diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 00000000000..69fe82afafb
--- /dev/null
+++ b/.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
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..b944333a0b6
--- /dev/null
+++ b/.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
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 00000000000..de2ca2326e4
--- /dev/null
+++ b/.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
diff --git a/.github/workflows/build-toolchain.yml b/.github/workflows/build-toolchain.yml
index 8413ff68041..6dcad70e0de 100644
--- a/.github/workflows/build-toolchain.yml
+++ b/.github/workflows/build-toolchain.yml
@@ -28,9 +28,15 @@ on:
 
 jobs:
   build:
-    name: Preset ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }}
-    runs-on: windows-latest
-    timeout-minutes: 40
+    name: ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }}
+    runs-on: windows-2022
+    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
@@ -41,41 +47,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,15 +105,65 @@ jobs:
         with:
           arch: x86
 
+      - name: Compute vcpkg cache key parts
+        if: startsWith(inputs.preset, 'win32')
+        id: vcpkg_key
+        shell: pwsh
+        run: |
+          $baseline = (Get-Content vcpkg.json | ConvertFrom-Json)."builtin-baseline"
+
+          $msvc = $env:VCToolsVersion
+          if (-not $msvc) { $msvc = "unknown" }
+
+          # Reduce churn: keep major.minor (e.g. 14.44)
+          $msvcMajorMinor = ($msvc -split '\.')[0..1] -join '.'
+
+          $triplet = "x86-windows"
+          if ("${{ inputs.preset }}" -like "x64*") { $triplet = "x64-windows" }
+
+          "baseline=$baseline" >> $env:GITHUB_OUTPUT
+          "msvc=$msvcMajorMinor" >> $env:GITHUB_OUTPUT
+          "triplet=$triplet" >> $env:GITHUB_OUTPUT
+
+          Write-Host "vcpkg cache key parts: baseline=$baseline, msvc=$msvcMajorMinor, triplet=$triplet"
+
+      - name: Restore vcpkg binary cache
+        if: startsWith(inputs.preset, 'win32')
+        id: vcpkg_cache
+        uses: actions/cache/restore@v4
+        with:
+          path: ${{ github.workspace }}\vcpkg-bincache
+          key: vcpkg-bincache-v2-${{ runner.os }}-msvc${{ steps.vcpkg_key.outputs.msvc }}-baseline${{ steps.vcpkg_key.outputs.baseline }}-${{ steps.vcpkg_key.outputs.triplet }}
+          restore-keys: |
+            vcpkg-bincache-v2-${{ runner.os }}-msvc${{ steps.vcpkg_key.outputs.msvc }}-baseline${{ steps.vcpkg_key.outputs.baseline }}-
+            vcpkg-bincache-v2-${{ runner.os }}-
+
       - name: Setup vcpkg
         uses: lukka/run-vcpkg@v11
+        with:
+          runVcpkgInstall: false
+          doNotCache: true
+
+      - name: Configure vcpkg to use cached directory
+        if: startsWith(inputs.preset, 'win32')
+        shell: pwsh
+        run: |
+          $cacheDir = "${{ github.workspace }}\vcpkg-bincache"
+          New-Item -ItemType Directory -Force -Path $cacheDir | Out-Null
+
+          # lukka/run-vcpkg sets its own temp cache dir; override to force our cached dir
+          $env:VCPKG_DEFAULT_BINARY_CACHE = $cacheDir
+          $env:VCPKG_BINARY_SOURCES = "clear;files,$cacheDir,readwrite"
+
+          "VCPKG_DEFAULT_BINARY_CACHE=$cacheDir" >> $env:GITHUB_ENV
+          "VCPKG_BINARY_SOURCES=$env:VCPKG_BINARY_SOURCES" >> $env:GITHUB_ENV
 
       - name: Configure ${{ inputs.game }} with CMake Using ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Preset
         shell: pwsh
         run: |
           $buildFlags = @(
-          "-DRTS_BUILD_ZEROHOUR=${{ inputs.game == 'GeneralsMD' && 'ON' || 'OFF' }}",
-          "-DRTS_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' }}"
@@ -120,7 +173,6 @@ jobs:
           $buildFlags += "-DRTS_BUILD_${gamePrefix}_EXTRAS=${{ inputs.extras && 'ON' || 'OFF' }}"
 
           Write-Host "Build flags: $($buildFlags -join ' | ')"
-
           cmake --preset ${{ inputs.preset }} $buildFlags
 
       - name: Build ${{ inputs.game }} with CMake Using ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Preset
@@ -128,19 +180,29 @@ jobs:
         run: |
           cmake --build --preset ${{ inputs.preset }}
 
+      - name: Save vcpkg binary cache
+        # Only one job should save to avoid "Unable to reserve cache" conflicts.
+        if: ${{ startsWith(inputs.preset, 'win32') && steps.vcpkg_cache.outputs.cache-hit != 'true' && inputs.game == 'Generals' && inputs.preset == 'win32-vcpkg-debug' }}
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}\vcpkg-bincache
+          key: vcpkg-bincache-v2-${{ runner.os }}-msvc${{ steps.vcpkg_key.outputs.msvc }}-baseline${{ steps.vcpkg_key.outputs.baseline }}-${{ steps.vcpkg_key.outputs.triplet }}
+
       - name: Collect ${{ inputs.game }} ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Artifact
         shell: pwsh
         run: |
           $buildDir = "build\${{ inputs.preset }}"
           $artifactsDir = New-Item -ItemType Directory -Force -Path "$buildDir\${{ inputs.game }}\artifacts" -Verbose
 
-            if ("${{ inputs.preset }}" -like "win32*") {
-            # For win32 preset, look in config-specific subdirectories
+          if ("${{ inputs.preset }}" -like "win32*") {
             $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\Core","$buildDir\${{ inputs.game }}" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
+            $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\Core","$buildDir\${{ inputs.game }}" -File |
+              Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
           }
+
           $files | Move-Item -Destination $artifactsDir -Verbose -Force
 
       - name: Upload ${{ inputs.game }} ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Artifact
diff --git a/.github/workflows/check-replays.yml b/.github/workflows/check-replays.yml
new file mode 100644
index 00000000000..0f10f67d85b
--- /dev/null
+++ b/.github/workflows/check-replays.yml
@@ -0,0 +1,242 @@
+name: Check Replays
+
+permissions:
+  contents: read
+  pull-requests: write
+
+on:
+  workflow_call:
+    inputs:
+      game:
+        required: true
+        type: string
+        description: "Game to check (only GeneralsMD for now)"
+      userdata:
+        required: true
+        type: string
+        description: "Path to folder with replays and maps"
+      preset:
+        required: true
+        type: string
+        description: "CMake preset"
+
+jobs:
+  build:
+    name: ${{ inputs.preset }}
+    runs-on: windows-2022
+    timeout-minutes: 15
+    env:
+      GAME_PATH: C:\GameData
+      GENERALS_PATH: C:\GameData\Generals
+      GENERALSMD_PATH: C:\GameData\GeneralsMD
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Download Game Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.game }}-${{ inputs.preset }}
+          path: build
+
+      - name: Cache Game Data
+        id: cache-gamedata
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.GAME_PATH }}
+          key: gamedata-permanent-cache-v4
+
+      - name: Download Game Data from Cloudflare R2
+        if: ${{ steps.cache-gamedata.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_GENERALS: "37A351AA430199D1F05DEB9E404857DCE7B461A6AC272C5D4A0B5652CDB06372"
+          EXPECTED_HASH_GENERALSMD: "6837FE1E3009A4C239406C39B1598216C0943EE8ED46BB10626767029AC05E21"
+        shell: pwsh
+        run: |
+          # Download trimmed gamedata of both Generals 1.08 and Generals Zero Hour 1.04.
+          # This data cannot be used for playing because it's
+          # missing textures, audio and gui files. But it's enough for replay checking.
+          # It's also encrypted because it's not allowed to distribute these files.
+
+          if (-not $env:AWS_ACCESS_KEY_ID -or -not $env:AWS_SECRET_ACCESS_KEY -or -not $env:AWS_ENDPOINT_URL) {
+              $ok1 = [bool]$env:AWS_ACCESS_KEY_ID
+              $ok2 = [bool]$env:AWS_SECRET_ACCESS_KEY
+              $ok3 = [bool]$env:AWS_ENDPOINT_URL
+              Write-Host "One or more required secrets are not set or are empty. R2_ACCESS_KEY_ID: $ok1, R2_SECRET_ACCESS_KEY: $ok2, R2_ENDPOINT_URL: $ok3"
+              exit 1
+          }
+
+          # Download Generals Game Files
+          # The archive contains these files:
+          # BINKW32.DLL
+          # English.big
+          # INI.big
+          # Maps.big
+          # mss32.dll
+          # W3D.big
+          # Data\Scripts\MultiplayerScripts.scb
+          # Data\Scripts\SkirmishScripts.scb
+
+          Write-Host "Downloading Game Data for Generals" -ForegroundColor Cyan
+          aws s3 cp s3://github-ci/generals108_gamedata_trimmed.7z generals108_gamedata_trimmed.7z --endpoint-url $env:AWS_ENDPOINT_URL
+
+          Write-Host "Verifying File Integrity" -ForegroundColor Cyan
+          $fileHash = (Get-FileHash -Path generals108_gamedata_trimmed.7z -Algorithm SHA256).Hash
+          Write-Host "Downloaded file SHA256: $fileHash"
+          Write-Host "Expected file SHA256: $env:EXPECTED_HASH_GENERALS"
+          if ($fileHash -ne $env:EXPECTED_HASH_GENERALS) {
+              Write-Error "Hash verification failed! File may be corrupted or tampered with."
+              exit 1
+          }
+
+          Write-Host "Extracting Archive" -ForegroundColor Cyan
+          $extractPath = $env:GENERALS_PATH
+          & 7z x generals108_gamedata_trimmed.7z -o"$extractPath"
+          Remove-Item generals108_gamedata_trimmed.7z -Verbose
+
+          # Download GeneralsMD (ZH) Game Files
+          # The archive contains these files:
+          # BINKW32.DLL
+          # INIZH.big
+          # MapsZH.big
+          # mss32.dll
+          # W3DZH.big
+          # Data\Scripts\MultiplayerScripts.scb
+          # Data\Scripts\Scripts.ini
+          # Data\Scripts\SkirmishScripts.scb
+
+          Write-Host "Downloading Game Data for GeneralsMD" -ForegroundColor Cyan
+          aws s3 cp s3://github-ci/zerohour104_gamedata_trimmed.7z zerohour104_gamedata_trimmed.7z --endpoint-url $env:AWS_ENDPOINT_URL
+
+          Write-Host "Verifying File Integrity" -ForegroundColor Cyan
+          $fileHash = (Get-FileHash -Path zerohour104_gamedata_trimmed.7z -Algorithm SHA256).Hash
+          Write-Host "Downloaded file SHA256: $fileHash"
+          Write-Host "Expected file SHA256: $env:EXPECTED_HASH_GENERALSMD"
+          if ($fileHash -ne $env:EXPECTED_HASH_GENERALSMD) {
+              Write-Error "Hash verification failed! File may be corrupted or tampered with."
+              exit 1
+          }
+
+          Write-Host "Extracting Archive" -ForegroundColor Cyan
+          $extractPath = $env:GENERALSMD_PATH
+          & 7z x zerohour104_gamedata_trimmed.7z -o"$extractPath"
+          Remove-Item zerohour104_gamedata_trimmed.7z -Verbose
+
+      - name: Set Up Game Data
+        shell: pwsh
+        run: |
+          $source = "$env:GAME_PATH\${{ inputs.game }}"
+          $destination = "build"
+          Copy-Item -Path $source\* -Destination $destination -Recurse -Force
+
+      - name: Set Generals InstallPath in Registry
+        shell: pwsh
+        run: |
+          # Zero Hour loads some Generals files and needs this registry key to find the
+          # Generals data files.
+
+          $regPath = "HKCU:\SOFTWARE\Electronic Arts\EA Games\Generals"
+          $installPath = "$env:GENERALS_PATH\"
+
+          # Ensure the key exists
+          if (-not (Test-Path $regPath)) {
+            New-Item -Path $regPath -Force | Out-Null
+          }
+
+          # Set the InstallPath value
+          Set-ItemProperty -Path $regPath -Name InstallPath -Value $installPath -Type String
+          Write-Host "Registry key set: $regPath -> InstallPath = $installPath"
+
+      - name: Move Replays and Maps to User Dir
+        shell: pwsh
+        run: |
+          # These files are expected in the user dir, so we move them here.
+
+          $source = "${{ inputs.userdata }}\Replays"
+          $destination = "$env:USERPROFILE\Documents\Command and Conquer Generals Zero Hour Data\Replays"
+          Write-Host "Move replays to $destination"
+          New-Item -ItemType Directory -Path $destination -Force | Out-Null
+          Move-Item -Path "$source\*" -Destination $destination -Force
+
+          $source = "${{ inputs.userdata }}\Maps"
+          $destination = "$env:USERPROFILE\Documents\Command and Conquer Generals Zero Hour Data\Maps"
+          Write-Host "Move maps to $destination"
+          New-Item -ItemType Directory -Path $destination -Force | Out-Null
+          Move-Item -Path "$source\*" -Destination $destination -Force
+
+      - name: Run Replay Compatibility Tests
+        shell: pwsh
+        run: |
+          $exePath = "build/generalszh.exe"
+          $arguments = "-jobs 4 -headless -replay *.rep"
+          $timeoutSeconds = 10*60
+          $stdoutPath = "stdout.log"
+          $stderrPath = "stderr.log"
+
+          if (-not (Test-Path $exePath)) {
+              Write-Host "ERROR: Executable not found at $exePath"
+              exit 1
+          }
+
+          # Note that the game is a gui application. That means we need to redirect console output to a file
+          # in order to retrieve it.
+          # Clean previous logs
+          Remove-Item $stdoutPath, $stderrPath -ErrorAction SilentlyContinue
+
+          # Start the process
+          Write-Host "Run $exePath $arguments"
+          $process = Start-Process -FilePath $exePath `
+              -ArgumentList $arguments `
+              -RedirectStandardOutput $stdoutPath `
+              -RedirectStandardError $stderrPath `
+              -PassThru
+
+          # Wait with timeout
+          $exited = $process.WaitForExit($timeoutSeconds * 1000)
+
+          if (-not $exited) {
+              Write-Host "ERROR: Process still running after $timeoutSeconds seconds. Killing process..."
+              Stop-Process -Id $process.Id -Force
+          }
+
+          # Read output
+          Write-Host "=== STDOUT ==="
+          Get-Content $stdoutPath
+
+          if ((Test-Path $stderrPath) -and (Get-Item $stderrPath).Length -gt 0) {
+              Write-Host "`n=== STDERR ==="
+              Get-Content $stderrPath
+          }
+
+          if (-not $exited) {
+              exit 1
+          }
+
+          # Check exit code
+          $exitCode = $process.ExitCode
+          
+          # The above doesn't work on all Windows versions. If not, try this: (see https://stackoverflow.com/a/16018287)
+          #$process.HasExited | Out-Null # Needs to be called for the command below to work correctly
+          #$exitCode = $process.GetType().GetField('exitCode', 'NonPublic, Instance').GetValue($process)
+          #Write-Host "exit code $exitCode"
+
+          if ($exitCode -ne 0) {
+              Write-Host "ERROR: Process failed with exit code $exitCode"
+              exit $exitCode
+          }
+
+          Write-Host "Success!"
+
+      - name: Upload Debug Log
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Replay-Debug-Log-${{ inputs.preset }}
+          path: build/DebugLogFile*.txt
+          retention-days: 30
+          if-no-files-found: ignore
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd16f177f09..0420bc2e276 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,8 +41,7 @@ jobs:
             generalsmd:
               - 'GeneralsMD/**'
             shared:
-              - '.github/workflows/build-toolchain.yml'
-              - '.github/workflows/ci.yml'
+              - '.github/workflows/**'
               - 'CMakeLists.txt'
               - 'CMakePresets.json'
               - 'cmake/**'
@@ -69,19 +68,22 @@ jobs:
           - preset: "vc6-profile"
             tools: true
             extras: true
-          - preset: "vc6-internal"
+          - preset: "vc6-debug"
             tools: true
             extras: true
-          - preset: "vc6-debug"
+          - preset: "win32"
             tools: true
             extras: true
-          - preset: "win32-vcpkg"
+          - preset: "win32-profile"
             tools: true
             extras: true
-          - preset: "win32-vcpkg-profile"
+          - preset: "win32-debug"
+            tools: true
+            extras: true
+          - preset: "win32-vcpkg"
             tools: true
             extras: true
-          - preset: "win32-vcpkg-internal"
+          - preset: "win32-vcpkg-profile"
             tools: true
             extras: true
           - preset: "win32-vcpkg-debug"
@@ -96,7 +98,9 @@ jobs:
       extras: ${{ matrix.extras }}
     secrets: inherit
 
-  build-generalsmd:
+  # Note build-generalsmd is split into two jobs for vc6 and win32 because replaycheck-generalsmd
+  # only requires the vc6 build and compiling vc6 is much faster than win32
+  build-generalsmd-vc6:
     name: Build GeneralsMD${{ matrix.preset && '' }}
     needs: detect-changes
     if: ${{ github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.generalsmd == 'true' || needs.detect-changes.outputs.shared == 'true' }}
@@ -109,22 +113,44 @@ jobs:
           - preset: "vc6-profile"
             tools: true
             extras: true
-          - preset: "vc6-internal"
+          - preset: "vc6-debug"
             tools: true
             extras: true
-          - preset: "vc6-debug"
+          - preset: "vc6-releaselog"
             tools: true
             extras: true
+      fail-fast: false
+    uses: ./.github/workflows/build-toolchain.yml
+    with:
+      game: "GeneralsMD"
+      preset: ${{ matrix.preset }}
+      tools: ${{ matrix.tools }}
+      extras: ${{ matrix.extras }}
+    secrets: inherit
+
+  build-generalsmd-win32:
+    name: Build GeneralsMD${{ matrix.preset && '' }}
+    needs: detect-changes
+    if: ${{ github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.generalsmd == 'true' || needs.detect-changes.outputs.shared == 'true' }}
+    strategy:
+      matrix:
+        include:
           - preset: "win32"
             tools: true
             extras: true
           - preset: "win32-profile"
             tools: true
             extras: true
-          - preset: "win32-internal"
+          - preset: "win32-debug"
             tools: true
             extras: true
-          - preset: "win32-debug"
+          - 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
@@ -135,3 +161,20 @@ jobs:
       tools: ${{ matrix.tools }}
       extras: ${{ matrix.extras }}
     secrets: inherit
+
+  replaycheck-generalsmd:
+    name: Replay Check GeneralsMD${{ matrix.preset && '' }}
+    needs: build-generalsmd-vc6
+    if: ${{ github.event_name == 'workflow_dispatch' || needs.detect-changes.outputs.generalsmd == 'true' || needs.detect-changes.outputs.shared == 'true' }}
+    strategy:
+      matrix:
+        include:
+          - preset: "vc6+t+e"
+          - preset: "vc6-releaselog+t+e" # optimized build with logging and crashing enabled should be compatible, so we test that here.
+      fail-fast: false
+    uses: ./.github/workflows/check-replays.yml
+    with:
+      game: "GeneralsMD"
+      userdata: "GeneralsReplays/GeneralsZH/1.04"
+      preset: ${{ matrix.preset }}
+    secrets: inherit
diff --git a/.github/workflows/weekly-release.yml b/.github/workflows/weekly-release.yml
new file mode 100644
index 00000000000..c127d9e5f02
--- /dev/null
+++ b/.github/workflows/weekly-release.yml
@@ -0,0 +1,210 @@
+name: Weekly Release
+
+permissions:
+  contents: write
+  pull-requests: write
+
+on:
+  workflow_dispatch:
+    inputs:
+      build_notes:
+        description: 'Build notes (optional)'
+        required: false
+        default: ''
+        type: string
+      known_issues:
+        description: 'Known issues (optional)'
+        required: false
+        default: ''
+        type: string
+      force_changed:
+        description: 'Force build'
+        required: false
+        default: 'false'
+        type: choice
+        options:
+          - 'false'
+          - 'true'
+      pre-release:
+        description: 'Mark release as pre-release'
+        required: false
+        default: 'false'
+        type: choice
+        options:
+          - 'false'
+          - 'true'
+
+  schedule:
+    - cron: '0 9 * * 5'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  get-date:
+    runs-on: ubuntu-latest
+    outputs:
+      date: ${{ steps.date.outputs.date }}
+    steps:
+      - name: Get current date
+        id: date
+        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+
+  detect-scm-changes:
+    needs: [get-date]
+    runs-on: ubuntu-latest
+    outputs:
+      changed: ${{ steps.check.outputs.changed }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+      - id: check
+        run: |
+          if [ "${{ github.event.inputs.force_changed }}" = "true" ]; then
+            echo "changed=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          echo LAST TAG:
+          git describe --tags --abbrev=0 2>/dev/null || echo ""
+
+          LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          if [ -z "$LAST_TAG" ]; then
+            echo "changed=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+          CHANGED=$(git diff --name-only $LAST_TAG..HEAD | grep -v '.github/workflows/' | wc -l)
+          if [ "$CHANGED" -eq "0" ]; then
+            echo "changed=false" >> $GITHUB_OUTPUT
+          else
+            echo "changed=true" >> $GITHUB_OUTPUT
+          fi
+
+  build-generals:
+    needs: [detect-scm-changes, get-date]
+    if: needs.detect-scm-changes.outputs.changed == 'true'
+    name: Build Generals${{ matrix.preset && '' }}
+    strategy:
+      matrix:
+        include:
+          - preset: "vc6-weekly"
+            tools: true
+            extras: false
+            release: true
+      fail-fast: false
+    uses: ./.github/workflows/build-toolchain.yml
+    with:
+      game: "Generals"
+      preset: ${{ matrix.preset }}
+      tools: ${{ matrix.tools }}
+      extras: ${{ matrix.extras }}
+    secrets: inherit
+
+  build-generalsmd:
+    needs: [detect-scm-changes, get-date]
+    if: needs.detect-scm-changes.outputs.changed == 'true'
+    name: Build GeneralsMD${{ matrix.preset && '' }}
+    strategy:
+      matrix:
+        include:
+          - preset: "vc6-weekly"
+            tools: true
+            extras: false
+            release: true
+      fail-fast: false
+    uses: ./.github/workflows/build-toolchain.yml
+    with:
+      game: "GeneralsMD"
+      preset: ${{ matrix.preset }}
+      tools: ${{ matrix.tools }}
+      extras: ${{ matrix.extras }}
+    secrets: inherit
+
+  create-release:
+    name: Create Release
+    needs: [build-generals, build-generalsmd, get-date]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Collect commits since last release
+        id: changelog
+        run: |
+          LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          if [ -z "$LAST_TAG" ]; then
+            CHANGELOG_COMMITS=$(git log --pretty="format:- %s" --no-merges HEAD | head -n 10 || true)
+          else
+            CHANGELOG_COMMITS=$(git log --pretty="format:- %s" --no-merges "$LAST_TAG"..HEAD || true)
+          fi
+          if [ -z "$CHANGELOG_COMMITS" ]; then
+            CHANGELOG_COMMITS="- No relevant changes detected since the last release."
+          fi
+          {
+            echo 'commits<<CHANGELOG_EOF'
+            echo "$CHANGELOG_COMMITS"
+            echo 'CHANGELOG_EOF'
+          } >> "$GITHUB_OUTPUT"
+
+      # Generals vc6
+      - name: Download Generals VC6 Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: Generals-vc6-weekly+t
+          path: generals-vc6-artifacts
+
+      - name: Prepare and Zip Generals VC6
+        run: |
+          zip -jr generals-weekly-${{ needs.get-date.outputs.date }}.zip generals-vc6-artifacts/*
+
+      # GeneralsMD vc6
+      - name: Download GeneralsMD VC6 Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: GeneralsMD-vc6-weekly+t
+          path: generalsmd-vc6-artifacts
+
+      - name: Prepare and Zip GeneralsMD VC6
+        run: |
+          zip -jr generalszh-weekly-${{ needs.get-date.outputs.date }}.zip generalsmd-vc6-artifacts/*
+
+      - name: Generate release notes
+        id: release_body
+        run: |
+          BODY=""
+          if [ "${{ github.event.inputs.build_notes }}" != "" ]; then
+            BODY="${BODY}### Build notes\n${{ github.event.inputs.build_notes }}\n"
+          fi
+          if [ "${{ github.event.inputs.known_issues }}" != "" ]; then
+            BODY="${BODY}### Known issues\n${{ github.event.inputs.known_issues }}\n"
+          fi
+          BODY="${BODY}### Changelog\n${{ steps.changelog.outputs.commits }}"
+          echo "body<<EOF" >> $GITHUB_OUTPUT
+          echo -e "$BODY" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: weekly-${{ needs.get-date.outputs.date }}
+          name: weekly-${{ needs.get-date.outputs.date }}
+          prerelease: ${{ github.event.inputs.pre-release == 'true' }}
+          body: ${{ steps.release_body.outputs.body }}
+          files: |
+            generals-weekly-${{ needs.get-date.outputs.date }}.zip
+            generalszh-weekly-${{ needs.get-date.outputs.date }}.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Clean up release folders
+        if: always()
+        run: |
+          rm -rf generals-vc6-artifacts generalsmd-vc6-artifacts
+          rm -f generals-weekly-${{ needs.get-date.outputs.date }}.zip
+          rm -f generalszh-weekly-${{ needs.get-date.outputs.date }}.zip
diff --git a/.gitignore b/.gitignore
index e5e550b48da..1c9c525ae12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
-# Ignore everything starting with dot, except git files.
+# Ignore everything starting with dot, except specific files.
 .*
+!.editorconfig
 !.gitignore
 !.gitattributes
 !.github
+!.gitmodules
 
 *.user
 *.ncb
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000000..09d4419ccc5
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "GeneralsReplays"]
+	path = GeneralsReplays
+	url = https://github.com/TheSuperHackers/GeneralsReplays
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b9bb8bf6b7..4160c918c74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,6 @@ if((WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows") AND ${CMAKE_SIZEOF_VOID_P} EQU
     include(cmake/miles.cmake)
     include(cmake/bink.cmake)
     include(cmake/dx8.cmake)
-    include(cmake/dbghelp.cmake)
 endif()
 
 # Define a dummy stlport target when not on VC6.
@@ -57,7 +56,6 @@ include(cmake/config.cmake)
 include(cmake/gamespy.cmake)
 include(cmake/lzhl.cmake)
 
-add_subdirectory(Dependencies/Benchmark)
 if (IS_VS6_BUILD)
     # The original max sdk does not compile against a modern compiler.
     # If there is a desire to make this work, then a fixed max sdk needs to be created.
diff --git a/CMakePresets.json b/CMakePresets.json
index feb76247721..ba1d2d194c2 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -9,13 +9,13 @@
         {
             "name": "vc6",
             "displayName": "Windows 32bit VC6 Release",
-            "generator": "NMake Makefiles",
+            "generator": "Ninja",
             "hidden": false,
             "binaryDir": "${sourceDir}/build/${presetName}",
             "cacheVariables": {
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
                 "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
-                "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:ProgramDatabase>",
+                "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "",
                 "CMAKE_BUILD_TYPE": "Release",
                 "RTS_FLAGS": "/W3"
             },
@@ -34,14 +34,6 @@
                 "RTS_BUILD_OPTION_PROFILE": "ON"
             }
         },
-        {
-            "name": "vc6-internal",
-            "displayName": "Windows 32bit VC6 Internal",
-            "inherits": "vc6",
-            "cacheVariables": {
-                "RTS_BUILD_OPTION_INTERNAL": "ON"
-            }
-        },
         {
             "name": "vc6-debug",
             "displayName": "Windows 32bit VC6 Debug",
@@ -52,6 +44,23 @@
                 "RTS_BUILD_OPTION_DEBUG": "ON"
             }
         },
+        {
+            "name": "vc6-releaselog",
+            "displayName": "Windows 32bit VC6 Release Logging",
+            "inherits": "vc6",
+            "cacheVariables": {
+                "RTS_DEBUG_LOGGING": "ON",
+                "RTS_DEBUG_CRASHING": "ON"
+            }
+        },
+        {
+            "name": "vc6-weekly",
+            "displayName": "Windows 32bit VC6 Weekly Release",
+            "inherits": "vc6",
+            "cacheVariables": {
+                "RTS_BUILD_OPTION_VC6_FULL_DEBUG": "ON"
+            }
+        },
         {
             "name": "default",
             "displayName": "Default Config (don't use directly!)",
@@ -103,14 +112,6 @@
                 "RTS_BUILD_OPTION_PROFILE": "ON"
             }
         },
-        {
-            "name": "win32-internal",
-            "inherits": "win32",
-            "displayName": "Windows 32bit Internal",
-            "cacheVariables": {
-                "RTS_BUILD_OPTION_INTERNAL": "ON"
-            }
-        },
         {
             "name": "win32-debug",
             "inherits": "win32",
@@ -145,14 +146,6 @@
                 "RTS_BUILD_OPTION_PROFILE": "ON"
             }
         },
-        {
-            "name": "win32-vcpkg-internal",
-            "inherits": "win32-vcpkg",
-            "displayName": "Windows 32bit VCPKG Internal",
-            "cacheVariables": {
-                "RTS_BUILD_OPTION_INTERNAL": "ON"
-            }
-        },
         {
             "name": "win32-vcpkg-debug",
             "inherits": "win32-vcpkg",
@@ -175,12 +168,6 @@
             "displayName": "Build Windows 32bit VC6 Release",
             "description": "Build Windows 32bit VC6 Release"
         },
-        {
-            "name": "vc6-internal",
-            "configurePreset": "vc6-internal",
-            "displayName": "Build Windows 32bit VC6 Internal",
-            "description": "Build Windows 32bit VC6 Internal"
-        },
         {
             "name": "vc6-profile",
             "configurePreset": "vc6-profile",
@@ -193,6 +180,18 @@
             "displayName": "Build Windows 32bit VC6 Debug",
             "description": "Build Windows 32bit VC6 Debug"
         },
+        {
+            "name": "vc6-releaselog",
+            "configurePreset": "vc6-releaselog",
+            "displayName": "Build Windows 32bit VC6 Release Logging",
+            "description": "Build Windows 32bit VC6 Release Logging"
+        },
+        {
+            "name": "vc6-weekly",
+            "configurePreset": "vc6-weekly",
+            "displayName": "Build Windows 32bit VC6 Weekly Release",
+            "description": "Build Windows 32bit VC6 Weekly Release"
+        },
         {
             "name": "win32",
             "configurePreset": "win32",
@@ -200,13 +199,6 @@
             "description": "Build Windows 32bit Release",
             "configuration": "Release"
         },
-        {
-            "name": "win32-internal",
-            "configurePreset": "win32-internal",
-            "displayName": "Build Windows 32bit Internal",
-            "description": "Build Windows 32bit Internal",
-            "configuration": "Release"
-        },
         {
             "name": "win32-profile",
             "configurePreset": "win32-profile",
@@ -228,13 +220,6 @@
             "description": "Build Windows 32bit VCPKG Release",
             "configuration": "Release"
         },
-        {
-            "name": "win32-vcpkg-internal",
-            "configurePreset": "win32-vcpkg-internal",
-            "displayName": "Build Windows 32bit VCPKG Internal",
-            "description": "Build Windows 32bit VCPKG Internal",
-            "configuration": "Release"
-        },
         {
             "name": "win32-vcpkg-profile",
             "configurePreset": "win32-vcpkg-profile",
@@ -285,54 +270,54 @@
             ]
         },
         {
-            "name": "vc6-internal",
+            "name": "vc6-profile",
             "steps": [
                 {
                     "type": "configure",
-                    "name": "vc6-internal"
+                    "name": "vc6-profile"
                 },
                 {
                     "type": "build",
-                    "name": "vc6-internal"
+                    "name": "vc6-profile"
                 }
             ]
         },
         {
-            "name": "vc6-profile",
+            "name": "vc6-releaselog",
             "steps": [
                 {
                     "type": "configure",
-                    "name": "vc6-profile"
+                    "name": "vc6-releaselog"
                 },
                 {
                     "type": "build",
-                    "name": "vc6-profile"
+                    "name": "vc6-releaselog"
                 }
             ]
         },
         {
-            "name": "win32",
+            "name": "vc6-weekly",
             "steps": [
                 {
                     "type": "configure",
-                    "name": "win32"
+                    "name": "vc6-weekly"
                 },
                 {
                     "type": "build",
-                    "name": "win32"
+                    "name": "vc6-weekly"
                 }
             ]
         },
         {
-            "name": "win32-internal",
+            "name": "win32",
             "steps": [
                 {
                     "type": "configure",
-                    "name": "win32-internal"
+                    "name": "win32"
                 },
                 {
                     "type": "build",
-                    "name": "win32-internal"
+                    "name": "win32"
                 }
             ]
         },
@@ -375,19 +360,6 @@
                 }
             ]
         },
-        {
-            "name": "win32-vcpkg-internal",
-            "steps": [
-                {
-                    "type": "configure",
-                    "name": "win32-vcpkg-internal"
-                },
-                {
-                    "type": "build",
-                    "name": "win32-vcpkg-internal"
-                }
-            ]
-        },
         {
             "name": "win32-vcpkg-profile",
             "steps": [
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000000..84d5b7d70e4
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,153 @@
+# How to contribute as a developer
+
+To contribute, fork this repository to create your own copy that you can clone locally and push back to. You can use your fork to create pull requests for your code to be merged into this repository.
+
+## Code guidelines
+
+### Scope of code changes
+
+Code edits only touch the lines of code that serve the intended goal of the change. Big refactors should not be combined with logical changes, because these can become very difficult to review. If a change requires a refactor, create a commit for the refactor before (or after) creating a commit for the change. A Pull Request can contain multiple commits and can be merged with **Rebase and Merge** if these commits are meant to be preserved on the main branch. Otherwise, method of merging will be **Squash and Merge**.
+
+### Style of code changes
+
+Code edits should fit the nearby code in ways that the code style reads consistent, unless the original code style is bad. The original game code uses c++98, or a deviation thereof, and is simple to read. Prefer not to use newer language features unless required to implement the desired change. Prefer to use newer language features when they are considerably more robust or make the code easier to understand or maintain.
+
+### Language style guide
+
+*Work in progress. Needs a maintainer. Can be built upon existing Code guidelines, such as the "Google C++ Style Guide".*
+
+### Precedence of code changes
+
+Changes to Zero Hour take precedence over Generals, if applicable. When the changed code is not shared by both titles, then the change needs to be created for Zero Hour first, and then recreated for Generals. The implementation of a change for both titles needs to be identical or as close as possible. Preferably the Generals replica of a change comes with the same Pull Request. The Generals replica can be created after the Zero Hour code review has finished.
+
+
+## Change documentation
+
+User facing changes need to be documented in code, Pull Requests and change logs. All documentation ideally is written in the present tense, and not the past.
+
+Good:
+
+> Fixes particle effect of USA Missile Defender
+
+Bad:
+
+> Fixed particle effect of USA Missile Defender
+
+When a text refers to a faction unit, structure, upgrade or similar, then the unit should be worded without any abbrevations and should be prefixed with the faction name. Valid faction names are USA, China, GLA, Boss, Civilian. Subfaction names can be appended too, for example GLA Stealth.
+
+Good:
+
+> Fixes particle effect of USA Missile Defender
+
+Bad:
+
+> Fixes particle effect of MD
+
+
+### Code documentation
+
+User facing changes need to be accompanied by comment(s) where the change is made. Maintenance related changes, such as compilation fixes, typically do not need commenting, unless the next reader can benefit from a special explanation. The comment can be put at the begin of the changed file, class, function or block. It must be clear from the change description what has changed.
+
+The expected comment format is
+
+```
+// TheSuperHackers @keyword author DD/MM/YYYY A meaningful description for this change.
+```
+
+The `TheSuperHackers` word and `@keyword` are mandatory. `author` and date can be omitted when preferred.
+
+| Keyword          | Use-case                                                    |
+|------------------|-------------------------------------------------------------|
+| @bugfix          | Fixes a bug                                                 |
+| @fix             | Fixes something, but is not a user facing bug               |
+| @build           | Addresses a compile warning or error                        |
+| @feature         | Adds something new                                          |
+| @performance     | Improves performance                                        |
+| @refactor        | Moves or rewrites code, but does not change the behaviour   |
+| @tweak           | Changes values or settings                                  |
+| @info            | Writes useful information for the next reader               |
+| @todo            | Adds a note for something left to do if really necessary    |
+
+Block comment sample
+
+```
+    // TheSuperHackers @bugfix JAJames 17/03/2025 Fix uninitialized memory access and add more Windows versions.
+    memset(&os_info,0,sizeof(os_info));
+```
+
+Optionally, the pull request number can be appended to the comment. This can only be done after the pull request has been created.
+
+```
+// TheSuperHackers @bugfix JAJames 17/03/2025 Fix uninitialized memory access and add more Windows versions. (#123)
+```
+
+### Pull request documentation
+
+The title of a new Pull Request, and/or commit(s) within, begins with a [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/) tag. The tag is followed by a concise and descriptive sentence about the change and/or commit, beginning with an upper case letter and ending without a dot. The sentence ideally begins with a word that describes the action that the change takes, for example `fix *this*`, `change *that*`, `add *those*`, `refactor *thing*`.
+
+Allowed (extended) commit title types are:
+```
+bugfix:
+build:
+chore:
+ci:
+docs:
+fix:
+feat:
+perf:
+refactor:
+style:
+test:
+tweak:
+unify:
+```
+
+For the optional scope behind the type pick a suitable word that describes the overall area that the change touches.
+
+Good:
+```
+bugfix(system): fix uninitialized memory access in Get_OS_Info
+```
+
+Bad:
+```
+Minimal changes for successful build.
+```
+
+If the Pull Request is meant to be merged with rebase, then a note for **Merge with Rebase** should be added to the top of the text body, to help identify the correct merge action when it is ready for merge. All commits of the Pull Request need to be properly named and need the number of the Pull Request added as a suffix in parentheses. Example: **(#333)**. All commits need to be able to compile on their own without dependencies in newer commits of the same Pull Request. Prefer to create changes for **Squash and Merge**, as this will simplify things.
+
+The text body begins with links to related issue report(s) and/or Pull Request(s) if applicable.
+
+To write a link use the following format:
+
+```
+* Fixes #222
+* Closes #333
+* Relates to #555
+* Follow up for #666
+```
+
+Links are commonly used for
+
+* closing a related issue report or task when this pull request is merged
+* closing another pull request when this pull request is merged
+
+Some keywords are interpreted by GitHub. Read about it [here](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
+
+The text body continues with a description of the change in appropriate detail. This serves to educate reviewers and visitors to get a good understanding of the change without the need to study and understand the associated changed files. If the change is controversial or affects gameplay in a considerable way, then a rationale text needs to be appended. The rationale explains why the given change makes sense.
+
+
+### Pull request merging rules
+
+Please be mindful when merging changes. There are pitfalls in regards to the commit title consistency.
+
+When attempting to **Squash and Merge** a Pull Request that contains a single commit, then GitHub will default generate a commit title from that single commit. Typically this is undesired, when the new commit title is meant to be kept in sync with the Pull Request title rather than the Pull Request commit title. The generated commit title may need to be adjusted before merging the Pull Request.
+
+When attempting to **Squash and Merge** a Pull Request that contains multiple commits, the GitHub will default generate a commit title from the Pull Request title. Additionally it will generate a commit description from the multiple commits that are part of the Pull Request. The generated commit description generally needs to be cleared before merging the Pull Request to keep the commit title clean.
+
+When attempting to **Rebase and Merge** a Pull Request, then all commits will transfer with the same names to the main branch. Verify that all commit titles are properly crafted, with tags where applicable, trailing Pull Request numbers in parentheses and no unnecessary commit descriptions (texts below the commit title).
+
+
+### Change log documentation
+
+*Work in progress.*
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index 30b785f330c..6f6f640b3a4 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -1,17 +1,21 @@
-# c stands for core, i stands for Interface
+# i stands for Interface
+add_library(corei_gameengine_include INTERFACE)
 add_library(corei_libraries_include INTERFACE)
 add_library(corei_libraries_source_wwvegas INTERFACE)
-add_library(corei_libraries_source_wwvegas_wwdebug INTERFACE)
 add_library(corei_libraries_source_wwvegas_wwlib INTERFACE)
+add_library(corei_main INTERFACE)
 add_library(corei_always INTERFACE)
 
+target_include_directories(corei_gameengine_include INTERFACE "GameEngine/Include")
 target_include_directories(corei_libraries_include INTERFACE "Libraries/Include")
 target_include_directories(corei_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
-target_include_directories(corei_libraries_source_wwvegas_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
 target_include_directories(corei_libraries_source_wwvegas_wwlib INTERFACE "Libraries/Source/WWVegas/WWLib")
+target_include_directories(corei_main INTERFACE "Main")
+
 target_link_libraries(corei_always INTERFACE
     core_utility
     corei_libraries_include
+    resources
 )
 
 # Set where the build results will end up
@@ -24,6 +28,6 @@ add_subdirectory(Libraries)
 add_subdirectory(GameEngine)
 
 # Platform specific GameEngine code
-# add_subdirectory(GameEngineDevice)
+add_subdirectory(GameEngineDevice)
 
 add_subdirectory(Tools)
diff --git a/Core/GameEngine/CMakeLists.txt b/Core/GameEngine/CMakeLists.txt
index 35fc9a97d1e..eb7b7541e14 100644
--- a/Core/GameEngine/CMakeLists.txt
+++ b/Core/GameEngine/CMakeLists.txt
@@ -1,16 +1,17 @@
 set(GAMEENGINE_SRC
 #    Include/Common/AcademyStats.h
 #    Include/Common/ActionManager.h
-#    Include/Common/ArchiveFile.h
-#    Include/Common/ArchiveFileSystem.h
-#    Include/Common/AsciiString.h
-#    Include/Common/AudioAffect.h
-#    Include/Common/AudioEventInfo.h
-#    Include/Common/AudioEventRTS.h
-#    Include/Common/AudioHandleSpecialValues.h
-#    Include/Common/AudioRandomValue.h
-#    Include/Common/AudioRequest.h
-#    Include/Common/AudioSettings.h
+    Include/Common/AddonCompat.h
+    Include/Common/ArchiveFile.h
+    Include/Common/ArchiveFileSystem.h
+    Include/Common/AsciiString.h
+    Include/Common/AudioAffect.h
+    Include/Common/AudioEventInfo.h
+    Include/Common/AudioEventRTS.h
+    Include/Common/AudioHandleSpecialValues.h
+    Include/Common/AudioRandomValue.h
+    Include/Common/AudioRequest.h
+    Include/Common/AudioSettings.h
 #    Include/Common/BattleHonors.h
 #    Include/Common/BezFwdIterator.h
 #    Include/Common/BezierSegment.h
@@ -21,37 +22,40 @@ set(GAMEENGINE_SRC
 #    Include/Common/CDManager.h
 #    Include/Common/ClientUpdateModule.h
 #    Include/Common/CommandLine.h
-#    Include/Common/crc.h
-#    Include/Common/CRCDebug.h
+    Include/Common/crc.h
+    Include/Common/CRCDebug.h
 #    Include/Common/CriticalSection.h
 #    Include/Common/CustomMatchPreferences.h
 #    Include/Common/DamageFX.h
 #    Include/Common/DataChunk.h
-#    Include/Common/Debug.h
+    Include/Common/Debug.h
 #    Include/Common/Dict.h
 #    Include/Common/Directory.h
 #    Include/Common/DisabledTypes.h
 #    Include/Common/DiscreteCircle.h
 #    Include/Common/DrawModule.h
-#    Include/Common/DynamicAudioEventInfo.h
+    Include/Common/DynamicAudioEventInfo.h
 #    Include/Common/encrypt.h
 #    Include/Common/Energy.h
 #    Include/Common/Errors.h
-#    Include/Common/file.h
-#    Include/Common/FileSystem.h
+    Include/Common/file.h
+    Include/Common/FileSystem.h
+    Include/Common/FramePacer.h
+    Include/Common/FrameRateLimit.h
 #    Include/Common/FunctionLexicon.h
-#    Include/Common/GameAudio.h
+    Include/Common/GameAudio.h
 #    Include/Common/GameCommon.h
     Include/Common/GameDefines.h
 #    Include/Common/GameEngine.h
 #    Include/Common/GameLOD.h
-#    Include/Common/GameMemory.h
-#    Include/Common/GameMusic.h
-#    Include/Common/GameSounds.h
+    Include/Common/GameMemory.h
+    Include/Common/GameMusic.h
+    Include/Common/GameSounds.h
 #    Include/Common/GameSpyMiscPreferences.h
 #    Include/Common/GameState.h
 #    Include/Common/GameStateMap.h
 #    Include/Common/GameType.h
+    Include/Common/GameUtility.h
 #    Include/Common/Geometry.h
 #    Include/Common/GlobalData.h
 #    Include/Common/Handicap.h
@@ -63,13 +67,14 @@ set(GAMEENGINE_SRC
 #    Include/Common/Language.h
 #    Include/Common/LatchRestore.h
 #    Include/Common/List.h
-#    Include/Common/LocalFile.h
-#    Include/Common/LocalFileSystem.h
-#    Include/Common/MapObject.h
+    Include/Common/LocalFile.h
+    Include/Common/LocalFileSystem.h
+    Include/Common/MapObject.h
 #    Include/Common/MapReaderWriterInfo.h
 #    Include/Common/MessageStream.h
+    Include/Common/MiniDumper.h
 #    Include/Common/MiniLog.h
-#    Include/Common/MiscAudio.h
+    Include/Common/MiscAudio.h
 #    Include/Common/MissionStats.h
 #    Include/Common/ModelState.h
 #    Include/Common/Module.h
@@ -77,7 +82,7 @@ set(GAMEENGINE_SRC
 #    Include/Common/Money.h
 #    Include/Common/MultiplayerSettings.h
 #    Include/Common/NameKeyGenerator.h
-#    Include/Common/ObjectStatusTypes.h
+    Include/Common/ObjectStatusTypes.h
 #    Include/Common/OSDisplay.h
 #    Include/Common/Overridable.h
 #    Include/Common/Override.h
@@ -90,16 +95,17 @@ set(GAMEENGINE_SRC
 #    Include/Common/ProductionPrerequisite.h
 #    Include/Common/QuickmatchPreferences.h
 #    Include/Common/QuotedPrintable.h
-#    Include/Common/Radar.h
-#    Include/Common/RAMFile.h
-#    Include/Common/RandomValue.h
+    Include/Common/Radar.h
+    Include/Common/RAMFile.h
+    Include/Common/RandomValue.h
 #    Include/Common/Recorder.h
 #    Include/Common/Registry.h
+    Include/Common/ReplaySimulation.h
 #    Include/Common/ResourceGatheringManager.h
 #    Include/Common/Science.h
 #    Include/Common/ScopedMutex.h
 #    Include/Common/ScoreKeeper.h
-#    Include/Common/simpleplayer.h
+    #Include/Common/simpleplayer.h # unused
 #    Include/Common/SkirmishBattleHonors.h
 #    Include/Common/SkirmishPreferences.h
 #    Include/Common/Snapshot.h
@@ -111,7 +117,7 @@ set(GAMEENGINE_SRC
 #    Include/Common/StateMachine.h
 #    Include/Common/StatsCollector.h
 #    Include/Common/STLTypedefs.h
-#    Include/Common/StreamingArchiveFile.h
+    Include/Common/StreamingArchiveFile.h
 #    Include/Common/SubsystemInterface.h
 #    Include/Common/SystemInfo.h
 #    Include/Common/Team.h
@@ -122,13 +128,14 @@ set(GAMEENGINE_SRC
 #    Include/Common/ThingSort.h
 #    Include/Common/ThingTemplate.h
 #    Include/Common/TunnelTracker.h
-#    Include/Common/UnicodeString.h
+    Include/Common/UnicodeString.h
 #    Include/Common/UnitTimings.h
 #    Include/Common/Upgrade.h
-#    Include/Common/urllaunch.h
+    #Include/Common/urllaunch.h # unused
 #    Include/Common/UserPreferences.h
 #    Include/Common/version.h
 #    Include/Common/WellKnownKeys.h
+    Include/Common/WorkerProcess.h
     Include/Common/Xfer.h
     Include/Common/XferCRC.h
     Include/Common/XferDeepCRC.h
@@ -140,7 +147,7 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/CDCheck.h
 #    Include/GameClient/ChallengeGenerals.h
 #    Include/GameClient/ClientInstance.h
-#    Include/GameClient/ClientRandomValue.h
+    Include/GameClient/ClientRandomValue.h
 #    Include/GameClient/Color.h
 #    Include/GameClient/CommandXlat.h
 #    Include/GameClient/ControlBar.h
@@ -197,14 +204,14 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/Line2D.h
 #    Include/GameClient/LoadScreen.h
 #    Include/GameClient/LookAtXlat.h
-#    Include/GameClient/MapUtil.h
+    Include/GameClient/MapUtil.h
 #    Include/GameClient/MessageBox.h
 #    Include/GameClient/MetaEvent.h
 #    Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
 #    Include/GameClient/Module/BeaconClientUpdate.h
 #    Include/GameClient/Module/SwayClientUpdate.h
 #    Include/GameClient/Mouse.h
-#    Include/GameClient/ParabolicEase.h
+    Include/GameClient/ParabolicEase.h
 #    Include/GameClient/ParticleSys.h
 #    Include/GameClient/PlaceEventTranslator.h
 #    Include/GameClient/ProcessAnimateWindow.h
@@ -216,16 +223,16 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/Shell.h
 #    Include/GameClient/ShellHooks.h
 #    Include/GameClient/ShellMenuScheme.h
-#    Include/GameClient/Smudge.h
-#    Include/GameClient/Snow.h
+    Include/GameClient/Smudge.h
+    Include/GameClient/Snow.h
 #    Include/GameClient/Statistics.h
-#    Include/GameClient/TerrainRoads.h
-#    Include/GameClient/TerrainVisual.h
-#    Include/GameClient/VideoPlayer.h
-#    Include/GameClient/View.h
-#    Include/GameClient/Water.h
+    Include/GameClient/TerrainRoads.h
+    Include/GameClient/TerrainVisual.h
+    Include/GameClient/VideoPlayer.h
+    Include/GameClient/View.h
+    Include/GameClient/Water.h
 #    Include/GameClient/WindowLayout.h
-#    Include/GameClient/WindowVideoManager.h
+    Include/GameClient/WindowVideoManager.h
 #    Include/GameClient/WindowXlat.h
 #    Include/GameClient/WinInstanceData.h
 #    Include/GameLogic/AI.h
@@ -249,7 +256,7 @@ set(GAMEENGINE_SRC
 #    Include/GameLogic/GhostObject.h
 #    Include/GameLogic/Locomotor.h
 #    Include/GameLogic/LocomotorSet.h
-#    Include/GameLogic/LogicRandomValue.h
+    Include/GameLogic/LogicRandomValue.h
 #    Include/GameLogic/Module/ActiveBody.h
 #    Include/GameLogic/Module/ActiveShroudUpgrade.h
 #    Include/GameLogic/Module/AIUpdate.h
@@ -496,84 +503,89 @@ set(GAMEENGINE_SRC
 #    Include/GameLogic/WeaponSetFlags.h
 #    Include/GameLogic/WeaponSetType.h
 #    Include/GameLogic/WeaponStatus.h
-#    Include/GameNetwork/Connection.h
-#    Include/GameNetwork/ConnectionManager.h
-#    Include/GameNetwork/DisconnectManager.h
-#    Include/GameNetwork/DownloadManager.h
-#    Include/GameNetwork/FileTransfer.h
-#    Include/GameNetwork/FirewallHelper.h
-#    Include/GameNetwork/FrameData.h
-#    Include/GameNetwork/FrameDataManager.h
-#    Include/GameNetwork/FrameMetrics.h
-#    Include/GameNetwork/GameInfo.h
-#    Include/GameNetwork/GameMessageParser.h
-#    Include/GameNetwork/GameSpy/BuddyDefs.h
-#    Include/GameNetwork/GameSpy/BuddyThread.h
-#    Include/GameNetwork/GameSpy/GameResultsThread.h
-#    Include/GameNetwork/GameSpy/GSConfig.h
-#    Include/GameNetwork/GameSpy/LadderDefs.h
-#    Include/GameNetwork/GameSpy/LobbyUtils.h
-#    Include/GameNetwork/GameSpy/MainMenuUtils.h
-#    Include/GameNetwork/GameSpy/PeerDefs.h
-#    Include/GameNetwork/GameSpy/PeerDefsImplementation.h
-#    Include/GameNetwork/GameSpy/PeerThread.h
-#    Include/GameNetwork/GameSpy/PersistentStorageDefs.h
-#    Include/GameNetwork/GameSpy/PersistentStorageThread.h
-#    Include/GameNetwork/GameSpy/PingThread.h
-#    Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
-#    Include/GameNetwork/GameSpy/ThreadUtils.h
-#    Include/GameNetwork/GameSpyChat.h
-#    Include/GameNetwork/GameSpyGameInfo.h
-#    Include/GameNetwork/GameSpyGP.h
-#    Include/GameNetwork/GameSpyOverlay.h
-#    Include/GameNetwork/GameSpyThread.h
+    Include/GameNetwork/Connection.h
+    Include/GameNetwork/ConnectionManager.h
+    Include/GameNetwork/DisconnectManager.h
+    Include/GameNetwork/DownloadManager.h
+    Include/GameNetwork/FileTransfer.h
+    Include/GameNetwork/FirewallHelper.h
+    Include/GameNetwork/FrameData.h
+    Include/GameNetwork/FrameDataManager.h
+    Include/GameNetwork/FrameMetrics.h
+    Include/GameNetwork/GameInfo.h
+    Include/GameNetwork/GameMessageParser.h
+    Include/GameNetwork/GameSpy/BuddyDefs.h
+    Include/GameNetwork/GameSpy/BuddyThread.h
+    Include/GameNetwork/GameSpy/GameResultsThread.h
+    Include/GameNetwork/GameSpy/GSConfig.h
+    Include/GameNetwork/GameSpy/LadderDefs.h
+    Include/GameNetwork/GameSpy/LobbyUtils.h
+    Include/GameNetwork/GameSpy/MainMenuUtils.h
+    Include/GameNetwork/GameSpy/PeerDefs.h
+    Include/GameNetwork/GameSpy/PeerDefsImplementation.h
+    Include/GameNetwork/GameSpy/PeerThread.h
+    Include/GameNetwork/GameSpy/PersistentStorageDefs.h
+    Include/GameNetwork/GameSpy/PersistentStorageThread.h
+    Include/GameNetwork/GameSpy/PingThread.h
+    Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
+    Include/GameNetwork/GameSpy/ThreadUtils.h
+#    Include/GameNetwork/GameSpyChat.h # unused
+#    Include/GameNetwork/GameSpyGameInfo.h # unused
+#    Include/GameNetwork/GameSpyGP.h # unused
+    Include/GameNetwork/GameSpyOverlay.h
+    Include/GameNetwork/GameSpyThread.h
 #    Include/GameNetwork/GUIUtil.h
-#    Include/GameNetwork/IPEnumeration.h
-#    Include/GameNetwork/LANAPI.h
-#    Include/GameNetwork/LANAPICallbacks.h
-#    Include/GameNetwork/LANGameInfo.h
-#    Include/GameNetwork/LANPlayer.h
-#    Include/GameNetwork/NAT.h
-#    Include/GameNetwork/NetCommandList.h
-#    Include/GameNetwork/NetCommandMsg.h
-#    Include/GameNetwork/NetCommandRef.h
-#    Include/GameNetwork/NetCommandWrapperList.h
-#    Include/GameNetwork/NetPacket.h
-#    Include/GameNetwork/NetworkDefs.h
-#    Include/GameNetwork/NetworkInterface.h
-#    Include/GameNetwork/networkutil.h
-#    Include/GameNetwork/RankPointValue.h
-#    Include/GameNetwork/Transport.h
-#    Include/GameNetwork/udp.h
-#    Include/GameNetwork/User.h
-#    Include/GameNetwork/WOLBrowser/FEBDispatch.h
-#    Include/GameNetwork/WOLBrowser/WebBrowser.h
+    Include/GameNetwork/IPEnumeration.h
+    Include/GameNetwork/LANAPI.h
+    Include/GameNetwork/LANAPICallbacks.h
+    Include/GameNetwork/LANGameInfo.h
+    Include/GameNetwork/LANPlayer.h
+    Include/GameNetwork/NAT.h
+    Include/GameNetwork/NetCommandList.h
+    Include/GameNetwork/NetCommandMsg.h
+    Include/GameNetwork/NetCommandRef.h
+    Include/GameNetwork/NetCommandWrapperList.h
+    Include/GameNetwork/NetPacket.h
+    Include/GameNetwork/NetPacketStructs.h
+    Include/GameNetwork/NetworkDefs.h
+    Include/GameNetwork/NetworkInterface.h
+    Include/GameNetwork/networkutil.h
+    Include/GameNetwork/RankPointValue.h
+    Include/GameNetwork/Transport.h
+    Include/GameNetwork/udp.h
+    Include/GameNetwork/User.h
+    Include/GameNetwork/WOLBrowser/FEBDispatch.h
+    Include/GameNetwork/WOLBrowser/WebBrowser.h
 #    Include/Precompiled/PreRTS.h
-#    Source/Common/Audio/AudioEventRTS.cpp
-#    Source/Common/Audio/AudioRequest.cpp
-#    Source/Common/Audio/DynamicAudioEventInfo.cpp
-#    Source/Common/Audio/GameAudio.cpp
-#    Source/Common/Audio/GameMusic.cpp
-#    Source/Common/Audio/GameSounds.cpp
+    Source/Common/AddonCompat.cpp
+    Source/Common/Audio/AudioEventRTS.cpp
+    Source/Common/Audio/AudioRequest.cpp
+    Source/Common/Audio/DynamicAudioEventInfo.cpp
+    Source/Common/Audio/GameAudio.cpp
+    Source/Common/Audio/GameMusic.cpp
+    Source/Common/Audio/GameSounds.cpp
     #Source/Common/Audio/simpleplayer.cpp # unused
     #Source/Common/Audio/urllaunch.cpp # unused
 #    Source/Common/Bezier/BezFwdIterator.cpp
 #    Source/Common/Bezier/BezierSegment.cpp
 #    Source/Common/BitFlags.cpp
 #    Source/Common/CommandLine.cpp
-#    Source/Common/crc.cpp
-#    Source/Common/CRCDebug.cpp
+    Source/Common/crc.cpp
+    Source/Common/CRCDebug.cpp
 #    Source/Common/DamageFX.cpp
 #    Source/Common/Dict.cpp
 #    Source/Common/DiscreteCircle.cpp
+    Source/Common/FramePacer.cpp
+    Source/Common/FrameRateLimit.cpp
 #    Source/Common/GameEngine.cpp
 #    Source/Common/GameLOD.cpp
 #    Source/Common/GameMain.cpp
+    Source/Common/GameUtility.cpp
 #    Source/Common/GlobalData.cpp
 #    Source/Common/INI/INI.cpp
 #    Source/Common/INI/INIAiData.cpp
 #    Source/Common/INI/INIAnimation.cpp
-#    Source/Common/INI/INIAudioEventInfo.cpp
+    Source/Common/INI/INIAudioEventInfo.cpp
 #    Source/Common/INI/INICommandButton.cpp
 #    Source/Common/INI/INICommandSet.cpp
 #    Source/Common/INI/INIControlBarScheme.cpp
@@ -584,7 +596,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/INI/INIMapCache.cpp
 #    Source/Common/INI/INIMapData.cpp
 #    Source/Common/INI/INIMappedImage.cpp
-#    Source/Common/INI/INIMiscAudio.cpp
+    Source/Common/INI/INIMiscAudio.cpp
 #    Source/Common/INI/INIModel.cpp
 #    Source/Common/INI/INIMultiplayer.cpp
 #    Source/Common/INI/INIObject.cpp
@@ -594,7 +606,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/INI/INITerrainBridge.cpp
 #    Source/Common/INI/INITerrainRoad.cpp
 #    Source/Common/INI/INIUpgrade.cpp
-#    Source/Common/INI/INIVideo.cpp
+    Source/Common/INI/INIVideo.cpp
 #    Source/Common/INI/INIWater.cpp
 #    Source/Common/INI/INIWeapon.cpp
 #    Source/Common/INI/INIWebpageURL.cpp
@@ -605,8 +617,9 @@ set(GAMEENGINE_SRC
 #    Source/Common/NameKeyGenerator.cpp
 #    Source/Common/PartitionSolver.cpp
 #    Source/Common/PerfTimer.cpp
-#    Source/Common/RandomValue.cpp
+    Source/Common/RandomValue.cpp
 #    Source/Common/Recorder.cpp
+    Source/Common/ReplaySimulation.cpp
 #    Source/Common/RTS/AcademyStats.cpp
 #    Source/Common/RTS/ActionManager.cpp
 #    Source/Common/RTS/Energy.cpp
@@ -626,42 +639,43 @@ set(GAMEENGINE_SRC
 #    Source/Common/SkirmishBattleHonors.cpp
 #    Source/Common/StateMachine.cpp
 #    Source/Common/StatsCollector.cpp
-#    Source/Common/System/ArchiveFile.cpp
-#    Source/Common/System/ArchiveFileSystem.cpp
-#    Source/Common/System/AsciiString.cpp
+    Source/Common/System/ArchiveFile.cpp
+    Source/Common/System/ArchiveFileSystem.cpp
+    Source/Common/System/AsciiString.cpp
 #    Source/Common/System/BuildAssistant.cpp
 #    Source/Common/System/CDManager.cpp
 #    Source/Common/System/CriticalSection.cpp
 #    Source/Common/System/DataChunk.cpp
-#    Source/Common/System/Debug.cpp
+    Source/Common/System/Debug.cpp
 #    Source/Common/System/Directory.cpp
 #    Source/Common/System/DisabledTypes.cpp
 #    Source/Common/System/encrypt.cpp
-#    Source/Common/System/File.cpp
-#    Source/Common/System/FileSystem.cpp
+    Source/Common/System/File.cpp
+    Source/Common/System/FileSystem.cpp
 #    Source/Common/System/FunctionLexicon.cpp
 #    Source/Common/System/GameCommon.cpp
     #Source/Common/System/GameMemory.cpp # is conditionally appended
+    #Source/Common/System/GameMemoryInit.cpp # is conditionally appended
 #    Source/Common/System/GameType.cpp
 #    Source/Common/System/Geometry.cpp
 #    Source/Common/System/KindOf.cpp
 #    Source/Common/System/List.cpp
-#    Source/Common/System/LocalFile.cpp
-#    Source/Common/System/LocalFileSystem.cpp
-    #Source/Common/System/MemoryInit.cpp # is conditionally appended
-#    Source/Common/System/ObjectStatusTypes.cpp
+    Source/Common/System/LocalFile.cpp
+    Source/Common/System/LocalFileSystem.cpp
+    Source/Common/System/MiniDumper.cpp
+    Source/Common/System/ObjectStatusTypes.cpp
 #    Source/Common/System/QuotedPrintable.cpp
-#    Source/Common/System/Radar.cpp
-#    Source/Common/System/RAMFile.cpp
+    Source/Common/System/Radar.cpp
+    Source/Common/System/RAMFile.cpp
 #    Source/Common/System/registry.cpp
 #    Source/Common/System/SaveGame/GameState.cpp
 #    Source/Common/System/SaveGame/GameStateMap.cpp
 #    Source/Common/System/Snapshot.cpp
 #    Source/Common/System/StackDump.cpp
-#    Source/Common/System/StreamingArchiveFile.cpp
+    Source/Common/System/StreamingArchiveFile.cpp
 #    Source/Common/System/SubsystemInterface.cpp
 #    Source/Common/System/Trig.cpp
-#    Source/Common/System/UnicodeString.cpp
+    Source/Common/System/UnicodeString.cpp
 #    Source/Common/System/Upgrade.cpp
     Source/Common/System/Xfer.cpp
     Source/Common/System/XferCRC.cpp
@@ -676,6 +690,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/Thing/ThingTemplate.cpp
 #    Source/Common/UserPreferences.cpp
 #    Source/Common/version.cpp
+    Source/Common/WorkerProcess.cpp
 #    Source/GameClient/ClientInstance.cpp
 #    Source/GameClient/Color.cpp
 #    Source/GameClient/Credits.cpp
@@ -786,14 +801,14 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/GUI/Shell/Shell.cpp
 #    Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
 #    Source/GameClient/GUI/WindowLayout.cpp
-#    Source/GameClient/GUI/WindowVideoManager.cpp
+    Source/GameClient/GUI/WindowVideoManager.cpp
 #    Source/GameClient/GUI/WinInstanceData.cpp
 #    Source/GameClient/InGameUI.cpp
 #    Source/GameClient/Input/Keyboard.cpp
 #    Source/GameClient/Input/Mouse.cpp
 #    Source/GameClient/LanguageFilter.cpp
 #    Source/GameClient/Line2D.cpp
-#    Source/GameClient/MapUtil.cpp
+    Source/GameClient/MapUtil.cpp
 #    Source/GameClient/MessageStream/CommandXlat.cpp
 #    Source/GameClient/MessageStream/GUICommandTranslator.cpp
 #    Source/GameClient/MessageStream/HintSpy.cpp
@@ -803,25 +818,25 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/MessageStream/PlaceEventTranslator.cpp
 #    Source/GameClient/MessageStream/SelectionXlat.cpp
 #    Source/GameClient/MessageStream/WindowXlat.cpp
-#    Source/GameClient/ParabolicEase.cpp
+    Source/GameClient/ParabolicEase.cpp
 #    Source/GameClient/RadiusDecal.cpp
 #    Source/GameClient/SelectionInfo.cpp
-#    Source/GameClient/Snow.cpp
+    Source/GameClient/Snow.cpp
 #    Source/GameClient/Statistics.cpp
 #    Source/GameClient/System/Anim2D.cpp
 #    Source/GameClient/System/CampaignManager.cpp
-#    "Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp"
+    Source/GameClient/System/Debug/AudioDebugDisplay.cpp
 #    Source/GameClient/System/DebugDisplay.cpp
 #    Source/GameClient/System/Image.cpp
 #    Source/GameClient/System/ParticleSys.cpp
 #    Source/GameClient/System/RayEffect.cpp
-#    Source/GameClient/System/Smudge.cpp
-#    Source/GameClient/Terrain/TerrainRoads.cpp
-#    Source/GameClient/Terrain/TerrainVisual.cpp
-#    Source/GameClient/VideoPlayer.cpp
-#    Source/GameClient/VideoStream.cpp
-#    Source/GameClient/View.cpp
-#    Source/GameClient/Water.cpp
+    Source/GameClient/System/Smudge.cpp
+    Source/GameClient/Terrain/TerrainRoads.cpp
+    Source/GameClient/Terrain/TerrainVisual.cpp
+    Source/GameClient/VideoPlayer.cpp
+    Source/GameClient/VideoStream.cpp
+    Source/GameClient/View.cpp
+    Source/GameClient/Water.cpp
 #    Source/GameLogic/AI/AI.cpp
 #    Source/GameLogic/AI/AIDock.cpp
 #    Source/GameLogic/AI/AIGroup.cpp
@@ -1081,67 +1096,71 @@ set(GAMEENGINE_SRC
 #    Source/GameLogic/System/GameLogic.cpp
 #    Source/GameLogic/System/GameLogicDispatch.cpp
 #    Source/GameLogic/System/RankInfo.cpp
-#    Source/GameNetwork/Connection.cpp
-#    Source/GameNetwork/ConnectionManager.cpp
-#    Source/GameNetwork/DisconnectManager.cpp
-#    Source/GameNetwork/DownloadManager.cpp
-#    Source/GameNetwork/FileTransfer.cpp
-#    Source/GameNetwork/FirewallHelper.cpp
-#    Source/GameNetwork/FrameData.cpp
-#    Source/GameNetwork/FrameDataManager.cpp
-#    Source/GameNetwork/FrameMetrics.cpp
-#    Source/GameNetwork/GameInfo.cpp
-#    Source/GameNetwork/GameMessageParser.cpp
+    Source/GameNetwork/Connection.cpp
+    Source/GameNetwork/ConnectionManager.cpp
+    Source/GameNetwork/DisconnectManager.cpp
+    Source/GameNetwork/DownloadManager.cpp
+    Source/GameNetwork/FileTransfer.cpp
+    Source/GameNetwork/FirewallHelper.cpp
+    Source/GameNetwork/FrameData.cpp
+    Source/GameNetwork/FrameDataManager.cpp
+    Source/GameNetwork/FrameMetrics.cpp
+    Source/GameNetwork/GameInfo.cpp
+    Source/GameNetwork/GameMessageParser.cpp
     #Source/GameNetwork/GameSpyChat.cpp # unused
     #Source/GameNetwork/GameSpyGameInfo.cpp # unused
     #Source/GameNetwork/GameSpyGP.cpp # unused
-#    Source/GameNetwork/GameSpy/Chat.cpp
-#    Source/GameNetwork/GameSpy/GSConfig.cpp
-#    Source/GameNetwork/GameSpy/LadderDefs.cpp
-#    Source/GameNetwork/GameSpy/LobbyUtils.cpp
-#    Source/GameNetwork/GameSpy/MainMenuUtils.cpp
-#    Source/GameNetwork/GameSpy/PeerDefs.cpp
-#    Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
-#    Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
-#    Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
-#    Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
-#    Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
-#    Source/GameNetwork/GameSpy/Thread/PingThread.cpp
-#    Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
-#    Source/GameNetwork/GameSpyOverlay.cpp
+    Source/GameNetwork/GameSpy/Chat.cpp
+    Source/GameNetwork/GameSpy/GSConfig.cpp
+    Source/GameNetwork/GameSpy/LadderDefs.cpp
+    Source/GameNetwork/GameSpy/LobbyUtils.cpp
+    Source/GameNetwork/GameSpy/MainMenuUtils.cpp
+    Source/GameNetwork/GameSpy/PeerDefs.cpp
+    Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
+    Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
+    Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
+    Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
+    Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
+    Source/GameNetwork/GameSpy/Thread/PingThread.cpp
+    Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
+    Source/GameNetwork/GameSpyOverlay.cpp
 #    Source/GameNetwork/GUIUtil.cpp
-#    Source/GameNetwork/IPEnumeration.cpp
-#    Source/GameNetwork/LANAPI.cpp
-#    Source/GameNetwork/LANAPICallbacks.cpp
-#    Source/GameNetwork/LANAPIhandlers.cpp
-#    Source/GameNetwork/LANGameInfo.cpp
-#    Source/GameNetwork/NAT.cpp
-#    Source/GameNetwork/NetCommandList.cpp
-#    Source/GameNetwork/NetCommandMsg.cpp
-#    Source/GameNetwork/NetCommandRef.cpp
-#    Source/GameNetwork/NetCommandWrapperList.cpp
-#    Source/GameNetwork/NetMessageStream.cpp
-#    Source/GameNetwork/NetPacket.cpp
-#    Source/GameNetwork/Network.cpp
-#    Source/GameNetwork/NetworkUtil.cpp
-#    Source/GameNetwork/Transport.cpp
-#    Source/GameNetwork/udp.cpp
-#    Source/GameNetwork/User.cpp
-#    Source/GameNetwork/WOLBrowser/WebBrowser.cpp
+    Source/GameNetwork/IPEnumeration.cpp
+    Source/GameNetwork/LANAPI.cpp
+    Source/GameNetwork/LANAPICallbacks.cpp
+    Source/GameNetwork/LANAPIhandlers.cpp
+    Source/GameNetwork/LANGameInfo.cpp
+    Source/GameNetwork/NAT.cpp
+    Source/GameNetwork/NetCommandList.cpp
+    Source/GameNetwork/NetCommandMsg.cpp
+    Source/GameNetwork/NetCommandRef.cpp
+    Source/GameNetwork/NetCommandWrapperList.cpp
+    Source/GameNetwork/NetMessageStream.cpp
+    Source/GameNetwork/NetPacket.cpp
+    Source/GameNetwork/Network.cpp
+    Source/GameNetwork/NetworkUtil.cpp
+    Source/GameNetwork/Transport.cpp
+    Source/GameNetwork/udp.cpp
+    Source/GameNetwork/User.cpp
+    Source/GameNetwork/WOLBrowser/WebBrowser.cpp
 #    Source/Precompiled/PreRTS.cpp
 )
 
 if(RTS_GAMEMEMORY_ENABLE)
     # Uses the original Game Memory implementation.
     list(APPEND GAMEENGINE_SRC
-#        Source/Common/System/GameMemory.cpp
-#        Source/Common/System/MemoryInit.cpp
+        Source/Common/System/GameMemory.cpp
+        Source/Common/System/GameMemoryInit.cpp
+        Source/Common/System/GameMemoryInitDMA_Generals.inl
+        Source/Common/System/GameMemoryInitDMA_GeneralsMD.inl
+        Source/Common/System/GameMemoryInitPools_Generals.inl
+        Source/Common/System/GameMemoryInitPools_GeneralsMD.inl
     )
 else()
     # Uses the null implementation when disabled.
     list(APPEND GAMEENGINE_SRC
-#        Source/Common/System/GameMemoryNull.cpp
-#        Include/Common/GameMemoryNull.h
+        Source/Common/System/GameMemoryNull.cpp
+        Include/Common/GameMemoryNull.h
     )
 endif()
 
diff --git a/Core/GameEngine/Include/Common/AddonCompat.h b/Core/GameEngine/Include/Common/AddonCompat.h
new file mode 100644
index 00000000000..7b8bc2c9e97
--- /dev/null
+++ b/Core/GameEngine/Include/Common/AddonCompat.h
@@ -0,0 +1,25 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+namespace addon
+{
+extern Bool HasFullviewportDat();
+
+} // namespace addon
diff --git a/Core/GameEngine/Include/Common/ArchiveFile.h b/Core/GameEngine/Include/Common/ArchiveFile.h
new file mode 100644
index 00000000000..7c3d1c7a8fb
--- /dev/null
+++ b/Core/GameEngine/Include/Common/ArchiveFile.h
@@ -0,0 +1,72 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+/////// ArchiveFile.h ////////////////////
+// Bryan Cleveland, August 2002
+//////////////////////////////////////////
+
+#pragma once
+
+#include "Lib/BaseType.h"
+#include "Common/AsciiString.h"
+#include "Common/ArchiveFileSystem.h"
+
+class File;
+
+/**
+  *	An archive file is itself a collection of sub files. Each file inside the archive file
+	* has a unique name by which it can be accessed. The ArchiveFile object class is the
+	* runtime interface to the mix file and the sub files. Each file inside the mix
+	* file can be accessed by the openFile().
+	*
+	* ArchiveFile interfaces can be created by the TheArchiveFileSystem object.
+	*/
+//===============================
+
+class ArchiveFile
+{
+public:
+	ArchiveFile();
+	virtual ~ArchiveFile();
+
+	virtual Bool					getFileInfo( const AsciiString& filename, FileInfo *fileInfo) const = 0;	///< fill in the fileInfo struct with info about the file requested.
+	virtual File*					openFile( const Char *filename, Int access = 0) = 0;	///< Open the specified file within the archive file
+	virtual void					closeAllFiles( void ) = 0;									///< Close all file opened in this archive file
+	virtual AsciiString		getName( void ) = 0;												///< Returns the name of the archive file
+	virtual AsciiString		getPath( void ) = 0;												///< Returns full path and name of archive file
+	virtual void					setSearchPriority( Int new_priority ) = 0;	///< Set this archive file's search priority
+	virtual void					close( void ) = 0;													///< Close this archive file
+	void									attachFile(File *file);
+
+	void									getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
+	void									getFileListInDirectory(const DetailedArchivedDirectoryInfo *dirInfo, const AsciiString& currentDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
+
+	void									addFile(const AsciiString& path, const ArchivedFileInfo *fileInfo); ///< add this file to our directory tree.
+
+protected:
+	const ArchivedFileInfo *		getArchivedFileInfo(const AsciiString& filename) const;	///< return the ArchivedFileInfo from the directory tree.
+
+	File *m_file; ///< file pointer to the archive file on disk.  Kept open so we don't have to continuously open and close the file all the time.
+	DetailedArchivedDirectoryInfo m_rootDirectory;
+};
diff --git a/Core/GameEngine/Include/Common/ArchiveFileSystem.h b/Core/GameEngine/Include/Common/ArchiveFileSystem.h
new file mode 100644
index 00000000000..a482e593b99
--- /dev/null
+++ b/Core/GameEngine/Include/Common/ArchiveFileSystem.h
@@ -0,0 +1,179 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:    Generals
+//
+// Module:     Archive files
+//
+// File name:  Common/ArchiveFileSystem.h
+//
+// Created:    11/26/01 TR
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+#define MUSIC_BIG "Music.big"
+
+//----------------------------------------------------------------------------
+//           Includes
+//----------------------------------------------------------------------------
+
+#include "Common/SubsystemInterface.h"
+#include "Common/AsciiString.h"
+#include "Common/FileSystem.h" // for typedefs, etc.
+#include "Common/STLTypedefs.h"
+
+//----------------------------------------------------------------------------
+//           Forward References
+//----------------------------------------------------------------------------
+
+class File;
+class ArchiveFile;
+
+//----------------------------------------------------------------------------
+//           Type Defines
+//----------------------------------------------------------------------------
+
+
+//===============================
+// ArchiveFileSystem
+//===============================
+/**
+  *	Creates and manages ArchiveFile interfaces. ArchiveFiles can be accessed
+	* by calling the openArchiveFile() member. ArchiveFiles can be accessed by
+	* name or by File interface.
+	*
+	* openFile() member searches all Archive files for the specified sub file.
+	*/
+//===============================
+class ArchivedDirectoryInfo;
+class DetailedArchivedDirectoryInfo;
+class ArchivedFileInfo;
+
+typedef std::map<AsciiString, DetailedArchivedDirectoryInfo> DetailedArchivedDirectoryInfoMap; // Archived directory name to detailed archived directory info
+typedef std::map<AsciiString, ArchivedDirectoryInfo> ArchivedDirectoryInfoMap; // Archived directory name to archived directory info
+typedef std::map<AsciiString, ArchivedFileInfo> ArchivedFileInfoMap; // Archived file name to archived file info
+typedef std::map<AsciiString, ArchiveFile *> ArchiveFileMap; // Archive file name to archive data
+typedef std::multimap<AsciiString, ArchiveFile *> ArchivedFileLocationMap; // Archived file name to archive data
+
+class ArchivedDirectoryInfo
+{
+public:
+	AsciiString								m_path; // The full path to this directory
+	AsciiString								m_directoryName; // The current directory
+	ArchivedDirectoryInfoMap	m_directories; // Contained leaf directories
+	ArchivedFileLocationMap		m_files; // Contained files
+};
+
+class DetailedArchivedDirectoryInfo
+{
+public:
+	AsciiString												m_directoryName;
+	DetailedArchivedDirectoryInfoMap	m_directories;
+	ArchivedFileInfoMap								m_files;
+};
+
+class ArchivedFileInfo
+{
+public:
+	AsciiString m_filename;
+	AsciiString m_archiveFilename;
+	UnsignedInt m_offset;
+	UnsignedInt m_size;
+
+	ArchivedFileInfo()
+		: m_offset(0)
+		, m_size(0)
+	{
+	}
+};
+
+
+class ArchiveFileSystem : public SubsystemInterface
+{
+public:
+	ArchiveFileSystem();
+	virtual ~ArchiveFileSystem();
+
+	virtual void init( void ) = 0;
+	virtual void update( void ) = 0;
+	virtual void reset( void ) = 0;
+	virtual void postProcessLoad( void ) = 0;
+
+	// ArchiveFile operations
+	virtual ArchiveFile*	openArchiveFile( const Char *filename ) = 0;		///< Create new or return existing Archive file from file name
+	virtual void					closeArchiveFile( const Char *filename ) = 0;		///< Close the one specified big file.
+	virtual void					closeAllArchiveFiles( void ) = 0;								///< Close all Archive files currently open
+
+	// File operations
+	virtual File*					openFile( const Char *filename, Int access = 0, FileInstance instance = 0);	///< Search Archive files for specified file name and open it if found
+	virtual void					closeAllFiles( void ) = 0;									///< Close all files associated with Archive files
+	virtual Bool					doesFileExist(const Char *filename, FileInstance instance = 0) const;	///< return true if that file exists in an archive file somewhere.
+
+	void					getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.  Scans each Archive file.
+	Bool					getFileInfo(const AsciiString& filename, FileInfo *fileInfo, FileInstance instance = 0) const; ///< see FileSystem.h
+
+	virtual Bool	loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) = 0;
+
+	// Unprotected this for copy-protection routines
+	ArchiveFile* getArchiveFile(const AsciiString& filename, FileInstance instance = 0) const;
+
+	void loadMods( void );
+
+	ArchivedDirectoryInfo* friend_getArchivedDirectoryInfo(const Char* directory);
+
+protected:
+	struct ArchivedDirectoryInfoResult
+	{
+		ArchivedDirectoryInfoResult() : dirInfo(NULL) {}
+		Bool valid() const { return dirInfo != NULL; }
+
+		ArchivedDirectoryInfo* dirInfo;
+		AsciiString lastToken; ///< Synonymous for file name if the search directory was a file path
+	};
+
+	ArchivedDirectoryInfoResult getArchivedDirectoryInfo(const Char* directory);
+
+	virtual void loadIntoDirectoryTree(ArchiveFile *archiveFile, Bool overwrite = FALSE);	///< load the archive file's header information and apply it to the global archive directory tree.
+
+	ArchiveFileMap m_archiveFileMap;
+	ArchivedDirectoryInfo m_rootDirectory;
+};
+
+
+extern ArchiveFileSystem *TheArchiveFileSystem;
+
+//----------------------------------------------------------------------------
+//           Inlining
+//----------------------------------------------------------------------------
diff --git a/Core/GameEngine/Include/Common/AsciiString.h b/Core/GameEngine/Include/Common/AsciiString.h
new file mode 100644
index 00000000000..5af9cbe130e
--- /dev/null
+++ b/Core/GameEngine/Include/Common/AsciiString.h
@@ -0,0 +1,596 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: AsciiString.h
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:    RTS3
+//
+// File name:  AsciiString.h
+//
+// Created:    Steven Johnson, October 2001
+//
+// Desc:       General-purpose string classes
+//
+//-----------------------------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include <stdarg.h>
+#include "Lib/BaseType.h"
+#include "Common/Debug.h"
+#include "Common/Errors.h"
+
+class UnicodeString;
+
+// -----------------------------------------------------
+/**
+	AsciiString is the fundamental single-byte string type used in the Generals
+	code base, and should be preferred over all other string constructions
+	(e.g., array of char, STL string<>, WWVegas StringClass, etc.)
+
+	Of course, other string setups may be used when necessary or appropriate!
+
+	AsciiString is modeled after the MFC CString class, with some minor
+	syntactic differences to keep in line with our coding conventions.
+
+	Basically, AsciiString allows you to treat a string as an intrinsic
+	type, rather analogous to 'int' -- when passed by value, a new string
+	is created, and modifying the new string doesn't modify the original.
+	This is done fairly efficiently, so that no new memory allocation is done
+	unless the string is actually modified.
+
+	Naturally, AsciiString handles all memory issues, so there's no need
+	to do anything to free memory... just allow the AsciiString's
+	destructor to run.
+
+	AsciiStrings are suitable for use as automatic, member, or static variables.
+*/
+
+class AsciiString
+{
+private:
+
+	// Note, this is a Plain Old Data Structure... don't
+	// add a ctor/dtor, 'cuz they won't ever be called.
+	struct AsciiStringData
+	{
+#if defined(RTS_DEBUG)
+		const char* m_debugptr;	// just makes it easier to read in the debugger
+#endif
+		unsigned short	m_refCount;						// reference count
+		unsigned short	m_numCharsAllocated;  // length of data allocated
+		// char m_stringdata[];
+
+		char* peek() { return (char*)(this+1); }
+	};
+
+	#ifdef RTS_DEBUG
+	void validate() const;
+	#else
+	void validate() const { }
+	#endif
+
+protected:
+	AsciiStringData* m_data;   // pointer to ref counted string data
+
+	char* peek() const;
+	void releaseBuffer();
+	void ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData, const char* strToCpy, const char* strToCat);
+
+public:
+
+	typedef Char value_type;
+	typedef value_type* pointer;
+	typedef const value_type* const_pointer;
+
+	enum
+	{
+		MAX_FORMAT_BUF_LEN = 2048,		///< max total len of string created by format/format_va
+		MAX_LEN = 32767							///< max total len of any AsciiString, in chars
+	};
+
+
+	/**
+		This is a convenient global used to indicate the empty
+		string, so we don't need to construct temporaries
+		for such a common thing.
+	*/
+	static const AsciiString TheEmptyString;
+
+	/**
+		Default constructor -- construct a new, empty AsciiString.
+	*/
+	AsciiString();
+	/**
+		Copy constructor -- make this AsciiString identical to the
+		other AsciiString. (This is actually quite efficient, because
+		they will simply share the same string and increment the
+		refcount.)
+	*/
+	AsciiString(const AsciiString& stringSrc);
+	/**
+		Constructor -- from a literal string. Constructs an AsciiString
+		with the given string. Note that a copy of the string is made;
+		the input ptr is not saved.
+		Note that this is no longer explicit, as the conversion is almost
+		always wanted, anyhow.
+	*/
+	AsciiString(const char* s);
+
+	/**
+		Constructs an AsciiString with the given string and length.
+		The length must not be larger than the actual string length.
+	*/
+	AsciiString(const char* s, int len);
+
+	/**
+		Destructor. Not too exciting... clean up the works and such.
+	*/
+	~AsciiString();
+
+	/**
+		Return the length, in characters, of the string up to the first zero or null terminator.
+	*/
+	int getLength() const;
+
+	/**
+		Return the number of bytes used by the string up to the first zero or null terminator.
+	*/
+	int getByteCount() const;
+	/**
+		Return true iff the length of the string is zero. Equivalent
+		to (getLength() == 0) but slightly more efficient.
+	*/
+	Bool isEmpty() const;
+	/**
+		Make the string empty. Equivalent to (str = "") but slightly more efficient.
+	*/
+	void clear();
+
+	/**
+		Return the character and the given (zero-based) index into the string.
+		No range checking is done (except in debug mode).
+	*/
+	char getCharAt(int index) const;
+	/**
+		Return a pointer to the (null-terminated) string. Note that this is
+		a const pointer: do NOT change this! It is imperative that it be
+		impossible (or at least, really difficuly) for someone to change our
+		private data, since it might be shared amongst other AsciiStrings.
+	*/
+	const char* str() const;
+
+	/**
+		Makes sure there is room for a string of len+1 characters, and
+		returns a pointer to the string buffer.  This ensures that the
+		string buffer is NOT shared.  This is intended for the file reader,
+		that is reading new strings in from a file. jba.
+	*/
+	char* getBufferForRead(Int len);
+
+	/**
+		Replace the contents of self with the given string.
+		(This is actually quite efficient, because
+		they will simply share the same string and increment the
+		refcount.)
+	*/
+	void set(const AsciiString& stringSrc);
+
+	/**
+		Replace the contents of self with the given string.
+		Note that a copy of the string is made; the input ptr is not saved.
+	*/
+	void set(const char* s);
+
+	/**
+		Replace the contents of self with the given string and length.
+		Note that a copy of the string is made; the input ptr is not saved.
+		The length must not be larger than the actual string length.
+	*/
+	void set(const char* s, int len);
+
+	/**
+		replace contents of self with the given string. Note the
+		nomenclature is translate rather than set; this is because
+		not all single-byte strings translate one-for-one into
+		UnicodeStrings, so some data manipulation may be necessary,
+		and the resulting strings may not be equivalent.
+	*/
+	void translate(const UnicodeString& stringSrc);
+
+	/**
+		Concatenate the given string onto self.
+	*/
+	void concat(const AsciiString& stringSrc);
+	/**
+		Concatenate the given string onto self.
+	*/
+	void concat(const char* s);
+	/**
+		Concatenate the given character onto self.
+	*/
+	void concat(const char c);
+
+	/**
+	  Remove leading and trailing whitespace from the string.
+	*/
+	void trim( void );
+
+	/**
+	  Remove trailing whitespace from the string.
+	*/
+	void trimEnd(void);
+
+	/**
+	  Remove all consecutive occurances of c from the end of the string.
+	*/
+	void trimEnd(const char c);
+
+	/**
+	  Make the string lowercase
+	*/
+	void toLower( void );
+
+	/**
+		Remove the final character in the string. If the string is empty,
+		do nothing. (This is a rather dorky method, but used a lot in
+		text editing, thus its presence here.)
+	*/
+	void removeLastChar();
+
+	/**
+		Remove the final charCount characters in the string. If the string is empty,
+		do nothing.
+	*/
+	void truncateBy(const Int charCount);
+
+	/**
+		Truncate the string to a length of maxLength characters, not including null termination,
+		by removing from the end. If the string is empty or shorter than maxLength, do nothing.
+	*/
+	void truncateTo(const Int maxLength);
+
+	/**
+		Analogous to sprintf() -- this formats a string according to the
+		given sprintf-style format string (and the variable argument list)
+		and stores the result in self.
+	*/
+	void format(AsciiString format, ...);
+	void format(const char* format, ...);
+	/**
+		Identical to format(), but takes a va_list rather than
+		a variable argument list. (i.e., analogous to vsprintf.)
+	*/
+	void format_va(const AsciiString& format, va_list args);
+	void format_va(const char* format, va_list args);
+
+	/**
+		Conceptually identical to strcmp().
+	*/
+	int compare(const AsciiString& stringSrc) const;
+	/**
+		Conceptually identical to strcmp().
+	*/
+	int compare(const char* s) const;
+	/**
+		Conceptually identical to _stricmp().
+	*/
+	int compareNoCase(const AsciiString& stringSrc) const;
+	/**
+		Conceptually identical to _stricmp().
+	*/
+	int compareNoCase(const char* s) const;
+
+	/**
+		Conceptually identical to strchr().
+	*/
+	const char* find(char c) const;
+
+	/**
+		Conceptually identical to strrchr().
+	*/
+	const char* reverseFind(char c) const;
+
+	/**
+		return true iff self starts with the given string.
+	*/
+	Bool startsWith(const char* p) const;
+	Bool startsWith(const AsciiString& stringSrc) const { return startsWith(stringSrc.str()); }
+
+	/**
+		return true iff self starts with the given string. (case insensitive)
+	*/
+	Bool startsWithNoCase(const char* p) const;
+	Bool startsWithNoCase(const AsciiString& stringSrc) const { return startsWithNoCase(stringSrc.str()); }
+
+	/**
+		return true iff self ends with the given string.
+	*/
+	Bool endsWith(const char* p) const;
+	Bool endsWith(const AsciiString& stringSrc) const { return endsWith(stringSrc.str()); }
+
+	/**
+		return true iff self ends with the given string. (case insensitive)
+	*/
+	Bool endsWithNoCase(const char* p) const;
+	Bool endsWithNoCase(const AsciiString& stringSrc) const { return endsWithNoCase(stringSrc.str()); }
+
+	/**
+		conceptually similar to strtok():
+
+		extract the next seps-delimited token from the front
+		of 'this' and copy it into 'token', returning true if a nonempty
+		token was found. (note that this modifies 'this' as well, stripping
+		the token off!)
+	*/
+	Bool nextToken(AsciiString* token, const char* seps = NULL);
+
+	/**
+		return true iff the string is "NONE" (case-insensitive).
+		Hey, hokey, but we use it a ton.
+	*/
+	Bool isNone() const;
+
+	Bool isNotEmpty() const { return !isEmpty(); }
+	Bool isNotNone() const { return !isNone(); }
+
+//
+// You might think it would be a good idea to overload the * operator
+// to allow for an implicit conversion to an char*. This is
+// (in theory) a good idea, but in practice, there's lots of code
+// that assumes it should check text fields for null, which
+// is meaningless for us, since we never return a null ptr.
+//
+//	operator const char*() const { return str(); }
+//
+
+	AsciiString& operator=(const AsciiString& stringSrc);	///< the same as set()
+	AsciiString& operator=(const char* s);				///< the same as set()
+
+	void debugIgnoreLeaks();
+
+};
+
+// -----------------------------------------------------
+inline char* AsciiString::peek() const
+{
+	DEBUG_ASSERTCRASH(m_data, ("null string ptr"));
+	validate();
+	return m_data->peek();
+}
+
+// -----------------------------------------------------
+inline AsciiString::AsciiString() : m_data(0)
+{
+	validate();
+}
+
+// -----------------------------------------------------
+inline AsciiString::~AsciiString()
+{
+	validate();
+	releaseBuffer();
+}
+
+// -----------------------------------------------------
+inline int AsciiString::getLength() const
+{
+	validate();
+	return m_data ? strlen(peek()) : 0;
+}
+
+// -----------------------------------------------------
+inline int AsciiString::getByteCount() const
+{
+	validate();
+	return m_data ? getLength() : 0;
+}
+
+// -----------------------------------------------------
+inline Bool AsciiString::isEmpty() const
+{
+	validate();
+	return m_data == NULL || peek()[0] == 0;
+}
+
+// -----------------------------------------------------
+inline void AsciiString::clear()
+{
+	validate();
+	releaseBuffer();
+	validate();
+}
+
+// -----------------------------------------------------
+inline char AsciiString::getCharAt(int index) const
+{
+	DEBUG_ASSERTCRASH(index >= 0 && index < getLength(), ("bad index in getCharAt"));
+	validate();
+	return m_data ? peek()[index] : 0;
+}
+
+// -----------------------------------------------------
+inline const char* AsciiString::str() const
+{
+	validate();
+	static const char TheNullChr = 0;
+	return m_data ? peek() : &TheNullChr;
+}
+
+// -----------------------------------------------------
+inline AsciiString& AsciiString::operator=(const AsciiString& stringSrc)
+{
+	validate();
+	set(stringSrc);
+	validate();
+	return *this;
+}
+
+// -----------------------------------------------------
+inline AsciiString& AsciiString::operator=(const char* s)
+{
+	validate();
+	set(s);
+	validate();
+	return *this;
+}
+
+// -----------------------------------------------------
+inline void AsciiString::concat(const AsciiString& stringSrc)
+{
+	validate();
+	concat(stringSrc.str());
+	validate();
+}
+
+// -----------------------------------------------------
+inline void AsciiString::concat(const char c)
+{
+	validate();
+	/// this can probably be made more efficient, if necessary
+	char tmp[2] = { c, 0 };
+	concat(tmp);
+	validate();
+}
+
+// -----------------------------------------------------
+inline int AsciiString::compare(const AsciiString& stringSrc) const
+{
+	validate();
+	return strcmp(this->str(), stringSrc.str());
+}
+
+// -----------------------------------------------------
+inline int AsciiString::compare(const char* s) const
+{
+	validate();
+	return strcmp(this->str(), s);
+}
+
+// -----------------------------------------------------
+inline int AsciiString::compareNoCase(const AsciiString& stringSrc) const
+{
+	validate();
+	return _stricmp(this->str(), stringSrc.str());
+}
+
+// -----------------------------------------------------
+inline int AsciiString::compareNoCase(const char* s) const
+{
+	validate();
+	return _stricmp(this->str(), s);
+}
+
+// -----------------------------------------------------
+inline const char* AsciiString::find(char c) const
+{
+	return strchr(this->str(), c);
+}
+
+// -----------------------------------------------------
+inline const char* AsciiString::reverseFind(char c) const
+{
+	return strrchr(this->str(), c);
+}
+
+// -----------------------------------------------------
+inline Bool operator==(const AsciiString& s1, const AsciiString& s2)
+{
+	return strcmp(s1.str(), s2.str()) == 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator!=(const AsciiString& s1, const AsciiString& s2)
+{
+	return strcmp(s1.str(), s2.str()) != 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator<(const AsciiString& s1, const AsciiString& s2)
+{
+	return strcmp(s1.str(), s2.str()) < 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator<=(const AsciiString& s1, const AsciiString& s2)
+{
+	return strcmp(s1.str(), s2.str()) <= 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator>(const AsciiString& s1, const AsciiString& s2)
+{
+	return strcmp(s1.str(), s2.str()) > 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator>=(const AsciiString& s1, const AsciiString& s2)
+{
+	return strcmp(s1.str(), s2.str()) >= 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator==(const AsciiString& s1, const char* s2)
+{
+	return strcmp(s1.str(), s2) == 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator!=(const AsciiString& s1, const char* s2)
+{
+	return strcmp(s1.str(), s2) != 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator<(const AsciiString& s1, const char* s2)
+{
+	return strcmp(s1.str(), s2) < 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator<=(const AsciiString& s1, const char* s2)
+{
+	return strcmp(s1.str(), s2) <= 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator>(const AsciiString& s1, const char* s2)
+{
+	return strcmp(s1.str(), s2) > 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator>=(const AsciiString& s1, const char* s2)
+{
+	return strcmp(s1.str(), s2) >= 0;
+}
diff --git a/Core/GameEngine/Include/Common/AudioAffect.h b/Core/GameEngine/Include/Common/AudioAffect.h
new file mode 100644
index 00000000000..f58cb9e18b2
--- /dev/null
+++ b/Core/GameEngine/Include/Common/AudioAffect.h
@@ -0,0 +1,44 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// EA Pacific
+// John McDonald, Jr
+// Do not distribute
+
+#pragma once
+
+#include <Lib/BaseType.h>
+
+// if it is set by the options panel, use the system setting parameter. Otherwise, this will be
+// appended to whatever the current system volume is.
+enum AudioAffect CPP_11(: Int)
+{
+	AudioAffect_Music		= 0x01,
+	AudioAffect_Sound		= 0x02,
+	AudioAffect_Sound3D	= 0x04,
+	AudioAffect_Speech	= 0x08,
+	AudioAffect_All			= (AudioAffect_Music | AudioAffect_Sound | AudioAffect_Sound3D | AudioAffect_Speech),
+
+	AudioAffect_SystemSetting = 0x10,
+};
diff --git a/Core/GameEngine/Include/Common/AudioEventInfo.h b/Core/GameEngine/Include/Common/AudioEventInfo.h
new file mode 100644
index 00000000000..ff412fcb6f4
--- /dev/null
+++ b/Core/GameEngine/Include/Common/AudioEventInfo.h
@@ -0,0 +1,135 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: AudioEventInfo.h /////////////////////////////////////////////////////////////////////////
+// AudioEventInfo structure
+// Author: John K. McDonald, March 2002
+
+#pragma once
+
+#include "Common/AsciiString.h"
+#include "Common/GameMemory.h"
+#include "Common/STLTypedefs.h"
+
+// DEFINES
+#define NO_INTENSIVE_AUDIO_DEBUG
+
+// FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
+struct FieldParse;
+
+// USEFUL DECLARATIONS ////////////////////////////////////////////////////////////////////////////
+enum AudioType CPP_11(: Int)
+{
+	AT_Music,
+	AT_Streaming,
+	AT_SoundEffect
+};
+
+extern const char* const theAudioPriorityNames[];
+enum AudioPriority CPP_11(: Int)
+{
+	AP_LOWEST,
+	AP_LOW,
+	AP_NORMAL,
+	AP_HIGH,
+	AP_CRITICAL,
+
+	AP_COUNT
+};
+
+extern const char *const theSoundTypeNames[];
+enum SoundType CPP_11(: Int)
+{
+	ST_UI										= 0x0001,
+	ST_WORLD								= 0x0002,
+	ST_SHROUDED							= 0x0004,
+	ST_GLOBAL								= 0x0008,
+	ST_VOICE								= 0x0010,
+	ST_PLAYER								= 0x0020,
+	ST_ALLIES								= 0x0040,
+	ST_ENEMIES							= 0x0080,
+	ST_EVERYONE							= 0x0100,
+};
+
+extern const char *const theAudioControlNames[];
+enum AudioControl CPP_11(: Int)
+{
+	AC_LOOP									= 0x0001,
+	AC_RANDOM								= 0x0002,
+	AC_ALL									= 0x0004,
+	AC_POSTDELAY						= 0x0008,
+	AC_INTERRUPT						= 0x0010,
+};
+
+class DynamicAudioEventInfo;
+
+struct AudioEventInfo : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AudioEventInfo, "AudioEventInfo" )
+
+public:
+	AsciiString m_audioName;	// This name matches the name of the AudioEventRTS
+	AsciiString m_filename;		// For music tracks, this is the filename of the track
+
+	Real m_volume;						// Desired volume of this audio
+	Real m_volumeShift;				// Desired volume shift of the audio
+	Real m_minVolume;					// Clamped minimum value, useful when muting sound effects
+	Real m_pitchShiftMin;			// minimum pitch shift value
+	Real m_pitchShiftMax;			// maximum pitch shift value
+	Int m_delayMin;						// minimum delay before we'll fire up another one of these
+	Int m_delayMax;						// maximum delay before we'll fire up another one of these
+	Int m_limit;							// Limit to the number of these sounds that can be fired up simultaneously
+	Int m_loopCount;					// number of times to loop this sound
+
+	AudioPriority m_priority;	// Priority of this sound
+	UnsignedInt m_type;								// Type of sound
+	UnsignedInt m_control;						// control of sound
+
+	std::vector<AsciiString> m_soundsMorning;	// Sounds to play in the wee hours of the morning
+	std::vector<AsciiString> m_sounds;				// Default sounds to play
+	std::vector<AsciiString> m_soundsNight;		// Sounds to play at night
+	std::vector<AsciiString> m_soundsEvening;	// Sounds to play in the evening
+
+	std::vector<AsciiString> m_attackSounds;
+	std::vector<AsciiString> m_decaySounds;
+
+	Real m_lowPassFreq;			// When performing low pass filters, what is the maximum frequency heard, expressed as a percentage?
+	Real m_minDistance;			// less than this distance and the sound behaves as though it is at minDistance
+	Real m_maxDistance;			// greater than this distance and the sound behaves as though it is muted
+
+	AudioType m_soundType;	// This should be either Music, Streaming or SoundEffect
+
+
+  // DynamicAudioEventInfo interfacing functions
+  virtual Bool isLevelSpecific() const { return false; } ///< If true, this sound is only defined on the current level and can be deleted when that level ends
+  virtual DynamicAudioEventInfo * getDynamicAudioEventInfo() { return NULL; }  ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
+  virtual const DynamicAudioEventInfo * getDynamicAudioEventInfo() const { return NULL; } ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
+
+  /// Is this a permenant sound? That is, if I start this sound up, will it ever end
+  /// "on its own" or only if I explicitly kill it?
+  Bool isPermanentSound() const { return BitIsSet( m_control, AC_LOOP ) && (m_loopCount == 0 );  }
+
+	static const FieldParse m_audioEventInfo[];		///< the parse table for INI definition
+	const FieldParse *getFieldParse( void ) const { return m_audioEventInfo; }
+};
diff --git a/Core/GameEngine/Include/Common/AudioEventRTS.h b/Core/GameEngine/Include/Common/AudioEventRTS.h
new file mode 100644
index 00000000000..5a6f0f4510b
--- /dev/null
+++ b/Core/GameEngine/Include/Common/AudioEventRTS.h
@@ -0,0 +1,212 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: AudioEventRTS.h ///////////////////////////////////////////////////////////////////////////////
+// AudioEventRTS structure
+// Author: John K. McDonald, March 2002
+
+#pragma once
+
+#include "Common/AsciiString.h"
+#include "Common/GameAudio.h"
+#include "Common/GameMemory.h"
+#include "Common/GameType.h"
+
+// forward declarations ///////////////////////////////////////////////////////////////////////////
+struct AudioEventInfo;
+
+enum OwnerType CPP_11(: Int)
+{
+	OT_Positional,
+	OT_Drawable,
+	OT_Object,
+	OT_Dead,
+	OT_INVALID
+};
+
+enum PortionToPlay CPP_11(: Int)
+{
+	PP_Attack,
+	PP_Sound,
+	PP_Decay,
+	PP_Done
+};
+
+enum AudioPriority CPP_11(: Int);
+
+// This is called AudioEventRTS because AudioEvent is a typedef in ww3d
+// You might want this to be memory pooled (I personally do), but it can't
+// because we allocate them on the stack frequently.
+class AudioEventRTS
+{
+public:
+	AudioEventRTS( );
+	AudioEventRTS( const AsciiString& eventName );
+	AudioEventRTS( const AsciiString& eventName, ObjectID ownerID );
+	AudioEventRTS( const AsciiString& eventName, DrawableID drawableID );	// Pass 0 for unused if attaching to drawable
+	AudioEventRTS( const AsciiString& eventName, const Coord3D *positionOfAudio );
+
+	virtual ~AudioEventRTS( );
+
+	AudioEventRTS( const AudioEventRTS& right );
+	AudioEventRTS& operator=( const AudioEventRTS& right );
+
+	void setEventName( AsciiString name );
+	const AsciiString& getEventName( void ) const { return m_eventName; }
+
+	// generateFilename is separate from generatePlayInfo because generatePlayInfo should only be called once
+	// per triggered event. generateFilename will be called once per loop, or once to get each filename if 'all' is
+	// specified.
+	void generateFilename( void );
+	AsciiString getFilename( void );
+
+	// The attack and decay sounds are generated in generatePlayInfo, because they will never be played more
+	// than once during a given sound event.
+	void generatePlayInfo( void );
+	Real getPitchShift( void ) const;
+	Real getVolumeShift( void ) const;
+	AsciiString getAttackFilename( void ) const;
+	AsciiString getDecayFilename( void ) const;
+	Real getDelay( void ) const;
+
+	void decrementDelay( Real timeToDecrement );
+
+	PortionToPlay getNextPlayPortion( void ) const;
+	void advanceNextPlayPortion( void );
+	void setNextPlayPortion( PortionToPlay ptp );
+
+	void decreaseLoopCount( void );
+	Bool hasMoreLoops( void ) const;
+
+	void setAudioEventInfo( const AudioEventInfo *eventInfo ) const;
+	const AudioEventInfo *getAudioEventInfo( void ) const;
+
+	void setPlayingHandle( AudioHandle handle );	// for ID of this audio piece.
+	AudioHandle getPlayingHandle( void ); // for ID of this audio piece
+
+	void setPosition( const Coord3D *pos );
+	const Coord3D* getPosition( void );
+
+	void setObjectID( ObjectID objID );
+	ObjectID getObjectID( void );
+
+	Bool isDead() const { return m_ownerType == OT_Dead; }
+	OwnerType getOwnerType() const { return m_ownerType; }
+
+	void setDrawableID( DrawableID drawID );
+	DrawableID getDrawableID( void );
+
+	void setTimeOfDay( TimeOfDay tod );
+	TimeOfDay getTimeOfDay( void ) const;
+
+	void setHandleToKill( AudioHandle handleToKill );
+	AudioHandle getHandleToKill( void ) const;
+
+	void setShouldFade( Bool shouldFade );
+	Bool getShouldFade( void ) const;
+
+	void setIsLogicalAudio( Bool isLogicalAudio );
+	Bool getIsLogicalAudio( void ) const;
+
+	Bool isPositionalAudio( void ) const;
+	Bool isCurrentlyPlaying( void ) const;
+
+	AudioPriority getAudioPriority( void ) const;
+	void setAudioPriority( AudioPriority newPriority );
+
+	Real getVolume( void ) const;
+	void setVolume( Real vol );
+
+	Int getPlayerIndex( void ) const;
+	void setPlayerIndex( Int playerNdx );
+
+	Int getPlayingAudioIndex( void ) { return m_playingAudioIndex; };
+	void setPlayingAudioIndex( Int pai )  { m_playingAudioIndex = pai; };
+
+	Bool getUninterruptable( ) const { return m_uninterruptable; }
+	void setUninterruptable( Bool uninterruptable ) { m_uninterruptable = uninterruptable; }
+
+
+	// This will retrieve the appropriate position based on type.
+	const Coord3D *getCurrentPosition( void );
+
+	// This will return the directory leading up to the appropriate type, including the trailing '\\'
+	// If localized is true, we'll append a language specifc directory to the end of the path.
+	AsciiString generateFilenamePrefix( AudioType audioTypeToPlay, Bool localized );
+	AsciiString generateFilenameExtension( AudioType audioTypeToPlay );
+protected:
+	void adjustForLocalization( AsciiString &strToAdjust );
+
+protected:
+	AsciiString m_filenameToLoad;
+	mutable const AudioEventInfo *m_eventInfo;	// Mutable so that it can be modified even on const objects
+	AudioHandle m_playingHandle;
+
+	AudioHandle m_killThisHandle;		///< Sometimes sounds will canabilize other sounds in order to take their handle away.
+																	///< This is one of those instances.
+
+	AsciiString m_eventName;				///< This should correspond with an entry in Dialog.ini, Speech.ini, or Audio.ini
+	AsciiString m_attackName;				///< This is the filename that should be used during the attack.
+	AsciiString m_decayName;				///< This is the filename that should be used during the decay.
+
+	AudioPriority m_priority;				///< This should be the priority as given by the event info, or the overrided priority.
+	Real m_volume;									///< This is the override for the volume. It will either be the normal
+	TimeOfDay m_timeOfDay;					///< This should be the current Time Of Day.
+
+	Coord3D m_positionOfAudio;			///< Position of the sound if no further positional updates are necessary
+	union	// These are now unioned.
+	{
+		ObjectID m_objectID;						///< ObjectID of the object that this sound is tied to. Position can be automatically updated from this.
+		DrawableID m_drawableID;				///< DrawableID of the drawable that owns this sound
+	};
+	OwnerType m_ownerType;
+
+	Bool m_shouldFade;							///< This should fade in or out (if it is starting or stopping)
+	Bool m_isLogicalAudio;					///< Should probably only be true for scripted sounds
+	Bool m_uninterruptable;
+
+	// Playing attributes
+	Real m_pitchShift;							///< Pitch shift that should occur on this piece of audio
+	Real m_volumeShift;							///< Volume shift that should occur on this piece of audio
+	Real m_delay;										///< Amount to delay before playing this sound
+	Int m_loopCount;								///< The current loop count value. Only valid if this is a looping type event or the override has been set.
+	Int m_playingAudioIndex;				///< The sound index we are currently playing. In the case of non-random, we increment this to move to the next sound
+	Int m_allCount;									///< If this sound is an ALL type, then this is how many sounds we have played so far.
+
+	Int m_playerIndex;							///< The index of the player who owns this sound. Used for sounds that should have an owner, but don't have an object, etc.
+
+	PortionToPlay m_portionToPlayNext;	///< Which portion (attack, sound, decay) should be played next?
+};
+
+class DynamicAudioEventRTS : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DynamicAudioEventRTS, "DynamicAudioEventRTS" )
+public:
+
+	DynamicAudioEventRTS() { }
+	DynamicAudioEventRTS(const AudioEventRTS& a) : m_event(a) { }
+
+	AudioEventRTS	m_event;
+};
+EMPTY_DTOR(DynamicAudioEventRTS)
diff --git a/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h b/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h
new file mode 100644
index 00000000000..102f9ed860b
--- /dev/null
+++ b/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h
@@ -0,0 +1,40 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// EA Pacific
+// John McDonald, Jr
+// Do not distribute
+
+#pragma once
+
+enum AudioHandleSpecialValues CPP_11(: Int)
+{
+	AHSV_Error					= 0x00,
+	AHSV_NoSound,
+	AHSV_Muted,
+	AHSV_NotForLocal,
+	AHSV_StopTheMusic,
+	AHSV_StopTheMusicFade,
+	AHSV_FirstHandle
+};
diff --git a/Core/GameEngine/Include/Common/AudioRandomValue.h b/Core/GameEngine/Include/Common/AudioRandomValue.h
new file mode 100644
index 00000000000..4efc9c26b3d
--- /dev/null
+++ b/Core/GameEngine/Include/Common/AudioRandomValue.h
@@ -0,0 +1,42 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// AudioRandomValue.h
+// Random number generation system
+// Author: Michael S. Booth, January 1998
+// Split out into separate Logic/Client/Audio headers by MDC Sept 2002
+
+#pragma once
+
+#include "Lib/BaseType.h"
+
+// do NOT use these functions directly, rather use the macros below
+extern Int GetGameAudioRandomValue( int lo, int hi, const char *file, int line );
+extern Real GetGameAudioRandomValueReal( Real lo, Real hi, const char *file, int line );
+
+// use these macros to access the random value functions
+#define GameAudioRandomValue( lo, hi ) GetGameAudioRandomValue( lo, hi, __FILE__, __LINE__ )
+#define GameAudioRandomValueReal( lo, hi ) GetGameAudioRandomValueReal( lo, hi, __FILE__, __LINE__ )
+
+//--------------------------------------------------------------------------------------------------------------
diff --git a/Core/GameEngine/Include/Common/AudioRequest.h b/Core/GameEngine/Include/Common/AudioRequest.h
new file mode 100644
index 00000000000..a0321fdb481
--- /dev/null
+++ b/Core/GameEngine/Include/Common/AudioRequest.h
@@ -0,0 +1,56 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// EA Pacific
+// John McDonald, Jr
+// Do not distribute
+
+#pragma once
+
+#include "Common/GameAudio.h"
+#include "Common/GameMemory.h"
+
+class AudioEventRTS;
+
+enum RequestType CPP_11(: Int)
+{
+	AR_Play,
+	AR_Pause,
+	AR_Stop
+};
+
+struct AudioRequest : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AudioRequest, "AudioRequest" )
+
+public:
+	RequestType m_request;
+	union
+	{
+		AudioEventRTS *m_pendingEvent;
+		AudioHandle m_handleToInteractOn;
+	};
+	Bool m_usePendingEvent;
+	Bool m_requiresCheckForSample;
+};
diff --git a/Core/GameEngine/Include/Common/AudioSettings.h b/Core/GameEngine/Include/Common/AudioSettings.h
new file mode 100644
index 00000000000..93a485e848a
--- /dev/null
+++ b/Core/GameEngine/Include/Common/AudioSettings.h
@@ -0,0 +1,102 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// EA Pacific
+// John McDonald, Jr
+// Do not distribute
+
+#pragma once
+
+#include "Common/AsciiString.h"
+
+enum { MAX_HW_PROVIDERS = 4 };
+
+// TheSuperHackers @tweak xezon 23/07/2025 Adds setting to modify the volume of money deposit and withdraw sounds
+
+struct AudioSettings
+{
+	AudioSettings()
+#if RTS_GENERALS
+		: m_defaultMoneyTransactionVolume(1.0f)
+#elif RTS_ZEROHOUR
+		: m_defaultMoneyTransactionVolume(0.0f) // Uses zero volume by default because originally the money sounds did not work in Zero Hour
+#endif
+	{
+	}
+
+	AsciiString m_audioRoot;
+	AsciiString m_soundsFolder;
+	AsciiString m_musicFolder;
+	AsciiString m_streamingFolder;
+	AsciiString m_soundsExtension;
+	Bool m_useDigital;
+	Bool m_useMidi;
+	Int m_outputRate;
+	Int m_outputBits;
+	Int m_outputChannels;
+	Int m_sampleCount2D;
+	Int m_sampleCount3D;
+	Int m_streamCount;
+	Int m_globalMinRange;
+	Int m_globalMaxRange;
+	Int m_drawableAmbientFrames;
+	Int m_fadeAudioFrames;
+	UnsignedInt m_maxCacheSize;
+
+	Real m_minVolume;		// At volumes less than this, the sample will be culled.
+
+	AsciiString m_preferred3DProvider[MAX_HW_PROVIDERS + 1];
+
+	//Defaults actually don't ever get changed!
+	Real m_relative2DVolume;		//2D volume compared to 3D
+	Real m_defaultSoundVolume;
+	Real m_default3DSoundVolume;
+	Real m_defaultSpeechVolume;
+	Real m_defaultMusicVolume;
+	Real m_defaultMoneyTransactionVolume;
+	UnsignedInt m_defaultSpeakerType2D;
+	UnsignedInt m_defaultSpeakerType3D;
+
+	//If you want to change a value, store it somewhere else (like here)
+	Real m_preferredSoundVolume;
+	Real m_preferred3DSoundVolume;
+	Real m_preferredSpeechVolume;
+	Real m_preferredMusicVolume;
+	Real m_preferredMoneyTransactionVolume;
+
+	//The desired altitude of the microphone to improve panning relative to terrain.
+	Real m_microphoneDesiredHeightAboveTerrain;
+
+	//When tracing a line between the ground look-at-point and the camera, we want
+	//to ensure a maximum percentage, so the microphone never goes behind the camera.
+	Real m_microphoneMaxPercentageBetweenGroundAndCamera;
+
+	//Handles changing sound volume whenever the camera is close to the microphone.
+  Real m_zoomMinDistance;			//If we're closer than the minimum distance, then apply the full bonus no matter how close.
+  Real m_zoomMaxDistance;			//The maximum distance from microphone we need to be before benefiting from any bonus.
+
+  //NOTE: The higher this value is, the lower normal sounds will be! If you specify a sound volume value of 25%, then sounds will play
+	//between 75% and 100%, not 100% to 125%!
+  Real m_zoomSoundVolumePercentageAmount;	//The amount of sound volume dedicated to zooming.
+};
diff --git a/Core/GameEngine/Include/Common/CRCDebug.h b/Core/GameEngine/Include/Common/CRCDebug.h
new file mode 100644
index 00000000000..1fbeffebe61
--- /dev/null
+++ b/Core/GameEngine/Include/Common/CRCDebug.h
@@ -0,0 +1,128 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// CRCDebug.h ///////////////////////////////////////////////////////////////
+// Macros/functions/etc to help logging values for tracking down sync errors
+// Author: Matthew D. Campbell, June 2002
+
+#pragma once
+
+#include "Common/Debug.h"
+
+#ifndef NO_DEBUG_CRC
+	#ifdef DEBUG_LOGGING
+		#define DEBUG_CRC
+	#endif
+#endif
+
+#ifdef DEBUG_CRC
+
+#include "Common/AsciiString.h"
+#include "GameLogic/GameLogic.h"
+#include "Lib/BaseType.h"
+#include "WWMath/vector3.h"
+#include "WWMath/matrix3d.h"
+
+	#define AS_INT(x) (*(Int *)(&x))
+	#define DUMPVEL DUMPCOORD3DNAMED(&m_vel, "m_vel")
+	#define DUMPACCEL DUMPCOORD3DNAMED(&m_accel, "m_accel")
+	#define DUMPVECTOR3(x) DUMPVECTOR3NAMED(x, #x)
+	#define DUMPVECTOR3NAMED(x, y) dumpVector3(x, y, __FILE__, __LINE__)
+	#define DUMPCOORD3D(x) DUMPCOORD3DNAMED(x, #x)
+	#define DUMPCOORD3DNAMED(x, y) dumpCoord3D(x, y, __FILE__, __LINE__)
+	#define DUMPMATRIX3D(x) DUMPMATRIX3DNAMED(x, #x)
+	#define DUMPMATRIX3DNAMED(x, y) dumpMatrix3D(x, y, __FILE__, __LINE__)
+	#define DUMPREAL(x) DUMPREALNAMED(x, #x)
+	#define DUMPREALNAMED(x, y) dumpReal(x, y, __FILE__, __LINE__)
+
+	extern Int TheCRCFirstFrameToLog;
+	extern UnsignedInt TheCRCLastFrameToLog;
+
+	void dumpVector3(const Vector3 *v, AsciiString name, AsciiString fname, Int line);
+	void dumpCoord3D(const Coord3D *c, AsciiString name, AsciiString fname, Int line);
+	void dumpMatrix3D(const Matrix3D *m, AsciiString name, AsciiString fname, Int line);
+	void dumpReal(Real r, AsciiString name, AsciiString fname, Int line);
+
+	void outputCRCDebugLines( void );
+	void CRCDebugStartNewGame( void );
+	void outputCRCDumpLines( void );
+
+	void addCRCDebugLine(const char *fmt, ...);
+	void addCRCDebugLineNoCounter(const char *fmt, ...);
+	void addCRCDumpLine(const char *fmt, ...);
+	void addCRCGenLine(const char *fmt, ...);
+	#define CRCDEBUG_LOG(x) addCRCDebugLine x
+	#define CRCDUMP_LOG(x) addCRCDumpLine x
+	#define CRCGEN_LOG(x) addCRCGenLine x
+
+	class CRCVerification
+	{
+	public:
+		CRCVerification();
+		~CRCVerification();
+	protected:
+		UnsignedInt m_startCRC;
+	};
+	#define VERIFY_CRC CRCVerification crcVerification;
+
+	extern Int lastCRCDebugFrame;
+	extern Int lastCRCDebugIndex;
+
+	extern Bool g_verifyClientCRC;
+	extern Bool g_clientDeepCRC;
+
+	extern Bool g_crcModuleDataFromClient;
+	extern Bool g_crcModuleDataFromLogic;
+
+	extern Bool g_keepCRCSaves;
+	extern Bool g_saveDebugCRCPerFrame;
+	extern AsciiString g_saveDebugCRCPerFrameDir;
+
+	extern Bool g_logObjectCRCs;
+
+#else // DEBUG_CRC
+
+	#define DUMPVEL {}
+	#define DUMPACCEL {}
+	#define DUMPVECTOR3(x) {}
+	#define DUMPVECTOR3NAMED(x, y) {}
+	#define DUMPCOORD3D(x) {}
+	#define DUMPCOORD3DNAMED(x, y) {}
+	#define DUMPMATRIX3D(x) {}
+	#define DUMPMATRIX3DNAMED(x, y) {}
+
+	#define DUMPREAL(x) {}
+	#define DUMPREALNAMED(x, y) {}
+
+	#define CRCDEBUG_LOG(x) {}
+	#define CRCDUMP_LOG(x) {}
+	#define CRCGEN_LOG(x) {}
+
+	#define VERIFY_CRC {}
+
+#endif
+
+extern Int NET_CRC_INTERVAL;
+extern Int REPLAY_CRC_INTERVAL;
+extern Bool TheDebugIgnoreSyncErrors;
diff --git a/Core/GameEngine/Include/Common/Debug.h b/Core/GameEngine/Include/Common/Debug.h
new file mode 100644
index 00000000000..673e7d58e7b
--- /dev/null
+++ b/Core/GameEngine/Include/Common/Debug.h
@@ -0,0 +1,261 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: Debug.h
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:    RTS3
+//
+// File name:  Debug.h
+//
+// Created:    Steven Johnson, August 2001
+//
+// Desc:       Debug Utilities
+//
+//-----------------------------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include <Utility/CppMacros.h>
+
+class AsciiString;
+
+#define NO_RELEASE_DEBUG_LOGGING
+
+#ifdef RELEASE_DEBUG_LOGGING  ///< Creates a DebugLogFile.txt (No I or D) with all the debug log goodness.  Good for startup problems.
+	#define ALLOW_DEBUG_UTILS 1
+	#define DEBUG_LOGGING 1
+	#define DISABLE_DEBUG_CRASHING 1
+	#define DISABLE_DEBUG_STACKTRACE 1
+	#define DISABLE_DEBUG_PROFILE 1
+#endif
+
+// These are stolen from the WW3D Debug file. REALLY useful. :-)
+#define STRING_IT(a) #a
+#define TOKEN_IT(a) STRING_IT(,##a)
+#define MESSAGE(a) message (__FILE__ "(" TOKEN_IT(__LINE__) ") : " a)
+
+// by default, turn on ALLOW_DEBUG_UTILS if RTS_DEBUG is turned on.
+#if defined(RTS_DEBUG) && !defined(ALLOW_DEBUG_UTILS) && !defined(DISABLE_ALLOW_DEBUG_UTILS)
+	#define ALLOW_DEBUG_UTILS 1
+#elif defined(DEBUG_LOGGING) || defined(DEBUG_CRASHING) || defined(DEBUG_STACKTRACE) || defined(DEBUG_PROFILE)
+	// TheSuperHackers @tweak also turn on when any of the above options is already set.
+	#define ALLOW_DEBUG_UTILS 1
+#endif
+
+// these are predicated on ALLOW_DEBUG_UTILS, not RTS_DEBUG, and allow you to selectively disable
+// bits of the debug stuff for special builds.
+#if defined(ALLOW_DEBUG_UTILS) && !defined(DEBUG_LOGGING) && !defined(DISABLE_DEBUG_LOGGING)
+	#define DEBUG_LOGGING 1
+#endif
+#if defined(ALLOW_DEBUG_UTILS) && !defined(DEBUG_CRASHING) && !defined(DISABLE_DEBUG_CRASHING)
+	#define DEBUG_CRASHING 1
+#endif
+#if defined(ALLOW_DEBUG_UTILS) && !defined(DEBUG_STACKTRACE) && !defined(DISABLE_DEBUG_STACKTRACE)
+	#define DEBUG_STACKTRACE 1
+	#ifndef DEBUG_LOGGING
+		#define DEBUG_LOGGING 1 // TheSuperHackers @build Stack trace requires logging.
+	#endif
+#endif
+#if defined(ALLOW_DEBUG_UTILS) && !defined(DEBUG_PROFILE) && !defined(DISABLE_DEBUG_PROFILE)
+	#define DEBUG_PROFILE 1
+#endif
+
+#ifdef __cplusplus
+	#define DEBUG_EXTERN_C extern "C"
+#else
+	#define DEBUG_EXTERN_C extern
+#endif
+
+
+// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
+
+// USER INCLUDES //////////////////////////////////////////////////////////////
+
+// FORWARD REFERENCES /////////////////////////////////////////////////////////
+
+// TYPE DEFINES ///////////////////////////////////////////////////////////////
+
+// INLINING ///////////////////////////////////////////////////////////////////
+
+// EXTERNALS //////////////////////////////////////////////////////////////////
+
+/// @todo: the standard line-to-string trick isn't working correctly in vc6; figure out why
+#define DEBUG_STRING_IT(b)	#b
+#define DEBUG_TOKEN_IT(a)		DEBUG_STRING_IT(a)
+#define DEBUG_FILENLINE			__FILE__ ":" DEBUG_TOKEN_IT(__LINE__)
+
+#ifdef ALLOW_DEBUG_UTILS
+
+	enum
+	{
+		DEBUG_FLAG_LOG_TO_FILE = 0x01,
+		DEBUG_FLAG_LOG_TO_CONSOLE = 0x02,
+		DEBUG_FLAG_PREPEND_TIME = 0x04,
+		DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE | DEBUG_FLAG_LOG_TO_CONSOLE),
+	};
+
+	DEBUG_EXTERN_C void DebugInit(int flags);
+	DEBUG_EXTERN_C void DebugShutdown();
+
+	DEBUG_EXTERN_C int DebugGetFlags();
+	DEBUG_EXTERN_C void DebugSetFlags(int flags);
+
+	#define DEBUG_INIT(f)						do { DebugInit(f); } while (0)
+	#define DEBUG_SHUTDOWN()				do { DebugShutdown(); } while (0)
+
+#else
+
+	#define DEBUG_INIT(f)						((void)0)
+	#define DEBUG_SHUTDOWN()				((void)0)
+
+#endif
+
+#ifdef DEBUG_LOGGING
+
+	DEBUG_EXTERN_C void DebugLog(const char *format, ...);
+	DEBUG_EXTERN_C void DebugLogRaw(const char *format, ...);
+	DEBUG_EXTERN_C const char* DebugGetLogFileName();
+	DEBUG_EXTERN_C const char* DebugGetLogFileNamePrev();
+
+	// This defines a bitmask of log types that we care about, to allow some flexability
+	// in what gets logged.  This should be extended to asserts, too, but the assert box
+	// is waiting to be rewritten. -MDC 3/19/2003
+	extern unsigned int DebugLevelMask;
+	enum
+	{
+		DEBUG_LEVEL_NET = 0,           // in-game network
+		DEBUG_LEVEL_MAX
+	};
+	extern const char *TheDebugLevels[DEBUG_LEVEL_MAX];
+
+	#define DEBUG_LOG(m)						do { { DebugLog m ; } } while (0) // Log message with trailing new line character (LF)
+	#define DEBUG_LOG_RAW(m)				do { { DebugLogRaw m ; } } while (0) // Log message without trailing new line character (LF)
+	#define DEBUG_LOG_LEVEL(l, m)		do { if (l & DebugLevelMask) { DebugLog m ; } } while (0)
+	#define DEBUG_LOG_LEVEL_RAW(l, m)	do { if (l & DebugLevelMask) { DebugLogRaw m ; } } while (0)
+	#define DEBUG_ASSERTLOG(c, m)		do { { if (!(c)) DebugLog m ; } } while (0)
+
+#else
+
+	#define DEBUG_LOG(m)						((void)0)
+	#define DEBUG_LOG_RAW(m)				((void)0)
+	#define DEBUG_LOG_LEVEL(l, m)		((void)0)
+	#define DEBUG_LOG_LEVEL_RAW(l, m)	((void)0)
+	#define DEBUG_ASSERTLOG(c, m)		((void)0)
+
+#endif
+
+#ifdef DEBUG_CRASHING
+
+	DEBUG_EXTERN_C void DebugCrash(const char *format, ...);
+
+	/*
+		Yeah, it's a sleazy global, since we can't reasonably add
+		any args to DebugCrash due to the varargs nature of it.
+		We'll just let it slide in this case...
+	*/
+	DEBUG_EXTERN_C char* TheCurrentIgnoreCrashPtr;
+
+	#define DEBUG_CRASH(m)	\
+		do { \
+			{ \
+				static char ignoreCrash = 0; \
+				if (!ignoreCrash) { \
+					TheCurrentIgnoreCrashPtr = &ignoreCrash; \
+					DebugCrash m ; \
+					TheCurrentIgnoreCrashPtr = nullptr; \
+				} \
+			} \
+		} while (0)
+
+	#define DEBUG_ASSERTCRASH(c, m)		do { { if (!(c)) DEBUG_CRASH(m); } } while (0)
+
+	//Note: RELEASE_CRASH(m) is now always defined.
+	//#define RELEASE_CRASH(m)					DEBUG_CRASH((m))
+
+#else
+
+	#define DEBUG_CRASH(m)					((void)0)
+	#define DEBUG_ASSERTCRASH(c, m)	((void)0)
+
+//	DEBUG_EXTERN_C void ReleaseCrash(const char* reason);
+
+//	#define RELEASE_CRASH(m)				do { ReleaseCrash(m); } while (0)
+
+#endif
+
+DEBUG_EXTERN_C void ReleaseCrash(const char* reason);
+DEBUG_EXTERN_C void ReleaseCrashLocalized(const AsciiString& p, const AsciiString& m);
+
+#define RELEASE_CRASH(m)				do { ReleaseCrash(m); } while (0)
+#define RELEASE_CRASHLOCALIZED(p, m)		do { ReleaseCrashLocalized(p, m); } while (0)
+
+
+#ifdef DEBUG_PROFILE
+
+class SimpleProfiler
+{
+private:
+	__int64 m_freq;
+	__int64 m_startThisSession;
+	__int64 m_totalThisSession;
+	__int64 m_totalAllSessions;
+	int			m_numSessions;
+
+public:
+
+	SimpleProfiler();
+	void start();
+	void stop();
+	void stopAndLog(const char *msg, int howOftenToLog, int howOftenToResetAvg);
+	double getTime();				// of most recent session, in milliseconds
+	int getNumSessions();
+	double getTotalTime();	// total over all sessions, in milliseconds
+	double getAverageTime();	// averaged over all sessions, in milliseconds
+
+};
+
+#define BEGIN_PROFILE(uniqueid) \
+	static SimpleProfiler prof_##uniqueid; \
+	prof_##uniqueid.start();
+
+#define END_PROFILE(uniqueid, msg, howoftentolog, howoftentoreset) \
+	prof_##uniqueid.stopAndLog(msg, howoftentolog, howoftentoreset);
+
+#else
+
+#define BEGIN_PROFILE(uniqueid)
+#define END_PROFILE(uniqueid, msg, howoftentolog, howoftentoreset)
+
+#endif
+
+// MACROS //////////////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DynamicAudioEventInfo.h b/Core/GameEngine/Include/Common/DynamicAudioEventInfo.h
similarity index 97%
rename from GeneralsMD/Code/GameEngine/Include/Common/DynamicAudioEventInfo.h
rename to Core/GameEngine/Include/Common/DynamicAudioEventInfo.h
index c13dfbd5912..145f895cc64 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/DynamicAudioEventInfo.h
+++ b/Core/GameEngine/Include/Common/DynamicAudioEventInfo.h
@@ -28,10 +28,6 @@
 
 #pragma once
 
-
-#ifndef DYNAMICAUDIOEVENTINFO_H_INCLUDED
-#define DYNAMICAUDIOEVENTINFO_H_INCLUDED
-
 #include "Common/AudioEventInfo.h"
 #include "Common/BitFlags.h"
 
@@ -155,8 +151,3 @@ inline Bool DynamicAudioEventInfo::wasPriorityOverriden() const
 {
   return m_overriddenFields.test( OVERRIDE_PRIORITY );
 }
-
-
-
-#endif // DYNAMICAUDIOEVENTINFO_H_INCLUDED
-
diff --git a/Core/GameEngine/Include/Common/FileSystem.h b/Core/GameEngine/Include/Common/FileSystem.h
new file mode 100644
index 00000000000..51bf9153caa
--- /dev/null
+++ b/Core/GameEngine/Include/Common/FileSystem.h
@@ -0,0 +1,189 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------=
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:    GameEngine
+//
+// Module:     IO
+//
+// File name:  FileSystem.h
+//
+// Created:
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+//----------------------------------------------------------------------------
+//           Includes
+//----------------------------------------------------------------------------
+
+#include "Common/file.h"
+#include "Common/STLTypedefs.h"
+#include "Common/SubsystemInterface.h"
+
+#include <Utility/hash_map_adapter.h>
+
+#include "mutex.h"
+
+//----------------------------------------------------------------------------
+//           Forward References
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//           Type Defines
+//----------------------------------------------------------------------------
+
+typedef std::set<AsciiString, rts::less_than_nocase<AsciiString> > FilenameList;
+typedef FilenameList::iterator FilenameListIter;
+typedef UnsignedByte FileInstance;
+
+//----------------------------------------------------------------------------
+//           Type Defines
+//----------------------------------------------------------------------------
+//#define W3D_DIR_PATH "../FinalArt/W3D/"					///< .w3d files live here
+//#define TGA_DIR_PATH "../FinalArt/Textures/"		///< .tga texture files live here
+//#define TERRAIN_TGA_DIR_PATH "../FinalArt/Terrain/"		///< terrain .tga texture files live here
+#define W3D_DIR_PATH "Art/W3D/"					///< .w3d files live here
+#define TGA_DIR_PATH "Art/Textures/"		///< .tga texture files live here
+#define TERRAIN_TGA_DIR_PATH "Art/Terrain/"		///< terrain .tga texture files live here
+#define MAP_PREVIEW_DIR_PATH "%sMapPreviews/"	///< We need a common place we can copy the map previews to at runtime.
+#define USER_W3D_DIR_PATH "%sW3D/"					///< .w3d files live here
+#define USER_TGA_DIR_PATH "%sTextures/"		///< User .tga texture files live here
+
+// the following defines are only to be used while maintaining legacy compatibility
+// with old files until they are completely gone and in the regular art set
+#ifdef MAINTAIN_LEGACY_FILES
+#define LEGACY_W3D_DIR_PATH "../LegacyArt/W3D/"				///< .w3d files live here
+#define LEGACY_TGA_DIR_PATH "../LegacyArt/Textures/"	///< .tga texture files live here
+#endif  // MAINTAIN_LEGACY_FILES
+
+// LOAD_TEST_ASSETS automatically loads w3d assets from the TEST_W3D_DIR_PATH
+// without having to add an INI entry.
+#if defined(RTS_DEBUG)
+#define LOAD_TEST_ASSETS 1
+#endif
+
+#ifdef LOAD_TEST_ASSETS
+	#define ROAD_DIRECTORY		"../TestArt/TestRoad/"
+	#define TEST_STRING				"***TESTING"
+	// the following directories will be used to look for test art
+	#define LOOK_FOR_TEST_ART
+	#define TEST_W3D_DIR_PATH "../TestArt/"					///< .w3d files live here
+	#define TEST_TGA_DIR_PATH "../TestArt/"		///< .tga texture files live here
+#endif
+
+#ifndef ENABLE_FILESYSTEM_LOGGING
+#define ENABLE_FILESYSTEM_LOGGING (0)
+#endif
+
+
+struct FileInfo {
+
+	Int64 size() const { return (Int64)sizeHigh << 32 | sizeLow; }
+	Int64 timestamp() const { return (Int64)timestampHigh << 32 | timestampLow; }
+
+	Int sizeHigh;
+	Int sizeLow;
+	Int timestampHigh;
+	Int timestampLow;
+};
+
+//===============================
+// FileSystem
+//===============================
+/**
+  * FileSystem is an interface class for creating specific FileSystem objects.
+  *
+	* A FileSystem object's implementation decides what derivative of File object needs to be
+	* created when FileSystem::Open() gets called.
+	*/
+// TheSuperHackers @feature xezon 23/08/2025 Implements file instance access.
+// Can be used to access different versions of files in different archives under the same name.
+// Instance 0 refers to the top file that shadows all other files under the same name.
+// 
+// TheSuperHackers @bugfix xezon 26/10/2025 Adds a mutex to the file exist map to try prevent
+// application hangs during level load after the file exist map was corrupted because of writes
+// from multiple threads.
+//===============================
+class FileSystem : public SubsystemInterface
+{
+  FileSystem(const FileSystem&);
+  FileSystem& operator=(const FileSystem&);
+
+public:
+	FileSystem();
+	virtual	~FileSystem();
+
+	void init();
+	void reset();
+	void update();
+
+	File* openFile( const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE, FileInstance instance = 0 ); ///< opens a File interface to the specified file
+	Bool doesFileExist(const Char *filename, FileInstance instance = 0) const; ///< returns TRUE if the file exists.  filename should have no directory.
+	void getFileListInDirectory(const AsciiString& directory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.
+	Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo, FileInstance instance = 0) const; ///< fills in the FileInfo struct for the file given. returns TRUE if successful.
+
+	Bool createDirectory(AsciiString directory); ///< create a directory of the given name.
+
+	Bool areMusicFilesOnCD();
+	void loadMusicFilesFromCD();
+	void unloadMusicFilesFromCD();
+
+	static AsciiString normalizePath(const AsciiString& path);	///< normalizes a file path. The path can refer to a directory. File path must be absolute, but does not need to exist. Returns an empty string on failure.
+	static Bool isPathInDirectory(const AsciiString& testPath, const AsciiString& basePath);	///< determines if a file path is within a base path. Both paths must be absolute, but do not need to exist.
+
+protected:
+#if ENABLE_FILESYSTEM_EXISTENCE_CACHE
+	struct FileExistData
+	{
+		FileExistData() : instanceExists(0), instanceDoesNotExist(~FileInstance(0)) {}
+		FileInstance instanceExists;
+		FileInstance instanceDoesNotExist;
+	};
+	typedef std::hash_map<
+		rts::string_key<AsciiString>, FileExistData,
+		rts::string_key_hash<AsciiString>,
+		rts::string_key_equal<AsciiString> > FileExistMap;
+
+	mutable FileExistMap m_fileExist;
+	mutable FastCriticalSectionClass m_fileExistMutex;
+#endif
+};
+
+extern FileSystem*	TheFileSystem;
+
+
+
+//----------------------------------------------------------------------------
+//           Inlining
+//----------------------------------------------------------------------------
diff --git a/Core/GameEngine/Include/Common/FramePacer.h b/Core/GameEngine/Include/Common/FramePacer.h
new file mode 100644
index 00000000000..5bba1a704e8
--- /dev/null
+++ b/Core/GameEngine/Include/Common/FramePacer.h
@@ -0,0 +1,84 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "Common/FrameRateLimit.h"
+
+
+// TheSuperHackers @todo Use unsigned integers for fps values
+// TheSuperHackers @todo Consolidate the GlobalData::m_useFpsLimit and FramePacer::m_enableFpsLimit
+// TheSuperHackers @todo Implement new fast forward in here
+class FramePacer
+{
+public:
+
+	typedef UnsignedInt LogicTimeQueryFlags;
+	enum LogicTimeQueryFlags_ CPP_11(: LogicTimeQueryFlags)
+	{
+		IgnoreFrozenTime = 1<<0, ///< Ignore frozen time for the query
+		IgnoreHaltedGame = 1<<1, ///< Ignore halted game for the query
+	};
+
+	FramePacer();
+	~FramePacer();
+
+	void update(); ///< Signal that the app/render update is done and wait for the fps limit if applicable.
+
+	void setFramesPerSecondLimit( Int fps ); ///< Set the update fps limit.
+	Int  getFramesPerSecondLimit() const; ///< Get the update fps limit.
+	void enableFramesPerSecondLimit( Bool enable ); ///< Enable or disable the update fps limit.
+	Bool isFramesPerSecondLimitEnabled() const; ///< Returns whether the fps limit is enabled here.
+	Bool isActualFramesPerSecondLimitEnabled() const; ///< Returns whether the fps limit is actually enabled when considering all game settings and setups.
+	Int  getActualFramesPerSecondLimit() const; // Get the actual update fps limit.
+
+	Real getUpdateTime() const; ///< Get the last update delta time in seconds.
+	Real getUpdateFps() const; ///< Get the last update fps.
+	Real getBaseOverUpdateFpsRatio(Real minUpdateFps = 5.0f); ///< Get the last engine base over update fps ratio. Used to scale user inputs to a frame rate independent speed.
+
+	void setTimeFrozen(Bool frozen); ///< Set time frozen. Allows scripted camera movement.
+	void setGameHalted(Bool halted); ///< Set game halted. Does not allow scripted camera movement.
+	Bool isTimeFrozen() const;
+	Bool isGameHalted() const;
+
+	void setLogicTimeScaleFps( Int fps ); ///< Set the logic time scale fps and therefore scale the simulation time. Is capped by the max render fps and does not apply to network matches.
+	Int  getLogicTimeScaleFps() const; ///< Get the raw logic time scale fps value.
+	void enableLogicTimeScale( Bool enable ); ///< Enable or disable the logic time scale setup. If disabled, the simulation time scale is bound to the render frame time or network update time.
+	Bool isLogicTimeScaleEnabled() const; ///< Check whether the logic time scale setup is enabled.
+	Int  getActualLogicTimeScaleFps(LogicTimeQueryFlags flags = 0) const; ///< Get the real logic time scale fps, depending on the max render fps, network state and enabled state.
+	Real getActualLogicTimeScaleRatio(LogicTimeQueryFlags flags = 0) const; ///< Get the real logic time scale ratio, depending on the max render fps, network state and enabled state.
+	Real getActualLogicTimeScaleOverFpsRatio(LogicTimeQueryFlags flags = 0) const; ///< Get the real logic time scale over render fps ratio, used to scale down steps in render updates to match logic updates.
+	Real getLogicTimeStepSeconds(LogicTimeQueryFlags flags = 0) const; ///< Get the logic time step in seconds
+	Real getLogicTimeStepMilliseconds(LogicTimeQueryFlags flags = 0) const; ///< Get the logic time step in milliseconds
+
+protected:
+
+	FrameRateLimit m_frameRateLimit;
+
+	Int m_maxFPS; ///< Maximum frames per second for rendering
+	Int m_logicTimeScaleFPS; ///< Maximum frames per second for logic time scale
+
+	Real m_updateTime; ///< Last update delta time in seconds
+
+	Bool m_enableFpsLimit;
+	Bool m_enableLogicTimeScale;
+	Bool m_isTimeFrozen;
+	Bool m_isGameHalted;
+};
+
+extern FramePacer* TheFramePacer;
diff --git a/Core/GameEngine/Include/Common/FrameRateLimit.h b/Core/GameEngine/Include/Common/FrameRateLimit.h
new file mode 100644
index 00000000000..5bb2b5fd3a7
--- /dev/null
+++ b/Core/GameEngine/Include/Common/FrameRateLimit.h
@@ -0,0 +1,78 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "Common/GameCommon.h"
+
+
+class FrameRateLimit
+{
+public:
+	FrameRateLimit();
+
+	Real wait(UnsignedInt maxFps);
+
+private:
+	Int64 m_freq;
+	Int64 m_start;
+};
+
+
+enum FpsValueChange
+{
+	FpsValueChange_Increase,
+	FpsValueChange_Decrease,
+};
+
+
+class RenderFpsPreset
+{
+public:
+	enum CPP_11(: UnsignedInt)
+	{
+		UncappedFpsValue = 1000000,
+	};
+
+	static UnsignedInt getNextFpsValue(UnsignedInt value);
+	static UnsignedInt getPrevFpsValue(UnsignedInt value);
+	static UnsignedInt changeFpsValue(UnsignedInt value, FpsValueChange change);
+
+private:
+	static const UnsignedInt s_fpsValues[];
+};
+
+
+class LogicTimeScaleFpsPreset
+{
+public:
+	enum CPP_11(: UnsignedInt)
+	{
+#if RTS_DEBUG
+		MinFpsValue = 5,
+#else
+		MinFpsValue = LOGICFRAMES_PER_SECOND,
+#endif
+		StepFpsValue = 5,
+	};
+
+	static UnsignedInt getNextFpsValue(UnsignedInt value);
+	static UnsignedInt getPrevFpsValue(UnsignedInt value);
+	static UnsignedInt changeFpsValue(UnsignedInt value, FpsValueChange change);
+};
+
diff --git a/Core/GameEngine/Include/Common/GameAudio.h b/Core/GameEngine/Include/Common/GameAudio.h
new file mode 100644
index 00000000000..de19bb7fcc2
--- /dev/null
+++ b/Core/GameEngine/Include/Common/GameAudio.h
@@ -0,0 +1,430 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:    RTS 3
+//
+// File name:  Common/GameAudio.h
+//
+// Created:    5/01/01
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+// Includes
+#include "Lib/BaseType.h"
+#include "Common/STLTypedefs.h"
+#include "Common/SubsystemInterface.h"
+
+
+// Forward Declarations
+
+class AsciiString;
+class AudioEventRTS;
+class DebugDisplayInterface;
+class Drawable;
+class MusicManager;
+class Object;
+class SoundManager;
+
+
+enum AudioAffect CPP_11(: Int);
+enum AudioType CPP_11(: Int);
+
+struct AudioEventInfo;
+struct AudioRequest;
+struct AudioSettings;
+struct MiscAudio;
+
+typedef std::hash_map<AsciiString, AudioEventInfo*, rts::hash<AsciiString>, rts::equal_to<AsciiString> > AudioEventInfoHash;
+typedef AudioEventInfoHash::iterator AudioEventInfoHashIt;
+typedef UnsignedInt AudioHandle;
+
+
+// Defines
+enum
+{
+	PROVIDER_ERROR = 0xFFFFFFFF
+};
+
+// Class AudioManager
+/**
+	The life of audio.
+
+	When audio is requested to play, it is done so in the following manner:
+	1) An AudioEventRTS is created on the stack.
+	2) Its guts are copied from elsewhere (for instance, a ThingTemplate, or MiscAudio).
+	3) It is added to TheAudio via TheAudio->addAudioEvent(...)
+
+	The return value from addAudioEvent can be saved in case the sound needs to loop and/or be
+	terminated at some point.
+
+	To reomve a playing sound, the call TheAudio->removeAudioEvent(...) is used. This will search
+	the list of currently playing audio for the specified handle, and kill the attached sound. It
+	will play a decay sound, if one is specified.
+
+	The important functions of TheAudio, are therefore
+		GameAudio::addAudioEvent()
+		GameAudio::removeAudioEvent()
+	All other functions exist to support these two basic requirements.
+
+	In addition to the fundamental requirements, the audio has a fairly complicated sound management
+	scheme. If all units were always allowed to sound off, the sound engine would be overwhelmed and
+	would sound awful. Therefore, when an audio event is requested, it goes through a series of
+	checks to determine if it is near enough to the camera, if it should be heard based on shroud,
+	local player affiliation, etc. (The entire list of checks is contained in shouldPlayLocally()).
+
+	In addition, the world and unit audio are never allowed to exceed their footprint, as specified
+	in the audio settings INI file. In order to accommodate this, the audio uses an audio cache. The
+	audio cache will attempt to load a sample, assuming there is enough room. If there is not enough
+	room, then it goes through and finds any samples that are lower priority, and kills them until
+	enough room is present for the sample. If it cannot free enough room, nothing happens to the
+	cache.
+
+	Although the audio is multithreaded, most of the operations are performed such that the worst
+	case scenario for thread miscommunication is that the main thread misses an event for one frame.
+	One specific case of this is the status of playing audio. Because audio is playing
+	asynchronously, it can complete at any time. When most audio completes, it sets a flag on the
+	event noting that it has completed. During the next update (from the main thread), anything with
+	that flag set is moved to the stopped list, and then is cleaned up. (Basically, the audio uses
+	a push model for its multithreadedness, which doesn't require thread safety such as mutexes or
+	semaphores).
+
+	All in all, the best way to learn how the audio works is to track the lifetime of an event
+	through the system. This will give a better understanding than all the documentation I could
+	write.
+
+	-jkmcd
+	-December 2002
+*/
+
+class AudioManager : public SubsystemInterface
+{
+	public:
+		AudioManager();
+		virtual ~AudioManager();
+#if defined(RTS_DEBUG)
+		virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *userData, FILE *fp = NULL ) = 0;
+#endif
+
+		// From SubsystemInterface
+		virtual void init();
+		virtual void postProcessLoad();
+		virtual void reset();
+		virtual void update();
+
+		// device dependent stop, pause and resume
+		virtual void stopAudio( AudioAffect which ) = 0;
+		virtual void pauseAudio( AudioAffect which ) = 0;
+		virtual void resumeAudio( AudioAffect which ) = 0;
+		virtual void pauseAmbient( Bool shouldPause ) = 0;
+
+		// for focus issues
+		virtual void loseFocus( void );
+		virtual void regainFocus( void );
+
+		// control for AudioEventsRTS
+		virtual AudioHandle addAudioEvent( const AudioEventRTS *eventToAdd );	///< Add an audio event (event must be declared in an INI file)
+		virtual void removeAudioEvent( AudioHandle audioEvent );	///< Remove an audio event, stop for instance.
+		virtual void killAudioEventImmediately( AudioHandle audioEvent ) = 0;
+
+		virtual Bool isValidAudioEvent( const AudioEventRTS *eventToCheck ) const;	///< validate that this piece of audio exists
+		virtual Bool isValidAudioEvent( AudioEventRTS *eventToCheck ) const;	///< validate that this piece of audio exists
+
+		// add tracks during INIification
+		void addTrackName( const AsciiString& trackName );
+		AsciiString nextTrackName(const AsciiString& currentTrack );
+		AsciiString prevTrackName(const AsciiString& currentTrack );
+
+		// changing music tracks
+		virtual void nextMusicTrack( void ) = 0;
+		virtual void prevMusicTrack( void ) = 0;
+		virtual Bool isMusicPlaying( void ) const = 0;
+		virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const = 0;
+		virtual AsciiString getMusicTrackName( void ) const = 0;
+
+		virtual void setAudioEventEnabled( AsciiString eventToAffect, Bool enable );
+		virtual void setAudioEventVolumeOverride( AsciiString eventToAffect, Real newVolume );
+		virtual void removeAudioEvent( AsciiString eventToRemove );
+		virtual void removeDisabledEvents();
+
+		// Really meant for internal purposes only, but cannot be protected.
+		virtual void getInfoForAudioEvent( const AudioEventRTS *eventToFindAndFill ) const;	// Note: m_eventInfo is Mutable, and so this function will overwrite it if found
+
+		///< Return whether the current audio is playing or not.
+		///< NOTE NOTE NOTE !!DO NOT USE THIS IN FOR GAMELOGIC PURPOSES!! NOTE NOTE NOTE
+		virtual Bool isCurrentlyPlaying( AudioHandle handle );
+
+		// Device Dependent open and close functions
+		virtual void openDevice( void ) = 0;
+		virtual void closeDevice( void ) = 0;
+		virtual void *getDevice( void ) = 0;
+
+		// Device Dependent notification functions
+		virtual void notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags ) = 0;
+
+		// Device Dependent enumerate providers functions. It is okay for there to be only 1 provider (Miles provides a maximum of 64.
+		virtual UnsignedInt getProviderCount( void ) const = 0;
+		virtual AsciiString getProviderName( UnsignedInt providerNum ) const = 0;
+		virtual UnsignedInt getProviderIndex( AsciiString providerName ) const = 0;
+		virtual void selectProvider( UnsignedInt providerNdx ) = 0;
+		virtual void unselectProvider( void ) = 0;
+		virtual UnsignedInt getSelectedProvider( void ) const = 0;
+		virtual void setSpeakerType( UnsignedInt speakerType ) = 0;
+		virtual UnsignedInt getSpeakerType( void ) = 0;
+
+		virtual UnsignedInt translateSpeakerTypeToUnsignedInt( const AsciiString& speakerType );
+		virtual AsciiString translateUnsignedIntToSpeakerType( UnsignedInt speakerType );
+
+		// Device Dependent calls to get the number of channels for each type of audio (2-D, 3-D, Streams)
+		virtual UnsignedInt getNum2DSamples( void ) const = 0;
+		virtual UnsignedInt getNum3DSamples( void ) const = 0;
+		virtual UnsignedInt getNumStreams( void ) const = 0;
+
+		// Device Dependent calls to determine sound prioritization info
+		virtual Bool doesViolateLimit( AudioEventRTS *event ) const = 0;
+		virtual Bool isPlayingLowerPriority( AudioEventRTS *event ) const = 0;
+		virtual Bool isPlayingAlready( AudioEventRTS *event ) const = 0;
+		virtual Bool isObjectPlayingVoice( UnsignedInt objID ) const = 0;
+
+		virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume) = 0;
+		virtual void removePlayingAudio( AsciiString eventName ) = 0;
+		virtual void removeAllDisabledAudio() = 0;
+
+		// Is the audio device on? We can skip a lot of audio processing if not.
+		virtual Bool isOn( AudioAffect whichToGet ) const;
+		virtual void setOn( Bool turnOn, AudioAffect whichToAffect );
+
+		// Set and get the device Volume
+		virtual void setVolume( Real volume, AudioAffect whichToAffect );
+		virtual Real getVolume( AudioAffect whichToGet );
+
+		// To get a more 3-D feeling from the universe, we adjust the volume of the 3-D samples based
+		// on zoom.
+		virtual void set3DVolumeAdjustment( Real volumeAdjustment );
+
+    virtual Bool has3DSensitiveStreamsPlaying( void ) const = 0;
+
+ 		virtual void *getHandleForBink( void ) = 0;
+ 		virtual void releaseHandleForBink( void ) = 0;
+
+		// this function will play an audio event rts by loading it into memory. It should not be used
+		// by anything except for the load screens.
+		virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) = 0;
+
+		// Update Listener position information
+		virtual void setListenerPosition( const Coord3D *newListenerPos, const Coord3D *newListenerOrientation );
+		virtual const Coord3D *getListenerPosition( void ) const;
+
+		virtual AudioRequest *allocateAudioRequest( Bool useAudioEvent );
+		virtual void releaseAudioRequest( AudioRequest *requestToRelease );
+		virtual void appendAudioRequest( AudioRequest *m_request );
+		virtual void processRequestList( void );
+
+		virtual AudioEventInfo *newAudioEventInfo( AsciiString newEventName );
+    virtual void addAudioEventInfo( AudioEventInfo * newEventInfo );
+		virtual AudioEventInfo *findAudioEventInfo( AsciiString eventName ) const;
+
+		const AudioSettings *getAudioSettings( void ) const;
+		const MiscAudio *getMiscAudio( void ) const;
+
+		// This function should only be called by AudioManager, MusicManager and SoundManager
+		virtual void releaseAudioEventRTS( AudioEventRTS *&eventToRelease );
+
+		// For INI
+		AudioSettings *friend_getAudioSettings( void );
+		MiscAudio *friend_getMiscAudio( void );
+		const FieldParse *getFieldParseTable( void ) const;
+
+		const AudioEventRTS *getValidSilentAudioEvent() const { return m_silentAudioEvent; }
+
+		virtual void setHardwareAccelerated(Bool accel) { m_hardwareAccel = accel; }
+		virtual Bool getHardwareAccelerated() { return m_hardwareAccel; }
+
+		virtual void setSpeakerSurround(Bool surround) { m_surroundSpeakers = surround; }
+		virtual Bool getSpeakerSurround() { return m_surroundSpeakers; }
+
+		virtual void refreshCachedVariables();
+
+		virtual void setPreferredProvider(AsciiString providerNdx) = 0;
+		virtual void setPreferredSpeaker(AsciiString speakerType) = 0;
+
+		// For Scripting
+		virtual Real getAudioLengthMS( const AudioEventRTS *event );
+		virtual Real getFileLengthMS( AsciiString strToLoad ) const = 0;
+
+		// For the file cache to know when to remove files.
+		virtual void closeAnySamplesUsingFile( const void *fileToClose ) = 0;
+
+		virtual Bool isMusicAlreadyLoaded(void) const;
+		virtual Bool isMusicPlayingFromCD(void) const { return m_musicPlayingFromCD; }
+
+		Bool getDisallowSpeech( void ) const { return m_disallowSpeech; }
+		void setDisallowSpeech( Bool disallowSpeech ) { m_disallowSpeech = disallowSpeech; }
+
+		// For Worldbuilder, to build lists from which to select
+		virtual void findAllAudioEventsOfType( AudioType audioType, std::vector<AudioEventInfo*>& allEvents );
+    virtual const AudioEventInfoHash & getAllAudioEvents() const { return m_allAudioEventInfo; }
+
+		Real getZoomVolume() const { return m_zoomVolume; }
+	protected:
+
+		// Is the currently selected provider actually HW accelerated?
+		virtual Bool isCurrentProviderHardwareAccelerated();
+
+		// Is the currently selected speaker type Surround sound?
+		virtual Bool isCurrentSpeakerTypeSurroundSound();
+
+		// Should this piece of audio play on the local machine?
+		virtual Bool shouldPlayLocally(const AudioEventRTS *audioEvent);
+
+		// Set the Listening position for the device
+		virtual void setDeviceListenerPosition( void ) = 0;
+
+		// For tracking purposes
+		virtual AudioHandle allocateNewHandle( void );
+
+    // Remove all AudioEventInfo's with the m_isLevelSpecific flag
+    virtual void removeLevelSpecificAudioEventInfos( void );
+
+    void removeAllAudioRequests( void );
+
+	protected:
+		AudioSettings *m_audioSettings;
+		MiscAudio *m_miscAudio;
+		MusicManager *m_music;
+		SoundManager *m_sound;
+		Coord3D m_listenerPosition;
+		Coord3D m_listenerOrientation;
+		std::list<AudioRequest*> m_audioRequests;
+		std::vector<AsciiString> m_musicTracks;
+
+		AudioEventInfoHash m_allAudioEventInfo;
+		AudioHandle theAudioHandlePool;
+		std::list<std::pair<AsciiString, Real> > m_adjustedVolumes;
+
+		Real m_musicVolume;
+		Real m_soundVolume;
+		Real m_sound3DVolume;
+		Real m_speechVolume;
+
+		Real m_scriptMusicVolume;
+		Real m_scriptSoundVolume;
+		Real m_scriptSound3DVolume;
+		Real m_scriptSpeechVolume;
+
+		Real m_systemMusicVolume;
+		Real m_systemSoundVolume;
+		Real m_systemSound3DVolume;
+		Real m_systemSpeechVolume;
+		Real m_zoomVolume;
+
+
+		AudioEventRTS *m_silentAudioEvent;
+
+		enum
+		{
+			VOLUME_TYPE_MUSIC,
+			VOLUME_TYPE_SOUND,
+			VOLUME_TYPE_SOUND3D,
+			VOLUME_TYPE_SPEECH,
+			NUM_VOLUME_TYPES
+		};
+		Real *m_savedValues;
+
+		// Group of 8
+		Bool m_speechOn						: 1;
+		Bool m_soundOn						: 1;
+		Bool m_sound3DOn					: 1;
+		Bool m_musicOn						: 1;
+		Bool m_volumeHasChanged		: 1;
+		Bool m_hardwareAccel			: 1;
+		Bool m_surroundSpeakers		: 1;
+		Bool m_musicPlayingFromCD : 1;
+
+		// Next 8
+		Bool m_disallowSpeech			: 1;
+};
+
+// TheSuperHackers @feature helmutbuhler 17/05/2025
+// AudioManager that does nothing. Used for Headless Mode.
+class AudioManagerDummy : public AudioManager
+{
+#if defined(RTS_DEBUG)
+	virtual void audioDebugDisplay(DebugDisplayInterface* dd, void* userData, FILE* fp) {}
+#endif
+	virtual void stopAudio(AudioAffect which) {}
+	virtual void pauseAudio(AudioAffect which) {}
+	virtual void resumeAudio(AudioAffect which) {}
+	virtual void pauseAmbient(Bool shouldPause) {}
+	virtual void killAudioEventImmediately(AudioHandle audioEvent) {}
+	virtual void nextMusicTrack() {}
+	virtual void prevMusicTrack() {}
+	virtual Bool isMusicPlaying() const { return false; }
+	virtual Bool hasMusicTrackCompleted(const AsciiString& trackName, Int numberOfTimes) const { return false; }
+	virtual AsciiString getMusicTrackName() const { return ""; }
+	virtual void openDevice() {}
+	virtual void closeDevice() {}
+	virtual void* getDevice() { return NULL; }
+	virtual void notifyOfAudioCompletion(UnsignedInt audioCompleted, UnsignedInt flags) {}
+	virtual UnsignedInt getProviderCount(void) const { return 0; };
+	virtual AsciiString getProviderName(UnsignedInt providerNum) const { return ""; }
+	virtual UnsignedInt getProviderIndex(AsciiString providerName) const { return 0; }
+	virtual void selectProvider(UnsignedInt providerNdx) {}
+	virtual void unselectProvider(void) {}
+	virtual UnsignedInt getSelectedProvider(void) const { return 0; }
+	virtual void setSpeakerType(UnsignedInt speakerType) {}
+	virtual UnsignedInt getSpeakerType(void) { return 0; }
+	virtual UnsignedInt getNum2DSamples(void) const { return 0; }
+	virtual UnsignedInt getNum3DSamples(void) const { return 0; }
+	virtual UnsignedInt getNumStreams(void) const { return 0; }
+	virtual Bool doesViolateLimit(AudioEventRTS* event) const { return false; }
+	virtual Bool isPlayingLowerPriority(AudioEventRTS* event) const { return false; }
+	virtual Bool isPlayingAlready(AudioEventRTS* event) const { return false; }
+	virtual Bool isObjectPlayingVoice(UnsignedInt objID) const { return false; }
+	virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume) {}
+	virtual void removePlayingAudio(AsciiString eventName) {}
+	virtual void removeAllDisabledAudio() {}
+	virtual Bool has3DSensitiveStreamsPlaying(void) const { return false; }
+	virtual void* getHandleForBink(void) { return NULL; }
+	virtual void releaseHandleForBink(void) {}
+	virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) {}
+	virtual void setPreferredProvider(AsciiString providerNdx) {}
+	virtual void setPreferredSpeaker(AsciiString speakerType) {}
+	virtual Real getFileLengthMS(AsciiString strToLoad) const { return -1; }
+	virtual void closeAnySamplesUsingFile(const void* fileToClose) {}
+	virtual void setDeviceListenerPosition(void) {}
+};
+
+
+extern AudioManager *TheAudio;
diff --git a/Core/GameEngine/Include/Common/GameDefines.h b/Core/GameEngine/Include/Common/GameDefines.h
index 0cc57e7b299..667ea8aa9ff 100644
--- a/Core/GameEngine/Include/Common/GameDefines.h
+++ b/Core/GameEngine/Include/Common/GameDefines.h
@@ -18,9 +18,15 @@
 
 #pragma once
 
+#include "WWDefines.h"
+
 // Note: Retail compatibility must not be broken before this project officially does.
 // Use RETAIL_COMPATIBLE_CRC and RETAIL_COMPATIBLE_XFER_SAVE to guard breaking changes.
 
+#ifndef PRESERVE_RETAIL_BEHAVIOR
+#define PRESERVE_RETAIL_BEHAVIOR (1) // Retain behavior present in retail Generals 1.08 and Zero Hour 1.04
+#endif
+
 #ifndef RETAIL_COMPATIBLE_CRC
 #define RETAIL_COMPATIBLE_CRC (1) // Game is expected to be CRC compatible with retail Generals 1.08, Zero Hour 1.04
 #endif
@@ -28,3 +34,73 @@
 #ifndef RETAIL_COMPATIBLE_XFER_SAVE
 #define RETAIL_COMPATIBLE_XFER_SAVE (1) // Game is expected to be Xfer Save compatible with retail Generals 1.08, Zero Hour 1.04
 #endif
+
+// This is here to easily toggle between the retail compatible with fixed pathfinding fallback and pure fixed pathfinding mode
+#if RETAIL_COMPATIBLE_CRC
+#define RETAIL_COMPATIBLE_PATHFINDING (1)
+#else
+#define RETAIL_COMPATIBLE_PATHFINDING (0)
+#endif
+
+// This is essentially synonymous for RETAIL_COMPATIBLE_CRC. There is a lot wrong with AIGroup, such as use-after-free, double-free, leaks,
+// but we cannot touch it much without breaking retail compatibility. Do not shy away from using massive hacks when fixing issues with AIGroup,
+// but put them behind this macro.
+
+#ifndef RETAIL_COMPATIBLE_AIGROUP
+#define RETAIL_COMPATIBLE_AIGROUP (1) // AIGroup logic is expected to be CRC compatible with retail Generals 1.08, Zero Hour 1.04
+#endif
+
+#ifndef ENABLE_GAMETEXT_SUBSTITUTES
+#define ENABLE_GAMETEXT_SUBSTITUTES (1) // The code can provide substitute texts when labels and strings are missing in the STR or CSF translation file
+#endif
+
+// Previously the configurable shroud sat behind #if defined(RTS_DEBUG)
+// Enable the configurable shroud to properly draw the terrain in World Builder without RTS_DEBUG compiled in.
+// Disable the configurable shroud to make shroud hacking a bit less accessible in Release game builds.
+#ifndef ENABLE_CONFIGURABLE_SHROUD
+#define ENABLE_CONFIGURABLE_SHROUD (1) // When enabled, the GlobalData contains a field to turn on/off the shroud, otherwise shroud is always enabled
+#endif
+
+// Enable buffered IO in File System. Was disabled in retail game.
+// Buffered IO generally is much faster than unbuffered for small reads and writes.
+#ifndef USE_BUFFERED_IO
+#define USE_BUFFERED_IO (1)
+#endif
+
+// Enable cache for local file existence. Reduces amount of disk accesses for better performance,
+// but decreases file existence correctness and runtime stability, if a cached file is deleted on runtime.
+#ifndef ENABLE_FILESYSTEM_EXISTENCE_CACHE
+#define ENABLE_FILESYSTEM_EXISTENCE_CACHE (1)
+#endif
+
+// Enable prioritization of textures by size. This will improve the texture quality of 481 textures in Zero Hour
+// by using the larger resolution textures from Generals. Content wise these textures are identical.
+#ifndef PRIORITIZE_TEXTURES_BY_SIZE
+#define PRIORITIZE_TEXTURES_BY_SIZE (1)
+#endif
+
+// Enable obsolete code. This mainly refers to code that existed in Generals but was removed in GeneralsMD.
+// Disable and remove this when Generals and GeneralsMD are merged.
+#if RTS_GENERALS
+#ifndef USE_OBSOLETE_GENERALS_CODE
+#define USE_OBSOLETE_GENERALS_CODE (1)
+#endif
+#endif
+
+// Overwrite window settings until wnd data files are adapted or fixed.
+#ifndef ENABLE_GUI_HACKS
+#define ENABLE_GUI_HACKS (1)
+#endif
+
+// Tell our computer identity in the LAN lobby. Disable for privacy.
+// Was enabled in the retail game and exposed the computer login and host names.
+#ifdef RTS_DEBUG
+#ifndef TELL_COMPUTER_IDENTITY_IN_LAN_LOBBY
+#define TELL_COMPUTER_IDENTITY_IN_LAN_LOBBY (1)
+#endif
+#endif
+
+#define MIN_DISPLAY_BIT_DEPTH       16
+#define DEFAULT_DISPLAY_BIT_DEPTH   32
+#define DEFAULT_DISPLAY_WIDTH      800 // The standard resolution this game was designed for
+#define DEFAULT_DISPLAY_HEIGHT     600 // The standard resolution this game was designed for
diff --git a/Core/GameEngine/Include/Common/GameMemory.h b/Core/GameEngine/Include/Common/GameMemory.h
new file mode 100644
index 00000000000..1ea96161cea
--- /dev/null
+++ b/Core/GameEngine/Include/Common/GameMemory.h
@@ -0,0 +1,912 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: Memory.h
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C); 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:    RTS3
+//
+// File name:  Memory.h
+//
+// Created:    Steven Johnson, August 2001
+//
+// Desc:       Memory manager
+//
+//-----------------------------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+// Turn off memory pool checkpointing for now.
+#ifndef DISABLE_MEMORYPOOL_CHECKPOINTING
+	#define DISABLE_MEMORYPOOL_CHECKPOINTING 1
+#endif
+
+#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG_CUSTOM_NEW) && !defined(DISABLE_MEMORYPOOL_DEBUG_CUSTOM_NEW)
+	#define MEMORYPOOL_DEBUG_CUSTOM_NEW
+#endif
+
+//#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
+#if defined(RTS_DEBUG) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
+	#define MEMORYPOOL_DEBUG
+#endif
+
+// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
+
+#include <new.h>
+#include <Utility/stdio_adapter.h>
+#ifdef MEMORYPOOL_OVERRIDE_MALLOC
+	#include <malloc.h>
+#endif
+
+// USER INCLUDES //////////////////////////////////////////////////////////////
+
+#include "Lib/BaseType.h"
+#include "Common/Debug.h"
+#include "Common/Errors.h"
+
+// MACROS //////////////////////////////////////////////////////////////////
+
+#ifdef MEMORYPOOL_DEBUG
+
+	// by default, enable free-block-retention for checkpointing in debug mode
+	#if !defined(DISABLE_MEMORYPOOL_CHECKPOINTING) || DISABLE_MEMORYPOOL_CHECKPOINTING == 0
+		#define MEMORYPOOL_CHECKPOINTING
+	#endif
+
+	// by default, enable bounding walls in debug mode (unless we have specifically disabled them)
+	#ifndef DISABLE_MEMORYPOOL_BOUNDINGWALL
+		#define MEMORYPOOL_BOUNDINGWALL
+	#endif
+
+	#if !defined(MEMORYPOOL_STACKTRACE) && !defined(DISABLE_MEMORYPOOL_STACKTRACE)
+		#define MEMORYPOOL_STACKTRACE
+	#endif
+
+	// flags for the memory-report options.
+	enum
+	{
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+		// ------------------------------------------------------
+		// you usually won't use the _REPORT bits directly; see below for more convenient combinations.
+
+		// you must set at least one of the 'allocate' bits.
+		_REPORT_CP_ALLOCATED_BEFORE			= 0x0001,
+		_REPORT_CP_ALLOCATED_BETWEEN		= 0x0002,
+		_REPORT_CP_ALLOCATED_DONTCARE		= (_REPORT_CP_ALLOCATED_BEFORE|_REPORT_CP_ALLOCATED_BETWEEN),
+
+		// you must set at least one of the 'freed' bits.
+		_REPORT_CP_FREED_BEFORE					= 0x0010,
+		_REPORT_CP_FREED_BETWEEN				= 0x0020,
+		_REPORT_CP_FREED_NEVER					= 0x0040,	// ie, still in existence
+		_REPORT_CP_FREED_DONTCARE				= (_REPORT_CP_FREED_BEFORE|_REPORT_CP_FREED_BETWEEN|_REPORT_CP_FREED_NEVER),
+		// ------------------------------------------------------
+#endif // MEMORYPOOL_CHECKPOINTING
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+		/** display the stacktrace for allocation location for all blocks found.
+			this bit may be mixed-n-matched with any other flag.
+		*/
+		REPORT_CP_STACKTRACE		= 0x0100,
+#endif
+
+		/** display stats for each pool, in addition to each block.
+			(this is useful for finding suitable allocation counts for the pools.)
+			this bit may be mixed-n-matched with any other flag.
+		*/
+		REPORT_POOLINFO					= 0x0200,
+
+		/** report on the overall memory situation (including all pools and dma's).
+			this bit may be mixed-n-matched with any other flag.
+		*/
+		REPORT_FACTORYINFO			= 0x0400,
+
+		/** report on pools that have overflowed their initial allocation.
+			this bit may be mixed-n-matched with any other flag.
+		*/
+		REPORT_POOL_OVERFLOW		= 0x0800,
+
+		/** simple-n-cheap leak checking */
+		REPORT_SIMPLE_LEAKS			= 0x1000,
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+		/** report on blocks that were allocated between the checkpoints.
+		 (don't care if they were freed or not.)
+		*/
+		REPORT_CP_ALLOCATES	= (_REPORT_CP_ALLOCATED_BETWEEN | _REPORT_CP_FREED_DONTCARE),
+
+		/** report on blocks that were freed between the checkpoints.
+		 (don't care when they were allocated.)
+		*/
+		REPORT_CP_FREES			= (_REPORT_CP_ALLOCATED_DONTCARE | _REPORT_CP_FREED_BETWEEN),
+
+		/** report on blocks that were allocated between the checkpoints, and still exist
+		 (note that this reports *potential* leaks -- some such blocks may be desired)
+		*/
+		REPORT_CP_LEAKS			= (_REPORT_CP_ALLOCATED_BETWEEN | _REPORT_CP_FREED_NEVER),
+
+		/** report on blocks that existed before checkpoint #1 and still exist now.
+		*/
+		REPORT_CP_LONGTERM		= (_REPORT_CP_ALLOCATED_BEFORE | _REPORT_CP_FREED_NEVER),
+
+		/** report on blocks that were allocated-and-freed between the checkpoints.
+		*/
+		REPORT_CP_TRANSIENT		= (_REPORT_CP_ALLOCATED_BETWEEN | _REPORT_CP_FREED_BETWEEN),
+
+		/** report on all blocks that currently exist
+		*/
+		REPORT_CP_EXISTING		= (_REPORT_CP_ALLOCATED_BEFORE | _REPORT_CP_ALLOCATED_BETWEEN | _REPORT_CP_FREED_NEVER),
+
+		/** report on all blocks that have ever existed (!) (or at least, since the last call
+			to debugResetCheckpoints)
+		*/
+		REPORT_CP_ALL					= (_REPORT_CP_ALLOCATED_DONTCARE | _REPORT_CP_FREED_DONTCARE)
+#endif // MEMORYPOOL_CHECKPOINTING
+
+	};
+
+#endif // MEMORYPOOL_DEBUG
+
+// TheSuperHackers @build xezon 30/03/2025 Define DISABLE_GAMEMEMORY to use a null implementations for Game Memory.
+// Useful for address sanitizer checks and other investigations.
+// Is included below the macros so that memory pool debug code can still be used.
+#ifdef DISABLE_GAMEMEMORY
+#include "GameMemoryNull.h"
+#else
+
+#ifdef MEMORYPOOL_DEBUG
+
+	#define DECLARE_LITERALSTRING_ARG1										const char * debugLiteralTagString
+	#define PASS_LITERALSTRING_ARG1												debugLiteralTagString
+	#define DECLARE_LITERALSTRING_ARG2										, const char * debugLiteralTagString
+	#define PASS_LITERALSTRING_ARG2												, debugLiteralTagString
+
+	#define MP_LOC_SUFFIX																/*" [" DEBUG_FILENLINE "]"*/
+
+	#define allocateBlock(ARGLITERAL)										allocateBlockImplementation(ARGLITERAL MP_LOC_SUFFIX)
+	#define allocateBlockDoNotZero(ARGLITERAL)					allocateBlockDoNotZeroImplementation(ARGLITERAL MP_LOC_SUFFIX)
+	#define allocateBytes(ARGCOUNT,ARGLITERAL)					allocateBytesImplementation(ARGCOUNT, ARGLITERAL MP_LOC_SUFFIX)
+	#define allocateBytesDoNotZero(ARGCOUNT,ARGLITERAL)	allocateBytesDoNotZeroImplementation(ARGCOUNT, ARGLITERAL MP_LOC_SUFFIX)
+	#define newInstanceDesc(ARGCLASS,ARGLITERAL)				new(ARGCLASS::ARGCLASS##_GLUE_NOT_IMPLEMENTED, ARGLITERAL MP_LOC_SUFFIX) ARGCLASS
+	#define newInstance(ARGCLASS)												new(ARGCLASS::ARGCLASS##_GLUE_NOT_IMPLEMENTED, __FILE__) ARGCLASS
+
+#else
+
+	#define DECLARE_LITERALSTRING_ARG1
+	#define PASS_LITERALSTRING_ARG1
+	#define DECLARE_LITERALSTRING_ARG2
+	#define PASS_LITERALSTRING_ARG2
+
+	#define allocateBlock(ARGLITERAL)										allocateBlockImplementation()
+	#define allocateBlockDoNotZero(ARGLITERAL)					allocateBlockDoNotZeroImplementation()
+	#define allocateBytes(ARGCOUNT,ARGLITERAL)					allocateBytesImplementation(ARGCOUNT)
+	#define allocateBytesDoNotZero(ARGCOUNT,ARGLITERAL)	allocateBytesDoNotZeroImplementation(ARGCOUNT)
+	#define newInstanceDesc(ARGCLASS,ARGLITERAL)				new(ARGCLASS::ARGCLASS##_GLUE_NOT_IMPLEMENTED) ARGCLASS
+	#define newInstance(ARGCLASS)												new(ARGCLASS::ARGCLASS##_GLUE_NOT_IMPLEMENTED) ARGCLASS
+
+#endif
+
+// FORWARD REFERENCES /////////////////////////////////////////////////////////
+
+class MemoryPoolSingleBlock;
+class MemoryPoolBlob;
+class MemoryPool;
+class MemoryPoolFactory;
+class DynamicMemoryAllocator;
+class BlockCheckpointInfo;
+
+// TYPE DEFINES ///////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+/**
+	This class is purely a convenience used to pass optional arguments to initMemoryManager(),
+	and by extension, to createDynamicMemoryAllocator(). You can specify how many sub-pools you
+	want, what size each is, what the allocation counts are to be, etc. Most apps will
+	construct an array of these to pass to initMemoryManager() and never use it elsewhere.
+*/
+struct PoolInitRec
+{
+	const char *poolName;					///< name of the pool; by convention, "dmaPool_XXX" where XXX is allocationSize
+	Int allocationSize;						///< size, in bytes, of the pool.
+	Int initialAllocationCount;		///< initial number of blocks to allocate.
+	Int overflowAllocationCount;	///< when the pool runs out of space, allocate more blocks in this increment
+};
+
+enum
+{
+	MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS = 8	///< The max number of subpools allowed in a DynamicMemoryAllocator
+};
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+// ----------------------------------------------------------------------------
+/**
+	This class exists purely for coding convenience, and should never be used by external code.
+	It simply allows MemoryPool and DynamicMemoryAllocator to share checkpoint-related
+	code in a seamless way.
+*/
+class Checkpointable
+{
+private:
+	BlockCheckpointInfo	*m_firstCheckpointInfo;		///< head of the linked list of checkpoint infos for this pool/dma
+	Bool								m_cpiEverFailed;					///< flag to detect if we ran out of memory accumulating checkpoint info.
+
+protected:
+
+	Checkpointable();
+	~Checkpointable();
+
+	/// create a new checkpoint info and add it to the list.
+	BlockCheckpointInfo *debugAddCheckpointInfo(
+		const char *debugLiteralTagString,
+		Int allocCheckpoint,
+		Int blockSize
+	);
+
+public:
+	/// dump a checkpoint report to logfile
+	void debugCheckpointReport(Int flags, Int startCheckpoint, Int endCheckpoint, const char *poolName);
+	/// reset all the checkpoints for this pool/dma
+	void debugResetCheckpoints();
+};
+#endif
+
+// ----------------------------------------------------------------------------
+/**
+	A MemoryPool provides a way to efficiently allocate objects of the same (or similar)
+	size. We allocate large a large chunk of memory (a "blob") and subdivide it into
+	even-size chunks, doling these out as needed. If the first blob gets full, we allocate
+	additional blobs as necessary. A given pool can allocate blocks of only one size;
+	if you need a different size, you should use a different pool.
+*/
+class MemoryPool
+#ifdef MEMORYPOOL_CHECKPOINTING
+	: public Checkpointable
+#endif
+{
+private:
+
+	MemoryPoolFactory	*m_factory;									///< the factory that created us
+	MemoryPool				*m_nextPoolInFactory;				///< linked list node, managed by factory
+	const char				*m_poolName;								///< name of this pool. (literal string; must not be freed)
+	Int								m_allocationSize;						///< size of the blocks allocated by this pool, in bytes
+	Int								m_initialAllocationCount;		///< number of blocks to be allocated in initial blob
+	Int								m_overflowAllocationCount;	///< number of blocks to be allocated in any subsequent blob(s)
+	Int								m_usedBlocksInPool;					///< total number of blocks in use in the pool.
+	Int								m_totalBlocksInPool;				///< total number of blocks in all blobs of this pool (used or not).
+	Int								m_peakUsedBlocksInPool;			///< high-water mark of m_usedBlocksInPool
+	MemoryPoolBlob		*m_firstBlob;								///< head of linked list: first blob for this pool.
+	MemoryPoolBlob		*m_lastBlob;								///< tail of linked list: last blob for this pool. (needed for efficiency)
+	MemoryPoolBlob		*m_firstBlobWithFreeBlocks;	///< first blob in this pool that has at least one unallocated block.
+
+private:
+	/// create a new blob with the given number of blocks.
+	MemoryPoolBlob* createBlob(Int allocationCount);
+
+	/// destroy a blob.
+	Int freeBlob(MemoryPoolBlob *blob);
+
+public:
+
+	// 'public' funcs that are really only for use by MemoryPoolFactory
+	MemoryPool *getNextPoolInList();					///< return next pool in linked list
+	void addToList(MemoryPool **pHead);				///< add this pool to head of the linked list
+	void removeFromList(MemoryPool **pHead);	///< remove this pool from the linked list
+	#ifdef MEMORYPOOL_DEBUG
+		static void debugPoolInfoReport( MemoryPool *pool, FILE *fp = NULL );	///< dump a report about this pool to the logfile
+		const char *debugGetBlockTagString(void *pBlock);		///< return the tagstring for the given block (assumed to belong to this pool)
+		void debugMemoryVerifyPool();												///< perform internal consistency check on this pool.
+		Int debugPoolReportLeaks( const char* owner );
+	#endif
+	#ifdef MEMORYPOOL_CHECKPOINTING
+		void debugResetCheckpoints();												///< throw away all checkpoint information for this pool.
+	#endif
+
+public:
+
+	MemoryPool();
+
+	/// initialize the given memory pool.
+	void init(MemoryPoolFactory *factory, const char *poolName, Int allocationSize, Int initialAllocationCount, Int overflowAllocationCount);
+
+	~MemoryPool();
+
+	/// allocate a block from this pool. (don't call directly; use allocateBlock() macro)
+	void *allocateBlockImplementation(DECLARE_LITERALSTRING_ARG1);
+
+	/// same as allocateBlockImplementation, but memory returned is not zeroed
+	void *allocateBlockDoNotZeroImplementation(DECLARE_LITERALSTRING_ARG1);
+
+	/// free the block. it is OK to pass null.
+	void freeBlock(void *pMem);
+
+	/// return the factory that created (and thus owns) this pool.
+	MemoryPoolFactory *getOwningFactory();
+
+	/// return the name of this pool. the result is a literal string and must not be freed.
+	const char *getPoolName();
+
+	/// return the block allocation size of this pool.
+	Int getAllocationSize();
+
+	/// return the number of free (available) blocks in this pool.
+	Int getFreeBlockCount();
+
+	/// return the number of blocks in use in this pool.
+	Int getUsedBlockCount();
+
+	/// return the total number of blocks in this pool. [ == getFreeBlockCount() + getUsedBlockCount() ]
+	Int getTotalBlockCount();
+
+	/// return the high-water mark for getUsedBlockCount()
+	Int getPeakBlockCount();
+
+	/// return the initial allocation count for this pool
+	Int getInitialBlockCount();
+
+	Int countBlobsInPool();
+
+	/// if this pool has any empty blobs, return them to the system.
+	Int releaseEmpties();
+
+	/// destroy all blocks and blobs in this pool.
+	void reset();
+
+	#ifdef MEMORYPOOL_DEBUG
+		/// return true iff this block was allocated by this pool.
+		Bool debugIsBlockInPool(void *pBlock);
+	#endif
+};
+
+// ----------------------------------------------------------------------------
+/**
+	The DynamicMemoryAllocator class is used to handle unpredictably-sized
+	allocation requests. It basically allocates a number of (private) MemoryPools,
+	then routes request to the smallest-size pool that will satisfy the request.
+	(Requests too large for any of the pool are routed to the system memory allocator.)
+	You should normally use this in place of malloc/free or (global) new/delete.
+*/
+class DynamicMemoryAllocator
+#ifdef MEMORYPOOL_CHECKPOINTING
+	: public Checkpointable
+#endif
+{
+private:
+	MemoryPoolFactory					*m_factory;						///< the factory that created us
+	DynamicMemoryAllocator		*m_nextDmaInFactory;	///< linked list node, managed by factory
+	Int												m_numPools;						///< number of subpools (up to MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS)
+	Int												m_usedBlocksInDma;		///< total number of blocks allocated, from subpools and "raw"
+	MemoryPool								*m_pools[MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS];	///< the subpools
+	MemoryPoolSingleBlock			*m_rawBlocks;					///< linked list of "raw" blocks allocated directly from system
+
+	/// return the best pool for the given allocSize, or null if none are suitable
+	MemoryPool *findPoolForSize(Int allocSize);
+
+public:
+
+	// 'public' funcs that are really only for use by MemoryPoolFactory
+
+	DynamicMemoryAllocator *getNextDmaInList();						///< return next dma in linked list
+	void addToList(DynamicMemoryAllocator **pHead);				///< add this dma to the list
+	void removeFromList(DynamicMemoryAllocator **pHead);	///< remove this dma from the list
+	#ifdef MEMORYPOOL_DEBUG
+		Int debugCalcRawBlockBytes(Int *numBlocks);												///< calculate the number of bytes in "raw" (non-subpool) blocks
+		void debugMemoryVerifyDma();												///< perform internal consistency check
+		const char *debugGetBlockTagString(void *pBlock);		///< return the tagstring for the given block (assumed to belong to this dma)
+		void debugDmaInfoReport( FILE *fp = NULL );					///< dump a report about this pool to the logfile
+		Int debugDmaReportLeaks();
+	#endif
+	#ifdef MEMORYPOOL_CHECKPOINTING
+		void debugResetCheckpoints();												///< toss all checkpoint information
+	#endif
+
+public:
+
+	DynamicMemoryAllocator();
+
+	/// initialize the dma. pass 0/null for numSubPool/parms to get some reasonable default subpools.
+	void init(MemoryPoolFactory *factory, Int numSubPools, const PoolInitRec pParms[]);
+
+	~DynamicMemoryAllocator();
+
+	/// allocate bytes from this pool. (don't call directly; use allocateBytes() macro)
+	void *allocateBytesImplementation(Int numBytes DECLARE_LITERALSTRING_ARG2);
+
+	/// like allocateBytesImplementation, but zeroes the memory before returning
+	void *allocateBytesDoNotZeroImplementation(Int numBytes DECLARE_LITERALSTRING_ARG2);
+
+#ifdef MEMORYPOOL_DEBUG
+	void debugIgnoreLeaksForThisBlock(void* pBlockPtr);
+#endif
+
+	/// free the bytes. (assumes allocated by this dma.)
+	void freeBytes(void* pMem);
+
+	/**
+		return the actual number of bytes that would be allocated
+		if you tried to allocate the given size. (It will generally be slightly
+		larger than you request.) This lets you use extra space if you're gonna get it anyway...
+		The idea is that you will call this before doing a memory allocation, to see if
+		you got any extra "bonus" space.
+	*/
+	Int getActualAllocationSize(Int numBytes);
+
+	/// destroy all allocations performed by this DMA.
+	void reset();
+
+	Int getDmaMemoryPoolCount() const { return m_numPools; }
+	MemoryPool* getNthDmaMemoryPool(Int i) const { return m_pools[i]; }
+
+	#ifdef MEMORYPOOL_DEBUG
+
+		/// return true iff this block was allocated by this dma
+		Bool debugIsBlockInDma(void *pBlock);
+
+		/// return true iff the pool is a subpool of this dma
+		Bool debugIsPoolInDma(MemoryPool *pool);
+
+	#endif	// MEMORYPOOL_DEBUG
+};
+
+// ----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+enum { MAX_SPECIAL_USED = 256 };
+#endif
+
+// ----------------------------------------------------------------------------
+/**
+	The class that manages all the MemoryPools and DynamicMemoryAllocators.
+	Usually you will create exactly one of these (TheMemoryPoolFactory)
+	and use it for everything.
+*/
+class MemoryPoolFactory
+{
+private:
+	MemoryPool								*m_firstPoolInFactory;		///< linked list of pools
+	DynamicMemoryAllocator		*m_firstDmaInFactory;			///< linked list of dmas
+#ifdef MEMORYPOOL_CHECKPOINTING
+	Int												m_curCheckpoint;					///< most recent checkpoint value
+#endif
+#ifdef MEMORYPOOL_DEBUG
+	Int												m_usedBytes;							///< total bytes in use
+	Int												m_physBytes;							///< total bytes allocated to all pools (includes unused blocks)
+	Int												m_peakUsedBytes;					///< high-water mark of m_usedBytes
+	Int												m_peakPhysBytes;					///< high-water mark of m_physBytes
+	Int												m_usedBytesSpecial[MAX_SPECIAL_USED];
+	Int												m_usedBytesSpecialPeak[MAX_SPECIAL_USED];
+	Int												m_physBytesSpecial[MAX_SPECIAL_USED];
+	Int												m_physBytesSpecialPeak[MAX_SPECIAL_USED];
+#endif
+
+public:
+
+		// 'public' funcs that are really only for use by MemoryPool and friends
+	#ifdef MEMORYPOOL_DEBUG
+		/// adjust the usedBytes and physBytes variables by the given amoun ts.
+		void adjustTotals(const char* tagString, Int usedDelta, Int physDelta);
+	#endif
+	#ifdef MEMORYPOOL_CHECKPOINTING
+		/// return the current checkpoint value.
+		Int getCurCheckpoint() { return m_curCheckpoint; }
+	#endif
+
+public:
+
+	MemoryPoolFactory();
+	void init();
+	~MemoryPoolFactory();
+
+	/// create a new memory pool with the given settings. if a pool with the given name already exists, return it.
+	MemoryPool *createMemoryPool(const PoolInitRec *parms);
+
+	/// overloaded version of createMemoryPool with explicit parms.
+	MemoryPool *createMemoryPool(const char *poolName, Int allocationSize, Int initialAllocationCount, Int overflowAllocationCount);
+
+	/// return the pool with the given name. if no such pool exists, return null.
+	MemoryPool *findMemoryPool(const char *poolName);
+
+	/// destroy the given pool.
+	void destroyMemoryPool(MemoryPool *pMemoryPool);
+
+	/// create a DynamicMemoryAllocator with subpools with the given parms.
+	DynamicMemoryAllocator *createDynamicMemoryAllocator(Int numSubPools, const PoolInitRec pParms[]);
+
+	/// destroy the given DynamicMemoryAllocator.
+	void destroyDynamicMemoryAllocator(DynamicMemoryAllocator *dma);
+
+	/// destroy the contents of all pools and dmas. (the pools and dma's are not destroyed, just reset)
+	void reset();
+
+	void memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead = NULL );
+
+	#ifdef MEMORYPOOL_DEBUG
+
+		/// perform internal consistency checking
+		void debugMemoryVerify();
+
+		/// return true iff the block was allocated by any pool or dma owned by this factory.
+		Bool debugIsBlockInAnyPool(void *pBlock);
+
+		/// return the tag string for the block.
+		const char *debugGetBlockTagString(void *pBlock);
+
+		/// dump a report with the given options to the logfile.
+		void debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp = NULL );
+
+		void debugSetInitFillerIndex(Int index);
+
+	#endif
+	#ifdef MEMORYPOOL_CHECKPOINTING
+
+		/// set a new checkpoint.
+		Int debugSetCheckpoint();
+
+		/// reset all checkpoint information.
+		void debugResetCheckpoints();
+
+	#endif
+};
+
+// how many bytes are we allowed to 'waste' per pool allocation before the debug code starts yelling at us...
+#define MEMORY_POOL_OBJECT_ALLOCATION_SLOP	16
+
+// ----------------------------------------------------------------------------
+#define GCMP_FIND(ARGCLASS, ARGPOOLNAME) \
+private: \
+	static MemoryPool *getClassMemoryPool() \
+	{ \
+		/* \
+			Note that this static variable will be initialized exactly once: the first time \
+			control flows over this section of code. This allows us to neatly resolve the \
+			order-of-execution problem for static variables, ensuring this is not executed \
+			prior to the initialization of TheMemoryPoolFactory. \
+		*/ \
+		DEBUG_ASSERTCRASH(TheMemoryPoolFactory, ("TheMemoryPoolFactory is NULL")); \
+		static MemoryPool *The##ARGCLASS##Pool = TheMemoryPoolFactory->findMemoryPool(ARGPOOLNAME); \
+		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool, ("Pool \"%s\" not found (did you set it up in initMemoryPools?)", ARGPOOLNAME)); \
+		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool->getAllocationSize() >= sizeof(ARGCLASS), ("Pool \"%s\" is too small for this class (currently %d, need %d)", ARGPOOLNAME, The##ARGCLASS##Pool->getAllocationSize(), sizeof(ARGCLASS))); \
+		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool->getAllocationSize() <= sizeof(ARGCLASS)+MEMORY_POOL_OBJECT_ALLOCATION_SLOP, ("Pool \"%s\" is too large for this class (currently %d, need %d)", ARGPOOLNAME, The##ARGCLASS##Pool->getAllocationSize(), sizeof(ARGCLASS))); \
+		return The##ARGCLASS##Pool; \
+	}
+
+// ----------------------------------------------------------------------------
+#define GCMP_CREATE(ARGCLASS, ARGPOOLNAME, ARGINITIAL, ARGOVERFLOW) \
+private: \
+	static MemoryPool *getClassMemoryPool() \
+	{ \
+		/* \
+			Note that this static variable will be initialized exactly once: the first time \
+			control flows over this section of code. This allows us to neatly resolve the \
+			order-of-execution problem for static variables, ensuring this is not executed \
+			prior to the initialization of TheMemoryPoolFactory. \
+		*/ \
+		DEBUG_ASSERTCRASH(TheMemoryPoolFactory, ("TheMemoryPoolFactory is NULL")); \
+		static MemoryPool *The##ARGCLASS##Pool = TheMemoryPoolFactory->createMemoryPool(ARGPOOLNAME, sizeof(ARGCLASS), ARGINITIAL, ARGOVERFLOW); \
+		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool, ("Pool \"%s\" not found (did you set it up in initMemoryPools?)", ARGPOOLNAME)); \
+		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool->getAllocationSize() >= sizeof(ARGCLASS), ("Pool \"%s\" is too small for this class (currently %d, need %d)", ARGPOOLNAME, The##ARGCLASS##Pool->getAllocationSize(), sizeof(ARGCLASS))); \
+		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool->getAllocationSize() <= sizeof(ARGCLASS)+MEMORY_POOL_OBJECT_ALLOCATION_SLOP, ("Pool \"%s\" is too large for this class (currently %d, need %d)", ARGPOOLNAME, The##ARGCLASS##Pool->getAllocationSize(), sizeof(ARGCLASS))); \
+		return The##ARGCLASS##Pool; \
+	}
+
+// ----------------------------------------------------------------------------
+#define MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
+protected: \
+	virtual ~ARGCLASS(); \
+public: \
+	enum ARGCLASS##MagicEnum { ARGCLASS##_GLUE_NOT_IMPLEMENTED = 0 }; \
+public: \
+	inline void *operator new(size_t s, ARGCLASS##MagicEnum e DECLARE_LITERALSTRING_ARG2) \
+	{ \
+		DEBUG_ASSERTCRASH(s == sizeof(ARGCLASS), ("The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up correctly")); \
+		return ARGCLASS::getClassMemoryPool()->allocateBlockImplementation(PASS_LITERALSTRING_ARG1); \
+	} \
+public: \
+	/* \
+		Note that this delete operator can't be called directly; it is called \
+		only if the analogous new operator is called, AND the constructor \
+		throws an exception... \
+	*/ \
+	inline void operator delete(void *p, ARGCLASS##MagicEnum e DECLARE_LITERALSTRING_ARG2) \
+	{ \
+		ARGCLASS::getClassMemoryPool()->freeBlock(p); \
+	} \
+protected: \
+	/* \
+		Make normal new and delete protected, so they can't be called by the outside world. \
+		Note that delete is funny, in that it can still be called by the class itself; \
+		this is safe but not recommended, for consistency purposes. More problematically, \
+		it can be called by another class that has declared itself 'friend' to us. \
+		In theory, this shouldn't work, since it may not use the right operator-delete, \
+		and thus the wrong memory pool; in practice, it seems the right delete IS called \
+		in MSVC -- it seems to make operator delete virtual if the destructor is also virtual. \
+		At any rate, this is undocumented behavior as far as I can tell, so we put a big old \
+		crash into operator delete telling people to do the right thing and call deleteInstance \
+		instead -- it'd be nice if we could catch this at compile time, but catching it at \
+		runtime seems to be the best we can do... \
+	*/ \
+	inline void *operator new(size_t s) \
+	{ \
+		DEBUG_CRASH(("This operator new should normally never be called... please use new(char*) instead.")); \
+		DEBUG_ASSERTCRASH(s == sizeof(ARGCLASS), ("The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up correctly")); \
+		throw ERROR_BUG; \
+		return 0; \
+	} \
+	inline void operator delete(void *p) \
+	{ \
+		DEBUG_CRASH(("Please call deleteInstance instead of delete.")); \
+		ARGCLASS::getClassMemoryPool()->freeBlock(p); \
+	} \
+private: \
+	virtual MemoryPool *getObjectMemoryPool() \
+	{ \
+		return ARGCLASS::getClassMemoryPool(); \
+	} \
+public: /* include this line at the end to reset visibility to 'public' */
+
+// ----------------------------------------------------------------------------
+#define MEMORY_POOL_GLUE(ARGCLASS, ARGPOOLNAME) \
+	MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
+	GCMP_FIND(ARGCLASS, ARGPOOLNAME)
+
+// ----------------------------------------------------------------------------
+#define MEMORY_POOL_GLUE_WITH_EXPLICIT_CREATE(ARGCLASS, ARGPOOLNAME, ARGINITIAL, ARGOVERFLOW) \
+	MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
+	GCMP_CREATE(ARGCLASS, ARGPOOLNAME, ARGINITIAL, ARGOVERFLOW)
+
+// ----------------------------------------------------------------------------
+#define MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ARGCLASS, ARGPOOLNAME) \
+	MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
+	GCMP_CREATE(ARGCLASS, ARGPOOLNAME, -1, -1)
+
+// ----------------------------------------------------------------------------
+// this is the version for an Abstract Base Class, which will never be instantiated...
+#define MEMORY_POOL_GLUE_ABC(ARGCLASS) \
+protected: \
+	virtual ~ARGCLASS(); \
+public: \
+	enum ARGCLASS##MagicEnum { ARGCLASS##_GLUE_NOT_IMPLEMENTED = 0 }; \
+protected: \
+	inline void *operator new(size_t s, ARGCLASS##MagicEnum e DECLARE_LITERALSTRING_ARG2) \
+	{ \
+		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
+		DEBUG_ASSERTCRASH(s == sizeof(ARGCLASS), ("The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up correctly")); \
+		throw ERROR_BUG; \
+		return 0; \
+	} \
+protected: \
+	inline void operator delete(void *p, ARGCLASS##MagicEnum e DECLARE_LITERALSTRING_ARG2) \
+	{ \
+		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
+	} \
+protected: \
+	inline void *operator new(size_t s) \
+	{ \
+		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
+		DEBUG_ASSERTCRASH(s == sizeof(ARGCLASS), ("The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up correctly")); \
+		throw ERROR_BUG; \
+		return 0; \
+	} \
+	inline void operator delete(void *p) \
+	{ \
+		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
+	} \
+private: \
+	virtual MemoryPool *getObjectMemoryPool() \
+	{ \
+		throw ERROR_BUG; \
+		return 0; \
+	} \
+public: /* include this line at the end to reset visibility to 'public' */
+
+
+// ----------------------------------------------------------------------------
+/**
+	This class is provided as a simple and safe way to integrate C++ object allocation
+	into MemoryPool usage. To use it, you must have your class inherit from
+	MemoryPoolObject, then put the macro MEMORY_POOL_GLUE(MyClassName, "MyPoolName")
+	at the start of your class definition. (This does not create the pool itself -- you
+	must create that manually using MemoryPoolFactory::createMemoryPool)
+*/
+class MemoryPoolObject
+{
+protected:
+
+	/** ensure that all destructors are virtual */
+	virtual ~MemoryPoolObject() { }
+
+protected:
+	void *operator new(size_t s) { DEBUG_CRASH(("This should be impossible")); return 0; }
+	void operator delete(void *p) { DEBUG_CRASH(("This should be impossible")); }
+
+protected:
+
+	virtual MemoryPool *getObjectMemoryPool() = 0;
+
+public:
+
+	static void deleteInstanceInternal(MemoryPoolObject* mpo)
+	{
+		if (mpo)
+		{
+			MemoryPool *pool = mpo->getObjectMemoryPool(); // save this, since the dtor will nuke our vtbl
+			mpo->~MemoryPoolObject();	// it's virtual, so the right one will be called.
+			pool->freeBlock((void *)mpo);
+		}
+	}
+};
+
+inline void deleteInstance(MemoryPoolObject* mpo)
+{
+	MemoryPoolObject::deleteInstanceInternal(mpo);
+}
+
+
+// INLINING ///////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+inline MemoryPoolFactory *MemoryPool::getOwningFactory() { return m_factory; }
+inline MemoryPool *MemoryPool::getNextPoolInList() { return m_nextPoolInFactory; }
+inline const char *MemoryPool::getPoolName() { return m_poolName; }
+inline Int MemoryPool::getAllocationSize() { return m_allocationSize; }
+inline Int MemoryPool::getFreeBlockCount() { return getTotalBlockCount() - getUsedBlockCount(); }
+inline Int MemoryPool::getUsedBlockCount() { return m_usedBlocksInPool; }
+inline Int MemoryPool::getTotalBlockCount() { return m_totalBlocksInPool; }
+inline Int MemoryPool::getPeakBlockCount() { return m_peakUsedBlocksInPool; }
+inline Int MemoryPool::getInitialBlockCount() { return m_initialAllocationCount; }
+
+// ----------------------------------------------------------------------------
+inline DynamicMemoryAllocator *DynamicMemoryAllocator::getNextDmaInList() { return m_nextDmaInFactory; }
+
+// EXTERNALS //////////////////////////////////////////////////////////////////
+
+/**
+	Initialize the memory manager. Construct a new MemoryPoolFactory and
+	DynamicMemoryAllocator and store 'em in the singletons of the relevant
+	names.
+*/
+extern void initMemoryManager();
+
+/**
+	return true if initMemoryManager() has been called.
+	return false if only preMainInitMemoryManager() has been called.
+*/
+extern Bool isMemoryManagerOfficiallyInited();
+
+/**
+	similar to initMemoryManager, but this should be used if the memory manager must be initialized
+	prior to main() (e.g., from a static constructor). If preMainInitMemoryManager() is called prior
+	to initMemoryManager(), then subsequent calls to either are quietly ignored, AS IS any subsequent
+	call to shutdownMemoryManager() [since there's no safe way to ensure that shutdownMemoryManager
+	will execute after all static destructors].
+
+	(Note: this function is actually not externally visible, but is documented here for clarity.)
+*/
+/* extern void preMainInitMemoryManager(); */
+
+/**
+	Shut down the memory manager. Throw away TheMemoryPoolFactory and
+	TheDynamicMemoryAllocator.
+*/
+extern void shutdownMemoryManager();
+
+extern MemoryPoolFactory *TheMemoryPoolFactory;
+extern DynamicMemoryAllocator *TheDynamicMemoryAllocator;
+
+/**
+	This function is declared in this header, but is not defined anywhere -- you must provide
+	it in your code. It is called by initMemoryManager() or preMainInitMemoryManager() in order
+	to get the specifics of the subpool for the dynamic memory allocator. (If you just want
+	some defaults, set both return arguments to zero.) The reason for this odd setup is that
+	we may need to init the memory manager prior to main() [due to static C++ ctors] and
+	this allows us a way to get the necessary parameters.
+*/
+extern void userMemoryManagerGetDmaParms(Int *numSubPools, const PoolInitRec **pParms);
+
+/**
+	This function is declared in this header, but is not defined anywhere -- you must provide
+	it in your code. It is called by initMemoryManager() or preMainInitMemoryManager() in order
+	to initialize the pools to be used. (You can define an empty function if you like.)
+*/
+extern void userMemoryManagerInitPools();
+
+/**
+	This function is declared in this header, but is not defined anywhere -- you must provide
+	it in your code. It is called by createMemoryPool to adjust the allocation size(s) for a
+	given pool. Note that the counts are in-out parms!
+*/
+extern void userMemoryAdjustPoolSize(const char *poolName, Int& initialAllocationCount, Int& overflowAllocationCount);
+
+#ifdef __cplusplus
+
+#ifndef _OPERATOR_NEW_DEFINED_
+
+	#define _OPERATOR_NEW_DEFINED_
+
+	extern void * __cdecl operator new		(size_t size);
+	extern void __cdecl operator delete		(void *p);
+
+	extern void * __cdecl operator new[]	(size_t size);
+	extern void __cdecl operator delete[]	(void *p);
+
+	// additional overloads to account for VC/MFC funky versions
+	extern void* __cdecl operator new(size_t nSize, const char *, int);
+	extern void __cdecl operator delete(void *, const char *, int);
+
+	extern void* __cdecl operator new[](size_t nSize, const char *, int);
+	extern void __cdecl operator delete[](void *, const char *, int);
+
+#if defined(_MSC_VER) && _MSC_VER < 1300
+	// additional overloads for 'placement new'
+	//inline void* __cdecl operator new							(size_t s, void *p) { return p; }
+	//inline void __cdecl operator delete						(void *, void *p)		{ }
+	inline void* __cdecl operator new[]						(size_t s, void *p) { return p; }
+	inline void __cdecl operator delete[]					(void *, void *p)		{ }
+#endif
+
+#endif
+
+#ifdef MEMORYPOOL_DEBUG_CUSTOM_NEW
+	#define MSGNEW(MSG)		new(MSG, 0)
+	#define NEW						new(__FILE__, __LINE__)
+#else
+	#define MSGNEW(MSG)		new
+	#define NEW						new
+#endif
+
+#endif
+
+class STLSpecialAlloc
+{
+public:
+	static void* allocate(size_t __n);
+	static void deallocate(void* __p, size_t);
+};
+
+#endif // DISABLE_GAMEMEMORY
+
+
+/**
+	A simple utility class to ensure exception safety; this holds a MemoryPoolObject
+	and deletes it in its destructor. Especially useful for iterators!
+*/
+class MemoryPoolObjectHolder
+{
+private:
+	MemoryPoolObject *m_mpo;
+public:
+	MemoryPoolObjectHolder(MemoryPoolObject *mpo = NULL) : m_mpo(mpo) { }
+	void hold(MemoryPoolObject *mpo) { DEBUG_ASSERTCRASH(!m_mpo, ("already holding")); m_mpo = mpo; }
+	void release() { m_mpo = NULL; }
+	~MemoryPoolObjectHolder() { deleteInstance(m_mpo); }
+};
+
+
+#define EMPTY_DTOR(CLASS) inline CLASS::~CLASS() { }
diff --git a/Core/GameEngine/Include/Common/GameMemoryNull.h b/Core/GameEngine/Include/Common/GameMemoryNull.h
new file mode 100644
index 00000000000..5babbf4553c
--- /dev/null
+++ b/Core/GameEngine/Include/Common/GameMemoryNull.h
@@ -0,0 +1,171 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define allocateBytes(ARGCOUNT,ARGLITERAL)          allocateBytesImplementation(ARGCOUNT)
+#define allocateBytesDoNotZero(ARGCOUNT,ARGLITERAL) allocateBytesDoNotZeroImplementation(ARGCOUNT)
+#define newInstanceDesc(ARGCLASS,ARGLITERAL)        new ARGCLASS
+#define newInstance(ARGCLASS)                       new ARGCLASS
+#define MSGNEW(MSG)                                 new
+#define NEW                                         new
+
+
+/**
+	The DynamicMemoryAllocator class is used to handle unpredictably-sized
+	allocation requests.
+*/
+class DynamicMemoryAllocator
+{
+public:
+
+	/// allocate bytes from this pool. (don't call directly; use allocateBytes() macro)
+	void *allocateBytesImplementation(Int numBytes);
+
+	/// like allocateBytesImplementation, but zeroes the memory before returning
+	void *allocateBytesDoNotZeroImplementation(Int numBytes);
+
+#ifdef MEMORYPOOL_DEBUG
+	void debugIgnoreLeaksForThisBlock(void* pBlockPtr);
+#endif
+
+	/// free the bytes. (assumes allocated by this dma.)
+	void freeBytes(void* pMem);
+
+	/**
+		return the actual number of bytes that would be allocated
+		if you tried to allocate the given size.
+	*/
+	Int getActualAllocationSize(Int numBytes);
+};
+
+
+/**
+	The class that manages all the MemoryPools and DynamicMemoryAllocators.
+	Usually you will create exactly one of these (TheMemoryPoolFactory)
+	and use it for everything.
+*/
+class MemoryPoolFactory
+{
+public:
+
+	void memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead = NULL );
+
+#ifdef MEMORYPOOL_DEBUG
+
+	void debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp = NULL );
+	void debugSetInitFillerIndex(Int index);
+
+#endif
+};
+
+
+#define MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
+protected: \
+	virtual ~ARGCLASS(); \
+public: /* include this line at the end to reset visibility to 'public' */
+
+
+#define MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ARGCLASS, ARGPOOLNAME) \
+	MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS)
+
+
+// this is the version for an Abstract Base Class, which will never be instantiated...
+#define MEMORY_POOL_GLUE_ABC(ARGCLASS) \
+protected: \
+	virtual ~ARGCLASS(); \
+public: /* include this line at the end to reset visibility to 'public' */
+
+
+/**
+	This class is provided as a simple and safe way to integrate C++ object allocation
+	into MemoryPool usage. To use it, you must have your class inherit from
+	MemoryPoolObject, then put the macro MEMORY_POOL_GLUE(MyClassName, "MyPoolName")
+	at the start of your class definition. (This does not create the pool itself -- you
+	must create that manually using MemoryPoolFactory::createMemoryPool)
+*/
+class MemoryPoolObject
+{
+protected:
+
+	/** ensure that all destructors are virtual */
+	virtual ~MemoryPoolObject() { }
+
+public:
+
+	static void deleteInstanceInternal(MemoryPoolObject* mpo)
+	{
+		delete mpo;
+	}
+};
+
+inline void deleteInstance(MemoryPoolObject* mpo)
+{
+	MemoryPoolObject::deleteInstanceInternal(mpo);
+}
+
+
+/**
+	Initialize the memory manager. Construct a new MemoryPoolFactory and
+	DynamicMemoryAllocator and store 'em in the singletons of the relevant
+	names.
+*/
+extern void initMemoryManager();
+
+/**
+	return true if initMemoryManager() has been called.
+	return false if only preMainInitMemoryManager() has been called.
+*/
+extern Bool isMemoryManagerOfficiallyInited();
+
+/**
+	Shut down the memory manager. Throw away TheMemoryPoolFactory and
+	TheDynamicMemoryAllocator.
+*/
+extern void shutdownMemoryManager();
+
+extern MemoryPoolFactory *TheMemoryPoolFactory;
+extern DynamicMemoryAllocator *TheDynamicMemoryAllocator;
+
+
+// TheSuperHackers @info
+// The new operator overloads will zero all memory after allocation.
+// This replicates the behavior of the original Game Memory implementation and is necessary to avoid crashing the game,
+// where data is not properly zero initialized. Disable these operators when fixing those issues.
+#ifndef DISABLE_GAMEMEMORY_NEW_OPERATORS
+
+extern void * __cdecl operator new(size_t size);
+extern void __cdecl operator delete(void *p);
+
+extern void * __cdecl operator new[](size_t size);
+extern void __cdecl operator delete[](void *p);
+
+// additional overloads to account for VC/MFC funky versions
+extern void* __cdecl operator new(size_t size, const char *, int);
+extern void __cdecl operator delete(void *p, const char *, int);
+
+extern void* __cdecl operator new[](size_t size, const char *, int);
+extern void __cdecl operator delete[](void *p, const char *, int);
+
+#endif
+
+#if defined(_MSC_VER) && _MSC_VER < 1300
+// additional overloads for 'placement new'
+inline void* __cdecl operator new[](size_t s, void* p) { return p; }
+inline void __cdecl operator delete[](void*, void* p) {}
+#endif
diff --git a/Core/GameEngine/Include/Common/GameMusic.h b/Core/GameEngine/Include/Common/GameMusic.h
new file mode 100644
index 00000000000..864c52f82a5
--- /dev/null
+++ b/Core/GameEngine/Include/Common/GameMusic.h
@@ -0,0 +1,112 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:    RTS 3
+//
+// File name:  Common/GameMusic.h
+//
+// Created:    5/01/01
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+//----------------------------------------------------------------------------
+//           Includes
+//----------------------------------------------------------------------------
+
+#include "Common/GameAudio.h"
+#include "Common/GameMemory.h"
+
+
+//----------------------------------------------------------------------------
+//           Forward References
+//----------------------------------------------------------------------------
+
+class AudioEventRTS;
+struct FieldParse;
+
+//----------------------------------------------------------------------------
+//           Type Defines
+//----------------------------------------------------------------------------
+
+
+//===============================
+// MusicTrack
+//===============================
+
+//-------------------------------------------------------------------------------------------------
+/** The MusicTrack struct holds all information about a music track.
+	* Place data in TrackInfo that is useful to the game code in determining
+	* what tracks to play. */
+//-------------------------------------------------------------------------------------------------
+
+class MusicTrack : public MemoryPoolObject
+{
+
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( MusicTrack, "MusicTrack" )
+
+public:
+
+		MusicTrack();
+		// virtual destructor prototype defined by memory pool object
+
+		const FieldParse *getFieldParse( void ) const { return m_musicTrackFieldParseTable; }
+
+		Int					index;									///< Track index
+		AsciiString name;										///< Logical name of track
+		AsciiString filename;								///< Filename with extension of music track
+		Real				volume;									///< Mixing level for this track
+		Bool				ambient;								///< Game info about this track(public)
+
+		MusicTrack *next;
+		MusicTrack *prev;
+
+	static const FieldParse m_musicTrackFieldParseTable[];		///< the parse table for INI definition
+
+};
+
+class MusicManager
+{
+	public:
+		MusicManager();
+		virtual ~MusicManager();
+
+		void playTrack( AudioEventRTS *eventToUse );
+		void stopTrack( AudioHandle eventToRemove );
+
+		virtual void addAudioEvent(AudioEventRTS *eventToAdd);	// pre-copied
+		virtual void removeAudioEvent( AudioHandle eventToRemove );
+
+		void setVolume( Real m_volume );
+};
diff --git a/Core/GameEngine/Include/Common/GameSounds.h b/Core/GameEngine/Include/Common/GameSounds.h
new file mode 100644
index 00000000000..4f3a5f955ea
--- /dev/null
+++ b/Core/GameEngine/Include/Common/GameSounds.h
@@ -0,0 +1,98 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:    RTS 3
+//
+// File name:  Common/GameSounds.h
+//
+// Created:    5/02/01
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+#include "Common/SubsystemInterface.h"
+#include "Common/GameAudio.h"
+#include "Common/GameType.h"
+
+// Forward declarations
+class AudioEventRTS;
+
+class SoundManager : public SubsystemInterface
+{
+	public:
+		SoundManager();
+		virtual ~SoundManager();
+
+		virtual void init( void );										///< Initializes the sounds system
+		virtual void postProcessLoad();
+		virtual void update( void );									///< Services sounds tasks. Called by AudioInterface
+		virtual void reset( void );										///< Reset the sounds system
+
+		virtual void loseFocus( void );								///< Called when application loses focus
+		virtual void regainFocus( void );							///< Called when application regains focus
+
+		virtual void setListenerPosition( const Coord3D *position );	///< Set the listener position for map3DSound() calculations
+		virtual void setViewRadius( Real viewRadius );///< Sets the radius of the view from the center of the screen in world coordinate units
+		virtual void setCameraAudibleDistance( Real audibleDistance );
+		virtual Real getCameraAudibleDistance( void );
+
+		virtual void addAudioEvent(AudioEventRTS *&eventToAdd);	// pre-copied
+
+		virtual void notifyOf2DSampleStart( void );
+		virtual void notifyOf3DSampleStart( void );
+
+		virtual void notifyOf2DSampleCompletion( void );
+		virtual void notifyOf3DSampleCompletion( void );
+
+		virtual Int getAvailableSamples( void );
+		virtual Int getAvailable3DSamples( void );
+
+		// empty string means that this sound wasn't found or some error occurred. CHECK FOR EMPTY STRING.
+		virtual AsciiString getFilenameForPlayFromAudioEvent( const AudioEventRTS *eventToGetFrom );
+
+		// called by this class and MilesAudioManager to determine if a sound can still be played
+		virtual Bool canPlayNow( AudioEventRTS *event );
+
+	protected:
+		virtual Bool violatesVoice( AudioEventRTS *event );
+		virtual Bool isInterrupting( AudioEventRTS *event );
+
+
+	protected:
+		UnsignedInt m_num2DSamples;
+		UnsignedInt m_num3DSamples;
+
+		UnsignedInt m_numPlaying2DSamples;
+		UnsignedInt m_numPlaying3DSamples;
+};
diff --git a/Core/GameEngine/Include/Common/GameUtility.h b/Core/GameEngine/Include/Common/GameUtility.h
new file mode 100644
index 00000000000..86790ff4847
--- /dev/null
+++ b/Core/GameEngine/Include/Common/GameUtility.h
@@ -0,0 +1,39 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "Lib/BaseType.h"
+
+// For miscellaneous game utility functions.
+
+class Player;
+typedef Int PlayerIndex;
+
+namespace rts
+{
+
+bool localPlayerHasRadar();
+Player* getObservedOrLocalPlayer(); ///< Get the current observed or local player. Is never null.
+Player* getObservedOrLocalPlayer_Safe(); ///< Get the current observed or local player. Is never null, except when the application does not have players.
+PlayerIndex getObservedOrLocalPlayerIndex_Safe(); ///< Get the current observed or local player index. Returns 0 when the application does not have players.
+
+void changeLocalPlayer(Player* player); //< Change local player during game. Must not pass null.
+void changeObservedPlayer(Player* player); ///< Change observed player during game. Can pass null: is identical to passing the "ReplayObserver" player.
+
+} // namespace rts
diff --git a/Core/GameEngine/Include/Common/LocalFile.h b/Core/GameEngine/Include/Common/LocalFile.h
new file mode 100644
index 00000000000..db9568ee0e7
--- /dev/null
+++ b/Core/GameEngine/Include/Common/LocalFile.h
@@ -0,0 +1,131 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------=
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:    WSYS Library
+//
+// Module:     IO
+//
+// File name:  LocalFile.h
+//
+// Created:    4/23/01
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+//----------------------------------------------------------------------------
+//           Includes
+//----------------------------------------------------------------------------
+
+#include "Common/file.h"
+
+#if USE_BUFFERED_IO
+#include "Utility/stdio_adapter.h"
+#endif
+
+//----------------------------------------------------------------------------
+//           Forward References
+//----------------------------------------------------------------------------
+
+
+//----------------------------------------------------------------------------
+//           Type Defines
+//----------------------------------------------------------------------------
+
+//===============================
+// LocalFile
+//===============================
+/**
+  *	File abstraction for standard C file operators: open, close, lseek, read, write
+	*/
+//===============================
+
+class LocalFile : public File
+{
+	MEMORY_POOL_GLUE_ABC(LocalFile)
+	private:
+
+#if USE_BUFFERED_IO
+		// srj sez: this was purely an experiment in optimization.
+		// at the present time, it doesn't appear to be a good one.
+		// TheSuperHackers @info It is a good optimization and will be
+		// significantly faster than unbuffered IO with small reads and writes.
+		FILE* m_file;
+#else
+		int m_handle;											///< Local C file handle
+#endif
+
+	public:
+
+		LocalFile();
+		//virtual				~LocalFile();
+
+
+		virtual Bool	open( const Char *filename, Int access = NONE, size_t bufferSize = BUFFERSIZE ); ///< Open a file for access
+		virtual void	close( void );																			///< Close the file
+		virtual Int		read( void *buffer, Int bytes );										///< Read the specified number of bytes in to buffer: See File::read
+		virtual Int		readChar();																///< Read a character from the file
+		virtual Int		readWideChar();															///< Read a wide character from the file
+		virtual Int		write( const void *buffer, Int bytes );							///< Write the specified number of bytes from the buffer: See File::write
+		virtual Int		writeFormat( const Char* format, ... );							///< Write an unterminated formatted string to the file
+		virtual Int		writeFormat( const WideChar* format, ... );						///< Write an unterminated formatted string to the file
+		virtual Int		writeChar( const Char* character );								///< Write a character to the file
+		virtual Int		writeChar( const WideChar* character );							///< Write a wide character to the file
+		virtual Int		seek( Int new_pos, seekMode mode = CURRENT );				///< Set file position: See File::seek
+		virtual Bool	flush();													///< flush data to disk
+		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0);				///< moves file position to after the next new-line
+		virtual Bool	scanInt(Int &newInt);																///< return what gets read in as an integer at the current file position.
+		virtual Bool	scanReal(Real &newReal);														///< return what gets read in as a float at the current file position.
+		virtual	Bool	scanString(AsciiString &newString);									///< return what gets read in as a string at the current file position.
+		/**
+			Allocate a buffer large enough to hold entire file, read
+			the entire file into the buffer, then close the file.
+			the buffer is owned by the caller, who is responsible
+			for freeing is (via delete[]). This is a Good Thing to
+			use because it minimizes memory copies for BIG files.
+		*/
+		virtual char* readEntireAndClose();
+		virtual File* convertToRAMFile();
+
+	protected:
+
+		void closeWithoutDelete();
+		void closeFile();
+};
+
+
+
+
+//----------------------------------------------------------------------------
+//           Inlining
+//----------------------------------------------------------------------------
diff --git a/Core/GameEngine/Include/Common/LocalFileSystem.h b/Core/GameEngine/Include/Common/LocalFileSystem.h
new file mode 100644
index 00000000000..08f00af5d27
--- /dev/null
+++ b/Core/GameEngine/Include/Common/LocalFileSystem.h
@@ -0,0 +1,53 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+/////// LocalFileSystem.h ////////////////////////////////
+// Bryan Cleveland, August 2002
+//////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Common/SubsystemInterface.h"
+#include "FileSystem.h" // for typedefs, etc.
+
+class LocalFileSystem : public SubsystemInterface
+{
+public:
+	virtual ~LocalFileSystem() {}
+
+	virtual void init() = 0;
+	virtual void reset() = 0;
+	virtual void update() = 0;
+
+	virtual File * openFile(const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE) = 0;
+	virtual Bool doesFileExist(const Char *filename) const = 0;
+	virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const = 0; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.
+	virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const = 0; ///< see FileSystem.h
+	virtual Bool createDirectory(AsciiString directory) = 0; ///< see FileSystem.h
+	virtual AsciiString normalizePath(const AsciiString& filePath) const = 0;	///< see FileSystem.h
+
+protected:
+};
+
+extern LocalFileSystem *TheLocalFileSystem;
diff --git a/Core/GameEngine/Include/Common/MapObject.h b/Core/GameEngine/Include/Common/MapObject.h
new file mode 100644
index 00000000000..1438662eccc
--- /dev/null
+++ b/Core/GameEngine/Include/Common/MapObject.h
@@ -0,0 +1,182 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+// MapObject.h
+// Class to encapsulate height map.
+// Author: John Ahlquist, April 2001
+
+#pragma once
+
+#include "Common/Dict.h"
+#include "Common/GameMemory.h"
+#include "GameClient/TerrainRoads.h"
+
+
+
+class WorldHeightMapInterfaceClass
+{
+public:
+
+  virtual Int getBorderSize() = 0;
+  virtual Real getSeismicZVelocity(Int xIndex, Int yIndex) const = 0;
+  virtual void setSeismicZVelocity(Int xIndex, Int yIndex, Real value) = 0;
+  virtual Real getBilinearSampleSeismicZVelocity( Int x, Int y) = 0;
+
+};
+
+/** MapObject class
+Not ref counted.  Do not store pointers to this class.  */
+class WorldHeightMap;
+class RenderObjClass;
+class ThingTemplate;
+class Shadow;
+enum WaypointID CPP_11(: Int);
+
+#define MAP_XY_FACTOR			(10.0f)	 //How wide and tall each height map square is in world space.
+#define MAP_HEIGHT_SCALE	(MAP_XY_FACTOR/16.0f)		//divide all map heights by 8.
+
+// m_flags bit values.
+enum {
+	FLAG_DRAWS_IN_MIRROR		= 0x00000001,			 ///< If set, draws in water mirror.
+	FLAG_ROAD_POINT1				= 0x00000002,			 ///< If set, is the first point in a road segment.
+	FLAG_ROAD_POINT2				= 0x00000004,			 ///< If set, is the second point in a road segment.
+	FLAG_ROAD_FLAGS					= (FLAG_ROAD_POINT1|FLAG_ROAD_POINT2),	 ///< If nonzero, object is a road piece.
+	FLAG_ROAD_CORNER_ANGLED	= 0x00000008,			 ///< If set, the road corner is angled rather than curved.
+	FLAG_BRIDGE_POINT1			= 0x00000010,			 ///< If set, is the first point in a bridge.
+	FLAG_BRIDGE_POINT2			= 0x00000020,			 ///< If set, is the second point in a bridge.
+	FLAG_BRIDGE_FLAGS				= (FLAG_BRIDGE_POINT1|FLAG_BRIDGE_POINT2),	 ///< If nonzero, object is a bridge piece.
+	FLAG_ROAD_CORNER_TIGHT	= 0x00000040,
+	FLAG_ROAD_JOIN					= 0x00000080,			 ///< If set, this road end does a generic alpha join.
+	FLAG_DONT_RENDER				= 0x00000100			 ///< If set, do not render this object. Only WB pays attention to this. (Right now, anyways)
+};
+
+class MapObject : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(MapObject, "MapObject")
+
+// friend doesn't play well with MPO -- srj
+//	friend class WorldHeightMap;
+//	friend class WorldHeightMapEdit;
+//	friend class AddObjectUndoable;
+//	friend class DeleteInfo;
+
+	enum
+	{
+		MO_SELECTED = 0x01,
+		MO_LIGHT = 0x02,
+		MO_WAYPOINT = 0x04,
+		MO_SCORCH = 0x08
+	};
+
+	// This data is currently written out into the map data file.
+	Coord3D								m_location;					///< Location of the center of the object.
+	AsciiString						m_objectName;				///< The object name.
+	const ThingTemplate*	m_thingTemplate; ///< thing template for map object
+	Real									m_angle;						///< positive x is 0 degrees, angle is counterclockwise in degrees.
+	MapObject*						m_nextMapObject;		///< linked list.
+	Int										m_flags;						///< Bit flags.
+	Dict									m_properties;				///< general property sheet.
+	// This data is runtime data that is used by the worldbuider editor, but
+	// not saved in the map file.
+	Int										m_color;		 ///< Display color.
+	RenderObjClass*				m_renderObj; ///< object that renders in the 3d scene.
+	Shadow*								m_shadowObj; ///< object that renders shadow in the 3d scene.
+	RenderObjClass*				m_bridgeTowers[ BRIDGE_MAX_TOWERS ];		///< for bridge towers
+	Int										m_runtimeFlags;
+
+public:
+	static MapObject *TheMapObjectListPtr;
+	static Dict TheWorldDict;
+
+public:
+	MapObject(Coord3D loc, AsciiString name, Real angle, Int flags, const Dict* props,
+						const ThingTemplate *thingTemplate );
+	//~MapObject(void);		///< Note that deleting the head of a list deletes all linked objects in the list.
+
+public:
+
+	Dict *getProperties() { return &m_properties; }	///< return the object's property sheet.
+
+	void setNextMap(MapObject *nextMap) {m_nextMapObject = nextMap;} ///< Link the next map object.
+	const Coord3D *getLocation(void) const {return &m_location;} ///< Get the center point.
+	Real getAngle(void) const {return m_angle;} ///< Get the angle.
+	Int getColor(void) const {return m_color;} ///< Gets whatever ui color we set.
+	void setColor(Int color) {m_color=color;} ///< Sets the ui color.
+	AsciiString getName(void) const {return m_objectName;} ///< Gets the object name
+	void setName(AsciiString name); ///< Sets the object name
+	void setThingTemplate( const ThingTemplate* thing ); ///< set template
+	const ThingTemplate *getThingTemplate( void ) const;
+	MapObject *getNext(void) const {return m_nextMapObject;}		 ///< Next map object in the list.  Not a copy, don't delete it.
+	MapObject *duplicate(void);		 ///< Allocates a copy.  Caller is responsible for delete-ing this when done with it.
+
+	void setAngle(Real angle) {m_angle = normalizeAngle(angle);}
+	void setLocation(Coord3D *pLoc) {m_location = *pLoc;}
+	void setFlag(Int flag) {m_flags |= flag;}
+	void clearFlag(Int flag) {m_flags &= (~flag);}
+	Bool getFlag(Int flag) const {return (m_flags&flag)?true:false;}
+	Int getFlags(void) const {return (m_flags);}
+
+	Bool isSelected(void) const {return (m_runtimeFlags & MO_SELECTED) != 0;}
+	void setSelected(Bool sel) { if (sel) m_runtimeFlags |= MO_SELECTED; else m_runtimeFlags &= ~MO_SELECTED; }
+
+	Bool isLight(void) const {return (m_runtimeFlags & MO_LIGHT) != 0;}
+	Bool isWaypoint(void) const {return (m_runtimeFlags & MO_WAYPOINT) != 0;}
+	Bool isScorch(void) const {return (m_runtimeFlags & MO_SCORCH) != 0;}
+
+	void setIsLight() {m_runtimeFlags |= MO_LIGHT;}
+	void setIsWaypoint() { m_runtimeFlags |= MO_WAYPOINT; }
+	void setIsScorch() { m_runtimeFlags |= MO_SCORCH; }
+
+	void setRenderObj(RenderObjClass *pObj);
+	RenderObjClass *getRenderObj(void) const {return m_renderObj;}
+	void setShadowObj(Shadow *pObj)	{m_shadowObj=pObj;}
+	Shadow *getShadowObj(void) const {return m_shadowObj;}
+
+	RenderObjClass* getBridgeRenderObject( BridgeTowerType type );
+	void setBridgeRenderObject( BridgeTowerType type, RenderObjClass* renderObj );
+
+	WaypointID getWaypointID();
+	AsciiString getWaypointName();
+	void setWaypointID(Int i);
+	void setWaypointName(AsciiString n);
+
+	// calling validate will call verifyValidTeam and verifyValidUniqueID.
+	void validate(void);
+
+	// verifyValidTeam will either place the map object on an approrpriate team, or leave the
+	// current team (if it is valid)
+	void verifyValidTeam(void);
+
+	// verifyValidUniqueID will ensure that this unit isn't sharing a number with another unit.
+	void verifyValidUniqueID(void);
+
+	// The fast version doesn't attempt to verify uniqueness. It goes
+	static void fastAssignAllUniqueIDs(void);
+
+
+	static MapObject *getFirstMapObject(void) { return TheMapObjectListPtr; }
+	static Dict* getWorldDict() { return &TheWorldDict; }
+	static Int countMapObjectsWithOwner(const AsciiString& n);
+};
diff --git a/Core/GameEngine/Include/Common/MiniDumper.h b/Core/GameEngine/Include/Common/MiniDumper.h
new file mode 100644
index 00000000000..44c03e96ef1
--- /dev/null
+++ b/Core/GameEngine/Include/Common/MiniDumper.h
@@ -0,0 +1,97 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#ifdef RTS_ENABLE_CRASHDUMP
+#include "DbgHelpLoader.h"
+
+enum DumpType CPP_11(: Char)
+{
+	// Smallest dump type with call stacks and some supporting variables
+	DumpType_Minimal = 'M',
+	// Largest dump size including complete memory contents of the process
+	DumpType_Full = 'F',
+};
+
+class MiniDumper
+{
+	enum MiniDumperExitCode CPP_11(: Int)
+	{
+		MiniDumperExitCode_Success = 0x0,
+		MiniDumperExitCode_FailureWait = 0x37DA1040,
+		MiniDumperExitCode_FailureParam = 0x4EA527BB,
+		MiniDumperExitCode_ForcedTerminate = 0x158B1154,
+	};
+
+public:
+	MiniDumper();
+	Bool IsInitialized() const;
+	void TriggerMiniDump(DumpType dumpType);
+	void TriggerMiniDumpForException(_EXCEPTION_POINTERS* e_info, DumpType dumpType);
+	static void initMiniDumper(const AsciiString& userDirPath);
+	static void shutdownMiniDumper();
+	static LONG WINAPI DumpingExceptionFilter(_EXCEPTION_POINTERS* e_info);
+
+private:
+	void Initialize(const AsciiString& userDirPath);
+	void ShutDown();
+	void CreateMiniDump(DumpType dumpType);
+	void CleanupResources();
+	Bool IsDumpThreadStillRunning() const;
+	void ShutdownDumpThread();
+
+	// Thread procs
+	static DWORD WINAPI MiniDumpThreadProc(LPVOID lpParam);
+	DWORD ThreadProcInternal();
+
+	// Dump file directory bookkeeping
+	Bool InitializeDumpDirectory(const AsciiString& userDirPath);
+	static void KeepNewestFiles(const std::string& directory, const DumpType dumpType, const Int keepCount);
+
+	// Struct to hold file information
+	struct FileInfo
+	{
+		std::string name;
+		FILETIME lastWriteTime;
+	};
+
+	static bool CompareByLastWriteTime(const FileInfo& a, const FileInfo& b);
+
+private:
+	Bool m_miniDumpInitialized;
+	Bool m_loadedDbgHelp;
+	DumpType m_requestedDumpType;
+
+	// Path buffers
+	Char m_dumpDir[MAX_PATH];
+	Char m_dumpFile[MAX_PATH];
+	WideChar m_executablePath[MAX_PATH];
+
+	// Event handles
+	HANDLE m_dumpRequested;
+	HANDLE m_dumpComplete;
+	HANDLE m_quitting;
+
+	// Thread handles
+	HANDLE m_dumpThread;
+	DWORD m_dumpThreadId;
+};
+
+extern MiniDumper* TheMiniDumper;
+#endif
diff --git a/Core/GameEngine/Include/Common/MiscAudio.h b/Core/GameEngine/Include/Common/MiscAudio.h
new file mode 100644
index 00000000000..fa7b47f3c16
--- /dev/null
+++ b/Core/GameEngine/Include/Common/MiscAudio.h
@@ -0,0 +1,72 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///MiscAudio.h/////////////////////////////////////////////////////////////////////////////////////
+// This file is for miscellaneous sound hooks that don't have another happy home.
+
+#pragma once
+
+#include "Common/AudioEventRTS.h"
+
+struct MiscAudio
+{
+	static const FieldParse m_fieldParseTable[];
+
+	AudioEventRTS m_radarUnitUnderAttackSound;						///< radar sounds to play when unit under attack
+	AudioEventRTS m_radarHarvesterUnderAttackSound;				///< radar sounds to play when harvester under attack
+	AudioEventRTS m_radarStructureUnderAttackSound;				///< radar sounds to play when structure under attack
+	AudioEventRTS m_radarUnderAttackSound;								///< radar sounds to play when ? under attack
+	AudioEventRTS m_radarInfiltrationSound;								///< radar sounds to play when something is infiltrated
+	AudioEventRTS m_radarOnlineSound;											///< radar sounds to play when radar goes online
+	AudioEventRTS m_radarOfflineSound;										///< radar sounds to play when radar goes offline
+	AudioEventRTS m_defectorTimerTickSound;								///< snd to play during transient invulnerability while defecting // lorenzen
+	AudioEventRTS m_defectorTimerDingSound;								///< snd to play when you become vulnerable again // lorenzen
+	AudioEventRTS m_lockonTickSound;											///< snd to play during stealth-fighter-lockon period
+	AudioEventRTS m_allCheerSound;												///< snd to play when user presses 'cheer' key
+	AudioEventRTS m_battleCrySound;												///< snd to play when user presses 'battlecry' key
+	AudioEventRTS m_guiClickSound;												///< snd to play when user presses button in GUI
+	AudioEventRTS m_noCanDoSound;													///< Global "No Can Do" sound
+	AudioEventRTS	m_stealthDiscoveredSound;								///< I have just discovered an enemy stealth unit
+	AudioEventRTS	m_stealthNeutralizedSound;							///< One of my stealthed units has just been discovered by the enemy
+	AudioEventRTS m_moneyDepositSound;										///< Money was deposited in my bank
+	AudioEventRTS m_moneyWithdrawSound;										///< Money was withdrawn from my bank
+	AudioEventRTS m_buildingDisabled;											///< Building has lost power, been hit with an EMP, or disable hacked.
+	AudioEventRTS m_buildingReenabled;										///< Building has recovered from being disabled.
+	AudioEventRTS m_vehicleDisabled;											///< Vehicle has been disabled via EMP or hacker attack.
+	AudioEventRTS m_vehicleReenabled;											///< Vehicle has recovered from being disabled.
+	AudioEventRTS m_splatterVehiclePilotsBrain;						///< Pilot has been sniped by Jarmen Kell.
+	AudioEventRTS m_terroristInCarMoveVoice;							///< Terrorist issues a move order while in a car.
+	AudioEventRTS m_terroristInCarAttackVoice;						///< Terrorist issues attack order while in a car.
+	AudioEventRTS m_terroristInCarSelectVoice;						///< Terrorist is selected while in a car.
+	AudioEventRTS m_crateHeal;														///< When heal crate is picked up.
+	AudioEventRTS m_crateShroud;													///< When shroud crate is picked up.
+	AudioEventRTS m_crateSalvage;													///< When salvage crate is picked up.
+	AudioEventRTS m_crateFreeUnit;												///< When free unit crate is picked up.
+	AudioEventRTS m_crateMoney;														///< When money crate is picked up.
+	AudioEventRTS m_unitPromoted;													///< Unit is promoted.
+	AudioEventRTS m_repairSparks;													///< Battle drone repairs unit.
+	AudioEventRTS m_sabotageShutDownBuilding;											///< When Saboteur hits a building
+	AudioEventRTS m_sabotageResetTimerBuilding;											///< When Saboteur hits a building
+	AudioEventRTS m_aircraftWheelScreech;									///< When a jet lands on a runway.
+};
diff --git a/Core/GameEngine/Include/Common/ObjectStatusTypes.h b/Core/GameEngine/Include/Common/ObjectStatusTypes.h
new file mode 100644
index 00000000000..affa254c9e0
--- /dev/null
+++ b/Core/GameEngine/Include/Common/ObjectStatusTypes.h
@@ -0,0 +1,143 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: ObjectStatusTypes.h /////////////////////////////////////////////////////////////////////////
+// Author: Kris, May 2003
+// Desc:   Object status types that are stackable using the BitSet system. Used to be ObjectStatusBits
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "Lib/BaseType.h"
+#include "Common/BitFlags.h"
+#include "Common/BitFlagsIO.h"
+
+//-------------------------------------------------------------------------------------------------
+/** Object status types */
+//-------------------------------------------------------------------------------------------------
+enum ObjectStatusTypes CPP_11(: Int)
+{
+	//These are saved. Do not insert or remove any!
+
+	OBJECT_STATUS_NONE,									///< no status bit
+	OBJECT_STATUS_DESTROYED,						///< has been destroyed, pending delete
+	OBJECT_STATUS_CAN_ATTACK,						///< used by garrissoned buildings, is OR'ed with KINDOF_CAN_ATTACK in isAbleToAttack()
+	OBJECT_STATUS_UNDER_CONSTRUCTION,		///< object is being constructed and is not yet complete
+	OBJECT_STATUS_UNSELECTABLE,					///< This is a negative condition since these statuses are overrides.  ie their presence forces the condition, but their absence means nothing
+	OBJECT_STATUS_NO_COLLISIONS,				///< object should be ignored for object-object collisions (but not object-ground); used for thing like collapsing parachutes that are intangible
+	OBJECT_STATUS_NO_ATTACK,						///< Absolute override to being able to attack
+	OBJECT_STATUS_AIRBORNE_TARGET,			///< InTheAir as far as AntiAir weapons are concerned only.
+	OBJECT_STATUS_PARACHUTING,					///< object is on a parachute
+	OBJECT_STATUS_REPULSOR,							///< object repulses "KINDOF_CAN_BE_REPULSED" objects.
+	OBJECT_STATUS_HIJACKED,  						///< unit is in the possesion of an enemy criminal, call the authorities
+	OBJECT_STATUS_AFLAME,								///< This object is on fire.
+	OBJECT_STATUS_BURNED,								///< This object has already burned as much as it can.
+	OBJECT_STATUS_WET,									///< object has been soaked with water
+	OBJECT_STATUS_IS_FIRING_WEAPON,			///< Object is firing a weapon, now. Not true for special attacks. --Lorenzen
+	OBJECT_STATUS_BRAKING,							///< Object is braking, and subverts the physics.
+	OBJECT_STATUS_STEALTHED,						///< Object is currently "stealthed"
+	OBJECT_STATUS_DETECTED,							///< Object is in range of a stealth-detector unit (meaningless if STEALTHED not set)
+	OBJECT_STATUS_CAN_STEALTH,					///< Object has ability to stealth allowing the stealth update module to run.
+	OBJECT_STATUS_SOLD,									///< Object is being sold
+	OBJECT_STATUS_UNDERGOING_REPAIR,		///< Object is awaiting/undergoing a repair order that has been issued
+	OBJECT_STATUS_RECONSTRUCTING,				///< Reconstructing
+	OBJECT_STATUS_MASKED,								///< Masked objects are not selectable and targetable by players or AI
+	OBJECT_STATUS_IS_ATTACKING,					///< Object is in the general Attack state (incl. aim, approach, etc.). Note that IS_FIRING_WEAPON and IS_AIMING_WEAPON is a subset of this!
+	OBJECT_STATUS_IS_USING_ABILITY,			///< Object is in the process of preparing or firing a special ability.
+	OBJECT_STATUS_IS_AIMING_WEAPON,			///< Object is aiming a weapon, now. Not true for special attacks.
+	OBJECT_STATUS_NO_ATTACK_FROM_AI,		///< attacking this object may not be done from commandSource == CMD_FROM_AI
+	OBJECT_STATUS_IGNORING_STEALTH,			///< temporarily ignoring all stealth bits. (used only for some special-case mine clearing stuff.)
+	OBJECT_STATUS_IS_CARBOMB,						///< Object is now a carbomb.
+
+	// TheSuperHackers @info New statuses added in Zero Hour
+	// Note: Loading old save games that do not track these flags in objects will not recover them. Expect logic bugs.
+	OBJECT_STATUS_DECK_HEIGHT_OFFSET,		///< Object factors deck height on top of ground altitude.
+	OBJECT_STATUS_RIDER1,
+	OBJECT_STATUS_RIDER2,
+	OBJECT_STATUS_RIDER3,
+	OBJECT_STATUS_RIDER4,
+	OBJECT_STATUS_RIDER5,
+	OBJECT_STATUS_RIDER6,
+	OBJECT_STATUS_RIDER7,
+	OBJECT_STATUS_RIDER8,
+	OBJECT_STATUS_FAERIE_FIRE,			///< Anyone shooting at you shoots faster than normal
+  OBJECT_STATUS_MISSILE_KILLING_SELF, ///< Object (likely a missile or bomb) is *BUSTING* its way through the *BUNKER*, building or ground, awaiting death at the bottom.
+	OBJECT_STATUS_REASSIGN_PARKING,			///< Jet is trying to get a better parking assignment.
+	OBJECT_STATUS_BOOBY_TRAPPED,				///< We need to know we have a booby trap on us so we can detonate it from many different code segments
+	OBJECT_STATUS_IMMOBILE,							///< Do not move!
+	OBJECT_STATUS_DISGUISED,						///< Object is disguised (a type of stealth)
+	OBJECT_STATUS_DEPLOYED,							///< Object is deployed.
+	// add more status types here and don't forget to add to the string table ObjectStatusMaskType::s_bitNameList[]
+
+	OBJECT_STATUS_COUNT
+
+};
+
+typedef BitFlags<OBJECT_STATUS_COUNT>	ObjectStatusMaskType;
+
+#define MAKE_OBJECT_STATUS_MASK(k) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k))
+#define MAKE_OBJECT_STATUS_MASK2(k,a) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k), (a))
+#define MAKE_OBJECT_STATUS_MASK3(k,a,b) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k), (a), (b))
+#define MAKE_OBJECT_STATUS_MASK4(k,a,b,c) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k), (a), (b), (c))
+#define MAKE_OBJECT_STATUS_MASK5(k,a,b,c,d) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k), (a), (b), (c), (d))
+
+inline Bool TEST_OBJECT_STATUS_MASK( const ObjectStatusMaskType& m, ObjectStatusTypes t )
+{
+	return m.test( t );
+}
+
+inline Bool TEST_OBJECT_STATUS_MASK_ANY( const ObjectStatusMaskType& m, const ObjectStatusMaskType& mask )
+{
+	return m.anyIntersectionWith( mask );
+}
+
+inline Bool TEST_OBJECT_STATUS_MASK_MULTI( const ObjectStatusMaskType& m, const ObjectStatusMaskType& mustBeSet, const ObjectStatusMaskType& mustBeClear )
+{
+	return m.testSetAndClear( mustBeSet, mustBeClear );
+}
+
+inline Bool OBJECT_STATUS_MASK_ANY_SET( const ObjectStatusMaskType& m)
+{
+	return m.any();
+}
+
+inline void CLEAR_OBJECT_STATUS_MASK( ObjectStatusMaskType& m )
+{
+	m.clear();
+}
+
+inline void SET_ALL_OBJECT_STATUS_MASK_BITS( ObjectStatusMaskType& m )
+{
+	m.clear( );
+	m.flip( );
+}
+
+inline void FLIP_OBJECT_STATUS_MASK( ObjectStatusMaskType& m )
+{
+	m.flip();
+}
+
+// defined in Common/System/ObjectStatusTypes.cpp
+extern ObjectStatusMaskType OBJECT_STATUS_MASK_NONE;	// inits to all zeroes
diff --git a/Core/GameEngine/Include/Common/RAMFile.h b/Core/GameEngine/Include/Common/RAMFile.h
new file mode 100644
index 00000000000..084aa8d857e
--- /dev/null
+++ b/Core/GameEngine/Include/Common/RAMFile.h
@@ -0,0 +1,127 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------=
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:    WSYS Library
+//
+// Module:     IO
+//
+// File name:  wsys/RAMFile.h
+//
+// Created:    11/08/01
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+//----------------------------------------------------------------------------
+//           Includes
+//----------------------------------------------------------------------------
+
+#include "Common/file.h"
+
+//----------------------------------------------------------------------------
+//           Forward References
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//           Type Defines
+//----------------------------------------------------------------------------
+
+//===============================
+// RAMFile
+//===============================
+/**
+  *	File abstraction for standard C file operators: open, close, lseek, read, write
+	*/
+//===============================
+
+class RAMFile : public File
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RAMFile, "RAMFile")
+	protected:
+
+		Char				*m_data;											///< File data in memory
+		Int					m_pos;												///< current read position
+		Int					m_size;												///< size of file in memory
+
+	public:
+
+		RAMFile();
+		//virtual				~RAMFile();
+
+
+		virtual Bool	open( const Char *filename, Int access = NONE, size_t bufferSize = 0 ); ///< Open a file for access
+		virtual void	close( void );																			///< Close the file
+		virtual Int		read( void *buffer, Int bytes );										///< Read the specified number of bytes in to buffer: See File::read
+		virtual Int		readChar();																///< Read a character from the file
+		virtual Int		readWideChar();															///< Read a wide character from the file
+		virtual Int		write( const void *buffer, Int bytes );							///< Write the specified number of bytes from the buffer: See File::write
+		virtual Int		writeFormat( const Char* format, ... );							///< Write the formatted string to the file
+		virtual Int		writeFormat( const WideChar* format, ... );						///< Write the formatted string to the file
+		virtual Int		writeChar( const Char* character );								///< Write a character to the file
+		virtual Int		writeChar( const WideChar* character );							///< Write a wide character to the file
+		virtual Int		seek( Int new_pos, seekMode mode = CURRENT );				///< Set file position: See File::seek
+		virtual Bool	flush();													///< flush data to disk
+		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0);				///< moves current position to after the next new-line
+
+		virtual Bool	scanInt(Int &newInt);																///< return what gets read as an integer from the current memory position.
+		virtual Bool	scanReal(Real &newReal);														///< return what gets read as a float from the current memory position.
+		virtual Bool	scanString(AsciiString &newString);									///< return what gets read as a string from the current memory position.
+
+		virtual Bool	open( File *file );																	///< Open file for fast RAM access
+		virtual Bool	openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size); ///< copy file data from the given file at the given offset for the given size.
+		virtual Bool	copyDataToFile(File *localFile);										///< write the contents of the RAM file to the given local file.  This could be REALLY slow.
+
+		/**
+			Allocate a buffer large enough to hold entire file, read
+			the entire file into the buffer, then close the file.
+			the buffer is owned by the caller, who is responsible
+			for freeing is (via delete[]). This is a Good Thing to
+			use because it minimizes memory copies for BIG files.
+		*/
+		virtual char* readEntireAndClose();
+		virtual File* convertToRAMFile();
+
+	protected:
+
+		void closeFile();
+};
+
+
+
+
+//----------------------------------------------------------------------------
+//           Inlining
+//----------------------------------------------------------------------------
diff --git a/Core/GameEngine/Include/Common/Radar.h b/Core/GameEngine/Include/Common/Radar.h
new file mode 100644
index 00000000000..431cfbf1668
--- /dev/null
+++ b/Core/GameEngine/Include/Common/Radar.h
@@ -0,0 +1,312 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: Radar.h //////////////////////////////////////////////////////////////////////////////////
+// Author: Colin Day, January 2002
+// Desc:   Logical radar implementation
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "Lib/BaseType.h"
+#include "Common/SubsystemInterface.h"
+#include "Common/GameMemory.h"
+#include "GameClient/Display.h"	// for ShroudLevel
+#include "GameClient/Color.h"
+
+// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
+class GameWindow;
+class Object;
+class Player;
+class TerrainLogic;
+
+// GLOBAL /////////////////////////////////////////////////////////////////////////////////////////
+//
+// the following is used for the resolution of the radar "cells" ... this is how accurate
+// the radar is and also reflects directly the size of the image we build ... which with
+// WW3D must be a square power of two as well
+//
+enum
+{
+	RADAR_CELL_WIDTH  = 128,	// radar created at this horz resolution
+	RADAR_CELL_HEIGHT = 128   // radar created at this vert resolution
+};
+
+//-------------------------------------------------------------------------------------------------
+/** These event types determine the colors radar events happen in to make it easier for us
+	* to play events with a consistent color scheme */
+//-------------------------------------------------------------------------------------------------
+enum RadarEventType CPP_11(: Int)
+{
+	RADAR_EVENT_INVALID = 0,
+	RADAR_EVENT_CONSTRUCTION,
+	RADAR_EVENT_UPGRADE,
+	RADAR_EVENT_UNDER_ATTACK,
+	RADAR_EVENT_INFORMATION,
+	RADAR_EVENT_BEACON_PULSE,
+	RADAR_EVENT_INFILTRATION, //for defection, hijacking, hacking, carbombing, and other sneaks
+	RADAR_EVENT_BATTLE_PLAN,
+	RADAR_EVENT_STEALTH_DISCOVERED,		// we discovered a stealth unit
+	RADAR_EVENT_STEALTH_NEUTRALIZED,	// our stealth unit has been revealed
+	RADAR_EVENT_FAKE,					//Internally creates a radar event, but doesn't notify the player (unit lost
+														//for example, so we can use the spacebar to jump to the event).
+
+	RADAR_EVENT_NUM_EVENTS
+
+};
+
+// PROTOTYPES /////////////////////////////////////////////////////////////////////////////////////
+
+//-------------------------------------------------------------------------------------------------
+/** Radar objects are objects that are on the radar, go figure :) */
+//-------------------------------------------------------------------------------------------------
+class RadarObject : public MemoryPoolObject,
+										public Snapshot
+{
+
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( RadarObject, "RadarObject" )
+
+public:
+
+	RadarObject( void );
+	// destructor prototype defined by memory pool glue
+
+	// color management
+	void setColor( Color c ) { m_color = c; }
+	Color getColor( void ) const { return m_color; }
+
+	void friend_setObject( Object *obj ) { m_object = obj; }
+	Object *friend_getObject( void ) { return m_object; }
+	const Object *friend_getObject( void ) const { return m_object; }
+
+	void friend_setNext( RadarObject *next ) { m_next = next; }
+	RadarObject *friend_getNext( void ) { return m_next; }
+	const RadarObject *friend_getNext( void ) const { return m_next; }
+
+	Bool isTemporarilyHidden() const;
+	static Bool isTemporarilyHidden(const Object* obj);
+
+protected:
+
+	// snapshot methods
+	virtual void crc( Xfer *xfer );
+	virtual void xfer( Xfer *xfer );
+	virtual void loadPostProcess( void );
+
+	Object *m_object;				///< the object
+	RadarObject *m_next;		///< next radar object
+	Color m_color;					///< color to draw for this object on the radar
+
+};
+
+//-------------------------------------------------------------------------------------------------
+/** Radar priorities.  Keep this in sync with the priority names list below */
+//-------------------------------------------------------------------------------------------------
+enum RadarPriorityType CPP_11(: Int)
+{
+	RADAR_PRIORITY_INVALID,					// a priority that has not been set (in general it won't show up on the radar)
+	RADAR_PRIORITY_NOT_ON_RADAR,		// object specifically forbidden from being on the radar
+	RADAR_PRIORITY_STRUCTURE,				// structure level drawing priority
+	RADAR_PRIORITY_UNIT,						// unit level drawing priority
+	RADAR_PRIORITY_LOCAL_UNIT_ONLY,	// unit priority, but only on the radar if controlled by the local player
+
+	RADAR_PRIORITY_NUM_PRIORITIES
+};
+#ifdef DEFINE_RADAR_PRIORITY_NAMES
+static const char *const RadarPriorityNames[] =
+{
+	"INVALID",											// a priority that has not been set (in general it won't show up on the radar)
+	"NOT_ON_RADAR",									// object specifically forbidden from being on the radar
+	"STRUCTURE",										// structure level drawing priority
+	"UNIT",													// unit level drawing priority
+	"LOCAL_UNIT_ONLY",							// unit priority, but only on the radar if controlled by the local player
+
+	NULL
+};
+static_assert(ARRAY_SIZE(RadarPriorityNames) == RADAR_PRIORITY_NUM_PRIORITIES + 1, "Incorrect array size");
+#endif  // DEFINE_RADAR_PRIOTITY_NAMES
+
+//-------------------------------------------------------------------------------------------------
+/** Interface for the radar */
+//-------------------------------------------------------------------------------------------------
+class Radar : public Snapshot,
+							public SubsystemInterface
+{
+
+public:
+
+	Radar( void );
+	virtual ~Radar( void );
+
+	virtual void init( void ) { }														///< subsystem initialization
+	virtual void reset( void );															///< subsystem reset
+	virtual void update( void );														///< subsystem per frame update
+
+	// is the game window parameter the radar window
+	Bool isRadarWindow( GameWindow *window ) { return (m_radarWindow == window) && (m_radarWindow != NULL); }
+
+	Bool radarToWorld( const ICoord2D *radar, Coord3D *world );		///< radar point to world point on terrain
+	Bool radarToWorld2D( const ICoord2D *radar, Coord3D *world );		///< radar point to world point (x,y only!)
+	Bool worldToRadar( const Coord3D *world, ICoord2D *radar );		///< translate world point to radar (x,y)
+	Bool localPixelToRadar( const ICoord2D *pixel, ICoord2D *radar );	///< translate pixel (with UL of radar being (0,0)) to logical radar coordinates
+	Bool screenPixelToWorld( const ICoord2D *pixel, Coord3D *world ); ///< translate pixel (with UL of the screen being (0,0)) to world position in the world
+	Object *objectUnderRadarPixel( const ICoord2D *pixel );				///< return the object (if any) represented by the pixel coordinates passed in
+	void findDrawPositions( Int startX, Int startY, Int width, Int height,
+													ICoord2D *ul, ICoord2D *lr );					///< make translation for screen area of radar square to scaled aspect ratio preserving points inside the radar area
+
+	// priority inquiry
+	static Bool isPriorityVisible( RadarPriorityType priority );		///< is the priority passed in a "visible" one on the radar
+
+	// radar events
+	void createEvent( const Coord3D *world, RadarEventType type, Real secondsToLive = 4.0f );	///< create radar event at location in world
+	void createPlayerEvent( Player *player, const Coord3D *world, RadarEventType type, Real secondsToLive = 4.0f );  ///< create radar event using player colors
+
+	Bool getLastEventLoc( Coord3D *eventPos );							///< get last event loc (if any)
+	void tryUnderAttackEvent( const Object *obj );					///< try to make an "under attack" event if it's the proper time
+	void tryInfiltrationEvent( const Object *obj );					///< try to make an "infiltration" event if it's the proper time
+ 	Bool tryEvent( RadarEventType event, const Coord3D *pos );	///< try to make a "stealth" event
+
+	// adding and removing objects from the radar
+	virtual Bool addObject( Object *obj ); ///< add object to radar
+	virtual Bool removeObject( Object *obj ); ///< remove object from radar
+
+	// radar options
+	void hide( Int playerIndex, Bool hide ) { m_radarHidden[playerIndex] = hide; } ///< hide/show the radar
+	Bool isRadarHidden( Int playerIndex ) { return m_radarHidden[playerIndex]; } ///< is radar hidden
+	// other radar option methods here like the ability to show a certain
+	// team, show buildings, show units at all, etc
+
+	// forcing the radar on/off regardless of player situation
+	void forceOn( Int playerIndex, Bool force ) { m_radarForceOn[playerIndex] = force; } ///< force the radar to be on
+	Bool isRadarForced( Int playerIndex ) { return m_radarForceOn[playerIndex]; } ///< is radar forced on?
+
+	/// refresh the water values for the radar
+	virtual void refreshTerrain( TerrainLogic *terrain );
+
+	/// refresh the radar when the state of world objects changes drastically
+	virtual void refreshObjects() {};
+
+	/// queue a refresh of the terrain at the next available time
+	virtual void queueTerrainRefresh( void );
+
+	virtual void newMap( TerrainLogic *terrain );	///< reset radar for new map
+
+	virtual void draw( Int pixelX, Int pixelY, Int width, Int height ) = 0;	///< draw the radar
+
+	/// empty the entire shroud
+	virtual void clearShroud() = 0;
+
+	/// set the shroud level at shroud cell x,y
+	virtual void setShroudLevel( Int x, Int y, CellShroudStatus setting ) = 0;
+
+protected:
+
+	// snapshot methods
+	virtual void crc( Xfer *xfer );
+	virtual void xfer( Xfer *xfer );
+	virtual void loadPostProcess( void );
+
+	/// internal method for creating a radar event with specific colors
+	void internalCreateEvent( const Coord3D *world, RadarEventType type, Real secondsToLive,
+														const RGBAColorInt *color1, const RGBAColorInt *color2 );
+
+	void deleteList( RadarObject **list );
+	void deleteListResources( void );			///< delete list radar resources used
+	Bool deleteFromList( Object *obj, RadarObject **list );	///< try to remove object from specific list
+
+	Real getTerrainAverageZ() const { return m_terrainAverageZ; }
+	Real getWaterAverageZ() const { return m_waterAverageZ; }
+
+	void clearAllEvents( void );					///< remove all radar events in progress
+
+	// search the object list for an object that maps to the given logical radar coordinates
+	Object *searchListForRadarLocationMatch( RadarObject *listHead, ICoord2D *radarMatch );
+
+	void linkRadarObject( RadarObject *newObj, RadarObject **list );
+	void assignObjectColorToRadarObject( RadarObject *radarObj, Object *obj );
+
+	Bool m_radarHidden[MAX_PLAYER_COUNT]; ///< true when radar is not visible
+	Bool m_radarForceOn[MAX_PLAYER_COUNT]; ///< true when radar is forced to be on
+
+	RadarObject *m_objectList;						///< list of objects in the radar
+	RadarObject *m_localObjectList;				/** list of objects for the local player, sorted
+																					* in exactly the same priority as the regular
+																					* object list for all other objects */
+
+	// TheSuperHackers @bugfix xezon 22/11/2025 Now stores local heroes in a separate list,
+	// because they are treated with special icons but should otherwise work like all other
+	// radar objects. In retail version, the cached hero object data was able to dangle
+	// for a few frames and cause undefined behavior.
+	RadarObject *m_localHeroObjectList; ///< list of hero objects for the local player
+
+	Real m_terrainAverageZ;								///< average Z for terrain samples
+	Real m_waterAverageZ;									///< average Z for water samples
+
+	//
+	// when dealing with world sampling we will sample at these intervals so that
+	// the whole map can be accounted for within our RADAR_CELL_WIDTH and
+	// RADAR_CELL_HEIGHT resolutions
+	//
+	Real m_xSample;
+	Real m_ySample;
+
+	enum { MAX_RADAR_EVENTS = 64 };
+	struct RadarEvent
+	{
+		RadarEventType type;								///< type of this radar event
+		Bool active;												///< TRUE when event is "active", otherwise it's just historical information in the event array to look through
+		UnsignedInt createFrame;						///< frame event was created on
+		UnsignedInt dieFrame;								///< frame the event will go away on
+		UnsignedInt fadeFrame;							///< start fading out on this frame
+		RGBAColorInt color1;								///< color 1 for drawing
+		RGBAColorInt color2;								///< color 2 for drawing
+		Coord3D worldLoc;										///< location of event in the world
+		ICoord2D radarLoc;									///< 2D radar location of the event
+		Bool soundPlayed;										///< TRUE when we have played the radar sound for this
+	};
+	RadarEvent m_event[ MAX_RADAR_EVENTS ];///< our radar events
+	Int m_nextFreeRadarEvent;							///< index into m_event for where to store the next event
+	Int m_lastRadarEvent;									///< index of the most recent radar event
+
+	GameWindow *m_radarWindow;						///< window we display the radar in
+
+	Region3D m_mapExtent;									///< extents of the current map
+
+	UnsignedInt m_queueTerrainRefreshFrame;  ///< frame we requested the last terrain refresh on
+
+};
+
+// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
+extern Radar *TheRadar;  ///< the radar singleton extern
+
+// TheSuperHackers @feature helmutbuhler 10/04/2025
+// Radar that does nothing. Used for Headless Mode.
+class RadarDummy : public Radar
+{
+public:
+	virtual void draw(Int pixelX, Int pixelY, Int width, Int height) { }
+	virtual void clearShroud() { }
+	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) { }
+};
diff --git a/Core/GameEngine/Include/Common/RandomValue.h b/Core/GameEngine/Include/Common/RandomValue.h
new file mode 100644
index 00000000000..011477a3372
--- /dev/null
+++ b/Core/GameEngine/Include/Common/RandomValue.h
@@ -0,0 +1,39 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// RandomValue.h
+// Random number generation system
+// Author: Michael S. Booth, January 1998
+
+#pragma once
+
+#include "Lib/BaseType.h"
+
+extern void InitRandom( void );
+extern void InitRandom( UnsignedInt seed );
+extern void InitGameLogicRandom( UnsignedInt seed ); ///< Set the GameLogic seed to a known value at game start
+extern UnsignedInt GetGameLogicRandomSeed( void );   ///< Get the seed (used for replays)
+extern UnsignedInt GetGameLogicRandomSeedCRC( void );///< Get the seed (used for CRCs)
+
+//--------------------------------------------------------------------------------------------------------------
diff --git a/Core/GameEngine/Include/Common/ReplaySimulation.h b/Core/GameEngine/Include/Common/ReplaySimulation.h
new file mode 100644
index 00000000000..219f6233709
--- /dev/null
+++ b/Core/GameEngine/Include/Common/ReplaySimulation.h
@@ -0,0 +1,48 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+class ReplaySimulation
+{
+public:
+
+	// TheSuperHackers @feature helmutbuhler 13/04/2025
+	// Simulate a list of replays without graphics.
+	// Returns exit code 1 if mismatch or other error occurred
+	// Returns exit code 0 if all replays were successfully simulated without mismatches
+	static int simulateReplays(const std::vector<AsciiString> &filenames, int maxProcesses);
+
+	static void stop() { s_isRunning = false; }
+
+	static Bool isRunning() { return s_isRunning; }
+	static UnsignedInt getCurrentReplayIndex() { return s_replayIndex; }
+	static UnsignedInt getReplayCount() { return s_replayCount; }
+
+private:
+
+	static int simulateReplaysInThisProcess(const std::vector<AsciiString> &filenames);
+	static int simulateReplaysInWorkerProcesses(const std::vector<AsciiString> &filenames, int maxProcesses);
+	static std::vector<AsciiString> resolveFilenameWildcards(const std::vector<AsciiString> &filenames);
+
+private:
+
+	static Bool s_isRunning;
+	static UnsignedInt s_replayIndex;
+	static UnsignedInt s_replayCount;
+};
diff --git a/Core/GameEngine/Include/Common/StreamingArchiveFile.h b/Core/GameEngine/Include/Common/StreamingArchiveFile.h
new file mode 100644
index 00000000000..bf481b19784
--- /dev/null
+++ b/Core/GameEngine/Include/Common/StreamingArchiveFile.h
@@ -0,0 +1,111 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------=
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:    RTS 3
+//
+// Module:     IO
+//
+// File name:  Common/StreamingArchiveFile.h
+//
+// Created:    11/08/01
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+//----------------------------------------------------------------------------
+//           Includes
+//----------------------------------------------------------------------------
+
+#include "Common/RAMFile.h"
+
+//----------------------------------------------------------------------------
+//           Forward References
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//           Type Defines
+//----------------------------------------------------------------------------
+
+//===============================
+// StreamingArchiveFile
+//===============================
+/**
+  *	File abstraction for standard C file operators: open, close, lseek, read, write
+	*/
+//===============================
+
+class StreamingArchiveFile : public RAMFile
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(StreamingArchiveFile, "StreamingArchiveFile")
+	protected:
+
+		File					*m_file;											///< The archive file that I came from
+		Int						m_startingPos;								///< My starting position in the archive
+		Int						m_size;												///< My length
+		Int						m_curPos;											///< My current position.
+
+	public:
+
+		StreamingArchiveFile();
+		//virtual				~StreamingArchiveFile();
+
+
+		virtual Bool	open( const Char *filename, Int access = NONE, size_t bufferSize = BUFFERSIZE ); ///< Open a file for access
+		virtual void	close( void );																			///< Close the file
+		virtual Int		read( void *buffer, Int bytes );										///< Read the specified number of bytes in to buffer: See File::read
+		virtual Int		write( const void *buffer, Int bytes );							///< Write the specified number of bytes from the buffer: See File::write
+		virtual Int		seek( Int new_pos, seekMode mode = CURRENT );				///< Set file position: See File::seek
+
+		// Ini's should not be parsed with streaming files, that's just dumb.
+		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0) { DEBUG_CRASH(("Should not call nextLine on a streaming file.")); }
+		virtual Bool	scanInt(Int &newInt) { DEBUG_CRASH(("Should not call scanInt on a streaming file."));  return FALSE; }
+		virtual Bool	scanReal(Real &newReal) { DEBUG_CRASH(("Should not call scanReal on a streaming file.")); return FALSE; }
+		virtual Bool	scanString(AsciiString &newString) { DEBUG_CRASH(("Should not call scanString on a streaming file.")); return FALSE; }
+
+		virtual Bool	open( File *file );																	///< Open file for fast RAM access
+		virtual Bool	openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size); ///< copy file data from the given file at the given offset for the given size.
+		virtual Bool	copyDataToFile(File *localFile) { DEBUG_CRASH(("Are you sure you meant to copyDataToFile on a streaming file?")); return FALSE; }
+
+		virtual char* readEntireAndClose() { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return NULL; }
+		virtual File* convertToRAMFile() { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return this; }
+};
+
+
+
+
+//----------------------------------------------------------------------------
+//           Inlining
+//----------------------------------------------------------------------------
diff --git a/Core/GameEngine/Include/Common/UnicodeString.h b/Core/GameEngine/Include/Common/UnicodeString.h
new file mode 100644
index 00000000000..ff66edfe478
--- /dev/null
+++ b/Core/GameEngine/Include/Common/UnicodeString.h
@@ -0,0 +1,522 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: UnicodeString.h
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:    RTS3
+//
+// File name:  UnicodeString.h
+//
+// Created:    Steven Johnson, October 2001
+//
+// Desc:       General-purpose string classes
+//
+//-----------------------------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include <stdarg.h>
+#include "Lib/BaseType.h"
+#include "Common/Debug.h"
+#include "Common/Errors.h"
+
+class AsciiString;
+
+// -----------------------------------------------------
+/**
+	UnicodeString is the fundamental double-byte string type used in the Generals
+	code base, and should be preferred over all other string constructions
+	(e.g., array of WideChar, STL string<>, WWVegas StringClass, etc.)
+
+	Of course, other string setups may be used when necessary or appropriate!
+
+	UnicodeString is modeled after the MFC CString class, with some minor
+	syntactic differences to keep in line with our coding conventions.
+
+	Basically, UnicodeString allows you to treat a string as an intrinsic
+	type, rather analogous to 'int' -- when passed by value, a new string
+	is created, and modifying the new string doesn't modify the original.
+	This is done fairly efficiently, so that no new memory allocation is done
+	unless the string is actually modified.
+
+	Naturally, UnicodeString handles all memory issues, so there's no need
+	to do anything to free memory... just allow the UnicodeString's
+	destructor to run.
+
+	UnicodeStrings are suitable for use as automatic, member, or static variables.
+*/
+
+class UnicodeString
+{
+private:
+
+	// Note, this is a Plain Old Data Structure... don't
+	// add a ctor/dtor, 'cuz they won't ever be called.
+	struct UnicodeStringData
+	{
+#if defined(RTS_DEBUG)
+		const WideChar* m_debugptr;	// just makes it easier to read in the debugger
+#endif
+		unsigned short	m_refCount;						// reference count
+		unsigned short	m_numCharsAllocated;  // length of data allocated
+		// WideChar m_stringdata[];
+
+		WideChar* peek() { return (WideChar*)(this+1); }
+	};
+
+	#ifdef RTS_DEBUG
+	void validate() const;
+	#else
+	void validate() const { }
+	#endif
+
+protected:
+	UnicodeStringData* m_data;   // pointer to ref counted string data
+
+	WideChar* peek() const;
+	void releaseBuffer();
+	void ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData, const WideChar* strToCpy, const WideChar* strToCat);
+
+public:
+
+	typedef WideChar value_type;
+	typedef value_type* pointer;
+	typedef const value_type* const_pointer;
+
+	enum
+	{
+		MAX_FORMAT_BUF_LEN = 2048,		///< max total len of string created by format/format_va
+		MAX_LEN = 32767							///< max total len of any UnicodeString, in chars
+	};
+
+
+	/**
+		This is a convenient global used to indicate the empty
+		string, so we don't need to construct temporaries
+		for such a common thing.
+	*/
+	static const UnicodeString TheEmptyString;
+
+	/**
+		Default constructor -- construct a new, empty UnicodeString.
+	*/
+	UnicodeString();
+	/**
+		Copy constructor -- make this UnicodeString identical to the
+		other UnicodeString. (This is actually quite efficient, because
+		they will simply share the same string and increment the
+		refcount.)
+	*/
+	UnicodeString(const UnicodeString& stringSrc);
+	/**
+		Constructor -- from a literal string. Constructs an UnicodeString
+		with the given string. Note that a copy of the string is made;
+		the input ptr is not saved.
+		Note that this is no longer explicit, as the conversion is almost
+		always wanted, anyhow.
+	*/
+	UnicodeString(const WideChar* s);
+
+	/**
+		Constructs an UnicodeString with the given string and length.
+		The length must not be larger than the actual string length.
+	*/
+	UnicodeString(const WideChar* s, int len);
+
+	/**
+		Destructor. Not too exciting... clean up the works and such.
+	*/
+	~UnicodeString();
+
+	/**
+		Return the length, in characters, of the string up to the first zero or null terminator.
+	*/
+	int getLength() const;
+
+	/**
+		Return the number of bytes used by the string up to the first zero or null terminator.
+	*/
+	int getByteCount() const;
+	/**
+		Return true iff the length of the string is zero. Equivalent
+		to (getLength() == 0) but slightly more efficient.
+	*/
+	Bool isEmpty() const;
+	/**
+		Make the string empty. Equivalent to (str = "") but slightly more efficient.
+	*/
+	void clear();
+
+	/**
+		Return the character and the given (zero-based) index into the string.
+		No range checking is done (except in debug mode).
+	*/
+	WideChar getCharAt(int index) const;
+	/**
+		Return a pointer to the (null-terminated) string. Note that this is
+		a const pointer: do NOT change this! It is imperative that it be
+		impossible (or at least, really difficuly) for someone to change our
+		private data, since it might be shared amongst other UnicodeStrings.
+	*/
+	const WideChar* str() const;
+
+	/**
+		Makes sure there is room for a string of len+1 characters, and
+		returns a pointer to the string buffer.  This ensures that the
+		string buffer is NOT shared.  This is intended for the file reader,
+		that is reading new strings in from a file. jba.
+	*/
+	WideChar* getBufferForRead(Int len);
+
+	/**
+		Replace the contents of self with the given string.
+		(This is actually quite efficient, because
+		they will simply share the same string and increment the
+		refcount.)
+	*/
+	void set(const UnicodeString& stringSrc);
+
+	/**
+		Replace the contents of self with the given string.
+		Note that a copy of the string is made; the input ptr is not saved.
+	*/
+	void set(const WideChar* s);
+
+	/**
+		Replace the contents of self with the given string and length.
+		Note that a copy of the string is made; the input ptr is not saved.
+		The length must not be larger than the actual string length.
+	*/
+	void set(const WideChar* s, int len);
+
+	/**
+		replace contents of self with the given string. Note the
+		nomenclature is translate rather than set; this is because
+		not all single-byte strings translate one-for-one into
+		UnicodeStrings, so some data manipulation may be necessary,
+		and the resulting strings may not be equivalent.
+	*/
+	void translate(const AsciiString& stringSrc);
+
+	/**
+		Concatenate the given string onto self.
+	*/
+	void concat(const UnicodeString& stringSrc);
+	/**
+		Concatenate the given string onto self.
+	*/
+	void concat(const WideChar* s);
+	/**
+		Concatenate the given character onto self.
+	*/
+	void concat(const WideChar c);
+
+	/**
+	  Remove leading and trailing whitespace from the string.
+	*/
+	void trim( void );
+
+	/**
+	  Remove trailing whitespace from the string.
+	*/
+	void trimEnd(void);
+
+	/**
+	  Remove all consecutive occurances of c from the end of the string.
+	*/
+	void trimEnd(const WideChar c);
+
+	/**
+		Remove the final character in the string. If the string is empty,
+		do nothing. (This is a rather dorky method, but used a lot in
+		text editing, thus its presence here.)
+	*/
+	void removeLastChar();
+
+	/**
+		Remove the final charCount characters in the string. If the string is empty,
+		do nothing.
+	*/
+	void truncateBy(const Int charCount);
+
+	/**
+		Truncate the string to a length of maxLength characters, not including null termination,
+		by removing from the end. If the string is empty or shorter than maxLength, do nothing.
+	*/
+	void truncateTo(const Int maxLength);
+
+	/**
+		Analogous to sprintf() -- this formats a string according to the
+		given sprintf-style format string (and the variable argument list)
+		and stores the result in self.
+	*/
+	void format(UnicodeString format, ...);
+	void format(const WideChar* format, ...);
+	/**
+		Identical to format(), but takes a va_list rather than
+		a variable argument list. (i.e., analogous to vsprintf.)
+	*/
+	void format_va(const UnicodeString& format, va_list args);
+	void format_va(const WideChar* format, va_list args);
+
+	/**
+		Conceptually identical to wsccmp().
+	*/
+	int compare(const UnicodeString& stringSrc) const;
+	/**
+		Conceptually identical to wsccmp().
+	*/
+	int compare(const WideChar* s) const;
+	/**
+		Conceptually identical to _wcsicmp().
+	*/
+	int compareNoCase(const UnicodeString& stringSrc) const;
+	/**
+		Conceptually identical to _wcsicmp().
+	*/
+	int compareNoCase(const WideChar* s) const;
+
+	/**
+		return true iff self starts with the given string.
+	*/
+	Bool startsWith(const WideChar* p) const;
+	Bool startsWith(const UnicodeString& stringSrc) const { return startsWith(stringSrc.str()); }
+
+	/**
+		return true iff self starts with the given string. (case insensitive)
+	*/
+	Bool startsWithNoCase(const WideChar* p) const;
+	Bool startsWithNoCase(const UnicodeString& stringSrc) const { return startsWithNoCase(stringSrc.str()); }
+
+	/**
+		return true iff self ends with the given string.
+	*/
+	Bool endsWith(const WideChar* p) const;
+	Bool endsWith(const UnicodeString& stringSrc) const { return endsWith(stringSrc.str()); }
+
+	/**
+		return true iff self ends with the given string. (case insensitive)
+	*/
+	Bool endsWithNoCase(const WideChar* p) const;
+	Bool endsWithNoCase(const UnicodeString& stringSrc) const { return endsWithNoCase(stringSrc.str()); }
+
+	/**
+		conceptually similar to strtok():
+
+		extract the next whitespace-delimited token from the front
+		of 'this' and copy it into 'token', returning true if a nonempty
+		token was found. (note that this modifies 'this' as well, stripping
+		the token off!)
+	*/
+	Bool nextToken(UnicodeString* token, UnicodeString delimiters = UnicodeString::TheEmptyString);
+
+//
+// You might think it would be a good idea to overload the * operator
+// to allow for an implicit conversion to an WideChar*. This is
+// in theory a good idea, but in practice, there's lots of code
+// that assumes it should check text fields for null, which
+// is meaningless for us, since we never return a null ptr.
+//
+//	operator const WideChar*() const { return str(); }
+//
+
+	UnicodeString& operator=(const UnicodeString& stringSrc);	///< the same as set()
+	UnicodeString& operator=(const WideChar* s);				///< the same as set()
+};
+
+
+// -----------------------------------------------------
+inline WideChar* UnicodeString::peek() const
+{
+	DEBUG_ASSERTCRASH(m_data, ("null string ptr"));
+	validate();
+	return m_data->peek();
+}
+
+// -----------------------------------------------------
+inline UnicodeString::UnicodeString() : m_data(0)
+{
+	validate();
+}
+
+// -----------------------------------------------------
+inline UnicodeString::~UnicodeString()
+{
+	validate();
+	releaseBuffer();
+}
+
+// -----------------------------------------------------
+inline int UnicodeString::getLength() const
+{
+	validate();
+	return m_data ? wcslen(peek()) : 0;
+}
+
+// -----------------------------------------------------
+inline int UnicodeString::getByteCount() const
+{
+	validate();
+	return m_data ? getLength() * sizeof(WideChar) : 0;
+}
+
+// -----------------------------------------------------
+inline Bool UnicodeString::isEmpty() const
+{
+	validate();
+	return m_data == NULL || peek()[0] == 0;
+}
+
+// -----------------------------------------------------
+inline void UnicodeString::clear()
+{
+	validate();
+	releaseBuffer();
+	validate();
+}
+
+// -----------------------------------------------------
+inline WideChar UnicodeString::getCharAt(int index) const
+{
+	DEBUG_ASSERTCRASH(index >= 0 && index < getLength(), ("bad index in getCharAt"));
+	validate();
+	return m_data ? peek()[index] : 0;
+}
+
+// -----------------------------------------------------
+inline const WideChar* UnicodeString::str() const
+{
+	validate();
+	static const WideChar TheNullChr = 0;
+	return m_data ? peek() : &TheNullChr;
+}
+
+// -----------------------------------------------------
+inline UnicodeString& UnicodeString::operator=(const UnicodeString& stringSrc)
+{
+	validate();
+	set(stringSrc);
+	validate();
+	return *this;
+}
+
+// -----------------------------------------------------
+inline UnicodeString& UnicodeString::operator=(const WideChar* s)
+{
+	validate();
+	set(s);
+	validate();
+	return *this;
+}
+
+// -----------------------------------------------------
+inline void UnicodeString::concat(const UnicodeString& stringSrc)
+{
+	validate();
+	concat(stringSrc.str());
+	validate();
+}
+
+// -----------------------------------------------------
+inline void UnicodeString::concat(const WideChar c)
+{
+	validate();
+	/// this can probably be made more efficient, if necessary
+	WideChar tmp[2] = { c, 0 };
+	concat(tmp);
+	validate();
+}
+
+// -----------------------------------------------------
+inline int UnicodeString::compare(const UnicodeString& stringSrc) const
+{
+	validate();
+	return wcscmp(this->str(), stringSrc.str());
+}
+
+// -----------------------------------------------------
+inline int UnicodeString::compare(const WideChar* s) const
+{
+	validate();
+	return wcscmp(this->str(), s);
+}
+
+// -----------------------------------------------------
+inline int UnicodeString::compareNoCase(const UnicodeString& stringSrc) const
+{
+	validate();
+	return _wcsicmp(this->str(), stringSrc.str());
+}
+
+// -----------------------------------------------------
+inline int UnicodeString::compareNoCase(const WideChar* s) const
+{
+	validate();
+	return _wcsicmp(this->str(), s);
+}
+
+// -----------------------------------------------------
+inline Bool operator==(const UnicodeString& s1, const UnicodeString& s2)
+{
+	return wcscmp(s1.str(), s2.str()) == 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator!=(const UnicodeString& s1, const UnicodeString& s2)
+{
+	return wcscmp(s1.str(), s2.str()) != 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator<(const UnicodeString& s1, const UnicodeString& s2)
+{
+	return wcscmp(s1.str(), s2.str()) < 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator<=(const UnicodeString& s1, const UnicodeString& s2)
+{
+	return wcscmp(s1.str(), s2.str()) <= 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator>(const UnicodeString& s1, const UnicodeString& s2)
+{
+	return wcscmp(s1.str(), s2.str()) > 0;
+}
+
+// -----------------------------------------------------
+inline Bool operator>=(const UnicodeString& s1, const UnicodeString& s2)
+{
+	return wcscmp(s1.str(), s2.str()) >= 0;
+}
diff --git a/Core/GameEngine/Include/Common/WorkerProcess.h b/Core/GameEngine/Include/Common/WorkerProcess.h
new file mode 100644
index 00000000000..664d4a7f65d
--- /dev/null
+++ b/Core/GameEngine/Include/Common/WorkerProcess.h
@@ -0,0 +1,56 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// Helper class that allows you to start a worker process and retrieve its exit code
+// and console output as a string.
+// It also makes sure that the started process is killed in case our process exits in any way.
+class WorkerProcess
+{
+public:
+	WorkerProcess();
+
+	bool startProcess(UnicodeString command);
+
+	void update();
+
+	bool isRunning() const;
+
+	// returns true iff the process exited.
+	bool isDone() const;
+
+	DWORD getExitCode() const;
+	AsciiString getStdOutput() const;
+
+	// Terminate Process if it's running
+	void kill();
+
+private:
+	// returns true if all output has been received
+	// returns false if the worker is still running
+	bool fetchStdOutput();
+
+private:
+	HANDLE m_processHandle;
+	HANDLE m_readHandle;
+	HANDLE m_jobHandle;
+	AsciiString m_stdOutput;
+	DWORD m_exitcode;
+	bool m_isDone;
+};
diff --git a/Core/GameEngine/Include/Common/Xfer.h b/Core/GameEngine/Include/Common/Xfer.h
index f8f64d95ea8..f9c82288007 100644
--- a/Core/GameEngine/Include/Common/Xfer.h
+++ b/Core/GameEngine/Include/Common/Xfer.h
@@ -39,9 +39,6 @@
 
 #pragma once
 
-#ifndef __XFER_H_
-#define __XFER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Science.h"
 #include "Common/Upgrade.h"
@@ -68,7 +65,7 @@ enum XferMode CPP_11(: Int)
 	XFER_LOAD,
 	XFER_CRC,
 
-	NUM_XFER_TYPES  // please keep this last
+	NUM_XFER_TYPES
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -76,7 +73,7 @@ enum XferMode CPP_11(: Int)
 enum XferStatus CPP_11(: Int)
 {
 	XFER_STATUS_INVALID = 0,
-	
+
 	XFER_OK,														///< all is green and good
 	XFER_EOF,														///< end of file encountered
 	XFER_FILE_NOT_FOUND,								///< requested file does not exist
@@ -93,10 +90,10 @@ enum XferStatus CPP_11(: Int)
 	XFER_INVALID_PARAMETERS,						///< invalid parameters
 	XFER_LIST_NOT_EMPTY,								///< trying to xfer into a list that should be empty, but isn't
 	XFER_UNKNOWN_STRING,								///< unrecognized string value
-	
+
 	XFER_ERROR_UNKNOWN,									///< unknown error (isn't that useful!)
 
-	NUM_XFER_STATUS  // please keep this last
+	NUM_XFER_STATUS
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -106,7 +103,7 @@ enum XferOptions CPP_11(: UnsignedInt)
 	XO_NONE										= 0x00000000,
 	XO_NO_POST_PROCESSING			= 0x00000001,
 
-	XO_ALL										= 0xFFFFFFFF  // keep this last please
+	XO_ALL										= 0xFFFFFFFF
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -189,8 +186,5 @@ class Xfer
 	UnsignedInt m_options;					///< xfer options
 	XferMode m_xferMode;						///< the current xfer mode
 	AsciiString m_identifier;				///< the string identifier
-			
-};
-
-#endif // __XFER_H_
 
+};
diff --git a/Core/GameEngine/Include/Common/XferCRC.h b/Core/GameEngine/Include/Common/XferCRC.h
index 5c07d5bc4a2..b57769e86d2 100644
--- a/Core/GameEngine/Include/Common/XferCRC.h
+++ b/Core/GameEngine/Include/Common/XferCRC.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __XFERCRC_H_
-#define __XFERCRC_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/Xfer.h"
 
@@ -64,11 +61,8 @@ class XferCRC : public Xfer
 
 	virtual void xferImplementation( void *data, Int dataSize );
 
-	void addCRC( UnsignedInt val );								///< CRC a 4-byte block
+	inline void addCRC( UnsignedInt val );								///< CRC a 4-byte block
 
 	UnsignedInt m_crc;
 
 };
-
-#endif // __XFERDISKWRITE_H_
-
diff --git a/Core/GameEngine/Include/Common/XferDeepCRC.h b/Core/GameEngine/Include/Common/XferDeepCRC.h
index 514ea80c1db..7125d41fe04 100644
--- a/Core/GameEngine/Include/Common/XferDeepCRC.h
+++ b/Core/GameEngine/Include/Common/XferDeepCRC.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __XFERDEEPCRC_H_
-#define __XFERDEEPCRC_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/Xfer.h"
 #include "Common/XferCRC.h"
@@ -64,6 +61,3 @@ class XferDeepCRC : public XferCRC
 
 	FILE * m_fileFP;																			///< pointer to file
 };
-
-#endif // __XFERDEEPCRC_H_
-
diff --git a/Core/GameEngine/Include/Common/XferLoad.h b/Core/GameEngine/Include/Common/XferLoad.h
index 0d68e29271c..4df7a5428d6 100644
--- a/Core/GameEngine/Include/Common/XferLoad.h
+++ b/Core/GameEngine/Include/Common/XferLoad.h
@@ -29,11 +29,7 @@
 
 #pragma once
 
-#ifndef __XFER_LOAD_H_
-#define __XFER_LOAD_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include <stdio.h>
 #include "Common/Xfer.h"
 
 // FOWARD REFERNCES ///////////////////////////////////////////////////////////////////////////////
@@ -68,6 +64,3 @@ class XferLoad : public Xfer
 	FILE * m_fileFP;																					///< pointer to file
 
 };
-
-#endif // __XFER_LOAD_H_
-
diff --git a/Core/GameEngine/Include/Common/XferSave.h b/Core/GameEngine/Include/Common/XferSave.h
index 58c3a315f48..f836910beec 100644
--- a/Core/GameEngine/Include/Common/XferSave.h
+++ b/Core/GameEngine/Include/Common/XferSave.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __XFER_SAVE_H_
-#define __XFER_SAVE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/Xfer.h"
 
@@ -73,6 +70,3 @@ class XferSave : public Xfer
 	XferBlockData *m_blockStack;													///< stack of block data
 
 };
-
-#endif // __XFER_SAVE_H_
-
diff --git a/Core/GameEngine/Include/Common/crc.h b/Core/GameEngine/Include/Common/crc.h
new file mode 100644
index 00000000000..0cc7ae74add
--- /dev/null
+++ b/Core/GameEngine/Include/Common/crc.h
@@ -0,0 +1,138 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// CRC.h ///////////////////////////////////////////////////////////////
+// A class encapsulating CRC calculation
+// Author: Matthew D. Campbell, October 2001
+
+#pragma once
+
+#include "Lib/BaseType.h"
+
+#ifdef RTS_DEBUG
+
+//#include "winsock2.h" // for htonl
+
+class CRC
+{
+public:
+	CRC() { crc = 0; }
+
+	void computeCRC( const void *buf, Int len );		///< Compute the CRC for a buffer, added into current CRC
+	void clear( void ) { crc = 0; }									///< Clears the CRC to 0
+//	UnsignedInt get( void ) { return htonl(crc); }	///< Get the combined CRC
+	UnsignedInt get( void );
+
+#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
+  void set( UnsignedInt v )
+  {
+    crc = v;
+  }
+#endif
+
+private:
+	void addCRC( UnsignedByte val );									///< CRC a 4-byte block
+
+	UnsignedInt crc;
+};
+
+#else
+
+// optimized inline only version
+class CRC
+{
+public:
+	CRC(void) { crc=0; }
+
+  /// Compute the CRC for a buffer, added into current CRC
+	__forceinline void computeCRC( const void *buf, Int len )
+  {
+    if (!buf||len<1)
+      return;
+
+#if !(defined(_MSC_VER) && _MSC_VER < 1300)
+    // C++ version left in for reference purposes
+	  for (UnsignedByte *uintPtr=(UnsignedByte *)buf;len>0;len--,uintPtr++)
+    {
+    	int hibit;
+    	if (crc & 0x80000000)
+      {
+		    hibit = 1;
+	    }
+      else
+      {
+		    hibit = 0;
+	    }
+
+	    crc <<= 1;
+	    crc += *uintPtr;
+	    crc += hibit;
+    }
+#else
+    // ASM version, verified by comparing resulting data with C++ version data
+    unsigned *crcPtr=&crc;
+    _asm
+    {
+      mov esi,[buf]
+      mov ecx,[len]
+      dec ecx
+      mov edi,[crcPtr]
+      mov ebx,dword ptr [edi]
+      xor eax,eax
+    lp:
+      mov al,byte ptr [esi]
+      shl ebx,1
+      inc esi
+      adc ebx,eax
+      dec ecx
+      jns lp
+      mov dword ptr [edi],ebx
+    };
+#endif
+  }
+
+  /// Clears the CRC to 0
+	void clear( void )
+  {
+    crc = 0;
+  }
+
+  ///< Get the combined CRC
+	UnsignedInt get( void ) const
+  {
+    return crc;
+  }
+
+#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
+  void set( UnsignedInt v )
+  {
+    crc = v;
+  }
+#endif
+
+private:
+	UnsignedInt crc;
+};
+
+#endif
diff --git a/Core/GameEngine/Include/Common/file.h b/Core/GameEngine/Include/Common/file.h
new file mode 100644
index 00000000000..80e66445914
--- /dev/null
+++ b/Core/GameEngine/Include/Common/file.h
@@ -0,0 +1,224 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------=
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:    WSYS Library
+//
+// Module:     IO
+//
+// File name:  wsys/File.h
+//
+// Created:    4/23/01
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+//----------------------------------------------------------------------------
+//           Includes
+//----------------------------------------------------------------------------
+
+#include "Lib/BaseType.h"
+#include "Common/AsciiString.h"
+#include "Common/GameMemory.h"
+
+//----------------------------------------------------------------------------
+//           Forward References
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//           Type Defines
+//----------------------------------------------------------------------------
+
+//===============================
+// File
+//===============================
+/**
+  *	File is an interface class for basic file operations.
+	*
+	* All code should use the File class and not its derivatives, unless
+	* absolutely necessary. Also FS::Open should be used to create File objects and open files.
+	*
+	* TheSuperHackers @feature Adds LINEBUF and FULLBUF modes and buffer size argument for file open.
+	*/
+//===============================
+
+class File : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_ABC(File)
+// friend doesn't play well with MPO (srj)
+//	friend class FileSystem;
+
+	public:
+
+		enum access
+		{
+			NONE			= 0x00000000,				///< Access file. Reading by default
+
+			READ			= 0x00000001,				///< Access file for reading
+			WRITE			= 0x00000002,				///< Access file for writing
+			READWRITE = (READ | WRITE),
+
+			APPEND		= 0x00000004,				///< Seek to end of file on open
+			CREATE		= 0x00000008,				///< Create file if it does not exist
+			TRUNCATE	= 0x00000010,				///< Delete all data in file when opened
+
+			// NOTE: accesses file as binary data if neither TEXT and BINARY are set
+			TEXT			= 0x00000020,				///< Access file as text data
+			BINARY		= 0x00000040,				///< Access file as binary data
+
+			ONLYNEW		= 0x00000080,				///< Only create file if it does not exist
+
+			// NOTE: STREAMING is Mutually exclusive with WRITE
+			STREAMING = 0x00000100,				///< Do not read this file into a ram file, read it as requested.
+
+			// NOTE: accesses file with full buffering if neither LINEBUF and FULLBUF are set
+			LINEBUF   = 0x00000200,				///< Access file with line buffering
+			FULLBUF   = 0x00000400,				///< Access file with full buffering
+		};
+
+		enum seekMode
+		{
+			START,												///< Seek position is relative to start of file
+			CURRENT,											///< Seek position is relative to current file position
+			END														///< Seek position is relative from the end of the file
+		};
+
+		enum
+		{
+			BUFFERSIZE = BUFSIZ,
+		};
+
+	protected:
+
+		AsciiString	m_nameStr;						///< Stores file name
+		Int					m_access;									///< How the file was opened
+		Bool				m_open;										///< Has the file been opened
+		Bool				m_deleteOnClose;					///< delete File object on close()
+
+
+		File();											///< This class can only used as a base class
+		//virtual				~File();
+
+		void closeWithoutDelete();
+
+	public:
+
+
+						Bool	eof();
+		virtual Bool	open( const Char *filename, Int access = NONE, size_t bufferSize = BUFFERSIZE ); ///< Open a file for access
+		virtual void	close( void );																			///< Close the file !!! File object no longer valid after this call !!!
+
+		virtual Int		read( void *buffer, Int bytes ) = 0 ;						/**< Read the specified number of bytes from the file in to the
+																																			  *  memory pointed at by buffer. Returns the number of bytes read.
+																																			  *  Returns -1 if an error occurred.
+																																			  */
+		virtual Int		readChar() = 0 ;											/**< Read a character from the file
+																																			  *  Returns the character converted to an integer.
+																																			  *  Returns EOF if an error occurred.
+																																			  */
+		virtual Int		readWideChar() = 0 ;										/**< Read a wide character from the file
+																																			  *  Returns the wide character converted to an integer.
+																																			  *  Returns wide EOF if an error occurred.
+																																			  */
+		virtual Int		write( const void *buffer, Int bytes ) = 0 ;						/**< Write the specified number of bytes from the
+																																			  *	 memory pointed at by buffer to the file. Returns the number of bytes written.
+																																			  *	 Returns -1 if an error occurred.
+																																			  */
+		virtual Int		writeFormat( const Char* format, ... ) = 0 ;						/**< Write an unterminated formatted string to the file
+																																			  *	 Returns the number of bytes written.
+																																			  *	 Returns -1 if an error occurred.
+																																			  */
+		virtual Int		writeFormat( const WideChar* format, ... ) = 0 ;						/**< Write an unterminated formatted wide character string to the file
+																																			  *	 Returns the number of bytes written.
+																																			  *	 Returns -1 if an error occurred.
+																																			  */
+		virtual Int		writeChar( const Char* character ) = 0 ;						/**< Write a character to the file
+																																			  *	 Returns a copy of the character written.
+																																			  *	 Returns EOF if an error occurred.
+																																			  */
+		virtual Int		writeChar( const WideChar* character ) = 0 ;						/**< Write a wide character to the file
+																																			  *	 Returns a copy of the wide character written.
+																																			  *	 Returns wide EOF if an error occurred.
+																																			  */
+		virtual Int		seek( Int bytes, seekMode mode = CURRENT ) = 0;	/**< Sets the file position of the next read/write operation. Returns the new file
+																																				*  position as the number of bytes from the start of the file.
+																																				*  Returns -1 if an error occurred.
+																																				*
+																																				*  seekMode determines how the seek is done:
+																																				*
+																																				*  START : means seek to the specified number of bytes from the start of the file
+																																				*  CURRENT: means seek the specified the number of bytes from the current file position
+																																				*  END: means seek the specified number of bytes back from the end of the file
+																																				*/
+		virtual Bool	flush() = 0;											///< flush data to disk
+		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0) = 0;		///< reads until it reaches a new-line character
+
+		virtual Bool	scanInt(Int &newInt) = 0;														///< read an integer from the current file position.
+		virtual Bool	scanReal(Real &newReal) = 0;												///< read a real number from the current file position.
+		virtual Bool	scanString(AsciiString &newString) = 0;							///< read a string from the current file position.
+
+		virtual Bool	print ( const Char *format, ...);										///< Prints formated string to text file
+		virtual Int		size( void );																				///< Returns the size of the file
+		virtual Int		position( void );																		///< Returns the current read/write position
+
+
+		void					setName( const char *name );												///< Set the name of the file
+		const char*		getName( void ) const;															///< Returns a pointer to the name of the file
+		Int						getAccess( void ) const;														///< Returns file's access flags
+
+		void					deleteOnClose ( void );															///< Causes the File object to delete itself when it closes
+
+		/**
+			Allocate a buffer large enough to hold entire file, read
+			the entire file into the buffer, then close the file.
+			the buffer is owned by the caller, who is responsible
+			for freeing is (via delete[]). This is a Good Thing to
+			use because it minimizes memory copies for BIG files.
+		*/
+		virtual char* readEntireAndClose() = 0;
+		virtual File* convertToRAMFile() = 0;
+};
+
+
+
+
+//----------------------------------------------------------------------------
+//           Inlining
+//----------------------------------------------------------------------------
+
+inline const char* File::getName( void ) const { return m_nameStr.str(); }
+inline void File::setName( const char *name ) { m_nameStr.set(name); }
+inline Int File::getAccess( void ) const { return m_access; }
+inline void File::deleteOnClose( void ) { m_deleteOnClose = TRUE; }
diff --git a/Core/GameEngine/Include/Common/simpleplayer.h b/Core/GameEngine/Include/Common/simpleplayer.h
new file mode 100644
index 00000000000..ff93823701d
--- /dev/null
+++ b/Core/GameEngine/Include/Common/simpleplayer.h
@@ -0,0 +1,119 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "wmsdk.h"
+
+//
+// we preserve a list of "ready-to-free" list of wave headers for the
+// caller to unprepare and free
+//
+typedef struct WAVEHDR_LIST {
+    LPWAVEHDR           pwh;
+    struct WAVEHDR_LIST *next;
+}   WAVEHDR_LIST;
+
+#define SIMPLE_PLAYER_OPEN_EVENT  _T( "45ab58e0-382e-4d1c-ac50-88a5f9601851" )
+#define SIMPLE_PLAYER_CLOSE_EVENT _T( "276095fa-a8e0-48e6-ac61-8b0002345607" )
+#define WMAPLAY_EVENT             _T( "9e828a72-64f3-48f0-9de8-13dafd0cbd3a" )
+///////////////////////////////////////////////////////////////////////////////
+class CSimplePlayer : public IWMReaderCallback
+{
+public:
+    CSimplePlayer( HRESULT* phr );
+    ~CSimplePlayer();
+
+    virtual HRESULT Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hCompletionEvent, HRESULT *phrCompletion );
+
+//
+// IUnknown Implemenation
+//
+public:
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface(
+        REFIID riid,
+        void **ppvObject );
+
+    virtual ULONG STDMETHODCALLTYPE AddRef();
+    virtual ULONG STDMETHODCALLTYPE Release();
+
+//
+// IWMReaderCallback Implemenation
+//
+public:
+    virtual HRESULT STDMETHODCALLTYPE OnSample(
+        /* [in] */ DWORD dwOutputNum,
+        /* [in] */ QWORD cnsSampleTime,
+        /* [in] */ QWORD cnsSampleDuration,
+        /* [in] */ DWORD dwFlags,
+        /* [in] */ INSSBuffer __RPC_FAR *pSample,
+        /* [in] */ void __RPC_FAR *pvContext);
+
+    virtual HRESULT STDMETHODCALLTYPE OnStatus(
+        /* [in] */ WMT_STATUS Status,
+        /* [in] */ HRESULT hr,
+        /* [in] */ WMT_ATTR_DATATYPE dwType,
+        /* [in] */ BYTE __RPC_FAR *pValue,
+        /* [in] */ void __RPC_FAR *pvContext);
+
+//
+// Helper Methods
+//
+protected:
+
+    HRESULT Close();
+
+    void OnWaveOutMsg( UINT uMsg, DWORD dwParam1, DWORD dwParam2 );
+
+    static void CALLBACK WaveProc(
+                          HWAVEOUT hwo,
+                          UINT uMsg,
+                          DWORD dwInstance,
+                          DWORD dwParam1,
+                          DWORD dwParam2 );
+
+    HRESULT AddWaveHeader( LPWAVEHDR pwh );
+    void    RemoveWaveHeaders( void );
+
+    CRITICAL_SECTION    m_CriSec;
+    WAVEHDR_LIST       *m_whdrHead;
+
+    LONG    m_cRef;
+    LONG    m_cBuffersOutstanding;
+    BOOL    m_fEof;
+    HANDLE  m_hCompletionEvent;
+
+    IWMReader *m_pReader;
+    IWMHeaderInfo *m_pHeader;
+    HWAVEOUT m_hwo;
+
+    HRESULT *m_phrCompletion;
+
+    HRESULT m_hrOpen;
+    HANDLE m_hOpenEvent;
+    HANDLE m_hCloseEvent;
+
+    union
+    {
+        WAVEFORMATEX m_wfx;
+        BYTE m_WfxBuf[1024];
+    };
+
+    LPWSTR  m_pszUrl;
+
+};
diff --git a/Core/GameEngine/Include/Common/urllaunch.h b/Core/GameEngine/Include/Common/urllaunch.h
new file mode 100644
index 00000000000..ca23690143d
--- /dev/null
+++ b/Core/GameEngine/Include/Common/urllaunch.h
@@ -0,0 +1,23 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL );
+
+HRESULT LaunchURL( LPCWSTR pszURL );
diff --git a/Core/GameEngine/Include/GameClient/ClientRandomValue.h b/Core/GameEngine/Include/GameClient/ClientRandomValue.h
new file mode 100644
index 00000000000..3222cf4e71f
--- /dev/null
+++ b/Core/GameEngine/Include/GameClient/ClientRandomValue.h
@@ -0,0 +1,91 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// ClientRandomValue.h
+// Random number generation system
+// Author: Michael S. Booth, January 1998
+// Split out into separate Logic/Client/Audio headers by MDC Sept 2002
+
+#pragma once
+
+#include "Lib/BaseType.h"
+
+// do NOT use these functions directly, rather use the macros below
+extern Int GetGameClientRandomValue( int lo, int hi, const char *file, int line );
+extern Real GetGameClientRandomValueReal( Real lo, Real hi, const char *file, int line );
+
+// use these macros to access the random value functions
+#define GameClientRandomValue( lo, hi ) GetGameClientRandomValue( lo, hi, __FILE__, __LINE__ )
+#define GameClientRandomValueReal( lo, hi ) GetGameClientRandomValueReal( lo, hi, __FILE__, __LINE__ )
+
+//--------------------------------------------------------------------------------------------------------------
+class CColorAlphaDialog;
+class DebugWindowDialog;
+
+/**
+ * A GameClientRandomVariable represents a distribution of random values
+ * from which discrete values can be retrieved.
+ */
+class GameClientRandomVariable
+{
+public:
+	// NOTE: This class cannot have a constructor or destructor due to its use within unions
+
+	/**
+	 * CONSTANT represents a single, constant, value.
+	 * UNIFORM represents a uniform distribution of random values.
+	 * GAUSSIAN represents a normally distributed set of random values.
+	 * TRIANGULAR represents a distribution of random values in the shape
+	 *		of a triangle, with the peak probability midway between low and high.
+	 * LOW_BIAS represents a distribution of random values with
+	 *		maximum probability at low, and zero probability at high.
+	 * HIGH_BIAS represents a distribution of random values with
+	 *		zero probability at low, and maximum probability at high.
+	 */
+	enum DistributionType
+	{
+		CONSTANT, UNIFORM, GAUSSIAN, TRIANGULAR, LOW_BIAS, HIGH_BIAS,
+		DISTRIBUTION_COUNT
+	};
+
+	static const char *const DistributionTypeNames[];
+
+	/// define the range of random values, and the distribution of values
+	void setRange( Real low, Real high, DistributionType type = UNIFORM );
+
+	Real getValue( void ) const;														///< return a value from the random distribution
+	Real getMinimumValue( void ) const { return m_low; }
+	Real getMaximumValue( void ) const { return m_high; }
+	DistributionType getDistributionType( void ) const { return m_type; }
+protected:
+	DistributionType m_type;																		///< the kind of random distribution
+	Real m_low, m_high;																					///< the range of random values
+
+	// These two friends are for particle editing.
+	friend CColorAlphaDialog;
+	friend DebugWindowDialog;
+
+};
+
+//--------------------------------------------------------------------------------------------------------------
diff --git a/Core/GameEngine/Include/GameClient/MapUtil.h b/Core/GameEngine/Include/GameClient/MapUtil.h
new file mode 100644
index 00000000000..408333c4794
--- /dev/null
+++ b/Core/GameEngine/Include/GameClient/MapUtil.h
@@ -0,0 +1,150 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: MapUtil.h /////////////////////////////////////////////////////////
+// Author: Matt Campbell, December 2001
+// Description: Map utility/convenience routines
+////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Common/AsciiString.h"
+#include "Common/UnicodeString.h"
+
+#include "Common/STLTypedefs.h"
+
+class GameWindow;
+class AsciiString;
+struct Coord3D;
+struct FileInfo;
+class Image;
+class DataChunkInput;
+struct DataChunkInfo;
+// This matches the windows timestamp.
+enum { SUPPLY_TECH_SIZE = 15};
+typedef std::list <ICoord2D> ICoord2DList;
+
+class TechAndSupplyImages
+{
+public:
+	ICoord2DList m_techPosList;
+	ICoord2DList m_supplyPosList;
+};
+
+struct WinTimeStamp
+{
+	UnsignedInt m_lowTimeStamp;
+	UnsignedInt m_highTimeStamp;
+};
+
+
+class WaypointMap : public std::map<AsciiString, Coord3D>
+{
+public:
+	void update( void );	///< returns the number of multiplayer start spots found
+	Int m_numStartSpots;
+};
+
+typedef std::list <Coord3D> Coord3DList;
+
+class MapMetaData
+{
+public:
+	UnicodeString m_displayName;
+	AsciiString m_nameLookupTag;
+	Region3D m_extent;
+	Int m_numPlayers;
+
+	Bool m_isMultiplayer;
+	Bool m_isOfficial;
+	Bool m_doesExist; ///< Flag to indicate whether the map physically exists. Should be true.
+	UnsignedInt m_filesize;
+	UnsignedInt m_CRC;
+
+	WinTimeStamp m_timestamp;
+
+	WaypointMap m_waypoints;
+	Coord3DList m_supplyPositions;
+	Coord3DList m_techPositions;
+	AsciiString m_fileName;
+};
+
+// TheSuperHackers @performance xezon 02/11/2025 Simplifies and improves the implementation of MapCache
+// to prevent expensive reoccurring redundant map cache reads.
+
+class MapCache : public std::map<AsciiString, MapMetaData>
+{
+	typedef std::set<AsciiString> MapNameSet;
+
+public:
+	MapCache()
+		: m_doCreateStandardMapCacheINI(TRUE)
+		, m_doLoadStandardMapCacheINI(TRUE)
+		, m_doLoadUserMapCacheINI(TRUE)
+	{}
+
+	void updateCache( void );
+
+	AsciiString getMapDir() const;
+	AsciiString getUserMapDir() const;
+	AsciiString getMapExtension() const;
+
+	const MapMetaData *findMap(AsciiString mapName);
+
+	// allow us to create a set of shippable maps to be in mapcache.ini.  For use with -buildMapCache.
+	void addShippingMap(AsciiString mapName) { mapName.toLower(); m_allowedMaps.insert(mapName); }
+
+private:
+	void prepareUnseenMaps(const AsciiString &mapDir);
+	Bool clearUnseenMaps(const AsciiString &mapDir);
+	void loadMapsFromMapCacheINI(const AsciiString &mapDir);
+	Bool loadMapsFromDisk(const AsciiString &mapDir, Bool isOfficial, Bool filterByAllowedMaps = FALSE); // returns true if we needed to (re)parse a map
+	Bool addMap(const AsciiString &mapDir, const AsciiString &fname, const AsciiString &lowerFname, FileInfo &fileInfo, Bool isOfficial); ///< returns true if it had to (re)parse the map
+	void writeCacheINI(const AsciiString &mapDir);
+
+	static const char *const m_mapCacheName;
+
+	MapNameSet m_allowedMaps;
+	Bool m_doCreateStandardMapCacheINI;
+	Bool m_doLoadStandardMapCacheINI;
+	Bool m_doLoadUserMapCacheINI;
+};
+
+extern MapCache *TheMapCache;
+extern TechAndSupplyImages TheSupplyAndTechImageLocations;
+
+// TheSuperHackers @refactor xezon 28/11/2025 Refactors the map list population implementation
+// by breaking it into smaller pieces to make it more maintainable.
+
+Int populateMapListbox( GameWindow *listbox, Bool useSystemMaps, Bool isMultiplayer, AsciiString mapToSelect = AsciiString::TheEmptyString );		/// Read a list of maps from the run directory and fill in the listbox.  Return the selected index
+Int populateMapListboxNoReset( GameWindow *listbox, Bool useSystemMaps, Bool isMultiplayer, AsciiString mapToSelect = AsciiString::TheEmptyString );		/// Read a list of maps from the run directory and fill in the listbox.  Return the selected index
+Bool isValidMap( AsciiString mapName, Bool isMultiplayer );						/// Validate a map
+Image *getMapPreviewImage( AsciiString mapName );
+AsciiString getDefaultMap( Bool isMultiplayer );											/// Find a valid map
+AsciiString getDefaultOfficialMap();
+Bool isOfficialMap( AsciiString mapName );
+Bool parseMapPreviewChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
+void findDrawPositions( Int startX, Int startY, Int width, Int height, Region3D extent,
+															 ICoord2D *ul, ICoord2D *lr );
+Bool WouldMapTransfer( const AsciiString& mapName );
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h b/Core/GameEngine/Include/GameClient/ParabolicEase.h
similarity index 97%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h
rename to Core/GameEngine/Include/GameClient/ParabolicEase.h
index ef13c49a50e..3334def572b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h
+++ b/Core/GameEngine/Include/GameClient/ParabolicEase.h
@@ -23,9 +23,9 @@
 // Ease in and out based on a parabolic function.
 // Author: Robert Minsk May 12, 2003
 // ============================================================================
+
 #pragma once
-#ifndef _PARABOLICEASE_H
-#define _PARABOLICEASE_H
+
 // ============================================================================
 #include "Lib/BaseType.h"
 // ============================================================================
@@ -89,4 +89,3 @@ class ParabolicEase
 };
 
 // ============================================================================
-#endif // _PARABOLICEASE_H
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h b/Core/GameEngine/Include/GameClient/Smudge.h
similarity index 89%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h
rename to Core/GameEngine/Include/GameClient/Smudge.h
index e523c4ea0d8..657736d1f2f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h
+++ b/Core/GameEngine/Include/GameClient/Smudge.h
@@ -20,9 +20,6 @@
 
 #pragma once
 
-#ifndef _SMUDGE_H_
-#define _SMUDGE_H_
-
 #include "WW3D2/dllist.h"
 #include "WWMath/vector2.h"
 #include "WWMath/vector3.h"
@@ -81,9 +78,9 @@ class SmudgeManager
 
 	SmudgeSet *addSmudgeSet(void);
 	void removeSmudgeSet(SmudgeSet &mySmudge);
-	inline Int getSmudgeCountLastFrame(void) {return m_smudgeCountLastFrame;} ///<return number of smudges submitted last frame.
-	inline void setSmudgeCountLastFrame(Int count) { m_smudgeCountLastFrame = count;} 
-	inline Bool getHardwareSupport(void) { return m_hardwareSupportStatus != SMUDGE_SUPPORT_NO;}
+	Int getSmudgeCountLastFrame(void) {return m_smudgeCountLastFrame;} ///<return number of smudges submitted last frame.
+	void setSmudgeCountLastFrame(Int count) { m_smudgeCountLastFrame = count;}
+	Bool getHardwareSupport(void) { return m_hardwareSupportStatus != SMUDGE_SUPPORT_NO;}
 
 protected:
 
@@ -97,5 +94,3 @@ class SmudgeManager
 };
 
 extern SmudgeManager *TheSmudgeManager;	///<singleton
-
-#endif	//_SMUDGE_H_
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Snow.h b/Core/GameEngine/Include/GameClient/Snow.h
similarity index 98%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/Snow.h
rename to Core/GameEngine/Include/GameClient/Snow.h
index 5538fad454c..08679b14f07 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Snow.h
+++ b/Core/GameEngine/Include/GameClient/Snow.h
@@ -19,8 +19,6 @@
 // FILE: Snow.h /////////////////////////////////////////////////////////
 
 #pragma once
-#ifndef _SNOW_H_
-#define _SNOW_H_
 
 #include "Lib/BaseType.h"
 #include "Common/SubsystemInterface.h"
@@ -115,6 +113,3 @@ class SnowManager : public SubsystemInterface
 };
 
 extern SnowManager *TheSnowManager;  ///< the ray effects singleton external
-
-#endif // _SNOW_H_
-
diff --git a/Core/GameEngine/Include/GameClient/TerrainRoads.h b/Core/GameEngine/Include/GameClient/TerrainRoads.h
new file mode 100644
index 00000000000..dd7669c9c1d
--- /dev/null
+++ b/Core/GameEngine/Include/GameClient/TerrainRoads.h
@@ -0,0 +1,229 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: TerrainRoads.h ///////////////////////////////////////////////////////////////////////////
+// Author: Colin Day, December 2001
+// Desc:   Terrain road descriptions
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "Common/GameMemory.h"
+#include "Common/SubsystemInterface.h"
+
+#include "GameLogic/Module/BodyModule.h"
+
+
+// FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
+struct FieldParse;
+class AsciiString;
+
+// ------------------------------------------------------------------------------------------------
+/** Bridges have 4 towers around it that the player can attack or use to repair the bridge */
+// ------------------------------------------------------------------------------------------------
+enum BridgeTowerType CPP_11(: Int)
+{
+	BRIDGE_TOWER_FROM_LEFT = 0,
+	BRIDGE_TOWER_FROM_RIGHT,
+	BRIDGE_TOWER_TO_LEFT,
+	BRIDGE_TOWER_TO_RIGHT,
+
+	BRIDGE_MAX_TOWERS
+};
+
+// ------------------------------------------------------------------------------------------------
+enum { MAX_BRIDGE_BODY_FX = 3 };
+
+//-------------------------------------------------------------------------------------------------
+/** Terrain road description, good for roads and bridges */
+//-------------------------------------------------------------------------------------------------
+class TerrainRoadType : public MemoryPoolObject
+{
+
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TerrainRoadType, "TerrainRoadType" )
+
+public:
+
+	TerrainRoadType( void );
+	// destructor prototypes defined by memory pool object
+
+	AsciiString getName( void ) { return m_name; }
+	AsciiString getTexture( void ) { return m_texture; }
+	Bool isBridge( void ) { return m_isBridge; }
+	UnsignedInt getID( void ) { return m_id; }
+
+	Real getRoadWidth( void ) { return m_roadWidth; }
+	Real getRoadWidthInTexture( void ) { return m_roadWidthInTexture; }
+
+	Real getBridgeScale( void ) { return m_bridgeScale; }
+	AsciiString getScaffoldObjectName( void ) { return m_scaffoldObjectName; }
+	AsciiString getScaffoldSupportObjectName( void ) { return m_scaffoldSupportObjectName; }
+	RGBColor getRadarColor( void ) { return m_radarColor; }
+	AsciiString getBridgeModel( void ) { return m_bridgeModelName; }
+	AsciiString getBridgeModelNameDamaged( void ) { return m_bridgeModelNameDamaged; }
+	AsciiString getBridgeModelNameReallyDamaged( void ) { return m_bridgeModelNameReallyDamaged; }
+	AsciiString getBridgeModelNameBroken( void ) { return m_bridgeModelNameBroken; }
+	AsciiString getTextureDamaged( void ) { return m_textureDamaged; }
+	AsciiString getTextureReallyDamaged( void ) { return m_textureReallyDamaged; }
+	AsciiString getTextureBroken( void ) { return m_textureBroken; }
+	AsciiString getTowerObjectName( BridgeTowerType tower ) { return m_towerObjectName[ tower ]; }
+	AsciiString getDamageToSoundString( BodyDamageType state ) { return m_damageToSoundString[ state ]; }
+	AsciiString getDamageToOCLString( BodyDamageType state, Int index ) { return m_damageToOCLString[ state ][ index ]; }
+	AsciiString getDamageToFXString( BodyDamageType state, Int index ) { return m_damageToFXString[ state ][ index ]; }
+	AsciiString getRepairedToSoundString( BodyDamageType state ) { return m_repairedToSoundString[ state ]; }
+	AsciiString getRepairedToOCLString( BodyDamageType state, Int index ) { return m_repairedToOCLString[ state ][ index ]; }
+	AsciiString getRepairedToFXString( BodyDamageType state, Int index ) { return m_repairedToFXString[ state ][ index ]; }
+	Real getTransitionEffectsHeight( void ) { return m_transitionEffectsHeight; }
+	Int getNumFXPerType( void ) { return m_numFXPerType; }
+
+	// friend access methods to be used by the road collection only!
+	void friend_setName( AsciiString name ) { m_name = name; }
+	void friend_setTexture( AsciiString texture ) { m_texture = texture; }
+	void friend_setBridge( Bool isBridge ) { m_isBridge = isBridge; }
+	void friend_setID( UnsignedInt id ) { m_id = id; }
+	void friend_setNext( TerrainRoadType *next ) { m_next = next; }
+	TerrainRoadType *friend_getNext( void ) { return m_next; }
+	void friend_setRoadWidth( Real width ) { m_roadWidth = width; }
+	void friend_setRoadWidthInTexture( Real width ) { m_roadWidthInTexture = width; }
+	void friend_setBridgeScale( Real scale ) { m_bridgeScale = scale; }
+	void friend_setScaffoldObjectName( AsciiString name ) { m_scaffoldObjectName = name; }
+	void friend_setScaffoldSupportObjectName( AsciiString name ) { m_scaffoldSupportObjectName = name; }
+	void friend_setBridgeModelName( AsciiString name ) { m_bridgeModelName = name; }
+	void friend_setBridgeModelNameDamaged( AsciiString name ) { m_bridgeModelNameDamaged = name; }
+	void friend_setBridgeModelNameReallyDamaged( AsciiString name ) { m_bridgeModelNameReallyDamaged = name; }
+	void friend_setBridgeModelNameBroken( AsciiString name ) { m_bridgeModelNameBroken = name; }
+	void friend_setTextureDamaged( AsciiString texture ) { m_textureDamaged = texture; }
+	void friend_setTextureReallyDamaged( AsciiString texture ) { m_textureReallyDamaged = texture; }
+	void friend_setTextureBroken( AsciiString texture ) { m_textureBroken = texture; }
+	void friend_setTowerObjectName( BridgeTowerType tower, AsciiString name ) { m_towerObjectName[ tower ] = name; }
+	void friend_setDamageToSoundString( BodyDamageType state, AsciiString s ) { m_damageToSoundString[ state ] = s; }
+	void friend_setDamageToOCLString( BodyDamageType state, Int index, AsciiString s ) { m_damageToOCLString[ state ][ index ] = s; }
+	void friend_setDamageToFXString( BodyDamageType state, Int index, AsciiString s ) { m_damageToFXString[ state ][ index ] = s; }
+	void friend_setRepairedToSoundString( BodyDamageType state, AsciiString s ) { m_repairedToSoundString[ state ] = s; }
+	void friend_setRepairedToOCLString( BodyDamageType state, Int index, AsciiString s ) { m_repairedToOCLString[ state ][ index ] = s; }
+	void friend_setRepairedToFXString( BodyDamageType state, Int index, AsciiString s ) { m_repairedToFXString[ state ][ index ] = s; }
+	void friend_setTransitionEffectsHeight( Real height ) { m_transitionEffectsHeight = height; }
+	void friend_setNumFXPerType( Int num ) { m_numFXPerType = num; }
+
+	/// get the parsing table for INI
+	const FieldParse *getRoadFieldParse( void ) { return m_terrainRoadFieldParseTable; }
+	const FieldParse *getBridgeFieldParse( void ) { return m_terrainBridgeFieldParseTable; }
+
+protected:
+
+	AsciiString m_name;								///< entry name
+	Bool m_isBridge;									///< true if entry is for a bridge
+	UnsignedInt m_id;									///< unique id
+	TerrainRoadType *m_next;					///< next in road list
+
+	// for parsing from INI
+	static const FieldParse m_terrainRoadFieldParseTable[];		///< the parse table for INI definition
+	static const FieldParse m_terrainBridgeFieldParseTable[];		///< the parse table for INI definition
+	static void parseTransitionToOCL( INI *ini, void *instance, void *store, const void *userData );
+	static void parseTransitionToFX( INI *ini, void *instance, void *store, const void *userData );
+
+	//
+	// *note* I would union the road and bridge data, but unions can't have a copy
+	// constructor such as the AsciiString does
+	//
+
+	// road data
+	Real m_roadWidth;														///< width of road
+	Real m_roadWidthInTexture;									///< width of road in the texture
+
+	// bridge data
+	Real m_bridgeScale;													///< scale for bridge
+
+	AsciiString m_scaffoldObjectName;						///< scaffold object name
+	AsciiString m_scaffoldSupportObjectName;		///< scaffold support object name
+
+	RGBColor m_radarColor;											///< color for this bridge on the radar
+
+	AsciiString m_bridgeModelName;							///< model name for bridge
+	AsciiString m_texture;											///< texture filename
+
+	AsciiString m_bridgeModelNameDamaged;				///< model name for bridge
+	AsciiString m_textureDamaged;								///< model name for bridge
+
+	AsciiString m_bridgeModelNameReallyDamaged;	///< model name for bridge
+	AsciiString m_textureReallyDamaged;					///< model name for bridge
+
+	AsciiString m_bridgeModelNameBroken;				///< model name for bridge
+	AsciiString m_textureBroken;								///< model name for bridge
+
+	AsciiString m_towerObjectName[ BRIDGE_MAX_TOWERS ];	///< object names for the targetable towers on the bridge
+
+	//
+	// the following strings are for repair/damage transition events, what sounds to
+	// play and a collection of OCL and FX lists to play over the bridge area
+	//
+	AsciiString m_damageToSoundString[ BODYDAMAGETYPE_COUNT ];
+	AsciiString m_damageToOCLString[ BODYDAMAGETYPE_COUNT ][ MAX_BRIDGE_BODY_FX ];
+	AsciiString m_damageToFXString[ BODYDAMAGETYPE_COUNT ][ MAX_BRIDGE_BODY_FX ];
+	AsciiString m_repairedToSoundString[ BODYDAMAGETYPE_COUNT ];
+	AsciiString m_repairedToOCLString[ BODYDAMAGETYPE_COUNT ][ MAX_BRIDGE_BODY_FX ];
+	AsciiString m_repairedToFXString[ BODYDAMAGETYPE_COUNT ][ MAX_BRIDGE_BODY_FX ];
+	Real m_transitionEffectsHeight;
+	Int m_numFXPerType; ///< for *each* fx/ocl we will make this many of them on the bridge area
+
+};
+
+//-------------------------------------------------------------------------------------------------
+/** Collection of all roads and bridges */
+//-------------------------------------------------------------------------------------------------
+class TerrainRoadCollection : public SubsystemInterface
+{
+
+public:
+
+	TerrainRoadCollection( void );
+	~TerrainRoadCollection( void );
+
+	void init() { }
+	void reset() { }
+	void update() { }
+
+	TerrainRoadType *findRoad( AsciiString name );		///< find road with matching name
+	TerrainRoadType *newRoad( AsciiString name );			///< allocate new road, assing name, and link to list
+	TerrainRoadType *firstRoad( void ) { return m_roadList; }			///< return first road
+	TerrainRoadType *nextRoad( TerrainRoadType *road );						///< get next road
+
+	TerrainRoadType *findBridge( AsciiString name );	///< find bridge with matching name
+	TerrainRoadType *newBridge( AsciiString name );		///< allocate new bridge, assign name, and link
+	TerrainRoadType *firstBridge( void ) { return m_bridgeList; } ///< return first bridge
+	TerrainRoadType *nextBridge( TerrainRoadType *bridge );				///< get next bridge
+
+	TerrainRoadType *findRoadOrBridge( AsciiString name );				///< search roads and bridges
+
+protected:
+
+	TerrainRoadType *m_roadList;				///< list of available roads
+	TerrainRoadType *m_bridgeList;			///< list of available bridges
+	static UnsignedInt m_idCounter;			///< unique id counter when allocating roads/bridges
+
+};
+
+// EXTERNAL ////////////////////////////////////////////////////////////////////////////////////////
+extern TerrainRoadCollection *TheTerrainRoads;
diff --git a/Core/GameEngine/Include/GameClient/TerrainVisual.h b/Core/GameEngine/Include/GameClient/TerrainVisual.h
new file mode 100644
index 00000000000..8463ff83ab1
--- /dev/null
+++ b/Core/GameEngine/Include/GameClient/TerrainVisual.h
@@ -0,0 +1,310 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: TerrainVisual.h //////////////////////////////////////////////////////////////////////////
+// Interface for visual representation of terrain on the client
+// Author: Colin Day, April 2001
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Common/Terrain.h"
+#include "Common/Snapshot.h"
+#include "Common/MapObject.h"
+
+// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
+class TerrainType;
+class WaterHandle;
+class Matrix3D;
+class Object;
+class Drawable;
+class GeometryInfo;
+
+
+class WorldHeightMap;
+struct SeismicSimulationNode;
+class SeismicSimulationFilterBase;
+
+
+#define DEFAULT_SEISMIC_SIMULATION_MAGNITUDE (20.0f)
+struct SeismicSimulationNode; // just a forward declaration folks, no cause for alarm
+class SeismicSimulationFilterBase
+{
+public:
+  enum SeismicSimStatusCode CPP_11(: Int)
+  {
+    SEISMIC_STATUS_INVALID,
+    SEISMIC_STATUS_ACTIVE,
+    SEISMIC_STATUS_ZERO_ENERGY,
+  };
+
+  virtual SeismicSimStatusCode filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node ) = 0;
+  virtual Real applyGravityCallback( Real velocityIn ) = 0;
+};
+
+struct SeismicSimulationNode
+{
+  SeismicSimulationNode()
+  {
+    m_center.x    = 0;
+    m_center.y    = 0;
+    m_radius      = 0;
+    m_region.lo.x = 0;
+    m_region.lo.y = 0;
+    m_region.hi.x = 0;
+    m_region.hi.y = 0;
+    m_clean = FALSE;
+    callbackFilter = NULL;
+    m_life = 0;
+    m_magnitude = DEFAULT_SEISMIC_SIMULATION_MAGNITUDE;
+
+  }
+  SeismicSimulationNode( const SeismicSimulationNode &ssn )
+  {
+    m_center.x    = ssn.m_center.x;
+    m_center.y    = ssn.m_center.y;
+    m_radius      = ssn.m_radius;
+    m_region.lo.x = ssn.m_region.lo.x;
+    m_region.lo.y = ssn.m_region.lo.y;
+    m_region.hi.x = ssn.m_region.hi.x;
+    m_region.hi.y = ssn.m_region.hi.y;
+    m_clean       = ssn.m_clean;
+    callbackFilter= ssn.callbackFilter;
+    m_life        = ssn.m_life;
+    m_magnitude   = ssn.m_magnitude;
+
+  }
+  SeismicSimulationNode( const Coord3D* ctr, Real rad, Real mag, SeismicSimulationFilterBase *cbf = NULL )
+  {
+    m_center.x    = REAL_TO_INT_FLOOR(ctr->x/MAP_XY_FACTOR);
+    m_center.y    = REAL_TO_INT_FLOOR(ctr->y/MAP_XY_FACTOR);
+    m_radius      = (rad-1)/MAP_XY_FACTOR;
+    UnsignedInt regionSize = rad/MAP_XY_FACTOR;
+    m_region.lo.x = m_center.x - regionSize;
+    m_region.lo.y = m_center.y - regionSize;
+    m_region.hi.x = m_center.x + regionSize;
+    m_region.hi.y = m_center.y + regionSize;
+    m_clean       = false;
+    callbackFilter= cbf;
+    m_life        = 0;
+    m_magnitude   = mag;
+
+  }
+
+  SeismicSimulationFilterBase::SeismicSimStatusCode handleFilterCallback( WorldHeightMapInterfaceClass *heightMap )
+  {
+    if ( callbackFilter == NULL )
+      return SeismicSimulationFilterBase::SEISMIC_STATUS_INVALID;
+
+    ++m_life;
+
+    return callbackFilter->filterCallback( heightMap, this );
+  }
+
+  Real applyGravity( Real velocityIn )
+  {
+    DEBUG_ASSERTCRASH( callbackFilter, ("SeismicSimulationNode::applyGravity() has no callback filter!") );
+
+    if ( callbackFilter == NULL )
+      return velocityIn;//oops, we have no callback!
+
+    return callbackFilter->applyGravityCallback( velocityIn );
+
+  }
+
+  IRegion2D   m_region;
+  ICoord2D    m_center;
+  Bool        m_clean;
+  Real        m_magnitude;
+  UnsignedInt m_radius;
+  UnsignedInt m_life;
+
+  SeismicSimulationFilterBase *callbackFilter;
+
+};
+typedef std::list<SeismicSimulationNode> SeismicSimulationList;
+typedef SeismicSimulationList::iterator SeismicSimulationListIt;
+
+class DomeStyleSeismicFilter : public SeismicSimulationFilterBase
+{
+  virtual SeismicSimStatusCode filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node );
+  virtual Real applyGravityCallback( Real velocityIn );
+};
+
+
+//-------------------------------------------------------------------------------------------------
+/** LOD values for terrain, keep this in sync with TerrainLODNames[] */
+//-------------------------------------------------------------------------------------------------
+typedef enum _TerrainLOD CPP_11(: Int)
+{
+	TERRAIN_LOD_INVALID,
+	TERRAIN_LOD_MIN,  // note that this is less than max
+	TERRAIN_LOD_STRETCH_NO_CLOUDS,
+	TERRAIN_LOD_HALF_CLOUDS,
+	TERRAIN_LOD_NO_CLOUDS,
+	TERRAIN_LOD_STRETCH_CLOUDS,
+	TERRAIN_LOD_NO_WATER,
+	TERRAIN_LOD_MAX,  // note that this is larger than min
+	TERRAIN_LOD_AUTOMATIC,
+	TERRAIN_LOD_DISABLE,
+
+	TERRAIN_LOD_NUM_TYPES
+
+} TerrainLOD;
+#ifdef DEFINE_TERRAIN_LOD_NAMES
+static const char *const TerrainLODNames[] =
+{
+	"NONE",
+	"MIN",
+	"STRETCH_NO_CLOUDS",
+	"HALF_CLOUDS",
+	"NO_CLOUDS",
+	"STRETCH_CLOUDS",
+	"NO_WATER",
+	"MAX",
+	"AUTOMATIC",
+	"DISABLE",
+
+	NULL
+};
+static_assert(ARRAY_SIZE(TerrainLODNames) == TERRAIN_LOD_NUM_TYPES + 1, "Incorrect array size");
+#endif  // end DEFINE_TERRAIN_LOD_NAMES
+
+//-------------------------------------------------------------------------------------------------
+/** Device independent implementation for visual terrain */
+//-------------------------------------------------------------------------------------------------
+class TerrainVisual : public Snapshot,
+											public SubsystemInterface
+{
+
+public:
+
+	enum {NumSkyboxTextures = 5};
+
+	TerrainVisual();
+	virtual ~TerrainVisual();
+
+	virtual void init( void );
+	virtual void reset( void );
+	virtual void update( void );
+
+	virtual Bool load( AsciiString filename );
+
+	/// get color of texture on the terrain at location specified
+	virtual void getTerrainColorAt( Real x, Real y, RGBColor *pColor ) = 0;
+
+	/// get the terrain tile type at the world location in the (x,y) plane ignoring Z
+	virtual TerrainType *getTerrainTile( Real x, Real y ) = 0;
+
+	/** intersect the ray with the terrain, if a hit occurs TRUE is returned
+	and the result point on the terrain is returned in "result" */
+	virtual Bool intersectTerrain( Coord3D *rayStart,
+																 Coord3D *rayEnd,
+																 Coord3D *result ) { return FALSE; }
+
+	//
+	// water methods
+	//
+	virtual void enableWaterGrid( Bool enable ) = 0;
+	/// set min/max height values allowed in water grid pointed to by waterTable
+	virtual void setWaterGridHeightClamps( const WaterHandle *waterTable, Real minZ, Real maxZ ) = 0;
+	/// adjust fallof parameters for grid change method
+	virtual void setWaterAttenuationFactors( const WaterHandle *waterTable, Real a, Real b, Real c, Real range ) = 0;
+	/// set the water table position and orientation in world space
+	virtual void setWaterTransform( const WaterHandle *waterTable, Real angle, Real x, Real y, Real z ) = 0;
+	virtual void setWaterTransform( const Matrix3D *transform ) = 0;
+	/// get water transform parameters
+	virtual void getWaterTransform( const WaterHandle *waterTable, Matrix3D *transform ) = 0;
+	/// water grid resolution spacing
+	virtual void setWaterGridResolution( const WaterHandle *waterTable, Real gridCellsX, Real gridCellsY, Real cellSize ) = 0;
+	virtual void getWaterGridResolution( const WaterHandle *waterTable, Real *gridCellsX, Real *gridCellsY, Real *cellSize ) = 0;
+	/// adjust the water grid in world coords by the delta
+	virtual void changeWaterHeight( Real x, Real y, Real delta ) = 0;
+	/// adjust the velocity at a water grid point corresponding to the world x,y
+	virtual void addWaterVelocity( Real worldX, Real worldY, Real velocity, Real preferredHeight ) = 0;
+	/// get height of water grid at specified position
+	virtual Bool getWaterGridHeight( Real worldX, Real worldY, Real *height) = 0;
+
+	/// set detail of terrain tracks.
+	virtual void setTerrainTracksDetail(void)=0;
+	virtual void setShoreLineDetail(void)=0;
+
+	/// Add a bib for an object at location.
+	virtual void addFactionBib(Object *factionBuilding, Bool highlight, Real extra = 0)=0;
+	/// Remove a bib.
+	virtual void removeFactionBib(Object *factionBuilding)=0;
+
+	/// Add a bib for a drawable at location.
+	virtual void addFactionBibDrawable(Drawable *factionBuilding, Bool highlight, Real extra = 0)=0;
+	/// Remove a bib.
+	virtual void removeFactionBibDrawable(Drawable *factionBuilding)=0;
+
+	virtual void removeAllBibs(void)=0;
+	virtual void removeBibHighlighting(void)=0;
+
+	virtual void removeTreesAndPropsForConstruction(
+		const Coord3D* pos,
+		const GeometryInfo& geom,
+		Real angle
+	) = 0;
+
+	virtual void addProp(const ThingTemplate *tt, const Coord3D *pos, Real angle) = 0;
+
+	//
+	// Modify height.
+	//
+	virtual void setRawMapHeight(const ICoord2D *gridPos, Int height)=0;
+	virtual Int getRawMapHeight(const ICoord2D *gridPos)=0;
+
+
+  ////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////
+#ifdef DO_SEISMIC_SIMULATIONS
+  virtual void updateSeismicSimulations( void ) = 0; /// walk the SeismicSimulationList and, well, do it.
+  virtual void addSeismicSimulation( const SeismicSimulationNode& sim ) = 0;
+#endif
+  virtual WorldHeightMap* getLogicHeightMap( void ) {return NULL;};
+  virtual WorldHeightMap* getClientHeightMap( void ) {return NULL;};
+  ////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////
+
+
+	/// Replace the skybox texture
+	virtual void replaceSkyboxTextures(const AsciiString *oldTexName[NumSkyboxTextures], const AsciiString *newTexName[NumSkyboxTextures])=0;
+
+protected:
+
+	// snapshot methods
+	virtual void crc( Xfer *xfer );
+	virtual void xfer( Xfer *xfer );
+	virtual void loadPostProcess( void );
+
+	AsciiString m_filenameString;							///< file with terrain data
+
+};
+
+// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
+extern TerrainVisual *TheTerrainVisual;  ///< singleton extern
diff --git a/Core/GameEngine/Include/GameClient/VideoPlayer.h b/Core/GameEngine/Include/GameClient/VideoPlayer.h
new file mode 100644
index 00000000000..ce127e89036
--- /dev/null
+++ b/Core/GameEngine/Include/GameClient/VideoPlayer.h
@@ -0,0 +1,311 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:    Generals
+//
+// File name:  GameClient/VideoPlayer.h
+//
+// Created:    10/22/01
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+//----------------------------------------------------------------------------
+//           Includes
+//----------------------------------------------------------------------------
+
+#include <Lib/BaseType.h>
+#include "WWMath/rect.h"
+#include "Common/SubsystemInterface.h"
+#include "Common/AsciiString.h"
+#include "Common/INI.h"
+#include "Common/STLTypedefs.h"
+
+//----------------------------------------------------------------------------
+//           Forward References
+//----------------------------------------------------------------------------
+
+struct Video;
+class VideoPlayer;
+
+//----------------------------------------------------------------------------
+//           Type Defines
+//----------------------------------------------------------------------------
+typedef std::vector<Video>	VecVideo;
+typedef std::vector<Video>::iterator	VecVideoIt;
+
+//----------------------------------------------------------------------------
+//           Video (Struct)
+//----------------------------------------------------------------------------
+struct Video
+{
+	AsciiString m_filename;																	///< should be filled with the filename on disk
+	AsciiString m_internalName;															///< should be our internal reference name
+	AsciiString m_commentForWB;
+};
+
+//===============================
+// VideoBuffer
+//===============================
+/**
+  * Video buffer interface class. The VideoPlayer uses this buffer abstraction
+	* in order to be able to render a video stream.
+	*/
+//===============================
+
+class VideoBuffer
+{
+	public:
+
+	// Enumeration of buffer pixel formats
+		enum Type
+		{
+			TYPE_UNKNOWN,
+			TYPE_R8G8B8,
+			TYPE_X8R8G8B8,
+			TYPE_R5G6B5,
+			TYPE_X1R5G5B5,
+			NUM_TYPES
+		};
+
+
+	protected:
+
+		UnsignedInt m_xPos;					///< X pixel buffer offset
+		UnsignedInt m_yPos;					///< Y pixel buffer offset
+		UnsignedInt m_width;				///< Buffer visible width
+		UnsignedInt m_height;				///< Buffer height
+		UnsignedInt m_textureWidth;	///< Buffer visible width
+		UnsignedInt m_textureHeight;///< Buffer height
+		UnsignedInt m_pitch;				///< buffer pitch
+
+		Type m_format;			///< buffer pixel format
+
+	public:
+
+		VideoBuffer( Type format );
+		virtual ~VideoBuffer() {};
+
+		virtual	Bool		allocate( UnsignedInt width, UnsignedInt Height ) = 0; ///< Allocate buffer
+		virtual void		free( void ) = 0;			///< Free the buffer
+		virtual	void*		lock( void ) = 0;			///< Returns memory pointer to start of buffer
+		virtual void		unlock( void ) = 0;		///< Release buffer
+		virtual Bool		valid( void ) = 0;		///< Is the buffer valid to use
+
+		UnsignedInt			xPos( void ) { return m_xPos;};///< X pixel offset to draw into
+		UnsignedInt			yPos( void ) { return m_yPos;};///< Y pixel offset to draw into
+		void		setPos( UnsignedInt x, UnsignedInt y ) { m_xPos = x; m_yPos = y;};	///< Set the x and y buffer offset
+		UnsignedInt			width( void ) { return m_width;};		///< Returns pixel width of visible texture
+		UnsignedInt			height( void ) { return m_height;};	///< Returns pixel height of visible texture
+		UnsignedInt			textureWidth( void ) { return m_textureWidth;};		///< Returns pixel width of texture
+		UnsignedInt			textureHeight( void ) { return m_textureHeight;};	///< Returns pixel height of texture
+		UnsignedInt			pitch( void ) { return m_pitch;};		///< Returns buffer pitch in bytes
+		Type		format( void ) { return m_format;};	///< Returns buffer pixel format
+
+		RectClass				Rect( Real x1, Real y1, Real x2, Real y2 );
+
+};
+
+
+//===============================
+// VideoStreamInterface
+//===============================
+/**
+  * Video stream interface class.
+	*/
+//===============================
+
+class VideoStreamInterface
+{
+	friend class VideoPlayerInterface;
+
+	protected:
+
+		virtual ~VideoStreamInterface(){};								///< only VideoPlayerInterfaces can create these
+
+	public:
+
+
+		virtual	VideoStreamInterface* next( void ) = 0;		///< Returns next open stream
+		virtual void update( void ) = 0;									///< Update stream
+		virtual void close( void ) = 0;										///< Close and free stream
+
+		virtual Bool	isFrameReady( void ) = 0;						///< Is the frame ready to be displayed
+		virtual void	frameDecompress( void ) = 0;				///< Render current frame in to buffer
+		virtual void	frameRender( VideoBuffer *buffer ) = 0; ///< Render current frame in to buffer
+		virtual void	frameNext( void ) = 0;							///< Advance to next frame
+		virtual Int		frameIndex( void ) = 0;							///< Returns zero based index of current frame
+		virtual Int		frameCount( void ) = 0;							///< Returns the total number of frames in the stream
+		virtual void	frameGoto( Int index ) = 0;					///< Go to the spcified frame index
+		virtual Int		height( void ) = 0;									///< Return the height of the video
+		virtual Int		width( void ) = 0;									///< Return the width of the video
+
+};
+
+//===============================
+// VideoStream
+//===============================
+
+
+
+class VideoStream : public VideoStreamInterface
+{
+	friend class VideoPlayer;
+
+	protected:
+
+		VideoPlayer							*m_player;								///< Video player we were created with
+		VideoStream							*m_next;									///< Next open stream
+
+		VideoStream();																		///< only VideoPlayer can create these
+		virtual ~VideoStream();
+
+	public:
+
+ 		virtual	VideoStreamInterface* next( void );				///< Returns next open stream
+		virtual void update( void );											///< Update stream
+		virtual void close( void );												///< Close and free stream
+
+		virtual Bool	isFrameReady( void );								///< Is the frame ready to be displayed
+		virtual void	frameDecompress( void );						///< Render current frame in to buffer
+		virtual void	frameRender( VideoBuffer *buffer ); ///< Render current frame in to buffer
+		virtual void	frameNext( void );									///< Advance to next frame
+		virtual Int		frameIndex( void );									///< Returns zero based index of current frame
+		virtual Int		frameCount( void );									///< Returns the total number of frames in the stream
+		virtual void	frameGoto( Int index );							///< Go to the spcified frame index
+		virtual Int		height( void );											///< Return the height of the video
+		virtual Int		width( void );											///< Return the width of the video
+
+
+};
+
+//===============================
+// VideoPlayerInterface
+//===============================
+/**
+  *	Interface for video playback.
+	*/
+//===============================
+
+class VideoPlayerInterface : public SubsystemInterface
+{
+
+	public:
+
+		virtual void	init( void ) = 0;														///< Initialize video playback
+		virtual void	reset( void ) = 0;													///< Reset video playback
+		virtual void	update( void ) = 0;													///< Services all video tasks. Should be called frequently
+
+		virtual void	deinit( void ) = 0;													///< Close down player
+
+		virtual				~VideoPlayerInterface() {};
+
+		// service
+		virtual void	loseFocus( void ) = 0;											///< Should be called when application loses focus
+		virtual void	regainFocus( void ) = 0;										///< Should be called when application regains focus
+
+		virtual VideoStreamInterface*	open( AsciiString movieTitle ) = 0;	///< Open video file for playback
+		virtual VideoStreamInterface*	load( AsciiString movieTitle ) = 0;	///< Load video file in to memory for playback
+
+		virtual VideoStreamInterface* firstStream( void ) = 0;		///< Return the first open/loaded video stream
+
+		virtual void	closeAllStreams( void ) = 0;								///< Close all open streams
+		virtual void	addVideo( Video* videoToAdd ) = 0;					///< Add a video to the list of videos we can play
+		virtual void	removeVideo( Video* videoToRemove ) = 0;		///< Remove a video to the list of videos we can play
+		virtual Int getNumVideos( void ) = 0;											///< Retrieve info about the number of videos currently listed
+		virtual const Video* getVideo( AsciiString movieTitle ) = 0;	///< Retrieve info about a movie based on internal name
+		virtual const Video* getVideo( Int index ) = 0;						///< Retrieve info about a movie based on index
+
+		virtual const FieldParse *getFieldParse( void ) const = 0;		///< Return the field parse info
+
+		virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) = 0;		///< Notify the video player that they can now ask for an audio handle, or they need to give theirs up.
+};
+
+
+//===============================
+// VideoPlayer
+//===============================
+/**
+  *	Common video playback code.
+	*/
+//===============================
+
+class VideoPlayer : public VideoPlayerInterface
+{
+	protected:
+		VecVideo mVideosAvailableForPlay;
+		VideoStream		*m_firstStream;
+		static const FieldParse m_videoFieldParseTable[];
+
+	public:
+
+		// subsytem requirements
+		virtual void	init( void );														///< Initialize video playback code
+		virtual void	reset( void );													///< Reset video playback
+		virtual void	update( void );													///< Services all audio tasks. Should be called frequently
+
+		virtual void	deinit( void );													///< Close down player
+
+
+		VideoPlayer();
+		~VideoPlayer();
+
+		// service
+		virtual void	loseFocus( void );											///< Should be called when application loses focus
+		virtual void	regainFocus( void );										///< Should be called when application regains focus
+
+		virtual VideoStreamInterface*	open( AsciiString movieTitle );	///< Open video file for playback
+		virtual VideoStreamInterface*	load( AsciiString movieTitle );	///< Load video file in to memory for playback
+		virtual VideoStreamInterface* firstStream( void );		///< Return the first open/loaded video stream
+		virtual void	closeAllStreams( void );								///< Close all open streams
+
+		virtual void	addVideo( Video* videoToAdd );					///< Add a video to the list of videos we can play
+		virtual void	removeVideo( Video* videoToRemove );		///< Remove a video to the list of videos we can play
+		virtual Int getNumVideos( void );											///< Retrieve info about the number of videos currently listed
+		virtual const Video* getVideo( AsciiString movieTitle );	///< Retrieve info about a movie based on internal name
+		virtual const Video* getVideo( Int index );						///< Retrieve info about a movie based on index
+		virtual const FieldParse *getFieldParse( void ) const { return m_videoFieldParseTable; }		///< Return the field parse info
+
+		virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) { }
+
+		// Implementation specific
+		void remove( VideoStream *stream );										///< remove stream from active list
+
+};
+
+extern VideoPlayerInterface *TheVideoPlayer;
+
+//----------------------------------------------------------------------------
+//           Inlining
+//----------------------------------------------------------------------------
diff --git a/Core/GameEngine/Include/GameClient/View.h b/Core/GameEngine/Include/GameClient/View.h
new file mode 100644
index 00000000000..9d26976debb
--- /dev/null
+++ b/Core/GameEngine/Include/GameClient/View.h
@@ -0,0 +1,337 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// View.h /////////////////////////////////////////////////////////////////////////////////////////
+// A "view", or window, into the World
+// Author: Michael S. Booth, February 2001
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "Common/GameType.h"
+#include "Common/Snapshot.h"
+#include "Lib/BaseType.h"
+#include "WW3D2/coltype.h"			///< we don't generally do this, but we need the W3D collision types
+
+#define DEFAULT_VIEW_WIDTH 640
+#define DEFAULT_VIEW_HEIGHT 480
+#define DEFAULT_VIEW_ORIGIN_X 0
+#define DEFAULT_VIEW_ORIGIN_Y 0
+
+// FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
+class Drawable;
+class ViewLocation;
+class Thing;
+class Waypoint;
+class LookAtTranslator;
+enum FilterTypes CPP_11(: Int);
+enum FilterModes CPP_11(: Int);
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+enum PickType CPP_11(: Int)
+{
+	PICK_TYPE_TERRAIN						= COLL_TYPE_0,
+	PICK_TYPE_SELECTABLE				= COLL_TYPE_1,
+	PICK_TYPE_SHRUBBERY					= COLL_TYPE_2,
+	PICK_TYPE_MINES							= COLL_TYPE_3,	// mines aren't normally selectable, but workers/dozers need to
+	PICK_TYPE_FORCEATTACKABLE		= COLL_TYPE_4,
+	PICK_TYPE_ALL_DRAWABLES			= (PICK_TYPE_SELECTABLE | PICK_TYPE_SHRUBBERY | PICK_TYPE_MINES | PICK_TYPE_FORCEATTACKABLE)
+};
+
+// ------------------------------------------------------------------------------------------------
+/** The implementation of common view functionality. */
+// ------------------------------------------------------------------------------------------------
+class View : public Snapshot
+{
+
+public:
+
+	enum
+	{
+		ZoomHeightPerSecond = 10,
+	};
+
+	/// Add an impulse force to shake the camera
+	enum CameraShakeType
+	{
+		SHAKE_SUBTLE = 0,
+		SHAKE_NORMAL,
+		SHAKE_STRONG,
+		SHAKE_SEVERE,
+		SHAKE_CINE_EXTREME,		//Added for cinematics ONLY
+		SHAKE_CINE_INSANE,		//Added for cinematics ONLY
+		SHAKE_COUNT
+	};
+
+  // Return values for worldToScreenTriReturn
+  enum WorldToScreenReturn CPP_11(: Int)
+  {
+    WTS_INSIDE_FRUSTUM = 0, // On the screen (inside frustum of camera)
+    WTS_OUTSIDE_FRUSTUM,    // Return is valid but off the screen (outside frustum of camera)
+    WTS_INVALID,            // No transform possible
+  };
+
+public:
+
+	View( void );
+	virtual ~View( void );
+
+	virtual void init( void );
+	virtual void reset( void );
+	virtual UnsignedInt getID( void ) { return m_id; }
+
+	virtual void setZoomLimited( Bool limit ) { m_zoomLimited = limit; }			///< limit the zoom height
+	virtual Bool isZoomLimited( void ) { return m_zoomLimited; }							///< get status of zoom limit
+
+	/// pick drawable given the screen pixel coords.  If force attack, picks bridges as well.
+	virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ) = 0;
+
+	/// all drawables in the 2D screen region will call the 'callback'
+	virtual Int iterateDrawablesInRegion( IRegion2D *screenRegion,
+																				Bool (*callback)( Drawable *draw, void *userData ),
+																				void *userData ) = 0;
+
+	/** project the 4 corners of this view into the world and return each point as a parameter,
+			the world points are at the requested Z */
+	virtual void getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
+																							Coord3D *bottomLeft, Coord3D *bottomRight,
+																							Real z );
+
+	virtual void setWidth( Int width ) { m_width = width; }
+	virtual Int getWidth( void ) { return m_width; }
+	virtual void setHeight( Int height ) { m_height = height; }
+	virtual Int getHeight( void ) { return m_height; }
+	virtual void setOrigin( Int x, Int y) { m_originX=x; m_originY=y;}				///< Sets location of top-left view corner on display
+	virtual void getOrigin( Int *x, Int *y) { *x=m_originX; *y=m_originY;}			///< Return location of top-left view corner on display
+
+	virtual void lockViewUntilFrame(UnsignedInt frame); ///< Locks the current view until the given frame is reached.
+	virtual void forceRedraw() = 0;
+
+	virtual void lookAt( const Coord3D *o );														///< Center the view on the given coordinate
+	virtual void initHeightForMap( void ) {};														///<  Init the camera height for the map at the current position.
+	virtual void scrollBy( Coord2D *delta );														///< Shift the view by the given delta
+
+	virtual void moveCameraTo(const Coord3D *o, Int frames, Int shutter, Bool orient, Real easeIn=0.0f, Real easeOut=0.0f) { lookAt( o ); }
+	virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, Bool orient, Real easeIn=0.0f, Real easeOut=0.0f) { }
+	virtual Bool isCameraMovementFinished( void ) { return TRUE; }
+	virtual void cameraModFinalZoom(Real finalZoom, Real easeIn=0.0f, Real easeOut=0.0f){}; ///< Final zoom for current camera movement.
+	virtual void cameraModRollingAverage(Int framesToAverage){}; ///< Number of frames to average movement for current camera movement.
+	virtual void cameraModFinalTimeMultiplier(Int finalMultiplier){}; ///< Final time multiplier for current camera movement.
+	virtual void cameraModFinalPitch(Real finalPitch, Real easeIn=0.0f, Real easeOut=0.0f){};	 ///< Final pitch for current camera movement.
+	virtual void cameraModFreezeTime(void){ }					///< Freezes time during the next camera movement.
+	virtual void cameraModFreezeAngle(void){ }					///< Freezes time during the next camera movement.
+	virtual void cameraModLookToward(Coord3D *pLoc){}			///< Sets a look at point during camera movement.
+	virtual void cameraModFinalLookToward(Coord3D *pLoc){}			///< Sets a look at point during camera movement.
+	virtual void cameraModFinalMoveTo(Coord3D *pLoc){ };			///< Sets a final move to.
+
+	// (gth) C&C3 animation controled camera feature
+	virtual void cameraEnableSlaveMode(const AsciiString & thingtemplateName, const AsciiString & boneName) {}
+	virtual void cameraDisableSlaveMode(void) {}
+	virtual	void Add_Camera_Shake(const Coord3D & position,float radius, float duration, float power) {}
+	virtual FilterModes getViewFilterMode(void) {return (FilterModes)0;}			///< Turns on viewport special effect (black & white mode)
+	virtual FilterTypes getViewFilterType(void) {return (FilterTypes)0;}			///< Turns on viewport special effect (black & white mode)
+	virtual Bool setViewFilterMode(FilterModes filterMode) { return FALSE; }			///< Turns on viewport special effect (black & white mode)
+	virtual void setViewFilterPos(const Coord3D *pos) { };			///<  Passes a position to the special effect filter.
+	virtual Bool setViewFilter( FilterTypes filter) { return FALSE;}			///< Turns on viewport special effect (black & white mode)
+
+	virtual void setFadeParameters(Int fadeFrames, Int direction) { };
+	virtual void set3DWireFrameMode(Bool enable) { };
+
+ 	virtual void resetCamera(const Coord3D *location, Int frames, Real easeIn=0.0f, Real easeOut=0.0f) {}; ///< Move camera to location, and reset to default angle & zoom.
+ 	virtual void rotateCamera(Real rotations, Int frames, Real easeIn=0.0f, Real easeOut=0.0f) {}; ///< Rotate camera about current viewpoint.
+	virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn=0.0f, Real easeOut=0.0f) {};	///< Rotate camera to face an object, and hold on it
+	virtual void rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds, Real easeIn=0.0f, Real easeOut=0.0f, Bool reverseRotation=FALSE) {};	///< Rotate camera to face a location.
+	virtual Bool isTimeFrozen(void){ return false;}					///< Freezes time during the next camera movement.
+	virtual Int	 getTimeMultiplier(void) {return 1;};				///< Get the time multiplier.
+	virtual void setTimeMultiplier(Int multiple) {}; ///< Set the time multiplier.
+	virtual void setDefaultView(Real pitch, Real angle, Real maxHeight) {};
+	virtual void zoomCamera( Real finalZoom, Int milliseconds, Real easeIn=0.0f, Real easeOut=0.0f ) {};
+	virtual void pitchCamera( Real finalPitch, Int milliseconds, Real easeIn=0.0f, Real easeOut=0.0f ) {};
+
+	virtual void setAngle( Real angle );																///< Rotate the view around the up axis to the given angle
+	virtual Real getAngle( void ) { return m_angle; }
+	virtual void setPitch( Real angle );																///< Rotate the view around the horizontal axis to the given angle
+	virtual Real getPitch( void ) { return m_pitchAngle; }							///< Return current camera pitch
+	virtual void setAngleAndPitchToDefault( void );											///< Set the view angle back to default
+	virtual void getPosition(Coord3D *pos)	{ *pos=m_pos;}							///< Returns position camera is looking at (z will be zero)
+
+	virtual const Coord3D& get3DCameraPosition() const = 0;							///< Returns the actual camera position
+
+	virtual Real getZoom() { return m_zoom; }
+	virtual void setZoom(Real z) { m_zoom = z; }
+	virtual Real getHeightAboveGround() { return m_heightAboveGround; }
+	virtual void setHeightAboveGround(Real z);
+	virtual void zoom( Real height ); ///< Zoom in/out, closer to the ground, limit to min, or farther away from the ground, limit to max
+	virtual void setZoomToDefault( void ) { m_zoom  = 1.0f; } ///< Set zoom to default value
+	virtual void setOkToAdjustHeight( Bool val ) { m_okToAdjustHeight = val; }	///< Set this to adjust camera height
+
+	// for debugging
+	virtual Real getTerrainHeightUnderCamera() { return m_terrainHeightUnderCamera; }
+	virtual void setTerrainHeightUnderCamera(Real z) { m_terrainHeightUnderCamera = z; }
+	virtual Real getCurrentHeightAboveGround() { return m_currentHeightAboveGround; }
+	virtual void setCurrentHeightAboveGround(Real z) { m_currentHeightAboveGround = z; }
+
+	virtual void setFieldOfView( Real angle ) { m_FOV = angle; }				///< Set the horizontal field of view angle
+	virtual Real getFieldOfView( void ) { return m_FOV; }								///< Get the horizontal field of view angle
+
+  Bool worldToScreen( const Coord3D *w, ICoord2D *s ) { return worldToScreenTriReturn( w, s ) == WTS_INSIDE_FRUSTUM; }	///< Transform world coordinate "w" into screen coordinate "s"
+  virtual WorldToScreenReturn worldToScreenTriReturn(const Coord3D *w, ICoord2D *s ) = 0; ///< Like worldToScreen(), but with a more informative return value
+	virtual void screenToWorld( const ICoord2D *s, Coord3D *w ) = 0;										///< Transform screen coordinate "s" into world coordinate "w"
+	virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world ) = 0;  ///< transform screen coord to a point on the 3D terrain
+	virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) = 0;  ///< transform screen point to world point at the specified world Z value
+
+	virtual void getLocation ( ViewLocation *location );								///< write the view's current location in to the view location object
+	virtual void setLocation ( const ViewLocation *location );					///< set the view's current location from to the view location object
+
+
+	virtual void drawView( void ) = 0;															///< Render the world visible in this view.
+	virtual void updateView(void) = 0;					///<called once per frame to determine the final camera and object transforms
+	virtual void stepView() = 0; ///< Update view for every fixed time step
+
+
+
+
+	virtual ObjectID getCameraLock() const { return m_cameraLock; }
+	virtual void setCameraLock(ObjectID id) { m_cameraLock = id; m_lockDist = 0.0f; m_lockType = LOCK_FOLLOW; }
+	virtual void snapToCameraLock( void ) { m_snapImmediate = TRUE; }
+	enum CameraLockType { LOCK_FOLLOW, LOCK_TETHER };
+	virtual void setSnapMode( CameraLockType lockType, Real lockDist ) { m_lockType = lockType; m_lockDist = lockDist; }
+
+	virtual Drawable *getCameraLockDrawable() const { return m_cameraLockDrawable; }
+	virtual void setCameraLockDrawable(Drawable *drawable) { m_cameraLockDrawable = drawable; m_lockDist = 0.0f; }
+
+	virtual void setMouseLock( Bool mouseLocked ) { m_mouseLocked = mouseLocked; }					///< lock/unlock the mouse input to the tactical view
+	virtual Bool isMouseLocked( void ) { return m_mouseLocked; }														///< is the mouse input locked to the tactical view?
+
+	/// Add an impulse force to shake the camera
+	virtual void shake( const Coord3D *epicenter, CameraShakeType shakeType ) { };
+
+	virtual Real getFXPitch( void ) const { return 1.0f; }					///< returns the FX pitch angle
+	virtual void forceCameraConstraintRecalc(void) {}
+	virtual void setGuardBandBias( const Coord2D *gb ) = 0;
+
+protected:
+
+	friend class Display;
+
+	// snapshot methods
+	virtual void crc( Xfer *xfer ) { }
+	virtual void xfer( Xfer *xfer );
+	virtual void loadPostProcess( void ) { }
+
+	void setPosition( const Coord3D *pos ) { m_pos = *pos; }
+	const Coord3D *getPosition( void ) const { return &m_pos; }
+
+	virtual View *prependViewToList( View *list );							///< Prepend this view to the given list, return the new list
+	virtual View *getNextView( void ) { return m_next; }				///< Return next view in the set
+
+
+	// **********************************************************************************************
+
+	View *m_next;																								///< List links used by the Display class
+
+	UnsignedInt m_id;																						///< Rhe ID of this view
+	static UnsignedInt m_idNext;																///< Used for allocating view ID's for all views
+
+	UnsignedInt m_viewLockedUntilFrame;
+
+	Coord3D m_pos;																							///< Position of this view, in world coordinates
+	Int m_width, m_height;																			///< Dimensions of the view
+	Int m_originX, m_originY;																		///< Location of top/left view corner
+
+	Real m_angle;																								///< Angle at which view has been rotated about the Z axis
+	Real m_pitchAngle;																					///< Rotation of view direction around horizontal (X) axis
+
+	Real m_maxHeightAboveGround;																///< Highest camera above ground value
+	Real m_minHeightAboveGround;																///< Lowest camera above ground value
+	Real m_zoom;																								///< Current zoom value
+	Real m_heightAboveGround;																		///< User's desired height above ground
+	Bool m_zoomLimited;																					///< Camera restricted in zoom height
+	Real m_defaultAngle;
+	Real m_defaultPitchAngle;
+	Real m_currentHeightAboveGround;														///< Cached value for debugging
+	Real m_terrainHeightUnderCamera;														///< Cached value for debugging
+
+	ObjectID m_cameraLock;																			///< if nonzero, id of object that the camera should follow
+	Drawable *m_cameraLockDrawable;															///< if nonzero, drawable of object that camera should follow.
+	CameraLockType m_lockType;																	///< are we following or just tethering?
+	Real m_lockDist;																						///< how far can we be when tethered?
+
+	Real m_FOV;																									///< the current field of view angle
+	Bool m_mouseLocked;																					///< is the mouse input locked to the tactical view?
+
+	Bool m_okToAdjustHeight;																		///< Should we attempt to adjust camera height?
+	Bool m_snapImmediate;																				///< Should we immediately snap to the object we're following?
+
+	Coord2D m_guardBandBias; ///< Extra beefy margins so huge thins can stay "on-screen"
+
+};
+
+// ------------------------------------------------------------------------------------------------
+/** Used to save and restore view position */
+// ------------------------------------------------------------------------------------------------
+class ViewLocation
+{
+	friend class View;
+	friend class LookAtTranslator;
+
+	protected:
+		Bool m_valid;																								///< Is this location valid
+		Coord3D m_pos;																							///< Position of this view, in world coordinates
+		Real m_angle;																								///< Angle at which view has been rotated about the Z axis
+		Real m_pitch;																								///< Angle at which view has been rotated about the Y axis
+		Real m_zoom;																								///< Current zoom value
+
+	public:
+
+		ViewLocation()
+		{
+			m_valid = FALSE;
+			m_pos.zero();
+			m_angle = m_pitch = m_zoom = 0.0;
+		}
+
+		const Coord3D& getPosition() const { return m_pos; }
+		Bool isValid() const { return m_valid; }
+		Real getAngle() const { return m_angle; }
+		Real getPitch() const { return m_pitch; }
+		Real getZoom() const { return m_zoom; }
+
+		void init(Real x, Real y, Real z, Real angle, Real pitch, Real zoom)
+		{
+			m_pos.x = x;
+			m_pos.y = y;
+			m_pos.z = z;
+			m_angle = angle;
+			m_pitch = pitch;
+			m_zoom = zoom;
+			m_valid = true;
+		}
+};
+
+// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
+extern View *TheTacticalView;		///< the main tactical interface to the game world
diff --git a/Core/GameEngine/Include/GameClient/Water.h b/Core/GameEngine/Include/GameClient/Water.h
new file mode 100644
index 00000000000..f938df6d8c0
--- /dev/null
+++ b/Core/GameEngine/Include/GameClient/Water.h
@@ -0,0 +1,124 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: Water.h //////////////////////////////////////////////////////////////////////////////////
+// Author: Colin Day, December 2001
+// Desc:   Water settings
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+// INLCLUDES //////////////////////////////////////////////////////////////////////////////////////
+#include "Common/GameType.h"
+#include "Common/Overridable.h"
+#include "Common/Override.h"
+
+//-------------------------------------------------------------------------------------------------
+struct FieldParse;
+
+//-------------------------------------------------------------------------------------------------
+/** This structures keeps the settings for how our water will look */
+//-------------------------------------------------------------------------------------------------
+class WaterSetting
+{
+
+public:
+
+	WaterSetting( void );
+	virtual ~WaterSetting( void );
+
+	/// Get the INI parsing table for loading
+	const FieldParse *getFieldParse( void ) { return m_waterSettingFieldParseTable; }
+
+	static const FieldParse m_waterSettingFieldParseTable[];		///< the parse table for INI definition
+	AsciiString m_skyTextureFile;
+	AsciiString m_waterTextureFile;
+	Int m_waterRepeatCount;
+	Real m_skyTexelsPerUnit;	//texel density of sky plane (higher value repeats texture more).
+	RGBAColorInt m_vertex00Diffuse;
+	RGBAColorInt m_vertex10Diffuse;
+	RGBAColorInt m_vertex11Diffuse;
+	RGBAColorInt m_vertex01Diffuse;
+	RGBAColorInt m_waterDiffuseColor;
+	RGBAColorInt m_transparentWaterDiffuse;
+	Real m_uScrollPerMs;
+	Real m_vScrollPerMs;
+
+};
+
+//-------------------------------------------------------------------------------------------------
+/** This structure keeps the transparency and vertex settings, which are the same regardless of the
+		time of day. They can be overridden on a per-map basis. */
+//-------------------------------------------------------------------------------------------------
+class WaterTransparencySetting : public Overridable
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( WaterTransparencySetting, "WaterTransparencySetting"  )
+
+	public:
+		Real m_transparentWaterDepth;
+		Real m_minWaterOpacity;
+		RGBColor m_standingWaterColor;
+		RGBColor m_radarColor;
+		Bool m_additiveBlend;
+		AsciiString m_standingWaterTexture;
+
+		AsciiString m_skyboxTextureN;
+		AsciiString m_skyboxTextureE;
+		AsciiString m_skyboxTextureS;
+		AsciiString m_skyboxTextureW;
+		AsciiString m_skyboxTextureT;
+
+	public:
+		WaterTransparencySetting()
+		{
+			m_transparentWaterDepth = 3.0f;
+			m_minWaterOpacity = 1.0f;
+			m_standingWaterColor.red = 1.0f;
+			m_standingWaterColor.green = 1.0f;
+			m_standingWaterColor.blue = 1.0f;
+			m_radarColor.red = 0.55f;
+			m_radarColor.green = 0.55f;
+			m_radarColor.blue = 1.0f;
+			m_standingWaterTexture = "TWWater01.tga";
+			m_additiveBlend = FALSE;
+
+			m_skyboxTextureN = "TSMorningN.tga";
+			m_skyboxTextureE = "TSMorningE.tga";
+			m_skyboxTextureS = "TSMorningS.tga";
+			m_skyboxTextureW = "TSMorningW.tga";
+			m_skyboxTextureT = "TSMorningT.tga";
+		}
+
+		static const FieldParse m_waterTransparencySettingFieldParseTable[];		///< the parse table for INI definition
+
+		/// Get the INI parsing table for loading
+		const FieldParse *getFieldParse( void ) const { return m_waterTransparencySettingFieldParseTable; }
+};
+
+EMPTY_DTOR(WaterTransparencySetting)
+
+// EXTERNAL ///////////////////////////////////////////////////////////////////////////////////////
+extern WaterSetting WaterSettings[ TIME_OF_DAY_COUNT ];
+
+extern OVERRIDE<WaterTransparencySetting> TheWaterTransparency;
diff --git a/Core/GameEngine/Include/GameClient/WindowVideoManager.h b/Core/GameEngine/Include/GameClient/WindowVideoManager.h
new file mode 100644
index 00000000000..ab0346b3e4f
--- /dev/null
+++ b/Core/GameEngine/Include/GameClient/WindowVideoManager.h
@@ -0,0 +1,182 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: WindowVideoManager.h /////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+//	created:	Mar 2002
+//
+//	Filename: 	WindowVideoManager.h
+//
+//	author:		Chris Huybregts
+//
+//	purpose:
+//
+//-----------------------------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+//-----------------------------------------------------------------------------
+// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// USER INCLUDES //////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// FORWARD REFERENCES /////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+class GameWindow;
+class AsciiString;
+class VideoStreamInterface;
+class VideoBuffer;
+
+//-----------------------------------------------------------------------------
+// TYPE DEFINES ///////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+
+
+enum WindowVideoPlayType CPP_11(: Int)
+{
+	WINDOW_PLAY_MOVIE_ONCE = 0,
+	WINDOW_PLAY_MOVIE_LOOP,
+	WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME,
+
+	WINDOW_PLAY_MOVIE_COUNT
+};
+
+enum WindowVideoStates CPP_11(: Int)
+{
+	WINDOW_VIDEO_STATE_START = 0,
+	WINDOW_VIDEO_STATE_STOP,
+	WINDOW_VIDEO_STATE_PAUSE,
+	WINDOW_VIDEO_STATE_PLAY,
+	WINDOW_VIDEO_STATE_HIDDEN,
+
+	WINDOW_VIDEO_STATE_COUNT
+};
+
+class WindowVideo
+{
+public:
+	WindowVideo( void );
+	~WindowVideo( void );
+
+	VideoStreamInterface *getVideoStream( void );
+	VideoBuffer *getVideoBuffer( void );
+	GameWindow *getWin( void );
+	AsciiString getMovieName( void );
+	WindowVideoPlayType getPlayType ( void );
+	WindowVideoStates getState( void );
+
+	void setPlayType(WindowVideoPlayType playType);
+	void setWindowState( WindowVideoStates state );
+
+	void init( GameWindow *win, AsciiString movieName, WindowVideoPlayType playType,VideoBuffer *videoBuffer,
+	VideoStreamInterface *videoStream);
+
+private:
+	WindowVideoPlayType m_playType;
+	GameWindow *m_win;
+	VideoBuffer *m_videoBuffer;
+	VideoStreamInterface *m_videoStream;
+	AsciiString m_movieName;
+	WindowVideoStates m_state;
+
+};
+
+
+class WindowVideoManager : public SubsystemInterface
+{
+public:
+	WindowVideoManager( void );
+	~WindowVideoManager( void );
+
+	// Inhertited from subsystem ====================================================================
+	virtual void init( void );
+	virtual void reset( void );
+	virtual void update( void );
+	//===============================================================================================
+
+
+	void playMovie( GameWindow *win, AsciiString movieName, WindowVideoPlayType playType );
+	void hideMovie( GameWindow *win );							///< If the window becomes hidden while we're playing, stop the movie but test to see if we should resume
+	void pauseMovie( GameWindow *win );							///< Pause a movie and display it's current frame
+	void resumeMovie( GameWindow *win );						///< If a movie has been stopped, resume it.
+	void stopMovie( GameWindow *win );							///< Stop a movie
+	void stopAndRemoveMovie( GameWindow *win );			///< Stop a movie, and remove it from the manager
+	void stopAllMovies( void );											///< Stop all playing movies
+	void pauseAllMovies( void );										///< Pauses all movies on their current frame
+	void resumeAllMovies( void );										///< Resume Playing all movies
+	Int getWinState( GameWindow *win );			///< return the current state of the window.
+
+private:
+
+	typedef const GameWindow* ConstGameWindowPtr;
+	// use special class for hashing, since std::hash won't compile for arbitrary ptrs
+	struct hashConstGameWindowPtr
+	{
+	size_t operator()(ConstGameWindowPtr p) const
+	{
+		std::hash<UnsignedInt> hasher;
+		return hasher((UnsignedInt)p);
+	}
+	};
+
+	typedef std::hash_map< ConstGameWindowPtr, WindowVideo *, hashConstGameWindowPtr, std::equal_to<ConstGameWindowPtr> > WindowVideoMap;
+
+	WindowVideoMap m_playingVideos;								///< List of currently playin Videos
+	//WindowVideoMap m_pausedVideos;									///< List of currently paused Videos
+	Bool m_stopAllMovies;														///< Maintains is we're in a stop all Movies State
+	Bool m_pauseAllMovies;													///< Maintains if we're in a pause all movies state
+
+
+};
+
+//-----------------------------------------------------------------------------
+// INLINING ///////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+inline VideoStreamInterface *WindowVideo::getVideoStream( void ){ return m_videoStream; };
+inline VideoBuffer *WindowVideo::getVideoBuffer( void ){ return m_videoBuffer; };
+inline GameWindow *WindowVideo::getWin( void ){ return m_win; };
+inline AsciiString WindowVideo::getMovieName( void ){ return m_movieName; };
+inline WindowVideoPlayType WindowVideo::getPlayType ( void ){ return m_playType; };
+inline WindowVideoStates WindowVideo::getState( void ){ return m_state; };
+
+inline void WindowVideo::setPlayType(WindowVideoPlayType playType){ m_playType = playType; };
+
+
+
+//-----------------------------------------------------------------------------
+// EXTERNALS //////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
diff --git a/Core/GameEngine/Include/GameLogic/LogicRandomValue.h b/Core/GameEngine/Include/GameLogic/LogicRandomValue.h
new file mode 100644
index 00000000000..0bc26ef7d14
--- /dev/null
+++ b/Core/GameEngine/Include/GameLogic/LogicRandomValue.h
@@ -0,0 +1,91 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// LogicRandomValue.h
+// Random number generation system
+// Author: Michael S. Booth, January 1998
+// Split out into separate Logic/Client/Audio headers by MDC Sept 2002
+
+#pragma once
+
+#include "Lib/BaseType.h"
+
+// do NOT use these functions directly, rather use the macros below
+extern Int GetGameLogicRandomValue( int lo, int hi, const char *file, int line );
+extern Real GetGameLogicRandomValueReal( Real lo, Real hi, const char *file, int line );
+
+// use these macros to access the random value functions
+#define GameLogicRandomValue( lo, hi ) GetGameLogicRandomValue( lo, hi, __FILE__, __LINE__ )
+#define GameLogicRandomValueReal( lo, hi ) GetGameLogicRandomValueReal( lo, hi, __FILE__, __LINE__ )
+
+//--------------------------------------------------------------------------------------------------------------
+class CColorAlphaDialog;
+class DebugWindowDialog;
+
+/**
+ * A GameLogicRandomVariable represents a distribution of random values
+ * from which discrete values can be retrieved.
+ */
+class GameLogicRandomVariable
+{
+public:
+	// NOTE: This class cannot have a constructor or destructor due to its use within unions
+
+	/**
+	 * CONSTANT represents a single, constant, value.
+	 * UNIFORM represents a uniform distribution of random values.
+	 * GAUSSIAN represents a normally distributed set of random values.
+	 * TRIANGULAR represents a distribution of random values in the shape
+	 *		of a triangle, with the peak probability midway between low and high.
+	 * LOW_BIAS represents a distribution of random values with
+	 *		maximum probability at low, and zero probability at high.
+	 * HIGH_BIAS represents a distribution of random values with
+	 *		zero probability at low, and maximum probability at high.
+	 */
+	enum DistributionType
+	{
+		CONSTANT, UNIFORM, GAUSSIAN, TRIANGULAR, LOW_BIAS, HIGH_BIAS,
+		DISTRIBUTION_COUNT
+	};
+
+	static const char *const DistributionTypeNames[];
+
+	/// define the range of random values, and the distribution of values
+	void setRange( Real low, Real high, DistributionType type = UNIFORM );
+
+	Real getValue( void ) const;														///< return a value from the random distribution
+	Real getMinimumValue( void ) const { return m_low; }
+	Real getMaximumValue( void ) const { return m_high; }
+	DistributionType getDistributionType( void ) const { return m_type; }
+protected:
+	DistributionType m_type;																		///< the kind of random distribution
+	Real m_low, m_high;																					///< the range of random values
+
+	// These two friends are for particle editing.
+	friend CColorAlphaDialog;
+	friend DebugWindowDialog;
+
+};
+
+//--------------------------------------------------------------------------------------------------------------
diff --git a/Core/GameEngine/Include/GameNetwork/Connection.h b/Core/GameEngine/Include/GameNetwork/Connection.h
new file mode 100644
index 00000000000..660a3dcfbb6
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/Connection.h
@@ -0,0 +1,101 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * The Connection class handles queues for individual players, one connection per player.
+ * Connections are identified by their names (m_name).  This should accomodate changing IPs
+ * in the face of modem disconnects, NAT irregularities, etc.
+ * Messages can be guaranteed or non-guaranteed, sequenced or not.
+ *
+ *
+ * So how this works is this:
+ * The connection contains the incoming and outgoing commands to and from the player this
+ * connection object represents.  The incoming packets are separated into the different frames
+ * of execution.  This is done for efficiency reasons since we will be keeping track of commands
+ * that are to be executed on many different frames, and they will need to be retrieved by the
+ * connection manager on a per-frame basis.  We don't really care what frame the outgoing
+ * commands are executed on as they all need to be sent out right away to ensure that the commands
+ * get to their destination in time.
+ */
+
+#pragma once
+
+#include "GameNetwork/NetCommandList.h"
+#include "GameNetwork/User.h"
+#include "GameNetwork/Transport.h"
+#include "GameNetwork/NetPacket.h"
+
+#define CONNECTION_LATENCY_HISTORY_LENGTH 200
+
+class Connection : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Connection, "Connection")
+public:
+	Connection();
+	//~Connection();
+
+	void update();
+	void init();
+	void reset();
+
+	UnsignedInt doSend();
+	void doRecv();
+
+	Bool allCommandsReady(UnsignedInt frame);
+	Bool isQueueEmpty();
+	void attachTransport(Transport *transport);
+	void setUser(User *user);
+	User *getUser();
+	void setFrameGrouping(time_t frameGrouping);
+
+	void sendNetCommandMsg(NetCommandMsg *msg, UnsignedByte relay);
+
+	// These two processAck calls do the same thing, just take different types of ACK commands.
+	NetCommandRef * processAck(NetAckBothCommandMsg *msg);
+	NetCommandRef * processAck(NetAckStage1CommandMsg *msg);
+	NetCommandRef * processAck(NetCommandMsg *msg);
+	NetCommandRef * processAck(UnsignedShort commandID, UnsignedByte originalPlayerID);
+
+	void clearCommandsExceptFrom( Int playerIndex );
+
+	void setQuitting( void );
+	Bool isQuitting( void ) { return m_isQuitting; }
+
+#if defined(RTS_DEBUG)
+	void debugPrintCommands();
+#endif
+
+protected:
+	void doRetryMetrics();
+
+	Bool m_isQuitting;
+	UnsignedInt m_quitTime;
+
+	Transport *m_transport;
+	User *m_user;
+
+	NetCommandList *m_netCommandList;
+	time_t m_retryTime;						///< The time between sending retry packets for this connection.  Time is in milliseconds.
+	Real m_averageLatency;			///< The average time between sending a command and receiving an ACK.
+	Real m_latencies[CONNECTION_LATENCY_HISTORY_LENGTH];	///< List of the last 100 latencies.
+
+	time_t m_frameGrouping;				///< The minimum time between packet sends.
+	time_t m_lastTimeSent;				///< The time of the last packet send.
+	Int m_numRetries;							///< The number of retries for the last second.
+	time_t m_retryMetricsTime;		///< The start time of the current retry metrics thing.
+};
diff --git a/Core/GameEngine/Include/GameNetwork/ConnectionManager.h b/Core/GameEngine/Include/GameNetwork/ConnectionManager.h
new file mode 100644
index 00000000000..98b98fe36ef
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/ConnectionManager.h
@@ -0,0 +1,216 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * The connection manager maintains a collection of Connections to each player.  Messages are queued up
+ * from here, as well as removed through here.
+ */
+
+#pragma once
+
+#include "GameNetwork/Connection.h"
+#include "GameNetwork/NetCommandList.h"
+#include "GameNetwork/Transport.h"
+#include "GameNetwork/FrameDataManager.h"
+#include "GameNetwork/FrameMetrics.h"
+#include "GameNetwork/NetworkDefs.h"
+#include "GameNetwork/DisconnectManager.h"
+
+class GameInfo;
+class NetCommandWrapperList;
+
+typedef std::map<UnsignedShort, AsciiString> FileCommandMap;
+typedef std::map<UnsignedShort, UnsignedByte> FileMaskMap;
+typedef std::map<UnsignedShort, Int> FileProgressMap;
+
+class ConnectionManager
+{
+public:
+	ConnectionManager();
+	~ConnectionManager();
+
+	virtual void init();				///< Initialize this instance.
+	virtual void reset();				///< Take this instance back to the initial state.
+	virtual void update(Bool isInGame);			///< Service the Connections being managed by this instance.
+
+	// End SubsystemInterface functions
+
+	void updateRunAhead(Int oldRunAhead, Int frameRate, Bool didSelfSlug, Int nextExecutionFrame);	///< Update the run ahead value.  If we are the current packet router, issue the command.
+
+	void attachTransport(Transport *transport);
+
+	void parseUserList(const GameInfo *game);
+	void sendChat(UnicodeString text, Int playerMask, UnsignedInt executionFrame);
+	void sendDisconnectChat(UnicodeString text);
+	void sendLocalCommand(NetCommandMsg *msg, UnsignedByte relay = 0xff);		///< Send command to the players specified in the relay, goes through packet router.
+	void sendLocalCommandDirect(NetCommandMsg *msg, UnsignedByte relay);		///< Send command directly to the players specified, doesn't go through packet router.
+	void sendLocalGameMessage(GameMessage *msg, UnsignedInt frame);
+	void sendCommand(NetCommandMsg *msg);
+	Bool allCommandsReady(UnsignedInt frame, Bool justTesting = FALSE);
+	void handleAllCommandsReady(void);
+	NetCommandList *getFrameCommandList(UnsignedInt frame);
+//	void AddConnection(User *user, UnsignedInt slot);
+	void determineRouterFallbackPlan();
+	void zeroFrames(UnsignedInt startingFrame, UnsignedInt numFrames);
+	void destroyGameMessages();
+//	void createConnections(UnsignedInt numberOfPlayers, UnsignedInt localSlot);
+	void setLocalAddress(UnsignedInt ip, UnsignedInt port);
+	void initTransport();
+	void processFrameTick(UnsignedInt frame);
+	void handleLocalPlayerLeaving(UnsignedInt frame);
+
+	void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID);
+	UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask);
+	Int getFileTransferProgress(Int playerID, AsciiString path);
+	Bool areAllQueuesEmpty(void);
+
+	UnsignedInt getLocalPlayerID();
+	UnicodeString getPlayerName(Int playerNum);
+	Int getNumPlayers();
+
+	UnsignedInt getPacketRouterFallbackSlot(Int packetRouterNumber);	///< Returns the slot of the given packet router number in the fallback plan.
+	UnsignedInt getPacketRouterSlot();																///< Returns the current packet router's slot.
+	PlayerLeaveCode disconnectPlayer(Int slot);												///< Disconnect this player immediately.  This should only be called by the disconnect manager.
+	void disconnectLocalPlayer();																			///< Does whatever is necessary to get TheNetwork to realize that it should be leaving the game now.
+	void quitGame();																									///< Disconnect from the game RIGHT NOW!!  Tell everyone else we are disconnecting.
+
+	void voteForPlayerDisconnect(Int slot);														///< Register a vote for a player to be disconnected.
+
+	void resendPendingCommands();																			///< Resend the pending commands to the packet router.
+
+	void setFrameGrouping(time_t frameGrouping);				///< Set the number of frames that are grouped together into packets.
+
+	PlayerLeaveCode processPlayerLeave(NetPlayerLeaveCommandMsg *msg);
+	Bool canILeave();																///< Returns true if the local player is allowed to leave.
+
+	// Bandwidth metrics
+	Real getIncomingBytesPerSecond( void );
+	Real getIncomingPacketsPerSecond( void );
+	Real getOutgoingBytesPerSecond( void );
+	Real getOutgoingPacketsPerSecond( void );
+	Real getUnknownBytesPerSecond( void );
+	Real getUnknownPacketsPerSecond( void );
+	UnsignedInt getPacketArrivalCushion( void );
+
+	UnsignedInt getMinimumCushion();
+
+	void flushConnections();
+
+	void processChat(NetChatCommandMsg *msg); // this actually needs to be public because it is frame-synchronized
+
+	void updateLoadProgress( Int progress );
+	void loadProgressComplete( void );
+	void sendTimeOutGameStart( void );
+
+	Bool isPacketRouter( void );
+
+	Bool isPlayerConnected( Int playerID );
+
+	void notifyOthersOfCurrentFrame(Int frame);
+	void sendFrameDataToPlayer(UnsignedInt playerID, UnsignedInt startingFrame);
+	void sendSingleFrameToPlayer(UnsignedInt playerID, UnsignedInt frame);
+	void notifyOthersOfNewFrame(UnsignedInt frame);
+
+	UnsignedInt getNextPacketRouterSlot(UnsignedInt playerID); ///< returns the packet router player that comes after the given player.
+
+	Int getAverageFPS( void );
+	Int getSlotAverageFPS(Int slot);
+
+#if defined(RTS_DEBUG)
+	void debugPrintConnectionCommands();
+#endif
+
+	// For disconnect blame assignment
+	UnsignedInt getPingFrame();
+	Int getPingsSent();
+	Int getPingsRecieved();
+
+private:
+	void doRelay();
+	void doKeepAlive();
+	void sendRemoteCommand(NetCommandRef *msg);
+	void ackCommand(NetCommandRef *ref, UnsignedInt localSlot);
+
+	Bool processNetCommand(NetCommandRef *ref);
+	void processAckStage1(NetCommandMsg *msg);
+	void processAckStage2(NetCommandMsg *msg);
+	void processAck(NetCommandMsg *msg);
+	void processFrameInfo(NetFrameCommandMsg *msg);
+	void processRunAheadMetrics(NetRunAheadMetricsCommandMsg *msg);
+	void processDisconnectChat(NetDisconnectChatCommandMsg *msg);
+	void processProgress( NetProgressCommandMsg *msg );
+	void processLoadComplete( NetCommandMsg *msg );
+	void processTimeOutGameStart( NetCommandMsg *msg );
+	void processWrapper(NetCommandRef *ref);
+	void processFrameResendRequest(NetFrameResendRequestCommandMsg *msg);
+
+	void processFile(NetFileCommandMsg *ref);
+	void processFileAnnounce(NetFileAnnounceCommandMsg *ref);
+	void processFileProgress(NetFileProgressCommandMsg *ref);
+
+	//	void doPerFrameMetrics(UnsignedInt frame);
+	void getMinimumFps(Int &minFps, Int &minFpsPlayer);			///< Returns the smallest FPS in the m_fpsAverages list.
+	Real getMaximumLatency(); ///< Returns the highest average latency between players.
+
+	void requestFrameDataResend(Int playerID, UnsignedInt frame); ///< request of this player that he send the specified frame's data.
+
+	// The connections are set up like the slot list. The connection corresponding to the local
+	// player's position in the slot list will be NULL.  Connections corresponding to slots that
+	// do not have a player will also be NULL.
+	Connection *m_connections[MAX_SLOTS];
+
+	Transport *m_transport;
+	UnsignedInt m_localSlot;
+	UnsignedInt m_packetRouterSlot;
+	UnsignedInt m_packetRouterFallback[MAX_SLOTS];
+	UnsignedInt m_localAddr;
+	UnsignedInt m_localPort;
+	User* m_localUser;
+
+	DisconnectManager *m_disconnectManager;						///< Controls the disconnect dialog.
+
+	FrameDataManager *m_frameData[MAX_SLOTS];
+
+	NetCommandList *m_pendingCommands;
+	NetCommandList *m_relayedCommands;
+
+	FrameMetrics m_frameMetrics;
+
+	NetCommandWrapperList *m_netCommandWrapperList;
+
+	// These variables are used to keep track of the other players' average fps and latency.
+	// yup.
+	Real m_latencyAverages[MAX_SLOTS];
+	Int  m_fpsAverages[MAX_SLOTS];
+	Int  m_minFpsPlayer;
+	Int  m_minFps;
+	UnsignedInt m_smallestPacketArrivalCushion;
+	Bool m_didSelfSlug;
+
+	// -----------------------------------------------------------------------------
+	FileCommandMap s_fileCommandMap;
+	FileMaskMap s_fileRecipientMaskMap;
+	FileProgressMap s_fileProgressMap[MAX_SLOTS];
+	// -----------------------------------------------------------------------------
+};
diff --git a/Core/GameEngine/Include/GameNetwork/DisconnectManager.h b/Core/GameEngine/Include/GameNetwork/DisconnectManager.h
new file mode 100644
index 00000000000..cfc1fb952e4
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/DisconnectManager.h
@@ -0,0 +1,125 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "GameNetwork/NetCommandRef.h"
+#include "Lib/BaseType.h"
+//#include "GameNetwork/ConnectionManager.h"
+
+enum DisconnectStateType CPP_11(: Int) {
+	DISCONNECTSTATETYPE_SCREENON,
+	DISCONNECTSTATETYPE_SCREENOFF
+//	DISCONNECTSTATETYPE_WAITINGFORPACKETROUTER
+};
+
+class ConnectionManager;
+
+struct DisconnectVoteStruct {
+	Bool vote;
+	UnsignedInt frame;
+};
+
+class DisconnectManager
+{
+public:
+	DisconnectManager();
+	virtual ~DisconnectManager();
+
+	void init();
+	void update(ConnectionManager *conMgr);
+
+	void processDisconnectCommand(NetCommandRef *ref, ConnectionManager *conMgr);
+	void allCommandsReady(UnsignedInt frame, ConnectionManager *conMgr, Bool waitForPacketRouter = TRUE);
+	void nextFrame(UnsignedInt frame, ConnectionManager *conMgr);
+	Bool allowedToContinue();			///< Allow the next frame to go through?
+	void playerHasAdvancedAFrame(Int slot, UnsignedInt frame); ///< this player has advanced to that frame.
+
+	void voteForPlayerDisconnect(Int slot, ConnectionManager *conMgr);
+
+	// For disconnect blame assignment
+	UnsignedInt getPingFrame();
+	Int getPingsSent();
+	Int getPingsRecieved();
+
+protected:
+	void sendKeepAlive(ConnectionManager *conMgr);
+	void populateDisconnectScreen(ConnectionManager *conMgr);
+	Int translatedSlotPosition(Int slot, Int localSlot);
+	Int untranslatedSlotPosition(Int slot, Int localSlot);
+	void resetPlayerTimeouts(ConnectionManager *conMgr);
+	void resetPlayerTimeout(Int slot);
+	void resetPacketRouterTimeout();
+	void updateDisconnectStatus(ConnectionManager *conMgr);
+	void disconnectPlayer(Int slot, ConnectionManager *conMgr);
+	void sendDisconnectCommand(Int slot, ConnectionManager *conMgr);
+	void sendVoteCommand(Int slot, ConnectionManager *conMgr);
+	void updateWaitForPacketRouter(ConnectionManager *conMgr);
+	void recalculatePacketRouterIndex(ConnectionManager *conMgr);
+	Bool allOnSameFrame(ConnectionManager *conMgr); ///< returns true if all players are stuck on the same frame.
+	Bool isLocalPlayerNextPacketRouter(ConnectionManager *conMgr); ///< returns true if the local player is next in line to be the packet router with all the players that have timed out being taken out of the picture.
+	Bool hasPlayerTimedOut(Int slot); ///< returns true if this player has timed out.
+	void sendPlayerDestruct(Int slot, ConnectionManager *conMgr); ///< send a destruct player network message.
+	Bool isPlayerVotedOut(Int slot, ConnectionManager *conMgr);	///< returns true if this player has been voted out.
+	Bool isPlayerInGame(Int slot, ConnectionManager *conMgr); ///< returns true if the player has neither timed out or been voted out.
+	UnsignedInt getMaxDisconnectFrame();	///< returns the highest frame that people have got to.
+	Int countVotesForPlayer(Int slot); ///< return the number of disconnect votes a player has.
+	void resetPlayersVotes(Int playerID, UnsignedInt frame, ConnectionManager *conMgr); ///< reset the votes for this player.
+
+	void turnOnScreen(ConnectionManager *conMgr); ///< This gets called when the disconnect screen is first turned on.
+
+	void processDisconnectKeepAlive(NetCommandMsg *msg, ConnectionManager *conMgr);
+	void processDisconnectPlayer(NetCommandMsg *msg, ConnectionManager *conMgr);
+	void processPacketRouterQuery(NetCommandMsg *msg, ConnectionManager *conMgr);
+	void processPacketRouterAck(NetCommandMsg *msg, ConnectionManager *conMgr);
+	void processDisconnectVote(NetCommandMsg *msg, ConnectionManager *conMgr);
+	void processDisconnectFrame(NetCommandMsg *msg, ConnectionManager *conMgr);
+	void processDisconnectScreenOff(NetCommandMsg *msg, ConnectionManager *conMgr);
+
+	void applyDisconnectVote(Int slot, UnsignedInt frame, Int castingSlot, ConnectionManager *conMgr);
+
+	UnsignedInt m_lastFrame;
+	time_t m_lastFrameTime;
+	DisconnectStateType m_disconnectState;
+
+	UnsignedInt m_packetRouterFallback[MAX_SLOTS];
+	UnsignedInt m_currentPacketRouterIndex;
+
+	time_t m_lastKeepAliveSendTime;
+
+	time_t m_playerTimeouts[MAX_SLOTS - 1];
+	time_t m_packetRouterTimeout;
+
+	DisconnectVoteStruct m_playerVotes[MAX_SLOTS][MAX_SLOTS];
+//	Bool m_myVotes[MAX_SLOTS - 1];
+
+	UnsignedInt m_disconnectFrames[MAX_SLOTS];
+	Bool m_disconnectFramesReceived[MAX_SLOTS];
+	Bool m_haveNotifiedOtherPlayersOfCurrentFrame;
+
+	time_t m_timeOfDisconnectScreenOn;
+	Int m_pingsSent;
+	Int m_pingsRecieved;
+	UnsignedInt m_pingFrame;
+};
diff --git a/Core/GameEngine/Include/GameNetwork/DownloadManager.h b/Core/GameEngine/Include/GameNetwork/DownloadManager.h
new file mode 100644
index 00000000000..c4a52edf479
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/DownloadManager.h
@@ -0,0 +1,93 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: DownloadManager.h //////////////////////////////////////////////////////
+// Generals download class definitions
+// Author: Matthew D. Campbell, July 2002
+
+#pragma once
+
+#include "WWDownload/downloaddefs.h"
+#include "WWDownload/Download.h"
+
+class CDownload;
+class QueuedDownload
+{
+public:
+	AsciiString server;
+	AsciiString userName;
+	AsciiString password;
+	AsciiString file;
+	AsciiString localFile;
+	AsciiString regKey;
+	Bool tryResume;
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// DownloadManager
+
+class DownloadManager : public IDownload
+{
+public:
+	DownloadManager();
+	virtual ~DownloadManager();
+
+public:
+	void init( void );
+	HRESULT update( void );
+	void reset( void );
+
+	virtual HRESULT OnError( Int error );
+	virtual HRESULT OnEnd();
+	virtual HRESULT OnQueryResume();
+	virtual HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft );
+	virtual HRESULT OnStatusUpdate( Int status );
+
+	virtual HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume );
+	AsciiString getLastLocalFile( void );
+
+	Bool isDone( void ) { return m_sawEnd || m_wasError; }
+	Bool isOk( void ) { return m_sawEnd; }
+	Bool wasError( void ) { return m_wasError; }
+
+	UnicodeString getStatusString( void ) { return m_statusString; }
+	UnicodeString getErrorString( void ) { return m_errorString; }
+
+	void queueFileForDownload( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume );
+	Bool isFileQueuedForDownload( void ) { return !m_queuedDownloads.empty(); }
+	HRESULT downloadNextQueuedFile( void );
+
+private:
+	Bool m_winsockInit;
+	CDownload *m_download;
+	Bool m_wasError;
+	Bool m_sawEnd;
+	UnicodeString m_errorString;
+	UnicodeString m_statusString;
+
+protected:
+	std::list<QueuedDownload> m_queuedDownloads;
+};
+
+extern DownloadManager *TheDownloadManager;
diff --git a/Core/GameEngine/Include/GameNetwork/FileTransfer.h b/Core/GameEngine/Include/GameNetwork/FileTransfer.h
new file mode 100644
index 00000000000..474599405f0
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/FileTransfer.h
@@ -0,0 +1,48 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////
+// FILE: FileTransfer.h
+// Author: Matthew D. Campbell, December 2002
+// Description: File Transfer wrapper using TheNetwork
+///////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+class GameInfo;
+
+// Convenience functions
+AsciiString GetBasePathFromPath( AsciiString path );
+AsciiString GetFileFromPath( AsciiString path );
+AsciiString GetExtensionFromFile( AsciiString fname );
+AsciiString GetBaseFileFromFile( AsciiString fname );
+AsciiString GetPreviewFromMap( AsciiString path );
+AsciiString GetINIFromMap( AsciiString path );
+AsciiString GetStrFileFromMap( AsciiString path );
+AsciiString GetSoloINIFromMap( AsciiString path );
+AsciiString GetAssetUsageFromMap( AsciiString path );
+AsciiString GetReadmeFromMap( AsciiString path );
+
+// The meat of file (map) transfers
+Bool DoAnyMapTransfers(GameInfo *game);
diff --git a/Core/GameEngine/Include/GameNetwork/FirewallHelper.h b/Core/GameEngine/Include/GameNetwork/FirewallHelper.h
new file mode 100644
index 00000000000..3a472abcf19
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/FirewallHelper.h
@@ -0,0 +1,307 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /RedAlert2/NAT.cpp                                          $*
+ *                                                                                             *
+ *                      $Author:: Steve_t                                                     $*
+ *                                                                                             *
+ *                     $Modtime:: 3/15/01 12:00PM                                             $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ *                                                                                             *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ *                                                                                             *
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+class UDP;
+
+#define NUM_TEST_PORTS 4
+#define MAX_SPARE_SOCKETS 8
+
+/*
+**
+**   Class to help in dealing with firewalls.
+**
+**
+**
+*/
+
+struct SpareSocketStruct {
+	UDP *udp;
+	UnsignedShort port;
+};
+
+enum FirewallDetectionState CPP_11(: Int) {
+	DETECTIONSTATE_IDLE,
+	DETECTIONSTATE_BEGIN,
+	DETECTIONSTATE_TEST1,
+	DETECTIONSTATE_TEST2,
+	DETECTIONSTATE_TEST3,
+	DETECTIONSTATE_TEST3_WAITFORRESPONSES,
+	DETECTIONSTATE_TEST4_1,
+	DETECTIONSTATE_TEST4_2,
+	DETECTIONSTATE_TEST5,
+	DETECTIONSTATE_DONE
+};
+
+#pragma pack(push, 1)
+
+// size = 16 bytes
+struct ManglerData {
+		unsigned int		CRC;
+		unsigned short	magic;
+		unsigned short	PacketID;
+		unsigned short	MyMangledPortNumber;
+		unsigned short	OriginalPortNumber;
+		unsigned char		MyMangledAddress[4];
+		unsigned char		NetCommandType;
+		unsigned char		BlitzMe;
+		unsigned short	Padding;
+};
+
+// size = TransportMessageHeader + ManglerData + 10 bytes = 26 bytes
+struct ManglerMessage {
+        ManglerData							data;
+        int											length;
+        unsigned int						ip;
+        unsigned short					port;
+};
+
+#pragma pack(pop)
+
+static const Int MAX_NUM_MANGLERS = 4;
+static const UnsignedShort MANGLER_PORT = 4321;
+
+class FirewallHelperClass {
+
+	public:
+
+		/*
+		** Enumeration of firewall behaviors we can detect.
+		**
+		** It is assumed that all port mangling firewalls change the mangled source port in response to
+		** an application source port change.
+		*/
+		typedef enum tFirewallBehaviorType {
+
+			FIREWALL_MIN = 0,
+
+			/*
+			** Just used as an initialiser.
+			*/
+			FIREWALL_TYPE_UNKNOWN = 0,
+
+			/*
+			** This is a simple, non-port translating firewall, or there is no firewall at all.
+			*/
+			FIREWALL_TYPE_SIMPLE = 1,
+
+			/*
+			** This is a firewall/NAT with port mangling but it's pretty dumb - it uses the same mangled
+			** source port regardless of the destination address.
+			*/
+			FIREWALL_TYPE_DUMB_MANGLING = 2,
+
+			/*
+			** This is a smarter firewall/NAT with port mangling that uses different mangled source ports
+			** for different destination IPs.
+			*/
+			FIREWALL_TYPE_SMART_MANGLING = 4,
+
+			/*
+			** This is a firewall that exhibits the bug as seen in the Netgear firewalls. A previously good
+			** source port mapping will change in response to unsolicited traffic from a known IP.
+			*/
+			FIREWALL_TYPE_NETGEAR_BUG = 8,
+
+			/*
+			** This firewall has a simple absolute offset port allocation scheme.
+			*/
+			FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION = 16,
+
+			/*
+			** This firewall has a relative offset port allocation scheme. For these firewalls, we have to
+			** subtract the actual source port from the mangled source port to discover the allocation scheme.
+			** The mangled port number is based in part on the original source port number.
+			*/
+			FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION = 32,
+
+			/*
+			** This firewall mangles source ports differently depending on the destination port.
+			*/
+			FIREWALL_TYPE_DESTINATION_PORT_DELTA = 64,
+
+			FIREWALL_MAX = 128
+
+		} FirewallBehaviorType;
+
+
+
+		FirewallHelperClass(void);
+		virtual ~FirewallHelperClass(void);
+		Bool detectFirewall(void);
+		UnsignedShort getRawFirewallBehavior(void) {return((UnsignedShort)m_behavior);}
+		Short getSourcePortAllocationDelta(void);
+		Int getFirewallHardness(FirewallBehaviorType behavior);
+		Int getFirewallRetries(FirewallBehaviorType behavior);
+		void setSourcePortPoolStart(Int port) {m_sourcePortPool = port;};
+		Int getSourcePortPool(void) {return(m_sourcePortPool);};
+		void readFirewallBehavior(void);
+		void reset(void);
+		Bool behaviorDetectionUpdate(void);
+
+		FirewallBehaviorType getFirewallBehavior(void);
+		void writeFirewallBehavior(void);
+
+		void flagNeedToRefresh(Bool flag);
+
+		static void getManglerName(Int manglerIndex, Char *nameBuf);
+		Bool sendToManglerFromPort(UnsignedInt address, UnsignedShort port, UnsignedShort packetID, Bool blitzme = FALSE);
+		UnsignedShort getManglerResponse(UnsignedShort packetID, Int time = 0);
+		Bool openSpareSocket(UnsignedShort port);
+		void closeSpareSocket(UnsignedShort port);
+		void closeAllSpareSockets();
+		UnsignedShort getNextTemporarySourcePort(Int skip);
+
+		Bool detectionBeginUpdate(void);
+		Bool detectionTest1Update(void);
+		Bool detectionTest2Update(void);
+		Bool detectionTest3Update(void);
+		Bool detectionTest3WaitForResponsesUpdate(void);
+		Bool detectionTest4Stage1Update(void);
+		Bool detectionTest4Stage2Update(void);
+		Bool detectionTest5Update(void);
+
+
+		/*
+		** Behavior query functions.
+		*/
+		Bool isNAT(void) {
+			if (m_behavior == FIREWALL_TYPE_UNKNOWN || (m_behavior & FIREWALL_TYPE_SIMPLE) != 0) {
+				return(FALSE);
+			}
+			return(TRUE);
+		};
+
+		Bool isNAT(FirewallBehaviorType behavior) {
+			if (behavior == FIREWALL_TYPE_UNKNOWN || (behavior & FIREWALL_TYPE_SIMPLE) != 0) {
+				return(FALSE);
+			}
+			return(TRUE);
+		};
+
+		Bool isNetgear(FirewallBehaviorType behavior) {
+			if ((behavior & FIREWALL_TYPE_NETGEAR_BUG) != 0) {
+				return(TRUE);
+			}
+			return(FALSE);
+		};
+
+		Bool isNetgear(void) {
+			if ((m_behavior & FIREWALL_TYPE_NETGEAR_BUG) != 0) {
+				return(TRUE);
+			}
+			return(FALSE);
+		};
+
+
+
+	private:
+
+		Int getNATPortAllocationScheme(Int numPorts, UnsignedShort *originalPorts, UnsignedShort *mangledPorts, Bool &relativeDelta, Bool &looksGood);
+		void detectFirewallBehavior(/*Bool &canRecord*/);
+		Bool getReferencePort(void);
+
+		SpareSocketStruct * findSpareSocketByPort(UnsignedShort port);
+		ManglerMessage * findEmptyMessage();
+
+		void byteAdjust(ManglerData *data);
+
+		/*
+		** How does our firewall behave?
+		*/
+		FirewallBehaviorType m_behavior;
+
+		/*
+		** How did the firewall behave the last time we ran the game.
+		*/
+		FirewallBehaviorType m_lastBehavior;
+
+		/*
+		** What is the delta in our firewalls NAT port allocation scheme.
+		*/
+		Int m_sourcePortAllocationDelta;
+
+		/*
+		** What was the delta the last time we ran?
+		*/
+		Int m_lastSourcePortAllocationDelta;
+
+		/*
+		** Source ports used only to discover port allocation patterns.
+		** Needs to be static so that previous communications with the manglers
+		** don't affect the current one.
+		*/
+		static Int m_sourcePortPool;
+
+		/*
+		** Spare sockets used for detecting mangling and such.
+		*/
+		SpareSocketStruct m_spareSockets[MAX_SPARE_SOCKETS];
+
+		UnsignedInt m_manglers[MAX_NUM_MANGLERS];
+		Int m_numManglers;
+
+		UnsignedShort m_sparePorts[MAX_SPARE_SOCKETS];
+		UnsignedShort m_mangledPorts[MAX_SPARE_SOCKETS];
+		UnsignedShort m_packetID;
+
+		ManglerMessage m_messages[MAX_SPARE_SOCKETS];
+
+		FirewallDetectionState m_currentState;
+		time_t m_timeoutStart;
+		time_t m_timeoutLength;
+
+		Int m_numResponses;
+		Int m_currentTry;
+};
+
+
+
+extern FirewallHelperClass *TheFirewallHelper;
+FirewallHelperClass * createFirewallHelper();
diff --git a/Core/GameEngine/Include/GameNetwork/FrameData.h b/Core/GameEngine/Include/GameNetwork/FrameData.h
new file mode 100644
index 00000000000..aa0427967e8
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/FrameData.h
@@ -0,0 +1,63 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Lib/BaseType.h"
+#include "GameNetwork/NetCommandList.h"
+
+enum FrameDataReturnType CPP_11(: Int) {
+	FRAMEDATA_NOTREADY,
+	FRAMEDATA_RESEND,
+	FRAMEDATA_READY
+};
+
+class FrameData {
+public:
+	FrameData();
+	~FrameData();
+
+	void init();
+	void reset();
+	void update();
+
+	UnsignedInt getFrame();
+	void setFrame(UnsignedInt frame);
+	FrameDataReturnType allCommandsReady(Bool debugSpewage);
+	NetCommandList * getCommandList();
+	void setFrameCommandCount(UnsignedInt totalCommandCount);
+	UnsignedInt getFrameCommandCount();
+	void addCommand(NetCommandMsg *msg);
+	UnsignedInt getCommandCount();
+	void zeroFrame();
+	void destroyGameMessages();
+
+protected:
+	UnsignedInt m_frame;
+	UnsignedInt m_frameCommandCount;
+	UnsignedInt m_commandCount;
+	NetCommandList *m_commandList;
+	UnsignedInt m_lastFailedCC;
+	UnsignedInt m_lastFailedFrameCC;
+};
diff --git a/Core/GameEngine/Include/GameNetwork/FrameDataManager.h b/Core/GameEngine/Include/GameNetwork/FrameDataManager.h
new file mode 100644
index 00000000000..1ad6055da05
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/FrameDataManager.h
@@ -0,0 +1,61 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "GameNetwork/NetworkDefs.h"
+#include "GameNetwork/FrameData.h"
+
+class FrameDataManager : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FrameDataManager, "FrameDataManager")
+public:
+	FrameDataManager(Bool isLocal);
+	//virtual ~FrameDataManager();
+
+	void init();
+	void reset();
+	void update();
+
+	void addNetCommandMsg(NetCommandMsg *msg);
+	void setIsLocal(Bool isLocal);
+	FrameDataReturnType allCommandsReady(UnsignedInt frame, Bool debugSpewage);
+	NetCommandList * getFrameCommandList(UnsignedInt frame);
+	UnsignedInt getCommandCount(UnsignedInt frame);
+	void setFrameCommandCount(UnsignedInt frame, UnsignedInt commandCount);
+	UnsignedInt getFrameCommandCount(UnsignedInt frame);
+	void zeroFrames(UnsignedInt startingFrame, UnsignedInt numFrames);
+	void destroyGameMessages();
+	void resetFrame(UnsignedInt frame, Bool isAdvancing = TRUE);
+	void setQuitFrame(UnsignedInt frame);
+	UnsignedInt getQuitFrame();
+	Bool getIsQuitting();
+
+protected:
+	FrameData *m_frameData;
+	Bool m_isLocal;
+
+	Bool m_isQuitting;
+	UnsignedInt m_quitFrame;
+};
diff --git a/Core/GameEngine/Include/GameNetwork/FrameMetrics.h b/Core/GameEngine/Include/GameNetwork/FrameMetrics.h
new file mode 100644
index 00000000000..4a77c0f09dd
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/FrameMetrics.h
@@ -0,0 +1,69 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+/** FrameMetrics.h */
+
+#pragma once
+
+#include "Lib/BaseType.h"
+#include "GameNetwork/NetworkDefs.h"
+
+class FrameMetrics {
+public:
+	FrameMetrics();
+	virtual ~FrameMetrics();
+
+	void init();
+	void reset();
+
+	void doPerFrameMetrics(UnsignedInt frame);
+	void processLatencyResponse(UnsignedInt frame);
+	void addCushion(Int cushion);
+
+	Real getAverageLatency();
+	Int getAverageFPS();
+	Int getMinimumCushion();
+
+protected:
+	// These are used for keeping track of parameters to the run ahead equation.
+	// frames per second history variables.
+	Real *m_fpsList;								///< A record of how many game logic frames per second there were for the last 60 seconds.
+	time_t m_lastFpsTimeThing;																///< The time when the last fps entry started being recorded.
+	Int m_fpsListIndex;																				///< Index into the array of the current fps list entry being measured.
+	Real m_averageFps;																				///< The current average logic fps, computed just like m_averageLatency below but with the fps numbers.
+
+	// round trip time to packet router variables.
+	// The lists are indexed off the frame number of the frame info packet they are associated with.
+	// The index used should be the frame number mod the array length.
+	Real *m_latencyList;				///< A record of the round trip latencies of the frame info packets to the packet router.  Values in seconds.
+	time_t *m_pendingLatencies;																///< The latencies of frame info packets that are "in the air."
+	Real m_averageLatency;																		///< The current average latency, this is used to save calculation time.
+																														///< When a new latency value is received, the old one is subtracted out and the new
+																														///< one is added in.
+
+	// packet arrival cushion variables.
+	// Keeps track of the cushion for the incoming commands.
+	UnsignedInt m_cushionIndex;															///< The next index to use for the cushion list.
+	Int m_minimumCushion;																			///< The average cushion for the history.
+};
diff --git a/Core/GameEngine/Include/GameNetwork/GameInfo.h b/Core/GameEngine/Include/GameNetwork/GameInfo.h
new file mode 100644
index 00000000000..79831cd16f6
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameInfo.h
@@ -0,0 +1,305 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: GameInfo.h //////////////////////////////////////////////////////
+// Generals game setup information
+// Author: Matthew D. Campbell, December 2001
+
+#pragma once
+
+#include "Common/Snapshot.h"
+#include "Common/Money.h"
+#include "GameNetwork/NetworkDefs.h"
+#include "GameNetwork/FirewallHelper.h"
+
+enum SlotState CPP_11(: Int)
+{
+	SLOT_OPEN,
+	SLOT_CLOSED,
+	SLOT_EASY_AI,
+	SLOT_MED_AI,
+	SLOT_BRUTAL_AI,
+	SLOT_PLAYER
+};
+
+enum
+{
+	PLAYERTEMPLATE_RANDOM = -1,
+	PLAYERTEMPLATE_OBSERVER = -2,
+	PLAYERTEMPLATE_MIN = PLAYERTEMPLATE_OBSERVER
+};
+
+/**
+  * GameSlot class - maintains information about the contents of a
+	* game slot.  This persists throughout the game.
+	*/
+class GameSlot
+{
+public:
+	GameSlot();
+	virtual void reset();
+
+	void setAccept( void ) { m_isAccepted = true; }		///< Accept the current options
+	void unAccept( void );														///< Unaccept (options changed, etc)
+	Bool isAccepted( void ) const { return m_isAccepted; }	///< Non-human slots are always accepted
+
+	void setMapAvailability( Bool hasMap );						///< Set whether the slot has the map
+	Bool hasMap( void ) const { return m_hasMap; }		///< Non-human slots always have the map
+
+	void setState( SlotState state,
+		UnicodeString name = UnicodeString::TheEmptyString,
+		UnsignedInt IP = 0);														///< Set the slot's state (human, AI, open, etc)
+	SlotState getState( void ) const { return m_state; }		///< Get the slot state
+
+	void setColor( Int color ) { m_color = color; }
+	Int getColor( void ) const { return m_color; }
+
+	void setStartPos( Int startPos ) { m_startPos = startPos; }
+	Int getStartPos( void ) const { return m_startPos; }
+
+	void setPlayerTemplate( Int playerTemplate )
+	{ m_playerTemplate = playerTemplate;
+		if (playerTemplate <= PLAYERTEMPLATE_MIN)
+			m_startPos = -1;
+	 }
+	Int getPlayerTemplate( void ) const { return m_playerTemplate; }
+
+	void setTeamNumber( Int teamNumber ) { m_teamNumber = teamNumber; }
+	Int getTeamNumber( void ) const { return m_teamNumber; }
+
+	void setName( UnicodeString name ) { m_name = name; }
+	UnicodeString getName( void ) const { return m_name; }
+
+	void setIP( UnsignedInt IP ) { m_IP = IP; }
+	UnsignedInt getIP( void ) const { return m_IP; }
+
+	void setPort( UnsignedShort port ) { m_port = port; }
+	UnsignedShort getPort( void ) const { return m_port; }
+
+	void setNATBehavior( FirewallHelperClass::FirewallBehaviorType NATBehavior) { m_NATBehavior = NATBehavior; }
+	FirewallHelperClass::FirewallBehaviorType getNATBehavior() const { return m_NATBehavior; }
+
+	void saveOffOriginalInfo( void );
+	Int getOriginalPlayerTemplate( void ) const	{ return m_origPlayerTemplate; }
+	Int getOriginalColor( void ) const						{ return m_origColor; }
+	Int getOriginalStartPos( void ) const				{ return m_origStartPos; }
+	Int getApparentPlayerTemplate( void ) const;
+	Int getApparentColor( void ) const;
+	Int getApparentStartPos( void ) const;
+	UnicodeString getApparentPlayerTemplateDisplayName( void ) const;
+
+	// Various tests
+	Bool isHuman( void ) const;															///< Is this slot occupied by a human player?
+	Bool isOccupied( void ) const;													///< Is this slot occupied (by a human or an AI)?
+	Bool isAI( void ) const;																///< Is this slot occupied by an AI?
+	Bool isPlayer( AsciiString userName ) const;						///< Does this slot contain the given user?
+	Bool isPlayer( UnicodeString userName ) const;					///< Does this slot contain the given user?
+	Bool isPlayer( UnsignedInt ip ) const;									///< Is this slot at this IP?
+	Bool isOpen( void ) const;
+
+	void setLastFrameInGame( UnsignedInt frame ) { m_lastFrameInGame = frame; }
+	void markAsDisconnected( void ) { m_disconnected = TRUE; }
+	UnsignedInt lastFrameInGame( void ) const { return m_lastFrameInGame; }
+	Bool disconnected( void ) const { return isHuman() && m_disconnected; }
+
+	void mute( Bool isMuted ) { m_isMuted = isMuted; }
+	Bool isMuted( void ) const { return m_isMuted; }
+protected:
+	SlotState m_state;
+	Bool m_isAccepted;
+	Bool m_hasMap;
+	Bool m_isMuted;
+	Int m_color;																			///< color, or -1 for random
+	Int m_startPos;																		///< start position, or -1 for random
+	Int m_playerTemplate;															///< PlayerTemplate
+	Int m_teamNumber;																	///< alliance, -1 for none
+	Int m_origColor;																			///< color, or -1 for random
+	Int m_origStartPos;																		///< start position, or -1 for random
+	Int m_origPlayerTemplate;															///< PlayerTemplate
+	UnicodeString m_name;															///< Only valid for human players
+	UnsignedInt m_IP;																	///< Only valid for human players in LAN/WOL
+	UnsignedShort m_port;															///< Only valid for human players in LAN/WOL
+	FirewallHelperClass::FirewallBehaviorType m_NATBehavior;	///< The NAT behavior for this slot's player.
+	UnsignedInt m_lastFrameInGame;	// only valid for human players
+	Bool m_disconnected;						// only valid for human players
+};
+
+/**
+  * GameInfo class - maintains information about the game setup and
+	* the contents of its slot list hroughout the game.
+	*/
+class GameInfo
+{
+public:
+	GameInfo();
+
+	void init( void );
+	virtual void reset( void );
+
+	void clearSlotList( void );
+
+	Int getNumPlayers( void ) const;									///< How many players (human and AI) are in the game?
+	Int getNumNonObserverPlayers( void ) const;				///< How many non-observer players (human and AI) are in the game?
+	Int getMaxPlayers( void ) const;									///< How many players (human and AI) can be in the game?
+
+	void enterGame( void );														///< Mark us as having entered the game
+	void leaveGame( void );														///< Mark us as having left the game
+	virtual void startGame( Int gameID );											///< Mark our game as started, and record the game ID
+	void endGame( void );															///< Mark us as out of game
+	inline Int getGameID( void ) const;								///< Get the game ID of the current game or the last one if we're not in game
+
+	inline void setInGame( void );										///< set the m_inGame flag
+	inline Bool isInGame( void ) const;											///< Are we (in game or in game setup)?  As opposed to chatting, matching, etc
+	inline Bool isGameInProgress( void ) const;							///< Is the game in progress?
+	inline void setGameInProgress( Bool inProgress ); ///< Set whether the game is in progress or not.
+	void setSlot( Int slotNum, GameSlot slotInfo );		///< Set the slot state (human, open, AI, etc)
+	GameSlot* getSlot( Int slotNum );									///< Get the slot
+	const GameSlot* getConstSlot( Int slotNum ) const;	///< Get the slot
+	virtual Bool amIHost( void ) const;															///< Convenience function - is the local player the game host?
+	virtual Int getLocalSlotNum( void ) const;				///< Get the local slot number, or -1 if we're not present
+	Int getSlotNum( AsciiString userName ) const;			///< Get the slot number corresponding to a specific user, or -1 if he's not present
+
+	// Game options
+	void setMap( AsciiString mapName );								///< Set the map to play on
+	void setMapCRC( UnsignedInt mapCRC );							///< Set the map CRC
+	void setMapSize( UnsignedInt mapSize );						///< Set the map size
+	void setMapContentsMask( Int mask );							///< Set the map contents mask (1=map,2=preview,4=map.ini)
+	inline AsciiString getMap( void ) const;								///< Get the game map
+	inline UnsignedInt getMapCRC( void ) const;							///< Get the map CRC
+	inline UnsignedInt getMapSize( void ) const;						///< Get the map size
+	inline Int getMapContentsMask( void ) const;						///< Get the map contents mask
+	void setSeed( Int seed );													///< Set the random seed for the game
+	inline Int getSeed( void ) const;												///< Get the game seed
+	inline Int getUseStats( void ) const;		///< Does this game count towards gamespy stats?
+	inline void setUseStats( Int useStats );
+
+  inline UnsignedShort getSuperweaponRestriction( void ) const; ///< Get any optional limits on superweapons
+  void setSuperweaponRestriction( UnsignedShort restriction ); ///< Set the optional limits on superweapons
+  inline const Money & getStartingCash(void) const;
+  void setStartingCash( const Money & startingCash );
+
+	void setSlotPointer( Int index, GameSlot *slot );	///< Set the slot info pointer
+
+	void setLocalIP( UnsignedInt ip ) { m_localIP =ip; }	///< Set the local IP
+	UnsignedInt getLocalIP( void ) const { return m_localIP; }	///< Get the local IP
+
+	Bool isColorTaken(Int colorIdx, Int slotToIgnore = -1 ) const;
+	Bool isStartPositionTaken(Int positionIdx, Int slotToIgnore = -1 ) const;
+
+	virtual void resetAccepted(void);															///< Reset the accepted flag on all players
+	virtual void resetStartSpots(void);						///< reset the start spots for the new map.
+	virtual void adjustSlotsForMap(void);					///< adjusts the slots to open and closed depending on the players in the game and the number of players the map can hold.
+
+	virtual void closeOpenSlots(void);						///< close all slots that are currently unoccupied.
+
+	// CRC checking hack
+	void setCRCInterval( Int val ) { m_crcInterval = (val<100)?val:100; }
+	Int getCRCInterval( void ) const { return m_crcInterval; }
+
+	Bool haveWeSurrendered(void) { return m_surrendered; }
+	void markAsSurrendered(void) { m_surrendered = TRUE; }
+
+	Bool isSkirmish(void); // TRUE if 1 human & 1+ AI are present && !isSandbox()
+	Bool isMultiPlayer(void); // TRUE if 2+ human are present
+	Bool isSandbox(void); // TRUE if everybody is on the same team
+
+	Bool isPlayerPreorder(Int index);
+	void markPlayerAsPreorder(Int index);
+
+  inline Bool oldFactionsOnly(void) const;
+  inline void setOldFactionsOnly( Bool oldFactionsOnly );
+
+protected:
+	Int m_preorderMask;
+	Int m_crcInterval;
+	Bool m_inGame;
+	Bool m_inProgress;
+	Bool m_surrendered;
+	Int m_gameID;
+	GameSlot *m_slot[MAX_SLOTS];
+
+	UnsignedInt m_localIP;
+
+	// Game options
+	AsciiString m_mapName;
+	UnsignedInt m_mapCRC;
+	UnsignedInt m_mapSize;
+	Int m_mapMask;
+	Int m_seed;
+	Int m_useStats;
+  Money         m_startingCash;
+  UnsignedShort m_superweaponRestriction;
+  Bool m_oldFactionsOnly; // Only USA, China, GLA -- not USA Air Force General, GLA Toxic General, et al
+};
+
+extern GameInfo *TheGameInfo;
+
+// Inline functions
+Int					GameInfo::getGameID( void ) const								{ return m_gameID; }
+AsciiString	GameInfo::getMap( void ) const									{ return m_mapName; }
+UnsignedInt	GameInfo::getMapCRC( void ) const								{ return m_mapCRC; }
+UnsignedInt	GameInfo::getMapSize( void ) const							{ return m_mapSize; }
+Int					GameInfo::getMapContentsMask( void ) const			{ return m_mapMask; }
+Int					GameInfo::getSeed( void ) const									{ return m_seed; }
+Bool				GameInfo::isInGame( void ) const								{ return m_inGame; }
+void				GameInfo::setInGame( void )											{ m_inGame = true; }
+Bool				GameInfo::isGameInProgress( void ) const				{ return m_inProgress; }
+void				GameInfo::setGameInProgress( Bool inProgress )	{ m_inProgress = inProgress; }
+Int					GameInfo::getUseStats( void ) const             { return m_useStats; }
+void				GameInfo::setUseStats( Int useStats )           { m_useStats = useStats; }
+const Money&GameInfo::getStartingCash( void ) const         { return m_startingCash; }
+UnsignedShort GameInfo::getSuperweaponRestriction( void ) const { return m_superweaponRestriction; }
+Bool        GameInfo::oldFactionsOnly(void) const           { return m_oldFactionsOnly; }
+void        GameInfo::setOldFactionsOnly( Bool oldFactionsOnly ) { m_oldFactionsOnly = oldFactionsOnly; }
+
+AsciiString GameInfoToAsciiString( const GameInfo *game );
+Bool ParseAsciiStringToGameInfo( GameInfo *game, AsciiString options );
+
+
+/**
+  * The SkirmishGameInfo class holds information about the skirmish game and
+	* the contents of its slot list.
+	*/
+
+class SkirmishGameInfo : public GameInfo, public Snapshot
+{
+private:
+	GameSlot m_skirmishSlot[MAX_SLOTS];
+
+protected:
+	// snapshot methods
+	virtual void crc( Xfer *xfer );
+	virtual void xfer( Xfer *xfer );
+	virtual void loadPostProcess( void );
+
+public:
+	SkirmishGameInfo()
+	{
+		for (Int i = 0; i< MAX_SLOTS; ++i)
+			setSlotPointer(i, &m_skirmishSlot[i]);
+	}
+};
+
+extern SkirmishGameInfo *TheSkirmishGameInfo;
+extern SkirmishGameInfo *TheChallengeGameInfo;
diff --git a/Core/GameEngine/Include/GameNetwork/GameMessageParser.h b/Core/GameEngine/Include/GameNetwork/GameMessageParser.h
new file mode 100644
index 00000000000..e9b5af774ef
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameMessageParser.h
@@ -0,0 +1,104 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Common/MessageStream.h"
+#include "Common/GameMemory.h"
+
+//----------------------------------------------------------------------------
+class GameMessageParserArgumentType : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessageParserArgumentType, "GameMessageParserArgumentType")
+public:
+	GameMessageParserArgumentType(GameMessageArgumentDataType type, Int argCount);
+	//virtual ~GameMessageParserArgumentType();
+
+	GameMessageParserArgumentType *getNext();
+	void setNext(GameMessageParserArgumentType *next);
+	Int getArgCount();
+	GameMessageArgumentDataType getType();
+
+protected:
+	GameMessageParserArgumentType*	m_next;
+	GameMessageArgumentDataType			m_type;
+	Int															m_argCount;
+};
+
+//----------------------------------------------------------------------------
+inline GameMessageParserArgumentType * GameMessageParserArgumentType::getNext()
+{
+	return m_next;
+}
+
+//----------------------------------------------------------------------------
+inline void GameMessageParserArgumentType::setNext(GameMessageParserArgumentType *next)
+{
+	m_next = next;
+}
+
+//----------------------------------------------------------------------------
+inline GameMessageArgumentDataType GameMessageParserArgumentType::getType()
+{
+	return m_type;
+}
+
+//----------------------------------------------------------------------------
+inline Int GameMessageParserArgumentType::getArgCount()
+{
+	return m_argCount;
+}
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+class GameMessageParser : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessageParser, "GameMessageParser")
+public:
+	GameMessageParser();
+	GameMessageParser(GameMessage *msg);
+	//virtual ~GameMessageParser();
+
+	GameMessageParserArgumentType *getFirstArgumentType();
+	void addArgType(GameMessageArgumentDataType type, Int argCount);
+	Int getNumTypes();
+
+protected:
+	GameMessageParserArgumentType *m_first, *m_last;
+	Int m_argTypeCount;
+};
+
+//----------------------------------------------------------------------------
+inline GameMessageParserArgumentType * GameMessageParser::getFirstArgumentType()
+{
+	return m_first;
+}
+
+//----------------------------------------------------------------------------
+inline Int GameMessageParser::getNumTypes()
+{
+	return m_argTypeCount;
+}
+
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h b/Core/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h
new file mode 100644
index 00000000000..b6522cba401
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h
@@ -0,0 +1,32 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: BuddyDefs.h //////////////////////////////////////////////////////
+// Generals GameSpy Buddy (GP) definitions
+// Author: Matthew D. Campbell, July 2002
+
+#pragma once
+
+void HandleBuddyResponses(void);
+void PopulateOldBuddyMessages(void);
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h b/Core/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h
new file mode 100644
index 00000000000..de175b0e84a
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h
@@ -0,0 +1,171 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: BuddyThread.h //////////////////////////////////////////////////////
+// Generals GameSpy BuddyList thread class interface
+// Author: Matthew D. Campbell, June 2002
+
+#pragma once
+
+#include "gamespy/gp/gp.h"
+
+#define MAX_BUDDY_CHAT_LEN 128
+
+// this class encapsulates a request for the buddy thread
+class BuddyRequest
+{
+public:
+	enum
+	{
+		BUDDYREQUEST_LOGIN,				// attempt to login
+		BUDDYREQUEST_RELOGIN,			// log in after being disconnected
+		BUDDYREQUEST_LOGOUT,			// log out if connected
+		BUDDYREQUEST_MESSAGE,
+		BUDDYREQUEST_LOGINNEW,		// attempt to create a new nick and login
+		//BUDDYREQUEST_DELETELOGIN,
+		BUDDYREQUEST_ADDBUDDY,		// add someone to your buddy list
+		BUDDYREQUEST_DELBUDDY,		// delete someone from your buddy list
+		BUDDYREQUEST_OKADD,				// allow someone to add you to their buddy list
+		BUDDYREQUEST_DENYADD,			// don't allow someone to add you to their buddy list
+		BUDDYREQUEST_SETSTATUS,		// Set our status
+		BUDDYREQUEST_DELETEACCT,	// Delete our account
+	} buddyRequestType;
+
+	union
+	{
+		struct
+		{
+			GPProfile recipient;
+			WideChar text[MAX_BUDDY_CHAT_LEN];
+		} message;
+
+		struct
+		{
+			char nick[GP_NICK_LEN];
+			char email[GP_EMAIL_LEN];
+			char password[GP_PASSWORD_LEN];
+			Bool hasFirewall;
+		} login;
+
+		struct
+		{
+			GPProfile id;
+			WideChar text[MAX_BUDDY_CHAT_LEN];
+		} addbuddy;
+
+		struct
+		{
+			GPProfile id;
+		} profile;
+
+		struct
+		{
+			GPEnum status;
+			char statusString[GP_STATUS_STRING_LEN];
+			char locationString[GP_LOCATION_STRING_LEN];
+		} status;
+
+	} arg;
+};
+
+//-------------------------------------------------------------------------
+
+// this class encapsulates an action the buddy thread wants from the UI
+class BuddyResponse
+{
+public:
+	enum
+	{
+		BUDDYRESPONSE_LOGIN,
+		BUDDYRESPONSE_DISCONNECT,
+		BUDDYRESPONSE_MESSAGE,
+		BUDDYRESPONSE_REQUEST,
+		BUDDYRESPONSE_STATUS,
+	} buddyResponseType;
+
+	GPProfile profile;
+	GPResult result;
+
+	union
+	{
+		struct
+		{
+			UnsignedInt date;
+			char nick[GP_NICK_LEN];
+			WideChar text[MAX_BUDDY_CHAT_LEN];
+		} message;
+
+		struct
+		{
+			char nick[GP_NICK_LEN];
+			char email[GP_EMAIL_LEN];
+			char countrycode[GP_COUNTRYCODE_LEN];
+			WideChar text[GP_REASON_LEN];
+		} request;
+
+		struct
+		{
+			//GPResult result;
+			GPErrorCode errorCode;
+			char errorString[MAX_BUDDY_CHAT_LEN];
+			GPEnum fatal;
+		} error;
+
+		struct
+		{
+			char nick[GP_NICK_LEN];
+			char email[GP_EMAIL_LEN];
+			char countrycode[GP_COUNTRYCODE_LEN];
+			char location[GP_LOCATION_STRING_LEN];
+			GPEnum status;
+			char statusString[GP_STATUS_STRING_LEN];
+		} status;
+	} arg;
+};
+
+//-------------------------------------------------------------------------
+
+// this is the actual message queue used to pass messages between threads
+class GameSpyBuddyMessageQueueInterface
+{
+public:
+	virtual ~GameSpyBuddyMessageQueueInterface() {}
+	virtual void startThread( void ) = 0;
+	virtual void endThread( void ) = 0;
+	virtual Bool isThreadRunning( void ) = 0;
+	virtual Bool isConnected( void ) = 0;
+	virtual Bool isConnecting( void ) = 0;
+
+	virtual void addRequest( const BuddyRequest& req ) = 0;
+	virtual Bool getRequest( BuddyRequest& req ) = 0;
+
+	virtual void addResponse( const BuddyResponse& resp ) = 0;
+	virtual Bool getResponse( BuddyResponse& resp ) = 0;
+
+	virtual GPProfile getLocalProfileID( void ) = 0;
+
+	static GameSpyBuddyMessageQueueInterface* createNewMessageQueue( void );
+};
+
+extern GameSpyBuddyMessageQueueInterface *TheGameSpyBuddyMessageQueue;
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h b/Core/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h
new file mode 100644
index 00000000000..8645d8b445a
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h
@@ -0,0 +1,77 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: GSConfig.h ///////////////////////////////////////////////////////////
+// Author: Matthew D. Campbell, Sept 2002
+// Description: GameSpy online config
+///////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Common/AsciiString.h"
+#include "Common/STLTypedefs.h"
+
+class GameSpyConfigInterface
+{
+public:
+	virtual ~GameSpyConfigInterface() {}
+
+	// Pings
+	virtual std::list<AsciiString> getPingServers(void) = 0;
+	virtual Int getNumPingRepetitions(void) = 0;
+	virtual Int getPingTimeoutInMs(void) = 0;
+	virtual Int getPingCutoffGood( void ) = 0;
+	virtual Int getPingCutoffBad( void ) = 0;
+
+	// QM
+	virtual std::list<AsciiString> getQMMaps(void) = 0;
+	virtual Int getQMBotID(void) = 0;
+	virtual Int getQMChannel(void) = 0;
+	virtual void setQMChannel(Int channel) = 0;
+
+	// Player Info
+	virtual Int getPointsForRank(Int rank) = 0;
+	virtual Bool isPlayerVIP(Int id) = 0;
+
+	// mangler Info
+	virtual Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port) = 0;
+
+	// Ladder / Any other external parsing
+	virtual AsciiString getLeftoverConfig(void) = 0;
+
+	// NAT Timeouts
+	virtual Int getTimeBetweenRetries() = 0;
+	virtual Int getMaxManglerRetries() = 0;
+	virtual time_t getRetryInterval() = 0;
+	virtual time_t getKeepaliveInterval() = 0;
+	virtual time_t getPortTimeout() = 0;
+	virtual time_t getRoundTimeout() = 0;
+
+	// Custom match
+	virtual Bool restrictGamesToLobby() = 0;
+
+	static GameSpyConfigInterface* create(AsciiString config);
+};
+
+extern GameSpyConfigInterface *TheGameSpyConfig;
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h b/Core/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h
new file mode 100644
index 00000000000..d437f58ce5a
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h
@@ -0,0 +1,75 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: GameResultsThread.h //////////////////////////////////////////////////////
+// Generals game results thread class interface
+// Author: Matthew D. Campbell, August 2002
+
+#pragma once
+
+#include "Common/SubsystemInterface.h"
+
+// this class encapsulates a request for the thread
+class GameResultsRequest
+{
+public:
+	std::string hostname;
+	UnsignedShort port;
+	std::string results;
+};
+
+//-------------------------------------------------------------------------
+
+// this class encapsulates a response from the thread
+class GameResultsResponse
+{
+public:
+	std::string hostname;
+	UnsignedShort port;
+	Bool sentOk;
+};
+
+//-------------------------------------------------------------------------
+
+// this is the actual message queue used to pass messages between threads
+class GameResultsInterface : public SubsystemInterface
+{
+public:
+	virtual ~GameResultsInterface() {}
+	virtual void startThreads( void ) = 0;
+	virtual void endThreads( void ) = 0;
+	virtual Bool areThreadsRunning( void ) = 0;
+
+	virtual void addRequest( const GameResultsRequest& req ) = 0;
+	virtual Bool getRequest( GameResultsRequest& resp ) = 0;
+
+	virtual void addResponse( const GameResultsResponse& resp ) = 0;
+	virtual Bool getResponse( GameResultsResponse& resp ) = 0;
+
+	static GameResultsInterface* createNewGameResultsInterface( void );
+
+	virtual Bool areGameResultsBeingSent( void ) = 0;
+};
+
+extern GameResultsInterface *TheGameResultsQueue;
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h b/Core/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h
new file mode 100644
index 00000000000..e59aebbd5de
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h
@@ -0,0 +1,83 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: LadderDefs.h //////////////////////////////////////////////////////
+// Generals ladder definitions
+// Author: Matthew D. Campbell, August 2002
+
+#pragma once
+
+#include "Common/UnicodeString.h"
+#include "Common/AsciiString.h"
+#include "Common/STLTypedefs.h"
+
+class GameWindow;
+
+class LadderInfo
+{
+public:
+	LadderInfo();
+	UnicodeString name;
+	UnicodeString description;
+	UnicodeString location;
+	Int playersPerTeam;
+	Int minWins;
+	Int maxWins;
+	Bool randomMaps;
+	Bool randomFactions;
+	Bool validQM;
+	Bool validCustom;
+	std::list<AsciiString> validMaps;
+	std::list<AsciiString> validFactions;
+	AsciiString cryptedPassword;
+	AsciiString address;
+	UnsignedShort port;
+	AsciiString homepageURL;
+	Bool submitReplay; // with game results
+	Int index;
+};
+
+typedef std::list<LadderInfo *> LadderInfoList;
+
+class LadderList
+{
+public:
+	LadderList();
+	~LadderList();
+
+	const LadderInfo* findLadder( const AsciiString& addr, UnsignedShort port );
+	const LadderInfo* findLadderByIndex( Int index );	// doesn't look in local ladders
+	const LadderInfoList* getLocalLadders( void );
+	const LadderInfoList* getSpecialLadders( void );
+	const LadderInfoList* getStandardLadders( void );
+
+private:
+	void loadLocalLadders( void );
+	void checkLadder( AsciiString fname, Int index );
+	LadderInfoList m_localLadders;
+	LadderInfoList m_specialLadders;
+	LadderInfoList m_standardLadders;
+};
+
+extern LadderList *TheLadderList;
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h b/Core/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
new file mode 100644
index 00000000000..d881d474e4e
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
@@ -0,0 +1,55 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: LobbyUtils.h //////////////////////////////////////////////////////
+// Generals lobby utils
+// Author: Matthew D. Campbell, Sept 2002
+
+#pragma once
+
+class GameWindow;
+
+GameWindow *GetGameListBox( void );
+GameWindow *GetGameInfoListBox( void );
+NameKeyType GetGameListBoxID( void );
+NameKeyType GetGameInfoListBoxID( void );
+void GrabWindowInfo( void );
+void ReleaseWindowInfo( void );
+void RefreshGameInfoListBox( GameWindow *mainWin, GameWindow *win );
+void RefreshGameListBoxes( void );
+void ToggleGameListType( void );
+
+void playerTemplateComboBoxTooltip(GameWindow *wndComboBox, WinInstanceData *instData, UnsignedInt mouse);
+void playerTemplateListBoxTooltip(GameWindow *wndListBox, WinInstanceData *instData, UnsignedInt mouse);
+
+enum GameSortType CPP_11(: Int)
+{
+	GAMESORT_ALPHA_ASCENDING = 0,
+	GAMESORT_ALPHA_DESCENDING,
+	GAMESORT_PING_ASCENDING,
+	GAMESORT_PING_DESCENDING,
+};
+
+Bool HandleSortButton( NameKeyType sortButton );
+void PopulateLobbyPlayerListbox(void);
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h b/Core/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h
new file mode 100644
index 00000000000..9aab07f7601
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h
@@ -0,0 +1,65 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: MainMenuUtils.h //////////////////////////////////////////////////////
+// Author: Matthew D. Campbell, Sept 2002
+// Description: GameSpy version check, patch download, etc utils
+///////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+void HTTPThinkWrapper( void );
+void StopAsyncDNSCheck( void );
+void StartPatchCheck( void );
+void CancelPatchCheckCallback( void );
+void StartDownloadingPatches( void );
+void HandleCanceledDownload( Bool resetDropDown = TRUE );
+
+#if RTS_GENERALS
+enum OverallStatsPeriod CPP_11(: Int)
+{
+	STATS_TODAY = 0,
+	STATS_YESTERDAY,
+	STATS_ALLTIME,
+	STATS_LASTWEEK,
+	STATS_MAX
+};
+
+struct OverallStats
+{
+	OverallStats();
+	Int wins[STATS_MAX];
+	Int losses[STATS_MAX];
+};
+#endif
+
+void CheckOverallStats( void );
+#if RTS_GENERALS
+void HandleOverallStats( const OverallStats& USA, const OverallStats& China, const OverallStats& GLA );
+#else
+void HandleOverallStats( const char* szHTTPStats, unsigned len );
+#endif
+
+void CheckNumPlayersOnline( void );
+void HandleNumPlayersOnline( Int numPlayersOnline );
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h b/Core/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
new file mode 100644
index 00000000000..41332be23a1
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
@@ -0,0 +1,297 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: PeerDefs.h //////////////////////////////////////////////////////
+// Generals GameSpy Peer (chat) definitions
+// Author: Matthew D. Campbell, June 2002
+
+#pragma once
+
+#include "gamespy/peer/peer.h"
+#include "gamespy/gp/gp.h"
+
+#include "GameClient/Color.h"
+#include "Common/STLTypedefs.h"
+#include "GameNetwork/GameSpy/StagingRoomGameInfo.h"
+
+class GameWindow;
+class PSPlayerStats;
+
+typedef std::set<AsciiString> IgnoreList;
+typedef std::map<Int, AsciiString> SavedIgnoreMap;
+
+enum RCItemType CPP_11(: Int)
+{
+	ITEM_BUDDY,
+	ITEM_REQUEST,
+	ITEM_NONBUDDY,
+	ITEM_NONE,
+};
+
+class GameSpyRCMenuData
+{
+public:
+	AsciiString m_nick;
+	GPProfile m_id;
+	RCItemType m_itemType;
+};
+
+class BuddyInfo
+{
+public:
+	GPProfile m_id;
+	AsciiString m_name;
+	AsciiString m_email;
+	AsciiString m_countryCode;
+	GPEnum m_status;
+	UnicodeString m_statusString;
+	UnicodeString m_locationString;
+};
+typedef std::map<GPProfile, BuddyInfo> BuddyInfoMap;
+
+class BuddyMessage
+{
+public:
+	UnsignedInt m_timestamp;
+	GPProfile m_senderID;
+	AsciiString m_senderNick;
+	GPProfile m_recipientID;
+	AsciiString m_recipientNick;
+	UnicodeString m_message;
+};
+typedef std::list<BuddyMessage> BuddyMessageList;
+
+class GameSpyGroupRoom
+{
+public:
+	GameSpyGroupRoom() { m_name = AsciiString::TheEmptyString; m_translatedName = UnicodeString::TheEmptyString; m_groupID = m_numWaiting = m_maxWaiting = m_numGames = m_numPlaying = 0; }
+	AsciiString m_name;
+	UnicodeString m_translatedName;
+	Int m_groupID;
+	Int m_numWaiting;
+	Int m_maxWaiting;
+	Int m_numGames;
+	Int m_numPlaying;
+};
+typedef std::map<Int, GameSpyGroupRoom> GroupRoomMap;
+
+class Transport;
+class NAT;
+
+typedef std::map<Int, GameSpyStagingRoom *> StagingRoomMap;
+
+class PlayerInfo
+{
+public:
+	PlayerInfo() { m_name = m_locale = AsciiString::TheEmptyString; m_wins = m_losses = m_rankPoints = m_side = m_preorder = m_profileID = m_flags = 0; }
+	AsciiString m_name;
+	AsciiString m_locale;
+	Int m_wins;
+	Int m_losses;
+	Int m_profileID;
+	Int m_flags;
+	Int m_rankPoints;
+	Int m_side;
+	Int m_preorder;
+	Bool isIgnored( void );
+};
+struct AsciiComparator
+{
+	bool operator()(AsciiString s1, AsciiString s2) const;
+};
+
+
+typedef std::map<AsciiString, PlayerInfo, AsciiComparator> PlayerInfoMap;
+
+enum GameSpyColors CPP_11(: Int) {
+	GSCOLOR_DEFAULT = 0,
+	GSCOLOR_CURRENTROOM,
+	GSCOLOR_ROOM,
+	GSCOLOR_GAME,
+	GSCOLOR_GAME_FULL,
+	GSCOLOR_GAME_CRCMISMATCH,
+	GSCOLOR_PLAYER_NORMAL,
+	GSCOLOR_PLAYER_OWNER,
+	GSCOLOR_PLAYER_BUDDY,
+	GSCOLOR_PLAYER_SELF,
+	GSCOLOR_PLAYER_IGNORED,
+	GSCOLOR_CHAT_NORMAL,
+	GSCOLOR_CHAT_EMOTE,
+	GSCOLOR_CHAT_OWNER,
+	GSCOLOR_CHAT_OWNER_EMOTE,
+	GSCOLOR_CHAT_PRIVATE,
+	GSCOLOR_CHAT_PRIVATE_EMOTE,
+	GSCOLOR_CHAT_PRIVATE_OWNER,
+	GSCOLOR_CHAT_PRIVATE_OWNER_EMOTE,
+	GSCOLOR_CHAT_BUDDY,
+	GSCOLOR_CHAT_SELF,
+	GSCOLOR_ACCEPT_TRUE,
+	GSCOLOR_ACCEPT_FALSE,
+	GSCOLOR_MAP_SELECTED,
+	GSCOLOR_MAP_UNSELECTED,
+	GSCOLOR_MOTD,
+	GSCOLOR_MOTD_HEADING,
+	GSCOLOR_MAX
+};
+
+extern Color GameSpyColor[GSCOLOR_MAX];
+
+enum GameSpyBuddyStatus CPP_11(: Int) {
+	BUDDY_OFFLINE,
+	BUDDY_ONLINE,
+	BUDDY_LOBBY,
+	BUDDY_STAGING,
+	BUDDY_LOADING,
+	BUDDY_PLAYING,
+	BUDDY_MATCHING,
+};
+
+// ---------------------------------------------------
+// this class holds info used in the main thread
+class GameSpyInfoInterface
+{
+public:
+	virtual ~GameSpyInfoInterface() {};
+	virtual void reset( void ) {};
+	virtual void clearGroupRoomList( void ) = 0;
+	virtual GroupRoomMap* getGroupRoomList( void ) = 0;
+	virtual void addGroupRoom( GameSpyGroupRoom room ) = 0;
+	virtual Bool gotGroupRoomList( void ) = 0;
+	virtual void joinGroupRoom( Int groupID ) = 0;
+	virtual void leaveGroupRoom( void ) = 0;
+	virtual void joinBestGroupRoom( void ) = 0;
+	virtual void setCurrentGroupRoom( Int groupID ) = 0;
+	virtual Int  getCurrentGroupRoom( void ) = 0;
+	virtual void updatePlayerInfo( PlayerInfo pi, AsciiString oldNick = AsciiString::TheEmptyString ) = 0;
+	virtual void playerLeftGroupRoom( AsciiString nick ) = 0;
+	virtual PlayerInfoMap* getPlayerInfoMap( void ) = 0;
+
+	virtual BuddyInfoMap* getBuddyMap( void ) = 0;
+	virtual BuddyInfoMap* getBuddyRequestMap( void ) = 0;
+	virtual BuddyMessageList* getBuddyMessages( void ) = 0;
+	virtual Bool isBuddy( Int id ) = 0;
+
+	virtual void setLocalName( AsciiString name ) = 0;
+	virtual AsciiString getLocalName( void ) = 0;
+	virtual void setLocalProfileID( Int profileID ) = 0;
+	virtual Int getLocalProfileID( void ) = 0;
+	virtual AsciiString getLocalEmail( void ) = 0;
+	virtual void setLocalEmail( AsciiString email ) = 0;
+	virtual AsciiString getLocalPassword( void ) = 0;
+	virtual void setLocalPassword( AsciiString passwd ) = 0;
+	virtual void setLocalBaseName( AsciiString name ) = 0;
+	virtual AsciiString getLocalBaseName( void ) = 0;
+
+	virtual void setCachedLocalPlayerStats( PSPlayerStats stats ) = 0;
+	virtual PSPlayerStats getCachedLocalPlayerStats( void ) = 0;
+
+	virtual void clearStagingRoomList( void ) = 0;
+	virtual StagingRoomMap* getStagingRoomList( void ) = 0;
+	virtual GameSpyStagingRoom* findStagingRoomByID( Int id ) = 0;
+	virtual void addStagingRoom( GameSpyStagingRoom room ) = 0;
+	virtual void updateStagingRoom( GameSpyStagingRoom room ) = 0;
+	virtual void removeStagingRoom( GameSpyStagingRoom room ) = 0;
+	virtual Bool hasStagingRoomListChanged( void ) = 0;
+	virtual void leaveStagingRoom( void ) = 0;
+	virtual void markAsStagingRoomHost( void ) = 0;
+	virtual void markAsStagingRoomJoiner( Int game ) = 0;
+	virtual void sawFullGameList( void ) = 0;
+
+	virtual Bool amIHost( void ) = 0;
+	virtual GameSpyStagingRoom* getCurrentStagingRoom( void ) = 0;
+	virtual void setGameOptions( void ) = 0;
+	virtual Int getCurrentStagingRoomID( void ) = 0;
+
+	virtual void setDisallowAsianText( Bool val ) = 0;
+	virtual void setDisallowNonAsianText( Bool val ) = 0;
+	virtual Bool getDisallowAsianText( void ) = 0;
+	virtual Bool getDisallowNonAsianText(void ) = 0;
+
+	// chat
+	virtual void registerTextWindow( GameWindow *win ) = 0;
+	virtual void unregisterTextWindow( GameWindow *win ) = 0;
+	virtual Int addText( UnicodeString message, Color c, GameWindow *win ) = 0;
+	virtual void addChat( PlayerInfo p, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win ) = 0;
+	virtual void addChat( AsciiString nick, Int profileID, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win ) = 0;
+	virtual Bool sendChat( UnicodeString message, Bool isAction, GameWindow *playerListbox ) = 0;
+
+	virtual void setMOTD( const AsciiString& motd ) = 0;
+	virtual const AsciiString& getMOTD( void ) = 0;
+
+	virtual void setConfig( const AsciiString& config ) = 0;
+	virtual const AsciiString& getConfig( void ) = 0;
+
+	virtual void setPingString( const AsciiString& ping ) = 0;
+	virtual const AsciiString& getPingString( void ) = 0;
+	virtual Int getPingValue( const AsciiString& otherPing ) = 0;
+
+	static GameSpyInfoInterface* createNewGameSpyInfoInterface( void );
+
+	virtual void addToSavedIgnoreList( Int profileID, AsciiString nick ) = 0;
+	virtual void removeFromSavedIgnoreList( Int profileID ) = 0;
+	virtual Bool isSavedIgnored( Int profileID ) = 0;
+	virtual SavedIgnoreMap returnSavedIgnoreList( void ) = 0;
+	virtual void loadSavedIgnoreList( void ) = 0;
+
+	virtual IgnoreList returnIgnoreList( void ) = 0;
+	virtual void addToIgnoreList( AsciiString nick ) = 0;
+	virtual void removeFromIgnoreList( AsciiString nick ) = 0;
+	virtual Bool isIgnored( AsciiString nick ) = 0;
+
+	virtual void setLocalIPs(UnsignedInt internalIP, UnsignedInt externalIP) = 0;
+	virtual UnsignedInt getInternalIP(void) = 0;
+	virtual UnsignedInt getExternalIP(void) = 0;
+
+	virtual Bool isDisconnectedAfterGameStart(Int *reason) const = 0;
+	virtual void markAsDisconnectedAfterGameStart(Int reason) = 0;
+
+	virtual Bool didPlayerPreorder( Int profileID ) const = 0;
+	virtual void markPlayerAsPreorder( Int profileID ) = 0;
+
+	virtual void setMaxMessagesPerUpdate( Int num ) = 0;
+	virtual Int getMaxMessagesPerUpdate( void ) = 0;
+
+	virtual Int getAdditionalDisconnects( void ) = 0;
+	virtual void clearAdditionalDisconnects( void ) = 0;
+	virtual void readAdditionalDisconnects( void ) = 0;
+	virtual void updateAdditionalGameSpyDisconnections(Int count) = 0;
+};
+
+extern GameSpyInfoInterface *TheGameSpyInfo;
+
+void WOLDisplayGameOptions( void );
+void WOLDisplaySlotList( void );
+Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverPort, UnsignedInt& localIP);
+void SetLobbyAttemptHostJoin(Bool start);
+void SendStatsToOtherPlayers(const GameInfo *game);
+
+class PSPlayerStats;
+void GetAdditionalDisconnectsFromUserFile(PSPlayerStats *stats);
+extern Int GetAdditionalDisconnectsFromUserFile(Int playerID);
+
+//-------------------------------------------------------------------------
+// These functions set up the globals and threads neccessary for our GameSpy impl.
+
+void SetUpGameSpy( const char *motdBuffer, const char *configBuffer );
+void TearDownGameSpy( void );
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h b/Core/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h
new file mode 100644
index 00000000000..470879d9391
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h
@@ -0,0 +1,177 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: PeerDefsImplementation.h //////////////////////////////////////////////////////
+// Generals GameSpy Peer (chat) implementation definitions
+// Author: Matthew D. Campbell, Sept 2002
+
+#pragma once
+
+#include "GameNetwork/GameSpy/PeerDefs.h"
+#include "GameNetwork/GameSpy/PersistentStorageThread.h"
+
+
+class GameSpyInfo : public GameSpyInfoInterface
+{
+public:
+	GameSpyInfo();
+	virtual ~GameSpyInfo();
+	virtual void reset( void );
+	virtual void clearGroupRoomList( void ) { m_groupRooms.clear(); m_gotGroupRoomList = false; }
+	virtual GroupRoomMap* getGroupRoomList( void ) { return &m_groupRooms; }
+	virtual void addGroupRoom( GameSpyGroupRoom room );
+	virtual Bool gotGroupRoomList( void ) { return m_gotGroupRoomList; }
+	virtual void joinGroupRoom( Int groupID );
+	virtual void leaveGroupRoom( void );
+	virtual void joinBestGroupRoom( void );
+	virtual void setCurrentGroupRoom( Int groupID ) { m_currentGroupRoomID = groupID; m_playerInfoMap.clear(); }
+	virtual Int  getCurrentGroupRoom( void ) { return m_currentGroupRoomID; }
+	virtual void updatePlayerInfo( PlayerInfo pi, AsciiString oldNick = AsciiString::TheEmptyString );
+	virtual void playerLeftGroupRoom( AsciiString nick );
+	virtual PlayerInfoMap* getPlayerInfoMap( void ) { return &m_playerInfoMap; }
+
+	virtual void setLocalName( AsciiString name ) { m_localName = name; }
+	virtual AsciiString getLocalName( void ) { return m_localName; }
+	virtual void setLocalProfileID( Int profileID ) { m_localProfileID = profileID; }
+	virtual Int getLocalProfileID( void ) { return m_localProfileID; }
+	virtual AsciiString getLocalEmail( void ) { return m_localEmail; }
+	virtual void setLocalEmail( AsciiString email ) { m_localEmail = email;	}
+	virtual AsciiString getLocalPassword( void ){ return m_localPasswd;	}
+	virtual void setLocalPassword( AsciiString passwd ) { m_localPasswd = passwd;	}
+	virtual void setLocalBaseName( AsciiString name ) { m_localBaseName = name; }
+	virtual AsciiString getLocalBaseName( void ){ return m_localBaseName; }
+	virtual void setCachedLocalPlayerStats( PSPlayerStats stats ) {m_cachedLocalPlayerStats = stats;	}
+	virtual PSPlayerStats getCachedLocalPlayerStats( void ){ return m_cachedLocalPlayerStats;	}
+
+	virtual BuddyInfoMap* getBuddyMap( void ) { return &m_buddyMap; }
+	virtual BuddyInfoMap* getBuddyRequestMap( void ) { return &m_buddyRequestMap; }
+	virtual BuddyMessageList* getBuddyMessages( void ) { return &m_buddyMessages; }
+	virtual Bool isBuddy( Int id );
+
+	virtual void clearStagingRoomList( void );
+	virtual StagingRoomMap* getStagingRoomList( void ) { return &m_stagingRooms; }
+	virtual GameSpyStagingRoom* findStagingRoomByID( Int id );
+	virtual void addStagingRoom( GameSpyStagingRoom room );
+	virtual void updateStagingRoom( GameSpyStagingRoom room );
+	virtual void removeStagingRoom( GameSpyStagingRoom room );
+	virtual Bool hasStagingRoomListChanged( void );
+	virtual void leaveStagingRoom( void );
+	virtual void markAsStagingRoomHost( void );
+	virtual void markAsStagingRoomJoiner( Int game );
+	virtual Int getCurrentStagingRoomID( void ) { return m_localStagingRoomID; }
+
+	virtual void sawFullGameList( void ) { m_sawFullGameList = TRUE; }
+
+	virtual void setDisallowAsianText( Bool val );
+	virtual void setDisallowNonAsianText( Bool val );
+	virtual Bool getDisallowAsianText( void );
+	virtual Bool getDisallowNonAsianText(void );
+	// chat
+	virtual void registerTextWindow( GameWindow *win );
+	virtual void unregisterTextWindow( GameWindow *win );
+	virtual Int addText( UnicodeString message, Color c, GameWindow *win );
+	virtual void addChat( PlayerInfo p, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win );
+	virtual void addChat( AsciiString nick, Int profileID, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win );
+	virtual Bool sendChat( UnicodeString message, Bool isAction, GameWindow *playerListbox );
+
+	virtual void setMOTD( const AsciiString& motd );
+	virtual const AsciiString& getMOTD( void );
+	virtual void setConfig( const AsciiString& config );
+	virtual const AsciiString& getConfig( void );
+
+	virtual void setPingString( const AsciiString& ping ) { m_pingString = ping; }
+	virtual const AsciiString& getPingString( void ) { return m_pingString; }
+	virtual Int getPingValue( const AsciiString& otherPing );
+
+	virtual Bool amIHost( void );
+	virtual GameSpyStagingRoom* getCurrentStagingRoom( void );
+	virtual void setGameOptions( void );
+
+	virtual void addToIgnoreList( AsciiString nick );
+	virtual void removeFromIgnoreList( AsciiString nick );
+	virtual Bool isIgnored( AsciiString nick );
+	virtual IgnoreList returnIgnoreList( void );
+
+	virtual void loadSavedIgnoreList( void );
+	virtual SavedIgnoreMap returnSavedIgnoreList( void );
+	virtual void addToSavedIgnoreList( Int profileID, AsciiString nick);
+	virtual void removeFromSavedIgnoreList( Int profileID );
+	virtual Bool isSavedIgnored( Int profileID );
+	virtual void setLocalIPs(UnsignedInt internalIP, UnsignedInt externalIP);
+	virtual UnsignedInt getInternalIP(void) { return m_internalIP; }
+	virtual UnsignedInt getExternalIP(void) { return m_externalIP; }
+
+	virtual Bool isDisconnectedAfterGameStart(Int *reason) const { if (reason) *reason = m_disconReason; return m_isDisconAfterGameStart; }
+	virtual void markAsDisconnectedAfterGameStart(Int reason) { m_isDisconAfterGameStart = TRUE; m_disconReason = reason; }
+
+	virtual Bool didPlayerPreorder( Int profileID ) const;
+	virtual void markPlayerAsPreorder( Int profileID );
+
+	virtual void setMaxMessagesPerUpdate( Int num );
+	virtual Int getMaxMessagesPerUpdate( void );
+
+	virtual Int getAdditionalDisconnects( void );
+	virtual void clearAdditionalDisconnects( void );
+	virtual void readAdditionalDisconnects( void );
+	virtual void updateAdditionalGameSpyDisconnections(Int count);
+private:
+	Bool m_sawFullGameList;
+	Bool m_isDisconAfterGameStart;
+	Int m_disconReason;
+	AsciiString m_rawMotd;
+	AsciiString m_rawConfig;
+	AsciiString m_pingString;
+	GroupRoomMap m_groupRooms;
+	StagingRoomMap m_stagingRooms;
+	Bool m_stagingRoomsDirty;
+	BuddyInfoMap m_buddyMap;
+	BuddyInfoMap m_buddyRequestMap;
+	PlayerInfoMap m_playerInfoMap;
+	BuddyMessageList m_buddyMessages;
+	Int m_currentGroupRoomID;
+	Bool m_gotGroupRoomList;
+	AsciiString m_localName;
+	Int m_localProfileID;
+	AsciiString m_localPasswd;
+	AsciiString m_localEmail;
+	AsciiString m_localBaseName;
+	PSPlayerStats m_cachedLocalPlayerStats;
+	Bool m_disallowAsainText;
+	Bool m_disallowNonAsianText;
+	UnsignedInt m_internalIP, m_externalIP;
+	Int m_maxMessagesPerUpdate;
+
+	Int m_joinedStagingRoom;								// if we join a staging room, this holds its ID (0 otherwise)
+	Bool m_isHosting;												// if we host, this is true, and
+	GameSpyStagingRoom m_localStagingRoom;	// this holds the GameInfo for it.
+	Int m_localStagingRoomID;
+
+	IgnoreList m_ignoreList;
+	SavedIgnoreMap m_savedIgnoreMap;
+
+	std::set<GameWindow *> m_textWindows;
+
+	std::set<Int> m_preorderPlayers;
+	Int m_additionalDisconnects;
+};
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h b/Core/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
new file mode 100644
index 00000000000..5178e7d36bb
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
@@ -0,0 +1,386 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: PeerThread.h //////////////////////////////////////////////////////
+// Generals GameSpy Peer-to-peer chat thread class interface
+// Author: Matthew D. Campbell, June 2002
+
+#pragma once
+
+#include "gamespy/peer/peer.h"
+#include "GameNetwork/NetworkDefs.h"
+
+enum SerialAuthResult CPP_11(: Int)
+{
+	SERIAL_NONEXISTENT,
+	SERIAL_AUTHFAILED,
+	SERIAL_BANNED,
+	SERIAL_OK
+};
+
+// this class encapsulates a request for the peer thread
+class PeerRequest
+{
+public:
+	enum
+	{
+		PEERREQUEST_LOGIN,				// attempt to login
+		PEERREQUEST_LOGOUT,				// log out if connected
+		PEERREQUEST_MESSAGEPLAYER,
+		PEERREQUEST_MESSAGEROOM,
+		PEERREQUEST_JOINGROUPROOM,
+		PEERREQUEST_LEAVEGROUPROOM,
+		PEERREQUEST_STARTGAMELIST,
+		PEERREQUEST_STOPGAMELIST,
+		PEERREQUEST_CREATESTAGINGROOM,
+		PEERREQUEST_SETGAMEOPTIONS,
+		PEERREQUEST_JOINSTAGINGROOM,
+		PEERREQUEST_LEAVESTAGINGROOM,
+		PEERREQUEST_UTMPLAYER,
+		PEERREQUEST_UTMROOM,
+		PEERREQUEST_STARTGAME,
+		PEERREQUEST_STARTQUICKMATCH,
+		PEERREQUEST_WIDENQUICKMATCHSEARCH,
+		PEERREQUEST_STOPQUICKMATCH,
+		PEERREQUEST_PUSHSTATS,
+		PEERREQUEST_GETEXTENDEDSTAGINGROOMINFO,
+		PEERREQUEST_MAX
+	} peerRequestType;
+
+	std::string nick;	// only used by login, but must be outside the union b/c of copy constructor
+	std::wstring text;  // can't be in a union
+	std::string password;
+	std::string email;
+	std::string id;
+
+	// gameopts
+	std::string options; // full string for UTMs
+	std::string ladderIP;
+	std::string hostPingStr;
+	std::string gameOptsMapName;
+	std::string gameOptsPlayerNames[MAX_SLOTS];
+
+	std::vector<bool> qmMaps;
+
+	union
+	{
+		struct
+		{
+			Int profileID;
+		} login;
+
+		struct
+		{
+			Int id;
+		} groupRoom;
+
+		struct
+		{
+			Bool restrictGameList;
+		} gameList;
+
+		struct
+		{
+			Bool isAction;
+		} message;
+
+		struct
+		{
+			Int id;
+		} stagingRoom;
+
+		struct
+		{
+			UnsignedInt exeCRC;
+			UnsignedInt iniCRC;
+			UnsignedInt gameVersion;
+			Bool allowObservers;
+      Bool useStats;
+			UnsignedShort ladPort;
+			UnsignedInt ladPassCRC;
+			Bool restrictGameList;
+		} stagingRoomCreation;
+
+		struct
+		{
+			Int wins[MAX_SLOTS];
+			Int losses[MAX_SLOTS];
+			Int profileID[MAX_SLOTS];
+			Int faction[MAX_SLOTS];
+			Int color[MAX_SLOTS];
+			Int numPlayers;
+			Int maxPlayers;
+			Int numObservers;
+		} gameOptions;
+
+		struct
+		{
+			Bool isStagingRoom;
+		} UTM;
+
+		struct
+		{
+			Int minPointPercentage, maxPointPercentage, points;
+			Int widenTime;
+			Int ladderID;
+			UnsignedInt ladderPassCRC;
+			Int maxPing;
+			Int maxDiscons, discons;
+			char pings[17]; // 8 servers (0-ff), 1 NULL
+			Int numPlayers;
+			Int botID;
+			Int roomID;
+			Int side;
+			Int color;
+			Int NAT;
+			UnsignedInt exeCRC;
+			UnsignedInt iniCRC;
+		} QM;
+
+		struct
+		{
+			Int locale;
+			Int wins;
+			Int losses;
+			Int rankPoints;
+			Int side;
+			Bool preorder;
+		} statsToPush;
+
+	};
+};
+
+//-------------------------------------------------------------------------
+
+enum DisconnectReason CPP_11(: Int)
+{
+	DISCONNECT_NICKTAKEN = 1,
+	DISCONNECT_BADNICK,
+	DISCONNECT_LOSTCON,
+	DISCONNECT_COULDNOTCONNECT,
+	DISCONNECT_GP_LOGIN_TIMEOUT,
+	DISCONNECT_GP_LOGIN_BAD_NICK,
+	DISCONNECT_GP_LOGIN_BAD_EMAIL,
+	DISCONNECT_GP_LOGIN_BAD_PASSWORD,
+	DISCONNECT_GP_LOGIN_BAD_PROFILE,
+	DISCONNECT_GP_LOGIN_PROFILE_DELETED,
+	DISCONNECT_GP_LOGIN_CONNECTION_FAILED,
+	DISCONNECT_GP_LOGIN_SERVER_AUTH_FAILED,
+	DISCONNECT_SERIAL_INVALID,
+	DISCONNECT_SERIAL_NOT_PRESENT,
+	DISCONNECT_SERIAL_BANNED,
+	DISCONNECT_GP_NEWUSER_BAD_NICK,
+	DISCONNECT_GP_NEWUSER_BAD_PASSWORD,
+	DISCONNECT_GP_NEWPROFILE_BAD_NICK,
+	DISCONNECT_GP_NEWPROFILE_BAD_OLD_NICK,
+};
+
+enum QMStatus CPP_11(: Int)
+{
+	QM_IDLE,
+	QM_JOININGQMCHANNEL,
+	QM_LOOKINGFORBOT,
+	QM_SENTINFO,
+	QM_WORKING,
+	QM_POOLSIZE,
+	QM_WIDENINGSEARCH,
+	QM_MATCHED,
+	QM_INCHANNEL,
+	QM_NEGOTIATINGFIREWALLS,
+	QM_STARTINGGAME,
+	QM_COULDNOTFINDBOT,
+	QM_COULDNOTFINDCHANNEL,
+	QM_COULDNOTNEGOTIATEFIREWALLS,
+	QM_STOPPED,
+};
+
+// this class encapsulates an action the peer thread wants from the UI
+class PeerResponse
+{
+public:
+	enum
+	{
+		PEERRESPONSE_LOGIN,
+		PEERRESPONSE_DISCONNECT,
+		PEERRESPONSE_MESSAGE,
+		PEERRESPONSE_GROUPROOM,
+		PEERRESPONSE_STAGINGROOM,
+		PEERRESPONSE_STAGINGROOMLISTCOMPLETE,
+		PEERRESPONSE_STAGINGROOMPLAYERINFO,
+		PEERRESPONSE_JOINGROUPROOM,
+		PEERRESPONSE_CREATESTAGINGROOM,
+		PEERRESPONSE_JOINSTAGINGROOM,
+		PEERRESPONSE_PLAYERJOIN,
+		PEERRESPONSE_PLAYERLEFT,
+		PEERRESPONSE_PLAYERCHANGEDNICK,
+		PEERRESPONSE_PLAYERINFO,
+		PEERRESPONSE_PLAYERCHANGEDFLAGS,
+		PEERRESPONSE_ROOMUTM,
+		PEERRESPONSE_PLAYERUTM,
+		PEERRESPONSE_QUICKMATCHSTATUS,
+		PEERRESPONSE_GAMESTART,
+		PEERRESPONSE_FAILEDTOHOST,
+		PEERRESPONSE_MAX
+	} peerResponseType;
+
+	std::string groupRoomName; // can't be in union
+
+	std::string nick;   // can't be in a union
+	std::string oldNick;   // can't be in a union
+	std::wstring text;  // can't be in a union
+	std::string locale; // can't be in a union
+
+	std::string stagingServerGameOptions; // full string from UTMs
+
+	// game opts sent with PEERRESPONSE_STAGINGROOM
+	std::wstring stagingServerName;
+	std::string stagingServerPingString;
+	std::string stagingServerLadderIP;
+	std::string stagingRoomMapName;
+
+	// game opts sent with PEERRESPONSE_STAGINGROOMPLAYERINFO
+	std::string stagingRoomPlayerNames[MAX_SLOTS];
+
+	std::string command;
+	std::string commandOptions;
+
+	union
+	{
+		struct
+		{
+			DisconnectReason reason;
+		} discon;
+
+		struct
+		{
+			Int id;
+			Int numWaiting;
+			Int maxWaiting;
+			Int numGames;
+			Int numPlaying;
+		} groupRoom;
+
+		struct
+		{
+			Int id;
+			Bool ok;
+		} joinGroupRoom;
+
+		struct
+		{
+			Int result;
+		} createStagingRoom;
+
+		struct
+		{
+			Int id;
+			Bool ok;
+			Bool isHostPresent;
+			Int result; // for failures
+		} joinStagingRoom;
+
+		struct
+		{
+			Bool isPrivate;
+			Bool isAction;
+			Int profileID;
+		} message;
+
+		struct
+		{
+			Int profileID;
+			Int wins;
+			Int losses;
+			RoomType roomType;
+			Int flags;
+			UnsignedInt IP;
+			Int rankPoints;
+			Int side;
+			Int preorder;
+			UnsignedInt internalIP; // for us, on connection
+			UnsignedInt externalIP; // for us, on connection
+		} player;
+
+		struct
+		{
+			Int id;
+			Int action;
+			Bool isStaging;
+			Bool requiresPassword;
+			Bool allowObservers;
+      Bool useStats;
+			UnsignedInt version;
+			UnsignedInt exeCRC;
+			UnsignedInt iniCRC;
+			UnsignedShort ladderPort;
+			Int wins[MAX_SLOTS];
+			Int losses[MAX_SLOTS];
+			Int profileID[MAX_SLOTS];
+			Int faction[MAX_SLOTS];
+			Int color[MAX_SLOTS];
+			Int numPlayers;
+			Int numObservers;
+			Int maxPlayers;
+			Int percentComplete;
+		} stagingRoom;
+
+		struct
+		{
+			QMStatus status;
+			Int poolSize;
+			Int mapIdx; // when matched
+			Int seed; // when matched
+			UnsignedInt IP[MAX_SLOTS]; // when matched
+			Int side[MAX_SLOTS]; // when matched
+			Int color[MAX_SLOTS]; // when matched
+			Int nat[MAX_SLOTS];
+		} qmStatus;
+	};
+};
+
+//-------------------------------------------------------------------------
+
+// this is the actual message queue used to pass messages between threads
+class GameSpyPeerMessageQueueInterface
+{
+public:
+	virtual ~GameSpyPeerMessageQueueInterface() {}
+	virtual void startThread( void ) = 0;
+	virtual void endThread( void ) = 0;
+	virtual Bool isThreadRunning( void ) = 0;
+	virtual Bool isConnected( void ) = 0;
+	virtual Bool isConnecting( void ) = 0;
+
+	virtual void addRequest( const PeerRequest& req ) = 0;
+	virtual Bool getRequest( PeerRequest& req ) = 0;
+
+	virtual void addResponse( const PeerResponse& resp ) = 0;
+	virtual Bool getResponse( PeerResponse& resp ) = 0;
+
+	virtual SerialAuthResult getSerialAuthResult( void ) = 0;
+
+	static GameSpyPeerMessageQueueInterface* createNewMessageQueue( void );
+};
+
+extern GameSpyPeerMessageQueueInterface *TheGameSpyPeerMessageQueue;
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h b/Core/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h
new file mode 100644
index 00000000000..f039a0b2ab0
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h
@@ -0,0 +1,42 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: PersistentStorageDefs.h //////////////////////////////////////////////////////
+// Generals GameSpy Persistent Storage definitions
+// Author: Matthew D. Campbell, July 2002
+
+#pragma once
+
+enum LocaleType CPP_11(: Int)
+{
+    LOC_UNKNOWN = 0,
+    LOC_MIN = 1,
+    LOC_MAX = 37
+};
+
+void HandlePersistentStorageResponses(void);
+void UpdateLocalPlayerStats(void);
+
+void SetLookAtPlayer( Int id, AsciiString nick );
+void PopulatePlayerInfoWindows( AsciiString parentWindowName );
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h b/Core/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h
new file mode 100644
index 00000000000..d2fa080cd41
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h
@@ -0,0 +1,181 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: PersistentStorageThread.h //////////////////////////////////////////////////////
+// Generals GameSpy Persistent Storage thread class interface
+// Author: Matthew D. Campbell, July 2002
+
+#pragma once
+
+#include "gamespy/gstats/gpersist.h"
+
+#define MAX_BUDDY_CHAT_LEN 128
+
+typedef std::map<Int, UnsignedInt> PerGeneralMap;
+// this structure holds all info on a player that is stored online
+class PSPlayerStats
+{
+public:
+	PSPlayerStats( void );
+	PSPlayerStats( const PSPlayerStats& other );
+	void reset(void);
+
+	Int id;
+	PerGeneralMap wins;
+	PerGeneralMap losses;
+	PerGeneralMap games;              //first: playerTemplate #,  second: #games played (see also gamesAsRandom)
+	PerGeneralMap duration;
+	PerGeneralMap unitsKilled;
+	PerGeneralMap unitsLost;
+	PerGeneralMap unitsBuilt;
+	PerGeneralMap buildingsKilled;
+	PerGeneralMap buildingsLost;
+	PerGeneralMap buildingsBuilt;
+	PerGeneralMap earnings;
+	PerGeneralMap techCaptured;
+	PerGeneralMap discons;
+	PerGeneralMap desyncs;
+	PerGeneralMap surrenders;
+	PerGeneralMap gamesOf2p;
+	PerGeneralMap gamesOf3p;
+	PerGeneralMap gamesOf4p;
+	PerGeneralMap gamesOf5p;
+	PerGeneralMap gamesOf6p;
+	PerGeneralMap gamesOf7p;
+	PerGeneralMap gamesOf8p;
+	PerGeneralMap customGames;
+	PerGeneralMap QMGames;
+	Int locale;
+	Int gamesAsRandom;
+	std::string options;
+	std::string systemSpec;
+	Real lastFPS;
+	Int lastGeneral;
+	Int gamesInRowWithLastGeneral;
+	Int challengeMedals;
+	Int battleHonors;
+	Int QMwinsInARow;
+	Int maxQMwinsInARow;
+
+	Int winsInARow;
+	Int maxWinsInARow;
+	Int lossesInARow;
+	Int maxLossesInARow;
+	Int disconsInARow;
+	Int maxDisconsInARow;
+	Int desyncsInARow;
+	Int maxDesyncsInARow;
+
+	Int builtParticleCannon;
+	Int builtNuke;
+	Int builtSCUD;
+
+	Int lastLadderPort;
+	std::string lastLadderHost;
+
+	void incorporate( const PSPlayerStats& other );
+};
+
+// this class encapsulates a request for the thread
+class PSRequest
+{
+public:
+	PSRequest();
+	enum
+	{
+		PSREQUEST_READPLAYERSTATS,			// read stats for a player
+		PSREQUEST_UPDATEPLAYERSTATS,		// update stats on the server
+		PSREQUEST_UPDATEPLAYERLOCALE,		// update locale on the server
+		PSREQUEST_READCDKEYSTATS,				// read stats for a cdkey
+		PSREQUEST_SENDGAMERESTOGAMESPY,	// report game results to GameSpy
+		PSREQUEST_MAX
+	} requestType;
+
+	// player stats for the *PLAYERSTATS
+	PSPlayerStats player;
+
+	// cdkey for READCDKEYSTATS;
+	std::string cdkey;
+
+	// our info for UPDATEPLAYERSTATS
+	std::string nick;
+	std::string password;
+	std::string email;
+	Bool addDiscon;
+	Bool addDesync;
+	Int lastHouse;
+
+	// for GameRes
+	std::string results;
+};
+
+//-------------------------------------------------------------------------
+
+// this class encapsulates a response from the thread
+class PSResponse
+{
+public:
+	enum
+	{
+		PSRESPONSE_PLAYERSTATS,
+		PSRESPONSE_COULDNOTCONNECT,
+		PSRESPONSE_PREORDER,
+		PSRESPONSE_MAX
+	} responseType;
+
+	// player stats for the *PLAYERSTATS
+	PSPlayerStats player;
+
+	// preorder flag
+	Bool preorder;
+};
+
+//-------------------------------------------------------------------------
+
+// this is the actual message queue used to pass messages between threads
+class GameSpyPSMessageQueueInterface
+{
+public:
+	virtual ~GameSpyPSMessageQueueInterface() {}
+	virtual void startThread( void ) = 0;
+	virtual void endThread( void ) = 0;
+	virtual Bool isThreadRunning( void ) = 0;
+
+	virtual void addRequest( const PSRequest& req ) = 0;
+	virtual Bool getRequest( PSRequest& req ) = 0;
+
+	virtual void addResponse( const PSResponse& resp ) = 0;
+	virtual Bool getResponse( PSResponse& resp ) = 0;
+
+	// called from the main thread
+	virtual void trackPlayerStats( PSPlayerStats stats ) = 0;
+	virtual PSPlayerStats findPlayerStatsByID( Int id ) = 0;
+
+	static GameSpyPSMessageQueueInterface* createNewMessageQueue( void );
+
+	static std::string formatPlayerKVPairs( PSPlayerStats stats );
+	static PSPlayerStats parsePlayerKVPairs( std::string kvPairs );
+};
+
+extern GameSpyPSMessageQueueInterface *TheGameSpyPSMessageQueue;
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/PingThread.h b/Core/GameEngine/Include/GameNetwork/GameSpy/PingThread.h
new file mode 100644
index 00000000000..df2f7f35c13
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/PingThread.h
@@ -0,0 +1,77 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: PingThread.h //////////////////////////////////////////////////////
+// Generals ping thread class interface
+// Author: Matthew D. Campbell, August 2002
+// Note: adapted from WOLAPI
+
+#pragma once
+
+// this class encapsulates a request for the thread
+class PingRequest
+{
+public:
+	std::string hostname;
+	Int repetitions;
+	Int timeout;
+};
+
+//-------------------------------------------------------------------------
+
+// this class encapsulates a response from the thread
+class PingResponse
+{
+public:
+	std::string hostname;
+	Int avgPing;
+	Int repetitions;
+};
+
+//-------------------------------------------------------------------------
+
+// this is the actual message queue used to pass messages between threads
+class PingerInterface
+{
+public:
+	virtual ~PingerInterface() {}
+	virtual void startThreads( void ) = 0;
+	virtual void endThreads( void ) = 0;
+	virtual Bool areThreadsRunning( void ) = 0;
+
+	virtual void addRequest( const PingRequest& req ) = 0;
+	virtual Bool getRequest( PingRequest& resp ) = 0;
+
+	virtual void addResponse( const PingResponse& resp ) = 0;
+	virtual Bool getResponse( PingResponse& resp ) = 0;
+
+	static PingerInterface* createNewPingerInterface( void );
+
+	virtual Bool arePingsInProgress( void ) = 0;
+	virtual Int getPing( AsciiString hostname ) = 0;
+	virtual void clearPingMap( void ) = 0;
+	virtual AsciiString getPingString( Int timeout ) = 0;
+};
+
+extern PingerInterface *ThePinger;
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h b/Core/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
new file mode 100644
index 00000000000..a2b298ae471
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
@@ -0,0 +1,156 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: StagingRoomGameInfo.h //////////////////////////////////////////////////////
+// Generals GameSpy GameInfo
+// Author: Matthew D. Campbell, Sept 2002
+
+#pragma once
+
+#include "GameNetwork/GameInfo.h"
+#include "GameNetwork/Transport.h"
+
+class GameSpyGameSlot : public GameSlot
+{
+public:
+	GameSpyGameSlot();
+	Int getProfileID( void ) const { return m_profileID; }
+	void setProfileID( Int id ) { m_profileID = id; }
+	AsciiString getLoginName( void ) const { return m_gameSpyLogin; }
+	void setLoginName( AsciiString name ) { m_gameSpyLogin = name; }
+	AsciiString getLocale( void ) const { return m_gameSpyLocale; }
+	void setLocale( AsciiString name ) { m_gameSpyLocale = name; }
+	Int getWins( void ) const { return m_wins; }
+	Int getLosses( void ) const { return m_losses; }
+	void setWins( Int wins ) { m_wins = wins; }
+	void setLosses( Int losses ) { m_losses = losses; }
+
+	Int getSlotRankPoints( void ) const { return m_rankPoints; }
+	Int getFavoriteSide( void ) const { return m_favoriteSide; }
+	void setSlotRankPoints( Int val ) { m_rankPoints = val; }
+	void setFavoriteSide( Int val ) { m_favoriteSide = val; }
+
+	void setPingString( AsciiString pingStr );
+	AsciiString getPingString( void ) const { return m_pingStr; }
+	Int getPingAsInt( void ) const { return m_pingInt; }
+
+protected:
+	Int m_profileID;
+	AsciiString m_gameSpyLogin;
+	AsciiString m_gameSpyLocale;
+
+	AsciiString m_pingStr;
+	Int m_pingInt;
+	Int m_wins, m_losses;
+	Int m_rankPoints, m_favoriteSide;
+};
+
+/**
+  * GameSpyStagingRoom class - maintains information about the GameSpy game and
+	* the contents of its slot list throughout the game.
+	*/
+class GameSpyStagingRoom : public GameInfo
+{
+private:
+	GameSpyGameSlot m_GameSpySlot[MAX_SLOTS];											///< The GameSpy Games Slot List
+	UnicodeString m_gameName;
+	Int m_id;
+	Transport *m_transport;
+	AsciiString m_localName;
+	Bool m_requiresPassword;
+	Bool m_allowObservers;
+	UnsignedInt m_version;
+	UnsignedInt m_exeCRC;
+	UnsignedInt m_iniCRC;
+	Bool m_isQM;
+
+	AsciiString m_ladderIP;
+	AsciiString m_pingStr;
+	Int m_pingInt;
+	UnsignedShort m_ladderPort;
+
+	Int m_reportedNumPlayers;
+	Int m_reportedMaxPlayers;
+	Int m_reportedNumObservers;
+
+public:
+	GameSpyStagingRoom();
+	virtual void reset( void );
+
+	void cleanUpSlotPointers(void);
+	void setID(Int id) { m_id = id; }
+	Int getID( void ) const { return m_id; }
+
+	void setHasPassword(Bool val) { m_requiresPassword = val; }
+	Bool getHasPassword(void) const { return m_requiresPassword; }
+	void setAllowObservers(Bool val) { m_allowObservers = val; }
+	Bool getAllowObservers(void) const { return m_allowObservers; }
+
+	void setVersion(UnsignedInt val) { m_version = val; }
+	UnsignedInt getVersion(void) const { return m_version; }
+	void setExeCRC(UnsignedInt val) { m_exeCRC = val; }
+	UnsignedInt getExeCRC(void) const { return m_exeCRC; }
+	void setIniCRC(UnsignedInt val) { m_iniCRC = val; }
+	UnsignedInt getIniCRC(void) const { return m_iniCRC; }
+
+	void setReportedNumPlayers(Int val) { m_reportedNumPlayers = val; }
+	Int getReportedNumPlayers(void) const { return m_reportedNumPlayers; }
+
+	void setReportedMaxPlayers(Int val) { m_reportedMaxPlayers = val; }
+	Int getReportedMaxPlayers(void) const { return m_reportedMaxPlayers; }
+
+	void setReportedNumObservers(Int val) { m_reportedNumObservers = val; }
+	Int getReportedNumObservers(void) const { return m_reportedNumObservers; }
+
+	void setLadderIP( AsciiString ladderIP ) { m_ladderIP = ladderIP; }
+	AsciiString getLadderIP( void ) const { return m_ladderIP; }
+	void setLadderPort( UnsignedShort ladderPort ) { m_ladderPort = ladderPort; }
+	UnsignedShort getLadderPort( void ) const { return m_ladderPort; }
+	void setPingString( AsciiString pingStr );
+	AsciiString getPingString( void ) const { return m_pingStr; }
+	Int getPingAsInt( void ) const { return m_pingInt; }
+
+	virtual Bool amIHost( void ) const;															///< Convenience function - is the local player the game host?
+
+	GameSpyGameSlot *getGameSpySlot( Int index );
+
+	AsciiString generateGameSpyGameResultsPacket( void );
+	AsciiString generateLadderGameResultsPacket( void );
+	void markGameAsQM( void ) { m_isQM = TRUE; }
+	Bool isQMGame( void ) { return m_isQM; }
+
+	virtual void init(void);
+	virtual void resetAccepted(void);															///< Reset the accepted flag on all players
+
+	virtual void startGame(Int gameID);														///< Mark our game as started and record the game ID.
+	void launchGame( void );																			///< NAT negotiation has finished - really start
+	virtual Int getLocalSlotNum( void ) const;										///< Get the local slot number, or -1 if we're not present
+
+	void setGameName( UnicodeString name ) { m_gameName = name; }
+	UnicodeString getGameName( void ) const { return m_gameName; }
+
+	void setLocalName( AsciiString name ) { m_localName = name; }
+};
+
+extern GameSpyStagingRoom *TheGameSpyGame;
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h b/Core/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h
new file mode 100644
index 00000000000..0db2a8df67e
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h
@@ -0,0 +1,32 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: ThreadUtils.h //////////////////////////////////////////////////////
+// Generals GameSpy thread utils
+// Author: Matthew D. Campbell, July 2002
+
+#pragma once
+
+std::wstring MultiByteToWideCharSingleLine( const char *orig );
+std::string WideCharStringToMultiByte( const WideChar *orig );
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpyOverlay.h b/Core/GameEngine/Include/GameNetwork/GameSpyOverlay.h
new file mode 100644
index 00000000000..b6dd9035949
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpyOverlay.h
@@ -0,0 +1,65 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: GamespyOverlay.h //////////////////////////////////////////////////////
+// Generals GameSpy overlay screens
+// Author: Matthew D. Campbell, March 2002
+
+#pragma once
+
+#include "Common/NameKeyGenerator.h"
+#include "GameClient/WindowLayout.h"
+#include "GameClient/Gadget.h"
+#include "GameClient/Shell.h"
+#include "GameClient/KeyDefs.h"
+#include "GameClient/GameWindowManager.h"
+
+void ClearGSMessageBoxes( void );	///< Tear down any GS message boxes (e.g. in case we have a new one to put up)
+void GSMessageBoxOk(UnicodeString titleString,UnicodeString bodyString, GameWinMsgBoxFunc okFunc = NULL);	///< Display a Message box with Ok button and track it
+void GSMessageBoxOkCancel(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc okFunc, GameWinMsgBoxFunc cancelFunc);	///< Display a Message box with Ok/Cancel buttons and track it
+void GSMessageBoxYesNo(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc yesFunc, GameWinMsgBoxFunc noFunc);	///< Display a Message box with Yes/No buttons and track it
+void RaiseGSMessageBox( void );		///< Bring GS message box to the foreground (if we transition screens while a message box is up)
+
+enum GSOverlayType CPP_11(: Int)
+{
+	GSOVERLAY_PLAYERINFO,
+	GSOVERLAY_MAPSELECT,
+	GSOVERLAY_BUDDY,
+	GSOVERLAY_PAGE,
+	GSOVERLAY_GAMEOPTIONS,
+	GSOVERLAY_GAMEPASSWORD,
+	GSOVERLAY_LADDERSELECT,
+	GSOVERLAY_LOCALESELECT,
+	GSOVERLAY_OPTIONS,
+	GSOVERLAY_MAX
+};
+
+void GameSpyOpenOverlay( GSOverlayType );
+void GameSpyCloseOverlay( GSOverlayType );
+void GameSpyCloseAllOverlays( void );
+Bool GameSpyIsOverlayOpen( GSOverlayType );
+void GameSpyToggleOverlay( GSOverlayType );
+void GameSpyUpdateOverlays( void );
+void ReOpenPlayerInfo( void );
+void CheckReOpenPlayerInfo(void );
diff --git a/Core/GameEngine/Include/GameNetwork/GameSpyThread.h b/Core/GameEngine/Include/GameNetwork/GameSpyThread.h
new file mode 100644
index 00000000000..82434da4187
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/GameSpyThread.h
@@ -0,0 +1,62 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: GameSpyThread.h //////////////////////////////////////////////////////
+// Generals GameSpy thread class
+// Author: Matthew D. Campbell, March 2002
+
+#pragma once
+
+#include "mutex.h"
+#include "thread.h"
+
+class GameSpyThreadClass : public ThreadClass
+{
+
+public:
+	GameSpyThreadClass::GameSpyThreadClass() : ThreadClass() { m_doLogin = false; m_readStats = false; m_updateWins = false; m_updateLosses = false; m_updateLocale = false; m_showLocaleSelect = false; m_nextShellScreen.clear(); }
+	void queueLogin(AsciiString nick, AsciiString pass, AsciiString email) { m_nick = nick; m_pass = pass; m_email = email; m_doLogin = true; }
+	void queueReadPersistentStatsFromServer( void ) { m_readStats = true; }
+	void queueUpdateLocale( AsciiString locale ) { m_locale = locale; m_updateLocale = true; }
+	void queueUpdateWins  ( AsciiString wins   ) { m_wins   = wins;   m_updateWins   = true; }
+	void queueUpdateLosses( AsciiString losses ) { m_losses = losses; m_updateLosses = true; }
+
+	void Thread_Function();
+
+	AsciiString getNextShellScreen( void );
+	Bool showLocaleSelect( void );
+
+	void setNextShellScreen( AsciiString nextShellScreen );
+	void setShowLocaleSelect( Bool val );
+
+private:
+	AsciiString m_nick, m_pass, m_email;
+	Bool m_doLogin, m_readStats, m_updateWins, m_updateLosses, m_updateLocale;
+	AsciiString m_locale, m_wins, m_losses;
+	AsciiString m_nextShellScreen;
+	Bool m_showLocaleSelect;
+};
+
+extern GameSpyThreadClass *TheGameSpyThread;
+extern MutexClass TheGameSpyMutex;
diff --git a/Core/GameEngine/Include/GameNetwork/IPEnumeration.h b/Core/GameEngine/Include/GameNetwork/IPEnumeration.h
new file mode 100644
index 00000000000..0b2651d2484
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/IPEnumeration.h
@@ -0,0 +1,77 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// IPEnumeration.h ///////////////////////////////////////////////////////////////
+// Class for enumerating IP addresses
+// Author: Matthew D. Campbell, October 2001
+
+#pragma once
+
+#include "GameNetwork/Transport.h"
+
+/**
+ * IP wrapper class.
+ */
+class EnumeratedIP : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(EnumeratedIP, "EnumeratedIP")
+public:
+	EnumeratedIP() { m_IPstring = ""; m_next = NULL; m_IP = 0; }
+
+	// Access functions
+	AsciiString getIPstring( void ) { return m_IPstring; }
+	void setIPstring( AsciiString name ) { m_IPstring = name; }
+	UnsignedInt getIP( void ) { return m_IP; }
+	void setIP( UnsignedInt IP ) { m_IP = IP; }
+	EnumeratedIP *getNext( void ) { return m_next; }
+	void setNext( EnumeratedIP *next ) { m_next = next; }
+
+protected:
+	AsciiString m_IPstring;
+	UnsignedInt m_IP;
+	EnumeratedIP *m_next;
+};
+EMPTY_DTOR(EnumeratedIP)
+
+
+/**
+ * The IPEnumeration class is used to obtain a list of IP addresses on the
+ * local machine.
+ */
+class IPEnumeration
+{
+public:
+
+	IPEnumeration();
+	~IPEnumeration();
+
+	EnumeratedIP * getAddresses( void );		///< Return a linked list of local IP addresses
+	AsciiString getMachineName( void );			///< Return the Network Neighborhood machine name
+
+protected:
+	void addNewIP( UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedByte d );
+
+	EnumeratedIP *m_IPlist;
+	Bool m_isWinsockInitialized;
+};
diff --git a/Core/GameEngine/Include/GameNetwork/LANAPI.h b/Core/GameEngine/Include/GameNetwork/LANAPI.h
new file mode 100644
index 00000000000..eecd1eedbaf
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/LANAPI.h
@@ -0,0 +1,412 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// LANAPI.h ///////////////////////////////////////////////////////////////
+// LANAPI singleton class - defines interface to LAN broadcast communications
+// Author: Matthew D. Campbell, October 2001
+
+#pragma once
+
+#include "GameNetwork/Transport.h"
+#include "GameNetwork/NetworkInterface.h"
+#include "GameNetwork/NetworkDefs.h"
+#include "GameNetwork/LANPlayer.h"
+#include "GameNetwork/LANGameInfo.h"
+
+//static const Int g_lanPlayerNameLength = 20;
+static const Int g_lanPlayerNameLength = 12; // reduced length because of game option length
+//static const Int g_lanLoginNameLength = 16;
+//static const Int g_lanHostNameLength = 16;
+static const Int g_lanLoginNameLength = 1;
+static const Int g_lanHostNameLength = 1;
+//static const Int g_lanGameNameLength = 32;
+static const Int g_lanGameNameLength = 16; // reduced length because of game option length
+static const Int g_lanGameNameReservedLength = 16; // save N wchars for ID info
+static const Int g_lanMaxChatLength = 100;
+static const Int m_lanMaxOptionsLength = MAX_PACKET_SIZE - ( 8 + (g_lanGameNameLength+1)*2 + 4 + (g_lanPlayerNameLength+1)*2
+																														+ (g_lanLoginNameLength+1) + (g_lanHostNameLength+1) );
+static const Int g_maxSerialLength = 23; // including the trailing '\0'
+
+struct LANMessage;
+
+/**
+ * The LANAPI class is used to instantiate a singleton which
+ * implements the interface to all LAN broadcast communications.
+ */
+class LANAPIInterface : public SubsystemInterface
+{
+public:
+
+	virtual ~LANAPIInterface() { };
+
+	virtual void init( void ) = 0;															///< Initialize or re-initialize the instance
+	virtual void reset( void ) = 0;															///< reset the logic system
+	virtual void update( void ) = 0;														///< update the world
+
+	virtual void setIsActive(Bool isActive ) = 0;								///< Tell TheLAN whether or not the app is active.
+
+	// Possible types of chat messages
+	enum ChatType
+	{
+		LANCHAT_NORMAL = 0,
+		LANCHAT_EMOTE,
+		LANCHAT_SYSTEM,
+	};
+
+	// Request functions generate network traffic
+	virtual void RequestLocations( void ) = 0;																				///< Request everybody to respond with where they are
+	virtual void RequestGameJoin( LANGameInfo *game, UnsignedInt ip = 0 ) = 0;				///< Request to join a game
+	virtual void RequestGameJoinDirectConnect( UnsignedInt ipaddress ) = 0;						///< Request to join a game at an IP address
+	virtual void RequestGameLeave( void ) = 0;																				///< Tell everyone we're leaving
+	virtual void RequestAccept( void ) = 0;																						///< Indicate we're OK with the game options
+	virtual void RequestHasMap( void ) = 0;																						///< Send our map status
+	virtual void RequestChat( UnicodeString message, ChatType format ) = 0;						///< Send a chat message
+	virtual void RequestGameStart( void ) = 0;																				///< Tell everyone the game is starting
+	virtual void RequestGameStartTimer( Int seconds ) = 0;
+	virtual void RequestGameOptions( AsciiString gameOptions, Bool isPublic, UnsignedInt ip = 0 ) = 0;		///< Change the game options
+	virtual void RequestGameCreate( UnicodeString gameName, Bool isDirectConnect ) = 0;	///< Try to host a game
+	virtual void RequestGameAnnounce( void ) = 0;																			///< Sound out current game info if host
+//	virtual void RequestSlotList( void ) = 0;																					///< Pump out the Slot info.
+	virtual void RequestSetName( UnicodeString newName ) = 0;													///< Pick a new name
+	virtual void RequestLobbyLeave( Bool forced ) = 0;																///< Announce that we're leaving the lobby
+	virtual void ResetGameStartTimer( void ) = 0;
+
+	// Possible result codes passed to On functions
+	enum ReturnType
+	{
+		RET_OK,							// Any function
+		RET_TIMEOUT,				// OnGameJoin/Leave/Start, etc
+		RET_GAME_FULL,			// OnGameJoin
+		RET_DUPLICATE_NAME,	// OnGameJoin
+		RET_CRC_MISMATCH,		// OnGameJoin
+		RET_SERIAL_DUPE,		// OnGameJoin
+		RET_GAME_STARTED,		// OnGameJoin
+		RET_GAME_EXISTS,		// OnGameCreate
+		RET_GAME_GONE,			// OnGameJoin
+		RET_BUSY,						// OnGameCreate/Join/etc if another action is in progress
+		RET_UNKNOWN,				// Default message for oddity
+	};
+	UnicodeString getErrorStringFromReturnType( ReturnType ret );
+
+	// On functions are (generally) the result of network traffic
+	virtual void OnGameList( LANGameInfo *gameList ) = 0;																							///< List of games
+	virtual void OnPlayerList( LANPlayer *playerList ) = 0;																				///< List of players in the Lobby
+	virtual void OnGameJoin( ReturnType ret, LANGameInfo *theGame ) = 0;															///< Did we get in the game?
+	virtual void OnPlayerJoin( Int slot, UnicodeString playerName ) = 0;													///< Someone else joined our game (host only; joiners get a slotlist)
+	virtual void OnHostLeave( void ) = 0;																													///< Host left the game
+	virtual void OnPlayerLeave( UnicodeString player ) = 0;																				///< Someone left the game
+	virtual void OnAccept( UnsignedInt playerIP, Bool status ) = 0;																///< Someone's accept status changed
+	virtual void OnHasMap( UnsignedInt playerIP, Bool status ) = 0;																///< Someone's map status changed
+	virtual void OnChat( UnicodeString player, UnsignedInt ip,
+											 UnicodeString message, ChatType format ) = 0;														///< Chat message from someone
+	virtual void OnGameStart( void ) = 0;																													///< The game is starting
+	virtual void OnGameStartTimer( Int seconds ) = 0;
+	virtual void OnGameOptions( UnsignedInt playerIP, Int playerSlot, AsciiString options ) = 0;	///< Someone sent game options
+	virtual void OnGameCreate( ReturnType ret ) = 0;																							///< Your game is created
+//	virtual void OnSlotList( ReturnType ret, LANGameInfo *theGame ) = 0;															///< Slotlist for a game in setup
+	virtual void OnNameChange( UnsignedInt IP, UnicodeString newName ) = 0;												///< Someone has morphed
+
+	// Misc utility functions
+	virtual LANGameInfo * LookupGame( UnicodeString gameName ) = 0;														///< return a pointer to a game we know about
+	virtual LANGameInfo * LookupGameByListOffset( Int offset ) = 0;														///< return a pointer to a game we know about
+	virtual Bool SetLocalIP( UnsignedInt localIP ) = 0;																		///< For multiple NIC machines
+	virtual void SetLocalIP( AsciiString localIP ) = 0;																		///< For multiple NIC machines
+	virtual Bool AmIHost( void ) = 0;																											///< Am I hosting a game?
+	virtual inline UnicodeString GetMyName( void ) = 0;																		///< What's my name?
+	virtual inline LANGameInfo *GetMyGame( void ) = 0;															          ///< What's my Game?
+	virtual void fillInLANMessage( LANMessage *msg ) = 0;																	///< Fill in default params
+	virtual void checkMOTD( void ) = 0;
+};
+
+
+/**
+ * The LANAPI class is used to instantiate a singleton which
+ * implements the interface to all LAN broadcast communications.
+ */
+class LANAPI : public LANAPIInterface
+{
+public:
+
+	LANAPI();
+	virtual ~LANAPI();
+
+	virtual void init( void );															///< Initialize or re-initialize the instance
+	virtual void reset( void );															///< reset the logic system
+	virtual void update( void );														///< update the world
+
+	virtual void setIsActive(Bool isActive);								///< tell TheLAN whether or not
+
+	// Request functions generate network traffic
+	virtual void RequestLocations( void );																				///< Request everybody to respond with where they are
+	virtual void RequestGameJoin( LANGameInfo *game, UnsignedInt ip = 0 );				///< Request to join a game
+	virtual void RequestGameJoinDirectConnect( UnsignedInt ipaddress );						///< Request to join a game at an IP address
+	virtual void RequestGameLeave( void );																				///< Tell everyone we're leaving
+	virtual void RequestAccept( void );																						///< Indicate we're OK with the game options
+	virtual void RequestHasMap( void );																						///< Send our map status
+	virtual void RequestChat( UnicodeString message, ChatType format );						///< Send a chat message
+	virtual void RequestGameStart( void );																				///< Tell everyone the game is starting
+	virtual void RequestGameStartTimer( Int seconds );
+	virtual void RequestGameOptions( AsciiString gameOptions, Bool isPublic, UnsignedInt ip = 0 );		///< Change the game options
+	virtual void RequestGameCreate( UnicodeString gameName, Bool isDirectConnect );	///< Try to host a game
+	virtual void RequestGameAnnounce( void );																			///< Send out game info if host
+	virtual void RequestSetName( UnicodeString newName );													///< Pick a new name
+//	virtual void RequestSlotList( void );																					///< Pump out the Slot info.
+	virtual void RequestLobbyLeave( Bool forced );																///< Announce that we're leaving the lobby
+	virtual void ResetGameStartTimer( void );
+
+	// On functions are (generally) the result of network traffic
+	virtual void OnGameList( LANGameInfo *gameList );																							///< List of games
+	virtual void OnPlayerList( LANPlayer *playerList );																				///< List of players in the Lobby
+	virtual void OnGameJoin( ReturnType ret, LANGameInfo *theGame );															///< Did we get in the game?
+	virtual void OnPlayerJoin( Int slot, UnicodeString playerName );													///< Someone else joined our game (host only; joiners get a slotlist)
+	virtual void OnHostLeave( void );																													///< Host left the game
+	virtual void OnPlayerLeave( UnicodeString player );																				///< Someone left the game
+	virtual void OnAccept( UnsignedInt playerIP, Bool status );																///< Someone's accept status changed
+	virtual void OnHasMap( UnsignedInt playerIP, Bool status );																///< Someone's map status changed
+	virtual void OnChat( UnicodeString player, UnsignedInt ip,
+											 UnicodeString message, ChatType format );														///< Chat message from someone
+	virtual void OnGameStart( void );																													///< The game is starting
+	virtual void OnGameStartTimer( Int seconds );
+	virtual void OnGameOptions( UnsignedInt playerIP, Int playerSlot, AsciiString options );	///< Someone sent game options
+	virtual void OnGameCreate( ReturnType ret );																							///< Your game is created
+	//virtual void OnSlotList( ReturnType ret, LANGameInfo *theGame );															///< Slotlist for a game in setup
+	virtual void OnNameChange( UnsignedInt IP, UnicodeString newName );												///< Someone has morphed
+	virtual void OnInActive( UnsignedInt IP );																								///< Someone has alt-tabbed out.
+
+
+	// Misc utility functions
+	virtual LANGameInfo * LookupGame( UnicodeString gameName );														///< return a pointer to a game we know about
+	virtual LANGameInfo * LookupGameByListOffset( Int offset );														///< return a pointer to a game we know about
+	virtual LANPlayer * LookupPlayer( UnsignedInt playerIP );													///< return a pointer to a player we know about
+	virtual Bool SetLocalIP( UnsignedInt localIP );																		///< For multiple NIC machines
+	virtual void SetLocalIP( AsciiString localIP );																		///< For multiple NIC machines
+	virtual Bool AmIHost( void );																											///< Am I hosting a game?
+	virtual UnicodeString GetMyName( void ) { return m_name; }                 ///< What's my name?
+	virtual LANGameInfo* GetMyGame( void ) { return m_currentGame; }					      ///< What's my Game?
+	virtual UnsignedInt GetLocalIP( void ) { return m_localIP; }								///< What's my IP?
+	virtual void fillInLANMessage( LANMessage *msg );																	///< Fill in default params
+	virtual void checkMOTD( void );
+protected:
+
+	enum PendingActionType
+	{
+		ACT_NONE = 0,
+		ACT_JOIN,
+		ACT_JOINDIRECTCONNECT,
+		ACT_LEAVE,
+	};
+
+	static const UnsignedInt s_resendDelta; // in ms
+
+protected:
+	LANPlayer *					m_lobbyPlayers;			///< List of players in the lobby
+	LANGameInfo *				m_games;								///< List of games
+	UnicodeString				m_name;							///< Who do we think we are?
+	AsciiString					m_userName;						///< login name
+	AsciiString					m_hostName;						///< machine name
+	UnsignedInt					m_gameStartTime;
+	Int									m_gameStartSeconds;
+
+	PendingActionType		m_pendingAction;	///< What action are we performing?
+	UnsignedInt					m_expiration;						///< When should we give up on our action?
+	UnsignedInt					m_actionTimeout;
+	UnsignedInt					m_directConnectRemoteIP;///< The IP address of the game we are direct connecting to.
+
+	// Resend timer ---------------------------------------------------------------------------
+	UnsignedInt					m_lastResendTime; // in ms
+
+	Bool								m_isInLANMenu;		///< true while we are in a LAN menu (lobby, game options, direct connect)
+	Bool								m_inLobby;											///< Are we in the lobby (not in a game)?
+	LANGameInfo *				m_currentGame;							///< Pointer to game (setup screen) we are currently in (NULL for lobby)
+	//LANGameInfo *m_currentGameInfo;			///< Pointer to game setup info we are currently in.
+
+	UnsignedInt					m_localIP;
+	Transport*					m_transport;
+
+	UnsignedInt					m_broadcastAddr;
+
+	UnsignedInt					m_lastUpdate;
+	AsciiString					m_lastGameopt; /// @todo: hack for demo - remove this
+
+	Bool								m_isActive;			///< is the game currently active?
+
+protected:
+	void sendMessage(LANMessage *msg, UnsignedInt ip = 0); // Convenience function
+	void removePlayer(LANPlayer *player);
+	void removeGame(LANGameInfo *game);
+	void addPlayer(LANPlayer *player);
+	void addGame(LANGameInfo *game);
+	AsciiString createSlotString( void );
+
+	// Functions to handle incoming messages -----------------------------------
+	void handleRequestLocations( LANMessage *msg, UnsignedInt senderIP );
+	void handleGameAnnounce( LANMessage *msg, UnsignedInt senderIP );
+	void handleLobbyAnnounce( LANMessage *msg, UnsignedInt senderIP );
+	void handleRequestGameInfo( LANMessage *msg, UnsignedInt senderIP );
+	void handleRequestJoin( LANMessage *msg, UnsignedInt senderIP );
+	void handleJoinAccept( LANMessage *msg, UnsignedInt senderIP );
+	void handleJoinDeny( LANMessage *msg, UnsignedInt senderIP );
+	void handleRequestGameLeave( LANMessage *msg, UnsignedInt senderIP );
+	void handleRequestLobbyLeave( LANMessage *msg, UnsignedInt senderIP );
+	void handleSetAccept( LANMessage *msg, UnsignedInt senderIP );
+	void handleHasMap( LANMessage *msg, UnsignedInt senderIP );
+	void handleChat( LANMessage *msg, UnsignedInt senderIP );
+	void handleGameStart( LANMessage *msg, UnsignedInt senderIP );
+	void handleGameStartTimer( LANMessage *msg, UnsignedInt senderIP );
+	void handleGameOptions( LANMessage *msg, UnsignedInt senderIP );
+	void handleInActive( LANMessage *msg, UnsignedInt senderIP );
+
+};
+
+
+
+/**
+ * LAN message class
+ */
+#pragma pack(push, 1)
+struct LANMessage
+{
+	enum Type				          ///< What kind of message are we?
+	{
+		// Locating everybody
+		MSG_REQUEST_LOCATIONS,	///< Hey, where is everybody?
+		MSG_GAME_ANNOUNCE,			///< Here I am, and here's my game info!
+		MSG_LOBBY_ANNOUNCE,			///< Hey, I'm in the lobby!
+
+		// Joining games
+		MSG_REQUEST_JOIN,				///< Let me in!  Let me in!
+		MSG_JOIN_ACCEPT,				///< Okay, you can join.
+		MSG_JOIN_DENY,					///< Go away!  We don't want any!
+
+		// Leaving games
+		MSG_REQUEST_GAME_LEAVE,	///< I want to leave the game
+		MSG_REQUEST_LOBBY_LEAVE,///< I'm leaving the lobby
+
+		// Game options, chat, etc
+		MSG_SET_ACCEPT,					///< I'm cool with everything as is.
+		MSG_MAP_AVAILABILITY,		///< I do (not) have the map.
+		MSG_CHAT,								///< Just spouting my mouth off.
+		MSG_GAME_START,					///< Hold on; we're starting!
+		MSG_GAME_START_TIMER,		///< The game will start in N seconds
+		MSG_GAME_OPTIONS,				///< Here's some info about the game.
+		MSG_INACTIVE,						///< I've alt-tabbed out.  Unaccept me cause I'm a poo-flinging monkey.
+
+		MSG_REQUEST_GAME_INFO,	///< For direct connect, get the game info from a specific IP Address
+	} messageType;
+
+	WideChar name[g_lanPlayerNameLength+1]; ///< My name, for convenience
+	char userName[g_lanLoginNameLength+1];	///< login name, for convenience
+	char hostName[g_lanHostNameLength+1];		///< machine name, for convenience
+
+	// No additional data is required for REQUEST_LOCATIONS, LOBBY_ANNOUNCE,
+	// REQUEST_LOBBY_LEAVE, GAME_START.
+	union
+	{
+		// StartTimer is sent with GAME_START_TIMER
+		struct
+		{
+			Int seconds;
+		} StartTimer;
+
+		// GameJoined is sent with REQUEST_GAME_LEAVE
+		struct
+		{
+			WideChar gameName[g_lanGameNameLength+1];
+		} GameToLeave;
+
+		// GameInfo if sent with GAME_ANNOUNCE
+		struct
+		{
+			WideChar gameName[g_lanGameNameLength+1];
+			Bool inProgress;
+			char options[m_lanMaxOptionsLength+1];
+			Bool isDirectConnect;
+		} GameInfo;
+
+		// PlayerInfo is sent with REQUEST_GAME_INFO for direct connect games.
+		struct
+		{
+			UnsignedInt ip;
+			WideChar playerName[g_lanPlayerNameLength+1];
+		} PlayerInfo;
+
+		// GameToJoin is sent with REQUEST_JOIN
+		struct
+		{
+			UnsignedInt gameIP;
+			UnsignedInt exeCRC;
+			UnsignedInt iniCRC;
+			char serial[g_maxSerialLength];
+		} GameToJoin;
+
+		// GameJoined is sent with JOIN_ACCEPT
+		struct
+		{
+			WideChar gameName[g_lanGameNameLength+1];
+			UnsignedInt gameIP;
+			UnsignedInt playerIP;
+			Int slotPosition;
+		} GameJoined;
+
+		// GameNotJoined is sent with JOIN_DENY
+		struct
+		{
+			WideChar gameName[g_lanGameNameLength+1];
+			UnsignedInt gameIP;
+			UnsignedInt playerIP;
+			LANAPIInterface::ReturnType reason;
+		} GameNotJoined;
+
+		// Accept is sent with SET_ACCEPT
+		struct
+		{
+			WideChar gameName[g_lanGameNameLength+1];
+			Bool isAccepted;
+		} Accept;
+
+		// Accept is sent with MAP_AVAILABILITY
+		struct
+		{
+			WideChar gameName[g_lanGameNameLength+1];
+			UnsignedInt mapCRC;	// to make sure we're talking about the same map
+			Bool hasMap;
+		} MapStatus;
+
+		// Chat is sent with CHAT
+		struct
+		{
+			WideChar gameName[g_lanGameNameLength+1];
+			LANAPIInterface::ChatType chatType;
+			WideChar message[g_lanMaxChatLength+1];
+		} Chat;
+
+		// GameOptions is sent with GAME_OPTIONS
+		struct
+		{
+			char options[m_lanMaxOptionsLength+1];
+		} GameOptions;
+
+	};
+};
+#pragma pack(pop)
diff --git a/Core/GameEngine/Include/GameNetwork/LANAPICallbacks.h b/Core/GameEngine/Include/GameNetwork/LANAPICallbacks.h
new file mode 100644
index 00000000000..394b75dedd8
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/LANAPICallbacks.h
@@ -0,0 +1,83 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////
+// FILE: LANAPICallbacks.h
+// Author: Chris Huybregts, October 2001
+// Description: LAN API Callbacks header
+///////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Common/NameKeyGenerator.h"
+#include "GameClient/Shell.h"
+#include "GameClient/GadgetListBox.h"
+#include "GameClient/GadgetTextEntry.h"
+#include "GameNetwork/LANAPI.h"
+
+
+// LAN API Singleton ----------------------------------------------------------------------
+extern LANAPI *TheLAN;
+
+//external declarations of the Gadgets the callbacks can use
+// LanLobby
+extern NameKeyType listboxChatWindowID;
+extern GameWindow *listboxChatWindow;
+extern GameWindow *listboxPlayers;
+extern NameKeyType listboxGamesID;
+extern GameWindow *listboxGames;
+//LanGame Options screen
+extern NameKeyType listboxChatWindowLanGameID;
+extern GameWindow *listboxChatWindowLanGame;
+extern WindowLayout *mapSelectLayout;
+// ScoreScreen
+extern NameKeyType listboxChatWindowScoreScreenID;
+extern GameWindow *listboxChatWindowScoreScreen;
+
+
+//Colors used for the chat dialogs
+extern const Color playerColor;
+extern const Color gameColor;
+extern const Color gameInProgressColor;
+extern const Color chatNormalColor;
+extern const Color chatActionColor;
+extern const Color chatLocalNormalColor;
+extern const Color chatLocalActionColor;
+extern const Color chatSystemColor;
+extern const Color chatSystemColor;
+extern const Color acceptTrueColor;
+extern const Color acceptFalseColor;
+
+
+void lanUpdateSlotList( void );
+void updateGameOptions( void );
+void setLANPlayerTooltip(LANPlayer* player);
+
+//Enum is used for the utility function so other windows do not need
+//to know about controls on LanGameOptions window.
+enum PostToLanGameType CPP_11(: Int){ SEND_GAME_OPTS = 0,
+												MAP_BACK,
+												POST_TO_LAN_GAME_TYPE_COUNT };
+//the utility function mentioned above
+void PostToLanGameOptions(PostToLanGameType post);
diff --git a/Core/GameEngine/Include/GameNetwork/LANGameInfo.h b/Core/GameEngine/Include/GameNetwork/LANGameInfo.h
new file mode 100644
index 00000000000..dbdeb0dfc69
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/LANGameInfo.h
@@ -0,0 +1,179 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: LANGameInfo.h //////////////////////////////////////////////////////
+// Generals LAN game setup information
+// Author: Matthew D. Campbell, December 2001
+
+#pragma once
+
+#include "GameNetwork/GameInfo.h"
+#include "GameNetwork/LANPlayer.h"
+
+class GameWindow;
+
+/**
+  * LANGameSlot class - maintains information about the contents of a
+	* game slot.  This persists throughout the game.
+	*/
+class LANGameSlot : public GameSlot
+{
+public:
+	LANGameSlot();
+
+	LANPlayer *getUser( void );																	///< Get the User structure associated with the slot (NULL for non-humans)
+
+	// Various tests
+	Bool isUser( LANPlayer *user );															///< Does this slot contain the given user?  Based off user->name
+	Bool isUser( UnicodeString userName );									///< Does this slot contain the given user?
+	Bool isLocalPlayer( void ) const;															///< Is this slot me?
+	void setLogin( UnicodeString name ) { m_user.setLogin(name); }
+	void setLogin( AsciiString name ) { m_user.setLogin(name); }
+	void setHost( UnicodeString name ) { m_user.setHost(name); }
+	void setHost( AsciiString name ) { m_user.setHost(name); }
+	void setSerial( AsciiString serial ) { m_serial = serial; }
+	AsciiString getSerial( void ) { return m_serial; }
+
+	void setLastHeard( UnsignedInt t ) { m_lastHeard = t; }
+	UnsignedInt getLastHeard( void ) { return m_lastHeard; }
+
+	//LANGameSlot& operator=(const LANGameSlot& src);
+
+private:
+
+	LANPlayer m_user;	///< filled in for each getUser() call
+	AsciiString m_serial;
+
+	UnsignedInt m_lastHeard;
+};
+
+/**
+  * LANGameInfo class - maintains information about the LAN game and
+	* the contents of its slot list hroughout the game.
+	*/
+class LANGameInfo : public GameInfo
+{
+private:
+	LANGameSlot m_LANSlot[MAX_SLOTS];											///< The Lan Games Slot List
+
+public:
+	LANGameInfo();
+	void setSlot( Int slotNum, LANGameSlot slotInfo );	///< Set the slot state (human, open, AI, etc)
+	LANGameSlot* getLANSlot( Int slotNum );							///< Get the slot
+	const LANGameSlot* getConstLANSlot( Int slotNum ) const;							///< Get the slot
+	virtual Int getLocalSlotNum( void ) const;												///< Get the local slot number, or -1 if we're not present
+	Int getSlotNum( UnicodeString userName );						///< Get the slot number corresponding to a specific user, or -1 if he's not present
+
+	UnsignedInt getLastHeard( void ) { return m_lastHeard; }
+	void setLastHeard( UnsignedInt lastHeard ) { m_lastHeard = lastHeard; }
+	LANGameInfo *getNext( void ) { return m_next; }
+	void setNext( LANGameInfo *next ) { m_next = next; }
+
+	// Game options
+	void setMap( AsciiString mapName );									///< Set the map to play on
+	void setSeed( Int seed );														///< Set the random seed for the game
+
+	void setName( UnicodeString name ) { m_gameName = name; }		///< Set the Name of the Game
+	UnicodeString getName( void ) { return m_gameName; }					///< Get the Name of the Game
+
+	// Convinience functions that interface with the LANPlayer held in the slot list
+	virtual void resetAccepted(void);														///< Reset the accepted flag on all players
+	Bool amIHost( void );																///< Convenience function - is the local player the game host?
+
+	/// Get the IP of selected player or return 0
+	UnsignedInt getIP( int who )
+	{
+		return m_LANSlot[who].getIP();
+	}
+
+	/// Set the IP of the Selected Player
+	void setIP( int who, UnsignedInt IP )
+	{
+		m_LANSlot[who].setIP(IP);
+	}
+
+	/// set whether or not this is a direct connect game or not.
+	void setIsDirectConnect(Bool isDirectConnect)
+	{
+		m_isDirectConnect = isDirectConnect;
+	}
+
+	/// returns whether or not this is a direct connect game or not.
+	Bool getIsDirectConnect()
+	{
+		return m_isDirectConnect;
+	}
+
+	/// Set the Player Name
+	void setPlayerName( int who, UnicodeString name )
+	{
+		m_LANSlot[who].setName(name);
+	}
+
+	/// Return the Player name or TheEmptyString
+	UnicodeString getPlayerName(int who)
+	{
+		return m_LANSlot[who].getName();
+	}
+
+	/// Return the time the player was heard from last, or 0
+	UnsignedInt getPlayerLastHeard( int who )
+	{
+		if (m_LANSlot[who].isHuman())
+			return m_LANSlot[who].getLastHeard();
+		return 0;
+	}
+
+	/// Set the last time we heard from the player
+	void setPlayerLastHeard( int who, UnsignedInt lastHeard )
+	{
+		DEBUG_LOG(("LANGameInfo::setPlayerLastHeard - changing player %d last heard from %d to %d", who, getPlayerLastHeard(who), lastHeard));
+		if (m_LANSlot[who].isHuman())
+			m_LANSlot[who].setLastHeard(lastHeard);
+	}
+
+	/// Return the hosts IP or 0
+	UnsignedInt getHostIP(void)
+	{
+		if (m_LANSlot[0].isHuman())
+			return m_LANSlot[0].getIP();
+		return 0;
+	}
+
+
+private:
+	LANGameInfo *m_next;																///< Pointer for linked list
+	UnsignedInt m_lastHeard;														///< The last time we heard from this game (for timeout purposes)
+	UnicodeString m_gameName;														///< Game name.  @todo: are game names based off of host player names?
+	Bool m_isDirectConnect;															///< Is this game a direct connect game, or a LAN game?
+};
+
+void LANDisplayGameList( GameWindow *gameListbox, LANGameInfo *gameList );	///< Displays the list of games in a listbox, preserving selections
+void LANEnableStartButton(Bool enabled);
+
+void LANDisplaySlotList( void );		///< Displays the slot list according to TheLANGameInfo
+void LANDisplayGameOptions( void );	///< Displays the game options according to TheLANGameInfo
+
+AsciiString GenerateGameOptionsString( void );
+Bool ParseGameOptionsString(LANGameInfo *game, AsciiString options);
diff --git a/Core/GameEngine/Include/GameNetwork/LANPlayer.h b/Core/GameEngine/Include/GameNetwork/LANPlayer.h
new file mode 100644
index 00000000000..f71e7b18a73
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/LANPlayer.h
@@ -0,0 +1,63 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// LANPlayer.h ///////////////////////////////////////////////////////////////
+// LAN Player Class used for both the LANAPI and LANGameInfo
+// Author: Matthew D. Campbell, October 2001 (Pulled out of LANAPI.h by CLH on 12/21/01
+
+#pragma once
+
+/**
+ * LAN player class.  This is for players sitting in the lobby.  Players are
+ * uniquely identified by their IP addresses.
+ */
+class LANPlayer
+{
+public:
+	LANPlayer() { m_name = m_login = m_host = L""; m_lastHeard = 0; m_next = NULL; m_IP = 0; }
+
+	// Access functions
+	UnicodeString getName( void ) { return m_name; }
+	void setName( UnicodeString name ) { m_name = name; }
+	UnicodeString getLogin( void ) { return m_login; }
+	void setLogin( UnicodeString name ) { m_login = name; }
+	void setLogin( AsciiString name ) { m_login.translate(name); }
+	UnicodeString getHost( void ) { return m_host; }
+	void setHost( UnicodeString name ) { m_host = name; }
+	void setHost( AsciiString name ) { m_host.translate(name); }
+	UnsignedInt getLastHeard( void ) { return m_lastHeard; }
+	void setLastHeard( UnsignedInt lastHeard ) { m_lastHeard = lastHeard; }
+	LANPlayer *getNext( void ) { return m_next; }
+	void setNext( LANPlayer *next ) { m_next = next; }
+	UnsignedInt getIP( void ) { return m_IP; }
+	void setIP( UnsignedInt IP ) { m_IP = IP; }
+
+protected:
+	UnicodeString m_name;			///< Player name
+	UnicodeString m_login;		///< login name
+	UnicodeString m_host;			///< machine name
+	UnsignedInt m_lastHeard;	///< The last time we heard from this player (for timeout purposes)
+	LANPlayer *m_next;				///< Linked list pointer
+	UnsignedInt m_IP;					///< Player's IP
+};
diff --git a/Core/GameEngine/Include/GameNetwork/NAT.h b/Core/GameEngine/Include/GameNetwork/NAT.h
new file mode 100644
index 00000000000..b5eb44c9596
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/NAT.h
@@ -0,0 +1,157 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: NAT.h /////////////////////////////////////////////////////////////////////////////////
+// Author: Bryan Cleveland April 2002
+// Desc:   Resolves NAT'd IPs and port numbers for the other players in a game.
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Lib/BaseType.h"
+#include "GameNetwork/NetworkInterface.h"
+#include "GameNetwork/FirewallHelper.h"
+
+class Transport;
+class GameSlot;
+
+enum NATStateType CPP_11(: Int) {
+	NATSTATE_IDLE,
+	NATSTATE_DOCONNECTIONPATHS,
+	NATSTATE_WAITFORSTATS,
+	NATSTATE_DONE,
+	NATSTATE_FAILED
+};
+
+enum NATConnectionState CPP_11(: Int) {
+	NATCONNECTIONSTATE_NOSTATE,
+	NATCONNECTIONSTATE_WAITINGTOBEGIN,
+//	NATCONNECTIONSTATE_NETGEARDELAY,
+	NATCONNECTIONSTATE_WAITINGFORMANGLERRESPONSE,
+	NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT,
+	NATCONNECTIONSTATE_WAITINGFORRESPONSE,
+	NATCONNECTIONSTATE_DONE,
+	NATCONNECTIONSTATE_FAILED
+};
+
+struct ConnectionNodeType {
+	FirewallHelperClass::tFirewallBehaviorType m_behavior;	///< the NAT/Firewall behavior of this node.
+	UnsignedInt m_slotIndex; ///< the player list index of this node.
+};
+
+class NAT {
+public:
+	NAT();
+	virtual ~NAT();
+
+	NATStateType update();
+
+	void attachSlotList(GameSlot **slotList, Int localSlot, UnsignedInt localIP);
+	void establishConnectionPaths();
+
+	Int getSlotPort(Int slot);
+	Transport * getTransport();	///< return the newly created Transport layer that has all the connections and whatnot.
+
+	// Notification messages from GameSpy
+	void processGlobalMessage(Int slotNum, const char *options);
+
+protected:
+	NATConnectionState connectionUpdate(); ///< the update function for the connections.
+	void sendMangledSourcePort(); ///< starts the process to get the next mangled source port.
+	void processManglerResponse(UnsignedShort mangledPort);
+
+	Bool allConnectionsDoneThisRound();
+	Bool allConnectionsDone();
+
+	void generatePortNumbers(GameSlot **slotList, Int localSlot); ///< generate all of the slots' port numbers to be used.
+
+	void doThisConnectionRound();	///< compute who will connect with who for this round.
+	void setConnectionState(Int nodeNumber, NATConnectionState state); ///< central point for changing a connection's state.
+	void sendAProbe(UnsignedInt ip, UnsignedShort port, Int fromNode);	///< send a "PROBE" packet to this IP and port.
+	void notifyTargetOfProbe(GameSlot *targetSlot);
+	void notifyUsersOfConnectionDone(Int nodeIndex);
+	void notifyUsersOfConnectionFailed(Int nodeIndex);
+	void sendMangledPortNumberToTarget(UnsignedShort mangledPort, GameSlot *targetSlot);
+
+	void probed(Int nodeNumber);
+	void gotMangledPort(Int nodeNumber, UnsignedShort mangledPort);
+	void gotInternalAddress(Int nodeNumber, UnsignedInt address);
+	void connectionComplete(Int slotIndex);
+	void connectionFailed(Int slotIndex);
+
+	Transport *m_transport;
+	GameSlot **m_slotList;
+	NATStateType m_NATState;
+	Int m_localNodeNumber;	///< The node number of the local player.
+	Int m_targetNodeNumber;	///< The node number of the player we are connecting to this round.
+	UnsignedInt m_localIP;	///< The IP of the local computer.
+	UnsignedInt m_numNodes;	///< The number of players we have to connect together.
+	UnsignedInt m_connectionRound; ///< The "round" of connections we are currently on.
+
+	Int m_numRetries;
+	Int m_maxNumRetriesAllowed;
+
+	UnsignedShort m_packetID;
+	UnsignedShort m_spareSocketPort;
+	time_t m_manglerRetryTime;
+	Int m_manglerRetries;
+	UnsignedShort m_previousSourcePort;
+
+	Bool m_beenProbed; ///< have I been notified that I've been probed this round?
+
+	UnsignedInt m_manglerAddress;
+
+	time_t m_timeTillNextSend; ///< The number of milliseconds till we send to the other guy's port again.
+	NATConnectionState m_connectionStates[MAX_SLOTS]; ///< connection states for this round for all the nodes.
+
+	ConnectionNodeType m_connectionNodes[MAX_SLOTS]; ///< info regarding the nodes that are being connected.
+
+	UnsignedShort m_sourcePorts[MAX_SLOTS]; ///< the source ports that the other players communicate to us on.
+
+	Bool m_myConnections[MAX_SLOTS]; ///< keeps track of all the nodes I've connected to. For keepalive.
+	time_t m_nextKeepaliveTime; ///< the next time we will send out our keepalive packets.
+
+	static Int m_connectionPairs[MAX_SLOTS-1][MAX_SLOTS-1][MAX_SLOTS];
+	Int m_connectionPairIndex;
+
+	UnsignedShort m_startingPortNumber; ///< the starting port number for this game. The slots all get port numbers with their port numbers based on this number.
+																			///< this is done so that games that are played right after each other with the same players in the same
+																			///< slot order will not use the old source port allocation scheme in case their NAT
+																			///< hasn't timed out that connection.
+
+	time_t m_nextPortSendTime; ///< Last time we sent our mangled port number to our target this round.
+
+	time_t m_timeoutTime; ///< the time at which we will time out waiting for the other player's port number.
+	time_t m_roundTimeout;	///< the time at which we will time out this connection round.
+
+ static Int m_timeBetweenRetries; // 1 second between retries sounds good to me.
+ static time_t m_manglerRetryTimeInterval; // sounds good to me.
+ static Int m_maxAllowedManglerRetries; // works for me.
+ static time_t m_keepaliveInterval; // 15 seconds between keepalive packets seems good.
+ static time_t m_timeToWaitForPort; // wait for ten seconds for the other player's port number.
+ static time_t m_timeForRoundTimeout; // wait for at most ten seconds for each connection round to finish.
+
+};
+
+extern NAT *TheNAT;
diff --git a/Core/GameEngine/Include/GameNetwork/NetCommandList.h b/Core/GameEngine/Include/GameNetwork/NetCommandList.h
new file mode 100644
index 00000000000..21aa6ff733b
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/NetCommandList.h
@@ -0,0 +1,68 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Common/GameMemory.h"
+#include "GameNetwork/NetCommandRef.h"
+
+/**
+ * The NetCommandList is a ordered linked list of NetCommandRef objects.
+ * The list is ordered based on the command id, player id, and command type.
+ * It is ordered in this way to aid in constructing the packets efficiently.
+ * The list keeps track of the last message inserted in order to accommodate
+ * adding commands in order more efficiently since that is whats going to be
+ * done most of the time.  If the new message doesn't go after the last message
+ * inserted, then the list will be traversed linearly until the proper spot is
+ * found.  We can get away with this inefficient method since these occurances
+ * will be rare.  Also, the list is not expected to ever have more than 30 or so
+ * commands on it at a time.  Five commands would probably be a normal amount.
+ */
+
+class NetCommandList : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandList, "NetCommandList")
+public:
+	NetCommandList();
+	//virtual ~NetCommandList();
+
+	void init();									///< Initialize the list
+	void reset();									///< Reset the list to the initial state.
+	NetCommandRef * addMessage(NetCommandMsg *cmdMsg);	///< Add message to the list in its properly ordered place.
+	Bool isEqualCommandMsg(NetCommandMsg *msg1, NetCommandMsg *msg2);
+	NetCommandRef * getFirstMessage();				///< Get the first message on the list.
+	NetCommandRef * findMessage(NetCommandMsg *msg);	///< Find and return a reference to the given message if one exists.
+	NetCommandRef * findMessage(UnsignedShort commandID, UnsignedByte playerID);	///< Find and return a reference to the
+																								///< message given the player id and the command id.
+																								///< This will only check against messages of types that require
+																								///< a command id.
+	void removeMessage(NetCommandRef *msg);			///< Remove the given message from the list.
+	void appendList(NetCommandList *list);			///< Append the given list to the end of this list.
+	Int length();									///< Returns the number of nodes in this list.  This is inefficient and is meant to be a debug tool.
+
+protected:
+	NetCommandRef *m_first;							///< Head of the list.
+	NetCommandRef *m_last;							///< Tail of the list.
+	NetCommandRef *m_lastMessageInserted;			///< The last message that was inserted to this list.
+};
diff --git a/Core/GameEngine/Include/GameNetwork/NetCommandMsg.h b/Core/GameEngine/Include/GameNetwork/NetCommandMsg.h
new file mode 100644
index 00000000000..84eb1566689
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/NetCommandMsg.h
@@ -0,0 +1,588 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//------------------------------------------------------------------------------------
+// The CommandMsg class is a linked-list wrapper around GameMessage objects that
+// are queued up to execute at a later time
+
+#pragma once
+
+#include "Lib/BaseType.h"
+#include "GameNetwork/NetworkDefs.h"
+#include "Common/UnicodeString.h"
+
+//-----------------------------------------------------------------------------
+class NetCommandMsg : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandMsg, "NetCommandMsg")
+public:
+	NetCommandMsg();
+	//virtual ~NetCommandMsg();
+	UnsignedInt GetTimestamp() { return m_timestamp; }
+	void SetTimestamp(UnsignedInt timestamp) { m_timestamp = timestamp; }
+	void setExecutionFrame(UnsignedInt frame) { m_executionFrame = frame; }
+	void setPlayerID(UnsignedInt playerID) { m_playerID = playerID; }
+	void setID(UnsignedShort id) { m_id = id; }
+	UnsignedInt getExecutionFrame() const { return m_executionFrame; }
+	UnsignedInt getPlayerID() const { return m_playerID; }
+	UnsignedShort getID() const { return m_id; }
+	void setNetCommandType(NetCommandType type) { m_commandType = type; }
+	NetCommandType getNetCommandType() { return m_commandType; }
+	virtual Int getSortNumber();
+	virtual size_t getPackedByteCount() const = 0;
+	void attach();
+	void detach();
+
+protected:
+	UnsignedInt m_timestamp;
+	UnsignedInt m_executionFrame;
+	UnsignedInt m_playerID;
+	UnsignedShort m_id;
+
+	NetCommandType m_commandType;
+	Int m_referenceCount;
+};
+
+
+//-----------------------------------------------------------------------------
+/**
+ * The NetGameCommandMsg is the NetCommandMsg representation of a GameMessage
+ */
+class NetGameCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetGameCommandMsg, "NetGameCommandMsg")
+public:
+	NetGameCommandMsg();
+	NetGameCommandMsg(GameMessage *msg);
+	//virtual ~NetGameCommandMsg();
+
+	GameMessage *constructGameMessage() const;
+	void addArgument(const GameMessageArgumentDataType type, GameMessageArgumentType arg);
+	void setGameMessageType(GameMessage::Type type);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	Int m_numArgs;
+	Int m_argSize;
+	GameMessage::Type m_type;
+	GameMessageArgument *m_argList, *m_argTail;
+};
+
+//-----------------------------------------------------------------------------
+/**
+ * The NetAckBothCommandMsg is the NetCommandMsg representation of the combination of a
+ * stage 1 ack and a stage 2 ack.
+ */
+class NetAckBothCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetAckBothCommandMsg, "NetAckBothCommandMsg")
+public:
+	NetAckBothCommandMsg(NetCommandMsg *msg);
+	NetAckBothCommandMsg();
+	//virtual ~NetAckBothCommandMsg();
+
+	UnsignedShort getCommandID();
+	void setCommandID(UnsignedShort commandID);
+	UnsignedByte getOriginalPlayerID();
+	void setOriginalPlayerID(UnsignedByte originalPlayerID);
+	virtual Int getSortNumber();
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedShort m_commandID;
+	UnsignedByte m_originalPlayerID;
+};
+
+//-----------------------------------------------------------------------------
+/**
+ * The NetAckStage1CommandMsg is the NetCommandMsg representation of an ack message for the initial
+ * recipient.
+ */
+class NetAckStage1CommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetAckStage1CommandMsg, "NetAckStage1CommandMsg")
+public:
+	NetAckStage1CommandMsg(NetCommandMsg *msg);
+	NetAckStage1CommandMsg();
+	//virtual ~NetAckStage1CommandMsg();
+
+	UnsignedShort getCommandID();
+	void setCommandID(UnsignedShort commandID);
+	UnsignedByte getOriginalPlayerID();
+	void setOriginalPlayerID(UnsignedByte originalPlayerID);
+	virtual Int getSortNumber();
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedShort m_commandID;
+	UnsignedByte m_originalPlayerID;
+};
+
+//-----------------------------------------------------------------------------
+/**
+ * The NetAckStage2CommandMsg is the NetCommandMsg representation of an ack message for all eventual
+ * recipients. (when this is returned, all the players in the relay mask have received the packet)
+ */
+class NetAckStage2CommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetAckStage2CommandMsg, "NetAckStage2CommandMsg")
+public:
+	NetAckStage2CommandMsg(NetCommandMsg *msg);
+	NetAckStage2CommandMsg();
+	//virtual ~NetAckStage2CommandMsg();
+
+	UnsignedShort getCommandID();
+	void setCommandID(UnsignedShort commandID);
+	UnsignedByte getOriginalPlayerID();
+	void setOriginalPlayerID(UnsignedByte originalPlayerID);
+	virtual Int getSortNumber();
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedShort m_commandID;
+	UnsignedByte m_originalPlayerID;
+};
+
+//-----------------------------------------------------------------------------
+class NetFrameCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFrameCommandMsg, "NetFrameCommandMsg")
+public:
+	NetFrameCommandMsg();
+	//virtual ~NetFrameCommandMsg();
+
+	void setCommandCount(UnsignedShort commandCount);
+	UnsignedShort getCommandCount();
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedShort m_commandCount;
+};
+
+//-----------------------------------------------------------------------------
+class NetPlayerLeaveCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetPlayerLeaveCommandMsg, "NetPlayerLeaveCommandMsg")
+public:
+	NetPlayerLeaveCommandMsg();
+	//virtual ~NetPlayerLeaveCommandMsg();
+
+	UnsignedByte getLeavingPlayerID();
+	void setLeavingPlayerID(UnsignedByte id);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedByte m_leavingPlayerID;
+};
+
+//-----------------------------------------------------------------------------
+class NetRunAheadMetricsCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetRunAheadMetricsCommandMsg, "NetRunAheadMetricsCommandMsg")
+public:
+	NetRunAheadMetricsCommandMsg();
+	//virtual ~NetRunAheadMetricsCommandMsg();
+
+	Real getAverageLatency();
+	void setAverageLatency(Real avgLat);
+	Int  getAverageFps();
+	void setAverageFps(Int fps);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	Real m_averageLatency;
+	Int  m_averageFps;
+};
+
+//-----------------------------------------------------------------------------
+class NetRunAheadCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetRunAheadCommandMsg, "NetRunAheadCommandMsg")
+public:
+	NetRunAheadCommandMsg();
+	//virtual ~NetRunAheadCommandMsg();
+
+	UnsignedShort getRunAhead();
+	void setRunAhead(UnsignedShort runAhead);
+
+	UnsignedByte getFrameRate();
+	void setFrameRate(UnsignedByte frameRate);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedShort m_runAhead;
+	UnsignedByte m_frameRate;
+};
+
+//-----------------------------------------------------------------------------
+class NetDestroyPlayerCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDestroyPlayerCommandMsg, "NetDestroyPlayerCommandMsg")
+public:
+	NetDestroyPlayerCommandMsg();
+	//virtual ~NetDestroyPlayerCommandMsg();
+
+	UnsignedInt getPlayerIndex();
+	void setPlayerIndex(UnsignedInt playerIndex);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedInt m_playerIndex;
+};
+
+//-----------------------------------------------------------------------------
+class NetKeepAliveCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetKeepAliveCommandMsg, "NetKeepAliveCommandMsg")
+public:
+	NetKeepAliveCommandMsg();
+	//virtual ~NetKeepAliveCommandMsg();
+
+	virtual size_t getPackedByteCount() const;
+};
+
+//-----------------------------------------------------------------------------
+class NetDisconnectKeepAliveCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectKeepAliveCommandMsg, "NetDisconnectKeepAliveCommandMsg")
+public:
+	NetDisconnectKeepAliveCommandMsg();
+	//virtual ~NetDisconnectKeepAliveCommandMsg();
+
+	virtual size_t getPackedByteCount() const;
+};
+
+//-----------------------------------------------------------------------------
+class NetDisconnectPlayerCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectPlayerCommandMsg, "NetDisconnectPlayerCommandMsg")
+public:
+	NetDisconnectPlayerCommandMsg();
+	//virtual ~NetDisconnectPlayerCommandMsg();
+
+	UnsignedByte getDisconnectSlot();
+	void setDisconnectSlot(UnsignedByte slot);
+
+	UnsignedInt getDisconnectFrame();
+	void setDisconnectFrame(UnsignedInt frame);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedByte m_disconnectSlot;
+	UnsignedInt m_disconnectFrame;
+};
+
+//-----------------------------------------------------------------------------
+class NetPacketRouterQueryCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetPacketRouterQueryCommandMsg, "NetPacketRouterQueryCommandMsg")
+public:
+	NetPacketRouterQueryCommandMsg();
+	//virtual ~NetPacketRouterQueryCommandMsg();
+
+	virtual size_t getPackedByteCount() const;
+};
+
+//-----------------------------------------------------------------------------
+class NetPacketRouterAckCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetPacketRouterAckCommandMsg, "NetPacketRouterAckCommandMsg")
+public:
+	NetPacketRouterAckCommandMsg();
+	//virtual ~NetPacketRouterAckCommandMsg();
+
+	virtual size_t getPackedByteCount() const;
+};
+
+//-----------------------------------------------------------------------------
+class NetDisconnectChatCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectChatCommandMsg, "NetDisconnectChatCommandMsg")
+public:
+	NetDisconnectChatCommandMsg();
+	//virtual ~NetDisconnectChatCommandMsg();
+
+	UnicodeString getText();
+	void setText(UnicodeString text);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnicodeString m_text;
+};
+
+//-----------------------------------------------------------------------------
+class NetChatCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetChatCommandMsg, "NetChatCommandMsg")
+public:
+	NetChatCommandMsg();
+	//virtual ~NetChatCommandMsg();
+
+	UnicodeString getText();
+	void setText(UnicodeString text);
+
+	Int getPlayerMask( void );
+	void setPlayerMask( Int playerMask );
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnicodeString m_text;
+	Int m_playerMask;
+};
+
+//-----------------------------------------------------------------------------
+class NetDisconnectVoteCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectVoteCommandMsg, "NetDisconnectVoteCommandMsg")
+public:
+	NetDisconnectVoteCommandMsg();
+	//virtual ~NetDisconnectVoteCommandMsg();
+
+	UnsignedByte getSlot();
+	void setSlot(UnsignedByte slot);
+
+	UnsignedInt getVoteFrame();
+	void setVoteFrame(UnsignedInt voteFrame);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedByte m_slot;
+	UnsignedInt m_voteFrame;
+};
+
+//-----------------------------------------------------------------------------
+class NetProgressCommandMsg: public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetProgressCommandMsg, "NetProgressCommandMsg")
+public:
+	NetProgressCommandMsg( void );
+	//virtual ~NetProgressCommandMsg( void );
+
+	UnsignedByte getPercentage();
+	void setPercentage( UnsignedByte percent );
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedByte m_percent;
+};
+
+//-----------------------------------------------------------------------------
+class NetWrapperCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetWrapperCommandMsg, "NetWrapperCommandMsg")
+public:
+	NetWrapperCommandMsg( void );
+	//virtual ~NetWrapperCommandMsg();
+
+	UnsignedByte * getData();
+	void setData(UnsignedByte *data, UnsignedInt dataLength);
+
+	virtual size_t getPackedByteCount() const;
+
+	UnsignedInt getChunkNumber();
+	void setChunkNumber(UnsignedInt chunkNumber);
+
+	UnsignedInt getNumChunks();
+	void setNumChunks(UnsignedInt numChunks);
+
+	UnsignedInt getDataLength();
+
+	UnsignedInt getTotalDataLength();
+	void setTotalDataLength(UnsignedInt totalDataLength);
+
+	UnsignedInt getDataOffset();
+	void setDataOffset(UnsignedInt offset);
+
+	UnsignedShort getWrappedCommandID();
+	void setWrappedCommandID(UnsignedShort wrappedCommandID);
+
+private:
+	UnsignedByte *m_data;
+	// using UnsignedInt's so we can send around files of effectively unlimited size easily
+	UnsignedInt m_dataLength;
+	UnsignedInt m_dataOffset;
+	UnsignedInt m_totalDataLength;
+	UnsignedInt m_chunkNumber;
+	UnsignedInt m_numChunks;
+	UnsignedShort m_wrappedCommandID;
+};
+
+//-----------------------------------------------------------------------------
+class NetFileCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFileCommandMsg, "NetFileCommandMsg")
+public:
+	NetFileCommandMsg();
+	//virtual ~NetFileCommandMsg();
+
+	AsciiString getRealFilename();
+	void setRealFilename(AsciiString filename);
+
+	AsciiString getPortableFilename() { return m_portableFilename; }
+	void setPortableFilename(AsciiString filename) { m_portableFilename = filename; }
+
+	UnsignedInt getFileLength();
+
+	UnsignedByte * getFileData();
+	void setFileData(UnsignedByte *data, UnsignedInt dataLength);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	AsciiString m_portableFilename;
+
+	UnsignedByte *m_data;
+	UnsignedInt m_dataLength;
+};
+
+//-----------------------------------------------------------------------------
+class NetFileAnnounceCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFileAnnounceCommandMsg, "NetFileAnnounceCommandMsg")
+public:
+	NetFileAnnounceCommandMsg();
+	//virtual ~NetFileAnnounceCommandMsg();
+
+	AsciiString getRealFilename();
+	void setRealFilename(AsciiString filename);
+
+	AsciiString getPortableFilename() { return m_portableFilename; }
+	void setPortableFilename(AsciiString filename) { m_portableFilename = filename; }
+
+	UnsignedShort getFileID();
+	void setFileID(UnsignedShort fileID);
+
+	UnsignedByte getPlayerMask(void);
+	void setPlayerMask(UnsignedByte playerMask);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	AsciiString m_portableFilename;
+	UnsignedShort m_fileID;
+	UnsignedByte m_playerMask;
+};
+
+//-----------------------------------------------------------------------------
+class NetFileProgressCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFileProgressCommandMsg, "NetFileProgressCommandMsg")
+public:
+	NetFileProgressCommandMsg();
+	//virtual ~NetFileProgressCommandMsg();
+
+	UnsignedShort getFileID();
+	void setFileID(UnsignedShort val);
+
+	Int getProgress();
+	void setProgress(Int val);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedShort m_fileID;
+	Int m_progress;
+};
+
+//-----------------------------------------------------------------------------
+class NetDisconnectFrameCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectFrameCommandMsg, "NetDisconnectFrameCommandMsg")
+public:
+	NetDisconnectFrameCommandMsg();
+
+	UnsignedInt getDisconnectFrame();
+	void setDisconnectFrame(UnsignedInt disconnectFrame);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedInt m_disconnectFrame;
+};
+
+//-----------------------------------------------------------------------------
+class NetDisconnectScreenOffCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectScreenOffCommandMsg, "NetDisconnectScreenOffCommandMsg")
+public:
+	NetDisconnectScreenOffCommandMsg();
+
+	UnsignedInt getNewFrame();
+	void setNewFrame(UnsignedInt newFrame);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedInt m_newFrame;
+};
+
+//-----------------------------------------------------------------------------
+class NetFrameResendRequestCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFrameResendRequestCommandMsg, "NetFrameResendRequestCommandMsg")
+public:
+	NetFrameResendRequestCommandMsg();
+
+	UnsignedInt getFrameToResend();
+	void setFrameToResend(UnsignedInt frame);
+
+	virtual size_t getPackedByteCount() const;
+
+protected:
+	UnsignedInt m_frameToResend;
+};
+
+class NetLoadCompleteCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetLoadCompleteCommandMsg, "NetLoadCompleteCommandMsg")
+public:
+	NetLoadCompleteCommandMsg();
+	//virtual ~NetLoadCompleteCommandMsg();
+
+	virtual size_t getPackedByteCount() const;
+};
+
+class NetTimeOutGameStartCommandMsg : public NetCommandMsg
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetTimeOutGameStartCommandMsg, "NetTimeOutGameStartCommandMsg")
+public:
+	NetTimeOutGameStartCommandMsg();
+	//virtual ~NetTimeOutGameStartCommandMsg();
+
+	virtual size_t getPackedByteCount() const;
+};
diff --git a/Core/GameEngine/Include/GameNetwork/NetCommandRef.h b/Core/GameEngine/Include/GameNetwork/NetCommandRef.h
new file mode 100644
index 00000000000..33e0d46b2d9
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/NetCommandRef.h
@@ -0,0 +1,146 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "GameNetwork/NetCommandMsg.h"
+#include "Common/GameMemory.h"
+
+#if defined(RTS_DEBUG)
+//	#define DEBUG_NETCOMMANDREF
+#endif
+
+#ifdef DEBUG_NETCOMMANDREF
+#define NEW_NETCOMMANDREF(msg) newInstance(NetCommandRef)(msg, __FILE__, __LINE__)
+#else
+#define NEW_NETCOMMANDREF(msg) newInstance(NetCommandRef)(msg)
+#endif
+
+
+class NetCommandRef : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandRef, "NetCommandRef")
+public:
+#ifdef DEBUG_NETCOMMANDREF
+	NetCommandRef(NetCommandMsg *msg, char *filename, int line);
+#else
+	NetCommandRef(NetCommandMsg *msg);
+#endif
+	//~NetCommandRef();
+
+	NetCommandMsg *getCommand();
+	NetCommandRef *getNext();
+	NetCommandRef *getPrev();
+	void setNext(NetCommandRef *next);
+	void setPrev(NetCommandRef *prev);
+
+	void setRelay(UnsignedByte relay);
+	UnsignedByte getRelay() const;
+
+	time_t getTimeLastSent() const;
+	void setTimeLastSent(time_t timeLastSent);
+
+protected:
+	NetCommandMsg *m_msg;
+	NetCommandRef *m_next;
+	NetCommandRef *m_prev;
+	UnsignedByte m_relay; ///< Need this in the command reference since the relay value will be different depending on where this particular reference is being sent.
+	time_t m_timeLastSent;
+
+#ifdef DEBUG_NETCOMMANDREF
+	UnsignedInt m_id;
+#endif
+};
+
+/**
+ * Return the command message.
+ */
+inline NetCommandMsg * NetCommandRef::getCommand()
+{
+	return m_msg;
+}
+
+/**
+ * Return the next command ref in the list.
+ */
+inline NetCommandRef * NetCommandRef::getNext()
+{
+	return m_next;
+}
+
+/**
+ * Return the previous command ref in the list.
+ */
+inline NetCommandRef * NetCommandRef::getPrev()
+{
+	return m_prev;
+}
+
+/**
+ * Set the next command ref in the list.
+ */
+inline void NetCommandRef::setNext(NetCommandRef *next)
+{
+	m_next = next;
+}
+
+/**
+ * Set the previous command ref in the list.
+ */
+inline void NetCommandRef::setPrev(NetCommandRef *prev)
+{
+	m_prev = prev;
+}
+
+/**
+ * Return the time for the last time this command was sent from this reference.
+ */
+inline time_t NetCommandRef::getTimeLastSent() const
+{
+	return m_timeLastSent;
+}
+
+/**
+ * Set the time for the last time this command was sent from this reference.
+ */
+inline void NetCommandRef::setTimeLastSent(time_t timeLastSent)
+{
+	m_timeLastSent = timeLastSent;
+}
+
+/**
+ * Set the send relay for this reference of the command.
+ */
+inline void NetCommandRef::setRelay(UnsignedByte relay)
+{
+	m_relay = relay;
+}
+
+/**
+ * Return the send relay for this refreence of the command.
+ */
+inline UnsignedByte NetCommandRef::getRelay() const
+{
+	return m_relay;
+}
diff --git a/Core/GameEngine/Include/GameNetwork/NetCommandWrapperList.h b/Core/GameEngine/Include/GameNetwork/NetCommandWrapperList.h
new file mode 100644
index 00000000000..fac7ea79644
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/NetCommandWrapperList.h
@@ -0,0 +1,78 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+////// NetCommandWrapperList.h ////////////////////////////////
+// Bryan Cleveland
+
+#pragma once
+
+#include "GameNetwork/NetCommandList.h"
+
+class NetCommandWrapperListNode : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandWrapperListNode, "NetCommandWrapperListNode")
+public:
+	NetCommandWrapperListNode(NetWrapperCommandMsg *msg);
+	//virtual ~NetCommandWrapperListNode();
+
+	Bool isComplete();
+	UnsignedShort getCommandID();
+	UnsignedInt getRawDataLength();
+	void copyChunkData(NetWrapperCommandMsg *msg);
+	UnsignedByte * getRawData();
+
+	Int getPercentComplete(void);
+
+	NetCommandWrapperListNode *m_next;
+
+protected:
+	UnsignedShort m_commandID;
+	UnsignedByte *m_data;
+	UnsignedInt m_totalDataLength;
+	Bool *m_chunksPresent;
+	UnsignedInt m_numChunks;
+	UnsignedInt m_numChunksPresent;
+
+};
+
+class NetCommandWrapperList : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandWrapperList, "NetCommandWrapperList")
+public:
+	NetCommandWrapperList();
+	//virtual ~NetCommandWrapperList();
+
+	void init();
+	void reset();
+
+	void processWrapper(NetCommandRef *ref);
+	NetCommandList * getReadyCommands();
+
+	Int getPercentComplete(UnsignedShort wrappedCommandID);
+
+protected:
+	void removeFromList(NetCommandWrapperListNode *node);
+
+	NetCommandWrapperListNode *m_list;
+};
diff --git a/Core/GameEngine/Include/GameNetwork/NetPacket.h b/Core/GameEngine/Include/GameNetwork/NetPacket.h
new file mode 100644
index 00000000000..d4980a9eef0
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/NetPacket.h
@@ -0,0 +1,235 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+/*
+Ok, how this should have been done is to make each of the command types
+have a bitmask telling which command message header information
+each command type required.  That would make finding out the size of
+a particular command easier to find, without so much repetitious code.
+We would still need to have a separate function for each command type
+for the data, but at least that wouldn't be repeating code, that would
+be specialized code.
+*/
+
+#pragma once
+
+#include "NetworkDefs.h"
+
+#include "GameNetwork/NetCommandList.h"
+#include "Common/MessageStream.h"
+#include "Common/GameMemory.h"
+
+class NetPacket;
+
+typedef std::list<NetPacket *> NetPacketList;
+typedef std::list<NetPacket *>::iterator NetPacketListIter;
+
+class NetPacket : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetPacket, "NetPacket")
+public:
+	NetPacket();
+	NetPacket(TransportMessage *msg);
+	//virtual ~NetPacket();
+
+	void init();
+	void reset();
+	void setAddress(Int addr, Int port);
+	Bool addCommand(NetCommandRef *msg);
+	Int getNumCommands();
+
+	NetCommandList *getCommandList();
+
+	static NetCommandRef * ConstructNetCommandMsgFromRawData(UnsignedByte *data, UnsignedShort dataLength);
+	static NetPacketList ConstructBigCommandPacketList(NetCommandRef *ref);
+
+	UnsignedByte *getData();
+	Int getLength();
+	UnsignedInt getAddr();
+	UnsignedShort getPort();
+
+	static UnsignedInt GetBufferSizeNeededForCommand(NetCommandMsg *msg);
+	static void FillBufferWithCommand(UnsignedByte *buffer, NetCommandRef *msg);
+
+protected:
+
+	// These functions return the size of the command without any compression, repetition, etc.
+	// i.e. All of the required fields are taken into account when returning the size.
+	static UnsignedInt GetGameCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetAckCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetFrameCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetPlayerLeaveCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetRunAheadMetricsCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetRunAheadCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetDestroyPlayerCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetKeepAliveCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetDisconnectKeepAliveCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetDisconnectPlayerCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetPacketRouterQueryCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetPacketRouterAckCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetDisconnectChatCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetDisconnectVoteCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetChatCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetProgressMessageSize(NetCommandMsg *msg);
+	static UnsignedInt GetLoadCompleteMessageSize(NetCommandMsg *msg);
+	static UnsignedInt GetTimeOutGameStartMessageSize(NetCommandMsg *msg);
+	static UnsignedInt GetWrapperCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetFileCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetFileAnnounceCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetFileProgressCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetDisconnectFrameCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetDisconnectScreenOffCommandSize(NetCommandMsg *msg);
+	static UnsignedInt GetFrameResendRequestCommandSize(NetCommandMsg *msg);
+
+	static void FillBufferWithGameCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithAckCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithKeepAliveCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithDisconnectKeepAliveCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithPacketRouterQueryCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithPacketRouterAckCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithProgressMessage(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithLoadCompleteMessage(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithTimeOutGameStartMessage(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithFileMessage(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithFileProgressMessage(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithFileAnnounceMessage(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithDisconnectFrameMessage(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithDisconnectScreenOffMessage(UnsignedByte *buffer, NetCommandRef *msg);
+	static void FillBufferWithFrameResendRequestMessage(UnsignedByte *buffer, NetCommandRef *msg);
+
+	Bool addFrameCommand(NetCommandRef *msg);
+	Bool isRoomForFrameMessage(NetCommandRef *msg);
+	Bool addAckCommand(NetCommandRef *msg, UnsignedShort commandID, UnsignedByte originalPlayerID);
+	Bool addAckStage1Command(NetCommandRef *msg);
+	Bool addAckStage2Command(NetCommandRef *msg);
+	Bool addAckBothCommand(NetCommandRef *msg);
+	Bool isRoomForAckMessage(NetCommandRef *msg);
+	Bool addGameCommand(NetCommandRef *msg);
+	Bool isRoomForGameMessage(NetCommandRef *msg, GameMessage *gmsg);
+	Bool addPlayerLeaveCommand(NetCommandRef *msg);
+	Bool isRoomForPlayerLeaveMessage(NetCommandRef *msg);
+	Bool addRunAheadMetricsCommand(NetCommandRef *msg);
+	Bool isRoomForRunAheadMetricsMessage(NetCommandRef *msg);
+	Bool addRunAheadCommand(NetCommandRef *msg);
+	Bool isRoomForRunAheadMessage(NetCommandRef *msg);
+	Bool addDestroyPlayerCommand(NetCommandRef *msg);
+	Bool isRoomForDestroyPlayerMessage(NetCommandRef *msg);
+	Bool addKeepAliveCommand(NetCommandRef *msg);
+	Bool isRoomForKeepAliveMessage(NetCommandRef *msg);
+	Bool addDisconnectKeepAliveCommand(NetCommandRef *msg);
+	Bool isRoomForDisconnectKeepAliveMessage(NetCommandRef *msg);
+	Bool addDisconnectPlayerCommand(NetCommandRef *msg);
+	Bool isRoomForDisconnectPlayerMessage(NetCommandRef *msg);
+	Bool addPacketRouterQueryCommand(NetCommandRef *msg);
+	Bool isRoomForPacketRouterQueryMessage(NetCommandRef *msg);
+	Bool addPacketRouterAckCommand(NetCommandRef *msg);
+	Bool isRoomForPacketRouterAckMessage(NetCommandRef *msg);
+	Bool addDisconnectChatCommand(NetCommandRef *msg);
+	Bool isRoomForDisconnectChatMessage(NetCommandRef *msg);
+	Bool addChatCommand(NetCommandRef *msg);
+	Bool isRoomForChatMessage(NetCommandRef *msg);
+	Bool addDisconnectVoteCommand(NetCommandRef *msg);
+	Bool isRoomForDisconnectVoteMessage(NetCommandRef *msg);
+	Bool addProgressMessage( NetCommandRef *msg );
+	Bool isRoomForProgressMessage( NetCommandRef *msg );
+	Bool addLoadCompleteMessage( NetCommandRef *msg );
+	Bool isRoomForLoadCompleteMessage( NetCommandRef *msg );
+	Bool addTimeOutGameStartMessage( NetCommandRef *msg );
+	Bool isRoomForTimeOutGameStartMessage( NetCommandRef *msg );
+	Bool addWrapperCommand(NetCommandRef *msg);
+	Bool isRoomForWrapperMessage(NetCommandRef *msg);
+	Bool addFileCommand(NetCommandRef *msg);
+	Bool isRoomForFileMessage(NetCommandRef *msg);
+	Bool addFileAnnounceCommand(NetCommandRef *msg);
+	Bool isRoomForFileAnnounceMessage(NetCommandRef *msg);
+	Bool addFileProgressCommand(NetCommandRef *msg);
+	Bool isRoomForFileProgressMessage(NetCommandRef *msg);
+	Bool addDisconnectFrameCommand(NetCommandRef *msg);
+	Bool isRoomForDisconnectFrameMessage(NetCommandRef *msg);
+	Bool addDisconnectScreenOffCommand(NetCommandRef *msg);
+	Bool isRoomForDisconnectScreenOffMessage(NetCommandRef *msg);
+	Bool addFrameResendRequestCommand(NetCommandRef *msg);
+	Bool isRoomForFrameResendRequestMessage(NetCommandRef *msg);
+
+	Bool isAckRepeat(NetCommandRef *msg);
+	Bool isAckBothRepeat(NetCommandRef *msg);
+	Bool isAckStage1Repeat(NetCommandRef *msg);
+	Bool isAckStage2Repeat(NetCommandRef *msg);
+	Bool isFrameRepeat(NetCommandRef *msg);
+
+	static NetCommandMsg * readGameMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readAckBothMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readAckStage1Message(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readAckStage2Message(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readFrameMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readPlayerLeaveMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readRunAheadMetricsMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readRunAheadMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readDestroyPlayerMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readKeepAliveMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readDisconnectKeepAliveMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readDisconnectPlayerMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readPacketRouterQueryMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readPacketRouterAckMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readDisconnectChatMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readDisconnectVoteMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readChatMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readProgressMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readLoadCompleteMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readTimeOutGameStartMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readWrapperMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readFileMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readFileAnnounceMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readFileProgressMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readDisconnectFrameMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readDisconnectScreenOffMessage(UnsignedByte *data, Int &i);
+	static NetCommandMsg * readFrameResendRequestMessage(UnsignedByte *data, Int &i);
+
+	void writeGameMessageArgumentToPacket(GameMessageArgumentDataType type, GameMessageArgumentType arg);
+	static void readGameMessageArgumentFromPacket(GameMessageArgumentDataType type, NetGameCommandMsg *msg, UnsignedByte *data, Int &i);
+
+	void dumpPacketToLog();
+
+protected:
+	UnsignedByte		m_packet[MAX_PACKET_SIZE];
+	Int							m_packetLen;
+	UnsignedInt			m_addr;
+	Int							m_numCommands;
+	NetCommandRef*	m_lastCommand;
+	UnsignedInt			m_lastFrame;
+	UnsignedShort		m_port;
+	UnsignedShort		m_lastCommandID;
+	UnsignedByte		m_lastPlayerID;
+	UnsignedByte		m_lastCommandType;
+	UnsignedByte		m_lastRelay;
+};
diff --git a/Core/GameEngine/Include/GameNetwork/NetPacketStructs.h b/Core/GameEngine/Include/GameNetwork/NetPacketStructs.h
new file mode 100644
index 00000000000..35f5ce997a6
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/NetPacketStructs.h
@@ -0,0 +1,420 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// TheSuperHackers @refactor BobTista 07/10/2025
+// Packed struct definitions for network packet serialization/deserialization.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "GameNetwork/NetworkDefs.h"
+
+// Ensure structs are packed to 1-byte alignment for network protocol compatibility
+#pragma pack(push, 1)
+
+////////////////////////////////////////////////////////////////////////////////
+// Network packet field type definitions
+////////////////////////////////////////////////////////////////////////////////
+
+// Network packet field type definitions
+typedef UnsignedByte NetPacketFieldType;
+
+namespace NetPacketFieldTypes {
+	constexpr const NetPacketFieldType CommandType = 'T';		// NetCommandType field
+	constexpr const NetPacketFieldType Relay = 'R';				// Relay field
+	constexpr const NetPacketFieldType PlayerId = 'P';			// Player ID field
+	constexpr const NetPacketFieldType CommandId = 'C';			// Command ID field
+	constexpr const NetPacketFieldType Frame = 'F';				// Frame field
+	constexpr const NetPacketFieldType Data = 'D';				// Data payload field
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Common packet field structures
+////////////////////////////////////////////////////////////////////////////////
+
+// Command Type field: 'T' + UnsignedByte
+struct NetPacketCommandTypeField {
+	char header;
+	UnsignedByte commandType;
+};
+
+// Relay field: 'R' + UnsignedByte
+struct NetPacketRelayField {
+	char header;
+	UnsignedByte relay;
+};
+
+// Player ID field: 'P' + UnsignedByte
+struct NetPacketPlayerIdField {
+	char header;
+	UnsignedByte playerId;
+};
+
+// Frame field: 'F' + UnsignedInt
+struct NetPacketFrameField {
+	char header;
+	UnsignedInt frame;
+};
+
+// Command ID field: 'C' + UnsignedShort
+struct NetPacketCommandIdField {
+	char header;
+	UnsignedShort commandId;
+};
+
+// Data field header: 'D' (followed by variable-length data)
+struct NetPacketDataFieldHeader {
+	char header;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Acknowledgment Command Packets
+////////////////////////////////////////////////////////////////////////////////
+
+// ACK command packet structure
+// Fields: T + type, P + playerID, D + commandID + originalPlayerID
+struct NetPacketAckCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketPlayerIdField playerId;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedShort commandId;           // Command ID being acknowledged
+	UnsignedByte originalPlayerId;     // Original player who sent the command
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Frame Info Command Packet
+////////////////////////////////////////////////////////////////////////////////
+
+// Frame info command packet structure
+// Fields: T + type, F + frame, R + relay, P + playerID, C + commandID, D + commandCount
+struct NetPacketFrameCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketFrameField frame;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedShort commandCount;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Player Leave Command Packet
+////////////////////////////////////////////////////////////////////////////////
+
+// Player leave command packet structure
+// Fields: T + type, R + relay, F + frame, P + playerID, C + commandID, D + leavingPlayerID
+struct NetPacketPlayerLeaveCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketFrameField frame;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedByte leavingPlayerId;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Run Ahead Metrics Command Packet
+////////////////////////////////////////////////////////////////////////////////
+
+// Run ahead metrics command packet structure
+// Fields: T + type, R + relay, P + playerID, C + commandID, D + averageLatency + averageFps
+// TODO: averageFps should be UnsignedShort to match FillBufferWithRunAheadMetricsCommand, but
+// original GetRunAheadMetricsCommandSize incorrectly counted it as UnsignedByte
+struct NetPacketRunAheadMetricsCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	Real averageLatency;
+	UnsignedByte averageFps;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Run Ahead Command Packet
+////////////////////////////////////////////////////////////////////////////////
+
+// Run ahead command packet structure
+// Fields: T + type, R + relay, F + frame, P + playerID, C + commandID, D + runAhead + frameRate
+struct NetPacketRunAheadCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketFrameField frame;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedShort runAhead;
+	UnsignedByte frameRate;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Destroy Player Command Packet
+////////////////////////////////////////////////////////////////////////////////
+
+// Destroy player command packet structure
+// Fields: T + type, R + relay, F + frame, P + playerID, C + commandID, D + playerIndex
+struct NetPacketDestroyPlayerCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketFrameField frame;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedInt playerIndex;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Keep Alive Command Packet
+////////////////////////////////////////////////////////////////////////////////
+
+// Keep alive command packet structure
+// Fields: T + type, R + relay, P + playerID, D
+struct NetPacketKeepAliveCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketDataFieldHeader dataHeader;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Disconnect Keep Alive Command Packet
+////////////////////////////////////////////////////////////////////////////////
+
+// Disconnect keep alive command packet structure
+// Fields: T + type, R + relay, P + playerID, D
+struct NetPacketDisconnectKeepAliveCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketDataFieldHeader dataHeader;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Disconnect Player Command Packet
+////////////////////////////////////////////////////////////////////////////////
+
+// Disconnect player command packet structure
+// Fields: T + type, R + relay, P + playerID, C + commandID, D + slot + disconnectFrame
+struct NetPacketDisconnectPlayerCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedByte slot;
+	UnsignedInt disconnectFrame;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Packet Router Command Packets
+////////////////////////////////////////////////////////////////////////////////
+
+// Packet router query command packet
+// Fields: T + type, R + relay, P + playerID, D
+struct NetPacketRouterQueryCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketDataFieldHeader dataHeader;
+};
+
+// Packet router ack command packet
+// Fields: T + type, R + relay, P + playerID, D
+struct NetPacketRouterAckCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketDataFieldHeader dataHeader;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Disconnect Vote Command Packet
+////////////////////////////////////////////////////////////////////////////////
+
+// Disconnect vote command
+// Fields: T + type, R + relay, P + playerID, C + commandID, D + slot + voteFrame
+struct NetPacketDisconnectVoteCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedByte slot;
+	UnsignedInt voteFrame;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Packed Structs for getPackedByteCount() calculations
+// These structs represent the fixed portion of variable-length command messages
+////////////////////////////////////////////////////////////////////////////////
+
+// Chat command packed struct
+// Fixed fields: T + type, F + frame, R + relay, P + playerID, C + commandID, D
+struct NetPacketChatCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketFrameField frame;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	// Variable fields: UnsignedByte textLength + UnsignedShort text[textLength] + Int playerMask
+};
+
+// Disconnect chat command packed struct
+// Fixed fields: T + type, R + relay, P + playerID, D
+struct NetPacketDisconnectChatCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketDataFieldHeader dataHeader;
+	// Variable fields: UnsignedByte textLength + UnsignedShort text[textLength]
+};
+
+// Game command packed struct
+// Fixed fields: T + type, F + frame, R + relay, P + playerID, C + commandID, D
+struct NetPacketGameCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketFrameField frame;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	// Variable fields: game message arguments
+};
+
+// Wrapper command packet (fixed size - contains metadata about wrapped command)
+// Fields: T + type, R + relay, P + playerID, C + commandID, D + metadata
+struct NetPacketWrapperCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedShort wrappedCommandId;
+	UnsignedInt chunkNumber;
+	UnsignedInt numChunks;
+	UnsignedInt totalDataLength;
+	UnsignedInt dataLength;
+	UnsignedInt dataOffset;
+};
+
+// File command packed struct
+// Fixed fields: T + type, R + relay, P + playerID, C + commandID, D
+struct NetPacketFileCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	// Variable fields: null-terminated filename + UnsignedInt fileDataLength + file data
+};
+
+// File announce command packed struct
+// Fixed fields: T + type, R + relay, P + playerID, C + commandID, D
+struct NetPacketFileAnnounceCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	// Variable fields: null-terminated filename + UnsignedShort fileID + UnsignedByte playerMask
+};
+
+// File progress command packet
+// Fields: T + type, R + relay, P + playerID, C + commandID, D + fileID + progress
+struct NetPacketFileProgressCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedShort fileId;
+	Int progress;
+};
+
+// Progress message packet
+// Fields: T + type, R + relay, P + playerID, D + percentage
+struct NetPacketProgressMessage {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedByte percentage;
+};
+
+// Load complete message packet
+// Fields: T + type, R + relay, P + playerID, D
+// TODO: commandId field is missing. FillBufferWithLoadCompleteMessage writes it, but
+// original GetLoadCompleteMessageSize did not count it
+struct NetPacketLoadCompleteMessage {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketDataFieldHeader dataHeader;
+};
+
+// Timeout game start message packet
+// Fields: T + type, R + relay, P + playerID, D
+// TODO: commandId field is missing. FillBufferWithTimeOutGameStartMessage writes it, but
+// original GetTimeOutGameStartMessageSize did not count it
+struct NetPacketTimeOutGameStartMessage {
+	NetPacketCommandTypeField commandType;
+	NetPacketRelayField relay;
+	NetPacketPlayerIdField playerId;
+	NetPacketDataFieldHeader dataHeader;
+};
+
+// Disconnect frame command packet
+// Fields: T + type, P + playerID, C + commandID, R + relay, D + disconnectFrame
+struct NetPacketDisconnectFrameCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketRelayField relay;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedInt disconnectFrame;
+};
+
+// Disconnect screen off command packet
+// Fields: T + type, P + playerID, C + commandID, R + relay, D + newFrame
+struct NetPacketDisconnectScreenOffCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketRelayField relay;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedInt newFrame;
+};
+
+// Frame resend request command packet
+// Fields: T + type, P + playerID, C + commandID, R + relay, D + frameToResend
+struct NetPacketFrameResendRequestCommand {
+	NetPacketCommandTypeField commandType;
+	NetPacketPlayerIdField playerId;
+	NetPacketCommandIdField commandId;
+	NetPacketRelayField relay;
+	NetPacketDataFieldHeader dataHeader;
+	UnsignedInt frameToResend;
+};
+
+// Restore normal struct packing
+#pragma pack(pop)
diff --git a/Core/GameEngine/Include/GameNetwork/NetworkDefs.h b/Core/GameEngine/Include/GameNetwork/NetworkDefs.h
new file mode 100644
index 00000000000..171f33df3d1
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/NetworkDefs.h
@@ -0,0 +1,210 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Lib/BaseType.h"
+#include "Common/MessageStream.h"
+
+static const Int WOL_NAME_LEN = 64;
+
+/// Max number of commands per frame
+static const Int MAX_COMMANDS = 256;
+
+extern Int MIN_LOGIC_FRAMES;
+extern Int MAX_FRAMES_AHEAD;
+extern Int MIN_RUNAHEAD;
+
+// FRAME_DATA_LENGTH needs to be MAX_FRAMES_AHEAD+1 because a player on a different
+// computer can send commands for a frame that is one beyond twice the max runahead.
+extern Int FRAME_DATA_LENGTH;
+extern Int FRAMES_TO_KEEP;
+
+// This is the connection numbering: 1-8 are for players, 9 is a broadcast con.
+enum ConnectionNumbers CPP_11(: Int)
+{
+	MAX_PLAYER = 7,			// The index of the highest possible player number.  This is 0 based, so the most players allowed in a game is MAX_PLAYER+1.
+	NUM_CONNECTIONS
+};
+
+static const Int MAX_SLOTS = MAX_PLAYER+1;
+
+// UDP (8 bytes) + IP header (28 bytes) = 36 bytes total.  We want a total packet size of 512, so 512 - 36 = 476
+static const Int MAX_PACKET_SIZE = 476;
+
+/**
+ * Command packet - contains frame #, total # of commands, and each command.  This is what gets sent
+ * to each player every frame
+ */
+#define MAX_MESSAGE_LEN 1024
+#define MAX_MESSAGES 128
+static const Int numCommandsPerCommandPacket = (MAX_MESSAGE_LEN - sizeof(UnsignedInt) - sizeof(UnsignedShort))/sizeof(GameMessage);
+#pragma pack(push, 1)
+struct CommandPacket
+{
+	UnsignedInt m_frame;
+	UnsignedShort m_numCommands;
+	unsigned char m_commands[numCommandsPerCommandPacket * sizeof(GameMessage)];
+};
+#pragma pack(pop)
+
+#define MAX_TRANSPORT_STATISTICS_SECONDS 30
+
+#pragma pack(push, 1)
+struct TransportMessageHeader
+{
+	UnsignedInt crc;											///< packet-level CRC (must be first in packet)
+	UnsignedShort magic;									///< Magic number identifying Generals packets
+//	Int id;
+//	NetMessageFlags flags;
+};
+#pragma pack(pop)
+
+/**
+ * Transport message - encapsulating info kept by the transport layer about each
+ * packet.  These structs make up the in/out buffers at the transport layer.
+ */
+#pragma pack(push, 1)
+struct TransportMessage
+{
+	TransportMessageHeader header;
+	UnsignedByte data[MAX_MESSAGE_LEN];
+	Int length;
+	UnsignedInt addr;
+	UnsignedShort port;
+};
+#pragma pack(pop)
+
+#if defined(RTS_DEBUG)
+#pragma pack(push, 1)
+struct DelayedTransportMessage
+{
+	UnsignedInt deliveryTime;
+	TransportMessage message;
+};
+#pragma pack(pop)
+#endif
+
+/**
+ * Message types
+ */
+enum NetMessageFlag CPP_11(: Int) {
+	MSG_ACK = 1,
+	MSG_NEEDACK = 2,
+	MSG_SEQUENCED = 4,
+	MSG_SUPERCEDING = 8
+};
+typedef UnsignedByte NetMessageFlags;
+
+enum NetCommandType CPP_11(: Int) {
+	NETCOMMANDTYPE_UNKNOWN = -1,
+	NETCOMMANDTYPE_ACKBOTH = 0,
+	NETCOMMANDTYPE_ACKSTAGE1,
+	NETCOMMANDTYPE_ACKSTAGE2,
+	NETCOMMANDTYPE_FRAMEINFO,
+	NETCOMMANDTYPE_GAMECOMMAND,
+	NETCOMMANDTYPE_PLAYERLEAVE,
+	NETCOMMANDTYPE_RUNAHEADMETRICS,
+	NETCOMMANDTYPE_RUNAHEAD,
+	NETCOMMANDTYPE_DESTROYPLAYER,
+	NETCOMMANDTYPE_KEEPALIVE,
+	NETCOMMANDTYPE_DISCONNECTCHAT,
+	NETCOMMANDTYPE_CHAT,
+	NETCOMMANDTYPE_MANGLERQUERY,
+	NETCOMMANDTYPE_MANGLERRESPONSE,
+	NETCOMMANDTYPE_PROGRESS,
+	NETCOMMANDTYPE_LOADCOMPLETE,
+	NETCOMMANDTYPE_TIMEOUTSTART,
+	NETCOMMANDTYPE_WRAPPER,							// A wrapper command that holds a command thats too big to fit in a single packet.
+	NETCOMMANDTYPE_FILE,
+	NETCOMMANDTYPE_FILEANNOUNCE,
+	NETCOMMANDTYPE_FILEPROGRESS,
+	NETCOMMANDTYPE_FRAMERESENDREQUEST,
+
+	// Disconnect menu command section.
+	NETCOMMANDTYPE_DISCONNECTSTART,
+	NETCOMMANDTYPE_DISCONNECTKEEPALIVE,
+	NETCOMMANDTYPE_DISCONNECTPLAYER,
+	NETCOMMANDTYPE_PACKETROUTERQUERY,
+	NETCOMMANDTYPE_PACKETROUTERACK,
+	NETCOMMANDTYPE_DISCONNECTVOTE,
+	NETCOMMANDTYPE_DISCONNECTFRAME,
+	NETCOMMANDTYPE_DISCONNECTSCREENOFF,
+	NETCOMMANDTYPE_DISCONNECTEND,
+};
+
+enum NetLocalStatus CPP_11(: Int) {
+	NETLOCALSTATUS_PREGAME = 0,
+	NETLOCALSTATUS_INGAME,
+	NETLOCALSTATUS_LEAVING,
+	NETLOCALSTATUS_LEFT,
+	NETLOCALSTATUS_POSTGAME
+};
+
+enum PlayerLeaveCode CPP_11(: Int) {
+	PLAYERLEAVECODE_CLIENT = 0,
+	PLAYERLEAVECODE_LOCAL,
+	PLAYERLEAVECODE_PACKETROUTER,
+	PLAYERLEAVECODE_UNKNOWN
+};
+
+// Magic number for identifying a Generals packet.
+static const UnsignedShort GENERALS_MAGIC_NUMBER = 0xF00D;
+
+// The number of fps history entries.
+//static const Int NETWORK_FPS_HISTORY_LENGTH = 30;
+
+// The number of ping history entries.
+//static const Int NETWORK_LATENCY_HISTORY_LENGTH = 200;
+
+// The number of miliseconds between run ahead metrics things
+//static const Int NETWORK_RUN_AHEAD_METRICS_TIME = 5000;
+
+// The number of cushion values to keep.
+//static const Int NETWORK_CUSHION_HISTORY_LENGTH = 10;
+
+// The amount of slack in the run ahead value.  This is the percentage of the calculated run ahead that is added.
+//static const Int NETWORK_RUN_AHEAD_SLACK = 20;
+
+// The number of seconds between when the connections to each player send a keep-alive packet.
+// This should be less than 30 just to keep firewall ports open.
+//static const Int NETWORK_KEEPALIVE_DELAY = 20;
+
+// The number of milliseconds between when the game gets stuck on a frame for a network stall and
+// and when the disconnect dialog comes up.
+//static const Int NETWORK_DISCONNECT_TIME = 5000;
+
+// The number of miliseconds between when a player's last disconnect keep alive command
+// was recieved and when they are considered disconnected from the game.
+//static const Int NETWORK_PLAYER_TIMEOUT_TIME = 60000;
+
+// The base port number used for the transport socket.  A players slot number is added to this
+// value to get their actual port number.
+static const Int NETWORK_BASE_PORT_NUMBER = 8088;
+
+// the singleton
+class NetworkInterface;
+extern NetworkInterface *TheNetwork;
+
+#define PRINTF_IP_AS_4_INTS(ip) ((ip) >> 24) & 0xff, ((ip) >> 16) & 0xff, ((ip) >> 8 ) & 0xff, (ip) & 0xff
diff --git a/Core/GameEngine/Include/GameNetwork/NetworkInterface.h b/Core/GameEngine/Include/GameNetwork/NetworkInterface.h
new file mode 100644
index 00000000000..c0bf655eb64
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/NetworkInterface.h
@@ -0,0 +1,136 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// NetworkInterface.h ///////////////////////////////////////////////////////////////
+// Network singleton class - defines interface to Network methods
+// Author: Matthew D. Campbell, July 2001
+
+#pragma once
+
+#include "Common/MessageStream.h"
+#include "GameNetwork/ConnectionManager.h"
+#include "GameNetwork/User.h"
+#include "GameNetwork/NetworkDefs.h"
+
+// forward declarations
+
+struct CommandPacket;
+class GameMessage;
+class GameInfo;
+
+void ClearCommandPacket(UnsignedInt frame);										///< ClearCommandPacket clears the command packet at the start of the frame.
+CommandPacket *GetCommandPacket(void);											///< TheNetwork calls GetCommandPacket to get commands to send.
+
+
+
+/**
+ * Interface definition for the Network.
+ */
+class NetworkInterface : public SubsystemInterface
+{
+protected:
+
+public:
+	virtual ~NetworkInterface() { };
+
+	static NetworkInterface * createNetwork( void );
+
+	//---------------------------------------------------------------------------------------
+	// SubsystemInterface functions
+	virtual void init( void ) = 0;																		///< Initialize the network
+	virtual void reset( void ) = 0;																		///< Re-initialize the network
+	virtual void update( void ) = 0;																	///< Updates the network
+	virtual void liteupdate( void ) = 0;															///< does a lightweight update for passing messages around.
+
+	virtual void setLocalAddress(UnsignedInt ip, UnsignedInt port) = 0;	///< Tell the network what local ip and port to bind to.
+	virtual Bool isFrameDataReady( void ) = 0;												///< Are the commands for the next frame available?
+	virtual Bool isStalling() = 0;
+	virtual void parseUserList( const GameInfo *game ) = 0;						///< Parse a userlist, creating connections
+	virtual void startGame(void) = 0;																	///< Sets the network game frame counter to -1
+	virtual UnsignedInt getRunAhead(void) = 0;												///< Get the current RunAhead value
+	virtual UnsignedInt getFrameRate(void) = 0;												///< Get the current allowed frame rate.
+	virtual UnsignedInt getPacketArrivalCushion(void) = 0;						///< Get the smallest packet arrival cushion since this was last called.
+
+	// Chat functions
+	virtual void sendChat(UnicodeString text, Int playerMask) = 0;		///< Send a chat line using the normal system.
+	virtual void sendDisconnectChat(UnicodeString text) = 0;					///< Send a chat line using the disconnect manager.
+
+	virtual void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID) = 0;
+	virtual UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask) = 0;
+	virtual Int getFileTransferProgress(Int playerID, AsciiString path) = 0;
+	virtual Bool areAllQueuesEmpty(void) = 0;
+
+	virtual void quitGame() = 0;																			///< Quit the game right now.
+
+	virtual void selfDestructPlayer(Int index) = 0;
+
+	virtual void voteForPlayerDisconnect(Int slot) = 0;								///< register a vote towards this player's disconnect.
+	virtual Bool isPacketRouter( void ) = 0;
+
+	// Bandwidth metrics
+	virtual Real getIncomingBytesPerSecond( void ) = 0;
+	virtual Real getIncomingPacketsPerSecond( void ) = 0;
+	virtual Real getOutgoingBytesPerSecond( void ) = 0;
+	virtual Real getOutgoingPacketsPerSecond( void ) = 0;
+	virtual Real getUnknownBytesPerSecond( void ) = 0;
+	virtual Real getUnknownPacketsPerSecond( void ) = 0;
+
+	virtual void updateLoadProgress( Int percent ) = 0;
+	virtual void loadProgressComplete( void ) = 0;
+	virtual void sendTimeOutGameStart( void ) = 0;
+	virtual UnsignedInt getLocalPlayerID()= 0;
+	virtual UnicodeString getPlayerName(Int playerNum)= 0;
+	virtual Int getNumPlayers() = 0;
+
+	virtual Int getAverageFPS() = 0;
+	virtual Int getSlotAverageFPS(Int slot) = 0;
+
+	virtual void attachTransport(Transport *transport) = 0;
+	virtual void initTransport() = 0;
+	virtual Bool sawCRCMismatch() = 0;
+	virtual void setSawCRCMismatch() = 0;
+
+	virtual Bool isPlayerConnected(Int playerID) = 0;
+
+	virtual void notifyOthersOfCurrentFrame() = 0;					///< Tells all the other players what frame we are on.
+	virtual void notifyOthersOfNewFrame(UnsignedInt frame) = 0;							///< Tells all the other players that we are on a new frame.
+
+	virtual Int  getExecutionFrame() = 0;																			///< Returns the next valid frame for simultaneous command execution.
+
+#if defined(RTS_DEBUG)
+	virtual void toggleNetworkOn( void ) = 0;													///< toggle whether or not to send network traffic.
+#endif
+
+	// For disconnect blame assignment
+	virtual UnsignedInt getPingFrame() = 0;
+	virtual Int getPingsSent() = 0;
+	virtual Int getPingsRecieved() = 0;
+};
+
+
+/**
+ * ResolveIP turns a string ("games2.westwood.com", or "192.168.0.1") into
+ * a 32-bit unsigned integer.
+ */
+UnsignedInt ResolveIP(AsciiString host);
diff --git a/Core/GameEngine/Include/GameNetwork/RankPointValue.h b/Core/GameEngine/Include/GameNetwork/RankPointValue.h
new file mode 100644
index 00000000000..a2f616a2f56
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/RankPointValue.h
@@ -0,0 +1,100 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: RankPointValue.h /////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+//	created:	Sep 2002
+//
+//	Filename: 	RankPointValue.h
+//
+//	author:		Chris Huybregts
+//
+//	purpose:
+//
+//-----------------------------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+//-----------------------------------------------------------------------------
+// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// USER INCLUDES //////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// FORWARD REFERENCES /////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+class Image;
+class PSPlayerStats;
+//-----------------------------------------------------------------------------
+// TYPE DEFINES ///////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+enum
+{
+	RANK_PRIVATE = 0,
+	RANK_CORPORAL,
+	RANK_SERGEANT,
+	RANK_LIEUTENANT,
+	RANK_CAPTAIN,
+	RANK_MAJOR,
+	RANK_COLONEL,
+	RANK_BRIGADIER_GENERAL,
+	RANK_GENERAL,
+	RANK_COMMANDER_IN_CHIEF,
+
+	MAX_RANKS
+};
+
+struct RankPoints
+{
+RankPoints(void );
+	Int m_ranks[MAX_RANKS];
+	Real m_winMultiplier;
+	Real m_lostMultiplier;
+	Real m_hourSpentOnlineMultiplier;
+	Real m_completedSoloCampaigns;
+	Real m_disconnectMultiplier;
+};
+//-----------------------------------------------------------------------------
+// INLINING ///////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// EXTERNALS //////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+Int CalculateRank( const PSPlayerStats& stats );
+Int GetFavoriteSide( const PSPlayerStats& stats );
+const Image* LookupSmallRankImage(Int side, Int rankPoints);
+extern RankPoints *TheRankPointValues;
diff --git a/Core/GameEngine/Include/GameNetwork/Transport.h b/Core/GameEngine/Include/GameNetwork/Transport.h
new file mode 100644
index 00000000000..bb3caff847c
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/Transport.h
@@ -0,0 +1,100 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// Transport.h ///////////////////////////////////////////////////////////////
+// Transport layer - a thin layer around a UDP socket, with queues.
+// Author: Matthew D. Campbell, July 2001
+
+#pragma once
+
+#include "GameNetwork/udp.h"
+#include "GameNetwork/NetworkDefs.h"
+
+/**
+ * The transport layer handles the UDP socket for the game, and will packetize and
+ * de-packetize multiple ACK/CommandPacket/etc packets into larger aggregates.
+ */
+// we only ever allocate one of there, and it is quite large, so we really DON'T want
+// it to be a MemoryPoolObject (srj)
+class Transport //: public MemoryPoolObject
+{
+	//MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Transport, "Transport")
+public:
+
+	Transport();
+	~Transport();
+
+	Bool init( AsciiString ip, UnsignedShort port );
+	Bool init( UnsignedInt ip, UnsignedShort port );
+	void reset( void );
+	Bool update( void );									///< Call this once a GameEngine tick, regardless of whether the frame advances.
+
+	Bool doRecv( void );		///< call this to service the receive packets
+	Bool doSend( void );		///< call this to service the send queue.
+
+	Bool queueSend(UnsignedInt addr, UnsignedShort port, const UnsignedByte *buf, Int len /*,
+		NetMessageFlags flags, Int id */);				///< Queue a packet for sending to the specified address and port.  This will be sent on the next update() call.
+
+	Bool allowBroadcasts(Bool val) { if (!m_udpsock) return false; return (m_udpsock->AllowBroadcasts(val))?true:false; }
+
+	// Latency insertion and packet loss
+	void setLatency( Bool val ) { m_useLatency = val; }
+	void setPacketLoss( Bool val ) { m_usePacketLoss = val; }
+
+	// Bandwidth metrics
+	Real getIncomingBytesPerSecond( void );
+	Real getIncomingPacketsPerSecond( void );
+	Real getOutgoingBytesPerSecond( void );
+	Real getOutgoingPacketsPerSecond( void );
+	Real getUnknownBytesPerSecond( void );
+	Real getUnknownPacketsPerSecond( void );
+
+	TransportMessage m_outBuffer[MAX_MESSAGES];
+	TransportMessage m_inBuffer[MAX_MESSAGES];
+
+#if defined(RTS_DEBUG)
+	DelayedTransportMessage m_delayedInBuffer[MAX_MESSAGES];
+#endif
+
+	UnsignedShort m_port;
+private:
+	Bool m_winsockInit;
+	UDP *m_udpsock;
+
+	// Latency insertion and packet loss
+	Bool m_useLatency;
+	Bool m_usePacketLoss;
+
+	// Bandwidth metrics
+	UnsignedInt m_incomingBytes[MAX_TRANSPORT_STATISTICS_SECONDS];
+	UnsignedInt m_unknownBytes[MAX_TRANSPORT_STATISTICS_SECONDS];
+	UnsignedInt m_outgoingBytes[MAX_TRANSPORT_STATISTICS_SECONDS];
+	UnsignedInt m_incomingPackets[MAX_TRANSPORT_STATISTICS_SECONDS];
+	UnsignedInt m_unknownPackets[MAX_TRANSPORT_STATISTICS_SECONDS];
+	UnsignedInt m_outgoingPackets[MAX_TRANSPORT_STATISTICS_SECONDS];
+	Int m_statisticsSlot;
+	UnsignedInt m_lastSecond;
+
+	Bool isGeneralsPacket( TransportMessage *msg );
+};
diff --git a/Core/GameEngine/Include/GameNetwork/User.h b/Core/GameEngine/Include/GameNetwork/User.h
new file mode 100644
index 00000000000..d37ec9a52e7
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/User.h
@@ -0,0 +1,57 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * User class used by the network.
+ */
+
+#pragma once
+
+#include "GameNetwork/NetworkDefs.h"
+#include "Common/UnicodeString.h"
+
+class User : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(User, "User")
+public:
+	User() {}
+	User(UnicodeString name, UnsignedInt addr, UnsignedInt port);
+	User &operator= (const User *other);
+	Bool operator== (const User *other);
+	Bool operator!= (const User *other);
+
+	UnicodeString GetName() { return m_name; }
+	void setName(UnicodeString name);
+	UnsignedShort GetPort() { return m_port; }
+	UnsignedInt GetIPAddr() { return m_ipaddr; }
+	void SetPort(UnsignedShort port) { m_port = port; }
+	void SetIPAddr(UnsignedInt ipaddr) { m_ipaddr = ipaddr; }
+
+
+private:
+	UnicodeString m_name;
+	UnsignedShort m_port;
+	UnsignedInt m_ipaddr;
+};
+EMPTY_DTOR(User)
diff --git a/Core/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h b/Core/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h
new file mode 100644
index 00000000000..e87de2eb6c2
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h
@@ -0,0 +1,103 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// FEBDispatch class is a template class which, when inherited from, can implement the
+// IDispatch for a COM object with a type library.
+//
+
+#pragma once
+
+#include <atlbase.h>
+extern CComModule _Module;
+#include <atlcom.h>
+#include <comutil.h>    // For _bstr_t.
+
+#include "oleauto.h"
+
+template <class T, class C, const IID *I>
+class FEBDispatch :
+public CComObjectRootEx<CComSingleThreadModel>,
+public CComCoClass<T>,
+public C
+{
+public:
+
+	BEGIN_COM_MAP(T)
+		COM_INTERFACE_ENTRY(C)
+		COM_INTERFACE_ENTRY_AGGREGATE(IID_IDispatch, m_dispatch)
+	END_COM_MAP()
+
+		FEBDispatch()
+	{
+		m_ptinfo = NULL;
+		m_dispatch = NULL;
+
+		ITypeLib *ptlib;
+		HRESULT hr;
+		HRESULT TypeLibraryLoadResult;
+		char filename[256];
+
+		GetModuleFileName(NULL, filename, sizeof(filename));
+		_bstr_t bstr(filename);
+
+		TypeLibraryLoadResult = LoadTypeLib(bstr, &ptlib);
+
+		DEBUG_ASSERTCRASH(TypeLibraryLoadResult == 0, ("Can't load type library for Embedded Browser"));
+
+		if (TypeLibraryLoadResult == S_OK)
+		{
+			hr = ptlib->GetTypeInfoOfGuid(*I, &m_ptinfo);
+			ptlib->Release();
+
+			if (hr == S_OK)
+			{
+				hr = CreateStdDispatch(static_cast<IUnknown*>(this), static_cast<C*>(this), m_ptinfo, &m_dispatch);
+
+				m_dispatch->AddRef();
+				// Don't release the IUnknown from CreateStdDispatch without calling AddRef.
+				// It looks like CreateStdDispatch doesn't call AddRef on the IUnknown it returns.
+			}
+		}
+
+		if ( m_dispatch == NULL )
+		{
+			DEBUG_LOG(("Error creating Dispatch for Web interface"));
+		}
+	}
+
+	virtual ~FEBDispatch()
+	{
+		if (m_ptinfo)
+			m_ptinfo->Release();
+
+		if (m_dispatch)
+			m_dispatch->Release();
+	}
+
+	IUnknown *m_dispatch;
+
+private:
+	ITypeInfo *m_ptinfo;
+};
diff --git a/Core/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/Core/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
new file mode 100644
index 00000000000..0338aad5aa3
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
@@ -0,0 +1,124 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+/******************************************************************************
+*
+* NAME
+*     $Archive:  $
+*
+* DESCRIPTION
+*     Web Browser
+*
+* PROGRAMMER
+*     Bryan Cleveland
+*     $Author:  $
+*
+* VERSION INFO
+*     $Revision:  $
+*     $Modtime:  $
+*
+******************************************************************************/
+
+#pragma once
+
+#include "Common/SubsystemInterface.h"
+#include <atlbase.h>
+#include <windows.h>
+#include <Common/GameMemory.h>
+#include "EABrowserDispatch/BrowserDispatch.h"
+#include "FEBDispatch.h"
+#include <Lib/BaseType.h>
+
+class GameWindow;
+
+class WebBrowserURL : public MemoryPoolObject
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( WebBrowserURL, "WebBrowserURL" )
+
+public:
+
+	WebBrowserURL();
+	// virtual destructor prototype defined by memory pool object
+
+	const FieldParse *getFieldParse( void ) const { return m_URLFieldParseTable; }
+
+	AsciiString m_tag;
+	AsciiString m_url;
+
+	WebBrowserURL *m_next;
+
+	static const FieldParse m_URLFieldParseTable[];		///< the parse table for INI definition
+
+};
+
+
+
+class WebBrowser :
+		public FEBDispatch<WebBrowser, IBrowserDispatch, &IID_IBrowserDispatch>,
+		public SubsystemInterface
+	{
+	public:
+		void init( void );
+		void reset( void );
+		void update( void );
+
+		// Create an instance of the embedded browser for Dune Emperor.
+		virtual Bool createBrowserWindow(const char *tag, GameWindow *win) = 0;
+		virtual void closeBrowserWindow(GameWindow *win) = 0;
+
+		WebBrowserURL *makeNewURL(AsciiString tag);
+		WebBrowserURL *findURL(AsciiString tag);
+
+	protected:
+		// Protected to prevent direct construction via new, use CreateInstance() instead.
+		WebBrowser();
+		virtual ~WebBrowser();
+
+		// Protected to prevent copy and assignment
+		WebBrowser(const WebBrowser&);
+		const WebBrowser& operator=(const WebBrowser&);
+
+//		Bool RetrievePageURL(const char* page, char* url, int size);
+//		Bool RetrieveHTMLPath(char* path, int size);
+
+	protected:
+		ULONG mRefCount;
+		WebBrowserURL *m_urlList;
+
+	//---------------------------------------------------------------------------
+	// IUnknown methods
+	//---------------------------------------------------------------------------
+	protected:
+		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) IUNKNOWN_NOEXCEPT;
+		ULONG STDMETHODCALLTYPE AddRef(void) IUNKNOWN_NOEXCEPT;
+		ULONG STDMETHODCALLTYPE Release(void) IUNKNOWN_NOEXCEPT;
+
+	//---------------------------------------------------------------------------
+	// IBrowserDispatch methods
+	//---------------------------------------------------------------------------
+	public:
+		STDMETHOD(TestMethod)(Int num1);
+	};
+
+extern CComObject<WebBrowser> *TheWebBrowser;
diff --git a/Core/GameEngine/Include/GameNetwork/networkutil.h b/Core/GameEngine/Include/GameNetwork/networkutil.h
new file mode 100644
index 00000000000..944e2ce0a60
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/networkutil.h
@@ -0,0 +1,54 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "GameNetwork/NetworkDefs.h"
+#include "GameNetwork/NetworkInterface.h"
+
+UnsignedInt AssembleIp(UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedByte d);
+UnsignedInt ResolveIP(AsciiString host);
+UnsignedShort GenerateNextCommandID();
+Bool DoesCommandRequireACommandID(NetCommandType type);
+Bool CommandRequiresAck(NetCommandMsg *msg);
+Bool CommandRequiresDirectSend(NetCommandMsg *msg);
+Bool IsCommandSynchronized(NetCommandType type);
+const char* GetNetCommandTypeAsString(NetCommandType type);
+
+#ifdef DEBUG_LOGGING
+extern "C" {
+void dumpBufferToLog(const void *vBuf, Int len, const char *fname, Int line);
+};
+#define LOGBUFFER(buf, len) dumpBufferToLog(buf, len, __FILE__, __LINE__)
+#else
+#define LOGBUFFER(buf, len) {}
+#endif // DEBUG_LOGGING
+
+inline UnsignedInt AssembleIp(UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedByte d)
+{
+    return ((UnsignedInt)(a) << 24) |
+           ((UnsignedInt)(b) << 16) |
+           ((UnsignedInt)(c) << 8) |
+           ((UnsignedInt)(d));
+}
diff --git a/Core/GameEngine/Include/GameNetwork/udp.h b/Core/GameEngine/Include/GameNetwork/udp.h
new file mode 100644
index 00000000000..38ae9d3d1fe
--- /dev/null
+++ b/Core/GameEngine/Include/GameNetwork/udp.h
@@ -0,0 +1,125 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#ifdef _UNIX
+#include <errno.h>
+#endif
+
+#ifdef _WIN32
+#include <winsock.h>
+#include <io.h>
+//#define close _close
+//#define read  _read
+//#define write _write
+
+#else  //UNIX
+#include <netdb.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <fcntl.h>
+#include <limits.h>
+#endif
+
+#ifdef AIX
+#include <sys/select.h>
+#endif
+
+#include "Lib/BaseType.h"
+
+#define DEFAULT_PROTOCOL 0
+
+//#include "wlib/wstypes.h"
+//#include "wlib/wtime.h"
+
+class UDP
+{
+ // DATA
+ private:
+  Int       fd;
+  UnsignedInt       myIP;
+  UnsignedShort       myPort;
+  struct       sockaddr_in  addr;
+
+ public:
+  // These defines specify a system independent way to
+  //   get error codes for socket services.
+  enum sockStat CPP_11(: Int)
+  {
+    OK           =  0,     // Everything's cool
+    UNKNOWN      = -1,     // There was an error of unknown type
+    ISCONN       = -2,     // The socket is already connected
+    INPROGRESS   = -3,     // The socket is non-blocking and the operation
+                           //   isn't done yet
+    ALREADY      = -4,     // The socket is already attempting a connection
+                           //   but isn't done yet
+    AGAIN        = -5,     // Try again.
+    ADDRINUSE    = -6,     // Address already in use
+    ADDRNOTAVAIL = -7,     // That address is not available on the remote host
+    BADF         = -8,     // Not a valid FD
+    CONNREFUSED  = -9,     // Connection was refused
+    INTR         =-10,     // Operation was interrupted
+    NOTSOCK      =-11,     // FD wasn't a socket
+    PIPE         =-12,     // That operation just made a SIGPIPE
+    WOULDBLOCK   =-13,     // That operation would block
+    INVAL        =-14,     // Invalid
+    TIMEDOUT     =-15      // Timeout
+  };
+
+// CODE
+ private:
+  Int           SetBlocking(Int block);
+
+	Int m_lastError;
+
+ public:
+                   UDP();
+                  ~UDP();
+  Int           Bind(UnsignedInt IP,UnsignedShort port);
+  Int           Bind(const char *Host,UnsignedShort port);
+  Int           Write(const unsigned char *msg,UnsignedInt len,UnsignedInt IP,UnsignedShort port);
+  Int           Read(unsigned char *msg,UnsignedInt len,sockaddr_in *from);
+  sockStat         GetStatus(void);
+  void             ClearStatus(void);
+  //int              Wait(Int sec,Int usec,fd_set &returnSet);
+  //int              Wait(Int sec,Int usec,fd_set &givenSet,fd_set &returnSet);
+
+  Int             getLocalAddr(UnsignedInt &ip, UnsignedShort &port);
+  Int           getFD(void) { return(fd); }
+
+  Int             SetInputBuffer(UnsignedInt bytes);
+  Int             SetOutputBuffer(UnsignedInt bytes);
+  int              GetInputBuffer(void);
+  int              GetOutputBuffer(void);
+	Int						AllowBroadcasts(Bool status);
+};
+
+#ifdef DEBUG_LOGGING
+AsciiString GetWSAErrorString( Int error );
+#endif
diff --git a/Core/GameEngine/Source/Common/AddonCompat.cpp b/Core/GameEngine/Source/Common/AddonCompat.cpp
new file mode 100644
index 00000000000..6d88feb47d6
--- /dev/null
+++ b/Core/GameEngine/Source/Common/AddonCompat.cpp
@@ -0,0 +1,36 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "PreRTS.h"
+
+#include "Common/AddonCompat.h"
+#include "Common/FileSystem.h"
+
+namespace addon
+{
+Bool HasFullviewportDat()
+{
+	Char value = '0';
+	if (File* file = TheFileSystem->openFile("GenTool/fullviewport.dat", File::READ | File::BINARY))
+	{
+		file->read(&value, 1);
+	}
+	return value != '0';
+}
+
+} // namespace addon
diff --git a/Core/GameEngine/Source/Common/Audio/AudioEventRTS.cpp b/Core/GameEngine/Source/Common/Audio/AudioEventRTS.cpp
new file mode 100644
index 00000000000..c15c26a570e
--- /dev/null
+++ b/Core/GameEngine/Source/Common/Audio/AudioEventRTS.cpp
@@ -0,0 +1,842 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: AudioEventRTS.cpp
+/*---------------------------------------------------------------------------*/
+/* EA Pacific                                                                */
+/* Confidential Information	                                                 */
+/* Copyright (C) 2001 - All Rights Reserved                                  */
+/* DO NOT DISTRIBUTE                                                         */
+/*---------------------------------------------------------------------------*/
+/* Project:    RTS3                                                          */
+/* File name:  AudioEventRTS.cpp                                             */
+/* Created:    John K. McDonald, Jr., 3/21/2002                              */
+/* Desc:       AudioEventRTS constructors and assignment operator, etc.      */
+/* Revision History:                                                         */
+/*		3/21/2002 : Initial creation                                           */
+/*---------------------------------------------------------------------------*/
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/AudioEventRTS.h"
+
+#include "Common/AudioEventInfo.h"
+#include "Common/AudioRandomValue.h"
+#include "Common/AudioSettings.h"
+#include "Common/file.h"
+#include "Common/FileSystem.h"
+#include "Common/GameSounds.h"
+#include "Common/GlobalData.h"
+#include "Common/Player.h"
+#include "Common/Registry.h"
+
+#include "GameLogic/GameLogic.h"	// For getObjectByID
+#include "GameLogic/LogicRandomValue.h"
+#include "GameLogic/Object.h"
+
+#include "GameClient/Drawable.h"	// For getPosition
+#include "GameClient/GameClient.h"	// For getDrawableByID
+
+
+//-------------------------------------------------------------------------------------------------
+AudioEventRTS::AudioEventRTS()
+									: m_eventName(AsciiString::TheEmptyString),
+										m_priority(AP_NORMAL),
+										m_volume(-1.0),
+										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
+										m_ownerType(OT_INVALID),
+										m_shouldFade(false),
+										m_isLogicalAudio(false),
+										m_filenameToLoad(AsciiString::TheEmptyString),
+										m_eventInfo(NULL),
+										m_playingHandle(0),
+										m_killThisHandle(0),
+										m_pitchShift(1.0),
+										m_volumeShift(0.0),
+										m_loopCount(1),
+										m_playingAudioIndex(-1),
+										m_allCount(0),
+										m_playerIndex(-1),
+										m_delay(0.0f),
+										m_uninterruptable(FALSE)
+{
+	m_attackName.clear();
+	m_decayName.clear();
+	m_positionOfAudio.zero();
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioEventRTS::AudioEventRTS( const AsciiString& eventName )
+									: m_eventName(eventName),
+										m_priority(AP_NORMAL),
+										m_volume(-1.0),
+										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
+										m_ownerType(OT_INVALID),
+										m_shouldFade(false),
+										m_isLogicalAudio(false),
+										m_filenameToLoad(AsciiString::TheEmptyString),
+										m_eventInfo(NULL),
+										m_playingHandle(0),
+										m_killThisHandle(0),
+										m_pitchShift(1.0),
+										m_volumeShift(0.0),
+										m_loopCount(1),
+										m_playingAudioIndex(-1),
+										m_allCount(0),
+										m_playerIndex(-1),
+										m_delay(0.0f),
+										m_uninterruptable(FALSE)
+{
+	m_attackName.clear();
+	m_decayName.clear();
+	m_positionOfAudio.zero();
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioEventRTS::AudioEventRTS( const AsciiString& eventName, ObjectID ownerID )
+									: m_eventName(eventName),
+										m_priority(AP_NORMAL),
+										m_volume(-1.0),
+										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
+										m_objectID(ownerID),
+										m_ownerType(OT_INVALID),
+										m_shouldFade(false),
+										m_isLogicalAudio(false),
+										m_filenameToLoad(AsciiString::TheEmptyString),
+										m_eventInfo(NULL),
+										m_playingHandle(0),
+										m_killThisHandle(0),
+										m_pitchShift(1.0),
+										m_volumeShift(0.0),
+										m_loopCount(1),
+										m_playingAudioIndex(-1),
+										m_allCount(0),
+										m_playerIndex(-1),
+										m_delay(0.0f),
+										m_uninterruptable(FALSE)
+{
+	m_attackName.clear();
+	m_decayName.clear();
+
+	if(	m_objectID )
+	{
+		m_ownerType = OT_Object;
+	}
+	else
+	{
+		m_objectID = INVALID_ID;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioEventRTS::AudioEventRTS( const AsciiString& eventName, DrawableID drawableID )
+									: m_eventName(eventName),
+										m_priority(AP_NORMAL),
+										m_volume(-1.0),
+										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
+										m_drawableID(drawableID),
+										m_ownerType(OT_INVALID),
+										m_shouldFade(false),
+										m_isLogicalAudio(false),
+										m_filenameToLoad(AsciiString::TheEmptyString),
+										m_eventInfo(NULL),
+										m_playingHandle(0),
+										m_killThisHandle(0),
+										m_pitchShift(1.0),
+										m_volumeShift(0.0),
+										m_loopCount(1),
+										m_playingAudioIndex(-1),
+										m_allCount(0),
+										m_playerIndex(-1),
+										m_delay(0.0f),
+										m_uninterruptable(FALSE)
+{
+	m_attackName.clear();
+	m_decayName.clear();
+
+	if( m_drawableID )
+	{
+		m_ownerType = OT_Drawable;
+	}
+	else
+	{
+		m_drawableID = INVALID_DRAWABLE_ID;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioEventRTS::AudioEventRTS( const AsciiString& eventName, const Coord3D *positionOfAudio )
+									: m_eventName(eventName),
+										m_priority(AP_NORMAL),
+										m_volume(-1.0),
+										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
+										m_ownerType(OT_Positional),
+										m_shouldFade(false),
+										m_isLogicalAudio(false),
+										m_filenameToLoad(AsciiString::TheEmptyString),
+										m_eventInfo(NULL),
+										m_playingHandle(0),
+										m_killThisHandle(0),
+										m_pitchShift(1.0),
+										m_volumeShift(0.0),
+										m_loopCount(1),
+										m_playingAudioIndex(-1),
+										m_allCount(0),
+										m_playerIndex(-1),
+										m_delay(0.0f),
+										m_uninterruptable(FALSE)
+{
+	m_positionOfAudio.set( positionOfAudio );
+	m_attackName.clear();
+	m_decayName.clear();
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioEventRTS::AudioEventRTS( const AudioEventRTS& right )
+{
+	m_filenameToLoad			= right.m_filenameToLoad;
+	m_eventInfo						= right.m_eventInfo;
+	m_playingHandle				= right.m_playingHandle;
+	m_killThisHandle			= right.m_killThisHandle;
+	m_eventName						= right.m_eventName;
+	m_priority						= right.m_priority;
+	m_volume							= right.m_volume;
+	m_timeOfDay						= right.m_timeOfDay;
+	m_ownerType						= right.m_ownerType;
+	m_shouldFade					= right.m_shouldFade;
+	m_isLogicalAudio			= right.m_isLogicalAudio;
+	m_pitchShift					= right.m_pitchShift;
+	m_volumeShift					= right.m_volumeShift;
+	m_loopCount						= right.m_loopCount;
+	m_playingAudioIndex		= right.m_playingAudioIndex;
+	m_allCount						= right.m_allCount;
+	m_playerIndex					= right.m_playerIndex;
+	m_delay								= right.m_delay;
+	m_attackName					= right.m_attackName;
+	m_decayName						= right.m_decayName;
+	m_portionToPlayNext		= right.m_portionToPlayNext;
+	m_uninterruptable			= right.m_uninterruptable;
+
+	if( m_ownerType == OT_Positional || m_ownerType == OT_Dead )
+	{
+		m_positionOfAudio.set( &right.m_positionOfAudio );
+	}
+	else if( m_ownerType == OT_Drawable )
+	{
+		m_drawableID = right.m_drawableID;
+	}
+	else if( m_ownerType == OT_Object )
+	{
+		m_objectID = right.m_objectID;
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioEventRTS& AudioEventRTS::operator=( const AudioEventRTS& right )
+{
+	m_filenameToLoad			= right.m_filenameToLoad;
+	m_eventInfo						= right.m_eventInfo;
+	m_playingHandle				= right.m_playingHandle;
+	m_killThisHandle			= right.m_killThisHandle;
+	m_eventName						= right.m_eventName;
+	m_priority						= right.m_priority;
+	m_volume							= right.m_volume;
+	m_timeOfDay						= right.m_timeOfDay;
+	m_ownerType						= right.m_ownerType;
+	m_shouldFade					= right.m_shouldFade;
+	m_isLogicalAudio			= right.m_isLogicalAudio;
+	m_pitchShift					= right.m_pitchShift;
+	m_volumeShift					= right.m_volumeShift;
+	m_loopCount						= right.m_loopCount;
+	m_playingAudioIndex		= right.m_playingAudioIndex;
+	m_allCount						= right.m_allCount;
+	m_playerIndex					= right.m_playerIndex;
+	m_delay								= right.m_delay;
+	m_attackName					= right.m_attackName;
+	m_decayName						= right.m_decayName;
+	m_portionToPlayNext		= right.m_portionToPlayNext;
+	m_uninterruptable			= right.m_uninterruptable;
+
+	if( m_ownerType == OT_Positional || m_ownerType == OT_Dead )
+	{
+		m_positionOfAudio.set( &right.m_positionOfAudio );
+	}
+	else if( m_ownerType == OT_Drawable )
+	{
+		m_drawableID = right.m_drawableID;
+	}
+	else if( m_ownerType == OT_Object )
+	{
+		m_objectID = right.m_objectID;
+	}
+	return *this;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioEventRTS::~AudioEventRTS()
+{
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setEventName( AsciiString name )
+{
+	if ((name != m_eventName) && m_eventInfo != NULL) {
+		// Clear out the audio event info, cause its not valid for the new event.
+		m_eventInfo = NULL;
+	}
+
+	m_eventName = name;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::generateFilename( void )
+{
+	// A Logic Random Value is used because we may ask "How long will it take to play this sound?"
+	// In that case, we need the same answer across all pcs.
+
+	if (!m_eventInfo) {
+		return;
+	}
+
+	m_filenameToLoad = generateFilenamePrefix(m_eventInfo->m_soundType, false);
+
+	Int which = 0;
+
+	if (m_eventInfo->m_soundType == AT_Music || m_eventInfo->m_soundType == AT_Streaming) {
+		m_filenameToLoad.concat(m_eventInfo->m_filename);
+		adjustForLocalization(m_filenameToLoad);
+		return;
+	} else {
+		if (m_eventInfo->m_sounds.empty()) {
+			m_filenameToLoad = AsciiString::TheEmptyString;
+			return;
+		}
+
+
+
+		if (BitIsSet(m_eventInfo->m_control, AC_RANDOM))
+		{
+			if (m_isLogicalAudio)
+			{
+				which = GameLogicRandomValue(0, m_eventInfo->m_sounds.size() - 1);
+			}
+			else
+			{
+				which = GameAudioRandomValue(0, m_eventInfo->m_sounds.size() - 1);
+			}
+
+			if (which == m_playingAudioIndex && m_eventInfo->m_sounds.size() > 2)
+				which = ( which + 1 ) % m_eventInfo->m_sounds.size();
+
+			m_playingAudioIndex = which;//caching random choice to compare next call
+
+		}
+		else
+			which = (++m_playingAudioIndex) % m_eventInfo->m_sounds.size();
+
+
+	}
+
+	m_filenameToLoad.concat(m_eventInfo->m_sounds[which]);
+	m_filenameToLoad.concat(generateFilenameExtension(m_eventInfo->m_soundType));
+	adjustForLocalization(m_filenameToLoad);
+
+	// Note: Also generate Delay when generating a filename, cause
+	// we want delay to apply between every loop of a sound.
+	m_delay = GameAudioRandomValueReal(m_eventInfo->m_delayMin, m_eventInfo->m_delayMax);
+}
+
+//-------------------------------------------------------------------------------------------------
+AsciiString AudioEventRTS::getFilename( void )
+{
+	return m_filenameToLoad;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::generatePlayInfo( void )
+{
+	m_pitchShift = GameAudioRandomValueReal(m_eventInfo->m_pitchShiftMin, m_eventInfo->m_pitchShiftMax);
+	m_volumeShift = GameAudioRandomValueReal(1.0f + m_eventInfo->m_volumeShift, 1.0f);	// volume shifts are between 0 and 1
+	m_loopCount = m_eventInfo->m_loopCount;
+
+	m_portionToPlayNext = PP_Attack;
+	Int attackSize = m_eventInfo->m_attackSounds.size();
+	if (attackSize > 0) {
+		m_attackName = generateFilenamePrefix(m_eventInfo->m_soundType, false);
+		// needs to be logic because it needs to be the same on all systems.
+		Int attackToPlay;
+		if (m_isLogicalAudio) {
+			attackToPlay = GameLogicRandomValue(0, attackSize - 1);
+		} else {
+			attackToPlay = GameAudioRandomValue(0, attackSize - 1);
+		}
+
+		m_attackName.concat(m_eventInfo->m_attackSounds[attackToPlay]);
+		m_attackName.concat(generateFilenameExtension(m_eventInfo->m_soundType));
+		adjustForLocalization(m_attackName);
+	} else {
+		m_portionToPlayNext = PP_Sound;
+	}
+
+	Int decaySize = m_eventInfo->m_decaySounds.size();
+	if (decaySize > 0) {
+		m_decayName = generateFilenamePrefix(m_eventInfo->m_soundType, false);
+		// needs to be logic because it needs to be the same on all systems.
+		Int decayToPlay;
+		if (m_isLogicalAudio) {
+			decayToPlay = GameLogicRandomValue(0, decaySize - 1);
+		} else {
+			decayToPlay = GameAudioRandomValue(0, decaySize - 1);
+		}
+
+		m_decayName.concat(m_eventInfo->m_decaySounds[decayToPlay]);
+		m_decayName.concat(generateFilenameExtension(m_eventInfo->m_soundType));
+		adjustForLocalization(m_decayName);
+	}
+
+	m_isLogicalAudio = FALSE;
+}
+
+//-------------------------------------------------------------------------------------------------
+Real AudioEventRTS::getPitchShift( void ) const
+{
+	return m_pitchShift;
+}
+
+//-------------------------------------------------------------------------------------------------
+Real AudioEventRTS::getVolumeShift( void ) const
+{
+	return m_volumeShift;
+}
+
+//-------------------------------------------------------------------------------------------------
+AsciiString AudioEventRTS::getAttackFilename( void ) const
+{
+	return m_attackName;
+}
+
+//-------------------------------------------------------------------------------------------------
+AsciiString AudioEventRTS::getDecayFilename( void ) const
+{
+	return m_decayName;
+}
+
+//-------------------------------------------------------------------------------------------------
+Real AudioEventRTS::getDelay( void ) const
+{
+	return m_delay;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::decrementDelay( Real timeToDecrement )
+{
+	m_delay -= timeToDecrement;
+}
+
+//-------------------------------------------------------------------------------------------------
+PortionToPlay AudioEventRTS::getNextPlayPortion( void ) const
+{
+	return m_portionToPlayNext;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::advanceNextPlayPortion( void )
+{
+	switch (m_portionToPlayNext)
+	{
+		case PP_Attack:
+			m_portionToPlayNext = PP_Sound;
+			break;
+		case PP_Sound:
+			if (m_eventInfo && BitIsSet(m_eventInfo->m_control, AC_ALL))
+			{
+				if (m_allCount == m_eventInfo->m_sounds.size()) {
+					m_portionToPlayNext = PP_Decay;
+				}
+
+				// Advance the all count so that we move to the next sound.
+				++m_allCount;
+			}
+			if (!m_decayName.isEmpty()) {
+				m_portionToPlayNext = PP_Decay;
+			} else {
+				m_portionToPlayNext = PP_Done;
+			}
+			break;
+		case PP_Decay:
+			m_portionToPlayNext = PP_Done;
+			break;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setNextPlayPortion( PortionToPlay ptp )
+{
+	m_portionToPlayNext = ptp;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::decreaseLoopCount( void )
+{
+	if (m_loopCount == 1) {
+		m_loopCount = -1;
+	} else if (m_loopCount > 1) {
+		--m_loopCount;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioEventRTS::hasMoreLoops( void ) const
+{
+	return (m_loopCount >= 0);
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setAudioEventInfo( const AudioEventInfo *eventInfo ) const
+{
+	m_eventInfo = eventInfo;
+}
+
+//-------------------------------------------------------------------------------------------------
+const AudioEventInfo *AudioEventRTS::getAudioEventInfo( void ) const
+{
+	if (m_eventInfo) {
+		if (m_eventInfo->m_audioName == m_eventName) {
+			return m_eventInfo;
+		} else {
+			m_eventInfo = NULL;
+		}
+	}
+
+	return m_eventInfo;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setPlayingHandle( AudioHandle handle )
+{
+	m_playingHandle = handle;
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioHandle AudioEventRTS::getPlayingHandle( void )
+{
+	return m_playingHandle;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setPosition( const Coord3D *pos )
+{
+	if (!pos) {
+		return;
+	}
+
+	if (!(m_ownerType == OT_Positional || m_ownerType == OT_INVALID)) {
+		return;
+	}
+
+	m_positionOfAudio = *pos;
+	m_ownerType = OT_Positional;
+}
+
+//-------------------------------------------------------------------------------------------------
+const Coord3D* AudioEventRTS::getPosition( void )
+{
+	if( m_ownerType != OT_INVALID )
+	{
+		return &m_positionOfAudio;
+	}
+
+	return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setObjectID( ObjectID objID )
+{
+	if (!(m_ownerType == OT_Object || m_ownerType == OT_INVALID)) {
+		return;
+	}
+
+	m_objectID = objID;
+	m_ownerType = OT_Object;
+}
+
+//-------------------------------------------------------------------------------------------------
+ObjectID AudioEventRTS::getObjectID( void )
+{
+	if (m_ownerType == OT_Object) {
+		return m_objectID;
+	}
+
+	return INVALID_ID;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setDrawableID( DrawableID drawID )
+{
+	if (!(m_ownerType == OT_Drawable || m_ownerType == OT_INVALID)) {
+		return;
+	}
+
+	m_drawableID = drawID;
+	m_ownerType = OT_Drawable;
+}
+
+//-------------------------------------------------------------------------------------------------
+DrawableID AudioEventRTS::getDrawableID( void )
+{
+	if (m_ownerType == OT_Drawable) {
+		return m_drawableID;
+	}
+
+	return INVALID_DRAWABLE_ID;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setTimeOfDay( TimeOfDay tod )
+{
+	m_timeOfDay = tod;
+}
+
+//-------------------------------------------------------------------------------------------------
+TimeOfDay AudioEventRTS::getTimeOfDay( void ) const
+{
+	return m_timeOfDay;
+}
+
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setHandleToKill( AudioHandle handleToKill )
+{
+	m_killThisHandle = handleToKill;
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioHandle AudioEventRTS::getHandleToKill( void ) const
+{
+	return m_killThisHandle;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setShouldFade( Bool shouldFade )
+{
+	m_shouldFade = shouldFade;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioEventRTS::getShouldFade( void ) const
+{
+	return m_shouldFade;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setIsLogicalAudio( Bool isLogicalAudio )
+{
+	m_isLogicalAudio = isLogicalAudio;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioEventRTS::getIsLogicalAudio( void ) const
+{
+	return m_isLogicalAudio;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioEventRTS::isPositionalAudio( void ) const
+{
+	if( m_eventInfo )
+	{
+		if( !BitIsSet( m_eventInfo->m_type, ST_WORLD ) )
+		{
+			return FALSE;
+		}
+	}
+	if( m_ownerType != OT_INVALID )
+	{
+		if( m_drawableID != INVALID_DRAWABLE_ID || m_objectID != INVALID_ID || m_ownerType == OT_Positional )
+		{
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioEventRTS::isCurrentlyPlaying( void ) const
+{
+	return TheAudio->isCurrentlyPlaying(m_playingHandle);
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioPriority AudioEventRTS::getAudioPriority( void ) const
+{
+	return m_priority;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setAudioPriority( AudioPriority newPriority )
+{
+	m_priority = newPriority;
+
+}
+
+
+//-------------------------------------------------------------------------------------------------
+Real AudioEventRTS::getVolume( void ) const
+{
+	if (m_volume == -1.0f) {
+		if (m_eventInfo) {
+			return m_eventInfo->m_volume;
+		}
+		return 0.5;
+	}
+
+	return m_volume;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setVolume( Real vol )
+{
+	m_volume = vol;
+}
+
+//-------------------------------------------------------------------------------------------------
+const Coord3D *AudioEventRTS::getCurrentPosition( void )
+{
+	switch (m_ownerType)
+	{
+	case OT_Positional:
+		return &m_positionOfAudio;
+
+	case OT_Object:
+		if (Object *obj = TheGameLogic->findObjectByID(m_objectID))
+		{
+			m_positionOfAudio.set( obj->getPosition() );
+		}
+		else
+		{
+			m_ownerType = OT_Dead;
+		}
+		return &m_positionOfAudio;
+
+	case OT_Drawable:
+		if (Drawable *draw = TheGameClient->findDrawableByID(m_drawableID))
+		{
+			m_positionOfAudio.set( draw->getPosition() );
+		}
+		else
+		{
+			m_ownerType = OT_Dead;
+		}
+		return &m_positionOfAudio;
+
+	case OT_Dead:
+		return &m_positionOfAudio;
+	}
+
+	return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+AsciiString AudioEventRTS::generateFilenamePrefix( AudioType audioTypeToPlay, Bool localized )
+{
+	AsciiString retStr;
+	retStr = TheAudio->getAudioSettings()->m_audioRoot;
+	retStr.concat("\\");
+	if (audioTypeToPlay == AT_Music) {
+		retStr.concat(TheAudio->getAudioSettings()->m_musicFolder);
+	} else if (audioTypeToPlay == AT_Streaming) {
+		retStr.concat(TheAudio->getAudioSettings()->m_streamingFolder);
+	} else {
+		retStr.concat(TheAudio->getAudioSettings()->m_soundsFolder);
+	}
+	retStr.concat("\\");
+
+	if (localized) {
+		retStr.concat(GetRegistryLanguage());
+		retStr.concat("\\");
+	}
+
+	return retStr;
+}
+
+//-------------------------------------------------------------------------------------------------
+AsciiString AudioEventRTS::generateFilenameExtension( AudioType audioTypeToPlay )
+{
+	AsciiString retStr = AsciiString::TheEmptyString;
+	if (audioTypeToPlay != AT_Music) {
+		retStr = ".";
+		retStr.concat(TheAudio->getAudioSettings()->m_soundsExtension);
+	}
+
+	return retStr;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::adjustForLocalization(AsciiString &strToAdjust)
+{
+	const char *filename = strToAdjust.reverseFind('\\');
+	if (filename) {
+		filename += 1;
+	} else {
+		filename = strToAdjust.str();
+	}
+
+	// try the localized version first so that we're guaranteed to get it
+	// even if the generic data directory holds a version of the file
+	AsciiString localizedFilePath = generateFilenamePrefix(m_eventInfo->m_soundType, TRUE);
+	localizedFilePath.concat(filename);
+
+	if (TheFileSystem->doesFileExist(localizedFilePath.str())) {
+		strToAdjust = localizedFilePath;
+	}
+	// else there was no localized version, so leave the path we received unchanged
+}
+
+//-------------------------------------------------------------------------------------------------
+Int AudioEventRTS::getPlayerIndex( void ) const
+{
+	if (m_ownerType == OT_Object) {
+		Object *obj = TheGameLogic->findObjectByID(m_objectID);
+		if (obj) {
+			return obj->getControllingPlayer()->getPlayerIndex();
+		}
+	} else if (m_ownerType == OT_Drawable) {
+		Drawable *draw = TheGameClient->findDrawableByID(m_drawableID);
+		if (draw) {
+			Object *obj = draw->getObject();
+			if (obj) {
+				return obj->getControllingPlayer()->getPlayerIndex();
+			}
+		}
+	}
+
+	return m_playerIndex;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioEventRTS::setPlayerIndex( Int playerNdx )
+{
+	m_playerIndex = playerNdx;
+}
diff --git a/Core/GameEngine/Source/Common/Audio/AudioRequest.cpp b/Core/GameEngine/Source/Common/Audio/AudioRequest.cpp
new file mode 100644
index 00000000000..a3235e1b69a
--- /dev/null
+++ b/Core/GameEngine/Source/Common/Audio/AudioRequest.cpp
@@ -0,0 +1,34 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/AudioRequest.h"
+
+
+AudioRequest::~AudioRequest()
+{
+
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/DynamicAudioEventInfo.cpp b/Core/GameEngine/Source/Common/Audio/DynamicAudioEventInfo.cpp
similarity index 96%
rename from GeneralsMD/Code/GameEngine/Source/Common/Audio/DynamicAudioEventInfo.cpp
rename to Core/GameEngine/Source/Common/Audio/DynamicAudioEventInfo.cpp
index f47c96c33c0..e045b92e534 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/Audio/DynamicAudioEventInfo.cpp
+++ b/Core/GameEngine/Source/Common/Audio/DynamicAudioEventInfo.cpp
@@ -26,7 +26,7 @@
 // Derivation of AudioEventInfo structure, for customized sounds
 // Author: Ian Barkley-Yeung, June 2003
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/DynamicAudioEventInfo.h"
 #include "Common/Xfer.h"
@@ -47,21 +47,21 @@ DynamicAudioEventInfo::~DynamicAudioEventInfo()
 }
 
 /** Override; dynamic audio events are used only for level-specific stuff at the moment */
-Bool DynamicAudioEventInfo::isLevelSpecific() const 
+Bool DynamicAudioEventInfo::isLevelSpecific() const
 {
-  return true; 
+  return true;
 }
- 
+
 /** Override; cheap dynamic casting */
-DynamicAudioEventInfo * DynamicAudioEventInfo::getDynamicAudioEventInfo() 
+DynamicAudioEventInfo * DynamicAudioEventInfo::getDynamicAudioEventInfo()
 {
-  return this; 
+  return this;
 }
 
 /** Override; cheap dynamic casting */
-const DynamicAudioEventInfo * DynamicAudioEventInfo::getDynamicAudioEventInfo() const 
-{ 
-  return this; 
+const DynamicAudioEventInfo * DynamicAudioEventInfo::getDynamicAudioEventInfo() const
+{
+  return this;
 }
 
 
@@ -80,7 +80,7 @@ void DynamicAudioEventInfo::overrideAudioName( const AsciiString & newName )
 void DynamicAudioEventInfo::overrideLoopFlag( Bool newLoopFlag )
 {
   m_overriddenFields.set( OVERRIDE_LOOP_FLAG );
-  
+
   if ( newLoopFlag)
     BitSet( m_control, AC_LOOP );
   else
@@ -99,7 +99,7 @@ void DynamicAudioEventInfo::overrideLoopCount( Int newLoopCount )
 void DynamicAudioEventInfo::overrideVolume( Real newVolume )
 {
   m_overriddenFields.set( OVERRIDE_VOLUME );
-  
+
   m_volume = newVolume;
 }
 
@@ -107,7 +107,7 @@ void DynamicAudioEventInfo::overrideVolume( Real newVolume )
 void DynamicAudioEventInfo::overrideMinVolume( Real newMinVolume )
 {
   m_overriddenFields.set( OVERRIDE_MIN_VOLUME );
-  
+
   m_minVolume = newMinVolume;
 }
 
@@ -115,7 +115,7 @@ void DynamicAudioEventInfo::overrideMinVolume( Real newMinVolume )
 void DynamicAudioEventInfo::overrideMinRange( Real newMinRange )
 {
   m_overriddenFields.set( OVERRIDE_MIN_RANGE );
-  
+
   m_minDistance = newMinRange;
 }
 
@@ -123,7 +123,7 @@ void DynamicAudioEventInfo::overrideMinRange( Real newMinRange )
 void DynamicAudioEventInfo::overrideMaxRange( Real newMaxRange )
 {
   m_overriddenFields.set( OVERRIDE_MAX_RANGE );
-  
+
   m_maxDistance = newMaxRange;
 }
 
@@ -131,7 +131,7 @@ void DynamicAudioEventInfo::overrideMaxRange( Real newMaxRange )
 void DynamicAudioEventInfo::overridePriority( AudioPriority newPriority )
 {
   m_overriddenFields.set( OVERRIDE_PRIORITY );
-  
+
   m_priority = newPriority;
 }
 
@@ -203,27 +203,27 @@ void DynamicAudioEventInfo::xferNoName( Xfer * xfer )
   {
     xfer->xferInt( &m_loopCount );
   }
-  
+
   if ( wasVolumeOverriden() )
   {
     xfer->xferReal( &m_volume );
   }
-  
+
   if ( wasMinVolumeOverriden() )
   {
     xfer->xferReal( &m_minVolume );
   }
-  
+
   if ( wasMinRangeOverriden() )
   {
     xfer->xferReal( &m_minDistance );
   }
-  
+
   if ( wasMaxRangeOverriden() )
   {
     xfer->xferReal( &m_maxDistance );
   }
-  
+
   if ( wasPriorityOverriden() )
   {
     UnsignedByte priority = (UnsignedByte)m_priority;
diff --git a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp
new file mode 100644
index 00000000000..23c944fd950
--- /dev/null
+++ b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp
@@ -0,0 +1,1158 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   RTS3
+//
+// File name: GameAudio.cpp
+//
+// Created:   5/01/01
+//
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+#include "Common/GameAudio.h"
+
+#include "Common/AudioAffect.h"
+#include "Common/AudioEventInfo.h"
+#include "Common/AudioEventRTS.h"
+#include "Common/AudioHandleSpecialValues.h"
+#include "Common/AudioRequest.h"
+#include "Common/AudioSettings.h"
+#include "Common/FileSystem.h"
+#include "Common/GameEngine.h"
+#include "Common/GameMusic.h"
+#include "Common/GameSounds.h"
+#include "Common/MiscAudio.h"
+#include "Common/OSDisplay.h"
+#include "Common/Player.h"
+#include "Common/PlayerList.h"
+#include "Common/UserPreferences.h"
+
+#include "GameClient/ControlBar.h"
+#include "GameClient/Drawable.h"
+#include "GameClient/View.h"
+
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/TerrainLogic.h"
+
+#include "WWMath/matrix3d.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+static const char* TheSpeakerTypes[] =
+{
+	"2 Speakers",
+	"Headphones",
+	"Surround Sound",
+	"4 Speaker",
+	"5.1 Surround",
+	"7.1 Surround",
+	NULL
+};
+
+static const Int TheSpeakerTypesCount = sizeof(TheSpeakerTypes) / sizeof(TheSpeakerTypes[0]);
+
+static void parseSpeakerType( INI *ini, void *instance, void *store, const void *userData );
+
+// Field Parse table for Audio Settings ///////////////////////////////////////////////////////////
+static const FieldParse audioSettingsFieldParseTable[] =
+{
+	{ "AudioRoot",						INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_audioRoot) },
+	{ "SoundsFolder",					INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_soundsFolder) },
+	{ "MusicFolder",					INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_musicFolder) },
+	{ "StreamingFolder",			INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_streamingFolder) },
+	{ "SoundsExtension",			INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_soundsExtension) },
+
+	{ "UseDigital",						INI::parseBool,											NULL,							offsetof( AudioSettings, m_useDigital) },
+	{ "UseMidi",							INI::parseBool,											NULL,							offsetof( AudioSettings, m_useMidi) },
+	{ "OutputRate",						INI::parseInt,											NULL,							offsetof( AudioSettings, m_outputRate) },
+	{ "OutputBits",						INI::parseInt,											NULL,							offsetof( AudioSettings, m_outputBits) },
+	{ "OutputChannels",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_outputChannels) },
+	{ "SampleCount2D",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_sampleCount2D) },
+	{ "SampleCount3D",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_sampleCount3D) },
+	{ "StreamCount",					INI::parseInt,											NULL,							offsetof( AudioSettings, m_streamCount) },
+
+	{ "Preferred3DHW1",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[0]) },
+	{ "Preferred3DHW2",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[1]) },
+	{ "Preferred3DHW3",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[2]) },
+	{ "Preferred3DHW4",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[3]) },
+
+	{ "Preferred3DSW",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[4]) },
+
+	{ "Default2DSpeakerType",		 parseSpeakerType,							NULL,							offsetof( AudioSettings, m_defaultSpeakerType2D) },
+	{ "Default3DSpeakerType",		 parseSpeakerType,							NULL,							offsetof( AudioSettings, m_defaultSpeakerType3D) },
+
+	{ "MinSampleVolume",			INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_minVolume) },
+	{ "GlobalMinRange",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_globalMinRange) },
+	{ "GlobalMaxRange",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_globalMaxRange) },
+	{ "TimeBetweenDrawableSounds", INI::parseDurationUnsignedInt, NULL,							offsetof( AudioSettings, m_drawableAmbientFrames) },
+	{ "TimeToFadeAudio",			INI::parseDurationUnsignedInt,			NULL,							offsetof( AudioSettings, m_fadeAudioFrames) },
+	{ "AudioFootprintInBytes",INI::parseUnsignedInt,							NULL,							offsetof( AudioSettings, m_maxCacheSize) },
+	{ "Relative2DVolume",			INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_relative2DVolume ) },
+	{ "DefaultSoundVolume",		INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_defaultSoundVolume) },
+	{ "Default3DSoundVolume",	INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_default3DSoundVolume) },
+	{ "DefaultSpeechVolume",	INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_defaultSpeechVolume) },
+	{ "DefaultMusicVolume",		INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_defaultMusicVolume) },
+	{ "DefaultMoneyTransactionVolume", INI::parsePercentToReal,		NULL,							offsetof( AudioSettings, m_defaultMoneyTransactionVolume) },
+	{ "MicrophoneDesiredHeightAboveTerrain",	INI::parseReal,			NULL,							offsetof( AudioSettings, m_microphoneDesiredHeightAboveTerrain ) },
+	{ "MicrophoneMaxPercentageBetweenGroundAndCamera", INI::parsePercentToReal,	NULL,	offsetof( AudioSettings, m_microphoneMaxPercentageBetweenGroundAndCamera ) },
+  { "ZoomMinDistance",		INI::parseReal,									NULL,							offsetof( AudioSettings, m_zoomMinDistance ) },
+  { "ZoomMaxDistance",		INI::parseReal,									NULL,							offsetof( AudioSettings, m_zoomMaxDistance ) },
+  { "ZoomSoundVolumePercentageAmount",		INI::parsePercentToReal,	NULL,		offsetof( AudioSettings, m_zoomSoundVolumePercentageAmount ) },
+
+	{ NULL, NULL, NULL, NULL }
+};
+
+// Singleton TheAudio /////////////////////////////////////////////////////////////////////////////
+AudioManager *TheAudio = NULL;
+
+
+// AudioManager Device Independent functions //////////////////////////////////////////////////////
+AudioManager::AudioManager() :
+	m_soundOn(TRUE),
+	m_sound3DOn(TRUE),
+	m_musicOn(TRUE),
+	m_speechOn(TRUE),
+	m_music(NULL),
+	m_sound(NULL),
+	m_surroundSpeakers(FALSE),
+	m_hardwareAccel(FALSE),
+	m_musicPlayingFromCD(FALSE)
+{
+	m_adjustedVolumes.clear();
+	m_audioRequests.clear();
+	m_listenerPosition.zero();
+	m_musicTracks.clear();
+	m_musicVolume = 0.0f;
+	m_sound3DVolume = 0.0f;
+	m_soundVolume   = 0.0f;
+	m_speechVolume  = 0.0f;
+	m_systemMusicVolume   = 0.0f;
+	m_systemSound3DVolume = 0.0f;
+	m_systemSoundVolume   = 0.0f;
+	m_systemSpeechVolume  = 0.0f;
+	m_volumeHasChanged			= FALSE;
+	m_listenerOrientation.set(0.0, 1.0, 0.0);
+	theAudioHandlePool = AHSV_FirstHandle;
+	m_audioSettings = NEW AudioSettings;
+	m_miscAudio = NEW MiscAudio;
+	m_silentAudioEvent = NEW AudioEventRTS;
+	m_savedValues = NULL;
+	m_disallowSpeech = FALSE;
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioManager::~AudioManager()
+{
+	// cleanup all of the loaded AudioEventInfos
+	AudioEventInfoHashIt it;
+	for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) {
+		AudioEventInfo *eventInfo = (*it).second;
+		deleteInstance(eventInfo);
+	}
+	m_allAudioEventInfo.clear();
+
+	delete m_silentAudioEvent;
+	m_silentAudioEvent = NULL;
+
+	delete m_music;
+	m_music = NULL;
+
+	delete m_sound;
+	m_sound = NULL;
+
+	delete m_miscAudio;
+	m_miscAudio = NULL;
+
+	delete m_audioSettings;
+	m_audioSettings = NULL;
+
+	delete [] m_savedValues;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::init()
+{
+	INI ini;
+	ini.loadFileDirectory( "Data\\INI\\AudioSettings", INI_LOAD_OVERWRITE, NULL);
+
+	ini.loadFileDirectory( "Data\\INI\\Default\\Music", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Music", INI_LOAD_OVERWRITE, NULL );
+
+	ini.loadFileDirectory( "Data\\INI\\Default\\SoundEffects", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\SoundEffects", INI_LOAD_OVERWRITE, NULL );
+
+	ini.loadFileDirectory( "Data\\INI\\Default\\Speech", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Speech", INI_LOAD_OVERWRITE, NULL );
+
+	ini.loadFileDirectory( "Data\\INI\\Default\\Voice", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Voice", INI_LOAD_OVERWRITE, NULL );
+
+	// do the miscellaneous sound files last so that we find the AudioEventRTS associated with the events.
+	ini.loadFileDirectory( "Data\\INI\\MiscAudio", INI_LOAD_OVERWRITE, NULL);
+
+	// determine if one of the music tracks exists. Since their now BIGd, one implies all.
+	// If they don't exist, then attempt to load them from the CD.
+	if (!TheGlobalData->m_headless && !isMusicAlreadyLoaded())
+	{
+		m_musicPlayingFromCD = TRUE;
+		while (TRUE)
+		{
+			// @todo Unload any files from CD first. - jkmcd
+
+			TheFileSystem->loadMusicFilesFromCD();
+			if (isMusicAlreadyLoaded())
+			{
+				break;
+			}
+			// We loop infinitely on the splash screen if we don't allow breaking out of this loop.
+//#if !defined( RTS_DEBUG )
+			else
+			{
+				// Display the warning.
+
+				if (OSDisplayWarningBox("GUI:InsertCDPrompt", "GUI:InsertCDMessage", OSDBT_OK | OSDBT_CANCEL, OSDOF_SYSTEMMODAL | OSDOF_EXCLAMATIONICON) == OSDBT_CANCEL) {
+					//TheGameEngine->setQuitting(TRUE);  // Can't do this to WorldBuilder
+					break;
+				}
+			}
+//#endif
+		}
+	}
+
+	m_music = NEW MusicManager;
+	m_sound = NEW SoundManager;
+
+	// Set our system volumes from the user's preferred settings, not the defaults.
+	m_systemMusicVolume = m_audioSettings->m_preferredMusicVolume;
+	m_systemSoundVolume = m_audioSettings->m_preferredSoundVolume;
+	m_systemSound3DVolume = m_audioSettings->m_preferred3DSoundVolume;
+	m_systemSpeechVolume = m_audioSettings->m_preferredSpeechVolume;
+
+	m_scriptMusicVolume = 1.0f;
+	m_scriptSoundVolume = 1.0f;
+	m_scriptSound3DVolume = 1.0f;
+	m_scriptSpeechVolume = 1.0f;
+
+	m_musicVolume = m_systemMusicVolume;
+	m_soundVolume = m_systemSoundVolume;
+	m_sound3DVolume = m_systemSound3DVolume;
+	m_speechVolume = m_systemSpeechVolume;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::postProcessLoad()
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::reset()
+{
+	// clear out any adjusted volumes we might have set.
+	m_adjustedVolumes.clear();
+
+	// adjust the scripted volumes, and reset the
+	m_scriptMusicVolume = 1.0f;
+	m_scriptSoundVolume = 1.0f;
+	m_scriptSound3DVolume = 1.0f;
+	m_scriptSpeechVolume = 1.0f;
+
+	// restore the final values to the
+	m_musicVolume = m_systemMusicVolume;
+	m_soundVolume = m_systemSoundVolume;
+	m_sound3DVolume = m_systemSound3DVolume;
+	m_speechVolume = m_systemSpeechVolume;
+
+	m_disallowSpeech = FALSE;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::update()
+{
+	Coord3D groundPos, microphonePos;
+	TheTacticalView->getPosition( &groundPos );
+	Real angle = TheTacticalView->getAngle();
+	Matrix3D rot = Matrix3D::Identity;
+	rot.Rotate_Z( angle );
+	Vector3 forward( 0, 1, 0 );
+	rot.mulVector3( forward );
+
+	Real desiredHeight = m_audioSettings->m_microphoneDesiredHeightAboveTerrain;
+	Real maxPercentage = m_audioSettings->m_microphoneMaxPercentageBetweenGroundAndCamera;
+
+	Coord3D lookTo;
+	lookTo.set(forward.X, forward.Y, forward.Z);
+
+	//Kris: At this point, the microphone is calculated to be at the ground position where the camera is looking at.
+	//Instead we want to move the microphone towards the camera. Hopefully, it'll be a desired altitude, but if it
+	//gets too close to the camera (or even past it), that would be undesirable. Therefore, we have a backup method
+	//of making sure we only go a certain percentage towards the camera or the desired height, whichever occurs first.
+	Coord3D cameraPos = TheTacticalView->get3DCameraPosition();
+	Coord3D groundToCameraVector;
+	groundToCameraVector.set( &cameraPos );
+	groundToCameraVector.sub( &groundPos );
+	Real bestScaleFactor;
+
+	if( cameraPos.z <= desiredHeight || groundToCameraVector.z <= 0.0f )
+	{
+		//Use the percentage calculation!
+		bestScaleFactor = maxPercentage;
+	}
+	else
+	{
+		//Calculate the stopping position of the groundToCameraVector when we force z to be m_microphoneDesiredHeightAboveTerrain
+		Real zScale = desiredHeight / groundToCameraVector.z;
+
+		//Use the smallest of the two scale calculations
+		bestScaleFactor = MIN( maxPercentage, zScale );
+	}
+
+	//Now apply the best scalar to the ground-to-camera vector.
+	groundToCameraVector.scale( bestScaleFactor );
+
+	//Set the microphone to be the ground position adjusted for terrain plus the vector we just calculated.
+	groundPos.z = TheTerrainLogic->getGroundHeight( groundPos.x, groundPos.y );
+	microphonePos.set( &groundPos );
+	microphonePos.add( &groundToCameraVector );
+
+	//Viola! A properly placed microphone.
+	setListenerPosition( &microphonePos, &lookTo );
+
+
+	//Now determine if we would like to boost the volume based on the camera being close to the microphone!
+	Real maxBoostScalar = m_audioSettings->m_zoomSoundVolumePercentageAmount;
+	Real minDist = m_audioSettings->m_zoomMinDistance;
+	Real maxDist = m_audioSettings->m_zoomMaxDistance;
+
+	//We can't boost a sound above 100%, instead reduce the normal sound level.
+	m_zoomVolume = 1.0f - maxBoostScalar;
+
+	//Are we even using a boost?
+	if( maxBoostScalar > 0.0f )
+	{
+		//How far away is the camera from the microphone?
+		Coord3D vector = cameraPos;
+		vector.sub( &microphonePos );
+		Real dist = vector.length();
+
+		if( dist < minDist )
+		{
+			//Max volume!
+			m_zoomVolume = 1.0f;
+		}
+		else if( dist < maxDist )
+		{
+			//Determine what the boost amount will be.
+			Real scalar = (dist - minDist) / (maxDist - minDist);
+			m_zoomVolume = 1.0f - scalar * maxBoostScalar;
+		}
+	}
+
+	set3DVolumeAdjustment( m_zoomVolume );
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::getInfoForAudioEvent( const AudioEventRTS *eventToFindAndFill ) const
+{
+	if (!eventToFindAndFill) {
+		return;
+	}
+
+	if (eventToFindAndFill->getAudioEventInfo()) {
+		// already done
+		return;
+	}
+
+	eventToFindAndFill->setAudioEventInfo(findAudioEventInfo(eventToFindAndFill->getEventName()));
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioHandle AudioManager::addAudioEvent(const AudioEventRTS *eventToAdd)
+{
+	if (eventToAdd->getEventName().isEmpty() || eventToAdd->getEventName() == "NoSound") {
+		return AHSV_NoSound;
+	}
+
+#ifdef INTENSIVE_AUDIO_DEBUG
+	DEBUG_LOG(("AUDIO (%d): Received addAudioEvent('%s')", TheGameLogic->getFrame(), eventToAdd->getEventName().str()));
+#endif
+	if (!eventToAdd->getAudioEventInfo()) {
+		getInfoForAudioEvent(eventToAdd);
+		if (!eventToAdd->getAudioEventInfo()) {
+			DEBUG_CRASH(("No info for requested audio event '%s'", eventToAdd->getEventName().str()));
+			return AHSV_Error;
+		}
+	}
+
+	const AudioType soundType = eventToAdd->getAudioEventInfo()->m_soundType;
+
+	// Check if audio type is on
+	// TheSuperHackers @info Zero audio volume is not a fail condition, because music, speech and sounds
+	// still need to be in flight in case the user raises the volume on runtime after the audio was already triggered.
+	switch (soundType)
+	{
+		case AT_Music:
+			if (!isOn(AudioAffect_Music))
+				return AHSV_NoSound;
+			break;
+		case AT_SoundEffect:
+			if (!isOn(AudioAffect_Sound) || !isOn(AudioAffect_Sound3D))
+				return AHSV_NoSound;
+			break;
+		case AT_Streaming:
+			// if we're currently playing uninterruptable speech, then disallow the addition of this sample
+			if (getDisallowSpeech())
+				return AHSV_NoSound;
+			if (!isOn(AudioAffect_Speech))
+				return AHSV_NoSound;
+			break;
+	}
+
+	if (!eventToAdd->getUninterruptable()) {
+		if (!shouldPlayLocally(eventToAdd)) {
+			return AHSV_NotForLocal;
+		}
+	}
+
+	AudioEventRTS *audioEvent = MSGNEW("AudioEventRTS") AudioEventRTS(*eventToAdd);		// poolify
+	audioEvent->setPlayingHandle( allocateNewHandle() );
+	audioEvent->generateFilename();	// which file are we actually going to play?
+	((AudioEventRTS*)eventToAdd)->setPlayingAudioIndex( audioEvent->getPlayingAudioIndex() );
+	audioEvent->generatePlayInfo();	// generate pitch shift and volume shift now as well
+
+	std::list<std::pair<AsciiString, Real> >::iterator it;
+	for (it = m_adjustedVolumes.begin(); it != m_adjustedVolumes.end(); ++it) {
+		if (it->first == audioEvent->getEventName()) {
+			audioEvent->setVolume(it->second);
+			break;
+		}
+	}
+
+	// cull muted audio
+	if (audioEvent->getVolume() < m_audioSettings->m_minVolume) {
+#ifdef INTENSIVE_AUDIO_DEBUG
+		DEBUG_LOG((" - culled due to muting (%d).", audioEvent->getVolume()));
+#endif
+		releaseAudioEventRTS(audioEvent);
+		return AHSV_Muted;
+	}
+
+	if (soundType == AT_Music)
+	{
+		m_music->addAudioEvent(audioEvent);
+	}
+	else
+	{
+		//Possible to nuke audioEvent inside.
+		m_sound->addAudioEvent(audioEvent);
+	}
+
+	if( audioEvent )
+	{
+		return audioEvent->getPlayingHandle();
+	}
+	return AHSV_NoSound;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioManager::isValidAudioEvent(const AudioEventRTS *eventToCheck) const
+{
+	if (eventToCheck->getEventName().isEmpty()) {
+		return false;
+	}
+
+	getInfoForAudioEvent(eventToCheck);
+
+	return (eventToCheck->getAudioEventInfo() != NULL);
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioManager::isValidAudioEvent( AudioEventRTS *eventToCheck ) const
+{
+	if( eventToCheck->getEventName().isEmpty() )
+	{
+		return false;
+	}
+
+	getInfoForAudioEvent( eventToCheck );
+
+	return( eventToCheck->getAudioEventInfo() );
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::addTrackName( const AsciiString& trackName )
+{
+	m_musicTracks.push_back(trackName);
+}
+
+//-------------------------------------------------------------------------------------------------
+AsciiString AudioManager::nextTrackName(const AsciiString& currentTrack )
+{
+	std::vector<AsciiString>::iterator it;
+	for (it = m_musicTracks.begin(); it != m_musicTracks.end(); ++it) {
+		if (*it == currentTrack) {
+			break;
+		}
+	}
+
+	if (it != m_musicTracks.end()) {
+		++it;
+	}
+
+	if (it == m_musicTracks.end()) {
+		it = m_musicTracks.begin();
+		if (it == m_musicTracks.end()) {
+			return AsciiString::TheEmptyString;
+		}
+	}
+
+	return *it;
+}
+
+//-------------------------------------------------------------------------------------------------
+AsciiString AudioManager::prevTrackName(const AsciiString& currentTrack )
+{
+	std::vector<AsciiString>::reverse_iterator rit;
+	for (rit = m_musicTracks.rbegin(); rit != m_musicTracks.rend(); ++rit) {
+		if (*rit == currentTrack) {
+			break;
+		}
+	}
+
+	if (rit != m_musicTracks.rend()) {
+		++rit;
+	}
+
+	if (rit == m_musicTracks.rend()) {
+		rit = m_musicTracks.rbegin();
+		if (rit == m_musicTracks.rend()) {
+			return AsciiString::TheEmptyString;
+		}
+	}
+
+	return *rit;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::removeAudioEvent(AudioHandle audioEvent)
+{
+	if (audioEvent == AHSV_StopTheMusic || audioEvent == AHSV_StopTheMusicFade) {
+		m_music->removeAudioEvent(audioEvent);
+		return;
+	}
+
+	if (audioEvent < AHSV_FirstHandle) {
+		return;
+	}
+
+	AudioRequest *req = allocateAudioRequest( false );
+	req->m_handleToInteractOn = audioEvent;
+	req->m_request = AR_Stop;
+	appendAudioRequest( req );
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::setAudioEventEnabled( AsciiString eventToAffect, Bool enable )
+{
+	setAudioEventVolumeOverride(eventToAffect, (enable ? -1.0f : 0.0f) );
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::setAudioEventVolumeOverride( AsciiString eventToAffect, Real newVolume )
+{
+	if (eventToAffect == AsciiString::TheEmptyString) {
+		m_adjustedVolumes.clear();
+		return;
+	}
+
+	// Find any playing audio events and adjust their volume accordingly.
+	if (newVolume != -1.0f) {
+		adjustVolumeOfPlayingAudio(eventToAffect, newVolume);
+	}
+
+	std::list<std::pair<AsciiString, Real> >::iterator it;
+	for (it = m_adjustedVolumes.begin(); it != m_adjustedVolumes.end(); ++it) {
+		if (it->first == eventToAffect) {
+			if (newVolume == -1.0f) {
+				m_adjustedVolumes.erase(it);
+				return;
+			} else {
+				it->second = newVolume;
+				return;
+			}
+		}
+	}
+
+	if (newVolume != -1.0f) {
+		std::pair<AsciiString, Real> newPair;
+		newPair.first = eventToAffect;
+		newPair.second = newVolume;
+		m_adjustedVolumes.push_front(newPair);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::removeAudioEvent( AsciiString eventToRemove )
+{
+	removePlayingAudio( eventToRemove );
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::removeDisabledEvents()
+{
+	removeAllDisabledAudio();
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioManager::isCurrentlyPlaying( AudioHandle audioEvent )
+{
+	return true;
+}
+
+//-------------------------------------------------------------------------------------------------
+UnsignedInt AudioManager::translateSpeakerTypeToUnsignedInt( const AsciiString& speakerType )
+{
+	for (UnsignedInt i = 0; TheSpeakerTypes[i]; ++i) {
+		if (TheSpeakerTypes[i] == speakerType) {
+			return i;
+		}
+	}
+
+	return 0;
+}
+
+//-------------------------------------------------------------------------------------------------
+AsciiString AudioManager::translateUnsignedIntToSpeakerType( UnsignedInt speakerType )
+{
+	if (speakerType >= TheSpeakerTypesCount) {
+		return TheSpeakerTypes[0];
+	}
+
+	return TheSpeakerTypes[speakerType];
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioManager::isOn( AudioAffect whichToGet ) const
+{
+	if (whichToGet & AudioAffect_Music) {
+		return m_musicOn;
+	} else if (whichToGet & AudioAffect_Sound) {
+		return m_soundOn;
+	} else if (whichToGet & AudioAffect_Sound3D) {
+		return m_sound3DOn;
+	}
+
+	// Speech
+	return m_speechOn;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::setOn( Bool turnOn, AudioAffect whichToAffect )
+{
+	if (whichToAffect & AudioAffect_Music) {
+		m_musicOn = turnOn;
+	}
+
+	if (whichToAffect & AudioAffect_Sound) {
+		m_soundOn = turnOn;
+	}
+
+	if (whichToAffect & AudioAffect_Sound3D) {
+		m_sound3DOn = turnOn;
+	}
+
+	if (whichToAffect & AudioAffect_Speech) {
+		m_speechOn = turnOn;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::setVolume( Real volume, AudioAffect whichToAffect )
+{
+	if (whichToAffect & AudioAffect_Music) {
+		if (whichToAffect & AudioAffect_SystemSetting) {
+			m_systemMusicVolume = volume;
+		} else {
+			m_scriptMusicVolume = volume;
+		}
+
+		m_musicVolume = m_scriptMusicVolume * m_systemMusicVolume;
+	}
+
+	if (whichToAffect & AudioAffect_Sound) {
+		if (whichToAffect & AudioAffect_SystemSetting) {
+			m_systemSoundVolume = volume;
+		} else {
+			m_scriptSoundVolume = volume;
+		}
+
+		m_soundVolume = m_scriptSoundVolume * m_systemSoundVolume;
+	}
+
+	if (whichToAffect & AudioAffect_Sound3D) {
+		if (whichToAffect & AudioAffect_SystemSetting) {
+			m_systemSound3DVolume = volume;
+		} else {
+			m_scriptSound3DVolume = volume;
+		}
+		m_sound3DVolume = m_scriptSound3DVolume * m_systemSound3DVolume;
+	}
+
+	if (whichToAffect & AudioAffect_Speech) {
+		if (whichToAffect & AudioAffect_SystemSetting) {
+			m_systemSpeechVolume = volume;
+		} else {
+			m_scriptSpeechVolume = volume;
+		}
+		m_speechVolume = m_scriptSpeechVolume * m_systemSpeechVolume;
+	}
+
+	m_volumeHasChanged = true;
+}
+
+//-------------------------------------------------------------------------------------------------
+Real AudioManager::getVolume( AudioAffect whichToGet )
+{
+	if (whichToGet & AudioAffect_Music) {
+		return m_musicVolume;
+	} else if (whichToGet & AudioAffect_Sound) {
+		return m_soundVolume;
+	} else if (whichToGet & AudioAffect_Sound3D) {
+		return m_sound3DVolume;
+	}
+
+	// Speech
+	return m_speechVolume;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::set3DVolumeAdjustment( Real volumeAdjustment )
+{
+	m_sound3DVolume = volumeAdjustment * m_scriptSound3DVolume * m_systemSound3DVolume;
+
+	// clamp
+	if (m_sound3DVolume < 0.0f)
+		m_sound3DVolume = 0.0f;
+
+	if (m_sound3DVolume > 1.0f)
+		m_sound3DVolume = 1.0f;
+
+  if ( ! has3DSensitiveStreamsPlaying() )
+  	m_volumeHasChanged = TRUE;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::setListenerPosition( const Coord3D *newListenerPos, const Coord3D *newListenerOrientation )
+{
+	m_listenerPosition = *newListenerPos;
+	m_listenerOrientation = *newListenerOrientation;
+}
+
+//-------------------------------------------------------------------------------------------------
+const Coord3D *AudioManager::getListenerPosition( void ) const
+{
+	return &m_listenerPosition;
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioRequest *AudioManager::allocateAudioRequest( Bool useAudioEvent )
+{
+	AudioRequest *audioReq = newInstance(AudioRequest);
+	audioReq->m_usePendingEvent = useAudioEvent;
+	audioReq->m_requiresCheckForSample = false;
+	return audioReq;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::releaseAudioRequest( AudioRequest *requestToRelease )
+{
+	deleteInstance(requestToRelease);
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::appendAudioRequest( AudioRequest *m_request )
+{
+	m_audioRequests.push_back(m_request);
+}
+
+//-------------------------------------------------------------------------------------------------
+// Remove all pending audio requests
+void AudioManager::removeAllAudioRequests( void )
+{
+  std::list<AudioRequest*>::iterator it;
+  for ( it = m_audioRequests.begin(); it != m_audioRequests.end(); it++ ) {
+    releaseAudioRequest( *it );
+  }
+
+  m_audioRequests.clear();
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::processRequestList( void )
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioEventInfo *AudioManager::newAudioEventInfo( AsciiString audioName )
+{
+	AudioEventInfo *eventInfo = findAudioEventInfo(audioName);
+	if (eventInfo) {
+		DEBUG_CRASH(("Requested add of '%s' multiple times. Is this intentional? - jkmcd", audioName.str()));
+		return eventInfo;
+	}
+
+	m_allAudioEventInfo[audioName] = newInstance(AudioEventInfo);
+	return m_allAudioEventInfo[audioName];
+}
+
+//-------------------------------------------------------------------------------------------------
+// Add an AudioEventInfo structure allocated elsewhere to the audio event list
+void AudioManager::addAudioEventInfo( AudioEventInfo * newEvent )
+{
+  // Warning: Don't try to copy the structure. It may be a derived class
+  AudioEventInfo *eventInfo = findAudioEventInfo( newEvent->m_audioName );
+  if (eventInfo)
+  {
+    DEBUG_CRASH(("Requested add of '%s' multiple times. Is this intentional? - jkmcd", newEvent->m_audioName.str()));
+    *eventInfo = *newEvent;
+  }
+  else
+  {
+    m_allAudioEventInfo[newEvent->m_audioName] = newEvent;
+  }
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioEventInfo *AudioManager::findAudioEventInfo( AsciiString eventName ) const
+{
+	AudioEventInfoHash::const_iterator it;
+	it = m_allAudioEventInfo.find(eventName);
+	if (it == m_allAudioEventInfo.end()) {
+		return NULL;
+	}
+
+	return (*it).second;
+}
+
+//-------------------------------------------------------------------------------------------------
+// Remove all AudioEventInfo's with the m_isLevelSpecific flag
+void AudioManager::removeLevelSpecificAudioEventInfos(void)
+{
+  AudioEventInfoHash::iterator it = m_allAudioEventInfo.begin();
+
+  while ( it != m_allAudioEventInfo.end() )
+  {
+    AudioEventInfoHash::iterator next = it; // Make sure erase doesn't cause problems
+    next++;
+
+    if ( it->second->isLevelSpecific() )
+    {
+      deleteInstance(it->second);
+      m_allAudioEventInfo.erase( it );
+    }
+
+    it = next;
+  }
+
+}
+
+//-------------------------------------------------------------------------------------------------
+const AudioSettings *AudioManager::getAudioSettings( void ) const
+{
+	return m_audioSettings;
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioSettings *AudioManager::friend_getAudioSettings( void )
+{
+	return m_audioSettings;
+}
+
+//-------------------------------------------------------------------------------------------------
+const MiscAudio *AudioManager::getMiscAudio( void ) const
+{
+	return m_miscAudio;
+}
+
+//-------------------------------------------------------------------------------------------------
+MiscAudio *AudioManager::friend_getMiscAudio( void )
+{
+	return m_miscAudio;
+}
+
+//-------------------------------------------------------------------------------------------------
+const FieldParse *AudioManager::getFieldParseTable( void ) const
+{
+	return audioSettingsFieldParseTable;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::refreshCachedVariables()
+{
+	m_hardwareAccel = isCurrentProviderHardwareAccelerated();
+	m_surroundSpeakers = isCurrentSpeakerTypeSurroundSound();
+}
+
+//-------------------------------------------------------------------------------------------------
+Real AudioManager::getAudioLengthMS( const AudioEventRTS *event )
+{
+	if (!event->getAudioEventInfo()) {
+		getInfoForAudioEvent(event);
+		if (!event->getAudioEventInfo()) {
+			return 0.0f;
+		}
+	}
+
+	AudioEventRTS tmpEvent = *event;
+
+	tmpEvent.generateFilename();
+	tmpEvent.generatePlayInfo();
+	return getFileLengthMS(tmpEvent.getAttackFilename()) +
+				 getFileLengthMS(tmpEvent.getFilename()) +
+				 getFileLengthMS(tmpEvent.getDecayFilename());
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioManager::isMusicAlreadyLoaded(void) const
+{
+	const AudioEventInfo *musicToLoad = NULL;
+	AudioEventInfoHash::const_iterator it;
+	for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) {
+		if (it->second) {
+			const AudioEventInfo *aet = it->second;
+			if (aet->m_soundType == AT_Music) {
+				musicToLoad = aet;
+			}
+		}
+	}
+
+	if (!musicToLoad) {
+		return FALSE;
+	}
+
+	AudioEventRTS aud;
+	aud.setAudioEventInfo(musicToLoad);
+	aud.generateFilename();
+
+	AsciiString astr = aud.getFilename();
+
+	return (TheFileSystem->doesFileExist(astr.str()));
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::findAllAudioEventsOfType( AudioType audioType, std::vector<AudioEventInfo*>& allEvents )
+{
+	AudioEventInfoHashIt it;
+	for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) {
+		AudioEventInfo *aud = (*it).second;
+		if (aud->m_soundType == audioType) {
+			allEvents.push_back(aud);
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioManager::isCurrentProviderHardwareAccelerated()
+{
+	for (Int i = 0; i < MAX_HW_PROVIDERS; ++i) {
+		if (getProviderName(getSelectedProvider()) == m_audioSettings->m_preferred3DProvider[i]) {
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioManager::isCurrentSpeakerTypeSurroundSound()
+{
+	return (getSpeakerType() == m_audioSettings->m_defaultSpeakerType3D);
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioManager::shouldPlayLocally(const AudioEventRTS *audioEvent)
+{
+	Player *localPlayer = ThePlayerList->getLocalPlayer();
+	if( !localPlayer->isPlayerActive() )
+	{
+		//We are dead, thus are observing. Get the player we are observing. It's
+		//possible that we're not looking at any player, therefore it can be NULL.
+		localPlayer = TheControlBar->getObserverLookAtPlayer();
+	}
+
+	const AudioEventInfo *ei = audioEvent->getAudioEventInfo();
+
+	// Music should always play locally.
+	if (ei->m_soundType == AT_Music) {
+		return TRUE;
+	}
+
+	if (!BitIsSet(ei->m_type, (ST_PLAYER | ST_ALLIES | ST_ENEMIES | ST_EVERYONE))) {
+		DEBUG_CRASH(("No player restrictions specified for '%s'. Using Everyone.", ei->m_audioName.str()));
+		return TRUE;
+	}
+
+	if (BitIsSet(ei->m_type, ST_EVERYONE)) {
+		return TRUE;
+	}
+
+	Player *owningPlayer = ThePlayerList->getNthPlayer(audioEvent->getPlayerIndex());
+
+	if (BitIsSet(ei->m_type, ST_PLAYER) && BitIsSet(ei->m_type, ST_UI) && owningPlayer == NULL) {
+		DEBUG_ASSERTCRASH(!TheGameLogic->isInGameLogicUpdate(), ("Playing %s sound -- player-based UI sound without specifying a player.", ei->m_audioName.str()));
+		return TRUE;
+	}
+
+	if (owningPlayer == NULL) {
+		DEBUG_CRASH(("Sound '%s' expects an owning player, but the audio event that created it didn't specify one.", ei->m_audioName.str()));
+		return FALSE;
+	}
+
+	if( !localPlayer )
+	{
+		return FALSE;
+	}
+
+	const Team *localTeam = localPlayer->getDefaultTeam();
+	if (localTeam == NULL) {
+		return FALSE;
+	}
+
+	if (BitIsSet(ei->m_type, ST_PLAYER))  {
+		return owningPlayer == localPlayer;
+	}
+
+	if (BitIsSet(ei->m_type, ST_ALLIES)) {
+		// We have to also check that the owning player isn't the local player, because PLAYER
+		// wasn't specified, or we wouldn't have gotten here.
+		return (owningPlayer != localPlayer) && owningPlayer->getRelationship(localTeam) == ALLIES;
+	}
+
+	if (BitIsSet(ei->m_type, ST_ENEMIES)) {
+		return owningPlayer->getRelationship(localTeam) == ENEMIES;
+	}
+
+	return FALSE;
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioHandle AudioManager::allocateNewHandle( void )
+{
+	// note, intenionally a post increment rather than a pre increment.
+	return theAudioHandlePool++;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::releaseAudioEventRTS( AudioEventRTS *&eventToRelease )
+{
+	delete eventToRelease;
+	eventToRelease = NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::loseFocus( void )
+{
+	if (m_savedValues)
+		return;
+
+	// In this case, make all the audio go silent.
+	m_savedValues = NEW Real[NUM_VOLUME_TYPES];
+	m_savedValues[VOLUME_TYPE_MUSIC] = m_systemMusicVolume;
+	m_savedValues[VOLUME_TYPE_SOUND] = m_systemSoundVolume;
+	m_savedValues[VOLUME_TYPE_SOUND3D] = m_systemSound3DVolume;
+	m_savedValues[VOLUME_TYPE_SPEECH] = m_systemSpeechVolume;
+
+	// Now, set them all to 0.
+	setVolume(0.0f, (AudioAffect) (AudioAffect_All | AudioAffect_SystemSetting));
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioManager::regainFocus( void )
+{
+	if (!m_savedValues)
+		return;
+
+	// We got focus back. Restore the previous audio values.
+	setVolume(m_savedValues[VOLUME_TYPE_MUSIC], (AudioAffect) (AudioAffect_Music | AudioAffect_SystemSetting));
+	setVolume(m_savedValues[VOLUME_TYPE_SOUND], (AudioAffect) (AudioAffect_Sound | AudioAffect_SystemSetting));
+	setVolume(m_savedValues[VOLUME_TYPE_SOUND3D], (AudioAffect) (AudioAffect_Sound3D | AudioAffect_SystemSetting));
+	setVolume(m_savedValues[VOLUME_TYPE_SPEECH], (AudioAffect) (AudioAffect_Speech | AudioAffect_SystemSetting));
+
+	// Now, blow away the old volumes.
+	delete [] m_savedValues;
+	m_savedValues = NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void INI::parseAudioSettingsDefinition( INI *ini )
+{
+	ini->initFromINI(TheAudio->friend_getAudioSettings(), TheAudio->getFieldParseTable());
+
+	// time to override the volume settings, default 3-D provider, and speaker setup with the
+	// ones stored from the prefs
+	OptionPreferences prefs;
+
+	TheAudio->setPreferredProvider(prefs.getPreferred3DProvider());
+	TheAudio->setPreferredSpeaker(prefs.getSpeakerType());
+
+	Real relative2DVolume = TheAudio->getAudioSettings()->m_relative2DVolume;
+	relative2DVolume = MIN( 1.0f, MAX( -1.0f, relative2DVolume ) );
+
+	TheAudio->friend_getAudioSettings()->m_preferredSoundVolume		= prefs.getSoundVolume() / 100.0f;
+	TheAudio->friend_getAudioSettings()->m_preferred3DSoundVolume	= prefs.get3DSoundVolume() / 100.0f;
+	TheAudio->friend_getAudioSettings()->m_preferredSpeechVolume	= prefs.getSpeechVolume() / 100.0f;
+	TheAudio->friend_getAudioSettings()->m_preferredMusicVolume		= prefs.getMusicVolume() / 100.0f;
+	TheAudio->friend_getAudioSettings()->m_preferredMoneyTransactionVolume = prefs.getMoneyTransactionVolume() / 100.0f;
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------------------------------
+void parseSpeakerType( INI *ini, void *instance, void *store, const void* userData )
+{
+	AsciiString str;
+	ini->parseAsciiString( ini, instance, &str, userData );
+
+	(*(UnsignedInt*)store) = TheAudio->translateSpeakerTypeToUnsignedInt(str);
+}
+
diff --git a/Core/GameEngine/Source/Common/Audio/GameMusic.cpp b/Core/GameEngine/Source/Common/Audio/GameMusic.cpp
new file mode 100644
index 00000000000..1f0bbe18c02
--- /dev/null
+++ b/Core/GameEngine/Source/Common/Audio/GameMusic.cpp
@@ -0,0 +1,126 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   RTS3
+//
+// File name: GameMusic.cpp
+//
+// Created:   5/01/01
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/GameMusic.h"
+
+#include "Common/AudioEventRTS.h"
+#include "Common/AudioRequest.h"
+#include "Common/GameAudio.h"
+#include "Common/INI.h"
+
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+#define MUSIC_PATH "Data\\Audio\\Tracks"  // directory path to the music files
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------------------------------
+/** The INI data fields for music tracks */
+//-------------------------------------------------------------------------------------------------
+const FieldParse MusicTrack::m_musicTrackFieldParseTable[] =
+{
+
+	{ "Filename",								INI::parseAsciiString,							NULL, offsetof( MusicTrack, filename ) },
+	{ "Volume",									INI::parsePercentToReal,						NULL, offsetof( MusicTrack, volume ) },
+	{ "Ambient",								INI::parseBool,											NULL, offsetof( MusicTrack, ambient ) },
+	{ NULL,											NULL,																NULL, 0 },
+};
+
+
+//-------------------------------------------------------------------------------------------------
+MusicManager::MusicManager()
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+MusicManager::~MusicManager()
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void MusicManager::playTrack( AudioEventRTS *eventToUse )
+{
+	AudioRequest *audioRequest = TheAudio->allocateAudioRequest( true );
+	audioRequest->m_pendingEvent = eventToUse;
+	audioRequest->m_request = AR_Play;
+	TheAudio->appendAudioRequest( audioRequest );
+}
+
+//-------------------------------------------------------------------------------------------------
+void MusicManager::stopTrack( AudioHandle eventToRemove )
+{
+	AudioRequest *audioRequest = TheAudio->allocateAudioRequest( false );
+	audioRequest->m_handleToInteractOn = eventToRemove;
+	audioRequest->m_request = AR_Stop;
+	TheAudio->appendAudioRequest( audioRequest );
+}
+
+//-------------------------------------------------------------------------------------------------
+void MusicManager::addAudioEvent( AudioEventRTS *eventToAdd )
+{
+	playTrack( eventToAdd );
+}
+
+//-------------------------------------------------------------------------------------------------
+void MusicManager::removeAudioEvent( AudioHandle eventToRemove )
+{
+	stopTrack( eventToRemove );
+}
+
diff --git a/Core/GameEngine/Source/Common/Audio/GameSounds.cpp b/Core/GameEngine/Source/Common/Audio/GameSounds.cpp
new file mode 100644
index 00000000000..f398941ab38
--- /dev/null
+++ b/Core/GameEngine/Source/Common/Audio/GameSounds.cpp
@@ -0,0 +1,331 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   RTS3
+//
+// File name: GameSounds.cpp
+//
+// Created:   5/02/01
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Lib/BaseType.h"
+#include "Common/GameSounds.h"
+
+#include "Common/AudioEventInfo.h"
+#include "Common/AudioEventRTS.h"
+#include "Common/AudioRequest.h"
+#include "Common/GameUtility.h"
+#include "Common/Player.h"
+#include "Common/PlayerList.h"
+
+#include "GameLogic/PartitionManager.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+//-------------------------------------------------------------------------------------------------
+SoundManager::SoundManager()
+{
+	// nada to do
+}
+
+//-------------------------------------------------------------------------------------------------
+SoundManager::~SoundManager()
+{
+	// nada to do
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::init( void )
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::postProcessLoad()
+{
+	// The AudioManager should actually be live now, so go ahead and get the info we need from it
+	// here
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::update( void )
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::reset( void )
+{
+	m_numPlaying2DSamples = 0;
+	m_numPlaying3DSamples = 0;
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::loseFocus( void )
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::regainFocus( void )
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::setListenerPosition( const Coord3D *position )
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::setViewRadius( Real viewRadius )
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::setCameraAudibleDistance( Real audibleDistance )
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+Real SoundManager::getCameraAudibleDistance( void )
+{
+	return 1.0f;
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::addAudioEvent(AudioEventRTS *&eventToAdd)
+{
+	if (m_num2DSamples == 0 && m_num3DSamples == 0) {
+		m_num2DSamples = TheAudio->getNum2DSamples();
+		m_num3DSamples = TheAudio->getNum3DSamples();
+	}
+
+	if (canPlayNow(eventToAdd)) {
+#ifdef INTENSIVE_AUDIO_DEBUG
+		DEBUG_LOG((" - appended to request list with handle '%d'.", (UnsignedInt) eventToAdd->getPlayingHandle()));
+#endif
+		AudioRequest *audioRequest = TheAudio->allocateAudioRequest( true );
+		audioRequest->m_pendingEvent = eventToAdd;
+		audioRequest->m_request = AR_Play;
+		TheAudio->appendAudioRequest(audioRequest);
+	} else {
+		TheAudio->releaseAudioEventRTS(eventToAdd);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::notifyOf2DSampleStart( void )
+{
+	++m_numPlaying2DSamples;
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::notifyOf3DSampleStart( void )
+{
+	++m_numPlaying3DSamples;
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::notifyOf2DSampleCompletion( void )
+{
+	if (m_numPlaying2DSamples > 0) {
+		--m_numPlaying2DSamples;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void SoundManager::notifyOf3DSampleCompletion( void )
+{
+	if (m_numPlaying3DSamples > 0) {
+		--m_numPlaying3DSamples;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+Int SoundManager::getAvailableSamples( void )
+{
+	return (m_num2DSamples - m_numPlaying2DSamples);
+}
+
+//-------------------------------------------------------------------------------------------------
+Int SoundManager::getAvailable3DSamples( void )
+{
+	return (m_num3DSamples - m_numPlaying3DSamples);
+}
+
+//-------------------------------------------------------------------------------------------------
+AsciiString SoundManager::getFilenameForPlayFromAudioEvent( const AudioEventRTS *eventToGetFrom )
+{
+	return AsciiString::TheEmptyString;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool SoundManager::canPlayNow( AudioEventRTS *event )
+{
+	Bool retVal = false;
+	// 1) Are we muted because we're beyond our maximum distance?
+	// 2) Are we shrouded and this is a shroud sound?
+	// 3) Are we violating our voice count or are we playing above the limit? (If so, stop now)
+	// 4) is there an avaiable channel open?
+	// 5) if not, then determine if there is anything of lower priority that we can kill
+	// 6) if not, are we an interrupt-sound type?
+	// if so, are there any sounds of our type playing right now that we can interrupt?
+	// potentially here: Are there any sounds that are playing that are now beyond their distance?
+	// if so, kill them and start our sound
+	// if not, we're done. Can't play dude.
+
+	if( event->isPositionalAudio() && !BitIsSet( event->getAudioEventInfo()->m_type, ST_GLOBAL) && event->getAudioEventInfo()->m_priority != AP_CRITICAL )
+	{
+		Coord3D distance = *TheAudio->getListenerPosition();
+		const Coord3D *pos = event->getCurrentPosition();
+		if (pos)
+		{
+			distance.sub(pos);
+			if (distance.length() >= event->getAudioEventInfo()->m_maxDistance)
+			{
+#ifdef INTENSIVE_AUDIO_DEBUG
+				DEBUG_LOG(("- culled due to distance (%.2f).", distance.length()));
+#endif
+				return false;
+			}
+
+			const Int localPlayerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
+
+			if( (event->getAudioEventInfo()->m_type & ST_SHROUDED) &&
+					 ThePartitionManager->getShroudStatusForPlayer(localPlayerIndex, pos) != CELLSHROUD_CLEAR )
+			{
+#ifdef INTENSIVE_AUDIO_DEBUG
+				DEBUG_LOG(("- culled due to shroud."));
+#endif
+				return false;
+			}
+		}
+	}
+
+	if (violatesVoice(event))
+	{
+		retVal = isInterrupting(event);
+		if (retVal)
+		{
+			return true;
+		}
+		else
+		{
+#ifdef INTENSIVE_AUDIO_DEBUG
+		DEBUG_LOG(("- culled due to voice."));
+#endif
+			return false;
+		}
+	}
+
+	if( TheAudio->doesViolateLimit( event ) )
+	{
+#ifdef INTENSIVE_AUDIO_DEBUG
+		DEBUG_LOG(("- culled due to limit." ));
+#endif
+		return false;
+	}
+	else if( isInterrupting( event ) )
+	{
+		return true;
+	}
+
+	if (event->isPositionalAudio())
+	{
+		if (m_numPlaying3DSamples < m_num3DSamples)
+		{
+			return true;
+		}
+#ifdef INTENSIVE_AUDIO_DEBUG
+		DEBUG_LOG(("- %d samples playing, %d samples available", m_numPlaying3DSamples, m_num3DSamples));
+#endif
+	}
+	else
+	{
+		// its a UI sound (and thus, 2-D)
+		if (m_numPlaying2DSamples < m_num2DSamples)
+		{
+			return true;
+		}
+	}
+
+	if (TheAudio->isPlayingLowerPriority(event))
+	{
+		return true;
+	}
+
+	if (isInterrupting(event))
+	{
+		retVal = TheAudio->isPlayingAlready(event);
+		if (retVal)
+		{
+			return true;
+		}
+		else
+		{
+#ifdef INTENSIVE_AUDIO_DEBUG
+			DEBUG_LOG(("- culled due to no channels available and non-interrupting." ));
+#endif
+			return false;
+		}
+	}
+#ifdef INTENSIVE_AUDIO_DEBUG
+	DEBUG_LOG(("culled due to unavailable channels"));
+#endif
+	return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool SoundManager::violatesVoice( AudioEventRTS *event )
+{
+	if (event->getAudioEventInfo()->m_type & ST_VOICE) {
+		return (event->getObjectID() && TheAudio->isObjectPlayingVoice(event->getObjectID()));
+	}
+	return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool SoundManager::isInterrupting( AudioEventRTS *event )
+{
+	return event->getAudioEventInfo()->m_control & AC_INTERRUPT;
+}
diff --git a/Core/GameEngine/Source/Common/Audio/simpleplayer.cpp b/Core/GameEngine/Source/Common/Audio/simpleplayer.cpp
new file mode 100644
index 00000000000..4af0d3a6a17
--- /dev/null
+++ b/Core/GameEngine/Source/Common/Audio/simpleplayer.cpp
@@ -0,0 +1,708 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "Common/simpleplayer.h"
+#include "Common/urllaunch.h"
+
+
+///////////////////////////////////////////////////////////////////////////////
+CSimplePlayer::CSimplePlayer( HRESULT* phr )
+{
+    m_cRef = 1;
+    m_cBuffersOutstanding = 0;
+
+    m_pReader = NULL;
+
+    m_pHeader = NULL;
+    m_hwo = NULL;
+
+    m_fEof = FALSE;
+    m_pszUrl = NULL;
+
+	*phr = S_OK;
+
+    m_hOpenEvent = CreateEvent( NULL, FALSE, FALSE, SIMPLE_PLAYER_OPEN_EVENT );
+	if ( NULL == m_hOpenEvent )
+	{
+		*phr = E_OUTOFMEMORY;
+	}
+    m_hCloseEvent = CreateEvent( NULL, FALSE, FALSE, SIMPLE_PLAYER_CLOSE_EVENT );
+	if ( NULL == m_hCloseEvent )
+	{
+		*phr = E_OUTOFMEMORY;
+	}
+
+    m_hrOpen = S_OK;
+
+	m_hCompletionEvent = NULL;
+
+    InitializeCriticalSection( &m_CriSec );
+    m_whdrHead = NULL;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+CSimplePlayer::~CSimplePlayer()
+{
+    DEBUG_ASSERTCRASH( 0 == m_cBuffersOutstanding,("CSimplePlayer destructor m_cBuffersOutstanding != 0") );
+
+    Close();
+
+    //
+    // final remove of everything in the wave header list
+    //
+    RemoveWaveHeaders();
+    DeleteCriticalSection( &m_CriSec );
+
+    if( m_pHeader != NULL )
+    {
+        m_pHeader->Release();
+        m_pHeader = NULL;
+    }
+
+    if( m_pReader != NULL )
+    {
+        m_pReader->Release();
+        m_pReader = NULL;
+    }
+
+    if( m_hwo != NULL )
+    {
+        waveOutClose( m_hwo );
+    }
+
+    delete [] m_pszUrl;
+
+	if ( m_hOpenEvent )
+	{
+	    CloseHandle( m_hOpenEvent );
+	}
+	if ( m_hCloseEvent )
+	{
+        CloseHandle( m_hCloseEvent );
+	}
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+HRESULT STDMETHODCALLTYPE CSimplePlayer::QueryInterface(
+    REFIID riid,
+    void **ppvObject )
+{
+    return( E_NOINTERFACE );
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+ULONG STDMETHODCALLTYPE CSimplePlayer::AddRef()
+{
+    return( InterlockedIncrement( &m_cRef ) );
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+ULONG STDMETHODCALLTYPE CSimplePlayer::Release()
+{
+    ULONG uRet = InterlockedDecrement( &m_cRef );
+
+    if( 0 == uRet )
+    {
+        delete this;
+    }
+
+    return( uRet );
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+HRESULT STDMETHODCALLTYPE CSimplePlayer::OnSample(
+        /* [in] */ DWORD dwOutputNum,
+        /* [in] */ QWORD cnsSampleTime,
+        /* [in] */ QWORD cnsSampleDuration,
+        /* [in] */ DWORD dwFlags,
+        /* [in] */ INSSBuffer __RPC_FAR *pSample,
+        /* [in] */ VOID *pvContext )
+{
+    if( 0 != dwOutputNum )
+    {
+        return( S_OK );
+    }
+
+    HRESULT hr = S_OK;
+    BYTE *pData;
+    DWORD cbData;
+
+    //
+    // first UnprepareHeader and remove everthing in the ready list
+    //
+    RemoveWaveHeaders( );
+
+    hr = pSample->GetBufferAndLength( &pData, &cbData );
+    if ( FAILED( hr ) )
+    {
+        return( E_UNEXPECTED );
+    }
+
+    DEBUG_LOG(( " New Sample of length %d and PS time %d ms",
+              cbData, ( DWORD ) ( cnsSampleTime / 10000 ) ));
+
+    LPWAVEHDR pwh = (LPWAVEHDR) new BYTE[ sizeof( WAVEHDR ) + cbData ];
+
+    if( NULL == pwh )
+    {
+        DEBUG_LOG(( "OnSample OUT OF MEMORY! "));
+
+        *m_phrCompletion = E_OUTOFMEMORY;
+        SetEvent( m_hCompletionEvent );
+        return( E_UNEXPECTED );
+    }
+
+    pwh->lpData = (LPSTR)&pwh[1];
+    pwh->dwBufferLength = cbData;
+    pwh->dwBytesRecorded = cbData;
+    pwh->dwUser = 0;
+    pwh->dwLoops = 0;
+    pwh->dwFlags = 0;
+
+    CopyMemory( pwh->lpData, pData, cbData );
+
+    MMRESULT mmr;
+
+    mmr = waveOutPrepareHeader( m_hwo, pwh, sizeof(WAVEHDR) );
+    mmr = MMSYSERR_NOERROR;
+
+    if( mmr != MMSYSERR_NOERROR )
+    {
+        DEBUG_LOG(( "failed to prepare wave buffer, error=%lu" , mmr ));
+        *m_phrCompletion = E_UNEXPECTED;
+        SetEvent( m_hCompletionEvent );
+        return( E_UNEXPECTED );
+    }
+
+    mmr = waveOutWrite( m_hwo, pwh, sizeof(WAVEHDR) );
+    mmr = MMSYSERR_NOERROR;
+
+    if( mmr != MMSYSERR_NOERROR )
+    {
+        delete pwh;
+
+        DEBUG_LOG(( "failed to write wave sample, error=%lu" , mmr ));
+        *m_phrCompletion = E_UNEXPECTED;
+        SetEvent( m_hCompletionEvent );
+        return( E_UNEXPECTED );
+    }
+
+    InterlockedIncrement( &m_cBuffersOutstanding );
+
+    return( S_OK );
+}
+
+///////////////////////////////////////////////////////////////////////////////
+HRESULT CSimplePlayer::Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hCompletionEvent, HRESULT *phrCompletion )
+{
+    HRESULT hr;
+
+    //
+    // If the URL is not a UNC path, a full path, or an Internet-style URL then assume it is
+    // a relative local file name that needs to be expanded to a full path.
+    //
+    WCHAR wszFullUrl[ MAX_PATH ];
+
+    if( ( 0 == wcsstr( pszUrl, L"\\\\" ) )
+        && ( 0 == wcsstr( pszUrl, L":\\" ) )
+        && ( 0 == wcsstr( pszUrl, L"://" ) ) )
+    {
+        //
+        // Expand to a full path name
+        //
+        LPWSTR pszCheck = _wfullpath( wszFullUrl, pszUrl, MAX_PATH );
+
+        if( NULL == pszCheck )
+        {
+           DEBUG_LOG(( "internal error %lu" , GetLastError() ));
+           return E_UNEXPECTED ;
+        }
+
+		pszUrl = wszFullUrl;
+    }
+
+    //
+    // Save a copy of the URL
+    //
+    delete[] m_pszUrl;
+
+    m_pszUrl = new WCHAR[ wcslen( pszUrl ) + 1 ];
+
+    if( NULL == m_pszUrl )
+    {
+        DEBUG_LOG(( "insufficient Memory"  )) ;
+        return( E_OUTOFMEMORY );
+    }
+
+    wcscpy( m_pszUrl, pszUrl );
+
+    //
+    // Attempt to open the URL
+    //
+    m_hCompletionEvent = hCompletionEvent;
+
+    m_phrCompletion = phrCompletion;
+
+#ifdef SUPPORT_DRM
+
+    hr = WMCreateReader( NULL, WMT_RIGHT_PLAYBACK, &m_pReader );
+
+#else
+
+    hr = WMCreateReader( NULL, 0, &m_pReader );
+
+#endif
+
+    if( FAILED( hr ) )
+    {
+        DEBUG_LOG(( "failed to create audio reader (hr=0x%08x)" , hr ));
+        return( hr );
+    }
+
+    //
+    // Open the file
+    //
+    hr = m_pReader->Open( m_pszUrl, this, NULL );
+    if ( SUCCEEDED( hr ) )
+    {
+        WaitForSingleObject( m_hOpenEvent, INFINITE );
+        hr = m_hrOpen;
+    }
+    if ( NS_E_NO_STREAM == hr )
+    {
+        DEBUG_LOG(( "Waiting for transmission to begin..." ));
+        WaitForSingleObject( m_hOpenEvent, INFINITE );
+        hr = m_hrOpen;
+    }
+    if ( FAILED( hr ) )
+    {
+        DEBUG_LOG(( "failed to open (hr=0x%08x)", hr ));
+        return( hr );
+    }
+
+
+    //
+    // It worked!  Display various attributes
+    //
+    hr = m_pReader->QueryInterface( IID_IWMHeaderInfo, ( VOID ** )&m_pHeader );
+    if ( FAILED( hr ) )
+    {
+        DEBUG_LOG(( "failed to qi for header interface (hr=0x%08x)" , hr ));
+        return( hr );
+    }
+
+    WORD i, wAttrCnt;
+
+    hr = m_pHeader->GetAttributeCount( 0, &wAttrCnt );
+    if ( FAILED( hr ) )
+    {
+        DEBUG_LOG(( "GetAttributeCount Failed (hr=0x%08x)" , hr ));
+        return( hr );
+    }
+
+    WCHAR *pwszName = NULL;
+    BYTE *pValue = NULL;
+
+    for ( i = 0; i < wAttrCnt ; i++ )
+    {
+        WORD wStream = 0;
+        WORD cchNamelen = 0;
+        WMT_ATTR_DATATYPE type;
+        WORD cbLength = 0;
+
+        hr = m_pHeader->GetAttributeByIndex( i, &wStream, NULL, &cchNamelen, &type, NULL, &cbLength );
+        if ( FAILED( hr ) )
+        {
+            DEBUG_LOG(( "GetAttributeByIndex Failed (hr=0x%08x)" , hr ));
+            break;
+        }
+
+        pwszName = new WCHAR[ cchNamelen ];
+        pValue = new BYTE[ cbLength ];
+
+        if( NULL == pwszName || NULL == pValue )
+        {
+            hr = E_OUTOFMEMORY;
+            break;
+        }
+
+        hr = m_pHeader->GetAttributeByIndex( i, &wStream, pwszName, &cchNamelen, &type, pValue, &cbLength );
+        if ( FAILED( hr ) )
+        {
+            DEBUG_LOG(( "GetAttributeByIndex Failed (hr=0x%08x)" , hr ));
+            break;
+        }
+
+        switch ( type )
+        {
+        case WMT_TYPE_DWORD:
+            DEBUG_LOG(("%ws:  %u" , pwszName, *((DWORD *) pValue) ));
+            break;
+        case WMT_TYPE_STRING:
+            DEBUG_LOG(("%ws:   %ws" , pwszName, (WCHAR *) pValue ));
+            break;
+        case WMT_TYPE_BINARY:
+            DEBUG_LOG(("%ws:   Type = Binary of Length %u" , pwszName, cbLength ));
+            break;
+        case WMT_TYPE_BOOL:
+            DEBUG_LOG(("%ws:   %s" , pwszName, ( * ( ( BOOL * ) pValue) ? _T( "true" ) : _T( "false" ) ) ));
+            break;
+        case WMT_TYPE_WORD:
+            DEBUG_LOG(("%ws:  %hu" , pwszName, *((WORD *) pValue) ));
+            break;
+        case WMT_TYPE_QWORD:
+            DEBUG_LOG(("%ws:  %I64u" , pwszName, *((QWORD *) pValue) ));
+            break;
+        case WMT_TYPE_GUID:
+            DEBUG_LOG(("%ws:  %I64x%I64x" , pwszName, *((QWORD *) pValue), *((QWORD *) pValue + 1) ));
+            break;
+        default:
+            DEBUG_LOG(("%ws:   Type = %d, Length %u" , pwszName, type, cbLength ));
+            break;
+        }
+
+        delete pwszName;
+        pwszName = NULL;
+
+        delete pValue;
+        pValue = NULL;
+    }
+
+    delete pwszName;
+    pwszName = NULL;
+
+    delete pValue;
+    pValue = NULL;
+
+    if ( FAILED( hr ) )
+    {
+        return( hr );
+    }
+
+    //
+    // Make sure we're audio only
+    //
+    DWORD cOutputs;
+
+    hr = m_pReader->GetOutputCount( &cOutputs );
+    if ( FAILED( hr ) )
+    {
+        DEBUG_LOG(( "failed GetOutputCount(), (hr=0x%08x)" , hr ));
+        return( hr );
+    }
+
+    if ( cOutputs != 1 )
+    {
+        DEBUG_LOG(( "Not audio only (cOutputs = %d)." , cOutputs ));
+        // return( E_UNEXPECTED );
+    }
+
+    IWMOutputMediaProps *pProps;
+    hr = m_pReader->GetOutputProps( 0, &pProps );
+    if ( FAILED( hr ) )
+    {
+        DEBUG_LOG(( "failed GetOutputProps(), (hr=0x%08x)" , hr ));
+        return( hr );
+    }
+
+    DWORD cbBuffer = 0;
+
+    hr = pProps->GetMediaType( NULL, &cbBuffer );
+    if ( FAILED( hr ) )
+    {
+        pProps->Release( );
+        DEBUG_LOG(( "GetMediaType failed (hr=0x%08x)" , hr ));
+        return( hr );
+    }
+
+	WM_MEDIA_TYPE *pMediaType = ( WM_MEDIA_TYPE * ) new BYTE[cbBuffer] ;
+
+	hr = pProps->GetMediaType( pMediaType, &cbBuffer );
+    if ( FAILED( hr ) )
+    {
+        pProps->Release( );
+        DEBUG_LOG(( "GetMediaType failed (hr=0x%08x)" , hr ));
+        return( hr );
+    }
+
+    pProps->Release( );
+
+    if ( pMediaType->majortype != WMMEDIATYPE_Audio )
+    {
+		delete[] (BYTE *) pMediaType ;
+        DEBUG_LOG(( "Not audio only (major type mismatch)."  ));
+        return( E_UNEXPECTED );
+    }
+
+    //
+    // Set up for audio playback
+    //
+    WAVEFORMATEX *pwfx = ( WAVEFORMATEX * )pMediaType->pbFormat;
+    memcpy( &m_wfx, pwfx, sizeof( WAVEFORMATEX ) + pwfx->cbSize );
+
+    delete[] (BYTE *)pMediaType ;
+	pMediaType = NULL ;
+
+    MMRESULT mmr;
+
+    mmr = waveOutOpen( &m_hwo,
+                       WAVE_MAPPER,
+                       &m_wfx,
+                       (DWORD)WaveProc,
+                       (DWORD)this,
+                       CALLBACK_FUNCTION );
+    mmr = MMSYSERR_NOERROR;
+
+    if( mmr != MMSYSERR_NOERROR  )
+    {
+
+        DEBUG_LOG(( "failed to open wav output device, error=%lu" , mmr ));
+        return( E_UNEXPECTED );
+    }
+
+    //
+    // Start reading the data (and rendering the audio)
+    //
+    QWORD cnsDuration = ( QWORD ) dwSecDuration * 10000000;
+    hr = m_pReader->Start( 0, cnsDuration, 1.0, NULL );
+
+    if( FAILED( hr ) )
+    {
+        DEBUG_LOG(( "failed Start(), (hr=0x%08x)" , hr ));
+        return( hr );
+    }
+
+    return( hr );
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+HRESULT STDMETHODCALLTYPE CSimplePlayer::OnStatus(
+        /* [in] */ WMT_STATUS Status,
+        /* [in] */ HRESULT hr,
+        /* [in] */ WMT_ATTR_DATATYPE dwType,
+        /* [in] */ BYTE __RPC_FAR *pValue,
+        /* [in] */ void __RPC_FAR *pvContext)
+{
+    switch( Status )
+    {
+    case WMT_OPENED:
+        DEBUG_LOG(( "OnStatus( WMT_OPENED )"  ));
+        m_hrOpen = hr;
+        SetEvent( m_hOpenEvent );
+        break;
+
+    case WMT_SOURCE_SWITCH:
+        DEBUG_LOG(( "OnStatus( WMT_SOURCE_SWITCH )"  ));
+        m_hrOpen = hr;
+        SetEvent( m_hOpenEvent );
+        break;
+
+    case WMT_ERROR:
+        DEBUG_LOG(( "OnStatus( WMT_ERROR )"  ));
+        break;
+
+    case WMT_STARTED:
+        DEBUG_LOG(( "OnStatus( WMT_STARTED )"  ));
+        break;
+
+    case WMT_STOPPED:
+        DEBUG_LOG(( "OnStatus( WMT_STOPPED )"  ));
+        break;
+
+    case WMT_BUFFERING_START:
+        DEBUG_LOG(( "OnStatus( WMT_BUFFERING START)"  ));
+        break;
+
+    case WMT_BUFFERING_STOP:
+        DEBUG_LOG(( "OnStatus( WMT_BUFFERING STOP)"  ));
+        break;
+
+    case WMT_EOF:
+        DEBUG_LOG(( "OnStatus( WMT_EOF )"  ));
+
+        //
+        // cleanup and exit
+        //
+
+        m_fEof = TRUE;
+
+        if( 0 == m_cBuffersOutstanding )
+        {
+            SetEvent( m_hCompletionEvent );
+        }
+
+        break;
+
+    case WMT_END_OF_SEGMENT:
+        DEBUG_LOG(( "OnStatus( WMT_END_OF_SEGMENT )"  ));
+
+        //
+        // cleanup and exit
+        //
+
+        m_fEof = TRUE;
+
+        if( 0 == m_cBuffersOutstanding )
+        {
+            SetEvent( m_hCompletionEvent );
+        }
+
+        break;
+
+    case WMT_LOCATING:
+        DEBUG_LOG(( "OnStatus( WMT_LOCATING )"  ));
+        break;
+
+    case WMT_CONNECTING:
+        DEBUG_LOG(( "OnStatus( WMT_CONNECTING )"  ));
+        break;
+
+    case WMT_NO_RIGHTS:
+        {
+            LPWSTR pwszEscapedURL = NULL;
+
+            hr = MakeEscapedURL( m_pszUrl, &pwszEscapedURL );
+
+            if( SUCCEEDED( hr ) )
+            {
+                WCHAR wszURL[ 0x1000 ];
+
+                swprintf( wszURL, L"%s&filename=%s&embedded=false", pValue, pwszEscapedURL );
+
+                hr = LaunchURL( wszURL );
+
+                if( FAILED( hr ) )
+                {
+                    DEBUG_LOG(( "Unable to launch web browser to retrieve playback license (hr=0x%08x)" , hr ));
+                }
+
+                delete [] pwszEscapedURL;
+				pwszEscapedURL = NULL ;
+            }
+        }
+        break;
+
+    case WMT_MISSING_CODEC:
+		{
+			DEBUG_LOG(( "Missing codec: (hr=0x%08x)" , hr ));
+			break;
+		}
+
+    case WMT_CLOSED:
+        SetEvent( m_hCloseEvent );
+        break;
+    };
+
+    return( S_OK );
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+HRESULT CSimplePlayer::Close()
+{
+    HRESULT hr = S_OK;
+
+    if( NULL != m_pReader )
+    {
+        hr = m_pReader->Close();
+
+        if( SUCCEEDED( hr ) )
+        {
+            WaitForSingleObject( m_hCloseEvent, INFINITE );
+        }
+    }
+
+    return( hr );
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+void CSimplePlayer::OnWaveOutMsg( UINT uMsg, DWORD dwParam1, DWORD dwParam2 )
+{
+    if( WOM_DONE == uMsg )
+    {
+        //
+        // add the wave header to ready-to-free list for the caller
+        // to pick up and free in the next OnSample call
+        //
+        AddWaveHeader( ( LPWAVEHDR )dwParam1 );
+
+        InterlockedDecrement( &m_cBuffersOutstanding );
+
+        if( m_fEof && ( 0 == m_cBuffersOutstanding ) )
+        {
+            SetEvent( m_hCompletionEvent );
+        }
+    }
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+void CALLBACK CSimplePlayer::WaveProc(
+                                HWAVEOUT hwo,
+                                UINT uMsg,
+                                DWORD dwInstance,
+                                DWORD dwParam1,
+                                DWORD dwParam2 )
+{
+    CSimplePlayer *pThis = (CSimplePlayer*)dwInstance;
+
+    pThis->OnWaveOutMsg( uMsg, dwParam1, dwParam2 );
+}
+
+//////////////////////////////////////////////////////////////////////////////
+HRESULT CSimplePlayer::AddWaveHeader( LPWAVEHDR pwh )
+{
+    WAVEHDR_LIST *tmp = new WAVEHDR_LIST;
+    if( NULL == tmp )
+    {
+        return( E_OUTOFMEMORY );
+    }
+    tmp->pwh = pwh;
+
+    EnterCriticalSection( &m_CriSec );
+    tmp->next = m_whdrHead;
+    m_whdrHead = tmp;
+    LeaveCriticalSection( &m_CriSec );
+    return( S_OK );
+}
+
+//////////////////////////////////////////////////////////////////////////////
+void CSimplePlayer::RemoveWaveHeaders( )
+{
+    WAVEHDR_LIST *tmp;
+
+    EnterCriticalSection( &m_CriSec );
+    while( NULL != m_whdrHead )
+    {
+        tmp = m_whdrHead->next;
+        DEBUG_ASSERTCRASH( m_whdrHead->pwh->dwFlags & WHDR_DONE, ("RemoveWaveHeaders!") );
+        waveOutUnprepareHeader( m_hwo, m_whdrHead->pwh, sizeof( WAVEHDR ) );
+        delete m_whdrHead->pwh;
+        delete m_whdrHead;
+        m_whdrHead = tmp;
+    }
+    LeaveCriticalSection( &m_CriSec );
+}
diff --git a/Core/GameEngine/Source/Common/Audio/urllaunch.cpp b/Core/GameEngine/Source/Common/Audio/urllaunch.cpp
new file mode 100644
index 00000000000..6ac481a89c0
--- /dev/null
+++ b/Core/GameEngine/Source/Common/Audio/urllaunch.cpp
@@ -0,0 +1,338 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "Common/urllaunch.h"
+
+#define FILE_PREFIX     L"file://"
+
+
+///////////////////////////////////////////////////////////////////////////////
+HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL )
+{
+    if( ( NULL == pszInURL ) || ( NULL == ppszOutURL ) )
+    {
+        return( E_INVALIDARG );
+    }
+
+    //
+    // Do we need to pre-pend file://?
+    //
+    BOOL fNeedFilePrefix = ( 0 == wcsstr( pszInURL, L"://" ) );
+
+    //
+    // Count how many characters need to be escaped
+    //
+    LPWSTR pszTemp = pszInURL;
+    DWORD cEscapees = 0;
+
+    while( TRUE )
+    {
+        LPWSTR pchToEscape = wcspbrk( pszTemp, L" #$%&\\+,;=@[]^{}" );
+
+        if( NULL == pchToEscape )
+        {
+            break;
+        }
+
+        cEscapees++;
+
+        pszTemp = pchToEscape + 1;
+    }
+
+    //
+    // Allocate sufficient outgoing buffer space
+    //
+    int cchNeeded = wcslen( pszInURL ) + ( 2 * cEscapees ) + 1;
+
+    if( fNeedFilePrefix )
+    {
+        cchNeeded += wcslen( FILE_PREFIX );
+    }
+
+    *ppszOutURL = new WCHAR[ cchNeeded ];
+
+    if( NULL == *ppszOutURL )
+    {
+        return( E_OUTOFMEMORY );
+    }
+
+    //
+    // Fill in the outgoing escaped buffer
+    //
+    pszTemp = pszInURL;
+
+    LPWSTR pchNext = *ppszOutURL;
+
+    if( fNeedFilePrefix )
+    {
+        wcscpy( *ppszOutURL, FILE_PREFIX );
+        pchNext += wcslen( FILE_PREFIX );
+    }
+
+    while( TRUE )
+    {
+        LPWSTR pchToEscape = wcspbrk( pszTemp, L" #$%&\\+,;=@[]^{}" );
+
+        if( NULL == pchToEscape )
+        {
+            //
+            // Copy the rest of the input string and get out
+            //
+            wcscpy( pchNext, pszTemp );
+            break;
+        }
+
+        //
+        // Copy all characters since the previous escapee
+        //
+        int cchToCopy = pchToEscape - pszTemp;
+
+        if( cchToCopy > 0 )
+        {
+            wcsncpy( pchNext, pszTemp, cchToCopy );
+
+            pchNext += cchToCopy;
+        }
+
+        //
+        // Expand this character into an escape code and move on
+        //
+        pchNext += swprintf( pchNext, L"%%%02x", *pchToEscape );
+
+        pszTemp = pchToEscape + 1;
+    }
+
+    return( S_OK );
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+HRESULT GetShellOpenCommand( LPTSTR ptszShellOpenCommand, DWORD cbShellOpenCommand )
+{
+    LONG lResult;
+
+    HKEY hKey = NULL;
+    HKEY hFileKey = NULL;
+
+    BOOL fFoundExtensionCommand = FALSE;
+
+    do
+    {
+        //
+        // Look for the file type associated with .html files
+        //
+        TCHAR szFileType[ MAX_PATH ];
+
+        lResult = RegOpenKeyEx( HKEY_CLASSES_ROOT, _T( ".html" ), 0, KEY_READ, &hKey );
+
+        if( ERROR_SUCCESS != lResult )
+        {
+            break;
+        }
+
+        DWORD dwLength = sizeof( szFileType );
+
+        lResult = RegQueryValueEx( hKey, NULL, 0, NULL, (BYTE *)szFileType, &dwLength );
+
+        if( ERROR_SUCCESS != lResult )
+        {
+            break;
+        }
+
+        //
+        // Find the command for the shell's open verb associated with this file type
+        //
+        TCHAR szKeyName[ MAX_PATH + 20 ];
+
+        wsprintf( szKeyName, _T( "%s\\shell\\open\\command" ), szFileType );
+
+        lResult = RegOpenKeyEx( HKEY_CLASSES_ROOT, szKeyName, 0, KEY_READ, &hFileKey );
+
+        if( ERROR_SUCCESS != lResult )
+        {
+            break;
+        }
+
+        dwLength = cbShellOpenCommand;
+
+        lResult = RegQueryValueEx( hFileKey, NULL, 0, NULL, (BYTE *)ptszShellOpenCommand, &dwLength );
+
+        if( 0 == lResult )
+        {
+            fFoundExtensionCommand = TRUE;
+        }
+    }
+    while( FALSE );
+
+    //
+    // If there was no application associated with .html files by extension, look for
+    // an application associated with the http protocol
+    //
+    if( !fFoundExtensionCommand )
+    {
+        if( NULL != hKey )
+        {
+            RegCloseKey( hKey );
+        }
+
+        do
+        {
+            //
+            // Find the command for the shell's open verb associated with the http protocol
+            //
+            lResult = RegOpenKeyEx( HKEY_CLASSES_ROOT, _T( "http\\shell\\open\\command" ), 0, KEY_READ, &hKey );
+
+            if( ERROR_SUCCESS != lResult )
+            {
+                break;
+            }
+
+            DWORD dwLength = cbShellOpenCommand;
+
+            lResult = RegQueryValueEx( hKey, NULL, 0, NULL, (BYTE *)ptszShellOpenCommand, &dwLength );
+        }
+        while( FALSE );
+    }
+
+    if( NULL != hKey )
+    {
+        RegCloseKey( hKey );
+    }
+
+    if( NULL != hFileKey )
+    {
+        RegCloseKey( hFileKey );
+    }
+
+    return( HRESULT_FROM_WIN32( lResult ) );
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+HRESULT LaunchURL( LPCWSTR pszURL )
+{
+    HRESULT hr;
+
+    //
+    // Find the appropriate command to launch URLs with
+    //
+    TCHAR szShellOpenCommand[ MAX_PATH * 2 ];
+
+    hr = GetShellOpenCommand( szShellOpenCommand, sizeof( szShellOpenCommand ) );
+
+    if( FAILED( hr ) )
+    {
+        return( hr );
+    }
+
+    //
+    // Build the appropriate command line, substituting our URL parameter
+    //
+    TCHAR szLaunchCommand[ 2000 ];
+
+    LPTSTR pszParam = _tcsstr( szShellOpenCommand, _T( "\"%1\"" ) );
+
+    if( NULL == pszParam )
+    {
+        pszParam = _tcsstr( szShellOpenCommand, _T( "\"%*\"" ) );
+    }
+
+    if( NULL != pszParam )
+    {
+        *pszParam = _T( '\0' ) ;
+
+        wsprintf( szLaunchCommand, _T( "%s%ws%s" ), szShellOpenCommand, pszURL, pszParam + 4 );
+    }
+    else
+    {
+        wsprintf( szLaunchCommand, _T( "%s %ws" ), szShellOpenCommand, pszURL );
+    }
+
+    //
+    // Find the application name, stripping quotes if necessary
+    //
+    TCHAR szExe[ MAX_PATH * 2 ];
+    LPTSTR pchFirst = szShellOpenCommand;
+    LPTSTR pchNext = NULL;
+
+    while( _T( ' ' ) == *pchFirst )
+    {
+        pchFirst++;
+    }
+
+    if( _T( '"' ) == *pchFirst )
+    {
+        pchFirst++;
+
+        pchNext = _tcschr( pchFirst, _T( '"' ) );
+    }
+    else
+    {
+        pchNext = _tcschr( pchFirst + 1, _T( ' ' ) );
+    }
+
+    if( NULL == pchNext )
+    {
+        pchNext = szShellOpenCommand + _tcslen( szShellOpenCommand );
+    }
+
+    _tcsncpy( szExe, pchFirst, pchNext - pchFirst );
+    szExe[ pchNext - pchFirst ] = _T( '\0' ) ;
+
+    //
+    // Because of the extremely long length of the URLs, neither
+    // WinExec, nor ShellExecute, were working correctly.  For this reason
+    // we use CreateProcess.  The CreateProcess documentation in MSDN says
+    // that the most robust way to call CreateProcess is to pass the full
+    // command line, where the first element is the application name, in the
+    // lpCommandLine parameter.  In our case this is necesssary to get Netscape
+    // to function properly.
+    //
+    PROCESS_INFORMATION ProcInfo;
+    ZeroMemory( (LPVOID)&ProcInfo, sizeof( PROCESS_INFORMATION ) );
+
+    STARTUPINFO StartUp;
+    ZeroMemory( (LPVOID)&StartUp, sizeof( STARTUPINFO ) );
+
+    StartUp.cb = sizeof(STARTUPINFO);
+
+    if( !CreateProcess( szExe, szLaunchCommand, NULL, NULL,
+                        FALSE, 0, NULL, NULL, &StartUp, &ProcInfo) )
+    {
+        hr = HRESULT_FROM_WIN32( GetLastError() );
+    }
+    else
+    {
+        //
+        // CreateProcess succeeded and we do not need the handles to the thread
+        // or the process, so close them now.
+        //
+        if( NULL != ProcInfo.hThread )
+        {
+            CloseHandle( ProcInfo.hThread );
+        }
+
+        if( NULL != ProcInfo.hProcess )
+        {
+            CloseHandle( ProcInfo.hProcess );
+        }
+    }
+
+    return( hr );
+}
diff --git a/Core/GameEngine/Source/Common/CRCDebug.cpp b/Core/GameEngine/Source/Common/CRCDebug.cpp
new file mode 100644
index 00000000000..6b46e248bbc
--- /dev/null
+++ b/Core/GameEngine/Source/Common/CRCDebug.cpp
@@ -0,0 +1,319 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/CRCDebug.h"
+#include "Common/Debug.h"
+#include "Common/PerfTimer.h"
+#include "Common/LocalFileSystem.h"
+#include "GameClient/InGameUI.h"
+#include "GameNetwork/IPEnumeration.h"
+#include <cstdarg>
+
+
+#ifdef DEBUG_CRC
+
+static const Int MaxStrings = 64000;
+static const Int MaxStringLen = 1024;
+
+static char DebugStrings[MaxStrings][MaxStringLen];
+static Int nextDebugString = 0;
+static Int numDebugStrings = 0;
+//static char DumpStrings[MaxStrings][MaxStringLen];
+//static Int nextDumpString = 0;
+//static Int numDumpStrings = 0;
+
+#define IS_FRAME_OK_TO_LOG TheGameLogic->isInGame() && !TheGameLogic->isInShellGame() && !TheDebugIgnoreSyncErrors && \
+	TheCRCFirstFrameToLog >= 0 && TheCRCFirstFrameToLog <= TheGameLogic->getFrame() \
+	&& TheGameLogic->getFrame() <= TheCRCLastFrameToLog
+
+CRCVerification::CRCVerification()
+{
+#ifdef DEBUG_LOGGING
+/**/
+	if (g_verifyClientCRC && (IS_FRAME_OK_TO_LOG))
+	{
+		m_startCRC = TheGameLogic->getCRC(CRC_RECALC, (g_clientDeepCRC)?"clientPre.crc":"");
+	}
+	else
+	{
+		m_startCRC = 0;
+	}
+/**/
+#endif
+}
+
+CRCVerification::~CRCVerification()
+{
+#ifdef DEBUG_LOGGING
+/**/
+	UnsignedInt endCRC = 0;
+	if (g_verifyClientCRC && (IS_FRAME_OK_TO_LOG))
+	{
+		endCRC = TheGameLogic->getCRC(CRC_RECALC, (g_clientDeepCRC)?"clientPost.crc":"");
+	}
+	DEBUG_ASSERTCRASH(!TheGameLogic->isInGame() || m_startCRC == endCRC, ("GameLogic changed outside of GameLogic::update() on frame %d!", TheGameLogic->getFrame()));
+	if (TheGameLogic->isInMultiplayerGame() && m_startCRC != endCRC)
+	{
+		if (TheInGameUI)
+		{
+			TheInGameUI->message(L"GameLogic changed outside of GameLogic::update() - call Matt (x36804)!");
+		}
+		CRCDEBUG_LOG(("GameLogic changed outside of GameLogic::update()!!!"));
+	}
+/**/
+#endif
+}
+
+void outputCRCDebugLines( void )
+{
+	IPEnumeration ips;
+	AsciiString fname;
+	fname.format("crcDebug%s.txt", ips.getMachineName().str());
+	FILE *fp = fopen(fname.str(), "wt");
+	int start = 0;
+	int end = nextDebugString;
+	if (numDebugStrings >= MaxStrings)
+		start = nextDebugString - MaxStrings;
+
+	for (Int i=start; i<end; ++i)
+	{
+		const char *line = DebugStrings[ (i + MaxStrings) % MaxStrings ];
+		DEBUG_LOG(("%s", line));
+		if (fp) fprintf(fp, "%s\n", line);
+	}
+
+	if (fp) fclose(fp);
+}
+
+Int lastCRCDebugFrame = 0;
+Int lastCRCDebugIndex = 0;
+extern Bool inCRCGen;
+
+void CRCDebugStartNewGame()
+{
+	if (TheGameLogic->isInShellGame())
+		return;
+	if (g_saveDebugCRCPerFrame)
+	{
+		// Create folder for frame data, if it doesn't exist yet.
+		CreateDirectory(g_saveDebugCRCPerFrameDir.str(), NULL);
+
+		// Delete existing files
+		FilenameList files;
+		AsciiString dir = g_saveDebugCRCPerFrameDir;
+		dir.concat("/");
+		TheLocalFileSystem->getFileListInDirectory(dir.str(), "", "DebugFrame_*.txt", files, FALSE);
+		FilenameList::iterator it;
+		for (it = files.begin(); it != files.end(); ++it)
+		{
+			DeleteFile(it->str());
+		}
+	}
+	nextDebugString = 0;
+	numDebugStrings = 0;
+	lastCRCDebugFrame = 0;
+	lastCRCDebugIndex = 0;
+}
+
+static void outputCRCDebugLinesPerFrame()
+{
+	if (!g_saveDebugCRCPerFrame || numDebugStrings == 0)
+		return;
+	AsciiString fname;
+	fname.format("%s/DebugFrame_%06d.txt", g_saveDebugCRCPerFrameDir.str(), lastCRCDebugFrame);
+	FILE *fp = fopen(fname.str(), "wt");
+	int start = 0;
+	int end = nextDebugString;
+	if (numDebugStrings >= MaxStrings)
+		start = nextDebugString - MaxStrings;
+	nextDebugString = 0;
+	numDebugStrings = 0;
+	if (!fp)
+		return;
+
+	for (Int i=start; i<end; ++i)
+	{
+		const char *line = DebugStrings[ (i + MaxStrings) % MaxStrings ];
+		//DEBUG_LOG(("%s", line));
+		fprintf(fp, "%s\n", line);
+	}
+
+	fclose(fp);
+}
+
+void outputCRCDumpLines( void )
+{
+	/*
+	int start = 0;
+	int end = nextDumpString;
+	if (numDumpStrings >= MaxStrings)
+		start = nextDumpString - MaxStrings;
+
+	for (Int i=start; i<end; ++i)
+	{
+		const char *line = DumpStrings[ (i + MaxStrings) % MaxStrings ];
+		DEBUG_LOG(("%s", line));
+	}
+	*/
+}
+
+static AsciiString getFname(AsciiString path)
+{
+	return path.reverseFind('\\') + 1;
+}
+
+static void addCRCDebugLineInternal(bool count, const char *fmt, va_list args)
+{
+	if (TheGameLogic == NULL || !(IS_FRAME_OK_TO_LOG))
+		return;
+
+	if (lastCRCDebugFrame != TheGameLogic->getFrame())
+	{
+		outputCRCDebugLinesPerFrame();
+		lastCRCDebugFrame = TheGameLogic->getFrame();
+		lastCRCDebugIndex = 0;
+	}
+
+	if (count)
+		sprintf(DebugStrings[nextDebugString], "%d:%05d ", TheGameLogic->getFrame(), lastCRCDebugIndex++);
+	else
+		DebugStrings[nextDebugString][0] = 0;
+	Int len = strlen(DebugStrings[nextDebugString]);
+
+	vsnprintf(DebugStrings[nextDebugString]+len, MaxStringLen-len, fmt, args);
+
+	char *tmp = DebugStrings[nextDebugString];
+	while (tmp && *tmp)
+	{
+		if (*tmp == '\r' || *tmp == '\n')
+		{
+			*tmp = ' ';
+		}
+		++tmp;
+	}
+
+	//DEBUG_LOG(("%s", DebugStrings[nextDebugString]));
+
+	++nextDebugString;
+	++numDebugStrings;
+	if (nextDebugString == MaxStrings)
+		nextDebugString = 0;
+}
+
+void addCRCDebugLine(const char *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    addCRCDebugLineInternal(true, fmt, args);
+    va_end(args);
+}
+
+void addCRCDebugLineNoCounter(const char *fmt, ...)
+{
+	// TheSuperHackers @feature helmutbuhler 04/09/2025
+	// This version doesn't increase the lastCRCDebugIndex counter
+	// and can be used for logging lines that don't necessarily match up on all peers.
+	// (Otherwise the numbers would no longer match up and the diff would be very difficult to read)
+    va_list args;
+    va_start(args, fmt);
+    addCRCDebugLineInternal(false, fmt, args);
+    va_end(args);
+}
+
+void addCRCGenLine(const char *fmt, ...)
+{
+	if (!(IS_FRAME_OK_TO_LOG))
+		return;
+
+	static char buf[MaxStringLen];
+	va_list va;
+	va_start( va, fmt );
+	vsnprintf(buf, MaxStringLen, fmt, va );
+	va_end( va );
+	addCRCDebugLine("%s", buf);
+
+	//DEBUG_LOG(("%s", buf));
+}
+
+void addCRCDumpLine(const char *fmt, ...)
+{
+	/*
+	va_list va;
+	va_start( va, fmt );
+	vsnprintf(DumpStrings[nextDumpString], MaxStringLen, fmt, va );
+	va_end( va );
+
+	++nextDumpString;
+	++numDumpStrings;
+	if (nextDumpString == MaxStrings)
+		nextDumpString = 0;
+		*/
+}
+
+void dumpVector3(const Vector3 *v, AsciiString name, AsciiString fname, Int line)
+{
+	if (!(IS_FRAME_OK_TO_LOG)) return;
+	fname.toLower();
+	fname = getFname(fname);
+	addCRCDebugLine("dumpVector3() %s:%d %s %8.8X %8.8X %8.8X",
+		fname.str(), line, name.str(),
+		AS_INT(v->X), AS_INT(v->Y), AS_INT(v->Z));
+}
+
+void dumpCoord3D(const Coord3D *c, AsciiString name, AsciiString fname, Int line)
+{
+	if (!(IS_FRAME_OK_TO_LOG)) return;
+	fname.toLower();
+	fname = getFname(fname);
+	addCRCDebugLine("dumpCoord3D() %s:%d %s %8.8X %8.8X %8.8X",
+		fname.str(), line, name.str(),
+		AS_INT(c->x), AS_INT(c->y), AS_INT(c->z));
+}
+
+void dumpMatrix3D(const Matrix3D *m, AsciiString name, AsciiString fname, Int line)
+{
+	if (!(IS_FRAME_OK_TO_LOG)) return;
+	fname.toLower();
+	fname = getFname(fname);
+	const Real *matrix = (const Real *)m;
+	addCRCDebugLine("dumpMatrix3D() %s:%d %s",
+		fname.str(), line, name.str());
+	for (Int i=0; i<3; ++i)
+		addCRCDebugLine("      0x%08X 0x%08X 0x%08X 0x%08X",
+			AS_INT(matrix[(i<<2)+0]), AS_INT(matrix[(i<<2)+1]), AS_INT(matrix[(i<<2)+2]), AS_INT(matrix[(i<<2)+3]));
+}
+
+void dumpReal(Real r, AsciiString name, AsciiString fname, Int line)
+{
+	if (!(IS_FRAME_OK_TO_LOG)) return;
+	fname.toLower();
+	fname = getFname(fname);
+	addCRCDebugLine("dumpReal() %s:%d %s %8.8X (%f)",
+		fname.str(), line, name.str(), AS_INT(r), r);
+}
+
+#endif // DEBUG_CRC
diff --git a/Core/GameEngine/Source/Common/FramePacer.cpp b/Core/GameEngine/Source/Common/FramePacer.cpp
new file mode 100644
index 00000000000..d538af0677a
--- /dev/null
+++ b/Core/GameEngine/Source/Common/FramePacer.cpp
@@ -0,0 +1,214 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "PreRTS.h"
+
+#include "Common/FramePacer.h"
+
+#include "GameClient/View.h"
+
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/ScriptEngine.h"
+
+#include "GameNetwork/NetworkDefs.h"
+#include "GameNetwork/NetworkInterface.h"
+
+
+FramePacer* TheFramePacer = NULL;
+
+FramePacer::FramePacer()
+{
+	// Set the time slice size to 1 ms.
+	timeBeginPeriod(1);
+
+	m_maxFPS = BaseFps;
+	m_logicTimeScaleFPS = LOGICFRAMES_PER_SECOND;
+	m_updateTime = 1.0f / (Real)BaseFps; // initialized to something to avoid division by zero on first use
+	m_enableFpsLimit = FALSE;
+	m_enableLogicTimeScale = FALSE;
+	m_isTimeFrozen = FALSE;
+	m_isGameHalted = FALSE;
+}
+
+FramePacer::~FramePacer()
+{
+	// Restore the previous time slice for Windows.
+	timeEndPeriod(1);
+}
+
+void FramePacer::update()
+{
+	// TheSuperHackers @bugfix xezon 05/08/2025 Re-implements the frame rate limiter
+	// with higher resolution counters to cap the frame rate more accurately to the desired limit.
+	const UnsignedInt maxFps = getActualFramesPerSecondLimit();// allowFpsLimit ? getFramesPerSecondLimit() : RenderFpsPreset::UncappedFpsValue;
+	m_updateTime = m_frameRateLimit.wait(maxFps);
+}
+
+void FramePacer::setFramesPerSecondLimit( Int fps )
+{
+	DEBUG_LOG(("FramePacer::setFramesPerSecondLimit() - setting max fps to %d (TheGlobalData->m_useFpsLimit == %d)", fps, TheGlobalData->m_useFpsLimit));
+	m_maxFPS = fps;
+}
+
+Int FramePacer::getFramesPerSecondLimit()  const
+{
+	return m_maxFPS;
+}
+
+void FramePacer::enableFramesPerSecondLimit( Bool enable )
+{
+	m_enableFpsLimit = enable;
+}
+
+Bool FramePacer::isFramesPerSecondLimitEnabled() const
+{
+	return m_enableFpsLimit;
+}
+
+Bool FramePacer::isActualFramesPerSecondLimitEnabled() const
+{
+	Bool allowFpsLimit = true;
+
+	if (TheTacticalView != NULL)
+	{
+		allowFpsLimit &= TheTacticalView->getTimeMultiplier()<=1 && !TheScriptEngine->isTimeFast();
+	}
+
+	if (TheGameLogic != NULL)
+	{
+#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+		allowFpsLimit &= !(!TheGameLogic->isGamePaused() && TheGlobalData->m_TiVOFastMode);
+#else	//always allow this cheat key if we're in a replay game.
+		allowFpsLimit &= !(!TheGameLogic->isGamePaused() && TheGlobalData->m_TiVOFastMode && TheGameLogic->isInReplayGame());
+#endif
+	}
+
+	allowFpsLimit &= TheGlobalData->m_useFpsLimit;
+	allowFpsLimit &= isFramesPerSecondLimitEnabled();
+
+	return allowFpsLimit;
+}
+
+Int FramePacer::getActualFramesPerSecondLimit() const
+{
+	return isActualFramesPerSecondLimitEnabled() ? getFramesPerSecondLimit() : RenderFpsPreset::UncappedFpsValue;
+}
+
+Real FramePacer::getUpdateTime()  const
+{
+	return m_updateTime;
+}
+
+Real FramePacer::getUpdateFps()  const
+{
+	return 1.0f / m_updateTime;
+}
+
+Real FramePacer::getBaseOverUpdateFpsRatio(Real minUpdateFps)
+{
+	// Update fps is floored to default 5 fps, 200 ms.
+	// Useful to prevent insane ratios on frame spikes/stalls.
+	return (Real)BaseFps / std::max(getUpdateFps(), minUpdateFps);
+}
+
+void FramePacer::setTimeFrozen(Bool frozen)
+{
+	m_isTimeFrozen = frozen;
+}
+
+void FramePacer::setGameHalted(Bool halted)
+{
+	m_isGameHalted = halted;
+}
+
+Bool FramePacer::isTimeFrozen() const
+{
+	return m_isTimeFrozen;
+}
+
+Bool FramePacer::isGameHalted() const
+{
+	return m_isGameHalted;
+}
+
+void FramePacer::setLogicTimeScaleFps( Int fps )
+{
+	m_logicTimeScaleFPS = fps;
+}
+
+Int FramePacer::getLogicTimeScaleFps() const
+{
+	return m_logicTimeScaleFPS;
+}
+
+void FramePacer::enableLogicTimeScale( Bool enable )
+{
+	m_enableLogicTimeScale = enable;
+}
+
+Bool FramePacer::isLogicTimeScaleEnabled() const
+{
+	return m_enableLogicTimeScale;
+}
+
+Int FramePacer::getActualLogicTimeScaleFps(LogicTimeQueryFlags flags) const
+{
+	if (m_isTimeFrozen && (flags & IgnoreFrozenTime) == 0)
+	{
+		return 0;
+	}
+
+	if (m_isGameHalted && (flags & IgnoreHaltedGame) == 0)
+	{
+		return 0;
+	}
+
+	if (TheNetwork != NULL)
+	{
+		return TheNetwork->getFrameRate();
+	}
+
+	if (isLogicTimeScaleEnabled())
+	{
+		return getLogicTimeScaleFps();
+	}
+
+	// Returns uncapped value to align with the render update as per the original game behavior.
+	return RenderFpsPreset::UncappedFpsValue;
+}
+
+Real FramePacer::getActualLogicTimeScaleRatio(LogicTimeQueryFlags flags) const
+{
+	return (Real)getActualLogicTimeScaleFps(flags) / LOGICFRAMES_PER_SECONDS_REAL;
+}
+
+Real FramePacer::getActualLogicTimeScaleOverFpsRatio(LogicTimeQueryFlags flags) const
+{
+	// TheSuperHackers @info Clamps ratio to min 1, because the logic
+	// frame rate is currently capped by the render frame rate.
+	return min(1.0f, (Real)getActualLogicTimeScaleFps(flags) / getUpdateFps());
+}
+
+Real FramePacer::getLogicTimeStepSeconds(LogicTimeQueryFlags flags) const
+{
+	return SECONDS_PER_LOGICFRAME_REAL * getActualLogicTimeScaleOverFpsRatio(flags);
+}
+
+Real FramePacer::getLogicTimeStepMilliseconds(LogicTimeQueryFlags flags) const
+{
+	return MSEC_PER_LOGICFRAME_REAL * getActualLogicTimeScaleOverFpsRatio(flags);
+}
diff --git a/Core/GameEngine/Source/Common/FrameRateLimit.cpp b/Core/GameEngine/Source/Common/FrameRateLimit.cpp
new file mode 100644
index 00000000000..b8c7f1ff7a9
--- /dev/null
+++ b/Core/GameEngine/Source/Common/FrameRateLimit.cpp
@@ -0,0 +1,130 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "PreRTS.h"
+#include "Common/FrameRateLimit.h"
+
+
+FrameRateLimit::FrameRateLimit()
+{
+	LARGE_INTEGER freq;
+	LARGE_INTEGER start;
+	QueryPerformanceFrequency(&freq);
+	QueryPerformanceCounter(&start);
+	m_freq = freq.QuadPart;
+	m_start = start.QuadPart;
+}
+
+Real FrameRateLimit::wait(UnsignedInt maxFps)
+{
+	LARGE_INTEGER tick;
+	QueryPerformanceCounter(&tick);
+	double elapsedSeconds = static_cast<double>(tick.QuadPart - m_start) / m_freq;
+	const double targetSeconds = 1.0 / maxFps;
+	const double sleepSeconds = targetSeconds - elapsedSeconds - 0.002; // leave ~2ms for spin wait
+
+	if (sleepSeconds > 0.0)
+	{
+		// Non busy wait with Munkee sleep
+		DWORD dwMilliseconds = static_cast<DWORD>(sleepSeconds * 1000);
+		Sleep(dwMilliseconds);
+	}
+
+	// Busy wait for remaining time
+	do
+	{
+		QueryPerformanceCounter(&tick);
+		elapsedSeconds = static_cast<double>(tick.QuadPart - m_start) / m_freq;
+	}
+	while (elapsedSeconds < targetSeconds);
+
+	m_start = tick.QuadPart;
+	return (Real)elapsedSeconds;
+}
+
+
+const UnsignedInt RenderFpsPreset::s_fpsValues[] = {
+	30, 50, 56, 60, 65, 70, 72, 75, 80, 85, 90, 100, 110, 120, 144, 240, 480, UncappedFpsValue };
+
+static_assert(LOGICFRAMES_PER_SECOND <= 30, "Min FPS values need to be revisited!");
+
+UnsignedInt RenderFpsPreset::getNextFpsValue(UnsignedInt value)
+{
+	const Int first = 0;
+	const Int last = ARRAY_SIZE(s_fpsValues) - 1;
+	for (Int i = first; i < last; ++i)
+	{
+		if (value >= s_fpsValues[i] && value < s_fpsValues[i + 1])
+		{
+			return s_fpsValues[i + 1];
+		}
+	}
+	return s_fpsValues[last];
+}
+
+UnsignedInt RenderFpsPreset::getPrevFpsValue(UnsignedInt value)
+{
+	const Int first = 0;
+	const Int last = ARRAY_SIZE(s_fpsValues) - 1;
+	for (Int i = last; i > first; --i)
+	{
+		if (value <= s_fpsValues[i] && value > s_fpsValues[i - 1])
+		{
+			return s_fpsValues[i - 1];
+		}
+	}
+	return s_fpsValues[first];
+}
+
+UnsignedInt RenderFpsPreset::changeFpsValue(UnsignedInt value, FpsValueChange change)
+{
+	switch (change)
+	{
+	default:
+	case FpsValueChange_Increase: return getNextFpsValue(value);
+	case FpsValueChange_Decrease: return getPrevFpsValue(value);
+	}
+}
+
+
+UnsignedInt LogicTimeScaleFpsPreset::getNextFpsValue(UnsignedInt value)
+{
+	return value + StepFpsValue;
+}
+
+UnsignedInt LogicTimeScaleFpsPreset::getPrevFpsValue(UnsignedInt value)
+{
+	if (value - StepFpsValue < MinFpsValue)
+	{
+		return MinFpsValue;
+	}
+	else
+	{
+		return value - StepFpsValue;
+	}
+}
+
+UnsignedInt LogicTimeScaleFpsPreset::changeFpsValue(UnsignedInt value, FpsValueChange change)
+{
+	switch (change)
+	{
+	default:
+	case FpsValueChange_Increase: return getNextFpsValue(value);
+	case FpsValueChange_Decrease: return getPrevFpsValue(value);
+	}
+}
diff --git a/Core/GameEngine/Source/Common/GameUtility.cpp b/Core/GameEngine/Source/Common/GameUtility.cpp
new file mode 100644
index 00000000000..386fefdb3e0
--- /dev/null
+++ b/Core/GameEngine/Source/Common/GameUtility.cpp
@@ -0,0 +1,133 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "PreRTS.h"
+
+#include "Common/GameUtility.h"
+#include "Common/PlayerList.h"
+#include "Common/Player.h"
+#include "Common/Radar.h"
+
+#include "GameClient/ControlBar.h"
+#include "GameClient/GameClient.h"
+#include "GameClient/InGameUI.h"
+#include "GameClient/ParticleSys.h"
+
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/GhostObject.h"
+#include "GameLogic/PartitionManager.h"
+
+namespace rts
+{
+
+namespace detail
+{
+static void changePlayerCommon(Player* player)
+{
+	TheParticleSystemManager->setLocalPlayerIndex(player->getPlayerIndex());
+	ThePartitionManager->refreshShroudForLocalPlayer();
+	TheGhostObjectManager->setLocalPlayerIndex(player->getPlayerIndex());
+	TheGameClient->updateFakeDrawables();
+	TheRadar->refreshObjects();
+	TheInGameUI->deselectAllDrawables();
+}
+
+} // namespace detail
+
+bool localPlayerHasRadar()
+{
+	// Using "local" instead of "observed or local" player because as an observer we prefer
+	// the radar to be turned on when observing a player that has no radar.
+	const Player* player = ThePlayerList->getLocalPlayer();
+	const PlayerIndex index = player->getPlayerIndex();
+
+	if (TheRadar->isRadarForced(index))
+		return true;
+
+	if (!TheRadar->isRadarHidden(index) && player->hasRadar())
+		return true;
+
+	return false;
+}
+
+Player* getObservedOrLocalPlayer()
+{
+	DEBUG_ASSERTCRASH(TheControlBar != NULL, ("TheControlBar is NULL"));
+	Player* player = TheControlBar->getObservedPlayer();
+	if (player == NULL)
+	{
+		DEBUG_ASSERTCRASH(ThePlayerList != NULL, ("ThePlayerList is NULL"));
+		player = ThePlayerList->getLocalPlayer();
+	}
+	return player;
+}
+
+Player* getObservedOrLocalPlayer_Safe()
+{
+	Player* player = NULL;
+
+	if (TheControlBar != NULL)
+		player = TheControlBar->getObservedPlayer();
+
+	if (player == NULL)
+		if (ThePlayerList != NULL)
+			player = ThePlayerList->getLocalPlayer();
+
+	return player;
+}
+
+PlayerIndex getObservedOrLocalPlayerIndex_Safe()
+{
+	if (Player* player = getObservedOrLocalPlayer_Safe())
+		return player->getPlayerIndex();
+
+	return 0;
+}
+
+void changeLocalPlayer(Player* player)
+{
+	DEBUG_ASSERTCRASH(player != NULL, ("Player is NULL"));
+
+	ThePlayerList->setLocalPlayer(player);
+	TheControlBar->setObserverLookAtPlayer(NULL);
+	TheControlBar->setObservedPlayer(NULL);
+	TheControlBar->setControlBarSchemeByPlayer(player);
+	TheControlBar->initSpecialPowershortcutBar(player);
+
+	detail::changePlayerCommon(player);
+}
+
+void changeObservedPlayer(Player* player)
+{
+	TheControlBar->setObserverLookAtPlayer(player);
+
+	const Bool canBeginObservePlayer = TheGlobalData->m_enablePlayerObserver && TheGhostObjectManager->trackAllPlayers();
+	const Bool canEndObservePlayer = TheControlBar->getObservedPlayer() != NULL && TheControlBar->getObserverLookAtPlayer() == NULL;
+
+	if (canBeginObservePlayer || canEndObservePlayer)
+	{
+		TheControlBar->setObservedPlayer(player);
+
+		Player *becomePlayer = player;
+		if (becomePlayer == NULL)
+			becomePlayer = ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey("ReplayObserver"));
+		detail::changePlayerCommon(becomePlayer);
+	}
+}
+
+} // namespace rts
diff --git a/Core/GameEngine/Source/Common/INI/INIAudioEventInfo.cpp b/Core/GameEngine/Source/Common/INI/INIAudioEventInfo.cpp
new file mode 100644
index 00000000000..e729c0a40c0
--- /dev/null
+++ b/Core/GameEngine/Source/Common/INI/INIAudioEventInfo.cpp
@@ -0,0 +1,216 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: INIAudioEventInfo.cpp ////////////////////////////////////////////////////////////////////////
+// Author: Colin Day, July 2002
+// Desc:   Parsing AudioEvent, MusicTrack and DialogEvent INI entries
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/INI.h"
+#include "Common/GameAudio.h"
+#include "Common/AudioEventInfo.h"
+
+AudioEventInfo::~AudioEventInfo()
+{
+
+}
+// @todo: Get these functions unified.
+
+//-------------------------------------------------------------------------------------------------
+void INI::parseMusicTrackDefinition( INI* ini )
+{
+	AsciiString name;
+	AudioEventInfo *track;
+
+	// read the name
+	const char* c = ini->getNextToken();
+	name.set( c );
+
+	track = TheAudio->newAudioEventInfo( name );
+	if (!track) {
+		return;
+	}
+
+	AudioEventInfo *defaultInfo = TheAudio->findAudioEventInfo("DefaultMusicTrack");
+	if (defaultInfo) {
+		(*track) = (*defaultInfo);
+		TheAudio->addTrackName( name );
+	}
+
+	track->m_audioName = name;
+	track->m_soundType = AT_Music;
+
+	// parse the ini definition
+	ini->initFromINI( track, track->getFieldParse() );
+}
+
+//-------------------------------------------------------------------------------------------------
+void INI::parseAudioEventDefinition( INI* ini )
+{
+	AsciiString name;
+	AudioEventInfo *track;
+
+	// read the name
+	const char* c = ini->getNextToken();
+	name.set( c );
+
+	track = TheAudio->newAudioEventInfo( name );
+	if (!track) {
+		return;
+	}
+
+	AudioEventInfo *defaultInfo = TheAudio->findAudioEventInfo("DefaultSoundEffect");
+	if (defaultInfo) {
+		(*track) = (*defaultInfo);
+	}
+
+	track->m_audioName = name;
+	track->m_soundType = AT_SoundEffect;
+
+	// parse the ini definition
+	ini->initFromINI( track, track->getFieldParse() );
+}
+
+//-------------------------------------------------------------------------------------------------
+void INI::parseDialogDefinition( INI* ini )
+{
+	AsciiString name;
+	AudioEventInfo *track;
+
+	// read the name
+	const char* c = ini->getNextToken();
+	name.set( c );
+
+	track = TheAudio->newAudioEventInfo( name );
+	if (!track) {
+		return;
+	}
+
+	AudioEventInfo *defaultInfo = TheAudio->findAudioEventInfo("DefaultDialog");
+	if (defaultInfo) {
+		(*track) = (*defaultInfo);
+	}
+
+	track->m_audioName = name;
+	track->m_soundType = AT_Streaming;
+
+	// parse the ini definition
+	ini->initFromINI( track, track->getFieldParse() );
+}
+
+
+//-------------------------------------------------------------------------------------------------
+static void parseDelay( INI* ini, void *instance, void *store, const void* /*userData*/ );
+static void parsePitchShift( INI* ini, void *instance, void *store, const void* /*userData*/ );
+
+//-------------------------------------------------------------------------------------------------
+const FieldParse AudioEventInfo::m_audioEventInfo[] =
+{
+	{ "Filename",							INI::parseAsciiString,		NULL,								offsetof( AudioEventInfo, m_filename) },
+	{ "Volume",								INI::parsePercentToReal,	NULL,								offsetof( AudioEventInfo, m_volume ) },
+	{ "VolumeShift",					INI::parsePercentToReal,	NULL,								offsetof( AudioEventInfo, m_volumeShift ) },
+	{ "MinVolume",						INI::parsePercentToReal,	NULL,								offsetof( AudioEventInfo, m_minVolume ) },
+	{ "PitchShift",						parsePitchShift,					NULL,								0 },
+	{ "Delay",								parseDelay,								NULL,								0 },
+	{ "Limit",								INI::parseInt,						NULL,								offsetof( AudioEventInfo, m_limit ) },
+	{ "LoopCount",						INI::parseInt,						NULL,								offsetof( AudioEventInfo, m_loopCount ) },
+	{ "Priority",							INI::parseIndexList,			theAudioPriorityNames,	offsetof( AudioEventInfo, m_priority ) },
+	{ "Type",									INI::parseBitString32,		theSoundTypeNames,			offsetof( AudioEventInfo, m_type ) },
+	{ "Control",							INI::parseBitString32,		theAudioControlNames,	offsetof( AudioEventInfo, m_control ) },
+	{ "Sounds",								INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_sounds ) },
+	{ "SoundsNight",					INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_soundsNight ) },
+	{ "SoundsEvening",				INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_soundsEvening ) },
+	{ "SoundsMorning",				INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_soundsMorning ) },
+	{ "Attack",								INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_attackSounds ) },
+	{ "Decay",								INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_decaySounds ) },
+	{ "MinRange",							INI::parseReal,						NULL,								offsetof( AudioEventInfo, m_minDistance) },
+	{ "MaxRange",							INI::parseReal,						NULL,								offsetof( AudioEventInfo, m_maxDistance) },
+	{ "LowPassCutoff",				INI::parsePercentToReal,	NULL,								offsetof( AudioEventInfo, m_lowPassFreq) },
+};
+
+//-------------------------------------------------------------------------------------------------
+static void parseDelay( INI* ini, void *instance, void *store, const void* /*userData*/ )
+{
+	AudioEventInfo *attribs = (AudioEventInfo*) store;
+
+	Int min = ini->scanInt(ini->getNextToken());
+	Int max = ini->scanInt(ini->getNextToken());
+
+	DEBUG_ASSERTCRASH( min >= 0 && max >= min, ("Bad delay values for audio event %s", attribs->m_audioName.str()));
+	attribs->m_delayMax = max;
+	attribs->m_delayMin = min;
+}
+
+//-------------------------------------------------------------------------------------------------
+static void parsePitchShift( INI* ini, void *instance, void *store, const void* /*userData*/ )
+{
+	AudioEventInfo *attribs = (AudioEventInfo*) store;
+
+	Real min = ini->scanReal(ini->getNextToken());
+	Real max = ini->scanReal(ini->getNextToken());
+
+	DEBUG_ASSERTCRASH( min > -100 && max >= min, ("Bad pitch shift values for audio event %s", attribs->m_audioName.str()));
+	attribs->m_pitchShiftMin = 1.0f + min/100;
+	attribs->m_pitchShiftMax = 1.0f + max/100;
+}
+
+// STATIC DEFINIITIONS ////////////////////////////////////////////////////////////////////////////
+
+const char *const theAudioPriorityNames[] =
+{
+	"LOWEST",
+	"LOW",
+	"NORMAL",
+	"HIGH",
+	"CRITICAL",
+	NULL
+};
+static_assert(ARRAY_SIZE(theAudioPriorityNames) == AP_COUNT + 1, "Incorrect array size");
+
+const char *const theSoundTypeNames[] =
+{
+	"UI",
+	"WORLD",
+	"SHROUDED",
+	"GLOBAL",
+	"VOICE",
+	"PLAYER",
+	"ALLIES",
+	"ENEMIES",
+	"EVERYONE",
+	NULL
+};
+
+const char *const theAudioControlNames[] =
+{
+	"LOOP",
+	"RANDOM",
+	"ALL",
+	"POSTDELAY",
+	"INTERRUPT",
+	NULL
+};
+
diff --git a/Core/GameEngine/Source/Common/INI/INIMiscAudio.cpp b/Core/GameEngine/Source/Common/INI/INIMiscAudio.cpp
new file mode 100644
index 00000000000..442f9235043
--- /dev/null
+++ b/Core/GameEngine/Source/Common/INI/INIMiscAudio.cpp
@@ -0,0 +1,78 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/MiscAudio.h"
+#include "Common/INI.h"
+
+const FieldParse MiscAudio::m_fieldParseTable[] =
+{
+	{ "RadarNotifyUnitUnderAttackSound",			INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarUnitUnderAttackSound ) },
+	{ "RadarNotifyHarvesterUnderAttackSound",	INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarHarvesterUnderAttackSound ) },
+	{ "RadarNotifyStructureUnderAttackSound", INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarStructureUnderAttackSound ) },
+	{ "RadarNotifyUnderAttackSound",					INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarUnderAttackSound ) },
+	{ "RadarNotifyInfiltrationSound",					INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarInfiltrationSound ) },
+	{ "RadarNotifyOnlineSound",								INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarOnlineSound ) },
+	{ "RadarNotifyOfflineSound",							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarOfflineSound ) },
+	{ "DefectorTimerTickSound",			  				INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_defectorTimerTickSound ) },
+	{ "DefectorTimerDingSound",			  				INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_defectorTimerDingSound ) },
+	{ "LockonTickSound",			  							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_lockonTickSound ) },
+	{ "AllCheerSound",												INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_allCheerSound )	},
+	{ "BattleCrySound",												INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_battleCrySound )	},
+	{ "GUIClickSound",												INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_guiClickSound )	},
+	{ "NoCanDoSound",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_noCanDoSound )	},
+	{ "StealthDiscoveredSound",								INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_stealthDiscoveredSound ) },
+	{ "StealthNeutralizedSound",							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_stealthNeutralizedSound ) },
+	{ "MoneyDepositSound",										INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_moneyDepositSound ) },
+	{ "MoneyWithdrawSound",										INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_moneyWithdrawSound ) },
+	{ "BuildingDisabled",											INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_buildingDisabled ) },
+	{ "BuildingReenabled",										INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_buildingReenabled ) },
+	{ "VehicleDisabled",											INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_vehicleDisabled ) },
+	{ "VehicleReenabled",											INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_vehicleReenabled ) },
+	{ "SplatterVehiclePilotsBrain",						INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_splatterVehiclePilotsBrain ) },
+	{ "TerroristInCarMoveVoice",							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_terroristInCarMoveVoice ) },
+	{ "TerroristInCarAttackVoice",						INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_terroristInCarAttackVoice ) },
+	{ "TerroristInCarSelectVoice",						INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_terroristInCarSelectVoice ) },
+	{ "CrateHeal",														INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateHeal ) },
+	{ "CrateShroud",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateShroud ) },
+	{ "CrateSalvage",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateSalvage ) },
+	{ "CrateFreeUnit",												INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateFreeUnit ) },
+	{ "CrateMoney",														INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateMoney ) },
+	{ "UnitPromoted",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_unitPromoted ) },
+	{ "RepairSparks",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_repairSparks ) },
+	{ "SabotageShutDownBuilding",							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_sabotageShutDownBuilding ) },
+	{ "SabotageResetTimeBuilding",						INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_sabotageResetTimerBuilding ) },
+  { "AircraftWheelScreech",									INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_aircraftWheelScreech ) },
+
+	{ 0, 0, 0, 0 }
+};
+
+
+//-------------------------------------------------------------------------------------------------
+void INI::parseMiscAudio( INI *ini )
+{
+	ini->initFromINI(TheAudio->friend_getMiscAudio(), MiscAudio::m_fieldParseTable);
+}
diff --git a/Core/GameEngine/Source/Common/INI/INIVideo.cpp b/Core/GameEngine/Source/Common/INI/INIVideo.cpp
new file mode 100644
index 00000000000..0e7e4d888d7
--- /dev/null
+++ b/Core/GameEngine/Source/Common/INI/INIVideo.cpp
@@ -0,0 +1,61 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: INIVideo.cpp /////////////////////////////////////////////////////////////////////////////
+// Author: John McDonald, February 2002
+// Desc:   Parsing Video INI entries
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/INI.h"
+#include "GameClient/VideoPlayer.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+//-------------------------------------------------------------------------------------------------
+/** Parse Music entry */
+//-------------------------------------------------------------------------------------------------
+void INI::parseVideoDefinition( INI* ini )
+{
+	// read the name
+	const char* c = ini->getNextToken();
+
+	Video video;
+	video.m_internalName.set( c );
+
+	ini->initFromINI(&video, TheVideoPlayer->getFieldParse() );
+	TheVideoPlayer->addVideo(&video);
+
+
+}
+
+
diff --git a/Core/GameEngine/Source/Common/RandomValue.cpp b/Core/GameEngine/Source/Common/RandomValue.cpp
new file mode 100644
index 00000000000..f1c00982a86
--- /dev/null
+++ b/Core/GameEngine/Source/Common/RandomValue.cpp
@@ -0,0 +1,440 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// RandomValue.cpp
+// Pseudo-random number generators
+// Author: Michael S. Booth, January 1998
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+
+#include "Lib/BaseType.h"
+#include "Common/RandomValue.h"
+#include "Common/crc.h"
+#include "Common/Debug.h"
+#include "GameLogic/GameLogic.h"
+
+//#define DETERMINISTIC				// to allow repetition for debugging
+
+
+#undef DEBUG_RANDOM_CLIENT
+#undef DEBUG_RANDOM_LOGIC
+#undef DEBUG_RANDOM_AUDIO
+
+//#define DEBUG_RANDOM_CLIENT
+//#define DEBUG_RANDOM_LOGIC
+//#define DEBUG_RANDOM_AUDIO
+
+static const Real theMultFactor = 1.0f / (powf(2, 8 * sizeof(UnsignedInt)) - 1.0f);
+
+// Initial seed values.
+static UnsignedInt theGameClientSeed[6] =
+{
+    0xf22d0e56L, 0x883126e9L, 0xc624dd2fL, 0x702c49cL, 0x9e353f7dL, 0x6fdf3b64L
+};
+
+static UnsignedInt theGameAudioSeed[6] =
+{
+    0xf22d0e56L, 0x883126e9L, 0xc624dd2fL, 0x702c49cL, 0x9e353f7dL, 0x6fdf3b64L
+};
+
+static UnsignedInt theGameLogicBaseSeed = 0;
+static UnsignedInt theGameLogicSeed[6] =
+{
+    0xf22d0e56L, 0x883126e9L, 0xc624dd2fL, 0x702c49cL, 0x9e353f7dL, 0x6fdf3b64L
+};
+
+// Add with carry. SUM is replaced with A + B + C, C is replaced with 1  if there was a carry, 0 if there wasn't. A carry occurred if the sum is  less than one of the inputs. This is addition, so carry can never be  more than one.
+#define ADC(SUM, A, B, C)   SUM = (A) + (B) + (C); C = ((SUM < (A)) || (SUM < (B)))
+
+static UnsignedInt randomValue(UnsignedInt *seed)
+{
+	UnsignedInt ax;
+	UnsignedInt c = 0;
+
+
+	ADC(ax, seed[5], seed[4], c);   /*  mov     ax,seed+20  */
+	/*  add     ax,seed+16  */
+	seed[4] = ax;                   /*  mov     seed+8,ax   */
+
+	ADC(ax, ax, seed[3], c);        /*  adc     ax,seed+12  */
+	seed[3] = ax;                   /*  mov     seed+12,ax  */
+
+	ADC(ax, ax, seed[2], c);        /*  adc     ax,seed+8   */
+	seed[2] = ax;                   /*  mov     seed+8,ax   */
+
+	ADC(ax, ax, seed[1], c);        /*  adc     ax,seed+4   */
+	seed[1] = ax;                   /*  mov     seed+4,ax   */
+
+	ADC(ax, ax, seed[0], c);        /*  adc     ax,seed+0   */
+	seed[0] = ax;                   /*  mov     seed+0,ax   */
+
+	/* Increment seed array, bubbling up the carries. */
+	if (!++seed[5])
+	{
+		if (!++seed[4])
+		{
+			if (!++seed[3])
+			{
+				if (!++seed[2])
+				{
+					if (!++seed[1])
+					{
+						++seed[0];
+						++ax;
+					}
+				}
+			}
+		}
+	}
+	return(ax);
+}
+
+static void seedRandom(UnsignedInt SEED, UnsignedInt *seed)
+{
+	UnsignedInt ax;
+
+	ax = SEED;                      /* mov     eax,SEED                     */
+	ax += 0xf22d0e56;               /* add     eax,0f22d0e56h               */
+	seed[0] = ax;                   /* mov     seed,eax                     */
+	ax += 0x883126e9 - 0xf22d0e56;  /* add     eax,0883126e9h-0f22d0e56h    */
+	seed[1] = ax;                   /* mov     seed+4,eax                   */
+	ax += 0xc624dd2f - 0x883126e9;  /* add     eax,0c624dd2fh-0883126e9h    */
+	seed[2] = ax;                   /* mov     seed+8,eax                   */
+	ax += 0x0702c49c - 0xc624dd2f;  /* add     eax,00702c49ch-0c624dd2fh    */
+	seed[3] = ax;                   /* mov     seed+12,eax                  */
+	ax += 0x9e353f7d - 0x0702c49c;  /* add     eax,09e353f7dh-00702c49ch    */
+	seed[4] = ax;                   /* mov     seed+16,eax                  */
+	ax += 0x6fdf3b64 - 0x9e353f7d;  /* add     eax,06fdf3b64h-09e353f7dh    */
+	seed[5] = ax;                   /* mov     seed+20,eax                  */
+}
+
+//
+// It is necessary to separate the GameClient and GameLogic usage of random
+// values to ensure that the GameLogic remains deterministic, regardless
+// of the effects displayed on the GameClient.
+//
+
+UnsignedInt GetGameLogicRandomSeed( void )
+{
+	return theGameLogicBaseSeed;
+}
+
+UnsignedInt GetGameLogicRandomSeedCRC( void )
+{
+	CRC c;
+	c.computeCRC(theGameLogicSeed, 6*sizeof(UnsignedInt));
+	return c.get();
+}
+
+void InitRandom( void )
+{
+#ifdef DETERMINISTIC
+	// needs to be the same every time
+	seedRandom(0, theGameClientSeed);
+	seedRandom(0, theGameAudioSeed);
+	seedRandom(0, theGameLogicSeed);
+	theGameLogicBaseSeed = 0;
+#else
+	time_t seconds = time( NULL );
+
+	seedRandom(seconds, theGameAudioSeed);
+	seedRandom(seconds, theGameClientSeed);
+	seedRandom(seconds, theGameLogicSeed);
+	theGameLogicBaseSeed = seconds;
+#endif
+}
+
+void InitRandom( UnsignedInt seed )
+{
+	seedRandom(seed, theGameAudioSeed);
+	seedRandom(seed, theGameClientSeed);
+	seedRandom(seed, theGameLogicSeed);
+	theGameLogicBaseSeed = seed;
+#ifdef DEBUG_RANDOM_LOGIC
+DEBUG_LOG(( "InitRandom %08lx",seed));
+#endif
+}
+
+void InitGameLogicRandom( UnsignedInt seed )
+{
+#ifdef DETERMINISTIC
+	// needs to be the same every time
+	seedRandom(0, theGameLogicSeed);
+	theGameLogicBaseSeed = 0;
+#else
+	seedRandom(seed, theGameLogicSeed);
+	theGameLogicBaseSeed = seed;
+#endif
+#ifdef DEBUG_RANDOM_LOGIC
+DEBUG_LOG(( "InitRandom Logic %08lx",seed));
+#endif
+}
+
+//
+// Integer random value
+//
+Int GetGameLogicRandomValue( int lo, int hi, const char *file, int line )
+{
+	//Int delta = hi - lo + 1;
+	//Int rval;
+
+	//if (delta == 0)
+		//return hi;
+
+	//rval = ((Int)(randomValue(theGameLogicSeed) % delta)) + lo;
+
+	UnsignedInt delta = hi - lo + 1;
+	//UnsignedInt temp;
+	Int rval;
+
+	if (delta == 0)
+		return hi;
+
+	rval = ((Int)(randomValue(theGameLogicSeed) % delta)) + lo;
+	//temp = randomValue(theGameLogicSeed);
+	//temp = temp % delta;
+
+	//rval = temp + lo;
+
+/**/
+#ifdef DEBUG_RANDOM_LOGIC
+DEBUG_LOG(( "%d: GetGameLogicRandomValue = %d (%d - %d), %s line %d",
+				 TheGameLogic->getFrame(), rval, lo, hi, file, line ));
+#endif
+/**/
+
+	return rval;
+}
+
+//
+// Integer random value
+//
+Int GetGameClientRandomValue( int lo, int hi, const char *file, int line )
+{
+	UnsignedInt delta = hi - lo + 1;
+	Int rval;
+
+	if (delta == 0)
+		return hi;
+
+	rval = ((Int)(randomValue(theGameClientSeed) % delta)) + lo;
+
+/**/
+#ifdef DEBUG_RANDOM_CLIENT
+DEBUG_LOG(( "%d: GetGameClientRandomValue = %d (%d - %d), %s line %d",
+				TheGameLogic ? TheGameLogic->getFrame() : -1, rval, lo, hi, file, line ));
+#endif
+/**/
+
+	return rval;
+}
+
+//
+// Integer random value
+//
+Int GetGameAudioRandomValue( int lo, int hi, const char *file, int line )
+{
+	UnsignedInt delta = hi - lo + 1;
+	Int rval;
+
+	if (delta == 0)
+		return hi;
+
+	rval = ((Int)(randomValue(theGameAudioSeed) % delta)) + lo;
+
+/**/
+#ifdef DEBUG_RANDOM_AUDIO
+DEBUG_LOG(( "%d: GetGameAudioRandomValue = %d (%d - %d), %s line %d",
+				TheGameLogic->getFrame(), rval, lo, hi, file, line ));
+#endif
+/**/
+
+	return rval;
+}
+
+//
+// Real valued random value
+//
+Real GetGameLogicRandomValueReal( Real lo, Real hi, const char *file, int line )
+{
+	Real delta = hi - lo;
+	Real rval;
+
+	if (delta <= 0.0f)
+		return hi;
+
+	rval = ((Real)(randomValue(theGameLogicSeed)) * theMultFactor ) * delta + lo;
+
+	DEBUG_ASSERTCRASH( rval >= lo && rval <= hi, ("Bad random val"));
+/**/
+#ifdef DEBUG_RANDOM_LOGIC
+DEBUG_LOG(( "%d: GetGameLogicRandomValueReal = %f, %s line %d",
+					TheGameLogic->getFrame(), rval, file, line ));
+#endif
+/**/
+
+	return rval;
+}
+
+//
+// Real valued random value
+//
+Real GetGameClientRandomValueReal( Real lo, Real hi, const char *file, int line )
+{
+	Real delta = hi - lo;
+	Real rval;
+
+	if (delta <= 0.0f)
+		return hi;
+
+	rval = ((Real)(randomValue(theGameClientSeed)) * theMultFactor ) * delta + lo;
+
+	DEBUG_ASSERTCRASH( rval >= lo && rval <= hi, ("Bad random val"));
+/**/
+#ifdef DEBUG_RANDOM_CLIENT
+DEBUG_LOG(( "%d: GetGameClientRandomValueReal = %f, %s line %d",
+					TheGameLogic->getFrame(), rval, file, line ));
+#endif
+/**/
+
+	return rval;
+}
+
+//
+// Real valued random value
+//
+Real GetGameAudioRandomValueReal( Real lo, Real hi, const char *file, int line )
+{
+	Real delta = hi - lo;
+	Real rval;
+
+	if (delta <= 0.0f)
+		return hi;
+
+	rval = ((Real)(randomValue(theGameAudioSeed)) * theMultFactor ) * delta + lo;
+
+	DEBUG_ASSERTCRASH( rval >= lo && rval <= hi, ("Bad random val"));
+/**/
+#ifdef DEBUG_RANDOM_AUDIO
+DEBUG_LOG(( "%d: GetGameAudioRandomValueReal = %f, %s line %d",
+					TheGameLogic->getFrame(), rval, file, line ));
+#endif
+/**/
+
+	return rval;
+}
+
+//--------------------------------------------------------------------------------------------------------------
+// GameClientRandomVariable
+//
+
+const char *const GameClientRandomVariable::DistributionTypeNames[] =
+{
+	"CONSTANT", "UNIFORM", "GAUSSIAN", "TRIANGULAR", "LOW_BIAS", "HIGH_BIAS", NULL
+};
+static_assert(ARRAY_SIZE(GameClientRandomVariable::DistributionTypeNames) == GameClientRandomVariable::DISTRIBUTION_COUNT + 1, "Incorrect array size");
+
+/**
+	define the range of random values, and the distribution of values
+*/
+void GameClientRandomVariable::setRange( Real low, Real high, DistributionType type )
+{
+	DEBUG_ASSERTCRASH(!(m_type == CONSTANT && m_low != m_high), ("CONSTANT GameClientRandomVariables should have low == high"));
+	m_low = low;
+	m_high = high;
+	m_type = type;
+}
+
+/**
+ * Return a value from the random distribution
+ */
+Real GameClientRandomVariable::getValue( void ) const
+{
+	switch( m_type )
+	{
+		case CONSTANT:
+			DEBUG_ASSERTLOG(m_low == m_high, ("m_low != m_high for a CONSTANT GameClientRandomVariable"));
+			if (m_low == m_high) {
+				return m_low;
+			}
+			FALLTHROUGH;
+
+		case UNIFORM:
+			return GameClientRandomValueReal( m_low, m_high );
+
+		default:
+			/// @todo fill in support for nonuniform GameClientRandomVariables.
+			DEBUG_CRASH(("unsupported DistributionType in GameClientRandomVariable::getValue"));
+			return 0.0f;
+	}
+}
+
+
+//--------------------------------------------------------------------------------------------------------------
+// GameLogicRandomVariable
+//
+
+const char *const GameLogicRandomVariable::DistributionTypeNames[] =
+{
+	"CONSTANT", "UNIFORM", "GAUSSIAN", "TRIANGULAR", "LOW_BIAS", "HIGH_BIAS", NULL
+};
+static_assert(ARRAY_SIZE(GameLogicRandomVariable::DistributionTypeNames) == GameLogicRandomVariable::DISTRIBUTION_COUNT + 1, "Incorrect array size");
+
+/**
+	define the range of random values, and the distribution of values
+*/
+void GameLogicRandomVariable::setRange( Real low, Real high, DistributionType type )
+{
+	DEBUG_ASSERTCRASH(!(m_type == CONSTANT && m_low != m_high), ("CONSTANT GameLogicRandomVariables should have low == high"));
+	m_low = low;
+	m_high = high;
+	m_type = type;
+}
+
+/**
+ * Return a value from the random distribution
+ */
+Real GameLogicRandomVariable::getValue( void ) const
+{
+	switch( m_type )
+	{
+		case CONSTANT:
+			DEBUG_ASSERTLOG(m_low == m_high, ("m_low != m_high for a CONSTANT GameLogicRandomVariable"));
+			if (m_low == m_high) {
+				return m_low;
+			}
+			FALLTHROUGH;
+
+		case UNIFORM:
+			return GameLogicRandomValueReal( m_low, m_high );
+
+		default:
+			/// @todo fill in support for nonuniform GameLogicRandomVariables.
+			DEBUG_CRASH(("unsupported DistributionType in GameLogicRandomVariable::getValue"));
+			return 0.0f;
+	}
+}
+
+
diff --git a/Core/GameEngine/Source/Common/ReplaySimulation.cpp b/Core/GameEngine/Source/Common/ReplaySimulation.cpp
new file mode 100644
index 00000000000..354925c8fcd
--- /dev/null
+++ b/Core/GameEngine/Source/Common/ReplaySimulation.cpp
@@ -0,0 +1,255 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/ReplaySimulation.h"
+
+#include "Common/GameEngine.h"
+#include "Common/LocalFileSystem.h"
+#include "Common/Recorder.h"
+#include "Common/WorkerProcess.h"
+#include "GameLogic/GameLogic.h"
+#include "GameClient/GameClient.h"
+
+
+Bool ReplaySimulation::s_isRunning = false;
+UnsignedInt ReplaySimulation::s_replayIndex = 0;
+UnsignedInt ReplaySimulation::s_replayCount = 0;
+
+namespace
+{
+int countProcessesRunning(const std::vector<WorkerProcess>& processes)
+{
+	int numProcessesRunning = 0;
+	size_t i = 0;
+	for (; i < processes.size(); ++i)
+	{
+		if (processes[i].isRunning())
+			++numProcessesRunning;
+	}
+	return numProcessesRunning;
+}
+} // namespace
+
+int ReplaySimulation::simulateReplaysInThisProcess(const std::vector<AsciiString> &filenames)
+{
+	int numErrors = 0;
+
+	if (!TheGlobalData->m_headless)
+	{
+		s_isRunning = true;
+		s_replayIndex = 0;
+		s_replayCount = static_cast<UnsignedInt>(filenames.size());
+
+		// If we are not in headless mode, we need to run the replay in the engine.
+		for (; s_replayIndex < s_replayCount; ++s_replayIndex)
+		{
+			TheRecorder->playbackFile(filenames[s_replayIndex]);
+			TheGameEngine->execute();
+			if (TheRecorder->sawCRCMismatch())
+				numErrors++;
+			if (!s_isRunning)
+				break;
+			TheGameEngine->setQuitting(FALSE);
+		}
+		s_isRunning = false;
+		s_replayIndex = 0;
+		s_replayCount = 0;
+		return numErrors != 0 ? 1 : 0;
+	}
+	// Note that we use printf here because this is run from cmd.
+	DWORD totalStartTimeMillis = GetTickCount();
+	for (size_t i = 0; i < filenames.size(); i++)
+	{
+		AsciiString filename = filenames[i];
+		printf("Simulating Replay \"%s\"\n", filename.str());
+		fflush(stdout);
+		DWORD startTimeMillis = GetTickCount();
+		if (TheRecorder->simulateReplay(filename))
+		{
+			UnsignedInt totalTimeSec = TheRecorder->getPlaybackFrameCount() / LOGICFRAMES_PER_SECOND;
+			while (TheRecorder->isPlaybackInProgress())
+			{
+				TheGameClient->updateHeadless();
+
+				const int progressFrameInterval = 10*60*LOGICFRAMES_PER_SECOND;
+				if (TheGameLogic->getFrame() != 0 && TheGameLogic->getFrame() % progressFrameInterval == 0)
+				{
+					// Print progress report
+					UnsignedInt gameTimeSec = TheGameLogic->getFrame() / LOGICFRAMES_PER_SECOND;
+					UnsignedInt realTimeSec = (GetTickCount()-startTimeMillis) / 1000;
+					printf("Elapsed Time: %02d:%02d Game Time: %02d:%02d/%02d:%02d\n",
+							realTimeSec/60, realTimeSec%60, gameTimeSec/60, gameTimeSec%60, totalTimeSec/60, totalTimeSec%60);
+					fflush(stdout);
+				}
+				TheGameLogic->UPDATE();
+				if (TheRecorder->sawCRCMismatch())
+				{
+					numErrors++;
+					break;
+				}
+			}
+			UnsignedInt gameTimeSec = TheGameLogic->getFrame() / LOGICFRAMES_PER_SECOND;
+			UnsignedInt realTimeSec = (GetTickCount()-startTimeMillis) / 1000;
+			printf("Elapsed Time: %02d:%02d Game Time: %02d:%02d/%02d:%02d\n",
+					realTimeSec/60, realTimeSec%60, gameTimeSec/60, gameTimeSec%60, totalTimeSec/60, totalTimeSec%60);
+			fflush(stdout);
+		}
+		else
+		{
+			printf("Cannot open replay\n");
+			numErrors++;
+		}
+	}
+	if (filenames.size() > 1)
+	{
+		printf("Simulation of all replays completed. Errors occurred: %d\n", numErrors);
+
+		UnsignedInt realTime = (GetTickCount()-totalStartTimeMillis) / 1000;
+		printf("Total Time: %d:%02d:%02d\n", realTime/60/60, realTime/60%60, realTime%60);
+		fflush(stdout);
+	}
+
+	return numErrors != 0 ? 1 : 0;
+}
+
+int ReplaySimulation::simulateReplaysInWorkerProcesses(const std::vector<AsciiString> &filenames, int maxProcesses)
+{
+	DWORD totalStartTimeMillis = GetTickCount();
+
+	WideChar exePath[1024];
+	GetModuleFileNameW(NULL, exePath, ARRAY_SIZE(exePath));
+
+	std::vector<WorkerProcess> processes;
+	int filenamePositionStarted = 0;
+	int filenamePositionDone = 0;
+	int numErrors = 0;
+
+	while (true)
+	{
+		int i;
+		for (i = 0; i < processes.size(); i++)
+			processes[i].update();
+
+		// Get result of finished processes and print output in order
+		while (!processes.empty())
+		{
+			if (!processes[0].isDone())
+				break;
+			AsciiString stdOutput = processes[0].getStdOutput();
+			printf("%d/%d %s", filenamePositionDone+1, (int)filenames.size(), stdOutput.str());
+			DWORD exitcode = processes[0].getExitCode();
+			if (exitcode != 0)
+				printf("Error!\n");
+			fflush(stdout);
+			numErrors += exitcode == 0 ? 0 : 1;
+			processes.erase(processes.begin());
+			filenamePositionDone++;
+		}
+
+		int numProcessesRunning = countProcessesRunning(processes);
+
+		// Add new processes when we are below the limit and there are replays left
+		while (numProcessesRunning < maxProcesses && filenamePositionStarted < filenames.size())
+		{
+			UnicodeString filenameWide;
+			filenameWide.translate(filenames[filenamePositionStarted]);
+			UnicodeString command;
+			command.format(L"\"%s\"%s%s -replay \"%s\"",
+				exePath,
+				TheGlobalData->m_windowed ? L" -win" : L"",
+				TheGlobalData->m_headless ? L" -headless" : L"",
+				filenameWide.str());
+
+			processes.push_back(WorkerProcess());
+			processes.back().startProcess(command);
+
+			filenamePositionStarted++;
+			numProcessesRunning++;
+		}
+
+		if (processes.empty())
+			break;
+
+		// Don't waste CPU here, our workers need every bit of CPU time they can get
+		Sleep(100);
+	}
+
+	DEBUG_ASSERTCRASH(filenamePositionStarted == filenames.size(), ("inconsistent file position 1"));
+	DEBUG_ASSERTCRASH(filenamePositionDone == filenames.size(), ("inconsistent file position 2"));
+
+	printf("Simulation of all replays completed. Errors occurred: %d\n", numErrors);
+
+	UnsignedInt realTime = (GetTickCount()-totalStartTimeMillis) / 1000;
+	printf("Total Wall Time: %d:%02d:%02d\n", realTime/60/60, realTime/60%60, realTime%60);
+	fflush(stdout);
+
+	return numErrors != 0 ? 1 : 0;
+}
+
+std::vector<AsciiString> ReplaySimulation::resolveFilenameWildcards(const std::vector<AsciiString> &filenames)
+{
+	// If some filename contains wildcards, search for actual filenames.
+	// Note that we cannot do this in parseReplay because we require TheLocalFileSystem initialized.
+	std::vector<AsciiString> filenamesResolved;
+	for (std::vector<AsciiString>::const_iterator filename = filenames.begin(); filename != filenames.end(); ++filename)
+	{
+		if (filename->find('*') || filename->find('?'))
+		{
+			AsciiString dir1 = TheRecorder->getReplayDir();
+			AsciiString dir2 = *filename;
+			AsciiString wildcard = *filename;
+			{
+				int len = dir2.getLength();
+				while (len)
+				{
+					char c = dir2.getCharAt(len-1);
+					if (c == '/' || c == '\\')
+					{
+						wildcard.set(wildcard.str()+dir2.getLength());
+						break;
+					}
+					dir2.removeLastChar();
+					len--;
+				}
+			}
+
+			FilenameList files;
+			TheLocalFileSystem->getFileListInDirectory(dir2.str(), dir1.str(), wildcard, files, FALSE);
+			for (FilenameList::iterator it = files.begin(); it != files.end(); ++it)
+			{
+				AsciiString file;
+				file.set(it->str() + dir1.getLength());
+				filenamesResolved.push_back(file);
+			}
+		}
+		else
+			filenamesResolved.push_back(*filename);
+	}
+	return filenamesResolved;
+}
+
+int ReplaySimulation::simulateReplays(const std::vector<AsciiString> &filenames, int maxProcesses)
+{
+	std::vector<AsciiString> filenamesResolved = resolveFilenameWildcards(filenames);
+	if (maxProcesses == SIMULATE_REPLAYS_SEQUENTIAL)
+		return simulateReplaysInThisProcess(filenamesResolved);
+	else
+		return simulateReplaysInWorkerProcesses(filenamesResolved, maxProcesses);
+}
diff --git a/Core/GameEngine/Source/Common/System/ArchiveFile.cpp b/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
new file mode 100644
index 00000000000..88cd6576469
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/ArchiveFile.cpp
@@ -0,0 +1,229 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+/////////ArchiveFile.cpp ///////////////////////
+// Bryan Cleveland, August 2002
+////////////////////////////////////////////////
+
+#include "PreRTS.h"
+
+#include "Common/ArchiveFile.h"
+#include "Common/ArchiveFileSystem.h"
+#include "Common/file.h"
+#include "Common/PerfTimer.h"
+
+
+// checks to see if str matches searchString.  Search string is done in the
+// using * and ? as wildcards. * is used to denote any number of characters,
+// and ? is used to denote a single wildcard character.
+static Bool SearchStringMatches(AsciiString str, AsciiString searchString)
+{
+	if (str.isEmpty()) {
+		if (searchString.isEmpty()) {
+			return TRUE;
+		}
+		return FALSE;
+	}
+	if (searchString.isEmpty()) {
+		return FALSE;
+	}
+
+	const char *c1 = str.str();
+	const char *c2 = searchString.str();
+
+	while ((*c1 == *c2) || (*c2 == '?') || (*c2 == '*')) {
+		if ((*c1 == *c2) || (*c2 == '?')) {
+			++c1;
+			++c2;
+		} else if (*c2 == '*') {
+			++c2;
+			if (*c2 == 0) {
+				return TRUE;
+			}
+			while (*c1 != 0) {
+				if (SearchStringMatches(AsciiString(c1), AsciiString(c2))) {
+					return TRUE;
+				}
+				++c1;
+			}
+		}
+		if (*c1 == 0) {
+			if (*c2 == 0) {
+				return TRUE;
+			}
+			return FALSE;
+		}
+		if (*c2 == 0) {
+			return FALSE;
+		}
+	}
+	return FALSE;
+}
+
+ArchiveFile::~ArchiveFile()
+{
+	if (m_file != NULL) {
+		m_file->close();
+		m_file = NULL;
+	}
+}
+
+ArchiveFile::ArchiveFile()
+	: m_file(NULL)
+{
+}
+
+void ArchiveFile::addFile(const AsciiString& path, const ArchivedFileInfo *fileInfo)
+{
+	DetailedArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
+
+	AsciiString token;
+	AsciiString tokenizer = path;
+	tokenizer.toLower();
+	tokenizer.nextToken(&token, "\\/");
+
+	while (!token.isEmpty())
+	{
+		DetailedArchivedDirectoryInfoMap::iterator tempiter = dirInfo->m_directories.find(token);
+		if (tempiter == dirInfo->m_directories.end())
+		{
+			dirInfo = &(dirInfo->m_directories[token]);
+			dirInfo->m_directoryName = token;
+		}
+		else
+		{
+			dirInfo = &tempiter->second;
+		}
+
+		tokenizer.nextToken(&token, "\\/");
+	}
+
+	dirInfo->m_files[fileInfo->m_filename] = *fileInfo;
+}
+
+void ArchiveFile::getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
+{
+	const DetailedArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
+
+	AsciiString token;
+	AsciiString tokenizer = originalDirectory;
+	tokenizer.toLower();
+	tokenizer.nextToken(&token, "\\/");
+
+	while (!token.isEmpty()) {
+
+		DetailedArchivedDirectoryInfoMap::const_iterator it = dirInfo->m_directories.find(token);
+		if (it != dirInfo->m_directories.end())
+		{
+			dirInfo = &it->second;
+		}
+		else
+		{
+			// if the directory doesn't exist, then there aren't any files to be had.
+			return;
+		}
+
+		tokenizer.nextToken(&token, "\\/");
+	}
+
+	getFileListInDirectory(dirInfo, originalDirectory, searchName, filenameList, searchSubdirectories);
+}
+
+void ArchiveFile::getFileListInDirectory(const DetailedArchivedDirectoryInfo *dirInfo, const AsciiString& currentDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
+{
+	DetailedArchivedDirectoryInfoMap::const_iterator diriter = dirInfo->m_directories.begin();
+	while (diriter != dirInfo->m_directories.end()) {
+		const DetailedArchivedDirectoryInfo *tempDirInfo = &(diriter->second);
+		AsciiString tempdirname;
+		tempdirname = currentDirectory;
+		if ((!tempdirname.isEmpty()) && (!tempdirname.endsWith("\\"))) {
+			tempdirname.concat('\\');
+		}
+		tempdirname.concat(tempDirInfo->m_directoryName);
+		getFileListInDirectory(tempDirInfo, tempdirname, searchName, filenameList, searchSubdirectories);
+		diriter++;
+	}
+
+	ArchivedFileInfoMap::const_iterator fileiter = dirInfo->m_files.begin();
+	while (fileiter != dirInfo->m_files.end()) {
+		if (SearchStringMatches(fileiter->second.m_filename, searchName)) {
+			AsciiString tempfilename;
+			tempfilename = currentDirectory;
+			if ((!tempfilename.isEmpty()) && (!tempfilename.endsWith("\\"))) {
+				tempfilename.concat('\\');
+			}
+			tempfilename.concat(fileiter->second.m_filename);
+			if (filenameList.find(tempfilename) == filenameList.end()) {
+				// only insert into the list if its not already in there.
+				filenameList.insert(tempfilename);
+			}
+		}
+		fileiter++;
+	}
+}
+
+void ArchiveFile::attachFile(File *file)
+{
+	if (m_file != NULL) {
+		m_file->close();
+		m_file = NULL;
+	}
+	m_file = file;
+}
+
+const ArchivedFileInfo * ArchiveFile::getArchivedFileInfo(const AsciiString& filename) const
+{
+	const DetailedArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
+
+	AsciiString token;
+	AsciiString tokenizer = filename;
+	tokenizer.toLower();
+	tokenizer.nextToken(&token, "\\/");
+
+	while (!token.find('.') || tokenizer.find('.'))
+	{
+		DetailedArchivedDirectoryInfoMap::const_iterator it = dirInfo->m_directories.find(token);
+		if (it != dirInfo->m_directories.end())
+		{
+			dirInfo = &it->second;
+		}
+		else
+		{
+			return NULL;
+		}
+
+		tokenizer.nextToken(&token, "\\/");
+	}
+
+	ArchivedFileInfoMap::const_iterator it = dirInfo->m_files.find(token);
+	if (it != dirInfo->m_files.end())
+	{
+		return &it->second;
+	}
+	else
+	{
+		return NULL;
+	}
+
+}
diff --git a/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp b/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
new file mode 100644
index 00000000000..b422e5cd1d0
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
@@ -0,0 +1,342 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   Generals
+//
+// Module:    Game Engine Common
+//
+// File name: ArchiveFileSystem.cpp
+//
+// Created:   11/26/01 TR
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "PreRTS.h"
+#include "Common/ArchiveFile.h"
+#include "Common/ArchiveFileSystem.h"
+#include "Common/AsciiString.h"
+#include "Common/PerfTimer.h"
+
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+
+//----------------------------------------------------------------------------
+//         Private Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Data
+//----------------------------------------------------------------------------
+
+ArchiveFileSystem *TheArchiveFileSystem = NULL;
+
+
+//----------------------------------------------------------------------------
+//         Private Prototypes
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Functions
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Functions
+//----------------------------------------------------------------------------
+
+//------------------------------------------------------
+// ArchivedFileInfo
+//------------------------------------------------------
+ArchiveFileSystem::ArchiveFileSystem()
+{
+}
+
+ArchiveFileSystem::~ArchiveFileSystem()
+{
+	ArchiveFileMap::iterator iter = m_archiveFileMap.begin();
+	while (iter != m_archiveFileMap.end()) {
+		ArchiveFile *file = iter->second;
+		delete file;
+		iter++;
+	}
+}
+
+void ArchiveFileSystem::loadIntoDirectoryTree(ArchiveFile *archiveFile, Bool overwrite)
+{
+
+	FilenameList filenameList;
+
+	archiveFile->getFileListInDirectory("", "", "*", filenameList, TRUE);
+
+	FilenameListIter it = filenameList.begin();
+
+	while (it != filenameList.end())
+	{
+		ArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
+
+		AsciiString path;
+		AsciiString token;
+		AsciiString tokenizer = *it;
+		tokenizer.toLower();
+		Bool infoInPath = tokenizer.nextToken(&token, "\\/");
+
+		while (infoInPath && (!token.find('.') || tokenizer.find('.')))
+		{
+			path.concat(token);
+			path.concat('\\');
+
+			ArchivedDirectoryInfoMap::iterator tempiter = dirInfo->m_directories.find(token);
+			if (tempiter == dirInfo->m_directories.end())
+			{
+				dirInfo = &(dirInfo->m_directories[token]);
+				dirInfo->m_path = path;
+				dirInfo->m_directoryName = token;
+			}
+			else
+			{
+				dirInfo = &tempiter->second;
+			}
+
+			infoInPath = tokenizer.nextToken(&token, "\\/");
+		}
+
+		ArchivedFileLocationMap::iterator fileIt;
+		if (overwrite)
+		{
+			// When overwriting, try place the new value at the beginning of the key list.
+			fileIt = dirInfo->m_files.find(token);
+		}
+		else
+		{
+			// Append to the end of the key list.
+			fileIt = dirInfo->m_files.end();
+		}
+
+		dirInfo->m_files.insert(fileIt, std::make_pair(token, archiveFile));
+
+#if defined(DEBUG_LOGGING) && ENABLE_FILESYSTEM_LOGGING
+		{
+			const stl::const_range<ArchivedFileLocationMap> range = stl::get_range(dirInfo->m_files, token, 0);
+			if (range.distance() >= 2)
+			{
+				ArchivedFileLocationMap::const_iterator rangeIt0;
+				ArchivedFileLocationMap::const_iterator rangeIt1;
+
+				if (overwrite)
+				{
+					rangeIt0 = range.begin;
+					rangeIt1 = std::next(rangeIt0);
+
+					DEBUG_LOG(("ArchiveFileSystem::loadIntoDirectoryTree - adding file %s, archived in %s, overwriting same file in %s",
+						it->str(),
+						rangeIt0->second->getName().str(),
+						rangeIt1->second->getName().str()
+					));
+				}
+				else
+				{
+					rangeIt1 = std::prev(range.end);
+					rangeIt0 = std::prev(rangeIt1);
+
+					DEBUG_LOG(("ArchiveFileSystem::loadIntoDirectoryTree - adding file %s, archived in %s, overwritten by same file in %s",
+						it->str(),
+						rangeIt1->second->getName().str(),
+						rangeIt0->second->getName().str()
+					));
+				}
+			}
+			else
+			{
+				DEBUG_LOG(("ArchiveFileSystem::loadIntoDirectoryTree - adding file %s, archived in %s", it->str(), archiveFile->getName().str()));
+			}
+		}
+#endif
+
+		it++;
+	}
+}
+
+void ArchiveFileSystem::loadMods()
+{
+	if (TheGlobalData->m_modBIG.isNotEmpty())
+	{
+		ArchiveFile *archiveFile = openArchiveFile(TheGlobalData->m_modBIG.str());
+
+		if (archiveFile != NULL) {
+			DEBUG_LOG(("ArchiveFileSystem::loadMods - loading %s into the directory tree.", TheGlobalData->m_modBIG.str()));
+			loadIntoDirectoryTree(archiveFile, TRUE);
+			m_archiveFileMap[TheGlobalData->m_modBIG] = archiveFile;
+			DEBUG_LOG(("ArchiveFileSystem::loadMods - %s inserted into the archive file map.", TheGlobalData->m_modBIG.str()));
+		}
+		else
+		{
+			DEBUG_LOG(("ArchiveFileSystem::loadMods - could not openArchiveFile(%s)", TheGlobalData->m_modBIG.str()));
+		}
+	}
+
+	if (TheGlobalData->m_modDir.isNotEmpty())
+	{
+#ifdef DEBUG_LOGGING
+		Bool ret =
+#endif
+		loadBigFilesFromDirectory(TheGlobalData->m_modDir, "*.big", TRUE);
+		DEBUG_ASSERTLOG(ret, ("loadBigFilesFromDirectory(%s) returned FALSE!", TheGlobalData->m_modDir.str()));
+	}
+}
+
+Bool ArchiveFileSystem::doesFileExist(const Char *filename, FileInstance instance) const
+{
+	ArchivedDirectoryInfoResult result = const_cast<ArchiveFileSystem*>(this)->getArchivedDirectoryInfo(filename);
+
+	if (!result.valid())
+		return false;
+
+	stl::const_range<ArchivedFileLocationMap> range = stl::get_range(result.dirInfo->m_files, result.lastToken, instance);
+
+	return range.valid();
+}
+
+ArchivedDirectoryInfo* ArchiveFileSystem::friend_getArchivedDirectoryInfo(const Char* directory)
+{
+	ArchivedDirectoryInfoResult result = getArchivedDirectoryInfo(directory);
+
+	return result.dirInfo;
+}
+
+ArchiveFileSystem::ArchivedDirectoryInfoResult ArchiveFileSystem::getArchivedDirectoryInfo(const Char* directory)
+{
+	ArchivedDirectoryInfoResult result;
+	ArchivedDirectoryInfo* dirInfo = &m_rootDirectory;
+
+	AsciiString token;
+	AsciiString tokenizer = directory;
+	tokenizer.toLower();
+	Bool infoInPath = tokenizer.nextToken(&token, "\\/");
+
+	while (infoInPath && (!token.find('.') || tokenizer.find('.')))
+	{
+		ArchivedDirectoryInfoMap::iterator tempiter = dirInfo->m_directories.find(token);
+		if (tempiter != dirInfo->m_directories.end())
+		{
+			dirInfo = &tempiter->second;
+			infoInPath = tokenizer.nextToken(&token, "\\/");
+		}
+		else
+		{
+			// the directory doesn't exist
+			result.dirInfo = NULL;
+			result.lastToken = AsciiString::TheEmptyString;
+			return result;
+		}
+	}
+
+	result.dirInfo = dirInfo;
+	result.lastToken = token;
+	return result;
+}
+
+File * ArchiveFileSystem::openFile(const Char *filename, Int access, FileInstance instance)
+{
+	ArchiveFile* archive = getArchiveFile(filename, instance);
+
+	if (archive == NULL)
+		return NULL;
+
+	return archive->openFile(filename, access);
+}
+
+Bool ArchiveFileSystem::getFileInfo(const AsciiString& filename, FileInfo *fileInfo, FileInstance instance) const
+{
+	if (fileInfo == NULL) {
+		return FALSE;
+	}
+
+	if (filename.isEmpty()) {
+		return FALSE;
+	}
+
+	ArchiveFile* archive = getArchiveFile(filename, instance);
+
+	if (archive == NULL)
+		return FALSE;
+
+	return archive->getFileInfo(filename, fileInfo);
+}
+
+ArchiveFile* ArchiveFileSystem::getArchiveFile(const AsciiString& filename, FileInstance instance) const
+{
+	ArchivedDirectoryInfoResult result = const_cast<ArchiveFileSystem*>(this)->getArchivedDirectoryInfo(filename.str());
+
+	if (!result.valid())
+		return NULL;
+
+	stl::const_range<ArchivedFileLocationMap> range = stl::get_range(result.dirInfo->m_files, result.lastToken, instance);
+
+	if (!range.valid())
+		return NULL;
+	
+	return range.get()->second;
+}
+
+void ArchiveFileSystem::getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
+{
+	ArchiveFileMap::const_iterator it = m_archiveFileMap.begin();
+	while (it != m_archiveFileMap.end()) {
+		it->second->getFileListInDirectory(currentDirectory, originalDirectory, searchName, filenameList, searchSubdirectories);
+		it++;
+	}
+}
diff --git a/Core/GameEngine/Source/Common/System/AsciiString.cpp b/Core/GameEngine/Source/Common/System/AsciiString.cpp
new file mode 100644
index 00000000000..31567ec5335
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/AsciiString.cpp
@@ -0,0 +1,536 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: AsciiString.cpp
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:    RTS3
+//
+// File name:  AsciiString.cpp
+//
+// Created:    Steven Johnson, October 2001
+//
+// Desc:       General-purpose string classes
+//
+//-----------------------------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/CriticalSection.h"
+
+
+// -----------------------------------------------------
+
+/*static*/ const AsciiString AsciiString::TheEmptyString;
+
+//-----------------------------------------------------------------------------
+inline char* skipSeps(char* p, const char* seps)
+{
+	while (*p && strchr(seps, *p) != NULL)
+		++p;
+	return p;
+}
+
+//-----------------------------------------------------------------------------
+inline char* skipNonSeps(char* p, const char* seps)
+{
+	while (*p && strchr(seps, *p) == NULL)
+		++p;
+	return p;
+}
+
+//-----------------------------------------------------------------------------
+inline char* skipWhitespace(char* p)
+{
+	while (*p && isspace(*p))
+		++p;
+	return p;
+}
+
+//-----------------------------------------------------------------------------
+inline char* skipNonWhitespace(char* p)
+{
+	while (*p && !isspace(*p))
+		++p;
+	return p;
+}
+
+// -----------------------------------------------------
+AsciiString::AsciiString(const AsciiString& stringSrc) : m_data(stringSrc.m_data)
+{
+	ScopedCriticalSection scopedCriticalSection(TheAsciiStringCriticalSection);
+	if (m_data)
+		++m_data->m_refCount;
+	validate();
+}
+
+// -----------------------------------------------------
+#ifdef RTS_DEBUG
+void AsciiString::validate() const
+{
+	if (!m_data) return;
+	DEBUG_ASSERTCRASH(m_data->m_refCount > 0, ("m_refCount is zero"));
+	DEBUG_ASSERTCRASH(m_data->m_refCount < 32000, ("m_refCount is suspiciously large"));
+	DEBUG_ASSERTCRASH(m_data->m_numCharsAllocated > 0, ("m_numCharsAllocated is zero"));
+//	DEBUG_ASSERTCRASH(m_data->m_numCharsAllocated < 1024, ("m_numCharsAllocated suspiciously large"));
+	DEBUG_ASSERTCRASH(strlen(m_data->peek())+1 <= m_data->m_numCharsAllocated,("str is too long (%d) for storage",strlen(m_data->peek())+1));
+}
+#endif
+
+// -----------------------------------------------------
+void AsciiString::debugIgnoreLeaks()
+{
+#ifdef MEMORYPOOL_DEBUG
+	if (m_data)
+	{
+		TheDynamicMemoryAllocator->debugIgnoreLeaksForThisBlock(m_data);
+	}
+	else
+	{
+		DEBUG_LOG(("cannot ignore the leak (no data)"));
+	}
+#endif
+}
+
+// -----------------------------------------------------
+void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData, const char* strToCopy, const char* strToCat)
+{
+	validate();
+
+	const int usableNumChars = numCharsNeeded - 1;
+
+	if (m_data &&
+			m_data->m_refCount == 1 &&
+			m_data->m_numCharsAllocated >= numCharsNeeded)
+	{
+		// no buffer manhandling is needed (it's already large enough, and unique to us)
+		if (strToCopy)
+		{
+			// TheSuperHackers @fix Mauller 04/04/2025 Replace strcpy with safer memmove as memory regions can overlap when part of string is copied to itself
+			DEBUG_ASSERTCRASH(usableNumChars <= strlen(strToCopy), ("strToCopy is too small"));
+			memmove(m_data->peek(), strToCopy, usableNumChars);
+			m_data->peek()[usableNumChars] = 0;
+		}
+		if (strToCat)
+			strcat(m_data->peek(), strToCat);
+		return;
+	}
+
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order."));
+	DEBUG_ASSERTCRASH(numCharsNeeded <= MAX_LEN, ("AsciiString::ensureUniqueBufferOfSize exceeds max string length %d with requested length %d", MAX_LEN, numCharsNeeded));
+	int minBytes = sizeof(AsciiStringData) + numCharsNeeded*sizeof(char);
+	int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
+	AsciiStringData* newData = (AsciiStringData*)TheDynamicMemoryAllocator->allocateBytesDoNotZero(actualBytes, "STR_AsciiString::ensureUniqueBufferOfSize");
+	newData->m_refCount = 1;
+	newData->m_numCharsAllocated = (actualBytes - sizeof(AsciiStringData))/sizeof(char);
+#if defined(RTS_DEBUG)
+	newData->m_debugptr = newData->peek();	// just makes it easier to read in the debugger
+#endif
+
+	if (m_data && preserveData)
+		strcpy(newData->peek(), m_data->peek());
+	else
+		newData->peek()[0] = 0;
+
+	// do these BEFORE releasing the old buffer, so that self-copies
+	// or self-cats will work correctly.
+	if (strToCopy)
+	{
+		DEBUG_ASSERTCRASH(usableNumChars <= strlen(strToCopy), ("strToCopy is too small"));
+		strncpy(newData->peek(), strToCopy, usableNumChars);
+		newData->peek()[usableNumChars] = 0;
+	}
+	if (strToCat)
+		strcat(newData->peek(), strToCat);
+
+	releaseBuffer();
+	m_data = newData;
+
+	validate();
+}
+
+
+// -----------------------------------------------------
+void AsciiString::releaseBuffer()
+{
+	ScopedCriticalSection scopedCriticalSection(TheAsciiStringCriticalSection);
+
+	validate();
+	if (m_data)
+	{
+		if (--m_data->m_refCount == 0)
+		{
+			TheDynamicMemoryAllocator->freeBytes(m_data);
+		}
+		m_data = 0;
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+AsciiString::AsciiString(const char* s) : m_data(NULL)
+{
+	//DEBUG_ASSERTCRASH(isMemoryManagerOfficiallyInited(), ("Initializing AsciiStrings prior to main (ie, as static vars) can cause memory leak reporting problems. Are you sure you want to do this?"));
+	int len = s ? (int)strlen(s) : 0;
+	if (len > 0)
+	{
+		ensureUniqueBufferOfSize(len + 1, false, s, NULL);
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+AsciiString::AsciiString(const char* s, int len) : m_data(NULL)
+{
+	if (len > 0)
+	{
+		ensureUniqueBufferOfSize(len + 1, false, s, NULL);
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void AsciiString::set(const AsciiString& stringSrc)
+{
+	ScopedCriticalSection scopedCriticalSection(TheAsciiStringCriticalSection);
+
+	validate();
+	if (&stringSrc != this)
+	{
+		releaseBuffer();
+		m_data = stringSrc.m_data;
+		if (m_data)
+			++m_data->m_refCount;
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void AsciiString::set(const char* s)
+{
+	int len = s ? strlen(s) : 0;
+	set(s, len);
+}
+
+// -----------------------------------------------------
+void AsciiString::set(const char* s, int len)
+{
+	validate();
+	if (!m_data || s != peek())
+	{
+		if (len > 0)
+		{
+			ensureUniqueBufferOfSize(len + 1, false, s, NULL);
+		}
+		else
+		{
+			releaseBuffer();
+		}
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+char*  AsciiString::getBufferForRead(Int len)
+{
+	validate();
+	DEBUG_ASSERTCRASH(len>0, ("No need to allocate 0 len strings."));
+	ensureUniqueBufferOfSize(len + 1, false, NULL, NULL);
+	validate();
+	return peek();
+}
+
+// -----------------------------------------------------
+void AsciiString::translate(const UnicodeString& stringSrc)
+{
+	validate();
+	/// @todo srj put in a real translation here; this will only work for 7-bit ascii
+	clear();
+	Int len = stringSrc.getLength();
+	for (Int i = 0; i < len; i++)
+		concat((char)stringSrc.getCharAt(i));
+	validate();
+}
+
+// -----------------------------------------------------
+void AsciiString::concat(const char* s)
+{
+	validate();
+	int addlen = strlen(s);
+	if (addlen == 0)
+		return;	// my, that was easy
+
+	if (m_data)
+	{
+		ensureUniqueBufferOfSize(getLength() + addlen + 1, true, NULL, s);
+	}
+	else
+	{
+		set(s);
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void AsciiString::trim()
+{
+	validate();
+
+	if (m_data)
+	{
+		char *c = peek();
+
+		//	Strip leading white space from the string.
+		c = skipWhitespace(c);
+		if (c != peek())
+		{
+			set(c);
+		}
+
+		trimEnd();
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void AsciiString::trimEnd()
+{
+	validate();
+
+	if (m_data)
+	{
+		// Clip trailing white space from the string.
+		const int len = strlen(peek());
+		int index = len;
+		while (index > 0 && isspace(getCharAt(index - 1)))
+		{
+			--index;
+		}
+
+		if (index < len)
+		{
+			truncateTo(index);
+		}
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void AsciiString::trimEnd(const char c)
+{
+	validate();
+
+	if (m_data)
+	{
+		// Clip trailing consecutive occurances of c from the string.
+		const int len = strlen(peek());
+		int index = len;
+		while (index > 0 && getCharAt(index - 1) == c)
+		{
+			--index;
+		}
+
+		if (index < len)
+		{
+			truncateTo(index);
+		}
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void AsciiString::toLower()
+{
+	validate();
+	if (m_data)
+	{
+		char buf[MAX_FORMAT_BUF_LEN];
+		strcpy(buf, peek());
+
+		char *c = buf;
+		while (c && *c)
+		{
+			*c = tolower(*c);
+			c++;
+		}
+		set(buf);
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void AsciiString::removeLastChar()
+{
+	truncateBy(1);
+}
+
+// -----------------------------------------------------
+void AsciiString::truncateBy(const Int charCount)
+{
+	validate();
+	if (m_data && charCount > 0)
+	{
+		const size_t len = strlen(peek());
+		if (len > 0)
+		{
+			ensureUniqueBufferOfSize(len + 1, true, NULL, NULL);
+			size_t count = charCount;
+			if (charCount > len)
+			{
+				count = len;
+			}
+			peek()[len - count] = 0;
+		}
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void AsciiString::truncateTo(const Int maxLength)
+{
+	validate();
+	if (m_data)
+	{
+		const size_t len = strlen(peek());
+		if (len > maxLength)
+		{
+			ensureUniqueBufferOfSize(len + 1, true, NULL, NULL);
+			peek()[maxLength] = 0;
+		}
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void AsciiString::format(AsciiString format, ...)
+{
+	validate();
+	va_list args;
+  va_start(args, format);
+	format_va(format, args);
+  va_end(args);
+	validate();
+}
+
+// -----------------------------------------------------
+void AsciiString::format(const char* format, ...)
+{
+	validate();
+	va_list args;
+  va_start(args, format);
+	format_va(format, args);
+  va_end(args);
+	validate();
+}
+
+// -----------------------------------------------------
+void AsciiString::format_va(const AsciiString& format, va_list args)
+{
+	format_va(format.str(), args);
+}
+
+// -----------------------------------------------------
+void AsciiString::format_va(const char* format, va_list args)
+{
+	validate();
+	char buf[MAX_FORMAT_BUF_LEN];
+	const int result = vsnprintf(buf, sizeof(buf)/sizeof(char), format, args);
+	if (result >= 0)
+	{
+		set(buf);
+		validate();
+	}
+	else
+	{
+		DEBUG_CRASH(("AsciiString::format_va failed with code:%d format:\"%s\"", result, format));
+	}
+}
+
+// -----------------------------------------------------
+Bool AsciiString::startsWith(const char* p) const
+{
+	return m_data && ::startsWith(peek(), p);
+}
+
+// -----------------------------------------------------
+Bool AsciiString::startsWithNoCase(const char* p) const
+{
+	return m_data && ::startsWithNoCase(peek(), p);
+}
+
+// -----------------------------------------------------
+Bool AsciiString::endsWith(const char* p) const
+{
+	return m_data && ::endsWith(peek(), p);
+}
+
+// -----------------------------------------------------
+Bool AsciiString::endsWithNoCase(const char* p) const
+{
+	return m_data && ::endsWithNoCase(peek(), p);
+}
+
+//-----------------------------------------------------------------------------
+Bool AsciiString::isNone() const
+{
+	return m_data && stricmp(peek(), "None") == 0;
+}
+
+//-----------------------------------------------------------------------------
+Bool AsciiString::nextToken(AsciiString* tok, const char* seps)
+{
+	if (this->isEmpty() || tok == this)
+		return false;
+
+	if (seps == NULL)
+		seps = " \n\r\t";
+
+	char* start = skipSeps(peek(), seps);
+	char* end = skipNonSeps(start, seps);
+
+	if (end > start)
+	{
+		Int len = end - start;
+		char* tmp = tok->getBufferForRead(len + 1);
+		memcpy(tmp, start, len);
+		tmp[len] = 0;
+
+		this->set(end);
+
+		return true;
+	}
+	else
+	{
+		this->clear();
+		tok->clear();
+		return false;
+	}
+}
diff --git a/Core/GameEngine/Source/Common/System/Debug.cpp b/Core/GameEngine/Source/Common/System/Debug.cpp
new file mode 100644
index 00000000000..33ddbff4606
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/Debug.cpp
@@ -0,0 +1,906 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: Debug.cpp
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:   RTS3
+//
+// File name: Debug.cpp
+//
+// Created:   Steven Johnson, August 2001
+//
+// Desc:      Debug logging and other debug utilities
+//
+// ----------------------------------------------------------------------------
+
+// SYSTEM INCLUDES
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+
+// USER INCLUDES
+
+// TheSuperHackers @feature helmutbuhler 04/10/2025
+// Uncomment this to show normal logging stuff in the crc logging.
+// This can be helpful for context, but can also clutter diffs because normal logs aren't necessarily
+// deterministic or the same on all peers in multiplayer games.
+//#define INCLUDE_DEBUG_LOG_IN_CRC_LOG
+
+#define DEBUG_THREADSAFE
+#ifdef DEBUG_THREADSAFE
+#include "Common/CriticalSection.h"
+#endif
+#include "Common/CommandLine.h"
+#include "Common/Debug.h"
+#include "Common/CRCDebug.h"
+#include "Common/SystemInfo.h"
+#include "Common/UnicodeString.h"
+#include "GameClient/ClientInstance.h"
+#include "GameClient/GameText.h"
+#include "GameClient/Keyboard.h"
+#include "GameClient/Mouse.h"
+#if defined(DEBUG_STACKTRACE) || defined(IG_DEBUG_STACKTRACE)
+	#include "Common/StackDump.h"
+#endif
+#ifdef RTS_ENABLE_CRASHDUMP
+#include "Common/MiniDumper.h"
+#endif
+
+// Horrible reference, but we really, really need to know if we are windowed.
+extern bool DX8Wrapper_IsWindowed;
+extern HWND ApplicationHWnd;
+
+extern const char *gAppPrefix; /// So WB can have a different log file name.
+
+
+// ----------------------------------------------------------------------------
+// DEFINES
+// ----------------------------------------------------------------------------
+
+#ifdef DEBUG_LOGGING
+
+#if defined(RTS_DEBUG)
+	#define DEBUG_FILE_NAME				"DebugLogFileD"
+	#define DEBUG_FILE_NAME_PREV	"DebugLogFilePrevD"
+#else
+	#define DEBUG_FILE_NAME				"DebugLogFile"
+	#define DEBUG_FILE_NAME_PREV	"DebugLogFilePrev"
+#endif
+
+#endif
+
+// ----------------------------------------------------------------------------
+// PRIVATE TYPES
+// ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+// PRIVATE DATA
+// ----------------------------------------------------------------------------
+// TheSuperHackers @info Must not use static RAII types when set in DebugInit,
+// because DebugInit can be called during static module initialization before the main function is called.
+#ifdef DEBUG_LOGGING
+static FILE *theLogFile = NULL;
+static char theLogFileName[ _MAX_PATH ];
+static char theLogFileNamePrev[ _MAX_PATH ];
+#endif
+#define LARGE_BUFFER	8192
+static char theBuffer[ LARGE_BUFFER ];	// make it big to avoid weird overflow bugs in debug mode
+static int theDebugFlags = 0;
+static DWORD theMainThreadID = 0;
+// ----------------------------------------------------------------------------
+// PUBLIC DATA
+// ----------------------------------------------------------------------------
+
+char* TheCurrentIgnoreCrashPtr = NULL;
+#ifdef DEBUG_LOGGING
+UnsignedInt DebugLevelMask = 0;
+const char *TheDebugLevels[DEBUG_LEVEL_MAX] = {
+	"NET"
+};
+#endif
+
+// ----------------------------------------------------------------------------
+// PRIVATE PROTOTYPES
+// ----------------------------------------------------------------------------
+static const char *getCurrentTimeString(void);
+static const char *getCurrentTickString(void);
+static void prepBuffer(char *buffer);
+#ifdef DEBUG_LOGGING
+static void doLogOutput(const char *buffer);
+static void doLogOutput(const char *buffer, const char *endline);
+#endif
+#ifdef DEBUG_CRASHING
+static int doCrashBox(const char *buffer, Bool logResult);
+#endif
+static void whackFunnyCharacters(char *buf);
+#ifdef DEBUG_STACKTRACE
+static void doStackDump();
+#endif
+
+// ----------------------------------------------------------------------------
+// PRIVATE FUNCTIONS
+// ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+inline Bool ignoringAsserts()
+{
+	if (!DX8Wrapper_IsWindowed)
+		return true;
+	if (TheGlobalData && TheGlobalData->m_headless)
+		return true;
+#ifdef DEBUG_CRASHING
+	if (TheGlobalData && TheGlobalData->m_debugIgnoreAsserts)
+		return true;
+#endif
+
+	return false;
+}
+
+// ----------------------------------------------------------------------------
+inline HWND getThreadHWND()
+{
+	return (theMainThreadID == GetCurrentThreadId())?ApplicationHWnd:NULL;
+}
+
+// ----------------------------------------------------------------------------
+
+int MessageBoxWrapper( LPCSTR lpText, LPCSTR lpCaption, UINT uType )
+{
+	HWND threadHWND = getThreadHWND();
+	return ::MessageBox(threadHWND, lpText, lpCaption, uType);
+}
+
+// ----------------------------------------------------------------------------
+// getCurrentTimeString
+/**
+	Return the current time in string form
+*/
+// ----------------------------------------------------------------------------
+static const char *getCurrentTimeString(void)
+{
+	time_t aclock;
+	time(&aclock);
+	struct tm *newtime = localtime(&aclock);
+	return asctime(newtime);
+}
+
+// ----------------------------------------------------------------------------
+// getCurrentTickString
+/**
+	Return the current TickCount in string form
+*/
+// ----------------------------------------------------------------------------
+static const char *getCurrentTickString(void)
+{
+	static char TheTickString[32];
+	snprintf(TheTickString, ARRAY_SIZE(TheTickString), "(T=%08lx)", ::GetTickCount());
+	return TheTickString;
+}
+
+// ----------------------------------------------------------------------------
+// prepBuffer
+// zap the buffer and optionally prepend the tick time.
+// ----------------------------------------------------------------------------
+/**
+	Empty the buffer passed in, then optionally prepend the current TickCount
+	value in string form, depending on the setting of theDebugFlags.
+*/
+static void prepBuffer(char *buffer)
+{
+	buffer[0] = 0;
+#ifdef ALLOW_DEBUG_UTILS
+	if (theDebugFlags & DEBUG_FLAG_PREPEND_TIME)
+	{
+		strcpy(buffer, getCurrentTickString());
+		strcat(buffer, " ");
+	}
+#endif
+}
+
+// ----------------------------------------------------------------------------
+// doLogOutput
+/**
+	send a string directly to the log file and/or console without further processing.
+*/
+// ----------------------------------------------------------------------------
+#ifdef DEBUG_LOGGING
+static void doLogOutput(const char *buffer)
+{
+		doLogOutput(buffer, "\n");
+}
+
+static void doLogOutput(const char *buffer, const char *endline)
+{
+	// log message to file
+	if (theDebugFlags & DEBUG_FLAG_LOG_TO_FILE)
+	{
+		if (theLogFile)
+		{
+			fprintf(theLogFile, "%s%s", buffer, endline);
+			fflush(theLogFile);
+		}
+	}
+
+	// log message to dev studio output window
+	if (theDebugFlags & DEBUG_FLAG_LOG_TO_CONSOLE)
+	{
+		::OutputDebugString(buffer);
+		::OutputDebugString(endline);
+	}
+
+#ifdef INCLUDE_DEBUG_LOG_IN_CRC_LOG
+	addCRCDebugLineNoCounter("%s%s", buffer, endline);
+#endif
+}
+#endif // DEBUG_LOGGING
+
+// ----------------------------------------------------------------------------
+// doCrashBox
+/*
+	present a messagebox with the given message. Depending on user selection,
+	we exit the app, break into debugger, or continue execution.
+*/
+// ----------------------------------------------------------------------------
+#ifdef DEBUG_CRASHING
+static int doCrashBox(const char *buffer, Bool logResult)
+{
+	int result;
+
+	if (!ignoringAsserts()) {
+		result = MessageBoxWrapper(buffer, "Assertion Failure", MB_ABORTRETRYIGNORE|MB_TASKMODAL|MB_ICONWARNING|MB_DEFBUTTON3);
+		//result = MessageBoxWrapper(buffer, "Assertion Failure", MB_ABORTRETRYIGNORE|MB_TASKMODAL|MB_ICONWARNING);
+	}	else {
+		result = IDIGNORE;
+	}
+
+	switch(result)
+	{
+		case IDABORT:
+#ifdef DEBUG_LOGGING
+			if (logResult)
+				DebugLog("[Abort]");
+#endif
+			_exit(1);
+			break;
+		case IDRETRY:
+#ifdef DEBUG_LOGGING
+			if (logResult)
+				DebugLog("[Retry]");
+#endif
+			::DebugBreak();
+			break;
+		case IDIGNORE:
+#ifdef DEBUG_LOGGING
+			// do nothing, just keep going
+			if (logResult)
+				DebugLog("[Ignore]");
+#endif
+			break;
+	}
+	return result;
+}
+#endif
+
+#ifdef DEBUG_STACKTRACE
+// ----------------------------------------------------------------------------
+/**
+	Dumps a stack trace (from the current PC) to logfile and/or console.
+*/
+static void doStackDump()
+{
+	const int STACKTRACE_SIZE	= 24;
+	const int STACKTRACE_SKIP = 2;
+	void* stacktrace[STACKTRACE_SIZE];
+
+	doLogOutput("\nStack Dump:");
+	::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);
+	::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, doLogOutput);
+}
+#endif
+
+// ----------------------------------------------------------------------------
+// whackFunnyCharacters
+/**
+	Eliminates any undesirable nonprinting characters, aside from newline,
+	replacing them with spaces.
+*/
+// ----------------------------------------------------------------------------
+static void whackFunnyCharacters(char *buf)
+{
+	for (char *p = buf + strlen(buf) - 1; p >= buf; --p)
+	{
+		// ok, these are naughty magic numbers, but I'm guessing you know ASCII....
+		if (*p >= 0 && *p < 32 && *p != 10 && *p != 13)
+			*p = 32;
+	}
+}
+
+// ----------------------------------------------------------------------------
+// PUBLIC FUNCTIONS
+// ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+// DebugInit
+// ----------------------------------------------------------------------------
+#ifdef ALLOW_DEBUG_UTILS
+/**
+	Initialize the debug utilities. This should be called once, as near to the
+	start of the app as possible, before anything else (since other code will
+	probably want to make use of it).
+*/
+void DebugInit(int flags)
+{
+//	if (theDebugFlags != 0)
+//		::MessageBox(NULL, "Debug already inited", "", MB_OK|MB_APPLMODAL);
+
+	// just quietly allow multiple calls to this, so that static ctors can call it.
+	if (theDebugFlags == 0)
+	{
+		theDebugFlags = flags;
+
+		theMainThreadID = GetCurrentThreadId();
+
+	#ifdef DEBUG_LOGGING
+
+		// TheSuperHackers @info Debug initialization can happen very early.
+		// Determine the client instance id before creating the log file with an instance specific name.
+		CommandLine::parseCommandLineForStartup();
+
+		if (!rts::ClientInstance::initialize())
+			return;
+
+		char dirbuf[ _MAX_PATH ];
+		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
+		if (char *pEnd = strrchr(dirbuf, '\\'))
+		{
+			*(pEnd + 1) = 0;
+		}
+
+		static_assert(ARRAY_SIZE(theLogFileNamePrev) >= ARRAY_SIZE(dirbuf), "Incorrect array size");
+		strcpy(theLogFileNamePrev, dirbuf);
+		strlcat(theLogFileNamePrev, gAppPrefix, ARRAY_SIZE(theLogFileNamePrev));
+		strlcat(theLogFileNamePrev, DEBUG_FILE_NAME_PREV, ARRAY_SIZE(theLogFileNamePrev));
+		if (rts::ClientInstance::getInstanceId() > 1u)
+		{
+			size_t offset = strlen(theLogFileNamePrev);
+			snprintf(theLogFileNamePrev + offset, ARRAY_SIZE(theLogFileNamePrev) - offset, "_Instance%.2u", rts::ClientInstance::getInstanceId());
+		}
+		strlcat(theLogFileNamePrev, ".txt", ARRAY_SIZE(theLogFileNamePrev));
+
+		static_assert(ARRAY_SIZE(theLogFileName) >= ARRAY_SIZE(dirbuf), "Incorrect array size");
+		strcpy(theLogFileName, dirbuf);
+		strlcat(theLogFileName, gAppPrefix, ARRAY_SIZE(theLogFileNamePrev));
+		strlcat(theLogFileName, DEBUG_FILE_NAME, ARRAY_SIZE(theLogFileNamePrev));
+		if (rts::ClientInstance::getInstanceId() > 1u)
+		{
+			size_t offset = strlen(theLogFileName);
+			snprintf(theLogFileName + offset, ARRAY_SIZE(theLogFileName) - offset, "_Instance%.2u", rts::ClientInstance::getInstanceId());
+		}
+		strlcat(theLogFileName, ".txt", ARRAY_SIZE(theLogFileNamePrev));
+
+		remove(theLogFileNamePrev);
+		if (rename(theLogFileName, theLogFileNamePrev) != 0)
+		{
+#ifdef DEBUG_LOGGING
+			DebugLog("Warning: Could not rename buffer file '%s' to '%s'. Will remove instead", theLogFileName, theLogFileNamePrev);
+#endif
+			if (remove(theLogFileName) != 0)
+			{
+#ifdef DEBUG_LOGGING
+				DebugLog("Warning: Failed to remove file '%s'", theLogFileName);
+#endif
+			}
+		}
+
+		theLogFile = fopen(theLogFileName, "w");
+		if (theLogFile != NULL)
+		{
+			DebugLog("Log %s opened: %s", theLogFileName, getCurrentTimeString());
+		}
+	#endif
+	}
+
+}
+#endif
+
+// ----------------------------------------------------------------------------
+// DebugLog
+// ----------------------------------------------------------------------------
+#ifdef DEBUG_LOGGING
+/**
+	Print a string to the log file and/or console.
+*/
+void DebugLog(const char *format, ...)
+{
+#ifdef DEBUG_THREADSAFE
+	ScopedCriticalSection scopedCriticalSection(TheDebugLogCriticalSection);
+#endif
+
+	if (theDebugFlags == 0)
+		MessageBoxWrapper("DebugLog - Debug not inited properly", "", MB_OK|MB_TASKMODAL);
+
+	prepBuffer(theBuffer);
+
+	va_list args;
+	va_start(args, format);
+	size_t offset = strlen(theBuffer);
+	vsnprintf(theBuffer + offset, ARRAY_SIZE(theBuffer) - offset, format, args);
+	va_end(args);
+
+	if (strlen(theBuffer) >= sizeof(theBuffer))
+		MessageBoxWrapper("String too long for debug buffer", "", MB_OK|MB_TASKMODAL);
+
+	whackFunnyCharacters(theBuffer);
+	doLogOutput(theBuffer);
+}
+
+/**
+	Print a string with no modifications to the log file and/or console.
+*/
+void DebugLogRaw(const char *format, ...)
+{
+#ifdef DEBUG_THREADSAFE
+	ScopedCriticalSection scopedCriticalSection(TheDebugLogCriticalSection);
+#endif
+
+	if (theDebugFlags == 0)
+		MessageBoxWrapper("DebugLogRaw - Debug not inited properly", "", MB_OK|MB_TASKMODAL);
+
+	theBuffer[0] = 0;
+
+	va_list args;
+	va_start(args, format);
+	vsnprintf(theBuffer, ARRAY_SIZE(theBuffer), format, args);
+	va_end(args);
+
+	if (strlen(theBuffer) >= sizeof(theBuffer))
+		MessageBoxWrapper("String too long for debug buffer", "", MB_OK|MB_TASKMODAL);
+
+	doLogOutput(theBuffer, "");
+}
+
+const char* DebugGetLogFileName()
+{
+	return theLogFileName;
+}
+
+const char* DebugGetLogFileNamePrev()
+{
+	return theLogFileNamePrev;
+}
+
+#endif
+
+// ----------------------------------------------------------------------------
+// DebugCrash
+// ----------------------------------------------------------------------------
+#ifdef DEBUG_CRASHING
+/**
+	Print a character string to the log file and/or console, then halt execution
+	while presenting the user with an exit/debug/ignore dialog containing the same
+	text message.
+
+	TheSuperHackers @tweak Now shows a message box without any logging when debug was not yet initialized.
+*/
+void DebugCrash(const char *format, ...)
+{
+	// Note: You might want to make this thread safe, but we cannot. The reason is that
+	// there is an implicit requirement on other threads that the message loop be running.
+
+	// make it not static so that it'll be thread-safe.
+	// make it big to avoid weird overflow bugs in debug mode
+	char theCrashBuffer[ LARGE_BUFFER ];
+
+	prepBuffer(theCrashBuffer);
+	strlcat(theCrashBuffer, "ASSERTION FAILURE: ", ARRAY_SIZE(theCrashBuffer));
+
+	va_list arg;
+	va_start(arg, format);
+	size_t offset =  strlen(theCrashBuffer);
+	vsnprintf(theCrashBuffer + offset, ARRAY_SIZE(theCrashBuffer) - offset, format, arg);
+	va_end(arg);
+
+	whackFunnyCharacters(theCrashBuffer);
+
+	const bool useLogging = theDebugFlags != 0;
+
+	if (useLogging)
+	{
+#ifdef DEBUG_LOGGING
+		if (ignoringAsserts())
+		{
+			doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!");
+		}
+		doLogOutput(theCrashBuffer);
+#endif
+#ifdef DEBUG_STACKTRACE
+		if (!(TheGlobalData && TheGlobalData->m_debugIgnoreStackTrace))
+		{
+			doStackDump();
+		}
+#endif
+	}
+
+	strlcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue", ARRAY_SIZE(theCrashBuffer));
+
+	const int result = doCrashBox(theCrashBuffer, useLogging);
+
+	if (result == IDIGNORE && TheCurrentIgnoreCrashPtr != NULL)
+	{
+		int yn;
+		if (!ignoringAsserts())
+		{
+			yn = MessageBoxWrapper("Ignore this crash from now on?", "", MB_YESNO|MB_TASKMODAL);
+		}
+		else
+		{
+			yn = IDYES;
+		}
+		if (yn == IDYES)
+			*TheCurrentIgnoreCrashPtr = 1;
+		if( TheKeyboard )
+			TheKeyboard->resetKeys();
+		if( TheMouse )
+			TheMouse->reset();
+	}
+
+}
+#endif
+
+// ----------------------------------------------------------------------------
+// DebugShutdown
+// ----------------------------------------------------------------------------
+#ifdef ALLOW_DEBUG_UTILS
+/**
+	Shut down the debug utilities. This should be called once, as near to the
+	end of the app as possible, after everything else (since other code will
+	probably want to make use of it).
+*/
+void DebugShutdown()
+{
+#ifdef DEBUG_LOGGING
+	if (theLogFile)
+	{
+		DebugLog("Log closed: %s", getCurrentTimeString());
+		fclose(theLogFile);
+	}
+	theLogFile = NULL;
+#endif
+	theDebugFlags = 0;
+}
+
+// ----------------------------------------------------------------------------
+// DebugGetFlags
+// ----------------------------------------------------------------------------
+/**
+	Get the current values for the flags passed to DebugInit. Most code will never
+	need to use this; the most common usage would be to temporarily enable or disable
+	the DEBUG_FLAG_PREPEND_TIME bit for complex logfile messages.
+*/
+int DebugGetFlags()
+{
+	return theDebugFlags;
+}
+
+// ----------------------------------------------------------------------------
+// DebugSetFlags
+// ----------------------------------------------------------------------------
+/**
+	Set the current values for the flags passed to DebugInit. Most code will never
+	need to use this; the most common usage would be to temporarily enable or disable
+	the DEBUG_FLAG_PREPEND_TIME bit for complex logfile messages.
+*/
+void DebugSetFlags(int flags)
+{
+	theDebugFlags = flags;
+}
+
+#endif	// ALLOW_DEBUG_UTILS
+
+#ifdef DEBUG_PROFILE
+// ----------------------------------------------------------------------------
+SimpleProfiler::SimpleProfiler()
+{
+	QueryPerformanceFrequency((LARGE_INTEGER*)&m_freq);
+	m_startThisSession = 0;
+	m_totalThisSession = 0;
+	m_totalAllSessions = 0;
+	m_numSessions = 0;
+}
+
+// ----------------------------------------------------------------------------
+void SimpleProfiler::start()
+{
+	DEBUG_ASSERTCRASH(m_startThisSession == 0, ("already started"));
+	QueryPerformanceCounter((LARGE_INTEGER*)&m_startThisSession);
+}
+
+// ----------------------------------------------------------------------------
+void SimpleProfiler::stop()
+{
+	if (m_startThisSession != 0)
+	{
+		__int64 stop;
+		QueryPerformanceCounter((LARGE_INTEGER*)&stop);
+		m_totalThisSession = stop - m_startThisSession;
+		m_totalAllSessions += stop - m_startThisSession;
+		m_startThisSession = 0;
+		++m_numSessions;
+	}
+}
+
+// ----------------------------------------------------------------------------
+void SimpleProfiler::stopAndLog(const char *msg, int howOftenToLog, int howOftenToResetAvg)
+{
+	stop();
+	// howOftenToResetAvg==0 means "never reset"
+	if (howOftenToResetAvg > 0 && m_numSessions >= howOftenToResetAvg)
+	{
+		m_numSessions = 0;
+		m_totalAllSessions = 0;
+		DEBUG_LOG(("%s: reset averages",msg));
+	}
+	DEBUG_ASSERTLOG(m_numSessions % howOftenToLog != 0, ("%s: %f msec, total %f msec, avg %f msec",msg,getTime(),getTotalTime(),getAverageTime()));
+}
+
+// ----------------------------------------------------------------------------
+double SimpleProfiler::getTime()
+{
+	stop();
+	return (double)m_totalThisSession / (double)m_freq * 1000.0;
+}
+
+// ----------------------------------------------------------------------------
+int SimpleProfiler::getNumSessions()
+{
+	stop();
+	return m_numSessions;
+}
+
+// ----------------------------------------------------------------------------
+double SimpleProfiler::getTotalTime()
+{
+	stop();
+	if (!m_numSessions)
+		return 0.0;
+
+	return (double)m_totalAllSessions * 1000.0 / ((double)m_freq);
+}
+
+// ----------------------------------------------------------------------------
+double SimpleProfiler::getAverageTime()
+{
+	stop();
+	if (!m_numSessions)
+		return 0.0;
+
+	return (double)m_totalAllSessions * 1000.0 / ((double)m_freq * (double)m_numSessions);
+}
+
+#endif	// DEBUG_PROFILE
+
+// ----------------------------------------------------------------------------
+// ReleaseCrash
+// ----------------------------------------------------------------------------
+/**
+	Halt the application, EVEN IN FINAL RELEASE BUILDS. This should be called
+	only when a crash is guaranteed by continuing, and no meaningful continuation
+	of processing is possible, even by throwing an exception.
+*/
+
+	#define RELEASECRASH_FILE_NAME				"ReleaseCrashInfo.txt"
+	#define RELEASECRASH_FILE_NAME_PREV		"ReleaseCrashInfoPrev.txt"
+
+	static FILE *theReleaseCrashLogFile = NULL;
+
+	static void releaseCrashLogOutput(const char *buffer)
+	{
+		if (theReleaseCrashLogFile)
+		{
+			fprintf(theReleaseCrashLogFile, "%s\n", buffer);
+			fflush(theReleaseCrashLogFile);
+		}
+	}
+
+
+static void TriggerMiniDump()
+{
+#ifdef RTS_ENABLE_CRASHDUMP
+	if (TheMiniDumper && TheMiniDumper->IsInitialized())
+	{
+		// Create both minimal and full memory dumps
+		TheMiniDumper->TriggerMiniDump(DumpType_Minimal);
+		TheMiniDumper->TriggerMiniDump(DumpType_Full);
+	}
+
+	MiniDumper::shutdownMiniDumper();
+#endif
+}
+
+
+void ReleaseCrash(const char *reason)
+{
+	/// do additional reporting on the crash, if possible
+
+	if (!DX8Wrapper_IsWindowed) {
+		if (ApplicationHWnd) {
+			ShowWindow(ApplicationHWnd, SW_HIDE);
+		}
+	}
+
+	TriggerMiniDump();
+
+	char prevbuf[ _MAX_PATH ];
+	char curbuf[ _MAX_PATH ];
+
+	if (TheGlobalData==NULL) {
+		return; // We are shutting down, and TheGlobalData has been freed.  jba. [4/15/2003]
+	}
+
+	strlcpy(prevbuf, TheGlobalData->getPath_UserData().str(), ARRAY_SIZE(prevbuf));
+	strlcat(prevbuf, RELEASECRASH_FILE_NAME_PREV, ARRAY_SIZE(prevbuf));
+	strlcpy(curbuf, TheGlobalData->getPath_UserData().str(), ARRAY_SIZE(curbuf));
+	strlcat(curbuf, RELEASECRASH_FILE_NAME, ARRAY_SIZE(curbuf));
+
+ 	remove(prevbuf);
+	if (rename(curbuf, prevbuf) != 0)
+	{
+#ifdef DEBUG_LOGGING
+		DebugLog("Warning: Could not rename buffer file '%s' to '%s'. Will remove instead", curbuf, prevbuf);
+#endif
+		if (remove(curbuf) != 0)
+		{
+#ifdef DEBUG_LOGGING
+			DebugLog("Warning: Failed to remove file '%s'", curbuf);
+#endif
+		}
+	}
+
+	theReleaseCrashLogFile = fopen(curbuf, "w");
+	if (theReleaseCrashLogFile)
+	{
+		fprintf(theReleaseCrashLogFile, "Release Crash at %s; Reason %s\n", getCurrentTimeString(), reason);
+		fprintf(theReleaseCrashLogFile, "\nLast error:\n%s\n\nCurrent stack:\n", g_LastErrorDump.str());
+		const int STACKTRACE_SIZE	= 12;
+		const int STACKTRACE_SKIP = 6;
+		void* stacktrace[STACKTRACE_SIZE];
+		::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);
+		::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, releaseCrashLogOutput);
+
+		fflush(theReleaseCrashLogFile);
+		fclose(theReleaseCrashLogFile);
+		theReleaseCrashLogFile = NULL;
+	}
+
+	if (!DX8Wrapper_IsWindowed) {
+		if (ApplicationHWnd) {
+			ShowWindow(ApplicationHWnd, SW_HIDE);
+		}
+	}
+
+#if defined(RTS_DEBUG)
+	/* static */ char buff[8192]; // not so static so we can be threadsafe
+	snprintf(buff, 8192, "Sorry, a serious error occurred. (%s)", reason);
+	::MessageBox(NULL, buff, "Technical Difficulties...", MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
+#else
+// crash error messaged changed 3/6/03 BGC
+//	::MessageBox(NULL, "Sorry, a serious error occurred.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
+//	::MessageBox(NULL, "You have encountered a serious error.  Serious errors can be caused by many things including viruses, overheated hardware and hardware that does not meet the minimum specifications for the game. Please visit the forums at www.generals.ea.com for suggested courses of action or consult your manual for Technical Support contact information.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
+
+// crash error message changed again 8/22/03 M Lorenzen... made this message box modal to the system so it will appear on top of any task-modal windows, splash-screen, etc.
+  ::MessageBox(NULL, "You have encountered a serious error.  Serious errors can be caused by many things including viruses, overheated hardware and hardware that does not meet the minimum specifications for the game. Please visit the forums at www.generals.ea.com for suggested courses of action or consult your manual for Technical Support contact information.",
+   "Technical Difficulties...",
+   MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
+
+
+#endif
+
+	_exit(1);
+}
+
+void ReleaseCrashLocalized(const AsciiString& p, const AsciiString& m)
+{
+	if (!TheGameText) {
+		ReleaseCrash(m.str());
+		// This won't ever return
+		return;
+	}
+
+	TriggerMiniDump();
+
+	UnicodeString prompt = TheGameText->fetch(p);
+	UnicodeString mesg = TheGameText->fetch(m);
+
+
+	/// do additional reporting on the crash, if possible
+
+	if (!DX8Wrapper_IsWindowed) {
+		if (ApplicationHWnd) {
+			ShowWindow(ApplicationHWnd, SW_HIDE);
+		}
+	}
+
+	if (TheSystemIsUnicode)
+	{
+		::MessageBoxW(NULL, mesg.str(), prompt.str(), MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
+	}
+	else
+	{
+		// However, if we're using the default version of the message box, we need to
+		// translate the string into an AsciiString
+		AsciiString promptA, mesgA;
+		promptA.translate(prompt);
+		mesgA.translate(mesg);
+		//Make sure main window is not TOP_MOST
+		::SetWindowPos(ApplicationHWnd, HWND_NOTOPMOST, 0, 0, 0, 0,SWP_NOSIZE |SWP_NOMOVE);
+		::MessageBoxA(NULL, mesgA.str(), promptA.str(), MB_OK|MB_TASKMODAL|MB_ICONERROR);
+	}
+
+	char prevbuf[ _MAX_PATH ];
+	char curbuf[ _MAX_PATH ];
+
+	strlcpy(prevbuf, TheGlobalData->getPath_UserData().str(), ARRAY_SIZE(prevbuf));
+	strlcat(prevbuf, RELEASECRASH_FILE_NAME_PREV, ARRAY_SIZE(prevbuf));
+	strlcpy(curbuf, TheGlobalData->getPath_UserData().str(), ARRAY_SIZE(curbuf));
+	strlcat(curbuf, RELEASECRASH_FILE_NAME, ARRAY_SIZE(curbuf));
+
+ 	remove(prevbuf);
+	if (rename(curbuf, prevbuf) != 0)
+	{
+#ifdef DEBUG_LOGGING
+		DebugLog("Warning: Could not rename buffer file '%s' to '%s'. Will remove instead", curbuf, prevbuf);
+#endif
+		if (remove(curbuf) != 0)
+		{
+#ifdef DEBUG_LOGGING
+			DebugLog("Warning: Failed to remove file '%s'", curbuf);
+#endif
+		}
+	}
+
+	theReleaseCrashLogFile = fopen(curbuf, "w");
+	if (theReleaseCrashLogFile)
+	{
+		fprintf(theReleaseCrashLogFile, "Release Crash at %s; Reason %ls\n", getCurrentTimeString(), mesg.str());
+
+		const int STACKTRACE_SIZE	= 12;
+		const int STACKTRACE_SKIP = 6;
+		void* stacktrace[STACKTRACE_SIZE];
+		::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);
+		::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, releaseCrashLogOutput);
+
+		fflush(theReleaseCrashLogFile);
+		fclose(theReleaseCrashLogFile);
+		theReleaseCrashLogFile = NULL;
+	}
+
+	_exit(1);
+}
diff --git a/Core/GameEngine/Source/Common/System/File.cpp b/Core/GameEngine/Source/Common/System/File.cpp
new file mode 100644
index 00000000000..dfb60e80d3c
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/File.cpp
@@ -0,0 +1,267 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   WSYS Library
+//
+// Module:    IO_
+//
+// File name: IO_File.cpp
+//
+// Created:   4/23/01
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "PreRTS.h"
+
+#include <assert.h>
+#include <stdarg.h>
+
+
+#include "Common/file.h"
+
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Prototypes
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Functions
+//----------------------------------------------------------------------------
+
+//=================================================================
+// File::File
+//=================================================================
+
+File::File()
+:	m_open(FALSE),
+	m_deleteOnClose(FALSE),
+	m_access(NONE)
+{
+
+	setName("<no file>");
+
+}
+
+
+//----------------------------------------------------------------------------
+//         Public Functions
+//----------------------------------------------------------------------------
+
+
+//=================================================================
+// File::~File
+//=================================================================
+
+File::~File()
+{
+}
+
+//=================================================================
+// File::open
+//=================================================================
+/**
+  * Any derived open() members must first call File::open. If File::open
+	* succeeds but the derived class's open failes then make sure to call
+	* File::close() before returning.
+	*/
+//=================================================================
+
+Bool File::open( const Char *filename, Int access, size_t bufferSize )
+{
+	if( m_open )
+	{
+		return FALSE;
+	}
+
+	setName( filename );
+
+	if( (access & ( STREAMING | WRITE )) == ( STREAMING | WRITE ))
+	{
+		// illegal access
+		return FALSE;
+	}
+
+	if( (access & ( TEXT | BINARY)) == ( TEXT | BINARY ))
+	{
+		// illegal access
+		return FALSE;
+	}
+
+	if ( (access & (READ|WRITE)) == 0 )
+	{
+		access |= READ;
+	}
+
+	if ( (access & (READ|APPEND)) == 0 )
+	{
+		access |= TRUNCATE;
+	}
+
+	if ( (access & (TEXT|BINARY)) == 0 )
+	{
+		access |= BINARY;
+	}
+
+	m_access = access;
+	m_open = TRUE;
+	return TRUE;
+}
+
+//=================================================================
+// File::close
+//=================================================================
+/**
+  * Must call File::close() for each successful File::open() call.
+	*/
+//=================================================================
+
+void File::close( void )
+{
+	if( m_open )
+	{
+		setName( "<no file>" );
+		m_open = FALSE;
+		if ( m_deleteOnClose )
+		{
+			deleteInstance(this); // on special cases File object will delete itself when closing
+		}
+	}
+}
+
+//=================================================================
+
+void File::closeWithoutDelete()
+{
+	if( m_open )
+	{
+		setName( "<no file>" );
+		m_open = FALSE;
+	}
+}
+
+//=================================================================
+// File::size
+//=================================================================
+/**
+  * Default implementation of File::size. Derived classes can optimize
+	* this member function.
+	*/
+//=================================================================
+
+Int File::size( void )
+{
+	Int pos = seek( 0, CURRENT );
+	Int size = seek( 0, END );
+
+	seek( pos, START );
+
+	return size < 0 ? 0 : size;
+}
+
+//============================================================================
+// File::position
+//============================================================================
+
+Int File::position( void )
+{
+	return seek(0, CURRENT);
+}
+
+//============================================================================
+// File::print
+//============================================================================
+
+Bool	File::print ( const Char *format, ...)
+{
+	Char buffer[10*1024];
+	Int len;
+
+	if ( ! (m_access & TEXT ) )
+	{
+		return FALSE;
+	}
+
+	va_list args;
+	va_start( args, format );     /* Initialize variable arguments. */
+	len = vsprintf( buffer, format, args );
+	va_end( args );
+
+	if ( len >= sizeof(buffer) )
+	{
+		// Big Problem
+		assert( FALSE );
+		return FALSE;
+	}
+
+	return (write ( buffer, len ) == len);
+}
+
+Bool	File::eof() {
+	return (position() == size());
+}
diff --git a/Core/GameEngine/Source/Common/System/FileSystem.cpp b/Core/GameEngine/Source/Common/System/FileSystem.cpp
new file mode 100644
index 00000000000..46d468d4a05
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/FileSystem.cpp
@@ -0,0 +1,459 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   WSYS Library
+//
+// Module:    IO
+//
+// File name: IO_FileSystem.cpp
+//
+// Created:   4/23/01
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "PreRTS.h"
+#include "Common/file.h"
+#include "Common/FileSystem.h"
+
+#include "Common/ArchiveFileSystem.h"
+#include "Common/CDManager.h"
+#include "Common/GameAudio.h"
+#include "Common/LocalFileSystem.h"
+#include "Common/PerfTimer.h"
+
+
+DECLARE_PERF_TIMER(FileSystem)
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Data
+//----------------------------------------------------------------------------
+
+//===============================
+// TheFileSystem
+//===============================
+/**
+  *	This is the FileSystem's singleton class. All file access
+	* should be through TheFileSystem, unless code needs to use an explicit
+	* File or FileSystem derivative.
+	*
+	* Using TheFileSystem->open and File exclusively for file access, particularly
+	* in library or modular code, allows applications to transparently implement
+	* file access as they see fit. This is particularly important for code that
+	* needs to be shared between applications, such as games and tools.
+	*/
+//===============================
+
+FileSystem	*TheFileSystem = NULL;
+
+//----------------------------------------------------------------------------
+//         Private Prototypes
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Private Functions
+//----------------------------------------------------------------------------
+
+
+//----------------------------------------------------------------------------
+//         Public Functions
+//----------------------------------------------------------------------------
+
+
+//============================================================================
+// FileSystem::FileSystem
+//============================================================================
+
+FileSystem::FileSystem()
+{
+
+}
+
+//============================================================================
+// FileSystem::~FileSystem
+//============================================================================
+
+FileSystem::~FileSystem()
+{
+
+}
+
+//============================================================================
+// FileSystem::init
+//============================================================================
+
+void		FileSystem::init( void )
+{
+	TheLocalFileSystem->init();
+	TheArchiveFileSystem->init();
+}
+
+//============================================================================
+// FileSystem::update
+//============================================================================
+
+void		FileSystem::update( void )
+{
+	USE_PERF_TIMER(FileSystem)
+	TheLocalFileSystem->update();
+	TheArchiveFileSystem->update();
+}
+
+//============================================================================
+// FileSystem::reset
+//============================================================================
+
+void		FileSystem::reset( void )
+{
+	USE_PERF_TIMER(FileSystem)
+	TheLocalFileSystem->reset();
+	TheArchiveFileSystem->reset();
+}
+
+//============================================================================
+// FileSystem::open
+//============================================================================
+
+File*		FileSystem::openFile( const Char *filename, Int access, size_t bufferSize, FileInstance instance )
+{
+	USE_PERF_TIMER(FileSystem)
+	File *file = NULL;
+
+	if ( TheLocalFileSystem != NULL )
+	{
+		if (instance != 0)
+		{
+			if (TheLocalFileSystem->doesFileExist(filename))
+			{
+				--instance;
+			}
+		}
+		else
+		{
+			file = TheLocalFileSystem->openFile( filename, access, bufferSize );
+
+#if ENABLE_FILESYSTEM_EXISTENCE_CACHE
+			if (file != NULL && (file->getAccess() & File::CREATE))
+			{
+				FastCriticalSectionClass::LockClass lock(m_fileExistMutex);
+				FileExistMap::iterator it = m_fileExist.find(FileExistMap::key_type::temporary(filename));
+				if (it != m_fileExist.end())
+				{
+					++it->second.instanceExists;
+					if (it->second.instanceDoesNotExist != ~FileInstance(0))
+						++it->second.instanceDoesNotExist;
+				}
+				else
+				{
+					m_fileExist[filename];
+				}
+			}
+#endif
+		}
+	}
+
+	if ( (TheArchiveFileSystem != NULL) && (file == NULL) )
+	{
+		// TheSuperHackers @todo Pass 'access' here?
+		file = TheArchiveFileSystem->openFile( filename, 0, instance );
+	}
+
+	return file;
+}
+
+//============================================================================
+// FileSystem::doesFileExist
+//============================================================================
+
+Bool FileSystem::doesFileExist(const Char *filename, FileInstance instance) const
+{
+	USE_PERF_TIMER(FileSystem)
+
+#if ENABLE_FILESYSTEM_EXISTENCE_CACHE
+	{
+		FastCriticalSectionClass::LockClass lock(m_fileExistMutex);
+		FileExistMap::const_iterator it = m_fileExist.find(FileExistMap::key_type::temporary(filename));
+		if (it != m_fileExist.end())
+		{
+			// Must test instanceDoesNotExist first!
+			if (instance >= it->second.instanceDoesNotExist)
+				return FALSE;
+			if (instance <= it->second.instanceExists)
+				return TRUE;
+		}
+	}
+#endif
+
+	if (TheLocalFileSystem->doesFileExist(filename))
+	{
+		if (instance == 0)
+		{
+#if ENABLE_FILESYSTEM_EXISTENCE_CACHE
+			{
+				FastCriticalSectionClass::LockClass lock(m_fileExistMutex);
+				m_fileExist[filename];
+			}
+#endif
+			return TRUE;
+		}
+
+		--instance;
+	}
+
+	if (TheArchiveFileSystem->doesFileExist(filename, instance))
+	{
+#if ENABLE_FILESYSTEM_EXISTENCE_CACHE
+		{
+			FastCriticalSectionClass::LockClass lock(m_fileExistMutex);
+			FileExistMap::mapped_type& value = m_fileExist[filename];
+			value.instanceExists = max(value.instanceExists, instance);
+		}
+#endif
+		return TRUE;
+	}
+
+#if ENABLE_FILESYSTEM_EXISTENCE_CACHE
+	{
+		FastCriticalSectionClass::LockClass lock(m_fileExistMutex);
+		FileExistMap::mapped_type& value = m_fileExist[filename];
+		value.instanceDoesNotExist = min(value.instanceDoesNotExist, instance);
+	}
+#endif
+	return FALSE;
+}
+
+//============================================================================
+// FileSystem::getFileListInDirectory
+//============================================================================
+void FileSystem::getFileListInDirectory(const AsciiString& directory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
+{
+	USE_PERF_TIMER(FileSystem)
+	TheLocalFileSystem->getFileListInDirectory(AsciiString::TheEmptyString, directory, searchName, filenameList, searchSubdirectories);
+	TheArchiveFileSystem->getFileListInDirectory(AsciiString::TheEmptyString, directory, searchName, filenameList, searchSubdirectories);
+}
+
+//============================================================================
+// FileSystem::getFileInfo
+//============================================================================
+Bool FileSystem::getFileInfo(const AsciiString& filename, FileInfo *fileInfo, FileInstance instance) const
+{
+	USE_PERF_TIMER(FileSystem)
+
+	// TheSuperHackers @todo Add file info cache?
+
+	if (fileInfo == NULL) {
+		return FALSE;
+	}
+	memset(fileInfo, 0, sizeof(*fileInfo));
+
+	if (TheLocalFileSystem->getFileInfo(filename, fileInfo)) {
+		if (instance == 0) {
+			return TRUE;
+		}
+
+		--instance;
+	}
+
+	if (TheArchiveFileSystem->getFileInfo(filename, fileInfo, instance)) {
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+//============================================================================
+// FileSystem::createDirectory
+//============================================================================
+Bool FileSystem::createDirectory(AsciiString directory)
+{
+	USE_PERF_TIMER(FileSystem)
+	if (TheLocalFileSystem != NULL) {
+		return TheLocalFileSystem->createDirectory(directory);
+	}
+	return FALSE;
+}
+
+//============================================================================
+// FileSystem::areMusicFilesOnCD
+//============================================================================
+Bool FileSystem::areMusicFilesOnCD()
+{
+#if 1
+	return TRUE;
+#else
+	if (!TheCDManager) {
+		DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - No CD Manager; returning false"));
+		return FALSE;
+	}
+
+	AsciiString cdRoot;
+	Int dc = TheCDManager->driveCount();
+	for (Int i = 0; i < dc; ++i) {
+		DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - checking drive %d", i));
+		CDDriveInterface *cdi = TheCDManager->getDrive(i);
+		if (!cdi) {
+			continue;
+		}
+
+		cdRoot = cdi->getPath();
+		if (!cdRoot.endsWith("\\"))
+			cdRoot.concat("\\");
+#if RTS_GENERALS
+		cdRoot.concat("gensec.big");
+#elif RTS_ZEROHOUR
+		cdRoot.concat("genseczh.big");
+#endif
+		DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - checking for %s", cdRoot.str()));
+		File *musicBig = TheLocalFileSystem->openFile(cdRoot.str());
+		if (musicBig)
+		{
+			DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - found it!"));
+			musicBig->close();
+			return TRUE;
+		}
+	}
+	return FALSE;
+#endif
+}
+//============================================================================
+// FileSystem::loadMusicFilesFromCD
+//============================================================================
+void FileSystem::loadMusicFilesFromCD()
+{
+	if (!TheCDManager) {
+		return;
+	}
+
+	AsciiString cdRoot;
+	Int dc = TheCDManager->driveCount();
+	for (Int i = 0; i < dc; ++i) {
+		CDDriveInterface *cdi = TheCDManager->getDrive(i);
+		if (!cdi) {
+			continue;
+		}
+
+		cdRoot = cdi->getPath();
+		if (TheArchiveFileSystem->loadBigFilesFromDirectory(cdRoot, MUSIC_BIG)) {
+			break;
+		}
+	}
+}
+
+//============================================================================
+// FileSystem::unloadMusicFilesFromCD
+//============================================================================
+void FileSystem::unloadMusicFilesFromCD()
+{
+	if (!(TheAudio && TheAudio->isMusicPlayingFromCD())) {
+		return;
+	}
+
+	TheArchiveFileSystem->closeArchiveFile( MUSIC_BIG );
+}
+
+//============================================================================
+// FileSystem::normalizePath
+//============================================================================
+AsciiString FileSystem::normalizePath(const AsciiString& path)
+{
+	return TheLocalFileSystem->normalizePath(path);
+}
+
+//============================================================================
+// FileSystem::isPathInDirectory
+//============================================================================
+Bool FileSystem::isPathInDirectory(const AsciiString& testPath, const AsciiString& basePath)
+{
+	AsciiString testPathNormalized = TheFileSystem->normalizePath(testPath);
+	AsciiString basePathNormalized = TheFileSystem->normalizePath(basePath);
+
+	if (basePathNormalized.isEmpty())
+	{
+		DEBUG_CRASH(("Unable to normalize base directory path '%s'.", basePath.str()));
+		return false;
+	}
+	else if (testPathNormalized.isEmpty())
+	{
+		DEBUG_CRASH(("Unable to normalize file path '%s'.", testPath.str()));
+		return false;
+	}
+
+#ifdef _WIN32
+	const char* pathSep = "\\";
+#else
+	const char* pathSep = "/";
+#endif
+
+	if (!basePathNormalized.endsWith(pathSep))
+	{
+		basePathNormalized.concat(pathSep);
+	}
+
+#ifdef _WIN32
+	if (!testPathNormalized.startsWithNoCase(basePathNormalized))
+#else
+	if (!testPathNormalized.startsWith(basePathNormalized))
+#endif
+	{
+		return false;
+	}
+
+	return true;
+}
diff --git a/Core/GameEngine/Source/Common/System/GameMemory.cpp b/Core/GameEngine/Source/Common/System/GameMemory.cpp
new file mode 100644
index 00000000000..2ede5c780b9
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/GameMemory.cpp
@@ -0,0 +1,3579 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: Memory.cpp
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:   RTS3
+//
+// File name: Memory.cpp
+//
+// Created:   Steven Johnson, August 2001
+//
+// Desc:      Memory manager
+//
+// ----------------------------------------------------------------------------
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+// SYSTEM INCLUDES
+
+// USER INCLUDES
+#include "Common/GameMemory.h"
+#include "Common/CriticalSection.h"
+#include "Common/Errors.h"
+#include "Common/GlobalData.h"
+#include "Common/PerfTimer.h"
+#ifdef MEMORYPOOL_DEBUG
+#include "GameClient/ClientRandomValue.h"
+#endif
+#ifdef MEMORYPOOL_STACKTRACE
+	#include "Common/StackDump.h"
+#endif
+
+#ifdef MEMORYPOOL_DEBUG
+DECLARE_PERF_TIMER(MemoryPoolDebugging)
+DECLARE_PERF_TIMER(MemoryPoolInitFilling)
+#endif
+
+
+
+// ----------------------------------------------------------------------------
+// DEFINES
+// ----------------------------------------------------------------------------
+
+/**
+	define MPSB_DLINK to add a backlink to MemoryPoolSingleBlock; this makes it
+	faster to free raw DMA blocks.
+	@todo verify this speedup is enough to be worth the extra space
+*/
+#ifndef DISABLE_MEMORYPOOL_MPSB_DLINK
+	#define MPSB_DLINK
+#endif
+
+#ifdef MEMORYPOOL_DEBUG
+
+	/**
+		if you define MEMORYPOOL_INTENSE_VERIFY, we do intensive verifications after
+		nearly every memory operation. this is OFF by default, since it slows down
+		things a lot, but is worth turning on for really obscure memory corruption issues.
+	*/
+	#ifndef MEMORYPOOL_INTENSE_VERIFY
+		#define NO_MEMORYPOOL_INTENSE_VERIFY
+	#endif
+
+	/**
+		if you define MEMORYPOOL_CHECK_BLOCK_OWNERSHIP, we do lots of calls to verify
+		that a block actually belongs to the pool it is called with. this is great
+		for debugging, but can be realllly slow, so is off by default.
+	*/
+	#ifndef MEMORYPOOL_CHECK_BLOCK_OWNERSHIP
+		#define NO_MEMORYPOOL_CHECK_BLOCK_OWNERSHIP
+	#endif
+
+	static const char* FREE_SINGLEBLOCK_TAG_STRING			= "FREE_SINGLEBLOCK_TAG_STRING";
+	const Short SINGLEBLOCK_MAGIC_COOKIE								= 12345;
+	const Int GARBAGE_FILL_VALUE												= 0xdeadbeef;
+
+	// flags for m_debugFlags
+	enum
+	{
+		IGNORE_LEAKS		= 0x0001
+	};
+
+	// in debug mode (but not internal), save stacktraces too
+	#if !defined(MEMORYPOOL_CHECKPOINTING) && defined(MEMORYPOOL_STACKTRACE) && defined(RTS_DEBUG)
+		#define MEMORYPOOL_SINGLEBLOCK_GETS_STACKTRACE
+	#endif
+
+	#define USE_FILLER_VALUE
+
+	const Int MAX_INIT_FILLER_COUNT = 8;
+	#ifdef USE_FILLER_VALUE
+		static UnsignedInt s_initFillerValue = 0xf00dcafe; // will be replaced, should never be this value at runtime
+		static void calcFillerValue(Int index)
+		{
+			s_initFillerValue = (index & 3) << 1;
+			s_initFillerValue |= 0x01;
+			s_initFillerValue |= (~(s_initFillerValue << 4)) & 0xf0;
+			s_initFillerValue |= (s_initFillerValue << 8);
+			s_initFillerValue |= (s_initFillerValue << 16);
+			//DEBUG_LOG(("Setting MemoryPool initFillerValue to %08x (index %d)",s_initFillerValue,index));
+		}
+	#endif
+
+#endif
+
+#ifdef MEMORYPOOL_BOUNDINGWALL
+
+	#define WALLCOUNT (2)	// default setting of 8 requires 4*4*2==32 extra bytes PER BLOCK
+	#define WALLSIZE	(WALLCOUNT * sizeof(Int))
+
+#endif
+
+#ifdef MEMORYPOOL_STACKTRACE
+
+	#define MEMORYPOOL_STACKTRACE_SIZE				(20)
+	#define MEMORYPOOL_STACKTRACE_SKIP_SIZE		(6)
+	#define MEMORYPOOL_STACKTRACE_SIZE_BYTES	(MEMORYPOOL_STACKTRACE_SIZE * sizeof(void*))
+
+#endif
+
+// ----------------------------------------------------------------------------
+// PRIVATE DATA
+// ----------------------------------------------------------------------------
+
+#ifdef MEMORYPOOL_BOUNDINGWALL
+
+	static Int theBoundingWallPattern = 0xbabeface;
+
+#endif
+
+#ifdef MEMORYPOOL_STACKTRACE
+
+	/** the max number levels to dump in the stacktrace. a variable rather than
+		constant so that you can fiddle with it in the debugger if desired, to
+		get shorter or longer dumps. (you can't go longer than MEMORYPOOL_STACKTRACE_SIZE
+		in any event. */
+	static Int theStackTraceDepth = 16;
+
+#endif
+
+#ifdef MEMORYPOOL_DEBUG
+
+	static Int theTotalSystemAllocationInBytes = 0;
+	static Int thePeakSystemAllocationInBytes = 0;
+	static Int theTotalLargeBlocks = 0;
+	static Int thePeakLargeBlocks = 0;
+	Int theTotalDMA = 0;
+	Int thePeakDMA = 0;
+	Int theWastedDMA = 0;
+	Int thePeakWastedDMA = 0;
+
+#ifdef INTENSE_DMA_BOOKKEEPING
+	struct UsedNPeak
+	{
+		Int used, peak, waste, peakwaste;
+		UsedNPeak() : used(0), peak(0), waste(0), peakwaste(0) { }
+	};
+	typedef std::map< const char*, UsedNPeak, std::less<const char*> > UsedNPeakMap;
+	static UsedNPeakMap TheUsedNPeakMap;
+	static Int doingIntenseDMA = 0;
+#endif
+
+
+#endif
+
+static Bool thePreMainInitFlag = false;
+static Bool theMainInitFlag = false;
+
+// ----------------------------------------------------------------------------
+// PRIVATE PROTOTYPES
+// ----------------------------------------------------------------------------
+
+/// @todo srj -- make this work for 8
+#define MEM_BOUND_ALIGNMENT 4
+
+static Int roundUpMemBound(Int i);
+static void *sysAllocateDoNotZero(Int numBytes);
+static void sysFree(void* p);
+static void memset32(void* ptr, Int value, Int bytesToFill);
+#ifdef MEMORYPOOL_STACKTRACE
+static void doStackDumpOutput(const char* m);
+static void doStackDump(void **stacktrace, int size);
+#endif
+static void preMainInitMemoryManager();
+
+// ----------------------------------------------------------------------------
+// PRIVATE FUNCTIONS
+// ----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+/** round up to the nearest multiple of MEM_BOUND_ALIGNMENT */
+static Int roundUpMemBound(Int i)
+{
+	return (i + (MEM_BOUND_ALIGNMENT-1)) & ~(MEM_BOUND_ALIGNMENT-1);
+}
+
+//-----------------------------------------------------------------------------
+/**
+	this is the low-level allocator that we use to request memory from the OS.
+	all (repeat, all) memory allocations in this module should ultimately
+	go thru this routine (or sysAllocate).
+
+	note: throws ERROR_OUT_OF_MEMORY on failure; never returns null
+*/
+static void* sysAllocateDoNotZero(Int numBytes)
+{
+	void* p = ::GlobalAlloc(GMEM_FIXED, numBytes);
+	if (!p)
+		throw ERROR_OUT_OF_MEMORY;
+#ifdef MEMORYPOOL_DEBUG
+	{
+		USE_PERF_TIMER(MemoryPoolDebugging)
+		#ifdef USE_FILLER_VALUE
+		{
+			USE_PERF_TIMER(MemoryPoolInitFilling)
+			::memset32(p, s_initFillerValue, ::GlobalSize(p));
+		}
+		#endif
+		theTotalSystemAllocationInBytes += ::GlobalSize(p);
+		if (thePeakSystemAllocationInBytes < theTotalSystemAllocationInBytes)
+			thePeakSystemAllocationInBytes = theTotalSystemAllocationInBytes;
+	}
+#endif
+	return p;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	the counterpart to sysAllocate / sysAllocateDoNotZero; used to free blocks
+	allocated by them. it is OK to pass null here (it will just be ignored).
+*/
+static void sysFree(void* p)
+{
+	if (p)
+	{
+#ifdef MEMORYPOOL_DEBUG
+		{
+			USE_PERF_TIMER(MemoryPoolDebugging)
+			::memset32(p, GARBAGE_FILL_VALUE, ::GlobalSize(p));
+			theTotalSystemAllocationInBytes -= ::GlobalSize(p);
+		}
+#endif
+		::GlobalFree(p);
+	}
+}
+
+// ----------------------------------------------------------------------------
+/**
+	fills memory with a 32-bit value (note: assumes the ptr is 4-byte-aligned)
+*/
+static void memset32(void* ptr, Int value, Int bytesToFill)
+{
+	Int wordsToFill = bytesToFill>>2;
+	bytesToFill -= (wordsToFill<<2);
+
+	Int *p = (Int*)ptr;
+	for (++wordsToFill; --wordsToFill; )
+		*p++ = value;
+
+	Byte *b = (Byte *)p;
+	for (++bytesToFill; --bytesToFill; )
+		*b++ = (Byte)value;
+}
+
+#ifdef MEMORYPOOL_STACKTRACE
+// ----------------------------------------------------------------------------
+/**
+	This is just a convenience routine that dumps output from the StackDump module
+	to our normal debug log file, with a little massaging for formatting.
+*/
+static void doStackDumpOutput(const char* m)
+{
+	const char *PREPEND = "STACKTRACE";
+	if (*m == 0)
+	{
+		DEBUG_LOG((m));
+	}
+	else
+	{
+		// Note - I am moving the prepend to the end, as this allows double clicking in the
+		// output window to open the file in VisualStudio.  jba.
+		DEBUG_LOG(("%s,    %s",m, PREPEND));
+	}
+}
+#endif
+
+#ifdef MEMORYPOOL_STACKTRACE
+// ----------------------------------------------------------------------------
+/**
+	dump the given stacktrace to the debug log.
+*/
+static void doStackDump(void **stacktrace, int size)
+{
+	::doStackDumpOutput("Allocation Stack Trace:");
+	::StackDumpFromAddresses(stacktrace, size, ::doStackDumpOutput);
+}
+#endif
+
+// ----------------------------------------------------------------------------
+// PRIVATE TYPES
+// ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	This is a auxiliary record that we allocate in debug modes (actually, checkpoint modes)
+	to retain extra information about blocks; there is a one-to-one correspondence
+	between this record and a block allocation. The interesting bit about this record is that
+	we don't deallocate it when the corresponding block is freed; we retain it so we can
+	later provide information about what blocks were freed when, etc. Yes, this does chew
+	up a lot of memory! That's why it's debug-mode only; the presumption is that developers
+	machines have boatloads of RAM. (Note that we *do* free these when resetCheckpoints() is called.)
+	Note also that we directly allocate/free these with sysAllocate/sysFree, so ctors/dtors
+	are never executed, nor would virtual functions work -- I know, it's a little evil.
+*/
+class BlockCheckpointInfo
+{
+private:
+	BlockCheckpointInfo				*m_next;										///< next checkpoint in this pool/dma
+	const char								*m_debugLiteralTagString;		///< the tagstring for the block
+	Int												m_allocCheckpoint;					///< when it was allocated
+	Int												m_freeCheckpoint;						///< when it was freed (-1 if still in existence)
+	Int												m_blockSize;								///< logical size of the block
+#ifdef MEMORYPOOL_STACKTRACE
+	void*											m_stacktrace[MEMORYPOOL_STACKTRACE_SIZE];		///< stacktrace of when block was allocated
+#endif
+
+	~BlockCheckpointInfo() {};
+
+public:
+
+	BlockCheckpointInfo *getNext();	///< return next checkpointinfo for this pool/dma
+
+	void debugSetFreepoint(Int f);	///< set the checkpoint at which the block was freed.
+
+#ifdef MEMORYPOOL_STACKTRACE
+	void **getStacktraceInfo();			///< return a ptr to the allocation stacktrace info.
+#endif
+
+	static BlockCheckpointInfo *addToList(
+		BlockCheckpointInfo **pHead,
+		const char *debugLiteralTagString,
+		Int allocCheckpoint,
+		Int blockSize
+	);
+
+	static void freeList(BlockCheckpointInfo **pHead);
+
+	Bool shouldBeInReport(Int flags, Int startCheckpoint, Int endCheckpoint);
+
+	static void doBlockCheckpointReport( BlockCheckpointInfo *bi, const char *poolName,
+									Int flags, Int startCheckpoint, Int endCheckpoint );
+};
+
+#endif
+
+// ----------------------------------------------------------------------------
+/**
+	This is the fundamental allocation unit; when you allocate via (say) MemoryPool::allocateBlock,
+	this is what is being allocated for you. (Of course, you don't see the private fields.)
+	For the most part, we allocate big chunks of these in a monolithic Blob and subdivide
+	from there. (However, we occasionally allocate these individually, for large blocks.)
+
+	Note also that we directly allocate/free these with sysAllocate/sysFree, so ctors/dtors
+	are never executed, nor would virtual functions work -- I know, it's a little evil.
+*/
+class MemoryPoolSingleBlock
+{
+private:
+
+	MemoryPoolBlob				*m_owningBlob;			///< will be NULL if the single block was allocated via sysAllocate()
+	MemoryPoolSingleBlock	*m_nextBlock;				///< if m_owningBlob is nonnull, this points to next free (unallocated) block in the blob; if m_owningBlob is null, this points to the next used (allocated) raw block in the pool.
+#ifdef MPSB_DLINK
+	MemoryPoolSingleBlock	*m_prevBlock;				///< if m_owningBlob is nonnull, this points to prev free (unallocated) block in the blob; if m_owningBlob is null, this points to the prev used (allocated) raw block in the pool.
+#endif
+#ifdef MEMORYPOOL_CHECKPOINTING
+	BlockCheckpointInfo		*m_checkpointInfo;	///< ptr to the checkpointinfo for this block
+#endif
+#ifdef MEMORYPOOL_BOUNDINGWALL
+	Int										m_wallPattern;			///< unique seed value for the bounding-walls for this block
+#endif
+#ifdef MEMORYPOOL_DEBUG
+	const char						*m_debugLiteralTagString;	///< ptr to the tagstring for this block.
+	Int										m_logicalSize;						///< logical size of block (not including overhead, walls, etc.)
+	Int										m_wastedSize;							///< if allocated via DMA, the "wasted" bytes
+	Short									m_magicCookie;						///< magic value used to verify that the block is one of ours (as opposed to random pointer)
+	Short									m_debugFlags;							///< misc flags
+	#ifdef MEMORYPOOL_SINGLEBLOCK_GETS_STACKTRACE
+	void*									m_stacktrace[MEMORYPOOL_STACKTRACE_SIZE];		///< stacktrace of when block was allocated (if not checkpointing)
+	#endif
+#endif
+
+private:
+
+	void* getUserDataNoDbg();
+#ifdef MEMORYPOOL_BOUNDINGWALL
+	void debugFillInWalls();
+#endif
+
+public:
+
+	static Int calcRawBlockSize(Int logicalSize);
+	static MemoryPoolSingleBlock *rawAllocateSingleBlock(MemoryPoolSingleBlock **pRawListHead, Int logicalSize, MemoryPoolFactory *owningFactory DECLARE_LITERALSTRING_ARG2);
+	void removeBlockFromList(MemoryPoolSingleBlock **pHead);
+
+	void initBlock(Int logicalSize, MemoryPoolBlob *owningBlob, MemoryPoolFactory *owningFactory DECLARE_LITERALSTRING_ARG2);
+	void* getUserData();
+	static MemoryPoolSingleBlock *recoverBlockFromUserData(void* pUserData);
+	MemoryPoolBlob *getOwningBlob();
+
+	MemoryPoolSingleBlock *getNextFreeBlock();
+	void setNextFreeBlock(MemoryPoolSingleBlock *b);
+	MemoryPoolSingleBlock *getNextRawBlock();
+	void setNextRawBlock(MemoryPoolSingleBlock *b);
+
+#ifdef MEMORYPOOL_DEBUG
+	void debugIgnoreLeaksForThisBlock();
+	const char *debugGetLiteralTagString();
+	Int debugGetLogicalSize();
+	Int debugGetWastedSize();
+	void debugSetWastedSize(Int waste);
+	void debugVerifyBlock();
+	void debugMarkBlockAsFree();
+	Bool debugCheckUnderrun();
+	Bool debugCheckOverrun();
+	Int debugSingleBlockReportLeak(const char* owner);
+#endif	// MEMORYPOOL_DEBUG
+#ifdef MEMORYPOOL_CHECKPOINTING
+	BlockCheckpointInfo *debugGetCheckpointInfo();
+	void debugSetCheckpointInfo(BlockCheckpointInfo *bi);
+	void debugResetCheckpoint();
+#endif
+
+};
+// ----------------------------------------------------------------------------
+class MemoryPoolBlob
+{
+private:
+	MemoryPool							*m_owningPool;				///< the pool that owns this blob
+	MemoryPoolBlob					*m_nextBlob;					///< next blob in this pool
+	MemoryPoolBlob					*m_prevBlob;					///< prev blob in this pool
+	MemoryPoolSingleBlock		*m_firstFreeBlock;		///< ptr to first available block in this blob
+	Int											m_usedBlocksInBlob;		///< total allocated blocks in this blob
+	Int											m_totalBlocksInBlob;	///< total blocks in this blob (allocated + available)
+	char										*m_blockData;					///< ptr to the blocks (really a MemoryPoolSingleBlock*)
+
+public:
+
+	MemoryPoolBlob();
+	~MemoryPoolBlob();
+
+	void initBlob(MemoryPool *owningPool, Int allocationCount);
+
+	void addBlobToList(MemoryPoolBlob **ppHead, MemoryPoolBlob **ppTail);
+	void removeBlobFromList(MemoryPoolBlob **ppHead, MemoryPoolBlob **ppTail);
+	MemoryPoolBlob *getNextInList();
+	Bool hasAnyFreeBlocks();
+
+	MemoryPoolSingleBlock *allocateSingleBlock(DECLARE_LITERALSTRING_ARG1);
+	void freeSingleBlock(MemoryPoolSingleBlock *block);
+
+	MemoryPool *getOwningPool();
+	Int getFreeBlockCount();
+	Int getUsedBlockCount();
+	Int getTotalBlockCount();
+
+#ifdef MEMORYPOOL_DEBUG
+	void debugMemoryVerifyBlob();
+	Int debugBlobReportLeaks(const char* owner);
+	Bool debugIsBlockInBlob(void *pBlock);
+#endif
+#ifdef MEMORYPOOL_CHECKPOINTING
+	void debugResetCheckpoints();
+#endif
+
+};
+
+// ----------------------------------------------------------------------------
+// PUBLIC DATA
+// ----------------------------------------------------------------------------
+
+MemoryPoolFactory *TheMemoryPoolFactory = NULL;
+DynamicMemoryAllocator *TheDynamicMemoryAllocator = NULL;
+
+// ----------------------------------------------------------------------------
+// INLINES
+// ----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+inline BlockCheckpointInfo *BlockCheckpointInfo::getNext() { return m_next; }
+inline void BlockCheckpointInfo::debugSetFreepoint(Int f) { DEBUG_ASSERTCRASH(m_freeCheckpoint == -1, ("already have a freepoint")); m_freeCheckpoint = f; }
+#ifdef MEMORYPOOL_STACKTRACE
+inline void **BlockCheckpointInfo::getStacktraceInfo() { return m_stacktrace; }
+#endif
+#endif
+
+// ----------------------------------------------------------------------------
+/**
+	return a ptr to the user-data area of the block (ie, the part the enduser can deal with).
+	this call does NO debug verification and is for internal use of class MemoryPoolSingleBlock only.
+*/
+inline void* MemoryPoolSingleBlock::getUserDataNoDbg()
+{
+	char* p = ((char*)this) + sizeof(MemoryPoolSingleBlock);
+	#ifdef MEMORYPOOL_BOUNDINGWALL
+	p += WALLSIZE;
+	#endif
+	return (void*)p;
+}
+
+/**
+	return a ptr to the user-data area of the block (ie, the part the enduser can deal with).
+	this call verifies that the block is valid in debug mode.
+*/
+inline void* MemoryPoolSingleBlock::getUserData()
+{
+	// yes, verify the block in this case for plain debug mode (not intense-verify mode)
+	#ifdef MEMORYPOOL_DEBUG
+	debugVerifyBlock();
+	#endif
+	return getUserDataNoDbg();
+}
+
+/**
+	given a desired logical block size, calculate the physical size needed for each
+	MemoryPoolSingleBlock (including overhead, etc.)
+*/
+inline /*static*/ Int MemoryPoolSingleBlock::calcRawBlockSize(Int logicalSize)
+{
+	Int s = ::roundUpMemBound(logicalSize) + sizeof(MemoryPoolSingleBlock);
+	#ifdef MEMORYPOOL_BOUNDINGWALL
+	s += WALLSIZE*2;
+	#endif
+	return s;
+}
+
+/**
+	accessor
+*/
+inline MemoryPoolBlob *MemoryPoolSingleBlock::getOwningBlob()
+{
+	return m_owningBlob;
+}
+
+/**
+	return the next free block in this blob. this call assumes that the block
+	in question belongs to a blob, and will assert if not.
+*/
+inline MemoryPoolSingleBlock *MemoryPoolSingleBlock::getNextFreeBlock()
+{
+	DEBUG_ASSERTCRASH(m_owningBlob != NULL, ("must be called on blob block"));
+	return m_nextBlock;
+}
+
+/**
+	set the next free block in this blob. this call assumes that both blocks
+	in question belongs to a blob, but will NOT assert if not, since it may be
+	called when the blocks are in an inconsistent state.
+*/
+inline void MemoryPoolSingleBlock::setNextFreeBlock(MemoryPoolSingleBlock *b)
+{
+	//DEBUG_ASSERTCRASH(m_owningBlob != NULL && b->m_owningBlob != NULL, ("must be called on blob block"));
+	// don't check the 'b' block -- we need to call this before 'b' is fully initialized.
+	DEBUG_ASSERTCRASH(m_owningBlob != NULL, ("must be called on blob block"));
+	this->m_nextBlock = b;
+#ifdef MPSB_DLINK
+	if (b) {
+		b->m_prevBlock = this;
+	}
+#endif
+}
+
+/**
+	return the next raw block in this dma. this call assumes that the block
+	in question does NOT belong to a blob, and will assert if not.
+*/
+inline MemoryPoolSingleBlock *MemoryPoolSingleBlock::getNextRawBlock()
+{
+	DEBUG_ASSERTCRASH(m_owningBlob == NULL, ("must be called on raw block"));
+	return m_nextBlock;
+}
+
+/**
+	set the next raw block in this dma. this call assumes that the blocks
+	in question do NOT belong to a blob, and will assert if not.
+*/
+inline void MemoryPoolSingleBlock::setNextRawBlock(MemoryPoolSingleBlock *b)
+{
+	DEBUG_ASSERTCRASH(m_owningBlob == NULL && (!b || b->m_owningBlob == NULL), ("must be called on raw block"));
+	m_nextBlock = b;
+#ifdef MPSB_DLINK
+	if (b)
+		b->m_prevBlock = this;
+#endif
+}
+
+#ifdef MEMORYPOOL_DEBUG
+inline void MemoryPoolSingleBlock::debugIgnoreLeaksForThisBlock()
+{
+	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
+	m_debugFlags |= IGNORE_LEAKS;
+}
+/**
+	accessor
+*/
+inline const char *MemoryPoolSingleBlock::debugGetLiteralTagString()
+{
+	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
+	return m_debugLiteralTagString;
+}
+#endif
+
+#ifdef MEMORYPOOL_DEBUG
+/**
+	accessor
+*/
+inline Int MemoryPoolSingleBlock::debugGetLogicalSize()
+{
+	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
+	return m_logicalSize;
+}
+#endif
+
+#ifdef MEMORYPOOL_DEBUG
+/**
+	accessor
+*/
+inline Int MemoryPoolSingleBlock::debugGetWastedSize()
+{
+	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
+	return m_wastedSize;
+}
+#endif
+
+#ifdef MEMORYPOOL_DEBUG
+inline void MemoryPoolSingleBlock::debugSetWastedSize(Int w)
+{
+	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
+	m_wastedSize = w;
+}
+#endif
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	accessor
+*/
+inline BlockCheckpointInfo *MemoryPoolSingleBlock::debugGetCheckpointInfo()
+{
+	return m_checkpointInfo;
+}
+#endif
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	set the checkpoint info for this block.
+*/
+inline void MemoryPoolSingleBlock::debugSetCheckpointInfo(BlockCheckpointInfo *bi)
+{
+	DEBUG_ASSERTCRASH(m_checkpointInfo == NULL, ("should be null"));
+	m_checkpointInfo = bi;
+}
+#endif
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	sets the checkpointinfo to null, but does NOT free it... the checkpointinfo
+	is expected to be freed elsewhere.
+*/
+inline void MemoryPoolSingleBlock::debugResetCheckpoint()
+{
+	m_checkpointInfo = NULL;
+}
+#endif
+
+// ----------------------------------------------------------------------------
+/// accessor
+inline MemoryPoolBlob *MemoryPoolBlob::getNextInList() { return m_nextBlob; }
+/// accessor
+inline Bool MemoryPoolBlob::hasAnyFreeBlocks() { return m_firstFreeBlock != NULL; }
+/// accessor
+inline MemoryPool *MemoryPoolBlob::getOwningPool() { return m_owningPool; }
+/// accessor
+inline Int MemoryPoolBlob::getFreeBlockCount() { return getTotalBlockCount() - getUsedBlockCount(); }
+/// accessor
+inline Int MemoryPoolBlob::getUsedBlockCount() { return m_usedBlocksInBlob; }
+/// accessor
+inline Int MemoryPoolBlob::getTotalBlockCount() { return m_totalBlocksInBlob; }
+
+//-----------------------------------------------------------------------------
+// METHODS for BlockCheckpointInfo
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/// return true iff this checkpointinfo should be included in a checkpointreport with the given parameters.
+Bool BlockCheckpointInfo::shouldBeInReport(Int flags, Int startCheckpoint, Int endCheckpoint)
+{
+	Bool allocFlagsOK = false;
+	Bool freedFlagsOK = false;
+
+	if (m_allocCheckpoint < startCheckpoint && (flags & _REPORT_CP_ALLOCATED_BEFORE))
+		allocFlagsOK = true;
+	if (m_allocCheckpoint >= startCheckpoint && m_allocCheckpoint < endCheckpoint && (flags & _REPORT_CP_ALLOCATED_BETWEEN))
+		allocFlagsOK = true;
+
+	if (m_freeCheckpoint == -1)
+	{
+		// block still exists! process this only if we want 'em.
+		freedFlagsOK = (flags & _REPORT_CP_FREED_NEVER) ? true : false;
+	}
+	else
+	{
+		if (m_freeCheckpoint < startCheckpoint && (flags & _REPORT_CP_FREED_BEFORE))
+			freedFlagsOK = true;
+		if (m_freeCheckpoint >= startCheckpoint && m_freeCheckpoint < endCheckpoint && (flags & _REPORT_CP_FREED_BETWEEN))
+			freedFlagsOK = true;
+	}
+
+	// the block must match both the 'alloc' and 'free' criteria to get a report
+	return allocFlagsOK && freedFlagsOK;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/// print a checkpointreport for the given checkpointinfo. if checkpointinfo is null, print column headers.
+/*static*/ void BlockCheckpointInfo::doBlockCheckpointReport(BlockCheckpointInfo *bi,
+			const char *poolName, Int flags, Int startCheckpoint, Int endCheckpoint )
+{
+	const char *PREPEND = "BLOCKINFO";	// allows grepping more easily
+
+	if (!bi)
+	{
+		DEBUG_LOG(("%s,%32s,%6s,%6s,%6s,%s",PREPEND,"POOLNAME","BLKSZ","ALLOC","FREED","BLOCKNAME"));
+	}
+	else
+	{
+		DEBUG_ASSERTCRASH(startCheckpoint >= 0 && startCheckpoint <= endCheckpoint, ("bad checkpoints"));
+		DEBUG_ASSERTCRASH((flags & _REPORT_CP_ALLOCATED_DONTCARE) != 0, ("bad flags: must set at least one alloc flag"));
+		DEBUG_ASSERTCRASH((flags & _REPORT_CP_FREED_DONTCARE) != 0, ("bad flags: must set at least one freed flag"));
+
+		if (bi->shouldBeInReport(flags, startCheckpoint, endCheckpoint))
+		{
+			DEBUG_LOG(("%s,%32s,%6d,%6d,%6d,%s",PREPEND,poolName,bi->m_blockSize,bi->m_allocCheckpoint,bi->m_freeCheckpoint,bi->m_debugLiteralTagString));
+	#ifdef MEMORYPOOL_STACKTRACE
+			if (flags & REPORT_CP_STACKTRACE)
+			{
+				::doStackDump(bi->m_stacktrace, min(MEMORYPOOL_STACKTRACE_SIZE, theStackTraceDepth ));
+			}
+	#endif
+		}
+	}
+}
+#endif
+
+// ----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/// free an entire list of checkpointinfos.
+/*static*/ void BlockCheckpointInfo::freeList(BlockCheckpointInfo **pHead)
+{
+	BlockCheckpointInfo *p = *pHead;
+	while (p)
+	{
+		BlockCheckpointInfo *n = p->m_next;
+		::sysFree((void *)p);
+		p = n;
+	}
+	*pHead = NULL;
+}
+#endif
+
+// ----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	allocate a new checkpointinfo with the given tag/checkpoint/size, add it to the
+	linked list, and return the checkpointinfo. (note that this will NOT throw an exception;
+	if there is not enough memory to allocate a new checkpointinfo, it will quietly return null.)
+*/
+/*static*/ BlockCheckpointInfo *BlockCheckpointInfo::addToList(
+	BlockCheckpointInfo **pHead,
+	const char *debugLiteralTagString,
+	Int allocCheckpoint,
+	Int blockSize
+)
+{
+	DEBUG_ASSERTCRASH(debugLiteralTagString != FREE_SINGLEBLOCK_TAG_STRING, ("bad tag string"));
+
+	BlockCheckpointInfo *freed = NULL;
+	try {
+		freed = (BlockCheckpointInfo *)::sysAllocateDoNotZero(sizeof(BlockCheckpointInfo));
+	} catch (...) {
+		freed = NULL;
+	}
+	if (freed)
+	{
+		DEBUG_ASSERTCRASH(debugLiteralTagString != NULL, ("null tagstrings are not allowed"));
+		freed->m_debugLiteralTagString = debugLiteralTagString;
+		freed->m_allocCheckpoint = allocCheckpoint;
+		freed->m_freeCheckpoint = -1;
+		freed->m_blockSize = blockSize;
+		freed->m_next = *pHead;
+		*pHead = freed;
+	}
+	return freed;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+// METHODS for MemoryPoolSingleBlock
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+/**
+	fill in a block's fields. this is usually done only just after a block is allocated,
+	but might also be done at other points in debug mode.
+*/
+void MemoryPoolSingleBlock::initBlock(Int logicalSize, MemoryPoolBlob *owningBlob,
+			MemoryPoolFactory *owningFactory DECLARE_LITERALSTRING_ARG2)
+{
+	// Note that while it is OK for owningBlob to be null, it is NEVER ok
+	// for owningFactory to be null.
+	DEBUG_ASSERTCRASH(owningFactory, ("null factory"));
+
+#ifdef MEMORYPOOL_DEBUG
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+	m_magicCookie = SINGLEBLOCK_MAGIC_COOKIE;
+	m_debugFlags = 0;
+	if (!theMainInitFlag)
+		debugIgnoreLeaksForThisBlock();
+	DEBUG_ASSERTCRASH(debugLiteralTagString != NULL, ("null tagstrings are not allowed"));
+	m_debugLiteralTagString = debugLiteralTagString;
+	m_logicalSize = logicalSize;
+	m_wastedSize = 0;
+
+#ifdef MEMORYPOOL_SINGLEBLOCK_GETS_STACKTRACE
+	if (theStackTraceDepth > 0 && (!TheGlobalData || TheGlobalData->m_checkForLeaks))
+	{
+		memset(m_stacktrace, 0, MEMORYPOOL_STACKTRACE_SIZE_BYTES);
+		::FillStackAddresses(m_stacktrace, min(MEMORYPOOL_STACKTRACE_SIZE, theStackTraceDepth), MEMORYPOOL_STACKTRACE_SKIP_SIZE);
+	}
+	else
+	{
+		m_stacktrace[0] = NULL;
+	}
+#endif
+}
+#endif // MEMORYPOOL_DEBUG
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+	m_checkpointInfo = NULL;
+#endif
+
+	m_nextBlock = NULL;
+#ifdef MPSB_DLINK
+	m_prevBlock = NULL;
+#endif
+	m_owningBlob = owningBlob;	// could be NULL
+
+#ifdef MEMORYPOOL_BOUNDINGWALL
+	m_wallPattern = theBoundingWallPattern++;
+	debugFillInWalls();
+#endif
+}
+
+//-----------------------------------------------------------------------------
+/**
+	given a 'public' ptr to a block (ie, the ptr returned by the MemoryPool::allocateBlock),
+	recover the ptr to the MemoryPoolSingleBlock, so we can access the hidden fields.
+*/
+/* static */ MemoryPoolSingleBlock *MemoryPoolSingleBlock::recoverBlockFromUserData(void* pUserData)
+{
+	DEBUG_ASSERTCRASH(pUserData, ("null pUserData"));
+	if (!pUserData)
+		return NULL;
+	char* p = ((char*)pUserData) - sizeof(MemoryPoolSingleBlock);
+	#ifdef MEMORYPOOL_BOUNDINGWALL
+	p -= WALLSIZE;
+	#endif
+	MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)p;
+// yes, verify the block in this case for plain debug mode (not intense-verify mode)
+#ifdef MEMORYPOOL_DEBUG
+	block->debugVerifyBlock();
+#endif
+	return block;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	allocate and initialize a single block. this should only used by DynamicMemoryAllocator
+	when allocating an extraordinarily large block.
+*/
+/*static*/ MemoryPoolSingleBlock *MemoryPoolSingleBlock::rawAllocateSingleBlock(
+	MemoryPoolSingleBlock **pRawListHead,
+	Int logicalSize,
+	MemoryPoolFactory *owningFactory
+	DECLARE_LITERALSTRING_ARG2)
+{
+	MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)::sysAllocateDoNotZero(calcRawBlockSize(logicalSize));
+	block->initBlock(logicalSize, NULL, owningFactory PASS_LITERALSTRING_ARG2);
+	block->setNextRawBlock(*pRawListHead);
+	*pRawListHead = block;
+	return block;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	remove the block from the list, which is presumed to be a list of raw blocks.
+	generally, only the DynamicMemoryAllocator should call this.
+*/
+void MemoryPoolSingleBlock::removeBlockFromList(MemoryPoolSingleBlock **pHead)
+{
+	DEBUG_ASSERTCRASH(this->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
+#ifdef MPSB_DLINK
+	DEBUG_ASSERTCRASH(this->m_nextBlock == NULL || this->m_nextBlock->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
+	if (this->m_prevBlock)
+	{
+		DEBUG_ASSERTCRASH(this->m_prevBlock->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
+		DEBUG_ASSERTCRASH(*pHead != this, ("bad linkage"));
+		this->m_prevBlock->m_nextBlock = this->m_nextBlock;
+	}
+	else
+	{
+		DEBUG_ASSERTCRASH(*pHead == this, ("bad linkage"));
+		*pHead = this->m_nextBlock;
+	}
+
+	if (this->m_nextBlock)
+	{
+		DEBUG_ASSERTCRASH(this->m_nextBlock->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
+		this->m_nextBlock->m_prevBlock = this->m_prevBlock;
+	}
+#else
+	// this isn't very efficient, and may need upgrading... but to do so
+	// would require adding a back link, so I'd rather do some testing
+	// first to see if it's really a speed issue in practice. (the only place
+	// this is used is when freeing 'raw' blocks allocated via the DMA).
+	MemoryPoolSingleBlock *prev = NULL;
+	for (MemoryPoolSingleBlock *cur = *pHead; cur; cur = cur->m_nextBlock)
+	{
+		DEBUG_ASSERTCRASH(cur->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
+		if (cur == this)
+		{
+			if (prev)
+			{
+				prev->m_nextBlock = this->m_nextBlock;
+			}
+			else
+			{
+				*pHead = this->m_nextBlock;
+			}
+			break;
+		}
+		prev = cur;
+	}
+#endif
+}
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+Int MemoryPoolSingleBlock::debugSingleBlockReportLeak(const char* owner)
+{
+	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
+
+	// if allocated before main... just ignore the leak.
+	if (m_debugFlags & IGNORE_LEAKS)
+		return 0;
+
+	// it's free, ergo, not leaked.
+	if (m_debugLiteralTagString == FREE_SINGLEBLOCK_TAG_STRING)
+		return 0;
+
+	if (strcmp(m_debugLiteralTagString, "STR_AsciiString::ensureUniqueBufferOfSize") == 0)
+	{
+		/** @todo srj -- we leak a bunch of these for some reason (probably due to leaking Win32LocalFile)
+			so just ignore 'em for now... figure out later. */
+	}
+	else if (strstr(m_debugLiteralTagString, "Win32LocalFileSystem.cpp") != NULL)
+	{
+		/** @todo srj -- we leak a bunch of these for some reason
+			so just ignore 'em for now... figure out later. */
+	}
+	else
+	{
+		DEBUG_LOG(("Leaked a block of size %d, tagstring %s, from pool/dma %s",m_logicalSize,m_debugLiteralTagString,owner));
+	}
+
+	#ifdef MEMORYPOOL_SINGLEBLOCK_GETS_STACKTRACE
+	if (!TheGlobalData || TheGlobalData->m_checkForLeaks)
+		::doStackDump(m_stacktrace, min(MEMORYPOOL_STACKTRACE_SIZE, theStackTraceDepth));
+	#endif
+
+	return 1;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	Verify internal consistency of this block.
+*/
+void MemoryPoolSingleBlock::debugVerifyBlock()
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	DEBUG_ASSERTCRASH(this, ("null this"));
+	DEBUG_ASSERTCRASH(m_magicCookie == SINGLEBLOCK_MAGIC_COOKIE, ("wrong cookie"));
+	DEBUG_ASSERTCRASH(m_debugLiteralTagString != NULL, ("bad tagstring"));
+	/// @todo Put this check back in after the AI memory usage is under control (MSB)
+	//DEBUG_ASSERTCRASH(m_logicalSize>0 && m_logicalSize < 0x00ffffff, ("unlikely value for m_logicalSize"));
+	DEBUG_ASSERTCRASH(m_nextBlock == NULL
+		|| memcmp(&m_nextBlock->m_owningBlob, &s_initFillerValue, sizeof(s_initFillerValue)) == 0
+		|| m_nextBlock->m_owningBlob == m_owningBlob, ("owning blob mismatch..."));
+#ifdef MPSB_DLINK
+	DEBUG_ASSERTCRASH(m_prevBlock == NULL
+		|| memcmp(&m_prevBlock->m_owningBlob, &s_initFillerValue, sizeof(s_initFillerValue)) == 0
+		|| m_prevBlock->m_owningBlob == m_owningBlob, ("owning blob mismatch..."));
+#endif
+	debugCheckUnderrun();
+	debugCheckOverrun();
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	Fill block with bogus values and mark other internal fields for debugging purposes.
+*/
+void MemoryPoolSingleBlock::debugMarkBlockAsFree()
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	::memset32(getUserDataNoDbg(), GARBAGE_FILL_VALUE, m_logicalSize);
+	m_debugLiteralTagString = FREE_SINGLEBLOCK_TAG_STRING;
+	#ifdef MEMORYPOOL_INTENSE_VERIFY
+	debugVerifyBlock();
+	#endif
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	Returns true iff someone overwrote part of the first bounding wall
+	(ie, tromped on memory just before the block)
+*/
+Bool MemoryPoolSingleBlock::debugCheckUnderrun()
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+#ifdef MEMORYPOOL_BOUNDINGWALL
+	Int *p = (Int*)(((char*)getUserDataNoDbg()) - WALLSIZE);
+	for (Int i = 0; i < WALLCOUNT; i++, p++)
+	{
+		if (*p != m_wallPattern+i)
+		{
+			DEBUG_CRASH(("memory underrun for block \"%s\" (expected %08x, got %08x)",m_debugLiteralTagString,m_wallPattern+i,*p));
+			return true;
+		}
+	}
+#endif
+	return false;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	Returns true iff someone overwrote part of the second bounding wall
+	(ie, tromped on memory just after the block)
+*/
+Bool MemoryPoolSingleBlock::debugCheckOverrun()
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+#ifdef MEMORYPOOL_BOUNDINGWALL
+	Int *p = (Int*)(((char*)getUserDataNoDbg()) + m_logicalSize);
+	for (Int i = 0; i < WALLCOUNT; i++, p++)
+	{
+		if (*p != m_wallPattern-i)
+		{
+			DEBUG_CRASH(("memory overrun for block \"%s\" (expected %08x, got %08x)",m_debugLiteralTagString,m_wallPattern+i,*p));
+			return true;
+		}
+	}
+#endif
+	return false;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_BOUNDINGWALL
+/**
+	Fill in the proper values for this block's bounding walls.
+*/
+void MemoryPoolSingleBlock::debugFillInWalls()
+{
+	Int *p;
+	Int i;
+
+	p = (Int*)(((char*)getUserDataNoDbg()) - WALLSIZE);
+	for (i = 0; i < WALLCOUNT; i++)
+		*p++ = m_wallPattern+i;
+
+	p = (Int*)(((char*)getUserDataNoDbg()) + m_logicalSize);
+	for (i = 0; i < WALLCOUNT; i++)
+		*p++ = m_wallPattern-i;
+
+	#ifdef MEMORYPOOL_INTENSE_VERIFY
+	debugVerifyBlock();
+	#endif
+}
+#endif
+
+
+//-----------------------------------------------------------------------------
+// METHODS for MemoryPoolBlob
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+/**
+	fill in safe default values.
+*/
+MemoryPoolBlob::MemoryPoolBlob() :
+	m_owningPool(NULL),
+	m_nextBlob(NULL),
+	m_prevBlob(NULL),
+	m_firstFreeBlock(NULL),
+	m_usedBlocksInBlob(0),
+	m_totalBlocksInBlob(0),
+	m_blockData(NULL)
+{
+}
+
+//-----------------------------------------------------------------------------
+/**
+	throw away the blob. free the block data, if any.
+*/
+MemoryPoolBlob::~MemoryPoolBlob()
+{
+	::sysFree((void *)m_blockData);
+}
+
+//-----------------------------------------------------------------------------
+/**
+	initialize a Blob; this is called just after the blob is allocated.
+	allocate space for the blocks in this blob and initialize all those blocks.
+*/
+void MemoryPoolBlob::initBlob(MemoryPool *owningPool, Int allocationCount)
+{
+	DEBUG_ASSERTCRASH(m_blockData == NULL, ("unlikely init call"));
+
+	m_owningPool = owningPool;
+	m_totalBlocksInBlob = allocationCount;
+	m_usedBlocksInBlob = 0;
+
+	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
+	m_blockData = (char *)::sysAllocateDoNotZero(rawBlockSize * m_totalBlocksInBlob);	// throws on failure
+
+	// set up the list of free blocks in the blob (namely, all of 'em)
+	MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)m_blockData;
+	MemoryPoolSingleBlock *next;
+	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--)
+	{
+		next = (MemoryPoolSingleBlock *)(((char *)block) + rawBlockSize);
+#ifdef MEMORYPOOL_DEBUG
+		block->initBlock(m_owningPool->getAllocationSize(), this, owningPool->getOwningFactory(), FREE_SINGLEBLOCK_TAG_STRING);
+#else
+		block->initBlock(m_owningPool->getAllocationSize(), this, owningPool->getOwningFactory());
+#endif
+		block->setNextFreeBlock((i > 0) ? next : NULL);
+#ifdef MEMORYPOOL_DEBUG
+		block->debugMarkBlockAsFree();
+#endif
+		block = next;
+	}
+	m_firstFreeBlock = (MemoryPoolSingleBlock *)m_blockData;
+
+#ifdef MEMORYPOOL_INTENSE_VERIFY
+	debugMemoryVerifyBlob();
+#endif
+}
+
+//-----------------------------------------------------------------------------
+/**
+	add this blob to a given pool's list-of-blobs
+*/
+void MemoryPoolBlob::addBlobToList(MemoryPoolBlob **ppHead, MemoryPoolBlob **ppTail)
+{
+	m_prevBlob = *ppTail;
+	m_nextBlob =  NULL;
+
+	if (*ppTail != NULL)
+		(*ppTail)->m_nextBlob = this;
+
+	if (*ppHead == NULL)
+		*ppHead = this;
+
+	*ppTail = this;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	remove this blob from a given pool's list-of-blobs
+*/
+void MemoryPoolBlob::removeBlobFromList(MemoryPoolBlob **ppHead, MemoryPoolBlob **ppTail)
+{
+	if (*ppHead == this)
+		*ppHead = this->m_nextBlob;
+	else
+		this->m_prevBlob->m_nextBlob = this->m_nextBlob;
+
+	if (*ppTail == this)
+		*ppTail = this->m_prevBlob;
+	else
+		this->m_nextBlob->m_prevBlob = this->m_prevBlob;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	grab a free block from this blob, mark it as taken, and return it.
+	this method assumes that there is at least one free block in the blob!
+*/
+MemoryPoolSingleBlock *MemoryPoolBlob::allocateSingleBlock(DECLARE_LITERALSTRING_ARG1)
+{
+	DEBUG_ASSERTCRASH(m_firstFreeBlock, ("no free blocks available in MemoryPoolBlob"));
+
+	MemoryPoolSingleBlock *block = m_firstFreeBlock;
+	m_firstFreeBlock = block->getNextFreeBlock();
+	++m_usedBlocksInBlob;
+
+#ifdef MEMORYPOOL_INTENSE_VERIFY
+	block->debugVerifyBlock();
+#endif
+#ifdef MEMORYPOOL_DEBUG
+	// this is debug-only because it only serves to update the debugLiteralTagString.
+	block->initBlock(m_owningPool->getAllocationSize(), this, m_owningPool->getOwningFactory(), debugLiteralTagString);
+#endif
+#ifdef MEMORYPOOL_INTENSE_VERIFY
+	debugMemoryVerifyBlob();
+#endif
+
+//	don't need to zero this out... the caller will do that, if necessary
+//	memset(block->getUserData(), 0, m_owningPool->getAllocationSize());
+
+	return block;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	make this block available for future allocations. it is assumed that the block
+	belongs to this blob, and is not already free.
+*/
+void MemoryPoolBlob::freeSingleBlock(MemoryPoolSingleBlock *block)
+{
+	DEBUG_ASSERTCRASH(block->getOwningBlob() == this, ("block does not belong to this blob"));
+
+	block->setNextFreeBlock(m_firstFreeBlock);
+	m_firstFreeBlock = block;
+	--m_usedBlocksInBlob;
+
+#ifdef MEMORYPOOL_INTENSE_VERIFY
+	block->debugVerifyBlock();
+#endif
+#ifdef MEMORYPOOL_DEBUG
+	block->debugMarkBlockAsFree();
+#endif
+#ifdef MEMORYPOOL_INTENSE_VERIFY
+	debugMemoryVerifyBlob();
+#endif
+
+}
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	Perform internal consistency checking on this blob and all its blocks.
+*/
+void MemoryPoolBlob::debugMemoryVerifyBlob()
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	DEBUG_ASSERTCRASH(m_owningPool != NULL, ("bad owner"));
+	DEBUG_ASSERTCRASH(m_usedBlocksInBlob >= 0 && m_usedBlocksInBlob <= m_totalBlocksInBlob, ("unlikely m_usedBlocksInBlob"));
+	DEBUG_ASSERTCRASH(m_totalBlocksInBlob > 0, ("unlikely m_totalBlocksInBlob"));
+
+	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
+	char *blockData = m_blockData;
+	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--, blockData += rawBlockSize)
+	{
+		MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)blockData;
+		block->debugVerifyBlock();
+	}
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+Int MemoryPoolBlob::debugBlobReportLeaks(const char* owner)
+{
+	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
+
+	Int any = 0;
+	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
+	char *blockData = m_blockData;
+	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--, blockData += rawBlockSize)
+	{
+		MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)blockData;
+		any += block->debugSingleBlockReportLeak(owner);
+	}
+	return any;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	return true iff this block belongs to this blob.
+*/
+Bool MemoryPoolBlob::debugIsBlockInBlob(void *pBlockPtr)
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
+	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
+	char *blockData = m_blockData;
+	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--)
+	{
+		if ((char *)block == blockData)
+			return true;
+		blockData += rawBlockSize;
+	}
+	return false;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	set all the checkpointinfos to null for all the blocks in this blob.
+	this does NOT free the checkpointinfos; that is presumed to happen elsewhere.
+*/
+void MemoryPoolBlob::debugResetCheckpoints()
+{
+	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
+	char *blockData = m_blockData;
+	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--, blockData += rawBlockSize)
+	{
+		MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)blockData;
+		block->debugResetCheckpoint();
+	}
+}
+#endif
+
+//-----------------------------------------------------------------------------
+// METHODS for Checkpointable
+//-----------------------------------------------------------------------------
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+//-----------------------------------------------------------------------------
+/**
+	init fields of Checkpointable to safe values.
+*/
+Checkpointable::Checkpointable() :
+	m_firstCheckpointInfo(NULL),
+	m_cpiEverFailed(false)
+{
+}
+#endif
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+//-----------------------------------------------------------------------------
+/**
+	destroy the object. discard any remaining checkpointinfo.
+*/
+Checkpointable::~Checkpointable()
+{
+	BlockCheckpointInfo::freeList(&m_firstCheckpointInfo);
+	m_firstCheckpointInfo = NULL;
+	m_cpiEverFailed = false;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	create a new checkpointinfo and fill it in appropriately. this does NOT
+	throw an exception on failure; it quietly returns null if there is not
+	enough memory, and sets a flag to indicate our checkpointinfo is not complete.
+*/
+BlockCheckpointInfo *Checkpointable::debugAddCheckpointInfo(
+	const char *debugLiteralTagString,
+	Int allocCheckpoint,
+	Int blockSize
+)
+{
+
+	BlockCheckpointInfo *bi = BlockCheckpointInfo::addToList(&m_firstCheckpointInfo, debugLiteralTagString,
+				allocCheckpoint, blockSize);
+
+	if (bi)
+	{
+#ifdef MEMORYPOOL_STACKTRACE
+		void **stacktrace = bi->getStacktraceInfo();
+		if (theStackTraceDepth > 0 && !TheGlobalData || TheGlobalData->m_checkForLeaks)
+		{
+			memset(stacktrace, 0, MEMORYPOOL_STACKTRACE_SIZE_BYTES);
+			::FillStackAddresses(stacktrace, min(MEMORYPOOL_STACKTRACE_SIZE, theStackTraceDepth), MEMORYPOOL_STACKTRACE_SKIP_SIZE);
+		}
+		else
+		{
+			stacktrace[0] = NULL;
+		}
+#endif
+	}
+	else
+	{
+		m_cpiEverFailed = true;
+	}
+
+	return bi;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	print a report on the checkpointinfos belonging to this pool/dma.
+*/
+void Checkpointable::debugCheckpointReport( Int flags, Int startCheckpoint, Int endCheckpoint, const char *poolName )
+{
+	DEBUG_ASSERTCRASH(startCheckpoint >= 0 && startCheckpoint <= endCheckpoint, ("bad checkpoints"));
+	DEBUG_ASSERTCRASH((flags & _REPORT_CP_ALLOCATED_DONTCARE) != 0, ("bad flags: must set at least one alloc flag"));
+	DEBUG_ASSERTCRASH((flags & _REPORT_CP_FREED_DONTCARE) != 0, ("bad flags: must set at least one freed flag"));
+
+	if (m_cpiEverFailed)
+	{
+		DEBUG_LOG(("  *** WARNING *** info on freed blocks may be inaccurate or incomplete!"));
+	}
+
+	for (BlockCheckpointInfo *bi = m_firstCheckpointInfo; bi; bi = bi->getNext())
+	{
+		BlockCheckpointInfo::doBlockCheckpointReport( bi, poolName, flags, startCheckpoint, endCheckpoint );
+	}
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	throw away all the checkpointinfos. this frees the memory, but blocks might still
+	refer to the discarded infos; you must zero those elsewhere.
+*/
+void Checkpointable::debugResetCheckpoints()
+{
+	BlockCheckpointInfo::freeList(&m_firstCheckpointInfo);
+}
+#endif
+
+//-----------------------------------------------------------------------------
+// METHODS for MemoryPool
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+/**
+	init to safe values.
+*/
+MemoryPool::MemoryPool() :
+	m_factory(NULL),
+	m_nextPoolInFactory(NULL),
+	m_poolName(""),
+	m_allocationSize(0),
+	m_initialAllocationCount(0),
+	m_overflowAllocationCount(0),
+	m_usedBlocksInPool(0),
+	m_totalBlocksInPool(0),
+	m_peakUsedBlocksInPool(0),
+	m_firstBlob(NULL),
+	m_lastBlob(NULL),
+	m_firstBlobWithFreeBlocks(NULL)
+{
+}
+
+//-----------------------------------------------------------------------------
+/**
+	initialize the memory pool with the given parameters. allocate the initial
+	set of blocks.
+*/
+void MemoryPool::init(MemoryPoolFactory *factory, const char *poolName, Int allocationSize, Int initialAllocationCount, Int overflowAllocationCount)
+{
+	m_factory = factory;
+	m_poolName = poolName;
+	m_allocationSize = ::roundUpMemBound(allocationSize);	// round up to four-byte boundary
+	m_initialAllocationCount = initialAllocationCount;
+	m_overflowAllocationCount = overflowAllocationCount;
+	m_usedBlocksInPool = 0;
+	m_totalBlocksInPool = 0;
+	m_peakUsedBlocksInPool = 0;
+	m_firstBlob = NULL;
+	m_lastBlob = NULL;
+	m_firstBlobWithFreeBlocks = NULL;
+
+	// go ahead and init the initial block here (will throw on failure)
+	createBlob(m_initialAllocationCount);
+}
+
+//-----------------------------------------------------------------------------
+/**
+	throw away the pool, and all blocks/blobs associated with it.
+*/
+MemoryPool::~MemoryPool()
+{
+	// toss everything. we could do this slightly more efficiently,
+	// but not really worth the extra code to do so.
+	while (m_firstBlob)
+	{
+		freeBlob(m_firstBlob);
+	}
+}
+
+//-----------------------------------------------------------------------------
+/**
+	create a new blob for this pool. if you set up good values for initialAllocationCount,
+	this should rarely (if ever) be called (though during development it will be called
+	frequently).
+*/
+MemoryPoolBlob* MemoryPool::createBlob(Int allocationCount)
+{
+	DEBUG_ASSERTCRASH(allocationCount > 0 && allocationCount%MEM_BOUND_ALIGNMENT==0, ("bad allocationCount (must be >0 and evenly divisible by %d)",MEM_BOUND_ALIGNMENT));
+
+	MemoryPoolBlob* blob = new (::sysAllocateDoNotZero(sizeof(MemoryPoolBlob))) MemoryPoolBlob;	// will throw on failure
+
+	blob->initBlob(this, allocationCount);	// will throw on failure
+
+	blob->addBlobToList(&m_firstBlob, &m_lastBlob);
+
+	DEBUG_ASSERTCRASH(m_firstBlobWithFreeBlocks == NULL, ("DO NOT IGNORE. Please call John McD - x36872 (m_firstBlobWithFreeBlocks != NULL)"));
+	m_firstBlobWithFreeBlocks = blob;
+
+	// bookkeeping
+	m_totalBlocksInPool += allocationCount;
+
+#ifdef MEMORYPOOL_DEBUG
+	m_factory->adjustTotals("", 0, allocationCount*getAllocationSize());
+#endif
+
+	return blob;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	throw away a given blob, and all its blocks. it's assumed that the blob belongs
+	to this pool.
+*/
+Int MemoryPool::freeBlob(MemoryPoolBlob* blob)
+{
+	DEBUG_ASSERTCRASH(blob, ("null blob"));
+	DEBUG_ASSERTCRASH(blob->getOwningPool() == this, ("blob does not belong to this pool"));
+
+	// save these for later...
+	Int totalBlocksInBlob = blob->getTotalBlockCount();
+	Int usedBlocksInBlob = blob->getUsedBlockCount();
+	DEBUG_ASSERTCRASH(usedBlocksInBlob == 0, ("freeing a nonempty blob (%d)",usedBlocksInBlob));
+
+	// this is really just an estimate... will be too small in debug mode.
+	Int amtFreed = totalBlocksInBlob * getAllocationSize() + sizeof(MemoryPoolBlob);
+
+	// de-link it from our list
+	blob->removeBlobFromList(&m_firstBlob, &m_lastBlob);
+
+	// ensure that the 'first free' blob is still a valid blob.
+	// (doesn't need to actually have free blocks, just be a valid blob)
+	if (m_firstBlobWithFreeBlocks == blob)
+		m_firstBlobWithFreeBlocks = m_firstBlob;
+
+	// this is evil... since there is no 'placement delete' we must do this the hard way
+	// and call the dtor directly. ordinarily this is heinous, but in this case we'll
+	// make an exception.
+	blob->~MemoryPoolBlob();
+	::sysFree((void *)blob);
+
+	// finally... bookkeeping
+	m_usedBlocksInPool -= usedBlocksInBlob;
+	m_totalBlocksInPool -= totalBlocksInBlob;
+
+#ifdef MEMORYPOOL_DEBUG
+	m_factory->adjustTotals("", -usedBlocksInBlob*getAllocationSize(), -totalBlocksInBlob*getAllocationSize());
+#endif
+
+	return amtFreed;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	allocate a block from this pool and return it, but don't bother zeroing
+	out the block. if unable to allocate, throw ERROR_OUT_OF_MEMORY. this
+	function will never return null.
+*/
+void* MemoryPool::allocateBlockDoNotZeroImplementation(DECLARE_LITERALSTRING_ARG1)
+{
+	ScopedCriticalSection scopedCriticalSection(TheMemoryPoolCriticalSection);
+
+	if (m_firstBlobWithFreeBlocks != NULL && !m_firstBlobWithFreeBlocks->hasAnyFreeBlocks())
+	{
+		// hmm... the current 'free' blob has nothing available. look and see if there
+		// are any other existing blobs with freespace.
+		MemoryPoolBlob *blob = m_firstBlob;
+		for (; blob != NULL; blob = blob->getNextInList())
+		{
+			if (blob->hasAnyFreeBlocks())
+			 	break;
+		}
+
+		// note that if we walk thru the list without finding anything, this will
+		// reset m_firstBlobWithFreeBlocks to null and fall thru.
+	 	m_firstBlobWithFreeBlocks = blob;
+	}
+
+	// OK, if we are here then we have no blobs with freespace... darn.
+	// allocate an overflow block.
+	if (m_firstBlobWithFreeBlocks == NULL)
+	{
+		if (m_overflowAllocationCount == 0)
+		{
+			throw ERROR_OUT_OF_MEMORY;	// this pool is not allowed to grow
+		}
+		else
+		{
+			createBlob(m_overflowAllocationCount); // throws on failure
+		}
+	}
+
+	MemoryPoolBlob *blob = m_firstBlobWithFreeBlocks;
+
+	DEBUG_ASSERTCRASH(blob, ("no blob with free blocks available in MemoryPool::allocate"));
+
+	MemoryPoolSingleBlock *block = blob->allocateSingleBlock(PASS_LITERALSTRING_ARG1);
+	DEBUG_ASSERTCRASH(block, ("should not fail here"));
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+	BlockCheckpointInfo *bi = debugAddCheckpointInfo(block->debugGetLiteralTagString(), m_factory->getCurCheckpoint(), getAllocationSize());
+	if (bi)
+		block->debugSetCheckpointInfo(bi);
+#endif
+
+	// bookkeeping
+	++m_usedBlocksInPool;
+	if (m_peakUsedBlocksInPool < m_usedBlocksInPool)
+		m_peakUsedBlocksInPool = m_usedBlocksInPool;
+
+#ifdef MEMORYPOOL_DEBUG
+	m_factory->adjustTotals(debugLiteralTagString, 1*getAllocationSize(), 0);
+	#ifdef USE_FILLER_VALUE
+	{
+		USE_PERF_TIMER(MemoryPoolInitFilling)
+		::memset32(block->getUserData(), s_initFillerValue, getAllocationSize());
+	}
+	#endif
+#endif
+
+	return block->getUserData();
+}
+
+//-----------------------------------------------------------------------------
+/**
+	allocate a block from this pool and return it, and zero out the contents
+	of the block. if unable to allocate, throw ERROR_OUT_OF_MEMORY. this
+	function will never return null.
+*/
+void* MemoryPool::allocateBlockImplementation(DECLARE_LITERALSTRING_ARG1)
+{
+	void* p = allocateBlockDoNotZeroImplementation(PASS_LITERALSTRING_ARG1);	// throws on failure
+	memset(p, 0, getAllocationSize());
+	return p;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	free a block allocated by this pool. it's ok to pass null.
+*/
+void MemoryPool::freeBlock(void* pBlockPtr)
+{
+	if (!pBlockPtr)
+		return;	// my, that was easy
+
+	ScopedCriticalSection scopedCriticalSection(TheMemoryPoolCriticalSection);
+
+	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
+	MemoryPoolBlob *blob = block->getOwningBlob();
+#ifdef MEMORYPOOL_DEBUG
+	const char* tagString = block->debugGetLiteralTagString();
+#endif
+
+	DEBUG_ASSERTCRASH(blob && blob->getOwningPool() == this, ("block does not belong to this pool"));
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+	BlockCheckpointInfo *bi = block->debugGetCheckpointInfo();
+	DEBUG_ASSERTCRASH(bi, ("hmm, no checkpoint info"));
+	if (bi)
+		bi->debugSetFreepoint(m_factory->getCurCheckpoint());
+#endif
+
+	blob->freeSingleBlock(block);
+
+	// if we want to free the blobs as they become empty, do that here.
+	// normally we don't bother, but just in case this is ever desired, here's how you'd do it...
+	//
+	// if (blob->m_usedBlocksInBlob == 0)
+	// {
+	//	freeBlob(blob);
+	//	return;
+	//}
+
+	if (!m_firstBlobWithFreeBlocks)
+		m_firstBlobWithFreeBlocks = blob;
+
+	// bookkeeping
+	--m_usedBlocksInPool;
+
+#ifdef MEMORYPOOL_DEBUG
+	m_factory->adjustTotals(tagString, -1*getAllocationSize(), 0);
+#endif
+}
+
+//-----------------------------------------------------------------------------
+Int MemoryPool::countBlobsInPool()
+{
+	Int blobs = 0;
+	for (MemoryPoolBlob* blob = m_firstBlob; blob;)
+	{
+		++blobs;
+		blob = blob->getNextInList();
+	}
+	return blobs;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	if the pool has any blobs that are completely unused, they are released back to the
+	operating system. this will rarely, if ever, be called, but may be useful
+	in odd situations.
+*/
+Int MemoryPool::releaseEmpties()
+{
+	ScopedCriticalSection scopedCriticalSection(TheMemoryPoolCriticalSection);
+
+	Int released = 0;
+
+	for (MemoryPoolBlob* blob = m_firstBlob; blob;)
+	{
+		MemoryPoolBlob* pNext = blob->getNextInList();
+		if (blob->getUsedBlockCount() == 0)
+			released += freeBlob(blob);
+		blob = pNext;
+	}
+	return released;
+}
+
+
+//-----------------------------------------------------------------------------
+/**
+	throw away everything in the pool, but keep the pool itself valid.
+*/
+void MemoryPool::reset()
+{
+	ScopedCriticalSection scopedCriticalSection(TheMemoryPoolCriticalSection);
+
+	// toss everything. we could do this slightly more efficiently,
+	// but not really worth the extra code to do so.
+	while (m_firstBlob)
+	{
+		freeBlob(m_firstBlob);
+	}
+	m_firstBlob = NULL;
+	m_lastBlob = NULL;
+	m_firstBlobWithFreeBlocks = NULL;
+
+	init(m_factory, m_poolName, m_allocationSize, m_initialAllocationCount, m_overflowAllocationCount);	// will throw on failure
+
+}
+
+//-----------------------------------------------------------------------------
+/**
+	add this pool to the factory's list-of-pools.
+*/
+void MemoryPool::addToList(MemoryPool **pHead)
+{
+	this->m_nextPoolInFactory = *pHead;
+	*pHead = this;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	remove this pool from the factory's list-of-pools.
+*/
+void MemoryPool::removeFromList(MemoryPool **pHead)
+{
+	// this isn't very efficient, but then, we rarely remove pools...
+	// usually only at shutdown. so don't bother optimizing.
+	MemoryPool *prev = NULL;
+	for (MemoryPool *cur = *pHead; cur; cur = cur->m_nextPoolInFactory)
+	{
+		if (cur == this)
+		{
+			if (prev)
+			{
+				prev->m_nextPoolInFactory = this->m_nextPoolInFactory;
+			}
+			else
+			{
+				*pHead = this->m_nextPoolInFactory;
+			}
+			break;
+		}
+		prev = cur;
+	}
+}
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	print a report about per-pool allocation statistics to the debug log.
+	if the pool is null, print column headers.
+*/
+/*static*/ void MemoryPool::debugPoolInfoReport( MemoryPool *pool, FILE *fp )
+{
+	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
+
+	const char *PREPEND = "POOLINFO";	// allows grepping more easily
+
+	if (!pool)
+	{
+		DEBUG_LOG(("%s,%32s,%6s,%6s,%6s,%6s,%6s,%6s",PREPEND,"POOLNAME","BLKSZ","INIT","OVRFL","USED","TOTAL","PEAK"));
+		if( fp )
+			fprintf( fp, "%s,%32s,%6s,%6s,%6s,%6s,%6s,%6s\n",PREPEND,"POOLNAME","BLKSZ","INIT","OVRFL","USED","TOTAL","PEAK" );
+	}
+	else
+	{
+		DEBUG_LOG(("%s,%32s,%6d,%6d,%6d,%6d,%6d,%6d",PREPEND,
+			pool->m_poolName,pool->m_allocationSize,pool->m_initialAllocationCount,pool->m_overflowAllocationCount,
+			pool->m_usedBlocksInPool,pool->m_totalBlocksInPool,pool->m_peakUsedBlocksInPool));
+		if( fp )
+		{
+			fprintf( fp, "%s,%32s,%6d,%6d,%6d,%6d,%6d,%6d\n",PREPEND,
+				pool->m_poolName,pool->m_allocationSize,pool->m_initialAllocationCount,pool->m_overflowAllocationCount,
+				pool->m_usedBlocksInPool,pool->m_totalBlocksInPool,pool->m_peakUsedBlocksInPool );
+		}
+	}
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+Int MemoryPool::debugPoolReportLeaks( const char* owner )
+{
+	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
+
+	Int any = 0;
+	for (MemoryPoolBlob* blob = m_firstBlob; blob; blob = blob->getNextInList())
+	{
+		any += blob->debugBlobReportLeaks(owner);
+	}
+	return any;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	perform internal consistency checking on the memory pool.
+*/
+void MemoryPool::debugMemoryVerifyPool()
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	Int used = 0;
+	Int total = 0;
+	for (MemoryPoolBlob* blob = m_firstBlob; blob; blob = blob->getNextInList())
+	{
+		blob->debugMemoryVerifyBlob();
+		used += blob->getUsedBlockCount();
+		total += blob->getTotalBlockCount();
+	}
+	DEBUG_ASSERTCRASH(m_usedBlocksInPool == used, ("used mismatch %d %d",m_usedBlocksInPool,used));
+	DEBUG_ASSERTCRASH(m_totalBlocksInPool == total, ("total mismatch %d %d",m_totalBlocksInPool,total));
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	return true iff the block is a valid block in this pool.
+*/
+Bool MemoryPool::debugIsBlockInPool(void *pBlockPtr)
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	if (!pBlockPtr)
+		return false;
+
+#ifdef MEMORYPOOL_INTENSE_VERIFY
+	debugMemoryVerifyPool();
+#endif
+
+	Bool check1 = false, check2 = false;
+
+	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
+	MemoryPoolBlob *ownerBlob = block->getOwningBlob();
+	for (MemoryPoolBlob* blob = m_firstBlob; blob; blob = blob->getNextInList())
+	{
+		if (blob->debugIsBlockInBlob(pBlockPtr))
+			check1 = true;
+
+		if (blob == ownerBlob)
+			check2 = true;
+	}
+
+	DEBUG_ASSERTCRASH(check1 == check2, ("mismatch checks in debugIsBlockInPool"));
+
+	return check1 && check2;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	return the tagstring for the block. this will never return null; if
+	the block is null or invalid, "FREE_SINGLEBLOCK_TAG_STRING" will be returned.
+	it is assumed that the block was allocated by this pool.
+*/
+const char *MemoryPool::debugGetBlockTagString(void *pBlockPtr)
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	if (!pBlockPtr)
+		return FREE_SINGLEBLOCK_TAG_STRING;
+
+#ifdef MEMORYPOOL_INTENSE_VERIFY
+	debugMemoryVerifyPool();
+#endif
+	if (!debugIsBlockInPool(pBlockPtr))
+	{
+		DEBUG_CRASH(("block is not in this pool"));
+		return FREE_SINGLEBLOCK_TAG_STRING;
+	}
+	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
+	return block->debugGetLiteralTagString();
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	free all checkpointinfo for this pool, and reset all ptrs to checkpointinfo.
+*/
+void MemoryPool::debugResetCheckpoints()
+{
+	Checkpointable::debugResetCheckpoints();
+	for (MemoryPoolBlob* blob = m_firstBlob; blob; blob = blob->getNextInList())
+	{
+		blob->debugResetCheckpoints();
+	}
+}
+#endif
+
+//-----------------------------------------------------------------------------
+// METHODS for DynamicMemoryAllocator
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+/**
+	init the DMA to safe values.
+*/
+DynamicMemoryAllocator::DynamicMemoryAllocator() :
+	m_factory(NULL),
+	m_nextDmaInFactory(NULL),
+	m_numPools(0),
+	m_usedBlocksInDma(0),
+	m_rawBlocks(NULL)
+{
+	for (Int i = 0; i < MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS; i++)
+		m_pools[i] = 0;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	Initialize the dma and its subpools.
+*/
+void DynamicMemoryAllocator::init(MemoryPoolFactory *factory, Int numSubPools, const PoolInitRec pParms[])
+{
+	const PoolInitRec defaultDMA[7] =
+	{
+		{ "dmaPool_16", 16, 64, 64 },
+		{ "dmaPool_32", 32, 64, 64 },
+		{ "dmaPool_64", 64, 64, 64 },
+		{ "dmaPool_128", 128, 64, 64 },
+		{ "dmaPool_256", 256, 64, 64 },
+		{ "dmaPool_512", 512, 64, 64 },
+		{ "dmaPool_1024", 1024, 64, 64 }
+	};
+
+	if (numSubPools == 0 || pParms == NULL)
+	{
+		// use the defaults...
+		numSubPools = 7;
+		pParms = defaultDMA;
+	}
+
+
+	m_factory = factory;
+	m_numPools = numSubPools;
+	if (m_numPools > MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS)
+		m_numPools = MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS;
+	m_usedBlocksInDma = 0;
+	for (Int i = 0; i < m_numPools; i++)
+	{
+		DEBUG_ASSERTCRASH(i == 0 || pParms[i].allocationSize > pParms[i-1].allocationSize, ("alloc size must increase monotonically for DMA"));
+		m_pools[i] = m_factory->createMemoryPool(&pParms[i]);
+	}
+}
+
+//-----------------------------------------------------------------------------
+/**
+	destroy the dma and its subpools.
+*/
+DynamicMemoryAllocator::~DynamicMemoryAllocator()
+{
+	DEBUG_ASSERTCRASH(m_usedBlocksInDma == 0, ("destroying a nonempty dma"));
+
+	/// @todo this may cause double-destruction of the subpools -- test & fix
+	for (Int i = 0; i < m_numPools; i++)
+	{
+		m_factory->destroyMemoryPool(m_pools[i]);
+		m_pools[i] = NULL;
+	}
+
+	while (m_rawBlocks)
+	{
+		freeBytes(m_rawBlocks->getUserData());
+	}
+}
+
+//-----------------------------------------------------------------------------
+/**
+	find the best-fitting subpool in this dma for a given allocation size.
+	if no subpool can satisfy the size, return null.
+*/
+MemoryPool *DynamicMemoryAllocator::findPoolForSize(Int allocSize)
+{
+	for (Int i = 0; i < m_numPools; i++)
+	{
+		DEBUG_ASSERTCRASH(m_pools[i], ("null pool"));
+		if (allocSize <= m_pools[i]->getAllocationSize())
+			return m_pools[i];
+	}
+	return NULL;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	add this DMA to the factory's list of dmas.
+*/
+void DynamicMemoryAllocator::addToList(DynamicMemoryAllocator **pHead)
+{
+	this->m_nextDmaInFactory = *pHead;
+	*pHead = this;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	remove this DMA from the factory's list of dmas.
+*/
+void DynamicMemoryAllocator::removeFromList(DynamicMemoryAllocator **pHead)
+{
+	// this isn't very efficient, but then, we rarely remove these...
+	// usually only at shutdown. so don't bother optimizing.
+	DynamicMemoryAllocator *prev = NULL;
+	for (DynamicMemoryAllocator *cur = *pHead; cur; cur = cur->m_nextDmaInFactory)
+	{
+		if (cur == this)
+		{
+			if (prev)
+			{
+				prev->m_nextDmaInFactory = this->m_nextDmaInFactory;
+			}
+			else
+			{
+				*pHead = this->m_nextDmaInFactory;
+			}
+			break;
+		}
+		prev = cur;
+	}
+}
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+void DynamicMemoryAllocator::debugIgnoreLeaksForThisBlock(void* pBlockPtr)
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	if (!pBlockPtr)
+		return;
+
+#ifdef MEMORYPOOL_CHECK_BLOCK_OWNERSHIP
+	DEBUG_ASSERTCRASH(debugIsBlockInDma(pBlockPtr), ("block is not in this dma"));
+#endif
+
+	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
+	if (block->getOwningBlob())
+	{
+#ifdef MEMORYPOOL_DEBUG
+		DEBUG_ASSERTCRASH(findPoolForSize(block->debugGetLogicalSize()) == block->getOwningBlob()->getOwningPool(), ("pool mismatch"));
+#endif
+		block->debugIgnoreLeaksForThisBlock();
+	}
+	else
+	{
+		DEBUG_CRASH(("cannot currently ignore leaks for raw blocks (allocation too large)"));
+	}
+}
+#endif
+
+//-----------------------------------------------------------------------------
+/**
+	allocate a chunk-o-bytes from this DMA and return it, but don't bother zeroing
+	out the block. if unable to allocate, throw ERROR_OUT_OF_MEMORY. this
+	function will never return null.
+
+  added code to make sure we're on a DWord boundary, throw exception if not
+*/
+void *DynamicMemoryAllocator::allocateBytesDoNotZeroImplementation(Int numBytes DECLARE_LITERALSTRING_ARG2)
+{
+	ScopedCriticalSection scopedCriticalSection(TheDmaCriticalSection);
+
+	void *result = NULL;
+
+#ifdef MEMORYPOOL_DEBUG
+	DEBUG_ASSERTCRASH(debugLiteralTagString != NULL, ("bad tagstring"));
+	Int waste = 0;
+#endif
+
+	MemoryPool *pool = findPoolForSize(numBytes);
+	if (pool != NULL)
+	{
+		result = pool->allocateBlockDoNotZeroImplementation(PASS_LITERALSTRING_ARG1);
+#ifdef MEMORYPOOL_DEBUG
+	{
+		USE_PERF_TIMER(MemoryPoolDebugging)
+		waste = pool->getAllocationSize() - numBytes;
+		MemoryPoolSingleBlock *wblock = MemoryPoolSingleBlock::recoverBlockFromUserData(result);
+		wblock->debugSetWastedSize(waste);
+#ifdef INTENSE_DMA_BOOKKEEPING
+		if (doingIntenseDMA == 0)
+#endif
+		{
+			theWastedDMA += (waste);
+			if (thePeakWastedDMA < theWastedDMA)
+				thePeakWastedDMA = theWastedDMA;
+		}
+	}
+#endif // MEMORYPOOL_DEBUG
+	}
+	else
+	{
+		// too big for our pools -- just go right to the metal.
+		MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::rawAllocateSingleBlock(&m_rawBlocks, numBytes, m_factory PASS_LITERALSTRING_ARG2);
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+		BlockCheckpointInfo *bi = debugAddCheckpointInfo(block->debugGetLiteralTagString(), m_factory->getCurCheckpoint(), numBytes);
+		if (bi)
+			block->debugSetCheckpointInfo(bi);
+#endif
+
+		result = block->getUserData();
+
+#ifdef MEMORYPOOL_DEBUG
+		m_factory->adjustTotals(debugLiteralTagString, numBytes, numBytes);
+		theTotalLargeBlocks += numBytes;
+		if (thePeakLargeBlocks < theTotalLargeBlocks)
+			thePeakLargeBlocks = theTotalLargeBlocks;
+#endif
+	}
+
+#ifdef MEMORYPOOL_DEBUG
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+	theTotalDMA += numBytes;
+	if (thePeakDMA < theTotalDMA)
+		thePeakDMA = theTotalDMA;
+#ifdef INTENSE_DMA_BOOKKEEPING
+	if (isMemoryManagerOfficiallyInited() && doingIntenseDMA == 0)
+	{
+		++doingIntenseDMA;
+		UsedNPeak& up = TheUsedNPeakMap[debugLiteralTagString];
+		up.used += numBytes;
+		if (up.peak < up.used)
+			up.peak = up.used;
+		up.waste += waste;
+		if (up.peakwaste < up.waste)
+			up.peakwaste = up.waste;
+		--doingIntenseDMA;
+	}
+#endif
+}
+#endif // MEMORYPOOL_DEBUG
+
+	++m_usedBlocksInDma;
+	DEBUG_ASSERTCRASH(m_usedBlocksInDma >= 0, ("negative count for m_usedBlocksInDma"));
+#ifdef MEMORYPOOL_DEBUG
+	#ifdef USE_FILLER_VALUE
+	{
+		USE_PERF_TIMER(MemoryPoolInitFilling)
+		::memset32(result, s_initFillerValue, numBytes);
+	}
+	#endif
+#endif
+
+#if defined(RTS_DEBUG)
+  // check alignment
+  if (unsigned(result)&3)
+    throw ERROR_OUT_OF_MEMORY;
+#endif
+
+	return result;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	allocate a chunk-o-bytes from this DMA and return it, and zero out the contents first.
+	if unable to allocate, throw ERROR_OUT_OF_MEMORY.
+	this function will never return null.
+*/
+void *DynamicMemoryAllocator::allocateBytesImplementation(Int numBytes DECLARE_LITERALSTRING_ARG2)
+{
+	void* p = allocateBytesDoNotZeroImplementation(numBytes PASS_LITERALSTRING_ARG2);	// throws on failure
+	memset(p, 0, numBytes);
+	return p;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	free a chunk-o-bytes allocated by this dma. it's ok to pass null.
+*/
+void DynamicMemoryAllocator::freeBytes(void* pBlockPtr)
+{
+	if (!pBlockPtr)
+		return;
+
+	ScopedCriticalSection scopedCriticalSection(TheDmaCriticalSection);
+
+#ifdef MEMORYPOOL_CHECK_BLOCK_OWNERSHIP
+	DEBUG_ASSERTCRASH(debugIsBlockInDma(pBlockPtr), ("block is not in this dma"));
+#endif
+
+	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
+#ifdef MEMORYPOOL_DEBUG
+	Int waste = 0, used = 0;
+#ifdef INTENSE_DMA_BOOKKEEPING
+	const char* tagString;
+#endif
+	{
+		USE_PERF_TIMER(MemoryPoolDebugging)
+		waste = 0;
+		used = block->debugGetLogicalSize();
+		theTotalDMA -= used;
+		if (thePeakDMA < theTotalDMA)
+			thePeakDMA = theTotalDMA;
+	#ifdef INTENSE_DMA_BOOKKEEPING
+		tagString = block->debugGetLiteralTagString();
+	#endif
+	}
+#endif // MEMORYPOOL_DEBUG
+
+	if (block->getOwningBlob())
+	{
+#ifdef MEMORYPOOL_DEBUG
+		{
+			USE_PERF_TIMER(MemoryPoolDebugging)
+			DEBUG_ASSERTCRASH(findPoolForSize(used) == block->getOwningBlob()->getOwningPool(), ("pool mismatch"));
+	#ifdef INTENSE_DMA_BOOKKEEPING
+			if (doingIntenseDMA == 0)
+	#endif
+			{
+				waste = block->debugGetWastedSize();
+				theWastedDMA -= waste;
+				if (thePeakWastedDMA < theWastedDMA)
+					thePeakWastedDMA = theWastedDMA;
+			}
+		}
+#endif // MEMORYPOOL_DEBUG
+		block->getOwningBlob()->getOwningPool()->freeBlock(pBlockPtr);
+	}
+	else
+	{
+		// was allocated via sysAllocate.
+#ifdef MEMORYPOOL_CHECKPOINTING
+		BlockCheckpointInfo *bi = block->debugGetCheckpointInfo();
+		DEBUG_ASSERTCRASH(bi, ("hmm, no checkpoint info"));
+		if (bi)
+			bi->debugSetFreepoint(m_factory->getCurCheckpoint());
+#endif
+
+#ifdef MEMORYPOOL_DEBUG
+		m_factory->adjustTotals(block->debugGetLiteralTagString(), -used, -used);
+		theTotalLargeBlocks -= used;
+		if (thePeakLargeBlocks < theTotalLargeBlocks)
+			thePeakLargeBlocks = theTotalLargeBlocks;
+		block->debugMarkBlockAsFree();
+#endif
+
+		block->removeBlockFromList(&m_rawBlocks);
+
+		::sysFree((void *)block);
+
+	}
+	--m_usedBlocksInDma;
+	DEBUG_ASSERTCRASH(m_usedBlocksInDma >= 0, ("negative count for m_usedBlocksInDma"));
+
+#ifdef INTENSE_DMA_BOOKKEEPING
+	if (isMemoryManagerOfficiallyInited() && doingIntenseDMA == 0)
+	{
+		++doingIntenseDMA;
+		UsedNPeak& up = TheUsedNPeakMap[tagString];
+		up.used -= used;
+		if (up.peak < up.used)
+			up.peak = up.used;
+		up.waste -= waste;
+		if (up.peakwaste < up.waste)
+			up.peakwaste = up.waste;
+		--doingIntenseDMA;
+	}
+#endif
+
+}
+
+//-----------------------------------------------------------------------------
+Int DynamicMemoryAllocator::getActualAllocationSize(Int numBytes)
+{
+	MemoryPool *pool = findPoolForSize(numBytes);
+	return pool ? pool->getAllocationSize() : numBytes;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	throw away everything in the DMA, but keep the DMA itself valid.
+*/
+void DynamicMemoryAllocator::reset()
+{
+	for (Int i = 0; i < m_numPools; i++)
+	{
+		if (m_pools[i])
+		{
+			m_pools[i]->reset();
+		}
+	}
+
+	while (m_rawBlocks)
+		freeBytes(m_rawBlocks->getUserData());
+
+	m_usedBlocksInDma = 0;
+}
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	return true iff the given pool is a subpool of this dma.
+*/
+Bool DynamicMemoryAllocator::debugIsPoolInDma(MemoryPool *pool)
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	if (!pool)
+		return false;
+
+	for (Int i = 0; i < m_numPools; i++)
+	{
+		if (m_pools[i] == pool)
+			return true;
+	}
+
+	return false;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	return true iff the block was allocated by this dma
+	(either from a subpool or as a raw block).
+*/
+Bool DynamicMemoryAllocator::debugIsBlockInDma(void *pBlockPtr)
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	if (!pBlockPtr)
+		return false;
+
+	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
+	if (block->getOwningBlob())
+	{
+		MemoryPool *pool = block->getOwningBlob()->getOwningPool();
+		return pool && pool->debugIsBlockInPool(pBlockPtr) && debugIsPoolInDma(pool);
+	}
+	else
+	{
+		for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
+		{
+			if (b == block)
+				return true;
+		}
+		return false;
+	}
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	return the tagstring for the block. this will never return null; if
+	the block is null or invalid, "FREE_SINGLEBLOCK_TAG_STRING" will be returned.
+	it is assumed that the block was allocated by this dma.
+*/
+const char *DynamicMemoryAllocator::debugGetBlockTagString(void *pBlockPtr)
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	if (!pBlockPtr)
+		return FREE_SINGLEBLOCK_TAG_STRING;
+
+	if (!debugIsBlockInDma(pBlockPtr))
+	{
+		DEBUG_CRASH(("block is not in this dma"));
+		return FREE_SINGLEBLOCK_TAG_STRING;
+	}
+	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
+	return block->debugGetLiteralTagString();
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	perform internal consistency checking on this DMA.
+*/
+void DynamicMemoryAllocator::debugMemoryVerifyDma()
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
+	{
+		b->debugVerifyBlock();
+	}
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	free all checkpointinfo for this dma, and reset all ptrs to checkpointinfo.
+*/
+void DynamicMemoryAllocator::debugResetCheckpoints()
+{
+	Checkpointable::debugResetCheckpoints();
+	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
+	{
+		b->debugResetCheckpoint();
+	}
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	calculate the total number of raw blocks allocated by this dma,
+	and the total number of bytes (logical) used by those raw blocks.
+*/
+Int DynamicMemoryAllocator::debugCalcRawBlockBytes(Int *numBlocks)
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	if (numBlocks)
+		*numBlocks = 0;
+	Int bytes = 0;
+	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
+	{
+		if (numBlocks)
+			*numBlocks += 1;
+		bytes += b->debugGetLogicalSize();
+	}
+	return bytes;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+Int DynamicMemoryAllocator::debugDmaReportLeaks()
+{
+	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
+
+	Int any = false;
+	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
+	{
+		any += b->debugSingleBlockReportLeak("(DMA)");
+	}
+	return any;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	print a report about raw block allocations to the debug log.
+*/
+void DynamicMemoryAllocator::debugDmaInfoReport( FILE *fp )
+{
+	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
+
+	const char *PREPEND = "POOLINFO";	// allows grepping more easily
+
+	Int numBlocks;
+	Int bytes = debugCalcRawBlockBytes(&numBlocks);
+	DEBUG_LOG(("%s,Total Raw Blocks = %d",PREPEND,numBlocks));
+	DEBUG_LOG(("%s,Total Raw Block Bytes = %d",PREPEND,bytes));
+	DEBUG_LOG(("%s,Average Raw Block Size = %d",PREPEND,numBlocks?bytes/numBlocks:0));
+	DEBUG_LOG(("%s,Raw Blocks:",PREPEND));
+	if( fp )
+	{
+		fprintf( fp, "%s,Total Raw Blocks = %d\n",PREPEND,numBlocks );
+		fprintf( fp, "%s,Total Raw Block Bytes = %d\n",PREPEND,bytes );
+		fprintf( fp, "%s,Average Raw Block Size = %d\n",PREPEND,numBlocks?bytes/numBlocks:0 );
+		fprintf( fp, "%s,Raw Blocks:\n",PREPEND );
+	}
+	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
+	{
+		DEBUG_LOG(("%s,  Blocksize=%d",PREPEND,b->debugGetLogicalSize()));
+		//if( fp )
+		//{
+		//	fprintf( fp, "%s,  Blocksize=%d\n",PREPEND,b->debugGetLogicalSize() );
+		//}
+	}
+
+}
+#endif
+
+//-----------------------------------------------------------------------------
+// METHODS for MemoryPoolFactory
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+/**
+	init the factory to safe values.
+*/
+MemoryPoolFactory::MemoryPoolFactory() :
+	m_firstPoolInFactory(NULL),
+	m_firstDmaInFactory(NULL)
+#ifdef MEMORYPOOL_CHECKPOINTING
+	, m_curCheckpoint(0)
+#endif
+#ifdef MEMORYPOOL_DEBUG
+	, m_usedBytes(0)
+	, m_physBytes(0)
+	, m_peakUsedBytes(0)
+	, m_peakPhysBytes(0)
+#endif
+{
+#ifdef MEMORYPOOL_DEBUG
+	for (int i = 0; i < MAX_SPECIAL_USED; ++i)
+	{
+		m_usedBytesSpecial[i] = 0;
+		m_usedBytesSpecialPeak[i] = 0;
+		m_physBytesSpecial[i] = 0;
+		m_physBytesSpecialPeak[i] = 0;
+	}
+	#ifdef USE_FILLER_VALUE
+	calcFillerValue(GameClientRandomValue(0, MAX_INIT_FILLER_COUNT-1));
+	#endif
+#endif
+}
+//-----------------------------------------------------------------------------
+/**
+	initialize the factory.
+*/
+void MemoryPoolFactory::init()
+{
+	// my, that was easy
+}
+
+//-----------------------------------------------------------------------------
+/**
+	destroy the factory, and all its pools and dmas.
+*/
+MemoryPoolFactory::~MemoryPoolFactory()
+{
+	while (m_firstPoolInFactory)
+	{
+		destroyMemoryPool(m_firstPoolInFactory);
+	}
+
+	while (m_firstDmaInFactory)
+	{
+		destroyDynamicMemoryAllocator(m_firstDmaInFactory);
+	}
+}
+
+//-----------------------------------------------------------------------------
+/**
+	create a new memory pool.
+*/
+MemoryPool *MemoryPoolFactory::createMemoryPool(const PoolInitRec *parms)
+{
+	return createMemoryPool(parms->poolName, parms->allocationSize, parms->initialAllocationCount, parms->overflowAllocationCount);
+}
+
+//-----------------------------------------------------------------------------
+/**
+	create a new memory pool. (alternate argument list)
+*/
+MemoryPool *MemoryPoolFactory::createMemoryPool(const char *poolName, Int allocationSize, Int initialAllocationCount, Int overflowAllocationCount)
+{
+	MemoryPool *pool = findMemoryPool(poolName);
+	if (pool)
+	{
+		DEBUG_ASSERTCRASH(allocationSize == pool->getAllocationSize(), ("pool size mismatch"));
+		return pool;
+	}
+
+	userMemoryAdjustPoolSize(poolName, initialAllocationCount, overflowAllocationCount);
+
+	if (initialAllocationCount <= 0 || overflowAllocationCount < 0)
+	{
+		DEBUG_CRASH(("illegal pool size: %d %d",initialAllocationCount,overflowAllocationCount));
+		throw ERROR_OUT_OF_MEMORY;
+	}
+
+	pool = new (::sysAllocateDoNotZero(sizeof(MemoryPool))) MemoryPool;	// will throw on failure
+	pool->init(this, poolName, allocationSize, initialAllocationCount, overflowAllocationCount);	// will throw on failure
+
+	pool->addToList(&m_firstPoolInFactory);
+
+	return pool;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	find a memory pool with the given name; return null if no such pool exists,
+	return null. note that this function isn't particularly fast (it just does
+	a linear search), so you should probably cache the result.
+*/
+MemoryPool *MemoryPoolFactory::findMemoryPool(const char *poolName)
+{
+	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
+	{
+		if (strcmp(poolName, pool->getPoolName()) == 0)
+		{
+			DEBUG_ASSERTCRASH(poolName == pool->getPoolName(), ("hmm, ptrs should probably match here"));
+			return pool;
+		}
+	}
+	return NULL;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	destroy the given memory pool. you normally will never need to call this directly.
+*/
+void MemoryPoolFactory::destroyMemoryPool(MemoryPool *pMemoryPool)
+{
+	if (!pMemoryPool)
+		return;
+
+	DEBUG_ASSERTCRASH(pMemoryPool->getUsedBlockCount() == 0, ("destroying a nonempty pool"));
+
+	pMemoryPool->removeFromList(&m_firstPoolInFactory);
+
+	// this is evil... since there is no 'placement delete' we must do this the hard way
+	// and call the dtor directly. ordinarily this is heinous, but in this case we'll
+	// make an exception.
+	pMemoryPool->~MemoryPool();
+	::sysFree((void *)pMemoryPool);
+}
+
+//-----------------------------------------------------------------------------
+/**
+	create a new dynamicMemoryAllocator. You normally will never need to call this directly.
+*/
+DynamicMemoryAllocator *MemoryPoolFactory::createDynamicMemoryAllocator(Int numSubPools, const PoolInitRec pParms[])
+{
+	DynamicMemoryAllocator *dma;
+
+	dma = new (::sysAllocateDoNotZero(sizeof(DynamicMemoryAllocator))) DynamicMemoryAllocator;	// will throw on failure
+	dma->init(this, numSubPools, pParms);	// will throw on failure
+
+	dma->addToList(&m_firstDmaInFactory);
+
+	return dma;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	destroy the given dynamicMemoryAllocator. You normally will never need to call this directly.
+*/
+void MemoryPoolFactory::destroyDynamicMemoryAllocator(DynamicMemoryAllocator *dma)
+{
+	if (!dma)
+		return;
+
+	dma->removeFromList(&m_firstDmaInFactory);
+
+	// this is evil... since there is no 'placement delete' we must do this the hard way
+	// and call the dtor directly. ordinarily this is heinous, but in this case we'll
+	// make an exception.
+	dma->~DynamicMemoryAllocator();
+	::sysFree((void *)dma);
+}
+
+//-----------------------------------------------------------------------------
+/**
+	throw away everything in all pools/dmas owned by this factory, but keep the factory
+	and pools/dmas themselves valid.
+*/
+void MemoryPoolFactory::reset()
+{
+#ifdef MEMORYPOOL_CHECKPOINTING
+	debugResetCheckpoints();
+#endif
+
+	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
+	{
+		pool->reset();
+	}
+	for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
+	{
+		dma->reset();
+	}
+
+#ifdef MEMORYPOOL_DEBUG
+	m_usedBytes = 0;
+	m_physBytes = 0;
+	m_peakUsedBytes = 0;
+	m_peakPhysBytes = 0;
+	for (int i = 0; i < MAX_SPECIAL_USED; ++i)
+	{
+		m_usedBytesSpecial[i] = 0;
+		m_usedBytesSpecialPeak[i] = 0;
+		m_physBytesSpecial[i] = 0;
+		m_physBytesSpecialPeak[i] = 0;
+	}
+	#ifdef USE_FILLER_VALUE
+	calcFillerValue(GameClientRandomValue(0, MAX_INIT_FILLER_COUNT-1));
+	#endif
+#endif
+}
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+static const char* s_specialPrefixes[MAX_SPECIAL_USED] =
+{
+	"Misc",			// the catchall for stuff that doesn't match others
+	"W3D_",
+	"W3A_",
+	"STL_",
+	"STR_",
+	NULL
+};
+
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	perform bookkeeping on memory usage statistics.
+*/
+void MemoryPoolFactory::adjustTotals(const char* tagString, Int usedDelta, Int physDelta)
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	m_usedBytes += usedDelta;
+	m_physBytes += physDelta;
+	if (m_peakUsedBytes < m_usedBytes)
+		m_peakUsedBytes = m_usedBytes;
+	if (m_peakPhysBytes < m_physBytes)
+		m_peakPhysBytes = m_physBytes;
+
+	int found = 0;	// if no matches found, goes into slot zero
+	for (int i = 1; i < MAX_SPECIAL_USED; ++i)	// start at 1, not zero
+	{
+		if (s_specialPrefixes[i] == NULL)
+			break;
+
+		if (strncmp(tagString, s_specialPrefixes[i], strlen(s_specialPrefixes[i])) == 0)
+		{
+			found = i;
+			break;
+		}
+	}
+	m_usedBytesSpecial[found] += usedDelta;
+	m_physBytesSpecial[found] += physDelta;
+	if (m_usedBytesSpecialPeak[found] < m_usedBytesSpecial[found])
+		m_usedBytesSpecialPeak[found] = m_usedBytesSpecial[found];
+	if (m_physBytesSpecialPeak[found] < m_physBytesSpecial[found])
+		m_physBytesSpecialPeak[found] = m_physBytesSpecial[found];
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+void MemoryPoolFactory::debugSetInitFillerIndex(Int index)
+{
+	#ifdef USE_FILLER_VALUE
+	if (index < 0 || index >= MAX_INIT_FILLER_COUNT)
+		index = GameClientRandomValue(0, MAX_INIT_FILLER_COUNT-1);
+	calcFillerValue(index);
+	#endif
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	perform internal consistency checking on the factory, and all of its
+	pools and dmas.
+*/
+void MemoryPoolFactory::debugMemoryVerify()
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	Int used = 0, phys = 0;
+
+	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
+	{
+		pool->debugMemoryVerifyPool();
+		used += pool->getUsedBlockCount()*pool->getAllocationSize();
+		phys += pool->getTotalBlockCount()*pool->getAllocationSize();
+	}
+
+	for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
+	{
+		dma->debugMemoryVerifyDma();
+		Int tmp = dma->debugCalcRawBlockBytes(NULL);
+		used += tmp;
+		phys += tmp;
+	}
+
+	DEBUG_ASSERTCRASH(used == m_usedBytes, ("used count mismatch"));
+	DEBUG_ASSERTCRASH(phys == m_physBytes, ("phys count mismatch"));
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	return true iff the block was allocated by any of the pools/dmas owned
+	by this factory.
+*/
+Bool MemoryPoolFactory::debugIsBlockInAnyPool(void *pBlock)
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+#ifdef MEMORYPOOL_INTENSE_VERIFY
+	debugMemoryVerify();
+#endif
+	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
+	{
+		if (pool->debugIsBlockInPool(pBlock))
+			return true;
+	}
+
+	for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
+	{
+		if (dma->debugIsBlockInDma(pBlock))
+			return true;
+	}
+
+	return false;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	return the tagstring for this block. this will never return null; if
+	the block is null or invalid, "FREE_SINGLEBLOCK_TAG_STRING" will be returned.
+	it is assumed that the block was allocated by this factory.
+*/
+const char *MemoryPoolFactory::debugGetBlockTagString(void *pBlockPtr)
+{
+	USE_PERF_TIMER(MemoryPoolDebugging)
+
+	if (!pBlockPtr)
+		return FREE_SINGLEBLOCK_TAG_STRING;
+
+#ifdef MEMORYPOOL_INTENSE_VERIFY
+	debugMemoryVerify();
+#endif
+	if (!debugIsBlockInAnyPool(pBlockPtr))
+	{
+		DEBUG_CRASH(("block is not in this factory"));
+		return FREE_SINGLEBLOCK_TAG_STRING;
+	}
+	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
+	return block->debugGetLiteralTagString();
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	set a new checkpoint for all future blocks allocated/freed by this factory's pools/dmas.
+*/
+Int MemoryPoolFactory::debugSetCheckpoint()
+{
+	return ++m_curCheckpoint;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_CHECKPOINTING
+/**
+	throw away all checkpoint info for all pools/dmas.
+*/
+void MemoryPoolFactory::debugResetCheckpoints()
+{
+	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
+	{
+		pool->debugResetCheckpoints();
+	}
+	for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
+	{
+		dma->debugResetCheckpoints();
+	}
+	m_curCheckpoint = 0;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+void MemoryPoolFactory::memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead )
+{
+#ifdef MEMORYPOOL_DEBUG
+	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
+
+	FILE* perfStatsFile = NULL;
+	Int totalNamedPoolPeak = 0;
+
+	if( !appendToFileInstead )
+	{
+		char tmp[256];
+		strlcpy(tmp, filename, ARRAY_SIZE(tmp));
+		strlcat(tmp, ".csv", ARRAY_SIZE(tmp));
+		perfStatsFile = fopen(tmp, "w");
+	}
+	else
+	{
+		perfStatsFile = appendToFileInstead;
+	}
+
+	if (perfStatsFile == NULL)
+	{
+		DEBUG_CRASH(("could not open/create perf file %s -- is it open in another app?",filename));
+		return;
+	}
+
+	Int lineIdx = 0;
+	MemoryPool *pool = m_firstPoolInFactory;
+#ifdef INTENSE_DMA_BOOKKEEPING
+	UsedNPeakMap::const_iterator it = TheUsedNPeakMap.begin();
+#endif
+	for (;;)
+	{
+		Bool keepGoing = false;
+		if (pool)
+		{
+			if (lineIdx == 0)
+			{
+				fprintf(perfStatsFile, "%s,%d","Unpooled Large Blocks (>1024 bytes)",thePeakLargeBlocks/1024);
+			}
+			else
+			{
+				Int sz = pool->getAllocationSize();
+				Int initial = pool->getInitialBlockCount()*sz;
+				Int peak = pool->getPeakBlockCount()*sz;
+				Int waste = initial - peak;
+				if (waste < 0) waste = 0;
+				fprintf(perfStatsFile, "%s,%d,%d",pool->getPoolName(),peak/1024,waste/1024);
+				totalNamedPoolPeak += peak;
+				pool = pool->getNextPoolInList();
+			}
+			keepGoing = true;
+		}
+		else
+		{
+			fprintf(perfStatsFile, ",,");
+		}
+
+#ifdef INTENSE_DMA_BOOKKEEPING
+		if (it != TheUsedNPeakMap.end())
+		{
+			Int wastepct = (it->second.peakwaste * 100) / (it->second.peak + it->second.peakwaste);
+			fprintf(perfStatsFile, ",,,,%s,%d,%d,%d",it->first,it->second.peak/1024,it->second.peakwaste/1024,wastepct);
+			++it;
+			keepGoing = true;
+		}
+		else
+		{
+			fprintf(perfStatsFile, ",,,,,,,");
+		}
+#endif
+
+		if (lineIdx < MAX_SPECIAL_USED && s_specialPrefixes[lineIdx] != NULL)
+		{
+			fprintf(perfStatsFile, ",,,%s,%d",s_specialPrefixes[lineIdx],m_usedBytesSpecialPeak[lineIdx]/1024);
+			keepGoing = true;
+		}
+
+		fprintf(perfStatsFile, "\n");
+		++lineIdx;
+
+		if (!keepGoing)
+			break;
+	}
+
+	fflush(perfStatsFile);
+
+	if( !appendToFileInstead )
+	{
+		fclose(perfStatsFile);
+	}
+#endif
+}
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_DEBUG
+/**
+	send a memory reports (based on the flags/checkpoints) to the debug log.
+*/
+void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp )
+{
+	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
+
+#ifdef ALLOW_DEBUG_UTILS
+	Int oldFlags = DebugGetFlags();
+	DebugSetFlags(oldFlags & ~DEBUG_FLAG_PREPEND_TIME);
+#endif
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+	Bool doBlockReport = (flags & _REPORT_CP_ALLOCATED_DONTCARE) != 0 && (flags & _REPORT_CP_FREED_DONTCARE) != 0;
+	DEBUG_ASSERTCRASH(startCheckpoint >= 0 && startCheckpoint <= endCheckpoint && endCheckpoint <= m_curCheckpoint, ("bad checkpoints"));
+	DEBUG_ASSERTCRASH(((flags & _REPORT_CP_ALLOCATED_DONTCARE) != 0) == ((flags & _REPORT_CP_FREED_DONTCARE) != 0), ("bad flags: must set at both alloc and free flag"));
+#endif
+
+	debugMemoryVerify();
+
+	if (flags & REPORT_FACTORYINFO)
+	{
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("Begin Factory Info Report"));
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("Bytes in use (logical) = %d",m_usedBytes));
+		DEBUG_LOG(("Bytes in use (physical) = %d",m_physBytes));
+		DEBUG_LOG(("PEAK Bytes in use (logical) = %d",m_peakUsedBytes));
+		DEBUG_LOG(("PEAK Bytes in use (physical) = %d",m_peakPhysBytes));
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("End Factory Info Report"));
+		DEBUG_LOG(("------------------------------------------"));
+		if( fp )
+		{
+			fprintf( fp, "------------------------------------------\n" );
+			fprintf( fp, "Begin Factory Info Report\n" );
+			fprintf( fp, "------------------------------------------\n" );
+			fprintf( fp, "Bytes in use (logical) = %d\n",m_usedBytes );
+			fprintf( fp, "Bytes in use (physical) = %d\n",m_physBytes );
+			fprintf( fp, "PEAK Bytes in use (logical) = %d\n",m_peakUsedBytes );
+			fprintf( fp, "PEAK Bytes in use (physical) = %d\n",m_peakPhysBytes );
+			fprintf( fp, "------------------------------------------\n" );
+			fprintf( fp, "End Factory Info Report\n" );
+			fprintf( fp, "------------------------------------------\n" );
+		}
+	}
+
+	if (flags & REPORT_POOLINFO)
+	{
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("Begin Pool Info Report"));
+		DEBUG_LOG(("------------------------------------------"));
+		if( fp )
+		{
+			fprintf( fp, "------------------------------------------\n" );
+			fprintf( fp, "Begin Pool Info Report\n" );
+			fprintf( fp, "------------------------------------------\n" );
+		}
+		MemoryPool::debugPoolInfoReport( NULL, fp );
+		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
+		{
+			MemoryPool::debugPoolInfoReport( pool, fp );
+		}
+		for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
+		{
+			dma->debugDmaInfoReport( fp );
+		}
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("End Pool Info Report"));
+		DEBUG_LOG(("------------------------------------------"));
+		if( fp )
+		{
+			fprintf( fp, "------------------------------------------\n" );
+			fprintf( fp, "End Pool Info Report\n" );
+			fprintf( fp, "------------------------------------------\n" );
+		}
+	}
+
+	if (flags & REPORT_POOL_OVERFLOW)
+	{
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("Begin Pool Overflow Report"));
+		DEBUG_LOG(("------------------------------------------"));
+		MemoryPool *pool = m_firstPoolInFactory;
+		for (; pool; pool = pool->getNextPoolInList())
+		{
+			if (pool->getPeakBlockCount() > pool->getInitialBlockCount())
+			{
+				DEBUG_LOG(("*** Pool %s overflowed initial allocation of %d (peak allocation was %d)",pool->getPoolName(),pool->getInitialBlockCount(),pool->getPeakBlockCount()));
+			}
+		}
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("End Pool Overflow Report"));
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("Begin Pool Underflow Report"));
+		DEBUG_LOG(("------------------------------------------"));
+		for (pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
+		{
+			Int peak = pool->getPeakBlockCount()*pool->getAllocationSize();
+			Int initial = pool->getInitialBlockCount()*pool->getAllocationSize();
+			if (peak < initial/2 && (initial - peak) > 4096)
+			{
+				DEBUG_LOG(("*** Pool %s used less than half its initial allocation of %d (peak allocation was %d, wasted %dk)",
+					pool->getPoolName(),pool->getInitialBlockCount(),pool->getPeakBlockCount(),(initial - peak)/1024));
+			}
+		}
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("End Pool Underflow Report"));
+		DEBUG_LOG(("------------------------------------------"));
+	}
+
+	if( flags & REPORT_SIMPLE_LEAKS )
+	{
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("Begin Simple Leak Report"));
+		DEBUG_LOG(("------------------------------------------"));
+		Int any = 0;
+		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
+		{
+			any += pool->debugPoolReportLeaks( pool->getPoolName() );
+		}
+		for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
+		{
+			any += dma->debugDmaReportLeaks();
+		}
+		DEBUG_ASSERTCRASH(!any, ("There were %d memory leaks. Please fix them.",any));
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("End Simple Leak Report"));
+		DEBUG_LOG(("------------------------------------------"));
+	}
+
+#ifdef MEMORYPOOL_CHECKPOINTING
+	if (doBlockReport)
+	{
+		const char* nm = (this == TheMemoryPoolFactory) ? "TheMemoryPoolFactory" : "*** UNKNOWN *** MemoryPoolFactory";
+
+		DEBUG_LOG_RAW(("\n"));
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("Begin Block Report for %s", nm));
+		DEBUG_LOG(("------------------------------------------"));
+		char buf[256] = "";
+		if (flags & _REPORT_CP_ALLOCATED_BEFORE) strcat(buf, "AllocBefore ");
+		if (flags & _REPORT_CP_ALLOCATED_BETWEEN) strcat(buf, "AllocBetween ");
+		if (flags & _REPORT_CP_FREED_BEFORE) strcat(buf, "FreedBefore ");
+		if (flags & _REPORT_CP_FREED_BETWEEN) strcat(buf, "FreedBetween ");
+		if (flags & _REPORT_CP_FREED_NEVER) strcat(buf, "StillExisting ");
+		DEBUG_LOG(("Options: Between checkpoints %d and %d, report on (%s)",startCheckpoint,endCheckpoint,buf));
+		DEBUG_LOG(("------------------------------------------"));
+
+		BlockCheckpointInfo::doBlockCheckpointReport( NULL, "", 0, 0, 0 );
+		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
+		{
+			pool->debugCheckpointReport(flags, startCheckpoint, endCheckpoint, pool->getPoolName());
+		}
+		for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
+		{
+			dma->debugCheckpointReport(flags, startCheckpoint, endCheckpoint, "(Oversized)");
+		}
+
+		DEBUG_LOG(("------------------------------------------"));
+		DEBUG_LOG(("End Block Report for %s", nm));
+		DEBUG_LOG(("------------------------------------------"));
+	}
+#endif
+
+#ifdef ALLOW_DEBUG_UTILS
+	DebugSetFlags(oldFlags);
+#endif
+}
+#endif
+
+//-----------------------------------------------------------------------------
+// GLOBAL FUNCTIONS
+//-----------------------------------------------------------------------------
+
+static int theLinkTester = 0;
+
+//-----------------------------------------------------------------------------
+void* STLSpecialAlloc::allocate(size_t __n)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
+	return TheDynamicMemoryAllocator->allocateBytes(__n, "STL_");
+}
+
+//-----------------------------------------------------------------------------
+void STLSpecialAlloc::deallocate(void* __p, size_t)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
+	TheDynamicMemoryAllocator->freeBytes(__p);
+}
+
+//-----------------------------------------------------------------------------
+/**
+	overload for global operator new; send requests to TheDynamicMemoryAllocator.
+*/
+void *operator new(size_t size)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
+	return TheDynamicMemoryAllocator->allocateBytes(size, "global operator new");
+}
+
+//-----------------------------------------------------------------------------
+/**
+	overload for global operator new[]; send requests to TheDynamicMemoryAllocator.
+*/
+void *operator new[](size_t size)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
+	return TheDynamicMemoryAllocator->allocateBytes(size, "global operator new[]");
+}
+
+//-----------------------------------------------------------------------------
+/**
+	overload for global operator delete; send requests to TheDynamicMemoryAllocator.
+*/
+void operator delete(void *p)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator delete"));
+	TheDynamicMemoryAllocator->freeBytes(p);
+}
+
+//-----------------------------------------------------------------------------
+/**
+	overload for global operator delete[]; send requests to TheDynamicMemoryAllocator.
+*/
+void operator delete[](void *p)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator delete"));
+	TheDynamicMemoryAllocator->freeBytes(p);
+}
+
+//-----------------------------------------------------------------------------
+/**
+	overload for global operator new (MFC debug version); send requests to TheDynamicMemoryAllocator.
+*/
+void* operator new(size_t size, const char * fname, int)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
+#ifdef MEMORYPOOL_DEBUG
+	return TheDynamicMemoryAllocator->allocateBytesImplementation(size, fname);
+#else
+	return TheDynamicMemoryAllocator->allocateBytesImplementation(size);
+#endif
+}
+
+//-----------------------------------------------------------------------------
+/**
+	overload for global operator delete (MFC debug version); send requests to TheDynamicMemoryAllocator.
+*/
+void operator delete(void * p, const char *, int)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator delete"));
+	TheDynamicMemoryAllocator->freeBytes(p);
+}
+
+//-----------------------------------------------------------------------------
+/**
+	overload for global operator new (MFC debug version); send requests to TheDynamicMemoryAllocator.
+*/
+void* operator new[](size_t size, const char * fname, int)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
+#ifdef MEMORYPOOL_DEBUG
+	return TheDynamicMemoryAllocator->allocateBytesImplementation(size, fname);
+#else
+	return TheDynamicMemoryAllocator->allocateBytesImplementation(size);
+#endif
+}
+
+//-----------------------------------------------------------------------------
+/**
+	overload for global operator delete (MFC debug version); send requests to TheDynamicMemoryAllocator.
+*/
+void operator delete[](void * p, const char *, int)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator delete"));
+	TheDynamicMemoryAllocator->freeBytes(p);
+}
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_OVERRIDE_MALLOC
+void *calloc(size_t a, size_t b)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager"));
+	return TheDynamicMemoryAllocator->allocateBytes(a * b, "calloc");
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_OVERRIDE_MALLOC
+void  free(void * p)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager"));
+	TheDynamicMemoryAllocator->freeBytes(p);
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_OVERRIDE_MALLOC
+void *malloc(size_t a)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager"));
+	return TheDynamicMemoryAllocator->allocateBytesDoNotZero(a, "malloc");
+}
+#endif
+
+//-----------------------------------------------------------------------------
+#ifdef MEMORYPOOL_OVERRIDE_MALLOC
+void *realloc(void *p, size_t s)
+{
+	DEBUG_CRASH(("realloc is evil. do not call it."));
+	throw ERROR_OUT_OF_MEMORY;
+}
+#endif
+
+//-----------------------------------------------------------------------------
+/**
+	Initialize the memory manager, and create TheMemoryPoolFactory and TheDynamicMemoryAllocator.
+*/
+void initMemoryManager()
+{
+	if (TheMemoryPoolFactory == NULL)
+	{
+		Int numSubPools;
+		const PoolInitRec *pParms;
+		userMemoryManagerGetDmaParms(&numSubPools, &pParms);
+		TheMemoryPoolFactory = new (::sysAllocateDoNotZero(sizeof(MemoryPoolFactory))) MemoryPoolFactory;	// will throw on failure
+		TheMemoryPoolFactory->init();	// will throw on failure
+		TheDynamicMemoryAllocator = TheMemoryPoolFactory->createDynamicMemoryAllocator(numSubPools, pParms);	// will throw on failure
+		userMemoryManagerInitPools();
+		thePreMainInitFlag = false;
+
+		DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+		DEBUG_LOG(("*** Initialized the Memory Manager"));
+	}
+	else
+	{
+		if (thePreMainInitFlag)
+		{
+			// quietly ignore the call
+		}
+		else
+		{
+			DEBUG_CRASH(("Memory Manager is already initialized"));
+		}
+	}
+
+	char* linktest;
+
+	theLinkTester = 0;
+
+	linktest = new char;
+	delete linktest;
+
+	linktest = new char[8];
+	delete [] linktest;
+
+	linktest = new char('\0');
+	delete linktest;
+
+#ifdef MEMORYPOOL_OVERRIDE_MALLOC
+	linktest = (char*)malloc(1);
+	free(linktest);
+
+	linktest = (char*)calloc(1,1);
+	free(linktest);
+#endif
+
+#ifdef MEMORYPOOL_OVERRIDE_MALLOC
+	if (theLinkTester != 10)
+#else
+	if (theLinkTester != 6)
+#endif
+	{
+		DEBUG_CRASH(("Wrong operator new/delete linked in! Fix this..."));
+	}
+
+	theMainInitFlag = true;
+
+}
+
+//-----------------------------------------------------------------------------
+Bool isMemoryManagerOfficiallyInited()
+{
+	return theMainInitFlag;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	Initialize the memory manager, and create TheMemoryPoolFactory and TheDynamicMemoryAllocator.
+	This is only called if memory is allocated prior to the normal call to initMemoryManager
+	(generally via a static C++ ctor).
+*/
+static void preMainInitMemoryManager()
+{
+	if (TheMemoryPoolFactory == NULL)
+	{
+
+		Int numSubPools;
+		const PoolInitRec *pParms;
+		userMemoryManagerGetDmaParms(&numSubPools, &pParms);
+		TheMemoryPoolFactory = new (::sysAllocateDoNotZero(sizeof(MemoryPoolFactory))) MemoryPoolFactory;	// will throw on failure
+		TheMemoryPoolFactory->init();	// will throw on failure
+
+		TheDynamicMemoryAllocator = TheMemoryPoolFactory->createDynamicMemoryAllocator(numSubPools, pParms);	// will throw on failure
+		userMemoryManagerInitPools();
+		thePreMainInitFlag = true;
+
+		DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+		DEBUG_LOG(("*** Initialized the Memory Manager prior to main!"));
+	}
+}
+
+//-----------------------------------------------------------------------------
+/**
+	shutdown the memory manager and discard all memory. Note: if preMainInitMemoryManager()
+	was called prior to initMemoryManager(), this call will do nothing.
+*/
+void shutdownMemoryManager()
+{
+	if (thePreMainInitFlag)
+	{
+	#ifdef MEMORYPOOL_DEBUG
+		DEBUG_LOG(("*** Memory Manager was inited prior to main -- skipping shutdown!"));
+	#endif
+	}
+	else
+	{
+		if (TheDynamicMemoryAllocator)
+		{
+			DEBUG_ASSERTCRASH(TheMemoryPoolFactory, ("hmm, no factory"));
+			if (TheMemoryPoolFactory)
+				TheMemoryPoolFactory->destroyDynamicMemoryAllocator(TheDynamicMemoryAllocator);
+			TheDynamicMemoryAllocator = NULL;
+		}
+
+		if (TheMemoryPoolFactory)
+		{
+			// this is evil... since there is no 'placement delete' we must do this the hard way
+			// and call the dtor directly. ordinarily this is heinous, but in this case we'll
+			// make an exception.
+			TheMemoryPoolFactory->~MemoryPoolFactory();
+			::sysFree((void *)TheMemoryPoolFactory);
+			TheMemoryPoolFactory = NULL;
+		}
+
+	#ifdef MEMORYPOOL_DEBUG
+		DEBUG_LOG(("Peak system allocation was %d bytes",thePeakSystemAllocationInBytes));
+		DEBUG_LOG(("Wasted DMA space (peak) was %d bytes",thePeakWastedDMA));
+		DEBUG_ASSERTCRASH(theTotalSystemAllocationInBytes == 0, ("Leaked a total of %d raw bytes", theTotalSystemAllocationInBytes));
+	#endif
+	}
+
+	theMainInitFlag = false;
+
+	DEBUG_SHUTDOWN();
+}
+
+//-----------------------------------------------------------------------------
+void* createW3DMemPool(const char *poolName, int allocationSize)
+{
+	++theLinkTester;
+	preMainInitMemoryManager();
+	MemoryPool* pool = TheMemoryPoolFactory->createMemoryPool(poolName, allocationSize, 0, 0);
+	DEBUG_ASSERTCRASH(pool && pool->getAllocationSize() == allocationSize, ("bad w3d pool"));
+	return pool;
+}
+
+//-----------------------------------------------------------------------------
+void* allocateFromW3DMemPool(void* pool, int allocationSize)
+{
+	DEBUG_ASSERTCRASH(pool, ("pool is null"));
+	DEBUG_ASSERTCRASH(pool && ((MemoryPool*)pool)->getAllocationSize() == allocationSize, ("bad w3d pool size %s",((MemoryPool*)pool)->getPoolName()));
+	return ((MemoryPool*)pool)->allocateBlock("allocateFromW3DMemPool");
+}
+
+//-----------------------------------------------------------------------------
+void* allocateFromW3DMemPool(void* pool, int allocationSize, const char* msg, int unused)
+{
+	DEBUG_ASSERTCRASH(pool, ("pool is null"));
+	DEBUG_ASSERTCRASH(pool && ((MemoryPool*)pool)->getAllocationSize() == allocationSize, ("bad w3d pool size %s",((MemoryPool*)pool)->getPoolName()));
+	return ((MemoryPool*)pool)->allocateBlock(msg);
+}
+
+//-----------------------------------------------------------------------------
+void freeFromW3DMemPool(void* pool, void* p)
+{
+	DEBUG_ASSERTCRASH(pool, ("pool is null"));
+	((MemoryPool*)pool)->freeBlock(p);
+}
diff --git a/Core/GameEngine/Source/Common/System/GameMemoryInit.cpp b/Core/GameEngine/Source/Common/System/GameMemoryInit.cpp
new file mode 100644
index 00000000000..d25872b98c6
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/GameMemoryInit.cpp
@@ -0,0 +1,148 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: MemoryInit.cpp
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:   RTS3
+//
+// File name: MemoryInit.cpp
+//
+// Created:   Steven Johnson, August 2001
+//
+// Desc:      Memory manager
+//
+// ----------------------------------------------------------------------------
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+// SYSTEM INCLUDES
+
+// USER INCLUDES
+#include "Lib/BaseType.h"
+#include "Common/GameMemory.h"
+
+struct PoolSizeRec
+{
+	const char* name;
+	Int initial;
+	Int overflow;
+};
+
+#if RTS_GENERALS
+#include "GameMemoryInitDMA_Generals.inl"
+#include "GameMemoryInitPools_Generals.inl"
+#elif RTS_ZEROHOUR
+#include "GameMemoryInitDMA_GeneralsMD.inl"
+#include "GameMemoryInitPools_GeneralsMD.inl"
+#endif
+
+//-----------------------------------------------------------------------------
+void userMemoryManagerGetDmaParms(Int *numSubPools, const PoolInitRec **pParms)
+{
+	*numSubPools = ARRAY_SIZE(DefaultDMA);
+	*pParms = DefaultDMA;
+}
+
+//-----------------------------------------------------------------------------
+void userMemoryAdjustPoolSize(const char *poolName, Int& initialAllocationCount, Int& overflowAllocationCount)
+{
+	if (initialAllocationCount > 0)
+		return;
+
+	for (const PoolSizeRec* p = PoolSizes; p->name != NULL; ++p)
+	{
+		if (strcmp(p->name, poolName) == 0)
+		{
+			initialAllocationCount = p->initial;
+			overflowAllocationCount = p->overflow;
+			return;
+		}
+	}
+
+	DEBUG_CRASH(("Initial size for pool %s not found -- you should add it to MemoryInit.cpp",poolName));
+}
+
+//-----------------------------------------------------------------------------
+static Int roundUpMemBound(Int i)
+{
+	const int MEM_BOUND_ALIGNMENT = 4;
+
+	if (i < MEM_BOUND_ALIGNMENT)
+		return MEM_BOUND_ALIGNMENT;
+	else
+		return (i + (MEM_BOUND_ALIGNMENT-1)) & ~(MEM_BOUND_ALIGNMENT-1);
+}
+
+//-----------------------------------------------------------------------------
+void userMemoryManagerInitPools()
+{
+	// note that we MUST use stdio stuff here, and not the normal game file system
+	// (with bigfile support, etc), because that relies on memory pools, which
+	// aren't yet initialized properly! so rely ONLY on straight stdio stuff here.
+	// (not even AsciiString. thanks.)
+
+	// since we're called prior to main, the cur dir might not be what
+	// we expect. so do it the hard way.
+	char buf[_MAX_PATH];
+	::GetModuleFileName(NULL, buf, sizeof(buf));
+	if (char* pEnd = strrchr(buf, '\\'))
+	{
+		*pEnd = 0;
+	}
+	strlcat(buf, "\\Data\\INI\\MemoryPools.ini", ARRAY_SIZE(buf));
+
+	FILE* fp = fopen(buf, "r");
+	if (fp)
+	{
+		char poolName[256];
+		int initial, overflow;
+		while (fgets(buf, _MAX_PATH, fp))
+		{
+			if (buf[0] == ';')
+				continue;
+			if (sscanf(buf, "%s %d %d", poolName, &initial, &overflow ) == 3)
+			{
+				for (PoolSizeRec* p = PoolSizes; p->name != NULL; ++p)
+				{
+					if (stricmp(p->name, poolName) == 0)
+					{
+						// currently, these must be multiples of 4. so round up.
+						p->initial = roundUpMemBound(initial);
+						p->overflow = roundUpMemBound(overflow);
+						break;	// from for-p
+					}
+				}
+			}
+		}
+		fclose(fp);
+	}
+}
+
diff --git a/Core/GameEngine/Source/Common/System/GameMemoryInitDMA_Generals.inl b/Core/GameEngine/Source/Common/System/GameMemoryInitDMA_Generals.inl
new file mode 100644
index 00000000000..98a7809fe08
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/GameMemoryInitDMA_Generals.inl
@@ -0,0 +1,29 @@
+/*
+**	Command & Conquer Generals(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+static const PoolInitRec DefaultDMA[] =
+{
+	//          name, allocSize, initialCount, overflowCount
+	{   "dmaPool_16",        16,        65536,          1024 },
+	{   "dmaPool_32",        32,       150000,          1024 },
+	{   "dmaPool_64",        64,        60000,          1024 },
+	{  "dmaPool_128",       128,        32768,          1024 },
+	{  "dmaPool_256",       256,         8192,          1024 },
+	{  "dmaPool_512",       512,         8192,          1024 },
+	{ "dmaPool_1024",      1024,        24000,          1024 }
+};
diff --git a/Core/GameEngine/Source/Common/System/GameMemoryInitDMA_GeneralsMD.inl b/Core/GameEngine/Source/Common/System/GameMemoryInitDMA_GeneralsMD.inl
new file mode 100644
index 00000000000..91c67d3f391
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/GameMemoryInitDMA_GeneralsMD.inl
@@ -0,0 +1,29 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+static const PoolInitRec DefaultDMA[] =
+{
+	//          name, allocSize, initialCount, overflowCount
+	{   "dmaPool_16",        16,       130000,         10000 },
+	{   "dmaPool_32",        32,       250000,         10000 },
+	{   "dmaPool_64",        64,       100000,         10000 },
+	{  "dmaPool_128",       128,        80000,         10000 },
+	{  "dmaPool_256",       256,        20000,          5000 },
+	{  "dmaPool_512",       512,        16000,          5000 },
+	{ "dmaPool_1024",      1024,         6000,          1024 }
+};
diff --git a/Core/GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl b/Core/GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl
new file mode 100644
index 00000000000..d8177c459d4
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl
@@ -0,0 +1,662 @@
+/*
+**	Command & Conquer Generals(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// And please be careful of duplicates.  They are not rejected.
+// not const -- we might override from INI
+static PoolSizeRec PoolSizes[] =
+{
+	{ "PartitionContactListNode", 2048, 512 },
+	{ "BattleshipUpdate", 32, 32 },
+	{ "FlyToDestAndDestroyUpdate", 32, 32 },
+	{ "MusicTrack", 32, 32 },
+	{ "PositionalSoundPool", 32, 32 },
+	{ "GameMessage", 2048, 32 },
+	{ "NameKeyBucketPool", 4096, 32 },
+	{ "ObjectSellInfo", 16, 16 },
+	{ "ProductionPrerequisitePool", 1024, 32 },
+	{ "RadarObject", 512, 32 },
+	{ "ResourceGatheringManager", 16, 16 },
+	{ "SightingInfo", 8192, 2048 },// Looks big, but all 3000 objects used to have 4 just built in.
+	{ "SpecialPowerTemplate", 64, 32 },
+	{ "StateMachinePool", 32, 32 },
+	{ "TeamPool", 128, 32 },	// if you increase this, increase player/team relation map pools
+	{ "PlayerRelationMapPool", 128, 32 },
+	{ "TeamRelationMapPool", 128, 32 },
+	{ "TeamPrototypePool", 256, 32 },
+	{ "TerrainType", 256, 32 },
+	{ "ThingTemplatePool", 1200, 32 },
+	{ "TunnelTracker", 16, 16 },
+	{ "Upgrade", 16, 16 },
+	{ "UpgradeTemplate", 128, 16 },
+	{ "Anim2D", 32, 32 },
+	{ "CommandButton", 300, 16 },
+	{ "CommandSet", 256, 16 },
+	{ "DisplayString", 32, 32 },
+	{ "WebBrowserURL", 16, 16 },
+	{ "Drawable", 4096, 32 },
+	{ "Image", 2048, 32 },
+	{ "ParticlePool", 4096, 256 },
+	{ "ParticleSystemTemplatePool", 768, 32 },
+	{ "ParticleSystemPool", 1024, 32 },
+	{ "TerrainRoadType", 64, 64, },
+	{ "WindowLayoutPool", 32, 32 },
+	{ "AnimatedParticleSysBoneClientUpdate", 16, 16 },
+	{ "SwayClientUpdate", 4096, 32 },
+	{ "BeaconClientUpdate", 64, 32 },
+	{ "AIGroupPool", 64, 32 },
+	{ "AIDockMachinePool", 256, 32 },
+	{ "AIGuardMachinePool", 32, 32 },
+	{ "AIGuardRetaliateMachinePool", 32, 32 },
+	{ "AITNGuardMachinePool", 32, 32 },
+	{ "PathNodePool", 8192, 1024 },
+	{ "PathPool", 256, 16 },
+	{ "WorkOrder", 32, 32 },
+	{ "TeamInQueue", 32, 32 },
+	{ "AIPlayer", 8, 8 },
+	{ "AISkirmishPlayer", 8, 8 },
+	{ "AIStateMachine",  600, 32 },
+	{ "JetAIStateMachine",  64, 32 },
+	{ "HeliAIStateMachine",  64, 32 },
+	{ "AIAttackMoveStateMachine", 2048, 32 },
+	{ "AIAttackThenIdleStateMachine", 512, 32 },
+	{ "AttackStateMachine",  512, 32 },
+	{ "CrateTemplate", 32, 32 },
+	{ "ExperienceTrackerPool", 4096, 256 },
+	{ "FiringTrackerPool", 4096, 256 },
+	{ "ObjectRepulsorHelper", 1024, 256 },
+	{ "ObjectSMCHelperPool", 4096, 256 },
+	{ "ObjectWeaponStatusHelperPool", 4096, 256 },
+	{ "ObjectDefectionHelperPool", 4096, 256 },
+	{ "StatusDamageHelper", 1500, 256 },
+	{ "SubdualDamageHelper", 1500, 256 },
+	{ "TempWeaponBonusHelper", 4096, 256 },
+	{ "Locomotor", 2048, 32 },
+	{ "LocomotorTemplate", 128, 32	},
+	{ "ObjectPool", 4096, 32 },
+	{ "SimpleObjectIteratorPool", 32, 32 },
+	{ "SimpleObjectIteratorClumpPool", 4096, 32 },
+	{ "PartitionDataPool", 4096, 32 },
+	{ "BuildEntry", 32, 32 },
+	{ "Weapon", 4096, 32 },
+	{ "WeaponTemplate", 192, 32 },
+	{ "AIUpdateInterface", 600, 32 },
+	{ "ActiveBody", 1024, 32 },
+	{ "ActiveShroudUpgrade", 32, 32 },
+	{ "AssistedTargetingUpdate", 32, 32 },
+	{ "AudioEventInfo", 1200, 64 },
+	{ "AudioRequest", 256, 8 },
+	{ "AutoHealBehavior", 4096, 32 },
+	{ "WeaponBonusUpdate", 16, 16 },
+	{ "GrantStealthBehavior", 4096, 32 },
+	{ "NeutronBlastBehavior", 4096, 32 },
+	{ "CountermeasuresBehavior", 256, 32 },
+	{ "BaseRegenerateUpdate", 64, 32 },
+	{ "BoneFXDamage", 64, 32 },
+	{ "BoneFXUpdate", 64, 32 },
+	{ "BridgeBehavior", 32, 32 },
+	{ "BridgeTowerBehavior", 32, 32 },
+	{ "BridgeScaffoldBehavior", 32, 32 },
+	{ "CaveContain", 16, 16 },
+	{ "HealContain", 32, 32 },
+	{ "CreateCrateDie", 256, 128 },
+	{ "CreateObjectDie", 1024, 32 },
+	{ "EjectPilotDie", 1024, 32 },
+	{ "CrushDie", 1024, 32 },
+	{ "DamDie", 8, 8 },
+#if USE_OBSOLETE_GENERALS_CODE
+	{ "DelayedUpgrade", 32, 32 },
+	{ "DelayedWeaponSetUpgradeUpdate", 32, 32 },
+#endif
+	{ "DeliverPayloadStateMachine", 32, 32 },
+	{ "DeliverPayloadAIUpdate", 32, 32 },
+	{ "DeletionUpdate", 128, 32 },
+	{ "SmartBombTargetHomingUpdate", 8, 8 },
+	{ "DynamicAudioEventInfo", 16, 256 }, // Note: some levels have none, some have lots. Since all are allocated at level load time, we can set this low for the levels with none.
+	{ "HackInternetStateMachine", 32, 32 },
+	{ "HackInternetAIUpdate", 32, 32 },
+	{ "MissileAIUpdate", 512, 32 },
+	{ "DumbProjectileBehavior", 64, 32 },
+	{ "DestroyDie", 1024, 32 },
+	{ "UpgradeDie", 128, 32 },
+	{ "KeepObjectDie", 128, 32 },
+	{ "DozerAIUpdate", 32, 32 },
+	{ "DynamicGeometryInfoUpdate", 16, 16 },
+	{ "DynamicShroudClearingRangeUpdate", 128, 16 },
+	{ "FXListDie", 1024, 32 },
+	{ "FireSpreadUpdate", 2048, 128 },
+	{ "FirestormDynamicGeometryInfoUpdate", 16, 16 },
+	{ "FireWeaponCollide", 2048, 32 },
+	{ "FireWeaponUpdate", 32, 32 },
+	{ "FlammableUpdate", 4096, 256 },
+	{ "FloatUpdate", 512, 128 },
+	{ "TensileFormationUpdate", 256, 32 },
+	{ "GarrisonContain", 256, 32 },
+	{ "HealCrateCollide", 32, 32 },
+	{ "HeightDieUpdate", 32, 32 },
+	{ "FireWeaponWhenDamagedBehavior", 32, 32 },
+	{ "FireWeaponWhenDeadBehavior", 64, 32 },
+	{ "GenerateMinefieldBehavior", 32, 32 },
+	{ "HelicopterSlowDeathBehavior", 64, 32 },
+	{ "ParkingPlaceBehavior", 32, 32 },
+	{ "FlightDeckBehavior", 8, 8 },
+#ifdef ALLOW_SURRENDER
+	{ "POWTruckAIUpdate", 32, 32, },
+	{ "POWTruckBehavior", 32, 32, },
+	{ "PrisonBehavior", 32, 32 },
+	{ "PrisonVisual", 32, 32 },
+	{ "PropagandaCenterBehavior", 16, 16 },
+#endif
+	{ "PropagandaTowerBehavior", 16, 16 },
+	{ "BunkerBusterBehavior", 16, 16 },
+	{ "ObjectTracker", 128, 32 },
+	{ "OCLUpdate", 16, 16 },
+	{ "BodyParticleSystem", 128, 64 },
+	{ "HighlanderBody", 2048, 128 },
+	{ "UndeadBody", 32, 32 },
+	{ "HordeUpdate", 128, 32 },
+	{ "ImmortalBody", 2048, 128 },
+	{ "InactiveBody", 2048, 32 },
+	{ "InstantDeathBehavior", 512, 32 },
+	{ "LaserUpdate", 32, 32 },
+	{ "PointDefenseLaserUpdate", 32, 32 },
+	{ "CleanupHazardUpdate", 32, 32 },
+	{ "AutoFindHealingUpdate", 256, 32 },
+	{ "CommandButtonHuntUpdate", 512, 8 },
+	{ "PilotFindVehicleUpdate", 256, 32 },
+	{ "DemoTrapUpdate", 32, 32 },
+	{ "ParticleUplinkCannonUpdate", 16, 16 },
+	{ "SpectreGunshipUpdate", 8, 8 },
+	{ "SpectreGunshipDeploymentUpdate", 8, 8 },
+	{ "BaikonurLaunchPower", 4, 4 },
+	{ "RadiusDecalUpdate", 16, 16 },
+	{ "BattlePlanUpdate", 32, 32 },
+	{ "LifetimeUpdate", 256, 32 },
+	{ "LocomotorSetUpgrade", 512, 128 },
+	{ "LockWeaponCreate", 64, 128 },
+	{ "AutoDepositUpdate", 256, 32 },
+	{ "NeutronMissileUpdate", 512, 32 },
+	{ "MoneyCrateCollide", 32, 32 },
+	{ "NeutronMissileSlowDeathBehavior", 8, 8 },
+	{ "OpenContain", 128, 32 },
+	{ "OverchargeBehavior", 32, 32 },
+	{ "OverlordContain", 32, 32 },
+	{ "HelixContain", 32, 32 },
+	{ "ParachuteContain", 128, 32 },
+	{ "PhysicsBehavior", 600, 32 },
+	{ "PoisonedBehavior", 512, 64 },
+	{ "ProductionEntry", 32, 32 },
+	{ "ProductionUpdate", 256, 32 },
+	{ "ProjectileStreamUpdate", 32, 32 },
+	{ "ProneUpdate", 128, 32 },
+	{ "QueueProductionExitUpdate", 32, 32 },
+	{ "RadarUpdate", 16, 16 },
+	{ "RadarUpgrade", 16, 16 },
+	{ "AnimationSteeringUpdate", 1024, 32 },
+	{ "SupplyWarehouseCripplingBehavior", 16, 16 },
+	{ "CostModifierUpgrade", 32, 32 },
+	{ "CashBountyPower", 32, 32 },
+	{ "CleanupAreaPower", 32, 32 },
+	{ "ObjectCreationUpgrade", 128, 32 },
+	{ "MinefieldBehavior", 256, 32 },
+	{ "JetSlowDeathBehavior", 64, 32 },
+	{ "BattleBusSlowDeathBehavior", 64, 32 },
+	{ "RebuildHoleBehavior", 64, 32 },
+	{ "RebuildHoleExposeDie", 64, 32 },
+	{ "RepairDockUpdate", 32, 32 },
+#ifdef ALLOW_SURRENDER
+	{ "PrisonDockUpdate", 32, 32 },
+#endif
+	{ "RailedTransportDockUpdate", 16, 16 },
+	{ "RailedTransportAIUpdate", 16, 16 },
+	{ "RailedTransportContain", 16, 16 },
+	{ "RailroadBehavior", 16, 16 },
+	{ "SalvageCrateCollide", 32, 32 },
+	{ "ShroudCrateCollide", 32, 32 },
+	{ "SlavedUpdate", 64, 32 },
+	{ "SlowDeathBehavior", 4096, 32 },
+	{ "SpyVisionUpdate", 16, 16 },
+	{ "DefaultProductionExitUpdate", 32, 32 },
+	{ "SpawnPointProductionExitUpdate", 32, 32 },
+	{ "SpawnBehavior", 32, 32 },
+	{ "SpecialPowerCompletionDie", 32, 32 },
+	{ "SpecialPowerCreate", 32, 32 },
+	{ "PreorderCreate", 32, 32 },
+	{ "SpecialAbility", 512, 32 },
+	{ "SpecialAbilityUpdate", 512, 32 },
+	{ "MissileLauncherBuildingUpdate", 32, 32 },
+	{ "SquishCollide", 512, 32 },
+	{ "StructureBody", 512, 64 },
+	{ "HiveStructureBody", 64, 32 }, //Stinger sites
+	{ "StructureCollapseUpdate", 32, 32 },
+	{ "StructureToppleUpdate", 32, 32 },
+	{ "SupplyCenterCreate", 32, 32 },
+	{ "SupplyCenterDockUpdate", 32, 32 },
+	{ "SupplyCenterProductionExitUpdate", 32, 32 },
+	{ "SupplyTruckStateMachine", 256, 32 },
+	{ "SupplyTruckAIUpdate", 32, 32 },
+	{ "SupplyWarehouseCreate", 32, 32 },
+	{ "SupplyWarehouseDockUpdate", 32, 32 },
+	{ "EnemyNearUpdate", 1024, 32 },
+	{ "TechBuildingBehavior", 32, 32 },
+	{ "ToppleUpdate", 2048, 32 },
+	{ "TransitionDamageFX", 256, 32 },
+	{ "TransportAIUpdate", 64, 32 },
+	{ "TransportContain", 128, 32 },
+	{ "RiderChangeContain", 128, 32 },
+	{ "InternetHackContain", 16, 16 },
+	{ "TunnelContain", 16, 16 },
+	{ "TunnelContainDie", 32, 32 },
+	{ "TunnelCreate", 32, 32 },
+	{ "TurretAI", 256, 32 },
+	{ "TurretStateMachine", 128, 32 },
+	{ "TurretSwapUpgrade", 512, 128 },
+	{ "UnitCrateCollide", 32, 32 },
+	{ "UnpauseSpecialPowerUpgrade", 32, 32 },
+	{ "VeterancyCrateCollide", 32, 32 },
+	{ "VeterancyGainCreate", 512, 128 },
+	{ "ConvertToCarBombCrateCollide", 32, 32 },
+	{ "ConvertToHijackedVehicleCrateCollide", 32, 32 },
+	{ "SabotageCommandCenterCrateCollide", 256, 128 },
+	{ "SabotageFakeBuildingCrateCollide", 256, 128 },
+	{ "SabotageInternetCenterCrateCollide", 256, 128 },
+	{ "SabotageMilitaryFactoryCrateCollide", 256, 128 },
+	{ "SabotagePowerPlantCrateCollide", 256, 128 },
+	{ "SabotageSuperweaponCrateCollide", 256, 128 },
+	{ "SabotageSupplyCenterCrateCollide", 256, 128 },
+	{ "SabotageSupplyDropzoneCrateCollide", 256, 128 },
+	{ "JetAIUpdate", 64, 32 },
+	{ "ChinookAIUpdate", 32, 32 },
+	{ "WanderAIUpdate", 32, 32 },
+	{ "WaveGuideUpdate", 16, 16 },
+	{ "WeaponBonusUpgrade", 512, 128 },
+	{ "WeaponSetUpgrade", 512, 128 },
+	{ "ArmorUpgrade", 512, 128 },
+	{ "WorkerAIUpdate", 128, 128 },
+	{ "WorkerStateMachine", 128, 128 },
+	{ "ChinookAIStateMachine", 32, 32 },
+	{ "DeployStyleAIUpdate", 32, 32 },
+	{ "AssaultTransportAIUpdate", 64, 32 },
+	{ "StreamingArchiveFile", 8, 8 },
+
+	{ "DozerActionStateMachine", 256, 32 },
+	{ "DozerPrimaryStateMachine", 256, 32 },
+	{ "W3DDisplayString", 1024, 128 },
+	{ "W3DDefaultDraw", 1024, 128 },
+	{ "W3DDebrisDraw", 1024, 128 },
+	{ "W3DDependencyModelDraw", 64, 64 },
+	{ "W3DLaserDraw", 32, 32 },
+	{ "W3DModelDraw", 4096, 128 },
+	{ "W3DOverlordTankDraw", 64, 64 },
+	{ "W3DOverlordTruckDraw", 64, 64 },
+	{ "W3DOverlordAircraftDraw", 64, 64 },
+	{ "W3DPoliceCarDraw", 32, 32 },
+	{ "W3DProjectileStreamDraw", 32, 32 },
+	{ "W3DRopeDraw", 32, 32 },
+	{ "W3DScienceModelDraw", 32, 32 },
+	{ "W3DSupplyDraw", 32, 32 },
+	{ "W3DTankDraw", 256, 32 },
+	{ "W3DTreeDraw", 16, 16 },
+	{ "W3DPropDraw", 16, 16 },
+	{ "W3DTracerDraw", 64, 32 },
+	{ "W3DTruckDraw", 128, 32 },
+	{ "W3DTankTruckDraw", 32, 16 },
+	{ "W3DTreeTextureClass", 4, 4 },
+	{ "DefaultSpecialPower", 32, 32 },
+	{ "OCLSpecialPower", 32, 32 },
+	{ "FireWeaponPower", 32, 32 },
+#ifdef ALLOW_DEMORALIZE
+	{ "DemoralizeSpecialPower", 16, 16, },
+#endif
+	{ "CashHackSpecialPower", 32, 32 },
+	{ "CommandSetUpgrade", 32, 32 },
+	{ "PassengersFireUpgrade", 32, 32 },
+	{ "GrantUpgradeCreate", 256, 32 },
+	{ "GrantScienceUpgrade", 256, 32 },
+	{ "ReplaceObjectUpgrade", 32, 32 },
+	{ "ModelConditionUpgrade", 32, 32 },
+	{ "SpyVisionSpecialPower", 256, 32 },
+	{ "StealthDetectorUpdate", 256, 32 },
+	{ "StealthUpdate", 256, 32 },
+	{ "StealthUpgrade", 256, 32 },
+	{ "StatusBitsUpgrade", 128, 128 },
+	{ "SubObjectsUpgrade", 128, 128 },
+	{ "ExperienceScalarUpgrade", 256, 128 },
+	{ "MaxHealthUpgrade", 128, 128 },
+	{ "WeaponBonusUpgrade", 128, 64 },
+	{ "StickyBombUpdate", 64, 32 },
+	{ "FireOCLAfterWeaponCooldownUpdate", 64, 32 },
+	{ "HijackerUpdate", 64, 32 },
+	{ "ChinaMinesUpgrade", 64, 32 },
+	{ "PowerPlantUpdate", 16, 16 },
+	{ "PowerPlantUpgrade", 16, 16 },
+	{ "DefectorSpecialPower", 16, 16 },
+	{ "CheckpointUpdate", 16, 16 },
+	{ "MobNexusContain", 128, 32 },
+	{ "MobMemberSlavedUpdate", 64, 32 },
+	{ "EMPUpdate", 64, 32 },
+	{ "LeafletDropBehavior", 64, 32 },
+	{ "Overridable", 32, 32 },
+
+	{ "W3DGameWindow", 1024, 32 },
+	{ "GameWindowDummy", 1024, 32 },
+	{ "SuccessState", 32, 32 },
+	{ "FailureState", 32, 32 },
+	{ "ContinueState", 32, 32 },
+	{ "SleepState", 32, 32 },
+
+	{ "AIDockWaitForClearanceState", 256, 32 },
+	{ "AIDockProcessDockState", 256, 32 },
+	{ "AIGuardInnerState", 32, 32 },
+	{ "AIGuardIdleState", 32, 32 },
+	{ "AIGuardOuterState", 32, 32 },
+	{ "AIGuardReturnState", 32, 32 },
+	{ "AIGuardPickUpCrateState", 32, 32 },
+	{ "AIGuardAttackAggressorState", 32, 32 },
+	{ "AIGuardRetaliateInnerState", 32, 32 },
+	{ "AIGuardRetaliateIdleState", 32, 32 },
+	{ "AIGuardRetaliateOuterState", 32, 32 },
+	{ "AIGuardRetaliateReturnState", 32, 32 },
+	{ "AIGuardRetaliatePickUpCrateState", 32, 32 },
+	{ "AIGuardRetaliateAttackAggressorState", 32, 32 },
+	{ "AITNGuardInnerState", 32, 32 },
+	{ "AITNGuardIdleState", 32, 32 },
+	{ "AITNGuardOuterState", 32, 32 },
+	{ "AITNGuardReturnState", 32, 32 },
+	{ "AITNGuardPickUpCrateState", 32, 32 },
+	{ "AITNGuardAttackAggressorState", 32, 32 },
+	{ "AIIdleState", 2400, 32 },
+	{ "AIRappelState", 600, 32 },
+	{ "AIBusyState", 600, 32 },
+	{ "AIWaitState", 600, 32 },
+	{ "AIAttackState", 4096, 32 },
+	{ "AIAttackSquadState", 600, 32 },
+	{ "AIDeadState", 600, 32 },
+	{ "AIDockState", 600, 32 },
+	{ "AIExitState", 600, 32 },
+	{ "AIExitInstantlyState", 600, 32 },
+	{ "AIGuardState", 600, 32 },
+	{ "AIGuardRetaliateState", 600, 32 },
+	{ "AITunnelNetworkGuardState", 600, 32 },
+	{ "AIHuntState", 600, 32 },
+	{ "AIAttackAreaState", 600, 32 },
+	{ "AIFaceState", 1200, 32 },
+	{ "ApproachState", 600, 32 },
+	{ "DeliveringState", 600, 32 },
+	{ "ConsiderNewApproachState", 600, 32 },
+	{ "RecoverFromOffMapState", 600, 32 },
+	{ "HeadOffMapState", 600, 32 },
+	{ "CleanUpState", 600, 32 },
+	{ "HackInternetState", 600, 32 },
+	{ "PackingState", 600, 32 },
+	{ "UnpackingState", 600, 32 },
+	{ "SupplyTruckWantsToPickUpOrDeliverBoxesState", 600, 32 },
+	{ "RegroupingState", 600, 32 },
+	{ "DockingState", 600, 32 },
+	{ "ChinookEvacuateState", 32, 32 },
+	{ "ChinookHeadOffMapState", 32, 32 },
+	{ "ChinookTakeoffOrLandingState", 32, 32 },
+	{ "ChinookCombatDropState", 32, 32 },
+	{ "DozerActionPickActionPosState", 256, 32 },
+	{ "DozerActionMoveToActionPosState", 256, 32 },
+	{ "DozerActionDoActionState", 256, 32 },
+	{ "DozerPrimaryIdleState", 256, 32 },
+	{ "DozerActionState", 256, 32 },
+	{ "DozerPrimaryGoingHomeState", 256, 32 },
+	{ "JetAwaitingRunwayState", 64, 32 },
+	{ "JetOrHeliCirclingDeadAirfieldState", 64, 32 },
+	{ "HeliTakeoffOrLandingState", 64, 32 },
+	{ "JetOrHeliParkOrientState", 64, 32 },
+	{ "JetOrHeliReloadAmmoState", 64, 32 },
+	{ "SupplyTruckBusyState", 600, 32 },
+	{ "SupplyTruckIdleState", 600, 32 },
+	{ "ActAsDozerState", 600, 32 },
+	{ "ActAsSupplyTruckState", 600, 32 },
+	{ "AIDockApproachState", 256, 32 },
+	{ "AIDockAdvancePositionState", 256, 32 },
+	{ "AIDockMoveToEntryState", 256, 32 },
+	{ "AIDockMoveToDockState", 256, 32 },
+	{ "AIDockMoveToExitState", 256, 32 },
+	{ "AIDockMoveToRallyState", 256, 32 },
+	{ "AIMoveToState", 600, 32 },
+	{ "AIMoveOutOfTheWayState", 600, 32 },
+	{ "AIMoveAndTightenState", 600, 32 },
+	{ "AIMoveAwayFromRepulsorsState", 600, 32 },
+	{ "AIAttackApproachTargetState", 96, 32 },
+	{ "AIAttackPursueTargetState", 96, 32 },
+	{ "AIAttackAimAtTargetState", 96, 32 },
+	{ "AIAttackFireWeaponState", 256, 32 },
+	{ "AIPickUpCrateState", 4096, 32 },
+	{ "AIFollowWaypointPathState", 1200, 32 },
+	{ "AIFollowWaypointPathExactState", 1200, 32 },
+	{ "AIWanderInPlaceState", 600, 32 },
+	{ "AIFollowPathState", 1200, 32 },
+	{ "AIMoveAndEvacuateState", 1200, 32 },
+	{ "AIMoveAndDeleteState", 600, 32 },
+	{ "AIEnterState", 600, 32 },
+	{ "JetOrHeliReturningToDeadAirfieldState", 64, 32 },
+	{ "JetOrHeliReturnForLandingState", 64, 32 },
+	{ "TurretAIIdleState", 600, 32 },
+	{ "TurretAIIdleScanState", 600, 32 },
+	{ "TurretAIAimTurretState", 600, 32 },
+	{ "TurretAIRecenterTurretState", 600, 32 },
+	{ "TurretAIHoldTurretState", 600, 32 },
+	{ "JetOrHeliTaxiState", 64, 32 },
+	{ "JetTakeoffOrLandingState", 64, 32 },
+	{ "JetPauseBeforeTakeoffState", 64, 32 },
+	{ "AIAttackMoveToState", 600, 32 },
+	{ "AIAttackFollowWaypointPathState", 1200, 32 },
+	{ "AIWanderState", 600, 32 },
+	{ "AIPanicState", 600, 32 },
+	{ "ChinookMoveToBldgState", 32, 32 },
+	{ "ChinookRecordCreationState", 32, 32 },
+	{ "ScienceInfo", 64, 32 },
+	{ "RankInfo", 32, 32 },
+
+	{ "FireWeaponNugget", 32, 32 },
+	{ "AttackNugget", 32, 32 },
+	{ "DeliverPayloadNugget", 32, 32 },
+	{ "ApplyRandomForceNugget", 32, 32 },
+	{ "GenericObjectCreationNugget", 512, 32 },
+	{ "SoundFXNugget", 256, 32 },
+	{ "TracerFXNugget", 32, 32 },
+	{ "RayEffectFXNugget", 32, 32 },
+	{ "LightPulseFXNugget", 64, 32 },
+	{ "ViewShakeFXNugget", 128, 32 },
+	{ "TerrainScorchFXNugget", 32, 32 },
+	{ "ParticleSystemFXNugget", 600, 32 },
+	{ "FXListAtBonePosFXNugget", 32, 32 },
+	{ "Squad", 256, 32 },
+	{ "BuildListInfo", 256, 32 },
+
+	{ "ScriptGroup", 128, 32 },
+	{ "OrCondition", 1024, 256 },
+	{ "ScriptAction", 2048, 512 },
+	{ "Script", 1024, 256 },
+	{ "Parameter", 8192, 1024 },
+	{ "Condition", 2048, 256 },
+	{ "Template", 32, 32 },
+	{ "ScriptList", 32, 32 },
+	{ "AttackPriorityInfo", 32, 32 },
+	{ "SequentialScript", 32, 32 },
+	{ "Win32LocalFile", 1024, 256 },
+	{ "StdLocalFile", 1024, 256 },
+	{ "RAMFile", 32, 32 },
+	{ "BattlePlanBonuses", 32, 32 },
+	{ "KindOfPercentProductionChange", 32, 32 },
+	{ "UserParser", 4096, 256 },
+	{ "XferBlockData", 32, 32 },
+	{ "EvaCheckInfo", 32, 32 },
+	{ "SuperweaponInfo", 32, 32 },
+	{ "NamedTimerInfo", 32, 32 },
+	{ "PopupMessageData", 32, 32 },
+	{ "FloatingTextData", 32, 32 },
+	{ "MapObject", 4096, 32 },
+	{ "Waypoint", 1024, 32 },
+	{ "PolygonTrigger", 128, 32 },
+	{ "Bridge", 32, 32 },
+	{ "Mapping", 128, 32 },
+	{ "OutputChunk", 32, 32 },
+	{ "InputChunk", 32, 32 },
+	{ "AnimateWindow", 32, 32 },
+	{ "GameFont", 32, 32 },
+	{ "NetCommandRef", 256, 32 },
+	{ "GameMessageArgument", 128, 32 },
+	{ "GameMessageParserArgumentType", 32, 32 },
+	{ "GameMessageParser", 32, 32 },
+	{ "WeaponBonusSet", 32, 32 },
+	{ "Campaign", 32, 32 },
+	{ "Mission", 32, 32 },
+	{ "ModalWindow", 32, 32 },
+	{ "NetPacket", 32, 32 },
+	{ "AISideInfo", 32, 32 },
+	{ "AISideBuildList", 32, 32 },
+	{ "MetaMapRec", 256, 32 },
+	{ "TransportStatus", 32, 32 },
+	{ "Anim2DTemplate", 32, 32 },
+	{ "ObjectTypes", 32, 32 },
+	{ "NetCommandList", 512, 32 },
+	{ "TurretAIData", 256, 32 },
+	{ "NetCommandMsg", 32, 32 },
+	{ "NetGameCommandMsg", 64, 32 },
+	{ "NetAckBothCommandMsg", 32, 32 },
+	{ "NetAckStage1CommandMsg", 32, 32 },
+	{ "NetAckStage2CommandMsg", 32, 32 },
+	{ "NetFrameCommandMsg", 32, 32 },
+	{ "NetPlayerLeaveCommandMsg", 32, 32 },
+	{ "NetRunAheadMetricsCommandMsg", 32, 32 },
+	{ "NetRunAheadCommandMsg", 32, 32 },
+	{ "NetDestroyPlayerCommandMsg", 32, 32 },
+	{ "NetDisconnectFrameCommandMsg", 32, 32 },
+	{ "NetDisconnectScreenOffCommandMsg", 32, 32 },
+	{ "NetFrameResendRequestCommandMsg", 32, 32 },
+	{ "NetKeepAliveCommandMsg", 32, 32 },
+	{ "NetDisconnectKeepAliveCommandMsg", 32, 32 },
+	{ "NetDisconnectPlayerCommandMsg", 32, 32 },
+	{ "NetPacketRouterQueryCommandMsg", 32, 32 },
+	{ "NetPacketRouterAckCommandMsg", 32, 32 },
+	{ "NetDisconnectChatCommandMsg", 32, 32 },
+	{ "NetChatCommandMsg", 32, 32 },
+	{ "NetDisconnectVoteCommandMsg", 32, 32 },
+	{ "NetProgressCommandMsg", 32, 32 },
+	{ "NetLoadCompleteCommandMsg", 32, 32 },
+	{ "NetTimeOutGameStartCommandMsg", 32, 32 },
+	{ "NetWrapperCommandMsg", 32, 32 },
+	{ "NetFileCommandMsg", 32, 32 },
+	{ "NetFileAnnounceCommandMsg", 32, 32 },
+	{ "NetFileProgressCommandMsg", 32, 32 },
+	{ "NetCommandWrapperListNode", 32, 32 },
+	{ "NetCommandWrapperList", 32, 32 },
+	{ "Connection", 32, 32 },
+	{ "User", 32, 32 },
+	{ "FrameDataManager", 32, 32 },
+	{ "DrawableIconInfo", 32, 32 },
+	{ "TintEnvelope", 128, 32 },
+	{ "DynamicAudioEventRTS", 1024, 256 },
+	{ "DrawableLocoInfo", 128, 32 },
+	{ "W3DPrototypeClass", 2048, 32 },
+	{ "EnumeratedIP", 32, 32 },
+	{ "WaterTransparencySetting", 4, 4 },
+	{ "WeatherSetting", 4, 4 },
+
+	// W3D pools!
+	{ "BoxPrototypeClass", 512, 32 },
+	{ "SpherePrototypeClass", 32, 32 },
+	{ "SoundRenderObjPrototypeClass", 32, 32 },
+	{ "RingPrototypeClass", 32, 32 },
+	{ "PrimitivePrototypeClass", 8192, 32 },
+	{ "HModelPrototypeClass", 256, 32 },
+	{ "ParticleEmitterPrototypeClass", 32, 32 },
+	{ "NullPrototypeClass", 32, 32 },
+	{ "HLodPrototypeClass", 512, 32 },
+	{ "HLodDefClass", 512, 32 },
+	{ "DistLODPrototypeClass", 32, 32 },
+	{ "DazzlePrototypeClass", 32, 32 },
+	{ "CollectionPrototypeClass", 32, 32 },
+	{ "BoxPrototypeClass", 256, 32 },
+	{ "AggregatePrototypeClass", 32, 32 },
+	{ "OBBoxRenderObjClass", 16384, 32 },
+	{ "AABoxRenderObjClass", 32, 32 },
+	{ "VertexMaterialClass", 16384, 32 },
+	{ "TextureClass", 1024, 32 },
+	{ "CloudMapTerrainTextureClass", 32, 32 },
+	{ "ScorchTextureClass", 32, 32 },
+	{ "LightMapTerrainTextureClass", 32, 32 },
+	{ "AlphaEdgeTextureClass", 32, 32 },
+	{ "AlphaTerrainTextureClass", 32, 32 },
+	{ "TerrainTextureClass", 32, 32 },
+	{ "MeshClass", 16384, 1024 },
+	{ "HTreeClass", 8192, 32 },
+	{ "HLodClass", 4096, 32 },
+	{ "MeshModelClass", 8192, 32 },
+	{ "ShareBufferClass", 32768, 1024 },
+	{ "AABTreeClass", 32, 32 },
+	{ "MotionChannelClass", 16384, 32 },
+	{ "BitChannelClass", 64, 32 },
+	{ "TimeCodedMotionChannelClass", 32, 32 },
+	{ "AdaptiveDeltaMotionChannelClass", 32, 32 },
+	{ "TimeCodedBitChannelClass", 32, 32 },
+	{ "UVBufferClass", 8192, 32 },
+	{ "TexBufferClass", 512, 32 },
+	{ "MatBufferClass", 512, 32 },
+	{ "MatrixMapperClass", 32, 32 },
+	{ "ScaleTextureMapperClass", 32, 32 },
+	{ "LinearOffsetTextureMapperClass", 32, 32 },
+	{ "GridTextureMapperClass", 32, 32 },
+	{ "RotateTextureMapperClass", 32, 32 },
+	{ "SineLinearOffsetTextureMapperClass", 32, 32 },
+	{ "StepLinearOffsetTextureMapperClass", 32, 32 },
+	{ "ZigZagLinearOffsetTextureMapperClass", 32, 32 },
+	{ "ClassicEnvironmentMapperClass", 32, 32 },
+	{ "EnvironmentMapperClass", 256, 32 },
+	{ "EdgeMapperClass", 32, 32 },
+	{ "WSClassicEnvironmentMapperClass", 32, 32 },
+	{ "WSEnvironmentMapperClass", 32, 32 },
+	{ "GridClassicEnvironmentMapperClass", 32, 32 },
+	{ "GridEnvironmentMapperClass", 32, 32 },
+	{ "ScreenMapperClass", 32, 32 },
+	{ "RandomTextureMapperClass", 32, 32 },
+	{ "BumpEnvTextureMapperClass", 32, 32 },
+	{ "MeshLoadContextClass", 32, 32 },
+	{ "MaterialInfoClass", 8192, 32 },
+	{ "MeshMatDescClass", 8192, 32 },
+	{ "TextureLoadTaskClass", 256, 32 },
+	{ "SortingNodeStruct", 256, 32 },
+	{ "ProxyArrayClass", 32, 32 },
+	{ "Line3DClass", 128, 32 },
+	{ "Render2DClass", 64, 32 },
+	{ "SurfaceClass", 128, 32 },
+	{ "FontCharsClassCharDataStruct", 1024, 32 },
+	{ "FontCharsBuffer", 16, 4 },
+	{ "FVFInfoClass", 128, 32 },
+	{ "TerrainTracksRenderObjClass", 128, 32 },
+	{ "DynamicIBAccessClass", 32, 32 },
+	{ "DX8IndexBufferClass", 128, 32 },
+	{ "SortingIndexBufferClass", 32, 32 },
+	{ "DX8VertexBufferClass", 128, 32 },
+	{ "SortingVertexBufferClass", 32, 32 },
+	{ "DynD3DMATERIAL8", 8192, 32 },
+	{ "DynamicMatrix3D", 512, 32 },
+	{ "MeshGeometryClass", 32, 32 },
+	{ "DynamicMeshModel", 32, 32 },
+	{ "GapFillerClass", 32, 32 },
+	{ "FontCharsClass", 64, 32 },
+	{ "ThumbnailManagerClass", 32, 32},
+	{ "SmudgeSet", 32, 32},
+	{ "Smudge", 128, 32},
+	{ 0, 0, 0 }
+};
diff --git a/Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl b/Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl
new file mode 100644
index 00000000000..f9f5b5a0a18
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl
@@ -0,0 +1,658 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// And please be careful of duplicates.  They are not rejected.
+// not const -- we might override from INI
+static PoolSizeRec PoolSizes[] =
+{
+	{ "PartitionContactListNode", 2048, 512 },
+	{ "BattleshipUpdate", 32, 32 },
+	{ "FlyToDestAndDestroyUpdate", 32, 32 },
+	{ "MusicTrack", 32, 32 },
+	{ "PositionalSoundPool", 32, 32 },
+	{ "GameMessage", 2048, 32 },
+	{ "NameKeyBucketPool", 9000, 1024 },
+	{ "ObjectSellInfo", 16, 16 },
+	{ "ProductionPrerequisitePool", 1024, 32 },
+	{ "RadarObject", 512, 32 },
+	{ "ResourceGatheringManager", 16, 16 },
+	{ "SightingInfo", 8192, 2048 },// Looks big, but all 3000 objects used to have 4 just built in.
+	{ "SpecialPowerTemplate", 84, 32 },
+	{ "StateMachinePool", 32, 32 },
+	{ "TeamPool", 128, 32 },	// if you increase this, increase player/team relation map pools
+	{ "PlayerRelationMapPool", 128, 32 },
+	{ "TeamRelationMapPool", 128, 32 },
+	{ "TeamPrototypePool", 256, 32 },
+	{ "TerrainType", 256, 32 },
+	{ "ThingTemplatePool", 2120, 32 },
+	{ "TunnelTracker", 16, 16 },
+	{ "Upgrade", 16, 16 },
+	{ "UpgradeTemplate", 128, 16 },
+	{ "Anim2D", 32, 32 },
+	{ "CommandButton", 1024, 256 },
+	{ "CommandSet", 820, 16 },
+	{ "DisplayString", 32, 32 },
+	{ "WebBrowserURL", 16, 16 },
+	{ "Drawable", 4096, 32 },
+	{ "Image", 2048, 32 },
+	{ "ParticlePool", 1400, 1024 },
+	{ "ParticleSystemTemplatePool", 1100, 32 },
+	{ "ParticleSystemPool", 1024, 32 },
+	{ "TerrainRoadType", 100, 32, },
+	{ "WindowLayoutPool", 32, 32 },
+	{ "AnimatedParticleSysBoneClientUpdate", 16, 16 },
+	{ "SwayClientUpdate", 32, 32 },
+	{ "BeaconClientUpdate", 64, 32 },
+	{ "AIGroupPool", 64, 32 },
+	{ "AIDockMachinePool", 256, 32 },
+	{ "AIGuardMachinePool", 32, 32 },
+	{ "AIGuardRetaliateMachinePool", 32, 32 },
+	{ "AITNGuardMachinePool", 32, 32 },
+	{ "PathNodePool", 8192, 1024 },
+	{ "PathPool", 256, 16 },
+	{ "WorkOrder", 32, 32 },
+	{ "TeamInQueue", 32, 32 },
+	{ "AIPlayer", 12, 4 },
+	{ "AISkirmishPlayer", 8, 8 },
+	{ "AIStateMachine",  600, 32 },
+	{ "JetAIStateMachine",  64, 32 },
+	{ "HeliAIStateMachine",  64, 32 },
+	{ "AIAttackMoveStateMachine", 2048, 32 },
+	{ "AIAttackThenIdleStateMachine", 512, 32 },
+	{ "AttackStateMachine",  512, 32 },
+	{ "CrateTemplate", 32, 32 },
+	{ "ExperienceTrackerPool", 2048, 512 },
+	{ "FiringTrackerPool", 4096, 256 },
+	{ "ObjectRepulsorHelper", 1024, 256 },
+	{ "ObjectSMCHelperPool", 2048, 256 },
+	{ "ObjectWeaponStatusHelperPool", 4096, 256 },
+	{ "ObjectDefectionHelperPool", 2048, 256 },
+	{ "StatusDamageHelper", 1500, 256 },
+	{ "SubdualDamageHelper", 1500, 256 },
+	{ "TempWeaponBonusHelper", 4096, 256 },
+	{ "Locomotor", 2048, 32 },
+	{ "LocomotorTemplate", 192, 32	},
+	{ "ObjectPool", 1500, 256 },
+	{ "SimpleObjectIteratorPool", 32, 32 },
+	{ "SimpleObjectIteratorClumpPool", 4096, 32 },
+	{ "PartitionDataPool", 2048, 512 },
+	{ "BuildEntry", 32, 32 },
+	{ "Weapon", 4096, 32 },
+	{ "WeaponTemplate", 360, 32 },
+	{ "AIUpdateInterface", 600, 32 },
+	{ "ActiveBody", 1024, 32 },
+	{ "ActiveShroudUpgrade", 32, 32 },
+	{ "AssistedTargetingUpdate", 32, 32 },
+	{ "AudioEventInfo", 4096, 64 },
+	{ "AudioRequest", 256, 8 },
+	{ "AutoHealBehavior", 1024, 256 },
+	{ "WeaponBonusUpdate", 16, 16 },
+	{ "GrantStealthBehavior", 4096, 32 },
+	{ "NeutronBlastBehavior", 4096, 32 },
+	{ "CountermeasuresBehavior", 256, 32 },
+	{ "BaseRegenerateUpdate", 128, 32 },
+	{ "BoneFXDamage", 64, 32 },
+	{ "BoneFXUpdate", 64, 32 },
+	{ "BridgeBehavior", 4, 4 },
+	{ "BridgeTowerBehavior", 32, 32 },
+	{ "BridgeScaffoldBehavior", 32, 32 },
+	{ "CaveContain", 16, 16 },
+	{ "HealContain", 32, 32 },
+	{ "CreateCrateDie", 256, 128 },
+	{ "CreateObjectDie", 1024, 32 },
+	{ "EjectPilotDie", 1024, 32 },
+	{ "CrushDie", 1024, 32 },
+	{ "DamDie", 8, 8 },
+	{ "DeliverPayloadStateMachine", 32, 32 },
+	{ "DeliverPayloadAIUpdate", 32, 32 },
+	{ "DeletionUpdate", 128, 32 },
+	{ "SmartBombTargetHomingUpdate", 8, 8 },
+	{ "DynamicAudioEventInfo", 16, 256 }, // Note: some levels have none, some have lots. Since all are allocated at level load time, we can set this low for the levels with none.
+	{ "HackInternetStateMachine", 32, 32 },
+	{ "HackInternetAIUpdate", 32, 32 },
+	{ "MissileAIUpdate", 512, 32 },
+	{ "DumbProjectileBehavior", 64, 32 },
+	{ "DestroyDie", 1024, 32 },
+	{ "UpgradeDie", 128, 32 },
+	{ "KeepObjectDie", 128, 32 },
+	{ "DozerAIUpdate", 32, 32 },
+	{ "DynamicGeometryInfoUpdate", 16, 16 },
+	{ "DynamicShroudClearingRangeUpdate", 128, 16 },
+	{ "FXListDie", 1024, 32 },
+	{ "FireSpreadUpdate", 2048, 128 },
+	{ "FirestormDynamicGeometryInfoUpdate", 16, 16 },
+	{ "FireWeaponCollide", 2048, 32 },
+	{ "FireWeaponUpdate", 32, 32 },
+	{ "FlammableUpdate", 512, 256 },
+	{ "FloatUpdate", 512, 128 },
+	{ "TensileFormationUpdate", 256, 32 },
+	{ "GarrisonContain", 256, 32 },
+	{ "HealCrateCollide", 32, 32 },
+	{ "HeightDieUpdate", 32, 32 },
+	{ "FireWeaponWhenDamagedBehavior", 32, 32 },
+	{ "FireWeaponWhenDeadBehavior", 128, 64 },
+	{ "GenerateMinefieldBehavior", 32, 32 },
+	{ "HelicopterSlowDeathBehavior", 64, 32 },
+	{ "ParkingPlaceBehavior", 32, 32 },
+	{ "FlightDeckBehavior", 8, 8 },
+#ifdef ALLOW_SURRENDER
+	{ "POWTruckAIUpdate", 32, 32, },
+	{ "POWTruckBehavior", 32, 32, },
+	{ "PrisonBehavior", 32, 32 },
+	{ "PrisonVisual", 32, 32 },
+	{ "PropagandaCenterBehavior", 16, 16 },
+#endif
+	{ "PropagandaTowerBehavior", 16, 16 },
+	{ "BunkerBusterBehavior", 16, 16 },
+	{ "ObjectTracker", 128, 32 },
+	{ "OCLUpdate", 16, 16 },
+	{ "BodyParticleSystem", 196, 64 },
+	{ "HighlanderBody", 2048, 128 },
+	{ "UndeadBody", 32, 32 },
+	{ "HordeUpdate", 128, 32 },
+	{ "ImmortalBody", 128, 256 },
+	{ "InactiveBody", 2048, 32 },
+	{ "InstantDeathBehavior", 512, 32 },
+	{ "LaserUpdate", 32, 32 },
+	{ "PointDefenseLaserUpdate", 32, 32 },
+	{ "CleanupHazardUpdate", 32, 32 },
+	{ "AutoFindHealingUpdate", 256, 32 },
+	{ "CommandButtonHuntUpdate", 512, 8 },
+	{ "PilotFindVehicleUpdate", 256, 32 },
+	{ "DemoTrapUpdate", 32, 32 },
+	{ "ParticleUplinkCannonUpdate", 16, 16 },
+	{ "SpectreGunshipUpdate", 8, 8 },
+	{ "SpectreGunshipDeploymentUpdate", 8, 8 },
+	{ "BaikonurLaunchPower", 4, 4 },
+	{ "RadiusDecalUpdate", 16, 16 },
+	{ "BattlePlanUpdate", 32, 32 },
+	{ "LifetimeUpdate", 32, 32 },
+	{ "LocomotorSetUpgrade", 512, 128 },
+	{ "LockWeaponCreate", 64, 128 },
+	{ "AutoDepositUpdate", 256, 32 },
+	{ "NeutronMissileUpdate", 512, 32 },
+	{ "MoneyCrateCollide", 48, 16 },
+	{ "NeutronMissileSlowDeathBehavior", 8, 8 },
+	{ "OpenContain", 128, 32 },
+	{ "OverchargeBehavior", 32, 32 },
+	{ "OverlordContain", 32, 32 },
+	{ "HelixContain", 32, 32 },
+	{ "ParachuteContain", 128, 32 },
+	{ "PhysicsBehavior", 600, 32 },
+	{ "PoisonedBehavior", 512, 64 },
+	{ "ProductionEntry", 32, 32 },
+	{ "ProductionUpdate", 256, 32 },
+	{ "ProjectileStreamUpdate", 32, 32 },
+	{ "ProneUpdate", 128, 32 },
+	{ "QueueProductionExitUpdate", 32, 32 },
+	{ "RadarUpdate", 16, 16 },
+	{ "RadarUpgrade", 16, 16 },
+	{ "AnimationSteeringUpdate", 1024, 32 },
+	{ "SupplyWarehouseCripplingBehavior", 16, 16 },
+	{ "CostModifierUpgrade", 32, 32 },
+	{ "CashBountyPower", 32, 32 },
+	{ "CleanupAreaPower", 32, 32 },
+	{ "ObjectCreationUpgrade", 196, 32 },
+	{ "MinefieldBehavior", 256, 32 },
+	{ "JetSlowDeathBehavior", 64, 32 },
+	{ "BattleBusSlowDeathBehavior", 64, 32 },
+	{ "RebuildHoleBehavior", 64, 32 },
+	{ "RebuildHoleExposeDie", 64, 32 },
+	{ "RepairDockUpdate", 32, 32 },
+#ifdef ALLOW_SURRENDER
+	{ "PrisonDockUpdate", 32, 32 },
+#endif
+	{ "RailedTransportDockUpdate", 16, 16 },
+	{ "RailedTransportAIUpdate", 16, 16 },
+	{ "RailedTransportContain", 16, 16 },
+	{ "RailroadBehavior", 16, 16 },
+	{ "SalvageCrateCollide", 32, 32 },
+	{ "ShroudCrateCollide", 32, 32 },
+	{ "SlavedUpdate", 64, 32 },
+	{ "SlowDeathBehavior", 1400, 256 },
+	{ "SpyVisionUpdate", 16, 16 },
+	{ "DefaultProductionExitUpdate", 32, 32 },
+	{ "SpawnPointProductionExitUpdate", 32, 32 },
+	{ "SpawnBehavior", 32, 32 },
+	{ "SpecialPowerCompletionDie", 32, 32 },
+	{ "SpecialPowerCreate", 32, 32 },
+	{ "PreorderCreate", 32, 32 },
+	{ "SpecialAbility", 512, 32 },
+	{ "SpecialAbilityUpdate", 512, 32 },
+	{ "MissileLauncherBuildingUpdate", 32, 32 },
+	{ "SquishCollide", 512, 32 },
+	{ "StructureBody", 512, 64 },
+	{ "HiveStructureBody", 64, 32 }, //Stinger sites
+	{ "StructureCollapseUpdate", 32, 32 },
+	{ "StructureToppleUpdate", 32, 32 },
+	{ "SupplyCenterCreate", 32, 32 },
+	{ "SupplyCenterDockUpdate", 32, 32 },
+	{ "SupplyCenterProductionExitUpdate", 32, 32 },
+	{ "SupplyTruckStateMachine", 256, 32 },
+	{ "SupplyTruckAIUpdate", 32, 32 },
+	{ "SupplyWarehouseCreate", 48, 16 },
+	{ "SupplyWarehouseDockUpdate", 48, 16 },
+	{ "EnemyNearUpdate", 1024, 32 },
+	{ "TechBuildingBehavior", 32, 32 },
+	{ "ToppleUpdate", 256, 128 },
+	{ "TransitionDamageFX", 384, 128 },
+	{ "TransportAIUpdate", 64, 32 },
+	{ "TransportContain", 128, 32 },
+	{ "RiderChangeContain", 128, 32 },
+	{ "InternetHackContain", 16, 16 },
+	{ "TunnelContain", 8, 8 },
+	{ "TunnelContainDie", 32, 32 },
+	{ "TunnelCreate", 32, 32 },
+	{ "TurretAI", 256, 32 },
+	{ "TurretStateMachine", 128, 32 },
+	{ "TurretSwapUpgrade", 512, 128 },
+	{ "UnitCrateCollide", 32, 32 },
+	{ "UnpauseSpecialPowerUpgrade", 32, 32 },
+	{ "VeterancyCrateCollide", 32, 32 },
+	{ "VeterancyGainCreate", 512, 128 },
+	{ "ConvertToCarBombCrateCollide", 256, 128 },
+	{ "ConvertToHijackedVehicleCrateCollide", 256, 128 },
+	{ "SabotageCommandCenterCrateCollide", 256, 128 },
+	{ "SabotageFakeBuildingCrateCollide", 256, 128 },
+	{ "SabotageInternetCenterCrateCollide", 256, 128 },
+	{ "SabotageMilitaryFactoryCrateCollide", 256, 128 },
+	{ "SabotagePowerPlantCrateCollide", 256, 128 },
+	{ "SabotageSuperweaponCrateCollide", 256, 128 },
+	{ "SabotageSupplyCenterCrateCollide", 256, 128 },
+	{ "SabotageSupplyDropzoneCrateCollide", 256, 128 },
+	{ "JetAIUpdate", 64, 32 },
+	{ "ChinookAIUpdate", 32, 32 },
+	{ "WanderAIUpdate", 32, 32 },
+	{ "WaveGuideUpdate", 16, 16 },
+	{ "WeaponBonusUpgrade", 512, 128 },
+	{ "WeaponSetUpgrade", 512, 128 },
+	{ "ArmorUpgrade", 512, 128 },
+	{ "WorkerAIUpdate", 128, 128 },
+	{ "WorkerStateMachine", 128, 128 },
+	{ "ChinookAIStateMachine", 32, 32 },
+	{ "DeployStyleAIUpdate", 32, 32 },
+	{ "AssaultTransportAIUpdate", 64, 32 },
+	{ "StreamingArchiveFile", 8, 8 },
+
+	{ "DozerActionStateMachine", 256, 32 },
+	{ "DozerPrimaryStateMachine", 256, 32 },
+	{ "W3DDisplayString", 1400, 128 },
+	{ "W3DDefaultDraw", 1024, 128 },
+	{ "W3DDebrisDraw", 128, 128 },
+	{ "W3DDependencyModelDraw", 64, 64 },
+	{ "W3DLaserDraw", 32, 32 },
+	{ "W3DModelDraw", 2048, 512 },
+	{ "W3DOverlordTankDraw", 64, 64 },
+	{ "W3DOverlordTruckDraw", 64, 64 },
+	{ "W3DOverlordAircraftDraw", 64, 64 },
+	{ "W3DPoliceCarDraw", 32, 32 },
+	{ "W3DProjectileStreamDraw", 32, 32 },
+	{ "W3DRopeDraw", 32, 32 },
+	{ "W3DScienceModelDraw", 32, 32 },
+	{ "W3DSupplyDraw", 40, 16 },
+	{ "W3DTankDraw", 256, 32 },
+	{ "W3DTreeDraw", 16, 16 },
+	{ "W3DPropDraw", 16, 16 },
+	{ "W3DTracerDraw", 64, 32 },
+	{ "W3DTruckDraw", 128, 32 },
+	{ "W3DTankTruckDraw", 32, 16 },
+	{ "W3DTreeTextureClass", 4, 4 },
+	{ "DefaultSpecialPower", 32, 32 },
+	{ "OCLSpecialPower", 96, 32 },
+	{ "FireWeaponPower", 32, 32 },
+#ifdef ALLOW_DEMORALIZE
+	{ "DemoralizeSpecialPower", 16, 16, },
+#endif
+	{ "CashHackSpecialPower", 32, 32 },
+	{ "CommandSetUpgrade", 32, 32 },
+	{ "PassengersFireUpgrade", 32, 32 },
+	{ "GrantUpgradeCreate", 256, 32 },
+	{ "GrantScienceUpgrade", 256, 32 },
+	{ "ReplaceObjectUpgrade", 32, 32 },
+	{ "ModelConditionUpgrade", 32, 32 },
+	{ "SpyVisionSpecialPower", 256, 32 },
+	{ "StealthDetectorUpdate", 256, 32 },
+	{ "StealthUpdate", 512, 128 },
+	{ "StealthUpgrade", 256, 32 },
+	{ "StatusBitsUpgrade", 128, 128 },
+	{ "SubObjectsUpgrade", 128, 128 },
+	{ "ExperienceScalarUpgrade", 256, 128 },
+	{ "MaxHealthUpgrade", 128, 128 },
+	{ "WeaponBonusUpgrade", 128, 64 },
+	{ "StickyBombUpdate", 64, 32 },
+	{ "FireOCLAfterWeaponCooldownUpdate", 64, 32 },
+	{ "HijackerUpdate", 64, 32 },
+	{ "ChinaMinesUpgrade", 64, 32 },
+	{ "PowerPlantUpdate", 48, 16 },
+	{ "PowerPlantUpgrade", 48, 16 },
+	{ "DefectorSpecialPower", 16, 16 },
+	{ "CheckpointUpdate", 16, 16 },
+	{ "MobNexusContain", 128, 32 },
+	{ "MobMemberSlavedUpdate", 64, 32 },
+	{ "EMPUpdate", 64, 32 },
+	{ "LeafletDropBehavior", 64, 32 },
+	{ "Overridable", 32, 32 },
+
+	{ "W3DGameWindow", 700, 256 },
+	{ "GameWindowDummy", 700, 256 },
+	{ "SuccessState", 32, 32 },
+	{ "FailureState", 32, 32 },
+	{ "ContinueState", 32, 32 },
+	{ "SleepState", 32, 32 },
+
+	{ "AIDockWaitForClearanceState", 256, 32 },
+	{ "AIDockProcessDockState", 256, 32 },
+	{ "AIGuardInnerState", 32, 32 },
+	{ "AIGuardIdleState", 32, 32 },
+	{ "AIGuardOuterState", 32, 32 },
+	{ "AIGuardReturnState", 32, 32 },
+	{ "AIGuardPickUpCrateState", 32, 32 },
+	{ "AIGuardAttackAggressorState", 32, 32 },
+	{ "AIGuardRetaliateInnerState", 32, 32 },
+	{ "AIGuardRetaliateIdleState", 32, 32 },
+	{ "AIGuardRetaliateOuterState", 32, 32 },
+	{ "AIGuardRetaliateReturnState", 32, 32 },
+	{ "AIGuardRetaliatePickUpCrateState", 32, 32 },
+	{ "AIGuardRetaliateAttackAggressorState", 32, 32 },
+	{ "AITNGuardInnerState", 32, 32 },
+	{ "AITNGuardIdleState", 32, 32 },
+	{ "AITNGuardOuterState", 32, 32 },
+	{ "AITNGuardReturnState", 32, 32 },
+	{ "AITNGuardPickUpCrateState", 32, 32 },
+	{ "AITNGuardAttackAggressorState", 32, 32 },
+	{ "AIIdleState", 2400, 32 },
+	{ "AIRappelState", 600, 32 },
+	{ "AIBusyState", 600, 32 },
+	{ "AIWaitState", 600, 32 },
+	{ "AIAttackState", 4096, 32 },
+	{ "AIAttackSquadState", 600, 32 },
+	{ "AIDeadState", 600, 32 },
+	{ "AIDockState", 600, 32 },
+	{ "AIExitState", 600, 32 },
+	{ "AIExitInstantlyState", 600, 32 },
+	{ "AIGuardState", 600, 32 },
+	{ "AIGuardRetaliateState", 600, 32 },
+	{ "AITunnelNetworkGuardState", 600, 32 },
+	{ "AIHuntState", 600, 32 },
+	{ "AIAttackAreaState", 600, 32 },
+	{ "AIFaceState", 1200, 32 },
+	{ "ApproachState", 600, 32 },
+	{ "DeliveringState", 600, 32 },
+	{ "ConsiderNewApproachState", 600, 32 },
+	{ "RecoverFromOffMapState", 600, 32 },
+	{ "HeadOffMapState", 600, 32 },
+	{ "CleanUpState", 600, 32 },
+	{ "HackInternetState", 600, 32 },
+	{ "PackingState", 600, 32 },
+	{ "UnpackingState", 600, 32 },
+	{ "SupplyTruckWantsToPickUpOrDeliverBoxesState", 600, 32 },
+	{ "RegroupingState", 600, 32 },
+	{ "DockingState", 600, 32 },
+	{ "ChinookEvacuateState", 32, 32 },
+	{ "ChinookHeadOffMapState", 32, 32 },
+	{ "ChinookTakeoffOrLandingState", 32, 32 },
+	{ "ChinookCombatDropState", 32, 32 },
+	{ "DozerActionPickActionPosState", 256, 32 },
+	{ "DozerActionMoveToActionPosState", 256, 32 },
+	{ "DozerActionDoActionState", 256, 32 },
+	{ "DozerPrimaryIdleState", 256, 32 },
+	{ "DozerActionState", 256, 32 },
+	{ "DozerPrimaryGoingHomeState", 256, 32 },
+	{ "JetAwaitingRunwayState", 64, 32 },
+	{ "JetOrHeliCirclingDeadAirfieldState", 64, 32 },
+	{ "HeliTakeoffOrLandingState", 64, 32 },
+	{ "JetOrHeliParkOrientState", 64, 32 },
+	{ "JetOrHeliReloadAmmoState", 64, 32 },
+	{ "SupplyTruckBusyState", 600, 32 },
+	{ "SupplyTruckIdleState", 600, 32 },
+	{ "ActAsDozerState", 600, 32 },
+	{ "ActAsSupplyTruckState", 600, 32 },
+	{ "AIDockApproachState", 256, 32 },
+	{ "AIDockAdvancePositionState", 256, 32 },
+	{ "AIDockMoveToEntryState", 256, 32 },
+	{ "AIDockMoveToDockState", 256, 32 },
+	{ "AIDockMoveToExitState", 256, 32 },
+	{ "AIDockMoveToRallyState", 256, 32 },
+	{ "AIMoveToState", 600, 32 },
+	{ "AIMoveOutOfTheWayState", 600, 32 },
+	{ "AIMoveAndTightenState", 600, 32 },
+	{ "AIMoveAwayFromRepulsorsState", 600, 32 },
+	{ "AIAttackApproachTargetState", 96, 32 },
+	{ "AIAttackPursueTargetState", 96, 32 },
+	{ "AIAttackAimAtTargetState", 96, 32 },
+	{ "AIAttackFireWeaponState", 256, 32 },
+	{ "AIPickUpCrateState", 4096, 32 },
+	{ "AIFollowWaypointPathState", 1200, 32 },
+	{ "AIFollowWaypointPathExactState", 1200, 32 },
+	{ "AIWanderInPlaceState", 600, 32 },
+	{ "AIFollowPathState", 1200, 32 },
+	{ "AIMoveAndEvacuateState", 1200, 32 },
+	{ "AIMoveAndDeleteState", 600, 32 },
+	{ "AIEnterState", 600, 32 },
+	{ "JetOrHeliReturningToDeadAirfieldState", 64, 32 },
+	{ "JetOrHeliReturnForLandingState", 64, 32 },
+	{ "TurretAIIdleState", 600, 32 },
+	{ "TurretAIIdleScanState", 600, 32 },
+	{ "TurretAIAimTurretState", 600, 32 },
+	{ "TurretAIRecenterTurretState", 600, 32 },
+	{ "TurretAIHoldTurretState", 600, 32 },
+	{ "JetOrHeliTaxiState", 64, 32 },
+	{ "JetTakeoffOrLandingState", 64, 32 },
+	{ "JetPauseBeforeTakeoffState", 64, 32 },
+	{ "AIAttackMoveToState", 600, 32 },
+	{ "AIAttackFollowWaypointPathState", 1200, 32 },
+	{ "AIWanderState", 600, 32 },
+	{ "AIPanicState", 600, 32 },
+	{ "ChinookMoveToBldgState", 32, 32 },
+	{ "ChinookRecordCreationState", 32, 32 },
+	{ "ScienceInfo", 96, 32 },
+	{ "RankInfo", 32, 32 },
+
+	{ "FireWeaponNugget", 32, 32 },
+	{ "AttackNugget", 32, 32 },
+	{ "DeliverPayloadNugget", 48, 32 },
+	{ "ApplyRandomForceNugget", 32, 32 },
+	{ "GenericObjectCreationNugget", 632, 32 },
+	{ "SoundFXNugget", 320, 32 },
+	{ "TracerFXNugget", 32, 32 },
+	{ "RayEffectFXNugget", 32, 32 },
+	{ "LightPulseFXNugget", 68, 32 },
+	{ "ViewShakeFXNugget", 140, 32 },
+	{ "TerrainScorchFXNugget", 48, 32 },
+	{ "ParticleSystemFXNugget", 832, 32 },
+	{ "FXListAtBonePosFXNugget", 32, 32 },
+	{ "Squad", 256, 32 },
+	{ "BuildListInfo", 400, 64 },
+
+	{ "ScriptGroup", 128, 32 },
+	{ "OrCondition", 1024, 256 },
+	{ "ScriptAction", 2600, 512 },
+	{ "Script", 1024, 256 },
+	{ "Parameter", 8192, 1024 },
+	{ "Condition", 2048, 256 },
+	{ "Template", 32, 32 },
+	{ "ScriptList", 32, 32 },
+	{ "AttackPriorityInfo", 32, 32 },
+	{ "SequentialScript", 32, 32 },
+	{ "Win32LocalFile", 1024, 256 },
+	{ "StdLocalFile", 1024, 256 },
+	{ "RAMFile", 32, 32 },
+	{ "BattlePlanBonuses", 32, 32 },
+	{ "KindOfPercentProductionChange", 32, 32 },
+	{ "UserParser", 4096, 256 },
+	{ "XferBlockData", 32, 32 },
+	{ "EvaCheckInfo", 52, 16 },
+	{ "SuperweaponInfo", 32, 32 },
+	{ "NamedTimerInfo", 32, 32 },
+	{ "PopupMessageData", 32, 32 },
+	{ "FloatingTextData", 32, 32 },
+	{ "MapObject", 5000, 1024 },
+	{ "Waypoint", 1024, 32 },
+	{ "PolygonTrigger", 64, 64 },
+	{ "Bridge", 32, 32 },
+	{ "Mapping", 384, 64 },
+	{ "OutputChunk", 32, 32 },
+	{ "InputChunk", 32, 32 },
+	{ "AnimateWindow", 32, 32 },
+	{ "GameFont", 32, 32 },
+	{ "NetCommandRef", 256, 32 },
+	{ "GameMessageArgument", 1024, 256 },
+	{ "GameMessageParserArgumentType", 32, 32 },
+	{ "GameMessageParser", 32, 32 },
+	{ "WeaponBonusSet", 96, 32 },
+	{ "Campaign", 32, 32 },
+	{ "Mission", 88, 32 },
+	{ "ModalWindow", 32, 32 },
+	{ "NetPacket", 32, 32 },
+	{ "AISideInfo", 32, 32 },
+	{ "AISideBuildList", 32, 32 },
+	{ "MetaMapRec", 256, 32 },
+	{ "TransportStatus", 32, 32 },
+	{ "Anim2DTemplate", 32, 32 },
+	{ "ObjectTypes", 32, 32 },
+	{ "NetCommandList", 512, 32 },
+	{ "TurretAIData", 256, 32 },
+	{ "NetCommandMsg", 32, 32 },
+	{ "NetGameCommandMsg", 64, 32 },
+	{ "NetAckBothCommandMsg", 32, 32 },
+	{ "NetAckStage1CommandMsg", 32, 32 },
+	{ "NetAckStage2CommandMsg", 32, 32 },
+	{ "NetFrameCommandMsg", 32, 32 },
+	{ "NetPlayerLeaveCommandMsg", 32, 32 },
+	{ "NetRunAheadMetricsCommandMsg", 32, 32 },
+	{ "NetRunAheadCommandMsg", 32, 32 },
+	{ "NetDestroyPlayerCommandMsg", 32, 32 },
+	{ "NetDisconnectFrameCommandMsg", 32, 32 },
+	{ "NetDisconnectScreenOffCommandMsg", 32, 32 },
+	{ "NetFrameResendRequestCommandMsg", 32, 32 },
+	{ "NetKeepAliveCommandMsg", 32, 32 },
+	{ "NetDisconnectKeepAliveCommandMsg", 32, 32 },
+	{ "NetDisconnectPlayerCommandMsg", 32, 32 },
+	{ "NetPacketRouterQueryCommandMsg", 32, 32 },
+	{ "NetPacketRouterAckCommandMsg", 32, 32 },
+	{ "NetDisconnectChatCommandMsg", 32, 32 },
+	{ "NetChatCommandMsg", 32, 32 },
+	{ "NetDisconnectVoteCommandMsg", 32, 32 },
+	{ "NetProgressCommandMsg", 32, 32 },
+	{ "NetLoadCompleteCommandMsg", 32, 32 },
+	{ "NetTimeOutGameStartCommandMsg", 32, 32 },
+	{ "NetWrapperCommandMsg", 32, 32 },
+	{ "NetFileCommandMsg", 32, 32 },
+	{ "NetFileAnnounceCommandMsg", 32, 32 },
+	{ "NetFileProgressCommandMsg", 32, 32 },
+	{ "NetCommandWrapperListNode", 32, 32 },
+	{ "NetCommandWrapperList", 32, 32 },
+	{ "Connection", 32, 32 },
+	{ "User", 32, 32 },
+	{ "FrameDataManager", 32, 32 },
+	{ "DrawableIconInfo", 32, 32 },
+	{ "TintEnvelope", 128, 32 },
+	{ "DynamicAudioEventRTS", 4000, 256 },
+	{ "DrawableLocoInfo", 128, 32 },
+	{ "W3DPrototypeClass", 512, 256 },
+	{ "EnumeratedIP", 32, 32 },
+	{ "WaterTransparencySetting", 4, 4 },
+	{ "WeatherSetting", 4, 4 },
+
+	// W3D pools!
+	{ "BoxPrototypeClass", 128, 128 },
+	{ "SpherePrototypeClass", 32, 32 },
+	{ "SoundRenderObjPrototypeClass", 32, 32 },
+	{ "RingPrototypeClass", 32, 32 },
+	{ "PrimitivePrototypeClass", 8192, 32 },
+	{ "HModelPrototypeClass", 256, 32 },
+	{ "ParticleEmitterPrototypeClass", 32, 32 },
+	{ "NullPrototypeClass", 32, 32 },
+	{ "HLodPrototypeClass", 700, 128 },
+	{ "HLodDefClass", 700, 128 },
+	{ "DistLODPrototypeClass", 32, 32 },
+	{ "DazzlePrototypeClass", 32, 32 },
+	{ "CollectionPrototypeClass", 32, 32 },
+	{ "BoxPrototypeClass", 256, 32 },
+	{ "AggregatePrototypeClass", 32, 32 },
+	{ "OBBoxRenderObjClass", 512, 128 },
+	{ "AABoxRenderObjClass", 32, 32 },
+	{ "VertexMaterialClass", 6000, 2048 },
+	{ "TextureClass", 1200, 256 },
+	{ "CloudMapTerrainTextureClass", 4, 4 },
+	{ "ScorchTextureClass", 4, 4 },
+	{ "LightMapTerrainTextureClass", 4, 4 },
+	{ "AlphaEdgeTextureClass", 4, 4 },
+	{ "AlphaTerrainTextureClass", 4, 4 },
+	{ "TerrainTextureClass", 4, 4 },
+	{ "MeshClass", 14000, 2000 },
+	{ "HTreeClass", 2048, 512 },
+	{ "HLodClass", 2048, 512 },
+	{ "MeshModelClass", 8192, 32 },
+	{ "ShareBufferClass", 32768, 1024 },
+	{ "AABTreeClass", 300, 128 },
+	{ "MotionChannelClass", 16384, 32 },
+	{ "BitChannelClass", 84, 32 },
+	{ "TimeCodedMotionChannelClass", 116, 32 },
+	{ "AdaptiveDeltaMotionChannelClass", 32, 32 },
+	{ "TimeCodedBitChannelClass", 32, 32 },
+	{ "UVBufferClass", 8192, 32 },
+	{ "TexBufferClass", 384, 128 },
+	{ "MatBufferClass", 256, 128 },
+	{ "MatrixMapperClass", 32, 32 },
+	{ "ScaleTextureMapperClass", 32, 32 },
+	{ "LinearOffsetTextureMapperClass", 96, 32 },
+	{ "GridTextureMapperClass", 32, 32 },
+	{ "RotateTextureMapperClass", 32, 32 },
+	{ "SineLinearOffsetTextureMapperClass", 32, 32 },
+	{ "StepLinearOffsetTextureMapperClass", 32, 32 },
+	{ "ZigZagLinearOffsetTextureMapperClass", 32, 32 },
+	{ "ClassicEnvironmentMapperClass", 32, 32 },
+	{ "EnvironmentMapperClass", 256, 32 },
+	{ "EdgeMapperClass", 32, 32 },
+	{ "WSClassicEnvironmentMapperClass", 32, 32 },
+	{ "WSEnvironmentMapperClass", 32, 32 },
+	{ "GridClassicEnvironmentMapperClass", 32, 32 },
+	{ "GridEnvironmentMapperClass", 32, 32 },
+	{ "ScreenMapperClass", 32, 32 },
+	{ "RandomTextureMapperClass", 32, 32 },
+	{ "BumpEnvTextureMapperClass", 32, 32 },
+	{ "MeshLoadContextClass", 4, 4 },
+	{ "MaterialInfoClass", 8192, 32 },
+	{ "MeshMatDescClass", 8192, 32 },
+	{ "TextureLoadTaskClass", 256, 32 },
+	{ "SortingNodeStruct", 288, 32 },
+	{ "ProxyArrayClass", 32, 32 },
+	{ "Line3DClass", 8, 8 },
+	{ "Render2DClass", 64, 32 },
+	{ "SurfaceClass", 128, 32 },
+	{ "FontCharsClassCharDataStruct", 1024, 32 },
+	{ "FontCharsBuffer", 16, 4 },
+	{ "FVFInfoClass", 152, 64 },
+	{ "TerrainTracksRenderObjClass", 128, 32 },
+	{ "DynamicIBAccessClass", 32, 32 },
+	{ "DX8IndexBufferClass", 128, 32 },
+	{ "SortingIndexBufferClass", 32, 32 },
+	{ "DX8VertexBufferClass", 128, 32 },
+	{ "SortingVertexBufferClass", 32, 32 },
+	{ "DynD3DMATERIAL8", 8192, 32 },
+	{ "DynamicMatrix3D", 512, 32 },
+	{ "MeshGeometryClass", 32, 32 },
+	{ "DynamicMeshModel", 32, 32 },
+	{ "GapFillerClass", 32, 32 },
+	{ "FontCharsClass", 64, 32 },
+	{ "ThumbnailManagerClass", 32, 32},
+	{ "SmudgeSet", 32, 32},
+	{ "Smudge", 128, 32},
+	{ 0, 0, 0 }
+};
diff --git a/Core/GameEngine/Source/Common/System/GameMemoryNull.cpp b/Core/GameEngine/Source/Common/System/GameMemoryNull.cpp
new file mode 100644
index 00000000000..8520a77de9b
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/GameMemoryNull.cpp
@@ -0,0 +1,218 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "PreRTS.h"
+
+#include <malloc.h>
+
+#include "Common/GameMemoryNull.h"
+
+static Bool theMainInitFlag = false;
+
+// ----------------------------------------------------------------------------
+// PUBLIC DATA
+// ----------------------------------------------------------------------------
+
+MemoryPoolFactory *TheMemoryPoolFactory = NULL;
+DynamicMemoryAllocator *TheDynamicMemoryAllocator = NULL;
+
+//-----------------------------------------------------------------------------
+// METHODS for DynamicMemoryAllocator
+//-----------------------------------------------------------------------------
+
+/**
+	allocate a chunk-o-bytes from this DMA and return it, but don't bother zeroing
+	out the block. if unable to allocate, throw ERROR_OUT_OF_MEMORY. this
+	function will never return null.
+
+  added code to make sure we're on a DWord boundary, throw exception if not
+*/
+void *DynamicMemoryAllocator::allocateBytesDoNotZeroImplementation(Int numBytes)
+{
+	void *p = malloc(numBytes);
+	if (p == NULL)
+		throw ERROR_OUT_OF_MEMORY;
+	return p;
+}
+
+/**
+	allocate a chunk-o-bytes from this DMA and return it, and zero out the contents first.
+	if unable to allocate, throw ERROR_OUT_OF_MEMORY.
+	this function will never return null.
+*/
+void *DynamicMemoryAllocator::allocateBytesImplementation(Int numBytes)
+{
+	void* p = allocateBytesDoNotZeroImplementation(numBytes);	// throws on failure
+	memset(p, 0, numBytes);
+	return p;
+}
+
+/**
+	free a chunk-o-bytes allocated by this dma. it's ok to pass null.
+*/
+void DynamicMemoryAllocator::freeBytes(void* pBlockPtr)
+{
+	free(pBlockPtr);
+}
+
+Int DynamicMemoryAllocator::getActualAllocationSize(Int numBytes)
+{
+	return numBytes;
+}
+
+#ifdef MEMORYPOOL_DEBUG
+void DynamicMemoryAllocator::debugIgnoreLeaksForThisBlock(void* pBlockPtr)
+{
+}
+#endif
+
+//-----------------------------------------------------------------------------
+// METHODS for MemoryPoolFactory
+//-----------------------------------------------------------------------------
+
+void MemoryPoolFactory::memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead )
+{
+}
+
+#ifdef MEMORYPOOL_DEBUG
+void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp )
+{
+}
+void MemoryPoolFactory::debugSetInitFillerIndex(Int index)
+{
+}
+#endif
+
+//-----------------------------------------------------------------------------
+// GLOBAL FUNCTIONS
+//-----------------------------------------------------------------------------
+
+/**
+	Initialize the memory manager, and create TheMemoryPoolFactory and TheDynamicMemoryAllocator.
+*/
+void initMemoryManager()
+{
+	if (TheMemoryPoolFactory == NULL && TheDynamicMemoryAllocator == NULL)
+	{
+		TheMemoryPoolFactory = new (malloc(sizeof MemoryPoolFactory)) MemoryPoolFactory;
+		TheDynamicMemoryAllocator = new (malloc(sizeof DynamicMemoryAllocator)) DynamicMemoryAllocator;
+
+		DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+		DEBUG_LOG(("*** Initialized the Null Memory Manager"));
+	}
+	else
+	{
+			DEBUG_CRASH(("Null Memory Manager is already initialized"));
+	}
+
+	theMainInitFlag = true;
+}
+
+//-----------------------------------------------------------------------------
+Bool isMemoryManagerOfficiallyInited()
+{
+	return theMainInitFlag;
+}
+
+//-----------------------------------------------------------------------------
+/**
+	shutdown the memory manager and discard all memory. Note: if preMainInitMemoryManager()
+	was called prior to initMemoryManager(), this call will do nothing.
+*/
+void shutdownMemoryManager()
+{
+	if (TheDynamicMemoryAllocator != NULL)
+	{
+		TheDynamicMemoryAllocator->~DynamicMemoryAllocator();
+		free((void *)TheDynamicMemoryAllocator);
+		TheDynamicMemoryAllocator = NULL;
+	}
+
+	if (TheMemoryPoolFactory != NULL)
+	{
+		TheMemoryPoolFactory->~MemoryPoolFactory();
+		free((void *)TheMemoryPoolFactory);
+		TheMemoryPoolFactory = NULL;
+	}
+
+	theMainInitFlag = false;
+
+	DEBUG_SHUTDOWN();
+}
+
+
+#ifndef DISABLE_GAMEMEMORY_NEW_OPERATORS
+
+extern void * __cdecl operator new(size_t size)
+{
+	void *p = malloc(size);
+	if (p == NULL)
+		throw ERROR_OUT_OF_MEMORY;
+	memset(p, 0, size);
+	return p;
+}
+
+extern void __cdecl operator delete(void *p)
+{
+	free(p);
+}
+
+extern void * __cdecl operator new[](size_t size)
+{
+	void *p = malloc(size);
+	if (p == NULL)
+		throw ERROR_OUT_OF_MEMORY;
+	memset(p, 0, size);
+	return p;
+}
+
+extern void __cdecl operator delete[](void *p)
+{
+	free(p);
+}
+
+// additional overloads to account for VC/MFC funky versions
+extern void* __cdecl operator new(size_t size, const char *, int)
+{
+	void *p = malloc(size);
+	if (p == NULL)
+		throw ERROR_OUT_OF_MEMORY;
+	memset(p, 0, size);
+	return p;
+}
+
+extern void __cdecl operator delete(void *p, const char *, int)
+{
+	free(p);
+}
+
+extern void* __cdecl operator new[](size_t size, const char *, int)
+{
+	void *p = malloc(size);
+	if (p == NULL)
+		throw ERROR_OUT_OF_MEMORY;
+	memset(p, 0, size);
+	return p;
+}
+
+extern void __cdecl operator delete[](void *p, const char *, int)
+{
+	free(p);
+}
+
+#endif
diff --git a/Core/GameEngine/Source/Common/System/LocalFile.cpp b/Core/GameEngine/Source/Common/System/LocalFile.cpp
new file mode 100644
index 00000000000..7ac8cd7a20b
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/LocalFile.cpp
@@ -0,0 +1,739 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   WSYS Library
+//
+// Module:    IO_
+//
+// File name: IO_LocalFile.cpp
+//
+// Created:   4/23/01
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "PreRTS.h"
+
+#include <fcntl.h>
+#include <io.h>
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "Common/LocalFile.h"
+#include "Common/RAMFile.h"
+#include "Lib/BaseType.h"
+#include "Common/PerfTimer.h"
+
+
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Data
+//----------------------------------------------------------------------------
+
+static Int s_totalOpen = 0;
+
+//----------------------------------------------------------------------------
+//         Public Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Prototypes
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Functions
+//----------------------------------------------------------------------------
+
+//=================================================================
+// LocalFile::LocalFile
+//=================================================================
+
+LocalFile::LocalFile()
+#if USE_BUFFERED_IO
+	: m_file(NULL)
+#else
+	: m_handle(-1)
+#endif
+{
+}
+
+
+//----------------------------------------------------------------------------
+//         Public Functions
+//----------------------------------------------------------------------------
+
+
+//=================================================================
+// LocalFile::~LocalFile
+//=================================================================
+
+LocalFile::~LocalFile()
+{
+	closeFile();
+}
+
+//=================================================================
+// LocalFile::open
+//=================================================================
+/**
+	* This function opens a file using the standard C open() or
+	* fopen() call. Access flags are mapped to the appropriate flags.
+	* Returns true if file was opened successfully.
+	*/
+//=================================================================
+
+//DECLARE_PERF_TIMER(LocalFile)
+Bool LocalFile::open( const Char *filename, Int access, size_t bufferSize )
+{
+	//USE_PERF_TIMER(LocalFile)
+	if( !File::open( filename, access) )
+	{
+		return FALSE;
+	}
+
+	/* here we translate WSYS file access to the std C equivalent */
+#if USE_BUFFERED_IO
+
+	// r    open for reading (The file must exist)
+	// w    open for writing (creates file if it doesn't exist). Deletes content and overwrites the file.
+	// a    open for appending (creates file if it doesn't exist).
+	// r+   open for reading and writing (The file must exist).
+	// w+   open for reading and writing.
+	//      If file exists deletes content and overwrites the file, otherwise creates an empty new file.
+	// a+   open for reading and writing (append if file exists).
+
+	const Bool write     = (m_access & WRITE) != 0;
+	const Bool readwrite = (m_access & READWRITE) == READWRITE;
+	const Bool append    = (m_access & APPEND) != 0;
+	const Bool create    = (m_access & CREATE) != 0;
+	const Bool truncate  = (m_access & TRUNCATE) != 0;
+	const Bool binary    = (m_access & BINARY) != 0;
+
+	const Char *mode = NULL;
+
+	// Mode string selection (mimics _open flag combinations)
+	// TEXT is implicit for fopen if 'b' is not present
+	if (readwrite)
+	{
+		if (append)
+			mode = binary ? "a+b" : "a+";
+		else if (truncate || create)
+			mode = binary ? "w+b" : "w+";
+		else
+			mode = binary ? "r+b" : "r+";
+	}
+	else if (write)
+	{
+		if (append)
+			mode = binary ? "ab" : "a";
+		else
+			mode = binary ? "wb" : "w";
+	}
+	else // implicitly read-only
+	{
+		mode = binary ? "rb" : "r";
+	}
+
+	m_file = fopen(filename, mode);
+	if (m_file == NULL)
+	{
+		goto error;
+	}
+
+	{
+		Int result = 0;
+
+		if (bufferSize == 0)
+		{
+			result = setvbuf(m_file, NULL, _IONBF, 0); // Uses no buffering
+		}
+		else
+		{
+			const Int bufferMode = (m_access & LINEBUF)
+				? _IOLBF // Uses line buffering
+				: _IOFBF; // Uses full buffering
+
+			// Buffer is expected to lazy allocate on first read or write later
+			result = setvbuf(m_file, NULL, bufferMode, bufferSize);
+		}
+
+		DEBUG_ASSERTCRASH(result == 0, ("LocalFile::open - setvbuf failed"));
+	}
+
+#else
+
+	int flags = 0;
+
+	if (m_access & CREATE)
+	{
+		flags |= _O_CREAT;
+	}
+	if (m_access & TRUNCATE)
+	{
+		flags |= _O_TRUNC;
+	}
+	if (m_access & APPEND)
+	{
+		flags |= _O_APPEND;
+	}
+	if (m_access & TEXT)
+	{
+		flags |= _O_TEXT;
+	}
+	if (m_access & BINARY)
+	{
+		flags |= _O_BINARY;
+	}
+
+	if((m_access & READWRITE )== READWRITE )
+	{
+		flags |= _O_RDWR;
+	}
+	else if(m_access & WRITE)
+	{
+		flags |= _O_WRONLY;
+		flags |= _O_CREAT;
+	}
+	else // implicitly read-only
+	{
+		flags |= _O_RDONLY;
+	}
+
+	m_handle = _open( filename, flags , _S_IREAD | _S_IWRITE);
+
+	if( m_handle == -1 )
+	{
+		goto error;
+	}
+
+#endif
+
+	++s_totalOpen;
+///	DEBUG_LOG(("LocalFile::open %s (total %d)",filename,s_totalOpen));
+	if ( m_access & APPEND )
+	{
+		if ( seek ( 0, END ) < 0 )
+		{
+			goto error;
+		}
+	}
+
+	return TRUE;
+
+error:
+
+	// TheSuperHackers @fix Instance must never delete itself in this function.
+	closeWithoutDelete();
+
+	return FALSE;
+}
+
+//=================================================================
+// LocalFile::close
+//=================================================================
+/**
+	* Closes the current file if it is open.
+  * Must call LocalFile::close() for each successful LocalFile::open() call.
+	*/
+//=================================================================
+
+void LocalFile::close( void )
+{
+	closeFile();
+	File::close();
+}
+
+//=================================================================
+
+void LocalFile::closeWithoutDelete()
+{
+	closeFile();
+	File::closeWithoutDelete();
+}
+
+//=================================================================
+
+void LocalFile::closeFile()
+{
+#if USE_BUFFERED_IO
+	if (m_file)
+	{
+		fclose(m_file);
+		m_file = NULL;
+		--s_totalOpen;
+	}
+#else
+	if( m_handle != -1 )
+	{
+		_close( m_handle );
+		m_handle = -1;
+		--s_totalOpen;
+	}
+#endif
+}
+
+//=================================================================
+// LocalFile::read
+//=================================================================
+
+Int LocalFile::read( void *buffer, Int bytes )
+{
+	//USE_PERF_TIMER(LocalFile)
+	if( !m_open )
+	{
+		return -1;
+	}
+
+	if (buffer == NULL)
+	{
+#if USE_BUFFERED_IO
+		fseek(m_file, bytes, SEEK_CUR);
+#else
+		_lseek(m_handle, bytes, SEEK_CUR);
+#endif
+		return bytes;
+	}
+
+#if USE_BUFFERED_IO
+	Int ret = fread(buffer, 1, bytes, m_file);
+#else
+	Int ret = _read( m_handle, buffer, bytes );
+#endif
+
+	return ret;
+}
+
+//=================================================================
+// LocalFile::readChar
+//=================================================================
+
+Int LocalFile::readChar( )
+{
+	Char character = '\0';
+
+	Int ret = read( &character, sizeof(character) );
+
+	if (ret == sizeof(character))
+		return (Int)character;
+
+	return EOF;
+}
+
+//=================================================================
+// LocalFile::readWideChar
+//=================================================================
+
+Int LocalFile::readWideChar( )
+{
+	WideChar character = L'\0';
+
+	Int ret = read( &character, sizeof(character) );
+
+	if (ret == sizeof(character))
+		return (Int)character;
+
+	return WEOF;
+}
+
+//=================================================================
+// LocalFile::write
+//=================================================================
+
+Int LocalFile::write( const void *buffer, Int bytes )
+{
+
+	if( !m_open || !buffer )
+	{
+		return -1;
+	}
+
+#if USE_BUFFERED_IO
+	Int ret = fwrite(buffer, 1, bytes, m_file);
+#else
+	Int ret = _write( m_handle, buffer, bytes );
+#endif
+	return ret;
+}
+
+//=================================================================
+// LocalFile::writeFormat - Ascii
+//=================================================================
+
+Int LocalFile::writeFormat( const Char* format, ... )
+{
+	char buffer[1024];
+
+	va_list args;
+	va_start(args, format);
+	Int length = vsnprintf(buffer, sizeof(buffer), format, args);
+	va_end(args);
+
+	return write( buffer, length );
+}
+
+//=================================================================
+// LocalFile::writeFormat - Wide character
+//=================================================================
+
+Int LocalFile::writeFormat( const WideChar* format, ... )
+{
+	WideChar buffer[1024];
+
+	va_list args;
+	va_start(args, format);
+	Int length = vswprintf(buffer, sizeof(buffer) / sizeof(WideChar), format, args);
+	va_end(args);
+
+	return write( buffer, length * sizeof(WideChar) );
+}
+
+//=================================================================
+// LocalFile::writeChar - Ascii
+//=================================================================
+
+Int LocalFile::writeChar( const Char* character )
+{
+	if ( write( character, sizeof(Char) ) == sizeof(Char) ) {
+		return (Int)character;
+	}
+
+	return EOF;
+}
+
+//=================================================================
+// LocalFile::writeChar - Wide character
+//=================================================================
+
+Int LocalFile::writeChar( const WideChar* character )
+{
+	if ( write( character, sizeof(WideChar) ) == sizeof(WideChar) ) {
+		return (Int)character;
+	}
+
+	return WEOF;
+}
+
+//=================================================================
+// LocalFile::seek
+//=================================================================
+
+Int LocalFile::seek( Int pos, seekMode mode)
+{
+	int lmode;
+
+	switch( mode )
+	{
+		case START:
+			DEBUG_ASSERTCRASH(pos >= 0, ("LocalFile::seek - pos must be >= 0 when seeking from the beginning of the file"));
+			lmode = SEEK_SET;
+			break;
+		case CURRENT:
+			lmode = SEEK_CUR;
+			break;
+		case END:
+			lmode = SEEK_END;
+			break;
+		default:
+			DEBUG_CRASH(("LocalFile::seek - bad seek mode"));
+			return -1;
+	}
+
+#if USE_BUFFERED_IO
+	Int ret = fseek(m_file, pos, lmode);
+	if (ret == 0)
+		return ftell(m_file);
+	else
+		return -1;
+#else
+	Int ret = _lseek( m_handle, pos, lmode );
+#endif
+	return ret;
+}
+
+//=================================================================
+// LocalFile::flush
+//=================================================================
+
+Bool LocalFile::flush()
+{
+	return fflush(m_file) != EOF;
+}
+
+//=================================================================
+// LocalFile::scanInt
+//=================================================================
+// skips preceding whitespace and stops at the first non-number
+// or at EOF
+Bool LocalFile::scanInt(Int &newInt)
+{
+	newInt = 0;
+	AsciiString tempstr;
+	Char c;
+	Int val;
+
+	// skip preceding non-numeric characters
+	do {
+#if USE_BUFFERED_IO
+		val = fread(&c, 1, 1, m_file);
+#else
+		val = _read( m_handle, &c, 1);
+#endif
+	} while ((val != 0) && (((c < '0') || (c > '9')) && (c != '-')));
+
+	if (val == 0) {
+		return FALSE;
+	}
+
+	do {
+		tempstr.concat(c);
+#if USE_BUFFERED_IO
+		val = fread(&c, 1, 1, m_file);
+#else
+		val = _read( m_handle, &c, 1);
+#endif
+	} while ((val != 0) && ((c >= '0') && (c <= '9')));
+
+	// put the last read char back, since we didn't use it.
+	if (val != 0) {
+#if USE_BUFFERED_IO
+		fseek(m_file, -1, SEEK_CUR);
+#else
+		_lseek(m_handle, -1, SEEK_CUR);
+#endif
+	}
+
+	newInt = atoi(tempstr.str());
+	return TRUE;
+}
+
+//=================================================================
+// LocalFile::scanReal
+//=================================================================
+// skips preceding whitespace and stops at the first non-number
+// or at EOF
+Bool LocalFile::scanReal(Real &newReal)
+{
+	newReal = 0.0;
+	AsciiString tempstr;
+	Char c;
+	Int val;
+	Bool sawDec = FALSE;
+
+	// skip the preceding white space
+	do {
+#if USE_BUFFERED_IO
+		val = fread(&c, 1, 1, m_file);
+#else
+		val = _read( m_handle, &c, 1);
+#endif
+	} while ((val != 0) && (((c < '0') || (c > '9')) && (c != '-') && (c != '.')));
+
+	if (val == 0) {
+		return FALSE;
+	}
+
+	do {
+		tempstr.concat(c);
+		if (c == '.') {
+			sawDec = TRUE;
+		}
+#if USE_BUFFERED_IO
+		val = fread(&c, 1, 1, m_file);
+#else
+		val = _read(m_handle, &c, 1);
+#endif
+	} while ((val != 0) && (((c >= '0') && (c <= '9')) || ((c == '.') && !sawDec)));
+
+	if (val != 0) {
+#if USE_BUFFERED_IO
+		fseek(m_file, -1, SEEK_CUR);
+#else
+		_lseek(m_handle, -1, SEEK_CUR);
+#endif
+	}
+
+	newReal = atof(tempstr.str());
+	return TRUE;
+}
+
+//=================================================================
+// LocalFile::scanString
+//=================================================================
+// skips preceding whitespace and stops at the first whitespace
+// or at EOF
+Bool LocalFile::scanString(AsciiString &newString)
+{
+	Char c;
+	Int val;
+
+	newString.clear();
+
+	// skip the preceding whitespace
+	do {
+#if USE_BUFFERED_IO
+		val = fread(&c, 1, 1, m_file);
+#else
+		val = _read(m_handle, &c, 1);
+#endif
+	} while ((val != 0) && (isspace(c)));
+
+	if (val == 0) {
+		return FALSE;
+	}
+
+	do {
+		newString.concat(c);
+#if USE_BUFFERED_IO
+		val = fread(&c, 1, 1, m_file);
+#else
+		val = _read(m_handle, &c, 1);
+#endif
+	} while ((val != 0) && (!isspace(c)));
+
+	if (val != 0) {
+#if USE_BUFFERED_IO
+		fseek(m_file, -1, SEEK_CUR);
+#else
+		_lseek(m_handle, -1, SEEK_CUR);
+#endif
+	}
+
+	return TRUE;
+}
+
+//=================================================================
+// LocalFile::nextLine
+//=================================================================
+// scans to the first character after a new-line or at EOF
+void LocalFile::nextLine(Char *buf, Int bufSize)
+{
+	Char c = 0;
+	Int val;
+	Int i = 0;
+
+	// seek to the next new-line.
+	do {
+		if ((buf == NULL) || (i >= (bufSize-1))) {
+#if USE_BUFFERED_IO
+			val = fread(&c, 1, 1, m_file);
+#else
+			val = _read(m_handle, &c, 1);
+#endif
+		} else {
+#if USE_BUFFERED_IO
+			val = fread(buf + i, 1, 1, m_file);
+#else
+			val = _read(m_handle, buf + i, 1);
+#endif
+			c = buf[i];
+		}
+		++i;
+	} while ((val != 0) && (c != '\n'));
+
+	if (buf != NULL) {
+		if (i < bufSize) {
+			buf[i] = 0;
+		} else {
+			buf[bufSize] = 0;
+		}
+	}
+}
+
+//=================================================================
+//=================================================================
+File* LocalFile::convertToRAMFile()
+{
+	RAMFile *ramFile = newInstance( RAMFile );
+	if (ramFile->open(this))
+	{
+		if (this->m_deleteOnClose)
+		{
+			ramFile->deleteOnClose();
+		}
+		deleteInstance(this);
+		return ramFile;
+	}
+	else
+	{
+		deleteInstance(ramFile);
+		return this;
+	}
+}
+
+//=================================================================
+// LocalFile::readEntireAndClose
+//=================================================================
+/**
+	Allocate a buffer large enough to hold entire file, read
+	the entire file into the buffer, then close the file.
+	the buffer is owned by the caller, who is responsible
+	for freeing is (via delete[]). This is a Good Thing to
+	use because it minimizes memory copies for BIG files.
+*/
+char* LocalFile::readEntireAndClose()
+{
+	UnsignedInt fileSize = size();
+	char* buffer = NEW char[fileSize];
+
+	read(buffer, fileSize);
+
+	close();
+
+	return buffer;
+}
diff --git a/Core/GameEngine/Source/Common/System/LocalFileSystem.cpp b/Core/GameEngine/Source/Common/System/LocalFileSystem.cpp
new file mode 100644
index 00000000000..af6b19329b8
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/LocalFileSystem.cpp
@@ -0,0 +1,103 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   Game Engine
+//
+// Module:    IO
+//
+// File name: LocalFileSystem.cpp
+//
+// Created:   4/23/01
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "PreRTS.h"
+#include "Common/LocalFileSystem.h"
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Data
+//----------------------------------------------------------------------------
+
+
+//----------------------------------------------------------------------------
+//         Public Data
+//----------------------------------------------------------------------------
+
+LocalFileSystem *TheLocalFileSystem = NULL;
+
+//----------------------------------------------------------------------------
+//         Private Prototypes
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Functions
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Functions
+//----------------------------------------------------------------------------
+
+void LocalFileSystem::init() {
+}
+
+void LocalFileSystem::reset() {
+}
+
+void LocalFileSystem::update() {
+}
diff --git a/Core/GameEngine/Source/Common/System/MiniDumper.cpp b/Core/GameEngine/Source/Common/System/MiniDumper.cpp
new file mode 100644
index 00000000000..21ab80e578a
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/MiniDumper.cpp
@@ -0,0 +1,461 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#ifdef RTS_ENABLE_CRASHDUMP
+#include "Common/MiniDumper.h"
+#include <wctype.h>
+#include "gitinfo.h"
+
+// Globals for storing the pointer to the exception
+_EXCEPTION_POINTERS* g_dumpException = NULL;
+DWORD g_dumpExceptionThreadId = 0;
+
+MiniDumper* TheMiniDumper = NULL;
+
+// Globals containing state about the current exception that's used for context in the mini dump.
+// These are populated by MiniDumper::DumpingExceptionFilter to store a copy of the exception in case it goes out of scope
+_EXCEPTION_POINTERS g_exceptionPointers = { 0 };
+EXCEPTION_RECORD g_exceptionRecord = { 0 };
+CONTEXT g_exceptionContext = { 0 };
+
+constexpr const char* DumpFileNamePrefix = "Crash";
+
+void MiniDumper::initMiniDumper(const AsciiString& userDirPath)
+{
+	DEBUG_ASSERTCRASH(TheMiniDumper == NULL, ("MiniDumper::initMiniDumper called on already created instance"));
+
+	// Use placement new on the process heap so TheMiniDumper is placed outside the MemoryPoolFactory managed area.
+	// If the crash is due to corrupted MemoryPoolFactory structures, try to mitigate the chances of MiniDumper memory also being corrupted
+	TheMiniDumper = new (::HeapAlloc(::GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(MiniDumper))) MiniDumper;
+	TheMiniDumper->Initialize(userDirPath);
+}
+
+void MiniDumper::shutdownMiniDumper()
+{
+	if (TheMiniDumper)
+	{
+		TheMiniDumper->ShutDown();
+		TheMiniDumper->~MiniDumper();
+		::HeapFree(::GetProcessHeap(), NULL, TheMiniDumper);
+		TheMiniDumper = NULL;
+	}
+}
+
+MiniDumper::MiniDumper()
+{
+	m_miniDumpInitialized = false;
+	m_loadedDbgHelp = false;
+	m_requestedDumpType = DumpType_Minimal;
+	m_dumpRequested = NULL;
+	m_dumpComplete = NULL;
+	m_quitting = NULL;
+	m_dumpThread = NULL;
+	m_dumpThreadId = 0;
+	m_dumpDir[0] = 0;
+	m_dumpFile[0] = 0;
+	m_executablePath[0] = 0;
+};
+
+LONG WINAPI MiniDumper::DumpingExceptionFilter(_EXCEPTION_POINTERS* e_info)
+{
+	// Store the exception info in the global variables for later use by the dumping thread
+	g_exceptionRecord = *(e_info->ExceptionRecord);
+	g_exceptionContext = *(e_info->ContextRecord);
+	g_exceptionPointers.ContextRecord = &g_exceptionContext;
+	g_exceptionPointers.ExceptionRecord = &g_exceptionRecord;
+	g_dumpException = &g_exceptionPointers;
+
+	return EXCEPTION_EXECUTE_HANDLER;
+}
+
+void MiniDumper::TriggerMiniDump(DumpType dumpType)
+{
+	if (!m_miniDumpInitialized)
+	{
+		DEBUG_LOG(("MiniDumper::TriggerMiniDump: Attempted to use an uninitialized instance."));
+		return;
+	}
+
+	__try
+	{
+		// Use DebugBreak to raise an exception that can be caught in the __except block
+		::DebugBreak();
+	}
+	__except (DumpingExceptionFilter(GetExceptionInformation()))
+	{
+		TriggerMiniDumpForException(g_dumpException, dumpType);
+	}
+}
+
+void MiniDumper::TriggerMiniDumpForException(_EXCEPTION_POINTERS* e_info, DumpType dumpType)
+{
+	if (!m_miniDumpInitialized)
+	{
+		DEBUG_LOG(("MiniDumper::TriggerMiniDumpForException: Attempted to use an uninitialized instance."));
+		return;
+	}
+
+	g_dumpException = e_info;
+	g_dumpExceptionThreadId = ::GetCurrentThreadId();
+	m_requestedDumpType = dumpType;
+
+	DEBUG_ASSERTCRASH(IsDumpThreadStillRunning(), ("MiniDumper::TriggerMiniDumpForException: Dumping thread has exited."));
+	::SetEvent(m_dumpRequested);
+	DWORD wait = ::WaitForSingleObject(m_dumpComplete, INFINITE);
+	if (wait != WAIT_OBJECT_0)
+	{
+		if (wait == WAIT_FAILED)
+		{
+			DEBUG_LOG(("MiniDumper::TriggerMiniDumpForException: Waiting for minidump triggering failed: status=%u, error=%u", wait, ::GetLastError()));
+		}
+		else
+		{
+			DEBUG_LOG(("MiniDumper::TriggerMiniDumpForException: Waiting for minidump triggering failed: status=%u", wait));
+		}
+	}
+
+	::ResetEvent(m_dumpComplete);
+}
+
+void MiniDumper::Initialize(const AsciiString& userDirPath)
+{
+	m_loadedDbgHelp = DbgHelpLoader::load();
+
+	// We want to only use the dbghelp.dll from the OS installation, as the one bundled with the game does not support MiniDump functionality
+	if (!(m_loadedDbgHelp && DbgHelpLoader::isLoadedFromSystem()))
+	{
+		DEBUG_LOG(("MiniDumper::Initialize: Unable to load system-provided dbghelp.dll, minidump functionality disabled."));
+		return;
+	}
+
+	DWORD executableSize = ::GetModuleFileNameW(NULL, m_executablePath, ARRAY_SIZE(m_executablePath));
+	if (executableSize == 0 || executableSize == ARRAY_SIZE(m_executablePath))
+	{
+		DEBUG_LOG(("MiniDumper::Initialize: Could not get executable file name. Returned value=%u", executableSize));
+		return;
+	}
+
+	// Create & store dump folder
+	if (!InitializeDumpDirectory(userDirPath))
+	{
+		return;
+	}
+
+	m_dumpRequested = CreateEvent(NULL, TRUE, FALSE, NULL);
+	m_dumpComplete = CreateEvent(NULL, TRUE, FALSE, NULL);
+	m_quitting = CreateEvent(NULL, TRUE, FALSE, NULL);
+
+	if (m_dumpRequested == NULL || m_dumpComplete == NULL || m_quitting == NULL)
+	{
+		// Something went wrong with the creation of the events..
+		DEBUG_LOG(("MiniDumper::Initialize: Unable to create events: error=%u", ::GetLastError()));
+		return;
+	}
+
+	m_dumpThread = ::CreateThread(NULL, 0, MiniDumpThreadProc, this, CREATE_SUSPENDED, &m_dumpThreadId);
+	if (!m_dumpThread)
+	{
+		DEBUG_LOG(("MiniDumper::Initialize: Unable to create thread: error=%u", ::GetLastError()));
+		return;
+	}
+
+	if (::ResumeThread(m_dumpThread) != 1)
+	{
+		DEBUG_LOG(("MiniDumper::Initialize: Unable to resume thread: error=%u", ::GetLastError()));
+		return;
+	}
+
+	DEBUG_LOG(("MiniDumper::Initialize: Configured to store crash dumps in '%s'", m_dumpDir));
+	m_miniDumpInitialized = true;
+}
+
+Bool MiniDumper::IsInitialized() const
+{
+	return m_miniDumpInitialized;
+}
+
+Bool MiniDumper::IsDumpThreadStillRunning() const
+{
+	DWORD exitCode;
+	if (m_dumpThread != NULL && ::GetExitCodeThread(m_dumpThread, &exitCode) && exitCode == STILL_ACTIVE)
+	{
+		return true;
+	}
+
+	return false;
+}
+
+Bool MiniDumper::InitializeDumpDirectory(const AsciiString& userDirPath)
+{
+	constexpr const Int MaxFullFileCount = 2;
+	constexpr const Int MaxMiniFileCount = 10;
+
+	strlcpy(m_dumpDir, userDirPath.str(), ARRAY_SIZE(m_dumpDir));
+	strlcat(m_dumpDir, "CrashDumps\\", ARRAY_SIZE(m_dumpDir));
+	if (::_access(m_dumpDir, 0) != 0)
+	{
+		if (!::CreateDirectory(m_dumpDir, NULL))
+		{
+			DEBUG_LOG(("MiniDumper::Initialize: Unable to create path for crash dumps at '%s': error=%u", m_dumpDir, ::GetLastError()));
+			return false;
+		}
+	}
+
+	// Clean up old files (we keep a maximum of 10 small, 2 full)
+	KeepNewestFiles(m_dumpDir, DumpType_Full, MaxFullFileCount);
+	KeepNewestFiles(m_dumpDir, DumpType_Minimal, MaxMiniFileCount);
+
+	return true;
+}
+
+void MiniDumper::ShutdownDumpThread()
+{
+	if (IsDumpThreadStillRunning())
+	{
+		DEBUG_ASSERTCRASH(m_quitting != NULL, ("MiniDumper::ShutdownDumpThread: Dump thread still running despite m_quitting being NULL"));
+		::SetEvent(m_quitting);
+
+		DWORD waitRet = ::WaitForSingleObject(m_dumpThread, 3000);
+		switch (waitRet)
+		{
+		case WAIT_OBJECT_0:
+			// Wait for thread exit was successful
+			break;
+		case WAIT_TIMEOUT:
+			DEBUG_LOG(("MiniDumper::ShutdownDumpThread: Waiting for dumping thread to exit timed out, killing thread", waitRet));
+			::TerminateThread(m_dumpThread, MiniDumperExitCode_ForcedTerminate);
+			break;
+		case WAIT_FAILED:
+			DEBUG_LOG(("MiniDumper::ShutdownDumpThread: Waiting for minidump triggering failed: status=%u, error=%u", waitRet, ::GetLastError()));
+			break;
+		default:
+			DEBUG_LOG(("MiniDumper::ShutdownDumpThread: Waiting for minidump triggering failed: status=%u", waitRet));
+			break;
+		}
+	}
+}
+
+void MiniDumper::ShutDown()
+{
+	ShutdownDumpThread();
+
+	if (m_dumpThread != NULL)
+	{
+		DEBUG_ASSERTCRASH(!IsDumpThreadStillRunning(), ("MiniDumper::ShutDown: ShutdownDumpThread() was unable to stop Dump thread"));
+		::CloseHandle(m_dumpThread);
+		m_dumpThread = NULL;
+	}
+
+	if (m_quitting != NULL)
+	{
+		::CloseHandle(m_quitting);
+		m_quitting = NULL;
+	}
+
+	if (m_dumpComplete != NULL)
+	{
+		::CloseHandle(m_dumpComplete);
+		m_dumpComplete = NULL;
+	}
+
+	if (m_dumpRequested != NULL)
+	{
+		::CloseHandle(m_dumpRequested);
+		m_dumpRequested = NULL;
+	}
+
+	if (m_loadedDbgHelp)
+	{
+		DbgHelpLoader::unload();
+		m_loadedDbgHelp = false;
+	}
+
+	m_miniDumpInitialized = false;
+}
+
+DWORD MiniDumper::ThreadProcInternal()
+{
+	while (true)
+	{
+		HANDLE waitEvents[2] = { m_dumpRequested, m_quitting };
+		DWORD event = ::WaitForMultipleObjects(ARRAY_SIZE(waitEvents), waitEvents, FALSE, INFINITE);
+		switch (event)
+		{
+		case WAIT_OBJECT_0 + 0:
+			// A dump is requested (m_dumpRequested)
+			::ResetEvent(m_dumpComplete);
+			CreateMiniDump(m_requestedDumpType);
+			::ResetEvent(m_dumpRequested);
+			::SetEvent(m_dumpComplete);
+			break;
+		case WAIT_OBJECT_0 + 1:
+			// Quit (m_quitting)
+			return MiniDumperExitCode_Success;
+		case WAIT_FAILED:
+			DEBUG_LOG(("MiniDumper::ThreadProcInternal: Waiting for events failed: status=%u, error=%u", event, ::GetLastError()));
+			return MiniDumperExitCode_FailureWait;
+		default:
+			DEBUG_LOG(("MiniDumper::ThreadProcInternal: Waiting for events failed: status=%u", event));
+			return MiniDumperExitCode_FailureWait;
+		}
+	}
+}
+
+DWORD WINAPI MiniDumper::MiniDumpThreadProc(LPVOID lpParam)
+{
+	if (lpParam == NULL)
+	{
+		DEBUG_LOG(("MiniDumper::MiniDumpThreadProc: The provided parameter was NULL, exiting thread."));
+		return MiniDumperExitCode_FailureParam;
+	}
+
+	MiniDumper* dumper = static_cast<MiniDumper *>(lpParam);
+	return dumper->ThreadProcInternal();
+}
+
+
+void MiniDumper::CreateMiniDump(DumpType dumpType)
+{
+	// Create a unique dump file name, using the path from m_dumpDir, in m_dumpFile
+	SYSTEMTIME sysTime;
+	::GetLocalTime(&sysTime);
+#if RTS_GENERALS
+	const Char product = 'G';
+#elif RTS_ZEROHOUR
+	const Char product = 'Z';
+#endif
+	Char dumpTypeSpecifier = static_cast<Char>(dumpType);
+	DWORD currentProcessId = ::GetCurrentProcessId();
+
+	// m_dumpDir is stored with trailing backslash in Initialize
+	snprintf(m_dumpFile, ARRAY_SIZE(m_dumpFile), "%s%s%c%c-%04d%02d%02d-%02d%02d%02d-%s-pid%ld.dmp",
+		m_dumpDir, DumpFileNamePrefix, dumpTypeSpecifier, product, sysTime.wYear, sysTime.wMonth,
+		sysTime.wDay, sysTime.wHour, sysTime.wMinute, sysTime.wSecond,
+		GitShortSHA1, currentProcessId);
+
+	HANDLE dumpFile = ::CreateFile(m_dumpFile, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (dumpFile == NULL || dumpFile == INVALID_HANDLE_VALUE)
+	{
+		DEBUG_LOG(("MiniDumper::CreateMiniDump: Unable to create dump file '%s': error=%u", m_dumpFile, ::GetLastError()));
+		return;
+	}
+
+	PMINIDUMP_EXCEPTION_INFORMATION exceptionInfoPtr = NULL;
+	MINIDUMP_EXCEPTION_INFORMATION exceptionInfo = { 0 };
+	if (g_dumpException != NULL)
+	{
+		exceptionInfo.ExceptionPointers = g_dumpException;
+		exceptionInfo.ThreadId = g_dumpExceptionThreadId;
+		exceptionInfo.ClientPointers = FALSE;
+		exceptionInfoPtr = &exceptionInfo;
+	}
+
+	int dumpTypeFlags = MiniDumpNormal;
+	switch (dumpType)
+	{
+	case DumpType_Full:
+		dumpTypeFlags |= MiniDumpWithFullMemory | MiniDumpWithDataSegs | MiniDumpWithHandleData |
+			MiniDumpWithThreadInfo | MiniDumpWithFullMemoryInfo | MiniDumpWithPrivateReadWriteMemory;
+		FALLTHROUGH;
+	case DumpType_Minimal:
+		dumpTypeFlags |= MiniDumpWithIndirectlyReferencedMemory | MiniDumpScanMemory;
+		break;
+	}
+
+	MINIDUMP_TYPE miniDumpType = static_cast<MINIDUMP_TYPE>(dumpTypeFlags);
+	BOOL success = DbgHelpLoader::miniDumpWriteDump(
+		::GetCurrentProcess(),
+		currentProcessId,
+		dumpFile,
+		miniDumpType,
+		exceptionInfoPtr,
+		NULL,
+		NULL);
+
+	if (!success)
+	{
+		DEBUG_LOG(("MiniDumper::CreateMiniDump: Unable to write minidump file '%s': error=%u", m_dumpFile, ::GetLastError()));
+	}
+	else
+	{
+		DEBUG_LOG(("MiniDumper::CreateMiniDump: Successfully wrote minidump file to '%s'", m_dumpFile));
+	}
+
+	::CloseHandle(dumpFile);
+}
+
+// Comparator for sorting files by last modified time (newest first)
+bool MiniDumper::CompareByLastWriteTime(const FileInfo& a, const FileInfo& b)
+{
+	return ::CompareFileTime(&a.lastWriteTime, &b.lastWriteTime) > 0;
+}
+
+void MiniDumper::KeepNewestFiles(const std::string& directory, const DumpType dumpType, const Int keepCount)
+{
+	// directory already contains trailing backslash
+	std::string searchPath = directory + DumpFileNamePrefix + static_cast<Char>(dumpType) + "*";
+	WIN32_FIND_DATA findData;
+	HANDLE hFind = ::FindFirstFile(searchPath.c_str(), &findData);
+
+	if (hFind == INVALID_HANDLE_VALUE)
+	{
+		if (::GetLastError() != ERROR_FILE_NOT_FOUND)
+		{
+			DEBUG_LOG(("MiniDumper::KeepNewestFiles: Unable to find files in directory '%s': error=%u", searchPath.c_str(), ::GetLastError()));
+		}
+
+		return;
+	}
+
+	std::vector<FileInfo> files;
+	do
+	{
+		if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+		{
+			continue;
+		}
+
+		// Store file info
+		FileInfo fileInfo;
+		fileInfo.name = directory + findData.cFileName;
+		fileInfo.lastWriteTime = findData.ftLastWriteTime;
+		files.push_back(fileInfo);
+
+	} while (::FindNextFile(hFind, &findData));
+
+	::FindClose(hFind);
+
+	// Sort files by last modified time in descending order
+	std::sort(files.begin(), files.end(), CompareByLastWriteTime);
+
+	// Delete files beyond the newest keepCount
+	for (size_t i = keepCount; i < files.size(); ++i)
+	{
+		if (::DeleteFile(files[i].name.c_str()))
+		{
+			DEBUG_LOG(("MiniDumper::KeepNewestFiles: Deleted old dump file '%s'.", files[i].name.c_str()));
+		}
+		else
+		{
+			DEBUG_LOG(("MiniDumper::KeepNewestFiles: Failed to delete file '%s': error=%u", files[i].name.c_str(), ::GetLastError()));
+		}
+	}
+}
+#endif
diff --git a/Core/GameEngine/Source/Common/System/ObjectStatusTypes.cpp b/Core/GameEngine/Source/Common/System/ObjectStatusTypes.cpp
new file mode 100644
index 00000000000..ab689ad343c
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/ObjectStatusTypes.cpp
@@ -0,0 +1,88 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: ObjectStatusTypes.cpp ////////////////////////////////////////////////////////////////////
+// Author: Kris, May 2003
+// Desc:   Object status types that are stackable using the BitSet system. Used to be ObjectStatusBits
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "PreRTS.h"
+
+#include "Common/ObjectStatusTypes.h"
+#include "Common/BitFlagsIO.h"
+
+template<>
+const char* const ObjectStatusMaskType::s_bitNameList[] =
+{
+	"NONE",
+	"DESTROYED",
+	"CAN_ATTACK",
+	"UNDER_CONSTRUCTION",
+	"UNSELECTABLE",
+	"NO_COLLISIONS",
+	"NO_ATTACK",
+	"AIRBORNE_TARGET",
+	"PARACHUTING",
+	"REPULSOR",
+	"HIJACKED",
+	"AFLAME",
+	"BURNED",
+	"WET",
+	"IS_FIRING_WEAPON",
+	"IS_BRAKING",
+	"STEALTHED",
+	"DETECTED",
+	"CAN_STEALTH",
+	"SOLD",
+	"UNDERGOING_REPAIR",
+	"RECONSTRUCTING",
+	"MASKED",
+	"IS_ATTACKING",
+	"USING_ABILITY",
+	"IS_AIMING_WEAPON",
+	"NO_ATTACK_FROM_AI",
+	"IGNORING_STEALTH",
+	"IS_CARBOMB",
+	// TheSuperHackers @info New statuses added in Zero Hour
+	"DECK_HEIGHT_OFFSET",
+	"STATUS_RIDER1",
+	"STATUS_RIDER2",
+	"STATUS_RIDER3",
+	"STATUS_RIDER4",
+	"STATUS_RIDER5",
+	"STATUS_RIDER6",
+	"STATUS_RIDER7",
+	"STATUS_RIDER8",
+	"FAERIE_FIRE",
+  "KILLING_SELF",
+	"REASSIGN_PARKING",
+	"BOOBY_TRAPPED",
+	"IMMOBILE",
+	"DISGUISED",
+	"DEPLOYED",
+	NULL
+};
+static_assert(ARRAY_SIZE(ObjectStatusMaskType::s_bitNameList) == ObjectStatusMaskType::NumBits + 1, "Incorrect array size");
+
+ObjectStatusMaskType OBJECT_STATUS_MASK_NONE;	// inits to all zeroes
diff --git a/Core/GameEngine/Source/Common/System/RAMFile.cpp b/Core/GameEngine/Source/Common/System/RAMFile.cpp
new file mode 100644
index 00000000000..93d5994b451
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/RAMFile.cpp
@@ -0,0 +1,564 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   WSYS Library
+//
+// Module:    IO
+//
+// File name: WSYS_RAMFile.cpp
+//
+// Created:   11/08/01
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "PreRTS.h"
+
+#include <fcntl.h>
+#include <io.h>
+#include <sys/stat.h>
+
+#include "Common/AsciiString.h"
+#include "Common/FileSystem.h"
+#include "Common/RAMFile.h"
+#include "Common/PerfTimer.h"
+
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Prototypes
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Functions
+//----------------------------------------------------------------------------
+
+//=================================================================
+// RAMFile::RAMFile
+//=================================================================
+
+RAMFile::RAMFile()
+: m_size(0),
+	m_data(NULL),
+	m_pos(0)
+{
+
+}
+
+
+//----------------------------------------------------------------------------
+//         Public Functions
+//----------------------------------------------------------------------------
+
+
+//=================================================================
+// RAMFile::~RAMFile
+//=================================================================
+
+RAMFile::~RAMFile()
+{
+	closeFile();
+}
+
+//=================================================================
+// RAMFile::open
+//=================================================================
+/**
+	* This function opens a file using the standard C open() or
+	* fopen() call. Access flags are mapped to the appropriate flags.
+	* Returns true if file was opened successfully.
+	*/
+//=================================================================
+
+//DECLARE_PERF_TIMER(RAMFile)
+Bool RAMFile::open( const Char *filename, Int access, size_t bufferSize )
+{
+	//USE_PERF_TIMER(RAMFile)
+
+	bufferSize = 0; // RAM File needs no file buffer because it is read in one go.
+
+	File *file = TheFileSystem->openFile( filename, access, bufferSize );
+
+	if ( file == NULL )
+	{
+		return FALSE;
+	}
+
+	Bool result = open( file );
+
+	file->close();
+
+	return result;
+}
+
+//============================================================================
+// RAMFile::open
+//============================================================================
+
+Bool RAMFile::open( File *file )
+{
+	//USE_PERF_TIMER(RAMFile)
+	if ( file == NULL )
+	{
+		return NULL;
+	}
+
+	const Int access = file->getAccess();
+
+	if ( !File::open( file->getName(), access ))
+	{
+		return FALSE;
+	}
+
+	// read whole file in to memory
+	m_size = file->size();
+	m_data = MSGNEW("RAMFILE") char [ m_size ];	// pool[]ify
+
+	if ( m_data == NULL )
+	{
+		return FALSE;
+	}
+
+	m_size = file->read( m_data, m_size );
+
+	if ( m_size < 0 )
+	{
+		delete [] m_data;
+		m_data = NULL;
+		return FALSE;
+	}
+
+	m_pos = 0;
+
+	return TRUE;
+}
+
+//============================================================================
+// RAMFile::openFromArchive
+//============================================================================
+Bool RAMFile::openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size)
+{
+	//USE_PERF_TIMER(RAMFile)
+	if (archiveFile == NULL) {
+		return FALSE;
+	}
+
+	if (File::open(filename.str(), File::READ | File::BINARY) == FALSE) {
+		return FALSE;
+	}
+
+	delete[] m_data;
+	m_data = MSGNEW("RAMFILE") Char [size];	// pool[]ify
+	m_size = size;
+
+	if (archiveFile->seek(offset, File::START) != offset) {
+		return FALSE;
+	}
+	if (archiveFile->read(m_data, size) != size) {
+		return FALSE;
+	}
+	m_nameStr = filename;
+
+	return TRUE;
+}
+
+//=================================================================
+// RAMFile::close
+//=================================================================
+/**
+	* Closes the current file if it is open.
+  * Must call RAMFile::close() for each successful RAMFile::open() call.
+	*/
+//=================================================================
+
+void RAMFile::close( void )
+{
+	closeFile();
+	File::close();
+}
+
+//=================================================================
+
+void RAMFile::closeFile()
+{
+	delete [] m_data;
+	m_data = NULL;
+}
+
+//=================================================================
+// RAMFile::read
+//=================================================================
+// if buffer is null, just advance the current position by 'bytes'
+Int RAMFile::read( void *buffer, Int bytes )
+{
+	if( m_data == NULL )
+	{
+		return -1;
+	}
+
+	Int bytesLeft = m_size - m_pos ;
+
+	if ( bytes > bytesLeft )
+	{
+		bytes = bytesLeft;
+	}
+
+	if (( bytes > 0 ) && ( buffer != NULL ))
+	{
+		memcpy ( buffer, &m_data[m_pos], bytes );
+	}
+
+	m_pos += bytes;
+
+	return bytes;
+}
+
+//=================================================================
+// RAMFile::readChar
+//=================================================================
+
+Int RAMFile::readChar( )
+{
+	return EOF;
+}
+
+//=================================================================
+// RAMFile::readWideChar
+//=================================================================
+
+Int RAMFile::readWideChar( )
+{
+	return WEOF;
+}
+
+//=================================================================
+// RAMFile::write
+//=================================================================
+
+Int RAMFile::write( const void *buffer, Int bytes )
+{
+	return -1;
+}
+
+//=================================================================
+// RAMFile::writeFormat - Ascii
+//=================================================================
+
+Int RAMFile::writeFormat( const Char* format, ... )
+{
+	return -1;
+}
+
+//=================================================================
+// RAMFile::writeFormat - Wide character
+//=================================================================
+
+Int RAMFile::writeFormat( const WideChar* format, ... )
+{
+	return -1;
+}
+
+//=================================================================
+// RAMFile::writeChar - Ascii
+//=================================================================
+
+Int RAMFile::writeChar( const Char* character )
+{
+	return EOF;
+}
+
+//=================================================================
+// RAMFile::writeChar - Wide character
+//=================================================================
+
+Int RAMFile::writeChar( const WideChar* character )
+{
+	return WEOF;
+}
+
+//=================================================================
+// RAMFile::seek
+//=================================================================
+
+Int RAMFile::seek( Int pos, seekMode mode)
+{
+	Int newPos;
+
+	switch( mode )
+	{
+		case START:
+			newPos = pos;
+			break;
+		case CURRENT:
+			newPos = m_pos + pos;
+			break;
+		case END:
+			DEBUG_ASSERTCRASH(pos <= 0, ("RAMFile::seek - position should be <= 0 for a seek starting from the end."));
+			newPos = m_size + pos;
+			break;
+		default:
+			// bad seek mode
+			return -1;
+	}
+
+	if ( newPos < 0 )
+	{
+		newPos = 0;
+	}
+	else if ( newPos > m_size )
+	{
+		newPos = m_size;
+	}
+
+	m_pos = newPos;
+
+	return m_pos;
+
+}
+
+//=================================================================
+// RAMFile::flush
+//=================================================================
+
+Bool RAMFile::flush()
+{
+	return false;
+}
+
+//=================================================================
+// RAMFile::scanInt
+//=================================================================
+Bool RAMFile::scanInt(Int &newInt)
+{
+	newInt = 0;
+	AsciiString tempstr;
+
+	while ((m_pos < m_size) && ((m_data[m_pos] < '0') || (m_data[m_pos] > '9')) && (m_data[m_pos] != '-')) {
+		++m_pos;
+	}
+
+	if (m_pos >= m_size) {
+		m_pos = m_size;
+		return FALSE;
+	}
+
+	do {
+		tempstr.concat(m_data[m_pos]);
+		++m_pos;
+	} while ((m_pos < m_size) && ((m_data[m_pos] >= '0') && (m_data[m_pos] <= '9')));
+
+//	if (m_pos < m_size) {
+//		--m_pos;
+//	}
+
+	newInt = atoi(tempstr.str());
+	return TRUE;
+}
+
+//=================================================================
+// RAMFile::scanInt
+//=================================================================
+Bool RAMFile::scanReal(Real &newReal)
+{
+	newReal = 0.0;
+	AsciiString tempstr;
+	Bool sawDec = FALSE;
+
+	while ((m_pos < m_size) && ((m_data[m_pos] < '0') || (m_data[m_pos] > '9')) && (m_data[m_pos] != '-') && (m_data[m_pos] != '.')) {
+		++m_pos;
+	}
+
+	if (m_pos >= m_size) {
+		m_pos = m_size;
+		return FALSE;
+	}
+
+	do {
+		tempstr.concat(m_data[m_pos]);
+		if (m_data[m_pos] == '.') {
+			sawDec = TRUE;
+		}
+		++m_pos;
+	} while ((m_pos < m_size) && (((m_data[m_pos] >= '0') && (m_data[m_pos] <= '9')) || ((m_data[m_pos] == '.') && !sawDec)));
+
+//	if (m_pos < m_size) {
+//		--m_pos;
+//	}
+
+	newReal = atof(tempstr.str());
+	return TRUE;
+}
+
+//=================================================================
+// RAMFile::scanString
+//=================================================================
+Bool RAMFile::scanString(AsciiString &newString)
+{
+	newString.clear();
+
+	while ((m_pos < m_size) && isspace(m_data[m_pos])) {
+		++m_pos;
+	}
+
+	if (m_pos >= m_size) {
+		m_pos = m_size;
+		return FALSE;
+	}
+
+	do {
+		newString.concat(m_data[m_pos]);
+		++m_pos;
+	} while ((m_pos < m_size) && (!isspace(m_data[m_pos])));
+
+	return TRUE;
+}
+
+//=================================================================
+// RAMFile::nextLine
+//=================================================================
+void RAMFile::nextLine(Char *buf, Int bufSize)
+{
+	Int i = 0;
+	// seek to the next new-line character
+	while ((m_pos < m_size) && (m_data[m_pos] != '\n')) {
+		if ((buf != NULL) && (i < (bufSize-1))) {
+			buf[i] = m_data[m_pos];
+			++i;
+		}
+		++m_pos;
+	}
+
+	// we got to the new-line character, now go one past it.
+	if (m_pos < m_size) {
+		if ((buf != NULL) && (i < bufSize)) {
+			buf[i] = m_data[m_pos];
+			++i;
+		}
+		++m_pos;
+	}
+	if (buf != NULL) {
+		if (i < bufSize) {
+			buf[i] = 0;
+		} else {
+			buf[bufSize] = 0;
+		}
+	}
+	if (m_pos >= m_size) {
+		m_pos = m_size;
+	}
+}
+
+//=================================================================
+// RAMFile::nextLine
+//=================================================================
+Bool RAMFile::copyDataToFile(File *localFile)
+{
+	if (localFile == NULL) {
+		return FALSE;
+	}
+
+	if (localFile->write(m_data, m_size) == m_size) {
+		return TRUE;
+	}
+
+
+	return FALSE;
+}
+
+//=================================================================
+//=================================================================
+File* RAMFile::convertToRAMFile()
+{
+	return this;
+}
+
+//=================================================================
+// RAMFile::readEntireAndClose
+//=================================================================
+/**
+	Allocate a buffer large enough to hold entire file, read
+	the entire file into the buffer, then close the file.
+	the buffer is owned by the caller, who is responsible
+	for freeing is (via delete[]). This is a Good Thing to
+	use because it minimizes memory copies for BIG files.
+*/
+char* RAMFile::readEntireAndClose()
+{
+
+	if (m_data == NULL)
+	{
+		DEBUG_CRASH(("m_data is NULL in RAMFile::readEntireAndClose -- should not happen!"));
+		return NEW char[1];	// just to avoid crashing...
+	}
+
+	char* tmp = m_data;
+	m_data = NULL;	// will belong to our caller!
+
+	close();
+
+	return tmp;
+}
diff --git a/Core/GameEngine/Source/Common/System/Radar.cpp b/Core/GameEngine/Source/Common/System/Radar.cpp
new file mode 100644
index 00000000000..86ac2046b84
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/Radar.cpp
@@ -0,0 +1,1655 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: Radar.cpp ////////////////////////////////////////////////////////////////////////////////
+// Author: Colin Day, January 2002
+// Desc:   Radar logic implementation
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/GameAudio.h"
+#include "Common/GameState.h"
+#include "Common/GameUtility.h"
+#include "Common/MiscAudio.h"
+#include "Common/Radar.h"
+#include "Common/Player.h"
+#include "Common/PlayerList.h"
+#include "Common/ThingTemplate.h"
+#include "Common/GlobalData.h"
+#include "Common/Xfer.h"
+
+#include "GameClient/Drawable.h"
+#include "GameClient/Eva.h"
+#include "GameClient/GameWindowManager.h"
+#include "GameClient/InGameUI.h"
+#include "GameClient/ControlBar.h"
+
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/Object.h"
+#include "GameLogic/PartitionManager.h"
+#include "GameLogic/TerrainLogic.h"
+#include "GameLogic/Module/ContainModule.h"
+#include "GameLogic/Module/StealthUpdate.h"
+
+
+// GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
+Radar *TheRadar = NULL;  ///< the radar global singleton
+
+// PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
+#define RADAR_QUEUE_TERRAIN_REFRESH_DELAY (LOGICFRAMES_PER_SECOND * 3.0f)
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void Radar::deleteList( RadarObject **list )
+{
+	while( *list )
+	{
+		RadarObject *nextObject = (*list)->friend_getNext();
+		(*list)->friend_getObject()->friend_setRadarData( NULL );
+		deleteInstance(*list);
+		*list = nextObject;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Delete list resources used by the radar and return them to the memory pools */
+//-------------------------------------------------------------------------------------------------
+void Radar::deleteListResources( void )
+{
+	deleteList(&m_objectList);
+	deleteList(&m_localObjectList);
+	deleteList(&m_localHeroObjectList);
+
+#ifdef DEBUG_CRASHING
+	for( Object *obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() )
+	{
+		DEBUG_ASSERTCRASH( obj->friend_getRadarData() == NULL,
+			("Radar::deleteListResources: Unexpectedly an object still has radar data assigned") );
+	}
+#endif
+}
+
+// PUBLIC METHODS /////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+RadarObject::RadarObject( void )
+{
+
+	m_object = NULL;
+	m_next = NULL;
+	m_color = GameMakeColor( 255, 255, 255, 255 );
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+RadarObject::~RadarObject( void )
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+Bool RadarObject::isTemporarilyHidden() const
+{
+	return isTemporarilyHidden(m_object);
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+Bool RadarObject::isTemporarilyHidden(const Object* obj)
+{
+	Drawable* draw = obj->getDrawable();
+	if (draw == NULL || draw->getStealthLook() == STEALTHLOOK_INVISIBLE || draw->isDrawableEffectivelyHidden())
+		return true;
+
+	return false;
+}
+
+// ------------------------------------------------------------------------------------------------
+/** CRC */
+// ------------------------------------------------------------------------------------------------
+void RadarObject::crc( Xfer *xfer )
+{
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Xfer method
+	* Version Info:
+	* 1: Initial version */
+// ------------------------------------------------------------------------------------------------
+void RadarObject::xfer( Xfer *xfer )
+{
+
+	// version
+	XferVersion currentVersion = 1;
+	XferVersion version = currentVersion;
+	xfer->xferVersion( &version, currentVersion );
+
+	// object id
+	ObjectID objectID = m_object ? m_object->getID() : INVALID_ID;
+	xfer->xferObjectID( &objectID );
+	if( xfer->getXferMode() == XFER_LOAD )
+	{
+
+		// find the object and save
+		m_object = TheGameLogic->findObjectByID( objectID );
+		if( m_object == NULL )
+		{
+
+			DEBUG_CRASH(( "RadarObject::xfer - Unable to find object for radar data" ));
+			throw SC_INVALID_DATA;
+
+		}
+
+		// tell the object we now have some radar data
+		m_object->friend_setRadarData( this );
+
+	}
+
+	// color
+	xfer->xferColor( &m_color );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Load post process */
+// ------------------------------------------------------------------------------------------------
+void RadarObject::loadPostProcess( void )
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+Radar::Radar( void )
+{
+
+	m_radarWindow = NULL;
+	m_objectList = NULL;
+	m_localObjectList = NULL;
+	m_localHeroObjectList = NULL;
+	std::fill(m_radarHidden, m_radarHidden + ARRAY_SIZE(m_radarHidden), false);
+	std::fill(m_radarForceOn, m_radarForceOn + ARRAY_SIZE(m_radarForceOn), false);
+	m_terrainAverageZ = 0.0f;
+	m_waterAverageZ = 0.0f;
+	m_xSample = 0.0f;
+	m_ySample = 0.0f;
+	m_mapExtent.lo.x = 0.0f;
+	m_mapExtent.lo.y = 0.0f;
+	m_mapExtent.lo.z = 0.0f;
+	m_mapExtent.hi.x = 0.0f;
+	m_mapExtent.hi.y = 0.0f;
+	m_mapExtent.hi.z = 0.0f;
+	m_queueTerrainRefreshFrame = 0;
+
+	// clear the radar events
+	clearAllEvents();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+Radar::~Radar( void )
+{
+
+	// delete list resources
+	deleteListResources();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Clear all radar events */
+//-------------------------------------------------------------------------------------------------
+void Radar::clearAllEvents( void )
+{
+
+	// set next free index to the first one
+	m_nextFreeRadarEvent = 0;
+	m_lastRadarEvent = -1;
+
+	// zero out all data
+	for( Int i = 0; i < MAX_RADAR_EVENTS; ++i )
+	{
+
+		m_event[ i ].type = RADAR_EVENT_INVALID;
+		m_event[ i ].active = FALSE;
+		m_event[ i ].createFrame = 0;
+		m_event[ i ].dieFrame = 0;
+		m_event[ i ].fadeFrame = 0;
+		m_event[ i ].color1.red = 0;
+		m_event[ i ].color1.green = 0;
+		m_event[ i ].color1.blue = 0;
+		m_event[ i ].color2.red = 0;
+		m_event[ i ].color2.green = 0;
+		m_event[ i ].color2.blue = 0;
+		m_event[ i ].worldLoc.x = 0.0f;
+		m_event[ i ].worldLoc.y = 0.0f;
+		m_event[ i ].worldLoc.z = 0.0f;
+		m_event[ i ].radarLoc.x = 0;
+		m_event[ i ].radarLoc.y = 0;
+		m_event[ i ].soundPlayed = FALSE;
+
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Reset radar data */
+//-------------------------------------------------------------------------------------------------
+void Radar::reset( void )
+{
+
+	// delete list resources
+	deleteListResources();
+
+	// clear all events
+	clearAllEvents();
+
+	// TheSuperHackers @todo Reset m_radarHidden?
+	//std::fill(m_radarHidden, m_radarHidden + ARRAY_SIZE(m_radarHidden), false);
+
+	// stop forcing the radar on
+	std::fill(m_radarForceOn, m_radarForceOn + ARRAY_SIZE(m_radarForceOn), false);
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Radar per frame update */
+//-------------------------------------------------------------------------------------------------
+void Radar::update( void )
+{
+	Int i;
+	UnsignedInt thisFrame = TheGameLogic->getFrame();
+
+	//
+	// traverse the radar event list, if an event has a creationFrame it means that it
+	// exists ... check to see if it's time for that event to die and if so, just clear
+	// out the active status
+	//
+	for( i = 0; i < MAX_RADAR_EVENTS; i++ )
+	{
+
+		if( m_event[ i ].active == TRUE && m_event[ i ].createFrame &&
+				thisFrame > m_event[ i ].dieFrame )
+			m_event[ i ].active = FALSE;
+
+	}
+
+	// see if we should refresh the terrain
+	if( m_queueTerrainRefreshFrame != 0 &&
+			TheGameLogic->getFrame() - m_queueTerrainRefreshFrame > RADAR_QUEUE_TERRAIN_REFRESH_DELAY )
+	{
+
+		// refresh the terrain
+		refreshTerrain( TheTerrainLogic );
+
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Reset the radar for the new map data being given to it */
+//-------------------------------------------------------------------------------------------------
+void Radar::newMap( TerrainLogic *terrain )
+{
+
+	// keep a pointer for our radar window
+	Int id = NAMEKEY( "ControlBar.wnd:LeftHUD" );
+	m_radarWindow = TheWindowManager->winGetWindowFromId( NULL, id );
+	DEBUG_ASSERTCRASH( m_radarWindow, ("Radar::newMap - Unable to find radar game window") );
+
+	// reset all the data in the radar
+	reset();
+
+	// get the extents of the new map
+	terrain->getExtent( &m_mapExtent );
+
+	// we will sample at these intervals across the map
+	m_xSample = m_mapExtent.width() / RADAR_CELL_WIDTH;
+	m_ySample = m_mapExtent.height() / RADAR_CELL_HEIGHT;
+
+	// find the "middle" height for the terrain (most used value) and water table
+	Int x, y;
+	Int terrainSamples = 0, waterSamples = 0;
+
+	m_terrainAverageZ = 0.0f;
+	m_waterAverageZ = 0.0f;
+	Coord3D worldPoint;
+
+	// since we're averaging let's skip every second sample...
+	worldPoint.y=0;
+	for( y = 0; y < RADAR_CELL_HEIGHT; y+=2, worldPoint.y+=2.0*m_ySample )
+	{
+		worldPoint.x=0;
+		for( x = 0; x < RADAR_CELL_WIDTH; x+=2, worldPoint.x+=2.0*m_xSample )
+		{
+			// don't use this, we don't really need the
+			// Z position by this function... radarToWorld( &radarPoint, &worldPoint );
+			// and this is done by isUnderwater anyway: z = terrain->getGroundHeight( worldPoint.x, worldPoint.y );
+			Real z,waterZ;
+			if( terrain->isUnderwater( worldPoint.x, worldPoint.y, &waterZ, &z ) )
+			{
+				m_waterAverageZ += z;
+				waterSamples++;
+			}
+			else
+			{
+				m_terrainAverageZ += z;
+				terrainSamples++;
+			}
+		}
+	}
+
+	// avoid divide by zeros
+	if( terrainSamples == 0 )
+		terrainSamples = 1;
+	if( waterSamples == 0 )
+		waterSamples = 1;
+
+	// compute averages
+	m_terrainAverageZ = m_terrainAverageZ / INT_TO_REAL( terrainSamples );
+	m_waterAverageZ = m_waterAverageZ / INT_TO_REAL( waterSamples );
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Add an object to the radar list.  The object will be sorted in the list to be grouped
+	* using it's radar priority */
+//-------------------------------------------------------------------------------------------------
+Bool Radar::addObject( Object *obj )
+{
+
+	// get the radar priority for this object
+	RadarPriorityType newPriority = obj->getRadarPriority();
+	if( isPriorityVisible( newPriority ) == FALSE )
+		return FALSE;
+
+	// if this object is on the radar, remove it in favor of the new add
+	RadarObject **list;
+	RadarObject *newObj;
+
+	// sanity
+	DEBUG_ASSERTCRASH( obj->friend_getRadarData() == NULL,
+										 ("Radar: addObject - non NULL radar data for '%s'",
+										 obj->getTemplate()->getName().str()) );
+
+	// allocate a new object
+	newObj = newInstance(RadarObject);
+
+	// set the object data
+	newObj->friend_setObject( obj );
+
+	// set color for this object on the radar
+	assignObjectColorToRadarObject( newObj, obj );
+
+	// set a chunk of radar data in the object
+	obj->friend_setRadarData( newObj );
+
+	//
+	// we will put this on either the local object list for objects that belong to the
+	// local player, or on the regular object list for all other objects
+	//
+	if( obj->isLocallyControlled() )
+	{
+		if ( obj->isHero() )
+			list = &m_localHeroObjectList;
+		else
+			list = &m_localObjectList;
+	}
+	else
+	{
+		list = &m_objectList;
+	}
+
+	// link object to master list at the head of it's priority section
+	linkRadarObject(newObj, list);
+
+	return TRUE;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Try to delete an object from a specific list */
+//-------------------------------------------------------------------------------------------------
+Bool Radar::deleteFromList( Object *obj, RadarObject **list )
+{
+	RadarObject *radarObject, *prevObject = NULL;
+
+	// find the object in list
+	for( radarObject = *list; radarObject; radarObject = radarObject->friend_getNext() )
+	{
+
+		if( radarObject->friend_getObject() == obj )
+		{
+
+			// unlink the object from list
+			if( prevObject == NULL )
+				*list = radarObject->friend_getNext();  // removing head of list
+			else
+				prevObject->friend_setNext( radarObject->friend_getNext() );
+
+			// set the object radar data to NULL
+			obj->friend_setRadarData( NULL );
+
+			// delete the object instance
+			deleteInstance(radarObject);
+
+			// all done, object found and deleted
+			return TRUE;
+
+		}
+
+		// save this object as previous one encountered in the list
+		prevObject = radarObject;
+
+	}
+
+	// object was not found in this list
+	return FALSE;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Remove an object from the radar, the object may reside in any list */
+//-------------------------------------------------------------------------------------------------
+Bool Radar::removeObject( Object *obj )
+{
+
+	// sanity
+	if( obj->friend_getRadarData() == NULL )
+		return FALSE;
+
+	if( deleteFromList( obj, &m_localHeroObjectList ) == TRUE )
+		return TRUE;
+	if( deleteFromList( obj, &m_localObjectList ) == TRUE )
+		return TRUE;
+	else if( deleteFromList( obj, &m_objectList ) == TRUE )
+		return TRUE;
+	else
+	{
+		DEBUG_ASSERTCRASH( 0, ("Radar: Tried to remove object '%s' which was not found",
+											 obj->getTemplate()->getName().str()) );
+		return FALSE;
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Translate a 2D spot on the radar (from (0,0) to (RADAR_CELL_WIDTH,RADAR_CELL_HEIGHT)
+	* to a 3D spot in the world. Does not determine Z value!
+	* Return TRUE if the radar points translates to a valid world position
+	* Return FALSE if the radar point is not a valid world position */
+//-------------------------------------------------------------------------------------------------
+Bool Radar::radarToWorld2D( const ICoord2D *radar, Coord3D *world )
+{
+	Int x, y;
+
+	// sanity
+	if( radar == NULL || world == NULL )
+		return FALSE;
+
+	// get the coords
+	x = radar->x;
+	y = radar->y;
+
+	// more sanity
+	if( x < 0 )
+		x = 0;
+	if( x >= RADAR_CELL_WIDTH )
+		x = RADAR_CELL_WIDTH - 1;
+	if( y < 0 )
+		y = 0;
+	if( y >= RADAR_CELL_HEIGHT )
+		y = RADAR_CELL_HEIGHT - 1;
+
+	// translate to world
+	world->x = x * m_xSample;
+	world->y = y * m_ySample;
+  return TRUE;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Translate a 2D spot on the radar (from (0,0) to (RADAR_CELL_WIDTH,RADAR_CELL_HEIGHT)
+	* to a 3D spot in the world on the terrain
+	* Return TRUE if the radar points translates to a valid world position
+	* Return FALSE if the radar point is not a valid world position */
+//-------------------------------------------------------------------------------------------------
+Bool Radar::radarToWorld( const ICoord2D *radar, Coord3D *world )
+{
+  if (!radarToWorld2D(radar,world))
+    return FALSE;
+
+	// find the terrain height here
+	world->z = TheTerrainLogic->getGroundHeight( world->x, world->y );
+
+	return TRUE;  // valid translation
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Translate a point in the world to the 2D radar (x,y)
+	* Return TRUE if the world point successfully translates to a radar point
+	* Return FALSE if world point is a bogus off the map position */
+//-------------------------------------------------------------------------------------------------
+Bool Radar::worldToRadar( const Coord3D *world, ICoord2D *radar )
+{
+
+	// sanity
+	if( world == NULL || radar == NULL )
+		return FALSE;
+
+	// sanity check the world position
+//	if( world->x < m_mapExtent.lo.x || world->x > m_mapExtent.hi.x ||
+//			world->y < m_mapExtent.lo.y || world->y > m_mapExtent.hi.y )
+//		return FALSE;
+	// This is actually an insanity check.  Nobody uses the return value, so this just leaves garbage in the
+	// return pointer.  The reason the question gets asked is there are 60 partition cells to 128 radar cells
+	// (for example), and the radar wants to draw a horizontal line.  This line ends up three pixels long
+	// at the right side, so the radar gives up and doesn't draw the middle one.
+	// We bind to on radar anyway, and we only ask if we are on radar, so don't intentionally add edge weirdness.
+
+	// convert
+	radar->x = world->x / m_xSample;
+	radar->y = world->y / m_ySample;
+
+	// keep it in bounds
+	if( radar->x < 0 )
+		radar->x = 0;
+	if( radar->x >= RADAR_CELL_WIDTH )
+		radar->x = RADAR_CELL_WIDTH - 1;
+	if( radar->y < 0 )
+		radar->y = 0;
+	if( radar->y >= RADAR_CELL_HEIGHT )
+		radar->y = RADAR_CELL_HEIGHT - 1;
+
+	return TRUE;  // valid translation
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Translate an actual pixel location (relative pixel with (0,0) being the top left of
+	* the radar area) to the "logical" radar coords that would cover the entire area of display
+	* on the screen.  This is needed because some maps are "long" or "tall" and need a translation
+	* to any radar image that has been scaled to preserve the map aspect ratio */
+// ------------------------------------------------------------------------------------------------
+Bool Radar::localPixelToRadar( const ICoord2D *pixel, ICoord2D *radar )
+{
+
+	// sanity
+	if( pixel == NULL || radar == NULL )
+		return FALSE;
+
+	// get window size of the radar
+	ICoord2D size;
+	m_radarWindow->winGetSize( &size.x, &size.y );
+
+	//
+	// act like we're going to draw and find the aspect ratio adjusted points of the
+	// terrain radar positions
+	//
+	ICoord2D start = { 0, 0 };
+	ICoord2D ul, lr;
+	findDrawPositions( start.x, start.y, size.x, size.y, &ul, &lr );
+
+	// get the scaled width and height
+	Int scaledWidth = lr.x - ul.x;
+	Int scaledHeight = lr.y - ul.y;
+
+	// if the pixel is outsize of the adjusted radar area there are no logical coords
+	if( pixel->x < ul.x || pixel->x > lr.x ||
+			pixel->y < ul.y || pixel->y > lr.y )
+		return FALSE;
+
+	if( scaledWidth >= scaledHeight )
+	{
+
+		// just normal conversion from full stretched to radar cells
+		radar->x = (pixel->x - ul.x)* RADAR_CELL_WIDTH / scaledWidth;
+
+		// conversion for scaled Y direction in map
+		radar->y = REAL_TO_INT( ((pixel->y - ul.y) / INT_TO_REAL( scaledHeight )) * size.y );
+
+		//
+		// radar->y now refers to a point that was "as if" the map was square, translate to radar
+		// note that y is inverted to have the radar align with the world (+x = right, -y = down)
+		//
+		radar->y = (size.y - radar->y) * RADAR_CELL_HEIGHT / size.y;
+
+
+	}
+	else
+	{
+
+		// conversion for scaled Y direction in map
+		radar->x = REAL_TO_INT( ((pixel->x - ul.x) / INT_TO_REAL( scaledWidth )) * size.x );
+
+		// radar->x now refers to a point that was "as if" the map was square, translate to radar
+		radar->x = radar->x * RADAR_CELL_WIDTH / size.x;
+
+		//
+		// just normal conversion from full stretched to radar cells, note that y is inverted
+		// to have the radar align with the world (+x = right, -y = down)
+		//
+		radar->y = (size.y - pixel->y) * RADAR_CELL_HEIGHT / size.y;
+
+	}
+
+	return TRUE;
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Translate a screen mouse position to world coords if the screen position is within
+	* the radar window and that spot in the radar corresponds to a point in the world */
+// ------------------------------------------------------------------------------------------------
+Bool Radar::screenPixelToWorld( const ICoord2D *pixel, Coord3D *world )
+{
+
+	// sanity
+	if( pixel == NULL || world == NULL )
+		return FALSE;
+
+	// if we have no radar window can't do the conversion
+	if( m_radarWindow == NULL )
+		return FALSE;
+
+	// translate pixel coords to local pixel coords relative to the radar window
+	ICoord2D localPixel;
+	ICoord2D screenPos;
+	m_radarWindow->winGetScreenPosition( &screenPos.x, &screenPos.y );
+	localPixel.x = pixel->x - screenPos.x;
+	localPixel.y = pixel->y - screenPos.y;
+
+	// translate local pixel to radar
+	ICoord2D radar;
+	if( localPixelToRadar( &localPixel, &radar ) == FALSE )
+		return FALSE;
+
+	// translate radar to world
+	return radarToWorld( &radar, world );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Given the pixel coordinates, see if there is an object that is exactly in this
+	* spot represented on the radar */
+// ------------------------------------------------------------------------------------------------
+Object *Radar::objectUnderRadarPixel( const ICoord2D *pixel )
+{
+
+	// sanity
+	if( pixel == NULL )
+		return NULL;
+
+	// convert pixel location to radar logical radar location
+	ICoord2D radar;
+	if( localPixelToRadar( pixel, &radar ) == FALSE )
+		return NULL;
+
+	// object we will return
+	Object *obj = NULL;
+
+	//
+	// scan the objects on the radar list and return any object that maps its world location
+	// to the radar location
+	//
+
+	// search the local hero object list
+	obj = searchListForRadarLocationMatch( m_localHeroObjectList, &radar );
+
+	// search the local object list if not found
+	if( obj == NULL )
+		obj = searchListForRadarLocationMatch( m_localObjectList, &radar );
+
+	// search all other objects if still not found
+	if( obj == NULL )
+		obj = searchListForRadarLocationMatch( m_objectList, &radar );
+
+	// return the object found (if any)
+	return obj;
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Search the object list for an object that maps to the given logical radar coords */
+// ------------------------------------------------------------------------------------------------
+Object *Radar::searchListForRadarLocationMatch( RadarObject *listHead, ICoord2D *radarMatch )
+{
+
+	// sanity
+	if( listHead == NULL || radarMatch == NULL )
+		return NULL;
+
+	// scan the list
+	RadarObject *radarObject;
+	ICoord2D radar;
+	for( radarObject = listHead; radarObject; radarObject = radarObject->friend_getNext() )
+	{
+
+		// get object
+		Object *obj = radarObject->friend_getObject();
+
+		// sanity
+		if( obj == NULL )
+		{
+
+			DEBUG_CRASH(( "Radar::searchListForRadarLocationMatch - NULL object encountered in list" ));
+			continue;
+
+		}
+
+		// convert object position to logical radar
+		worldToRadar( obj->getPosition(), &radar );
+
+		// see if this matches our match radar location
+		if( radar.x >= radarMatch->x - 1 &&
+				radar.x <= radarMatch->x + 1 &&
+				radar.y >= radarMatch->y - 1 &&
+				radar.y <= radarMatch->y + 1 )
+			return obj;
+
+	}
+
+	// no match found
+	return NULL;
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Given the RELATIVE SCREEN start X and Y, the width and height of the area to draw the whole
+	* radar in, compute what the upper left (ul) and lower right (lr) local coordinates are
+	* that represent the actual terrain image part of the radar that will preserve the
+	* aspect ratio of the map */
+// ------------------------------------------------------------------------------------------------
+void Radar::findDrawPositions( Int startX, Int startY, Int width, Int height,
+															 ICoord2D *ul, ICoord2D *lr )
+{
+
+	Real ratioWidth;
+	Real ratioHeight;
+	Coord2D radar;
+	ratioWidth = m_mapExtent.width()/(width * 1.0f);
+	ratioHeight = m_mapExtent.height()/(height* 1.0f);
+
+	if( ratioWidth >= ratioHeight)
+	{
+		radar.x = m_mapExtent.width() / ratioWidth;
+		radar.y = m_mapExtent.height()/ ratioWidth;
+		ul->x = 0;
+		ul->y = (height - radar.y) / 2.0f;
+		lr->x = radar.x;
+		lr->y = height - ul->y;
+	}
+	else
+	{
+		radar.x = m_mapExtent.width() / ratioHeight;
+		radar.y = m_mapExtent.height()/ ratioHeight;
+		ul->x = (width - radar.x ) / 2.0f;
+		ul->y = 0;
+		lr->x = width - ul->x;
+		lr->y = radar.y;
+	}
+/*
+
+	if( m_mapExtent.width() > m_mapExtent.height() )
+	{
+
+		//
+		// +---------------+
+		// |               |
+		// |               |
+		// +---------------+
+		// |   map area    |
+		// +---------------+
+		// |               |
+		// |               |
+		// +---------------+
+		//
+		ul->x = 0;
+		ul->y = (height - (m_mapExtent.height() / m_mapExtent.width() * height)) / 2.0f;
+		lr->x = width;
+		lr->y = height - ul->y;
+
+	}
+	else if(  m_mapExtent.height() > m_mapExtent.width() )
+	{
+
+		// +-----+---+-----+
+		// |     | m |     |
+		// |     | a |     |
+		// |     | p |     |
+		// |     |   |     |
+		// |     | a |     |
+		// |     | r |     |
+		// |     | e |     |
+		// |     | a |     |
+		// +-----+---+-----+
+		//
+
+		ul->x = (width - (m_mapExtent.width() / m_mapExtent.height() * width)) / 2.0f;
+		ul->y = 0;
+		lr->x = width - ul->x;
+		lr->y = height;
+
+	}
+	else
+	{
+
+		ul->x = 0;
+		ul->y = 0;
+		lr->x = width;
+		lr->y = height;
+
+	}
+*/
+
+	// make them pixel positions
+	ul->x += startX;
+	ul->y += startY;
+	lr->x += startX;
+	lr->y += startY;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Radar color lookup table */
+//-------------------------------------------------------------------------------------------------
+struct RadarColorLookup
+{
+	RadarEventType event;
+	RGBAColorInt color1;
+	RGBAColorInt color2;
+};
+static RadarColorLookup radarColorLookupTable[] =
+{
+	/*      Radar Event													Color 1									 Color 2       */
+	{ RADAR_EVENT_CONSTRUCTION,					{ 128, 128, 255, 255 },  {  128, 255, 255, 255 } },
+	{ RADAR_EVENT_UPGRADE,							{ 128,   0,  64, 255 },  {  255, 185, 220, 255 } },
+	{ RADAR_EVENT_UNDER_ATTACK,					{ 255,   0,   0, 255 },  {  255, 128, 128, 255 } },
+	{ RADAR_EVENT_INFORMATION,					{ 255, 255,   0, 255 },  {  255, 255, 128, 255 } },
+	{ RADAR_EVENT_BEACON_PULSE,					{ 255, 255,   0, 255 },  {  255, 255, 128, 255 } },
+	{ RADAR_EVENT_INFILTRATION,					{   0, 255, 255, 255 },  {  128, 255, 255, 255 } },
+	{ RADAR_EVENT_BATTLE_PLAN,					{ 255, 255, 255, 255 },	 {  255, 255, 255, 255 } },
+	{ RADAR_EVENT_STEALTH_DISCOVERED,		{   0, 255,   0, 255 },	 {    0, 128,   0, 255 } },
+	{ RADAR_EVENT_STEALTH_NEUTRALIZED,	{   0, 255,   0, 255 },	 {    0, 128,   0, 255 } },
+	{ RADAR_EVENT_FAKE,									{   0,	 0,   0,	 0 },	 {    0,	 0,   0,   0 } },
+	{ RADAR_EVENT_INVALID,							{   0,   0,   0,   0 },  {    0,   0,   0,   0 } }
+};
+
+//-------------------------------------------------------------------------------------------------
+/** Create a new radar event */
+//-------------------------------------------------------------------------------------------------
+void Radar::createEvent( const Coord3D *world, RadarEventType type, Real secondsToLive )
+{
+
+	// sanity
+	if( world == NULL )
+		return;
+
+	// lookup the colors we are to used based on the event
+	RGBAColorInt color[ 2 ];
+	Int i = 0;
+	for( ; radarColorLookupTable[ i ].event != RADAR_EVENT_INVALID; ++i )
+	{
+
+		if( radarColorLookupTable[ i ].event == type )
+		{
+
+			color[ 0 ] = radarColorLookupTable[ i ].color1;
+			color[ 1 ] = radarColorLookupTable[ i ].color2;
+			break;
+
+		}
+
+	}
+
+	// check for no match found in color table
+	if( radarColorLookupTable[ i ].event == RADAR_EVENT_INVALID )
+	{
+		static RGBAColorInt color1 = { 255, 255, 255, 255 };
+		static RGBAColorInt color2 = { 255, 255, 255, 255 };
+
+		DEBUG_CRASH(( "Radar::createEvent - Event not found in color table, using default colors" ));
+		color[ 0 ] = color1;
+		color[ 1 ] = color2;
+
+	}
+
+	// call the internal method to create the event with these colors
+	internalCreateEvent( world, type, secondsToLive, &color[ 0 ], &color[ 1 ] );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Create radar event using a specific colors from the player */
+// ------------------------------------------------------------------------------------------------
+void Radar::createPlayerEvent( Player *player, const Coord3D *world,
+															 RadarEventType type, Real secondsToLive )
+{
+
+	// sanity
+	if( player == NULL || world == NULL )
+		return;
+
+	// figure out the two colors we should use
+	Color c;
+	UnsignedByte r, g, b, a;
+	RGBAColorInt color[ 2 ];
+
+	// color 1
+	c = player->getPlayerColor();
+	GameGetColorComponents( c, &r, &g, &b, &a );
+	color[ 0 ].red = r;
+	color[ 0 ].green = g;
+	color[ 0 ].blue = b;
+	color[ 0 ].alpha = a;
+
+	// the second will be a darker color 1
+	Real darkScale = 0.75f;
+	color[ 1 ] = color[ 0 ];
+	color[ 1 ].red -= REAL_TO_INT( color[ 0 ].red * darkScale );
+	if( color[ 1 ].red < 0 )
+		color[ 1 ].red = 0;
+	color[ 1 ].green -= REAL_TO_INT( color[ 0 ].green * darkScale );
+	if( color[ 1 ].green < 0 )
+		color[ 1 ].green = 0;
+	color[ 1 ].blue -= REAL_TO_INT( color[ 0 ].blue * darkScale );
+	if( color[ 1 ].blue < 0 )
+		color[ 1 ].blue = 0;
+
+	// create the events using these colors
+	internalCreateEvent( world, type, secondsToLive, &color[ 0 ], &color[ 1 ] );
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Create a new radar event */
+//-------------------------------------------------------------------------------------------------
+void Radar::internalCreateEvent( const Coord3D *world, RadarEventType type, Real secondsToLive,
+																 const RGBAColorInt *color1, const RGBAColorInt *color2 )
+{
+	static Real secondsBeforeDieToFade = 0.5f;  ///< this many seconds before we hit the die frame we start to fade away
+
+	// sanity
+	if( world == NULL || color1 == NULL || color2 == NULL )
+		return;
+
+	// translate the world coord to radar coords
+	ICoord2D radar;
+	worldToRadar( world, &radar );
+
+	// add to the list of radar events
+	m_event[ m_nextFreeRadarEvent ].type = type;
+	m_event[ m_nextFreeRadarEvent ].active = TRUE;
+	m_event[ m_nextFreeRadarEvent ].createFrame = TheGameLogic->getFrame();
+	m_event[ m_nextFreeRadarEvent ].dieFrame = TheGameLogic->getFrame() + LOGICFRAMES_PER_SECOND * secondsToLive;
+	m_event[ m_nextFreeRadarEvent ].fadeFrame = m_event[ m_nextFreeRadarEvent ].dieFrame - LOGICFRAMES_PER_SECOND * secondsBeforeDieToFade;
+	m_event[ m_nextFreeRadarEvent ].color1 = *color1;
+	m_event[ m_nextFreeRadarEvent ].color2 = *color2;
+	m_event[ m_nextFreeRadarEvent ].worldLoc = *world;
+	m_event[ m_nextFreeRadarEvent ].radarLoc = radar;
+	m_event[ m_nextFreeRadarEvent ].soundPlayed = FALSE;
+
+	// record the index of this, our "last" radar event.
+	if ( type != RADAR_EVENT_BEACON_PULSE )
+		m_lastRadarEvent = m_nextFreeRadarEvent;
+
+	//
+	// increment the next radar event index, wrapping to the beginning.  If we ever have so many
+	// events that they fill up the buffer the oldest ones will just drop off, eh ... should be fine.
+	//
+	m_nextFreeRadarEvent++;
+	if( m_nextFreeRadarEvent >= MAX_RADAR_EVENTS )
+		m_nextFreeRadarEvent = 0;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Get the last event position, if any.
+	* Returns TRUE if event was found
+	* Returns FALSE if there is no "last event" */
+//-------------------------------------------------------------------------------------------------
+Bool Radar::getLastEventLoc( Coord3D *eventPos )
+{
+
+	// if we have an index for the last event, one was present
+	if( m_lastRadarEvent != -1 )
+	{
+
+		if( eventPos )
+			*eventPos = m_event[ m_lastRadarEvent ].worldLoc;
+		return TRUE;
+
+	}
+
+	return FALSE;  // no last event
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Try to create a radar event for "we're under attack".  This will be called every time
+	* actual damage is dealt to an object that the player owns that shows up on the radar.
+	* We don't want to create under attack events every time we are damaged and we also want
+	* to limit them based on time and local area of other recent attack events */
+// ------------------------------------------------------------------------------------------------
+void Radar::tryUnderAttackEvent( const Object *obj )
+{
+
+	// sanity
+	if( obj == NULL )
+		return;
+
+	// try to create the event
+	Bool eventCreated = tryEvent( RADAR_EVENT_UNDER_ATTACK, obj->getPosition() );
+
+	// if event created, do some more feedback
+	if( eventCreated )
+	{
+
+		TheControlBar->triggerRadarAttackGlow();
+		//
+		///@todo Should make an INI data driven table for radar event strings, and audio events
+		//
+		// UI feedback for being under attack (note that we display these messages and audio
+		// queues even if we don't have a radar)
+		//
+		Player *player = rts::getObservedOrLocalPlayer();
+
+		// create a message for the attack event
+		if( obj->isKindOf( KINDOF_INFANTRY ) || obj->isKindOf( KINDOF_VEHICLE ) )
+		{
+			AudioEventRTS unitAttackSound;
+			if( obj->isKindOf(KINDOF_HARVESTER) )
+			{
+				// display special message
+				TheInGameUI->message( "RADAR:HarvesterUnderAttack" );
+
+				// play special audio event
+				unitAttackSound = TheAudio->getMiscAudio()->m_radarHarvesterUnderAttackSound;
+			}
+			else
+			{
+				// display message
+				TheInGameUI->message( "RADAR:UnitUnderAttack" );
+
+				// play audio event
+				unitAttackSound = TheAudio->getMiscAudio()->m_radarStructureUnderAttackSound;
+			}
+			unitAttackSound.setPlayerIndex(player->getPlayerIndex());
+			TheAudio->addAudioEvent( &unitAttackSound );
+
+		}
+		else if( obj->isKindOf( KINDOF_STRUCTURE ) && obj->isKindOf( KINDOF_MP_COUNT_FOR_VICTORY ) )
+		{
+			// play EVA. If its our object, play Base under attack.
+			if (obj->getControllingPlayer()->isLocalPlayer())
+				TheEva->setShouldPlay(EVA_BaseUnderAttack);
+			else if (player->getRelationship(obj->getTeam()) == ALLIES)
+				TheEva->setShouldPlay(EVA_AllyUnderAttack);
+
+			// display message
+			TheInGameUI->message( "RADAR:StructureUnderAttack" );
+
+			// play audio event
+			static AudioEventRTS structureAttackSound = TheAudio->getMiscAudio()->m_radarStructureUnderAttackSound;
+			structureAttackSound.setPlayerIndex(player->getPlayerIndex());
+			TheAudio->addAudioEvent( &structureAttackSound );
+
+		}
+		else
+		{
+
+			// display message
+			TheInGameUI->message( "RADAR:UnderAttack" );
+
+			// play audio event
+			static AudioEventRTS underAttackSound = TheAudio->getMiscAudio()->m_radarStructureUnderAttackSound;
+			underAttackSound.setPlayerIndex(player->getPlayerIndex());
+			TheAudio->addAudioEvent( &underAttackSound );
+
+		}
+
+	}
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Try to create a radar event for "infiltration".
+		This happens whenever a unit is hijacked, defected, converted to carbomb, hacked, or
+		otherwise snuck into */
+// ------------------------------------------------------------------------------------------------
+void Radar::tryInfiltrationEvent( const Object *obj )
+{
+
+	//Sanity!
+	if( !obj )
+	{
+		return;
+	}
+
+	Player *player = rts::getObservedOrLocalPlayer();
+
+	// We should only be warned against infiltrations that are taking place against us.
+	if( obj->getControllingPlayer() != player )
+		return;
+
+	// create the radar event
+	createEvent( obj->getPosition(), RADAR_EVENT_INFILTRATION );
+
+	//
+	///@todo Should make an INI data driven table for radar event strings, and audio events
+	//
+	// UI feedback for being under attack (note that we display these messages and audio
+	// queues even if we don't have a radar)
+	//
+
+	// display message
+	TheInGameUI->message( "RADAR:Infiltration" );
+
+	// play audio event
+	static AudioEventRTS infiltrationWarningSound = TheAudio->getMiscAudio()->m_radarInfiltrationSound;
+	infiltrationWarningSound.setPlayerIndex(player->getPlayerIndex());
+	TheAudio->addAudioEvent( &infiltrationWarningSound );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+Bool Radar::tryEvent( RadarEventType event, const Coord3D *pos )
+{
+
+	// sanity
+	if( event <= RADAR_EVENT_INVALID || event >= RADAR_EVENT_NUM_EVENTS || pos == NULL )
+		return FALSE;
+
+	// see if there was an event of this type within the given range within the given time
+	UnsignedInt currentFrame = TheGameLogic->getFrame();
+	const Real closeEnoughDistanceSq = 250.0f * 250.0f;
+	const UnsignedInt framesBetweenEvents = LOGICFRAMES_PER_SECOND * 10;
+	//
+
+	// see if there was any matching radar event within range of this one
+	// that wasn't too long ago, if there was we won't create another and get outta here
+	//
+	for( Int i = 0; i < MAX_RADAR_EVENTS; ++i )
+	{
+
+		// only pay attention to under attack events
+		if( m_event[ i ].type == event )
+		{
+
+			// get distance from our new event location to this event location in 2D
+			Real distSquared = m_event[ i ].worldLoc.x - pos->x * m_event[ i ].worldLoc.x - pos->x +
+												 m_event[ i ].worldLoc.y - pos->y * m_event[ i ].worldLoc.y - pos->y;
+
+			if( distSquared <= closeEnoughDistanceSq )
+			{
+
+				// finally only reject making a new event of this existing one is "recent enough"
+				if( currentFrame - m_event[ i ].createFrame < framesBetweenEvents )
+					return FALSE;  // reject it
+
+			}
+
+		}
+
+	}
+
+	// if we got here then we want to create a new event
+	createEvent( pos, event );
+
+	// return TRUE for successfully created event
+	return TRUE;
+
+}
+
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void Radar::refreshTerrain( TerrainLogic *terrain )
+{
+
+	// no future queue is valid now
+	m_queueTerrainRefreshFrame = 0;
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Queue a refresh of the radar terrain, we have this so that if there is code that
+	* rapidly needs to refresh the radar, it should use this so we aren't continually
+	* rebuilding the radar graphic because that process is slow.  If you need to update
+	* the terrain on the radar immediately use refreshTerrain() */
+// ------------------------------------------------------------------------------------------------
+void Radar::queueTerrainRefresh( void )
+{
+
+	//
+	// we just simply overwrite the frame we have recorded for a radar refresh.  If there was
+	// already one there, it's simply just forgotten and whatever changes we wanted to see
+	// with that refresh will have to wait until enough time has passed to show these
+	// changes as well.  why you ask ... well, because if we're calling this in close enough
+	// proximity for us to overwrite something, we're changing the terrain features
+	// quite often and can't afford the expense of rebuilding the radar visual
+	//
+	m_queueTerrainRefreshFrame = TheGameLogic->getFrame();
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** CRC */
+// ------------------------------------------------------------------------------------------------
+void Radar::crc( Xfer *xfer )
+{
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Xfer a radar object list given the head pointer as a parameter
+	* Version Info;
+	* 1: Initial version */
+// ------------------------------------------------------------------------------------------------
+static void xferRadarObjectList( Xfer *xfer, RadarObject **head )
+{
+	RadarObject *radarObject;
+
+	// sanity
+	DEBUG_ASSERTCRASH( head != NULL, ("xferRadarObjectList - Invalid parameters" ));
+
+	// version
+	XferVersion currentVersion = 1;
+	XferVersion version = currentVersion;
+	xfer->xferVersion( &version, currentVersion );
+
+	// write could of objects in list
+	UnsignedShort count = 0;
+	for( radarObject = *head; radarObject; radarObject = radarObject->friend_getNext() )
+		count++;
+	xfer->xferUnsignedShort( &count );
+
+	// xfer the list data
+	if( xfer->getXferMode() == XFER_SAVE )
+	{
+
+		// save each object
+		for( radarObject = *head; radarObject; radarObject = radarObject->friend_getNext() )
+		{
+
+			// save this object
+			xfer->xferSnapshot( radarObject );
+
+		}
+
+	}
+	else
+	{
+
+		// the list should be empty at this point as we are loading it as a whole
+		if( *head != NULL )
+		{
+#if 1
+			// srj sez: yeah, it SHOULD be, but a few rogue things come into existence (via their ctor) preloaded
+			// with stuff (eg, "CabooseFullOfTerrorists"). we immediately destroy 'em, but they don't go away just yet.
+			// so just ignore 'em if possible.
+			for( radarObject = *head; radarObject; radarObject = radarObject->friend_getNext() )
+			{
+				if (!radarObject->friend_getObject()->isDestroyed())
+				{
+					DEBUG_CRASH(( "xferRadarObjectList - List head should be NULL, or contain only destroyed objects" ));
+					throw SC_INVALID_DATA;
+				}
+			}
+#else
+			DEBUG_CRASH(( "xferRadarObjectList - List head should be NULL, but isn't" ));
+			throw SC_INVALID_DATA;
+#endif
+		}
+
+		// read each element
+		for( UnsignedShort i = 0; i < count; ++i )
+		{
+
+			// alloate a new radar object
+			radarObject = newInstance(RadarObject);
+
+			// link to the end of the list
+			if( *head == NULL )
+				*head = radarObject;
+			else
+			{
+
+				RadarObject *other;
+				for( other = *head; other->friend_getNext() != NULL; other = other->friend_getNext() )
+				{
+				}
+
+				// set the end of the list to point to the new object
+				other->friend_setNext( radarObject );
+
+			}
+
+			// load the data
+			xfer->xferSnapshot( radarObject );
+
+		}
+
+	}
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Xfer Method
+	* Version Info:
+	* 1: Initial version
+	* 2: TheSuperHackers @tweak Serialize m_radarHidden, m_radarForceOn for each player
+	* 3: TheSuperHackers @tweak Serialize m_localHeroObjectList
+	*/
+// ------------------------------------------------------------------------------------------------
+void Radar::xfer( Xfer *xfer )
+{
+
+	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
+	XferVersion currentVersion = 1;
+#else
+	XferVersion currentVersion = 3;
+#endif
+	XferVersion version = currentVersion;
+	xfer->xferVersion( &version, currentVersion );
+
+
+	if (version <= 1)
+	{
+		const Int localPlayerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+		Bool value;
+
+		// radar hidden
+		value = m_radarHidden[localPlayerIndex];
+		xfer->xferBool( &value );
+		m_radarHidden[localPlayerIndex] = value;
+
+		// radar force on
+		value = m_radarForceOn[localPlayerIndex];
+		xfer->xferBool( &value );
+		m_radarForceOn[localPlayerIndex] = value;
+	}
+	else
+	{
+		static_assert(sizeof(m_radarHidden) == 16, "Increase version if size changes");
+		xfer->xferUser(&m_radarHidden, sizeof(m_radarHidden));
+
+		static_assert(sizeof(m_radarForceOn) == 16, "Increase version if size changes");
+		xfer->xferUser(&m_radarForceOn, sizeof(m_radarForceOn));
+	}
+
+	if (version <= 2)
+	{
+		if (xfer->getXferMode() == XFER_SAVE)
+		{
+			// TheSuperHackers @info For legacy xfer compatibility.
+			// Transfer all local hero objects to local object list.
+			RadarObject **fromList = &m_localHeroObjectList;
+			RadarObject **toList = &m_localObjectList;
+			while (*fromList != NULL)
+			{
+				RadarObject* nextObject = (*fromList)->friend_getNext();
+				(*fromList)->friend_setNext(NULL);
+				linkRadarObject(*fromList, toList);
+				*fromList = nextObject;
+			}
+		}
+	}
+	else
+	{
+		xferRadarObjectList( xfer, &m_localHeroObjectList );
+	}
+
+	// save our local object list
+	xferRadarObjectList( xfer, &m_localObjectList );
+
+	// save the regular object list
+	xferRadarObjectList( xfer, &m_objectList );
+
+	if (version <= 2)
+	{
+		// TheSuperHackers @info For legacy xfer compatibility.
+		// Transfer hero local object(s) back to local hero object list.
+		// This needs to be done on both load and save.
+		RadarObject **fromList = &m_localObjectList;
+		RadarObject **toList = &m_localHeroObjectList;
+		RadarObject *currObject;
+		RadarObject *prevObject;
+		RadarObject *nextObject;
+		prevObject = NULL;
+		for (currObject = *fromList; currObject != NULL; currObject = nextObject)
+		{
+			nextObject = currObject->friend_getNext();
+			if (currObject->friend_getObject()->isHero())
+			{
+				if (prevObject != NULL)
+				{
+					prevObject->friend_setNext(nextObject);
+				}
+				else
+				{
+					*fromList = nextObject;
+				}
+				currObject->friend_setNext(NULL);
+				linkRadarObject(currObject, toList);
+				continue;
+			}
+			prevObject = currObject;
+		}
+	}
+
+	// save the radar event count and data
+	UnsignedShort eventCountVerify = MAX_RADAR_EVENTS;
+	UnsignedShort eventCount = eventCountVerify;
+	xfer->xferUnsignedShort( &eventCount );
+	if( eventCount != eventCountVerify )
+	{
+
+		DEBUG_CRASH(( "Radar::xfer - size of MAX_RADAR_EVENTS has changed, you must version this xfer method to accomodate the new array size.  Was '%d' and is now '%d'",
+									eventCount, eventCountVerify ));
+		throw SC_INVALID_DATA;
+
+	}
+	for( UnsignedShort i = 0; i < eventCount; ++i )
+	{
+
+		// xfer event data
+		xfer->xferUser( &m_event[ i ].type, sizeof( RadarEventType ) );
+		xfer->xferBool( &m_event[ i ].active );
+		xfer->xferUnsignedInt( &m_event[ i ].createFrame );
+		xfer->xferUnsignedInt( &m_event[ i ].dieFrame );
+		xfer->xferUnsignedInt( &m_event[ i ].fadeFrame );
+		xfer->xferRGBAColorInt( &m_event[ i ].color1 );
+		xfer->xferRGBAColorInt( &m_event[ i ].color2 );
+		xfer->xferCoord3D( &m_event[ i ].worldLoc );
+		xfer->xferICoord2D( &m_event[ i ].radarLoc );
+		xfer->xferBool( &m_event[ i ].soundPlayed );
+
+	}
+
+	// next event index
+	xfer->xferInt( &m_nextFreeRadarEvent );
+
+	// last event index
+	xfer->xferInt( &m_lastRadarEvent );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Load post process */
+// ------------------------------------------------------------------------------------------------
+void Radar::loadPostProcess( void )
+{
+
+	//
+	// refresh the radar texture now that all the objects (specifically bridges) have
+	// been loaded with their correct damage states from save game file
+	//
+	refreshTerrain( TheTerrainLogic );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Is the priority type passed in a "visible" one that can show up on the radar */
+// ------------------------------------------------------------------------------------------------
+Bool Radar::isPriorityVisible( RadarPriorityType priority )
+{
+
+	switch( priority )
+	{
+
+		case RADAR_PRIORITY_INVALID:
+		case RADAR_PRIORITY_NOT_ON_RADAR:
+			return FALSE;
+
+		default:
+			return TRUE;
+
+	}
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void Radar::linkRadarObject( RadarObject *newObj, RadarObject **list )
+{
+	if( *list == NULL )
+	{
+		// trivial case, an empty list
+		*list = newObj;
+		return;
+	}
+
+	RadarPriorityType newPriority = newObj->friend_getObject()->getRadarPriority();
+	RadarPriorityType prevPriority;
+	RadarPriorityType currPriority;
+	RadarObject *currObject;
+	RadarObject *prevObject;
+	RadarObject *nextObject;
+
+	DEBUG_ASSERTCRASH(newObj->friend_getNext() == NULL, ("newObj->friend_getNext is not NULL"));
+
+	prevObject = NULL;
+	prevPriority = RADAR_PRIORITY_INVALID;
+	for( currObject = *list; currObject; currObject = nextObject )
+	{
+		// get the next object
+		nextObject = currObject->friend_getNext();
+
+		// get the priority of this entry in the list (currPriority)
+		currPriority = currObject->friend_getObject()->getRadarPriority();
+
+		//
+		// if there is no previous object, or the previous priority is less than the
+		// our new priority, and the current object in the list has a priority
+		// higher than our equal to our own we need to be inserted here
+		//
+		if( (prevObject == NULL || prevPriority < newPriority ) && (currPriority >= newPriority) )
+		{
+			// insert into the list just ahead of currObject
+			if( prevObject )
+			{
+				// the new entry next points to what the previous one used to point to
+				newObj->friend_setNext( prevObject->friend_getNext() );
+
+				// the previous one next now points to the new entry
+				prevObject->friend_setNext( newObj );
+			}
+			else
+			{
+				// the new object next points to the current object
+				newObj->friend_setNext( currObject );
+
+				// new list head is now newObj
+				*list = newObj;
+			}
+			break;
+		}
+		else if( nextObject == NULL )
+		{
+			// at the end of the list, put object here
+			currObject->friend_setNext( newObj );
+		}
+
+		// our current object is now the previous object
+		prevObject = currObject;
+		prevPriority = currPriority;
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void Radar::assignObjectColorToRadarObject( RadarObject *radarObj, Object *obj )
+{
+	const Player *player = obj->getControllingPlayer();
+	Player *clientPlayer = rts::getObservedOrLocalPlayer();
+	Bool useIndicatorColor = true;
+
+	if( obj->isKindOf( KINDOF_DISGUISER ) )
+	{
+		//Because we have support for disguised units pretending to be units from another
+		//team, we need to intercept it here and make sure it's rendered appropriately
+		//based on which client is rendering it.
+		StealthUpdate *update = obj->getStealth();
+		if( update )
+		{
+			if( update->isDisguised() )
+			{
+				Player *disguisedPlayer = ThePlayerList->getNthPlayer( update->getDisguisedPlayerIndex() );
+				if( player->getRelationship( clientPlayer->getDefaultTeam() ) != ALLIES && clientPlayer->isPlayerActive() )
+				{
+					//Neutrals and enemies will see this disguised unit as the team it's disguised as.
+					player = disguisedPlayer;
+					if( player )
+						useIndicatorColor = false;
+				}
+				//Otherwise, the color will show up as the team it really belongs to (already set above).
+			}
+		}
+	}
+
+	if( obj->getContain() )
+	{
+		// To handle Stealth garrison, ask containers what color they are drawing with to the local player.
+		// Local is okay because radar display is not synced.
+		player = obj->getContain()->getApparentControllingPlayer( clientPlayer );
+		if( player )
+			useIndicatorColor = false;
+	}
+
+	if( useIndicatorColor || (player == NULL) )
+	{
+		radarObj->setColor( obj->getIndicatorColor() );
+	}
+	else
+	{
+		radarObj->setColor( player->getPlayerColor() );
+	}
+}
diff --git a/Core/GameEngine/Source/Common/System/StreamingArchiveFile.cpp b/Core/GameEngine/Source/Common/System/StreamingArchiveFile.cpp
new file mode 100644
index 00000000000..1fc9f43b2ea
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/StreamingArchiveFile.cpp
@@ -0,0 +1,282 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   RTS
+//
+// Module:    IO
+//
+// File name: StreamingArchiveFile.cpp
+//
+// Created:   12/06/02
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "PreRTS.h"
+
+#include <fcntl.h>
+#include <io.h>
+#include <sys/stat.h>
+
+#include "Common/AsciiString.h"
+#include "Common/FileSystem.h"
+#include "Common/StreamingArchiveFile.h"
+#include "Common/PerfTimer.h"
+
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Prototypes
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Functions
+//----------------------------------------------------------------------------
+
+//=================================================================
+// StreamingArchiveFile::StreamingArchiveFile
+//=================================================================
+
+StreamingArchiveFile::StreamingArchiveFile()
+: m_file(NULL),
+	m_startingPos(0),
+	m_size(0),
+	m_curPos(0)
+{
+
+}
+
+
+//----------------------------------------------------------------------------
+//         Public Functions
+//----------------------------------------------------------------------------
+
+
+//=================================================================
+// StreamingArchiveFile::~StreamingArchiveFile
+//=================================================================
+
+StreamingArchiveFile::~StreamingArchiveFile()
+{
+}
+
+//=================================================================
+// StreamingArchiveFile::open
+//=================================================================
+/**
+	* This function opens a file using the file system. Access flags
+	* are mapped to the appropriate open flags. Returns true if file
+	* was opened successfully.
+	*/
+//=================================================================
+
+//DECLARE_PERF_TIMER(StreamingArchiveFile)
+Bool StreamingArchiveFile::open( const Char *filename, Int access, size_t bufferSize )
+{
+	//USE_PERF_TIMER(StreamingArchiveFile)
+	File *file = TheFileSystem->openFile( filename, access, bufferSize );
+
+	if ( file == NULL )
+	{
+		return FALSE;
+	}
+
+	return (open( file ) != NULL);
+}
+
+//============================================================================
+// StreamingArchiveFile::open
+//============================================================================
+
+Bool StreamingArchiveFile::open( File *file )
+{
+	return TRUE;
+}
+
+//============================================================================
+// StreamingArchiveFile::openFromArchive
+//============================================================================
+Bool StreamingArchiveFile::openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size)
+{
+	//USE_PERF_TIMER(StreamingArchiveFile)
+	if (archiveFile == NULL) {
+		return FALSE;
+	}
+
+	if (File::open(filename.str(), File::READ | File::BINARY | File::STREAMING) == FALSE) {
+		return FALSE;
+	}
+
+	m_file = archiveFile;
+	m_startingPos = offset;
+	m_size = size;
+	m_curPos = 0;
+
+	if (m_file->seek(offset, File::START) != offset) {
+		return FALSE;
+	}
+
+	if (m_file->seek(size) != m_startingPos + size) {
+		return FALSE;
+	}
+
+	// We know this will succeed.
+	m_file->seek(offset, File::START);
+
+	m_nameStr = filename;
+
+	return TRUE;
+}
+
+//=================================================================
+// StreamingArchiveFile::close
+//=================================================================
+/**
+	* Closes the current file if it is open.
+  * Must call StreamingArchiveFile::close() for each successful StreamingArchiveFile::open() call.
+	*/
+//=================================================================
+
+void StreamingArchiveFile::close( void )
+{
+	File::close();
+}
+
+//=================================================================
+// StreamingArchiveFile::read
+//=================================================================
+// if buffer is null, just advance the current position by 'bytes'
+Int StreamingArchiveFile::read( void *buffer, Int bytes )
+{
+	if (!m_file) {
+		return 0;
+	}
+
+	// There shouldn't be a way that this can fail, because we've already verified that the file
+	// contains at least this many bits.
+	m_file->seek(m_startingPos + m_curPos, File::START);
+
+	if (bytes + m_curPos > m_size)
+		bytes = m_size - m_curPos;
+
+	Int bytesRead = m_file->read(buffer, bytes);
+
+	m_curPos += bytesRead;
+
+	return bytesRead;
+}
+
+//=================================================================
+// StreamingArchiveFile::write
+//=================================================================
+
+Int StreamingArchiveFile::write( const void *buffer, Int bytes )
+{
+	DEBUG_CRASH(("Cannot write to streaming files."));
+	return -1;
+}
+
+//=================================================================
+// StreamingArchiveFile::seek
+//=================================================================
+
+Int StreamingArchiveFile::seek( Int pos, seekMode mode)
+{
+	Int newPos;
+
+	switch( mode )
+	{
+		case START:
+			newPos = pos;
+			break;
+		case CURRENT:
+			newPos = m_curPos + pos;
+			break;
+		case END:
+			DEBUG_ASSERTCRASH(pos <= 0, ("StreamingArchiveFile::seek - position should be <= 0 for a seek starting from the end."));
+			newPos = m_size + pos;
+			break;
+		default:
+			// bad seek mode
+			return -1;
+	}
+
+	if ( newPos < 0 )
+	{
+		newPos = 0;
+	}
+	else if ( newPos > m_size )
+	{
+		newPos = m_size;
+	}
+
+	m_curPos = newPos;
+
+	return m_curPos;
+
+}
+
diff --git a/Core/GameEngine/Source/Common/System/UnicodeString.cpp b/Core/GameEngine/Source/Common/System/UnicodeString.cpp
new file mode 100644
index 00000000000..af1a6317e3f
--- /dev/null
+++ b/Core/GameEngine/Source/Common/System/UnicodeString.cpp
@@ -0,0 +1,467 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: UnicodeString.cpp
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:    RTS3
+//
+// File name:  UnicodeString.cpp
+//
+// Created:    Steven Johnson, October 2001
+//
+// Desc:       General-purpose string classes
+//
+//-----------------------------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/CriticalSection.h"
+
+
+// -----------------------------------------------------
+
+/*static*/ const UnicodeString UnicodeString::TheEmptyString;
+
+// -----------------------------------------------------
+#ifdef RTS_DEBUG
+void UnicodeString::validate() const
+{
+	if (!m_data) return;
+	DEBUG_ASSERTCRASH(m_data->m_refCount > 0, ("m_refCount is zero"));
+	DEBUG_ASSERTCRASH(m_data->m_numCharsAllocated > 0, ("m_numCharsAllocated is zero"));
+	DEBUG_ASSERTCRASH(wcslen(m_data->peek())+1 <= m_data->m_numCharsAllocated,("str is too long for storage"));
+}
+#endif
+
+// -----------------------------------------------------
+UnicodeString::UnicodeString(const UnicodeString& stringSrc) : m_data(stringSrc.m_data)
+{
+	ScopedCriticalSection scopedCriticalSection(TheUnicodeStringCriticalSection);
+	if (m_data)
+		++m_data->m_refCount;
+	validate();
+}
+
+// -----------------------------------------------------
+void UnicodeString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData, const WideChar* strToCopy, const WideChar* strToCat)
+{
+	validate();
+
+	const int usableNumChars = numCharsNeeded - 1;
+
+	if (m_data &&
+			m_data->m_refCount == 1 &&
+			m_data->m_numCharsAllocated >= numCharsNeeded)
+	{
+		// no buffer manhandling is needed (it's already large enough, and unique to us)
+		if (strToCopy)
+		{
+			// TheSuperHackers @fix Mauller 04/04/2025 Replace wcscpy with safer memmove as memory regions can overlap when part of string is copied to itself
+			DEBUG_ASSERTCRASH(usableNumChars <= wcslen(strToCopy), ("strToCopy is too small"));
+			memmove(m_data->peek(), strToCopy, usableNumChars * sizeof(WideChar));
+			m_data->peek()[usableNumChars] = 0;
+		}
+		if (strToCat)
+			wcscat(m_data->peek(), strToCat);
+		return;
+	}
+
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order."));
+	DEBUG_ASSERTCRASH(numCharsNeeded <= MAX_LEN, ("UnicodeString::ensureUniqueBufferOfSize exceeds max string length %d with requested length %d", MAX_LEN, numCharsNeeded));
+	int minBytes = sizeof(UnicodeStringData) + numCharsNeeded*sizeof(WideChar);
+	int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
+	UnicodeStringData* newData = (UnicodeStringData*)TheDynamicMemoryAllocator->allocateBytesDoNotZero(actualBytes, "STR_UnicodeString::ensureUniqueBufferOfSize");
+	newData->m_refCount = 1;
+	newData->m_numCharsAllocated = (actualBytes - sizeof(UnicodeStringData))/sizeof(WideChar);
+#if defined(RTS_DEBUG)
+	newData->m_debugptr = newData->peek();	// just makes it easier to read in the debugger
+#endif
+
+	if (m_data && preserveData)
+		wcscpy(newData->peek(), m_data->peek());
+	else
+		newData->peek()[0] = 0;
+
+	// do these BEFORE releasing the old buffer, so that self-copies
+	// or self-cats will work correctly.
+	if (strToCopy)
+	{
+		DEBUG_ASSERTCRASH(usableNumChars <= wcslen(strToCopy), ("strToCopy is too small"));
+		wcsncpy(newData->peek(), strToCopy, usableNumChars);
+		newData->peek()[usableNumChars] = 0;
+	}
+	if (strToCat)
+		wcscat(newData->peek(), strToCat);
+
+	releaseBuffer();
+	m_data = newData;
+
+	validate();
+}
+
+
+// -----------------------------------------------------
+void UnicodeString::releaseBuffer()
+{
+	ScopedCriticalSection scopedCriticalSection(TheUnicodeStringCriticalSection);
+
+	validate();
+	if (m_data)
+	{
+		if (--m_data->m_refCount == 0)
+		{
+			TheDynamicMemoryAllocator->freeBytes(m_data);
+		}
+		m_data = 0;
+	}
+}
+
+// -----------------------------------------------------
+UnicodeString::UnicodeString(const WideChar* s) : m_data(NULL)
+{
+	int len = s ? (int)wcslen(s) : 0;
+	if (len > 0)
+	{
+		ensureUniqueBufferOfSize(len + 1, false, s, NULL);
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+UnicodeString::UnicodeString(const WideChar* s, int len) : m_data(NULL)
+{
+	if (len > 0)
+	{
+		ensureUniqueBufferOfSize(len + 1, false, s, NULL);
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void UnicodeString::set(const UnicodeString& stringSrc)
+{
+	ScopedCriticalSection scopedCriticalSection(TheUnicodeStringCriticalSection);
+
+	validate();
+	if (&stringSrc != this)
+	{
+		releaseBuffer();
+		m_data = stringSrc.m_data;
+		if (m_data)
+			++m_data->m_refCount;
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void UnicodeString::set(const WideChar* s)
+{
+	int len = s ? wcslen(s) : 0;
+	set(s, len);
+}
+
+// -----------------------------------------------------
+void UnicodeString::set(const WideChar* s, int len)
+{
+	validate();
+	if (!m_data || s != peek())
+	{
+		if (len > 0)
+		{
+			ensureUniqueBufferOfSize(len + 1, false, s, NULL);
+		}
+		else
+		{
+			releaseBuffer();
+		}
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+WideChar* UnicodeString::getBufferForRead(Int len)
+{
+	validate();
+	DEBUG_ASSERTCRASH(len>0, ("No need to allocate 0 len strings."));
+	ensureUniqueBufferOfSize(len + 1, false, NULL, NULL);
+	validate();
+	return peek();
+}
+
+// -----------------------------------------------------
+void UnicodeString::translate(const AsciiString& stringSrc)
+{
+	validate();
+	/// @todo srj put in a real translation here; this will only work for 7-bit ascii
+	clear();
+	Int len = stringSrc.getLength();
+	for (Int i = 0; i < len; i++)
+		concat((WideChar)stringSrc.getCharAt(i));
+	validate();
+}
+
+// -----------------------------------------------------
+void UnicodeString::concat(const WideChar* s)
+{
+	validate();
+	int addlen = wcslen(s);
+	if (addlen == 0)
+		return;	// my, that was easy
+
+	if (m_data)
+	{
+		ensureUniqueBufferOfSize(getLength() + addlen + 1, true, NULL, s);
+	}
+	else
+	{
+		set(s);
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void UnicodeString::trim()
+{
+	validate();
+
+	if (m_data)
+	{
+		const WideChar *c = peek();
+
+		//	Strip leading white space from the string.
+		while (c && iswspace(*c))
+		{
+			c++;
+		}
+		if (c != peek())
+		{
+			set(c);
+		}
+
+		trimEnd();
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void UnicodeString::trimEnd()
+{
+	validate();
+
+	if (m_data)
+	{
+		//	Clip trailing white space from the string.
+		const int len = wcslen(peek());
+		int index = len;
+		while (index > 0 && iswspace(getCharAt(index - 1)))
+		{
+			--index;
+		}
+
+		if (index < len)
+		{
+			truncateTo(index);
+		}
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void UnicodeString::trimEnd(const WideChar c)
+{
+	validate();
+
+	if (m_data)
+	{
+		// Clip trailing consecutive occurances of c from the string.
+		const int len = wcslen(peek());
+		int index = len;
+		while (index > 0 && getCharAt(index - 1) == c)
+		{
+			--index;
+		}
+
+		if (index < len)
+		{
+			truncateTo(index);
+		}
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void UnicodeString::removeLastChar()
+{
+	truncateBy(1);
+}
+
+// -----------------------------------------------------
+void UnicodeString::truncateBy(const Int charCount)
+{
+	validate();
+	if (m_data && charCount > 0)
+	{
+		const size_t len = wcslen(peek());
+		if (len > 0)
+		{
+			ensureUniqueBufferOfSize(len + 1, true, NULL, NULL);
+			size_t count = charCount;
+			if (charCount > len)
+			{
+				count = len;
+			}
+			peek()[len - count] = 0;
+		}
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void UnicodeString::truncateTo(const Int maxLength)
+{
+	validate();
+	if (m_data)
+	{
+		const size_t len = wcslen(peek());
+		if (len > maxLength)
+		{
+			ensureUniqueBufferOfSize(len + 1, true, NULL, NULL);
+			peek()[maxLength] = 0;
+		}
+	}
+	validate();
+}
+
+// -----------------------------------------------------
+void UnicodeString::format(UnicodeString format, ...)
+{
+	validate();
+	va_list args;
+  va_start(args, format);
+	format_va(format, args);
+  va_end(args);
+	validate();
+}
+
+// -----------------------------------------------------
+void UnicodeString::format(const WideChar* format, ...)
+{
+	validate();
+	va_list args;
+  va_start(args, format);
+	format_va(format, args);
+  va_end(args);
+	validate();
+}
+
+// -----------------------------------------------------
+void UnicodeString::format_va(const UnicodeString& format, va_list args)
+{
+	format_va(format.str(), args);
+}
+
+// -----------------------------------------------------
+void UnicodeString::format_va(const WideChar* format, va_list args)
+{
+	validate();
+	WideChar buf[MAX_FORMAT_BUF_LEN];
+	const int result = vswprintf(buf, sizeof(buf)/sizeof(WideChar), format, args);
+	if (result >= 0)
+	{
+		set(buf);
+		validate();
+	}
+	else
+	{
+		DEBUG_CRASH(("UnicodeString::format_va failed with code:%d", result));
+	}
+}
+
+// -----------------------------------------------------
+Bool UnicodeString::startsWith(const WideChar* p) const
+{
+	return m_data && ::startsWith(peek(), p);
+}
+
+// -----------------------------------------------------
+Bool UnicodeString::startsWithNoCase(const WideChar* p) const
+{
+	return m_data && ::startsWithNoCase(peek(), p);
+}
+
+// -----------------------------------------------------
+Bool UnicodeString::endsWith(const WideChar* p) const
+{
+	return m_data && ::endsWith(peek(), p);
+}
+
+// -----------------------------------------------------
+Bool UnicodeString::endsWithNoCase(const WideChar* p) const
+{
+	return m_data && ::endsWithNoCase(peek(), p);
+}
+
+//-----------------------------------------------------------------------------
+Bool UnicodeString::nextToken(UnicodeString* tok, UnicodeString delimiters)
+{
+	if (this->isEmpty() || tok == this)
+		return false;
+
+	if (delimiters.isEmpty())
+		delimiters = L" \t\n\r";
+
+	Int offset;
+
+	offset = wcsspn(peek(), delimiters.str());
+	WideChar* start = peek() + offset;
+
+	offset = wcscspn(start, delimiters.str());
+	WideChar* end = start + offset;
+
+	if (end > start)
+	{
+		Int len = end - start;
+		WideChar* tmp = tok->getBufferForRead(len + 1);
+		memcpy(tmp, start, len*2);
+		tmp[len] = 0;
+
+		this->set(end);
+
+		return true;
+	}
+	else
+	{
+		this->clear();
+		tok->clear();
+		return false;
+	}
+}
diff --git a/Core/GameEngine/Source/Common/System/Xfer.cpp b/Core/GameEngine/Source/Common/System/Xfer.cpp
index b66d57195a7..4427a7dd0a7 100644
--- a/Core/GameEngine/Source/Common/System/Xfer.cpp
+++ b/Core/GameEngine/Source/Common/System/Xfer.cpp
@@ -30,17 +30,12 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Upgrade.h"
 #include "Common/GameState.h"
 #include "Common/Xfer.h"
 #include "Common/BitFlagsIO.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -50,14 +45,14 @@ Xfer::Xfer( void )
 	m_options = XO_NONE;
 	m_xferMode = XFER_INVALID;
 
-}  // end Xfer
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Xfer::~Xfer( void )
 {
 
-}  // end ~Xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Open */
@@ -68,16 +63,16 @@ void Xfer::open( AsciiString identifier )
 	// save identifier
 	m_identifier = identifier;
 
-}  // end open
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void Xfer::xferByte( Byte *byteData )
 {
 
-	xferImplementation( byteData, sizeof( Byte ) ); 
+	xferImplementation( byteData, sizeof( Byte ) );
 
-}  // end xferByte
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -90,40 +85,40 @@ void Xfer::xferVersion( XferVersion *versionData, XferVersion currentVersion )
 	if( *versionData > currentVersion )
 	{
 
-		DEBUG_CRASH(( "XferVersion - Unknown version '%d' should be no higher than '%d'\n",
+		DEBUG_CRASH(( "XferVersion - Unknown version '%d' should be no higher than '%d'",
 									*versionData, currentVersion ));
 		throw XFER_INVALID_VERSION;
 
-	}  // end if
+	}
 
-}  // end xferVersion
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void Xfer::xferUnsignedByte( UnsignedByte *unsignedByteData )
 {
 
-	xferImplementation( unsignedByteData, sizeof( UnsignedByte ) ); 
+	xferImplementation( unsignedByteData, sizeof( UnsignedByte ) );
 
-}  // end xferUnsignedByte
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void Xfer::xferBool( Bool *boolData )
 {
 
-	xferImplementation( boolData, sizeof( Bool ) ); 
+	xferImplementation( boolData, sizeof( Bool ) );
 
-}  // end xferBool
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void Xfer::xferInt( Int *intData ) 
+void Xfer::xferInt( Int *intData )
 {
 
 	xferImplementation( intData, sizeof( Int ) );
-	
-}  // end xferInt
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -132,43 +127,43 @@ void Xfer::xferInt64( Int64 *int64Data )
 
 	xferImplementation( int64Data, sizeof( Int64 ) );
 
-}  // end xferInt64
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void Xfer::xferUnsignedInt( UnsignedInt *unsignedIntData ) 
+void Xfer::xferUnsignedInt( UnsignedInt *unsignedIntData )
 {
 
 	xferImplementation( unsignedIntData, sizeof( UnsignedInt ) );
-	
-}  // end xferUnsignedInt
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void Xfer::xferShort( Short *shortData )
 {
 
-	xferImplementation( shortData, sizeof( Short ) ); 
+	xferImplementation( shortData, sizeof( Short ) );
 
-}  // end xferShort
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void Xfer::xferUnsignedShort( UnsignedShort *unsignedShortData )
 {
 
-	xferImplementation( unsignedShortData, sizeof( UnsignedShort ) ); 
+	xferImplementation( unsignedShortData, sizeof( UnsignedShort ) );
 
-}  // end xferUnsignedShort
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void Xfer::xferReal( Real *realData )
 {
 
-	xferImplementation( realData, sizeof( Real ) ); 
-	
-}  // end xferReal
+	xferImplementation( realData, sizeof( Real ) );
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -184,7 +179,7 @@ void Xfer::xferMapName( AsciiString *mapNameData )
 		xferAsciiString(mapNameData);
 		*mapNameData = TheGameState->portableMapPathToRealMapPath(*mapNameData);
 	}
-}  // end xferAsciiString
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -193,13 +188,13 @@ void Xfer::xferAsciiString( AsciiString *asciiStringData )
 
 	xferImplementation( (void *)asciiStringData->str(), sizeof( Byte ) * asciiStringData->getLength() );
 
-}  // end xferAsciiString
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void Xfer::xferMarkerLabel( AsciiString asciiStringData )
 {
-}  // end xferMarkerLabel
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -208,7 +203,7 @@ void Xfer::xferUnicodeString( UnicodeString *unicodeStringData )
 
 	xferImplementation( (void *)unicodeStringData->str(), sizeof( WideChar ) * unicodeStringData->getLength() );
 
-}  // end xferUnicodeString
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -219,7 +214,7 @@ void Xfer::xferCoord3D( Coord3D *coord3D )
 	xferReal( &coord3D->y );
 	xferReal( &coord3D->z );
 
-}  // end xferCoord3D
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -230,7 +225,7 @@ void Xfer::xferICoord3D( ICoord3D *iCoord3D )
 	xferInt( &iCoord3D->y );
 	xferInt( &iCoord3D->z );
 
-}  // end xferICoor3D
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -240,7 +235,7 @@ void Xfer::xferRegion3D( Region3D *region3D )
 	xferCoord3D( &region3D->lo );
 	xferCoord3D( &region3D->hi );
 
-}  // end xferRegion3D
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -250,7 +245,7 @@ void Xfer::xferIRegion3D( IRegion3D *iRegion3D )
 	xferICoord3D( &iRegion3D->lo );
 	xferICoord3D( &iRegion3D->hi );
 
-}  // end xferIRegion3D
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -260,7 +255,7 @@ void Xfer::xferCoord2D( Coord2D *coord2D )
 	xferReal( &coord2D->x );
 	xferReal( &coord2D->y );
 
-}  // end xferCoord2D
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -270,7 +265,7 @@ void Xfer::xferICoord2D( ICoord2D *iCoord2D )
 	xferInt( &iCoord2D->x );
 	xferInt( &iCoord2D->y );
 
-}  // end xferICoord2D
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -280,7 +275,7 @@ void Xfer::xferRegion2D( Region2D *region2D )
 	xferCoord2D( &region2D->lo );
 	xferCoord2D( &region2D->hi );
 
-}  // end xferRegion2D
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -290,7 +285,7 @@ void Xfer::xferIRegion2D( IRegion2D *iRegion2D )
 	xferICoord2D( &iRegion2D->lo );
 	xferICoord2D( &iRegion2D->hi );
 
-}  // end xferIRegion2D
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -300,7 +295,7 @@ void Xfer::xferRealRange( RealRange *realRange )
 	xferReal( &realRange->lo );
 	xferReal( &realRange->hi );
 
-}  // end xferRealRange
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -309,7 +304,7 @@ void Xfer::xferColor( Color *color )
 
 	xferImplementation( color, sizeof( Color ) );
 
-}  // end xferColor
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -320,7 +315,7 @@ void Xfer::xferRGBColor( RGBColor *rgbColor )
 	xferReal( &rgbColor->green );
 	xferReal( &rgbColor->blue );
 
-}  // end xferRGBColor
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -332,7 +327,7 @@ void Xfer::xferRGBAColorReal( RGBAColorReal *rgbaColorReal )
 	xferReal( &rgbaColorReal->blue );
 	xferReal( &rgbaColorReal->alpha );
 
-}  // end xferRGBAColorReal
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -344,7 +339,7 @@ void Xfer::xferRGBAColorInt( RGBAColorInt *rgbaColorInt )
 	xferUnsignedInt( &rgbaColorInt->blue );
 	xferUnsignedInt( &rgbaColorInt->alpha );
 
-}  // end xferRGBAColorInt
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -353,7 +348,7 @@ void Xfer::xferObjectID( ObjectID *objectID )
 
 	xferImplementation( objectID, sizeof( ObjectID ) );
 
-}  // end xferObjeftID
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -362,7 +357,7 @@ void Xfer::xferDrawableID( DrawableID *drawableID )
 
 	xferImplementation( drawableID, sizeof( DrawableID ) );
 
-}  // end xferDrawableID
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -379,7 +374,7 @@ void Xfer::xferSTLObjectIDVector( std::vector<ObjectID> *objectIDVectorData )
 	// xfer the count of the vector
 	UnsignedShort listCount = objectIDVectorData->size();
 	xferUnsignedShort( &listCount );
-	
+
 	// xfer vector data
 	ObjectID objectID;
 	if( getXferMode() == XFER_SAVE || getXferMode() == XFER_CRC )
@@ -393,20 +388,20 @@ void Xfer::xferSTLObjectIDVector( std::vector<ObjectID> *objectIDVectorData )
 			objectID = *it;
 			xferObjectID( &objectID );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else if( getXferMode() == XFER_LOAD )
 	{
 
 		// sanity, the list should be empty before we transfer more data into it
-		if( objectIDVectorData->size() != 0 )
+		if( !objectIDVectorData->empty() )
 		{
 
-			DEBUG_CRASH(( "Xfer::xferSTLObjectIDList - object vector should be empty before loading\n" ));
+			DEBUG_CRASH(( "Xfer::xferSTLObjectIDList - object vector should be empty before loading" ));
 			throw XFER_LIST_NOT_EMPTY;
 
-		}  // end if
+		}
 
 		// read all ids
 		for( UnsignedShort i = 0; i < listCount; ++i )
@@ -415,16 +410,16 @@ void Xfer::xferSTLObjectIDVector( std::vector<ObjectID> *objectIDVectorData )
 			xferObjectID( &objectID );
 			objectIDVectorData->push_back( objectID );
 
-		}  // end for, i
+		}
 
-	}  // end else if
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "xferSTLObjectIDList - Unknown xfer mode '%d'\n", getXferMode() ));
+		DEBUG_CRASH(( "xferSTLObjectIDList - Unknown xfer mode '%d'", getXferMode() ));
 		throw XFER_MODE_UNKNOWN;
 
-	}  // end else
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -446,7 +441,7 @@ void Xfer::xferSTLObjectIDList( std::list< ObjectID > *objectIDListData )
 	// xfer the count of the list
 	UnsignedShort listCount = objectIDListData->size();
 	xferUnsignedShort( &listCount );
-	
+
 	// xfer list data
 	ObjectID objectID;
 	if( getXferMode() == XFER_SAVE || getXferMode() == XFER_CRC )
@@ -460,20 +455,20 @@ void Xfer::xferSTLObjectIDList( std::list< ObjectID > *objectIDListData )
 			objectID = *it;
 			xferObjectID( &objectID );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else if( getXferMode() == XFER_LOAD )
 	{
 
 		// sanity, the list should be empty before we transfer more data into it
-		if( objectIDListData->size() != 0 )
+		if( !objectIDListData->empty() )
 		{
 
-			DEBUG_CRASH(( "Xfer::xferSTLObjectIDList - object list should be empty before loading\n" ));
+			DEBUG_CRASH(( "Xfer::xferSTLObjectIDList - object list should be empty before loading" ));
 			throw XFER_LIST_NOT_EMPTY;
 
-		}  // end if
+		}
 
 		// read all ids
 		for( UnsignedShort i = 0; i < listCount; ++i )
@@ -482,18 +477,18 @@ void Xfer::xferSTLObjectIDList( std::list< ObjectID > *objectIDListData )
 			xferObjectID( &objectID );
 			objectIDListData->push_back( objectID );
 
-		}  // end for, i
+		}
 
-	}  // end else if
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "xferSTLObjectIDList - Unknown xfer mode '%d'\n", getXferMode() ));
+		DEBUG_CRASH(( "xferSTLObjectIDList - Unknown xfer mode '%d'", getXferMode() ));
 		throw XFER_MODE_UNKNOWN;
 
-	}  // end else
+	}
 
-}  // end xferSTLObjectIDList
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -512,7 +507,7 @@ void Xfer::xferSTLIntList( std::list< Int > *intListData )
 	// xfer the count of the list
 	UnsignedShort listCount = intListData->size();
 	xferUnsignedShort( &listCount );
-	
+
 	// xfer list data
 	Int intData;
 	if( getXferMode() == XFER_SAVE || getXferMode() == XFER_CRC )
@@ -526,20 +521,20 @@ void Xfer::xferSTLIntList( std::list< Int > *intListData )
 			intData = *it;
 			xferInt( &intData );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else if( getXferMode() == XFER_LOAD )
 	{
 
 		// sanity, the list should be empty before we transfer more data into it
-		if( intListData->size() != 0 )
+		if( !intListData->empty() )
 		{
 
-			DEBUG_CRASH(( "Xfer::xferSTLIntList - int list should be empty before loading\n" ));
+			DEBUG_CRASH(( "Xfer::xferSTLIntList - int list should be empty before loading" ));
 			throw XFER_LIST_NOT_EMPTY;
 
-		}  // end if
+		}
 
 		// read all ids
 		for( UnsignedShort i = 0; i < listCount; ++i )
@@ -548,18 +543,18 @@ void Xfer::xferSTLIntList( std::list< Int > *intListData )
 			xferInt( &intData );
 			intListData->push_back( intData );
 
-		}  // end for, i
+		}
 
-	}  // end else if
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "xferSTLIntList - Unknown xfer mode '%d'\n", getXferMode() ));
+		DEBUG_CRASH(( "xferSTLIntList - Unknown xfer mode '%d'", getXferMode() ));
 		throw XFER_MODE_UNKNOWN;
 
-	}  // end else
+	}
 
-}  // end xferSTLIntList
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -567,7 +562,7 @@ void Xfer::xferScienceType( ScienceType *science )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( science != NULL, ("xferScienceType - Invalid parameters\n") );
+	DEBUG_ASSERTCRASH( science != NULL, ("xferScienceType - Invalid parameters") );
 
 	AsciiString scienceName;
 
@@ -579,7 +574,7 @@ void Xfer::xferScienceType( ScienceType *science )
 		// write the string
 		xferAsciiString( &scienceName );
 
-	}  // end if, save
+	}
 	else if( getXferMode() == XFER_LOAD )
 	{
 		xferAsciiString( &scienceName );
@@ -589,26 +584,26 @@ void Xfer::xferScienceType( ScienceType *science )
 		if( *science == SCIENCE_INVALID )
 		{
 
-			DEBUG_CRASH(( "xferScienceType - Unknown science '%s'\n", scienceName.str() ));
+			DEBUG_CRASH(( "xferScienceType - Unknown science '%s'", scienceName.str() ));
 			throw XFER_UNKNOWN_STRING;
 
-		}  // end if
-			
-	}  // end else if, load
+		}
+
+	}
 	else if( getXferMode() == XFER_CRC )
 	{
 			xferImplementation( science, sizeof( *science ) );
 
-	}  // end else if, crc
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "xferScienceType - Unknown xfer mode '%d'\n", getXferMode() ));
+		DEBUG_CRASH(( "xferScienceType - Unknown xfer mode '%d'", getXferMode() ));
 		throw XFER_MODE_UNKNOWN;
 
-	}  // end else
+	}
 
-}  // end xferScienceType
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -616,7 +611,7 @@ void Xfer::xferScienceVec( ScienceVec *scienceVec )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( scienceVec != NULL, ("xferScienceVec - Invalid parameters\n") );
+	DEBUG_ASSERTCRASH( scienceVec != NULL, ("xferScienceVec - Invalid parameters") );
 
 	// this deserves a version number
 	const XferVersion currentVersion = 1;
@@ -644,7 +639,7 @@ void Xfer::xferScienceVec( ScienceVec *scienceVec )
 			scienceVec->clear();
 
 			// Homework for today.  Write 2000 words reconciling "Your code must never crash" with "Intentionally putting crashes in the code".  Fucktard.
-//			DEBUG_CRASH(( "xferScienceVec - vector is not empty, but should be\n" ));
+//			DEBUG_CRASH(( "xferScienceVec - vector is not empty, but should be" ));
 //			throw XFER_LIST_NOT_EMPTY;
 		}
 
@@ -652,9 +647,9 @@ void Xfer::xferScienceVec( ScienceVec *scienceVec )
 		{
 			ScienceType science;
 			xferScienceType(&science);
-			scienceVec->push_back( science );				
+			scienceVec->push_back( science );
 		}
-			
+
 	}
 	else if( getXferMode() == XFER_CRC )
 	{
@@ -662,20 +657,20 @@ void Xfer::xferScienceVec( ScienceVec *scienceVec )
 		{
 			ScienceType science = *it;
 			xferImplementation( &science, sizeof( ScienceType ) );
-		}  // end for, it
-	}  // end else if, crc
+		}
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "xferScienceVec - Unknown xfer mode '%d'\n", getXferMode() ));
+		DEBUG_CRASH(( "xferScienceVec - Unknown xfer mode '%d'", getXferMode() ));
 		throw XFER_MODE_UNKNOWN;
 
-	}  // end else
+	}
 
-}  // end xferScienceVec
+}
 
 // ------------------------------------------------------------------------------------------------
-/** kind of type, for load/save it is xfered as a string so we can reorder the 
+/** kind of type, for load/save it is xfered as a string so we can reorder the
 	* kindofs if we like
 	* Version Info:
 	* 1: Initial version */
@@ -696,10 +691,10 @@ void Xfer::xferKindOf( KindOfType *kindOfData )
 		AsciiString kindOfName = KindOfMaskType::getNameFromSingleBit(*kindOfData);
 		xferAsciiString( &kindOfName );
 
-	}  // end if, save
+	}
 	else if( getXferMode() == XFER_LOAD )
 	{
-		
+
 		// read ascii string from file
 		AsciiString kindOfName;
 		xferAsciiString( &kindOfName );
@@ -708,24 +703,24 @@ void Xfer::xferKindOf( KindOfType *kindOfData )
 		Int bit = KindOfMaskType::getSingleBitFromName(kindOfName.str());
 		if (bit != -1)
 			*kindOfData = (KindOfType)bit;
-				
-	}  // end else if, load
+
+	}
 	else if( getXferMode() == XFER_CRC )
 	{
 
 		// just call the xfer implementation on the data values
 		xferImplementation( kindOfData, sizeof( KindOfType ) );
 
-	}  // end else if, crc
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "xferKindOf - Unknown xfer mode '%d'\n", getXferMode() ));
+		DEBUG_CRASH(( "xferKindOf - Unknown xfer mode '%d'", getXferMode() ));
 		throw XFER_MODE_UNKNOWN;
 
-	}  // end else
+	}
 
-}  // end xferKindOf
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -737,12 +732,12 @@ void Xfer::xferUpgradeMask( UpgradeMaskType *upgradeMaskData )
 	XferVersion version = currentVersion;
 	xferVersion( &version, currentVersion );
 
-	//Kris: The Upgrade system has been converted from Int64 to BitFlags. However because the 
+	//Kris: The Upgrade system has been converted from Int64 to BitFlags. However because the
 	//names of upgrades are saved to preserve order reassignments (inserting a new upgrade in
 	//the INI file will skew the bit values), we must continue saving the names of the upgrades
 	//in order to recalculate the actual bit value of said upgrade.
 	//---------------------------------------------------------------------------------------------
-	//NOTE: The xfer code didn't have to change with the bitset upgrades, because either way, we're 
+	//NOTE: The xfer code didn't have to change with the bitset upgrades, because either way, we're
 	//converting data <-> Ascii, so the minor syntax works with the before and after code!
 
 	// check which type of xfer we're doing
@@ -760,7 +755,7 @@ void Xfer::xferUpgradeMask( UpgradeMaskType *upgradeMaskData )
 			{
 				count++;
 			}
-		}  // end for, upgradeTemplate
+		}
 
 		// write the count
 		xferUnsignedShort( &count );
@@ -773,9 +768,9 @@ void Xfer::xferUpgradeMask( UpgradeMaskType *upgradeMaskData )
 			{
 				upgradeName = upgradeTemplate->getUpgradeName();
 				xferAsciiString( &upgradeName );
-			}  // end if
-		}  // end for, upgradeTemplate
-	}  // end if, save
+			}
+		}
+	}
 	else if( getXferMode() == XFER_LOAD )
 	{
 		AsciiString upgradeName;
@@ -800,33 +795,33 @@ void Xfer::xferUpgradeMask( UpgradeMaskType *upgradeMaskData )
 			if( upgradeTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "Xfer::xferUpgradeMask - Unknown upgrade '%s'\n", upgradeName.str() ));
+				DEBUG_CRASH(( "Xfer::xferUpgradeMask - Unknown upgrade '%s'", upgradeName.str() ));
 				throw XFER_UNKNOWN_STRING;
 
-			}  // end if
+			}
 
 			// set the mask data
 			upgradeMaskData->set( upgradeTemplate->getUpgradeMask() );
 
-		}  // end for i
+		}
 
-	}  // end else if, load
+	}
 	else if( getXferMode() == XFER_CRC )
 	{
 
 		// just xfer implementation the data itself
 		xferImplementation( upgradeMaskData, sizeof( UpgradeMaskType ) );
 
-	}  // end else if, crc
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "xferUpgradeMask - Unknown xfer mode '%d'\n", getXferMode() ));
+		DEBUG_CRASH(( "xferUpgradeMask - Unknown xfer mode '%d'", getXferMode() ));
 		throw XFER_MODE_UNKNOWN;
 
-	}  // end else
-	
-}  // end xferUpgradeMask
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -835,7 +830,7 @@ void Xfer::xferUser( void *data, Int dataSize )
 
 	xferImplementation( data, dataSize );
 
-}  // end xferUser
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
diff --git a/Core/GameEngine/Source/Common/System/XferCRC.cpp b/Core/GameEngine/Source/Common/System/XferCRC.cpp
index b90e643386a..520cd2cc4fc 100644
--- a/Core/GameEngine/Source/Common/System/XferCRC.cpp
+++ b/Core/GameEngine/Source/Common/System/XferCRC.cpp
@@ -28,13 +28,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/XferCRC.h"
 #include "Common/XferDeepCRC.h"
 #include "Common/crc.h"
 #include "Common/Snapshot.h"
-#include "winsock2.h" // for htonl
+#include "utility/endian_compat.h"
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -42,18 +42,15 @@ XferCRC::XferCRC( void )
 {
 
 	m_xferMode = XFER_CRC;
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_crc = 0;
-	//
-}  // end XferCRC
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 XferCRC::~XferCRC( void )
 {
 
-}  // end ~XferCRC
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Open file 'identifier' for writing */
@@ -67,7 +64,7 @@ void XferCRC::open( AsciiString identifier )
 	// initialize CRC to brand new one at zero
 	m_crc = 0;
 
-}  // end open
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Close our current file */
@@ -75,7 +72,7 @@ void XferCRC::open( AsciiString identifier )
 void XferCRC::close( void )
 {
 
-}  // end close
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -84,37 +81,23 @@ Int XferCRC::beginBlock( void )
 
 	return 0;
 
-}  // end beginBlock
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void XferCRC::endBlock( void )
 {
 
-}  // end endBlock
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void XferCRC::addCRC( UnsignedInt val )
 {
-	int hibit;
 
-	val = htonl(val);
+	m_crc = (m_crc << 1) + htobe(val) + ((m_crc >> 31) & 0x01);
 
-	if (m_crc & 0x80000000)
-	{
-		hibit = 1;
-	}
-	else
-	{
-		hibit = 0;
-	}
-
-	m_crc <<= 1;
-	m_crc += val;
-	m_crc += hibit;
-
-}  // end addCRC
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Entry point for xfering a snapshot */
@@ -127,61 +110,64 @@ void XferCRC::xferSnapshot( Snapshot *snapshot )
 
 		return;
 
-	}  // end if
+	}
 
 	// run the crc function of the snapshot
 	snapshot->crc( this );
 
-}  // end xferSnapshot
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Perform a single CRC operation on the data passed in */
 //-------------------------------------------------------------------------------------------------
 void XferCRC::xferImplementation( void *data, Int dataSize )
 {
-
-	if (!data || dataSize < 1)
-	{
-		return;
-	}
-
 	const UnsignedInt *uintPtr = (const UnsignedInt *) (data);
+	dataSize *= (data != NULL);
 
-	for (Int i=0 ; i<dataSize/4 ; i++)
+	int dataBytes = (dataSize / 4);
+
+	for (Int i=0 ; i<dataBytes; ++i)
 	{
 		addCRC (*uintPtr++);
 	}
 
-	int leftover = dataSize & 3;
-	if (leftover)
+	UnsignedInt val = 0;
+	const unsigned char *c = (const unsigned char *)uintPtr;
+
+	switch(dataSize & 3)
 	{
-		UnsignedInt val = 0;
-		const unsigned char *c = (const unsigned char *)uintPtr;
-		for (Int i=0; i<leftover; i++)
-		{
-			val += (c[i] << (i*8));
-		}
-		val = htonl(val);
-		addCRC (val);
+	case 3:
+		val += (c[2] << 16);
+		FALLTHROUGH;
+	case 2:
+		val += (c[1] << 8);
+		FALLTHROUGH;
+	case 1:
+		val += c[0];
+		m_crc = (m_crc << 1) + val + ((m_crc >> 31) & 0x01);
+		FALLTHROUGH;
+	default:
+		break;
 	}
-	
-}  // end xferImplementation
+
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void XferCRC::skip( Int dataSize )
 {
 
-}  // end skip
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 UnsignedInt XferCRC::getCRC( void )
 {
 
-	return htonl(m_crc);
+	return htobe(m_crc);
 
-}  // end skip
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -192,7 +178,7 @@ XferDeepCRC::XferDeepCRC( void )
 	m_xferMode = XFER_SAVE;
 	m_fileFP = NULL;
 
-}  // end XferCRC
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -203,12 +189,12 @@ XferDeepCRC::~XferDeepCRC( void )
 	if( m_fileFP != NULL )
 	{
 
-		DEBUG_CRASH(( "Warning: Xfer file '%s' was left open\n", m_identifier.str() ));
+		DEBUG_CRASH(( "Warning: Xfer file '%s' was left open", m_identifier.str() ));
 		close();
 
-	}  // end if
+	}
 
-}  // end ~XferCRC
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Open file 'identifier' for writing */
@@ -222,11 +208,11 @@ void XferDeepCRC::open( AsciiString identifier )
 	if( m_fileFP != NULL )
 	{
 
-		DEBUG_CRASH(( "Cannot open file '%s' cause we've already got '%s' open\n",
+		DEBUG_CRASH(( "Cannot open file '%s' cause we've already got '%s' open",
 									identifier.str(), m_identifier.str() ));
 		throw XFER_FILE_ALREADY_OPEN;
 
-	}  // end if
+	}
 
 	// call base class
 	Xfer::open( identifier );
@@ -235,16 +221,16 @@ void XferDeepCRC::open( AsciiString identifier )
 	m_fileFP = fopen( identifier.str(), "w+b" );
 	if( m_fileFP == NULL )
 	{
-		
-		DEBUG_CRASH(( "File '%s' not found\n", identifier.str() ));
+
+		DEBUG_CRASH(( "File '%s' not found", identifier.str() ));
 		throw XFER_FILE_NOT_FOUND;
 
-	}  // end if
+	}
 
 	// initialize CRC to brand new one at zero
 	m_crc = 0;
 
-}  // end open
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Close our current file */
@@ -256,10 +242,10 @@ void XferDeepCRC::close( void )
 	if( m_fileFP == NULL )
 	{
 
-		DEBUG_CRASH(( "Xfer close called, but no file was open\n" ));
+		DEBUG_CRASH(( "Xfer close called, but no file was open" ));
 		throw XFER_FILE_NOT_OPEN;
 
-	}  // end if
+	}
 
 	// close the file
 	fclose( m_fileFP );
@@ -268,7 +254,7 @@ void XferDeepCRC::close( void )
 	// erase the filename
 	m_identifier.clear();
 
-}  // end close
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Perform a single CRC operation on the data passed in */
@@ -282,21 +268,21 @@ void XferDeepCRC::xferImplementation( void *data, Int dataSize )
 	}
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("XferSave - file pointer for '%s' is NULL\n",
+	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("XferSave - file pointer for '%s' is NULL",
 										 m_identifier.str()) );
 
 	// write data to file
 	if( fwrite( data, dataSize, 1, m_fileFP ) != 1 )
 	{
 
-		DEBUG_CRASH(( "XferSave - Error writing to file '%s'\n", m_identifier.str() ));
+		DEBUG_CRASH(( "XferSave - Error writing to file '%s'", m_identifier.str() ));
 		throw XFER_WRITE_ERROR;
 
-	}  // end if
+	}
 
 	XferCRC::xferImplementation( data, dataSize );
 
-}  // end xferImplementation
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Save ascii string */
@@ -304,7 +290,7 @@ void XferDeepCRC::xferImplementation( void *data, Int dataSize )
 void XferDeepCRC::xferMarkerLabel( AsciiString asciiStringData )
 {
 
-}  // end xferAsciiString
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Save ascii string */
@@ -316,10 +302,10 @@ void XferDeepCRC::xferAsciiString( AsciiString *asciiStringData )
 	if( asciiStringData->getLength() > 16385 )
 	{
 
-		DEBUG_CRASH(( "XferSave cannot save this ascii string because it's too long.  Change the size of the length header (but be sure to preserve save file compatability\n" ));
+		DEBUG_CRASH(( "XferSave cannot save this ascii string because it's too long.  Change the size of the length header (but be sure to preserve save file compatability" ));
 		throw XFER_STRING_ERROR;
 
-	}  // end if
+	}
 
 	// save length of string to follow
 	UnsignedShort len = asciiStringData->getLength();
@@ -329,22 +315,22 @@ void XferDeepCRC::xferAsciiString( AsciiString *asciiStringData )
 	if( len > 0 )
 		xferUser( (void *)asciiStringData->str(), sizeof( Byte ) * len );
 
-}  // end xferAsciiString
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Save unicodee string */
 // ------------------------------------------------------------------------------------------------
 void XferDeepCRC::xferUnicodeString( UnicodeString *unicodeStringData )
 {
-	
+
 	// sanity
 	if( unicodeStringData->getLength() > 255 )
 	{
 
-		DEBUG_CRASH(( "XferSave cannot save this unicode string because it's too long.  Change the size of the length header (but be sure to preserve save file compatability\n" ));
+		DEBUG_CRASH(( "XferSave cannot save this unicode string because it's too long.  Change the size of the length header (but be sure to preserve save file compatability" ));
 		throw XFER_STRING_ERROR;
 
-	}  // end if
+	}
 
 	// save length of string to follow
 	Byte len = unicodeStringData->getLength();
@@ -354,4 +340,4 @@ void XferDeepCRC::xferUnicodeString( UnicodeString *unicodeStringData )
 	if( len > 0 )
 		xferUser( (void *)unicodeStringData->str(), sizeof( WideChar ) * len );
 
-}  // end xferUnicodeString
+}
diff --git a/Core/GameEngine/Source/Common/System/XferLoad.cpp b/Core/GameEngine/Source/Common/System/XferLoad.cpp
index c188c6e1c63..9b1f1981b3c 100644
--- a/Core/GameEngine/Source/Common/System/XferLoad.cpp
+++ b/Core/GameEngine/Source/Common/System/XferLoad.cpp
@@ -42,7 +42,7 @@ XferLoad::XferLoad( void )
 	m_xferMode = XFER_LOAD;
 	m_fileFP = NULL;
 
-}  // end XferLoad
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -53,12 +53,12 @@ XferLoad::~XferLoad( void )
 	if( m_fileFP != NULL )
 	{
 
-		DEBUG_CRASH(( "Warning: Xfer file '%s' was left open\n", m_identifier.str() ));
+		DEBUG_CRASH(( "Warning: Xfer file '%s' was left open", m_identifier.str() ));
 		close();
 
-	}  // end if
+	}
 
-}  // end ~XferLoad
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Open file 'identifier' for reading */
@@ -70,11 +70,11 @@ void XferLoad::open( AsciiString identifier )
 	if( m_fileFP != NULL )
 	{
 
-		DEBUG_CRASH(( "Cannot open file '%s' cause we've already got '%s' open\n",
+		DEBUG_CRASH(( "Cannot open file '%s' cause we've already got '%s' open",
 									identifier.str(), m_identifier.str() ));
 		throw XFER_FILE_ALREADY_OPEN;
 
-	}  // end if
+	}
 
 	// call base class
 	Xfer::open( identifier );
@@ -83,13 +83,13 @@ void XferLoad::open( AsciiString identifier )
 	m_fileFP = fopen( identifier.str(), "rb" );
 	if( m_fileFP == NULL )
 	{
-		
-		DEBUG_CRASH(( "File '%s' not found\n", identifier.str() ));
+
+		DEBUG_CRASH(( "File '%s' not found", identifier.str() ));
 		throw XFER_FILE_NOT_FOUND;
 
-	}  // end if
+	}
 
-}  // end open
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Close our current file */
@@ -101,10 +101,10 @@ void XferLoad::close( void )
 	if( m_fileFP == NULL )
 	{
 
-		DEBUG_CRASH(( "Xfer close called, but no file was open\n" ));
+		DEBUG_CRASH(( "Xfer close called, but no file was open" ));
 		throw XFER_FILE_NOT_OPEN;
 
-	}  // end if
+	}
 
 	// close the file
 	fclose( m_fileFP );
@@ -113,7 +113,7 @@ void XferLoad::close( void )
 	// erase the filename
 	m_identifier.clear();
 
-}  // end close
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Read a block size descriptor from the file at the current position */
@@ -122,23 +122,23 @@ Int XferLoad::beginBlock( void )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("Xfer begin block - file pointer for '%s' is NULL\n",
+	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("Xfer begin block - file pointer for '%s' is NULL",
 										 m_identifier.str()) );
 
 	// read block size
 	XferBlockSize blockSize;
 	if( fread( &blockSize, sizeof( XferBlockSize ), 1, m_fileFP ) != 1 )
 	{
-		
-		DEBUG_CRASH(( "Xfer - Error reading block size for '%s'\n", m_identifier.str() ));
+
+		DEBUG_CRASH(( "Xfer - Error reading block size for '%s'", m_identifier.str() ));
 		return 0;
 
-	}  // end if
+	}
 
 	// return the block size
 	return blockSize;
 
-}  // end beginBlock
+}
 
 // ------------------------------------------------------------------------------------------------
 /** End block ... this does nothing when reading */
@@ -146,7 +146,7 @@ Int XferLoad::beginBlock( void )
 void XferLoad::endBlock( void )
 {
 
-}  // end endBlock
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Skip forward 'dataSize' bytes in the file */
@@ -155,18 +155,18 @@ void XferLoad::skip( Int dataSize )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("XferLoad::skip - file pointer for '%s' is NULL\n",
+	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("XferLoad::skip - file pointer for '%s' is NULL",
 										 m_identifier.str()) );
 
 	// sanity
-	DEBUG_ASSERTCRASH( dataSize >=0, ("XferLoad::skip - dataSize '%d' must be greater than 0\n",
+	DEBUG_ASSERTCRASH( dataSize >=0, ("XferLoad::skip - dataSize '%d' must be greater than 0",
 										 dataSize) );
 
 	// skip datasize in the file from the current position
 	if( fseek( m_fileFP, dataSize, SEEK_CUR ) != 0 )
 		throw XFER_SKIP_ERROR;
 
-}  // end skip
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Entry point for xfering a snapshot */
@@ -177,10 +177,10 @@ void XferLoad::xferSnapshot( Snapshot *snapshot )
 	if( snapshot == NULL )
 	{
 
-		DEBUG_CRASH(( "XferLoad::xferSnapshot - Invalid parameters\n" ));
+		DEBUG_CRASH(( "XferLoad::xferSnapshot - Invalid parameters" ));
 		throw XFER_INVALID_PARAMETERS;
 
-	}  // end if
+	}
 
 	// run the xfer function of the snapshot
 	snapshot->xfer( this );
@@ -189,14 +189,14 @@ void XferLoad::xferSnapshot( Snapshot *snapshot )
 	if( BitIsSet( getOptions(), XO_NO_POST_PROCESSING ) == FALSE )
 		TheGameState->addPostProcessSnapshot( snapshot );
 
-}  // end xferSnapshot
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Read string from file and store in ascii string */
 // ------------------------------------------------------------------------------------------------
 void XferLoad::xferAsciiString( AsciiString *asciiStringData )
 {
-	
+
 	// read bytes of string length to follow
 	UnsignedByte len;
 	xferUnsignedByte( &len );
@@ -212,14 +212,14 @@ void XferLoad::xferAsciiString( AsciiString *asciiStringData )
 	// save into ascii string
 	asciiStringData->set( buffer );
 
-}  // end xferAsciiString
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Read string from file and store in unicode string */
 // ------------------------------------------------------------------------------------------------
 void XferLoad::xferUnicodeString( UnicodeString *unicodeStringData )
 {
-	
+
 	// read bytes of string length to follow
 	UnsignedByte len;
 	xferUnsignedByte( &len );
@@ -235,7 +235,7 @@ void XferLoad::xferUnicodeString( UnicodeString *unicodeStringData )
 	// save into unicode string
 	unicodeStringData->set( buffer );
 
-}  // end xferUnicodeString
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Perform the read operation */
@@ -244,17 +244,17 @@ void XferLoad::xferImplementation( void *data, Int dataSize )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("XferLoad - file pointer for '%s' is NULL\n",
+	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("XferLoad - file pointer for '%s' is NULL",
 										 m_identifier.str()) );
 
 	// read data from file
 	if( fread( data, dataSize, 1, m_fileFP ) != 1 )
 	{
 
-		DEBUG_CRASH(( "XferLoad - Error reading from file '%s'\n", m_identifier.str() ));
+		DEBUG_CRASH(( "XferLoad - Error reading from file '%s'", m_identifier.str() ));
 		throw XFER_READ_ERROR;
 
-	}  // end if
-	
-}  // end xferImplementation
+	}
+
+}
 
diff --git a/Core/GameEngine/Source/Common/System/XferSave.cpp b/Core/GameEngine/Source/Common/System/XferSave.cpp
index c436677b8fc..292cb6c8838 100644
--- a/Core/GameEngine/Source/Common/System/XferSave.cpp
+++ b/Core/GameEngine/Source/Common/System/XferSave.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/XferSave.h"
 #include "Common/Snapshot.h"
 #include "Common/GameMemory.h"
@@ -36,7 +36,7 @@
 // PRIVATE TYPES //////////////////////////////////////////////////////////////////////////////////
 class XferBlockData : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(XferBlockData, "XferBlockData")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(XferBlockData, "XferBlockData")
 
 public:
 
@@ -59,7 +59,7 @@ XferSave::XferSave( void )
 	m_fileFP = NULL;
 	m_blockStack = NULL;
 
-}  // end XferSave
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -70,10 +70,10 @@ XferSave::~XferSave( void )
 	if( m_fileFP != NULL )
 	{
 
-		DEBUG_CRASH(( "Warning: Xfer file '%s' was left open\n", m_identifier.str() ));
+		DEBUG_CRASH(( "Warning: Xfer file '%s' was left open", m_identifier.str() ));
 		close();
 
-	}  // end if
+	}
 
 	//
 	// the block stack should be empty, if it's not that means we started blocks but never
@@ -83,7 +83,7 @@ XferSave::~XferSave( void )
 	{
 
 		// tell the user there is an error
-		DEBUG_CRASH(( "Warning: XferSave::~XferSave - m_blockStack was not NULL!\n" ));
+		DEBUG_CRASH(( "Warning: XferSave::~XferSave - m_blockStack was not NULL!" ));
 
 		// delete the block stack
 		XferBlockData *next;
@@ -94,11 +94,11 @@ XferSave::~XferSave( void )
 			deleteInstance(m_blockStack);
 			m_blockStack = next;
 
-		}  // end while
+		}
 
-	}  // end if
+	}
 
-}  // end ~XferSave
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Open file 'identifier' for writing */
@@ -110,11 +110,11 @@ void XferSave::open( AsciiString identifier )
 	if( m_fileFP != NULL )
 	{
 
-		DEBUG_CRASH(( "Cannot open file '%s' cause we've already got '%s' open\n",
+		DEBUG_CRASH(( "Cannot open file '%s' cause we've already got '%s' open",
 									identifier.str(), m_identifier.str() ));
 		throw XFER_FILE_ALREADY_OPEN;
 
-	}  // end if
+	}
 
 	// call base class
 	Xfer::open( identifier );
@@ -123,13 +123,13 @@ void XferSave::open( AsciiString identifier )
 	m_fileFP = fopen( identifier.str(), "w+b" );
 	if( m_fileFP == NULL )
 	{
-		
-		DEBUG_CRASH(( "File '%s' not found\n", identifier.str() ));
+
+		DEBUG_CRASH(( "File '%s' not found", identifier.str() ));
 		throw XFER_FILE_NOT_FOUND;
 
-	}  // end if
+	}
 
-}  // end open
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Close our current file */
@@ -141,10 +141,10 @@ void XferSave::close( void )
 	if( m_fileFP == NULL )
 	{
 
-		DEBUG_CRASH(( "Xfer close called, but no file was open\n" ));
+		DEBUG_CRASH(( "Xfer close called, but no file was open" ));
 		throw XFER_FILE_NOT_OPEN;
 
-	}  // end if
+	}
 
 	// close the file
 	fclose( m_fileFP );
@@ -153,12 +153,12 @@ void XferSave::close( void )
 	// erase the filename
 	m_identifier.clear();
 
-}  // end close
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Write a placeholder at the current location in the file and store this location
 	* internally.  The next endBlock that is called will back up to the most recently stored
-	* beginBlock and write the difference in file bytes from the endBlock call to the 
+	* beginBlock and write the difference in file bytes from the endBlock call to the
 	* location of this beginBlock.  The current file position will then return to the location
 	* at which endBlock was called */
 //-------------------------------------------------------------------------------------------------
@@ -166,7 +166,7 @@ Int XferSave::beginBlock( void )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("Xfer begin block - file pointer for '%s' is NULL\n",
+	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("Xfer begin block - file pointer for '%s' is NULL",
 										 m_identifier.str()) );
 
 	// get the current file position so we can back up here for the next end block call
@@ -176,12 +176,12 @@ Int XferSave::beginBlock( void )
 	XferBlockSize blockSize = 0;
 	if( fwrite( &blockSize, sizeof( XferBlockSize ), 1, m_fileFP ) != 1 )
 	{
-		
-		DEBUG_CRASH(( "XferSave::beginBlock - Error writing block size in '%s'\n",
+
+		DEBUG_CRASH(( "XferSave::beginBlock - Error writing block size in '%s'",
 									m_identifier.str() ));
 		return XFER_WRITE_ERROR;
 
-	}  // end if
+	}
 
 	// save this block position on the top of the "stack"
 	XferBlockData *top = newInstance(XferBlockData);
@@ -189,7 +189,7 @@ Int XferSave::beginBlock( void )
 //	if( top == NULL )
 //	{
 //
-//		DEBUG_CRASH(( "XferSave - Begin block, out of memory - can't save block stack data\n" ));
+//		DEBUG_CRASH(( "XferSave - Begin block, out of memory - can't save block stack data" ));
 //		return XFER_OUT_OF_MEMORY;
 //
 //	}  // end if
@@ -200,7 +200,7 @@ Int XferSave::beginBlock( void )
 
 	return XFER_OK;
 
-}  // end beginBlock
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Do the tail end as described in beginBlock above.  Back up to the last begin block,
@@ -211,17 +211,17 @@ void XferSave::endBlock( void )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("Xfer end block - file pointer for '%s' is NULL\n",
+	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("Xfer end block - file pointer for '%s' is NULL",
 										 m_identifier.str()) );
 
 	// sanity, make sure we have a block started
 	if( m_blockStack == NULL )
 	{
 
-		DEBUG_CRASH(( "Xfer end block called, but no matching begin block was found\n" ));
+		DEBUG_CRASH(( "Xfer end block called, but no matching begin block was found" ));
 		throw XFER_BEGIN_END_MISMATCH;
 
-	}  // end if
+	}
 
 	// save our current file position
 	XferFilePos currentFilePos = ftell( m_fileFP );
@@ -238,10 +238,10 @@ void XferSave::endBlock( void )
 	if( fwrite( &blockSize, sizeof( XferBlockSize ), 1, m_fileFP ) != 1 )
 	{
 
-		DEBUG_CRASH(( "Error writing block size to file '%s'\n", m_identifier.str() ));
+		DEBUG_CRASH(( "Error writing block size to file '%s'", m_identifier.str() ));
 		throw XFER_WRITE_ERROR;
 
-	}  // end if
+	}
 
 	// place the file pointer back to the current position
 	fseek( m_fileFP, currentFilePos, SEEK_SET );
@@ -249,7 +249,7 @@ void XferSave::endBlock( void )
 	// delete the block data as it's all used up now
 	deleteInstance(top);
 
-}  // end endBlock
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Skip forward 'dataSize' bytes in the file */
@@ -258,14 +258,14 @@ void XferSave::skip( Int dataSize )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("XferSave - file pointer for '%s' is NULL\n",
+	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("XferSave - file pointer for '%s' is NULL",
 										 m_identifier.str()) );
 
 
 	// skip forward dataSize bytes
 	fseek( m_fileFP, dataSize, SEEK_CUR );
 
-}  // end skip
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Entry point for xfering a snapshot */
@@ -276,15 +276,15 @@ void XferSave::xferSnapshot( Snapshot *snapshot )
 	if( snapshot == NULL )
 	{
 
-		DEBUG_CRASH(( "XferSave::xferSnapshot - Invalid parameters\n" ));
+		DEBUG_CRASH(( "XferSave::xferSnapshot - Invalid parameters" ));
 		throw XFER_INVALID_PARAMETERS;
 
-	}  // end if
+	}
 
 	// run the xfer function of the snapshot
 	snapshot->xfer( this );
 
-}  // end xferSnapshot
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Save ascii string */
@@ -296,11 +296,11 @@ void XferSave::xferAsciiString( AsciiString *asciiStringData )
 	if( asciiStringData->getLength() > 255 )
 	{
 
-		DEBUG_CRASH(( "XferSave cannot save this unicode string because it's too long.  Change the size of the length header (but be sure to preserve save file compatability\n" ));
+		DEBUG_CRASH(( "XferSave cannot save this unicode string because it's too long.  Change the size of the length header (but be sure to preserve save file compatability" ));
 		throw XFER_STRING_ERROR;
 
-	}  // end if
-	
+	}
+
 	// save length of string to follow
 	UnsignedByte len = asciiStringData->getLength();
 	xferUnsignedByte( &len );
@@ -309,22 +309,22 @@ void XferSave::xferAsciiString( AsciiString *asciiStringData )
 	if( len > 0 )
 		xferUser( (void *)asciiStringData->str(), sizeof( Byte ) * len );
 
-}  // end xferAsciiString
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Save unicodee string */
 // ------------------------------------------------------------------------------------------------
 void XferSave::xferUnicodeString( UnicodeString *unicodeStringData )
 {
-	
+
 	// sanity
 	if( unicodeStringData->getLength() > 255 )
 	{
 
-		DEBUG_CRASH(( "XferSave cannot save this unicode string because it's too long.  Change the size of the length header (but be sure to preserve save file compatability\n" ));
+		DEBUG_CRASH(( "XferSave cannot save this unicode string because it's too long.  Change the size of the length header (but be sure to preserve save file compatability" ));
 		throw XFER_STRING_ERROR;
 
-	}  // end if
+	}
 
 	// save length of string to follow
 	UnsignedByte len = unicodeStringData->getLength();
@@ -334,7 +334,7 @@ void XferSave::xferUnicodeString( UnicodeString *unicodeStringData )
 	if( len > 0 )
 		xferUser( (void *)unicodeStringData->str(), sizeof( WideChar ) * len );
 
-}  // end xferUnicodeString
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Perform the write operation */
@@ -343,16 +343,16 @@ void XferSave::xferImplementation( void *data, Int dataSize )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("XferSave - file pointer for '%s' is NULL\n",
+	DEBUG_ASSERTCRASH( m_fileFP != NULL, ("XferSave - file pointer for '%s' is NULL",
 										 m_identifier.str()) );
 
 	// write data to file
 	if( fwrite( data, dataSize, 1, m_fileFP ) != 1 )
 	{
 
-		DEBUG_CRASH(( "XferSave - Error writing to file '%s'\n", m_identifier.str() ));
+		DEBUG_CRASH(( "XferSave - Error writing to file '%s'", m_identifier.str() ));
 		throw XFER_WRITE_ERROR;
 
-	}  // end if
-	
-}  // end xferImplementation
+	}
+
+}
diff --git a/Core/GameEngine/Source/Common/WorkerProcess.cpp b/Core/GameEngine/Source/Common/WorkerProcess.cpp
new file mode 100644
index 00000000000..5970225a383
--- /dev/null
+++ b/Core/GameEngine/Source/Common/WorkerProcess.cpp
@@ -0,0 +1,231 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+#include "Common/WorkerProcess.h"
+
+// We need Job-related functions, but these aren't defined in the Windows-headers that VC6 uses.
+// So we define them here and load them dynamically.
+#if defined(_MSC_VER) && _MSC_VER < 1300
+struct JOBOBJECT_BASIC_LIMIT_INFORMATION2
+{
+	LARGE_INTEGER PerProcessUserTimeLimit;
+	LARGE_INTEGER PerJobUserTimeLimit;
+	DWORD LimitFlags;
+	SIZE_T MinimumWorkingSetSize;
+	SIZE_T MaximumWorkingSetSize;
+	DWORD ActiveProcessLimit;
+	ULONG_PTR Affinity;
+	DWORD PriorityClass;
+	DWORD SchedulingClass;
+};
+struct IO_COUNTERS
+{
+	ULONGLONG ReadOperationCount;
+	ULONGLONG WriteOperationCount;
+	ULONGLONG OtherOperationCount;
+	ULONGLONG ReadTransferCount;
+	ULONGLONG WriteTransferCount;
+	ULONGLONG OtherTransferCount;
+};
+struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION
+{
+	JOBOBJECT_BASIC_LIMIT_INFORMATION2 BasicLimitInformation;
+	IO_COUNTERS IoInfo;
+	SIZE_T ProcessMemoryLimit;
+	SIZE_T JobMemoryLimit;
+	SIZE_T PeakProcessMemoryUsed;
+	SIZE_T PeakJobMemoryUsed;
+};
+
+#define JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE 0x00002000
+const int JobObjectExtendedLimitInformation = 9;
+
+typedef HANDLE (WINAPI *PFN_CreateJobObjectW)(LPSECURITY_ATTRIBUTES, LPCWSTR);
+typedef BOOL (WINAPI *PFN_SetInformationJobObject)(HANDLE, JOBOBJECTINFOCLASS, LPVOID, DWORD);
+typedef BOOL (WINAPI *PFN_AssignProcessToJobObject)(HANDLE, HANDLE);
+
+static PFN_CreateJobObjectW CreateJobObjectW = (PFN_CreateJobObjectW)GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "CreateJobObjectW");
+static PFN_SetInformationJobObject SetInformationJobObject = (PFN_SetInformationJobObject)GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "SetInformationJobObject");
+static PFN_AssignProcessToJobObject AssignProcessToJobObject = (PFN_AssignProcessToJobObject)GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "AssignProcessToJobObject");
+#endif
+
+WorkerProcess::WorkerProcess()
+{
+	m_processHandle = NULL;
+	m_readHandle = NULL;
+	m_jobHandle = NULL;
+	m_exitcode = 0;
+	m_isDone = false;
+}
+
+bool WorkerProcess::startProcess(UnicodeString command)
+{
+	m_stdOutput.clear();
+	m_isDone = false;
+
+	// Create pipe for reading console output
+	SECURITY_ATTRIBUTES saAttr = { sizeof(SECURITY_ATTRIBUTES) };
+	saAttr.bInheritHandle = TRUE;
+	HANDLE writeHandle = NULL;
+	if (!CreatePipe(&m_readHandle, &writeHandle, &saAttr, 0))
+		return false;
+	SetHandleInformation(m_readHandle, HANDLE_FLAG_INHERIT, 0);
+
+	STARTUPINFOW si = { sizeof(STARTUPINFOW) };
+	si.dwFlags = STARTF_FORCEOFFFEEDBACK; // Prevent cursor wait animation
+	si.dwFlags |= STARTF_USESTDHANDLES;
+	si.hStdError = writeHandle;
+	si.hStdOutput = writeHandle;
+
+	PROCESS_INFORMATION pi = { 0 };
+
+	if (!CreateProcessW(NULL, (LPWSTR)command.str(),
+			NULL, NULL, /*bInheritHandles=*/TRUE, 0,
+			NULL, 0, &si, &pi))
+	{
+		CloseHandle(writeHandle);
+		CloseHandle(m_readHandle);
+		m_readHandle = NULL;
+		return false;
+	}
+
+	CloseHandle(pi.hThread);
+	CloseHandle(writeHandle);
+	m_processHandle = pi.hProcess;
+
+	// We want to make sure that when our process is killed, our workers automatically terminate as well.
+	// In Windows, the way to do this is to attach the worker to a job we own.
+	m_jobHandle = CreateJobObjectW != NULL ? CreateJobObjectW(NULL, NULL) : NULL;
+	if (m_jobHandle != NULL)
+	{
+		JOBOBJECT_EXTENDED_LIMIT_INFORMATION jobInfo = { 0 };
+		jobInfo.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
+		SetInformationJobObject(m_jobHandle, (JOBOBJECTINFOCLASS)JobObjectExtendedLimitInformation, &jobInfo, sizeof(jobInfo));
+		AssignProcessToJobObject(m_jobHandle, m_processHandle);
+	}
+
+	return true;
+}
+
+bool WorkerProcess::isRunning() const
+{
+	return m_processHandle != NULL;
+}
+
+bool WorkerProcess::isDone() const
+{
+	return m_isDone;
+}
+
+DWORD WorkerProcess::getExitCode() const
+{
+	return m_exitcode;
+}
+
+AsciiString WorkerProcess::getStdOutput() const
+{
+	return m_stdOutput;
+}
+
+bool WorkerProcess::fetchStdOutput()
+{
+	while (true)
+	{
+		// Call PeekNamedPipe to make sure ReadFile won't block
+		DWORD bytesAvailable = 0;
+		DEBUG_ASSERTCRASH(m_readHandle != NULL, ("Is not expected NULL"));
+		BOOL success = PeekNamedPipe(m_readHandle, NULL, 0, NULL, &bytesAvailable, NULL);
+		if (!success)
+			return true;
+		if (bytesAvailable == 0)
+		{
+			// Child process is still running and we have all output so far
+			return false;
+		}
+
+		DWORD readBytes = 0;
+		char buffer[1024];
+		success = ReadFile(m_readHandle, buffer, ARRAY_SIZE(buffer)-1, &readBytes, NULL);
+		if (!success)
+			return true;
+		DEBUG_ASSERTCRASH(readBytes != 0, ("expected readBytes to be non null"));
+
+		// Remove \r, otherwise each new line is doubled when we output it again
+		for (int i = 0; i < readBytes; i++)
+			if (buffer[i] == '\r')
+				buffer[i] = ' ';
+		buffer[readBytes] = 0;
+		m_stdOutput.concat(buffer);
+	}
+}
+
+void WorkerProcess::update()
+{
+	if (!isRunning())
+		return;
+
+	if (!fetchStdOutput())
+	{
+		// There is still potential output pending
+		return;
+	}
+
+	// Pipe broke, that means the process already exited. But we call this just to make sure
+	WaitForSingleObject(m_processHandle, INFINITE);
+	GetExitCodeProcess(m_processHandle, &m_exitcode);
+	CloseHandle(m_processHandle);
+	m_processHandle = NULL;
+
+	CloseHandle(m_readHandle);
+	m_readHandle = NULL;
+
+	CloseHandle(m_jobHandle);
+	m_jobHandle = NULL;
+
+	m_isDone = true;
+}
+
+void WorkerProcess::kill()
+{
+	if (!isRunning())
+		return;
+
+	if (m_processHandle != NULL)
+	{
+		TerminateProcess(m_processHandle, 1);
+		CloseHandle(m_processHandle);
+		m_processHandle = NULL;
+	}
+
+	if (m_readHandle != NULL)
+	{
+		CloseHandle(m_readHandle);
+		m_readHandle = NULL;
+	}
+
+	if (m_jobHandle != NULL)
+	{
+		CloseHandle(m_jobHandle);
+		m_jobHandle = NULL;
+	}
+
+	m_stdOutput.clear();
+	m_isDone = false;
+}
+
diff --git a/Core/GameEngine/Source/Common/crc.cpp b/Core/GameEngine/Source/Common/crc.cpp
new file mode 100644
index 00000000000..60e71e4b2ff
--- /dev/null
+++ b/Core/GameEngine/Source/Common/crc.cpp
@@ -0,0 +1,83 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/crc.h"
+#include "Common/Debug.h"
+
+#ifdef RTS_DEBUG
+
+void CRC::addCRC( UnsignedByte val )
+{
+	int hibit;
+
+	//cout << "\t\t" << hex << val;
+//	val = htonl(val);
+	//cout << " / " << hex << val <<endl;
+
+
+	if (crc & 0x80000000) {
+		hibit = 1;
+	} else {
+		hibit = 0;
+	}
+
+	crc <<= 1;
+	crc += val;
+	crc += hibit;
+
+	//cout << hex << (*crc) <<endl;
+}
+
+
+void CRC::computeCRC( const void *buf, Int len )
+{
+	if (!buf || len < 1)
+	{
+		return;
+	}
+
+	//crc = 0;
+
+	UnsignedByte *uintPtr = (UnsignedByte *)buf;
+
+	for (int i=0 ; i<len ; i++) {
+		addCRC (*(uintPtr++));
+	}
+	//crc = htonl(crc);
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+UnsignedInt CRC::get( void )
+{
+
+	UnsignedInt tcrc = crc;
+	return tcrc;
+
+}
+
+#endif
diff --git a/Core/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp b/Core/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp
new file mode 100644
index 00000000000..0bbbfde983e
--- /dev/null
+++ b/Core/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp
@@ -0,0 +1,418 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: WindowVideoManager.cpp /////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+//	created:	Apr 2002
+//
+//	Filename: 	WindowVideoManager.cpp
+//
+//	author:		Chris Huybregts
+//
+//	purpose:	Every window is setup to be able to draw a movie.  The
+//						WindowVideoManager will take care of setting up the window,
+//						creating/destroying the buffers, and the ability to pause/stop
+//						movies.
+//
+//	To Use:		Create a manager and initialize it. Make sure the manager's Update
+//						is called every frame or how ever often it needs to be updated.
+//						Call reset if the manager needs to be cleared.
+//						Play a movie in a window by passing a window pointer, a movie name,
+//						and the playtype.
+//						If a user trys to play a two different movies on the same window,
+//						only the last one added will play.
+//						It's important when destroying a window, that window is removed
+//						from the manager (Or call Reset if you know no other windows are
+//						playing a movie).
+//
+//-----------------------------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////////
+
+//-----------------------------------------------------------------------------
+// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// USER INCLUDES //////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameClient/WindowVideoManager.h"
+#include "GameClient/GameWindow.h"
+#include "GameClient/VideoPlayer.h"
+#include "GameClient/Display.h"
+
+//-----------------------------------------------------------------------------
+// DEFINES ////////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// WindowVideo PUBLIC FUNCTIONS ///////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+WindowVideo::WindowVideo( void )
+{
+
+	m_playType = WINDOW_PLAY_MOVIE_ONCE;
+	m_win = NULL;
+	m_videoBuffer = NULL;
+	m_videoStream = NULL;
+	m_movieName.clear();
+	m_state = WINDOW_VIDEO_STATE_STOP;
+
+}
+
+WindowVideo::~WindowVideo( void )
+{
+	// Don't Delete the window, only set it's video buffer to NULL
+	if(m_win)
+		m_win->winGetInstanceData()->setVideoBuffer( NULL );
+	m_win = NULL;
+
+	delete m_videoBuffer;
+	m_videoBuffer = NULL;
+
+	if ( m_videoStream )
+	{
+		m_videoStream->close();
+		m_videoStream = NULL;
+	}
+}
+
+void WindowVideo::init( GameWindow *win, AsciiString movieName,
+												WindowVideoPlayType playType,
+												VideoBuffer *videoBuffer, VideoStreamInterface *videoStream)
+{
+	m_win = win;
+	m_movieName = movieName;
+	m_playType = playType;
+	m_videoBuffer = videoBuffer;
+	m_videoStream = videoStream;
+	m_state = WINDOW_VIDEO_STATE_PLAY;
+	if(m_win)
+		m_win->winGetInstanceData()->setVideoBuffer( m_videoBuffer );
+}
+
+void WindowVideo::setWindowState( WindowVideoStates state )
+{
+	m_state = state;
+
+	if(m_state == WINDOW_VIDEO_STATE_STOP && m_win)
+		m_win->winGetInstanceData()->setVideoBuffer( NULL );
+
+	if((m_state == WINDOW_VIDEO_STATE_PLAY || m_state == WINDOW_VIDEO_STATE_PAUSE )&& m_win)
+		m_win->winGetInstanceData()->setVideoBuffer( m_videoBuffer );
+}
+
+//-----------------------------------------------------------------------------
+// WindowVideoManager PUBLIC FUNCTIONS ////////////////////////////////////////
+//-----------------------------------------------------------------------------
+WindowVideoManager::WindowVideoManager( void )
+{
+	WindowVideoMap::iterator it = m_playingVideos.begin();
+	while(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+		delete winVid;
+		it++;
+	}
+	m_playingVideos.clear();
+
+	m_stopAllMovies = FALSE;
+	m_pauseAllMovies = FALSE;
+
+}
+
+WindowVideoManager::~WindowVideoManager( void )
+{
+	WindowVideoMap::iterator it = m_playingVideos.begin();
+	while(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+		delete winVid;
+		it++;
+	}
+	m_playingVideos.clear();
+
+}
+
+
+void WindowVideoManager::init( void )
+{
+	m_playingVideos.clear();
+
+	m_stopAllMovies = FALSE;
+	m_pauseAllMovies = FALSE;
+}
+
+void WindowVideoManager::reset( void )
+{
+	WindowVideoMap::iterator it = m_playingVideos.begin();
+	while(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+		delete winVid;
+		it++;
+	}
+	m_playingVideos.clear();
+
+	m_stopAllMovies = FALSE;
+	m_pauseAllMovies = FALSE;
+}
+
+void WindowVideoManager::update( void )
+{
+	WindowVideoMap::iterator it = m_playingVideos.begin();
+
+	if(m_pauseAllMovies || m_stopAllMovies)
+		return;
+
+	//Iterate through the maps
+	while(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+
+		if(!winVid)
+		{
+			DEBUG_CRASH(("There's No WindowVideo in the m_playignVideos list"));
+			return;
+		}
+		GameWindow *win = winVid->getWin();
+
+		if(winVid->getState() == WINDOW_VIDEO_STATE_HIDDEN && (win->winIsHidden() == FALSE))
+		{
+			resumeMovie(win);
+		}
+
+		if(winVid->getState() == WINDOW_VIDEO_STATE_PLAY && win->winIsHidden())
+		{
+			hideMovie(win);
+		}
+
+		// Only advance the frame if we're playing
+		if(winVid->getState() != WINDOW_VIDEO_STATE_PLAY)
+		{
+			it++;
+			continue;
+		}
+
+		// Get the Stream and the buffer to update for each animation
+		VideoStreamInterface *videoStream = winVid->getVideoStream();
+		VideoBuffer *videoBuffer = winVid->getVideoBuffer();
+
+		if ( videoStream && videoBuffer )
+		{
+			if ( videoStream->isFrameReady())
+			{
+				videoStream->frameDecompress();
+				videoStream->frameRender( videoBuffer );
+				videoStream->frameNext();
+
+				// If we reach frame Index of 0, we might have to pause, or loop.
+				if ( videoStream->frameIndex() == 0 )
+				{
+					if(winVid->getPlayType() == WINDOW_PLAY_MOVIE_ONCE)
+						stopMovie(win);
+					else if (winVid->getPlayType() == WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME)
+						pauseMovie(win);
+				}
+			}
+		}
+
+		it++;
+	}
+}
+
+void WindowVideoManager::playMovie( GameWindow *win, AsciiString movieName, WindowVideoPlayType playType )
+{
+	// if we already have a movie playing for that window, kill it.
+	stopAndRemoveMovie( win );
+
+	// create the new stream
+	VideoStreamInterface *videoStream = TheVideoPlayer->open( movieName );
+	if ( videoStream == NULL )
+	{
+		return;
+	}
+
+	// Create the new buffer
+	VideoBuffer *videoBuffer = TheDisplay->createVideoBuffer();
+	if (	videoBuffer == NULL ||
+				!videoBuffer->allocate(	videoStream->width(),
+													videoStream->height())
+		)
+	{
+		// If we failed to create the buffer...
+		delete videoBuffer;
+		videoBuffer = NULL;
+
+		if ( videoStream )
+		{
+			videoStream->close();
+			videoStream = NULL;
+		}
+
+		return;
+	}
+
+	// now that we have everything, create the new WindowVideo Structure
+	WindowVideo *winVid = NEW WindowVideo;
+
+	// init it.
+	winVid->init( win, movieName,playType,videoBuffer,videoStream);
+
+	// add it to our map.
+	m_playingVideos[win] = winVid;
+
+	m_pauseAllMovies = FALSE;
+	m_stopAllMovies = FALSE;
+}
+
+
+void WindowVideoManager::pauseMovie( GameWindow *win )
+{
+	WindowVideoMap::iterator it = m_playingVideos.find(win);
+	if(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+		if(winVid)
+		winVid->setWindowState(WINDOW_VIDEO_STATE_PAUSE);
+	}
+
+}
+void WindowVideoManager::hideMovie( GameWindow *win )
+{
+	WindowVideoMap::iterator it = m_playingVideos.find(win);
+	if(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+		if(winVid)
+		winVid->setWindowState(WINDOW_VIDEO_STATE_HIDDEN);
+	}
+}
+
+void WindowVideoManager::resumeMovie( GameWindow *win )
+{
+	WindowVideoMap::iterator it = m_playingVideos.find(win);
+	if(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+		if(winVid)
+			winVid->setWindowState(WINDOW_VIDEO_STATE_PLAY);
+	}
+	m_pauseAllMovies = FALSE;
+	m_stopAllMovies = FALSE;
+}
+
+void WindowVideoManager::stopMovie( GameWindow *win )
+{
+	WindowVideoMap::iterator it = m_playingVideos.find(win);
+	if(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+		if(winVid)
+			winVid->setWindowState(WINDOW_VIDEO_STATE_STOP);
+	}
+}
+
+void WindowVideoManager::stopAndRemoveMovie( GameWindow *win )
+{
+	WindowVideoMap::iterator it = m_playingVideos.find(win);
+	if(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+		delete winVid;
+		m_playingVideos.erase(it);
+	}
+}
+
+void WindowVideoManager::stopAllMovies( void )
+{
+	WindowVideoMap::iterator it = m_playingVideos.begin();
+	//Iterate through the maps
+	while(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+		if(winVid)
+			winVid->setWindowState(WINDOW_VIDEO_STATE_STOP);
+		it++;
+	}
+
+	m_stopAllMovies = TRUE;
+	m_pauseAllMovies = FALSE;
+}
+
+void WindowVideoManager::pauseAllMovies( void )
+{
+	WindowVideoMap::iterator it = m_playingVideos.begin();
+	//Iterate through the maps
+	while(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+		if(winVid)
+			winVid->setWindowState(WINDOW_VIDEO_STATE_PAUSE);
+		it++;
+	}
+
+	m_pauseAllMovies = TRUE;
+	m_stopAllMovies = FALSE;
+}
+
+void WindowVideoManager::resumeAllMovies( void )
+{
+	WindowVideoMap::iterator it = m_playingVideos.begin();
+	//Iterate through the maps
+	while(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+		if(winVid)
+			winVid->setWindowState(WINDOW_VIDEO_STATE_PLAY);
+		it++;
+	}
+	m_stopAllMovies = FALSE;
+	m_pauseAllMovies = FALSE;
+}
+
+Int WindowVideoManager::getWinState( GameWindow *win )
+{
+	WindowVideoMap::iterator it = m_playingVideos.find(win);
+	if(it != m_playingVideos.end())
+	{
+		WindowVideo *winVid = it->second;
+		if(winVid)
+			return winVid->getState();
+	}
+	return WINDOW_VIDEO_STATE_STOP;
+}
+
+//-----------------------------------------------------------------------------
+// PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
diff --git a/Core/GameEngine/Source/GameClient/MapUtil.cpp b/Core/GameEngine/Source/GameClient/MapUtil.cpp
new file mode 100644
index 00000000000..a99f1cdc36f
--- /dev/null
+++ b/Core/GameEngine/Source/GameClient/MapUtil.cpp
@@ -0,0 +1,1348 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: MapUtil.cpp //////////////////////////////////////////////////////////////////////////////
+// Author: Matt Campbell, December 2001
+// Description: Map utility/convenience routines
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/crc.h"
+#include "Common/FileSystem.h"
+#include "Common/LocalFileSystem.h"
+#include "Common/file.h"
+#include "Common/GlobalData.h"
+#include "Common/GameState.h"
+#include "Common/GameEngine.h"
+#include "Common/NameKeyGenerator.h"
+#include "Common/DataChunk.h"
+#include "Common/MapReaderWriterInfo.h"
+#include "Common/MessageStream.h"
+#include "Common/WellKnownKeys.h"
+#include "Common/INI.h"
+#include "Common/QuotedPrintable.h"
+#include "Common/SkirmishBattleHonors.h"
+#include "Common/ThingFactory.h"
+#include "Common/ThingTemplate.h"
+#include "Common/MapObject.h"
+#include "GameClient/GameText.h"
+#include "GameClient/WindowLayout.h"
+#include "GameClient/Gadget.h"
+#include "GameClient/Image.h"
+#include "GameClient/Shell.h"
+#include "GameClient/GameWindowManager.h"
+#include "GameClient/GadgetListBox.h"
+#include "GameClient/MapUtil.h"
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/FPUControl.h"
+#include "GameNetwork/GameInfo.h"
+#include "GameNetwork/NetworkDefs.h"
+
+
+//-------------------------------------------------------------------------------
+// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
+static const char *mapExtension = ".map";
+
+static Int m_width = 0;						///< Height map width.
+static Int m_height = 0;					///< Height map height (y size of array).
+static Int m_borderSize = 0;			///< Non-playable border area.
+static std::vector<ICoord2D> m_boundaries;	///< All the boundaries we use for the map
+static Int m_dataSize = 0;				///< size of m_data.
+static UnsignedByte *m_data = 0;	///< array of z(height) values in the height map.
+static Dict worldDict = 0;
+
+static WaypointMap *m_waypoints = 0;
+static Coord3DList	m_supplyPositions;
+static Coord3DList	m_techPositions;
+
+static Int m_mapDX = 0;
+static Int m_mapDY = 0;
+
+static UnsignedInt calcCRC( AsciiString fname )
+{
+	CRC theCRC;
+	theCRC.clear();
+
+	File *fp = TheFileSystem->openFile(fname.str(), File::READ);
+	if( !fp )
+	{
+		DEBUG_CRASH(("Couldn't open '%s'", fname.str()));
+		return 0;
+	}
+
+	UnsignedByte buf[4096];
+	Int num;
+	while ( (num=fp->read(buf, 4096)) > 0 )
+	{
+		theCRC.computeCRC(buf, num);
+	}
+
+	fp->close();
+	fp = NULL;
+
+	return theCRC.get();
+}
+
+static Bool ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	Bool readDict = info->version >= K_OBJECTS_VERSION_2;
+
+	Coord3D loc;
+	loc.x = file.readReal();
+	loc.y = file.readReal();
+	loc.z = file.readReal();
+	if (info->version <= K_OBJECTS_VERSION_2)
+	{
+		loc.z = 0;
+	}
+
+	Real angle = file.readReal();
+	Int flags = file.readInt();
+	AsciiString name = file.readAsciiString();
+	Dict d;
+	if (readDict)
+	{
+		d = file.readDict();
+	}
+	MapObject *pThisOne;
+
+	// create the map object
+	pThisOne = newInstance( MapObject )( loc, name, angle, flags, &d,
+														TheThingFactory->findTemplate( name, FALSE ) );
+
+//DEBUG_LOG(("obj %s owner %s",name.str(),d.getAsciiString(TheKey_originalOwner).str()));
+
+	if (pThisOne->getProperties()->getType(TheKey_waypointID) == Dict::DICT_INT)
+	{
+		pThisOne->setIsWaypoint();
+
+		// grab useful info
+		(*m_waypoints)[pThisOne->getWaypointName()] = loc;
+	}
+	else if (pThisOne->getThingTemplate() && pThisOne->getThingTemplate()->isKindOf(KINDOF_TECH_BUILDING))
+	{
+		m_techPositions.push_back(loc);
+	}
+	else if (pThisOne->getThingTemplate() && pThisOne->getThingTemplate()->isKindOf(KINDOF_SUPPLY_SOURCE_ON_PREVIEW))
+	{
+		m_supplyPositions.push_back(loc);
+	}
+
+	deleteInstance(pThisOne);
+	return TRUE;
+}
+
+static Bool ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	file.m_currentObject = NULL;
+	file.registerParser( "Object", info->label, ParseObjectDataChunk );
+	return (file.parse(userData));
+}
+
+static Bool ParseWorldDictDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	worldDict = file.readDict();
+	return true;
+}
+
+static Bool ParseSizeOnly(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	m_width = file.readInt();
+	m_height = file.readInt();
+	if (info->version >= K_HEIGHT_MAP_VERSION_3) {
+		m_borderSize = file.readInt();
+	} else {
+		m_borderSize = 0;
+	}
+
+	if (info->version >= K_HEIGHT_MAP_VERSION_4) {
+		Int numBorders = file.readInt();
+		m_boundaries.resize(numBorders);
+		for (int i = 0; i < numBorders; ++i) {
+			m_boundaries[i].x = file.readInt();
+			m_boundaries[i].y = file.readInt();
+		}
+	}
+	return true;
+
+	m_dataSize = file.readInt();
+	m_data = NEW UnsignedByte[m_dataSize];	// pool[]ify
+	if (m_dataSize <= 0 || (m_dataSize != (m_width*m_height))) {
+		throw ERROR_CORRUPT_FILE_FORMAT	;
+	}
+	file.readArrayOfBytes((char *)m_data, m_dataSize);
+	// Resize me.
+	if (info->version == K_HEIGHT_MAP_VERSION_1) {
+		Int newWidth = (m_width+1)/2;
+		Int newHeight = (m_height+1)/2;
+		Int i, j;
+		for (i=0; i<newHeight; i++) {
+			for (j=0; j<newWidth; j++) {
+				m_data[i*newWidth+j] = m_data[2*i*m_width+2*j];
+			}
+		}
+		m_width = newWidth;
+		m_height = newHeight;
+	}
+	return true;
+}
+
+static Bool ParseSizeOnlyInChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	return ParseSizeOnly(file, info, userData);
+}
+
+static Bool loadMap( AsciiString filename )
+{
+	CachedFileInputStream fileStrm;
+
+	if( !fileStrm.open(filename) )
+	{
+		return FALSE;
+	}
+
+	ChunkInputStream *pStrm = &fileStrm;
+
+	DataChunkInput file( pStrm );
+
+	m_waypoints = NEW WaypointMap;
+
+	file.registerParser( "HeightMapData", AsciiString::TheEmptyString, ParseSizeOnlyInChunk );
+	file.registerParser( "WorldInfo", AsciiString::TheEmptyString, ParseWorldDictDataChunk );
+	file.registerParser( "ObjectsList", AsciiString::TheEmptyString, ParseObjectsDataChunk );
+	if (!file.parse(NULL)) {
+		throw(ERROR_CORRUPT_FILE_FORMAT);
+	}
+
+	m_mapDX = m_width  - 2*m_borderSize;
+	m_mapDY = m_height - 2*m_borderSize;
+
+	return TRUE;
+}
+
+static void resetMap( void )
+{
+	delete[] m_data;
+	m_data = NULL;
+
+	delete m_waypoints;
+	m_waypoints = NULL;
+
+	m_techPositions.clear();
+	m_supplyPositions.clear();
+}
+
+static void getExtent( Region3D *extent )
+{
+	extent->lo.x = 0.0f;
+
+	extent->lo.y = 0.0f;
+
+	// Note - m_mapDX & Y are the number of height map grids wide, so we have to
+	// multiply by the grid width.
+	extent->hi.x = m_mapDX*MAP_XY_FACTOR;
+	extent->hi.y = m_mapDY*MAP_XY_FACTOR;
+
+	extent->lo.z = 0;
+	extent->hi.z = 0;
+}
+
+//-------------------------------------------------------------------------------
+
+void WaypointMap::update( void )
+{
+	if (!m_waypoints)
+	{
+		m_numStartSpots = 1;
+		return;
+	}
+
+	this->clear();
+
+	AsciiString startingCamName = TheNameKeyGenerator->keyToName(TheKey_InitialCameraPosition);
+	WaypointMap::const_iterator it;
+
+	it = m_waypoints->find(startingCamName);
+	if (it != m_waypoints->end())
+	{
+		(*this)[startingCamName] = it->second;
+	}
+
+	m_numStartSpots = 0;
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		startingCamName.format("Player_%d_Start", i+1); // start pos waypoints are 1-based
+		it = m_waypoints->find(startingCamName);
+		if (it != m_waypoints->end())
+		{
+			(*this)[startingCamName] = it->second;
+			++m_numStartSpots;
+		}
+		else
+		{
+			break;
+		}
+	}
+
+	m_numStartSpots = max(1, m_numStartSpots);
+}
+
+const char *const MapCache::m_mapCacheName = "MapCache.ini";
+
+AsciiString MapCache::getMapDir() const
+{
+	return "Maps";
+}
+
+AsciiString MapCache::getUserMapDir() const
+{
+	AsciiString tmp = TheGlobalData->getPath_UserData();
+	tmp.concat(getMapDir());
+	return tmp;
+}
+
+AsciiString MapCache::getMapExtension() const
+{
+	return "map";
+}
+
+void MapCache::writeCacheINI( const AsciiString &mapDir )
+{
+	AsciiString filepath = mapDir;
+	filepath.concat('\\');
+
+	TheFileSystem->createDirectory(mapDir);
+
+	filepath.concat(m_mapCacheName);
+	FILE *fp = fopen(filepath.str(), "w");
+	DEBUG_ASSERTCRASH(fp != NULL, ("Failed to create %s", filepath.str()));
+	if (fp == NULL) {
+		return;
+	}
+
+	fprintf(fp, "; FILE: %s /////////////////////////////////////////////////////////////\n", filepath.str());
+	fprintf(fp, "; This INI file is auto-generated - do not modify\n");
+	fprintf(fp, "; /////////////////////////////////////////////////////////////////////////////\n");
+
+	MapCache::iterator it = begin();
+	for (; it != end(); ++it)
+	{
+		if (it->first.startsWithNoCase(mapDir.str()))
+		{
+			const MapMetaData &md = it->second;
+			fprintf(fp, "\nMapCache %s\n", AsciiStringToQuotedPrintable(it->first.str()).str());
+			fprintf(fp, "  fileSize = %u\n", md.m_filesize);
+			fprintf(fp, "  fileCRC = %u\n", md.m_CRC);
+			fprintf(fp, "  timestampLo = %d\n", md.m_timestamp.m_lowTimeStamp);
+			fprintf(fp, "  timestampHi = %d\n", md.m_timestamp.m_highTimeStamp);
+			fprintf(fp, "  isOfficial = %s\n", (md.m_isOfficial)?"yes":"no");
+
+			fprintf(fp, "  isMultiplayer = %s\n", (md.m_isMultiplayer)?"yes":"no");
+			fprintf(fp, "  numPlayers = %d\n", md.m_numPlayers);
+
+			fprintf(fp, "  extentMin = X:%2.2f Y:%2.2f Z:%2.2f\n", md.m_extent.lo.x, md.m_extent.lo.y, md.m_extent.lo.z);
+			fprintf(fp, "  extentMax = X:%2.2f Y:%2.2f Z:%2.2f\n", md.m_extent.hi.x, md.m_extent.hi.y, md.m_extent.hi.z);
+
+// BAD AND NOW UNUSED:  the mapcache.ini should not contain localized data... using the lookup tag instead
+#if RTS_GENERALS
+			fprintf(fp, "  displayName = %s\n", UnicodeStringToQuotedPrintable(md.m_displayName).str());
+#else
+			fprintf(fp, "  nameLookupTag = %s\n", md.m_nameLookupTag.str());
+#endif
+
+			Coord3D pos;
+			WaypointMap::const_iterator itw = md.m_waypoints.begin();
+			for (; itw != md.m_waypoints.end(); ++itw)
+			{
+				pos = itw->second;
+				fprintf(fp, "  %s = X:%2.2f Y:%2.2f Z:%2.2f\n", itw->first.str(), pos.x, pos.y, pos.z);
+			}
+			Coord3DList::const_iterator itc3d = md.m_techPositions.begin();
+			for (; itc3d != md.m_techPositions.end(); ++itc3d)
+			{
+				pos = *itc3d;
+				fprintf(fp, "  techPosition = X:%2.2f Y:%2.2f Z:%2.2f\n", pos.x, pos.y, pos.z);
+			}
+
+			itc3d = md.m_supplyPositions.begin();
+			for (; itc3d != md.m_supplyPositions.end(); ++itc3d)
+			{
+				pos = *itc3d;
+				fprintf(fp, "  supplyPosition = X:%2.2f Y:%2.2f Z:%2.2f\n", pos.x, pos.y, pos.z);
+			}
+			fprintf(fp, "END\n\n");
+		}
+		else
+		{
+			//DEBUG_LOG(("%s does not start %s", mapDir.str(), it->first.str()));
+		}
+	}
+
+	fclose(fp);
+}
+
+void MapCache::updateCache( void )
+{
+	setFPMode();
+
+	const AsciiString mapDir = getMapDir();
+	const AsciiString userMapDir = getUserMapDir();
+
+	// Create the standard map cache if required. Is only relevant for Mod developers.
+	// TheSuperHackers @tweak This step is done before loading any other map caches to not poison the cached state.
+	if (m_doCreateStandardMapCacheINI)
+	{
+#if defined(RTS_DEBUG)
+		// only create the map cache file if "Maps" folder exists
+		const Bool buildMapCache = TheLocalFileSystem->doesFileExist(mapDir.str());
+#else
+		const Bool buildMapCache = TheGlobalData->m_buildMapCache;
+#endif
+		if (buildMapCache)
+		{
+			const Bool isOfficial = TRUE;
+			const Bool filterByAllowedMaps = !m_allowedMaps.empty();
+
+			if (loadMapsFromDisk(mapDir, isOfficial, filterByAllowedMaps))
+			{
+				writeCacheINI(mapDir);
+			}
+		}
+		m_doCreateStandardMapCacheINI = FALSE;
+	}
+
+	// Load user map cache first.
+	if (m_doLoadUserMapCacheINI)
+	{
+		loadMapsFromMapCacheINI(userMapDir);
+		m_doLoadUserMapCacheINI = FALSE;
+	}
+
+	// Load user maps from disk and update any discrepancies from the map cache.
+	if (loadMapsFromDisk(userMapDir, FALSE))
+	{
+		writeCacheINI(userMapDir);
+		m_doLoadStandardMapCacheINI = TRUE;
+	}
+
+	// Load standard maps from map cache last.
+	// This overwrites matching user maps to prevent munkees getting rowdy :)
+	if (m_doLoadStandardMapCacheINI)
+	{
+		loadMapsFromMapCacheINI(mapDir);
+		m_doLoadStandardMapCacheINI = FALSE;
+	}
+}
+
+void MapCache::prepareUnseenMaps( const AsciiString &mapDir )
+{
+	MapCache::iterator it = begin();
+	for (; it != end(); ++it)
+	{
+		const AsciiString &mapName = it->first;
+
+		if (mapName.startsWithNoCase(mapDir.str()))
+		{
+			it->second.m_doesExist = FALSE;
+		}
+	}
+}
+
+Bool MapCache::clearUnseenMaps( const AsciiString &mapDir )
+{
+	Bool erasedSomething = FALSE;
+
+	MapCache::iterator it = begin();
+	while (it != end())
+	{
+		MapCache::iterator next = it;
+		++next;
+
+		const AsciiString &mapName = it->first;
+		const MapMetaData &mapData = it->second;
+
+		if (mapName.startsWithNoCase(mapDir.str()) && !mapData.m_doesExist)
+		{
+			erase(it);
+			erasedSomething = TRUE;
+		}
+
+		it = next;
+	}
+
+	return erasedSomething;
+}
+
+void MapCache::loadMapsFromMapCacheINI( const AsciiString &mapDir )
+{
+	INI ini;
+	AsciiString fname;
+	fname.format("%s\\%s", mapDir.str(), m_mapCacheName);
+
+	if (TheFileSystem->doesFileExist(fname.str()))
+	{
+		ini.load( fname, INI_LOAD_OVERWRITE, NULL );
+	}
+}
+
+Bool MapCache::loadMapsFromDisk( const AsciiString &mapDir, Bool isOfficial, Bool filterByAllowedMaps )
+{
+	prepareUnseenMaps(mapDir);
+
+	FilenameList filepathList;
+	FilenameListIter filepathIt;
+	AsciiString toplevelPattern;
+	toplevelPattern.format("%s\\", mapDir.str());
+	Bool mapListChanged = FALSE;
+	AsciiString filenamepattern;
+	filenamepattern.format("*.%s", getMapExtension().str());
+
+	TheFileSystem->getFileListInDirectory(toplevelPattern, filenamepattern, filepathList, TRUE);
+
+	filepathIt = filepathList.begin();
+
+	for (; filepathIt != filepathList.end(); ++filepathIt)
+	{
+		FileInfo fileInfo;
+		AsciiString filepathLower = *filepathIt;
+		filepathLower.toLower();
+
+		const char *szFilenameLower = filepathLower.reverseFind('\\');
+		if (!szFilenameLower)
+		{
+			DEBUG_CRASH(("Couldn't find \\ in map name!"));
+			continue;
+		}
+
+		AsciiString endingStr;
+		AsciiString filenameLower = szFilenameLower+1;
+		filenameLower.truncateBy(strlen(mapExtension));
+
+		if (filterByAllowedMaps && m_allowedMaps.find(filenameLower) == m_allowedMaps.end())
+		{
+			DEBUG_CRASH(("Map '%s' has been filtered out", filenameLower.str()));
+			continue;
+		}
+
+		endingStr.format("%s\\%s%s", filenameLower.str(), filenameLower.str(), mapExtension);
+
+		if (!filepathLower.endsWithNoCase(endingStr.str()))
+		{
+			DEBUG_CRASH(("Found map '%s' in wrong spot (%s)", filenameLower.str(), filepathLower.str()));
+			continue;
+		}
+
+		if (!TheFileSystem->getFileInfo(*filepathIt, &fileInfo))
+		{
+			DEBUG_CRASH(("Could not get file info for map %s", filepathIt->str()));
+			continue;
+		}
+
+		mapListChanged |= addMap(mapDir, *filepathIt, filepathLower, fileInfo, isOfficial);
+	}
+
+	if (clearUnseenMaps(mapDir))
+	{
+		mapListChanged = TRUE;
+	}
+
+	return mapListChanged;
+}
+
+Bool MapCache::addMap(
+	const AsciiString &mapDir,
+	const AsciiString &fname,
+	const AsciiString &lowerFname,
+	FileInfo &fileInfo,
+	Bool isOfficial)
+{
+	MapCache::iterator it = find(lowerFname);
+	if (it != end())
+	{
+		// Found the map in our cache. Check to see if it has changed.
+		const MapMetaData& md = it->second;
+
+		if (md.m_filesize == fileInfo.sizeLow && md.m_CRC != 0)
+		{
+			// Force a lookup so that we don't display the English localization in all builds.
+			if (md.m_nameLookupTag.isEmpty())
+			{
+				// unofficial maps or maps without names
+				AsciiString tempdisplayname;
+				tempdisplayname = fname.reverseFind('\\') + 1;
+				(*this)[lowerFname].m_displayName.translate(tempdisplayname);
+				if (md.m_numPlayers >= 2)
+				{
+					UnicodeString extension;
+					extension.format(L" (%d)", md.m_numPlayers);
+					(*this)[lowerFname].m_displayName.concat(extension);
+				}
+			}
+			else
+			{
+				// official maps with name tags
+				(*this)[lowerFname].m_displayName = TheGameText->fetch(md.m_nameLookupTag);
+				if (md.m_numPlayers >= 2)
+				{
+					UnicodeString extension;
+					extension.format(L" (%d)", md.m_numPlayers);
+					(*this)[lowerFname].m_displayName.concat(extension);
+				}
+			}
+
+			it->second.m_doesExist = TRUE;
+
+//			DEBUG_LOG(("MapCache::addMap - found match for map %s", lowerFname.str()));
+			return FALSE;	// OK, it checks out.
+		}
+		DEBUG_LOG(("%s didn't match file in MapCache", fname.str()));
+		DEBUG_LOG(("size: %d / %d", fileInfo.sizeLow, md.m_filesize));
+		DEBUG_LOG(("time1: %d / %d", fileInfo.timestampHigh, md.m_timestamp.m_highTimeStamp));
+		DEBUG_LOG(("time2: %d / %d", fileInfo.timestampLow, md.m_timestamp.m_lowTimeStamp));
+//		DEBUG_LOG(("size: %d / %d", filesize, md.m_filesize));
+//		DEBUG_LOG(("time1: %d / %d", timestamp.m_highTimeStamp, md.m_timestamp.m_highTimeStamp));
+//		DEBUG_LOG(("time2: %d / %d", timestamp.m_lowTimeStamp, md.m_timestamp.m_lowTimeStamp));
+	}
+
+	DEBUG_LOG(("MapCache::addMap(): caching '%s' because '%s' was not found", fname.str(), lowerFname.str()));
+
+	loadMap(fname); // Just load for querying the data, since we aren't playing this map.
+
+	// The map is now loaded.  Pick out what we need.
+	MapMetaData md;
+	md.m_fileName = lowerFname;
+	md.m_filesize = fileInfo.sizeLow;
+	md.m_isOfficial = isOfficial;
+	md.m_doesExist = TRUE;
+	md.m_waypoints.update();
+	md.m_numPlayers = md.m_waypoints.m_numStartSpots;
+	md.m_isMultiplayer = (md.m_numPlayers >= 2);
+	md.m_timestamp.m_highTimeStamp = fileInfo.timestampHigh;
+	md.m_timestamp.m_lowTimeStamp = fileInfo.timestampLow;
+	md.m_supplyPositions = m_supplyPositions;
+	md.m_techPositions = m_techPositions;
+	md.m_CRC = calcCRC(fname);
+
+	Bool exists = false;
+	AsciiString nameLookupTag = worldDict.getAsciiString(TheKey_mapName, &exists);
+	md.m_nameLookupTag = nameLookupTag;
+
+	if (!exists || nameLookupTag.isEmpty())
+	{
+		DEBUG_LOG(("Missing TheKey_mapName!"));
+		AsciiString tempdisplayname;
+		tempdisplayname = fname.reverseFind('\\') + 1;
+		md.m_displayName.translate(tempdisplayname);
+		if (md.m_numPlayers >= 2)
+		{
+			UnicodeString extension;
+			extension.format(L" (%d)", md.m_numPlayers);
+			md.m_displayName.concat(extension);
+		}
+		TheGameText->reset();
+	}
+	else
+	{
+		AsciiString stringFileName;
+		stringFileName.format("%s\\%s", mapDir.str(), fname.str());
+		stringFileName.truncateBy(4);
+		stringFileName.concat("\\map.str");
+		TheGameText->initMapStringFile(stringFileName);
+		md.m_displayName = TheGameText->fetch(nameLookupTag);
+		if (md.m_numPlayers >= 2)
+		{
+			UnicodeString extension;
+			extension.format(L" (%d)", md.m_numPlayers);
+			md.m_displayName.concat(extension);
+		}
+		DEBUG_LOG(("Map name is now '%ls'", md.m_displayName.str()));
+		TheGameText->reset();
+	}
+
+	getExtent(&(md.m_extent));
+
+	(*this)[lowerFname] = md;
+
+	DEBUG_LOG(("  filesize = %d bytes", md.m_filesize));
+	DEBUG_LOG(("  displayName = %ls", md.m_displayName.str()));
+	DEBUG_LOG(("  CRC = %X", md.m_CRC));
+	DEBUG_LOG(("  timestamp = %d", md.m_timestamp));
+	DEBUG_LOG(("  isOfficial = %s", (md.m_isOfficial)?"yes":"no"));
+
+	DEBUG_LOG(("  isMultiplayer = %s", (md.m_isMultiplayer)?"yes":"no"));
+	DEBUG_LOG(("  numPlayers = %d", md.m_numPlayers));
+
+	DEBUG_LOG(("  extent = (%2.2f,%2.2f) -> (%2.2f,%2.2f)",
+		md.m_extent.lo.x, md.m_extent.lo.y,
+		md.m_extent.hi.x, md.m_extent.hi.y));
+
+	Coord3D pos;
+	WaypointMap::iterator itw = md.m_waypoints.begin();
+	for (; itw != md.m_waypoints.end(); ++itw)
+	{
+		pos = itw->second;
+		DEBUG_LOG(("    waypoint %s: (%2.2f,%2.2f)", itw->first.str(), pos.x, pos.y));
+	}
+
+	resetMap();
+
+	return TRUE;
+}
+
+MapCache *TheMapCache = NULL;
+
+// PUBLIC FUNCTIONS //////////////////////////////////////////////////////////////////////////////
+
+Bool WouldMapTransfer( const AsciiString& mapName )
+{
+	return mapName.startsWithNoCase(TheMapCache->getUserMapDir());
+}
+
+//-------------------------------------------------------------------------------------------------
+typedef std::set<UnicodeString, rts::less_than_nocase<UnicodeString> > MapNameList;
+typedef std::map<UnicodeString, AsciiString> MapDisplayToFileNameList;
+
+static void buildMapListForNumPlayers(MapNameList &outMapNames, MapDisplayToFileNameList &outFileNames, Int numPlayers)
+{
+	MapCache::iterator it = TheMapCache->begin();
+
+	for (; it != TheMapCache->end(); ++it)
+	{
+		const MapMetaData &mapData = it->second;
+		if (mapData.m_numPlayers == numPlayers)
+		{
+			outMapNames.insert(it->second.m_displayName);
+			outFileNames[it->second.m_displayName] = it->first;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+struct MapListBoxData
+{
+	MapListBoxData()
+		: listbox(NULL)
+		, numLength(0)
+		, numColumns(0)
+		, w(10)
+		, h(10)
+		, color(GameMakeColor(255, 255, 255, 255))
+		, battleHonors(NULL)
+		, easyImage(NULL)
+		, mediumImage(NULL)
+		, brutalImage(NULL)
+		, maxBrutalImage(NULL)
+		, mapToSelect()
+		, selectionIndex(0) // always select *something*
+		, isMultiplayer(false)
+	{
+	}
+
+	GameWindow *listbox;
+	Int numLength;
+	Int numColumns;
+	Int w;
+	Int h;
+	Color color;
+	const SkirmishBattleHonors *battleHonors;
+	const Image *easyImage;
+	const Image *mediumImage;
+	const Image *brutalImage;
+	const Image *maxBrutalImage;
+	AsciiString mapToSelect;
+	Int selectionIndex;
+	Bool isMultiplayer;
+};
+
+//-------------------------------------------------------------------------------------------------
+static Bool addMapToMapListbox(
+	MapListBoxData& lbData,
+	const AsciiString& mapDir,
+	const AsciiString& mapName,
+	const MapMetaData& mapMetaData)
+{
+	const Bool mapOk = mapName.startsWithNoCase(mapDir.str()) && lbData.isMultiplayer == mapMetaData.m_isMultiplayer && !mapMetaData.m_displayName.isEmpty();
+
+	if (mapOk)
+	{
+		UnicodeString mapDisplayName;
+		/// @todo: mapDisplayName = TheGameText->fetch(mapMetaData.m_displayName.str());
+		mapDisplayName = mapMetaData.m_displayName;
+
+		Int index = -1;
+		Int imageItemData = -1;
+		if (lbData.numColumns > 1 && mapMetaData.m_isMultiplayer)
+		{
+			const Int numEasy = lbData.battleHonors->getEnduranceMedal(mapName.str(), SLOT_EASY_AI);
+			const Int numMedium = lbData.battleHonors->getEnduranceMedal(mapName.str(), SLOT_MED_AI);
+			const Int numBrutal = lbData.battleHonors->getEnduranceMedal(mapName.str(), SLOT_BRUTAL_AI);
+			if (numBrutal)
+			{
+				const Int maxBrutalSlots = mapMetaData.m_numPlayers - 1;
+				if (lbData.maxBrutalImage != NULL && numBrutal == maxBrutalSlots)
+				{
+					index = GadgetListBoxAddEntryImage( lbData.listbox, lbData.maxBrutalImage, index, 0, lbData.w, lbData.h, TRUE);
+					imageItemData = 4;
+				}
+				else
+				{
+					index = GadgetListBoxAddEntryImage( lbData.listbox, lbData.brutalImage, index, 0, lbData.w, lbData.h, TRUE);
+					imageItemData = 3;
+				}
+			}
+			else if (numMedium)
+			{
+				imageItemData = 2;
+				index = GadgetListBoxAddEntryImage( lbData.listbox, lbData.mediumImage, index, 0, lbData.w, lbData.h, TRUE);
+			}
+			else if (numEasy)
+			{
+				imageItemData = 1;
+				index = GadgetListBoxAddEntryImage( lbData.listbox, lbData.easyImage, index, 0, lbData.w, lbData.h, TRUE);
+			}
+			else
+			{
+				imageItemData = 0;
+				index = GadgetListBoxAddEntryImage( lbData.listbox, NULL, index, 0, lbData.w, lbData.h, TRUE);
+			}
+		}
+
+		index = GadgetListBoxAddEntryText( lbData.listbox, mapDisplayName, lbData.color, index, lbData.numColumns-1 );
+		DEBUG_ASSERTCRASH(index >= 0, ("Expects valid index"));
+
+		if (mapName == lbData.mapToSelect)
+		{
+			lbData.selectionIndex = index;
+		}
+
+		// now set the char* as the item data.  this works because the map cache isn't being
+		// modified while a map listbox is up.
+		GadgetListBoxSetItemData( lbData.listbox, (void *)(mapName.str()), index );
+
+		if (lbData.numColumns > 1)
+		{
+			GadgetListBoxSetItemData( lbData.listbox, (void *)imageItemData, index, 1 );
+		}
+
+		// TheSuperHackers @performance Now stops processing when the list is full.
+		if (index == lbData.numLength - 1)
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+//-------------------------------------------------------------------------------------------------
+static Bool addMapCollectionToMapListbox(
+	MapListBoxData& lbData,
+	const AsciiString& mapDir,
+	const MapNameList& mapNames,
+	const MapDisplayToFileNameList& fileNames)
+{
+	MapNameList::const_iterator mapNameIt = mapNames.begin();
+
+	for (; mapNameIt != mapNames.end(); ++mapNameIt)
+	{
+		MapDisplayToFileNameList::const_iterator fileNameIt = fileNames.find(*mapNameIt);
+		DEBUG_ASSERTCRASH(fileNameIt != fileNames.end(), ("Map '%s' not found in file names map", mapNameIt->str()));
+
+		const AsciiString& asciiMapName = fileNameIt->second;
+
+#if RTS_ZEROHOUR
+		//Patch 1.03 -- Purposely filter out these broken maps that exist in Generals.
+		if( !asciiMapName.compare( "maps\\armored fury\\armored fury.map" ) ||
+			!asciiMapName.compare( "maps\\scorched earth\\scorched earth.map" ) )
+		{
+			continue;
+		}
+#endif
+
+		MapCache::iterator mapCacheIt = TheMapCache->find(asciiMapName);
+		DEBUG_ASSERTCRASH(mapCacheIt != TheMapCache->end(), ("Map '%s' not found in map cache.", mapNameIt->str()));
+		/*
+		if (it != TheMapCache->end())
+		{
+			DEBUG_LOG(("populateMapListbox(): looking at %s (displayName = %ls), mp = %d (== %d?) mapDir=%s (ok=%d)",
+				it->first.str(), it->second.m_displayName.str(), it->second.m_isMultiplayer, isMultiplayer,
+				mapDir.str(), it->first.startsWith(mapDir.str())));
+		}
+		*/
+
+		const Bool ok = addMapToMapListbox(lbData, mapDir, mapCacheIt->first, mapCacheIt->second);
+
+		if (!ok)
+			return false;
+	}
+
+	return true;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Load the listbox with all the map files available to play */
+//-------------------------------------------------------------------------------------------------
+Int populateMapListboxNoReset( GameWindow *listbox, Bool useSystemMaps, Bool isMultiplayer, AsciiString mapToSelect )
+{
+	if(!TheMapCache)
+		return -1;
+
+	if (!listbox)
+		return -1;
+
+	MapListBoxData lbData;
+	lbData.listbox = listbox;
+	lbData.numLength = GadgetListBoxGetListLength( listbox );
+	lbData.numColumns = GadgetListBoxGetNumColumns( listbox );
+	lbData.mapToSelect = mapToSelect;
+	lbData.isMultiplayer = isMultiplayer;
+
+	if (lbData.numColumns > 1)
+	{
+		lbData.easyImage = TheMappedImageCollection->findImageByName("Star-Bronze");
+		lbData.mediumImage = TheMappedImageCollection->findImageByName("Star-Silver");
+		lbData.brutalImage = TheMappedImageCollection->findImageByName("Star-Gold");
+		lbData.maxBrutalImage = TheMappedImageCollection->findImageByName("RedYell_Star");
+		lbData.battleHonors = new SkirmishBattleHonors;
+
+		lbData.w = lbData.brutalImage ? lbData.brutalImage->getImageWidth() : 10;
+		lbData.w = min(GadgetListBoxGetColumnWidth(listbox, 0), lbData.w);
+		lbData.h = lbData.w;
+	}
+
+	AsciiString mapDir;
+	if (useSystemMaps)
+	{
+		mapDir = TheMapCache->getMapDir();
+	}
+	else
+	{
+		mapDir = TheGlobalData->getPath_UserData();
+		mapDir.concat(TheMapCache->getMapDir());
+	}
+	mapDir.toLower();
+
+	MapNameList mapNames;
+	MapDisplayToFileNameList fileNames;
+	Int curNumPlayersInMap = 1;
+
+	for (; curNumPlayersInMap <= MAX_SLOTS; ++curNumPlayersInMap)
+	{
+		buildMapListForNumPlayers(mapNames, fileNames, curNumPlayersInMap);
+
+		const Bool ok = addMapCollectionToMapListbox(lbData, mapDir, mapNames, fileNames);
+
+		mapNames.clear();
+		fileNames.clear();
+
+		if (!ok)
+			break;
+	}
+
+	delete lbData.battleHonors;
+	lbData.battleHonors = NULL;
+
+	GadgetListBoxSetSelected(listbox, &lbData.selectionIndex, 1);
+
+	if (lbData.selectionIndex >= 0)
+	{
+		Int topIndex = GadgetListBoxGetTopVisibleEntry(listbox);
+		Int bottomIndex = GadgetListBoxGetBottomVisibleEntry(listbox);
+		Int rowsOnScreen = bottomIndex - topIndex;
+
+		if (lbData.selectionIndex >= bottomIndex)
+		{
+			Int newTop = max( 0, lbData.selectionIndex - max( 1, rowsOnScreen / 2 ) );
+			//The trouble is that rowsOnScreen/2 can be zero if bottom is 1 and top is zero
+			GadgetListBoxSetTopVisibleEntry( listbox, newTop );
+		}
+	}
+
+	return lbData.selectionIndex;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Load the listbox with all the map files available to play */
+//-------------------------------------------------------------------------------------------------
+Int populateMapListbox( GameWindow *listbox, Bool useSystemMaps, Bool isMultiplayer, AsciiString mapToSelect )
+{
+	if(!TheMapCache)
+		return -1;
+
+	if (!listbox)
+		return -1;
+
+	// reset the listbox content
+	GadgetListBoxReset( listbox );
+
+	return populateMapListboxNoReset( listbox, useSystemMaps, isMultiplayer, mapToSelect );
+}
+
+
+
+//-------------------------------------------------------------------------------------------------
+/** Validate a map */
+//-------------------------------------------------------------------------------------------------
+Bool isValidMap( AsciiString mapName, Bool isMultiplayer )
+{
+	if(!TheMapCache || mapName.isEmpty())
+		return FALSE;
+	TheMapCache->updateCache();
+
+	mapName.toLower();
+	MapCache::iterator it = TheMapCache->find(mapName);
+	if (it != TheMapCache->end())
+	{
+		if (isMultiplayer == it->second.m_isMultiplayer)
+		{
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Find a valid map */
+//-------------------------------------------------------------------------------------------------
+AsciiString getDefaultMap( Bool isMultiplayer )
+{
+	if(!TheMapCache)
+		return AsciiString::TheEmptyString;
+	TheMapCache->updateCache();
+
+	MapCache::iterator it = TheMapCache->begin();
+	for (; it != TheMapCache->end(); ++it)
+	{
+		if (isMultiplayer == it->second.m_isMultiplayer)
+		{
+			return it->first;
+		}
+	}
+
+	return AsciiString::TheEmptyString;
+}
+
+
+AsciiString getDefaultOfficialMap()
+{
+	if(!TheMapCache)
+		return AsciiString::TheEmptyString;
+	TheMapCache->updateCache();
+
+	MapCache::iterator it = TheMapCache->begin();
+	for (; it != TheMapCache->end(); ++it)
+	{
+		if (it->second.m_isMultiplayer && it->second.m_isOfficial)
+		{
+			return it->first;
+		}
+	}
+	return AsciiString::TheEmptyString;
+}
+
+
+Bool isOfficialMap( AsciiString mapName )
+{
+	if(!TheMapCache || mapName.isEmpty())
+		return FALSE;
+	TheMapCache->updateCache();
+	mapName.toLower();
+	MapCache::iterator it = TheMapCache->find(mapName);
+	if (it != TheMapCache->end())
+		return it->second.m_isOfficial;
+	return FALSE;
+}
+
+
+const MapMetaData *MapCache::findMap(AsciiString mapName)
+{
+	mapName.toLower();
+	MapCache::iterator it = find(mapName);
+	if (it == end())
+		return NULL;
+	return &(it->second);
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Embed the pristine map into the xfer stream */
+// ------------------------------------------------------------------------------------------------
+static void copyFromBigToDir( const AsciiString& infile, const AsciiString& outfile )
+{
+	// open the map file
+
+	File *file = TheFileSystem->openFile( infile.str(), File::READ | File::BINARY );
+	if( file == NULL )
+	{
+		DEBUG_CRASH(( "copyFromBigToDir - Error opening source file '%s'", infile.str() ));
+		throw SC_INVALID_DATA;
+	}
+
+	// how big is the map file
+	Int fileSize = file->seek( 0, File::END );
+
+
+	// rewind to beginning of file
+	file->seek( 0, File::START );
+
+	// allocate buffer big enough to hold the entire map file
+	char *buffer = NEW char[ fileSize ];
+	if( buffer == NULL )
+	{
+		DEBUG_CRASH(( "copyFromBigToDir - Unable to allocate buffer for file '%s'", infile.str() ));
+		throw SC_INVALID_DATA;
+	}
+
+	// copy the file to the buffer
+	if( file->read( buffer, fileSize ) < fileSize )
+	{
+		DEBUG_CRASH(( "copyFromBigToDir - Error reading from file '%s'", infile.str() ));
+		throw SC_INVALID_DATA;
+	}
+	// close the BIG file
+	file->close();
+
+	File *filenew = TheFileSystem->openFile( outfile.str(), File::WRITE | File::CREATE | File::BINARY );
+
+	if( !filenew || filenew->write(buffer, fileSize) < fileSize)
+	{
+		DEBUG_CRASH(( "copyFromBigToDir - Error writing to file '%s'", outfile.str() ));
+		throw SC_INVALID_DATA;
+	}
+
+	filenew->close();
+
+	// delete the buffer
+	delete [] buffer;
+}
+
+Image *getMapPreviewImage( AsciiString mapName )
+{
+	if(!TheGlobalData)
+		return NULL;
+	DEBUG_LOG(("%s Map Name", mapName.str()));
+	AsciiString tgaName = mapName;
+	AsciiString name;
+	AsciiString tempName;
+	tgaName.truncateBy(4); // ".map"
+	name = tgaName;
+	tgaName.concat(".tga");
+
+	AsciiString portableName = TheGameState->realMapPathToPortableMapPath(name);
+	tempName.set(AsciiString::TheEmptyString);
+	for(Int i = 0; i < portableName.getLength(); ++i)
+	{
+		char c = portableName.getCharAt(i);
+		if (c == '\\' || c == ':')
+			tempName.concat('_');
+		else
+			tempName.concat(c);
+	}
+
+	name = tempName;
+	name.concat(".tga");
+
+
+	// copy file over
+	// copy source tgaName, to name
+
+	Image *image = (Image *)TheMappedImageCollection->findImageByName(tempName);
+	if(!image)
+	{
+
+		if(!TheFileSystem->doesFileExist(tgaName.str()))
+			return NULL;
+		AsciiString mapPreviewDir;
+		mapPreviewDir.format(MAP_PREVIEW_DIR_PATH, TheGlobalData->getPath_UserData().str());
+		TheFileSystem->createDirectory(mapPreviewDir);
+
+		mapPreviewDir.concat(name);
+
+		Bool success = false;
+		try
+		{
+			copyFromBigToDir(tgaName, mapPreviewDir);
+			success = true;
+		}
+		catch (...)
+		{
+			success = false;	// no rethrow
+		}
+
+		if (success)
+		{
+    	image = newInstance(Image);
+			image->setName(tempName);
+			//image->setFullPath("mission.tga");
+			image->setFilename(name);
+			image->setStatus(IMAGE_STATUS_NONE);
+			Region2D uv;
+			uv.hi.x = 1.0f;
+			uv.hi.y = 1.0f;
+			uv.lo.x	= 0.0f;
+			uv.lo.y = 0.0f;
+			image->setUV(&uv);
+			image->setTextureHeight(128);
+			image->setTextureWidth(128);
+			TheMappedImageCollection->addImage(image);
+		}
+		else
+		{
+			image = NULL;
+		}
+	}
+
+	return image;
+
+
+
+/*
+	// sanity
+	if( mapName.isEmpty() )
+		return NULL;
+	Region2D uv;
+	mapPreviewImage = TheMappedImageCollection->findImageByName("MapPreview");
+	if(mapPreviewImage)
+		deleteInstance(mapPreviewImage);
+
+	mapPreviewImage = TheMappedImageCollection->newImage();
+	mapPreviewImage->setName("MapPreview");
+	mapPreviewImage->setStatus(IMAGE_STATUS_RAW_TEXTURE);
+// allocate our terrain texture
+	TextureClass * texture = new TextureClass( size.x, size.y,
+																			 WW3D_FORMAT_X8R8G8B8, MIP_LEVELS_1 );
+	uv.lo.x = 0.0f;
+	uv.lo.y = 1.0f;
+	uv.hi.x = 1.0f;
+	uv.hi.y = 0.0f;
+	mapPreviewImage->setStatus( IMAGE_STATUS_RAW_TEXTURE );
+	mapPreviewImage->setRawTextureData( texture );
+	mapPreviewImage->setUV( &uv );
+	mapPreviewImage->setTextureWidth( size.x );
+	mapPreviewImage->setTextureHeight( size.y );
+	mapPreviewImage->setImageSize( &size );
+
+
+	CachedFileInputStream theInputStream;
+	if (theInputStream.open(AsciiString(mapName.str())))
+	{
+		ChunkInputStream *pStrm = &theInputStream;
+		pStrm->absoluteSeek(0);
+		DataChunkInput file( pStrm );
+		if (file.isValidFileType()) {	// Backwards compatible files aren't valid data chunk files.
+			// Read the waypoints.
+			file.registerParser( "MapPreview", AsciiString::TheEmptyString, parseMapPreviewChunk );
+			if (!file.parse(NULL)) {
+				DEBUG_ASSERTCRASH(false,("Unable to read MapPreview info."));
+				deleteInstance(mapPreviewImage);
+				return NULL;
+			}
+		}
+		theInputStream.close();
+	}
+	else
+	{
+		deleteInstance(mapPreviewImage);
+		return NULL;
+	}
+
+
+	return mapPreviewImage;
+
+*/
+	return NULL;
+}
+
+Bool parseMapPreviewChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+/*
+	ICoord2D size;
+
+	SurfaceClass *surface;
+	size.x = file.readInt();
+	size.y = file.readInt();
+
+
+	surface = (TextureClass *)mapPreviewImage->getRawTextureData()->Get_Surface_Level();
+	//texture->Get_Surface_Level();
+
+	DEBUG_LOG(("BeginMapPreviewInfo"));
+	UnsignedInt *buffer = new UnsignedInt[size.x * size.y];
+	Int x,y;
+	for (y=0; y<size.y; y++) {
+		for(x = 0; x< size.x; x++)
+		{
+			surface->DrawPixel( x, y, file.readInt() );
+			buffer[y + x] = file.readInt();
+			DEBUG_LOG(("x:%d, y:%d, %X", x, y, buffer[y + x]));
+		}
+	}
+	mapPreviewImage->setRawTextureData(buffer);
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
+	DEBUG_LOG(("EndMapPreviewInfo"));
+	REF_PTR_RELEASE(surface);
+	return true;
+*/
+	return FALSE;
+}
+
+void findDrawPositions( Int startX, Int startY, Int width, Int height, Region3D extent,
+															 ICoord2D *ul, ICoord2D *lr )
+{
+
+	Real ratioWidth;
+	Real ratioHeight;
+	Coord2D radar;
+	ratioWidth = extent.width()/(width * 1.0f);
+	ratioHeight = extent.height()/(height* 1.0f);
+
+	if( ratioWidth >= ratioHeight)
+	{
+		radar.x = extent.width() / ratioWidth;
+		radar.y = extent.height()/ ratioWidth;
+		ul->x = 0;
+		ul->y = (height - radar.y) / 2.0f;
+		lr->x = radar.x;
+		lr->y = height - ul->y;
+	}
+	else
+	{
+		radar.x = extent.width() / ratioHeight;
+		radar.y = extent.height()/ ratioHeight;
+		ul->x = (width - radar.x ) / 2.0f;
+		ul->y = 0;
+		lr->x = width - ul->x;
+		lr->y = radar.y;
+	}
+
+	// make them pixel positions
+	ul->x += startX;
+	ul->y += startY;
+	lr->x += startX;
+	lr->y += startY;
+
+}
+
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/ParabolicEase.cpp b/Core/GameEngine/Source/GameClient/ParabolicEase.cpp
similarity index 88%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/ParabolicEase.cpp
rename to Core/GameEngine/Source/GameClient/ParabolicEase.cpp
index b393145d456..ac92ae19770 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/ParabolicEase.cpp
+++ b/Core/GameEngine/Source/GameClient/ParabolicEase.cpp
@@ -26,11 +26,6 @@
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "GameClient/ParabolicEase.h"
 // ============================================================================
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-// #pragma optimize("", off)
-// #pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif // RTS_INTERNAL
 // ============================================================================
 namespace {
 // ============================================================================
@@ -54,18 +49,18 @@ ParabolicEase::setEaseTimes(Real easeInTime, Real easeOutTime)
 {
 	m_in = easeInTime;
 	if (m_in < 0.0f || m_in > 1.0f) {
-		DEBUG_CRASH(("Ease-in out of range (in = %g)\n", m_in));
+		DEBUG_CRASH(("Ease-in out of range (in = %g)", m_in));
 		m_in = clamp(m_in);
 	}
 
 	m_out = 1.0f - easeOutTime;
 	if (m_out < 0.0f || m_out > 1.0f) {
-		DEBUG_CRASH(("Ease-out out of range (out = %g)\n", m_out));
+		DEBUG_CRASH(("Ease-out out of range (out = %g)", m_out));
 		m_out = clamp(m_out);
 	}
 
 	if (m_in > m_out) {
-		DEBUG_CRASH(("Ease-in and ease-out overlap (in = %g, out = %g)\n", m_in, m_out));
+		DEBUG_ASSERTCRASH(m_in <= m_out + FLT_EPSILON, ("Ease-in and ease-out overlap (in = %g, out = %g)", m_in, m_out));
 		m_in = m_out;
 	}
 }
@@ -75,7 +70,7 @@ Real
 ParabolicEase::operator ()(Real param) const
 {
 	if (param < 0.0f || param > 1.0f) {
-		DEBUG_CRASH(("Ease-in/ease-out parameter out of range (param = %g)\n", param));
+		DEBUG_CRASH(("Ease-in/ease-out parameter out of range (param = %g)", param));
 		param = clamp(param);
 	}
 #if 0
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Snow.cpp b/Core/GameEngine/Source/GameClient/Snow.cpp
similarity index 90%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/Snow.cpp
rename to Core/GameEngine/Source/GameClient/Snow.cpp
index eb6dbd14645..46615690a76 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Snow.cpp
+++ b/Core/GameEngine/Source/GameClient/Snow.cpp
@@ -27,15 +27,10 @@
 // Author: Mark Wilczynski, July 2003
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the Game
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the Game
 #include "GameClient/Snow.h"
 #include "GameClient/View.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 SnowManager *TheSnowManager=NULL;
 
@@ -73,9 +68,9 @@ void SnowManager::updateIniSettings(void)
 	m_velocity = TheWeatherSetting->m_snowVelocity;
 	m_frequencyScaleX = TheWeatherSetting->m_snowFrequencyScaleX;
 	m_frequencyScaleY = TheWeatherSetting->m_snowFrequencyScaleY;
-	m_amplitude	= TheWeatherSetting->m_snowAmplitude;	
-	m_pointSize = TheWeatherSetting->m_snowPointSize;	
-	m_quadSize	= TheWeatherSetting->m_snowQuadSize;		
+	m_amplitude	= TheWeatherSetting->m_snowAmplitude;
+	m_pointSize = TheWeatherSetting->m_snowPointSize;
+	m_quadSize	= TheWeatherSetting->m_snowQuadSize;
 	m_boxDimensions	= TheWeatherSetting->m_snowBoxDimensions;
 	m_emitterSpacing = 1.0f/TheWeatherSetting->m_snowBoxDensity;
 	m_maxPointSize = TheWeatherSetting->m_snowMaxPointSize;
@@ -101,17 +96,14 @@ SnowManager::~SnowManager()
 	m_startingHeights=NULL;
 
 	// TheSuperHackers @fix Mauller 13/04/2025 Delete the instance of the weather settings
-	if (TheWeatherSetting)
-	{
-		deleteInstance((WeatherSetting*)TheWeatherSetting.getNonOverloadedPointer());
-		TheWeatherSetting=NULL;
-	}
+	deleteInstance((WeatherSetting*)TheWeatherSetting.getNonOverloadedPointer());
+	TheWeatherSetting=NULL;
 }
 
 OVERRIDE<WeatherSetting> TheWeatherSetting = NULL;
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-const FieldParse WeatherSetting::m_weatherSettingFieldParseTable[] = 
+const FieldParse WeatherSetting::m_weatherSettingFieldParseTable[] =
 {
 	{ "SnowTexture",							INI::parseAsciiString,NULL,			offsetof( WeatherSetting, m_snowTexture ) },
 	{ "SnowFrequencyScaleX",					INI::parseReal,NULL,			offsetof( WeatherSetting, m_snowFrequencyScaleX ) },
diff --git a/Core/GameEngine/Source/GameClient/System/Debug/AudioDebugDisplay.cpp b/Core/GameEngine/Source/GameClient/System/Debug/AudioDebugDisplay.cpp
new file mode 100644
index 00000000000..363cde812a7
--- /dev/null
+++ b/Core/GameEngine/Source/GameClient/System/Debug/AudioDebugDisplay.cpp
@@ -0,0 +1,114 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   Generals
+//
+// Module:    Debug
+//
+// File name: AudiDebugDisplay.cpp
+//
+// Created:   11/13/01 TR
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameClient/DebugDisplay.h"
+#include "Common/GameAudio.h"
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Data
+//----------------------------------------------------------------------------
+
+static DebugDisplayInterface *debugDisplay;
+
+//----------------------------------------------------------------------------
+//         Public Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Prototypes
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Functions
+//----------------------------------------------------------------------------
+
+
+static void printFunc( char *text )
+{
+	debugDisplay->printf( text );
+}
+
+//----------------------------------------------------------------------------
+//         Public Functions
+//----------------------------------------------------------------------------
+
+
+//============================================================================
+// AudioDebugDisplay
+//============================================================================
+
+#if defined(RTS_DEBUG)
+void AudioDebugDisplay ( DebugDisplayInterface *dd, void *, FILE *fp = NULL )
+{
+	TheAudio->audioDebugDisplay( dd, NULL, fp );
+}
+#endif
+
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Smudge.cpp b/Core/GameEngine/Source/GameClient/System/Smudge.cpp
similarity index 93%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/System/Smudge.cpp
rename to Core/GameEngine/Source/GameClient/System/Smudge.cpp
index 436a83da99c..62b40b491f8 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Smudge.cpp
+++ b/Core/GameEngine/Source/GameClient/System/Smudge.cpp
@@ -27,14 +27,9 @@
 // Author: Mark Wilczynski, June 2003
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the Game
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the Game
 #include "GameClient/Smudge.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 DLListClass<Smudge> SmudgeSet::m_freeSmudgeList;	///<list of unused smudges for use by SmudgeSets.
 
diff --git a/Core/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp b/Core/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp
new file mode 100644
index 00000000000..ceae1abd30e
--- /dev/null
+++ b/Core/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp
@@ -0,0 +1,458 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: TerrainRoads.cpp /////////////////////////////////////////////////////////////////////////
+// Author: Colin Day, December 2001
+// Desc:   Terrain road/bridge descriptions
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+// INCLDUES ///////////////////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#define DEFINE_BODYDAMAGETYPE_NAMES
+#include "Common/INI.h"
+#include "GameClient/TerrainRoads.h"
+
+// PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
+TerrainRoadCollection *TheTerrainRoads = NULL;
+
+// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
+UnsignedInt TerrainRoadCollection::m_idCounter = 0;
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+const FieldParse TerrainRoadType::m_terrainRoadFieldParseTable[] =
+{
+
+	{ "Texture",						INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_texture ) },
+	{ "RoadWidth",					INI::parseReal,								NULL, offsetof( TerrainRoadType, m_roadWidth ) },
+	{ "RoadWidthInTexture",	INI::parseReal,								NULL, offsetof( TerrainRoadType, m_roadWidthInTexture ) },
+
+	{ NULL,									NULL,													NULL, 0 },
+
+};
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+const FieldParse TerrainRoadType::m_terrainBridgeFieldParseTable[] =
+{
+
+	{ "BridgeScale",									INI::parseReal,								NULL, offsetof( TerrainRoadType, m_bridgeScale ) },
+	{ "ScaffoldObjectName",						INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_scaffoldObjectName ) },
+	{ "ScaffoldSupportObjectName",		INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_scaffoldSupportObjectName ) },
+	{ "RadarColor",										INI::parseRGBColor,						NULL, offsetof( TerrainRoadType, m_radarColor ) },
+
+	{ "TransitionEffectsHeight",			INI::parseReal,								NULL, offsetof( TerrainRoadType, m_transitionEffectsHeight ) },
+	{ "NumFXPerType",									INI::parseInt,								NULL,	offsetof( TerrainRoadType, m_numFXPerType ) },
+
+	{ "BridgeModelName",							INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_bridgeModelName ) },
+	{ "Texture",											INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_texture ) },
+	{ "BridgeModelNameDamaged",				INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_bridgeModelNameDamaged ) },
+	{ "TextureDamaged",								INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_textureDamaged ) },
+	{ "BridgeModelNameReallyDamaged",	INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_bridgeModelNameReallyDamaged ) },
+	{ "TextureReallyDamaged",					INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_textureReallyDamaged ) },
+	{ "BridgeModelNameBroken",				INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_bridgeModelNameBroken ) },
+	{ "TextureBroken",								INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_textureBroken ) },
+
+	{ "TowerObjectNameFromLeft",			INI::parseAsciiString,				NULL,	offsetof( TerrainRoadType, m_towerObjectName[ BRIDGE_TOWER_FROM_LEFT ] ) },
+	{ "TowerObjectNameFromRight",			INI::parseAsciiString,				NULL,	offsetof( TerrainRoadType, m_towerObjectName[ BRIDGE_TOWER_FROM_RIGHT ] ) },
+	{ "TowerObjectNameToLeft",				INI::parseAsciiString,				NULL,	offsetof( TerrainRoadType, m_towerObjectName[ BRIDGE_TOWER_TO_LEFT ] ) },
+	{ "TowerObjectNameToRight",				INI::parseAsciiString,				NULL,	offsetof( TerrainRoadType, m_towerObjectName[ BRIDGE_TOWER_TO_RIGHT ] ) },
+
+	{ "DamagedToSound",								INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_damageToSoundString[ BODY_DAMAGED ] ) },
+	{ "RepairedToSound",							INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_repairedToSoundString[ BODY_DAMAGED ] ) },
+	{ "TransitionToOCL",							parseTransitionToOCL,					NULL,	NULL },
+	{ "TransitionToFX",								parseTransitionToFX,					NULL, NULL },
+
+
+	{ NULL,									NULL,													NULL, 0 },
+
+};
+
+// ------------------------------------------------------------------------------------------------
+/** In the form of
+	* Label = Transition:<Damage|Repair> ToState:<BODYTYPE> EffectNum:<INT> OCL:<OCL NAME> */
+// ------------------------------------------------------------------------------------------------
+/*static*/ void TerrainRoadType::parseTransitionToOCL( INI *ini,
+																											 void *instance,
+																											 void *store,
+																											 const void *userData )
+{
+	const char *token;
+	TerrainRoadType *theInstance = (TerrainRoadType *)instance;
+
+	// which transition is this
+	Bool damageTransition;
+	token = ini->getNextSubToken( "Transition" );
+	if( stricmp( token, "Damage" ) == 0 )
+		damageTransition = TRUE;
+	else if( stricmp( token, "Repair" ) == 0 )
+		damageTransition = FALSE;
+	else
+	{
+
+		DEBUG_CRASH(( "Expected Damage/Repair transition keyword" ));
+		throw INI_INVALID_DATA;
+
+	}
+
+	// get body damage state
+	token = ini->getNextSubToken( "ToState" );
+	BodyDamageType state = (BodyDamageType)ini->scanIndexList( token, TheBodyDamageTypeNames );
+
+	// get effect num
+	token = ini->getNextSubToken( "EffectNum" );
+	Int effectNum = ini->scanInt( token );
+
+	// make effectNum zero based
+	--effectNum;
+
+	// sanity check effect num
+	if( effectNum < 0 || effectNum >= MAX_BRIDGE_BODY_FX )
+	{
+
+		DEBUG_CRASH(( "Effect number max on bridge transitions is '%d'", MAX_BRIDGE_BODY_FX ));
+		throw INI_INVALID_DATA;
+
+	}
+
+	// read the string
+	token = ini->getNextSubToken( "OCL" );
+	if( damageTransition )
+		theInstance->friend_setDamageToOCLString( state, effectNum, AsciiString( token ) );
+	else
+		theInstance->friend_setRepairedToOCLString( state, effectNum, AsciiString( token ) );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** In the form of
+	* Label = Transition:<Damage|Repair> ToState:<BODYTYPE> EffectNum:<INT> FX:<FXLIST NAME> */
+// ------------------------------------------------------------------------------------------------
+/*static*/ void TerrainRoadType::parseTransitionToFX( INI *ini,
+																											void *instance,
+																											void *store,
+																											const void *userData )
+{
+	const char *token;
+	TerrainRoadType *theInstance = (TerrainRoadType *)instance;
+
+	// which transition is this
+	Bool damageTransition;
+	token = ini->getNextSubToken( "Transition" );
+	if( stricmp( token, "Damage" ) == 0 )
+		damageTransition = TRUE;
+	else if( stricmp( token, "Repair" ) == 0 )
+		damageTransition = FALSE;
+	else
+	{
+
+		DEBUG_CRASH(( "Expected Damage/Repair transition keyword" ));
+		throw INI_INVALID_DATA;
+
+	}
+
+	// get body damage state
+	token = ini->getNextSubToken( "ToState" );
+	BodyDamageType state = (BodyDamageType)ini->scanIndexList( token, TheBodyDamageTypeNames );
+
+	// get effect num
+	token = ini->getNextSubToken( "EffectNum" );
+	Int effectNum = ini->scanInt( token );
+
+	// make effectNum zero based
+	--effectNum;
+
+	// sanity check effect num
+	if( effectNum < 0 || effectNum >= MAX_BRIDGE_BODY_FX )
+	{
+
+		DEBUG_CRASH(( "Effect number max on bridge transitions is '%d'", MAX_BRIDGE_BODY_FX ));
+		throw INI_INVALID_DATA;
+
+	}
+
+	// read the string
+	token = ini->getNextSubToken( "FX" );
+	if( damageTransition )
+		theInstance->friend_setDamageToFXString( state, effectNum, AsciiString( token ) );
+	else
+		theInstance->friend_setRepairedToFXString( state, effectNum, AsciiString( token ) );
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+TerrainRoadType::TerrainRoadType( void )
+{
+
+	m_isBridge = FALSE;
+	m_id = 0;
+	m_next = NULL;
+	m_roadWidth = 0.0f;
+	m_roadWidthInTexture = 0.0f;
+	m_bridgeScale = 1.0f;
+	m_radarColor.red = 0.0f;
+	m_radarColor.green = 0.0f;
+	m_radarColor.blue = 0.0f;
+	m_transitionEffectsHeight = 0.0f;
+	m_numFXPerType = 0;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+TerrainRoadType::~TerrainRoadType( void )
+{
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+TerrainRoadCollection::TerrainRoadCollection( void )
+{
+
+	m_roadList = NULL;
+	m_bridgeList = NULL;
+
+	m_idCounter = 1;   ///< MUST start this at 1.
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+TerrainRoadCollection::~TerrainRoadCollection( void )
+{
+	TerrainRoadType *temp;
+
+	// delete all roads in the list
+	while( m_roadList )
+	{
+
+		// get next road
+		temp = m_roadList->friend_getNext();
+
+		// delete this road
+		deleteInstance(m_roadList);
+
+		// set the new head of the list
+		m_roadList = temp;
+
+	}
+
+	// delete all bridges in the list
+	while( m_bridgeList )
+	{
+
+		// get next bridge
+		temp = m_bridgeList->friend_getNext();
+
+		// delete this bridge
+		deleteInstance(m_bridgeList);
+
+		// set the new head of the list
+		m_bridgeList = temp;
+
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Find road with matching name */
+//-------------------------------------------------------------------------------------------------
+TerrainRoadType *TerrainRoadCollection::findRoad( AsciiString name )
+{
+	TerrainRoadType *road;
+
+	for( road = m_roadList; road; road = nextRoad( road ) )
+	{
+
+		if( road->getName() == name )
+			return road;
+
+	}
+
+	// not found
+	return NULL;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Find bridge with matching name */
+//-------------------------------------------------------------------------------------------------
+TerrainRoadType *TerrainRoadCollection::findBridge( AsciiString name )
+{
+	TerrainRoadType *bridge;
+
+	for( bridge = m_bridgeList; bridge; bridge = nextBridge( bridge ) )
+	{
+
+		if( bridge->getName() == name )
+			return bridge;
+
+	}
+
+	// not found
+	return NULL;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Search the roads AND bridge lists for the name */
+//-------------------------------------------------------------------------------------------------
+TerrainRoadType *TerrainRoadCollection::findRoadOrBridge( AsciiString name )
+{
+	TerrainRoadType *road = findRoad( name );
+
+	if( road )
+		return road;
+	else
+		return findBridge( name );
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Allocate a new road, set the name, and link to the road list */
+//-------------------------------------------------------------------------------------------------
+TerrainRoadType *TerrainRoadCollection::newRoad( AsciiString name )
+{
+	TerrainRoadType *road = newInstance(TerrainRoadType);
+
+	// assign the name
+	road->friend_setName( name );
+
+	// assign unique id
+	road->friend_setID( m_idCounter++ );
+
+	// is not a bridge
+	road->friend_setBridge( FALSE );
+
+	// set defaults from the default road
+	TerrainRoadType *defaultRoad = findRoad( "DefaultRoad" );
+	if( defaultRoad )
+	{
+
+		road->friend_setTexture( defaultRoad->getTexture() );
+		road->friend_setRoadWidth( defaultRoad->getRoadWidth() );
+		road->friend_setRoadWidthInTexture( defaultRoad->getRoadWidthInTexture() );
+
+	}
+
+	// link to list
+	road->friend_setNext( m_roadList );
+	m_roadList = road;
+
+	// return the new road
+	return road;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Allocate a new bridge */
+//-------------------------------------------------------------------------------------------------
+TerrainRoadType *TerrainRoadCollection::newBridge( AsciiString name )
+{
+	TerrainRoadType *bridge = newInstance(TerrainRoadType);
+
+	// assign the name
+	bridge->friend_setName( name );
+
+	// assign unique id
+	bridge->friend_setID( m_idCounter++ );
+
+	// is a bridge
+	bridge->friend_setBridge( TRUE );
+
+	// set defaults from the default bridge
+	TerrainRoadType *defaultBridge = findBridge( "DefaultBridge" );
+	if( defaultBridge )
+	{
+
+		bridge->friend_setTexture( defaultBridge->getTexture() );
+		bridge->friend_setBridgeScale( defaultBridge->getBridgeScale() );
+		bridge->friend_setBridgeModelName( defaultBridge->getBridgeModel() );
+		bridge->friend_setBridgeModelNameDamaged( defaultBridge->getBridgeModelNameDamaged() );
+		bridge->friend_setBridgeModelNameReallyDamaged( defaultBridge->getBridgeModelNameReallyDamaged() );
+		bridge->friend_setBridgeModelNameBroken( defaultBridge->getBridgeModelNameBroken() );
+		bridge->friend_setTextureDamaged( defaultBridge->getTextureDamaged() );
+		bridge->friend_setTextureReallyDamaged( defaultBridge->getTextureReallyDamaged() );
+		bridge->friend_setTextureBroken( defaultBridge->getTextureBroken() );
+
+		bridge->friend_setTransitionEffectsHeight( defaultBridge->getTransitionEffectsHeight() );
+		bridge->friend_setNumFXPerType( defaultBridge->getNumFXPerType() );
+		for( Int state = BODY_PRISTINE; state < BODYDAMAGETYPE_COUNT; state++ )
+		{
+
+			bridge->friend_setDamageToSoundString( (BodyDamageType)state, bridge->getDamageToSoundString( (BodyDamageType)state ) );
+			bridge->friend_setRepairedToSoundString( (BodyDamageType)state, bridge->getRepairedToSoundString( (BodyDamageType)state ) );
+
+			for( Int i = 0; i < MAX_BRIDGE_BODY_FX; i++ )
+			{
+
+				bridge->friend_setDamageToOCLString( (BodyDamageType)state, i, bridge->getDamageToOCLString( (BodyDamageType)state, i ) );
+				bridge->friend_setDamageToFXString( (BodyDamageType)state, i, bridge->getDamageToOCLString( (BodyDamageType)state, i ) );
+				bridge->friend_setRepairedToOCLString( (BodyDamageType)state, i, bridge->getDamageToOCLString( (BodyDamageType)state, i ) );
+				bridge->friend_setRepairedToFXString( (BodyDamageType)state, i, bridge->getDamageToOCLString( (BodyDamageType)state, i ) );
+
+			}
+
+		}
+
+	}
+
+	// link to list
+	bridge->friend_setNext( m_bridgeList );
+	m_bridgeList = bridge;
+
+	// return the new bridge
+	return bridge;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Return next road in list */
+//-------------------------------------------------------------------------------------------------
+TerrainRoadType *TerrainRoadCollection::nextRoad( TerrainRoadType *road )
+{
+
+	DEBUG_ASSERTCRASH( road->isBridge() == FALSE, ("nextRoad: road not a road") );
+	return road->friend_getNext();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Return next bridge in list */
+//-------------------------------------------------------------------------------------------------
+TerrainRoadType *TerrainRoadCollection::nextBridge( TerrainRoadType *bridge )
+{
+
+	DEBUG_ASSERTCRASH( bridge->isBridge() == TRUE, ("nextBridge, bridge is not a bridge") );
+	return bridge->friend_getNext();
+
+}
+
diff --git a/Core/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp b/Core/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp
new file mode 100644
index 00000000000..7b200f35d8c
--- /dev/null
+++ b/Core/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp
@@ -0,0 +1,208 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: TerrainVisual.cpp ////////////////////////////////////////////////////////////////////////
+// Interface for visual representation of terrain on the client
+// Author: Colin Day, April 2001
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+#include "Common/Xfer.h"
+#include "GameClient/TerrainVisual.h"
+
+
+
+
+
+// GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
+TerrainVisual *TheTerrainVisual = NULL;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// DEFINITIONS
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+TerrainVisual::TerrainVisual()
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+TerrainVisual::~TerrainVisual()
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** initialize the device independent functionality of the visual terrain */
+//-------------------------------------------------------------------------------------------------
+void TerrainVisual::init( void )
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Reset */
+//-------------------------------------------------------------------------------------------------
+void TerrainVisual::reset( void )
+{
+
+	m_filenameString.clear();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Update */
+//-------------------------------------------------------------------------------------------------
+void TerrainVisual::update( void )
+{
+	// All the interesting stuff happens in load.  jba.
+}
+
+//-------------------------------------------------------------------------------------------------
+/** device independent implementation for common terrain visual systems */
+//-------------------------------------------------------------------------------------------------
+Bool TerrainVisual::load( AsciiString filename )
+{
+
+	// save the filename
+	if (filename.isEmpty())
+		return FALSE;
+
+	m_filenameString = filename;
+
+	return TRUE;  // success
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** CRC */
+// ------------------------------------------------------------------------------------------------
+void TerrainVisual::crc( Xfer *xfer )
+{
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Xfer
+	* Version Info:
+	* 1: Initial version */
+// ------------------------------------------------------------------------------------------------
+void TerrainVisual::xfer( Xfer *xfer )
+{
+
+	// version
+	XferVersion currentVersion = 1;
+	XferVersion version = currentVersion;
+	xfer->xferVersion( &version, currentVersion );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Load post process */
+// ------------------------------------------------------------------------------------------------
+void TerrainVisual::loadPostProcess( void )
+{
+
+}
+
+
+SeismicSimulationFilterBase::SeismicSimStatusCode DomeStyleSeismicFilter::filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node )
+{
+
+  Int life = node->m_life;
+
+  if ( heightMap == NULL )
+    return SEISMIC_STATUS_INVALID;
+
+
+  if ( life == 0 )
+    return SEISMIC_STATUS_ACTIVE;
+  if ( life < 15 )
+  {
+    // ADD HEIGHT BECAUSE THE EXPLOSION IS PUSHING DIRT UP
+
+    Real magnitude = node->m_magnitude;
+
+    Real offsScalar =  magnitude / (Real)life; // real-life, get it?
+    Int radius = node->m_radius;
+    Int border = heightMap->getBorderSize();
+    Int centerX = node->m_center.x + border ;
+    Int centerY = node->m_center.y + border ;
+
+    UnsignedInt workspaceWidth = radius*2;
+    Real *workspace = NEW Real[ sqr(workspaceWidth) ];
+    Real *workspaceEnd = workspace + sqr(workspaceWidth);
+
+
+    for ( Real *t = workspace; t < workspaceEnd; ++t ) *t = 0.0f;// clear the workspace
+
+    Int x, y;
+    for (x = 0; x < radius; ++x)
+    {
+      for (y = 0; y < radius; ++y)
+      {
+
+        Real distance = sqrt( sqr(x) + sqr(y) );//Pythagoras
+
+        if ( distance < radius )
+        {
+          Real distScalar = cos( ( distance / radius * (PI/2) ) );
+          Real height = (offsScalar * distScalar);
+
+          workspace[ (radius + x) +  workspaceWidth * (radius + y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX + x,  centerY + y ) ;//kaleidoscope
+
+          if ( x != 0 ) // non-zero test prevents cross-shaped double stamp
+          {
+      			workspace[ (radius - x) + workspaceWidth * (radius + y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX - x,  centerY + y ) ;
+            if ( y != 0 )
+              workspace[ (radius - x) + workspaceWidth * (radius - y) ] =  height + heightMap->getBilinearSampleSeismicZVelocity( centerX - x,  centerY - y ) ;
+          }
+          if ( y != 0 )
+      			workspace[ (radius + x) + workspaceWidth * (radius - y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX + x,  centerY - y ) ;
+        }
+      }
+    }
+
+    // stuff the values from the workspace into the heightmap's velocities
+    for (x = 0; x < workspaceWidth; ++x)
+      for (y = 0; y < workspaceWidth; ++y)
+    		heightMap->setSeismicZVelocity( centerX - radius + x, centerY - radius + y,  MIN( 9.0f, workspace[  x + workspaceWidth * y ])  );
+
+    delete [] workspace;
+
+    return SEISMIC_STATUS_ACTIVE;
+  }
+  else
+    return SEISMIC_STATUS_ZERO_ENERGY;
+}
+
+Real DomeStyleSeismicFilter::applyGravityCallback( Real velocityIn )
+{
+  Real velocityOut = velocityIn;
+  velocityOut -= 1.5f;
+  return velocityOut;
+}
diff --git a/Core/GameEngine/Source/GameClient/VideoPlayer.cpp b/Core/GameEngine/Source/GameClient/VideoPlayer.cpp
new file mode 100644
index 00000000000..a756d3c4562
--- /dev/null
+++ b/Core/GameEngine/Source/GameClient/VideoPlayer.cpp
@@ -0,0 +1,512 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   Generals
+//
+// Module:    GameClient
+//
+// File name: VideoPlayer.cpp
+//
+// Created:   10/22/01	TR
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Lib/BaseType.h"
+#include "GameClient/VideoPlayer.h"
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Data
+//----------------------------------------------------------------------------
+
+VideoPlayerInterface *TheVideoPlayer = NULL;
+
+//----------------------------------------------------------------------------
+//         Private Prototypes
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Functions
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Functions
+//----------------------------------------------------------------------------
+
+//============================================================================
+// VideoBuffer::VideoBuffer
+//============================================================================
+
+VideoBuffer::VideoBuffer( Type format)
+: m_width(0),
+	m_height(0),
+	m_textureWidth(0),
+	m_textureHeight(0),
+	m_format(format),
+	m_pitch(0),
+	m_xPos(0),
+	m_yPos(0)
+{
+
+	if ( m_format >= NUM_TYPES || m_format < 0 )
+	{
+		m_format = TYPE_UNKNOWN;
+	}
+
+}
+
+//============================================================================
+// VideoBuffer::Rect
+//============================================================================
+
+RectClass VideoBuffer::Rect( Real x1, Real y1, Real x2, Real y2 )
+{
+	RectClass rect(0,0,0,0);
+
+	if ( valid() )
+	{
+		rect.Set(
+						((Real)m_width/(Real)m_textureWidth)*x1, ((Real)m_height/(Real)m_textureHeight)*y1,
+						((Real)m_width/(Real)m_textureWidth)*x2, ((Real)m_height/(Real)m_textureHeight)*y2
+					);
+	}
+
+	return rect;
+
+}
+
+//============================================================================
+// VideoBuffer::free
+//============================================================================
+
+void	VideoBuffer::free( void )
+{
+	m_width = 0;
+	m_height = 0;
+	m_textureWidth = 0;
+	m_textureHeight = 0;
+}
+
+//============================================================================
+// VideoPlayer::VideoPlayer
+//============================================================================
+
+VideoPlayer::VideoPlayer()
+: m_firstStream(NULL)
+{
+
+}
+
+//============================================================================
+// VideoPlayer::~VideoPlayer
+//============================================================================
+
+VideoPlayer::~VideoPlayer()
+{
+	deinit();
+	// Set the video player to null if its us. (WB requires this.)
+	if (this == TheVideoPlayer) {
+		TheVideoPlayer = NULL;
+	}
+}
+
+//============================================================================
+// VideoPlayer::init
+//============================================================================
+
+void	VideoPlayer::init( void )
+{
+	// Load this here so that WB doesn't have to link to BinkLib, costing us (potentially)
+	// an extra license.
+	INI ini;
+	ini.loadFileDirectory( "Data\\INI\\Default\\Video", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Video", INI_LOAD_OVERWRITE, NULL );
+}
+
+//============================================================================
+// VideoPlayer::deinit
+//============================================================================
+
+void VideoPlayer::deinit( void )
+{
+}
+
+//============================================================================
+// VideoPlayer::reset
+//============================================================================
+
+void	VideoPlayer::reset( void )
+{
+	closeAllStreams();
+}
+
+//============================================================================
+// VideoPlayer::update
+//============================================================================
+
+void	VideoPlayer::update( void )
+{
+
+	VideoStreamInterface *stream = firstStream();
+
+	while ( stream )
+	{
+		stream->update();
+		stream = stream->next();
+	}
+
+}
+
+//============================================================================
+// VideoPlayer::loseFocus
+//============================================================================
+
+void	VideoPlayer::loseFocus( void )
+{
+
+}
+
+//============================================================================
+// VideoPlayer::regainFocus
+//============================================================================
+
+void	VideoPlayer::regainFocus( void )
+{
+
+}
+
+//============================================================================
+// VideoPlayer::open
+//============================================================================
+
+VideoStreamInterface*	VideoPlayer::open( AsciiString movieTitle )
+{
+	return NULL;
+}
+
+//============================================================================
+// VideoPlayer::load
+//============================================================================
+
+VideoStreamInterface*	VideoPlayer::load( AsciiString movieTitle )
+{
+	return NULL;
+}
+
+//============================================================================
+// VideoPlayer::firstStream
+//============================================================================
+
+VideoStreamInterface* VideoPlayer::firstStream( void )
+{
+	return m_firstStream;
+}
+
+//============================================================================
+// VideoPlayer::closeAllStreams
+//============================================================================
+
+void	VideoPlayer::closeAllStreams( void )
+{
+	VideoStreamInterface *stream ;
+
+	while ( (stream = firstStream()) != 0 )
+	{
+		stream->close();
+	}
+}
+
+//============================================================================
+// VideoPlayer::remove
+//============================================================================
+
+void VideoPlayer::remove( VideoStream *stream_to_remove )
+{
+	VideoStream *last = NULL;
+	VideoStream *stream = (VideoStream*) firstStream();
+
+	while ( stream != NULL && stream != stream_to_remove )
+	{
+		last = stream;
+		stream = (VideoStream*) stream->next();
+	}
+
+	if ( stream )
+	{
+		if ( last )
+		{
+			last->m_next = stream->m_next;
+		}
+		else
+		{
+			m_firstStream = stream->m_next;
+		}
+	}
+}
+
+//============================================================================
+// VideoPlayer::addVideo
+//============================================================================
+void VideoPlayer::addVideo( Video* videoToAdd )
+{
+	for (VecVideoIt it = mVideosAvailableForPlay.begin(); it != mVideosAvailableForPlay.end(); ++it) {
+		if (it->m_internalName == videoToAdd->m_internalName) {
+			(*it) = (*videoToAdd);
+			return;
+		}
+	}
+
+	// That internal name hasn't been used, so push a new entry on the back
+	mVideosAvailableForPlay.push_back(*videoToAdd);
+}
+
+//============================================================================
+// VideoPlayer::removeVideo
+//============================================================================
+void VideoPlayer::removeVideo( Video* videoToRemove )
+{
+	for (VecVideoIt it = mVideosAvailableForPlay.begin(); it != mVideosAvailableForPlay.end(); ++it) {
+		if (it->m_internalName == videoToRemove->m_internalName) {
+			mVideosAvailableForPlay.erase(it);
+			return;
+		}
+	}
+}
+
+//============================================================================
+// VideoPlayer::getNumVideos
+//============================================================================
+Int VideoPlayer::getNumVideos( void )
+{
+	return mVideosAvailableForPlay.size();
+}
+
+//============================================================================
+// VideoPlayer::removeVideo
+//============================================================================
+const Video* VideoPlayer::getVideo( AsciiString movieTitle )
+{
+	for (VecVideoIt it = mVideosAvailableForPlay.begin(); it != mVideosAvailableForPlay.end(); ++it) {
+		if (it->m_internalName == movieTitle) {
+			return &(*it);
+		}
+	}
+	return NULL;
+}
+
+//============================================================================
+// VideoPlayer::getVideo
+//============================================================================
+const Video* VideoPlayer::getVideo( Int index )
+{
+	if (index < 0 || index >= mVideosAvailableForPlay.size()) {
+		return NULL;
+	}
+
+	return &mVideosAvailableForPlay[index];
+}
+
+//============================================================================
+// VideoStream::VideoStream
+//============================================================================
+
+VideoStream::VideoStream()
+: m_next(NULL),
+	m_player(NULL)
+{
+
+}
+
+//============================================================================
+// VideoStream::~VideoStream
+//============================================================================
+
+VideoStream::~VideoStream()
+{
+
+	if ( m_player )
+	{
+		m_player->remove( this );
+		m_player = NULL;
+	}
+
+}
+
+//============================================================================
+// VideoStream::next
+//============================================================================
+
+VideoStreamInterface* VideoStream::next( void )
+{
+	return m_next;
+}
+
+//============================================================================
+// VideoStream::update
+//============================================================================
+
+void VideoStream::update( void )
+{
+}
+
+//============================================================================
+// VideoStream::close
+//============================================================================
+
+void VideoStream::close( void )
+{
+	delete this;
+}
+
+//============================================================================
+// VideoStream::isFrameReady
+//============================================================================
+
+Bool VideoStream::isFrameReady( void )
+{
+	return TRUE;
+}
+
+//============================================================================
+// VideoStream::frameDecompress
+//============================================================================
+
+void VideoStream::frameDecompress( void )
+{
+
+}
+
+//============================================================================
+// VideoStream::frameRender
+//============================================================================
+
+void VideoStream::frameRender( VideoBuffer *buffer )
+{
+
+}
+
+//============================================================================
+// VideoStream::frameNext
+//============================================================================
+
+void VideoStream::frameNext( void )
+{
+
+}
+
+//============================================================================
+// VideoStream::frameIndex
+//============================================================================
+
+Int VideoStream::frameIndex( void )
+{
+	return 0;
+}
+
+//============================================================================
+// VideoStream::totalFrames
+//============================================================================
+
+Int	VideoStream::frameCount( void )
+{
+	return 0;
+}
+
+//============================================================================
+// VideoStream::frameGoto
+//============================================================================
+
+void VideoStream::frameGoto( Int index )
+{
+
+}
+
+//============================================================================
+// VideoStream::height
+//============================================================================
+
+Int		VideoStream::height( void )
+{
+	return 0;
+}
+
+//============================================================================
+// VideoStream::width
+//============================================================================
+
+Int		VideoStream::width( void )
+{
+	return 0;
+}
+
+
+const FieldParse VideoPlayer::m_videoFieldParseTable[] =
+{
+	{ "Filename",								INI::parseAsciiString,							NULL, offsetof( Video, m_filename) },
+	{ "Comment",								INI::parseAsciiString,							NULL, offsetof( Video, m_commentForWB) },
+	{ NULL,											NULL,																NULL, 0 },
+};
+
diff --git a/Core/GameEngine/Source/GameClient/VideoStream.cpp b/Core/GameEngine/Source/GameClient/VideoStream.cpp
new file mode 100644
index 00000000000..bf23e08e923
--- /dev/null
+++ b/Core/GameEngine/Source/GameClient/VideoStream.cpp
@@ -0,0 +1,91 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   Generals
+//
+// Module:    GameClient
+//
+// File name: VideoStream.cpp
+//
+// Created:   10/22/01	TR
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "Lib/BaseType.h"
+#include "GameClient/VideoPlayer.h"
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Data
+//----------------------------------------------------------------------------
+
+
+//----------------------------------------------------------------------------
+//         Private Prototypes
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Functions
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Functions
+//----------------------------------------------------------------------------
+
+
+
diff --git a/Core/GameEngine/Source/GameClient/View.cpp b/Core/GameEngine/Source/GameClient/View.cpp
new file mode 100644
index 00000000000..97945602086
--- /dev/null
+++ b/Core/GameEngine/Source/GameClient/View.cpp
@@ -0,0 +1,284 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// View.cpp ///////////////////////////////////////////////////////////////////
+// A "view", or window, into the World
+// Author: Michael S. Booth, February 2001
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/GameEngine.h"
+#include "Common/Xfer.h"
+#include "GameClient/View.h"
+#include "GameClient/Drawable.h"
+
+UnsignedInt View::m_idNext = 1;
+
+// the tactical view singleton
+View *TheTacticalView = NULL;
+
+
+View::View( void )
+{
+	m_viewLockedUntilFrame = 0u;
+	m_currentHeightAboveGround = 0.0f;
+	m_defaultAngle = 0.0f;
+	m_defaultPitchAngle = 0.0f;
+	m_heightAboveGround = 0.0f;
+	m_lockDist = 0.0f;
+	m_maxHeightAboveGround = 0.0f;
+	m_minHeightAboveGround = 0.0f;
+	m_next = NULL;
+	m_okToAdjustHeight = TRUE;
+	m_originX = 0;
+	m_originY = 0;
+	m_snapImmediate = FALSE;
+	m_terrainHeightUnderCamera = 0.0f;
+	m_zoom = 0.0f;
+	m_pos.x = 0;
+	m_pos.y = 0;
+	m_width = 0;
+	m_height = 0;
+	m_angle = 0.0f;
+	m_pitchAngle = 0.0f;
+	m_cameraLock = INVALID_ID;
+	m_cameraLockDrawable = NULL;
+	m_zoomLimited = TRUE;
+
+	// create unique view ID
+	m_id = m_idNext++;
+
+	// default field of view
+	m_FOV = 50.0f * PI/180.0f;
+
+	m_mouseLocked = FALSE;
+
+	m_guardBandBias.x = 0.0f;
+	m_guardBandBias.y = 0.0f;
+}
+
+View::~View()
+{
+}
+
+void View::init( void )
+{
+	m_width = DEFAULT_VIEW_WIDTH;
+	m_height = DEFAULT_VIEW_HEIGHT;
+	m_originX = DEFAULT_VIEW_ORIGIN_X;
+	m_originY = DEFAULT_VIEW_ORIGIN_Y;
+	m_pos.x = 0;
+	m_pos.y = 0;
+	m_angle = 0.0f;
+	m_cameraLock = INVALID_ID;
+	m_cameraLockDrawable = NULL;
+	m_zoomLimited = TRUE;
+
+	m_zoom = 1.0f;
+	m_maxHeightAboveGround = TheGlobalData->m_maxCameraHeight;
+	m_minHeightAboveGround = TheGlobalData->m_minCameraHeight;
+	m_okToAdjustHeight = FALSE;
+
+	m_defaultAngle = 0.0f;
+	m_defaultPitchAngle = 0.0f;
+}
+
+void View::reset( void )
+{
+	// Only fixing the reported bug.  Who knows what side effects resetting the rest could have.
+	m_zoomLimited = TRUE;
+
+	m_viewLockedUntilFrame = 0u;
+}
+
+/**
+ * Prepend this view to the given list, return the new list.
+ */
+View *View::prependViewToList( View *list )
+{
+	m_next = list;
+	return this;
+}
+
+void View::zoom( Real height )
+{
+	setHeightAboveGround(getHeightAboveGround() + height);
+}
+
+void View::lockViewUntilFrame(UnsignedInt frame)
+{
+	m_viewLockedUntilFrame = frame;
+}
+
+/**
+ * Center the view on the given coordinate.
+ */
+void View::lookAt( const Coord3D *o )
+{
+
+	/// @todo this needs to be changed to be 3D, this is still old 2D stuff
+	Coord3D pos = *getPosition();
+	pos.x = o->x - m_width * 0.5f;
+	pos.y = o->y - m_height * 0.5f;
+	setPosition(&pos);
+}
+
+/**
+ * Shift the view by the given delta.
+ */
+void View::scrollBy( Coord2D *delta )
+{
+	// update view's world position
+	m_pos.x += delta->x;
+	m_pos.y += delta->y;
+}
+
+/**
+ * Rotate the view around the up axis by the given angle.
+ */
+void View::setAngle( Real angle )
+{
+	m_angle = angle;
+}
+
+/**
+ * Rotate the view around the horizontal (X) axis to the given angle.
+ */
+void View::setPitch( Real angle )
+{
+	constexpr Real limit = PI/5.0f;
+	m_pitchAngle = clamp(-limit, angle, limit);
+}
+
+/**
+ * Set the view angle back to default
+ */
+void View::setAngleAndPitchToDefault( void )
+{
+	m_angle = m_defaultAngle;
+	m_pitchAngle = m_defaultPitchAngle;
+}
+
+void View::setHeightAboveGround(Real z)
+{
+	// if our zoom is limited, we will stay within a predefined distance from the terrain
+	if( m_zoomLimited )
+	{
+		m_heightAboveGround = clamp(m_minHeightAboveGround, z, m_maxHeightAboveGround);
+	}
+	else
+	{
+		m_heightAboveGround = z;
+	}
+}
+
+/**
+ * write the view's current location in to the view location object
+ */
+void View::getLocation( ViewLocation *location )
+{
+
+	const Coord3D *pos = getPosition();
+	location->init( pos->x, pos->y, pos->z, getAngle(), getPitch(), getZoom() );
+
+}
+
+
+/**
+ * set the view's current location from to the view location object
+ */
+void View::setLocation( const ViewLocation *location )
+{
+	if ( location->m_valid )
+	{
+		setPosition(&location->m_pos);
+		setAngle(location->m_angle);
+		setPitch(location->m_pitch);
+		setZoom(location->m_zoom);
+		forceRedraw();
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** project the 4 corners of this view into the world and return each point as a parameter,
+		the world points are at the requested Z */
+//-------------------------------------------------------------------------------------------------
+void View::getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
+																					Coord3D *bottomLeft, Coord3D *bottomRight,
+																					Real z )
+{
+	ICoord2D screenTopLeft, screenTopRight, screenBottomLeft, screenBottomRight;
+	ICoord2D origin;
+	Int viewWidth = getWidth();
+	Int viewHeight = getHeight();
+
+	// sanity
+	if( topLeft == NULL || topRight == NULL || bottomLeft == NULL || bottomRight == NULL )
+		return;
+
+	// setup the screen coords for the 4 corners of the viewable display
+	getOrigin( &origin.x, &origin.y );
+	screenTopLeft.x     = origin.x;								// upper left
+	screenTopLeft.y     = origin.y;								// upper left
+	screenTopRight.x    = origin.x + viewWidth;		// upper right
+	screenTopRight.y    = origin.y;								// upper right
+	screenBottomLeft.x  = origin.x + viewWidth;		// lower right
+	screenBottomLeft.y  = origin.y + viewHeight;  // lower right
+	screenBottomRight.x = origin.x;								// lower left
+	screenBottomRight.y = origin.y + viewHeight;	// lower left
+
+	// project
+	screenToWorldAtZ( &screenTopLeft, topLeft, z );
+	screenToWorldAtZ( &screenTopRight, topRight, z );
+	screenToWorldAtZ( &screenBottomLeft, bottomLeft, z );
+	screenToWorldAtZ( &screenBottomRight, bottomRight, z );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Xfer method for a view */
+// ------------------------------------------------------------------------------------------------
+void View::xfer( Xfer *xfer )
+{
+
+	// version
+	XferVersion currentVersion = 1;
+	XferVersion version = currentVersion;
+	xfer->xferVersion( &version, currentVersion );
+
+	// camera angle
+	Real angle = getAngle();
+	xfer->xferReal( &angle );
+	setAngle( angle );
+
+	// view position
+	Coord3D viewPos;
+	getPosition( &viewPos );
+	xfer->xferReal( &viewPos.x );
+	xfer->xferReal( &viewPos.y );
+	xfer->xferReal( &viewPos.z );
+	lookAt( &viewPos );
+
+}
diff --git a/Core/GameEngine/Source/GameClient/Water.cpp b/Core/GameEngine/Source/GameClient/Water.cpp
new file mode 100644
index 00000000000..ce17606d229
--- /dev/null
+++ b/Core/GameEngine/Source/GameClient/Water.cpp
@@ -0,0 +1,134 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: Water.cpp ////////////////////////////////////////////////////////////////////////////////
+// Author: Colin Day, December 2001
+// Desc:   Map water settings
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameClient/Water.h"
+#include "Common/INI.h"
+
+// GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
+WaterSetting WaterSettings[ TIME_OF_DAY_COUNT ];
+OVERRIDE<WaterTransparencySetting> TheWaterTransparency = NULL;
+
+// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
+const FieldParse WaterSetting::m_waterSettingFieldParseTable[] =
+{
+
+	{ "SkyTexture",									INI::parseAsciiString,			NULL, offsetof( WaterSetting, m_skyTextureFile ) },
+	{ "WaterTexture",								INI::parseAsciiString,			NULL, offsetof( WaterSetting, m_waterTextureFile ) },
+  { "Vertex00Color",							INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_vertex00Diffuse ) },
+	{ "Vertex10Color",							INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_vertex10Diffuse ) },
+	{ "Vertex01Color",							INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_vertex01Diffuse ) },
+  { "Vertex11Color",							INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_vertex11Diffuse ) },
+	{ "DiffuseColor",								INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_waterDiffuseColor ) },
+  { "TransparentDiffuseColor",		INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_transparentWaterDiffuse ) },
+  { "UScrollPerMS",								INI::parseReal,							NULL, offsetof( WaterSetting, m_uScrollPerMs ) },
+  { "VScrollPerMS",								INI::parseReal,							NULL, offsetof( WaterSetting, m_vScrollPerMs ) },
+	{ "SkyTexelsPerUnit",						INI::parseReal,							NULL, offsetof( WaterSetting, m_skyTexelsPerUnit ) },
+  { "WaterRepeatCount",						INI::parseInt,							NULL, offsetof( WaterSetting, m_waterRepeatCount ) },
+
+	{ NULL,													NULL,												NULL, 0 },
+
+};
+
+// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
+const FieldParse WaterTransparencySetting::m_waterTransparencySettingFieldParseTable[] =
+{
+
+	{ "TransparentWaterDepth",			INI::parseReal,				NULL,			offsetof( WaterTransparencySetting, m_transparentWaterDepth ) },
+	{ "TransparentWaterMinOpacity",	INI::parseReal,				NULL,			offsetof( WaterTransparencySetting, m_minWaterOpacity ) },
+	{ "StandingWaterColor",	INI::parseRGBColor,			NULL,			offsetof( WaterTransparencySetting, m_standingWaterColor ) },
+	{ "StandingWaterTexture",INI::parseAsciiString,		NULL,			offsetof( WaterTransparencySetting, m_standingWaterTexture ) },
+	{ "AdditiveBlending", INI::parseBool,				NULL,			offsetof( WaterTransparencySetting, m_additiveBlend) },
+	{ "RadarWaterColor", INI::parseRGBColor,			NULL,			offsetof( WaterTransparencySetting, m_radarColor) },
+	{ "SkyboxTextureN",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureN ) },
+	{ "SkyboxTextureE",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureE ) },
+	{ "SkyboxTextureS",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureS ) },
+	{ "SkyboxTextureW",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureW ) },
+	{ "SkyboxTextureT",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureT ) },
+
+
+	{ 0, 0, 0, 0 },
+};
+
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+WaterSetting::WaterSetting( void )
+{
+
+	m_skyTextureFile.clear();
+	m_waterTextureFile.clear();
+	m_waterRepeatCount = 0;
+	m_skyTexelsPerUnit = 0.0f;
+
+	m_vertex00Diffuse.red = 0;
+	m_vertex00Diffuse.green = 0;
+	m_vertex00Diffuse.blue = 0;
+	m_vertex00Diffuse.alpha = 0;
+
+	m_vertex01Diffuse.red = 0;
+	m_vertex01Diffuse.green = 0;
+	m_vertex01Diffuse.blue = 0;
+	m_vertex01Diffuse.alpha = 0;
+
+	m_vertex10Diffuse.red = 0;
+	m_vertex10Diffuse.green = 0;
+	m_vertex10Diffuse.blue = 0;
+	m_vertex10Diffuse.alpha = 0;
+
+	m_vertex11Diffuse.red = 0;
+	m_vertex11Diffuse.green = 0;
+	m_vertex11Diffuse.blue = 0;
+	m_vertex11Diffuse.alpha = 0;
+
+	m_waterDiffuseColor.red = 0;
+	m_waterDiffuseColor.green = 0;
+	m_waterDiffuseColor.blue = 0;
+	m_waterDiffuseColor.alpha = 0;
+
+	m_transparentWaterDiffuse.red = 0;
+	m_transparentWaterDiffuse.green = 0;
+	m_transparentWaterDiffuse.blue = 0;
+	m_transparentWaterDiffuse.alpha = 0;
+
+	m_uScrollPerMs = 0.0f;
+	m_vScrollPerMs = 0.0f;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+WaterSetting::~WaterSetting( void )
+{
+
+}
+
+
diff --git a/Core/GameEngine/Source/GameNetwork/Connection.cpp b/Core/GameEngine/Source/GameNetwork/Connection.cpp
new file mode 100644
index 00000000000..fe804e5ae86
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/Connection.cpp
@@ -0,0 +1,412 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/Connection.h"
+#include "GameNetwork/networkutil.h"
+#include "GameLogic/GameLogic.h"
+
+enum { MaxQuitFlushTime = 30000 }; // wait this many milliseconds at most to retry things before quitting
+
+/**
+ * The constructor.
+ */
+Connection::Connection() {
+	m_transport = NULL;
+	m_user = NULL;
+	m_netCommandList = NULL;
+	m_retryTime = 2000; // set retry time to 2 seconds.
+	m_lastTimeSent = 0;
+	m_frameGrouping = 1;
+	m_isQuitting = false;
+	m_quitTime = 0;
+	m_averageLatency = 0.0f;
+	Int i;
+	for(i = 0; i < CONNECTION_LATENCY_HISTORY_LENGTH; i++)
+	{
+		m_latencies[i] = 0.0f;
+	}
+}
+
+/**
+ * The destructor.
+ */
+Connection::~Connection() {
+	deleteInstance(m_user);
+	m_user = NULL;
+
+	deleteInstance(m_netCommandList);
+	m_netCommandList = NULL;
+}
+
+/**
+ * Initialize the connection and any subsystems.
+ */
+void Connection::init() {
+	m_transport = NULL;
+
+	deleteInstance(m_user);
+	m_user = NULL;
+
+	if (m_netCommandList == NULL) {
+		m_netCommandList = newInstance(NetCommandList);
+		m_netCommandList->init();
+	}
+	m_netCommandList->reset();
+
+	m_lastTimeSent = 0;
+	m_frameGrouping = 1;
+	m_numRetries = 0;
+	m_retryMetricsTime = 0;
+
+	for (Int i = 0; i < CONNECTION_LATENCY_HISTORY_LENGTH; ++i) {
+		m_latencies[i] = 0;
+	}
+	m_averageLatency = 0;
+	m_isQuitting = FALSE;
+	m_quitTime = 0;
+}
+
+/**
+ * Take the connection back to the initial state.
+ */
+void Connection::reset() {
+	init();
+}
+
+/**
+ * Doesn't really do anything.
+ */
+void Connection::update() {
+}
+
+/**
+ * Attach the transport object that this connection should use.
+ */
+void Connection::attachTransport(Transport *transport) {
+	m_transport = transport;
+}
+
+/**
+ * Assign this connection a user.  This is the user to whome we send all our packetized goodies.
+ */
+void Connection::setUser(User *user) {
+	deleteInstance(m_user);
+	m_user = user;
+}
+
+/**
+ * Return the user object.
+ */
+User * Connection::getUser() {
+	return m_user;
+}
+
+/**
+ * Add this network command to the send queue for this connection.
+ * The relay is the mask specifying the people the person we are sending to should send to.
+ * The relay mostly has to do with the packet router.
+ */
+void Connection::sendNetCommandMsg(NetCommandMsg *msg, UnsignedByte relay) {
+	static NetPacket *packet = NULL;
+
+	// this is done so we don't have to allocate and delete a packet every time we send a message.
+	if (packet == NULL) {
+		packet = newInstance(NetPacket);
+	}
+
+
+	if (m_isQuitting)
+		return;
+
+	if (m_netCommandList != NULL) {
+		// check to see if this command will fit in a packet.  If not, we need to split it up.
+		// we are splitting up the command here so that the retry logic will not try to
+		// resend the ENTIRE command (i.e. multiple packets work of data) and only do the retry
+		// one wrapper command at a time.
+		packet->reset();
+
+		NetCommandRef *tempref = NEW_NETCOMMANDREF(msg);
+
+		Bool msgFits = packet->addCommand(tempref);
+		deleteInstance(tempref); // delete the temporary reference.
+		tempref = NULL;
+
+		if (!msgFits) {
+			NetCommandRef *origref = NEW_NETCOMMANDREF(msg);
+			origref->setRelay(relay);
+			// the message doesn't fit in a single packet, need to split it up.
+			NetPacketList packetList = NetPacket::ConstructBigCommandPacketList(origref);
+			NetPacketListIter tempPacketPtr = packetList.begin();
+
+			while (tempPacketPtr != packetList.end()) {
+				NetPacket *tempPacket = (*tempPacketPtr);
+
+				NetCommandList *list = tempPacket->getCommandList();
+				NetCommandRef *ref1 = list->getFirstMessage();
+				while (ref1 != NULL) {
+					NetCommandRef *ref2 = m_netCommandList->addMessage(ref1->getCommand());
+					ref2->setRelay(relay);
+
+					ref1 = ref1->getNext();
+				}
+
+				deleteInstance(tempPacket);
+				tempPacket = NULL;
+				++tempPacketPtr;
+
+				deleteInstance(list);
+				list = NULL;
+			}
+
+			deleteInstance(origref);
+			origref = NULL;
+
+			return;
+		}
+
+		// the message fits in a packet, add to the command list normally.
+		NetCommandRef *ref = m_netCommandList->addMessage(msg);
+
+		if (ref != NULL) {
+
+/*
+#if defined(RTS_DEBUG)
+			if (msg->getNetCommandType() == NETCOMMANDTYPE_GAMECOMMAND) {
+				DEBUG_LOG(("Connection::sendNetCommandMsg - added game command %d to net command list for frame %d.",
+					msg->getID(), msg->getExecutionFrame()));
+			} else if (msg->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) {
+				DEBUG_LOG(("Connection::sendNetCommandMsg - added frame info for frame %d", msg->getExecutionFrame()));
+			}
+#endif // RTS_DEBUG
+*/
+
+			ref->setRelay(relay);
+		}
+	}
+}
+
+void Connection::clearCommandsExceptFrom( Int playerIndex )
+{
+	NetCommandRef *tmp = m_netCommandList->getFirstMessage();
+	while (tmp)
+	{
+		NetCommandRef *next = tmp->getNext();
+		NetCommandMsg *msg = tmp->getCommand();
+
+		if (msg->getPlayerID() != playerIndex)
+		{
+			DEBUG_LOG(("Connection::clearCommandsExceptFrom(%d) - clearing a command from player %d for frame %d",
+				playerIndex, tmp->getCommand()->getPlayerID(), tmp->getCommand()->getExecutionFrame()));
+
+			m_netCommandList->removeMessage(tmp);
+			deleteInstance(tmp);
+		}
+
+		tmp = next;
+	}
+}
+
+Bool Connection::isQueueEmpty() {
+	if (m_netCommandList->getFirstMessage() == NULL) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+void Connection::setQuitting( void )
+{
+	m_isQuitting = TRUE;
+	m_quitTime = timeGetTime();
+	DEBUG_LOG(("Connection::setQuitting() at time %d", m_quitTime));
+}
+
+/**
+ * This is the good part. We take all the network commands queued up for this connection,
+ * packetize them and put them on the transport's send queue for actual sending.
+ */
+UnsignedInt Connection::doSend() {
+	Int numpackets = 0;
+	time_t curtime = timeGetTime();
+	Bool couldQueue = TRUE;
+
+	// Do this check first, since it's an important fail-safe
+	if (m_isQuitting && curtime > m_quitTime + MaxQuitFlushTime)
+	{
+		DEBUG_LOG(("Timed out a quitting connection.  Deleting all %d messages", m_netCommandList->length()));
+		m_netCommandList->reset();
+		return 0;
+	}
+
+	if ((curtime - m_lastTimeSent) < m_frameGrouping) {
+//		DEBUG_LOG(("not sending packet, time = %d, m_lastFrameSent = %d, m_frameGrouping = %d", curtime, m_lastTimeSent, m_frameGrouping));
+		return 0;
+	}
+
+	// iterate through all the messages and put them into a packet(s).
+	NetCommandRef *msg = m_netCommandList->getFirstMessage();
+
+	while ((msg != NULL) && couldQueue) {
+		NetPacket *packet = newInstance(NetPacket);
+		packet->init();
+		packet->setAddress(m_user->GetIPAddr(), m_user->GetPort());
+
+		Bool notDone = TRUE;
+
+		// add the command messages until either we run out of messages or the packet is full.
+		while ((msg != NULL) && notDone) {
+			NetCommandRef *next = msg->getNext(); // Need this since msg could be deleted
+
+			time_t timeLastSent = msg->getTimeLastSent();
+
+			if (((curtime - timeLastSent) > m_retryTime) || (timeLastSent == -1)) {
+				notDone = packet->addCommand(msg);
+				if (notDone) {
+					// the msg command was added to the packet.
+					if (CommandRequiresAck(msg->getCommand())) {
+						if (timeLastSent != -1) {
+							++m_numRetries;
+						}
+						doRetryMetrics();
+						msg->setTimeLastSent(curtime);
+					} else {
+						m_netCommandList->removeMessage(msg);
+						deleteInstance(msg);
+					}
+				}
+			}
+			msg = next;
+		}
+
+		if (msg != NULL) {
+			DEBUG_LOG(("didn't finish sending all commands in connection"));
+		}
+
+		++numpackets;
+
+		/// @todo Make the act of giving the transport object a packet to send more efficient.  Make the transport take a NetPacket object rather than the raw data, thus avoiding an extra memcpy.
+		if (packet->getNumCommands() > 0) {
+			// If the packet actually has any information to give, give it to the transport object
+			// for transmission.
+			couldQueue = m_transport->queueSend(packet->getAddr(), packet->getPort(), packet->getData(), packet->getLength());
+			m_lastTimeSent = curtime;
+		}
+
+		deleteInstance(packet); // delete the packet now that we're done with it.
+	}
+
+	return numpackets;
+}
+
+NetCommandRef * Connection::processAck(NetAckStage1CommandMsg *msg) {
+	return processAck(msg->getCommandID(), msg->getOriginalPlayerID());
+}
+
+NetCommandRef * Connection::processAck(NetAckBothCommandMsg *msg) {
+	return processAck(msg->getCommandID(), msg->getOriginalPlayerID());
+}
+
+NetCommandRef * Connection::processAck(NetCommandMsg *msg) {
+	if (msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) {
+		NetAckStage1CommandMsg *ackmsg = (NetAckStage1CommandMsg *)msg;
+		return processAck(ackmsg);
+	}
+
+	if (msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
+		NetAckBothCommandMsg *ackmsg = (NetAckBothCommandMsg *)msg;
+		return processAck(ackmsg);
+	}
+
+	return NULL;
+}
+
+/**
+ * The person we are sending to has ack'd one of the messages we sent him.
+ * Take that message off the list of commands to send.
+ */
+NetCommandRef * Connection::processAck(UnsignedShort commandID, UnsignedByte originalPlayerID) {
+	NetCommandRef *temp = m_netCommandList->getFirstMessage();
+	while ((temp != NULL) && ((temp->getCommand()->getID() != commandID) || (temp->getCommand()->getPlayerID() != originalPlayerID))) {
+
+		// cycle through the commands till we find the one we need to remove.
+		// Need to check for both the command ID and the player ID.
+		temp = temp->getNext();
+	}
+	if (temp == NULL) {
+		return NULL;
+	}
+
+#if defined(RTS_DEBUG)
+	Bool doDebug = FALSE;
+	if (temp->getCommand()->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) {
+		doDebug = TRUE;
+	}
+#endif
+
+	Int index = temp->getCommand()->getID() % CONNECTION_LATENCY_HISTORY_LENGTH;
+	m_averageLatency -= ((Real)(m_latencies[index])) / CONNECTION_LATENCY_HISTORY_LENGTH;
+	Real lat = timeGetTime() - temp->getTimeLastSent();
+	m_averageLatency += lat / CONNECTION_LATENCY_HISTORY_LENGTH;
+	m_latencies[index] = lat;
+
+#if defined(RTS_DEBUG)
+	if (doDebug == TRUE) {
+		DEBUG_LOG(("Connection::processAck - disconnect frame command %d found, removing from command list.", commandID));
+	}
+#endif
+	m_netCommandList->removeMessage(temp);
+	return temp;
+}
+
+void Connection::setFrameGrouping(time_t frameGrouping) {
+	m_frameGrouping = frameGrouping;
+//	m_retryTime = frameGrouping * 4;
+}
+
+void Connection::doRetryMetrics() {
+	static Int numSeconds = 0;
+	time_t curTime = timeGetTime();
+
+	if ((curTime - m_retryMetricsTime) > 10000) {
+		m_retryMetricsTime = curTime;
+		++numSeconds;
+//		DEBUG_LOG(("Retries in the last 10 seconds = %d, average latency = %fms", m_numRetries, m_averageLatency));
+		m_numRetries = 0;
+//		m_retryTime = m_averageLatency * 1.5;
+	}
+}
+
+#if defined(RTS_DEBUG)
+void Connection::debugPrintCommands() {
+	NetCommandRef *ref = m_netCommandList->getFirstMessage();
+	while (ref != NULL) {
+		DEBUG_LOG(("Connection::debugPrintCommands - ID: %d\tType: %s\tRelay: 0x%X for frame %d",
+			ref->getCommand()->getID(), GetNetCommandTypeAsString(ref->getCommand()->getNetCommandType()),
+			ref->getRelay(), ref->getCommand()->getExecutionFrame()));
+		ref = ref->getNext();
+	}
+}
+#endif
diff --git a/Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp
new file mode 100644
index 00000000000..49d4676ffb0
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp
@@ -0,0 +1,2446 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Compression.h"
+#include "strtok_r.h"
+#include "Common/AudioEventRTS.h"
+#include "Common/CRCDebug.h"
+#include "Common/Debug.h"
+#include "Common/file.h"
+#include "Common/GameAudio.h"
+#include "Common/LocalFileSystem.h"
+#include "Common/Player.h"
+#include "Common/PlayerList.h"
+#include "Common/RandomValue.h"
+#include "Common/Recorder.h"
+
+#include "GameClient/Diplomacy.h"
+#include "GameClient/GameText.h"
+#include "GameClient/MessageBox.h"
+#include "GameNetwork/ConnectionManager.h"
+#include "GameNetwork/LANAPICallbacks.h"
+#include "GameNetwork/NAT.h"
+#include "GameNetwork/NetCommandWrapperList.h"
+#include "GameNetwork/networkutil.h"
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/ScriptActions.h"
+#include "GameLogic/ScriptEngine.h"
+#include "GameLogic/VictoryConditions.h"
+#include "GameClient/DisconnectMenu.h"
+#include "GameClient/InGameUI.h"
+
+static Bool hasValidTransferFileExtension(const AsciiString& filePath)
+{
+	static const char* const validExtensions[] = {
+		"map",
+		"ini",
+		"str",
+		"wak",
+		"tga",
+		"txt"
+	};
+
+	const char* fileExt = strrchr(filePath.str(), '.');
+
+	if (fileExt == NULL || fileExt[1] == '\0')
+	{
+		return false;
+	}
+
+	fileExt++;
+
+	for (Int i = 0; i < ARRAY_SIZE(validExtensions); ++i)
+	{
+		if (stricmp(fileExt, validExtensions[i]) == 0)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Le destructor.
+ */
+ConnectionManager::~ConnectionManager(void)
+{
+	deleteInstance(m_localUser);
+	m_localUser = NULL;
+
+	// Network will delete transports; we just forget them
+	delete m_transport;
+	m_transport = NULL;
+
+	Int i = 0;
+	for (; i < MAX_SLOTS; ++i) {
+		deleteInstance(m_frameData[i]);
+		m_frameData[i] = NULL;
+	}
+
+	for (i = 0; i < NUM_CONNECTIONS; ++i) {
+		deleteInstance(m_connections[i]);
+		m_connections[i] = NULL;
+	}
+
+	// This is done here since TheDisconnectMenu should only be there if we are in a network game.
+	delete TheDisconnectMenu;
+	TheDisconnectMenu = NULL;
+
+	delete m_disconnectManager;
+	m_disconnectManager = NULL;
+
+	deleteInstance(m_pendingCommands);
+	m_pendingCommands = NULL;
+
+	deleteInstance(m_relayedCommands);
+	m_relayedCommands = NULL;
+
+	deleteInstance(m_netCommandWrapperList);
+	m_netCommandWrapperList = NULL;
+
+	s_fileCommandMap.clear();
+	s_fileRecipientMaskMap.clear();
+	for (i = 0; i < MAX_SLOTS; ++i) {
+		s_fileProgressMap[i].clear();
+	}
+}
+
+/**
+ * Le constructor
+ */
+ConnectionManager::ConnectionManager(void)
+{
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		m_frameData[i] = NULL;
+	}
+	m_transport = NULL;
+	m_disconnectManager = NULL;
+	m_pendingCommands = NULL;
+	m_relayedCommands = NULL;
+	m_localAddr = 0;
+	m_localPort = 0;
+	m_netCommandWrapperList = NULL;
+	m_localUser = NULL;
+	m_localUser = newInstance(User);
+}
+
+/**
+ * Initialize the connection manager and any subsystems.
+ */
+void ConnectionManager::init()
+{
+//	if (m_transport == NULL) {
+//		m_transport = new Transport;
+//	}
+//	m_transport->reset();
+
+	UnsignedInt i = 0;
+	for (; i < NUM_CONNECTIONS; ++i) {
+		m_connections[i] = NULL;
+	}
+
+	if (m_pendingCommands == NULL) {
+		m_pendingCommands = newInstance(NetCommandList);
+		m_pendingCommands->init();
+	}
+	m_pendingCommands->reset();
+
+	if (m_relayedCommands == NULL) {
+		m_relayedCommands = newInstance(NetCommandList);
+		m_relayedCommands->init();
+	}
+	m_relayedCommands->reset();
+
+	m_localSlot = -1;
+#ifdef MEMORYPOOL_DEBUG
+	TheMemoryPoolFactory->debugSetInitFillerIndex(m_localSlot);
+#endif
+	m_packetRouterSlot = 0; /// @todo The LAN/WOL interface should be telling us who the packet router is based on machine specs passed around through game options.
+	for (i = 0; i < MAX_SLOTS; ++i) {
+		m_packetRouterFallback[i] = -1;
+	}
+
+	for (i = 0; i < MAX_SLOTS; ++i) {
+		deleteInstance(m_frameData[i]);
+		m_frameData[i] = NULL;
+	}
+
+//	m_averageFps = 30;			// since 30 fps is the desired rate, we'll start off at that.
+//	m_averageLatency = (Real)0.2; // 200ms seems like a good starting point.
+
+	for (i = 0; i < MAX_SLOTS; ++i) {
+		m_fpsAverages[i] = -1;
+	}
+	for (i = 0; i < MAX_SLOTS; ++i) {
+		m_latencyAverages[i] = 0.0; // using zero since all floating point standards should be able to specify 0.0 accurately.
+	}
+	m_smallestPacketArrivalCushion = -1;
+
+	m_frameMetrics.init();
+
+	TheDisconnectMenu = NEW DisconnectMenu;
+	TheDisconnectMenu->init();
+
+	m_disconnectManager = NEW DisconnectManager;
+	m_disconnectManager->init();
+
+	TheDisconnectMenu->attachDisconnectManager(m_disconnectManager);
+	TheDisconnectMenu->hideScreen();
+
+	m_netCommandWrapperList = newInstance(NetCommandWrapperList);
+	m_netCommandWrapperList->init();
+
+	s_fileCommandMap.clear();
+	s_fileRecipientMaskMap.clear();
+	for (i = 0; i < MAX_SLOTS; ++i) {
+		s_fileProgressMap[i].clear();
+	}
+}
+
+/**
+ * Reset the connection manager and any subsystems.
+ */
+void ConnectionManager::reset()
+{
+//	if (m_transport == NULL) {
+//		m_transport = new Transport;
+//	}
+//	m_transport->reset();
+
+	delete m_transport;
+	m_transport = NULL;
+
+	UnsignedInt i = 0;
+	for (; i < (UnsignedInt)NUM_CONNECTIONS; ++i) {
+		deleteInstance(m_connections[i]);
+		m_connections[i] = NULL;
+	}
+
+	for (i=0; i<(UnsignedInt)MAX_SLOTS; ++i)
+	{
+		deleteInstance(m_frameData[i]);
+		m_frameData[i] = NULL;
+	}
+
+	if (m_pendingCommands == NULL) {
+		m_pendingCommands = newInstance(NetCommandList);
+		m_pendingCommands->init();
+	}
+	m_pendingCommands->reset();
+
+	if (m_relayedCommands == NULL) {
+		m_relayedCommands = newInstance(NetCommandList);
+		m_relayedCommands->init();
+	}
+	m_relayedCommands->reset();
+
+	if (m_netCommandWrapperList == NULL) {
+		m_netCommandWrapperList = newInstance(NetCommandWrapperList);
+		m_netCommandWrapperList->init();
+	}
+	m_netCommandWrapperList->reset();
+
+	m_localSlot = -1;
+#ifdef MEMORYPOOL_DEBUG
+	TheMemoryPoolFactory->debugSetInitFillerIndex(m_localSlot);
+#endif
+	m_packetRouterSlot = -1;
+
+	for (i = 0; i < TheGlobalData->m_networkFPSHistoryLength; ++i) {
+		m_fpsAverages[i] = -1;
+	}
+	for (i = 0; i < TheGlobalData->m_networkLatencyHistoryLength; ++i) {
+		m_latencyAverages[i] = 0.0;
+	}
+
+	for (i = 0; i < (UnsignedInt)MAX_SLOTS; ++i) {
+		m_packetRouterFallback[i] = -1;
+	}
+
+	m_frameMetrics.reset();
+}
+
+UnsignedInt ConnectionManager::getPingFrame()
+{
+	return (m_disconnectManager)?m_disconnectManager->getPingFrame():0;
+}
+
+Int ConnectionManager::getPingsSent()
+{
+	return (m_disconnectManager)?m_disconnectManager->getPingsSent():0;
+}
+
+Int ConnectionManager::getPingsRecieved()
+{
+	return (m_disconnectManager)?m_disconnectManager->getPingsRecieved():0;
+}
+
+Bool ConnectionManager::isPlayerConnected( Int playerID )
+{
+	return ( playerID == m_localSlot || (m_connections[playerID] && !m_connections[playerID]->isQuitting()) );
+}
+
+void ConnectionManager::attachTransport(Transport *transport) {
+	delete m_transport;
+	m_transport = transport;
+}
+
+/**
+ * zero out the command counts for the given frames.  Presently this is used for
+ * the start of a game since there won't be any commands for the first few frames due to runahead.
+ */
+void ConnectionManager::zeroFrames(UnsignedInt startingFrame, UnsignedInt numFrames) {
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if (m_frameData[i] != NULL) {
+//			DEBUG_LOG(("Calling zeroFrames on player %d, starting frame %d, numFrames %d", i, startingFrame, numFrames));
+			m_frameData[i]->zeroFrames(startingFrame, numFrames);
+		}
+	}
+}
+
+/**
+ * Destroy any game messages that are left over due to the run ahead.
+ */
+void ConnectionManager::destroyGameMessages() {
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		// Need to destroy these game messages because when the game ends, there are
+		// still some game messages left over because of the run ahead aspect of
+		// network play.
+		if (m_frameData[i] != NULL) {
+			m_frameData[i]->destroyGameMessages();
+		}
+	}
+}
+
+/**
+ * ConnectionManager::doRelay()
+ * Queries the transport for commands that need to be relayed to another client.
+ * Get those commands and relay them to the appropriate Connection(s). We make the
+ * assumption that a command will only be relayed once.
+ */
+void ConnectionManager::doRelay() {
+	static Int numPackets = 0;
+	static Int numCommands = 0;
+
+	NetPacket *packet = NULL;
+
+	for (Int i = 0; i < MAX_MESSAGES; ++i) {
+		if (m_transport->m_inBuffer[i].length != 0) {
+			// This transport buffer has yet to be processed.
+
+			// make a NetPacket out of this data so it can be broken up into individual commands.
+			packet = newInstance(NetPacket)(&(m_transport->m_inBuffer[i]));
+
+			//DEBUG_LOG(("ConnectionManager::doRelay() - got a packet with %d commands", packet->getNumCommands()));
+			//LOGBUFFER( packet->getData(), packet->getLength() );
+
+			// Get the command list from the packet.
+			NetCommandList *cmdList = packet->getCommandList();
+			NetCommandRef *cmd = cmdList->getFirstMessage();
+
+			// Iterate through the commands in this packet and send them to the proper connections.
+			while (cmd != NULL) {
+				//DEBUG_LOG(("ConnectionManager::doRelay() - Looking at a command of type %s",
+					//GetNetCommandTypeAsString(cmd->getCommand()->getNetCommandType())));
+				if (CommandRequiresAck(cmd->getCommand())) {
+					ackCommand(cmd, m_localSlot);
+				}
+				if (!processNetCommand(cmd)) {
+					sendRemoteCommand(cmd);
+				}
+				cmd = cmd->getNext();
+
+				++numCommands;
+			}
+			++numPackets;
+
+			// Delete this packet since we won't be needing it anymore.
+			deleteInstance(packet);
+			packet = NULL;
+
+			deleteInstance(cmdList);
+			cmdList = NULL;
+
+			// signal that this has been processed.
+			m_transport->m_inBuffer[i].length = 0;
+		}
+	}
+
+	NetCommandList *cmdList = m_netCommandWrapperList->getReadyCommands();
+	NetCommandRef *cmd = cmdList->getFirstMessage();
+	while (cmd != NULL) {
+		if (CommandRequiresAck(cmd->getCommand())) {
+			ackCommand(cmd, m_localSlot);
+		}
+		if (!processNetCommand(cmd)) {
+			sendRemoteCommand(cmd);
+		}
+		cmd = cmd->getNext();
+
+		++numCommands;
+	}
+	++numPackets;
+
+	// Delete this packet since we won't be needing it anymore.
+	deleteInstance(packet);
+	packet = NULL;
+
+	deleteInstance(cmdList);
+	cmdList = NULL;
+}
+
+/**
+ * This is where the non-synchronized network commands should be processed.
+ * Return TRUE if the command should not be relayed. Return FALSE if it should be relayed.
+ */
+Bool ConnectionManager::processNetCommand(NetCommandRef *ref) {
+	NetCommandMsg *msg = ref->getCommand();
+	NetCommandType cmdType = msg->getNetCommandType();
+
+	// Handle ACK commands first (before connection validation)
+	if ((cmdType == NETCOMMANDTYPE_ACKSTAGE1) ||
+			(cmdType == NETCOMMANDTYPE_ACKSTAGE2) ||
+			(cmdType == NETCOMMANDTYPE_ACKBOTH)) {
+		processAck(msg);
+		return FALSE;
+	}
+
+	// Early validation checks
+	if ((m_connections[msg->getPlayerID()] == NULL) && (msg->getPlayerID() != m_localSlot)) {
+		// if this is from a player that is no longer in the game, then ignore them.
+		return TRUE;
+	}
+
+	// Handle WRAPPER commands (before second connection validation)
+	if (cmdType == NETCOMMANDTYPE_WRAPPER) {
+		processWrapper(ref); // need to send the NetCommandRef since we have to construct the relay for the wrapped command.
+		return FALSE;
+	}
+
+	if ((msg->getPlayerID() >= 0) && (msg->getPlayerID() < MAX_SLOTS) && (msg->getPlayerID() != m_localSlot)) {
+		if (m_connections[msg->getPlayerID()] == NULL) {
+			return TRUE;
+		}
+	}
+
+	// Don't allow an out of date command to be sent through.
+	// Its unnecessary traffic and it could cause problems.
+	//
+	// This was a fix for a command count bug where a command would be
+	// executed, then a command for that old frame would be added to the
+	// FrameData for that frame + 256, and would screw up the command count.
+	if (IsCommandSynchronized(cmdType)) {
+		if (ref->getCommand()->getExecutionFrame() < TheGameLogic->getFrame()) {
+			return TRUE;
+		}
+	}
+
+	// Handle disconnect commands as a range
+	if ((cmdType > NETCOMMANDTYPE_DISCONNECTSTART) && (cmdType < NETCOMMANDTYPE_DISCONNECTEND)) {
+		m_disconnectManager->processDisconnectCommand(ref, this);
+		return TRUE;
+	}
+
+	// Process command by type
+	switch (cmdType) {
+
+		case NETCOMMANDTYPE_FRAMEINFO: {
+			processFrameInfo((NetFrameCommandMsg *)msg);
+			// need to set the relay so we don't send it to ourselves.
+			UnsignedByte relay = ref->getRelay();
+			relay = relay & (0xff ^ (1 << m_localSlot));
+			ref->setRelay(relay);
+			return FALSE;
+		}
+
+		case NETCOMMANDTYPE_PROGRESS: {
+			//DEBUG_LOG(("ConnectionManager::processNetCommand - got a progress net command from player %d", msg->getPlayerID()));
+			processProgress((NetProgressCommandMsg *) msg);
+			// need to set the relay so we don't send it to ourselves.
+			UnsignedByte relay = ref->getRelay();
+			relay = relay & (0xff ^ (1 << m_localSlot));
+			ref->setRelay(relay);
+			return FALSE;
+		}
+
+		case NETCOMMANDTYPE_TIMEOUTSTART:
+			DEBUG_LOG(("ConnectionManager::processNetCommand - got a TimeOut GameStart net command from player %d", msg->getPlayerID()));
+			processTimeOutGameStart(msg);
+			return FALSE;
+
+		case NETCOMMANDTYPE_RUNAHEADMETRICS:
+			processRunAheadMetrics((NetRunAheadMetricsCommandMsg *)msg);
+			return TRUE;
+
+		case NETCOMMANDTYPE_KEEPALIVE:
+			return TRUE;
+
+		case NETCOMMANDTYPE_DISCONNECTCHAT:
+			processDisconnectChat((NetDisconnectChatCommandMsg *)msg);
+			return FALSE;
+
+		case NETCOMMANDTYPE_LOADCOMPLETE:
+			DEBUG_LOG(("ConnectionManager::processNetCommand - got a Load Complete net command from player %d", msg->getPlayerID()));
+			processLoadComplete(msg);
+			return FALSE;
+
+		case NETCOMMANDTYPE_CHAT:
+			processChat((NetChatCommandMsg *)msg);
+			return FALSE;
+
+		case NETCOMMANDTYPE_FILE:
+			processFile((NetFileCommandMsg *)msg);
+			return FALSE;
+
+		case NETCOMMANDTYPE_FILEANNOUNCE:
+			processFileAnnounce((NetFileAnnounceCommandMsg *)msg);
+			return FALSE;
+
+		case NETCOMMANDTYPE_FILEPROGRESS:
+			processFileProgress((NetFileProgressCommandMsg *)msg);
+			return FALSE;
+
+		case NETCOMMANDTYPE_FRAMERESENDREQUEST:
+			processFrameResendRequest((NetFrameResendRequestCommandMsg *)msg);
+			return TRUE;
+
+		default:
+			return FALSE;
+	}
+}
+
+void ConnectionManager::processFrameResendRequest(NetFrameResendRequestCommandMsg *msg) {
+	// first make sure this is a valid slot
+	Int playerID = msg->getPlayerID();
+	if ((playerID < 0) || (playerID >= MAX_SLOTS)) {
+		return;
+	}
+
+	// make sure this player is still in our game.
+	if ((m_connections[playerID] == NULL) || (m_connections[playerID]->isQuitting() == TRUE)) {
+		return;
+	}
+
+	sendFrameDataToPlayer(playerID, msg->getFrameToResend());
+}
+
+/**
+ * We have received a wrapper for a command too big to fit in a packet.
+ */
+void ConnectionManager::processWrapper(NetCommandRef *ref)
+{
+	NetWrapperCommandMsg *wrapperMsg = (NetWrapperCommandMsg *)(ref->getCommand());
+	UnsignedShort commandID = wrapperMsg->getWrappedCommandID();
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processWrapper() - wrapped commandID is %d, commandID is %d",
+		commandID, wrapperMsg->getID()));
+	Int origProgress = 0;
+	FileCommandMap::iterator fcIt = s_fileCommandMap.find(commandID);
+	if (fcIt != s_fileCommandMap.end())
+	{
+		origProgress = s_fileProgressMap[m_localSlot][commandID];
+	}
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processWrapper() - origProgress[%d] == %d for command %d",
+		m_localSlot, origProgress, commandID));
+
+	m_netCommandWrapperList->processWrapper(ref);
+
+	if (fcIt != s_fileCommandMap.end())
+	{
+		Int newProgress = m_netCommandWrapperList->getPercentComplete(commandID);
+		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processWrapper() - newProgress[%d] == %d for command %d",
+			m_localSlot, newProgress, commandID));
+		if (newProgress > origProgress && newProgress < 100)
+		{
+			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processWrapper() - sending a NetFileProgressCommandMsg"));
+			s_fileProgressMap[m_localSlot][commandID] = newProgress;
+
+			Int progressMask = 0xff ^ (1 << m_localSlot);
+			NetFileProgressCommandMsg *msg = newInstance(NetFileProgressCommandMsg);
+			msg->setPlayerID(m_localSlot);
+			msg->setID(0);
+			if (DoesCommandRequireACommandID(msg->getNetCommandType()))
+			{
+				msg->setID(GenerateNextCommandID());
+			}
+			msg->setFileID(commandID);
+			msg->setProgress(newProgress);
+			sendLocalCommand(msg, progressMask);
+			processFileProgress(msg);
+			msg->detach();
+		}
+	}
+}
+
+/**
+ * A client has sent us their run ahead metrics, lets store them away for future calculations.
+ */
+void ConnectionManager::processRunAheadMetrics(NetRunAheadMetricsCommandMsg *msg)
+{
+	UnsignedInt player = msg->getPlayerID();
+	if ((player >= 0) && (player < MAX_SLOTS) && (isPlayerConnected(player))) {
+		m_latencyAverages[player] = msg->getAverageLatency();
+		m_fpsAverages[player] = msg->getAverageFps();
+		//DEBUG_LOG(("ConnectionManager::processRunAheadMetrics - player %d, fps = %d, latency = %f", player, msg->getAverageFps(), msg->getAverageLatency()));
+		if (m_fpsAverages[player] > 100) {
+			// limit the reported frame rate average to 100.  This is done because if a
+			// user alt-tab's out of the game their frame rate climbs to in the neighborhood of
+			// 300, that was deemed "ugly" by the powers that be.
+			m_fpsAverages[player] = 100;
+		}
+	}
+}
+
+void ConnectionManager::processDisconnectChat(NetDisconnectChatCommandMsg *msg)
+{
+	UnicodeString unitext;
+	UnicodeString name;
+	UnsignedByte playerID = msg->getPlayerID();
+	if (playerID == m_localSlot) {
+		name = m_localUser->GetName();
+	} else if (isPlayerConnected(playerID)) {
+		name = m_connections[playerID]->getUser()->GetName();
+	}
+	unitext.format(L"[%ls] %ls", name.str(), msg->getText().str());
+//	DEBUG_LOG(("ConnectionManager::processDisconnectChat - got message from player %d, message is %ls", playerID, unitext.str()));
+	TheDisconnectMenu->showChat(unitext); // <-- need to implement this
+}
+
+void ConnectionManager::processChat(NetChatCommandMsg *msg)
+{
+	UnicodeString unitext;
+	UnicodeString name;
+	UnsignedByte playerID = msg->getPlayerID();
+	//DEBUG_LOG(("processChat(): playerID = %d", playerID));
+	if (playerID == m_localSlot) {
+		name = m_localUser->GetName();
+		//DEBUG_LOG(("connection is NULL, using %ls", name.str()));
+	} else if (((m_connections[playerID] != NULL) && (m_connections[playerID]->isQuitting() == FALSE))) {
+		name = m_connections[playerID]->getUser()->GetName();
+		//DEBUG_LOG(("connection is non-NULL, using %ls", name.str()));
+	}
+	unitext.format(L"[%ls] %ls", name.str(), msg->getText().str());
+//	DEBUG_LOG(("ConnectionManager::processChat - got message from player %d (mask %8.8X), message is %ls", playerID, msg->getPlayerMask(), unitext.str()));
+
+	AsciiString playerName;
+	playerName.format("player%d", msg->getPlayerID());
+	const Player *player = ThePlayerList->findPlayerWithNameKey( TheNameKeyGenerator->nameToKey( playerName ) );
+	if (!player)
+	{
+		TheInGameUI->message(L"%ls", unitext.str());
+		return;
+	}
+
+	Bool fromObserver = !player->isPlayerActive();
+	Bool amIObserver = !ThePlayerList->getLocalPlayer()->isPlayerActive();
+	Bool canSeeChat = (amIObserver || !fromObserver) && !TheGameInfo->getConstSlot(playerID)->isMuted();
+
+	if ( ((1<<m_localSlot) & msg->getPlayerMask() ) && canSeeChat  )
+	{
+		RGBColor rgb;
+		rgb.setFromInt(player->getPlayerColor());
+		TheInGameUI->messageColor(&rgb, L"%ls", unitext.str());
+
+		// feedback for received chat messages in-game
+		AudioEventRTS audioEvent("GUICommunicatorIncoming");
+		TheAudio->addAudioEvent(&audioEvent);
+	}
+}
+
+void ConnectionManager::processFile(NetFileCommandMsg *msg)
+{
+#ifdef DEBUG_LOGGING
+	UnicodeString log;
+	log.format(L"Saw file transfer: '%hs' of %d bytes from %d", msg->getPortableFilename().str(), msg->getFileLength(), msg->getPlayerID());
+	DEBUG_LOG(("%ls", log.str()));
+#endif
+
+	AsciiString realFileName = msg->getRealFilename();
+	if (realFileName.isEmpty())
+	{
+		// TheSuperHackers @security slurmlord 18/06/2025 As the file name/path from the NetFileCommandMsg failed to normalize,
+		// in other words is bogus and points outside of the approved target directory, avoid an arbitrary file overwrite vulnerability
+		// by simply returning and let the transfer time out.
+		DEBUG_LOG(("Got a file name transferred that failed to normalize: '%s'!", msg->getPortableFilename().str()));
+		return;
+	}
+
+	// TheSuperHackers @security bobtista 06/11/2025 Validate file extension to prevent arbitrary file types
+	if (!hasValidTransferFileExtension(realFileName))
+	{
+		DEBUG_LOG(("File '%s' has invalid extension for transfer operations.", realFileName.str()));
+		return;
+	}
+
+	if (TheFileSystem->doesFileExist(realFileName.str()))
+	{
+		DEBUG_LOG(("File exists already!"));
+		//return;
+	}
+
+	UnsignedByte *buf = msg->getFileData();
+	Int len = msg->getFileLength();
+
+	// uncompress Targas
+#ifdef COMPRESS_TARGAS
+	Bool deleteBuf = FALSE;
+	if (msg->getFilename().endsWith(".tga") && CompressionManager::isDataCompressed(buf, len))
+	{
+		Int uncompLen = CompressionManager::getUncompressedSize(buf, len);
+		UnsignedByte *uncompBuffer = NEW UnsignedByte[uncompLen];
+		Int actualLen = CompressionManager::decompressData(buf, len, uncompBuffer, uncompLen);
+		if (actualLen == uncompLen)
+		{
+			DEBUG_LOG(("Uncompressed Targa after map transfer"));
+			deleteBuf = TRUE;
+			buf = uncompBuffer;
+			len = uncompLen;
+		}
+		else
+		{
+			DEBUG_LOG(("Failed to uncompress Targa after map transfer"));
+			delete[] uncompBuffer; // failed to decompress, so just use the source
+		}
+	}
+#endif // COMPRESS_TARGAS
+
+	File *fp = TheFileSystem->openFile(realFileName.str(), File::CREATE | File::BINARY | File::WRITE);
+	if (fp)
+	{
+		fp->write(buf, len);
+		fp->close();
+		fp = NULL;
+		DEBUG_LOG(("Wrote %d bytes to file %s!", len, realFileName.str()));
+
+	}
+	else
+	{
+		DEBUG_LOG(("Cannot open file!"));
+	}
+
+	DEBUG_LOG(("ConnectionManager::processFile() - sending a NetFileProgressCommandMsg"));
+
+	Int commandID = msg->getID();
+	Int newProgress = 100;
+
+	s_fileProgressMap[m_localSlot][commandID] = newProgress;
+
+	Int progressMask = 0xff ^ (1 << m_localSlot);
+	NetFileProgressCommandMsg *progressMsg = newInstance(NetFileProgressCommandMsg);
+	progressMsg->setPlayerID(m_localSlot);
+	progressMsg->setID(0);
+	if (DoesCommandRequireACommandID(progressMsg->getNetCommandType()))
+	{
+		progressMsg->setID(GenerateNextCommandID());
+	}
+	progressMsg->setFileID(commandID);
+	progressMsg->setProgress(newProgress);
+	sendLocalCommand(progressMsg, progressMask);
+	processFileProgress(progressMsg);
+	progressMsg->detach();
+
+#ifdef COMPRESS_TARGAS
+	if (deleteBuf)
+	{
+		delete[] buf;
+		buf = NULL;
+	}
+#endif // COMPRESS_TARGAS
+}
+
+void ConnectionManager::processFileAnnounce(NetFileAnnounceCommandMsg *msg)
+{
+	DEBUG_LOG(("ConnectionManager::processFileAnnounce() - expecting '%s' (%s) in command %d", msg->getPortableFilename().str(), msg->getRealFilename().str(), msg->getFileID()));
+	s_fileCommandMap[msg->getFileID()] = msg->getRealFilename();
+	s_fileRecipientMaskMap[msg->getFileID()] = msg->getPlayerMask();
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		if ( (1<<i) & msg->getPlayerMask() )
+		{
+			s_fileProgressMap[i][msg->getFileID()] = 0;
+		}
+		else
+		{
+			s_fileProgressMap[i][msg->getFileID()] = 100; // they don't need to get it, so they're already done.
+		}
+	}
+}
+
+void ConnectionManager::processFileProgress(NetFileProgressCommandMsg *msg)
+{
+	DEBUG_LOG(("ConnectionManager::processFileProgress() - command %d is at %d%%",
+		msg->getFileID(), msg->getProgress()));
+	Int oldProgress = s_fileProgressMap[msg->getPlayerID()][msg->getFileID()];
+
+	s_fileProgressMap[msg->getPlayerID()][msg->getFileID()] = max(oldProgress, msg->getProgress());
+}
+
+void ConnectionManager::processProgress( NetProgressCommandMsg *msg )
+{
+	TheGameLogic->processProgress(msg->getPlayerID(), msg->getPercentage());
+}
+
+void ConnectionManager::processLoadComplete( NetCommandMsg *msg )
+{
+	TheGameLogic->processProgressComplete(msg->getPlayerID());
+}
+
+void ConnectionManager::processTimeOutGameStart( NetCommandMsg *msg )
+{
+	TheGameLogic->timeOutGameStart();
+}
+
+/**
+ * Another client has sent us the command count for a new frame.
+ */
+void ConnectionManager::processFrameInfo(NetFrameCommandMsg *msg) {
+	//stupid frame info, why don't you process yourself?
+
+	UnsignedInt playerID = msg->getPlayerID();
+
+	if ((playerID >= 0) && (playerID < MAX_SLOTS)) {
+		if (m_frameData[playerID] != NULL) {
+//			DEBUG_LOG(("ConnectionManager::processFrameInfo - player %d, frame %d, command count %d, received on frame %d", playerID, msg->getExecutionFrame(), msg->getCommandCount(), TheGameLogic->getFrame()));
+			m_frameData[playerID]->setFrameCommandCount(msg->getExecutionFrame(), msg->getCommandCount());
+		}
+	}
+}
+
+/**
+ * We just got a stage 1 ack from someone.  So we should remove it from the connection that sent it so
+ * it doesn't keep resending it.
+ */
+void ConnectionManager::processAckStage1(NetCommandMsg *msg) {
+#if defined(RTS_DEBUG)
+	Bool doDebug = (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ? TRUE : FALSE;
+#endif
+
+	UnsignedByte playerID = msg->getPlayerID();
+	NetCommandRef *ref = NULL;
+
+#if defined(RTS_DEBUG)
+	if (doDebug == TRUE) {
+		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processAck - processing ack for command %d from player %d", ((NetAckStage1CommandMsg *)msg)->getCommandID(), playerID));
+	}
+#endif
+
+	if ((playerID >= 0) && (playerID < NUM_CONNECTIONS)) {
+		if (m_connections[playerID] != NULL) {
+			ref = m_connections[playerID]->processAck(msg);
+		}
+	} else {
+		DEBUG_ASSERTCRASH((playerID >= 0) && (playerID < NUM_CONNECTIONS), ("ConnectionManager::processAck - %d is an invalid player number", playerID));
+	}
+
+	if (ref != NULL) {
+		if (ref->getCommand()->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) {
+			m_frameMetrics.processLatencyResponse(((NetFrameCommandMsg *)(ref->getCommand()))->getExecutionFrame());
+		}
+
+		deleteInstance(ref);
+		ref = NULL;
+	}
+}
+
+/**
+ * We just got a stage 2 ack from someone.  So remove it from the pending commands list so it doesn't
+ * get sent in the case of a new packet router.
+ */
+void ConnectionManager::processAckStage2(NetCommandMsg *msg) {
+	UnsignedShort commandID = 0;
+	UnsignedByte playerID = 0;
+	if (msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) {
+		commandID = ((NetAckStage2CommandMsg *)msg)->getCommandID();
+		playerID = ((NetAckStage2CommandMsg *)msg)->getOriginalPlayerID();
+	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
+		commandID = ((NetAckBothCommandMsg *)msg)->getCommandID();
+		playerID = ((NetAckBothCommandMsg *)msg)->getOriginalPlayerID();
+	} else {
+		return;
+	}
+
+	NetCommandRef *ref = m_pendingCommands->findMessage(commandID, playerID);
+	if (ref != NULL) {
+		//DEBUG_LOG(("ConnectionManager::processAckStage2 - removing command %d from the pending commands list.", commandID));
+		DEBUG_ASSERTCRASH((m_localSlot == playerID), ("Found a command in the pending commands list that wasn't originated by the local player"));
+		m_pendingCommands->removeMessage(ref);
+		deleteInstance(ref);
+		ref = NULL;
+	} else {
+		//DEBUG_LOG(("ConnectionManager::processAckStage2 - Couldn't find command %d from player %d in the pending commands list.", commandID, playerID));
+	}
+
+	ref = m_relayedCommands->findMessage(commandID, playerID);
+	if (ref != NULL) {
+		//DEBUG_LOG(("ConnectionManager::processAckStage2 - found command ID %d from player %d in the relayed commands list.", commandID, playerID));
+		UnsignedByte prevRelay = ref->getRelay();
+		UnsignedByte relay = prevRelay & ~(1 << msg->getPlayerID());
+		//DEBUG_LOG(("ConnectionManager::processAckStage2 - relay was %d and is now %d", relay, prevRelay));
+		if (relay == 0) {
+			//DEBUG_LOG(("ConnectionManager::processAckStage2 - relay is 0, removing command from the relayed commands list."));
+			m_relayedCommands->removeMessage(ref);
+			NetAckStage2CommandMsg *ackmsg = newInstance(NetAckStage2CommandMsg)(ref->getCommand());
+			sendLocalCommand(ackmsg, 1 << ackmsg->getOriginalPlayerID());
+			deleteInstance(ref);
+			ref = NULL;
+
+			ackmsg->detach();
+			ackmsg = NULL;
+		} else {
+			ref->setRelay(relay);
+		}
+	}
+}
+
+/**
+ * We just got a "both" ack from someone.  So process it as both a stage 1 and stage 2 ack.
+ */
+void ConnectionManager::processAck(NetCommandMsg *msg) {
+	if ((msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) || (msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH)) {
+		processAckStage1(msg);
+	}
+	if ((msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) || (msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH)) {
+		processAckStage2(msg);
+	}
+}
+
+/**
+ * A player has just left our game. Delete their connection and frame data manager.
+ * return codes are:
+ * PLAYERLEAVECODE_UNKNOWN - player didn't have a valid slot number.
+ * PLAYERLEAVECODE_CLIENT - someone in the game that wasn't us or the packet router.
+ * PLAYERLEAVECODE_LOCAL - We are leaving the game, we could also be the packet router.
+ * PLAYERLEAVECODE_PACKETROUTER - The packet router left the game.
+ *
+ * If we are leaving and are also the packet router, it will return the PLAYERLEAVECODE_LOCAL return code.
+ */
+PlayerLeaveCode ConnectionManager::processPlayerLeave(NetPlayerLeaveCommandMsg *msg) {
+	UnsignedByte playerID = msg->getLeavingPlayerID();
+	if ((playerID != m_localSlot) && (m_connections[playerID] != NULL)) {
+		DEBUG_LOG(("ConnectionManager::processPlayerLeave() - setQuitting() on player %d on frame %d", playerID, TheGameLogic->getFrame()));
+		m_connections[playerID]->setQuitting();
+	}
+	DEBUG_ASSERTCRASH(m_frameData[playerID]->getIsQuitting() == FALSE, ("Player %d is already quitting", playerID));
+	if ((playerID != m_localSlot) && (m_frameData[playerID] != NULL) && (m_frameData[playerID]->getIsQuitting() == FALSE)) {
+		DEBUG_LOG(("ConnectionManager::processPlayerLeave - setQuitFrame on player %d for frame %d", playerID, TheGameLogic->getFrame()+1));
+		m_frameData[playerID]->setQuitFrame(TheGameLogic->getFrame() + FRAMES_TO_KEEP + 1);
+	}
+
+	if (playerID == m_localSlot)
+	{
+		// we're leaving, so mark our connections and frame datas to go away.
+		for (Int i=0; i<MAX_SLOTS; ++i)
+		{
+			if (m_connections[i])
+			{
+				m_connections[i]->clearCommandsExceptFrom(m_localSlot);
+				m_connections[i]->setQuitting();
+			}
+		}
+	}
+
+	PlayerLeaveCode code = disconnectPlayer(playerID);
+	DEBUG_LOG(("ConnectionManager::processPlayerLeave() - just disconnected player %d with ret code %d", playerID, code));
+	if (code == PLAYERLEAVECODE_PACKETROUTER)
+		resendPendingCommands();
+
+	PopulateInGameDiplomacyPopup();
+	return code;
+}
+
+UnsignedInt ConnectionManager::getPacketRouterFallbackSlot(Int packetRouterNumber) {
+	if ((packetRouterNumber >= 0) && (packetRouterNumber < MAX_SLOTS)) {
+		return m_packetRouterFallback[packetRouterNumber];
+	}
+	return MAX_SLOTS;
+}
+
+UnsignedInt ConnectionManager::getPacketRouterSlot() {
+	return m_packetRouterSlot;
+}
+
+Bool ConnectionManager::areAllQueuesEmpty(void) {
+	Bool retval = TRUE;
+	for (Int i = 0; (i < MAX_SLOTS) && retval; ++i) {
+		if (m_connections[i] != NULL) {
+			if (m_connections[i]->isQueueEmpty() == FALSE) {
+				//DEBUG_LOG(("ConnectionManager::areAllQueuesEmpty() - m_connections[%d] is not empty", i));
+				//m_connections[i]->debugPrintCommands();
+				retval = FALSE;
+			}
+		}
+	}
+
+	return retval;
+}
+
+Bool ConnectionManager::canILeave() {
+	return areAllQueuesEmpty();
+}
+
+/**
+ * The local player is leaving. Tell the local player as well as the other players
+ * to remove this player at the specified frame.
+ */
+void ConnectionManager::handleLocalPlayerLeaving(UnsignedInt frame) {
+	NetPlayerLeaveCommandMsg *msg = newInstance(NetPlayerLeaveCommandMsg);
+
+	msg->setLeavingPlayerID(m_localSlot);
+	msg->setExecutionFrame(frame);
+	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
+		msg->setID(GenerateNextCommandID());
+	}
+	msg->setPlayerID(m_localSlot);
+
+	DEBUG_LOG(("ConnectionManager::handleLocalPlayerLeaving - Local player leaving on frame %d", frame));
+	DEBUG_ASSERTCRASH(m_packetRouterSlot >= 0, ("ConnectionManager::handleLocalPlayerLeaving, packet router is %d, illegal value.", m_packetRouterSlot));
+
+	sendLocalCommand(msg);
+
+	msg->detach();
+}
+
+/**
+ * We just got a message that needs to be ack'd, so ack it!
+ */
+void ConnectionManager::ackCommand(NetCommandRef *ref, UnsignedInt localSlot) {
+	NetCommandMsg *msg = ref->getCommand();
+	NetCommandMsg *ackmsg;
+	UnsignedShort commandID;
+	UnsignedByte originalPlayerID;
+	UnsignedByte sendRelay = 0;
+
+	// Make send relay a bitmask for the connections that the relay will actually be sent to. This is
+	// necessary to determine whether or not we have to wait to send a stage 2 ack.
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if (((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE))) {
+			sendRelay = sendRelay | (1 << i);
+		}
+	}
+
+#if defined(RTS_DEBUG)
+	Bool doDebug = (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ? TRUE : FALSE;
+#endif
+
+	sendRelay = sendRelay & ref->getRelay();
+	if (sendRelay == 0) {
+		NetAckBothCommandMsg *bothmsg = newInstance(NetAckBothCommandMsg)(ref->getCommand());
+		ackmsg = bothmsg;
+		commandID = bothmsg->getCommandID();
+		originalPlayerID = bothmsg->getOriginalPlayerID();
+#if defined(RTS_DEBUG)
+		if (doDebug) {
+			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::ackCommand - doing ack both for command %d from player %d", bothmsg->getCommandID(), bothmsg->getOriginalPlayerID()));
+		}
+#endif
+	} else {
+		NetAckStage1CommandMsg *stage1msg = newInstance(NetAckStage1CommandMsg)(ref->getCommand());
+		ackmsg = stage1msg;
+		commandID = stage1msg->getCommandID();
+		originalPlayerID = stage1msg->getOriginalPlayerID();
+#if defined(RTS_DEBUG)
+		if (doDebug) {
+			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::ackCommand - doing ack stage 1 for command %d from player %d", stage1msg->getCommandID(), stage1msg->getOriginalPlayerID()));
+		}
+#endif
+	}
+
+	ackmsg->setPlayerID(localSlot); // Tell the player who this ack is coming from.
+
+	if (CommandRequiresDirectSend(msg) && CommandRequiresAck(msg)) {
+		// Send this ack directly back to the sending player, don't go through the packet router.
+		if ((msg->getPlayerID() >= 0) && (msg->getPlayerID() < MAX_SLOTS)) {
+			if (m_connections[msg->getPlayerID()] != NULL) {
+				m_connections[msg->getPlayerID()]->sendNetCommandMsg(ackmsg, 1 << msg->getPlayerID());
+			}
+		}
+	} else {
+		// The local connection may be the packet router, in that case, the connection would be NULL.  So do something about it!
+		if ((m_packetRouterSlot >= 0) && (m_packetRouterSlot < MAX_SLOTS)) {
+			if (m_connections[m_packetRouterSlot] != NULL) {
+//				DEBUG_LOG(("ConnectionManager::ackCommand - acking command %d from player %d to packet router.", commandID, m_packetRouterSlot));
+				m_connections[m_packetRouterSlot]->sendNetCommandMsg(ackmsg, 1 << m_packetRouterSlot);
+			} else if (m_localSlot == m_packetRouterSlot) {
+				// we are the packet router, send the ack to the player that sent the command.
+				if ((msg->getPlayerID() >= 0) && (msg->getPlayerID() < MAX_SLOTS)) {
+					if (m_connections[msg->getPlayerID()] != NULL) {
+//						DEBUG_LOG(("ConnectionManager::ackCommand - acking command %d from player %d directly to player.", commandID, msg->getPlayerID()));
+						m_connections[msg->getPlayerID()]->sendNetCommandMsg(ackmsg, 1 << msg->getPlayerID());
+					} else {
+	//					DEBUG_ASSERTCRASH(m_connections[msg->getPlayerID()] != NULL, ("Connection to player is NULL"));
+					}
+				} else {
+					DEBUG_ASSERTCRASH((msg->getPlayerID() >= 0) && (msg->getPlayerID() < MAX_SLOTS), ("Command sent by an invalid player ID."));
+				}
+			} else {
+				DEBUG_ASSERTCRASH(m_connections[m_packetRouterSlot] != NULL, ("Connection to packet router is NULL"));
+			}
+		} else {
+			DEBUG_ASSERTCRASH((m_packetRouterSlot >= 0) && (m_packetRouterSlot < MAX_SLOTS), ("I don't know who the packet router is."));
+		}
+	}
+
+	ackmsg->detach();
+}
+
+/**
+ * This is where we relay a command from one client to others (including ourselves).
+ * This should only be done by the current packet router.
+ */
+void ConnectionManager::sendRemoteCommand(NetCommandRef *msg) {
+	UnsignedByte actualRelay = 0;
+	if (msg->getCommand() == NULL) {
+		return;
+	}
+
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - sending net command %d of type %s from player %d, relay is 0x%x",
+		msg->getCommand()->getID(), GetNetCommandTypeAsString(msg->getCommand()->getNetCommandType()), msg->getCommand()->getPlayerID(), msg->getRelay()));
+
+	UnsignedByte relay = msg->getRelay();
+	if ((relay & (1 << m_localSlot)) && (m_frameData[msg->getCommand()->getPlayerID()] != NULL)) {
+		if (IsCommandSynchronized(msg->getCommand()->getNetCommandType())) {
+			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - adding net command of type %s to player %d for frame %d", GetNetCommandTypeAsString(msg->getCommand()->getNetCommandType()), msg->getCommand()->getPlayerID(), msg->getCommand()->getExecutionFrame()));
+			m_frameData[msg->getCommand()->getPlayerID()]->addNetCommandMsg(msg->getCommand());
+		}
+	}
+
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if ((relay & (1 << i)) && ((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE))) {
+			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - relaying command %d to player %d", msg->getCommand()->getID(), i));
+			m_connections[i]->sendNetCommandMsg(msg->getCommand(), 1 << i);
+			actualRelay = actualRelay | (1 << i);
+		}
+	}
+
+	if ((actualRelay != 0) && (CommandRequiresAck(msg->getCommand()) == TRUE)) {
+		NetCommandRef *ref = m_relayedCommands->addMessage(msg->getCommand());
+		if (ref != NULL) {
+			ref->setRelay(actualRelay);
+			//DEBUG_LOG(("ConnectionManager::sendRemoteCommand - command %d added to relayed commands with relay %d", msg->getCommand()->getID(), ref->getRelay()));
+		}
+	}
+
+	// Do some metrics to find the minimum packet arrival cushion.
+	if (IsCommandSynchronized(msg->getCommand()->getNetCommandType())) {
+//		DEBUG_LOG(("ConnectionManager::sendRemoteCommand - about to call allCommandsReady"));
+		if (allCommandsReady(msg->getCommand()->getExecutionFrame(), TRUE)) {
+			UnsignedInt cushion = msg->getCommand()->getExecutionFrame() - TheGameLogic->getFrame();
+			if ((cushion < m_smallestPacketArrivalCushion) || (m_smallestPacketArrivalCushion == -1)) {
+				m_smallestPacketArrivalCushion = cushion;
+			}
+			m_frameMetrics.addCushion(cushion);
+//			DEBUG_LOG(("Adding %d to cushion for frame %d", cushion, msg->getCommand()->getExecutionFrame()));
+		}
+	}
+}
+
+/**
+ * ConnectionManager::update
+ * Update the connections. Tell them to do the receive and send.  Also relay
+ * commands to their final destinations as necessary.
+ */
+void ConnectionManager::update(Bool isInGame) {
+//
+// 1. do this
+// 2. do that
+// 3. do something else
+// 4. blow something up
+// 5. bust some cap
+//
+
+	if ((m_localAddr == 0) || (m_localPort == 0)) {
+		// we don't have a local address or port yet, this is bad.
+		DEBUG_ASSERTCRASH((m_localAddr != 0) && (m_localPort != 0), ("ConnectionManager doesn't have a local address."));
+		return;
+	}
+
+	m_transport->doRecv();
+
+	if (isInGame) {
+		m_disconnectManager->update(this);
+	}
+
+	// take the packets from the transport, break them up into commands, and give them to the appropriate connections.
+	doRelay();
+
+	// send any necessary keep-alive packets.
+	doKeepAlive();
+
+	for (Int i = 0; i < NUM_CONNECTIONS; ++i) {
+		if (m_connections[i] != NULL) {
+			/*
+			if (m_connections[i]->isQueueEmpty() == FALSE) {
+//				DEBUG_LOG(("ConnectionManager::update - calling doSend on connection %d", i));
+			}
+			*/
+
+			m_connections[i]->doSend();
+
+			if (m_connections[i]->isQuitting() && m_connections[i]->isQueueEmpty())
+			{
+				DEBUG_LOG(("ConnectionManager::update - deleting connection for slot %d", i));
+				deleteInstance(m_connections[i]);
+				m_connections[i] = NULL;
+			}
+		}
+
+		if ((m_frameData[i] != NULL) && (m_frameData[i]->getIsQuitting() == TRUE)) {
+			if (m_frameData[i]->getQuitFrame() == TheGameLogic->getFrame()) {
+				DEBUG_LOG(("ConnectionManager::update - deleting frame data for slot %d on quitting frame %d", i, m_frameData[i]->getQuitFrame()));
+				deleteInstance(m_frameData[i]);
+				m_frameData[i] = NULL;
+			}
+		}
+	}
+
+	m_transport->doSend();
+}
+
+void ConnectionManager::updateRunAhead(Int oldRunAhead, Int frameRate, Bool didSelfSlug, Int nextExecutionFrame) {
+	static time_t lasttimesent = 0;
+	time_t curTime = timeGetTime();
+
+	if ((lasttimesent == 0) || ((curTime - lasttimesent) > TheGlobalData->m_networkRunAheadMetricsTime)) {
+		if (m_localSlot == m_packetRouterSlot) {
+			// We are the packet router, time to compute a new run ahead for this game.
+			m_latencyAverages[m_localSlot] = m_frameMetrics.getAverageLatency();
+
+			// since we are now using the display frame rate rather than the logic frame rate to get our average FPS,
+			// it doesn't make sense to send the desired logic frame rate if we "slugged" ourself.
+//			if (didSelfSlug) {
+//				m_fpsAverages[m_localSlot] = frameRate;
+//			} else {
+				m_fpsAverages[m_localSlot] = m_frameMetrics.getAverageFPS();
+//			}
+			if (didSelfSlug) {
+				//DEBUG_LOG(("ConnectionManager::updateRunAhead - local player run ahead metrics, fps = %d, actual fps = %d, latency = %f, didSelfSlug = true", m_fpsAverages[m_localSlot], m_frameMetrics.getAverageFPS(), m_latencyAverages[m_localSlot]));
+			} else {
+				//DEBUG_LOG(("ConnectionManager::updateRunAhead - local player run ahead metrics, fps = %d, latency = %f, didSelfSlug = false", m_fpsAverages[m_localSlot], m_latencyAverages[m_localSlot]));
+			}
+			Int minFps;
+			Int minFpsPlayer;
+			getMinimumFps(minFps, minFpsPlayer);
+			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::updateRunAhead - max latency = %f, min fps = %d, min fps player = %d old FPS = %d", getMaximumLatency(), minFps, minFpsPlayer, frameRate));
+			if ((minFps >= ((frameRate * 9) / 10)) && (minFps < frameRate)) {
+				// if the minimum fps is within 10% of the desired framerate, then keep the current minimum fps.
+				minFps = frameRate;
+			}
+
+			// TheSuperHackers @info this clamps the logic time scale fps in network games
+			minFps = clamp<Int>(MIN_LOGIC_FRAMES, minFps, TheGlobalData->m_framesPerSecondLimit);
+			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::updateRunAhead - minFps after adjustment is %d", minFps));
+
+			// TheSuperHackers @bugfix Mauller 21/08/2025 calculate the runahead so it always follows the latency
+			// The runahead should always be rounded up to the next integer value to prevent variations in latency from causing stutter
+			// The network slack pushes the runahead up to the next value when the latency is within the slack percentage of the current runahead
+			const Real runAheadSlackScale = 1.0f + ( (Real)TheGlobalData->m_networkRunAheadSlack / 100.0f );
+			Int newRunAhead = ceilf( getMaximumLatency() * runAheadSlackScale * (Real)minFps );
+
+			// TheSuperHackers @info if the runahead goes below 3 logic frames it can start to introduce stutter
+			// We also limit the upper range of the runahead to prevent it getting out of hand
+			newRunAhead = clamp<Int>(MIN_RUNAHEAD, newRunAhead, MAX_FRAMES_AHEAD / 2);
+
+			NetRunAheadCommandMsg *msg = newInstance(NetRunAheadCommandMsg);
+			msg->setPlayerID(m_localSlot);
+			if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
+				msg->setID(GenerateNextCommandID());
+			}
+
+			// needs to be set to the greater of getExecutionFrame and TheGameLogic->getFrame() + oldRunAhead
+			// This prevents the case of...
+			// run ahead starts at 30
+			// run ahead changes to 10 at frame 31 (the command was created on frame 1)
+			// run ahead changes to 10 at frame 56 (the command was created on frame 46)
+			// notice that 56 is within the previous run ahead of 30 which has triggered
+			// the frame command count being set for frames 1 through 60 since run ahead
+			// didn't change for the first time till frame 31.  This creates an extra command
+			// for frame 56 that isn't accounted for in the frame command count that is sent
+			// out in the NetFrameCommandMsg.  sheesh.
+			if (nextExecutionFrame > (TheGameLogic->getFrame() + oldRunAhead)) {
+				msg->setExecutionFrame(nextExecutionFrame);
+			} else {
+				msg->setExecutionFrame(TheGameLogic->getFrame() + oldRunAhead);
+			}
+
+			msg->setRunAhead(newRunAhead);
+			msg->setFrameRate(minFps);
+			//DEBUG_LOG(("ConnectionManager::updateRunAhead - new run ahead = %d, new frame rate = %d, execution frame %d", newRunAhead, minFps, msg->getExecutionFrame()));
+			sendLocalCommand(msg, 0xff ^ (1 << minFpsPlayer)); // Send the packet to everyone but the lowest FPS player.
+
+			NetRunAheadCommandMsg *msg2 = newInstance(NetRunAheadCommandMsg);
+			msg2->setPlayerID(m_localSlot);
+			if (DoesCommandRequireACommandID(msg2->getNetCommandType())) {
+				/*
+				 * Ok there needs to be a big friggin comment about this change...
+				 * What happens is that the two run ahead commands get sent to different players
+				 * using different command ID's.  So player 1 has the run ahead command as command x
+				 * and player 2 has the command as command x+1.  This is all good except when it comes
+				 * to players being disconnected.  With the new disconnect scheme player 1 could potentially
+				 * send his run ahead command to player 2 (or the other way around) to let player 2 catch
+				 * up to him.  So if player 2 has his run ahead command as x+1 and now he gets player 1's
+				 * command list with the run ahead command listed as command x, he won't see them as being
+				 * the same command and will now think he has two different run ahead commands for that frame
+				 * and thus his command list will have an extra command and he will never be able to recover.
+				 * So to fix this we have to use the same command ID for both run ahead commands.  That way
+				 * when the commands are copied places for the disconnect screen they will be seen as the
+				 * same command, and all will be good.
+				 */
+//				msg2->setID(GenerateNextCommandID());
+				msg2->setID(msg->getID());
+			}
+			if (nextExecutionFrame > (TheGameLogic->getFrame() + oldRunAhead)) {
+				msg2->setExecutionFrame(nextExecutionFrame);
+			} else {
+				msg2->setExecutionFrame(TheGameLogic->getFrame() + oldRunAhead);
+			}
+
+			// Let the player with the slowest FPS run a little faster than the other computers...
+			// just in case they are able to.  Then we might be able to run the game faster which would be good.
+			Int newMinFps = (minFps * 11) / 10;
+			if (newMinFps == minFps) {
+				newMinFps = minFps + 1;
+			}
+			if (newMinFps > 30) {
+				newMinFps = 30; // Cap FPS to 30.
+			}
+			msg2->setRunAhead(newRunAhead);
+			msg2->setFrameRate(newMinFps);
+
+			sendLocalCommand(msg2, 1 << minFpsPlayer);
+
+			msg->detach();
+			msg2->detach();
+		} else {
+			// We are not the packet router, send our metrics info to the packet router.
+			NetRunAheadMetricsCommandMsg *msg = newInstance(NetRunAheadMetricsCommandMsg);
+			msg->setPlayerID(m_localSlot);
+			if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
+				msg->setID(GenerateNextCommandID());
+			}
+			msg->setAverageLatency(m_frameMetrics.getAverageLatency());
+
+			// see above for explanation.
+//			if (didSelfSlug) {
+//				msg->setAverageFps(frameRate);
+//			} else {
+				msg->setAverageFps(m_frameMetrics.getAverageFPS());
+//			}
+			if (didSelfSlug) {
+				//DEBUG_LOG(("ConnectionManager::updateRunAhead - average latency = %f, average fps = %d, actual fps = %d, didSelfSlug = true", m_frameMetrics.getAverageLatency(), m_frameMetrics.getAverageFPS(), m_frameMetrics.getAverageFPS()));
+			} else {
+				//DEBUG_LOG(("ConnectionManager::updateRunAhead - average latency = %f, average fps = %d, didSelfSlug = false", m_frameMetrics.getAverageLatency(), m_frameMetrics.getAverageFPS()));
+			}
+			m_connections[m_packetRouterSlot]->sendNetCommandMsg(msg, 1 << m_packetRouterSlot);
+			msg->detach();
+		}
+		lasttimesent = curTime;
+	}
+}
+
+Real ConnectionManager::getMaximumLatency() {
+	Real maxLatency = 0.0f;
+
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if (isPlayerConnected(i) && m_latencyAverages[i] > maxLatency) {
+				maxLatency = m_latencyAverages[i];
+		}
+	}
+
+	return maxLatency;
+}
+
+void ConnectionManager::getMinimumFps(Int &minFps, Int &minFpsPlayer) {
+	minFps = -1;
+	minFpsPlayer = -1;
+//	DEBUG_LOG_RAW(("ConnectionManager::getMinimumFps -"));
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if ((m_connections[i] != NULL) || (i == m_localSlot)) {
+//			DEBUG_LOG_RAW((" %d: %d,", i, m_fpsAverages[i]));
+			if (m_fpsAverages[i] != -1) {
+				if ((minFps == -1) || (m_fpsAverages[i] < minFps)) {
+					minFps = m_fpsAverages[i];
+					minFpsPlayer = i;
+				}
+			}
+		}
+	}
+//	DEBUG_LOG_RAW(("\n"));
+}
+
+UnsignedInt ConnectionManager::getMinimumCushion() {
+	return m_frameMetrics.getMinimumCushion();
+}
+
+/**
+ * The commands for the given frame are all ready, time to send out our command count for that frame.
+ */
+void ConnectionManager::processFrameTick(UnsignedInt frame) {
+	if ((m_frameData[m_localSlot] == NULL) || (m_frameData[m_localSlot]->getIsQuitting() == TRUE)) {
+		// if the local frame data stuff is NULL, we must be leaving the game.
+		return;
+	}
+	UnsignedShort commandCount = m_frameData[m_localSlot]->getCommandCount(frame);
+	NetFrameCommandMsg *msg = newInstance(NetFrameCommandMsg);
+	msg->setExecutionFrame(frame);
+	msg->setCommandCount(commandCount);
+	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
+		msg->setID(GenerateNextCommandID());
+	}
+	msg->setPlayerID(m_localSlot);
+
+	m_frameMetrics.doPerFrameMetrics(frame);
+
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processFrameTick - sending frame info for frame %d, ID %d, command count %d", frame, msg->getID(), commandCount));
+
+	sendLocalCommand(msg, 0xff & ~(1 << m_localSlot));
+
+	msg->detach();
+}
+
+/**
+ * Set the local address.
+ */
+void ConnectionManager::setLocalAddress(UnsignedInt ip, UnsignedInt port) {
+	DEBUG_LOG(("ConnectionManager::setLocalAddress() - local address is %X:%d", ip, port));
+	m_localAddr = ip;
+	m_localPort = port;
+}
+
+/**
+ * Initialize the transport object
+ */
+void ConnectionManager::initTransport() {
+	DEBUG_ASSERTCRASH((m_transport == NULL), ("m_transport already exists when trying to init it."));
+	DEBUG_LOG(("ConnectionManager::initTransport - Initializing Transport"));
+
+	delete m_transport;
+	m_transport = new Transport;
+	m_transport->reset();
+	m_transport->init(m_localAddr, m_localPort);
+}
+
+/**
+ * This is where the commands from the local client are sent to the other clients in
+ * the game.  This is also where the local commands are put into the frame data for
+ * future execution.
+ */
+void ConnectionManager::sendLocalGameMessage(GameMessage *msg, UnsignedInt frame) {
+	UnsignedShort currentID = 0;
+	if (DoesCommandRequireACommandID(NETCOMMANDTYPE_GAMECOMMAND)) {
+		currentID = GenerateNextCommandID();
+	}
+
+	NetCommandMsg *netmsg = newInstance(NetGameCommandMsg)(msg);
+	netmsg->setExecutionFrame(frame);
+	netmsg->setPlayerID(m_localSlot);
+	netmsg->setID(currentID);
+
+	sendLocalCommand(netmsg);
+
+	netmsg->detach();
+}
+
+/**
+ * This is a NetCommandMsg that originated on the local computer. Send this to everyone specified
+ * in the relay field.  Commands sent in this way go through the packet router.
+ */
+void ConnectionManager::sendLocalCommand(NetCommandMsg *msg, UnsignedByte relay /* = 0xff by default*/) {
+	if (CommandRequiresDirectSend(msg) || (m_packetRouterSlot < 0) || (m_packetRouterSlot >= MAX_SLOTS) || (m_connections[m_packetRouterSlot] == NULL)) {
+		sendLocalCommandDirect(msg, relay);
+		return;
+	}
+	msg->attach();
+
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommand - sending net command %d of type %s", msg->getID(),
+		GetNetCommandTypeAsString(msg->getNetCommandType())));
+
+	if (relay & (1 << m_localSlot)) {
+		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommand - adding net command of type %s to player %d for frame %d", GetNetCommandTypeAsString(msg->getNetCommandType()), msg->getPlayerID(), msg->getExecutionFrame()));
+		m_frameData[m_localSlot]->addNetCommandMsg(msg);
+	}
+
+	// Send the packet to everyone else
+	if (m_localSlot == m_packetRouterSlot) {
+		// I am the packet router, I need to send this packet to everyone individually.
+		for (Int i = 0; i < MAX_SLOTS; ++i) {
+			// Send it to all open connections.
+			if (((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE)) && (relay & (1 << i))) {
+				// Set the relay mask to only go to this player so he knows not to relay it to anyone else.
+				UnsignedByte temprelay = 1 << i;
+				m_connections[i]->sendNetCommandMsg(msg, temprelay); // This will create a new copy of netmsg for this connection.
+			}
+		}
+	} else {
+		// Send the command to everyone else via the packet router.
+		UnsignedByte temprelay = relay & ~(1 << m_localSlot);	// Tell the packet router to relay the message to everyone but myself.
+														// Hopefully the packet router is smart enough to not send it
+														// to slots that are not in the game.
+
+		m_connections[m_packetRouterSlot]->sendNetCommandMsg(msg, temprelay); // This will create a new copy of netmsg for this connection.
+
+		if (CommandRequiresAck(msg)) {
+			NetCommandRef *ref = m_pendingCommands->addMessage(msg);
+			//DEBUG_LOG(("ConnectionManager::sendLocalCommand - added command %d to pending commands list.", msg->getID()));
+			if (ref != NULL) {
+				ref->setRelay(temprelay);
+			}
+		}
+	}
+
+	msg->detach(); // detach from the command msg.
+}
+
+/**
+ * This is a NetCommandMsg that originated on the local computer.  Send this to everyone specified
+ * in the relay field.  Commands sent in this way do not go through the packet router.
+ */
+void ConnectionManager::sendLocalCommandDirect(NetCommandMsg *msg, UnsignedByte relay) {
+	msg->attach();
+
+	if (((relay & (1 << m_localSlot)) != 0) && (m_frameData[m_localSlot] != NULL)) {
+		if (IsCommandSynchronized(msg->getNetCommandType()) == TRUE) {
+			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - adding net command of type %s to player %d for frame %d", GetNetCommandTypeAsString(msg->getNetCommandType()), msg->getPlayerID(), msg->getExecutionFrame()));
+			m_frameData[m_localSlot]->addNetCommandMsg(msg);
+		}
+	}
+
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if ((relay & (1 << i)) != 0) {
+			if ((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE)) {
+				UnsignedByte temprelay = 1 << i;
+				m_connections[i]->sendNetCommandMsg(msg, temprelay);
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - Sending direct command %d of type %s to player %d", msg->getID(), GetNetCommandTypeAsString(msg->getNetCommandType()), i));
+			}
+		}
+	}
+
+	msg->detach();
+}
+
+Int commandsReadyDebugSpewage = 0;
+
+/**
+ * Returns true if all the commands for the given frame are ready to be executed.
+ */
+Bool ConnectionManager::allCommandsReady(UnsignedInt frame, Bool justTesting /* = FALSE */) {
+	Bool retval = TRUE;
+	FrameDataReturnType frameRetVal = FRAMEDATA_NOTREADY;
+//	retval = FALSE;  // ****for testing purposes only!!!!!!****
+	Int i = 0;
+	for (; (i < MAX_SLOTS) && retval; ++i) {
+		if ((m_frameData[i] != NULL) && (m_frameData[i]->getIsQuitting() == FALSE)) {
+/*
+			if (!(m_frameData[i]->allCommandsReady(frame, (frame != commandsReadyDebugSpewage) && (justTesting == FALSE)))) {
+				if ((frame != commandsReadyDebugSpewage) && (justTesting == FALSE)) {
+					DEBUG_LOG(("ConnectionManager::allCommandsReady, frame %d player %d not ready.", frame, i));
+					commandsReadyDebugSpewage = frame;
+				}
+				retval = FALSE;
+			} else {
+//				DEBUG_LOG(("ConnectionManager::allCommandsReady, frame %d player %d is ready.", frame, i));
+			}
+*/
+
+			frameRetVal = m_frameData[i]->allCommandsReady(frame, (frame != commandsReadyDebugSpewage) && (justTesting == FALSE));
+			if (frameRetVal == FRAMEDATA_NOTREADY) {
+				retval = FALSE;
+			} else if (frameRetVal == FRAMEDATA_RESEND) {
+				requestFrameDataResend(i, frame);
+				retval = FALSE;
+			}
+		}
+	}
+
+	if (frameRetVal == FRAMEDATA_RESEND) {
+		// this frame's data is really screwed up, we need to clean it out so it can be resent to us.
+		for (i = 0; i < MAX_SLOTS; ++i) {
+			if ((m_frameData[i] != NULL) && (i != m_localSlot)) {
+				m_frameData[i]->resetFrame(frame, FALSE);
+			}
+		}
+	}
+
+	if ((retval == TRUE) && (justTesting == FALSE)) {
+		m_disconnectManager->allCommandsReady(TheGameLogic->getFrame(), this);
+		retval = m_disconnectManager->allowedToContinue(); // allow the disconnect manager to keep us on this frame
+																											// in case we are waiting for a new packet router or something.
+	}
+
+	return retval;
+}
+
+void ConnectionManager::handleAllCommandsReady(void)
+{
+	m_disconnectManager->allCommandsReady(TheGameLogic->getFrame(), this, FALSE);
+}
+
+
+/**
+ * Only call this after making sure that all the commands are there for this frame.
+ * After calling this the commands for this frame will be removed from the connection.
+ *
+ * BGC - To account for the case where the host disconnects without sending the
+ *       same commands to all players, we now have to keep around the last 'run ahead'
+ *       frames so we can potentially send those commands to the other players in the
+ *       game so they can catch up.
+ */
+NetCommandList *ConnectionManager::getFrameCommandList(UnsignedInt frame)
+{
+	NetCommandList *retlist = newInstance(NetCommandList);
+	retlist->init();
+
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if (m_frameData[i] != NULL) {
+			retlist->appendList(m_frameData[i]->getFrameCommandList(frame));
+			if (frame > FRAMES_TO_KEEP) {
+				m_frameData[i]->resetFrame(frame - FRAMES_TO_KEEP);	// After getting the commands for that frame from this
+													// FrameDataManager object, we need to tell it that we're
+													// done with the messages for that frame.
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("getFrameCommandList - called reset frame on player %d for frame %d", i, frame - FRAMES_TO_KEEP));
+			}
+		}
+	}
+
+	return retlist; // retlist deallocated by calling function.
+}
+
+void ConnectionManager::setFrameGrouping(time_t frameGrouping) {
+	// Since we are the packet router, we should send more packets per second since we
+	// may become the latency bottleneck for sending packets from one player to the next.
+	// This is probably ok since the packet router should have the fastest connection of all
+	// the players in the game.
+	if (m_localSlot == m_packetRouterSlot) {
+		frameGrouping = frameGrouping / 2;
+	}
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if (m_connections[i] != NULL) {
+			m_connections[i]->setFrameGrouping(frameGrouping);
+		}
+	}
+}
+
+/*
+void ConnectionManager::determineRouterFallbackPlan() {
+	memset(m_packetRouterFallback, 0, sizeof(m_packetRouterFallback));
+	Int curnum = 1;
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if (m_connections[i] != NULL) {
+			m_packetRouterFallback[i] = curnum;
+			if (curnum == 1) {
+				m_packetRouterSlot = i;
+			}
+			++curnum;
+		}
+	}
+}
+*/
+
+void ConnectionManager::doKeepAlive() {
+	static Int nextIndex = 0;
+	static time_t startTime = 0;
+
+	time_t curTime = timeGetTime();
+
+	if (startTime == 0) {
+		startTime = curTime;
+		return;
+	}
+
+	time_t numSeconds = (curTime - startTime) / 1000;
+
+	while ((nextIndex <= numSeconds) && (nextIndex < MAX_SLOTS)) {
+//		DEBUG_LOG(("ConnectionManager::doKeepAlive - trying to send keep alive message to player %d", nextIndex));
+		if (m_connections[nextIndex] != NULL) {
+			NetKeepAliveCommandMsg *msg = newInstance(NetKeepAliveCommandMsg);
+			msg->setPlayerID(m_localSlot);
+			if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
+				msg->setID(GenerateNextCommandID());
+			}
+//			DEBUG_LOG(("ConnectionManager::doKeepAlive - sending keep alive message to player %d", nextIndex));
+			sendLocalCommandDirect(msg, 1 << nextIndex);
+			msg->detach();
+		}
+		++nextIndex;
+	}
+	if (nextIndex == MAX_SLOTS) {
+		nextIndex = 0;
+		startTime = curTime;
+	}
+}
+
+PlayerLeaveCode ConnectionManager::disconnectPlayer(Int slot) {
+	// Need to do the deletion of the slot's connection and frame data here.
+	PlayerLeaveCode retval = PLAYERLEAVECODE_CLIENT;
+	DEBUG_LOG(("ConnectionManager::disconnectPlayer - disconnecting slot %d on frame %d", slot, TheGameLogic->getFrame()));
+
+	if ((slot < 0) || (slot >= MAX_SLOTS)) {
+		return PLAYERLEAVECODE_UNKNOWN;
+	}
+
+	if (TheGameInfo)
+	{
+		GameSlot *gSlot = TheGameInfo->getSlot( slot );
+		if (gSlot && !gSlot->lastFrameInGame())
+		{
+			DEBUG_LOG(("ConnectionManager::disconnectPlayer(%d) - slot is last in the game on frame %d",
+				slot, TheGameLogic->getFrame()));
+			gSlot->setLastFrameInGame(TheGameLogic->getFrame());
+		}
+	}
+
+	UnicodeString unicodeName;
+	unicodeName = getPlayerName(slot);
+	if (!unicodeName.isEmpty() && m_connections[slot]) {
+		TheInGameUI->message("Network:PlayerLeftGame", unicodeName.str());
+
+		// People are boneheads. Also play a sound
+		static AudioEventRTS leftGameSound("GUIMessageReceived");
+		TheAudio->addAudioEvent(&leftGameSound);
+	}
+
+	if ((m_frameData[slot] != NULL) && (m_frameData[slot]->getIsQuitting() == FALSE)) {
+		DEBUG_LOG(("ConnectionManager::disconnectPlayer - deleting player %d frame data", slot));
+		deleteInstance(m_frameData[slot]);
+		m_frameData[slot] = NULL;
+	}
+
+	if (m_connections[slot] != NULL && !m_connections[slot]->isQuitting()) {
+		DEBUG_LOG(("ConnectionManager::disconnectPlayer - deleting player %d connection", slot));
+		deleteInstance(m_connections[slot]);
+		m_connections[slot] = NULL;
+	}
+
+//	if (playerID == m_localSlot) {
+//		TheMessageStream->appendMessage(GameMessage::MSG_CLEAR_GAME_DATA);
+//	}
+
+	if (slot == m_packetRouterSlot) {
+		Int index = 0;
+		while ((index < (MAX_SLOTS-1)) && (m_packetRouterFallback[index] != m_packetRouterSlot)) {
+			++index;
+		}
+		++index;
+		m_packetRouterSlot = m_packetRouterFallback[index];
+		DEBUG_LOG(("Packet router left.  New packet router is slot %d", m_packetRouterSlot));
+		retval = PLAYERLEAVECODE_PACKETROUTER;
+	}
+	if (m_localSlot == slot) {
+		DEBUG_LOG(("Disconnecting self"));
+		retval = PLAYERLEAVECODE_LOCAL;
+	}
+
+	// Take the player out of the fallback plan
+	Int fallbackindex = 0;
+	while ((fallbackindex < MAX_SLOTS) && (m_packetRouterFallback[fallbackindex] != slot)) {
+		++fallbackindex;
+	}
+
+	for (Int i = fallbackindex; i < MAX_SLOTS-1; ++i) {
+		m_packetRouterFallback[i] = m_packetRouterFallback[i+1];
+	}
+	m_packetRouterFallback[MAX_SLOTS-1] = -1;
+
+	return retval;
+}
+
+void ConnectionManager::quitGame() {
+	// Need to do the NetDisconnectPlayerCommandMsg creation and sending here.
+	NetDisconnectPlayerCommandMsg *disconnectMsg = newInstance(NetDisconnectPlayerCommandMsg);
+	disconnectMsg->setDisconnectSlot(m_localSlot);
+	disconnectMsg->setDisconnectFrame(TheGameLogic->getFrame());
+	disconnectMsg->setPlayerID(m_localSlot);
+	if (DoesCommandRequireACommandID(disconnectMsg->getNetCommandType())) {
+		disconnectMsg->setID(GenerateNextCommandID());
+	}
+	//DEBUG_LOG(("ConnectionManager::disconnectLocalPlayer - about to send disconnect command"));
+	sendLocalCommandDirect(disconnectMsg, 0xff ^ (1 << m_localSlot));
+
+	//DEBUG_LOG(("ConnectionManager::disconnectLocalPlayer - about to flush connections"));
+	flushConnections(); // need to do this so our packet actually gets sent before the connections are deleted.
+	//DEBUG_LOG(("ConnectionManager::disconnectLocalPlayer - done flushing connections"));
+
+	disconnectMsg->detach();
+
+#if RTS_GENERALS
+	// if we get here, we hit Quit on the disconnect screen.  Mark everyone as having disconnected from us
+	// so the online stats can give us appropriate feedback.
+	if (TheGameInfo)
+	{
+		for (Int i = 0; i < MAX_SLOTS; ++i)
+		{
+			GameSlot *gSlot = TheGameInfo->getSlot( i );
+			if (gSlot && !gSlot->lastFrameInGame())
+			{
+				gSlot->markAsDisconnected();
+			}
+		}
+	}
+#endif
+
+	disconnectLocalPlayer();
+}
+
+void ConnectionManager::disconnectLocalPlayer() {
+	// kill the frame data and the connections for all the other players.
+	DEBUG_LOG(("ConnectionManager::disconnectLocalPlayer()"));
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if (i != m_localSlot) {
+			disconnectPlayer(i);
+		}
+	}
+}
+
+/**
+ * Takes all the commands that are ready to send and sends them right now.
+ */
+void ConnectionManager::flushConnections() {
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if (m_connections[i] != NULL) {
+//			DEBUG_LOG(("ConnectionManager::flushConnections - flushing connection to player %d", i));
+			/*
+			if (m_connections[i]->isQueueEmpty()) {
+//				DEBUG_LOG(("ConnectionManager::flushConnections - connection queue empty"));
+			}
+			*/
+			m_connections[i]->doSend();
+		}
+	}
+
+	if (m_transport != NULL) {
+		m_transport->doSend();
+	}
+}
+
+void ConnectionManager::resendPendingCommands() {
+	//DEBUG_LOG(("ConnectionManager::resendPendingCommands()"));
+	if (m_pendingCommands == NULL) {
+		return;
+	}
+
+	NetCommandRef *ref = m_pendingCommands->getFirstMessage();
+	while (ref != NULL) {
+		//DEBUG_LOG(("ConnectionManager::resendPendingCommands - resending command %d", ref->getCommand()->getID()));
+		sendLocalCommand(ref->getCommand(), ref->getRelay());
+		ref = ref->getNext();
+	}
+}
+
+UnsignedInt ConnectionManager::getLocalPlayerID() {
+	return m_localSlot;
+}
+
+UnicodeString ConnectionManager::getPlayerName(Int playerNum) {
+	UnicodeString retval;
+	if( playerNum == m_localSlot ) {
+		retval = m_localUser->GetName();
+	}	else if (((m_connections[playerNum] != NULL) && (m_connections[playerNum]->isQuitting() == FALSE))) {
+		retval = m_connections[playerNum]->getUser()->GetName();
+	}
+	return retval;
+}
+
+/**
+ * Take a user list and make connections and frame data manager objects for each of the players.
+ * For now, this is also how we'll determine the packet router fallback plan.
+ */
+void ConnectionManager::parseUserList(const GameInfo *game)
+{
+	if (!game)
+		return;
+
+	Int i;
+	Int numUsers = 0;
+	m_localSlot = -1;
+	DEBUG_LOG(("Local slot is %d", game->getLocalSlotNum()));
+	for (i=0; i<MAX_SLOTS; ++i)
+	{
+		const GameSlot *slot = game->getConstSlot(i);	// badness, but since we cast right back to const, we should be ok
+		if (slot->isHuman())
+		{
+			if (game->getLocalSlotNum() == i)
+			{
+				m_localSlot = i;
+   			m_localUser->setName(slot->getName());
+			}
+
+			if (m_localSlot != i)
+			{
+				m_connections[i] = newInstance(Connection)();
+				m_connections[i]->init();
+				m_connections[i]->attachTransport(m_transport);
+//				UnsignedShort port = (TheNAT)?TheNAT->getSlotPort(i):8088;
+				UnsignedShort port = slot->getPort();
+				m_connections[i]->setUser(newInstance(User)(slot->getName(), slot->getIP(), port));
+				m_frameData[i] = newInstance(FrameDataManager)(FALSE);
+				DEBUG_LOG(("Remote user is at %X:%d", slot->getIP(), slot->getPort()));
+			}
+			else
+			{
+				DEBUG_LOG(("Local user is %d (%X:%d)", m_localSlot, slot->getIP(), slot->getPort()));
+				m_frameData[i] = newInstance(FrameDataManager)(TRUE);
+			}
+			m_frameData[i]->init();
+			m_frameData[i]->reset();
+
+			m_packetRouterFallback[numUsers] = i;
+
+			++numUsers;
+
+		}
+	}
+#ifdef MEMORYPOOL_DEBUG
+	TheMemoryPoolFactory->debugSetInitFillerIndex(m_localSlot);
+#endif
+
+	/*
+	if ( numUsers < 2 || m_localSlot == -1 )
+	{
+		DEBUG_CRASH(("FAILED parseUserList - network game won't work as expected"));
+		return;
+	}
+
+	char * list = strdup(buf);
+	char *listPtr = list;
+	if (!list)
+		return;
+
+	User users[MAX_SLOTS];
+	int localUser = -1;
+	int i;
+
+	for (i=0; i<MAX_SLOTS; i++)
+	{
+		users[i].setName("");
+	}
+
+	char *userStr, *nameStr, *addrStr, *portStr;
+	AsciiString addrAsciiStr;
+
+	char *listPos;
+
+	DEBUG_LOG(("ConnectionManager::parseUserList - looking for local user at %d.%d.%d.%d:%d",
+		PRINTF_IP_AS_4_INTS(m_localAddr),
+		m_localPort));
+
+	int numUsers = 0;
+	while ( (userStr=strtok_r(listPtr, ",", &listPos)) != NULL )
+	{
+		listPtr = NULL;
+		char *pos = NULL;
+
+		nameStr = strtok_r(userStr, "@", &pos);
+		addrStr = strtok_r(NULL, "@:", &pos);
+		portStr = strtok_r(NULL, ": ", &pos);
+
+		if (!portStr || numUsers >= MAX_SLOTS)
+		{
+			DEBUG_LOG(("ConnectionManager::parseUserList - (numUsers = %d) FAILED parseUserList with list [%s]", numUsers, buf));
+			return;
+		}
+
+		addrAsciiStr = addrStr;
+		UnsignedInt addr = ResolveIP(addrAsciiStr);
+		UnsignedInt port = atoi(portStr);
+
+//		if ((m_localAddr != addr) || (m_localPort != port)) {
+		if (loginName.compare(nameStr) != 0) {
+			m_connections[numUsers] = newInstance(Connection)();
+			m_connections[numUsers]->init();
+			m_connections[numUsers]->attachTransport(m_transport);
+			m_connections[numUsers]->setUser(newInstance(User)(nameStr, addr, port));
+
+			m_frameData[numUsers] = newInstance(FrameDataManager)(FALSE);
+
+			DEBUG_LOG(("ConnectionManager::parseUserList - User %d is %s", numUsers, nameStr));
+		} else {
+			m_localSlot = numUsers;
+			m_localUser.setName(nameStr);
+
+			DEBUG_LOG(("ConnectionManager::parseUserList - User %d is %s", numUsers, nameStr));
+			DEBUG_LOG(("Local user is %d", m_localSlot));
+
+			m_frameData[numUsers] = newInstance(FrameDataManager)(TRUE);
+		}
+		m_frameData[numUsers]->init();
+		m_frameData[numUsers]->reset();
+
+		m_packetRouterFallback[numUsers] = numUsers;
+
+		numUsers++;
+	}
+
+	if (numUsers < 2 || m_localSlot == -1)
+	{
+		DEBUG_LOG(("ConnectionManager::parseUserList - FAILED (local user = %d, num players = %d) with list [%s]", m_localSlot, numUsers, buf));
+		return;
+	}
+
+	free(list); // from the strdup above.
+	list = NULL;
+	*/
+}
+
+/**
+ * Return the number of incoming bytes per second averaged over 30 sec.
+ */
+Real ConnectionManager::getIncomingBytesPerSecond( void )
+{
+	if (m_transport)
+		return m_transport->getIncomingBytesPerSecond();
+	else
+	  return 0.0;
+}
+
+/**
+ * Return the number of incoming packets per second averaged over the last 30 sec.
+ */
+Real ConnectionManager::getIncomingPacketsPerSecond( void )
+{
+	if (m_transport)
+		return m_transport->getIncomingPacketsPerSecond();
+	else
+	  return 0.0;
+}
+
+/**
+ * Return the number of outgoing bytes per second averaged over the last 30 sec.
+ */
+Real ConnectionManager::getOutgoingBytesPerSecond( void )
+{
+	if (m_transport)
+		return m_transport->getOutgoingBytesPerSecond();
+	else
+	  return 0.0;
+}
+
+/**
+ * Return the number of outgoing packets per second averaged over the last 30 sec.
+ */
+Real ConnectionManager::getOutgoingPacketsPerSecond( void )
+{
+	if (m_transport) {
+		return m_transport->getOutgoingPacketsPerSecond();
+	} else {
+	  return 0.0;
+	}
+}
+
+/**
+ * Return the number of bytes not from generals clients received per second averaged over the last 30 sec.
+ */
+Real ConnectionManager::getUnknownBytesPerSecond( void )
+{
+	if (m_transport)
+		return m_transport->getUnknownBytesPerSecond();
+	else
+	  return 0.0;
+}
+
+/**
+ * Return the number ov packets not from generals clients received per second averaged over the last 30 sec.
+ */
+Real ConnectionManager::getUnknownPacketsPerSecond( void )
+{
+	if (m_transport)
+		return m_transport->getUnknownPacketsPerSecond();
+	else
+	  return 0.0;
+}
+
+/**
+ * Return the smallest packet arrival cushion since this was last called.
+ */
+UnsignedInt ConnectionManager::getPacketArrivalCushion() {
+	UnsignedInt retval = m_smallestPacketArrivalCushion;
+	m_smallestPacketArrivalCushion = -1;
+	return retval;
+}
+
+void ConnectionManager::sendChat(UnicodeString text, Int playerMask, UnsignedInt executionFrame)
+{
+	NetChatCommandMsg *msg = newInstance(NetChatCommandMsg);
+	msg->setText(text);
+	msg->setPlayerMask(playerMask);
+	msg->setPlayerID(m_localSlot);
+	msg->setID(0);
+	msg->setExecutionFrame(executionFrame);
+	if (DoesCommandRequireACommandID(msg->getNetCommandType()))
+	{
+		msg->setID(GenerateNextCommandID());
+	}
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Chat message has ID of %d, mask of %8.8X, text of %ls", msg->getID(), msg->getPlayerMask(), msg->getText().str()));
+
+	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
+	processChat(msg);
+
+	msg->detach();
+}
+
+void ConnectionManager::sendDisconnectChat(UnicodeString text) {
+	NetDisconnectChatCommandMsg *msg = newInstance(NetDisconnectChatCommandMsg);
+	msg->setPlayerID(m_localSlot);
+	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
+		msg->setID(GenerateNextCommandID());
+	}
+	msg->setText(text);
+
+	sendLocalCommandDirect(msg, 0xff ^ (1 << m_localSlot));
+	processDisconnectChat(msg);
+}
+
+UnsignedShort ConnectionManager::sendFileAnnounce(AsciiString path, UnsignedByte playerMask)
+{
+	File *theFile = TheLocalFileSystem->openFile(path.str());
+	if (!theFile || !theFile->size())
+	{
+		UnicodeString log;
+		log.format(L"Not sending file '%hs' to %X", path.str(), playerMask);
+		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("%ls", log.str()));
+		if (TheLAN)
+			TheLAN->OnChat(L"sendFile", 0, log, LANAPI::LANCHAT_SYSTEM);
+		return 0;
+	}
+
+	theFile->close();
+
+	Int announceMask = 0xff ^ (1 << m_localSlot);
+	NetFileAnnounceCommandMsg *announceMsg = newInstance(NetFileAnnounceCommandMsg);
+	announceMsg->setPlayerID(m_localSlot);
+	if (DoesCommandRequireACommandID(announceMsg->getNetCommandType()) == TRUE) {
+		announceMsg->setID(GenerateNextCommandID());
+	}
+	announceMsg->setRealFilename(path);
+	announceMsg->setPlayerMask(playerMask);
+	UnsignedShort fileID = GenerateNextCommandID();
+	announceMsg->setFileID(fileID);
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFileAnnounce() - creating announce message with ID of %d from %d to mask %X for '%s' going to %X as command %d",
+		announceMsg->getID(), announceMsg->getPlayerID(), announceMask, announceMsg->getRealFilename().str(),
+		announceMsg->getPlayerMask(), announceMsg->getFileID()));
+
+	processFileAnnounce(announceMsg); // set up things for the host
+
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Sending file announce to %X", announceMask));
+	sendLocalCommand(announceMsg, announceMask);
+	announceMsg->detach();
+
+	return fileID;
+}
+
+void ConnectionManager::sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID)
+{
+	File *theFile = TheLocalFileSystem->openFile(path.str());
+	if (!theFile || !theFile->size())
+	{
+		UnicodeString log;
+		log.format(L"Not sending file '%hs' to %X", path.str(), playerMask);
+		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("%ls", log.str()));
+		if (TheLAN)
+			TheLAN->OnChat(L"sendFile", 0, log, LANAPI::LANCHAT_SYSTEM);
+		return;
+	}
+
+	Int len = theFile->size();
+	char *buf = theFile->readEntireAndClose();
+
+	// compress Targas
+#ifdef COMPRESS_TARGAS
+	char *compressedBuf = NULL;
+	Int compressedLen = path.endsWith(".tga")?CompressionManager::getMaxCompressedSize(len, CompressionManager::getPreferredCompression()):0;
+	Int compressedSize = 0;
+	if (compressedLen)
+		compressedSize = CompressionManager::compressData(CompressionManager::getPreferredCompression(),
+		buf, len, compressedBuf, compressedLen);
+
+	if (!compressedSize)
+	{
+		delete[] compressedBuf;
+		compressedBuf = NULL;
+	}
+#endif // COMPRESS_TARGAS
+
+	NetFileCommandMsg *fileMsg = newInstance(NetFileCommandMsg);
+	fileMsg->setPlayerID(m_localSlot);
+	fileMsg->setID(commandID);
+	fileMsg->setRealFilename(path);
+#ifdef COMPRESS_TARGAS
+	if (compressedBuf)
+	{
+		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Compressed '%s' from %d to %d (%g%%) before transfer", path.str(), len, compressedSize,
+			(Real)compressedSize/(Real)len*100.0f));
+		fileMsg->setFileData((unsigned char *)compressedBuf, compressedSize);
+	}
+	else
+#endif // COMPRESS_TARGAS
+	{
+		fileMsg->setFileData((unsigned char *)buf, len);
+	}
+
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFile() - creating file message with ID of %d for '%s' going to %X from %d, size of %d",
+		fileMsg->getID(), fileMsg->getRealFilename().str(), playerMask, fileMsg->getPlayerID(), fileMsg->getFileLength()));
+
+	delete[] buf;
+	buf = NULL;
+#ifdef COMPRESS_TARGAS
+	delete[] compressedBuf;
+	compressedBuf = NULL;
+#endif // COMPRESS_TARGAS
+
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Sending file: '%s', len %d, to %X", path.str(), len, playerMask));
+
+	sendLocalCommand(fileMsg, playerMask);
+
+	fileMsg->detach();
+}
+
+Int ConnectionManager::getFileTransferProgress(Int playerID, AsciiString path)
+{
+	FileCommandMap::iterator commandIt = s_fileCommandMap.begin();
+	while (commandIt != s_fileCommandMap.end())
+	{
+		//DEBUG_LOG(("ConnectionManager::getFileTransferProgress(%s): looking at existing transfer of '%s'",
+		//	path.str(), commandIt->second.str()));
+		if (commandIt->second == path)
+		{
+			return s_fileProgressMap[playerID][commandIt->first];
+		}
+		++commandIt;
+	}
+	//DEBUG_LOG(("Falling back to 0, since we couldn't find the map"));
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::getFileTransferProgress: path %s not found",path.str()));
+	return 0;
+}
+
+
+void ConnectionManager::voteForPlayerDisconnect(Int slot) {
+	if (m_disconnectManager != NULL) {
+		m_disconnectManager->voteForPlayerDisconnect(slot, this);
+	}
+}
+
+Int ConnectionManager::getNumPlayers()
+{
+	Int retval = 0;
+	for (Int i = 0; i < MAX_SLOTS; ++i)
+	{
+		if (isPlayerConnected(i)) {
+			++retval;
+		}
+	}
+
+	return retval;
+}
+
+void ConnectionManager::updateLoadProgress( Int progress )
+{
+	NetProgressCommandMsg *msg = newInstance(NetProgressCommandMsg);
+	msg->setPercentage( progress );
+	msg->setPlayerID( m_localSlot );
+	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
+		msg->setID(GenerateNextCommandID());
+	}
+	processProgress(msg);
+	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
+
+	msg->detach();
+}
+
+void ConnectionManager::loadProgressComplete()
+{
+	NetLoadCompleteCommandMsg *msg = newInstance(NetLoadCompleteCommandMsg);
+	msg->setPlayerID( m_localSlot );
+	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
+		msg->setID(GenerateNextCommandID());
+	}
+	processLoadComplete(msg);
+	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
+
+	msg->detach();
+}
+
+void ConnectionManager::sendTimeOutGameStart()
+{
+	NetTimeOutGameStartCommandMsg *msg = newInstance(NetTimeOutGameStartCommandMsg);
+	msg->setPlayerID( m_localSlot );
+	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
+		msg->setID(GenerateNextCommandID());
+	}
+	processTimeOutGameStart(msg);
+	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
+
+	msg->detach();
+}
+
+Bool ConnectionManager::isPacketRouter( void )
+{
+	return m_localSlot == m_packetRouterSlot;
+}
+
+Int ConnectionManager::getAverageFPS( void )
+{
+	return m_frameMetrics.getAverageFPS();
+}
+
+Int ConnectionManager::getSlotAverageFPS(Int slot) {
+	if ((slot < 0) || (slot >= MAX_SLOTS)) {
+		return -1;
+	}
+	if ((m_packetRouterSlot != m_localSlot) && (slot == m_localSlot)) {
+		// our framerate data isn't valid for other players unless we are the
+		// packet router, so don't fake someone out.
+		return -1;
+	}
+	return m_fpsAverages[slot];
+}
+
+#if defined(RTS_DEBUG)
+void ConnectionManager::debugPrintConnectionCommands() {
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::debugPrintConnectionCommands - begin commands"));
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if (m_connections[i] != NULL) {
+			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::debugPrintConnectionCommands - commands for connection %d", i));
+			m_connections[i]->debugPrintCommands();
+		}
+	}
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::debugPrintConnectionCommands - end commands"));
+}
+#endif
+
+void ConnectionManager::notifyOthersOfCurrentFrame(Int frame) {
+	NetDisconnectFrameCommandMsg *msg = newInstance(NetDisconnectFrameCommandMsg);
+
+	msg->setPlayerID(m_localSlot);
+	msg->setDisconnectFrame(frame);
+	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
+		msg->setID(GenerateNextCommandID());
+	}
+
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::notifyOthersOfCurrentFrame - sending disconnect frame of %d, command ID = %d", frame, msg->getID()));
+	sendLocalCommandDirect(msg, 0xff ^ (1 << m_localSlot));
+	NetCommandRef *ref = NEW_NETCOMMANDREF(msg);
+	ref->setRelay(1 << m_localSlot);
+	m_disconnectManager->processDisconnectCommand(ref, this);
+	deleteInstance(ref);
+
+	msg->detach();
+
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::notifyOthersOfCurrentFrame - start screen on debug stuff"));
+#if defined(RTS_DEBUG)
+	debugPrintConnectionCommands();
+#endif
+}
+
+void ConnectionManager::notifyOthersOfNewFrame(UnsignedInt frame) {
+	NetDisconnectScreenOffCommandMsg *msg = newInstance(NetDisconnectScreenOffCommandMsg);
+
+	msg->setPlayerID(m_localSlot);
+	msg->setNewFrame(frame);
+	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
+		msg->setID(GenerateNextCommandID());
+	}
+
+	sendLocalCommandDirect(msg, 0xff ^ (1 << m_localSlot));
+	NetCommandRef *ref = NEW_NETCOMMANDREF(msg);
+	ref->setRelay(1 << m_localSlot);
+	m_disconnectManager->processDisconnectCommand(ref, this);
+	deleteInstance(ref);
+
+	msg->detach();
+}
+
+void ConnectionManager::sendFrameDataToPlayer(UnsignedInt playerID, UnsignedInt startingFrame) {
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - sending frame data to player %d starting with frame %d", playerID, startingFrame));
+	for (UnsignedInt frame = startingFrame; frame < TheGameLogic->getFrame(); ++frame) {
+		sendSingleFrameToPlayer(playerID, frame);
+	}
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - done sending commands to player %d", playerID));
+}
+
+void ConnectionManager::sendSingleFrameToPlayer(UnsignedInt playerID, UnsignedInt frame) {
+	if ((TheGameLogic->getFrame() - FRAMES_TO_KEEP) > frame) {
+		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendSingleFrameToPlayer - player %d requested frame %d when we are on frame %d, this is too far in the past.", playerID, frame, TheGameLogic->getFrame()));
+		return;
+	}
+
+	UnsignedByte relay = 1 << playerID;
+
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - sending data for frame %d", frame));
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if ((m_frameData[i] != NULL) && (i != playerID)) { // no need to send his own commands to him.
+			NetCommandList *list = m_frameData[i]->getFrameCommandList(frame);
+			if (list != NULL) {
+				NetCommandRef *ref = list->getFirstMessage();
+				while (ref != NULL) {
+					DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - sending command %d from player %d to player %d using relay 0x%x", ref->getCommand()->getID(), i, playerID, relay));
+					sendLocalCommandDirect(ref->getCommand(), relay);
+					ref = ref->getNext();
+				}
+			}
+			UnsignedInt frameCommandCount = m_frameData[i]->getFrameCommandCount(frame);
+			NetFrameCommandMsg *msg = newInstance(NetFrameCommandMsg);
+			msg->setExecutionFrame(frame);
+			msg->setCommandCount(frameCommandCount);
+			if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
+				msg->setID(GenerateNextCommandID());
+			}
+			msg->setPlayerID(i);
+			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - sending frame info from player %d to player %d for frame %d with command count %d and ID %d and relay %d", i, playerID, msg->getExecutionFrame(), msg->getCommandCount(), msg->getID(), relay));
+			sendLocalCommandDirect(msg, relay);
+			msg->detach();
+		}
+	}
+}
+
+UnsignedInt ConnectionManager::getNextPacketRouterSlot(UnsignedInt playerID) {
+	Int index = 0;
+	while ((index < (MAX_SLOTS-1)) && (m_packetRouterFallback[index] != playerID)) {
+		++index;
+	}
+	++index;
+	return m_packetRouterFallback[index];
+}
+
+void ConnectionManager::requestFrameDataResend(Int playerID, UnsignedInt frame) {
+	NetFrameResendRequestCommandMsg *msg = newInstance(NetFrameResendRequestCommandMsg);
+	msg->setPlayerID(m_localSlot);
+	msg->setFrameToResend(frame);
+	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
+		msg->setID(GenerateNextCommandID());
+	}
+
+	if (isPlayerConnected(playerID) == FALSE) {
+		playerID = 0;
+		while ((playerID < MAX_SLOTS) && (isPlayerConnected(playerID) == FALSE)) {
+			++playerID;
+		}
+	}
+
+	if (playerID < MAX_SLOTS) {
+		sendLocalCommandDirect(msg, 1 << playerID);
+	}
+
+	msg->detach();
+}
diff --git a/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp b/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp
new file mode 100644
index 00000000000..94beda05da6
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp
@@ -0,0 +1,824 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/Recorder.h"
+#include "GameClient/DisconnectMenu.h"
+#include "GameClient/InGameUI.h"
+#include "GameLogic/GameLogic.h"
+#include "GameNetwork/DisconnectManager.h"
+#include "GameNetwork/NetworkInterface.h"
+#include "GameNetwork/networkutil.h"
+#include "GameNetwork/GameSpy/PingThread.h"
+#include "GameNetwork/GameSpy/GSConfig.h"
+
+
+DisconnectManager::DisconnectManager()
+{
+	Int i;
+	m_currentPacketRouterIndex = 0;
+	m_lastFrame = 0;
+	m_lastFrameTime = 0;
+	m_lastKeepAliveSendTime = 0;
+	m_haveNotifiedOtherPlayersOfCurrentFrame = FALSE;
+	m_timeOfDisconnectScreenOn = 0;
+
+	for( i = 0; i < MAX_SLOTS; ++i) {
+		m_packetRouterFallback[i] = 0;
+	}
+
+	m_packetRouterTimeout = 0;
+	for( i = 0; i < MAX_SLOTS -1; ++i) {
+		m_playerTimeouts[i] = 0;
+	}
+
+	for( i = 0; i < MAX_SLOTS; ++i) {
+		for (Int j = 0; j < MAX_SLOTS; ++j) {
+			m_playerVotes[i][j].vote = FALSE;
+			m_playerVotes[i][j].frame = 0;
+		}
+	}
+}
+
+DisconnectManager::~DisconnectManager() {
+}
+
+void DisconnectManager::init() {
+	TheDisconnectMenu->hideScreen(); // make sure the screen starts out hidden.
+	m_lastFrame = 0;
+	m_lastFrameTime = -1;
+	m_lastKeepAliveSendTime = -1;
+	m_disconnectState = DISCONNECTSTATETYPE_SCREENOFF;
+	m_currentPacketRouterIndex = 0;
+	m_timeOfDisconnectScreenOn = 0;
+
+	Int i = 0;
+	for (; i < MAX_SLOTS; ++i) {
+		for (Int j = 0; j < MAX_SLOTS; ++j) {
+			m_playerVotes[i][j].vote = FALSE;
+			m_playerVotes[i][j].frame = 0;
+		}
+	}
+
+	for (i = 0; i < MAX_SLOTS; ++i) {
+		m_disconnectFrames[i] = 0;
+		m_disconnectFramesReceived[i] = FALSE;
+	}
+
+	m_pingFrame = 0;
+	m_pingsSent = 0;
+	m_pingsRecieved = 0;
+}
+
+void DisconnectManager::update(ConnectionManager *conMgr) {
+	if (m_lastFrameTime == -1) {
+		m_lastFrameTime = timeGetTime();
+	}
+
+	// The game logic stalls on the frame we are currently waiting for commands on,
+	// so we have to check for the current logic frame being one higher than
+	// the last one we had the commands ready for.
+	if (TheGameLogic->getFrame() == m_lastFrame) {
+		time_t curTime = timeGetTime();
+		if ((curTime - m_lastFrameTime) > TheGlobalData->m_networkDisconnectTime) {
+			if (m_disconnectState == DISCONNECTSTATETYPE_SCREENOFF) {
+				turnOnScreen(conMgr);
+			}
+			sendKeepAlive(conMgr);
+		}
+	} else {
+		nextFrame(TheGameLogic->getFrame(), conMgr);
+	}
+
+	if (m_disconnectState != DISCONNECTSTATETYPE_SCREENOFF) {
+		updateDisconnectStatus(conMgr);
+
+		// check to see if we need to send pings
+		if (m_pingFrame < TheGameLogic->getFrame())
+		{
+			time_t curTime = timeGetTime();
+			if ((curTime - m_lastFrameTime) > 10000) /// @todo: plug in some better measure here
+			{
+				m_pingFrame = TheGameLogic->getFrame();
+				m_pingsSent = 0;
+				m_pingsRecieved = 0;
+
+				// Send the pings
+				if (ThePinger)
+				{
+					//use next ping server
+					static size_t serverIndex = 0;
+					serverIndex++;
+
+					AsciiStringList pingServers = TheGameSpyConfig->getPingServers();
+
+					if( serverIndex >= pingServers.size() )
+						serverIndex = 0;  //wrap back to first ping server
+
+					std::list<AsciiString>::iterator it = pingServers.begin();
+					for( size_t i = 0;  i < serverIndex;  i++ )
+						it++;
+
+					PingRequest req;
+					req.hostname = it->str();
+					req.repetitions = 5;
+					req.timeout = 2000;
+					m_pingsSent = req.repetitions;
+					ThePinger->addRequest(req);
+					DEBUG_LOG(("DisconnectManager::update() - requesting %d pings of %d from %s",
+						req.repetitions, req.timeout, req.hostname.c_str()));
+				}
+			}
+		}
+
+		// update the ping thread, tracking pings if we are on the same frame
+		if (ThePinger)
+		{
+			PingResponse resp;
+			while (ThePinger->getResponse(resp))
+			{
+				if (m_pingFrame != TheGameLogic->getFrame())
+				{
+					// wrong frame - we're not pinging yet
+					DEBUG_LOG(("DisconnectManager::update() - discarding ping of %d from %s (%d reps)",
+						resp.avgPing, resp.hostname.c_str(), resp.repetitions));
+				}
+				else
+				{
+					// right frame
+					DEBUG_LOG(("DisconnectManager::update() - keeping ping of %d from %s (%d reps)",
+						resp.avgPing, resp.hostname.c_str(), resp.repetitions));
+					if (resp.avgPing < 2000)
+					{
+						m_pingsRecieved += resp.repetitions;
+					}
+				}
+			}
+		}
+	}
+}
+
+UnsignedInt DisconnectManager::getPingFrame()
+{
+	return m_pingFrame;
+}
+
+Int DisconnectManager::getPingsSent()
+{
+	return m_pingsSent;
+}
+
+Int DisconnectManager::getPingsRecieved()
+{
+	return m_pingsRecieved;
+}
+
+
+void DisconnectManager::updateDisconnectStatus(ConnectionManager *conMgr) {
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if (conMgr->isPlayerConnected(i)) {
+			Int slot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
+			if (slot != -1) {
+				time_t curTime = timeGetTime();
+				time_t newTime = TheGlobalData->m_networkPlayerTimeoutTime - (curTime - m_playerTimeouts[slot]);
+
+// if someone is more than 2/3 timed out, lets get our frame numbers sync'd up.  Also if someone is voted out
+// lets do the same thing.
+
+				if (m_haveNotifiedOtherPlayersOfCurrentFrame == FALSE) {
+					if ((newTime < TheGlobalData->m_networkPlayerTimeoutTime / 3) || (isPlayerVotedOut(slot, conMgr) == TRUE)) {
+						TheNetwork->notifyOthersOfCurrentFrame();
+						m_haveNotifiedOtherPlayersOfCurrentFrame = TRUE;
+					}
+
+					DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - curTime = %d, m_timeOfDisconnectScreenOn = %d, curTime - m_timeOfDisconnectScreenOn = %d", curTime, m_timeOfDisconnectScreenOn, curTime - m_timeOfDisconnectScreenOn));
+
+					if (m_timeOfDisconnectScreenOn != 0) {
+						if ((curTime - m_timeOfDisconnectScreenOn) > TheGlobalData->m_networkDisconnectScreenNotifyTime) {
+							TheNetwork->notifyOthersOfCurrentFrame();
+							m_haveNotifiedOtherPlayersOfCurrentFrame = TRUE;
+						}
+					}
+				}
+
+				if ((newTime < 0) || (isPlayerVotedOut(slot, conMgr) == TRUE)) {
+					newTime = 0;
+					DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - player %d(translated slot %d) has been voted out or timed out", i, slot));
+					if (allOnSameFrame(conMgr) == TRUE) {
+						DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - all on same frame"));
+						if (isLocalPlayerNextPacketRouter(conMgr) == TRUE) {
+							DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - local player is next packet router"));
+							DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - about to do the disconnect procedure for player %d", i));
+							sendDisconnectCommand(i, conMgr);
+							disconnectPlayer(i, conMgr);
+							sendPlayerDestruct(i, conMgr);
+						} else {
+							DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - local player is not the next packet router"));
+						}
+					} else {
+						DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - not all on same frame"));
+					}
+				}
+				TheDisconnectMenu->setPlayerTimeoutTime(slot, newTime);
+			}
+		}
+	}
+}
+
+void DisconnectManager::updateWaitForPacketRouter(ConnectionManager *conMgr) {
+/*
+	time_t curTime = timeGetTime();
+	time_t newTime = TheGlobalData->m_networkPlayerTimeoutTime - (curTime - m_packetRouterTimeout);
+	if (newTime < 0) {
+		newTime = 0;
+
+		// The guy that we were hoping would be the new packet router isn't.  We're screwed, get out of the game.
+
+		DEBUG_LOG(("DisconnectManager::updateWaitForPacketRouter - timed out waiting for new packet router, quitting game"));
+		TheNetwork->quitGame();
+	}
+	TheDisconnectMenu->setPacketRouterTimeoutTime(newTime);
+*/
+}
+
+void DisconnectManager::processDisconnectCommand(NetCommandRef *ref, ConnectionManager *conMgr) {
+	NetCommandMsg *msg = ref->getCommand();
+	
+	switch (msg->getNetCommandType()) {
+		case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
+			processDisconnectKeepAlive(msg, conMgr);
+			break;
+			
+		case NETCOMMANDTYPE_DISCONNECTPLAYER:
+			processDisconnectPlayer(msg, conMgr);
+			break;
+			
+		case NETCOMMANDTYPE_PACKETROUTERQUERY:
+			processPacketRouterQuery(msg, conMgr);
+			break;
+			
+		case NETCOMMANDTYPE_PACKETROUTERACK:
+			processPacketRouterAck(msg, conMgr);
+			break;
+			
+		case NETCOMMANDTYPE_DISCONNECTVOTE:
+			processDisconnectVote(msg, conMgr);
+			break;
+			
+		case NETCOMMANDTYPE_DISCONNECTFRAME:
+			processDisconnectFrame(msg, conMgr);
+			break;
+			
+		case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
+			processDisconnectScreenOff(msg, conMgr);
+			break;
+			
+		default:
+			break;
+	}
+}
+
+void DisconnectManager::processDisconnectKeepAlive(NetCommandMsg *msg, ConnectionManager *conMgr) {
+	NetDisconnectKeepAliveCommandMsg *cmdMsg = (NetDisconnectKeepAliveCommandMsg *)msg;
+	Int slot = translatedSlotPosition(cmdMsg->getPlayerID(), conMgr->getLocalPlayerID());
+	if (slot != -1) {
+		resetPlayerTimeout(slot);
+	}
+}
+
+void DisconnectManager::processDisconnectPlayer(NetCommandMsg *msg, ConnectionManager *conMgr) {
+	NetDisconnectPlayerCommandMsg *cmdMsg = (NetDisconnectPlayerCommandMsg *)msg;
+	DEBUG_LOG(("DisconnectManager::processDisconnectPlayer - Got disconnect player command from player %d.  Disconnecting player %d on frame %d", msg->getPlayerID(), cmdMsg->getDisconnectSlot(), cmdMsg->getDisconnectFrame()));
+	DEBUG_ASSERTCRASH(TheGameLogic->getFrame() == cmdMsg->getDisconnectFrame(), ("disconnecting player on the wrong frame!!!"));
+	disconnectPlayer(cmdMsg->getDisconnectSlot(), conMgr);
+}
+
+void DisconnectManager::processPacketRouterQuery(NetCommandMsg *msg, ConnectionManager *conMgr) {
+	NetPacketRouterQueryCommandMsg *cmdMsg = (NetPacketRouterQueryCommandMsg *)msg;
+	DEBUG_LOG(("DisconnectManager::processPacketRouterQuery - got a packet router query command from player %d", msg->getPlayerID()));
+
+	if (conMgr->getPacketRouterSlot() == conMgr->getLocalPlayerID()) {
+		NetPacketRouterAckCommandMsg *ackmsg = newInstance(NetPacketRouterAckCommandMsg);
+		ackmsg->setPlayerID(conMgr->getLocalPlayerID());
+		if (DoesCommandRequireACommandID(ackmsg->getNetCommandType()) == TRUE) {
+			ackmsg->setID(GenerateNextCommandID());
+		}
+		DEBUG_LOG(("DisconnectManager::processPacketRouterQuery - We are the new packet router, responding with an packet router ack. Local player is %d", ackmsg->getPlayerID()));
+		conMgr->sendLocalCommandDirect(ackmsg, 1 << cmdMsg->getPlayerID());
+		ackmsg->detach();
+	} else {
+		DEBUG_LOG(("DisconnectManager::processPacketRouterQuery - We are NOT the new packet router, these are not the droids you're looking for."));
+	}
+}
+
+void DisconnectManager::processPacketRouterAck(NetCommandMsg *msg, ConnectionManager *conMgr) {
+	NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)msg;
+	DEBUG_LOG(("DisconnectManager::processPacketRouterAck - got packet router ack command from player %d", msg->getPlayerID()));
+
+	if (conMgr->getPacketRouterSlot() == cmdMsg->getPlayerID()) {
+		DEBUG_LOG(("DisconnectManager::processPacketRouterAck - packet router command is from who it should be."));
+		resetPacketRouterTimeout();
+		Int currentPacketRouterSlot = conMgr->getPacketRouterSlot();
+		Int currentPacketRouterIndex = 0;
+		while ((currentPacketRouterSlot != conMgr->getPacketRouterFallbackSlot(currentPacketRouterIndex)) && (currentPacketRouterIndex < MAX_SLOTS)) {
+			++currentPacketRouterIndex;
+		}
+		DEBUG_ASSERTCRASH((currentPacketRouterIndex < MAX_SLOTS), ("Invalid packet router index"));
+
+		DEBUG_LOG(("DisconnectManager::processPacketRouterAck - New packet router confirmed, resending pending commands"));
+		conMgr->resendPendingCommands();
+		m_currentPacketRouterIndex = currentPacketRouterIndex;
+		DEBUG_LOG(("DisconnectManager::processPacketRouterAck - Setting disconnect state to screen on."));
+		m_disconnectState = DISCONNECTSTATETYPE_SCREENON; ///< set it to screen on so that the next call to AllCommandsReady can set up everything for the next frame properly.
+	}
+}
+
+void DisconnectManager::processDisconnectVote(NetCommandMsg *msg, ConnectionManager *conMgr) {
+	NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)msg;
+	DEBUG_LOG(("DisconnectManager::processDisconnectVote - Got a disconnect vote for player %d command from player %d", cmdMsg->getSlot(), cmdMsg->getPlayerID()));
+	Int transSlot = translatedSlotPosition(msg->getPlayerID(), conMgr->getLocalPlayerID());
+
+	if (isPlayerInGame(transSlot, conMgr) == FALSE) {
+		// if they've been timed out, voted out, disconnected, don't count their vote.
+		return;
+	}
+
+	applyDisconnectVote(cmdMsg->getSlot(), cmdMsg->getVoteFrame(), cmdMsg->getPlayerID(), conMgr);
+}
+
+void DisconnectManager::processDisconnectFrame(NetCommandMsg *msg, ConnectionManager *conMgr) {
+	NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)msg;
+	UnsignedInt playerID = cmdMsg->getPlayerID();
+	if (m_disconnectFrames[playerID] >= cmdMsg->getDisconnectFrame()) {
+		// this message isn't valid, we have a disconnect frame that is later than this already.
+		return;
+	}
+
+	if (m_disconnectFramesReceived[playerID] == TRUE) {
+		DEBUG_LOG(("DisconnectManager::processDisconnectFrame - Got two disconnect frames without an intervening disconnect screen off command from player %d. Frames are %d and %d", playerID, m_disconnectFrames[playerID], cmdMsg->getDisconnectFrame()));
+	}
+
+	DEBUG_LOG(("DisconnectManager::processDisconnectFrame - about to call resetPlayersVotes for player %d", playerID));
+	resetPlayersVotes(playerID, cmdMsg->getDisconnectFrame()-1, conMgr);
+
+	m_disconnectFrames[playerID] = cmdMsg->getDisconnectFrame();
+	m_disconnectFramesReceived[playerID] = TRUE;
+	DEBUG_LOG(("DisconnectManager::processDisconnectFrame - Got a disconnect frame for player %d, frame = %d, local player is %d, local disconnect frame = %d, command id = %d", cmdMsg->getPlayerID(), cmdMsg->getDisconnectFrame(), conMgr->getLocalPlayerID(), m_disconnectFrames[conMgr->getLocalPlayerID()], cmdMsg->getID()));
+
+	if (playerID == conMgr->getLocalPlayerID()) {
+		DEBUG_LOG(("DisconnectManager::processDisconnectFrame - player %d is the local player", playerID));
+		// we just got the message from the local player, check to see if we need to send
+		// commands to anyone we already have heard from.
+		for (Int i = 0; i < MAX_SLOTS; ++i) {
+			if (i != playerID) {
+				Int transSlot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
+				if (isPlayerInGame(transSlot, conMgr) == TRUE) {
+					if ((m_disconnectFrames[i] < m_disconnectFrames[playerID]) && (m_disconnectFramesReceived[i] == TRUE)) {
+						DEBUG_LOG(("DisconnectManager::processDisconnectFrame - I have more frames than player %d, my frame = %d, their frame = %d", i, m_disconnectFrames[conMgr->getLocalPlayerID()], m_disconnectFrames[i]));
+						conMgr->sendFrameDataToPlayer(i, m_disconnectFrames[i]);
+					}
+				}
+			}
+		}
+	} else if ((m_disconnectFrames[playerID] < m_disconnectFrames[conMgr->getLocalPlayerID()]) && (m_disconnectFramesReceived[playerID] == TRUE)) {
+		DEBUG_LOG(("DisconnectManager::processDisconnectFrame - I have more frames than player %d, my frame = %d, their frame = %d", playerID, m_disconnectFrames[conMgr->getLocalPlayerID()], m_disconnectFrames[playerID]));
+		conMgr->sendFrameDataToPlayer(playerID, m_disconnectFrames[playerID]);
+	}
+}
+
+void DisconnectManager::processDisconnectScreenOff(NetCommandMsg *msg, ConnectionManager *conMgr) {
+	NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)msg;
+	UnsignedInt playerID = cmdMsg->getPlayerID();
+
+	DEBUG_LOG(("DisconnectManager::processDisconnectScreenOff - got a screen off command from player %d for frame %d", cmdMsg->getPlayerID(), cmdMsg->getNewFrame()));
+
+	if ((playerID < 0) || (playerID >= MAX_SLOTS)) {
+		return;
+	}
+
+	UnsignedInt newFrame = cmdMsg->getNewFrame();
+	if (newFrame >= m_disconnectFrames[playerID]) {
+		DEBUG_LOG(("DisconnectManager::processDisconnectScreenOff - resetting the disconnect screen status for player %d", playerID));
+		m_disconnectFramesReceived[playerID] = FALSE;
+		m_disconnectFrames[playerID] = newFrame; // just in case we get packets out of order and the disconnect screen off message gets here before the disconnect frame message.
+
+		DEBUG_LOG(("DisconnectManager::processDisconnectScreenOff - about to call resetPlayersVotes for player %d", playerID));
+		resetPlayersVotes(playerID, cmdMsg->getNewFrame(), conMgr);
+	}
+}
+
+void DisconnectManager::applyDisconnectVote(Int slot, UnsignedInt frame, Int fromSlot, ConnectionManager *conMgr) {
+	m_playerVotes[slot][fromSlot].vote = TRUE;
+	m_playerVotes[slot][fromSlot].frame = frame;
+	Int numVotes = countVotesForPlayer(slot);
+	DEBUG_LOG(("DisconnectManager::applyDisconnectVote - added a vote to disconnect slot %d, from slot %d, for frame %d, current votes are %d", slot, fromSlot, frame, numVotes));
+	Int transSlot = translatedSlotPosition(slot, conMgr->getLocalPlayerID());
+	if (transSlot != -1) {
+		TheDisconnectMenu->updateVotes(transSlot, numVotes);
+	}
+}
+
+void DisconnectManager::nextFrame(UnsignedInt frame, ConnectionManager *conMgr) {
+	m_lastFrame = frame;
+	m_lastFrameTime = timeGetTime();
+	resetPlayerTimeouts(conMgr);
+}
+
+void DisconnectManager::allCommandsReady(UnsignedInt frame, ConnectionManager *conMgr, Bool waitForPacketRouter) {
+		if (m_disconnectState != DISCONNECTSTATETYPE_SCREENOFF) {
+			DEBUG_LOG(("DisconnectManager::allCommandsReady - setting screen state to off."));
+
+			TheDisconnectMenu->hideScreen();
+			m_disconnectState = DISCONNECTSTATETYPE_SCREENOFF;
+			TheNetwork->notifyOthersOfNewFrame(frame);
+
+			// reset the votes since we're moving to a new frame.
+			for (Int i = 0; i < MAX_SLOTS; ++i) {
+				m_playerVotes[i][conMgr->getLocalPlayerID()].vote = FALSE;
+			}
+
+			DEBUG_LOG(("DisconnectManager::allCommandsReady - resetting m_timeOfDisconnectScreenOn"));
+			m_timeOfDisconnectScreenOn = 0;
+		}
+}
+
+Bool DisconnectManager::allowedToContinue() {
+	if (m_disconnectState != DISCONNECTSTATETYPE_SCREENOFF) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+void DisconnectManager::sendKeepAlive(ConnectionManager *conMgr) {
+	time_t curTime = timeGetTime();
+
+	if (((curTime - m_lastKeepAliveSendTime) > 500) || (m_lastKeepAliveSendTime == -1)) {
+		NetDisconnectKeepAliveCommandMsg *msg = newInstance(NetDisconnectKeepAliveCommandMsg);
+		msg->setPlayerID(conMgr->getLocalPlayerID());
+		if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
+			msg->setID(GenerateNextCommandID());
+		}
+		conMgr->sendLocalCommandDirect(msg, 0xff ^ (1 << msg->getPlayerID()));
+		msg->detach();
+
+		m_lastKeepAliveSendTime = curTime;
+	}
+}
+
+void DisconnectManager::populateDisconnectScreen(ConnectionManager *conMgr) {
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		UnicodeString name = conMgr->getPlayerName(i);
+		Int slot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
+		if (slot != -1) {
+			TheDisconnectMenu->setPlayerName(slot, name);
+
+			Int numVotes = countVotesForPlayer(i);
+			TheDisconnectMenu->updateVotes(slot, numVotes);
+		}
+	}
+}
+
+Int DisconnectManager::translatedSlotPosition(Int slot, Int localSlot) {
+	if (slot < localSlot) {
+		return slot;
+	}
+
+	if (slot == localSlot) {
+		return -1;
+	}
+
+	return (slot - 1);
+}
+
+Int DisconnectManager::untranslatedSlotPosition(Int slot, Int localSlot) {
+	if (slot == -1) {
+		return localSlot;
+	}
+
+	if (slot < localSlot) {
+		return slot;
+	}
+
+	return (slot + 1);
+}
+
+void DisconnectManager::resetPlayerTimeouts(ConnectionManager *conMgr) {
+	// reset the player timeouts.
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		Int slot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
+		if (slot != -1) {
+			resetPlayerTimeout(slot);
+		}
+	}
+}
+
+void DisconnectManager::resetPlayerTimeout(Int slot) {
+	m_playerTimeouts[slot] = timeGetTime();
+}
+
+void DisconnectManager::resetPacketRouterTimeout() {
+	m_packetRouterTimeout = timeGetTime();
+}
+
+void DisconnectManager::turnOnScreen(ConnectionManager *conMgr) {
+	TheDisconnectMenu->showScreen();
+	DEBUG_LOG(("DisconnectManager::turnOnScreen - turning on screen on frame %d", TheGameLogic->getFrame()));
+	m_disconnectState = DISCONNECTSTATETYPE_SCREENON;
+	m_lastKeepAliveSendTime = -1;
+	populateDisconnectScreen(conMgr);
+	resetPlayerTimeouts(conMgr);
+	TheDisconnectMenu->hidePacketRouterTimeout();
+
+	m_haveNotifiedOtherPlayersOfCurrentFrame = FALSE;
+
+	m_timeOfDisconnectScreenOn = timeGetTime();
+	DEBUG_LOG(("DisconnectManager::turnOnScreen - turned on screen at time %d", m_timeOfDisconnectScreenOn));
+}
+
+void DisconnectManager::disconnectPlayer(Int slot, ConnectionManager *conMgr) {
+	DEBUG_LOG(("DisconnectManager::disconnectPlayer - Disconnecting slot number %d on frame %d", slot, TheGameLogic->getFrame()));
+	DEBUG_ASSERTCRASH((slot >= 0) && (slot < MAX_SLOTS), ("Attempting to disconnect an invalid slot number"));
+	if ((slot < 0) || (slot >= (MAX_SLOTS))) {
+		return;
+	}
+
+	if (TheGameInfo)
+	{
+		GameSlot *gSlot = TheGameInfo->getSlot( slot );
+		if (gSlot)
+		{
+			gSlot->markAsDisconnected();
+		}
+	}
+
+	Int transSlot = translatedSlotPosition(slot, conMgr->getLocalPlayerID());
+
+	if (transSlot != -1) {
+		// Ignore any disconnect commands that tell us to disconnect ourselves.
+
+		// Get the disconnecting player off the disconnect window.
+		UnicodeString uname = conMgr->getPlayerName(slot);
+		TheRecorder->logPlayerDisconnect(uname, slot);
+		TheDisconnectMenu->removePlayer(transSlot, uname);
+
+		PlayerLeaveCode retcode = conMgr->disconnectPlayer(slot);
+		DEBUG_ASSERTCRASH((retcode != PLAYERLEAVECODE_UNKNOWN), ("Invalid player leave code"));
+
+		if (retcode == PLAYERLEAVECODE_PACKETROUTER) {
+			DEBUG_LOG(("DisconnectManager::disconnectPlayer - disconnecting player was packet router."));
+
+			conMgr->resendPendingCommands();
+		}
+	}
+}
+
+void DisconnectManager::sendDisconnectCommand(Int slot, ConnectionManager *conMgr) {
+	DEBUG_LOG(("DisconnectManager::sendDisconnectCommand - Sending disconnect command for slot number %d", slot));
+	DEBUG_ASSERTCRASH((slot >= 0) && (slot < MAX_SLOTS), ("Attempting to send a disconnect command for an invalid slot number"));
+	if ((slot < 0) || (slot >= (MAX_SLOTS))) {
+		return;
+	}
+
+	UnsignedInt disconnectFrame = getMaxDisconnectFrame();
+
+	// Need to do the NetDisconnectPlayerCommandMsg creation and sending here.
+	NetDisconnectPlayerCommandMsg *msg = newInstance(NetDisconnectPlayerCommandMsg);
+	msg->setDisconnectSlot(slot);
+	msg->setDisconnectFrame(disconnectFrame);
+	msg->setPlayerID(conMgr->getLocalPlayerID());
+	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
+		msg->setID(GenerateNextCommandID());
+	}
+
+	conMgr->sendLocalCommand(msg);
+
+	DEBUG_LOG(("DisconnectManager::sendDisconnectCommand - Sending disconnect command for slot number %d for frame %d", slot, disconnectFrame));
+
+	msg->detach();
+}
+
+void DisconnectManager::sendVoteCommand(Int slot, ConnectionManager *conMgr) {
+	NetDisconnectVoteCommandMsg *msg = newInstance(NetDisconnectVoteCommandMsg);
+
+	msg->setPlayerID(conMgr->getLocalPlayerID());
+	msg->setSlot(slot);
+	msg->setVoteFrame(TheGameLogic->getFrame());
+	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
+		msg->setID(GenerateNextCommandID());
+	}
+
+	conMgr->sendLocalCommandDirect(msg, 0xff & ~(1 << conMgr->getLocalPlayerID()));
+
+	msg->detach();
+}
+
+void DisconnectManager::voteForPlayerDisconnect(Int slot, ConnectionManager *conMgr) {
+	Int transSlot = untranslatedSlotPosition(slot, conMgr->getLocalPlayerID());
+
+	if (m_playerVotes[transSlot][conMgr->getLocalPlayerID()].vote == FALSE) {
+		m_playerVotes[transSlot][conMgr->getLocalPlayerID()].vote = TRUE;
+
+		sendVoteCommand(transSlot, conMgr);
+
+		// we use the game logic frame cause we might not have sent out our own disconnect frame yet.
+		applyDisconnectVote(transSlot, TheGameLogic->getFrame(), conMgr->getLocalPlayerID(), conMgr);
+	}
+}
+
+void DisconnectManager::recalculatePacketRouterIndex(ConnectionManager *conMgr) {
+	Int currentPacketRouterSlot = conMgr->getPacketRouterSlot();
+	m_currentPacketRouterIndex = 0;
+	while ((currentPacketRouterSlot != conMgr->getPacketRouterFallbackSlot(m_currentPacketRouterIndex)) && (m_currentPacketRouterIndex < MAX_SLOTS)) {
+		++m_currentPacketRouterIndex;
+	}
+	DEBUG_ASSERTCRASH((m_currentPacketRouterIndex < MAX_SLOTS), ("Invalid packet router index"));
+}
+
+Bool DisconnectManager::allOnSameFrame(ConnectionManager *conMgr) {
+	Bool retval = TRUE;
+	for (Int i = 0; (i < MAX_SLOTS) && (retval == TRUE); ++i) {
+		Int transSlot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
+		if (transSlot == -1) {
+			continue;
+		}
+		if ((conMgr->isPlayerConnected(i) == TRUE) && (isPlayerInGame(transSlot, conMgr) == TRUE)) {
+			// ok, i is someone who is in the game and hasn't timed out yet or been voted out.
+			if (m_disconnectFramesReceived[i] == FALSE) {
+				// we don't know what frame they are on yet.
+				retval = FALSE;
+			}
+			if ((m_disconnectFramesReceived[i] == TRUE) && (m_disconnectFrames[conMgr->getLocalPlayerID()] != m_disconnectFrames[i])) {
+				// We know their frame, but they aren't on the same frame as us.
+				retval = FALSE;
+			}
+		}
+	}
+	return retval;
+}
+
+Bool DisconnectManager::isLocalPlayerNextPacketRouter(ConnectionManager *conMgr) {
+	UnsignedInt localSlot = conMgr->getLocalPlayerID();
+	UnsignedInt packetRouterSlot = conMgr->getPacketRouterSlot();
+	Int transSlot = translatedSlotPosition(packetRouterSlot, localSlot);
+
+	// stop when we have found a packet router that is connected
+	while ((transSlot != -1) && (isPlayerInGame(transSlot, conMgr) == FALSE)) {
+		packetRouterSlot = conMgr->getNextPacketRouterSlot(packetRouterSlot);
+		if ((packetRouterSlot >= MAX_SLOTS) || (packetRouterSlot < 0)) {
+			// don't know who the next packet router is going to be,
+			// so this game is not going to go anywhere anymore.
+			DEBUG_CRASH(("no more players left to be the packet router, this shouldn't happen."));
+			return FALSE;
+		}
+		transSlot = translatedSlotPosition(packetRouterSlot, localSlot);
+	}
+
+	if (packetRouterSlot == localSlot) {
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+Bool DisconnectManager::hasPlayerTimedOut(Int slot) {
+	if (slot == -1) {
+		return FALSE;
+	}
+
+	time_t newTime = TheGlobalData->m_networkPlayerTimeoutTime - (timeGetTime() - m_playerTimeouts[slot]);
+	if (newTime <= 0) {
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+// this function assumes that we are the packet router. (or at least that
+// we will be after everyone is getting disconnected)
+void DisconnectManager::sendPlayerDestruct(Int slot, ConnectionManager *conMgr) {
+	UnsignedShort currentID = 0;
+	if (DoesCommandRequireACommandID(NETCOMMANDTYPE_DESTROYPLAYER))
+	{
+		currentID = GenerateNextCommandID();
+	}
+
+	DEBUG_LOG(("Queueing DestroyPlayer %d for frame %d on frame %d as command %d",
+		slot, TheNetwork->getExecutionFrame()+1, TheGameLogic->getFrame(), currentID));
+
+	NetDestroyPlayerCommandMsg *netmsg = newInstance(NetDestroyPlayerCommandMsg);
+	netmsg->setExecutionFrame(TheNetwork->getExecutionFrame()+1);
+	netmsg->setPlayerID(conMgr->getLocalPlayerID());
+	netmsg->setID(currentID);
+	netmsg->setPlayerIndex(slot);
+	conMgr->sendLocalCommand(netmsg);
+	netmsg->detach();
+}
+
+// the 'slot' variable is supposed to be a translated slot position. (translated slot meaning
+// that it is the player's position in the disconnect menu)
+Bool DisconnectManager::isPlayerVotedOut(Int slot, ConnectionManager *conMgr) {
+	if (slot == -1) {
+		// we can't vote out ourselves.
+		return FALSE;
+	}
+	Int transSlot = untranslatedSlotPosition(slot, conMgr->getLocalPlayerID());
+	Int numVotes = countVotesForPlayer(transSlot);
+	if (numVotes >= (conMgr->getNumPlayers() - 1)) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+UnsignedInt DisconnectManager::getMaxDisconnectFrame() {
+	UnsignedInt retval = 0;
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		if (m_disconnectFrames[i] > retval) {
+			retval = m_disconnectFrames[i];
+		}
+	}
+	return retval;
+}
+
+Bool DisconnectManager::isPlayerInGame(Int slot, ConnectionManager *conMgr) {
+	Int transSlot = untranslatedSlotPosition(slot, conMgr->getLocalPlayerID());
+	DEBUG_ASSERTCRASH((transSlot >= 0) && (transSlot < MAX_SLOTS), ("invalid slot number"));
+	if (((transSlot < 0) || (transSlot >= MAX_SLOTS)) || conMgr->isPlayerConnected(transSlot) == FALSE) {
+		return FALSE;
+	}
+
+	if (isPlayerVotedOut(slot, conMgr) == TRUE) {
+		return FALSE;
+	}
+
+	if (hasPlayerTimedOut(slot) == TRUE) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+void DisconnectManager::playerHasAdvancedAFrame(Int slot, UnsignedInt frame) {
+	// if they have advanced beyond the frame they had been previously disconnecting on.
+	if (frame >= m_disconnectFrames[slot]) {
+		m_disconnectFrames[slot] = frame; // just in case we get a disconnect frame command after this is called.
+		m_disconnectFramesReceived[slot] = FALSE;
+	}
+}
+
+Int DisconnectManager::countVotesForPlayer(Int slot) {
+	if ((slot < 0) || (slot >= MAX_SLOTS)) {
+		return 0;
+	}
+
+	Int retval = 0;
+	for (Int i = 0; i < MAX_SLOTS; ++i) {
+		// using TheGameLogic->getFrame() cause we might not have sent our disconnect frame yet.
+		if ((m_playerVotes[slot][i].vote == TRUE) && (m_playerVotes[slot][i].frame == TheGameLogic->getFrame())) {
+			++retval;
+		}
+	}
+
+	return retval;
+}
+
+void DisconnectManager::resetPlayersVotes(Int playerID, UnsignedInt frame, ConnectionManager *conMgr) {
+	DEBUG_LOG(("DisconnectManager::resetPlayersVotes - resetting player %d's votes on frame %d", playerID, frame));
+
+	// we need to reset this player's votes that happened before or on the given frame.
+	for(Int i = 0; i < MAX_SLOTS; ++i) {
+		if (m_playerVotes[i][playerID].frame <= frame) {
+			DEBUG_LOG(("DisconnectManager::resetPlayersVotes - resetting player %d's vote for player %d from frame %d on frame %d", playerID, i, m_playerVotes[i][playerID].frame, frame));
+			m_playerVotes[i][playerID].vote = FALSE;
+		}
+	}
+
+	Int numVotes = countVotesForPlayer(playerID);
+	DEBUG_LOG(("DisconnectManager::resetPlayersVotes - after adjusting votes, player %d has %d votes", playerID, numVotes));
+	Int transSlot = translatedSlotPosition(playerID, conMgr->getLocalPlayerID());
+	if (transSlot != -1) {
+		TheDisconnectMenu->updateVotes(transSlot, numVotes);
+	}
+}
diff --git a/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp b/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp
new file mode 100644
index 00000000000..b84abac9182
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/DownloadManager.cpp
@@ -0,0 +1,217 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: DownloadManager.cpp //////////////////////////////////////////////////////
+// Generals download manager code
+// Author: Matthew D. Campbell, July 2002
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameClient/GameText.h"
+#include "GameNetwork/DownloadManager.h"
+
+DownloadManager *TheDownloadManager;
+
+DownloadManager::DownloadManager()
+{
+	m_download = NEW CDownload(this);
+	m_wasError = m_sawEnd = false;
+	m_queuedDownloads.clear();
+	m_statusString = TheGameText->fetch("FTP:StatusIdle");
+
+	// ----- Initialize Winsock -----
+	m_winsockInit = true;
+	WORD verReq = MAKEWORD(2, 2);
+	WSADATA wsadata;
+
+	int err = WSAStartup(verReq, &wsadata);
+	if (err != 0)
+	{
+		m_winsockInit = false;
+	}
+	else
+	{
+		if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2))
+		{
+			WSACleanup();
+			m_winsockInit = false;
+		}
+	}
+
+}
+
+DownloadManager::~DownloadManager()
+{
+	delete m_download;
+	if (m_winsockInit)
+	{
+		WSACleanup();
+		m_winsockInit = false;
+	}
+}
+
+void DownloadManager::init( void )
+{
+}
+
+void DownloadManager::reset( void )
+{
+}
+
+HRESULT DownloadManager::update( void )
+{
+	return m_download->PumpMessages();
+}
+
+HRESULT DownloadManager::downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume )
+{
+	return m_download->DownloadFile( server.str(), username.str(), password.str(), file.str(), localfile.str(), regkey.str(), tryResume );
+}
+
+void DownloadManager::queueFileForDownload( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume )
+{
+	QueuedDownload q;
+	q.file = file;
+	q.localFile = localfile;
+	q.password = password;
+	q.regKey = regkey;
+	q.server = server;
+	q.tryResume = tryResume;
+	q.userName = username;
+
+	m_queuedDownloads.push_back(q);
+}
+
+HRESULT DownloadManager::downloadNextQueuedFile( void )
+{
+	QueuedDownload q;
+	std::list<QueuedDownload>::iterator it = m_queuedDownloads.begin();
+	if (it != m_queuedDownloads.end())
+	{
+		q = *it;
+		m_queuedDownloads.pop_front();
+		m_wasError = m_sawEnd = false;
+		return downloadFile( q.server, q.userName, q.password, q.file, q.localFile, q.regKey, q.tryResume );
+	}
+	else
+	{
+		DEBUG_CRASH(("Starting non-existent download!"));
+		return S_OK;
+	}
+}
+
+AsciiString DownloadManager::getLastLocalFile( void )
+{
+	char buf[256] = "";
+	m_download->GetLastLocalFile(buf, 256);
+	return buf;
+}
+
+HRESULT DownloadManager::OnError( Int error )
+{
+	m_wasError = true;
+	AsciiString s = "FTP:UnknownError";
+	switch (error)
+	{
+		case DOWNLOADEVENT_NOSUCHSERVER:
+			s = "FTP:NoSuchServer";
+			break;
+		case DOWNLOADEVENT_COULDNOTCONNECT:
+			s = "FTP:CouldNotConnect";
+			break;
+		case DOWNLOADEVENT_LOGINFAILED:
+			s = "FTP:LoginFailed";
+			break;
+		case DOWNLOADEVENT_NOSUCHFILE:
+			s = "FTP:NoSuchFile";
+			break;
+		case DOWNLOADEVENT_LOCALFILEOPENFAILED:
+			s = "FTP:LocalFileOpenFailed";
+			break;
+		case DOWNLOADEVENT_TCPERROR:
+			s = "FTP:TCPError";
+			break;
+		case DOWNLOADEVENT_DISCONNECTERROR:
+			s = "FTP:DisconnectError";
+			break;
+	}
+	m_errorString = TheGameText->fetch(s);
+	DEBUG_LOG(("DownloadManager::OnError(): %s(%d)", s.str(), error));
+	return S_OK;
+}
+
+HRESULT DownloadManager::OnEnd()
+{
+	m_sawEnd = true;
+	DEBUG_LOG(("DownloadManager::OnEnd()"));
+	return S_OK;
+}
+
+HRESULT DownloadManager::OnQueryResume()
+{
+	DEBUG_LOG(("DownloadManager::OnQueryResume()"));
+	//return DOWNLOADEVENT_DONOTRESUME;
+	return DOWNLOADEVENT_RESUME;
+}
+
+HRESULT DownloadManager::OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft )
+{
+	DEBUG_LOG(("DownloadManager::OnProgressUpdate(): %d/%d %d/%d", bytesread, totalsize, timetaken, timeleft));
+	return S_OK;
+}
+
+HRESULT DownloadManager::OnStatusUpdate( Int status )
+{
+	AsciiString s = "FTP:StatusNone";
+	switch (status)
+	{
+		case DOWNLOADSTATUS_CONNECTING:
+			s = "FTP:StatusConnecting";
+			break;
+		case DOWNLOADSTATUS_LOGGINGIN:
+			s = "FTP:StatusLoggingIn";
+			break;
+		case DOWNLOADSTATUS_FINDINGFILE:
+			s = "FTP:StatusFindingFile";
+			break;
+		case DOWNLOADSTATUS_QUERYINGRESUME:
+			s = "FTP:StatusQueryingResume";
+			break;
+		case DOWNLOADSTATUS_DOWNLOADING:
+			s = "FTP:StatusDownloading";
+			break;
+		case DOWNLOADSTATUS_DISCONNECTING:
+			s = "FTP:StatusDisconnecting";
+			break;
+		case DOWNLOADSTATUS_FINISHING:
+			s = "FTP:StatusFinishing";
+			break;
+		case DOWNLOADSTATUS_DONE:
+			s = "FTP:StatusDone";
+			break;
+	}
+	m_statusString = TheGameText->fetch(s);
+	DEBUG_LOG(("DownloadManager::OnStatusUpdate(): %s(%d)", s.str(), status));
+	return S_OK;
+}
diff --git a/Core/GameEngine/Source/GameNetwork/FileTransfer.cpp b/Core/GameEngine/Source/GameNetwork/FileTransfer.cpp
new file mode 100644
index 00000000000..c64f3118adb
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/FileTransfer.cpp
@@ -0,0 +1,283 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////
+// FILE: FileTransfer.cpp
+// Author: Matthew D. Campbell, December 2002
+// Description: File Transfer wrapper using TheNetwork
+///////////////////////////////////////////////////////////////////////////////////////
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameClient/LoadScreen.h"
+#include "GameClient/Shell.h"
+#include "GameNetwork/FileTransfer.h"
+#include "GameNetwork/networkutil.h"
+
+//-------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------
+
+static Bool doFileTransfer( AsciiString filename, MapTransferLoadScreen *ls, Int mask )
+{
+	Bool fileTransferDone = FALSE;
+	Int fileTransferPercent = 0;
+	Int i;
+
+	if (mask)
+	{
+		ls->setCurrentFilename(filename);
+		UnsignedInt startTime = timeGetTime();
+		const Int timeoutPeriod = 2*60*1000;
+		ls->processTimeout(timeoutPeriod/1000);
+
+		ls->update(0);
+		fileTransferDone = FALSE;
+		fileTransferPercent = 0;
+
+		UnsignedShort fileCommandID = 0;
+		Bool sentFile = FALSE;
+		if (TheGameInfo->amIHost())
+		{
+			Sleep(500);
+			fileCommandID = TheNetwork->sendFileAnnounce(filename, mask);
+		}
+		else
+		{
+			sentFile = TRUE;
+		}
+
+		DEBUG_LOG(("Starting file transfer loop"));
+
+		while (!fileTransferDone)
+		{
+			if (!sentFile && TheNetwork->areAllQueuesEmpty())
+			{
+				TheNetwork->sendFile(filename, mask, fileCommandID);
+				sentFile = TRUE;
+			}
+
+			// get the progress for each player, and take the min for our overall progress
+			fileTransferDone = TRUE;
+			fileTransferPercent = 100;
+			for (i=1; i<MAX_SLOTS; ++i)
+			{
+				if (TheGameInfo->getConstSlot(i)->isHuman() && !TheGameInfo->getConstSlot(i)->hasMap())
+				{
+					Int slotTransferPercent = TheNetwork->getFileTransferProgress(i, filename);
+					fileTransferPercent = min(fileTransferPercent, slotTransferPercent);
+
+					if (slotTransferPercent == 0)
+						ls->processProgress(i, slotTransferPercent, "MapTransfer:Preparing");
+					else if (slotTransferPercent < 100)
+						ls->processProgress(i, slotTransferPercent, "MapTransfer:Recieving");
+					else
+						ls->processProgress(i, slotTransferPercent, "MapTransfer:Done");
+				}
+			}
+			if (fileTransferPercent < 100)
+			{
+				fileTransferDone = FALSE;
+				if (fileTransferPercent == 0)
+					ls->processProgress(0, fileTransferPercent, "MapTransfer:Preparing");
+				else
+					ls->processProgress(0, fileTransferPercent, "MapTransfer:Sending");
+			}
+			else
+			{
+				DEBUG_LOG(("File transfer is 100%%!"));
+				ls->processProgress(0, fileTransferPercent, "MapTransfer:Done");
+			}
+
+			Int now = timeGetTime();
+			if (now > startTime + timeoutPeriod) // bail if we don't finish in a reasonable amount of time
+			{
+				DEBUG_LOG(("Timing out file transfer"));
+				break;
+			}
+			else
+			{
+				ls->processTimeout((startTime + timeoutPeriod - now)/1000);
+			}
+
+			ls->update(fileTransferPercent);
+		}
+
+		if (!fileTransferDone)
+		{
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+//-------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------
+
+AsciiString GetBasePathFromPath( AsciiString path )
+{
+	const char *s = path.reverseFind('\\');
+	if (s)
+	{
+		Int len = s - path.str();
+
+		AsciiString base;
+		char *buf = base.getBufferForRead(len + 1);
+		memcpy(buf, path.str(), len);
+		buf[len] = 0;
+		return buf;
+	}
+	return AsciiString::TheEmptyString;
+}
+
+AsciiString GetFileFromPath( AsciiString path )
+{
+	const char *s = path.reverseFind('\\');
+	if (s)
+		return s+1;
+	return path;
+}
+
+AsciiString GetExtensionFromFile( AsciiString fname )
+{
+	const char *s = fname.reverseFind('.');
+	if (s)
+		return s+1;
+	return fname;
+}
+
+AsciiString GetBaseFileFromFile( AsciiString fname )
+{
+	const char *s = fname.reverseFind('.');
+	if (s)
+	{
+		Int len = s - fname.str();
+
+		AsciiString base;
+		char *buf = base.getBufferForRead(len + 1);
+		memcpy(buf, fname.str(), len);
+		buf[len] = 0;
+		return buf;
+	}
+	return AsciiString::TheEmptyString;
+}
+
+AsciiString GetPreviewFromMap( AsciiString path )
+{
+	AsciiString fname = GetBaseFileFromFile(GetFileFromPath(path));
+	AsciiString base = GetBasePathFromPath(path);
+
+	AsciiString out;
+	out.format("%s\\%s.tga", base.str(), fname.str());
+	return out;
+}
+
+AsciiString GetINIFromMap( AsciiString path )
+{
+	AsciiString base = GetBasePathFromPath(path);
+
+	AsciiString out;
+	out.format("%s\\map.ini", base.str());
+	return out;
+}
+
+AsciiString GetStrFileFromMap( AsciiString path )
+{
+	AsciiString base = GetBasePathFromPath(path);
+
+	AsciiString out;
+	out.format("%s\\map.str", base.str());
+	return out;
+}
+
+AsciiString GetSoloINIFromMap( AsciiString path )
+{
+	AsciiString base = GetBasePathFromPath(path);
+
+	AsciiString out;
+	out.format("%s\\solo.ini", base.str());
+	return out;
+}
+
+AsciiString GetAssetUsageFromMap( AsciiString path )
+{
+	AsciiString base = GetBasePathFromPath(path);
+
+	AsciiString out;
+	out.format("%s\\assetusage.txt", base.str());
+	return out;
+}
+
+AsciiString GetReadmeFromMap( AsciiString path )
+{
+	AsciiString base = GetBasePathFromPath(path);
+
+	AsciiString out;
+	out.format("%s\\readme.txt", base.str());
+	return out;
+}
+
+//-------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------
+
+Bool DoAnyMapTransfers(GameInfo *game)
+{
+	TheGameInfo = game;
+	Int mask = 0;
+	Int i=0;
+	for (i=1; i<MAX_SLOTS; ++i)
+	{
+		if (TheGameInfo->getConstSlot(i)->isHuman() && !TheGameInfo->getConstSlot(i)->hasMap())
+		{
+			DEBUG_LOG(("Adding player %d to transfer mask", i));
+			mask |= (1<<i);
+		}
+	}
+	if (!mask)
+		return TRUE;
+
+	TheShell->hideShell();
+	MapTransferLoadScreen *ls = NEW MapTransferLoadScreen;
+	ls->init(TheGameInfo);
+	Bool ok = TRUE;
+	if (TheGameInfo->getMapContentsMask() & 2)
+		ok = doFileTransfer(GetPreviewFromMap(game->getMap()), ls, mask);
+	if (ok && TheGameInfo->getMapContentsMask() & 4)
+		ok = doFileTransfer(GetINIFromMap(game->getMap()), ls, mask);
+	if (ok && TheGameInfo->getMapContentsMask() & 8)
+		ok = doFileTransfer(GetStrFileFromMap(game->getMap()), ls, mask);
+	if (ok && TheGameInfo->getMapContentsMask() & 16)
+		ok = doFileTransfer(GetSoloINIFromMap(game->getMap()), ls, mask);
+	if (ok && TheGameInfo->getMapContentsMask() & 32)
+		ok = doFileTransfer(GetAssetUsageFromMap(game->getMap()), ls, mask);
+	if (ok && TheGameInfo->getMapContentsMask() & 64)
+		ok = doFileTransfer(GetReadmeFromMap(game->getMap()), ls, mask);
+	if (ok)
+		ok = doFileTransfer(game->getMap(), ls, mask);
+	delete ls;
+	ls = NULL;
+	if (!ok)
+		TheShell->showShell();
+	return ok;
+}
diff --git a/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp b/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp
new file mode 100644
index 00000000000..2f0db33a44a
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp
@@ -0,0 +1,1563 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /RedAlert2/NAT.cpp                                          $*
+ *                                                                                             *
+ *                      $Author:: Steve_t                                                     $*
+ *                                                                                             *
+ *                     $Modtime:: 3/15/01 12:00PM                                             $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ *                                                                                             *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ *                                                                                             *
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/crc.h"
+#include "Common/UserPreferences.h"
+#include "GameNetwork/FirewallHelper.h"
+#include "GameNetwork/NAT.h"
+#include "GameNetwork/udp.h"
+#include "GameNetwork/NetworkDefs.h"
+#include "GameNetwork/GameSpy/GSConfig.h"
+
+
+FirewallHelperClass *TheFirewallHelper = NULL;
+
+FirewallHelperClass * createFirewallHelper()
+{
+	return NEW FirewallHelperClass();
+}
+
+
+/***********************************************************************************************
+ * FirewallHelperClass::FirewallHelperClass -- Constructor                                     *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Nothing                                                                           *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/15/01 5:03PM ST : Created                                                               *
+ *=============================================================================================*/
+/* static */ Int FirewallHelperClass::m_sourcePortPool = 4096;
+
+FirewallHelperClass::FirewallHelperClass(void)
+{
+	m_currentTry = 0;
+	m_numManglers = 0;
+	m_numResponses = 0;
+	m_packetID = 0;
+	m_timeoutLength = 0;
+	m_timeoutStart = 0;
+	m_behavior = FIREWALL_TYPE_UNKNOWN;
+	m_lastBehavior = FIREWALL_TYPE_UNKNOWN;
+	m_sourcePortAllocationDelta = 0;
+	m_lastSourcePortAllocationDelta = 0;
+	Int i = 0;
+	for (; i < MAX_SPARE_SOCKETS; ++i) {
+		m_spareSockets[i].port = 0;
+		m_messages[i].length = 0;
+		m_mangledPorts[i] = 0;
+		m_sparePorts[i] = 0;
+	}
+
+	for (i = 0; i < MAX_NUM_MANGLERS; i++)
+	{
+		m_manglers[i] = 0;
+	}
+
+	m_currentState = DETECTIONSTATE_IDLE;
+
+	m_sourcePortPool = 4096 + ((timeGetTime() / 1000) % 1000); // do this to make sure we don't use the same source
+																										// port before a previous connection has had a chance
+																										// to time out.
+}
+
+
+
+/***********************************************************************************************
+ * FirewallHelperClass::~FirewallHelperClass -- Destructor                                     *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Nothing                                                                           *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   4/16/02 BGC : Created                                                                     *
+ *=============================================================================================*/
+FirewallHelperClass::~FirewallHelperClass()
+{
+	reset();
+}
+
+/***********************************************************************************************
+ * FirewallHelperClass::Reset -- Cleans out the object                                         *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Nothing                                                                           *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/29/01 1:04AM ST : Created                                                               *
+ *=============================================================================================*/
+void FirewallHelperClass::reset(void)
+{
+	closeAllSpareSockets();
+	m_currentState = DETECTIONSTATE_IDLE;
+	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
+		m_messages[i].length = 0;
+	}
+}
+
+
+
+
+/***********************************************************************************************
+ * FirewallHelperClass::Detect_Firewall -- See what our firewall is up to                      *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Nothing                                                                           *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/15/01 6:47PM ST : Created                                                               *
+ *=============================================================================================*/
+Bool FirewallHelperClass::detectFirewall(void)
+{
+	OptionPreferences pref;
+
+	OptionPreferences::const_iterator it = pref.find("FirewallNeedToRefresh");
+	if (it != pref.end()) {
+		AsciiString str = it->second;
+		if (str.compareNoCase("TRUE") == 0) {
+			TheWritableGlobalData->m_firewallBehavior = FIREWALL_TYPE_UNKNOWN;
+		}
+	}
+
+	if (TheWritableGlobalData->m_firewallBehavior == FIREWALL_TYPE_UNKNOWN) {
+		detectFirewallBehavior();
+
+		return FALSE;
+	} else {
+		DEBUG_LOG(("FirewallHelperClass::detectFirewall - firewall behavior already specified as %d, port allocation delta is %d, skipping detection.", TheWritableGlobalData->m_firewallBehavior, TheWritableGlobalData->m_firewallPortAllocationDelta));
+	}
+
+	return TRUE;
+}
+
+
+Bool FirewallHelperClass::behaviorDetectionUpdate()
+{
+	switch (m_currentState) {
+		case DETECTIONSTATE_IDLE:
+			return FALSE;
+			
+		case DETECTIONSTATE_DONE:
+			return TRUE;
+			
+		case DETECTIONSTATE_BEGIN:
+			return detectionBeginUpdate();
+			
+		case DETECTIONSTATE_TEST1:
+			return detectionTest1Update();
+			
+		case DETECTIONSTATE_TEST2:
+			return detectionTest2Update();
+			
+		case DETECTIONSTATE_TEST3:
+			return detectionTest3Update();
+			
+		case DETECTIONSTATE_TEST3_WAITFORRESPONSES:
+			return detectionTest3WaitForResponsesUpdate();
+			
+		case DETECTIONSTATE_TEST4_1:
+			return detectionTest4Stage1Update();
+			
+		case DETECTIONSTATE_TEST4_2:
+			return detectionTest4Stage2Update();
+			
+		case DETECTIONSTATE_TEST5:
+			return detectionTest5Update();
+			
+		default:
+			return TRUE;
+	}
+}
+
+/***********************************************************************************************
+ * FHC::getNextTemporarySourcePort -- Get a throwaway source port for temporary use        *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    number of ports in sequence to skip                                               *
+ *                                                                                             *
+ * OUTPUT:   port number                                                                       *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/15/01 12:06PM ST : Created                                                              *
+ *=============================================================================================*/
+UnsignedShort FirewallHelperClass::getNextTemporarySourcePort(Int skip)
+{
+	UnsignedShort return_port = (UnsignedShort) m_sourcePortPool;
+
+	/*
+	** Try max 256 ports until we find one we can bind to a socket.
+	*/
+	Int tries = 256;
+	if (skip == 0) {
+		skip = 1;
+	}
+
+	while (tries--) {
+
+		m_sourcePortPool += skip;
+		return_port = (UnsignedShort) m_sourcePortPool;
+
+		if (m_sourcePortPool > 65535) {
+			m_sourcePortPool = 2048;
+		}
+
+		/*
+		** Validate the port by trying to bind it to a socket.
+		*/
+		Bool result = openSpareSocket(return_port);
+
+		if (result) {
+			closeSpareSocket(return_port);
+			return(return_port);
+		} else {
+			DEBUG_LOG(("FirewallHelperClass::getNextTemporarySourcePort - failed to open socket on port %d", return_port));
+		}
+	}
+
+	return(return_port);
+
+}
+
+
+
+
+
+/***********************************************************************************************
+ * FHC::sendToManglerFromPort -- Send to the mangler from the specified port               *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Address of mangler server                                                         *
+ *           Source port to send *from*                                                        *
+ *                                                                                             *
+ * OUTPUT:   True if sent OK                                                                   *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/15/01 12:47PM ST : Created                                                              *
+ *=============================================================================================*/
+Bool FirewallHelperClass::sendToManglerFromPort(UnsignedInt address, UnsignedShort port, UnsignedShort packetID, Bool blitzme)
+{
+	DEBUG_LOG(("sizeof(ManglerMessage) == %d, sizeof(ManglerData) == %d",
+		sizeof(ManglerMessage), sizeof(ManglerData)));
+
+	/*
+	** Build the packet to send out.
+	*/
+	ManglerMessage packet;
+	memset(&(packet.data),0x44, sizeof(ManglerData));
+	packet.data.NetCommandType = 12; // mangler request.
+	packet.data.PacketID = packetID;
+	if (blitzme) {
+		packet.data.BlitzMe = 1;
+	} else {
+		packet.data.BlitzMe = 0;
+	}
+	packet.data.magic = GENERALS_MAGIC_NUMBER;
+	packet.data.OriginalPortNumber = port;
+/*
+	DEBUG_LOG_RAW(("Pre-Adjust Buffer = "));
+	for (Int i = 0; i < sizeof(ManglerData); ++i) {
+		DEBUG_LOG_RAW(("%02x", *(((unsigned char *)(&(packet.data))) + i)));
+	}
+	DEBUG_LOG_RAW(("\n"));
+*/
+	byteAdjust(&(packet.data));
+/*
+	DEBUG_LOG_RAW(("Pre-CRC Buffer = "));
+	for (i = 0; i < sizeof(ManglerData); ++i) {
+		DEBUG_LOG_RAW(("%02x", *(((unsigned char *)(&(packet.data))) + i)));
+	}
+	DEBUG_LOG_RAW(("\n"));
+*/
+	CRC crc;
+	crc.computeCRC((unsigned char *)(&(packet.data.magic)), sizeof(ManglerData) - sizeof(unsigned int));
+	packet.data.CRC = htonl(crc.get());
+
+	packet.length = sizeof(ManglerData);
+
+	DEBUG_LOG(("FirewallHelperClass::sendToManglerFromPort - Sending from port %d to %d.%d.%d.%d:%d", (UnsignedInt)port,
+		PRINTF_IP_AS_4_INTS(address), MANGLER_PORT));
+/*
+	DEBUG_LOG_RAW(("Buffer = "));
+	for (i = 0; i < sizeof(ManglerData); ++i) {
+		DEBUG_LOG_RAW(("%02x", *(((unsigned char *)(&(packet.data))) + i)));
+	}
+	DEBUG_LOG_RAW(("\n"));
+*/
+	SpareSocketStruct *spareSocket = findSpareSocketByPort(port);
+//	DEBUG_LOG(("PacketID = %u", packetID));
+//	DEBUG_LOG(("OriginalPortNumber = %u", port));
+
+	if (spareSocket == NULL) {
+		DEBUG_ASSERTCRASH(spareSocket != NULL, ("Could not find spare socket for send."));
+		DEBUG_LOG(("FirewallHelperClass::sendToManglerFromPort - failed to find the spare socket for port %d", port));
+		return FALSE;
+	}
+
+	spareSocket->udp->Write((UnsignedByte *) &packet, sizeof(ManglerData), address, MANGLER_PORT);
+
+	return(TRUE);
+}
+
+
+SpareSocketStruct * FirewallHelperClass::findSpareSocketByPort(UnsignedShort port) {
+	DEBUG_LOG(("FirewallHelperClass::findSpareSocketByPort - trying to find spare socket with port %d", port));
+	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
+		if (m_spareSockets[i].port == port) {
+			DEBUG_LOG(("FirewallHelperClass::findSpareSocketByPort - found it!"));
+			return &(m_spareSockets[i]);
+		}
+	}
+
+	DEBUG_LOG(("FirewallHelperClass::findSpareSocketByPort - didn't find it"));
+	return NULL;
+}
+
+ManglerMessage * FirewallHelperClass::findEmptyMessage() {
+	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
+		if (m_messages[i].length == 0) {
+			return &(m_messages[i]);
+		}
+	}
+	return NULL;
+}
+
+void FirewallHelperClass::byteAdjust(ManglerData *data) {
+//	for (Int i = 0; i < len/4; ++i) {
+//		*buf = htonl(*buf);
+//		++buf;
+//	}
+	data->CRC = htonl(data->CRC);
+	data->magic = htons(data->magic);
+	data->MyMangledPortNumber = htons(data->MyMangledPortNumber);
+	data->OriginalPortNumber = htons(data->OriginalPortNumber);
+	data->PacketID = htons(data->PacketID);
+}
+
+/***********************************************************************************************
+ * FHC::Get_Mangler_Response_On_Port -- Get the manglers response to a specific query           *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Packet id of packet we are looking for                                            *
+ *                                                                                             *
+ * OUTPUT:   Port the mangler saw this packet come from.                                       *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/15/01 12:51PM ST : Created                                                              *
+ *=============================================================================================*/
+UnsignedShort FirewallHelperClass::getManglerResponse(UnsignedShort packetID, Int time)
+{
+	ManglerMessage *msg = NULL;
+
+//	SpareSocketStruct *spareSocket = NULL;
+
+	sockaddr_in addr;
+
+	Int i = 0;
+	for (; i < MAX_SPARE_SOCKETS; ++i) {
+		if (m_spareSockets[i].udp != NULL) {
+			ManglerMessage *message = findEmptyMessage();
+			if (message == NULL) {
+				break;
+			}
+			Int retval = m_spareSockets[i].udp->Read((unsigned char *)message, sizeof(ManglerData), &addr);
+			if (retval > 0) {
+				CRC crc;
+				crc.computeCRC((unsigned char *)(&(message->data.magic)), sizeof(ManglerData) - sizeof(unsigned int));
+				if (crc.get() != htonl(message->data.CRC)) {
+					DEBUG_LOG(("FirewallHelperClass::getManglerResponse - Saw message, CRC mismatch.  Expected CRC %u, computed CRC %u", message->data.CRC, crc.get()));
+					continue;
+				}
+				byteAdjust(&(message->data));
+				message->length = retval;
+				DEBUG_LOG(("FirewallHelperClass::getManglerResponse - Saw message of %d bytes from mangler %d on port %u", retval, i, m_spareSockets[i].port));
+				DEBUG_LOG(("FirewallHelperClass::getManglerResponse - Message has packet ID %d 0x%08X, looking for packet id %d 0x%08X", message->data.PacketID, message->data.PacketID, packetID, packetID));
+				if (message->data.PacketID == packetID) {
+					DEBUG_LOG(("FirewallHelperClass::getManglerResponse - packet ID's match, returning message"));
+					msg = message;
+					message->length = 0;
+				}
+				if (ntohs(message->data.PacketID) == packetID) {
+					DEBUG_LOG(("FirewallHelperClass::getManglerResponse - NETWORK BYTE ORDER packet ID's match, returning message"));
+					msg = message;
+					message->length = 0;
+				}
+			}
+		}
+	}
+
+	// See if we have already received it and saved it.
+	if (msg == NULL) {
+		for (i = 0; i < MAX_SPARE_SOCKETS; ++i) {
+			if ((m_messages[i].length != 0) && (m_messages[i].data.PacketID == packetID)) {
+				msg = &(m_messages[i]);
+				msg->length = 0;
+			}
+		}
+	}
+
+	if (msg == NULL) {
+		return 0;
+	}
+
+	UnsignedShort mangled_port = msg->data.MyMangledPortNumber;
+	DEBUG_LOG(("Mangler is seeing packets from port %d as coming from port %d", (UnsignedInt)msg->data.OriginalPortNumber, (UnsignedInt)mangled_port));
+	return mangled_port;
+}
+
+
+
+
+/***********************************************************************************************
+ * FirewallHelperClass::Write_Firewall_Settings -- Save out firewall settings.                 *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Nothing                                                                           *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/22/01 10:23PM ST : Created                                                              *
+ *=============================================================================================*/
+void FirewallHelperClass::writeFirewallBehavior(void)
+{
+	OptionPreferences pref;
+
+	char num[16];
+	num[0] = 0;
+	itoa(TheGlobalData->m_firewallBehavior, num, 10);
+	AsciiString numstr;
+	numstr = num;
+	(pref)["FirewallBehavior"] = numstr;
+
+	TheWritableGlobalData->m_firewallPortAllocationDelta = getSourcePortAllocationDelta();
+	num[0] = 0;
+	itoa(TheGlobalData->m_firewallPortAllocationDelta, num, 10);
+	numstr = num;
+	(pref)["FirewallPortAllocationDelta"] = numstr;
+
+	pref.write();
+}
+
+
+/***********************************************************************************************
+ * FirewallHelperClass::flagNeedToRefresh -- Flag that the next time we log in we need to      *
+ *    refresh our firewall settings.                                                           *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    flag - whether or not to refresh...munkee                                         *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/19/03 4:30PM BGC : Created                                                              *
+ *=============================================================================================*/
+void FirewallHelperClass::flagNeedToRefresh(Bool flag)
+{
+	OptionPreferences pref;
+
+	(pref)["FirewallNeedToRefresh"] = flag ? "TRUE" : "FALSE";
+
+	pref.write();
+}
+
+
+/***********************************************************************************************
+ * FirewallHelperClass::Read_Firewall_Behavior -- Read in old firewall settings                *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Nothing                                                                           *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/22/01 10:25PM ST : Created                                                              *
+ *=============================================================================================*/
+void FirewallHelperClass::readFirewallBehavior(void)
+{
+#if (0)
+	m_lastBehavior = (FirewallBehaviorType) ConfigINI.Get_Int("MultiPlayer", "FirewallSettings", FIREWALL_UNKNOWN);
+	m_lastSourcePortAllocationDelta = ConfigINI.Get_Int("MultiPlayer", "FirewallDelta", 1);
+#endif //(0)
+}
+
+
+
+/***********************************************************************************************
+ * FHC::detectFirewallBehavior -- What is that wacky firewall doing to our packet headers?   *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Nothing                                                                           *
+ *                                                                                             *
+ * OUTPUT:   Firewall behavior                                                                 *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/15/01 12:30PM ST : Created                                                              *
+ *=============================================================================================*/
+void FirewallHelperClass::detectFirewallBehavior(/*Bool &canRecord*/)
+{
+	m_behavior = FIREWALL_TYPE_SIMPLE;
+
+	m_currentState = DETECTIONSTATE_BEGIN;
+}
+
+FirewallHelperClass::FirewallBehaviorType FirewallHelperClass::getFirewallBehavior() {
+	m_currentState = DETECTIONSTATE_IDLE;
+	return m_behavior;
+}
+
+Short FirewallHelperClass::getSourcePortAllocationDelta() {
+	return m_sourcePortAllocationDelta;
+}
+
+/* static */ void FirewallHelperClass::getManglerName(Int manglerIndex, Char *nameBuf)
+{
+	AsciiString host;
+	UnsignedShort port;
+	TheGameSpyConfig->getManglerLocation(manglerIndex, host, port);
+	strcpy(nameBuf, host.str());
+}
+
+Bool FirewallHelperClass::detectionBeginUpdate() {
+//	UnsignedShort mangler_port = MANGLER_PORT;
+	 m_packetID = 0x7f00;
+	//int current_mangler = 0;
+
+	/*
+	** Well, we are going to need some manglers.
+	*/
+
+	UnsignedByte mangler_addresses[4][4];
+
+//	Int delta = 0;
+
+
+	/*
+	** If the user specified a particular port to use then we act as if there is no firewall.
+	*/
+	if (TheWritableGlobalData->m_firewallPortOverride != 0) {
+		m_behavior = FIREWALL_TYPE_SIMPLE;
+		DEBUG_LOG(("Source port %d specified by user", TheGlobalData->m_firewallPortOverride));
+
+		if (TheGlobalData->m_firewallSendDelay) {
+			UnsignedInt addbehavior = FIREWALL_TYPE_NETGEAR_BUG;
+			addbehavior |= (UnsignedInt)m_behavior;
+			m_behavior = (FirewallBehaviorType) addbehavior;
+			DEBUG_LOG(("Netgear bug specified by command line or SendDelay flag"));
+		}
+		m_currentState = DETECTIONSTATE_DONE;
+		return TRUE;
+	}
+
+
+
+	m_timeoutStart = timeGetTime();
+	m_timeoutLength = 5000;
+	DEBUG_LOG(("About to call gethostbyname for the mangler address"));
+	int namenum = 0;
+
+	do {
+		AsciiString host;
+		UnsignedShort port;
+		TheGameSpyConfig->getManglerLocation(namenum, host, port);
+		const char *mangler_name_ptr = host.str();
+		DEBUG_LOG(("Looking at %s:%d", host.str(), port));
+
+		/*
+		** Use the wolapi supplied mangler info if available.
+		*/
+//		if (NumManglerServers > namenum) {
+//			mangler_name_ptr = &ManglerServerAddress[namenum][0];
+//			mangler_port = ManglerServerPort[namenum];
+			//current_mangler = CurrentManglerServer;
+//			DEBUG_LOG(("Using mangler from servserv"));
+//		}
+		namenum++;
+
+		if (strlen(mangler_name_ptr) == 0) {
+			break;
+		}
+
+		/*
+		** Do the lookup.
+		*/
+		struct hostent *host_info = gethostbyname(mangler_name_ptr);
+
+		if (!host_info) {
+			DEBUG_LOG(("gethostbyname failed! Error code %d", WSAGetLastError()));
+			break;
+		}
+
+		/*
+		** See if we already have that address in the list.
+		*/
+		Bool found = FALSE;
+		for (Int i=0 ; i<m_numManglers; i++) {
+			if (memcmp(mangler_addresses[i], &host_info->h_addr_list[0][0], 4) == 0) {
+				found = TRUE;
+				break;
+			}
+		}
+		/*
+		** Add the address in if we didn't find it.
+		*/
+		if (!found) {
+			Int m = m_numManglers++;
+			memcpy(&mangler_addresses[m][0], &host_info->h_addr_list[0][0], 4);
+			ntohl((UnsignedInt)mangler_addresses[m]);
+			DEBUG_LOG(("Found mangler address at %d.%d.%d.%d", mangler_addresses[m][0], mangler_addresses[m][1], mangler_addresses[m][2], mangler_addresses[m][3]));
+		}
+
+	} while ((m_numManglers < MAX_NUM_MANGLERS) && ((timeGetTime() - m_timeoutStart) < m_timeoutLength));
+
+
+	DEBUG_ASSERTCRASH(m_numManglers > 2, ("not enough mangler addresses found."));
+	if (m_numManglers < 3) {
+		m_currentState = DETECTIONSTATE_DONE;
+		return TRUE;
+	}
+
+	for (Int i=0 ; i<m_numManglers ; i++) {
+		UnsignedInt temp = 0;
+		temp = mangler_addresses[i][3];
+		temp += mangler_addresses[i][2] << 8;
+		temp += mangler_addresses[i][1] << 16;
+		temp += mangler_addresses[i][0] << 24;
+		m_manglers[i] = temp;
+//		memcpy(&(m_manglers[i]), &mangler_addresses[i][0], 4);
+	}
+
+	DEBUG_LOG(("FirewallHelperClass::detectionBeginUpdate - Testing for Netgear bug"));
+
+	/*
+	** See if the user specified a netgear firewall - that will save us the trouble.
+	*/
+	if (TheGlobalData->m_firewallSendDelay) {
+		UnsignedInt addbehavior = FIREWALL_TYPE_NETGEAR_BUG;
+		addbehavior |= (UnsignedInt)m_behavior;
+		m_behavior = (FirewallBehaviorType) addbehavior;
+		DEBUG_LOG(("FirewallHelperClass::detectionBeginUpdate - Netgear bug specified by command line or SendDelay flag"));
+	} else {
+		DEBUG_LOG(("FirewallHelperClass::detectionBeginUpdate - Netgear bug not specified"));
+	}
+
+	/*
+	** OK, we have our manglers.
+	**
+	** First test, see if there is any port mangling at all.
+	**
+	**
+	**
+	*/
+
+	DEBUG_LOG(("About to start mangler test 1"));
+	/*
+	** Get a spare port number and create a new socket to bind it to.
+	*/
+	m_sparePorts[0] = getNextTemporarySourcePort(0);
+	if (!openSpareSocket(m_sparePorts[0])) {
+		m_currentState = DETECTIONSTATE_DONE;
+		return TRUE;
+	}
+
+	/*
+	** Send to the mangler from this port until we get a response.
+	*/
+	m_timeoutStart = timeGetTime();
+	m_timeoutLength = 6000;
+
+	sendToManglerFromPort(m_manglers[0], m_sparePorts[0], m_packetID);
+	m_currentState = DETECTIONSTATE_TEST1;
+	return FALSE;
+}
+
+
+Bool FirewallHelperClass::detectionTest1Update() {
+
+	m_mangledPorts[0] = getManglerResponse(m_packetID);
+
+	/*
+	** See if we got no response or a non-mangled response.
+	*/
+	if (m_mangledPorts[0] == 0 || m_mangledPorts[0] == m_sparePorts[0]) {
+		if (m_mangledPorts[0] == m_sparePorts[0]) {
+			m_sourcePortAllocationDelta = 0;
+			DEBUG_LOG(("FirewallHelperClass::detectionTest1Update - Non-mangled response from mangler, quitting test."));
+		}
+		if ((m_mangledPorts[0] == 0) && ((timeGetTime() - m_timeoutStart) < m_timeoutLength)) {
+			// we are still waiting for a response and haven't timed out yet.
+			DEBUG_LOG(("FirewallHelperClass::detectionTest1Update - waiting for response from mangler."));
+			return FALSE;
+		}
+		if ((m_mangledPorts[0] == 0) && ((timeGetTime() - m_timeoutStart) >= m_timeoutLength)) {
+			// we are still waiting for a response and we timed out.
+			DEBUG_LOG(("FirewallHelperClass::detectionTest1Update - timed out waiting for response from mangler."));
+		}
+		// either we have received a non-mangled response or we timed out waiting for a response.
+		closeSpareSocket(m_sparePorts[0]);
+
+		m_currentState = DETECTIONSTATE_DONE;
+		return TRUE;
+	}
+
+	DEBUG_LOG(("FirewallHelperClass::detectionTest1Update - test 1 complete"));
+	/*
+	** Test one completed, time to start up the second test.
+	**
+	** Second test. See if the ports are mangled differently for different destination IPs.
+	**
+	** We can use the spare socket from the last test and send to a different mangler.
+	**
+	*/
+
+	/*
+	** Send to the mangler from this port until we get a response.
+	*/
+	m_timeoutStart = timeGetTime();
+	m_timeoutLength = 6000;
+	m_mangledPorts[1] = 0;
+	sendToManglerFromPort(m_manglers[1], m_sparePorts[0], m_packetID+1);
+
+	m_currentState = DETECTIONSTATE_TEST2;
+	return FALSE;
+}
+
+Bool FirewallHelperClass::detectionTest2Update() {
+
+	m_mangledPorts[1] = getManglerResponse(m_packetID+1);
+
+	if (m_mangledPorts[1] == 0) {
+		if ((timeGetTime() - m_timeoutStart) <= m_timeoutLength) {
+			return FALSE;
+		}
+		DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - timed out waiting for mangler response"));
+		m_currentState = DETECTIONSTATE_DONE;
+		return TRUE;
+	}
+
+	/*
+	** We are done with this socket/port
+	*/
+	closeSpareSocket(m_sparePorts[0]);
+
+	/*
+	** See if we got no response or a non-mangled response.
+	*/
+	if (m_mangledPorts[1] == 0 || m_mangledPorts[1] == m_sparePorts[0]) {
+		m_currentState = DETECTIONSTATE_DONE;
+		UnsignedInt addBehavior = (UnsignedInt)FIREWALL_TYPE_SIMPLE;
+		addBehavior |= (UnsignedInt)m_behavior;
+		m_behavior = (FirewallBehaviorType)addBehavior;
+
+		if (m_mangledPorts[1] == 0) {
+			DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - got no response from mangler"));
+		} else {
+			DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - got a mangler response, no port mangling"));
+		}
+		DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - Setting behavior to SIMPLE, done testing"));
+		return TRUE;
+	}
+
+	if (m_mangledPorts[0] == m_mangledPorts[1]) {
+		DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - port mangling doesn't depend on destination IP, setting to DUMB_MANGLING"));
+		UnsignedInt addBehavior = (UnsignedInt)FIREWALL_TYPE_DUMB_MANGLING;
+		addBehavior |= (UnsignedInt)m_behavior;
+		m_behavior = (FirewallBehaviorType)addBehavior;
+	} else {
+		DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - port mangling depends on destination IP, setting to SMART_MANGLING"));
+		UnsignedInt addBehavior = (UnsignedInt)FIREWALL_TYPE_SMART_MANGLING;
+		addBehavior |= (UnsignedInt)m_behavior;
+		m_behavior = (FirewallBehaviorType)addBehavior;
+	}
+
+
+
+
+	/*
+	** Third test.
+	**
+	** This test tries to detect a pattern in the ports allocated by the NAT.
+	** We use several source ports for this one.
+	**
+	*/
+
+	m_currentTry = 0;
+	m_packetID = m_packetID + 10;
+
+	DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - moving on to 3rd test"));
+
+	m_currentState = DETECTIONSTATE_TEST3;
+	return FALSE;
+}
+
+Bool FirewallHelperClass::detectionTest3Update() {
+	/*
+	** Try this whole thing a max of 3 times.
+	*/
+	if (m_currentTry < 3) {
+		memset(m_sparePorts, 0, sizeof(m_sparePorts));
+		memset(m_mangledPorts, 0, sizeof(m_mangledPorts));
+
+		/*
+		** Open a socket for each source port.
+		** We should use a non-linear set of source ports so we can detect the NAT32 relative offset
+		** case.
+		*/
+		Int i=0;
+		for (; i<NUM_TEST_PORTS ; i++) {
+			m_sparePorts[i] = getNextTemporarySourcePort(i);
+			if (!openSpareSocket(m_sparePorts[i])) {
+
+				/*
+				** Close any spare ports we allocated already before we bail.
+				*/
+				for (Int j=0 ; j<i ; j++) {
+					if (m_sparePorts[j]) {
+						closeSpareSocket(m_sparePorts[j]);
+					}
+				}
+				DEBUG_LOG(("FirewallHelperClass::detectionTest3Update - Failed to open all the spare sockets, bailing test"));
+				m_currentState = DETECTIONSTATE_DONE;
+				return TRUE;
+			}
+		}
+
+		/*
+		** OK, lets get some numbers from the mangler.
+		**
+		** Keep sending from each port until we get a response to all the sends. There's a implied
+		** delay between initial sends due to the timeout in Get_Mangler_Response.
+		*/
+		m_timeoutStart = timeGetTime();
+		m_timeoutLength = 12000;
+
+		DEBUG_LOG(("FirewallHelperClass::detectionTest3Update - Sending to %d manglers", NUM_TEST_PORTS));
+		for (i=0 ; i<NUM_TEST_PORTS ; i++) {
+			if (m_mangledPorts[i] == 0) {
+				sendToManglerFromPort(m_manglers[0], m_sparePorts[i], m_packetID+i);
+			}
+		}
+
+		m_numResponses = 0;
+
+		m_currentState = DETECTIONSTATE_TEST3_WAITFORRESPONSES;
+		DEBUG_LOG(("FirewallHelperClass::detectionTest3Update - Waiting for mangler responses"));
+		return FALSE;
+	}
+
+	DEBUG_LOG(("FirewallHelperClass::detectionTest3Update - Failed to complete test, quitting"));
+	m_currentState = DETECTIONSTATE_DONE;
+	return TRUE;
+}
+
+Bool FirewallHelperClass::detectionTest3WaitForResponsesUpdate() {
+	Int i = 0;
+	for (; i < NUM_TEST_PORTS; ++i) {
+		if (m_mangledPorts[i] == 0) {
+			m_mangledPorts[i] = getManglerResponse(m_packetID + i);
+			if (m_mangledPorts[i] != 0) {
+				++m_numResponses;
+			}
+		}
+	}
+
+	if (m_numResponses < NUM_TEST_PORTS) {
+		if ((timeGetTime() - m_timeoutStart) > m_timeoutLength) {
+			/*
+			** Close down those sockets - we are finished with them.
+			*/
+			for (Int j=0 ; j<i ; j++) {
+				if (m_spareSockets[j].port != 0) {
+					closeSpareSocket(m_spareSockets[j].port);
+				}
+			}
+			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - timed out waiting, bailing test"));
+			m_currentState = DETECTIONSTATE_DONE;
+			return TRUE;
+		}
+		return FALSE;
+	}
+
+	/*
+	** Close down those sockets - we are finished with them.
+	*/
+	for (Int j=0 ; j<i ; j++) {
+		if (m_spareSockets[j].port != 0) {
+			closeSpareSocket(m_spareSockets[j].port);
+		}
+	}
+
+	/*
+	** We need at least 4 responses to be sure of the port allocation scheme.
+	*/
+	if (m_numResponses < 4) {
+		if (m_lastSourcePortAllocationDelta != 0 && (int)m_lastBehavior > (int)FIREWALL_TYPE_SIMPLE) {
+			/*
+			** If the delta we got last time we played looks good then use that.
+			*/
+			m_sourcePortAllocationDelta = m_lastSourcePortAllocationDelta;
+		}
+		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - didn't get enough responses, using %d as the source port allocation delta, finished test", m_sourcePortAllocationDelta));
+		m_currentState = DETECTIONSTATE_DONE;
+		return TRUE;
+	}
+
+
+	Bool relative_delta = FALSE;
+	Bool looks_good = FALSE;
+	Int delta = getNATPortAllocationScheme(m_numResponses, m_sparePorts, m_mangledPorts, relative_delta, looks_good);
+	DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - getNATPortAllocationScheme returned %d", delta));
+
+	if (delta) {
+
+		/*
+		** Hey, we got it!
+		*/
+		UnsignedInt addbehavior = 0;
+		if (relative_delta) {
+			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - detected RELATIVE PORT ALLOCATION"));
+			addbehavior = (UnsignedInt)FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION;
+		} else {
+			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - detected SIMPLE PORT ALLOCATION"));
+			addbehavior = (UnsignedInt)FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION;
+		}
+		addbehavior |= (UnsignedInt)m_behavior;
+		m_behavior = (FirewallBehaviorType) addbehavior;
+
+		m_sourcePortAllocationDelta = delta;
+		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - setting source port delta to %d", delta));
+	} else {
+		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - didn't get a delta value"));
+		if (m_lastSourcePortAllocationDelta != 0 && (Int)m_lastBehavior > (Int)FIREWALL_TYPE_SIMPLE) {
+			/*
+			** If the delta we got last time we played looks good then use that.
+			*/
+			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - using the port allocation delta we have from before which is %d", m_lastSourcePortAllocationDelta));
+			m_sourcePortAllocationDelta = m_lastSourcePortAllocationDelta;
+		}
+		++m_currentTry;
+		m_currentState = DETECTIONSTATE_TEST3;
+		return FALSE;
+	}
+
+	DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - starting 4th test"));
+	/*
+	** Fourth test.
+	**
+	** Test to see if the NAT mangles differently per destination port at the same IP.
+	*/
+	if ((m_behavior & FIREWALL_TYPE_SMART_MANGLING) != 0) {
+
+		if ((m_behavior & FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION) != 0) {
+
+			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - simple port allocation, Testing to see if the NAT mangles differently per destination port at the same IP"));
+
+			/*
+			** We need 2 source ports for this.
+			*/
+			m_sparePorts[0] = getNextTemporarySourcePort(0);
+			if (!openSpareSocket(m_sparePorts[0])) {
+				m_currentState = DETECTIONSTATE_DONE;
+				DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - Failed to open first spare port, bailing"));
+				return TRUE;
+			}
+
+			m_sparePorts[1] = getNextTemporarySourcePort(0);
+			if (!openSpareSocket(m_sparePorts[1])) {
+				closeSpareSocket(m_sparePorts[0]);
+				m_currentState = DETECTIONSTATE_DONE;
+				DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - Failed to open second spare port, bailing"));
+				return TRUE;
+			}
+
+			/*
+			** Get a reference port.
+			*/
+			m_timeoutStart = timeGetTime();
+			m_timeoutLength = 4000;
+			m_mangledPorts[0] = 0;
+			m_packetID += 10;
+
+			/*
+			** Wait for a response.
+			*/
+			sendToManglerFromPort(m_manglers[0], m_sparePorts[0], m_packetID);
+
+			m_currentState = DETECTIONSTATE_TEST4_1;
+			return FALSE;
+		} else {
+			/*
+			** NAT32 uses different mangled source ports for different destination ports.
+			*/
+			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - relative port allocation, NAT32 right?"));
+			UnsignedInt addbehavior = 0;
+			addbehavior = (UnsignedInt)FIREWALL_TYPE_DESTINATION_PORT_DELTA;
+			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - adding DESTINATION PORT DELTA to behavior"));
+			addbehavior |= (UnsignedInt)m_behavior;
+			m_behavior = (FirewallBehaviorType) addbehavior;
+		}
+	} else {
+		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - We don't have smart mangling, skipping test 4, entering test 5"));
+	}
+
+	DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - entering test 5"));
+
+	m_currentState = DETECTIONSTATE_TEST5;
+	return FALSE;
+}
+
+
+
+Bool FirewallHelperClass::detectionTest4Stage1Update() {
+	m_mangledPorts[0] = getManglerResponse(m_packetID);
+
+	if (m_mangledPorts[0] == 0) {
+		if ((timeGetTime() - m_timeoutStart) > m_timeoutLength) {
+			closeSpareSocket(m_sparePorts[0]);
+			closeSpareSocket(m_sparePorts[1]);
+			m_currentState = DETECTIONSTATE_DONE;
+			DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage1Update - timed out waiting for mangler response, quitting"));
+			return TRUE;
+		}
+		return FALSE;
+	}
+
+	/*
+	** Send out to a different port at that IP.
+	** We won't get a response for this.
+	*/
+	UnsignedInt addr = m_manglers[0];
+	UnsignedShort port1 = m_sparePorts[0] + 1;
+	sendToManglerFromPort(addr, port1, m_packetID);
+	sendToManglerFromPort(addr, port1, m_packetID);
+	sendToManglerFromPort(addr, port1, m_packetID);
+
+	/*
+	** We can't get a response from a different destination port so the only way to detect
+	** this behavior is to check the next mangled port allocation to see if it's double
+	** what we would normally expect.
+	*/
+	m_packetID++;
+	m_timeoutStart = timeGetTime();
+	m_timeoutLength = 4000;
+
+	sendToManglerFromPort(m_manglers[0], m_sparePorts[1], m_packetID);
+
+	m_currentState = DETECTIONSTATE_TEST4_2;
+	return FALSE;
+}
+
+Bool FirewallHelperClass::detectionTest4Stage2Update() {
+	m_mangledPorts[1] = getManglerResponse(m_packetID);
+
+	if (m_mangledPorts[1] == 0) {
+		if ((timeGetTime() - m_timeoutStart) > m_timeoutLength) {
+			closeSpareSocket(m_sparePorts[0]);
+			closeSpareSocket(m_sparePorts[1]);
+			m_currentState = DETECTIONSTATE_DONE;
+			DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage2Update - timed out waiting for the second mangler response, quitting"));
+			return TRUE;
+		}
+		return FALSE;
+	}
+
+	if (m_mangledPorts[1] != m_mangledPorts[0] + m_sourcePortAllocationDelta) {
+		DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage2Update - NAT uses different source ports for different destination ports"));
+
+		UnsignedInt addbehavior = 0;
+		addbehavior = (UnsignedInt)FIREWALL_TYPE_DESTINATION_PORT_DELTA;
+		addbehavior |= (UnsignedInt)m_behavior;
+		m_behavior = (FirewallBehaviorType) addbehavior;
+	} else {
+		DEBUG_ASSERTCRASH(m_mangledPorts[1] == m_mangledPorts[0] + m_sourcePortAllocationDelta, ("Problem getting the source port deltas."));
+		if (m_mangledPorts[1] == m_mangledPorts[0] + m_sourcePortAllocationDelta) {
+			DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage2Update - NAT uses the same source port for different destination ports"));
+		} else {
+			DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage2Update - Unable to complete destination port mangling test"));
+			DEBUG_CRASH(("Unable to complete destination port mangling test"));
+		}
+	}
+
+	m_currentState = DETECTIONSTATE_TEST5;
+
+	return detectionTest5Update();
+}
+
+Bool FirewallHelperClass::detectionTest5Update() {
+	/*
+	** We have done all the tests we *have* to. There's other info that it would be nice to know though.
+	**
+	** Test for the netgear bug behavior.
+	*/
+#if (0)
+// moved to before test 1.  Moved because this flag could be specified for another firewall
+// for testing purposes and never get this far because it has behavior that doesn't require
+// all the tests to be performed.
+// BGC 10/1/02
+	DEBUG_LOG(("FirewallHelperClass::detectionTest5Update - Testing for Netgear bug"));
+
+	/*
+	** See if the user specified a netgear firewall - that will save us the trouble.
+	*/
+	if (TheGlobalData->m_firewallSendDelay) {
+		UnsignedInt addbehavior = FIREWALL_TYPE_NETGEAR_BUG;
+		addbehavior |= (UnsignedInt)m_behavior;
+		m_behavior = (FirewallBehaviorType) addbehavior;
+		DEBUG_LOG(("FirewallHelperClass::detectionTest5Update - Netgear bug specified by command line or SendDelay flag"));
+	} else {
+		DEBUG_LOG(("FirewallHelperClass::detectionTest5Update - Netgear bug not specified"));
+	}
+#endif // #if (0)
+
+	DEBUG_LOG_RAW(("FirewallHelperClass::detectionTest5Update - All done, behavior is: "));
+
+	if ((m_behavior & FIREWALL_TYPE_SIMPLE) != 0) {
+		DEBUG_LOG_RAW((" FIREWALL_TYPE_SIMPLE "));
+	}
+	if ((m_behavior & FIREWALL_TYPE_DUMB_MANGLING) != 0) {
+		DEBUG_LOG_RAW((" FIREWALL_TYPE_DUMB_MANGLING "));
+	}
+	if ((m_behavior & FIREWALL_TYPE_SMART_MANGLING) != 0) {
+		DEBUG_LOG_RAW((" FIREWALL_TYPE_SMART_MANGLING "));
+	}
+	if ((m_behavior & FIREWALL_TYPE_NETGEAR_BUG) != 0) {
+		DEBUG_LOG_RAW((" FIREWALL_TYPE_NETGEAR_BUG "));
+	}
+	if ((m_behavior & FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION) != 0) {
+		DEBUG_LOG_RAW((" FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION "));
+	}
+	if ((m_behavior & FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION) != 0) {
+		DEBUG_LOG_RAW((" FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION "));
+	}
+	if ((m_behavior & FIREWALL_TYPE_DESTINATION_PORT_DELTA) != 0) {
+		DEBUG_LOG_RAW((" FIREWALL_TYPE_DESTINATION_PORT_DELTA "));
+	}
+
+	DEBUG_LOG_RAW(("\n"));
+
+	m_currentState = DETECTIONSTATE_DONE;
+	return TRUE;
+}
+
+
+/***********************************************************************************************
+ * FHC::Get_NAT_Port_Allocation_Scheme -- Find out how a NAT is allocating ports               *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Number of ports we should analyze                                                 *
+ *           List of original port numbers                                                     *
+ *           List of mangled port numbers                                                      *
+ *           relative_delta (out) Is the delta relative to the original port number?           *
+ *           looks_good (out) Do all the values point to the same delta?                       *
+ *                                                                                             *
+ * OUTPUT:   Port allocation delta                                                             *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/15/01 4:45PM ST : Created                                                               *
+ *=============================================================================================*/
+Int FirewallHelperClass::getNATPortAllocationScheme(Int numPorts, UnsignedShort *originalPorts, UnsignedShort *mangledPorts, Bool &relativeDelta, Bool &looksGood)
+{
+	DEBUG_ASSERTCRASH(numPorts > 3, ("numPorts too small"));
+
+	DEBUG_LOG(("Looking for port allocation pattern in originalPorts %d, %d, %d, %d", originalPorts[0], originalPorts[1], originalPorts[2], originalPorts[3]));
+
+	/*
+	** Sort the mangled ports into order - should be easier to detect patterns.
+	** Stupid bubble sort will do. original_ports may be out of oder after the sort.
+	*/
+	for (Int x=0 ; x<numPorts ; x++) {
+		for (Int y=0 ; y<numPorts-1 ; y++) {
+			if (mangledPorts[y] > mangledPorts[y+1]) {
+				Int temp = mangledPorts[y];
+				mangledPorts[y] = mangledPorts[y+1];
+				mangledPorts[y+1] = temp;
+				temp = originalPorts[y];
+				originalPorts[y] = originalPorts[y+1];
+				originalPorts[y+1] = temp;
+			}
+		}
+	}
+
+	/*
+	** Now start looking for patterns in the port numbers. Possible patterns include.
+	**
+	** Incremental. Port numbers are allocated incrementally.
+	** Every 'n' ports. NAT adds 'n' port numbers when allocating ports.
+	**
+	** Also, schemes may be absolute or relative to the original port number.
+	*/
+
+	/*
+	** 1. Check for absolute sequential allocation.
+	*/
+	if (mangledPorts[1] - mangledPorts[0] == 1) {
+		if (mangledPorts[2] - mangledPorts[1] == 1) {
+			if (mangledPorts[3] - mangledPorts[2] == 1) {
+				DEBUG_LOG(("Incremental port allocation detected"));
+				relativeDelta = FALSE;
+				looksGood = TRUE;
+				return(1);
+			}
+		}
+	}
+
+	/*
+	** 2. Check for semi sequential.
+	*/
+	if (mangledPorts[1] - mangledPorts[0] == 2) {
+		if (mangledPorts[2] - mangledPorts[1] == 2) {
+			if (mangledPorts[3] - mangledPorts[2] == 2) {
+				DEBUG_LOG(("Semi-incremental port allocation detected"));
+				relativeDelta = FALSE;
+				looksGood = TRUE;
+				return(2);
+			}
+		}
+	}
+
+	Int diff1 = mangledPorts[1] - mangledPorts[0];
+	Int diff2 = mangledPorts[2] - mangledPorts[1];
+	Int diff3 = mangledPorts[3] - mangledPorts[2];
+
+
+	/*
+	** 3. Check for absolute scheme skipping 'n' ports.
+	*/
+	if (diff1 == diff2 && diff2 == diff3) {
+		DEBUG_LOG(("Looks good for absolute allocation sequence delta of %d", diff1));
+		relativeDelta = FALSE;
+		looksGood = TRUE;
+		return(diff1);
+	}
+
+	if (diff1 == diff2) {
+		DEBUG_LOG(("Probable absolute allocation sequence delta of %d", diff1));
+		relativeDelta = FALSE;
+		looksGood = FALSE;
+		return(diff1);
+	}
+
+	if (diff2 == diff3) {
+		DEBUG_LOG(("Probable absolute allocation sequence delta of %d", diff2));
+		relativeDelta = FALSE;
+		looksGood = FALSE;
+		return(diff2);
+	}
+
+
+
+
+	/*
+	** Insert more tests here if we can think of any!!!!!
+	*/
+
+
+
+	/*
+	** 4. Check for relative scheme skipping 'n' ports. NAT32 behaves this way, it skips 100 ports
+	** each time.
+	*/
+	for (Int i=0 ; i<numPorts ; i++) {
+		mangledPorts[i] -= originalPorts[i];
+	}
+
+	diff1 = mangledPorts[1] - mangledPorts[0];
+	diff2 = mangledPorts[2] - mangledPorts[1];
+	diff3 = mangledPorts[3] - mangledPorts[2];
+
+	/*
+	** Look for a linear pattern.
+	*/
+	if (diff1 == diff2 && diff2 == diff3) {
+		/*
+		** Return a -ve result to indicate that port mangling is relative.
+		*/
+		DEBUG_LOG(("Looks good for a relative port range delta of %d", diff1));
+		relativeDelta = TRUE;
+		looksGood = TRUE;
+		return(diff1);
+	}
+
+	/*
+	** Look for a broken pattern. Maybe the NAT skipped a whole range.
+	*/
+	if (diff1 == diff2 || diff1 == diff3) {
+		DEBUG_LOG(("Detected probable broken relative port range delta of %d", diff1));
+		relativeDelta = TRUE;
+		looksGood = FALSE;
+		return(diff1);
+	}
+
+	if (diff2 == diff3) {
+		DEBUG_LOG(("Detected probable broken relative port range delta of %d", diff2));
+		relativeDelta = TRUE;
+		looksGood = FALSE;
+		return(diff2);
+	}
+
+
+	/*
+	** Aw hell, I don't know what it is.
+	*/
+	looksGood = FALSE;
+	relativeDelta = FALSE;
+	return(0);
+}
+
+
+
+
+
+
+/***********************************************************************************************
+ * FHC::Get_Firewall_Hardness -- How hard is it to connect to this firewall                    *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Firewall behavior                                                                 *
+ *                                                                                             *
+ * OUTPUT:   Hardness                                                                          *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/16/01 11:43AM ST : Created                                                              *
+ *=============================================================================================*/
+Int FirewallHelperClass::getFirewallHardness(FirewallBehaviorType behavior)
+{
+
+	Int hardness = 0;
+
+
+	UnsignedInt fw = (UnsignedInt) behavior;
+
+	if (((UnsignedInt)FIREWALL_TYPE_SIMPLE & fw) != 0) {
+		hardness++;
+	}
+
+	if (((UnsignedInt)FIREWALL_TYPE_DUMB_MANGLING & fw) != 0) {
+		hardness += 2;
+	}
+
+	if (((UnsignedInt)FIREWALL_TYPE_SMART_MANGLING & fw) != 0) {
+		hardness += 3;
+	}
+
+	if (((UnsignedInt)FIREWALL_TYPE_NETGEAR_BUG & fw) != 0) {
+		hardness += 10;
+	}
+
+	if (((UnsignedInt)FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION & fw) != 0) {
+		hardness += 1;
+	}
+
+	if (((UnsignedInt)FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION & fw) != 0) {
+		hardness += 2;
+	}
+
+	return(hardness);
+}
+
+
+
+
+
+/***********************************************************************************************
+ * FHC::Get_Firewall_Retries -- How many retries is it likely to take before we connect?       *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Firewall behavior                                                                 *
+ *                                                                                             *
+ * OUTPUT:   Hardness                                                                          *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/16/01 11:43AM ST : Created                                                              *
+ *=============================================================================================*/
+Int FirewallHelperClass::getFirewallRetries(FirewallBehaviorType behavior)
+{
+
+	Int retries = 2;
+
+
+	UnsignedInt fw = (UnsignedInt) behavior;
+
+	if (((UnsignedInt)FIREWALL_TYPE_SIMPLE & fw) != 0) {
+		retries++;
+	}
+
+	if (((UnsignedInt)FIREWALL_TYPE_DUMB_MANGLING & fw) != 0) {
+		retries += 1;
+	}
+
+	if (((UnsignedInt)FIREWALL_TYPE_SMART_MANGLING & fw) != 0) {
+		retries += 1;
+	}
+
+	if (((UnsignedInt)FIREWALL_TYPE_NETGEAR_BUG & fw) != 0) {
+		//retries += 10;
+	}
+
+	if (((UnsignedInt)FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION & fw) != 0) {
+		//retries += 1;
+	}
+
+	if (((UnsignedInt)FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION & fw) != 0) {
+		retries += 5;
+	}
+
+	return(retries);
+}
+
+
+
+/*
+ *  openSpareSocket - opens a socket for communication on a specified port.
+ *  returns TRUE if successful, FALSE otherwise.
+ */
+Bool FirewallHelperClass::openSpareSocket(UnsignedShort port) {
+	Int i = 0;
+	for (; i < MAX_SPARE_SOCKETS; ++i) {
+		if (m_spareSockets[i].port == 0) {
+			break;
+		}
+	}
+
+	// don't have room for any more spare sockets.  Fail.
+	if (i == MAX_SPARE_SOCKETS) {
+		DEBUG_ASSERTCRASH(i < MAX_SPARE_SOCKETS, ("Ran out of spare sockets."));
+		return FALSE;
+	}
+
+	m_spareSockets[i].udp = NEW UDP();
+	if (m_spareSockets[i].udp == NULL) {
+		DEBUG_LOG(("FirewallHelperClass::openSpareSocket - failed to create UDP object"));
+		return FALSE;
+	}
+
+	if (m_spareSockets[i].udp->Bind((UnsignedInt)0, port) != 0) {
+		DEBUG_CRASH(("FirewallHelperClass::openSpareSocket - Failed to init spare socket"));
+		return FALSE;
+	}
+
+	m_spareSockets[i].port = port;
+	DEBUG_LOG(("FirewallHelperClass::openSpareSocket - port %d is open for send", port));
+	return TRUE;
+}
+
+/*
+ *  closeSpareSocket - closes a socket at a specific port.
+ */
+void FirewallHelperClass::closeSpareSocket(UnsignedShort port) {
+	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
+		if (m_spareSockets[i].port == port) {
+			delete m_spareSockets[i].udp;
+			m_spareSockets[i].udp = NULL;
+			m_spareSockets[i].port = 0;
+			break;
+		}
+	}
+}
+
+/*
+ *  closeAllSpareSockets - closes all spare sockets, duh.
+ */
+void FirewallHelperClass::closeAllSpareSockets() {
+	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
+		delete (m_spareSockets[i].udp);
+		m_spareSockets[i].udp = NULL;
+		m_spareSockets[i].port = 0;
+	}
+}
diff --git a/Core/GameEngine/Source/GameNetwork/FrameData.cpp b/Core/GameEngine/Source/GameNetwork/FrameData.cpp
new file mode 100644
index 00000000000..da5fef6e767
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/FrameData.cpp
@@ -0,0 +1,200 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/FrameData.h"
+#include "GameNetwork/networkutil.h"
+
+/**
+ * Constructor
+ */
+FrameData::FrameData()
+{
+	m_frame = 0;
+	m_commandList = NULL;
+	m_commandCount = 0;
+	m_frameCommandCount = -1;
+	m_lastFailedCC = 0;
+	m_lastFailedFrameCC = 0;
+}
+
+/**
+ * Destructor
+ */
+FrameData::~FrameData()
+{
+	deleteInstance(m_commandList);
+	m_commandList = NULL;
+}
+
+/**
+ * Initialize this thing.
+ */
+void FrameData::init()
+{
+	m_frame = 0;
+	if (m_commandList == NULL) {
+		m_commandList = newInstance(NetCommandList);
+		m_commandList->init();
+	}
+	m_commandList->reset();
+
+	m_frameCommandCount = -1;
+	//DEBUG_LOG(("FrameData::init"));
+	m_commandCount = 0;
+	m_lastFailedCC = -2;
+	m_lastFailedFrameCC = -2;
+}
+
+/**
+ * Reset this thing.
+ */
+void FrameData::reset() {
+	init();
+}
+
+/**
+ * update the thing, doesn't do anything at the moment.
+ */
+void FrameData::update() {
+}
+
+/**
+ * return the frame number this frame data is associated with.
+ */
+UnsignedInt FrameData::getFrame() {
+	return m_frame;
+}
+
+/**
+ * Assign the frame number this frame data is associated with.
+ */
+void FrameData::setFrame(UnsignedInt frame) {
+	m_frame = frame;
+}
+
+/**
+ * Returns true if all the frame command count is equal to the number of commands that have been received.
+ */
+FrameDataReturnType FrameData::allCommandsReady(Bool debugSpewage) {
+	if (m_frameCommandCount == m_commandCount) {
+		m_lastFailedFrameCC = -2;
+		m_lastFailedCC = -2;
+		return FRAMEDATA_READY;
+	}
+
+	if (debugSpewage) {
+		if ((m_lastFailedFrameCC != m_frameCommandCount) || (m_lastFailedCC != m_commandCount)) {
+			DEBUG_LOG(("FrameData::allCommandsReady - failed, frame command count = %d, command count = %d", m_frameCommandCount, m_commandCount));
+			m_lastFailedFrameCC = m_frameCommandCount;
+			m_lastFailedCC = m_commandCount;
+		}
+	}
+
+	if (m_commandCount > m_frameCommandCount) {
+		DEBUG_LOG(("FrameData::allCommandsReady - There are more commands than there should be (%d, should be %d).  Commands in command list are...", m_commandCount, m_frameCommandCount));
+		NetCommandRef *ref = m_commandList->getFirstMessage();
+		while (ref != NULL) {
+			DEBUG_LOG(("%s, frame = %d, id = %d", GetNetCommandTypeAsString(ref->getCommand()->getNetCommandType()), ref->getCommand()->getExecutionFrame(), ref->getCommand()->getID()));
+			ref = ref->getNext();
+		}
+		DEBUG_LOG(("FrameData::allCommandsReady - End of command list."));
+		DEBUG_LOG(("FrameData::allCommandsReady - about to clear the command list"));
+		reset();
+		DEBUG_LOG(("FrameData::allCommandsReady - command list cleared. command list length = %d, command count = %d, frame command count = %d", m_commandList->length(), m_commandCount, m_frameCommandCount));
+		return FRAMEDATA_RESEND;
+	}
+	return FRAMEDATA_NOTREADY;
+}
+
+/**
+ * Set the command count for this frame
+ */
+void FrameData::setFrameCommandCount(UnsignedInt frameCommandCount) {
+	//DEBUG_LOG(("setFrameCommandCount to %d for frame %d", frameCommandCount, m_frame));
+	m_frameCommandCount = frameCommandCount;
+}
+
+/**
+ * Get the command count for this frame.
+ */
+UnsignedInt FrameData::getFrameCommandCount() {
+	return m_frameCommandCount;
+}
+
+/**
+ * return the number of commands received so far.
+ */
+UnsignedInt FrameData::getCommandCount() {
+	return m_commandCount;
+}
+
+/**
+ * Add a command to this frame
+ */
+void FrameData::addCommand(NetCommandMsg *msg) {
+	// need to add the message in order of command ID
+	if (m_commandList == NULL) {
+		init();
+	}
+
+	// We don't need to worry about setting the relay since its not getting sent anywhere.
+	if (m_commandList->findMessage(msg) != NULL) {
+		// We don't want to add the same command twice.
+		return;
+	}
+	m_commandList->addMessage(msg);
+
+	++m_commandCount;
+	//DEBUG_LOG(("added command %d, type = %d(%s), command count = %d, frame command count = %d", msg->getID(), msg->getNetCommandType(), GetNetCommandTypeAsString(msg->getNetCommandType()), m_commandCount, m_frameCommandCount));
+}
+
+/**
+ * Return the list of commands for this frame
+ */
+NetCommandList * FrameData::getCommandList() {
+	return m_commandList;
+}
+
+/**
+ * Set both the command count and the frame command count to 0.
+ */
+void FrameData::zeroFrame() {
+	m_commandCount = 0;
+	m_frameCommandCount = 0;
+}
+
+/**
+ * destroy all the commands in this frame.
+ */
+void FrameData::destroyGameMessages() {
+	if (m_commandList == NULL) {
+		return;
+	}
+
+	m_commandList->reset();
+	m_commandCount = 0;
+}
diff --git a/Core/GameEngine/Source/GameNetwork/FrameDataManager.cpp b/Core/GameEngine/Source/GameNetwork/FrameDataManager.cpp
new file mode 100644
index 00000000000..0bc84f74bec
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/FrameDataManager.cpp
@@ -0,0 +1,203 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/FrameDataManager.h"
+#include "GameNetwork/networkutil.h"
+
+/**
+ * Constructor.  isLocal tells it whether its the frame data manager for the local player or not.
+ */
+FrameDataManager::FrameDataManager(Bool isLocal) {
+	m_isLocal = isLocal;
+
+	m_frameData = NEW FrameData[FRAME_DATA_LENGTH];
+
+	m_isQuitting = FALSE;
+	m_quitFrame = 0;
+}
+
+/**
+ * destructor.
+ */
+FrameDataManager::~FrameDataManager() {
+	for (Int i = 0; i < FRAME_DATA_LENGTH; ++i) {
+		m_frameData[i].reset();
+	}
+	delete[] m_frameData;
+	m_frameData = NULL;
+}
+
+/**
+ * Initialize all of the frame datas associated with this manager.
+ */
+void FrameDataManager::init() {
+	for (Int i = 0; i < FRAME_DATA_LENGTH; ++i) {
+		m_frameData[i].init();
+		if (m_isLocal) {
+			// If this is the local connection, adjust the frame command count.
+			m_frameData[i].setFrameCommandCount(m_frameData[i].getCommandCount());
+		}
+	}
+
+	m_isQuitting = FALSE;
+	m_quitFrame = 0;
+}
+
+/**
+ * Reset the state of all the frames.
+ */
+void FrameDataManager::reset() {
+	init();
+}
+
+/**
+ * update function. Does nothing at this time.
+ */
+void FrameDataManager::update() {
+}
+
+/**
+ * Add a network command to the appropriate frame.
+ */
+void FrameDataManager::addNetCommandMsg(NetCommandMsg *msg) {
+	UnsignedInt frame = msg->getExecutionFrame();
+	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("FrameDataManager::addNetCommandMsg - about to add a command of type %s for frame %d, frame index %d", GetNetCommandTypeAsString(msg->getNetCommandType()), frame, frameindex));
+	m_frameData[frameindex].addCommand(msg);
+
+	if (m_isLocal) {
+		// If this is the local connection, adjust the frame command count.
+		m_frameData[frameindex].setFrameCommandCount(m_frameData[frameindex].getCommandCount());
+	}
+}
+
+/**
+ * Returns true if all the commands for the given frame are ready.
+ */
+FrameDataReturnType FrameDataManager::allCommandsReady(UnsignedInt frame, Bool debugSpewage) {
+	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
+	//DEBUG_ASSERTCRASH(m_frameData[frameindex].getFrame() == frame || frame == 256, ("Looking at old commands!"));
+	return m_frameData[frameindex].allCommandsReady(debugSpewage);
+}
+
+/**
+ * Returns the command list for the given frame.
+ */
+NetCommandList * FrameDataManager::getFrameCommandList(UnsignedInt frame) {
+	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
+	return m_frameData[frameindex].getCommandList();
+}
+
+/**
+ * Reset the contents of the given frame.
+ */
+void FrameDataManager::resetFrame(UnsignedInt frame, Bool isAdvancing) {
+	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
+
+	m_frameData[frameindex].reset();
+
+	if (isAdvancing) {
+		m_frameData[frameindex].setFrame(frame + MAX_FRAMES_AHEAD);
+	}
+
+	if (m_isLocal) {
+		m_frameData[frameindex].setFrameCommandCount(m_frameData[frameindex].getCommandCount());
+	}
+
+	DEBUG_ASSERTCRASH(m_frameData[frameindex].getCommandCount() == 0, ("we just reset the frame data and the command count is not zero, huh?"));
+}
+
+/**
+ * Returns the command count for the given frame.
+ */
+UnsignedInt FrameDataManager::getCommandCount(UnsignedInt frame) {
+	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
+
+	return m_frameData[frameindex].getCommandCount();
+}
+
+/**
+ * Set the frame command count for the given frame.
+ */
+void FrameDataManager::setFrameCommandCount(UnsignedInt frame, UnsignedInt commandCount) {
+	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
+
+	m_frameData[frameindex].setFrameCommandCount(commandCount);
+}
+
+/**
+ *
+ */
+UnsignedInt FrameDataManager::getFrameCommandCount(UnsignedInt frame) {
+	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
+
+	return m_frameData[frameindex].getFrameCommandCount();
+}
+
+/**
+ * Set both the command count and the frame command count to 0 for the given frames.
+ */
+void FrameDataManager::zeroFrames(UnsignedInt startingFrame, UnsignedInt numFrames) {
+	UnsignedInt frameIndex = startingFrame % FRAME_DATA_LENGTH;
+	for (UnsignedInt i = 0; i < numFrames; ++i) {
+		//DEBUG_LOG(("Calling zeroFrame for frame index %d", frameIndex));
+		m_frameData[frameIndex].zeroFrame();
+		++frameIndex;
+		frameIndex = frameIndex % FRAME_DATA_LENGTH;
+	}
+}
+
+/**
+ * Destroy all the commands held by this object.
+ */
+void FrameDataManager::destroyGameMessages() {
+	for (Int i = 0; i < FRAME_DATA_LENGTH; ++i) {
+		m_frameData[i].destroyGameMessages();
+	}
+}
+
+/**
+ * Sets the quit frame, also sets the isQuitting flag.
+ */
+void FrameDataManager::setQuitFrame(UnsignedInt frame) {
+	m_isQuitting = TRUE;
+	m_quitFrame = frame;
+}
+
+/**
+ * returns the quit frame.
+ */
+UnsignedInt FrameDataManager::getQuitFrame() {
+	return m_quitFrame;
+}
+
+/**
+ * returns true if this frame data manager is quitting.
+ */
+Bool FrameDataManager::getIsQuitting() {
+	return m_isQuitting;
+}
diff --git a/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp b/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp
new file mode 100644
index 00000000000..a9a9aca66e5
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp
@@ -0,0 +1,138 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+/** FrameMetrics.cpp */
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/FrameMetrics.h"
+#include "GameClient/Display.h"
+#include "GameNetwork/networkutil.h"
+
+FrameMetrics::FrameMetrics()
+{
+	m_averageFps = 0.0f;
+	m_averageLatency = 0.0f;
+	m_cushionIndex = 0;
+	m_fpsListIndex = 0;
+	m_lastFpsTimeThing = 0;
+	m_minimumCushion = 0;
+
+	m_pendingLatencies = NEW time_t[MAX_FRAMES_AHEAD];
+	for(Int i = 0; i < MAX_FRAMES_AHEAD; i++)
+		m_pendingLatencies[i] = 0;
+	m_fpsList = NEW Real[TheGlobalData->m_networkFPSHistoryLength];
+	m_latencyList = NEW Real[TheGlobalData->m_networkLatencyHistoryLength];
+}
+
+FrameMetrics::~FrameMetrics() {
+	delete m_fpsList;
+	m_fpsList = NULL;
+
+	delete m_latencyList;
+	m_latencyList = NULL;
+
+	delete[] m_pendingLatencies;
+	m_pendingLatencies = NULL;
+}
+
+void FrameMetrics::init() {
+	m_averageFps = 30;
+	m_averageLatency = (Real)0.2;
+	m_minimumCushion = -1;
+
+	UnsignedInt i = 0;
+	for (; i < TheGlobalData->m_networkFPSHistoryLength; ++i) {
+		m_fpsList[i] = 30.0;
+	}
+	m_fpsListIndex = 0;
+	for (i = 0; i < TheGlobalData->m_networkLatencyHistoryLength; ++i) {
+		m_latencyList[i] = (Real)0.2;
+	}
+	m_cushionIndex = 0;
+}
+
+void FrameMetrics::reset() {
+	init();
+}
+
+void FrameMetrics::doPerFrameMetrics(UnsignedInt frame) {
+	// Do the measurement of the fps.
+	time_t curTime = timeGetTime();
+	if ((curTime - m_lastFpsTimeThing) >= 1000) {
+//		if ((m_fpsListIndex % 16) == 0) {
+//			DEBUG_LOG(("FrameMetrics::doPerFrameMetrics - adding %f to fps history. average before: %f ", m_fpsList[m_fpsListIndex], m_averageFps));
+//		}
+		m_averageFps -= ((m_fpsList[m_fpsListIndex])) / TheGlobalData->m_networkFPSHistoryLength; // subtract out the old value from the average.
+		m_fpsList[m_fpsListIndex] = TheDisplay->getAverageFPS();
+//		m_fpsList[m_fpsListIndex] = TheGameClient->getFrame() - m_fpsStartingFrame;
+		m_averageFps += ((Real)(m_fpsList[m_fpsListIndex])) / TheGlobalData->m_networkFPSHistoryLength; // add the new value to the average.
+//		DEBUG_LOG(("average after: %f", m_averageFps));
+		++m_fpsListIndex;
+		m_fpsListIndex %= TheGlobalData->m_networkFPSHistoryLength;
+		m_lastFpsTimeThing = curTime;
+	}
+
+	Int pendingLatenciesIndex = frame % MAX_FRAMES_AHEAD;
+	m_pendingLatencies[pendingLatenciesIndex] = curTime;
+
+}
+
+void FrameMetrics::processLatencyResponse(UnsignedInt frame) {
+	time_t curTime = timeGetTime();
+	Int pendingIndex = frame % MAX_FRAMES_AHEAD;
+	time_t timeDiff = curTime - m_pendingLatencies[pendingIndex];
+
+	Int latencyListIndex = frame % TheGlobalData->m_networkLatencyHistoryLength;
+	m_averageLatency -= m_latencyList[latencyListIndex] / TheGlobalData->m_networkLatencyHistoryLength;
+	m_latencyList[latencyListIndex] = (Real)timeDiff / (Real)1000; // convert to seconds from milliseconds.
+	m_averageLatency += m_latencyList[latencyListIndex] / TheGlobalData->m_networkLatencyHistoryLength;
+
+	if (frame % 16 == 0) {
+//		DEBUG_LOG(("ConnectionManager::processFrameInfoAck - average latency = %f", m_averageLatency));
+	}
+}
+
+void FrameMetrics::addCushion(Int cushion) {
+	++m_cushionIndex;
+	m_cushionIndex %= TheGlobalData->m_networkCushionHistoryLength;
+	if (m_cushionIndex == 0) {
+		m_minimumCushion = -1;
+	}
+	if ((cushion < m_minimumCushion) || (m_minimumCushion == -1)) {
+		m_minimumCushion = cushion;
+	}
+}
+
+Int FrameMetrics::getAverageFPS() {
+	return (Int)m_averageFps;
+}
+
+Real FrameMetrics::getAverageLatency() {
+	return m_averageLatency;
+}
+
+Int FrameMetrics::getMinimumCushion() {
+	return m_minimumCushion;
+}
diff --git a/Core/GameEngine/Source/GameNetwork/GameInfo.cpp b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp
new file mode 100644
index 00000000000..6b3298d6ef3
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp
@@ -0,0 +1,1645 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: GameInfo.cpp //////////////////////////////////////////////////////
+// game setup state info
+// Author: Matthew D. Campbell, December 2001
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/CRCDebug.h"
+#include "Common/file.h"
+#include "Common/FileSystem.h"
+#include "Common/GameState.h"
+#include "GameClient/GameText.h"
+#include "GameClient/MapUtil.h"
+#include "Common/MultiplayerSettings.h"
+#include "Common/PlayerTemplate.h"
+#include "Common/Xfer.h"
+#include "GameNetwork/FileTransfer.h"
+#include "GameNetwork/GameInfo.h"
+#include "GameNetwork/GameSpy/ThreadUtils.h"
+#include "GameNetwork/GameSpy/StagingRoomGameInfo.h"
+#include "GameNetwork/LANAPI.h"						// for testing packet size
+#include "GameNetwork/LANAPICallbacks.h"	// for testing packet size
+#include "strtok_r.h"
+
+
+
+GameInfo *TheGameInfo = NULL;
+
+// GameSlot ----------------------------------------
+
+GameSlot::GameSlot()
+{
+	reset();
+}
+
+void GameSlot::reset()
+{
+	m_state = SLOT_CLOSED; // decent default
+	m_isAccepted = false;
+	m_hasMap = true;
+	m_color = -1;
+	m_startPos = -1;
+	m_playerTemplate = -1;
+	m_teamNumber = -1;
+	m_NATBehavior = FirewallHelperClass::FIREWALL_TYPE_SIMPLE;
+	m_lastFrameInGame = 0;
+	m_disconnected = FALSE;
+	m_port = 0;
+	m_isMuted = FALSE;
+	m_origPlayerTemplate = -1;
+	m_origStartPos = -1;
+	m_origColor = -1;
+}
+
+void GameSlot::saveOffOriginalInfo( void )
+{
+	DEBUG_LOG(("GameSlot::saveOffOriginalInfo() - orig was color=%d, pos=%d, house=%d",
+		m_origColor, m_origStartPos, m_origPlayerTemplate));
+	m_origPlayerTemplate = m_playerTemplate;
+	m_origStartPos = m_startPos;
+	m_origColor = m_color;
+	DEBUG_LOG(("GameSlot::saveOffOriginalInfo() - color=%d, pos=%d, house=%d",
+		m_color, m_startPos, m_playerTemplate));
+}
+
+static Int getSlotIndex(const GameSlot *slot)
+{
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		if (TheGameInfo->getConstSlot(i) == slot)
+			return i;
+	}
+	return -1;
+}
+
+static Bool isSlotLocalAlly(const GameSlot *slot)
+{
+	Int slotIndex = getSlotIndex(slot);
+	Int localIndex = TheGameInfo->getLocalSlotNum();
+	const GameSlot *localSlot = TheGameInfo->getConstSlot(localIndex);
+
+	// if either doesn't exist, not an ally
+	if (slotIndex < 0 || localIndex < 0)
+		return FALSE;
+
+	// if slot is us, ally
+	if (slotIndex == localIndex)
+		return TRUE;
+
+	// if slot is same team as us, ally
+	if (slot->getTeamNumber() == localSlot->getTeamNumber() && slot->getTeamNumber() >= 0)
+		return TRUE;
+
+	// if we're an observer, we see all
+	if (localSlot->getOriginalPlayerTemplate() == PLAYERTEMPLATE_OBSERVER)
+		return TRUE;
+
+	// nope
+	return FALSE;
+}
+
+UnicodeString GameSlot::getApparentPlayerTemplateDisplayName( void ) const
+{
+	if (TheMultiplayerSettings && TheMultiplayerSettings->showRandomPlayerTemplate() &&
+		m_origPlayerTemplate == PLAYERTEMPLATE_RANDOM && !isSlotLocalAlly(this))
+	{
+		return TheGameText->fetch("GUI:Random");
+	}
+	else if (m_origPlayerTemplate == PLAYERTEMPLATE_OBSERVER)
+	{
+		return TheGameText->fetch("GUI:Observer");
+	}
+	DEBUG_LOG(("Fetching player template display name for player template %d (orig is %d)",
+		m_playerTemplate, m_origPlayerTemplate));
+	if (m_playerTemplate < 0)
+	{
+		return TheGameText->fetch("GUI:Random");
+	}
+	return ThePlayerTemplateStore->getNthPlayerTemplate(m_playerTemplate)->getDisplayName();
+}
+
+Int GameSlot::getApparentPlayerTemplate( void ) const
+{
+	if (TheMultiplayerSettings && TheMultiplayerSettings->showRandomPlayerTemplate() &&
+		!isSlotLocalAlly(this))
+	{
+		return m_origPlayerTemplate;
+	}
+	return m_playerTemplate;
+}
+
+Int GameSlot::getApparentColor( void ) const
+{
+	if (TheMultiplayerSettings && m_origPlayerTemplate == PLAYERTEMPLATE_OBSERVER)
+		return TheMultiplayerSettings->getColor(PLAYERTEMPLATE_OBSERVER)->getColor();
+
+	if (TheMultiplayerSettings && TheMultiplayerSettings->showRandomColor() &&
+		!isSlotLocalAlly(this))
+	{
+		return m_origColor;
+	}
+	return m_color;
+}
+
+Int GameSlot::getApparentStartPos( void ) const
+{
+	if (TheMultiplayerSettings && TheMultiplayerSettings->showRandomStartPos() &&
+		!isSlotLocalAlly(this))
+	{
+		return m_origStartPos;
+	}
+	return m_startPos;
+}
+
+
+void GameSlot::unAccept( void )
+{
+	if (isHuman())
+	{
+		m_isAccepted = false;
+	}
+}
+
+void GameSlot::setMapAvailability( Bool hasMap )
+{
+	if (isHuman())
+	{
+		m_hasMap = hasMap;
+	}
+}
+
+void GameSlot::setState( SlotState state, UnicodeString name, UnsignedInt IP )
+{
+	if (!(isAI() &&  (state == SLOT_EASY_AI || state == SLOT_MED_AI || state == SLOT_BRUTAL_AI)))
+	{
+		m_color = -1;
+		m_startPos = -1;
+		m_playerTemplate = -1;
+		m_teamNumber = -1;
+
+		if (state == SLOT_OPEN && TheGameSpyGame && TheGameSpyGame->getConstSlot(0) == this)
+		{
+			DEBUG_CRASH(("Game Is Hosed!"));
+		}
+	}
+	if (state == SLOT_PLAYER)
+	{
+		reset();
+		m_state = state;
+		m_name = name;
+	}
+	else
+	{
+		m_state = state;
+		m_isAccepted = true;
+		m_hasMap = true;
+		switch(state)
+		{
+		case SLOT_OPEN:
+			m_name = TheGameText->fetch("GUI:Open");
+			break;
+		case SLOT_EASY_AI:
+			m_name = TheGameText->fetch("GUI:EasyAI");
+			break;
+		case SLOT_MED_AI:
+			m_name = TheGameText->fetch("GUI:MediumAI");
+			break;
+		case SLOT_BRUTAL_AI:
+			m_name = TheGameText->fetch("GUI:HardAI");
+			break;
+		case SLOT_CLOSED:
+		default:
+			m_name = TheGameText->fetch("GUI:Closed");
+			break;
+		}
+	}
+
+	m_IP = IP;
+}
+
+// Various tests
+Bool GameSlot::isHuman( void ) const
+{
+	return m_state == SLOT_PLAYER;
+}
+
+Bool GameSlot::isOccupied( void ) const
+{
+	return m_state == SLOT_PLAYER || m_state == SLOT_EASY_AI || m_state == SLOT_MED_AI || m_state == SLOT_BRUTAL_AI;
+}
+
+Bool GameSlot::isAI( void ) const
+{
+	return m_state == SLOT_EASY_AI || m_state == SLOT_MED_AI || m_state == SLOT_BRUTAL_AI;
+}
+
+Bool GameSlot::isPlayer( AsciiString userName ) const
+{
+	UnicodeString uName;
+	uName.translate(userName);
+	return (m_state == SLOT_PLAYER && !m_name.compareNoCase(uName));
+}
+
+Bool GameSlot::isPlayer( UnicodeString userName ) const
+{
+	return (m_state == SLOT_PLAYER && !m_name.compareNoCase(userName));
+}
+
+Bool GameSlot::isPlayer( UnsignedInt ip ) const
+{
+	return (m_state == SLOT_PLAYER && m_IP == ip);
+}
+
+Bool GameSlot::isOpen( void ) const
+{
+	return m_state == SLOT_OPEN;
+}
+
+// GameInfo ----------------------------------------
+
+GameInfo::GameInfo()
+{
+	for (int i=0; i<MAX_SLOTS; ++i)
+	{
+		m_slot[i] = NULL;
+	}
+	reset();
+}
+
+void GameInfo::init( void )
+{
+	reset();
+}
+
+void GameInfo::reset( void )
+{
+	m_crcInterval = NET_CRC_INTERVAL;
+	m_inGame = false;
+	m_inProgress = false;
+	m_gameID = 0;
+	m_mapName = "NOMAP";
+	m_mapMask = 0;
+	m_seed = GetTickCount(); //GameClientRandomValue(0, INT_MAX - 1);
+	m_useStats = TRUE;
+	m_surrendered = FALSE;
+  m_oldFactionsOnly = FALSE;
+//	m_localIP = 0; // BGC - actually we don't want this to be reset since the m_localIP is
+										// set properly in the constructor of LANGameInfo which uses this as a base class.
+	m_mapCRC = 0;
+	m_mapSize = 0;
+  m_superweaponRestriction = 0;
+  m_startingCash = TheGlobalData->m_defaultStartingCash;
+
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		if (m_slot[i])
+			m_slot[i]->reset();
+	}
+
+	m_preorderMask = 0;
+}
+
+Bool GameInfo::isPlayerPreorder(Int index)
+{
+	if (index >= 0 && index < MAX_SLOTS)
+		return ((m_preorderMask & (1 << index)) != 0);
+	return FALSE;
+}
+
+void GameInfo::markPlayerAsPreorder(Int index)
+{
+	if (index >= 0 && index < MAX_SLOTS)
+		m_preorderMask |= 1 << index;
+}
+
+
+void GameInfo::clearSlotList( void )
+{
+	for (int i=0; i<MAX_SLOTS; ++i)
+	{
+		if (m_slot[i])
+			m_slot[i]->setState(SLOT_CLOSED);
+	}
+}
+
+Int GameInfo::getNumPlayers( void ) const
+{
+	Int numPlayers = 0;
+	for (int i=0; i<MAX_SLOTS; ++i)
+	{
+		if (m_slot[i] && m_slot[i]->isOccupied())
+			numPlayers++;
+	}
+	return numPlayers;
+}
+
+Int GameInfo::getNumNonObserverPlayers( void ) const
+{
+	Int numPlayers = 0;
+	for (int i=0; i<MAX_SLOTS; ++i)
+	{
+		if (m_slot[i] && m_slot[i]->isOccupied() && m_slot[i]->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
+			numPlayers++;
+	}
+	return numPlayers;
+}
+
+Int GameInfo::getMaxPlayers( void ) const
+{
+	if (!TheMapCache)
+		return -1;
+
+	AsciiString lowerMap = m_mapName;
+	lowerMap.toLower();
+	MapCache::iterator it = TheMapCache->find(lowerMap);
+	if (it == TheMapCache->end())
+		return -1;
+	MapMetaData data = it->second;
+	return data.m_numPlayers;
+}
+
+void GameInfo::enterGame( void )
+{
+	DEBUG_ASSERTCRASH(!m_inGame && !m_inProgress, ("Entering game at a bad time!"));
+	reset();
+	m_inGame = true;
+	m_inProgress = false;
+}
+
+void GameInfo::leaveGame( void )
+{
+	DEBUG_ASSERTCRASH(m_inGame && !m_inProgress, ("Leaving game at a bad time!"));
+	reset();
+}
+
+void GameInfo::startGame( Int gameID )
+{
+	DEBUG_ASSERTCRASH(m_inGame && !m_inProgress, ("Starting game at a bad time!"));
+	m_gameID = gameID;
+	closeOpenSlots();
+	m_inProgress = true;
+}
+
+void GameInfo::endGame( void )
+{
+	DEBUG_ASSERTCRASH(m_inGame && m_inProgress, ("Ending game without playing one!"));
+	m_inGame = false;
+	m_inProgress = false;
+}
+
+void GameInfo::setSlot( Int slotNum, GameSlot slotInfo )
+{
+	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("GameInfo::setSlot - Invalid slot number"));
+	if (slotNum < 0 || slotNum >= MAX_SLOTS)
+		return;
+
+	DEBUG_ASSERTCRASH( m_slot[slotNum], ("NULL slot pointer"));
+	if (!m_slot[slotNum])
+		return;
+
+//	Bool isHuman = slotInfo.isHuman();
+//	Bool wasHuman = m_slot[slotNum]->isHuman();
+
+	if (slotNum == 0)
+	{
+		slotInfo.setAccept();
+		slotInfo.setMapAvailability(true);
+	}
+	*m_slot[slotNum] = slotInfo;
+
+#ifdef DEBUG_LOGGING
+	UnsignedInt ip = slotInfo.getIP();
+#endif
+
+	DEBUG_LOG(("GameInfo::setSlot - setting slot %d to be player %ls with IP %d.%d.%d.%d", slotNum, slotInfo.getName().str(),
+							PRINTF_IP_AS_4_INTS(ip)));
+}
+
+GameSlot* GameInfo::getSlot( Int slotNum )
+{
+	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("GameInfo::getSlot - Invalid slot number"));
+	if (slotNum < 0 || slotNum >= MAX_SLOTS)
+		return NULL;
+
+	DEBUG_ASSERTCRASH( m_slot[slotNum], ("NULL slot pointer") );
+	return m_slot[slotNum];
+}
+
+const GameSlot* GameInfo::getConstSlot( Int slotNum ) const
+{
+	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("GameInfo::getSlot - Invalid slot number"));
+	if (slotNum < 0 || slotNum >= MAX_SLOTS)
+		return NULL;
+
+	DEBUG_ASSERTCRASH( m_slot[slotNum], ("NULL slot pointer") );
+	return m_slot[slotNum];
+}
+
+Int GameInfo::getLocalSlotNum( void ) const
+{
+	DEBUG_ASSERTCRASH(m_inGame, ("Looking for local game slot while not in game"));
+	if (!m_inGame)
+		return -1;
+
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		const GameSlot *slot = getConstSlot(i);
+		if (slot == NULL) {
+			continue;
+		}
+		if (slot->isPlayer(m_localIP))
+			return i;
+	}
+	return -1;
+}
+
+Int GameInfo::getSlotNum( AsciiString userName ) const
+{
+	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
+	if (!m_inGame)
+		return -1;
+
+	UnicodeString uName;
+	uName.translate(userName);
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		const GameSlot *slot = getConstSlot(i);
+		if (slot->isPlayer( uName ))
+			return i;
+	}
+	return -1;
+}
+
+Bool GameInfo::amIHost( void ) const
+{
+	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
+	if (!m_inGame)
+		return false;
+
+	return getConstSlot(0)->isPlayer(m_localIP);
+}
+
+void GameInfo::setMap( AsciiString mapName )
+{
+	m_mapName = mapName;
+	if (m_inGame && amIHost())
+	{
+		const MapMetaData *mapData = TheMapCache->findMap( mapName );
+		if (mapData)
+		{
+			m_mapMask = 1;
+			AsciiString path = mapName;
+			path.truncateBy(3);
+			path.concat("tga");
+			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'", path.str()));
+			File *fp = TheFileSystem->openFile(path.str());
+			if (fp)
+			{
+				m_mapMask |= 2;
+				fp->close();
+				fp = NULL;
+			}
+
+			AsciiString newMapName;
+			if (!mapName.isEmpty())
+			{
+				AsciiString token;
+				mapName.nextToken(&token, "\\/");
+				// add all the tokens except the last one.
+				// that way we don't add the filename, just the
+				// directory name, we can do this since the filename
+				// is just the directory name with the file extention
+				// added onto it.
+				while (mapName.find('\\') != NULL)
+				{
+					if (!newMapName.isEmpty())
+					{
+						newMapName.concat('/');
+					}
+					newMapName.concat(token);
+					mapName.nextToken(&token, "\\/");
+				}
+			}
+			newMapName.concat("/map.ini");
+			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'", newMapName.str()));
+			fp = TheFileSystem->openFile(newMapName.str());
+			if (fp)
+			{
+				m_mapMask |= 4;
+				fp->close();
+				fp = NULL;
+			}
+
+			path = GetStrFileFromMap(m_mapName);
+			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'", path.str()));
+			fp = TheFileSystem->openFile(path.str());
+			if (fp)
+			{
+				m_mapMask |= 8;
+				fp->close();
+				fp = NULL;
+			}
+
+			path = GetSoloINIFromMap(m_mapName);
+			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'", path.str()));
+			fp = TheFileSystem->openFile(path.str());
+			if (fp)
+			{
+				m_mapMask |= 16;
+				fp->close();
+				fp = NULL;
+			}
+
+			path = GetAssetUsageFromMap(m_mapName);
+			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'", path.str()));
+			fp = TheFileSystem->openFile(path.str());
+			if (fp)
+			{
+				m_mapMask |= 32;
+				fp->close();
+				fp = NULL;
+			}
+
+			path = GetReadmeFromMap(m_mapName);
+			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'", path.str()));
+			fp = TheFileSystem->openFile(path.str());
+			if (fp)
+			{
+				m_mapMask |= 64;
+				fp->close();
+				fp = NULL;
+			}
+		}
+		else
+		{
+			m_mapMask = 0;
+		}
+	}
+}
+
+void GameInfo::setMapContentsMask( Int mask )
+{
+	m_mapMask = mask;
+}
+
+void GameInfo::setMapCRC( UnsignedInt mapCRC )
+{
+	m_mapCRC = mapCRC;
+	if (!TheMapCache)
+		return;
+
+	// check the map cache
+	if (m_inGame && getLocalSlotNum() >= 0)
+	{
+		//TheMapCache->updateCache();
+		AsciiString lowerMap = m_mapName;
+		lowerMap.toLower();
+		//DEBUG_LOG(("GameInfo::setMapCRC - looking for map file \"%s\" in the map cache", lowerMap.str()));
+		std::map<AsciiString, MapMetaData>::iterator it = TheMapCache->find(lowerMap);
+		if (it == TheMapCache->end())
+		{
+			/*
+			DEBUG_LOG(("GameInfo::setMapCRC - could not find map file."));
+			it = TheMapCache->begin();
+			while (it != TheMapCache->end())
+			{
+				DEBUG_LOG(("\t\"%s\"", it->first.str()));
+				++it;
+			}
+			*/
+			getSlot(getLocalSlotNum())->setMapAvailability(false);
+		}
+		else if (m_mapCRC != it->second.m_CRC)
+		{
+			DEBUG_LOG(("GameInfo::setMapCRC - map CRC's do not match (%X/%X).", m_mapCRC, it->second.m_CRC));
+			getSlot(getLocalSlotNum())->setMapAvailability(false);
+		}
+		else
+		{
+			//DEBUG_LOG(("GameInfo::setMapCRC - map CRC's match."));
+			getSlot(getLocalSlotNum())->setMapAvailability(true);
+		}
+	}
+}
+
+void GameInfo::setMapSize( UnsignedInt mapSize )
+{
+	m_mapSize = mapSize;
+	if (!TheMapCache)
+		return;
+
+	// check the map cache
+	if (m_inGame && getLocalSlotNum() >= 0)
+	{
+		//TheMapCache->updateCache();
+		AsciiString lowerMap = m_mapName;
+		lowerMap.toLower();
+		std::map<AsciiString, MapMetaData>::iterator it = TheMapCache->find(lowerMap);
+		if (it == TheMapCache->end())
+		{
+			DEBUG_LOG(("GameInfo::setMapSize - could not find map file."));
+			getSlot(getLocalSlotNum())->setMapAvailability(false);
+		}
+		else if (m_mapCRC != it->second.m_CRC)
+		{
+			DEBUG_LOG(("GameInfo::setMapSize - map CRC's do not match."));
+			getSlot(getLocalSlotNum())->setMapAvailability(false);
+		}
+		else
+		{
+			//DEBUG_LOG(("GameInfo::setMapSize - map CRC's match."));
+			getSlot(getLocalSlotNum())->setMapAvailability(true);
+		}
+	}
+}
+
+void GameInfo::setSeed( Int seed )
+{
+	m_seed = seed;
+}
+
+void GameInfo::setSlotPointer( Int index, GameSlot *slot )
+{
+	if (index < 0 || index >= MAX_SLOTS)
+		return;
+
+	m_slot[index] = slot;
+}
+
+void GameInfo::setSuperweaponRestriction( UnsignedShort restriction )
+{
+  m_superweaponRestriction = restriction;
+}
+
+void GameInfo::setStartingCash( const Money & startingCash )
+{
+  m_startingCash = startingCash;
+}
+
+Bool GameInfo::isColorTaken(Int colorIdx, Int slotToIgnore ) const
+{
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		const GameSlot *slot = getConstSlot(i);
+		if (slot && slot->getColor() == colorIdx && i != slotToIgnore)
+			return true;
+	}
+	return false;
+}
+
+Bool GameInfo::isStartPositionTaken(Int positionIdx, Int slotToIgnore ) const
+{
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		const GameSlot *slot = getConstSlot(i);
+		if (slot && slot->getStartPos() == positionIdx && i != slotToIgnore)
+			return true;
+	}
+	return false;
+}
+
+void GameInfo::resetAccepted( void )
+{
+	GameSlot *slot = getSlot(0);
+	if (slot)
+		slot->setAccept();
+	for(int i = 1; i< MAX_SLOTS; i++)
+	{
+		slot = getSlot(i);
+		if (slot)
+			slot->unAccept();
+	}
+}
+
+void GameInfo::resetStartSpots()
+{
+	GameSlot *slot = NULL;
+	for (Int i = 0; i < MAX_SLOTS; ++i)
+	{
+		slot = getSlot(i);
+		if (slot != NULL)
+		{
+			slot->setStartPos(-1);
+		}
+	}
+}
+
+// adjust the slots in the game to open or closed
+// depending on the players in there now and the number of
+// players the map can hold.
+void GameInfo::adjustSlotsForMap()
+{
+	const MapMetaData *md = TheMapCache->findMap(m_mapName);
+	if (md != NULL)
+	{
+		// get the number of players allowed from the map.
+		Int numPlayers = md->m_numPlayers;
+		Int numPlayerSlots = 0;
+
+		// first get the number of occupied slots.
+		Int i = 0;
+		for (; i < MAX_SLOTS; ++i)
+		{
+			GameSlot *tempSlot = getSlot(i);
+			if (tempSlot->isOccupied())
+			{
+				++numPlayerSlots;
+			}
+		}
+
+		// now go through and close the appropriate number of slots.
+		// note that no players are kicked in this process, we leave
+		// that up to the user.
+		for (i = 0; i < MAX_SLOTS; ++i)
+		{
+			// we have room for more players, if this slot is unoccupied, set it to open.
+			GameSlot *slot = getSlot(i);
+			if (numPlayers > numPlayerSlots)
+			{
+				if (!(slot->isOccupied()))
+				{
+					GameSlot newSlot;
+					newSlot.setState(SLOT_OPEN);
+					setSlot(i, newSlot);
+					++numPlayerSlots;
+				}
+			}
+			else
+			{
+				if (!(slot->isOccupied()))
+				{
+					// we don't have any more room, set this slot to closed.
+					GameSlot newSlot;
+					newSlot.setState(SLOT_CLOSED);
+					setSlot(i, newSlot);
+				}
+			}
+		}
+	}
+}
+
+void GameInfo::closeOpenSlots()
+{
+	for (Int i = 0; i < MAX_SLOTS; ++i)
+	{
+		GameSlot *slot = getSlot(i);
+		if (!(slot->isOccupied()))
+		{
+			GameSlot newSlot;
+			newSlot.setState(SLOT_CLOSED);
+			setSlot(i, newSlot);
+		}
+	}
+}
+
+static Bool isSlotLocalAlly(GameInfo *game, const GameSlot *slot)
+{
+	const GameSlot *localSlot = game->getConstSlot(game->getLocalSlotNum());
+	if (!localSlot)
+		return TRUE;
+
+	if (slot == localSlot)
+		return TRUE;
+
+	if (slot->getTeamNumber() < 0)
+		return FALSE;
+
+	return slot->getTeamNumber() == localSlot->getTeamNumber();
+}
+
+Bool GameInfo::isSkirmish(void)
+{
+	Bool sawAI = FALSE;
+
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		if (i == getLocalSlotNum())
+			continue;
+
+		if (getConstSlot(i)->isHuman())
+			return FALSE;
+
+		if (getConstSlot(i)->isAI())
+		{
+			if (isSlotLocalAlly(getConstSlot(i)))
+				return FALSE;
+			sawAI = TRUE;
+		}
+	}
+	return sawAI;
+}
+
+Bool GameInfo::isMultiPlayer(void)
+{
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		if (i == getLocalSlotNum())
+			continue;
+
+		if (getConstSlot(i)->isHuman())
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+Bool GameInfo::isSandbox(void)
+{
+	Int localSlotNum = getLocalSlotNum();
+	Int localTeam = getConstSlot(localSlotNum)->getTeamNumber();
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		if (i == localSlotNum)
+			continue;
+
+		const GameSlot *slot = getConstSlot(i);
+		if (slot->isOccupied() && (slot->getTeamNumber() < 0 || slot->getTeamNumber() != localTeam))
+			return FALSE;
+	}
+	return TRUE;
+}
+
+
+// Convenience Functions ----------------------------------------
+
+static const char slotListID		= 'S';
+
+AsciiString GameInfoToAsciiString( const GameInfo *game )
+{
+	if (!game)
+		return AsciiString::TheEmptyString;
+
+	AsciiString mapName = game->getMap();
+	mapName = TheGameState->realMapPathToPortableMapPath(mapName);
+	AsciiString newMapName;
+	if (!mapName.isEmpty())
+	{
+		AsciiString token;
+		mapName.nextToken(&token, "\\/");
+		// add all the tokens except the last one.
+		// that way we don't add the filename, just the
+		// directory name, we can do this since the filename
+		// is just the directory name with the file extention
+		// added onto it.
+		while (mapName.find('\\') != NULL)
+		{
+			if (!newMapName.isEmpty())
+			{
+				newMapName.concat('/');
+			}
+			newMapName.concat(token);
+			mapName.nextToken(&token, "\\/");
+		}
+		DEBUG_LOG(("Map name is %s", mapName.str()));
+	}
+
+	AsciiString optionsString;
+#if RTS_GENERALS
+	optionsString.format("M=%2.2x%s;MC=%X;MS=%d;SD=%d;C=%d;", game->getMapContentsMask(), newMapName.str(),
+		game->getMapCRC(), game->getMapSize(), game->getSeed(), game->getCRCInterval());
+#else
+	optionsString.format("US=%d;M=%2.2x%s;MC=%X;MS=%d;SD=%d;C=%d;SR=%u;SC=%u;O=%c;", game->getUseStats(), game->getMapContentsMask(), newMapName.str(),
+		game->getMapCRC(), game->getMapSize(), game->getSeed(), game->getCRCInterval(), game->getSuperweaponRestriction(),
+		game->getStartingCash().countMoney(), game->oldFactionsOnly() ? 'Y' : 'N' );
+#endif
+
+	//add player info for each slot
+	optionsString.concat(slotListID);
+	optionsString.concat('=');
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		const GameSlot *slot = game->getConstSlot(i);
+
+		AsciiString str;
+		if (slot && slot->isHuman())
+		{
+			AsciiString tmp;  //all this data goes after name
+			tmp.format( ",%X,%d,%c%c,%d,%d,%d,%d,%d:",
+				slot->getIP(), slot->getPort(),
+				(slot->isAccepted()?'T':'F'),
+				(slot->hasMap()?'T':'F'),
+				slot->getColor(), slot->getPlayerTemplate(),
+				slot->getStartPos(), slot->getTeamNumber(),
+				slot->getNATBehavior() );
+			//make sure name doesn't cause overflow of m_lanMaxOptionsLength
+			int lenCur = tmp.getLength() + optionsString.getLength() + 2;  //+2 for H and trailing ;
+			int lenRem = m_lanMaxOptionsLength - lenCur;  //length remaining before overflowing
+			int lenMax = lenRem / (MAX_SLOTS-i);  //share lenRem with all remaining slots
+			AsciiString name = WideCharStringToMultiByte(slot->getName().str()).c_str();
+			while( name.getLength() > lenMax )
+				name.removeLastChar();  //what a horrible way to truncate.  I hate AsciiString.
+
+			str.format( "H%s%s", name.str(), tmp.str() );
+		}
+		else if (slot && slot->isAI())
+		{
+			Char c;
+			if (slot->getState() == SLOT_EASY_AI)
+				c = 'E';
+			else if (slot->getState() == SLOT_MED_AI)
+				c = 'M';
+			else
+				c = 'H';
+			str.format("C%c,%d,%d,%d,%d:", c,
+				slot->getColor(), slot->getPlayerTemplate(),
+				slot->getStartPos(), slot->getTeamNumber());
+		}
+		else if (slot && slot->getState() == SLOT_OPEN)
+		{
+			str = "O:";
+		}
+		else if (slot && slot->getState() == SLOT_CLOSED)
+		{
+			str = "X:";
+		}
+		else
+		{
+			DEBUG_ASSERTCRASH(false, ("Bad slot type"));
+			str = "X:";
+		}
+		optionsString.concat(str);
+	}
+	optionsString.concat(';');
+
+	DEBUG_ASSERTCRASH(!TheLAN || (optionsString.getLength() < m_lanMaxOptionsLength),
+		("WARNING: options string is longer than expected!  Length is %d, but max is %d!",
+		optionsString.getLength(), m_lanMaxOptionsLength));
+
+	return optionsString;
+}
+
+static Int grabHexInt(const char *s)
+{
+	char tmp[5] = "0xff";
+	tmp[2] = s[0];
+	tmp[3] = s[1];
+	Int b = strtol(tmp, NULL, 16);
+	return b;
+}
+Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
+{
+	// Parse game options
+	char *buf = strdup(options.str());
+	char *bufPtr = buf;
+	char *strPos, *keyValPair;
+	GameSlot newSlot[MAX_SLOTS];
+	Bool optionsOk = true;
+	AsciiString mapName;
+	Int mapContentsMask;
+	UnsignedInt mapCRC, mapSize;
+	Int seed = 0;
+	Int crc = 100;
+	Bool sawCRC = FALSE;
+  Bool oldFactionsOnly = FALSE;
+	Int useStats = TRUE;
+  Money startingCash = TheGlobalData->m_defaultStartingCash;
+  UnsignedShort restriction = 0; // Always the default
+
+	Bool sawMap = FALSE;
+	Bool sawMapCRC = FALSE;
+	Bool sawMapSize = FALSE;
+	Bool sawSeed = FALSE;
+	Bool sawSlotlist = FALSE;
+	Bool sawUseStats = FALSE;
+	Bool sawSuperweaponRestriction = FALSE;
+	Bool sawStartingCash = FALSE;
+	Bool sawOldFactions = FALSE;
+
+	//DEBUG_LOG(("Saw options of %s", options.str()));
+	DEBUG_LOG(("ParseAsciiStringToGameInfo - parsing [%s]", options.str()));
+
+
+	while ( (keyValPair = strtok_r(bufPtr, ";", &strPos)) != NULL )
+	{
+		bufPtr = NULL; // strtok within the same string
+
+		AsciiString key, val;
+		char *pos = NULL;
+		char *keyPtr, *valPtr;
+		keyPtr = (strtok_r(keyValPair, "=", &pos));
+		valPtr = (strtok_r(NULL, "\n", &pos));
+		if (keyPtr)
+			key = keyPtr;
+		if (valPtr)
+			val = valPtr;
+
+		if (val.isEmpty())
+		{
+			optionsOk = false;
+			DEBUG_LOG(("ParseAsciiStringToGameInfo - saw empty value, quitting"));
+			break;
+		}
+
+		if (key.compare("US") == 0)
+		{
+			useStats = atoi(val.str());
+			sawUseStats = true;
+		}
+		else
+		if (key.compare("M") == 0)
+		{
+			if (val.getLength() < 3)
+			{
+				optionsOk = FALSE;
+				DEBUG_LOG(("ParseAsciiStringToGameInfo - saw bogus map; quitting"));
+				break;
+			}
+			mapContentsMask = grabHexInt(val.str());
+			AsciiString tempstr;
+			AsciiString token;
+			tempstr = val.str()+2;
+			tempstr.nextToken(&token, "\\/");
+			while (!tempstr.isEmpty())
+			{
+				mapName.concat(token);
+				mapName.concat('\\');
+				tempstr.nextToken(&token, "\\/");
+			}
+			mapName.concat(token);
+			mapName.concat('\\');
+			mapName.concat(token);
+			mapName.concat('.');
+			mapName.concat(TheMapCache->getMapExtension());
+			AsciiString realMapName = TheGameState->portableMapPathToRealMapPath(mapName);
+			if (realMapName.isEmpty())
+			{
+				// TheSuperHackers @security slurmlord 18/06/2025 As the map file name/path from the AsciiString failed to normalize,
+				// in other words is bogus and points outside of the approved target directory for maps, avoid an arbitrary file overwrite vulnerability
+				// if the save or network game embeds a custom map to store at the location, by flagging the options as not OK and rejecting the game.
+				optionsOk = FALSE;
+				DEBUG_LOG(("ParseAsciiStringToGameInfo - saw bogus map name ('%s'); quitting", mapName.str()));
+				break;
+			}
+			mapName = realMapName;
+			sawMap = true;
+			DEBUG_LOG(("ParseAsciiStringToGameInfo - map name is %s", mapName.str()));
+		}
+		else if (key.compare("MC") == 0)
+		{
+			mapCRC = 0;
+			sscanf(val.str(), "%X", &mapCRC);
+			sawMapCRC = true;
+		}
+		else if (key.compare("MS") == 0)
+		{
+			mapSize = atoi(val.str());
+			sawMapSize = true;
+		}
+		else if (key.compare("SD") == 0)
+		{
+			seed = atoi(val.str());
+			sawSeed = true;
+//			DEBUG_LOG(("ParseAsciiStringToGameInfo - random seed is %d", seed));
+		}
+		else if (key.compare("C") == 0)
+		{
+			crc = atoi(val.str());
+			sawCRC = TRUE;
+		}
+    else if (key.compare("SR") == 0 )
+    {
+      restriction = (UnsignedShort)atoi(val.str());
+      sawSuperweaponRestriction = TRUE;
+    }
+    else if (key.compare("SC") == 0 )
+    {
+      UnsignedInt startingCashAmount = strtoul( val.str(), NULL, 10 );
+      startingCash.init();
+      startingCash.deposit( startingCashAmount, FALSE, FALSE );
+      sawStartingCash = TRUE;
+    }
+    else if (key.compare("O") == 0 )
+    {
+      oldFactionsOnly = ( val.compareNoCase( "Y" ) == 0 );
+      sawOldFactions = TRUE;
+    }
+		else if (key.getLength() == 1 && *key.str() == slotListID)
+		{
+			sawSlotlist = true;
+			/// @TODO: Need to read in all the slot info... big mess right now.
+			char *rawSlotBuf = strdup(val.str());
+			char *freeMe = NULL;
+			AsciiString rawSlot;
+//			Bool slotsOk = true;	//flag that lets us know whether or not the slot list is good.
+
+//			DEBUG_LOG(("ParseAsciiStringToGameInfo - Parsing slot list"));
+			for (int i=0; i<MAX_SLOTS; ++i)
+				{
+					rawSlot = strtok_r(rawSlotBuf,":",&pos);
+					if( rawSlotBuf )
+						freeMe = rawSlotBuf;
+					rawSlotBuf = NULL;
+					switch (*rawSlot.str())
+					{
+						case 'H':
+						{
+//							DEBUG_LOG(("ParseAsciiStringToGameInfo - Human player"));
+							char *slotPos = NULL;
+							//Parse out the Name
+							AsciiString slotValue(strtok_r((char *)rawSlot.str(),",",&slotPos));
+							if(slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue name is empty, quitting"));
+								break;
+							}
+							UnicodeString name;
+              				name.set(MultiByteToWideCharSingleLine(slotValue.str() +1).c_str());
+
+							//DEBUG_LOG(("ParseAsciiStringToGameInfo - name is %s", slotValue.str()+1));
+
+							//Parse out the IP
+							slotValue = strtok_r(NULL,",",&slotPos);
+							if(slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue IP address is empty, quitting"));
+								break;
+							}
+							UnsignedInt playerIP = 0;
+							sscanf(slotValue.str(),"%x", &playerIP);
+							//DEBUG_LOG(("ParseAsciiStringToGameInfo - IP address is %x", playerIP));
+
+							//set the state of the slot
+							newSlot[i].setState(SLOT_PLAYER, name, playerIP);
+
+							// parse out the port
+							slotValue = strtok_r(NULL, ",", &slotPos);
+							if (slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue port is empty, quitting"));
+								break;
+							}
+							UnsignedInt playerPort = 0;
+							sscanf(slotValue.str(), "%d", &playerPort);
+							newSlot[i].setPort(playerPort);
+							DEBUG_LOG(("ParseAsciiStringToGameInfo - port is %d", playerPort));
+
+							//Read if it's accepted or not
+							slotValue = strtok_r(NULL,",",&slotPos);
+							if(slotValue.getLength() != 2)
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue accepted is mis-sized, quitting"));
+								break;
+							}
+							const char *svs = slotValue.str();
+							if(*svs == 'T') {
+								newSlot[i].setAccept();
+								//DEBUG_LOG(("ParseAsciiStringToGameInfo - player has accepted"));
+							} else if (*svs == 'F') {
+								newSlot[i].unAccept();
+								//DEBUG_LOG(("ParseAsciiStringToGameInfo - player has not accepted"));
+							}
+							++svs;
+							if(*svs == 'T') {
+								newSlot[i].setMapAvailability(TRUE);
+								//DEBUG_LOG(("ParseAsciiStringToGameInfo - player has map"));
+							} else {
+								newSlot[i].setMapAvailability(FALSE);
+								//DEBUG_LOG(("ParseAsciiStringToGameInfo - player does not have map"));
+							}
+
+							//Read color index
+							slotValue = strtok_r(NULL,",",&slotPos);
+							if(slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue color is empty, quitting"));
+								break;
+							}
+							Int color = atoi(slotValue.str());
+							if (color < -1 || color >= TheMultiplayerSettings->getNumColors())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - player color was invalid, quitting"));
+								break;
+							}
+							newSlot[i].setColor(color);
+							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player color set to %d", color));
+
+							//Read playerTemplate index
+							slotValue = strtok_r(NULL,",",&slotPos);
+							if(slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue player template is empty, quitting"));
+								break;
+							}
+							Int playerTemplate = atoi(slotValue.str());
+							if (playerTemplate < PLAYERTEMPLATE_MIN || playerTemplate >= ThePlayerTemplateStore->getPlayerTemplateCount())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - player template value is invalid, quitting"));
+								break;
+							}
+							newSlot[i].setPlayerTemplate(playerTemplate);
+							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player template is %d", playerTemplate));
+
+							//Read start position index
+							slotValue = strtok_r(NULL,",",&slotPos);
+							if(slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue start position is empty, quitting"));
+								break;
+							}
+							Int startPos = atoi(slotValue.str());
+							if (startPos < -1 || startPos >= MAX_SLOTS)
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - player start position is invalid, quitting"));
+								break;
+							}
+							newSlot[i].setStartPos(startPos);
+							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player start position is %d", startPos));
+
+							//Read team index
+							slotValue = strtok_r(NULL,",",&slotPos);
+							if(slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue team number is empty, quitting"));
+								break;
+							}
+							Int team = atoi(slotValue.str());
+							if (team < -1 || team >= MAX_SLOTS/2)
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - team number is invalid, quitting"));
+								break;
+							}
+							newSlot[i].setTeamNumber(team);
+							//DEBUG_LOG(("ParseAsciiStringToGameInfo - team number is %d", team));
+
+							// Read the NAT behavior
+							slotValue = strtok_r(NULL, ",",&slotPos);
+							if (slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - NAT behavior is empty, quitting"));
+								break;
+							}
+							FirewallHelperClass::FirewallBehaviorType NATType = (FirewallHelperClass::FirewallBehaviorType)atoi(slotValue.str());
+							if ((NATType < FirewallHelperClass::FIREWALL_MIN) ||
+									(NATType > FirewallHelperClass::FIREWALL_MAX)) {
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - NAT behavior is invalid, quitting"));
+								break;
+							}
+							newSlot[i].setNATBehavior(NATType);
+							DEBUG_LOG(("ParseAsciiStringToGameInfo - NAT behavior is %X", NATType));
+						}
+						break;
+						case 'C':
+						{
+            	DEBUG_LOG(("ParseAsciiStringToGameInfo - AI player"));
+							char *slotPos = NULL;
+							//Parse out the Name
+							AsciiString slotValue(strtok_r((char *)rawSlot.str(),",",&slotPos));
+							if(slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue AI Type is empty, quitting"));
+								break;
+							}
+
+							switch(*(slotValue.str() + 1))
+							{
+								case 'E':
+								{
+									newSlot[i].setState(SLOT_EASY_AI);
+									//DEBUG_LOG(("ParseAsciiStringToGameInfo - Easy AI"));
+								}
+								break;
+								case 'M':
+								{
+									newSlot[i].setState(SLOT_MED_AI);
+									//DEBUG_LOG(("ParseAsciiStringToGameInfo - Medium AI"));
+								}
+								break;
+								case 'H':
+								{
+									newSlot[i].setState(SLOT_BRUTAL_AI);
+									//DEBUG_LOG(("ParseAsciiStringToGameInfo - Brutal AI"));
+								}
+								break;
+								default:
+								{
+									optionsOk = false;
+									DEBUG_LOG(("ParseAsciiStringToGameInfo - Unknown AI, quitting"));
+								}
+								break;
+							}
+
+							//Read color index
+							slotValue = strtok_r(NULL,",",&slotPos);
+							if(slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue color is empty, quitting"));
+								break;
+							}
+							Int color = atoi(slotValue.str());
+							if (color < -1 || color >= TheMultiplayerSettings->getNumColors())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - player color was invalid, quitting"));
+								break;
+							}
+							newSlot[i].setColor(color);
+							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player color set to %d", color));
+
+							//Read playerTemplate index
+							slotValue = strtok_r(NULL,",",&slotPos);
+							if(slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue player template is empty, quitting"));
+								break;
+							}
+							Int playerTemplate = atoi(slotValue.str());
+							if (playerTemplate < PLAYERTEMPLATE_MIN || playerTemplate >= ThePlayerTemplateStore->getPlayerTemplateCount())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - player template value is invalid, quitting"));
+								break;
+							}
+							newSlot[i].setPlayerTemplate(playerTemplate);
+							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player template is %d", playerTemplate));
+
+							//Read start pos
+							slotValue = strtok_r(NULL,",",&slotPos);
+							if(slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue start pos is empty, quitting"));
+								break;
+							}
+							Int startPos = atoi(slotValue.str());
+							Bool isStartPosBad = FALSE;
+							if (startPos < -1 || startPos >= MAX_SLOTS)
+							{
+								isStartPosBad = TRUE;
+							}
+							for (Int j=0; j<i; ++j)
+							{
+								if (startPos >= 0 && startPos == newSlot[i].getStartPos())
+								{
+									isStartPosBad = TRUE; // can't have multiple people using the same start pos
+								}
+							}
+							if (isStartPosBad)
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - start pos is invalid, quitting"));
+								break;
+							}
+							newSlot[i].setStartPos(startPos);
+							//DEBUG_LOG(("ParseAsciiStringToGameInfo - start spot is %d", startPos));
+
+							//Read team index
+							slotValue = strtok_r(NULL,",",&slotPos);
+							if(slotValue.isEmpty())
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue team number is empty, quitting"));
+								break;
+							}
+							Int team = atoi(slotValue.str());
+							if (team < -1 || team >= MAX_SLOTS/2)
+							{
+								optionsOk = false;
+								DEBUG_LOG(("ParseAsciiStringToGameInfo - team number is invalid, quitting"));
+								break;
+							}
+							newSlot[i].setTeamNumber(team);
+							//DEBUG_LOG(("ParseAsciiStringToGameInfo - team number is %d", team));
+
+						}
+						break;
+						case 'O':
+						{
+							newSlot[i].setState( SLOT_OPEN );
+							//DEBUG_LOG(("ParseAsciiStringToGameInfo - Slot is open"));
+						}
+						break;
+						case 'X':
+						{
+							newSlot[i].setState( SLOT_CLOSED );
+							//DEBUG_LOG(("ParseAsciiStringToGameInfo - Slot is closed"));
+						}
+						break;
+						default:
+						{
+							optionsOk = false;
+							DEBUG_LOG(("ParseAsciiStringToGameInfo - unrecognized slot entry, quitting"));
+						}
+						break;
+					}
+				}
+
+			free(freeMe);
+		}
+		else
+		{
+			optionsOk = false;
+			break;
+		}
+	}
+
+	free(buf);
+
+	// TheSuperHackers @tweak The following settings are no longer
+	// a strict requirement in the Zero Hour Replay file:
+	//  * UseStats
+	//  * SuperweaponRestriction
+	//  * StartingCash
+	//  * OldFactionsOnly
+	// In Generals they never were.
+	if (optionsOk && sawMap && sawMapCRC && sawMapSize && sawSeed && sawSlotlist && sawCRC)
+	{
+		// We were setting the Global Data directly here, but Instead, I'm now
+		// first setting the data in game.  We'll set the global data when
+		// we start a game.
+		if (!game)
+			return true;
+
+		//DEBUG_LOG(("ParseAsciiStringToGameInfo - game options all good, setting info"));
+
+		for(Int i = 0; i<MAX_SLOTS; i++)
+			game->setSlot(i,newSlot[i]);
+
+		game->setMap(mapName);
+		game->setMapCRC(mapCRC);
+		game->setMapSize(mapSize);
+		game->setMapContentsMask(mapContentsMask);
+		game->setSeed(seed);
+		game->setCRCInterval(crc);
+		game->setUseStats(useStats);
+		game->setSuperweaponRestriction(restriction);
+		game->setStartingCash(startingCash);
+		game->setOldFactionsOnly(oldFactionsOnly);
+
+		return true;
+	}
+
+	DEBUG_LOG(("ParseAsciiStringToGameInfo - game options messed up"));
+	return false;
+}
+
+
+//----------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------------
+
+//------------------------- SkirmishGameInfo ---------------------------------------------------------------
+
+// ------------------------------------------------------------------------------------------------
+/** CRC */
+// ------------------------------------------------------------------------------------------------
+void SkirmishGameInfo::crc( Xfer *xfer )
+{
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Xfer Method */
+// ------------------------------------------------------------------------------------------------
+void SkirmishGameInfo::xfer( Xfer *xfer )
+{
+#if RTS_GENERALS
+	const XferVersion currentVersion = 2;
+#else
+	const XferVersion currentVersion = 4;
+#endif
+	XferVersion version = currentVersion;
+	xfer->xferVersion( &version, currentVersion );
+
+
+	xfer->xferInt(&m_preorderMask);
+	xfer->xferInt(&m_crcInterval);
+	xfer->xferBool(&m_inGame);
+	xfer->xferBool(&m_inProgress);
+	xfer->xferBool(&m_surrendered);
+	xfer->xferInt(&m_gameID);
+
+	Int slot = MAX_SLOTS;
+	xfer->xferInt(&slot);
+	DEBUG_ASSERTCRASH(slot==MAX_SLOTS, ("MAX_SLOTS changed, need to change version. jba."));
+
+	for (slot = 0; slot < MAX_SLOTS; slot++)
+	{
+		Int state = m_slot[slot]->getState();
+		xfer->xferInt(&state);
+
+		UnicodeString name=m_slot[slot]->getName();
+		if (version >= 2)
+		{
+			xfer->xferUnicodeString(&name);
+		}
+
+		Bool isAccepted=m_slot[slot]->isAccepted();
+		xfer->xferBool(&isAccepted);
+
+		Bool isMuted=m_slot[slot]->isMuted();
+		xfer->xferBool(&isMuted);
+		m_slot[slot]->mute(isMuted);
+
+		Int color=m_slot[slot]->getColor();
+		xfer->xferInt(&color);
+
+		Int startPos=m_slot[slot]->getStartPos();
+		xfer->xferInt(&startPos);
+
+		Int playerTemplate=m_slot[slot]->getPlayerTemplate();
+		xfer->xferInt(&playerTemplate);
+
+		Int teamNumber=m_slot[slot]->getTeamNumber();
+		xfer->xferInt(&teamNumber);
+
+		Int origColor=m_slot[slot]->getOriginalColor();
+		xfer->xferInt(&origColor);
+
+		Int origStartPos=m_slot[slot]->getOriginalStartPos();
+		xfer->xferInt(&origStartPos);
+
+ 		Int origPlayerTemplate=m_slot[slot]->getOriginalPlayerTemplate();
+		xfer->xferInt(&origPlayerTemplate);
+
+		if( xfer->getXferMode() == XFER_LOAD ) {
+			m_slot[slot]->setState((SlotState)state, name);
+			if (isAccepted) m_slot[slot]->setAccept();
+
+			m_slot[slot]->setPlayerTemplate(origPlayerTemplate);
+			m_slot[slot]->setStartPos(origStartPos);
+			m_slot[slot]->setColor(origColor);
+			m_slot[slot]->saveOffOriginalInfo();
+
+			m_slot[slot]->setTeamNumber(teamNumber);
+			m_slot[slot]->setColor(color);
+			m_slot[slot]->setStartPos(startPos);
+			m_slot[slot]->setPlayerTemplate(playerTemplate);
+		}
+	}
+
+	xfer->xferUnsignedInt(&m_localIP);
+
+	xfer->xferMapName(&m_mapName);
+	xfer->xferUnsignedInt(&m_mapCRC);
+	xfer->xferUnsignedInt(&m_mapSize);
+	xfer->xferInt(&m_mapMask);
+	xfer->xferInt(&m_seed);
+
+  if ( version >= 3 )
+  {
+    xfer->xferUnsignedShort( &m_superweaponRestriction );
+
+    if ( version == 3 )
+    {
+      // Version 3 had a bool which is now gone
+      Bool obsoleteBool;
+      xfer->xferBool( &obsoleteBool );
+    }
+
+    xfer->xferSnapshot( &m_startingCash );
+  }
+  else if ( xfer->getXferMode() == XFER_LOAD )
+  {
+    m_superweaponRestriction = 0;
+    m_startingCash = TheGlobalData->m_defaultStartingCash;
+  }
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Load post process */
+// ------------------------------------------------------------------------------------------------
+void SkirmishGameInfo::loadPostProcess( void )
+{
+}
+
+
diff --git a/Core/GameEngine/Source/GameNetwork/GameMessageParser.cpp b/Core/GameEngine/Source/GameNetwork/GameMessageParser.cpp
new file mode 100644
index 00000000000..9b289c450e5
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameMessageParser.cpp
@@ -0,0 +1,101 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/GameMessageParser.h"
+
+//----------------------------------------------------------------------------
+GameMessageParser::GameMessageParser()
+{
+	m_first = NULL;
+	m_argTypeCount = 0;
+}
+
+//----------------------------------------------------------------------------
+GameMessageParser::GameMessageParser(GameMessage *msg)
+{
+	m_first = NULL;
+	m_argTypeCount = 0;
+
+	UnsignedByte argCount = msg->getArgumentCount();
+	GameMessageArgumentDataType lasttype = ARGUMENTDATATYPE_UNKNOWN;
+	Int thisTypeCount = 0;
+
+	for (UnsignedByte i = 0; i < argCount; ++i) {
+		GameMessageArgumentDataType type = msg->getArgumentDataType(i);
+		if (type != lasttype) {
+			if (thisTypeCount > 0) {
+				addArgType(lasttype, thisTypeCount);
+				++m_argTypeCount;
+			}
+			lasttype = type;
+			thisTypeCount = 0;
+		}
+		++thisTypeCount;
+	}
+	if (thisTypeCount > 0) {
+		addArgType(lasttype, thisTypeCount);
+		++m_argTypeCount;
+	}
+}
+
+//----------------------------------------------------------------------------
+GameMessageParser::~GameMessageParser()
+{
+	GameMessageParserArgumentType *temp = NULL;
+	while (m_first != NULL) {
+		temp = m_first->getNext();
+		deleteInstance(m_first);
+		m_first = temp;
+	}
+}
+
+//----------------------------------------------------------------------------
+void GameMessageParser::addArgType(GameMessageArgumentDataType type, Int argCount)
+{
+	if (m_first == NULL) {
+		m_first = newInstance(GameMessageParserArgumentType)(type, argCount);
+		m_last = m_first;
+		return;
+	}
+
+	m_last->setNext(newInstance(GameMessageParserArgumentType)(type, argCount));
+	m_last = m_last->getNext();
+}
+
+//----------------------------------------------------------------------------
+GameMessageParserArgumentType::GameMessageParserArgumentType(GameMessageArgumentDataType type, Int argCount)
+{
+	m_next = NULL;
+	m_type = type;
+	m_argCount = argCount;
+}
+
+//----------------------------------------------------------------------------
+GameMessageParserArgumentType::~GameMessageParserArgumentType()
+{
+}
+
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp
new file mode 100644
index 00000000000..e3089d6fb6e
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp
@@ -0,0 +1,351 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: Chat.cpp //////////////////////////////////////////////////////
+// Generals GameSpy chat-related code
+// Author: Matthew D. Campbell, July 2002
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/AudioEventRTS.h"
+#include "Common/INI.h"
+#include "GameClient/GameText.h"
+#include "GameClient/GadgetListBox.h"
+#include "GameClient/LanguageFilter.h"
+#include "GameClient/GameWindowManager.h"
+#include "GameNetwork/GameSpy/PeerDefsImplementation.h"
+#include "GameNetwork/GameSpy/PeerThread.h"
+#include "GameClient/InGameUI.h"
+
+#define OFFSET(x) (sizeof(Int) * (x))
+static const FieldParse GameSpyColorFieldParse[] =
+{
+
+	{ "Default",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_DEFAULT) },
+	{ "CurrentRoom",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CURRENTROOM) },
+	{ "ChatRoom",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_ROOM) },
+	{ "Game",								INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_GAME) },
+	{ "GameFull",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_GAME_FULL) },
+	{ "GameCRCMismatch",		INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_GAME_CRCMISMATCH) },
+	{ "PlayerNormal",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_NORMAL) },
+	{ "PlayerOwner",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_OWNER) },
+	{ "PlayerBuddy",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_BUDDY) },
+	{ "PlayerSelf",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_SELF) },
+	{ "PlayerIgnored",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_IGNORED) },
+	{ "ChatNormal",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_NORMAL) },
+	{ "ChatEmote",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_EMOTE) },
+	{ "ChatOwner",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_OWNER) },
+	{ "ChatOwnerEmote",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_OWNER_EMOTE) },
+	{ "ChatPriv",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_PRIVATE) },
+	{ "ChatPrivEmote",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_PRIVATE_EMOTE) },
+	{ "ChatPrivOwner",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_PRIVATE_OWNER) },
+	{ "ChatPrivOwnerEmote",	INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_PRIVATE_OWNER_EMOTE) },
+	{ "ChatBuddy",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_BUDDY) },
+	{ "ChatSelf",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_SELF) },
+	{ "AcceptTrue",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_ACCEPT_TRUE) },
+	{ "AcceptFalse",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_ACCEPT_FALSE) },
+	{ "MapSelected",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_MAP_SELECTED) },
+	{ "MapUnselected",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_MAP_UNSELECTED) },
+	{ "MOTD",								INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_MOTD) },
+	{ "MOTDHeading",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_MOTD_HEADING) },
+
+	{ NULL,					NULL,						NULL,						0 }
+
+};
+
+void INI::parseOnlineChatColorDefinition( INI* ini )
+{
+	// parse the ini definition
+	ini->initFromINI( GameSpyColor, GameSpyColorFieldParse );
+}
+
+
+Color GameSpyColor[GSCOLOR_MAX] =
+{
+	GameMakeColor(255,255,255,255),	// GSCOLOR_DEFAULT
+	GameMakeColor(255,255,  0,255),	// GSCOLOR_CURRENTROOM
+	GameMakeColor(255,255,255,255),	// GSCOLOR_ROOM
+	GameMakeColor(128,128,0,255),		// GSCOLOR_GAME
+	GameMakeColor(128,128,128,255),	// GSCOLOR_GAME_FULL
+	GameMakeColor(128,128,128,255),	// GSCOLOR_GAME_CRCMISMATCH
+#if RTS_GENERALS
+	GameMakeColor(255,  0,  0,255),	// GSCOLOR_PLAYER_NORMAL
+#else
+	GameMakeColor(255,255,255,255),	// GSCOLOR_PLAYER_NORMAL
+#endif
+	GameMakeColor(255,  0,255,255),	// GSCOLOR_PLAYER_OWNER
+	GameMakeColor(255,  0,128,255),	// GSCOLOR_PLAYER_BUDDY
+	GameMakeColor(255,  0,  0,255),	// GSCOLOR_PLAYER_SELF
+	GameMakeColor(128,128,128,255),	// GSCOLOR_PLAYER_IGNORED
+#if RTS_GENERALS
+	GameMakeColor(255,0,0,255),			// GSCOLOR_CHAT_NORMAL
+#else
+	GameMakeColor(255,255,255,255),		// GSCOLOR_CHAT_NORMAL
+#endif
+	GameMakeColor(255,128,0,255),		// GSCOLOR_CHAT_EMOTE,
+	GameMakeColor(255,255,0,255),		// GSCOLOR_CHAT_OWNER,
+	GameMakeColor(128,255,0,255),		// GSCOLOR_CHAT_OWNER_EMOTE,
+	GameMakeColor(0,0,255,255),			// GSCOLOR_CHAT_PRIVATE,
+	GameMakeColor(0,255,255,255),		// GSCOLOR_CHAT_PRIVATE_EMOTE,
+	GameMakeColor(255,0,255,255),		// GSCOLOR_CHAT_PRIVATE_OWNER,
+	GameMakeColor(255,128,255,255),	// GSCOLOR_CHAT_PRIVATE_OWNER_EMOTE,
+	GameMakeColor(255,  0,255,255),	// GSCOLOR_CHAT_BUDDY,
+	GameMakeColor(255,  0,128,255),	// GSCOLOR_CHAT_SELF,
+	GameMakeColor(  0,255,  0,255),	// GSCOLOR_ACCEPT_TRUE,
+	GameMakeColor(255,  0,  0,255),	// GSCOLOR_ACCEPT_FALSE,
+	GameMakeColor(255,255,  0,255),	// GSCOLOR_MAP_SELECTED,
+	GameMakeColor(255,255,255,255),	// GSCOLOR_MAP_UNSELECTED,
+	GameMakeColor(255,255,255,255),	// GSCOLOR_MOTD,
+	GameMakeColor(255,255,  0,255),	// GSCOLOR_MOTD_HEADING,
+};
+
+Bool GameSpyInfo::sendChat( UnicodeString message, Bool isAction, GameWindow *playerListbox )
+{
+	static UnicodeString s_prevMsg = UnicodeString::TheEmptyString;  //stop spam before it happens
+
+	RoomType roomType = StagingRoom;
+	if (getCurrentGroupRoom())
+		roomType = GroupRoom;
+
+	PeerRequest req;
+	req.text = message.str();
+
+	message.trim();
+	// Echo the user's input to the chat window
+	if (!message.isEmpty())
+	{
+		if (!playerListbox)
+		{	// Public message
+			if( isAction  ||  message.compare(s_prevMsg) != 0 )  //don't send duplicate messages
+			{
+				req.message.isAction = isAction;
+				req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEROOM;
+				TheGameSpyPeerMessageQueue->addRequest(req);
+				s_prevMsg = message;
+			}
+			return false;
+		}
+
+		// Get the selections (is this a private message?)
+		Int maxSel = GadgetListBoxGetMaxSelectedLength(playerListbox);
+		Int *selections;
+		GadgetListBoxGetSelected(playerListbox, (Int *)&selections);
+
+		if (selections[0] == -1)
+		{	// Public message
+			if( isAction  ||  message.compare(s_prevMsg) != 0 )  //don't send duplicate messages
+			{
+				req.message.isAction = isAction;
+				req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEROOM;
+				TheGameSpyPeerMessageQueue->addRequest(req);
+				s_prevMsg = message;
+			}
+			return false;
+		}
+		else
+		{
+			// Private message
+
+			// Construct a list
+			AsciiString names = AsciiString::TheEmptyString;
+			AsciiString tmp = AsciiString::TheEmptyString;
+			AsciiString aStr; // AsciiString buf for translating Unicode entries
+			names.format("%s", TheGameSpyInfo->getLocalName().str());
+			for (int i=0; i<maxSel; i++)
+			{
+				if (selections[i] != -1)
+				{
+					aStr.translate(GadgetListBoxGetText(playerListbox, selections[i], GadgetListBoxGetNumColumns(playerListbox)-1));
+					if (aStr.compareNoCase(TheGameSpyInfo->getLocalName()))
+					{
+						tmp.format(",%s", aStr.str());
+						names.concat(tmp);
+					}
+				}
+				else
+				{
+					break;
+				}
+			}
+
+			if (!names.isEmpty())
+			{
+				req.nick = names.str();
+				req.message.isAction = isAction;
+				req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEPLAYER;
+				TheGameSpyPeerMessageQueue->addRequest(req);
+			}
+			s_prevMsg = message;
+			return true;
+		}
+	}
+	s_prevMsg = message;
+	return false;
+}
+
+void GameSpyInfo::addChat( AsciiString nick, Int profileID, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win )
+{
+	PlayerInfoMap::iterator it = getPlayerInfoMap()->find(nick);
+	if (it != getPlayerInfoMap()->end())
+	{
+		addChat( it->second, msg, isPublic, isAction, win );
+	}
+	else
+	{
+	}
+}
+
+void GameSpyInfo::addChat( PlayerInfo p, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win )
+{
+	Int style;
+	if(isSavedIgnored(p.m_profileID) || isIgnored(p.m_name))
+		return;
+
+	Bool isOwner = p.m_flags & PEER_FLAG_OP;
+	Bool isBuddy = getBuddyMap()->find(p.m_profileID) != getBuddyMap()->end();
+
+	Bool isMe = p.m_name.compare(TheGameSpyInfo->getLocalName()) == 0;
+
+	if(!isMe)
+	{
+		if(m_disallowAsainText)
+		{
+			const WideChar *buff = msg.str();
+			Int length =  msg.getLength();
+			for(Int i = 0; i < length; ++i)
+			{
+				if(buff[i] >= 256)
+					return;
+			}
+		}
+		else if(m_disallowNonAsianText)
+		{
+			const WideChar *buff = msg.str();
+			Int length =  msg.getLength();
+			Bool hasUnicode = FALSE;
+			for(Int i = 0; i < length; ++i)
+			{
+				if(buff[i] >= 256)
+				{
+					hasUnicode = TRUE;
+					break;
+				}
+			}
+			if(!hasUnicode)
+				return;
+		}
+
+		if (!isPublic)
+		{
+			AudioEventRTS privMsgAudio("GUIMessageReceived");
+
+			if( TheAudio )
+			{
+				TheAudio->addAudioEvent( &privMsgAudio );
+			}
+		}
+	}
+
+
+	if (isBuddy)
+	{
+		style = GSCOLOR_CHAT_BUDDY;
+	}
+	else if (isPublic && isAction)
+	{
+		style = (isOwner)?GSCOLOR_CHAT_OWNER_EMOTE:GSCOLOR_CHAT_EMOTE;
+	}
+	else if (isPublic)
+	{
+		style = (isOwner)?GSCOLOR_CHAT_OWNER:GSCOLOR_CHAT_NORMAL;
+	}
+	else if (isAction)
+	{
+		style = (isOwner)?GSCOLOR_CHAT_PRIVATE_OWNER_EMOTE:GSCOLOR_CHAT_PRIVATE_EMOTE;
+	}
+	else
+	{
+		style = (isOwner)?GSCOLOR_CHAT_PRIVATE_OWNER:GSCOLOR_CHAT_PRIVATE;
+	}
+
+	UnicodeString name;
+	name.translate(p.m_name);
+
+	// filters language
+//  if( TheGlobalData->m_languageFilterPref )
+//  {
+    TheLanguageFilter->filterLine(msg);
+//  }
+
+	UnicodeString fullMsg;
+	if (isAction)
+	{
+		fullMsg.format( L"%ls %ls", name.str(), msg.str() );
+	}
+	else
+	{
+		fullMsg.format( L"[%ls] %ls", name.str(), msg.str() );
+	}
+
+	Int index = addText(fullMsg, GameSpyColor[style], win);
+	if (index >= 0)
+	{
+		GadgetListBoxSetItemData(win, (void *)p.m_profileID, index);
+	}
+}
+
+Int GameSpyInfo::addText( UnicodeString message, Color c, GameWindow *win )
+{
+	if (TheGameSpyGame && TheGameSpyGame->isInGame() && TheGameSpyGame->isGameInProgress())
+	{
+		static AudioEventRTS messageFromChatSound("GUIMessageReceived");
+		TheAudio->addAudioEvent(&messageFromChatSound);
+
+		TheInGameUI->message(message);
+	}
+
+	if (!win)
+	{
+		// try to pick up a registered text window
+		if (m_textWindows.empty())
+			return -1;
+
+		win = *(m_textWindows.begin());
+	}
+	Int index = GadgetListBoxAddEntryText(win, message, c, -1, -1);
+	GadgetListBoxSetItemData(win, (void *)-1, index);
+
+	return index;
+}
+
+void GameSpyInfo::registerTextWindow( GameWindow *win )
+{
+	m_textWindows.insert(win);
+}
+
+void GameSpyInfo::unregisterTextWindow( GameWindow *win )
+{
+	m_textWindows.erase(win);
+}
+
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp
new file mode 100644
index 00000000000..bc2360883a2
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp
@@ -0,0 +1,482 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////
+// FILE: GSConfig.cpp
+// Author: Matthew D. Campbell, Sept 2002
+// Description: GameSpy online config
+///////////////////////////////////////////////////////////////////////////////////////
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/GameState.h"
+#include "GameClient/MapUtil.h"
+#include "GameNetwork/GameSpy/GSConfig.h"
+#include "GameNetwork/RankPointValue.h"
+
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+GameSpyConfigInterface *TheGameSpyConfig = NULL;
+
+class GameSpyConfig : public GameSpyConfigInterface
+{
+public:
+	GameSpyConfig( AsciiString config );
+	~GameSpyConfig() {}
+
+	// Pings
+	std::list<AsciiString> getPingServers(void)	{ return m_pingServers; }
+	Int getNumPingRepetitions(void)							{ return m_pingReps; }
+	Int getPingTimeoutInMs(void)								{ return m_pingTimeout; }
+	virtual Int getPingCutoffGood( void )				{	return m_pingCutoffGood; }
+	virtual Int getPingCutoffBad( void )				{ return m_pingCutoffBad;	}
+
+	// QM
+	std::list<AsciiString> getQMMaps(void)			{ return m_qmMaps; }
+	Int getQMBotID(void)												{ return m_qmBotID; }
+	Int getQMChannel(void)											{ return m_qmChannel; }
+	void setQMChannel(Int channel)							{ m_qmChannel = channel; }
+
+	// Player Info
+	Int getPointsForRank(Int rank);
+	virtual Bool isPlayerVIP(Int id);
+
+	virtual Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port);
+
+	// Ladder / Any other external parsing
+	AsciiString getLeftoverConfig(void)					{ return m_leftoverConfig; }
+
+	// NAT Timeouts
+	virtual Int getTimeBetweenRetries() { return m_natRetryInterval; }
+	virtual Int getMaxManglerRetries() { return m_natMaxManglerRetries; }
+	virtual time_t getRetryInterval() { return m_natManglerRetryInterval; }
+	virtual time_t getKeepaliveInterval() { return m_natKeepaliveInterval; }
+	virtual time_t getPortTimeout() { return m_natPortTimeout; }
+	virtual time_t getRoundTimeout() { return m_natRoundTimeout; }
+
+	// Custom match
+	virtual Bool restrictGamesToLobby() { return m_restrictGamesToLobby; }
+
+protected:
+	std::list<AsciiString> m_pingServers;
+	Int m_pingReps;
+	Int m_pingTimeout;
+	Int m_pingCutoffGood;
+	Int m_pingCutoffBad;
+
+	Int m_natRetryInterval;
+	Int m_natMaxManglerRetries;
+	time_t m_natManglerRetryInterval;
+	time_t m_natKeepaliveInterval;
+	time_t m_natPortTimeout;
+	time_t m_natRoundTimeout;
+
+	std::vector<AsciiString> m_manglerHosts;
+	std::vector<UnsignedShort> m_manglerPorts;
+
+	std::list<AsciiString> m_qmMaps;
+	Int m_qmBotID;
+	Int m_qmChannel;
+
+	Bool m_restrictGamesToLobby;
+
+	std::set<Int> m_vip; // VIP people
+
+	Int m_rankPoints[MAX_RANKS];
+
+	AsciiString m_leftoverConfig;
+};
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+GameSpyConfigInterface* GameSpyConfigInterface::create(AsciiString config)
+{
+	return NEW GameSpyConfig(config);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+class SectionChecker
+{
+public:
+	typedef std::list<const Bool *> SectionList;
+	void addVar(const Bool *var) { m_bools.push_back(var); }
+	Bool isInSection();
+protected:
+	 SectionList m_bools;
+};
+Bool SectionChecker::isInSection() {
+	Bool ret = FALSE;
+	for (SectionList::const_iterator it = m_bools.begin(); it != m_bools.end(); ++it)
+	{
+		ret = ret || **it;
+	}
+	return ret;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+GameSpyConfig::GameSpyConfig( AsciiString config ) :
+m_natRetryInterval(1000),
+m_natMaxManglerRetries(25),
+m_natManglerRetryInterval(300),
+m_natKeepaliveInterval(15000),
+m_natPortTimeout(10000),
+m_natRoundTimeout(10000),
+m_pingReps(1),
+m_pingTimeout(1000),
+m_pingCutoffGood(300),
+m_pingCutoffBad(600),
+m_restrictGamesToLobby(FALSE),
+m_qmBotID(0),
+m_qmChannel(0)
+{
+	m_rankPoints[0] = 0;
+	m_rankPoints[1] = 5;
+	m_rankPoints[2] = 10;
+	m_rankPoints[3] = 20;
+	m_rankPoints[4] = 50;
+	m_rankPoints[5] = 100;
+	m_rankPoints[6] = 200;
+	m_rankPoints[7] = 500;
+	m_rankPoints[8] = 1000;
+	m_rankPoints[9] = 2000;
+
+	AsciiString line;
+	Bool inPingServers = FALSE;
+	Bool inPingDuration = FALSE;
+	Bool inQMMaps = FALSE;
+	Bool inQMBot = FALSE;
+	Bool inManglers = FALSE;
+	Bool inVIP = FALSE;
+	Bool inNAT = FALSE;
+	Bool inCustom = FALSE;
+
+	SectionChecker sections;
+	sections.addVar(&inPingServers);
+	sections.addVar(&inPingDuration);
+	sections.addVar(&inQMMaps);
+	sections.addVar(&inQMBot);
+	sections.addVar(&inManglers);
+	sections.addVar(&inVIP);
+	sections.addVar(&inNAT);
+	sections.addVar(&inCustom);
+
+	while (config.nextToken(&line, "\n"))
+	{
+		if (line.getCharAt(line.getLength()-1) == '\r')
+			line.removeLastChar();	// there is a trailing '\r'
+
+		line.trim();
+
+		if (line.isEmpty())
+			continue;
+
+		if (!sections.isInSection() && line.compare("<PingServers>") == 0)
+		{
+			inPingServers = TRUE;
+		}
+		else if (inPingServers && line.compare("</PingServers>") == 0)
+		{
+			inPingServers = FALSE;
+		}
+		else if (!sections.isInSection() && line.compare("<PingDuration>") == 0)
+		{
+			inPingDuration = TRUE;
+		}
+		else if (inPingDuration && line.compare("</PingDuration>") == 0)
+		{
+			inPingDuration = FALSE;
+		}
+		else if (!sections.isInSection() && line.compare("<QMMaps>") == 0)
+		{
+			inQMMaps = TRUE;
+		}
+		else if (inQMMaps && line.compare("</QMMaps>") == 0)
+		{
+			inQMMaps = FALSE;
+		}
+		else if (!sections.isInSection() && line.compare("<Manglers>") == 0)
+		{
+			inManglers = TRUE;
+		}
+		else if (inManglers && line.compare("</Manglers>") == 0)
+		{
+			inManglers = FALSE;
+		}
+		else if (!sections.isInSection() && line.compare("<QMBot>") == 0)
+		{
+			inQMBot = TRUE;
+		}
+		else if (inQMBot && line.compare("</QMBot>") == 0)
+		{
+			inQMBot = FALSE;
+		}
+		else if (!sections.isInSection() && line.compare("<VIP>") == 0)
+		{
+			inVIP = TRUE;
+		}
+		else if (inVIP && line.compare("</VIP>") == 0)
+		{
+			inVIP = FALSE;
+		}
+		else if (!sections.isInSection() && line.compare("<NAT>") == 0)
+		{
+			inNAT = TRUE;
+		}
+		else if (inNAT && line.compare("</NAT>") == 0)
+		{
+			inNAT = FALSE;
+		}
+		else if (!sections.isInSection() && line.compare("<Custom>") == 0)
+		{
+			inCustom = TRUE;
+		}
+		else if (inCustom && line.compare("</Custom>") == 0)
+		{
+			inCustom = FALSE;
+		}
+		else if (inVIP)
+		{
+			line.toLower();
+			if (line.getLength())
+			{
+				Int val = atoi(line.str());
+				if (val > 0)
+					m_vip.insert(val);
+			}
+		}
+		else if (inPingServers)
+		{
+			line.toLower();
+			m_pingServers.push_back(line);
+		}
+		else if (inPingDuration)
+		{
+			line.toLower();
+			AsciiString key, val;
+			if (line.nextToken(&key, " ="))
+			{
+				if (key == "reps")
+				{
+					if (line.nextToken(&val, " ="))
+					{
+						m_pingReps = atoi(val.str());
+					}
+				}
+				else if (key == "timeout")
+				{
+					if (line.nextToken(&val, " ="))
+					{
+						m_pingTimeout = atoi(val.str());
+					}
+				}
+				else if (key == "low")
+				{
+					if (line.nextToken(&val, " ="))
+					{
+						m_pingCutoffGood = atoi(val.str());
+					}
+				}
+				else if (key == "med")
+				{
+					if (line.nextToken(&val, " ="))
+					{
+						m_pingCutoffBad = atoi(val.str());
+					}
+				}
+			}
+		}
+		else if (inManglers)
+		{
+			line.trim();
+			line.toLower();
+			AsciiString hostStr;
+			AsciiString portStr;
+			line.nextToken(&hostStr, ":");
+			line.nextToken(&portStr, ":\n\r");
+			if (hostStr.isNotEmpty() && portStr.isNotEmpty())
+			{
+				m_manglerHosts.push_back(hostStr);
+				m_manglerPorts.push_back(atoi(portStr.str()));
+			}
+		}
+		else if (inQMMaps)
+		{
+			line.toLower();
+			AsciiString mapName;
+			mapName.format("%s\\%s\\%s.map", TheMapCache->getMapDir().str(), line.str(), line.str());
+			mapName = TheGameState->portableMapPathToRealMapPath(TheGameState->realMapPathToPortableMapPath(mapName));
+			mapName.toLower();
+
+			// [SKB: Jul 01 2003 @ 6:43pm] :
+			// German2 is missing some maps because of content.  But, we need the m_qmMaps
+			// to contain same number of strings as the Retail version so that the
+			// QM Bot thinks that they have the same number of maps.
+			#if RTS_GENERALS
+			m_qmMaps.push_back(mapName);
+			#else
+			const MapMetaData *md = TheMapCache->findMap(mapName);
+			if (md)
+			{
+				m_qmMaps.push_back(mapName);
+			}
+			#endif
+		}
+		else if (inQMBot)
+		{
+			line.toLower();
+			AsciiString key, val;
+			if (line.nextToken(&key, " ="))
+			{
+				if (key == "id")
+				{
+					if (line.nextToken(&val, " ="))
+					{
+						m_qmBotID = atoi(val.str());
+					}
+				}
+			}
+		}
+		else if (inNAT)
+		{
+			line.toLower();
+			AsciiString key, val;
+			if (line.nextToken(&key, " ="))
+			{
+				if (key == "retryinterval")
+				{
+					if (line.nextToken(&val, " ="))
+					{
+						m_natRetryInterval = atoi(val.str());
+					}
+				}
+				else if (key == "manglerretries")
+				{
+					if (line.nextToken(&val, " ="))
+					{
+						m_natMaxManglerRetries = atoi(val.str());
+					}
+				}
+				else if (key == "manglerinterval")
+				{
+					if (line.nextToken(&val, " ="))
+					{
+						m_natManglerRetryInterval = atoi(val.str());
+					}
+				}
+				else if (key == "keepaliveinterval")
+				{
+					if (line.nextToken(&val, " ="))
+					{
+						m_natKeepaliveInterval = atoi(val.str());
+					}
+				}
+				else if (key == "porttimeout")
+				{
+					if (line.nextToken(&val, " ="))
+					{
+						m_natPortTimeout = atoi(val.str());
+					}
+				}
+				else if (key == "roundtimeout")
+				{
+					if (line.nextToken(&val, " ="))
+					{
+						m_natRoundTimeout = atoi(val.str());
+					}
+				}
+				else
+				{
+					DEBUG_LOG(("Unknown key '%s' = '%s' in NAT block of GameSpy Config", key.str(), val.str()));
+				}
+			}
+			else
+			{
+				DEBUG_LOG(("Key '%s' missing val in NAT block of GameSpy Config", key.str()));
+			}
+		}
+		else if (inCustom)
+		{
+			line.toLower();
+			AsciiString key, val;
+			if (line.nextToken(&key, " =") && line.nextToken(&val, " ="))
+			{
+				if (key == "restricted")
+				{
+					m_restrictGamesToLobby = atoi(val.str());
+				}
+				else
+				{
+					DEBUG_LOG(("Unknown key '%s' = '%s' in Custom block of GameSpy Config", key.str(), val.str()));
+				}
+			}
+			else
+			{
+				DEBUG_LOG(("Key '%s' missing val in Custom block of GameSpy Config", key.str()));
+			}
+		}
+		else
+		{
+			m_leftoverConfig.concat(line);
+			m_leftoverConfig.concat('\n');
+		}
+	}
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+Int GameSpyConfig::getPointsForRank(Int rank)
+{
+	if (rank >= MAX_RANKS) rank = MAX_RANKS-1;
+	if (rank < 0) rank = 0;
+	return m_rankPoints[rank];
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+Bool GameSpyConfig::getManglerLocation(Int index, AsciiString& host, UnsignedShort& port)
+{
+	if (index < 0 || index >= m_manglerHosts.size())
+	{
+		return FALSE;
+	}
+
+	host = m_manglerHosts[index];
+	port = m_manglerPorts[index];
+	return TRUE;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+Bool GameSpyConfig::isPlayerVIP(Int id)
+{
+	std::set<Int>::const_iterator it = std::find(m_vip.begin(), m_vip.end(), id);
+	return it != m_vip.end();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp
new file mode 100644
index 00000000000..c59f0613a2f
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp
@@ -0,0 +1,525 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: LadderDefs.cpp //////////////////////////////////////////////////////
+// Generals ladder code
+// Author: Matthew D. Campbell, August 2002
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/GameSpy/ThreadUtils.h"
+#include "GameNetwork/GameSpy/LadderDefs.h"
+#include "GameNetwork/GameSpy/PeerDefs.h"
+#include "GameNetwork/GameSpy/GSConfig.h"
+#include "Common/GameState.h"
+#include "Common/file.h"
+#include "Common/FileSystem.h"
+#include "Common/PlayerTemplate.h"
+#include "GameClient/GameText.h"
+#include "GameClient/MapUtil.h"
+
+
+LadderList *TheLadderList = NULL;
+
+LadderInfo::LadderInfo()
+{
+	playersPerTeam = 1;
+	minWins = 0;
+	maxWins = 0;
+	randomMaps = TRUE;
+	randomFactions = TRUE;
+	validQM = TRUE;
+	validCustom = FALSE;
+	port = 0;
+	submitReplay = FALSE;
+	index = -1;
+}
+
+static LadderInfo *parseLadder(AsciiString raw)
+{
+	DEBUG_LOG(("Looking at ladder:\n%s", raw.str()));
+	LadderInfo *lad = NULL;
+	AsciiString line;
+	while (raw.nextToken(&line, "\n"))
+	{
+		if (line.getCharAt(line.getLength()-1) == '\r')
+			line.removeLastChar();	// there is a trailing '\r'
+
+		line.trim();
+
+		if (line.isEmpty())
+			continue;
+
+		// woohoo!  got a line!
+		line.trim();
+		if ( !lad && line.startsWith("<Ladder ") )
+		{
+			// start of a ladder def
+			lad = NEW LadderInfo;
+
+			// fill in some info
+			AsciiString tokenName, tokenAddr, tokenPort, tokenHomepage;
+			line.removeLastChar(); // the '>'
+			line = line.str() + 7; // the "<Ladder "
+			line.nextToken(&tokenAddr, "\" ");
+			line.nextToken(&tokenPort, " ");
+			line.nextToken(&tokenHomepage, " ");
+
+			lad->name = MultiByteToWideCharSingleLine(tokenName.str()).c_str();
+			lad->name.truncateTo(20); // Per Harvard's request, ladder names are limited to 20 chars
+			lad->address = tokenAddr;
+			lad->port = atoi(tokenPort.str());
+			lad->homepageURL = tokenHomepage;
+		}
+		else if ( lad && line.startsWith("Name ") )
+		{
+			lad->name = MultiByteToWideCharSingleLine(line.str() + 5).c_str();
+		}
+		else if ( lad && line.startsWith("Desc ") )
+		{
+			lad->description = MultiByteToWideCharSingleLine(line.str() + 5).c_str();
+		}
+		else if ( lad && line.startsWith("Loc ") )
+		{
+			lad->location = MultiByteToWideCharSingleLine(line.str() + 4).c_str();
+		}
+		else if ( lad && line.startsWith("TeamSize ") )
+		{
+			lad->playersPerTeam = atoi(line.str() + 9);
+		}
+		else if ( lad && line.startsWith("RandomMaps ") )
+		{
+			lad->randomMaps = atoi(line.str() + 11);
+		}
+		else if ( lad && line.startsWith("RandomFactions ") )
+		{
+			lad->randomFactions = atoi(line.str() + 15);
+		}
+		else if ( lad && line.startsWith("Faction ") )
+		{
+			AsciiString faction = line.str() + 8;
+			AsciiStringList outStringList;
+			ThePlayerTemplateStore->getAllSideStrings(&outStringList);
+
+			AsciiStringList::iterator aIt = std::find(outStringList.begin(), outStringList.end(), faction);
+			if (aIt != outStringList.end())
+			{
+				// valid faction - now check for dupes
+				aIt = std::find(lad->validFactions.begin(), lad->validFactions.end(), faction);
+				if (aIt == lad->validFactions.end())
+				{
+					lad->validFactions.push_back(faction);
+				}
+			}
+		}
+		/*
+		else if ( lad && line.startsWith("QM ") )
+		{
+			lad->validQM = atoi(line.str() + 3);
+		}
+		else if ( lad && line.startsWith("Custom ") )
+		{
+			lad->validCustom = atoi(line.str() + 7);
+		}
+		*/
+		else if ( lad && line.startsWith("MinWins ") )
+		{
+			lad->minWins = atoi(line.str() + 8);
+		}
+		else if ( lad && line.startsWith("MaxWins ") )
+		{
+			lad->maxWins = atoi(line.str() + 8);
+		}
+		else if ( lad && line.startsWith("CryptedPass ") )
+		{
+			lad->cryptedPassword = line.str() + 12;
+		}
+		else if ( lad && line.compare("</Ladder>") == 0 )
+		{
+			DEBUG_LOG(("Saw a ladder: name=%ls, addr=%s:%d, players=%dv%d, pass=%s, replay=%d, homepage=%s",
+				lad->name.str(), lad->address.str(), lad->port, lad->playersPerTeam, lad->playersPerTeam, lad->cryptedPassword.str(),
+				lad->submitReplay, lad->homepageURL.str()));
+			// end of a ladder
+			if (lad->playersPerTeam >= 1 && lad->playersPerTeam <= MAX_SLOTS/2)
+			{
+				if (lad->validFactions.empty())
+				{
+					DEBUG_LOG(("No factions specified.  Using all."));
+					lad->validFactions.clear();
+					Int numTemplates = ThePlayerTemplateStore->getPlayerTemplateCount();
+					for ( Int i = 0; i < numTemplates; ++i )
+					{
+						const PlayerTemplate *pt = ThePlayerTemplateStore->getNthPlayerTemplate(i);
+						if (!pt)
+							continue;
+
+						if (pt->isPlayableSide()  &&  pt->getSide().compare("Boss") != 0 )
+							lad->validFactions.push_back(pt->getSide());
+					}
+				}
+				else
+				{
+					AsciiStringList validFactions = lad->validFactions;
+					for (AsciiStringListIterator it = validFactions.begin(); it != validFactions.end(); ++it)
+					{
+						AsciiString faction = *it;
+						AsciiString marker;
+						marker.format("INI:Faction%s", faction.str());
+						DEBUG_LOG(("Faction %s has marker %s corresponding to str %ls", faction.str(), marker.str(), TheGameText->fetch(marker).str()));
+					}
+				}
+
+				if (lad->validMaps.empty())
+				{
+					DEBUG_LOG(("No maps specified.  Using all."));
+					std::list<AsciiString> qmMaps = TheGameSpyConfig->getQMMaps();
+					for (std::list<AsciiString>::const_iterator it = qmMaps.begin(); it != qmMaps.end(); ++it)
+					{
+						AsciiString mapName = *it;
+
+						// check sizes on the maps before allowing them
+						const MapMetaData *md = TheMapCache->findMap(mapName);
+						if (md && md->m_numPlayers >= lad->playersPerTeam*2)
+						{
+							lad->validMaps.push_back(mapName);
+						}
+					}
+				}
+				return lad;
+			}
+			else
+			{
+				// no maps?  don't play on it!
+				delete lad;
+				lad = NULL;
+				return NULL;
+			}
+		}
+		else if ( lad && line.startsWith("Map ") )
+		{
+			// valid map
+			AsciiString mapName = line.str() + 4;
+			mapName.trim();
+			if (mapName.isNotEmpty())
+			{
+				mapName.format("%s\\%s\\%s.map", TheMapCache->getMapDir().str(), mapName.str(), mapName.str());
+				mapName = TheGameState->portableMapPathToRealMapPath(TheGameState->realMapPathToPortableMapPath(mapName));
+				mapName.toLower();
+				std::list<AsciiString> qmMaps = TheGameSpyConfig->getQMMaps();
+				if (std::find(qmMaps.begin(), qmMaps.end(), mapName) != qmMaps.end())
+				{
+					// check sizes on the maps before allowing them
+					const MapMetaData *md = TheMapCache->findMap(mapName);
+					if (md && md->m_numPlayers >= lad->playersPerTeam*2)
+						lad->validMaps.push_back(mapName);
+				}
+			}
+		}
+		else
+		{
+			// bad ladder - kill it
+			delete lad;
+			lad = NULL;
+		}
+	}
+
+	delete lad;
+	return NULL;
+}
+
+LadderList::LadderList()
+{
+	//Int profile = TheGameSpyInfo->getLocalProfileID();
+
+	AsciiString rawMotd = TheGameSpyConfig->getLeftoverConfig();
+	AsciiString line;
+	Bool inLadders = FALSE;
+	Bool inSpecialLadders = FALSE;
+	Bool inLadder = FALSE;
+	LadderInfo *lad = NULL;
+	Int index = 1;
+	AsciiString rawLadder;
+
+	while (rawMotd.nextToken(&line, "\n"))
+	{
+		if (line.getCharAt(line.getLength()-1) == '\r')
+			line.removeLastChar();	// there is a trailing '\r'
+
+		line.trim();
+
+		if (line.isEmpty())
+			continue;
+
+		if (!inLadders && line.compare("<Ladders>") == 0)
+		{
+			inLadders = TRUE;
+			rawLadder.clear();
+		}
+		else if (inLadders && line.compare("</Ladders>") == 0)
+		{
+			inLadders = FALSE;
+		}
+		else if (!inSpecialLadders && line.compare("<SpecialLadders>") == 0)
+		{
+			inSpecialLadders = TRUE;
+			rawLadder.clear();
+		}
+		else if (inSpecialLadders && line.compare("</SpecialLadders>") == 0)
+		{
+			inSpecialLadders = FALSE;
+		}
+		else if (inLadders || inSpecialLadders)
+		{
+			if (line.startsWith("<Ladder ") && !inLadder)
+			{
+				inLadder = TRUE;
+				rawLadder.clear();
+				rawLadder.concat(line);
+				rawLadder.concat('\n');
+			}
+			else if (line.compare("</Ladder>") == 0 && inLadder)
+			{
+				inLadder = FALSE;
+				rawLadder.concat(line);
+				rawLadder.concat('\n');
+				if ((lad = parseLadder(rawLadder)) != NULL)
+				{
+					lad->index = index++;
+					if (inLadders)
+					{
+						DEBUG_LOG(("Adding to standard ladders"));
+						m_standardLadders.push_back(lad);
+					}
+					else
+					{
+						DEBUG_LOG(("Adding to special ladders"));
+						m_specialLadders.push_back(lad);
+					}
+				}
+				rawLadder.clear();
+			}
+			else if (inLadder)
+			{
+				rawLadder.concat(line);
+				rawLadder.concat('\n');
+			}
+		}
+	}
+
+	// look for local ladders
+	loadLocalLadders();
+
+	DEBUG_LOG(("After looking for ladders, we have %d local, %d special && %d normal", m_localLadders.size(), m_specialLadders.size(), m_standardLadders.size()));
+}
+
+LadderList::~LadderList()
+{
+	LadderInfoList::iterator it;
+	for (it = m_specialLadders.begin(); it != m_specialLadders.end(); it = m_specialLadders.begin())
+	{
+		delete *it;
+		m_specialLadders.pop_front();
+	}
+	for (it = m_standardLadders.begin(); it != m_standardLadders.end(); it = m_standardLadders.begin())
+	{
+		delete *it;
+		m_standardLadders.pop_front();
+	}
+	for (it = m_localLadders.begin(); it != m_localLadders.end(); it = m_localLadders.begin())
+	{
+		delete *it;
+		m_localLadders.pop_front();
+	}
+}
+
+const LadderInfo* LadderList::findLadder( const AsciiString& addr, UnsignedShort port )
+{
+	LadderInfoList::const_iterator cit;
+
+	for (cit = m_specialLadders.begin(); cit != m_specialLadders.end(); ++cit)
+	{
+		const LadderInfo *li = *cit;
+		if (li->address == addr && li->port == port)
+		{
+			return li;
+		}
+	}
+
+	for (cit = m_standardLadders.begin(); cit != m_standardLadders.end(); ++cit)
+	{
+		const LadderInfo *li = *cit;
+		if (li->address == addr && li->port == port)
+		{
+			return li;
+		}
+	}
+
+	for (cit = m_localLadders.begin(); cit != m_localLadders.end(); ++cit)
+	{
+		const LadderInfo *li = *cit;
+		if (li->address == addr && li->port == port)
+		{
+			return li;
+		}
+	}
+
+	return NULL;
+}
+
+const LadderInfo* LadderList::findLadderByIndex( Int index )
+{
+	if (index == 0)
+		return NULL;
+
+	LadderInfoList::const_iterator cit;
+
+	for (cit = m_specialLadders.begin(); cit != m_specialLadders.end(); ++cit)
+	{
+		const LadderInfo *li = *cit;
+		if (li->index == index)
+		{
+			return li;
+		}
+	}
+
+	for (cit = m_standardLadders.begin(); cit != m_standardLadders.end(); ++cit)
+	{
+		const LadderInfo *li = *cit;
+		if (li->index == index)
+		{
+			return li;
+		}
+	}
+
+	for (cit = m_localLadders.begin(); cit != m_localLadders.end(); ++cit)
+	{
+		const LadderInfo *li = *cit;
+		if (li->index == index)
+		{
+			return li;
+		}
+	}
+
+	return NULL;
+}
+
+const LadderInfoList* LadderList::getSpecialLadders( void )
+{
+	return &m_specialLadders;
+}
+
+const LadderInfoList* LadderList::getStandardLadders( void )
+{
+	return &m_standardLadders;
+}
+
+const LadderInfoList* LadderList::getLocalLadders( void )
+{
+	return &m_localLadders;
+}
+
+void LadderList::loadLocalLadders( void )
+{
+	AsciiString dirname;
+	dirname.format("%sGeneralsOnline\\Ladders\\", TheGlobalData->getPath_UserData().str());
+	FilenameList filenameList;
+	TheFileSystem->getFileListInDirectory(dirname, "*.ini", filenameList, TRUE);
+
+	Int index = -1;
+
+	FilenameList::iterator it = filenameList.begin();
+	while (it != filenameList.end())
+	{
+		AsciiString filename = *it;
+		DEBUG_LOG(("Looking at possible ladder info file '%s'", filename.str()));
+		filename.toLower();
+		checkLadder( filename, index-- );
+		++it;
+	}
+}
+
+void LadderList::checkLadder( AsciiString fname, Int index )
+{
+	File *fp = TheFileSystem->openFile(fname.str(), File::READ | File::TEXT);
+	char buf[1024];
+	AsciiString rawData;
+	if (fp)
+	{
+		Int len;
+		while (!fp->eof())
+		{
+			len = fp->read(buf, 1023);
+			buf[len] = 0;
+			buf[1023] = 0;
+			rawData.concat(buf);
+		}
+		fp->close();
+		fp = NULL;
+	}
+
+	DEBUG_LOG(("Read %d bytes from '%s'", rawData.getLength(), fname.str()));
+	if (rawData.isEmpty())
+		return;
+
+	LadderInfo *li = parseLadder(rawData);
+	if (!li)
+	{
+		return;
+	}
+
+	// sanity check
+	if (li->address.isEmpty())
+	{
+		DEBUG_LOG(("Bailing because of li->address.isEmpty()"));
+		delete li;
+		return;
+	}
+
+	if (!li->port)
+	{
+		DEBUG_LOG(("Bailing because of !li->port"));
+		delete li;
+		return;
+	}
+
+	if (li->validMaps.empty())
+	{
+		DEBUG_LOG(("Bailing because of li->validMaps.empty()"));
+		delete li;
+		return;
+	}
+
+	li->index = index;
+
+	// ladders are QM-only at this point, which kinda invalidates the whole concept of local ladders.  Oh well.
+	li->validQM = FALSE; // no local ladders in QM
+	li->validCustom = FALSE;
+
+	//for (Int i=0; i<4; ++i)
+	//	fname.removeLastChar(); // remove .lad
+	//li->name = UnicodeString(MultiByteToWideCharSingleLine(fname.reverseFind('\\')+1).c_str());
+
+	DEBUG_LOG(("Adding local ladder %ls", li->name.str()));
+	m_localLadders.push_back(li);
+}
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp
new file mode 100644
index 00000000000..7ac0d39b852
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp
@@ -0,0 +1,939 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////
+// FILE: LobbyUtils.cpp
+// Author: Matthew D. Campbell, Sept 2002
+// Description: GameSpy lobby utils
+///////////////////////////////////////////////////////////////////////////////////////
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/GameEngine.h"
+#include "Common/MultiplayerSettings.h"
+#include "Common/PlayerTemplate.h"
+#include "Common/version.h"
+#include "GameClient/AnimateWindowManager.h"
+#include "GameClient/WindowLayout.h"
+#include "GameClient/Gadget.h"
+#include "GameClient/Image.h"
+#include "GameClient/Shell.h"
+#include "GameClient/KeyDefs.h"
+#include "GameClient/GameWindowManager.h"
+#include "GameClient/GadgetComboBox.h"
+#include "GameClient/GadgetListBox.h"
+#include "GameClient/GadgetTextEntry.h"
+#include "GameClient/GameText.h"
+#include "GameClient/MapUtil.h"
+#include "GameClient/MessageBox.h"
+#include "GameClient/Mouse.h"
+#include "GameNetwork/GameSpyOverlay.h"
+
+#include "GameClient/LanguageFilter.h"
+#include "GameNetwork/GameSpy/BuddyDefs.h"
+#include "GameNetwork/GameSpy/LadderDefs.h"
+#include "GameNetwork/GameSpy/LobbyUtils.h"
+#include "GameNetwork/GameSpy/PeerDefs.h"
+#include "GameNetwork/GameSpy/PeerThread.h"
+#include "GameNetwork/GameSpy/PersistentStorageDefs.h"
+#include "GameNetwork/GameSpy/GSConfig.h"
+
+#include "Common/STLTypedefs.h"
+
+
+// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
+// Note: if you add more columns, you must modify the .wnd files and change the listbox properties (yuck!)
+enum {
+	COLUMN_NAME = 0,
+	COLUMN_MAP,
+	COLUMN_LADDER,
+	COLUMN_NUMPLAYERS,
+	COLUMN_PASSWORD,
+	COLUMN_OBSERVER,
+#if !RTS_GENERALS
+  COLUMN_USE_STATS,
+#endif
+	COLUMN_PING,
+};
+
+static NameKeyType buttonSortAlphaID = NAMEKEY_INVALID;
+static NameKeyType buttonSortPingID = NAMEKEY_INVALID;
+static NameKeyType buttonSortBuddiesID = NAMEKEY_INVALID;
+static NameKeyType windowSortAlphaID = NAMEKEY_INVALID;
+static NameKeyType windowSortPingID = NAMEKEY_INVALID;
+static NameKeyType windowSortBuddiesID = NAMEKEY_INVALID;
+
+static GameWindow *buttonSortAlpha = NULL;
+static GameWindow *buttonSortPing = NULL;
+static GameWindow *buttonSortBuddies = NULL;
+static GameWindow *windowSortAlpha = NULL;
+static GameWindow *windowSortPing = NULL;
+static GameWindow *windowSortBuddies = NULL;
+
+static GameSortType theGameSortType = GAMESORT_ALPHA_ASCENDING;
+static Bool sortBuddies = TRUE;
+static void showSortIcons(void)
+{
+	if (windowSortAlpha && windowSortPing)
+	{
+		switch(theGameSortType)
+		{
+			case GAMESORT_ALPHA_ASCENDING:
+				windowSortAlpha->winHide(FALSE);
+				windowSortAlpha->winEnable(TRUE);
+				windowSortPing->winHide(TRUE);
+				break;
+			case GAMESORT_ALPHA_DESCENDING:
+				windowSortAlpha->winHide(FALSE);
+				windowSortAlpha->winEnable(FALSE);
+				windowSortPing->winHide(TRUE);
+				break;
+			case GAMESORT_PING_ASCENDING:
+				windowSortPing->winHide(FALSE);
+				windowSortPing->winEnable(TRUE);
+				windowSortAlpha->winHide(TRUE);
+				break;
+			case GAMESORT_PING_DESCENDING:
+				windowSortPing->winHide(FALSE);
+				windowSortPing->winEnable(FALSE);
+				windowSortAlpha->winHide(TRUE);
+				break;
+		}
+	}
+
+	if (sortBuddies)
+	{
+		if (windowSortBuddies)
+		{
+			windowSortBuddies->winHide(FALSE);
+		}
+	}
+	else
+	{
+		if (windowSortBuddies)
+		{
+			windowSortBuddies->winHide(TRUE);
+		}
+	}
+}
+void setSortMode( GameSortType sortType ) { theGameSortType = sortType; showSortIcons(); RefreshGameListBoxes(); }
+void sortByBuddies( Bool doSort ) { sortBuddies = doSort; showSortIcons(); RefreshGameListBoxes(); }
+
+Bool HandleSortButton( NameKeyType sortButton )
+{
+	if (sortButton == buttonSortBuddiesID)
+	{
+		sortByBuddies( !sortBuddies );
+		return TRUE;
+	}
+	else if (sortButton == buttonSortAlphaID)
+	{
+		if (theGameSortType == GAMESORT_ALPHA_ASCENDING)
+		{
+			setSortMode(GAMESORT_ALPHA_DESCENDING);
+		}
+		else
+		{
+			setSortMode(GAMESORT_ALPHA_ASCENDING);
+		}
+		return TRUE;
+	}
+	else if (sortButton == buttonSortPingID)
+	{
+		if (theGameSortType == GAMESORT_PING_ASCENDING)
+		{
+			setSortMode(GAMESORT_PING_DESCENDING);
+		}
+		else
+		{
+			setSortMode(GAMESORT_PING_ASCENDING);
+		}
+		return TRUE;
+	}
+	return FALSE;
+}
+
+// window ids ------------------------------------------------------------------------------
+static NameKeyType parentID = NAMEKEY_INVALID;
+//static NameKeyType parentGameListSmallID = NAMEKEY_INVALID;
+static NameKeyType parentGameListLargeID = NAMEKEY_INVALID;
+static NameKeyType listboxLobbyGamesSmallID = NAMEKEY_INVALID;
+static NameKeyType listboxLobbyGamesLargeID = NAMEKEY_INVALID;
+//static NameKeyType listboxLobbyGameInfoID = NAMEKEY_INVALID;
+
+// Window Pointers ------------------------------------------------------------------------
+static GameWindow *parent = NULL;
+//static GameWindow *parentGameListSmall = NULL;
+static GameWindow *parentGameListLarge = NULL;
+       //GameWindow *listboxLobbyGamesSmall = NULL;
+       GameWindow *listboxLobbyGamesLarge = NULL;
+       //GameWindow *listboxLobbyGameInfo = NULL;
+
+static const Image *pingImages[3] = { NULL, NULL, NULL };
+
+static void gameTooltip(GameWindow *window,
+													WinInstanceData *instData,
+													UnsignedInt mouse)
+{
+	Int x, y, row, col;
+	x = LOLONGTOSHORT(mouse);
+	y = HILONGTOSHORT(mouse);
+
+	GadgetListBoxGetEntryBasedOnXY(window, x, y, row, col);
+
+	if (row == -1 || col == -1)
+	{
+		TheMouse->setCursorTooltip( UnicodeString::TheEmptyString);//TheGameText->fetch("TOOLTIP:GamesBeingFormed") );
+		return;
+	}
+
+	Int gameID = (Int)GadgetListBoxGetItemData(window, row, 0);
+	GameSpyStagingRoom *room = TheGameSpyInfo->findStagingRoomByID(gameID);
+	if (!room)
+	{
+		TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:UnknownGame") );
+		return;
+	}
+
+	if (col == COLUMN_PING)
+	{
+#if 0 //def DEBUG_LOGGING
+		UnicodeString s;
+		s.format(L"Ping is %d ms (cutoffs are %d ms and %d ms\n%hs local pings\n%hs remote pings",
+			room->getPingAsInt(), TheGameSpyConfig->getPingCutoffGood(), TheGameSpyConfig->getPingCutoffBad(),
+			TheGameSpyInfo->getPingString().str(), room->getPingString().str()
+		);
+		TheMouse->setCursorTooltip( s, 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
+#else
+		TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:PingInfo"), 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
+#endif
+		return;
+	}
+	if (col == COLUMN_NUMPLAYERS)
+	{
+		TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:NumberOfPlayers"), 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
+		return;
+	}
+	if (col == COLUMN_PASSWORD)
+	{
+		if (room->getHasPassword())
+		{
+			UnicodeString checkTooltip =TheGameText->fetch("TOOTIP:Password");
+			if(!checkTooltip.compare(L"Password required to joing game"))
+				checkTooltip.set(L"Password required to join game");
+			TheMouse->setCursorTooltip( checkTooltip, 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
+		}
+		else
+			TheMouse->setCursorTooltip( UnicodeString::TheEmptyString );
+		return;
+	}
+#if !RTS_GENERALS
+  if (col == COLUMN_USE_STATS)
+  {
+    if ( room->getUseStats() )
+    {
+      TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:UseStatsOn") );
+    }
+    else
+    {
+      TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:UseStatsOff") );
+    }
+    return;
+  }
+#endif
+
+	UnicodeString tooltip;
+
+	UnicodeString mapName;
+	const MapMetaData *md = TheMapCache->findMap(room->getMap());
+	if (md)
+	{
+		mapName = md->m_displayName;
+	}
+	else
+	{
+		const char *start = room->getMap().reverseFind('\\');
+		if (start)
+		{
+			++start;
+		}
+		else
+		{
+			start = room->getMap().str();
+		}
+		mapName.translate( start );
+	}
+	UnicodeString tmp;
+	tooltip.format(TheGameText->fetch("TOOLTIP:GameInfoGameName"), room->getGameName().str());
+	if (room->getLadderPort() != 0)
+	{
+		const LadderInfo *linfo = TheLadderList->findLadder(room->getLadderIP(), room->getLadderPort());
+		if (linfo)
+		{
+			tmp.format(TheGameText->fetch("TOOLTIP:GameInfoLadderName"), linfo->name.str());
+			tooltip.concat(tmp);
+		}
+	}
+	if (room->getExeCRC() != TheGlobalData->m_exeCRC || room->getIniCRC() != TheGlobalData->m_iniCRC)
+	{
+		tmp.format(TheGameText->fetch("TOOLTIP:InvalidGameVersion"), mapName.str());
+		tooltip.concat(tmp);
+	}
+	tmp.format(TheGameText->fetch("TOOLTIP:GameInfoMap"), mapName.str());
+	tooltip.concat(tmp);
+
+	AsciiString aPlayer;
+	UnicodeString player;
+	Int numPlayers = 0;
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		GameSpyGameSlot *slot = room->getGameSpySlot(i);
+		if (i == 0 && (!slot || !slot->isHuman()))
+		{
+			DEBUG_CRASH(("About to tooltip a non-hosted game!"));
+		}
+		if (slot && slot->isHuman())
+		{
+			tmp.format(TheGameText->fetch("TOOLTIP:GameInfoPlayer"), slot->getName().str(), slot->getWins(), slot->getLosses());
+			tooltip.concat(tmp);
+			++numPlayers;
+		}
+		else if (slot && slot->isAI())
+		{
+			++numPlayers;
+			switch(slot->getState())
+			{
+			case SLOT_EASY_AI:
+				tooltip.concat(L'\n');
+				tooltip.concat(TheGameText->fetch("GUI:EasyAI"));
+				break;
+			case SLOT_MED_AI:
+				tooltip.concat(L'\n');
+				tooltip.concat(TheGameText->fetch("GUI:MediumAI"));
+				break;
+			case SLOT_BRUTAL_AI:
+				tooltip.concat(L'\n');
+				tooltip.concat(TheGameText->fetch("GUI:HardAI"));
+				break;
+			}
+		}
+	}
+	DEBUG_ASSERTCRASH(numPlayers, ("Tooltipping a 0-player game!"));
+
+	TheMouse->setCursorTooltip( tooltip, 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
+}
+
+static Bool isSmall = TRUE;
+
+GameWindow *GetGameListBox( void )
+{
+	return listboxLobbyGamesLarge;
+}
+
+GameWindow *GetGameInfoListBox( void )
+{
+	return NULL;
+}
+
+NameKeyType GetGameListBoxID( void )
+{
+	return listboxLobbyGamesLargeID;
+}
+
+NameKeyType GetGameInfoListBoxID( void )
+{
+	return NAMEKEY_INVALID;
+}
+
+void GrabWindowInfo( void )
+{
+	isSmall = TRUE;
+	parentID = NAMEKEY( "WOLCustomLobby.wnd:WOLLobbyMenuParent" );
+	parent = TheWindowManager->winGetWindowFromId(NULL, parentID);
+
+	pingImages[0] = TheMappedImageCollection->findImageByName("Ping03");
+	pingImages[1] = TheMappedImageCollection->findImageByName("Ping02");
+	pingImages[2] = TheMappedImageCollection->findImageByName("Ping01");
+	DEBUG_ASSERTCRASH(pingImages[0], ("Can't find ping image!"));
+	DEBUG_ASSERTCRASH(pingImages[1], ("Can't find ping image!"));
+	DEBUG_ASSERTCRASH(pingImages[2], ("Can't find ping image!"));
+
+//	parentGameListSmallID = NAMEKEY( "WOLCustomLobby.wnd:ParentGameListSmall" );
+//	parentGameListSmall = TheWindowManager->winGetWindowFromId(NULL, parentGameListSmallID);
+
+	parentGameListLargeID = NAMEKEY( "WOLCustomLobby.wnd:ParentGameListLarge" );
+	parentGameListLarge = TheWindowManager->winGetWindowFromId(NULL, parentGameListLargeID);
+
+	listboxLobbyGamesSmallID = NAMEKEY( "WOLCustomLobby.wnd:ListboxGames" );
+//	listboxLobbyGamesSmall = TheWindowManager->winGetWindowFromId(NULL, listboxLobbyGamesSmallID);
+//	listboxLobbyGamesSmall->winSetTooltipFunc(gameTooltip);
+
+	listboxLobbyGamesLargeID = NAMEKEY( "WOLCustomLobby.wnd:ListboxGamesLarge" );
+	listboxLobbyGamesLarge = TheWindowManager->winGetWindowFromId(NULL, listboxLobbyGamesLargeID);
+	listboxLobbyGamesLarge->winSetTooltipFunc(gameTooltip);
+//
+//	listboxLobbyGameInfoID = NAMEKEY( "WOLCustomLobby.wnd:ListboxGameInfo" );
+//	listboxLobbyGameInfo = TheWindowManager->winGetWindowFromId(NULL, listboxLobbyGameInfoID);
+
+	buttonSortAlphaID = NAMEKEY("WOLCustomLobby.wnd:ButtonSortAlpha");
+	buttonSortPingID = NAMEKEY("WOLCustomLobby.wnd:ButtonSortPing");
+	buttonSortBuddiesID = NAMEKEY("WOLCustomLobby.wnd:ButtonSortBuddies");
+	windowSortAlphaID = NAMEKEY("WOLCustomLobby.wnd:WindowSortAlpha");
+	windowSortPingID = NAMEKEY("WOLCustomLobby.wnd:WindowSortPing");
+	windowSortBuddiesID = NAMEKEY("WOLCustomLobby.wnd:WindowSortBuddies");
+
+	buttonSortAlpha = TheWindowManager->winGetWindowFromId(parent, buttonSortAlphaID);
+	buttonSortPing = TheWindowManager->winGetWindowFromId(parent, buttonSortPingID);
+	buttonSortBuddies = TheWindowManager->winGetWindowFromId(parent, buttonSortBuddiesID);
+	windowSortAlpha = TheWindowManager->winGetWindowFromId(parent, windowSortAlphaID);
+	windowSortPing = TheWindowManager->winGetWindowFromId(parent, windowSortPingID);
+	windowSortBuddies = TheWindowManager->winGetWindowFromId(parent, windowSortBuddiesID);
+
+	showSortIcons();
+}
+
+void ReleaseWindowInfo( void )
+{
+	isSmall = TRUE;
+	parent = NULL;
+//	parentGameListSmall = NULL;
+	parentGameListLarge = NULL;
+//	listboxLobbyGamesSmall = NULL;
+	listboxLobbyGamesLarge = NULL;
+//	listboxLobbyGameInfo = NULL;
+
+	buttonSortAlpha = NULL;
+	buttonSortPing = NULL;
+	buttonSortBuddies = NULL;
+	windowSortAlpha = NULL;
+	windowSortPing = NULL;
+	windowSortBuddies = NULL;
+}
+
+typedef std::set<GameSpyStagingRoom *> BuddyGameSet;
+static BuddyGameSet *theBuddyGames = NULL;
+static void populateBuddyGames(void)
+{
+	BuddyInfoMap *m = TheGameSpyInfo->getBuddyMap();
+	theBuddyGames = NEW BuddyGameSet;
+	if (!m)
+	{
+		return;
+	}
+	for (BuddyInfoMap::const_iterator bit = m->begin(); bit != m->end(); ++bit)
+	{
+		BuddyInfo info = bit->second;
+		if (info.m_status == GP_STAGING)
+		{
+			StagingRoomMap *srm = TheGameSpyInfo->getStagingRoomList();
+			for (StagingRoomMap::iterator srmIt = srm->begin(); srmIt != srm->end(); ++srmIt)
+			{
+				GameSpyStagingRoom *game = srmIt->second;
+				game->cleanUpSlotPointers();
+				const GameSpyGameSlot *slot = game->getGameSpySlot(0);
+				if (slot && slot->getName() == info.m_locationString)
+				{
+					theBuddyGames->insert(game);
+					break;
+				}
+			}
+		}
+	}
+}
+
+static void clearBuddyGames(void)
+{
+	delete theBuddyGames;
+	theBuddyGames = NULL;
+}
+
+struct GameSortStruct
+{
+	bool operator()(GameSpyStagingRoom *g1, GameSpyStagingRoom *g2) const
+	{
+		// sort CRC mismatches to the bottom
+		Bool g1Good = (g1->getExeCRC() != TheGlobalData->m_exeCRC || g1->getIniCRC() != TheGlobalData->m_iniCRC);
+		Bool g2Good = (g1->getExeCRC() != TheGlobalData->m_exeCRC || g1->getIniCRC() != TheGlobalData->m_iniCRC);
+		if ( g1Good ^ g2Good )
+		{
+			return g1Good;
+		}
+
+		// sort games with private ladders to the bottom
+		Bool g1UnknownLadder = (g1->getLadderPort() && TheLadderList->findLadder(g1->getLadderIP(), g1->getLadderPort()) == NULL);
+		Bool g2UnknownLadder = (g2->getLadderPort() && TheLadderList->findLadder(g2->getLadderIP(), g2->getLadderPort()) == NULL);
+		if ( g1UnknownLadder ^ g2UnknownLadder )
+		{
+			return g2UnknownLadder;
+		}
+
+		// sort full games to the bottom
+		Bool g1Full = (g1->getNumNonObserverPlayers() == g1->getMaxPlayers() || g1->getNumPlayers() == MAX_SLOTS);
+		Bool g2Full = (g2->getNumNonObserverPlayers() == g2->getMaxPlayers() || g2->getNumPlayers() == MAX_SLOTS);
+		if ( g1Full ^ g2Full )
+		{
+			return g2Full;
+		}
+
+		if (sortBuddies)
+		{
+			Bool g1HasBuddies = (theBuddyGames->find(g1) != theBuddyGames->end());
+			Bool g2HasBuddies = (theBuddyGames->find(g2) != theBuddyGames->end());
+			if ( g1HasBuddies ^ g2HasBuddies )
+			{
+				return g1HasBuddies;
+			}
+		}
+
+		switch(theGameSortType)
+		{
+		case GAMESORT_ALPHA_ASCENDING:
+			return wcsicmp(g1->getGameName().str(), g2->getGameName().str()) < 0;
+			break;
+		case GAMESORT_ALPHA_DESCENDING:
+			return wcsicmp(g1->getGameName().str(),g2->getGameName().str()) > 0;
+			break;
+		case GAMESORT_PING_ASCENDING:
+			return g1->getPingAsInt() < g2->getPingAsInt();
+			break;
+		case GAMESORT_PING_DESCENDING:
+			return g1->getPingAsInt() > g2->getPingAsInt();
+			break;
+		}
+		return false;
+	}
+};
+
+static Int insertGame( GameWindow *win, GameSpyStagingRoom *game, Bool showMap )
+{
+	game->cleanUpSlotPointers();
+	Color gameColor = GameSpyColor[GSCOLOR_GAME];
+	if (game->getNumNonObserverPlayers() == game->getMaxPlayers() || game->getNumPlayers() == MAX_SLOTS)
+	{
+		gameColor = GameSpyColor[GSCOLOR_GAME_FULL];
+	}
+	if (game->getExeCRC() != TheGlobalData->m_exeCRC || game->getIniCRC() != TheGlobalData->m_iniCRC)
+	{
+		gameColor = GameSpyColor[GSCOLOR_GAME_CRCMISMATCH];
+	}
+	UnicodeString gameName = game->getGameName();
+
+	if(TheGameSpyInfo->getDisallowAsianText())
+	{
+		const WideChar *buff = gameName.str();
+		Int length =  gameName.getLength();
+		for(Int i = 0; i < length; ++i)
+		{
+			if(buff[i] >= 256)
+				return -1;
+		}
+	}
+	else if(TheGameSpyInfo->getDisallowNonAsianText())
+	{
+		const WideChar *buff = gameName.str();
+		Int length =  gameName.getLength();
+		Bool hasUnicode = FALSE;
+		for(Int i = 0; i < length; ++i)
+		{
+			if(buff[i] >= 256)
+			{
+				hasUnicode = TRUE;
+				break;
+			}
+		}
+		if(!hasUnicode)
+			return -1;
+	}
+
+
+
+	Int index = GadgetListBoxAddEntryText(win, game->getGameName(), gameColor, -1, COLUMN_NAME);
+	GadgetListBoxSetItemData(win, (void *)game->getID(), index);
+
+	UnicodeString s;
+
+	if (showMap)
+	{
+		UnicodeString mapName;
+		const MapMetaData *md = TheMapCache->findMap(game->getMap());
+		if (md)
+		{
+			mapName = md->m_displayName;
+		}
+		else
+		{
+			const char *start = game->getMap().reverseFind('\\');
+			if (start)
+			{
+				++start;
+			}
+			else
+			{
+				start = game->getMap().str();
+			}
+			mapName.translate( start );
+		}
+		GadgetListBoxAddEntryText(win, mapName, gameColor, index, COLUMN_MAP);
+
+		const LadderInfo * li = TheLadderList->findLadder(game->getLadderIP(), game->getLadderPort());
+		if (li)
+		{
+			GadgetListBoxAddEntryText(win, li->name, gameColor, index, COLUMN_LADDER);
+		}
+		else if (game->getLadderPort())
+		{
+			GadgetListBoxAddEntryText(win, TheGameText->fetch("GUI:UnknownLadder"), gameColor, index, COLUMN_LADDER);
+		}
+		else
+		{
+			GadgetListBoxAddEntryText(win, TheGameText->fetch("GUI:NoLadder"), gameColor, index, COLUMN_LADDER);
+		}
+	}
+	else
+	{
+		GadgetListBoxAddEntryText(win, L" ", gameColor, index, COLUMN_MAP);
+		GadgetListBoxAddEntryText(win, L" ", gameColor, index, COLUMN_LADDER);
+	}
+
+	s.format(L"%d/%d", game->getReportedNumPlayers(), game->getReportedMaxPlayers());
+	GadgetListBoxAddEntryText(win, s, gameColor, index, COLUMN_NUMPLAYERS);
+
+	if (game->getHasPassword())
+	{
+		const Image *img = TheMappedImageCollection->findImageByName("Password");
+		Int width = 10, height = 10;
+		if (img)
+		{
+			width = img->getImageWidth();
+			height = img->getImageHeight();
+		}
+		GadgetListBoxAddEntryImage(win, img, index, COLUMN_PASSWORD, width, height);
+	}
+	else
+	{
+		GadgetListBoxAddEntryText(win, L" ", gameColor, index, COLUMN_PASSWORD);
+	}
+
+	if (game->getAllowObservers())
+	{
+		const Image *img = TheMappedImageCollection->findImageByName("Observer");
+		GadgetListBoxAddEntryImage(win, img, index, COLUMN_OBSERVER);
+	}
+	else
+	{
+		GadgetListBoxAddEntryText(win, L" ", gameColor, index, COLUMN_OBSERVER);
+	}
+
+#if !RTS_GENERALS
+  {
+    if (game->getUseStats())
+    {
+      if (const Image *img = TheMappedImageCollection->findImageByName("GoodStatsIcon"))
+      {
+        GadgetListBoxAddEntryImage(win, img, index, COLUMN_USE_STATS, img->getImageHeight(), img->getImageWidth());
+      }
+    }
+  }
+#endif
+
+	s.format(L"%d", game->getPingAsInt());
+	GadgetListBoxAddEntryText(win, s, gameColor, index, COLUMN_PING);
+	Int ping = game->getPingAsInt();
+	Int width = 10, height = 10;
+	if (pingImages[0])
+	{
+		width = pingImages[0]->getImageWidth();
+		height = pingImages[0]->getImageHeight();
+	}
+	// CLH picking an arbitrary number for our ping display
+	if (ping < TheGameSpyConfig->getPingCutoffGood())
+	{
+		GadgetListBoxAddEntryImage(win, pingImages[0], index, COLUMN_PING, width, height);
+	}
+	else if (ping < TheGameSpyConfig->getPingCutoffBad())
+	{
+		GadgetListBoxAddEntryImage(win, pingImages[1], index, COLUMN_PING, width, height);
+	}
+	else
+	{
+		GadgetListBoxAddEntryImage(win, pingImages[2], index, COLUMN_PING, width, height);
+	}
+
+	return index;
+}
+
+void RefreshGameListBox( GameWindow *win, Bool showMap )
+{
+	if (!win)
+		return;
+
+	// save off selection
+	Int selectedIndex = -1;
+	Int indexToSelect = -1;
+	Int selectedID = 0;
+	GadgetListBoxGetSelected(win, &selectedIndex);
+	if (selectedIndex != -1 )
+	{
+		selectedID = (Int)GadgetListBoxGetItemData(win, selectedIndex);
+	}
+	int prevPos = GadgetListBoxGetTopVisibleEntry( win );
+
+	// empty listbox
+	GadgetListBoxReset(win);
+
+	// sort our games
+	typedef std::multiset<GameSpyStagingRoom *, GameSortStruct> SortedGameList;
+	SortedGameList sgl;
+	StagingRoomMap *srm = TheGameSpyInfo->getStagingRoomList();
+	populateBuddyGames();
+	for (StagingRoomMap::iterator srmIt = srm->begin(); srmIt != srm->end(); ++srmIt)
+	{
+		sgl.insert(srmIt->second);
+	}
+
+	// populate listbox
+	for (SortedGameList::iterator sglIt = sgl.begin(); sglIt != sgl.end(); ++sglIt)
+	{
+		GameSpyStagingRoom *game = *sglIt;
+		if (game)
+		{
+			Int index = insertGame(win, game, showMap);
+			if (game->getID() == selectedID)
+			{
+				indexToSelect = index;
+			}
+		}
+	}
+
+	clearBuddyGames();
+
+	// restore selection
+	GadgetListBoxSetSelected(win, indexToSelect); // even for -1, so we can disable the 'Join Game' button
+//	if(prevPos > 10)
+		GadgetListBoxSetTopVisibleEntry( win, prevPos  );//+ 1
+
+	if (indexToSelect < 0 && selectedID)
+	{
+		TheWindowManager->winSetLoneWindow(NULL);
+	}
+}
+
+void RefreshGameInfoListBox( GameWindow *mainWin, GameWindow *win )
+{
+//	if (!mainWin || !win)
+//		return;
+//
+//	GadgetListBoxReset(win);
+//
+//	Int selected = -1;
+//	GadgetListBoxGetSelected(mainWin, &selected);
+//	if (selected < 0)
+//	{
+//		return;
+//	}
+//
+//	Int selectedID = (Int)GadgetListBoxGetItemData(mainWin, selected);
+//	if (selectedID < 0)
+//	{
+//		return;
+//	}
+//
+//	StagingRoomMap *srm = TheGameSpyInfo->getStagingRoomList();
+//	StagingRoomMap::iterator srmIt = srm->find(selectedID);
+//	if (srmIt != srm->end())
+//	{
+//		GameSpyStagingRoom *theRoom = srmIt->second;
+//		theRoom->cleanUpSlotPointers();
+//
+//		// game name
+////		GadgetListBoxAddEntryText(listboxLobbyGameInfo, theRoom->getGameName(), GameSpyColor[GSCOLOR_DEFAULT], -1);
+//
+//		const LadderInfo * li = TheLadderList->findLadder(theRoom->getLadderIP(), theRoom->getLadderPort());
+//		if (li)
+//		{
+//			UnicodeString tmp;
+//			tmp.format(TheGameText->fetch("TOOLTIP:LadderName"), li->name.str());
+//			GadgetListBoxAddEntryText(listboxLobbyGameInfo, tmp, GameSpyColor[GSCOLOR_DEFAULT], -1);
+//		}
+//		else if (theRoom->getLadderPort())
+//		{
+//			GadgetListBoxAddEntryText(listboxLobbyGameInfo, TheGameText->fetch("TOOLTIP:UnknownLadder"), GameSpyColor[GSCOLOR_DEFAULT], -1);
+//		}
+//		else
+//		{
+//			GadgetListBoxAddEntryText(listboxLobbyGameInfo, TheGameText->fetch("TOOLTIP:NoLadder"), GameSpyColor[GSCOLOR_DEFAULT], -1);
+//		}
+//
+//		if (theRoom->getExeCRC() != TheGlobalData->m_exeCRC || theRoom->getIniCRC() != TheGlobalData->m_iniCRC)
+//		{
+//			GadgetListBoxAddEntryText(listboxLobbyGameInfo, TheGameText->fetch("TOOLTIP:InvalidGameVersionSingleLine"), GameSpyColor[GSCOLOR_DEFAULT], -1);
+//		}
+//
+//		// map name
+//		UnicodeString mapName;
+//		const MapMetaData *md = TheMapCache->findMap(theRoom->getMap());
+//		if (md)
+//		{
+//			mapName = md->m_displayName;
+//		}
+//		else
+//		{
+//			const char *start = theRoom->getMap().reverseFind('\\');
+//			if (start)
+//			{
+//				++start;
+//			}
+//			else
+//			{
+//				start = theRoom->getMap().str();
+//			}
+//			mapName.translate( start );
+//		}
+//
+//		GadgetListBoxAddEntryText(listboxLobbyGameInfo, mapName, GameSpyColor[GSCOLOR_DEFAULT], -1);
+//
+//		// player list (rank, win/loss, side)
+//		for (Int i=0; i<MAX_SLOTS; ++i)
+//		{
+//			const GameSpyGameSlot *slot = theRoom->getGameSpySlot(i);
+//			if (slot && slot->isHuman())
+//			{
+//				UnicodeString theName, theRating, thePlayerTemplate;
+//				Int colorIdx = slot->getColor();
+//				theName = slot->getName();
+//				theRating.format(L" (%d-%d)", slot->getWins(), slot->getLosses());
+//				const PlayerTemplate * pt = ThePlayerTemplateStore->getNthPlayerTemplate(slot->getPlayerTemplate());
+//				if (pt)
+//				{
+//					thePlayerTemplate = pt->getDisplayName();
+//				}
+//				else
+//				{
+//					thePlayerTemplate = TheGameText->fetch("GUI:Random");
+//				}
+//
+//				UnicodeString theText;
+//				theText.format(L"%ls - %ls - %ls", theName.str(), thePlayerTemplate.str(), theRating.str());
+//
+//				Int theColor = GameSpyColor[GSCOLOR_DEFAULT];
+//				const MultiplayerColorDefinition *mcd = TheMultiplayerSettings->getColor(colorIdx);
+//				if (mcd)
+//				{
+//					theColor = mcd->getColor();
+//				}
+//
+//				GadgetListBoxAddEntryText(listboxLobbyGameInfo, theText, theColor, -1);
+//			}
+//		}
+//	}
+
+}
+
+void RefreshGameListBoxes( void )
+{
+	GameWindow *main = GetGameListBox();
+	GameWindow *info = GetGameInfoListBox();
+
+	RefreshGameListBox( main, (info == NULL) );
+
+	if (info)
+	{
+		RefreshGameInfoListBox( main, info );
+	}
+}
+
+void ToggleGameListType( void )
+{
+	isSmall = !isSmall;
+	if(isSmall)
+	{
+		parentGameListLarge->winHide(TRUE);
+//		parentGameListSmall->winHide(FALSE);
+	}
+	else
+	{
+		parentGameListLarge->winHide(FALSE);
+//		parentGameListSmall->winHide(TRUE);
+	}
+
+	RefreshGameListBoxes();
+}
+
+// for use by GameWindow::winSetTooltipFunc
+// displays the Army Tooltip for the player templates
+void playerTemplateComboBoxTooltip(GameWindow *wndComboBox, WinInstanceData *instData, UnsignedInt mouse)
+{
+	Int index = 0;
+	GadgetComboBoxGetSelectedPos(wndComboBox, &index);
+	Int templateNum = (Int)GadgetComboBoxGetItemData(wndComboBox, index);
+	UnicodeString ustringTooltip;
+	if (templateNum == -1)
+	{
+			// the "Random" template is always first
+			ustringTooltip = TheGameText->fetch("TOOLTIP:BioStrategyLong_Random");
+	}
+	else
+	{
+		const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
+		if (playerTemplate)
+		{
+			ustringTooltip = TheGameText->fetch(playerTemplate->getTooltip());
+		}
+	}
+	TheMouse->setCursorTooltip(ustringTooltip);
+}
+
+// -----------------------------------------------------------------------------
+
+// for use by GameWindow::winSetTooltipFunc
+// displays the Army Tooltip for the player templates
+void playerTemplateListBoxTooltip(GameWindow *wndListBox, WinInstanceData *instData, UnsignedInt mouse)
+{
+	Int x, y, row, col;
+	x = LOLONGTOSHORT(mouse);
+	y = HILONGTOSHORT(mouse);
+	GadgetListBoxGetEntryBasedOnXY(wndListBox, x, y, row, col);
+	if (row == -1 || col == -1)
+		return;
+
+	Int templateNum = (Int)GadgetListBoxGetItemData(wndListBox, row, col);
+	UnicodeString ustringTooltip;
+	if (templateNum == -1)
+	{
+			// the "Random" template is always first
+			ustringTooltip = TheGameText->fetch("TOOLTIP:BioStrategyLong_Random");
+	}
+	else
+	{
+		const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
+		if (playerTemplate)
+		{
+			ustringTooltip = TheGameText->fetch(playerTemplate->getTooltip());
+		}
+	}
+
+	// use no tooltip delay here
+	TheMouse->setCursorTooltip(ustringTooltip, 0);
+}
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp
new file mode 100644
index 00000000000..c6585cef93e
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp
@@ -0,0 +1,885 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////
+// FILE: MainMenuUtils.cpp
+// Author: Matthew D. Campbell, Sept 2002
+// Description: GameSpy version check, patch download, etc utils
+///////////////////////////////////////////////////////////////////////////////////////
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include <fcntl.h>
+
+//#include "Common/Registry.h"
+#include "Common/UserPreferences.h"
+#include "Common/version.h"
+#include "GameClient/GameText.h"
+#include "GameClient/MessageBox.h"
+#include "GameClient/Shell.h"
+#include "GameLogic/ScriptEngine.h"
+
+#include "GameClient/ShellHooks.h"
+
+#include "gamespy/ghttp/ghttp.h"
+
+#include "GameNetwork/DownloadManager.h"
+#include "GameNetwork/GameSpy/BuddyThread.h"
+#include "GameNetwork/GameSpy/MainMenuUtils.h"
+#include "GameNetwork/GameSpy/PeerDefs.h"
+#include "GameNetwork/GameSpy/PeerThread.h"
+
+#include "WWDownload/Registry.h"
+#include "WWDownload/urlBuilder.h"
+
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static Bool checkingForPatchBeforeGameSpy = FALSE;
+static Int checksLeftBeforeOnline = 0;
+static Int timeThroughOnline = 0; // used to avoid having old callbacks cause problems
+static Bool mustDownloadPatch = FALSE;
+static Bool cantConnectBeforeOnline = FALSE;
+static std::list<QueuedDownload> queuedDownloads;
+
+static char *MOTDBuffer = NULL;
+static char *configBuffer = NULL;
+GameWindow *onlineCancelWindow = NULL;
+
+static Bool s_asyncDNSThreadDone = TRUE;
+static Bool s_asyncDNSThreadSucceeded = FALSE;
+static Bool s_asyncDNSLookupInProgress = FALSE;
+static HANDLE s_asyncDNSThreadHandle = NULL;
+enum {
+	LOOKUP_INPROGRESS,
+	LOOKUP_FAILED,
+	LOOKUP_SUCCEEDED,
+};
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static void startOnline( void );
+static void reallyStartPatchCheck( void );
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+// someone has hit a button allowing downloads to start
+void StartDownloadingPatches( void )
+{
+	if (queuedDownloads.empty())
+	{
+		HandleCanceledDownload();
+		return;
+	}
+
+	WindowLayout *layout;
+	layout = TheWindowManager->winCreateLayout( "Menus/DownloadMenu.wnd" );
+	layout->runInit();
+	layout->hide( FALSE );
+	layout->bringForward();
+	HandleCanceledDownload(FALSE);
+	DEBUG_ASSERTCRASH(TheDownloadManager, ("No download manager!"));
+	if (TheDownloadManager)
+	{
+		std::list<QueuedDownload>::iterator it = queuedDownloads.begin();
+		while (it != queuedDownloads.end())
+		{
+			QueuedDownload q = *it;
+			TheDownloadManager->queueFileForDownload(q.server, q.userName, q.password,
+				q.file, q.localFile, q.regKey, q.tryResume);
+			queuedDownloads.pop_front();
+			it = queuedDownloads.begin();
+		}
+		TheDownloadManager->downloadNextQueuedFile();
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+// user agrees to patch before going online
+static void patchBeforeOnlineCallback( void )
+{
+	StartDownloadingPatches();
+}
+
+// user doesn't want to patch before going online
+static void noPatchBeforeOnlineCallback( void )
+{
+	queuedDownloads.clear();
+	if (mustDownloadPatch || cantConnectBeforeOnline)
+	{
+		// go back to normal
+		HandleCanceledDownload();
+	}
+	else
+	{
+		// clear out unneeded downloads and go on
+		startOnline();
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static Bool hasWriteAccess()
+{
+	const char* filename = "PatchAccessTest.txt";
+
+	remove(filename);
+
+	int handle = _open( filename, _O_CREAT | _O_RDWR, _S_IREAD | _S_IWRITE);
+	if (handle == -1)
+	{
+		return false;
+	}
+
+	_close(handle);
+	remove(filename);
+
+	unsigned int val;
+	if (!GetUnsignedIntFromRegistry("", "Version", val))
+	{
+		return false;
+	}
+
+	if (!SetUnsignedIntInRegistry("", "Version", val))
+	{
+		return false;
+	}
+
+	return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static void startOnline( void )
+{
+	checkingForPatchBeforeGameSpy = FALSE;
+
+	DEBUG_ASSERTCRASH(checksLeftBeforeOnline==0, ("starting online with pending callbacks"));
+	if (onlineCancelWindow)
+	{
+		TheWindowManager->winDestroy(onlineCancelWindow);
+		onlineCancelWindow = NULL;
+	}
+
+	if (cantConnectBeforeOnline)
+	{
+		MessageBoxOk(TheGameText->fetch("GUI:CannotConnectToServservTitle"),
+			TheGameText->fetch("GUI:CannotConnectToServserv"),
+			noPatchBeforeOnlineCallback);
+		return;
+	}
+	if (!queuedDownloads.empty())
+	{
+		if (!hasWriteAccess())
+		{
+			MessageBoxOk(TheGameText->fetch("GUI:Error"),
+				TheGameText->fetch("GUI:MustHaveAdminRights"),
+				noPatchBeforeOnlineCallback);
+		}
+		else if (mustDownloadPatch)
+		{
+			MessageBoxOkCancel(TheGameText->fetch("GUI:PatchAvailable"),
+				TheGameText->fetch("GUI:MustPatchForOnline"),
+				patchBeforeOnlineCallback, noPatchBeforeOnlineCallback);
+		}
+		else
+		{
+			MessageBoxYesNo(TheGameText->fetch("GUI:PatchAvailable"),
+				TheGameText->fetch("GUI:CanPatchForOnline"),
+				patchBeforeOnlineCallback, noPatchBeforeOnlineCallback);
+		}
+		return;
+	}
+
+	TheScriptEngine->signalUIInteract(TheShellHookNames[SHELL_SCRIPT_HOOK_MAIN_MENU_ONLINE_SELECTED]);
+
+	DEBUG_ASSERTCRASH( !TheGameSpyBuddyMessageQueue, ("TheGameSpyBuddyMessageQueue exists!") );
+	DEBUG_ASSERTCRASH( !TheGameSpyPeerMessageQueue, ("TheGameSpyPeerMessageQueue exists!") );
+	DEBUG_ASSERTCRASH( !TheGameSpyInfo, ("TheGameSpyInfo exists!") );
+	SetUpGameSpy(MOTDBuffer, configBuffer);
+
+	delete[] MOTDBuffer;
+	MOTDBuffer = NULL;
+
+	delete[] configBuffer;
+	configBuffer = NULL;
+
+#ifdef ALLOW_NON_PROFILED_LOGIN
+	UserPreferences pref;
+	pref.load("GameSpyLogin.ini");
+	UserPreferences::const_iterator it = pref.find("useProfiles");
+	if (it != pref.end() && it->second.compareNoCase("yes") == 0)
+#endif // ALLOW_NON_PROFILED_LOGIN
+		TheShell->push( "Menus/GameSpyLoginProfile.wnd" );
+#ifdef ALLOW_NON_PROFILED_LOGIN
+	else
+		TheShell->push( "Menus/GameSpyLoginQuick.wnd" );
+#endif // ALLOW_NON_PROFILED_LOGIN
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static void queuePatch(Bool mandatory, AsciiString downloadURL)
+{
+	QueuedDownload q;
+	Bool success = TRUE;
+
+	AsciiString connectionType;
+	success &= downloadURL.nextToken(&connectionType, ":");
+
+	AsciiString server;
+	success &= downloadURL.nextToken(&server, ":/");
+
+	AsciiString user;
+	success &= downloadURL.nextToken(&user, ":@");
+
+	AsciiString pass;
+	success &= downloadURL.nextToken(&pass, "@/");
+
+	AsciiString filePath;
+	success &= downloadURL.nextToken(&filePath, "");
+
+	if (!success && user.isNotEmpty())
+	{
+		// no user/pass combo - move the file into it's proper place
+		filePath = user;
+		user = ""; // LFeenanEA - Credentials removed as per Security requirements
+		pass = "";
+		success = TRUE;
+	}
+
+	AsciiString fileStr = filePath;
+	const char *s = filePath.reverseFind('/');
+	if (s)
+		fileStr = s+1;
+	AsciiString fileName = "patches\\";
+	fileName.concat(fileStr);
+
+	DEBUG_LOG(("download URL split: %d [%s] [%s] [%s] [%s] [%s] [%s]",
+		success, connectionType.str(), server.str(), user.str(), pass.str(),
+		filePath.str(), fileName.str()));
+
+	if (!success)
+		return;
+
+	q.file = filePath;
+	q.localFile = fileName;
+	q.password = pass;
+	q.regKey = "";
+	q.server = server;
+	q.tryResume = TRUE;
+	q.userName = user;
+
+	std::list<QueuedDownload>::iterator it = queuedDownloads.begin();
+	while (it != queuedDownloads.end())
+	{
+		if (it->localFile == q.localFile)
+			return; // don't add it if it exists already (because we can check multiple times)
+		++it;
+	}
+
+	queuedDownloads.push_back(q);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static GHTTPBool motdCallback( GHTTPRequest request, GHTTPResult result,
+															char * buffer, GHTTPByteCount bufferLen, void * param )
+{
+	Int run = (Int)param;
+	if (run != timeThroughOnline)
+	{
+		DEBUG_CRASH(("Old callback being called!"));
+		return GHTTPTrue;
+	}
+
+	delete[] MOTDBuffer;
+	MOTDBuffer = NEW char[bufferLen];
+	memcpy(MOTDBuffer, buffer, bufferLen);
+	MOTDBuffer[bufferLen-1] = 0;
+
+	--checksLeftBeforeOnline;
+	DEBUG_ASSERTCRASH(checksLeftBeforeOnline>=0, ("Too many callbacks"));
+	if (onlineCancelWindow && !checksLeftBeforeOnline)
+	{
+		TheWindowManager->winDestroy(onlineCancelWindow);
+		onlineCancelWindow = NULL;
+	}
+
+	DEBUG_LOG(("------- Got MOTD before going online -------"));
+	DEBUG_LOG(("%s", (MOTDBuffer)?MOTDBuffer:""));
+	DEBUG_LOG(("--------------------------------------------"));
+
+	if (!checksLeftBeforeOnline)
+		startOnline();
+
+	return GHTTPTrue;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static GHTTPBool configCallback( GHTTPRequest request, GHTTPResult result,
+																char * buffer, GHTTPByteCount bufferLen, void * param )
+{
+	Int run = (Int)param;
+	if (run != timeThroughOnline)
+	{
+		DEBUG_CRASH(("Old callback being called!"));
+		return GHTTPTrue;
+	}
+
+	delete[] configBuffer;
+	configBuffer = NULL;
+
+	if (result != GHTTPSuccess || bufferLen < 100)
+	{
+		if (!checkingForPatchBeforeGameSpy)
+			return GHTTPTrue;
+		--checksLeftBeforeOnline;
+		if (onlineCancelWindow && !checksLeftBeforeOnline)
+		{
+			TheWindowManager->winDestroy(onlineCancelWindow);
+			onlineCancelWindow = NULL;
+		}
+		cantConnectBeforeOnline = TRUE;
+		if (!checksLeftBeforeOnline)
+		{
+			startOnline();
+		}
+		return GHTTPTrue;
+	}
+
+	configBuffer = NEW char[bufferLen];
+	memcpy(configBuffer, buffer, bufferLen);
+	configBuffer[bufferLen-1] = 0;
+
+	AsciiString fname;
+	fname.format("%sGeneralsOnline\\Config.txt", TheGlobalData->getPath_UserData().str());
+	FILE *fp = fopen(fname.str(), "wb");
+	if (fp)
+	{
+		fwrite(configBuffer, bufferLen, 1, fp);
+		fclose(fp);
+	}
+
+	--checksLeftBeforeOnline;
+	DEBUG_ASSERTCRASH(checksLeftBeforeOnline>=0, ("Too many callbacks"));
+	if (onlineCancelWindow && !checksLeftBeforeOnline)
+	{
+		TheWindowManager->winDestroy(onlineCancelWindow);
+		onlineCancelWindow = NULL;
+	}
+
+	DEBUG_LOG(("Got Config before going online"));
+
+	if (!checksLeftBeforeOnline)
+		startOnline();
+
+	return GHTTPTrue;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static GHTTPBool configHeadCallback( GHTTPRequest request, GHTTPResult result,
+																		char * buffer, GHTTPByteCount bufferLen, void * param )
+{
+	Int run = (Int)param;
+	if (run != timeThroughOnline)
+	{
+		DEBUG_CRASH(("Old callback being called!"));
+		return GHTTPTrue;
+	}
+
+	DEBUG_LOG(("HTTP head resp: res=%d, len=%d, buf=[%s]", result, bufferLen, buffer));
+
+	if (result == GHTTPSuccess)
+	{
+		DEBUG_LOG(("Headers are [%s]", ghttpGetHeaders( request )));
+
+		AsciiString headers(ghttpGetHeaders( request ));
+		AsciiString line;
+		while (headers.nextToken(&line, "\n\r"))
+		{
+			AsciiString key, val;
+			line.nextToken(&key, ": ");
+			line.nextToken(&val, ": \r\n");
+
+			if (key.compare("Content-Length") == 0 && val.isNotEmpty())
+			{
+				Int serverLen = atoi(val.str());
+				Int fileLen = 0;
+				AsciiString fname;
+				fname.format("%sGeneralsOnline\\Config.txt", TheGlobalData->getPath_UserData().str());
+				FILE *fp = fopen(fname.str(), "rb");
+				if (fp)
+				{
+					fseek(fp, 0, SEEK_END);
+					fileLen = ftell(fp);
+					fclose(fp);
+				}
+
+				if (serverLen == fileLen)
+				{
+					// we don't need to download the MOTD again
+					--checksLeftBeforeOnline;
+					DEBUG_ASSERTCRASH(checksLeftBeforeOnline>=0, ("Too many callbacks"));
+					if (onlineCancelWindow && !checksLeftBeforeOnline)
+					{
+						TheWindowManager->winDestroy(onlineCancelWindow);
+						onlineCancelWindow = NULL;
+					}
+
+					delete[] configBuffer;
+					configBuffer = NULL;
+
+					AsciiString fname;
+					fname.format("%sGeneralsOnline\\Config.txt", TheGlobalData->getPath_UserData().str());
+					FILE *fp = fopen(fname.str(), "rb");
+					if (fp)
+					{
+						configBuffer = NEW char[fileLen];
+						fread(configBuffer, fileLen, 1, fp);
+						configBuffer[fileLen-1] = 0;
+						fclose(fp);
+
+						DEBUG_LOG(("Got Config before going online"));
+
+						if (!checksLeftBeforeOnline)
+							startOnline();
+
+						return GHTTPTrue;
+					}
+				}
+			}
+		}
+	}
+
+	// we need to download the MOTD again
+	std::string gameURL, mapURL;
+	std::string configURL, motdURL;
+	FormatURLFromRegistry(gameURL, mapURL, configURL, motdURL);
+	ghttpGet( configURL.c_str(), GHTTPFalse, configCallback, param );
+
+	return GHTTPTrue;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static GHTTPBool gamePatchCheckCallback( GHTTPRequest request, GHTTPResult result, char * buffer, GHTTPByteCount bufferLen, void * param )
+{
+	Int run = (Int)param;
+	if (run != timeThroughOnline)
+	{
+		DEBUG_CRASH(("Old callback being called!"));
+		return GHTTPTrue;
+	}
+
+	--checksLeftBeforeOnline;
+	DEBUG_ASSERTCRASH(checksLeftBeforeOnline>=0, ("Too many callbacks"));
+
+	DEBUG_LOG(("Result=%d, buffer=[%s], len=%d", result, buffer, bufferLen));
+	if (result != GHTTPSuccess)
+	{
+		if (!checkingForPatchBeforeGameSpy)
+			return GHTTPTrue;
+		cantConnectBeforeOnline = TRUE;
+		if (!checksLeftBeforeOnline)
+		{
+			startOnline();
+		}
+		return GHTTPTrue;
+	}
+
+	AsciiString message = buffer;
+	AsciiString line;
+	while (message.nextToken(&line, "\r\n"))
+	{
+		AsciiString type, req, url;
+		Bool ok = TRUE;
+		ok &= line.nextToken(&type, " ");
+		ok &= line.nextToken(&req, " ");
+		ok &= line.nextToken(&url, " ");
+		if (ok && type == "patch")
+		{
+			DEBUG_LOG(("Saw a patch: %d/[%s]", atoi(req.str()), url.str()));
+			queuePatch( atoi(req.str()), url );
+			if (atoi(req.str()))
+			{
+				mustDownloadPatch = TRUE;
+			}
+		}
+		else if (ok && type == "server")
+		{
+		}
+	}
+
+	if (!checksLeftBeforeOnline)
+	{
+		startOnline();
+	}
+
+	return GHTTPTrue;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void CancelPatchCheckCallbackAndReopenDropdown( void )
+{
+	HandleCanceledDownload();
+	CancelPatchCheckCallback();
+}
+
+void CancelPatchCheckCallback( void )
+{
+	s_asyncDNSLookupInProgress = FALSE;
+	HandleCanceledDownload(FALSE); // don't dropdown
+	checkingForPatchBeforeGameSpy = FALSE;
+	checksLeftBeforeOnline = 0;
+	if (onlineCancelWindow)
+	{
+		TheWindowManager->winDestroy(onlineCancelWindow);
+		onlineCancelWindow = NULL;
+	}
+	queuedDownloads.clear();
+
+	delete[] MOTDBuffer;
+	MOTDBuffer = NULL;
+
+	delete[] configBuffer;
+	configBuffer = NULL;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static GHTTPBool overallStatsCallback( GHTTPRequest request, GHTTPResult result, char * buffer, GHTTPByteCount bufferLen, void * param )
+{
+	DEBUG_LOG(("overallStatsCallback() - Result=%d, len=%d", result, bufferLen));
+	if (result != GHTTPSuccess)
+	{
+		return GHTTPTrue;
+	}
+
+#if RTS_GENERALS
+	OverallStats USA, China, GLA;
+	AsciiString message = buffer;
+
+	Int state = STATS_MAX; // STATS_MAX == none
+	AsciiString line;
+	OverallStats *stats = NULL;
+	while (message.nextToken(&line, "\n"))
+	{
+		line.trim();
+		line.toLower();
+		if (strstr(line.str(), "today"))
+		{
+			state = STATS_TODAY;
+		}
+		else if (strstr(line.str(), "yesterday"))
+		{
+			state = STATS_YESTERDAY;
+		}
+		else if (strstr(line.str(), "all time"))
+		{
+			state = STATS_ALLTIME;
+		}
+		else if (strstr(line.str(), "last week"))
+		{
+			state = STATS_LASTWEEK;
+		}
+		else if (state != STATS_MAX && strstr(line.str(), "usa"))
+		{
+			stats = &USA;
+		}
+		else if (state != STATS_MAX && strstr(line.str(), "china"))
+		{
+			stats = &China;
+		}
+		else if (state != STATS_MAX && strstr(line.str(), "gla"))
+		{
+			stats = &GLA;
+		}
+
+		if (stats)
+		{
+			AsciiString totalLine, winsLine, lossesLine;
+			message.nextToken(&totalLine, "\n");
+			message.nextToken(&winsLine, "\n");
+			message.nextToken(&lossesLine, "\n");
+			while (totalLine.isNotEmpty() && !isdigit(totalLine.getCharAt(0)))
+			{
+				totalLine = totalLine.str()+1;
+			}
+			while (winsLine.isNotEmpty() && !isdigit(winsLine.getCharAt(0)))
+			{
+				winsLine = winsLine.str()+1;
+			}
+			while (lossesLine.isNotEmpty() && !isdigit(lossesLine.getCharAt(0)))
+			{
+				lossesLine = lossesLine.str()+1;
+			}
+			if (totalLine.isNotEmpty() && winsLine.isNotEmpty() && lossesLine.isNotEmpty())
+			{
+				stats->wins[state] = atoi(winsLine.str());
+				stats->losses[state] = atoi(lossesLine.str());
+			}
+
+			stats = NULL;
+		}
+	}
+
+	HandleOverallStats(USA, China, GLA);
+#elif RTS_ZEROHOUR
+	HandleOverallStats( buffer, bufferLen );
+#endif
+
+	return GHTTPTrue;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static GHTTPBool numPlayersOnlineCallback( GHTTPRequest request, GHTTPResult result, char * buffer, GHTTPByteCount bufferLen, void * param )
+{
+	DEBUG_LOG(("numPlayersOnlineCallback() - Result=%d, buffer=[%s], len=%d", result, buffer, bufferLen));
+	if (result != GHTTPSuccess)
+	{
+		return GHTTPTrue;
+	}
+
+	AsciiString message = buffer;
+	message.trim();
+	const char *s = message.reverseFind('\\');
+	if (!s)
+	{
+		return GHTTPTrue;
+	}
+
+	if (*s == '\\')
+		++s;
+
+	DEBUG_LOG(("Message was '%s', trimmed to '%s'=%d", buffer, s, atoi(s)));
+	HandleNumPlayersOnline(atoi(s));
+
+	return GHTTPTrue;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void CheckOverallStats( void )
+{
+#if RTS_GENERALS
+	const char *const url = "http://gamestats.gamespy.com/ccgenerals/display.html";
+#elif RTS_ZEROHOUR
+	const char *const url = "http://gamestats.gamespy.com/ccgenzh/display.html";
+#endif
+	ghttpGet(url, GHTTPFalse, overallStatsCallback, NULL);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void CheckNumPlayersOnline( void )
+{
+#if RTS_GENERALS
+	const char *const url = "http://launch.gamespyarcade.com/software/launch/arcadecount2.dll?svcname=ccgenerals";
+#elif RTS_ZEROHOUR
+	const char *const url = "http://launch.gamespyarcade.com/software/launch/arcadecount2.dll?svcname=ccgenzh";
+#endif
+	ghttpGet(url, GHTTPFalse, numPlayersOnlineCallback, NULL);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+DWORD WINAPI asyncGethostbynameThreadFunc( void * szName )
+{
+	HOSTENT *he = gethostbyname( (const char *)szName );
+
+	if (he)
+	{
+		s_asyncDNSThreadSucceeded = TRUE;
+	}
+	else
+	{
+		s_asyncDNSThreadSucceeded = FALSE;
+	}
+
+	s_asyncDNSThreadDone = TRUE;
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+int asyncGethostbyname(char * szName)
+{
+	static int            stat = 0;
+	static unsigned long  threadid;
+
+	if( stat == 0 )
+	{
+		/* Kick off gethostname thread */
+		s_asyncDNSThreadDone = FALSE;
+		s_asyncDNSThreadHandle = CreateThread( NULL, 0, asyncGethostbynameThreadFunc, szName, 0, &threadid );
+
+		if( s_asyncDNSThreadHandle == NULL )
+		{
+			return( LOOKUP_FAILED );
+		}
+		stat = 1;
+	}
+	if( stat == 1 )
+	{
+		if( s_asyncDNSThreadDone )
+		{
+			/* Thread finished */
+			stat = 0;
+			s_asyncDNSLookupInProgress = FALSE;
+			s_asyncDNSThreadHandle = NULL;
+			return( (s_asyncDNSThreadSucceeded)?LOOKUP_SUCCEEDED:LOOKUP_FAILED );
+		}
+	}
+
+	return( LOOKUP_INPROGRESS );
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+// GameSpy's HTTP SDK has had at least 1 crash bug, so we're going to just bail and
+// never try again if they crash us.  We won't be able to get back online again (we'll
+// time out) but at least we'll live.
+static Bool isHttpOk = TRUE;
+
+void HTTPThinkWrapper( void )
+{
+	if (s_asyncDNSLookupInProgress)
+	{
+		Char hostname[] = "servserv.generals.ea.com";
+		Int ret = asyncGethostbyname(hostname);
+		switch(ret)
+		{
+		case LOOKUP_FAILED:
+			cantConnectBeforeOnline = TRUE;
+			startOnline();
+			break;
+		case LOOKUP_SUCCEEDED:
+			reallyStartPatchCheck();
+			break;
+		}
+	}
+
+	if (isHttpOk)
+	{
+		try
+		{
+			ghttpThink();
+		}
+		catch (...)
+		{
+			isHttpOk = FALSE; // we can't abort the login, since we might be done with the
+												// required checks and are fetching extras.  If it is a required
+												// check, we'll time out normally.
+		}
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void StopAsyncDNSCheck( void )
+{
+	if (s_asyncDNSThreadHandle)
+	{
+#ifdef DEBUG_CRASHING
+		Int res =
+#endif
+			TerminateThread(s_asyncDNSThreadHandle,0);
+		DEBUG_ASSERTCRASH(res, ("Could not terminate the Async DNS Lookup thread!"));	// Thread still not killed!
+	}
+	s_asyncDNSThreadHandle = NULL;
+	s_asyncDNSLookupInProgress = FALSE;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void StartPatchCheck( void )
+{
+	checkingForPatchBeforeGameSpy = TRUE;
+	cantConnectBeforeOnline = FALSE;
+	timeThroughOnline++;
+	checksLeftBeforeOnline = 0;
+
+	onlineCancelWindow = MessageBoxCancel(TheGameText->fetch("GUI:CheckingForPatches"),
+		TheGameText->fetch("GUI:CheckingForPatches"), CancelPatchCheckCallbackAndReopenDropdown);
+
+	s_asyncDNSLookupInProgress = TRUE;
+	Char hostname[] = "servserv.generals.ea.com";
+	Int ret = asyncGethostbyname(hostname);
+	switch(ret)
+	{
+	case LOOKUP_FAILED:
+		cantConnectBeforeOnline = TRUE;
+		startOnline();
+		break;
+	case LOOKUP_SUCCEEDED:
+		reallyStartPatchCheck();
+		break;
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static void reallyStartPatchCheck( void )
+{
+	checksLeftBeforeOnline = 4;
+
+	std::string gameURL, mapURL;
+	std::string configURL, motdURL;
+
+	FormatURLFromRegistry(gameURL, mapURL, configURL, motdURL);
+
+	std::string proxy;
+	if (GetStringFromRegistry("", "Proxy", proxy))
+	{
+		if (!proxy.empty())
+		{
+			ghttpSetProxy(proxy.c_str());
+		}
+	}
+
+	// check for a patch first
+	DEBUG_LOG(("Game patch check: [%s]", gameURL.c_str()));
+	DEBUG_LOG(("Map patch check: [%s]", mapURL.c_str()));
+	DEBUG_LOG(("Config: [%s]", configURL.c_str()));
+	DEBUG_LOG(("MOTD: [%s]", motdURL.c_str()));
+	ghttpGet(gameURL.c_str(), GHTTPFalse, gamePatchCheckCallback, (void *)timeThroughOnline);
+	ghttpGet(mapURL.c_str(), GHTTPFalse, gamePatchCheckCallback, (void *)timeThroughOnline);
+	ghttpHead(configURL.c_str(), GHTTPFalse, configHeadCallback, (void *)timeThroughOnline);
+	ghttpGet(motdURL.c_str(), GHTTPFalse, motdCallback, (void *)timeThroughOnline);
+
+	// check total game stats
+	CheckOverallStats();
+
+	// check the users online
+	CheckNumPlayersOnline();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp
new file mode 100644
index 00000000000..cd67390e83f
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp
@@ -0,0 +1,912 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// FILE: PeerDefs.cpp //////////////////////////////////////////////////////
+// Generals GameSpy Peer (chat) definitions
+// Author: Matthew D. Campbell, June 2002
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+#include <set>
+
+#include "Common/GameState.h"
+#include "Common/RandomValue.h"
+#include "Common/IgnorePreferences.h"
+#include "Common/CustomMatchPreferences.h"
+#include "Common/GameSpyMiscPreferences.h"
+#include "Common/Recorder.h"
+#include "Common/Player.h"
+#include "Common/PlayerList.h"
+#include "Common/PlayerTemplate.h"
+#include "GameClient/MapUtil.h"
+#include "GameClient/ShellHooks.h"
+#include "GameClient/GameText.h"
+#include "GameNetwork/GameSpy/LadderDefs.h"
+#include "GameNetwork/GameSpy/PeerDefsImplementation.h"
+#include "GameNetwork/GameSpy/BuddyThread.h"
+#include "GameNetwork/GameSpy/PeerThread.h"
+#include "GameNetwork/GameSpy/PingThread.h"
+#include "GameNetwork/GameSpy/PersistentStorageThread.h"
+#include "GameNetwork/GameSpy/GSConfig.h"
+#include "GameNetwork/GameSpyOverlay.h"
+#include "GameNetwork/RankPointValue.h"
+#include "GameLogic/GameLogic.h"
+
+
+GameSpyInfoInterface *TheGameSpyInfo = NULL;
+extern GameSpyStagingRoom *TheGameSpyGame = NULL;
+void deleteNotificationBox( void );
+
+bool AsciiComparator::operator()(AsciiString s1, AsciiString s2) const
+{
+	return stricmp(s1.str(), s2.str()) < 0;
+}
+
+GameSpyInfo::GameSpyInfo()
+{
+	reset();
+	TheGameSpyGame = &m_localStagingRoom;
+	m_isDisconAfterGameStart = FALSE;
+}
+
+GameSpyInfo::~GameSpyInfo()
+{
+	TheGameSpyGame = NULL;
+	reset();
+}
+
+void GameSpyInfo::reset( void )
+{
+	m_sawFullGameList = FALSE;
+	m_isDisconAfterGameStart = FALSE;
+	m_currentGroupRoomID = 0;
+	clearGroupRoomList();
+	clearStagingRoomList();
+	m_localStagingRoomID = 0;
+	m_buddyRequestMap.clear();
+	m_buddyMap.clear();
+	m_buddyMessages.clear();
+	m_joinedStagingRoom = 0;
+	m_isHosting = false;
+	m_localStagingRoomID = 0;
+	m_localStagingRoom.reset();
+	m_gotGroupRoomList = false;
+	m_localName.clear();
+	m_localProfileID = 0;
+	m_maxMessagesPerUpdate = 100;
+	m_disallowAsainText = FALSE;
+	m_disallowNonAsianText = FALSE;
+	m_disconReason = 0;
+	m_localBaseName.clear();
+	m_localEmail.clear();
+	m_localPasswd.clear();
+	m_pingString.clear();
+	m_rawConfig.clear();
+	m_rawMotd.clear();
+	m_internalIP = m_externalIP = 0;
+	m_savedIgnoreMap.clear();
+	m_preorderPlayers.clear();
+	m_cachedLocalPlayerStats.reset();
+	m_additionalDisconnects = -1;
+}
+
+Bool GameSpyInfo::didPlayerPreorder( Int profileID ) const
+{
+	std::set<Int>::const_iterator it = m_preorderPlayers.find(profileID);
+	return (it != m_preorderPlayers.end());
+}
+
+void GameSpyInfo::markPlayerAsPreorder( Int profileID )
+{
+	m_preorderPlayers.insert(profileID);
+}
+
+void GameSpyInfo::setLocalIPs(UnsignedInt internalIP, UnsignedInt externalIP)
+{
+	m_internalIP = internalIP;
+	m_externalIP = externalIP;
+}
+
+void GameSpyInfo::readAdditionalDisconnects( void )
+{
+	m_additionalDisconnects = GetAdditionalDisconnectsFromUserFile(m_localProfileID);
+	DEBUG_LOG(("GameSpyInfo::readAdditionalDisconnects() found %d disconnects.", m_additionalDisconnects));
+}
+
+Int GameSpyInfo::getAdditionalDisconnects( void )
+{
+	DEBUG_LOG(("GameSpyInfo::getAdditionalDisconnects() would have returned %d.  Returning 0 instead.", m_additionalDisconnects));
+	return 0;
+}
+
+void GameSpyInfo::clearAdditionalDisconnects( void )
+{
+	m_additionalDisconnects = 0;
+}
+
+GameSpyInfoInterface* GameSpyInfoInterface::createNewGameSpyInfoInterface( void )
+{
+	return NEW GameSpyInfo;
+}
+
+Bool GameSpyInfo::amIHost( void )
+{
+	return m_isHosting;
+}
+
+GameSpyStagingRoom* GameSpyInfo::getCurrentStagingRoom( void )
+{
+	if (m_isHosting || m_joinedStagingRoom)
+		return &m_localStagingRoom;
+
+	StagingRoomMap::iterator it = m_stagingRooms.find(m_joinedStagingRoom);
+	if (it != m_stagingRooms.end())
+		return it->second;
+
+	return NULL;
+}
+
+void GameSpyInfo::setGameOptions( void )
+{
+	if (!m_isHosting)
+		return;
+
+	// set options for game lists, and UTM players in-game
+	PeerRequest req;
+	req.peerRequestType = PeerRequest::PEERREQUEST_SETGAMEOPTIONS;
+	req.options = GameInfoToAsciiString(&m_localStagingRoom).str();
+
+	Int i;
+	AsciiString mapName = TheGameState->realMapPathToPortableMapPath(m_localStagingRoom.getMap());
+	AsciiString newMapName;
+	for (i=0; i<mapName.getLength(); ++i)
+	{
+		char c = mapName.getCharAt(i);
+		if (c != '\\')
+			newMapName.concat(c);
+		else
+			newMapName.concat('/');
+	}
+	req.gameOptsMapName = newMapName.str();
+
+	req.gameOptions.numPlayers = 0;
+	req.gameOptions.numObservers = 0;
+	Int numOpenSlots = 0;
+	AsciiString playerInfo;
+	for (i=0; i<MAX_SLOTS; ++i)
+	{
+		Int wins = 0, losses = 0, profileID = 0;
+		GameSpyGameSlot *slot = TheGameSpyGame->getGameSpySlot(i);
+		req.gameOptsPlayerNames[i] = "";
+		if (!slot->isOccupied())
+		{
+			if (slot->isOpen())
+				++numOpenSlots;
+		}
+		else
+		{
+			AsciiString playerName;
+			if (slot->isHuman())
+			{
+				playerName.translate(slot->getName());
+				req.gameOptsPlayerNames[i] = playerName.str();
+				PlayerInfoMap::iterator it = m_playerInfoMap.find(playerName);
+				if (it != m_playerInfoMap.end())
+				{
+					wins = it->second.m_wins;
+					losses = it->second.m_losses;
+					profileID = it->second.m_profileID;
+				}
+				req.gameOptions.wins[req.gameOptions.numObservers+req.gameOptions.numPlayers] = wins;
+				req.gameOptions.losses[req.gameOptions.numObservers+req.gameOptions.numPlayers] = losses;
+				req.gameOptions.profileID[req.gameOptions.numObservers+req.gameOptions.numPlayers] = profileID;
+				req.gameOptions.faction[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getPlayerTemplate();
+				req.gameOptions.color[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getColor();
+				if (slot->getPlayerTemplate() == PLAYERTEMPLATE_OBSERVER)
+				{
+					++req.gameOptions.numObservers;
+				}
+				else
+				{
+					++req.gameOptions.numPlayers;
+				}
+			}
+			else if (slot->isAI())
+			{
+				// add in AI players
+				switch (slot->getState())
+				{
+				case SLOT_EASY_AI:
+					playerName = "CE";
+					break;
+				case SLOT_MED_AI:
+					playerName = "CM";
+					break;
+				case SLOT_BRUTAL_AI:
+					playerName = "CH";
+					break;
+				}
+				req.gameOptsPlayerNames[i] = playerName.str(); // name is unused - we go off of the profileID
+				req.gameOptions.wins[req.gameOptions.numObservers+req.gameOptions.numPlayers] = 0;
+				req.gameOptions.losses[req.gameOptions.numObservers+req.gameOptions.numPlayers] = 0;
+				req.gameOptions.profileID[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getState();
+				req.gameOptions.faction[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getPlayerTemplate();
+				req.gameOptions.color[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getColor();
+				++req.gameOptions.numPlayers;
+			}
+		}
+	}
+	req.gameOptions.maxPlayers = numOpenSlots + req.gameOptions.numPlayers + req.gameOptions.numObservers;
+	TheGameSpyPeerMessageQueue->addRequest(req);
+
+	req.peerRequestType = PeerRequest::PEERREQUEST_UTMROOM;
+	req.UTM.isStagingRoom = TRUE;
+	req.id = "Pings/";
+	AsciiString pings;
+	for (i=0; i<MAX_SLOTS; ++i)
+	{
+		if (i!=0)
+			pings.concat(",");
+
+		GameSpyGameSlot *slot = TheGameSpyGame->getGameSpySlot(i);
+		if (slot && slot->isHuman())
+		{
+			pings.concat(slot->getPingString());
+		}
+		else
+		{
+			pings.concat("0");
+		}
+	}
+	req.options = pings.str();
+	TheGameSpyPeerMessageQueue->addRequest(req);
+}
+
+Bool GameSpyInfo::isBuddy( Int id )
+{
+	return m_buddyMap.find(id) != m_buddyMap.end();
+}
+
+void GameSpyInfo::addGroupRoom( GameSpyGroupRoom room )
+{
+	if (room.m_groupID == 0)
+	{
+		m_gotGroupRoomList = TRUE;
+
+		GroupRoomMap::iterator iter;
+
+		// figure out how many good strings we've got
+		std::vector<UnicodeString> names;
+		Int numRooms = 0;
+		for (iter = getGroupRoomList()->begin(); iter != getGroupRoomList()->end(); ++iter)
+		{
+			GameSpyGroupRoom room = iter->second;
+			if (room.m_groupID != TheGameSpyConfig->getQMChannel())
+			{
+				++numRooms;
+
+				AsciiString groupLabel;
+				groupLabel.format("GUI:%s", room.m_name.str());
+
+				Bool exists = FALSE;
+				UnicodeString groupName = TheGameText->fetch(groupLabel, &exists);
+				if (exists)
+				{
+					names.push_back(groupName);
+				}
+			}
+		}
+
+		if (!names.empty() && names.size() != numRooms)
+		{
+			// didn't get all names.  fix up
+			Int nameIndex = 0;
+			Int timesThrough = 1; // start with USA Lobby 1
+			for (iter = TheGameSpyInfo->getGroupRoomList()->begin(); iter != TheGameSpyInfo->getGroupRoomList()->end(); ++iter)
+			{
+				GameSpyGroupRoom room = iter->second;
+				if (room.m_groupID != TheGameSpyConfig->getQMChannel())
+				{
+					room.m_translatedName.format(L"%ls %d", names[nameIndex].str(), timesThrough);
+					nameIndex = (nameIndex+1)%names.size();
+					m_groupRooms[room.m_groupID] = room;
+					if (!nameIndex)
+					{
+						// we've looped through the name list already.  increment the timesThrough counter
+						++timesThrough;
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		DEBUG_LOG(("Adding group room %d (%s)", room.m_groupID, room.m_name.str()));
+		AsciiString groupLabel;
+		groupLabel.format("GUI:%s", room.m_name.str());
+		room.m_translatedName = TheGameText->fetch(groupLabel);
+		m_groupRooms[room.m_groupID] = room;
+		if ( stricmp("quickmatch", room.m_name.str()) == 0 )
+		{
+			DEBUG_LOG(("Group room %d (%s) is the QuickMatch room", room.m_groupID, room.m_name.str()));
+			TheGameSpyConfig->setQMChannel(room.m_groupID);
+		}
+	}
+}
+
+void GameSpyInfo::joinGroupRoom( Int groupID )
+{
+	if (groupID > 0)
+	{
+		PeerRequest req;
+		req.peerRequestType = PeerRequest::PEERREQUEST_JOINGROUPROOM;
+		req.groupRoom.id = groupID;
+		TheGameSpyPeerMessageQueue->addRequest(req);
+		m_playerInfoMap.clear();
+	}
+}
+
+void GameSpyInfo::leaveGroupRoom( void )
+{
+	PeerRequest req;
+	req.peerRequestType = PeerRequest::PEERREQUEST_LEAVEGROUPROOM;
+	TheGameSpyPeerMessageQueue->addRequest(req);
+	setCurrentGroupRoom(0);
+	m_playerInfoMap.clear();
+}
+
+void GameSpyInfo::joinBestGroupRoom( void )
+{
+	if (m_currentGroupRoomID)
+	{
+		DEBUG_LOG(("Bailing from GameSpyInfo::joinBestGroupRoom() - we were already in a room"));
+		m_currentGroupRoomID = 0;
+		return;
+	}
+
+	if (!m_groupRooms.empty())
+	{
+		int minID = -1;
+		int minPlayers = 1000;
+		GroupRoomMap::iterator iter = m_groupRooms.begin();
+		while (iter != m_groupRooms.end())
+		{
+			GameSpyGroupRoom room = iter->second;
+			DEBUG_LOG(("Group room %d: %s (%d, %d, %d, %d)", room.m_groupID, room.m_name.str(), room.m_numWaiting, room.m_maxWaiting,
+				room.m_numGames, room.m_numPlaying));
+
+			if (TheGameSpyConfig->getQMChannel() != room.m_groupID && minPlayers > 25 && room.m_numWaiting < minPlayers)
+			{
+				minID = room.m_groupID;
+				minPlayers = room.m_numWaiting;
+			}
+
+			++iter;
+		}
+
+		if (minID > 0)
+		{
+			PeerRequest req;
+			req.peerRequestType = PeerRequest::PEERREQUEST_JOINGROUPROOM;
+			req.groupRoom.id = minID;
+			TheGameSpyPeerMessageQueue->addRequest(req);
+			m_playerInfoMap.clear();
+		}
+		else
+		{
+			GSMessageBoxOk(TheGameText->fetch("GUI:Error"), TheGameText->fetch("GUI:GSGroupRoomJoinFail"), NULL);
+		}
+	}
+	else
+	{
+		GSMessageBoxOk(TheGameText->fetch("GUI:Error"), TheGameText->fetch("GUI:GSGroupRoomJoinFail"), NULL);
+	}
+}
+
+void GameSpyInfo::updatePlayerInfo( PlayerInfo pi, AsciiString oldNick )
+{
+	if (!oldNick.isEmpty())
+		playerLeftGroupRoom(oldNick);
+
+	m_playerInfoMap[pi.m_name] = pi;
+
+	if (pi.m_preorder != 0)
+		markPlayerAsPreorder(pi.m_profileID);
+}
+
+void GameSpyInfo::playerLeftGroupRoom( AsciiString nick )
+{
+	PlayerInfoMap::iterator it = m_playerInfoMap.find(nick);
+	if (it != m_playerInfoMap.end())
+	{
+		m_playerInfoMap.erase(it);
+	}
+}
+
+void GameSpyInfo::clearStagingRoomList( void )
+{
+	Int numRoomsRemoved = 0;
+	m_sawFullGameList = FALSE;
+	m_stagingRoomsDirty = FALSE;
+
+	StagingRoomMap::iterator it = m_stagingRooms.begin();
+	while (it != m_stagingRooms.end())
+	{
+		++numRoomsRemoved;
+
+		delete it->second;
+		m_stagingRooms.erase(it);
+		it = m_stagingRooms.begin();
+	}
+	if (numRoomsRemoved > 0)
+	{
+		//m_stagingRoomsDirty = true; // only consider ourselves dirty if we actually removed some games.
+	}
+}
+
+void GameSpyInfo::addStagingRoom( GameSpyStagingRoom room )
+{
+	removeStagingRoom(room);
+	GameSpyStagingRoom *newRoom = NEW GameSpyStagingRoom;
+	*newRoom = room;
+	newRoom->cleanUpSlotPointers();
+	m_stagingRooms[room.getID()] = newRoom;
+	m_stagingRoomsDirty = m_sawFullGameList;
+}
+
+void GameSpyInfo::updateStagingRoom( GameSpyStagingRoom room )
+{
+	addStagingRoom(room);
+}
+
+void GameSpyInfo::removeStagingRoom( GameSpyStagingRoom room )
+{
+	StagingRoomMap::iterator it = m_stagingRooms.find(room.getID());
+	if (it != m_stagingRooms.end())
+	{
+		delete it->second;
+		m_stagingRooms.erase(it);
+
+		m_stagingRoomsDirty = m_sawFullGameList;
+	}
+}
+
+Bool GameSpyInfo::hasStagingRoomListChanged( void )
+{
+	Bool val = m_stagingRoomsDirty;
+	m_stagingRoomsDirty = false;
+	return val;
+}
+
+GameSpyStagingRoom* GameSpyInfo::findStagingRoomByID( Int id )
+{
+	StagingRoomMap::iterator it = m_stagingRooms.find(id);
+	if (it != m_stagingRooms.end())
+		return it->second;
+
+	return NULL;
+}
+
+void GameSpyInfo::leaveStagingRoom( void )
+{
+	m_localStagingRoomID = 0;
+	PeerRequest req;
+	req.peerRequestType = PeerRequest::PEERREQUEST_LEAVESTAGINGROOM;
+	TheGameSpyPeerMessageQueue->addRequest(req);
+	m_playerInfoMap.clear();
+	m_joinedStagingRoom = FALSE;
+	m_isHosting = FALSE;
+}
+
+void GameSpyInfo::markAsStagingRoomHost( void )
+{
+	m_localStagingRoomID = 0;
+	m_joinedStagingRoom = FALSE; m_isHosting = TRUE;
+
+  // There are a few options we don't want to reset when we are hosting (they carry over
+  // from the the create game dialog).
+  // Interesting fact: oldFactionsOnly will be carried over correctly if I remove these
+  // lines. UseStats won't be. I have no idea why.
+  Int useStats = m_localStagingRoom.getUseStats();
+  Bool oldFactionsOnly = m_localStagingRoom.oldFactionsOnly();
+
+  m_localStagingRoom.reset();
+	m_localStagingRoom.enterGame();
+	m_localStagingRoom.setSeed(GetTickCount());
+
+  m_localStagingRoom.setUseStats( useStats );
+  m_localStagingRoom.setOldFactionsOnly( oldFactionsOnly );
+
+	GameSlot newSlot;
+	UnicodeString uName;
+	uName.translate(m_localName);
+	newSlot.setState(SLOT_PLAYER, uName);
+
+	m_localStagingRoom.setLocalIP(m_externalIP);
+	newSlot.setIP(m_externalIP);
+
+	m_localStagingRoom.setSlot(0,newSlot);
+	m_localStagingRoom.setLocalName(m_localName);
+
+	TheMapCache->updateCache();
+	m_localStagingRoom.setMap(getDefaultMap(TRUE));
+	m_localStagingRoom.adjustSlotsForMap(); // close slots that the map can't hold. BGC
+}
+
+void GameSpyInfo::markAsStagingRoomJoiner( Int game )
+{
+	m_localStagingRoomID = game;
+	m_joinedStagingRoom = TRUE; m_isHosting = FALSE;
+	m_localStagingRoom.reset();
+	m_localStagingRoom.enterGame();
+	StagingRoomMap::iterator it = m_stagingRooms.find(game);
+	if (it != m_stagingRooms.end())
+	{
+		GameSpyStagingRoom *info = it->second;
+		info->cleanUpSlotPointers();
+		AsciiString options = GameInfoToAsciiString(info);
+#ifdef DEBUG_CRASHING
+		Bool res =
+#endif
+		ParseAsciiStringToGameInfo(&m_localStagingRoom, options);
+		DEBUG_ASSERTCRASH(res, ("Could not parse game info \"%s\"", options.str()));
+		m_localStagingRoom.setInGame();
+		m_localStagingRoom.setLocalName(m_localName);
+		m_localStagingRoom.setExeCRC(info->getExeCRC());
+		m_localStagingRoom.setIniCRC(info->getIniCRC());
+		m_localStagingRoom.setAllowObservers(info->getAllowObservers());
+		m_localStagingRoom.setHasPassword(info->getHasPassword());
+		m_localStagingRoom.setGameName(info->getGameName());
+		DEBUG_LOG(("Joining game: host is %ls", m_localStagingRoom.getConstSlot(0)->getName().str()));
+	}
+}
+
+void GameSpyInfo::setMOTD( const AsciiString& motd )
+{
+	m_rawMotd = motd;
+}
+
+const AsciiString& GameSpyInfo::getMOTD( void )
+{
+	return m_rawMotd;
+}
+
+void GameSpyInfo::setConfig( const AsciiString& config )
+{
+	m_rawConfig = config;
+}
+
+const AsciiString& GameSpyInfo::getConfig( void )
+{
+	return m_rawConfig;
+}
+
+// --------------------------------------------------------------
+void SetUpGameSpy( const char *motdBuffer, const char *configBuffer )
+{
+	if (!motdBuffer)
+		motdBuffer = "";
+	if (!configBuffer)
+		configBuffer = "";
+	TearDownGameSpy();
+
+	AsciiString dir = TheGlobalData->getPath_UserData();
+	CreateDirectory(dir.str(), NULL);
+	dir.format("%sGeneralsOnline", TheGlobalData->getPath_UserData().str());
+	CreateDirectory(dir.str(), NULL);
+	dir.format("%sGeneralsOnline\\Ladders", TheGlobalData->getPath_UserData().str());
+	CreateDirectory(dir.str(), NULL);
+
+	TheGameSpyBuddyMessageQueue = GameSpyBuddyMessageQueueInterface::createNewMessageQueue();
+	TheGameSpyBuddyMessageQueue->startThread();
+
+	TheGameSpyPeerMessageQueue = GameSpyPeerMessageQueueInterface::createNewMessageQueue();
+	TheGameSpyPeerMessageQueue->startThread();
+
+	TheGameSpyPSMessageQueue = GameSpyPSMessageQueueInterface::createNewMessageQueue();
+	TheGameSpyPSMessageQueue->startThread();
+
+	/*
+	TheGameSpyGame = NEW GameSpyStagingRoom;
+	*/
+
+	TheGameSpyInfo = GameSpyInfoInterface::createNewGameSpyInfoInterface();
+	TheGameSpyInfo->setMOTD(motdBuffer);
+	TheGameSpyInfo->setConfig(configBuffer);
+
+	CustomMatchPreferences pref;
+	TheGameSpyInfo->setDisallowAsianText(pref.getDisallowAsianText());
+	TheGameSpyInfo->setDisallowNonAsianText( pref.getDisallowNonAsianText());
+
+
+	TheGameSpyConfig = GameSpyConfigInterface::create(configBuffer);
+
+	TheLadderList = NEW LadderList;
+
+	ThePinger = PingerInterface::createNewPingerInterface();
+	ThePinger->startThreads();
+
+	TheRankPointValues = NEW RankPoints;
+}
+
+void TearDownGameSpy( void )
+{
+	// save off cached stats
+	if (TheGameSpyInfo && TheGameSpyInfo->getLocalProfileID())
+	{
+//		/* This was done on the score screen, so there is no need to do it now.
+//		 *
+		PSPlayerStats localPSStats = TheGameSpyPSMessageQueue->findPlayerStatsByID(TheGameSpyInfo->getLocalProfileID());
+		if (localPSStats.id != 0)
+		{
+			GameSpyMiscPreferences mPref;
+			mPref.setCachedStats(GameSpyPSMessageQueueInterface::formatPlayerKVPairs(localPSStats).c_str());
+			mPref.write();
+		}
+//		*/
+	}
+
+	// End our threads before we kill off the singletons they reference.  No crashy-crash for you!
+	if (TheGameSpyPSMessageQueue)
+		TheGameSpyPSMessageQueue->endThread();
+	if (TheGameSpyBuddyMessageQueue)
+		TheGameSpyBuddyMessageQueue->endThread();
+	if (TheGameSpyPeerMessageQueue)
+		TheGameSpyPeerMessageQueue->endThread();
+	if (ThePinger)
+		ThePinger->endThreads();
+
+	delete TheRankPointValues;
+	TheRankPointValues = NULL;
+
+	delete TheGameSpyPSMessageQueue;
+	TheGameSpyPSMessageQueue = NULL;
+
+	delete TheGameSpyBuddyMessageQueue;
+	TheGameSpyBuddyMessageQueue = NULL;
+
+	delete TheGameSpyPeerMessageQueue;
+	TheGameSpyPeerMessageQueue = NULL;
+
+	if (TheGameSpyInfo)
+	{
+		if (TheGameSpyInfo->getInternalIP())
+		{
+			// we've logged in before.  mark us as logging out.
+			SignalUIInteraction(SHELL_SCRIPT_HOOK_GENERALS_ONLINE_LOGOUT);
+		}
+		delete TheGameSpyInfo;
+		TheGameSpyInfo = NULL;
+	}
+
+	delete ThePinger;
+	ThePinger = NULL;
+
+	delete TheLadderList;
+	TheLadderList = NULL;
+
+	delete TheGameSpyConfig;
+	TheGameSpyConfig = NULL;
+
+	// make sure the notification box doesn't exist
+	deleteNotificationBox();
+}
+
+
+void GameSpyInfo::addToIgnoreList( AsciiString nick )
+{
+	m_ignoreList.insert(nick);
+}
+
+void GameSpyInfo::removeFromIgnoreList( AsciiString nick )
+{
+	m_ignoreList.erase(nick);
+}
+
+Bool GameSpyInfo::isIgnored( AsciiString nick )
+{
+	return m_ignoreList.find(nick) != m_ignoreList.end();
+}
+
+IgnoreList GameSpyInfo::returnIgnoreList( void )
+{
+ return m_ignoreList;
+}
+
+void GameSpyInfo::addToSavedIgnoreList( Int profileID, AsciiString nick)
+{
+	m_savedIgnoreMap[profileID] = nick;
+	IgnorePreferences pref;
+	pref.setIgnore(nick, profileID, true);
+	pref.write();
+}
+
+void GameSpyInfo::removeFromSavedIgnoreList( Int profileID )
+{
+	m_savedIgnoreMap.erase(profileID);
+	IgnorePreferences pref;
+	pref.setIgnore(AsciiString::TheEmptyString, profileID, false);
+	pref.write();
+}
+
+Bool GameSpyInfo::isSavedIgnored( Int profileID )
+{
+	return m_savedIgnoreMap.find(profileID) != m_savedIgnoreMap.end();
+}
+
+SavedIgnoreMap	GameSpyInfo::returnSavedIgnoreList( void )
+{
+	return m_savedIgnoreMap;
+}
+
+static Int grabHexInt(const char *s)
+{
+	char tmp[5] = "0xff";
+	tmp[2] = s[0];
+	tmp[3] = s[1];
+	Int b = strtol(tmp, NULL, 16);
+	return b;
+}
+
+Int GameSpyInfo::getPingValue( const AsciiString& otherPing )
+{
+	if (m_pingString.getLength() != otherPing.getLength())
+	{
+		return TheGameSpyConfig->getPingTimeoutInMs();
+	}
+
+	if (m_pingString.getLength() % 2 != 0)
+	{
+		return TheGameSpyConfig->getPingTimeoutInMs();
+	}
+
+	Int best = 255+255;
+	const char *myStr = m_pingString.str();
+	const char *otherStr = otherPing.str();
+
+	while (*myStr)
+	{
+		Int myVal = grabHexInt(myStr);
+		Int otherVal = grabHexInt(otherStr);
+		Int val = myVal + otherVal;
+		best = (val < best) ? val : best;
+		myStr += 2;
+		otherStr += 2;
+	}
+
+	return best * TheGameSpyConfig->getPingTimeoutInMs() / (255+255);
+}
+
+Bool PlayerInfo::isIgnored( void )
+{
+	return (m_profileID)?TheGameSpyInfo->isSavedIgnored(m_profileID):TheGameSpyInfo->isIgnored(m_name);
+}
+
+void GameSpyInfo::loadSavedIgnoreList( void )
+{
+	m_savedIgnoreMap.clear();
+	IgnorePreferences prefs;
+	m_savedIgnoreMap = prefs.getIgnores();
+}
+
+void GameSpyInfo::setDisallowAsianText( Bool val )
+{
+	m_disallowAsainText = val;
+}
+
+void GameSpyInfo::setDisallowNonAsianText( Bool val )
+{
+	m_disallowNonAsianText = val;
+}
+
+Bool GameSpyInfo::getDisallowAsianText( void )
+{
+	return m_disallowAsainText;
+}
+Bool GameSpyInfo::getDisallowNonAsianText(void )
+{
+	return m_disallowNonAsianText;
+}
+
+void GameSpyInfo::setMaxMessagesPerUpdate( Int num )
+{
+	m_maxMessagesPerUpdate = num;
+}
+
+Int GameSpyInfo::getMaxMessagesPerUpdate( void )
+{
+	return m_maxMessagesPerUpdate;
+}
+
+/**This function is used to force an update of player's gamespy stats with an additional
+disconnection.  This is used upon starting a new game so that if user disconnects prior
+to finishing game, the disconnection stays on the server.  If he completes the game, we
+remove this extra disconnection inside of populatePlayerInfo() on the ScoreScreen.  This
+seems like the only secure way to handle this issue since users can abort the process
+before we can detect/log disconnections.*/
+void GameSpyInfo::updateAdditionalGameSpyDisconnections(Int count)
+{
+	if (TheRecorder->isMultiplayer() && TheGameLogic->isInInternetGame() && TheGameSpyGame && TheGameSpyGame->getUseStats())
+	{
+		Int localID = TheGameSpyInfo->getLocalProfileID();
+		PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(localID);
+
+		Player *player=ThePlayerList->getLocalPlayer();
+
+		Int ptIdx;
+		const PlayerTemplate *myTemplate = player->getPlayerTemplate();
+		DEBUG_LOG(("myTemplate = %X(%s)", myTemplate, myTemplate->getName().str()));
+		for (ptIdx = 0; ptIdx < ThePlayerTemplateStore->getPlayerTemplateCount(); ++ptIdx)
+		{
+			const PlayerTemplate *nthTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(ptIdx);
+			DEBUG_LOG(("nthTemplate = %X(%s)", nthTemplate, nthTemplate->getName().str()));
+			if (nthTemplate == myTemplate)
+			{
+					break;
+			}
+		}
+
+		Bool anyAI = FALSE;
+		for (Int i=0; i<MAX_SLOTS; ++i)
+		{
+			const GameSlot *slot = TheGameInfo->getConstSlot(i);
+
+			if (slot->isAI())
+			{
+				anyAI = TRUE;
+			}
+		}
+
+		//Check for cases where we're not tracking stats.
+		if (anyAI || stats.id == 0 || myTemplate->isObserver() || player->getPlayerType() != PLAYER_HUMAN || player->isPlayerObserver())
+			return;
+
+		Int disCons=stats.discons[ptIdx];
+		disCons += count;
+		if (disCons < 0)
+		{	DEBUG_LOG(("updateAdditionalGameSpyDisconnections() - disconnection count below zero"));
+			return;	//something is wrong here
+		}
+		stats.discons[ptIdx] = disCons;	//add an additional disconnection to their stats.
+
+		//Add an additional disconnection to player stats.
+		PSRequest req;
+
+		req.requestType = PSRequest::PSREQUEST_UPDATEPLAYERSTATS;
+		req.email = TheGameSpyInfo->getLocalEmail().str();
+		req.nick = TheGameSpyInfo->getLocalBaseName().str();
+		req.password = TheGameSpyInfo->getLocalPassword().str();
+		req.player = stats;
+		req.addDesync = FALSE;
+		req.addDiscon = FALSE;
+		req.lastHouse = ptIdx;
+
+		TheGameSpyPSMessageQueue->addRequest(req);
+		TheGameSpyPSMessageQueue->trackPlayerStats(stats);
+
+		// force an update of our shtuff
+		PSResponse newResp;
+		newResp.responseType = PSResponse::PSRESPONSE_PLAYERSTATS;
+		newResp.player = stats;
+		TheGameSpyPSMessageQueue->addResponse(newResp);
+
+		// cache our stuff for easy reading next time
+   		GameSpyMiscPreferences mPref;
+   		mPref.setCachedStats(GameSpyPSMessageQueueInterface::formatPlayerKVPairs(stats).c_str());
+   		mPref.write();
+	}
+}
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
new file mode 100644
index 00000000000..278f991793a
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
@@ -0,0 +1,884 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: StagingRoomGameInfo.cpp //////////////////////////////////////////////////////
+// Generals GameSpy GameInfo-related code
+// Author: Matthew D. Campbell, July 2002
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/GameState.h"
+#include "Common/Player.h"
+#include "Common/PlayerList.h"
+#include "Common/PlayerTemplate.h"
+#include "Common/RandomValue.h"
+#include "Common/ScoreKeeper.h"
+#include "GameClient/GameText.h"
+#include "GameClient/MapUtil.h"
+#include "GameClient/Shell.h"
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/VictoryConditions.h"
+#include "GameNetwork/FileTransfer.h"
+#include "GameNetwork/GameSpy/BuddyThread.h"
+#include "GameNetwork/GameSpy/PeerDefs.h"
+#include "GameNetwork/GameSpy/PersistentStorageThread.h"
+#include "GameNetwork/GameSpy/ThreadUtils.h"
+#include "GameNetwork/GameSpyOverlay.h"
+#include "GameNetwork/NAT.h"
+#include "GameNetwork/NetworkInterface.h"
+
+
+// GameSpyGameSlot -------------------------------------------
+
+GameSpyGameSlot::GameSpyGameSlot()
+	: GameSlot()
+{
+	m_gameSpyLogin.clear();
+	m_gameSpyLocale.clear();
+	m_profileID = 0;
+	m_wins = 0;
+	m_losses = 0;
+	m_rankPoints = 0;
+	m_favoriteSide = 0;
+	m_pingInt = 0;
+	m_profileID = 0;
+	m_pingStr.clear();
+}
+
+// Helper Functions ----------------------------------------
+/*
+** Function definitions for the MIB-II entry points.
+*/
+
+BOOL (__stdcall *SnmpExtensionInitPtr)(IN DWORD dwUpTimeReference, OUT HANDLE *phSubagentTrapEvent, OUT AsnObjectIdentifier *pFirstSupportedRegion);
+BOOL (__stdcall *SnmpExtensionQueryPtr)(IN BYTE bPduType, IN OUT RFC1157VarBindList *pVarBindList, OUT AsnInteger32 *pErrorStatus, OUT AsnInteger32 *pErrorIndex);
+LPVOID (__stdcall *SnmpUtilMemAllocPtr)(IN DWORD bytes);
+VOID (__stdcall *SnmpUtilMemFreePtr)(IN LPVOID pMem);
+
+typedef struct tConnInfoStruct {
+	unsigned int State;
+	unsigned long LocalIP;
+	unsigned short LocalPort;
+	unsigned long RemoteIP;
+	unsigned short RemotePort;
+} ConnInfoStruct;
+
+/***********************************************************************************************
+ * Get_Local_Chat_Connection_Address -- Which address are we using to talk to the chat server? *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:    Ptr to address to return local address                                            *                                                                                             *
+ *                                                                                             *
+ * OUTPUT:   True if success                                                                   *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/27/00 3:24PM ST : Created                                                              *
+ *=============================================================================================*/
+Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverPort, UnsignedInt& localIP)
+{
+	//return false;
+	/*
+	** Local defines.
+	*/
+	enum {
+		CLOSED = 1,
+		LISTENING,
+		SYN_SENT,
+		SEN_RECEIVED,
+		ESTABLISHED,
+		FIN_WAIT,
+		FIN_WAIT2,
+		CLOSE_WAIT,
+		LAST_ACK,
+		CLOSING,
+		TIME_WAIT,
+		DELETE_TCB
+	};
+
+	enum {
+		tcpConnState = 1,
+		tcpConnLocalAddress,
+		tcpConnLocalPort,
+		tcpConnRemAddress,
+		tcpConnRemPort
+	};
+
+
+	/*
+	** Locals.
+	*/
+	unsigned char serverAddress[4];
+	unsigned char remoteAddress[4];
+	HANDLE trap_handle;
+	AsnObjectIdentifier first_supported_region;
+	std::vector<ConnInfoStruct> connectionVector;
+	int last_field;
+	int index;
+	AsnInteger error_status;
+	AsnInteger error_index;
+	int conn_entry_type_index;
+	int conn_entry_type;
+	Bool found;
+
+	/*
+	** Statics.
+	*/
+	static char _conn_state[][32] = {
+		"?",
+		"CLOSED",
+		"LISTENING",
+		"SYN_SENT",
+		"SEN_RECEIVED",
+		"ESTABLISHED",
+		"FIN_WAIT",
+		"FIN_WAIT2",
+		"CLOSE_WAIT",
+		"LAST_ACK",
+		"CLOSING",
+		"TIME_WAIT",
+		"DELETE_TCB"
+	};
+
+	DEBUG_LOG(("Finding local address used to talk to the chat server"));
+	DEBUG_LOG(("Current chat server name is %s", serverName.str()));
+	DEBUG_LOG(("Chat server port is %d", serverPort));
+
+	/*
+	** Get the address of the chat server.
+	*/
+	DEBUG_LOG( ("About to call gethostbyname"));
+	struct hostent *host_info = gethostbyname(serverName.str());
+
+	if (!host_info) {
+		DEBUG_LOG( ("gethostbyname failed! Error code %d", WSAGetLastError()));
+		return(false);
+	}
+
+	memcpy(serverAddress, &host_info->h_addr_list[0][0], 4);
+	unsigned long temp = *((unsigned long*)(&serverAddress[0]));
+	temp = ntohl(temp);
+	*((unsigned long*)(&serverAddress[0])) = temp;
+
+	DEBUG_LOG(("Host address is %d.%d.%d.%d", serverAddress[3], serverAddress[2], serverAddress[1], serverAddress[0]));
+
+	/*
+	** Load the MIB-II SNMP DLL.
+	*/
+	DEBUG_LOG(("About to load INETMIB1.DLL"));
+
+	HINSTANCE mib_ii_dll = LoadLibrary("inetmib1.dll");
+	if (mib_ii_dll == NULL) {
+		DEBUG_LOG(("Failed to load INETMIB1.DLL"));
+		return(false);
+	}
+
+	DEBUG_LOG(("About to load SNMPAPI.DLL"));
+
+	HINSTANCE snmpapi_dll = LoadLibrary("snmpapi.dll");
+	if (snmpapi_dll == NULL) {
+		DEBUG_LOG(("Failed to load SNMPAPI.DLL"));
+		FreeLibrary(mib_ii_dll);
+		return(false);
+	}
+
+	/*
+	** Get the function pointers into the .dll
+	*/
+	SnmpExtensionInitPtr = (int (__stdcall *)(unsigned long,void ** ,AsnObjectIdentifier *)) GetProcAddress(mib_ii_dll, "SnmpExtensionInit");
+	SnmpExtensionQueryPtr = (int (__stdcall *)(unsigned char,SnmpVarBindList *,long *,long *)) GetProcAddress(mib_ii_dll, "SnmpExtensionQuery");
+	SnmpUtilMemAllocPtr = (void *(__stdcall *)(unsigned long)) GetProcAddress(snmpapi_dll, "SnmpUtilMemAlloc");
+	SnmpUtilMemFreePtr = (void (__stdcall *)(void *)) GetProcAddress(snmpapi_dll, "SnmpUtilMemFree");
+	if (SnmpExtensionInitPtr == NULL || SnmpExtensionQueryPtr == NULL || SnmpUtilMemAllocPtr == NULL || SnmpUtilMemFreePtr == NULL) {
+		DEBUG_LOG(("Failed to get proc addresses for linked functions"));
+		FreeLibrary(snmpapi_dll);
+		FreeLibrary(mib_ii_dll);
+		return(false);
+	}
+
+
+	RFC1157VarBindList *bind_list_ptr = (RFC1157VarBindList *) SnmpUtilMemAllocPtr(sizeof(RFC1157VarBindList));
+	RFC1157VarBind *bind_ptr = (RFC1157VarBind *) SnmpUtilMemAllocPtr(sizeof(RFC1157VarBind));
+
+	/*
+	** OK, here we go. Try to initialise the .dll
+	*/
+	DEBUG_LOG(("About to init INETMIB1.DLL"));
+	int ok = SnmpExtensionInitPtr(GetCurrentTime(), &trap_handle, &first_supported_region);
+
+	if (!ok) {
+		/*
+		** Aw crap.
+		*/
+		DEBUG_LOG(("Failed to init the .dll"));
+		SnmpUtilMemFreePtr(bind_list_ptr);
+		SnmpUtilMemFreePtr(bind_ptr);
+		FreeLibrary(snmpapi_dll);
+		FreeLibrary(mib_ii_dll);
+		return(false);
+	}
+
+	/*
+	** Name of mib_ii object we want to query. See RFC 1213.
+	**
+	** iso.org.dod.internet.mgmt.mib-2.tcp.tcpConnTable.TcpConnEntry.tcpConnState
+	**  1   3   6      1      2     1   6        13          1             1
+	*/
+	unsigned int mib_ii_name[] = {1,3,6,1,2,1,6,13,1,1};
+	unsigned int *mib_ii_name_ptr = (unsigned int *) SnmpUtilMemAllocPtr(sizeof(mib_ii_name));
+	memcpy(mib_ii_name_ptr, mib_ii_name, sizeof(mib_ii_name));
+
+	/*
+	** Get the index of the conn entry data.
+	*/
+	conn_entry_type_index = ARRAY_SIZE(mib_ii_name) - 1;
+
+	/*
+	** Set up the bind list.
+	*/
+	bind_ptr->name.idLength = ARRAY_SIZE(mib_ii_name);
+	bind_ptr->name.ids = mib_ii_name;
+	bind_list_ptr->list = bind_ptr;
+	bind_list_ptr->len = 1;
+
+
+	/*
+	** We start with the tcpConnLocalAddress field.
+	*/
+	last_field = 1;
+
+	/*
+	** First connection.
+	*/
+	index = 0;
+
+	/*
+	** Suck out that tcp connection info....
+	*/
+	while (true) {
+
+		if (!SnmpExtensionQueryPtr(SNMP_PDU_GETNEXT, bind_list_ptr, &error_status, &error_index)) {
+		//if (!SnmpExtensionQueryPtr(ASN_RFC1157_GETNEXTREQUEST, bind_list_ptr, &error_status, &error_index)) {
+			DEBUG_LOG(("SnmpExtensionQuery returned false"));
+			SnmpUtilMemFreePtr(bind_list_ptr);
+			SnmpUtilMemFreePtr(bind_ptr);
+			FreeLibrary(snmpapi_dll);
+			FreeLibrary(mib_ii_dll);
+			return(false);
+		}
+
+		/*
+		** If this is something new we aren't looking for then we are done.
+		*/
+		if (bind_ptr->name.idLength < ARRAY_SIZE(mib_ii_name)) {
+			break;
+		}
+
+		/*
+		** Get the type of info we are looking at. See RFC1213.
+		**
+		** 1 = tcpConnState
+		** 2 = tcpConnLocalAddress
+		** 3 = tcpConnLocalPort
+		** 4 = tcpConnRemAddress
+		** 5 = tcpConnRemPort
+		**
+		** tcpConnState is one of the following...
+		**
+		**   1  closed
+		**   2  listen
+		**   3  synSent
+		**   4  synReceived
+		**   5  established
+		**   6  finWait1
+		**   7  finWait2
+		**   8  closeWait
+		**   9  lastAck
+		**   10 closing
+		**   11 timeWait
+		**   12 deleteTCB
+		*/
+		conn_entry_type = bind_ptr->name.ids[conn_entry_type_index];
+
+		if (last_field != conn_entry_type) {
+			index = 0;
+			last_field = conn_entry_type;
+		}
+
+		switch (conn_entry_type) {
+
+			/*
+			** 1. First field in the entry. Need to create a new connection info struct
+			** here to store this connection in.
+			*/
+			case tcpConnState:
+			{
+				ConnInfoStruct new_conn;
+				new_conn.State = bind_ptr->value.asnValue.number;
+				connectionVector.push_back(new_conn);
+				break;
+			}
+
+			/*
+			** 2. Local address field.
+			*/
+			case tcpConnLocalAddress:
+				DEBUG_ASSERTCRASH(index < connectionVector.size(), ("Bad connection index"));
+				connectionVector[index].LocalIP = *((unsigned long*)bind_ptr->value.asnValue.address.stream);
+				index++;
+				break;
+
+			/*
+			** 3. Local port field.
+			*/
+			case tcpConnLocalPort:
+				DEBUG_ASSERTCRASH(index < connectionVector.size(), ("Bad connection index"));
+				connectionVector[index].LocalPort = bind_ptr->value.asnValue.number;
+				//connectionVector[index]->LocalPort = ntohs(connectionVector[index]->LocalPort);
+				index++;
+				break;
+
+			/*
+			** 4. Remote address field.
+			*/
+			case tcpConnRemAddress:
+				DEBUG_ASSERTCRASH(index < connectionVector.size(), ("Bad connection index"));
+				connectionVector[index].RemoteIP = *((unsigned long*)bind_ptr->value.asnValue.address.stream);
+				index++;
+				break;
+
+			/*
+			** 5. Remote port field.
+			*/
+			case tcpConnRemPort:
+				DEBUG_ASSERTCRASH(index < connectionVector.size(), ("Bad connection index"));
+				connectionVector[index].RemotePort = bind_ptr->value.asnValue.number;
+				//connectionVector[index]->RemotePort = ntohs(connectionVector[index]->RemotePort);
+				index++;
+				break;
+		}
+	}
+
+	SnmpUtilMemFreePtr(bind_list_ptr);
+	SnmpUtilMemFreePtr(bind_ptr);
+	SnmpUtilMemFreePtr(mib_ii_name_ptr);
+
+	DEBUG_LOG(("Got %d connections in list, parsing...", connectionVector.size()));
+
+	/*
+	** Right, we got the lot. Lets see if any of them have the same address as the chat
+	** server we think we are talking to.
+	*/
+	found = false;
+	for (size_t i=0; i<connectionVector.size(); ++i) {
+		ConnInfoStruct connection = connectionVector[i];
+
+		temp = ntohl(connection.RemoteIP);
+		memcpy(remoteAddress, (unsigned char*)&temp, 4);
+
+		/*
+		** See if this connection has the same address as our server.
+		*/
+		if (!found && memcmp(remoteAddress, serverAddress, 4) == 0) {
+			DEBUG_LOG(("Found connection with same remote address as server"));
+
+			if (serverPort == 0 || serverPort == (unsigned int)connection.RemotePort) {
+
+				DEBUG_LOG(("Connection has same port"));
+				/*
+				** Make sure the connection is current.
+				*/
+				if (connection.State == ESTABLISHED) {
+					DEBUG_LOG(("Connection is ESTABLISHED"));
+					localIP = connection.LocalIP;
+					found = true;
+				} else {
+					DEBUG_LOG(("Connection is not ESTABLISHED - skipping"));
+				}
+			} else {
+				DEBUG_LOG(("Connection has different port. Port is %d, looking for %d", connection.RemotePort, serverPort));
+			}
+		}
+	}
+
+	if (found) {
+		DEBUG_LOG(("Using address 0x%8.8X to talk to chat server", localIP));
+	}
+
+	FreeLibrary(snmpapi_dll);
+	FreeLibrary(mib_ii_dll);
+	return(found);
+}
+
+// GameSpyGameSlot ----------------------------------------
+
+void GameSpyGameSlot::setPingString( AsciiString pingStr )
+{
+	m_pingStr = pingStr;
+	m_pingInt = TheGameSpyInfo->getPingValue(pingStr);
+}
+
+// GameSpyStagingRoom ----------------------------------------
+
+GameSpyStagingRoom::GameSpyStagingRoom()
+{
+	cleanUpSlotPointers();
+
+	setLocalIP(0);
+	m_transport = NULL;
+
+	m_localName = "localhost";
+
+	m_ladderIP.clear();
+	m_ladderPort = 0;
+}
+
+void GameSpyStagingRoom::cleanUpSlotPointers( void )
+{
+	for (Int i = 0; i< MAX_SLOTS; ++i)
+		setSlotPointer(i, &m_GameSpySlot[i]);
+}
+
+GameSpyGameSlot * GameSpyStagingRoom::getGameSpySlot( Int index )
+{
+	GameSlot *slot = getSlot(index);
+	DEBUG_ASSERTCRASH(slot && (slot == &(m_GameSpySlot[index])), ("Bad game slot pointer"));
+	return (GameSpyGameSlot *)slot;
+}
+
+void GameSpyStagingRoom::init( void )
+{
+	GameInfo::init();
+}
+
+void GameSpyStagingRoom::setPingString( AsciiString pingStr )
+{
+	m_pingStr = pingStr;
+	m_pingInt = TheGameSpyInfo->getPingValue(pingStr);
+}
+
+Bool GameSpyStagingRoom::amIHost( void ) const
+{
+	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
+	if (!m_inGame)
+		return false;
+
+	return getConstSlot(0)->isPlayer(m_localName);
+}
+
+void GameSpyStagingRoom::resetAccepted( void )
+{
+	GameInfo::resetAccepted();
+
+	if (amIHost())
+	{
+		/*
+		peerStateChanged(TheGameSpyChat->getPeer());
+		m_hasBeenQueried = false;
+		DEBUG_LOG(("resetAccepted() called peerStateChange()"));
+		*/
+	}
+}
+
+Int GameSpyStagingRoom::getLocalSlotNum( void ) const
+{
+	DEBUG_ASSERTCRASH(m_inGame, ("Looking for local game slot while not in game"));
+	if (!m_inGame)
+		return -1;
+
+	AsciiString localName = TheGameSpyInfo->getLocalName();
+
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		const GameSlot *slot = getConstSlot(i);
+		if (slot == NULL) {
+			continue;
+		}
+		if (slot->isPlayer(localName))
+			return i;
+	}
+	return -1;
+}
+
+void GameSpyStagingRoom::startGame(Int gameID)
+{
+	DEBUG_ASSERTCRASH(m_inGame, ("Starting a game while not in game"));
+	DEBUG_LOG(("GameSpyStagingRoom::startGame - game id = %d", gameID));
+	DEBUG_ASSERTCRASH(m_transport == NULL, ("m_transport is not NULL when it should be"));
+	DEBUG_ASSERTCRASH(TheNAT == NULL, ("TheNAT is not NULL when it should be"));
+
+	UnsignedInt localIP = TheGameSpyInfo->getInternalIP();
+	setLocalIP(localIP);
+
+	delete TheNAT;
+	TheNAT = NULL;
+
+	// fill in GS-specific info
+	Int numHumans = 0;
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		if (m_GameSpySlot[i].isHuman())
+		{
+			++numHumans;
+			AsciiString gsName;
+			gsName.translate( m_GameSpySlot[i].getName() );
+			m_GameSpySlot[i].setLoginName( gsName );
+
+			if (m_isQM)
+			{
+				if (getLocalSlotNum() == i)
+					m_GameSpySlot[i].setProfileID(TheGameSpyInfo->getLocalProfileID());  // hehe - we know our own.  the rest, they'll tell us.
+			}
+			else
+			{
+				PlayerInfoMap *pInfoMap = TheGameSpyInfo->getPlayerInfoMap();
+				PlayerInfoMap::iterator it = pInfoMap->find(gsName);
+				if (it != pInfoMap->end())
+				{
+					m_GameSpySlot[i].setProfileID(it->second.m_profileID);
+					m_GameSpySlot[i].setLocale(it->second.m_locale);
+					m_GameSpySlot[i].setSlotRankPoints(it->second.m_rankPoints);
+					m_GameSpySlot[i].setFavoriteSide(it->second.m_side);
+				}
+				else
+				{
+					DEBUG_CRASH(("No player info for %s", gsName.str()));
+				}
+			}
+		}
+	}
+
+//#if defined(RTS_DEBUG)
+	if (numHumans < 2)
+	{
+		launchGame();
+		if (TheGameSpyInfo)
+			TheGameSpyInfo->leaveStagingRoom();
+	}
+	else
+//#endif // defined(RTS_DEBUG)
+	{
+		TheNAT = NEW NAT();
+		TheNAT->attachSlotList(m_slot, getLocalSlotNum(), m_localIP);
+		TheNAT->establishConnectionPaths();
+	}
+}
+
+AsciiString GameSpyStagingRoom::generateGameSpyGameResultsPacket( void )
+{
+	Int i;
+	Int endFrame = TheVictoryConditions->getEndFrame();
+	Int localSlotNum = getLocalSlotNum();
+	Int winningTeam = -1;
+	Int numHumans = 0;
+	Int numPlayers = 0;
+	Int numAIs = 0;
+	Int numTeamsAtGameEnd = 0;
+	Int lastTeamAtGameEnd = -1;
+	for (i=0; i<MAX_SLOTS; ++i)
+	{
+		AsciiString playerName;
+		playerName.format("player%d", i);
+		Player *p = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
+		if (p)
+		{
+			++numHumans;
+			if (TheVictoryConditions->hasAchievedVictory(p))
+			{
+				winningTeam = getSlot(i)->getTeamNumber();
+			}
+
+			// check if he lasted
+			GameSlot *slot = getSlot(i);
+			if (!slot->disconnected())
+			{
+				if (slot->getTeamNumber() != lastTeamAtGameEnd || numTeamsAtGameEnd == 0)
+				{
+					lastTeamAtGameEnd = slot->getTeamNumber();
+					++numTeamsAtGameEnd;
+				}
+			}
+		}
+		else
+		{
+			if (m_GameSpySlot[i].isAI())
+				++numAIs;
+		}
+	}
+	numPlayers = numHumans + numAIs;
+
+	AsciiString mapName;
+	for (i=0; i<getMap().getLength(); ++i)
+	{
+		char c = getMap().getCharAt(i);
+		if (c == '\\')
+			c = '/';
+		mapName.concat(c);
+	}
+
+	AsciiString results;
+	results.format("\\seed\\%d\\hostname\\%s\\mapname\\%s\\numplayers\\%d\\duration\\%d\\gamemode\\exiting\\localplayer\\%d",
+		getSeed(), m_GameSpySlot[0].getLoginName().str(), mapName.str(), numPlayers, endFrame, localSlotNum);
+
+	Int playerID = 0;
+	for (i=0; i<MAX_SLOTS; ++i)
+	{
+		AsciiString playerName;
+		playerName.format("player%d", i);
+		Player *p = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
+		if (p)
+		{
+			GameSpyGameSlot *slot = &(m_GameSpySlot[i]);
+			AsciiString playerName = (slot->isHuman())?slot->getLoginName():"AIPlayer";
+			Int gsPlayerID = slot->getProfileID();
+			Bool disconnected = slot->disconnected();
+
+			AsciiString result = "loss";
+			if (disconnected)
+				result = "discon";
+			else if (TheNetwork->sawCRCMismatch())
+				result = "desync";
+			else if (TheVictoryConditions->hasAchievedVictory(p))
+				result = "win";
+
+			AsciiString side = p->getPlayerTemplate()->getSide();
+			if (side == "America")
+				side = "USA";  //conform to GameSpy
+
+			AsciiString playerStr;
+			playerStr.format("\\player_%d\\%s\\pid_%d\\%d\\team_%d\\%d\\result_%d\\%s\\side_%d\\%s",
+				playerID, playerName.str(), playerID, gsPlayerID, playerID, slot->getTeamNumber(),
+				playerID, result.str(), playerID, side.str());
+			results.concat(playerStr);
+
+			++playerID;
+		}
+	}
+
+	return results;
+}
+
+AsciiString GameSpyStagingRoom::generateLadderGameResultsPacket( void )
+{
+	Int i;
+	Int endFrame = TheVictoryConditions->getEndFrame();
+	Int localSlotNum = getLocalSlotNum();
+	Bool sawGameEnd = (endFrame > 0);
+	Int winningTeam = -1;
+	Int numPlayers = 0;
+	Int numTeamsAtGameEnd = 0;
+	Int lastTeamAtGameEnd = -1;
+	Player* p[MAX_SLOTS];
+	for (i=0; i<MAX_SLOTS; ++i)
+	{
+		AsciiString playerName;
+		playerName.format("player%d", i);
+		p[i] = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
+		if (p[i])
+		{
+			++numPlayers;
+			if (TheVictoryConditions->hasAchievedVictory(p[i]))
+			{
+				winningTeam = getSlot(i)->getTeamNumber();
+			}
+
+			// check if he lasted
+			GameSlot *slot = getSlot(i);
+			if (!slot->disconnected())
+			{
+				if (slot->getTeamNumber() != lastTeamAtGameEnd || numTeamsAtGameEnd == 0)
+				{
+					lastTeamAtGameEnd = slot->getTeamNumber();
+					++numTeamsAtGameEnd;
+				}
+			}
+		}
+	}
+
+	AsciiString results;
+	results.format("seed=%d,slotNum=%d,sawDesync=%d,sawGameEnd=%d,winningTeam=%d,disconEnd=%d,duration=%d,numPlayers=%d,isQM=%d,map=%s",
+		getSeed(), localSlotNum, TheNetwork->sawCRCMismatch(), sawGameEnd, winningTeam, (numTeamsAtGameEnd < 2),
+		endFrame, numPlayers, m_isQM, TheGameState->realMapPathToPortableMapPath(getMap()).str());
+
+	AsciiString tempStr;
+	tempStr.format(",ladderIP=%s,ladderPort=%d", getLadderIP().str(), getLadderPort());
+	results.concat(tempStr);
+
+	Int playerID = 0;
+	for (i=0; i<MAX_SLOTS; ++i)
+	{
+		AsciiString playerName;
+		playerName.format("player%d", i);
+		if (p[i])
+		{
+			GameSpyGameSlot *slot = &(m_GameSpySlot[i]);
+			ScoreKeeper *keeper = p[i]->getScoreKeeper();
+			AsciiString playerName = slot->getLoginName();
+			Int gsPlayerID = slot->getProfileID();
+			PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(gsPlayerID);
+			Int fps = TheNetwork->getAverageFPS();
+			Int unitsKilled = keeper->getTotalUnitsDestroyed();
+			Int unitsLost = keeper->getTotalUnitsLost();
+			Int unitsBuilt = keeper->getTotalUnitsBuilt();
+			Int buildingsKilled = keeper->getTotalBuildingsDestroyed();
+			Int buildingsLost = keeper->getTotalBuildingsLost();
+			Int buildingsBuilt = keeper->getTotalBuildingsBuilt();
+			Int earnings = keeper->getTotalMoneyEarned();
+			Int techCaptured = keeper->getTotalTechBuildingsCaptured();
+			Bool disconnected = slot->disconnected();
+
+			AsciiString playerStr;
+			playerStr.format(",player%d=%s,playerID%d=%d,locale%d=%d",
+				playerID, playerName.str(), playerID, gsPlayerID, playerID, stats.locale);
+			results.concat(playerStr);
+			playerStr.format(",unitsKilled%d=%d,unitsLost%d=%d,unitsBuilt%d=%d",
+				playerID, unitsKilled, playerID, unitsLost, playerID, unitsBuilt);
+			results.concat(playerStr);
+			playerStr.format(",buildingsKilled%d=%d,buildingsLost%d=%d,buildingsBuilt%d=%d",
+				playerID, buildingsKilled, playerID, buildingsLost, playerID, buildingsBuilt);
+			results.concat(playerStr);
+#if RTS_GENERALS
+			playerStr.format(",fps%d=%d,cash%d=%d,capturedTech%d=%d,discon%d=%d,side%d=%s,team%d=%d",
+				playerID, fps, playerID, earnings, playerID, techCaptured, playerID, disconnected, playerID, p[i]->getPlayerTemplate()->getSide().str(), playerID, slot->getTeamNumber());
+#elif RTS_ZEROHOUR
+			playerStr.format(",fps%d=%d,cash%d=%d,capturedTech%d=%d,discon%d=%d,side%d=%s",
+				playerID, fps, playerID, earnings, playerID, techCaptured, playerID, disconnected, playerID, p[i]->getPlayerTemplate()->getSide().str());
+#endif
+			results.concat(playerStr);
+
+			++playerID;
+		}
+	}
+
+	// Add a trailing size value (so the server can ensure it got the entire packet)
+	results.concat(",size=");
+	int resultsLen = results.getLength()+10;
+	AsciiString tail;
+	tail.format("%10.10d", resultsLen);
+	results.concat(tail);
+
+	return results;
+}
+
+void GameSpyStagingRoom::launchGame( void )
+{
+	setGameInProgress(TRUE);
+
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		const GameSpyGameSlot *slot = getGameSpySlot(i);
+		if (slot->isHuman())
+		{
+			if (TheGameSpyInfo->didPlayerPreorder(slot->getProfileID()))
+				markPlayerAsPreorder(i);
+		}
+	}
+
+	// Set up the game network
+	AsciiString user;
+	AsciiString userList;
+	DEBUG_ASSERTCRASH(TheNetwork == NULL, ("For some reason TheNetwork isn't NULL at the start of this game.  Better look into that."));
+
+	delete TheNetwork;
+	TheNetwork = NULL;
+
+	// Time to initialize TheNetwork for this game.
+	TheNetwork = NetworkInterface::createNetwork();
+	TheNetwork->init();
+
+	TheNetwork->setLocalAddress(getLocalIP(), (TheNAT)?TheNAT->getSlotPort(getLocalSlotNum()):8888);
+	if (TheNAT)
+		TheNetwork->attachTransport(TheNAT->getTransport());
+	else
+		TheNetwork->initTransport();
+
+	TheNetwork->parseUserList(this);
+
+
+	if (TheGameLogic->isInGame()) {
+		TheGameLogic->clearGameData();
+	}
+
+	Bool filesOk = DoAnyMapTransfers(this);
+
+	// see if we really have the map.  if not, back out.
+	TheMapCache->updateCache();
+	if (!filesOk || TheMapCache->findMap(getMap()) == NULL)
+	{
+		DEBUG_LOG(("After transfer, we didn't really have the map.  Bailing..."));
+
+		delete TheNetwork;
+		TheNetwork = NULL;
+
+		GSMessageBoxOk(TheGameText->fetch("GUI:Error"), TheGameText->fetch("GUI:CouldNotTransferMap"));
+
+		void PopBackToLobby( void );
+		PopBackToLobby();
+		return;
+	}
+
+
+	// shutdown the top, but do not pop it off the stack
+//		TheShell->hideShell();
+	// setup the Global Data with the Map and Seed
+	TheWritableGlobalData->m_pendingFile = getMap();
+
+	// send a message to the logic for a new game
+	GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
+	msg->appendIntegerArgument(GAME_INTERNET);
+
+	TheWritableGlobalData->m_useFpsLimit = false;
+
+	// Set the random seed
+	InitGameLogicRandom( getSeed() );
+	DEBUG_LOG(("InitGameLogicRandom( %d )", getSeed()));
+
+	// mark us as "Loading" in the buddy list
+	BuddyRequest req;
+	req.buddyRequestType = BuddyRequest::BUDDYREQUEST_SETSTATUS;
+	req.arg.status.status = GP_PLAYING;
+	strcpy(req.arg.status.statusString, "Loading");
+	sprintf(req.arg.status.locationString, "%s", WideCharStringToMultiByte(getGameName().str()).c_str());
+	TheGameSpyBuddyMessageQueue->addRequest(req);
+
+	delete TheNAT;
+	TheNAT = NULL;
+}
+
+void GameSpyStagingRoom::reset(void)
+{
+#ifdef DEBUG_LOGGING
+	if (this == TheGameSpyGame)
+	{
+		WindowLayout *theLayout = TheShell->findScreenByFilename("Menus/GameSpyGameOptionsMenu.wnd");
+		if (theLayout)
+		{
+			DEBUG_LOG(("Resetting TheGameSpyGame on the game options menu!"));
+		}
+	}
+#endif
+	GameInfo::reset();
+}
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
new file mode 100644
index 00000000000..da36009076c
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
@@ -0,0 +1,683 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: BuddyThread.cpp //////////////////////////////////////////////////////
+// GameSpy Presence & Messaging (Buddy) thread
+// This thread communicates with GameSpy's buddy server
+// and talks through a message queue with the rest of
+// the game.
+// Author: Matthew D. Campbell, June 2002
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/GameSpy/BuddyThread.h"
+#include "GameNetwork/GameSpy/PeerThread.h"
+#include "GameNetwork/GameSpy/PersistentStorageThread.h"
+#include "GameNetwork/GameSpy/ThreadUtils.h"
+
+#include "mutex.h"
+#include "thread.h"
+
+
+//-------------------------------------------------------------------------
+
+typedef std::queue<BuddyRequest> RequestQueue;
+typedef std::queue<BuddyResponse> ResponseQueue;
+class BuddyThreadClass;
+
+class GameSpyBuddyMessageQueue : public GameSpyBuddyMessageQueueInterface
+{
+public:
+	virtual ~GameSpyBuddyMessageQueue();
+	GameSpyBuddyMessageQueue();
+	virtual void startThread( void );
+	virtual void endThread( void );
+	virtual Bool isThreadRunning( void );
+	virtual Bool isConnected( void );
+	virtual Bool isConnecting( void );
+
+	virtual void addRequest( const BuddyRequest& req );
+	virtual Bool getRequest( BuddyRequest& req );
+
+	virtual void addResponse( const BuddyResponse& resp );
+	virtual Bool getResponse( BuddyResponse& resp );
+
+	virtual GPProfile getLocalProfileID( void );
+
+	BuddyThreadClass* getThread( void );
+
+private:
+	MutexClass m_requestMutex;
+	MutexClass m_responseMutex;
+	RequestQueue m_requests;
+	ResponseQueue m_responses;
+	BuddyThreadClass *m_thread;
+};
+
+GameSpyBuddyMessageQueueInterface* GameSpyBuddyMessageQueueInterface::createNewMessageQueue( void )
+{
+	return NEW GameSpyBuddyMessageQueue;
+}
+
+GameSpyBuddyMessageQueueInterface *TheGameSpyBuddyMessageQueue;
+#define MESSAGE_QUEUE ((GameSpyBuddyMessageQueue *)TheGameSpyBuddyMessageQueue)
+
+//-------------------------------------------------------------------------
+
+class BuddyThreadClass : public ThreadClass
+{
+
+public:
+	BuddyThreadClass() : ThreadClass() { m_isNewAccount = m_isdeleting = m_isConnecting = m_isConnected = false; m_profileID = 0; m_lastErrorCode = 0; }
+
+	void Thread_Function();
+
+	void errorCallback( GPConnection *con, GPErrorArg *arg );
+	void messageCallback( GPConnection *con, GPRecvBuddyMessageArg *arg );
+	void connectCallback( GPConnection *con, GPConnectResponseArg *arg );
+	void requestCallback( GPConnection *con, GPRecvBuddyRequestArg *arg );
+	void statusCallback( GPConnection *con, GPRecvBuddyStatusArg *arg );
+
+	Bool isConnecting( void ) { return m_isConnecting; }
+	Bool isConnected( void ) { return m_isConnected; }
+
+	GPProfile getLocalProfileID( void ) { return m_profileID; }
+
+private:
+	Bool m_isNewAccount;
+	Bool m_isConnecting;
+	Bool m_isConnected;
+	GPProfile m_profileID;
+	Int m_lastErrorCode;
+	Bool m_isdeleting;
+	std::string m_nick, m_email, m_pass;
+};
+
+enum CallbackType
+{
+	CALLBACK_CONNECT,
+	CALLBACK_ERROR,
+	CALLBACK_RECVMESSAGE,
+	CALLBACK_RECVREQUEST,
+	CALLBACK_RECVSTATUS,
+};
+
+void callbackWrapper( GPConnection *con, void *arg, void *param )
+{
+	CallbackType info = (CallbackType)(Int)param;
+	BuddyThreadClass *thread = MESSAGE_QUEUE->getThread() ? MESSAGE_QUEUE->getThread() : NULL /*(TheGameSpyBuddyMessageQueue)?TheGameSpyBuddyMessageQueue->getThread():NULL*/;
+	if (!thread)
+		return;
+
+	switch (info)
+	{
+		case CALLBACK_CONNECT:
+			thread->connectCallback( con, (GPConnectResponseArg *)arg );
+			break;
+		case CALLBACK_ERROR:
+			thread->errorCallback( con, (GPErrorArg *)arg );
+			break;
+		case CALLBACK_RECVMESSAGE:
+			thread->messageCallback( con, (GPRecvBuddyMessageArg *)arg );
+			break;
+		case CALLBACK_RECVREQUEST:
+			thread->requestCallback( con, (GPRecvBuddyRequestArg *)arg );
+			break;
+		case CALLBACK_RECVSTATUS:
+			thread->statusCallback( con, (GPRecvBuddyStatusArg *)arg );
+			break;
+	}
+}
+
+//-------------------------------------------------------------------------
+
+GameSpyBuddyMessageQueue::GameSpyBuddyMessageQueue()
+{
+	m_thread = NULL;
+}
+
+GameSpyBuddyMessageQueue::~GameSpyBuddyMessageQueue()
+{
+	endThread();
+}
+
+void GameSpyBuddyMessageQueue::startThread( void )
+{
+	if (!m_thread)
+	{
+		m_thread = NEW BuddyThreadClass;
+		m_thread->Execute();
+	}
+	else
+	{
+		if (!m_thread->Is_Running())
+		{
+			m_thread->Execute();
+		}
+	}
+}
+
+void GameSpyBuddyMessageQueue::endThread( void )
+{
+	delete m_thread;
+	m_thread = NULL;
+}
+
+Bool GameSpyBuddyMessageQueue::isThreadRunning( void )
+{
+	return (m_thread) ? m_thread->Is_Running() : false;
+}
+
+Bool GameSpyBuddyMessageQueue::isConnected( void )
+{
+	return (m_thread) ? m_thread->isConnected() : false;
+}
+
+Bool GameSpyBuddyMessageQueue::isConnecting( void )
+{
+	return (m_thread) ? m_thread->isConnecting() : false;
+}
+
+void GameSpyBuddyMessageQueue::addRequest( const BuddyRequest& req )
+{
+	MutexClass::LockClass m(m_requestMutex);
+	if (m.Failed())
+		return;
+
+	m_requests.push(req);
+}
+
+Bool GameSpyBuddyMessageQueue::getRequest( BuddyRequest& req )
+{
+	MutexClass::LockClass m(m_requestMutex, 0);
+	if (m.Failed())
+		return false;
+
+	if (m_requests.empty())
+		return false;
+	req = m_requests.front();
+	m_requests.pop();
+	return true;
+}
+
+void GameSpyBuddyMessageQueue::addResponse( const BuddyResponse& resp )
+{
+	MutexClass::LockClass m(m_responseMutex);
+	if (m.Failed())
+		return;
+
+	m_responses.push(resp);
+}
+
+Bool GameSpyBuddyMessageQueue::getResponse( BuddyResponse& resp )
+{
+	MutexClass::LockClass m(m_responseMutex, 0);
+	if (m.Failed())
+		return false;
+
+	if (m_responses.empty())
+		return false;
+	resp = m_responses.front();
+	m_responses.pop();
+	return true;
+}
+
+BuddyThreadClass* GameSpyBuddyMessageQueue::getThread( void )
+{
+	return m_thread;
+}
+
+GPProfile GameSpyBuddyMessageQueue::getLocalProfileID( void )
+{
+	return (m_thread) ? m_thread->getLocalProfileID() : 0;
+}
+
+//-------------------------------------------------------------------------
+
+void BuddyThreadClass::Thread_Function()
+{
+	try {
+	GPConnection gpCon;
+	GPConnection *con = &gpCon;
+#if RTS_GENERALS
+	const int productID = 675;
+#elif RTS_ZEROHOUR
+	const int productID = 823;
+#endif
+	gpInitialize( con, productID, 0, GP_PARTNERID_GAMESPY );
+	m_isConnected = m_isConnecting = false;
+
+	gpSetCallback( con, GP_ERROR,								callbackWrapper,	(void *)CALLBACK_ERROR );
+	gpSetCallback( con, GP_RECV_BUDDY_MESSAGE,	callbackWrapper,	(void *)CALLBACK_RECVMESSAGE );
+	gpSetCallback( con, GP_RECV_BUDDY_REQUEST,	callbackWrapper,	(void *)CALLBACK_RECVREQUEST );
+	gpSetCallback( con, GP_RECV_BUDDY_STATUS,		callbackWrapper,	(void *)CALLBACK_RECVSTATUS );
+
+	GPEnum lastStatus = GP_OFFLINE;
+	std::string lastStatusString;
+
+	BuddyRequest incomingRequest;
+	while ( running )
+	{
+		// deal with requests
+		if (TheGameSpyBuddyMessageQueue->getRequest(incomingRequest))
+		{
+			switch (incomingRequest.buddyRequestType)
+			{
+			case BuddyRequest::BUDDYREQUEST_LOGIN:
+				m_isConnecting = true;
+				m_nick = incomingRequest.arg.login.nick;
+				m_email = incomingRequest.arg.login.email;
+				m_pass = incomingRequest.arg.login.password;
+				m_isConnected = (gpConnect( con, incomingRequest.arg.login.nick, incomingRequest.arg.login.email,
+					incomingRequest.arg.login.password, (incomingRequest.arg.login.hasFirewall)?GP_FIREWALL:GP_NO_FIREWALL,
+					GP_BLOCKING, callbackWrapper, (void *)CALLBACK_CONNECT ) == GP_NO_ERROR);
+				m_isConnecting = false;
+				break;
+
+			case BuddyRequest::BUDDYREQUEST_RELOGIN:
+				m_isConnecting = true;
+				m_isConnected = (gpConnect( con, m_nick.c_str(), m_email.c_str(), m_pass.c_str(), GP_FIREWALL,
+					GP_BLOCKING, callbackWrapper, (void *)CALLBACK_CONNECT ) == GP_NO_ERROR);
+				m_isConnecting = false;
+				break;
+			case BuddyRequest::BUDDYREQUEST_DELETEACCT:
+				m_isdeleting =  true;
+				// TheSuperHackers @tweak OmniBlade API was updated since Generals released to require a callback. Passing -1 will make our wrapper ignore this.
+				gpDeleteProfile( con, callbackWrapper, (void *)(-1) );
+				break;
+			case BuddyRequest::BUDDYREQUEST_LOGOUT:
+				m_isConnecting = m_isConnected = false;
+				gpDisconnect( con );
+				break;
+			case BuddyRequest::BUDDYREQUEST_MESSAGE:
+				{
+					std::string s = WideCharStringToMultiByte( incomingRequest.arg.message.text );
+					DEBUG_LOG(("Sending a buddy message to %d [%s]", incomingRequest.arg.message.recipient, s.c_str()));
+					gpSendBuddyMessage( con, incomingRequest.arg.message.recipient, s.c_str() );
+				}
+				break;
+			case BuddyRequest::BUDDYREQUEST_LOGINNEW:
+				{
+					m_isConnecting = true;
+					m_nick = incomingRequest.arg.login.nick;
+					m_email = incomingRequest.arg.login.email;
+					m_pass = incomingRequest.arg.login.password;
+					m_isNewAccount = TRUE;
+					// TheSuperHackers @tweak OmniBlade API was updated since Generals release to require uniquenick which is the same as nick and cdkey is an empty string here.
+					m_isConnected = (gpConnectNewUser( con, incomingRequest.arg.login.nick, incomingRequest.arg.login.nick, incomingRequest.arg.login.email,
+						incomingRequest.arg.login.password, "", (incomingRequest.arg.login.hasFirewall)?GP_FIREWALL:GP_NO_FIREWALL,
+						GP_BLOCKING, callbackWrapper, (void *)CALLBACK_CONNECT ) == GP_NO_ERROR);
+					if (m_isNewAccount) // if we didn't re-login
+					{
+						gpSetInfoMask( con, GP_MASK_NONE ); // don't share info
+					}
+					m_isConnecting = false;
+				}
+				break;
+			case BuddyRequest::BUDDYREQUEST_ADDBUDDY:
+				{
+					std::string s = WideCharStringToMultiByte( incomingRequest.arg.addbuddy.text );
+					gpSendBuddyRequest( con, incomingRequest.arg.addbuddy.id, s.c_str() );
+				}
+				break;
+			case BuddyRequest::BUDDYREQUEST_DELBUDDY:
+				{
+					gpDeleteBuddy( con, incomingRequest.arg.profile.id );
+				}
+				break;
+			case BuddyRequest::BUDDYREQUEST_OKADD:
+				{
+					gpAuthBuddyRequest( con, incomingRequest.arg.profile.id );
+				}
+				break;
+			case BuddyRequest::BUDDYREQUEST_DENYADD:
+				{
+					gpDenyBuddyRequest( con, incomingRequest.arg.profile.id );
+				}
+				break;
+			case BuddyRequest::BUDDYREQUEST_SETSTATUS:
+				{
+					//don't blast our 'Loading' status with 'Online'.
+					if (lastStatus == GP_PLAYING && lastStatusString == "Loading" && incomingRequest.arg.status.status == GP_ONLINE)
+						break;
+
+					DEBUG_LOG(("BUDDYREQUEST_SETSTATUS: status is now %d:%s/%s",
+						incomingRequest.arg.status.status, incomingRequest.arg.status.statusString, incomingRequest.arg.status.locationString));
+					gpSetStatus( con, incomingRequest.arg.status.status, incomingRequest.arg.status.statusString,
+						incomingRequest.arg.status.locationString );
+					lastStatus = incomingRequest.arg.status.status;
+					lastStatusString = incomingRequest.arg.status.statusString;
+				}
+				break;
+			}
+		}
+
+		// update the network
+		GPEnum isConnected = GP_CONNECTED;
+		GPResult res = GP_NO_ERROR;
+		res = gpIsConnected( con, &isConnected );
+		if ( isConnected == GP_CONNECTED && res == GP_NO_ERROR )
+			gpProcess( con );
+
+		// end our timeslice
+		Switch_Thread();
+	}
+
+	gpDestroy( con );
+	} catch ( ... ) {
+		DEBUG_CRASH(("Exception in buddy thread!"));
+	}
+}
+
+void BuddyThreadClass::errorCallback( GPConnection *con, GPErrorArg *arg )
+{
+	// log the error
+	DEBUG_LOG(("GPErrorCallback"));
+	m_lastErrorCode = arg->errorCode;
+
+	char errorCodeString[256];
+	char resultString[256];
+
+	#define RESULT(x) case x: strcpy(resultString, #x); break;
+	switch(arg->result)
+	{
+		RESULT(GP_NO_ERROR)
+		RESULT(GP_MEMORY_ERROR)
+		RESULT(GP_PARAMETER_ERROR)
+		RESULT(GP_NETWORK_ERROR)
+		RESULT(GP_SERVER_ERROR)
+	default:
+		strcpy(resultString, "Unknown result!");
+	}
+	#undef RESULT
+
+	#define ERRORCODE(x) case x: strcpy(errorCodeString, #x); break;
+	switch(arg->errorCode)
+	{
+		ERRORCODE(GP_GENERAL)
+		ERRORCODE(GP_PARSE)
+		ERRORCODE(GP_NOT_LOGGED_IN)
+		ERRORCODE(GP_BAD_SESSKEY)
+		ERRORCODE(GP_DATABASE)
+		ERRORCODE(GP_NETWORK)
+		ERRORCODE(GP_FORCED_DISCONNECT)
+		ERRORCODE(GP_CONNECTION_CLOSED)
+		ERRORCODE(GP_LOGIN)
+		ERRORCODE(GP_LOGIN_TIMEOUT)
+		ERRORCODE(GP_LOGIN_BAD_NICK)
+		ERRORCODE(GP_LOGIN_BAD_EMAIL)
+		ERRORCODE(GP_LOGIN_BAD_PASSWORD)
+		ERRORCODE(GP_LOGIN_BAD_PROFILE)
+		ERRORCODE(GP_LOGIN_PROFILE_DELETED)
+		ERRORCODE(GP_LOGIN_CONNECTION_FAILED)
+		ERRORCODE(GP_LOGIN_SERVER_AUTH_FAILED)
+		ERRORCODE(GP_NEWUSER)
+		ERRORCODE(GP_NEWUSER_BAD_NICK)
+		ERRORCODE(GP_NEWUSER_BAD_PASSWORD)
+		ERRORCODE(GP_UPDATEUI)
+		ERRORCODE(GP_UPDATEUI_BAD_EMAIL)
+		ERRORCODE(GP_NEWPROFILE)
+		ERRORCODE(GP_NEWPROFILE_BAD_NICK)
+		ERRORCODE(GP_NEWPROFILE_BAD_OLD_NICK)
+		ERRORCODE(GP_UPDATEPRO)
+		ERRORCODE(GP_UPDATEPRO_BAD_NICK)
+		ERRORCODE(GP_ADDBUDDY)
+		ERRORCODE(GP_ADDBUDDY_BAD_FROM)
+		ERRORCODE(GP_ADDBUDDY_BAD_NEW)
+		ERRORCODE(GP_ADDBUDDY_ALREADY_BUDDY)
+		ERRORCODE(GP_AUTHADD)
+		ERRORCODE(GP_AUTHADD_BAD_FROM)
+		ERRORCODE(GP_AUTHADD_BAD_SIG)
+		ERRORCODE(GP_STATUS)
+		ERRORCODE(GP_BM)
+		ERRORCODE(GP_BM_NOT_BUDDY)
+		ERRORCODE(GP_GETPROFILE)
+		ERRORCODE(GP_GETPROFILE_BAD_PROFILE)
+		ERRORCODE(GP_DELBUDDY)
+		ERRORCODE(GP_DELBUDDY_NOT_BUDDY)
+		ERRORCODE(GP_DELPROFILE)
+		ERRORCODE(GP_DELPROFILE_LAST_PROFILE)
+		ERRORCODE(GP_SEARCH)
+		ERRORCODE(GP_SEARCH_CONNECTION_FAILED)
+	default:
+		strcpy(errorCodeString, "Unknown error code!");
+	}
+	#undef ERRORCODE
+
+	if(arg->fatal)
+	{
+		DEBUG_LOG(( "-----------"));
+		DEBUG_LOG(( "GP FATAL ERROR"));
+		DEBUG_LOG(( "-----------"));
+	}
+	else
+	{
+		DEBUG_LOG(( "-----"));
+		DEBUG_LOG(( "GP ERROR"));
+		DEBUG_LOG(( "-----"));
+	}
+	DEBUG_LOG(( "RESULT: %s (%d)", resultString, arg->result));
+	DEBUG_LOG(( "ERROR CODE: %s (0x%X)", errorCodeString, arg->errorCode));
+	DEBUG_LOG(( "ERROR STRING: %s", arg->errorString));
+
+	if (arg->fatal == GP_FATAL)
+	{
+		BuddyResponse errorResponse;
+		errorResponse.buddyResponseType = BuddyResponse::BUDDYRESPONSE_DISCONNECT;
+		errorResponse.result = arg->result;
+		errorResponse.arg.error.errorCode = arg->errorCode;
+		errorResponse.arg.error.fatal = arg->fatal;
+		strlcpy(errorResponse.arg.error.errorString, arg->errorString, MAX_BUDDY_CHAT_LEN);
+		m_isConnecting = m_isConnected = false;
+		TheGameSpyBuddyMessageQueue->addResponse( errorResponse );
+		if (m_isdeleting)
+		{
+			PeerRequest req;
+			req.peerRequestType = PeerRequest::PEERREQUEST_LOGOUT;
+			TheGameSpyPeerMessageQueue->addRequest( req );
+			m_isdeleting = false;
+		}
+	}
+}
+
+static void getNickForMessage( GPConnection *con, GPGetInfoResponseArg *arg, void *param )
+{
+	BuddyResponse *resp = (BuddyResponse *)param;
+	static_assert(ARRAY_SIZE(resp->arg.message.nick) >= ARRAY_SIZE(arg->nick), "Incorrect array size");
+	strcpy(resp->arg.message.nick, arg->nick);
+}
+
+void BuddyThreadClass::messageCallback( GPConnection *con, GPRecvBuddyMessageArg *arg )
+{
+	BuddyResponse messageResponse;
+	messageResponse.buddyResponseType = BuddyResponse::BUDDYRESPONSE_MESSAGE;
+	messageResponse.profile = arg->profile;
+
+	// get info about the person asking to be our buddy
+	gpGetInfo( con, arg->profile, GP_CHECK_CACHE, GP_BLOCKING, (GPCallback)getNickForMessage, &messageResponse);
+
+	std::wstring s = MultiByteToWideCharSingleLine( arg->message );
+	wcslcpy(messageResponse.arg.message.text, s.c_str(), MAX_BUDDY_CHAT_LEN);
+	messageResponse.arg.message.date = arg->date;
+	DEBUG_LOG(("Got a buddy message from %d [%ls]", arg->profile, s.c_str()));
+	TheGameSpyBuddyMessageQueue->addResponse( messageResponse );
+}
+
+void BuddyThreadClass::connectCallback( GPConnection *con, GPConnectResponseArg *arg )
+{
+	BuddyResponse loginResponse;
+	if (arg->result == GP_NO_ERROR)
+	{
+		loginResponse.buddyResponseType = BuddyResponse::BUDDYRESPONSE_LOGIN;
+		loginResponse.result = arg->result;
+		loginResponse.profile = arg->profile;
+		TheGameSpyBuddyMessageQueue->addResponse( loginResponse );
+		m_profileID = arg->profile;
+
+		if (!TheGameSpyPeerMessageQueue->isConnected() && !TheGameSpyPeerMessageQueue->isConnecting())
+		{
+			DEBUG_LOG(("Buddy connect: trying chat connect"));
+			PeerRequest req;
+			req.peerRequestType = PeerRequest::PEERREQUEST_LOGIN;
+			req.nick = m_nick;
+			req.password = m_pass;
+			req.email = m_email;
+			req.login.profileID = arg->profile;
+			TheGameSpyPeerMessageQueue->addRequest(req);
+		}
+	}
+	else
+	{
+		if (!TheGameSpyPeerMessageQueue->isConnected() && !TheGameSpyPeerMessageQueue->isConnecting())
+		{
+			if (m_lastErrorCode == GP_NEWUSER_BAD_NICK)
+			{
+				m_isNewAccount = FALSE;
+				// they just hit 'create account' instead of 'log in'.  Fix them.
+				DEBUG_LOG(("User Error: Create Account instead of Login.  Fixing them..."));
+				BuddyRequest req;
+				req.buddyRequestType = BuddyRequest::BUDDYREQUEST_LOGIN;
+				strlcpy(req.arg.login.nick, m_nick.c_str(), ARRAY_SIZE(req.arg.login.nick));
+				strlcpy(req.arg.login.email, m_email.c_str(), ARRAY_SIZE(req.arg.login.email));
+				strlcpy(req.arg.login.password, m_pass.c_str(), ARRAY_SIZE(req.arg.login.password));
+				req.arg.login.hasFirewall = true;
+				TheGameSpyBuddyMessageQueue->addRequest( req );
+				return;
+			}
+			DEBUG_LOG(("Buddy connect failed (%d/%d): posting a failed chat connect", arg->result, m_lastErrorCode));
+			PeerResponse resp;
+			resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
+			resp.discon.reason = DISCONNECT_COULDNOTCONNECT;
+			switch (m_lastErrorCode)
+			{
+			case GP_LOGIN_TIMEOUT:
+				resp.discon.reason = DISCONNECT_GP_LOGIN_TIMEOUT;
+				break;
+			case GP_LOGIN_BAD_NICK:
+				resp.discon.reason = DISCONNECT_GP_LOGIN_BAD_NICK;
+				break;
+			case GP_LOGIN_BAD_EMAIL:
+				resp.discon.reason = DISCONNECT_GP_LOGIN_BAD_EMAIL;
+				break;
+			case GP_LOGIN_BAD_PASSWORD:
+				resp.discon.reason = DISCONNECT_GP_LOGIN_BAD_PASSWORD;
+				break;
+			case GP_LOGIN_BAD_PROFILE:
+				resp.discon.reason = DISCONNECT_GP_LOGIN_BAD_PROFILE;
+				break;
+			case GP_LOGIN_PROFILE_DELETED:
+				resp.discon.reason = DISCONNECT_GP_LOGIN_PROFILE_DELETED;
+				break;
+			case GP_LOGIN_CONNECTION_FAILED:
+				resp.discon.reason = DISCONNECT_GP_LOGIN_CONNECTION_FAILED;
+				break;
+			case GP_LOGIN_SERVER_AUTH_FAILED:
+				resp.discon.reason = DISCONNECT_GP_LOGIN_SERVER_AUTH_FAILED;
+				break;
+			case GP_NEWUSER_BAD_NICK:
+				resp.discon.reason = DISCONNECT_GP_NEWUSER_BAD_NICK;
+				break;
+			case GP_NEWUSER_BAD_PASSWORD:
+				resp.discon.reason = DISCONNECT_GP_NEWUSER_BAD_PASSWORD;
+				break;
+			case GP_NEWPROFILE_BAD_NICK:
+				resp.discon.reason = DISCONNECT_GP_NEWPROFILE_BAD_NICK;
+				break;
+			case GP_NEWPROFILE_BAD_OLD_NICK:
+				resp.discon.reason = DISCONNECT_GP_NEWPROFILE_BAD_OLD_NICK;
+				break;
+			}
+			TheGameSpyPeerMessageQueue->addResponse(resp);
+		}
+	}
+}
+
+// -----------------------
+
+static void getInfoResponseForRequest( GPConnection *con, GPGetInfoResponseArg *arg, void *param )
+{
+	BuddyResponse *resp = (BuddyResponse *)param;
+	resp->profile = arg->profile;
+	static_assert(ARRAY_SIZE(resp->arg.request.nick) >= ARRAY_SIZE(arg->nick), "Incorrect array size");
+	static_assert(ARRAY_SIZE(resp->arg.request.email) >= ARRAY_SIZE(arg->email), "Incorrect array size");
+	static_assert(ARRAY_SIZE(resp->arg.request.countrycode) >= ARRAY_SIZE(arg->countrycode), "Incorrect array size");
+	strcpy(resp->arg.request.nick, arg->nick);
+	strcpy(resp->arg.request.email, arg->email);
+	strcpy(resp->arg.request.countrycode, arg->countrycode);
+}
+
+void BuddyThreadClass::requestCallback( GPConnection *con, GPRecvBuddyRequestArg *arg )
+{
+	BuddyResponse response;
+	response.buddyResponseType = BuddyResponse::BUDDYRESPONSE_REQUEST;
+	response.profile = arg->profile;
+
+	// get info about the person asking to be our buddy
+	gpGetInfo( con, arg->profile, GP_CHECK_CACHE, GP_BLOCKING, (GPCallback)getInfoResponseForRequest, &response);
+
+	std::wstring s = MultiByteToWideCharSingleLine( arg->reason );
+	wcslcpy(response.arg.request.text, s.c_str(), GP_REASON_LEN);
+
+	TheGameSpyBuddyMessageQueue->addResponse( response );
+}
+
+// -----------------------
+
+static void getInfoResponseForStatus(GPConnection * connection, GPGetInfoResponseArg * arg, void * param)
+{
+	BuddyResponse *resp = (BuddyResponse *)param;
+	resp->profile = arg->profile;
+	static_assert(ARRAY_SIZE(resp->arg.status.nick) >= ARRAY_SIZE(arg->nick), "Incorrect array size");
+	static_assert(ARRAY_SIZE(resp->arg.status.email) >= ARRAY_SIZE(arg->email), "Incorrect array size");
+	static_assert(ARRAY_SIZE(resp->arg.status.countrycode) >= ARRAY_SIZE(arg->countrycode), "Incorrect array size");
+	strcpy(resp->arg.status.nick, arg->nick);
+	strcpy(resp->arg.status.email, arg->email);
+	strcpy(resp->arg.status.countrycode, arg->countrycode);
+}
+
+void BuddyThreadClass::statusCallback( GPConnection *con, GPRecvBuddyStatusArg *arg )
+{
+	BuddyResponse response;
+
+	// get user's name
+	response.buddyResponseType = BuddyResponse::BUDDYRESPONSE_STATUS;
+	gpGetInfo( con, arg->profile, GP_CHECK_CACHE, GP_BLOCKING, (GPCallback)getInfoResponseForStatus, &response);
+
+	// get user's status
+	GPBuddyStatus status;
+	gpGetBuddyStatus( con, arg->index, &status );
+	static_assert(ARRAY_SIZE(response.arg.status.location) >= ARRAY_SIZE(status.locationString), "Incorrect array size");
+	static_assert(ARRAY_SIZE(response.arg.status.statusString) >= ARRAY_SIZE(status.statusString), "Incorrect array size");
+	strcpy(response.arg.status.location, status.locationString);
+	strcpy(response.arg.status.statusString, status.statusString);
+	response.arg.status.status = status.status;
+	DEBUG_LOG(("Got buddy status for %d(%s) - status %d", status.profile, response.arg.status.nick, status.status));
+
+	// relay to UI
+	TheGameSpyBuddyMessageQueue->addResponse( response );
+}
+
+
+//-------------------------------------------------------------------------
+
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
new file mode 100644
index 00000000000..6d8cc679b22
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
@@ -0,0 +1,392 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: PingThread.cpp //////////////////////////////////////////////////////
+// Ping thread
+// Author: Matthew D. Campbell, August 2002
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include <winsock.h>	// This one has to be here. Prevents collisions with winsock2.h
+
+#include "GameNetwork/GameSpy/GameResultsThread.h"
+#include "mutex.h"
+#include "thread.h"
+
+#include "Common/SubsystemInterface.h"
+
+//-------------------------------------------------------------------------
+
+static const Int NumWorkerThreads = 1;
+
+typedef std::queue<GameResultsRequest> RequestQueue;
+typedef std::queue<GameResultsResponse> ResponseQueue;
+class GameResultsThreadClass;
+
+class GameResultsQueue : public GameResultsInterface
+{
+public:
+	virtual ~GameResultsQueue();
+	GameResultsQueue();
+
+	virtual void init() {}
+	virtual void reset() {}
+	virtual void update() {}
+
+	virtual void startThreads( void );
+	virtual void endThreads( void );
+	virtual Bool areThreadsRunning( void );
+
+	virtual void addRequest( const GameResultsRequest& req );
+	virtual Bool getRequest( GameResultsRequest& resp );
+
+	virtual void addResponse( const GameResultsResponse& resp );
+	virtual Bool getResponse( GameResultsResponse& resp );
+
+	virtual Bool areGameResultsBeingSent( void );
+
+private:
+	MutexClass m_requestMutex;
+	MutexClass m_responseMutex;
+	RequestQueue m_requests;
+	ResponseQueue m_responses;
+	Int m_requestCount;
+	Int m_responseCount;
+
+	GameResultsThreadClass *m_workerThreads[NumWorkerThreads];
+};
+
+GameResultsInterface* GameResultsInterface::createNewGameResultsInterface( void )
+{
+	return NEW GameResultsQueue;
+}
+
+GameResultsInterface *TheGameResultsQueue;
+
+//-------------------------------------------------------------------------
+
+class GameResultsThreadClass : public ThreadClass
+{
+
+public:
+	GameResultsThreadClass() : ThreadClass() {}
+
+	void Thread_Function();
+
+private:
+	Int sendGameResults( UnsignedInt IP, UnsignedShort port, const std::string& results );
+};
+
+
+//-------------------------------------------------------------------------
+
+GameResultsQueue::GameResultsQueue() : m_requestCount(0), m_responseCount(0)
+{
+	for (Int i=0; i<NumWorkerThreads; ++i)
+	{
+		m_workerThreads[i] = NULL;
+	}
+
+	startThreads();
+}
+
+GameResultsQueue::~GameResultsQueue()
+{
+	endThreads();
+}
+
+void GameResultsQueue::startThreads( void )
+{
+	endThreads();
+	for (Int i=0; i<NumWorkerThreads; ++i)
+	{
+		m_workerThreads[i] = NEW GameResultsThreadClass;
+		m_workerThreads[i]->Execute();
+	}
+}
+
+void GameResultsQueue::endThreads( void )
+{
+	for (Int i=0; i<NumWorkerThreads; ++i)
+	{
+		delete m_workerThreads[i];
+		m_workerThreads[i] = NULL;
+	}
+}
+
+Bool GameResultsQueue::areThreadsRunning( void )
+{
+	for (Int i=0; i<NumWorkerThreads; ++i)
+	{
+		if (m_workerThreads[i])
+		{
+			if (m_workerThreads[i]->Is_Running())
+				return true;
+		}
+	}
+	return false;
+}
+
+void GameResultsQueue::addRequest( const GameResultsRequest& req )
+{
+	MutexClass::LockClass m(m_requestMutex);
+
+	++m_requestCount;
+	m_requests.push(req);
+}
+
+Bool GameResultsQueue::getRequest( GameResultsRequest& req )
+{
+	MutexClass::LockClass m(m_requestMutex, 0);
+	if (m.Failed())
+		return false;
+
+	if (m_requests.empty())
+		return false;
+	req = m_requests.front();
+	m_requests.pop();
+	return true;
+}
+
+void GameResultsQueue::addResponse( const GameResultsResponse& resp )
+{
+	{
+		MutexClass::LockClass m(m_responseMutex);
+
+		++m_responseCount;
+		m_responses.push(resp);
+	}
+}
+
+Bool GameResultsQueue::getResponse( GameResultsResponse& resp )
+{
+	MutexClass::LockClass m(m_responseMutex, 0);
+	if (m.Failed())
+		return false;
+
+	if (m_responses.empty())
+		return false;
+	resp = m_responses.front();
+	m_responses.pop();
+	return true;
+}
+
+Bool GameResultsQueue::areGameResultsBeingSent( void )
+{
+	MutexClass::LockClass m(m_requestMutex, 0);
+	if (m.Failed())
+		return true;
+
+	return m_requestCount > 0;
+}
+
+//-------------------------------------------------------------------------
+
+void GameResultsThreadClass::Thread_Function()
+{
+	try {
+	GameResultsRequest req;
+
+	WSADATA wsaData;
+
+	// Fire up winsock (prob already done, but doesn't matter)
+	WORD wVersionRequested = MAKEWORD(1, 1);
+	WSAStartup( wVersionRequested, &wsaData );
+
+	while ( running )
+	{
+		// deal with requests
+		if (TheGameResultsQueue && TheGameResultsQueue->getRequest(req))
+		{
+			// resolve the hostname
+			const char *hostnameBuffer = req.hostname.c_str();
+			UnsignedInt IP = 0xFFFFFFFF;
+			if (isdigit(hostnameBuffer[0]))
+			{
+				IP = inet_addr(hostnameBuffer);
+				in_addr hostNode;
+				hostNode.s_addr = IP;
+				DEBUG_LOG(("sending game results to %s - IP = %s", hostnameBuffer, inet_ntoa(hostNode) ));
+			}
+			else
+			{
+				HOSTENT *hostStruct;
+				in_addr *hostNode;
+				hostStruct = gethostbyname(hostnameBuffer);
+				if (hostStruct == NULL)
+				{
+					DEBUG_LOG(("sending game results to %s - host lookup failed", hostnameBuffer));
+
+					// Even though this failed to resolve IP, still need to send a
+					//   callback.
+					IP = 0xFFFFFFFF;   // flag for IP resolve failed
+				}
+				else
+				{
+					hostNode = (in_addr *) hostStruct->h_addr;
+					IP = hostNode->s_addr;
+					DEBUG_LOG(("sending game results to %s IP = %s", hostnameBuffer, inet_ntoa(*hostNode) ));
+				}
+			}
+
+			int result = sendGameResults( IP, req.port, req.results );
+			GameResultsResponse resp;
+			resp.hostname = req.hostname;
+			resp.port = req.port;
+			resp.sentOk = (result == req.results.length());
+
+		}
+
+		// end our timeslice
+		Switch_Thread();
+	}
+
+	WSACleanup();
+	} catch ( ... ) {
+		DEBUG_CRASH(("Exception in results thread!"));
+	}
+}
+
+//-------------------------------------------------------------------------
+
+#ifdef DEBUG_LOGGING
+#define CASE(x) case (x): return #x;
+
+static const char *getWSAErrorString( Int error )
+{
+	switch (error)
+	{
+		CASE(WSABASEERR)
+		CASE(WSAEINTR)
+		CASE(WSAEBADF)
+		CASE(WSAEACCES)
+		CASE(WSAEFAULT)
+		CASE(WSAEINVAL)
+		CASE(WSAEMFILE)
+		CASE(WSAEWOULDBLOCK)
+		CASE(WSAEINPROGRESS)
+		CASE(WSAEALREADY)
+		CASE(WSAENOTSOCK)
+		CASE(WSAEDESTADDRREQ)
+		CASE(WSAEMSGSIZE)
+		CASE(WSAEPROTOTYPE)
+		CASE(WSAENOPROTOOPT)
+		CASE(WSAEPROTONOSUPPORT)
+		CASE(WSAESOCKTNOSUPPORT)
+		CASE(WSAEOPNOTSUPP)
+		CASE(WSAEPFNOSUPPORT)
+		CASE(WSAEAFNOSUPPORT)
+		CASE(WSAEADDRINUSE)
+		CASE(WSAEADDRNOTAVAIL)
+		CASE(WSAENETDOWN)
+		CASE(WSAENETUNREACH)
+		CASE(WSAENETRESET)
+		CASE(WSAECONNABORTED)
+		CASE(WSAECONNRESET)
+		CASE(WSAENOBUFS)
+		CASE(WSAEISCONN)
+		CASE(WSAENOTCONN)
+		CASE(WSAESHUTDOWN)
+		CASE(WSAETOOMANYREFS)
+		CASE(WSAETIMEDOUT)
+		CASE(WSAECONNREFUSED)
+		CASE(WSAELOOP)
+		CASE(WSAENAMETOOLONG)
+		CASE(WSAEHOSTDOWN)
+		CASE(WSAEHOSTUNREACH)
+		CASE(WSAENOTEMPTY)
+		CASE(WSAEPROCLIM)
+		CASE(WSAEUSERS)
+		CASE(WSAEDQUOT)
+		CASE(WSAESTALE)
+		CASE(WSAEREMOTE)
+		CASE(WSAEDISCON)
+		CASE(WSASYSNOTREADY)
+		CASE(WSAVERNOTSUPPORTED)
+		CASE(WSANOTINITIALISED)
+		CASE(WSAHOST_NOT_FOUND)
+		CASE(WSATRY_AGAIN)
+		CASE(WSANO_RECOVERY)
+		CASE(WSANO_DATA)
+		default:
+			return "Not a Winsock error";
+	}
+}
+
+#undef CASE
+
+#endif
+//-------------------------------------------------------------------------
+
+Int GameResultsThreadClass::sendGameResults( UnsignedInt IP, UnsignedShort port, const std::string& results )
+{
+	int error = 0;
+
+	// create the socket
+	Int sock = socket( AF_INET, SOCK_STREAM, 0 );
+	if (sock < 0)
+	{
+		DEBUG_LOG(("GameResultsThreadClass::sendGameResults() - socket() returned %d(%s)", sock, getWSAErrorString(sock)));
+		return sock;
+	}
+
+	// fill in address info
+	struct sockaddr_in sockAddr;
+	memset( &sockAddr, 0, sizeof( sockAddr ) );
+	sockAddr.sin_family = AF_INET;
+	sockAddr.sin_addr.s_addr = IP;
+	sockAddr.sin_port = htons(port);
+
+	// Start the connection process....
+	if( connect( sock, (struct sockaddr *)&sockAddr, sizeof( sockAddr ) ) == -1 )
+	{
+		error = WSAGetLastError();
+		DEBUG_LOG(("GameResultsThreadClass::sendGameResults() - connect() returned %d(%s)", error, getWSAErrorString(error)));
+		if( ( error == WSAEWOULDBLOCK ) || ( error == WSAEINVAL ) || ( error == WSAEALREADY ) )
+		{
+			return( -1 );
+		}
+
+		if( error != WSAEISCONN )
+		{
+			closesocket( sock );
+			return( -1 );
+		}
+	}
+
+	if (send( sock, results.c_str(), results.length(), 0 ) == SOCKET_ERROR)
+	{
+		error = WSAGetLastError();
+		DEBUG_LOG(("GameResultsThreadClass::sendGameResults() - send() returned %d(%s)", error, getWSAErrorString(error)));
+		closesocket(sock);
+		return WSAGetLastError();
+	}
+
+	closesocket(sock);
+
+	return results.length();
+}
+
+
+//-------------------------------------------------------------------------
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
new file mode 100644
index 00000000000..8be4c993d98
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
@@ -0,0 +1,2991 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: PeerThread.cpp //////////////////////////////////////////////////////
+// GameSpy Peer (chat) thread
+// This thread communicates with GameSpy's chat server
+// and talks through a message queue with the rest of
+// the game.
+// Author: Matthew D. Campbell, June 2002
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/Registry.h"
+#include "Common/UserPreferences.h"
+#include "Common/version.h"
+#include "GameNetwork/IPEnumeration.h"
+#include "GameNetwork/GameSpy/BuddyThread.h"
+#include "GameNetwork/GameSpy/PeerDefs.h"
+#include "GameNetwork/GameSpy/PeerThread.h"
+#include "GameNetwork/GameSpy/PersistentStorageThread.h"
+#include "GameNetwork/GameSpy/ThreadUtils.h"
+
+#include "strtok_r.h"
+#include "mutex.h"
+#include "thread.h"
+
+#include "Common/MiniLog.h"
+
+
+// enable this for trying to track down why SBServers are losing their keyvals  -MDC 2/20/2003
+#undef SERVER_DEBUGGING
+#ifdef SERVER_DEBUGGING
+void CheckServers(PEER peer);
+#endif // SERVER_DEBUGGING
+
+#ifdef DEBUG_LOGGING
+//#define PING_TEST
+static LogClass s_pingLog("Ping.txt");
+#define PING_LOG(x) s_pingLog.log x
+#else // DEBUG_LOGGING
+#define PING_LOG(x) {}
+#endif // DEBUG_LOGGING
+
+#ifdef DEBUG_LOGGING
+static LogClass s_stateChangedLog("StateChanged.txt");
+
+#define STATECHANGED_LOG(x) s_stateChangedLog.log x
+
+#else // DEBUG_LOGGING
+
+#define STATECHANGED_LOG(x) {}
+
+#endif // DEBUG_LOGGING
+
+// we should always be using broadcast keys from now on.  Remove the old code sometime when
+// we're not in a rush, ok?
+// -MDC 2/14/2003
+#define USE_BROADCAST_KEYS
+
+
+int isThreadHosting = 0;
+static UnsignedInt s_lastStateChangedHeartbeat = 0;
+static Bool s_wantStateChangedHeartbeat = FALSE;
+static UnsignedInt s_heartbeatInterval = 10000;
+
+static SOCKET qr2Sock = INVALID_SOCKET;
+
+enum
+{
+	EXECRC_KEY = NUM_RESERVED_KEYS + 1,
+	INICRC_KEY,
+	PW_KEY,
+	OBS_KEY,
+#if !RTS_GENERALS
+  USE_STATS_KEY,
+#endif
+	LADIP_KEY,
+	LADPORT_KEY,
+	PINGSTR_KEY,
+	NUMPLAYER_KEY,
+	MAXPLAYER_KEY,
+	NUMOBS_KEY,
+	NAME__KEY,
+	FACTION__KEY,
+	COLOR__KEY,
+	WINS__KEY,
+	LOSSES__KEY
+};
+
+#define EXECRC_STR		"exeCRC"
+#define INICRC_STR		"iniCRC"
+#define PW_STR				"pw"
+#define OBS_STR				"obs"
+#define USE_STATS_STR "stat"
+#define LADIP_STR			"ladIP"
+#define LADPORT_STR		"ladPort"
+#define PINGSTR_STR		"pings"
+#define NUMPLAYER_STR	"numRealPlayers"
+#define MAXPLAYER_STR	"maxRealPlayers"
+#define NUMOBS_STR		"numObservers"
+#define NAME__STR			"name"
+#define FACTION__STR	"faction"
+#define COLOR__STR		"color"
+#define WINS__STR			"wins"
+#define LOSSES__STR		"losses"
+
+//-------------------------------------------------------------------------
+
+typedef std::queue<PeerRequest> RequestQueue;
+typedef std::queue<PeerResponse> ResponseQueue;
+class PeerThreadClass;
+
+class GameSpyPeerMessageQueue : public GameSpyPeerMessageQueueInterface
+{
+public:
+	virtual ~GameSpyPeerMessageQueue();
+	GameSpyPeerMessageQueue();
+	virtual void startThread( void );
+	virtual void endThread( void );
+	virtual Bool isThreadRunning( void );
+	virtual Bool isConnected( void );
+	virtual Bool isConnecting( void );
+
+	virtual void addRequest( const PeerRequest& req );
+	virtual Bool getRequest( PeerRequest& req );
+
+	virtual void addResponse( const PeerResponse& resp );
+	virtual Bool getResponse( PeerResponse& resp );
+
+	virtual SerialAuthResult getSerialAuthResult( void ) { return m_serialAuth; }
+	void setSerialAuthResult( SerialAuthResult result ) { m_serialAuth = result; }
+
+	PeerThreadClass* getThread( void );
+
+private:
+	MutexClass m_requestMutex;
+	MutexClass m_responseMutex;
+	RequestQueue m_requests;
+	ResponseQueue m_responses;
+	PeerThreadClass *m_thread;
+
+	SerialAuthResult m_serialAuth;
+};
+
+GameSpyPeerMessageQueueInterface* GameSpyPeerMessageQueueInterface::createNewMessageQueue( void )
+{
+	return NEW GameSpyPeerMessageQueue;
+}
+
+GameSpyPeerMessageQueueInterface *TheGameSpyPeerMessageQueue;
+#define MESSAGE_QUEUE ((GameSpyPeerMessageQueue *)TheGameSpyPeerMessageQueue)
+
+//-------------------------------------------------------------------------
+
+class PeerThreadClass : public ThreadClass
+{
+
+public:
+	PeerThreadClass() : ThreadClass()
+	{
+		m_roomJoined = m_allowObservers = m_hasPassword = FALSE;
+		m_useStats = TRUE;
+		m_exeCRC = m_iniCRC = 0;
+		m_gameVersion = 0;
+		m_ladderPort = 0;
+		m_localRoomID = 0;
+		m_maxPlayers = 0;
+		m_numObservers = 0;
+		m_maxPlayers = 0;
+		m_qmGroupRoom = 0;
+		m_sawEndOfEnumPlayers = m_sawMatchbot = FALSE;
+		m_sawCompleteGameList = FALSE;
+		m_isConnecting = m_isConnected = false;
+		m_groupRoomID = m_profileID = 0;
+		m_nextStagingServer = 1;
+		m_stagingServers.clear();
+		m_isHosting = false;
+		for (Int i=0; i<MAX_SLOTS; ++i)
+		{
+			m_playerColors[i] = 0;
+			m_playerFactions[i] = 0;
+			m_playerLosses[i] = 0;
+			m_playerProfileID[i] = 0;
+			m_playerWins[i] = 0;
+		}
+	}
+
+	void Thread_Function();
+
+	void markAsDisconnected( void ) { m_isConnecting = m_isConnected = false; }
+
+	void connectCallback( PEER peer, PEERBool success );
+	void nickErrorCallback( PEER peer, Int type, const char *nick );
+
+	Bool isConnecting( void ) { return m_isConnecting; }
+	Bool isConnected( void ) { return m_isConnected; }
+
+	Int addServerToMap( SBServer server );
+	Int removeServerFromMap( SBServer server );
+	void clearServers( void );
+	SBServer findServerByID( Int id );
+	Int findServer( SBServer server );
+
+	// get info about the game we are hosting
+	Bool isHosting( void ) { return m_isHosting; }
+	void stopHostingAlready(PEER peer);
+	Bool hasPassword( void ) { return m_hasPassword; }
+	Bool allowObservers( void ) { return m_allowObservers; }
+  Bool useStats(void) const { return m_useStats; }
+	std::string getMapName( void ) { return m_mapName; }
+	UnsignedInt exeCRC( void ) { return m_exeCRC; }
+	UnsignedInt iniCRC( void ) { return m_iniCRC; }
+	UnsignedInt gameVersion( void ) { return m_gameVersion; }
+	std::wstring getLocalStagingServerName( void ) { return m_localStagingServerName; }
+	Int getLocalRoomID( void ) { return m_localRoomID; }
+	std::string ladderIP( void ) { return m_ladderIP; }
+	UnsignedShort ladderPort( void ) { return m_ladderPort; }
+	std::string pingStr( void ) { return m_pingStr; }
+	std::string getPlayerName(Int idx) { return m_playerNames[idx]; }
+	Int getPlayerWins(Int idx) { return m_playerWins[idx]; }
+	Int getPlayerLosses(Int idx) { return m_playerLosses[idx]; }
+	Int getPlayerProfileID(Int idx) { return m_playerProfileID[idx]; }
+	Int getPlayerFaction(Int idx) { return m_playerFactions[idx]; }
+	Int getPlayerColor(Int idx) { return m_playerColors[idx]; }
+	Int getNumPlayers(void) { return m_numPlayers; }
+	Int getMaxPlayers(void) { return m_maxPlayers; }
+	Int getNumObservers(void) { return m_numObservers; }
+
+	void roomJoined( Bool val ) { m_roomJoined = val; }
+	void setQMGroupRoom( Int groupID ) { m_qmGroupRoom = groupID; }
+	void sawEndOfEnumPlayers( void ) { m_sawEndOfEnumPlayers = true; }
+	void sawMatchbot( std::string bot ) { m_sawMatchbot = true; m_matchbotName = bot; }
+	QMStatus getQMStatus( void ) { return m_qmStatus; }
+	void handleQMMatch(PEER peer, Int mapIndex, Int seed, char *playerName[MAX_SLOTS], char *playerIP[MAX_SLOTS], char *playerSide[MAX_SLOTS], char *playerColor[MAX_SLOTS], char *playerNAT[MAX_SLOTS]);
+	std::string getQMBotName( void ) { return m_matchbotName; }
+	Int getQMGroupRoom( void ) { return m_qmGroupRoom; }
+	Int getQMLadder( void ) { return m_qmInfo.QM.ladderID; }
+
+	Int getCurrentGroupRoom(void) { return m_groupRoomID; }
+
+#ifdef USE_BROADCAST_KEYS
+	void pushStatsToRoom(PEER peer);
+	void getStatsFromRoom(PEER peer, RoomType roomType);
+	void trackStatsForPlayer(RoomType roomType, const char *nick, const char *key, const char *val);
+	int lookupStatForPlayer(RoomType roomType, const char *nick, const char *key);
+	void clearPlayerStats(RoomType roomType);
+#endif // USE_BROADCAST_KEYS
+
+	void setSawCompleteGameList(Bool val) { m_sawCompleteGameList = val; }
+	Bool getSawCompleteGameList() { return m_sawCompleteGameList; }
+
+private:
+	Bool m_isConnecting;
+	Bool m_isConnected;
+	std::string m_loginName, m_originalName, m_password, m_email;
+	Int m_profileID;
+	Int m_groupRoomID;
+	Bool m_sawCompleteGameList;
+
+#ifdef USE_BROADCAST_KEYS
+	enum { NumKeys = 6, ValBufSize = 20 };
+	static const char *s_keys[NumKeys];
+	static char s_valueBuffers[NumKeys][ValBufSize];
+	static const char *s_values[NumKeys];
+
+	typedef std::map<std::string, int> PlayerStatMap;
+	PlayerStatMap m_groupRoomStats;
+	PlayerStatMap m_stagingRoomStats;
+	std::string packStatKey(const char *nick, const char *key);
+#endif // USE_BROADCAST_KEYS
+
+	// game-hosting info for GOA callbacks
+	Bool m_isHosting;
+	Bool m_hasPassword;
+	std::string m_mapName;
+	std::string m_playerNames[MAX_SLOTS];
+	UnsignedInt m_exeCRC;
+	UnsignedInt m_iniCRC;
+	UnsignedInt m_gameVersion;
+	Bool m_allowObservers;
+  Bool m_useStats;
+	std::string m_pingStr;
+	std::string m_ladderIP;
+	UnsignedShort m_ladderPort;
+	Int m_playerWins[MAX_SLOTS];
+	Int m_playerLosses[MAX_SLOTS];
+	Int m_playerProfileID[MAX_SLOTS];
+	Int m_playerColors[MAX_SLOTS];
+	Int m_playerFactions[MAX_SLOTS];
+	Int m_numPlayers;
+	Int m_maxPlayers;
+	Int m_numObservers;
+
+	Int m_nextStagingServer;
+	std::map<Int, SBServer> m_stagingServers;
+	std::wstring m_localStagingServerName;
+	Int m_localRoomID;
+
+	void doQuickMatch( PEER peer );
+	QMStatus m_qmStatus;
+	PeerRequest m_qmInfo;
+	Bool m_roomJoined;
+	Int m_qmGroupRoom;
+	Bool m_sawEndOfEnumPlayers;
+	Bool m_sawMatchbot;
+	std::string m_matchbotName;
+};
+
+#ifdef USE_BROADCAST_KEYS
+const char* PeerThreadClass::s_keys[6] = { "b_locale", "b_wins", "b_losses", "b_points", "b_side", "b_pre" };
+char PeerThreadClass::s_valueBuffers[6][20] = { "", "", "", "", "", "" };
+const char* PeerThreadClass::s_values[6] = { s_valueBuffers[0], s_valueBuffers[1], s_valueBuffers[2],
+	s_valueBuffers[3], s_valueBuffers[4], s_valueBuffers[5]};
+
+void PeerThreadClass::trackStatsForPlayer(RoomType roomType, const char *nick, const char *key, const char *val)
+{
+	switch (roomType)
+	{
+		case GroupRoom:
+			m_groupRoomStats[packStatKey(nick, key)] = atoi(val);
+			break;
+		case StagingRoom:
+			m_stagingRoomStats[packStatKey(nick, key)] = atoi(val);
+			break;
+	}
+}
+
+std::string PeerThreadClass::packStatKey(const char *nick, const char *key)
+{
+	std::string s = nick;
+	s.append(key);
+	return s;
+}
+
+int PeerThreadClass::lookupStatForPlayer(RoomType roomType, const char *nick, const char *key)
+{
+	std::string fullKey = packStatKey(nick, key);
+	PlayerStatMap::const_iterator it;
+	switch (roomType)
+	{
+		case GroupRoom:
+			it = m_groupRoomStats.find(fullKey);
+			if (it != m_groupRoomStats.end())
+				return it->second;
+			break;
+		case StagingRoom:
+			it = m_stagingRoomStats.find(fullKey);
+			if (it != m_stagingRoomStats.end())
+				return it->second;
+			break;
+	}
+	return 0;
+}
+
+void PeerThreadClass::clearPlayerStats(RoomType roomType)
+{
+	switch (roomType)
+	{
+		case GroupRoom:
+			m_groupRoomStats.clear();
+			break;
+		case StagingRoom:
+			m_stagingRoomStats.clear();
+			break;
+	}
+}
+
+void PeerThreadClass::pushStatsToRoom(PEER peer)
+{
+	DEBUG_LOG(("PeerThreadClass::pushStatsToRoom(): stats are %s=%s,%s=%s,%s=%s,%s=%s,%s=%s,%s=%s",
+		s_keys[0], s_values[0],
+		s_keys[1], s_values[1],
+		s_keys[2], s_values[2],
+		s_keys[3], s_values[3],
+		s_keys[4], s_values[4],
+		s_keys[5], s_values[5]));
+	peerSetRoomKeys(peer, GroupRoom, m_loginName.c_str(), 6, s_keys, s_values);
+	peerSetRoomKeys(peer, StagingRoom, m_loginName.c_str(), 6, s_keys, s_values);
+}
+
+void getRoomKeysCallback(PEER peer, PEERBool success, RoomType roomType, const char *nick, int num, char **keys, char **values, void *param);
+void PeerThreadClass::getStatsFromRoom(PEER peer, RoomType roomType)
+{
+	peerGetRoomKeys(peer, GroupRoom, "*", NumKeys, s_keys, getRoomKeysCallback, this, PEERFalse);
+}
+#endif // USE_BROADCAST_KEYS
+
+Int PeerThreadClass::addServerToMap( SBServer server )
+{
+	Int val = m_nextStagingServer++;
+	m_stagingServers[val] = server;
+	return val;
+}
+
+Int PeerThreadClass::removeServerFromMap( SBServer server )
+{
+	for (std::map<Int, SBServer>::iterator it = m_stagingServers.begin(); it != m_stagingServers.end(); ++it)
+	{
+		if (it->second == server)
+		{
+			Int val = it->first;
+			m_stagingServers.erase(it);
+			return val;
+		}
+	}
+
+	return 0;
+}
+
+void PeerThreadClass::clearServers( void )
+{
+	m_stagingServers.clear();
+}
+
+SBServer PeerThreadClass::findServerByID( Int id )
+{
+	std::map<Int, SBServer>::iterator it = m_stagingServers.find(id);
+	if (it != m_stagingServers.end())
+	{
+		SBServer server = it->second;
+		if (server && !server->keyvals)
+		{
+			DEBUG_CRASH(("Referencing a missing server!"));
+			return 0;
+		}
+		return it->second;
+	}
+	return 0;
+}
+
+Int PeerThreadClass::findServer( SBServer server )
+{
+	char tmp[10] = "";
+	const char *newName = SBServerGetStringValue(server, "gamename", tmp);
+	UnsignedInt newPrivateIP = SBServerGetPrivateInetAddress(server);
+	UnsignedShort newPrivatePort = SBServerGetPrivateQueryPort(server);
+	UnsignedInt newPublicIP = SBServerGetPublicInetAddress(server);
+
+	SBServer serverToRemove = NULL;
+
+	for (std::map<Int, SBServer>::iterator it = m_stagingServers.begin(); it != m_stagingServers.end(); ++it)
+	{
+		if (it->second == server)
+		{
+			return it->first;
+		}
+		else
+		{
+			const char *oldName = SBServerGetStringValue(it->second, "gamename", tmp);
+			UnsignedInt oldPrivateIP = SBServerGetPrivateInetAddress(it->second);
+			UnsignedShort oldPrivatePort = SBServerGetPrivateQueryPort(it->second);
+			UnsignedInt oldPublicIP = SBServerGetPublicInetAddress(it->second);
+			if (strcmp(oldName, newName) == 0 &&
+				oldPrivateIP == newPrivateIP &&
+				oldPublicIP == newPublicIP &&
+				oldPrivatePort == newPrivatePort)
+			{
+				serverToRemove = it->second;
+			}
+		}
+	}
+
+	if (serverToRemove)
+	{
+		// this is the same as another game - it has just migrated to another port.  Remove the old and replace it.
+		PeerResponse resp;
+		resp.peerResponseType = PeerResponse::PEERRESPONSE_STAGINGROOM;
+		resp.stagingRoom.id = removeServerFromMap( serverToRemove );
+		resp.stagingRoom.action = PEER_REMOVE;
+		resp.stagingRoom.isStaging = TRUE;
+		resp.stagingRoom.percentComplete = -1;
+		TheGameSpyPeerMessageQueue->addResponse(resp);
+	}
+
+	return addServerToMap(server);
+}
+
+enum CallbackType
+{
+	CALLBACK_CONNECT,
+	CALLBACK_ERROR,
+	CALLBACK_RECVMESSAGE,
+	CALLBACK_RECVREQUEST,
+	CALLBACK_RECVSTATUS,
+};
+
+void connectCallbackWrapper( PEER peer, PEERBool success, int failureReason, void *param )
+{
+#ifdef SERVER_DEBUGGING
+	DEBUG_LOG(("In connectCallbackWrapper()"));
+	CheckServers(peer);
+#endif // SERVER_DEBUGGING
+	if (param != NULL)
+	{
+		((PeerThreadClass *)param)->connectCallback( peer, success );
+	}
+}
+
+void nickErrorCallbackWrapper( PEER peer, Int type, const char *nick, int numSuggestedNicks, const gsi_char** suggestedNicks, void *param )
+{
+	if (param != NULL)
+	{
+		((PeerThreadClass *)param)->nickErrorCallback( peer, type, nick );
+	}
+}
+
+static void joinRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomType roomType, void *param);
+
+//-------------------------------------------------------------------------
+
+GameSpyPeerMessageQueue::GameSpyPeerMessageQueue()
+{
+	m_thread = NULL;
+	m_serialAuth = SERIAL_OK;
+}
+
+GameSpyPeerMessageQueue::~GameSpyPeerMessageQueue()
+{
+	endThread();
+}
+
+void GameSpyPeerMessageQueue::startThread( void )
+{
+	if (!m_thread)
+	{
+		m_thread = NEW PeerThreadClass;
+		m_thread->Execute();
+	}
+	else
+	{
+		if (!m_thread->Is_Running())
+		{
+			m_thread->Execute();
+		}
+	}
+}
+
+void GameSpyPeerMessageQueue::endThread( void )
+{
+	delete m_thread;
+	m_thread = NULL;
+}
+
+Bool GameSpyPeerMessageQueue::isThreadRunning( void )
+{
+	return (m_thread) ? m_thread->Is_Running() : false;
+}
+
+Bool GameSpyPeerMessageQueue::isConnected( void )
+{
+	return (m_thread) ? m_thread->isConnected() : false;
+}
+
+Bool GameSpyPeerMessageQueue::isConnecting( void )
+{
+	return (m_thread) ? m_thread->isConnecting() : false;
+}
+
+void GameSpyPeerMessageQueue::addRequest( const PeerRequest& req )
+{
+	MutexClass::LockClass m(m_requestMutex);
+	if (m.Failed())
+		return;
+
+	m_requests.push(req);
+}
+
+//PeerRequest GameSpyPeerMessageQueue::getRequest( void )
+Bool GameSpyPeerMessageQueue::getRequest( PeerRequest& req )
+{
+	MutexClass::LockClass m(m_requestMutex, 0);
+	if (m.Failed())
+		return false;
+
+	if (m_requests.empty())
+		return false;
+	req = m_requests.front();
+	m_requests.pop();
+	return true;
+}
+
+void GameSpyPeerMessageQueue::addResponse( const PeerResponse& resp )
+{
+	if (resp.nick == "(END)")
+		return;
+
+	MutexClass::LockClass m(m_responseMutex);
+	if (m.Failed())
+		return;
+
+	m_responses.push(resp);
+}
+
+//PeerResponse GameSpyPeerMessageQueue::getResponse( void )
+Bool GameSpyPeerMessageQueue::getResponse( PeerResponse& resp )
+{
+	MutexClass::LockClass m(m_responseMutex, 0);
+	if (m.Failed())
+		return false;
+
+	if (m_responses.empty())
+		return false;
+	resp = m_responses.front();
+	m_responses.pop();
+	return true;
+}
+
+PeerThreadClass* GameSpyPeerMessageQueue::getThread( void )
+{
+	return m_thread;
+}
+
+//-------------------------------------------------------------------------
+static void disconnectedCallback(PEER peer, const char * reason, void * param);
+static void roomMessageCallback(PEER peer, RoomType roomType, const char * nick, const char * message, MessageType messageType, void * param);
+static void playerMessageCallback(PEER peer, const char * nick, const char * message, MessageType messageType, void * param);
+static void playerJoinedCallback(PEER peer, RoomType roomType, const char * nick, void * param);
+static void playerLeftCallback(PEER peer, RoomType roomType, const char * nick, const char * reason, void * param);
+static void playerChangedNickCallback(PEER peer, RoomType roomType, const char * oldNick, const char * newNick, void * param);
+static void playerInfoCallback(PEER peer, RoomType roomType, const char * nick, unsigned int IP, int profileID, void * param);
+static void playerFlagsChangedCallback(PEER peer, RoomType roomType, const char * nick, int oldFlags, int newFlags, void * param);
+static void listingGamesCallback(PEER peer, PEERBool success, const char * name, SBServer server, PEERBool staging, int msg, Int percentListed, void * param);
+static void roomUTMCallback(PEER peer, RoomType roomType, const char * nick, const char * command, const char * parameters, PEERBool authenticated, void * param);
+static void playerUTMCallback(PEER peer, const char * nick, const char * command, const char * parameters, PEERBool authenticated, void * param);
+static void gameStartedCallback(PEER peer, SBServer server, const char *message, void *param);
+static void globalKeyChangedCallback(PEER peer, const char *nick, const char *key, const char *val, void *param);
+static void roomKeyChangedCallback(PEER peer, RoomType roomType, const char *nick, const char *key, const char *val, void *param);
+
+// convenience function to set buddy status
+static void updateBuddyStatus( GameSpyBuddyStatus status, Int groupRoom = 0, std::string gameName = "" )
+{
+	if (!TheGameSpyBuddyMessageQueue)
+		return;
+
+	BuddyRequest req;
+	req.buddyRequestType = BuddyRequest::BUDDYREQUEST_SETSTATUS;
+	switch(status)
+	{
+		case BUDDY_OFFLINE:
+			req.arg.status.status = GP_OFFLINE;
+			strcpy(req.arg.status.statusString, "Offline");
+			strcpy(req.arg.status.locationString, "");
+			break;
+		case BUDDY_ONLINE:
+			req.arg.status.status = GP_ONLINE;
+			strcpy(req.arg.status.statusString, "Online");
+			strcpy(req.arg.status.locationString, "");
+			break;
+		case BUDDY_LOBBY:
+			req.arg.status.status = GP_CHATTING;
+			strcpy(req.arg.status.statusString, "Chatting");
+			sprintf(req.arg.status.locationString, "%d", groupRoom);
+			break;
+		case BUDDY_STAGING:
+			req.arg.status.status = GP_STAGING;
+			strcpy(req.arg.status.statusString, "Staging");
+			sprintf(req.arg.status.locationString, "%s", gameName.c_str());
+			break;
+		case BUDDY_LOADING:
+			req.arg.status.status = GP_PLAYING;
+			strcpy(req.arg.status.statusString, "Loading");
+			sprintf(req.arg.status.locationString, "%s", gameName.c_str());
+			break;
+		case BUDDY_PLAYING:
+			req.arg.status.status = GP_PLAYING;
+			strcpy(req.arg.status.statusString, "Playing");
+			sprintf(req.arg.status.locationString, "%s", gameName.c_str());
+			break;
+		case BUDDY_MATCHING:
+			req.arg.status.status = GP_ONLINE;
+			strcpy(req.arg.status.statusString, "Matching");
+			strcpy(req.arg.status.locationString, "");
+			break;
+	}
+	DEBUG_LOG(("updateBuddyStatus %d:%s", req.arg.status.status, req.arg.status.statusString));
+	TheGameSpyBuddyMessageQueue->addRequest(req);
+}
+
+static void createRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomType roomType, void *param)
+{
+	Int *s = (Int *)param;
+	if (s)
+		*s = result;
+}
+
+static const char * KeyTypeToString(qr2_key_type type)
+{
+	switch(type)
+	{
+	case key_server:
+		return "server";
+	case key_player:
+		return "player";
+	case key_team:
+		return "team";
+	}
+
+	return "Unkown key type";
+}
+
+static const char * ErrorTypeToString(qr2_error_t error)
+{
+	switch(error)
+	{
+	case e_qrnoerror:
+		return "noerror";
+	case e_qrwsockerror:
+		return "wsockerror";
+	case e_qrbinderror:
+		return "rbinderror";
+	case e_qrdnserror:
+		return "dnserror";
+	case e_qrconnerror:
+		return "connerror";
+	}
+
+	return "Unknown error type";
+}
+
+static void QRServerKeyCallback
+(
+	PEER peer,
+	int key,
+	qr2_buffer_t buffer,
+	void * param
+)
+{
+	//DEBUG_LOG(("QR_SERVER_KEY | %d (%s)", key, qr2_registered_key_list[key]));
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	if (!t)
+	{
+		DEBUG_LOG(("QRServerKeyCallback: bailing because of no thread info"));
+		return;
+	}
+
+	if (!t->isHosting())
+		t->stopHostingAlready(peer);
+
+#ifdef DEBUG_LOGGING
+	AsciiString val;
+#define ADD(x) { qr2_buffer_add(buffer, x); val = x; }
+#define ADDINT(x) { qr2_buffer_add_int(buffer, x); val.format("%d",x); }
+#else
+#define ADD(x) { qr2_buffer_add(buffer, x); }
+#define ADDINT(x) { qr2_buffer_add_int(buffer, x); }
+#endif
+
+	switch(key)
+	{
+	case HOSTNAME_KEY:
+		ADD(t->getPlayerName(0).c_str());
+		break;
+	case GAMEVER_KEY:
+		ADDINT(t->gameVersion());
+		break;
+	case EXECRC_KEY:
+		ADDINT(t->exeCRC());
+		break;
+	case INICRC_KEY:
+		ADDINT(t->iniCRC());
+		break;
+	case GAMENAME_KEY:
+		{
+			std::string tmp = t->getPlayerName(0);
+			tmp.append(" ");
+			tmp.append(WideCharStringToMultiByte(t->getLocalStagingServerName().c_str()));
+			ADD(tmp.c_str());
+		}
+		break;
+	case MAPNAME_KEY:
+		ADD(t->getMapName().c_str());
+		break;
+	case PW_KEY:
+		ADDINT(t->hasPassword());
+		break;
+	case OBS_KEY:
+		ADDINT(t->allowObservers());
+		break;
+#if !RTS_GENERALS
+  case USE_STATS_KEY:
+    ADDINT(t->useStats());
+    break;
+#endif
+	case LADIP_KEY:
+		ADD(t->ladderIP().c_str());
+		break;
+	case LADPORT_KEY:
+		ADDINT(t->ladderPort());
+		break;
+	case PINGSTR_KEY:
+		ADD(t->pingStr().c_str());
+		break;
+	case NUMPLAYER_KEY:
+		ADDINT(t->getNumPlayers());
+		break;
+	case MAXPLAYER_KEY:
+		ADDINT(t->getMaxPlayers());
+		break;
+	case NUMOBS_KEY:
+		ADDINT(t->getNumObservers());
+		break;
+	default:
+		ADD("");
+		//DEBUG_LOG(("QR_SERVER_KEY | %d (%s)", key, qr2_registered_key_list[key]));
+		break;
+	}
+
+	DEBUG_LOG(("QR_SERVER_KEY | %d (%s) = [%s]", key, qr2_registered_key_list[key], val.str()));
+}
+
+static void QRPlayerKeyCallback
+(
+	PEER peer,
+	int key,
+	int index,
+	qr2_buffer_t buffer,
+	void * param
+)
+{
+	//DEBUG_LOG(("QR_PLAYER_KEY | %d | %d (%s)", key, index, qr2_registered_key_list[key]));
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	if (!t)
+	{
+		DEBUG_LOG(("QRPlayerKeyCallback: bailing because of no thread info"));
+		return;
+	}
+
+	if (!t->isHosting())
+		t->stopHostingAlready(peer);
+
+#undef ADD
+#undef ADDINT
+#ifdef DEBUG_LOGGING
+	AsciiString val;
+#define ADD(x) { qr2_buffer_add(buffer, x); val = x; }
+#define ADDINT(x) { qr2_buffer_add_int(buffer, x); val.format("%d",x); }
+#else
+#define ADD(x) { qr2_buffer_add(buffer, x); }
+#define ADDINT(x) { qr2_buffer_add_int(buffer, x); }
+#endif
+
+	switch(key)
+	{
+	case NAME__KEY:
+		ADD(t->getPlayerName(index).c_str());
+		break;
+	case WINS__KEY:
+		ADDINT(t->getPlayerWins(index));
+		break;
+	case LOSSES__KEY:
+		ADDINT(t->getPlayerLosses(index));
+		break;
+	case PID__KEY:
+		ADDINT(t->getPlayerProfileID(index));
+		break;
+	case FACTION__KEY:
+		ADDINT(t->getPlayerLosses(index));
+		break;
+	case COLOR__KEY:
+		ADDINT(t->getPlayerLosses(index));
+		break;
+	default:
+		ADD("");
+		//DEBUG_LOG(("QR_PLAYER_KEY | %d | %d (%s)", key, index, qr2_registered_key_list[key]));
+		break;
+	}
+
+	DEBUG_LOG(("QR_PLAYER_KEY | %d | %d (%s) = [%s]", key, index, qr2_registered_key_list[key], val.str()));
+}
+
+static void QRTeamKeyCallback
+(
+	PEER peer,
+	int key,
+	int index,
+	qr2_buffer_t buffer,
+	void * param
+)
+{
+	//DEBUG_LOG(("QR_TEAM_KEY | %d | %d", key, index));
+
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	if (!t)
+	{
+		DEBUG_LOG(("QRTeamKeyCallback: bailing because of no thread info"));
+		return;
+	}
+	if (!t->isHosting())
+		t->stopHostingAlready(peer);
+
+	// we don't report teams, so this shouldn't get called
+	qr2_buffer_add(buffer, "");
+}
+
+static void QRKeyListCallback
+(
+	PEER peer,
+	qr2_key_type type,
+	qr2_keybuffer_t keyBuffer,
+	void * param
+)
+{
+	DEBUG_LOG(("QR_KEY_LIST | %s", KeyTypeToString(type)));
+
+	/*
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	if (!t)
+	{
+		DEBUG_LOG(("QRKeyListCallback: bailing because of no thread info"));
+		return;
+	}
+	if (!t->isHosting())
+		t->stopHostingAlready(peer);
+		*/
+
+	// register the keys we use
+	switch(type)
+	{
+	case key_server:
+		qr2_keybuffer_add(keyBuffer, HOSTNAME_KEY);
+		qr2_keybuffer_add(keyBuffer, GAMEVER_KEY);
+		//qr2_keybuffer_add(keyBuffer, GAMENAME_KEY);
+		qr2_keybuffer_add(keyBuffer, MAPNAME_KEY);
+		qr2_keybuffer_add(keyBuffer, EXECRC_KEY);
+		qr2_keybuffer_add(keyBuffer, INICRC_KEY);
+		qr2_keybuffer_add(keyBuffer, PW_KEY);
+		qr2_keybuffer_add(keyBuffer, OBS_KEY);
+#if !RTS_GENERALS
+    qr2_keybuffer_add(keyBuffer, USE_STATS_KEY);
+#endif
+		qr2_keybuffer_add(keyBuffer, LADIP_KEY);
+		qr2_keybuffer_add(keyBuffer, LADPORT_KEY);
+		qr2_keybuffer_add(keyBuffer, PINGSTR_KEY);
+		qr2_keybuffer_add(keyBuffer, NUMPLAYER_KEY);
+		qr2_keybuffer_add(keyBuffer, MAXPLAYER_KEY);
+		qr2_keybuffer_add(keyBuffer, NUMOBS_KEY);
+		break;
+	case key_player:
+		qr2_keybuffer_add(keyBuffer, NAME__KEY);
+		qr2_keybuffer_add(keyBuffer, WINS__KEY);
+		qr2_keybuffer_add(keyBuffer, LOSSES__KEY);
+		qr2_keybuffer_add(keyBuffer, PID__KEY);
+		qr2_keybuffer_add(keyBuffer, FACTION__KEY);
+		qr2_keybuffer_add(keyBuffer, COLOR__KEY);
+		break;
+	case key_team:
+		// no custom team keys
+		break;
+	}
+}
+
+static int QRCountCallback
+(
+	PEER peer,
+	qr2_key_type type,
+	void * param
+)
+{
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	if (!t)
+	{
+		DEBUG_LOG(("QRCountCallback: bailing because of no thread info"));
+		return 0;
+	}
+	if (!t->isHosting())
+		t->stopHostingAlready(peer);
+
+	if(type == key_player)
+	{
+		DEBUG_LOG(("QR_COUNT | %s = %d", KeyTypeToString(type), t->getNumPlayers() + t->getNumObservers()));
+		return t->getNumPlayers() + t->getNumObservers();
+	}
+	else if(type == key_team)
+	{
+		DEBUG_LOG(("QR_COUNT | %s = %d", KeyTypeToString(type), 0));
+		return 0;
+	}
+
+	DEBUG_LOG(("QR_COUNT | %s = %d", KeyTypeToString(type), 0));
+	return 0;
+}
+
+void PeerThreadClass::stopHostingAlready(PEER peer)
+{
+	isThreadHosting = 0; // debugging
+	s_lastStateChangedHeartbeat = 0;
+	s_wantStateChangedHeartbeat = FALSE;
+	peerStopGame(peer);
+	if (qr2Sock != INVALID_SOCKET)
+	{
+		closesocket(qr2Sock);
+		qr2Sock = INVALID_SOCKET;
+	}
+}
+
+static void QRAddErrorCallback
+(
+	PEER peer,
+	qr2_error_t error,
+	char * errorString,
+	void * param
+)
+{
+	DEBUG_LOG(("QR_ADD_ERROR | %s | %s", ErrorTypeToString(error), errorString));
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_FAILEDTOHOST;
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+
+static void QRNatNegotiateCallback
+(
+	PEER peer,
+	int cookie,
+	void * param
+)
+{
+	DEBUG_LOG(("QR_NAT_NEGOTIATE | 0x%08X", cookie));
+}
+
+static void KickedCallback
+(
+	PEER peer,
+	RoomType roomType,
+	const char * nick,
+	const char * reason,
+	void * param
+)
+{
+	DEBUG_LOG(("Kicked from %d by %s: \"%s\"", roomType, nick, reason));
+}
+
+static void NewPlayerListCallback
+(
+	PEER peer,
+	RoomType roomType,
+	void * param
+)
+{
+	DEBUG_LOG(("NewPlayerListCallback"));
+}
+
+static void AuthenticateCDKeyCallback
+(
+	PEER peer,
+	int result,
+	const char * message,
+	void * param
+)
+{
+	DEBUG_LOG(("CD Key Result: %s (%d) %X", message, result, param));
+#ifdef SERVER_DEBUGGING
+	CheckServers(peer);
+#endif // SERVER_DEBUGGING
+	SerialAuthResult *val = (SerialAuthResult *)param;
+	if (val)
+	{
+		if (result >= 1)
+		{
+			*val = SERIAL_OK;
+		}
+		else
+		{
+			*val = SERIAL_AUTHFAILED;
+		}
+	}
+#ifdef SERVER_DEBUGGING
+	CheckServers(peer);
+#endif // SERVER_DEBUGGING
+}
+
+static SerialAuthResult doCDKeyAuthentication( PEER peer )
+{
+	SerialAuthResult retval = SERIAL_NONEXISTENT;
+	if (!peer)
+		return retval;
+
+	AsciiString s;
+	if (GetStringFromRegistry("\\ergc", "", s) && s.isNotEmpty())
+	{
+#ifdef SERVER_DEBUGGING
+		DEBUG_LOG(("Before peerAuthenticateCDKey()"));
+		CheckServers(peer);
+#endif // SERVER_DEBUGGING
+		peerAuthenticateCDKey(peer, s.str(), AuthenticateCDKeyCallback, &retval, PEERTrue);
+#ifdef SERVER_DEBUGGING
+		DEBUG_LOG(("After peerAuthenticateCDKey()"));
+		CheckServers(peer);
+#endif // SERVER_DEBUGGING
+	}
+
+	if (retval == SERIAL_OK)
+	{
+		PSRequest req;
+		req.requestType = PSRequest::PSREQUEST_READCDKEYSTATS;
+		req.cdkey = s.str();
+		TheGameSpyPSMessageQueue->addRequest(req);
+	}
+
+	return retval;
+}
+
+#define INBUF_LEN 256
+void checkQR2Queries( PEER peer, SOCKET sock )
+{
+	static char indata[INBUF_LEN];
+	struct sockaddr_in saddr;
+	int saddrlen = sizeof(struct sockaddr_in);
+	fd_set set;
+	struct timeval timeout = {0,0};
+	int error;
+
+	FD_ZERO ( &set );
+	FD_SET ( sock, &set );
+
+	while (1)
+	{
+		error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
+		if (SOCKET_ERROR == error || 0 == error)
+			return;
+		//else we have data
+		error = recvfrom(sock, indata, INBUF_LEN - 1, 0, (struct sockaddr *)&saddr, &saddrlen);
+		if (error != SOCKET_ERROR)
+		{
+			indata[error] = '\0';
+			peerParseQuery( peer, indata, error, (sockaddr *)&saddr );
+		}
+	}
+}
+
+static UnsignedInt localIP = 0;
+
+void PeerThreadClass::Thread_Function()
+{
+	try {
+
+	PEER peer;
+
+	// Setup the callbacks.
+	///////////////////////
+	PEERCallbacks callbacks;
+	memset(&callbacks, 0, sizeof(PEERCallbacks));
+	callbacks.disconnected = disconnectedCallback;
+	//callbacks.readyChanged = readyChangedCallback;
+	callbacks.roomMessage = roomMessageCallback;
+	callbacks.playerMessage = playerMessageCallback;
+	callbacks.gameStarted = gameStartedCallback;
+	callbacks.playerJoined = playerJoinedCallback;
+	callbacks.playerLeft = playerLeftCallback;
+	callbacks.playerChangedNick = playerChangedNickCallback;
+	callbacks.playerFlagsChanged = playerFlagsChangedCallback;
+	callbacks.playerInfo = playerInfoCallback;
+	callbacks.roomUTM = roomUTMCallback;
+	callbacks.playerUTM = playerUTMCallback;
+	callbacks.globalKeyChanged = globalKeyChangedCallback;
+	callbacks.roomKeyChanged = roomKeyChangedCallback;
+
+	callbacks.qrServerKey = QRServerKeyCallback;
+	callbacks.qrPlayerKey = QRPlayerKeyCallback;
+	callbacks.qrTeamKey = QRTeamKeyCallback;
+	callbacks.qrKeyList = QRKeyListCallback;
+	callbacks.qrCount = QRCountCallback;
+	callbacks.qrAddError = QRAddErrorCallback;
+	callbacks.qrNatNegotiateCallback = QRNatNegotiateCallback;
+
+	callbacks.kicked = KickedCallback;
+	callbacks.newPlayerList = NewPlayerListCallback;
+
+	callbacks.param = this;
+
+	m_qmGroupRoom = 0;
+
+	peer = peerInitialize( &callbacks );
+	DEBUG_ASSERTCRASH( peer != NULL, ("NULL peer!") );
+	m_isConnected = m_isConnecting = false;
+
+	qr2_register_key(EXECRC_KEY, EXECRC_STR);
+	qr2_register_key(INICRC_KEY, INICRC_STR);
+	qr2_register_key(PW_KEY, PW_STR);
+	qr2_register_key(OBS_KEY, OBS_STR);
+#if !RTS_GENERALS
+  qr2_register_key(USE_STATS_KEY, USE_STATS_STR);
+#endif
+	qr2_register_key(LADIP_KEY, LADIP_STR);
+	qr2_register_key(LADPORT_KEY, LADPORT_STR);
+	qr2_register_key(PINGSTR_KEY, PINGSTR_STR);
+	qr2_register_key(NUMOBS_KEY, NUMOBS_STR);
+	qr2_register_key(NUMPLAYER_KEY, NUMPLAYER_STR);
+	qr2_register_key(MAXPLAYER_KEY, MAXPLAYER_STR);
+	qr2_register_key(NAME__KEY, NAME__STR "_");
+	qr2_register_key(WINS__KEY, WINS__STR "_");
+	qr2_register_key(LOSSES__KEY, LOSSES__STR "_");
+	qr2_register_key(FACTION__KEY, FACTION__STR "_");
+	qr2_register_key(COLOR__KEY, COLOR__STR "_");
+
+#if RTS_GENERALS
+	const Int NumKeys = 14;
+#else
+	const Int NumKeys = 15;
+#endif
+	unsigned char allKeysArray[NumKeys] = {
+		/*
+		PID__KEY,
+		NAME__KEY,
+		WINS__KEY,
+		LOSSES__KEY,
+		FACTION__KEY,
+		COLOR__KEY,
+		*/
+		MAPNAME_KEY,
+		GAMEVER_KEY,
+		GAMENAME_KEY,
+		EXECRC_KEY,
+		INICRC_KEY,
+		PW_KEY,
+		OBS_KEY,
+#if !RTS_GENERALS
+    USE_STATS_KEY,
+#endif
+		LADIP_KEY,
+		LADPORT_KEY,
+		PINGSTR_KEY,
+		NUMOBS_KEY,
+		NUMPLAYER_KEY,
+		MAXPLAYER_KEY,
+		HOSTNAME_KEY
+	};
+
+	/*
+	const char *allKeys = "\\pid_\\mapname\\gamever\\gamename" \
+		"\\" EXECRC_STR "\\" INICRC_STR \
+		"\\" PW_STR "\\" OBS_STR "\\" USE_STATS_STR "\\" LADIP_STR "\\" LADPORT_STR \
+		"\\" PINGSTR_STR "\\" NUMOBS_STR \
+		"\\" NUMPLAYER_STR "\\" MAXPLAYER_STR \
+		"\\" NAME__STR "_" "\\" WINS__STR "_" "\\" LOSSES__STR "_" "\\" FACTION__STR "_" "\\" COLOR__STR "_";
+	*/
+
+	const char * key = "username";
+	peerSetRoomWatchKeys(peer, StagingRoom, 1, &key, PEERTrue);
+	peerSetRoomWatchKeys(peer, GroupRoom, 1, &key, PEERTrue);
+
+	m_localRoomID = 0;
+	m_localStagingServerName = L"";
+
+	m_qmStatus = QM_IDLE;
+
+	// Setup which rooms to do pings and cross-pings in.
+	////////////////////////////////////////////////////
+	PEERBool pingRooms[NumRooms];
+	PEERBool crossPingRooms[NumRooms];
+	pingRooms[TitleRoom] = PEERFalse;
+	pingRooms[GroupRoom] = PEERFalse;
+	pingRooms[StagingRoom] = PEERFalse;
+	crossPingRooms[TitleRoom] = PEERFalse;
+	crossPingRooms[GroupRoom] = PEERFalse;
+	crossPingRooms[StagingRoom] = PEERFalse;
+
+	/*********
+	First step, set our game authentication info
+	We could do:
+	Generals:
+		strcpy(gcd_gamename,"ccgenerals");
+		strcpy(gcd_secret_key,"h5T2f6");
+	ZeroHour:
+		strcpy(gcd_gamename,"ccgenzh");
+		strcpy(gcd_secret_key,"D6s9k3");
+	or
+	Generals:
+		strcpy(gcd_gamename,"ccgeneralsb");
+		strcpy(gcd_secret_key,"g3T9s2");
+	ZeroHour:
+		strcpy(gcd_gamename,"ccgeneralsb");
+		strcpy(gcd_secret_key,"whatever the key is");
+	...but this is more secure:
+	**********/
+	char gameName[12] = {0};
+	char secretKey[7] = {0};
+	/**
+	gameName[0]='c';gameName[1]='c';gameName[2]='g';gameName[3]='e';
+	gameName[4]='n';gameName[5]='e';gameName[6]='r';gameName[7]='a';
+	gameName[8]='l';gameName[9]='s';gameName[10]='b';gameName[11]='\0';
+	secretKey[0]='g';secretKey[1]='3';secretKey[2]='T';secretKey[3]='9';
+	secretKey[4]='s';secretKey[5]='2';secretKey[6]='\0';
+	/**/
+#if RTS_GENERALS
+	gameName[0]='c';gameName[1]='c';gameName[2]='g';gameName[3]='e';
+	gameName[4]='n';gameName[5]='e';gameName[6]='r';gameName[7]='a';
+	gameName[8]='l';gameName[9]='s';gameName[10]='\0';
+	secretKey[0]='h';secretKey[1]='5';secretKey[2]='T';secretKey[3]='2';
+	secretKey[4]='f';secretKey[5]='6';secretKey[6]='\0';
+#elif RTS_ZEROHOUR
+	gameName[0]='c';gameName[1]='c';gameName[2]='g';gameName[3]='e';
+	gameName[4]='n';gameName[5]='z';gameName[6]='h';gameName[7]='\0';
+	secretKey[0]='D';secretKey[1]='6';secretKey[2]='s';secretKey[3]='9';
+	secretKey[4]='k';secretKey[5]='3';secretKey[6]='\0';
+#endif
+	/**/
+
+	// Set the title.
+	/////////////////
+	if(!peerSetTitle( peer , gameName, secretKey, gameName, secretKey, GetRegistryVersion(), 30, PEERTrue, pingRooms, crossPingRooms))
+	{
+		DEBUG_CRASH(("Error setting title"));
+		peerShutdown( peer );
+		peer = NULL;
+		return;
+	}
+
+	OptionPreferences pref;
+	UnsignedInt preferredIP = INADDR_ANY;
+	UnsignedInt selectedIP = pref.getOnlineIPAddress();
+	DEBUG_LOG(("Looking for IP %X", selectedIP));
+	IPEnumeration IPs;
+	EnumeratedIP *IPlist = IPs.getAddresses();
+	while (IPlist)
+	{
+		DEBUG_LOG(("Looking at IP %s", IPlist->getIPstring().str()));
+		if (selectedIP == IPlist->getIP())
+		{
+			preferredIP = IPlist->getIP();
+			DEBUG_LOG(("Connecting to GameSpy chat server via IP address %8.8X", preferredIP));
+			break;
+		}
+		IPlist = IPlist->getNext();
+	}
+	chatSetLocalIP(preferredIP);
+
+	UnsignedInt preferredQRPort = 0;
+	AsciiString selectedQRPort = pref["GameSpyQRPort"];
+	if (selectedQRPort.isNotEmpty())
+	{
+		preferredQRPort = atoi(selectedQRPort.str());
+	}
+
+	PeerRequest incomingRequest;
+	while ( running )
+	{
+		// deal with requests
+		if (TheGameSpyPeerMessageQueue->getRequest(incomingRequest))
+		{
+			DEBUG_LOG(("TheGameSpyPeerMessageQueue->getRequest() got request of type %d", incomingRequest.peerRequestType));
+			switch (incomingRequest.peerRequestType)
+			{
+			case PeerRequest::PEERREQUEST_LOGIN:
+				{
+				m_isConnecting = true;
+				m_originalName = incomingRequest.nick;
+				m_loginName = incomingRequest.nick;
+				m_profileID = incomingRequest.login.profileID;
+				m_password = incomingRequest.password;
+				m_email = incomingRequest.email;
+				peerConnect( peer, incomingRequest.nick.c_str(), incomingRequest.login.profileID, nickErrorCallbackWrapper, connectCallbackWrapper, this, PEERTrue );
+#ifdef SERVER_DEBUGGING
+				DEBUG_LOG(("After peerConnect()"));
+				CheckServers(peer);
+#endif // SERVER_DEBUGGING
+				if (m_isConnected)
+				{
+					SerialAuthResult ret = doCDKeyAuthentication( peer );
+					if (ret != SERIAL_OK)
+					{
+						m_isConnecting = m_isConnected = false;
+						MESSAGE_QUEUE->setSerialAuthResult( ret );
+						peerDisconnect( peer );
+					}
+				}
+				m_isConnecting = false;
+
+				// check our connection
+				//if (m_isConnected)
+				//{
+				//	GetLocalChatConnectionAddress("peerchat.gamespy.com", 6667, localIP);
+				//}
+				}
+
+				break;
+
+			case PeerRequest::PEERREQUEST_LOGOUT:
+				m_isConnecting = m_isConnected = false;
+				peerDisconnect( peer );
+				break;
+
+			case PeerRequest::PEERREQUEST_JOINGROUPROOM:
+				m_groupRoomID = incomingRequest.groupRoom.id;
+				isThreadHosting = 0; // debugging
+				s_lastStateChangedHeartbeat = 0;
+				s_wantStateChangedHeartbeat = FALSE;
+				peerStopGame( peer );
+				peerLeaveRoom( peer, GroupRoom, NULL );
+				peerLeaveRoom( peer, StagingRoom, NULL );
+				if (qr2Sock != INVALID_SOCKET)
+				{
+					closesocket(qr2Sock);
+					qr2Sock = INVALID_SOCKET;
+				}
+				m_isHosting = false;
+				m_localRoomID = m_groupRoomID;
+				DEBUG_LOG(("Requesting to join room %d in thread %X", m_localRoomID, this));
+				peerJoinGroupRoom( peer, incomingRequest.groupRoom.id, joinRoomCallback, (void *)this, PEERTrue );
+				break;
+
+			case PeerRequest::PEERREQUEST_LEAVEGROUPROOM:
+				m_groupRoomID = 0;
+				updateBuddyStatus( BUDDY_ONLINE );
+				peerLeaveRoom( peer, GroupRoom, NULL );
+				peerLeaveRoom( peer, StagingRoom, NULL ); m_isHosting = false;
+				break;
+
+			case PeerRequest::PEERREQUEST_JOINSTAGINGROOM:
+				{
+					m_groupRoomID = 0;
+					updateBuddyStatus( BUDDY_ONLINE );
+					peerLeaveRoom( peer, GroupRoom, NULL );
+					peerLeaveRoom( peer, StagingRoom, NULL ); m_isHosting = false;
+					SBServer server = findServerByID(incomingRequest.stagingRoom.id);
+					m_localStagingServerName = incomingRequest.text;
+					DEBUG_LOG(("Setting m_localStagingServerName to [%ls]", m_localStagingServerName.c_str()));
+					m_localRoomID = incomingRequest.stagingRoom.id;
+					DEBUG_LOG(("Requesting to join room %d", m_localRoomID));
+					if (server)
+					{
+						peerJoinStagingRoom( peer, server, incomingRequest.password.c_str(), joinRoomCallback, (void *)this, PEERTrue );
+					}
+					else
+					{
+						PeerResponse resp;
+						resp.peerResponseType = PeerResponse::PEERRESPONSE_JOINSTAGINGROOM;
+						resp.joinStagingRoom.id = incomingRequest.stagingRoom.id;
+						resp.joinStagingRoom.ok = FALSE;
+						resp.joinStagingRoom.result = PEERJoinFailed;
+						TheGameSpyPeerMessageQueue->addResponse(resp);
+					}
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_LEAVESTAGINGROOM:
+				m_groupRoomID = 0;
+				updateBuddyStatus( BUDDY_ONLINE );
+				peerLeaveRoom( peer, GroupRoom, NULL );
+				peerLeaveRoom( peer, StagingRoom, NULL );
+				isThreadHosting = 0; // debugging
+				s_lastStateChangedHeartbeat = 0;
+				s_wantStateChangedHeartbeat = FALSE;
+				if (m_isHosting)
+				{
+					peerStopGame( peer );
+					if (qr2Sock != INVALID_SOCKET)
+					{
+						closesocket(qr2Sock);
+						qr2Sock = INVALID_SOCKET;
+					}
+					m_isHosting = false;
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_MESSAGEPLAYER:
+				{
+					std::string s = WideCharStringToMultiByte(incomingRequest.text.c_str());
+					peerMessagePlayer( peer, incomingRequest.nick.c_str(), s.c_str(), (incomingRequest.message.isAction)?ActionMessage:NormalMessage );
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_MESSAGEROOM:
+				{
+					std::string s = WideCharStringToMultiByte(incomingRequest.text.c_str());
+					peerMessageRoom( peer, (m_groupRoomID)?GroupRoom:StagingRoom, s.c_str(), (incomingRequest.message.isAction)?ActionMessage:NormalMessage );
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_PUSHSTATS:
+				{
+					DEBUG_LOG(("PEERREQUEST_PUSHSTATS: stats are %d,%d,%d,%d,%d,%d",
+						incomingRequest.statsToPush.locale, incomingRequest.statsToPush.wins, incomingRequest.statsToPush.losses, incomingRequest.statsToPush.rankPoints, incomingRequest.statsToPush.side, incomingRequest.statsToPush.preorder));
+
+					// Testing alternate way to push stats
+#ifdef USE_BROADCAST_KEYS
+					snprintf(s_valueBuffers[0], 20, "%d", incomingRequest.statsToPush.locale);
+					snprintf(s_valueBuffers[1], 20, "%d", incomingRequest.statsToPush.wins);
+					snprintf(s_valueBuffers[2], 20, "%d", incomingRequest.statsToPush.losses);
+					snprintf(s_valueBuffers[3], 20, "%d", incomingRequest.statsToPush.rankPoints);
+					snprintf(s_valueBuffers[4], 20, "%d", incomingRequest.statsToPush.side);
+					snprintf(s_valueBuffers[5], 20, "%d", incomingRequest.statsToPush.preorder);
+					pushStatsToRoom(peer);
+#else
+					const char *keys[6] = { "locale", "wins", "losses", "points", "side", "pre" };
+					char valueStrings[6][20];
+					char *values[6] = { valueStrings[0], valueStrings[1], valueStrings[2],
+						valueStrings[3], valueStrings[4], valueStrings[5]};
+					snprintf(values[0], 20, "%d", incomingRequest.statsToPush.locale);
+					snprintf(values[1], 20, "%d", incomingRequest.statsToPush.wins);
+					snprintf(values[2], 20, "%d", incomingRequest.statsToPush.losses);
+					snprintf(values[3], 20, "%d", incomingRequest.statsToPush.rankPoints);
+					snprintf(values[4], 20, "%d", incomingRequest.statsToPush.side);
+					snprintf(values[5], 20, "%d", incomingRequest.statsToPush.preorder);
+					peerSetGlobalKeys(peer, 6, (const char **)keys, (const char **)values);
+					peerSetGlobalWatchKeys(peer, GroupRoom,   0, NULL, PEERFalse);
+					peerSetGlobalWatchKeys(peer, StagingRoom, 0, NULL, PEERFalse);
+					peerSetGlobalWatchKeys(peer, GroupRoom,   6, keys, PEERTrue);
+					peerSetGlobalWatchKeys(peer, StagingRoom, 6, keys, PEERTrue);
+#endif
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_SETGAMEOPTIONS:
+				{
+					m_mapName = incomingRequest.gameOptsMapName;
+					m_numPlayers = incomingRequest.gameOptions.numPlayers;
+					m_numObservers = incomingRequest.gameOptions.numObservers;
+					m_maxPlayers = incomingRequest.gameOptions.maxPlayers;
+					DEBUG_LOG(("peerStateChanged(): Marking game options state as changed - %d players, %d observers", m_numPlayers, m_numObservers));
+					for (Int i=0; i<MAX_SLOTS; ++i)
+					{
+						m_playerNames[i] = incomingRequest.gameOptsPlayerNames[i];
+						m_playerWins[i] = incomingRequest.gameOptions.wins[i];
+						m_playerLosses[i] = incomingRequest.gameOptions.losses[i];
+						m_playerProfileID[i] = incomingRequest.gameOptions.profileID[i];
+						m_playerFactions[i] = incomingRequest.gameOptions.faction[i];
+						m_playerColors[i] = incomingRequest.gameOptions.color[i];
+					}
+
+					s_wantStateChangedHeartbeat = TRUE;
+
+					/*
+					peerStateChanged( peer );
+
+#ifdef DEBUG_LOGGING
+					static UnsignedInt prev = 0;
+					UnsignedInt now = timeGetTime();
+					UnsignedInt diff = now - prev;
+					prev = now;
+#endif
+					STATECHANGED_LOG(("peerStateChanged() at time %d (difference of %d ms)", now, diff));
+					*/
+
+					peerUTMRoom( peer, StagingRoom, "SL/", incomingRequest.options.c_str(), PEERFalse ); // send the full string to people in the room
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_GETEXTENDEDSTAGINGROOMINFO:
+				{
+					SBServer server = findServerByID( incomingRequest.stagingRoom.id );
+					if (server)
+					{
+						DEBUG_LOG(("Requesting full update on a game"));
+						peerUpdateGame( peer, server, PEERTrue );
+					}
+					else
+					{
+						DEBUG_LOG(("Tried to update non-existent server!"));
+					}
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_CREATESTAGINGROOM:
+				{
+					Int oldGroupID = m_groupRoomID;
+					m_groupRoomID = 0;
+					updateBuddyStatus( BUDDY_ONLINE );
+					if (!incomingRequest.stagingRoomCreation.restrictGameList)
+					{
+						peerLeaveRoom( peer, GroupRoom, NULL );
+						peerLeaveRoom( peer, StagingRoom, NULL );
+					}
+					m_isHosting = TRUE;
+
+					Int res = PEERJoinFailed;
+					if (qr2Sock == INVALID_SOCKET)
+					{
+						// allocate a port
+						if (preferredQRPort < 1024)
+						{
+							preferredQRPort = 6500 + (ntohl(localIP) & 0xff);
+						}
+						DEBUG_LOG(("Using %8.8X:%d for QR2", ntohl(localIP), preferredQRPort));
+					}
+					else
+					{
+						closesocket(qr2Sock);
+						qr2Sock = INVALID_SOCKET;
+					}
+					qr2Sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+					struct sockaddr_in saddr;
+					saddr.sin_port=htons(preferredQRPort);
+					saddr.sin_addr.s_addr=localIP;
+					saddr.sin_family=AF_INET;
+					if (bind(qr2Sock, (sockaddr *)&saddr, sizeof(saddr)) != 0)
+					{
+						DEBUG_LOG(("Could not bind to %d!  Falling back to GameSpy's default port", preferredQRPort));
+						closesocket(qr2Sock);
+						qr2Sock = INVALID_SOCKET;
+						preferredQRPort = 0;
+					}
+					std::string compositeGame = m_loginName;
+					compositeGame.append(" ");
+					compositeGame.append(WideCharStringToMultiByte(incomingRequest.text.c_str()));
+					m_localStagingServerName = incomingRequest.text;
+					m_playerNames[0] = m_loginName;
+					peerCreateStagingRoomWithSocket(peer, compositeGame.c_str(), MAX_SLOTS, incomingRequest.password.c_str(), qr2Sock, preferredQRPort, createRoomCallback, (void *)&res, PEERTrue);
+					//peerCreateStagingRoomWithSocket(peer, WideCharStringToMultiByte(incomingRequest.text.c_str()).c_str(), MAX_SLOTS, incomingRequest.password.c_str(), qr2Sock, preferredQRPort, createRoomCallback, (void *)&res, PEERTrue);
+					DEBUG_LOG(("PEERREQUEST_CREATESTAGINGROOM - creating staging room, name is %ls, passwd is %s, result = %d",
+						incomingRequest.text.c_str(), incomingRequest.password.c_str(), res));
+
+					PeerResponse resp;
+					resp.peerResponseType = PeerResponse::PEERRESPONSE_CREATESTAGINGROOM;
+					resp.createStagingRoom.result = res;
+					TheGameSpyPeerMessageQueue->addResponse(resp);
+
+					if (res != PEERJoinSuccess && res != PEERAlreadyInRoom)
+					{
+						m_localRoomID = oldGroupID;
+						DEBUG_LOG(("Requesting to join room %d", m_localRoomID));
+						if (incomingRequest.stagingRoomCreation.restrictGameList)
+						{
+							peerLeaveRoom( peer, StagingRoom, NULL );
+						}
+						else
+						{
+							peerJoinGroupRoom( peer, oldGroupID, joinRoomCallback, (void *)this, PEERTrue );
+						}
+						m_isHosting = FALSE;
+						m_localStagingServerName = L"";
+						m_playerNames[0] = "";
+					}
+					else
+					{
+						if (incomingRequest.stagingRoomCreation.restrictGameList)
+						{
+							peerLeaveRoom( peer, GroupRoom, NULL );
+						}
+						isThreadHosting = 1; // debugging
+						s_lastStateChangedHeartbeat = timeGetTime(); // wait the full interval before updating state
+						s_wantStateChangedHeartbeat = FALSE;
+						m_isHosting = TRUE;
+						m_allowObservers = incomingRequest.stagingRoomCreation.allowObservers;
+            m_useStats = incomingRequest.stagingRoomCreation.useStats;
+						m_mapName = "";
+						for (Int i=0; i<MAX_SLOTS; ++i)
+						{
+							m_playerNames[i] = "";
+							m_playerWins[i] = 0;
+							m_playerLosses[i] = 0;
+							m_playerProfileID[i] = 0;
+							m_playerFactions[i] = 0;
+							m_playerColors[i] = 0;
+						}
+						if (!incomingRequest.password.empty())
+							m_hasPassword = true;
+						else
+							m_hasPassword = false;
+						m_playerNames[0] = m_loginName;
+						m_exeCRC = incomingRequest.stagingRoomCreation.exeCRC;
+						m_iniCRC = incomingRequest.stagingRoomCreation.iniCRC;
+						m_gameVersion = incomingRequest.stagingRoomCreation.gameVersion;
+						m_localStagingServerName = incomingRequest.text;
+						m_ladderIP = incomingRequest.ladderIP;
+						m_pingStr = incomingRequest.hostPingStr;
+						m_ladderPort = incomingRequest.stagingRoomCreation.ladPort;
+
+#ifdef USE_BROADCAST_KEYS
+						pushStatsToRoom(peer);
+#endif // USE_BROADCAST_KEYS
+
+						DEBUG_LOG(("Setting m_localStagingServerName to [%ls]", m_localStagingServerName.c_str()));
+						updateBuddyStatus( BUDDY_STAGING, 0, WideCharStringToMultiByte(m_localStagingServerName.c_str()) );
+					}
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_STARTGAMELIST:
+				{
+					m_sawCompleteGameList = FALSE;
+					PeerResponse resp;
+					resp.peerResponseType = PeerResponse::PEERRESPONSE_STAGINGROOM;
+					resp.stagingRoom.action = PEER_CLEAR;
+					resp.stagingRoom.isStaging = TRUE;
+					resp.stagingRoom.percentComplete = 0;
+					clearServers();
+					TheGameSpyPeerMessageQueue->addResponse(resp);
+					peerStartListingGames( peer, allKeysArray, NumKeys, (incomingRequest.gameList.restrictGameList?"~":NULL), listingGamesCallback, this );
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_STOPGAMELIST:
+				{
+					peerStopListingGames( peer );
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_STARTGAME:
+				{
+					peerStartGame( peer, NULL, PEER_STOP_REPORTING);
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_UTMPLAYER:
+				{
+					if (!incomingRequest.nick.empty())
+					{
+						peerUTMPlayer( peer, incomingRequest.nick.c_str(), incomingRequest.id.c_str(), incomingRequest.options.c_str(), PEERFalse );
+					}
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_UTMROOM:
+				{
+					peerUTMRoom( peer, (incomingRequest.UTM.isStagingRoom)?StagingRoom:GroupRoom, incomingRequest.id.c_str(), incomingRequest.options.c_str(), PEERFalse );
+				}
+				break;
+
+			case PeerRequest::PEERREQUEST_STARTQUICKMATCH:
+				{
+					m_qmInfo = incomingRequest;
+					doQuickMatch( peer );
+				}
+				break;
+
+			}
+		}
+
+		if (isThreadHosting && s_wantStateChangedHeartbeat)
+		{
+			UnsignedInt now = timeGetTime();
+			if (now > s_lastStateChangedHeartbeat + s_heartbeatInterval)
+			{
+				s_lastStateChangedHeartbeat = now;
+				s_wantStateChangedHeartbeat = FALSE;
+				peerStateChanged( peer );
+
+#ifdef DEBUG_LOGGING
+				static UnsignedInt prev = 0;
+				UnsignedInt now = timeGetTime();
+				UnsignedInt diff = now - prev;
+				prev = now;
+#endif
+				STATECHANGED_LOG(("peerStateChanged() at time %d (difference of %d ms)", now, diff));
+			}
+		}
+
+		// update the network
+		PEERBool isConnected = PEERTrue;
+		isConnected = peerIsConnected( peer );
+		if ( isConnected == PEERTrue )
+		{
+			if (qr2Sock != INVALID_SOCKET)
+			{
+				// check hosting activity
+				checkQR2Queries( peer, qr2Sock );
+			}
+			peerThink( peer );
+		}
+
+		// end our timeslice
+		Switch_Thread();
+	}
+
+	DEBUG_LOG(("voluntarily ending peer thread %d", running));
+	peerShutdown( peer );
+
+	} catch ( ... ) {
+		DEBUG_CRASH(("Exception in peer thread!"));
+
+		try {
+			PeerResponse resp;
+			resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
+			resp.discon.reason = DISCONNECT_LOSTCON;
+			TheGameSpyPeerMessageQueue->addResponse(resp);
+		}
+		catch (...)
+		{
+		}
+	}
+}
+
+static void qmProfileIDCallback( PEER peer, PEERBool success, const char *nick, int profileID, void *param )
+{
+	Int *i = (Int *)param;
+	if (!i || !success || !nick)
+		return;
+
+	*i = profileID;
+}
+
+static Int matchbotProfileID = 0;
+void quickmatchEnumPlayersCallback( PEER peer, PEERBool success, RoomType roomType, int index, const char * nick, int flags, void * param )
+{
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	if (!t || !success || nick == NULL || nick[0] == '\0')
+	{
+		t->sawEndOfEnumPlayers();
+		return;
+	}
+
+	Int id = 0;
+	peerGetPlayerProfileID(peer, nick, qmProfileIDCallback, &id, PEERTrue);
+	DEBUG_LOG(("Saw player %s with id %d (looking for %d)", nick, id, matchbotProfileID));
+	if (id == matchbotProfileID)
+	{
+		t->sawMatchbot(nick);
+	}
+
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERJOIN;
+	resp.nick = nick;
+	resp.player.roomType = roomType;
+	resp.player.IP = 0;
+
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+
+void PeerThreadClass::handleQMMatch(PEER peer, Int mapIndex, Int seed,
+																		char *playerName[MAX_SLOTS],
+																		char *playerIP[MAX_SLOTS],
+																		char *playerSide[MAX_SLOTS],
+																		char *playerColor[MAX_SLOTS],
+																		char *playerNAT[MAX_SLOTS])
+{
+	if (m_qmStatus == QM_WORKING)
+	{
+		m_qmStatus = QM_MATCHED;
+		peerLeaveRoom(peer, GroupRoom, "");
+
+		Int i=0;
+		for (; i<MAX_SLOTS; ++i)
+		{
+			if (playerName[i] && stricmp(playerName[i], m_loginName.c_str()) != 0)
+			{
+				peerMessagePlayer( peer, playerName[i], "We're matched!", NormalMessage );
+			}
+		}
+
+		PeerResponse resp;
+		resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
+		resp.qmStatus.status = QM_MATCHED;
+		for (i=0; i<MAX_SLOTS; ++i)
+		{
+			if (playerName[i])
+			{
+				resp.stagingRoomPlayerNames[i] = playerName[i];
+				resp.qmStatus.IP[i] = atoi(playerIP[i]);
+				resp.qmStatus.side[i] = atoi(playerSide[i]);
+				resp.qmStatus.color[i] = atoi(playerColor[i]);
+				resp.qmStatus.nat[i] = atoi(playerNAT[i]);
+			}
+			else
+			{
+				resp.stagingRoomPlayerNames[i] = "";
+				resp.qmStatus.IP[i] = 0;
+				resp.qmStatus.side[i] = 0;
+				resp.qmStatus.color[i] = 0;
+				resp.qmStatus.nat[i] = 0;
+			}
+		}
+		resp.qmStatus.seed = seed;
+		resp.qmStatus.mapIdx = mapIndex;
+		TheGameSpyPeerMessageQueue->addResponse(resp);
+	}
+}
+
+void PeerThreadClass::doQuickMatch( PEER peer )
+{
+	m_qmStatus = QM_JOININGQMCHANNEL;
+	Bool done = false;
+	matchbotProfileID = m_qmInfo.QM.botID;
+	setQMGroupRoom( m_qmInfo.QM.roomID );
+	m_sawMatchbot = false;
+	updateBuddyStatus( BUDDY_MATCHING );
+	while (!done && running)
+	{
+		if (!peerIsConnected( peer ))
+		{
+			done = true;
+		}
+		else
+		{
+			// update the network
+			peerThink( peer );
+
+			// end our timeslice
+			Switch_Thread();
+
+			PeerRequest incomingRequest;
+			if (TheGameSpyPeerMessageQueue->getRequest(incomingRequest))
+			{
+				switch (incomingRequest.peerRequestType)
+				{
+				case PeerRequest::PEERREQUEST_WIDENQUICKMATCHSEARCH:
+					{
+						if (m_qmStatus != QM_IDLE && m_qmStatus != QM_STOPPED && m_sawMatchbot)
+						{
+							peerMessagePlayer( peer, m_matchbotName.c_str(), "\\WIDEN", NormalMessage );
+						}
+					}
+					break;
+				case PeerRequest::PEERREQUEST_STOPQUICKMATCH:
+					{
+						m_qmStatus = QM_STOPPED;
+						peerLeaveRoom(peer, GroupRoom, "");
+						done = true;
+					}
+					break;
+				case PeerRequest::PEERREQUEST_LOGOUT:
+					{
+						m_qmStatus = QM_STOPPED;
+						peerLeaveRoom(peer, GroupRoom, "");
+						done = true;
+					}
+					break;
+				case PeerRequest::PEERREQUEST_LEAVEGROUPROOM:
+					{
+						m_qmStatus = QM_STOPPED;
+						peerLeaveRoom(peer, GroupRoom, "");
+						done = true;
+					}
+					break;
+				case PeerRequest::PEERREQUEST_UTMPLAYER:
+					{
+						peerUTMPlayer( peer, incomingRequest.nick.c_str(), incomingRequest.id.c_str(), incomingRequest.options.c_str(), PEERFalse );
+					}
+					break;
+				default:
+					{
+						DEBUG_CRASH(("Unanticipated request %d to peer thread!", incomingRequest.peerRequestType));
+					}
+					break;
+				}
+			}
+
+			if (!done)
+			{
+				// do the next bit of QM
+				switch (m_qmStatus)
+				{
+				case QM_JOININGQMCHANNEL:
+					{
+						PeerResponse resp;
+						resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
+						resp.qmStatus.status = QM_JOININGQMCHANNEL;
+						TheGameSpyPeerMessageQueue->addResponse(resp);
+
+						m_groupRoomID = m_qmGroupRoom;
+						peerLeaveRoom( peer, GroupRoom, NULL );
+						peerLeaveRoom( peer, StagingRoom, NULL ); m_isHosting = false;
+						m_localRoomID = m_groupRoomID;
+						m_roomJoined = false;
+						DEBUG_LOG(("Requesting to join room %d in thread %X", m_localRoomID, this));
+						peerJoinGroupRoom( peer, m_localRoomID, joinRoomCallback, (void *)this, PEERTrue );
+						if (m_roomJoined)
+						{
+							resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
+							resp.qmStatus.status = QM_LOOKINGFORBOT;
+							TheGameSpyPeerMessageQueue->addResponse(resp);
+
+							m_qmStatus = QM_LOOKINGFORBOT;
+							m_sawMatchbot = false;
+							m_sawEndOfEnumPlayers = false;
+							peerEnumPlayers( peer, GroupRoom, quickmatchEnumPlayersCallback, this );
+						}
+						else
+						{
+							resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
+							resp.qmStatus.status = QM_COULDNOTFINDBOT;
+							TheGameSpyPeerMessageQueue->addResponse(resp);
+							done = true;
+							m_qmStatus = QM_STOPPED;
+						}
+					}
+					break;
+				case QM_LOOKINGFORBOT:
+					{
+						if (m_sawEndOfEnumPlayers)
+						{
+							if (m_sawMatchbot)
+							{
+								char buf[64];
+								std::string msg = "\\CINFO";
+								snprintf(buf, 64, "\\Widen\\%d", m_qmInfo.QM.widenTime);
+								msg.append(buf);
+								snprintf(buf, 64, "\\LadID\\%d", m_qmInfo.QM.ladderID);
+								msg.append(buf);
+								snprintf(buf, 64, "\\LadPass\\%d", m_qmInfo.QM.ladderPassCRC);
+								msg.append(buf);
+								snprintf(buf, 64, "\\PointsMin\\%d", m_qmInfo.QM.minPointPercentage);
+								msg.append(buf);
+								snprintf(buf, 64, "\\PointsMax\\%d", m_qmInfo.QM.maxPointPercentage);
+								msg.append(buf);
+								snprintf(buf, 64, "\\Points\\%d", m_qmInfo.QM.points);
+								msg.append(buf);
+								snprintf(buf, 64, "\\Discons\\%d", m_qmInfo.QM.discons);
+								msg.append(buf);
+								snprintf(buf, 64, "\\DisconMax\\%d", m_qmInfo.QM.maxDiscons);
+								msg.append(buf);
+								snprintf(buf, 64, "\\NumPlayers\\%d", m_qmInfo.QM.numPlayers);
+								msg.append(buf);
+								snprintf(buf, 64, "\\Pings\\%s", m_qmInfo.QM.pings);
+								msg.append(buf);
+								snprintf(buf, 64, "\\IP\\%d", ntohl(peerGetLocalIP(peer)));// not ntohl(localIP), as we need EXTERNAL address for proper NAT negotiation!
+								msg.append(buf);
+								snprintf(buf, 64, "\\Side\\%d", m_qmInfo.QM.side);
+								msg.append(buf);
+								snprintf(buf, 64, "\\Color\\%d", m_qmInfo.QM.color);
+								msg.append(buf);
+								snprintf(buf, 64, "\\NAT\\%d", m_qmInfo.QM.NAT);
+								msg.append(buf);
+								snprintf(buf, 64, "\\EXE\\%d", m_qmInfo.QM.exeCRC);
+								msg.append(buf);
+								snprintf(buf, 64, "\\INI\\%d", m_qmInfo.QM.iniCRC);
+								msg.append(buf);
+								buf[0] = 0;
+								msg.append("\\Maps\\");
+								for (size_t i=0; i<m_qmInfo.qmMaps.size(); ++i)
+								{
+									if (m_qmInfo.qmMaps[i])
+										msg.append("1");
+									else
+										msg.append("0");
+								}
+								DEBUG_LOG(("Sending QM options of [%s] to %s", msg.c_str(), m_matchbotName.c_str()));
+								peerMessagePlayer( peer, m_matchbotName.c_str(), msg.c_str(), NormalMessage );
+								m_qmStatus = QM_WORKING;
+								PeerResponse resp;
+								resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
+								resp.qmStatus.status = QM_SENTINFO;
+								TheGameSpyPeerMessageQueue->addResponse(resp);
+							}
+							else
+							{
+								// no QM bot.  Bail.
+								PeerResponse resp;
+								resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
+								resp.qmStatus.status = QM_COULDNOTFINDBOT;
+								TheGameSpyPeerMessageQueue->addResponse(resp);
+
+								m_qmStatus = QM_STOPPED;
+								peerLeaveRoom(peer, GroupRoom, "");
+								done = true;
+							}
+						}
+					}
+					break;
+				case QM_WORKING:
+					{
+					}
+					break;
+				case QM_MATCHED:
+					{
+						// leave QM channel, and clean up.  Our work here is done.
+						peerLeaveRoom( peer, GroupRoom, NULL );
+						peerLeaveRoom( peer, StagingRoom, NULL ); m_isHosting = false;
+
+						m_qmStatus = QM_STOPPED;
+						peerLeaveRoom(peer, GroupRoom, "");
+						done = true;
+					}
+					break;
+				case QM_INCHANNEL:
+					{
+					}
+					break;
+				case QM_NEGOTIATINGFIREWALLS:
+					{
+					}
+					break;
+				case QM_STARTINGGAME:
+					{
+					}
+					break;
+				case QM_COULDNOTFINDCHANNEL:
+					{
+					}
+					break;
+				case QM_COULDNOTNEGOTIATEFIREWALLS:
+					{
+					}
+					break;
+				}
+			}
+		}
+	}
+	updateBuddyStatus( BUDDY_ONLINE );
+}
+
+static void getPlayerProfileIDCallback(PEER peer,  PEERBool success,  const char * nick,  int profileID,  void * param)
+{
+	if (success && param != NULL)
+	{
+		*((Int *)param) = profileID;
+	}
+}
+
+static void stagingRoomPlayerEnum( PEER peer, PEERBool success, RoomType roomType, int index, const char * nick, int flags, void * param )
+{
+	DEBUG_LOG(("Enum: success=%d, index=%d, nick=%s, flags=%d", success, index, nick, flags));
+	if (!nick || !success)
+		return;
+
+	Int id = 0;
+	peerGetPlayerProfileID(peer, nick, getPlayerProfileIDCallback, &id, PEERTrue);
+	DEBUG_ASSERTCRASH(id != 0, ("Failed to fetch player ID!"));
+
+	PeerResponse *resp = (PeerResponse *)param;
+	if (flags & PEER_FLAG_OP)
+	{
+		resp->joinStagingRoom.isHostPresent = TRUE;
+	}
+	if (index < MAX_SLOTS)
+	{
+		resp->stagingRoomPlayerNames[index] = nick;
+	}
+
+	if (id)
+	{
+		PSRequest req;
+		req.requestType = PSRequest::PSREQUEST_READPLAYERSTATS;
+		req.player.id = id;
+		TheGameSpyPSMessageQueue->addRequest(req);
+	}
+}
+
+static void joinRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomType roomType, void *param)
+{
+	DEBUG_LOG(("JoinRoomCallback: success==%d, result==%d", success, result));
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	if (!t)
+		return;
+	DEBUG_LOG(("Room id was %d from thread %X", t->getLocalRoomID(), t));
+	DEBUG_LOG(("Current staging server name is [%ls]", t->getLocalStagingServerName().c_str()));
+	DEBUG_LOG(("Room type is %d (GroupRoom=%d, StagingRoom=%d, TitleRoom=%d)", roomType, GroupRoom, StagingRoom, TitleRoom));
+
+#ifdef USE_BROADCAST_KEYS
+	if (success)
+	{
+		t->pushStatsToRoom(peer);
+		t->getStatsFromRoom(peer, roomType);
+	}
+#endif // USE_BROADCAST_KEYS
+
+	switch (roomType)
+	{
+		case GroupRoom:
+			{
+#ifdef USE_BROADCAST_KEYS
+				t->clearPlayerStats(GroupRoom);
+#endif // USE_BROADCAST_KEYS
+				PeerResponse resp;
+				resp.peerResponseType = PeerResponse::PEERRESPONSE_JOINGROUPROOM;
+				resp.joinGroupRoom.id = t->getLocalRoomID();
+				resp.joinGroupRoom.ok = success;
+				TheGameSpyPeerMessageQueue->addResponse(resp);
+				t->roomJoined(success == PEERTrue);
+				DEBUG_LOG(("Entered group room %d, qm is %d", t->getLocalRoomID(), t->getQMGroupRoom()));
+				if ((!t->getQMGroupRoom()) || (t->getQMGroupRoom() != t->getLocalRoomID()))
+				{
+					DEBUG_LOG(("Updating buddy status"));
+					updateBuddyStatus( BUDDY_LOBBY, t->getLocalRoomID() );
+				}
+			}
+			break;
+		case StagingRoom:
+			{
+#ifdef USE_BROADCAST_KEYS
+				t->clearPlayerStats(StagingRoom);
+#endif // USE_BROADCAST_KEYS
+				PeerResponse resp;
+				resp.peerResponseType = PeerResponse::PEERRESPONSE_JOINSTAGINGROOM;
+				resp.joinStagingRoom.id = t->getLocalRoomID();
+				resp.joinStagingRoom.ok = success;
+				resp.joinStagingRoom.result = result;
+				if (success)
+				{
+					DEBUG_LOG(("joinRoomCallback() - game name is now '%ls'", t->getLocalStagingServerName().c_str()));
+					updateBuddyStatus( BUDDY_STAGING, 0, WideCharStringToMultiByte(t->getLocalStagingServerName().c_str()) );
+				}
+
+				resp.joinStagingRoom.isHostPresent = FALSE;
+				DEBUG_LOG(("Enum of staging room players"));
+				peerEnumPlayers(peer, StagingRoom, stagingRoomPlayerEnum, &resp);
+				DEBUG_LOG(("Host %s present", (resp.joinStagingRoom.isHostPresent)?"is":"is not"));
+
+				TheGameSpyPeerMessageQueue->addResponse(resp);
+			}
+			break;
+	}
+}
+
+// Gets called once for each group room when listing group rooms.
+// After this has been called for each group room, it will be
+// called one more time with groupID==0 and name==NULL.
+/////////////////////////////////////////////////////////////////
+static void listGroupRoomsCallback(PEER peer, PEERBool success,
+														int groupID, SBServer server,
+														const char * name, int numWaiting,
+														int maxWaiting, int numGames,
+														int numPlaying, void * param)
+{
+	DEBUG_LOG(("listGroupRoomsCallback, success=%d, server=%X, groupID=%d", success, server, groupID));
+#ifdef SERVER_DEBUGGING
+	CheckServers(peer);
+#endif // SERVER_DEBUGGING
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	if (!t)
+	{
+		DEBUG_LOG(("No thread!  Bailing!"));
+		return;
+	}
+
+	if (success)
+	{
+		DEBUG_LOG(("Saw group room of %d (%s) at address %X %X", groupID, name, server, (server)?server->keyvals:0));
+		PeerResponse resp;
+		resp.peerResponseType = PeerResponse::PEERRESPONSE_GROUPROOM;
+		resp.groupRoom.id = groupID;
+		resp.groupRoom.numWaiting = numWaiting;
+		resp.groupRoom.maxWaiting = maxWaiting;
+		resp.groupRoom.numGames = numGames;
+		resp.groupRoom.numPlaying = numPlaying;
+		if (name)
+		{
+			resp.groupRoomName = name;
+			//t->setQMGroupRoom(groupID);
+		}
+		TheGameSpyPeerMessageQueue->addResponse(resp);
+#ifdef SERVER_DEBUGGING
+		CheckServers(peer);
+		DEBUG_LOG((""));
+#endif // SERVER_DEBUGGING
+	}
+	else
+	{
+		DEBUG_LOG(("Failure!"));
+	}
+}
+
+void PeerThreadClass::connectCallback( PEER peer, PEERBool success )
+{
+	PeerResponse resp;
+	if(!success)
+	{
+		//updateBuddyStatus( BUDDY_OFFLINE );
+		resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
+		resp.discon.reason = DISCONNECT_COULDNOTCONNECT;
+		TheGameSpyPeerMessageQueue->addResponse(resp);
+		return;
+	}
+
+	updateBuddyStatus( BUDDY_ONLINE );
+
+	m_isConnected = true;
+	DEBUG_LOG(("Connected as profile %d (%s)", m_profileID, m_loginName.c_str()));
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_LOGIN;
+	resp.player.profileID = m_profileID;
+	resp.nick = m_loginName;
+	GetLocalChatConnectionAddress("peerchat.gamespy.com", 6667, localIP);
+	chatSetLocalIP(localIP);
+	resp.player.internalIP = ntohl(localIP);
+	resp.player.externalIP = ntohl(peerGetLocalIP(peer));
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+
+	PSRequest psReq;
+	psReq.requestType = PSRequest::PSREQUEST_READPLAYERSTATS;
+	psReq.player.id = m_profileID;
+	psReq.nick = m_originalName;
+	psReq.email = m_email;
+	psReq.password = m_password;
+	TheGameSpyPSMessageQueue->addRequest(psReq);
+
+#ifdef SERVER_DEBUGGING
+	DEBUG_LOG(("Before peerListGroupRooms()"));
+	CheckServers(peer);
+#endif // SERVER_DEBUGGING
+	peerListGroupRooms( peer, NULL, listGroupRoomsCallback, this, PEERTrue );
+#ifdef SERVER_DEBUGGING
+	DEBUG_LOG(("After peerListGroupRooms()"));
+	CheckServers(peer);
+#endif // SERVER_DEBUGGING
+}
+
+void PeerThreadClass::nickErrorCallback( PEER peer, Int type, const char *nick )
+{
+	if(type == PEER_IN_USE)
+	{
+		Int len = strlen(nick);
+		std::string nickStr = nick;
+		Int newVal = 0;
+		if (nick[len-1] == '}' && nick[len-3] == '{' && isdigit(nick[len-2]))
+		{
+			newVal = nick[len-2] - '0' + 1;
+			nickStr.erase(len-3, 3);
+		}
+
+		DEBUG_LOG(("Nickname taken: was %s, new val = %d, new nick = %s", nick, newVal, nickStr.c_str()));
+
+		if (newVal < 10)
+		{
+			nickStr.append("{");
+			char tmp[2];
+			tmp[0] = '0'+newVal;
+			tmp[1] = '\0';
+			nickStr.append(tmp);
+			nickStr.append("}");
+			// Retry the connect with a similar nick.
+			m_loginName = nickStr;
+			peerRetryWithNick(peer, nickStr.c_str());
+		}
+		else
+		{
+			PeerResponse resp;
+			resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
+			resp.discon.reason = DISCONNECT_NICKTAKEN;
+			TheGameSpyPeerMessageQueue->addResponse(resp);
+
+			// Cancel the connect.
+			peerRetryWithNick(peer, NULL);
+		}
+	}
+	else
+	{
+		PeerResponse resp;
+		resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
+		resp.discon.reason = DISCONNECT_BADNICK;
+		TheGameSpyPeerMessageQueue->addResponse(resp);
+
+		// Cancel the connect.
+		peerRetryWithNick(peer, NULL);
+	}
+}
+
+void disconnectedCallback(PEER peer, const char * reason, void * param)
+{
+	DEBUG_LOG(("disconnectedCallback(): reason was '%s'", reason));
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
+	if (t)
+		t->markAsDisconnected();
+	//updateBuddyStatus( BUDDY_OFFLINE );
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
+	resp.discon.reason = DISCONNECT_LOSTCON;
+	SerialAuthResult res = TheGameSpyPeerMessageQueue->getSerialAuthResult();
+	switch (res)
+	{
+		case SERIAL_NONEXISTENT:
+			resp.discon.reason = DISCONNECT_SERIAL_NOT_PRESENT;
+			break;
+		case SERIAL_AUTHFAILED:
+			resp.discon.reason = DISCONNECT_SERIAL_INVALID;
+			break;
+		case SERIAL_BANNED:
+			resp.discon.reason = DISCONNECT_SERIAL_BANNED;
+			break;
+	}
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+
+void roomMessageCallback(PEER peer, RoomType roomType, const char * nick, const char * message, MessageType messageType, void * param)
+{
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_MESSAGE;
+	resp.nick = nick;
+	resp.text = MultiByteToWideCharSingleLine(message);
+	resp.message.isPrivate = FALSE;
+	resp.message.isAction = (messageType == ActionMessage);
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+	DEBUG_LOG(("Saw text [%hs] (%ls) %d chars Orig was %s (%d chars)", nick, resp.text.c_str(), resp.text.length(), message, strlen(message)));
+
+	UnsignedInt IP;
+	peerGetPlayerInfoNoWait(peer, nick, &IP, &resp.message.profileID);
+
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
+	if (t && (t->getQMStatus() != QM_IDLE && t->getQMStatus() != QM_STOPPED))
+	{
+		if (resp.message.profileID == matchbotProfileID)
+		{
+			char *lastStr = NULL;
+			char *cmd = strtok_r((char *)message, " ", &lastStr);
+			if ( cmd && strcmp(cmd, "MBOT:POOLSIZE") == 0 )
+			{
+				Int poolSize = 0;
+
+				while (1)
+				{
+					char *poolStr = strtok_r(NULL, " ", &lastStr);
+					char *sizeStr = strtok_r(NULL, " ", &lastStr);
+					if (poolStr && sizeStr)
+					{
+						Int pool = atoi(poolStr);
+						Int size = atoi(sizeStr);
+						if (pool == t->getQMLadder())
+						{
+							poolSize = size;
+							break;
+						}
+					}
+					else
+						break;
+				}
+
+				PeerResponse resp;
+				resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
+				resp.qmStatus.status = QM_POOLSIZE;
+				resp.qmStatus.poolSize = poolSize;
+				TheGameSpyPeerMessageQueue->addResponse(resp);
+			}
+		}
+	}
+}
+
+void gameStartedCallback( PEER peer, SBServer server, const char *message, void *param )
+{
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_GAMESTART;
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+
+void playerMessageCallback(PEER peer, const char * nick, const char * message, MessageType messageType, void * param)
+{
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_MESSAGE;
+	resp.nick = nick;
+	resp.text = MultiByteToWideCharSingleLine(message);
+	resp.message.isPrivate = TRUE;
+	resp.message.isAction = (messageType == ActionMessage);
+	UnsignedInt IP;
+	peerGetPlayerInfoNoWait(peer, nick, &IP, &resp.message.profileID);
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+
+
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
+	if (t && (t->getQMStatus() != QM_IDLE && t->getQMStatus() != QM_STOPPED))
+	{
+		if (resp.message.isPrivate && resp.message.profileID == matchbotProfileID)
+		{
+			char *lastStr = NULL;
+			char *cmd = strtok_r((char *)message, " ", &lastStr);
+			if ( cmd && strcmp(cmd, "MBOT:MATCHED") == 0 )
+			{
+				char *mapNumStr = strtok_r(NULL, " ", &lastStr);
+				char *seedStr = strtok_r(NULL, " ", &lastStr);
+				char *playerStr[MAX_SLOTS];
+				char *playerIPStr[MAX_SLOTS];
+				char *playerSideStr[MAX_SLOTS];
+				char *playerColorStr[MAX_SLOTS];
+				char *playerNATStr[MAX_SLOTS];
+				Int numPlayers = 0;
+				for (Int i=0; i<MAX_SLOTS; ++i)
+				{
+					playerStr[i] = strtok_r(NULL, " ", &lastStr);
+					playerIPStr[i] = strtok_r(NULL, " ", &lastStr);
+					playerSideStr[i] = strtok_r(NULL, " ", &lastStr);
+					playerColorStr[i] = strtok_r(NULL, " ", &lastStr);
+					playerNATStr[i] = strtok_r(NULL, " ", &lastStr);
+					if (playerNATStr[i])
+					{
+						++numPlayers;
+					}
+					else
+					{
+						playerStr[i] = NULL;
+						playerIPStr[i] = NULL;
+						playerSideStr[i] = NULL;
+						playerColorStr[i] = NULL;
+						playerNATStr[i] = NULL;
+					}
+				}
+
+				if (numPlayers > 1)
+				{
+					// woohoo!  got everything needed for a match!
+					DEBUG_LOG(("Saw %d-player QM match: map index = %s, seed = %s", numPlayers, mapNumStr, seedStr));
+					t->handleQMMatch(peer, atoi(mapNumStr), atoi(seedStr), playerStr, playerIPStr, playerSideStr, playerColorStr, playerNATStr);
+				}
+			}
+			else if ( cmd && strcmp(cmd, "MBOT:WORKING") == 0 )
+			{
+				Int poolSize = 0;
+				char *poolStr = strtok_r(NULL, " ", &lastStr);
+				if (poolStr)
+					poolSize = atoi(poolStr);
+				PeerResponse resp;
+				resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
+				resp.qmStatus.status = QM_WORKING;
+				resp.qmStatus.poolSize = poolSize;
+				TheGameSpyPeerMessageQueue->addResponse(resp);
+			}
+			else if ( cmd && strcmp(cmd, "MBOT:WIDENINGSEARCH") == 0 )
+			{
+				PeerResponse resp;
+				resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
+				resp.qmStatus.status = QM_WIDENINGSEARCH;
+				TheGameSpyPeerMessageQueue->addResponse(resp);
+			}
+		}
+	}
+}
+
+void roomUTMCallback(PEER peer, RoomType roomType, const char * nick, const char * command, const char * parameters, PEERBool authenticated, void * param)
+{
+	DEBUG_LOG(("roomUTMCallback: %s says %s = [%s]", nick, command, parameters));
+	if (roomType != StagingRoom)
+		return;
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_ROOMUTM;
+	resp.nick = nick;
+	resp.command = command;
+	resp.commandOptions = parameters;
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+
+void playerUTMCallback(PEER peer, const char * nick, const char * command, const char * parameters, PEERBool authenticated, void * param)
+{
+	DEBUG_LOG(("playerUTMCallback: %s says %s = [%s]", nick, command, parameters));
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERUTM;
+	resp.nick = nick;
+	resp.command = command;
+	resp.commandOptions = parameters;
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+
+static void getPlayerInfo(PeerThreadClass *t, PEER peer, const char *nick, Int& id, UnsignedInt& IP,
+													std::string& locale, Int& wins, Int& losses, Int& rankPoints, Int& side, Int& preorder,
+													RoomType roomType, Int& flags)
+{
+	if (!t || !nick)
+		return;
+	peerGetPlayerInfoNoWait(peer, nick, &IP, &id);
+#ifdef USE_BROADCAST_KEYS
+	//locale.printf
+	Int localeIndex = t->lookupStatForPlayer(roomType, nick, "b_locale");
+	AsciiString tmp;
+	tmp.format("%d", localeIndex);
+	locale = tmp.str();
+
+	wins = t->lookupStatForPlayer(roomType, nick, "b_wins");
+	losses = t->lookupStatForPlayer(roomType, nick, "b_losses");
+	rankPoints = t->lookupStatForPlayer(roomType, nick, "b_points");
+	side = t->lookupStatForPlayer(roomType, nick, "b_side");
+	preorder = t->lookupStatForPlayer(roomType, nick, "b_pre");
+#else // USE_BROADCAST_KEYS
+	const char *s;
+	s = peerGetGlobalWatchKey(peer, nick, "locale");
+	locale = (s)?s:"";
+	s = peerGetGlobalWatchKey(peer, nick, "wins");
+	wins = atoi((s)?s:"");
+	s = peerGetGlobalWatchKey(peer, nick, "losses");
+	losses = atoi((s)?s:"");
+	s = peerGetGlobalWatchKey(peer, nick, "points");
+	rankPoints = atoi((s)?s:"");
+	s = peerGetGlobalWatchKey(peer, nick, "side");
+	side = atoi((s)?s:"");
+	s = peerGetGlobalWatchKey(peer, nick, "pre");
+	preorder = atoi((s)?s:"");
+#endif // USE_BROADCAST_KEYS
+	flags = 0;
+	peerGetPlayerFlags(peer, nick, roomType, &flags);
+	DEBUG_LOG(("getPlayerInfo(%d) - %s has locale %s, wins:%d, losses:%d, rankPoints:%d, side:%d, preorder:%d",
+		id, nick, locale.c_str(), wins, losses, rankPoints, side, preorder));
+}
+
+static void roomKeyChangedCallback(PEER peer, RoomType roomType, const char *nick, const char *key, const char *val, void *param)
+{
+#ifdef USE_BROADCAST_KEYS
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
+	if (!t || !nick || !key || !val)
+	{
+		DEBUG_ASSERTCRASH(nick && strcmp(nick,"(END)")==0, ("roomKeyChangedCallback bad values = nick:%X:%s, key:%X:%s, val:%X:%s", nick, nick, key, key, val, val));
+		return;
+	}
+
+#ifdef DEBUG_LOGGING
+	if (strcmp(key, "username") != 0 && strcmp(key, "b_flags") != 0)
+	{
+		DEBUG_LOG(("roomKeyChangedCallback() - %s set %s=%s", nick, key, val));
+	}
+#endif
+
+	t->trackStatsForPlayer(roomType, nick, key, val);
+
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERINFO;
+	resp.nick = nick;
+	resp.player.roomType = roomType;
+
+	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
+		resp.locale, resp.player.wins, resp.player.losses,
+		resp.player.rankPoints, resp.player.side, resp.player.preorder,
+		resp.player.roomType, resp.player.flags);
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+#endif // USE_BROADCAST_KEYS
+}
+
+#ifdef USE_BROADCAST_KEYS
+void getRoomKeysCallback(PEER peer, PEERBool success, RoomType roomType, const char *nick, int num, char **keys, char **values, void *param)
+{
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
+	if (!t || !nick || !num || !success || !keys || !values)
+	{
+		DEBUG_ASSERTCRASH(!nick || strcmp(nick,"(END)")==0, ("getRoomKeysCallback bad key/value %X/%X, nick=%s", keys, values, nick));
+		return;
+	}
+
+	for (Int i=0; i<num; ++i)
+	{
+		t->trackStatsForPlayer(roomType, nick, keys[i], values[i]);
+	}
+
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERINFO;
+	resp.nick = nick;
+	resp.player.roomType = roomType;
+
+	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
+		resp.locale, resp.player.wins, resp.player.losses,
+		resp.player.rankPoints, resp.player.side, resp.player.preorder,
+		resp.player.roomType, resp.player.flags);
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+#endif // USE_BROADCAST_KEYS
+
+static void globalKeyChangedCallback(PEER peer, const char *nick, const char *key, const char *val, void *param)
+{
+	if (!nick)
+		return;
+
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
+	if (!t)
+		return;
+
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERINFO;
+	resp.nick = nick;
+	resp.player.roomType = t->getCurrentGroupRoom()?GroupRoom:StagingRoom;
+
+	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
+		resp.locale, resp.player.wins, resp.player.losses,
+		resp.player.rankPoints, resp.player.side, resp.player.preorder,
+		resp.player.roomType, resp.player.flags);
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+
+void playerJoinedCallback(PEER peer, RoomType roomType, const char * nick, void * param)
+{
+	if (!nick)
+		return;
+
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
+	if (!t)
+		return;
+
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERJOIN;
+	resp.nick = nick;
+	resp.player.roomType = roomType;
+
+	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
+		resp.locale, resp.player.wins, resp.player.losses,
+		resp.player.rankPoints, resp.player.side, resp.player.preorder,
+		roomType, resp.player.flags);
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+
+void playerLeftCallback(PEER peer, RoomType roomType, const char * nick, const char * reason, void * param)
+{
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERLEFT;
+	resp.nick = nick;
+	resp.player.roomType = roomType;
+	resp.player.profileID = 0;
+
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
+	if (!t)
+		return;
+
+	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
+		resp.locale, resp.player.wins, resp.player.losses,
+		resp.player.rankPoints, resp.player.side, resp.player.preorder,
+		roomType, resp.player.flags);
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+
+	if (t->getQMStatus() != QM_IDLE && t->getQMStatus() != QM_STOPPED)
+	{
+		if (stricmp(t->getQMBotName().c_str(), nick) == 0)
+		{
+			// matchbot left - bail
+			PeerResponse resp;
+			resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
+			resp.qmStatus.status = QM_COULDNOTFINDBOT;
+			TheGameSpyPeerMessageQueue->addResponse(resp);
+
+			PeerRequest req;
+			req.peerRequestType = PeerRequest::PEERREQUEST_STOPQUICKMATCH;
+			TheGameSpyPeerMessageQueue->addRequest(req);
+		}
+	}
+}
+
+void playerChangedNickCallback(PEER peer, RoomType roomType, const char * oldNick, const char * newNick, void * param)
+{
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERCHANGEDNICK;
+	resp.nick = newNick;
+	resp.oldNick = oldNick;
+	resp.player.roomType = roomType;
+
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
+	if (!t)
+		return;
+
+	getPlayerInfo(t, peer, newNick, resp.player.profileID, resp.player.IP,
+		resp.locale, resp.player.wins, resp.player.losses,
+		resp.player.rankPoints, resp.player.side, resp.player.preorder,
+		roomType, resp.player.flags);
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+
+static void playerInfoCallback(PEER peer, RoomType roomType, const char * nick, unsigned int IP, int profileID, void * param)
+{
+	if (!nick)
+		return;
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERINFO;
+	resp.nick = nick;
+	resp.player.roomType = roomType;
+
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
+	if (!t)
+		return;
+
+	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
+		resp.locale, resp.player.wins, resp.player.losses,
+		resp.player.rankPoints, resp.player.side, resp.player.preorder,
+		roomType, resp.player.flags);
+DEBUG_LOG(("**GS playerInfoCallback name=%s, local=%s", nick, resp.locale.c_str() ));
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+
+static void playerFlagsChangedCallback(PEER peer, RoomType roomType, const char * nick, int oldFlags, int newFlags, void * param)
+{
+	if (!nick)
+		return;
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERCHANGEDFLAGS;
+	resp.nick = nick;
+	resp.player.roomType = roomType;
+
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
+	if (!t)
+		return;
+
+	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
+		resp.locale, resp.player.wins, resp.player.losses,
+		resp.player.rankPoints, resp.player.side, resp.player.preorder,
+		roomType, resp.player.flags);
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+
+#ifdef DEBUG_LOGGING
+/*
+static void enumFunc(char *key, char *val, void *param)
+{
+	DEBUG_LOG(("  [%s] = [%s]", key, val));
+}
+*/
+#endif
+
+static void listingGamesCallback(PEER peer, PEERBool success, const char * name, SBServer server, PEERBool staging, int msg, Int percentListed, void * param)
+{
+	PeerThreadClass *t = (PeerThreadClass *)param;
+	if (!t || !success)
+		return;
+
+#ifdef DEBUG_LOGGING
+	AsciiString cmdStr = "<Unknown>";
+	switch(msg)
+	{
+		case PEER_ADD:
+			cmdStr = "PEER_ADD";
+			break;
+		case PEER_UPDATE:
+			cmdStr = "PEER_UPDATE";
+			break;
+		case PEER_REMOVE:
+			cmdStr = "PEER_REMOVE";
+			break;
+		case PEER_CLEAR:
+			cmdStr = "PEER_CLEAR";
+			break;
+		case PEER_COMPLETE:
+			cmdStr = "PEER_COMPLETE";
+			break;
+	}
+	DEBUG_LOG(("listingGamesCallback() - doing command %s on server %X", cmdStr.str(), server));
+#endif // DEBUG_LOGGING
+
+//	PeerThreadClass *t = (PeerThreadClass *)param;
+	DEBUG_ASSERTCRASH(name || msg==PEER_CLEAR || msg==PEER_COMPLETE, ("Game has no name!"));
+	if (!t || !success || (!name && (msg == PEER_ADD || msg == PEER_UPDATE)))
+	{
+		DEBUG_LOG(("Bailing from listingGamesCallback() - success=%d, name=%X, server=%X, msg=%X", success, name, server, msg));
+		return;
+	}
+	if (!name)
+		name = "bogus";
+
+	if (server && (msg == PEER_ADD || msg == PEER_UPDATE))
+	{
+		DEBUG_ASSERTCRASH(server->keyvals, ("Looking at an already-freed server for msg type %d!", msg));
+		if (!server->keyvals)
+		{
+			msg = PEER_REMOVE;
+		}
+	}
+
+	if (server && success && (msg == PEER_ADD || msg == PEER_UPDATE))
+	{
+		DEBUG_LOG(("Game name is '%s'", name));
+		const char *newname = SBServerGetStringValue(server, "gamename", (char *)name);
+#if RTS_GENERALS
+		if (strcmp(newname, "ccgenerals") != 0)
+#elif RTS_ZEROHOUR
+		if (strcmp(newname, "ccgenzh") != 0)
+#endif
+			name = newname;
+		DEBUG_LOG(("Game name is now '%s'", name));
+	}
+
+	DEBUG_LOG(("listingGamesCallback - got percent complete %d", percentListed));
+	if (percentListed == 100)
+	{
+		if (!t->getSawCompleteGameList())
+		{
+			t->setSawCompleteGameList(TRUE);
+			PeerResponse completeResp;
+			completeResp.peerResponseType = PeerResponse::PEERRESPONSE_STAGINGROOMLISTCOMPLETE;
+			TheGameSpyPeerMessageQueue->addResponse(completeResp);
+		}
+	}
+
+	AsciiString gameName = name;
+	AsciiString tmp = gameName;
+	AsciiString hostName;
+	tmp.nextToken(&hostName, " ");
+	const char *firstSpace = gameName.find(' ');
+	if(firstSpace)
+	{
+		gameName.set(firstSpace + 1);
+		//gameName.trim();
+		DEBUG_LOG(("Hostname/Gamename split leaves '%s' hosting '%s'", hostName.str(), gameName.str()));
+	}
+	PeerResponse resp;
+	resp.peerResponseType = PeerResponse::PEERRESPONSE_STAGINGROOM;
+	resp.stagingRoom.action = msg;
+	resp.stagingRoom.isStaging = staging;
+	resp.stagingRoom.percentComplete = percentListed;
+
+	if (server && (msg == PEER_ADD || msg == PEER_UPDATE))
+	{
+		Bool hasPassword = (Bool)SBServerGetIntValue(server, PW_STR, FALSE);
+		Bool allowObservers = (Bool)SBServerGetIntValue(server, OBS_STR, FALSE);
+    Bool usesStats = (Bool)SBServerGetIntValue(server, USE_STATS_STR, TRUE);
+		const char *verStr = SBServerGetStringValue(server, "gamever", "000000");
+		const char *exeStr = SBServerGetStringValue(server, EXECRC_STR, "000000");
+		const char *iniStr = SBServerGetStringValue(server, INICRC_STR, "000000");
+		const char *ladIPStr = SBServerGetStringValue(server, LADIP_STR, "000000");
+		const char *pingStr = SBServerGetStringValue(server, PINGSTR_STR, "FFFFFFFFFFFFFFFF");
+		UnsignedShort ladPort = (UnsignedShort)SBServerGetIntValue(server, LADPORT_STR, 0);
+		UnsignedInt verVal = strtoul(verStr, NULL, 10);
+		UnsignedInt exeVal = strtoul(exeStr, NULL, 10);
+		UnsignedInt iniVal = strtoul(iniStr, NULL, 10);
+		resp.stagingRoom.requiresPassword = hasPassword;
+		resp.stagingRoom.allowObservers = allowObservers;
+    resp.stagingRoom.useStats = usesStats;
+		resp.stagingRoom.version = verVal;
+		resp.stagingRoom.exeCRC = exeVal;
+		resp.stagingRoom.iniCRC = iniVal;
+		resp.stagingServerLadderIP = ladIPStr;
+		resp.stagingServerPingString = pingStr;
+		resp.stagingRoom.ladderPort = ladPort;
+		resp.stagingRoom.numPlayers = SBServerGetIntValue(server, NUMPLAYER_STR, 0);
+		resp.stagingRoom.numObservers = SBServerGetIntValue(server, NUMOBS_STR, 0);
+		resp.stagingRoom.maxPlayers = SBServerGetIntValue(server, MAXPLAYER_STR, 8);
+		resp.stagingRoomMapName = SBServerGetStringValue(server, "mapname", "");
+		for (Int i=0; i<MAX_SLOTS; ++i)
+		{
+			resp.stagingRoomPlayerNames[i] = SBServerGetPlayerStringValue(server, i, NAME__STR, "");
+			resp.stagingRoom.wins[i] = SBServerGetPlayerIntValue(server, i, WINS__STR, 0);
+			resp.stagingRoom.losses[i] = SBServerGetPlayerIntValue(server, i, LOSSES__STR, 0);
+			resp.stagingRoom.profileID[i] = SBServerGetPlayerIntValue(server, i, "pid", 0);
+			resp.stagingRoom.color[i] = SBServerGetPlayerIntValue(server, i, COLOR__STR, 0);
+			resp.stagingRoom.faction[i] = SBServerGetPlayerIntValue(server, i, FACTION__STR, 0);
+#ifdef DEBUG_LOGGING
+			if (resp.stagingRoomPlayerNames[i].length())
+			{
+				DEBUG_LOG(("Player %d raw stuff: [%s] [%d] [%d] [%d]", i, resp.stagingRoomPlayerNames[i].c_str(), resp.stagingRoom.wins[i], resp.stagingRoom.losses[i], resp.stagingRoom.profileID[i]));
+			}
+#endif
+		}
+		if (resp.stagingRoomPlayerNames[0].empty())
+		{
+			resp.stagingRoomPlayerNames[0] = hostName.str();
+		}
+		DEBUG_ASSERTCRASH(resp.stagingRoomPlayerNames[0].empty() == false, ("No host!"));
+		DEBUG_LOG(("Raw stuff: [%s] [%s] [%s] [%d] [%d] [%d]", verStr, exeStr, iniStr, hasPassword, allowObservers, usesStats));
+		DEBUG_LOG(("Raw stuff: [%s] [%s] [%d]", pingStr, ladIPStr, ladPort));
+		DEBUG_LOG(("Saw game with stuff %s %d %X %X %X %s", resp.stagingRoomMapName.c_str(), hasPassword, verVal, exeVal, iniVal, SBServerGetStringValue(server, "password", "missing")));
+#ifdef PING_TEST
+	PING_LOG(("%s", pingStr));
+#endif
+	}
+
+	if (msg == PEER_ADD || msg == PEER_UPDATE)
+	{
+		if (!resp.stagingRoom.exeCRC || !resp.stagingRoom.iniCRC)
+		{
+			if (SBServerHasBasicKeys(server))
+			{
+				DEBUG_LOG(("Server %x does not have basic keys", server));
+				return;
+			}
+			else
+			{
+				DEBUG_LOG(("Server %x has basic keys, yet has no info", server));
+			}
+			if (msg == PEER_UPDATE)
+			{
+				PeerRequest req;
+				req.peerRequestType = PeerRequest::PEERREQUEST_GETEXTENDEDSTAGINGROOMINFO;
+				req.stagingRoom.id = t->findServer( server );
+				DEBUG_LOG(("Add/update a 0/0 server %X (%d, %s) - requesting full update to see if that helps.",
+					server, resp.stagingRoom.id, gameName.str()));
+				TheGameSpyPeerMessageQueue->addRequest(req);
+			}
+			return; // don't actually try to list it.
+		}
+	}
+
+	switch (msg)
+	{
+		case PEER_CLEAR:
+			t->clearServers();
+			break;
+		case PEER_ADD:
+		case PEER_UPDATE:
+			resp.stagingRoom.id = t->findServer( server );
+			DEBUG_LOG(("Add/update on server %X (%d, %s)", server, resp.stagingRoom.id, gameName.str()));
+			resp.stagingServerName = MultiByteToWideCharSingleLine( gameName.str() );
+			DEBUG_LOG(("Server had basic=%d, full=%d", SBServerHasBasicKeys(server), SBServerHasFullKeys(server)));
+#ifdef DEBUG_LOGGING
+			//SBServerEnumKeys(server, enumFunc, NULL);
+#endif
+			break;
+		case PEER_REMOVE:
+			DEBUG_LOG(("Removing server %X (%d)", server, resp.stagingRoom.id));
+			resp.stagingRoom.id = t->removeServerFromMap( server );
+			break;
+	}
+
+	TheGameSpyPeerMessageQueue->addResponse(resp);
+}
+
+//-------------------------------------------------------------------------
+
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
new file mode 100644
index 00000000000..959004fc329
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
@@ -0,0 +1,1485 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: PersistentStorageThread.cpp //////////////////////////////////////////////////////
+// GameSpy Persistent Storage thread
+// This thread communicates with GameSpy's persistent storage server
+// and talks through a message queue with the rest of
+// the game.
+// Author: Matthew D. Campbell, July 2002
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/UserPreferences.h"
+#include "Common/PlayerTemplate.h"
+#include "GameNetwork/GameSpy/PersistentStorageThread.h"
+#include "GameNetwork/GameSpy/PeerDefs.h"
+
+#include "mutex.h"
+#include "thread.h"
+
+#include "Common/SubsystemInterface.h"
+
+
+//-------------------------------------------------------------------------
+
+PSRequest::PSRequest()
+{
+	player.reset();
+	requestType = PSREQUEST_READPLAYERSTATS;
+	addDiscon = addDesync = FALSE;
+	lastHouse = -1;
+}
+
+//-------------------------------------------------------------------------
+
+#define DEBUG_MAP(x) for (it = stats.x.begin(); it != stats.x.end(); ++it) \
+{ \
+	if (it->second > 0) \
+	{ \
+		DEBUG_LOG(("%s(%d): %d", #x, it->first, it->second)); \
+	} \
+}
+
+static void debugDumpPlayerStats( const PSPlayerStats& stats )
+{
+	DEBUG_LOG(("-----------------------------------------"));
+	DEBUG_LOG(("Tracking player stats for player %d:", stats.id));
+	PerGeneralMap::const_iterator it;
+	DEBUG_MAP(wins);
+	DEBUG_MAP(losses);
+	DEBUG_MAP(games);
+	DEBUG_MAP(duration);
+	DEBUG_MAP(unitsKilled);
+	DEBUG_MAP(unitsLost);
+	DEBUG_MAP(unitsBuilt);
+	DEBUG_MAP(buildingsKilled);
+	DEBUG_MAP(buildingsLost);
+	DEBUG_MAP(buildingsBuilt);
+	DEBUG_MAP(earnings);
+	DEBUG_MAP(techCaptured);
+	DEBUG_MAP(discons);
+	DEBUG_MAP(desyncs);
+	DEBUG_MAP(surrenders);
+	DEBUG_MAP(gamesOf2p);
+	DEBUG_MAP(gamesOf3p);
+	DEBUG_MAP(gamesOf4p);
+	DEBUG_MAP(gamesOf5p);
+	DEBUG_MAP(gamesOf6p);
+	DEBUG_MAP(gamesOf7p);
+	DEBUG_MAP(gamesOf8p);
+	DEBUG_MAP(customGames);
+	DEBUG_MAP(QMGames);
+
+	if (stats.locale > 0)
+	{
+		DEBUG_LOG(("Locale: %d", stats.locale));
+	}
+
+	if (stats.gamesAsRandom > 0)
+	{
+		DEBUG_LOG(("gamesAsRandom: %d", stats.gamesAsRandom));
+	}
+
+	if (!stats.options.empty())
+	{
+		DEBUG_LOG(("Options: %s", stats.options.c_str()));
+	}
+
+	if (!stats.systemSpec.empty())
+	{
+		DEBUG_LOG(("systemSpec: %s", stats.systemSpec.c_str()));
+	}
+
+	if (stats.lastFPS > 0.0f)
+	{
+		DEBUG_LOG(("lastFPS: %g", stats.lastFPS));
+	}
+
+	if (stats.battleHonors > 0)
+	{
+		DEBUG_LOG(("battleHonors: %x", stats.battleHonors));
+	}
+	if (stats.challengeMedals > 0)
+	{
+		DEBUG_LOG(("challengeMedals: %x", stats.challengeMedals));
+	}
+	if (stats.lastGeneral >= 0)
+	{
+		DEBUG_LOG(("lastGeneral: %d", stats.lastGeneral));
+	}
+	if (stats.gamesInRowWithLastGeneral >= 0)
+	{
+		DEBUG_LOG(("gamesInRowWithLastGeneral: %d", stats.gamesInRowWithLastGeneral));
+	}
+	if (stats.builtSCUD >= 0)
+	{
+		DEBUG_LOG(("builtSCUD: %d", stats.builtSCUD));
+	}
+	if (stats.builtNuke >= 0)
+	{
+		DEBUG_LOG(("builtNuke: %d", stats.builtNuke));
+	}
+	if (stats.builtParticleCannon >= 0)
+	{
+		DEBUG_LOG(("builtParticleCannon: %d", stats.builtParticleCannon));
+	}
+
+	if (stats.winsInARow >= 0)
+	{
+		DEBUG_LOG(("winsInARow: %d", stats.winsInARow));
+	}
+	if (stats.maxWinsInARow >= 0)
+	{
+		DEBUG_LOG(("maxWinsInARow: %d", stats.maxWinsInARow));
+	}
+	if (stats.disconsInARow >= 0)
+	{
+		DEBUG_LOG(("disconsInARow: %d", stats.disconsInARow));
+	}
+	if (stats.maxDisconsInARow >= 0)
+	{
+		DEBUG_LOG(("maxDisconsInARow: %d", stats.maxDisconsInARow));
+	}
+	if (stats.lossesInARow >= 0)
+	{
+		DEBUG_LOG(("lossesInARow: %d", stats.lossesInARow));
+	}
+	if (stats.maxLossesInARow >= 0)
+	{
+		DEBUG_LOG(("maxLossesInARow: %d", stats.maxLossesInARow));
+	}
+	if (stats.desyncsInARow >= 0)
+	{
+		DEBUG_LOG(("desyncsInARow: %d", stats.desyncsInARow));
+	}
+	if (stats.maxDesyncsInARow >= 0)
+	{
+		DEBUG_LOG(("maxDesyncsInARow: %d", stats.maxDesyncsInARow));
+	}
+
+	if (stats.lastLadderPort >= 0)
+	{
+		DEBUG_LOG(("lastLadderPort: %d", stats.lastLadderPort));
+	}
+
+	if (!stats.lastLadderHost.empty())
+	{
+		DEBUG_LOG(("lastLadderHost: %s", stats.lastLadderHost.c_str()));
+	}
+
+
+
+}
+
+//-------------------------------------------------------------------------
+
+#define INCORPORATE_MAP(x) for (it = other.x.begin(); it != other.x.end(); ++it) \
+{ \
+	if (it->second > 0) \
+	{ \
+		x[it->first] = it->second; \
+	} \
+}
+
+void PSPlayerStats::incorporate( const PSPlayerStats& other )
+{
+	PerGeneralMap::const_iterator it;
+	INCORPORATE_MAP(wins);
+	INCORPORATE_MAP(losses);
+	INCORPORATE_MAP(games);
+	INCORPORATE_MAP(duration);
+	INCORPORATE_MAP(unitsKilled);
+	INCORPORATE_MAP(unitsLost);
+	INCORPORATE_MAP(unitsBuilt);
+	INCORPORATE_MAP(buildingsKilled);
+	INCORPORATE_MAP(buildingsLost);
+	INCORPORATE_MAP(buildingsBuilt);
+	INCORPORATE_MAP(earnings);
+	INCORPORATE_MAP(techCaptured);
+
+	//GS  Clear all disconnects so that we don't retain any that were
+	//previously reported as 1 by updateAdditionalGameSpyDisconnections
+	discons.clear();
+	INCORPORATE_MAP(discons);
+
+	INCORPORATE_MAP(desyncs);
+	INCORPORATE_MAP(surrenders);
+	INCORPORATE_MAP(gamesOf2p);
+	INCORPORATE_MAP(gamesOf3p);
+	INCORPORATE_MAP(gamesOf4p);
+	INCORPORATE_MAP(gamesOf5p);
+	INCORPORATE_MAP(gamesOf6p);
+	INCORPORATE_MAP(gamesOf7p);
+	INCORPORATE_MAP(gamesOf8p);
+	INCORPORATE_MAP(customGames);
+	INCORPORATE_MAP(QMGames);
+
+	if (other.locale > 0)
+	{
+		locale = other.locale;
+	}
+
+	if (other.gamesAsRandom > 0)
+	{
+		gamesAsRandom = other.gamesAsRandom;
+	}
+
+	if (!other.options.empty())
+	{
+		options = other.options;
+	}
+
+	if (!other.systemSpec.empty())
+	{
+		systemSpec = other.systemSpec;
+	}
+
+	if (other.lastFPS > 0.0f)
+	{
+		lastFPS = other.lastFPS;
+	}
+
+	if (other.battleHonors > 0)
+	{
+		battleHonors |= other.battleHonors;
+	}
+	if (other.challengeMedals > 0)
+	{
+		challengeMedals |= other.challengeMedals;
+	}
+	if (other.lastGeneral >= 0)
+	{
+		lastGeneral = other.lastGeneral;
+	}
+	if (other.gamesInRowWithLastGeneral >= 0)
+	{
+		gamesInRowWithLastGeneral = other.gamesInRowWithLastGeneral;
+	}
+	if (other.builtParticleCannon >= 0)
+	{
+		builtParticleCannon = other.builtParticleCannon;
+	}
+	if (other.builtNuke >= 0)
+	{
+		builtNuke = other.builtNuke;
+	}
+	if (other.builtSCUD >= 0)
+	{
+		builtSCUD = other.builtSCUD;
+	}
+	if (other.winsInARow >= 0)
+	{
+		winsInARow = other.winsInARow;
+	}
+	if (other.maxWinsInARow >= 0)
+	{
+		maxWinsInARow = other.maxWinsInARow;
+	}
+	if (other.lossesInARow >= 0)
+	{
+		lossesInARow = other.lossesInARow;
+	}
+	if (other.maxLossesInARow >= 0)
+	{
+		maxLossesInARow = other.maxLossesInARow;
+	}
+	if (other.disconsInARow >= 0)
+	{
+		disconsInARow = other.disconsInARow;
+	}
+	if (other.maxDisconsInARow >= 0)
+	{
+		maxDisconsInARow = other.maxDisconsInARow;
+	}
+	if (other.desyncsInARow >= 0)
+	{
+		desyncsInARow = other.desyncsInARow;
+	}
+	if (other.maxDesyncsInARow >= 0)
+	{
+		maxDesyncsInARow = other.maxDesyncsInARow;
+	}
+	if (other.lastLadderPort >= 0)
+	{
+		lastLadderPort = other.lastLadderPort;
+	}
+	if (!other.lastLadderHost.empty())
+	{
+		lastLadderHost = other.lastLadderHost;
+	}
+}
+
+PSPlayerStats::PSPlayerStats( const PSPlayerStats& other )
+{
+	incorporate(other);
+	id = other.id;
+	locale = other.locale;
+	gamesAsRandom = other.gamesAsRandom;
+	options = other.options;
+	systemSpec = other.systemSpec;
+	lastFPS = other.lastFPS;
+	lastGeneral = other.lastGeneral;
+	gamesInRowWithLastGeneral = other.gamesInRowWithLastGeneral;
+	builtParticleCannon = other.builtParticleCannon;
+	builtNuke = other.builtNuke;
+	builtSCUD = other.builtSCUD;
+	challengeMedals = other.challengeMedals;
+	battleHonors = other.battleHonors;
+	winsInARow = other.winsInARow;
+	maxWinsInARow = other.maxWinsInARow;
+	lossesInARow = other.lossesInARow;
+	maxLossesInARow = other.maxLossesInARow;
+	disconsInARow = other.disconsInARow;
+	maxDisconsInARow = other.maxDisconsInARow;
+	desyncsInARow = other.desyncsInARow;
+	maxDesyncsInARow = other.maxDesyncsInARow;
+	lastLadderHost = other.lastLadderHost;
+	lastLadderPort = other.lastLadderPort;
+}
+
+//-------------------------------------------------------------------------
+
+typedef std::queue<PSRequest> RequestQueue;
+typedef std::queue<PSResponse> ResponseQueue;
+class PSThreadClass;
+
+class GameSpyPSMessageQueue : public GameSpyPSMessageQueueInterface
+{
+public:
+	virtual ~GameSpyPSMessageQueue();
+	GameSpyPSMessageQueue();
+	virtual void startThread( void );
+	virtual void endThread( void );
+	virtual Bool isThreadRunning( void );
+
+	virtual void addRequest( const PSRequest& req );
+	virtual Bool getRequest( PSRequest& req );
+
+	virtual void addResponse( const PSResponse& resp );
+	virtual Bool getResponse( PSResponse& resp );
+
+	virtual void trackPlayerStats( PSPlayerStats stats );
+	virtual PSPlayerStats findPlayerStatsByID( Int id );
+
+	PSThreadClass* getThread( void );
+
+	Int getLocalPlayerID(void) { return m_localPlayerID; }
+	void setLocalPlayerID(Int localPlayerID) { m_localPlayerID = localPlayerID; }
+
+	std::string getEmail() { return m_email; }
+	std::string getNick() { return m_nick; }
+	std::string getPassword() { return m_password; }
+
+	void setEmail(std::string email) { m_email = email; }
+	void setNick(std::string nick) { m_nick = nick; }
+	void setPassword(std::string password) { m_password = password; }
+
+private:
+	MutexClass m_requestMutex;
+	MutexClass m_responseMutex;
+	RequestQueue m_requests;
+	ResponseQueue m_responses;
+	PSThreadClass *m_thread;
+	Int m_localPlayerID;
+
+	std::string m_email;
+	std::string m_nick;
+	std::string m_password;
+
+	std::map<Int, PSPlayerStats> m_playerStats;
+};
+
+GameSpyPSMessageQueueInterface* GameSpyPSMessageQueueInterface::createNewMessageQueue( void )
+{
+	return NEW GameSpyPSMessageQueue;
+}
+
+GameSpyPSMessageQueueInterface *TheGameSpyPSMessageQueue = NULL;
+#define MESSAGE_QUEUE ((GameSpyPSMessageQueue *)TheGameSpyPSMessageQueue)
+
+//-------------------------------------------------------------------------
+
+class PSThreadClass : public ThreadClass
+{
+
+public:
+	PSThreadClass() : ThreadClass()
+	{
+		m_loginOK = m_sawLocalData = m_doneTryingToLogin = false;
+		m_opCount = 0;
+	}
+
+	void Thread_Function();
+
+	void persAuthCallback( Bool val ) { m_loginOK = val; m_doneTryingToLogin = true; }
+	void decrOpCount( void ) { --m_opCount; }
+	void incrOpCount( void ) { ++m_opCount; }
+	Int getOpCount( void ) { return m_opCount; }
+	Bool sawLocalPlayerData( void ) { return m_sawLocalData; }
+	void gotLocalPlayerData( void ) { m_sawLocalData = TRUE; }
+
+private:
+	Bool tryConnect( void );
+	Bool tryLogin( Int id, std::string nick, std::string password, std::string email );
+	Bool m_loginOK;
+	Bool m_doneTryingToLogin;
+	Int m_opCount;
+	Bool m_sawLocalData;
+};
+
+
+//-------------------------------------------------------------------------
+
+GameSpyPSMessageQueue::GameSpyPSMessageQueue()
+{
+	m_thread = NULL;
+	m_localPlayerID = 0;
+}
+
+GameSpyPSMessageQueue::~GameSpyPSMessageQueue()
+{
+	endThread();
+}
+
+void GameSpyPSMessageQueue::startThread( void )
+{
+	if (!m_thread)
+	{
+		m_thread = NEW PSThreadClass;
+		m_thread->Execute();
+	}
+	else
+	{
+		if (!m_thread->Is_Running())
+		{
+			m_thread->Execute();
+		}
+	}
+}
+
+void GameSpyPSMessageQueue::endThread( void )
+{
+	delete m_thread;
+	m_thread = NULL;
+}
+
+Bool GameSpyPSMessageQueue::isThreadRunning( void )
+{
+	return (m_thread) ? m_thread->Is_Running() : false;
+}
+
+void GameSpyPSMessageQueue::addRequest( const PSRequest& req )
+{
+	MutexClass::LockClass m(m_requestMutex);
+	if (m.Failed())
+		return;
+
+	m_requests.push(req);
+}
+
+Bool GameSpyPSMessageQueue::getRequest( PSRequest& req )
+{
+	MutexClass::LockClass m(m_requestMutex, 0);
+	if (m.Failed())
+		return false;
+
+	if (m_requests.empty())
+		return false;
+	req = m_requests.front();
+	m_requests.pop();
+	return true;
+}
+
+void GameSpyPSMessageQueue::addResponse( const PSResponse& resp )
+{
+	MutexClass::LockClass m(m_responseMutex);
+	if (m.Failed())
+		return;
+
+	m_responses.push(resp);
+}
+
+Bool GameSpyPSMessageQueue::getResponse( PSResponse& resp )
+{
+	MutexClass::LockClass m(m_responseMutex, 0);
+	if (m.Failed())
+		return false;
+
+	if (m_responses.empty())
+		return false;
+	resp = m_responses.front();
+	m_responses.pop();
+	return true;
+}
+
+PSThreadClass* GameSpyPSMessageQueue::getThread( void )
+{
+	return m_thread;
+}
+
+void GameSpyPSMessageQueue::trackPlayerStats( PSPlayerStats stats )
+{
+#ifdef DEBUG_LOGGING
+	debugDumpPlayerStats( stats );
+	DEBUG_ASSERTCRASH(stats.id != 0, ("Tracking stats with ID of 0"));
+#endif
+	PSPlayerStats newStats;
+	std::map<Int, PSPlayerStats>::iterator it = m_playerStats.find(stats.id);
+	if (it != m_playerStats.end())
+	{
+		newStats = it->second;
+		newStats.incorporate(stats);
+		m_playerStats[stats.id] = newStats;
+	}
+	else
+	{
+		m_playerStats[stats.id] = stats;
+	}
+}
+
+PSPlayerStats GameSpyPSMessageQueue::findPlayerStatsByID( Int id )
+{
+	std::map<Int, PSPlayerStats>::iterator it = m_playerStats.find(id);
+	if (it != m_playerStats.end())
+	{
+		return it->second;
+	}
+
+	PSPlayerStats empty;
+	empty.id = 0;
+	return empty;
+}
+
+//-------------------------------------------------------------------------
+
+Bool PSThreadClass::tryConnect( void )
+{
+	Int result;
+
+	DEBUG_LOG(("m_opCount = %d - opening connection", m_opCount));
+
+	if (IsStatsConnected())
+	{
+		DEBUG_LOG(("connection already open!"));
+		return true;
+	}
+
+	// this may block for 1-2 seconds (according to GS) so it's nice we're not in the UI thread :)
+	result = InitStatsConnection(0);
+
+	if (result != GE_NOERROR)
+	{
+		DEBUG_LOG(("InitStatsConnection() returned %d", result));
+		return false;
+	}
+
+	return true;
+}
+
+static void persAuthCallback(int localid, int profileid, int authenticated, char *errmsg, void *instance)
+{
+	PSThreadClass *t = (PSThreadClass *)instance;
+	DEBUG_LOG(("Auth callback: localid: %d profileid: %d auth: %d err: %s",localid, profileid, authenticated, errmsg));
+	if (t)
+		t->persAuthCallback(authenticated != 0);
+}
+
+Bool PSThreadClass::tryLogin( Int id, std::string nick, std::string password, std::string email )
+{
+	char validate[33];
+	DEBUG_LOG(("PSThreadClass::tryLogin id = %d, nick = %s, password = %s, email = %s", id, nick.c_str(), password.c_str(), email.c_str()));
+	/***********
+	We'll go ahead and start the authentication, using a Presence & Messaging SDK
+	profileid / password.  To generate the new validation token, we'll need to pass
+	in the password for the profile we are authenticating.
+	Again, if this is done in a client/server setting, with the Persistent Storage
+	access being done on the server, and the P&M SDK is used on the client, the
+	server will need to send the challenge (GetChallenge(NULL)) to the client, the
+	client will create the validation token using GenerateAuth, and send it
+	back to the server for use in PreAuthenticatePlayerPM
+	***********/
+	char *munkeeHack = strdup(password.c_str()); // GenerateAuth takes a char*, not a const char* :P
+	GenerateAuth(GetChallenge(NULL), munkeeHack, validate);
+	free (munkeeHack);
+
+	/************
+	After we get the validation token, we pass it and the profileid of the user
+	we are authenticating into PreAuthenticatePlayerPM.
+	We pass the same authentication callback as for the first user, but a different
+	localid this time.
+	************/
+	m_loginOK = false;
+	m_doneTryingToLogin = false;
+	PreAuthenticatePlayerPM(id, id, validate, ::persAuthCallback, this);
+	while (!m_doneTryingToLogin && IsStatsConnected())
+		PersistThink();
+	DEBUG_LOG(("Persistant Storage Login success %d", m_loginOK));
+	return m_loginOK;
+}
+
+static void getPersistentDataCallback(int localid, int profileid, persisttype_t type, int index, int success, time_t modified, char *data, int len, void *instance)
+{
+	DEBUG_LOG(("Data get callback: localid: %d profileid: %d success: %d len: %d data: %s",localid, profileid, success, len, data));
+	PSThreadClass *t = (PSThreadClass *)instance;
+	if (!t)
+		return;
+
+	t->decrOpCount();
+
+	PSResponse resp;
+
+	if (!success)
+	{
+		resp.responseType = PSResponse::PSRESPONSE_COULDNOTCONNECT;
+		resp.player.id = profileid;
+		TheGameSpyPSMessageQueue->addResponse(resp);
+		if (!t->getOpCount() && !t->sawLocalPlayerData())
+		{
+			// we haven't gotten stats for ourselves - try again
+			PSRequest req;
+			req.requestType = PSRequest::PSREQUEST_READPLAYERSTATS;
+			req.player.id = MESSAGE_QUEUE->getLocalPlayerID();
+			TheGameSpyPSMessageQueue->addRequest(req);
+		}
+		return;
+	}
+
+	if (profileid == MESSAGE_QUEUE->getLocalPlayerID() && TheGameSpyGame && TheGameSpyGame->getUseStats())
+	{
+		t->gotLocalPlayerData();
+		DEBUG_LOG(("getPersistentDataCallback() - got local player info"));
+
+		// check if we have discons we should update on the server
+		UserPreferences pref;
+		AsciiString userPrefFilename;
+		userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", MESSAGE_QUEUE->getLocalPlayerID());
+		DEBUG_LOG(("using the file %s", userPrefFilename.str()));
+		pref.load(userPrefFilename);
+		Int addedInDesyncs2 = pref.getInt("0", 0);
+		DEBUG_LOG(("addedInDesyncs2 = %d", addedInDesyncs2));
+		if (addedInDesyncs2 < 0)
+			addedInDesyncs2 = 10;
+		Int addedInDesyncs3 = pref.getInt("1", 0);
+		DEBUG_LOG(("addedInDesyncs3 = %d", addedInDesyncs3));
+		if (addedInDesyncs3 < 0)
+			addedInDesyncs3 = 10;
+		Int addedInDesyncs4 = pref.getInt("2", 0);
+		DEBUG_LOG(("addedInDesyncs4 = %d", addedInDesyncs4));
+		if (addedInDesyncs4 < 0)
+			addedInDesyncs4 = 10;
+		Int addedInDiscons2 = pref.getInt("3", 0);
+		DEBUG_LOG(("addedInDiscons2 = %d", addedInDiscons2));
+		if (addedInDiscons2 < 0)
+			addedInDiscons2 = 10;
+		Int addedInDiscons3 = pref.getInt("4", 0);
+		DEBUG_LOG(("addedInDiscons3 = %d", addedInDiscons3));
+		if (addedInDiscons3 < 0)
+			addedInDiscons3 = 10;
+		Int addedInDiscons4 = pref.getInt("5", 0);
+		DEBUG_LOG(("addedInDiscons4 = %d", addedInDiscons4));
+		if (addedInDiscons4 < 0)
+			addedInDiscons4 = 10;
+
+		DEBUG_LOG(("addedInDesync=%d,%d,%d, addedInDiscon=%d,%d,%d",
+			addedInDesyncs2, addedInDesyncs3, addedInDesyncs4,
+			addedInDiscons2, addedInDiscons3, addedInDiscons4));
+
+		if (addedInDesyncs2 || addedInDesyncs3 || addedInDesyncs4 || addedInDiscons2 || addedInDiscons3 || addedInDiscons4)
+		{
+			DEBUG_LOG(("We have a previous discon we can attempt to update!  Bummer..."));
+
+			PSRequest req;
+			req.requestType = PSRequest::PSREQUEST_UPDATEPLAYERSTATS;
+			req.email = MESSAGE_QUEUE->getEmail();
+			req.nick = MESSAGE_QUEUE->getNick();
+			req.password = MESSAGE_QUEUE->getPassword();
+			req.player = GameSpyPSMessageQueueInterface::parsePlayerKVPairs((len)?data:"");
+			req.player.id = profileid;
+			req.addDesync = FALSE;
+			req.addDiscon = FALSE;
+			req.lastHouse = 0;
+			TheGameSpyPSMessageQueue->addRequest(req);
+		}
+	}
+
+	resp.responseType = PSResponse::PSRESPONSE_PLAYERSTATS;
+	resp.player = GameSpyPSMessageQueueInterface::parsePlayerKVPairs((len)?data:"");
+	resp.player.id = profileid;
+
+	TheGameSpyPSMessageQueue->addResponse(resp);
+}
+
+static void setPersistentDataLocaleCallback(int localid, int profileid, persisttype_t type, int index, int success, time_t modified, void *instance)
+{
+	DEBUG_LOG(("Data save callback: localid: %d profileid: %d success: %d", localid, profileid, success));
+
+	PSThreadClass *t = (PSThreadClass *)instance;
+	if (!t)
+		return;
+
+	t->decrOpCount();
+}
+
+static void setPersistentDataCallback(int localid, int profileid, persisttype_t type, int index, int success, time_t modified, void *instance)
+{
+	DEBUG_LOG(("Data save callback: localid: %d profileid: %d success: %d", localid, profileid, success));
+
+	PSThreadClass *t = (PSThreadClass *)instance;
+	if (!t)
+		return;
+
+	if (success)
+	{
+		UserPreferences pref;
+		AsciiString userPrefFilename;
+		userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", profileid);
+		DEBUG_LOG(("setPersistentDataCallback - writing stats to file %s", userPrefFilename.str()));
+		pref.load(userPrefFilename);
+		pref.clear();
+		pref.write();
+	}
+	t->decrOpCount();
+}
+
+struct CDAuthInfo
+{
+	Bool success;
+	Bool done;
+	Int id;
+};
+
+void preAuthCDCallback(int localid, int profileid, int authenticated, char *errmsg, void *instance)
+{
+	DEBUG_LOG(("preAuthCDCallback(): profileid: %d auth: %d err: %s", profileid, authenticated, errmsg));
+
+	CDAuthInfo *authInfo = (CDAuthInfo *)instance;
+	authInfo->success = authenticated;
+	authInfo->done = TRUE;
+	authInfo->id = profileid;
+}
+
+static void getPreorderCallback(int localid, int profileid, persisttype_t type, int index, int success, time_t modified, char *data, int len, void *instance)
+{
+	PSThreadClass *t = (PSThreadClass *)instance;
+	if (!t)
+		return;
+
+	t->decrOpCount();
+
+	PSResponse resp;
+
+	if (!success)
+	{
+		DEBUG_LOG(("Failed getPreorderCallback()"));
+		return;
+	}
+
+	resp.responseType = PSResponse::PSRESPONSE_PREORDER;
+	resp.preorder = (data && strcmp(data, "\\preorder\\1") == 0);
+	DEBUG_LOG(("getPreorderCallback() - data was '%s'", data));
+
+	TheGameSpyPSMessageQueue->addResponse(resp);
+}
+
+void PSThreadClass::Thread_Function()
+{
+	try {
+	/*********
+	First step, set our game authentication info
+	We could do:
+	Generals:
+		strcpy(gcd_gamename,"ccgenerals");
+		strcpy(gcd_secret_key,"h5T2f6");
+	ZeroHour:
+		strcpy(gcd_gamename,"ccgenzh");
+		strcpy(gcd_secret_key,"D6s9k3");
+	or
+	Generals:
+		strcpy(gcd_gamename,"ccgeneralsb");
+		strcpy(gcd_secret_key,"g3T9s2");
+	ZeroHour:
+		strcpy(gcd_gamename,"ccgeneralsb");
+		strcpy(gcd_secret_key,"whatever the key is");
+	...but this is more secure:
+	**********/
+	/**
+	gcd_gamename[0]='c';gcd_gamename[1]='c';gcd_gamename[2]='g';gcd_gamename[3]='e';
+	gcd_gamename[4]='n';gcd_gamename[5]='e';gcd_gamename[6]='r';gcd_gamename[7]='a';
+	gcd_gamename[8]='l';gcd_gamename[9]='s';gcd_gamename[10]='b';gcd_gamename[11]='\0';
+	gcd_secret_key[0]='g';gcd_secret_key[1]='3';gcd_secret_key[2]='T';gcd_secret_key[3]='9';
+	gcd_secret_key[4]='s';gcd_secret_key[5]='2';gcd_secret_key[6]='\0';
+	/**/
+#if RTS_GENERALS
+	gcd_gamename[0]='c';gcd_gamename[1]='c';gcd_gamename[2]='g';gcd_gamename[3]='e';
+	gcd_gamename[4]='n';gcd_gamename[5]='e';gcd_gamename[6]='r';gcd_gamename[7]='a';
+	gcd_gamename[8]='l';gcd_gamename[9]='s';gcd_gamename[10]='\0';
+	gcd_secret_key[0]='h';gcd_secret_key[1]='5';gcd_secret_key[2]='T';gcd_secret_key[3]='2';
+	gcd_secret_key[4]='f';gcd_secret_key[5]='6';gcd_secret_key[6]='\0';
+#elif RTS_ZEROHOUR
+	gcd_gamename[0]='c';gcd_gamename[1]='c';gcd_gamename[2]='g';gcd_gamename[3]='e';
+	gcd_gamename[4]='n';gcd_gamename[5]='z';gcd_gamename[6]='h';gcd_gamename[7]='\0';
+	gcd_secret_key[0]='D';gcd_secret_key[1]='6';gcd_secret_key[2]='s';gcd_secret_key[3]='9';
+	gcd_secret_key[4]='k';gcd_secret_key[5]='3';gcd_secret_key[6]='\0';
+#endif
+	/**/
+
+	//strcpy(StatsServerHostname, "sdkdev.gamespy.com");
+
+	PSRequest req;
+	while ( running )
+	{
+		// deal with requests
+		if (TheGameSpyPSMessageQueue->getRequest(req))
+		{
+			switch (req.requestType)
+			{
+			case PSRequest::PSREQUEST_SENDGAMERESTOGAMESPY:
+				{
+					if (tryConnect())
+					{
+						NewGame(0);
+#ifdef DEBUG_LOGGING
+						Int res =
+#endif // DEBUG_LOGGING
+							SendGameSnapShot(NULL, req.results.c_str(), SNAP_FINAL);
+						DEBUG_LOG(("Just sent game results - res was %d", res));
+						FreeGame(NULL);
+					}
+				}
+				break;
+			case PSRequest::PSREQUEST_READPLAYERSTATS:
+				{
+					if (!MESSAGE_QUEUE->getLocalPlayerID())
+					{
+						MESSAGE_QUEUE->setLocalPlayerID(req.player.id); // first request is for ourselves
+						MESSAGE_QUEUE->setEmail(req.email);
+						MESSAGE_QUEUE->setNick(req.nick);
+						MESSAGE_QUEUE->setPassword(req.password);
+						DEBUG_LOG(("Setting email/nick/password = %s/%s/%s", req.email.c_str(), req.nick.c_str(), req.password.c_str()));
+					}
+					DEBUG_LOG(("Processing PSRequest::PSREQUEST_READPLAYERSTATS"));
+					if (tryConnect())
+					{
+						incrOpCount();
+						gsi_char keys[] = "";
+						GetPersistDataValues(0, req.player.id, pd_public_rw, 0, keys, getPersistentDataCallback, this);
+					}
+				}
+				break;
+			case PSRequest::PSREQUEST_UPDATEPLAYERLOCALE:
+				{
+					DEBUG_LOG(("Processing PSRequest::PSREQUEST_UPDATEPLAYERLOCALE"));
+					if (tryConnect() && tryLogin(req.player.id, req.nick, req.password, req.email))
+					{
+						char kvbuf[256];
+						sprintf(kvbuf, "\\locale\\%d", req.player.locale);
+						incrOpCount();
+						SetPersistDataValues(0, req.player.id, pd_public_rw, 0, kvbuf, setPersistentDataLocaleCallback, this);
+					}
+				}
+				break;
+			case PSRequest::PSREQUEST_UPDATEPLAYERSTATS:
+				{
+					/*
+					** NOTE THAT THIS IS HIGHLY DEPENDENT ON INI ORDERING FOR THE PLAYERTEMPLATES!!!
+					*/
+					DEBUG_LOG(("Processing PSRequest::PSREQUEST_UPDATEPLAYERSTATS"));
+					UserPreferences pref;
+					AsciiString userPrefFilename;
+					userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", MESSAGE_QUEUE->getLocalPlayerID());
+					DEBUG_LOG(("using the file %s", userPrefFilename.str()));
+					pref.load(userPrefFilename);
+					Int addedInDesyncs2 = pref.getInt("0", 0);
+					DEBUG_LOG(("addedInDesyncs2 = %d", addedInDesyncs2));
+					if (addedInDesyncs2 < 0)
+						addedInDesyncs2 = 10;
+					Int addedInDesyncs3 = pref.getInt("1", 0);
+					DEBUG_LOG(("addedInDesyncs3 = %d", addedInDesyncs3));
+					if (addedInDesyncs3 < 0)
+						addedInDesyncs3 = 10;
+					Int addedInDesyncs4 = pref.getInt("2", 0);
+					DEBUG_LOG(("addedInDesyncs4 = %d", addedInDesyncs4));
+					if (addedInDesyncs4 < 0)
+						addedInDesyncs4 = 10;
+					Int addedInDiscons2 = pref.getInt("3", 0);
+					DEBUG_LOG(("addedInDiscons2 = %d", addedInDiscons2));
+					if (addedInDiscons2 < 0)
+						addedInDiscons2 = 10;
+					Int addedInDiscons3 = pref.getInt("4", 0);
+					DEBUG_LOG(("addedInDiscons3 = %d", addedInDiscons3));
+					if (addedInDiscons3 < 0)
+						addedInDiscons3 = 10;
+					Int addedInDiscons4 = pref.getInt("5", 0);
+					DEBUG_LOG(("addedInDiscons4 = %d", addedInDiscons4));
+					if (addedInDiscons4 < 0)
+						addedInDiscons4 = 10;
+
+					DEBUG_LOG(("req.addDesync=%d, req.addDiscon=%d, addedInDesync=%d,%d,%d, addedInDiscon=%d,%d,%d",
+						req.addDesync, req.addDiscon, addedInDesyncs2, addedInDesyncs3, addedInDesyncs4,
+						addedInDiscons2, addedInDiscons3, addedInDiscons4));
+
+					if (req.addDesync || req.addDiscon)
+					{
+						AsciiString val;
+						if (req.lastHouse == 2)
+						{
+							val.format("%d", addedInDesyncs2 + req.addDesync);
+							pref["0"] = val;
+							val.format("%d", addedInDiscons2 + req.addDiscon);
+							pref["3"] = val;
+							DEBUG_LOG(("house 2 req.addDesync || req.addDiscon: %d %d",
+								addedInDesyncs2 + req.addDesync, addedInDiscons2 + req.addDiscon));
+						}
+						else if (req.lastHouse == 3)
+						{
+							val.format("%d", addedInDesyncs3 + req.addDesync);
+							pref["1"] = val;
+							val.format("%d", addedInDiscons3 + req.addDiscon);
+							pref["4"] = val;
+							DEBUG_LOG(("house 3 req.addDesync || req.addDiscon: %d %d",
+								addedInDesyncs3 + req.addDesync, addedInDiscons3 + req.addDiscon));
+						}
+						else
+						{
+							val.format("%d", addedInDesyncs4 + req.addDesync);
+							pref["2"] = val;
+							val.format("%d", addedInDiscons4 + req.addDiscon);
+							pref["5"] = val;
+							DEBUG_LOG(("house 4 req.addDesync || req.addDiscon: %d %d",
+								addedInDesyncs4 + req.addDesync, addedInDiscons4 + req.addDiscon));
+						}
+						pref.write();
+						if (req.password.empty())
+							return;
+					}
+					if (!req.player.id)
+					{
+						DEBUG_LOG(("Bailing because ID is NULL!"));
+						return;
+					}
+					req.player.desyncs[2] += addedInDesyncs2;
+					req.player.games[2] += addedInDesyncs2;
+					req.player.discons[2] += addedInDiscons2;
+					req.player.games[2] += addedInDiscons2;
+					req.player.desyncs[3] += addedInDesyncs3;
+					req.player.games[3] += addedInDesyncs3;
+					req.player.discons[3] += addedInDiscons3;
+					req.player.games[3] += addedInDiscons3;
+					req.player.desyncs[4] += addedInDesyncs4;
+					req.player.games[4] += addedInDesyncs4;
+					req.player.discons[4] += addedInDiscons4;
+					req.player.games[4] += addedInDiscons4;
+					DEBUG_LOG(("House2: %d/%d/%d, House3: %d/%d/%d, House4: %d/%d/%d",
+						req.player.desyncs[2], req.player.discons[2], req.player.games[2],
+						req.player.desyncs[3], req.player.discons[3], req.player.games[3],
+						req.player.desyncs[4], req.player.discons[4], req.player.games[4]
+						));
+					if (tryConnect() && tryLogin(req.player.id, req.nick, req.password, req.email))
+					{
+						DEBUG_LOG(("Logged in!"));
+						if (TheGameSpyPSMessageQueue)
+							TheGameSpyPSMessageQueue->trackPlayerStats(req.player);
+
+						char *munkeeHack = strdup(GameSpyPSMessageQueueInterface::formatPlayerKVPairs(req.player).c_str()); // GS takes a char* for some reason
+						incrOpCount();
+						DEBUG_LOG(("Setting values %s", munkeeHack));
+						SetPersistDataValues(0, req.player.id, pd_public_rw, 0, munkeeHack, setPersistentDataCallback, this);
+						free(munkeeHack);
+					}
+					else
+					{
+						DEBUG_LOG(("Cannot connect!"));
+						//if (IsStatsConnected())
+							//CloseStatsConnection();
+					}
+				}
+				break;
+			case PSRequest::PSREQUEST_READCDKEYSTATS:
+				{
+					DEBUG_LOG(("Processing PSRequest::PSREQUEST_READCDKEYSTATS"));
+					if (tryConnect())
+					{
+						incrOpCount();
+						CDAuthInfo cdAuthInfo;
+						cdAuthInfo.done = FALSE;
+						cdAuthInfo.success = FALSE;
+						cdAuthInfo.id = 0;
+						char cdkeyHash[33] = "";
+						char validationToken[33] = "";
+						char *munkeeHack = strdup(req.cdkey.c_str()); // GenerateAuth takes a char*, not a const char* :P
+
+						GenerateAuth(GetChallenge(NULL), munkeeHack, validationToken); // validation token
+						GenerateAuth("", munkeeHack, cdkeyHash); // cdkey hash
+
+						free (munkeeHack);
+
+						PreAuthenticatePlayerCD( 0, "preorder", cdkeyHash, validationToken, preAuthCDCallback , &cdAuthInfo);
+
+						while (running && IsStatsConnected() && !cdAuthInfo.done)
+							PersistThink();
+
+						DEBUG_LOG(("Looking for preorder status for %d (success=%d, done=%d) from CDKey %s with hash %s",
+							cdAuthInfo.id, cdAuthInfo.success, cdAuthInfo.done, req.cdkey.c_str(), cdkeyHash));
+						if (cdAuthInfo.done && cdAuthInfo.success)
+						{
+							gsi_char keys[] = "\\preorder";
+							GetPersistDataValues(0, cdAuthInfo.id, pd_public_ro, 0, keys, getPreorderCallback, this);
+						}
+						else
+							decrOpCount();
+					}
+				}
+				break;
+			}
+		}
+
+		// update the network
+		if (IsStatsConnected())
+		{
+			PersistThink();
+			if (m_opCount <= 0)
+			{
+				DEBUG_ASSERTCRASH(m_opCount == 0, ("Negative operations pending!!!"));
+				DEBUG_LOG(("m_opCount = %d - closing connection", m_opCount));
+				CloseStatsConnection();
+				m_opCount = 0;
+			}
+		}
+
+		// end our timeslice
+		Switch_Thread();
+	}
+
+	if (IsStatsConnected())
+		CloseStatsConnection();
+	} catch ( ... ) {
+		DEBUG_CRASH(("Exception in storage thread!"));
+	}
+}
+
+//-------------------------------------------------------------------------
+PSPlayerStats::PSPlayerStats( void )
+{
+	reset();
+}
+
+void PSPlayerStats::reset( void )
+{
+	id = 0;
+	locale = 0;
+	gamesAsRandom = 0;
+	lastFPS = 0;
+	lastGeneral = 0;
+	gamesInRowWithLastGeneral = 0;
+	builtNuke = 0;
+	builtSCUD = 0;
+	builtParticleCannon = 0;
+	challengeMedals = 0;
+	battleHonors = 0;
+	winsInARow = 0;
+	maxWinsInARow = 0;
+	lossesInARow = 0;
+	maxLossesInARow = 0;
+	disconsInARow = 0;
+	maxDisconsInARow = 0;
+	desyncsInARow = 0;
+	maxDesyncsInARow = 0;
+	lastLadderPort = 0;
+	maxQMwinsInARow = 0;
+	QMwinsInARow = 0;
+}
+
+//-------------------------------------------------------------------------
+#define CHECK(x) if (k == #x && generalMarker >= 0) { s.x[generalMarker] = atoi(v.c_str()); continue; }
+
+PSPlayerStats GameSpyPSMessageQueueInterface::parsePlayerKVPairs( std::string kvPairs )
+{
+	PSPlayerStats s;
+	kvPairs.append("\\");
+
+	Int offset = 0;
+	while (1)
+	{
+		Int firstMarker = kvPairs.find_first_of('\\', offset);
+		if (firstMarker < 0)
+			break;
+		Int secondMarker = kvPairs.find_first_of('\\', firstMarker + 1);
+		if (secondMarker < 0)
+			break;
+		Int thirdMarker = kvPairs.find_first_of('\\', secondMarker + 1);
+		if (thirdMarker < 0)
+			break;
+		Int generalMarker = kvPairs.find_last_not_of("0123456789", secondMarker - 1);
+		std::string k, v, g;
+		if (generalMarker == secondMarker - 1)
+		{
+			k = kvPairs.substr(firstMarker + 1, secondMarker - firstMarker - 1);
+			generalMarker = -1;
+		}
+		else
+		{
+			k = kvPairs.substr(firstMarker + 1, generalMarker - firstMarker);
+			g = kvPairs.substr(generalMarker + 1, secondMarker - generalMarker - 1);
+			generalMarker = atoi(g.c_str());
+		}
+		v = kvPairs.substr(secondMarker + 1, thirdMarker - secondMarker - 1);
+		//DEBUG_LOG(("%d [%s] [%s]", generalMarker, k.c_str(), v.c_str()));
+		offset = thirdMarker - 1;
+
+		CHECK(wins);
+		CHECK(losses);
+		CHECK(games);
+		CHECK(duration);
+		CHECK(unitsKilled);
+		CHECK(unitsLost);
+		CHECK(unitsBuilt);
+		CHECK(buildingsKilled);
+		CHECK(buildingsLost);
+		CHECK(buildingsBuilt);
+		CHECK(earnings);
+		CHECK(techCaptured);
+		CHECK(discons);
+		CHECK(desyncs);
+		CHECK(surrenders);
+		CHECK(gamesOf2p);
+		CHECK(gamesOf3p);
+		CHECK(gamesOf4p);
+		CHECK(gamesOf5p);
+		CHECK(gamesOf6p);
+		CHECK(gamesOf7p);
+		CHECK(gamesOf8p);
+		CHECK(customGames);
+		CHECK(QMGames);
+
+		if (k == "locale" && generalMarker < 0)
+		{
+			s.locale = atoi(v.c_str());
+			continue;
+		}
+
+		if (k == "random" && generalMarker < 0)
+		{
+			s.gamesAsRandom = atoi(v.c_str());
+			continue;
+		}
+
+		if (k == "options" && generalMarker < 0)
+		{
+			s.options = v;
+			continue;
+		}
+
+		if (k == "systemSpec" && generalMarker < 0)
+		{
+			s.systemSpec = v;
+			continue;
+		}
+
+		if (k == "fps" && generalMarker < 0)
+		{
+			s.lastFPS = atof(v.c_str());
+			continue;
+		}
+
+		if (k == "lastGeneral" && generalMarker < 0)
+		{
+			s.lastGeneral = atoi(v.c_str());
+			continue;
+		}
+		if (k == "genInRow" && generalMarker < 0)
+		{
+			s.gamesInRowWithLastGeneral = atoi(v.c_str());
+			continue;
+		}
+		if (k == "builtNuke" && generalMarker < 0)
+		{
+			s.builtNuke = atoi(v.c_str());
+			continue;
+		}
+		if (k == "builtSCUD" && generalMarker < 0)
+		{
+			s.builtSCUD = atoi(v.c_str());
+			continue;
+		}
+		if (k == "builtCannon" && generalMarker < 0)
+		{
+			s.builtParticleCannon = atoi(v.c_str());
+			continue;
+		}
+		if (k == "challenge" && generalMarker < 0)
+		{
+			s.challengeMedals = atoi(v.c_str());
+			continue;
+		}
+		if (k == "battle" && generalMarker < 0)
+		{
+			s.battleHonors = atoi(v.c_str());
+			continue;
+		}
+
+		if (k == "WinRow" && generalMarker < 0)
+		{
+			s.winsInARow = atoi(v.c_str());
+			continue;
+		}
+		if (k == "WinRowMax" && generalMarker < 0)
+		{
+			s.maxWinsInARow = atoi(v.c_str());
+			continue;
+		}
+
+		if (k == "LossRow" && generalMarker < 0)
+		{
+			s.lossesInARow = atoi(v.c_str());
+			continue;
+		}
+		if (k == "LossRowMax" && generalMarker < 0)
+		{
+			s.maxLossesInARow = atoi(v.c_str());
+			continue;
+		}
+
+		if (k == "DSRow" && generalMarker < 0)
+		{
+			s.desyncsInARow = atoi(v.c_str());
+			continue;
+		}
+		if (k == "DSRowMax" && generalMarker < 0)
+		{
+			s.maxDesyncsInARow = atoi(v.c_str());
+			continue;
+		}
+
+		if (k == "DCRow" && generalMarker < 0)
+		{
+			s.disconsInARow = atoi(v.c_str());
+			continue;
+		}
+		if (k == "DCRowMax" && generalMarker < 0)
+		{
+			s.maxDisconsInARow = atoi(v.c_str());
+			continue;
+		}
+
+		if (k == "ladderPort" && generalMarker < 0)
+		{
+			s.lastLadderPort = atoi(v.c_str());
+			continue;
+		}
+		if (k == "ladderHost" && generalMarker < 0)
+		{
+			s.lastLadderHost = v;
+			continue;
+		}
+
+		//DEBUG_ASSERTCRASH(generalMarker >= 0, ("Unknown KV Pair in persistent storage: [%s] = [%s]", k.c_str(), v.c_str()));
+		//DEBUG_ASSERTCRASH(generalMarker  < 0, ("Unknown KV Pair in persistent storage for PlayerTemplate %d: [%s] = [%s]", generalMarker, k.c_str(), v.c_str()));
+	}
+
+	return s;
+}
+
+#define ITERATE_OVER(x) for (it = stats.x.begin(); it != stats.x.end(); ++it) \
+{ \
+	if (it->second > 0) \
+	{ \
+		sprintf(kvbuf, "\\" #x "%d\\%d", it->first, it->second); \
+		s.append(kvbuf); \
+	} \
+}
+
+#include "Common/PlayerTemplate.h"
+
+std::string GameSpyPSMessageQueueInterface::formatPlayerKVPairs( PSPlayerStats stats )
+{
+	char kvbuf[256];
+	std::string s;
+	PerGeneralMap::iterator it;
+
+	ITERATE_OVER(wins);
+	ITERATE_OVER(losses);
+	ITERATE_OVER(games);
+	ITERATE_OVER(duration);
+	ITERATE_OVER(unitsKilled);
+	ITERATE_OVER(unitsLost);
+	ITERATE_OVER(unitsBuilt);
+	ITERATE_OVER(buildingsKilled);
+	ITERATE_OVER(buildingsLost);
+	ITERATE_OVER(buildingsBuilt);
+	ITERATE_OVER(earnings);
+	ITERATE_OVER(techCaptured);
+
+	//GS  Report all disconnects, even if zero, because might have been
+	//previously reported as 1 by updateAdditionalGameSpyDisconnections
+//	ITERATE_OVER(discons);
+	for (Int ptIdx = 0; ptIdx < ThePlayerTemplateStore->getPlayerTemplateCount(); ++ptIdx)
+	{
+//		const PlayerTemplate* pTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(ptIdx);
+//		const GeneralPersona* pGeneral = TheChallengeGenerals->getGeneralByTemplateName(pTemplate->getName());
+//		BOOL isReported = pGeneral ? pGeneral->isStartingEnabled() : FALSE;
+//		if( !isReported )
+//			continue;  //don't report unplayable templates (observer, boss, etc.)
+
+		sprintf(kvbuf, "\\discons%d\\%d", ptIdx, stats.discons[ptIdx]);
+		s.append(kvbuf);
+	}
+
+	ITERATE_OVER(desyncs);
+	ITERATE_OVER(surrenders);
+	ITERATE_OVER(gamesOf2p);
+	ITERATE_OVER(gamesOf3p);
+	ITERATE_OVER(gamesOf4p);
+	ITERATE_OVER(gamesOf5p);
+	ITERATE_OVER(gamesOf6p);
+	ITERATE_OVER(gamesOf7p);
+	ITERATE_OVER(gamesOf8p);
+	ITERATE_OVER(customGames);
+	ITERATE_OVER(QMGames);
+
+	if (stats.locale > 0)
+	{
+		sprintf(kvbuf, "\\locale\\%d", stats.locale);
+		s.append(kvbuf);
+	}
+
+	if (stats.gamesAsRandom > 0)
+	{
+		sprintf(kvbuf, "\\random\\%d", stats.gamesAsRandom);
+		s.append(kvbuf);
+	}
+
+	if (!stats.options.empty())
+	{
+		snprintf(kvbuf, 256, "\\options\\%s", stats.options.c_str());
+		s.append(kvbuf);
+	}
+
+	if (!stats.systemSpec.empty())
+	{
+		snprintf(kvbuf, 256, "\\systemSpec\\%s", stats.systemSpec.c_str());
+		s.append(kvbuf);
+	}
+
+	if (stats.lastFPS > 0.0f)
+	{
+		sprintf(kvbuf, "\\fps\\%g", stats.lastFPS);
+		s.append(kvbuf);
+	}
+	if (stats.lastGeneral >= 0)
+	{
+		sprintf(kvbuf, "\\lastGeneral\\%d", stats.lastGeneral);
+		s.append(kvbuf);
+	}
+	if (stats.gamesInRowWithLastGeneral >= 0)
+	{
+		sprintf(kvbuf, "\\genInRow\\%d", stats.gamesInRowWithLastGeneral);
+		s.append(kvbuf);
+	}
+	if (stats.builtParticleCannon >= 0)
+	{
+		sprintf(kvbuf, "\\builtCannon\\%d", stats.builtParticleCannon);
+		s.append(kvbuf);
+	}
+	if (stats.builtNuke >= 0)
+	{
+		sprintf(kvbuf, "\\builtNuke\\%d", stats.builtNuke);
+		s.append(kvbuf);
+	}
+	if (stats.builtSCUD >= 0)
+	{
+		sprintf(kvbuf, "\\builtSCUD\\%d", stats.builtSCUD);
+		s.append(kvbuf);
+	}
+	if (stats.challengeMedals > 0)
+	{
+		sprintf(kvbuf, "\\challenge\\%d", stats.challengeMedals);
+		s.append(kvbuf);
+	}
+	if (stats.battleHonors > 0)
+	{
+		sprintf(kvbuf, "\\battle\\%d", stats.battleHonors);
+		s.append(kvbuf);
+	}
+
+	//if (stats.winsInARow > 0)
+	{
+		sprintf(kvbuf, "\\WinRow\\%d", stats.winsInARow);
+		s.append(kvbuf);
+	}
+	if (stats.maxWinsInARow > 0)
+	{
+		sprintf(kvbuf, "\\WinRowMax\\%d", stats.maxWinsInARow);
+		s.append(kvbuf);
+	}
+
+	//if (stats.lossesInARow > 0)
+	{
+		sprintf(kvbuf, "\\LossRow\\%d", stats.lossesInARow);
+		s.append(kvbuf);
+	}
+	if (stats.maxLossesInARow > 0)
+	{
+		sprintf(kvbuf, "\\LossRowMax\\%d", stats.maxLossesInARow);
+		s.append(kvbuf);
+	}
+
+	//if (stats.disconsInARow > 0)
+	{
+		sprintf(kvbuf, "\\DCRow\\%d", stats.disconsInARow);
+		s.append(kvbuf);
+	}
+	if (stats.maxDisconsInARow > 0)
+	{
+		sprintf(kvbuf, "\\DCRowMax\\%d", stats.maxDisconsInARow);
+		s.append(kvbuf);
+	}
+
+	//if (stats.desyncsInARow > 0)
+	{
+		sprintf(kvbuf, "\\DSRow\\%d", stats.desyncsInARow);
+		s.append(kvbuf);
+	}
+	if (stats.maxDesyncsInARow > 0)
+	{
+		sprintf(kvbuf, "\\DSRowMax\\%d", stats.maxDesyncsInARow);
+		s.append(kvbuf);
+	}
+
+	if (stats.lastLadderPort > 0)
+	{
+		sprintf(kvbuf, "\\ladderPort\\%d", stats.lastLadderPort);
+		s.append(kvbuf);
+	}
+	if (!stats.lastLadderHost.empty())
+	{
+		snprintf(kvbuf, 256, "\\ladderHost\\%s", stats.lastLadderHost.c_str());
+		s.append(kvbuf);
+	}
+
+	DEBUG_LOG(("Formatted persistent values as '%s'", s.c_str()));
+	return s;
+}
+
+//-------------------------------------------------------------------------
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp
new file mode 100644
index 00000000000..a4e3630150c
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp
@@ -0,0 +1,573 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: PingThread.cpp //////////////////////////////////////////////////////
+// Ping thread
+// Author: Matthew D. Campbell, August 2002
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include <winsock.h>	// This one has to be here. Prevents collisions with windsock2.h
+
+#include "GameNetwork/GameSpy/PingThread.h"
+#include "mutex.h"
+#include "thread.h"
+
+#include "Common/SubsystemInterface.h"
+
+//-------------------------------------------------------------------------
+
+static const Int NumWorkerThreads = 10;
+
+typedef std::queue<PingRequest> RequestQueue;
+typedef std::queue<PingResponse> ResponseQueue;
+class PingThreadClass;
+
+class Pinger : public PingerInterface
+{
+public:
+	virtual ~Pinger();
+	Pinger();
+	virtual void startThreads( void );
+	virtual void endThreads( void );
+	virtual Bool areThreadsRunning( void );
+
+	virtual void addRequest( const PingRequest& req );
+	virtual Bool getRequest( PingRequest& resp );
+
+	virtual void addResponse( const PingResponse& resp );
+	virtual Bool getResponse( PingResponse& resp );
+
+	virtual Bool arePingsInProgress( void );
+	virtual Int getPing( AsciiString hostname );
+
+	virtual void clearPingMap( void );
+	virtual AsciiString getPingString( Int timeout );
+
+private:
+	MutexClass m_requestMutex;
+	MutexClass m_responseMutex;
+	MutexClass m_pingMapMutex;
+	RequestQueue m_requests;
+	ResponseQueue m_responses;
+	Int m_requestCount;
+	Int m_responseCount;
+
+	std::map<std::string, Int> m_pingMap;
+
+	PingThreadClass *m_workerThreads[NumWorkerThreads];
+};
+
+PingerInterface* PingerInterface::createNewPingerInterface( void )
+{
+	return NEW Pinger;
+}
+
+PingerInterface *ThePinger;
+
+//-------------------------------------------------------------------------
+
+class PingThreadClass : public ThreadClass
+{
+
+public:
+	PingThreadClass() : ThreadClass() {}
+
+	void Thread_Function();
+
+private:
+	Int doPing( UnsignedInt IP, Int timeout );
+};
+
+
+//-------------------------------------------------------------------------
+
+Pinger::Pinger() : m_requestCount(0), m_responseCount(0)
+{
+	for (Int i=0; i<NumWorkerThreads; ++i)
+	{
+		m_workerThreads[i] = NULL;
+	}
+}
+
+Pinger::~Pinger()
+{
+	endThreads();
+}
+
+void Pinger::startThreads( void )
+{
+	endThreads();
+	for (Int i=0; i<NumWorkerThreads; ++i)
+	{
+		m_workerThreads[i] = NEW PingThreadClass;
+		m_workerThreads[i]->Execute();
+	}
+}
+
+void Pinger::endThreads( void )
+{
+	for (Int i=0; i<NumWorkerThreads; ++i)
+	{
+		delete m_workerThreads[i];
+		m_workerThreads[i] = NULL;
+	}
+}
+
+Bool Pinger::areThreadsRunning( void )
+{
+	for (Int i=0; i<NumWorkerThreads; ++i)
+	{
+		if (m_workerThreads[i])
+		{
+			if (m_workerThreads[i]->Is_Running())
+				return true;
+		}
+	}
+	return false;
+}
+
+void Pinger::addRequest( const PingRequest& req )
+{
+	MutexClass::LockClass m(m_requestMutex);
+
+	++m_requestCount;
+	m_requests.push(req);
+}
+
+Bool Pinger::getRequest( PingRequest& req )
+{
+	MutexClass::LockClass m(m_requestMutex, 0);
+	if (m.Failed())
+		return false;
+
+	if (m_requests.empty())
+		return false;
+	req = m_requests.front();
+	m_requests.pop();
+	return true;
+}
+
+void Pinger::addResponse( const PingResponse& resp )
+{
+	{
+		MutexClass::LockClass m(m_pingMapMutex);
+
+		m_pingMap[resp.hostname] = resp.avgPing;
+	}
+	{
+		MutexClass::LockClass m(m_responseMutex);
+
+		++m_responseCount;
+		m_responses.push(resp);
+	}
+}
+
+Bool Pinger::getResponse( PingResponse& resp )
+{
+	MutexClass::LockClass m(m_responseMutex, 0);
+	if (m.Failed())
+		return false;
+
+	if (m_responses.empty())
+		return false;
+	resp = m_responses.front();
+	m_responses.pop();
+	return true;
+}
+
+Bool Pinger::arePingsInProgress( void )
+{
+	return (m_requestCount != m_responseCount);
+}
+
+Int Pinger::getPing( AsciiString hostname )
+{
+	MutexClass::LockClass m(m_pingMapMutex, 0);
+	if (m.Failed())
+		return false;
+
+	std::map<std::string, Int>::const_iterator it = m_pingMap.find(hostname.str());
+	if (it != m_pingMap.end())
+		return it->second;
+
+	return -1;
+}
+
+void Pinger::clearPingMap( void )
+{
+	MutexClass::LockClass m(m_pingMapMutex);
+	m_pingMap.clear();
+}
+
+AsciiString Pinger::getPingString( Int timeout )
+{
+	MutexClass::LockClass m(m_pingMapMutex);
+
+	AsciiString pingString;
+	AsciiString tmp;
+	for (std::map<std::string, Int>::const_iterator it = m_pingMap.begin(); it != m_pingMap.end(); ++it)
+	{
+		Int ping = it->second;
+		if (ping < 0 || ping > timeout)
+			ping = timeout;
+		ping = ping * 255 / timeout;
+		tmp.format("%2.2X", ping);
+		pingString.concat(tmp);
+	}
+	return pingString;
+}
+
+//-------------------------------------------------------------------------
+
+void PingThreadClass::Thread_Function()
+{
+	try {
+	PingRequest req;
+
+	WSADATA wsaData;
+
+	// Fire up winsock (prob already done, but doesn't matter)
+	WORD wVersionRequested = MAKEWORD(1, 1);
+	WSAStartup( wVersionRequested, &wsaData );
+
+	while ( running )
+	{
+		// deal with requests
+		if (ThePinger->getRequest(req))
+		{
+			// resolve the hostname
+			const char *hostnameBuffer = req.hostname.c_str();
+			UnsignedInt IP = 0xFFFFFFFF;
+			if (isdigit(hostnameBuffer[0]))
+			{
+				IP = inet_addr(hostnameBuffer);
+				in_addr hostNode;
+				hostNode.s_addr = IP;
+				DEBUG_LOG(("pinging %s - IP = %s", hostnameBuffer, inet_ntoa(hostNode) ));
+			}
+			else
+			{
+				HOSTENT *hostStruct;
+				in_addr *hostNode;
+				hostStruct = gethostbyname(hostnameBuffer);
+				if (hostStruct == NULL)
+				{
+					DEBUG_LOG(("pinging %s - host lookup failed", hostnameBuffer));
+
+					// Even though this failed to resolve IP, still need to send a
+					//   callback.
+					IP = 0xFFFFFFFF;   // flag for IP resolve failed
+				}
+				else
+				{
+					hostNode = (in_addr *) hostStruct->h_addr;
+					IP = hostNode->s_addr;
+					DEBUG_LOG(("pinging %s IP = %s", hostnameBuffer, inet_ntoa(*hostNode) ));
+				}
+			}
+
+			// do ping
+			Int totalPing = 0;
+			Int goodReps = 0;
+			Int reps = req.repetitions;
+			while (reps-- && running && IP != 0xFFFFFFFF)
+			{
+				Int ping = doPing(IP, req.timeout);
+				if (ping >= 0)
+				{
+					totalPing += ping;
+					++goodReps;
+				}
+
+				// end our timeslice
+				Switch_Thread();
+			}
+			if (!goodReps)
+				totalPing = -1;
+			else
+				totalPing = totalPing / goodReps;
+
+			PingResponse resp;
+			resp.hostname = req.hostname;
+			resp.avgPing = totalPing;
+			resp.repetitions = goodReps;
+			ThePinger->addResponse(resp);
+		}
+
+		// end our timeslice
+		Switch_Thread();
+	}
+
+	WSACleanup();
+	} catch ( ... ) {
+		DEBUG_CRASH(("Exception in ping thread!"));
+	}
+}
+
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+
+HANDLE WINAPI IcmpCreateFile(VOID); /* INVALID_HANDLE_VALUE on error */
+BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle); /* FALSE on error */
+
+/* Note 2: For the most part, you can refer to RFC 791 for detials
+ * on how to fill in values for the IP option information structure.
+ */
+typedef struct ip_option_information
+{
+   UnsignedByte Ttl;         /* Time To Live (used for traceroute) */
+   UnsignedByte Tos;         /* Type Of Service (usually 0) */
+   UnsignedByte Flags;       /* IP header flags (usually 0) */
+   UnsignedByte OptionsSize; /* Size of options data (usually 0, max 40) */
+   UnsignedByte FAR *OptionsData;   /* Options data buffer */
+}
+IPINFO, *PIPINFO, FAR *LPIPINFO;
+
+
+/* Note 1: The Reply Buffer will have an array of ICMP_ECHO_REPLY
+ * structures, followed by options and the data in ICMP echo reply
+ * datagram received. You must have room for at least one ICMP
+ * echo reply structure, plus 8 bytes for an ICMP header.
+ */
+typedef struct icmp_echo_reply
+{
+   UnsignedInt Address;     /* source address */
+   ////////UnsignedInt Status;      /* IP status value (see below) */
+   UnsignedInt RTTime;      /* Round Trip Time in milliseconds */
+   UnsignedShort DataSize;   /* reply data size */
+   UnsignedShort Reserved;   /* */
+   void FAR *Data;     /* reply data buffer */
+   struct ip_option_information Options; /* reply options */
+}
+ICMPECHO, *PICMPECHO, FAR *LPICMPECHO;
+
+
+DWORD WINAPI IcmpSendEcho(
+   HANDLE IcmpHandle,   /* handle returned from IcmpCreateFile() */
+   UnsignedInt DestAddress,  /* destination IP address (in network order) */
+   LPVOID RequestData,  /* pointer to buffer to send */
+   WORD RequestSize,    /* length of data in buffer */
+   LPIPINFO RequestOptns,   /* see Note 2 */
+   LPVOID ReplyBuffer,  /* see Note 1 */
+   DWORD ReplySize,     /* length of reply (must allow at least 1 reply) */
+   DWORD Timeout       /* time in milliseconds to wait for reply */
+);
+
+
+#define IP_STATUS_BASE 11000
+#define IP_SUCCESS 0
+#define IP_BUF_TOO_SMALL (IP_STATUS_BASE + 1)
+#define IP_DEST_NET_UNREACHABLE (IP_STATUS_BASE + 2)
+#define IP_DEST_HOST_UNREACHABLE (IP_STATUS_BASE + 3)
+#define IP_DEST_PROT_UNREACHABLE (IP_STATUS_BASE + 4)
+#define IP_DEST_PORT_UNREACHABLE (IP_STATUS_BASE + 5)
+#define IP_NO_RESOURCES (IP_STATUS_BASE + 6)
+#define IP_BAD_OPTION (IP_STATUS_BASE + 7)
+#define IP_HW_ERROR (IP_STATUS_BASE + 8)
+#define IP_PACKET_TOO_BIG (IP_STATUS_BASE + 9)
+#define IP_REQ_TIMED_OUT (IP_STATUS_BASE + 10)
+#define IP_BAD_REQ (IP_STATUS_BASE + 11)
+#define IP_BAD_ROUTE (IP_STATUS_BASE + 12)
+#define IP_TTL_EXPIRED_TRANSIT (IP_STATUS_BASE + 13)
+#define IP_TTL_EXPIRED_REASSEM (IP_STATUS_BASE + 14)
+#define IP_PARAM_PROBLEM (IP_STATUS_BASE + 15)
+#define IP_SOURCE_QUENCH (IP_STATUS_BASE + 16)
+#define IP_OPTION_TOO_BIG (IP_STATUS_BASE + 17)
+#define IP_BAD_DESTINATION (IP_STATUS_BASE + 18)
+#define IP_ADDR_DELETED (IP_STATUS_BASE + 19)
+#define IP_SPEC_MTU_CHANGE (IP_STATUS_BASE + 20)
+#define IP_MTU_CHANGE (IP_STATUS_BASE + 21)
+#define IP_UNLOAD (IP_STATUS_BASE + 22)
+#define IP_GENERAL_FAILURE (IP_STATUS_BASE + 50)
+#define MAX_IP_STATUS IP_GENERAL_FAILURE
+#define IP_PENDING (IP_STATUS_BASE + 255)
+
+
+#define BUFSIZE     8192
+#define DEFAULT_LEN 32
+#define LOOPLIMIT   4
+#define DEFAULT_TTL 64
+
+Int PingThreadClass::doPing(UnsignedInt IP, Int timeout)
+{
+   /*
+    * Initialize default settings
+    */
+
+   IPINFO stIPInfo, *lpstIPInfo;
+   HANDLE hICMP, hICMP_DLL;
+   int i, j, nDataLen, nLoopLimit, nTimeOut, nTTL, nTOS;
+   DWORD dwReplyCount;
+   ///////IN_ADDR stDestAddr;
+   BOOL fRet, fDontStop;
+   ///BOOL fTraceRoute;
+
+   nDataLen = DEFAULT_LEN;
+   nLoopLimit = LOOPLIMIT;
+   nTimeOut = timeout;
+   fDontStop = FALSE;
+   lpstIPInfo = NULL;
+   nTTL = DEFAULT_TTL;
+   nTOS = 0;
+
+   Int pingTime = -1;  // in case of error
+
+   char achReqData[BUFSIZE];
+   char achRepData[sizeof(ICMPECHO) + BUFSIZE];
+
+
+   HANDLE ( WINAPI *lpfnIcmpCreateFile )( VOID ) = NULL;
+   BOOL ( WINAPI *lpfnIcmpCloseHandle )( HANDLE ) = NULL;
+   DWORD (WINAPI *lpfnIcmpSendEcho)(HANDLE, DWORD, LPVOID, WORD, LPVOID,
+                                    LPVOID, DWORD, DWORD) = NULL;
+
+
+   /*
+    *  Load the ICMP.DLL
+    */
+   hICMP_DLL = LoadLibrary("ICMP.DLL");
+   if (hICMP_DLL == 0)
+   {
+      DEBUG_LOG(("LoadLibrary() failed: Unable to locate ICMP.DLL!"));
+      goto cleanup;
+   }
+
+   /*
+    * Get pointers to ICMP.DLL functions
+    */
+   lpfnIcmpCreateFile = (void * (__stdcall *)(void))GetProcAddress( (HINSTANCE)hICMP_DLL, "IcmpCreateFile");
+   lpfnIcmpCloseHandle = (int (__stdcall *)(void *))GetProcAddress( (HINSTANCE)hICMP_DLL, "IcmpCloseHandle");
+   lpfnIcmpSendEcho = (unsigned long (__stdcall *)(void *, unsigned long, void *, unsigned short,
+                       void *, void *, unsigned long, unsigned long))GetProcAddress( (HINSTANCE)hICMP_DLL, "IcmpSendEcho" );
+
+   if ((!lpfnIcmpCreateFile) ||
+         (!lpfnIcmpCloseHandle) ||
+         (!lpfnIcmpSendEcho))
+   {
+      DEBUG_LOG(("GetProcAddr() failed for at least one function."));
+      goto cleanup;
+   }
+
+
+   /*
+    * IcmpCreateFile() - Open the ping service
+    */
+   hICMP = (HANDLE) lpfnIcmpCreateFile();
+   if (hICMP == INVALID_HANDLE_VALUE)
+   {
+      DEBUG_LOG(("IcmpCreateFile() failed"));
+      goto cleanup;
+   }
+
+   /*
+    * Init data buffer printable ASCII
+    *  32 (space) through 126 (tilde)
+    */
+   for (j = 0, i = 32; j < nDataLen; j++, i++)
+   {
+      if (i >= 126)
+         i = 32;
+      achReqData[j] = i;
+   }
+
+   /*
+   * Init IPInfo structure
+   */
+   lpstIPInfo = &stIPInfo;
+   stIPInfo.Ttl = nTTL;
+   stIPInfo.Tos = nTOS;
+   stIPInfo.Flags = 0;
+   stIPInfo.OptionsSize = 0;
+   stIPInfo.OptionsData = NULL;
+
+
+
+   /*
+    * IcmpSendEcho() - Send the ICMP Echo Request
+    *                   and read the Reply
+    */
+   dwReplyCount = lpfnIcmpSendEcho(
+                     hICMP,
+                     IP,
+                     achReqData,
+                     nDataLen,
+                     lpstIPInfo,
+                     achRepData,
+                     sizeof(achRepData),
+                     nTimeOut);
+   if (dwReplyCount != 0)
+   {
+      //////////IN_ADDR stDestAddr;
+      DWORD dwStatus;
+
+      pingTime = (*(UnsignedInt *) & (achRepData[8]));
+
+      // I've seen the ping time bigger than the timeout by a little
+      //   bit.  How lame.
+      if (pingTime > timeout)
+         pingTime = timeout;
+
+      dwStatus = *(DWORD *) & (achRepData[4]);
+      if (dwStatus != IP_SUCCESS)
+      {
+         DEBUG_LOG(("ICMPERR: %d", dwStatus));
+      }
+
+   }
+   else
+   {
+      DEBUG_LOG(("IcmpSendEcho() failed: %d", dwReplyCount));
+      // Ok we didn't get a packet, just say everything's OK
+      //  and the time was -1
+      pingTime = -1;
+      goto cleanup;
+   }
+
+
+   /*
+    * IcmpCloseHandle - Close the ICMP handle
+    */
+   fRet = lpfnIcmpCloseHandle(hICMP);
+   if (fRet == FALSE)
+   {
+      DEBUG_LOG(("Error closing ICMP handle"));
+   }
+
+   // Say what you will about goto's but it's handy for stuff like this
+cleanup:
+
+   // Shut down...
+   if (hICMP_DLL)
+      FreeLibrary((HINSTANCE)hICMP_DLL);
+
+   return pingTime;
+}
+
+
+//-------------------------------------------------------------------------
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
new file mode 100644
index 00000000000..fedf8d86988
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
@@ -0,0 +1,81 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: ThreadUtils.cpp //////////////////////////////////////////////////////
+// GameSpy thread utils
+// Author: Matthew D. Campbell, July 2002
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+//-------------------------------------------------------------------------
+
+std::wstring MultiByteToWideCharSingleLine( const char *orig )
+{
+	Int len = strlen(orig);
+	WideChar *dest = NEW WideChar[len+1];
+
+	MultiByteToWideChar(CP_UTF8, 0, orig, -1, dest, len);
+	WideChar *c = NULL;
+	do
+	{
+		c = wcschr(dest, L'\n');
+		if (c)
+		{
+			*c = L' ';
+		}
+	}
+	while ( c != NULL );
+	do
+	{
+		c = wcschr(dest, L'\r');
+		if (c)
+		{
+			*c = L' ';
+		}
+	}
+	while ( c != NULL );
+
+	dest[len] = 0;
+	std::wstring ret = dest;
+	delete[] dest;
+	return ret;
+}
+
+std::string WideCharStringToMultiByte( const WideChar *orig )
+{
+	std::string ret;
+	Int len = WideCharToMultiByte( CP_UTF8, 0, orig, wcslen(orig), NULL, 0, NULL, NULL ) + 1;
+	if (len > 0)
+	{
+		char *dest = NEW char[len];
+		WideCharToMultiByte( CP_UTF8, 0, orig, -1, dest, len, NULL, NULL );
+		dest[len-1] = 0;
+		ret = dest;
+		delete[] dest;
+	}
+	return ret;
+}
+
+//-------------------------------------------------------------------------
+
diff --git a/Core/GameEngine/Source/GameNetwork/GameSpyOverlay.cpp b/Core/GameEngine/Source/GameNetwork/GameSpyOverlay.cpp
new file mode 100644
index 00000000000..10af680e1b0
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/GameSpyOverlay.cpp
@@ -0,0 +1,333 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: wolscreens.cpp //////////////////////////////////////////////////////
+// Westwood Online screen setup/teardown
+// Author: Matthew D. Campbell, November 2001
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+#include "Common/AudioEventRTS.h"
+
+#include "GameClient/GadgetListBox.h"
+#include "GameClient/GameText.h"
+#include "GameClient/MessageBox.h"
+#include "GameClient/ShellHooks.h"
+//#include "GameNetwork/GameSpy.h"
+//#include "GameNetwork/GameSpyGP.h"
+
+#include "GameNetwork/GameSpyOverlay.h"
+//#include "GameNetwork/GameSpy/PeerDefs.h"
+#include "GameNetwork/GameSpy/BuddyThread.h"
+
+void deleteNotificationBox( void );
+static void raiseOverlays( void );
+
+// Message boxes -------------------------------------
+static GameWindow *messageBoxWindow = NULL;
+static GameWinMsgBoxFunc okFunc = NULL;
+static GameWinMsgBoxFunc cancelFunc = NULL;
+static Bool reOpenPlayerInfoFlag = FALSE;
+/**
+	* messageBoxOK is called when a message box is destroyed
+	* by way of an OK button, so we can clear our pointers to it.
+	*/
+static void messageBoxOK( void )
+{
+	DEBUG_ASSERTCRASH(messageBoxWindow, ("Message box window went away without being there in the first place!"));
+	messageBoxWindow = NULL;
+	if (okFunc)
+	{
+		okFunc();
+		okFunc = NULL;
+	}
+}
+
+/**
+	* messageBoxCancel is called when a message box is destroyed
+	* by way of a Cancel button, so we can clear our pointers to it.
+	*/
+static void messageBoxCancel( void )
+{
+	DEBUG_ASSERTCRASH(messageBoxWindow, ("Message box window went away without being there in the first place!"));
+	messageBoxWindow = NULL;
+	if (cancelFunc)
+	{
+		cancelFunc();
+		cancelFunc = NULL;
+	}
+}
+
+/**
+	* clearGSMessageBoxes removes the current message box if
+	* one is present.  This is usually done when putting up a
+	* second messageBox.
+	*/
+void ClearGSMessageBoxes( void )
+{
+	if (messageBoxWindow)
+	{
+		TheWindowManager->winDestroy(messageBoxWindow);
+		messageBoxWindow = NULL;
+	}
+
+	if (okFunc)
+	{
+		okFunc = NULL;
+	}
+
+	if (cancelFunc)
+	{
+		cancelFunc = NULL;
+	}
+}
+
+/**
+	* GSMessageBoxOk puts up an OK dialog box and saves the
+	* pointers to it and its callbacks.
+	*/
+void GSMessageBoxOk(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc newOkFunc)
+{
+	ClearGSMessageBoxes();
+	messageBoxWindow = MessageBoxOk(title, message, messageBoxOK);
+	okFunc = newOkFunc;
+}
+
+/**
+	* GSMessageBoxOkCancel puts up an OK/Cancel dialog box and saves the
+	* pointers to it and its callbacks.
+	*/
+void GSMessageBoxOkCancel(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc newOkFunc, GameWinMsgBoxFunc newCancelFunc)
+{
+	ClearGSMessageBoxes();
+	messageBoxWindow = MessageBoxOkCancel(title, message, messageBoxOK, messageBoxCancel);
+	okFunc = newOkFunc;
+	cancelFunc = newCancelFunc;
+}
+
+/**
+	* GSMessageBoxYesNo puts up a Yes/No dialog box and saves the
+	* pointers to it and its callbacks.
+	*/
+void GSMessageBoxYesNo(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc newYesFunc, GameWinMsgBoxFunc newNoFunc)
+{
+	ClearGSMessageBoxes();
+	messageBoxWindow = MessageBoxYesNo(title, message, messageBoxOK, messageBoxCancel);
+	okFunc = newYesFunc;
+	cancelFunc = newNoFunc;
+}
+
+/**
+	* If the screen transitions underneath the dialog box, we
+	* need to raise it to keep it visible.
+	*/
+void RaiseGSMessageBox( void )
+{
+	raiseOverlays();
+
+	if (!messageBoxWindow)
+		return;
+
+	messageBoxWindow->winBringToTop();
+}
+
+// Overlay screens -------------------------------------
+
+/**
+	* gsOverlays holds a list of the .wnd files used in GS overlays.
+	* The entries *MUST* be in the same order as the GSOverlayType enum.
+	*/
+static const char * gsOverlays[GSOVERLAY_MAX] =
+{
+	"Menus/PopupPlayerInfo.wnd",	// Player info (right-click)
+	"Menus/WOLMapSelectMenu.wnd",	// Map select
+	"Menus/WOLBuddyOverlay.wnd",	// Buddy list
+	"Menus/WOLPageOverlay.wnd",		// Find/page
+	"Menus/PopupHostGame.wnd",		// Hosting options (game name, password, etc)
+	"Menus/PopupJoinGame.wnd",		// Joining options (password, etc)
+	"Menus/PopupLadderSelect.wnd",// LadderSelect
+	"Menus/PopupLocaleSelect.wnd",// Prompt for user's locale
+	"Menus/OptionsMenu.wnd",			// popup options
+};
+
+static WindowLayout *overlayLayouts[GSOVERLAY_MAX] =
+{
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+};
+
+static void buddyTryReconnect( void )
+{
+	BuddyRequest req;
+	req.buddyRequestType = BuddyRequest::BUDDYREQUEST_RELOGIN;
+	TheGameSpyBuddyMessageQueue->addRequest( req );
+}
+
+void GameSpyOpenOverlay( GSOverlayType overlay )
+{
+	if (overlay == GSOVERLAY_BUDDY)
+	{
+		if (!TheGameSpyBuddyMessageQueue->isConnected())
+		{
+			// not connected - is it because we were disconnected?
+			if (TheGameSpyBuddyMessageQueue->getLocalProfileID())
+			{
+				// used to be connected
+				GSMessageBoxYesNo(TheGameText->fetch("GUI:GPErrorTitle"), TheGameText->fetch("GUI:GPDisconnected"), buddyTryReconnect, NULL);
+			}
+			else
+			{
+				// no profile
+				GSMessageBoxOk(TheGameText->fetch("GUI:GPErrorTitle"), TheGameText->fetch("GUI:GPNoProfile"), NULL);
+			}
+			return;
+		}
+		AudioEventRTS buttonClick("GUICommunicatorOpen");
+
+		if( TheAudio )
+		{
+			TheAudio->addAudioEvent( &buttonClick );
+		}
+	}
+	if (overlayLayouts[overlay])
+	{
+		overlayLayouts[overlay]->hide( FALSE );
+		overlayLayouts[overlay]->bringForward();
+	}
+	else
+	{
+		overlayLayouts[overlay] = TheWindowManager->winCreateLayout( AsciiString( gsOverlays[overlay] ) );
+		overlayLayouts[overlay]->runInit();
+		overlayLayouts[overlay]->hide( FALSE );
+		overlayLayouts[overlay]->bringForward();
+	}
+}
+
+void GameSpyCloseOverlay( GSOverlayType overlay )
+{
+	switch(overlay)
+	{
+		case GSOVERLAY_PLAYERINFO:
+			DEBUG_LOG(("Closing overlay GSOVERLAY_PLAYERINFO"));
+			break;
+		case GSOVERLAY_MAPSELECT:
+			DEBUG_LOG(("Closing overlay GSOVERLAY_MAPSELECT"));
+			break;
+		case GSOVERLAY_BUDDY:
+			DEBUG_LOG(("Closing overlay GSOVERLAY_BUDDY"));
+			break;
+		case GSOVERLAY_PAGE:
+			DEBUG_LOG(("Closing overlay GSOVERLAY_PAGE"));
+			break;
+		case GSOVERLAY_GAMEOPTIONS:
+			DEBUG_LOG(("Closing overlay GSOVERLAY_GAMEOPTIONS"));
+			break;
+		case GSOVERLAY_GAMEPASSWORD:
+			DEBUG_LOG(("Closing overlay GSOVERLAY_GAMEPASSWORD"));
+			break;
+		case GSOVERLAY_LADDERSELECT:
+			DEBUG_LOG(("Closing overlay GSOVERLAY_LADDERSELECT"));
+			break;
+		case GSOVERLAY_OPTIONS:
+			DEBUG_LOG(("Closing overlay GSOVERLAY_OPTIONS"));
+			if( overlayLayouts[overlay] )
+			{
+				SignalUIInteraction(SHELL_SCRIPT_HOOK_OPTIONS_CLOSED);
+			}
+			break;
+	}
+	if( overlayLayouts[overlay] )
+	{
+		overlayLayouts[overlay]->runShutdown();
+		overlayLayouts[overlay]->destroyWindows();
+		deleteInstance(overlayLayouts[overlay]);
+		overlayLayouts[overlay] = NULL;
+	}
+}
+
+Bool GameSpyIsOverlayOpen( GSOverlayType overlay )
+{
+	return (overlayLayouts[overlay] != NULL);
+}
+
+void GameSpyToggleOverlay( GSOverlayType overlay )
+{
+	if (GameSpyIsOverlayOpen(overlay))
+		GameSpyCloseOverlay(overlay);
+	else
+		GameSpyOpenOverlay(overlay);
+}
+
+void raiseOverlays( void )
+{
+	for (int i=0; i<GSOVERLAY_MAX; ++i)
+	{
+		if (overlayLayouts[(GSOverlayType)i])
+		{
+			overlayLayouts[(GSOverlayType)i]->bringForward();
+		}
+	}
+}
+
+void GameSpyCloseAllOverlays( void )
+{
+	for (int i=0; i<GSOVERLAY_MAX; ++i)
+	{
+		GameSpyCloseOverlay((GSOverlayType)i);
+	}
+
+	// if we're shutting down the rest, chances are we don't want this popping up.
+	deleteNotificationBox();
+}
+
+void GameSpyUpdateOverlays( void )
+{
+	for (int i=0; i<GSOVERLAY_MAX; ++i)
+	{
+		if (overlayLayouts[(GSOverlayType)i])
+		{
+			overlayLayouts[(GSOverlayType)i]->runUpdate();
+		}
+	}
+}
+
+void ReOpenPlayerInfo( void )
+{
+	reOpenPlayerInfoFlag = TRUE;
+}
+void CheckReOpenPlayerInfo(void )
+{
+	if(!reOpenPlayerInfoFlag)
+		return;
+
+	GameSpyOpenOverlay(GSOVERLAY_PLAYERINFO);
+	reOpenPlayerInfoFlag = FALSE;
+
+}
diff --git a/Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp b/Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp
new file mode 100644
index 00000000000..9336b820640
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/IPEnumeration.cpp
@@ -0,0 +1,196 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/IPEnumeration.h"
+#include "GameNetwork/networkutil.h"
+#include "GameClient/ClientInstance.h"
+
+IPEnumeration::IPEnumeration( void )
+{
+	m_IPlist = NULL;
+	m_isWinsockInitialized = false;
+}
+
+IPEnumeration::~IPEnumeration( void )
+{
+	if (m_isWinsockInitialized)
+	{
+		WSACleanup();
+		m_isWinsockInitialized = false;
+	}
+
+	EnumeratedIP *ip = m_IPlist;
+	while (ip)
+	{
+		ip = ip->getNext();
+		deleteInstance(m_IPlist);
+		m_IPlist = ip;
+	}
+}
+
+EnumeratedIP * IPEnumeration::getAddresses( void )
+{
+	if (m_IPlist)
+		return m_IPlist;
+
+	if (!m_isWinsockInitialized)
+	{
+		WORD verReq = MAKEWORD(2, 2);
+		WSADATA wsadata;
+
+		int err = WSAStartup(verReq, &wsadata);
+		if (err != 0) {
+			return NULL;
+		}
+
+		if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2)) {
+			WSACleanup();
+			return NULL;
+		}
+		m_isWinsockInitialized = true;
+	}
+
+	// get the local machine's host name
+	char hostname[256];
+	if (gethostname(hostname, sizeof(hostname)))
+	{
+		DEBUG_LOG(("Failed call to gethostname; WSAGetLastError returned %d", WSAGetLastError()));
+		return NULL;
+	}
+	DEBUG_LOG(("Hostname is '%s'", hostname));
+
+	// get host information from the host name
+	HOSTENT* hostEnt = gethostbyname(hostname);
+	if (hostEnt == NULL)
+	{
+		DEBUG_LOG(("Failed call to gethostbyname; WSAGetLastError returned %d", WSAGetLastError()));
+		return NULL;
+	}
+
+	// sanity-check the length of the IP adress
+	if (hostEnt->h_length != 4)
+	{
+		DEBUG_LOG(("gethostbyname returns oddly-sized IP addresses!"));
+		return NULL;
+	}
+
+	// TheSuperHackers @feature Add one unique local host IP address for each multi client instance.
+	if (rts::ClientInstance::isMultiInstance())
+	{
+		const UnsignedInt id = rts::ClientInstance::getInstanceId();
+		addNewIP(
+			127,
+			(UnsignedByte)(id >> 16),
+			(UnsignedByte)(id >> 8),
+			(UnsignedByte)(id));
+	}
+
+	// construct a list of addresses
+	int numAddresses = 0;
+	char *entry;
+	while ( (entry = hostEnt->h_addr_list[numAddresses++]) != 0 )
+	{
+		addNewIP(
+			(UnsignedByte)entry[0],
+			(UnsignedByte)entry[1],
+			(UnsignedByte)entry[2],
+			(UnsignedByte)entry[3]);
+	}
+
+	return m_IPlist;
+}
+
+void IPEnumeration::addNewIP( UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedByte d )
+{
+	EnumeratedIP *newIP = newInstance(EnumeratedIP);
+
+	AsciiString str;
+	str.format("%d.%d.%d.%d", (int)a, (int)b, (int)c, (int)d);
+
+	UnsignedInt ip = AssembleIp(a, b, c, d);
+
+	newIP->setIPstring(str);
+	newIP->setIP(ip);
+
+	DEBUG_LOG(("IP: 0x%8.8X (%s)", ip, str.str()));
+
+	// Add the IP to the list in ascending order
+	if (!m_IPlist)
+	{
+		m_IPlist = newIP;
+		newIP->setNext(NULL);
+	}
+	else
+	{
+		if (newIP->getIP() < m_IPlist->getIP())
+		{
+			newIP->setNext(m_IPlist);
+			m_IPlist = newIP;
+		}
+		else
+		{
+			EnumeratedIP *p = m_IPlist;
+			while (p->getNext() && p->getNext()->getIP() < newIP->getIP())
+			{
+				p = p->getNext();
+			}
+			newIP->setNext(p->getNext());
+			p->setNext(newIP);
+		}
+	}
+}
+
+AsciiString IPEnumeration::getMachineName( void )
+{
+	if (!m_isWinsockInitialized)
+	{
+		WORD verReq = MAKEWORD(2, 2);
+		WSADATA wsadata;
+
+		int err = WSAStartup(verReq, &wsadata);
+		if (err != 0) {
+			return "";
+		}
+
+		if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2)) {
+			WSACleanup();
+			return "";
+		}
+		m_isWinsockInitialized = true;
+	}
+
+	// get the local machine's host name
+	char hostname[256];
+	if (gethostname(hostname, sizeof(hostname)))
+	{
+		DEBUG_LOG(("Failed call to gethostname; WSAGetLastError returned %d", WSAGetLastError()));
+		return "";
+	}
+
+	return AsciiString(hostname);
+}
+
+
diff --git a/Core/GameEngine/Source/GameNetwork/LANAPI.cpp b/Core/GameEngine/Source/GameNetwork/LANAPI.cpp
new file mode 100644
index 00000000000..86db49cbc7d
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/LANAPI.cpp
@@ -0,0 +1,1283 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#define WIN32_LEAN_AND_MEAN  // only bare bones windows stuff wanted
+
+#include "Common/crc.h"
+#include "Common/GameState.h"
+#include "Common/Registry.h"
+#include "GameNetwork/LANAPI.h"
+#include "GameNetwork/networkutil.h"
+#include "Common/GlobalData.h"
+#include "Common/RandomValue.h"
+#include "GameClient/GameText.h"
+#include "GameClient/MapUtil.h"
+#include "Common/UserPreferences.h"
+#include "GameLogic/GameLogic.h"
+
+
+static const UnsignedShort lobbyPort = 8086; ///< This is the UDP port used by all LANAPI communication
+
+AsciiString GetMessageTypeString(UnsignedInt type);
+
+const UnsignedInt LANAPI::s_resendDelta = 10 * 1000;	///< This is how often we announce ourselves to the world
+/*
+LANGame::LANGame( void )
+{
+	m_gameName = L"";
+
+	int player;
+	for (player = 0; player < MAX_SLOTS; ++player)
+	{
+		m_playerName[player] = L"";
+		m_playerIP[player]= 0;
+		m_playerAccepted[player] = false;
+	}
+	m_lastHeard = 0;
+	m_inProgress = false;
+	m_next = NULL;
+}
+*/
+
+
+
+
+LANAPI::LANAPI( void ) : m_transport(NULL)
+{
+	DEBUG_LOG(("LANAPI::LANAPI() - max game option size is %d, sizeof(LANMessage)=%d, MAX_PACKET_SIZE=%d",
+		m_lanMaxOptionsLength, sizeof(LANMessage), MAX_PACKET_SIZE));
+
+	m_lastResendTime = 0;
+	//
+	m_lobbyPlayers = NULL;
+	m_games = NULL;
+	m_name = L""; // safe default?
+	m_pendingAction = ACT_NONE;
+	m_expiration = 0;
+	m_localIP = 0;
+	m_inLobby = true;
+	m_isInLANMenu = TRUE;
+	m_currentGame = NULL;
+	m_broadcastAddr = INADDR_BROADCAST;
+	m_directConnectRemoteIP = 0;
+	m_actionTimeout = 5000; // ms
+	m_lastUpdate = 0;
+	m_transport = new Transport;
+	m_isActive = TRUE;
+}
+
+LANAPI::~LANAPI( void )
+{
+	reset();
+	delete m_transport;
+}
+
+void LANAPI::init( void )
+{
+	m_gameStartTime = 0;
+	m_gameStartSeconds = 0;
+	m_transport->reset();
+	m_transport->init(m_localIP, lobbyPort);
+	m_transport->allowBroadcasts(true);
+
+	m_pendingAction = ACT_NONE;
+	m_expiration = 0;
+	m_inLobby = true;
+	m_isInLANMenu = TRUE;
+	m_currentGame = NULL;
+	m_directConnectRemoteIP = 0;
+
+	m_lastGameopt = "";
+
+#if TELL_COMPUTER_IDENTITY_IN_LAN_LOBBY
+	char userName[UNLEN + 1];
+	DWORD bufSize = ARRAY_SIZE(userName);
+	if (GetUserNameA(userName, &bufSize))
+	{
+		m_userName.set(userName, bufSize - 1);
+	}
+	else
+	{
+		m_userName = "unknown";
+	}
+
+	char computerName[MAX_COMPUTERNAME_LENGTH + 1];
+	bufSize = ARRAY_SIZE(computerName);
+	if (GetComputerNameA(computerName, &bufSize))
+	{
+		m_hostName.set(computerName, bufSize - 1);
+	}
+	else
+	{
+		m_hostName = "unknown";
+	}
+#endif
+}
+
+void LANAPI::reset( void )
+{
+	if (m_inLobby)
+	{
+		LANMessage msg;
+		fillInLANMessage( &msg );
+		msg.messageType = LANMessage::MSG_REQUEST_LOBBY_LEAVE;
+		sendMessage(&msg);
+	}
+	m_transport->update();
+
+	LANGameInfo *theGame = m_games;
+	LANGameInfo *deletableGame = NULL;
+
+	while (theGame)
+	{
+		deletableGame = theGame;
+		theGame = theGame->getNext();
+		delete deletableGame;
+	}
+
+	LANPlayer *thePlayer = m_lobbyPlayers;
+	LANPlayer *deletablePlayer = NULL;
+
+	while (thePlayer)
+	{
+		deletablePlayer = thePlayer;
+		thePlayer = thePlayer->getNext();
+		delete deletablePlayer;
+	}
+
+	m_games = NULL;
+	m_lobbyPlayers = NULL;
+	m_directConnectRemoteIP = 0;
+	m_pendingAction = ACT_NONE;
+	m_expiration = 0;
+	m_inLobby = true;
+	m_isInLANMenu = TRUE;
+	m_currentGame = NULL;
+
+}
+
+void LANAPI::sendMessage(LANMessage *msg, UnsignedInt ip /* = 0 */)
+{
+	if (ip != 0)
+	{
+		m_transport->queueSend(ip, lobbyPort, (unsigned char *)msg, sizeof(LANMessage) /*, 0, 0 */);
+	}
+	else if ((m_currentGame != NULL) && (m_currentGame->getIsDirectConnect()))
+	{
+		Int localSlot = m_currentGame->getLocalSlotNum();
+		for (Int i = 0; i < MAX_SLOTS; ++i)
+		{
+			if (i != localSlot) {
+				GameSlot *slot = m_currentGame->getSlot(i);
+				if ((slot != NULL) && (slot->isHuman())) {
+					m_transport->queueSend(slot->getIP(), lobbyPort, (unsigned char *)msg, sizeof(LANMessage) /*, 0, 0 */);
+				}
+			}
+		}
+	}
+	else
+	{
+		m_transport->queueSend(m_broadcastAddr, lobbyPort, (unsigned char *)msg, sizeof(LANMessage) /*, 0, 0 */);
+	}
+}
+
+
+AsciiString GetMessageTypeString(UnsignedInt type)
+{
+	AsciiString returnString;
+
+	switch (type)
+	{
+		case LANMessage::MSG_REQUEST_LOCATIONS:
+			returnString.format( "Request Locations (%d)",type);
+			break;
+		case LANMessage::MSG_GAME_ANNOUNCE:
+			returnString.format("Game Announce (%d)",type);
+			break;
+		case LANMessage::MSG_LOBBY_ANNOUNCE:
+			returnString.format("Lobby Announce (%d)",type);
+			break;
+		case LANMessage::MSG_REQUEST_JOIN:
+			returnString.format("Request Join (%d)",type);
+			break;
+		case LANMessage::MSG_JOIN_ACCEPT:
+			returnString.format("Join Accept (%d)",type);
+			break;
+		case LANMessage::MSG_JOIN_DENY:
+			returnString.format("Join Deny (%d)",type);
+			break;
+		case LANMessage::MSG_REQUEST_GAME_LEAVE:
+			returnString.format("Request Game Leave (%d)",type);
+			break;
+		case LANMessage::MSG_REQUEST_LOBBY_LEAVE:
+			returnString.format("Request Lobby Leave (%d)",type);
+			break;
+		case LANMessage::MSG_SET_ACCEPT:
+			returnString.format("Set Accept(%d)",type);
+			break;
+		case LANMessage::MSG_CHAT:
+			returnString.format("Chat (%d)",type);
+			break;
+		case LANMessage::MSG_GAME_START:
+			returnString.format("Game Start (%d)",type);
+			break;
+		case LANMessage::MSG_GAME_START_TIMER:
+			returnString.format("Game Start Timer (%d)",type);
+			break;
+		case LANMessage::MSG_GAME_OPTIONS:
+			returnString.format("Game Options (%d)",type);
+			break;
+		case LANMessage::MSG_REQUEST_GAME_INFO:
+			returnString.format("Request GameInfo (%d)", type);
+			break;
+		case LANMessage::MSG_INACTIVE:
+			returnString.format("Inactive (%d)", type);
+			break;
+		default:
+			returnString.format("Unknown Message (%d)",type);
+	}
+	return returnString;
+}
+
+
+void LANAPI::checkMOTD( void )
+{
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_useLocalMOTD)
+	{
+		// for a playtest, let's log some play statistics, eh?
+		if (TheGlobalData->m_playStats <= 0)
+			TheWritableGlobalData->m_playStats = 30;
+
+		static UnsignedInt oldMOTDCRC = 0;
+		UnsignedInt newMOTDCRC = 0;
+		AsciiString asciiMOTD;
+		char buf[4096];
+		FILE *fp = fopen(TheGlobalData->m_MOTDPath.str(), "r");
+		Int len;
+		if (fp)
+		{
+			while( (len = fread(buf, 1, 4096, fp)) > 0 )
+			{
+				buf[len] = 0;
+				asciiMOTD.concat(buf);
+			}
+			fclose(fp);
+			CRC crcObj;
+			crcObj.computeCRC(asciiMOTD.str(), asciiMOTD.getLength());
+			newMOTDCRC = crcObj.get();
+		}
+
+		if (oldMOTDCRC != newMOTDCRC)
+		{
+			// different MOTD... display it
+			oldMOTDCRC = newMOTDCRC;
+			AsciiString line;
+			while (asciiMOTD.nextToken(&line, "\n"))
+			{
+				if (line.getCharAt(line.getLength()-1) == '\r')
+					line.removeLastChar();	// there is a trailing '\r'
+
+				if (line.isEmpty())
+				{
+					line = " ";
+				}
+
+				UnicodeString uniLine;
+				uniLine.translate(line);
+				OnChat( L"MOTD", 0, uniLine, LANCHAT_SYSTEM );
+			}
+		}
+	}
+#endif
+}
+
+extern Bool LANbuttonPushed;
+extern Bool LANSocketErrorDetected;
+void LANAPI::update( void )
+{
+	if(LANbuttonPushed)
+		return;
+	static const UnsignedInt LANAPIUpdateDelay = 200;
+	UnsignedInt now = timeGetTime();
+
+	if( now > m_lastUpdate + LANAPIUpdateDelay)
+	{
+		m_lastUpdate = now;
+	}
+	else
+	{
+		return;
+	}
+
+	// Let the UDP socket breathe
+	if ((m_transport->update() == FALSE) && (LANSocketErrorDetected == FALSE)) {
+		if (m_isInLANMenu == TRUE) {
+			LANSocketErrorDetected = TRUE;
+		}
+	}
+
+	// Handle any new messages
+	int i;
+	for (i=0; i<MAX_MESSAGES && !LANbuttonPushed; ++i)
+	{
+		if (m_transport->m_inBuffer[i].length > 0)
+		{
+			// Process the new message
+			UnsignedInt senderIP = m_transport->m_inBuffer[i].addr;
+			if (senderIP == m_localIP)
+			{
+				m_transport->m_inBuffer[i].length = 0;
+				continue;
+			}
+
+			LANMessage *msg = (LANMessage *)(m_transport->m_inBuffer[i].data);
+			//DEBUG_LOG(("LAN message type %s from %ls (%s@%s)", GetMessageTypeString(msg->messageType).str(),
+			//	msg->name, msg->userName, msg->hostName));
+			switch (msg->messageType)
+			{
+				// Location specification
+			case LANMessage::MSG_REQUEST_LOCATIONS:		// Hey, where is everybody?
+				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_LOCATIONS from %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(senderIP)));
+				handleRequestLocations( msg, senderIP );
+				break;
+			case LANMessage::MSG_GAME_ANNOUNCE:				// Here someone is, and here's his game info!
+				DEBUG_LOG(("LANAPI::update - got a MSG_GAME_ANNOUNCE from %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(senderIP)));
+				handleGameAnnounce( msg, senderIP );
+				break;
+			case LANMessage::MSG_LOBBY_ANNOUNCE:			// Hey, I'm in the lobby!
+				DEBUG_LOG(("LANAPI::update - got a MSG_LOBBY_ANNOUNCE from %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(senderIP)));
+				handleLobbyAnnounce( msg, senderIP );
+				break;
+			case LANMessage::MSG_REQUEST_GAME_INFO:
+				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_GAME_INFO from %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(senderIP)));
+				handleRequestGameInfo( msg, senderIP );
+				break;
+
+				// Joining games
+			case LANMessage::MSG_REQUEST_JOIN:				// Let me in!  Let me in!
+				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_JOIN from %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(senderIP)));
+				handleRequestJoin( msg, senderIP );
+				break;
+			case LANMessage::MSG_JOIN_ACCEPT:					// Okay, you can join.
+				DEBUG_LOG(("LANAPI::update - got a MSG_JOIN_ACCEPT from %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(senderIP)));
+				handleJoinAccept( msg, senderIP );
+				break;
+			case LANMessage::MSG_JOIN_DENY:						// Go away!  We don't want any!
+				DEBUG_LOG(("LANAPI::update - got a MSG_JOIN_DENY from %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(senderIP)));
+				handleJoinDeny( msg, senderIP );
+				break;
+
+				// Leaving games, lobby
+			case LANMessage::MSG_REQUEST_GAME_LEAVE:				// I'm outa here!
+				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_GAME_LEAVE from %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(senderIP)));
+				handleRequestGameLeave( msg, senderIP );
+				break;
+			case LANMessage::MSG_REQUEST_LOBBY_LEAVE:				// I'm outa here!
+				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_LOBBY_LEAVE from %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(senderIP)));
+				handleRequestLobbyLeave( msg, senderIP );
+				break;
+
+				// Game options, chat, etc
+			case LANMessage::MSG_SET_ACCEPT:					// I'm cool with everything as is.
+				handleSetAccept( msg, senderIP );
+				break;
+			case LANMessage::MSG_MAP_AVAILABILITY:		// Map status
+				handleHasMap( msg, senderIP );
+				break;
+			case LANMessage::MSG_CHAT:								// Just spouting my mouth off.
+				handleChat( msg, senderIP );
+				break;
+			case LANMessage::MSG_GAME_START:					// Hold on; we're starting!
+				handleGameStart( msg, senderIP );
+				break;
+			case LANMessage::MSG_GAME_START_TIMER:
+				handleGameStartTimer( msg, senderIP );
+				break;
+			case LANMessage::MSG_GAME_OPTIONS:				// Here's some info about the game.
+				DEBUG_LOG(("LANAPI::update - got a MSG_GAME_OPTIONS from %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(senderIP)));
+				handleGameOptions( msg, senderIP );
+				break;
+			case LANMessage::MSG_INACTIVE:		// someone is telling us that we're inactive.
+				handleInActive( msg, senderIP );
+				break;
+
+			default:
+				DEBUG_LOG(("Unknown LAN message type %d", msg->messageType));
+			}
+
+			// Mark it as read
+			m_transport->m_inBuffer[i].length = 0;
+		}
+	}
+	if(LANbuttonPushed)
+		return;
+	// Send out periodic I'm Here messages
+	if (now > s_resendDelta + m_lastResendTime)
+	{
+		m_lastResendTime = now;
+
+		if (m_inLobby)
+		{
+			RequestSetName(m_name);
+		}
+		else if (m_currentGame && !m_currentGame->isGameInProgress())
+		{
+			if (AmIHost())
+			{
+				RequestGameOptions( GenerateGameOptionsString(), true );
+				RequestGameAnnounce( );
+			}
+			else
+			{
+#if TELL_COMPUTER_IDENTITY_IN_LAN_LOBBY
+				AsciiString text;
+				text.format("User=%s", m_userName.str());
+				RequestGameOptions( text, true );
+				text.format("Host=%s", m_hostName.str());
+				RequestGameOptions( text, true );
+#endif
+				RequestGameOptions( "HELLO", false );
+			}
+		}
+		else if (m_currentGame)
+		{
+			// game is in progress - RequestGameAnnounce will check if we should send it
+			RequestGameAnnounce();
+		}
+	}
+
+	Bool playerListChanged = false;
+	Bool gameListChanged = false;
+
+	// Weed out people we haven't heard from in a while
+	LANPlayer *player = m_lobbyPlayers;
+	while (player)
+	{
+		if (player->getLastHeard() + s_resendDelta*2 < now)
+		{
+			// He's gone!
+			removePlayer(player);
+			LANPlayer *nextPlayer = player->getNext();
+			delete player;
+			player = nextPlayer;
+			playerListChanged = true;
+		}
+		else
+		{
+			player = player->getNext();
+		}
+	}
+
+	// Weed out people we haven't heard from in a while
+	LANGameInfo *game = m_games;
+	while (game)
+	{
+		if (game != m_currentGame && game->getLastHeard() + s_resendDelta*2 < now)
+		{
+			// He's gone!
+			removeGame(game);
+			LANGameInfo *nextGame = game->getNext();
+			delete game;
+			game = nextGame;
+			gameListChanged = true;
+		}
+		else
+		{
+			game = game->getNext();
+		}
+	}
+	if ( m_currentGame && !m_currentGame->isGameInProgress() )
+	{
+		if ( !AmIHost() && (m_currentGame->getLastHeard() + s_resendDelta*16 < now) )
+		{
+			// We haven't heard from the host in a while.  Bail.
+			// Actually, fake a host leaving message. :)
+			LANMessage msg;
+			fillInLANMessage( &msg );
+			msg.messageType = LANMessage::MSG_REQUEST_GAME_LEAVE;
+			wcslcpy(msg.name, m_currentGame->getPlayerName(0).str(), ARRAY_SIZE(msg.name));
+			handleRequestGameLeave(&msg, m_currentGame->getIP(0));
+			UnicodeString text;
+			text = TheGameText->fetch("LAN:HostNotResponding");
+			OnChat(UnicodeString::TheEmptyString, m_localIP, text, LANCHAT_SYSTEM);
+		}
+		else if ( AmIHost() )
+		{
+			// Check each player for timeouts
+			for (int p=1; p<MAX_SLOTS; ++p)
+			{
+				if (m_currentGame->getIP(p) && m_currentGame->getPlayerLastHeard(p) + s_resendDelta*8 < now)
+				{
+					LANMessage msg;
+					fillInLANMessage( &msg );
+					UnicodeString theStr;
+					theStr.format(TheGameText->fetch("LAN:PlayerDropped"), m_currentGame->getPlayerName(p).str());
+					msg.messageType = LANMessage::MSG_REQUEST_GAME_LEAVE;
+					wcslcpy(msg.name, m_currentGame->getPlayerName(p).str(), ARRAY_SIZE(msg.name));
+					handleRequestGameLeave(&msg, m_currentGame->getIP(p));
+					OnChat(UnicodeString::TheEmptyString, m_localIP, theStr, LANCHAT_SYSTEM);
+				}
+			}
+		}
+	}
+
+	if (playerListChanged)
+	{
+		OnPlayerList(m_lobbyPlayers);
+	}
+
+	if (gameListChanged)
+	{
+		OnGameList(m_games);
+	}
+
+	// Time out old actions
+	if (m_pendingAction != ACT_NONE && now > m_expiration)
+	{
+		switch (m_pendingAction)
+		{
+		case ACT_JOIN:
+			OnGameJoin(RET_TIMEOUT, NULL);
+			m_pendingAction = ACT_NONE;
+			m_currentGame = NULL;
+			m_inLobby = true;
+			break;
+		case ACT_LEAVE:
+			OnPlayerLeave(m_name);
+			m_pendingAction = ACT_NONE;
+			m_currentGame = NULL;
+			m_inLobby = true;
+			break;
+		case ACT_JOINDIRECTCONNECT:
+			OnGameJoin(RET_TIMEOUT, NULL);
+			m_pendingAction = ACT_NONE;
+			m_currentGame = NULL;
+			m_inLobby = true;
+			break;
+		default:
+			m_pendingAction = ACT_NONE;
+		}
+	}
+
+	// send out "game starting" messages
+	if ( m_gameStartTime && m_gameStartSeconds && m_gameStartTime <= now )
+	{
+		// m_gameStartTime is when the next message goes out
+		// m_gameStartSeconds is how many seconds remain in the message
+
+		RequestGameStartTimer( m_gameStartSeconds );
+	}
+	else if (m_gameStartTime && m_gameStartTime <= now)
+	{
+//		DEBUG_LOG(("m_gameStartTime=%d, now=%d, m_gameStartSeconds=%d", m_gameStartTime, now, m_gameStartSeconds));
+		ResetGameStartTimer();
+		RequestGameStart();
+	}
+
+	// Check for an MOTD every few seconds
+	static UnsignedInt lastMOTDCheck = 0;
+	static const UnsignedInt motdInterval = 30000;
+	if (now > lastMOTDCheck + motdInterval)
+	{
+		checkMOTD();
+		lastMOTDCheck = now;
+	}
+}
+
+// Request functions generate network traffic
+void LANAPI::RequestLocations( void )
+{
+	LANMessage msg;
+	msg.messageType = LANMessage::MSG_REQUEST_LOCATIONS;
+	fillInLANMessage( &msg );
+	sendMessage(&msg);
+}
+
+void LANAPI::RequestGameJoin( LANGameInfo *game, UnsignedInt ip /* = 0 */ )
+{
+	if ((m_pendingAction != ACT_NONE) && (m_pendingAction != ACT_JOINDIRECTCONNECT))
+	{
+		OnGameJoin( RET_BUSY, NULL );
+		return;
+	}
+
+	if (!game)
+	{
+		OnGameJoin( RET_GAME_GONE, NULL );
+		return;
+	}
+
+	LANMessage msg;
+	msg.messageType = LANMessage::MSG_REQUEST_JOIN;
+	fillInLANMessage( &msg );
+	msg.GameToJoin.gameIP = game->getSlot(0)->getIP();
+	msg.GameToJoin.exeCRC = TheGlobalData->m_exeCRC;
+	msg.GameToJoin.iniCRC = TheGlobalData->m_iniCRC;
+
+	AsciiString s;
+	GetStringFromRegistry("\\ergc", "", s);
+	strlcpy(msg.GameToJoin.serial, s.str(), ARRAY_SIZE(msg.GameToJoin.serial));
+
+	sendMessage(&msg, ip);
+
+	m_pendingAction = ACT_JOIN;
+	m_expiration = timeGetTime() + m_actionTimeout;
+}
+
+void LANAPI::RequestGameJoinDirectConnect(UnsignedInt ipaddress)
+{
+	if (m_pendingAction != ACT_NONE)
+	{
+		OnGameJoin( RET_BUSY, NULL );
+		return;
+	}
+
+	if (ipaddress == 0)
+	{
+		OnGameJoin( RET_GAME_GONE, NULL );
+		return;
+	}
+
+	m_directConnectRemoteIP = ipaddress;
+
+	LANMessage msg;
+	msg.messageType = LANMessage::MSG_REQUEST_GAME_INFO;
+	fillInLANMessage(&msg);
+	msg.PlayerInfo.ip = GetLocalIP();
+	wcslcpy(msg.PlayerInfo.playerName, m_name.str(), ARRAY_SIZE(msg.PlayerInfo.playerName));
+
+	sendMessage(&msg, ipaddress);
+
+	m_pendingAction = ACT_JOINDIRECTCONNECT;
+	m_expiration = timeGetTime() + m_actionTimeout;
+}
+
+void LANAPI::RequestGameLeave( void )
+{
+	LANMessage msg;
+	msg.messageType = LANMessage::MSG_REQUEST_GAME_LEAVE;
+	fillInLANMessage( &msg );
+	wcslcpy(msg.PlayerInfo.playerName, m_name.str(), ARRAY_SIZE(msg.PlayerInfo.playerName));
+	sendMessage(&msg);
+	m_transport->update();  // Send immediately, before OnPlayerLeave below resets everything.
+
+	if (m_currentGame && m_currentGame->getIP(0) == m_localIP)
+	{
+		// Exit out immediately if we're hosting
+		OnPlayerLeave(m_name);
+		removeGame(m_currentGame);
+		m_currentGame = NULL;
+		m_inLobby = true;
+	}
+	else
+	{
+		m_pendingAction = ACT_LEAVE;
+		m_expiration = timeGetTime() + m_actionTimeout;
+	}
+}
+
+void LANAPI::RequestGameAnnounce( void )
+{
+	// In game - are we a game host?
+	if (m_currentGame && !(m_currentGame->getIsDirectConnect()))
+	{
+		if (m_currentGame->getIP(0) == m_localIP || (m_currentGame->isGameInProgress() && TheNetwork && TheNetwork->isPacketRouter())) // if we're in game we should reply if we're the packet router
+		{
+			LANMessage reply;
+			fillInLANMessage( &reply );
+			reply.messageType = LANMessage::MSG_GAME_ANNOUNCE;
+
+			AsciiString gameOpts = GameInfoToAsciiString(m_currentGame);
+			strlcpy(reply.GameInfo.options,gameOpts.str(), ARRAY_SIZE(reply.GameInfo.options));
+			wcslcpy(reply.GameInfo.gameName, m_currentGame->getName().str(), ARRAY_SIZE(reply.GameInfo.gameName));
+			reply.GameInfo.inProgress = m_currentGame->isGameInProgress();
+			reply.GameInfo.isDirectConnect = m_currentGame->getIsDirectConnect();
+
+			sendMessage(&reply);
+		}
+	}
+}
+
+void LANAPI::RequestAccept( void )
+{
+	if (m_inLobby || !m_currentGame)
+		return;
+
+	LANMessage msg;
+	fillInLANMessage( &msg );
+	msg.messageType = LANMessage::MSG_SET_ACCEPT;
+	msg.Accept.isAccepted = true;
+	wcslcpy(msg.Accept.gameName, m_currentGame->getName().str(), ARRAY_SIZE(msg.Accept.gameName));
+	sendMessage(&msg);
+}
+
+void LANAPI::RequestHasMap( void )
+{
+	if (m_inLobby || !m_currentGame)
+		return;
+
+	LANMessage msg;
+	fillInLANMessage( &msg );
+	msg.messageType = LANMessage::MSG_MAP_AVAILABILITY;
+	msg.MapStatus.hasMap = m_currentGame->getSlot(m_currentGame->getLocalSlotNum())->hasMap();
+	wcslcpy(msg.MapStatus.gameName, m_currentGame->getName().str(), ARRAY_SIZE(msg.MapStatus.gameName));
+	CRC mapNameCRC;
+//mapNameCRC.computeCRC(m_currentGame->getMap().str(), m_currentGame->getMap().getLength());
+	AsciiString portableMapName = TheGameState->realMapPathToPortableMapPath(m_currentGame->getMap());
+	mapNameCRC.computeCRC(portableMapName.str(), portableMapName.getLength());
+	msg.MapStatus.mapCRC = mapNameCRC.get();
+	sendMessage(&msg);
+
+	if (!msg.MapStatus.hasMap)
+	{
+		UnicodeString text;
+		UnicodeString mapDisplayName;
+		const MapMetaData *mapData = TheMapCache->findMap( m_currentGame->getMap() );
+		Bool willTransfer = TRUE;
+		if (mapData)
+		{
+			mapDisplayName.format(L"%ls", mapData->m_displayName.str());
+			if (mapData->m_isOfficial)
+				willTransfer = FALSE;
+		}
+		else
+		{
+			mapDisplayName.format(L"%hs", TheGameState->getMapLeafName(m_currentGame->getMap()).str());
+			willTransfer = WouldMapTransfer(m_currentGame->getMap());
+		}
+		if (willTransfer)
+			text.format(TheGameText->fetch("GUI:LocalPlayerNoMapWillTransfer"), mapDisplayName.str());
+		else
+			text.format(TheGameText->fetch("GUI:LocalPlayerNoMap"), mapDisplayName.str());
+		OnChat(L"SYSTEM", m_localIP, text, LANCHAT_SYSTEM);
+	}
+}
+
+void LANAPI::RequestChat( UnicodeString message, ChatType format )
+{
+	LANMessage msg;
+	fillInLANMessage( &msg );
+	wcslcpy(msg.Chat.gameName, (m_currentGame) ? m_currentGame->getName().str() : L"", ARRAY_SIZE(msg.Chat.gameName));
+	msg.messageType = LANMessage::MSG_CHAT;
+	msg.Chat.chatType = format;
+	wcslcpy(msg.Chat.message, message.str(), ARRAY_SIZE(msg.Chat.message));
+	sendMessage(&msg);
+
+	OnChat(m_name, m_localIP, message, format);
+}
+
+void LANAPI::RequestGameStart( void )
+{
+	if (m_inLobby || !m_currentGame || m_currentGame->getIP(0) != m_localIP)
+		return;
+
+	LANMessage msg;
+	msg.messageType = LANMessage::MSG_GAME_START;
+	fillInLANMessage( &msg );
+	sendMessage(&msg);
+	m_transport->update(); // force a send
+
+	OnGameStart();
+}
+
+void LANAPI::ResetGameStartTimer( void )
+{
+	m_gameStartTime = 0;
+	m_gameStartSeconds = 0;
+}
+
+void LANAPI::RequestGameStartTimer( Int seconds )
+{
+	if (m_inLobby || !m_currentGame || m_currentGame->getIP(0) != m_localIP)
+		return;
+
+	UnsignedInt now = timeGetTime();
+	m_gameStartTime = now + 1000;
+	m_gameStartSeconds = (seconds) ? seconds - 1 : 0;
+
+	LANMessage msg;
+	msg.messageType = LANMessage::MSG_GAME_START_TIMER;
+	msg.StartTimer.seconds = seconds;
+	fillInLANMessage( &msg );
+	sendMessage(&msg);
+	m_transport->update(); // force a send
+
+	OnGameStartTimer(seconds);
+}
+
+void LANAPI::RequestGameOptions( AsciiString gameOptions, Bool isPublic, UnsignedInt ip /* = 0 */ )
+{
+	DEBUG_ASSERTCRASH(gameOptions.getLength() < m_lanMaxOptionsLength, ("Game options string is too long!"));
+
+	if (!m_currentGame)
+		return;
+
+	LANMessage msg;
+	fillInLANMessage( &msg );
+	msg.messageType = LANMessage::MSG_GAME_OPTIONS;
+	strlcpy(msg.GameOptions.options, gameOptions.str(), ARRAY_SIZE(msg.GameOptions.options));
+	sendMessage(&msg, ip);
+
+	m_lastGameopt = gameOptions;
+
+	int player;
+	for (player = 0; player<MAX_SLOTS; ++player)
+	{
+		if (m_currentGame->getIP(player) == m_localIP)
+		{
+			OnGameOptions(m_localIP, player, AsciiString(msg.GameOptions.options));
+			break;
+		}
+	}
+
+	// We can request game options (side, color, etc) while we don't have a slot yet.  Of course, we don't need to
+	// call OnGameOptions for those, so it's okay to silently fail.
+	//DEBUG_ASSERTCRASH(player != MAX_SLOTS, ("Requested game options, but we're not in slot list!");
+}
+
+void LANAPI::RequestGameCreate( UnicodeString gameName, Bool isDirectConnect )
+{
+	// No games of the same name should exist...  Ignore that for now.
+	/// @todo: make sure LAN games with identical names don't crash things like in RA2.
+
+	if ((!m_inLobby || m_currentGame) && !isDirectConnect)
+	{
+		DEBUG_ASSERTCRASH(m_inLobby && m_currentGame, ("Can't create a game while in one!"));
+		OnGameCreate(LANAPIInterface::RET_BUSY);
+		return;
+	}
+
+	if (m_pendingAction != ACT_NONE)
+	{
+		OnGameCreate(LANAPIInterface::RET_BUSY);
+		return;
+	}
+
+	// Create the local game object
+	m_inLobby = false;
+	LANGameInfo *myGame = NEW LANGameInfo;
+
+	myGame->setSeed(GetTickCount());
+
+//	myGame->setInProgress(false);
+	myGame->enterGame();
+	UnicodeString s;
+	s.format(L"%8.8X%8.8X", m_localIP, myGame->getSeed());
+	if (gameName.isEmpty())
+		s.concat(m_name);
+	else
+		s.concat(gameName);
+
+	s.truncateTo(g_lanGameNameLength);
+
+	DEBUG_LOG(("Setting local game name to '%ls'", s.str()));
+
+	myGame->setName(s);
+
+	LANGameSlot newSlot;
+	newSlot.setState(SLOT_PLAYER, m_name);
+	newSlot.setIP(m_localIP);
+	newSlot.setPort(NETWORK_BASE_PORT_NUMBER); // LAN game, everyone has a unique IP, so it's ok to use the same port.
+	newSlot.setLastHeard(0);
+	newSlot.setLogin(m_userName);
+	newSlot.setHost(m_hostName);
+
+	myGame->setSlot(0,newSlot);
+	myGame->setNext(NULL);
+	LANPreferences pref;
+
+	AsciiString mapName = pref.getPreferredMap();
+
+	myGame->setMap(mapName);
+	myGame->setIsDirectConnect(isDirectConnect);
+
+	myGame->setLastHeard(timeGetTime());
+	m_currentGame = myGame;
+
+/// @todo: Need to initialize the players elsewere.
+/*	for (int player = 1; player < MAX_SLOTS; ++player)
+	{
+		myGame->setPlayerName(player, L"");
+		myGame->setIP(player, 0);
+		myGame->setAccepted(player, false);
+	}*/
+
+	// Add the game to the local game list
+	addGame(myGame);
+
+	// Send an announcement
+	//RequestSlotList();
+/*
+	LANMessage msg;
+	wcslcpy(msg.name, m_name.str(), ARRAY_SIZE(msg.name));
+	wcscpy(msg.GameInfo.gameName, myGame->getName().str());
+	for (player=0; player<MAX_SLOTS; ++player)
+	{
+		wcscpy(msg.GameInfo.name[player], myGame->getPlayerName(player).str());
+		msg.GameInfo.ip[player] = myGame->getIP(player);
+		msg.GameInfo.playerAccepted[player] = myGame->getAccepted(player);
+	}
+	msg.messageType = LANMessage::MSG_GAME_ANNOUNCE;
+*/
+	OnGameCreate(LANAPIInterface::RET_OK);
+}
+
+
+/*static const char slotListID		= 'S';
+static const char gameOptionsID	= 'G';
+static const char acceptID			= 'A';
+static const char wannaStartID	= 'W';
+
+AsciiString LANAPI::createSlotString( void )
+{
+	AsciiString slotList;
+	slotList.concat(slotListID);
+	for (int i=0; i<MAX_SLOTS; ++i)
+	{
+		LANGameSlot *slot = GetMyGame()->getLANSlot(i);
+		AsciiString str;
+		if (slot->isHuman())
+		{
+			str = "H";
+			LANPlayer *user = slot->getUser();
+			DEBUG_ASSERTCRASH(user, ("Human player has no User*!"));
+			AsciiString name;
+			name.translate(user->getName());
+			str.concat(name);
+			str.concat(',');
+		}
+		else if (slot->isAI())
+		{
+			if (slot->getState() == SLOT_EASY_AI)
+				str = "CE,";
+			if (slot->getState() == SLOT_MED_AI)
+				str = "CM,";
+			else
+				str = "CB,";
+		}
+		else if (slot->getState() == SLOT_OPEN)
+		{
+			str = "O,";
+		}
+		else if (slot->getState() == SLOT_CLOSED)
+		{
+			str = "X,";
+		}
+		else
+		{
+			DEBUG_ASSERTCRASH(false, ("Bad slot type"));
+			str = "X,";
+		}
+
+		slotList.concat(str);
+	}
+	return slotList;
+}
+*/
+/*
+void LANAPI::RequestSlotList( void )
+{
+
+	LANMessage reply;
+	reply.messageType = LANMessage::MSG_GAME_ANNOUNCE;
+	wcslcpy(reply.name, m_name.str(), ARRAY_SIZE(reply.name));
+	int player;
+	for (player = 0; player < MAX_SLOTS; ++player)
+	{
+		wcslcpy(reply.GameInfo.name[player], m_currentGame->getPlayerName(player).str(), ARRAY_SIZE(reply.GameInfo.name[player]));
+		reply.GameInfo.ip[player] = m_currentGame->getIP(player);
+		reply.GameInfo.playerAccepted[player] = m_currentGame->getSlot(player)->isAccepted();
+	}
+	wcslcpy(reply.GameInfo.gameName, m_currentGame->getName().str(), ARRAY_SIZE(reply.GameInfo.gameName));
+	reply.GameInfo.inProgress = m_currentGame->isGameInProgress();
+
+	sendMessage(&reply);
+
+	OnSlotList(LANAPIInterface::RET_OK, m_currentGame);
+}
+*/
+void LANAPI::RequestSetName( UnicodeString newName )
+{
+	newName.trim();
+	if (m_pendingAction != ACT_NONE)
+	{
+		// Can't change name while joining games
+		OnNameChange(m_localIP, newName);
+		return;
+	}
+
+	// Set up timer
+	m_lastResendTime = timeGetTime();
+
+	if (m_inLobby && m_pendingAction == ACT_NONE)
+	{
+		m_name = newName;
+		LANMessage msg;
+		fillInLANMessage( &msg );
+		msg.messageType = LANMessage::MSG_LOBBY_ANNOUNCE;
+		sendMessage(&msg);
+
+		// Update the interface
+		LANPlayer *player = LookupPlayer(m_localIP);
+		if (!player)
+		{
+			player = NEW LANPlayer;
+			player->setIP(m_localIP);
+		}
+		else
+		{
+			removePlayer(player);
+		}
+		player->setName(m_name);
+		player->setHost(m_hostName);
+		player->setLogin(m_userName);
+		player->setLastHeard(timeGetTime());
+
+		addPlayer(player);
+
+		OnNameChange(player->getIP(), player->getName());
+	}
+}
+
+void LANAPI::fillInLANMessage( LANMessage *msg )
+{
+	if (!msg)
+		return;
+
+	wcslcpy(msg->name, m_name.str(), ARRAY_SIZE(msg->name));
+	strlcpy(msg->userName, m_userName.str(), ARRAY_SIZE(msg->userName));
+	strlcpy(msg->hostName, m_hostName.str(), ARRAY_SIZE(msg->hostName));
+}
+
+void LANAPI::RequestLobbyLeave( Bool forced )
+{
+	LANMessage msg;
+	msg.messageType = LANMessage::MSG_REQUEST_LOBBY_LEAVE;
+	fillInLANMessage( &msg );
+	sendMessage(&msg);
+
+	if (forced)
+		m_transport->update();
+}
+
+// Misc utility functions
+LANGameInfo * LANAPI::LookupGame( UnicodeString gameName )
+{
+	LANGameInfo *theGame = m_games;
+
+	while (theGame && theGame->getName() != gameName)
+	{
+		theGame = theGame->getNext();
+	}
+
+	return theGame; // NULL means we didn't find anything.
+}
+
+LANGameInfo * LANAPI::LookupGameByListOffset( Int offset )
+{
+	LANGameInfo *theGame = m_games;
+
+	if (offset < 0)
+		return NULL;
+
+	while (offset-- && theGame)
+	{
+		theGame = theGame->getNext();
+	}
+
+	return theGame; // NULL means we didn't find anything.
+}
+
+void LANAPI::removeGame( LANGameInfo *game )
+{
+	LANGameInfo *g = m_games;
+	if (!game)
+	{
+		return;
+	}
+	else if (m_games == game)
+	{
+		m_games = m_games->getNext();
+	}
+	else
+	{
+		while (g->getNext() && g->getNext() != game)
+		{
+			g = g->getNext();
+		}
+		if (g->getNext() == game)
+		{
+			g->setNext(game->getNext());
+		}
+		else
+		{
+			// Odd.  We went the whole way without finding it in the list.
+			DEBUG_ASSERTCRASH(false, ("LANGameInfo wasn't in the list"));
+		}
+	}
+}
+
+LANPlayer * LANAPI::LookupPlayer( UnsignedInt playerIP )
+{
+	LANPlayer *thePlayer = m_lobbyPlayers;
+
+	while (thePlayer && thePlayer->getIP() != playerIP)
+	{
+		thePlayer = thePlayer->getNext();
+	}
+
+	return thePlayer; // NULL means we didn't find anything.
+}
+
+void LANAPI::removePlayer( LANPlayer *player )
+{
+	LANPlayer *p = m_lobbyPlayers;
+	if (!player)
+	{
+		return;
+	}
+	else if (m_lobbyPlayers == player)
+	{
+		m_lobbyPlayers = m_lobbyPlayers->getNext();
+	}
+	else
+	{
+		while (p->getNext() && p->getNext() != player)
+		{
+			p = p->getNext();
+		}
+		if (p->getNext() == player)
+		{
+			p->setNext(player->getNext());
+		}
+		else
+		{
+			// Odd.  We went the whole way without finding it in the list.
+			DEBUG_ASSERTCRASH(false, ("LANPlayer wasn't in the list"));
+		}
+	}
+}
+
+void LANAPI::addGame( LANGameInfo *game )
+{
+	if (!m_games)
+	{
+		m_games = game;
+		game->setNext(NULL);
+		return;
+	}
+	else
+	{
+		if (game->getName().compareNoCase(m_games->getName()) < 0)
+		{
+			game->setNext(m_games);
+			m_games = game;
+			return;
+		}
+		else
+		{
+			LANGameInfo *g = m_games;
+			while (g->getNext() && g->getNext()->getName().compareNoCase(game->getName()) > 0)
+			{
+				g = g->getNext();
+			}
+			game->setNext(g->getNext());
+			g->setNext(game);
+			return;
+		}
+	}
+}
+
+void LANAPI::addPlayer( LANPlayer *player )
+{
+	if (!m_lobbyPlayers)
+	{
+		m_lobbyPlayers = player;
+		player->setNext(NULL);
+		return;
+	}
+	else
+	{
+		if (player->getName().compareNoCase(m_lobbyPlayers->getName()) < 0)
+		{
+			player->setNext(m_lobbyPlayers);
+			m_lobbyPlayers = player;
+			return;
+		}
+		else
+		{
+			LANPlayer *p = m_lobbyPlayers;
+			while (p->getNext() && p->getNext()->getName().compareNoCase(player->getName()) > 0)
+			{
+				p = p->getNext();
+			}
+			player->setNext(p->getNext());
+			p->setNext(player);
+			return;
+		}
+	}
+}
+
+Bool LANAPI::SetLocalIP( UnsignedInt localIP )
+{
+	Bool retval = TRUE;
+	m_localIP = localIP;
+
+	m_transport->reset();
+	retval = m_transport->init(m_localIP, lobbyPort);
+	m_transport->allowBroadcasts(true);
+
+	return retval;
+}
+
+void LANAPI::SetLocalIP( AsciiString localIP )
+{
+	UnsignedInt resolvedIP = ResolveIP(localIP);
+	SetLocalIP(resolvedIP);
+}
+
+Bool LANAPI::AmIHost( void )
+{
+	return m_currentGame && m_currentGame->getIP(0) == m_localIP;
+}
+
+void LANAPI::setIsActive(Bool isActive) {
+	DEBUG_LOG(("LANAPI::setIsActive - entering"));
+	if (isActive != m_isActive) {
+		DEBUG_LOG(("LANAPI::setIsActive - m_isActive changed to %s", isActive ? "TRUE" : "FALSE"));
+		if (isActive == FALSE) {
+			if ((m_inLobby == FALSE) && (m_currentGame != NULL)) {
+				LANMessage msg;
+				fillInLANMessage( &msg );
+				msg.messageType = LANMessage::MSG_INACTIVE;
+				sendMessage(&msg);
+				DEBUG_LOG(("LANAPI::setIsActive - sent an IsActive message"));
+			}
+		}
+	}
+	m_isActive = isActive;
+}
diff --git a/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp b/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp
new file mode 100644
index 00000000000..ee3c87e3bf6
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp
@@ -0,0 +1,735 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////
+// FILE: LANAPICallbacks.cpp
+// Author: Chris Huybregts, October 2001
+// Description: LAN API Callbacks
+///////////////////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "strtok_r.h"
+#include "Common/GameEngine.h"
+#include "Common/GlobalData.h"
+#include "Common/MessageStream.h"
+#include "Common/MultiplayerSettings.h"
+#include "Common/PlayerTemplate.h"
+#include "Common/QuotedPrintable.h"
+#include "Common/RandomValue.h"
+#include "Common/UserPreferences.h"
+#include "GameClient/GameText.h"
+#include "GameClient/LanguageFilter.h"
+#include "GameClient/MapUtil.h"
+#include "GameClient/MessageBox.h"
+#include "GameLogic/GameLogic.h"
+#include "GameNetwork/FileTransfer.h"
+#include "GameNetwork/LANAPICallbacks.h"
+#include "GameNetwork/networkutil.h"
+
+LANAPI *TheLAN = NULL;
+extern Bool LANbuttonPushed;
+
+
+//Colors used for the chat dialogs
+const Color playerColor =  GameMakeColor(255,255,255,255);
+const Color gameColor =  GameMakeColor(255,255,255,255);
+const Color gameInProgressColor =  GameMakeColor(128,128,128,255);
+const Color chatNormalColor =  GameMakeColor(50,215,230,255);
+const Color chatActionColor =  GameMakeColor(255,0,255,255);
+const Color chatLocalNormalColor =  GameMakeColor(255,128,0,255);
+const Color chatLocalActionColor =  GameMakeColor(128,255,255,255);
+const Color chatSystemColor =  GameMakeColor(255,255,255,255);
+const Color acceptTrueColor =  GameMakeColor(0,255,0,255);
+const Color acceptFalseColor =  GameMakeColor(255,0,0,255);
+
+
+UnicodeString LANAPIInterface::getErrorStringFromReturnType( ReturnType ret )
+{
+	switch (ret)
+	{
+		case RET_OK:
+			return TheGameText->fetch("LAN:OK");
+		case RET_TIMEOUT:
+			return TheGameText->fetch("LAN:ErrorTimeout");
+		case RET_GAME_FULL:
+			return TheGameText->fetch("LAN:ErrorGameFull");
+		case RET_DUPLICATE_NAME:
+			return TheGameText->fetch("LAN:ErrorDuplicateName");
+		case RET_CRC_MISMATCH:
+			return TheGameText->fetch("LAN:ErrorCRCMismatch");
+		case RET_GAME_STARTED:
+			return TheGameText->fetch("LAN:ErrorGameStarted");
+		case RET_GAME_EXISTS:
+			return TheGameText->fetch("LAN:ErrorGameExists");
+		case RET_GAME_GONE:
+			return TheGameText->fetch("LAN:ErrorGameGone");
+		case RET_BUSY:
+			return TheGameText->fetch("LAN:ErrorBusy");
+		case RET_SERIAL_DUPE:
+			return TheGameText->fetch("WOL:ChatErrorSerialDup");
+		default:
+			return TheGameText->fetch("LAN:ErrorUnknown");
+	}
+}
+
+// On functions are (generally) the result of network traffic
+
+void LANAPI::OnAccept( UnsignedInt playerIP, Bool status )
+{
+	if( AmIHost() )
+	{
+		Int i = 0;
+		for (; i < MAX_SLOTS; i++)
+		{
+			if (m_currentGame->getIP(i) == playerIP)
+			{
+				if(status)
+					m_currentGame->getLANSlot(i)->setAccept();
+				else
+					m_currentGame->getLANSlot(i)->unAccept();
+				break;
+			}
+		}
+		if (i != MAX_SLOTS )
+		{
+			RequestGameOptions( GenerateGameOptionsString(), false );
+			lanUpdateSlotList();
+		}
+	}
+	else
+	{
+		//i'm not the host but if the accept came from the host...
+		if( m_currentGame->getIP(0) == playerIP )
+		{
+			UnicodeString text;
+			text = TheGameText->fetch("GUI:HostWantsToStart");
+			OnChat(L"SYSTEM", m_localIP, text, LANCHAT_SYSTEM);
+		}
+	}
+}
+
+void LANAPI::OnHasMap( UnsignedInt playerIP, Bool status )
+{
+	if( AmIHost() )
+	{
+		Int i = 0;
+		for (; i < MAX_SLOTS; i++)
+		{
+			if (m_currentGame->getIP(i) == playerIP)
+			{
+				m_currentGame->getLANSlot(i)->setMapAvailability( status );
+				break;
+			}
+		}
+		if (i != MAX_SLOTS )
+		{
+			UnicodeString mapDisplayName;
+			const MapMetaData *mapData = TheMapCache->findMap( m_currentGame->getMap() );
+			Bool willTransfer = TRUE;
+			if (mapData)
+			{
+				mapDisplayName.format(L"%ls", mapData->m_displayName.str());
+				if (mapData->m_isOfficial)
+					willTransfer = FALSE;
+			}
+			else
+			{
+				mapDisplayName.format(L"%hs", m_currentGame->getMap().str());
+				willTransfer = WouldMapTransfer(m_currentGame->getMap());
+			}
+			if (!status)
+			{
+				UnicodeString text;
+				if (willTransfer)
+					text.format(TheGameText->fetch("GUI:PlayerNoMapWillTransfer"), m_currentGame->getLANSlot(i)->getName().str(), mapDisplayName.str());
+				else
+					text.format(TheGameText->fetch("GUI:PlayerNoMap"), m_currentGame->getLANSlot(i)->getName().str(), mapDisplayName.str());
+				OnChat(L"SYSTEM", m_localIP, text, LANCHAT_SYSTEM);
+			}
+			lanUpdateSlotList();
+		}
+	}
+}
+
+void LANAPI::OnGameStartTimer( Int seconds )
+{
+	UnicodeString text;
+	if (seconds == 1)
+		text.format(TheGameText->fetch("LAN:GameStartTimerSingular"), seconds);
+	else
+		text.format(TheGameText->fetch("LAN:GameStartTimerPlural"), seconds);
+	OnChat(L"SYSTEM", m_localIP, text, LANCHAT_SYSTEM);
+}
+
+void LANAPI::OnGameStart( void )
+{
+	//DEBUG_LOG(("Map is '%s', preview is '%s'", m_currentGame->getMap().str(), GetPreviewFromMap(m_currentGame->getMap()).str()));
+	//DEBUG_LOG(("Map is '%s', INI is '%s'", m_currentGame->getMap().str(), GetINIFromMap(m_currentGame->getMap()).str()));
+
+	if (m_currentGame)
+	{
+		LANPreferences pref;
+		AsciiString option;
+		option.format("%d", m_currentGame->getLANSlot( m_currentGame->getLocalSlotNum() )->getPlayerTemplate());
+		pref["PlayerTemplate"] = option;
+		option.format("%d", m_currentGame->getLANSlot( m_currentGame->getLocalSlotNum() )->getColor());
+		pref["Color"] = option;
+		if (m_currentGame->amIHost())
+    {
+    	pref["Map"] = AsciiStringToQuotedPrintable(m_currentGame->getMap());
+      pref.setSuperweaponRestricted( m_currentGame->getSuperweaponRestriction() > 0 );
+      pref.setStartingCash( m_currentGame->getStartingCash() );
+    }
+		pref.write();
+
+		m_isInLANMenu = FALSE;
+
+		//m_currentGame->startGame(0);
+
+		// Set up the game network
+		DEBUG_ASSERTCRASH(TheNetwork == NULL, ("For some reason TheNetwork isn't NULL at the start of this game.  Better look into that."));
+
+		delete TheNetwork;
+		TheNetwork = NULL;
+
+		// Time to initialize TheNetwork for this game.
+		TheNetwork = NetworkInterface::createNetwork();
+		TheNetwork->init();
+		TheNetwork->setLocalAddress(m_localIP, 8088);
+		TheNetwork->initTransport();
+
+		TheNetwork->parseUserList(m_currentGame);
+
+		if (TheGameLogic->isInGame())
+			TheGameLogic->clearGameData();
+
+		Bool filesOk = DoAnyMapTransfers(m_currentGame);
+
+		// see if we really have the map.  if not, back out.
+		TheMapCache->updateCache();
+		if (!filesOk || TheMapCache->findMap(m_currentGame->getMap()) == NULL)
+		{
+			DEBUG_LOG(("After transfer, we didn't really have the map.  Bailing..."));
+			OnPlayerLeave(m_name);
+			removeGame(m_currentGame);
+			m_currentGame = NULL;
+			m_inLobby = TRUE;
+
+			delete TheNetwork;
+			TheNetwork = NULL;
+
+			OnChat(UnicodeString::TheEmptyString, 0, TheGameText->fetch("GUI:CouldNotTransferMap"), LANCHAT_SYSTEM);
+			return;
+		}
+
+		m_currentGame->startGame(0);
+
+		// shutdown the top, but do not pop it off the stack
+		//TheShell->hideShell();
+		// setup the Global Data with the Map and Seed
+		TheWritableGlobalData->m_pendingFile = m_currentGame->getMap();
+
+		// send a message to the logic for a new game
+		GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
+		msg->appendIntegerArgument(GAME_LAN);
+
+		TheWritableGlobalData->m_useFpsLimit = false;
+
+		// Set the random seed
+		InitGameLogicRandom( m_currentGame->getSeed() );
+		DEBUG_LOG(("InitGameLogicRandom( %d )", m_currentGame->getSeed()));
+	}
+}
+
+void LANAPI::OnGameOptions( UnsignedInt playerIP, Int playerSlot, AsciiString options )
+{
+	if (!m_currentGame)
+		return;
+
+	if (m_currentGame->getIP(playerSlot) != playerIP)
+		return; // He's not in our game?!?
+
+
+	if (m_currentGame->isGameInProgress())
+		return; // we don't want to process any game options while in game.
+
+	if (playerSlot == 0 && !m_currentGame->amIHost())
+	{
+		m_currentGame->setLastHeard(timeGetTime());
+		AsciiString oldOptions = GameInfoToAsciiString(m_currentGame); // save these off for if we get booted
+		if(ParseGameOptionsString(m_currentGame,options))
+		{
+			lanUpdateSlotList();
+			updateGameOptions();
+		}
+		Bool booted = true;
+		for(Int player = 1; player< MAX_SLOTS; player++)
+		{
+			if(m_currentGame->getIP(player) == m_localIP)
+			{
+				booted = false;
+				break;
+			}
+		}
+		if(booted)
+		{
+			// restore the options with us in so we can save prefs
+			ParseGameOptionsString(m_currentGame, oldOptions);
+			OnPlayerLeave(m_name);
+		}
+
+	}
+	else
+	{
+		// Check for user/host updates
+		{
+			AsciiString key;
+			AsciiString munkee = options;
+			munkee.nextToken(&key, "=");
+			//DEBUG_LOG(("GameOpt request: key=%s, val=%s from player %d", key.str(), munkee.str(), playerSlot));
+
+			LANGameSlot *slot = m_currentGame->getLANSlot(playerSlot);
+			if (!slot)
+				return;
+
+			if (key == "User")
+			{
+				slot->setLogin(munkee.str()+1);
+				return;
+			}
+			else if (key == "Host")
+			{
+				slot->setHost(munkee.str()+1);
+				return;
+			}
+		}
+
+		// Parse player requests (side, color, etc)
+		if( AmIHost() && m_localIP != playerIP)
+		{
+			if (options.compare("HELLO") == 0)
+			{
+				m_currentGame->setPlayerLastHeard(playerSlot, timeGetTime());
+			}
+			else
+			{
+				m_currentGame->setPlayerLastHeard(playerSlot, timeGetTime());
+				Bool change = false;
+				Bool shouldUnaccept = false;
+				AsciiString key;
+				options.nextToken(&key, "=");
+				Int val = atoi(options.str()+1);
+				DEBUG_LOG(("GameOpt request: key=%s, val=%s from player %d", key.str(), options.str(), playerSlot));
+
+				LANGameSlot *slot = m_currentGame->getLANSlot(playerSlot);
+				if (!slot)
+					return;
+
+				if (key == "Color")
+				{
+					if (val >= -1 && val < TheMultiplayerSettings->getNumColors() && val != slot->getColor() && slot->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
+					{
+						Bool colorAvailable = TRUE;
+						if(val != -1 )
+						{
+							for(Int i=0; i <MAX_SLOTS; i++)
+							{
+								LANGameSlot *checkSlot = m_currentGame->getLANSlot(i);
+								if(val == checkSlot->getColor() && slot != checkSlot)
+								{
+									colorAvailable = FALSE;
+									break;
+								}
+							}
+						}
+						if(colorAvailable)
+							slot->setColor(val);
+						change = true;
+					}
+					else
+					{
+						DEBUG_LOG(("Rejecting invalid color %d", val));
+					}
+				}
+				else if (key == "PlayerTemplate")
+				{
+					if (val >= PLAYERTEMPLATE_MIN && val < ThePlayerTemplateStore->getPlayerTemplateCount() && val != slot->getPlayerTemplate())
+					{
+						slot->setPlayerTemplate(val);
+						if (val == PLAYERTEMPLATE_OBSERVER)
+						{
+							slot->setColor(-1);
+							slot->setStartPos(-1);
+							slot->setTeamNumber(-1);
+						}
+						change = true;
+						shouldUnaccept = true;
+					}
+					else
+					{
+						DEBUG_LOG(("Rejecting invalid PlayerTemplate %d", val));
+					}
+				}
+				else if (key == "StartPos" && slot->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
+				{
+
+					if (val >= -1 && val < MAX_SLOTS && val != slot->getStartPos())
+					{
+						Bool startPosAvailable = TRUE;
+						if(val != -1)
+							for(Int i=0; i <MAX_SLOTS; i++)
+							{
+								LANGameSlot *checkSlot = m_currentGame->getLANSlot(i);
+								if(val == checkSlot->getStartPos() && slot != checkSlot)
+								{
+									startPosAvailable = FALSE;
+									break;
+								}
+							}
+						if(startPosAvailable)
+							slot->setStartPos(val);
+						change = true;
+						shouldUnaccept = true;
+					}
+					else
+					{
+						DEBUG_LOG(("Rejecting invalid startPos %d", val));
+					}
+				}
+				else if (key == "Team")
+				{
+					if (val >= -1 && val < MAX_SLOTS/2 && val != slot->getTeamNumber() && slot->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
+					{
+						slot->setTeamNumber(val);
+						change = true;
+						shouldUnaccept = true;
+					}
+					else
+					{
+						DEBUG_LOG(("Rejecting invalid team %d", val));
+					}
+				}
+				else if (key == "NAT")
+				{
+					if ((val >= FirewallHelperClass::FIREWALL_TYPE_SIMPLE) &&
+							(val <= FirewallHelperClass::FIREWALL_TYPE_DESTINATION_PORT_DELTA))
+					{
+						slot->setNATBehavior((FirewallHelperClass::FirewallBehaviorType)val);
+						DEBUG_LOG(("NAT behavior set to %d for player %d", val, playerSlot));
+						change = true;
+					}
+					else
+					{
+						DEBUG_LOG(("Rejecting invalid NAT behavior %d", (Int)val));
+					}
+				}
+
+				if (change)
+				{
+					if (shouldUnaccept)
+						m_currentGame->resetAccepted();
+					RequestGameOptions(GenerateGameOptionsString(), true);
+					lanUpdateSlotList();
+					DEBUG_LOG(("Slot value is color=%d, PlayerTemplate=%d, startPos=%d, team=%d",
+						slot->getColor(), slot->getPlayerTemplate(), slot->getStartPos(), slot->getTeamNumber()));
+					DEBUG_LOG(("Slot list updated to %s", GenerateGameOptionsString().str()));
+				}
+			}
+		}
+	}
+}
+
+
+/*
+void LANAPI::OnSlotList( ReturnType ret, LANGameInfo *theGame )
+{
+	if (!theGame || theGame != m_currentGame)
+		return;
+
+	Bool foundMe = false;
+	for (int player = 0; player < MAX_SLOTS; ++player)
+	{
+		if (m_currentGame->getIP(player) == m_localIP)
+		{
+			foundMe = true;
+			break;
+		}
+	}
+	if (!foundMe)
+	{
+		// I've been kicked - back to the lobby for me!
+		// We're counting on the fact that OnPlayerLeave winds up calling reset on TheLAN.
+		OnPlayerLeave(m_name);
+		return;
+	}
+
+	lanUpdateSlotList();
+}
+*/
+void LANAPI::OnPlayerJoin( Int slot, UnicodeString playerName )
+{
+	if (m_currentGame && m_currentGame->getIP(0) == m_localIP)
+	{
+		// Someone New Joined.. lets reset the accepts
+		m_currentGame->resetAccepted();
+
+		// Send out the game options
+		RequestGameOptions(GenerateGameOptionsString(), true);
+	}
+
+	lanUpdateSlotList();
+}
+
+void LANAPI::OnGameJoin( ReturnType ret, LANGameInfo *theGame )
+{
+	if (ret == RET_OK)
+	{
+		LANbuttonPushed = true;
+		TheShell->push( "Menus/LanGameOptionsMenu.wnd" );
+		//lanUpdateSlotList();
+
+		LANPreferences pref;
+		AsciiString options;
+		options.format("PlayerTemplate=%d", pref.getPreferredFaction());
+		RequestGameOptions(options, true);
+		options.format("Color=%d", pref.getPreferredColor());
+		RequestGameOptions(options, true);
+		options.format("User=%s", m_userName.str());
+		RequestGameOptions( options, true );
+		options.format("Host=%s", m_hostName.str());
+		RequestGameOptions( options, true );
+		options.format("NAT=%d", FirewallHelperClass::FIREWALL_TYPE_SIMPLE); // BGC: This is a LAN game, so there is no firewall.
+		RequestGameOptions( options, true );
+	}
+	else if (ret != RET_BUSY)
+	{
+		/// @todo: re-enable lobby controls?  Error msgs?
+		UnicodeString title, body;
+		title = TheGameText->fetch("LAN:JoinFailed");
+		body = getErrorStringFromReturnType(ret);
+		MessageBoxOk(title, body, NULL);
+	}
+}
+
+void LANAPI::OnHostLeave( void )
+{
+	DEBUG_ASSERTCRASH(!m_inLobby && m_currentGame, ("Game info is gone!"));
+	if (m_inLobby || !m_currentGame)
+		return;
+	LANbuttonPushed = true;
+	DEBUG_LOG(("Host left - popping to lobby"));
+	TheShell->pop();
+}
+
+void LANAPI::OnPlayerLeave( UnicodeString player )
+{
+	DEBUG_ASSERTCRASH(!m_inLobby && m_currentGame, ("Game info is gone!"));
+	if (m_inLobby || !m_currentGame || m_currentGame->isGameInProgress())
+		return;
+
+	if (m_name.compare(player) == 0)
+	{
+		// We're leaving.  Save options and Pop the shell up a screen.
+		//DEBUG_ASSERTCRASH(false, ("Slot is %d", m_currentGame->getLocalSlotNum()));
+		if (m_currentGame && m_currentGame->isInGame() && m_currentGame->getLocalSlotNum() >= 0)
+		{
+			LANPreferences pref;
+			AsciiString option;
+			option.format("%d", m_currentGame->getLANSlot( m_currentGame->getLocalSlotNum() )->getPlayerTemplate());
+			pref["PlayerTemplate"] = option;
+			option.format("%d", m_currentGame->getLANSlot( m_currentGame->getLocalSlotNum() )->getColor());
+			pref["Color"] = option;
+			if (m_currentGame->amIHost())
+				pref["Map"] = AsciiStringToQuotedPrintable(m_currentGame->getMap());
+			pref.write();
+		}
+		LANbuttonPushed = true;
+		DEBUG_LOG(("OnPlayerLeave says we're leaving!  pop away!"));
+		TheShell->pop();
+	}
+	else
+	{
+		if (m_currentGame && m_currentGame->getIP(0) == m_localIP)
+		{
+			// Force a new slotlist send
+			m_lastResendTime = 0;
+
+			lanUpdateSlotList();
+			RequestGameOptions( GenerateGameOptionsString(), true );
+
+		}
+	}
+}
+
+void LANAPI::OnGameList( LANGameInfo *gameList )
+{
+
+	if (m_inLobby)
+	{
+		LANDisplayGameList(listboxGames, gameList);
+	}
+}
+
+void LANAPI::OnGameCreate( ReturnType ret )
+{
+	if (ret == RET_OK)
+	{
+
+		LANbuttonPushed = true;
+		TheShell->push( "Menus/LanGameOptionsMenu.wnd" );
+
+		RequestLobbyLeave( false );
+		//RequestGameAnnounce( ); // can't do this here, since we don't have a map set
+	}
+	else
+	{
+		if(m_inLobby)
+		{
+			switch( ret )
+			{
+			case RET_GAME_EXISTS:
+				GadgetListBoxAddEntryText(listboxChatWindow, TheGameText->fetch("LAN:ErrorGameExists"), chatSystemColor, -1, -1);
+				break;
+			case RET_BUSY:
+				GadgetListBoxAddEntryText(listboxChatWindow, TheGameText->fetch("LAN:ErrorBusy"), chatSystemColor, -1, -1);
+				break;
+			default:
+				GadgetListBoxAddEntryText(listboxChatWindow, TheGameText->fetch("LAN:ErrorUnknown"), chatSystemColor, -1, -1);
+			}
+		}
+	}
+
+}
+
+void LANAPI::OnPlayerList( LANPlayer *playerList )
+{
+	if (m_inLobby)
+	{
+
+		UnsignedInt selectedIP = 0;
+		Int selectedIndex = -1;
+		Int indexToSelect = -1;
+		GadgetListBoxGetSelected(listboxPlayers, &selectedIndex);
+
+		if (selectedIndex != -1 )
+			selectedIP = (UnsignedInt) GadgetListBoxGetItemData(listboxPlayers, selectedIndex, 0);
+
+		GadgetListBoxReset(listboxPlayers);
+
+		LANPlayer *player = m_lobbyPlayers;
+		while (player)
+		{
+			Int addedIndex = GadgetListBoxAddEntryText(listboxPlayers, player->getName(), playerColor, -1, -1);
+			GadgetListBoxSetItemData(listboxPlayers, (void *)player->getIP(),addedIndex, 0 );
+
+			if (selectedIP == player->getIP())
+				indexToSelect = addedIndex;
+
+			player = player->getNext();
+		}
+
+		if (indexToSelect >= 0)
+			GadgetListBoxSetSelected(listboxPlayers, indexToSelect);
+	}
+}
+
+void LANAPI::OnNameChange( UnsignedInt IP, UnicodeString newName )
+{
+	OnPlayerList(m_lobbyPlayers);
+}
+
+void LANAPI::OnInActive(UnsignedInt IP) {
+
+}
+
+void LANAPI::OnChat( UnicodeString player, UnsignedInt ip, UnicodeString message, ChatType format )
+{
+	GameWindow *chatWindow = NULL;
+
+	if (m_inLobby)
+	{
+		chatWindow = listboxChatWindow;
+	}
+	else if( m_currentGame && m_currentGame->isGameInProgress() && TheShell->isShellActive())
+	{
+		chatWindow = listboxChatWindowScoreScreen;
+	}
+	else if( m_currentGame && !m_currentGame->isGameInProgress())
+	{
+		chatWindow = listboxChatWindowLanGame;
+	}
+	if (chatWindow == NULL)
+		return;
+	Int index = -1;
+	UnicodeString unicodeChat;
+	switch (format)
+	{
+		case LANAPIInterface::LANCHAT_SYSTEM:
+			unicodeChat = message;
+			index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatSystemColor, -1, -1);
+			break;
+		case LANAPIInterface::LANCHAT_EMOTE:
+			unicodeChat = player;
+			unicodeChat.concat(L' ');
+			unicodeChat.concat(message);
+			if (ip == m_localIP)
+				index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatLocalActionColor, -1, -1);
+			else
+				index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatActionColor, -1, -1);
+			break;
+		case LANAPIInterface::LANCHAT_NORMAL:
+		default:
+		{
+			// Do the language filtering.
+			TheLanguageFilter->filterLine(message);
+
+			Color chatColor = GameMakeColor(255, 255, 255, 255);
+			if (m_currentGame)
+			{
+				Int slotNum = m_currentGame->getSlotNum(player);
+				// it'll be -1 if its invalid.
+				if (slotNum >= 0) {
+					GameSlot *gs = m_currentGame->getSlot(slotNum);
+					if (gs) {
+						Int colorIndex = gs->getColor();
+						MultiplayerColorDefinition *def = TheMultiplayerSettings->getColor(colorIndex);
+						if (def)
+							chatColor = def->getColor();
+					}
+				}
+			}
+
+			unicodeChat = L"[";
+			unicodeChat.concat(player);
+			unicodeChat.concat(L"] ");
+			unicodeChat.concat(message);
+			if (ip == m_localIP)
+				index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatColor, -1, -1);
+			else
+				index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatColor, -1, -1);
+			break;
+		}
+	}
+	GadgetListBoxSetItemData(chatWindow, (void *)-1, index);
+}
diff --git a/Core/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp b/Core/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp
new file mode 100644
index 00000000000..61660ff964c
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp
@@ -0,0 +1,725 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////
+// FILE: LANAPIHandlers.cpp
+// Author: Matthew D. Campbell, October 2001
+// Description: LAN callback handlers
+///////////////////////////////////////////////////////////////////////////////////////
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/crc.h"
+#include "Common/GameState.h"
+#include "Common/Registry.h"
+#include "Common/GlobalData.h"
+#include "Common/QuotedPrintable.h"
+#include "Common/UserPreferences.h"
+#include "GameNetwork/LANAPI.h"
+#include "GameNetwork/LANAPICallbacks.h"
+#include "GameClient/MapUtil.h"
+
+void LANAPI::handleRequestLocations( LANMessage *msg, UnsignedInt senderIP )
+{
+	if (m_inLobby)
+	{
+		LANMessage reply;
+		fillInLANMessage( &reply );
+		reply.messageType = LANMessage::MSG_LOBBY_ANNOUNCE;
+
+		sendMessage(&reply);
+		m_lastResendTime = timeGetTime();
+	}
+	else
+	{
+		// In game - are we a game host?
+		if (m_currentGame)
+		{
+			if (m_currentGame->getIP(0) == m_localIP)
+			{
+				LANMessage reply;
+				fillInLANMessage( &reply );
+				reply.messageType = LANMessage::MSG_GAME_ANNOUNCE;
+				AsciiString gameOpts = GenerateGameOptionsString();
+				strlcpy(reply.GameInfo.options, gameOpts.str(), ARRAY_SIZE(reply.GameInfo.options));
+				wcslcpy(reply.GameInfo.gameName, m_currentGame->getName().str(), ARRAY_SIZE(reply.GameInfo.gameName));
+				reply.GameInfo.inProgress = m_currentGame->isGameInProgress();
+				reply.GameInfo.isDirectConnect = m_currentGame->getIsDirectConnect();
+
+				sendMessage(&reply);
+			}
+			else
+			{
+				// We're a joiner
+			}
+		}
+	}
+	// Add the player to the lobby player list
+	LANPlayer *player = LookupPlayer(senderIP);
+	if (!player)
+	{
+		player = NEW LANPlayer;
+		player->setIP(senderIP);
+	}
+	else
+	{
+		removePlayer(player);
+	}
+	player->setName(UnicodeString(msg->name));
+	player->setHost(msg->hostName);
+	player->setLogin(msg->userName);
+	player->setLastHeard(timeGetTime());
+
+	addPlayer(player);
+
+	OnNameChange(player->getIP(), player->getName());
+}
+
+void LANAPI::handleGameAnnounce( LANMessage *msg, UnsignedInt senderIP )
+{
+	if (senderIP == m_localIP)
+	{
+		return; // Don't try to update own info
+	}
+	else if (m_currentGame && m_currentGame->isGameInProgress())
+	{
+		return; // Don't care about games if we're playing
+	}
+	else if (senderIP == m_directConnectRemoteIP)
+	{
+
+		if (m_currentGame == NULL)
+		{
+			LANGameInfo *game = LookupGame(UnicodeString(msg->GameInfo.gameName));
+			if (!game)
+			{
+				game = NEW LANGameInfo;
+				game->setName(UnicodeString(msg->GameInfo.gameName));
+				addGame(game);
+			}
+			Bool success = ParseGameOptionsString(game,AsciiString(msg->GameInfo.options));
+			game->setGameInProgress(msg->GameInfo.inProgress);
+			game->setIsDirectConnect(msg->GameInfo.isDirectConnect);
+			game->setLastHeard(timeGetTime());
+			if (!success)
+			{
+				// remove from list
+				removeGame(game);
+				delete game;
+				return;
+			}
+			RequestGameJoin(game, m_directConnectRemoteIP);
+		}
+	}
+	else
+	{
+		LANGameInfo *game = LookupGame(UnicodeString(msg->GameInfo.gameName));
+		if (!game)
+		{
+			game = NEW LANGameInfo;
+			game->setName(UnicodeString(msg->GameInfo.gameName));
+			addGame(game);
+		}
+		Bool success = ParseGameOptionsString(game,AsciiString(msg->GameInfo.options));
+		game->setGameInProgress(msg->GameInfo.inProgress);
+		game->setIsDirectConnect(msg->GameInfo.isDirectConnect);
+		game->setLastHeard(timeGetTime());
+		if (!success)
+		{
+			// remove from list
+			removeGame(game);
+			delete game;
+			game = NULL;
+		}
+
+		OnGameList( m_games );
+	//	if (game == m_currentGame && !m_inLobby)
+	//		OnSlotList(RET_OK, game);
+	}
+}
+
+void LANAPI::handleLobbyAnnounce( LANMessage *msg, UnsignedInt senderIP )
+{
+	LANPlayer *player = LookupPlayer(senderIP);
+	if (!player)
+	{
+		player = NEW LANPlayer;
+		player->setIP(senderIP);
+	}
+	else
+	{
+		removePlayer(player);
+	}
+	player->setName(UnicodeString(msg->name));
+	player->setHost(msg->hostName);
+	player->setLogin(msg->userName);
+	player->setLastHeard(timeGetTime());
+
+	addPlayer(player);
+
+	OnNameChange(player->getIP(), player->getName());
+}
+
+void LANAPI::handleRequestGameInfo( LANMessage *msg, UnsignedInt senderIP )
+{
+	// In game - are we a game host?
+	if (m_currentGame)
+	{
+		if (m_currentGame->getIP(0) == m_localIP || (m_currentGame->isGameInProgress() && TheNetwork && TheNetwork->isPacketRouter())) // if we're in game we should reply if we're the packet router
+		{
+			LANMessage reply;
+			fillInLANMessage( &reply );
+			reply.messageType = LANMessage::MSG_GAME_ANNOUNCE;
+
+			AsciiString gameOpts = GameInfoToAsciiString(m_currentGame);
+			strlcpy(reply.GameInfo.options,gameOpts.str(), ARRAY_SIZE(reply.GameInfo.options));
+			wcslcpy(reply.GameInfo.gameName, m_currentGame->getName().str(), ARRAY_SIZE(reply.GameInfo.gameName));
+			reply.GameInfo.inProgress = m_currentGame->isGameInProgress();
+			reply.GameInfo.isDirectConnect = m_currentGame->getIsDirectConnect();
+
+			sendMessage(&reply, senderIP);
+		}
+	}
+}
+
+static Bool IsInvalidCharForPlayerName(const WideChar c)
+{
+	return c < L' ' // C0 control chars
+		|| c == L',' || c == L':' || c == L';' // chars used for strtok in ParseAsciiStringToGameInfo
+		|| (c >= L'\x007f' && c <= L'\x009f') // DEL + C1 control chars
+		|| c == L'\x2028' || c == L'\x2029' // line and paragraph separators
+		|| (c >= L'\xdc00' && c <= L'\xdfff') // low surrogate, for chars beyond the Unicode Basic Multilingual Plane
+		|| (c >= L'\xd800' && c <= L'\xdbff'); // high surrogate, for chars beyond the BMP
+}
+
+static Bool IsSpaceCharacter(const WideChar c)
+{
+	return c == L' ' // space
+		|| c == L'\xA0' // no-break space
+		|| c == L'\x1680' // ogham space mark
+		|| (c >= L'\x2000' && c <= L'\x200A') // en/em spaces, figure, punctuation, thin, hair
+		|| c == L'\x202F' // narrow no-break space
+		|| c == L'\x205F' // medium mathematical space
+		|| c == L'\x3000'; // ideographic space
+}
+
+static Bool ContainsInvalidChars(const WideChar* playerName)
+{
+	DEBUG_ASSERTCRASH(playerName != NULL, ("playerName is NULL"));
+	while (*playerName)
+	{
+		if (IsInvalidCharForPlayerName(*playerName++))
+			return true;
+	}
+
+	return false;
+}
+
+static Bool ContainsAnyReadableChars(const WideChar* playerName)
+{
+	DEBUG_ASSERTCRASH(playerName != NULL, ("playerName is NULL"));
+	while (*playerName)
+	{
+		if (!IsSpaceCharacter(*playerName++))
+			return true;
+	}
+
+	return false;
+}
+
+void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP )
+{
+	UnsignedInt responseIP = senderIP;	// need this cause the player may or may not be
+																			// in the player list at the sendMessage.
+
+	if (msg->GameToJoin.gameIP != m_localIP)
+	{
+		return; // Not us.  Ignore it.
+	}
+	LANMessage reply;
+	fillInLANMessage( &reply );
+	if (!m_inLobby && m_currentGame && m_currentGame->getIP(0) == m_localIP)
+	{
+		if (m_currentGame->isGameInProgress())
+		{
+			reply.messageType = LANMessage::MSG_JOIN_DENY;
+			reply.GameNotJoined.reason = LANAPIInterface::RET_GAME_STARTED;
+			reply.GameNotJoined.gameIP = m_localIP;
+			reply.GameNotJoined.playerIP = senderIP;
+			DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because game already started."));
+		}
+		else
+		{
+			int player;
+			Bool canJoin = true;
+
+			// see if the CRCs match
+#if defined(RTS_DEBUG)
+			if (TheGlobalData->m_netMinPlayers > 0) {
+#endif
+// TheSuperHackers @todo Enable CRC checks!
+#if !RTS_ZEROHOUR
+			if (msg->GameToJoin.iniCRC != TheGlobalData->m_iniCRC ||
+					msg->GameToJoin.exeCRC != TheGlobalData->m_exeCRC)
+			{
+				DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of CRC mismatch. CRCs are them/us INI:%X/%X exe:%X/%X",
+					msg->GameToJoin.iniCRC, TheGlobalData->m_iniCRC,
+					msg->GameToJoin.exeCRC, TheGlobalData->m_exeCRC));
+				reply.messageType = LANMessage::MSG_JOIN_DENY;
+				reply.GameNotJoined.reason = LANAPIInterface::RET_CRC_MISMATCH;
+				reply.GameNotJoined.gameIP = m_localIP;
+				reply.GameNotJoined.playerIP = senderIP;
+				canJoin = false;
+			}
+#endif
+#if defined(RTS_DEBUG)
+			}
+#endif
+
+// TheSuperHackers @tweak Disables the duplicate serial check
+#if 0
+			// check for a duplicate serial
+			AsciiString s;
+			for (player = 0; canJoin && player<MAX_SLOTS; ++player)
+			{
+				LANGameSlot *slot = m_currentGame->getLANSlot(player);
+				s.clear();
+				if (player == 0)
+				{
+					GetStringFromRegistry("\\ergc", "", s);
+				}
+				else if (slot->isHuman())
+				{
+					s = slot->getSerial();
+					if (s.isEmpty())
+						s = "<Munkee>";
+				}
+
+				if (s.isNotEmpty())
+				{
+					DEBUG_LOG(("Checking serial '%s' in slot %d", s.str(), player));
+
+					if (!strncmp(s.str(), msg->GameToJoin.serial, g_maxSerialLength))
+					{
+						// serials match!  kick the punk!
+						reply.messageType = LANMessage::MSG_JOIN_DENY;
+						reply.GameNotJoined.reason = LANAPIInterface::RET_SERIAL_DUPE;
+						reply.GameNotJoined.gameIP = m_localIP;
+						reply.GameNotJoined.playerIP = senderIP;
+						canJoin = false;
+
+						DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of duplicate serial # (%s).", s.str()));
+						break;
+					}
+				}
+			}
+#endif
+
+			// TheSuperHackers @bugfix slurmlord 18/09/2025 need to validate the name of the connecting player before
+			// allowing them to join to prevent messing up the format of game state string. Commas, colons, semicolons etc.
+			// should not be in a player name. It should also not consist of only space characters.
+			if (canJoin)
+			{
+				if (ContainsInvalidChars(msg->name) || !ContainsAnyReadableChars(msg->name))
+				{
+					// Just deny with a duplicate name reason, for backwards compatibility with retail
+					reply.messageType = LANMessage::MSG_JOIN_DENY;
+					reply.GameNotJoined.reason = LANAPIInterface::RET_DUPLICATE_NAME;
+					reply.GameNotJoined.gameIP = m_localIP;
+					reply.GameNotJoined.playerIP = senderIP;
+					canJoin = false;
+
+					DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of illegal characters in the player name."));
+				}
+			}	
+
+			// Then see if the player has a duplicate name
+			for (player = 0; canJoin && player<MAX_SLOTS; ++player)
+			{
+				LANGameSlot *slot = m_currentGame->getLANSlot(player);
+				if (slot->isHuman() && slot->getName().compare(msg->name) == 0)
+				{
+					// just deny duplicates
+					reply.messageType = LANMessage::MSG_JOIN_DENY;
+					reply.GameNotJoined.reason = LANAPIInterface::RET_DUPLICATE_NAME;
+					reply.GameNotJoined.gameIP = m_localIP;
+					reply.GameNotJoined.playerIP = senderIP;
+					canJoin = false;
+
+					DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of duplicate names."));
+					break;
+				}
+			}
+
+			// TheSuperHackers @bugfix Stubbjax 26/09/2025 Players can now join open slots regardless of starting spots on the map.
+			for (player = 0; canJoin && player<MAX_SLOTS; ++player)
+			{
+				if (m_currentGame->getLANSlot(player)->isOpen())
+				{
+					// OK, add him in.
+					reply.messageType = LANMessage::MSG_JOIN_ACCEPT;
+					wcslcpy(reply.GameJoined.gameName, m_currentGame->getName().str(), ARRAY_SIZE(reply.GameJoined.gameName));
+					reply.GameJoined.slotPosition = player;
+					reply.GameJoined.gameIP = m_localIP;
+					reply.GameJoined.playerIP = senderIP;
+
+					LANGameSlot newSlot;
+					newSlot.setState(SLOT_PLAYER, UnicodeString(msg->name));
+					newSlot.setIP(senderIP);
+					newSlot.setPort(NETWORK_BASE_PORT_NUMBER);
+					newSlot.setLastHeard(timeGetTime());
+					newSlot.setSerial(msg->GameToJoin.serial);
+					m_currentGame->setSlot(player,newSlot);
+					DEBUG_LOG(("LANAPI::handleRequestJoin - added player %ls at ip 0x%08x to the game", msg->name, senderIP));
+
+					OnPlayerJoin(player, UnicodeString(msg->name));
+					responseIP = 0;
+
+					break;
+				}
+			}
+
+			if (canJoin && player == MAX_SLOTS)
+			{
+				reply.messageType = LANMessage::MSG_JOIN_DENY;
+				wcslcpy(reply.GameNotJoined.gameName, m_currentGame->getName().str(), ARRAY_SIZE(reply.GameNotJoined.gameName));
+				reply.GameNotJoined.reason = LANAPIInterface::RET_GAME_FULL;
+				reply.GameNotJoined.gameIP = m_localIP;
+				reply.GameNotJoined.playerIP = senderIP;
+				DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because game is full."));
+			}
+		}
+	}
+	else
+	{
+		reply.messageType = LANMessage::MSG_JOIN_DENY;
+		reply.GameNotJoined.reason = LANAPIInterface::RET_GAME_GONE;
+		reply.GameNotJoined.gameIP = m_localIP;
+		reply.GameNotJoined.playerIP = senderIP;
+	}
+	sendMessage(&reply, responseIP);
+	RequestGameOptions(GenerateGameOptionsString(), true);
+}
+
+void LANAPI::handleJoinAccept( LANMessage *msg, UnsignedInt senderIP )
+{
+	if (msg->GameJoined.playerIP == m_localIP) // Is it for us?
+	{
+		if (m_pendingAction == ACT_JOIN) // Are we trying to join?
+		{
+			m_currentGame = LookupGame(UnicodeString(msg->GameJoined.gameName));
+
+			if (!m_currentGame)
+			{
+				DEBUG_ASSERTCRASH(false, ("Could not find game to join!"));
+				OnGameJoin(RET_UNKNOWN, NULL);
+			}
+			else
+			{
+				m_inLobby = false;
+				AsciiString options = GameInfoToAsciiString(m_currentGame);
+				m_currentGame->enterGame();
+				ParseAsciiStringToGameInfo(m_currentGame, options);
+
+				Int pos = msg->GameJoined.slotPosition;
+
+				LANGameSlot slot;
+				slot.setState(SLOT_PLAYER, m_name);
+				slot.setIP(m_localIP);
+				slot.setPort(NETWORK_BASE_PORT_NUMBER);
+				slot.setLastHeard(0);
+				slot.setLogin(m_userName);
+				slot.setHost(m_hostName);
+				m_currentGame->setSlot(pos, slot);
+
+				m_currentGame->getLANSlot(0)->setHost(msg->hostName);
+				m_currentGame->getLANSlot(0)->setLogin(msg->userName);
+
+				LANPreferences prefs;
+				AsciiString entry;
+				entry.format("%d.%d.%d.%d:%s", PRINTF_IP_AS_4_INTS(senderIP), UnicodeStringToQuotedPrintable(m_currentGame->getSlot(0)->getName()).str());
+				prefs["RemoteIP0"] = entry;
+				prefs.write();
+
+				OnGameJoin(RET_OK, m_currentGame);
+				//DEBUG_ASSERTCRASH(false, ("setting host to %ls@%ls", m_currentGame->getLANSlot(0)->getUser()->getLogin().str(),
+				//	m_currentGame->getLANSlot(0)->getUser()->getHost().str()));
+			}
+			m_pendingAction = ACT_NONE;
+			m_expiration = 0;
+		}
+	}
+}
+
+void LANAPI::handleJoinDeny( LANMessage *msg, UnsignedInt senderIP )
+{
+	if (msg->GameJoined.playerIP == m_localIP) // Is it for us?
+	{
+		if (m_pendingAction == ACT_JOIN) // Are we trying to join?
+		{
+			OnGameJoin(msg->GameNotJoined.reason, LookupGame(UnicodeString(msg->GameNotJoined.gameName)));
+			m_pendingAction = ACT_NONE;
+			m_expiration = 0;
+		}
+	}
+}
+
+void LANAPI::handleRequestGameLeave( LANMessage *msg, UnsignedInt senderIP )
+{
+	if (!m_inLobby && m_currentGame && !m_currentGame->isGameInProgress())
+	{
+		int player;
+		for (player = 0; player < MAX_SLOTS; ++player)
+		{
+			if (m_currentGame->getIP(player) == senderIP)
+			{
+				if (player == 0)
+				{
+					OnHostLeave();
+					removeGame(m_currentGame);
+					delete m_currentGame;
+					m_currentGame = NULL;
+
+					/// @todo re-add myself to lobby?  Or just keep me there all the time?  If we send a LOBBY_ANNOUNCE things'll work out...
+					LANPlayer *lanPlayer = LookupPlayer(m_localIP);
+					if (!lanPlayer)
+					{
+						lanPlayer = NEW LANPlayer;
+						lanPlayer->setIP(m_localIP);
+					}
+					else
+					{
+						removePlayer(lanPlayer);
+					}
+					lanPlayer->setName(UnicodeString(m_name));
+					lanPlayer->setHost(m_hostName);
+					lanPlayer->setLogin(m_userName);
+					lanPlayer->setLastHeard(timeGetTime());
+					addPlayer(lanPlayer);
+
+				}
+				else
+				{
+					if (AmIHost())
+					{
+						// remove the deadbeat
+						LANGameSlot slot;
+						slot.setState(SLOT_OPEN);
+						m_currentGame->setSlot( player, slot );
+					}
+					OnPlayerLeave(UnicodeString(msg->name));
+					m_currentGame->getLANSlot(player)->setState(SLOT_OPEN);
+					m_currentGame->resetAccepted();
+					RequestGameOptions(GenerateGameOptionsString(), false, senderIP);
+					//m_currentGame->endGame();
+				}
+				break;
+			}
+			DEBUG_ASSERTCRASH(player < MAX_SLOTS, ("Didn't find player!"));
+		}
+	}
+	else if (m_inLobby)
+	{
+		// Look for dissappearing games
+		LANGameInfo *game = m_games;
+		while (game)
+		{
+			if (game->getName().compare(msg->GameToLeave.gameName) == 0)
+			{
+				removeGame(game);
+				delete game;
+				OnGameList(m_games);
+				break;
+			}
+			game = game->getNext();
+		}
+	}
+}
+
+void LANAPI::handleRequestLobbyLeave( LANMessage *msg, UnsignedInt senderIP )
+{
+	if (m_inLobby)
+	{
+		LANPlayer *player = m_lobbyPlayers;
+		while (player)
+		{
+			if (player->getIP() == senderIP)
+			{
+				removePlayer(player);
+				OnPlayerList(m_lobbyPlayers);
+				break;
+			}
+			player = player->getNext();
+		}
+	}
+}
+
+void LANAPI::handleSetAccept( LANMessage *msg, UnsignedInt senderIP )
+{
+	if (!m_inLobby && m_currentGame && !m_currentGame->isGameInProgress())
+	{
+		int player;
+		for (player = 0; player < MAX_SLOTS; ++player)
+		{
+			if (m_currentGame->getIP(player) == senderIP)
+			{
+				OnAccept(senderIP, msg->Accept.isAccepted);
+				break;
+			}
+		}
+	}
+}
+
+void LANAPI::handleHasMap( LANMessage *msg, UnsignedInt senderIP )
+{
+	if (!m_inLobby && m_currentGame)
+	{
+		CRC mapNameCRC;
+//	mapNameCRC.computeCRC(m_currentGame->getMap().str(), m_currentGame->getMap().getLength());
+		AsciiString portableMapName = TheGameState->realMapPathToPortableMapPath(m_currentGame->getMap());
+		mapNameCRC.computeCRC(portableMapName.str(), portableMapName.getLength());
+		if (mapNameCRC.get() != msg->MapStatus.mapCRC)
+		{
+			return;
+		}
+
+		int player;
+		for (player = 0; player < MAX_SLOTS; ++player)
+		{
+			if (m_currentGame->getIP(player) == senderIP)
+			{
+				OnHasMap(senderIP, msg->MapStatus.hasMap);
+				break;
+			}
+		}
+	}
+}
+
+void LANAPI::handleChat( LANMessage *msg, UnsignedInt senderIP )
+{
+	if (m_inLobby)
+	{
+		LANPlayer *player;
+		if((player=LookupPlayer(senderIP)) != 0)
+		{
+			OnChat(UnicodeString(player->getName()), player->getIP(), UnicodeString(msg->Chat.message), msg->Chat.chatType);
+			player->setLastHeard(timeGetTime());
+		}
+	}
+	else
+	{
+		if (LookupGame(UnicodeString(msg->Chat.gameName)) != m_currentGame)
+		{
+			DEBUG_LOG(("Game '%ls' is not my game", msg->Chat.gameName));
+			if (m_currentGame)
+			{
+				DEBUG_LOG(("Current game is '%ls'", m_currentGame->getName().str()));
+			}
+			return;
+		}
+
+		int player;
+		for (player = 0; player < MAX_SLOTS; ++player)
+		{
+			if (m_currentGame && m_currentGame->getIP(player) == senderIP)
+			{
+				OnChat(UnicodeString(msg->name), m_currentGame->getIP(player), UnicodeString(msg->Chat.message), msg->Chat.chatType);
+				break;
+			}
+		}
+	}
+}
+
+void LANAPI::handleGameStart( LANMessage *msg, UnsignedInt senderIP )
+{
+	if (!m_inLobby && m_currentGame && m_currentGame->getIP(0) == senderIP && !m_currentGame->isGameInProgress())
+	{
+		OnGameStart();
+	}
+}
+
+void LANAPI::handleGameStartTimer( LANMessage *msg, UnsignedInt senderIP )
+{
+	if (!m_inLobby && m_currentGame && m_currentGame->getIP(0) == senderIP && !m_currentGame->isGameInProgress())
+	{
+		OnGameStartTimer(msg->StartTimer.seconds);
+	}
+}
+
+void LANAPI::handleGameOptions( LANMessage *msg, UnsignedInt senderIP )
+{
+	if (!m_inLobby && m_currentGame && !m_currentGame->isGameInProgress())
+	{
+		int player;
+		for (player = 0; player < MAX_SLOTS; ++player)
+		{
+			if (m_currentGame->getIP(player) == senderIP)
+			{
+				OnGameOptions(senderIP, player, AsciiString(msg->GameOptions.options));
+				break;
+			}
+		}
+	}
+}
+
+void LANAPI::handleInActive(LANMessage *msg, UnsignedInt senderIP) {
+	if (m_inLobby || (m_currentGame == NULL) || (m_currentGame->isGameInProgress())) {
+		return;
+	}
+
+	// check to see if we are the host of this game.
+	if (m_currentGame->amIHost() == FALSE) {
+		return;
+	}
+
+	UnicodeString playerName;
+	playerName = msg->name;
+
+	Int slotNum = m_currentGame->getSlotNum(playerName);
+	if (slotNum < 0)
+		return;
+	GameSlot *slot = m_currentGame->getSlot(slotNum);
+	if (slot == NULL) {
+		return;
+	}
+
+	if (senderIP != slot->getIP()) {
+		return;
+	}
+
+	// don't want to unaccept the host, that's silly.  They can't hit start alt-tabbed anyways.
+	if (senderIP == GetLocalIP()) {
+		return;
+	}
+
+	// only unaccept if the timer hasn't started yet.
+	if (m_gameStartTime != 0) {
+		return;
+	}
+
+	slot->unAccept();
+	AsciiString options = GenerateGameOptionsString();
+	RequestGameOptions(options, FALSE);
+	lanUpdateSlotList();
+}
diff --git a/Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp b/Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp
new file mode 100644
index 00000000000..a34b6ea0e74
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp
@@ -0,0 +1,318 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: LANGameInfo.cpp //////////////////////////////////////////////////////
+// LAN game setup state info
+// Author: Matthew D. Campbell, December 2001
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameClient/GameInfoWindow.h"
+#include "GameClient/GameText.h"
+#include "GameClient/GadgetListBox.h"
+#include "GameNetwork/LANGameInfo.h"
+#include "GameNetwork/LANAPICallbacks.h"
+#include "Common/MultiplayerSettings.h"
+#include "strtok_r.h"
+/*
+#include "GameNetwork/LAN.h"
+#include "GameNetwork/LANGame.h"
+#include "GameNetwork/LANPing.h"
+#include "GameNetwork/LANusers.h"
+#include "GameNetwork/LANmenus.h"
+*/
+
+// Singleton ------------------------------------------
+
+LANGameInfo *TheLANGameInfo = NULL;
+
+// LANGameSlot ----------------------------------------
+
+LANGameSlot::LANGameSlot()
+{
+	m_lastHeard = 0;
+}
+
+
+LANPlayer * LANGameSlot::getUser( void )
+{
+	if (isHuman())
+	{
+		m_user.setIP(getIP());
+		m_user.setLastHeard(getLastHeard());
+		m_user.setName(getName());
+		m_user.setNext(NULL);
+		return &m_user;
+	}
+	return NULL;
+}
+
+// Various tests
+Bool LANGameSlot::isUser( LANPlayer *user )
+{
+	return (user && m_state == SLOT_PLAYER && user->getIP() == getIP());
+}
+
+Bool LANGameSlot::isUser( UnicodeString userName )
+{
+	return (m_state == SLOT_PLAYER && !userName.compareNoCase(getName()));
+}
+
+Bool LANGameSlot::isLocalPlayer( void ) const
+{
+	return isHuman() && TheLAN && TheLAN->GetLocalIP() == getIP();
+}
+
+// LANGameInfo ----------------------------------------
+
+LANGameInfo::LANGameInfo()
+{
+	m_lastHeard = 0;
+	m_next = NULL;
+	m_isDirectConnect = false;
+	//
+	for (Int i = 0; i< MAX_SLOTS; ++i)
+		setSlotPointer(i, &m_LANSlot[i]);
+
+	setLocalIP(TheLAN->GetLocalIP());
+}
+
+void LANGameInfo::setSlot( Int slotNum, LANGameSlot slotInfo )
+{
+	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("LANGameInfo::setSlot - Invalid slot number"));
+	if (slotNum < 0 || slotNum >= MAX_SLOTS)
+		return;
+
+	m_LANSlot[slotNum] = slotInfo;
+
+	if (slotNum == 0)
+	{
+		m_LANSlot[slotNum].setAccept();
+		m_LANSlot[slotNum].setMapAvailability(true);
+	}
+}
+
+LANGameSlot* LANGameInfo::getLANSlot( Int slotNum )
+{
+	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("LANGameInfo::getLANSlot - Invalid slot number"));
+	if (slotNum < 0 || slotNum >= MAX_SLOTS)
+		return NULL;
+
+	return &m_LANSlot[slotNum];
+}
+
+const LANGameSlot* LANGameInfo::getConstLANSlot( Int slotNum ) const
+{
+	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("LANGameInfo::getConstLANSlot - Invalid slot number"));
+	if (slotNum < 0 || slotNum >= MAX_SLOTS)
+		return NULL;
+
+	return &m_LANSlot[slotNum];
+}
+
+Int LANGameInfo::getLocalSlotNum( void ) const
+{
+	DEBUG_ASSERTCRASH(m_inGame, ("Looking for local game slot while not in game"));
+	if (!m_inGame)
+		return -1;
+
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		const LANGameSlot *slot = getConstLANSlot(i);
+		if (slot->isLocalPlayer())
+			return i;
+	}
+	return -1;
+}
+
+Int LANGameInfo::getSlotNum( UnicodeString userName )
+{
+	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
+	if (!m_inGame)
+		return -1;
+
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		LANGameSlot *slot = getLANSlot(i);
+		if (slot->isUser( userName ))
+			return i;
+	}
+	return -1;
+}
+
+Bool LANGameInfo::amIHost( void )
+{
+	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
+	if (!m_inGame)
+		return false;
+
+	return getLANSlot(0)->isLocalPlayer();
+}
+
+void LANGameInfo::setMap( AsciiString mapName )
+{
+	GameInfo::setMap(mapName);
+}
+
+void LANGameInfo::setSeed( Int seed )
+{
+	GameInfo::setSeed(seed);
+}
+
+void LANGameInfo::resetAccepted( void )
+{
+	if (TheLAN)
+	{
+		TheLAN->ResetGameStartTimer();
+		if (TheLAN->GetMyGame() == this && TheLAN->AmIHost())
+			LANEnableStartButton(true);
+	}
+	for(int i = 0; i< MAX_SLOTS; i++)
+	{
+		m_LANSlot[i].unAccept();
+	}
+}
+// Misc game-related functionality --------------------
+
+
+void LANDisplayGameList( GameWindow *gameListbox, LANGameInfo *gameList )
+{
+	LANGameInfo *selectedPtr = NULL;
+	Int selectedIndex = -1;
+	Int indexToSelect = -1;
+	if (gameListbox)
+	{
+		GadgetListBoxGetSelected(gameListbox, &selectedIndex);
+
+		if (selectedIndex != -1 )
+		{
+			selectedPtr = (LANGameInfo *)GadgetListBoxGetItemData(gameListbox, selectedIndex, 0);
+		}
+
+		GadgetListBoxReset(gameListbox);
+
+		while (gameList)
+		{
+			UnicodeString txtGName;
+			if( gameList->isGameInProgress() )
+			{
+				txtGName.concat(L"[");
+			}
+			txtGName.concat(gameList->getPlayerName(0));
+			if( gameList->isGameInProgress() )
+			{
+				txtGName.concat(L"]");
+			}
+			Int addedIndex = GadgetListBoxAddEntryText(gameListbox, txtGName, (gameList->isGameInProgress())?gameInProgressColor:gameColor, -1, -1);
+			GadgetListBoxSetItemData(gameListbox, (void *)gameList, addedIndex, 0 );
+
+			if (selectedPtr == gameList)
+				indexToSelect = addedIndex;
+
+			gameList = gameList->getNext();
+		}
+
+		if (indexToSelect >= 0)
+			GadgetListBoxSetSelected(gameListbox, indexToSelect);
+		else
+			HideGameInfoWindow(TRUE);
+	}
+}
+
+AsciiString GenerateGameOptionsString( void )
+{
+	if(!TheLAN->GetMyGame() || !TheLAN->GetMyGame()->amIHost())
+		return AsciiString::TheEmptyString;
+
+	return GameInfoToAsciiString(TheLAN->GetMyGame());
+}
+
+Bool ParseGameOptionsString(LANGameInfo *game, AsciiString options)
+{
+	if (!TheLAN || !game)
+		return false;
+
+	Int oldLocalSlotNum = (game->isInGame()) ? game->getLocalSlotNum() : -1;
+	Bool wasInGame = oldLocalSlotNum >= 0;
+//	Int hadMap = wasInGame && game->getSlot(oldLocalSlotNum)->hasMap();
+	AsciiString oldMap = game->getMap();
+	UnsignedInt oldMapCRC, newMapCRC;
+	oldMapCRC = game->getMapCRC();
+
+	std::map<UnicodeString, UnicodeString> oldLogins, oldMachines;
+	std::map<UnicodeString, UnicodeString>::iterator mapIt;
+	Int i;
+	for (i=0; i<MAX_SLOTS; ++i)
+	{
+		LANGameSlot *slot = game->getLANSlot(i);
+		if (slot && slot->isHuman())
+		{
+			//DEBUG_LOG(("Saving off %ls@%ls for %ls", slot->getUser()->getLogin().str(), slot->getUser()->getHost().str(), slot->getName().str()));
+			oldLogins[slot->getName()] = slot->getUser()->getLogin();
+			oldMachines[slot->getName()] = slot->getUser()->getHost();
+		}
+	}
+
+	if (ParseAsciiStringToGameInfo(game, options))
+	{
+		Int newLocalSlotNum = (game->isInGame()) ? game->getLocalSlotNum() : -1;
+		Bool isInGame = newLocalSlotNum >= 0;
+		if (!TheLAN->AmIHost() && isInGame)
+		{
+//			Int hasMap = game->getSlot(newLocalSlotNum)->hasMap();
+			newMapCRC = game->getMapCRC();
+			//DEBUG_LOG(("wasInGame:%d isInGame:%d hadMap:%d hasMap:%d oldMap:%s newMap:%s", wasInGame, isInGame, hadMap, hasMap, oldMap.str(), game->getMap().str()));
+			if ( (oldMapCRC ^ newMapCRC)/*(hasMap ^ hadMap)*/ || (!wasInGame && isInGame) )
+			{
+				// it changed.  send it
+				TheLAN->RequestHasMap();
+				lanUpdateSlotList();
+				updateGameOptions();
+			}
+		}
+		// clean up LAN users, etc.
+		UnsignedInt now = timeGetTime();
+		for (i=0; i<MAX_SLOTS; ++i)
+		{
+			LANGameSlot *slot = game->getLANSlot(i);
+
+			if (slot->isHuman())
+			{
+				slot->setLastHeard(now);
+				mapIt = oldLogins.find(slot->getName());
+				if (mapIt != oldLogins.end())
+					slot->setLogin(mapIt->second);
+				mapIt = oldMachines.find(slot->getName());
+				if (mapIt != oldMachines.end())
+					slot->setHost(mapIt->second);
+				//DEBUG_LOG(("Restored %ls@%ls for %ls", slot->getUser()->getLogin().str(), slot->getUser()->getHost().str(), slot->getName().str()));
+			}
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
diff --git a/Core/GameEngine/Source/GameNetwork/NAT.cpp b/Core/GameEngine/Source/GameNetwork/NAT.cpp
new file mode 100644
index 00000000000..03e58556756
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/NAT.cpp
@@ -0,0 +1,1290 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: NAT.cpp /////////////////////////////////////////////////////////////////////////////////
+// Author: Bryan Cleveland April 2002
+// Props to Steve Tall for figuring all the NAT and Firewall behavior patterns out, making my job
+// a LOT easier.
+// Desc:   Resolves NAT'd IPs and port numbers for the other players in a game.
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/NAT.h"
+#include "GameNetwork/Transport.h"
+#include "GameNetwork/NetworkDefs.h"
+#include "GameClient/EstablishConnectionsMenu.h"
+#include "GameNetwork/NetworkInterface.h"
+#include "GameNetwork/GameInfo.h"
+#include "GameNetwork/GameSpy/PeerThread.h"
+#include "GameNetwork/GameSpy/PeerDefs.h"
+#include "GameNetwork/GameSpy/PersistentStorageThread.h"
+#include "GameNetwork/GameSpy/GSConfig.h"
+
+
+/*
+ * In case you're wondering, we do this weird connection pairing scheme
+ * to speed up the negotiation process, especially in cases where there
+ * are 4 or more players (nodes).  Take for example an 8 player game...
+ * In an 8 player game there are 28 connections that need to be negotiated,
+ * doing this pairing scheme thing, we can make those 28 connections in the
+ * time it would normally take to make 7 connections.  Since each connection
+ * could potentially take several seconds, this can be a HUGE time savings.
+
+ * Right now you're probably wondering who this Bryan Cleveland guy is.
+ * He's the network coder that got fired when this didn't work.
+
+ * In case you're wondering, this did end up working and Bryan left by
+ * his own choice.
+ */
+//										m_connectionPairs[num nodes]	[round]			 [node index]
+/* static */ Int NAT::m_connectionPairs[MAX_SLOTS-1][MAX_SLOTS-1][MAX_SLOTS] =
+{
+	{	// 2 nodes
+		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
+		{			1,			0,			-1,			-1,			-1,			-1,			-1,			-1},	// round 0
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 1
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 2
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 3
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 4
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
+	},
+	{	// 3 nodes
+		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
+		{			1,			0,			-1,			-1,			-1,			-1,			-1,			-1},	// round 0
+		{			2,			-1,			0,			-1,			-1,			-1,			-1,			-1},	// round 1
+		{			-1,			2,			1,			-1,			-1,			-1,			-1,			-1},	// round 2
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 3
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 4
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
+	},
+	{	// 4 nodes
+		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
+		{			1,			0,			3,			2,			-1,			-1,			-1,			-1},	// round 0
+		{			2,			3,			0,			1,			-1,			-1,			-1,			-1},	// round 1
+		{			3,			2,			1,			0,			-1,			-1,			-1,			-1},	// round 2
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 3
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 4
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
+	},
+	{	// 5 nodes
+		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
+		{			2,			4,			0,			-1,			1,			-1,			-1,			-1},	// round 0
+		{			-1,			3,			4,			1,			2,			-1,			-1,			-1},	// round 1
+		{			3,			2,			1,			0,			-1,			-1,			-1,			-1},	// round 2
+		{			4,			-1,			3,			2,			0,			-1,			-1,			-1},	// round 3
+		{			1,			0,			-1,			4,			3,			-1,			-1,			-1},	// round 4
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
+	},
+	{	// 6 nodes
+		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
+		{			3,			5,			4,			0,			2,			1,			-1,			-1},	// round 0
+		{			2,			4,			0,			5,			1,			3,			-1,			-1},	// round 1
+		{			4,			3,			5,			1,			0,			2,			-1,			-1},	// round 2
+		{			1,			0,			3,			2,			5,			4,			-1,			-1},	// round 3
+		{			5,			2,			1,			4,			3,			0,			-1,			-1},	// round 4
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
+		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
+	},
+	{	// 7 nodes
+		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
+		{			-1,			6,			5,			4,			3,			2,			1,			-1},	// round 0
+		{			2,			-1,			0,			6,			5,			4,			3,			-1},	// round 1
+		{			4,			3,			-1,			1,			0,			6,			5,			-1},	// round 2
+		{			6,			5,			4,			-1,			2,			1,			0,			-1},	// round 3
+		{			1,			0,			6,			5,			-1,			3,			2,			-1},	// round 4
+		{			3,			2,			1,			0,			6,			-1,			4,			-1},	// round 5
+		{			5,			4,			3,			2,			1,			0,			-1,			-1}		// round 6
+	},
+	{	// 8 nodes
+		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
+		{			4,			5,			6,			7,			0,			1,			2,			3},		// round 0
+		{			5,			4,			7,			6,			1,			0,			3,			2},		// round 1
+		{			3,			6,			5,			0,			7,			2,			1,			4},		// round 2
+		{			2,			7,			0,			5,			6,			3,			4,			1},		// round 3
+		{			6,			3,			4,			1,			2,			7,			0,			5},		// round 4
+		{			1,			0,			3,			2,			5,			4,			7,			6},		// round 5
+		{			7,			2,			1,			4,			3,			6,			5,			0}		// round 6
+	}
+};
+
+/* static */ Int NAT::m_timeBetweenRetries = 500; // .5 seconds between retries sounds good to me.
+/* static */ time_t NAT::m_manglerRetryTimeInterval = 300; // sounds good to me.
+/* static */ Int NAT::m_maxAllowedManglerRetries = 25; // works for me.
+/* static */ time_t NAT::m_keepaliveInterval = 15000; // 15 seconds between keepalive packets seems good.
+/* static */ time_t NAT::m_timeToWaitForPort = 15000; // wait for 15 seconds for the other player's port number.
+/* static */ time_t NAT::m_timeForRoundTimeout = 15000; // wait for at most 15 seconds for each connection round to finish.
+
+NAT *TheNAT = NULL;
+
+NAT::NAT()
+{
+	m_beenProbed = FALSE;
+	m_connectionPairIndex = 0;
+	m_connectionRound = 0;
+	m_localIP = 0;
+	m_localNodeNumber = 0;
+	m_manglerAddress = 0;
+	m_manglerRetries = 0;
+	m_numNodes = 0;
+	m_numRetries = 0;
+	m_previousSourcePort = 0;
+	for(Int i = 0; i < MAX_SLOTS; i++)
+		m_sourcePorts[i] = 0;
+	m_spareSocketPort = 0;
+	m_startingPortNumber = 0;
+	m_targetNodeNumber = 0;
+	m_transport = NULL;
+	m_slotList = NULL;
+	m_roundTimeout = 0;
+	m_maxNumRetriesAllowed = 10;
+	m_packetID = 0x7f00;
+}
+
+NAT::~NAT() {
+}
+
+// if we're already finished, change to being idle
+// if we are negotiating now, check to see if this round is done
+// if it is, check to see if we're completely done with all rounds.
+// if we are, set state to be done.
+// if not go on to the next connection round.
+// if we are negotiating still, call the connection update
+// check to see if this connection is done for us, or if it has failed.
+enum { MS_TO_WAIT_FOR_STATS = 5000 };
+NATStateType NAT::update() {
+	static UnsignedInt s_startStatWaitTime = 0;
+	if (m_NATState == NATSTATE_DONE) {
+		m_NATState = NATSTATE_IDLE;
+	} else if (m_NATState == NATSTATE_WAITFORSTATS) {
+		// check for all stats
+		Bool gotAllStats = TRUE;
+		Bool timedOut = FALSE;
+		for (Int i=0; i<MAX_SLOTS; ++i)
+		{
+			const GameSpyGameSlot *slot = TheGameSpyGame->getGameSpySlot(i);
+			if (slot && slot->isHuman())
+			{
+				PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(slot->getProfileID());
+				if (stats.id == 0)
+				{
+					gotAllStats = FALSE;
+					//DEBUG_LOG(("Failed to find stats for %ls(%d)", slot->getName().str(), slot->getProfileID()));
+				}
+			}
+		}
+		// check for timeout.  Timing out is not a fatal error - it just means we didn't get the other
+		// player's stats.  We'll see 0/0 as his record, but we can still play him just fine.
+		UnsignedInt now = timeGetTime();
+		if (now > s_startStatWaitTime + MS_TO_WAIT_FOR_STATS)
+		{
+			DEBUG_LOG(("Timed out waiting for stats.  Let's just start the dang game."));
+			timedOut = TRUE;
+		}
+		if (gotAllStats || timedOut)
+		{
+			m_NATState = NATSTATE_DONE;
+			TheEstablishConnectionsMenu->endMenu();
+
+			delete TheFirewallHelper;
+			TheFirewallHelper = NULL;
+		}
+	} else if (m_NATState == NATSTATE_DOCONNECTIONPATHS) {
+		if (allConnectionsDoneThisRound() == TRUE) {
+			// we finished this round, move on to the next one.
+			++m_connectionRound;
+//			m_roundTimeout = timeGetTime() + TheGameSpyConfig->getRoundTimeout();
+			m_roundTimeout = timeGetTime() + m_timeForRoundTimeout;
+			DEBUG_LOG(("NAT::update - done with connection round, moving on to round %d", m_connectionRound));
+
+			// we finished that round, now check to see if we're done, or if there are more rounds to go.
+			if (allConnectionsDone() == TRUE) {
+				// we're all done, time to go back home.
+				m_NATState = NATSTATE_WAITFORSTATS;
+
+				// 2/19/03 BGC - we have successfully negotaited a NAT thingy, so our behavior must be correct
+				// so therefore we don't need to refresh our NAT even if we previously thought we had to.
+				TheFirewallHelper->flagNeedToRefresh(FALSE);
+
+				s_startStatWaitTime = timeGetTime();
+				DEBUG_LOG(("NAT::update - done with all connections, woohoo!!"));
+				/*
+				m_NATState = NATSTATE_DONE;
+				TheEstablishConnectionsMenu->endMenu();
+
+				delete TheFirewallHelper;
+				TheFirewallHelper = NULL;
+				*/
+			} else {
+				doThisConnectionRound();
+			}
+		}
+		NATConnectionState state = connectionUpdate();
+
+		if (timeGetTime() > m_roundTimeout) {
+			DEBUG_LOG(("NAT::update - round timeout expired"));
+			setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
+			notifyUsersOfConnectionFailed(m_localNodeNumber);
+		}
+
+		if (state == NATCONNECTIONSTATE_FAILED) {
+			// if we fail
+			m_NATState = NATSTATE_FAILED;
+			TheEstablishConnectionsMenu->endMenu();
+			if (TheFirewallHelper != NULL) {
+				// we failed NAT negotiation, perhaps we need to redetect our firewall settings.
+				// We don't trust the user to do it for themselves so we force them to do it next time
+				// the log in.
+				// 2/19/03 - ok, we don't want to do this right away, if the user tries to play in another game
+				// before they log out and log back in the game won't have a chance at working.
+				// so we need to simply flag it so that when they log out the firewall behavior gets blown away.
+				TheFirewallHelper->flagNeedToRefresh(TRUE);
+//				TheWritableGlobalData->m_firewallBehavior = FirewallHelperClass::FIREWALL_TYPE_UNKNOWN;
+//				TheFirewallHelper->writeFirewallBehavior();
+
+				delete TheFirewallHelper;
+				TheFirewallHelper = NULL;
+			}
+			// we failed to connect, so we don't have to pass on the transport to the network.
+			delete m_transport;
+			m_transport = NULL;
+		}
+	}
+	return m_NATState;
+}
+
+
+// update transport, check for PROBE packets from our target.
+// check to see if its time to PROBE our target
+// MANGLER:
+// if we are talking to the mangler, check to see if we got a response
+// if we didn't get a response, check to see if its time to send another packet to it
+NATConnectionState NAT::connectionUpdate() {
+
+	GameSlot *targetSlot = NULL;
+	if (m_targetNodeNumber >= 0) {
+		targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
+	} else {
+		return m_connectionStates[m_localNodeNumber];
+	}
+
+	if (m_beenProbed == FALSE) {
+		if (timeGetTime() >= m_nextPortSendTime) {
+//			sendMangledPortNumberToTarget(m_previousSourcePort, targetSlot);
+			sendMangledPortNumberToTarget(m_sourcePorts[m_targetNodeNumber], targetSlot);
+//			m_nextPortSendTime = timeGetTime() + TheGameSpyConfig->getRetryInterval();
+			m_nextPortSendTime = timeGetTime() + m_timeBetweenRetries;
+		}
+	}
+
+	// check to see if its time to send out our keepalives.
+	if (timeGetTime() >= m_nextKeepaliveTime) {
+		for (UnsignedInt node = 0; node < m_numNodes; ++node) {
+			if (m_myConnections[node] == TRUE) {
+				// we've made this connection, send a keepalive.
+				Int slotIndex = m_connectionNodes[node].m_slotIndex;
+				GameSlot *slot = m_slotList[slotIndex];
+				DEBUG_ASSERTCRASH(slot != NULL, ("Trying to send keepalive to a NULL slot"));
+				if (slot != NULL) {
+					UnsignedInt ip = slot->getIP();
+					DEBUG_LOG(("NAT::connectionUpdate - sending keep alive to node %d at %d.%d.%d.%d:%d", node,
+											PRINTF_IP_AS_4_INTS(ip), slot->getPort()));
+					m_transport->queueSend(ip, slot->getPort(), (const unsigned char *)"KEEPALIVE", strlen("KEEPALIVE") + 1);
+				}
+			}
+		}
+//		m_nextKeepaliveTime = timeGetTime() + TheGameSpyConfig->getKeepaliveInterval();
+		m_nextKeepaliveTime = timeGetTime() + m_keepaliveInterval;
+	}
+
+	m_transport->update();
+
+	// check to see if we've been probed.
+	for (Int i = 0; i < MAX_MESSAGES; ++i) {
+		if (m_transport->m_inBuffer[i].length > 0) {
+#ifdef DEBUG_LOGGING
+			UnsignedInt ip = m_transport->m_inBuffer[i].addr;
+#endif
+			DEBUG_LOG(("NAT::connectionUpdate - got a packet from %d.%d.%d.%d:%d, length = %d",
+									PRINTF_IP_AS_4_INTS(ip), m_transport->m_inBuffer[i].port, m_transport->m_inBuffer[i].length));
+			UnsignedByte *data = m_transport->m_inBuffer[i].data;
+			if (memcmp(data, "PROBE", strlen("PROBE")) == 0) {
+				Int fromNode = atoi((char *)data + strlen("PROBE"));
+				DEBUG_LOG(("NAT::connectionUpdate - we've been probed by node %d.", fromNode));
+
+				if (fromNode == m_targetNodeNumber) {
+					DEBUG_LOG(("NAT::connectionUpdate - probe was sent by our target, setting connection state %d to done.", m_targetNodeNumber));
+					setConnectionState(m_targetNodeNumber, NATCONNECTIONSTATE_DONE);
+
+					if (m_transport->m_inBuffer[i].addr != targetSlot->getIP()) {
+						UnsignedInt fromIP = m_transport->m_inBuffer[i].addr;
+#ifdef DEBUG_LOGGING
+						UnsignedInt slotIP = targetSlot->getIP();
+#endif
+						DEBUG_LOG(("NAT::connectionUpdate - incomming packet has different from address than we expected, incoming: %d.%d.%d.%d expected: %d.%d.%d.%d",
+												PRINTF_IP_AS_4_INTS(fromIP),
+												PRINTF_IP_AS_4_INTS(slotIP)));
+						targetSlot->setIP(fromIP);
+					}
+					if (m_transport->m_inBuffer[i].port != targetSlot->getPort()) {
+						DEBUG_LOG(("NAT::connectionUpdate - incoming packet came from a different port than we expected, incoming: %d expected: %d",
+												m_transport->m_inBuffer[i].port, targetSlot->getPort()));
+						targetSlot->setPort(m_transport->m_inBuffer[i].port);
+						m_sourcePorts[m_targetNodeNumber] = m_transport->m_inBuffer[i].port;
+					}
+					notifyUsersOfConnectionDone(m_targetNodeNumber);
+				}
+
+				m_transport->m_inBuffer[i].length = 0;
+			}
+			if (memcmp(data, "KEEPALIVE", strlen("KEEPALIVE")) == 0) {
+				// keep alive packet, just toss it.
+				DEBUG_LOG(("NAT::connectionUpdate - got keepalive from %d.%d.%d.%d:%d",
+										PRINTF_IP_AS_4_INTS(ip), m_transport->m_inBuffer[i].port));
+				m_transport->m_inBuffer[i].length = 0;
+			}
+		}
+	}
+
+	// we are waiting for our target to tell us that they have received our probe.
+	if (m_connectionStates[m_localNodeNumber] == NATCONNECTIONSTATE_WAITINGFORRESPONSE) {
+		// check to see if it's time to probe our target.
+		if ((m_timeTillNextSend != -1) && (m_timeTillNextSend <= timeGetTime())) {
+			if (m_numRetries > m_maxNumRetriesAllowed) {
+				DEBUG_LOG(("NAT::connectionUpdate - too many retries, connection failed."));
+				setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
+
+				notifyUsersOfConnectionFailed(m_localNodeNumber);
+			} else {
+				DEBUG_LOG(("NAT::connectionUpdate - trying to send another probe (#%d) to our target", m_numRetries+1));
+				// Send a probe.
+				sendAProbe(targetSlot->getIP(), targetSlot->getPort(), m_localNodeNumber);
+//				m_timeTillNextSend = timeGetTime() + TheGameSpyConfig->getRetryInterval();
+				m_timeTillNextSend = timeGetTime() + m_timeBetweenRetries;
+
+				// tell the target they've been probed. In other words, our port is open.
+				notifyTargetOfProbe(targetSlot);
+
+				++m_numRetries;
+			}
+		}
+	}
+
+	// we are waiting for a response from the mangler to tell us what port we're using.
+	if (m_connectionStates[m_localNodeNumber] == NATCONNECTIONSTATE_WAITINGFORMANGLERRESPONSE) {
+		UnsignedShort mangledPort = 0;
+		if (TheFirewallHelper != NULL) {
+			mangledPort = TheFirewallHelper->getManglerResponse(m_packetID);
+		}
+		if (mangledPort != 0) {
+			// we got a response.  now we need to start probing (unless of course we have a netgear)
+			processManglerResponse(mangledPort);
+
+			// we know there is a firewall helper if we got here.
+			TheFirewallHelper->closeSpareSocket(m_spareSocketPort);
+			m_spareSocketPort = 0;
+		} else {
+			if (timeGetTime() >= m_manglerRetryTime) {
+				++m_manglerRetries;
+//				if (m_manglerRetries > TheGameSpyConfig->getMaxManglerRetries()) {
+				if (m_manglerRetries > m_maxAllowedManglerRetries) {
+					// we couldn't communicate with the mangler, just use our non-mangled
+					// port number and hope that works.
+					DEBUG_LOG(("NAT::connectionUpdate - couldn't talk with the mangler using default port number"));
+					sendMangledPortNumberToTarget(getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex), targetSlot);
+					m_sourcePorts[m_targetNodeNumber] = getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex);
+					setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
+				} else {
+					if (TheFirewallHelper != NULL) {
+						DEBUG_LOG(("NAT::connectionUpdate - trying to send to the mangler again. mangler address: %d.%d.%d.%d, from port: %d, packet ID:%d",
+							PRINTF_IP_AS_4_INTS(m_manglerAddress), m_spareSocketPort, m_packetID));
+						TheFirewallHelper->sendToManglerFromPort(m_manglerAddress, m_spareSocketPort, m_packetID);
+					}
+//					m_manglerRetryTime = TheGameSpyConfig->getRetryInterval() + timeGetTime();
+					m_manglerRetryTime = m_manglerRetryTimeInterval + timeGetTime();
+				}
+			}
+		}
+	}
+
+	if (m_connectionStates[m_localNodeNumber] == NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT) {
+		if (timeGetTime() > m_timeoutTime) {
+			DEBUG_LOG(("NAT::connectionUpdate - waiting too long to get the other player's port number, failed."));
+			setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
+
+			notifyUsersOfConnectionFailed(m_localNodeNumber);
+		}
+	}
+
+	return m_connectionStates[m_localNodeNumber];
+}
+
+// this is the function that starts the NAT/firewall negotiation process.
+// after calling this, you should call the update function untill it returns
+// NATSTATE_DONE.
+void NAT::establishConnectionPaths() {
+	DEBUG_LOG(("NAT::establishConnectionPaths - entering"));
+	m_NATState = NATSTATE_DOCONNECTIONPATHS;
+	DEBUG_LOG(("NAT::establishConnectionPaths - using %d as our starting port number", m_startingPortNumber));
+	if (TheEstablishConnectionsMenu == NULL) {
+		TheEstablishConnectionsMenu = NEW EstablishConnectionsMenu;
+	}
+	TheEstablishConnectionsMenu->initMenu();
+
+	if (TheFirewallHelper == NULL) {
+		TheFirewallHelper = createFirewallHelper();
+	}
+
+	DEBUG_ASSERTCRASH(m_slotList != NULL, ("NAT::establishConnectionPaths - don't have a slot list"));
+	if (m_slotList == NULL) {
+		return;
+	}
+
+	// determine how many nodes we have.
+	m_numNodes = 0;
+	Int i = 0;
+	for (; i < MAX_SLOTS; ++i) {
+		if (m_slotList[i] != NULL) {
+			if (m_slotList[i]->isHuman()) {
+				DEBUG_LOG(("NAT::establishConnectionPaths - slot %d is %ls", i, m_slotList[i]->getName().str()));
+				++m_numNodes;
+			}
+		}
+	}
+	DEBUG_LOG(("NAT::establishConnectionPaths - number of nodes: %d", m_numNodes));
+
+	if (m_numNodes < 2)
+	{
+		// just start the game - there isn't anybody to which to connect. :P
+		m_NATState = NATSTATE_DONE;
+		return;
+	}
+
+	m_connectionRound = 0;
+	m_connectionPairIndex = m_numNodes - 2;
+	Bool connectionAssigned[MAX_SLOTS];
+
+	for (i = 0; i < MAX_SLOTS; ++i) {
+		m_connectionNodes[i].m_slotIndex = -1;
+		connectionAssigned[i] = FALSE;
+		m_sourcePorts[i] = 0;
+	}
+
+	m_previousSourcePort = 0;
+
+// check for netgear bug behavior.
+// as an aside, if there are more than 2 netgear bug firewall's in the game,
+// it probably isn't going to work so well.  stupid netgear.
+
+// nodes with a netgear bug behavior need to be matched up first. This prevents
+// the NAT table from being reset for connections to other nodes.  This also happens
+// to be the reason why I call them "nodes" rather than "slots" or "players" as the
+// ordering has to be messed with to get the netgears to make love, not war.
+	DEBUG_LOG(("NAT::establishConnectionPaths - about to set up the node list"));
+	DEBUG_LOG(("NAT::establishConnectionPaths - doing the netgear stuff"));
+	UnsignedInt otherNetgearNum = -1;
+	for (i = 0; i < MAX_SLOTS; ++i) {
+		if ((m_slotList != NULL) && (m_slotList[i] != NULL)) {
+			if ((m_slotList[i]->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0) {
+				if (otherNetgearNum == -1) {
+					// this is the start of a new pair, put it in as the first non -1 node connection pair thing.
+					Int nodeindex = 0;
+					while ((m_connectionPairs[m_connectionPairIndex][0][nodeindex] == -1) || (m_connectionNodes[nodeindex].m_slotIndex != -1)) {
+						++nodeindex;
+					}
+					m_connectionNodes[nodeindex].m_slotIndex = i;
+					m_connectionNodes[nodeindex].m_behavior = m_slotList[i]->getNATBehavior();
+					connectionAssigned[i] = TRUE;
+					otherNetgearNum = nodeindex;
+					DEBUG_LOG(("NAT::establishConnectionPaths - first netgear in pair. assigning node %d to slot %d (%ls)", nodeindex, i, m_slotList[i]->getName().str()));
+				} else {
+					// this is the second in the pair of netgears, pair this up with the other one
+					// for the first round.
+					Int nodeindex = 0;
+					while (m_connectionPairs[m_connectionPairIndex][0][nodeindex] != otherNetgearNum) {
+						++nodeindex;
+					}
+					m_connectionNodes[nodeindex].m_slotIndex = i;
+					m_connectionNodes[nodeindex].m_behavior = m_slotList[i]->getNATBehavior();
+					connectionAssigned[i] = TRUE;
+					otherNetgearNum = -1;
+					DEBUG_LOG(("NAT::establishConnectionPaths - second netgear in pair. assigning node %d to slot %d (%ls)", nodeindex, i, m_slotList[i]->getName().str()));
+				}
+			}
+		}
+	}
+
+	// fill in the rest of the nodes with the remaining slots.
+	DEBUG_LOG(("NAT::establishConnectionPaths - doing the non-Netgear nodes"));
+	for (i = 0; i < MAX_SLOTS; ++i) {
+		if (connectionAssigned[i] == TRUE) {
+			continue;
+		}
+		if (m_slotList[i] == NULL) {
+			continue;
+		}
+		if (!(m_slotList[i]->isHuman())) {
+			continue;
+		}
+		// find the first available connection node for this slot.
+		Int nodeindex = 0;
+		while (m_connectionNodes[nodeindex].m_slotIndex != -1) {
+			++nodeindex;
+		}
+		DEBUG_LOG(("NAT::establishConnectionPaths - assigning node %d to slot %d (%ls)", nodeindex, i, m_slotList[i]->getName().str()));
+		m_connectionNodes[nodeindex].m_slotIndex = i;
+		m_connectionNodes[nodeindex].m_behavior = m_slotList[i]->getNATBehavior();
+		connectionAssigned[i] = TRUE;
+	}
+
+// sanity check
+#if defined(RTS_DEBUG)
+	for (i = 0; i < m_numNodes; ++i) {
+		DEBUG_ASSERTCRASH(connectionAssigned[i] == TRUE, ("connection number %d not assigned", i));
+	}
+#endif
+
+	// find the local node number.
+	for (i = 0; i < m_numNodes; ++i) {
+		if (m_connectionNodes[i].m_slotIndex == TheGameSpyGame->getLocalSlotNum()) {
+			m_localNodeNumber = i;
+			DEBUG_LOG(("NAT::establishConnectionPaths - local node is %d", m_localNodeNumber));
+			break;
+		}
+	}
+
+	// set up the names in the connection window.
+	Int playerNum = 0;
+	for (i = 0; i < MAX_SLOTS; ++i) {
+		while ((i < MAX_SLOTS) && (m_slotList[i] != NULL) && !(m_slotList[i]->isHuman())) {
+			++i;
+		}
+		if (i >= MAX_SLOTS) {
+			break;
+		}
+		if (i != TheGameSpyGame->getLocalSlotNum()) {
+			TheEstablishConnectionsMenu->setPlayerName(playerNum, m_slotList[i]->getName());
+			TheEstablishConnectionsMenu->setPlayerStatus(playerNum, NATCONNECTIONSTATE_WAITINGTOBEGIN);
+			++playerNum;
+		}
+	}
+
+//	m_roundTimeout = timeGetTime() + TheGameSpyConfig->getRoundTimeout();
+	m_roundTimeout = timeGetTime() + m_timeForRoundTimeout;
+
+	// make the connections for this round.
+	// this song is cool.
+	doThisConnectionRound();
+}
+
+void NAT::attachSlotList(GameSlot *slotList[], Int localSlot, UnsignedInt localIP) {
+	m_slotList = slotList;
+	m_localIP = localIP;
+	m_transport = new Transport;
+	DEBUG_LOG(("NAT::attachSlotList - initting the transport socket with address %d.%d.%d.%d:%d",
+							PRINTF_IP_AS_4_INTS(m_localIP), getSlotPort(localSlot)));
+
+	m_startingPortNumber = NETWORK_BASE_PORT_NUMBER + ((timeGetTime() / 1000) % 20000);
+	DEBUG_LOG(("NAT::attachSlotList - using %d as the starting port number", m_startingPortNumber));
+	generatePortNumbers(slotList, localSlot);
+	m_transport->init(m_localIP, getSlotPort(localSlot));
+}
+
+Int NAT::getSlotPort(Int slot) {
+//	return (slot + m_startingPortNumber);
+	if (m_slotList[slot] != NULL) {
+		return m_slotList[slot]->getPort();
+	}
+	return 0;
+}
+
+void NAT::generatePortNumbers(GameSlot *slotList[], Int localSlot) {
+	for (UnsignedInt i = 0; i < (UnsignedInt)MAX_SLOTS; ++i) {
+		if (slotList[i] != NULL) {
+			if ((i == localSlot) && (TheWritableGlobalData->m_firewallPortOverride != 0)) {
+				slotList[i]->setPort(TheWritableGlobalData->m_firewallPortOverride);
+			} else {
+				slotList[i]->setPort(i + m_startingPortNumber);
+			}
+		}
+	}
+}
+
+Transport * NAT::getTransport() {
+	return m_transport;
+}
+
+// figure out which port I'll be using.
+// send the port number to our target for this round.
+// init the m_connectionStates for all players.
+void NAT::doThisConnectionRound() {
+	DEBUG_LOG(("NAT::doThisConnectionRound - starting process for connection round %d", m_connectionRound));
+	// clear out the states from the last round.
+	m_targetNodeNumber = -1;
+
+	Int i = 0;
+	for (; i < MAX_SLOTS; ++i) {
+		setConnectionState(i, NATCONNECTIONSTATE_NOSTATE);
+	}
+
+	m_beenProbed = FALSE;
+	m_numRetries = 0;
+
+	for (i = 0; i < m_numNodes; ++i) {
+		Int targetNodeNumber = m_connectionPairs[m_connectionPairIndex][m_connectionRound][i];
+		DEBUG_LOG(("NAT::doThisConnectionRound - node %d needs to connect to node %d", i, targetNodeNumber));
+		if (targetNodeNumber != -1) {
+			if (i == m_localNodeNumber) {
+				m_targetNodeNumber = targetNodeNumber;
+				DEBUG_LOG(("NAT::doThisConnectionRound - Local node is connecting to node %d", m_targetNodeNumber));
+				UnsignedInt targetSlotIndex = m_connectionNodes[(m_connectionPairs[m_connectionPairIndex][m_connectionRound][i])].m_slotIndex;
+				GameSlot *targetSlot = m_slotList[targetSlotIndex];
+				GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
+
+				DEBUG_ASSERTCRASH(localSlot != NULL, ("local slot is NULL"));
+				DEBUG_ASSERTCRASH(targetSlot != NULL, ("trying to negotiate with a NULL target slot, slot is %d", m_connectionPairs[m_connectionPairIndex][m_connectionRound][i]));
+				DEBUG_LOG(("NAT::doThisConnectionRound - Target slot index = %d (%ls)", targetSlotIndex, m_slotList[targetSlotIndex]->getName().str()));
+				DEBUG_LOG(("NAT::doThisConnectionRound - Target slot has NAT behavior 0x%8X, local slot has NAT behavior 0x%8X", targetSlot->getNATBehavior(), localSlot->getNATBehavior()));
+
+#if defined(DEBUG_LOGGING)
+				UnsignedInt targetIP = targetSlot->getIP();
+				UnsignedInt localIP = localSlot->getIP();
+#endif
+
+				DEBUG_LOG(("NAT::doThisConnectionRound - Target slot has IP %d.%d.%d.%d  Local slot has IP %d.%d.%d.%d",
+							PRINTF_IP_AS_4_INTS(targetIP),
+							PRINTF_IP_AS_4_INTS(localIP)));
+
+				if (((targetSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) == 0) &&
+						((localSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0)) {
+
+					// we have a netgear bug type behavior and the target does not, so we need them to send to us
+					// first to avoid having our NAT table reset.
+
+					DEBUG_LOG(("NAT::doThisConnectionRound - Local node has a netgear and the target node does not, need to delay our probe."));
+					m_timeTillNextSend = -1;
+				}
+
+				// figure out which port number I'm using for this connection
+				// this merely starts to talk to the mangler server, we have to keep calling
+				// the update function till we get a response.
+				DEBUG_LOG(("NAT::doThisConnectionRound - About to attempt to get the next mangled source port"));
+				sendMangledSourcePort();
+//				m_nextPortSendTime = timeGetTime() + TheGameSpyConfig->getRetryInterval();
+				m_nextPortSendTime = timeGetTime() + m_timeBetweenRetries;
+//				m_timeoutTime = timeGetTime() + TheGameSpyConfig->getPortTimeout();
+				m_timeoutTime = timeGetTime() + m_timeToWaitForPort;
+			} else {
+				// this is someone else that needs to connect to someone, so wait till they tell us
+				// that they're done.
+				setConnectionState(i, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
+			}
+		} else {
+			// no one to connect to, so this one is done.
+			DEBUG_LOG(("NAT::doThisConnectionRound - node %d has no one to connect to, so they're done", i));
+			setConnectionState(i, NATCONNECTIONSTATE_DONE);
+		}
+	}
+}
+
+void NAT::sendAProbe(UnsignedInt ip, UnsignedShort port, Int fromNode) {
+	DEBUG_LOG(("NAT::sendAProbe - sending a probe from port %d to %d.%d.%d.%d:%d", getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex),
+							PRINTF_IP_AS_4_INTS(ip), port));
+	AsciiString str;
+	str.format("PROBE%d", fromNode);
+	m_transport->queueSend(ip, port, (unsigned char *)str.str(), str.getLength() + 1);
+	m_transport->doSend();
+}
+
+// find the next mangled source port, and then send it to the other player.
+// if this requires talking to the mangler, we'll have to wait till a later update
+// to send our port out.
+void NAT::sendMangledSourcePort() {
+	UnsignedShort sourcePort = getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex);
+
+	FirewallHelperClass::tFirewallBehaviorType fwType = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex]->getNATBehavior();
+	GameSlot *targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
+	DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::sendMangledSourcePort - targetSlot is NULL"));
+	if (targetSlot == NULL) {
+		DEBUG_LOG(("NAT::sendMangledSourcePort - targetSlot is NULL, failed this connection"));
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
+		return;
+	}
+
+	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
+	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::sendMangledSourcePort - localSlot is NULL, WTF?"));
+	if (localSlot == NULL) {
+		DEBUG_LOG(("NAT::sendMangledSourcePort - localSlot is NULL, failed this connection"));
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
+		return;
+	}
+
+	// check to see if the target and I are behind the same NAT
+	if (targetSlot->getIP() == localSlot->getIP()) {
+#if defined(DEBUG_LOGGING)
+		UnsignedInt localip = localSlot->getIP();
+		UnsignedInt targetip = targetSlot->getIP();
+#endif
+		DEBUG_LOG(("NAT::sendMangledSourcePort - target and I are behind the same NAT, no mangling"));
+		DEBUG_LOG(("NAT::sendMangledSourcePort - I am %ls, target is %ls, my IP is %d.%d.%d.%d, target IP is %d.%d.%d.%d", localSlot->getName().str(), targetSlot->getName().str(),
+								PRINTF_IP_AS_4_INTS(localip),
+								PRINTF_IP_AS_4_INTS(targetip)));
+
+		sendMangledPortNumberToTarget(sourcePort, targetSlot);
+		m_sourcePorts[m_targetNodeNumber] = sourcePort;
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
+		// In case you're wondering, we don't set the m_previousSourcePort here because this will be a different source
+		// address than what other nodes will likely see (unless of course there are more than
+		// two of us behind the same NAT, but we won't worry about that cause theres no mangling
+		// in that case anyways)
+		return;
+	}
+
+	// check to see if we are NAT'd at all.
+	if ((fwType == 0) || (fwType == FirewallHelperClass::FIREWALL_TYPE_SIMPLE)) {
+		// no mangling, just return the source port
+		DEBUG_LOG(("NAT::sendMangledSourcePort - no mangling, just using the source port"));
+		sendMangledPortNumberToTarget(sourcePort, targetSlot);
+		m_previousSourcePort = sourcePort;
+		m_sourcePorts[m_targetNodeNumber] = sourcePort;
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
+		return;
+	}
+
+	// check to see if our NAT keeps the same source port for different destinations.
+	// if this is the case, and we've already worked out what our mangled port number is
+	// then we don't have to figure it out again.
+	if (((fwType & FirewallHelperClass::FIREWALL_TYPE_DESTINATION_PORT_DELTA) == 0) &&
+			((fwType & FirewallHelperClass::FIREWALL_TYPE_SMART_MANGLING) == 0)) {
+		DEBUG_LOG(("NAT::sendMangledSourcePort - our firewall doesn't NAT based on destination address, checking for old connections from this address"));
+		if (m_previousSourcePort != 0) {
+			DEBUG_LOG(("NAT::sendMangledSourcePort - Previous source port was %d, using that one", m_previousSourcePort));
+			sendMangledPortNumberToTarget(m_previousSourcePort, targetSlot);
+			m_sourcePorts[m_targetNodeNumber] = m_previousSourcePort;
+			setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
+			return;
+		} else {
+			DEBUG_LOG(("NAT::sendMangledSourcePort - Previous source port not found"));
+		}
+	}
+
+	// At this point we know that our NAT uses some kind of relative port mapping scheme, so we
+	// need to talk to the mangler to find out where we are now so we can find out where we'll be on the
+	// next port allocation.
+
+	// get the address of the mangler we need to talk to.
+	Char manglerName[256];
+	FirewallHelperClass::getManglerName(1, manglerName);
+	DEBUG_LOG(("NAT::sendMangledSourcePort - about to call gethostbyname for mangler at %s", manglerName));
+	struct hostent *hostInfo = gethostbyname(manglerName);
+
+	if (hostInfo == NULL) {
+		DEBUG_LOG(("NAT::sendMangledSourcePort - gethostbyname failed for mangler address %s", manglerName));
+		// can't find the mangler, we're screwed so just send the source port.
+		sendMangledPortNumberToTarget(sourcePort, targetSlot);
+		m_sourcePorts[m_targetNodeNumber] = sourcePort;
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
+		return;
+	}
+
+	memcpy(&m_manglerAddress, &(hostInfo->h_addr_list[0][0]), 4);
+	m_manglerAddress = ntohl(m_manglerAddress);
+	DEBUG_LOG(("NAT::sendMangledSourcePort - mangler %s address is %d.%d.%d.%d", manglerName,
+							PRINTF_IP_AS_4_INTS(m_manglerAddress)));
+
+	DEBUG_LOG(("NAT::sendMangledSourcePort - NAT behavior = 0x%08x", fwType));
+
+//	m_manglerRetryTime = TheGameSpyConfig->getRetryInterval() + timeGetTime();
+	m_manglerRetryTime = m_manglerRetryTimeInterval + timeGetTime();
+	m_manglerRetries = 0;
+
+	if (TheFirewallHelper != NULL) {
+		m_spareSocketPort = TheFirewallHelper->getNextTemporarySourcePort(0);
+		TheFirewallHelper->openSpareSocket(m_spareSocketPort);
+		TheFirewallHelper->sendToManglerFromPort(m_manglerAddress, m_spareSocketPort, m_packetID);
+//		m_manglerRetryTime = TheGameSpyConfig->getRetryInterval() + timeGetTime();
+		m_manglerRetryTime = m_manglerRetryTimeInterval + timeGetTime();
+	}
+
+	setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLERRESPONSE);
+}
+
+void NAT::processManglerResponse(UnsignedShort mangledPort) {
+	DEBUG_LOG(("NAT::processManglerResponse - Work out what my NAT'd port will be"));
+
+	GameSlot *targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
+	DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::processManglerResponse - targetSlot is NULL"));
+	if (targetSlot == NULL) {
+		DEBUG_LOG(("NAT::processManglerResponse - targetSlot is NULL, failed this connection"));
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
+		return;
+	}
+
+	Short delta = TheGlobalData->m_firewallPortAllocationDelta;
+	UnsignedShort sourcePort = getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex);
+	UnsignedShort returnPort = 0;
+
+	FirewallHelperClass::tFirewallBehaviorType fwType = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex]->getNATBehavior();
+
+	if ((fwType & FirewallHelperClass::FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION) != 0) {
+		returnPort = mangledPort + delta;
+	} else {
+		// to steal a line from Steve Tall...
+		// Rats. It's a relative mangler. This is much harder. Damn NAT32 guy.
+		if (delta == 100) {
+			// Special NAT32 section.
+			// NAT32 mangles source UDP port by ading 1700 + 100*NAT table index.
+			returnPort = mangledPort - m_spareSocketPort;
+			returnPort -= 1700;
+
+			returnPort += delta;
+			returnPort += sourcePort;
+			returnPort += 1700;
+
+		} else if (delta == 0) {
+			returnPort = sourcePort;
+		} else {
+			returnPort = mangledPort / delta;
+			returnPort = returnPort * delta;
+
+			returnPort += (sourcePort % delta);
+			returnPort += delta;
+		}
+	}
+
+	// This bit is probably doomed.
+	if (returnPort > 65535) {
+		returnPort -= 65535;
+	}
+	if (returnPort < 1024) {
+		returnPort += 1024;
+	}
+
+	DEBUG_LOG(("NAT::processManglerResponse - mangled port is %d", returnPort));
+	m_previousSourcePort = returnPort;
+
+	sendMangledPortNumberToTarget(returnPort, targetSlot);
+	m_sourcePorts[m_targetNodeNumber] = returnPort;
+	if (targetSlot->getPort() == 0) {
+		// we haven't got the target's mangled port number yet, wait for it.
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
+	} else {
+		// in this case we should have already sent a PROBE, so we'll just change the state
+		// and leave it at that.
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
+	}
+}
+
+// check to see if we've completed all the rounds
+// this is kind of a cheesy way to check, but it works.
+Bool NAT::allConnectionsDone() {
+	if (m_numNodes < 2) {
+		return FALSE;
+	}
+	const Int requiredRounds = (m_numNodes & 1) ? m_numNodes : m_numNodes - 1;
+	return m_connectionRound >= requiredRounds;
+}
+
+Bool NAT::allConnectionsDoneThisRound() {
+	Bool retval = TRUE;
+	for (UnsignedInt i = 0; (i < m_numNodes) && (retval == TRUE); ++i) {
+		if ((m_connectionStates[i] != NATCONNECTIONSTATE_DONE) && (m_connectionStates[i] != NATCONNECTIONSTATE_FAILED)) {
+			retval = FALSE;
+		}
+	}
+	return retval;
+}
+
+// this node's connection for this round has been completed.
+void NAT::connectionComplete(Int slotIndex) {
+}
+
+// this node's connection for this round has failed.
+void NAT::connectionFailed(Int slotIndex) {
+}
+
+// I have been probed by the target.
+void NAT::probed(Int nodeNumber) {
+	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
+	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::probed - localSlot is NULL, WTF?"));
+	if (localSlot == NULL) {
+		DEBUG_LOG(("NAT::probed - localSlot is NULL, failed this connection"));
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
+		return;
+	}
+
+	if (m_beenProbed == FALSE) {
+		m_beenProbed = TRUE;
+		DEBUG_LOG(("NAT::probed - just got probed for the first time."));
+		if ((localSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0) {
+			DEBUG_LOG(("NAT::probed - we have a NETGEAR and we were just probed for the first time"));
+			GameSlot *targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
+			DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::probed - targetSlot is NULL"));
+			if (targetSlot == NULL) {
+				DEBUG_LOG(("NAT::probed - targetSlot is NULL, failed this connection"));
+				setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
+				return;
+			}
+
+			if (targetSlot->getPort() == 0) {
+				setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
+				DEBUG_LOG(("NAT::probed - still waiting for mangled port"));
+			} else {
+				DEBUG_LOG(("NAT::probed - sending a probe to %ls", targetSlot->getName().str()));
+				sendAProbe(targetSlot->getIP(), targetSlot->getPort(), m_localNodeNumber);
+				notifyTargetOfProbe(targetSlot);
+				setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
+			}
+		}
+	}
+}
+
+// got the mangled port for our target for this round.
+void NAT::gotMangledPort(Int nodeNumber, UnsignedShort mangledPort) {
+
+	// if we've already finished the connection, then we don't need to process this.
+	if (m_connectionStates[m_localNodeNumber] == NATCONNECTIONSTATE_DONE) {
+		DEBUG_LOG(("NAT::gotMangledPort - got a mangled port, but we've already finished this connection, ignoring."));
+		return;
+	}
+
+	GameSlot *targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
+	DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::gotMangledPort - targetSlot is NULL"));
+	if (targetSlot == NULL) {
+		DEBUG_LOG(("NAT::gotMangledPort - targetSlot is NULL, failed this connection"));
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
+		return;
+	}
+
+	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
+	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::gotMangledPort - localSlot is NULL, WTF?"));
+	if (localSlot == NULL) {
+		DEBUG_LOG(("NAT::gotMangledPort - localSlot is NULL, failed this connection"));
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
+		return;
+	}
+
+	if (nodeNumber != m_targetNodeNumber) {
+		DEBUG_LOG(("NAT::gotMangledPort - got a mangled port number for someone that isn't my target. node = %d, target node = %d", nodeNumber, m_targetNodeNumber));
+		return;
+	}
+
+	targetSlot->setPort(mangledPort);
+	DEBUG_LOG(("NAT::gotMangledPort - got mangled port number %d from our target node (%ls)", mangledPort, targetSlot->getName().str()));
+	if (((localSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) == 0) || (m_beenProbed == TRUE) ||
+			(((localSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0) && ((targetSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0))) {
+#ifdef DEBUG_LOGGING
+		UnsignedInt ip = targetSlot->getIP();
+#endif
+		DEBUG_LOG(("NAT::gotMangledPort - don't have a netgear or we have already been probed, or both my target and I have a netgear, send a PROBE. Sending to %d.%d.%d.%d:%d",
+								PRINTF_IP_AS_4_INTS(ip), targetSlot->getPort()));
+
+		sendAProbe(targetSlot->getIP(), targetSlot->getPort(), m_localNodeNumber);
+		notifyTargetOfProbe(targetSlot);
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
+	} else {
+		DEBUG_LOG(("NAT::gotMangledPort - we are a netgear, not sending a PROBE yet."));
+	}
+}
+
+void NAT::gotInternalAddress(Int nodeNumber, UnsignedInt address) {
+	GameSlot *targetSlot = m_slotList[m_connectionNodes[nodeNumber].m_slotIndex];
+	DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::gotInternalAddress - targetSlot is NULL"));
+	if (targetSlot == NULL) {
+		return;
+	}
+
+	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
+	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::gotInternalAddress - localSlot is NULL, WTF?"));
+	if (localSlot == NULL) {
+		return;
+	}
+
+	if (nodeNumber != m_targetNodeNumber) {
+		DEBUG_LOG(("NAT::gotInternalAddress - got a internal address for someone that isn't my target. node = %d, target node = %d", nodeNumber, m_targetNodeNumber));
+		return;
+	}
+
+	if (localSlot->getIP() == targetSlot->getIP()) {
+		// we have the same IP address, i.e. we are behind the same NAT.
+		// I need to talk directly to his internal address.
+		DEBUG_LOG(("NAT::gotInternalAddress - target and local players have same external address, using internal address."));
+		targetSlot->setIP(address); // use the slot's internal address from now on
+	}
+}
+
+void NAT::notifyTargetOfProbe(GameSlot *targetSlot) {
+	PeerRequest req;
+	AsciiString options;
+	options.format("PROBED%d", m_localNodeNumber);
+	req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
+	req.UTM.isStagingRoom = TRUE;
+	req.id = "NAT/";
+	AsciiString hostName;
+	hostName.translate(targetSlot->getName());
+	req.nick = hostName.str();
+	req.options = options.str();
+	TheGameSpyPeerMessageQueue->addRequest(req);
+	DEBUG_LOG(("NAT::notifyTargetOfProbe - notifying %ls that we have probed them.", targetSlot->getName().str()));
+}
+
+void NAT::notifyUsersOfConnectionDone(Int nodeIndex) {
+	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
+	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::notifyUsersOfConnectionDone - localSlot is NULL, WTF?"));
+	if (localSlot == NULL) {
+		DEBUG_LOG(("NAT::notifyUsersOfConnectionDone - localSlot is NULL, failed this connection"));
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
+		return;
+	}
+
+	PeerRequest req;
+	AsciiString options;
+	options.format("CONNDONE%d %d", nodeIndex, m_localNodeNumber);
+
+	req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
+	req.UTM.isStagingRoom = TRUE;
+	req.id = "NAT";
+	AsciiString names;
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		if (m_connectionNodes[m_localNodeNumber].m_slotIndex == i) {
+			continue;
+		}
+
+		if ((m_slotList[i] == NULL) || (m_slotList[i]->isHuman() == FALSE)) {
+			continue;
+		}
+
+		AsciiString name;
+		name.translate(m_slotList[i]->getName());
+		if (names.isNotEmpty())
+		{
+			names.concat(',');
+		}
+		names.concat(name);
+	}
+	req.nick = names.str();
+	req.options = options.str();
+
+	DEBUG_LOG(("NAT::notifyUsersOfConnectionDone - sending %s to %s", options.str(), names.str()));
+	TheGameSpyPeerMessageQueue->addRequest(req);
+}
+
+void NAT::notifyUsersOfConnectionFailed(Int nodeIndex) {
+	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
+	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::notifyUsersOfConnectionFailed - localSlot is NULL, WTF?"));
+	if (localSlot == NULL) {
+		DEBUG_LOG(("NAT::notifyUsersOfConnectionFailed - localSlot is NULL, failed this connection"));
+		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
+		return;
+	}
+
+	PeerRequest req;
+	AsciiString options;
+	options.format("CONNFAILED%d", nodeIndex);
+/*
+	req.peerRequestType = PeerRequest::PEERREQUEST_UTMROOM;
+	req.UTM.isStagingRoom = TRUE;
+	req.id = "NAT/";
+	req.options = options.str();
+
+	DEBUG_LOG(("NAT::notifyUsersOfConnectionFailed - sending %s to room", options.str()));
+*/
+
+	req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
+	req.UTM.isStagingRoom = TRUE;
+	req.id = "NAT";
+	AsciiString names;
+	for (Int i=0; i<MAX_SLOTS; ++i)
+	{
+		if (m_connectionNodes[m_localNodeNumber].m_slotIndex == i) {
+			continue;
+		}
+
+		if ((m_slotList[i] == NULL) || (m_slotList[i]->isHuman() == FALSE)) {
+			continue;
+		}
+
+		AsciiString name;
+		name.translate(m_slotList[i]->getName());
+		if (names.isNotEmpty())
+		{
+			names.concat(',');
+		}
+		names.concat(name);
+	}
+	req.nick = names.str();
+	req.options = options.str();
+
+	DEBUG_LOG(("NAT::notifyUsersOfConnectionFailed - sending %s to %s", options.str(), names.str()));
+
+	TheGameSpyPeerMessageQueue->addRequest(req);
+}
+
+void NAT::sendMangledPortNumberToTarget(UnsignedShort mangledPort, GameSlot *targetSlot) {
+	PeerRequest req;
+	AsciiString options;
+	options.format("PORT%d %d %08X", m_localNodeNumber, mangledPort, m_localIP);
+
+	req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
+	req.UTM.isStagingRoom = TRUE;
+	req.id = "NAT/";
+	AsciiString hostName;
+	hostName.translate(targetSlot->getName());
+	req.nick = hostName.str();
+	req.options = options.str();
+	DEBUG_LOG(("NAT::sendMangledPortNumberToTarget - sending \"%s\" to %s", options.str(), hostName.str()));
+	TheGameSpyPeerMessageQueue->addRequest(req);
+}
+
+void NAT::processGlobalMessage(Int slotNum, const char *options) {
+	const char *ptr = options;
+	// skip preceding whitespace.
+	while (isspace(*ptr)) {
+		++ptr;
+	}
+	DEBUG_LOG(("NAT::processGlobalMessage - got message from slot %d, message is \"%s\"", slotNum, ptr));
+	if (strncmp(ptr, "PROBED", strlen("PROBED")) == 0) {
+		// format: PROBED<node number>
+		// a probe has been sent at us, if we are waiting because of a netgear or something, we
+		// should start sending our own probes.
+		Int node = atoi(ptr + strlen("PROBED"));
+		if (node == m_targetNodeNumber) {
+			// make sure we're being probed by who we're supposed to be probed by.
+			probed(node);
+		} else {
+			DEBUG_LOG(("NAT::processGlobalMessage - probed by node %d, not our target", node));
+		}
+	} else if (strncmp(ptr, "CONNDONE", strlen("CONNDONE")) == 0) {
+		// format: CONNDONE<node number>
+		// we should get the node number of the player who's connection is done from the options
+		// and mark that down as part of the connectionStates.
+		const char *c = ptr + strlen("CONNDONE");
+/*		while (*c != ' ') {
+			++c;
+		}
+		while (*c == ' ') {
+			++c;
+		}
+*/		Int node;
+		Int sendingNode;
+		sscanf(c, "%d %d\n", &node, &sendingNode);
+
+		if (m_connectionPairs[m_connectionPairIndex][m_connectionRound][node] == sendingNode) {
+//			Int node = atoi(ptr + strlen("CONNDONE"));
+			DEBUG_LOG(("NAT::processGlobalMessage - got a CONNDONE message for node %d", node));
+			if ((node >= 0) && (node <= m_numNodes)) {
+				DEBUG_LOG(("NAT::processGlobalMessage - node %d's connection is complete, setting connection state to done", node));
+				setConnectionState(node, NATCONNECTIONSTATE_DONE);
+			}
+		} else {
+			DEBUG_LOG(("NAT::processGlobalMessage - got a connection done message that isn't from this round. node: %d sending node: %d", node, sendingNode));
+		}
+	} else if (strncmp(ptr, "CONNFAILED", strlen("CONNFAILED")) == 0) {
+		// format: CONNFAILED<node number>
+		// we should get the node number of the player who's connection failed from the options
+		// and mark that down as part of the connectionStates.
+		Int node = atoi(ptr + strlen("CONNFAILED"));
+		if ((node >= 0) && (node < m_numNodes)) {
+			DEBUG_LOG(("NAT::processGlobalMessage - node %d's connection failed, setting connection state to failed", node));
+			setConnectionState(node, NATCONNECTIONSTATE_FAILED);
+		}
+	} else if (strncmp(ptr, "PORT", strlen("PORT")) == 0) {
+		// format: PORT<node number> <port number> <internal IP>
+		// we should get the node number and the mangled port number of the client we
+		// are supposed to be communicating with and start probing them. No, that was not
+		// meant to be a phallic reference, you sicko.
+		const char *c = ptr + strlen("PORT");
+		Int node = atoi(c);
+		while (*c != ' ') {
+			++c;
+		}
+		while (*c == ' ') {
+			++c;
+		}
+		UnsignedInt intport = 0;
+		UnsignedInt addr = 0;
+		sscanf(c, "%d %X", &intport, &addr);
+		UnsignedShort port = (UnsignedShort)intport;
+
+		DEBUG_LOG(("NAT::processGlobalMessage - got port message from node %d, port: %d, internal address: %d.%d.%d.%d", node, port,
+								PRINTF_IP_AS_4_INTS(addr)));
+
+		if ((node >= 0) && (node < m_numNodes)) {
+			if (port < 1024) {
+				// it has to be less than 65535 cause its a short duh.
+				DEBUG_ASSERTCRASH(port >= 1024, ("Was passed an invalid port number"));
+				port += 1024;
+			}
+			gotInternalAddress(node, addr);
+			gotMangledPort(node, port);
+		}
+	}
+}
+
+void NAT::setConnectionState(Int nodeNumber, NATConnectionState state) {
+	m_connectionStates[nodeNumber] = state;
+
+	if (nodeNumber != m_localNodeNumber) {
+		return;
+	}
+
+	// if this is the case we are starting a new round and we don't know
+	// who we're connecting to yet.
+	if (m_localNodeNumber == m_targetNodeNumber) {
+		return;
+	}
+
+	// if this is the start of a new connection round we don't have a
+	// target yet.
+	if (m_targetNodeNumber == -1) {
+		return;
+	}
+
+	// find the menu slot of the target node.
+	Int slotIndex = m_connectionNodes[m_targetNodeNumber].m_slotIndex;
+	Int slot = 0;
+	Int i = 0;
+	for (; i < MAX_SLOTS; ++i) {
+		if (m_slotList[i] != NULL) {
+			if (m_slotList[i]->isHuman()) {
+				if (i != m_connectionNodes[m_localNodeNumber].m_slotIndex) {
+					if (i == slotIndex) {
+					 break;
+					}
+					++slot;
+				}
+			}
+		}
+	}
+	if (i == MAX_SLOTS) {
+		DEBUG_ASSERTCRASH(i < MAX_SLOTS, ("Didn't find the node number in the slot list"));
+		return;
+	}
+	TheEstablishConnectionsMenu->setPlayerStatus(slot, state);
+}
diff --git a/Core/GameEngine/Source/GameNetwork/NetCommandList.cpp b/Core/GameEngine/Source/GameNetwork/NetCommandList.cpp
new file mode 100644
index 00000000000..9df51d77e99
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/NetCommandList.cpp
@@ -0,0 +1,455 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/NetCommandList.h"
+#include "GameNetwork/networkutil.h"
+
+/**
+ * Constructor.
+ */
+NetCommandList::NetCommandList() {
+	m_first = NULL;
+	m_last = NULL;
+	m_lastMessageInserted = NULL;
+}
+
+/**
+ * Destructor.
+ */
+NetCommandList::~NetCommandList() {
+	reset();
+}
+
+/**
+ * Append the given list of commands to this list.
+ */
+void NetCommandList::appendList(NetCommandList *list) {
+	if (list == NULL) {
+		return;
+	}
+
+	// Need to do it this way because of the reference counting that needs to happen in appendMessage.
+	NetCommandRef *msg = list->getFirstMessage();
+	NetCommandRef *next = NULL;
+	while (msg != NULL) {
+		next = msg->getNext();
+		NetCommandRef *temp = addMessage(msg->getCommand());
+		if (temp != NULL) {
+			temp->setRelay(msg->getRelay());
+		}
+
+		msg = next;
+	}
+}
+
+/**
+ * Return the first message in this list.
+ */
+NetCommandRef *NetCommandList::getFirstMessage() {
+	return m_first;
+}
+
+/**
+ * Remove the given message from this list.
+ */
+void NetCommandList::removeMessage(NetCommandRef *msg) {
+	if (m_lastMessageInserted == msg) {
+		m_lastMessageInserted = msg->getNext();
+	}
+
+	if (msg->getPrev() != NULL) {
+		msg->getPrev()->setNext(msg->getNext());
+	}
+	if (msg->getNext() != NULL) {
+		msg->getNext()->setPrev(msg->getPrev());
+	}
+
+	if (msg == m_first) {
+		m_first = msg->getNext();
+	}
+	if (msg == m_last) {
+		m_last = msg->getPrev();
+	}
+
+	msg->setNext(NULL);
+	msg->setPrev(NULL);
+}
+
+/**
+ * Initialize the list.
+ */
+void NetCommandList::init() {
+	reset();
+}
+
+/**
+ * Reset the contents of this list.
+ */
+void NetCommandList::reset() {
+	NetCommandRef *temp = m_first;
+	while (m_first != NULL) {
+		temp = m_first->getNext();
+		m_first->setNext(NULL);
+		m_first->setPrev(NULL);
+		deleteInstance(m_first);
+		m_first = temp;
+	}
+	m_last = NULL;
+	m_lastMessageInserted = NULL;
+}
+
+/**
+ * Insert sorts msg.  Assumes that all the previous message inserts were done using this function.
+ * The message is sorted in based first on command type, then player id, and then command id.
+ */
+NetCommandRef * NetCommandList::addMessage(NetCommandMsg *cmdMsg) {
+	if (cmdMsg == NULL) {
+		DEBUG_ASSERTCRASH(cmdMsg != NULL, ("NetCommandList::addMessage - command message was NULL"));
+		return NULL;
+	}
+
+//	UnsignedInt id = cmdMsg->getID();
+
+	NetCommandRef *msg = NEW_NETCOMMANDREF(cmdMsg);
+
+	if (m_first == NULL) {
+		// this is the first node, so we don't have to worry about ordering it.
+		m_first = msg;
+		m_last = msg;
+		m_lastMessageInserted = msg;
+		return msg;
+	}
+
+	if (m_lastMessageInserted != NULL) {
+		// Messages that are inserted in order should just be put in one right after the other.
+		// So saving the placement of the last message inserted can give us a huge boost in
+		// efficiency.
+		NetCommandRef *theNext = m_lastMessageInserted->getNext();
+		if ((m_lastMessageInserted->getCommand()->getNetCommandType() == msg->getCommand()->getNetCommandType()) &&
+			(m_lastMessageInserted->getCommand()->getPlayerID() == msg->getCommand()->getPlayerID()) &&
+			(m_lastMessageInserted->getCommand()->getID() < msg->getCommand()->getID()) &&
+			((theNext == NULL) || ((theNext->getCommand()->getNetCommandType() > msg->getCommand()->getNetCommandType()) ||
+			 (theNext->getCommand()->getPlayerID() > msg->getCommand()->getPlayerID()) ||
+			 (theNext->getCommand()->getID() > msg->getCommand()->getID())))) {
+
+			// Make sure this command isn't already in the list.
+			if (isEqualCommandMsg(m_lastMessageInserted->getCommand(), msg->getCommand())) {
+
+				// This command is already in the list, don't duplicate it.
+				deleteInstance(msg);
+				msg = NULL;
+				return NULL;
+			}
+
+			if (theNext == NULL) {
+				// this means that m_lastMessageInserted == m_last, so m_last should point to the msg that is being inserted.
+				msg->setNext(m_lastMessageInserted->getNext());
+				msg->setPrev(m_lastMessageInserted);
+				m_lastMessageInserted->setNext(msg);
+				m_lastMessageInserted = msg;
+				m_last = msg;
+			} else {
+				msg->setNext(m_lastMessageInserted->getNext());
+				msg->setPrev(m_lastMessageInserted);
+				m_lastMessageInserted->setNext(msg);
+				msg->getNext()->setPrev(msg);
+				m_lastMessageInserted = msg;
+			}
+			return msg;
+		}
+	}
+
+	if (msg->getCommand()->getNetCommandType() > m_last->getCommand()->getNetCommandType()) {
+		// easy optimization for a command that goes at the end of the list
+		// since they are likely to be added in order.
+
+		// Make sure this command isn't already in the list.
+		if (isEqualCommandMsg(m_last->getCommand(), msg->getCommand())) {
+
+			// This command is already in the list, don't duplicate it.
+			deleteInstance(msg);
+			msg = NULL;
+			return NULL;
+		}
+
+		msg->setPrev(m_last);
+		msg->setNext(NULL);
+		m_last->setNext(msg);
+		m_last = msg;
+		m_lastMessageInserted = msg;
+		return msg;
+	}
+
+	if (msg->getCommand()->getNetCommandType() < m_first->getCommand()->getNetCommandType()) {
+		// Make sure this command isn't already in the list.
+		if (isEqualCommandMsg(m_first->getCommand(), msg->getCommand())) {
+
+			// This command is already in the list, don't duplicate it.
+			deleteInstance(msg);
+			msg = NULL;
+			return NULL;
+		}
+
+		// The command goes at the head of the list.
+		msg->setNext(m_first);
+		msg->setPrev(NULL);
+		m_first->setPrev(msg);
+		m_first = msg;
+		m_lastMessageInserted = msg;
+		return msg;
+	}
+
+
+	// Find the start of the command type we're looking for.
+	NetCommandRef *tempmsg = m_first;
+	while ((tempmsg != NULL) && (msg->getCommand()->getNetCommandType() > tempmsg->getCommand()->getNetCommandType())) {
+		tempmsg = tempmsg->getNext();
+	}
+
+	if (tempmsg == NULL) {
+		// Make sure this command isn't already in the list.
+		if (isEqualCommandMsg(m_last->getCommand(), msg->getCommand())) {
+
+			// This command is already in the list, don't duplicate it.
+			deleteInstance(msg);
+			msg = NULL;
+			return NULL;
+		}
+
+		// message goes at the end of the list.
+		msg->setPrev(m_last);
+		msg->setNext(NULL);
+		m_last->setNext(msg);
+		m_last = msg;
+		m_lastMessageInserted = msg;
+		return msg;
+	}
+
+	// Now find the player position.  munkee.
+	while ((tempmsg != NULL) && (msg->getCommand()->getNetCommandType() == tempmsg->getCommand()->getNetCommandType()) && (msg->getCommand()->getPlayerID() > tempmsg->getCommand()->getPlayerID())) {
+		tempmsg = tempmsg->getNext();
+	}
+
+	if (tempmsg == NULL) {
+		// Make sure this command isn't already in the list.
+		if (isEqualCommandMsg(m_last->getCommand(), msg->getCommand())) {
+
+			// This command is already in the list, don't duplicate it.
+			deleteInstance(msg);
+			msg = NULL;
+			return NULL;
+		}
+
+		// message goes at the end of the list.
+		msg->setPrev(m_last);
+		msg->setNext(NULL);
+		m_last->setNext(msg);
+		m_last = msg;
+		m_lastMessageInserted = msg;
+		return msg;
+	}
+
+	// Find the position within the player's section based on the command ID.
+	// If the command type doesn't require a command ID, sort by whatever it should be sorted by.
+	while ((tempmsg != NULL) && (msg->getCommand()->getNetCommandType() == tempmsg->getCommand()->getNetCommandType()) && (msg->getCommand()->getPlayerID() == tempmsg->getCommand()->getPlayerID()) && (msg->getCommand()->getSortNumber() > tempmsg->getCommand()->getSortNumber())) {
+		tempmsg = tempmsg->getNext();
+	}
+
+	if (tempmsg == NULL) {
+		// Make sure this command isn't already in the list.
+		if (isEqualCommandMsg(m_last->getCommand(), msg->getCommand())) {
+
+			// This command is already in the list, don't duplicate it.
+			deleteInstance(msg);
+			msg = NULL;
+			return NULL;
+		}
+
+		// This message goes at the end of the list.
+		msg->setPrev(m_last);
+		msg->setNext(NULL);
+		m_last->setNext(msg);
+		m_last = msg;
+		m_lastMessageInserted = msg;
+		return msg;
+	}
+
+	if (tempmsg == m_first) {
+		// Make sure this command isn't already in the list.
+		if (isEqualCommandMsg(m_first->getCommand(), msg->getCommand())) {
+
+			// This command is already in the list, don't duplicate it.
+			deleteInstance(msg);
+			return NULL;
+		}
+
+		// This message goes at the head of the list.
+		msg->setNext(m_first);
+		msg->setPrev(NULL);
+		m_first->setPrev(msg);
+		m_first = msg;
+		m_lastMessageInserted = msg;
+		return msg;
+	}
+
+	// Make sure this command isn't already in the list.
+		if (isEqualCommandMsg(tempmsg->getCommand(), msg->getCommand())) {
+
+		// This command is already in the list, don't duplicate it.
+		deleteInstance(msg);
+		msg = NULL;
+		return NULL;
+	}
+
+	// Insert message before tempmsg.
+	msg->setNext(tempmsg);
+	msg->setPrev(tempmsg->getPrev());
+	msg->getPrev()->setNext(msg);
+	tempmsg->setPrev(msg);
+	m_lastMessageInserted = msg;
+
+	return msg;
+}
+
+Int NetCommandList::length() {
+	Int retval = 0;
+	NetCommandRef *temp = m_first;
+	while (temp != NULL) {
+		++retval;
+		temp = temp->getNext();
+	}
+	return retval;
+}
+
+/**
+ * This is really inefficient, but we can probably get away with it because
+ * there shouldn't be too many messages for any given frame.
+ */
+NetCommandRef * NetCommandList::findMessage(NetCommandMsg *msg) {
+	NetCommandRef *retval = m_first;
+	while ((retval != NULL) && (isEqualCommandMsg(retval->getCommand(), msg) == FALSE)) {
+		retval = retval->getNext();
+	}
+	return retval;
+}
+
+NetCommandRef * NetCommandList::findMessage(UnsignedShort commandID, UnsignedByte playerID) {
+	NetCommandRef *retval = m_first;
+	while (retval != NULL) {
+		if (DoesCommandRequireACommandID(retval->getCommand()->getNetCommandType())) {
+			if ((retval->getCommand()->getID() == commandID) && (retval->getCommand()->getPlayerID() == playerID)) {
+				return retval;
+			}
+		}
+		retval = retval->getNext();
+	}
+	return retval;
+}
+
+Bool NetCommandList::isEqualCommandMsg(NetCommandMsg *msg1, NetCommandMsg *msg2) {
+	if (DoesCommandRequireACommandID(msg1->getNetCommandType()) != DoesCommandRequireACommandID(msg2->getNetCommandType())) {
+		return FALSE;
+	}
+
+	// At this point we know that the commands both do or do not require a command id.
+	// Do or do not, there is no try.
+	if (DoesCommandRequireACommandID(msg1->getNetCommandType())) {
+		// Are the commands from the same player?
+		if (msg1->getPlayerID() != msg2->getPlayerID()) {
+			return FALSE;
+		}
+
+		// Do they have the same command ID?
+		if (msg1->getID() != msg2->getID()) {
+			return FALSE;
+		}
+		return TRUE;
+	}
+
+	// If we've gotten this far, we know that the commands do not require a command id.
+	// So now our equality checking becomes type-specific.
+
+	// Are they the same type?
+	if (msg1->getNetCommandType() != msg2->getNetCommandType()) {
+		return FALSE;
+	}
+
+	// Are they from the same player?
+	if (msg1->getPlayerID() != msg2->getPlayerID()) {
+		return FALSE;
+	}
+
+	// They are the same type and from the same player.
+	// Time for the type specific stuff.
+	if (msg1->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) {
+		NetAckStage1CommandMsg *ack1 = (NetAckStage1CommandMsg *)msg1;
+		NetAckStage1CommandMsg *ack2 = (NetAckStage1CommandMsg *)msg2;
+
+		if (ack1->getOriginalPlayerID() != ack2->getOriginalPlayerID()) {
+			return FALSE;
+		}
+
+		if (ack1->getCommandID() != ack2->getCommandID()) {
+			return FALSE;
+		}
+		return TRUE;
+	}
+
+	// They are the same type and from the same player.
+	// Time for the type specific stuff.
+	if (msg1->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) {
+		NetAckStage2CommandMsg *ack1 = (NetAckStage2CommandMsg *)msg1;
+		NetAckStage2CommandMsg *ack2 = (NetAckStage2CommandMsg *)msg2;
+
+		if (ack1->getOriginalPlayerID() != ack2->getOriginalPlayerID()) {
+			return FALSE;
+		}
+
+		if (ack1->getCommandID() != ack2->getCommandID()) {
+			return FALSE;
+		}
+		return TRUE;
+	}
+
+	// They are the same type and from the same player.
+	// Time for the type specific stuff.
+	if (msg1->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
+		NetAckBothCommandMsg *ack1 = (NetAckBothCommandMsg *)msg1;
+		NetAckBothCommandMsg *ack2 = (NetAckBothCommandMsg *)msg2;
+
+		if (ack1->getOriginalPlayerID() != ack2->getOriginalPlayerID()) {
+			return FALSE;
+		}
+
+		if (ack1->getCommandID() != ack2->getCommandID()) {
+			return FALSE;
+		}
+		return TRUE;
+	}
+
+	return FALSE;
+}
diff --git a/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp b/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp
new file mode 100644
index 00000000000..951f3c8cf6a
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp
@@ -0,0 +1,1264 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/NetCommandMsg.h"
+#include "GameNetwork/NetPacketStructs.h"
+#include "GameNetwork/GameMessageParser.h"
+#include "Common/GameState.h"
+#include "Common/PlayerList.h"
+#include "Common/Player.h"
+
+/**
+ * Base constructor
+ */
+NetCommandMsg::NetCommandMsg()
+{
+	m_executionFrame = 0;
+	m_id = 0;
+	m_playerID = 0;
+	m_timestamp = 0;
+	m_referenceCount = 1; // start this off as 1.  This means that an "attach" is implied by creating a NetCommandMsg object.
+	m_commandType = NETCOMMANDTYPE_UNKNOWN;
+}
+
+/**
+ * Destructor
+ */
+NetCommandMsg::~NetCommandMsg() {
+}
+
+/**
+ * Adds one to the reference count.
+ */
+void NetCommandMsg::attach() {
+	++m_referenceCount;
+}
+
+/**
+ * Subtracts one from the reference count. If the reference count is 0, the this object is destroyed.
+ */
+void NetCommandMsg::detach() {
+	--m_referenceCount;
+	if (m_referenceCount == 0) {
+		deleteInstance(this);
+		return;
+	}
+	DEBUG_ASSERTCRASH(m_referenceCount > 0, ("Invalid reference count for NetCommandMsg")); // Just to make sure...
+	if (m_referenceCount < 0) {
+		deleteInstance(this);
+	}
+}
+
+/**
+ * Returns the value by which this type of message should be sorted.
+ */
+Int NetCommandMsg::getSortNumber() {
+	return m_id;
+}
+
+//-------------------------------
+// NetGameCommandMsg
+//-------------------------------
+
+/**
+ * Constructor with no argument, sets everything to default values.
+ */
+NetGameCommandMsg::NetGameCommandMsg() : NetCommandMsg() {
+	m_argSize = 0;
+	m_numArgs = 0;
+	m_type = (GameMessage::Type)0;
+	m_commandType = NETCOMMANDTYPE_GAMECOMMAND;
+	m_argList = NULL;
+	m_argTail = NULL;
+}
+
+/**
+ * Constructor with a GameMessage argument. Sets member variables appropriately for this GameMessage.
+ * Also copies all the arguments.
+ */
+NetGameCommandMsg::NetGameCommandMsg(GameMessage *msg) : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_GAMECOMMAND;
+
+	m_type = msg->getType();
+	Int count = msg->getArgumentCount();
+	for (Int i = 0; i < count; ++i) {
+		addArgument(msg->getArgumentDataType(i), *(msg->getArgument(i)));
+	}
+}
+
+/**
+ * Destructor
+ */
+NetGameCommandMsg::~NetGameCommandMsg() {
+	GameMessageArgument *arg = m_argList;
+	while (arg != NULL) {
+		m_argList = m_argList->m_next;
+		deleteInstance(arg);
+		arg = m_argList;
+	}
+}
+
+/**
+ * Add an argument to this command.
+ */
+void NetGameCommandMsg::addArgument(const GameMessageArgumentDataType type, GameMessageArgumentType arg)
+{
+	if (m_argTail == NULL) {
+		m_argList = newInstance(GameMessageArgument);
+		m_argTail = m_argList;
+		m_argList->m_data = arg;
+		m_argList->m_type = type;
+		m_argList->m_next = NULL;
+		return;
+	}
+
+	GameMessageArgument *newArg = newInstance(GameMessageArgument);
+	newArg->m_data = arg;
+	newArg->m_type = type;
+	newArg->m_next = NULL;
+	m_argTail->m_next = newArg;
+	m_argTail = newArg;
+}
+
+// here's where we figure out which slot corresponds to which player
+static Int indexFromMask(UnsignedInt mask)
+{
+	Player *player = NULL;
+	Int i;
+
+	for( i = 0; i < MAX_PLAYER_COUNT; i++ )
+	{
+		player = ThePlayerList->getNthPlayer( i );
+		if( player && player->getPlayerMask() == mask )
+			return i;
+	}
+
+	return -1;
+}
+
+/**
+ * Construct a new GameMessage object from the data in this object.
+ */
+GameMessage *NetGameCommandMsg::constructGameMessage() const
+{
+	GameMessage *retval = newInstance(GameMessage)(m_type);
+
+	AsciiString name;
+	name.format("player%d", getPlayerID());
+	retval->friend_setPlayerIndex( ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(name))->getPlayerIndex());
+
+	GameMessageArgument *arg = m_argList;
+	while (arg != NULL) {
+
+		switch (arg->m_type) {
+
+		case ARGUMENTDATATYPE_INTEGER:
+			retval->appendIntegerArgument(arg->m_data.integer);
+			break;
+		case ARGUMENTDATATYPE_REAL:
+			retval->appendRealArgument(arg->m_data.real);
+			break;
+		case ARGUMENTDATATYPE_BOOLEAN:
+			retval->appendBooleanArgument(arg->m_data.boolean);
+			break;
+		case ARGUMENTDATATYPE_OBJECTID:
+			retval->appendObjectIDArgument(arg->m_data.objectID);
+			break;
+		case ARGUMENTDATATYPE_DRAWABLEID:
+			retval->appendDrawableIDArgument(arg->m_data.drawableID);
+			break;
+		case ARGUMENTDATATYPE_TEAMID:
+			retval->appendTeamIDArgument(arg->m_data.teamID);
+			break;
+		case ARGUMENTDATATYPE_LOCATION:
+			retval->appendLocationArgument(arg->m_data.location);
+			break;
+		case ARGUMENTDATATYPE_PIXEL:
+			retval->appendPixelArgument(arg->m_data.pixel);
+			break;
+		case ARGUMENTDATATYPE_PIXELREGION:
+			retval->appendPixelRegionArgument(arg->m_data.pixelRegion);
+			break;
+		case ARGUMENTDATATYPE_TIMESTAMP:
+			retval->appendTimestampArgument(arg->m_data.timestamp);
+			break;
+		case ARGUMENTDATATYPE_WIDECHAR:
+			retval->appendWideCharArgument(arg->m_data.wChar);
+			break;
+
+		}
+
+		arg = arg->m_next;
+	}
+	return retval;
+}
+
+/**
+ * Sets the type of game message
+ */
+void NetGameCommandMsg::setGameMessageType(GameMessage::Type type) {
+	m_type = type;
+}
+
+size_t NetGameCommandMsg::getPackedByteCount() const {
+	UnsignedShort msglen = sizeof(NetPacketGameCommand);
+
+	// Variable data portion
+	GameMessage *gmsg = constructGameMessage();
+	GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
+
+	msglen += sizeof(GameMessage::Type);
+	msglen += sizeof(UnsignedByte);
+
+	GameMessageParserArgumentType *arg = parser->getFirstArgumentType();
+	while (arg != NULL) {
+		msglen += sizeof(UnsignedByte); // argument type
+		msglen += sizeof(UnsignedByte); // argument count
+		GameMessageArgumentDataType type = arg->getType();
+
+		switch (type) {
+
+		case ARGUMENTDATATYPE_INTEGER:
+			msglen += arg->getArgCount() * sizeof(Int);
+			break;
+		case ARGUMENTDATATYPE_REAL:
+			msglen += arg->getArgCount() * sizeof(Real);
+			break;
+		case ARGUMENTDATATYPE_BOOLEAN:
+			msglen += arg->getArgCount() * sizeof(Bool);
+			break;
+		case ARGUMENTDATATYPE_OBJECTID:
+			msglen += arg->getArgCount() * sizeof(ObjectID);
+			break;
+		case ARGUMENTDATATYPE_DRAWABLEID:
+			msglen += arg->getArgCount() * sizeof(DrawableID);
+			break;
+		case ARGUMENTDATATYPE_TEAMID:
+			msglen += arg->getArgCount() * sizeof(UnsignedInt);
+			break;
+		case ARGUMENTDATATYPE_LOCATION:
+			msglen += arg->getArgCount() * sizeof(Coord3D);
+			break;
+		case ARGUMENTDATATYPE_PIXEL:
+			msglen += arg->getArgCount() * sizeof(ICoord2D);
+			break;
+		case ARGUMENTDATATYPE_PIXELREGION:
+			msglen += arg->getArgCount() * sizeof(IRegion2D);
+			break;
+		case ARGUMENTDATATYPE_TIMESTAMP:
+			msglen += arg->getArgCount() * sizeof(UnsignedInt);
+			break;
+		case ARGUMENTDATATYPE_WIDECHAR:
+			msglen += arg->getArgCount() * sizeof(WideChar);
+			break;
+
+		}
+
+		arg = arg->getNext();
+	}
+
+	deleteInstance(parser);
+	parser = NULL;
+
+	deleteInstance(gmsg);
+	gmsg = NULL;
+
+	return msglen;
+}
+
+//-------------------------
+// NetAckBothCommandMsg
+//-------------------------
+/**
+ * Constructor.  Sets the member variables according to the given message.
+ */
+NetAckBothCommandMsg::NetAckBothCommandMsg(NetCommandMsg *msg) : NetCommandMsg() {
+	m_commandID = msg->getID();
+	m_commandType = NETCOMMANDTYPE_ACKBOTH;
+	m_originalPlayerID = msg->getPlayerID();
+}
+
+/**
+ * Constructor.  Sets the member variables to default values.
+ */
+NetAckBothCommandMsg::NetAckBothCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_ACKBOTH;
+}
+
+/**
+ * Destructor.
+ */
+NetAckBothCommandMsg::~NetAckBothCommandMsg() {
+}
+
+/**
+ * Returns the command ID of the command being ack'd.
+ */
+UnsignedShort NetAckBothCommandMsg::getCommandID() {
+	return m_commandID;
+}
+
+/**
+ * Set the command ID of the command being ack'd.
+ */
+void NetAckBothCommandMsg::setCommandID(UnsignedShort commandID) {
+	m_commandID = commandID;
+}
+
+/**
+ * Get the player id of the player who originally sent the command.
+ */
+UnsignedByte NetAckBothCommandMsg::getOriginalPlayerID() {
+	return m_originalPlayerID;
+}
+
+/**
+ * Set the player id of the player who originally sent the command.
+ */
+void NetAckBothCommandMsg::setOriginalPlayerID(UnsignedByte originalPlayerID) {
+	m_originalPlayerID = originalPlayerID;
+}
+
+Int NetAckBothCommandMsg::getSortNumber() {
+	return m_commandID;
+}
+
+size_t NetAckBothCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketAckCommand);
+}
+
+//-------------------------
+// NetAckStage1CommandMsg
+//-------------------------
+/**
+ * Constructor.  Sets the member variables according to the given message.
+ */
+NetAckStage1CommandMsg::NetAckStage1CommandMsg(NetCommandMsg *msg) : NetCommandMsg() {
+	m_commandID = msg->getID();
+	m_commandType = NETCOMMANDTYPE_ACKSTAGE1;
+	m_originalPlayerID = msg->getPlayerID();
+}
+
+/**
+ * Constructor.  Sets the member variables to default values.
+ */
+NetAckStage1CommandMsg::NetAckStage1CommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_ACKSTAGE1;
+}
+
+/**
+ * Destructor.
+ */
+NetAckStage1CommandMsg::~NetAckStage1CommandMsg() {
+}
+
+/**
+ * Returns the command ID of the command being ack'd.
+ */
+UnsignedShort NetAckStage1CommandMsg::getCommandID() {
+	return m_commandID;
+}
+
+/**
+ * Set the command ID of the command being ack'd.
+ */
+void NetAckStage1CommandMsg::setCommandID(UnsignedShort commandID) {
+	m_commandID = commandID;
+}
+
+/**
+ * Get the player id of the player who originally sent the command.
+ */
+UnsignedByte NetAckStage1CommandMsg::getOriginalPlayerID() {
+	return m_originalPlayerID;
+}
+
+/**
+ * Set the player id of the player who originally sent the command.
+ */
+void NetAckStage1CommandMsg::setOriginalPlayerID(UnsignedByte originalPlayerID) {
+	m_originalPlayerID = originalPlayerID;
+}
+
+Int NetAckStage1CommandMsg::getSortNumber() {
+	return m_commandID;
+}
+
+size_t NetAckStage1CommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketAckCommand);
+}
+
+//-------------------------
+// NetAckStage2CommandMsg
+//-------------------------
+/**
+ * Constructor.  Sets the member variables according to the given message.
+ */
+NetAckStage2CommandMsg::NetAckStage2CommandMsg(NetCommandMsg *msg) : NetCommandMsg() {
+	m_commandID = msg->getID();
+	m_commandType = NETCOMMANDTYPE_ACKSTAGE2;
+	m_originalPlayerID = msg->getPlayerID();
+}
+
+/**
+ * Constructor.  Sets the member variables to default values.
+ */
+NetAckStage2CommandMsg::NetAckStage2CommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_ACKSTAGE2;
+}
+
+/**
+ * Destructor.
+ */
+NetAckStage2CommandMsg::~NetAckStage2CommandMsg() {
+}
+
+/**
+ * Returns the command ID of the command being ack'd.
+ */
+UnsignedShort NetAckStage2CommandMsg::getCommandID() {
+	return m_commandID;
+}
+
+/**
+ * Set the command ID of the command being ack'd.
+ */
+void NetAckStage2CommandMsg::setCommandID(UnsignedShort commandID) {
+	m_commandID = commandID;
+}
+
+/**
+ * Get the player id of the player who originally sent the command.
+ */
+UnsignedByte NetAckStage2CommandMsg::getOriginalPlayerID() {
+	return m_originalPlayerID;
+}
+
+/**
+ * Set the player id of the player who originally sent the command.
+ */
+void NetAckStage2CommandMsg::setOriginalPlayerID(UnsignedByte originalPlayerID) {
+	m_originalPlayerID = originalPlayerID;
+}
+
+Int NetAckStage2CommandMsg::getSortNumber() {
+	return m_commandID;
+}
+
+size_t NetAckStage2CommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketAckCommand);
+}
+
+//-------------------------
+// NetFrameCommandMsg
+//-------------------------
+/**
+ * Constructor.
+ */
+NetFrameCommandMsg::NetFrameCommandMsg() : NetCommandMsg() {
+	m_commandCount = 0;
+	m_commandType = NETCOMMANDTYPE_FRAMEINFO;
+}
+
+/**
+ * Destructor
+ */
+NetFrameCommandMsg::~NetFrameCommandMsg() {
+}
+
+/**
+ * Set the command count of this frame.
+ */
+void NetFrameCommandMsg::setCommandCount(UnsignedShort commandCount) {
+	m_commandCount = commandCount;
+}
+
+/**
+ * Return the command count of this frame.
+ */
+UnsignedShort NetFrameCommandMsg::getCommandCount() {
+	return m_commandCount;
+}
+
+size_t NetFrameCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketFrameCommand);
+}
+
+//-------------------------
+// NetPlayerLeaveCommandMsg
+//-------------------------
+/**
+ * Constructor
+ */
+NetPlayerLeaveCommandMsg::NetPlayerLeaveCommandMsg() : NetCommandMsg() {
+	m_leavingPlayerID = 0;
+	m_commandType = NETCOMMANDTYPE_PLAYERLEAVE;
+}
+
+/**
+ * Destructor
+ */
+NetPlayerLeaveCommandMsg::~NetPlayerLeaveCommandMsg() {
+}
+
+/**
+ * Get the id of the player leaving the game.
+ */
+UnsignedByte NetPlayerLeaveCommandMsg::getLeavingPlayerID() {
+	return m_leavingPlayerID;
+}
+
+/**
+ * Set the id of the player leaving the game.
+ */
+void NetPlayerLeaveCommandMsg::setLeavingPlayerID(UnsignedByte id) {
+	m_leavingPlayerID = id;
+}
+
+size_t NetPlayerLeaveCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketPlayerLeaveCommand);
+}
+
+//-------------------------
+// NetRunAheadMetricsCommandMsg
+//-------------------------
+/**
+ * Constructor
+ */
+NetRunAheadMetricsCommandMsg::NetRunAheadMetricsCommandMsg() : NetCommandMsg() {
+	m_averageLatency = 0.0;
+	m_averageFps = 0;
+	m_commandType = NETCOMMANDTYPE_RUNAHEADMETRICS;
+}
+
+/**
+ * Destructor
+ */
+NetRunAheadMetricsCommandMsg::~NetRunAheadMetricsCommandMsg() {
+}
+
+/**
+ * set the average latency
+ */
+void NetRunAheadMetricsCommandMsg::setAverageLatency(Real avgLat) {
+	m_averageLatency = avgLat;
+}
+
+/**
+ * get the average latency
+ */
+Real NetRunAheadMetricsCommandMsg::getAverageLatency() {
+	return m_averageLatency;
+}
+
+/**
+ * set the average fps
+ */
+void NetRunAheadMetricsCommandMsg::setAverageFps(Int fps) {
+	m_averageFps = fps;
+}
+
+/**
+ * get the average fps
+ */
+Int NetRunAheadMetricsCommandMsg::getAverageFps() {
+	return m_averageFps;
+}
+
+size_t NetRunAheadMetricsCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketRunAheadMetricsCommand);
+}
+
+//-------------------------
+// NetRunAheadCommandMsg
+//-------------------------
+NetRunAheadCommandMsg::NetRunAheadCommandMsg() : NetCommandMsg() {
+	m_runAhead = min(max(20, MIN_RUNAHEAD), MAX_FRAMES_AHEAD/2);
+	m_frameRate = 30;
+	m_commandType = NETCOMMANDTYPE_RUNAHEAD;
+}
+
+NetRunAheadCommandMsg::~NetRunAheadCommandMsg() {
+}
+
+UnsignedShort NetRunAheadCommandMsg::getRunAhead() {
+	return m_runAhead;
+}
+
+void NetRunAheadCommandMsg::setRunAhead(UnsignedShort runAhead) {
+	m_runAhead = runAhead;
+}
+
+UnsignedByte NetRunAheadCommandMsg::getFrameRate() {
+	return m_frameRate;
+}
+
+void NetRunAheadCommandMsg::setFrameRate(UnsignedByte frameRate) {
+	m_frameRate = frameRate;
+}
+
+size_t NetRunAheadCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketRunAheadCommand);
+}
+
+//-------------------------
+// NetDestroyPlayerCommandMsg
+//-------------------------
+/**
+ * Constructor
+ */
+NetDestroyPlayerCommandMsg::NetDestroyPlayerCommandMsg() : NetCommandMsg()
+{
+	m_playerIndex = 0;
+	m_commandType = NETCOMMANDTYPE_DESTROYPLAYER;
+}
+
+/**
+ * Destructor
+ */
+NetDestroyPlayerCommandMsg::~NetDestroyPlayerCommandMsg()
+{
+}
+
+/**
+ * set the CRC
+ */
+void NetDestroyPlayerCommandMsg::setPlayerIndex( UnsignedInt playerIndex )
+{
+	m_playerIndex = playerIndex;
+}
+
+/**
+ * get the average CRC
+ */
+UnsignedInt NetDestroyPlayerCommandMsg::getPlayerIndex( void )
+{
+	return m_playerIndex;
+}
+
+size_t NetDestroyPlayerCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketDestroyPlayerCommand);
+}
+
+//-------------------------
+// NetKeepAliveCommandMsg
+//-------------------------
+/**
+ * Constructor
+ */
+NetKeepAliveCommandMsg::NetKeepAliveCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_KEEPALIVE;
+}
+
+NetKeepAliveCommandMsg::~NetKeepAliveCommandMsg() {
+}
+
+size_t NetKeepAliveCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketKeepAliveCommand);
+}
+
+//-------------------------
+// NetDisconnectKeepAliveCommandMsg
+//-------------------------
+/**
+ * Constructor
+ */
+NetDisconnectKeepAliveCommandMsg::NetDisconnectKeepAliveCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_DISCONNECTKEEPALIVE;
+}
+
+NetDisconnectKeepAliveCommandMsg::~NetDisconnectKeepAliveCommandMsg() {
+}
+
+size_t NetDisconnectKeepAliveCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketDisconnectKeepAliveCommand);
+}
+
+//-------------------------
+// NetDisconnectPlayerCommandMsg
+//-------------------------
+/**
+ * Constructor
+ */
+NetDisconnectPlayerCommandMsg::NetDisconnectPlayerCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_DISCONNECTPLAYER;
+	m_disconnectSlot = 0;
+}
+
+/**
+ * Destructor
+ */
+NetDisconnectPlayerCommandMsg::~NetDisconnectPlayerCommandMsg() {
+}
+
+/**
+ * Returns the disconnecting slot number
+ */
+UnsignedByte NetDisconnectPlayerCommandMsg::getDisconnectSlot() {
+	return m_disconnectSlot;
+}
+
+/**
+ * Sets the disconnecting slot number
+ */
+void NetDisconnectPlayerCommandMsg::setDisconnectSlot(UnsignedByte slot) {
+	m_disconnectSlot = slot;
+}
+
+/**
+ * Sets the disconnect frame
+ */
+void NetDisconnectPlayerCommandMsg::setDisconnectFrame(UnsignedInt frame) {
+	m_disconnectFrame = frame;
+}
+
+/**
+ * returns the disconnect frame
+ */
+UnsignedInt NetDisconnectPlayerCommandMsg::getDisconnectFrame() {
+	return m_disconnectFrame;
+}
+
+size_t NetDisconnectPlayerCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketDisconnectPlayerCommand);
+}
+
+//-------------------------
+// NetPacketRouterQueryCommandMsg
+//-------------------------
+/**
+ * Constructor
+ */
+NetPacketRouterQueryCommandMsg::NetPacketRouterQueryCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_PACKETROUTERQUERY;
+}
+
+/**
+ * Destructor
+ */
+NetPacketRouterQueryCommandMsg::~NetPacketRouterQueryCommandMsg() {
+}
+
+size_t NetPacketRouterQueryCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketRouterQueryCommand);
+}
+
+//-------------------------
+// NetPacketRouterAckCommandMsg
+//-------------------------
+/**
+ * Constructor
+ */
+NetPacketRouterAckCommandMsg::NetPacketRouterAckCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_PACKETROUTERACK;
+}
+
+/**
+ * Destructor
+ */
+NetPacketRouterAckCommandMsg::~NetPacketRouterAckCommandMsg() {
+}
+
+size_t NetPacketRouterAckCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketRouterAckCommand);
+}
+
+//-------------------------
+// NetDisconnectChatCommandMsg
+//-------------------------
+/**
+ * Constructor
+ */
+NetDisconnectChatCommandMsg::NetDisconnectChatCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_DISCONNECTCHAT;
+}
+
+/**
+ * Destructor
+ */
+NetDisconnectChatCommandMsg::~NetDisconnectChatCommandMsg() {
+}
+
+/**
+ * Set the chat text for this message.
+ */
+void NetDisconnectChatCommandMsg::setText(UnicodeString text) {
+	m_text = text;
+}
+
+/**
+ * Get the chat text for this message.
+ */
+UnicodeString NetDisconnectChatCommandMsg::getText() {
+	return m_text;
+}
+
+//-------------------------
+// NetChatCommandMsg
+//-------------------------
+/**
+ * Constructor
+ */
+NetChatCommandMsg::NetChatCommandMsg() : NetCommandMsg()
+{
+	m_commandType = NETCOMMANDTYPE_CHAT;
+	m_playerMask = 0;
+}
+
+/**
+ * Destructor
+ */
+NetChatCommandMsg::~NetChatCommandMsg()
+{
+}
+
+/**
+ * Set the chat text for this message.
+ */
+void NetChatCommandMsg::setText(UnicodeString text)
+{
+	m_text = text;
+}
+
+/**
+ * Get the chat text for this message.
+ */
+UnicodeString NetChatCommandMsg::getText()
+{
+	return m_text;
+}
+
+/**
+ * Get the bitmask of chat recipients from this message.
+ */
+Int NetChatCommandMsg::getPlayerMask()
+{
+	return m_playerMask;
+}
+
+/**
+ * Set a bitmask of chat recipients in this message.
+ */
+void NetChatCommandMsg::setPlayerMask( Int playerMask )
+{
+	m_playerMask = playerMask;
+}
+
+size_t NetChatCommandMsg::getPackedByteCount() const
+{
+	return sizeof(NetPacketChatCommand)
+		+ sizeof(UnsignedByte) // text length byte
+		+ m_text.getByteCount()
+		+ sizeof(m_playerMask);
+}
+
+//-------------------------
+// NetDisconnectChatCommandMsg
+//-------------------------
+size_t NetDisconnectChatCommandMsg::getPackedByteCount() const
+{
+	return sizeof(NetPacketDisconnectChatCommand)
+		+ sizeof(UnsignedByte) // text length byte
+		+ m_text.getByteCount();
+}
+
+//-------------------------
+// NetDisconnectVoteCommandMsg
+//-------------------------
+/**
+ * Constructor
+ */
+NetDisconnectVoteCommandMsg::NetDisconnectVoteCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_DISCONNECTVOTE;
+	m_slot = 0;
+}
+
+/**
+ * Destructor
+ */
+NetDisconnectVoteCommandMsg::~NetDisconnectVoteCommandMsg() {
+}
+
+/**
+ * Set the slot that is being voted for.
+ */
+void NetDisconnectVoteCommandMsg::setSlot(UnsignedByte slot) {
+	m_slot = slot;
+}
+
+/**
+ * Get the slot that is being voted for.
+ */
+UnsignedByte NetDisconnectVoteCommandMsg::getSlot() {
+	return m_slot;
+}
+
+/**
+ * Get the vote frame.
+ */
+UnsignedInt NetDisconnectVoteCommandMsg::getVoteFrame() {
+	return m_voteFrame;
+}
+
+/**
+ * Set the vote frame.
+ */
+void NetDisconnectVoteCommandMsg::setVoteFrame(UnsignedInt voteFrame) {
+	m_voteFrame = voteFrame;
+}
+
+size_t NetDisconnectVoteCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketDisconnectVoteCommand);
+}
+
+//-------------------------
+// NetProgressCommandMsg
+//-------------------------
+NetProgressCommandMsg::NetProgressCommandMsg( void ) : NetCommandMsg()
+{
+	m_commandType = NETCOMMANDTYPE_PROGRESS;
+	m_percent = 0;
+}
+
+NetProgressCommandMsg::~NetProgressCommandMsg( void ) {}
+
+UnsignedByte NetProgressCommandMsg::getPercentage()
+{
+	return m_percent;
+}
+
+void NetProgressCommandMsg::setPercentage( UnsignedByte percent )
+{
+	m_percent = percent;
+}
+
+size_t NetProgressCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketProgressMessage);
+}
+
+//-------------------------
+// NetWrapperCommandMsg
+//-------------------------
+NetWrapperCommandMsg::NetWrapperCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_WRAPPER;
+	m_numChunks = 0;
+	m_data = NULL;
+	m_totalDataLength = 0;
+	m_chunkNumber = 0;
+	m_dataLength = 0;
+	m_dataOffset = 0;
+	m_wrappedCommandID = 0;
+}
+
+NetWrapperCommandMsg::~NetWrapperCommandMsg() {
+	delete m_data;
+	m_data = NULL;
+}
+
+UnsignedByte * NetWrapperCommandMsg::getData() {
+	return m_data;
+}
+
+void NetWrapperCommandMsg::setData(UnsignedByte *data, UnsignedInt dataLength)
+{
+	delete m_data;
+	m_data = NEW UnsignedByte[dataLength];	// pool[]ify
+	memcpy(m_data, data, dataLength);
+	m_dataLength = dataLength;
+}
+
+UnsignedInt NetWrapperCommandMsg::getDataLength() {
+	return m_dataLength;
+}
+
+UnsignedInt NetWrapperCommandMsg::getDataOffset() {
+	return m_dataOffset;
+}
+
+void NetWrapperCommandMsg::setDataOffset(UnsignedInt offset) {
+	m_dataOffset = offset;
+}
+
+UnsignedInt NetWrapperCommandMsg::getChunkNumber() {
+	return m_chunkNumber;
+}
+
+void NetWrapperCommandMsg::setChunkNumber(UnsignedInt chunkNumber) {
+	m_chunkNumber = chunkNumber;
+}
+
+UnsignedInt NetWrapperCommandMsg::getNumChunks() {
+	return m_numChunks;
+}
+
+void NetWrapperCommandMsg::setNumChunks(UnsignedInt numChunks) {
+	m_numChunks = numChunks;
+}
+
+UnsignedInt NetWrapperCommandMsg::getTotalDataLength() {
+	return m_totalDataLength;
+}
+
+void NetWrapperCommandMsg::setTotalDataLength(UnsignedInt totalDataLength) {
+	m_totalDataLength = totalDataLength;
+}
+
+UnsignedShort NetWrapperCommandMsg::getWrappedCommandID() {
+	return m_wrappedCommandID;
+}
+
+void NetWrapperCommandMsg::setWrappedCommandID(UnsignedShort wrappedCommandID) {
+	m_wrappedCommandID = wrappedCommandID;
+}
+
+size_t NetWrapperCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketWrapperCommand) + m_dataLength;
+}
+
+//-------------------------
+// NetFileCommandMsg
+//-------------------------
+NetFileCommandMsg::NetFileCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_FILE;
+	m_data = NULL;
+	m_portableFilename.clear();
+	m_dataLength = 0;
+}
+
+NetFileCommandMsg::~NetFileCommandMsg() {
+	delete[] m_data;
+	m_data = NULL;
+}
+
+AsciiString NetFileCommandMsg::getRealFilename()
+{
+	return TheGameState->portableMapPathToRealMapPath(m_portableFilename);
+}
+
+void NetFileCommandMsg::setRealFilename(AsciiString filename)
+{
+	m_portableFilename = TheGameState->realMapPathToPortableMapPath(filename);
+}
+
+UnsignedInt NetFileCommandMsg::getFileLength() {
+	return m_dataLength;
+}
+
+UnsignedByte * NetFileCommandMsg::getFileData() {
+	return m_data;
+}
+
+void NetFileCommandMsg::setFileData(UnsignedByte *data, UnsignedInt dataLength)
+{
+	m_dataLength = dataLength;
+	m_data = NEW UnsignedByte[dataLength];	// pool[]ify
+	memcpy(m_data, data, dataLength);
+}
+
+size_t NetFileCommandMsg::getPackedByteCount() const
+{
+	return sizeof(NetPacketFileCommand)
+		+ m_portableFilename.getLength() + 1
+		+ sizeof(m_dataLength)
+		+ m_dataLength;
+}
+
+//-------------------------
+// NetFileAnnounceCommandMsg
+//-------------------------
+NetFileAnnounceCommandMsg::NetFileAnnounceCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_FILEANNOUNCE;
+	m_portableFilename.clear();
+	m_fileID = 0;
+	m_playerMask = 0;
+}
+
+NetFileAnnounceCommandMsg::~NetFileAnnounceCommandMsg() {
+}
+
+AsciiString NetFileAnnounceCommandMsg::getRealFilename()
+{
+	return TheGameState->portableMapPathToRealMapPath(m_portableFilename);
+}
+
+void NetFileAnnounceCommandMsg::setRealFilename(AsciiString filename)
+{
+	m_portableFilename = TheGameState->realMapPathToPortableMapPath(filename);
+}
+
+UnsignedShort NetFileAnnounceCommandMsg::getFileID() {
+	return m_fileID;
+}
+
+void NetFileAnnounceCommandMsg::setFileID(UnsignedShort fileID) {
+	m_fileID = fileID;
+}
+
+UnsignedByte NetFileAnnounceCommandMsg::getPlayerMask(void) {
+	return m_playerMask;
+}
+
+void NetFileAnnounceCommandMsg::setPlayerMask(UnsignedByte playerMask) {
+	m_playerMask = playerMask;
+}
+
+size_t NetFileAnnounceCommandMsg::getPackedByteCount() const
+{
+	return sizeof(NetPacketFileAnnounceCommand)
+		+ m_portableFilename.getLength() + 1
+		+ sizeof(m_fileID)
+		+ sizeof(m_playerMask);
+}
+
+//-------------------------
+// NetFileProgressCommandMsg
+//-------------------------
+NetFileProgressCommandMsg::NetFileProgressCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_FILEPROGRESS;
+	m_fileID = 0;
+	m_progress = 0;
+}
+
+NetFileProgressCommandMsg::~NetFileProgressCommandMsg() {
+}
+
+UnsignedShort NetFileProgressCommandMsg::getFileID() {
+	return m_fileID;
+}
+
+void NetFileProgressCommandMsg::setFileID(UnsignedShort val) {
+	m_fileID = val;
+}
+
+Int NetFileProgressCommandMsg::getProgress() {
+	return m_progress;
+}
+
+void NetFileProgressCommandMsg::setProgress(Int val) {
+	m_progress = val;
+}
+
+size_t NetFileProgressCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketFileProgressCommand);
+}
+
+//-------------------------
+// NetDisconnectFrameCommandMsg
+//-------------------------
+NetDisconnectFrameCommandMsg::NetDisconnectFrameCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_DISCONNECTFRAME;
+	m_disconnectFrame = 0;
+}
+
+NetDisconnectFrameCommandMsg::~NetDisconnectFrameCommandMsg() {
+}
+
+UnsignedInt NetDisconnectFrameCommandMsg::getDisconnectFrame() {
+	return m_disconnectFrame;
+}
+
+void NetDisconnectFrameCommandMsg::setDisconnectFrame(UnsignedInt disconnectFrame) {
+	m_disconnectFrame = disconnectFrame;
+}
+
+size_t NetDisconnectFrameCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketDisconnectFrameCommand);
+}
+
+//-------------------------
+// NetDisconnectScreenOffCommandMsg
+//-------------------------
+NetDisconnectScreenOffCommandMsg::NetDisconnectScreenOffCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_DISCONNECTSCREENOFF;
+	m_newFrame = 0;
+}
+
+NetDisconnectScreenOffCommandMsg::~NetDisconnectScreenOffCommandMsg() {
+}
+
+UnsignedInt NetDisconnectScreenOffCommandMsg::getNewFrame() {
+	return m_newFrame;
+}
+
+void NetDisconnectScreenOffCommandMsg::setNewFrame(UnsignedInt newFrame) {
+	m_newFrame = newFrame;
+}
+
+size_t NetDisconnectScreenOffCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketDisconnectScreenOffCommand);
+}
+
+//-------------------------
+// NetFrameResendRequestCommandMsg
+//-------------------------
+NetFrameResendRequestCommandMsg::NetFrameResendRequestCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_FRAMERESENDREQUEST;
+	m_frameToResend = 0;
+}
+
+NetFrameResendRequestCommandMsg::~NetFrameResendRequestCommandMsg() {
+}
+
+UnsignedInt NetFrameResendRequestCommandMsg::getFrameToResend() {
+	return m_frameToResend;
+}
+
+void NetFrameResendRequestCommandMsg::setFrameToResend(UnsignedInt frame) {
+	m_frameToResend = frame;
+}
+
+size_t NetFrameResendRequestCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketFrameResendRequestCommand);
+}
+
+//-------------------------
+// NetLoadCompleteCommandMsg
+//-------------------------
+NetLoadCompleteCommandMsg::NetLoadCompleteCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_LOADCOMPLETE;
+}
+
+NetLoadCompleteCommandMsg::~NetLoadCompleteCommandMsg() {
+}
+
+size_t NetLoadCompleteCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketLoadCompleteMessage);
+}
+
+//-------------------------
+// NetTimeOutGameStartCommandMsg
+//-------------------------
+NetTimeOutGameStartCommandMsg::NetTimeOutGameStartCommandMsg() : NetCommandMsg() {
+	m_commandType = NETCOMMANDTYPE_TIMEOUTSTART;
+}
+
+NetTimeOutGameStartCommandMsg::~NetTimeOutGameStartCommandMsg() {
+}
+
+size_t NetTimeOutGameStartCommandMsg::getPackedByteCount() const {
+	return sizeof(NetPacketTimeOutGameStartMessage);
+}
diff --git a/Core/GameEngine/Source/GameNetwork/NetCommandRef.cpp b/Core/GameEngine/Source/GameNetwork/NetCommandRef.cpp
new file mode 100644
index 00000000000..6e767e961ae
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/NetCommandRef.cpp
@@ -0,0 +1,71 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/NetCommandRef.h"
+
+#ifdef DEBUG_NETCOMMANDREF
+static UnsignedInt refNum = 0;
+#endif
+
+/**
+ * Constructor.  Attach to the given network command.
+ */
+#ifdef DEBUG_NETCOMMANDREF
+NetCommandRef::NetCommandRef(NetCommandMsg *msg, char *filename, int line)
+#else
+NetCommandRef::NetCommandRef(NetCommandMsg *msg)
+#endif
+{
+	m_msg = msg;
+	m_next = NULL;
+	m_prev = NULL;
+	m_msg->attach();
+	m_timeLastSent = -1;
+
+#ifdef DEBUG_NETCOMMANDREF
+	m_id = ++refNum;
+	DEBUG_LOG(("NetCommandRef %d allocated in file %s line %d", m_id, filename, line));
+#endif
+}
+
+/**
+ * Destructor. Detach from the network command.
+ */
+NetCommandRef::~NetCommandRef()
+{
+	if (m_msg != NULL)
+	{
+		m_msg->detach();
+	}
+ 	DEBUG_ASSERTCRASH(m_next == NULL, ("NetCommandRef::~NetCommandRef - m_next != NULL"));
+	DEBUG_ASSERTCRASH(m_prev == NULL, ("NetCommandRef::~NetCommandRef - m_prev != NULL"));
+
+#ifdef DEBUG_NETCOMMANDREF
+	DEBUG_LOG(("NetCommandRef %d deleted", m_id));
+#endif
+}
+
diff --git a/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp b/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp
new file mode 100644
index 00000000000..86333e90168
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp
@@ -0,0 +1,244 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+////// NetCommandWrapperList.cpp ////////////////////////////////
+// Bryan Cleveland
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/NetCommandWrapperList.h"
+#include "GameNetwork/NetPacket.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+////// NetCommandWrapperListNode ///////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+NetCommandWrapperListNode::NetCommandWrapperListNode(NetWrapperCommandMsg *msg)
+{
+	m_next = NULL;
+	m_numChunks = msg->getNumChunks();
+	m_chunksPresent = NEW Bool[m_numChunks];	// pool[]ify
+	m_numChunksPresent = 0;
+
+	for (UnsignedInt i = 0; i < m_numChunks; ++i) {
+		m_chunksPresent[i] = FALSE;
+	}
+
+	m_totalDataLength = msg->getTotalDataLength();
+	m_data = NEW UnsignedByte[m_totalDataLength];	// pool[]ify
+
+	m_commandID = msg->getWrappedCommandID();
+}
+
+NetCommandWrapperListNode::~NetCommandWrapperListNode() {
+	delete[] m_chunksPresent;
+	m_chunksPresent = NULL;
+
+	delete[] m_data;
+	m_data = NULL;
+}
+
+Bool NetCommandWrapperListNode::isComplete() {
+	return m_numChunksPresent == m_numChunks;
+}
+
+Int NetCommandWrapperListNode::getPercentComplete(void) {
+	if (isComplete())
+		return 100;
+	else
+		return min(99, REAL_TO_INT( ((Real)m_numChunksPresent)/((Real)m_numChunks)*100.0f ));
+}
+
+UnsignedShort NetCommandWrapperListNode::getCommandID() {
+	return m_commandID;
+}
+
+UnsignedInt NetCommandWrapperListNode::getRawDataLength() {
+	return m_totalDataLength;
+}
+
+void NetCommandWrapperListNode::copyChunkData(NetWrapperCommandMsg *msg) {
+	if (msg == NULL) {
+		DEBUG_CRASH(("Trying to copy data from a non-existent wrapper command message"));
+		return;
+	}
+
+	UnsignedInt chunkNumber = msg->getChunkNumber();
+
+	if (chunkNumber >= m_numChunks) {
+		DEBUG_CRASH(("Data chunk %u exceeds the expected maximum of %u chunks", chunkNumber, m_numChunks));
+		return;
+	}
+
+	// we already received this chunk, no need to recopy it.
+	if (m_chunksPresent[chunkNumber] == TRUE) {
+		return;
+	}
+
+	UnsignedInt chunkDataOffset = msg->getDataOffset();
+	UnsignedInt chunkDataLength = msg->getDataLength();
+
+	// TheSuperHackers @security Mauller 04/12/2025 Prevent out of bounds memory access
+	if (chunkDataOffset >= m_totalDataLength) {
+		DEBUG_CRASH(("Data chunk offset %u exceeds the total data length %u", chunkDataOffset, m_totalDataLength));
+		return;
+	}
+
+	if (chunkDataLength > MAX_PACKET_SIZE ) {
+		DEBUG_CRASH(("Data Chunk size %u greater than max packet size %u", chunkDataLength, MAX_PACKET_SIZE));
+		return;
+	}
+
+	if (chunkDataOffset + chunkDataLength > m_totalDataLength) {
+		DEBUG_CRASH(("Data chunk exceeds data array size"));
+		return;
+	}
+
+	DEBUG_LOG(("NetCommandWrapperListNode::copyChunkData() - copying chunk %u", chunkNumber));
+
+	memcpy(m_data + chunkDataOffset, msg->getData(), chunkDataLength);
+
+	m_chunksPresent[chunkNumber] = TRUE;
+	++m_numChunksPresent;
+}
+
+UnsignedByte * NetCommandWrapperListNode::getRawData() {
+	return m_data;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+////// NetCommandWrapperList ///////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+NetCommandWrapperList::NetCommandWrapperList() {
+	m_list = NULL;
+}
+
+NetCommandWrapperList::~NetCommandWrapperList() {
+	NetCommandWrapperListNode *temp;
+	while (m_list != NULL) {
+		temp = m_list->m_next;
+		deleteInstance(m_list);
+		m_list = temp;
+	}
+}
+
+void NetCommandWrapperList::init() {
+	m_list = NULL;
+}
+
+void NetCommandWrapperList::reset() {
+	NetCommandWrapperListNode *temp;
+	while (m_list != NULL) {
+		temp = m_list->m_next;
+		deleteInstance(m_list);
+		m_list = temp;
+	}
+}
+
+Int NetCommandWrapperList::getPercentComplete(UnsignedShort wrappedCommandID)
+{
+	NetCommandWrapperListNode *temp = m_list;
+
+	while ((temp != NULL) && (temp->getCommandID() != wrappedCommandID)) {
+		temp = temp->m_next;
+	}
+
+	if (!temp)
+		return 0;
+
+	return temp->getPercentComplete();
+}
+
+void NetCommandWrapperList::processWrapper(NetCommandRef *ref) {
+	NetCommandWrapperListNode *temp = m_list;
+	NetWrapperCommandMsg *msg = (NetWrapperCommandMsg *)(ref->getCommand());
+
+	while ((temp != NULL) && (temp->getCommandID() != msg->getWrappedCommandID())) {
+		temp = temp->m_next;
+	}
+
+	if (temp == NULL) {
+		temp = newInstance(NetCommandWrapperListNode)(msg);
+		temp->m_next = m_list;
+		m_list = temp;
+	}
+
+	temp->copyChunkData(msg);
+}
+
+NetCommandList * NetCommandWrapperList::getReadyCommands()
+{
+	NetCommandList *retlist = newInstance(NetCommandList);
+	retlist->init();
+
+	NetCommandWrapperListNode *temp = m_list;
+	NetCommandWrapperListNode *next = NULL;
+
+	while (temp != NULL) {
+		next = temp->m_next;
+		if (temp->isComplete()) {
+			NetCommandRef *msg = NetPacket::ConstructNetCommandMsgFromRawData(temp->getRawData(), temp->getRawDataLength());
+			NetCommandRef *ret = retlist->addMessage(msg->getCommand());
+			ret->setRelay(msg->getRelay());
+
+			deleteInstance(msg);
+			msg = NULL;
+
+			removeFromList(temp);
+			temp = NULL;
+		}
+		temp = next;
+	}
+
+	return retlist;
+}
+
+void NetCommandWrapperList::removeFromList(NetCommandWrapperListNode *node) {
+	if (node == NULL) {
+		return;
+	}
+
+	NetCommandWrapperListNode *temp = m_list;
+	NetCommandWrapperListNode *prev = NULL;
+
+	while ((temp != NULL) && (temp->getCommandID() != node->getCommandID())) {
+		prev = temp;
+		temp = temp->m_next;
+	}
+
+	if (temp == NULL) {
+		return;
+	}
+
+	if (prev == NULL) {
+		m_list = temp->m_next;
+		deleteInstance(temp);
+		temp = NULL;
+	} else {
+		prev->m_next = temp->m_next;
+		deleteInstance(temp);
+		temp = NULL;
+	}
+}
diff --git a/Core/GameEngine/Source/GameNetwork/NetMessageStream.cpp b/Core/GameEngine/Source/GameNetwork/NetMessageStream.cpp
new file mode 100644
index 00000000000..43f5cd6da28
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/NetMessageStream.cpp
@@ -0,0 +1,227 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+
+// NetMessageStream.cpp
+// Holds misc functions to encapsulate GameMessages into Command Packets to send
+// over the network.
+// Author: Matthew D. Campbell, July 2001
+/*
+#include "stdlib.h"				// VC++ wants this here, or gives compile error...
+
+#include "Common/GameType.h"
+#include "Common/MessageStream.h"
+#include "Common/GameEngine.h"
+#include "GameLogic/GameLogic.h"
+#include "GameNetwork/NetworkInterface.h"
+#include "GameNetwork/NetworkDefs.h"
+
+
+
+// The per-player pointers for the list of commands
+static CommandMsg *CommandHead[MAX_SLOTS] = {  /// @todo: remove static initialization
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+static CommandMsg *CommandTail[MAX_SLOTS] = {
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+/**
+ * AddToNetCommandList adds a CommandMsg to a list of commands.
+ *
+static Bool AddToNetCommandList(GameMessage *msg, UnsignedInt timestamp, CommandMsg *& CommandHead, CommandMsg *& CommandTail)
+{
+	CommandMsg *cmdMsg = NEW CommandMsg(timestamp, msg);
+	if (!cmdMsg)
+	{
+		DEBUG_LOG(("Alloc failed!"));
+		return false;
+	}
+
+	if (CommandTail == NULL)
+	{
+		CommandHead = cmdMsg;
+		CommandTail = cmdMsg;
+	}
+	else
+	{
+		cmdMsg->SetPrevCommandMsg(CommandTail);
+		CommandTail->SetNextCommandMsg(cmdMsg);
+		CommandTail = cmdMsg;
+	}
+
+	return true;
+}
+
+/**
+ * AddToRemoteNetCommandList is used by TheNetwork to queue up commands recieved from other players.
+ *
+Bool AddToNetCommandList(Int playerNum, GameMessage *msg, UnsignedInt timestamp)
+{
+	if (playerNum < 0 || playerNum >= MAX_SLOTS)
+		return false;
+
+	DEBUG_LOG(("Adding msg to NetCommandList %d", playerNum));
+	return AddToNetCommandList(msg, timestamp, CommandHead[playerNum], CommandTail[playerNum]);
+}
+
+/**
+ * GetCommandMsg returns a GameMessage (deleting its CommandMsg wrapper) that is valid
+ * for the current frame, or NULL.
+ *
+static GameMessage * GetCommandMsg(UnsignedInt timestamp, CommandMsg *& CommandHead, CommandMsg *& CommandTail)
+{
+	if (!CommandHead)
+		return NULL;
+
+	if (CommandHead->GetTimestamp() < timestamp)
+	{
+		DEBUG_LOG(("Time is %d, yet message timestamp is %d!", timestamp, CommandHead->GetTimestamp()));
+		return NULL;
+	}
+
+	if (CommandHead->GetTimestamp() != timestamp)
+		return NULL;
+
+	CommandMsg *theMsg = CommandHead;
+
+	if (CommandHead->GetNextCommandMsg())
+	{
+		CommandHead->GetNextCommandMsg()->SetPrevCommandMsg(NULL);
+		CommandHead = CommandHead->GetNextCommandMsg();
+	}
+	else
+	{
+		CommandHead = CommandTail = NULL;
+	}
+
+	GameMessage *msg = theMsg->GetGameMessage();
+	delete theMsg;
+	return msg;
+}
+
+/**
+ * GetCommandMsg returns a message from the command list.
+ *
+GameMessage * GetCommandMsg(UnsignedInt timestamp, Int playerNum)
+{
+	if (playerNum < 0 || playerNum >= MAX_SLOTS)
+		return NULL;
+
+	//DEBUG_LOG(("Adding msg to NetCommandList %d", playerNum));
+	return GetCommandMsg(timestamp, CommandHead[playerNum], CommandTail[playerNum]);
+}
+
+
+
+
+//====================================================================================
+
+// The commandBuf & commandPacket hold the commands we're building up for the frame.
+static unsigned char commandBuf[sizeof(CommandPacket)+1];
+static CommandPacket *commandPacket = (CommandPacket *)(commandBuf+1);
+
+/**
+ * ClearCommandPacket clears the command packet at the start of the frame.
+ *
+void ClearCommandPacket(UnsignedInt frame)
+{
+	commandPacket->m_frame = frame;
+	commandPacket->m_numCommands = 0;
+}
+
+/**
+ * AddCommandToPacket creates a packet containing all move/attack/etc commands
+ * for the current frame.
+ *
+Bool AddCommandToPacket(const GameMessage *msg)
+{
+	int messageSize = sizeofMessageHeader + sizeofMessageArg * msg->getArgumentCount();
+
+	// If we have too much, send what we have
+	if (bytesUsed && (bytesUsed + sizeof(CommandPacketHeader) + messageSize >= MAX_MESSAGE_LEN))
+	{
+		commandBuf[0] = MSGTYPE_PARTIALCOMMAND;
+		if (!TheNetwork->queueSend(BROADCAST_CON, commandBuf, bytesUsed + sizeof(CommandPacketHeader) + 1, MSG_NEEDACK | MSG_SEQUENCED))
+		{
+			//DEBUG_ASSERTCRASH(false, ("Too many commands in one frame!  Some will be dropped."));
+			DEBUG_LOG(("Too many commands in one frame!  Some will be dropped."));
+			return false;
+		}
+		commandBuf[0] = MSGTYPE_COMMANDCOUNT;
+		commandPacket->header.m_numCommands = 0;
+		bytesUsed = 0;
+	}
+
+	if (bytesUsed + sizeof(CommandPacketHeader) + messageSize >= MAX_MESSAGE_LEN)
+	{
+		//DEBUG_ASSERTCRASH(false, ("Too many commands in one frame!  Some will be dropped."));
+		DEBUG_LOG(("Too many commands in one frame!  Some will be dropped."));
+		return false;
+	}
+
+	// We have room, so add the message
+	commandPacket->header.m_numCommands++;
+	commandPacket->m_commands[bytesUsed++] = (unsigned char)msg->getType();
+	commandPacket->m_commands[bytesUsed++] = msg->getArgumentCount();
+
+	for (int i=0; i<msg->getArgumentCount(); ++i)
+	{
+		memcpy((unsigned char *)(commandPacket->m_commands + bytesUsed), (unsigned char *)msg->getArgument(i), sizeofMessageArg);
+		bytesUsed += sizeofMessageArg;
+	}
+
+	//DEBUG_ASSERTCRASH(bytesUsed + sizeof(CommandPacketHeader) < MAX_MESSAGE_LEN, ("Memory overwrite constructing command packet!"));
+	//DEBUG_LOG(("Memory overwrite constructing command packet!"));
+	return true;
+}
+
+/**
+ * TheNetwork calls GetCommandPacket to get commands to send.
+ *
+CommandPacket *GetCommandPacket(void)
+{
+	commandBuf[0] = MSGTYPE_COMMANDCOUNT;
+	return commandPacket;
+}
+
+//====================================================================================
+
+*/
diff --git a/Core/GameEngine/Source/GameNetwork/NetPacket.cpp b/Core/GameEngine/Source/GameNetwork/NetPacket.cpp
new file mode 100644
index 00000000000..92ec1928595
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/NetPacket.cpp
@@ -0,0 +1,5436 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+////////// NetPacket.cpp ///////////////////////////
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/NetPacket.h"
+#include "GameNetwork/NetCommandMsg.h"
+#include "GameNetwork/NetworkDefs.h"
+#include "GameNetwork/networkutil.h"
+#include "GameNetwork/GameMessageParser.h"
+#include "GameNetwork/NetPacketStructs.h"
+
+
+// This function assumes that all of the fields are either of default value or are
+// present in the raw data.
+NetCommandRef * NetPacket::ConstructNetCommandMsgFromRawData(UnsignedByte *data, UnsignedShort dataLength) {
+	NetCommandType commandType = NETCOMMANDTYPE_GAMECOMMAND;
+	UnsignedShort commandID = 0;
+	UnsignedInt frame = 0;
+	UnsignedByte playerID = 0;
+	UnsignedByte relay = 0;
+
+	Int offset = 0;
+	NetCommandRef *ref = NULL;
+	NetCommandMsg *msg = NULL;
+
+	while (offset < (Int)dataLength) {
+
+		switch (data[offset]) {
+
+		case NetPacketFieldTypes::CommandType:
+			++offset;
+			memcpy(&commandType, data + offset, sizeof(UnsignedByte));
+			offset += sizeof(UnsignedByte);
+			break;
+
+		case NetPacketFieldTypes::Relay:
+			++offset;
+			memcpy(&relay, data + offset, sizeof(UnsignedByte));
+			offset += sizeof(UnsignedByte);
+			break;
+
+		case NetPacketFieldTypes::PlayerId:
+			++offset;
+			memcpy(&playerID, data + offset, sizeof(UnsignedByte));
+			offset += sizeof(UnsignedByte);
+			break;
+
+		case NetPacketFieldTypes::CommandId:
+			++offset;
+			memcpy(&commandID, data + offset, sizeof(UnsignedShort));
+			offset += sizeof(UnsignedShort);
+			break;
+
+		case NetPacketFieldTypes::Frame:
+			++offset;
+			memcpy(&frame, data + offset, sizeof(UnsignedInt));
+			offset += sizeof(UnsignedInt);
+			break;
+
+		case NetPacketFieldTypes::Data:
+			++offset;
+
+			switch (commandType) {
+
+			case NETCOMMANDTYPE_GAMECOMMAND:
+				msg = readGameMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_ACKBOTH:
+				msg = readAckBothMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_ACKSTAGE1:
+				msg = readAckStage1Message(data, offset);
+				break;
+			case NETCOMMANDTYPE_ACKSTAGE2:
+				msg = readAckStage2Message(data, offset);
+				break;
+			case NETCOMMANDTYPE_FRAMEINFO:
+				msg = readFrameMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_PLAYERLEAVE:
+				msg = readPlayerLeaveMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_RUNAHEADMETRICS:
+				msg = readRunAheadMetricsMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_RUNAHEAD:
+				msg = readRunAheadMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_DESTROYPLAYER:
+				msg = readDestroyPlayerMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_KEEPALIVE:
+				msg = readKeepAliveMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
+				msg = readDisconnectKeepAliveMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_DISCONNECTPLAYER:
+				msg = readDisconnectPlayerMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_PACKETROUTERQUERY:
+				msg = readPacketRouterQueryMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_PACKETROUTERACK:
+				msg = readPacketRouterAckMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_DISCONNECTCHAT:
+				msg = readDisconnectChatMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_DISCONNECTVOTE:
+				msg = readDisconnectVoteMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_CHAT:
+				msg = readChatMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_PROGRESS:
+				msg = readProgressMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_LOADCOMPLETE:
+				msg = readLoadCompleteMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_TIMEOUTSTART:
+				msg = readTimeOutGameStartMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_WRAPPER:
+				msg = readWrapperMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_FILE:
+				msg = readFileMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_FILEANNOUNCE:
+				msg = readFileAnnounceMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_FILEPROGRESS:
+				msg = readFileProgressMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_DISCONNECTFRAME:
+				msg = readDisconnectFrameMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
+				msg = readDisconnectScreenOffMessage(data, offset);
+				break;
+			case NETCOMMANDTYPE_FRAMERESENDREQUEST:
+				msg = readFrameResendRequestMessage(data, offset);
+				break;
+
+			}
+
+			msg->setExecutionFrame(frame);
+			msg->setID(commandID);
+			msg->setPlayerID(playerID);
+			msg->setNetCommandType(commandType);
+
+			ref = NEW_NETCOMMANDREF(msg);
+
+			ref->setRelay(relay);
+
+			msg->detach();
+			msg = NULL;
+
+			return ref;
+
+		}
+
+	}
+
+	return ref;
+}
+
+NetPacketList NetPacket::ConstructBigCommandPacketList(NetCommandRef *ref) {
+	// if we don't have a unique command ID, then the wrapped command cannot
+	// be identified.  Therefore don't allow commands without a unique ID to
+	// be wrapped.
+	NetCommandMsg *msg = ref->getCommand();
+
+	if (!DoesCommandRequireACommandID(msg->getNetCommandType())) {
+		DEBUG_CRASH(("Trying to wrap a command that doesn't have a unique command ID"));
+		return NetPacketList();
+	}
+
+	UnsignedInt bufferSize = GetBufferSizeNeededForCommand(msg);  // need to implement.  I have a drinking problem.
+	UnsignedByte *bigPacketData = NULL;
+
+	NetPacketList packetList;
+
+	// create the buffer for the huge message and fill the buffer with that message.
+	UnsignedInt bigPacketCurrentOffset = 0;
+	bigPacketData = NEW UnsignedByte[bufferSize];
+	FillBufferWithCommand(bigPacketData, ref);
+
+	// create the wrapper command message we'll be using.
+	NetWrapperCommandMsg *wrapperMsg = newInstance(NetWrapperCommandMsg);
+	// get the amount of space needed for the wrapper message, not including the wrapped command data.
+	UnsignedInt wrapperSize = GetBufferSizeNeededForCommand(wrapperMsg);
+	UnsignedInt commandSizePerPacket = MAX_PACKET_SIZE - wrapperSize;
+
+	UnsignedInt numChunks = bufferSize / commandSizePerPacket;
+	if ((bufferSize % commandSizePerPacket) > 0) {
+		++numChunks;
+	}
+	UnsignedInt currentChunk = 0;
+
+	// create the packets and the wrapper messages.
+	while (currentChunk < numChunks) {
+		NetPacket *packet = newInstance(NetPacket);
+
+		UnsignedShort dataSizeThisPacket = commandSizePerPacket;
+		if ((bufferSize - bigPacketCurrentOffset) < dataSizeThisPacket) {
+			dataSizeThisPacket = bufferSize - bigPacketCurrentOffset;
+		}
+
+		if (DoesCommandRequireACommandID(wrapperMsg->getNetCommandType())) {
+			wrapperMsg->setID(GenerateNextCommandID());
+		}
+		wrapperMsg->setPlayerID(msg->getPlayerID());
+		wrapperMsg->setExecutionFrame(msg->getExecutionFrame());
+
+		wrapperMsg->setChunkNumber(currentChunk);
+		wrapperMsg->setNumChunks(numChunks);
+		wrapperMsg->setDataOffset(bigPacketCurrentOffset);
+		wrapperMsg->setData(bigPacketData + bigPacketCurrentOffset, dataSizeThisPacket);
+		wrapperMsg->setTotalDataLength(bufferSize);
+		wrapperMsg->setWrappedCommandID(msg->getID());
+
+		bigPacketCurrentOffset += dataSizeThisPacket;
+
+		NetCommandRef * ref = NEW_NETCOMMANDREF(wrapperMsg);
+		ref->setRelay(ref->getRelay());
+
+		if (packet->addCommand(ref) == FALSE) {
+			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::BeginBigCommandPacketList - failed to add a wrapper command to the packet")); // I still have a drinking problem.
+		}
+
+		packetList.push_back(packet);
+
+		deleteInstance(ref);
+		ref = NULL;
+
+		++currentChunk;
+	}
+	wrapperMsg->detach();
+	wrapperMsg = NULL;
+
+	delete[] bigPacketData;
+	bigPacketData = NULL;
+
+	return packetList;
+}
+
+UnsignedInt NetPacket::GetBufferSizeNeededForCommand(NetCommandMsg *msg) {
+	// This is where the fun begins...
+
+	if (msg == NULL) {
+		return TRUE; // There was nothing to add, so it was successful.
+	}
+	// Use the virtual function for all command message types
+	return msg->getPackedByteCount();
+}
+
+
+
+// this function assumes that buffer is already the correct size.
+void NetPacket::FillBufferWithCommand(UnsignedByte *buffer, NetCommandRef *ref) {
+	NetCommandMsg *msg = ref->getCommand();
+
+	switch(msg->getNetCommandType())
+	{
+		case NETCOMMANDTYPE_GAMECOMMAND:
+			FillBufferWithGameCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_ACKSTAGE1:
+		case NETCOMMANDTYPE_ACKSTAGE2:
+		case NETCOMMANDTYPE_ACKBOTH:
+			FillBufferWithAckCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_FRAMEINFO:
+			FillBufferWithFrameCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_PLAYERLEAVE:
+			FillBufferWithPlayerLeaveCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_RUNAHEADMETRICS:
+			FillBufferWithRunAheadMetricsCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_RUNAHEAD:
+			FillBufferWithRunAheadCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_DESTROYPLAYER:
+			FillBufferWithDestroyPlayerCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_KEEPALIVE:
+			FillBufferWithKeepAliveCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
+			FillBufferWithDisconnectKeepAliveCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_DISCONNECTPLAYER:
+			FillBufferWithDisconnectPlayerCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_PACKETROUTERQUERY:
+			FillBufferWithPacketRouterQueryCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_PACKETROUTERACK:
+			FillBufferWithPacketRouterAckCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_DISCONNECTCHAT:
+			FillBufferWithDisconnectChatCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_DISCONNECTVOTE:
+			FillBufferWithDisconnectVoteCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_CHAT:
+			FillBufferWithChatCommand(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_PROGRESS:
+			FillBufferWithProgressMessage(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_LOADCOMPLETE:
+			FillBufferWithLoadCompleteMessage(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_TIMEOUTSTART:
+			FillBufferWithTimeOutGameStartMessage(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_FILE:
+			FillBufferWithFileMessage(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_FILEANNOUNCE:
+			FillBufferWithFileAnnounceMessage(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_FILEPROGRESS:
+			FillBufferWithFileProgressMessage(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_DISCONNECTFRAME:
+			FillBufferWithDisconnectFrameMessage(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
+			FillBufferWithDisconnectScreenOffMessage(buffer, ref);
+			break;
+		case NETCOMMANDTYPE_FRAMERESENDREQUEST:
+			FillBufferWithFrameResendRequestMessage(buffer, ref);
+			break;
+		default:
+			DEBUG_CRASH(("Unknown NETCOMMANDTYPE %d", msg->getNetCommandType()));
+			break;
+	}
+}
+
+void NetPacket::FillBufferWithGameCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetGameCommandMsg *cmdMsg = static_cast<NetGameCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+	// get the game message from the NetCommandMsg
+	GameMessage *gmsg = cmdMsg->constructGameMessage();
+
+	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithGameCommand for command ID %d", cmdMsg->getID()));
+
+	// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+	// If necessary, put the execution frame into the packet.
+	buffer[offset] = NetPacketFieldTypes::Frame;
+	++offset;
+	UnsignedInt newframe = cmdMsg->getExecutionFrame();
+	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
+	offset += sizeof(UnsignedInt);
+
+	// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+	// If necessary, put the playerID into the packet.
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+	// If necessary, specify the command ID of this command.
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+
+	// Now copy the GameMessage type into the packet.
+	GameMessage::Type newType = gmsg->getType();
+	memcpy(buffer + offset, &newType, sizeof(GameMessage::Type));
+	offset += sizeof(GameMessage::Type);
+
+
+	GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
+	UnsignedByte numTypes = parser->getNumTypes();
+	memcpy(buffer + offset, &numTypes, sizeof(numTypes));
+	offset += sizeof(numTypes);
+
+	GameMessageParserArgumentType *argType = parser->getFirstArgumentType();
+	while (argType != NULL) {
+		UnsignedByte type = (UnsignedByte)(argType->getType());
+		memcpy(buffer + offset, &type, sizeof(type));
+		offset += sizeof(type);
+
+		UnsignedByte argTypeCount = argType->getArgCount();
+		memcpy(buffer + offset, &argTypeCount, sizeof(argTypeCount));
+		offset += sizeof(argTypeCount);
+
+		argType = argType->getNext();
+	}
+
+	Int numArgs = gmsg->getArgumentCount();
+	for (Int i = 0; i < numArgs; ++i) {
+		GameMessageArgumentDataType type = gmsg->getArgumentDataType(i);
+		GameMessageArgumentType arg = *(gmsg->getArgument(i));
+
+		switch (type) {
+
+		case ARGUMENTDATATYPE_INTEGER:
+			memcpy(buffer + offset, &(arg.integer), sizeof(arg.integer));
+			offset += sizeof(arg.integer);
+			break;
+		case ARGUMENTDATATYPE_REAL:
+			memcpy(buffer + offset, &(arg.real), sizeof(arg.real));
+			offset += sizeof(arg.real);
+			break;
+		case ARGUMENTDATATYPE_BOOLEAN:
+			memcpy(buffer + offset, &(arg.boolean), sizeof(arg.boolean));
+			offset += sizeof(arg.boolean);
+			break;
+		case ARGUMENTDATATYPE_OBJECTID:
+			memcpy(buffer + offset, &(arg.objectID), sizeof(arg.objectID));
+			offset += sizeof(arg.objectID);
+			break;
+		case ARGUMENTDATATYPE_DRAWABLEID:
+			memcpy(buffer + offset, &(arg.drawableID), sizeof(arg.drawableID));
+			offset += sizeof(arg.drawableID);
+			break;
+		case ARGUMENTDATATYPE_TEAMID:
+			memcpy(buffer + offset, &(arg.teamID), sizeof(arg.teamID));
+			offset += sizeof(arg.teamID);
+			break;
+		case ARGUMENTDATATYPE_LOCATION:
+			memcpy(buffer + offset, &(arg.location), sizeof(arg.location));
+			offset += sizeof(arg.location);
+			break;
+		case ARGUMENTDATATYPE_PIXEL:
+			memcpy(buffer + offset, &(arg.pixel), sizeof(arg.pixel));
+			offset += sizeof(arg.pixel);
+			break;
+		case ARGUMENTDATATYPE_PIXELREGION:
+			memcpy(buffer + offset, &(arg.pixelRegion), sizeof(arg.pixelRegion));
+			offset += sizeof(arg.pixelRegion);
+			break;
+		case ARGUMENTDATATYPE_TIMESTAMP:
+			memcpy(buffer + offset, &(arg.timestamp), sizeof(arg.timestamp));
+			offset += sizeof(arg.timestamp);
+			break;
+		case ARGUMENTDATATYPE_WIDECHAR:
+			memcpy(buffer + offset, &(arg.wChar), sizeof(arg.wChar));
+			offset += sizeof(arg.wChar);
+			break;
+		}
+
+	}
+
+	deleteInstance(parser);
+	parser = NULL;
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addGameMessage - added game message, frame %d, player %d, command ID %d", m_lastFrame, m_lastPlayerID, m_lastCommandID));
+
+	deleteInstance(gmsg);
+	gmsg = NULL;
+}
+
+void NetPacket::FillBufferWithAckCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithAckCommand - adding ack for command %d for player %d", cmdMsg->getCommandID(), msg->getCommand()->getPlayerID()));
+
+	NetCommandMsg *cmdMsg = msg->getCommand();
+	UnsignedShort offset = 0;
+
+	UnsignedShort commandID = 0;
+	UnsignedByte originalPlayerID = 0;
+
+	NetCommandType type = cmdMsg->getNetCommandType();
+
+	switch (type) {
+
+	case NETCOMMANDTYPE_ACKBOTH: {
+		NetAckBothCommandMsg* ackbothmsg = (NetAckBothCommandMsg*)msg;
+		commandID = ackbothmsg->getCommandID();
+		originalPlayerID = ackbothmsg->getOriginalPlayerID();
+		break;
+	}
+
+	case NETCOMMANDTYPE_ACKSTAGE1: {
+		NetAckStage1CommandMsg* ackstageonemsg = (NetAckStage1CommandMsg*)msg;
+		commandID = ackstageonemsg->getCommandID();
+		originalPlayerID = ackstageonemsg->getOriginalPlayerID();
+		break;
+	}
+
+	case NETCOMMANDTYPE_ACKSTAGE2: {
+		NetAckStage2CommandMsg* ackstagetwomsg = (NetAckStage2CommandMsg*)msg;
+		commandID = ackstagetwomsg->getCommandID();
+		originalPlayerID = ackstagetwomsg->getOriginalPlayerID();
+		break;
+	}
+
+	}
+
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = type;
+	offset += sizeof(UnsignedByte);
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+	// Put in the command id of the command we are acking.
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+	memcpy(buffer + offset, &commandID, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+	memcpy(buffer + offset, &originalPlayerID, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+	//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added ACK, original player %d, command id %d", origPlayerID, cmdID));
+}
+
+void NetPacket::FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetFrameCommandMsg *cmdMsg = static_cast<NetFrameCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+	//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addFrameCommand - adding frame command for frame %d, command count = %d, command id = %d", cmdMsg->getExecutionFrame(), cmdMsg->getCommandCount(), cmdMsg->getID()));
+
+// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the execution frame into the packet.
+	buffer[offset] = NetPacketFieldTypes::Frame;
+	++offset;
+	UnsignedInt newframe = cmdMsg->getExecutionFrame();
+	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
+	offset += sizeof(UnsignedInt);
+
+// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+// If necessary, specify the command ID of this command.
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+	UnsignedShort cmdCount = cmdMsg->getCommandCount();
+	memcpy(buffer + offset, &cmdCount, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+	// frameinfodebug
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added frame %d, player %d, command count = %d, command id = %d", cmdMsg->getExecutionFrame(), cmdMsg->getPlayerID(), cmdMsg->getCommandCount(), cmdMsg->getID()));
+}
+
+void NetPacket::FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetPlayerLeaveCommandMsg *cmdMsg = static_cast<NetPlayerLeaveCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPlayerLeaveCommand - adding player leave command for player %d", cmdMsg->getLeavingPlayerID()));
+
+	// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the execution frame into the packet.
+	buffer[offset] = NetPacketFieldTypes::Frame;
+	++offset;
+	UnsignedInt newframe = cmdMsg->getExecutionFrame();
+	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
+	offset += sizeof(UnsignedInt);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+// If necessary, specify the command ID of this command.
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+	UnsignedByte leavingPlayerID = cmdMsg->getLeavingPlayerID();
+	memcpy(buffer + offset, &leavingPlayerID, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+}
+
+void NetPacket::FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetRunAheadMetricsCommandMsg *cmdMsg = static_cast<NetRunAheadMetricsCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadMetricsCommand - adding run ahead metrics for player %d, fps = %d, latency = %f", cmdMsg->getPlayerID(), cmdMsg->getAverageFps(), cmdMsg->getAverageLatency()));
+
+	// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+// If necessary, specify the command ID of this command.
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+	// write the average latency
+	Real averageLatency = cmdMsg->getAverageLatency();
+	memcpy(buffer + offset, &averageLatency, sizeof(averageLatency));
+	offset += sizeof(averageLatency);
+	// write the average fps
+	UnsignedShort averageFps = (UnsignedShort)(cmdMsg->getAverageFps());
+	memcpy(buffer + offset, &averageFps, sizeof(averageFps));
+	offset += sizeof(averageFps);
+}
+
+void NetPacket::FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetRunAheadCommandMsg *cmdMsg = static_cast<NetRunAheadCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithRunAheadCommand - adding run ahead command"));
+
+	// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+	// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+	// If necessary, put the execution frame into the packet.
+	buffer[offset] = NetPacketFieldTypes::Frame;
+	++offset;
+	UnsignedInt newframe = cmdMsg->getExecutionFrame();
+	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
+	offset += sizeof(UnsignedInt);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+	// If necessary, specify the command ID of this command.
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+	UnsignedShort newRunAhead = cmdMsg->getRunAhead();
+	memcpy(buffer + offset, &newRunAhead, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+	UnsignedByte newFrameRate = cmdMsg->getFrameRate();
+	memcpy(buffer + offset, &newFrameRate, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added run ahead command, frame %d, player id %d command id %d", m_lastFrame, m_lastPlayerID, m_lastCommandID));
+}
+
+void NetPacket::FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetDestroyPlayerCommandMsg *cmdMsg = static_cast<NetDestroyPlayerCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadCommand - adding run ahead command"));
+
+// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the execution frame into the packet.
+	buffer[offset] = NetPacketFieldTypes::Frame;
+	++offset;
+	UnsignedInt newframe = cmdMsg->getExecutionFrame();
+	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
+	offset += sizeof(UnsignedInt);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+// If necessary, specify the command ID of this command.
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+	UnsignedInt newVal = cmdMsg->getPlayerIndex();
+	memcpy(buffer + offset, &newVal, sizeof(UnsignedInt));
+	offset += sizeof(UnsignedInt);
+}
+
+void NetPacket::FillBufferWithKeepAliveCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetKeepAliveCommandMsg *cmdMsg = static_cast<NetKeepAliveCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+
+	// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+}
+
+void NetPacket::FillBufferWithDisconnectKeepAliveCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetDisconnectKeepAliveCommandMsg *cmdMsg = static_cast<NetDisconnectKeepAliveCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+
+	// Put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+	// Put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+	// Put the player ID into the packet.
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+}
+
+void NetPacket::FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetDisconnectPlayerCommandMsg *cmdMsg = static_cast<NetDisconnectPlayerCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - adding run ahead command"));
+
+	// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+// If necessary, specify the command ID of this command.
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+	//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+	UnsignedByte slot = cmdMsg->getDisconnectSlot();
+	memcpy(buffer + offset, &slot, sizeof(slot));
+	offset += sizeof(slot);
+
+	UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame();
+	memcpy(buffer + offset, &disconnectFrame, sizeof(disconnectFrame));
+	offset += sizeof(disconnectFrame);
+}
+
+void NetPacket::FillBufferWithPacketRouterQueryCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetPacketRouterQueryCommandMsg *cmdMsg = static_cast<NetPacketRouterQueryCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterQueryCommand - adding packet router query command"));
+
+	// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+	// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+}
+
+void NetPacket::FillBufferWithPacketRouterAckCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)(msg->getCommand());
+	UnsignedShort offset = 0;
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterAckCommand - adding packet router query command"));
+
+	// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+	// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+}
+
+void NetPacket::FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg->getCommand());
+	UnsignedShort offset = 0;
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command"));
+
+// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+	UnicodeString unitext = cmdMsg->getText();
+	UnsignedByte length = unitext.getLength();
+	memcpy(buffer + offset, &length, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+	memcpy(buffer + offset, unitext.str(), length * sizeof(UnsignedShort));
+	offset += length * sizeof(UnsignedShort);
+}
+
+void NetPacket::FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)(msg->getCommand());
+	UnsignedShort offset = 0;
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - adding run ahead command"));
+
+// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+// If necessary, specify the command ID of this command.
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+	UnsignedByte slot = cmdMsg->getSlot();
+	memcpy(buffer + offset, &slot, sizeof(slot));
+	offset += sizeof(slot);
+
+	UnsignedInt voteFrame = cmdMsg->getVoteFrame();
+	memcpy(buffer + offset, &voteFrame, sizeof(voteFrame));
+	offset += sizeof(voteFrame);
+}
+
+void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetChatCommandMsg *cmdMsg = static_cast<NetChatCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command"));
+
+// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the execution frame into the packet.
+	buffer[offset] = NetPacketFieldTypes::Frame;
+	++offset;
+	UnsignedInt newframe = cmdMsg->getExecutionFrame();
+	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
+	offset += sizeof(UnsignedInt);
+
+// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+// If necessary, specify the command ID of this command.
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+	UnicodeString unitext = cmdMsg->getText();
+	UnsignedByte length = unitext.getLength();
+	Int playerMask = cmdMsg->getPlayerMask();
+	memcpy(buffer + offset, &length, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+	memcpy(buffer + offset, unitext.str(), length * sizeof(UnsignedShort));
+	offset += length * sizeof(UnsignedShort);
+
+	memcpy(buffer + offset, &playerMask, sizeof(Int));
+	offset += sizeof(Int);
+}
+
+void NetPacket::FillBufferWithProgressMessage(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetProgressCommandMsg *cmdMsg = (NetProgressCommandMsg *)(msg->getCommand());
+	UnsignedShort offset = 0;
+
+// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+// Put the player ID into the packet.
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+
+	buffer[offset] = cmdMsg->getPercentage();
+	++offset;
+}
+
+void NetPacket::FillBufferWithLoadCompleteMessage(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetCommandMsg *cmdMsg = static_cast<NetCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+
+// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, specify the command ID of this command.
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+}
+
+void NetPacket::FillBufferWithTimeOutGameStartMessage(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetCommandMsg *cmdMsg = static_cast<NetCommandMsg *>(msg->getCommand());
+	UnsignedShort offset = 0;
+
+// If necessary, put the NetCommandType into the packet.
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, put the relay into the packet.
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	UnsignedByte newRelay = msg->getRelay();
+	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
+	offset += sizeof(UnsignedByte);
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+// If necessary, specify the command ID of this command.
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
+	offset += sizeof(UnsignedShort);
+
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+}
+
+void NetPacket::FillBufferWithFileMessage(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetFileCommandMsg *cmdMsg = static_cast<NetFileCommandMsg *>(msg->getCommand());
+	UnsignedInt offset = 0;
+
+	// command type
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+	// relay
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	buffer[offset] = msg->getRelay();
+	offset += sizeof(UnsignedByte);
+
+	// player ID
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+	// command ID
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(newID));
+	offset += sizeof(newID);
+
+	// data
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+
+	AsciiString filename = cmdMsg->getPortableFilename();	// PORTABLE
+	for (Int i = 0; i < filename.getLength(); ++i) {
+		buffer[offset] = filename.getCharAt(i);
+		++offset;
+	}
+	buffer[offset] = 0;
+	++offset;
+
+	UnsignedInt newInt = cmdMsg->getFileLength();
+	memcpy(buffer + offset, &newInt, sizeof(newInt));
+	offset += sizeof(newInt);
+
+	memcpy(buffer + offset, cmdMsg->getFileData(), cmdMsg->getFileLength());
+	offset += cmdMsg->getFileLength();
+}
+
+void NetPacket::FillBufferWithFileAnnounceMessage(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetFileAnnounceCommandMsg *cmdMsg = static_cast<NetFileAnnounceCommandMsg *>(msg->getCommand());
+	UnsignedInt offset = 0;
+
+	// command type
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+	// relay
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	buffer[offset] = msg->getRelay();
+	offset += sizeof(UnsignedByte);
+
+	// player ID
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+	// command ID
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(newID));
+	offset += sizeof(newID);
+
+	// data
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+
+	AsciiString filename = cmdMsg->getPortableFilename();	// PORTABLE
+	for (Int i = 0; i < filename.getLength(); ++i) {
+		buffer[offset] = filename.getCharAt(i);
+		++offset;
+	}
+	buffer[offset] = 0;
+	++offset;
+
+	UnsignedShort fileID = cmdMsg->getFileID();
+	memcpy(buffer + offset, &fileID, sizeof(fileID));
+	offset += sizeof(fileID);
+
+	UnsignedByte playerMask = cmdMsg->getPlayerMask();
+	memcpy(buffer + offset, &playerMask, sizeof(playerMask));
+	offset += sizeof(playerMask);
+}
+
+void NetPacket::FillBufferWithFileProgressMessage(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetFileProgressCommandMsg *cmdMsg = (NetFileProgressCommandMsg *)(msg->getCommand());
+	UnsignedInt offset = 0;
+
+	// command type
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+	// relay
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	buffer[offset] = msg->getRelay();
+	offset += sizeof(UnsignedByte);
+
+	// player ID
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+	// command ID
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(newID));
+	offset += sizeof(newID);
+
+	// data
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+
+	UnsignedShort fileID = cmdMsg->getFileID();
+	memcpy(buffer + offset, &fileID, sizeof(fileID));
+	offset += sizeof(fileID);
+
+	Int progress = cmdMsg->getProgress();
+	memcpy(buffer + offset, &progress, sizeof(progress));
+	offset += sizeof(progress);
+}
+
+void NetPacket::FillBufferWithDisconnectFrameMessage(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)(msg->getCommand());
+	UnsignedInt offset = 0;
+
+	// command type
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+	// relay
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	buffer[offset] = msg->getRelay();
+	offset += sizeof(UnsignedByte);
+
+	// player ID
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+	// command ID
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(newID));
+	offset += sizeof(newID);
+
+	// data
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+
+	UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame();
+	memcpy(buffer + offset, &disconnectFrame, sizeof(disconnectFrame));
+	offset += sizeof(disconnectFrame);
+}
+
+void NetPacket::FillBufferWithDisconnectScreenOffMessage(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)(msg->getCommand());
+	UnsignedInt offset = 0;
+
+	// command type
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+	// relay
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	buffer[offset] = msg->getRelay();
+	offset += sizeof(UnsignedByte);
+
+	// player ID
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+	// command ID
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(newID));
+	offset += sizeof(newID);
+
+	// data
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+
+	UnsignedInt newFrame = cmdMsg->getNewFrame();
+	memcpy(buffer + offset, &newFrame, sizeof(newFrame));
+	offset += sizeof(newFrame);
+}
+
+void NetPacket::FillBufferWithFrameResendRequestMessage(UnsignedByte *buffer, NetCommandRef *msg) {
+	NetFrameResendRequestCommandMsg *cmdMsg = (NetFrameResendRequestCommandMsg *)(msg->getCommand());
+	UnsignedInt offset = 0;
+
+	// command type
+	buffer[offset] = NetPacketFieldTypes::CommandType;
+	++offset;
+	buffer[offset] = cmdMsg->getNetCommandType();
+	offset += sizeof(UnsignedByte);
+
+	// relay
+	buffer[offset] = NetPacketFieldTypes::Relay;
+	++offset;
+	buffer[offset] = msg->getRelay();
+	offset += sizeof(UnsignedByte);
+
+	// player ID
+	buffer[offset] = NetPacketFieldTypes::PlayerId;
+	++offset;
+	buffer[offset] = cmdMsg->getPlayerID();
+	offset += sizeof(UnsignedByte);
+
+	// command ID
+	buffer[offset] = NetPacketFieldTypes::CommandId;
+	++offset;
+	UnsignedShort newID = cmdMsg->getID();
+	memcpy(buffer + offset, &newID, sizeof(newID));
+	offset += sizeof(newID);
+
+	// data
+	buffer[offset] = NetPacketFieldTypes::Data;
+	++offset;
+
+	UnsignedInt frameToResend = cmdMsg->getFrameToResend();
+	memcpy(buffer + offset, &frameToResend, sizeof(frameToResend));
+	offset += sizeof(frameToResend);
+}
+
+
+/**
+ * Constructor
+ */
+NetPacket::NetPacket() {
+	init();
+}
+
+/**
+ * Constructor given raw transport data.
+ */
+NetPacket::NetPacket(TransportMessage *msg) {
+	init();
+	m_packetLen = msg->length;
+	memcpy(m_packet, msg->data, MAX_PACKET_SIZE);
+	m_numCommands = -1;
+	m_addr = msg->addr;
+	m_port = msg->port;
+}
+
+/**
+ * Destructor
+ */
+NetPacket::~NetPacket() {
+	deleteInstance(m_lastCommand);
+	m_lastCommand = NULL;
+}
+
+/**
+ * Initialize all the member variable values.
+ */
+void NetPacket::init() {
+	m_addr = 0;
+	m_port = 0;
+	m_numCommands = 0;
+	m_packetLen = 0;
+	m_packet[0] = 0;
+
+	m_lastPlayerID = 0;
+	m_lastFrame = 0;
+	m_lastCommandID = 0;
+	m_lastCommandType = 0;
+	m_lastRelay = 0;
+
+	m_lastCommand = NULL;
+}
+
+void NetPacket::reset() {
+	deleteInstance(m_lastCommand);
+	m_lastCommand = NULL;
+
+	init();
+}
+
+/**
+ * Set the address to which this packet is to be sent.
+ */
+void NetPacket::setAddress(Int addr, Int port) {
+	m_addr = addr;
+	m_port = port;
+}
+
+/**
+ * Adds this command to the packet.  Returns false if there wasn't enough room
+ * in the packet for this message, true otherwise.
+ */
+Bool NetPacket::addCommand(NetCommandRef *msg) {
+	// This is where the fun begins...
+
+	NetCommandMsg *cmdMsg = msg->getCommand();
+
+	if (msg == NULL) {
+		return TRUE; // There was nothing to add, so it was successful.
+	}
+
+	switch(cmdMsg->getNetCommandType())
+	{
+		case NETCOMMANDTYPE_GAMECOMMAND:
+			return addGameCommand(msg);
+		case NETCOMMANDTYPE_ACKSTAGE1:
+			return addAckStage1Command(msg);
+		case NETCOMMANDTYPE_ACKSTAGE2:
+			return addAckStage2Command(msg);
+		case NETCOMMANDTYPE_ACKBOTH:
+			return addAckBothCommand(msg);
+		case NETCOMMANDTYPE_FRAMEINFO:
+			return addFrameCommand(msg);
+		case NETCOMMANDTYPE_PLAYERLEAVE:
+			return addPlayerLeaveCommand(msg);
+		case NETCOMMANDTYPE_RUNAHEADMETRICS:
+			return addRunAheadMetricsCommand(msg);
+		case NETCOMMANDTYPE_RUNAHEAD:
+			return addRunAheadCommand(msg);
+		case NETCOMMANDTYPE_DESTROYPLAYER:
+			return addDestroyPlayerCommand(msg);
+		case NETCOMMANDTYPE_KEEPALIVE:
+			return addKeepAliveCommand(msg);
+		case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
+			return addDisconnectKeepAliveCommand(msg);
+		case NETCOMMANDTYPE_DISCONNECTPLAYER:
+			return addDisconnectPlayerCommand(msg);
+		case NETCOMMANDTYPE_PACKETROUTERQUERY:
+			return addPacketRouterQueryCommand(msg);
+		case NETCOMMANDTYPE_PACKETROUTERACK:
+			return addPacketRouterAckCommand(msg);
+		case NETCOMMANDTYPE_DISCONNECTCHAT:
+			return addDisconnectChatCommand(msg);
+		case NETCOMMANDTYPE_DISCONNECTVOTE:
+			return addDisconnectVoteCommand(msg);
+		case NETCOMMANDTYPE_CHAT:
+			return addChatCommand(msg);
+		case NETCOMMANDTYPE_PROGRESS:
+			return addProgressMessage(msg);
+		case NETCOMMANDTYPE_LOADCOMPLETE:
+			return addLoadCompleteMessage(msg);
+		case NETCOMMANDTYPE_TIMEOUTSTART:
+			return addTimeOutGameStartMessage(msg);
+		case NETCOMMANDTYPE_WRAPPER:
+			return addWrapperCommand(msg);
+		case NETCOMMANDTYPE_FILE:
+			return addFileCommand(msg);
+		case NETCOMMANDTYPE_FILEANNOUNCE:
+			return addFileAnnounceCommand(msg);
+		case NETCOMMANDTYPE_FILEPROGRESS:
+			return addFileProgressCommand(msg);
+		case NETCOMMANDTYPE_DISCONNECTFRAME:
+			return addDisconnectFrameCommand(msg);
+		case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
+			return addDisconnectScreenOffCommand(msg);
+		case NETCOMMANDTYPE_FRAMERESENDREQUEST:
+			return addFrameResendRequestCommand(msg);
+		default:
+			DEBUG_CRASH(("Unknown NETCOMMANDTYPE %d", cmdMsg->getNetCommandType()));
+			break;
+	}
+
+	return TRUE;
+}
+
+/*
+T = Net command type
+F = Execution frame
+P = Player ID
+C = Command ID
+R = Relay
+D = Command Data
+Z = Repeat last command
+*/
+Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForFrameResendRequestMessage(msg)) {
+		NetFrameResendRequestCommandMsg *cmdMsg = (NetFrameResendRequestCommandMsg *)(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the execution frame into the packet.
+		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Frame;
+			++m_packetLen;
+			UnsignedInt newframe = cmdMsg->getExecutionFrame();
+			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
+			m_packetLen += sizeof(UnsignedInt);
+
+			m_lastFrame = newframe;
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		// If necessary put the player ID into the packet.
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		UnsignedInt frameToResend = cmdMsg->getFrameToResend();
+		memcpy(m_packet + m_packetLen, &frameToResend, sizeof(frameToResend));
+		m_packetLen += sizeof(frameToResend);
+
+		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addFrameResendRequest - added frame resend request command from player %d for frame %d, command id = %d", m_lastPlayerID, frameToResend, m_lastCommandID));
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool NetPacket::isRoomForFrameResendRequestMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetFrameResendRequestCommandMsg *cmdMsg = (NetFrameResendRequestCommandMsg *)(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedInt); // for the frame to be resent
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForDisconnectScreenOffMessage(msg)) {
+		NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the execution frame into the packet.
+		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Frame;
+			++m_packetLen;
+			UnsignedInt newframe = cmdMsg->getExecutionFrame();
+			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
+			m_packetLen += sizeof(UnsignedInt);
+
+			m_lastFrame = newframe;
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		// If necessary put the player ID into the packet.
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		UnsignedInt newFrame = cmdMsg->getNewFrame();
+		memcpy(m_packet + m_packetLen, &newFrame, sizeof(newFrame));
+		m_packetLen += sizeof(newFrame);
+
+		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectScreenOff - added disconnect screen off command from player %d for frame %d, command id = %d", m_lastPlayerID, newFrame, m_lastCommandID));
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool NetPacket::isRoomForDisconnectScreenOffMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedInt); // for the disconnect frame
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForDisconnectFrameMessage(msg)) {
+		NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the execution frame into the packet.
+		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Frame;
+			++m_packetLen;
+			UnsignedInt newframe = cmdMsg->getExecutionFrame();
+			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
+			m_packetLen += sizeof(UnsignedInt);
+
+			m_lastFrame = newframe;
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		// If necessary put the player ID into the packet.
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame();
+		memcpy(m_packet + m_packetLen, &disconnectFrame, sizeof(disconnectFrame));
+		m_packetLen += sizeof(disconnectFrame);
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectFrame - added disconnect frame command from player %d for frame %d, command id = %d", m_lastPlayerID, disconnectFrame, m_lastCommandID));
+
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool NetPacket::isRoomForDisconnectFrameMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedInt); // for the disconnect frame
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+Bool NetPacket::addFileCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForFileMessage(msg)) {
+		NetFileCommandMsg *cmdMsg = static_cast<NetFileCommandMsg *>(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		// If necessary put the player ID into the packet.
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		AsciiString filename = cmdMsg->getPortableFilename();		// PORTABLE
+		strcpy((char *)(m_packet + m_packetLen), filename.str());
+		m_packetLen += filename.getLength() + 1;
+
+		UnsignedInt fileLength = cmdMsg->getFileLength();
+		memcpy(m_packet + m_packetLen, &fileLength, sizeof(fileLength));
+		m_packetLen += sizeof(fileLength);
+
+		memcpy(m_packet + m_packetLen, cmdMsg->getFileData(), fileLength);
+		m_packetLen += fileLength;
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool NetPacket::isRoomForFileMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetFileCommandMsg *cmdMsg = static_cast<NetFileCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedShort);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += cmdMsg->getPortableFilename().getLength() + 1; // PORTABLE filename + the terminating 0
+	len += sizeof(UnsignedInt); // filedata length
+	len += cmdMsg->getFileLength();
+
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForFileAnnounceMessage(msg)) {
+		NetFileAnnounceCommandMsg *cmdMsg = static_cast<NetFileAnnounceCommandMsg *>(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		// If necessary put the player ID into the packet.
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		AsciiString filename = cmdMsg->getPortableFilename();	// PORTABLE
+		strcpy((char *)(m_packet + m_packetLen), filename.str());
+		m_packetLen += filename.getLength() + 1;
+
+		UnsignedShort fileID = cmdMsg->getFileID();
+		memcpy(m_packet + m_packetLen, &fileID, sizeof(fileID));
+		m_packetLen += sizeof(fileID);
+
+		UnsignedByte playerMask = cmdMsg->getPlayerMask();
+		memcpy(m_packet + m_packetLen, &playerMask, sizeof(playerMask));
+		m_packetLen += sizeof(playerMask);
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Adding file announce message for fileID %d, ID %d to packet",
+			cmdMsg->getFileID(), cmdMsg->getID()));
+		return TRUE;
+	}
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("No room to add file announce message to packet"));
+	return FALSE;
+}
+
+Bool NetPacket::isRoomForFileAnnounceMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetFileAnnounceCommandMsg *cmdMsg = static_cast<NetFileAnnounceCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedShort);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += cmdMsg->getPortableFilename().getLength() + 1; // PORTABLE filename + the terminating 0
+	len += sizeof(UnsignedShort); // m_fileID
+	len += sizeof(UnsignedByte); // m_playerMask
+
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForFileProgressMessage(msg)) {
+		NetFileProgressCommandMsg *cmdMsg = (NetFileProgressCommandMsg *)(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		// If necessary put the player ID into the packet.
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		UnsignedShort fileID = cmdMsg->getFileID();
+		memcpy(m_packet + m_packetLen, &fileID, sizeof(fileID));
+		m_packetLen += sizeof(fileID);
+
+		Int progress = cmdMsg->getProgress();
+		memcpy(m_packet + m_packetLen, &progress, sizeof(progress));
+		m_packetLen += sizeof(progress);
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool NetPacket::isRoomForFileProgressMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetFileProgressCommandMsg *cmdMsg = (NetFileProgressCommandMsg *)(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedShort);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedShort); // m_fileID
+	len += sizeof(Int); // m_progress
+
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+Bool NetPacket::addWrapperCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForWrapperMessage(msg)) {
+		NetWrapperCommandMsg *cmdMsg = (NetWrapperCommandMsg *)(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		// If necessary put the player ID into the packet.
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		// wrapped command ID
+		UnsignedShort wrappedCommandID = cmdMsg->getWrappedCommandID();
+		memcpy(m_packet + m_packetLen, &wrappedCommandID, sizeof(wrappedCommandID));
+		m_packetLen += sizeof(wrappedCommandID);
+
+		// chunk number
+//		m_packet[m_packetLen] = cmdMsg->getChunkNumber();
+//		++m_packetLen;
+		UnsignedInt chunkNumber = cmdMsg->getChunkNumber();
+		memcpy(m_packet + m_packetLen, &chunkNumber, sizeof(chunkNumber));
+		m_packetLen += sizeof(chunkNumber);
+
+		// number of chunks
+//		m_packet[m_packetLen] = cmdMsg->getNumChunks();
+//		++m_packetLen;
+		UnsignedInt numChunks = cmdMsg->getNumChunks();
+		memcpy(m_packet + m_packetLen, &numChunks, sizeof(numChunks));
+		m_packetLen += sizeof(numChunks);
+
+		// total length of data for all chunks
+		UnsignedInt totalDataLength = cmdMsg->getTotalDataLength();
+		memcpy(m_packet + m_packetLen, &totalDataLength, sizeof(totalDataLength));
+		m_packetLen += sizeof(totalDataLength);
+
+		// data length for this chunk
+		UnsignedInt dataLength = cmdMsg->getDataLength();
+		memcpy(m_packet + m_packetLen, &dataLength, sizeof(dataLength));
+		m_packetLen += sizeof(dataLength);
+
+		// the offset into the data of this chunk
+		UnsignedInt dataOffset = cmdMsg->getDataOffset();
+		memcpy(m_packet + m_packetLen, &dataOffset, sizeof(dataOffset));
+		m_packetLen += sizeof(dataOffset);
+
+		// the data for this chunk
+		UnsignedByte *data = cmdMsg->getData();
+		memcpy(m_packet + m_packetLen, data, dataLength);
+		m_packetLen += dataLength;
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool NetPacket::isRoomForWrapperMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetWrapperCommandMsg *cmdMsg = (NetWrapperCommandMsg *)(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedShort);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedShort); // wrapped command ID
+	len += sizeof(UnsignedInt); // chunk number
+	len += sizeof(UnsignedInt); // number of chunks
+	len += sizeof(UnsignedInt); // total data length
+	len += sizeof(UnsignedInt); // data length of this chunk
+	len += sizeof(UnsignedInt); // offset of this chunk
+	len += cmdMsg->getDataLength(); // for the data of this chunk
+
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/**
+ * Add a TimeOutGameStart  to the packet. Returns true if successful.
+ */
+Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForLoadCompleteMessage(msg)) {
+		NetCommandMsg *cmdMsg = static_cast<NetCommandMsg *>(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet."));
+
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is room in the packet for this command.
+ */
+Bool NetPacket::isRoomForTimeOutGameStartMessage(NetCommandRef *msg) {
+	Int len = 0;
+	NetCommandMsg *cmdMsg = static_cast<NetCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+
+
+/**
+ * Add a Progress command to the packet. Returns true if successful.
+ */
+Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForLoadCompleteMessage(msg)) {
+		NetCommandMsg *cmdMsg = static_cast<NetCommandMsg *>(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet."));
+
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is room in the packet for this command.
+ */
+Bool NetPacket::isRoomForLoadCompleteMessage(NetCommandRef *msg) {
+	Int len = 0;
+	NetCommandMsg *cmdMsg = static_cast<NetCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+
+
+
+/**
+ * Add a Progress command to the packet. Returns true if successful.
+ */
+Bool NetPacket::addProgressMessage(NetCommandRef *msg) {
+	if (isRoomForProgressMessage(msg)) {
+		NetProgressCommandMsg *cmdMsg = (NetProgressCommandMsg *)(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+		}
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		m_packet[m_packetLen] = cmdMsg->getPercentage();
+		++m_packetLen;
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet."));
+
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is room in the packet for this command.
+ */
+Bool NetPacket::isRoomForProgressMessage(NetCommandRef *msg) {
+	Int len = 0;
+	NetProgressCommandMsg *cmdMsg = (NetProgressCommandMsg *)(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	++len; // percentage
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+
+
+Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - entering..."));
+	//  need type, player id, relay, command id, slot number
+	if (isRoomForDisconnectVoteMessage(msg)) {
+		NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)(msg->getCommand());
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - adding run ahead command"));
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+		UnsignedByte slot = cmdMsg->getSlot();
+		memcpy(m_packet + m_packetLen, &slot, sizeof(slot));
+		m_packetLen += sizeof(slot);
+
+		UnsignedInt voteFrame = cmdMsg->getVoteFrame();
+		memcpy(m_packet + m_packetLen, &voteFrame, sizeof(voteFrame));
+		m_packetLen += sizeof(voteFrame);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - added disconnect vote command, player id %d command id %d, voted slot %d", m_lastPlayerID, m_lastCommandID, slot));
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is room for this player disconnect command in this packet.
+ */
+Bool NetPacket::isRoomForDisconnectVoteMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedByte); // slot number
+	len += sizeof(UnsignedInt); // vote frame
+
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) {
+	// type, player, id, relay, data
+	// data format: 1 byte string length, string (two bytes per character)
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - Entering..."));
+	if (isRoomForDisconnectChatMessage(msg)) {
+		NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg->getCommand());
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command"));
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+		UnicodeString unitext = cmdMsg->getText();
+		UnsignedByte length = unitext.getLength();
+		memcpy(m_packet + m_packetLen, &length, sizeof(UnsignedByte));
+		m_packetLen += sizeof(UnsignedByte);
+
+		memcpy(m_packet + m_packetLen, unitext.str(), length * sizeof(UnsignedShort));
+		m_packetLen += length * sizeof(UnsignedShort);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added disconnect chat command"));
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool NetPacket::isRoomForDisconnectChatMessage(NetCommandRef *msg) {
+	Int len = 0;
+	NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedByte); // string length
+	UnsignedByte textLen = cmdMsg->getText().getLength();
+	len += textLen * sizeof(UnsignedShort);
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+Bool NetPacket::addChatCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForChatMessage(msg)) {
+		NetChatCommandMsg *cmdMsg = static_cast<NetChatCommandMsg *>(msg->getCommand());
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command"));
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the execution frame into the packet.
+		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Frame;
+			++m_packetLen;
+			UnsignedInt newframe = cmdMsg->getExecutionFrame();
+			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
+			m_packetLen += sizeof(UnsignedInt);
+
+			m_lastFrame = newframe;
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+		UnicodeString unitext = cmdMsg->getText();
+		UnsignedByte length = unitext.getLength();
+		Int playerMask = cmdMsg->getPlayerMask();
+		memcpy(m_packet + m_packetLen, &length, sizeof(UnsignedByte));
+		m_packetLen += sizeof(UnsignedByte);
+
+		memcpy(m_packet + m_packetLen, unitext.str(), length * sizeof(UnsignedShort));
+		m_packetLen += length * sizeof(UnsignedShort);
+
+		memcpy(m_packet + m_packetLen, &playerMask, sizeof(Int));
+		m_packetLen += sizeof(Int);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added chat command"));
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool NetPacket::isRoomForChatMessage(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	Int len = 0;
+	NetChatCommandMsg *cmdMsg = static_cast<NetChatCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedByte); // string length
+	UnsignedByte textLen = cmdMsg->getText().getLength();
+	len += textLen * sizeof(UnsignedShort);
+	len += sizeof(Int); // playerMask
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) {
+	//  need type, player id, relay, command id, slot number
+	if (isRoomForPacketRouterAckMessage(msg)) {
+		NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)(msg->getCommand());
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterAckCommand - adding packet router query command"));
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added packet router ack command, player id %d", m_lastPlayerID));
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is room for this packet router ack command in this packet.
+ */
+Bool NetPacket::isRoomForPacketRouterAckMessage(NetCommandRef *msg) {
+	Int len = 0;
+	NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+Bool NetPacket::addPacketRouterQueryCommand(NetCommandRef *msg) {
+	//  need type, player id, relay, command id, slot number
+	if (isRoomForPacketRouterQueryMessage(msg)) {
+		NetPacketRouterQueryCommandMsg *cmdMsg = static_cast<NetPacketRouterQueryCommandMsg *>(msg->getCommand());
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterQueryCommand - adding packet router query command"));
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added packet router query command, player id %d", m_lastPlayerID));
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is room for this packet router query command in this packet.
+ */
+Bool NetPacket::isRoomForPacketRouterQueryMessage(NetCommandRef *msg) {
+	Int len = 0;
+	NetPacketRouterQueryCommandMsg *cmdMsg = static_cast<NetPacketRouterQueryCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - entering..."));
+	//  need type, player id, relay, command id, slot number
+	if (isRoomForDisconnectPlayerMessage(msg)) {
+		NetDisconnectPlayerCommandMsg *cmdMsg = static_cast<NetDisconnectPlayerCommandMsg *>(msg->getCommand());
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - adding run ahead command"));
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+		UnsignedByte slot = cmdMsg->getDisconnectSlot();
+		memcpy(m_packet + m_packetLen, &slot, sizeof(slot));
+		m_packetLen += sizeof(slot);
+
+		UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame();
+		memcpy(m_packet + m_packetLen, &disconnectFrame, sizeof(disconnectFrame));
+		m_packetLen += sizeof(disconnectFrame);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - added disconnect player command, player id %d command id %d, disconnecting slot %d", m_lastPlayerID, m_lastCommandID, slot));
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is room for this player disconnect command in this packet.
+ */
+Bool NetPacket::isRoomForDisconnectPlayerMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetDisconnectPlayerCommandMsg *cmdMsg = static_cast<NetDisconnectPlayerCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedByte); // slot number
+	len += sizeof(UnsignedInt);	// disconnectFrame
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+
+/**
+ * Add a keep alive command to the packet. Returns true if successful.
+ */
+Bool NetPacket::addDisconnectKeepAliveCommand(NetCommandRef *msg) {
+	if (isRoomForDisconnectKeepAliveMessage(msg)) {
+		NetDisconnectKeepAliveCommandMsg *cmdMsg = static_cast<NetDisconnectKeepAliveCommandMsg *>(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+		}
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet."));
+
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is room in the packet for this command.
+ */
+Bool NetPacket::isRoomForDisconnectKeepAliveMessage(NetCommandRef *msg) {
+	Int len = 0;
+	NetDisconnectKeepAliveCommandMsg *cmdMsg = static_cast<NetDisconnectKeepAliveCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/**
+ * Add a keep alive command to the packet. Returns true if successful.
+ */
+Bool NetPacket::addKeepAliveCommand(NetCommandRef *msg) {
+	if (isRoomForKeepAliveMessage(msg)) {
+		NetKeepAliveCommandMsg *cmdMsg = static_cast<NetKeepAliveCommandMsg *>(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+		}
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet."));
+
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is room in the packet for this command.
+ */
+Bool NetPacket::isRoomForKeepAliveMessage(NetCommandRef *msg) {
+	Int len = 0;
+	NetKeepAliveCommandMsg *cmdMsg = static_cast<NetKeepAliveCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/**
+ * Add a run ahead command to the packet. Returns true if successful.
+ */
+Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForRunAheadMessage(msg)) {
+		NetRunAheadCommandMsg *cmdMsg = static_cast<NetRunAheadCommandMsg *>(msg->getCommand());
+		//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadCommand - adding run ahead command"));
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		// If necessary, put the execution frame into the packet.
+		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Frame;
+			++m_packetLen;
+			UnsignedInt newframe = cmdMsg->getExecutionFrame();
+			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
+			m_packetLen += sizeof(UnsignedInt);
+
+			m_lastFrame = newframe;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+		UnsignedShort newRunAhead = cmdMsg->getRunAhead();
+		memcpy(m_packet + m_packetLen, &newRunAhead, sizeof(UnsignedShort));
+		m_packetLen += sizeof(UnsignedShort);
+
+		UnsignedByte newFrameRate = cmdMsg->getFrameRate();
+		memcpy(m_packet + m_packetLen, &newFrameRate, sizeof(UnsignedByte));
+		m_packetLen += sizeof(UnsignedByte);
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added run ahead command, frame %d, player id %d command id %d", m_lastFrame, m_lastPlayerID, m_lastCommandID));
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is room for this run ahead command in this packet.
+ */
+Bool NetPacket::isRoomForRunAheadMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetRunAheadCommandMsg *cmdMsg = static_cast<NetRunAheadCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedShort);
+	len += sizeof(UnsignedByte);
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/**
+ * Add a DestroyPlayer command to the packet. Returns true if successful.
+ */
+Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForDestroyPlayerMessage(msg)) {
+		NetDestroyPlayerCommandMsg *cmdMsg = static_cast<NetDestroyPlayerCommandMsg *>(msg->getCommand());
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		// If necessary, put the execution frame into the packet.
+		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Frame;
+			++m_packetLen;
+			UnsignedInt newframe = cmdMsg->getExecutionFrame();
+			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
+			m_packetLen += sizeof(UnsignedInt);
+
+			m_lastFrame = newframe;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+		UnsignedInt newVal = cmdMsg->getPlayerIndex();
+		memcpy(m_packet + m_packetLen, &newVal, sizeof(UnsignedInt));
+		m_packetLen += sizeof(UnsignedInt);
+
+		//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added CRC:0x%8.8X info command, frame %d, player id %d command id %d", newCRC, m_lastFrame, m_lastPlayerID, m_lastCommandID));
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is room for this DestroyPlayer command in this packet.
+ */
+Bool NetPacket::isRoomForDestroyPlayerMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetDestroyPlayerCommandMsg *cmdMsg = static_cast<NetDestroyPlayerCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedInt);
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/**
+ * Add a run ahead metrics command to the packet. Returns true if successful.
+ */
+Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForRunAheadMetricsMessage(msg)) {
+		NetRunAheadMetricsCommandMsg *cmdMsg = static_cast<NetRunAheadMetricsCommandMsg *>(msg->getCommand());
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadMetricsCommand - adding run ahead metrics for player %d, fps = %d, latency = %f", cmdMsg->getPlayerID(), cmdMsg->getAverageFps(), cmdMsg->getAverageLatency()));
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+		// write the average latency
+		Real averageLatency = cmdMsg->getAverageLatency();
+		memcpy(m_packet + m_packetLen, &averageLatency, sizeof(averageLatency));
+		m_packetLen += sizeof(averageLatency);
+		// write the average fps
+		UnsignedShort averageFps = (UnsignedShort)(cmdMsg->getAverageFps());
+		memcpy(m_packet + m_packetLen, &averageFps, sizeof(averageFps));
+		m_packetLen += sizeof(averageFps);
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+		++m_numCommands;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is enough room in the packet to fit this message.
+ */
+Bool NetPacket::isRoomForRunAheadMetricsMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetRunAheadMetricsCommandMsg *cmdMsg = static_cast<NetRunAheadMetricsCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedShort);
+	len += sizeof(Real);
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+
+/**
+ * Add a player leave command to the packet. Returns true if successful.
+ */
+Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isRoomForPlayerLeaveMessage(msg)) {
+		NetPlayerLeaveCommandMsg *cmdMsg = static_cast<NetPlayerLeaveCommandMsg *>(msg->getCommand());
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPlayerLeaveCommand - adding player leave command for player %d", cmdMsg->getLeavingPlayerID()));
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		// If necessary, put the execution frame into the packet.
+		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Frame;
+			++m_packetLen;
+			UnsignedInt newframe = cmdMsg->getExecutionFrame();
+			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
+			m_packetLen += sizeof(UnsignedInt);
+
+			m_lastFrame = newframe;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+		UnsignedByte leavingPlayerID = cmdMsg->getLeavingPlayerID();
+		memcpy(m_packet + m_packetLen, &leavingPlayerID, sizeof(UnsignedByte));
+		m_packetLen += sizeof(UnsignedByte);
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+		++m_numCommands;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is enough room in the packet to fit this message.
+ */
+Bool NetPacket::isRoomForPlayerLeaveMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetPlayerLeaveCommandMsg *cmdMsg = static_cast<NetPlayerLeaveCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedByte);
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/**
+ * Add this frame command message. Returns true if successful.
+ */
+Bool NetPacket::addFrameCommand(NetCommandRef *msg) {
+	Bool needNewCommandID = FALSE;
+	if (isFrameRepeat(msg)) {
+		if (m_packetLen >= MAX_PACKET_SIZE) {
+			return FALSE;
+		}
+		m_packet[m_packetLen] = 'Z';
+		++m_packetLen;
+		m_lastCommandID = msg->getCommand()->getID();
+		deleteInstance(m_lastCommand);
+		m_lastCommand = newInstance(NetCommandRef)(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+		++m_lastFrame;		// need this cause we're actually advancing to the next frame by adding this command.
+		++m_numCommands;
+		// frameinfodebug
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added frame %d, player %d, command count = %d, command id = %d, repeat", m_lastFrame, m_lastPlayerID, 0, m_lastCommandID));
+		return TRUE;
+	}
+	if (isRoomForFrameMessage(msg)) {
+		NetFrameCommandMsg *cmdMsg = static_cast<NetFrameCommandMsg *>(msg->getCommand());
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addFrameCommand - adding frame command for frame %d, command count = %d, command id = %d", cmdMsg->getExecutionFrame(), cmdMsg->getCommandCount(), cmdMsg->getID()));
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the execution frame into the packet.
+		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Frame;
+			++m_packetLen;
+			UnsignedInt newframe = cmdMsg->getExecutionFrame();
+			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
+			m_packetLen += sizeof(UnsignedInt);
+
+			m_lastFrame = newframe;
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+			needNewCommandID = TRUE;
+		}
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d", m_lastCommandID));
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+		UnsignedShort cmdCount = cmdMsg->getCommandCount();
+		memcpy(m_packet + m_packetLen, &cmdCount, sizeof(UnsignedShort));
+		m_packetLen += sizeof(UnsignedShort);
+
+		// frameinfodebug
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added frame %d, player %d, command count = %d, command id = %d", cmdMsg->getExecutionFrame(), cmdMsg->getPlayerID(), cmdMsg->getCommandCount(), cmdMsg->getID()));
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+		++m_numCommands;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is enough room in this packet for this frame message.
+ */
+Bool NetPacket::isRoomForFrameMessage(NetCommandRef *msg) {
+	Int len = 0;
+	Bool needNewCommandID = FALSE;
+	NetFrameCommandMsg *cmdMsg = static_cast<NetFrameCommandMsg *>(msg->getCommand());
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedShort);
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+Bool NetPacket::isFrameRepeat(NetCommandRef *msg) {
+	if (m_lastCommand == NULL) {
+		return FALSE;
+	}
+	if (m_lastCommand->getCommand()->getNetCommandType() != NETCOMMANDTYPE_FRAMEINFO) {
+		return FALSE;
+	}
+	NetFrameCommandMsg *framemsg = (NetFrameCommandMsg *)(msg->getCommand());
+	NetFrameCommandMsg *lastmsg = (NetFrameCommandMsg *)(m_lastCommand->getCommand());
+	if (framemsg->getCommandCount() != 0) {
+		return FALSE;
+	}
+	if (framemsg->getExecutionFrame() != (lastmsg->getExecutionFrame() + 1)) {
+		return FALSE;
+	}
+	if (msg->getRelay() != m_lastCommand->getRelay()) {
+		return FALSE;
+	}
+	if (framemsg->getID() != (lastmsg->getID() + 1)) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/**
+ * Add an ack "both" command.
+ */
+Bool NetPacket::addAckBothCommand(NetCommandRef *msg) {
+	NetAckBothCommandMsg *ackmsg = (NetAckBothCommandMsg *)(msg->getCommand());
+	return addAckCommand(msg, ackmsg->getCommandID(), ackmsg->getOriginalPlayerID());
+}
+
+/**
+ * Add an ack stage 1 command.
+ */
+Bool NetPacket::addAckStage1Command(NetCommandRef *msg) {
+	NetAckStage1CommandMsg *ackmsg = (NetAckStage1CommandMsg *)(msg->getCommand());
+	return addAckCommand(msg, ackmsg->getCommandID(), ackmsg->getOriginalPlayerID());
+}
+
+/**
+ * Add an ack stage 2 command.
+ */
+Bool NetPacket::addAckStage2Command(NetCommandRef *msg) {
+	NetAckStage2CommandMsg *ackmsg = (NetAckStage2CommandMsg *)(msg->getCommand());
+	return addAckCommand(msg, ackmsg->getCommandID(), ackmsg->getOriginalPlayerID());
+}
+
+/**
+ * Add this ack command to the packet.  Returns true if successful.
+ */
+Bool NetPacket::addAckCommand(NetCommandRef *msg, UnsignedShort commandID, UnsignedByte originalPlayerID) {
+	if (isAckRepeat(msg)) {
+		if (m_packetLen >= MAX_PACKET_SIZE) {
+			return FALSE;
+		}
+		m_packet[m_packetLen] = 'Z';
+		++m_packetLen;
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+		return TRUE;
+	}
+	if (isRoomForAckMessage(msg)) {
+		NetCommandMsg *cmdMsg = msg->getCommand();
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addAckCommand - adding ack for command %d for player %d", cmdMsg->getCommandID(), msg->getCommand()->getPlayerID()));
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+		}
+
+		// Put in the command id of the command we are acking.
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+		memcpy(m_packet + m_packetLen, &commandID, sizeof(UnsignedShort));
+		m_packetLen += sizeof(UnsignedShort);
+		memcpy(m_packet + m_packetLen, &originalPlayerID, sizeof(UnsignedByte));
+		m_packetLen += sizeof(UnsignedByte);
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added ACK, original player %d, command id %d", origPlayerID, cmdID));
+		++m_numCommands;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if there is enough room in the packet for this ack message.
+ */
+Bool NetPacket::isRoomForAckMessage(NetCommandRef *msg) {
+	Int len = 0;
+	NetCommandMsg *cmdMsg = msg->getCommand();
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		++len;
+		len += sizeof(UnsignedByte);
+	}
+
+	++len; // for NetPacketFieldTypes::Data
+	len += sizeof(UnsignedShort);
+	len += sizeof(UnsignedByte);
+	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+Bool NetPacket::isAckRepeat(NetCommandRef *msg) {
+	if (m_lastCommand == NULL) {
+		return FALSE;
+	}
+	if (m_lastCommand->getCommand()->getNetCommandType() != msg->getCommand()->getNetCommandType()) {
+		return FALSE;
+	}
+	if (msg->getCommand()->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
+		return isAckBothRepeat(msg);
+	}
+	if (msg->getCommand()->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) {
+		return isAckStage1Repeat(msg);
+	}
+	if (msg->getCommand()->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) {
+		return isAckStage2Repeat(msg);
+	}
+	return FALSE;
+}
+
+Bool NetPacket::isAckBothRepeat(NetCommandRef *msg) {
+	NetAckBothCommandMsg *ack = (NetAckBothCommandMsg *)(msg->getCommand());
+	NetAckBothCommandMsg *lastAck = (NetAckBothCommandMsg *)(m_lastCommand->getCommand());
+	if (lastAck->getCommandID() != (ack->getCommandID() - 1)) {
+		return FALSE;
+	}
+	if (lastAck->getOriginalPlayerID() != ack->getOriginalPlayerID()) {
+		return FALSE;
+	}
+	if (msg->getRelay() != m_lastCommand->getRelay()) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+Bool NetPacket::isAckStage1Repeat(NetCommandRef *msg) {
+	NetAckStage2CommandMsg *ack = (NetAckStage2CommandMsg *)(msg->getCommand());
+	NetAckStage2CommandMsg *lastAck = (NetAckStage2CommandMsg *)(m_lastCommand->getCommand());
+	if (lastAck->getCommandID() != (ack->getCommandID() - 1)) {
+		return FALSE;
+	}
+	if (lastAck->getOriginalPlayerID() != ack->getOriginalPlayerID()) {
+		return FALSE;
+	}
+	if (msg->getRelay() != m_lastCommand->getRelay()) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+Bool NetPacket::isAckStage2Repeat(NetCommandRef *msg) {
+	NetAckStage2CommandMsg *ack = (NetAckStage2CommandMsg *)(msg->getCommand());
+	NetAckStage2CommandMsg *lastAck = (NetAckStage2CommandMsg *)(m_lastCommand->getCommand());
+	if (lastAck->getCommandID() != (ack->getCommandID() - 1)) {
+		return FALSE;
+	}
+	if (lastAck->getOriginalPlayerID() != ack->getOriginalPlayerID()) {
+		return FALSE;
+	}
+	if (msg->getRelay() != m_lastCommand->getRelay()) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/**
+ * Adds this game command to the packet.  Returns true if successful.
+ */
+Bool NetPacket::addGameCommand(NetCommandRef *msg) {
+	Bool retval = FALSE;
+	NetGameCommandMsg *cmdMsg = (NetGameCommandMsg *)(msg->getCommand());
+	// get the game message from the NetCommandMsg
+	GameMessage *gmsg = cmdMsg->constructGameMessage();
+
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addGameCommand for command ID %d", cmdMsg->getID()));
+
+	if (isRoomForGameMessage(msg, gmsg)) {
+		// Now we know there is enough room, put the new game message into the packet.
+
+		Bool needNewCommandID = FALSE; // this is to allow us to force the starting command ID to be respecified with this command.
+
+		// If necessary, put the NetCommandType into the packet.
+		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandType;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastCommandType = cmdMsg->getNetCommandType();
+		}
+
+		// If necessary, put the execution frame into the packet.
+		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Frame;
+			++m_packetLen;
+			UnsignedInt newframe = cmdMsg->getExecutionFrame();
+			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
+			m_packetLen += sizeof(UnsignedInt);
+
+			m_lastFrame = newframe;
+		}
+
+		// If necessary, put the relay into the packet.
+		if (m_lastRelay != msg->getRelay()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::Relay;
+			++m_packetLen;
+			UnsignedByte newRelay = msg->getRelay();
+			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
+			m_packetLen += sizeof(UnsignedByte);
+
+			m_lastRelay = newRelay;
+		}
+
+		// If necessary, put the playerID into the packet.
+		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::PlayerId;
+			++m_packetLen;
+			m_packet[m_packetLen] = cmdMsg->getPlayerID();
+			m_packetLen += sizeof(UnsignedByte);
+			//since if we have a new player we need to respecify the starting command ID, lets force the command id to be different.
+			needNewCommandID = TRUE;
+
+			m_lastPlayerID = cmdMsg->getPlayerID();
+		}
+
+		// If necessary, specify the command ID of this command.
+		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+			m_packet[m_packetLen] = NetPacketFieldTypes::CommandId;
+			++m_packetLen;
+			UnsignedShort newID = cmdMsg->getID();
+			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
+			m_packetLen += sizeof(UnsignedShort);
+		}
+		m_lastCommandID = cmdMsg->getID();
+
+		m_packet[m_packetLen] = NetPacketFieldTypes::Data;
+		++m_packetLen;
+
+		// Now copy the GameMessage type into the packet.
+		GameMessage::Type newType = gmsg->getType();
+		memcpy(m_packet + m_packetLen, &newType, sizeof(GameMessage::Type));
+		m_packetLen += sizeof(GameMessage::Type);
+
+
+		GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
+		UnsignedByte numTypes = parser->getNumTypes();
+		memcpy(m_packet + m_packetLen, &numTypes, sizeof(numTypes));
+		m_packetLen += sizeof(numTypes);
+
+		GameMessageParserArgumentType *argType = parser->getFirstArgumentType();
+		while (argType != NULL) {
+			UnsignedByte type = (UnsignedByte)(argType->getType());
+			memcpy(m_packet + m_packetLen, &type, sizeof(type));
+			m_packetLen += sizeof(type);
+
+			UnsignedByte argTypeCount = argType->getArgCount();
+			memcpy(m_packet + m_packetLen, &argTypeCount, sizeof(argTypeCount));
+			m_packetLen += sizeof(argTypeCount);
+
+			argType = argType->getNext();
+		}
+
+		Int numArgs = gmsg->getArgumentCount();
+		for (Int i = 0; i < numArgs; ++i) {
+			GameMessageArgumentDataType type = gmsg->getArgumentDataType(i);
+			GameMessageArgumentType arg = *(gmsg->getArgument(i));
+			writeGameMessageArgumentToPacket(type, arg);
+		}
+
+		deleteInstance(parser);
+		parser = NULL;
+
+//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addGameMessage - added game message, frame %d, player %d, command ID %d", m_lastFrame, m_lastPlayerID, m_lastCommandID));
+
+		++m_numCommands;
+
+		deleteInstance(m_lastCommand);
+		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
+		m_lastCommand->setRelay(msg->getRelay());
+
+		retval = TRUE;
+	}
+
+	deleteInstance(gmsg);
+	gmsg = NULL;
+
+	return retval;
+}
+
+void NetPacket::writeGameMessageArgumentToPacket(GameMessageArgumentDataType type, GameMessageArgumentType arg) {
+
+	switch(type) {
+
+	case ARGUMENTDATATYPE_INTEGER:
+		memcpy(m_packet + m_packetLen, &(arg.integer), sizeof(arg.integer));
+		m_packetLen += sizeof(arg.integer);
+		break;
+	case ARGUMENTDATATYPE_REAL:
+		memcpy(m_packet + m_packetLen, &(arg.real), sizeof(arg.real));
+		m_packetLen += sizeof(arg.real);
+		break;
+	case ARGUMENTDATATYPE_BOOLEAN:
+		memcpy(m_packet + m_packetLen, &(arg.boolean), sizeof(arg.boolean));
+		m_packetLen += sizeof(arg.boolean);
+		break;
+	case ARGUMENTDATATYPE_OBJECTID:
+		memcpy(m_packet + m_packetLen, &(arg.objectID), sizeof(arg.objectID));
+		m_packetLen += sizeof(arg.objectID);
+		break;
+	case ARGUMENTDATATYPE_DRAWABLEID:
+		memcpy(m_packet + m_packetLen, &(arg.drawableID), sizeof(arg.drawableID));
+		m_packetLen += sizeof(arg.drawableID);
+		break;
+	case ARGUMENTDATATYPE_TEAMID:
+		memcpy(m_packet + m_packetLen, &(arg.teamID), sizeof(arg.teamID));
+		m_packetLen += sizeof(arg.teamID);
+		break;
+	case ARGUMENTDATATYPE_LOCATION:
+		memcpy(m_packet + m_packetLen, &(arg.location), sizeof(arg.location));
+		m_packetLen += sizeof(arg.location);
+		break;
+	case ARGUMENTDATATYPE_PIXEL:
+		memcpy(m_packet + m_packetLen, &(arg.pixel), sizeof(arg.pixel));
+		m_packetLen += sizeof(arg.pixel);
+		break;
+	case ARGUMENTDATATYPE_PIXELREGION:
+		memcpy(m_packet + m_packetLen, &(arg.pixelRegion), sizeof(arg.pixelRegion));
+		m_packetLen += sizeof(arg.pixelRegion);
+		break;
+	case ARGUMENTDATATYPE_TIMESTAMP:
+		memcpy(m_packet + m_packetLen, &(arg.timestamp), sizeof(arg.timestamp));
+		m_packetLen += sizeof(arg.timestamp);
+		break;
+	case ARGUMENTDATATYPE_WIDECHAR:
+		memcpy(m_packet + m_packetLen, &(arg.wChar), sizeof(arg.wChar));
+		m_packetLen += sizeof(arg.wChar);
+		break;
+
+	}
+}
+
+/**
+ * Returns true if there is enough room in this packet for this message.
+ */
+Bool NetPacket::isRoomForGameMessage(NetCommandRef *msg, GameMessage *gmsg) {
+	// Calculate how much space the NetCommandMsg will take in this packet.
+	Int msglen = 0;
+
+	NetGameCommandMsg *cmdMsg = (NetGameCommandMsg *)(msg->getCommand());
+
+	Bool needNewCommandID = FALSE;
+
+	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
+		msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
+	}
+	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
+		msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+		needNewCommandID = TRUE;
+	}
+	if (m_lastRelay != msg->getRelay()) {
+		msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
+		msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
+	}
+	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
+		msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
+	}
+
+	GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
+
+	++msglen; // for NetPacketFieldTypes::Data
+	msglen += sizeof(GameMessage::Type);
+	msglen += sizeof(UnsignedByte);
+//	Int numTypes = parser->getNumTypes();
+	GameMessageParserArgumentType *arg = parser->getFirstArgumentType();
+	while (arg != NULL) {
+		msglen += sizeof(UnsignedByte); // argument type
+		msglen += sizeof(UnsignedByte); // argument count
+		GameMessageArgumentDataType type = arg->getType();
+
+		switch (type) {
+
+		case ARGUMENTDATATYPE_INTEGER:
+			msglen += arg->getArgCount() * sizeof(Int);
+			break;
+		case ARGUMENTDATATYPE_REAL:
+			msglen += arg->getArgCount() * sizeof(Real);
+			break;
+		case ARGUMENTDATATYPE_BOOLEAN:
+			msglen += arg->getArgCount() * sizeof(Bool);
+			break;
+		case ARGUMENTDATATYPE_OBJECTID:
+			msglen += arg->getArgCount() * sizeof(ObjectID);
+			break;
+		case ARGUMENTDATATYPE_DRAWABLEID:
+			msglen += arg->getArgCount() * sizeof(DrawableID);
+			break;
+		case ARGUMENTDATATYPE_TEAMID:
+			msglen += arg->getArgCount() * sizeof(UnsignedInt);
+			break;
+		case ARGUMENTDATATYPE_LOCATION:
+			msglen += arg->getArgCount() * sizeof(Coord3D);
+			break;
+		case ARGUMENTDATATYPE_PIXEL:
+			msglen += arg->getArgCount() * sizeof(ICoord2D);
+			break;
+		case ARGUMENTDATATYPE_PIXELREGION:
+			msglen += arg->getArgCount() * sizeof(IRegion2D);
+			break;
+		case ARGUMENTDATATYPE_TIMESTAMP:
+			msglen += arg->getArgCount() * sizeof(UnsignedInt);
+			break;
+		case ARGUMENTDATATYPE_WIDECHAR:
+			msglen += arg->getArgCount() * sizeof(WideChar);
+			break;
+
+		}
+
+		arg = arg->getNext();
+
+	}
+
+	deleteInstance(parser);
+	parser = NULL;
+
+	// Is there enough room in the packet for this message?
+	if (msglen > (MAX_PACKET_SIZE - m_packetLen)) {
+		return FALSE; // there isn't enough room in this packet for this new message.
+	}
+	return TRUE;
+}
+
+/**
+ * Returns the list of commands that are in this packet.
+ */
+NetCommandList * NetPacket::getCommandList() {
+	NetCommandList *retval = newInstance(NetCommandList);
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList, packet length = %d", m_packetLen));
+	retval->init();
+
+	// These need to be the same as the default values for m_lastPlayerID, m_lastFrame, etc.
+	UnsignedByte playerID = 0;
+	UnsignedInt frame = 0;
+	UnsignedShort commandID = 1; // The first command is going to be
+	UnsignedByte commandType = 0;
+	UnsignedByte relay = 0;
+	NetCommandRef *lastCommand = NULL;
+
+	Int i = 0;
+	while (i < m_packetLen) {
+
+		switch(m_packet[i]) {
+
+		case NetPacketFieldTypes::CommandType:
+			++i;
+			memcpy(&commandType, m_packet + i, sizeof(UnsignedByte));
+			i += sizeof(UnsignedByte);
+			break;
+		case NetPacketFieldTypes::Frame:
+			++i;
+			memcpy(&frame, m_packet + i, sizeof(UnsignedInt));
+			i += sizeof(UnsignedInt);
+			break;
+		case NetPacketFieldTypes::PlayerId:
+			++i;
+			memcpy(&playerID, m_packet + i, sizeof(UnsignedByte));
+			i += sizeof(UnsignedByte);
+			break;
+		case NetPacketFieldTypes::Relay:
+			++i;
+			memcpy(&relay, m_packet + i, sizeof(UnsignedByte));
+			i += sizeof(UnsignedByte);
+			break;
+		case NetPacketFieldTypes::CommandId:
+			++i;
+			memcpy(&commandID, m_packet + i, sizeof(UnsignedShort));
+			i += sizeof(UnsignedShort);
+			break;
+		case NetPacketFieldTypes::Data: {
+			++i;
+
+			NetCommandMsg *msg = NULL;
+
+			//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList() - command of type %d(%s)", commandType, GetNetCommandTypeAsString((NetCommandType)commandType)));
+
+			switch((NetCommandType)commandType)
+			{
+			case NETCOMMANDTYPE_GAMECOMMAND:
+				msg = readGameMessage(m_packet, i);
+				//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read game command from player %d for frame %d", playerID, frame));
+				break;
+			case NETCOMMANDTYPE_ACKBOTH:
+				msg = readAckBothMessage(m_packet, i);
+				break;
+			case NETCOMMANDTYPE_ACKSTAGE1:
+				msg = readAckStage1Message(m_packet, i);
+				break;
+			case NETCOMMANDTYPE_ACKSTAGE2:
+				msg = readAckStage2Message(m_packet, i);
+				break;
+			case NETCOMMANDTYPE_FRAMEINFO:
+				msg = readFrameMessage(m_packet, i);
+				// frameinfodebug
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read frame %d from player %d, command count = %d, relay = 0x%X", frame, playerID, ((NetFrameCommandMsg *)msg)->getCommandCount(), relay));
+				break;
+			case NETCOMMANDTYPE_PLAYERLEAVE:
+				msg = readPlayerLeaveMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read player leave message from player %d for execution on frame %d", playerID, frame));
+				break;
+			case NETCOMMANDTYPE_RUNAHEADMETRICS:
+				msg = readRunAheadMetricsMessage(m_packet, i);
+				break;
+			case NETCOMMANDTYPE_RUNAHEAD:
+				msg = readRunAheadMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read run ahead message from player %d for execution on frame %d", playerID, frame));
+				break;
+			case NETCOMMANDTYPE_DESTROYPLAYER:
+				msg = readDestroyPlayerMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read CRC info message from player %d for execution on frame %d", playerID, frame));
+				break;
+			case NETCOMMANDTYPE_KEEPALIVE:
+				msg = readKeepAliveMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read keep alive message from player %d", playerID));
+				break;
+			case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
+				msg = readDisconnectKeepAliveMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read keep alive message from player %d", playerID));
+				break;
+			case NETCOMMANDTYPE_DISCONNECTPLAYER:
+				msg = readDisconnectPlayerMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect player message from player %d", playerID));
+				break;
+			case NETCOMMANDTYPE_PACKETROUTERQUERY:
+				msg = readPacketRouterQueryMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read packet router query message from player %d", playerID));
+				break;
+			case NETCOMMANDTYPE_PACKETROUTERACK:
+				msg = readPacketRouterAckMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read packet router ack message from player %d", playerID));
+				break;
+			case NETCOMMANDTYPE_DISCONNECTCHAT:
+				msg = readDisconnectChatMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect chat message from player %d", playerID));
+				break;
+			case NETCOMMANDTYPE_DISCONNECTVOTE:
+				msg = readDisconnectVoteMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect vote message from player %d", playerID));
+				break;
+			case NETCOMMANDTYPE_CHAT:
+				msg = readChatMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read chat message from player %d", playerID));
+				break;
+			case NETCOMMANDTYPE_PROGRESS:
+				msg = readProgressMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read Progress message from player %d", playerID));
+				break;
+			case NETCOMMANDTYPE_LOADCOMPLETE:
+				msg = readLoadCompleteMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read LoadComplete message from player %d", playerID));
+				break;
+			case NETCOMMANDTYPE_TIMEOUTSTART:
+				msg = readTimeOutGameStartMessage(m_packet, i);
+//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read TimeOutGameStart message from player %d", playerID));
+				break;
+			case NETCOMMANDTYPE_WRAPPER:
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read Wrapper message from player %d", playerID));
+				msg = readWrapperMessage(m_packet, i);
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Done reading Wrapper message from player %d - wrapped command was %d", playerID,
+					((NetWrapperCommandMsg *)msg)->getWrappedCommandID()));
+				break;
+			case NETCOMMANDTYPE_FILE:
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read file message from player %d", playerID));
+				msg = readFileMessage(m_packet, i);
+				break;
+			case NETCOMMANDTYPE_FILEANNOUNCE:
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read file announce message from player %d", playerID));
+				msg = readFileAnnounceMessage(m_packet, i);
+				break;
+			case NETCOMMANDTYPE_FILEPROGRESS:
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read file progress message from player %d", playerID));
+				msg = readFileProgressMessage(m_packet, i);
+				break;
+			case NETCOMMANDTYPE_DISCONNECTFRAME:
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect frame message from player %d", playerID));
+				msg = readDisconnectFrameMessage(m_packet, i);
+				break;
+			case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect screen off message from player %d", playerID));
+				msg = readDisconnectScreenOffMessage(m_packet, i);
+				break;
+			case NETCOMMANDTYPE_FRAMERESENDREQUEST:
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read frame resend request message from player %d", playerID));
+				msg = readFrameResendRequestMessage(m_packet, i);
+				break;
+			}
+
+			if (msg == NULL) {
+				DEBUG_CRASH(("Didn't read a message from the packet. Things are about to go wrong."));
+				continue;
+			}
+
+			// set the info
+			msg->setExecutionFrame(frame);
+			msg->setPlayerID(playerID);
+			msg->setNetCommandType((NetCommandType)commandType);
+			msg->setID(commandID);
+
+//			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("frame = %d, player = %d, command type = %d, id = %d", frame, playerID, commandType, commandID));
+
+			// increment to the next command ID.
+			if (DoesCommandRequireACommandID((NetCommandType)commandType)) {
+				++commandID;
+			}
+
+			// add the message to the list.
+			NetCommandRef *ref = retval->addMessage(msg);
+			if (ref != NULL) {
+				ref->setRelay(relay);
+			} else {
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList - failed to set relay for message %d", msg->getID()));
+			}
+
+			deleteInstance(lastCommand);
+			lastCommand = newInstance(NetCommandRef)(msg);
+
+			msg->detach();  // Need to detach from new NetCommandMsg created by the "readXMessage" above.
+
+			// since the message is part of the list now, we don't have to keep track of it.  So we'll just set it to NULL.
+			msg = NULL;
+			break;
+		}
+
+		case 'Z': {
+
+			++i;
+			// Repeat the last command, doing some funky cool byte-saving stuff
+			if (lastCommand == NULL) {
+				DEBUG_CRASH(("Got a repeat command with no command to repeat."));
+			}
+
+			NetCommandMsg *msg = NULL;
+
+			switch(commandType) {
+
+			case NETCOMMANDTYPE_ACKSTAGE1: {
+				msg = newInstance(NetAckStage1CommandMsg)();
+				NetAckStage1CommandMsg* laststageone = (NetAckStage1CommandMsg*)(lastCommand->getCommand());
+				((NetAckStage1CommandMsg*)msg)->setCommandID(laststageone->getCommandID() + 1);
+				((NetAckStage1CommandMsg*)msg)->setOriginalPlayerID(laststageone->getOriginalPlayerID());
+				break;
+			}
+			case NETCOMMANDTYPE_ACKSTAGE2: {
+				msg = newInstance(NetAckStage2CommandMsg)();
+				NetAckStage2CommandMsg* laststagetwo = (NetAckStage2CommandMsg*)(lastCommand->getCommand());
+				((NetAckStage2CommandMsg*)msg)->setCommandID(laststagetwo->getCommandID() + 1);
+				((NetAckStage2CommandMsg*)msg)->setOriginalPlayerID(laststagetwo->getOriginalPlayerID());
+				break;
+			}
+			case NETCOMMANDTYPE_ACKBOTH: {
+				msg = newInstance(NetAckBothCommandMsg)();
+				NetAckBothCommandMsg* lastboth = (NetAckBothCommandMsg*)(lastCommand->getCommand());
+				((NetAckBothCommandMsg*)msg)->setCommandID(lastboth->getCommandID() + 1);
+				((NetAckBothCommandMsg*)msg)->setOriginalPlayerID(lastboth->getOriginalPlayerID());
+				break;
+			}
+			case NETCOMMANDTYPE_FRAMEINFO: {
+				msg = newInstance(NetFrameCommandMsg)();
+				++frame; // this is set below.
+				((NetFrameCommandMsg*)msg)->setCommandCount(0);
+				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Read a repeated frame command, frame = %d, player = %d, commandID = %d", frame, playerID, commandID));
+				break;
+			}
+			default:
+				DEBUG_CRASH(("Trying to repeat a command that shouldn't be repeated."));
+				continue;
+
+			}
+
+			msg->setExecutionFrame(frame);
+			msg->setPlayerID(playerID);
+			msg->setNetCommandType((NetCommandType)commandType);
+			msg->setID(commandID);
+
+//			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("frame = %d, player = %d, command type = %d, id = %d", frame, playerID, commandType, commandID));
+
+			// increment to the next command ID.
+			if (DoesCommandRequireACommandID((NetCommandType)commandType)) {
+				++commandID;
+			}
+
+			// add the message to the list.
+			NetCommandRef *ref = retval->addMessage(msg);
+			if (ref != NULL) {
+				ref->setRelay(relay);
+			}
+
+			deleteInstance(lastCommand);
+//			lastCommand = newInstance(NetCommandRef)(msg);
+			lastCommand = NEW_NETCOMMANDREF(msg);
+
+			msg->detach();  // Need to detach from new NetCommandMsg created by the "readXMessage" above.
+
+			// since the message is part of the list now, we don't have to keep track of it.  So we'll just set it to NULL.
+			msg = NULL;
+			break;
+		}
+
+		default:
+			// we don't recognize this command, but we have to increment i so we don't fall into an infinite loop.
+			DEBUG_CRASH(("Unrecognized packet entry, ignoring."));
+			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList - Unrecognized packet entry at index %d", i));
+			dumpPacketToLog();
+			++i;
+			break;
+
+		}
+
+	}
+
+	deleteInstance(lastCommand);
+	lastCommand = NULL;
+
+	return retval;
+}
+
+/**
+ * Reads the data portion of a game message from the given position in the packet.
+ */
+NetCommandMsg * NetPacket::readGameMessage(UnsignedByte *data, Int &i)
+{
+	NetGameCommandMsg *msg = newInstance(NetGameCommandMsg);
+
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readGameMessage"));
+
+	// Get the GameMessage command type.
+	GameMessage::Type newType;
+	memcpy(&newType, data + i, sizeof(GameMessage::Type));
+	i += sizeof(GameMessage::Type);
+	msg->setGameMessageType(newType);
+
+	// Get the number of argument types
+	UnsignedByte numArgTypes = 0;
+	memcpy(&numArgTypes, data + i, sizeof(numArgTypes));
+	i += sizeof(numArgTypes);
+
+	// Get the types and the number of arguments of those types.
+	Int totalArgCount = 0;
+	GameMessageParser *parser = newInstance(GameMessageParser)();
+	Int j = 0;
+	for (; j < numArgTypes; ++j) {
+		UnsignedByte type = (UnsignedByte)ARGUMENTDATATYPE_UNKNOWN;
+		memcpy(&type, data + i, sizeof(type));
+		i += sizeof(type);
+
+		UnsignedByte argCount = 0;
+		memcpy(&argCount, data + i, sizeof(argCount));
+		i += sizeof(argCount);
+
+		parser->addArgType((GameMessageArgumentDataType)type, argCount);
+		totalArgCount += argCount;
+	}
+
+	GameMessageParserArgumentType *parserArgType = parser->getFirstArgumentType();
+	GameMessageArgumentDataType lasttype = ARGUMENTDATATYPE_UNKNOWN;
+	Int argsLeftForType = 0;
+	if (parserArgType != NULL) {
+		lasttype = parserArgType->getType();
+		argsLeftForType = parserArgType->getArgCount();
+	}
+	for (j = 0; j < totalArgCount; ++j) {
+		readGameMessageArgumentFromPacket(lasttype, msg, data, i);
+
+		--argsLeftForType;
+		if (argsLeftForType == 0) {
+			DEBUG_ASSERTCRASH(parserArgType != NULL, ("parserArgType was NULL when it shouldn't have been."));
+			if (parserArgType == NULL) {
+				return NULL;
+			}
+
+			parserArgType = parserArgType->getNext();
+			// parserArgType is allowed to be NULL here
+			if (parserArgType != NULL) {
+				argsLeftForType = parserArgType->getArgCount();
+				lasttype = parserArgType->getType();
+			}
+		}
+	}
+
+	deleteInstance(parser);
+	parser = NULL;
+
+	return (NetCommandMsg *)msg;
+}
+
+void NetPacket::readGameMessageArgumentFromPacket(GameMessageArgumentDataType type, NetGameCommandMsg *msg, UnsignedByte *data, Int &i) {
+
+	GameMessageArgumentType arg;
+
+	switch (type) {
+
+	case ARGUMENTDATATYPE_INTEGER:
+		Int theint;
+		memcpy(&theint, data + i, sizeof(theint));
+		i += sizeof(theint);
+		arg.integer = theint;
+		msg->addArgument(type, arg);
+		break;
+
+	case ARGUMENTDATATYPE_REAL:
+		Real thereal;
+		memcpy(&thereal, data + i, sizeof(thereal));
+		i += sizeof(thereal);
+		arg.real = thereal;
+		msg->addArgument(type, arg);
+		break;
+
+	case ARGUMENTDATATYPE_BOOLEAN:
+		Bool thebool;
+		memcpy(&thebool, data + i, sizeof(thebool));
+		i += sizeof(thebool);
+		arg.boolean = thebool;
+		msg->addArgument(type, arg);
+		break;
+
+	case ARGUMENTDATATYPE_OBJECTID:
+		ObjectID theobjectid;
+		memcpy(&theobjectid, data + i, sizeof(theobjectid));
+		i += sizeof(theobjectid);
+		arg.objectID = theobjectid;
+		msg->addArgument(type, arg);
+		break;
+
+	case ARGUMENTDATATYPE_DRAWABLEID:
+		DrawableID thedrawableid;
+		memcpy(&thedrawableid, data + i, sizeof(thedrawableid));
+		i += sizeof(thedrawableid);
+		arg.drawableID = thedrawableid;
+		msg->addArgument(type, arg);
+		break;
+
+	case ARGUMENTDATATYPE_TEAMID:
+		UnsignedInt theunsignedint;
+		memcpy(&theunsignedint, data + i, sizeof(theunsignedint));
+		i += sizeof(theunsignedint);
+		arg.teamID = theunsignedint;
+		msg->addArgument(type, arg);
+		break;
+
+	case ARGUMENTDATATYPE_LOCATION:
+		Coord3D coord;
+		memcpy(&coord, data + i, sizeof(coord));
+		i += sizeof(coord);
+		arg.location = coord;
+		msg->addArgument(type, arg);
+		break;
+
+	case ARGUMENTDATATYPE_PIXEL:
+		ICoord2D pixel;
+		memcpy(&pixel, data + i, sizeof(pixel));
+		i += sizeof(pixel);
+		arg.pixel = pixel;
+		msg->addArgument(type, arg);
+		break;
+
+	case ARGUMENTDATATYPE_PIXELREGION:
+		IRegion2D reg;
+		memcpy(&reg, data + i, sizeof(reg));
+		i += sizeof(reg);
+		arg.pixelRegion = reg;
+		msg->addArgument(type, arg);
+		break;
+
+	case ARGUMENTDATATYPE_TIMESTAMP:
+		UnsignedInt stamp;
+		memcpy(&stamp, data + i, sizeof(stamp));
+		i += sizeof(stamp);
+		arg.timestamp = stamp;
+		msg->addArgument(type, arg);
+		break;
+
+	case ARGUMENTDATATYPE_WIDECHAR:
+		WideChar c;
+		memcpy(&c, data + i, sizeof(c));
+		i += sizeof(c);
+		arg.wChar = c;
+		msg->addArgument(type, arg);
+		break;
+
+	}
+
+}
+
+/**
+ * Reads the data portion of the ack message at this position in the packet.
+ */
+NetCommandMsg * NetPacket::readAckBothMessage(UnsignedByte *data, Int &i) {
+	NetAckBothCommandMsg *msg = newInstance(NetAckBothCommandMsg);
+
+	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readAckMessage, "));
+	UnsignedShort cmdID = 0;
+
+	memcpy(&cmdID, data + i, sizeof(UnsignedShort));
+	i += sizeof(UnsignedShort);
+	msg->setCommandID(cmdID);
+	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("commandID = %d, ", cmdID));
+
+	UnsignedByte origPlayerID = 0;
+	memcpy(&origPlayerID, data + i, sizeof(UnsignedByte));
+	i += sizeof(UnsignedByte);
+	msg->setOriginalPlayerID(origPlayerID);
+	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("original player id = %d", origPlayerID));
+
+	return msg;
+}
+
+/**
+ * Reads the data portion of the ack message at this position in the packet.
+ */
+NetCommandMsg * NetPacket::readAckStage1Message(UnsignedByte *data, Int &i) {
+	NetAckStage1CommandMsg *msg = newInstance(NetAckStage1CommandMsg);
+
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readAckMessage, "));
+	UnsignedShort cmdID = 0;
+
+	memcpy(&cmdID, data + i, sizeof(UnsignedShort));
+	i += sizeof(UnsignedShort);
+	msg->setCommandID(cmdID);
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("commandID = %d, ", cmdID));
+
+	UnsignedByte origPlayerID = 0;
+	memcpy(&origPlayerID, data + i, sizeof(UnsignedByte));
+	i += sizeof(UnsignedByte);
+	msg->setOriginalPlayerID(origPlayerID);
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("original player id = %d", origPlayerID));
+
+	return msg;
+}
+
+/**
+ * Reads the data portion of the ack message at this position in the packet.
+ */
+NetCommandMsg * NetPacket::readAckStage2Message(UnsignedByte *data, Int &i) {
+	NetAckStage2CommandMsg *msg = newInstance(NetAckStage2CommandMsg);
+
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readAckMessage, "));
+	UnsignedShort cmdID = 0;
+
+	memcpy(&cmdID, data + i, sizeof(UnsignedShort));
+	i += sizeof(UnsignedShort);
+	msg->setCommandID(cmdID);
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("commandID = %d, ", cmdID));
+
+	UnsignedByte origPlayerID = 0;
+	memcpy(&origPlayerID, data + i, sizeof(UnsignedByte));
+	i += sizeof(UnsignedByte);
+	msg->setOriginalPlayerID(origPlayerID);
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("original player id = %d", origPlayerID));
+
+	return msg;
+}
+
+/**
+ * Reads the data portion of the frame message at this position in the packet.
+ */
+NetCommandMsg * NetPacket::readFrameMessage(UnsignedByte *data, Int &i) {
+	NetFrameCommandMsg *msg = newInstance(NetFrameCommandMsg);
+
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readFrameMessage, "));
+	UnsignedShort cmdCount = 0;
+
+	memcpy(&cmdCount, data + i, sizeof(UnsignedShort));
+	i += sizeof(UnsignedShort);
+	msg->setCommandCount(cmdCount);
+//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command count = %d, ", cmdCount));
+
+	return msg;
+}
+
+/**
+ * Reads the player leave message at this position in the packet.
+ */
+NetCommandMsg * NetPacket::readPlayerLeaveMessage(UnsignedByte *data, Int &i) {
+	NetPlayerLeaveCommandMsg *msg = newInstance(NetPlayerLeaveCommandMsg);
+
+	UnsignedByte leavingPlayerID = 0;
+
+	memcpy(&leavingPlayerID, data + i, sizeof(UnsignedByte));
+	i += sizeof(UnsignedByte);
+	msg->setLeavingPlayerID(leavingPlayerID);
+
+	return msg;
+}
+
+/**
+ * Reads the run ahead metrics message at this position in the packet.
+ */
+NetCommandMsg * NetPacket::readRunAheadMetricsMessage(UnsignedByte *data, Int &i) {
+	NetRunAheadMetricsCommandMsg *msg = newInstance(NetRunAheadMetricsCommandMsg);
+
+	Real averageLatency = (Real)0.2;
+	UnsignedShort averageFps = 30;
+
+	memcpy(&averageLatency, data + i, sizeof(Real));
+	i += sizeof(Real);
+	msg->setAverageLatency(averageLatency);
+
+	memcpy(&averageFps, data + i, sizeof(UnsignedShort));
+	i += sizeof(UnsignedShort);
+	msg->setAverageFps((Int)averageFps);
+	return msg;
+}
+
+/**
+ * Reads the run ahead message at this position in the packet.
+ */
+NetCommandMsg * NetPacket::readRunAheadMessage(UnsignedByte *data, Int &i) {
+	NetRunAheadCommandMsg *msg = newInstance(NetRunAheadCommandMsg);
+
+	UnsignedShort newRunAhead = 20;
+	memcpy(&newRunAhead, data + i, sizeof(UnsignedShort));
+	i += sizeof(UnsignedShort);
+	msg->setRunAhead(newRunAhead);
+
+	UnsignedByte newFrameRate = 30;
+	memcpy(&newFrameRate, data + i, sizeof(UnsignedByte));
+	i += sizeof(UnsignedByte);
+	msg->setFrameRate(newFrameRate);
+
+	return msg;
+}
+
+/**
+ * Reads the CRC info message at this position in the packet.
+ */
+NetCommandMsg * NetPacket::readDestroyPlayerMessage(UnsignedByte *data, Int &i) {
+	NetDestroyPlayerCommandMsg *msg = newInstance(NetDestroyPlayerCommandMsg);
+
+	UnsignedInt newVal = 0;
+	memcpy(&newVal, data + i, sizeof(UnsignedInt));
+	i += sizeof(UnsignedInt);
+	msg->setPlayerIndex(newVal);
+	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Saw CRC of 0x%8.8X", newCRC));
+
+	return msg;
+}
+
+/**
+ * Reads the keep alive data, of which there is none.
+ */
+NetCommandMsg * NetPacket::readKeepAliveMessage(UnsignedByte *data, Int &i) {
+	NetKeepAliveCommandMsg *msg = newInstance(NetKeepAliveCommandMsg);
+
+	return msg;
+}
+
+/**
+ * Reads the disconnect keep alive data, of which there is none.
+ */
+NetCommandMsg * NetPacket::readDisconnectKeepAliveMessage(UnsignedByte *data, Int &i) {
+	NetDisconnectKeepAliveCommandMsg *msg = newInstance(NetDisconnectKeepAliveCommandMsg);
+
+	return msg;
+}
+
+/**
+ * Reads the disconnect player data.  Which is the slot number of the player being disconnected.
+ */
+NetCommandMsg * NetPacket::readDisconnectPlayerMessage(UnsignedByte *data, Int &i) {
+	NetDisconnectPlayerCommandMsg *msg = newInstance(NetDisconnectPlayerCommandMsg);
+
+	UnsignedByte slot = 0;
+	memcpy(&slot, data + i, sizeof(slot));
+	i += sizeof(slot);
+	msg->setDisconnectSlot(slot);
+
+	UnsignedInt disconnectFrame = 0;
+	memcpy(&disconnectFrame, data + i, sizeof(disconnectFrame));
+	i += sizeof(disconnectFrame);
+	msg->setDisconnectFrame(disconnectFrame);
+
+	return msg;
+}
+
+/**
+ * Reads the packet router query data, of which there is none.
+ */
+NetCommandMsg * NetPacket::readPacketRouterQueryMessage(UnsignedByte *data, Int &i) {
+	NetPacketRouterQueryCommandMsg *msg = newInstance(NetPacketRouterQueryCommandMsg);
+
+	return msg;
+}
+
+/**
+ * Reads the packet router ack data, of which there is none.
+ */
+NetCommandMsg * NetPacket::readPacketRouterAckMessage(UnsignedByte *data, Int &i) {
+	NetPacketRouterAckCommandMsg *msg = newInstance(NetPacketRouterAckCommandMsg);
+
+	return msg;
+}
+
+/**
+ * Reads the disconnect chat data, which is just the string.
+ */
+NetCommandMsg * NetPacket::readDisconnectChatMessage(UnsignedByte *data, Int &i) {
+	NetDisconnectChatCommandMsg *msg = newInstance(NetDisconnectChatCommandMsg);
+
+	WideChar text[256];
+	UnsignedByte length;
+	memcpy(&length, data + i, sizeof(UnsignedByte));
+	++i;
+	memcpy(text, data + i, length * sizeof(WideChar));
+	i += length * sizeof(WideChar);
+	text[length] = 0;
+
+	UnicodeString unitext;
+	unitext.set(text);
+
+	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readDisconnectChatMessage - read message, message is %ls", unitext.str()));
+
+	msg->setText(unitext);
+	return msg;
+}
+
+/**
+ * Reads the chat data, which is just the string.
+ */
+NetCommandMsg * NetPacket::readChatMessage(UnsignedByte *data, Int &i) {
+	NetChatCommandMsg *msg = newInstance(NetChatCommandMsg);
+
+	WideChar text[256];
+	UnsignedByte length;
+	Int playerMask;
+	memcpy(&length, data + i, sizeof(UnsignedByte));
+	++i;
+	memcpy(text, data + i, length * sizeof(WideChar));
+	i += length * sizeof(WideChar);
+	text[length] = 0;
+	memcpy(&playerMask, data + i, sizeof(Int));
+	i += sizeof(Int);
+
+
+	UnicodeString unitext;
+	unitext.set(text);
+
+	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readChatMessage - read message, message is %ls", unitext.str()));
+
+	msg->setText(unitext);
+	msg->setPlayerMask(playerMask);
+	return msg;
+}
+
+/**
+ * Reads the disconnect vote data.  Which is the slot number of the player being disconnected.
+ */
+NetCommandMsg * NetPacket::readDisconnectVoteMessage(UnsignedByte *data, Int &i) {
+	NetDisconnectVoteCommandMsg *msg = newInstance(NetDisconnectVoteCommandMsg);
+
+	UnsignedByte slot = 0;
+	memcpy(&slot, data + i, sizeof(slot));
+	i += sizeof(slot);
+	msg->setSlot(slot);
+
+	UnsignedInt voteFrame = 0;
+	memcpy(&voteFrame, data + i, sizeof(voteFrame));
+	i += sizeof(voteFrame);
+	msg->setVoteFrame(voteFrame);
+
+	return msg;
+}
+
+/**
+ * Reads the Progress data.  Which is the slot number of the player being disconnected.
+ */
+NetCommandMsg * NetPacket::readProgressMessage(UnsignedByte *data, Int &i) {
+	NetProgressCommandMsg *msg = newInstance(NetProgressCommandMsg);
+
+	UnsignedByte percentage = 0;
+	memcpy(&percentage, data + i, sizeof(UnsignedByte));
+	i += sizeof(UnsignedByte);
+	msg->setPercentage(percentage);
+
+	return msg;
+}
+
+NetCommandMsg * NetPacket::readLoadCompleteMessage(UnsignedByte *data, Int &i) {
+	NetLoadCompleteCommandMsg *msg = newInstance(NetLoadCompleteCommandMsg);
+	return msg;
+}
+
+NetCommandMsg * NetPacket::readTimeOutGameStartMessage(UnsignedByte *data, Int &i) {
+	NetTimeOutGameStartCommandMsg *msg = newInstance(NetTimeOutGameStartCommandMsg);
+	return msg;
+}
+
+NetCommandMsg * NetPacket::readWrapperMessage(UnsignedByte *data, Int &i) {
+	NetWrapperCommandMsg *msg = newInstance(NetWrapperCommandMsg);
+
+	// get the wrapped command ID
+	UnsignedShort wrappedCommandID = 0;
+	memcpy(&wrappedCommandID, data + i, sizeof(wrappedCommandID));
+	msg->setWrappedCommandID(wrappedCommandID);
+	i += sizeof(wrappedCommandID);
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - wrapped command ID == %d", wrappedCommandID));
+
+	// get the chunk number.
+	UnsignedInt chunkNumber = 0;
+	memcpy(&chunkNumber, data + i, sizeof(chunkNumber));
+	msg->setChunkNumber(chunkNumber);
+	i += sizeof(chunkNumber);
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - chunk number = %d", chunkNumber));
+
+	// get the number of chunks
+	UnsignedInt numChunks = 0;
+	memcpy(&numChunks, data + i, sizeof(numChunks));
+	msg->setNumChunks(numChunks);
+	i += sizeof(numChunks);
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - number of chunks = %d", numChunks));
+
+	// get the total data length
+	UnsignedInt totalDataLength = 0;
+	memcpy(&totalDataLength, data + i, sizeof(totalDataLength));
+	msg->setTotalDataLength(totalDataLength);
+	i += sizeof(totalDataLength);
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - total data length = %d", totalDataLength));
+
+	// get the data length for this chunk
+	UnsignedInt dataLength = 0;
+	memcpy(&dataLength, data + i, sizeof(dataLength));
+	i += sizeof(dataLength);
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - data length = %d", dataLength));
+
+	UnsignedInt dataOffset = 0;
+	memcpy(&dataOffset, data + i, sizeof(dataOffset));
+	msg->setDataOffset(dataOffset);
+	i += sizeof(dataOffset);
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - data offset = %d", dataOffset));
+
+	msg->setData(data + i, dataLength);
+	i += dataLength;
+
+	return msg;
+}
+
+NetCommandMsg * NetPacket::readFileMessage(UnsignedByte *data, Int &i) {
+	NetFileCommandMsg *msg = newInstance(NetFileCommandMsg);
+	char filename[_MAX_PATH];
+
+	// TheSuperHackers @security Mauller/Jbremer/SkyAero 11/12/2025 Prevent buffer overflow when copying filepath string
+	i += strlcpy(filename, reinterpret_cast<const char*>(data + i), ARRAY_SIZE(filename));
+	++i; //Increment for null terminator
+	msg->setPortableFilename(AsciiString(filename));	// it's transferred as a portable filename
+
+	UnsignedInt dataLength = 0;
+	memcpy(&dataLength, data + i, sizeof(dataLength));
+	i += sizeof(dataLength);
+
+	UnsignedByte *buf = NEW UnsignedByte[dataLength];
+	memcpy(buf, data + i, dataLength);
+	i += dataLength;
+
+	msg->setFileData(buf, dataLength);
+
+	return msg;
+}
+
+NetCommandMsg * NetPacket::readFileAnnounceMessage(UnsignedByte *data, Int &i) {
+	NetFileAnnounceCommandMsg *msg = newInstance(NetFileAnnounceCommandMsg);
+	char filename[_MAX_PATH];
+
+	// TheSuperHackers @security Mauller/Jbremer/SkyAero 11/12/2025 Prevent buffer overflow when copying filepath string
+	i += strlcpy(filename, reinterpret_cast<const char*>(data + i), ARRAY_SIZE(filename));
+	++i; //Increment for null terminator
+	msg->setPortableFilename(AsciiString(filename));	// it's transferred as a portable filename
+
+	UnsignedShort fileID = 0;
+	memcpy(&fileID, data + i, sizeof(fileID));
+	i += sizeof(fileID);
+	msg->setFileID(fileID);
+
+	UnsignedByte playerMask = 0;
+	memcpy(&playerMask, data + i, sizeof(playerMask));
+	i += sizeof(playerMask);
+	msg->setPlayerMask(playerMask);
+
+	return msg;
+}
+
+NetCommandMsg * NetPacket::readFileProgressMessage(UnsignedByte *data, Int &i) {
+	NetFileProgressCommandMsg *msg = newInstance(NetFileProgressCommandMsg);
+
+	UnsignedShort fileID = 0;
+	memcpy(&fileID, data + i, sizeof(fileID));
+	i += sizeof(fileID);
+	msg->setFileID(fileID);
+
+	Int progress = 0;
+	memcpy(&progress, data + i, sizeof(progress));
+	i += sizeof(progress);
+	msg->setProgress(progress);
+
+	return msg;
+}
+
+NetCommandMsg * NetPacket::readDisconnectFrameMessage(UnsignedByte *data, Int &i) {
+	NetDisconnectFrameCommandMsg *msg = newInstance(NetDisconnectFrameCommandMsg);
+
+	UnsignedInt disconnectFrame = 0;
+	memcpy(&disconnectFrame, data + i, sizeof(disconnectFrame));
+	i += sizeof(disconnectFrame);
+	msg->setDisconnectFrame(disconnectFrame);
+
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readDisconnectFrameMessage - read disconnect frame for frame %d", disconnectFrame));
+
+	return msg;
+}
+
+NetCommandMsg * NetPacket::readDisconnectScreenOffMessage(UnsignedByte *data, Int &i) {
+	NetDisconnectScreenOffCommandMsg *msg = newInstance(NetDisconnectScreenOffCommandMsg);
+
+	UnsignedInt newFrame = 0;
+	memcpy(&newFrame, data + i, sizeof(newFrame));
+	i += sizeof(newFrame);
+	msg->setNewFrame(newFrame);
+
+	return msg;
+}
+
+NetCommandMsg * NetPacket::readFrameResendRequestMessage(UnsignedByte *data, Int &i) {
+	NetFrameResendRequestCommandMsg *msg = newInstance(NetFrameResendRequestCommandMsg);
+
+	UnsignedInt frameToResend = 0;
+	memcpy(&frameToResend, data + i, sizeof(frameToResend));
+	i += sizeof(frameToResend);
+	msg->setFrameToResend(frameToResend);
+
+	return msg;
+}
+
+/**
+ * Returns the number of commands in this packet.  Only valid if the packet is locally constructed.
+ */
+Int NetPacket::getNumCommands() {
+	return m_numCommands;
+}
+
+/**
+ * Returns the address that this packet is to be sent to.  Only valid if the packet is locally constructed.
+ */
+UnsignedInt NetPacket::getAddr() {
+	return m_addr;
+}
+
+/**
+ * Returns the port that this packet is to be sent to.  Only valid if the packet is locally constructed.
+ */
+UnsignedShort NetPacket::getPort() {
+	return m_port;
+}
+
+/**
+ * Returns the data of this packet.
+ */
+UnsignedByte * NetPacket::getData() {
+	return m_packet;
+}
+
+/**
+ * Returns the length of the packet.
+ */
+Int NetPacket::getLength() {
+	return m_packetLen;
+}
+
+/**
+ * Dumps the packet to the debug log file
+ */
+void NetPacket::dumpPacketToLog() {
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::dumpPacketToLog() - packet is %d bytes", m_packetLen));
+	Int numLines = m_packetLen / 8;
+	if ((m_packetLen % 8) != 0) {
+		++numLines;
+	}
+	for (Int dumpindex = 0; dumpindex < numLines; ++dumpindex) {
+		DEBUG_LOG_LEVEL_RAW(DEBUG_LEVEL_NET, ("\t%d\t", dumpindex*8));
+		for (Int dumpindex2 = 0; (dumpindex2 < 8) && ((dumpindex*8 + dumpindex2) < m_packetLen); ++dumpindex2) {
+			DEBUG_LOG_LEVEL_RAW(DEBUG_LEVEL_NET, ("%02x '%c' ", m_packet[dumpindex*8 + dumpindex2], m_packet[dumpindex*8 + dumpindex2]));
+		}
+		DEBUG_LOG_LEVEL_RAW(DEBUG_LEVEL_NET, ("\n"));
+	}
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("End of packet dump"));
+}
diff --git a/Core/GameEngine/Source/GameNetwork/Network.cpp b/Core/GameEngine/Source/GameNetwork/Network.cpp
new file mode 100644
index 00000000000..71d672cfed3
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/Network.cpp
@@ -0,0 +1,1052 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: Network.cpp ////////////////////////////////////////////////////
+// Implementation of Network singleton
+// Author: Matthew D. Campbell, July 2001
+///////////////////////////////////////////////////////////////////////////////
+
+// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
+
+// USER INCLUDES //////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/GameEngine.h"
+#include "Common/MessageStream.h"
+#include "Common/Player.h"
+#include "Common/PlayerList.h"
+#include "GameNetwork/NetworkInterface.h"
+#include "GameNetwork/udp.h"
+#include "GameNetwork/Transport.h"
+#include "strtok_r.h"
+#include "GameClient/Shell.h"
+#include "Common/CRCDebug.h"
+#include "GameLogic/GameLogic.h"
+
+#include "Common/RandomValue.h"
+
+
+#include "GameLogic/ScriptActions.h"
+#include "GameLogic/ScriptEngine.h"
+#include "Common/Recorder.h"
+#include "GameClient/MessageBox.h"
+
+
+#if defined(DEBUG_CRC)
+Int NET_CRC_INTERVAL = 1;
+#else
+Int NET_CRC_INTERVAL = 100;
+#endif
+
+// DEFINES ////////////////////////////////////////////////////////////////////
+
+#define RESEND_INTERVAL 1
+
+// PRIVATE TYPES //////////////////////////////////////////////////////////////
+
+/**
+ * Connection message - encapsulating info kept by the connection layer about each
+ * packet.  These structs make up the in/out buffers at the connection layer.
+ */
+#pragma pack(push, 1)
+struct ConnectionMessage
+{
+	Int id;
+	NetMessageFlags flags;
+	UnsignedByte data[MAX_MESSAGE_LEN];
+	time_t lastSendTime;
+	Int retries;
+	Int length;
+};
+#pragma pack(pop)
+
+static const int CmdMsgLen = 6; //< Minimum size of a command packet (Int + Unsigned Short)
+
+// PRIVATE DATA ///////////////////////////////////////////////////////////////
+
+
+
+// PUBLIC DATA ////////////////////////////////////////////////////////////////
+
+/// The Network singleton instance
+NetworkInterface *TheNetwork = NULL;
+
+// PRIVATE PROTOTYPES /////////////////////////////////////////////////////////
+
+/**
+ * The Network class is used to instantiate a singleton which
+ * implements the interface to all Network operations such as message stream processing and network communications.
+ */
+class Network : public NetworkInterface
+{
+public:
+	//---------------------------------------------------------------------------------------
+	// Setup / Teardown functions
+	Network();
+	~Network();
+	void init( void );																				///< Initialize or re-initialize the instance
+	void reset( void );																				///< Reinitialize the network
+	void update( void );																			///< Process command list
+	void liteupdate( void );																	///< Do a lightweight update to send packets and pass messages.
+	Bool deinit( void );																			///< Shutdown connections, release memory
+
+	void setLocalAddress(UnsignedInt ip, UnsignedInt port);
+	UnsignedInt getRunAhead(void) { return m_runAhead; }
+	UnsignedInt getFrameRate(void) { return m_frameRate; }
+	UnsignedInt getPacketArrivalCushion(void);								///< Returns the smallest packet arrival cushion since this was last called.
+	Bool isFrameDataReady( void );
+	virtual Bool isStalling();
+	void parseUserList( const GameInfo *game );
+	void startGame(void);																			///< Sets the network game frame counter to -1
+
+	void sendChat(UnicodeString text, Int playerMask);
+	void sendDisconnectChat(UnicodeString text);
+
+	void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID);
+	UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask);
+	Int getFileTransferProgress(Int playerID, AsciiString path);
+	Bool areAllQueuesEmpty(void);
+
+	void quitGame();
+	virtual void selfDestructPlayer(Int index);
+
+
+	void voteForPlayerDisconnect(Int slot);
+	virtual Bool isPacketRouter( void );
+
+	// Bandwidth metrics
+	Real getIncomingBytesPerSecond( void );
+	Real getIncomingPacketsPerSecond( void );
+	Real getOutgoingBytesPerSecond( void );
+	Real getOutgoingPacketsPerSecond( void );
+	Real getUnknownBytesPerSecond( void );
+	Real getUnknownPacketsPerSecond( void );
+
+	// Multiplayer Load Progress Functions
+	void updateLoadProgress( Int percent );
+	void loadProgressComplete( void );
+	void sendTimeOutGameStart( void );
+
+#if defined(RTS_DEBUG)
+	// Disconnect screen testing
+	virtual void toggleNetworkOn();
+#endif
+
+	// Exposing some info contained in the Connection Manager
+	UnsignedInt getLocalPlayerID( void );
+	UnicodeString getPlayerName(Int playerNum);
+	Int getNumPlayers(void );
+
+	Int getAverageFPS() { return m_conMgr->getAverageFPS(); }
+	Int getSlotAverageFPS(Int slot);
+
+	void attachTransport(Transport *transport);
+	void initTransport();
+
+	void setSawCRCMismatch( void );
+	Bool sawCRCMismatch( void ) { return m_sawCRCMismatch; }
+	Bool isPlayerConnected( Int playerID );
+
+	void notifyOthersOfCurrentFrame();														///< Tells all the other players what frame we are on.
+	void notifyOthersOfNewFrame(UnsignedInt frame);								///< Tells all the other players that we are on a new frame.
+
+	Int  getExecutionFrame();																			///< Returns the next valid frame for simultaneous command execution.
+
+	// For disconnect blame assignment
+	UnsignedInt getPingFrame();
+	Int getPingsSent();
+	Int getPingsRecieved();
+
+protected:
+	void GetCommandsFromCommandList();														///< Remove commands from TheCommandList and put them on the Network command list.
+	void SendCommandsToConnectionManager();												///< Send the new commands to the ConnectionManager
+	Bool AllCommandsReady(UnsignedInt frame);											///< Do we have all the commands for the given frame?
+	void RelayCommandsToCommandList(UnsignedInt frame);						///< Put the commands for the given frame onto TheCommandList.
+	Bool isTransferCommand(GameMessage *msg);											///< Is this a command that needs to be transfered to the other clients?
+	Bool processCommand(GameMessage *msg);												///< Whatever needs to be done as a result of this command, do it now.
+	void processFrameSynchronizedNetCommand(NetCommandRef *msg);	///< If there is a network command that needs to be executed at the same frame number on all clients, it happens here.
+	void processRunAheadCommand(NetRunAheadCommandMsg *msg);			///< Do what needs to be done when we get a new run ahead command.
+	void processDestroyPlayerCommand(NetDestroyPlayerCommandMsg *msg);	///< Do what needs to be done when we need to destroy a player.
+	void endOfGameCheck();																				///< Checks to see if its ok to leave this game.  If it is, send the apropriate command to the game logic.
+	Bool timeForNewFrame();
+
+	ConnectionManager *m_conMgr;																	///< The connection manager object
+
+	UnsignedInt m_lastFrame;																			///< The last game logic frame that was processed.
+
+	NetLocalStatus m_localStatus;															///< My local status as a player in this game.
+
+	Int m_runAhead;																						///< The current run ahead of the game.
+	Int m_frameRate;
+	Int m_lastExecutionFrame;																	///< The highest frame number that a command could have been executed on.
+	Int m_lastFrameCompleted;
+	Bool m_didSelfSlug;
+	__int64 m_perfCountFreq;														///< The frequency of the performance counter.
+
+	__int64 m_nextFrameTime;														///< When did we execute the last frame?  For slugging the GameLogic...
+
+	Bool m_frameDataReady;																		///< Is the frame data for the next frame ready to be executed by TheGameLogic?
+	Bool m_isStalling;
+
+	// CRC info
+	Bool m_checkCRCsThisFrame;
+	Bool m_sawCRCMismatch;
+	std::vector<UnsignedInt> m_CRC[MAX_SLOTS];
+	std::list<Int> m_playersToDisconnect;
+	GameWindow *m_messageWindow;
+
+#if defined(RTS_DEBUG)
+	Bool m_networkOn;
+#endif
+};
+
+UnsignedInt Network::getPingFrame()
+{
+	return (m_conMgr)?m_conMgr->getPingFrame():0;
+}
+
+Int Network::getPingsSent()
+{
+	return (m_conMgr)?m_conMgr->getPingsSent():0;
+}
+
+Int Network::getPingsRecieved()
+{
+	return (m_conMgr)?m_conMgr->getPingsRecieved():0;
+}
+
+Bool Network::isPlayerConnected( Int playerID ) {
+	if (playerID == getLocalPlayerID()) {
+		return m_localStatus == NETLOCALSTATUS_INGAME || m_localStatus == NETLOCALSTATUS_LEAVING;
+	}
+	return m_conMgr->isPlayerConnected(playerID);
+}
+
+
+// PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+// PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * This creates a network object and returns it.
+ */
+NetworkInterface *NetworkInterface::createNetwork()
+{
+	return NEW Network;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * The constructor.
+ */
+Network::Network()
+{
+	m_checkCRCsThisFrame = FALSE;
+	m_didSelfSlug = FALSE;
+	m_frameDataReady = FALSE;
+	m_isStalling = FALSE;
+	m_sawCRCMismatch = FALSE;
+	m_conMgr = NULL;
+	m_messageWindow = NULL;
+
+#if defined(RTS_DEBUG)
+	m_networkOn = TRUE;
+#endif
+}
+
+/**
+ * The destructor.
+ */
+Network::~Network()
+{
+	deinit();
+}
+
+/**
+ * This basically releases all the memory.
+ */
+Bool Network::deinit( void )
+{
+	if (m_conMgr)
+	{
+		m_conMgr->destroyGameMessages();
+		delete m_conMgr;
+		m_conMgr = NULL;
+	}
+	if (m_messageWindow) {
+		TheWindowManager->winDestroy(m_messageWindow);
+		m_messageWindow = NULL;
+	}
+
+	return true;
+}
+
+/**
+ * Takes the network back to the initial state.
+ */
+void Network::reset() {
+	init();
+}
+
+/**
+ * Initializes all the network subsystems.
+ */
+void Network::init()
+{
+	if (!deinit())
+	{
+		DEBUG_LOG(("Could not deinit network prior to init!"));
+		return;
+	}
+
+	m_conMgr = NEW ConnectionManager;
+	m_conMgr->init();
+
+	m_lastFrame = 0;
+	m_runAhead = min(max(30, MIN_RUNAHEAD), MAX_FRAMES_AHEAD/2); ///< @todo: don't hard-code the run-ahead.
+	m_frameRate = 30;
+	m_lastExecutionFrame = m_runAhead - 1; // subtract 1 since we're starting on frame 0
+	m_lastFrameCompleted = m_runAhead - 1; // subtract 1 since we're starting on frame 0
+	m_frameDataReady = FALSE;
+	m_isStalling = FALSE;
+	m_didSelfSlug = FALSE;
+
+	m_localStatus = NETLOCALSTATUS_PREGAME;
+
+	QueryPerformanceFrequency((LARGE_INTEGER *)&m_perfCountFreq);
+	m_nextFrameTime = 0;
+	m_sawCRCMismatch = FALSE;
+	m_checkCRCsThisFrame = FALSE;
+
+	DEBUG_LOG(("Network timing values:"));
+	DEBUG_LOG(("NetworkFPSHistoryLength: %d", TheGlobalData->m_networkFPSHistoryLength));
+	DEBUG_LOG(("NetworkLatencyHistoryLength: %d", TheGlobalData->m_networkLatencyHistoryLength));
+	DEBUG_LOG(("NetworkRunAheadMetricsTime: %d", TheGlobalData->m_networkRunAheadMetricsTime));
+	DEBUG_LOG(("NetworkCushionHistoryLength: %d", TheGlobalData->m_networkCushionHistoryLength));
+	DEBUG_LOG(("NetworkRunAheadSlack: %d", TheGlobalData->m_networkRunAheadSlack));
+	DEBUG_LOG(("NetworkKeepAliveDelay: %d", TheGlobalData->m_networkKeepAliveDelay));
+	DEBUG_LOG(("NetworkDisconnectTime: %d", TheGlobalData->m_networkDisconnectTime));
+	DEBUG_LOG(("NetworkPlayerTimeoutTime: %d", TheGlobalData->m_networkPlayerTimeoutTime));
+	DEBUG_LOG(("NetworkDisconnectScreenNotifyTime: %d", TheGlobalData->m_networkDisconnectScreenNotifyTime));
+	DEBUG_LOG(("Other network stuff:"));
+	DEBUG_LOG(("FRAME_DATA_LENGTH = %d", FRAME_DATA_LENGTH));
+	DEBUG_LOG(("FRAMES_TO_KEEP = %d", FRAMES_TO_KEEP));
+
+
+#if defined(RTS_DEBUG)
+	m_networkOn = TRUE;
+#endif
+
+	return;
+}
+
+void Network::setSawCRCMismatch( void )
+{
+	m_sawCRCMismatch = TRUE;
+
+	TheScriptActions->closeWindows( TRUE );
+	m_messageWindow = TheWindowManager->winCreateFromScript("Menus/CRCMismatch.wnd");
+	TheScriptEngine->startEndGameTimer();
+
+	TheRecorder->logCRCMismatch();
+
+	// dump GameLogic random seed
+	DEBUG_LOG(("Latest frame for mismatch = %d GameLogic frame = %d",
+		TheGameLogic->getFrame()-m_runAhead-1, TheGameLogic->getFrame()));
+	DEBUG_LOG(("GetGameLogicRandomSeedCRC() = %d", GetGameLogicRandomSeedCRC()));
+
+	// dump CRCs
+	{
+		DEBUG_LOG(("--- GameState Dump ---"));
+#ifdef DEBUG_CRC
+		outputCRCDumpLines();
+#endif
+		DEBUG_LOG(("------ End Dump ------"));
+	}
+	{
+		DEBUG_LOG(("--- DebugInfo Dump ---"));
+#ifdef DEBUG_CRC
+		outputCRCDebugLines();
+#endif
+		DEBUG_LOG(("------ End Dump ------"));
+	}
+}
+
+/**
+ * Take a user list and build the connection queues and player lists and stuff like that.
+ */
+void Network::parseUserList( const GameInfo *game )
+{
+	if (!game)
+	{
+		DEBUG_LOG(("FAILED parseUserList with a NULL game"));
+		return;
+	}
+
+	m_conMgr->parseUserList(game);
+
+	// Now that we have the players in this game, we need to reset the FrameData stuff.
+	m_conMgr->destroyGameMessages();
+	m_conMgr->zeroFrames(1, m_runAhead-1); ///< we zero out m_runAhead frames +1 because the game actually starts at frame 1.
+}
+
+/**
+ * Guess what, we're starting a game!
+ */
+void Network::startGame() {
+}
+
+/**
+ * Tell the network which ip address the user has chosen to use.  Well ok, they probably didn't choose
+ * it explicitly, but regardless, this is the one we're going to use.
+ */
+void Network::setLocalAddress(UnsignedInt ip, UnsignedInt port) {
+	DEBUG_ASSERTCRASH(m_conMgr != NULL, ("Connection manager does not exist."));
+	if (m_conMgr != NULL) {
+		m_conMgr->setLocalAddress(ip, port);
+	}
+}
+
+/**
+ * Tell the network to initialize the transport object
+ */
+void Network::initTransport() {
+	DEBUG_ASSERTCRASH(m_conMgr != NULL, ("Connection manager does not exist."));
+	if (m_conMgr != NULL) {
+		m_conMgr->initTransport();
+	}
+}
+
+void Network::attachTransport(Transport *transport) {
+	DEBUG_ASSERTCRASH(m_conMgr != NULL, ("Connection manager does not exist."));
+	if (m_conMgr != NULL) {
+		m_conMgr->attachTransport(transport);
+	}
+}
+
+/**
+ * Does this command need to be transfered to the other game clients?
+ */
+Bool Network::isTransferCommand(GameMessage *msg) {
+	if ((msg != NULL) && ((msg->getType() > GameMessage::MSG_BEGIN_NETWORK_MESSAGES) && (msg->getType() < GameMessage::MSG_END_NETWORK_MESSAGES))) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Take commands from TheCommandList and give them to the connection manager for transport.
+ */
+void Network::GetCommandsFromCommandList() {
+	GameMessage *msg = TheCommandList->getFirstMessage();
+	GameMessage *next = NULL;
+	while (msg != NULL) {
+		next = msg->next();
+		if (isTransferCommand(msg)) { // Is this something we should be sending to the other players?
+			if (m_localStatus == NETLOCALSTATUS_INGAME) {
+				m_conMgr->sendLocalGameMessage(msg, getExecutionFrame());
+			}
+			TheCommandList->removeMessage(msg); // This does not destroy msg's prev and next pointers, so they should still be valid.
+			deleteInstance(msg);
+		} else {
+			if (processCommand(msg)) {
+				TheCommandList->removeMessage(msg);
+				deleteInstance(msg);
+			}
+		}
+		msg = next;
+	}
+}
+
+Int Network::getExecutionFrame() {
+	Int logicFrame = TheGameLogic->getFrame() + m_runAhead;
+	if (logicFrame > m_lastExecutionFrame) {
+		m_lastExecutionFrame = logicFrame;
+		return (logicFrame);
+	}
+	return m_lastExecutionFrame;
+}
+
+/**
+ * This is where any processing that needs to be done for specific game messages.
+ * Also check here to see if the logic frame number has changed to see if we need to
+ * send our info for the last frame to the other players.
+ * Return true if the message should be "eaten" by the network.
+ */
+Bool Network::processCommand(GameMessage *msg)
+{
+	if ((m_lastFrame != TheGameLogic->getFrame()) || (m_localStatus == NETLOCALSTATUS_PREGAME)) {
+		// If this is the start of a new game logic frame, then tell the connection manager that the last
+		// frame is over and that it should now produce a frame info packet for the other players.
+
+		if (m_localStatus == NETLOCALSTATUS_PREGAME) {
+			// a sort-of-hack that prevents extraneous frames from being executed before the game actually starts.
+			// Idealy this shouldn't be necessary, but I don't think its hurting anything by being here.
+			if (TheGameLogic->getFrame() == 1) {
+				m_localStatus = NETLOCALSTATUS_INGAME;
+				NetCommandList *netcmdlist = m_conMgr->getFrameCommandList(0); // clear out frame 0 since we skipped it
+				deleteInstance(netcmdlist);
+			} else {
+				return FALSE;
+			}
+		}
+
+		// Only send frame info packets for frames where we are actually going to be in the game.
+		// The reason is so we don't have to wait for frame info packets to be sent that aren't going to
+		// matter anyways when we actually try to leave the game ourselves.
+		if (m_localStatus == NETLOCALSTATUS_INGAME) {
+			Int executionFrame = getExecutionFrame();
+
+			// Send command counts for all the frames we can.
+			for (Int i = m_lastFrameCompleted + 1; i < executionFrame; ++i) {
+				m_conMgr->processFrameTick(i);
+				//DEBUG_LOG(("Network::processCommand - calling processFrameTick for frame %d", i));
+				m_lastFrameCompleted = i;
+			}
+		}
+
+		//DEBUG_LOG(("Next Execution Frame - %d, last frame completed - %d", getExecutionFrame(), m_lastFrameCompleted));
+		m_lastFrame = TheGameLogic->getFrame();
+	}
+
+	// Are we leaving the game?
+	// This has to happen after the check to see if this is the start of a new logic frame.
+	// The reason is that we have to send all the frame info packets necessary to get to the
+	// frame where everyone else is going to see that we left.
+	if ((msg->getType() == GameMessage::MSG_CLEAR_GAME_DATA) && (m_localStatus == NETLOCALSTATUS_INGAME)) {
+		Int executionFrame = getExecutionFrame();
+		DEBUG_LOG(("Network::processCommand - local player leaving, executionFrame = %d, player leaving on frame %d", executionFrame, executionFrame+1));
+
+		m_conMgr->handleLocalPlayerLeaving(executionFrame+1);
+		m_conMgr->processFrameTick(executionFrame); // This is the last command we will execute, so send the command count.
+																								// Also, we are guaranteed not to send any more commands for this frame
+																								// since the local status will change to "Leaving" so we don't have to
+																								// worry about messing up the other players.
+		m_conMgr->processFrameTick(executionFrame+1); // since we send it for executionFrame+1, we need to process both ticks
+		m_lastFrameCompleted = executionFrame;
+		DEBUG_LOG(("Network::processCommand - player leaving on frame %d", executionFrame));
+		m_localStatus = NETLOCALSTATUS_LEAVING;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * returns true if all the commands are ready for the given frame.
+ */
+Bool Network::AllCommandsReady(UnsignedInt frame) {
+	if (m_conMgr == NULL) {
+		return TRUE;
+	}
+
+	if (m_localStatus == NETLOCALSTATUS_PREGAME) {
+		return TRUE;
+	}
+
+	if (m_localStatus == NETLOCALSTATUS_POSTGAME) {
+		return TRUE;
+	}
+
+	return m_conMgr->allCommandsReady(frame);// && m_conMgr->allCRCsReady(frame);
+}
+
+/**
+ * Take commands from the connection manager and put them on TheCommandList.
+ * The commands need to be put on in the same order across all clients.
+ */
+void Network::RelayCommandsToCommandList(UnsignedInt frame) {
+	if ((m_conMgr == NULL) || (m_localStatus == NETLOCALSTATUS_PREGAME)) {
+		return;
+	}
+	m_checkCRCsThisFrame = FALSE;
+	NetCommandList *netcmdlist = m_conMgr->getFrameCommandList(frame);
+	NetCommandRef *msg = netcmdlist->getFirstMessage();
+	while (msg != NULL) {
+		NetCommandType cmdType = msg->getCommand()->getNetCommandType();
+		if (cmdType == NETCOMMANDTYPE_GAMECOMMAND) {
+			//DEBUG_LOG(("Network::RelayCommandsToCommandList - appending command %d of type %s to command list on frame %d", msg->getCommand()->getID(), ((NetGameCommandMsg *)msg->getCommand())->constructGameMessage()->getCommandAsString(), TheGameLogic->getFrame()));
+			TheCommandList->appendMessage(((NetGameCommandMsg *)msg->getCommand())->constructGameMessage());
+		} else {
+			processFrameSynchronizedNetCommand(msg);
+		}
+		msg = msg->getNext();
+	}
+
+	for (std::list<Int>::iterator selfDestructIt = m_playersToDisconnect.begin(); selfDestructIt != m_playersToDisconnect.end(); ++selfDestructIt)
+	{
+		//Int playerToDisconnect = *selfDestructIt;
+		//GameMessage *msg = newInstance(GameMessage)( GameMessage::MSG_SELF_DESTRUCT );
+		//msg->friend_setPlayerIndex(playerToDisconnect);
+		//msg->appendBooleanArgument(TRUE);
+		//TheCommandList->appendMessage(msg);
+	}
+	m_playersToDisconnect.clear();
+
+	deleteInstance(netcmdlist);
+}
+
+/**
+ * This is where network commands that need to be executed on the same frame should be executed.
+ */
+void Network::processFrameSynchronizedNetCommand(NetCommandRef *msg) {
+	NetCommandMsg *cmdMsg = msg->getCommand();
+	if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_PLAYERLEAVE) {
+		PlayerLeaveCode retval = m_conMgr->processPlayerLeave((NetPlayerLeaveCommandMsg *)cmdMsg);
+		if (retval == PLAYERLEAVECODE_LOCAL) {
+			DEBUG_LOG(("Network::processFrameSynchronizedNetCommand - Local player left the game on frame %d.", TheGameLogic->getFrame()));
+			m_localStatus = NETLOCALSTATUS_LEFT;
+		} else if (retval == PLAYERLEAVECODE_PACKETROUTER) {
+			DEBUG_LOG(("Network::processFrameSynchronizedNetCommand - Packet router left the game on frame %d", TheGameLogic->getFrame()));
+		} else {
+			DEBUG_LOG(("Network::processFrameSynchronizedNetCommand - Client left the game on frame %d", TheGameLogic->getFrame()));
+		}
+	}
+	else if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEAD) {
+		NetRunAheadCommandMsg *netmsg = (NetRunAheadCommandMsg *)cmdMsg;
+		processRunAheadCommand(netmsg);
+		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command to set run ahead to %d and frame rate to %d on frame %d actually executed on frame %d", netmsg->getRunAhead(), netmsg->getFrameRate(), netmsg->getExecutionFrame(), TheGameLogic->getFrame()));
+	}
+	else if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_DESTROYPLAYER) {
+		NetDestroyPlayerCommandMsg *netmsg = (NetDestroyPlayerCommandMsg *)cmdMsg;
+		processDestroyPlayerCommand(netmsg);
+		//DEBUG_LOG(("CRC command (%8.8X) on frame %d actually executed on frame %d", netmsg->getCRC(), netmsg->getExecutionFrame(), TheGameLogic->getFrame()));
+	}
+}
+
+void Network::processRunAheadCommand(NetRunAheadCommandMsg *msg) {
+	m_runAhead = msg->getRunAhead();
+	m_frameRate = msg->getFrameRate();
+	time_t frameGrouping = (1000 * m_runAhead) / m_frameRate; // number of miliseconds between packet sends
+	frameGrouping = frameGrouping / 2; // since we only want the latency for one way to be a factor.
+//	DEBUG_LOG(("Network::processRunAheadCommand - trying to set frame grouping to %d.  run ahead = %d, m_frameRate = %d", frameGrouping, m_runAhead, m_frameRate));
+	if (frameGrouping < 1) {
+		frameGrouping = 1; // Having a value less than 1 doesn't make sense.
+	}
+	if (frameGrouping > 500) {
+		frameGrouping = 500; // Max of a half a second.
+	}
+	m_conMgr->setFrameGrouping(frameGrouping);
+}
+
+void Network::processDestroyPlayerCommand(NetDestroyPlayerCommandMsg *msg)
+{
+	UnsignedInt playerIndex = msg->getPlayerIndex();
+	DEBUG_ASSERTCRASH(playerIndex < MAX_SLOTS, ("Bad player index"));
+	if (playerIndex >= MAX_SLOTS)
+		return;
+
+	AsciiString playerName;
+	playerName.format("player%d", playerIndex);
+	Player *pPlayer = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
+	if (pPlayer)
+	{
+		GameMessage *msg = newInstance(GameMessage)(GameMessage::MSG_SELF_DESTRUCT);
+#if RETAIL_COMPATIBLE_CRC
+		const Bool transferAssets = FALSE;
+#else
+		const Bool transferAssets = TRUE;
+#endif
+		msg->appendBooleanArgument(transferAssets);
+		msg->friend_setPlayerIndex(pPlayer->getPlayerIndex());
+		TheCommandList->appendMessage(msg);
+	}
+
+	DEBUG_LOG(("Saw DestroyPlayer from %d about %d for frame %d on frame %d", msg->getPlayerID(), msg->getPlayerIndex(),
+		msg->getExecutionFrame(), TheGameLogic->getFrame()));
+}
+
+/**
+ * Service queues, process message stream, etc
+ */
+void Network::update( void )
+{
+//
+// 1. Take Commands off TheCommandList, hand them off to the ConnectionManager.
+// 2. Call ConnectionManager->update;
+// 3. Check to see if all the commands for the next frame are there.
+// 4. If all commands are there, put that frame's commands on TheCommandList.
+//
+	m_frameDataReady = FALSE;
+	m_isStalling = FALSE;
+
+#if defined(RTS_DEBUG)
+	if (m_networkOn == FALSE) {
+		return;
+	}
+#endif
+
+	GetCommandsFromCommandList(); // Remove commands from TheCommandList and send them to the connection manager.
+	if (m_conMgr != NULL) {
+		if (m_localStatus == NETLOCALSTATUS_INGAME) {
+			m_conMgr->updateRunAhead(m_runAhead, m_frameRate, m_didSelfSlug, getExecutionFrame());
+			m_didSelfSlug = FALSE;
+		}
+		//m_conMgr->update(); // Do the priority thing, packetize thing. This also calls the Transport::update function.
+									 // depacketizes the incoming packets and puts them on the Network command list.
+	}
+
+	liteupdate();
+
+	if (m_localStatus == NETLOCALSTATUS_LEFT) {// || (m_localStatus == NETLOCALSTATUS_LEAVING)) {
+		endOfGameCheck();
+	}
+
+	if (AllCommandsReady(TheGameLogic->getFrame())) { // If all the commands are ready for the next frame...
+		m_conMgr->handleAllCommandsReady();
+//		DEBUG_LOG(("Network::update - frame %d is ready", TheGameLogic->getFrame()));
+		if (timeForNewFrame()) { // This needs to come after any other pre-frame execution checks as this changes the timing variables.
+			RelayCommandsToCommandList(TheGameLogic->getFrame());	// Put the commands for the next frame on TheCommandList.
+			m_frameDataReady = TRUE; // Tell the GameEngine to run the commands for the new frame.
+		}
+	}
+	else {
+		__int64 curTime;
+		QueryPerformanceCounter((LARGE_INTEGER *)&curTime);
+		m_isStalling = curTime >= m_nextFrameTime;
+	}
+}
+
+void Network::liteupdate() {
+
+#if defined(RTS_DEBUG)
+	if (m_networkOn == FALSE) {
+		return;
+	}
+#endif
+
+	if (m_conMgr != NULL) {
+		if (m_localStatus == NETLOCALSTATUS_PREGAME) {
+			m_conMgr->update(FALSE);
+		} else {
+			m_conMgr->update(TRUE);
+		}
+	}
+}
+
+void Network::endOfGameCheck() {
+	if (m_conMgr != NULL) {
+		if (m_conMgr->canILeave()) {
+			m_conMgr->disconnectLocalPlayer();
+			TheGameLogic->exitGame();
+			m_localStatus = NETLOCALSTATUS_POSTGAME;
+
+			DEBUG_LOG(("Network::endOfGameCheck - about to show the shell"));
+		}
+#if defined(RTS_DEBUG)
+		else {
+			m_conMgr->debugPrintConnectionCommands();
+		}
+#endif
+	}
+}
+
+Bool Network::timeForNewFrame() {
+	__int64 curTime;
+	QueryPerformanceCounter((LARGE_INTEGER *)&curTime);
+	__int64 frameDelay = m_perfCountFreq / m_frameRate;
+
+	/*
+	 * If we're pushing up against the edge of our run ahead, we should slow the framerate down a bit
+	 * to avoid being frozen by spikes in network lag.  This will happen if another user's computer is
+	 * running too far behind us, so we need to slow down to let them catch up.
+	 */
+	if (m_conMgr != NULL) {
+		Real cushion = m_conMgr->getMinimumCushion();
+		Real runAheadPercentage = m_runAhead * (TheGlobalData->m_networkRunAheadSlack / (Real)100.0); // If we are at least 50% into our slack, we need to slow down.
+		if (cushion < runAheadPercentage) {
+			__int64 oldFrameDelay = frameDelay;
+			frameDelay += oldFrameDelay / 10; // temporarily decrease the frame rate by 20%.
+//			DEBUG_LOG(("Average cushion = %f, run ahead percentage = %f.  Adjusting frameDelay from %I64d to %I64d", cushion, runAheadPercentage, oldFrameDelay, frameDelay));
+			m_didSelfSlug = TRUE;
+//		} else {
+//			DEBUG_LOG(("Average cushion = %f, run ahead percentage = %f", cushion, runAheadPercentage));
+		}
+	}
+
+	// Check to see if we can run another frame.
+	if (curTime >= m_nextFrameTime) {
+//		DEBUG_LOG(("Allowing a new frame, frameDelay = %I64d, curTime - m_nextFrameTime = %I64d", frameDelay, curTime - m_nextFrameTime));
+
+//		if (m_nextFrameTime + frameDelay < curTime) {
+		if ((m_nextFrameTime + (2 * frameDelay)) < curTime) {
+			// If we get too far behind on our framerate we need to reset the nextFrameTime thing.
+			m_nextFrameTime = curTime;
+//			DEBUG_LOG(("Initializing m_nextFrameTime to %I64d", m_nextFrameTime));
+		} else {
+			// Set the soonest possible starting time for the next frame.
+			m_nextFrameTime += frameDelay;
+//			DEBUG_LOG(("m_nextFrameTime = %I64d", m_nextFrameTime));
+		}
+
+		return TRUE;
+	}
+//	DEBUG_LOG(("Slowing down frame rate. frame rate = %d, frame delay = %I64d, curTime - m_nextFrameTime = %I64d", m_frameRate, frameDelay, curTime - m_nextFrameTime));
+	return FALSE;
+}
+
+/**
+ * Returns true if the game commands for the next frame have been put on the command list.
+ */
+Bool Network::isFrameDataReady() {
+	return (m_frameDataReady || (m_localStatus == NETLOCALSTATUS_LEFT));
+}
+
+Bool Network::isStalling()
+{
+	return m_isStalling;
+}
+
+/**
+ * returns the number of incoming bytes per second averaged over the last 30 sec.
+ */
+Real Network::getIncomingBytesPerSecond( void )
+{
+	if (m_conMgr)
+		return m_conMgr->getIncomingBytesPerSecond();
+	else
+	  return 0.0;
+}
+
+/**
+ * returns the number of incoming packets per second averaged over the last 30 sec.
+ */
+Real Network::getIncomingPacketsPerSecond( void )
+{
+	if (m_conMgr)
+		return m_conMgr->getIncomingPacketsPerSecond();
+	else
+	  return 0.0;
+}
+
+/**
+ * returns the number of outgoing bytes per second averaged over the last 30 sec.
+ */
+Real Network::getOutgoingBytesPerSecond( void )
+{
+	if (m_conMgr)
+		return m_conMgr->getOutgoingBytesPerSecond();
+	else
+	  return 0.0;
+}
+
+/**
+ * returns the number of outgoing packets per second averaged over the last 30 sec.
+ */
+Real Network::getOutgoingPacketsPerSecond( void )
+{
+	if (m_conMgr)
+		return m_conMgr->getOutgoingPacketsPerSecond();
+	else
+	  return 0.0;
+}
+
+/**
+ * returns the number of bytes received per second that are not from a generals client averaged over 30 sec.
+ */
+Real Network::getUnknownBytesPerSecond( void )
+{
+	if (m_conMgr)
+		return m_conMgr->getUnknownBytesPerSecond();
+	else
+	  return 0.0;
+}
+
+/**
+ * returns the number of packets received per second that are not from a generals client averaged over 30 sec.
+ */
+Real Network::getUnknownPacketsPerSecond( void )
+{
+	if (m_conMgr)
+		return m_conMgr->getUnknownPacketsPerSecond();
+	else
+	  return 0.0;
+}
+
+/**
+ * returns the smallest packet arrival cushion since this was last called.
+ */
+UnsignedInt Network::getPacketArrivalCushion( void )
+{
+	if (m_conMgr)
+		return m_conMgr->getPacketArrivalCushion();
+	else
+		return 0;
+}
+
+/**
+ * Sends a line of chat to the other players
+ */
+void Network::sendChat(UnicodeString text, Int playerMask) {
+	Int executionFrame = getExecutionFrame();
+	m_conMgr->sendChat(text, playerMask, executionFrame);
+}
+
+/**
+ * Sends a line of chat to the other players using the disconnect manager.
+ */
+void Network::sendDisconnectChat(UnicodeString text) {
+	m_conMgr->sendDisconnectChat(text);
+}
+
+// send a file.  woohoo.
+void Network::sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID)
+{
+	m_conMgr->sendFile(path, playerMask, commandID);
+}
+
+// send a file.  woohoo.
+UnsignedShort Network::sendFileAnnounce(AsciiString path, UnsignedByte playerMask)
+{
+	return m_conMgr->sendFileAnnounce(path, playerMask);
+}
+
+Int Network::getFileTransferProgress(Int playerID, AsciiString path)
+{
+	return m_conMgr->getFileTransferProgress(playerID, path);
+}
+
+Bool Network::areAllQueuesEmpty(void)
+{
+	return m_conMgr->canILeave();
+}
+
+/**
+ * Quit the game now.  This should only be called from the disconnect screen.
+ */
+void Network::quitGame() {
+	if (m_conMgr != NULL) {
+		m_conMgr->quitGame();
+	}
+
+#if !RTS_GENERALS || !RETAIL_COMPATIBLE_CRC
+	// Blow up / Transfer your units when you quit.  Like a normal quit menu quit.
+	GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);
+	msg->appendBooleanArgument(TRUE);
+#endif
+
+	TheGameLogic->exitGame();
+	m_localStatus = NETLOCALSTATUS_POSTGAME;
+	DEBUG_LOG(("Network::quitGame - quitting game..."));
+}
+
+void Network::selfDestructPlayer(Int index)
+{
+	m_playersToDisconnect.push_back(index);
+}
+
+
+Bool Network::isPacketRouter( void )
+{
+	return m_conMgr && m_conMgr->isPacketRouter();
+}
+
+/**
+ * Register a vote towards a player being disconnected.
+ */
+void Network::voteForPlayerDisconnect(Int slot) {
+	if (m_conMgr != NULL) {
+		m_conMgr->voteForPlayerDisconnect(slot);
+	}
+}
+
+void Network::updateLoadProgress( Int percent )
+{
+	if (m_conMgr != NULL) {
+		m_conMgr->updateLoadProgress( percent );
+	}
+}
+
+void Network::loadProgressComplete( void )
+{
+	if (m_conMgr != NULL) {
+		m_conMgr->loadProgressComplete();
+	}
+}
+
+void Network::sendTimeOutGameStart( void )
+{
+	if (m_conMgr != NULL) {
+		m_conMgr->sendTimeOutGameStart();
+	}
+}
+
+
+UnsignedInt Network::getLocalPlayerID()
+{
+if (m_conMgr != NULL) {
+		return m_conMgr->getLocalPlayerID();
+	}
+	return 49;
+}
+UnicodeString Network::getPlayerName(Int playerNum)
+{
+	if (playerNum == m_conMgr->getLocalPlayerID()) {
+		if (m_localStatus != NETLOCALSTATUS_INGAME) {
+			return UnicodeString::TheEmptyString;
+		}
+	}
+	if (m_conMgr != NULL) {
+		return m_conMgr->getPlayerName( playerNum );
+	}
+	return UnicodeString::TheEmptyString;
+}
+Int Network::getNumPlayers()
+{
+	if (m_conMgr != NULL) {
+		return m_conMgr->getNumPlayers();
+	}
+	return -1;
+}
+
+Int Network::getSlotAverageFPS(Int slot) {
+	if (m_conMgr != NULL) {
+		return m_conMgr->getSlotAverageFPS(slot);
+	}
+	return -1;
+}
+
+#if defined(RTS_DEBUG)
+void Network::toggleNetworkOn() {
+	if (m_networkOn == TRUE) {
+		m_networkOn = FALSE;
+	} else {
+		m_networkOn = TRUE;
+	}
+}
+#endif
+
+void Network::notifyOthersOfCurrentFrame() {
+	if (m_conMgr != NULL) {
+		m_conMgr->notifyOthersOfCurrentFrame(TheGameLogic->getFrame());
+	}
+}
+
+void Network::notifyOthersOfNewFrame(UnsignedInt frame) {
+	if (m_conMgr != NULL) {
+		m_conMgr->notifyOthersOfNewFrame(frame);
+	}
+}
diff --git a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp
new file mode 100644
index 00000000000..d8f7b172c79
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp
@@ -0,0 +1,275 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/networkutil.h"
+
+// TheSuperHackers @tweak Mauller 26/08/2025 reduce the minimum runahead from 10
+// This lets network games run at latencies down to 133ms when the network conditions allow
+Int MIN_LOGIC_FRAMES = 5;
+Int MAX_FRAMES_AHEAD = 128;
+Int MIN_RUNAHEAD = 4;
+Int FRAME_DATA_LENGTH = (MAX_FRAMES_AHEAD+1)*2;
+Int FRAMES_TO_KEEP = (MAX_FRAMES_AHEAD/2) + 1;
+
+#ifdef DEBUG_LOGGING
+
+void dumpBufferToLog(const void *vBuf, Int len, const char *fname, Int line)
+{
+	DEBUG_LOG(("======= dumpBufferToLog() %d bytes =======", len));
+	DEBUG_LOG(("Source: %s:%d", fname, line));
+	const char *buf = (const char *)vBuf;
+	Int numLines = len / 8;
+	if ((len % 8) != 0)
+	{
+		++numLines;
+	}
+	for (Int dumpindex = 0; dumpindex < numLines; ++dumpindex)
+	{
+		Int offset = dumpindex*8;
+		DEBUG_LOG_RAW(("\t%5.5d\t", offset));
+		Int dumpindex2;
+		Int numBytesThisLine = min(8, len - offset);
+		for (dumpindex2 = 0; dumpindex2 < numBytesThisLine; ++dumpindex2)
+		{
+			Int c = (buf[offset + dumpindex2] & 0xff);
+			DEBUG_LOG_RAW(("%02X ", c));
+		}
+		for (; dumpindex2 < 8; ++dumpindex2)
+		{
+			DEBUG_LOG_RAW(("   "));
+		}
+		DEBUG_LOG_RAW((" | "));
+		for (dumpindex2 = 0; dumpindex2 < numBytesThisLine; ++dumpindex2)
+		{
+			char c = buf[offset + dumpindex2];
+			DEBUG_LOG_RAW(("%c", (isprint(c)?c:'.')));
+		}
+		DEBUG_LOG_RAW(("\n"));
+	}
+	DEBUG_LOG(("End of packet dump"));
+}
+
+#endif // DEBUG_LOGGING
+
+/**
+ * ResolveIP turns a string ("games2.westwood.com", or "192.168.0.1") into
+ * a 32-bit unsigned integer.
+ */
+UnsignedInt ResolveIP(AsciiString host)
+{
+  struct hostent *hostStruct;
+  struct in_addr *hostNode;
+
+  if (host.isEmpty())
+  {
+	  DEBUG_LOG(("ResolveIP(): Can't resolve NULL"));
+	  return 0;
+  }
+
+  // String such as "127.0.0.1"
+  if (isdigit(host.getCharAt(0)))
+  {
+    return ( ntohl(inet_addr(host.str())) );
+  }
+
+  // String such as "localhost"
+  hostStruct = gethostbyname(host.str());
+  if (hostStruct == NULL)
+  {
+	  DEBUG_LOG(("ResolveIP(): Can't resolve %s", host.str()));
+	  return 0;
+  }
+  hostNode = (struct in_addr *) hostStruct->h_addr;
+  return ( ntohl(hostNode->s_addr) );
+}
+
+/**
+ * Returns the next network command ID.
+ */
+UnsignedShort GenerateNextCommandID() {
+	static UnsignedShort commandID = 64000;
+	++commandID;
+	return commandID;
+}
+
+/**
+ * Returns true if this type of command requires a unique command ID.
+ */
+Bool DoesCommandRequireACommandID(NetCommandType type) {
+	if ((type == NETCOMMANDTYPE_GAMECOMMAND) ||
+			(type == NETCOMMANDTYPE_FRAMEINFO) ||
+			(type == NETCOMMANDTYPE_PLAYERLEAVE) ||
+			(type == NETCOMMANDTYPE_DESTROYPLAYER) ||
+			(type == NETCOMMANDTYPE_RUNAHEADMETRICS) ||
+			(type == NETCOMMANDTYPE_RUNAHEAD) ||
+			(type == NETCOMMANDTYPE_CHAT) ||
+			(type == NETCOMMANDTYPE_DISCONNECTVOTE) ||
+			(type == NETCOMMANDTYPE_LOADCOMPLETE) ||
+			(type == NETCOMMANDTYPE_TIMEOUTSTART) ||
+			(type == NETCOMMANDTYPE_WRAPPER) ||
+			(type == NETCOMMANDTYPE_FILE) ||
+			(type == NETCOMMANDTYPE_FILEANNOUNCE) ||
+			(type == NETCOMMANDTYPE_FILEPROGRESS) ||
+			(type == NETCOMMANDTYPE_DISCONNECTPLAYER) ||
+			(type == NETCOMMANDTYPE_DISCONNECTFRAME) ||
+			(type == NETCOMMANDTYPE_DISCONNECTSCREENOFF) ||
+			(type == NETCOMMANDTYPE_FRAMERESENDREQUEST))
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if this type of network command requires an ack.
+ */
+Bool CommandRequiresAck(NetCommandMsg *msg) {
+	if ((msg->getNetCommandType() == NETCOMMANDTYPE_GAMECOMMAND) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_PLAYERLEAVE) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_DESTROYPLAYER) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEADMETRICS) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEAD) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_CHAT) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTVOTE) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_LOADCOMPLETE) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_TIMEOUTSTART) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_WRAPPER) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_FILE) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_FILEANNOUNCE) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_FILEPROGRESS) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTSCREENOFF) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_FRAMERESENDREQUEST))
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool IsCommandSynchronized(NetCommandType type) {
+	if ((type == NETCOMMANDTYPE_GAMECOMMAND) ||
+			(type == NETCOMMANDTYPE_FRAMEINFO) ||
+			(type == NETCOMMANDTYPE_PLAYERLEAVE) ||
+			(type == NETCOMMANDTYPE_DESTROYPLAYER) ||
+			(type == NETCOMMANDTYPE_RUNAHEAD))
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Returns true if this type of network command requires the ack to be sent directly to the player
+ * rather than going through the packet router.  This should really only be used by commands
+ * used on the disconnect screen.
+ */
+Bool CommandRequiresDirectSend(NetCommandMsg *msg) {
+	if ((msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTVOTE) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_LOADCOMPLETE) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_TIMEOUTSTART) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_FILE) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_FILEANNOUNCE) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_FILEPROGRESS) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTSCREENOFF) ||
+			(msg->getNetCommandType() == NETCOMMANDTYPE_FRAMERESENDREQUEST)) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+const char* GetNetCommandTypeAsString(NetCommandType type) {
+
+	switch (type) {
+	case NETCOMMANDTYPE_ACKBOTH:
+		return "NETCOMMANDTYPE_ACKBOTH";
+	case NETCOMMANDTYPE_ACKSTAGE1:
+		return "NETCOMMANDTYPE_ACKSTAGE1";
+	case NETCOMMANDTYPE_ACKSTAGE2:
+		return "NETCOMMANDTYPE_ACKSTAGE2";
+	case NETCOMMANDTYPE_FRAMEINFO:
+		return "NETCOMMANDTYPE_FRAMEINFO";
+	case NETCOMMANDTYPE_GAMECOMMAND:
+		return "NETCOMMANDTYPE_GAMECOMMAND";
+	case NETCOMMANDTYPE_PLAYERLEAVE:
+		return "NETCOMMANDTYPE_PLAYERLEAVE";
+	case NETCOMMANDTYPE_RUNAHEADMETRICS:
+		return "NETCOMMANDTYPE_RUNAHEADMETRICS";
+	case NETCOMMANDTYPE_RUNAHEAD:
+		return "NETCOMMANDTYPE_RUNAHEAD";
+	case NETCOMMANDTYPE_DESTROYPLAYER:
+		return "NETCOMMANDTYPE_DESTROYPLAYER";
+	case NETCOMMANDTYPE_KEEPALIVE:
+		return "NETCOMMANDTYPE_KEEPALIVE";
+	case NETCOMMANDTYPE_DISCONNECTCHAT:
+		return "NETCOMMANDTYPE_DISCONNECTCHAT";
+	case NETCOMMANDTYPE_CHAT:
+		return "NETCOMMANDTYPE_CHAT";
+	case NETCOMMANDTYPE_MANGLERQUERY:
+		return "NETCOMMANDTYPE_MANGLERQUERY";
+	case NETCOMMANDTYPE_MANGLERRESPONSE:
+		return "NETCOMMANDTYPE_MANGLERRESPONSE";
+	case NETCOMMANDTYPE_PROGRESS:
+		return "NETCOMMANDTYPE_PROGRESS";
+	case NETCOMMANDTYPE_LOADCOMPLETE:
+		return "NETCOMMANDTYPE_LOADCOMPLETE";
+	case NETCOMMANDTYPE_TIMEOUTSTART:
+		return "NETCOMMANDTYPE_TIMEOUTSTART";
+	case NETCOMMANDTYPE_WRAPPER:
+		return "NETCOMMANDTYPE_WRAPPER";
+	case NETCOMMANDTYPE_FILE:
+		return "NETCOMMANDTYPE_FILE";
+	case NETCOMMANDTYPE_FILEANNOUNCE:
+		return "NETCOMMANDTYPE_FILEANNOUNCE";
+	case NETCOMMANDTYPE_FILEPROGRESS:
+		return "NETCOMMANDTYPE_FILEPROGRESS";
+	case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
+		return "NETCOMMANDTYPE_DISCONNECTKEEPALIVE";
+	case NETCOMMANDTYPE_DISCONNECTPLAYER:
+		return "NETCOMMANDTYPE_DISCONNECTPLAYER";
+	case NETCOMMANDTYPE_PACKETROUTERQUERY:
+		return "NETCOMMANDTYPE_PACKETROUTERQUERY";
+	case NETCOMMANDTYPE_PACKETROUTERACK:
+		return "NETCOMMANDTYPE_PACKETROUTERACK";
+	case NETCOMMANDTYPE_DISCONNECTVOTE:
+		return "NETCOMMANDTYPE_DISCONNECTVOTE";
+	case NETCOMMANDTYPE_DISCONNECTFRAME:
+		return "NETCOMMANDTYPE_DISCONNECTFRAME";
+	case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
+		return "NETCOMMANDTYPE_DISCONNECTSCREENOFF";
+	case NETCOMMANDTYPE_FRAMERESENDREQUEST:
+		return "NETCOMMANDTYPE_FRAMERESENDREQUEST";
+	default:
+		DEBUG_CRASH(("Unknown NetCommandType in GetNetCommandTypeAsString"));
+		return "UNKNOWN";
+	}
+
+}
diff --git a/Core/GameEngine/Source/GameNetwork/Transport.cpp b/Core/GameEngine/Source/GameNetwork/Transport.cpp
new file mode 100644
index 00000000000..26c459f161b
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/Transport.cpp
@@ -0,0 +1,504 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "Common/crc.h"
+#include "GameNetwork/Transport.h"
+#include "GameNetwork/NetworkInterface.h"
+
+
+//--------------------------------------------------------------------------
+// Packet-level encryption is an XOR operation, for speed reasons.  To get
+// the max throughput, we only XOR whole 4-byte words, so the last bytes
+// can be non-XOR'd.
+
+// This assumes the buf is a multiple of 4 bytes.  Extra is not encrypted.
+static inline void encryptBuf( unsigned char *buf, Int len )
+{
+	UnsignedInt mask = 0x0000Fade;
+
+	UnsignedInt *uintPtr = (UnsignedInt *) (buf);
+
+	for (int i=0 ; i<len/4 ; i++) {
+		*uintPtr = (*uintPtr) ^ mask;
+		*uintPtr = htonl(*uintPtr);
+		uintPtr++;
+		mask += 0x00000321; // just for fun
+	}
+}
+
+// This assumes the buf is a multiple of 4 bytes.  Extra is not encrypted.
+static inline void decryptBuf( unsigned char *buf, Int len )
+{
+	UnsignedInt mask = 0x0000Fade;
+
+	UnsignedInt *uintPtr = (UnsignedInt *) (buf);
+
+	for (int i=0 ; i<len/4 ; i++) {
+		*uintPtr = htonl(*uintPtr);
+		*uintPtr = (*uintPtr) ^ mask;
+		uintPtr++;
+		mask += 0x00000321; // just for fun
+	}
+}
+
+//--------------------------------------------------------------------------
+
+Transport::Transport(void)
+{
+	m_winsockInit = false;
+	m_udpsock = NULL;
+}
+
+Transport::~Transport(void)
+{
+	reset();
+}
+
+Bool Transport::init( AsciiString ip, UnsignedShort port )
+{
+	return init(ResolveIP(ip), port);
+}
+
+Bool Transport::init( UnsignedInt ip, UnsignedShort port )
+{
+	// ----- Initialize Winsock -----
+	if (!m_winsockInit)
+	{
+		WORD verReq = MAKEWORD(2, 2);
+		WSADATA wsadata;
+
+		int err = WSAStartup(verReq, &wsadata);
+		if (err != 0) {
+			return false;
+		}
+
+		if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2)) {
+			WSACleanup();
+			return false;
+		}
+		m_winsockInit = true;
+	}
+
+	// ------- Bind our port --------
+	delete m_udpsock;
+	m_udpsock = NEW UDP();
+
+	if (!m_udpsock)
+		return false;
+
+	int retval = -1;
+	time_t now = timeGetTime();
+	while ((retval != 0) && ((timeGetTime() - now) < 1000)) {
+		retval = m_udpsock->Bind(ip, port);
+	}
+
+	if (retval != 0) {
+		DEBUG_CRASH(("Could not bind to 0x%8.8X:%d", ip, port));
+		DEBUG_LOG(("Transport::init - Failure to bind socket with error code %x", retval));
+		delete m_udpsock;
+		m_udpsock = NULL;
+		return false;
+	}
+
+	// ------- Clear buffers --------
+	int i=0;
+	for (; i<MAX_MESSAGES; ++i)
+	{
+		m_outBuffer[i].length = 0;
+		m_inBuffer[i].length = 0;
+#if defined(RTS_DEBUG)
+		m_delayedInBuffer[i].message.length = 0;
+#endif
+	}
+	for (i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
+	{
+		m_incomingBytes[i] = 0;
+		m_outgoingBytes[i] = 0;
+		m_unknownBytes[i] = 0;
+		m_incomingPackets[i] = 0;
+		m_outgoingPackets[i] = 0;
+		m_unknownPackets[i] = 0;
+	}
+	m_statisticsSlot = 0;
+	m_lastSecond = timeGetTime();
+
+	m_port = port;
+
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_latencyAverage > 0 || TheGlobalData->m_latencyNoise)
+		m_useLatency = true;
+
+	if (TheGlobalData->m_packetLoss)
+		m_usePacketLoss = true;
+#endif
+
+	return true;
+}
+
+void Transport::reset( void )
+{
+	delete m_udpsock;
+	m_udpsock = NULL;
+
+	if (m_winsockInit)
+	{
+		WSACleanup();
+		m_winsockInit = false;
+	}
+}
+
+Bool Transport::update( void )
+{
+	Bool retval = TRUE;
+	if (doRecv() == FALSE && m_udpsock && m_udpsock->GetStatus() == UDP::ADDRNOTAVAIL)
+	{
+		retval = FALSE;
+	}
+	DEBUG_ASSERTLOG(retval, ("WSA error is %s", GetWSAErrorString(WSAGetLastError()).str()));
+	if (doSend() == FALSE && m_udpsock && m_udpsock->GetStatus() == UDP::ADDRNOTAVAIL)
+	{
+		retval = FALSE;
+	}
+	DEBUG_ASSERTLOG(retval, ("WSA error is %s", GetWSAErrorString(WSAGetLastError()).str()));
+	return retval;
+}
+
+Bool Transport::doSend() {
+	if (!m_udpsock)
+	{
+		DEBUG_LOG(("Transport::doSend() - m_udpSock is NULL!"));
+		return FALSE;
+	}
+
+	Bool retval = TRUE;
+
+	// Statistics gathering
+	UnsignedInt now = timeGetTime();
+	if (m_lastSecond + 1000 < now)
+	{
+		m_lastSecond = now;
+		m_statisticsSlot = (m_statisticsSlot + 1) % MAX_TRANSPORT_STATISTICS_SECONDS;
+		m_outgoingPackets[m_statisticsSlot] = 0;
+		m_outgoingBytes[m_statisticsSlot] = 0;
+		m_incomingPackets[m_statisticsSlot] = 0;
+		m_incomingBytes[m_statisticsSlot] = 0;
+		m_unknownPackets[m_statisticsSlot] = 0;
+		m_unknownBytes[m_statisticsSlot] = 0;
+	}
+
+	// Send all messages
+	int i;
+	for (i=0; i<MAX_MESSAGES; ++i)
+	{
+		if (m_outBuffer[i].length != 0)
+		{
+			int bytesSent = 0;
+			int bytesToSend = m_outBuffer[i].length + sizeof(TransportMessageHeader);
+			// Send this message
+			if ((bytesSent = m_udpsock->Write((unsigned char *)(&m_outBuffer[i]), bytesToSend, m_outBuffer[i].addr, m_outBuffer[i].port)) > 0)
+			{
+				//DEBUG_LOG(("Sending %d bytes to %d.%d.%d.%d:%d", bytesToSend, PRINTF_IP_AS_4_INTS(m_outBuffer[i].addr), m_outBuffer[i].port));
+				m_outgoingPackets[m_statisticsSlot]++;
+				m_outgoingBytes[m_statisticsSlot] += m_outBuffer[i].length + sizeof(TransportMessageHeader);
+				m_outBuffer[i].length = 0;  // Remove from queue
+				if (bytesSent != bytesToSend)
+				{
+					DEBUG_LOG(("Transport::doSend - wanted to send %d bytes, only sent %d bytes to %d.%d.%d.%d:%d",
+						bytesToSend, bytesSent,
+						PRINTF_IP_AS_4_INTS(m_outBuffer[i].addr), m_outBuffer[i].port));
+				}
+			}
+			else
+			{
+				//DEBUG_LOG(("Could not write to socket!!!  Not discarding message!"));
+				retval = FALSE;
+				//DEBUG_LOG(("Transport::doSend returning FALSE"));
+			}
+		}
+	}
+
+#if defined(RTS_DEBUG)
+	// Latency simulation - deliver anything we're holding on to that is ready
+	if (m_useLatency)
+	{
+		for (i=0; i<MAX_MESSAGES; ++i)
+		{
+			if (m_delayedInBuffer[i].message.length != 0 && m_delayedInBuffer[i].deliveryTime <= now)
+			{
+				for (int j=0; j<MAX_MESSAGES; ++j)
+				{
+					if (m_inBuffer[j].length == 0)
+					{
+						// Empty slot; use it
+						memcpy(&m_inBuffer[j], &m_delayedInBuffer[i].message, sizeof(TransportMessage));
+						m_delayedInBuffer[i].message.length = 0;
+						break;
+					}
+				}
+			}
+		}
+	}
+#endif
+	return retval;
+}
+
+Bool Transport::doRecv()
+{
+	if (!m_udpsock)
+	{
+		DEBUG_LOG(("Transport::doRecv() - m_udpSock is NULL!"));
+		return FALSE;
+	}
+
+	Bool retval = TRUE;
+
+	// Read in anything on our socket
+	sockaddr_in from;
+#if defined(RTS_DEBUG)
+	UnsignedInt now = timeGetTime();
+#endif
+
+	TransportMessage incomingMessage;
+	unsigned char *buf = (unsigned char *)&incomingMessage;
+	int len = MAX_MESSAGE_LEN;
+//	DEBUG_LOG(("Transport::doRecv - checking"));
+	while ( (len=m_udpsock->Read(buf, MAX_MESSAGE_LEN, &from)) > 0 )
+	{
+#if defined(RTS_DEBUG)
+		// Packet loss simulation
+		if (m_usePacketLoss)
+		{
+			if ( TheGlobalData->m_packetLoss >= GameClientRandomValue(0, 100) )
+			{
+				continue;
+			}
+		}
+#endif
+
+//		DEBUG_LOG(("Transport::doRecv - Got something! len = %d", len));
+		// Decrypt the packet
+//		DEBUG_LOG_RAW(("buffer = "));
+//		for (Int munkee = 0; munkee < len; ++munkee) {
+//			DEBUG_LOG_RAW(("%02x", *(buf + munkee)));
+//		}
+//		DEBUG_LOG_RAW(("\n"));
+		decryptBuf(buf, len);
+
+		incomingMessage.length = len - sizeof(TransportMessageHeader);
+
+		if (len <= sizeof(TransportMessageHeader) || !isGeneralsPacket( &incomingMessage ))
+		{
+			DEBUG_LOG(("Transport::doRecv - unknownPacket! len = %d", len));
+			m_unknownPackets[m_statisticsSlot]++;
+			m_unknownBytes[m_statisticsSlot] += len;
+			continue;
+		}
+
+		// Something there; stick it somewhere
+//		DEBUG_LOG(("Saw %d bytes from %d:%d", len, ntohl(from.sin_addr.S_un.S_addr), ntohs(from.sin_port)));
+		m_incomingPackets[m_statisticsSlot]++;
+		m_incomingBytes[m_statisticsSlot] += len;
+
+		for (int i=0; i<MAX_MESSAGES; ++i)
+		{
+#if defined(RTS_DEBUG)
+			// Latency simulation
+			if (m_useLatency)
+			{
+				if (m_delayedInBuffer[i].message.length == 0)
+				{
+					// Empty slot; use it
+					m_delayedInBuffer[i].deliveryTime =
+						now + TheGlobalData->m_latencyAverage +
+						(Int)(TheGlobalData->m_latencyAmplitude * sin(now * TheGlobalData->m_latencyPeriod)) +
+						GameClientRandomValue(-TheGlobalData->m_latencyNoise, TheGlobalData->m_latencyNoise);
+					m_delayedInBuffer[i].message.length = incomingMessage.length;
+					m_delayedInBuffer[i].message.addr = ntohl(from.sin_addr.S_un.S_addr);
+					m_delayedInBuffer[i].message.port = ntohs(from.sin_port);
+					memcpy(&m_delayedInBuffer[i].message, buf, len);
+					break;
+				}
+			}
+			else
+			{
+#endif
+				if (m_inBuffer[i].length == 0)
+				{
+					// Empty slot; use it
+					m_inBuffer[i].length = incomingMessage.length;
+					m_inBuffer[i].addr = ntohl(from.sin_addr.S_un.S_addr);
+					m_inBuffer[i].port = ntohs(from.sin_port);
+					memcpy(&m_inBuffer[i], buf, len);
+					break;
+				}
+#if defined(RTS_DEBUG)
+			}
+#endif
+		}
+		//DEBUG_ASSERTCRASH(i<MAX_MESSAGES, ("Message lost!"));
+	}
+
+	if (len == -1) {
+		// there was a socket error trying to perform a read.
+		//DEBUG_LOG(("Transport::doRecv returning FALSE"));
+		retval = FALSE;
+	}
+
+	return retval;
+}
+
+Bool Transport::queueSend(UnsignedInt addr, UnsignedShort port, const UnsignedByte *buf, Int len /*,
+						  NetMessageFlags flags, Int id */)
+{
+	int i;
+
+	if (len < 1 || len > MAX_PACKET_SIZE)
+	{
+		DEBUG_LOG(("Transport::queueSend - Invalid Packet size"));
+		return false;
+	}
+
+	for (i=0; i<MAX_MESSAGES; ++i)
+	{
+		if (m_outBuffer[i].length == 0)
+		{
+			// Insert data here
+			m_outBuffer[i].length = len;
+			memcpy(m_outBuffer[i].data, buf, len);
+			m_outBuffer[i].addr = addr;
+			m_outBuffer[i].port = port;
+//			m_outBuffer[i].header.flags = flags;
+//			m_outBuffer[i].header.id = id;
+			m_outBuffer[i].header.magic = GENERALS_MAGIC_NUMBER;
+
+			CRC crc;
+			crc.computeCRC( (unsigned char *)(&(m_outBuffer[i].header.magic)), m_outBuffer[i].length + sizeof(TransportMessageHeader) - sizeof(UnsignedInt) );
+//			DEBUG_LOG(("About to assign the CRC for the packet"));
+			m_outBuffer[i].header.crc = crc.get();
+
+			// Encrypt packet
+//			DEBUG_LOG(("buffer: "));
+			encryptBuf((unsigned char *)&m_outBuffer[i], len + sizeof(TransportMessageHeader));
+//			DEBUG_LOG((""));
+
+			return true;
+		}
+	}
+	DEBUG_LOG(("Send Queue is getting full, dropping packets"));
+	return false;
+}
+
+Bool Transport::isGeneralsPacket( TransportMessage *msg )
+{
+	if (!msg)
+		return false;
+
+	if (msg->length < 0 || msg->length > MAX_MESSAGE_LEN)
+		return false;
+
+	CRC crc;
+//	crc.computeCRC( (unsigned char *)msg->data, msg->length );
+	crc.computeCRC( (unsigned char *)(&(msg->header.magic)), msg->length + sizeof(TransportMessageHeader) - sizeof(UnsignedInt) );
+
+	if (crc.get() != msg->header.crc)
+		return false;
+
+	if (msg->header.magic != GENERALS_MAGIC_NUMBER)
+		return false;
+
+	return true;
+}
+
+// Statistics ---------------------------------------------------
+Real Transport::getIncomingBytesPerSecond( void )
+{
+	Real val = 0.0;
+	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
+	{
+		if (i != m_statisticsSlot)
+			val += m_incomingBytes[i];
+	}
+	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
+}
+
+Real Transport::getIncomingPacketsPerSecond( void )
+{
+	Real val = 0.0;
+	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
+	{
+		if (i != m_statisticsSlot)
+			val += m_incomingPackets[i];
+	}
+	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
+}
+
+Real Transport::getOutgoingBytesPerSecond( void )
+{
+	Real val = 0.0;
+	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
+	{
+		if (i != m_statisticsSlot)
+			val += m_outgoingBytes[i];
+	}
+	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
+}
+
+Real Transport::getOutgoingPacketsPerSecond( void )
+{
+	Real val = 0.0;
+	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
+	{
+		if (i != m_statisticsSlot)
+			val += m_outgoingPackets[i];
+	}
+	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
+}
+
+Real Transport::getUnknownBytesPerSecond( void )
+{
+	Real val = 0.0;
+	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
+	{
+		if (i != m_statisticsSlot)
+			val += m_unknownBytes[i];
+	}
+	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
+}
+
+Real Transport::getUnknownPacketsPerSecond( void )
+{
+	Real val = 0.0;
+	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
+	{
+		if (i != m_statisticsSlot)
+			val += m_unknownPackets[i];
+	}
+	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
+}
+
+
+
diff --git a/Core/GameEngine/Source/GameNetwork/User.cpp b/Core/GameEngine/Source/GameNetwork/User.cpp
new file mode 100644
index 00000000000..012f0da89df
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/User.cpp
@@ -0,0 +1,74 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+// User class copy and comparisons
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+#include "GameNetwork/User.h"
+
+/**
+ * Constructor.  Sets up the member variables with the appropriate values.
+ */
+User::User(UnicodeString name, UnsignedInt addr, UnsignedInt port) {
+	m_name.set(name);
+	m_ipaddr = addr;
+	m_port = port;
+}
+
+/**
+ * The assignment operator.
+ */
+User & User::operator= (const User *other)
+{
+	m_name = other->m_name;
+	m_ipaddr = other->m_ipaddr;
+	m_port = other->m_port;
+
+	return *this;
+}
+
+/**
+ * The equality operator.
+ */
+Bool User::operator== (const User *other)
+{
+	return (m_name.compare(other->m_name) == 0);
+}
+
+/**
+ * The inequality operator.
+ */
+Bool User::operator!= (const User *other)
+{
+	return (m_name.compare(other->m_name) != 0);
+}
+
+/**
+ * Set the name of this user.
+ */
+void User::setName(UnicodeString name) {
+	m_name.set(name);
+}
diff --git a/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp b/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp
new file mode 100644
index 00000000000..d644725d483
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp
@@ -0,0 +1,310 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+/******************************************************************************
+*
+* NAME
+*     $Archive:  $
+*
+* DESCRIPTION
+*
+* PROGRAMMER
+*     Bryan Cleveland
+*     $Author:  $
+*
+* VERSION INFO
+*     $Revision:  $
+*     $Modtime:  $
+*
+******************************************************************************/
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+//#include "WinMain.h"
+#include "GameNetwork/WOLBrowser/WebBrowser.h"
+#include "GameClient/GameWindow.h"
+#include "GameClient/Display.h"
+
+
+/**
+	* OLEInitializer class - Init and shutdown OLE & COM as a global
+	* object.  Scary, nasty stuff, COM.  /me shivers.
+	*/
+class OLEInitializer
+{
+public:
+	OLEInitializer()
+	{
+		// Initialize this instance
+		OleInitialize(NULL);
+	 }
+	~OLEInitializer()
+	{
+		OleUninitialize();
+	}
+};
+OLEInitializer g_OLEInitializer;
+CComModule _Module;
+
+CComObject<WebBrowser> * TheWebBrowser = NULL;
+
+
+/******************************************************************************
+*
+* NAME
+*     WebBrowser::WebBrowser
+*
+* DESCRIPTION
+*     Default constructor
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+******************************************************************************/
+
+WebBrowser::WebBrowser() :
+		mRefCount(1)
+{
+	DEBUG_LOG(("Instantiating embedded WebBrowser"));
+	m_urlList = NULL;
+}
+
+
+/******************************************************************************
+*
+* NAME
+*     WebBrowser::~WebBrowser
+*
+* DESCRIPTION
+*     Destructor
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+******************************************************************************/
+
+WebBrowser::~WebBrowser()
+{
+	DEBUG_LOG(("Destructing embedded WebBrowser"));
+	if (this == TheWebBrowser) {
+		DEBUG_LOG(("WebBrowser::~WebBrowser - setting TheWebBrowser to NULL"));
+		TheWebBrowser = NULL;
+	}
+	WebBrowserURL *url = m_urlList;
+	while (url != NULL) {
+		WebBrowserURL *temp = url;
+		url = url->m_next;
+		deleteInstance(temp);
+		temp = NULL;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+/** The INI data fields for Webpage URL's */
+//-------------------------------------------------------------------------------------------------
+const FieldParse WebBrowserURL::m_URLFieldParseTable[] =
+{
+
+	{ "URL",										INI::parseAsciiString,							NULL, offsetof( WebBrowserURL, m_url ) },
+	{ NULL,											NULL,																NULL, 0 },
+
+};
+
+WebBrowserURL::WebBrowserURL()
+{
+	m_next = NULL;
+	m_tag.clear();
+	m_url.clear();
+}
+
+WebBrowserURL::~WebBrowserURL()
+{
+}
+/******************************************************************************
+*
+* NAME
+*     WebBrowser::init
+*
+* DESCRIPTION
+*     Perform post creation initialization.
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+******************************************************************************/
+
+void WebBrowser::init()
+{
+	m_urlList = NULL;
+	INI ini;
+	ini.loadFileDirectory( "Data\\INI\\Webpages", INI_LOAD_OVERWRITE, NULL );
+}
+
+/******************************************************************************
+*
+* NAME
+*     WebBrowser::reset
+*
+* DESCRIPTION
+*     Perform post creation initialization.
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+******************************************************************************/
+
+void WebBrowser::reset()
+{
+}
+
+void WebBrowser::update( void )
+{
+}
+
+WebBrowserURL * WebBrowser::findURL(AsciiString tag)
+{
+	WebBrowserURL *retval = m_urlList;
+
+	while ((retval != NULL) && tag.compareNoCase(retval->m_tag.str()))
+	{
+		retval = retval->m_next;
+	}
+
+	return retval;
+}
+
+WebBrowserURL * WebBrowser::makeNewURL(AsciiString tag)
+{
+	WebBrowserURL *newURL = newInstance(WebBrowserURL);
+
+	newURL->m_tag = tag;
+
+	newURL->m_next = m_urlList;
+	m_urlList = newURL;
+
+	return newURL;
+}
+
+/******************************************************************************
+*
+* NAME
+*     IUnknown::QueryInterface
+*
+* DESCRIPTION
+*
+* INPUTS
+*     IID - Interface ID
+*
+* RESULT
+*
+******************************************************************************/
+
+STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) IUNKNOWN_NOEXCEPT
+{
+	*ppv = NULL;
+
+	if ((iid == IID_IUnknown) || (iid == IID_IBrowserDispatch))
+	{
+		*ppv = static_cast<IBrowserDispatch*>(this);
+	}
+	else
+	{
+		return E_NOINTERFACE;
+	}
+
+	static_cast<IUnknown*>(*ppv)->AddRef();
+
+	return S_OK;
+}
+
+
+/******************************************************************************
+*
+* NAME
+*     IUnknown::AddRef
+*
+* DESCRIPTION
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*
+******************************************************************************/
+
+ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) IUNKNOWN_NOEXCEPT
+{
+	return ++mRefCount;
+}
+
+
+/******************************************************************************
+*
+* NAME
+*     IUnknown::Release
+*
+* DESCRIPTION
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*
+******************************************************************************/
+
+ULONG STDMETHODCALLTYPE WebBrowser::Release(void) IUNKNOWN_NOEXCEPT
+{
+	DEBUG_ASSERTCRASH(mRefCount > 0, ("Negative reference count"));
+	--mRefCount;
+
+	if (mRefCount == 0)
+	{
+		DEBUG_LOG(("WebBrowser::Release - all references released, deleting the object."));
+		if (this == TheWebBrowser) {
+			TheWebBrowser = NULL;
+		}
+		delete this;
+		return 0;
+	}
+
+	return mRefCount;
+}
+
+STDMETHODIMP WebBrowser::TestMethod(Int num1)
+{
+	DEBUG_LOG(("WebBrowser::TestMethod - num1 = %d", num1));
+	return S_OK;
+}
diff --git a/Core/GameEngine/Source/GameNetwork/udp.cpp b/Core/GameEngine/Source/GameNetwork/udp.cpp
new file mode 100644
index 00000000000..fd21c6e066a
--- /dev/null
+++ b/Core/GameEngine/Source/GameNetwork/udp.cpp
@@ -0,0 +1,534 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: Udp.cpp //////////////////////////////////////////////////////////////
+// Implementation of UDP socket wrapper class (taken from wnet lib)
+// Author: Matthew D. Campbell, July 2001
+///////////////////////////////////////////////////////////////////////////////
+
+// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
+// USER INCLUDES //////////////////////////////////////////////////////////////
+#include "Common/GameEngine.h"
+//#include "GameNetwork/NetworkInterface.h"
+#include "GameNetwork/udp.h"
+
+
+//-------------------------------------------------------------------------
+
+#ifdef DEBUG_LOGGING
+
+#define CASE(x) case (x): return #x;
+
+AsciiString GetWSAErrorString( Int error )
+{
+	switch (error)
+	{
+		CASE(WSABASEERR)
+		CASE(WSAEINTR)
+		CASE(WSAEBADF)
+		CASE(WSAEACCES)
+		CASE(WSAEFAULT)
+		CASE(WSAEINVAL)
+		CASE(WSAEMFILE)
+		CASE(WSAEWOULDBLOCK)
+		CASE(WSAEINPROGRESS)
+		CASE(WSAEALREADY)
+		CASE(WSAENOTSOCK)
+		CASE(WSAEDESTADDRREQ)
+		CASE(WSAEMSGSIZE)
+		CASE(WSAEPROTOTYPE)
+		CASE(WSAENOPROTOOPT)
+		CASE(WSAEPROTONOSUPPORT)
+		CASE(WSAESOCKTNOSUPPORT)
+		CASE(WSAEOPNOTSUPP)
+		CASE(WSAEPFNOSUPPORT)
+		CASE(WSAEAFNOSUPPORT)
+		CASE(WSAEADDRINUSE)
+		CASE(WSAEADDRNOTAVAIL)
+		CASE(WSAENETDOWN)
+		CASE(WSAENETUNREACH)
+		CASE(WSAENETRESET)
+		CASE(WSAECONNABORTED)
+		CASE(WSAECONNRESET)
+		CASE(WSAENOBUFS)
+		CASE(WSAEISCONN)
+		CASE(WSAENOTCONN)
+		CASE(WSAESHUTDOWN)
+		CASE(WSAETOOMANYREFS)
+		CASE(WSAETIMEDOUT)
+		CASE(WSAECONNREFUSED)
+		CASE(WSAELOOP)
+		CASE(WSAENAMETOOLONG)
+		CASE(WSAEHOSTDOWN)
+		CASE(WSAEHOSTUNREACH)
+		CASE(WSAENOTEMPTY)
+		CASE(WSAEPROCLIM)
+		CASE(WSAEUSERS)
+		CASE(WSAEDQUOT)
+		CASE(WSAESTALE)
+		CASE(WSAEREMOTE)
+		CASE(WSAEDISCON)
+		CASE(WSASYSNOTREADY)
+		CASE(WSAVERNOTSUPPORTED)
+		CASE(WSANOTINITIALISED)
+		CASE(WSAHOST_NOT_FOUND)
+		CASE(WSATRY_AGAIN)
+		CASE(WSANO_RECOVERY)
+		CASE(WSANO_DATA)
+		default:
+		{
+			AsciiString ret;
+			ret.format("Not a Winsock error (%d)", error);
+			return ret;
+		}
+	}
+	return AsciiString::TheEmptyString; // will not be hit, ever.
+}
+
+#undef CASE
+
+#endif // defined(RTS_DEBUG)
+
+//-------------------------------------------------------------------------
+
+UDP::UDP()
+{
+  fd=0;
+}
+
+UDP::~UDP()
+{
+	if (fd)
+		closesocket(fd);
+}
+
+Int UDP::Bind(const char *Host,UnsignedShort port)
+{
+  struct hostent *hostStruct;
+  struct in_addr *hostNode;
+
+  if (isdigit(Host[0]))
+    return ( Bind( ntohl(inet_addr(Host)), port) );
+
+  hostStruct = gethostbyname(Host);
+  if (hostStruct == NULL)
+    return (0);
+  hostNode = (struct in_addr *) hostStruct->h_addr;
+  return ( Bind(ntohl(hostNode->s_addr),port) );
+}
+
+// You must call bind, implicit binding is for sissies
+//   Well... you can get implicit binding if you pass 0 for either arg
+Int UDP::Bind(UnsignedInt IP,UnsignedShort Port)
+{
+  int retval;
+  int status;
+
+  IP=htonl(IP);
+  Port=htons(Port);
+
+  addr.sin_family=AF_INET;
+  addr.sin_port=Port;
+  addr.sin_addr.s_addr=IP;
+  fd=socket(AF_INET,SOCK_DGRAM,DEFAULT_PROTOCOL);
+  #ifdef _WIN32
+  if (fd==SOCKET_ERROR)
+    fd=-1;
+  #endif
+  if (fd==-1)
+    return(UNKNOWN);
+
+  retval=bind(fd,(struct sockaddr *)&addr,sizeof(addr));
+
+  #ifdef _WIN32
+  if (retval==SOCKET_ERROR)
+	{
+    retval=-1;
+		m_lastError = WSAGetLastError();
+	}
+  #endif
+  if (retval==-1)
+  {
+    status=GetStatus();
+    //CERR("Bind failure (" << status << ") IP " << IP << " PORT " << Port )
+    return(status);
+  }
+
+  int namelen=sizeof(addr);
+  getsockname(fd, (struct sockaddr *)&addr, &namelen);
+
+  myIP=ntohl(addr.sin_addr.s_addr);
+  myPort=ntohs(addr.sin_port);
+
+  retval=SetBlocking(FALSE);
+  if (retval==-1)
+    fprintf(stderr,"Couldn't set nonblocking mode!\n");
+
+  return(OK);
+}
+
+Int UDP::getLocalAddr(UnsignedInt &ip, UnsignedShort &port)
+{
+  ip=myIP;
+  port=myPort;
+  return(OK);
+}
+
+
+// private function
+Int UDP::SetBlocking(Int block)
+{
+  #ifdef _WIN32
+   unsigned long flag=1;
+   if (block)
+     flag=0;
+   int retval;
+   retval=ioctlsocket(fd,FIONBIO,&flag);
+   if (retval==SOCKET_ERROR)
+     return(UNKNOWN);
+   else
+     return(OK);
+  #else  // UNIX
+   int flags = fcntl(fd, F_GETFL, 0);
+   if (block==FALSE)          // set nonblocking
+     flags |= O_NONBLOCK;
+   else                       // set blocking
+     flags &= ~(O_NONBLOCK);
+
+   if (fcntl(fd, F_SETFL, flags) < 0)
+   {
+     return(UNKNOWN);
+   }
+   return(OK);
+  #endif
+}
+
+
+Int UDP::Write(const unsigned char *msg,UnsignedInt len,UnsignedInt IP,UnsignedShort port)
+{
+  Int retval;
+  struct sockaddr_in to;
+
+  // This happens frequently
+  if ((IP==0)||(port==0)) return(ADDRNOTAVAIL);
+
+#ifdef _UNIX
+  errno=0;
+#endif
+  to.sin_port=htons(port);
+  to.sin_addr.s_addr=htonl(IP);
+  to.sin_family=AF_INET;
+
+  ClearStatus();
+  retval=sendto(fd,(const char *)msg,len,0,(struct sockaddr *)&to,sizeof(to));
+  #ifdef _WIN32
+  if (retval==SOCKET_ERROR)
+	{
+    retval=-1;
+		m_lastError = WSAGetLastError();
+#ifdef DEBUG_LOGGING
+		static Int errCount = 0;
+#endif
+		DEBUG_ASSERTLOG(errCount++ > 100, ("UDP::Write() - WSA error is %s", GetWSAErrorString(WSAGetLastError()).str()));
+	}
+  #endif
+
+  return(retval);
+}
+
+Int UDP::Read(unsigned char *msg,UnsignedInt len,sockaddr_in *from)
+{
+  Int retval;
+  int    alen=sizeof(sockaddr_in);
+
+  if (from!=NULL)
+  {
+    retval=recvfrom(fd,(char *)msg,len,0,(struct sockaddr *)from,&alen);
+    #ifdef _WIN32
+    if (retval == SOCKET_ERROR)
+		{
+			if (WSAGetLastError() != WSAEWOULDBLOCK)
+			{
+				// failing because of a blocking error isn't really such a bad thing.
+				m_lastError = WSAGetLastError();
+#ifdef DEBUG_LOGGING
+				static Int errCount = 0;
+#endif
+				DEBUG_ASSERTLOG(errCount++ > 100, ("UDP::Read() - WSA error is %s", GetWSAErrorString(WSAGetLastError()).str()));
+				retval = -1;
+			} else {
+				retval = 0;
+			}
+		}
+    #endif
+  }
+  else
+  {
+    retval=recvfrom(fd,(char *)msg,len,0,NULL,NULL);
+    #ifdef _WIN32
+    if (retval==SOCKET_ERROR)
+		{
+			if (WSAGetLastError() != WSAEWOULDBLOCK)
+			{
+				// failing because of a blocking error isn't really such a bad thing.
+				m_lastError = WSAGetLastError();
+#ifdef DEBUG_LOGGING
+				static Int errCount = 0;
+#endif
+				DEBUG_ASSERTLOG(errCount++ > 100, ("UDP::Read() - WSA error is %s", GetWSAErrorString(WSAGetLastError()).str()));
+				retval = -1;
+			} else {
+				retval = 0;
+			}
+		}
+    #endif
+  }
+  return(retval);
+}
+
+
+void UDP::ClearStatus(void)
+{
+  #ifndef _WIN32
+  errno=0;
+  #endif
+
+	m_lastError = 0;
+}
+
+UDP::sockStat UDP::GetStatus(void)
+{
+	Int status = m_lastError;
+ #ifdef _WIN32
+  //int status=WSAGetLastError();
+  switch (status) {
+    case NO_ERROR:
+      return OK;
+    case WSAEINTR:
+      return INTR;
+    case WSAEINPROGRESS:
+      return INPROGRESS;
+    case WSAECONNREFUSED:
+      return CONNREFUSED;
+    case WSAEINVAL:
+      return INVAL;
+    case WSAEISCONN:
+      return ISCONN;
+    case WSAENOTSOCK:
+      return NOTSOCK;
+    case WSAETIMEDOUT:
+      return TIMEDOUT;
+    case WSAEALREADY:
+      return ALREADY;
+    case WSAEWOULDBLOCK:
+      return WOULDBLOCK;
+    case WSAEBADF:
+      return BADF;
+    default:
+      return (UDP::sockStat)status;
+  }
+ #else
+  //int status=errno;
+  switch (status) {
+    case 0:
+      return OK;
+    case EINTR:
+      return INTR;
+    case EINPROGRESS:
+      return INPROGRESS;
+    case ECONNREFUSED:
+      return CONNREFUSED;
+    case EINVAL:
+      return INVAL;
+    case EISCONN:
+      return ISCONN;
+    case ENOTSOCK:
+      return NOTSOCK;
+    case ETIMEDOUT:
+      return TIMEDOUT;
+    case EALREADY:
+      return ALREADY;
+    case EAGAIN:
+      return AGAIN;
+    case EWOULDBLOCK:
+      return WOULDBLOCK;
+    case EBADF:
+      return BADF;
+    default:
+      return UNKNOWN;
+  }
+ #endif
+}
+
+
+
+/*
+//
+// Wait for net activity on this socket
+//
+int UDP::Wait(Int sec,Int usec,fd_set &returnSet)
+{
+  fd_set inputSet;
+
+  FD_ZERO(&inputSet);
+  FD_SET(fd,&inputSet);
+
+  return(Wait(sec,usec,inputSet,returnSet));
+}
+*/
+
+/*
+//
+// Wait for net activity on a list of sockets
+//
+int UDP::Wait(Int sec,Int usec,fd_set &givenSet,fd_set &returnSet)
+{
+  Wtime        timeout,timenow,timethen;
+  fd_set       backupSet;
+  int          retval=0,done,givenMax;
+  Bool         noTimeout=FALSE;
+  timeval      tv;
+
+  returnSet=givenSet;
+  backupSet=returnSet;
+
+  if ((sec==-1)&&(usec==-1))
+    noTimeout=TRUE;
+
+  timeout.SetSec(sec);
+  timeout.SetUsec(usec);
+  timethen+=timeout;
+
+  givenMax=fd;
+  for (UnsignedInt i=0; i<(sizeof(fd_set)*8); i++)   // i=maxFD+1
+  {
+    if (FD_ISSET(i,&givenSet))
+      givenMax=i;
+  }
+  ///DBGMSG("WAIT  fd="<<fd<<"  givenMax="<<givenMax);
+
+  done=0;
+  while( ! done)
+  {
+    if (noTimeout)
+      retval=select(givenMax+1,&returnSet,0,0,NULL);
+    else
+    {
+      timeout.GetTimevalMT(tv);
+      retval=select(givenMax+1,&returnSet,0,0,&tv);
+    }
+
+    if (retval>=0)
+      done=1;
+
+    else if ((retval==-1)&&(errno==EINTR))  // in case of signal
+    {
+      if (noTimeout==FALSE)
+      {
+        timenow.Update();
+        timeout=timethen-timenow;
+      }
+      if ((noTimeout==FALSE)&&(timenow.GetSec()==0)&&(timenow.GetUsec()==0))
+        done=1;
+      else
+        returnSet=backupSet;
+    }
+    else  // maybe out of memory?
+    {
+      done=1;
+    }
+  }
+  ///DBGMSG("Wait retval: "<<retval);
+  return(retval);
+}
+*/
+
+
+
+
+// Set the kernel buffer sizes for incoming, and outgoing packets
+//
+// Linux seems to have a buffer max of 32767 bytes for this,
+//  (which is the default). If you try and set the size to
+//  greater than the default it just sets it to 32767.
+
+Int UDP::SetInputBuffer(UnsignedInt bytes)
+{
+   int retval,arg=bytes;
+
+   retval=setsockopt(fd,SOL_SOCKET,SO_RCVBUF,
+     (char *)&arg,sizeof(int));
+   if (retval==0)
+     return(TRUE);
+   else
+     return(FALSE);
+}
+
+// Same note goes for the output buffer
+
+Int UDP::SetOutputBuffer(UnsignedInt bytes)
+{
+   int retval,arg=bytes;
+
+   retval=setsockopt(fd,SOL_SOCKET,SO_SNDBUF,
+     (char *)&arg,sizeof(int));
+   if (retval==0)
+     return(TRUE);
+   else
+     return(FALSE);
+}
+
+// Get the system buffer sizes
+
+int UDP::GetInputBuffer(void)
+{
+   int retval,arg=0,len=sizeof(int);
+
+   retval=getsockopt(fd,SOL_SOCKET,SO_RCVBUF,
+     (char *)&arg,&len);
+   return(arg);
+}
+
+
+int UDP::GetOutputBuffer(void)
+{
+   int retval,arg=0,len=sizeof(int);
+
+   retval=getsockopt(fd,SOL_SOCKET,SO_SNDBUF,
+     (char *)&arg,&len);
+   return(arg);
+}
+
+Int UDP::AllowBroadcasts(Bool status)
+{
+	int retval;
+	BOOL val = status;
+	retval = setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char *)&val, sizeof(BOOL));
+	if (retval == 0)
+		return TRUE;
+	else
+		return FALSE;
+}
diff --git a/Core/GameEngineDevice/CMakeLists.txt b/Core/GameEngineDevice/CMakeLists.txt
new file mode 100644
index 00000000000..7ebd9b02944
--- /dev/null
+++ b/Core/GameEngineDevice/CMakeLists.txt
@@ -0,0 +1,247 @@
+set(GAMEENGINEDEVICE_SRC
+    Include/MilesAudioDevice/MilesAudioManager.h
+    Include/VideoDevice/Bink/BinkVideoPlayer.h
+#    Include/W3DDevice/Common/W3DConvert.h
+#    Include/W3DDevice/Common/W3DFunctionLexicon.h
+#    Include/W3DDevice/Common/W3DModuleFactory.h
+    Include/W3DDevice/Common/W3DRadar.h
+#    Include/W3DDevice/Common/W3DThingFactory.h
+    Include/W3DDevice/GameClient/BaseHeightMap.h
+#    Include/W3DDevice/GameClient/camerashakesystem.h
+    Include/W3DDevice/GameClient/FlatHeightMap.h
+    Include/W3DDevice/GameClient/HeightMap.h
+#    Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
+    Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DModelDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h
+    Include/W3DDevice/GameClient/Module/W3DPropDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DRopeDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DTankDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
+    Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
+    Include/W3DDevice/GameClient/TerrainTex.h
+    Include/W3DDevice/GameClient/TileData.h
+#    Include/W3DDevice/GameClient/W3DAssetManager.h
+#    Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
+#    Include/W3DDevice/GameClient/W3DBibBuffer.h
+#    Include/W3DDevice/GameClient/W3DBridgeBuffer.h
+#    Include/W3DDevice/GameClient/W3DBufferManager.h
+#    Include/W3DDevice/GameClient/W3DCustomEdging.h
+#    Include/W3DDevice/GameClient/W3DCustomScene.h
+#    Include/W3DDevice/GameClient/W3DDebugDisplay.h
+#    Include/W3DDevice/GameClient/W3DDebugIcons.h
+#    Include/W3DDevice/GameClient/W3DDisplay.h
+#    Include/W3DDevice/GameClient/W3DDisplayString.h
+#    Include/W3DDevice/GameClient/W3DDisplayStringManager.h
+#    Include/W3DDevice/GameClient/W3DDynamicLight.h
+#    Include/W3DDevice/GameClient/W3DFileSystem.h
+#    Include/W3DDevice/GameClient/W3DGadget.h
+#    Include/W3DDevice/GameClient/W3DGameClient.h
+#    Include/W3DDevice/GameClient/W3DGameFont.h
+#    Include/W3DDevice/GameClient/W3DGameWindow.h
+#    Include/W3DDevice/GameClient/W3DGameWindowManager.h
+#    Include/W3DDevice/GameClient/W3DGUICallbacks.h
+#    Include/W3DDevice/GameClient/W3DInGameUI.h
+#    Include/W3DDevice/GameClient/W3DMirror.h
+#    Include/W3DDevice/GameClient/W3DMouse.h
+#    Include/W3DDevice/GameClient/W3DParticleSys.h
+#    Include/W3DDevice/GameClient/W3DPoly.h
+#    Include/W3DDevice/GameClient/W3DProjectedShadow.h
+    Include/W3DDevice/GameClient/W3DPropBuffer.h
+#    Include/W3DDevice/GameClient/W3DRoadBuffer.h
+#    Include/W3DDevice/GameClient/W3DScene.h
+    Include/W3DDevice/GameClient/W3DShaderManager.h
+#    Include/W3DDevice/GameClient/W3DShadow.h
+#    Include/W3DDevice/GameClient/W3DShroud.h
+    Include/W3DDevice/GameClient/W3DSmudge.h
+    Include/W3DDevice/GameClient/W3DSnow.h
+#    Include/W3DDevice/GameClient/W3DStatusCircle.h
+    Include/W3DDevice/GameClient/W3DTerrainBackground.h
+    Include/W3DDevice/GameClient/W3DTerrainTracks.h
+    Include/W3DDevice/GameClient/W3DTerrainVisual.h
+    Include/W3DDevice/GameClient/W3DTreeBuffer.h
+    Include/W3DDevice/GameClient/W3DVideoBuffer.h
+    Include/W3DDevice/GameClient/W3DView.h
+#    Include/W3DDevice/GameClient/W3DVolumetricShadow.h
+    Include/W3DDevice/GameClient/W3DWater.h
+    Include/W3DDevice/GameClient/W3DWaterTracks.h
+#    Include/W3DDevice/GameClient/W3DWaypointBuffer.h
+#    Include/W3DDevice/GameClient/W3DWebBrowser.h
+    Include/W3DDevice/GameClient/WorldHeightMap.h
+#    Include/W3DDevice/GameLogic/W3DGameLogic.h
+#    Include/W3DDevice/GameLogic/W3DGhostObject.h
+#    Include/W3DDevice/GameLogic/W3DTerrainLogic.h
+    Include/Win32Device/Common/Win32BIGFile.h
+    Include/Win32Device/Common/Win32BIGFileSystem.h
+#    Include/Win32Device/Common/Win32CDManager.h
+#    Include/Win32Device/Common/Win32GameEngine.h
+    Include/Win32Device/Common/Win32LocalFile.h
+    Include/Win32Device/Common/Win32LocalFileSystem.h
+#    Include/Win32Device/GameClient/Win32DIKeyboard.h
+#    Include/Win32Device/GameClient/Win32DIMouse.h
+#    Include/Win32Device/GameClient/Win32Mouse.h
+    Source/MilesAudioDevice/MilesAudioManager.cpp
+    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
+#    Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
+    Source/W3DDevice/Common/System/W3DRadar.cpp
+#    Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
+#    Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
+#    Source/W3DDevice/Common/W3DConvert.cpp
+    Source/W3DDevice/GameClient/BaseHeightMap.cpp
+    Source/W3DDevice/GameClient/CameraShakeSystem.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp
+    Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordAircraftDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTruckDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp
+    Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp
+    Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
+    Source/W3DDevice/GameClient/FlatHeightMap.cpp
+#    Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp
+#    Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp
+#    Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp
+#    Source/W3DDevice/GameClient/GUI/Gadget/W3DListBox.cpp
+#    Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp
+#    Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp
+#    Source/W3DDevice/GameClient/GUI/Gadget/W3DRadioButton.cpp
+#    Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp
+#    Source/W3DDevice/GameClient/GUI/Gadget/W3DTabControl.cpp
+#    Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp
+#    Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp
+#    Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
+#    Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp
+#    Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
+#    Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
+#    Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
+#    Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
+    Source/W3DDevice/GameClient/HeightMap.cpp
+#    Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp
+#    Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
+#    Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp
+#    Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
+    Source/W3DDevice/GameClient/TerrainTex.cpp
+    Source/W3DDevice/GameClient/TileData.cpp
+#    Source/W3DDevice/GameClient/W3DAssetManager.cpp
+#    Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
+#    Source/W3DDevice/GameClient/W3DBibBuffer.cpp
+#    Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
+#    Source/W3DDevice/GameClient/W3DCustomEdging.cpp
+#    Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
+#    Source/W3DDevice/GameClient/W3DDebugIcons.cpp
+#    Source/W3DDevice/GameClient/W3DDisplay.cpp
+#    Source/W3DDevice/GameClient/W3DDisplayString.cpp
+#    Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp
+#    Source/W3DDevice/GameClient/W3DDynamicLight.cpp
+#    Source/W3DDevice/GameClient/W3DFileSystem.cpp
+#    Source/W3DDevice/GameClient/W3DGameClient.cpp
+#    Source/W3DDevice/GameClient/W3DInGameUI.cpp
+#    Source/W3DDevice/GameClient/W3DMouse.cpp
+#    Source/W3DDevice/GameClient/W3DParticleSys.cpp
+#    Source/W3DDevice/GameClient/W3DPoly.cpp
+    Source/W3DDevice/GameClient/W3DPropBuffer.cpp
+#    Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
+#    Source/W3DDevice/GameClient/W3DScene.cpp
+    Source/W3DDevice/GameClient/W3DShaderManager.cpp
+#    Source/W3DDevice/GameClient/W3DShroud.cpp
+    Source/W3DDevice/GameClient/W3DSmudge.cpp
+    Source/W3DDevice/GameClient/W3DSnow.cpp
+#    Source/W3DDevice/GameClient/W3DStatusCircle.cpp
+    Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
+    Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
+    Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
+    Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
+    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
+    Source/W3DDevice/GameClient/W3DView.cpp
+#    Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
+#    Source/W3DDevice/GameClient/W3DWebBrowser.cpp
+    Source/W3DDevice/GameClient/Water/W3DWater.cpp
+    Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
+    Source/W3DDevice/GameClient/WorldHeightMap.cpp
+#    Source/W3DDevice/GameLogic/W3DGameLogic.cpp
+#    Source/W3DDevice/GameLogic/W3DGhostObject.cpp
+#    Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
+    Source/Win32Device/Common/Win32BIGFile.cpp
+    Source/Win32Device/Common/Win32BIGFileSystem.cpp
+#    Source/Win32Device/Common/Win32CDManager.cpp
+#    Source/Win32Device/Common/Win32GameEngine.cpp
+    Source/Win32Device/Common/Win32LocalFile.cpp
+    Source/Win32Device/Common/Win32LocalFileSystem.cpp
+#    Source/Win32Device/Common/Win32OSDisplay.cpp
+#    Source/Win32Device/GameClient/Win32DIKeyboard.cpp
+    #Source/Win32Device/GameClient/Win32DIMouse.cpp
+#    Source/Win32Device/GameClient/Win32Mouse.cpp
+)
+
+# Add C++ 17 FileSystem implementation for non-VS6 builds
+if(NOT IS_VS6_BUILD)
+    list(APPEND GAMEENGINEDEVICE_SRC
+        Include/StdDevice/Common/StdBIGFile.h
+        Include/StdDevice/Common/StdBIGFileSystem.h
+        Include/StdDevice/Common/StdLocalFile.h
+        Include/StdDevice/Common/StdLocalFileSystem.h
+        Source/StdDevice/Common/StdBIGFile.cpp
+        Source/StdDevice/Common/StdBIGFileSystem.cpp
+        Source/StdDevice/Common/StdLocalFile.cpp
+        Source/StdDevice/Common/StdLocalFileSystem.cpp
+    )
+endif()
+
+add_library(corei_gameenginedevice_private INTERFACE)
+add_library(corei_gameenginedevice_public INTERFACE)
+
+target_sources(corei_gameenginedevice_private INTERFACE ${GAMEENGINEDEVICE_SRC})
+
+target_include_directories(corei_gameenginedevice_public INTERFACE
+    Include
+)
+
+target_link_libraries(corei_gameenginedevice_private INTERFACE
+    corei_always
+    corei_main
+)
+
+target_link_libraries(corei_gameenginedevice_public INTERFACE
+    binkstub
+    corei_gameengine_public
+    d3d8lib
+    milesstub
+)
+
+if(RTS_BUILD_OPTION_FFMPEG)
+    find_package(FFMPEG REQUIRED)
+
+    if(FFMPEG_FOUND)
+        target_sources(corei_gameenginedevice_private INTERFACE
+            Include/VideoDevice/FFmpeg/FFmpegFile.h
+            Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
+            Source/VideoDevice/FFmpeg/FFmpegFile.cpp
+            Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
+        )
+        target_include_directories(corei_gameenginedevice_private INTERFACE ${FFMPEG_INCLUDE_DIRS})
+        target_link_directories(corei_gameenginedevice_private INTERFACE ${FFMPEG_LIBRARY_DIRS})
+        target_link_libraries(corei_gameenginedevice_private INTERFACE ${FFMPEG_LIBRARIES})
+        target_compile_definitions(corei_gameenginedevice_public INTERFACE RTS_HAS_FFMPEG)
+    endif()
+endif()
diff --git a/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h b/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
new file mode 100644
index 00000000000..314a8b8770c
--- /dev/null
+++ b/Core/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
@@ -0,0 +1,332 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// FILE: MilesAudioManager.h //////////////////////////////////////////////////////////////////////////
+// MilesAudioManager implementation
+// Author: John K. McDonald, July 2002
+
+#include "Common/AsciiString.h"
+#include "Common/GameAudio.h"
+#include "mss/mss.h"
+
+class AudioEventRTS;
+
+enum { MAXPROVIDERS = 64 };
+
+enum PlayingAudioType CPP_11(: Int)
+{
+	PAT_Sample,
+	PAT_3DSample,
+	PAT_Stream,
+	PAT_INVALID
+};
+
+enum PlayingStatus CPP_11(: Int)
+{
+	PS_Playing,
+	PS_Stopped,
+	PS_Paused
+};
+
+enum PlayingWhich CPP_11(: Int)
+{
+	PW_Attack,
+	PW_Sound,
+	PW_Decay,
+	PW_INVALID
+};
+
+struct PlayingAudio
+{
+	union
+	{
+		HSAMPLE m_sample;
+		H3DSAMPLE m_3DSample;
+		HSTREAM m_stream;
+	};
+
+	PlayingAudioType m_type;
+	volatile PlayingStatus m_status;	// This member is adjusted by another running thread.
+	AudioEventRTS *m_audioEventRTS;
+	void *m_file;		// The file that was opened to play this
+	Bool m_requestStop;
+	Bool m_cleanupAudioEventRTS;
+	Int m_framesFaded;
+
+	PlayingAudio() :
+		m_type(PAT_INVALID),
+		m_audioEventRTS(NULL),
+		m_requestStop(false),
+		m_cleanupAudioEventRTS(true),
+		m_sample(NULL),
+		m_framesFaded(0)
+	{ }
+};
+
+struct ProviderInfo
+{
+  AsciiString name;
+  HPROVIDER id;
+	Bool m_isValid;
+};
+
+struct OpenAudioFile
+{
+	AILSOUNDINFO m_soundInfo;
+	void *m_file;
+	UnsignedInt m_openCount;
+	UnsignedInt m_fileSize;
+
+	Bool m_compressed;	// if the file was compressed, then we need to free it with a miles function.
+
+	// Note: OpenAudioFile does not own this m_eventInfo, and should not delete it.
+	const AudioEventInfo *m_eventInfo;	// Not mutable, unlike the one on AudioEventRTS.
+};
+
+typedef std::hash_map< AsciiString, OpenAudioFile, rts::hash<AsciiString>, rts::equal_to<AsciiString> > OpenFilesHash;
+typedef OpenFilesHash::iterator OpenFilesHashIt;
+
+class AudioFileCache
+{
+	public:
+		AudioFileCache();
+
+		// Protected by mutex
+		virtual ~AudioFileCache();
+		void *openFile( AudioEventRTS *eventToOpenFrom );
+		void closeFile( void *fileToClose );
+		void setMaxSize( UnsignedInt size );
+		// End Protected by mutex
+
+		// Note: These functions should be used for informational purposes only. For speed reasons,
+		// they are not protected by the mutex, so they are not guarenteed to be valid if called from
+		// outside the audio cache. They should be used as a rough estimate only.
+		UnsignedInt getCurrentlyUsedSize() const { return m_currentlyUsedSize; }
+		UnsignedInt getMaxSize() const { return m_maxSize; }
+
+	protected:
+		void releaseOpenAudioFile( OpenAudioFile *fileToRelease );
+
+		// This function will return TRUE if it was able to free enough space, and FALSE otherwise.
+		Bool freeEnoughSpaceForSample(const OpenAudioFile& sampleThatNeedsSpace);
+
+		OpenFilesHash m_openFiles;
+		UnsignedInt m_currentlyUsedSize;
+		UnsignedInt m_maxSize;
+		HANDLE m_mutex;
+		const char *m_mutexName;
+};
+
+class MilesAudioManager : public AudioManager
+{
+
+	public:
+#if defined(RTS_DEBUG)
+		virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *, FILE *fp = NULL );
+		virtual AudioHandle addAudioEvent( const AudioEventRTS *eventToAdd );	///< Add an audio event (event must be declared in an INI file)
+#endif
+
+		// from AudioDevice
+		virtual void init();
+		virtual void postProcessLoad();
+		virtual void reset();
+		virtual void update();
+
+		MilesAudioManager();
+		virtual ~MilesAudioManager();
+
+
+		virtual void nextMusicTrack( void );
+		virtual void prevMusicTrack( void );
+		virtual Bool isMusicPlaying( void ) const;
+		virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const;
+		virtual AsciiString getMusicTrackName( void ) const;
+
+		virtual void openDevice( void );
+		virtual void closeDevice( void );
+		virtual void *getDevice( void ) { return m_digitalHandle; }
+
+		virtual void stopAudio( AudioAffect which );
+		virtual void pauseAudio( AudioAffect which );
+		virtual void resumeAudio( AudioAffect which );
+		virtual void pauseAmbient( Bool shouldPause );
+
+		virtual void killAudioEventImmediately( AudioHandle audioEvent );
+
+		///< Return whether the current audio is playing or not.
+		///< NOTE NOTE NOTE !!DO NOT USE THIS IN FOR GAMELOGIC PURPOSES!! NOTE NOTE NOTE
+		virtual Bool isCurrentlyPlaying( AudioHandle handle );
+
+		virtual void notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags );
+		virtual PlayingAudio *findPlayingAudioFrom( UnsignedInt audioCompleted, UnsignedInt flags );
+
+		virtual UnsignedInt getProviderCount( void ) const;
+		virtual AsciiString getProviderName( UnsignedInt providerNum ) const;
+		virtual UnsignedInt getProviderIndex( AsciiString providerName ) const;
+		virtual void selectProvider( UnsignedInt providerNdx );
+		virtual void unselectProvider( void );
+		virtual UnsignedInt getSelectedProvider( void ) const;
+		virtual void setSpeakerType( UnsignedInt speakerType );
+		virtual UnsignedInt getSpeakerType( void );
+
+ 		virtual void *getHandleForBink( void );
+ 		virtual void releaseHandleForBink( void );
+
+		virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay);
+
+		virtual UnsignedInt getNum2DSamples( void ) const;
+		virtual UnsignedInt getNum3DSamples( void ) const;
+		virtual UnsignedInt getNumStreams( void ) const;
+
+		virtual Bool doesViolateLimit( AudioEventRTS *event ) const;
+		virtual Bool isPlayingLowerPriority( AudioEventRTS *event ) const;
+		virtual Bool isPlayingAlready( AudioEventRTS *event ) const;
+		virtual Bool isObjectPlayingVoice( UnsignedInt objID ) const;
+		Bool killLowestPrioritySoundImmediately( AudioEventRTS *event );
+		AudioEventRTS* findLowestPrioritySound( AudioEventRTS *event );
+
+		virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume);
+
+		virtual void removePlayingAudio( AsciiString eventName );
+		virtual void removeAllDisabledAudio();
+
+		virtual void processRequestList( void );
+		virtual void processPlayingList( void );
+		virtual void processFadingList( void );
+		virtual void processStoppedList( void );
+
+		Bool shouldProcessRequestThisFrame( AudioRequest *req ) const;
+		void adjustRequest( AudioRequest *req );
+		Bool checkForSample( AudioRequest *req );
+
+		virtual void setHardwareAccelerated(Bool accel);
+		virtual void setSpeakerSurround(Bool surround);
+
+		virtual void setPreferredProvider(AsciiString provider) { m_pref3DProvider = provider; }
+		virtual void setPreferredSpeaker(AsciiString speakerType) { m_prefSpeaker = speakerType; }
+
+		virtual Real getFileLengthMS( AsciiString strToLoad ) const;
+
+		virtual void closeAnySamplesUsingFile( const void *fileToClose );
+
+
+    virtual Bool has3DSensitiveStreamsPlaying( void ) const;
+
+
+	protected:
+		// 3-D functions
+		virtual void setDeviceListenerPosition( void );
+		const Coord3D *getCurrentPositionFromEvent( AudioEventRTS *event );
+		Bool isOnScreen( const Coord3D *pos ) const;
+		Real getEffectiveVolume(AudioEventRTS *event) const;
+
+		// Looping functions
+		Bool startNextLoop( PlayingAudio *looping );
+
+		void playStream( AudioEventRTS *event, HSTREAM stream );
+		// Returns the file handle for attachment to the PlayingAudio structure
+		void *playSample( AudioEventRTS *event, HSAMPLE sample );
+		void *playSample3D( AudioEventRTS *event, H3DSAMPLE sample3D );
+
+	protected:
+		void buildProviderList( void );
+		void createListener( void );
+		void initDelayFilter( void );
+		Bool isValidProvider( void );
+		void initSamplePools( void );
+		void processRequest( AudioRequest *req );
+
+		void playAudioEvent( AudioEventRTS *event );
+		void stopAudioEvent( AudioHandle handle );
+		void pauseAudioEvent( AudioHandle handle );
+
+		void *loadFileForRead( AudioEventRTS *eventToLoadFrom );
+		void closeFile( void *fileRead );
+
+		PlayingAudio *allocatePlayingAudio( void );
+		void releaseMilesHandles( PlayingAudio *release );
+		void releasePlayingAudio( PlayingAudio *release );
+
+		void stopAllAudioImmediately( void );
+		void freeAllMilesHandles( void );
+
+		HSAMPLE getFirst2DSample( AudioEventRTS *event );
+		H3DSAMPLE getFirst3DSample( AudioEventRTS *event );
+
+		void adjustPlayingVolume( PlayingAudio *audio );
+
+		void stopAllSpeech( void );
+
+	protected:
+		void initFilters( HSAMPLE sample, const AudioEventRTS *eventInfo );
+		void initFilters3D( H3DSAMPLE sample, const AudioEventRTS *eventInfo, const Coord3D *pos );
+
+	protected:
+		ProviderInfo m_provider3D[MAXPROVIDERS];
+		UnsignedInt m_providerCount;
+		UnsignedInt m_selectedProvider;
+		UnsignedInt m_lastProvider;
+		UnsignedInt m_selectedSpeakerType;
+
+		AsciiString m_pref3DProvider;
+		AsciiString m_prefSpeaker;
+
+		HDIGDRIVER m_digitalHandle;
+		H3DPOBJECT m_listener;
+		HPROVIDER m_delayFilter;
+
+		// This is a list of all handles that are forcibly played. They always play as UI sounds.
+		std::list<HAUDIO> m_audioForcePlayed;
+
+		// Available handles for play. Note that there aren't handles open in advance for
+		// streaming things, only 2-D and 3-D sounds.
+		std::list<HSAMPLE> m_availableSamples;
+		std::list<H3DSAMPLE> m_available3DSamples;
+
+		// Currently Playing stuff. Useful if we have to preempt it.
+		// This should rarely if ever happen, as we mirror this in Sounds, and attempt to
+		// keep preemption from taking place here.
+		std::list<PlayingAudio *> m_playingSounds;
+		std::list<PlayingAudio *> m_playing3DSounds;
+		std::list<PlayingAudio *> m_playingStreams;
+
+		// Currently fading stuff. At this point, we just want to let it finish fading, when it is
+		// done it should be added to the completed list, then "freed" and the counts should be updated
+		// on the next update
+		std::list<PlayingAudio *> m_fadingAudio;
+
+		// Stuff that is done playing (either because it has finished or because it was killed)
+		// This stuff should be cleaned up during the next update cycle. This includes updating counts
+		// in the sound engine
+		std::list<PlayingAudio *> m_stoppedAudio;
+
+		AudioFileCache *m_audioCache;
+		PlayingAudio *m_binkHandle;
+		UnsignedInt m_num2DSamples;
+		UnsignedInt m_num3DSamples;
+		UnsignedInt m_numStreams;
+
+#if defined(RTS_DEBUG)
+		typedef std::set<AsciiString> SetAsciiString;
+		typedef SetAsciiString::iterator SetAsciiStringIt;
+		SetAsciiString m_allEventsLoaded;
+		void dumpAllAssetsUsed();
+#endif
+
+};
+
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h
similarity index 96%
rename from GeneralsMD/Code/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h
rename to Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h
index 9880a541fa5..84f3dc3b7fc 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h
+++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __STDBIGFILE_H
-#define __STDBIGFILE_H
-
 #include "Common/ArchiveFile.h"
 #include "Common/AsciiString.h"
 #include "Common/List.h"
@@ -38,7 +35,7 @@
 class StdBIGFile : public ArchiveFile
 {
 	public:
-		StdBIGFile();
+		StdBIGFile(AsciiString name, AsciiString path);
 		virtual ~StdBIGFile();
 
 		virtual Bool					getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const;	///< fill in the fileInfo struct with info about the requested file.
@@ -54,5 +51,3 @@ class StdBIGFile : public ArchiveFile
 		AsciiString		m_name;		///< BIG file name
 		AsciiString		m_path;		///< BIG file path
 };
-
-#endif // __STDBIGFILE_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h
similarity index 95%
rename from GeneralsMD/Code/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h
rename to Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h
index 3181e5308d1..45b45c793c5 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h
+++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __STDBIGFILESYSTEM_H
-#define __STDBIGFILESYSTEM_H
-
 #include "Common/ArchiveFileSystem.h"
 
 class StdBIGFileSystem : public ArchiveFileSystem
@@ -56,5 +53,3 @@ class StdBIGFileSystem : public ArchiveFileSystem
 protected:
 
 };
-
-#endif // __STDBIGFILESYSTEM_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h
similarity index 94%
rename from GeneralsMD/Code/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h
rename to Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h
index 5937be9359d..97f5830b963 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h
+++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h
@@ -28,19 +28,14 @@
 
 #pragma once
 
-#ifndef __STDLOCALFILE_H
-#define __STDLOCALFILE_H
-
 #include "Common/LocalFile.h"
 
 class StdLocalFile : public LocalFile
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(StdLocalFile, "StdLocalFile")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(StdLocalFile, "StdLocalFile")
 public:
 	StdLocalFile();
 	//virtual ~StdLocalFile();
 
 protected:
 };
-
-#endif // __STDLOCALFILE_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h
similarity index 90%
rename from GeneralsMD/Code/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h
rename to Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h
index 3008120f68e..d2a32c2a84b 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h
+++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h
@@ -28,8 +28,6 @@
 
 #pragma once
 
-#ifndef __STDLOCALFILESYSTEM_H
-#define __STDLOCALFILESYSTEM_H
 #include "Common/LocalFileSystem.h"
 
 class StdLocalFileSystem : public LocalFileSystem
@@ -42,15 +40,14 @@ class StdLocalFileSystem : public LocalFileSystem
 	virtual void reset();
 	virtual void update();
 
-	virtual File * openFile(const Char *filename, Int access = 0);	///< open the given file.
+	virtual File * openFile(const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE);	///< open the given file.
 	virtual Bool doesFileExist(const Char *filename) const;								///< does the given file exist?
 
 	virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.
 	virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const;
 
 	virtual Bool createDirectory(AsciiString directory);
+	virtual AsciiString normalizePath(const AsciiString& filePath) const;
 
 protected:
 };
-
-#endif // __STDLOCALFILESYSTEM_H
\ No newline at end of file
diff --git a/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h b/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
new file mode 100644
index 00000000000..45a3d158bd1
--- /dev/null
+++ b/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
@@ -0,0 +1,136 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:    Generals
+//
+// File name:  GameClient/VideoPlayer.h
+//
+// Created:    10/22/01
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+//----------------------------------------------------------------------------
+//           Includes
+//----------------------------------------------------------------------------
+
+#include "GameClient/VideoPlayer.h"
+#include "bink.h"
+
+//----------------------------------------------------------------------------
+//           Forward References
+//----------------------------------------------------------------------------
+
+class BinkVideoPlayer;
+
+//----------------------------------------------------------------------------
+//           Type Defines
+//----------------------------------------------------------------------------
+
+//===============================
+// BinkVideoStream
+//===============================
+
+class BinkVideoStream : public VideoStream
+{
+	friend class BinkVideoPlayer;
+
+	protected:
+
+		HBINK					m_handle;														///< Bink streaming handle;
+		Char					*m_memFile;													///< Pointer to memory resident file
+
+		BinkVideoStream();																///< only BinkVideoPlayer can create these
+		virtual ~BinkVideoStream();
+
+	public:
+
+		virtual void update( void );											///< Update bink stream
+
+		virtual Bool	isFrameReady( void );								///< Is the frame ready to be displayed
+		virtual void	frameDecompress( void );						///< Render current frame in to buffer
+		virtual void	frameRender( VideoBuffer *buffer ); ///< Render current frame in to buffer
+		virtual void	frameNext( void );									///< Advance to next frame
+		virtual Int		frameIndex( void );									///< Returns zero based index of current frame
+		virtual Int		frameCount( void );									///< Returns the total number of frames in the stream
+		virtual void	frameGoto( Int index );							///< Go to the spcified frame index
+		virtual Int		height( void );											///< Return the height of the video
+		virtual Int		width( void );											///< Return the width of the video
+
+
+};
+
+//===============================
+// BinkVideoPlayer
+//===============================
+/**
+  *	Bink video playback code.
+	*/
+//===============================
+
+class BinkVideoPlayer : public VideoPlayer
+{
+
+	protected:
+
+		VideoStreamInterface* createStream( HBINK handle );
+
+	public:
+
+		// subsytem requirements
+		virtual void	init( void );														///< Initialize video playback code
+		virtual void	reset( void );													///< Reset video playback
+		virtual void	update( void );													///< Services all audio tasks. Should be called frequently
+
+		virtual void	deinit( void );													///< Close down player
+
+
+		BinkVideoPlayer();
+		~BinkVideoPlayer();
+
+		// service
+		virtual void	loseFocus( void );											///< Should be called when application loses focus
+		virtual void	regainFocus( void );										///< Should be called when application regains focus
+
+		virtual VideoStreamInterface*	open( AsciiString movieTitle );	///< Open video file for playback
+		virtual VideoStreamInterface*	load( AsciiString movieTitle );	///< Load video file in to memory for playback
+
+		virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid );
+		virtual void initializeBinkWithMiles( void );
+};
+
+
+//----------------------------------------------------------------------------
+//           Inlining
+//----------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h b/Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h
similarity index 99%
rename from GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h
rename to Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h
index cf060b69efe..628374c4ef9 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h
+++ b/Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h
@@ -94,4 +94,4 @@ class FFmpegFile
 	std::vector<FFmpegStream> 	m_streams; ///< List of streams in the file
 	File 						*m_file = nullptr;	///< File handle for the file
 	void 						*m_userData = nullptr; ///< User data for the callback
-};
\ No newline at end of file
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h b/Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
similarity index 86%
rename from GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
rename to Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
index 9488f63ef2d..a4ab4fc4546 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
+++ b/Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
@@ -28,12 +28,8 @@
 
 #pragma once
 
-#ifndef __VIDEODEVICE_FFMPEGDEVICE_H_
-#define __VIDEODEVICE_FFMPEGDEVICE_H_
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "GameClient/VideoPlayer.h"
@@ -65,15 +61,15 @@ class FFmpegVideoStream : public VideoStream
 		SwsContext 		*m_swsContext = nullptr;///< SWSContext for scaling
 		FFmpegFile		*m_ffmpegFile;			///< The AVUI abstraction											///< Bink streaming handle;
 		Char			*m_memFile;				///< Pointer to memory resident file
-		UnsignedInt64	m_startTime = 0;		///< Time the stream started		
+		UnsignedInt64	m_startTime = 0;		///< Time the stream started
 		UnsignedByte *	m_audioBuffer = nullptr;///< Audio buffer for the stream
 
 		FFmpegVideoStream(FFmpegFile* file);																///< only BinkVideoPlayer can create these
-		virtual ~FFmpegVideoStream();												
-												
+		virtual ~FFmpegVideoStream();
+
 		static void onFrame(AVFrame *frame, int stream_idx, int stream_type, void *user_data);
-	public:																							
-																											
+	public:
+
 		virtual void update( void );											///< Update bink stream
 
 		virtual Bool	isFrameReady( void );								///< Is the frame ready to be displayed
@@ -110,17 +106,17 @@ class FFmpegVideoPlayer : public VideoPlayer
 		virtual void	init( void );														///< Initialize video playback code
 		virtual void	reset( void );													///< Reset video playback
 		virtual void	update( void );													///< Services all audio tasks. Should be called frequently
-																													
+
 		virtual void	deinit( void );													///< Close down player
-																														
-																													
-		FFmpegVideoPlayer();																				
-		~FFmpegVideoPlayer();																				
-																													
-		// service																						
+
+
+		FFmpegVideoPlayer();
+		~FFmpegVideoPlayer();
+
+		// service
 		virtual void	loseFocus( void );											///< Should be called when application loses focus
 		virtual void	regainFocus( void );										///< Should be called when application regains focus
-																												
+
 		virtual VideoStreamInterface*	open( AsciiString movieTitle );	///< Open video file for playback
 		virtual VideoStreamInterface*	load( AsciiString movieTitle );	///< Load video file in to memory for playback
 
@@ -130,8 +126,5 @@ class FFmpegVideoPlayer : public VideoPlayer
 
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-#endif // __VIDEODEVICE_FFMPEGDEVICE_H_
\ No newline at end of file
diff --git a/Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h b/Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h
new file mode 100644
index 00000000000..528ddb52a92
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h
@@ -0,0 +1,122 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DRadar.h ///////////////////////////////////////////////////////////////////////////////
+// Author: Colin Day, January 2002
+// Desc:   W3D radar implementation, this has the necessary device dependent drawing
+//				 necessary for the radar
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "Common/Radar.h"
+#include "WW3D2/ww3dformat.h"
+
+// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
+class TextureClass;
+class TerrainLogic;
+
+// PROTOTYPES /////////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------------
+/** W3D radar class.  This has the device specific implementation of the radar such as
+	* the drawing routines */
+//-------------------------------------------------------------------------------------------------
+class W3DRadar : public Radar
+{
+
+public:
+
+	W3DRadar( void );
+	~W3DRadar( void );
+
+	virtual void xfer( Xfer *xfer );
+
+	virtual void init( void );																		///< subsystem init
+	virtual void update( void );																	///< subsystem update
+	virtual void reset( void );																		///< subsystem reset
+
+	virtual void newMap( TerrainLogic *terrain );				///< reset radar for new map
+
+	virtual void draw( Int pixelX, Int pixelY, Int width, Int height );		///< draw the radar
+
+	virtual void clearShroud();
+	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting);
+
+	virtual void refreshTerrain( TerrainLogic *terrain );
+	virtual void refreshObjects();
+
+protected:
+
+	void drawSingleBeaconEvent( Int pixelX, Int pixelY, Int width, Int height, Int index );
+	void drawSingleGenericEvent( Int pixelX, Int pixelY, Int width, Int height, Int index );
+
+	void initializeTextureFormats( void );				///< find format to use for the radar texture
+	void deleteResources( void );									///< delete resources used
+	void drawEvents( Int pixelX, Int pixelY, Int width, Int height);		///< draw all of the radar events
+	void drawHeroIcon( Int pixelX, Int pixelY, Int width, Int height, const Coord3D *pos );	//< draw a hero icon
+	void drawViewBox( Int pixelX, Int pixelY, Int width, Int height );  ///< draw view box
+	void buildTerrainTexture( TerrainLogic *terrain );	 ///< create the terrain texture of the radar
+	void drawIcons( Int pixelX, Int pixelY, Int width, Int height );	///< draw all of the radar icons
+	void updateObjectTexture(TextureClass *texture);
+	static Bool canRenderObject( const RadarObject *rObj, const Player *localPlayer );
+	void renderObjectList( const RadarObject *listHead, TextureClass *texture );
+	void interpolateColorForHeight( RGBColor *color,
+																	Real height,
+																	Real hiZ,
+																	Real midZ,
+																	Real loZ );		///< "shade" color according to height value
+	void reconstructViewBox( void );							///< remake the view box
+	void radarToPixel( const ICoord2D *radar, ICoord2D *pixel,
+										 Int radarUpperLeftX, Int radarUpperLeftY,
+										 Int radarWidth, Int radarHeight );  ///< convert radar coord to pixel location
+
+	WW3DFormat m_terrainTextureFormat;						///< format to use for terrain texture
+	Image *m_terrainImage;												///< terrain image abstraction for drawing
+	TextureClass *m_terrainTexture;								///< terrain background texture
+
+	WW3DFormat m_overlayTextureFormat;						///< format to use for overlay texture
+	Image *m_overlayImage;												///< overlay image abstraction for drawing
+	TextureClass *m_overlayTexture;								///< overlay texture
+
+	WW3DFormat m_shroudTextureFormat;							///< format to use for shroud texture
+	Image *m_shroudImage;													///< shroud image abstraction for drawing
+	TextureClass *m_shroudTexture;								///< shroud texture
+
+	Int m_textureWidth;														///< width for all radar textures
+	Int m_textureHeight;													///< height for all radar textures
+
+	//
+	// we want to keep a flag that tells us when to reconstruct the view box, we want
+	// to reconstruct the box on map change, and when the camera changes height
+	// or orientation.  We want to avoid making the view box every frame because
+	// the 4 points visible on the edge of the screen will "jitter" unevenly as we
+	// translate real world coords to integer radar spots
+	//
+	Bool m_reconstructViewBox;										///< true when we need to reconstruct the box
+	Real m_viewAngle;															///< camera angle used for the view box we have
+	Real m_viewZoom;															///< camera zoom used for the view box we have
+	ICoord2D m_viewBox[ 4 ];											///< radar cell points for the 4 corners of view box
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h
similarity index 95%
rename from GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h
rename to Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h
index c6e7666271c..9d3469a36b1 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __BASE_HEIGHTMAP_H_
-#define __BASE_HEIGHTMAP_H_
-
 #include "always.h"
 #include "rendobj.h"
 #include "w3d_file.h"
@@ -38,7 +34,7 @@
 #include "vertmaterial.h"
 #include "Lib/BaseType.h"
 #include "Common/GameType.h"
-#include "WorldHeightMap.h"
+#include "W3DDevice/GameClient/WorldHeightMap.h"
 
 #define MAX_ENABLED_DYNAMIC_LIGHTS 20
 typedef UnsignedByte HeightSampleType;	//type of data to store in heightmap
@@ -66,7 +62,7 @@ typedef struct {
 } TBounds;
 
 
-class LightMapTerrainTextureClass; 
+class LightMapTerrainTextureClass;
 class CloudMapTerrainTextureClass;
 class W3DDynamicLight;
 
@@ -92,7 +88,7 @@ virtually everything to do with the terrain, including: drawing, lighting,
 scorchmarks and intersection tests.
 */
 class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHook, public Snapshot
-{	
+{
 
 public:
 
@@ -115,7 +111,7 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
 	virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;
 
 
-	virtual void					On_Frame_Update(void); 
+	virtual void					On_Frame_Update(void);
 	virtual void					Notify_Added(SceneClass * scene);
 
   // Other VIRTUAL methods. [3/20/2003]
@@ -130,26 +126,26 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
 	virtual void oversizeTerrain(Int tilesToOversize);
 	virtual void reset(void);
 
-  void redirectToHeightmap( WorldHeightMap *pMap ) 
+  void redirectToHeightmap( WorldHeightMap *pMap )
   {
     REF_PTR_RELEASE( m_map );
 	  REF_PTR_SET(m_map, pMap);	//update our heightmap pointer in case it changed since last call.
   }
 
 
-	inline UnsignedByte getClipHeight(Int x, Int y) const
+	UnsignedByte getClipHeight(Int x, Int y) const
 	{
 		Int xextent = m_map->getXExtent() - 1;
 		Int yextent = m_map->getYExtent() - 1;
 
-		if (x < 0) 
-			x = 0; 
-		else if (x > xextent) 
+		if (x < 0)
+			x = 0;
+		else if (x > xextent)
 			x = xextent;
 
-		if (y < 0) 
-			y = 0; 
-		else if (y > yextent) 
+		if (y < 0)
+			y = 0;
+		else if (y > yextent)
 			y = yextent;
 
 		return m_map->getDataPtr()[x + y*m_map->getXExtent()];
@@ -176,21 +172,21 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
 	void unitMoved( Object *unit );
 	void notifyShroudChanged(void);
 	void removeTreesAndPropsForConstruction(
-		const Coord3D* pos, 
+		const Coord3D* pos,
 		const GeometryInfo& geom,
 		Real angle
 	);
 
-	/// Add a bib at location.  
+	/// Add a bib at location.
 	void addTerrainBib(Vector3 corners[4], ObjectID id, Bool highlight);
 	void addTerrainBibDrawable(Vector3 corners[4], DrawableID id, Bool highlight);
-	/// Remove a bib.  
+	/// Remove a bib.
 	void removeTerrainBib(ObjectID id);
 	void removeTerrainBibDrawable(DrawableID id);
 
-	/// Removes all bibs.  
+	/// Removes all bibs.
 	void removeAllTerrainBibs(void);
-	/// Remove all highlighting.  
+	/// Remove all highlighting.
 	void removeTerrainBibHighlighting(void);
 
 	W3DShroud *getShroud()	{return m_shroud;}
@@ -220,12 +216,12 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
 	void setShowImpassableAreas(Bool show) {m_showImpassableAreas = show;}
 
 	Bool showAsVisibleCliff(Int xIndex, Int yIndex) const;
-	
+
 	Bool evaluateAsVisibleCliff(Int xIndex, Int yIndex, Real valuesGreaterThanRad);
 
 	Real getViewImpassableAreaSlope(void) const { return m_curImpassableSlope; }
 	void setViewImpassableAreaSlope(Real viewSlope) { m_curImpassableSlope = viewSlope; }
-	
+
 	Bool doesNeedFullUpdate(void) {return m_needFullUpdate;}
 
 
@@ -238,12 +234,12 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
 	virtual void loadPostProcess( void );
 
 protected:
-	Int	m_x;	///< dimensions of heightmap 
+	Int	m_x;	///< dimensions of heightmap
 	Int	m_y;	///< dimensions of heightmap
 
 #ifdef DO_SCORCH
-	enum { MAX_SCORCH_VERTEX=8194, 
-					MAX_SCORCH_INDEX=6*8194, 
+	enum { MAX_SCORCH_VERTEX=8194,
+					MAX_SCORCH_INDEX=6*8194,
 					MAX_SCORCH_MARKS=500,
 					SCORCH_MARKS_IN_TEXTURE=9,
 					SCORCH_PER_ROW = 3};
@@ -256,7 +252,7 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
 	Int			m_numScorches;
 
 	Int			m_scorchesInBuffer;		///< how many are in the buffers.  If less than numScorches, we need to update
-	
+
 	// NOTE: This argument (contrary to most of the rest of the engine), is in degrees, not radians.
 	Real		m_curImpassableSlope;
 
@@ -328,7 +324,8 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
 	void initDestAlphaLUT(void);	///<initialize water depth LUT stored in m_destAlphaTexture
 	void renderShoreLines(CameraClass *pCamera);	///<re-render parts of terrain that need custom blending into water edge
 	void renderShoreLinesSorted(CameraClass *pCamera);	///<optimized version for game usage.
+
+	static Bool useCloud();
 };
 
 extern BaseHeightMapRenderObjClass *TheTerrainRenderObject;
-#endif  // end __FLAT_HEIGHTMAP_H_
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h
new file mode 100644
index 00000000000..48e6bfe604e
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h
@@ -0,0 +1,107 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WWPhys                                                       *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwphys/camerashakesystem.h                   $*
+ *                                                                                             *
+ *              Original Author:: Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 7/13/00 4:06p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "always.h"
+#include "vector3.h"
+#include "multilist.h"
+#include "mempool.h"
+
+class CameraClass;
+
+/**
+** CameraShakeSystemClass
+** This class encapsulates all of the logic and data needed to implement camera "shakes"
+** These are used to simulate explosions, earthquakes, etc.
+*/
+class CameraShakeSystemClass
+{
+public:
+
+	CameraShakeSystemClass(void);
+	~CameraShakeSystemClass(void);
+
+	enum
+	{
+		FLAGS_NONE = 0,
+		FLAGS_IGNOREPOSITION,
+	};
+
+	void		Add_Camera_Shake(		const Vector3 & position,
+											float radius = 50.0f,
+											float duration = 1.5f,
+											float power = 1.0f	);
+	void		Timestep(float dt);
+	bool		IsCameraShaking(void);
+	void		Update_Camera_Shaker(Vector3 camera_position, Vector3 * shaker_angles);
+
+	/**
+	** CameraShakerClass
+	** This class encapsulates the current state of a camera shaker.  It is a multi-list object
+	** and is allocated in pools.
+	*/
+	class CameraShakerClass : public MultiListObjectClass, public AutoPoolClass<CameraShakerClass,256>
+	{
+	public:
+		CameraShakerClass(const Vector3 & position,float radius,float duration,float power);
+		~CameraShakerClass(void);
+
+		void					Timestep(float dt)							{ ElapsedTime += dt; }
+		bool					Is_Expired(void)								{ return (ElapsedTime >= Duration); }
+		void					Compute_Rotations(const Vector3 & pos,Vector3 * set_angles);
+
+	protected:
+
+		Vector3				Position;
+		float					Radius;
+		float					Duration;
+		float					Intensity;
+
+		float					ElapsedTime;
+		Vector3				Omega;
+		Vector3				Phi;
+	};
+
+protected:
+
+	MultiListClass<CameraShakerClass>	CameraShakerList;
+
+};
+
+extern CameraShakeSystemClass CameraShakerSystem; //WST 11/12/2002 This is the new Camera Shaker system upgrade
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h
similarity index 94%
rename from GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h
rename to Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h
index 8129e5cbe2a..7cbea55a47b 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __FLAT_HEIGHTMAP_H_
-#define __FLAT_HEIGHTMAP_H_
-
 #include "always.h"
 #include "rendobj.h"
 #include "w3d_file.h"
@@ -38,8 +34,8 @@
 #include "vertmaterial.h"
 #include "Lib/BaseType.h"
 #include "Common/GameType.h"
-#include "WorldHeightMap.h"
-#include "BaseHeightMap.h"
+#include "W3DDevice/GameClient/WorldHeightMap.h"
+#include "W3DDevice/GameClient/BaseHeightMap.h"
 
 class W3DTerrainBackground;
 /// Custom render object that draws the heightmap and handles intersection tests.
@@ -49,7 +45,7 @@ virtually everything to do with the terrain, including: drawing, lighting,
 scorchmarks and intersection tests.
 */
 class FlatHeightMapRenderObjClass : public BaseHeightMapRenderObjClass
-{	
+{
 
 public:
 
@@ -65,7 +61,7 @@ class FlatHeightMapRenderObjClass : public BaseHeightMapRenderObjClass
 	// Render Object Interface (W3D methods)
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void					Render(RenderInfoClass & rinfo);
-	virtual void					On_Frame_Update(void); 
+	virtual void					On_Frame_Update(void);
 
 	///allocate resources needed to render heightmap
 	virtual int initHeightData(Int width, Int height, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator,Bool updateExtraPassTiles=TRUE);
@@ -94,5 +90,3 @@ class FlatHeightMapRenderObjClass : public BaseHeightMapRenderObjClass
 	void releaseTiles(void);
 
 };
-
-#endif  // end __FLAT_HEIGHTMAP_H_
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h
new file mode 100644
index 00000000000..4e35b067290
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h
@@ -0,0 +1,119 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "always.h"
+#include "rendobj.h"
+#include "w3d_file.h"
+#include "dx8vertexbuffer.h"
+#include "dx8indexbuffer.h"
+#include "dx8wrapper.h"
+#include "shader.h"
+#include "vertmaterial.h"
+#include "Lib/BaseType.h"
+#include "Common/GameType.h"
+#include "W3DDevice/GameClient/WorldHeightMap.h"
+#include "W3DDevice/GameClient/BaseHeightMap.h"
+
+#define VERTEX_BUFFER_TILE_LENGTH	32		//tiles of side length 32 (grid of 33x33 vertices).
+
+// Adjust the triangles to make cliff sides most attractive.  jba.
+#define FLIP_TRIANGLES 1
+
+
+/// Custom render object that draws the heightmap and handles intersection tests.
+/**
+Custom W3D render object that's used to process the terrain.  It handles
+virtually everything to do with the terrain, including: drawing, lighting,
+scorchmarks and intersection tests.
+*/
+
+
+
+class HeightMapRenderObjClass : public BaseHeightMapRenderObjClass
+{
+
+public:
+
+	HeightMapRenderObjClass(void);
+	virtual ~HeightMapRenderObjClass(void);
+
+	// DX8_CleanupHook methods
+	virtual void ReleaseResources(void);	///< Release all dx8 resources so the device can be reset.
+	virtual void ReAcquireResources(void);  ///< Reacquire all resources after device reset.
+
+
+	/////////////////////////////////////////////////////////////////////////////
+	// Render Object Interface (W3D methods)
+	/////////////////////////////////////////////////////////////////////////////
+	virtual void					Render(RenderInfoClass & rinfo);
+	virtual void					On_Frame_Update(void);
+
+	///allocate resources needed to render heightmap
+	virtual int initHeightData(Int width, Int height, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator, Bool updateExtraPassTiles=TRUE);
+	virtual Int freeMapResources(void);	///< free resources used to render heightmap
+	virtual void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator);
+
+	virtual void staticLightingChanged(void);
+	virtual	void adjustTerrainLOD(Int adj);
+	virtual void reset(void);
+	virtual void doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator);
+
+	virtual void oversizeTerrain(Int tilesToOversize);
+
+	virtual int updateBlock(Int x0, Int y0, Int x1, Int y1, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator);
+
+protected:
+	Int *m_extraBlendTilePositions;	///<array holding x,y tile positions of all extra blend tiles. (used for 3 textures per tile).
+	Int m_numExtraBlendTiles;		///<number of blend tiles in m_extraBlendTilePositions.
+	Int	m_numVisibleExtraBlendTiles; ///<number rendered last frame.
+	Int m_extraBlendTilePositionsSize;	//<total size of array including unused memory.
+	DX8VertexBufferClass	**m_vertexBufferTiles;	///<collection of smaller vertex buffers that make up 1 heightmap
+	char	**m_vertexBufferBackup;	///< In memory copy of the vertex buffer data for quick update of dynamic lighting.
+	Int m_originX; ///<  Origin point in the grid.  Slides around.
+	Int m_originY; ///< Origin point in the grid.  Slides around.
+	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining triangles in a VB tile.
+	Int	m_numVBTilesX;	///<dimensions of array containing all the vertex buffers
+	Int	m_numVBTilesY;	///<dimensions of array containing all the vertex buffers
+	Int m_numVertexBufferTiles;	///<number of vertex buffers needed to store this heightmap
+	Int	m_numBlockColumnsInLastVB;///<a VB tile may be partially filled, this indicates how many 2x2 vertex blocks are filled.
+	Int	m_numBlockRowsInLastVB;///<a VB tile may be partially filled, this indicates how many 2x2 vertex blocks are filled.
+
+
+	UnsignedInt doTheDynamicLight(VERTEX_FORMAT *vb, VERTEX_FORMAT *vbMirror, Vector3*light, Vector3*normal, W3DDynamicLight *pLights[], Int numLights);
+	Int getXWithOrigin(Int x);
+	Int getYWithOrigin(Int x);
+	///update vertex diffuse color for dynamic lights inside given rectangle
+	Int updateVBForLight(DX8VertexBufferClass *pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights);
+	Int updateVBForLightOptimized(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights);
+	///update vertex buffer vertices inside given rectangle
+	Int updateVB(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator);
+	///upate vertex buffers associated with the given rectangle
+	void initDestAlphaLUT(void);	///<initialize water depth LUT stored in m_destAlphaTexture
+	void renderTerrainPass(CameraClass *pCamera);	///< renders additional terrain pass.
+	Int	getNumExtraBlendTiles(Bool visible) { return visible?m_numVisibleExtraBlendTiles:m_numExtraBlendTiles;}
+	void freeIndexVertexBuffers(void);
+	void renderExtraBlendTiles(void);	///< render 3-way blend tiles that have blend of 3 textures.
+};
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
new file mode 100644
index 00000000000..45d468e3ccb
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
@@ -0,0 +1,98 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DLaserDraw.h ///////////////////////////////////////////////////////////////////////////
+// Author:
+// Desc:
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "Common/DrawModule.h"
+//#include "WW3D2/Line3D.h"
+#include "GameClient/Color.h"
+
+class SegmentedLineClass;
+class TextureClass;
+
+class W3DLaserDrawModuleData : public ModuleData
+{
+public:
+
+  Color m_innerColor;
+  Color m_outerColor;
+	Real m_innerBeamWidth;
+	Real m_outerBeamWidth;
+	Real m_scrollRate;
+	Bool m_tile;
+  UnsignedInt m_numBeams;
+  UnsignedInt m_maxIntensityFrames;
+  UnsignedInt m_fadeFrames;
+	AsciiString m_textureName;
+	UnsignedInt m_segments;
+	Real m_arcHeight;
+	Real m_segmentOverlapRatio;
+	Real m_tilingScalar;
+
+	W3DLaserDrawModuleData();
+	~W3DLaserDrawModuleData();
+	static void buildFieldParse(MultiIniFieldParse& p);
+};
+
+//-------------------------------------------------------------------------------------------------
+/** W3D laser draw */
+//-------------------------------------------------------------------------------------------------
+class W3DLaserDraw : public DrawModule, public LaserDrawInterface
+{
+
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DLaserDraw, "W3DLaserDraw" )
+	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DLaserDraw, W3DLaserDrawModuleData )
+
+public:
+
+	W3DLaserDraw( Thing *thing, const ModuleData* moduleData );
+	// virtual destructor prototype provided by memory pool declaration
+
+	virtual void doDrawModule(const Matrix3D* transformMtx);
+	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.
+	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
+	virtual void setShadowsEnabled(Bool enable) { }
+	virtual void setFullyObscuredByShroud(Bool fullyObscured) { };
+	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle) { }
+	virtual void reactToGeometryChange() { }
+	virtual Bool isLaser() const { return true; }
+	Real getLaserTemplateWidth() const;
+
+	virtual LaserDrawInterface* getLaserDrawInterface() { return this; }
+	virtual const LaserDrawInterface* getLaserDrawInterface() const { return this; }
+
+protected:
+
+	SegmentedLineClass **m_line3D;  ///< line 3D for effect
+	TextureClass *m_texture;
+	Real m_textureAspectRatio;			///< aspect ratio of texture
+	Bool m_selfDirty;								// not saved
+
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h
similarity index 96%
rename from GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h
rename to Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h
index 8c06e10a01e..7222c39287a 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __W3DPropDraw_H_
-#define __W3DPropDraw_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "WW3D2/line3d.h"
@@ -65,7 +62,7 @@ class W3DPropDraw : public DrawModule
 
 	virtual void doDrawModule(const Matrix3D* transformMtx);
 	virtual void setShadowsEnabled(Bool enable) { }
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
+	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void setFullyObscuredByShroud(Bool fullyObscured) { }
 	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle);
@@ -75,6 +72,3 @@ class W3DPropDraw : public DrawModule
 	Bool m_propAdded;
 
 };
-
-#endif // __W3DPropDraw_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
similarity index 84%
rename from GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
rename to Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
index ff5c32a7fbf..9f0a0b3b7a0 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: W3DTreeDraw.h //////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:   
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __W3DTreeDraw_H_
-#define __W3DTreeDraw_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "WW3D2/line3d.h"
@@ -84,18 +81,16 @@ class W3DTreeDraw : public DrawModule
 	W3DTreeDraw( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void doDrawModule(const Matrix3D* transformMtx);
-	virtual void setShadowsEnabled(Bool enable) { }
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
-	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
-	virtual void setFullyObscuredByShroud(Bool fullyObscured) { }
-	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle);
-	virtual void reactToGeometryChange() { }
+	virtual void doDrawModule(const Matrix3D* transformMtx) {}
+	virtual void setShadowsEnabled(Bool enable) {}
+	virtual void releaseShadows(void) {}	///< we don't care about preserving temporary shadows.
+	virtual void allocateShadows(void) {}	///< we don't care about preserving temporary shadows.
+	virtual void setFullyObscuredByShroud(Bool fullyObscured) {}
+	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle) {}
+	virtual void reactToGeometryChange() {}
 
 protected:
-	Bool m_treeAdded;
-
-};
 
-#endif // __W3DTreeDraw_H_
+	void addToTreeBuffer();
 
+};
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h
new file mode 100644
index 00000000000..36af8873d00
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h
@@ -0,0 +1,143 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// TerrainTex.h
+// Class to generate texture for terrain.
+// Author: John Ahlquist, April 2001
+
+#pragma once
+
+//#define DO_8STAGE_TERRAIN_PASS		//optimized terrain rendering for Nvidia based cards
+
+#include "WW3D2/texture.h"
+#include "WWMath/matrix3d.h"
+#include "Common/AsciiString.h"
+
+class WorldHeightMap;
+#define TILE_OFFSET 8
+/** ***********************************************************************
+**                             TerrainTextureClass
+***************************************************************************/
+class TerrainTextureClass : public TextureClass
+{
+	W3DMPO_GLUE(TerrainTextureClass)
+protected:
+	virtual void Apply(unsigned int stage);
+
+public:
+		/// Create texture for a height map.
+		TerrainTextureClass(int height);
+
+		/// Create texture for a height map.
+		TerrainTextureClass(int height, int width);
+
+		// just use default destructor. ~TerrainTextureClass(void);
+public:
+	int update(WorldHeightMap *htMap); ///< Sets the pixels, and returns the actual height of the texture.
+	Bool updateFlat(WorldHeightMap *htMap, Int xCell, Int yCell, Int cellWidth, Int pixelsPerCell); ///< Sets the pixels.
+	void setLOD(Int LOD);
+};
+
+
+class AlphaTerrainTextureClass : public TextureClass
+{
+	W3DMPO_GLUE(AlphaTerrainTextureClass)
+protected:
+		virtual void Apply(unsigned int stage);
+public:
+		// Create texture for a height map.
+		AlphaTerrainTextureClass(TextureClass *pBaseTex );
+
+		// just use default destructor. ~TerrainTextureClass(void);
+
+};
+
+/** ***********************************************************************
+**                             AlphaEdgeTextureClass
+***************************************************************************/
+class AlphaEdgeTextureClass : public TextureClass
+{
+	W3DMPO_GLUE(AlphaEdgeTextureClass)
+protected:
+	virtual void Apply(unsigned int stage);
+	int update256(WorldHeightMap *htMap);///< Sets the pixels, and returns the actual height of the texture.
+
+public:
+		/// Create texture for a height map.
+		AlphaEdgeTextureClass(int height, MipCountType mipLevelCount = MIP_LEVELS_3 );
+
+		// just use default destructor. ~TerrainTextureClass(void);
+public:
+	int update(WorldHeightMap *htMap); ///< Sets the pixels, and returns the actual height of the texture.
+
+};
+
+class LightMapTerrainTextureClass : public TextureClass
+{
+	W3DMPO_GLUE(LightMapTerrainTextureClass)
+protected:
+		virtual void Apply(unsigned int stage);
+
+public:
+		// Create texture from a height map.
+		LightMapTerrainTextureClass( AsciiString name, MipCountType mipLevelCount = MIP_LEVELS_ALL );
+
+		// just use default destructor.
+};
+
+class ScorchTextureClass : public TextureClass
+{
+	W3DMPO_GLUE(ScorchTextureClass)
+protected:
+		virtual void Apply(unsigned int stage);
+
+public:
+		// Create texture.
+		ScorchTextureClass( MipCountType mipLevelCount = MIP_LEVELS_3 );
+
+		// just use default destructor. ~ScorchTextureClass(void);
+};
+
+class CloudMapTerrainTextureClass : public TextureClass
+{
+	W3DMPO_GLUE(CloudMapTerrainTextureClass)
+protected:
+		virtual void Apply(unsigned int stage);
+
+protected:
+		float m_xSlidePerSecond ;	 ///< How far the clouds move per second.
+		float m_ySlidePerSecond ;	 ///< How far the clouds move per second.
+		int	  m_curTick;
+		float m_xOffset;
+		float m_yOffset;
+
+
+public:
+		// Create texture from a height map.
+		CloudMapTerrainTextureClass( MipCountType mipLevelCount = MIP_LEVELS_ALL );
+
+		// just use default destructor. ~TerrainTextureClass(void);
+
+		void restore(void);
+};
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h
new file mode 100644
index 00000000000..7905a6def96
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h
@@ -0,0 +1,101 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// TileData.h
+// Class to hold 1 tile's data.
+// Author: John Ahlquist, April 2001
+
+#pragma once
+
+#include "Lib/BaseType.h"
+#include "WWLib/refcount.h"
+#include "Common/AsciiString.h"
+
+typedef struct {
+	Int blendNdx;
+	UnsignedByte horiz;
+	UnsignedByte vert;
+	UnsignedByte rightDiagonal;
+	UnsignedByte leftDiagonal;
+	UnsignedByte inverted;
+	UnsignedByte longDiagonal;
+	Int customBlendEdgeClass; // Class of texture for a blend edge.  -1 means use alpha.
+} TBlendTileInfo;
+
+#define INVERTED_MASK	0x1		//AND this with TBlendTileInfo.inverted to get actual inverted state
+#define FLIPPED_MASK	0x2		//AND this with TBlendTileInfo.inverted to get forced flip state (for horizontal/vertical flips).
+#define TILE_PIXEL_EXTENT 64
+#define TILE_BYTES_PER_PIXEL 4
+#define DATA_LEN_BYTES TILE_PIXEL_EXTENT*TILE_PIXEL_EXTENT*TILE_BYTES_PER_PIXEL
+#define DATA_LEN_PIXELS TILE_PIXEL_EXTENT*TILE_PIXEL_EXTENT
+#define TILE_PIXEL_EXTENT_MIP1 32
+#define TILE_PIXEL_EXTENT_MIP2 16
+#define TILE_PIXEL_EXTENT_MIP3 8
+#define TILE_PIXEL_EXTENT_MIP4 4
+#define TILE_PIXEL_EXTENT_MIP5 2
+#define TILE_PIXEL_EXTENT_MIP6 1
+#define TEXTURE_WIDTH 2048 // was 1024 jba
+
+/** This class holds the bitmap data from the .tga texture files.  It is used to
+create the D3D texture in the game and 3d windows, and to create DIB data for the
+2d window. */
+class TileData : public RefCountClass
+{
+protected:
+
+	// data is bgrabgrabgra to be compatible with windows blt. jba.
+	// Also, first byte is lower left pixel, not upper left pixel.
+	// so 0,0 is lower left, not upper left.
+	UnsignedByte m_tileData[DATA_LEN_BYTES];
+	/// Mipped down copies of the tile data.
+	UnsignedByte m_tileDataMip32[TILE_PIXEL_EXTENT_MIP1*TILE_PIXEL_EXTENT_MIP1*TILE_BYTES_PER_PIXEL];
+	UnsignedByte m_tileDataMip16[TILE_PIXEL_EXTENT_MIP2*TILE_PIXEL_EXTENT_MIP2*TILE_BYTES_PER_PIXEL];
+	UnsignedByte m_tileDataMip8[TILE_PIXEL_EXTENT_MIP3*TILE_PIXEL_EXTENT_MIP3*TILE_BYTES_PER_PIXEL];
+	UnsignedByte m_tileDataMip4[TILE_PIXEL_EXTENT_MIP4*TILE_PIXEL_EXTENT_MIP4*TILE_BYTES_PER_PIXEL];
+	UnsignedByte m_tileDataMip2[TILE_PIXEL_EXTENT_MIP5*TILE_PIXEL_EXTENT_MIP5*TILE_BYTES_PER_PIXEL];
+	UnsignedByte m_tileDataMip1[TILE_PIXEL_EXTENT_MIP6*TILE_PIXEL_EXTENT_MIP6*TILE_BYTES_PER_PIXEL];
+
+public:
+	ICoord2D	m_tileLocationInTexture;
+
+
+protected:
+	/** doMip - generates the next mip level mipping pHiRes down to pLoRes.
+				pLoRes is 1/2 the width of pHiRes, and both are square. */
+	static void doMip(UnsignedByte *pHiRes, Int hiRow, UnsignedByte *pLoRes);
+
+
+
+public:
+	TileData(void);
+
+public:
+	UnsignedByte *getDataPtr(void) {return(m_tileData);};
+	static Int dataLen(void) {return(DATA_LEN_BYTES);};
+
+	void updateMips(void);
+
+	Bool hasRGBDataForWidth(Int width);
+	UnsignedByte *getRGBDataForWidth(Int width);
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h
similarity index 88%
rename from GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h
rename to Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h
index f566d6d438f..bab5e660b78 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DPropBuffer.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,11 +44,8 @@
 
 #pragma once
 
-#ifndef __W3DPROP_BUFFER_H_
-#define __W3DPROP_BUFFER_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "always.h"
 #include "rendobj.h"
@@ -76,7 +73,7 @@ typedef struct {
 	RenderObjClass *m_robj;			///< Render object for this kind of prop.
 	Int					id;
 	Coord3D			location;			///< Drawing location
-	Int					propType;					///< Type of prop. Index into m_propTypes 
+	Int					propType;					///< Type of prop. Index into m_propTypes
 	ObjectShroudStatus ss;
 	Bool				visible;					///< Visible flag, updated each frame.
 	SphereClass bounds;				///< Bounding sphere for culling to set the visible flag.
@@ -94,7 +91,7 @@ typedef struct {
 //
 //
 class W3DPropBuffer : Snapshot
-{	
+{
 friend class BaseHeightMapRenderObjClass;
 
 
@@ -112,7 +109,7 @@ friend class BaseHeightMapRenderObjClass;
 	void notifyShroudChanged(void);
 
 	void removePropsForConstruction(
-		const Coord3D* pos, 
+		const Coord3D* pos,
 		const GeometryInfo& geom,
 		Real angle
 	);
@@ -144,10 +141,8 @@ friend class BaseHeightMapRenderObjClass;
 	TPropType m_propTypes[MAX_TYPES];	///< Info about a kind of prop.
 	Int			m_numPropTypes;						///< Number of entries in m_propTypes.
 	W3DShroudMaterialPassClass	*m_propShroudMaterialPass;	///< Custom render pass which applies shrouds to objects
-	
+
 	LightClass *m_light;
 
 	void cull(CameraClass * camera);						 ///< Culls the props.
 };
-
-#endif  // end __W3DPROP_BUFFER_H_
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
new file mode 100644
index 00000000000..90192607a4b
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
@@ -0,0 +1,253 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DShaderManager.h /////////////////////////////////////////////////////////
+//
+// Custom shader system that allows more options and easier device validation than
+// possible with W3D2.
+//
+// Author: Mark Wilczynski, August 2001
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "WW3D2/texture.h"
+enum FilterTypes CPP_11(: Int);
+enum FilterModes CPP_11(: Int);
+enum CustomScenePassModes CPP_11(: Int);
+enum StaticGameLODLevel CPP_11(: Int);
+enum ChipsetType CPP_11(: Int);
+enum CpuType CPP_11(: Int);
+enum GraphicsVenderID CPP_11(: Int);
+
+class TextureClass;	///forward reference
+/** System for managing complex rendering settings which are either not handled by
+	WW3D2 or need custom paths depending on the video card.  This system will determine
+	the proper shader given video card limitations and also allow the app to query the
+	hardware for specific features.
+*/
+class W3DShaderManager
+{
+public:
+
+	//put any custom shaders (not going through W3D) in here.
+	enum ShaderTypes
+	{	ST_INVALID,			//invalid shader type.
+		ST_TERRAIN_BASE,	//shader to apply base terrain texture only
+		ST_TERRAIN_BASE_NOISE1,	//shader to apply base texture and cloud/noise 1.
+		ST_TERRAIN_BASE_NOISE2,	//shader to apply base texture and cloud/noise 2.
+		ST_TERRAIN_BASE_NOISE12,//shader to apply base texture and both cloud/noise
+		ST_SHROUD_TEXTURE,		//shader to apply shroud texture projection.
+		ST_MASK_TEXTURE,		//shader to apply alpha mask texture projection.
+		ST_ROAD_BASE,	//shader to apply base terrain texture only
+		ST_ROAD_BASE_NOISE1,	//shader to apply base texture and cloud/noise 1.
+		ST_ROAD_BASE_NOISE2,	//shader to apply base texture and cloud/noise 2.
+		ST_ROAD_BASE_NOISE12,//shader to apply base texture and both cloud/noise
+		ST_CLOUD_TEXTURE,			//shader to project clouds.
+		ST_FLAT_TERRAIN_BASE,	//shader to apply base terrain texture only
+		ST_FLAT_TERRAIN_BASE_NOISE1,	//shader to apply base texture and cloud/noise 1.
+		ST_FLAT_TERRAIN_BASE_NOISE2,	//shader to apply base texture and cloud/noise 2.
+		ST_FLAT_TERRAIN_BASE_NOISE12,//shader to apply base texture and both cloud/noise
+		ST_FLAT_SHROUD_TEXTURE,		//shader to apply shroud texture projection.
+		ST_MAX
+	};
+
+
+	W3DShaderManager(void);	///<constructor
+	static void init( void );	///<determine optimal shaders for current device.
+	static void shutdown(void);	///<release resources used by shaders
+	static void updateCloud();	///<update the cloud position once every render frame.
+
+	static ChipsetType getChipset(void);	///<return current device chipset.
+	static GraphicsVenderID getCurrentVendor(void) {return m_currentVendor;}	///<return current card vendor.
+	static __int64 getCurrentDriverVersion(void) {return m_driverVersion; }	///<return current driver version.
+	static Int getShaderPasses(ShaderTypes shader);	///<rendering passes required for shader
+	static Int setShader(ShaderTypes shader, Int pass);	///<enable specific shader pass.
+	static Int setShroudTex(Int stage);	///<Set shroud in a texture stage.
+	static void resetShader(ShaderTypes shader);	///<make sure W3D2 gets restored to normal
+	///Specify all textures (up to 8) which can be accessed by the shaders.
+	static void setTexture(Int stage,TextureClass* texture) {m_Textures[stage]=texture;}
+	///Return current texture available to shaders.
+	static TextureClass *getShaderTexture(Int stage) { return m_Textures[stage];}	///<returns currently selected texture for given stage
+	///Return last activated shader.
+	static ShaderTypes getCurrentShader(void) {return m_currentShader;}
+	/// Loads a .vso file and creates a vertex shader for it
+	static HRESULT LoadAndCreateD3DShader(const char* strFilePath, const DWORD* pDeclaration, DWORD Usage, Bool ShaderType, DWORD* pHandle);
+
+	static Bool testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, MemValueType *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex);
+	static StaticGameLODLevel getGPUPerformanceIndex(void);
+	static Real GetCPUBenchTime(void);
+
+	// Filter methods
+	static Bool filterPreRender(FilterTypes filter, Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
+	static Bool filterPostRender(FilterTypes filter, FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
+	static Bool filterSetup(FilterTypes filter, FilterModes mode);
+
+	// Support routines for filter methods.
+	static Bool canRenderToTexture(void) { return (m_oldRenderSurface && m_newRenderSurface);}
+	static void startRenderToTexture(void); ///< Sets render target to texture.
+	static IDirect3DTexture8 * endRenderToTexture(void); ///< Ends render to texture, & returns texture.
+	static IDirect3DTexture8 * getRenderTexture(void);	///< returns last used render target texture
+	static Bool isRenderingToTexture(void) {return m_renderingToTexture; }
+	static void drawViewport(Int color);	///<draws 2 triangles covering the current tactical viewport
+
+
+protected:
+	static TextureClass *m_Textures[8];	///textures assigned to each of the possible stages
+	static ChipsetType m_currentChipset;	///<last video card chipset that was detected.
+	static GraphicsVenderID m_currentVendor;	///<last video card vendor
+	static __int64 m_driverVersion;			///<driver version of last chipset.
+	static ShaderTypes m_currentShader;	///<last shader that was set.
+	static Int m_currentShaderPass;		///<pass of last shader that was set.
+
+	static FilterTypes m_currentFilter; ///< Last filter that was set.
+	// Info for a render to texture surface for special effects.
+	static Bool m_renderingToTexture;
+	static IDirect3DSurface8 *m_oldRenderSurface;	///<previous render target
+	static IDirect3DTexture8 *m_renderTexture;		///<texture into which rendering will be redirected.
+	static IDirect3DSurface8 *m_newRenderSurface;	///<new render target inside m_renderTexture
+	static IDirect3DSurface8 *m_oldDepthSurface;	///<previous depth buffer surface
+
+
+};
+
+class W3DFilterInterface
+{
+public:
+	virtual Int init(void) = 0;			///<perform any one time initialization and validation
+	virtual Int shutdown(void) { return TRUE;};			///<release resources used by shader
+	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode) {skipRender=false; return false;} ///< Set up at start of render.  Only applies to screen filter shaders.
+	virtual Bool postRender(FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender){return false;} ///< Called after render.  Only applies to screen filter shaders.
+	virtual Bool setup(FilterModes mode){return false;} ///< Called when the filter is started, one time before the first prerender.
+protected:
+	virtual Int set(FilterModes mode) = 0;		///<setup shader for the specified rendering pass.
+	 ///do any custom resetting necessary to bring W3D in sync.
+	virtual void reset(void) = 0;
+};
+
+
+/*=========  ScreenMotionBlurFilter	=============================================================*/
+///applies motion blur to viewport.
+class ScreenMotionBlurFilter : public W3DFilterInterface
+{
+public:
+	virtual Int set(FilterModes mode);		///<setup shader for the specified rendering pass.
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	virtual Int shutdown(void);		///<release resources used by shader
+	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
+	virtual Bool postRender(FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
+	virtual Bool setup(FilterModes mode); ///< Called when the filter is started, one time before the first prerender.
+	ScreenMotionBlurFilter();
+
+	static void setZoomToPos(const Coord3D *pos) {m_zoomToPos = *pos; m_zoomToValid = true;}
+
+protected:
+	enum {MAX_COUNT = 60,
+				MAX_LIMIT = 30,
+				COUNT_STEP = 5,
+				DEFAULT_PAN_FACTOR = 30};
+	Int m_maxCount;
+	Int m_lastFrame;
+	Bool m_decrement;
+	Bool m_skipRender;
+	Bool m_additive;
+	Bool m_doZoomTo;
+	Coord2D m_priorDelta;
+	Int m_panFactor;
+
+
+	static Coord3D m_zoomToPos;
+	static Bool m_zoomToValid;
+} ;
+
+/*=========  ScreenBWFilter	=============================================================*/
+///converts viewport to black & white.
+class ScreenBWFilter : public W3DFilterInterface
+{
+	DWORD	m_dwBWPixelShader;		///<D3D handle to pixel shader which tints texture to black & white.
+public:
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual Int shutdown(void);		///<release resources used by shader
+	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
+	virtual Bool postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
+	virtual Bool setup(FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
+	static void setFadeParameters(Int fadeFrames, Int direction)
+	{
+		m_curFadeFrame = 0;
+		m_fadeFrames = fadeFrames;
+		m_fadeDirection = direction;
+	}
+protected:
+	virtual Int set(FilterModes mode);		///<setup shader for the specified rendering pass.
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	static Int m_fadeFrames;
+	static Int m_fadeDirection;
+	static Int m_curFadeFrame;
+	static Real m_curFadeValue;
+};
+
+class ScreenBWFilterDOT3 : public ScreenBWFilter
+{
+public:
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual Int shutdown(void);		///<release resources used by shader
+	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
+	virtual Bool postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
+	virtual Bool setup(FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
+protected:
+	virtual Int set(FilterModes mode);		///<setup shader for the specified rendering pass.
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+};
+
+/*=========  ScreenCrossFadeFilter	=============================================================*/
+///Fades between 2 different rendered frames.
+class ScreenCrossFadeFilter : public W3DFilterInterface
+{
+public:
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual Int shutdown(void);		///<release resources used by shader
+	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
+	virtual Bool postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
+	virtual Bool setup(FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
+	static void setFadeParameters(Int fadeFrames, Int direction)
+	{
+		m_curFadeFrame = 0;
+		m_fadeFrames = fadeFrames;
+		m_fadeDirection = direction;
+	}
+	static Real getCurrentFadeValue(void)	{ return m_curFadeValue;}
+	static TextureClass *getCurrentMaskTexture(void) { return m_fadePatternTexture;}
+protected:
+	virtual Int set(FilterModes mode);		///<setup shader for the specified rendering pass.
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	Bool updateFadeLevel(void);		///<updated current state of fade and return true if not finished.
+	static Int m_fadeFrames;
+	static Int m_fadeDirection;
+	static Int m_curFadeFrame;
+	static Real m_curFadeValue;
+	static Bool m_skipRender;
+	static TextureClass *m_fadePatternTexture;	///<shape/pattern of the fade
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSmudge.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DSmudge.h
similarity index 96%
rename from GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSmudge.h
rename to Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DSmudge.h
index 1239d03f7c0..22ef3802992 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSmudge.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DSmudge.h
@@ -20,9 +20,6 @@
 
 #pragma once
 
-#ifndef _W3DSMUDGE_H_
-#define _W3DSMUDGE_H_
-
 #include "GameClient/Smudge.h"
 #include "sharebuf.h"
 
@@ -65,5 +62,3 @@ class W3DSmudgeManager : public SmudgeManager
 	Int m_backBufferWidth;
 	Int m_backBufferHeight;
 };
-
-#endif	//_W3DSMUDGE_H_
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h
similarity index 97%
rename from GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h
rename to Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h
index e926fb7f168..e4a42351967 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h
@@ -18,8 +18,7 @@
 
 // FILE: W3DSnow.h /////////////////////////////////////////////////////////
 
-#ifndef _W3DSNOW_H_
-#define _W3DSNOW_H_
+#pragma once
 
 #include "GameClient/Snow.h"
 
@@ -39,7 +38,7 @@ class W3DSnowManager : public SnowManager
 	virtual void reset( void );
 	virtual void update ( void);
 	virtual void updateIniSettings(void);
-	
+
 	void	render(RenderInfoClass &rinfo);
 	void	renderAsQuads(RenderInfoClass &rinfo, Int cubeOriginX, Int cubeOriginY, Int cubeDimX, Int cubeDimY);
 	void	renderSubBox(RenderInfoClass &rinfo, Int originX, Int originY, Int cubeDimX, Int cubeDimY );
@@ -59,6 +58,3 @@ class W3DSnowManager : public SnowManager
 	Int m_totalRendered;	///<total number of snow particles rendered this frame - only for profiling.
 	Real m_cullOverscan;	///<how much extra padding to put on the sides of AABoxes when view culling.
 };
-
-#endif // _W3DSNOW_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainBackground.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainBackground.h
similarity index 87%
rename from GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainBackground.h
rename to Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainBackground.h
index 341c97d9383..0dda7d483f9 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainBackground.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainBackground.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DTerrainBackground.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,11 +44,8 @@
 
 #pragma once
 
-#ifndef __W3DTERRAIN_BUFFER_H_
-#define __W3DTERRAIN_BUFFER_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "always.h"
 #include "rendobj.h"
@@ -64,7 +61,7 @@
 //-----------------------------------------------------------------------------
 //           Forward References
 //-----------------------------------------------------------------------------
-class MeshClass; 
+class MeshClass;
 class WorldHeightMap;
 class TerrainTextureClass;
 
@@ -76,14 +73,14 @@ class TerrainTextureClass;
 // W3DTerrainBackground: Draw buffer for the bibs.
 //
 //
-class W3DTerrainBackground 
-{	
+class W3DTerrainBackground
+{
 friend class HeightMapRenderObjClass;
 public:
 
 	W3DTerrainBackground(void);
 	~W3DTerrainBackground(void);
-	/// Draws the terrain.  
+	/// Draws the terrain.
 	void drawVisiblePolys(RenderInfoClass & rinfo, Bool disableTextures);
 	void setFlip(WorldHeightMap *htMap); ///< Sets the flip bit for required vertices.
 	void doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, Bool doTextures );
@@ -124,5 +121,3 @@ friend class HeightMapRenderObjClass;
 	Bool advanceLeft(ICoord2D &left, Int xOffset, Int yOffset, Int width);
 	Bool advanceRight(ICoord2D &left, Int xOffset, Int yOffset, Int width);
 };
-
-#endif  // end __W3DTERRAIN_BUFFER_H_
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h
new file mode 100644
index 00000000000..f1477731bdb
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h
@@ -0,0 +1,155 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "always.h"
+#include "rendobj.h"
+#include "w3d_file.h"
+#include "dx8vertexbuffer.h"
+#include "dx8indexbuffer.h"
+#include "shader.h"
+#include "vertmaterial.h"
+#include "Lib/BaseType.h"
+
+#define MAX_TRACK_EDGE_COUNT	100	//maximum number of edges or divisions in track mark
+#define MAX_TRACK_OPAQUE_EDGE	25	//linear fade of edges will begin at this edge
+#define FADE_TIME_FRAMES 300000	// 300 seconds at 30 fps - time to fade out an edge and remove it from the system.
+
+class TerrainTracksRenderObjClassSystem;
+class Drawable;
+
+/// Custom render object that draws tracks on the terrain.
+/**
+This render object handles drawing tracks left by objects moving on the terrain.
+*/
+class TerrainTracksRenderObjClass : public W3DMPO, public RenderObjClass
+{
+	W3DMPO_GLUE(TerrainTracksRenderObjClass)
+
+	friend class TerrainTracksRenderObjClassSystem;
+
+public:
+
+	TerrainTracksRenderObjClass(void);
+	~TerrainTracksRenderObjClass(void);
+
+	/////////////////////////////////////////////////////////////////////////////
+	// Render Object Interface (W3D methods)
+	/////////////////////////////////////////////////////////////////////////////
+	virtual RenderObjClass *	Clone(void) const;
+	virtual int						Class_ID(void) const;
+	virtual void					Render(RenderInfoClass & rinfo);
+	virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;
+    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;
+
+	Int freeTerrainTracksResources(void);	///<free W3D assets used for this track
+	void init( Real width, Real length, const Char *texturename);	///<allocate W3D resources and set size
+	void addEdgeToTrack(Real x, Real y);	///< add a new segment to the track
+	void addCapEdgeToTrack(Real x, Real y);	///< cap the existing segment so we can resume at an unconnected position.
+	void setAirborne(void) {m_airborne = true; }	///< Starts a new section of track, generally after going airborne.
+	void setOwnerDrawable(const Drawable *owner) {m_ownerDrawable = owner;}
+
+protected:
+	TextureClass *m_stageZeroTexture;	///<primary texture
+	SphereClass	m_boundingSphere;		///<bounding sphere of TerrainTracks
+	AABoxClass	m_boundingBox;			///<bounding box of TerrainTracks
+	Int			m_activeEdgeCount;			///<number of active edges in segment list
+	Int			m_totalEdgesAdded;		///<number of edges ever added to this track
+	const Drawable	*m_ownerDrawable;	///<logical object that's laying down tread marks.
+
+	struct edgeInfo{
+		Vector3	endPointPos[2];			///<the 2 endpoints on the edge
+		Vector2	endPointUV[2];			///< uv coordinates at each end point
+		Int		timeAdded;				///< time when edge was created.
+		Real	alpha;					///< current alpha value for rendering
+	};
+
+	edgeInfo	m_edges[MAX_TRACK_EDGE_COUNT];	///<edges at each segment break
+	Vector3		m_lastAnchor;						///<location of last edge center
+	Int			m_bottomIndex;						///<points at oldest edge on track
+	Int			m_topIndex;						///<points to newest edge on track
+	Bool		m_haveAnchor;					///<set to false until first edge is added
+	Bool		m_bound;						///<object is bound to owner and accepts new edges
+	Real		m_width;						///<track width
+	Real		m_length;						///<length of each track segment
+	Bool		m_airborne;					///< Did the vehicle bounce up into the air?
+	Bool		m_haveCap;					///< is the segment capped so we can stop and resume at new location.
+	TerrainTracksRenderObjClass	*m_nextSystem;			///<next track system
+	TerrainTracksRenderObjClass *m_prevSystem;			///<previous track system
+};
+
+/// System for drawing, updating, and re-using tread mark render objects.
+/**
+This system keeps track of all the active track mark objects and reuses them
+when they expire.  It also renders all the track marks that were submitted in
+this frame.
+*/
+
+class TerrainTracksRenderObjClassSystem
+{
+	friend class TerrainTracksRenderObjClass;
+
+public:
+
+	TerrainTracksRenderObjClassSystem( void );
+	~TerrainTracksRenderObjClassSystem( void );
+
+	void ReleaseResources(void);	///< Release all dx8 resources so the device can be reset.
+	void ReAcquireResources(void);  ///< Reacquire all resources after device reset.
+
+	void setDetail(void);
+
+	void flush (void);	///<draw all tracks that were requested for rendering.
+	void update(void);	///<update the state of all edges (fade alpha, remove old, etc.)
+
+	void init( SceneClass *TerrainTracksScene);	///< pre-allocate track objects
+	void shutdown( void );		///< release all pre-allocated track objects, called by destructor
+	void Reset(void);	///<empties the system, ready for a new scene.
+
+	TerrainTracksRenderObjClass *bindTrack(RenderObjClass *renderObject, Real length, const Char *texturename);	///<track object to be controlled by owner
+	void unbindTrack( TerrainTracksRenderObjClass *mod );	///<releases control of track object
+
+protected:
+	DX8VertexBufferClass		*m_vertexBuffer;	///<vertex buffer used to draw all tracks
+	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining triangles in maximum length track
+	VertexMaterialClass	  	  *m_vertexMaterialClass;	///< vertex lighting material
+	ShaderClass m_shaderClass; ///<shader or rendering state for heightmap
+
+	TerrainTracksRenderObjClass *m_usedModules;	///<active objects being rendered in the scene
+	TerrainTracksRenderObjClass *m_freeModules;	//<unused modules that are free to use again
+	SceneClass	*m_TerrainTracksScene;		///<scene that will contain all the TerrainTracks
+
+	Int	m_edgesToFlush;			///< number of edges to flush on next render.
+
+	void releaseTrack( TerrainTracksRenderObjClass *mod );	///<returns track object to free store.
+	void clearTracks(void);	///<reset the amount of visible track marks of each object.
+
+	Int m_maxTankTrackEdges;	///<maximum length of tank track
+	Int m_maxTankTrackOpaqueEdges;	///<maximum length of tank track before it starts fading.
+	Int m_maxTankTrackFadeDelay;	///<maximum amount of time a tank track segment remains visible.
+
+};
+
+extern TerrainTracksRenderObjClassSystem *TheTerrainTracksRenderObjClassSystem; ///< singleton for track drawing system.
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h
new file mode 100644
index 00000000000..56f80c570e6
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h
@@ -0,0 +1,181 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DTerrainVisual.h ///////////////////////////////////////////////////////////////////////
+// W3D implementation details for visual aspects of terrain
+// Author: Colin Day, April 2001
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "GameClient/TerrainVisual.h"
+#include "W3DDevice/GameClient/W3DWater.h"
+
+// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
+class Matrix3D;
+class WaterHandle;
+class BaseHeightMapRenderObjClass;
+class WorldHeightMap;
+
+//-------------------------------------------------------------------------------------------------
+/** W3D impelmentation of visual terrain details singleton */
+//-------------------------------------------------------------------------------------------------
+class W3DTerrainVisual : public TerrainVisual
+{
+
+public:
+
+	W3DTerrainVisual();
+	virtual ~W3DTerrainVisual();
+
+	virtual void init( void );
+	virtual void reset( void );
+	virtual void update( void );
+
+	virtual Bool load( AsciiString filename );
+
+	void getTerrainColorAt( Real x, Real y, RGBColor *pColor );
+
+	/// get the terrain tile type at the world location in the (x,y) plane ignoring Z
+	TerrainType *getTerrainTile( Real x, Real y );
+
+	/** intersect the ray with the terrain, if a hit occurs TRUE is returned
+	and the result point on the terrain is returned in "result" */
+	virtual Bool intersectTerrain( Coord3D *rayStart, Coord3D *rayEnd, Coord3D *result );
+
+	//
+	// water methods
+	//
+	/// enable/disable the water grid
+	virtual void enableWaterGrid( Bool enable );
+	/// set min/max height values allowed in water grid pointed to by waterTable
+	virtual void setWaterGridHeightClamps( const WaterHandle *waterTable, Real minZ, Real maxZ );
+	/// adjust fallof parameters for grid change method
+	virtual void setWaterAttenuationFactors( const WaterHandle *waterTable,
+																					 Real a, Real b, Real c, Real range );
+	/// set the water table position and orientation in world space
+	virtual void setWaterTransform( const WaterHandle *waterTable,
+																	Real angle, Real x, Real y, Real z );
+	virtual void setWaterTransform( const Matrix3D *transform );
+	virtual void getWaterTransform( const WaterHandle *waterTable, Matrix3D *transform );
+	/// water grid resolution spacing
+	virtual void setWaterGridResolution( const WaterHandle *waterTable,
+																			 Real gridCellsX, Real gridCellsY, Real cellSize );
+	virtual void getWaterGridResolution( const WaterHandle *waterTable,
+																			 Real *gridCellsX, Real *gridCellsY, Real *cellSize );
+	/// adjust the water grid in world coords by the delta
+	virtual void changeWaterHeight( Real x, Real y, Real delta );
+	/// adjust the velocity at a water grid point corresponding to the world x,y
+	virtual void addWaterVelocity( Real worldX, Real worldY,
+																 Real velocity, Real preferredHeight );
+	virtual Bool getWaterGridHeight( Real worldX, Real worldY, Real *height);
+
+	virtual void setTerrainTracksDetail(void);
+	virtual void setShoreLineDetail(void);
+
+	/// Add a bib at location.
+	void addFactionBib(Object *factionBuilding, Bool highlight, Real extra = 0);
+	/// Remove a bib.
+	void removeFactionBib(Object *factionBuilding);
+
+	/// Add a bib at location.
+	void addFactionBibDrawable(Drawable *factionBuilding, Bool highlight, Real extra = 0);
+	/// Remove a bib.
+	void removeFactionBibDrawable(Drawable *factionBuilding);
+
+	virtual void removeAllBibs(void);
+	virtual void removeBibHighlighting(void);
+
+	virtual void addProp(const ThingTemplate *tt, const Coord3D *pos, Real angle);
+
+	virtual void removeTreesAndPropsForConstruction(
+		const Coord3D* pos,
+		const GeometryInfo& geom,
+		Real angle
+	);
+
+
+	//
+	// Modify height.
+	//
+	virtual void setRawMapHeight(const ICoord2D *gridPos, Int height);
+	virtual Int getRawMapHeight(const ICoord2D *gridPos);
+
+	/// Replace the skybox texture
+	virtual void replaceSkyboxTextures(const AsciiString *oldTexName[NumSkyboxTextures], const AsciiString *newTexName[NumSkyboxTextures]);
+
+  ////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////
+#ifdef DO_SEISMIC_SIMULATIONS
+  virtual void addSeismicSimulation( const SeismicSimulationNode& sim );
+#endif
+  WorldHeightMap* getLogicHeightMap( void ) {return m_logicHeightMap;};
+  WorldHeightMap* getClientHeightMap( void )
+  {
+#ifdef DO_SEISMIC_SIMULATIONS
+    return m_clientHeightMap;
+#else
+    return m_logicHeightMap;
+#endif
+  }
+  ////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////
+
+protected:
+
+	// snapshot methods
+	virtual void crc( Xfer *xfer );
+	virtual void xfer( Xfer *xfer );
+	virtual void loadPostProcess( void );
+
+#ifdef DO_SEISMIC_SIMULATIONS
+  ////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////
+  virtual void handleSeismicSimulations( void );
+  SeismicSimulationList m_seismicSimulationList;
+  virtual void updateSeismicSimulations( void ); /// walk the SeismicSimulationList and, well, do it.
+
+  ////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////
+#endif
+
+	BaseHeightMapRenderObjClass *m_terrainRenderObject;  ///< W3D render object for terrain
+	WaterRenderObjClass	*m_waterRenderObject;	///< W3D render object for water plane
+
+  WorldHeightMap *m_logicHeightMap;  ///< height map used for render obj building
+
+#ifdef DO_SEISMIC_SIMULATIONS
+  WorldHeightMap *m_clientHeightMap; ///< this is a workspace for animating the terrain elevations
+#endif
+
+	Bool m_isWaterGridRenderingEnabled;
+
+  AsciiString	m_currentSkyboxTexNames[NumSkyboxTextures];	///<store current texture names applied to skybox.
+	AsciiString m_initialSkyboxTexNames[NumSkyboxTextures];	///<store starting texture/default skybox textures.
+
+};
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h
new file mode 100644
index 00000000000..736c52f9a4a
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h
@@ -0,0 +1,285 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DTreeBuffer.h //////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:    RTS3
+//
+// File name:  W3DTreeBuffer.h
+//
+// Created:    John Ahlquist, May 2001
+//
+// Desc:       Draw buffer to handle all the trees in a scene.
+//
+//-----------------------------------------------------------------------------
+
+#pragma once
+
+//-----------------------------------------------------------------------------
+//           Includes
+//-----------------------------------------------------------------------------
+#include "always.h"
+#include "rendobj.h"
+#include "w3d_file.h"
+#include "texture.h"
+#include "dx8vertexbuffer.h"
+#include "dx8indexbuffer.h"
+#include "shader.h"
+#include "vertmaterial.h"
+#include "Lib/BaseType.h"
+#include "Common/GameType.h"
+#include "Common/AsciiString.h"
+#include "Common/GlobalData.h"
+
+//-----------------------------------------------------------------------------
+//           Forward References
+//-----------------------------------------------------------------------------
+class MeshClass;
+class W3DTreeBuffer;
+class TileData;
+class W3DTreeDrawModuleData;
+struct BreezeInfo;
+class GeometryInfo;
+class W3DProjectedShadow;
+
+//-----------------------------------------------------------------------------
+//           Type Defines
+//-----------------------------------------------------------------------------
+
+enum W3DToppleState CPP_11(: Int)
+{
+	TOPPLE_UPRIGHT = 0,
+	TOPPLE_FALLING,
+	TOPPLE_FOGGED,
+	TOPPLE_SHROUDED, // unused
+	TOPPLE_DOWN
+};
+/// The individual data for a tree.
+typedef struct {
+	Vector3 location;					///< Drawing location
+	Real		scale;						///< Scale at location.
+	Real		sin;							///< Sine of the rotation angle at location.
+	Real		cos;							///< Cosine of the rotation angle at location.
+	Int			treeType;					///< Type of tree.
+	Bool		visible;					///< Visible flag, updated each frame.
+	SphereClass bounds;				///< Bounding sphere for culling to set the visible flag.
+	Real		sortKey;					///< Sort key, essentially the distance along the look at vector.
+	DrawableID		drawableID;	///< Drawable this tree corresponds to.
+
+	Real		pushAside;
+	Real		pushAsideDelta;
+	Real		pushAsideSin;			///< Sine of the rotation angle at location.
+	Real		pushAsideCos;			///< Cosine of the rotation angle at location.
+	ObjectID pushAsideSource; ///< Unit that is pushing us aside.
+
+	UnsignedInt lastFrameUpdated; ///< Last frame push aside was updated.
+
+	Int			nextInPartition;
+
+	Int			swayType;					///< Which sway array entry we are using.
+
+	Int			firstIndex;				///< First index in the vertex buffer for this tree.
+	Int     bufferNdx;				///< Which vertex buffer this is in.
+
+	// Topple parameters. [7/7/2003]
+	Real					m_angularVelocity;				///< Velocity in degrees per frame (or is it radians per frame?)
+	Real					m_angularAcceleration;		///< Acceleration angularVelocity is increasing
+	Coord3D				m_toppleDirection;				///< Z-less direction we are toppling
+	W3DToppleState m_toppleState;						///< Stage this module is in.
+	Real					m_angularAccumulation;		///< How much have I rotated so I know when to bounce.
+	UnsignedInt		m_options;								///< topple options
+	Matrix3D			m_mtx;
+	Real					m_sinkFramesLeft;					///< Toppled trees sink into the terrain & disappear, how many frames left.
+
+} TTree;
+
+/// The individual data for a tree type.
+typedef struct {
+	MeshClass * m_mesh;			///< Mesh for this kind of tree.
+	SphereClass m_bounds;		///< Bounding boxes for the base tree models.
+	const W3DTreeDrawModuleData *m_data;
+	ICoord2D		m_textureOrigin; ///< Texture origin in the mega texture.
+	Int					m_numTiles;	///< Number of tex tiles.
+	Int					m_firstTile;///< First texture tile.
+	Int					m_tileWidth;///< Width in tiles of texture;
+	Bool				m_halfTile; ///< Tiles are 64x64 pixels, half tile supports a 32x32 bit texture.  Have to adjust the uv values.
+	Vector3			m_offset;
+	Real				m_shadowSize; ///< Shadow radius.
+	Bool				m_doShadow; ///< Draw shadow.
+
+} TTreeType;
+
+//
+// W3DTreeBuffer: Draw buffer for the trees.
+//
+// TheSuperHackers @info This class acts as a bootstrap for adding a new tree
+// instance to the tree buffer. It does not do anything useful until it is deleted.
+//
+class W3DTreeBuffer : public Snapshot
+{
+//friend class BaseHeightMapRenderObjClass;
+
+	//-----------------------------------------------------------------------------
+	//                             W3DTreeTextureClass
+	//-----------------------------------------------------------------------------
+	class W3DTreeTextureClass : public TextureClass
+	{
+		W3DMPO_GLUE(W3DTreeTextureClass)
+	protected:
+		virtual void Apply(unsigned int stage);
+
+	public:
+			/// Create texture.
+			W3DTreeTextureClass(unsigned width, unsigned height);
+
+			// just use default destructor. ~TerrainTextureClass(void);
+	public:
+		int update(W3DTreeBuffer *buffer); ///< Sets the pixels, and returns the actual height of the texture.
+		void setLOD(Int LOD) const;
+	};
+
+public:
+
+	W3DTreeBuffer(void);
+	~W3DTreeBuffer(void);
+	/// Add a tree at location.  Name is the w3d model name.
+	void addTree(DrawableID id, Coord3D location, Real scale, Real angle,
+								Real randomScaleAmount, const W3DTreeDrawModuleData *data);
+	/// Notify that an object moved, so check for collisions.
+	void unitMoved(Object *unit);
+	/// Add a type of tree.  Name is the w3d model name.
+	Int addTreeType(const W3DTreeDrawModuleData *data);
+	/// Updates a tree's location.
+	Bool updateTreePosition(DrawableID id, Coord3D location, Real angle);
+	void pushAsideTree( DrawableID id, const Coord3D *pusherPos,
+		const Coord3D *pusherDirection, ObjectID pusherID );
+	/// Remove a tree.
+	void removeTree(DrawableID id);
+	/// Remove trees that would be under a building.
+	void removeTreesForConstruction(
+		const Coord3D* pos,
+		const GeometryInfo& geom,
+		Real angle
+	);
+
+	void setTextureLOD(Int lod);	///<used to adjust maximum mip level sent to hardware.
+	/// Empties the tree buffer.
+	void clearAllTrees(void);
+	/// Empties the tree buffer.
+	void setBounds(const Region2D &bounds) {m_bounds = bounds;}
+	/// Draws the trees.  Uses camera for culling.
+	void drawTrees(CameraClass * camera, RefRenderObjListIterator *pDynamicLightsIterator);
+	/// Called when the view changes, and sort key needs to be recalculated.
+	/// Normally sortKey gets calculated when a tree becomes visible.
+	void doFullUpdate(void) {m_updateAllKeys = true;};
+	void setIsTerrain(void) {m_isTerrainPass = true;}; ///< Terrain calls this to tell trees to draw.
+	Bool needToDraw(void) {return m_isTerrainPass;};
+
+	Int getNumTiles(void) {return m_numTiles;}
+	TileData *getSourceTile(Int ndx) {return m_sourceTiles[ndx];}
+	void allocateTreeBuffers(void);							 ///< Allocates the buffers.
+	void freeTreeBuffers(void);									 ///< Frees the index and vertex buffers.
+
+private:
+	enum { MAX_TREE_VERTEX=30000,
+					MAX_TREE_INDEX=60000,
+					MAX_TREES=4000};
+	enum {MAX_TYPES = 64,
+				MAX_TILES = 512,
+				NUM_SWAY_ENTRIES = 100,
+				MAX_SWAY_TYPES = 10,
+				MAX_BUFFERS = 1,
+				SORT_ITERATIONS_PER_FRAME=10};
+	enum {PARTITION_WIDTH_HEIGHT = 100};
+	DX8VertexBufferClass	*m_vertexTree[MAX_BUFFERS];	///<Tree vertex buffer.
+	DX8IndexBufferClass			*m_indexTree[MAX_BUFFERS];	///<indices defining a triangles for the tree drawing.
+	DWORD					m_dwTreePixelShader;	///<handle to D3D pixel shader
+	DWORD					m_dwTreeVertexShader;	///<handle to D3D vertex shader
+
+	Short		m_areaPartition[PARTITION_WIDTH_HEIGHT*PARTITION_WIDTH_HEIGHT];
+	Region2D m_bounds;
+
+	TextureClass *m_treeTexture;	///<Trees texture
+	Int			m_textureWidth;				///<Width in pixels m_treeTexture;
+	Int			m_textureHeight;				///<Width in pixels m_treeTexture;
+	Int			m_curNumTreeVertices[MAX_BUFFERS]; ///<Number of vertices used in m_vertexTree.
+	Int			m_curNumTreeIndices[MAX_BUFFERS];	///<Number of indices used in b_indexTree;
+	TTree	m_trees[MAX_TREES];			///< The tree buffer.  All trees are stored here.
+	Int			m_numTrees;						///< Number of trees in m_trees.
+	Bool		m_anythingChanged;	///< Set to true if visibility or sorting changed.
+	Bool		m_anyPushChanged;		///< Set to true if push aside is active.
+	Bool		m_updateAllKeys;  ///< Set to true when the view changes.
+	Bool		m_initialized;		///< True if the subsystem initialized.
+	Bool		m_isTerrainPass;  ///< True if the terrain was drawn in this W3D scene render pass.
+	Bool		m_needToUpdateTexture; ///< True if we need to update the texture.
+	TTreeType m_treeTypes[MAX_TYPES];	///< Info about a kind of tree.
+	Int			m_numTreeTypes;						///< Number of entries in m_treeTypes.
+
+	Int			m_numTiles;
+	TileData			*m_sourceTiles[MAX_TILES];	///< Tiles for m_textureClasses
+	Vector3 m_cameraLookAtVector;
+	Vector3 m_swayOffsets[NUM_SWAY_ENTRIES];
+	Int			m_curSwayVersion;
+
+	Real		m_curSwayOffset[MAX_SWAY_TYPES];
+	Real		m_curSwayStep[MAX_SWAY_TYPES];
+	Real		m_curSwayFactor[MAX_SWAY_TYPES];
+
+	W3DProjectedShadow *m_shadow;
+
+protected:
+	// snapshot methods
+	virtual void crc( Xfer *xfer );
+	virtual void xfer( Xfer *xfer );
+	virtual void loadPostProcess( void );
+
+protected:
+	/// Updates the sway offsets.
+	void updateSway(const BreezeInfo& info);
+	void loadTreesInVertexAndIndexBuffers(RefRenderObjListIterator *pDynamicLightsIterator); ///< Fills the index and vertex buffers for drawing.
+	void updateVertexBuffer(void); ///< Fills the index and vertex buffers for drawing.
+	void cull(const CameraClass * camera);						 ///< Culls the trees.
+	UnsignedInt  doLighting(const Vector3 *normal,
+		const GlobalData::TerrainLighting	*objectLighting,
+		const Vector3 *emissive, UnsignedInt vertexDiffuse, Real scale) const;
+#if 0 // sort is no longer used and messes up the order. jba [6/6/2003]
+	void sort( Int iterations );								 ///< Performs partial bubble sort.
+#endif
+	void updateTexture(void);
+
+	Int  getPartitionBucket(const Coord3D &pos) const;
+
+	void updateTopplingTree(TTree *tree, Real timeScale);
+	void applyTopplingForce( TTree *tree, const Coord3D* toppleDirection, Real toppleSpeed,
+																			 UnsignedInt options );
+
+};
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h
new file mode 100644
index 00000000000..28bed8c6df3
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h
@@ -0,0 +1,99 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:    Generals
+//
+// File name:  W3DDevice/GameClient/W3DVideoBuffer.h
+//
+// Created:    10/23/01
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+//----------------------------------------------------------------------------
+//           Includes
+//----------------------------------------------------------------------------
+
+#include "GameClient/VideoPlayer.h"
+
+//----------------------------------------------------------------------------
+//           Forward References
+//----------------------------------------------------------------------------
+
+class TextureClass;
+class SurfaceClass;
+
+//----------------------------------------------------------------------------
+//           Type Defines
+//----------------------------------------------------------------------------
+
+//===============================
+// W3DVideoBuffer
+//===============================
+/**
+  * Video buffer interface class to a W3D TextureClass
+	*/
+//===============================
+
+
+class W3DVideoBuffer : public VideoBuffer
+{
+	protected:
+
+		TextureClass	*m_texture;
+		SurfaceClass	*m_surface;
+
+	public:
+
+		W3DVideoBuffer( Type format );
+		virtual ~W3DVideoBuffer();
+
+		virtual	Bool		allocate( UnsignedInt width, UnsignedInt height); ///< Allocates buffer
+		virtual void		free( void);					///< Free buffer
+		virtual	void*		lock( void );					///< Returns memory pointer to start of buffer
+		virtual void		unlock( void );				///< Release buffer
+		virtual Bool		valid( void );				///< Is the buffer valid to use
+
+		TextureClass		*texture( void );			///< Returns texture object
+
+		static WW3DFormat TypeToW3DFormat( VideoBuffer::Type format );
+		static VideoBuffer::Type W3DFormatToType( WW3DFormat w3dFormat );
+};
+
+
+//----------------------------------------------------------------------------
+//           Inlining
+//----------------------------------------------------------------------------
+
+inline TextureClass* W3DVideoBuffer::texture( void ) { return m_texture; }
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h
new file mode 100644
index 00000000000..df1dc768794
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h
@@ -0,0 +1,302 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DView.h ////////////////////////////////////////////////////////////////////////////////
+//
+// W3D implementation of the game view window.  View windows are literally
+// a window into the game world that have width, height, and camera
+// controls for what to look at
+//
+// Author: Colin Day, April 2001
+//
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+// SYSTEM INCLUDES ////////////////////////////////////////////////////////////////////////////////
+
+// USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
+#include "Common/STLTypedefs.h"
+#include "GameClient/ParabolicEase.h"
+#include "GameClient/View.h"
+#include "WW3D2/camera.h"
+
+// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
+class Drawable;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+enum {MAX_WAYPOINTS=25};
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+typedef struct
+{
+	Int			numWaypoints;
+	Coord3D	waypoints[MAX_WAYPOINTS+2];		// We pad first & last for interpolation.
+	Real		waySegLength[MAX_WAYPOINTS+2];	// Length of each segment;
+	Real		cameraAngle[MAX_WAYPOINTS+2];	// Camera Angle;
+	Int			timeMultiplier[MAX_WAYPOINTS+2];	// Time speedup factor.
+	Real		groundHeight[MAX_WAYPOINTS+1];	// Ground height.
+	Real		totalTimeMilliseconds;					// Num of ms to do this movement.
+	Real		elapsedTimeMilliseconds;				// Time since start.
+	Real		totalDistance;								// Total length of paths.
+	Real		curSegDistance;								// How far we are along the current seg.
+	Int			shutter;
+	Int			curSegment;										// The current segment.
+	Int			curShutter;										// The current shutter.
+	Int			rollingAverageFrames;					// Number of frames to roll.
+	ParabolicEase ease;										// Ease in/out function.
+} TMoveAlongWaypointPathInfo;
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+typedef struct
+{
+	Int			numFrames;						///< Number of frames to rotate.
+	Int			curFrame;							///< Current frame.
+	Int			startTimeMultiplier;
+	Int			endTimeMultiplier;
+	Int			numHoldFrames;				///< Number of frames to hold the camera before finishing the movement
+	ParabolicEase ease;
+	Bool		trackObject;					///< Are we tracking an object or just rotating?
+	struct Target {
+		ObjectID targetObjectID;			///< Target if we are tracking an object instead of just rotating
+		Coord3D	targetObjectPos;			///< Target's position (so we can stay looking at that spot if he dies)
+	};
+	struct Angle {
+		Real startAngle;
+		Real endAngle;
+	};
+	union {
+		Target target;
+		Angle angle;
+	};
+} TRotateCameraInfo;
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+typedef struct
+{
+	Int			numFrames;						///< Number of frames to pitch.
+	Int			curFrame;							///< Current frame.
+	Real		angle;
+	Real		startPitch;
+	Real		endPitch;
+	Int			startTimeMultiplier;
+	Int			endTimeMultiplier;
+	ParabolicEase ease;
+} TPitchCameraInfo;
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+typedef struct
+{
+	Int			numFrames;						///< Number of frames to zoom.
+	Int			curFrame;							///< Current frame.
+	Real		startZoom;
+	Real		endZoom;
+	Int			startTimeMultiplier;
+	Int			endTimeMultiplier;
+	ParabolicEase ease;
+} TZoomCameraInfo;
+
+// ------------------------------------------------------------------------------------------------
+/** W3DView implementation of the game view class.  This allows us to create
+  * a "window" into the game world that can be sized and contains controls
+	* for manipulating the camera */
+// ------------------------------------------------------------------------------------------------
+class W3DView : public View, public SubsystemInterface
+{
+
+public:
+	W3DView();
+	~W3DView();
+
+	virtual void init( void );  ///< init/re-init the W3DView
+	virtual void reset( void );
+	virtual void drawView( void );  ///< draw this view
+	virtual void updateView(void);	///<called once per frame to determine the final camera and object transforms
+	virtual void stepView(); ///< Update view for every fixed time step
+
+	virtual void draw( );  ///< draw this view
+	virtual void update( );	///<called once per frame to determine the final camera and object transforms
+
+	virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType );  ///< pick drawable given the screen pixel coords.  If force attack, picks bridges.
+
+	/// all drawables in the 2D screen region will call the 'callback'
+	virtual Int iterateDrawablesInRegion( IRegion2D *screenRegion,
+																Bool (*callback)( Drawable *draw, void *userData ),
+																void *userData );
+
+	virtual void setWidth( Int width );
+	virtual void setHeight( Int height );
+	virtual void setOrigin( Int x, Int y);			///< Sets location of top-left view corner on display
+
+	virtual void scrollBy( Coord2D *delta );  ///< Shift the view by the given delta
+
+	virtual void forceRedraw();
+
+	virtual void setAngle( Real angle );										///< Rotate the view around the up axis by the given angle
+	virtual void setPitch( Real angle );											///< Rotate the view around the horizontal axis to the given angle
+	virtual void setAngleAndPitchToDefault( void );							///< Set the view angle back to default
+
+	virtual void lookAt( const Coord3D *o );											///< Center the view on the given coordinate
+	virtual void initHeightForMap( void );												///<  Init the camera height for the map at the current position.
+	virtual void moveCameraTo(const Coord3D *o, Int miliseconds,  Int shutter, Bool orient, Real easeIn, Real easeOut);
+	virtual void moveCameraAlongWaypointPath(Waypoint *pWay, Int frames, Int shutter, Bool orient, Real easeIn, Real easeOut);
+	virtual Bool isCameraMovementFinished(void);
+	virtual Bool isCameraMovementAtWaypointAlongPath(void);
+ 	virtual void resetCamera(const Coord3D *location, Int frames, Real easeIn, Real easeOut);	///< Move camera to location, and reset to default angle & zoom.
+ 	virtual void rotateCamera(Real rotations, Int frames, Real easeIn, Real easeOut);					///< Rotate camera about current viewpoint.
+	virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut);	///< Rotate camera to face an object, and hold on it
+	virtual void rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds, Real easeIn, Real easeOut, Bool reverseRotation);	///< Rotate camera to face a location.
+	virtual void cameraModFreezeTime(void){ m_freezeTimeForCameraMovement = true;}					///< Freezes time during the next camera movement.
+	virtual void cameraModFreezeAngle(void);												///< Freezes time during the next camera movement.
+	virtual Bool isTimeFrozen(void){ return m_freezeTimeForCameraMovement;}					///< Freezes time during the next camera movement.
+	virtual void cameraModFinalZoom(Real finalZoom, Real easeIn, Real easeOut);	///< Final zoom for current camera movement.
+	virtual void cameraModRollingAverage(Int framesToAverage);			///< Number of frames to average movement for current camera movement.
+	virtual void cameraModFinalTimeMultiplier(Int finalMultiplier); ///< Final time multiplier for current camera movement.
+	virtual void cameraModFinalPitch(Real finalPitch, Real easeIn, Real easeOut);	///< Final pitch for current camera movement.
+	virtual void cameraModLookToward(Coord3D *pLoc);								///< Sets a look at point during camera movement.
+	virtual void cameraModFinalLookToward(Coord3D *pLoc);						///< Sets a look at point during camera movement.
+	virtual void cameraModFinalMoveTo(Coord3D *pLoc);			///< Sets a final move to.
+	// (gth) C&C3 animation controlled camera feature
+	virtual void cameraEnableSlaveMode(const AsciiString & thingtemplateName, const AsciiString & boneName);
+	virtual void cameraDisableSlaveMode(void);
+	virtual void cameraEnableRealZoomMode(void); //WST 10.18.2002
+	virtual void cameraDisableRealZoomMode(void);
+
+	virtual	void Add_Camera_Shake(const Coord3D & position,float radius, float duration, float power); //WST 10.18.2002
+	virtual Int	 getTimeMultiplier(void) {return m_timeMultiplier;};///< Get the time multiplier.
+	virtual void setTimeMultiplier(Int multiple) {m_timeMultiplier = multiple;}; ///< Set the time multiplier.
+	virtual void setDefaultView(Real pitch, Real angle, Real maxHeight);
+	virtual void zoomCamera( Real finalZoom, Int milliseconds, Real easeIn, Real easeOut );
+	virtual void pitchCamera( Real finalPitch, Int milliseconds, Real easeIn, Real easeOut );
+
+	virtual void setHeightAboveGround(Real z);
+	virtual void setZoom(Real z);
+	virtual void setZoomToDefault( void );									///< Set zoom to default value
+
+	virtual void setFieldOfView( Real angle );							///< Set the horizontal field of view angle
+
+  virtual WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s );	///< Transform world coordinate "w" into screen coordinate "s"
+	virtual void screenToWorld( const ICoord2D *s, Coord3D *w );	///< Transform screen coordinate "s" into world coordinate "w"
+	virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world );  ///< transform screen coord to a point on the 3D terrain
+	virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z );  ///< transform screen point to world point at the specified world Z value
+
+	CameraClass *get3DCamera() const { return m_3DCamera; }
+
+	virtual const Coord3D& get3DCameraPosition() const;
+
+	virtual void setCameraLock(ObjectID id);
+	virtual void setSnapMode( CameraLockType lockType, Real lockDist );
+
+	/// Add an impulse force to shake the camera
+	virtual void shake( const Coord3D *epicenter, CameraShakeType shakeType );
+
+	virtual Real getFXPitch( void ) const { return m_FXPitch; }					///< returns the FX pitch angle
+
+	virtual Bool setViewFilterMode(FilterModes filterMode);			///< Turns on viewport special effect (black & white mode)
+	virtual Bool setViewFilter(FilterTypes filter);			///< Turns on viewport special effect (black & white mode)
+	virtual void setViewFilterPos(const Coord3D *pos);			///<  Passes a position to the special effect filter.
+	virtual FilterModes getViewFilterMode(void) {return m_viewFilterMode;}			///< Turns on viewport special effect (black & white mode)
+	virtual FilterTypes getViewFilterType(void) {return m_viewFilter;}			///< Turns on viewport special effect (black & white mode)
+	virtual void setFadeParameters(Int fadeFrames, Int direction);
+	virtual void set3DWireFrameMode(Bool enable);	///<enables custom wireframe rendering of 3D viewport
+
+	Bool updateCameraMovements(void);
+	virtual void forceCameraConstraintRecalc(void) { calcCameraConstraints(); }
+
+	virtual void setGuardBandBias( const Coord2D *gb ) { m_guardBandBias.x = gb->x; m_guardBandBias.y = gb->y; }
+
+
+private:
+
+	CameraClass *m_3DCamera;												///< camera representation for 3D scene
+	CameraClass *m_2DCamera;												///< camera for UI overlayed on top of 3D scene
+	FilterModes m_viewFilterMode;
+	FilterTypes m_viewFilter;
+	Bool m_isWireFrameEnabled;
+	Bool m_nextWireFrameEnabled;											///< used to delay wireframe changes by 1 frame (needed for transitions).
+
+
+	Coord2D m_shakeOffset;													///< the offset to add to the camera position
+	Real m_shakeAngleCos;														///< the cosine of the orientation of the oscillation
+	Real m_shakeAngleSin;														///< the sine of the orientation of the oscillation
+	Real m_shakeIntensity;													///< the intensity of the oscillation
+	Vector3 m_shakerAngles;													//WST 11/12/2002 new multiple instance camera shaker system
+
+	TRotateCameraInfo	m_rcInfo;
+	Bool		m_doingRotateCamera;										///< True if we are doing a camera rotate.
+
+	TPitchCameraInfo m_pcInfo;
+	Bool m_doingPitchCamera;
+	TZoomCameraInfo m_zcInfo;
+	Bool m_doingZoomCamera;
+
+	Bool m_doingScriptedCameraLock;									///< True if we are following a unit via script
+
+	Real		m_FXPitch;															///< Camera effects pitch.  0 = flat, infinite = look down, 1 = normal.
+
+	TMoveAlongWaypointPathInfo m_mcwpInfo;					///< Move camera along waypoint path info.
+	Bool	m_doingMoveCameraOnWaypointPath;				///< If true, moving camera along waypoint path.
+	Bool	m_CameraArrivedAtWaypointOnPathFlag;
+
+	Bool		m_freezeTimeForCameraMovement;
+	Int			m_timeMultiplier;												///< Time speedup multiplier.
+
+	Bool		m_cameraHasMovedSinceRequest;					///< If true, throw out all saved locations
+	VecPosRequests	m_locationRequests;		///< These are cached. New requests are added here
+
+	Coord3D m_cameraOffset;													///< offset for camera from view center
+	Coord3D m_previousLookAtPosition;													///< offset for camera from view center
+	Coord2D m_scrollAmount;													///< scroll speed
+	Real m_scrollAmountCutoff;											///< scroll speed at which we do not adjust height
+
+	Real m_groundLevel;															///< height of ground.
+
+	Region2D m_cameraConstraint;										///< m_pos should be constrained to be within this area
+	Bool m_cameraConstraintValid;										///< if f, recalc cam constraints
+
+	void setCameraTransform( void );								///< set the transform matrix of m_3DCamera, based on m_pos & m_angle
+	void buildCameraTransform( Matrix3D *transform ) ;			///< calculate (but do not set) the transform matrix of m_3DCamera, based on m_pos & m_angle
+	void calcCameraConstraints() ;			///< recalc m_cameraConstraint
+	void moveAlongWaypointPath(Real milliseconds); ///< Move camera along path.
+	void getPickRay(const ICoord2D *screen, Vector3 *rayStart, Vector3 *rayEnd);	///<returns a line segment (ray) originating at the given screen position
+	void setupWaypointPath(Bool orient);					///< Calculates distances & angles for moving along a waypoint path.
+	void rotateCameraOneFrame(void);							///< Do one frame of a rotate camera movement.
+	void zoomCameraOneFrame(void);							///< Do one frame of a zoom camera movement.
+	void pitchCameraOneFrame(void);							///< Do one frame of a pitch camera movement.
+	void getAxisAlignedViewRegion(Region3D &axisAlignedRegion);	///< Find 3D Region enclosing all possible drawables.
+	void calcDeltaScroll(Coord2D &screenDelta);
+
+	// (gth) C&C3 animation controlled camera feature
+	Bool				m_isCameraSlaved;
+	Bool				m_useRealZoomCam;
+	AsciiString		m_cameraSlaveObjectName;
+	AsciiString		m_cameraSlaveObjectBoneName;
+};
+
+// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
+extern Real TheW3DFrameLengthInMsec;
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h
new file mode 100644
index 00000000000..86c15a96ef6
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h
@@ -0,0 +1,290 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DWater.h ///////////////////////////////////////////////////
+
+#pragma once
+
+#include "always.h"
+#include "rendobj.h"
+#include "w3d_file.h"
+#include "dx8vertexbuffer.h"
+#include "dx8indexbuffer.h"
+#include "shader.h"
+#include "vertmaterial.h"
+#include "light.h"
+#include "Lib/BaseType.h"
+#include "Common/GameType.h"
+#include "Common/Snapshot.h"
+
+#define INVALID_WATER_HEIGHT 0.0f	///water height guaranteed to be below all terrain.
+
+#define NUM_BUMP_FRAMES 32	///number of animation frames in bump map
+//Offsets in constant register file to Vertex shader constants
+#define CV_ZERO 0
+#define CV_ONE 1
+#define CV_WORLDVIEWPROJ_0 2
+#define CV_TEXPROJ_0 6
+#define CV_PATCH_SCALE_OFFSET 10
+
+class PolygonTrigger;
+class WaterTracksRenderSystem;
+class Xfer;
+/// Custom render object that draws mirrors, water, and skies.
+/**
+This render object handles drawing reflected W3D scenes.  It will only work
+with rectangular planar surfaces and was tuned with an emphasis on water.
+Since skies are only visible in reflections, this code will also
+render clouds and sky bodies.
+*/
+class WaterRenderObjClass : public Snapshot,
+														public RenderObjClass
+{
+
+public:
+
+	enum WaterType
+	{
+		WATER_TYPE_0_TRANSLUCENT = 0,	//translucent water, no reflection
+		WATER_TYPE_1_FB_REFLECTION,		//legacy frame buffer reflection (non translucent)
+		WATER_TYPE_2_PVSHADER,		//pixel/vertex shader, texture reflection
+		WATER_TYPE_3_GRIDMESH,		//3D Mesh based water
+	};
+
+	WaterRenderObjClass(void);
+	~WaterRenderObjClass(void);
+
+	/////////////////////////////////////////////////////////////////////////////
+	// Render Object Interface (W3D methods)
+	/////////////////////////////////////////////////////////////////////////////
+	virtual RenderObjClass *	Clone(void) const;
+	virtual int						Class_ID(void) const;
+	virtual void					Render(RenderInfoClass & rinfo);
+/// @todo: Add methods for collision detection with water surface
+//	virtual Bool					Cast_Ray(RayCollisionTestClass & raytest);
+//	virtual Bool					Cast_AABox(AABoxCollisionTestClass & boxtest);
+//	virtual Bool					Cast_OBBox(OBBoxCollisionTestClass & boxtest);
+//	virtual Bool					Intersect_AABox(AABoxIntersectionTestClass & boxtest);
+//	virtual Bool					Intersect_OBBox(OBBoxIntersectionTestClass & boxtest);
+
+	virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;
+    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;
+	// Get and set static sort level
+	virtual int		Get_Sort_Level(void) const		{ return m_sortLevel; }
+  	virtual void	Set_Sort_Level(int level)		{ m_sortLevel = level;}
+
+	///allocate W3D resources needed to render water
+	void renderWater(void);				///<draw the water surface (flat)
+	Int init(Real waterLevel, Real dx, Real dy, SceneClass *parentScene, WaterType type);
+	void reset( void );  ///< reset any resources we need to
+	void load(void);	///< load/setup any map dependent features
+	void update( void ); ///< update phase of the water
+	void enableWaterGrid(Bool state);	///< used to active custom water for special maps. (i.e DAM).
+	void updateMapOverrides(void);	///< used to update any map specific map overrides for water appearance.
+	void setTimeOfDay(TimeOfDay tod); ///<change sky/water for time of day
+	void toggleCloudLayer(Bool state)	{	m_useCloudLayer=state;}	///<enables/disables the cloud layer
+	void updateRenderTargetTextures(CameraClass *cam);	///< renders into any required textures.
+	void ReleaseResources(void);	///< Release all dx8 resources so the device can be reset.
+	void ReAcquireResources(void);  ///< Reacquire all resources after device reset.
+	Real getWaterHeight(Real x, Real y);	///<return water height at given point - for use by WB.
+	void setGridHeightClamps(Real minz, Real maxz);	///<set min/max height values alllowed in grid
+	void addVelocity( Real worldX, Real worldY, Real zVelocity, Real preferredHeight );	///< add velocity value
+	void changeGridHeight(Real x, Real y, Real delta);	///<change height of grid at world point including neighbors within falloff.
+	void setGridChangeAttenuationFactors(Real a, Real b, Real c, Real range);	///<adjust falloff parameters for grid change method.
+	void setGridTransform(Real angle, Real x, Real y, Real z);	///<positoin/orientation of grid in space
+	void setGridTransform(const Matrix3D *transform);	///< set transform by matrix
+	void getGridTransform(Matrix3D *transform);	///< get grid transform matrix
+	void setGridResolution(Real gridCellsX, Real gridCellsY, Real cellSize);	///<grid resolution and spacing
+	void getGridResolution(Real *gridCellsX, Real *gridCellsY, Real *cellSize);  ///<get grid resolution params
+	inline void setGridVertexHeight(Int x, Int y, Real value);
+	void getGridVertexHeight(Int x, Int y, Real *value)
+	{	if (m_meshData)	*value=m_meshData[(y+1)*(m_gridCellsX+1+2)+x+1].height+ Get_Position().Z;}
+	inline Bool worldToGridSpace(Real worldX, Real worldY, Real &gridX, Real &gridY);	///<convert from world coordinates to grid's local coordinate system.
+
+	void replaceSkyboxTexture(const AsciiString& oldTexName, const AsciiString& newTextName);
+
+protected:
+	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining quad
+	SceneClass							*m_parentScene;	///<scene to be reflected
+	ShaderClass m_shaderClass; ///<shader or rendering state for heightmap
+	VertexMaterialClass	  		*m_vertexMaterialClass;	///<vertex lighting material
+	VertexMaterialClass			*m_meshVertexMaterialClass; ///<vertex lighting marial for 3D water.
+	LightClass					*m_meshLight;				///<light used for 3D Mesh Water.
+	TextureClass *m_alphaClippingTexture;	///<used for faked clipping using alpha
+	Real	m_dx;	///<x extent of water surface (offset from local center)
+	Real	m_dy;	///<y extent of water surface (offset from local center)
+	Vector3 m_planeNormal;		///<water plane normal
+	Real		m_planeDistance;	///<water plane distance
+	Real		m_level;			///<level of water (hack for water)
+	Real		m_uOffset;			///<current texture offset on u axis
+	Real		m_vOffset;			///<current texture offset on v axis
+	Real		m_uScrollPerMs;		///<texels per/ms scroll rate in u direction
+	Real		m_vScrollPerMs;		///<texels per/ms scroll rate in v direction
+	Int			m_LastUpdateTime;	///<time of last cloud update
+	Bool		m_useCloudLayer;	///<flag if clouds are on/off
+	WaterType	m_waterType;		///<type of water being used
+	Int			m_sortLevel;		///<sort order after main scene is rendered
+
+	//Data used in GeForce3 bump-mapped water (uses direct D3D resources for better
+	//performance and compatibility (most of these featues are not supported by W3D).
+	struct SEA_PATCH_VERTEX	//vertex structure passed to D3D
+	{
+		float x,y,z;
+		unsigned int c;
+		float tu, tv;
+	};
+
+	LPDIRECT3DDEVICE8 m_pDev;						///<pointer to D3D Device
+	LPDIRECT3DVERTEXBUFFER8 m_vertexBufferD3D;		///<D3D vertex buffer
+	LPDIRECT3DINDEXBUFFER8	m_indexBufferD3D;	///<D3D index buffer
+	Int						m_vertexBufferD3DOffset;	///<location to start writing vertices
+	DWORD					m_dwWavePixelShader;	///<handle to D3D pixel shader
+	DWORD					m_dwWaveVertexShader;	///<handle to D3D vertex shader
+	Int	m_numVertices;				///<number of vertices in D3D vertex buffer
+	Int m_numIndices;				///<number of indices in D3D index buffer
+	LPDIRECT3DTEXTURE8 m_pBumpTexture[NUM_BUMP_FRAMES]; ///<animation frames
+	LPDIRECT3DTEXTURE8 m_pBumpTexture2[NUM_BUMP_FRAMES]; ///<animation frames
+	Real				m_fBumpFrame;	///<current animation frame
+	Real				m_fBumpScale;	///<scales bump map uv perturbation
+	TextureClass * m_pReflectionTexture;	///<render target for reflection
+	RenderObjClass	*m_skyBox;		///<box around level
+	WaterTracksRenderSystem *m_waterTrackSystem;	///<object responsible for rendering water wakes
+
+	enum WaterMeshStatus
+	{
+		AT_REST = 0x00,
+		IN_MOTION = 0x01
+	};
+	struct WaterMeshData
+	{
+		Real height;										///< height of the 3D mesh at this point
+		Real velocity;									///< velocity in Z that this point is moving up and down
+		UnsignedByte status;						///< status for this grid point
+		UnsignedByte preferredHeight;		///< the hight we prefer to be
+	};
+	WaterMeshData *m_meshData;  ///< heightmap data for 3D Mesh based water.
+	UnsignedInt m_meshDataSize;	///< size of m_meshData
+	Bool m_meshInMotion;				///< TRUE once we've messed with velocities and are in motion
+	Bool m_doWaterGrid;	///< allows/prevents water grid rendering.
+
+	Vector2	m_gridDirectionX;			///<vector along water grid's x-axis (scaled to world-space)
+	Vector2	m_gridDirectionY;			///<vector along water grid's y-axis (scaled to world-space)
+	Vector2	m_gridOrigin;				///<unit vector along water grid's x-axis
+	Real m_gridWidth;					///<object-space width of water grid
+	Real m_gridHeight;					///<object-space width of water grid
+	Real m_minGridHeight;				///<minimum height value allowed for water mesh
+	Real m_maxGridHeight;				///<maximum height value allowed for water mesh
+	Real m_gridChangeMaxRange;			///<maximum range of changeGridHeight() method
+	Real m_gridChangeAtt0;
+	Real m_gridChangeAtt1;
+	Real m_gridChangeAtt2;
+	Real m_gridCellSize;				///<world-space width/height of each cell.
+	Int  m_gridCellsX;					///<number of cells along width
+	Int  m_gridCellsY;					///<number of cells along height
+
+	Real m_riverVOrigin;
+	TextureClass *m_riverTexture;
+	TextureClass *m_whiteTexture;		///< a texture containing only white used for NULL pixel shader stages.
+	TextureClass *m_waterNoiseTexture;
+	DWORD	m_waterPixelShader;		///<D3D handle to pixel shader.
+	DWORD	m_riverWaterPixelShader;		///<D3D handle to pixel shader.
+	DWORD	m_trapezoidWaterPixelShader;	///<handle to D3D vertex shader
+	TextureClass *m_waterSparklesTexture;
+	Real m_riverXOffset;
+	Real m_riverYOffset;
+	Bool m_drawingRiver;
+	Bool m_disableRiver;
+	TextureClass *m_riverAlphaEdge;
+
+	TimeOfDay m_tod;	///<time of day setting for reflected cloud layer
+
+	struct Setting
+	{
+		TextureClass	*skyTexture;
+		TextureClass	*waterTexture;
+		Int				waterRepeatCount;
+		Real			skyTexelsPerUnit;	//texel density of sky plane (higher value repeats texture more).
+		DWORD			vertex00Diffuse;
+		DWORD			vertex10Diffuse;
+		DWORD			vertex11Diffuse;
+		DWORD			vertex01Diffuse;
+		DWORD			waterDiffuse;
+		DWORD			transparentWaterDiffuse;
+		Real			uScrollPerMs;
+		Real			vScrollPerMs;
+	};
+
+	Setting m_settings[ TIME_OF_DAY_COUNT ];	///< settings for each time of day
+	void drawRiverWater(PolygonTrigger *pTrig);
+	void drawTrapezoidWater(Vector3 points[4]);
+	void loadSetting ( Setting *skySetting, TimeOfDay timeOfDay );	///<init sky/water settings from GDF
+	void renderSky(void);	///<draw the sky layer (clouds, stars, etc.)
+	void testCurvedWater(void);	///<draw the sky layer (clouds, stars, etc.)
+	void renderSkyBody(Matrix3D *mat);	///<draw the sky body (sun, moon, etc.)
+	void renderWaterMesh(void);			///<draw the water surface mesh (deformed 3d mesh).
+	HRESULT initBumpMap(LPDIRECT3DTEXTURE8 *pTex, TextureClass *pBumpSource);	///<copies data into bump-map format.
+	void renderMirror(CameraClass *cam);	///< Draw reflected scene into texture
+	void drawSea(RenderInfoClass & rinfo);	///< Draw the surface of the water
+	///bounding box of frustum clipped polygon plane
+	Bool getClippedWaterPlane(CameraClass *cam, AABoxClass *box);
+
+	void setupFlatWaterShader(void);
+	void setupJbaWaterShader(void);
+	void cleanupJbaWaterShader(void);
+
+	//Methods used for GeForce3 specific water
+	HRESULT generateIndexBuffer(int sizeX, int sizeY);	///<Generate static index buufer
+	HRESULT generateVertexBuffer( Int sizeX, Int sizeY, Int vertexSize, Bool doFill);///<Generate static vertex buffer
+
+	// snapshot methods for save/load
+	virtual void crc( Xfer *xfer );
+	virtual void xfer( Xfer *xfer );
+	virtual void loadPostProcess( void );
+
+};
+
+//Public inline function declarations
+inline Bool WaterRenderObjClass::worldToGridSpace(Real worldX, Real worldY, Real &gridX, Real &gridY)
+{
+	Real dx,dy;
+	Real ooGridCellSize = 1.0f/m_gridCellSize;
+
+	dx=worldX - m_gridOrigin.X;
+	dy=worldY - m_gridOrigin.Y;
+	gridX = ooGridCellSize * (dx * m_gridDirectionX.X + dy * m_gridDirectionX.Y);
+	gridY = ooGridCellSize * (dx * m_gridDirectionY.X + dy * m_gridDirectionY.Y);
+
+	if (gridX < 0)
+		return FALSE;
+	if (gridX > m_gridCellsX-1 )
+		return FALSE;
+	if (gridY < 0)
+		return FALSE;
+	if (gridY > m_gridCellsY-1 )
+		return FALSE;
+
+	return TRUE;
+}
+
+extern WaterRenderObjClass *TheWaterRenderObj; ///<global water rendering object
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h
new file mode 100644
index 00000000000..7ca19b39fbd
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h
@@ -0,0 +1,140 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+enum waveType CPP_11(: Int);	//forward reference
+
+/// Custom render object that draws animated tracks/waves on the water.
+/**
+	This is an object which draws a small breaking wave or splash animation.  These objects are
+	to be managed/accessed only by the WaterTracksRenderObjClassSystem
+*/
+class WaterTracksObj
+{
+	friend class WaterTracksRenderSystem;
+
+public:
+
+	WaterTracksObj(void);
+	~WaterTracksObj(void);
+
+	virtual void					Render(void) {};	///<draw this object
+	virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;	///<bounding sphere of this object
+    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;		///<bounding box of this object
+
+	Int freeWaterTracksResources(void);	///<free W3D assets used for this track
+	void init( Real width, Real length, const Vector2 &start, const Vector2 &end, const Char *texturename, Int waveTimeOffset);	///<allocate W3D resources and set size
+	void init( Real width, const Vector2 &start, const Vector2 &end, const Char *texturename);	///<allocate W3D resources and set size
+	Int	update(Int msElapsed);	///< update animation state
+	Int render(DX8VertexBufferClass	*vertexBuffer, Int batchStart);	///<draw this object
+
+protected:
+	TextureClass *m_stageZeroTexture;	///<primary texture
+	SphereClass	m_boundingSphere;		///<bounding sphere of WaterTracks
+	AABoxClass	m_boundingBox;			///<bounding box of WaterTracks
+
+	waveType	m_type;					///<used for render state sorting (set this to texture pointer for now).
+	Int			m_x;					///<vertex count
+	Int			m_y;					///<vertex count
+	Bool		m_bound;				///<object is bound to owner and accepts new edges
+	Vector2		m_startPos;				///<starting position of wave
+//	Vector2		m_endPos;				///<ending position of wave
+	Vector2		m_waveDir;				///<direction of wave travel
+	Vector2		m_perpDir;				///<direction perpendicular to wave travel
+	Vector2		m_initStartPos;			///<original settings used to create wave
+	Vector2		m_initEndPos;			///<original settings used to create wave
+	Int			m_initTimeOffset;		///<time offset when wave is added into the system
+	Int		m_fadeMs;				///<time for wave to fade out after it stops moving
+	Int		m_totalMs;				///<amount of time to complete full motion
+	Int			m_elapsedMs;			///<amount of time since start of motion
+
+	//New version
+	Real	m_waveInitialWidth;				///<width of wave segment when it first appears
+	Real	m_waveInitialHeight;			///<height of wave segment when it first appears
+	Real	m_waveFinalWidth;				///<width of wave segment at full size
+	Real	m_waveFinalWidthPeakFrac;		///<fraction along path when wave reaches full width
+	Real	m_waveFinalHeight;				///<final height of unstretched wave
+
+	Real m_initialVelocity;	//initial velocity in world units per ms.
+	Real m_waveDistance;		//<total distance traveled by wave front.
+	Real m_timeToReachBeach;
+	Real m_frontSlowDownAcc;
+	Real m_timeToStop;
+	Real m_timeToRetreat;
+	Real m_backSlowDownAcc;
+	Real m_timeToCompress;
+	Real m_flipU;			///<force uv coordinates to flip
+
+	WaterTracksObj	*m_nextSystem;			///<next track in system
+	WaterTracksObj *m_prevSystem;			///<previous track in system
+};
+
+/// System for drawing, updating, and re-using water mark render objects.
+/**
+This system keeps track of all the active track mark objects and reuses them
+when they expire.  It also renders all the track marks that were submitted in
+this frame.
+*/
+
+class WaterTracksRenderSystem
+{
+	friend class WaterTracksObj;
+
+public:
+
+	WaterTracksRenderSystem( void );
+	~WaterTracksRenderSystem( void );
+
+	void ReleaseResources(void);	///< Release all dx8 resources so the device can be reset.
+	void ReAcquireResources(void);  ///< Reacquire all resources after device reset.
+
+	void flush (RenderInfoClass & rinfo);	///<draw all tracks that were requested for rendering.
+	void update(void);	///<update the state of all edges (fade alpha, remove old, etc.)
+
+	void init(void);	///< pre-allocate track objects
+	void shutdown( void );		///< release all pre-allocated track objects, called by destructor
+	void reset(void);			///< free all map dependent items.
+
+	WaterTracksObj *bindTrack(waveType type);	///<track object to be controlled by owner
+	void unbindTrack( WaterTracksObj *mod );	///<releases control of track object
+	void saveTracks(void);									///<save all used tracks to disk
+	void loadTracks(void);									///<load tracks from disk
+	WaterTracksObj *findTrack(Vector2 &start, Vector2 &end, waveType type);
+
+protected:
+	DX8VertexBufferClass		*m_vertexBuffer;	///<vertex buffer used to draw all tracks
+	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining triangles in maximum length track
+	VertexMaterialClass	  	  *m_vertexMaterialClass;	///< vertex lighting material
+	ShaderClass m_shaderClass; ///<shader or rendering state for heightmap
+
+	WaterTracksObj *m_usedModules;	///<active objects being rendered in the scene
+	WaterTracksObj *m_freeModules;	//<unused modules that are free to use again
+
+	Int		m_stripSizeX;			///< resolution (vertex count) of wave strip
+	Int		m_stripSizeY;			///< resolution (vertex count) of wave strip
+	Int		m_batchStart;			///< start of unused vertices in vertex buffer
+	Real	m_level;				///< water level
+	void releaseTrack( WaterTracksObj *mod );	///<returns track object to free store.
+};
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h
new file mode 100644
index 00000000000..932edf2a7a5
--- /dev/null
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h
@@ -0,0 +1,319 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+
+// WorldHeightMap.h
+// Class to encapsulate height map.
+// Author: John Ahlquist, April 2001
+
+#pragma once
+
+#include "Lib/BaseType.h"
+#include "WWLib/refcount.h"
+#include "WWMath/vector3.h"
+#include "W3DDevice/GameClient/TileData.h"
+#include "Common/MapObject.h"
+
+#include "Common/STLTypedefs.h"
+typedef std::vector<ICoord2D> VecICoord2D;
+
+
+/** MapObject class
+Not ref counted.  Do not store pointers to this class.  */
+
+#define K_MIN_HEIGHT  0
+#define K_MAX_HEIGHT  255
+
+#define NUM_SOURCE_TILES 1024
+#define NUM_BLEND_TILES 16192
+#define NUM_CLIFF_INFO 32384
+#define FLAG_VAL 0x7ADA0000
+
+// For backwards compatiblity.
+#define TEX_PATH_LEN 256
+
+
+/// Struct in memory.
+typedef struct {
+	Int globalTextureClass;
+	Int firstTile;
+	Int numTiles;
+	Int width;
+	Int isBlendEdgeTile; ///< True if the texture contains blend edges.
+	AsciiString name;
+	ICoord2D positionInTexture;
+} TXTextureClass;
+
+typedef enum {POS_X, POS_Y, NEG_X, NEG_Y} TVDirection;
+/// Struct in memory.
+typedef struct {
+	Real	u0, v0;	 // Upper left uv
+	Real	u1, v1;	 // Lower left uv
+	Real	u2, v2;	 // Lower right uv
+	Real	u3, v3;	 // Upper right uv
+	Bool  flip;
+	Bool	mutant;  // Mutant mapping needed to get this to fit.
+	Short tileIndex; // Tile texture.
+} TCliffInfo;
+
+#define NUM_TEXTURE_CLASSES 256
+
+
+class TextureClass;
+class ChunkInputStream;
+class InputStream;
+class OutputStream;
+class DataChunkInput;
+struct DataChunkInfo;
+class AlphaEdgeTextureClass;
+
+#define NUM_ALPHA_TILES 12
+
+class WorldHeightMap : public RefCountClass,
+                       public WorldHeightMapInterfaceClass
+{
+	friend class TerrainTextureClass;
+	friend class AlphaTerrainTextureClass;
+	friend class W3DCustomEdging;
+	friend class AlphaEdgeTextureClass;
+
+#define NO_EVAL_TILING_MODES
+
+public:
+#ifdef EVAL_TILING_MODES
+	enum {TILE_4x4, TILE_6x6, TILE_8x8} m_tileMode;
+#endif
+	enum {
+		NORMAL_DRAW_WIDTH = 129,
+		NORMAL_DRAW_HEIGHT = 129,
+		STRETCH_DRAW_WIDTH = 65,
+		STRETCH_DRAW_HEIGHT = 65
+	};
+
+protected:
+	Int m_width;				///< Height map width.
+	Int m_height;				///< Height map height (y size of array).
+	Int m_borderSize;		///< Non-playable border area.
+	VecICoord2D m_boundaries;	///< the in-game boundaries
+	Int m_dataSize;			///< size of m_data.
+	UnsignedByte *m_data;	///< array of z(height) values in the height map.
+
+  UnsignedByte *m_seismicUpdateFlag;  ///< array of bits to prevent ovelapping physics-update regions from doubling effects on shared cells
+  UnsignedInt   m_seismicUpdateWidth; ///< width of the array holding SeismicUpdateFlags
+  Real         *m_seismicZVelocities; ///< how fast is the dirt rising/falling at this location
+
+  UnsignedByte *m_cellFlipState;	///< array of bits to indicate the flip state of each cell.
+	Int m_flipStateWidth;			///< with of the array holding cellFlipState
+	UnsignedByte *m_cellCliffState;	///< array of bits to indicate the cliff state of each cell.
+
+
+	/// Texture indices.
+	Short  *m_tileNdxes;  ///< matches m_Data, indexes into m_SourceTiles.
+	Short  *m_blendTileNdxes;  ///< matches m_Data, indexes into m_blendedTiles.  0 means no blend info.
+	Short  *m_cliffInfoNdxes;  ///< matches m_Data, indexes into m_cliffInfo.	 0 means no cliff info.
+	Short  *m_extraBlendTileNdxes;  ///< matches m_Data, indexes into m_extraBlendedTiles.  0 means no blend info.
+
+
+	Int m_numBitmapTiles;	// Number of tiles initialized from bitmaps in m_SourceTiles.
+	Int m_numEdgeTiles;	// Number of tiles initialized from bitmaps in m_SourceTiles.
+	Int m_numBlendedTiles;	// Number of blended tiles created from bitmap tiles.
+
+	TileData			*m_sourceTiles[NUM_SOURCE_TILES];	///< Tiles for m_textureClasses
+	TileData			*m_edgeTiles[NUM_SOURCE_TILES];	///< Tiles for m_textureClasses
+
+	TBlendTileInfo	m_blendedTiles[NUM_BLEND_TILES];
+	TBlendTileInfo	m_extraBlendedTiles[NUM_BLEND_TILES];
+
+	TCliffInfo	m_cliffInfo[NUM_CLIFF_INFO];
+	Int m_numCliffInfo; ///< Number of cliffInfo's used in m_cliffInfo.
+
+	// Texture classes.  There is one texture class for each bitmap read in.
+	// A class may have more than one tile.  For example, if the grass bitmap is
+	// 128x128, it creates 4 64x64 tiles, so the grass texture class will have 4 tiles.
+	int m_numTextureClasses;
+	TXTextureClass m_textureClasses[NUM_TEXTURE_CLASSES];
+
+	// Edge Texture classes.  There is one texture class for each bitmap read in.
+	// An edge class will normally have 4 tiles.
+	int m_numEdgeTextureClasses;
+	TXTextureClass m_edgeTextureClasses[NUM_TEXTURE_CLASSES];
+
+	/** The actual texture used to render the 3d mesh.  Note that it is
+	 basically m_SourceTiles laid out in rows, so by itself it is not useful.
+	 Use GetUVData to get the mapping info for height cells to map into the
+	 texture. */
+	TerrainTextureClass *m_terrainTex;
+	Int	m_terrainTexHeight; /// Height of m_terrainTex allocated.
+	/** The texture that contains the alpha edge tiles that get blended on
+			top of the base texture. getAlphaUVData does the mapping. */
+	AlphaTerrainTextureClass *m_alphaTerrainTex;
+	Int	m_alphaTexHeight; /// Height of m_alphaTerrainTex allocated.
+
+	/** The texture that contains custom blend edge tiles. */
+	AlphaEdgeTextureClass *m_alphaEdgeTex;
+	Int	m_alphaEdgeHeight; /// Height of m_alphaEdgeTex allocated.
+
+	/// Drawing info - re the part of the map that is being drawn.
+	Int m_drawOriginX;
+	Int m_drawOriginY;
+	Int m_drawWidthX;
+	Int m_drawHeightY;
+
+	/// Tiles that hold the alpha channel info.
+	static TileData *m_alphaTiles[NUM_ALPHA_TILES];
+
+
+protected:
+	TileData *getSourceTile(UnsignedInt ndx) { if (ndx<NUM_SOURCE_TILES) return(m_sourceTiles[ndx]); return(NULL); };
+	TileData *getEdgeTile(UnsignedInt ndx) { if (ndx<NUM_SOURCE_TILES) return(m_edgeTiles[ndx]); return(NULL); };
+	/// UV mapping data for a cell to map into the terrain texture.
+	void getUVForNdx(Int ndx, float *minU, float *minV, float *maxU, float*maxV, Bool fullTile);
+	Bool getUVForTileIndex(Int ndx, Short tileNdx, float U[4], float V[4], Bool fullTile);
+	Int getTextureClassFromNdx(Int tileNdx);
+	void readTexClass(TXTextureClass *texClass, TileData **tileData);
+	Int updateTileTexturePositions(Int *edgeHeight); ///< Places each tile in the texture.
+	void initCliffFlagsFromHeights(void);
+	void setCellCliffFlagFromHeights(Int xIndex, Int yIndex);
+
+protected:	 // file reader callbacks.
+	static Bool ParseHeightMapDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
+	Bool ParseHeightMapData(DataChunkInput &file, DataChunkInfo *info, void *userData);
+	static Bool ParseSizeOnlyInChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
+	Bool ParseSizeOnly(DataChunkInput &file, DataChunkInfo *info, void *userData);
+	static Bool ParseBlendTileDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
+	Bool ParseBlendTileData(DataChunkInput &file, DataChunkInfo *info, void *userData);
+	static Bool ParseWorldDictDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
+	static Bool ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
+	static Bool ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
+	Bool ParseObjectData(DataChunkInput &file, DataChunkInfo *info, void *userData, Bool readDict);
+	static Bool ParseLightingDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
+
+protected:
+	WorldHeightMap(void);			///< Simple constructor for WorldHeightMapEdit class.
+
+public: // constructors/destructors
+	WorldHeightMap(ChunkInputStream *pFile, Bool bHMapOnly=false);	// read from file.
+	~WorldHeightMap(void);			// destroy.
+
+public:  // Boundary info
+	const VecICoord2D& getAllBoundaries(void) const { return m_boundaries; }
+
+public:  // height map info.
+	static Int getMinHeightValue(void) {return K_MIN_HEIGHT;}
+	static Int getMaxHeightValue(void) {return K_MAX_HEIGHT;}
+
+	UnsignedByte *getDataPtr(void) {return m_data;}
+
+
+	Int getXExtent(void) {return m_width;}	///<number of vertices in x
+	Int getYExtent(void) {return m_height;}	///<number of vertices in y
+
+	Int getDrawOrgX(void) {return m_drawOriginX;}
+	Int getDrawOrgY(void) {return m_drawOriginY;}
+
+	Int getDrawWidth(void) {return m_drawWidthX;}
+	Int getDrawHeight(void) {return m_drawHeightY;}
+	void setDrawWidth(Int width) {m_drawWidthX = width; if (m_drawWidthX>m_width) m_drawWidthX = m_width;}
+	void setDrawHeight(Int height) {m_drawHeightY = height; if (m_drawHeightY>m_height) m_drawHeightY = m_height;}
+	virtual Int getBorderSize(void) {return m_borderSize;}
+  Int getBorderSizeInline(void) const { return m_borderSize; }
+	/// Get height with the offset that HeightMapRenderObjClass uses built in.
+	UnsignedByte getDisplayHeight(Int x, Int y) { return m_data[x+m_drawOriginX+m_width*(y+m_drawOriginY)];}
+
+	/// Get height in normal coordinates.
+	UnsignedByte getHeight(Int xIndex, Int yIndex)
+	{
+		Int ndx = (yIndex*m_width)+xIndex;
+		if ((ndx>=0) && (ndx<m_dataSize) && m_data)
+			return(m_data[ndx]);
+		else
+			return(0);
+	};
+
+	void getUVForBlend(Int edgeClass, Region2D *range);
+
+	Bool setDrawOrg(Int xOrg, Int yOrg);
+
+	static void freeListOfMapObjects(void);
+
+	Int getTextureClassNoBlend(Int xIndex, Int yIndex, Bool baseClass=false);
+	Int getTextureClass(Int xIndex, Int yIndex, Bool baseClass=false);
+	TXTextureClass getTextureFromIndex( Int textureIndex );
+
+public:  // tile and texture info.
+	void setTextureLOD(Int lod);	///< set maximum lod level sent to the hardware.
+	TextureClass *getTerrainTexture(void);  //< generates if needed and returns the terrain texture
+	TextureClass *getAlphaTerrainTexture(void); //< generates if needed and returns alpha terrain texture
+	TextureClass *getEdgeTerrainTexture(void); //< generates if needed and returns blend edge texture
+	/// UV mapping data for a cell to map into the terrain texture.  Returns true if the textures had to be stretched for cliffs.
+	Bool getUVData(Int xIndex, Int yIndex, float U[4], float V[4], Bool fullTile);
+	Bool getFlipState(Int xIndex, Int yIndex) const;
+	///Faster version of above function without all the safety checks - For people that do checks externally.
+	Bool getQuickFlipState(Int xIndex, Int yIndex) const
+	{
+		return m_cellFlipState[yIndex*m_flipStateWidth + (xIndex >> 3)] & (1<<(xIndex&0x7));
+	}
+
+	void setFlipState(Int xIndex, Int yIndex, Bool value);
+	void clearFlipStates(void);
+	Bool getCliffState(Int xIndex, Int yIndex) const;
+	Bool getExtraAlphaUVData(Int xIndex, Int yIndex, float U[4], float V[4], UnsignedByte alpha[4], Bool *flip, Bool *cliff);
+	/// UV mapping data for a cell to map into the alpha terrain texture.
+	void getAlphaUVData(Int xIndex, Int yIndex, float U[4], float V[4], UnsignedByte alpha[4], Bool *flip, Bool fullTile);
+	void getTerrainColorAt(Real x, Real y, RGBColor *pColor);
+	AsciiString getTerrainNameAt(Real x, Real y);
+	Bool isCliffMappedTexture(Int xIndex, Int yIndex);
+
+
+  Bool getSeismicUpdateFlag(Int xIndex, Int yIndex) const;
+  void setSeismicUpdateFlag(Int xIndex, Int yIndex, Bool value);
+  void clearSeismicUpdateFlags(void) ;
+  virtual Real getSeismicZVelocity(Int xIndex, Int yIndex) const;
+  virtual void setSeismicZVelocity(Int xIndex, Int yIndex, Real value);
+  void fillSeismicZVelocities( Real value );
+  virtual Real getBilinearSampleSeismicZVelocity( Int x, Int y);
+
+
+
+public:  // Flat tile texture info.
+	TerrainTextureClass *getFlatTexture(Int xCell, Int yCell, Int cellWidth, Int pixelsPerCell);  //< generates and returns the terrain texture
+
+	static void setupAlphaTiles(void);
+	UnsignedByte *getPointerToTileData(Int xIndex, Int yIndex, Int width);
+	Bool getRawTileData(Short tileNdx, Int width, UnsignedByte *buffer, Int bufLen);
+	UnsignedByte *getRGBAlphaDataForWidth(Int width, TBlendTileInfo *pBlend);
+
+public:  // modify height value
+	void setRawHeight(Int xIndex, Int yIndex, UnsignedByte height) {
+		Int ndx = (yIndex*m_width)+xIndex;
+		if ((ndx>=0) && (ndx<m_dataSize) && m_data) m_data[ndx]=height;
+	};
+public: // Read tile utilities. jba [7/9/2003]
+	static Bool readTiles(InputStream *pStrm, TileData **tiles, Int numRows);
+	static Int countTiles(InputStream *pStrm, Bool *halfTile=NULL);
+
+protected:
+	void setCliffState(Int xIndex, Int yIndex, Bool state);
+
+};
diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h
new file mode 100644
index 00000000000..6d77772bbd7
--- /dev/null
+++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h
@@ -0,0 +1,53 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+/////// Win32BIGFile.h ////////////////////////////////////
+// Bryan Cleveland, August 2002
+///////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Common/ArchiveFile.h"
+#include "Common/AsciiString.h"
+#include "Common/List.h"
+
+class Win32BIGFile : public ArchiveFile
+{
+	public:
+		Win32BIGFile(AsciiString name, AsciiString path);
+		virtual ~Win32BIGFile();
+
+		virtual Bool					getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const;	///< fill in the fileInfo struct with info about the requested file.
+		virtual File*					openFile( const Char *filename, Int access = 0 );///< Open the specified file within the BIG file
+		virtual void					closeAllFiles( void );									///< Close all file opened in this BIG file
+		virtual AsciiString		getName( void );												///< Returns the name of the BIG file
+		virtual AsciiString		getPath( void );												///< Returns full path and name of BIG file
+		virtual void					setSearchPriority( Int new_priority );	///< Set this BIG file's search priority
+		virtual void					close( void );													///< Close this BIG file
+
+	protected:
+
+		AsciiString		m_name;		///< BIG file name
+		AsciiString		m_path;		///< BIG file path
+};
diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h
new file mode 100644
index 00000000000..fbad69d1cea
--- /dev/null
+++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h
@@ -0,0 +1,55 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//////// Win32BIGFileSystem.h ///////////////////////////
+// Bryan Cleveland, August 2002
+/////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Common/ArchiveFileSystem.h"
+
+class Win32BIGFileSystem : public ArchiveFileSystem
+{
+public:
+	Win32BIGFileSystem();
+	virtual ~Win32BIGFileSystem();
+
+	virtual void init( void );
+	virtual void update( void );
+	virtual void reset( void );
+	virtual void postProcessLoad( void );
+
+	// ArchiveFile operations
+	virtual void closeAllArchiveFiles( void );											///< Close all Archivefiles currently open
+
+	// File operations
+	virtual ArchiveFile * openArchiveFile(const Char *filename);
+	virtual void closeArchiveFile(const Char *filename);
+	virtual void closeAllFiles( void );															///< Close all files associated with ArchiveFiles
+
+	virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE);
+protected:
+
+};
diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h
new file mode 100644
index 00000000000..43faf6ea800
--- /dev/null
+++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h
@@ -0,0 +1,41 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///// Win32LocalFile.h ///////////////////////////
+// Bryan Cleveland, August 2002
+//////////////////////////////////////////////////
+
+#pragma once
+
+#include "Common/LocalFile.h"
+
+class Win32LocalFile : public LocalFile
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Win32LocalFile, "Win32LocalFile")
+public:
+	Win32LocalFile();
+	//virtual ~Win32LocalFile();
+
+protected:
+};
diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h
new file mode 100644
index 00000000000..7adf424986b
--- /dev/null
+++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h
@@ -0,0 +1,53 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///// Win32LocalFileSystem.h //////////////////////////////////
+// Bryan Cleveland, August 2002
+///////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Common/LocalFileSystem.h"
+
+class Win32LocalFileSystem : public LocalFileSystem
+{
+public:
+	Win32LocalFileSystem();
+	virtual ~Win32LocalFileSystem();
+
+	virtual void init();
+	virtual void reset();
+	virtual void update();
+
+	virtual File * openFile(const Char *filename, Int access = File::NONE, size_t bufferSize = File::BUFFERSIZE);	///< open the given file.
+	virtual Bool doesFileExist(const Char *filename) const;								///< does the given file exist?
+
+	virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.
+	virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const;
+
+	virtual Bool createDirectory(AsciiString directory);
+	virtual AsciiString normalizePath(const AsciiString& filePath) const;
+
+protected:
+};
diff --git a/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp b/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp
new file mode 100644
index 00000000000..5a47735ca77
--- /dev/null
+++ b/Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp
@@ -0,0 +1,3392 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: MilesAudioManager.cpp
+/*---------------------------------------------------------------------------*/
+/* EA Pacific                                                                */
+/* Confidential Information	                                                 */
+/* Copyright (C) 2001 - All Rights Reserved                                  */
+/* DO NOT DISTRIBUTE                                                         */
+/*---------------------------------------------------------------------------*/
+/* Project:    RTS3                                                          */
+/* File name:  MilesAudioManager.cpp                                         */
+/* Created:    John K. McDonald, Jr., 3/21/2002                              */
+/* Desc:       This is the implementation for the MilesAudioManager, which   */
+/*						 interfaces with the Miles Sound System.                       */
+/* Revision History:                                                         */
+/*		7/18/2002 : Initial creation                                           */
+/*---------------------------------------------------------------------------*/
+
+#include <dsound.h>
+#include "Lib/BaseType.h"
+#include "MilesAudioDevice/MilesAudioManager.h"
+
+#include "Common/AudioAffect.h"
+#include "Common/AudioHandleSpecialValues.h"
+#include "Common/AudioRequest.h"
+#include "Common/AudioSettings.h"
+#include "Common/AsciiString.h"
+#include "Common/AudioEventInfo.h"
+#include "Common/FileSystem.h"
+#include "Common/GameCommon.h"
+#include "Common/GameSounds.h"
+#include "Common/CRCDebug.h"
+#include "Common/GlobalData.h"
+#include "Common/ScopedMutex.h"
+
+#include "GameClient/DebugDisplay.h"
+#include "GameClient/Drawable.h"
+#include "GameClient/GameClient.h"
+#include "GameClient/VideoPlayer.h"
+#include "GameClient/View.h"
+
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/TerrainLogic.h"
+
+#include "Common/file.h"
+
+
+enum { INFINITE_LOOP_COUNT = 1000000 };
+
+// Callback functions useful for Miles ////////////////////////////////////////////////////////////
+static void AILCALLBACK setSampleCompleted( HSAMPLE sampleCompleted );
+static void AILCALLBACK set3DSampleCompleted( H3DSAMPLE sample3DCompleted );
+static void AILCALLBACK setStreamCompleted( HSTREAM streamCompleted );
+
+static U32 AILCALLBACK streamingFileOpen(char const *fileName, void **file_handle);
+static void AILCALLBACK streamingFileClose(void *fileHandle);
+static S32 AILCALLBACK streamingFileSeek(void *fileHandle, S32 offset, U32 type);
+static U32 AILCALLBACK streamingFileRead(void *fileHandle, void *buffer, U32 bytes);
+
+//-------------------------------------------------------------------------------------------------
+MilesAudioManager::MilesAudioManager() :
+	m_providerCount(0),
+	m_selectedProvider(PROVIDER_ERROR),
+	m_selectedSpeakerType(0),
+	m_lastProvider(PROVIDER_ERROR),
+	m_digitalHandle(NULL),
+	m_num2DSamples(0),
+	m_num3DSamples(0),
+	m_numStreams(0),
+	m_delayFilter(NULL),
+	m_binkHandle(NULL),
+	m_pref3DProvider(AsciiString::TheEmptyString),
+	m_prefSpeaker(AsciiString::TheEmptyString)
+{
+	m_audioCache = NEW AudioFileCache;
+}
+
+//-------------------------------------------------------------------------------------------------
+MilesAudioManager::~MilesAudioManager()
+{
+	DEBUG_ASSERTCRASH(m_binkHandle == NULL, ("Leaked a Bink handle. Chuybregts"));
+	releaseHandleForBink();
+	closeDevice();
+	delete m_audioCache;
+
+	DEBUG_ASSERTCRASH(this == TheAudio, ("Umm..."));
+	TheAudio = NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+#if defined(RTS_DEBUG)
+AudioHandle MilesAudioManager::addAudioEvent( const AudioEventRTS *eventToAdd )
+{
+	if (TheGlobalData->m_preloadReport) {
+		if (!eventToAdd->getEventName().isEmpty()) {
+			m_allEventsLoaded.insert(eventToAdd->getEventName());
+		}
+	}
+
+	return AudioManager::addAudioEvent(eventToAdd);
+}
+#endif
+
+#if defined(RTS_DEBUG)
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::audioDebugDisplay(DebugDisplayInterface *dd, void *, FILE *fp )
+{
+	std::list<PlayingAudio *>::iterator it;
+
+	static char buffer[128] = { 0 };
+	if (buffer[0] == 0) {
+		AIL_MSS_version(buffer, 128);
+	}
+
+	Coord3D lookPos;
+	TheTacticalView->getPosition( &lookPos );
+	lookPos.z = TheTerrainLogic->getGroundHeight( lookPos.x, lookPos.y );
+	const Coord3D *mikePos = TheAudio->getListenerPosition();
+	Coord3D distanceVector = TheTacticalView->get3DCameraPosition();
+	distanceVector.sub( mikePos );
+
+	Int now = TheGameLogic->getFrame();
+	static Int lastCheck = now;
+	const Int frames = 60;
+	static Int latency = 0;
+	static Int worstLatency = 0;
+	if( lastCheck + frames <= now )
+	{
+		latency = AIL_get_timer_highest_delay();
+		if( latency > worstLatency )
+		{
+			worstLatency = latency;
+		}
+		lastCheck = now;
+	}
+
+	if( dd )
+	{
+		dd->printf("Miles Sound System version: %s    ", buffer);
+		dd->printf("Memory Usage : %d/%d\n", m_audioCache->getCurrentlyUsedSize(), m_audioCache->getMaxSize());
+		dd->printf("Sound: %s    ", (isOn(AudioAffect_Sound) ? "Yes" : "No"));
+		dd->printf("3DSound: %s    ", (isOn(AudioAffect_Sound3D) ? "Yes" : "No"));
+		dd->printf("Speech: %s    ", (isOn(AudioAffect_Speech) ? "Yes" : "No"));
+		dd->printf("Music: %s\n", (isOn(AudioAffect_Music) ? "Yes" : "No"));
+		dd->printf("Channels Available: ");
+		dd->printf("%d Sounds    ", m_sound->getAvailableSamples());
+
+		dd->printf("%d(%d) 3D Sounds\n", m_sound->getAvailable3DSamples(), m_available3DSamples.size() );
+		dd->printf("Volume: ");
+		dd->printf("Sound: %d    ", REAL_TO_INT(m_soundVolume * 100.0f));
+		dd->printf("3DSound: %d    ", REAL_TO_INT(m_sound3DVolume * 100.0f));
+		dd->printf("Speech: %d    ", REAL_TO_INT(m_speechVolume * 100.0f));
+		dd->printf("Music: %d\n", REAL_TO_INT(m_musicVolume * 100.0f));
+		dd->printf("Current 3D Provider: %s    ",
+
+		TheAudio->getProviderName(m_selectedProvider).str());
+		dd->printf("Current Speaker Type: %s\n", TheAudio->translateUnsignedIntToSpeakerType(TheAudio->getSpeakerType()).str());
+
+		dd->printf( "Looking at: (%d,%d,%d) -- Microphone at: (%d,%d,%d)\n",
+				(Int)lookPos.x, (Int)lookPos.y, (Int)lookPos.z, (Int)mikePos->x, (Int)mikePos->y, (Int)mikePos->z );
+		dd->printf( "Camera distance from microphone: %d -- Zoom Volume: %d%%\n",
+				(Int)distanceVector.length(), (Int)(TheAudio->getZoomVolume()*100.0f) );
+		dd->printf( "Worst latency: %d -- Current latency: %d\n", worstLatency, latency );
+
+		dd->printf("-----------------------------------------------------------\n");
+		dd->printf("Playing Audio\n");
+	}
+	if( fp )
+	{
+		fprintf( fp, "Miles Sound System version: %s    ", buffer );
+		fprintf( fp, "Memory Usage : %d/%d\n", m_audioCache->getCurrentlyUsedSize(), m_audioCache->getMaxSize() );
+		fprintf( fp, "Sound: %s    ", (isOn(AudioAffect_Sound) ? "Yes" : "No") );
+		fprintf( fp, "3DSound: %s    ", (isOn(AudioAffect_Sound3D) ? "Yes" : "No") );
+		fprintf( fp, "Speech: %s    ", (isOn(AudioAffect_Speech) ? "Yes" : "No") );
+		fprintf( fp, "Music: %s\n", (isOn(AudioAffect_Music) ? "Yes" : "No") );
+		fprintf( fp, "Channels Available: " );
+		fprintf( fp, "%d Sounds    ", m_sound->getAvailableSamples() );
+		fprintf( fp, "%d 3D Sounds\n", m_sound->getAvailable3DSamples() );
+		fprintf( fp, "Volume: ");
+		fprintf( fp, "Sound: %d    ", REAL_TO_INT(m_soundVolume * 100.0f) );
+		fprintf( fp, "3DSound: %d    ", REAL_TO_INT(m_sound3DVolume * 100.0f) );
+		fprintf( fp, "Speech: %d    ", REAL_TO_INT(m_speechVolume * 100.0f) );
+		fprintf( fp, "Music: %d\n", REAL_TO_INT(m_musicVolume * 100.0f) );
+		fprintf( fp, "Current 3D Provider: %s    ", TheAudio->getProviderName(m_selectedProvider).str());
+		fprintf( fp, "Current Speaker Type: %s\n", TheAudio->translateUnsignedIntToSpeakerType(TheAudio->getSpeakerType()).str());
+
+		fprintf( fp, "Looking at: (%d,%d,%d) -- Microphone at: (%d,%d,%d)\n",
+				(Int)lookPos.x, (Int)lookPos.y, (Int)lookPos.z, (Int)mikePos->x, (Int)mikePos->y, (Int)mikePos->z );
+		fprintf( fp, "Camera distance from microphone: %d -- Zoom Volume: %d%%\n",
+				(Int)distanceVector.length(), (Int)(TheAudio->getZoomVolume()*100.0f) );
+
+		fprintf( fp, "-----------------------------------------------------------\n" );
+		fprintf( fp, "Playing Audio\n" );
+	}
+
+	PlayingAudio *playing = NULL;
+	Int channel;
+	Int channelCount;
+	Real volume = 0.0f;
+	AsciiString filenameNoSlashes;
+
+	const Int maxChannels = 64;
+	PlayingAudio *playingArray[maxChannels] = { NULL };
+
+	// 2-D Sounds
+	if( dd )
+	{
+		dd->printf("-----------------------------------------------------Sounds\n");
+		channelCount = TheAudio->getNum2DSamples();
+		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
+			playing = *it;
+			if (!playing) {
+				continue;
+			}
+
+			playingArray[(int)AIL_sample_user_data(playing->m_sample, 0)] = playing;
+		}
+
+		for (Int i = 1; i <= maxChannels && i <= channelCount; ++i) {
+			playing = playingArray[i];
+			if (!playing) {
+				dd->printf("%d: Silence\n", i);
+				continue;
+			}
+
+			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
+			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
+
+			// Calculate Sample volume
+			volume = 100.0f;
+			volume *= getEffectiveVolume(playing->m_audioEventRTS);
+
+			dd->printf("%2d: %-20s - (%s) Volume: %d (2D)\n", i, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT(volume));
+			playingArray[i] = NULL;
+		}
+	}
+	if( fp )
+	{
+		fprintf( fp, "-----------------------------------------------------Sounds\n" );
+		channelCount = TheAudio->getNum2DSamples();
+		channel = 1;
+		for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it )
+		{
+			playing = *it;
+			if( !playing )
+			{
+				continue;
+			}
+			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
+			filenameNoSlashes = filenameNoSlashes.reverseFind( '\\' ) + 1;
+
+			// Calculate Sample volume
+			volume = 100.0f;
+			volume *= getEffectiveVolume( playing->m_audioEventRTS );
+
+			fprintf( fp, "%2d: %-20s - (%s) Volume: %d (2D)\n", channel++, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT( volume ) );
+		}
+		for( int i = channel; i <= channelCount; ++i )
+		{
+			fprintf( fp, "%d: Silence\n", i );
+		}
+	}
+
+	const Coord3D *microphonePos = TheAudio->getListenerPosition();
+
+	// Now 3D Sounds
+	if( dd )
+	{
+		dd->printf("--------------------------------------------------3D Sounds\n");
+		channelCount = TheAudio->getNum3DSamples();
+		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
+			playing = *it;
+			if (!playing) {
+				continue;
+			}
+
+			playingArray[(int)AIL_3D_user_data(playing->m_3DSample, 0)] = playing;
+		}
+
+		for (Int i = 1; i <= maxChannels && i <= channelCount; ++i)
+		{
+			playing = playingArray[i];
+			if (!playing)
+			{
+				dd->printf("%d: Silence\n", i);
+				continue;
+			}
+
+			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
+			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
+
+			// Calculate Sample volume
+			volume = 100.0f;
+			volume *= getEffectiveVolume(playing->m_audioEventRTS);
+			Real dist = -1.0f;
+			const Coord3D *pos = playing->m_audioEventRTS->getPosition();
+			char distStr[32];
+			if( pos )
+			{
+				Coord3D vector = *microphonePos;
+				vector.sub( pos );
+				dist = vector.length();
+				sprintf( distStr, "%d", REAL_TO_INT( dist ) );
+			}
+			else
+			{
+				sprintf( distStr, "???" );
+			}
+			char str[32];
+			switch( playing->m_audioEventRTS->getOwnerType() )
+			{
+				case OT_Positional:
+					sprintf( str, "(3D)" );
+					break;
+				case OT_Object:
+					sprintf( str, "(3DObj)" );
+					break;
+				case OT_Drawable:
+					sprintf( str, "(3DDraw)" );
+					break;
+				case OT_Dead:
+					sprintf( str, "(3DDead)" );
+					break;
+
+			}
+
+			dd->printf("%2d: %-20s - (%s) Volume: %d, Dist: %s, %s\n",
+				i, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT(volume), distStr, str );
+			playingArray[i] = NULL;
+		}
+	}
+	if( fp )
+	{
+		fprintf( fp, "--------------------------------------------------3D Sounds\n" );
+		channelCount = TheAudio->getNum3DSamples();
+		channel = 1;
+		for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it )
+		{
+			playing = *it;
+			if( !playing )
+			{
+				continue;
+			}
+			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
+			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
+
+			// Calculate Sample volume
+			volume = 100.0f;
+			volume *= getEffectiveVolume( playing->m_audioEventRTS );
+			fprintf( fp, "%2d: %-24s - (%s) Volume: %d \n", channel++, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT( volume ) );
+		}
+
+		for( int i = channel; i <= channelCount; ++i )
+		{
+			fprintf( fp, "%2d: Silence\n", i );
+		}
+	}
+
+	// Now Streams
+	if( dd )
+	{
+		dd->printf("----------------------------------------------------Streams\n");
+		channelCount = TheAudio->getNumStreams();
+		channel = 1;
+		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+			playing = *it;
+			if (!playing) {
+				continue;
+			}
+			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
+			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
+
+
+			// Calculate Sample volume
+			volume = 100.0f;
+			volume *= getEffectiveVolume(playing->m_audioEventRTS);
+
+			dd->printf("%2d: %-24s - (%s)  Volume: %d (Stream)\n", channel++, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT(volume));
+		}
+
+		for ( int i = channel; i <= channelCount; ++i) {
+			dd->printf("%2d: Silence\n", i);
+		}
+		dd->printf("===========================================================\n");
+	}
+	if( fp )
+	{
+		fprintf( fp, "----------------------------------------------------Streams\n" );
+		channelCount = TheAudio->getNumStreams();
+		channel = 1;
+		for( it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it )
+		{
+			playing = *it;
+			if( !playing )
+			{
+				continue;
+			}
+			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
+			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
+
+			// Calculate Sample volume
+			volume = 100.0f;
+			volume *= getEffectiveVolume(playing->m_audioEventRTS);
+
+			fprintf( fp, "%2d: %-24s - (%s)  Volume: %d (Stream)\n", channel++, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT( volume ) );
+		}
+
+		for( int i = channel; i <= channelCount; ++i )
+		{
+			fprintf( fp, "%2d: Silence\n", i );
+		}
+		fprintf( fp, "===========================================================\n" );
+	}
+}
+#endif
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::init()
+{
+	AudioManager::init();
+#ifdef INTENSE_DEBUG
+	DEBUG_LOG(("Sound has temporarily been disabled in debug builds only. jkmcd"));
+	// for now, RTS_DEBUG builds only should have no sound. ask jkmcd or srj about this.
+	return;
+#endif
+
+	// We should now know how many samples we want to load
+	openDevice();
+	m_audioCache->setMaxSize(getAudioSettings()->m_maxCacheSize);
+
+	// Now, set the file callbacks to load the streams from Biggie files
+	AIL_set_file_callbacks(streamingFileOpen, streamingFileClose, streamingFileSeek, streamingFileRead);
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::postProcessLoad()
+{
+	AudioManager::postProcessLoad();
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::reset()
+{
+#if defined(RTS_DEBUG)
+	dumpAllAssetsUsed();
+	m_allEventsLoaded.clear();
+#endif
+
+	AudioManager::reset();
+	stopAllAudioImmediately();
+  removeAllAudioRequests();
+  // This must come after stopAllAudioImmediately() and removeAllAudioRequests(), to ensure that
+  // sounds pointing to the temporary AudioEventInfo handles are deleted before their info is deleted
+  removeLevelSpecificAudioEventInfos();
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::update()
+{
+	AudioManager::update();
+	setDeviceListenerPosition();
+	processRequestList();
+	processPlayingList();
+	processFadingList();
+	processStoppedList();
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::stopAudio( AudioAffect which )
+{
+	// All we really need to do is:
+	// 1) Remove the EOS callback.
+	// 2) Stop the sample, (so that when we later unload it, bad stuff doesn't happen)
+	// 3) Set the status to stopped, so that when we next process the playing list, we will
+	//		correctly clean up the sample.
+
+
+	std::list<PlayingAudio *>::iterator it;
+
+	PlayingAudio *playing = NULL;
+	if (BitIsSet(which, AudioAffect_Sound)) {
+		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
+			playing = *it;
+			if (playing) {
+				AIL_register_EOS_callback(playing->m_sample, NULL);
+				AIL_stop_sample(playing->m_sample);
+				playing->m_status = PS_Stopped;
+			}
+		}
+	}
+
+	if (BitIsSet(which, AudioAffect_Sound3D)) {
+		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
+			playing = *it;
+			if (playing) {
+				AIL_register_3D_EOS_callback(playing->m_3DSample, NULL);
+				AIL_stop_3D_sample(playing->m_3DSample);
+				playing->m_status = PS_Stopped;
+			}
+		}
+	}
+
+	if (BitIsSet(which, AudioAffect_Speech | AudioAffect_Music)) {
+		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+			playing = *it;
+			if (playing) {
+				if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
+					if (!BitIsSet(which, AudioAffect_Music)) {
+						continue;
+					}
+				} else {
+					if (!BitIsSet(which, AudioAffect_Speech)) {
+						continue;
+					}
+				}
+				AIL_register_stream_callback(playing->m_stream, NULL);
+				AIL_pause_stream(playing->m_stream, 1);
+				playing->m_status = PS_Stopped;
+			}
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::pauseAudio( AudioAffect which )
+{
+	std::list<PlayingAudio *>::iterator it;
+
+	PlayingAudio *playing = NULL;
+	if (BitIsSet(which, AudioAffect_Sound)) {
+		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
+			playing = *it;
+			if (playing) {
+				AIL_stop_sample(playing->m_sample);
+			}
+		}
+	}
+
+	if (BitIsSet(which, AudioAffect_Sound3D)) {
+		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
+			playing = *it;
+			if (playing) {
+				AIL_stop_3D_sample(playing->m_3DSample);
+			}
+		}
+	}
+
+	if (BitIsSet(which, AudioAffect_Speech | AudioAffect_Music)) {
+		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+			playing = *it;
+			if (playing) {
+				if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
+					if (!BitIsSet(which, AudioAffect_Music)) {
+						continue;
+					}
+				} else {
+					if (!BitIsSet(which, AudioAffect_Speech)) {
+						continue;
+					}
+				}
+
+				AIL_pause_stream(playing->m_stream, 1);
+			}
+		}
+	}
+
+	//Get rid of PLAY audio requests when pausing audio.
+	std::list<AudioRequest*>::iterator ait;
+	for (ait = m_audioRequests.begin(); ait != m_audioRequests.end(); /* empty */)
+	{
+		AudioRequest *req = (*ait);
+		if( req && req->m_request == AR_Play )
+		{
+			deleteInstance(req);
+			ait = m_audioRequests.erase(ait);
+		}
+		else
+		{
+			ait++;
+		}
+	}
+}
+
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::resumeAudio( AudioAffect which )
+{
+	std::list<PlayingAudio *>::iterator it;
+
+	PlayingAudio *playing = NULL;
+	if (BitIsSet(which, AudioAffect_Sound)) {
+		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
+			playing = *it;
+			if (playing) {
+				AIL_resume_sample(playing->m_sample);
+			}
+		}
+	}
+
+	if (BitIsSet(which, AudioAffect_Sound3D)) {
+		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
+			playing = *it;
+			if (playing) {
+				AIL_resume_3D_sample(playing->m_3DSample);
+			}
+		}
+	}
+
+	if (BitIsSet(which, AudioAffect_Speech | AudioAffect_Music)) {
+		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+			playing = *it;
+			if (playing) {
+				if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
+					if (!BitIsSet(which, AudioAffect_Music)) {
+						continue;
+					}
+				} else {
+					if (!BitIsSet(which, AudioAffect_Speech)) {
+						continue;
+					}
+				}
+				AIL_pause_stream(playing->m_stream, 0);
+			}
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::pauseAmbient( Bool shouldPause )
+{
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::playAudioEvent( AudioEventRTS *event )
+{
+#ifdef INTENSIVE_AUDIO_DEBUG
+	DEBUG_LOG(("MILES (%d) - Processing play request: %d (%s)", TheGameLogic->getFrame(), event->getPlayingHandle(), event->getEventName().str()));
+#endif
+	const AudioEventInfo *info = event->getAudioEventInfo();
+	if (!info) {
+		return;
+	}
+
+	std::list<PlayingAudio *>::iterator it;
+	PlayingAudio *playing = NULL;
+
+	AudioHandle handleToKill = event->getHandleToKill();
+
+	AsciiString fileToPlay = event->getFilename();
+	PlayingAudio *audio = allocatePlayingAudio();
+	switch(info->m_soundType)
+	{
+		case AT_Music:
+		case AT_Streaming:
+		{
+		#ifdef INTENSIVE_AUDIO_DEBUG
+			DEBUG_LOG(("- Stream"));
+		#endif
+
+			if ((info->m_soundType == AT_Streaming) && event->getUninterruptable()) {
+				stopAllSpeech();
+			}
+
+			Real curVolume = 1.0;
+			if (info->m_soundType == AT_Music) {
+				curVolume = m_musicVolume;
+			} else {
+				curVolume = m_speechVolume;
+			}
+			curVolume *= event->getVolume();
+
+			Bool foundSoundToReplace = false;
+			if (handleToKill) {
+				for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+					playing = (*it);
+					if (!playing) {
+						continue;
+					}
+
+					if (playing->m_audioEventRTS && playing->m_audioEventRTS->getPlayingHandle() == handleToKill)
+					{
+						//Release this streaming channel immediately because we are going to play another sound in it's place.
+						releasePlayingAudio(playing);
+						m_playingStreams.erase(it);
+						foundSoundToReplace = true;
+						break;
+					}
+				}
+			}
+
+			HSTREAM stream;
+			if (!handleToKill || foundSoundToReplace) {
+				stream = AIL_open_stream(m_digitalHandle, fileToPlay.str(), 0);
+			} else {
+				stream = NULL;
+			}
+
+			// Put this on here, so that the audio event RTS will be cleaned up regardless.
+			audio->m_audioEventRTS = event;
+			audio->m_stream = stream;
+			audio->m_type = PAT_Stream;
+
+			if (stream) {
+				if ((info->m_soundType == AT_Streaming) && event->getUninterruptable()) {
+					setDisallowSpeech(TRUE);
+	 			}
+				AIL_set_stream_volume_pan(stream, curVolume, 0.5f);
+				playStream(event, stream);
+				m_playingStreams.push_back(audio);
+				audio = NULL;
+			}
+			break;
+		}
+
+		case AT_SoundEffect:
+		{
+		#ifdef INTENSIVE_AUDIO_DEBUG
+			DEBUG_LOG(("- Sound"));
+		#endif
+
+
+			if (event->isPositionalAudio()) {
+				// Sounds that are non-global are positional 3-D sounds. Deal with them accordingly
+			#ifdef INTENSIVE_AUDIO_DEBUG
+				DEBUG_LOG((" Positional"));
+			#endif
+				Bool foundSoundToReplace = false;
+				if (handleToKill)
+				{
+					for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
+						playing = (*it);
+						if (!playing) {
+							continue;
+						}
+
+						if( playing->m_audioEventRTS && playing->m_audioEventRTS->getPlayingHandle() == handleToKill )
+						{
+							//Release this 3D sound channel immediately because we are going to play another sound in it's place.
+							releasePlayingAudio(playing);
+							m_playing3DSounds.erase(it);
+							foundSoundToReplace = true;
+							break;
+						}
+					}
+				}
+
+				H3DSAMPLE sample3D;
+				if( !handleToKill || foundSoundToReplace )
+				{
+					sample3D = getFirst3DSample( event );
+					if( !sample3D )
+					{
+						//If we don't have an available sample, kill the lowest priority assuming we have one that is lower
+						//than the sound we are trying to add. One possibility for strangeness is when an interrupt sound
+						//that wants to kill a handle to replace it, it's possible that another request already killed it,
+						//in which case we need to attempt to find another sound to kill.
+						if( killLowestPrioritySoundImmediately( event ) )
+						{
+							sample3D = getFirst3DSample( event );
+						}
+					}
+				}
+				else
+				{
+					sample3D = NULL;
+				}
+				// Push it onto the list of playing things
+				audio->m_audioEventRTS = event;
+				audio->m_3DSample = sample3D;
+				audio->m_file = NULL;
+				audio->m_type = PAT_3DSample;
+				m_playing3DSounds.push_back(audio);
+
+				if (sample3D) {
+					audio->m_file = playSample3D(event, sample3D);
+					m_sound->notifyOf3DSampleStart();
+				}
+
+				if( !audio->m_file )
+				{
+					m_playing3DSounds.pop_back();
+					#ifdef INTENSIVE_AUDIO_DEBUG
+						DEBUG_LOG((" Killed (no handles available)"));
+					#endif
+				}
+				else
+				{
+					audio = NULL;
+					#ifdef INTENSIVE_AUDIO_DEBUG
+						DEBUG_LOG((" Playing."));
+					#endif
+				}
+			}
+			else
+			{
+				// UI sounds are always 2-D. All other sounds should be Positional
+				// Unit acknowledgement, etc, falls into the UI category of sound.
+				Bool foundSoundToReplace = false;
+				if (handleToKill) {
+					for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
+						playing = (*it);
+						if (!playing) {
+							continue;
+						}
+
+						if (playing->m_audioEventRTS && playing->m_audioEventRTS->getPlayingHandle() == handleToKill)
+						{
+							//Release this 2D sound channel immediately because we are going to play another sound in it's place.
+							releasePlayingAudio(playing);
+							m_playingSounds.erase(it);
+							foundSoundToReplace = true;
+							break;
+						}
+					}
+				}
+
+				HSAMPLE sample;
+				if( !handleToKill || foundSoundToReplace )
+				{
+					sample = getFirst2DSample(event);
+					if( !sample )
+					{
+						//If we don't have an available sample, kill the lowest priority assuming we have one that is lower
+						//than the sound we are trying to add. One possibility for strangeness is when an interrupt sound
+						//that wants to kill a handle to replace it, it's possible that another request already killed it,
+						//in which case we need to attempt to find another sound to kill.
+						if( killLowestPrioritySoundImmediately( event ) )
+						{
+							sample = getFirst2DSample( event );
+						}
+					}
+					}
+				else
+				{
+					sample = NULL;
+				}
+
+				// Push it onto the list of playing things
+				audio->m_audioEventRTS = event;
+				audio->m_sample = sample;
+				audio->m_file = NULL;
+				audio->m_type = PAT_Sample;
+				m_playingSounds.push_back(audio);
+
+				if (sample) {
+					audio->m_file = playSample(event, sample);
+					m_sound->notifyOf2DSampleStart();
+				}
+
+				if (!audio->m_file) {
+					#ifdef INTENSIVE_AUDIO_DEBUG
+						DEBUG_LOG((" Killed (no handles available)"));
+					#endif
+					m_playingSounds.pop_back();
+				} else {
+					audio = NULL;
+				}
+
+				#ifdef INTENSIVE_AUDIO_DEBUG
+					DEBUG_LOG((" Playing."));
+				#endif
+			}
+			break;
+		}
+	}
+
+	// If we were able to successfully play audio, then we set it to NULL above. (And it will be freed
+	// later. However, if audio is non-NULL at this point, then it must be freed.
+	if (audio) {
+		releasePlayingAudio(audio);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::stopAudioEvent( AudioHandle handle )
+{
+#ifdef INTENSIVE_AUDIO_DEBUG
+	DEBUG_LOG(("MILES (%d) - Processing stop request: %d", TheGameLogic->getFrame(), handle));
+#endif
+
+	std::list<PlayingAudio *>::iterator it;
+	if ( handle == AHSV_StopTheMusic || handle == AHSV_StopTheMusicFade ) {
+		// for music, just find the currently playing music stream and kill it.
+		for ( it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it ) {
+			PlayingAudio *audio = (*it);
+			if (!audio) {
+				continue;
+			}
+
+			if( audio->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music )
+			{
+				if( handle == AHSV_StopTheMusicFade )
+				{
+					m_fadingAudio.push_back(audio);
+				}
+				else
+				{
+					//m_stoppedAudio.push_back(audio);
+					releasePlayingAudio( audio );
+				}
+				m_playingStreams.erase(it);
+				break;
+			}
+		}
+	}
+
+	for ( it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it ) {
+		PlayingAudio *audio = (*it);
+		if (!audio) {
+			continue;
+		}
+
+		if (audio->m_audioEventRTS->getPlayingHandle() == handle) {
+			// found it
+			audio->m_requestStop = true;
+			notifyOfAudioCompletion((UnsignedInt)(audio->m_stream), PAT_Stream);
+			break;
+		}
+	}
+
+	for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
+		PlayingAudio *audio = (*it);
+		if (!audio) {
+			continue;
+		}
+
+		if (audio->m_audioEventRTS->getPlayingHandle() == handle) {
+			audio->m_requestStop = true;
+			break;
+		}
+	}
+
+	for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
+		PlayingAudio *audio = (*it);
+		if (!audio) {
+			continue;
+		}
+
+		if (audio->m_audioEventRTS->getPlayingHandle() == handle) {
+		#ifdef INTENSIVE_AUDIO_DEBUG
+			DEBUG_LOG((" (%s)", audio->m_audioEventRTS->getEventName()));
+		#endif
+			audio->m_requestStop = true;
+			break;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::killAudioEventImmediately( AudioHandle audioEvent )
+{
+	//First look for it in the request list.
+	std::list<AudioRequest*>::iterator ait;
+	for( ait = m_audioRequests.begin(); ait != m_audioRequests.end(); ait++ )
+	{
+		AudioRequest *req = (*ait);
+		if( req && req->m_request == AR_Play && req->m_handleToInteractOn == audioEvent )
+		{
+			deleteInstance(req);
+			ait = m_audioRequests.erase(ait);
+			return;
+		}
+	}
+
+	//Look for matching 3D sound to kill
+	std::list<PlayingAudio *>::iterator it;
+	for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); it++ )
+	{
+		PlayingAudio *audio = (*it);
+		if( !audio )
+		{
+			continue;
+		}
+
+		if( audio->m_audioEventRTS->getPlayingHandle() == audioEvent )
+		{
+			releasePlayingAudio( audio );
+			m_playing3DSounds.erase( it );
+			return;
+		}
+	}
+
+	//Look for matching 2D sound to kill
+	for( it = m_playingSounds.begin(); it != m_playingSounds.end(); it++ )
+	{
+		PlayingAudio *audio = (*it);
+		if( !audio )
+		{
+			continue;
+		}
+
+		if( audio->m_audioEventRTS->getPlayingHandle() == audioEvent )
+		{
+			releasePlayingAudio( audio );
+			m_playingSounds.erase( it );
+			return;
+		}
+	}
+
+	//Look for matching steaming sound to kill
+	for( it = m_playingStreams.begin(); it != m_playingStreams.end(); it++ )
+	{
+		PlayingAudio *audio = (*it);
+		if( !audio )
+		{
+			continue;
+		}
+
+		if( audio->m_audioEventRTS->getPlayingHandle() == audioEvent )
+		{
+			releasePlayingAudio( audio );
+			m_playingStreams.erase( it );
+			return;
+		}
+	}
+
+}
+
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::pauseAudioEvent( AudioHandle handle )
+{
+	// pause audio
+}
+
+//-------------------------------------------------------------------------------------------------
+void *MilesAudioManager::loadFileForRead( AudioEventRTS *eventToLoadFrom )
+{
+	return m_audioCache->openFile(eventToLoadFrom);
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::closeFile( void *fileRead )
+{
+	m_audioCache->closeFile(fileRead);
+}
+
+
+//-------------------------------------------------------------------------------------------------
+PlayingAudio *MilesAudioManager::allocatePlayingAudio( void )
+{
+	PlayingAudio *aud = NEW PlayingAudio;	// poolify
+	aud->m_status = PS_Playing;
+	return aud;
+}
+
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::releaseMilesHandles( PlayingAudio *release )
+{
+	switch (release->m_type)
+	{
+		case PAT_Sample:
+		{
+			if (release->m_sample) {
+				AIL_register_EOS_callback(release->m_sample, NULL);
+				AIL_stop_sample(release->m_sample);
+				m_availableSamples.push_back(release->m_sample);
+			}
+			break;
+		}
+		case PAT_3DSample:
+		{
+			if (release->m_3DSample) {
+				AIL_register_3D_EOS_callback(release->m_3DSample, NULL);
+				AIL_stop_3D_sample(release->m_3DSample);
+				m_available3DSamples.push_back(release->m_3DSample);
+			}
+			break;
+		}
+		case PAT_Stream:
+		{
+			if (release->m_stream) {
+				AIL_register_stream_callback(release->m_stream, NULL);
+				AIL_close_stream(release->m_stream);
+			}
+			break;
+		}
+	}
+	release->m_type = PAT_INVALID;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::releasePlayingAudio( PlayingAudio *release )
+{
+	if (release->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_SoundEffect) {
+		if (release->m_type == PAT_Sample) {
+			if (release->m_sample) {
+				m_sound->notifyOf2DSampleCompletion();
+			}
+		} else {
+			if (release->m_3DSample) {
+				m_sound->notifyOf3DSampleCompletion();
+			}
+		}
+	}
+	releaseMilesHandles(release);	// forces stop of this audio
+	closeFile( release->m_file );
+	if (release->m_cleanupAudioEventRTS) {
+		releaseAudioEventRTS(release->m_audioEventRTS);
+	}
+	delete release;
+	release = NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::stopAllAudioImmediately( void )
+{
+	std::list<PlayingAudio *>::iterator it;
+	PlayingAudio *playing;
+
+	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ) {
+		playing = *it;
+		if (!playing) {
+			continue;
+		}
+
+		releasePlayingAudio(playing);
+		it = m_playingSounds.erase(it);
+	}
+
+	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ) {
+		playing = *it;
+		if (!playing) {
+			continue;
+		}
+
+		releasePlayingAudio(playing);
+		it = m_playing3DSounds.erase(it);
+	}
+
+	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ) {
+		playing = (*it);
+		if (!playing) {
+			continue;
+		}
+
+		releasePlayingAudio(playing);
+		it = m_playingStreams.erase(it);
+	}
+
+  for (it = m_fadingAudio.begin(); it != m_fadingAudio.end(); ) {
+    playing = (*it);
+    if (!playing) {
+      continue;
+    }
+
+    releasePlayingAudio(playing);
+    it = m_fadingAudio.erase(it);
+  }
+
+	std::list<HAUDIO>::iterator hit;
+	for (hit = m_audioForcePlayed.begin(); hit != m_audioForcePlayed.end(); ++hit) {
+		if (*hit) {
+			AIL_quick_unload(*hit);
+		}
+	}
+
+	m_audioForcePlayed.clear();
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::freeAllMilesHandles( void )
+{
+	// First, we need to ensure that we don't have any sample handles open. To that end, we must stop
+	// all of our currently playing audio.
+	stopAllAudioImmediately();
+
+	// Walks through the available 2-D and 3-D handles and releases them
+	std::list<HSAMPLE>::iterator it;
+	for ( it = m_availableSamples.begin(); it != m_availableSamples.end(); /* empty */ ) {
+		HSAMPLE sample = *it;
+		AIL_release_sample_handle(sample);
+		it = m_availableSamples.erase(it);
+	}
+	m_num2DSamples = 0;
+
+	std::list<H3DSAMPLE>::iterator it3D;
+	for ( it3D = m_available3DSamples.begin(); it3D != m_available3DSamples.end(); /* empty */ ) {
+		H3DSAMPLE sample3D = *it3D;
+		AIL_release_3D_sample_handle(sample3D);
+		it3D = m_available3DSamples.erase(it3D);
+	}
+	m_num3DSamples = 0;
+	m_numStreams = 0;
+}
+
+//-------------------------------------------------------------------------------------------------
+HSAMPLE MilesAudioManager::getFirst2DSample( AudioEventRTS *event )
+{
+	if (m_availableSamples.begin() != m_availableSamples.end()) {
+		HSAMPLE retSample = *m_availableSamples.begin();
+		m_availableSamples.erase(m_availableSamples.begin());
+		return (retSample);
+	}
+
+	// Find the first sample of lower priority than my augmented priority that is interruptable and take its handle
+
+	return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+H3DSAMPLE MilesAudioManager::getFirst3DSample( AudioEventRTS *event )
+{
+	if (m_available3DSamples.begin() != m_available3DSamples.end()) {
+		H3DSAMPLE retSample = *m_available3DSamples.begin();
+		m_available3DSamples.erase(m_available3DSamples.begin());
+		return (retSample);
+	}
+
+	// Find the first sample of lower priority than my augmented priority that is interruptable and take its handle
+	return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::adjustPlayingVolume( PlayingAudio *audio )
+{
+	Real desiredVolume = audio->m_audioEventRTS->getVolume() * audio->m_audioEventRTS->getVolumeShift();
+	Real pan;
+	if (audio->m_type == PAT_Sample) {
+		AIL_sample_volume_pan(audio->m_sample, NULL, &pan);
+		AIL_set_sample_volume_pan(audio->m_sample, m_soundVolume * desiredVolume, pan);
+
+	} else if (audio->m_type == PAT_3DSample) {
+		AIL_set_3D_sample_volume(audio->m_3DSample, m_sound3DVolume * desiredVolume);
+
+	} else if (audio->m_type == PAT_Stream) {
+		AIL_stream_volume_pan(audio->m_stream, NULL, &pan);
+		if (audio->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music ) {
+			AIL_set_stream_volume_pan(audio->m_stream, m_musicVolume * desiredVolume, pan);
+
+		} else {
+			AIL_set_stream_volume_pan(audio->m_stream, m_speechVolume * desiredVolume, pan);
+
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::stopAllSpeech( void )
+{
+	std::list<PlayingAudio *>::iterator it;
+	PlayingAudio *playing;
+	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ) {
+		playing = (*it);
+		if (!playing) {
+			continue;
+		}
+
+		if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Streaming) {
+			releasePlayingAudio(playing);
+			it = m_playingStreams.erase(it);
+		} else {
+			++it;
+		}
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::initFilters( HSAMPLE sample, const AudioEventRTS *event )
+{
+	// set the sample volume
+	Real volume = event->getVolume() * event->getVolumeShift() * m_soundVolume;
+	AIL_set_sample_volume_pan(sample, volume, 0.5f);
+
+	// pitch shift
+	Real pitchShift = event->getPitchShift();
+	if (pitchShift == 0.0f) {
+		DEBUG_CRASH(("Invalid Pitch shift in sound: '%s'", event->getEventName().str()) );
+	} else {
+		AIL_set_sample_playback_rate(sample, REAL_TO_INT(AIL_sample_playback_rate(sample) * pitchShift));
+	}
+
+	// set up delay filter, if applicable
+	if (event->getDelay() > 0.0f) {
+		Real value;
+		value = event->getDelay();
+		AIL_set_sample_processor(sample, DP_FILTER, m_delayFilter);
+		AIL_set_filter_sample_preference(sample, "Mono Delay Time", &value);
+
+		value = 0.0;
+		AIL_set_filter_sample_preference(sample, "Mono Delay", &value);
+		AIL_set_filter_sample_preference(sample, "Mono Delay Mix", &value);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::initFilters3D( H3DSAMPLE sample, const AudioEventRTS *event, const Coord3D *pos )
+{
+	// set the sample volume
+	Real volume = event->getVolume() * event->getVolumeShift() * m_sound3DVolume;
+	AIL_set_3D_sample_volume(sample, volume);
+
+	// pitch shift
+	Real pitchShift = event->getPitchShift();
+	if (pitchShift == 0.0f) {
+		DEBUG_CRASH(("Invalid Pitch shift in sound: '%s'", event->getEventName().str()) );
+	} else {
+		AIL_set_3D_sample_playback_rate(sample, REAL_TO_INT(AIL_3D_sample_playback_rate(sample) * pitchShift));
+	}
+
+	// Low pass filter
+	if (event->getAudioEventInfo()->m_lowPassFreq > 0 && !isOnScreen(pos) ) {
+		AIL_set_3D_sample_occlusion(sample, 1.0f - event->getAudioEventInfo()->m_lowPassFreq);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::nextMusicTrack( void )
+{
+	AsciiString trackName;
+	std::list<PlayingAudio *>::iterator it;
+	PlayingAudio *playing;
+	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+		playing = *it;
+		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
+			trackName = playing->m_audioEventRTS->getEventName();
+		}
+	}
+
+	// Stop currently playing music
+	TheAudio->removeAudioEvent(AHSV_StopTheMusic);
+
+	trackName = nextTrackName(trackName);
+	AudioEventRTS newTrack(trackName);
+	TheAudio->addAudioEvent(&newTrack);
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::prevMusicTrack( void )
+{
+	AsciiString trackName;
+	std::list<PlayingAudio *>::iterator it;
+	PlayingAudio *playing;
+	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+		playing = *it;
+		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
+			trackName = playing->m_audioEventRTS->getEventName();
+		}
+	}
+
+	// Stop currently playing music
+	TheAudio->removeAudioEvent(AHSV_StopTheMusic);
+
+	trackName = prevTrackName(trackName);
+	AudioEventRTS newTrack(trackName);
+	TheAudio->addAudioEvent(&newTrack);
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::isMusicPlaying( void ) const
+{
+	std::list<PlayingAudio *>::const_iterator it;
+	PlayingAudio *playing;
+	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+		playing = *it;
+		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const
+{
+	std::list<PlayingAudio *>::const_iterator it;
+	PlayingAudio *playing;
+	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+		playing = *it;
+		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
+			if (playing->m_audioEventRTS->getEventName() == trackName) {
+				if (INFINITE_LOOP_COUNT - AIL_stream_loop_count(playing->m_stream) >= numberOfTimes) {
+					return TRUE;
+				}
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+//-------------------------------------------------------------------------------------------------
+AsciiString MilesAudioManager::getMusicTrackName( void ) const
+{
+	// First check the requests. If there's one there, then report that as the currently playing track.
+	std::list<AudioRequest *>::const_iterator ait;
+	for (ait = m_audioRequests.begin(); ait != m_audioRequests.end(); ++ait) {
+		if ((*ait)->m_request != AR_Play) {
+			continue;
+		}
+
+		if (!(*ait)->m_usePendingEvent) {
+			continue;
+		}
+
+		if ((*ait)->m_pendingEvent->getAudioEventInfo()->m_soundType == AT_Music) {
+			return (*ait)->m_pendingEvent->getEventName();
+		}
+	}
+
+	std::list<PlayingAudio *>::const_iterator it;
+	PlayingAudio *playing;
+	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+		playing = *it;
+		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
+			return playing->m_audioEventRTS->getEventName();
+		}
+	}
+
+	return AsciiString::TheEmptyString;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::openDevice( void )
+{
+	if (!TheGlobalData->m_audioOn) {
+		return;
+	}
+
+	AIL_set_redist_directory("MSS\\");
+	AIL_startup();
+	Int retval = 0;
+
+	// AIL_quick_startup should be replaced later with a call to actually pick which device to use, etc
+	const AudioSettings *audioSettings = getAudioSettings();
+	m_selectedSpeakerType = TheAudio->translateSpeakerTypeToUnsignedInt(m_prefSpeaker);
+
+	retval = AIL_quick_startup(audioSettings->m_useDigital, audioSettings->m_useMidi, audioSettings->m_outputRate, audioSettings->m_outputBits, audioSettings->m_outputChannels);
+
+	// Quick handles tells us where to store the various devices. For now, we're only interested in the digital handle.
+	AIL_quick_handles(&m_digitalHandle, NULL, NULL);
+
+	if (retval) {
+		buildProviderList();
+	} else {
+		// if we couldn't initialize any devices, turn sound off (fail silently)
+		setOn( false, AudioAffect_All );
+	}
+
+	selectProvider(TheAudio->getProviderIndex(m_pref3DProvider));
+
+	// Now that we're all done, update the cached variables so that everything is in sync.
+	TheAudio->refreshCachedVariables();
+
+	if (!isValidProvider()) {
+		return;
+	}
+
+	initDelayFilter();
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::closeDevice( void )
+{
+	freeAllMilesHandles();
+	unselectProvider();
+	AIL_shutdown();
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::isCurrentlyPlaying( AudioHandle handle )
+{
+	std::list<PlayingAudio *>::iterator it;
+	PlayingAudio *playing;
+
+	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
+		playing = *it;
+		if (playing && playing->m_audioEventRTS->getPlayingHandle() == handle) {
+			return true;
+		}
+	}
+
+	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
+		playing = *it;
+		if (playing && playing->m_audioEventRTS->getPlayingHandle() == handle) {
+			return true;
+		}
+	}
+
+	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+		playing = *it;
+		if (playing && playing->m_audioEventRTS->getPlayingHandle() == handle) {
+			return true;
+		}
+	}
+
+	// if something is requested, it is also considered playing
+	std::list<AudioRequest *>::iterator ait;
+	AudioRequest *req = NULL;
+	for (ait = m_audioRequests.begin(); ait != m_audioRequests.end(); ++ait) {
+		req = *ait;
+		if (req && req->m_usePendingEvent && req->m_pendingEvent->getPlayingHandle() == handle) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags )
+{
+	PlayingAudio *playing = findPlayingAudioFrom(audioCompleted, flags);
+	if (!playing) {
+		DEBUG_CRASH(("Audio has completed playing, but we can't seem to find it. - jkmcd"));
+		return;
+	}
+
+	if (getDisallowSpeech() && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Streaming) {
+		setDisallowSpeech(FALSE);
+	}
+
+	if (playing->m_audioEventRTS->getAudioEventInfo()->m_control & AC_LOOP) {
+		if (playing->m_audioEventRTS->getNextPlayPortion() == PP_Attack) {
+			playing->m_audioEventRTS->setNextPlayPortion(PP_Sound);
+		}
+		if (playing->m_audioEventRTS->getNextPlayPortion() == PP_Sound) {
+			// First, decrease the loop count.
+			playing->m_audioEventRTS->decreaseLoopCount();
+
+			// Now, try to start the next loop
+			if (startNextLoop(playing)) {
+				return;
+			}
+		}
+	}
+
+	playing->m_audioEventRTS->advanceNextPlayPortion();
+	if (playing->m_audioEventRTS->getNextPlayPortion() != PP_Done) {
+		if (playing->m_type == PAT_Sample) {
+			closeFile(playing->m_file);	// close it so as not to leak it.
+			playing->m_file = playSample(playing->m_audioEventRTS, playing->m_sample);
+
+			// If we don't have a file now, then we should drop to the stopped status so that
+			// We correctly close this handle.
+			if (playing->m_file) {
+				return;
+			}
+		} else if (playing->m_type == PAT_3DSample) {
+			closeFile(playing->m_file);	// close it so as not to leak it.
+			playing->m_file = playSample3D(playing->m_audioEventRTS, playing->m_3DSample);
+
+			// If we don't have a file now, then we should drop to the stopped status so that
+			// We correctly close this handle.
+			if (playing->m_file) {
+				return;
+			}
+		}
+	}
+
+	if (playing->m_type == PAT_Stream) {
+		if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
+			playStream(playing->m_audioEventRTS, playing->m_stream);
+
+			return;
+		}
+	}
+
+	playing->m_status = PS_Stopped;	// it will be cleaned up on the next frame update
+}
+
+//-------------------------------------------------------------------------------------------------
+PlayingAudio *MilesAudioManager::findPlayingAudioFrom( UnsignedInt audioCompleted, UnsignedInt flags )
+{
+	std::list<PlayingAudio *>::iterator it;
+	PlayingAudio *playing;
+
+	if (flags == PAT_Sample) {
+		HSAMPLE sample = (HSAMPLE) audioCompleted;
+		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
+			playing = *it;
+			if (playing && playing->m_sample == sample) {
+				return playing;
+			}
+		}
+	}
+
+	if (flags == PAT_3DSample) {
+		H3DSAMPLE sample3D = (H3DSAMPLE) audioCompleted;
+		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
+			playing = *it;
+			if (playing && playing->m_3DSample == sample3D) {
+				return playing;
+			}
+		}
+	}
+
+	if (flags == PAT_Stream) {
+		HSTREAM stream = (HSTREAM) audioCompleted;
+		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+			playing = *it;
+			if (playing && playing->m_stream == stream) {
+				return playing;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+
+//-------------------------------------------------------------------------------------------------
+UnsignedInt MilesAudioManager::getProviderCount( void ) const
+{
+	return m_providerCount;
+}
+
+//-------------------------------------------------------------------------------------------------
+AsciiString MilesAudioManager::getProviderName( UnsignedInt providerNum ) const
+{
+	if (isOn(AudioAffect_Sound3D) && providerNum < m_providerCount) {
+		return m_provider3D[providerNum].name;
+	}
+
+	return AsciiString::TheEmptyString;
+}
+
+//-------------------------------------------------------------------------------------------------
+UnsignedInt MilesAudioManager::getProviderIndex( AsciiString providerName ) const
+{
+	for (UnsignedInt i = 0; i < m_providerCount; ++i) {
+		if (providerName == m_provider3D[i].name) {
+			return i;
+		}
+	}
+
+	return PROVIDER_ERROR;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::selectProvider( UnsignedInt providerNdx )
+{
+	if (!isOn(AudioAffect_Sound3D))
+	{
+		return;
+	}
+
+	if (providerNdx == m_selectedProvider)
+	{
+		return;
+	}
+
+	if (isValidProvider())
+	{
+		freeAllMilesHandles();
+		unselectProvider();
+	}
+
+	LPDIRECTSOUND lpDirectSoundInfo;
+	AIL_get_DirectSound_info( NULL, (void**)&lpDirectSoundInfo, NULL );
+	Bool useDolby = FALSE;
+	if( lpDirectSoundInfo )
+	{
+		DWORD speakerConfig;
+		lpDirectSoundInfo->GetSpeakerConfig( &speakerConfig );
+		switch( DSSPEAKER_CONFIG( speakerConfig ) )
+		{
+			case DSSPEAKER_DIRECTOUT:
+				m_selectedSpeakerType = AIL_3D_2_SPEAKER;
+				break;
+			case DSSPEAKER_MONO:
+				m_selectedSpeakerType = AIL_3D_2_SPEAKER;
+				break;
+			case DSSPEAKER_STEREO:
+				m_selectedSpeakerType = AIL_3D_2_SPEAKER;
+				break;
+			case DSSPEAKER_HEADPHONE:
+				m_selectedSpeakerType = AIL_3D_HEADPHONE;
+				useDolby = TRUE;
+				break;
+			case DSSPEAKER_QUAD:
+				m_selectedSpeakerType = AIL_3D_4_SPEAKER;
+				useDolby = TRUE;
+				break;
+			case DSSPEAKER_SURROUND:
+				m_selectedSpeakerType = AIL_3D_SURROUND;
+				useDolby = TRUE;
+				break;
+			case DSSPEAKER_5POINT1:
+				m_selectedSpeakerType = AIL_3D_51_SPEAKER;
+				useDolby = TRUE;
+				break;
+			case DSSPEAKER_7POINT1:
+				m_selectedSpeakerType = AIL_3D_71_SPEAKER;
+				useDolby = TRUE;
+				break;
+		}
+	}
+
+	Bool success = FALSE;
+	if( useDolby )
+	{
+		providerNdx = getProviderIndex( "Dolby Surround" );
+	}
+	else
+	{
+		providerNdx = getProviderIndex( "Miles Fast 2D Positional Audio" );
+	}
+	success = AIL_open_3D_provider( m_provider3D[providerNdx].id ) == 0;
+
+	//if (providerNdx < m_providerCount)
+	//{
+	//	failed = AIL_open_3D_provider(m_provider3D[providerNdx].id);
+	//}
+
+
+
+	if( !success )
+	{
+		m_selectedProvider = PROVIDER_ERROR;
+		// try to select a failsafe
+		providerNdx = getProviderIndex( "Miles Fast 2D Positional Audio" );
+		success = AIL_open_3D_provider( m_provider3D[providerNdx].id ) == 0;
+	}
+
+	if ( success )
+	{
+		m_selectedProvider = providerNdx;
+
+		initSamplePools();
+
+		createListener();
+		setSpeakerType(m_selectedSpeakerType);
+		if (TheVideoPlayer)
+		{
+			TheVideoPlayer->notifyVideoPlayerOfNewProvider(TRUE);
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::unselectProvider( void )
+{
+	if (!(isOn(AudioAffect_Sound3D) && isValidProvider())) {
+		return;
+	}
+
+	if (TheVideoPlayer) {
+		TheVideoPlayer->notifyVideoPlayerOfNewProvider(FALSE);
+	}
+	AIL_close_3D_listener(m_listener);
+	m_listener = NULL;
+
+	AIL_close_3D_provider(m_provider3D[m_selectedProvider].id);
+	m_lastProvider = m_selectedProvider;
+
+	m_selectedProvider = PROVIDER_ERROR;
+}
+
+//-------------------------------------------------------------------------------------------------
+UnsignedInt MilesAudioManager::getSelectedProvider( void ) const
+{
+	return m_selectedProvider;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::setSpeakerType( UnsignedInt speakerType )
+{
+	if (!isValidProvider()) {
+		return;
+	}
+
+	AIL_set_3D_speaker_type( m_provider3D[m_selectedProvider].id, speakerType );
+	m_selectedSpeakerType = speakerType;
+}
+
+//-------------------------------------------------------------------------------------------------
+UnsignedInt MilesAudioManager::getSpeakerType( void )
+{
+	if (!isValidProvider()) {
+		return 0;
+	}
+
+	return m_selectedSpeakerType;
+}
+
+//-------------------------------------------------------------------------------------------------
+UnsignedInt MilesAudioManager::getNum2DSamples( void ) const
+{
+	return m_num2DSamples;
+}
+
+//-------------------------------------------------------------------------------------------------
+UnsignedInt MilesAudioManager::getNum3DSamples( void ) const
+{
+	return m_num3DSamples;
+}
+
+//-------------------------------------------------------------------------------------------------
+UnsignedInt MilesAudioManager::getNumStreams( void ) const
+{
+	return m_numStreams;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::doesViolateLimit( AudioEventRTS *event ) const
+{
+	Int limit = event->getAudioEventInfo()->m_limit;
+	if (limit == 0) {
+		return false;
+	}
+
+	Int totalCount = 0;
+	Int totalRequestCount = 0;
+
+	std::list<PlayingAudio *>::const_iterator it;
+	if (!event->isPositionalAudio()) {
+		// 2-D
+		for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
+			if ((*it)->m_audioEventRTS->getEventName() == event->getEventName()) {
+				if (totalCount == 0) {
+					// This is the oldest audio of this type playing.
+					event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
+				}
+				++totalCount;
+			}
+		}
+	} else {
+		// 3-D
+		for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
+			if ((*it)->m_audioEventRTS->getEventName() == event->getEventName()) {
+				if (totalCount == 0) {
+					// This is the oldest audio of this type playing.
+					event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
+				}
+				++totalCount;
+			}
+		}
+	}
+
+	// Also check the request list in case we've requested to play this sound.
+	std::list<AudioRequest*>::const_iterator arIt;
+	for (arIt = m_audioRequests.begin(); arIt != m_audioRequests.end(); ++arIt) {
+		AudioRequest *req = (*arIt);
+		if (req == NULL) {
+			continue;
+		}
+		if( req->m_usePendingEvent )
+		{
+			if( req->m_pendingEvent->getEventName() == event->getEventName() )
+			{
+				totalRequestCount++;
+				totalCount++;
+			}
+		}
+	}
+
+	//If our event is an interrupting type, then normally we would always add it. The exception is when we have requested
+	//multiple sounds in the same frame and those requests violate the limit. Because we don't have any "old" sounds to
+	//remove in the case of an interrupt, we need to catch it early and prevent the sound from being added if we already
+	//reached the limit
+	if( event->getAudioEventInfo()->m_control & AC_INTERRUPT )
+	{
+		if( totalRequestCount < limit )
+		{
+			Int totalPlayingCount = totalCount - totalRequestCount;
+			if( totalRequestCount + totalPlayingCount < limit )
+			{
+				//We aren't exceeding the actual limit, then clear the kill handle.
+				event->setHandleToKill(0);
+				return false;
+			}
+
+			//We are exceeding the limit - the kill handle will kill the
+			//oldest playing sound to enforce the actual limit.
+			return false;
+		}
+	}
+
+	if( totalCount < limit )
+	{
+		event->setHandleToKill(0);
+		return false;
+	}
+
+	return true;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::isPlayingAlready( AudioEventRTS *event ) const
+{
+	std::list<PlayingAudio *>::const_iterator it;
+	if (!event->isPositionalAudio()) {
+		// 2-D
+		for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
+			if ((*it)->m_audioEventRTS->getEventName() == event->getEventName()) {
+				return true;
+			}
+		}
+	} else {
+		// 3-D
+		for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
+			if ((*it)->m_audioEventRTS->getEventName() == event->getEventName()) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::isObjectPlayingVoice( UnsignedInt objID ) const
+{
+	if (objID == 0) {
+		return false;
+	}
+
+	std::list<PlayingAudio *>::const_iterator it;
+		// 2-D
+	for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
+		if ((*it)->m_audioEventRTS->getObjectID() == objID && (*it)->m_audioEventRTS->getAudioEventInfo()->m_type & ST_VOICE) {
+			return true;
+		}
+	}
+
+	// 3-D
+	for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
+		if ((*it)->m_audioEventRTS->getObjectID() == objID && (*it)->m_audioEventRTS->getAudioEventInfo()->m_type & ST_VOICE) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioEventRTS* MilesAudioManager::findLowestPrioritySound( AudioEventRTS *event )
+{
+	AudioPriority priority = event->getAudioEventInfo()->m_priority;
+	if( priority == AP_LOWEST )
+	{
+		//If the event we pass in is the lowest priority, don't bother checking because
+		//there is nothing lower priority than lowest.
+		return NULL;
+	}
+	AudioEventRTS *lowestPriorityEvent = NULL;
+	AudioPriority lowestPriority;
+
+	std::list<PlayingAudio *>::const_iterator it;
+	if( event->isPositionalAudio() )
+	{
+		//3D
+		for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it )
+		{
+			AudioEventRTS *itEvent = (*it)->m_audioEventRTS;
+			AudioPriority itPriority = itEvent->getAudioEventInfo()->m_priority;
+			if( itPriority < priority )
+			{
+				if( !lowestPriorityEvent || lowestPriority > itPriority )
+				{
+					lowestPriorityEvent = itEvent;
+					lowestPriority = itPriority;
+					if( lowestPriority == AP_LOWEST )
+					{
+						return lowestPriorityEvent;
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		//2D
+		for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it )
+		{
+			AudioEventRTS *itEvent = (*it)->m_audioEventRTS;
+			AudioPriority itPriority = itEvent->getAudioEventInfo()->m_priority;
+			if( itPriority < priority )
+			{
+				if( !lowestPriorityEvent || lowestPriority > itPriority )
+				{
+					lowestPriorityEvent = itEvent;
+					lowestPriority = itPriority;
+					if( lowestPriority == AP_LOWEST )
+					{
+						return lowestPriorityEvent;
+					}
+				}
+			}
+		}
+	}
+	return lowestPriorityEvent;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::isPlayingLowerPriority( AudioEventRTS *event ) const
+{
+	//We don't actually want to do anything to this CONST function. Remember, we're
+	//just checking to see if there is a lower priority sound.
+	AudioPriority priority = event->getAudioEventInfo()->m_priority;
+	if( priority == AP_LOWEST )
+	{
+		//If the event we pass in is the lowest priority, don't bother checking because
+		//there is nothing lower priority than lowest.
+		return false;
+	}
+	std::list<PlayingAudio *>::const_iterator it;
+	if (!event->isPositionalAudio()) {
+		// 2-D
+		for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
+			if ((*it)->m_audioEventRTS->getAudioEventInfo()->m_priority < priority) {
+				//event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
+				return true;
+			}
+		}
+	} else {
+		// 3-D
+		for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
+			if ((*it)->m_audioEventRTS->getAudioEventInfo()->m_priority < priority) {
+				//event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::killLowestPrioritySoundImmediately( AudioEventRTS *event )
+{
+	//Actually, we want to kill the LOWEST PRIORITY SOUND, not the first "lower" priority
+	//sound we find, because it could easily be
+	AudioEventRTS *lowestPriorityEvent = findLowestPrioritySound( event );
+	if( lowestPriorityEvent )
+	{
+		std::list<PlayingAudio *>::iterator it;
+		if( event->isPositionalAudio() )
+		{
+			for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it )
+			{
+				PlayingAudio *playing = (*it);
+				if( !playing )
+				{
+					continue;
+				}
+
+				if( playing->m_audioEventRTS && playing->m_audioEventRTS == lowestPriorityEvent )
+				{
+					//Release this 3D sound channel immediately because we are going to play another sound in it's place.
+					releasePlayingAudio( playing );
+					m_playing3DSounds.erase( it );
+					return TRUE;
+				}
+			}
+		}
+		else
+		{
+			for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it )
+			{
+				PlayingAudio *playing = (*it);
+				if( !playing )
+				{
+					continue;
+				}
+
+				if( playing->m_audioEventRTS && playing->m_audioEventRTS == lowestPriorityEvent )
+				{
+					//Release this sound channel immediately because we are going to play another sound in it's place.
+					releasePlayingAudio( playing );
+					m_playingSounds.erase( it );
+					return TRUE;
+				}
+			}
+		}
+	}
+	return FALSE;
+}
+
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume)
+{
+	Real pan;
+	std::list<PlayingAudio *>::iterator it;
+
+	PlayingAudio *playing = NULL;
+	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
+		playing = *it;
+		if (playing && playing->m_audioEventRTS->getEventName() == eventName) {
+			// Adjust it
+			playing->m_audioEventRTS->setVolume(newVolume);
+			Real desiredVolume = playing->m_audioEventRTS->getVolume() * playing->m_audioEventRTS->getVolumeShift();
+			AIL_sample_volume_pan(playing->m_sample, NULL, &pan);
+			AIL_set_sample_volume_pan(playing->m_sample, desiredVolume, pan);
+		}
+	}
+
+	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
+		playing = *it;
+		if (playing && playing->m_audioEventRTS->getEventName() == eventName) {
+			// Adjust it
+			playing->m_audioEventRTS->setVolume(newVolume);
+			Real desiredVolume = playing->m_audioEventRTS->getVolume() * playing->m_audioEventRTS->getVolumeShift();
+			AIL_set_3D_sample_volume(playing->m_3DSample, desiredVolume);
+		}
+	}
+
+	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
+		playing = *it;
+		if (playing && playing->m_audioEventRTS->getEventName() == eventName) {
+			// Adjust it
+			playing->m_audioEventRTS->setVolume(newVolume);
+			Real desiredVolume = playing->m_audioEventRTS->getVolume() * playing->m_audioEventRTS->getVolumeShift();
+			AIL_stream_volume_pan(playing->m_stream, NULL, &pan);
+			AIL_set_stream_volume_pan(playing->m_stream, desiredVolume, pan);
+		}
+	}
+}
+
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::removePlayingAudio( AsciiString eventName )
+{
+	std::list<PlayingAudio *>::iterator it;
+
+	PlayingAudio *playing = NULL;
+	for( it = m_playingSounds.begin(); it != m_playingSounds.end(); )
+	{
+		playing = *it;
+		if( playing && playing->m_audioEventRTS->getEventName() == eventName )
+		{
+			releasePlayingAudio( playing );
+			it = m_playingSounds.erase(it);
+		}
+		else
+		{
+			it++;
+		}
+	}
+
+	for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); )
+	{
+		playing = *it;
+		if( playing && playing->m_audioEventRTS->getEventName() == eventName )
+		{
+			releasePlayingAudio( playing );
+			it = m_playing3DSounds.erase(it);
+		}
+		else
+		{
+			it++;
+		}
+	}
+
+	for( it = m_playingStreams.begin(); it != m_playingStreams.end(); )
+	{
+		playing = *it;
+		if( playing && playing->m_audioEventRTS->getEventName() == eventName )
+		{
+			releasePlayingAudio( playing );
+			it = m_playingStreams.erase(it);
+		}
+		else
+		{
+			it++;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::removeAllDisabledAudio()
+{
+	std::list<PlayingAudio *>::iterator it;
+
+	PlayingAudio *playing = NULL;
+	for( it = m_playingSounds.begin(); it != m_playingSounds.end(); )
+	{
+		playing = *it;
+		if( playing && playing->m_audioEventRTS->getVolume() == 0.0f )
+		{
+			releasePlayingAudio( playing );
+			it = m_playingSounds.erase(it);
+		}
+		else
+		{
+			it++;
+		}
+	}
+
+	for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); )
+	{
+		playing = *it;
+		if( playing && playing->m_audioEventRTS->getVolume() == 0.0f )
+		{
+			releasePlayingAudio( playing );
+			it = m_playing3DSounds.erase(it);
+		}
+		else
+		{
+			it++;
+		}
+	}
+
+	for( it = m_playingStreams.begin(); it != m_playingStreams.end(); )
+	{
+		playing = *it;
+		if( playing && playing->m_audioEventRTS->getVolume() == 0.0f )
+		{
+			releasePlayingAudio( playing );
+			it = m_playingStreams.erase(it);
+		}
+		else
+		{
+			it++;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::processRequestList( void )
+{
+	std::list<AudioRequest*>::iterator it;
+	for (it = m_audioRequests.begin(); it != m_audioRequests.end(); /* empty */) {
+		AudioRequest *req = (*it);
+		if (req == NULL) {
+			continue;
+		}
+
+		if (!shouldProcessRequestThisFrame(req)) {
+			adjustRequest(req);
+			++it;
+			continue;
+		}
+
+		if (!req->m_requiresCheckForSample || checkForSample(req)) {
+			processRequest(req);
+		}
+		deleteInstance(req);
+		it = m_audioRequests.erase(it);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::processPlayingList( void )
+{
+	// There are two types of processing we have to do here.
+	// 1. Move the item to the stopped list if it has become stopped.
+	// 2. Update the position of the audio if it is positional
+	std::list<PlayingAudio *>::iterator it;
+	PlayingAudio *playing;
+
+	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); /* empty */) {
+		playing = (*it);
+		if (!playing)
+		{
+			it = m_playingSounds.erase(it);
+			continue;
+		}
+
+		if (playing->m_status == PS_Stopped)
+		{
+			//m_stoppedAudio.push_back(playing);
+			releasePlayingAudio( playing );
+			it = m_playingSounds.erase(it);
+		}
+		else
+		{
+			if (m_volumeHasChanged)
+			{
+				adjustPlayingVolume(playing);
+			}
+			++it;
+		}
+	}
+
+	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); )
+	{
+		playing = (*it);
+		if (!playing)
+		{
+			it = m_playing3DSounds.erase(it);
+			continue;
+		}
+
+		if (playing->m_status == PS_Stopped)
+		{
+			//m_stoppedAudio.push_back(playing);
+			releasePlayingAudio( playing );
+			it = m_playing3DSounds.erase(it);
+		}
+		else
+		{
+			if (m_volumeHasChanged)
+			{
+				adjustPlayingVolume(playing);
+			}
+
+			const Coord3D *pos = getCurrentPositionFromEvent(playing->m_audioEventRTS);
+			if (pos)
+			{
+				if( playing->m_audioEventRTS->isDead() )
+				{
+					stopAudioEvent( playing->m_audioEventRTS->getPlayingHandle() );
+					it++;
+					continue;
+				}
+				else
+				{
+					Real volForConsideration = getEffectiveVolume(playing->m_audioEventRTS);
+					volForConsideration /= (m_sound3DVolume > 0.0f ? m_soundVolume : 1.0f);
+					Bool playAnyways = BitIsSet( playing->m_audioEventRTS->getAudioEventInfo()->m_type, ST_GLOBAL) || playing->m_audioEventRTS->getAudioEventInfo()->m_priority == AP_CRITICAL;
+					if( volForConsideration < m_audioSettings->m_minVolume && !playAnyways )
+					{
+						// don't want to get an additional callback for this sample
+						AIL_register_3D_EOS_callback(playing->m_3DSample, NULL);
+						//m_stoppedAudio.push_back(playing);
+						releasePlayingAudio( playing );
+						it = m_playing3DSounds.erase(it);
+						continue;
+					}
+					else
+					{
+						Real x = pos->x;
+						Real y = pos->y;
+						Real z = pos->z;
+						AIL_set_3D_position( playing->m_3DSample, x, y, z );
+					}
+				}
+			}
+			else
+			{
+				AIL_register_3D_EOS_callback(playing->m_3DSample, NULL);
+				//m_stoppedAudio.push_back(playing);
+				releasePlayingAudio( playing );
+				it = m_playing3DSounds.erase(it);
+				continue;
+			}
+
+			++it;
+		}
+	}
+
+	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ) {
+		playing = (*it);
+		if (!playing)
+		{
+			it = m_playingStreams.erase(it);
+			continue;
+		}
+
+		if (playing->m_status == PS_Stopped)
+		{
+			//m_stoppedAudio.push_back(playing);
+			releasePlayingAudio( playing );
+			it = m_playingStreams.erase(it);
+		}
+		else
+		{
+			if (m_volumeHasChanged)
+			{
+				adjustPlayingVolume(playing);
+			}
+
+			++it;
+		}
+	}
+
+	if (m_volumeHasChanged) {
+		m_volumeHasChanged = false;
+	}
+}
+
+//Patch for a rare bug (only on about 5% of in-studio machines suffer, and not all the time) .
+//The actual mechanics of this problem are still elusive as of the date of this comment. 8/21/03
+//but the cause is clear. Some cinematics do a radical change in the microphone position, which
+//calls for a radical 3DSoundVolume adjustment. If this happens while a stereo stream is *ENDING*,
+//low-level code gets caught in a tight loop. (Hangs) on some machines.
+//To prevent this condition, we just suppress the updating of 3DSoundVolume while one of these
+//is on the list. Since the music tracks play continuously, they never *END* during these cinematics.
+//so we filter them out as, *NOT SENSITIVE*... we do want to update 3DSoundVolume during music,
+//which is almost all of the time.
+
+Bool MilesAudioManager::has3DSensitiveStreamsPlaying( void ) const
+{
+  if ( m_playingStreams.empty() )
+    return FALSE;
+
+	for ( std::list< PlayingAudio* >::const_iterator it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it )
+  {
+		const PlayingAudio *playing = (*it);
+
+    if ( ! playing )
+      continue;
+
+    if ( playing->m_audioEventRTS->getAudioEventInfo()->m_soundType != AT_Music )
+    {
+      return TRUE;
+    }
+
+    if ( playing->m_audioEventRTS->getEventName().startsWith("Game_") == FALSE )
+    {
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+
+}
+
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::processFadingList( void )
+{
+	std::list<PlayingAudio *>::iterator it;
+	PlayingAudio *playing;
+
+	for (it = m_fadingAudio.begin(); it != m_fadingAudio.end(); /* emtpy */) {
+		playing = *it;
+		if (!playing) {
+			continue;
+		}
+
+		if (playing->m_framesFaded >= getAudioSettings()->m_fadeAudioFrames) {
+			playing->m_status = PS_Stopped;
+			playing->m_requestStop = true;
+			//m_stoppedAudio.push_back(playing);
+			releasePlayingAudio( playing );
+			it = m_fadingAudio.erase(it);
+			continue;
+		}
+
+		++playing->m_framesFaded;
+		Real volume = getEffectiveVolume(playing->m_audioEventRTS);
+		volume *= (1.0f - 1.0f * playing->m_framesFaded / getAudioSettings()->m_fadeAudioFrames);
+
+		switch(playing->m_type)
+		{
+			case PAT_Sample:
+			{
+				AIL_set_sample_volume_pan(playing->m_sample, volume, 0.5f);
+				break;
+			}
+
+			case PAT_3DSample:
+			{
+				AIL_set_3D_sample_volume(playing->m_3DSample, volume);
+				break;
+			}
+
+			case PAT_Stream:
+			{
+				AIL_set_stream_volume_pan(playing->m_stream, volume, 0.5f);
+				break;
+			}
+
+		}
+
+		++it;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::processStoppedList( void )
+{
+	std::list<PlayingAudio *>::iterator it;
+	PlayingAudio *playing;
+
+	for (it = m_stoppedAudio.begin(); it != m_stoppedAudio.end(); /* emtpy */) {
+		playing = *it;
+		if (playing) {
+			releasePlayingAudio(playing);
+		}
+		it = m_stoppedAudio.erase(it);
+	}
+}
+
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::shouldProcessRequestThisFrame( AudioRequest *req ) const
+{
+	if (!req->m_usePendingEvent) {
+		return true;
+	}
+
+	if (req->m_pendingEvent->getDelay() < MSEC_PER_LOGICFRAME_REAL) {
+		return true;
+	}
+
+	return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::adjustRequest( AudioRequest *req )
+{
+	if (!req->m_usePendingEvent) {
+		return;
+	}
+
+	req->m_pendingEvent->decrementDelay(MSEC_PER_LOGICFRAME_REAL);
+	req->m_requiresCheckForSample = true;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::checkForSample( AudioRequest *req )
+{
+	if (!req->m_usePendingEvent) {
+		return true;
+	}
+
+  if ( req->m_pendingEvent->getAudioEventInfo() == NULL )
+  {
+    // Fill in event info
+    getInfoForAudioEvent( req->m_pendingEvent );
+  }
+
+	if (req->m_pendingEvent->getAudioEventInfo()->m_type != AT_SoundEffect)
+  {
+		return true;
+	}
+
+	return m_sound->canPlayNow(req->m_pendingEvent);
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::setHardwareAccelerated(Bool accel)
+{
+	// Extends
+	Bool retEarly = (accel == m_hardwareAccel);
+	AudioManager::setHardwareAccelerated(accel);
+
+	if (retEarly) {
+		return;
+	}
+
+	if (m_hardwareAccel) {
+		for (Int i = 0; i < MAX_HW_PROVIDERS; ++i) {
+			UnsignedInt providerNdx = TheAudio->getProviderIndex(TheAudio->getAudioSettings()->m_preferred3DProvider[i]);
+			TheAudio->selectProvider(providerNdx);
+			if (getSelectedProvider() == providerNdx) {
+				return;
+			}
+		}
+	}
+
+	// set it false
+	AudioManager::setHardwareAccelerated(FALSE);
+	UnsignedInt providerNdx = TheAudio->getProviderIndex(TheAudio->getAudioSettings()->m_preferred3DProvider[MAX_HW_PROVIDERS]);
+	TheAudio->selectProvider(providerNdx);
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::setSpeakerSurround(Bool surround)
+{
+	// Extends
+	Bool retEarly = (surround == m_surroundSpeakers);
+	AudioManager::setSpeakerSurround(surround);
+
+	if (retEarly) {
+		return;
+	}
+
+	UnsignedInt speakerType;
+	if (m_surroundSpeakers) {
+		speakerType = TheAudio->getAudioSettings()->m_defaultSpeakerType3D;
+	} else {
+		speakerType = TheAudio->getAudioSettings()->m_defaultSpeakerType2D;
+	}
+
+	TheAudio->setSpeakerType(speakerType);
+}
+
+//-------------------------------------------------------------------------------------------------
+Real MilesAudioManager::getFileLengthMS( AsciiString strToLoad ) const
+{
+	if (strToLoad.isEmpty()) {
+		return 0.0f;
+	}
+
+	// Load it as a stream to get the file info without actually opening the file.
+	HSTREAM stream = AIL_open_stream(m_digitalHandle, strToLoad.str(), 0);
+	if (!stream) {
+		return 0.0f;
+	}
+
+	long retVal;
+	AIL_stream_ms_position(stream, &retVal, NULL);
+	// Now close the stream
+	AIL_close_stream(stream);
+
+	return INT_TO_REAL(retVal);
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::closeAnySamplesUsingFile( const void *fileToClose )
+{
+	std::list<PlayingAudio *>::iterator it;
+	PlayingAudio *playing;
+
+	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ) {
+		playing = *it;
+		if (!playing) {
+			continue;
+		}
+
+		if (playing->m_file == fileToClose) {
+			releasePlayingAudio(playing);
+			it = m_playingSounds.erase(it);
+		} else {
+			++it;
+		}
+	}
+
+	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ) {
+		playing = *it;
+		if (!playing) {
+			continue;
+		}
+
+		if (playing->m_file == fileToClose) {
+			releasePlayingAudio(playing);
+			it = m_playing3DSounds.erase(it);
+		} else {
+			++it;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::setDeviceListenerPosition( void )
+{
+	if (m_listener) {
+		AIL_set_3D_orientation(m_listener, m_listenerOrientation.x, m_listenerOrientation.y, m_listenerOrientation.z, 0, 0, -1);
+
+		Real x = m_listenerPosition.x;
+		Real y = m_listenerPosition.y;
+		Real z = m_listenerPosition.z;
+		AIL_set_3D_position( m_listener, x, y, z );
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+const Coord3D *MilesAudioManager::getCurrentPositionFromEvent( AudioEventRTS *event )
+{
+	if (!event->isPositionalAudio()) {
+		return NULL;
+	}
+
+	return event->getCurrentPosition();
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::isOnScreen( const Coord3D *pos ) const
+{
+	static ICoord2D dummy;
+	// WorldToScreen will return True if the point is onscreen and false if it is offscreen.
+	return TheTacticalView->worldToScreen(pos, &dummy);
+}
+
+//-------------------------------------------------------------------------------------------------
+Real MilesAudioManager::getEffectiveVolume(AudioEventRTS *event) const
+{
+	Real volume = event->getVolume() * event->getVolumeShift();
+
+	switch (event->getAudioEventInfo()->m_soundType)
+	{
+	case AT_Music:
+	{
+		volume *= m_musicVolume;
+		break;
+	}
+	case AT_Streaming:
+	{
+		volume *= m_speechVolume;
+		break;
+	}
+	case AT_SoundEffect:
+	{
+		if (event->isPositionalAudio())
+		{
+			volume *= m_sound3DVolume;
+			const Coord3D *pos = event->getCurrentPosition();
+			if (pos)
+			{
+				Coord3D distance = m_listenerPosition;
+				distance.sub(pos);
+				Real objMinDistance;
+				Real objMaxDistance;
+
+				if (event->getAudioEventInfo()->m_type & ST_GLOBAL)
+				{
+					objMinDistance = TheAudio->getAudioSettings()->m_globalMinRange;
+					objMaxDistance = TheAudio->getAudioSettings()->m_globalMaxRange;
+				}
+				else
+				{
+					objMinDistance = event->getAudioEventInfo()->m_minDistance;
+					objMaxDistance = event->getAudioEventInfo()->m_maxDistance;
+				}
+
+				Real objDistance = distance.length();
+				if( objDistance > objMinDistance )
+				{
+					volume *= 1 / (objDistance / objMinDistance);
+				}
+				if( objDistance >= objMaxDistance )
+				{
+					volume = 0.0f;
+				}
+				//else if( objDistance > objMinDistance )
+				//{
+				//	volume *= 1.0f - (objDistance - objMinDistance) / (objMaxDistance - objMinDistance);
+				//}
+			}
+		}
+		else
+		{
+			volume *= m_soundVolume;
+		}
+		break;
+	}
+	}
+
+	return volume;
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::startNextLoop( PlayingAudio *looping )
+{
+	closeFile(looping->m_file);
+	looping->m_file = NULL;
+
+	if (looping->m_requestStop) {
+		return false;
+	}
+
+	if (looping->m_audioEventRTS->hasMoreLoops()) {
+		// generate a new filename, and test to see whether we can play with it now
+		looping->m_audioEventRTS->generateFilename();
+
+		if (looping->m_audioEventRTS->getDelay() > MSEC_PER_LOGICFRAME_REAL) {
+			// fake it out so that this sound appears done, but also so that it will not
+			// delete the sound on completion (which would suck)
+			looping->m_cleanupAudioEventRTS = false;
+			looping->m_requestStop = true;
+			looping->m_status = PS_Stopped;
+
+
+			AudioRequest *req = allocateAudioRequest(true);
+			req->m_pendingEvent = looping->m_audioEventRTS;
+			req->m_requiresCheckForSample = true;
+			appendAudioRequest(req);
+			return true;
+		}
+
+		if (looping->m_type == PAT_3DSample) {
+			looping->m_file = playSample3D(looping->m_audioEventRTS, looping->m_3DSample);
+		} else {
+			looping->m_file = playSample(looping->m_audioEventRTS, looping->m_sample);
+		}
+
+		return looping->m_file != NULL;
+	}
+	return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::playStream( AudioEventRTS *event, HSTREAM stream )
+{
+	// Force it to the beginning
+	if (event->getAudioEventInfo()->m_soundType == AT_Music) {
+		AIL_set_stream_loop_count(stream, INFINITE_LOOP_COUNT);
+	}
+
+	AIL_register_stream_callback(stream, setStreamCompleted);
+	AIL_start_stream(stream);
+	if (event->getAudioEventInfo()->m_soundType == AT_Music) {
+		// Need to stop/fade out the old music here.
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void *MilesAudioManager::playSample( AudioEventRTS *event, HSAMPLE sample )
+{
+	AIL_init_sample(sample);
+
+	// Prep any sort of filtering, etc, here
+	AIL_register_EOS_callback(sample, setSampleCompleted);
+	initFilters(sample, event);
+
+	// Load the file in
+	void *fileBuffer = NULL;
+	fileBuffer = loadFileForRead(event);
+	if (fileBuffer) {
+		AIL_set_sample_file(sample, fileBuffer, 0);
+
+		// Start playback
+		AIL_start_sample(sample);
+	}
+
+	return fileBuffer;
+}
+
+//-------------------------------------------------------------------------------------------------
+void *MilesAudioManager::playSample3D( AudioEventRTS *event, H3DSAMPLE sample3D )
+{
+	const Coord3D *pos = getCurrentPositionFromEvent(event);
+	if (pos) {
+		// Load the file in
+		void *fileBuffer = loadFileForRead(event);
+		if (fileBuffer) {
+			AIL_set_3D_sample_file(sample3D, fileBuffer);
+
+			// Prep any sort of filtering, etc, here
+			AIL_register_3D_EOS_callback(sample3D, set3DSampleCompleted);
+
+			// Set the position values of the sample here
+			if (event->getAudioEventInfo()->m_type & ST_GLOBAL) {
+				AIL_set_3D_sample_distances(sample3D, TheAudio->getAudioSettings()->m_globalMinRange, TheAudio->getAudioSettings()->m_globalMaxRange );
+			} else {
+				AIL_set_3D_sample_distances(sample3D, event->getAudioEventInfo()->m_minDistance, event->getAudioEventInfo()->m_maxDistance );
+			}
+
+			// Set the position of the sample here
+			Real x = pos->x;
+			Real y = pos->y;
+			Real z = pos->z;
+			AIL_set_3D_position( sample3D, x, y, z );
+			initFilters3D(sample3D, event, pos);
+
+			// Start playback
+			AIL_start_3D_sample(sample3D);
+		}
+		return fileBuffer;
+	}
+
+	return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::buildProviderList( void )
+{
+   HPROENUM next = HPROENUM_FIRST;
+
+	 char *name;
+	 UnsignedInt index = 0;
+	 while (index < MAXPROVIDERS && AIL_enumerate_3D_providers(&next, &m_provider3D[index].id, &name)) {
+		 m_provider3D[index].name.set(name);	// set it to the AsciiString
+		 ++index;
+	 }
+
+	 m_providerCount = index;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::createListener( void )
+{
+	if (!(isOn(AudioAffect_Sound3D) && isValidProvider())) {
+		return;
+	}
+
+	m_listener = AIL_open_3D_listener(m_provider3D[m_selectedProvider].id);
+	// initial listener position will be (0, 0, 0)
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::initDelayFilter( void )
+{
+	if (m_delayFilter != NULL) {
+		return;
+	}
+
+	char* filterName;
+	HPROENUM enumFLTs = HPROENUM_FIRST;
+	HPROVIDER currentProvider;
+
+	while (AIL_enumerate_filters(&enumFLTs, &currentProvider, &filterName )) {
+		if (strcmp(filterName,"Mono Delay Filter") == 0) {
+			m_delayFilter = currentProvider;
+			break;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool MilesAudioManager::isValidProvider( void )
+{
+	return (m_selectedProvider < m_providerCount);
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::initSamplePools( void )
+{
+	if (!(isOn(AudioAffect_Sound3D) && isValidProvider())) {
+		return;
+	}
+
+	int i = 0;
+	for (i = 0; i < getAudioSettings()->m_sampleCount2D; ++i) {
+		HSAMPLE sample = AIL_allocate_sample_handle(m_digitalHandle);
+		DEBUG_ASSERTCRASH(sample, ("Couldn't get %d 2D samples", i + 1));
+		if (sample) {
+			AIL_init_sample(sample);
+			AIL_set_sample_user_data(sample, 0, (void *)(i + 1));
+			m_availableSamples.push_back(sample);
+			++m_num2DSamples;
+		}
+	}
+
+	for (i = 0; i < getAudioSettings()->m_sampleCount3D; ++i) {
+		H3DSAMPLE sample = AIL_allocate_3D_sample_handle(m_provider3D[m_selectedProvider].id);
+		DEBUG_ASSERTCRASH(sample, ("Couldn't get %d 3D samples", i + 1));
+		if (sample) {
+			AIL_set_3D_user_data(sample, 0, (void *)(i + 1));
+			m_available3DSamples.push_back(sample);
+			++m_num3DSamples;
+		}
+	}
+
+	// Streams are basically free, so we can just allocate the appropriate number
+	m_numStreams = getAudioSettings()->m_streamCount;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::processRequest( AudioRequest *req )
+{
+	switch (req->m_request)
+	{
+		case AR_Play:
+		{
+			playAudioEvent(req->m_pendingEvent);
+			break;
+		}
+		case AR_Pause:
+		{
+			pauseAudioEvent(req->m_handleToInteractOn);
+			break;
+		}
+		case AR_Stop:
+		{
+			stopAudioEvent(req->m_handleToInteractOn);
+			break;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void *MilesAudioManager::getHandleForBink( void )
+{
+	if (m_binkHandle == NULL) {
+		PlayingAudio *aud = allocatePlayingAudio();
+		aud->m_audioEventRTS = NEW AudioEventRTS("BinkHandle");	// poolify
+		getInfoForAudioEvent(aud->m_audioEventRTS);
+		aud->m_sample = getFirst2DSample(aud->m_audioEventRTS);
+		aud->m_type = PAT_Sample;
+
+		if (!aud->m_sample) {
+			releasePlayingAudio(aud);
+			return NULL;
+		}
+
+		m_binkHandle = aud;
+	}
+
+	AILLPDIRECTSOUND lpDS;
+	AIL_get_DirectSound_info(m_binkHandle->m_sample, &lpDS, NULL);
+	return lpDS;
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::releaseHandleForBink( void )
+{
+	if (m_binkHandle) {
+		releasePlayingAudio(m_binkHandle);
+		m_binkHandle = NULL;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay)
+{
+	if (!eventToPlay->getAudioEventInfo()) {
+		getInfoForAudioEvent(eventToPlay);
+		if (!eventToPlay->getAudioEventInfo()) {
+			DEBUG_CRASH(("No info for forced audio event '%s'", eventToPlay->getEventName().str()));
+			return;
+		}
+	}
+
+	switch (eventToPlay->getAudioEventInfo()->m_soundType)
+	{
+		case AT_Music:
+			if (!isOn(AudioAffect_Music))
+				return;
+			break;
+		case AT_SoundEffect:
+			if (!isOn(AudioAffect_Sound) || !isOn(AudioAffect_Sound3D))
+				return;
+			break;
+		case AT_Streaming:
+			if (!isOn(AudioAffect_Speech))
+				return;
+			break;
+	}
+
+	AudioEventRTS event = *eventToPlay;
+
+	event.generateFilename();
+	event.generatePlayInfo();
+
+	std::list<std::pair<AsciiString, Real> >::iterator it;
+	for (it = m_adjustedVolumes.begin(); it != m_adjustedVolumes.end(); ++it) {
+		if (it->first == event.getEventName()) {
+			event.setVolume(it->second);
+			break;
+		}
+	}
+
+	AsciiString fileToPlay = event.getFilename();
+	HAUDIO haud = AIL_quick_load_and_play(fileToPlay.str(), 1, 0);
+
+	// Even though the event type is not Speech, this is used only for mission briefings, so use the
+	// speech slider to adjust the volume.
+	// Get the volume from the event, and pass 0.5 to play the audio in the middle. (0.0 is full left, 1.0 is full right)
+	AIL_quick_set_volume(haud, event.getVolume() * getVolume(AudioAffect_Speech), 0.5);
+	m_audioForcePlayed.push_back(haud);
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void AILCALLBACK setSampleCompleted( HSAMPLE sampleCompleted )
+{
+	TheAudio->notifyOfAudioCompletion((UnsignedInt) sampleCompleted, PAT_Sample);
+}
+
+//-------------------------------------------------------------------------------------------------
+void AILCALLBACK set3DSampleCompleted( H3DSAMPLE sample3DCompleted )
+{
+	TheAudio->notifyOfAudioCompletion((UnsignedInt) sample3DCompleted, PAT_3DSample);
+}
+
+//-------------------------------------------------------------------------------------------------
+void AILCALLBACK setStreamCompleted( HSTREAM streamCompleted )
+{
+	TheAudio->notifyOfAudioCompletion((UnsignedInt) streamCompleted, PAT_Stream);
+}
+
+//-------------------------------------------------------------------------------------------------
+U32 AILCALLBACK streamingFileOpen(char const *fileName, void **file_handle)
+{
+#if defined(RTS_DEBUG)
+	if (sizeof(U32) != sizeof(File*)) {
+		RELEASE_CRASH(("streamingFileOpen - This function requires work in order to compile on non 32-bit platforms."));
+	}
+#endif
+
+	(*file_handle) = (void *) TheFileSystem->openFile(fileName, File::READ | File::STREAMING);
+	return ((*file_handle) != 0);
+}
+
+//-------------------------------------------------------------------------------------------------
+void AILCALLBACK streamingFileClose(void *fileHandle)
+{
+	((File*) fileHandle)->close();
+}
+
+//-------------------------------------------------------------------------------------------------
+S32 AILCALLBACK streamingFileSeek(void *fileHandle, S32 offset, U32 type)
+{
+	return ((File*) fileHandle)->seek(offset, (File::seekMode) type);
+}
+
+//-------------------------------------------------------------------------------------------------
+U32 AILCALLBACK streamingFileRead(void *file_handle, void *buffer, U32 bytes)
+{
+	return ((File*) file_handle)->read(buffer, bytes);
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+AudioFileCache::AudioFileCache() : m_maxSize(0), m_currentlyUsedSize(0), m_mutexName("AudioFileCacheMutex")
+{
+	m_mutex = CreateMutex(NULL, FALSE, m_mutexName);
+}
+
+//-------------------------------------------------------------------------------------------------
+AudioFileCache::~AudioFileCache()
+{
+	{
+		ScopedMutex mut(m_mutex);
+
+		// Free all the samples that are open.
+		OpenFilesHashIt it;
+		for ( it = m_openFiles.begin(); it != m_openFiles.end(); ++it ) {
+			if (it->second.m_openCount > 0) {
+				DEBUG_CRASH(("Sample '%s' is still playing, and we're trying to quit.", it->second.m_eventInfo->m_audioName.str()));
+			}
+
+			releaseOpenAudioFile(&it->second);
+			// Don't erase it from the map, cause it makes this whole process way more complicated, and
+			// we're about to go away anyways.
+		}
+	}
+
+	CloseHandle(m_mutex);
+}
+
+//-------------------------------------------------------------------------------------------------
+void *AudioFileCache::openFile( AudioEventRTS *eventToOpenFrom )
+{
+	// Protect the entire openFile function
+	ScopedMutex mut(m_mutex);
+
+	AsciiString strToFind;
+	switch (eventToOpenFrom->getNextPlayPortion())
+	{
+		case PP_Attack:
+			strToFind = eventToOpenFrom->getAttackFilename();
+			break;
+		case PP_Sound:
+			strToFind = eventToOpenFrom->getFilename();
+			break;
+		case PP_Decay:
+			strToFind = eventToOpenFrom->getDecayFilename();
+			break;
+		case PP_Done:
+			return NULL;
+	}
+
+	OpenFilesHash::iterator it;
+	it = m_openFiles.find(strToFind);
+
+	if (it != m_openFiles.end()) {
+		++it->second.m_openCount;
+		return it->second.m_file;
+	}
+
+	// Couldn't find the file, so actually open it.
+	File *file = TheFileSystem->openFile(strToFind.str());
+	if (!file) {
+		DEBUG_ASSERTLOG(strToFind.isEmpty(), ("Missing Audio File: '%s'", strToFind.str()));
+		return NULL;
+	}
+
+	UnsignedInt fileSize = file->size();
+	char* buffer = file->readEntireAndClose();
+
+	OpenAudioFile openedAudioFile;
+	openedAudioFile.m_eventInfo = eventToOpenFrom->getAudioEventInfo();
+
+	AILSOUNDINFO soundInfo;
+	AIL_WAV_info(buffer, &soundInfo);
+
+	if (eventToOpenFrom->isPositionalAudio()) {
+		if (soundInfo.channels > 1) {
+			DEBUG_CRASH(("Requested Positional Play of audio '%s', but it is in stereo.", strToFind.str()));
+			delete [] buffer;
+			return NULL;
+		}
+	}
+
+	if (soundInfo.format == WAVE_FORMAT_IMA_ADPCM) {
+		void *decompressFileBuffer;
+		U32 newFileSize;
+		AIL_decompress_ADPCM(&soundInfo, &decompressFileBuffer, &newFileSize);
+		fileSize = newFileSize;
+		openedAudioFile.m_compressed = TRUE;
+		delete [] buffer;
+		openedAudioFile.m_file = decompressFileBuffer;
+		openedAudioFile.m_soundInfo = soundInfo;
+		openedAudioFile.m_openCount = 1;
+	} else if (soundInfo.format == WAVE_FORMAT_PCM) {
+		openedAudioFile.m_compressed = FALSE;
+		openedAudioFile.m_file = buffer;
+		openedAudioFile.m_soundInfo = soundInfo;
+		openedAudioFile.m_openCount = 1;
+	} else {
+		DEBUG_CRASH(("Unexpected compression type in '%s'", strToFind.str()));
+		// prevent leaks
+		delete [] buffer;
+		return NULL;
+	}
+
+	openedAudioFile.m_fileSize = fileSize;
+	m_currentlyUsedSize += openedAudioFile.m_fileSize;
+	if (m_currentlyUsedSize > m_maxSize) {
+		// We need to free some samples, or we're not going to be able to play this sound.
+		if (!freeEnoughSpaceForSample(openedAudioFile)) {
+			m_currentlyUsedSize -= openedAudioFile.m_fileSize;
+			releaseOpenAudioFile(&openedAudioFile);
+			return NULL;
+		}
+	}
+
+	m_openFiles[strToFind] = openedAudioFile;
+	return openedAudioFile.m_file;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioFileCache::closeFile( void *fileToClose )
+{
+	if (!fileToClose) {
+		return;
+	}
+
+	// Protect the entire closeFile function
+	ScopedMutex mut(m_mutex);
+
+	OpenFilesHash::iterator it;
+	for ( it = m_openFiles.begin(); it != m_openFiles.end(); ++it ) {
+		if ( it->second.m_file == fileToClose ) {
+			--it->second.m_openCount;
+			return;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioFileCache::setMaxSize( UnsignedInt size )
+{
+	// Protect the function, in case we're trying to use this value elsewhere.
+	ScopedMutex mut(m_mutex);
+
+	m_maxSize = size;
+}
+
+//-------------------------------------------------------------------------------------------------
+void AudioFileCache::releaseOpenAudioFile( OpenAudioFile *fileToRelease )
+{
+	if (fileToRelease->m_openCount > 0) {
+		// This thing needs to be terminated IMMEDIATELY.
+		TheAudio->closeAnySamplesUsingFile(fileToRelease->m_file);
+	}
+
+	if (fileToRelease->m_file) {
+		if (fileToRelease->m_compressed) {
+			// Files read in via AIL_decompress_ADPCM must be freed with AIL_mem_free_lock.
+			AIL_mem_free_lock(fileToRelease->m_file);
+		} else {
+			// Otherwise, we read it, we own it, blow it away.
+			delete [] fileToRelease->m_file;
+		}
+		fileToRelease->m_file = NULL;
+		fileToRelease->m_eventInfo = NULL;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool AudioFileCache::freeEnoughSpaceForSample(const OpenAudioFile& sampleThatNeedsSpace)
+{
+
+	Int spaceRequired = m_currentlyUsedSize - m_maxSize;
+	Int runningTotal = 0;
+
+	std::list<AsciiString> filesToClose;
+	// First, search for any samples that have ref counts of 0. They are low-hanging fruit, and
+	// should be considered immediately.
+	OpenFilesHashIt it;
+	for (it = m_openFiles.begin(); it != m_openFiles.end(); ++it) {
+		if (it->second.m_openCount == 0) {
+			// This is said low-hanging fruit.
+			filesToClose.push_back(it->first);
+
+			runningTotal += it->second.m_fileSize;
+
+			if (runningTotal >= spaceRequired) {
+				break;
+			}
+		}
+	}
+
+	// If we don't have enough space yet, then search through the events who have a count of 1 or more
+	// and who are lower priority than this sound.
+	// Mical said that at this point, sounds shouldn't care if other sounds are interruptable or not.
+	// Kill any files of lower priority necessary to clear our the buffer.
+	if (runningTotal < spaceRequired) {
+		for (it = m_openFiles.begin(); it != m_openFiles.end(); ++it) {
+			if (it->second.m_openCount > 0) {
+				if (it->second.m_eventInfo->m_priority < sampleThatNeedsSpace.m_eventInfo->m_priority) {
+					filesToClose.push_back(it->first);
+					runningTotal += it->second.m_fileSize;
+
+					if (runningTotal >= spaceRequired) {
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	// We weren't able to find enough sounds to truncate. Therefore, this sound is not going to play.
+	if (runningTotal < spaceRequired) {
+		return FALSE;
+	}
+
+	std::list<AsciiString>::iterator ait;
+	for (ait = filesToClose.begin(); ait != filesToClose.end(); ++ait) {
+		OpenFilesHashIt itToErase = m_openFiles.find(*ait);
+		if (itToErase != m_openFiles.end()) {
+			releaseOpenAudioFile(&itToErase->second);
+			m_currentlyUsedSize -= itToErase->second.m_fileSize;
+			m_openFiles.erase(itToErase);
+		}
+	}
+
+	return TRUE;
+}
+
+
+#if defined(RTS_DEBUG)
+//-------------------------------------------------------------------------------------------------
+void MilesAudioManager::dumpAllAssetsUsed()
+{
+	if (!TheGlobalData->m_preloadReport) {
+		return;
+	}
+
+	// Dump all the audio assets we've used.
+	FILE *logfile=fopen("PreloadedAssets.txt","a+");	//append to log
+	if (!logfile)
+		return;
+
+	std::list<AsciiString> missingEvents;
+	std::list<AsciiString> usedFiles;
+
+	std::list<AsciiString>::iterator lit;
+
+	fprintf(logfile, "\nAudio Asset Report - BEGIN\n");
+	{
+		SetAsciiStringIt it;
+		std::vector<AsciiString>::iterator asIt;
+		for (it = m_allEventsLoaded.begin(); it != m_allEventsLoaded.end(); ++it) {
+			AsciiString astr = *it;
+			AudioEventInfo *aei = findAudioEventInfo(astr);
+			if (!aei) {
+				missingEvents.push_back(astr);
+				continue;
+			}
+
+			for (asIt = aei->m_attackSounds.begin(); asIt != aei->m_attackSounds.end(); ++asIt) {
+				usedFiles.push_back(*asIt);
+			}
+
+			for (asIt = aei->m_sounds.begin(); asIt != aei->m_sounds.end(); ++asIt) {
+				usedFiles.push_back(*asIt);
+			}
+
+			for (asIt = aei->m_decaySounds.begin(); asIt != aei->m_decaySounds.end(); ++asIt) {
+				usedFiles.push_back(*asIt);
+			}
+
+			if (!aei->m_filename.isEmpty()) {
+				usedFiles.push_back(aei->m_filename);
+			}
+		}
+
+		fprintf(logfile, "\nEvents Requested that are missing information - BEGIN\n");
+		for (lit = missingEvents.begin(); lit != missingEvents.end(); ++lit) {
+			fprintf(logfile, "%s\n", (*lit).str());
+		}
+		fprintf(logfile, "\nEvents Requested that are missing information - END\n");
+
+		fprintf(logfile, "\nFiles Used - BEGIN\n");
+		for (lit = usedFiles.begin(); lit != usedFiles.end(); ++lit) {
+			fprintf(logfile, "%s\n", (*lit).str());
+		}
+		fprintf(logfile, "\nFiles Used - END\n");
+	}
+	fprintf(logfile, "\nAudio Asset Report - END\n");
+	fclose(logfile);
+	logfile = NULL;
+}
+#endif
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp
similarity index 94%
rename from GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp
rename to Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp
index 9515af78c11..1c988d12987 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp
+++ b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFile.cpp
@@ -38,7 +38,9 @@
 // StdBIGFile::StdBIGFile
 //============================================================================
 
-StdBIGFile::StdBIGFile()
+StdBIGFile::StdBIGFile(AsciiString name, AsciiString path)
+	: m_name(name)
+	, m_path(path)
 {
 
 }
@@ -56,7 +58,7 @@ StdBIGFile::~StdBIGFile()
 // StdBIGFile::openFile
 //============================================================================
 
-File* StdBIGFile::openFile( const Char *filename, Int access ) 
+File* StdBIGFile::openFile( const Char *filename, Int access )
 {
 	const ArchivedFileInfo *fileInfo = getArchivedFileInfo(AsciiString(filename));
 
@@ -65,10 +67,10 @@ File* StdBIGFile::openFile( const Char *filename, Int access )
 	}
 
 	RAMFile *ramFile = NULL;
-	
-	if (BitIsSet(access, File::STREAMING)) 
+
+	if (BitIsSet(access, File::STREAMING))
 		ramFile = newInstance( StreamingArchiveFile );
-	else 
+	else
 		ramFile = newInstance( RAMFile );
 
 	ramFile->deleteOnClose();
@@ -86,7 +88,8 @@ File* StdBIGFile::openFile( const Char *filename, Int access )
 	// whoever is opening this file wants write access, so copy the file to the local disk
 	// and return that file pointer.
 
-	File *localFile = TheLocalFileSystem->openFile(filename, access);
+	constexpr size_t bufferSize = 0;
+	File *localFile = TheLocalFileSystem->openFile(filename, access, bufferSize);
 	if (localFile != NULL) {
 		ramFile->copyDataToFile(localFile);
 	}
@@ -146,7 +149,7 @@ void StdBIGFile::close( void )
 // StdBIGFile::getFileInfo
 //============================================================================
 
-Bool StdBIGFile::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const 
+Bool StdBIGFile::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
 {
 	const ArchivedFileInfo *tempFileInfo = getArchivedFileInfo(filename);
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
similarity index 84%
rename from GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
rename to Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
index e35e0360521..13f7045bb86 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
+++ b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp
@@ -33,9 +33,13 @@
 #include "Common/GameAudio.h"
 #include "Common/GameMemory.h"
 #include "Common/LocalFileSystem.h"
+
+#if RTS_ZEROHOUR
+#include "Common/Registry.h"
+#endif
+
 #include "StdDevice/Common/StdBIGFile.h"
 #include "StdDevice/Common/StdBIGFileSystem.h"
-#include "Common/Registry.h"
 #include "Utility/endian_compat.h"
 
 static const char *BIGFileIdentifier = "BIGF";
@@ -54,17 +58,15 @@ void StdBIGFileSystem::init() {
 
 	loadBigFilesFromDirectory("", "*.big");
 
+#if RTS_ZEROHOUR
     // load original Generals assets
     AsciiString installPath;
     GetStringFromGeneralsRegistry("", "InstallPath", installPath );
     //@todo this will need to be ramped up to a crash for release
-#ifndef RTS_INTERNAL
-    // had to make this non-internal only, otherwise we can't autobuild
-    // GeneralsZH...
-    DEBUG_ASSERTCRASH(installPath != "", ("Be 1337! Go install Generals!"));
-#endif
-    if (installPath!="")
+    DEBUG_ASSERTCRASH(!installPath.isEmpty(), ("Be 1337! Go install Generals!"));
+    if (!installPath.isEmpty())
       loadBigFilesFromDirectory(installPath, "*.big");
+#endif
 }
 
 void StdBIGFileSystem::reset() {
@@ -84,9 +86,9 @@ ArchiveFile * StdBIGFileSystem::openArchiveFile(const Char *filename) {
 	Int archiveFileSize = 0;
 	Int numLittleFiles = 0;
 
-	ArchiveFile *archiveFile = NEW StdBIGFile;
+	ArchiveFile *archiveFile = NEW StdBIGFile(filename, AsciiString::TheEmptyString);
 
-	DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - opening BIG file %s\n", filename));
+	DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - opening BIG file %s", filename));
 
 	if (fp == NULL) {
 		DEBUG_CRASH(("Could not open archive file %s for parsing", filename));
@@ -107,7 +109,7 @@ ArchiveFile * StdBIGFileSystem::openArchiveFile(const Char *filename) {
 	// read in the file size.
 	fp->read(&archiveFileSize, 4);
 
-	DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - size of archive file is %d bytes\n", archiveFileSize));
+	DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - size of archive file is %d bytes", archiveFileSize));
 
 //	char t;
 
@@ -116,7 +118,7 @@ ArchiveFile * StdBIGFileSystem::openArchiveFile(const Char *filename) {
 	fp->read(&numLittleFiles, 4);
 	numLittleFiles = betoh(numLittleFiles);
 
-	DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - %d are contained in archive\n", numLittleFiles));
+	DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - %d are contained in archive", numLittleFiles));
 //	for (Int i = 0; i < 2; ++i) {
 //		t = buffer[i];
 //		buffer[i] = buffer[(4-i)-1];
@@ -140,7 +142,7 @@ ArchiveFile * StdBIGFileSystem::openArchiveFile(const Char *filename) {
 		fileInfo->m_archiveFilename = archiveFileName;
 		fileInfo->m_offset = fileOffset;
 		fileInfo->m_size = filesize;
-		
+
 		// read in the path name of the file.
 		Int pathIndex = -1;
 		do {
@@ -163,7 +165,7 @@ ArchiveFile * StdBIGFileSystem::openArchiveFile(const Char *filename) {
 		AsciiString debugpath;
 		debugpath = path;
 		debugpath.concat(fileInfo->m_filename);
-//		DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - adding file %s to archive file %s, file number %d\n", debugpath.str(), fileInfo->m_archiveFilename.str(), i));
+//		DEBUG_LOG(("StdBIGFileSystem::openArchiveFile - adding file %s to archive file %s, file number %d", debugpath.str(), fileInfo->m_archiveFilename.str(), i));
 
 		archiveFile->addFile(path, fileInfo);
 	}
@@ -194,7 +196,7 @@ void StdBIGFileSystem::closeArchiveFile(const Char *filename) {
 	DEBUG_ASSERTCRASH(stricmp(filename, MUSIC_BIG) == 0, ("Attempting to close Archive file '%s', need to add code to handle its shutdown correctly.", filename));
 
 	// may need to do some other processing here first.
-	
+
 	delete (it->second);
 	m_archiveFileMap.erase(it);
 }
@@ -208,18 +210,28 @@ void StdBIGFileSystem::closeAllFiles() {
 Bool StdBIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite) {
 
 	FilenameList filenameList;
-	TheLocalFileSystem->getFileListInDirectory(dir, AsciiString(""), fileMask, filenameList, TRUE);
+	TheLocalFileSystem->getFileListInDirectory(dir, "", fileMask, filenameList, TRUE);
 
 	Bool actuallyAdded = FALSE;
 	FilenameListIter it = filenameList.begin();
 	while (it != filenameList.end()) {
+#if RTS_ZEROHOUR
+		// TheSuperHackers @bugfix bobtista 18/11/2025 Skip duplicate INIZH.big in Data\INI to prevent CRC mismatches.
+		// English, Chinese, and Korean SKUs shipped with two INIZH.big files (one in Run directory, one in Run\Data\INI).
+		// The DeleteFile cleanup doesn't work on EA App/Origin installs because the folder is not writable, so we skip loading it instead.
+		if (it->endsWithNoCase("Data\\INI\\INIZH.big") || it->endsWithNoCase("Data/INI/INIZH.big")) {
+			it++;
+			continue;
+		}
+#endif
+
 		ArchiveFile *archiveFile = openArchiveFile((*it).str());
 
 		if (archiveFile != NULL) {
-			DEBUG_LOG(("StdBIGFileSystem::loadBigFilesFromDirectory - loading %s into the directory tree.\n", (*it).str()));
-			loadIntoDirectoryTree(archiveFile, *it, overwrite);
+			DEBUG_LOG(("StdBIGFileSystem::loadBigFilesFromDirectory - loading %s into the directory tree.", (*it).str()));
+			loadIntoDirectoryTree(archiveFile, overwrite);
 			m_archiveFileMap[(*it)] = archiveFile;
-			DEBUG_LOG(("StdBIGFileSystem::loadBigFilesFromDirectory - %s inserted into the archive file map.\n", (*it).str()));
+			DEBUG_LOG(("StdBIGFileSystem::loadBigFilesFromDirectory - %s inserted into the archive file map.", (*it).str()));
 			actuallyAdded = TRUE;
 		}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdLocalFile.cpp b/Core/GameEngineDevice/Source/StdDevice/Common/StdLocalFile.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdLocalFile.cpp
rename to Core/GameEngineDevice/Source/StdDevice/Common/StdLocalFile.cpp
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdLocalFileSystem.cpp b/Core/GameEngineDevice/Source/StdDevice/Common/StdLocalFileSystem.cpp
similarity index 86%
rename from GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdLocalFileSystem.cpp
rename to Core/GameEngineDevice/Source/StdDevice/Common/StdLocalFileSystem.cpp
index 24ec744934b..119cd94a353 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/StdDevice/Common/StdLocalFileSystem.cpp
+++ b/Core/GameEngineDevice/Source/StdDevice/Common/StdLocalFileSystem.cpp
@@ -34,7 +34,7 @@
 
 #include <filesystem>
 
-StdLocalFileSystem::StdLocalFileSystem() : LocalFileSystem() 
+StdLocalFileSystem::StdLocalFileSystem() : LocalFileSystem()
 {
 }
 
@@ -102,10 +102,10 @@ static std::filesystem::path fixFilenameFromWindowsPath(const Char *filename, In
 			if (pathFixedPart.empty())
 			{
 				// Required to allow creation of new files
-				if (!(access & File::WRITE)) 
+				if (!(access & File::WRITE))
 				{
-					DEBUG_LOG(("StdLocalFileSystem::fixFilenameFromWindowsPath - Error finding file %s\n", filename.string().c_str()));
-					DEBUG_LOG(("StdLocalFileSystem::fixFilenameFromWindowsPath - Got so far %s\n", pathCurrent.string().c_str()));
+					DEBUG_LOG(("StdLocalFileSystem::fixFilenameFromWindowsPath - Error finding file %s", filename.string().c_str()));
+					DEBUG_LOG(("StdLocalFileSystem::fixFilenameFromWindowsPath - Got so far %s", pathCurrent.string().c_str()));
 
 					return std::filesystem::path();
 				}
@@ -125,7 +125,7 @@ static std::filesystem::path fixFilenameFromWindowsPath(const Char *filename, In
 	return path;
 }
 
-File * StdLocalFileSystem::openFile(const Char *filename, Int access /* = 0 */)
+File * StdLocalFileSystem::openFile(const Char *filename, Int access, size_t bufferSize)
 {
 	//USE_PERF_TIMER(StdLocalFileSystem_openFile)
 
@@ -147,16 +147,15 @@ File * StdLocalFileSystem::openFile(const Char *filename, Int access /* = 0 */)
 		std::error_code ec;
 		if (!std::filesystem::exists(dir, ec) || ec) {
 			if(!std::filesystem::create_directories(dir, ec) || ec) {
-				DEBUG_LOG(("StdLocalFileSystem::openFile - Error creating directory %s\n", dir.string().c_str()));
+				DEBUG_LOG(("StdLocalFileSystem::openFile - Error creating directory %s", dir.string().c_str()));
 				return NULL;
 			}
 		}
 	}
 
 	StdLocalFile *file = newInstance( StdLocalFile );
-	
-	if (file->open(path.string().c_str(), access) == FALSE) {
-		file->close();
+
+	if (file->open(path.string().c_str(), access, bufferSize) == FALSE) {
 		deleteInstance(file);
 		file = NULL;
 	} else {
@@ -165,7 +164,7 @@ File * StdLocalFileSystem::openFile(const Char *filename, Int access /* = 0 */)
 
 // this will also need to play nice with the STREAMING type that I added, if we ever enable this
 
-// srj sez: this speeds up INI loading, but makes BIG files unusable. 
+// srj sez: this speeds up INI loading, but makes BIG files unusable.
 // don't enable it without further tweaking.
 //
 // unless you like running really slowly.
@@ -185,15 +184,15 @@ File * StdLocalFileSystem::openFile(const Char *filename, Int access /* = 0 */)
 	return file;
 }
 
-void StdLocalFileSystem::update() 
+void StdLocalFileSystem::update()
 {
 }
 
-void StdLocalFileSystem::init() 
+void StdLocalFileSystem::init()
 {
 }
 
-void StdLocalFileSystem::reset() 
+void StdLocalFileSystem::reset()
 {
 }
 
@@ -212,7 +211,6 @@ Bool StdLocalFileSystem::doesFileExist(const Char *filename) const
 void StdLocalFileSystem::getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList & filenameList, Bool searchSubdirectories) const
 {
 
-	char search[_MAX_PATH];
 	AsciiString asciisearch;
 	asciisearch = originalDirectory;
 	asciisearch.concat(currentDirectory);
@@ -228,24 +226,22 @@ void StdLocalFileSystem::getFileListInDirectory(const AsciiString& currentDirect
 	std::replace(fixedDirectory.begin(), fixedDirectory.end(), '\\', '/');
 #endif
 
-	strcpy(search, fixedDirectory.c_str());
-
 	Bool done = FALSE;
 	std::error_code ec;
 
-	auto iter = std::filesystem::directory_iterator(search, ec);
+	auto iter = std::filesystem::directory_iterator(fixedDirectory.c_str(), ec);
 	// The default iterator constructor creates an end iterator
 	done = iter == std::filesystem::directory_iterator();
 
 	if (ec) {
-		DEBUG_LOG(("StdLocalFileSystem::getFileListInDirectory - Error opening directory %s\n", search));
+		DEBUG_LOG(("StdLocalFileSystem::getFileListInDirectory - Error opening directory %s", fixedDirectory.c_str()));
 		return;
 	}
 
 	while (!done)	{
 		std::string filenameStr = iter->path().filename().string();
 		if (!iter->is_directory() && iter->path().extension() == searchExt &&
-			(strcmp(filenameStr.c_str(), ".") && strcmp(filenameStr.c_str(), ".."))) {
+			(strcmp(filenameStr.c_str(), ".") != 0 && strcmp(filenameStr.c_str(), "..") != 0)) {
 			// if we haven't already, add this filename to the list.
 			// a stl set should only allow one copy of each filename
 			AsciiString newFilename = iter->path().string().c_str();
@@ -262,7 +258,7 @@ void StdLocalFileSystem::getFileListInDirectory(const AsciiString& currentDirect
 		auto iter = std::filesystem::directory_iterator(fixedDirectory, ec);
 
 		if (ec) {
-			DEBUG_LOG(("StdLocalFileSystem::getFileListInDirectory - Error opening subdirectory %s\n", fixedDirectory));
+			DEBUG_LOG(("StdLocalFileSystem::getFileListInDirectory - Error opening subdirectory %s", fixedDirectory.c_str()));
 			return;
 		}
 
@@ -271,8 +267,8 @@ void StdLocalFileSystem::getFileListInDirectory(const AsciiString& currentDirect
 
 		while (!done) {
 			std::string filenameStr = iter->path().filename().string();
-			if(iter->is_directory() && 
-				(strcmp(filenameStr.c_str(), ".") && strcmp(filenameStr.c_str(), ".."))) {
+			if(iter->is_directory() &&
+				(strcmp(filenameStr.c_str(), ".") != 0 && strcmp(filenameStr.c_str(), "..") != 0)) {
 				AsciiString tempsearchstr(filenameStr.c_str());
 
 				// recursively add files in subdirectories if required.
@@ -285,7 +281,7 @@ void StdLocalFileSystem::getFileListInDirectory(const AsciiString& currentDirect
 	}
 }
 
-Bool StdLocalFileSystem::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const 
+Bool StdLocalFileSystem::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
 {
 	std::filesystem::path path = fixFilenameFromWindowsPath(filename.str(), 0);
 
@@ -316,7 +312,7 @@ Bool StdLocalFileSystem::getFileInfo(const AsciiString& filename, FileInfo *file
 	return TRUE;
 }
 
-Bool StdLocalFileSystem::createDirectory(AsciiString directory) 
+Bool StdLocalFileSystem::createDirectory(AsciiString directory)
 {
 	bool result = FALSE;
 
@@ -327,7 +323,7 @@ Bool StdLocalFileSystem::createDirectory(AsciiString directory)
 	std::replace(fixedDirectory.begin(), fixedDirectory.end(), '\\', '/');
 #endif
 
-	if ((fixedDirectory.length() > 0) && (fixedDirectory.length() < _MAX_DIR)) {
+	if ((!fixedDirectory.empty()) && (fixedDirectory.length() < _MAX_DIR)) {
 		// Convert to host path
 		std::filesystem::path path(std::move(fixedDirectory));
 
@@ -339,3 +335,14 @@ Bool StdLocalFileSystem::createDirectory(AsciiString directory)
 	}
 	return result;
 }
+
+AsciiString StdLocalFileSystem::normalizePath(const AsciiString& filePath) const
+{
+	std::string nonNormalized(filePath.str());
+#ifndef _WIN32
+	// Replace backslashes with forward slashes on non-Windows platforms
+	std::replace(unNormalized.begin(), unNormalized.end(), '\\', '/');
+#endif
+	std::filesystem::path pathNonNormalized(nonNormalized);
+	return AsciiString(pathNonNormalized.lexically_normal().string().c_str());
+}
diff --git a/Core/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp b/Core/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
new file mode 100644
index 00000000000..09e9c85f229
--- /dev/null
+++ b/Core/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
@@ -0,0 +1,448 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   Generals
+//
+// Module:    VideoDevice
+//
+// File name: BinkDevice.cpp
+//
+// Created:   10/22/01	TR
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "Lib/BaseType.h"
+#include "VideoDevice/Bink/BinkVideoPlayer.h"
+#include "Common/AudioAffect.h"
+#include "Common/GameAudio.h"
+#include "Common/GameMemory.h"
+#include "Common/GlobalData.h"
+#include "Common/Registry.h"
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+#define VIDEO_LANG_PATH_FORMAT "Data/%s/Movies/%s.%s"
+#define VIDEO_PATH	"Data\\Movies"
+#define VIDEO_EXT		"bik"
+
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Prototypes
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Functions
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Functions
+//----------------------------------------------------------------------------
+
+
+//============================================================================
+// BinkVideoPlayer::BinkVideoPlayer
+//============================================================================
+
+BinkVideoPlayer::BinkVideoPlayer()
+{
+
+}
+
+//============================================================================
+// BinkVideoPlayer::~BinkVideoPlayer
+//============================================================================
+
+BinkVideoPlayer::~BinkVideoPlayer()
+{
+	deinit();
+}
+
+//============================================================================
+// BinkVideoPlayer::init
+//============================================================================
+
+void	BinkVideoPlayer::init( void )
+{
+	// Need to load the stuff from the ini file.
+	VideoPlayer::init();
+
+	initializeBinkWithMiles();
+}
+
+//============================================================================
+// BinkVideoPlayer::deinit
+//============================================================================
+
+void BinkVideoPlayer::deinit( void )
+{
+	TheAudio->releaseHandleForBink();
+	VideoPlayer::deinit();
+}
+
+//============================================================================
+// BinkVideoPlayer::reset
+//============================================================================
+
+void	BinkVideoPlayer::reset( void )
+{
+	VideoPlayer::reset();
+}
+
+//============================================================================
+// BinkVideoPlayer::update
+//============================================================================
+
+void	BinkVideoPlayer::update( void )
+{
+	VideoPlayer::update();
+
+}
+
+//============================================================================
+// BinkVideoPlayer::loseFocus
+//============================================================================
+
+void	BinkVideoPlayer::loseFocus( void )
+{
+	VideoPlayer::loseFocus();
+}
+
+//============================================================================
+// BinkVideoPlayer::regainFocus
+//============================================================================
+
+void	BinkVideoPlayer::regainFocus( void )
+{
+	VideoPlayer::regainFocus();
+}
+
+//============================================================================
+// BinkVideoPlayer::createStream
+//============================================================================
+
+VideoStreamInterface* BinkVideoPlayer::createStream( HBINK handle )
+{
+
+	if ( handle == NULL )
+	{
+		return NULL;
+	}
+
+	BinkVideoStream *stream = NEW BinkVideoStream;
+
+	if ( stream )
+	{
+
+		stream->m_handle = handle;
+		stream->m_next = m_firstStream;
+		stream->m_player = this;
+		m_firstStream = stream;
+
+		// never let volume go to 0, as Bink will interpret that as "play at full volume".
+		Int mod = (Int) ((TheAudio->getVolume(AudioAffect_Speech) * 0.8f) * 100) + 1;
+		Int volume = (32768*mod)/100;
+		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to set volume (%g -> %d -> %d",
+			TheAudio->getVolume(AudioAffect_Speech), mod, volume));
+		BinkSetVolume( stream->m_handle,0, volume);
+		DEBUG_LOG(("BinkVideoPlayer::createStream() - set volume"));
+	}
+
+	return stream;
+}
+
+//============================================================================
+// BinkVideoPlayer::open
+//============================================================================
+
+VideoStreamInterface*	BinkVideoPlayer::open( AsciiString movieTitle )
+{
+	VideoStreamInterface*	stream = NULL;
+
+	const Video* pVideo = getVideo(movieTitle);
+	if (pVideo) {
+		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to open bink file"));
+
+		if (TheGlobalData->m_modDir.isNotEmpty())
+		{
+			char filePath[ _MAX_PATH ];
+			sprintf( filePath, "%s%s\\%s.%s", TheGlobalData->m_modDir.str(), VIDEO_PATH, pVideo->m_filename.str(), VIDEO_EXT );
+			HBINK handle = BinkOpen(filePath , BINKPRELOADALL );
+			DEBUG_ASSERTLOG(!handle, ("opened bink file %s", filePath));
+			if (handle)
+			{
+				return createStream( handle );
+			}
+		}
+
+		char localizedFilePath[ _MAX_PATH ];
+		sprintf( localizedFilePath, VIDEO_LANG_PATH_FORMAT, GetRegistryLanguage().str(), pVideo->m_filename.str(), VIDEO_EXT );
+		HBINK handle = BinkOpen(localizedFilePath , BINKPRELOADALL );
+		DEBUG_ASSERTLOG(!handle, ("opened localized bink file %s", localizedFilePath));
+		if (!handle)
+		{
+			char filePath[ _MAX_PATH ];
+			sprintf( filePath, "%s\\%s.%s", VIDEO_PATH, pVideo->m_filename.str(), VIDEO_EXT );
+			handle = BinkOpen(filePath , BINKPRELOADALL );
+			DEBUG_ASSERTLOG(!handle, ("opened bink file %s", localizedFilePath));
+		}
+
+		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to create stream"));
+		stream = createStream( handle );
+	}
+
+	return stream;
+}
+
+//============================================================================
+// BinkVideoPlayer::load
+//============================================================================
+
+VideoStreamInterface*	BinkVideoPlayer::load( AsciiString movieTitle )
+{
+	return open(movieTitle); // load() used to have the same body as open(), so I'm combining them.  Munkee.
+}
+
+//============================================================================
+//============================================================================
+void BinkVideoPlayer::notifyVideoPlayerOfNewProvider( Bool nowHasValid )
+{
+	if (!nowHasValid) {
+		TheAudio->releaseHandleForBink();
+		BinkSetSoundTrack(0, 0);
+	} else {
+		initializeBinkWithMiles();
+	}
+}
+
+//============================================================================
+//============================================================================
+void BinkVideoPlayer::initializeBinkWithMiles()
+{
+	Int retVal = 0;
+	void *driver = TheAudio->getHandleForBink();
+
+	if ( driver )
+	{
+		retVal = BinkSoundUseDirectSound(driver);
+	}
+	if( !driver || retVal == 0)
+	{
+		BinkSetSoundTrack ( 0,0 );
+	}
+}
+
+//============================================================================
+// BinkVideoStream::BinkVideoStream
+//============================================================================
+
+BinkVideoStream::BinkVideoStream()
+: m_handle(NULL)
+{
+
+}
+
+//============================================================================
+// BinkVideoStream::~BinkVideoStream
+//============================================================================
+
+BinkVideoStream::~BinkVideoStream()
+{
+	if ( m_handle != NULL )
+	{
+		BinkClose( m_handle );
+		m_handle = NULL;
+	}
+}
+
+//============================================================================
+// BinkVideoStream::update
+//============================================================================
+
+void BinkVideoStream::update( void )
+{
+	BinkWait( m_handle );
+}
+
+//============================================================================
+// BinkVideoStream::isFrameReady
+//============================================================================
+
+Bool BinkVideoStream::isFrameReady( void )
+{
+	return !BinkWait( m_handle );
+}
+
+//============================================================================
+// BinkVideoStream::frameDecompress
+//============================================================================
+
+void BinkVideoStream::frameDecompress( void )
+{
+		BinkDoFrame( m_handle );
+}
+
+//============================================================================
+// BinkVideoStream::frameRender
+//============================================================================
+
+void BinkVideoStream::frameRender( VideoBuffer *buffer )
+{
+	if ( buffer )
+	{
+		void *mem = buffer->lock();
+
+		u32 flags;
+
+		switch ( buffer->format())
+		{
+			case VideoBuffer::TYPE_X8R8G8B8:
+				flags = BINKSURFACE32;
+				break;
+
+			case VideoBuffer::TYPE_R8G8B8:
+				flags = BINKSURFACE24;
+				break;
+
+			case VideoBuffer::TYPE_R5G6B5:
+				flags = BINKSURFACE565;
+				break;
+
+			case VideoBuffer::TYPE_X1R5G5B5:
+				flags = BINKSURFACE555;
+				break;
+
+			default:
+				return;
+		}
+
+		if ( mem != NULL )
+		{
+
+			BinkCopyToBuffer ( m_handle, mem, buffer->pitch(), buffer->height(),
+													buffer->xPos(), buffer->yPos(), flags );
+			buffer->unlock();
+		}
+	}
+
+}
+
+//============================================================================
+// BinkVideoStream::frameNext
+//============================================================================
+
+void BinkVideoStream::frameNext( void )
+{
+	BinkNextFrame( m_handle );
+}
+
+//============================================================================
+// BinkVideoStream::frameIndex
+//============================================================================
+
+Int BinkVideoStream::frameIndex( void )
+{
+	return m_handle->FrameNum - 1;
+}
+
+//============================================================================
+// BinkVideoStream::totalFrames
+//============================================================================
+
+Int	BinkVideoStream::frameCount( void )
+{
+	return m_handle->Frames;
+}
+
+//============================================================================
+// BinkVideoStream::frameGoto
+//============================================================================
+
+void BinkVideoStream::frameGoto( Int index )
+{
+	BinkGoto(m_handle, index, NULL );
+}
+
+//============================================================================
+// VideoStream::height
+//============================================================================
+
+Int		BinkVideoStream::height( void )
+{
+	return m_handle->Height;
+}
+
+//============================================================================
+// VideoStream::width
+//============================================================================
+
+Int		BinkVideoStream::width( void )
+{
+	return m_handle->Width;
+}
+
+
+
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp b/Core/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp
similarity index 99%
rename from GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp
rename to Core/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp
index e3033dc7b62..a06c3dcb291 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp
+++ b/Core/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp
@@ -370,4 +370,4 @@ UnsignedInt FFmpegFile::getFrameTime() const
 	if (stream == nullptr)
 		return 0u;
 	return 1000u / av_q2d(m_fmtCtx->streams[stream->stream_idx]->avg_frame_rate);
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp b/Core/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
similarity index 93%
rename from GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
rename to Core/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
index 345ce39d735..04baffcfeef 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
+++ b/Core/GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
@@ -27,7 +27,7 @@
 /////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include "Lib/BaseType.h"
@@ -39,7 +39,7 @@
 #include "Common/Registry.h"
 #include "Common/FileSystem.h"
 
-#include "VideoDevice/FFmpeg/FFmpegFile.h"  
+#include "VideoDevice/FFmpeg/FFmpegFile.h"
 
 extern "C" {
 	#include <libavcodec/avcodec.h>
@@ -54,13 +54,13 @@ extern "C" {
 #include <chrono>
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
- 
+
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 #define VIDEO_LANG_PATH_FORMAT "Data/%s/Movies/%s.%s"
 #define VIDEO_PATH	"Data\\Movies"
@@ -69,37 +69,37 @@ extern "C" {
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 
@@ -211,10 +211,10 @@ VideoStreamInterface* FFmpegVideoPlayer::createStream( File* file )
 		// never let volume go to 0, as Bink will interpret that as "play at full volume".
 		Int mod = (Int) ((TheAudio->getVolume(AudioAffect_Speech) * 0.8f) * 100) + 1;
 		[[maybe_unused]]  Int volume = (32768 * mod) / 100;
-		DEBUG_LOG(("FFmpegVideoPlayer::createStream() - About to set volume (%g -> %d -> %d\n",
+		DEBUG_LOG(("FFmpegVideoPlayer::createStream() - About to set volume (%g -> %d -> %d",
 			TheAudio->getVolume(AudioAffect_Speech), mod, volume));
 		//BinkSetVolume( stream->m_handle,0, volume);
-		DEBUG_LOG(("FFmpegVideoPlayer::createStream() - set volume\n"));
+		DEBUG_LOG(("FFmpegVideoPlayer::createStream() - set volume"));
 	}
 
 	return stream;
@@ -230,14 +230,14 @@ VideoStreamInterface*	FFmpegVideoPlayer::open( AsciiString movieTitle )
 
 	const Video* pVideo = getVideo(movieTitle);
 	if (pVideo) {
-		DEBUG_LOG(("FFmpegVideoPlayer::createStream() - About to open bink file\n"));
-		
+		DEBUG_LOG(("FFmpegVideoPlayer::createStream() - About to open bink file"));
+
 		if (TheGlobalData->m_modDir.isNotEmpty())
 		{
 			char filePath[ _MAX_PATH ];
 			sprintf( filePath, "%s%s\\%s.%s", TheGlobalData->m_modDir.str(), VIDEO_PATH, pVideo->m_filename.str(), VIDEO_EXT );
 			File* file =  TheFileSystem->openFile(filePath);
-			DEBUG_ASSERTLOG(!file, ("opened bink file %s\n", filePath));
+			DEBUG_ASSERTLOG(!file, ("opened bink file %s", filePath));
 			if (file)
 			{
 				return createStream( file );
@@ -247,20 +247,20 @@ VideoStreamInterface*	FFmpegVideoPlayer::open( AsciiString movieTitle )
 		char localizedFilePath[ _MAX_PATH ];
 		sprintf( localizedFilePath, VIDEO_LANG_PATH_FORMAT, GetRegistryLanguage().str(), pVideo->m_filename.str(), VIDEO_EXT );
 		File* file =  TheFileSystem->openFile(localizedFilePath);
-		DEBUG_ASSERTLOG(!file, ("opened localized bink file %s\n", localizedFilePath));
+		DEBUG_ASSERTLOG(!file, ("opened localized bink file %s", localizedFilePath));
 		if (!file)
 		{
 			char filePath[ _MAX_PATH ];
 			sprintf( filePath, "%s\\%s.%s", VIDEO_PATH, pVideo->m_filename.str(), VIDEO_EXT );
 			file = TheFileSystem->openFile(filePath);
-			DEBUG_ASSERTLOG(!file, ("opened bink file %s\n", filePath));
+			DEBUG_ASSERTLOG(!file, ("opened bink file %s", filePath));
 		}
 
-		DEBUG_LOG(("FFmpegVideoPlayer::createStream() - About to create stream\n"));
+		DEBUG_LOG(("FFmpegVideoPlayer::createStream() - About to create stream"));
 		stream = createStream( file );
 	}
 
-	return stream;	
+	return stream;
 }
 
 //============================================================================
@@ -289,8 +289,8 @@ void FFmpegVideoPlayer::notifyVideoPlayerOfNewProvider( Bool nowHasValid )
 void FFmpegVideoPlayer::initializeBinkWithMiles()
 {
 	Int retVal = 0;
-	void *driver = TheAudio->getHandleForBink();	
-	
+	void *driver = TheAudio->getHandleForBink();
+
 	if ( driver )
 	{
 		//retVal = BinkSoundUseDirectSound(driver);
@@ -505,7 +505,7 @@ void FFmpegVideoStream::frameNext( void )
 
 Int FFmpegVideoStream::frameIndex( void )
 {
-	return m_ffmpegFile->getCurrentFrame(); 
+	return m_ffmpegFile->getCurrentFrame();
 }
 
 //============================================================================
diff --git a/Core/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp b/Core/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp
new file mode 100644
index 00000000000..21aea05038e
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp
@@ -0,0 +1,1609 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DRadar.cpp /////////////////////////////////////////////////////////////////////////////
+// Author: Colin Day, January 2002
+// Desc:   W3D radar implementation, this has the necessary device dependent drawing
+//				 necessary for the radar
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "Common/AudioEventRTS.h"
+#include "Common/Debug.h"
+#include "Common/GlobalData.h"
+#include "Common/GameUtility.h"
+#include "Common/Player.h"
+#include "Common/PlayerList.h"
+
+#include "GameLogic/TerrainLogic.h"
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/Object.h"
+
+#include "GameClient/Color.h"
+#include "GameClient/ControlBar.h"
+#include "GameClient/Display.h"
+#include "GameClient/GameClient.h"
+#include "GameClient/GameWindow.h"
+#include "GameClient/Image.h"
+#include "GameClient/Line2D.h"
+#include "GameClient/TerrainVisual.h"
+#include "GameClient/Water.h"
+#include "W3DDevice/Common/W3DRadar.h"
+#include "W3DDevice/GameClient/HeightMap.h"
+#include "W3DDevice/GameClient/W3DShroud.h"
+#include "WW3D2/texture.h"
+#include "WW3D2/dx8caps.h"
+
+
+
+// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
+enum { OVERLAY_REFRESH_RATE = 6 };  ///< over updates once this many frames
+
+//-------------------------------------------------------------------------------------------------
+/** Is the point legal, that is, inside the resolution of the radar cells */
+//-------------------------------------------------------------------------------------------------
+inline Bool legalRadarPoint( Int px, Int py )
+{
+
+	if( px < 0 || py < 0 || px >= RADAR_CELL_WIDTH || py >= RADAR_CELL_HEIGHT )
+		return FALSE;
+
+	return TRUE;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+static WW3DFormat findFormat(const WW3DFormat formats[])
+{
+	for( Int i = 0; formats[ i ] != WW3D_FORMAT_UNKNOWN; i++ )
+	{
+
+		if( DX8Wrapper::Get_Current_Caps()->Support_Texture_Format( formats[ i ] ) )
+		{
+
+			return formats[ i ];
+
+		}
+
+	}
+	DEBUG_CRASH(("WW3DRadar: No appropriate texture format") );
+	return WW3D_FORMAT_UNKNOWN;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Find the texture format we're going to use for the radar.  The texture format must
+	* be supported by the hardware.  The "more preferred" formats appear at the top of
+	* the format tables in order from most preferred to least preferred */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::initializeTextureFormats( void )
+{
+	const WW3DFormat terrainFormats[] =
+	{
+		WW3D_FORMAT_R8G8B8,
+		WW3D_FORMAT_X8R8G8B8,
+		WW3D_FORMAT_R5G6B5,
+		WW3D_FORMAT_X1R5G5B5,
+		WW3D_FORMAT_UNKNOWN				// keep this one last
+	};
+	const WW3DFormat overlayFormats[] =
+	{
+		WW3D_FORMAT_A8R8G8B8,
+		WW3D_FORMAT_A4R4G4B4,
+		WW3D_FORMAT_UNKNOWN				// keep this one last
+	};
+	const WW3DFormat shroudFormats[] =
+	{
+		WW3D_FORMAT_A8R8G8B8,
+		WW3D_FORMAT_A4R4G4B4,
+		WW3D_FORMAT_UNKNOWN				// keep this one last
+	};
+
+	// find a format for the terrain texture
+	m_terrainTextureFormat = findFormat(terrainFormats);
+
+	// find a format for the overlay texture
+	m_overlayTextureFormat = findFormat(overlayFormats);
+
+	// find a format for the shroud texture
+	m_shroudTextureFormat = findFormat(shroudFormats);
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Delete resources used specifically in this W3D radar implemetation */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::deleteResources( void )
+{
+
+	//
+	// delete terrain resources used
+	//
+	if( m_terrainTexture )
+		m_terrainTexture->Release_Ref();
+	m_terrainTexture = NULL;
+
+	deleteInstance(m_terrainImage);
+	m_terrainImage = NULL;
+
+	//
+	// delete overlay resources used
+	//
+	if( m_overlayTexture )
+		m_overlayTexture->Release_Ref();
+	m_overlayTexture = NULL;
+
+	deleteInstance(m_overlayImage);
+	m_overlayImage = NULL;
+
+	//
+	// delete shroud resources used
+	//
+	if( m_shroudTexture )
+		m_shroudTexture->Release_Ref();
+	m_shroudTexture = NULL;
+
+	deleteInstance(m_shroudImage);
+	m_shroudImage = NULL;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Reconstruct the view box given the current camera settings */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::reconstructViewBox( void )
+{
+	Coord3D world[ 4 ];
+	ICoord2D radar[ 4 ];
+	Int i;
+
+	// get the 4 points of the view corners in the 3D world at the average Z height in the map
+	TheTacticalView->getScreenCornerWorldPointsAtZ( &world[ 0 ],
+																									&world[ 1 ],
+																									&world[ 2 ],
+																									&world[ 3 ],
+																									getTerrainAverageZ() );
+
+	// convert each of the 4 points in the world to radar cell positions
+	for( i = 0; i < 4; i++ )
+	{
+
+		// first convert to radar cells
+ 		radar[ i ].x = world[ i ].x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
+ 		radar[ i ].y = world[ i ].y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
+
+		//
+		// store these points in the view box array which contains a first position
+		// of (0,0) and then offsets for each additional entry point
+		//
+		if( i == 0 )
+		{
+
+			m_viewBox[ i ].x = 0;
+			m_viewBox[ i ].y = 0;
+
+		}
+		else
+		{
+
+			m_viewBox[ i ].x = radar[ i ].x - radar[ i - 1 ].x;
+			m_viewBox[ i ].y = radar[ i ].y - radar[ i - 1 ].y;
+
+		}
+
+	}
+
+	//
+	// save the camera settings for this view box, we will need to make it again only
+	// if some of these change
+	//
+	m_viewAngle = TheTacticalView->getAngle();
+	Coord3D pos;
+	TheTacticalView->getPosition( &pos );
+	m_viewZoom = TheTacticalView->getZoom();
+	m_reconstructViewBox = FALSE;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Convert radar position to actual pixel coord */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::radarToPixel( const ICoord2D *radar, ICoord2D *pixel,
+														 Int radarUpperLeftX, Int radarUpperLeftY,
+														 Int radarWidth, Int radarHeight )
+{
+
+	// sanity
+	if( radar == NULL || pixel == NULL )
+		return;
+
+	pixel->x = (radar->x * radarWidth / RADAR_CELL_WIDTH) + radarUpperLeftX;
+	// note the "inverted" y here to orient the way our world looks with +x=right and -y=down
+	pixel->y = ((RADAR_CELL_HEIGHT - 1 - radar->y) * radarHeight / RADAR_CELL_HEIGHT) + radarUpperLeftY;
+
+}
+
+
+//-------------------------------------------------------------------------------------------------
+/** Draw a hero icon at a position, given radar box upper left location and dimensions.  */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::drawHeroIcon( Int pixelX, Int pixelY, Int width, Int height, const Coord3D *pos )
+{
+	// get the hero icon image
+	static const Image *image = (Image *)TheMappedImageCollection->findImageByName("HeroReticle");
+	if (image != NULL)
+	{
+		// convert world to radar coords
+		ICoord2D ulRadar;
+		ulRadar.x = pos->x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
+		ulRadar.y = pos->y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
+
+		// convert radar to screen coords
+		ICoord2D offsetScreen;
+		radarToPixel( &ulRadar, &offsetScreen, pixelX, pixelY, width, height );
+
+		// shift from an upper left to a center focus for the icon
+		int iconWidth = image->getImageWidth();
+		int iconHeight = image->getImageHeight();
+		offsetScreen.x -= (iconWidth / 2) - 1;
+		offsetScreen.y -= iconHeight / 2;
+
+		// draw the icon
+		TheDisplay->drawImage( image, offsetScreen.x , offsetScreen.y, offsetScreen.x + iconWidth, offsetScreen.y + iconHeight );
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Draw a "box" into the texture passed in that represents the viewable area for
+	* the tactical display into the game world */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::drawViewBox( Int pixelX, Int pixelY, Int width, Int height )
+{
+	ICoord2D ulScreen;
+	ICoord2D ulRadar;
+	Coord3D ulWorld;
+	ICoord2D ulStart = { 0, 0 };
+	ICoord2D start, end;
+	ICoord2D clipStart, clipEnd;
+	Real lineWidth = 1.0f;
+	Color topColor = GameMakeColor( 225, 225, 0, 255 );
+	Color bottomColor = GameMakeColor( 158, 158, 0, 255 );
+
+	//
+	// setup the clipping region ... note that this clipping region is not over just the
+	// radar image area ... it's in the WHOLE window available for the radar
+	//
+	IRegion2D clipRegion;
+	ICoord2D radarWindowSize, radarWindowScreenPos;
+	m_radarWindow->winGetSize( &radarWindowSize.x, &radarWindowSize.y );
+	m_radarWindow->winGetScreenPosition( &radarWindowScreenPos.x, &radarWindowScreenPos.y );
+	clipRegion.lo.x = radarWindowScreenPos.x;
+	clipRegion.lo.y = radarWindowScreenPos.y;
+	clipRegion.hi.x = radarWindowScreenPos.x + radarWindowSize.x;
+	clipRegion.hi.y = radarWindowScreenPos.y + radarWindowSize.y;
+
+	// convert top left of screen into world position
+	TheTacticalView->getOrigin( &ulScreen.x, &ulScreen.y );
+	TheTacticalView->screenToWorldAtZ( &ulScreen, &ulWorld, getTerrainAverageZ() );
+
+	// convert world to radar coords
+ 	ulRadar.x = ulWorld.x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
+ 	ulRadar.y = ulWorld.y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
+
+	//
+	// convert radar point to actual pixel coords on the screen, shifted
+	// into position on the radar for where the radar is drawn and the size of the
+	// area that the radar is drawn in
+	//
+	radarToPixel( &ulRadar, &ulStart, pixelX, pixelY, width, height );
+
+	//
+	// using our view box offset array, convert each of those radar cell offset points
+	// into screen pixels and draw the box.  The view box array is setup with the
+	// first index containing (0,0) (the point we just converted in theory), with cell
+	// offsets to each of the other corners in the following order
+	// (upper left, upper right, lower right, lower left)
+	//
+	ICoord2D radar;
+
+	// top line
+	start = ulStart;
+	radar.x = ulRadar.x + m_viewBox[ 1 ].x;
+	radar.y = ulRadar.y + m_viewBox[ 1 ].y;
+	radarToPixel( &radar, &end, pixelX, pixelY, width, height );
+	if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) )
+		TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y,
+													lineWidth, topColor );
+
+  // right line
+	start = end;
+	radar.x += m_viewBox[ 2 ].x;
+	radar.y += m_viewBox[ 2 ].y;
+	radarToPixel( &radar, &end, pixelX, pixelY, width, height );
+	if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) )
+		TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y,
+													lineWidth, topColor, bottomColor );
+
+  // bottom line
+	start = end;
+	radar.x += m_viewBox[ 3 ].x;
+	radar.y += m_viewBox[ 3 ].y;
+	radarToPixel( &radar, &end, pixelX, pixelY, width, height );
+	if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) )
+		TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y,
+													lineWidth, bottomColor );
+
+  // left line
+	start = end;
+	end = ulStart;
+	if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) )
+		TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y,
+													lineWidth, bottomColor, topColor );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DRadar::drawSingleBeaconEvent( Int pixelX, Int pixelY, Int width, Int height, Int index )
+{
+	RadarEvent *event = &(m_event[index]);
+	ICoord2D tri[ 3 ];
+	ICoord2D start, end;
+	Real angle, addAngle;
+	Color startColor, endColor;
+	Real lineWidth = 1.0f;
+	UnsignedInt currentFrame = TheGameLogic->getFrame();
+	UnsignedInt frameDiff;							// frames the event has been alive for
+	Real maxEventSize = width / 10.0f;   // max size of the event marker
+	Int minEventSize = 6;     // min size of the event marker
+	Int eventSize;									 // current size of a marker to draw
+	const Real TIME_FROM_FULL_SIZE_TO_SMALL_SIZE = LOGICFRAMES_PER_SECOND * 1.5;
+	Real totalAnglesToSpin = 2.0f * PI;  ///< spin around this many angles going from big to small
+	UnsignedByte r, g, b, a;
+
+	// setup screen clipping region
+	IRegion2D clipRegion;
+	clipRegion.lo.x = pixelX;
+	clipRegion.lo.y = pixelY;
+	clipRegion.hi.x = pixelX + width;
+	clipRegion.hi.y = pixelY + height;
+
+	// get the difference in frame from the current frame to the frame we were created on
+	frameDiff = currentFrame - event->createFrame;
+
+	// compute the size of the event marker, it is largest when it starts and smallest at the end
+	eventSize = REAL_TO_INT( maxEventSize * ( 1.0f - frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE) );
+
+	// we never let the event size get too small
+	if( eventSize < minEventSize )
+		eventSize = minEventSize;
+
+	// compute how much "angle" we will add to each point to make it rotate as it's getting small
+	addAngle = -totalAnglesToSpin * (frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE);
+
+	// create a triangle around the event
+	angle = 0.0f - addAngle;
+	tri[ 0 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
+	tri[ 0 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
+
+	angle = 2.0f * PI / 3.0f - addAngle;
+	tri[ 1 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
+	tri[ 1 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
+
+	angle = -2.0f * PI / 3.0f - addAngle;
+	tri[ 2 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
+	tri[ 2 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
+
+	// translate radar coords to screen coords
+	radarToPixel( &tri[ 0 ], &tri[ 0 ], pixelX, pixelY, width, height );
+	radarToPixel( &tri[ 1 ], &tri[ 1 ], pixelX, pixelY, width, height );
+	radarToPixel( &tri[ 2 ], &tri[ 2 ], pixelX, pixelY, width, height );
+
+	//
+	// make the colors we're going to use, when we're at our smallest size we will start to
+	// fade the alpha away to transparent so that at our lifetime frame we are completely gone
+	//
+
+	// color 1 ------------------
+	r = event->color1.red;
+	g = event->color1.green;
+	b = event->color1.blue;
+	a = event->color1.alpha;
+	if( currentFrame > event->fadeFrame )
+	{
+
+		a = REAL_TO_UNSIGNEDBYTE( (Real)a * (1.0f - (Real)(currentFrame - event->fadeFrame) /
+																								(Real)(event->dieFrame - event->fadeFrame) ) );
+
+	}
+	startColor = GameMakeColor( r, g, b, a );
+
+	// color 2 ------------------
+	r = event->color2.red;
+	g = event->color2.green;
+	b = event->color2.blue;
+	a = event->color2.alpha;
+	if( currentFrame > event->fadeFrame )
+	{
+
+		a = REAL_TO_UNSIGNEDBYTE( (Real)a * (1.0f - (Real)(currentFrame - event->fadeFrame) /
+																								(Real)(event->dieFrame - event->fadeFrame) ) );
+
+	}
+	endColor = GameMakeColor( r, g, b, a );
+
+	// draw the lines
+	if( ClipLine2D( &tri[ 0 ], &tri[ 1 ], &start, &end, &clipRegion ) )
+		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
+	if( ClipLine2D( &tri[ 1 ], &tri[ 2 ], &start, &end, &clipRegion ) )
+		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
+	if( ClipLine2D( &tri[ 2 ], &tri[ 0 ], &start, &end, &clipRegion ) )
+		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DRadar::drawSingleGenericEvent( Int pixelX, Int pixelY, Int width, Int height, Int index )
+{
+	RadarEvent *event = &(m_event[index]);
+	ICoord2D tri[ 3 ];
+	ICoord2D start, end;
+	Real angle, addAngle;
+	Color startColor, endColor;
+	Real lineWidth = 1.0f;
+	UnsignedInt currentFrame = TheGameLogic->getFrame();
+	UnsignedInt frameDiff;							// frames the event has been alive for
+	Real maxEventSize = width / 2.0f;   // max size of the event marker
+	Int minEventSize = 6;     // min size of the event marker
+	Int eventSize;									 // current size of a marker to draw
+	const Real TIME_FROM_FULL_SIZE_TO_SMALL_SIZE = LOGICFRAMES_PER_SECOND * 1.5;
+	Real totalAnglesToSpin = 2.0f * PI;  ///< spin around this many angles going from big to small
+	UnsignedByte r, g, b, a;
+
+	// setup screen clipping region
+	IRegion2D clipRegion;
+	clipRegion.lo.x = pixelX;
+	clipRegion.lo.y = pixelY;
+	clipRegion.hi.x = pixelX + width;
+	clipRegion.hi.y = pixelY + height;
+
+	// get the difference in frame from the current frame to the frame we were created on
+	frameDiff = currentFrame - event->createFrame;
+
+	// compute the size of the event marker, it is largest when it starts and smallest at the end
+	eventSize = REAL_TO_INT( maxEventSize * ( 1.0f - frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE) );
+
+	// we never let the event size get too small
+	if( eventSize < minEventSize )
+		eventSize = minEventSize;
+
+	// compute how much "angle" we will add to each point to make it rotate as it's getting small
+	addAngle = totalAnglesToSpin * (frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE);
+
+	// create a triangle around the event
+	angle = 0.0f - addAngle;
+	tri[ 0 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
+	tri[ 0 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
+
+	angle = 2.0f * PI / 3.0f - addAngle;
+	tri[ 1 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
+	tri[ 1 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
+
+	angle = -2.0f * PI / 3.0f - addAngle;
+	tri[ 2 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
+	tri[ 2 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
+
+	// translate radar coords to screen coords
+	radarToPixel( &tri[ 0 ], &tri[ 0 ], pixelX, pixelY, width, height );
+	radarToPixel( &tri[ 1 ], &tri[ 1 ], pixelX, pixelY, width, height );
+	radarToPixel( &tri[ 2 ], &tri[ 2 ], pixelX, pixelY, width, height );
+
+	//
+	// make the colors we're going to use, when we're at our smallest size we will start to
+	// fade the alpha away to transparent so that at our lifetime frame we are completely gone
+	//
+
+	// color 1 ------------------
+	r = event->color1.red;
+	g = event->color1.green;
+	b = event->color1.blue;
+	a = event->color1.alpha;
+	if( currentFrame > event->fadeFrame )
+	{
+
+		a = REAL_TO_UNSIGNEDBYTE( (Real)a * (1.0f - (Real)(currentFrame - event->fadeFrame) /
+																								(Real)(event->dieFrame - event->fadeFrame) ) );
+
+	}
+	startColor = GameMakeColor( r, g, b, a );
+
+	// color 2 ------------------
+	r = event->color2.red;
+	g = event->color2.green;
+	b = event->color2.blue;
+	a = event->color2.alpha;
+	if( currentFrame > event->fadeFrame )
+	{
+
+		a = REAL_TO_UNSIGNEDBYTE( (Real)a * (1.0f - (Real)(currentFrame - event->fadeFrame) /
+																								(Real)(event->dieFrame - event->fadeFrame) ) );
+
+	}
+	endColor = GameMakeColor( r, g, b, a );
+
+	// draw the lines
+	if( ClipLine2D( &tri[ 0 ], &tri[ 1 ], &start, &end, &clipRegion ) )
+		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
+	if( ClipLine2D( &tri[ 1 ], &tri[ 2 ], &start, &end, &clipRegion ) )
+		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
+	if( ClipLine2D( &tri[ 2 ], &tri[ 0 ], &start, &end, &clipRegion ) )
+		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Draw all the radar events */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::drawEvents( Int pixelX, Int pixelY, Int width, Int height )
+{
+	Int i;
+
+	for( i = 0;  i < MAX_RADAR_EVENTS; i++ )
+	{
+
+		// only 'active' events actually have something to draw
+		if( m_event[ i ].active == TRUE && m_event[ i ].type != RADAR_EVENT_FAKE )
+		{
+
+			// if we haven't played the sound for this event, do it now that we can see it
+			if( m_event[ i ].soundPlayed == FALSE && m_event[i].type != RADAR_EVENT_BEACON_PULSE )
+			{
+				static AudioEventRTS eventSound("RadarEvent");
+				TheAudio->addAudioEvent( &eventSound );
+
+			}
+
+			m_event[ i ].soundPlayed = TRUE;
+
+			if ( m_event[ i ].type == RADAR_EVENT_BEACON_PULSE )
+				drawSingleBeaconEvent( pixelX, pixelY, width, height, i );
+			else
+				drawSingleGenericEvent( pixelX, pixelY, width, height, i );
+
+		}
+
+	}
+
+}
+
+
+//-------------------------------------------------------------------------------------------------
+/** Draw all the radar icons */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::drawIcons( Int pixelX, Int pixelY, Int width, Int height )
+{
+	Player *player = rts::getObservedOrLocalPlayer();
+	for (RadarObject *heroObj = m_localHeroObjectList; heroObj; heroObj = heroObj->friend_getNext())
+	{
+		if (canRenderObject(heroObj, player))
+		{
+			drawHeroIcon(pixelX, pixelY, width, height, heroObj->friend_getObject()->getPosition());
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::updateObjectTexture(TextureClass *texture)
+{
+	// reset the overlay texture
+	SurfaceClass *surface = texture->Get_Surface_Level();
+	surface->Clear();
+	REF_PTR_RELEASE(surface);
+
+	// rebuild the object overlay
+	renderObjectList( m_objectList, texture );
+	renderObjectList( m_localObjectList, texture );
+	renderObjectList( m_localHeroObjectList, texture );
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+Bool W3DRadar::canRenderObject( const RadarObject *rObj, const Player *localPlayer )
+{
+	if (rObj->isTemporarilyHidden())
+	{
+		return false;
+	}
+
+	const Int playerIndex = localPlayer->getPlayerIndex();
+	const Object *obj = rObj->friend_getObject();
+
+	//
+	// check for shrouded status
+	// if object is fogged or shrouded, don't render it
+	//
+	if (obj->getShroudedStatus(playerIndex) > OBJECTSHROUD_PARTIAL_CLEAR)
+	{
+		return false;
+	}
+
+	//
+	// objects with a local only unit priority will only appear on the radar if they
+	// are controlled by the local player, or if the local player is an observer (cause
+	// they are godlike and can see everything)
+	//
+	if (obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY &&
+		obj->getControllingPlayer() != localPlayer &&
+		localPlayer->isPlayerActive() )
+	{
+		return false;
+	}
+
+	//
+	// ML-- What the heck is this? local-only and neutral-observer-viewed units are stealthy?? Since when?
+	// Now it twinkles for any stealthed object, whether locally controlled or neutral-observer-viewed
+	//
+	if (TheControlBar->getCurrentlyViewedPlayerRelationship(obj->getTeam()) == ENEMIES &&
+		obj->testStatus( OBJECT_STATUS_STEALTHED ) &&
+		!obj->testStatus( OBJECT_STATUS_DETECTED ) &&
+		!obj->testStatus( OBJECT_STATUS_DISGUISED ) )
+	{
+		return false;
+	}
+
+	return true;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Render an object list into the texture passed in */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::renderObjectList( const RadarObject *listHead, TextureClass *texture )
+{
+
+	// sanity
+	if( listHead == NULL || texture == NULL )
+		return;
+
+	// get surface for texture to render into
+	SurfaceClass *surface = texture->Get_Surface_Level();
+
+	// loop through all objects and draw
+	ICoord2D radarPoint;
+
+	Player *player = rts::getObservedOrLocalPlayer();
+
+	for( const RadarObject *rObj = listHead; rObj; rObj = rObj->friend_getNext() )
+	{
+		if (!canRenderObject(rObj, player))
+			continue;
+
+		// get object position
+		const Object *obj = rObj->friend_getObject();
+		const Coord3D *pos = obj->getPosition();
+
+		// compute object position as a radar blip
+		radarPoint.x = pos->x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
+		radarPoint.y = pos->y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
+
+		// get the color we're going to draw in
+		Color c = rObj->getColor();
+
+		// adjust the alpha for stealth units so they "fade/blink" on the radar for the controller
+		// if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY )
+		// ML-- What the heck is this? local-only and neutral-observer-viewed units are stealthy?? Since when?
+		// Now it twinkles for any stealthed object, whether locally controlled or neutral-observer-viewed
+		if( obj->testStatus( OBJECT_STATUS_STEALTHED ) )
+		{
+			UnsignedByte r, g, b, a;
+			GameGetColorComponents( c, &r, &g, &b, &a );
+
+			const UnsignedInt framesForTransition = LOGICFRAMES_PER_SECOND;
+			const UnsignedByte minAlpha = 32;
+
+			Real alphaScale = INT_TO_REAL(TheGameLogic->getFrame() % framesForTransition) / (framesForTransition / 2.0f);
+			if( alphaScale > 0.0f )
+				a = REAL_TO_UNSIGNEDBYTE( ((alphaScale - 1.0f) * (255.0f - minAlpha)) + minAlpha );
+			else
+				a = REAL_TO_UNSIGNEDBYTE( (alphaScale * (255.0f - minAlpha)) + minAlpha );
+			c = GameMakeColor( r, g, b, a );
+
+		}
+
+		// draw the blip, but make sure the points are legal
+		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
+			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
+
+		radarPoint.y++;
+		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
+			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
+
+		radarPoint.x++;
+		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
+			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
+
+		radarPoint.y--;
+		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
+			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
+
+	}
+	REF_PTR_RELEASE(surface);
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Shade the color passed in using the height parameter to lighten and darken it.  Colors
+	* will be interpolated using the value "height" across the range from loZ to hiZ.  The
+	* midZ is the "middle" point, height values above it will be lightened, while
+	* lower ones are darkened. */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::interpolateColorForHeight( RGBColor *color,
+																					Real height,
+																					Real hiZ,
+																					Real midZ,
+																					Real loZ )
+{
+	const Real howBright = 0.95f;  // bigger is brighter (0.0 to 1.0)
+	const Real howDark   = 0.60f;  // bigger is darker (0.0 to 1.0)
+
+	// sanity on map height (flat maps bomb)
+	if (hiZ == midZ)
+		hiZ = midZ+0.1f;
+	if (midZ == loZ)
+		loZ = midZ-0.1f;
+	if (hiZ == loZ)
+		hiZ = loZ+0.2f;
+
+	Real t;
+	RGBColor colorTarget;
+
+	// if "over" the middle height, interpolate lighter
+	if( height >= midZ )
+	{
+
+		// how far are we from the middleZ towards the hi Z
+		t = (height - midZ) / (hiZ - midZ);
+
+		// compute what our "lightest" color possible we want to use is
+		colorTarget.red = color->red + (1.0f - color->red) * howBright;
+		colorTarget.green = color->green + (1.0f - color->green) * howBright;
+		colorTarget.blue = color->blue + (1.0f - color->blue) * howBright;
+
+	}
+	else  // interpolate darker
+	{
+
+		// how far are we from the middleZ towards the low Z
+		t = (midZ - height) / (midZ - loZ);
+
+		// compute what the "darkest" color possible we want to use is
+		colorTarget.red = color->red + (0.0f - color->red) * howDark;
+		colorTarget.green = color->green + (0.0f - color->green) * howDark;
+		colorTarget.blue = color->blue + (0.0f - color->blue) * howDark;
+
+	}
+
+	// interpolate toward the target color
+	color->red = color->red + (colorTarget.red - color->red) * t;
+	color->green = color->green + (colorTarget.green - color->green) * t;
+	color->blue = color->blue + (colorTarget.blue - color->blue) * t;
+
+	// keep the color real
+	if( color->red < 0.0f )
+		color->red = 0.0f;
+	if( color->red > 1.0f )
+		color->red = 1.0f;
+	if( color->green < 0.0f )
+		color->green = 0.0f;
+	if( color->green > 1.0f )
+		color->green = 1.0f;
+	if( color->blue < 0.0f )
+		color->blue = 0.0f;
+	if( color->blue > 1.0f )
+		color->blue = 1.0f;
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// PUBLIC METHODS /////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+W3DRadar::W3DRadar( void )
+{
+
+	m_terrainTextureFormat = WW3D_FORMAT_UNKNOWN;
+	m_terrainImage = NULL;
+	m_terrainTexture = NULL;
+
+	m_overlayTextureFormat = WW3D_FORMAT_UNKNOWN;
+	m_overlayImage = NULL;
+	m_overlayTexture = NULL;
+
+	m_shroudTextureFormat = WW3D_FORMAT_UNKNOWN;
+	m_shroudImage = NULL;
+	m_shroudTexture = NULL;
+
+	m_textureWidth = RADAR_CELL_WIDTH;
+	m_textureHeight = RADAR_CELL_HEIGHT;
+
+	m_reconstructViewBox = TRUE;
+	m_viewAngle = 0.0f;
+	m_viewZoom = 0.0f;
+	for( Int i = 0; i < 4; i++ )
+	{
+
+		m_viewBox[ i ].x = 0;
+		m_viewBox[ i ].y = 0;
+
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+W3DRadar::~W3DRadar( void )
+{
+
+	// delete resources used for the W3D radar
+	deleteResources();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::xfer( Xfer *xfer )
+{
+	Radar::xfer(xfer);
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Radar initialization */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::init( void )
+{
+	ICoord2D size;
+	Region2D uv;
+
+	// extending functionality
+	Radar::init();
+
+	// gather specific texture format information
+	initializeTextureFormats();
+
+	// allocate our terrain texture
+	// poolify
+	m_terrainTexture = MSGNEW("TextureClass") TextureClass( m_textureWidth, m_textureHeight,
+																			 m_terrainTextureFormat, MIP_LEVELS_1 );
+	DEBUG_ASSERTCRASH( m_terrainTexture, ("W3DRadar: Unable to allocate terrain texture") );
+
+	// allocate our overlay texture
+	m_overlayTexture = MSGNEW("TextureClass") TextureClass( m_textureWidth, m_textureHeight,
+																			 m_overlayTextureFormat, MIP_LEVELS_1 );
+	DEBUG_ASSERTCRASH( m_overlayTexture, ("W3DRadar: Unable to allocate overlay texture") );
+
+	// set filter type for the overlay texture, try it and see if you like it, I don't ;)
+//	m_overlayTexture->Set_Min_Filter( TextureFilterClass::FILTER_TYPE_NONE );
+//	m_overlayTexture->Set_Mag_Filter( TextureFilterClass::FILTER_TYPE_NONE );
+
+	// allocate our shroud texture
+	m_shroudTexture = MSGNEW("TextureClass") TextureClass( m_textureWidth, m_textureHeight,
+																			 m_shroudTextureFormat, MIP_LEVELS_1 );
+	DEBUG_ASSERTCRASH( m_shroudTexture, ("W3DRadar: Unable to allocate shroud texture") );
+	m_shroudTexture->Get_Filter().Set_Min_Filter( TextureFilterClass::FILTER_TYPE_DEFAULT );
+	m_shroudTexture->Get_Filter().Set_Mag_Filter( TextureFilterClass::FILTER_TYPE_DEFAULT );
+
+	//
+	// create images used for rendering and set them up with the textures
+	//
+
+	//
+	// the terrain image, note the UV coords change it from (0,0) in the upper left
+	// to (0,0) in the lower left cause that's how we are initially oriented in the
+	// world (positive X to the right and positive Y up)
+	//
+	m_terrainImage = newInstance(Image);
+	uv.lo.x = 0.0f;
+	uv.lo.y = 1.0f;
+	uv.hi.x = 1.0f;
+	uv.hi.y = 0.0f;
+	m_terrainImage->setStatus( IMAGE_STATUS_RAW_TEXTURE );
+	m_terrainImage->setRawTextureData( m_terrainTexture );
+	m_terrainImage->setUV( &uv );
+	m_terrainImage->setTextureWidth( m_textureWidth );
+	m_terrainImage->setTextureHeight( m_textureHeight );
+	size.x = m_textureWidth;
+	size.y = m_textureHeight;
+	m_terrainImage->setImageSize( &size );
+
+	// the overlay image
+	m_overlayImage = newInstance(Image);
+	uv.lo.x = 0.0f;
+	uv.lo.y = 1.0f;
+	uv.hi.x = 1.0f;
+	uv.hi.y = 0.0f;
+	m_overlayImage->setStatus( IMAGE_STATUS_RAW_TEXTURE );
+	m_overlayImage->setRawTextureData( m_overlayTexture );
+	m_overlayImage->setUV( &uv );
+	m_overlayImage->setTextureWidth( m_textureWidth );
+	m_overlayImage->setTextureHeight( m_textureHeight );
+	size.x = m_textureWidth;
+	size.y = m_textureHeight;
+	m_overlayImage->setImageSize( &size );
+
+	// the shroud image
+	m_shroudImage = newInstance(Image);
+	uv.lo.x = 0.0f;
+	uv.lo.y = 1.0f;
+	uv.hi.x = 1.0f;
+	uv.hi.y = 0.0f;
+	m_shroudImage->setStatus( IMAGE_STATUS_RAW_TEXTURE );
+	m_shroudImage->setRawTextureData( m_shroudTexture );
+	m_shroudImage->setUV( &uv );
+	m_shroudImage->setTextureWidth( m_textureWidth );
+	m_shroudImage->setTextureHeight( m_textureHeight );
+	size.x = m_textureWidth;
+	size.y = m_textureHeight;
+	m_shroudImage->setImageSize( &size );
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Reset the radar to the initial empty state ready for new data */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::reset( void )
+{
+
+	// extending functionality, call base class
+	Radar::reset();
+
+	// clear our texture data, but do not delete the resources
+	SurfaceClass *surface;
+
+	surface = m_terrainTexture->Get_Surface_Level();
+	if( surface )
+	{
+		surface->Clear();
+		REF_PTR_RELEASE(surface);
+	}
+
+	surface = m_overlayTexture->Get_Surface_Level();
+	if( surface )
+	{
+		surface->Clear();
+		REF_PTR_RELEASE(surface);
+	}
+
+	// don't call Clear(); that wips to transparent. do this instead.
+	//gs Dude, it's called CLEARshroud.  It needs to clear the shroud.
+	clearShroud();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Update */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::update( void )
+{
+
+	// extend base class
+	Radar::update();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Reset the radar for the new map data being given to it */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::newMap( TerrainLogic *terrain )
+{
+
+	//
+	// extending functionality, call the base class ... this will cause a reset of the
+	// system which will clear out our textures but not free them
+	//
+	Radar::newMap( terrain );
+
+	// sanity
+	if( terrain == NULL )
+		return;
+
+	// build terrain texture
+	buildTerrainTexture( terrain );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DRadar::buildTerrainTexture( TerrainLogic *terrain )
+{
+	SurfaceClass *surface;
+	RGBColor waterColor;
+
+	// we will want to reconstruct our new view box now
+	m_reconstructViewBox = TRUE;
+
+	// setup our water color
+	waterColor.red = TheWaterTransparency->m_radarColor.red;
+	waterColor.green = TheWaterTransparency->m_radarColor.green;
+	waterColor.blue = TheWaterTransparency->m_radarColor.blue;
+
+	// get the terrain surface to draw in
+	surface = m_terrainTexture->Get_Surface_Level();
+	DEBUG_ASSERTCRASH( surface, ("W3DRadar: Can't get surface for terrain texture") );
+
+	// build the terrain
+	RGBColor sampleColor;
+	RGBColor color;
+	Int i, j, samples;
+	Int x, y;
+	ICoord2D radarPoint;
+	Coord3D worldPoint;
+	Bridge *bridge;
+	for( y = 0; y < m_textureHeight; y++ )
+	{
+
+		for( x = 0; x < m_textureWidth; x++ )
+		{
+
+			// what point are we inspecting
+			radarPoint.x = x;
+			radarPoint.y = y;
+			radarToWorld2D( &radarPoint, &worldPoint );
+
+			// check to see if this point is part of a working bridge
+			Bool workingBridge = FALSE;
+			bridge = TheTerrainLogic->findBridgeAt( &worldPoint );
+			if( bridge != NULL )
+			{
+				Object *obj = TheGameLogic->findObjectByID( bridge->peekBridgeInfo()->bridgeObjectID );
+
+				if( obj )
+				{
+					BodyModuleInterface *body = obj->getBodyModule();
+
+					if( body->getDamageState() != BODY_RUBBLE )
+						workingBridge = TRUE;
+
+				}
+
+			}
+
+			// create a color based on the Z height of the map
+			Real waterZ;
+			if( workingBridge == FALSE && terrain->isUnderwater( worldPoint.x, worldPoint.y, &waterZ ) )
+			{
+				const Int waterSamplesAway = 1;		// how many "tiles" from the center tile we will sample away
+																					// to average a color for the tile color
+
+				sampleColor.red = sampleColor.green = sampleColor.blue = 0.0f;
+				samples = 0;
+
+				for( j = y - waterSamplesAway; j <= y + waterSamplesAway; j++ )
+				{
+
+					if( j >= 0 && j < m_textureHeight )
+					{
+
+						for( i = x - waterSamplesAway; i <= x + waterSamplesAway; i++ )
+						{
+
+							if( i >= 0 && i < m_textureWidth )
+							{
+
+								// the the world point we are concerned with
+								radarPoint.x = i;
+								radarPoint.y = j;
+								radarToWorld2D( &radarPoint, &worldPoint );
+
+								// get color for this Z and add to our sample color
+								Real underwaterZ;
+								if( terrain->isUnderwater( worldPoint.x, worldPoint.y, NULL, &underwaterZ ) )
+								{
+									// this is our "color" for water
+									color = waterColor;
+
+									// interpolate the water color for height in the water table
+									interpolateColorForHeight( &color, underwaterZ, waterZ,
+																						 waterZ,
+																						 m_mapExtent.lo.z );
+
+									// add color to our samples
+									sampleColor.red += color.red;
+									sampleColor.green += color.green;
+									sampleColor.blue += color.blue;
+									samples++;
+
+								}
+
+							}
+
+						}
+
+					}
+
+				}
+
+				// prevent divide by zeros
+				if( samples == 0 )
+					samples = 1;
+
+				// set the color to an average of the colors read
+				color.red = sampleColor.red / (Real)samples;
+				color.green = sampleColor.green / (Real)samples;
+				color.blue = sampleColor.blue / (Real)samples;
+
+			}
+			else  // regular terrain ...
+			{
+				const Int samplesAway = 1;  // how many "tiles" from the center tile we will sample away
+																		// to average a color for the tile color
+
+				sampleColor.red = sampleColor.green = sampleColor.blue = 0.0f;
+				samples = 0;
+
+				for( j = y - samplesAway; j <= y + samplesAway; j++ )
+				{
+
+					if( j >= 0 && j < m_textureHeight )
+					{
+
+						for( i = x - samplesAway; i <= x + samplesAway; i++ )
+						{
+
+							if( i >= 0 && i < m_textureWidth )
+							{
+
+								// the the world point we are concerned with
+								radarPoint.x = i;
+								radarPoint.y = j;
+								radarToWorld( &radarPoint, &worldPoint );
+
+								// get the color we're going to use here
+								if( workingBridge )
+								{
+									AsciiString bridgeTName = bridge->getBridgeTemplateName();
+									TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( bridgeTName );
+
+									// sanity
+									DEBUG_ASSERTCRASH( bridgeTemplate, ("W3DRadar::buildTerrainTexture - Can't find bridge template for '%s'", bridgeTName.str()) );
+
+									// use bridge color
+									if ( bridgeTemplate )
+										color = bridgeTemplate->getRadarColor();
+									else
+										color.setFromInt(0xffffffff);
+									//
+									// we won't use the height of the terrain at this sample point, we will
+									// instead use the height for the entire bridge
+									//
+									Real bridgeHeight = (bridge->peekBridgeInfo()->fromLeft.z +
+																			 bridge->peekBridgeInfo()->fromRight.z +
+																			 bridge->peekBridgeInfo()->toLeft.z +
+																			 bridge->peekBridgeInfo()->toRight.z) / 4.0f;
+
+									// interpolate the color, but use the bridge height, not the terrain height
+									interpolateColorForHeight( &color, bridgeHeight,
+																						 getTerrainAverageZ(),
+																						 m_mapExtent.hi.z, m_mapExtent.lo.z );
+
+								}
+								else
+								{
+
+									// get the color at this point
+									TheTerrainVisual->getTerrainColorAt( worldPoint.x, worldPoint.y, &color );
+
+									// interpolate the color for height
+									interpolateColorForHeight( &color, worldPoint.z, getTerrainAverageZ(),
+																						 m_mapExtent.hi.z, m_mapExtent.lo.z );
+
+								}
+
+								// add color to our samples
+								sampleColor.red += color.red;
+								sampleColor.green += color.green;
+								sampleColor.blue += color.blue;
+								samples++;
+
+							}
+
+						}
+
+					}
+
+				}
+
+				// prevent divide by zeros
+				if( samples == 0 )
+					samples = 1;
+
+				// set the color to an average of the colors read
+				color.red = sampleColor.red / (Real)samples;
+				color.green = sampleColor.green / (Real)samples;
+				color.blue = sampleColor.blue / (Real)samples;
+
+			}
+
+			//
+			// draw the pixel for the terrain at this point, note that because of the orientation
+			// of our world we draw it with positive y in the "up" direction
+			//
+			// FYI: I tried making this faster by pulling out all the code inside DrawPixel
+			// and locking only once ... but it made absolutely *no* performance difference,
+			// the sampling and interpolation algorithm for generating pretty looking terrain
+			// and water for the radar is just, well, expensive.
+			//
+			surface->DrawPixel( x, y, GameMakeColor( color.red * 255,
+																							 color.green * 255,
+																							 color.blue * 255,
+																							 255 ) );
+
+		}
+
+	}
+
+	// all done with the surface
+	REF_PTR_RELEASE(surface);
+
+}
+
+// ------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::clearShroud()
+{
+#if ENABLE_CONFIGURABLE_SHROUD
+	if (!TheGlobalData->m_shroudOn)
+		return;
+#endif
+
+	SurfaceClass *surface = m_shroudTexture->Get_Surface_Level();
+
+	// fill to clear, shroud will make black.  Don't want to make something black that logic can't clear
+	unsigned int color = GameMakeColor( 0, 0, 0, 0 );
+	for( Int y = 0; y < m_textureHeight; y++ )
+	{
+		surface->DrawHLine(y, 0, m_textureWidth-1, color);
+	}
+	REF_PTR_RELEASE(surface);
+}
+
+// ------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::setShroudLevel(Int shroudX, Int shroudY, CellShroudStatus setting)
+{
+#if ENABLE_CONFIGURABLE_SHROUD
+	if (!TheGlobalData->m_shroudOn)
+		return;
+#endif
+
+	W3DShroud* shroud = TheTerrainRenderObject ? TheTerrainRenderObject->getShroud() : NULL;
+	if (!shroud)
+		return;
+
+	SurfaceClass* surface = m_shroudTexture->Get_Surface_Level();
+	DEBUG_ASSERTCRASH( surface, ("W3DRadar: Can't get surface for Shroud texture") );
+
+	Int mapMinX = shroudX * shroud->getCellWidth();
+	Int mapMinY = shroudY * shroud->getCellHeight();
+	Int mapMaxX = (shroudX+1) * shroud->getCellWidth();
+	Int mapMaxY = (shroudY+1) * shroud->getCellHeight();
+
+	ICoord2D radarPoint;
+	Coord3D worldPoint;
+
+	worldPoint.x = mapMinX;
+	worldPoint.y = mapMinY;
+	worldToRadar( &worldPoint, &radarPoint );
+	Int radarMinX = radarPoint.x;
+	Int radarMinY = radarPoint.y;
+
+	worldPoint.x = mapMaxX;
+	worldPoint.y = mapMaxY;
+	worldToRadar( &worldPoint, &radarPoint );
+	Int radarMaxX = radarPoint.x;
+	Int radarMaxY = radarPoint.y;
+
+/*
+	Int radarMinX = REAL_TO_INT_FLOOR(mapMinX / getXSample());
+	Int radarMinY = REAL_TO_INT_FLOOR(mapMinY / getYSample());
+	Int radarMaxX = REAL_TO_INT_CEIL(mapMaxX / getXSample());
+	Int radarMaxY = REAL_TO_INT_CEIL(mapMaxY / getYSample());
+*/
+
+	/// @todo srj -- this really needs to smooth the display!
+
+	//Logic is saying shroud.  We can add alpha levels here in client if needed.
+	// W3DShroud is a 0-255 alpha byte.  Logic shroud is a double reference count.
+	Int alpha;
+	if( setting == CELLSHROUD_SHROUDED )
+		alpha = 255;
+	else if( setting == CELLSHROUD_FOGGED )
+		alpha = 127;///< @todo placeholder to get feedback on logic work while graphic side being decided
+	else
+		alpha = 0;
+
+	for( Int y = radarMinY; y <= radarMaxY; y++ )
+	{
+		for( Int x = radarMinX; x <= radarMaxX; x++ )
+		{
+			if( legalRadarPoint( x, y ) )
+				surface->DrawPixel( x, y, GameMakeColor( 0, 0, 0, alpha ) );
+		}
+	}
+	REF_PTR_RELEASE(surface);
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Actually draw the radar at the screen coordinates provided
+	* NOTE about how drawing works: The radar images are computed at samples across the
+	* map and are built into a "square" texture area.  At the time of drawing and computing
+	* radar<->world coords we consider the "ratio" of width to height of the map dimensions
+	* so that when we draw we preserve the aspect ratio of the map and don't squish it in
+	* any direction that would cause the map to be distorted.  Extra blank space is drawn
+	* around the radar images to keep the whole radar area covered when the map displayed
+	* is "long" or "tall" */
+//-------------------------------------------------------------------------------------------------
+void W3DRadar::draw( Int pixelX, Int pixelY, Int width, Int height )
+{
+	// if the local player does not have a radar then we can't draw anything
+	if( !rts::localPlayerHasRadar() )
+		return;
+
+	//
+	// given a upper left corner at pixelX|Y and a width and height to draw into, figure out
+	// where we should start and end the image so that the final drawn image has the
+	// same ratio as the map and isn't stretched or distorted
+	//
+	ICoord2D ul, lr;
+	findDrawPositions( pixelX, pixelY, width, height, &ul, &lr );
+
+	Int scaledWidth = lr.x - ul.x;
+	Int scaledHeight = lr.y - ul.y;
+
+	// draw black border areas where we need map
+	Color fillColor = GameMakeColor( 0, 0, 0, 255 );
+	Color lineColor = GameMakeColor( 50, 50, 50, 255 );
+	if( m_mapExtent.width()/width >= m_mapExtent.height()/height )
+	{
+
+		// draw horizontal bars at top and bottom
+		TheDisplay->drawFillRect( pixelX, pixelY, width, ul.y - pixelY - 1, fillColor );
+		TheDisplay->drawFillRect( pixelX, lr.y + 1, width, pixelY + height - lr.y - 1, fillColor);
+		TheDisplay->drawLine(pixelX, ul.y, pixelX + width, ul.y, 1, lineColor);
+		TheDisplay->drawLine(pixelX, lr.y + 1, pixelX + width, lr.y + 1, 1, lineColor);
+
+	}
+	else
+	{
+
+		// draw vertical bars to the left and right
+		TheDisplay->drawFillRect( pixelX, pixelY, ul.x - pixelX - 1, height, fillColor );
+		TheDisplay->drawFillRect( lr.x + 1, pixelY, width - (lr.x - pixelX) - 1, height, fillColor );
+		TheDisplay->drawLine(ul.x, pixelY, ul.x, pixelY + height, 1, lineColor);
+		TheDisplay->drawLine(lr.x + 1, pixelY, lr.x + 1, pixelY + height, 1, lineColor);
+
+	}
+
+	// draw the terrain texture
+	TheDisplay->drawImage( m_terrainImage, ul.x, ul.y, lr.x, lr.y );
+
+	// refresh the overlay texture once every so many frames
+	if( TheGameClient->getFrame() % OVERLAY_REFRESH_RATE == 0 )
+	{
+		updateObjectTexture(m_overlayTexture);
+	}
+
+	// draw the overlay image
+ 	TheDisplay->drawImage( m_overlayImage, ul.x, ul.y, lr.x, lr.y );
+
+	// draw the shroud image
+#if ENABLE_CONFIGURABLE_SHROUD
+	if( TheGlobalData->m_shroudOn )
+#else
+	if (true)
+#endif
+	{
+		TheDisplay->drawImage( m_shroudImage, ul.x, ul.y, lr.x, lr.y );
+	}
+
+	// draw any icons
+	drawIcons( ul.x, ul.y, scaledWidth, scaledHeight );
+
+	// draw any radar events
+	drawEvents( ul.x, ul.y, scaledWidth, scaledHeight );
+
+	// see if we need to reconstruct the view box
+	if( TheTacticalView->getZoom() != m_viewZoom )
+		m_reconstructViewBox = TRUE;
+	if( TheTacticalView->getAngle() != m_viewAngle )
+		m_reconstructViewBox = TRUE;
+
+	if( m_reconstructViewBox == TRUE )
+		reconstructViewBox();
+
+	// draw the view region on top of the radar reconstructing if necessary
+	drawViewBox( ul.x, ul.y, scaledWidth, scaledHeight );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DRadar::refreshTerrain( TerrainLogic *terrain )
+{
+
+	// extend base class
+	Radar::refreshTerrain( terrain );
+
+	// rebuild the entire terrain texture
+	buildTerrainTexture( terrain );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DRadar::refreshObjects()
+{
+	if constexpr (OVERLAY_REFRESH_RATE > 1)
+	{
+		if (m_overlayTexture != NULL)
+		{
+			updateObjectTexture(m_overlayTexture);
+		}
+	}
+}
+
+
+
+///The following is an "archive" of an attempt to foil the mapshroud hack... saved for later, since it is too close to release to try it
+
+
+/*
+ *
+	void W3DRadar::renderObjectList( const RadarObject *listHead, TextureClass *texture )
+{
+
+	// sanity
+	if( listHead == NULL || texture == NULL )
+		return;
+
+	// get surface for texture to render into
+	SurfaceClass *surface = texture->Get_Surface_Level();
+
+	// loop through all objects and draw
+	ICoord2D radarPoint;
+
+	Player *player = rts::getObservedOrLocalPlayer();
+	const Int playerIndex = player->getPlayerIndex();
+
+	UnsignedByte minAlpha = 8;
+
+	for( const RadarObject *rObj = listHead; rObj; rObj = rObj->friend_getNext() )
+	{
+    UnsignedByte h = (UnsignedByte)(rObj->isTemporarilyHidden());
+    if ( h )
+			continue;
+
+    UnsignedByte a = 0;
+
+		// get object
+		const Object *obj = rObj->friend_getObject();
+		UnsignedByte r = 1;   // all decoys
+
+		// get the color we're going to draw in
+		UnsignedInt c = 0xfe000000;// this is a decoy
+    c |= (UnsignedInt)( obj->testStatus( OBJECT_STATUS_STEALTHED ) );//so is this
+
+		// check for shrouded status
+		UnsignedByte k =  (UnsignedByte)(obj->getShroudedStatus(playerIndex) > OBJECTSHROUD_PARTIAL_CLEAR);
+    if ( k || a)
+			continue;	//object is fogged or shrouded, don't render it.
+
+ 		//
+ 		// objects with a local only unit priority will only appear on the radar if they
+ 		// are controlled by the local player, or if the local player is an observer (cause
+		// they are godlike and can see everything)
+ 		//
+ 		if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY &&
+				obj->getControllingPlayer() != player &&
+				player->isPlayerActive() )
+ 			continue;
+
+    UnsignedByte g = c|a;
+    UnsignedByte b = h|a;
+		// get object position
+		const Coord3D *pos = obj->getPosition();
+
+		// compute object position as a radar blip
+		radarPoint.x = pos->x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
+		radarPoint.y = pos->y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
+
+
+		const UnsignedInt framesForTransition = LOGICFRAMES_PER_SECOND;
+
+
+
+		// adjust the alpha for stealth units so they "fade/blink" on the radar for the controller
+		// if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY )
+		// ML-- What the heck is this? local-only and neutral-observier-viewed units are stealthy?? Since when?
+		// Now it twinkles for any stealthed object, whether locally controlled or neutral-observier-viewed
+    c = rObj->getColor();
+
+		if( g & r )
+		{
+		  Real alphaScale = INT_TO_REAL(TheGameLogic->getFrame() % framesForTransition) / (framesForTransition * 0.5f);
+      minAlpha <<= 2; // decoy
+
+ 			if ( ( obj->isLocallyControlled() == (Bool)a ) // another decoy, comparing the return of this non-inline with a local
+        && !obj->testStatus( OBJECT_STATUS_DISGUISED )
+        && !obj->testStatus( OBJECT_STATUS_DETECTED )
+        && ++a != 0 // The trick is that this increment does not occur unless all three above conditions are true
+        && minAlpha == 32  // tricksy hobbit decoy
+        && c != 0 )        // ditto
+      {
+        g = (UnsignedByte)(rObj->getColor());
+        continue;
+      }
+
+      a |= k | b;
+			GameGetColorComponentsWithCheatSpy( c, &r, &g, &b, &a );//this function does not touch the low order bit in 'a'
+
+
+			if( alphaScale > 0.0f )
+				a = REAL_TO_UNSIGNEDBYTE( ((alphaScale - 1.0f) * (255.0f - minAlpha)) + minAlpha );
+			else
+				a = REAL_TO_UNSIGNEDBYTE( (alphaScale * (255.0f - minAlpha)) + minAlpha );
+			c = GameMakeColor( r, g, b, a );
+
+		}
+
+
+
+
+		// draw the blip, but make sure the points are legal
+		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
+			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
+
+		radarPoint.x++;
+		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
+			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
+
+		radarPoint.y++;
+		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
+			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
+
+		radarPoint.x--;
+		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
+			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
+
+
+
+
+	}
+	REF_PTR_RELEASE(surface);
+
+}
+
+
+ *
+ */
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp
similarity index 95%
rename from GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp
rename to Core/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp
index bc7601a24dd..afb6045e686 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Heightmap.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,12 +43,10 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include <tri.h>
@@ -59,6 +57,7 @@
 #include <d3dx8core.h>
 #include "Common/GlobalData.h"
 #include "Common/PerfTimer.h"
+#include "Common/Xfer.h"
 
 #include "GameClient/TerrainVisual.h"
 #include "GameClient/View.h"
@@ -88,8 +87,7 @@
 #include "W3DDevice/GameClient/W3DPoly.h"
 #include "W3DDevice/GameClient/W3DCustomScene.h"
 
-#include "Common/PerfTimer.h"
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.		 
+#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
 #include "W3DDevice/GameClient/BaseHeightMap.h"
 
 #include "W3DDevice/GameClient/HeightMap.h"
@@ -97,17 +95,12 @@
 #include "W3DDevice/GameClient/W3DSmudge.h"
 #include "W3DDevice/GameClient/W3DSnow.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 extern FlatHeightMapRenderObjClass *TheFlatHeightMap;
 extern HeightMapRenderObjClass *TheHeightMap;
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 #define SC_DETAIL_BLEND ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
 	ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
@@ -116,12 +109,12 @@ extern HeightMapRenderObjClass *TheHeightMap;
 static ShaderClass detailOpaqueShader(SC_DETAIL_BLEND);
 
 //-----------------------------------------------------------------------------
-//         Global Functions & Data                                              
+//         Global Functions & Data
 //-----------------------------------------------------------------------------
 /// The one-of for the terrain rendering object.
 BaseHeightMapRenderObjClass *TheTerrainRenderObject=NULL;
 
-/** Entry point so that trees can be drawn at the appropriate point in the rendering pipe for 
+/** Entry point so that trees can be drawn at the appropriate point in the rendering pipe for
     transparent objects. */
 void DoTrees(RenderInfoClass & rinfo)
 {
@@ -132,7 +125,7 @@ void DoTrees(RenderInfoClass & rinfo)
 
 void oversizeTheTerrain(Int amount)
 {
-	if (TheTerrainRenderObject) 
+	if (TheTerrainRenderObject)
 	{
 		TheTerrainRenderObject->oversizeTerrain(amount);
 	}
@@ -145,7 +138,7 @@ void oversizeTheTerrain(Int amount)
 inline Int IABS(Int x) {	if (x>=0) return x; return -x;};
 
 //-----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -195,7 +188,7 @@ void BaseHeightMapRenderObjClass::drawScorches(void)
 
 
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -206,46 +199,35 @@ void BaseHeightMapRenderObjClass::drawScorches(void)
 BaseHeightMapRenderObjClass::~BaseHeightMapRenderObjClass(void)
 {
 	freeMapResources();
-	if (m_treeBuffer) {
-		delete m_treeBuffer;
- 		m_treeBuffer = NULL;
-	}
-	if (m_propBuffer) {
-		delete m_propBuffer;
- 		m_propBuffer = NULL;
-	}
-	if (m_bibBuffer) {
-		delete m_bibBuffer;
- 		m_bibBuffer = NULL;
-	}
+
+	delete m_treeBuffer;
+	m_treeBuffer = NULL;
+
+	delete m_propBuffer;
+	m_propBuffer = NULL;
+
+	delete m_bibBuffer;
+	m_bibBuffer = NULL;
+
 #ifdef DO_ROADS
-	if (m_roadBuffer) {
-		delete m_roadBuffer;
- 		m_roadBuffer = NULL;
-	}
+	delete m_roadBuffer;
+	m_roadBuffer = NULL;
 #endif
-	if (m_bridgeBuffer) {
-		delete m_bridgeBuffer;
-	}
 
-	if( m_waypointBuffer )
-	{
-		delete m_waypointBuffer;
-		m_waypointBuffer = NULL;
-	}
-	if (m_shroud) {
-		delete m_shroud;
-		m_shroud = NULL;
-	}
-	if (m_shoreLineTilePositions)	{
-		delete [] m_shoreLineTilePositions;
-		m_shoreLineTilePositions = NULL;
-	}
-	if (m_shoreLineSortInfos)
-	{
-		delete [] m_shoreLineSortInfos;
-		m_shoreLineSortInfos = NULL;
-	}
+	delete m_bridgeBuffer;
+	m_bridgeBuffer = NULL;
+
+	delete m_waypointBuffer;
+	m_waypointBuffer = NULL;
+
+	delete m_shroud;
+	m_shroud = NULL;
+
+	delete [] m_shoreLineTilePositions;
+	m_shoreLineTilePositions = NULL;
+
+	delete [] m_shoreLineSortInfos;
+	m_shoreLineSortInfos = NULL;
 }
 
 //=============================================================================
@@ -289,8 +271,8 @@ BaseHeightMapRenderObjClass::BaseHeightMapRenderObjClass(void)
 	m_disableTextures = false;
 	TheTerrainRenderObject = this;
 
-	m_treeBuffer = NULL; 
-	m_propBuffer = NULL; 
+	m_treeBuffer = NULL;
+	m_propBuffer = NULL;
 	m_bibBuffer = NULL;
 	m_bridgeBuffer = NULL;
 	m_waypointBuffer = NULL;
@@ -320,7 +302,7 @@ BaseHeightMapRenderObjClass::BaseHeightMapRenderObjClass(void)
 #ifdef DO_ROADS
 	m_roadBuffer = NEW W3DRoadBuffer;
 #endif
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if ENABLE_CONFIGURABLE_SHROUD
 	if (TheGlobalData->m_shroudOn)
 		m_shroud = NEW W3DShroud;
 #else
@@ -340,10 +322,10 @@ void BaseHeightMapRenderObjClass::setTextureLOD(Int lod)
 //=============================================================================
 // BaseHeightMapRenderObjClass::adjustTerrainLOD
 //=============================================================================
-/** Adjust the terrain Level Of Detail.  If adj > 0 , increases LOD 1 step, if 
+/** Adjust the terrain Level Of Detail.  If adj > 0 , increases LOD 1 step, if
 adj < 0 decreases it one step, if adj==0, then just sets up for the current LOD */
 //=============================================================================
-void BaseHeightMapRenderObjClass::adjustTerrainLOD(Int adj) 
+void BaseHeightMapRenderObjClass::adjustTerrainLOD(Int adj)
 {
 	if (adj>0 && TheGlobalData->m_terrainLOD<TERRAIN_LOD_MAX) TheWritableGlobalData->m_terrainLOD=(TerrainLOD)(TheGlobalData->m_terrainLOD+1);
 	if (adj<0 && TheGlobalData->m_terrainLOD>TERRAIN_LOD_MIN) TheWritableGlobalData->m_terrainLOD=(TerrainLOD)(TheGlobalData->m_terrainLOD-1);
@@ -383,7 +365,7 @@ void BaseHeightMapRenderObjClass::adjustTerrainLOD(Int adj)
 
 	if (newROBJ) {
 		// apply the heightmap to the terrain render object
-		newROBJ->initHeightData( m_map->getDrawWidth(), 
+		newROBJ->initHeightData( m_map->getDrawWidth(),
 																					 m_map->getDrawHeight(),
 																					 m_map,
 																					 NULL);
@@ -445,7 +427,7 @@ void BaseHeightMapRenderObjClass::ReleaseResources(void)
 #ifdef DO_ROADS
 	if (m_roadBuffer) {
 		m_roadBuffer->freeRoadBuffers();
-	}		  
+	}
 #endif
 }
 
@@ -514,8 +496,8 @@ void BaseHeightMapRenderObjClass::ReAcquireResources(void)
 // BaseHeightMapRenderObjClass::doTheLight
 //=============================================================================
 /** Calculates the diffuse lighting for a vertex in the terrain, taking all of the
-static lights into account as well.  It is possible to just use the normal in the 
-vertex and let D3D do the lighting, but it is slower to render, and can only 
+static lights into account as well.  It is possible to just use the normal in the
+vertex and let D3D do the lighting, but it is slower to render, and can only
 handle 4 lights at this point. */
 //=============================================================================
 void BaseHeightMapRenderObjClass::doTheLight(VERTEX_FORMAT *vb, Vector3*light, Vector3*normal, RefRenderObjListIterator *pLightsIterator, UnsignedByte alpha)
@@ -533,7 +515,7 @@ void BaseHeightMapRenderObjClass::doTheLight(VERTEX_FORMAT *vb, Vector3*light, V
 
 	if (pLightsIterator) {
 		for (pLightsIterator->First(); !pLightsIterator->Is_Done(); pLightsIterator->Next())
-		{		
+		{
 			LightClass *pLight = (LightClass*)pLightsIterator->Peek_Obj();
 			Vector3 lightDirection(vb->x, vb->y, vb->z);
 			Real factor = 1.0f;
@@ -563,7 +545,7 @@ void BaseHeightMapRenderObjClass::doTheLight(VERTEX_FORMAT *vb, Vector3*light, V
 					}
 #endif
 					factor = WWMath::Clamp(factor,0.0f,1.0f);
-				} 
+				}
 				break;
 			case LightClass::DIRECTIONAL:
 				lightDirection = pLight->Get_Transform().Get_Z_Vector();
@@ -572,7 +554,7 @@ void BaseHeightMapRenderObjClass::doTheLight(VERTEX_FORMAT *vb, Vector3*light, V
 			};
 			lightDirection.Normalize();
 			Vector3 lightRay(-lightDirection.X, -lightDirection.Y, -lightDirection.Z);
-			shade = Vector3::Dot_Product(lightRay, *normal); 
+			shade = Vector3::Dot_Product(lightRay, *normal);
 			shade *= factor;
 			Vector3 diffuse;
 			pLight->Get_Diffuse(&diffuse);
@@ -582,18 +564,18 @@ void BaseHeightMapRenderObjClass::doTheLight(VERTEX_FORMAT *vb, Vector3*light, V
 			if(shade < 0.0f) shade = 0.0f;
 			shadeR += shade*diffuse.X;
 			shadeG += shade*diffuse.Y;
-			shadeB += shade*diffuse.Z;		
+			shadeB += shade*diffuse.Z;
 			shadeR += factor*ambient.X;
 			shadeG += factor*ambient.Y;
-			shadeB += factor*ambient.Z;		
+			shadeB += factor*ambient.Z;
 
 		}
-	} 
+	}
 	// Add in global diffuse value.
 	const RGBColor *terrainDiffuse;
 	for (Int lightIndex=0; lightIndex < TheGlobalData->m_numGlobalLights; lightIndex++)
 	{
-		shade = Vector3::Dot_Product(light[lightIndex], *normal); 
+		shade = Vector3::Dot_Product(light[lightIndex], *normal);
 		if (shade > 1.0) shade = 1.0;
 		if(shade < 0.0f) shade = 0.0f;
 		terrainDiffuse=&TheGlobalData->m_terrainDiffuse[lightIndex];
@@ -636,7 +618,7 @@ void BaseHeightMapRenderObjClass::updateMacroTexture(AsciiString textureName)
 	// Release texture.
 	REF_PTR_RELEASE(m_stageThreeTexture);
 	// Reallocate texture.
-	m_stageThreeTexture=NEW LightMapTerrainTextureClass(m_macroTextureName);	
+	m_stageThreeTexture=NEW LightMapTerrainTextureClass(m_macroTextureName);
 }
 
 //=============================================================================
@@ -713,7 +695,7 @@ bool BaseHeightMapRenderObjClass::Cast_Ray(RayCollisionTestClass & raytest)
 	Int EndCellY = 0;
 	const Int overhang = 2*32+m_map->getBorderSizeInline(); // Allow picking past the edge for scrolling & objects.
  	Vector3 minPt(MAP_XY_FACTOR*(-overhang), MAP_XY_FACTOR*(-overhang), -MAP_XY_FACTOR);
-	Vector3 maxPt(MAP_XY_FACTOR*(m_map->getXExtent()+overhang), 
+	Vector3 maxPt(MAP_XY_FACTOR*(m_map->getXExtent()+overhang),
 		MAP_XY_FACTOR*(m_map->getYExtent()+overhang), MAP_HEIGHT_SCALE*m_map->getMaxHeightValue()+MAP_XY_FACTOR);
 	MinMaxAABoxClass mmbox(minPt, maxPt);
 	hbox.Init(mmbox);
@@ -795,7 +777,7 @@ bool BaseHeightMapRenderObjClass::Cast_Ray(RayCollisionTestClass & raytest)
 
 	Int offset;
 	for (offset = 1; offset < 5; offset *= 3) {
-		for (Y=StartCellY-offset; Y<=EndCellY+offset; Y++) { 
+		for (Y=StartCellY-offset; Y<=EndCellY+offset; Y++) {
 
 			for (X=StartCellX-offset; X<=EndCellX+offset; X++) {
 				//test the 2 triangles in this cell
@@ -823,10 +805,10 @@ bool BaseHeightMapRenderObjClass::Cast_Ray(RayCollisionTestClass & raytest)
 				P3.Z=MAP_HEIGHT_SCALE*(float)getClipHeight(X, Y+1);
 
 
-				tri.V[0] = &P0; 
+				tri.V[0] = &P0;
 				tri.V[1] = &P1;
 				tri.V[2] = &P2;
-				
+
 				tri.N = &normal;
 
 				tri.Compute_Normal();
@@ -837,10 +819,10 @@ bool BaseHeightMapRenderObjClass::Cast_Ray(RayCollisionTestClass & raytest)
 					return true;
 
 				//top triangle
-				tri.V[0] = &P2; 
+				tri.V[0] = &P2;
 				tri.V[1] = &P3;
 				tri.V[2] = &P0;
-				
+
 				tri.N = &normal;
 
 				tri.Compute_Normal();
@@ -864,7 +846,7 @@ bool BaseHeightMapRenderObjClass::Cast_Ray(RayCollisionTestClass & raytest)
 //=============================================================================
 Real BaseHeightMapRenderObjClass::getHeightMapHeight(Real x, Real y, Coord3D* normal) const
 {
-  
+
   // SORRY, KIDS
   // Had to make this function logic safe, so,
   // even though this is a renderObject, and is thus classified as client-side
@@ -880,7 +862,7 @@ Real BaseHeightMapRenderObjClass::getHeightMapHeight(Real x, Real y, Coord3D* no
   if ( !logicHeightMap )
   {
 		if (normal)
-		{	
+		{
 			// return a default normal pointing up
 			normal->x = 0.0f;
 			normal->y = 0.0f;
@@ -889,7 +871,7 @@ Real BaseHeightMapRenderObjClass::getHeightMapHeight(Real x, Real y, Coord3D* no
 		return 0;
   }
 
-  
+
 	float height;
 
 	//	3-----2
@@ -898,7 +880,7 @@ Real BaseHeightMapRenderObjClass::getHeightMapHeight(Real x, Real y, Coord3D* no
 	//	|/    |
 	//  0-----1
 	//Find surrounding grid points
-	
+
 	const Real MAP_XY_FACTOR_INV = 1.0f / MAP_XY_FACTOR;
 
 	float xdiv = x * MAP_XY_FACTOR_INV;
@@ -918,10 +900,10 @@ Real BaseHeightMapRenderObjClass::getHeightMapHeight(Real x, Real y, Coord3D* no
 	// Check for extent-3, not extent-1: we go into the next row/column of data for smoothed triangle points, so extent-1
 	// goes off the end...
 	if (ix > (xExtent-3) || iy > (logicHeightMap->getYExtent()-3) || iy < 1 || ix < 1)
-	{	
+	{
 		// sample point is not on the heightmap
 		if (normal)
-		{	
+		{
 			// return a default normal pointing up
 			normal->x = 0.0f;
 			normal->y = 0.0f;
@@ -935,12 +917,12 @@ Real BaseHeightMapRenderObjClass::getHeightMapHeight(Real x, Real y, Coord3D* no
 	float p0 = data[idx];
 	float p2 = data[idx + xExtent + 1];
 	if (fy > fx) // test if we are in the upper triangle
-	{	
+	{
 		float p3 = data[idx + xExtent];
 		height = (p3 + (1.0f-fy)*(p0-p3) + fx*(p2-p3)) * MAP_HEIGHT_SCALE;
 	}
 	else
-	{	
+	{
 		// we are in the lower triangle
 		float p1 = data[idx + 1];
 		height = (p1 + fy*(p2-p1) + (1.0f-fx)*(p0-p1)) * MAP_HEIGHT_SCALE;
@@ -1097,7 +1079,7 @@ Bool BaseHeightMapRenderObjClass::isClearLineOfSight(const Coord3D& pos, const C
 	Int yExtent = logicHeightMap->getYExtent();
 	for (Int curpixel = 0; curpixel < numpixels; curpixel++)
 	{
-		if (x < 0 || 
+		if (x < 0 ||
 				y < 0 ||
 				x >= xExtent-1 ||
 				y >= yExtent-1)
@@ -1142,7 +1124,7 @@ Bool BaseHeightMapRenderObjClass::isClearLineOfSight(const Coord3D& pos, const C
 		x += xinc2;												// Change the x as appropriate
 		y += yinc2;												// Change the y as appropriate
 	}
-	
+
 	return result;
 
 #else
@@ -1288,7 +1270,7 @@ Bool BaseHeightMapRenderObjClass::isCliffCell(Real x, Real y)
 Bool BaseHeightMapRenderObjClass::showAsVisibleCliff(Int xIndex, Int yIndex) const
 {
 	if (m_map == NULL)
-	{	
+	{
 		return false;
 	}
 
@@ -1302,7 +1284,7 @@ Bool BaseHeightMapRenderObjClass::showAsVisibleCliff(Int xIndex, Int yIndex) con
 Bool BaseHeightMapRenderObjClass::evaluateAsVisibleCliff(Int xIndex, Int yIndex, Real valuesGreaterThanRad)
 {
 	// This one never changes, so don't bother recomputing it.
-	static const Real distance[4] = 
+	static const Real distance[4] =
 	{
 		0.0f,
 		1.0 * MAP_XY_FACTOR,
@@ -1312,15 +1294,15 @@ Bool BaseHeightMapRenderObjClass::evaluateAsVisibleCliff(Int xIndex, Int yIndex,
 
 	// Note: getHeight will protect us from going out of bounds by returning 0 if we give it
 	// a value outside of its bounds.
-	UnsignedByte bytes[4] = 
-	{ 
-		m_map->getHeight(xIndex + 0, yIndex + 0), 
-		m_map->getHeight(xIndex + 1, yIndex + 0), 
-		m_map->getHeight(xIndex + 1, yIndex + 1), 
+	UnsignedByte bytes[4] =
+	{
+		m_map->getHeight(xIndex + 0, yIndex + 0),
+		m_map->getHeight(xIndex + 1, yIndex + 0),
+		m_map->getHeight(xIndex + 1, yIndex + 1),
 		m_map->getHeight(xIndex + 0, yIndex + 1),
 	};
 
-	Real heights[4] = 
+	Real heights[4] =
 	{
 		INT_TO_REAL(bytes[0]) * MAP_HEIGHT_SCALE,
 		INT_TO_REAL(bytes[1]) * MAP_HEIGHT_SCALE,
@@ -1328,7 +1310,7 @@ Bool BaseHeightMapRenderObjClass::evaluateAsVisibleCliff(Int xIndex, Int yIndex,
 		INT_TO_REAL(bytes[3]) * MAP_HEIGHT_SCALE,
 	};
 
-	Bool anyImpassable = FALSE;	
+	Bool anyImpassable = FALSE;
 
 	for (Int i = 1; i < 4 && !anyImpassable; ++i) {
 		if (fabs((heights[i] - heights[0]) / distance[i]) > valuesGreaterThanRad) {
@@ -1344,7 +1326,7 @@ Bool BaseHeightMapRenderObjClass::evaluateAsVisibleCliff(Int xIndex, Int yIndex,
 //=============================================================================
 /** Sets the terrain oversize amount. */
 //=============================================================================
-void BaseHeightMapRenderObjClass::oversizeTerrain(Int tilesToOversize) 
+void BaseHeightMapRenderObjClass::oversizeTerrain(Int tilesToOversize)
 {
 	// Not needed with flat version. [3/20/2003]
 }
@@ -1365,7 +1347,7 @@ void BaseHeightMapRenderObjClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sp
 	}
 	Vector3	ObjSpaceCenter((float)x*0.5f*MAP_XY_FACTOR,(float)y*0.5f*MAP_XY_FACTOR,(float)m_minHeight+(m_maxHeight-m_minHeight)*0.5f);
 	float length = ObjSpaceCenter.Length();
-	
+
 	if (m_map) {
 		ObjSpaceCenter.X += m_map->getDrawOrgX()*MAP_XY_FACTOR;
 		ObjSpaceCenter.Y += m_map->getDrawOrgY()*MAP_XY_FACTOR;
@@ -1455,7 +1437,7 @@ RenderObjClass *	 BaseHeightMapRenderObjClass::Clone(void) const
 /** Loads the roads from the map objects. */
 //=============================================================================
 void BaseHeightMapRenderObjClass::loadRoadsAndBridges(W3DTerrainLogic *pTerrainLogic, Bool saveGame)
-{	
+{
 	if (DX8Wrapper::_Get_D3D_Device8() && (DX8Wrapper::_Get_D3D_Device8()->TestCooperativeLevel()) != D3D_OK)
 		return;	//device not ready to render anything
 
@@ -1518,9 +1500,8 @@ void BaseHeightMapRenderObjClass::recordShoreLineSortInfos(void)
 
 	//Check if we need to allocate memory
 	if (!m_shoreLineSortInfos || shoreLineSortInfosSize > m_shoreLineSortInfosSize)
-	{	
-		if (m_shoreLineSortInfos)
-			delete [] m_shoreLineSortInfos;	//old buffer was too small.
+	{
+		delete [] m_shoreLineSortInfos;	//old buffer was too small.
 
 		//Find the major map axis (having the most tiles).
 		m_shoreLineSortInfosSize = shoreLineSortInfosSize;
@@ -1538,7 +1519,7 @@ void BaseHeightMapRenderObjClass::recordShoreLineSortInfos(void)
 		for (Int i=0; i<m_numShoreLineTiles; i++)
 		{
 			Int x=(m_shoreLineTilePositions[i].m_xy & 0xffff);
-		
+
 			shoreLineTileSortInfo *sortInfo=&m_shoreLineSortInfos[x];
 
 			if (x > m_shoreLineTileSortMaxCoordinate)
@@ -1571,7 +1552,7 @@ void BaseHeightMapRenderObjClass::recordShoreLineSortInfos(void)
 		for (Int i=0; i<m_numShoreLineTiles; i++)
 		{
 			Int y=(m_shoreLineTilePositions[i].m_xy >> 16);
-		
+
 			shoreLineTileSortInfo *sortInfo=&m_shoreLineSortInfos[y];
 
 			if (y > m_shoreLineTileSortMaxCoordinate)
@@ -1674,7 +1655,7 @@ void BaseHeightMapRenderObjClass::updateShorelineTiles(Int minX, Int minY, Int m
 		m_shoreLineTilePositions = NEW shoreLineTileInfo[DEFAULT_MAX_MAP_SHORELINE_TILES];
 		m_shoreLineTilePositionsSize = DEFAULT_MAX_MAP_SHORELINE_TILES;
 	}
-	
+
 	//First remove any existing extra blend tiles within this partial region
 	Int j=0;
 	for (; j<m_numShoreLineTiles; j++)
@@ -1696,7 +1677,7 @@ void BaseHeightMapRenderObjClass::updateShorelineTiles(Int minX, Int minY, Int m
 	//by default they are inserted in x-order
 	Bool shoreLineSortInfosXMajor=FALSE;
 	if (!TheGlobalData->m_isWorldBuilder)	//we're in the game, not the builder
-	{		
+	{
 		if ((m_map->getXExtent()-1) > (m_map->getYExtent()-1))
 			shoreLineSortInfosXMajor=TRUE;
 	}
@@ -1764,7 +1745,7 @@ void BaseHeightMapRenderObjClass::initDestAlphaLUT(void)
 		{
 			//Fill texture with alpha gradient
 			for (Int x=0; x<256; x++)
-			{	
+			{
 				alpha = x;
 				if (alpha > maxOpacity)
 					alpha = maxOpacity;
@@ -1785,11 +1766,11 @@ void BaseHeightMapRenderObjClass::initDestAlphaLUT(void)
 // BaseHeightMapRenderObjClass::initHeightData
 //=============================================================================
 /** Allocate a heightmap of x by y vertices and fill with initial height values.
-Also allocates all rendering resources such as vertex buffers, index buffers, 
+Also allocates all rendering resources such as vertex buffers, index buffers,
 shaders, and materials.*/
 //=============================================================================
 Int BaseHeightMapRenderObjClass::initHeightData(Int x, Int y, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIteratork, Bool updateExtraPassTiles)
-{	
+{
 
 	REF_PTR_SET(m_map, pMap);	//update our heightmap pointer in case it changed since last call.
 
@@ -1847,7 +1828,7 @@ Int BaseHeightMapRenderObjClass::initHeightData(Int x, Int y, WorldHeightMap *pM
 	Set_Force_Visible(TRUE);	//terrain is always visible.
 	m_needFullUpdate = true;
 
-	m_scorchesInBuffer = 0; 
+	m_scorchesInBuffer = 0;
 	m_curNumScorchVertices=0;
 	m_curNumScorchIndices=0;
 	// If the textures aren't allocated (usually because of a hardware reset) need to allocate.
@@ -1984,12 +1965,12 @@ void BaseHeightMapRenderObjClass::updateScorches(void)
 			for (i=minX; i<maxX; i++) {
 				if (m_curNumScorchVertices >= MAX_SCORCH_VERTEX) return;
 				curVb->diffuse = diffuse;
-				Real theZ; 
+				Real theZ;
 				theZ = amtToFloat+((float)getClipHeight(i+m_map->getBorderSizeInline(),j+m_map->getBorderSizeInline())*MAP_HEIGHT_SCALE);
 				// The scorchmarks are spaced out by 1.5 in the texture.
 				Real uOffset = (type%SCORCH_PER_ROW) * 1.5f;
 				Real vOffset = (type/SCORCH_PER_ROW) * 1.5f;
-				Real X = i*MAP_XY_FACTOR; 
+				Real X = i*MAP_XY_FACTOR;
 				Real Y = j*MAP_XY_FACTOR;
 				curVb->u1 = (uOffset + 0.5f + (X - loc.X)/(2*radius)) / (SCORCH_PER_ROW+1);
 				curVb->v1 = (vOffset + 0.5f + (Y - loc.Y)/(2*radius)) / (SCORCH_PER_ROW+1);
@@ -2019,8 +2000,8 @@ void BaseHeightMapRenderObjClass::updateScorches(void)
  					*curIb++ = startVertex + j*yOffset + i+1;
  					*curIb++ = startVertex + j*yOffset + i+1+yOffset;
 					*curIb++ = startVertex + j*yOffset + i+yOffset;
-				}	
-				else 
+				}
+				else
 				{
 					*curIb++ = startVertex + j*yOffset + i;
 					*curIb++ = startVertex + j*yOffset + i+1+yOffset;
@@ -2047,8 +2028,8 @@ void BaseHeightMapRenderObjClass::clearAllScorches(void)
 {
 #ifdef DO_SCORCH
 	m_numScorches=0;
-	m_scorchesInBuffer=0;	
-#endif	
+	m_scorchesInBuffer=0;
+#endif
 }
 
 //=============================================================================
@@ -2069,9 +2050,9 @@ void BaseHeightMapRenderObjClass::addScorch(Vector3 location, Real radius, Scorc
 
 	Int i;
 	Real limit = radius/4;
-	for (i=0; i<m_numScorches; i++) {		
-		if ( abs(location.X-m_scorches[i].location.X) < limit &&  
-				 abs(location.Y-m_scorches[i].location.Y) < limit && 
+	for (i=0; i<m_numScorches; i++) {
+		if ( abs(location.X-m_scorches[i].location.X) < limit &&
+				 abs(location.Y-m_scorches[i].location.Y) < limit &&
 				 abs(radius - m_scorches[i].radius) < limit &&
 				 m_scorches[i].scorchType == type) {
 			return; // basically a duplicate.
@@ -2083,7 +2064,7 @@ void BaseHeightMapRenderObjClass::addScorch(Vector3 location, Real radius, Scorc
 	m_scorches[m_numScorches].scorchType = type;
 	m_numScorches++;
 	m_scorchesInBuffer = 0; // force buffer regenerations.
-#endif	
+#endif
 }
 
 
@@ -2093,7 +2074,7 @@ void BaseHeightMapRenderObjClass::addScorch(Vector3 location, Real radius, Scorc
 /** Gets the static diffuse color value for a terrain vertex.*/
 //=============================================================================
 Int BaseHeightMapRenderObjClass::getStaticDiffuse(Int x, Int y)
-{	
+{
 
 	if (x<0) x = 0;
 	if (y<0) y = 0;
@@ -2134,7 +2115,7 @@ Int BaseHeightMapRenderObjClass::getStaticDiffuse(Int x, Int y)
 	//top-left sample
 	l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getHeight(up1, y) - m_map->getHeight(un0, y)));
 	n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getHeight(x, vp1) - m_map->getHeight(x, vn0)));
-	
+
 	Vector3::Normalized_Cross_Product(l2r,n2f, &normalAtTexel);
 
 	VERTEX_FORMAT vertex;
@@ -2167,7 +2148,7 @@ Int BaseHeightMapRenderObjClass::getStaticDiffuse(Int x, Int y)
 /** Updates the diffuse color values in the vertices as affected by the dynamic lights.*/
 //=============================================================================
 void BaseHeightMapRenderObjClass::On_Frame_Update(void)
-{	
+{
 
 }
 
@@ -2207,7 +2188,7 @@ void BaseHeightMapRenderObjClass::addTree(DrawableID id, Coord3D location, Real
 								Real randomScaleAmount,  const W3DTreeDrawModuleData *data)
 {
 	if (m_treeBuffer) {
-		m_treeBuffer->addTree(id, location, scale, angle, randomScaleAmount, data); 
+		m_treeBuffer->addTree(id, location, scale, angle, randomScaleAmount, data);
 	}
 };
 
@@ -2219,7 +2200,7 @@ void BaseHeightMapRenderObjClass::addTree(DrawableID id, Coord3D location, Real
 void BaseHeightMapRenderObjClass::removeTree(DrawableID id)
 {
 	if (m_treeBuffer) {
-		m_treeBuffer->removeTree(id); 
+		m_treeBuffer->removeTree(id);
 	}
 };
 
@@ -2231,7 +2212,7 @@ void BaseHeightMapRenderObjClass::removeTree(DrawableID id)
 void BaseHeightMapRenderObjClass::removeAllTrees()
 {
 	if (m_treeBuffer) {
-		m_treeBuffer->clearAllTrees(); 
+		m_treeBuffer->clearAllTrees();
 	}
 };
 
@@ -2253,7 +2234,7 @@ Bool BaseHeightMapRenderObjClass::updateTreePosition(DrawableID id, Coord3D loca
 //=============================================================================
 /** Adds a prop to the prop buffer.*/
 //=============================================================================
-void BaseHeightMapRenderObjClass::addProp(Int id, Coord3D location, Real angle, Real scale, 
+void BaseHeightMapRenderObjClass::addProp(Int id, Coord3D location, Real angle, Real scale,
 																					const AsciiString &modelName)
 {
 	if (m_propBuffer) {
@@ -2265,24 +2246,24 @@ void BaseHeightMapRenderObjClass::addProp(Int id, Coord3D location, Real angle,
 //=============================================================================
 // BaseHeightMapRenderObjClass::removeProp
 //=============================================================================
-/** Adds a prop to the prop buffer.*/
+/** Removes a prop from the prop buffer.*/
 //=============================================================================
 void BaseHeightMapRenderObjClass::removeProp(Int id)
 {
 	if (m_propBuffer) {
-		m_propBuffer->removeProp(id); 
+		m_propBuffer->removeProp(id);
 	}
 };
 
 //=============================================================================
 // BaseHeightMapRenderObjClass::removeAllProps
 //=============================================================================
-/** Adds a prop to the prop buffer.*/
+/** Removes all props from the prop buffer.*/
 //=============================================================================
 void BaseHeightMapRenderObjClass::removeAllProps()
 {
 	if (m_propBuffer) {
-		m_propBuffer->clearAllProps(); 
+		m_propBuffer->clearAllProps();
 	}
 };
 
@@ -2303,11 +2284,11 @@ void BaseHeightMapRenderObjClass::notifyShroudChanged(void)
 //=============================================================================
 /** Adds a terrainBib to the bib buffer.*/
 //=============================================================================
-void BaseHeightMapRenderObjClass::addTerrainBib(Vector3 corners[4], 
+void BaseHeightMapRenderObjClass::addTerrainBib(Vector3 corners[4],
 																						ObjectID id, Bool highlight)
 {
 	if (m_bibBuffer)
-		m_bibBuffer->addBib(corners, id, highlight); 
+		m_bibBuffer->addBib(corners, id, highlight);
 };
 
 //=============================================================================
@@ -2315,11 +2296,11 @@ void BaseHeightMapRenderObjClass::addTerrainBib(Vector3 corners[4],
 //=============================================================================
 /** Adds a terrainBib to the bib buffer.*/
 //=============================================================================
-void BaseHeightMapRenderObjClass::addTerrainBibDrawable(Vector3 corners[4], 
+void BaseHeightMapRenderObjClass::addTerrainBibDrawable(Vector3 corners[4],
 																						DrawableID id, Bool highlight)
 {
 	if (m_bibBuffer)
-		m_bibBuffer->addBibDrawable(corners, id, highlight); 
+		m_bibBuffer->addBibDrawable(corners, id, highlight);
 };
 
 //=============================================================================
@@ -2330,7 +2311,7 @@ void BaseHeightMapRenderObjClass::addTerrainBibDrawable(Vector3 corners[4],
 void BaseHeightMapRenderObjClass::removeTerrainBibHighlighting()
 {
 	if (m_bibBuffer)
-		m_bibBuffer->removeHighlighting(  ); 
+		m_bibBuffer->removeHighlighting(  );
 };
 
 //=============================================================================
@@ -2341,7 +2322,7 @@ void BaseHeightMapRenderObjClass::removeTerrainBibHighlighting()
 void BaseHeightMapRenderObjClass::removeAllTerrainBibs()
 {
 	if (m_bibBuffer)
-		m_bibBuffer->clearAllBibs(  ); 
+		m_bibBuffer->clearAllBibs(  );
 };
 
 //=============================================================================
@@ -2352,7 +2333,7 @@ void BaseHeightMapRenderObjClass::removeAllTerrainBibs()
 void BaseHeightMapRenderObjClass::removeTerrainBib(ObjectID id)
 {
 	if (m_bibBuffer)
-		m_bibBuffer->removeBib( id ); 
+		m_bibBuffer->removeBib( id );
 };
 
 //=============================================================================
@@ -2363,7 +2344,7 @@ void BaseHeightMapRenderObjClass::removeTerrainBib(ObjectID id)
 void BaseHeightMapRenderObjClass::removeTerrainBibDrawable(DrawableID id)
 {
 	if (m_bibBuffer)
-		m_bibBuffer->removeBibDrawable( id ); 
+		m_bibBuffer->removeBibDrawable( id );
 };
 
 //=============================================================================
@@ -2391,14 +2372,14 @@ void BaseHeightMapRenderObjClass::staticLightingChanged( void )
 /** When the time of day changes, the lighting changes and we need to update. */
 //=============================================================================
 void BaseHeightMapRenderObjClass::setTimeOfDay( TimeOfDay tod )
-{		 
+{
 	staticLightingChanged();
 }
 
 //=============================================================================
 // BaseHeightMapRenderObjClass::Notify_Added
 //=============================================================================
-/** W3D render object method, we use it to add ourselves to tthe update 
+/** W3D render object method, we use it to add ourselves to tthe update
 list, so On_Frame_Update gets called. */
 //=============================================================================
 void BaseHeightMapRenderObjClass::Notify_Added(SceneClass * scene)
@@ -2410,9 +2391,9 @@ void BaseHeightMapRenderObjClass::Notify_Added(SceneClass * scene)
 //=============================================================================
 // BaseHeightMapRenderObjClass::updateCenter
 //=============================================================================
-/** Updates the positioning of the drawn portion of the height map in the 
+/** Updates the positioning of the drawn portion of the height map in the
 heightmap.  As the view slides around, this determines what is the actually
-rendered portion of the terrain.  Only a 96x96 section is rendered at any time, 
+rendered portion of the terrain.  Only a 96x96 section is rendered at any time,
 even though maps can be up to 1024x1024.  This function determines which subset
 is rendered. */
 //=============================================================================
@@ -2501,7 +2482,7 @@ void BaseHeightMapRenderObjClass::renderShoreLines(CameraClass *pCamera)
 	//Enabled writes to destination alpha only
 	DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_ALPHA);
 	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
-	
+
 
 	while (j != m_numShoreLineTiles)
 	{
@@ -2583,7 +2564,7 @@ void BaseHeightMapRenderObjClass::renderShoreLines(CameraClass *pCamera)
 					vb->u2=0;
 					vb->v2=0;
 					vb++;
-					
+
 					if (m_map->getQuickFlipState(x,y))
 					{
 						ib[0]=1+vertexCount;
@@ -2607,7 +2588,7 @@ void BaseHeightMapRenderObjClass::renderShoreLines(CameraClass *pCamera)
 					indexCount +=6;
 				}
 			}
-		}//lock and fill ib/vb
+		}
 
 		if (indexCount > 0 && vertexCount > 0)
 		{
@@ -2619,7 +2600,7 @@ void BaseHeightMapRenderObjClass::renderShoreLines(CameraClass *pCamera)
 
 		vertexCount=0;
 		indexCount=0;
-	}//for all shore tiles
+	}
 
 	//Disable writes to destination alpha
 	DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
@@ -2669,7 +2650,7 @@ void BaseHeightMapRenderObjClass::renderShoreLinesSorted(CameraClass *pCamera)
 			drawStartY=m_shoreLineTileSortMinCoordinate;
 		if ((m_shoreLineTileSortMaxCoordinate+1) < drawEdgeY)
 			drawEdgeY=(m_shoreLineTileSortMaxCoordinate+1);
-	
+
 		if ((drawEdgeY-drawStartY) <= 0)
 			return;	//nothing to draw
 	}
@@ -2706,7 +2687,7 @@ void BaseHeightMapRenderObjClass::renderShoreLinesSorted(CameraClass *pCamera)
 
 			//Loop over visible terrain and extract all the tiles that need shoreline blend
 			if (m_shoreLineSortInfosXMajor)	//map is wider than taller.
-			{	
+			{
 				Int x=drawStartX;
 				for (; x<drawEdgeX; x++)
 				{	//figure out how many tiles are available in this column
@@ -2796,7 +2777,7 @@ void BaseHeightMapRenderObjClass::renderShoreLinesSorted(CameraClass *pCamera)
 						vb->u2=0;
 						vb->v2=0;
 						vb++;
-					
+
 						if (m_map->getQuickFlipState(x,tileY))
 						{
 							ib[0]=1+vertexCount;
@@ -2819,9 +2800,9 @@ void BaseHeightMapRenderObjClass::renderShoreLinesSorted(CameraClass *pCamera)
 						vertexCount +=4;
 						indexCount +=6;
 						shoreInfo++;	//advance to next tile.
-					}//looping over tiles in column
+					}
 					lastRenderedTile=0;
-				}//looping over all visible columns.
+				}
 flushVertexBuffer0:
 				drawStartX = x;	//record how far we've moved so far
 				isDone = x >= drawEdgeX;
@@ -2917,7 +2898,7 @@ void BaseHeightMapRenderObjClass::renderShoreLinesSorted(CameraClass *pCamera)
 						vb->u2=0;
 						vb->v2=0;
 						vb++;
-					
+
 						if (m_map->getQuickFlipState(tileX,y))
 						{
 							ib[0]=1+vertexCount;
@@ -2940,14 +2921,14 @@ void BaseHeightMapRenderObjClass::renderShoreLinesSorted(CameraClass *pCamera)
 						vertexCount +=4;
 						indexCount +=6;
 						shoreInfo++;	//advance to next tile.
-					}//looping over tiles in row
+					}
 					lastRenderedTile=0;
-				}//looping over all visible rows.
+				}
 flushVertexBuffer1:
 				drawStartY = y;	//record how far we've moved so far
 				isDone = y >= drawEdgeY;
 			}
-		}//lock and fill ib/vb
+		}
 
 		if (indexCount > 0 && vertexCount > 0)
 		{
@@ -2959,7 +2940,7 @@ void BaseHeightMapRenderObjClass::renderShoreLinesSorted(CameraClass *pCamera)
 
 		vertexCount=0;
 		indexCount=0;
-	}//for all shore tiles
+	}
 
 	//Disable writes to destination alpha
 	DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
@@ -2996,8 +2977,8 @@ void BaseHeightMapRenderObjClass::renderTrees(CameraClass * camera)
 // ------------------------------------------------------------------------------------------------
 void BaseHeightMapRenderObjClass::crc( Xfer *xfer )
 {
-	// empty. jba [8/11/2003]	
-}  // end CRC
+	// empty. jba [8/11/2003]
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer
@@ -3016,13 +2997,18 @@ void BaseHeightMapRenderObjClass::xfer( Xfer *xfer )
 	xfer->xferSnapshot( m_propBuffer );
 
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void BaseHeightMapRenderObjClass::loadPostProcess( void )
 {
-	// empty. jba [8/11/2003]	
-}  // end loadPostProcess
+	// empty. jba [8/11/2003]
+}
 
+//=============================================================================
+Bool BaseHeightMapRenderObjClass::useCloud()
+{
+	return TheGlobalData->m_useCloudMap && TheGlobalData->m_timeOfDay != TIME_OF_DAY_NIGHT;
+}
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/CameraShakeSystem.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/CameraShakeSystem.cpp
new file mode 100644
index 00000000000..71d7124a479
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/CameraShakeSystem.cpp
@@ -0,0 +1,303 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WWPhys                                                       *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwphys/camerashakesystem.cpp                 $*
+ *                                                                                             *
+ *              Original Author:: Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 6/12/01 10:25a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#include <stdlib.h>
+#include <assetmgr.h>
+#include <texture.h>
+#include <tri.h>
+#include <colmath.h>
+#include <coltest.h>
+#include <rinfo.h>
+#include <camera.h>
+#include <d3dx8core.h>
+#include "Common/GlobalData.h"
+#include "Common/PerfTimer.h"
+
+#include "GameClient/TerrainVisual.h"
+#include "GameClient/View.h"
+#include "GameClient/Water.h"
+
+#include "GameLogic/AIPathfind.h"
+#include "GameLogic/TerrainLogic.h"
+#include "W3DDevice/GameClient/TerrainTex.h"
+#include "W3DDevice/GameClient/W3DDynamicLight.h"
+#include "W3DDevice/GameClient/W3DScene.h"
+#include "W3DDevice/GameClient/W3DTerrainTracks.h"
+#include "W3DDevice/GameClient/W3DBibBuffer.h"
+#include "W3DDevice/GameClient/W3DTreeBuffer.h"
+#include "W3DDevice/GameClient/W3DRoadBuffer.h"
+#include "W3DDevice/GameClient/W3DBridgeBuffer.h"
+#include "W3DDevice/GameClient/W3DWaypointBuffer.h"
+#include "W3DDevice/GameClient/W3DCustomEdging.h"
+#include "W3DDevice/GameClient/WorldHeightMap.h"
+#include "W3DDevice/GameClient/W3DShaderManager.h"
+#include "W3DDevice/GameClient/W3DShadow.h"
+#include "W3DDevice/GameClient/W3DWater.h"
+#include "W3DDevice/GameClient/W3DShroud.h"
+#include "WW3D2/dx8wrapper.h"
+#include "WW3D2/light.h"
+#include "WW3D2/scene.h"
+#include "W3DDevice/GameClient/W3DPoly.h"
+#include "W3DDevice/GameClient/W3DCustomScene.h"
+
+#include "W3DDevice/GameClient/CameraShakeSystem.h"
+#include "WW3D2/camera.h"
+
+//#include "W3DDevice/GameClient/camera.h"
+//#include "W3DDevice/GameClient/wwmemlog.h"
+
+/*
+** (gth) According to my "research" the artists say that there are several factors that
+** go into a good camera shake.
+** - The motion should be sinusoidal.
+** - Camera rotation is more effective than camera motion (good, I won't use any translation)
+** - The camera should pitch up and down a lot more than it yaws left and right.
+*/
+
+DEFINE_AUTO_POOL(CameraShakeSystemClass::CameraShakerClass,256);
+
+const float MIN_OMEGA			= DEG_TO_RADF(12.5f*360.0f);
+const float MAX_OMEGA			= DEG_TO_RADF(15.0f*360.0f);
+const float END_OMEGA			= DEG_TO_RADF(360.0f);
+const float MIN_PHI				= DEG_TO_RADF(0.0f);
+const float MAX_PHI				= DEG_TO_RADF(360.0f);
+const Vector3 AXIS_ROTATION	= Vector3(DEG_TO_RADF(7.5f),DEG_TO_RADF(15.0f),DEG_TO_RADF(5.0f));
+
+
+/************************************************************************************************
+**
+** CameraShakeSystemClass::CameraShakerClass Implementation
+**
+************************************************************************************************/
+CameraShakeSystemClass::CameraShakerClass::CameraShakerClass
+(
+	const Vector3 & position,
+	float radius,
+	float duration,
+	float intensity
+) :
+	Position(position),
+	Radius(radius),
+	Duration(duration),
+	Intensity(intensity),
+	ElapsedTime(0.0f)
+{
+	/*
+	** Initialize random sinusoid values
+	*/
+	Omega.X = WWMath::Random_Float(MIN_OMEGA,MAX_OMEGA);
+	Omega.Y = WWMath::Random_Float(MIN_OMEGA,MAX_OMEGA);
+	Omega.Z = WWMath::Random_Float(MIN_OMEGA,MAX_OMEGA);
+	Phi.X = WWMath::Random_Float(MIN_PHI,MAX_PHI);
+	Phi.Y = WWMath::Random_Float(MIN_PHI,MAX_PHI);
+	Phi.Z = WWMath::Random_Float(MIN_PHI,MAX_PHI);
+}
+
+CameraShakeSystemClass::CameraShakerClass::~CameraShakerClass(void)
+{
+}
+
+
+void CameraShakeSystemClass::CameraShakerClass::Compute_Rotations(const Vector3 & camera_position, Vector3 * set_angles)
+{
+	WWASSERT(set_angles != NULL);
+
+	/*
+	** We want several different sinusiods, each with a different phase shift and
+	** frequency.  The frequency is a function of time as well, stretching the
+	** sine wave out.  These waves are modulated based on the distance from the
+	** center of the "shake", the intensity of the shake, and based on the axis
+	** being affected.  The vertical axis should have about 3x the amplitude of
+	** the horizontal axis.
+	*/
+
+	float len2 = (camera_position - Position).Length2();
+
+
+	if (len2 > Radius*Radius) {
+		return;
+	}
+
+
+	/*
+	** f(t) = intensity(t,pos) * sin( omega(t) * t + phi );
+	** intensity(t,pos) = intensity * (radius/distance) * timeremaing/totaltime
+	** omega(t) = start_omega + (end_omega - start_omega) * t
+	** phi = random(0..start_omega)
+	*/
+	float intensity = Intensity * (1.0f - WWMath::Sqrt(len2) / Radius) * (1.0f - ElapsedTime / Duration);
+	for (int i=0; i<3; i++) {
+		float omega = Omega[i] + (END_OMEGA - Omega[i]) * ElapsedTime;
+		(*set_angles)[i] += AXIS_ROTATION[i] * intensity * WWMath::Sin(omega * ElapsedTime + Phi[i]);
+
+		//WST 11/14/2002. Add in additional random fudge.  There seems to be a too mathematical pattern of shake with the above
+		Vector3 secondary_angles;
+		float minor_intensity = intensity * 0.5f;
+		secondary_angles.X = WWMath::Random_Float(-minor_intensity,minor_intensity);
+		secondary_angles.Y = WWMath::Random_Float(-minor_intensity,minor_intensity);
+		secondary_angles.Z = WWMath::Random_Float(-minor_intensity,minor_intensity);
+		(*set_angles) += secondary_angles;
+	}
+}
+
+
+/************************************************************************************************
+**
+** CameraShakeSystemClass Implementation
+**
+************************************************************************************************/
+CameraShakeSystemClass::CameraShakeSystemClass(void)
+{
+}
+
+CameraShakeSystemClass::~CameraShakeSystemClass(void)
+{
+	/*
+	** delete all of the objects out of the list
+	*/
+	while (!CameraShakerList.Is_Empty()) {
+		CameraShakerClass * obj = CameraShakerList.Remove_Head();
+		CameraShakerList.Remove(obj);
+		delete obj;
+	}
+}
+
+void CameraShakeSystemClass::Add_Camera_Shake
+(
+	const Vector3 & position,
+	float radius,
+	float duration,
+	float power
+)
+{
+	//WWMEMLOG(MEM_PHYSICSDATA);
+	/*
+	** Allocate a new camera shaker object.  Note that these are mem-pooled so the allocation
+	** is very cheap.
+	*/
+
+	//Power is in degrees of amplitude.
+	power = power * PI/180.0f;
+
+	CameraShakerClass * shaker = new CameraShakerClass(position,radius,duration,power);
+	CameraShakerList.Add(shaker);
+}
+
+bool CameraShakeSystemClass::IsCameraShaking(void)
+{
+	/*
+	** Loop through to find if there is any active camera shakers
+	*/
+	MultiListIterator<CameraShakerClass> iterator(&CameraShakerList);
+	for (iterator.First(); !iterator.Is_Done(); iterator.Next()) {
+		CameraShakerClass * obj = iterator.Peek_Obj();
+		if (obj){
+			return (true);
+		}
+	}
+	return(false);
+}
+
+
+void CameraShakeSystemClass::Timestep(float dt)
+{
+	/*
+	** Allow each camera shaker to timestep.  Any that expire are added to a temporary
+	** list for deletion.
+	*/
+	MultiListClass<CameraShakerClass> deletelist;
+	MultiListIterator<CameraShakerClass> iterator(&CameraShakerList);
+	for (iterator.First(); !iterator.Is_Done(); iterator.Next()) {
+		CameraShakerClass * obj = iterator.Peek_Obj();
+		obj->Timestep(dt);
+		if (obj->Is_Expired()) {
+			deletelist.Add(obj);
+		}
+	}
+
+	/*
+	** Remove and delete all the ones that expired
+	*/
+	while (!deletelist.Is_Empty()) {
+		CameraShakerClass * obj = deletelist.Remove_Head();
+		CameraShakerList.Remove(obj);
+		delete obj;
+	}
+}
+
+void CameraShakeSystemClass::Update_Camera_Shaker(Vector3 camera_position, Vector3 *shaker_angle)
+{
+	MultiListIterator<CameraShakerClass> iterator(&CameraShakerList);
+
+	Vector3 angles(0,0,0);
+	Matrix3D camera_transform;
+
+	//camera_transform = camera.Get_Transform();
+	//camera_transform.Get_Translation(&camera_position);
+
+	/*
+	** Accumulate the effects of any active camera shakers
+	*/
+
+	for (iterator.First(); !iterator.Is_Done(); iterator.Next()) {
+		iterator.Peek_Obj()->Compute_Rotations(camera_position,&angles);
+	}
+
+	/*
+	** Clamp the result
+	*/
+	for (int i=0; i<3; i++) {
+		WWMath::Clamp(angles[i],-AXIS_ROTATION[i],AXIS_ROTATION[i]);
+	}
+
+	*shaker_angle = angles;
+
+	/*
+	** Apply to the camera
+	*/
+	/*
+	camera_transform.Rotate_X(angles.X);
+	camera_transform.Rotate_Y(angles.Y);
+	camera_transform.Rotate_Z(angles.Z);
+	camera.Set_Transform(camera_transform);
+	*/
+}
+
+// The Instance of the system
+CameraShakeSystemClass CameraShakerSystem; //WST 11/12/2002 This is the new Camera Shaker system upgrade
+
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
new file mode 100644
index 00000000000..5fa25f6e275
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
@@ -0,0 +1,468 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DLaserDraw.cpp /////////////////////////////////////////////////////////////////////////
+// Author: Colin Day, May 2001
+// Desc:   W3DLaserDraw
+// Updated: Kris Morness July 2002 -- made it data driven and added new features to make it flexible.
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include <stdlib.h>
+
+#include "Common/Thing.h"
+#include "Common/ThingTemplate.h"
+#include "Common/Xfer.h"
+#include "GameClient/Color.h"
+#include "GameClient/Drawable.h"
+#include "GameClient/GameClient.h"
+#include "GameClient/RayEffect.h"
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/Object.h"
+#include "GameLogic/TerrainLogic.h"
+#include "GameLogic/Module/LaserUpdate.h"
+#include "W3DDevice/GameClient/Module/W3DLaserDraw.h"
+#include "W3DDevice/GameClient/W3DDisplay.h"
+#include "W3DDevice/GameClient/W3DScene.h"
+#include "WW3D2/rinfo.h"
+#include "WW3D2/camera.h"
+#include "WW3D2/segline.h"
+#include "WWMath/vector3.h"
+#include "WW3D2/assetmgr.h"
+
+
+
+// PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+W3DLaserDrawModuleData::W3DLaserDrawModuleData()
+{
+	m_innerBeamWidth = 0.0f;         //The total width of beam
+	m_outerBeamWidth = 1.0f;         //The total width of beam
+  m_numBeams = 1;                 //Number of overlapping cylinders that make the beam. 1 beam will just use inner data.
+  m_maxIntensityFrames = 0;				//Laser stays at max intensity for specified time in ms.
+  m_fadeFrames = 0;               //Laser will fade and delete.
+	m_scrollRate = 0.0f;
+	m_tile = false;
+	m_segments = 1;
+	m_arcHeight = 0.0f;
+	m_segmentOverlapRatio = 0.0f;
+	m_tilingScalar = 1.0f;
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+W3DLaserDrawModuleData::~W3DLaserDrawModuleData()
+{
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DLaserDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
+{
+  ModuleData::buildFieldParse(p);
+
+	static const FieldParse dataFieldParse[] =
+	{
+		{ "NumBeams",							INI::parseUnsignedInt,					NULL, offsetof( W3DLaserDrawModuleData, m_numBeams ) },
+		{ "InnerBeamWidth",				INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_innerBeamWidth ) },
+		{ "OuterBeamWidth",				INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_outerBeamWidth ) },
+		{ "InnerColor",						INI::parseColorInt,							NULL, offsetof( W3DLaserDrawModuleData, m_innerColor ) },
+		{ "OuterColor",						INI::parseColorInt,							NULL, offsetof( W3DLaserDrawModuleData, m_outerColor ) },
+		{ "MaxIntensityLifetime",	INI::parseDurationUnsignedInt,	NULL, offsetof( W3DLaserDrawModuleData, m_maxIntensityFrames ) },
+		{ "FadeLifetime",					INI::parseDurationUnsignedInt,	NULL, offsetof( W3DLaserDrawModuleData, m_fadeFrames ) },
+		{ "Texture",							INI::parseAsciiString,					NULL, offsetof( W3DLaserDrawModuleData, m_textureName ) },
+		{ "ScrollRate",						INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_scrollRate ) },
+		{ "Tile",									INI::parseBool,									NULL, offsetof( W3DLaserDrawModuleData, m_tile ) },
+		{ "Segments",							INI::parseUnsignedInt,					NULL, offsetof( W3DLaserDrawModuleData, m_segments ) },
+    { "ArcHeight",						INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_arcHeight ) },
+		{ "SegmentOverlapRatio",	INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_segmentOverlapRatio ) },
+		{ "TilingScalar",					INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_tilingScalar ) },
+		{ 0, 0, 0, 0 }
+	};
+  p.add(dataFieldParse);
+}
+
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+W3DLaserDraw::W3DLaserDraw( Thing *thing, const ModuleData* moduleData ) :
+	DrawModule( thing, moduleData ),
+	m_line3D(NULL),
+	m_texture(NULL),
+	m_textureAspectRatio(1.0f),
+	m_selfDirty(TRUE)
+{
+	Vector3 dummyPos1( 0.0f, 0.0f, 0.0f );
+	Vector3 dummyPos2( 1.0f, 1.0f, 1.0f );
+	Int i;
+
+	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
+
+	m_texture = WW3DAssetManager::Get_Instance()->Get_Texture( data->m_textureName.str() );
+	if (m_texture)
+	{
+		if (!m_texture->Is_Initialized())
+			m_texture->Init();	//make sure texture is actually loaded before accessing surface.
+
+		SurfaceClass::SurfaceDescription surfaceDesc;
+		m_texture->Get_Level_Description(surfaceDesc);
+		m_textureAspectRatio = (Real)surfaceDesc.Width/(Real)surfaceDesc.Height;
+	}
+
+	//Get the color components for calculation purposes.
+	Real innerRed, innerGreen, innerBlue, innerAlpha, outerRed, outerGreen, outerBlue, outerAlpha;
+	GameGetColorComponentsReal( data->m_innerColor, &innerRed, &innerGreen, &innerBlue, &innerAlpha );
+	GameGetColorComponentsReal( data->m_outerColor, &outerRed, &outerGreen, &outerBlue, &outerAlpha );
+
+	//Make sure our beams range between 1 and the maximum cap.
+#ifdef I_WANT_TO_BE_FIRED
+// srj sez: this data is const for a reason. casting away the constness because we don't like the values
+// isn't an acceptable solution. if you need to constrain the values, do so at parsing time, when
+// it's still legal to modify these values. (In point of fact, there's not even really any reason to limit
+// the numBeams or segments anymore.)
+	data->m_numBeams =		 __min( __max( 1, data->m_numBeams ), MAX_LASER_LINES );
+	data->m_segments =		 __min( __max( 1, data->m_segments ), MAX_SEGMENTS );
+	data->m_tilingScalar = __max( 0.01f, data->m_tilingScalar );
+#endif
+
+	//Allocate an array of lines equal to the number of beams * segments
+	m_line3D = NEW SegmentedLineClass *[ data->m_numBeams * data->m_segments ];
+
+	for( UnsignedInt segment = 0; segment < data->m_segments; segment++ )
+	{
+		//We don't care about segment positioning yet until we actually set the position
+
+		// create all the lines we need at the right transparency level
+		for( i = data->m_numBeams - 1; i >= 0; i-- )
+		{
+			int index = segment * data->m_numBeams + i;
+
+			Real red, green, blue, alpha, width;
+
+			if( data->m_numBeams == 1 )
+			{
+				width = data->m_innerBeamWidth;
+				alpha = innerAlpha;
+				red = innerRed * innerAlpha;
+				green = innerGreen * innerAlpha;
+				blue = innerBlue * innerAlpha;
+			}
+			else
+			{
+				//Calculate the scale between min and max values
+				//0 means use min value, 1 means use max value
+				//0.2 means min value + 20% of the diff between min and max
+				Real scale = i / ( data->m_numBeams - 1.0f);
+
+				width		= data->m_innerBeamWidth	+ scale * (data->m_outerBeamWidth - data->m_innerBeamWidth);
+				alpha		= innerAlpha							+ scale * (outerAlpha - innerAlpha);
+				red			= innerRed								+ scale * (outerRed - innerRed) * innerAlpha;
+				green		= innerGreen							+ scale * (outerGreen - innerGreen) * innerAlpha;
+				blue		= innerBlue								+ scale * (outerBlue - innerBlue) * innerAlpha;
+			}
+
+			m_line3D[ index ] = NEW SegmentedLineClass;
+
+			SegmentedLineClass *line = m_line3D[ index ];
+			if( line )
+			{
+				line->Set_Texture( m_texture );
+				line->Set_Shader( ShaderClass::_PresetAdditiveShader );	//pick the alpha blending mode you want - see shader.h for others.
+				line->Set_Width( width );
+				line->Set_Color( Vector3( red, green, blue ) );
+				line->Set_UV_Offset_Rate( Vector2(0.0f, data->m_scrollRate) );	//amount to scroll texture on each draw
+				if( m_texture )
+				{
+					line->Set_Texture_Mapping_Mode(SegLineRendererClass::TILED_TEXTURE_MAP);	//this tiles the texture across the line
+				}
+
+				// add to scene
+				if (W3DDisplay::m_3DScene != NULL)
+					W3DDisplay::m_3DScene->Add_Render_Object( line );	//add it to our scene so it gets rendered with other objects.
+
+				// hide the render object until the first time we come to draw it and
+				// set the correct position
+				line->Set_Visible( 0 );
+			}
+
+
+		}
+
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+W3DLaserDraw::~W3DLaserDraw( void )
+{
+	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
+
+	for( UnsignedInt i = 0; i < data->m_numBeams * data->m_segments; i++ )
+	{
+
+		// remove line from scene
+		if (W3DDisplay::m_3DScene != NULL)
+			W3DDisplay::m_3DScene->Remove_Render_Object( m_line3D[ i ] );
+
+		// delete line
+		REF_PTR_RELEASE( m_line3D[ i ] );
+
+	}
+
+	delete [] m_line3D;
+	// TheSuperHackers @fix Mauller 11/03/2025 Free reference counted material
+	REF_PTR_RELEASE(m_texture);
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+Real W3DLaserDraw::getLaserTemplateWidth() const
+{
+	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
+	return data->m_outerBeamWidth * 0.5f;
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DLaserDraw::doDrawModule(const Matrix3D* transformMtx)
+{
+	//UnsignedInt currentFrame = TheGameClient->getFrame();
+	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
+
+	//Get the updatemodule that drives it...
+	Drawable *draw = getDrawable();
+	static NameKeyType key_LaserUpdate = NAMEKEY( "LaserUpdate" );
+	LaserUpdate *update = (LaserUpdate*)draw->findClientUpdateModule( key_LaserUpdate );
+	if( !update )
+	{
+		DEBUG_ASSERTCRASH( 0, ("W3DLaserDraw::doDrawModule() expects its owner drawable %s to have a ClientUpdate = LaserUpdate module.", draw->getTemplate()->getName().str() ));
+		return;
+	}
+
+	//If the update has moved the laser, it requires a reset of the laser.
+	if (update->isDirty() || m_selfDirty)
+	{
+		update->setDirty(false);
+		m_selfDirty = false;
+
+		Vector3 laserPoints[ 2 ];
+
+		for( UnsignedInt segment = 0; segment < data->m_segments; segment++ )
+		{
+			if( data->m_arcHeight > 0.0f && data->m_segments > 1 )
+			{
+				//CALCULATE A CURVED LINE BASED ON TOTAL LENGTH AND DESIRED HEIGHT INCREASE
+				//To do this we will use a portion of the cos wave ranging between -0.25PI
+				//and +0.25PI. 0PI is 1.0 and 0.25PI is 0.70 -- resulting in a somewhat
+				//gentle curve depending on the line height and length. We also have to make
+				//the line *level* for this phase of the calculations.
+
+				//Get the desired direct line
+				Coord3D lineStart, lineEnd, lineVector;
+				lineStart.set( update->getStartPos() );
+				lineEnd.set( update->getEndPos() );
+				//This is critical -- in the case we have sloped lines (at the end, we'll fix it)
+//				lineEnd.z = lineStart.z;
+
+				//Get the length of the line
+				lineVector.set( &lineEnd );
+				lineVector.sub( &lineStart );
+				Real lineLength = lineVector.length();
+
+				//Get the middle point (we'll use this to determine how far we are from
+				//that to calculate our height -- middle point is the highest).
+				Coord3D lineMiddle;
+				lineMiddle.set( &lineStart );
+				lineMiddle.add( &lineEnd );
+				lineMiddle.scale( 0.5 );
+
+				//The half length is used to scale with the distance from middle to
+				//get our cos( 0 to 0.25 PI) cos value
+				Real halfLength = lineLength * 0.5f;
+
+				//Now calculate which segment we will use.
+				Real startSegmentRatio = segment / ((Real)data->m_segments);
+				Real endSegmentRatio = (segment + 1.0f) / ((Real)data->m_segments);
+
+				//Offset the segment ever-so-slightly to minimize overlap -- only apply
+				//to segments that are not the start/end point
+				if( segment > 0 )
+				{
+					startSegmentRatio -= data->m_segmentOverlapRatio;
+				}
+				if( segment < data->m_segments - 1 )
+				{
+					endSegmentRatio += data->m_segmentOverlapRatio;
+				}
+
+				//Calculate our start segment position on the *ground*.
+				Coord3D segmentStart, segmentEnd, vector;
+				vector.set( &lineVector );
+				vector.scale( startSegmentRatio );
+				segmentStart.set( &lineStart );
+				segmentStart.add( &vector );
+
+				//Calculate our end segment position on the *ground*.
+				vector.set( &lineVector );
+				vector.scale( endSegmentRatio );
+				segmentEnd.set( &lineStart );
+				segmentEnd.add( &vector );
+
+				//--------------------------------------------------------------------------------
+				//Now at this point, we have our segment line in the level positions that we want.
+				//Calculate the raised height for the start/end segment positions using cosine.
+				//--------------------------------------------------------------------------------
+
+				//Calculate the distance from midpoint for the start positions.
+				vector.set( &lineMiddle );
+				vector.sub( &segmentStart );
+				Real dist = vector.length();
+				Real scaledRadians = dist / halfLength * PI * 0.5f;
+				Real height = cos( scaledRadians );
+				height *= data->m_arcHeight;
+				segmentStart.z += height;
+
+				//Now do the same thing for the end position.
+				vector.set( &lineMiddle );
+				vector.sub( &segmentEnd );
+				dist = vector.length();
+				scaledRadians = dist / halfLength * PI * 0.5f;
+				height = cos( scaledRadians );
+				height *= data->m_arcHeight;
+				segmentEnd.z += height;
+
+				//This makes the laser skim the ground rather than penetrate it!
+				laserPoints[ 0 ].Set( segmentStart.x, segmentStart.y,
+					MAX( segmentStart.z, 2.0f + TheTerrainLogic->getGroundHeight(segmentStart.x, segmentStart.y) ) );
+				laserPoints[ 1 ].Set( segmentEnd.x, segmentEnd.y,
+					MAX( segmentEnd.z, 2.0f + TheTerrainLogic->getGroundHeight(segmentEnd.x, segmentEnd.y) ) );
+
+			}
+			else
+			{
+				//No arc -- way simpler!
+				laserPoints[ 0 ].Set( update->getStartPos()->x, update->getStartPos()->y, update->getStartPos()->z );
+				laserPoints[ 1 ].Set( update->getEndPos()->x, update->getEndPos()->y, update->getEndPos()->z );
+			}
+
+			//Get the color components for calculation purposes.
+			Real innerRed, innerGreen, innerBlue, innerAlpha, outerRed, outerGreen, outerBlue, outerAlpha;
+			GameGetColorComponentsReal( data->m_innerColor, &innerRed, &innerGreen, &innerBlue, &innerAlpha );
+			GameGetColorComponentsReal( data->m_outerColor, &outerRed, &outerGreen, &outerBlue, &outerAlpha );
+
+			for( Int i = data->m_numBeams - 1; i >= 0; i-- )
+			{
+
+				Real alpha, width;
+				int index = segment * data->m_numBeams + i;
+
+				if( data->m_numBeams == 1 )
+				{
+					width = data->m_innerBeamWidth * update->getWidthScale();
+					alpha = innerAlpha;
+				}
+				else
+				{
+					//Calculate the scale between min and max values
+					//0 means use min value, 1 means use max value
+					//0.2 means min value + 20% of the diff between min and max
+					Real scale = i / ( data->m_numBeams - 1.0f);
+					Real ultimateScale = update->getWidthScale();
+					width		= (data->m_innerBeamWidth	+ scale * (data->m_outerBeamWidth - data->m_innerBeamWidth));
+					width *= ultimateScale;
+					alpha		= innerAlpha							+ scale * (outerAlpha - innerAlpha);
+				}
+
+
+				//Calculate the number of times to tile the line based on the height of the texture used.
+				if( m_texture && data->m_tile )
+				{
+					//Calculate the length of the line.
+					Vector3 lineVector;
+					Vector3::Subtract( laserPoints[1], laserPoints[0], &lineVector );
+					Real length = lineVector.Length();
+
+					//Adjust tile factor so texture is NOT stretched but tiled equally in both width and length.
+					Real tileFactor = length/width*m_textureAspectRatio*data->m_tilingScalar;
+
+					//Set the tile factor
+					m_line3D[ index ]->Set_Texture_Tile_Factor( tileFactor );	//number of times to tile texture across each segment
+				}
+
+				m_line3D[ index ]->Set_Width( width );
+				m_line3D[ index ]->Set_Points( 2, &laserPoints[0] );
+			}
+		}
+	}
+
+	return;
+}
+
+// ------------------------------------------------------------------------------------------------
+/** CRC */
+// ------------------------------------------------------------------------------------------------
+void W3DLaserDraw::crc( Xfer *xfer )
+{
+
+	// extend base class
+	DrawModule::crc( xfer );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Xfer method
+	* Version Info:
+	* 1: Initial version */
+// ------------------------------------------------------------------------------------------------
+void W3DLaserDraw::xfer( Xfer *xfer )
+{
+
+	// version
+	const XferVersion currentVersion = 1;
+	XferVersion version = currentVersion;
+	xfer->xferVersion( &version, currentVersion );
+
+	// extend base class
+	DrawModule::xfer( xfer );
+
+	// Kris says there is no data to save for these, go ask him.
+	// m_selfDirty is not saved, is runtime only
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Load post process */
+// ------------------------------------------------------------------------------------------------
+void W3DLaserDraw::loadPostProcess( void )
+{
+
+	// extend base class
+	DrawModule::loadPostProcess();
+
+	m_selfDirty = true;	// so we update the first time after reload
+
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
similarity index 92%
rename from GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
rename to Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
index be666be04e5..1347418903d 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
@@ -38,14 +38,9 @@
 #include "W3DDevice/GameClient/Module/W3DPropDraw.h"
 #include "W3DDevice/GameClient/BaseHeightMap.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
-W3DPropDrawModuleData::W3DPropDrawModuleData() 
+W3DPropDrawModuleData::W3DPropDrawModuleData()
 {
 }
 
@@ -55,13 +50,13 @@ W3DPropDrawModuleData::~W3DPropDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DPropDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DPropDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ModuleData::buildFieldParse(p);
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ModelName", INI::parseAsciiString, NULL, offsetof(W3DPropDrawModuleData, m_modelName) },
-		
+
 		{ 0, 0, 0, 0 }
 	};
   p.add(dataFieldParse);
@@ -77,7 +72,7 @@ W3DPropDraw::W3DPropDraw( Thing *thing, const ModuleData* moduleData ) : DrawMod
 m_propAdded(false)
 {
 
-}  // end W3DPropDraw
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -87,8 +82,8 @@ W3DPropDraw::~W3DPropDraw( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DPropDraw::reactToTransformChange( const Matrix3D *oldMtx, 
-																							 const Coord3D *oldPos, 
+void W3DPropDraw::reactToTransformChange( const Matrix3D *oldMtx,
+																							 const Coord3D *oldPos,
 																							 Real oldAngle )
 {
 	Drawable *draw = getDrawable();
@@ -106,7 +101,7 @@ void W3DPropDraw::reactToTransformChange( const Matrix3D *oldMtx,
 	Real scale = draw->getScale();
 	TheTerrainRenderObject->addProp((Int)draw->getID(), *draw->getPosition(),
 		draw->getOrientation(), scale, moduleData->m_modelName);
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -127,7 +122,7 @@ void W3DPropDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -147,7 +142,7 @@ void W3DPropDraw::xfer( Xfer *xfer )
 
 	// no data to save here, nobody will ever notice
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -158,4 +153,4 @@ void W3DPropDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
similarity index 86%
rename from GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
rename to Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
index 347b26ffc7d..81fff438779 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
@@ -24,7 +24,7 @@
 
 // FILE: W3DTreeDraw.cpp ////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, December 2001
-// Desc:   Tracer drawing
+// Desc:   Tree draw
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
@@ -38,11 +38,6 @@
 #include "W3DDevice/GameClient/Module/W3DTreeDraw.h"
 #include "W3DDevice/GameClient/BaseHeightMap.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 W3DTreeDrawModuleData::W3DTreeDrawModuleData() :
@@ -78,10 +73,10 @@ W3DTreeDrawModuleData::~W3DTreeDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DTreeDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DTreeDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ModuleData::buildFieldParse(p);
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ModelName", INI::parseAsciiString, NULL, offsetof(W3DTreeDrawModuleData, m_modelName) },
 		{ "TextureName", INI::parseAsciiString, NULL, offsetof(W3DTreeDrawModuleData, m_textureName) },
@@ -90,7 +85,7 @@ void W3DTreeDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 		{ "MoveOutwardDistanceFactor", INI::parseReal, NULL, offsetof(W3DTreeDrawModuleData, m_maxOutwardMovement) },
 		{ "DarkeningFactor", INI::parseReal, NULL, offsetof(W3DTreeDrawModuleData, m_darkening) },
 
-// Topple parameters [7/7/2003]		
+// Topple parameters [7/7/2003]
 		{ "ToppleFX",	INI::parseFXList, NULL, offsetof( W3DTreeDrawModuleData, m_toppleFX ) },
 		{ "BounceFX",	INI::parseFXList, NULL, offsetof( W3DTreeDrawModuleData, m_bounceFX ) },
 		{ "StumpName",	INI::parseAsciiString, NULL, offsetof( W3DTreeDrawModuleData, m_stumpName ) },
@@ -114,51 +109,29 @@ void W3DTreeDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-W3DTreeDraw::W3DTreeDraw( Thing *thing, const ModuleData* moduleData ) : DrawModule( thing, moduleData ),
-m_treeAdded(false)
+W3DTreeDraw::W3DTreeDraw( Thing *thing, const ModuleData* moduleData ) : DrawModule( thing, moduleData )
 {
-
-}  // end W3DTreeDraw
-
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DTreeDraw::~W3DTreeDraw( void )
 {
+	addToTreeBuffer();
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DTreeDraw::reactToTransformChange( const Matrix3D *oldMtx, 
-																							 const Coord3D *oldPos, 
-																							 Real oldAngle )
+void W3DTreeDraw::addToTreeBuffer()
 {
-	Drawable *draw = getDrawable();
-	if (m_treeAdded) {
-		return;
-	}
-	if (draw->getPosition()->x==0.0f && draw->getPosition()->y == 0.0f) {
-		return;
-	}
-	m_treeAdded = true;
 	const W3DTreeDrawModuleData *moduleData = getW3DTreeDrawModuleData();
-	if (!moduleData) {
-		return;
-	}
+	const Drawable *draw = getDrawable();
+
+	DEBUG_ASSERTCRASH(draw->isPositioned(), ("W3DTreeDraw::addToTreeBuffer - This tree was not positioned!"));
+
 	Real scale = draw->getScale();
 	Real scaleRandomness = draw->getTemplate()->getInstanceScaleFuzziness();
 	scaleRandomness = 0.0f; // We use the scale fuzziness inside WB to generate random scales, so they don't change at load time. jba. [4/22/2003]
-	TheTerrainRenderObject->addTree(draw->getID(), *draw->getPosition(),
-		scale, draw->getOrientation(), scaleRandomness, moduleData);
-	
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DTreeDraw::doDrawModule(const Matrix3D* transformMtx)
-{
-
-	return;
-
+	TheTerrainRenderObject->addTree(draw->getID(), *draw->getPosition(), scale, draw->getOrientation(), scaleRandomness, moduleData);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -170,7 +143,7 @@ void W3DTreeDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -190,7 +163,7 @@ void W3DTreeDraw::xfer( Xfer *xfer )
 
 	// no data to save here, nobody will ever notice
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -201,5 +174,5 @@ void W3DTreeDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp
similarity index 93%
rename from GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp
rename to Core/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp
index 25c61c6277f..7f4ebc785ea 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Heightmap.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,13 +43,11 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/FlatHeightMap.h"
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include <tri.h>
@@ -89,19 +87,13 @@
 #include "W3DDevice/GameClient/W3DPoly.h"
 #include "W3DDevice/GameClient/W3DCustomScene.h"
 
-#include "Common/PerfTimer.h"
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.		 
+#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 FlatHeightMapRenderObjClass *TheFlatHeightMap = NULL;
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 #define SC_DETAIL_BLEND ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
 	ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
@@ -120,7 +112,7 @@ const Int CELLS_PER_TILE = 16; // In order to be efficient in texture, needs to
 
 
 //-----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -139,7 +131,7 @@ Int FlatHeightMapRenderObjClass::freeMapResources(void)
 
 
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -172,10 +164,10 @@ m_updateState(STATE_IDLE)
 //=============================================================================
 // FlatHeightMapRenderObjClass::adjustTerrainLOD
 //=============================================================================
-/** Adjust the terrain Level Of Detail.  If adj > 0 , increases LOD 1 step, if 
+/** Adjust the terrain Level Of Detail.  If adj > 0 , increases LOD 1 step, if
 adj < 0 decreases it one step, if adj==0, then just sets up for the current LOD */
 //=============================================================================
-void FlatHeightMapRenderObjClass::adjustTerrainLOD(Int adj) 
+void FlatHeightMapRenderObjClass::adjustTerrainLOD(Int adj)
 {
 	BaseHeightMapRenderObjClass::adjustTerrainLOD(adj);
 }
@@ -245,7 +237,7 @@ void FlatHeightMapRenderObjClass::reset(void)
 //=============================================================================
 /** Sets the terrain oversize amount. */
 //=============================================================================
-void FlatHeightMapRenderObjClass::oversizeTerrain(Int tilesToOversize) 
+void FlatHeightMapRenderObjClass::oversizeTerrain(Int tilesToOversize)
 {
 	// Not needed with flat version. [3/20/2003]
 }
@@ -260,7 +252,7 @@ The coordinates in partialRange are map cell coordinates, relative to the entire
 The vertex coordinates and texture coordinates, as well as static lighting are updated.
 */
 void FlatHeightMapRenderObjClass::doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator)
-{	
+{
 	if (htMap) {
 		REF_PTR_SET(m_map, htMap);
 	}
@@ -279,11 +271,10 @@ void FlatHeightMapRenderObjClass::doPartialUpdate(const IRegion2D &partialRange,
 /** Releases tiles.*/
 //=============================================================================
 void FlatHeightMapRenderObjClass::releaseTiles(void)
-{	
-	if (m_tiles) {
-		delete [] m_tiles;
-		m_tiles = NULL;
-	}
+{
+	delete [] m_tiles;
+	m_tiles = NULL;
+
 	m_tilesWidth = 0;
 	m_tilesHeight = 0;
 	m_numTiles = 0;
@@ -294,11 +285,11 @@ void FlatHeightMapRenderObjClass::releaseTiles(void)
 // FlatHeightMapRenderObjClass::initHeightData
 //=============================================================================
 /** Allocate a heightmap of x by y vertices and fill with initial height values.
-Also allocates all rendering resources such as vertex buffers, index buffers, 
+Also allocates all rendering resources such as vertex buffers, index buffers,
 shaders, and materials.*/
 //=============================================================================
 Int FlatHeightMapRenderObjClass::initHeightData(Int x, Int y, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator, Bool updateExtraPassTiles)
-{	
+{
 
 	BaseHeightMapRenderObjClass::initHeightData(x, y, pMap, pLightsIterator);
 
@@ -353,7 +344,7 @@ Int FlatHeightMapRenderObjClass::initHeightData(Int x, Int y, WorldHeightMap *pM
 /** Updates the diffuse color values in the vertices as affected by the dynamic lights.*/
 //=============================================================================
 void FlatHeightMapRenderObjClass::On_Frame_Update(void)
-{	
+{
 #ifdef DO_UNIT_TIMINGS
 #pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
 	return;
@@ -371,7 +362,7 @@ void FlatHeightMapRenderObjClass::On_Frame_Update(void)
 					W3DTerrainBackground *tile = m_tiles+j*m_tilesWidth+i;
 					tile->updateTexture();
 				}
-			}	
+			}
 			m_updateState = STATE_IDLE;
 		}
 	}
@@ -407,9 +398,9 @@ void FlatHeightMapRenderObjClass::staticLightingChanged( void )
 //=============================================================================
 // FlatHeightMapRenderObjClass::updateCenter
 //=============================================================================
-/** Updates the positioning of the drawn portion of the height map in the 
+/** Updates the positioning of the drawn portion of the height map in the
 heightmap.  As the view slides around, this determines what is the actually
-rendered portion of the terrain.  Only a 96x96 section is rendered at any time, 
+rendered portion of the terrain.  Only a 96x96 section is rendered at any time,
 even though maps can be up to 1024x1024.  This function determines which subset
 is rendered. */
 //=============================================================================
@@ -444,7 +435,7 @@ void FlatHeightMapRenderObjClass::updateCenter(CameraClass *camera , RefRenderOb
 		}
 	}
 	if (culled!=prevCulled || t4X!=prevT4X || t2X!=prevT2X) {
-		DEBUG_LOG(("%d of %d culled, %d 4X, %d 2X.\n", culled, m_numTiles, t4X, t2X));
+		DEBUG_LOG(("%d of %d culled, %d 4X, %d 2X.", culled, m_numTiles, t4X, t2X));
 		prevCulled = culled;
 		prevT2X = t2X;
 		prevT4X = t4X;
@@ -462,10 +453,17 @@ void FlatHeightMapRenderObjClass::updateCenter(CameraClass *camera , RefRenderOb
 void FlatHeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
 {
 	//USE_PERF_TIMER(Terrain_Render)
-	
+
 	Int devicePasses;
 	W3DShaderManager::ShaderTypes st;
-	Bool doCloud = TheGlobalData->m_useCloudMap;
+	const Bool doCloud = useCloud();
+
+	if (doCloud)
+	{
+		// TheSuperHackers @tweak Updates the cloud movement before applying it to the world.
+		// Is now decoupled from logic step.
+		W3DShaderManager::updateCloud();
+	}
 
 	Matrix3D tm(Transform);
 	// If there are trees, tell them to draw at the transparent time to draw.
@@ -496,16 +494,12 @@ void FlatHeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
 	//	tm.Scale(ObjSpaceExtent);
 	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
 
-	
+
 	DX8Wrapper::Set_Material(m_vertexMaterialClass);
 	DX8Wrapper::Set_Shader(m_shaderClass);
 
-	if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT) {
-		doCloud = false;
-	}
-
  	st=W3DShaderManager::ST_FLAT_TERRAIN_BASE; //set default shader
- 	
+
  	//set correct shader based on current settings
  	if (TheGlobalData->m_useLightMap && doCloud)
  	{	st=W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12;
@@ -521,8 +515,8 @@ void FlatHeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
  		st=W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1;
  	}
 
- 	
-	
+
+
 	//Find number of passes required to render current shader
  	devicePasses=W3DShaderManager::getShaderPasses(st);
 
@@ -534,7 +528,7 @@ void FlatHeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
 	if (m_shroud && rinfo.Additional_Pass_Count() && !m_disableTextures)
 	{
 		W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
-	}	
+	}
 
  	W3DShaderManager::setTexture(1,NULL);	// Set by the tile later. [3/31/2003]
  	W3DShaderManager::setTexture(2,m_stageTwoTexture);	//cloud
@@ -548,7 +542,7 @@ void FlatHeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
 	Int yCoordMax = 0;
 	Int yCoordMin = m_map->getXExtent();
 	Int xCoordMax = 0;
-	Int xCoordMin = m_map->getYExtent();	
+	Int xCoordMin = m_map->getYExtent();
  	for (pass=0; pass<devicePasses; pass++) {
 		Bool disableTex = m_disableTextures;
 		if (m_disableTextures ) {
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp
new file mode 100644
index 00000000000..57d0decba19
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp
@@ -0,0 +1,2448 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: Heightmap.cpp ////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:   RTS3
+//
+// File name: Heightmap.cpp
+//
+// Created:   Mark W., John Ahlquist, April/May 2001
+//
+// Desc:      Draw the terrain and scorchmarks in a scene.
+//
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+//         Includes
+//-----------------------------------------------------------------------------
+#include "W3DDevice/GameClient/HeightMap.h"
+
+#ifndef USE_FLAT_HEIGHT_MAP // Flat height map uses flattened textures. jba. [3/20/2003]
+
+#include <stdlib.h>
+#include <assetmgr.h>
+#include <texture.h>
+#include <tri.h>
+#include <colmath.h>
+#include <coltest.h>
+#include <rinfo.h>
+#include <camera.h>
+#include <d3dx8core.h>
+#include "Common/GlobalData.h"
+#include "Common/PerfTimer.h"
+
+#include "GameClient/TerrainVisual.h"
+#include "GameClient/View.h"
+#include "GameClient/Water.h"
+
+#include "GameLogic/AIPathfind.h"
+#include "GameLogic/TerrainLogic.h"
+#include "W3DDevice/GameClient/TerrainTex.h"
+#include "W3DDevice/GameClient/W3DDynamicLight.h"
+#include "W3DDevice/GameClient/W3DScene.h"
+#include "W3DDevice/GameClient/W3DTerrainTracks.h"
+#include "W3DDevice/GameClient/W3DBibBuffer.h"
+#include "W3DDevice/GameClient/W3DTreeBuffer.h"
+#include "W3DDevice/GameClient/W3DPropBuffer.h"
+#include "W3DDevice/GameClient/W3DRoadBuffer.h"
+#include "W3DDevice/GameClient/W3DBridgeBuffer.h"
+#include "W3DDevice/GameClient/W3DWaypointBuffer.h"
+#include "W3DDevice/GameClient/W3DCustomEdging.h"
+#include "W3DDevice/GameClient/WorldHeightMap.h"
+#include "W3DDevice/GameClient/W3DShaderManager.h"
+#include "W3DDevice/GameClient/W3DShadow.h"
+#include "W3DDevice/GameClient/W3DWater.h"
+#include "W3DDevice/GameClient/W3DShroud.h"
+#include "WW3D2/dx8wrapper.h"
+#include "WW3D2/light.h"
+#include "WW3D2/scene.h"
+#include "W3DDevice/GameClient/W3DPoly.h"
+#include "W3DDevice/GameClient/W3DCustomScene.h"
+
+#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
+
+
+#define no_OPTIMIZED_HEIGHTMAP_LIGHTING	01
+// Doesn't work well.  jba.
+
+const Bool HALF_RES_MESH = false;
+
+HeightMapRenderObjClass *TheHeightMap = NULL;
+//-----------------------------------------------------------------------------
+//         Private Data
+//-----------------------------------------------------------------------------
+#define SC_DETAIL_BLEND ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
+	ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
+	ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_ENABLE, ShaderClass::DETAILCOLOR_SCALE, ShaderClass::DETAILALPHA_DISABLE) )
+
+static ShaderClass detailOpaqueShader(SC_DETAIL_BLEND);
+
+#define DEFAULT_MAX_FRAME_EXTRABLEND_TILES		256	//default number of terrain tiles rendered per call (must fit in one VB)
+#define DEFAULT_MAX_MAP_EXTRABLEND_TILES		2048	//default size of array allocated to hold all map extra blend tiles.
+#define DEFAULT_MAX_BATCH_SHORELINE_TILES		512	//maximum number of terrain tiles rendered per call (must fit in one VB)
+#define DEFAULT_MAX_MAP_SHORELINE_TILES		4096	//default size of array allocated to hold all map shoreline tiles.
+
+#define ADJUST_FROM_INDEX_TO_REAL(k) ((k-m_map->getBorderSizeInline())*MAP_XY_FACTOR)
+inline Int IABS(Int x) {	if (x>=0) return x; return -x;};
+
+//-----------------------------------------------------------------------------
+//         Private Functions
+//-----------------------------------------------------------------------------
+
+//=============================================================================
+// HeightMapRenderObjClass::freeIndexVertexBuffers
+//=============================================================================
+/** Frees the w3d resources used to draw the terrain. */
+//=============================================================================
+void HeightMapRenderObjClass::freeIndexVertexBuffers(void)
+{
+	REF_PTR_RELEASE(m_indexBuffer);
+	if (m_vertexBufferTiles) {
+		for (int i=0; i<m_numVertexBufferTiles; i++)
+			REF_PTR_RELEASE(m_vertexBufferTiles[i]);
+		delete[] m_vertexBufferTiles;
+		m_vertexBufferTiles = NULL;
+	}
+	if (m_vertexBufferBackup) {
+		for (int i=0; i<m_numVertexBufferTiles; i++)
+			delete[] m_vertexBufferBackup[i];
+		delete[] m_vertexBufferBackup;
+		m_vertexBufferBackup = NULL;
+	}
+	m_numVertexBufferTiles = 0;
+
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::freeMapResources
+//=============================================================================
+/** Frees the w3d resources used to draw the terrain. */
+//=============================================================================
+Int HeightMapRenderObjClass::freeMapResources(void)
+{
+	BaseHeightMapRenderObjClass::freeMapResources();
+	freeIndexVertexBuffers();
+
+	return 0;
+}
+
+
+//=============================================================================
+// HeightMapRenderObjClass::doTheDynamicLight
+//=============================================================================
+/** Calculates the diffuse lighting as affected by dynamic lighting. */
+//=============================================================================
+UnsignedInt HeightMapRenderObjClass::doTheDynamicLight(VERTEX_FORMAT *vb, VERTEX_FORMAT *vbMirror, Vector3*light, Vector3*normal,  W3DDynamicLight *pLights[], Int numLights)
+{
+#ifdef USE_NORMALS
+	return;
+#else
+	Real shadeR, shadeG, shadeB;
+	Int diffuse = vbMirror->diffuse;
+#ifdef RTS_DEBUG
+	//vbMirror->diffuse += 30;	// Shows which vertexes are geting touched by dynamic light. debug only.
+#endif
+
+	// (gth) avoiding the extra divides (compiler unfortunately didn't do this automatically...)
+	const float oo255 = (1.0f/255.0f);
+	shadeR = ((diffuse>>16)&0x00FF) * oo255;
+	shadeG = ((diffuse>>8)&0x00FF) * oo255;
+	shadeB = (diffuse&0x00FF) * oo255;
+
+	Int alpha = (diffuse>>24)&0x00FF;
+	Int k;
+	for (k=0; k<numLights; k++) {
+		W3DDynamicLight *pLight = pLights[k];
+		if (!pLight->isEnabled()) {
+			continue; // he is turned off.
+		}
+		Vector3 lightDirection(vbMirror->x, vbMirror->y, vbMirror->z);
+		Real factor = 1.0f;
+		switch(pLight->Get_Type()) {
+		case LightClass::POINT:
+		case LightClass::SPOT: {
+				Vector3 lightLoc = pLight->Get_Position();
+				lightDirection -= lightLoc;
+				double range, midRange;
+				pLight->Get_Far_Attenuation_Range(midRange, range);
+				Real dist = lightDirection.Length();
+				if (dist >= range) continue;
+				if (midRange < 0.1) continue;
+				factor = 1.0f - (dist - midRange) / (range - midRange);
+				factor = WWMath::Clamp(factor,0.0f,1.0f);
+
+				// (gth) normalize here since we have the length
+				lightDirection /= dist;
+			}
+			break;
+		case LightClass::DIRECTIONAL:
+			pLight->Get_Spot_Direction(lightDirection);
+			factor = 1.0;
+			break;
+		};
+
+		// (gth) unneeded due to above normalization
+		//lightDirection.Normalize();
+
+		Vector3 lightRay(-lightDirection.X, -lightDirection.Y, -lightDirection.Z);
+		Real shade = Vector3::Dot_Product(lightRay, *normal);
+		shade *= factor;
+		Vector3 diffuse;
+		pLight->Get_Diffuse(&diffuse);
+		Vector3 ambient;
+		pLight->Get_Ambient(&ambient);
+		if (shade > 1.0) shade = 1.0;
+		if(shade < 0.0f) shade = 0.0f;
+		shadeR += shade*diffuse.X;
+		shadeG += shade*diffuse.Y;
+		shadeB += shade*diffuse.Z;
+		shadeR += factor*ambient.X;
+		shadeG += factor*ambient.Y;
+		shadeB += factor*ambient.Z;
+
+	}
+	if (shadeR > 1.0) shadeR = 1.0;
+	if(shadeR < 0.0f) shadeR = 0.0f;
+	if (shadeG > 1.0) shadeG = 1.0;
+	if(shadeG < 0.0f) shadeG = 0.0f;
+	if (shadeB > 1.0) shadeB = 1.0;
+	if(shadeB < 0.0f) shadeB = 0.0f;
+	shadeR*=255.0f;
+	shadeG*=255.0f;
+	shadeB*=255.0f;
+
+//	(gth) faster float to int conversion, return the result so we can re-use it.
+//	vb->diffuse=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16) | ((int)alpha << 24);
+	UnsignedInt light_val = WWMath::Float_To_Int_Chop(shadeB) | (WWMath::Float_To_Int_Chop(shadeG) << 8) | (WWMath::Float_To_Int_Chop(shadeR) << 16) | ((int)alpha << 24);
+	vb->diffuse = light_val;
+	return light_val;
+
+#endif
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::getXWithOrigin
+//=============================================================================
+/** Gets the x index that corresponds to the data.  For example, if the columns
+are shifted by 3, index 3 is actually the first row of polygons, or 0.  Yes it
+is confusing, but it makes sliding the map 10x faster.  */
+//=============================================================================
+Int HeightMapRenderObjClass::getXWithOrigin(Int x)
+{
+	x -= m_originX;
+	if (x<0) x+= m_x-1;
+	if (x>= m_x-1) x-=m_x-1;
+#ifdef RTS_DEBUG
+	DEBUG_ASSERTCRASH (x>=0, ("X out of range."));
+	DEBUG_ASSERTCRASH (x<m_x-1, ("X out of range."));
+#endif
+	if (x<0) x = 0;
+	if (x>= m_x-1) x=m_x-1;
+	return x;
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::getYWithOrigin
+//=============================================================================
+/** Gets the y index that corresponds to the data.  For example, if the rows
+are shifted by 3, index 3 is actually the first row of polygons, or 0.  Yes it
+is confusing, but it makes sliding the map 10x faster.  */
+//=============================================================================
+Int HeightMapRenderObjClass::getYWithOrigin(Int y)
+{
+	y -= m_originY;
+	if (y<0) y+= m_y-1;
+	if (y>= m_y-1) y-=m_y-1;
+#ifdef RTS_DEBUG
+	DEBUG_ASSERTCRASH (y>=0, ("Y out of range."));
+	DEBUG_ASSERTCRASH (y<m_y-1, ("Y out of range."));
+#endif
+	if (y<0) y = 0;
+	if (y>= m_y-1) y=m_y-1;
+	return y;
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::updateVB
+//=============================================================================
+/** Update a rectangular block of the given Vertex Buffer.
+data is expected to be an array same dimensions as current heightmap
+mapped into this VB.
+*/
+//=============================================================================
+Int HeightMapRenderObjClass::updateVB(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator)
+{
+	Int i,j;
+	Vector3 lightRay[MAX_GLOBAL_LIGHTS];
+	const Coord3D *lightPos;
+	Int xCoord, yCoord;
+	Int vn0,un0,vp1,up1;
+	Vector3 l2r,n2f,normalAtTexel;
+	Int	vertsPerRow=(VERTEX_BUFFER_TILE_LENGTH)*4;	//vertices per row of VB
+
+	Int cellOffset = 1;
+	if (HALF_RES_MESH) {
+		cellOffset = 2;
+	}
+
+	REF_PTR_SET(m_map, pMap);	//update our heightmap pointer in case it changed since last call.
+	if (m_vertexBufferTiles && pMap)
+	{
+#ifdef RTS_DEBUG
+		assert(x0 >= originX && y0 >= originY && x1>x0 && y1>y0 && x1<=originX+VERTEX_BUFFER_TILE_LENGTH && y1<=originY+VERTEX_BUFFER_TILE_LENGTH);
+#endif
+
+		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
+		VERTEX_FORMAT *vbHardware = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();
+		VERTEX_FORMAT *vBase = (VERTEX_FORMAT*)data;
+		// Note that we are building the vertex buffer data in the memory buffer, data.
+		// At the bottom, we will copy the final vertex data for one cell into the
+		// hardware vertex buffer.
+
+		for (j=y0; j<y1; j++)
+		{
+			VERTEX_FORMAT *vb = vBase;
+			if (HALF_RES_MESH) {
+				if (j&1) continue;
+				vb += ((j-originY)/2)*vertsPerRow/2;	//skip to correct row in vertex buffer
+				vb += ((x0-originX)/2)*4;		//skip to correct vertex in row.
+			} else {
+				vb += (j-originY)*vertsPerRow;	//skip to correct row in vertex buffer
+				vb += (x0-originX)*4;		//skip to correct vertex in row.
+			}
+			vn0 = getYWithOrigin(j)-cellOffset;
+			if (vn0 < -pMap->getDrawOrgY())
+				vn0=-pMap->getDrawOrgY();
+			vp1 = getYWithOrigin(j+cellOffset)+cellOffset;
+			if (vp1 >= pMap->getYExtent()-pMap->getDrawOrgY())
+				vp1=pMap->getYExtent()-pMap->getDrawOrgY()-1;
+
+			yCoord = getYWithOrigin(j)+pMap->getDrawOrgY();
+			for (i=x0; i<x1; i++)
+			{
+				if (HALF_RES_MESH) {
+					if (i&1) continue;
+				}
+				un0 = getXWithOrigin(i)-cellOffset;
+				if (un0 < -pMap->getDrawOrgX())
+					un0=-pMap->getDrawOrgX();
+				up1 = getXWithOrigin(i+cellOffset)+cellOffset;
+				if (up1 >= pMap->getXExtent()-pMap->getDrawOrgX())
+					up1=pMap->getXExtent()-pMap->getDrawOrgX()-1;
+				xCoord = getXWithOrigin(i)+pMap->getDrawOrgX();
+
+				//update the 4 vertices in this block
+				float U[4], V[4];
+				UnsignedByte alpha[4];
+				float UA[4], VA[4];
+				Bool flipForBlend = false;			 // True if the blend needs the triangles flipped.
+
+				if (pMap) {
+					pMap->getUVData(getXWithOrigin(i),getYWithOrigin(j),U, V, HALF_RES_MESH);
+					pMap->getAlphaUVData(getXWithOrigin(i),getYWithOrigin(j), UA, VA, alpha, &flipForBlend, HALF_RES_MESH);
+				}
+
+
+				for (Int lightIndex=0; lightIndex < TheGlobalData->m_numGlobalLights; lightIndex++)
+				{
+					lightPos=&TheGlobalData->m_terrainLightPos[lightIndex];
+					lightRay[lightIndex].Set(-lightPos->x,-lightPos->y,	-lightPos->z);
+				}
+
+				//top-left sample
+				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset, getYWithOrigin(j)) - pMap->getDisplayHeight(un0, getYWithOrigin(j))));
+				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i), (getYWithOrigin(j)+cellOffset)) - pMap->getDisplayHeight(getXWithOrigin(i), vn0)));
+
+#ifdef ALLOW_TEMPORARIES
+				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
+#else
+				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
+#endif
+
+				vb->x=xCoord;
+				vb->y=yCoord;
+				vb->z=  ((float)pMap->getDisplayHeight(getXWithOrigin(i), getYWithOrigin(j)))*MAP_HEIGHT_SCALE;
+				vb->x = ADJUST_FROM_INDEX_TO_REAL(vb->x);
+				vb->y = ADJUST_FROM_INDEX_TO_REAL(vb->y);
+				vb->u1=U[0];
+				vb->v1=V[0];
+				vb->u2=UA[0];
+				vb->v2=VA[0];
+				doTheLight(vb, lightRay, &normalAtTexel, pLightsIterator, alpha[0]);
+				vb++;
+
+				//top-right sample
+				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(up1 , getYWithOrigin(j) ) - pMap->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
+				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , (getYWithOrigin(j)+cellOffset) ) - pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , vn0 )));
+
+#ifdef ALLOW_TEMPORARIES
+				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
+#else
+				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
+#endif
+
+				vb->x=xCoord+cellOffset;
+				vb->y=yCoord;
+				vb->z=  ((float)pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset, getYWithOrigin(j)))*MAP_HEIGHT_SCALE;
+				vb->x = ADJUST_FROM_INDEX_TO_REAL(vb->x);
+				vb->y = ADJUST_FROM_INDEX_TO_REAL(vb->y);
+				vb->u1=U[1];
+				vb->v1=V[1];
+				vb->u2=UA[1];
+				vb->v2=VA[1];
+				doTheLight(vb, lightRay, &normalAtTexel, pLightsIterator, alpha[1]);
+				vb++;
+
+				//bottom-right sample
+				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(up1 , (getYWithOrigin(j)+cellOffset) ) - pMap->getDisplayHeight(getXWithOrigin(i) , (getYWithOrigin(j)+cellOffset) )));
+				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , vp1 ) - pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , getYWithOrigin(j) )));
+
+#ifdef ALLOW_TEMPORARIES
+				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
+#else
+				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
+#endif
+
+				vb->x=xCoord+cellOffset;
+				if (yCoord + 1 == pMap->getDrawOrgY() + m_y - 1) {
+					vb->y=yCoord+1;
+				} else {
+					vb->y=yCoord+cellOffset;
+				}
+				vb->z=  ((float)pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset, getYWithOrigin(j)+cellOffset))*MAP_HEIGHT_SCALE;
+				vb->x = ADJUST_FROM_INDEX_TO_REAL(vb->x);
+				vb->y = ADJUST_FROM_INDEX_TO_REAL(vb->y);
+				vb->u1=U[2];
+				vb->v1=V[2];
+				vb->u2=UA[2];
+				vb->v2=VA[2];
+				doTheLight(vb, lightRay, &normalAtTexel, pLightsIterator, alpha[2]);
+				vb++;
+
+				//bottom-left sample
+				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , (getYWithOrigin(j)+cellOffset) ) - pMap->getDisplayHeight(un0 , (getYWithOrigin(j)+cellOffset) )));
+				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i) , vp1 ) - pMap->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
+
+#ifdef ALLOW_TEMPORARIES
+				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
+#else
+				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
+#endif
+
+				if (xCoord == pMap->getDrawOrgX()) {
+					vb->x=xCoord;
+					//if (vb->x < 0) vb->x = 0;
+				} else {
+					vb->x=xCoord;
+				}
+				if (yCoord + 1 == pMap->getDrawOrgY() + m_y - 1) {
+					vb->y=yCoord+1;
+				} else {
+					vb->y=yCoord+cellOffset;
+				}
+				vb->z=  ((float)pMap->getDisplayHeight(getXWithOrigin(i), getYWithOrigin(j)+cellOffset))*MAP_HEIGHT_SCALE;
+				vb->x = ADJUST_FROM_INDEX_TO_REAL(vb->x);
+				vb->y = ADJUST_FROM_INDEX_TO_REAL(vb->y);
+				vb->u1=U[3];
+				vb->v1=V[3];
+				vb->u2=UA[3];
+				vb->v2=VA[3];
+				doTheLight(vb, lightRay, &normalAtTexel, pLightsIterator, alpha[3]);
+				vb++;
+
+				VERTEX_FORMAT *pCurVertices = vb-4;
+#ifdef FLIP_TRIANGLES // jba - reduces "diamonding" in some cases, not others.  Better cliffs, though.
+				VERTEX_FORMAT tmpVertex;
+				if (flipForBlend) {
+					tmpVertex = pCurVertices[0];
+					pCurVertices[0] = pCurVertices[1];
+					pCurVertices[1] = pCurVertices[2];
+					pCurVertices[2] = pCurVertices[3];
+					pCurVertices[3] = tmpVertex;
+				}
+#endif
+
+				if (m_showImpassableAreas) {
+					// Color impassable cells "red"
+					DEBUG_ASSERTCRASH(PATHFIND_CELL_SIZE_F == MAP_XY_FACTOR, ("Pathfind must be terrain cell size, or this code needs reworking.  John A."));
+					Real borderHiX = (pMap->getXExtent()-2*pMap->getBorderSizeInline())*MAP_XY_FACTOR;
+					Real borderHiY = (pMap->getYExtent()-2*pMap->getBorderSizeInline())*MAP_XY_FACTOR;
+					Bool border = pCurVertices[0].x == -MAP_XY_FACTOR || pCurVertices[0].y == -MAP_XY_FACTOR;
+					Bool cliffMapped = pMap->isCliffMappedTexture(getXWithOrigin(i), getYWithOrigin(j));
+					if (pCurVertices[0].x == borderHiX) {
+						border = true;
+					}
+					if (pCurVertices[0].y == borderHiY) {
+						border = true;
+					}
+					Bool isCliff = pMap->getCliffState(getXWithOrigin(i)+pMap->getDrawOrgX(), getYWithOrigin(j)+pMap->getDrawOrgY())
+												 || showAsVisibleCliff(getXWithOrigin(i) + pMap->getDrawOrgX(), getYWithOrigin(j)+pMap->getDrawOrgY());
+
+					if ( isCliff || border || cliffMapped) {
+						Int cellX, cellY;
+						for (cellX=0; cellX<2; cellX++) {
+							for (cellY=0; cellY<2; cellY++) {
+								Int vertex = cellX+2*cellY;
+								if (border) {
+									Bool doBorder = false;
+									if (pCurVertices[vertex].y >= 0 && pCurVertices[vertex].y <= borderHiY) {
+										if (pCurVertices[vertex].x == 0 || pCurVertices[vertex].x == borderHiX) {
+											doBorder = true;
+										}
+									}
+									if (pCurVertices[vertex].x >= 0 && pCurVertices[vertex].x <= borderHiX) {
+										if (pCurVertices[vertex].y == 0 || pCurVertices[vertex].y == borderHiY) {
+											doBorder = true;
+										}
+									}
+									if (doBorder) {
+										pCurVertices[vertex].diffuse &= 0xFF0000ff; // blue with alpha.
+									}
+								} else if (isCliff) {
+									pCurVertices[vertex].diffuse &= 0xFFFF0000; // red with alpha.
+								}
+								if (cliffMapped && vertex==0) {
+									pCurVertices[vertex].diffuse &= 0xFF000000; // Black.
+									pCurVertices[vertex].diffuse |= 0xff00; // Add green.
+								}
+							}
+						}
+					}
+				}
+
+				// Note - We have been building the vertex buffer in the memory location.
+				// Now copy the set of vertices into the hardware buffer.
+				// We don't copy the whole vertex buffer because we often update only
+				// a couple of rows and its a lot faster to just copy the ones that change.
+				Int offset = pCurVertices - vBase;
+				memcpy(vbHardware+offset, pCurVertices, 4*sizeof(VERTEX_FORMAT));
+			}
+		}
+		return 0; //success.
+	}
+	return -1;
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::updateVBForLight
+//=============================================================================
+/** Update the dynamic lighting values only in a rectangular block of the given Vertex Buffer.
+The vertex locations and texture coords are unchanged.
+*/
+Int HeightMapRenderObjClass::updateVBForLight(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights)
+{
+
+#if (OPTIMIZED_HEIGHTMAP_LIGHTING)	// (gth) if optimizations are enabled, jump over to the "optimized" version of this function.
+	return updateVBForLightOptimized( pVB, data, x0, y0, x1, y1, originX, originY, pLights, numLights );
+#endif
+
+	Int i,j,k;
+	Int vn0,un0,vp1,up1;
+	Vector3 l2r,n2f,normalAtTexel;
+	Int	vertsPerRow=(VERTEX_BUFFER_TILE_LENGTH)*4;	//vertices per row of VB
+
+	if (m_vertexBufferTiles && m_map)
+	{
+#ifdef RTS_DEBUG
+		assert(x0 >= originX && y0 >= originY && x1>x0 && y1>y0 && x1<=originX+VERTEX_BUFFER_TILE_LENGTH && y1<=originY+VERTEX_BUFFER_TILE_LENGTH);
+#endif
+
+		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
+		VERTEX_FORMAT *vBase = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();
+		VERTEX_FORMAT *vb;
+
+		for (j=y0; j<y1; j++)
+		{
+			if (HALF_RES_MESH) {
+				if (j&1) continue;
+			}
+			Int yCoord = getYWithOrigin(j)+m_map->getDrawOrgY()-m_map->getBorderSizeInline();
+			Bool intersect = false;
+			for (k=0; k<numLights; k++) {
+				if (pLights[k]->m_minY <= yCoord+1 &&
+					pLights[k]->m_maxY >= yCoord) {
+					intersect = true;
+				}
+				if (pLights[k]->m_prevMinY <= yCoord+1 &&
+					pLights[k]->m_prevMaxY >= yCoord) {
+					intersect = true;
+				}
+			}
+			if (!intersect) {
+				continue;
+			}
+			vn0 = getYWithOrigin(j)-1;
+			if (vn0 < -m_map->getDrawOrgY())
+				vn0=-m_map->getDrawOrgY();
+			vp1 = getYWithOrigin(j+1)+1;
+			if (vp1 >= m_map->getYExtent()-m_map->getDrawOrgY())
+				vp1=m_map->getYExtent()-m_map->getDrawOrgY()-1;
+
+			for (i=x0; i<x1; i++)
+			{
+				if (HALF_RES_MESH) {
+					if (i&1) continue;
+				}
+				Int xCoord = getXWithOrigin(i)+m_map->getDrawOrgX()-m_map->getBorderSizeInline();
+				Bool intersect = false;
+				for (k=0; k<numLights; k++) {
+					if (pLights[k]->m_minX <= xCoord+1 &&
+						pLights[k]->m_maxX >= xCoord &&
+						pLights[k]->m_minY <= yCoord+1 &&
+						pLights[k]->m_maxY >= yCoord) {
+						intersect = true;
+					}
+					if (pLights[k]->m_prevMinX <= xCoord+1 &&
+						pLights[k]->m_prevMaxX >= xCoord &&
+						pLights[k]->m_prevMinY <= yCoord+1 &&
+						pLights[k]->m_prevMaxY >= yCoord) {
+						intersect = true;
+					}
+				}
+				if (!intersect) {
+					continue;
+				}
+				// vb is the pointer to the vertex in the hardware dx8 vertex buffer.
+				Int offset = (j-originY)*vertsPerRow+4*(i-originX);
+				if (HALF_RES_MESH) {
+					offset = (j-originY)*vertsPerRow/4+2*(i-originX);
+				}
+				vb = vBase + offset;	//skip to correct row in vertex buffer
+				// vbMirror is the pointer to the vertex in our memory based copy.
+				// The important point is that we can read out of our copy to get the original
+				// diffuse color, and xyz location.  It is VERY SLOW to read out of the
+				// hardware vertex buffer, possibly worse... jba.
+				VERTEX_FORMAT *vbMirror = ((VERTEX_FORMAT*)data)  + offset;
+				un0 = getXWithOrigin(i)-1;
+				if (un0 < -m_map->getDrawOrgX())
+					un0=-m_map->getDrawOrgX();
+				up1 = getXWithOrigin(i+1)+1;
+				if (up1 >= m_map->getXExtent()-m_map->getDrawOrgX())
+					up1=m_map->getXExtent()-m_map->getDrawOrgX()-1;
+
+				Vector3 lightRay(0,0,0);
+
+				//top-left sample
+				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1, getYWithOrigin(j)) - m_map->getDisplayHeight(un0, getYWithOrigin(j))));
+				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i), (getYWithOrigin(j)+1)) - m_map->getDisplayHeight(getXWithOrigin(i), vn0)));
+
+#ifdef ALLOW_TEMPORARIES
+				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
+#else
+				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
+#endif
+
+				doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
+				vb++;	vbMirror++;
+
+				//top-right sample
+				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(up1 , getYWithOrigin(j) ) - m_map->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
+				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(getXWithOrigin(i)+1 , vn0 )));
+
+#ifdef ALLOW_TEMPORARIES
+				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
+#else
+				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
+#endif
+
+				doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
+				vb++;	vbMirror++;
+
+				//bottom-right sample
+				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(up1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(getXWithOrigin(i) , (getYWithOrigin(j)+1) )));
+				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , vp1 ) - m_map->getDisplayHeight(getXWithOrigin(i)+1 , getYWithOrigin(j) )));
+
+#ifdef ALLOW_TEMPORARIES
+				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
+#else
+				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
+#endif
+
+				doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
+				vb++;	vbMirror++;
+
+				//bottom-left sample
+				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(un0 , (getYWithOrigin(j)+1) )));
+				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i) , vp1 ) - m_map->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
+
+#ifdef ALLOW_TEMPORARIES
+				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
+#else
+				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
+#endif
+
+				doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
+				vb++;	vbMirror++;
+			}
+		}
+		return 0; //success.
+	}
+	return -1;
+}
+
+
+Int HeightMapRenderObjClass::updateVBForLightOptimized(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights)
+{
+	Int i,j,k;
+	Int vn0,un0,vp1,up1;
+	Vector3 l2r,n2f,normalAtTexel;
+	Int	vertsPerRow=(VERTEX_BUFFER_TILE_LENGTH)*4;	//vertices per row of VB
+
+	if (m_vertexBufferTiles && m_map)
+	{
+#ifdef RTS_DEBUG
+		assert(x0 >= originX && y0 >= originY && x1>x0 && y1>y0 && x1<=originX+VERTEX_BUFFER_TILE_LENGTH && y1<=originY+VERTEX_BUFFER_TILE_LENGTH);
+#endif
+
+		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
+		VERTEX_FORMAT *vBase = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();
+		VERTEX_FORMAT *vb;
+
+		//
+		// (gth) the optimization in this function is to take advantage of verts in the same
+		// x,y position who have already computed their lighting.  To do this, we need to set up
+		// some offsets in the vertex buffer.  I've computed these offsets to be consistent with
+		// the formula's that Generals is using but in the case of the "half-res-mesh" I'm not
+		// sure things are correct...
+		//
+		Int quad_right_offset;
+		Int quad_below_offset;
+		Int quad_below_right_offset;
+
+		if (HALF_RES_MESH == false) {
+			// offset = (j-originY)*vertsPerRow+4*(i-originX);
+			quad_right_offset = 4;
+			quad_below_offset = vertsPerRow;
+			quad_below_right_offset = vertsPerRow + 4;
+
+		} else {
+			// offset = (j-originY)*vertsPerRow/4+2*(i-originX);
+			quad_right_offset = 2;
+			quad_below_offset = vertsPerRow/4;
+			quad_below_right_offset = vertsPerRow/4 + 2;
+		}
+
+		//
+		// i,j loop over the quads affected by the light.  Each quad has its *own* 4 vertices.  This
+		// means that for any vertex position on the map, there are actually 4 copies of the vertex.
+		//
+		for (j=y0; j<y1; j++)
+		{
+			if (HALF_RES_MESH) {
+				if (j&1) continue;
+			}
+			Int yCoord = getYWithOrigin(j)+m_map->getDrawOrgY()-m_map->getBorderSizeInline();
+			Bool intersect = false;
+			for (k=0; k<numLights; k++) {
+				if (pLights[k]->m_minY <= yCoord+1 &&
+					pLights[k]->m_maxY >= yCoord) {
+					intersect = true;
+				}
+				if (pLights[k]->m_prevMinY <= yCoord+1 &&
+					pLights[k]->m_prevMaxY >= yCoord) {
+					intersect = true;
+				}
+			}
+			if (!intersect) {
+				continue;
+			}
+			vn0 = getYWithOrigin(j)-1;
+			if (vn0 < -m_map->getDrawOrgY())
+				vn0=-m_map->getDrawOrgY();
+			vp1 = getYWithOrigin(j+1)+1;
+			if (vp1 >= m_map->getYExtent()-m_map->getDrawOrgY())
+				vp1=m_map->getYExtent()-m_map->getDrawOrgY()-1;
+
+			for (i=x0; i<x1; i++)
+			{
+				if (HALF_RES_MESH) {
+					if (i&1) continue;
+				}
+				Int xCoord = getXWithOrigin(i)+m_map->getDrawOrgX()-m_map->getBorderSizeInline();
+				Bool intersect = false;
+				for (k=0; k<numLights; k++) {
+					if (pLights[k]->m_minX <= xCoord+1 &&
+						pLights[k]->m_maxX >= xCoord &&
+						pLights[k]->m_minY <= yCoord+1 &&
+						pLights[k]->m_maxY >= yCoord) {
+						intersect = true;
+					}
+					if (pLights[k]->m_prevMinX <= xCoord+1 &&
+						pLights[k]->m_prevMaxX >= xCoord &&
+						pLights[k]->m_prevMinY <= yCoord+1 &&
+						pLights[k]->m_prevMaxY >= yCoord) {
+						intersect = true;
+					}
+				}
+				if (!intersect) {
+					continue;
+				}
+				// vb is the pointer to the vertex in the hardware dx8 vertex buffer.
+				Int offset = (j-originY)*vertsPerRow+4*(i-originX);
+				if (HALF_RES_MESH) {
+					offset = (j-originY)*vertsPerRow/4+2*(i-originX);
+				}
+				vb = vBase + offset;	//skip to correct row in vertex buffer
+				// vbMirror is the pointer to the vertex in our memory based copy.
+				// The important point is that we can read out of our copy to get the original
+				// diffuse color, and xyz location.  It is VERY SLOW to read out of the
+				// hardware vertex buffer, possibly worse... jba.
+				VERTEX_FORMAT *vbMirror = ((VERTEX_FORMAT*)data)  + offset;
+				VERTEX_FORMAT *vbaseMirror = ((VERTEX_FORMAT*)data);
+				un0 = getXWithOrigin(i)-1;
+				if (un0 < -m_map->getDrawOrgX())
+					un0=-m_map->getDrawOrgX();
+				up1 = getXWithOrigin(i+1)+1;
+				if (up1 >= m_map->getXExtent()-m_map->getDrawOrgX())
+					up1=m_map->getXExtent()-m_map->getDrawOrgX()-1;
+
+				Vector3 lightRay(0,0,0);
+
+				//
+				// (gth) Following the set of rules below lets us take advantage of lighting values that have
+				// been previously computed.  The idea is to copy them ahead to future quads that will need them
+				// and then not compute them when we get to those quads.  This also avoids having to read-back
+				// from the vertex buffer but we do jump around in memory... probably bad anyway, maybe we should
+				// compute into a temporary buffer and copy all at once...
+				//
+				unsigned long light_copy;
+
+				// top-left sample -> only compute when i==0 and j==0
+				if ((i==x0) && (j==y0)) {
+					l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1, getYWithOrigin(j)) - m_map->getDisplayHeight(un0, getYWithOrigin(j))));
+					n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i), (getYWithOrigin(j)+1)) - m_map->getDisplayHeight(getXWithOrigin(i), vn0)));
+					Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
+					doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
+				}
+				vb++;	vbMirror++;
+
+				//top-right sample -> compute when j==0, then copy to (right,0)
+				if (j==y0) {
+					l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(up1 , getYWithOrigin(j) ) - m_map->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
+					n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(getXWithOrigin(i)+1 , vn0 )));
+					Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
+					light_copy = doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
+
+					if (i < x1-1) {
+						// copy light to (right,0)
+						(vBase + offset + quad_right_offset)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_right_offset)->diffuse&0xff000000) ;
+					}
+				}
+				vb++;	vbMirror++;
+
+				//bottom-right sample -> always compute, then copy to (right,3), (down,1), (down+right,0)
+				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(up1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(getXWithOrigin(i) , (getYWithOrigin(j)+1) )));
+				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , vp1 ) - m_map->getDisplayHeight(getXWithOrigin(i)+1 , getYWithOrigin(j) )));
+				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
+				light_copy = doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
+
+				if (i < x1-1) {
+					// copy light to (right,3)
+					//(vBase + offset + quad_right_offset + 3)->diffuse = light_copy;
+					(vBase + offset + quad_right_offset + 3)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_right_offset + 3)->diffuse&0xff000000) ;
+				}
+				if (j < y1-1) {
+					// copy light to (down,1)
+					//(vBase + offset + quad_below_offset + 1)->diffuse = light_copy;
+					(vBase + offset + quad_right_offset + 1)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_right_offset + 1)->diffuse&0xff000000) ;
+				}
+				if ((i < x1-1) && (j < y1-1)) {
+					// copy light to (right+down,0)
+					//(vBase + offset + quad_below_right_offset)->diffuse = light_copy;
+					(vBase + offset + quad_right_offset)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_right_offset)->diffuse&0xff000000) ;
+				}
+				vb++;	vbMirror++;
+
+				//bottom-left sample -> compute when i==0, otherwise copy from (left,2)
+				if (i==x0) {
+					l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(un0 , (getYWithOrigin(j)+1) )));
+					n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i) , vp1 ) - m_map->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
+					Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
+					light_copy = doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
+
+					if (j < y1-1) {
+						// copy light to (down,0)
+						//(vBase + offset + quad_below_offset)->diffuse = light_copy;
+						(vBase + offset + quad_below_offset)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_below_offset)->diffuse&0xff000000) ;
+					}
+				}
+				vb++;	vbMirror++;
+			}
+		}
+		return 0; //success.
+	}
+	return -1;
+}
+
+
+
+//=============================================================================
+// HeightMapRenderObjClass::doPartialUpdate
+//=============================================================================
+/** Updates a partial block of vertices from [x0,y0 to x1,y1]
+The coordinates in partialRange are map cell coordinates, relative to the entire map.
+The vertex coordinates and texture coordinates, as well as static lighting are updated.
+*/
+void HeightMapRenderObjClass::doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator)
+{
+	// Adjust range into the current drawn map range.
+	Int minX = partialRange.lo.x - htMap->getDrawOrgX();
+	Int maxX = partialRange.hi.x - htMap->getDrawOrgX();
+	Int minY = partialRange.lo.y - htMap->getDrawOrgY();
+	Int maxY = partialRange.hi.y - htMap->getDrawOrgY();
+	if (minX<0) minX = 0;
+	if (minY<0) minY = 0;
+	if (maxX > m_x-1) maxX = m_x-1;
+	if (maxY > m_y-1) maxY = m_y-1;
+	if (maxX < minX) return;
+	if (maxY < minY) return;
+	if (m_originX == 0 && m_originY == 0) {
+		// simple case.
+		updateBlock(minX, minY, maxX, maxY,
+								htMap, pLightsIterator);
+	}
+	else
+	{
+		minY = minY+m_originY;
+		maxY = maxY+m_originY;
+
+		if (minY> m_y-1) {
+			minY -= m_y-1;
+ 			maxY -= m_y-1;
+		}
+		if (maxY > m_y-1) {
+			maxY -= m_y-1;
+			updateBlock(0, minY, m_x-1, m_y-1, htMap, pLightsIterator);
+			updateBlock(0, 0, m_x-1, maxY, htMap, pLightsIterator);
+		} else {
+			updateBlock(0, minY, m_x-1, maxY, htMap, pLightsIterator);
+		}
+	}
+
+	if (!m_extraBlendTilePositions)
+	{	//Need to allocate memory
+		m_extraBlendTilePositions = NEW Int[DEFAULT_MAX_MAP_EXTRABLEND_TILES];
+		m_extraBlendTilePositionsSize = DEFAULT_MAX_MAP_EXTRABLEND_TILES;
+	}
+
+	//Find list of all extra blend tiles used on map.  These are tiles with 3 materials/textures
+	//over the same tile and require an extra render pass.
+
+	Int i, j;
+	//First remove any existing extra blend tiles within this partial region
+	for (j=0; j<m_numExtraBlendTiles; j++)
+	{	Int x = m_extraBlendTilePositions[j] & 0xffff;
+		Int y = m_extraBlendTilePositions[j] >> 16;
+		if (x >= partialRange.lo.x && x < partialRange.hi.x &&
+			y >= partialRange.lo.y && y < partialRange.hi.y)
+		{	//this tile is inside region being updated so remove it by shifting tile array
+			memcpy(m_extraBlendTilePositions+j,m_extraBlendTilePositions+j+1,(m_numExtraBlendTiles-1-j)*sizeof(Int));
+			m_numExtraBlendTiles--;
+			j--;	//need to look at index j again because this tile was removed
+		}
+	}
+
+	for (j=partialRange.lo.y; j<partialRange.hi.y; j++)
+		for (i=partialRange.lo.x; i<partialRange.hi.x; i++)
+		{
+			if (j<0 || i<0) continue;
+			Real U[4],V[4];
+			UnsignedByte alpha[4];
+			Bool flipState,cliffState;
+			if (htMap->getExtraAlphaUVData(i,j,U,V,alpha,&flipState, &cliffState))
+			{	if (m_numExtraBlendTiles >= m_extraBlendTilePositionsSize)
+				{	//no more room to store extra blend tiles so enlarge the buffer.
+					Int *tempPositions=NEW Int[m_extraBlendTilePositionsSize+512];
+					memcpy(tempPositions, m_extraBlendTilePositions, m_extraBlendTilePositionsSize*sizeof(Int));
+					delete [] m_extraBlendTilePositions;
+					//enlarge by more tiles to reduce memory trashing
+					m_extraBlendTilePositions = tempPositions;
+					m_extraBlendTilePositionsSize += 512;
+				}
+				//Pack x and y position into single integer since maps are limited in size
+				m_extraBlendTilePositions[m_numExtraBlendTiles]=i | (j <<16);
+				m_numExtraBlendTiles++;
+			}
+		}
+	updateShorelineTiles(partialRange.lo.x,partialRange.lo.y,partialRange.hi.x,partialRange.hi.y,htMap);
+
+	updateViewImpassableAreas(TRUE, minX, maxX, minY, maxY);
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::updateBlock
+//=============================================================================
+/** Updates a block of vertices from [x0,y0 to x1,y1]
+The vertex coordinates and texture coordinates, as well as static lighting are updated.
+*/
+Int HeightMapRenderObjClass::updateBlock(Int x0, Int y0, Int x1, Int y1,  WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator)
+{
+#ifdef RTS_DEBUG
+	DEBUG_ASSERTCRASH(x0>=0,  ("HeightMapRenderObjClass::UpdateBlock parameters extend beyond left edge."));
+	DEBUG_ASSERTCRASH(y0>=0,  ("HeightMapRenderObjClass::UpdateBlock parameters extend beyond bottom edge."));
+	DEBUG_ASSERTCRASH(x1<m_x, ("HeightMapRenderObjClass::UpdateBlock parameters extend beyond right edge."));
+	DEBUG_ASSERTCRASH(y1<m_y, ("HeightMapRenderObjClass::UpdateBlock parameters extend beyond top edge."));
+	DEBUG_ASSERTCRASH(x0<=x1, ("HeightMapRenderObjClass::UpdateBlock parameters have inside-out rectangle (on X)."));
+	DEBUG_ASSERTCRASH(y0<=y1, ("HeightMapRenderObjClass::UpdateBlock parameters have inside-out rectangle (on Y)."));
+#endif
+	Invalidate_Cached_Bounding_Volumes();
+	if (pMap && m_treeBuffer != NULL) {
+		REF_PTR_SET(m_stageZeroTexture, pMap->getTerrainTexture());
+		REF_PTR_SET(m_stageOneTexture, pMap->getAlphaTerrainTexture());
+	}
+
+	Int i,j;
+	DX8VertexBufferClass	**pVB;
+	Int originX,originY;
+	//step through each vertex buffer that needs updating
+	for (j=0; j<m_numVBTilesY; j++)
+	{
+		originY=j*VERTEX_BUFFER_TILE_LENGTH;	//location of this VB on the large full-size heightmap
+		Int yMin, yMax;
+		yMin = originY;
+		if (y0>yMin) yMin = y0;
+		yMax = originY+VERTEX_BUFFER_TILE_LENGTH;
+		if (y1<yMax) yMax = y1;
+		if (yMin >= yMax) {
+			continue;
+		}
+		for (i=0; i<m_numVBTilesX; i++)
+		{
+			originX=i*VERTEX_BUFFER_TILE_LENGTH;	//location of this VB on the large full-size heightmap
+			Int xMin, xMax;
+			xMin = originX;
+			if (xMin<x0) xMin = x0;
+			xMax = originX+VERTEX_BUFFER_TILE_LENGTH;
+			if (xMax>x1) xMax = x1;
+			if (xMin >= xMax) {
+				continue;
+			}
+			pVB=m_vertexBufferTiles+j*m_numVBTilesX+i;	//point to correct row/column of vertex buffers
+			char **pData = m_vertexBufferBackup+j*m_numVBTilesX+i;
+			updateVB(*pVB, *pData, xMin, yMin, xMax, yMax, originX, originY, pMap, pLightsIterator);
+		}
+	}
+
+	return 0;
+}
+
+
+//-----------------------------------------------------------------------------
+//         Public Functions
+//-----------------------------------------------------------------------------
+
+//=============================================================================
+// HeightMapRenderObjClass::~HeightMapRenderObjClass
+//=============================================================================
+/** Destructor. Releases w3d assets. */
+//=============================================================================
+HeightMapRenderObjClass::~HeightMapRenderObjClass(void)
+{
+	freeMapResources();
+
+	delete [] m_extraBlendTilePositions;
+	m_extraBlendTilePositions = NULL;
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::HeightMapRenderObjClass
+//=============================================================================
+/** Constructor. Mostly nulls out the member variables. */
+//=============================================================================
+HeightMapRenderObjClass::HeightMapRenderObjClass(void):
+m_extraBlendTilePositions(NULL),
+m_numExtraBlendTiles(0),
+m_numVisibleExtraBlendTiles(0),
+m_extraBlendTilePositionsSize(0),
+m_vertexBufferTiles(NULL),
+m_vertexBufferBackup(NULL),
+m_originX(0),
+m_originY(0),
+m_indexBuffer(NULL),
+m_numVBTilesX(0),
+m_numVBTilesY(0),
+m_numVertexBufferTiles(0),
+m_numBlockColumnsInLastVB(0),
+m_numBlockRowsInLastVB(0)
+{
+	TheHeightMap = this;
+}
+
+
+//=============================================================================
+// HeightMapRenderObjClass::adjustTerrainLOD
+//=============================================================================
+/** Adjust the terrain Level Of Detail.  If adj > 0 , increases LOD 1 step, if
+adj < 0 decreases it one step, if adj==0, then just sets up for the current LOD */
+//=============================================================================
+void HeightMapRenderObjClass::adjustTerrainLOD(Int adj)
+{
+	BaseHeightMapRenderObjClass::adjustTerrainLOD(adj);
+
+	return;
+
+#if 0
+	if (adj>0 && TheGlobalData->m_terrainLOD<TERRAIN_LOD_MAX) TheWritableGlobalData->m_terrainLOD=(TerrainLOD)(TheGlobalData->m_terrainLOD+1);
+	if (adj<0 && TheGlobalData->m_terrainLOD>TERRAIN_LOD_MIN) TheWritableGlobalData->m_terrainLOD=(TerrainLOD)(TheGlobalData->m_terrainLOD-1);
+
+	switch (TheGlobalData->m_terrainLOD) {
+		case	TERRAIN_LOD_MIN: TheWritableGlobalData->m_useCloudMap = false;
+									TheWritableGlobalData->m_useLightMap = false ;
+									TheWritableGlobalData->m_useWaterPlane = false;
+									TheWritableGlobalData->m_stretchTerrain = false;
+									TheWritableGlobalData->m_useHalfHeightMap = true;
+									break;
+		case TERRAIN_LOD_HALF_CLOUDS: TheWritableGlobalData->m_useCloudMap = true;
+									TheWritableGlobalData->m_useLightMap = true;
+									TheWritableGlobalData->m_useWaterPlane = false;
+									TheWritableGlobalData->m_stretchTerrain = false;
+									TheWritableGlobalData->m_useHalfHeightMap = true;
+									break;
+		case TERRAIN_LOD_STRETCH_NO_CLOUDS: TheWritableGlobalData->m_useCloudMap = false;
+									TheWritableGlobalData->m_useLightMap = false;
+									TheWritableGlobalData->m_useWaterPlane = false;
+									TheWritableGlobalData->m_stretchTerrain = true;
+									TheWritableGlobalData->m_useHalfHeightMap = false;
+									break;
+		case TERRAIN_LOD_STRETCH_CLOUDS: TheWritableGlobalData->m_useCloudMap = true;
+									TheWritableGlobalData->m_useLightMap = true;
+									TheWritableGlobalData->m_useWaterPlane = false;
+									TheWritableGlobalData->m_stretchTerrain = true;
+									TheWritableGlobalData->m_useHalfHeightMap = false;
+									break;
+		case TERRAIN_LOD_NO_CLOUDS: TheWritableGlobalData->m_useCloudMap = false;
+									TheWritableGlobalData->m_useLightMap = false;
+									TheWritableGlobalData->m_useWaterPlane = false;
+									TheWritableGlobalData->m_stretchTerrain = false;
+									TheWritableGlobalData->m_useHalfHeightMap = false;
+									break;
+		default:
+		case TERRAIN_LOD_NO_WATER: TheWritableGlobalData->m_useCloudMap = true;
+									TheWritableGlobalData->m_useLightMap = true;
+									TheWritableGlobalData->m_useWaterPlane = false;
+									TheWritableGlobalData->m_stretchTerrain = false;
+									TheWritableGlobalData->m_useHalfHeightMap = false;
+									break;
+		case TERRAIN_LOD_MAX: TheWritableGlobalData->m_useCloudMap = true;
+									TheWritableGlobalData->m_useLightMap = true;
+									TheWritableGlobalData->m_useWaterPlane = true;
+									TheWritableGlobalData->m_stretchTerrain = false;
+									TheWritableGlobalData->m_useHalfHeightMap = false;
+									break;
+	}
+	if (m_map==NULL) return;
+	m_map->setDrawOrg(m_map->getDrawOrgX(), m_map->getDrawOrgX());
+	if (m_shroud)
+		m_shroud->reset();	//need reset here since initHeightData will load new shroud.
+	this->initHeightData(m_map->getDrawWidth(),
+											m_map->getDrawHeight(), m_map, NULL);
+	staticLightingChanged();
+	if (TheTacticalView) {
+		TheTacticalView->setAngle(TheTacticalView->getAngle() + 1);
+		TheTacticalView->setAngle(TheTacticalView->getAngle() - 1);
+	}
+#endif
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::ReleaseResources
+//=============================================================================
+/** Releases all w3d assets, to prepare for Reset device call. */
+//=============================================================================
+void HeightMapRenderObjClass::ReleaseResources(void)
+{
+	BaseHeightMapRenderObjClass::ReleaseResources();
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::ReAcquireResources
+//=============================================================================
+/** Reallocates all W3D assets after a reset.. */
+//=============================================================================
+void HeightMapRenderObjClass::ReAcquireResources(void)
+{
+	BaseHeightMapRenderObjClass::ReAcquireResources();
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::reset
+//=============================================================================
+/** Updates the macro noise/lightmap texture (pass 3) */
+//=============================================================================
+void HeightMapRenderObjClass::reset(void)
+{
+	BaseHeightMapRenderObjClass::reset();
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::oversizeTerrain
+//=============================================================================
+/** Sets the terrain oversize amount. */
+//=============================================================================
+void HeightMapRenderObjClass::oversizeTerrain(Int tilesToOversize)
+{
+	Int width = WorldHeightMap::NORMAL_DRAW_WIDTH;
+	Int height = WorldHeightMap::NORMAL_DRAW_HEIGHT;
+	if (tilesToOversize>0 && tilesToOversize<5)
+	{
+		width += 32*tilesToOversize;
+		height += 32*tilesToOversize;
+		if (width>m_map->getXExtent())
+			width = m_map->getXExtent();
+		if (height>m_map->getYExtent())
+			height = m_map->getYExtent();
+	}
+	Int dx = width-m_map->getDrawWidth();
+	Int dy = height-m_map->getDrawHeight();
+ 	m_map->setDrawWidth(width);
+	m_map->setDrawHeight(height);
+	dx /= 2;
+	dy /= 2;
+	Int newOrgX = m_map->getDrawOrgX()-dx;
+	Int newOrgy = m_map->getDrawOrgY()-dy;
+	if (newOrgX<0) newOrgX=0;
+	if (newOrgy<0) newOrgy=0;
+	m_map->setDrawOrg(newOrgX,newOrgy);
+	m_originX = 0;
+	m_originY = 0;
+	if (m_shroud)
+		m_shroud->reset();
+	//delete m_shroud;
+	//m_shroud = NULL;
+	initHeightData(m_map->getDrawWidth(), m_map->getDrawHeight(), m_map, NULL, FALSE);
+	m_needFullUpdate = true;
+}
+
+
+
+
+//=============================================================================
+// HeightMapRenderObjClass::initHeightData
+//=============================================================================
+/** Allocate a heightmap of x by y vertices and fill with initial height values.
+Also allocates all rendering resources such as vertex buffers, index buffers,
+shaders, and materials.*/
+//=============================================================================
+Int HeightMapRenderObjClass::initHeightData(Int x, Int y, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator, Bool updateExtraPassTiles)
+{
+	BaseHeightMapRenderObjClass::initHeightData(x, y, pMap, pLightsIterator, updateExtraPassTiles);
+	Int i,j;
+//	Int	vertsPerRow=x*2-2;
+//	Int	vertsPerColumn=y*2-2;
+
+	HeightSampleType *data = NULL;
+	if (pMap) {
+		data = pMap->getDataPtr();
+	}
+
+	if (updateExtraPassTiles)
+	{
+		m_numExtraBlendTiles = 0;
+		//Do some preprocessing on map to extract useful data
+		if (pMap)
+		{
+			Int m_mapDX=pMap->getXExtent();
+			Int m_mapDY=pMap->getYExtent();
+			if (!m_extraBlendTilePositions)
+			{	//Need to allocate memory
+				m_extraBlendTilePositions = NEW Int[DEFAULT_MAX_MAP_EXTRABLEND_TILES];
+				m_extraBlendTilePositionsSize = DEFAULT_MAX_MAP_EXTRABLEND_TILES;
+			}
+
+			//Find list of all extra blend tiles used on map.  These are tiles with 3 materials/textures
+			//over the same tile and require an extra render pass.
+			for (j=0; j<(m_mapDY-1); j++)
+				for (i=0; i<(m_mapDX-1); i++)
+				{
+					Real U[4],V[4];
+					UnsignedByte alpha[4];
+					Bool flipState,cliffState;
+					if (pMap->getExtraAlphaUVData(i,j,U,V,alpha,&flipState, &cliffState))
+					{	if (m_numExtraBlendTiles >= m_extraBlendTilePositionsSize)
+						{	//no more room to store extra blend tiles so enlarge the buffer.
+							Int *tempPositions=NEW Int[m_extraBlendTilePositionsSize+512];
+							memcpy(tempPositions, m_extraBlendTilePositions, m_extraBlendTilePositionsSize*sizeof(Int));
+							delete [] m_extraBlendTilePositions;
+							//enlarge by more tiles to reduce memory trashing
+							m_extraBlendTilePositions = tempPositions;
+							m_extraBlendTilePositionsSize += 512;
+						}
+						//Pack x and y position into single integer since maps are limited in size
+						m_extraBlendTilePositions[m_numExtraBlendTiles]=i | (j <<16);
+						m_numExtraBlendTiles++;
+					}
+				}
+		}
+	}
+
+	m_originX = 0;
+	m_originY = 0;
+	m_needFullUpdate = true;
+
+	// If the size changed, we need to allocate.
+	Bool needToAllocate = (x != m_x || y != m_y);
+	// If the textures aren't allocated (usually because of a hardware reset) need to allocate.
+	if (m_stageOneTexture == NULL) {
+		needToAllocate = true;
+	}
+	if (data && needToAllocate && m_treeBuffer != NULL)
+	{	//requested heightmap different from old one.
+		freeIndexVertexBuffers();
+		//Create static index buffers.  These will index the vertex buffers holding the map.
+		m_indexBuffer=NEW_REF(DX8IndexBufferClass,(VERTEX_BUFFER_TILE_LENGTH*VERTEX_BUFFER_TILE_LENGTH*2*3));
+
+		// Fill up the IB
+		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
+		UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
+
+		for (j=0; j<(VERTEX_BUFFER_TILE_LENGTH*VERTEX_BUFFER_TILE_LENGTH*4); j+=VERTEX_BUFFER_TILE_LENGTH*4)
+		{
+			for (i=j; i<(j+VERTEX_BUFFER_TILE_LENGTH*4); i+=4)	//4 vertices per 2x2 block
+			{
+				ib[0]=i;
+				ib[1]=i+2;
+				ib[2]=i+3;
+
+				ib[3]=i;
+				ib[4]=i+1;
+				ib[5]=i+2;
+
+				ib+=6;	//skip the 6 indices we just filled
+			}
+		}
+
+		//Get number of vertex buffers needed to hold current map
+		//First round dimensions to next multiple of VERTEX_BUFFER_TILE_LENGTH since that's our
+		//blocksize
+		m_numVBTilesX=1;
+		for (i=VERTEX_BUFFER_TILE_LENGTH+1; i<x;)
+		{	i+=VERTEX_BUFFER_TILE_LENGTH;
+			m_numVBTilesX++;
+		}
+		m_numVBTilesY=1;
+		for (j=VERTEX_BUFFER_TILE_LENGTH+1; j<y;)
+		{	j+=VERTEX_BUFFER_TILE_LENGTH;
+			m_numVBTilesY++;
+		}
+
+		m_numBlockColumnsInLastVB=(x-1)%VERTEX_BUFFER_TILE_LENGTH;	//right border within last VB
+		m_numBlockRowsInLastVB=(y-1)%VERTEX_BUFFER_TILE_LENGTH;	//bottom border within last VB
+
+		m_numVertexBufferTiles=m_numVBTilesX*m_numVBTilesY;
+		m_x=x;
+		m_y=y;
+		m_vertexBufferTiles = NEW DX8VertexBufferClass*[m_numVertexBufferTiles];
+		m_vertexBufferBackup = NEW char *[m_numVertexBufferTiles];
+
+		Int numVertex = VERTEX_BUFFER_TILE_LENGTH*2*VERTEX_BUFFER_TILE_LENGTH*2;
+
+		for (i=0; i<m_numVertexBufferTiles; i++) {
+#ifdef USE_NORMALS
+			m_vertexBufferTiles[i]=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZNUV2,numVertex,DX8VertexBufferClass::USAGE_DEFAULT));
+#else
+			m_vertexBufferTiles[i]=NEW_REF(DX8VertexBufferClass,(DX8_VERTEX_FORMAT,numVertex,DX8VertexBufferClass::USAGE_DEFAULT));
+#endif
+			m_vertexBufferBackup[i] = NEW char[numVertex*sizeof(VERTEX_FORMAT)];
+		}
+
+		//go with a preset material for now.
+	}
+
+	updateBlock(0,0,x-1,y-1,pMap,pLightsIterator);
+
+	return 0;
+}
+
+
+//=============================================================================
+// HeightMapRenderObjClass::On_Frame_Update
+//=============================================================================
+// Updates the diffuse color values in the vertices as affected by the dynamic
+// lights.
+// TheSuperHackers @bugfix xezon 15/12/2025 Now draws the dynamic lights
+// properly on the entirety of the drawable map region.
+//=============================================================================
+void HeightMapRenderObjClass::On_Frame_Update(void)
+{
+	BaseHeightMapRenderObjClass::On_Frame_Update();
+	Int i,j,k;
+	DX8VertexBufferClass	**pVB;
+	Int originX,originY;
+	if (Scene==NULL) return;
+	RTS3DScene *pMyScene = (RTS3DScene *)Scene;
+
+
+	RefRenderObjListIterator pDynamicLightsIterator(pMyScene->getDynamicLights());
+	if (m_map == NULL) {
+		return;
+	}
+
+#ifdef DO_UNIT_TIMINGS
+#pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
+	return;
+#endif
+
+#ifdef EXTENDED_STATS
+	if (DX8Wrapper::stats.m_disableTerrain) {
+		return;
+	}
+#endif
+
+	Int numDynaLights=0;
+	W3DDynamicLight *enabledLights[MAX_ENABLED_DYNAMIC_LIGHTS];
+
+	const Int xCoordMin = m_map->getDrawOrgX() - m_map->getBorderSizeInline();
+	const Int yCoordMin = m_map->getDrawOrgY() - m_map->getBorderSizeInline();
+	const Int xCoordMax = xCoordMin + m_map->getDrawWidth();
+	const Int yCoordMax = yCoordMin + m_map->getDrawHeight();
+
+	for (pDynamicLightsIterator.First(); !pDynamicLightsIterator.Is_Done(); pDynamicLightsIterator.Next())
+	{
+		W3DDynamicLight *pLight = (W3DDynamicLight*)pDynamicLightsIterator.Peek_Obj();
+		pLight->m_processMe = false;
+		if (pLight->m_enabled || pLight->m_priorEnable) {
+			Real range = pLight->Get_Attenuation_Range();
+			if (pLight->m_priorEnable) {
+				pLight->m_prevMinX = pLight->m_minX;
+				pLight->m_prevMinY = pLight->m_minY;
+				pLight->m_prevMaxX = pLight->m_maxX;
+				pLight->m_prevMaxY = pLight->m_maxY;
+			}
+			Vector3	pos = pLight->Get_Position();
+			pLight->m_minX = (pos.X-range)/MAP_XY_FACTOR;
+			pLight->m_maxX = (pos.X+range)/MAP_XY_FACTOR+1.0f;
+			pLight->m_minY = (pos.Y-range)/MAP_XY_FACTOR;
+			pLight->m_maxY = (pos.Y+range)/MAP_XY_FACTOR+1.0f;
+			if (!pLight->m_priorEnable) {
+				pLight->m_prevMinX = pLight->m_minX;
+				pLight->m_prevMinY = pLight->m_minY;
+				pLight->m_prevMaxX = pLight->m_maxX;
+				pLight->m_prevMaxY = pLight->m_maxY;
+			}
+
+			if (pLight->m_minX < xCoordMax &&
+					pLight->m_minY < yCoordMax &&
+					pLight->m_maxX > xCoordMin &&
+					pLight->m_maxY > yCoordMin) {
+				pLight->m_processMe = TRUE;
+			} else if (pLight->m_prevMinX < xCoordMax &&
+					pLight->m_prevMinY < yCoordMax &&
+					pLight->m_prevMaxX > xCoordMin &&
+					pLight->m_prevMaxY > yCoordMin) {
+				pLight->m_processMe = TRUE;
+			} else {
+				pLight->m_processMe = false;
+			}
+			if (pLight->m_processMe) {
+				enabledLights[numDynaLights] = pLight;
+				numDynaLights++;
+				if (numDynaLights == MAX_ENABLED_DYNAMIC_LIGHTS) {
+					break;
+				}
+			}
+		}
+		pLight->m_priorEnable = pLight->m_enabled;
+	}
+	if (numDynaLights > 0) {
+		//step through each vertex buffer that needs updating
+		for (j=0; j<m_numVBTilesY; j++)
+		{
+			originY=j*VERTEX_BUFFER_TILE_LENGTH;	//location of this VB on the large full-size heightmap
+			Int yMin, yMax;
+			yMin = originY;
+			yMax = originY+VERTEX_BUFFER_TILE_LENGTH;
+			Bool intersect = false;
+			Int yCoordMin = getYWithOrigin(yMin)+m_map->getDrawOrgY()-m_map->getBorderSizeInline();
+			Int yCoordMax = getYWithOrigin(yMax-1)+m_map->getDrawOrgY()+1-m_map->getBorderSizeInline();
+			if (yCoordMax>yCoordMin) {
+				// no wrap occurred.
+				for (k=0; k<numDynaLights; k++) {
+					if (enabledLights[k]->m_minY < yCoordMax &&
+						enabledLights[k]->m_maxY > yCoordMin) {
+						intersect = true;
+						break;
+					}
+					if (enabledLights[k]->m_prevMinY < yCoordMax &&
+						enabledLights[k]->m_prevMaxY > yCoordMin) {
+						intersect = true;
+						break;
+					}
+				}
+			} else {
+				// wrap occurred, so we are outside of this range.
+				int tmp=yCoordMin;
+				yCoordMin = yCoordMax;
+				yCoordMax = tmp;
+				for (k=0; k<numDynaLights; k++) {
+					if (enabledLights[k]->m_minY <=  yCoordMin ||
+						enabledLights[k]->m_maxY >= yCoordMax) {
+						intersect = true;
+						break;
+					}
+					if (enabledLights[k]->m_prevMinY <=  yCoordMin ||
+						enabledLights[k]->m_prevMaxY >= yCoordMax) {
+						intersect = true;
+						break;
+					}
+				}
+			}
+			if (!intersect) {
+				continue;
+			}
+
+			for (i=0; i<m_numVBTilesX; i++)
+			{
+				originX=i*VERTEX_BUFFER_TILE_LENGTH;	//location of this VB on the large full-size heightmap
+				Int xMin, xMax;
+				xMin = originX;
+				xMax = originX+VERTEX_BUFFER_TILE_LENGTH;
+
+				Bool intersect = false;
+				Int xCoordMin = getXWithOrigin(xMin)+m_map->getDrawOrgX()-m_map->getBorderSizeInline();
+				Int xCoordMax = getXWithOrigin(xMax-1)+m_map->getDrawOrgX()+1-m_map->getBorderSizeInline();
+				if (xCoordMax>xCoordMin) {
+					// no wrap occurred.
+					for (k=0; k<numDynaLights; k++) {
+						if (enabledLights[k]->m_minX < xCoordMax &&
+							enabledLights[k]->m_maxX > xCoordMin) {
+							intersect = true;
+							break;
+						}
+						if (enabledLights[k]->m_prevMinX < xCoordMax &&
+							enabledLights[k]->m_prevMaxX > xCoordMin) {
+							intersect = true;
+							break;
+						}
+					}
+				} else {
+					// wrap occurred, so we are outside of this range.
+					int tmp=xCoordMin;
+					xCoordMin = xCoordMax;
+					xCoordMax = tmp;
+					for (k=0; k<numDynaLights; k++) {
+						if (enabledLights[k]->m_minX <=  xCoordMin ||
+							enabledLights[k]->m_maxX >= xCoordMax) {
+							intersect = true;
+							break;
+						}
+						if (enabledLights[k]->m_prevMinX <=  xCoordMin ||
+							enabledLights[k]->m_prevMaxX >= xCoordMax) {
+							intersect = true;
+							break;
+						}
+					}
+				}
+				if (!intersect) {
+					continue;
+				}
+				pVB=m_vertexBufferTiles+j*m_numVBTilesX+i;	//point to correct row/column of vertex buffers
+				char **pData = m_vertexBufferBackup+j*m_numVBTilesX+i;
+				updateVBForLight(*pVB, *pData, xMin, yMin, xMax, yMax, originX,originY, enabledLights, numDynaLights);
+			}
+		}
+	}
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::staticLightingChanged
+//=============================================================================
+/** Notification that all lighting needs to be recalculated. */
+//=============================================================================
+void HeightMapRenderObjClass::staticLightingChanged( void )
+{
+	BaseHeightMapRenderObjClass::staticLightingChanged();
+}
+
+#define CENTER_LIMIT 2
+#define BIG_JUMP 16
+#define WIDE_STEP 32
+
+static Int visMinX, visMinY, visMaxX, visMaxY;
+static Bool check(const FrustumClass & frustum, WorldHeightMap *pMap, Int x, Int y)
+{
+	if (x<0 || y<0) return(false);
+	if (x>= pMap->getXExtent() || y>= pMap->getYExtent()) return(false);
+	if (x >= visMinX && y >= visMinY && x <=visMaxX && y <= visMaxY) {
+		return(true);
+	}
+	Int height = pMap->getHeight(x, y);
+	Vector3 loc((x-pMap->getBorderSizeInline())*MAP_XY_FACTOR, (y-pMap->getBorderSizeInline())*MAP_XY_FACTOR, height*MAP_HEIGHT_SCALE);
+	if (CollisionMath::Overlap_Test(frustum,loc) == CollisionMath::INSIDE) {
+		if (x<visMinX) visMinX=x;
+		if (x>visMaxX) visMaxX=x;
+		if (y<visMinY) visMinY=y;
+		if (y>visMaxY) visMaxY=y;
+		return(true);
+	}
+	return(false);
+}
+
+static void calcVis(const FrustumClass & frustum, WorldHeightMap *pMap, Int minX, Int minY, Int maxX, Int maxY, Int limit)
+{
+	if (maxX-minX<2) return;
+	if (maxY-minY<2) return;
+	if (minX >=visMinX && minY >= visMinY && maxX <=visMaxX && maxY <= visMaxY) {
+		return;
+	}
+	Int midX = (minX+maxX)/2;
+	Int midY = (minY+maxY)/2;
+	Bool recurse1 = maxX-minX>=limit;
+	Bool recurse2 = recurse1;
+	Bool recurse3 = recurse1;
+	Bool recurse4 = recurse1;
+	/* boxes are:
+
+			1     2
+
+
+			3			4 */
+
+	if (check(frustum, pMap, midX, maxY)) {
+		recurse1=true;
+		recurse2=true;
+	}
+	if (check(frustum, pMap, midX, minY)) {
+		recurse3=true;
+		recurse4=true;
+	}
+	if (check(frustum, pMap, midX, midY)) {
+		recurse1=true;
+		recurse2=true;
+		recurse3=true;
+		recurse4=true;
+	}
+	if (check(frustum, pMap, minX, midY)) {
+		recurse1=true;
+		recurse3=true;
+	}
+	if (check(frustum, pMap, maxX, midY)) {
+		recurse2=true;
+		recurse4=true;
+	}
+	if (recurse1) {
+		calcVis(frustum, pMap, minX, midY, midX, maxY, limit);
+	}
+	if (recurse2) {
+		calcVis(frustum, pMap, midX, midY, maxX, maxY, limit);
+	}
+	if (recurse3) {
+		calcVis(frustum, pMap, minX, minY, midX, midY, limit);
+	}
+	if (recurse4) {
+		calcVis(frustum, pMap, midX, minY, maxX, midY, limit);
+	}
+}
+
+
+
+
+
+//=============================================================================
+// HeightMapRenderObjClass::updateCenter
+//=============================================================================
+/** Updates the positioning of the drawn portion of the height map in the
+heightmap.  As the view slides around, this determines what is the actually
+rendered portion of the terrain.  Only a 96x96 section is rendered at any time,
+even though maps can be up to 1024x1024.  This function determines which subset
+is rendered. */
+//=============================================================================
+void HeightMapRenderObjClass::updateCenter(CameraClass *camera , RefRenderObjListIterator *pLightsIterator)
+{
+	if (m_map==NULL) {
+		return;
+	}
+	if (m_updating) {
+		return;
+	}
+	if (m_vertexBufferTiles ==NULL)
+		return;		//did not initialize resources yet.
+
+	BaseHeightMapRenderObjClass::updateCenter(camera, pLightsIterator);
+
+	m_updating = true;
+	if (m_needFullUpdate)
+  {
+		m_needFullUpdate = false;
+		updateBlock(0, 0, m_x-1, m_y-1, m_map, pLightsIterator);
+		m_updating = false;
+		return;
+	}
+
+	if (m_x >= m_map->getXExtent() && m_y >= m_map->getYExtent())
+  {
+		m_updating = false;
+		return; // no need to center.
+	}
+
+	Int cellOffset = 1;
+	if (HALF_RES_MESH) {
+		cellOffset = 2;
+	}
+	// determine the ray corresponding to the camera and distance to projection plane
+	Matrix3D camera_matrix = camera->Get_Transform();
+
+	Vector3 camera_location  = camera->Get_Position();
+
+	Vector3 rayLocation;
+	Vector3 rayDirection;
+	Vector3 rayDirectionPt;
+	// the projected ray has the same origin as the camera
+	rayLocation = camera_location;
+	// determine the location of the screen coordinate in camera-model space
+	const ViewportClass &viewport = camera->Get_Viewport();
+	Int i, j, minHt;
+
+	Real intersectionZ;
+	minHt = m_map->getMaxHeightValue();
+	for (i=0; i<m_x; i++) {
+		for (j=0; j<m_y; j++) {
+			Short cur = m_map->getDisplayHeight(i,j);
+			if (cur<minHt) minHt = cur;
+		}
+	}
+	intersectionZ = (float)minHt;
+//	float aspect = camera->Get_Aspect_Ratio();
+
+	Vector2 min,max;
+	camera->Get_View_Plane(min,max);
+	float xscale = (max.X - min.X);
+	float yscale = (max.Y - min.Y);
+
+	float zmod = -1.0; // Scene->vpd; // Note: view plane distance is now always 1.0 from the camera
+	float minX = 200000;
+	float maxX = -minX;
+	float minY = 200000;
+	float maxY = -minY;
+	for (i=0; i<2; i++) {
+		for (j=0; j<2; j++) {
+			float xmod = (-i + 0.5 + viewport.Min.X) * zmod * xscale;// / aspect;
+			float ymod = (j - 0.5 - viewport.Min.Y) * zmod * yscale;// * aspect;
+
+			// transform the screen coordinates by the camera's matrix into world coordinates.
+			float x = zmod * camera_matrix[0][2] + xmod * camera_matrix[0][0] + ymod * camera_matrix[0][1];
+			float y = zmod * camera_matrix[1][2] + xmod * camera_matrix[1][0] + ymod * camera_matrix[1][1];
+			float z = zmod * camera_matrix[2][2] + xmod * camera_matrix[2][0] + ymod * camera_matrix[2][1];
+
+			rayDirection.Set(x,y,z);
+			rayDirection.Normalize();
+			rayDirectionPt = rayLocation+rayDirection;
+
+			x = Vector3::Find_X_At_Z(intersectionZ, rayLocation, rayDirectionPt);
+			y = Vector3::Find_Y_At_Z(intersectionZ, rayLocation, rayDirectionPt);
+			if (x<minX) minX = x;
+			if (x>maxX) maxX = x;
+			if (y<minY) minY = y;
+			if (y>maxY) maxY = y;
+		}
+	}
+
+	// convert back to cell indexes.
+	minX /= MAP_XY_FACTOR;
+	maxX /= MAP_XY_FACTOR;
+	minY /= MAP_XY_FACTOR;
+	maxY /= MAP_XY_FACTOR;
+
+	minX += m_map->getBorderSizeInline();
+	maxX += m_map->getBorderSizeInline();
+	minY += m_map->getBorderSizeInline();
+	maxY += m_map->getBorderSizeInline();
+
+	visMinX = m_map->getXExtent();
+	visMinY = m_map->getYExtent();
+	visMaxX = 0;
+	visMaxY = 0;
+
+	///< @todo find out why values go out of range
+	if (minX<0) minX=0;
+	if (minY<0) minY=0;
+	if (maxX > visMinX) maxX = visMinX;
+	if (maxY > visMinY) maxY = visMinY;
+
+	const FrustumClass & frustum = camera->Get_Frustum();
+	Int limit = (maxX-minX)/2;
+	if (limit > WIDE_STEP/2) {
+		limit=WIDE_STEP/2;
+	}
+	calcVis(frustum, m_map, minX-WIDE_STEP/2, minY-WIDE_STEP/2, maxX+WIDE_STEP/2, maxY+WIDE_STEP/2, limit);
+
+	if (m_map) {
+		Int newOrgX;
+		if (visMaxX-visMinX > m_x) {
+			newOrgX = (maxX+minX)/2-m_x/2.0;
+		} else {
+			newOrgX = (visMaxX+visMinX)/2-m_x/2.0;
+		}
+
+		Int newOrgY;
+		if (visMaxY - visMinY > m_y) {
+			newOrgY = visMinY+1;
+		}	else {
+			newOrgY = (visMaxY+visMinY)/2-m_y/2.0;
+		}
+		if (TheTacticalView->getFieldOfView() != 0) {
+			newOrgX = (visMaxX+visMinX)/2-m_x/2.0;
+			newOrgY = (visMaxY+visMinY)/2-m_y/2.0;
+		}
+		if (HALF_RES_MESH) {
+			newOrgX &= 0xFFFFFFFE;
+			newOrgY &= 0xFFFFFFFE;
+		}
+		Int deltaX = newOrgX - m_map->getDrawOrgX();
+		Int deltaY = newOrgY - m_map->getDrawOrgY();
+		if (IABS(deltaX) > m_x/2 || IABS(deltaY)>m_x/2) {
+			m_map->setDrawOrg(newOrgX, newOrgY);
+			m_originY = 0;
+			m_originX = 0;
+			updateBlock(0, 0, m_x-1, m_y-1, m_map, pLightsIterator);
+			m_updating = false;
+			return;
+		}
+
+		if (abs(deltaX)>CENTER_LIMIT || abs(deltaY)>CENTER_LIMIT) {
+			if (abs(deltaY) >= CENTER_LIMIT) {
+				if (m_map->setDrawOrg(m_map->getDrawOrgX(), newOrgY)) {
+					Int minY = 0;
+					Int maxY = 0;
+					deltaY -= newOrgY - m_map->getDrawOrgY();
+					m_originY += deltaY;
+					if (m_originY >= m_y-1) m_originY -= m_y-1;
+					if (deltaY<0) {
+						minY = m_originY;
+						maxY = m_originY-deltaY;
+					} else {
+						minY = m_originY - deltaY;
+						maxY = m_originY;
+					}
+					minY-=cellOffset;
+					if (m_originY < 0) m_originY += m_y-1;
+					if (minY<0) {
+						minY += m_y-1;
+						if (minY<0) minY = 0;
+						updateBlock(0, minY, m_x-1, m_y-1, m_map, pLightsIterator);
+						updateBlock(0, 0, m_x-1, maxY, m_map, pLightsIterator);
+					} else {
+						updateBlock(0, minY, m_x-1, maxY, m_map, pLightsIterator);
+					}
+				}
+				// It is much more efficient to update a cople of columns one frame, and then
+				// a couple of rows.  So if we aren't "jumping" to a new view, and have done X
+				// recently, return.
+				if (abs(deltaX) < BIG_JUMP && !m_doXNextTime) {
+					m_updating = false;
+					m_doXNextTime = true;
+					return;	// Only do the y this frame.  Do x next frame.  jba.
+				}
+			}
+			if (abs(deltaX) > CENTER_LIMIT) {
+				m_doXNextTime = false;
+				newOrgX = m_map->getDrawOrgX() + deltaX;
+				if (m_map->setDrawOrg(newOrgX, m_map->getDrawOrgY())) {
+					Int minX = 0;
+					Int maxX = 0;
+					deltaX -= newOrgX - m_map->getDrawOrgX();
+					m_originX += deltaX;
+					if (m_originX >= m_x-1) m_originX -= m_x-1;
+					if (deltaX<0) {
+						minX = m_originX;
+						maxX = m_originX-deltaX;
+					} else {
+						minX = m_originX - deltaX;
+						maxX = m_originX;
+					}
+					minX-=cellOffset;
+					maxX+=cellOffset;
+					if (m_originX < 0) m_originX += m_x-1;
+					if (minX<0) {
+						minX += m_x-1;
+						if (minX<0) minX = 0;
+						updateBlock(minX,0,m_x-1, m_y-1, m_map, pLightsIterator);
+						updateBlock(0,0,maxX, m_y-1, m_map, pLightsIterator);
+					} else {
+						updateBlock(minX,0,maxX, m_y-1, m_map, pLightsIterator);
+					}
+				}
+			}
+		}
+	}
+	m_updating = false;
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::Render
+//=============================================================================
+/** Renders (draws) the terrain. */
+//=============================================================================
+//DECLARE_PERF_TIMER(Terrain_Render)
+
+void HeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
+{
+	//USE_PERF_TIMER(Terrain_Render)
+
+	Int i,j,devicePasses;
+	W3DShaderManager::ShaderTypes st;
+	const Bool doCloud = useCloud();
+
+	if (doCloud)
+	{
+		// TheSuperHackers @tweak Updates the cloud movement before applying it to the world.
+		// Is now decoupled from logic step.
+		W3DShaderManager::updateCloud();
+	}
+
+	Matrix3D tm(Transform);
+#if 0 // There is some weirdness sometimes with the dx8 static buffers.
+			// This usually fixes terrain flashing.  jba.
+	static Int delay = 1;
+	delay --;
+	if (delay<1) {
+		delay = 1;
+		static Int ndx = -1;
+		ndx++;
+		if (ndx>=m_numVertexBufferTiles) {
+			ndx = 0;
+		}
+		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexBufferTiles[ndx]);
+		VERTEX_FORMAT *vb = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();
+		vb = 0;
+	}
+#endif
+	// If there are trees, tell them to draw at the transparent time to draw.
+	if (m_treeBuffer) {
+		m_treeBuffer->setIsTerrain();
+	}
+
+
+#ifdef DO_UNIT_TIMINGS
+#pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
+	return;
+#endif
+
+#ifdef EXTENDED_STATS
+	if (DX8Wrapper::stats.m_disableTerrain) {
+		return;
+	}
+#endif
+
+	DX8Wrapper::Set_Light_Environment(rinfo.light_environment);
+
+	// Force shaders to update.
+	m_stageTwoTexture->restore();
+	DX8Wrapper::Set_Texture(0,NULL);
+	DX8Wrapper::Set_Texture(1,NULL);
+	ShaderClass::Invalidate();
+
+	//	tm.Scale(ObjSpaceExtent);
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
+
+	//Apply the shader and material
+
+	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
+
+	Bool doMultiPassWireFrame=FALSE;
+
+	if (((RTS3DScene *)rinfo.Camera.Get_User_Data())->getCustomPassMode() == SCENE_PASS_ALPHA_MASK ||
+		((SceneClass *)rinfo.Camera.Get_User_Data())->Get_Extra_Pass_Polygon_Mode() == SceneClass::EXTRA_PASS_CLEAR_LINE)
+	{
+			if (WW3D::Is_Texturing_Enabled())
+			{	//first pass where we just fill the z-buffer
+
+				devicePasses=1;	//one pass solid, next in wireframe.
+				doMultiPassWireFrame=TRUE;
+
+				if (rinfo.Additional_Pass_Count())
+				{
+					rinfo.Peek_Additional_Pass(0)->Install_Materials();
+					renderTerrainPass(&rinfo.Camera);
+					rinfo.Peek_Additional_Pass(0)->UnInstall_Materials();
+					return;
+				}
+			}
+			else
+			{	//wireframe pass
+				//Set to vertex diffuse lighting
+				DX8Wrapper::Set_Material(m_vertexMaterialClass);
+				//Set shader to non-textured solid color from vertex
+				DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueSolidShader);
+				devicePasses=1;	//one pass solid, next in wireframe.
+				DX8Wrapper::Apply_Render_State_Changes();
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_TFACTOR );
+				DX8Wrapper::Set_DX8_Render_State(D3DRS_TEXTUREFACTOR,0xff808080);
+				doMultiPassWireFrame=TRUE;
+				renderTerrainPass(&rinfo.Camera);
+				DX8Wrapper::Set_DX8_Render_State(D3DRS_TEXTUREFACTOR,0xff008000);
+				return;
+			}
+	}
+	else
+	{
+		DX8Wrapper::Set_Material(m_vertexMaterialClass);
+		DX8Wrapper::Set_Shader(m_shaderClass);
+
+ 		st=W3DShaderManager::ST_TERRAIN_BASE; //set default shader
+
+ 		//set correct shader based on current settings
+ 		if (!ShaderClass::Is_Backface_Culling_Inverted())
+ 		{	//not reflection pass
+ 			if (TheGlobalData->m_useLightMap && doCloud)
+ 			{	st=W3DShaderManager::ST_TERRAIN_BASE_NOISE12;
+ 			}
+ 			else
+ 			if (TheGlobalData->m_useLightMap)
+ 			{	//lightmap only
+ 				st=W3DShaderManager::ST_TERRAIN_BASE_NOISE2;
+ 			}
+ 			else
+ 			if (doCloud)
+ 			{	//cloudmap only
+ 				st=W3DShaderManager::ST_TERRAIN_BASE_NOISE1;
+ 			}
+ 		}
+ 		else
+ 		{	//reflection pass, just do base texture
+ 			st=W3DShaderManager::ST_TERRAIN_BASE;
+ 		}
+
+ 		//Find number of passes required to render current shader
+ 		devicePasses=W3DShaderManager::getShaderPasses(st);
+
+ 		if (m_disableTextures)
+ 			devicePasses=1;	//force to 1 lighting-only pass
+
+ 		//Specify all textures that this shader may need.
+ 		W3DShaderManager::setTexture(0,m_stageZeroTexture);
+ 		W3DShaderManager::setTexture(1,m_stageZeroTexture);
+ 		W3DShaderManager::setTexture(2,m_stageTwoTexture);	//cloud
+ 		W3DShaderManager::setTexture(3,m_stageThreeTexture);//noise
+		//Disable writes to destination alpha channel (if there is one)
+		if (DX8Wrapper::getBackBufferFormat() == WW3D_FORMAT_A8R8G8B8)
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
+	}
+
+	Int pass;
+ 	for (pass=0; pass<devicePasses; pass++) {
+#ifdef TIMING_TESTS
+#endif
+		if (!doMultiPassWireFrame)	//multi-pass wireframe doesn't use regular shaders.
+		{
+ 			if (m_disableTextures ) {
+ 				DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaque2DShader);
+ 				DX8Wrapper::Set_Texture(0,NULL);
+   			} else {
+ 				W3DShaderManager::setShader(st, pass);
+			}
+		}
+
+		for (j=0; j<m_numVBTilesY; j++)
+			for (i=0; i<m_numVBTilesX; i++)
+			{
+				static int count = 0;
+				count++;
+				Int numPolys = VERTEX_BUFFER_TILE_LENGTH*VERTEX_BUFFER_TILE_LENGTH*2;
+				Int numVertex = (VERTEX_BUFFER_TILE_LENGTH*2)*(VERTEX_BUFFER_TILE_LENGTH*2);
+				if (HALF_RES_MESH) {
+					numPolys /= 4;
+					numVertex /= 4;
+				}
+				DX8Wrapper::Set_Vertex_Buffer(m_vertexBufferTiles[j*m_numVBTilesX+i]);
+#ifdef PRE_TRANSFORM_VERTEX
+				if (m_xformedVertexBuffer && pass==0) {
+					// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
+					DX8Wrapper::Apply_Render_State_Changes();
+					int code = DX8Wrapper::_Get_D3D_Device8()->ProcessVertices(0, 0, numVertex, m_xformedVertexBuffer[j*m_numVBTilesX+i], 0);
+					::OutputDebugString("did process vertex\n");
+				}
+				if (m_xformedVertexBuffer) {
+					// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
+					DX8Wrapper::Apply_Render_State_Changes();
+					DX8Wrapper::_Get_D3D_Device8()->SetStreamSource(
+						0,
+						m_xformedVertexBuffer[j*m_numVBTilesX+i],
+						D3DXGetFVFVertexSize(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2));
+					DX8Wrapper::_Get_D3D_Device8()->SetVertexShader(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2);
+				}
+#endif
+				if (Is_Hidden() == 0) {
+					DX8Wrapper::Draw_Triangles(	0,numPolys, 0,	numVertex);
+				}
+
+			}
+	}
+
+	if (!doMultiPassWireFrame)
+	{
+		if (pass)	//shader was applied at least once?
+ 			W3DShaderManager::resetShader(st);
+
+		//Draw feathered shorelines
+		renderShoreLines(&rinfo.Camera);
+
+		//Do additional pass over any tiles that have 3 textures blended together.
+		if (TheGlobalData->m_use3WayTerrainBlends)
+			renderExtraBlendTiles();
+
+		Int yCoordMin = m_map->getDrawOrgY();
+		Int yCoordMax = m_y+m_map->getDrawOrgY()-1;
+		Int xCoordMin = m_map->getDrawOrgX();
+		Int xCoordMax = m_x+m_map->getDrawOrgX()-1;
+	#ifdef TEST_CUSTOM_EDGING
+		// Draw edging just before last pass.
+		DX8Wrapper::Set_Texture(0,NULL);
+		DX8Wrapper::Set_Texture(1,NULL);
+		m_stageTwoTexture->restore();
+		m_customEdging->drawEdging(m_map, xCoordMin, xCoordMax, yCoordMin, yCoordMax,
+			m_stageZeroTexture, doCloud?m_stageTwoTexture:NULL, TheGlobalData->m_useLightMap?m_stageThreeTexture:NULL);
+	#endif
+	#ifdef DO_ROADS
+		DX8Wrapper::Set_Texture(0,NULL);
+		DX8Wrapper::Set_Texture(1,NULL);
+		m_stageTwoTexture->restore();
+
+		ShaderClass::Invalidate();
+		if (!ShaderClass::Is_Backface_Culling_Inverted()) {
+			DX8Wrapper::Set_Material(m_vertexMaterialClass);
+			if (Scene) {
+				RTS3DScene *pMyScene = (RTS3DScene *)Scene;
+				RefRenderObjListIterator pDynamicLightsIterator(pMyScene->getDynamicLights());
+				m_roadBuffer->drawRoads(&rinfo.Camera, doCloud?m_stageTwoTexture:NULL, TheGlobalData->m_useLightMap?m_stageThreeTexture:NULL,
+					m_disableTextures,xCoordMin-m_map->getBorderSizeInline(), xCoordMax-m_map->getBorderSizeInline(), yCoordMin-m_map->getBorderSizeInline(), yCoordMax-m_map->getBorderSizeInline(), &pDynamicLightsIterator);
+			}
+		}
+	#endif
+	if (m_propBuffer) {
+		m_propBuffer->drawProps(rinfo);
+	}
+	#ifdef DO_SCORCH
+		DX8Wrapper::Set_Texture(0,NULL);
+		DX8Wrapper::Set_Texture(1,NULL);
+		m_stageTwoTexture->restore();
+
+		ShaderClass::Invalidate();
+		if (!ShaderClass::Is_Backface_Culling_Inverted()) {
+			drawScorches();
+		}
+	#endif
+		DX8Wrapper::Set_Texture(0,NULL);
+		DX8Wrapper::Set_Texture(1,NULL);
+		m_stageTwoTexture->restore();
+		ShaderClass::Invalidate();
+		DX8Wrapper::Apply_Render_State_Changes();
+
+		m_bridgeBuffer->drawBridges(&rinfo.Camera, m_disableTextures, doCloud?m_stageTwoTexture:NULL);
+
+		if (TheTerrainTracksRenderObjClassSystem)
+			TheTerrainTracksRenderObjClassSystem->flush();
+
+		if (m_shroud && rinfo.Additional_Pass_Count())
+		{
+			rinfo.Peek_Additional_Pass(0)->Install_Materials();
+			renderTerrainPass(&rinfo.Camera);
+			rinfo.Peek_Additional_Pass(0)->UnInstall_Materials();
+		}
+
+		ShaderClass::Invalidate();
+		DX8Wrapper::Apply_Render_State_Changes();
+	}
+	else
+			m_bridgeBuffer->drawBridges(&rinfo.Camera, m_disableTextures, m_stageTwoTexture);
+
+  if ( m_waypointBuffer )
+	  m_waypointBuffer->drawWaypoints(rinfo);
+
+	m_bibBuffer->renderBibs();
+
+	// We do some custom blending, so tell the shader class to reset everything.
+	DX8Wrapper::Set_Texture(0,NULL);
+	DX8Wrapper::Set_Texture(1,NULL);
+	m_stageTwoTexture->restore();
+	ShaderClass::Invalidate();
+	DX8Wrapper::Set_Material(NULL);
+
+}
+
+
+
+///Performs additional terrain rendering pass, blending in the black shroud texture.
+void HeightMapRenderObjClass::renderTerrainPass(CameraClass *pCamera)
+{
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,Matrix3D(1));
+
+	//Apply the shader and material
+
+	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
+
+	for (Int j=0; j<m_numVBTilesY; j++)
+		for (Int i=0; i<m_numVBTilesX; i++)
+		{
+			static int count = 0;
+			count++;
+			Int numPolys = VERTEX_BUFFER_TILE_LENGTH*VERTEX_BUFFER_TILE_LENGTH*2;
+			Int numVertex = (VERTEX_BUFFER_TILE_LENGTH*2)*(VERTEX_BUFFER_TILE_LENGTH*2);
+			if (HALF_RES_MESH) {
+				numPolys /= 4;
+				numVertex /= 4;
+			}
+			DX8Wrapper::Set_Vertex_Buffer(m_vertexBufferTiles[j*m_numVBTilesX+i]);
+#ifdef PRE_TRANSFORM_VERTEX
+			if (m_xformedVertexBuffer && pass==0) {
+				// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
+				DX8Wrapper::Apply_Render_State_Changes();
+				int code = DX8Wrapper::_Get_D3D_Device8()->ProcessVertices(0, 0, numVertex, m_xformedVertexBuffer[j*m_numVBTilesX+i], 0);
+				::OutputDebugString("did process vertex\n");
+			}
+			if (m_xformedVertexBuffer) {
+				// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
+				DX8Wrapper::Apply_Render_State_Changes();
+				DX8Wrapper::_Get_D3D_Device8()->SetStreamSource(
+					0,
+					m_xformedVertexBuffer[j*m_numVBTilesX+i],
+					D3DXGetFVFVertexSize(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2));
+				DX8Wrapper::_Get_D3D_Device8()->SetVertexShader(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2);
+			}
+#endif
+			if (Is_Hidden() == 0) {
+				DX8Wrapper::Draw_Triangles(	0,numPolys, 0,	numVertex);
+			}
+		}
+}
+
+//=============================================================================
+// HeightMapRenderObjClass::renderExtraBlendTiles
+//=============================================================================
+/** Renders an additoinal terrain pass including only those tiles which have more than 2 textures
+blended together.  Used primarily for corner cases where 3 different textures meet.*/
+void HeightMapRenderObjClass::renderExtraBlendTiles(void)
+{
+	Int vertexCount = 0;
+	Int indexCount = 0;
+	Int xExtent = m_map->getXExtent();
+	Int border = m_map->getBorderSizeInline();
+	static Int maxBlendTiles = DEFAULT_MAX_FRAME_EXTRABLEND_TILES;
+
+	m_numVisibleExtraBlendTiles = 0;
+
+	if (!m_numExtraBlendTiles)
+		return;	//nothing to draw
+
+	if (maxBlendTiles > 10000)	//we can only fit about 10000 tiles into a single VB.
+		maxBlendTiles = 10000;
+
+	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,DX8_FVF_XYZNDUV2,maxBlendTiles*4);
+	DynamicIBAccessClass ib_access(BUFFER_TYPE_DYNAMIC_DX8,maxBlendTiles*6);
+	{
+
+		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
+		VertexFormatXYZNDUV2* vb= lock.Get_Formatted_Vertex_Array();
+		DynamicIBAccessClass::WriteLockClass lockib(&ib_access);
+		UnsignedShort *ib=lockib.Get_Index_Array();
+
+		if (!vb || !ib) return;
+
+		const UnsignedByte* data = m_map->getDataPtr();
+
+		//Loop over visible terrain and extract all the tiles that need extra blend
+		Int drawEdgeY=m_map->getDrawOrgY()+m_map->getDrawHeight()-1;
+		Int drawEdgeX=m_map->getDrawOrgX()+m_map->getDrawWidth()-1;
+		if (drawEdgeX > (m_map->getXExtent()-1))
+			drawEdgeX = m_map->getXExtent()-1;
+		if (drawEdgeY > (m_map->getYExtent()-1))
+			drawEdgeY = m_map->getYExtent()-1;
+		Int drawStartX=m_map->getDrawOrgX();
+		Int drawStartY=m_map->getDrawOrgY();
+
+		for (Int j=0; j<m_numExtraBlendTiles; j++)
+		{
+			if (vertexCount >= (maxBlendTiles*4))
+				break;	//no room in vertex buffer
+
+			Real U[4],V[4];
+			UnsignedByte alpha[4];
+			Bool flipState,cliffState;
+			Int x = m_extraBlendTilePositions[j] & 0xffff;
+			Int y = m_extraBlendTilePositions[j] >> 16;
+
+			if (x >= drawStartX && x < drawEdgeX &&
+				y >= drawStartY && y < drawEdgeY &&
+				m_map->getExtraAlphaUVData(x,y,U,V,alpha,&flipState, &cliffState))
+			{	//this tile is inside visible region and has 3rd blend layer.
+
+				Int idx = x+y*xExtent;
+
+				Real p0=data[idx]*MAP_HEIGHT_SCALE;
+				Real p1=data[idx+1]*MAP_HEIGHT_SCALE;
+				Real p2=data[idx + 1 + xExtent]*MAP_HEIGHT_SCALE;
+				Real p3=data[idx + xExtent]*MAP_HEIGHT_SCALE;
+				if (cliffState && abs(p0-p2) > abs(p1-p3))	//cliffs sometimes force a flip
+					flipState = TRUE;
+
+				vb->x=(x-border)*MAP_XY_FACTOR;
+				vb->y=(y-border)*MAP_XY_FACTOR;
+				vb->z=p0;
+				vb->nx=0;
+				vb->ny=0;
+				vb->nz=0;
+				vb->diffuse=(alpha[0]<<24)|(getStaticDiffuse(x,y) & 0x00ffffff);
+				vb->u1=U[0];
+				vb->v1=V[0];
+				vb->u2=0;
+				vb->v2=0;
+				vb++;
+
+				vb->x=(x+1-border)*MAP_XY_FACTOR;
+				vb->y=(y-border)*MAP_XY_FACTOR;
+				vb->z=p1;
+				vb->nx=0;
+				vb->ny=0;
+				vb->nz=0;
+				vb->diffuse=(alpha[1]<<24)|(getStaticDiffuse(x+1,y) & 0x00ffffff);
+				vb->u1=U[1];
+				vb->v1=V[1];
+				vb->u2=0;
+				vb->v2=0;
+				vb++;
+
+				vb->x=(x+1-border)*MAP_XY_FACTOR;
+				vb->y=(y+1-border)*MAP_XY_FACTOR;
+				vb->z=p2;
+				vb->nx=0;
+				vb->ny=0;
+				vb->nz=0;
+				vb->diffuse=(alpha[2]<<24)|(getStaticDiffuse(x+1,y+1) & 0x00ffffff);
+				vb->u1=U[2];
+				vb->v1=V[2];
+				vb->u2=0;
+				vb->v2=0;
+				vb++;
+
+				vb->x=(x-border)*MAP_XY_FACTOR;
+				vb->y=(y+1-border)*MAP_XY_FACTOR;
+				vb->z=p3;
+				vb->nx=0;
+				vb->ny=0;
+				vb->nz=0;
+				vb->diffuse=(alpha[3]<<24)|(getStaticDiffuse(x,y+1) & 0x00ffffff);
+				vb->u1=U[3];
+				vb->v1=V[3];
+				vb->u2=0;
+				vb->v2=0;
+				vb++;
+
+				if (flipState)
+				{
+					ib[0]=1+vertexCount;
+					ib[1]=3+vertexCount;
+					ib[2]=0+vertexCount;
+					ib[3]=1+vertexCount;
+					ib[4]=2+vertexCount;
+					ib[5]=3+vertexCount;
+				}
+				else
+				{
+					ib[0]=0+vertexCount;
+					ib[1]=2+vertexCount;
+					ib[2]=3+vertexCount;
+					ib[3]=0+vertexCount;
+					ib[4]=1+vertexCount;
+					ib[5]=2+vertexCount;
+				}
+				ib += 6;
+				vertexCount +=4;
+				indexCount +=6;
+			}
+		}
+	}
+
+	if (vertexCount)
+	{
+		//Check if we couldn't fit all blend tiles into vertex buffer so we can enlarge it for next frame.
+		if (vertexCount == (maxBlendTiles*4))
+			maxBlendTiles += 16;	//enlarge by 16 to reduce trashing.
+
+		ShaderClass::Invalidate();	//invalidate to force shader to reset since we directly changed states
+		DX8Wrapper::Set_Index_Buffer(ib_access,0);
+		DX8Wrapper::Set_Vertex_Buffer(vb_access);
+		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+		DX8Wrapper::Set_Material(vmat);
+		REF_PTR_RELEASE(vmat);
+		ShaderClass shader=ShaderClass::_PresetOpaqueShader;
+		shader.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);	//disable writes to z
+		DX8Wrapper::Set_Shader(shader);
+
+		if (TheGlobalData->m_use3WayTerrainBlends == 2)
+		{
+			shader.Set_Primary_Gradient(ShaderClass::GRADIENT_DISABLE);	//disable lighting.
+			shader.Set_Texturing(ShaderClass::TEXTURING_DISABLE);		//disable texturing.
+			DX8Wrapper::Set_Shader(shader);
+			DX8Wrapper::Set_Texture(0,NULL);	//debug mode which draws terrain tiles in white.
+			if (Is_Hidden() == 0) {
+				DX8Wrapper::Draw_Triangles(	0,indexCount/3, 0,	vertexCount);	//draw a quad, 2 triangles, 4 verts
+				m_numVisibleExtraBlendTiles += indexCount/6;
+			}
+		}
+		else
+		{
+			W3DShaderManager::setTexture(0,m_stageOneTexture);
+			W3DShaderManager::setTexture(1,m_stageTwoTexture);	//cloud
+			W3DShaderManager::setTexture(2,m_stageThreeTexture);	//noise/lightmap
+
+			W3DShaderManager::ShaderTypes st = W3DShaderManager::ST_ROAD_BASE;
+
+			const Bool doCloud = useCloud();
+
+			if (TheGlobalData->m_useLightMap && doCloud)
+ 			{
+				st = W3DShaderManager::ST_ROAD_BASE_NOISE12;
+ 			}
+ 			else if (TheGlobalData->m_useLightMap)
+ 			{	//lightmap only
+ 				st = W3DShaderManager::ST_ROAD_BASE_NOISE2;
+ 			}
+ 			else if (doCloud)
+ 			{	//cloudmap only
+ 				st = W3DShaderManager::ST_ROAD_BASE_NOISE1;
+ 			}
+
+			Int devicePasses=W3DShaderManager::getShaderPasses(st);
+
+			for (Int pass=0; pass < devicePasses; pass++)
+			{
+				W3DShaderManager::setShader(st, pass);
+				if (Is_Hidden() == 0) {
+					DX8Wrapper::Draw_Triangles(	0,indexCount/3, 0,	vertexCount);	//draw a quad, 2 triangles, 4 verts
+					m_numVisibleExtraBlendTiles += indexCount/6;
+				}
+			}
+			W3DShaderManager::resetShader(st);
+		}
+  }
+}
+#endif
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp
new file mode 100644
index 00000000000..9e923b1d6dd
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp
@@ -0,0 +1,1142 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: TerrainTex.cpp ////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:   RTS3
+//
+// File name: TerrainTex.cpp
+//
+// Created:   John Ahlquist, April 2001
+//
+// Desc:      TextureClass overrides to perform custom texturing for the terrain.
+//
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+//         Includes
+//-----------------------------------------------------------------------------
+#include <stdlib.h>
+
+#include "W3DDevice/GameClient/TerrainTex.h"
+#include "W3DDevice/GameClient/WorldHeightMap.h"
+#include "W3DDevice/GameClient/TileData.h"
+#include "Common/GlobalData.h"
+#include "WW3D2/dx8wrapper.h"
+#include "d3dx8tex.h"
+
+/******************************************************************************
+						TerrainTextureClass
+******************************************************************************/
+//-----------------------------------------------------------------------------
+//         Public Functions
+//-----------------------------------------------------------------------------
+
+//=============================================================================
+// TerrainTextureClass::TerrainTextureClass
+//=============================================================================
+/** Constructor. Calls parent constructor to create a 16 bit per pixel D3D
+texture of the desired height and mip level. */
+//=============================================================================
+TerrainTextureClass::TerrainTextureClass(int height) :
+	TextureClass(TEXTURE_WIDTH, height,
+		WW3D_FORMAT_A1R5G5B5, MIP_LEVELS_3 )
+{
+}
+
+//=============================================================================
+// TerrainTextureClass::TerrainTextureClass
+//=============================================================================
+/** Constructor. Calls parent constructor to create a 16 bit per pixel D3D
+texture of the desired height and mip level. */
+//=============================================================================
+TerrainTextureClass::TerrainTextureClass(int height, int width) :
+	TextureClass(width, height,
+		WW3D_FORMAT_A1R5G5B5, MIP_LEVELS_ALL )
+{
+}
+
+
+//=============================================================================
+// TerrainTextureClass::update
+//=============================================================================
+/** Sets the tile bitmap data into the texture.  The tiles are placed with 4
+	pixel borders around them, so that when the tiles are scaled and bilinearly
+	interpolated, you don't get seams between the tiles.  */
+//=============================================================================
+int TerrainTextureClass::update(WorldHeightMap *htMap)
+{
+	// D3DTexture is our texture;
+
+	IDirect3DSurface8 *surface_level;
+	D3DSURFACE_DESC surface_desc;
+	D3DLOCKED_RECT locked_rect;
+	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0, &surface_level));
+	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
+	if (surface_desc.Width < TEXTURE_WIDTH) {
+		surface_level->Release();
+		return 0;
+	}
+
+	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
+
+	Int tilePixelExtent = TILE_PIXEL_EXTENT;
+	Int tilesPerRow = surface_desc.Width/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
+	tilesPerRow *= 2;
+//	Int numRows = surface_desc.Height/(tilePixelExtent+TILE_OFFSET);
+#ifdef RTS_DEBUG
+	//DEBUG_ASSERTCRASH(tilesPerRow*numRows >= htMap->m_numBitmapTiles, ("Too many tiles."));
+	DEBUG_ASSERTCRASH((Int)surface_desc.Width >= tilePixelExtent*tilesPerRow, ("Bitmap too small."));
+#endif
+	if (surface_desc.Format == D3DFMT_A1R5G5B5) {
+#if 0
+		UnsignedInt cellX, cellY;
+		for (cellX = 0; cellX < surface_desc.Width; cellX++) {
+			for (cellY = 0; cellY < surface_desc.Height; cellY++) {
+				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(cellY*surface_desc.Width+cellX)*2;
+				*((Short*)pBGR) = (((255-2*cellY)>>3)<<10) + ((4*cellX)>>4);
+			}
+		}
+#endif
+		Int tileNdx;
+		Int pixelBytes = 2;
+		for (tileNdx=0; tileNdx < htMap->m_numBitmapTiles; tileNdx++) {
+			TileData *pTile = htMap->getSourceTile(tileNdx);
+			if (!pTile) continue;
+			ICoord2D position = pTile->m_tileLocationInTexture;
+			if (position.x<=0) continue; // all real tile offsets start at 2.  jba.
+
+			Int i,j;
+			for (j=0; j<tilePixelExtent; j++) {
+				UnsignedByte *pBGR = pTile->getRGBDataForWidth(tilePixelExtent);
+				pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
+				Int row = position.y+j;
+				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
+							(row)*surface_desc.Width*pixelBytes;
+
+				Int column = position.x;
+				pBGRX += column*pixelBytes;
+				for (i=0; i<tilePixelExtent; i++) {
+					*((Short*)pBGRX) = 0x8000 + ((pBGR[2]>>3)<<10) + ((pBGR[1]>>3)<<5) + (pBGR[0]>>3);
+					pBGRX +=pixelBytes;
+					pBGR +=TILE_BYTES_PER_PIXEL;
+				}
+			}
+		}
+		// Now draw the 4 pixel border around each tile class.
+		Int texClass;
+		for (texClass=0; texClass<htMap->m_numTextureClasses; texClass++) {
+			Int width = htMap->m_textureClasses[texClass].width;
+			ICoord2D origin = htMap->m_textureClasses[texClass].positionInTexture;
+			if (origin.x<=0) continue;
+			width *= TILE_PIXEL_EXTENT;
+			// Duplicate 4 columns of pixels before and after.
+			Int j;
+			for (j=0; j<width; j++) {
+				Int row = origin.y+j;
+				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
+							(row)*surface_desc.Width*pixelBytes;
+
+				Int column = origin.x;
+				pBGRX += column*pixelBytes;
+				// copy before
+				memcpy(pBGRX-(4)*pixelBytes, pBGRX+(width-4)*pixelBytes, 4*pixelBytes);
+				// copy after
+				memcpy(pBGRX+(width*pixelBytes), pBGRX, 4*pixelBytes);
+			}
+
+			// Duplicate 4 rows of pixels before and after.
+			for (j=0; j<4; j++) {
+				// copy before.
+				Int row = origin.y-j-1;
+				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
+							(row)*surface_desc.Width*pixelBytes;
+				UnsignedByte *target = pBGRX+(origin.x-4)*pixelBytes;
+				memcpy(target, target+width*surface_desc.Width*pixelBytes, (width+8)*pixelBytes);
+				// copy after.
+				row = origin.y+j;
+				pBGRX = ((UnsignedByte*)locked_rect.pBits) +
+							(row)*surface_desc.Width*pixelBytes;
+				target = pBGRX+(origin.x-4)*pixelBytes;
+				memcpy(target+width*surface_desc.Width*pixelBytes, target, (width+8)*pixelBytes);
+			}
+
+		}
+
+	}
+	surface_level->UnlockRect();
+	surface_level->Release();
+	DX8_ErrorCode(D3DXFilterTexture(Peek_D3D_Texture(), NULL, 0, D3DX_FILTER_BOX));
+	if (WW3D::Get_Texture_Reduction()) {
+		Peek_D3D_Texture()->SetLOD(WW3D::Get_Texture_Reduction());
+	}
+	return(surface_desc.Height);
+}
+
+#if 0 // old version.
+//=============================================================================
+// TerrainTextureClass::update
+//=============================================================================
+/** Sets the tile bitmap data into the texture.  The tiles are placed with 4
+	pixel borders around them, so that when the tiles are scaled and bilinearly
+	interpolated, you don't get seams between the tiles.  */
+//=============================================================================
+int TerrainTextureClass::update(WorldHeightMap *htMap)
+{
+	// D3DTexture is our texture;
+
+	IDirect3DSurface8 *surface_level;
+	D3DSURFACE_DESC surface_desc;
+	D3DLOCKED_RECT locked_rect;
+	DX8_ErrorCode(D3DTexture->GetSurfaceLevel(0, &surface_level));
+	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
+	if (surface_desc.Width < TEXTURE_WIDTH) {
+		surface_level->Release();
+		if (surface_desc.Width == 256) {
+			return update256(htMap);
+		}
+		return false;
+	}
+
+	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
+
+	Int tilePixelExtent = TILE_PIXEL_EXTENT;
+	Int tilesPerRow = surface_desc.Width/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
+	tilesPerRow *= 2;
+	Int numRows = surface_desc.Height/(tilePixelExtent+TILE_OFFSET);
+#ifdef RTS_DEBUG
+	assert(tilesPerRow*numRows >= htMap->m_numBitmapTiles);
+	assert((Int)surface_desc.Width >= tilePixelExtent*tilesPerRow);
+#endif
+	if (surface_desc.Format == D3DFMT_A1R5G5B5) {
+		Int cellX, cellY;
+#if 0
+		for (cellX = 0; cellX < surface_desc.Width; cellX++) {
+			for (cellY = 0; cellY < surface_desc.Height; cellY++) {
+				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(cellY*surface_desc.Width+cellX)*2;
+				*((Short*)pBGR) = (((255-2*cellY)>>3)<<10) + ((4*cellX)>>4);
+			}
+		}
+#endif
+		Int pixelBytes = 2;
+		for (cellY = 0; cellY < numRows; cellY++) {
+			for (cellX = 0; cellX < tilesPerRow; cellX++) {
+				Int tileNdx = cellX/2 + (tilesPerRow/2)*(cellY/2);
+				tileNdx *=4;
+				if (cellX&1) tileNdx++;
+				if (!(cellY&1)) tileNdx += 2;
+#define ADD_EXTRA_TILES 1
+#if ADD_EXTRA_TILES // Fills in an extra 2 columns and 1 row of tiles if there is room.
+				if (!htMap->getSourceTile(tileNdx) && htMap->getSourceTile(tileNdx-4)) {
+					tileNdx -= 4;
+				}
+				if (!htMap->getSourceTile(tileNdx) && htMap->getSourceTile(tileNdx-8)) {
+					tileNdx -= 8;
+				}
+				if (!htMap->getSourceTile(tileNdx) && htMap->getSourceTile(tileNdx-2*tilesPerRow)) {
+					tileNdx -= 2*tilesPerRow;
+				}
+#endif
+				if (htMap->getSourceTile(tileNdx)) {
+					Int i,j;
+					for (j=0; j<tilePixelExtent; j++) {
+						UnsignedByte *pBGR = htMap->getSourceTile(tileNdx)->getRGBDataForWidth(tilePixelExtent);
+						pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
+						Int row = cellY*tilePixelExtent+j;
+						row += TILE_OFFSET/2;
+						row += TILE_OFFSET*(cellY/2);
+						UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
+									(row)*surface_desc.Width*pixelBytes;
+
+						Int column = cellX*tilePixelExtent;
+						column += TILE_OFFSET*(cellX/2);
+						pBGRX += column*pixelBytes;
+						pBGRX += (TILE_OFFSET/2)*pixelBytes;
+						for (i=0; i<tilePixelExtent; i++) {
+							*((Short*)pBGRX) = 0x8000 + ((pBGR[2]>>3)<<10) + ((pBGR[1]>>3)<<5) + (pBGR[0]>>3);
+							pBGRX +=pixelBytes;
+							pBGR +=TILE_BYTES_PER_PIXEL;
+						}
+					}
+
+				}
+			}
+
+		}
+
+
+		for (cellY = 0; cellY < numRows; cellY++) {
+			for (cellX = 0; cellX < tilesPerRow; cellX++) {
+			// Duplicate 4 rows of pixels before and after.
+				Int j;
+				for (j=0; j<tilePixelExtent; j++) {
+					Int row = cellY*tilePixelExtent+j;
+					row += TILE_OFFSET/2;
+					row += TILE_OFFSET*(cellY/2);
+					UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
+								(row)*surface_desc.Width*pixelBytes;
+
+					Int column = cellX*tilePixelExtent;
+					column += TILE_OFFSET*(cellX/2);
+					pBGRX += column*pixelBytes;
+					if (cellX&1) {
+						Int bytesToCopy = 4*pixelBytes;
+						if (cellX == tilesPerRow-1) {
+							// last cell, so fill to the end of the texture.
+							Int usedWidth = tilesPerRow*tilePixelExtent + TILE_OFFSET*(tilesPerRow/2);
+							usedWidth *= pixelBytes;
+							bytesToCopy += surface_desc.Width*pixelBytes - usedWidth;
+						}
+						// Copy after.
+						pBGRX -= tilePixelExtent*pixelBytes;
+						pBGRX += (TILE_OFFSET/2)*pixelBytes;
+						memcpy(pBGRX+(2*tilePixelExtent*pixelBytes), pBGRX, bytesToCopy);
+					} else {
+						// copy before
+						memcpy(pBGRX, pBGRX+(2*tilePixelExtent)*pixelBytes, 4*pixelBytes);
+					}
+				}
+			}
+		}
+ 		for (cellY = 0; cellY < numRows; cellY++) {
+			Int rowBytes = surface_desc.Width*pixelBytes;
+			Int row = cellY*tilePixelExtent;
+			row += TILE_OFFSET/2;
+			row += TILE_OFFSET*(cellY/2);
+			if ( (cellY&1) == 0) {
+				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
+							(row)*rowBytes;
+				row += 2*tilePixelExtent;
+				UnsignedByte *pBase = ((UnsignedByte*)locked_rect.pBits) +
+							(row)*rowBytes;
+				memcpy(pBGRX-4*rowBytes, pBase-4*rowBytes, 4*rowBytes);
+			} else {
+				UnsignedByte *pBase = ((UnsignedByte*)locked_rect.pBits) +
+							(row-tilePixelExtent)*rowBytes;
+				row += tilePixelExtent;
+				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
+							(row)*rowBytes;
+				memcpy(pBGRX, pBase, 4*rowBytes);
+			}
+		}
+
+	}
+	surface_level->UnlockRect();
+	surface_level->Release();
+	DX8_ErrorCode(D3DXFilterTexture(D3DTexture, NULL, 0, D3DX_FILTER_BOX));
+	return(surface_desc.Height);
+}
+#endif
+
+//=============================================================================
+// TerrainTextureClass::setLOD
+//=============================================================================
+/** Sets the lod of the texture to be loaded into the video card.  */
+//=============================================================================
+void TerrainTextureClass::setLOD(Int LOD)
+{
+	if (Peek_D3D_Texture()) Peek_D3D_Texture()->SetLOD(LOD);
+}
+//=============================================================================
+// TerrainTextureClass::update
+//=============================================================================
+/** Sets the tile bitmap data into the texture.  The tiles are placed with 4
+	pixel borders around them, so that when the tiles are scaled and bilinearly
+	interpolated, you don't get seams between the tiles.  */
+//=============================================================================
+Bool TerrainTextureClass::updateFlat(WorldHeightMap *htMap, Int xCell, Int yCell, Int cellWidth, Int pixelsPerCell)
+{
+	// D3DTexture is our texture;
+
+	IDirect3DSurface8 *surface_level;
+	D3DSURFACE_DESC surface_desc;
+	D3DLOCKED_RECT locked_rect;
+	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0, &surface_level));
+	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
+	DEBUG_ASSERTCRASH((Int)surface_desc.Width == cellWidth*pixelsPerCell, ("Bitmap too small."));
+	DEBUG_ASSERTCRASH((Int)surface_desc.Height == cellWidth*pixelsPerCell, ("Bitmap too small."));
+	if (surface_desc.Width != cellWidth*pixelsPerCell) {
+		return false;
+	}
+
+	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
+
+
+	if (surface_desc.Format == D3DFMT_A1R5G5B5) {
+
+		Int pixelBytes = 2;
+		Int cellX, cellY;
+#if 0
+		UnsignedInt X, Y;
+		for (X = 0; X < surface_desc.Width; X++) {
+			for (Y = 0; Y < surface_desc.Height; Y++) {
+				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(Y*surface_desc.Width+X)*pixelBytes;
+				*((Short*)pBGR) = (((255-2*Y)>>3)<<10) + ((2*X)>>4);
+			}
+		}
+#endif
+		for (cellX = 0; cellX < cellWidth; cellX++) {
+			for (cellY = 0; cellY < cellWidth; cellY++) {
+				UnsignedByte *pBGRX_data = ((UnsignedByte*)locked_rect.pBits);
+				UnsignedByte *pBGR = htMap->getPointerToTileData(xCell+cellX, yCell+cellY, pixelsPerCell);
+				if (pBGR == NULL) continue; // past end of defined terrain. [3/24/2003]
+				Int k, l;
+				for (k=pixelsPerCell-1; k>=0; k--) {
+					UnsignedByte *pBGRX = pBGRX_data + (pixelsPerCell*(cellWidth-cellY-1)+k)*surface_desc.Width*pixelBytes +
+						cellX*pixelsPerCell*pixelBytes;
+					for (l=0; l<pixelsPerCell; l++) {
+						*((Short*)pBGRX) = 0x8000 + ((pBGR[2]>>3)<<10) + ((pBGR[1]>>3)<<5) + (pBGR[0]>>3);
+						pBGRX +=pixelBytes;
+						pBGR +=TILE_BYTES_PER_PIXEL;
+					}
+				}
+			}
+		}
+	}
+
+	surface_level->UnlockRect();
+	surface_level->Release();
+	DX8_ErrorCode(D3DXFilterTexture(Peek_D3D_Texture(), NULL, 0, D3DX_FILTER_BOX));
+	return(surface_desc.Height);
+}
+
+//=============================================================================
+// TerrainTextureClass::Apply
+//=============================================================================
+/** Sets the texture as the current D3D texture, and does some custom setup
+(standard D3D setup, but beyond the scope of W3D).  */
+//=============================================================================
+void TerrainTextureClass::Apply(unsigned int stage)
+{
+	// Do the base apply.
+	TextureClass::Apply(stage);
+#if 0 // obsolete [4/1/2003]
+	if (TheGlobalData && (TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex)) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+	}
+	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+	}
+	// Now setup the texture pipeline.
+	if (stage==0) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
+
+	}
+#endif
+}
+
+/******************************************************************************
+						AlphaTerrainTextureClass
+******************************************************************************/
+//-----------------------------------------------------------------------------
+//         Public Functions
+//-----------------------------------------------------------------------------
+
+//=============================================================================
+// AlphaTerrainTextureClass::AlphaTerrainTextureClass
+//=============================================================================
+/** Constructor. Calls parent constructor to creat a throw away 8x8 texture,
+then uses the base texture's D3D texture. This way the base tiles pass, drawn
+using TerrainTextureClass shares the same texture with the blended edges pass,
+saving lots of texture memory, and preventing seams between blended tiles. */
+//=============================================================================
+AlphaTerrainTextureClass::AlphaTerrainTextureClass( TextureClass *pBaseTex ):
+	TextureClass(8, 8,
+		WW3D_FORMAT_A1R5G5B5, MIP_LEVELS_1 )
+{
+	// Attach the base texture's d3d texture.
+	IDirect3DTexture8 * d3d_tex = pBaseTex->Peek_D3D_Texture();
+	Set_D3D_Base_Texture(d3d_tex);
+}
+
+
+//=============================================================================
+// AlphaTerrainTextureClass::Apply
+//=============================================================================
+/** Sets the texture as the current D3D texture, and does some custom setup.
+This may be applied in either single pass, as the second texture in the pipe,
+or multipass.  If stage==0, we are doing multipass and we set up the pipe
+for a single texture.  If stage==1, then we are doing a single pass, and we
+set up the pipe so that we blend onto the base texture in stage 0.
+(standard D3D setup, but beyond the scope of W3D). */
+//=============================================================================
+void AlphaTerrainTextureClass::Apply(unsigned int stage)
+{
+	// Do the base apply.
+	TextureClass::Apply(stage);
+
+	// Set the bilinear or trilinear filtering.
+	if (TheGlobalData && (TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex)) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+	}
+	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+	}
+	// Since we are using multiple distinct tiles, the textures doesn't wrap, so clamp it.
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+	// Now setup the texture pipeline.
+	if (stage==0) {
+		// Modulate the diffuse color with the texture as lighting comes from diffuse.
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 1 );
+		// Blend the result using the alpha. (came from diffuse mod texture)
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
+		// Disable stage 2.
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+	}	else if (stage==1) {
+
+		if (TheGlobalData && !TheGlobalData->m_multiPassTerrain)
+		{
+			///@todo: Remove 8-Stage Nvidia hack after drivers are fixed.
+			//This method is a backdoor specific to Nvidia based cards.  It will fail on
+			//other hardware.  Allows single pass blend of 2 textures and post modulate diffuse.
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
+
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP, D3DTOP_ADD);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_DIFFUSE | D3DTA_COMPLEMENT | D3DTA_ALPHAREPLICATE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_ADD);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TFACTOR | D3DTA_COMPLEMENT);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
+
+			DX8Wrapper::Set_DX8_Texture(2, NULL);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_MODULATE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, 2);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLORARG1, D3DTA_TEXTURE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLORARG2, D3DTA_TEXTURE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
+
+			DX8Wrapper::Set_DX8_Texture(3, NULL);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, 3);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLORARG1, D3DTA_DIFFUSE | 0 | D3DTA_ALPHAREPLICATE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
+
+			DX8Wrapper::Set_DX8_Texture(4, NULL);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLOROP, D3DTOP_MODULATE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_TEXCOORDINDEX, 4);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLORARG1, D3DTA_CURRENT);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAARG1, D3DTA_CURRENT);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
+
+			DX8Wrapper::Set_DX8_Texture(5, NULL);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLOROP, D3DTOP_ADD);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_TEXCOORDINDEX, 5);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLORARG1, D3DTA_DIFFUSE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAOP,   D3DTOP_ADD);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAARG1, D3DTA_TFACTOR | D3DTA_COMPLEMENT);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
+
+			DX8Wrapper::Set_DX8_Texture(6, NULL);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLOROP, D3DTOP_MODULATE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_TEXCOORDINDEX, 6);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLORARG1, D3DTA_TFACTOR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLORARG2, D3DTA_TFACTOR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
+
+			DX8Wrapper::Set_DX8_Texture(7, NULL);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_TEXCOORDINDEX, 7);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLORARG1, D3DTA_TFACTOR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLORARG2, D3DTA_TFACTOR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
+		}
+		else
+		{
+  			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
+
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
+		}
+	}
+}
+
+
+/******************************************************************************
+						LightMapTerrainTextureClass
+******************************************************************************/
+//-----------------------------------------------------------------------------
+//         Public Functions
+//-----------------------------------------------------------------------------
+
+//=============================================================================
+// LightMapTerrainTextureClass::LightMapTerrainTextureClass
+//=============================================================================
+/** Constructor. Calls parent constructor to load the .tga texture. */
+//=============================================================================
+LightMapTerrainTextureClass::LightMapTerrainTextureClass(AsciiString name, MipCountType mipLevelCount) :
+TextureClass(name.isEmpty()?"TSNoiseUrb.tga":name.str(),name.isEmpty()?"TSNoiseUrb.tga":name.str(), mipLevelCount )
+{
+	Get_Filter().Set_Min_Filter(TextureFilterClass::FILTER_TYPE_BEST);
+	Get_Filter().Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_BEST);
+	Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_REPEAT);
+	Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_REPEAT);
+}
+
+#define STRETCH_FACTOR ((float)(1/(63.0*MAP_XY_FACTOR/2))) /* covers 63/2 tiles */
+
+//=============================================================================
+// LightMapTerrainTextureClass::Apply
+//=============================================================================
+/** Sets the texture as the current D3D texture, and does some custom setup.
+The LightMapTerrainTextureClass may be applied by itself, or with the
+CloudMapTerrainTextureClass.  This may be applied in either single pass,
+as the second texture in the pipe,
+or multipass.  If stage==0, we are doing multipass and we set up the pipe
+for a single texture.  If stage==1, then we are doing a single pass, and we
+set up the pipe so that we blend onto the cloud map texture in stage 0.
+Also, texture is mapped using the x/y coordinates of the map, saving us
+yet another set of uv coordinates.
+(standard D3D setup, but beyond the scope of W3D). */
+//=============================================================================
+void LightMapTerrainTextureClass::Apply(unsigned int stage)
+{
+	TextureClass::Apply(stage);
+#if 0 // obsolete [4/1/2003]
+	// Do the base apply.
+	/* previous setup */
+	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+	}
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+	// Disable 3rd stage just in case.
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+	// Now setup the texture pipeline.
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG2, D3DTA_CURRENT );
+	if (stage == 0) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
+		//Disable second stage
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+	}
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+	// Two output coordinates are used.
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+	Matrix4x4 curView;
+	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+
+	D3DXMATRIX inv;
+	float det;
+	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+	D3DXMATRIX scale;
+	D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
+	inv *=scale;
+	if (stage==0) {
+		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&inv));
+	}	if (stage==1) {
+		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, *((Matrix4x4*)&inv));
+	}
+
+
+	if (stage==0) {
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_DESTCOLOR);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
+	}
+#endif
+}
+
+
+
+
+
+
+
+
+
+/******************************************************************************
+						AlphaEdgeTextureClass
+******************************************************************************/
+//-----------------------------------------------------------------------------
+//         Public Functions
+//-----------------------------------------------------------------------------
+
+/**
+* AlphaEdgeTextureClass - Generates the alpha edge blending for terrain.
+*
+*/
+AlphaEdgeTextureClass::AlphaEdgeTextureClass( int height, MipCountType mipLevelCount) :
+//	TextureClass("EdgingTemplate.tga","EdgingTemplate.tga", mipLevelCount )
+	TextureClass(TEXTURE_WIDTH, height, WW3D_FORMAT_A8R8G8B8, mipLevelCount )
+{
+
+}
+
+int AlphaEdgeTextureClass::update256(WorldHeightMap *htMap)
+{
+	return 1;
+}
+
+int AlphaEdgeTextureClass::update(WorldHeightMap *htMap)
+{
+	// D3DTexture is our texture;
+
+	IDirect3DSurface8 *surface_level;
+	D3DSURFACE_DESC surface_desc;
+	D3DLOCKED_RECT locked_rect;
+	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0, &surface_level));
+	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
+	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
+
+	Int tilePixelExtent = TILE_PIXEL_EXTENT; // blend tiles are 1/4 tiles.
+//	Int tilesPerRow = surface_desc.Width / (tilePixelExtent+8);
+
+//	Int numRows = surface_desc.Height/(tilePixelExtent+8);
+
+	if (surface_desc.Format == D3DFMT_A8R8G8B8) {
+#if 1
+#if 1
+		Int cellX, cellY;
+		for (cellX = 0; (UnsignedInt)cellX < surface_desc.Width; cellX++) {
+			for (cellY = 0; cellY < surface_desc.Height; cellY++) {
+				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(cellY*surface_desc.Width+cellX)*4;
+				pBGR[2] = 255-cellY/2;
+				pBGR[0] = cellX/2;
+				pBGR[3] = cellX/2;  // alpha.
+				pBGR[3] = 128;  // alpha.
+			}
+		}
+#endif
+#if 1
+		Int tileNdx;
+		Int pixelBytes = 4;
+		for (tileNdx=0; tileNdx < htMap->m_numEdgeTiles; tileNdx++) {
+			TileData *pTile = htMap->getEdgeTile(tileNdx);
+			if (!pTile) continue;
+			ICoord2D position = pTile->m_tileLocationInTexture;
+			if (position.x<=0) continue; // all real edge offsets start at 4.  jba.
+			Int i,j;
+			Int column = position.x;
+			for (j=0; j<tilePixelExtent; j++) {
+				Int row = position.y+j;
+				UnsignedByte *pBGR = htMap->getEdgeTile(tileNdx)->getRGBDataForWidth(tilePixelExtent);
+				pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
+				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
+							(row)*surface_desc.Width*pixelBytes;
+				pBGRX += column*pixelBytes;
+
+				for (i=0; i<tilePixelExtent; i++) {
+					pBGRX[0] = pBGR[0];  //r
+					pBGRX[1] = pBGR[1];	//g
+					pBGRX[2] = pBGR[2];	//b
+					if (pBGR[0]==0 && pBGR[1]==0 && pBGR[2]==0) {
+						pBGRX[3] = 0x80;
+					} else if (pBGR[0]==0xff && pBGR[1]==0xff && pBGR[2]==0xff) {
+						pBGRX[3] = 0x00;
+					}	else {
+						pBGRX[3] = 0xff;
+					}
+
+					pBGRX += pixelBytes;
+					pBGR += TILE_BYTES_PER_PIXEL;
+				}
+			}
+		}
+#endif
+#endif
+	}
+	surface_level->UnlockRect();
+	surface_level->Release();
+	DX8_ErrorCode(D3DXFilterTexture(Peek_D3D_Texture(), NULL, 0, D3DX_FILTER_BOX));
+	return(surface_desc.Height);
+}
+
+void AlphaEdgeTextureClass::Apply(unsigned int stage)
+{
+	// Do the base apply.
+	TextureClass::Apply(stage);
+#if 0 // obsolete [4/1/2003]
+
+	if (TheGlobalData && (TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex)) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+	}
+	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+	}
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+	// Now setup the texture pipeline.
+	if (stage==0) {
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1,   D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 1 );
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+	} else if (stage==1) {
+		// Drawing texture through the mask.
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1,   D3DTA_CURRENT );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_CURRENT );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1,   D3DTA_CURRENT );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2,   D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG2 );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1 );
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_ONE);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
+
+	}
+#endif
+}
+
+
+/******************************************************************************
+						CloudMapTerrainTextureClass
+******************************************************************************/
+//-----------------------------------------------------------------------------
+//         Public Functions
+//-----------------------------------------------------------------------------
+
+//=============================================================================
+// CloudMapTerrainTextureClass::CloudMapTerrainTextureClass
+//=============================================================================
+/** Constructor. Calls parent constructor to load the .tga texture, and sets
+up the "sliding" parameters for the clouds to slide over the terrain. */
+//=============================================================================
+//@todo - Allow adjustment of the cloud slide rate, and lose the hard coded "cloudmap.tga"
+CloudMapTerrainTextureClass::CloudMapTerrainTextureClass(MipCountType mipLevelCount) :
+	TextureClass("TSCloudMed.tga","TSCloudMed.tga", mipLevelCount )
+{
+	Get_Filter().Set_Mip_Mapping( TextureFilterClass::FILTER_TYPE_FAST );
+	m_xSlidePerSecond = -0.02f;
+	m_ySlidePerSecond =  1.50f * m_xSlidePerSecond;
+	m_curTick = 0;
+	m_xOffset = 0;
+	m_yOffset = 0;
+
+}
+
+//=============================================================================
+// CloudMapTerrainTextureClass::Apply
+//=============================================================================
+/** Sets the texture as the current D3D texture, and does some custom setup.
+The CloudMapTerrainTextureClass may be applied by itself, or with the
+LightMapTerrainTexture.  This may be applied in either single pass,
+as the first texture in the pipe with LightMapTerrainTextureClass as the
+second stage of the pape, or multipass.  We setup for stage 0, assuming that
+we are the only texture, as LightMapTerrainTexture will adjust for multitexture
+if it is applied to stage 1.
+Also, texture is mapped using the x/y coordinates of the map, saving us
+yet another set of uv coordinates.
+(standard D3D setup, but beyond the scope of W3D). */
+//=============================================================================
+void CloudMapTerrainTextureClass::Apply(unsigned int stage)
+{
+
+
+	// Do the base apply.
+	TextureClass::Apply(stage);
+#if 0   // obsolete
+	/* previous setup */
+	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+	}
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+	// Now setup the texture pipeline.
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+	// Two output coordinates are used.
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+	Matrix4x4 curView;
+	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+
+	D3DXMATRIX inv;
+	float det;
+	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+	D3DXMATRIX scale;
+	D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
+	inv *=scale;
+	D3DXMATRIX offset;
+
+	Int delta = m_curTick;
+	m_curTick = ::GetTickCount();
+	delta = m_curTick-delta;
+	m_xOffset += m_xSlidePerSecond*delta/1000;
+	m_yOffset += m_ySlidePerSecond*delta/1000;
+
+	if (m_xOffset > 1) m_xOffset -= 1;
+	if (m_yOffset > 1) m_yOffset -= 1;
+	if (m_xOffset < -1) m_xOffset += 1;
+	if (m_yOffset < -1) m_yOffset += 1;
+
+
+	D3DXMatrixTranslation(&offset, m_xOffset, m_yOffset,0);
+
+	inv *= offset;
+
+	if (stage==0) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&inv));
+
+		// Disable 3rd stage just in case.
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_DESTCOLOR);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
+	}	else if (stage==1) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_CURRENT );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
+
+		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, *((Matrix4x4*)&inv));
+	}
+#endif
+}
+
+//=============================================================================
+// CloudMapTerrainTextureClass::restore
+//=============================================================================
+/** Cleans up any custom settings to the texturing pipeline that may not be
+understood by w3d. */
+//=============================================================================
+void CloudMapTerrainTextureClass::restore(void)
+{
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 0 );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
+
+
+	if (TheGlobalData && !TheGlobalData->m_multiPassTerrain)
+	{
+		///@todo: Remove 8-Stage Nvidia hack after drivers are fixed.
+		//This method is a backdoor specific to Nvidia based cards.  It will fail on
+		//other hardware.  Allows single pass blend of 2 textures and post modulate diffuse.
+		Int i;
+		for (i=0; i<8; i++) {
+			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_COLOROP, D3DTOP_DISABLE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_TEXCOORDINDEX, i);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_COLORARG1, D3DTA_TEXTURE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_ALPHAOP,   D3DTOP_DISABLE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
+
+			DX8Wrapper::Set_DX8_Texture(i, NULL);
+		}
+	}
+}
+
+/******************************************************************************
+						ScorchTextureClass
+******************************************************************************/
+//-----------------------------------------------------------------------------
+//         Public Functions
+//-----------------------------------------------------------------------------
+
+//=============================================================================
+// ScorchTextureClass::ScorchTextureClass
+//=============================================================================
+/** Constructor. Calls parent constructor to load the .tga texture. */
+//=============================================================================
+/// @todo - get "EXScorch01.tga" from not hard coded location.
+ScorchTextureClass::ScorchTextureClass(MipCountType mipLevelCount) :
+	TextureClass("EXScorch01.tga","EXScorch01.tga", mipLevelCount )
+// Hack to disable texture reduction.
+//	TextureClass("EXScorch01.tga","EXScorch01.tga", mipLevelCount,WW3D_FORMAT_UNKNOWN,true,false)
+{
+}
+
+//=============================================================================
+// ScorchTextureClass::Apply
+//=============================================================================
+/** Sets the texture as the current D3D texture, and does some custom setup.
+The ScorchTextureClass is applied by iteself, as it's mesh is a subset of the
+terrain mesh.
+(standard D3D setup, but beyond the scope of W3D). */
+//=============================================================================
+void ScorchTextureClass::Apply(unsigned int stage)
+{
+	// Do the base apply.
+	TextureClass::Apply(stage);
+	// Setup bilinear or trilinear filtering as specified in global data.
+	if (TheGlobalData && (TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex)) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+	}
+	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+	}
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+	// Now setup the texture pipeline.
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+}
+
+
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/TileData.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/TileData.cpp
new file mode 100644
index 00000000000..605f209b22a
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/TileData.cpp
@@ -0,0 +1,107 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// TileData.cpp
+// Class to handle tile data.
+// Author: John Ahlquist, April 2001
+
+#include "W3DDevice/GameClient/TileData.h"
+#include "W3DDevice/GameClient/WorldHeightMap.h"
+
+
+
+//
+// TileData - no destructor.
+//
+
+//
+// TileData - create a new texture tile .
+//
+TileData::TileData()
+{
+
+}
+
+#define TILE_PIXEL_EXTENT_MIP1 32
+#define TILE_PIXEL_EXTENT_MIP2 16
+#define TILE_PIXEL_EXTENT_MIP3 8
+#define TILE_PIXEL_EXTENT_MIP4 4
+#define TILE_PIXEL_EXTENT_MIP5 2
+#define TILE_PIXEL_EXTENT_MIP6 1
+
+Bool TileData::hasRGBDataForWidth(Int width)
+{
+	if (width == TILE_PIXEL_EXTENT) return(true);
+	if (width == TILE_PIXEL_EXTENT_MIP1) return(true);
+	if (width == TILE_PIXEL_EXTENT_MIP2) return(true);
+	if (width == TILE_PIXEL_EXTENT_MIP3) return(true);
+	if (width == TILE_PIXEL_EXTENT_MIP4) return(true);
+	if (width == TILE_PIXEL_EXTENT_MIP5) return(true);
+	if (width == TILE_PIXEL_EXTENT_MIP6) return(true);
+	return(false);
+}
+
+UnsignedByte * TileData::getRGBDataForWidth(Int width)
+{
+	// default
+	if (width == TILE_PIXEL_EXTENT_MIP1) return(m_tileDataMip32);
+	if (width == TILE_PIXEL_EXTENT_MIP2) return(m_tileDataMip16);
+	if (width == TILE_PIXEL_EXTENT_MIP3) return(m_tileDataMip8);
+	if (width == TILE_PIXEL_EXTENT_MIP4) return(m_tileDataMip4);
+	if (width == TILE_PIXEL_EXTENT_MIP5) return(m_tileDataMip2);
+	if (width == TILE_PIXEL_EXTENT_MIP6) return(m_tileDataMip1);
+	return(m_tileData);
+}
+
+void TileData::updateMips(void)
+{
+	doMip(m_tileData, TILE_PIXEL_EXTENT, m_tileDataMip32);
+	doMip(m_tileDataMip32, TILE_PIXEL_EXTENT_MIP1, m_tileDataMip16);
+	doMip(m_tileDataMip16, TILE_PIXEL_EXTENT_MIP2, m_tileDataMip8);
+	doMip(m_tileDataMip8, TILE_PIXEL_EXTENT_MIP3, m_tileDataMip4);
+	doMip(m_tileDataMip4, TILE_PIXEL_EXTENT_MIP4, m_tileDataMip2);
+	doMip(m_tileDataMip2, TILE_PIXEL_EXTENT_MIP5, m_tileDataMip1);
+}
+
+
+void TileData::doMip(UnsignedByte *pHiRes, Int hiRow, UnsignedByte *pLoRes)
+{
+	Int i, j;
+	for (i=0; i<hiRow; i+=2) {
+		for (j=0; j<hiRow; j+=2) {
+			Int pxl;
+			Int ndx = (j*hiRow+i)*TILE_BYTES_PER_PIXEL;
+			Int loNdx = (j/2)*(hiRow/2) + (i/2);
+			loNdx *= TILE_BYTES_PER_PIXEL;
+			Int p;
+			for (p=0; p<TILE_BYTES_PER_PIXEL; p++,ndx++,loNdx++) {
+				pxl = pHiRes[ndx] + pHiRes[ndx+TILE_BYTES_PER_PIXEL] + pHiRes[ndx+TILE_BYTES_PER_PIXEL*hiRow] + pHiRes[ndx+TILE_BYTES_PER_PIXEL*hiRow+TILE_BYTES_PER_PIXEL] +2;
+				pxl /= 4;
+				pLoRes[loNdx] = pxl;
+			}
+		}
+	}
+
+}
+
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp
similarity index 90%
rename from GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp
rename to Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp
index 670f1fc9ba2..fe936811b86 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DPropBuffer.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,13 +43,12 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/W3DPropBuffer.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <assetmgr.h>
+#include "Common/GameUtility.h"
 #include "Common/Geometry.h"
 #include "Common/PerfTimer.h"
 #include "Common/Player.h"
@@ -64,17 +63,12 @@
 #include "W3DDevice/GameClient/BaseHeightMap.h"
 #include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
 
 //-----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -96,7 +90,7 @@ void W3DPropBuffer::cull(CameraClass * camera)
 
 
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -106,10 +100,7 @@ void W3DPropBuffer::cull(CameraClass * camera)
 //=============================================================================
 W3DPropBuffer::~W3DPropBuffer(void)
 {
-	Int i;
-	for (i=0; i<MAX_TYPES; i++) {
-		REF_PTR_RELEASE(m_propTypes[i].m_robj);
-	}
+	clearAllProps();
 	REF_PTR_RELEASE(m_light);
 	REF_PTR_RELEASE(m_propShroudMaterialPass);
 }
@@ -122,9 +113,9 @@ for the props. */
 //=============================================================================
 W3DPropBuffer::W3DPropBuffer(void)
 {
-	memset(this, sizeof(W3DPropBuffer), 0);
 	m_initialized = false;
-	clearAllProps();
+	m_numProps = 0;
+	m_numPropTypes = 0;
 	m_light = NEW_REF( LightClass, (LightClass::DIRECTIONAL) );
 	m_propShroudMaterialPass = NEW_REF(W3DShroudMaterialPassClass,());
 	m_initialized = true;
@@ -141,13 +132,16 @@ W3DPropBuffer::W3DPropBuffer(void)
 //=============================================================================
 void W3DPropBuffer::clearAllProps(void)
 {
-	m_numProps=0;
 	Int i;
-	for (i=0; i<MAX_TYPES; i++) {
+	for (i=0; i<m_numPropTypes; i++) {
 		REF_PTR_RELEASE(m_propTypes[i].m_robj);
 		m_propTypes[i].m_robjName.clear();
 	}
+	for (i=0; i<m_numProps; i++) {
+		REF_PTR_RELEASE(m_props[i].m_robj);
+	}
 	m_numPropTypes = 0;
+	m_numProps = 0;
 }
 
 //=============================================================================
@@ -158,17 +152,17 @@ void W3DPropBuffer::clearAllProps(void)
 Int W3DPropBuffer::addPropType(const AsciiString &modelName)
 {
 	if (m_numPropTypes>=MAX_TYPES) {
-		DEBUG_CRASH(("Too many kinds of props in map.  Reduce kinds of props, or raise prop limit. jba.")); 
+		DEBUG_CRASH(("Too many kinds of props in map.  Reduce kinds of props, or raise prop limit. jba."));
 		return 0;
 	}
 
 	m_propTypes[m_numPropTypes].m_robj = WW3DAssetManager::Get_Instance()->Create_Render_Obj(modelName.str());
 	if (m_propTypes[m_numPropTypes].m_robj==NULL) {
-		DEBUG_CRASH(("Unable to find model for prop %s\n", modelName.str()));
+		DEBUG_CRASH(("Unable to find model for prop %s", modelName.str()));
 		return -1;
 	}
 	m_propTypes[m_numPropTypes].m_robjName = modelName;
-	
+
 	SphereClass bounds = m_propTypes[m_numPropTypes].m_robj->Get_Bounding_Sphere();
 	m_propTypes[m_numPropTypes].m_bounds = bounds;
 	m_numPropTypes++;
@@ -184,10 +178,10 @@ ALPINE, DECIDUOUS and SHRUB. */
 void W3DPropBuffer::addProp(Int id, Coord3D location, Real angle,Real scale, const AsciiString &modelName)
 {
 	if (m_numProps >= MAX_PROPS) {
-		return;  
+		return;
 	}
 	if (!m_initialized) {
-		return;  
+		return;
 	}
 	Int propType = -1;
 	Int i;
@@ -282,7 +276,7 @@ void W3DPropBuffer::removePropsForConstruction(const Coord3D* pos, const Geometr
 {
 	// Just iterate all trees, as even non-collidable ones get removed. jba. [7/11/2003]
 	Int i;
-	for (i=0; i<m_numProps; i++) {				
+	for (i=0; i<m_numProps; i++) {
 		if (m_props[i].m_robj == NULL) {
 			continue; // already deleted.
 		}
@@ -297,7 +291,7 @@ void W3DPropBuffer::removePropsForConstruction(const Coord3D* pos, const Geometr
 			m_props[i].bounds.Center = Vector3(0,0,0);
 			m_props[i].bounds.Radius = 1;
 			m_anythingChanged = true;
-		} 
+		}
 	}
 }
 
@@ -355,7 +349,7 @@ void W3DPropBuffer::drawProps(RenderInfoClass &rinfo)
 			m_light->Set_Transform(mtx);
 			lightEnv.Add_Light(*m_light);
 	}
-	
+
 	rinfo.light_environment = &lightEnv;
 	for	(i=0; i<m_numProps; i++) {
 		if (!m_props[i].visible) {
@@ -369,7 +363,7 @@ void W3DPropBuffer::drawProps(RenderInfoClass &rinfo)
 			m_props[i].ss = OBJECTSHROUD_CLEAR;
 		}
 		if (m_props[i].ss == OBJECTSHROUD_INVALID) {
-			Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+			const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
 			m_props[i].ss = ThePartitionManager->getPropShroudStatusForPlayer(localPlayerIndex, &m_props[i].location);
 		}
 		if (m_props[i].ss >= OBJECTSHROUD_SHROUDED) {
@@ -396,8 +390,8 @@ void W3DPropBuffer::drawProps(RenderInfoClass &rinfo)
 // ------------------------------------------------------------------------------------------------
 void W3DPropBuffer::crc( Xfer *xfer )
 {
-	// empty. jba [8/11/2003]	
-}  // end CRC
+	// empty. jba [8/11/2003]
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer
@@ -413,13 +407,13 @@ void W3DPropBuffer::xfer( Xfer *xfer )
 	xfer->xferVersion( &version, currentVersion );
 
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void W3DPropBuffer::loadPostProcess( void )
 {
-	// empty. jba [8/11/2003]	
-}  // end loadPostProcess
+	// empty. jba [8/11/2003]
+}
 
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
new file mode 100644
index 00000000000..6ae6394e28f
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
@@ -0,0 +1,3729 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DShaderManager.cpp ////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:   RTS3
+//
+// File name: W3DShaderManager.cpp
+//
+// Created:   Mark Wilczynski, August 2001
+//
+// Desc:      Perform tests on currently selected WW3D/D3D device to determine
+//			  which of our rendering features are supported.  The system allows
+//			  setting up a few custom shaders that are selected based on video
+//			  card features.
+//
+//			  To add a new shader to the system:
+//			  0) Add your shader to the ShaderTypes enum
+//			  1) Create shader using W3DShaderInterface
+//			  2) Repeat step 1 for any alternate shaders
+//			  3) Create list of alternate shaders sorted by order of preference.
+//				 The first shader which passes hardware validation will be selected.
+//			  4) Add list from step 3) to MasterShaderList[].
+//
+//-----------------------------------------------------------------------------
+
+#include "dx8wrapper.h"
+#include "assetmgr.h"
+#include "Lib/BaseType.h"
+#include "Common/file.h"
+#include "Common/FileSystem.h"
+#include "W3DDevice/GameClient/W3DShaderManager.h"
+#include "W3DDevice/GameClient/W3DShroud.h"
+#include "W3DDevice/GameClient/HeightMap.h"
+#include "W3DDevice/GameClient/W3DCustomScene.h"
+#include "W3DDevice/GameClient/W3DSmudge.h"
+#include "GameClient/View.h"
+#include "GameClient/CommandXlat.h"
+#include "GameClient/Display.h"
+#include "GameClient/Water.h"
+#include "GameLogic/GameLogic.h"
+#include "Common/GlobalData.h"
+#include "Common/GameLOD.h"
+#include "d3dx8tex.h"
+#include "dx8caps.h"
+
+
+// Turn this on to turn off pixel shaders. jba[4/3/2003]
+#define do_not_DISABLE_PIXEL_SHADERS 1
+
+/** Interface definition for custom shaders we define in our app.  These shaders can perform more complex
+	operations than those allowed in the WW3D2 shader system.
+*/
+class W3DShaderInterface
+{
+public:
+	Int getNumPasses(void) {return m_numPasses;};	///<return number of passes needed for this shader
+	virtual Int set(Int pass) {return TRUE;};		///<setup shader for the specified rendering pass.
+	 ///do any custom resetting necessary to bring W3D in sync.
+	virtual void reset(void) {
+		ShaderClass::Invalidate();
+		DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
+		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);};
+	virtual Int init(void) = 0;			///<perform any one time initialization and validation
+	virtual Int shutdown(void) { return TRUE;};			///<release resources used by shader
+protected:
+	Int m_numPasses;						///<number of passes to complete shader
+};
+
+//this table will contain custom versions of each shader tuned for specific video card and user options.
+static W3DFilterInterface *W3DFilters[FT_MAX];
+static W3DShaderInterface *W3DShaders[W3DShaderManager::ST_MAX];
+static Int W3DShadersPassCount[W3DShaderManager::ST_MAX];	//number of passes for each of the above shaders
+TextureClass *W3DShaderManager::m_Textures[8];
+W3DShaderManager::ShaderTypes W3DShaderManager::m_currentShader;
+FilterTypes W3DShaderManager::m_currentFilter=FT_NULL_FILTER; ///< Last filter that was set.
+Int W3DShaderManager::m_currentShaderPass;
+ChipsetType W3DShaderManager::m_currentChipset;
+GraphicsVenderID W3DShaderManager::m_currentVendor;
+__int64 W3DShaderManager::m_driverVersion;
+
+Bool W3DShaderManager::m_renderingToTexture = false;
+IDirect3DSurface8 *W3DShaderManager::m_oldRenderSurface=NULL;	///<previous render target
+IDirect3DTexture8 *W3DShaderManager::m_renderTexture=NULL;		///<texture into which rendering will be redirected.
+IDirect3DSurface8 *W3DShaderManager::m_newRenderSurface=NULL;	///<new render target inside m_renderTexture
+IDirect3DSurface8 *W3DShaderManager::m_oldDepthSurface=NULL;	///<previous depth buffer surface
+/*===========================================================================================*/
+/*=========      Screen Shaders	=============================================================*/
+/*===========================================================================================*/
+
+class ScreenDefaultFilter : public W3DFilterInterface
+{
+public:
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
+	virtual Bool postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
+	virtual Bool setup(FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
+protected:
+	virtual Int set(FilterModes mode);		///<setup shader for the specified rendering pass.
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+};
+
+ScreenDefaultFilter screenDefaultFilter;
+
+///Default filter that just renders screen to off-screen texture and then copies it the the screen.
+///Useful because we added some full-time unit effects (microwave tank smudge) to Generals MD that need access
+///to the background as a texture.  This filter makes that texture always available for these effects.
+W3DFilterInterface *ScreenDefaultFilterList[]=
+{
+	&screenDefaultFilter,
+	NULL
+};
+
+Int ScreenDefaultFilter::init(void)
+{
+	if (!W3DShaderManager::canRenderToTexture()) {
+		// Have to be able to render to texture.
+		return FALSE;
+	}
+
+	//Can render to texture, but we don't know if it can read and write to the same texture.
+	//Since there is no D3D caps bit to tell you this, we will just hard-code some specific
+	//cards that we know should work.
+
+	Int res;
+
+	if ((res=W3DShaderManager::getChipset()) != DC_UNKNOWN)
+	{
+		if ( res >=	DC_GEFORCE2)
+		{
+			//Check if their driver is newer than what we tested for this vendor
+/*			if (TheGameLODManager)
+			{
+				if (TheGameLODManager->getTestedDriverVersion(W3DShaderManager::getCurrentVendor()) < W3DShaderManager::getCurrentDriverVersion())
+					return FALSE;
+			}*/
+		}
+	}
+
+	W3DFilters[FT_VIEW_DEFAULT]=&screenDefaultFilter;
+
+	return TRUE;
+}
+
+Bool ScreenDefaultFilter::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
+{
+	//Right now this filter is only used for smudges, so don't bother if none are present.
+	if (TheSmudgeManager)
+	{	if (((W3DSmudgeManager *)TheSmudgeManager)->getSmudgeCountLastFrame() == 0)
+			return FALSE;
+	}
+	W3DShaderManager::startRenderToTexture();
+	return true;
+}
+
+Bool ScreenDefaultFilter::postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
+{
+	IDirect3DTexture8 * tex =	W3DShaderManager::endRenderToTexture();
+	DEBUG_ASSERTCRASH(tex, ("Require rendered texture."));
+	if (!tex) return false;
+	if (!set(mode)) return false;
+
+	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
+
+	struct _TRANS_LIT_TEX_VERTEX {
+		D3DXVECTOR4 p;
+		DWORD color;   // diffuse color
+		float	u;
+		float	v;
+	} v[4];
+
+	Int xpos, ypos, width, height;
+
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
+	TheTacticalView->getOrigin(&xpos,&ypos);
+	width=TheTacticalView->getWidth();
+	height=TheTacticalView->getHeight();
+
+	//bottom right
+	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
+	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
+	//top right
+	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
+	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
+	//bottom left
+	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
+	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
+	//top left
+	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
+	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
+	v[0].color = 0xffffffff;
+	v[1].color = 0xffffffff;
+	v[2].color = 0xffffffff;
+	v[3].color = 0xffffffff;
+
+	//draw polygons like this is very inefficient but for only 2 triangles, it's
+	//not worth bothering with index/vertex buffers.
+	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
+
+	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
+
+	reset();
+	return true;
+}
+
+Int ScreenDefaultFilter::set(FilterModes mode)
+{
+	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+	DX8Wrapper::Set_Material(vmat);
+	REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
+	DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
+	DX8Wrapper::Set_Texture(0,NULL);
+	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
+	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+
+	return true;
+}
+
+void ScreenDefaultFilter::reset(void)
+{
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
+	DX8Wrapper::Invalidate_Cached_Render_States();
+}
+
+/*=========  ScreenBWFilter	=============================================================*/
+///converts viewport to black & white.
+
+Int ScreenBWFilter::m_fadeFrames;
+Int ScreenBWFilter::m_curFadeFrame;
+Real ScreenBWFilter::m_curFadeValue;
+Int ScreenBWFilter::m_fadeDirection;
+
+ScreenBWFilter screenBWFilter;
+ScreenBWFilterDOT3 screenBWFilterDOT3;	//slower version for older cards without pixel shaders.
+
+///List of different BW shader implementations in order of preference
+W3DFilterInterface *ScreenBWFilterList[]=
+{
+	&screenBWFilter,
+	&screenBWFilterDOT3,	//slower version for older cards without pixel shaders.
+	NULL
+};
+
+Int ScreenBWFilter::init(void)
+{
+	Int res;
+	HRESULT hr;
+
+	m_dwBWPixelShader = NULL;
+	m_curFadeFrame = 0;
+
+	if (!W3DShaderManager::canRenderToTexture()) {
+		// Have to be able to render to texture.
+		return false;
+	}
+
+	if ((res=W3DShaderManager::getChipset()) != 0)
+	{
+		if (res >= DC_GENERIC_PIXEL_SHADER_1_1)
+		{
+			//this shader needs some assets that need to be loaded
+			//shader decleration
+			DWORD Declaration[]=
+			{
+				(D3DVSD_STREAM(0)),
+				(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
+				(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
+				(D3DVSD_REG(2, D3DVSDT_FLOAT2)), //  Texture Coordinates
+				(D3DVSD_END())
+			};
+
+			//Monochrome pixel shader.
+			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\monochrome.pso", &Declaration[0], 0, false, &m_dwBWPixelShader);
+			if (FAILED(hr))
+				return FALSE;
+
+			W3DFilters[FT_VIEW_BW_FILTER]=&screenBWFilter;
+
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+Bool ScreenBWFilter::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
+{
+	skipRender = false;
+	W3DShaderManager::startRenderToTexture();
+	return true;
+}
+
+Bool ScreenBWFilter::postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
+{
+	IDirect3DTexture8 * tex =	W3DShaderManager::endRenderToTexture();
+	DEBUG_ASSERTCRASH(tex, ("Require rendered texture."));
+	if (!tex) return false;
+	if (!set(mode)) return false;
+
+	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
+
+	struct _TRANS_LIT_TEX_VERTEX {
+		D3DXVECTOR4 p;
+		DWORD color;   // diffuse color
+		float	u;
+		float	v;
+	} v[4];
+
+	Int xpos, ypos, width, height;
+
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
+	TheTacticalView->getOrigin(&xpos,&ypos);
+	width=TheTacticalView->getWidth();
+	height=TheTacticalView->getHeight();
+
+	//bottom right
+	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
+	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
+	//top right
+	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
+	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
+	//bottom left
+	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
+	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
+	//top left
+	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
+	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
+	v[0].color = 0xffffffff;
+	v[1].color = 0xffffffff;
+	v[2].color = 0xffffffff;
+	v[3].color = 0xffffffff;
+
+	//draw polygons like this is very inefficient but for only 2 triangles, it's
+	//not worth bothering with index/vertex buffers.
+	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
+
+	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
+
+	reset();
+	return true;
+}
+
+Int ScreenBWFilter::set(FilterModes mode)
+{
+	HRESULT hr;
+
+	if (mode > FM_NULL_MODE)
+	{	//rendering a quad with redirected rendering surface tinted by pixel shader
+
+		if (m_fadeDirection > 0)
+		{	//turning effect on
+			m_curFadeFrame++;
+			Int fade = m_curFadeFrame;
+
+			if (fade<m_fadeFrames)
+			{
+				m_curFadeValue = (Real)fade/(Real)m_fadeFrames;
+			}
+			else
+			{
+				m_curFadeFrame = 0;
+				m_curFadeValue = 1.0f;
+				m_fadeDirection = 0;
+			}
+		}
+		else
+		if (m_fadeDirection < 0)
+		{	//turning effect off
+			m_curFadeFrame++;
+			Int fade = m_curFadeFrame;
+			if (fade<m_fadeFrames)
+			{
+				m_curFadeValue = 1.0f - (Real)fade/(Real)m_fadeFrames;
+			}
+			else
+			{	m_curFadeValue = 0.0f;
+				TheTacticalView->setViewFilterMode(FM_NULL_MODE);
+				TheTacticalView->setViewFilter(FT_NULL_FILTER);
+				m_curFadeFrame = 0;
+				m_fadeDirection = 0;
+			}
+		}
+
+		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+		DX8Wrapper::Set_Material(vmat);
+		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
+		DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
+		DX8Wrapper::Set_Texture(0,NULL);
+		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
+		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+
+		hr=DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBWPixelShader);
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(0,   D3DXVECTOR4(0.3f, 0.59f, 0.11f, 1.0f), 1);
+
+		D3DXVECTOR4	color(1.0f,1.0f,1.0f,1.0f);	//multiply color
+
+		if (mode == FM_VIEW_BW_BLACK_AND_WHITE)
+		{	//back & white mode
+			color.x=1.0f;
+			color.y=1.0f;
+			color.z=1.0f;
+		}
+		if (mode == FM_VIEW_BW_RED_AND_WHITE)
+		{	//red is on
+			color.x = 1.0f;
+			color.y = 0.0f;
+			color.z = 0.0f;
+			//inverse red is on
+			//red is on
+//			color.x = 0.0f;
+//			color.y = 1.0f;
+//			color.z = 1.0f;
+		}
+		if (mode == FM_VIEW_BW_GREEN_AND_WHITE)
+		{
+			color.x = 0.0f;
+			color.y = 1.0f;
+			color.z = 0.0f;
+		}
+
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(1,   color, 1);
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(2,	D3DXVECTOR4(m_curFadeValue, m_curFadeValue, m_curFadeValue, 1.0f), 1);
+/*		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(2,   D3DXVECTOR4(150.0f/255.0f, 150.0f/255.0f, 150.0f/255.0f, 0.0f), 1);
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(3,   D3DXVECTOR4((765.0f/450.0f)/3, (765.0f/450.0f)/3, (765.0f/450.0f)/3, 1.0f), 1);
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(4,   D3DXVECTOR4(0.5f, 0.5f, 0.5f, 0), 1);
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(5,   D3DXVECTOR4((60.0f)/255.0f, (60.0f)/255.0f, (60.0f)/255.0f, 0), 1);
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(6,   D3DXVECTOR4((157.0f)/255.0f, (157.0f)/255.0f, (157.0f)/255.0f, 0), 1);
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(7,   D3DXVECTOR4((30.0f)/255.0f, (30.0f)/255.0f, (30.0f)/255.0f, 0), 1);
+*/
+		return true;
+	}
+	return false;
+}
+
+void ScreenBWFilter::reset(void)
+{
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
+	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(0);	//turn off pixel shader
+	DX8Wrapper::Invalidate_Cached_Render_States();
+}
+
+Int ScreenBWFilter::shutdown(void)
+{
+	if (m_dwBWPixelShader)
+		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBWPixelShader);
+
+	m_dwBWPixelShader=NULL;
+
+	return TRUE;
+}
+
+/**Alternate version of the above filter which does not require pixel shaders - good for older cards*/
+Int ScreenBWFilterDOT3::init(void)
+{
+	Int res;
+
+	m_curFadeFrame = 0;
+
+	if (!W3DShaderManager::canRenderToTexture()) {
+		// Have to be able to render to texture.
+		return false;
+	}
+
+	if ((res=W3DShaderManager::getChipset()) != 0)
+	{
+			W3DFilters[FT_VIEW_BW_FILTER]=&screenBWFilterDOT3;
+			return TRUE;
+	}
+	return FALSE;
+}
+
+Bool ScreenBWFilterDOT3::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
+{
+	skipRender = false;
+	W3DShaderManager::startRenderToTexture();
+	return true;
+}
+
+Bool ScreenBWFilterDOT3::postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
+{
+	IDirect3DTexture8 * tex =	W3DShaderManager::endRenderToTexture();
+	DEBUG_ASSERTCRASH(tex, ("Require rendered texture."));
+	if (!tex) return false;
+	if (!set(mode)) return false;
+
+	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
+
+	struct _TRANS_LIT_TEX_VERTEX {
+		D3DXVECTOR4 p;
+		DWORD color;   // diffuse color
+		float	u;
+		float	v;
+	} v[4];
+
+	Int xpos, ypos, width, height;
+
+	TheTacticalView->getOrigin(&xpos,&ypos);
+	width=TheTacticalView->getWidth();
+	height=TheTacticalView->getHeight();
+
+	//bottom right
+	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
+	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
+	//top right
+	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
+	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
+	//bottom left
+	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
+	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
+	//top left
+	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
+	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
+
+	DWORD currentFade=(((Int)((1.0f-m_curFadeValue) * 255.0f))<<24) | 0x00ffffff;	//store alpha value
+
+	v[0].color = currentFade;
+	v[1].color = currentFade;
+	v[2].color = currentFade;
+	v[3].color = currentFade;
+
+	//draw polygons like this is very inefficient but for only 2 triangles, it's
+	//not worth bothering with index/vertex buffers.
+	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
+
+	//Draw B&W version first
+	if (DX8Wrapper::Get_Current_Caps()->Support_Dot3())
+	{	//Override W3D states with customizations for grayscale
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_TEXTUREFACTOR, 0x80A5CA8E);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG0, D3DTA_TFACTOR | D3DTA_ALPHAREPLICATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_TFACTOR | D3DTA_ALPHAREPLICATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_MULTIPLYADD);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_CURRENT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_TFACTOR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP, D3DTOP_DOTPRODUCT3);
+	}
+	else
+	{	//doesn't have DOT3 blend mode so fake it another way.
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_TEXTUREFACTOR, 0x60606060);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_TFACTOR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
+	}
+
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
+
+	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
+
+	//Draw normal view blended by current fade level
+	ShaderClass::Invalidate();	//reset DOT3 blend from above.
+	ShaderClass shader=ShaderClass::_PresetAlphaShader;
+	shader.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);
+	DX8Wrapper::Set_Shader(shader);
+	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+	//replace texture alpha with vertex alpha
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG2);
+
+	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
+
+	reset();
+	return true;
+}
+
+Int ScreenBWFilterDOT3::set(FilterModes mode)
+{
+	if (mode > FM_NULL_MODE)
+	{	//rendering a quad with redirected rendering surface tinted by pixel shader
+
+		if (m_fadeDirection > 0)
+		{	//turning effect on
+			m_curFadeFrame++;
+			Int fade = m_curFadeFrame;
+
+			if (fade<m_fadeFrames)
+			{
+				m_curFadeValue = (Real)fade/(Real)m_fadeFrames;
+			}
+			else
+			{
+				m_curFadeFrame = 0;
+				m_curFadeValue = 1.0f;
+				m_fadeDirection = 0;
+			}
+		}
+		else
+		if (m_fadeDirection < 0)
+		{	//turning effect off
+			m_curFadeFrame++;
+			Int fade = m_curFadeFrame;
+			if (fade<m_fadeFrames)
+			{
+				m_curFadeValue = 1.0f - (Real)fade/(Real)m_fadeFrames;
+			}
+			else
+			{	m_curFadeValue = 0.0f;
+				TheTacticalView->setViewFilterMode(FM_NULL_MODE);
+				TheTacticalView->setViewFilter(FT_NULL_FILTER);
+				m_curFadeFrame = 0;
+				m_fadeDirection = 0;
+			}
+		}
+
+		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+		DX8Wrapper::Set_Material(vmat);
+		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
+		DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
+		DX8Wrapper::Set_Texture(0,NULL);
+		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
+		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+
+		return true;
+	}
+	return false;
+}
+
+void ScreenBWFilterDOT3::reset(void)
+{
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
+	DX8Wrapper::Invalidate_Cached_Render_States();
+}
+
+Int ScreenBWFilterDOT3::shutdown(void)
+{
+	return TRUE;
+}
+
+/*=========  ScreenCrossFadeFilter	=============================================================*/
+///Fades screen between 2 different views of the scene with both being visible at once.
+
+Int ScreenCrossFadeFilter::m_fadeFrames;
+Int ScreenCrossFadeFilter::m_curFadeFrame;
+Real ScreenCrossFadeFilter::m_curFadeValue;
+Int ScreenCrossFadeFilter::m_fadeDirection;
+TextureClass *ScreenCrossFadeFilter::m_fadePatternTexture=NULL;
+Bool ScreenCrossFadeFilter::m_skipRender = FALSE;
+
+ScreenCrossFadeFilter screenCrossFadeFilter;
+
+///List of different BW shader implementations in order of preference
+///@todo: Add a version that doesn't require pixel shader
+W3DFilterInterface *ScreenCrossFadeFilterList[]=
+{
+	&screenCrossFadeFilter,
+	NULL
+};
+
+Int ScreenCrossFadeFilter::init(void)
+{
+	if (!TheDisplay)
+		return FALSE;	//effect is useless without a view so no point initializing for the WB, etc.
+
+	m_curFadeFrame = 0;
+
+	if (!W3DShaderManager::canRenderToTexture())
+		// Have to be able to render to texture.
+		return FALSE;
+
+	//Load an alpha mask texture that will mix foreground/background views.
+	m_fadePatternTexture=WW3DAssetManager::Get_Instance()->Get_Texture("exmask_g.tga");
+	if (!m_fadePatternTexture)
+		return FALSE;
+	m_fadePatternTexture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+	m_fadePatternTexture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+	m_fadePatternTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
+
+	W3DFilters[FT_VIEW_CROSSFADE]=&screenCrossFadeFilter;
+
+	return TRUE;
+}
+
+Bool ScreenCrossFadeFilter::updateFadeLevel(void)
+{
+	if (m_fadeDirection > 0)
+	{	//turning effect on
+		m_curFadeFrame++;
+		Int fade = m_curFadeFrame;
+
+		if (fade<m_fadeFrames)
+		{
+			m_curFadeValue = (Real)fade/(Real)m_fadeFrames;
+		}
+		else
+		{
+			m_curFadeFrame = 0;
+			m_curFadeValue = 1.0f;
+			m_fadeDirection = 0;
+			return false;
+		}
+	}
+	else
+	if (m_fadeDirection < 0)
+	{	//turning effect off
+		Int fade = m_curFadeFrame;
+		if (fade<m_fadeFrames)
+		{
+			m_curFadeValue = 1.0f - (Real)fade/(Real)m_fadeFrames;
+			m_curFadeFrame++;
+		}
+		else
+		{	m_curFadeValue = 0.0f;
+			TheTacticalView->setViewFilterMode(FM_NULL_MODE);
+			TheTacticalView->setViewFilter(FT_NULL_FILTER);
+			m_curFadeFrame = 0;
+			m_fadeDirection = 0;
+			return false;
+		}
+	}
+	return true;
+}
+
+Bool ScreenCrossFadeFilter::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
+{
+	if (updateFadeLevel())
+	{	//if fade has not completed
+		W3DShaderManager::startRenderToTexture();
+		scenePassMode=SCENE_PASS_ALPHA_MASK;
+		skipRender = false;
+		m_skipRender=true;	//tell the postRender function not to draw into framebuffer yet.
+		return true;
+	}
+	//fade must have completed
+	return true;
+}
+
+Bool ScreenCrossFadeFilter::postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
+{
+	IDirect3DTexture8 * tex;
+
+	if (m_skipRender)
+	{
+		//don't render anything to frame buffer because we still need to draw the new scene
+		//that we're fading into.  Okay to render on the next call.
+		m_skipRender = false;
+		doExtraRender = TRUE;
+		tex =	W3DShaderManager::endRenderToTexture();
+		return true;
+	}
+
+	tex=W3DShaderManager::getRenderTexture();
+
+	DEBUG_ASSERTCRASH(tex, ("Require last rendered texture."));
+	if (!tex) return false;
+	if (!set(mode)) return false;
+
+	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
+
+	struct _TRANS_LIT_TEX_VERTEX {
+		D3DXVECTOR4 p;
+		DWORD color;   // diffuse color
+		float	u;
+		float	v;
+		float	u1;
+		float	v1;
+	} v[4];
+
+	Int xpos, ypos, width, height;
+	Real radius = 0.0f;
+
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
+	if (mode == FM_VIEW_CROSSFADE_CIRCLE)
+	{	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1,m_fadePatternTexture->Peek_D3D_Texture());
+		//Use the current fade level to scale the mask texture, for other modes the texture
+		//comes pre-scaled so doesn't require uv scaling.
+		radius = (1.0f-m_curFadeValue)*2.0f;
+		if (radius <= 0)
+			radius = 0.01f;
+		radius = 0.5f/radius;
+	}
+
+	TheTacticalView->getOrigin(&xpos,&ypos);
+	width=TheTacticalView->getWidth();
+	height=TheTacticalView->getHeight();
+
+/*	Real radius = (1.0f-m_curFadeValue);
+	if (radius <= 0)
+		radius = 0.01f;
+	radius = 25.0f-radius*24.75f;
+*/
+	//bottom right
+	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
+	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
+	v[0].u1 = 0.5f+radius;	v[0].v1 = 0.5f+radius;
+	//top right
+	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
+	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
+	v[1].u1 = 0.5f+radius;	v[1].v1 = 0.5f-radius;
+	//bottom left
+	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
+	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
+	v[2].u1 = 0.5f-radius;	v[2].v1 = 0.5f+radius;
+	//top left
+	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
+	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
+	v[3].u1 = 0.5f-radius;	v[3].v1 = 0.5f-radius;
+
+	DWORD diffuse = 0xffffffff;//((Int)((m_curFadeValue) * 255.0f) << 24) | 0x00ffffff;	//store alpha value in vertex diffuse
+
+	v[0].color = diffuse;
+	v[1].color = diffuse;
+	v[2].color = diffuse;
+	v[3].color = diffuse;
+
+	//draw polygons like this is very inefficient but for only 2 triangles, it's
+	//not worth bothering with index/vertex buffers.
+	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX2);
+
+//		m_pDev->SetTextureStageState(0,D3DTSS_MAGFILTER,D3DTEXF_POINT);
+//		m_pDev->SetTextureStageState(0,D3DTSS_MINFILTER,D3DTEXF_POINT);
+
+	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
+
+	reset();
+	return true;
+}
+
+Int ScreenCrossFadeFilter::set(FilterModes mode)
+{
+	if (mode > FM_NULL_MODE)
+	{	//rendering a quad with redirected rendering surface
+		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+		DX8Wrapper::Set_Material(vmat);
+		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
+		DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaShader);
+		DX8Wrapper::Set_Texture(0,NULL);
+		DX8Wrapper::Set_Texture(1,NULL);
+		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+
+		if (mode == FM_VIEW_CROSSFADE_CIRCLE)
+		{	//cross-fading using circle mask stored in stage 1
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1 );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_MIPFILTER, D3DTEXF_NONE);
+		}
+
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
+
+		return true;
+	}
+	return false;
+}
+
+void ScreenCrossFadeFilter::reset(void)
+{
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
+	DX8Wrapper::Invalidate_Cached_Render_States();
+}
+
+Int ScreenCrossFadeFilter::shutdown(void)
+{
+	REF_PTR_RELEASE(m_fadePatternTexture);
+
+	return TRUE;
+}
+
+/*=========  ScreenMotionBlurFilter	=============================================================*/
+///applies motion blur to viewport.
+
+ScreenMotionBlurFilter screenMotionBlurFilter;
+
+Coord3D ScreenMotionBlurFilter::m_zoomToPos;
+Bool ScreenMotionBlurFilter::m_zoomToValid = false;
+
+ScreenMotionBlurFilter::ScreenMotionBlurFilter():
+m_decrement(false),
+m_maxCount(0),
+m_lastFrame(0),
+m_skipRender(false)
+{
+}
+///List of different motion blur implementations in order of preference
+W3DFilterInterface *ScreenMotionBlurFilterList[]=
+{
+	&screenMotionBlurFilter,
+	NULL
+};
+
+Int ScreenMotionBlurFilter::init(void)
+{
+	if (!W3DShaderManager::canRenderToTexture()) {
+		// Have to be able to render to texture.
+		return false;
+	}
+	W3DFilters[FT_VIEW_MOTION_BLUR_FILTER]=this;
+	return true;
+}
+
+Bool ScreenMotionBlurFilter::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
+{
+	skipRender = m_skipRender;
+	W3DShaderManager::startRenderToTexture();
+	return true;
+}
+
+Bool ScreenMotionBlurFilter::postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
+{
+	IDirect3DTexture8 * tex =	W3DShaderManager::endRenderToTexture();
+	DEBUG_ASSERTCRASH(tex, ("Require rendered texture."));
+	if (!tex) return false;
+	if (!set(mode)) return false;
+
+	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
+
+	Bool continueEffect = true;
+	struct _TRANS_LIT_TEX_VERTEX {
+		D3DXVECTOR4 p;
+		DWORD color;   // diffuse color
+		float	u;
+		float	v;
+	} v[4];
+
+	Int xpos, ypos, width, height;
+
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
+	TheTacticalView->getOrigin(&xpos,&ypos);
+	width=TheTacticalView->getWidth();
+	height=TheTacticalView->getHeight();
+
+	//bottom right
+	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
+	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
+	//top right
+	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
+	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
+	//bottom left
+	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
+	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
+	//top left
+	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
+	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
+	v[0].color = 0xffffffff;
+	v[1].color = 0xffffffff;
+	v[2].color = 0xffffffff;
+	v[3].color = 0xffffffff;
+
+
+	if (m_additive) {
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ONE);
+	} else {
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
+	}
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
+	//draw polygons like this is very inefficient but for only 2 triangles, it's
+	//not worth bothering with index/vertex buffers.
+	DX8Wrapper::Apply_Render_State_Changes();
+	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
+
+	Coord2D center;
+	center.x = 0.5f;
+	center.y = 0.5f;
+	Bool pan = false;
+	if (mode>=FM_VIEW_MB_PAN_ALPHA) {
+		Real len = sqrt(scrollDelta.x*scrollDelta.x + scrollDelta.y*scrollDelta.y);
+		//center.x += 0.5f * (scrollDelta.x/len);
+		center.y -= 0.5f; // * (scrollDelta.y/len);
+		m_decrement = false;
+		m_maxCount = (len*200*m_panFactor/(Real)DEFAULT_PAN_FACTOR);
+		if (m_maxCount<m_panFactor/2)
+			m_maxCount = m_panFactor/2;
+		if (m_maxCount>m_panFactor)
+			m_maxCount=m_panFactor;
+		pan = true;
+		m_priorDelta = scrollDelta;
+	} else if (mode == FM_VIEW_MB_END_PAN_ALPHA) {
+		Real len = sqrt(m_priorDelta.x*m_priorDelta.x + m_priorDelta.y*m_priorDelta.y);
+		center.x += 0.5f * (m_priorDelta.x/len);
+		center.y -= 0.5f * (m_priorDelta.y/len);
+		m_decrement = false;
+		m_maxCount--;
+		if (m_maxCount<2) {
+			continueEffect = false;
+		}
+		pan = true;
+	}
+
+
+	m_skipRender = false;
+	if (!pan && m_lastFrame != TheGameLogic->getFrame()) {
+		if (m_decrement) {
+			m_maxCount-=COUNT_STEP;
+			if (m_maxCount<1) {
+				m_decrement = false;
+				continueEffect = false;
+			}	else {
+				m_skipRender = true;
+			}
+		} else {
+			m_maxCount+=COUNT_STEP;
+			if (m_maxCount>=MAX_COUNT) {
+				m_decrement = true;
+				if (m_doZoomTo && m_zoomToValid) {
+					TheTacticalView->lookAt(&m_zoomToPos);
+				} else {
+					continueEffect = false;
+				}
+			}	else {
+				m_skipRender = true;
+			}
+		}
+	}
+	Int	 i, j;
+	if (!pan) {
+		for (i=0; i<4; i++) {
+			Real factor = 1.0f - (m_maxCount/(Real)MAX_COUNT)*0.90f;
+			factor = sqrt(factor);
+			v[i].u = ((v[i].u-center.x)*factor) + center.x;
+			v[i].v = ((v[i].v-center.y)*factor) + center.y;
+		}
+	}
+	pDev->SetTextureStageState(0,D3DTSS_ALPHAARG1, D3DTA_CURRENT);
+	pDev->SetTextureStageState(0,D3DTSS_ALPHAARG2, D3DTA_TEXTURE);
+	pDev->SetTextureStageState(0,D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
+	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
+
+	DX8Wrapper::Apply_Render_State_Changes();
+	{
+		Int limit = m_maxCount;
+		if (m_maxCount>30) limit = 30;
+		for (j=0; j<limit; j++) {
+			for (i=0; i<4; i++) {
+				Real factor = 0.99f;
+				if (m_additive) factor = 0.98f;
+				Int alpha = 0x15;
+				if (m_additive) {
+					alpha = 0x09;
+					if (m_maxCount>limit) {
+						alpha += (m_maxCount-limit)/5;
+					}
+					if (m_maxCount==MAX_COUNT) alpha += 60;
+				}
+				v[i].color = (alpha<<24)|0x00ffffff; //
+				if (pan) {
+					v[i].u = ((v[i].u-center.x)*(factor+.006)) + center.x;
+					v[i].v = ((v[i].v-center.y)*factor) + center.y;
+				} else {
+					v[i].u = ((v[i].u-center.x)*factor) + center.x;
+					v[i].v = ((v[i].v-center.y)*factor) + center.y;
+				}
+			}
+			pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
+
+		}
+	}
+	m_lastFrame = TheGameLogic->getFrame();
+	if (pan){
+		m_skipRender = false;
+	}
+	reset();
+	if (!continueEffect) {
+		m_zoomToValid = false;
+	}
+	return continueEffect;
+}
+
+Bool ScreenMotionBlurFilter::setup(FilterModes mode)
+{
+
+	m_additive = false;
+
+	if (mode == FM_VIEW_MB_IN_AND_OUT_SATURATE ||
+			mode == FM_VIEW_MB_IN_SATURATE ||
+			mode == FM_VIEW_MB_OUT_SATURATE) {
+		m_additive = true;
+	}
+
+	m_doZoomTo = false;
+	if (mode == FM_VIEW_MB_IN_AND_OUT_SATURATE ||
+			mode == FM_VIEW_MB_IN_AND_OUT_ALPHA ) {
+		m_doZoomTo = true;
+	}
+	if (mode >= FM_VIEW_MB_PAN_ALPHA)	{
+		m_panFactor = (int)mode - FM_VIEW_MB_PAN_ALPHA;
+		if (m_panFactor<1) m_panFactor = DEFAULT_PAN_FACTOR;
+	}
+	m_skipRender = false;
+	if (mode != FM_VIEW_MB_END_PAN_ALPHA)
+		m_maxCount = 0;
+	m_decrement = false;
+	m_skipRender = false;
+	switch (mode) {
+		case FM_VIEW_MB_OUT_SATURATE:
+		case FM_VIEW_MB_OUT_ALPHA:
+			m_maxCount = MAX_COUNT;
+			m_decrement = TRUE;
+			break;
+	}
+	return true;
+}
+
+Int ScreenMotionBlurFilter::set(FilterModes mode)
+{
+	if (mode > FM_NULL_MODE)
+	{	//rendering a quad with redirected rendering surface motion blurred
+
+		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+		DX8Wrapper::Set_Material(vmat);
+		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
+		DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
+		DX8Wrapper::Set_Texture(0,NULL);
+		DX8Wrapper::Set_Texture(1,NULL);
+		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
+		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+	}
+	return TRUE;
+}
+
+void ScreenMotionBlurFilter::reset(void)
+{
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
+	DX8Wrapper::Invalidate_Cached_Render_States();
+}
+
+Int ScreenMotionBlurFilter::shutdown(void)
+{
+	return TRUE;
+}
+
+/*===========================================================================================*/
+/*=========      Shroud Shaders	=============================================================*/
+/*===========================================================================================*/
+
+///Shroud layer rendering shader
+class ShroudTextureShader : public W3DShaderInterface
+{
+	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	Int m_stageOfSet;
+} shroudTextureShader;
+
+///List of different shroud shader implementations in order of preference
+W3DShaderInterface *ShroudShaderList[]=
+{
+	&shroudTextureShader,
+	NULL
+};
+
+//#define SHROUD_STRETCH_FACTOR	(1.0f/MAP_XY_FACTOR)	//1 texel per heightmap cell width
+
+Int ShroudTextureShader::init(void)
+{
+	W3DShaders[W3DShaderManager::ST_SHROUD_TEXTURE]=&shroudTextureShader;
+	W3DShadersPassCount[W3DShaderManager::ST_SHROUD_TEXTURE]=1;
+
+	return TRUE;
+}
+
+//Setup a texture projection in the given stage that applies our shroud.
+Int ShroudTextureShader::set(Int stage)
+{
+	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
+	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+	DX8Wrapper::Set_Material(vmat);
+	REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
+	DX8Wrapper::Set_Texture(stage, W3DShaderManager::getShaderTexture(0));	//shroud always stored in texture 0
+
+	if (stage == 0)
+	{
+#if defined(RTS_DEBUG)
+	if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
+		DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaSpriteShader);
+	else
+		DX8Wrapper::Set_Shader(ShaderClass::_PresetMultiplicativeSpriteShader);
+#else
+	DX8Wrapper::Set_Shader(ShaderClass::_PresetMultiplicativeSpriteShader);
+#endif
+	}
+	DX8Wrapper::Apply_Render_State_Changes();
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_EQUAL);
+
+	//We need to scale so shroud texel stretches over one full terrain cell.  Each texel
+	//is 1/128 the size of full texture. (assuming 128x128 vid-mem texture).
+	W3DShroud *shroud;
+	if ((shroud=TheTerrainRenderObject->getShroud()) != 0)
+	{	///@todo: All this code really only need to be done once per camera/view.  Find a way to optimize it out.
+		D3DXMATRIX inv;
+		float det;
+
+		Matrix4x4 curView;
+		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+		D3DXMATRIX scale,offset;
+
+		//We need to make all world coordinates be relative to the heightmap data origin since that
+		//is where the shroud begins.
+
+		float xoffset = 0;
+		float yoffset = 0;
+		Real width=shroud->getCellWidth();
+		Real height=shroud->getCellHeight();
+
+		if (TheTerrainRenderObject->getMap())
+		{	//subtract origin position from all coordinates.  Origin is shifted by 1 cell width/height to allow for unused border texels.
+			xoffset = -(float)shroud->getDrawOriginX() + width;
+			yoffset = -(float)shroud->getDrawOriginY() + height;
+		}
+
+		D3DXMatrixTranslation(&offset, xoffset, yoffset,0);
+
+		width = 1.0f/(width*shroud->getTextureWidth());
+		height = 1.0f/(height*shroud->getTextureHeight());
+		D3DXMatrixScaling(&scale, width, height, 1);
+		*((D3DXMATRIX *)&curView) = (inv * offset) * scale;
+		DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), *((Matrix4x4*)&curView));
+	}
+	m_stageOfSet=stage;
+	return TRUE;
+}
+
+void ShroudTextureShader::reset(void)
+{
+	DX8Wrapper::Set_Texture(m_stageOfSet,NULL);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_LESSEQUAL);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(m_stageOfSet,  D3DTSS_TEXCOORDINDEX, m_stageOfSet);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(m_stageOfSet,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+}
+
+///Shroud layer rendering shader
+class FlatShroudTextureShader : public W3DShaderInterface
+{
+	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	Int m_stageOfSet;
+} flatShroudTextureShader;
+
+///List of different shroud shader implementations in order of preference
+W3DShaderInterface *FlatShroudShaderList[]=
+{
+	&flatShroudTextureShader,
+	NULL
+};
+
+//#define SHROUD_STRETCH_FACTOR	(1.0f/MAP_XY_FACTOR)	//1 texel per heightmap cell width
+
+Int FlatShroudTextureShader::init(void)
+{
+	W3DShaders[W3DShaderManager::ST_FLAT_SHROUD_TEXTURE]=&flatShroudTextureShader;
+	W3DShadersPassCount[W3DShaderManager::ST_FLAT_SHROUD_TEXTURE]=1;
+
+	return TRUE;
+}
+
+//Setup a texture projection in the given stage that applies our shroud.
+Int FlatShroudTextureShader::set(Int stage)
+{
+	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
+	if (stage < 2)
+		DX8Wrapper::Set_Texture(stage, W3DShaderManager::getShaderTexture(stage));
+	else	//stages larger than 1 are not supported by W3D so set them directly
+		DX8Wrapper::Set_DX8_Texture(stage, W3DShaderManager::getShaderTexture(stage)->Peek_D3D_Texture());
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG2, D3DTA_CURRENT );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+	//DX8Wrapper::Apply_Render_State_Changes();
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+	//We need to scale so shroud texel stretches over one full terrain cell.  Each texel
+	//is 1/128 the size of full texture. (assuming 128x128 vid-mem texture).
+	W3DShroud *shroud;
+	if ((shroud=TheTerrainRenderObject->getShroud()) != 0)
+	{	///@todo: All this code really only need to be done once per camera/view.  Find a way to optimize it out.
+		D3DXMATRIX inv;
+		float det;
+
+		Matrix4x4 curView;
+		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+		D3DXMATRIX scale,offset;
+
+		//We need to make all world coordinates be relative to the heightmap data origin since that
+		//is where the shroud begins.
+
+		float xoffset = 0;
+		float yoffset = 0;
+		Real width=shroud->getCellWidth();
+		Real height=shroud->getCellHeight();
+
+		if (TheTerrainRenderObject->getMap())
+		{	//subtract origin position from all coordinates.  Origin is shifted by 1 cell width/height to allow for unused border texels.
+			xoffset = -(float)shroud->getDrawOriginX() + width;
+			yoffset = -(float)shroud->getDrawOriginY() + height;
+		}
+
+		D3DXMatrixTranslation(&offset, xoffset, yoffset,0);
+
+		width = 1.0f/(width*shroud->getTextureWidth());
+		height = 1.0f/(height*shroud->getTextureHeight());
+		D3DXMatrixScaling(&scale, width, height, 1);
+		*((D3DXMATRIX *)&curView) = (inv * offset) * scale;
+		DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), *((Matrix4x4*)&curView));
+	}
+	m_stageOfSet=stage;
+	return TRUE;
+}
+
+void FlatShroudTextureShader::reset(void)
+{
+	if (m_stageOfSet < MAX_TEXTURE_STAGES)
+		DX8Wrapper::Set_Texture(m_stageOfSet,NULL);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_LESSEQUAL);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(m_stageOfSet,  D3DTSS_TEXCOORDINDEX, m_stageOfSet);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(m_stageOfSet,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+}
+
+///Mask layer rendering shader
+class MaskTextureShader : public W3DShaderInterface
+{
+	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+} maskTextureShader;
+
+///List of different shroud shader implementations in order of preference
+W3DShaderInterface *MaskShaderList[]=
+{
+	&maskTextureShader,
+	NULL
+};
+
+Int MaskTextureShader::init(void)
+{
+	W3DShaders[W3DShaderManager::ST_MASK_TEXTURE]=&maskTextureShader;
+	W3DShadersPassCount[W3DShaderManager::ST_MASK_TEXTURE]=1;
+
+	return TRUE;
+}
+
+Int MaskTextureShader::set(Int pass)
+{
+	Real fadeLevel=ScreenCrossFadeFilter::getCurrentFadeValue();
+
+	//Use the current fade level to scale the mask texture
+	Real radius = (1.0f-fadeLevel)*2.0f;
+	if (radius <= 0)
+		radius = 0.01f;
+	radius = 0.5f/radius;
+
+	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
+	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+	DX8Wrapper::Set_Material(vmat);
+	REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
+
+	//For now we're always going to project the texture coming from the crossfade effect
+	DX8Wrapper::Set_Texture(0, ScreenCrossFadeFilter::getCurrentMaskTexture());
+	ShaderClass shader=ShaderClass::_PresetOpaqueShader;
+	shader.Set_Primary_Gradient(ShaderClass::GRADIENT_DISABLE);
+	DX8Wrapper::Set_Shader(shader);
+	DX8Wrapper::Apply_Render_State_Changes();
+	Matrix4x4 curView;
+	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+	D3DXMATRIX inv;
+	float det;
+
+	//Get inverse view matrix so we can transform camera space points back to world space
+	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+	D3DXMATRIX scale,offset,offsetTextureCenter;
+	Coord3D centerPos;
+
+	//Find center of projection (this should be returned from some other filter, etc. but
+	//for now assume terrain location at center of screen.
+	if (TheTacticalView)
+	{	Int xpos,ypos;
+
+		TheTacticalView->getOrigin(&xpos,&ypos);
+
+		ICoord2D screenPos;
+		screenPos.x=(Real)TheTacticalView->getWidth()*0.5f;
+		screenPos.y=(Real)TheTacticalView->getHeight()*0.5f;
+		TheTacticalView->screenToTerrain(&screenPos,&centerPos);
+	}
+
+	D3DXMatrixTranslation(&offset, -centerPos.x, -centerPos.y,0);
+
+	D3DXMatrixTranslation(&offsetTextureCenter, 0.5f, 0.5f, 0);	//shift coordinates so center of projection falls at uv 0.5,0.5
+
+	Real worldTexelWidth=(1.0f-fadeLevel)*25.0f;	//9 worked well for circle but weird shape requires more stretch to cover.
+	Real worldTexelHeight=(1.0f-fadeLevel)*25.0f;
+
+	///@todo: Fix this to work with non 128x128 textures.
+	if (worldTexelWidth != 0 && worldTexelHeight != 0)
+	{	Real widthScale = 1.0f/(worldTexelWidth*128.0f);
+		Real heightScale = 1.0f/(worldTexelHeight*128.0f);
+		D3DXMatrixScaling(&scale, widthScale, heightScale, 1);
+		*((D3DXMATRIX *)&curView) = ((inv * offset) * scale)*offsetTextureCenter;
+	}
+	else
+	{	D3DXMatrixScaling(&scale, 0, 0, 1);	//scaling by 0 will set uv coordinates to 0,0
+		*((D3DXMATRIX *)&curView) = ((inv * offset) * scale);
+	}
+
+	DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&curView));
+
+	return TRUE;
+}
+
+void MaskTextureShader::reset(void)
+{
+	DX8Wrapper::Set_Texture(0,NULL);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+}
+
+/*===========================================================================================*/
+/*=========      Terrain Shaders	=========================================================*/
+/*===========================================================================================*/
+
+///regular terrain shader that should work on all multi-texture video cards (slowest version)
+class TerrainShader2Stage : public W3DShaderInterface
+{
+public:
+	float m_xSlidePerSecond ;	 ///< How far the clouds move per second.
+	float m_ySlidePerSecond ;	 ///< How far the clouds move per second.
+	float m_xOffset;
+	float m_yOffset;
+
+	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+
+	void updateCloud();
+	void updateNoise1 (D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate=true);	///<generate the uv coordinates for Noise1 (i.e clouds)
+	void updateNoise2 (D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate=true);	///<generate the uv coordinates for Noise2 (i.e lightmap)
+} terrainShader2Stage;
+
+///regular terrain shader that should work on all multi-texture video cards (slowest version)
+class FlatTerrainShader2Stage : public W3DShaderInterface
+{
+public:
+	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+} flatTerrainShader2Stage;
+
+///regular terrain shader that should work on all multi-texture video cards (slowest version)
+class FlatTerrainShaderPixelShader : public W3DShaderInterface
+{
+public:
+	DWORD					m_dwBasePixelShader;	///<handle to terrain D3D pixel shader
+	DWORD					m_dwBaseNoise1PixelShader;	///<handle to terrain/single noise D3D pixel shader
+	DWORD					m_dwBaseNoise2PixelShader;	///<handle to terrain/double noise D3D pixel shader
+	DWORD					m_dwBase0PixelShader;	///<handle to terrain only pixel shader
+	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	virtual Int shutdown(void);			///<release resources used by shader
+} flatTerrainShaderPixelShader;
+
+///8 stage terrain shader which only works on certain Nvidia cards.
+class TerrainShader8Stage : public W3DShaderInterface
+{
+	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	virtual Int init(void);			///<perform any one time initialization and validation
+} terrainShader8Stage;
+
+//Offsets into constant register pool used by vertex shader
+#define CV_WORLDVIEWPROJ_0	0	//4 vectors for transform of world->clip space.
+
+///Pixel shader based terrain shader - fastest method for the newest cards.
+class TerrainShaderPixelShader : public W3DShaderInterface
+{
+	DWORD					m_dwBasePixelShader;	///<handle to terrain D3D pixel shader
+	DWORD					m_dwBaseNoise1PixelShader;	///<handle to terrain/single noise D3D pixel shader
+	DWORD					m_dwBaseNoise2PixelShader;	///<handle to terrain/double noise D3D pixel shader
+
+	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual Int shutdown(void);			///<release resources used by shader
+} terrainShaderPixelShader;
+
+///List of different terrain shader implementations in order of preference
+W3DShaderInterface *TerrainShaderList[]=
+{
+	&terrainShaderPixelShader,
+	&terrainShader8Stage,
+	&terrainShader2Stage,
+	NULL
+};
+
+///List of different terrain shader implementations in order of preference
+W3DShaderInterface *FlatTerrainShaderList[]=
+{
+	&flatTerrainShaderPixelShader,
+	&flatTerrainShader2Stage,
+	NULL
+};
+
+Int TerrainShader2Stage::init( void )
+{
+	//initialize settings for uv animated clouds
+	m_xSlidePerSecond = -0.02f;
+	m_ySlidePerSecond =  1.50f * m_xSlidePerSecond;
+	m_xOffset = 0;
+	m_yOffset = 0;
+
+	//no special device validation needed - anything in our min spec should handle this.
+
+	W3DShaders[W3DShaderManager::ST_TERRAIN_BASE]=&terrainShader2Stage;
+	W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE]=2;
+	W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=&terrainShader2Stage;
+	W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=3;
+	W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=&terrainShader2Stage;
+	W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=3;
+	W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=&terrainShader2Stage;
+	W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=3;
+
+	return TRUE;
+}
+
+void TerrainShader2Stage::reset(void)
+{
+	ShaderClass::Invalidate();
+
+	//Free references to textures
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
+}
+
+void TerrainShader2Stage::updateCloud()
+{
+	const float frame_time = WW3D::Get_Logic_Frame_Time_Seconds();
+	m_xOffset += m_xSlidePerSecond * frame_time;
+	m_yOffset += m_ySlidePerSecond * frame_time;
+
+	// This moves offsets towards zero when smaller -1.0 or larger 1.0
+	m_xOffset -= (Int)m_xOffset;
+	m_yOffset -= (Int)m_yOffset;
+}
+
+void TerrainShader2Stage::updateNoise1(D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate)
+{
+	#define STRETCH_FACTOR ((float)(1/(63.0*MAP_XY_FACTOR/2))) /* covers 63/2 tiles */
+
+	D3DXMATRIX scale;
+
+	D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
+	*destMatrix = *curViewInverse * scale;
+
+	D3DXMATRIX offset;
+	D3DXMatrixTranslation(&offset, m_xOffset, m_yOffset,0);
+	*destMatrix *= offset;
+}
+
+void TerrainShader2Stage::updateNoise2(D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate)
+{
+
+	D3DXMATRIX scale;
+
+	D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
+	*destMatrix = *curViewInverse * scale;
+}
+
+Int TerrainShader2Stage::set(Int pass)
+{
+	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
+	DX8Wrapper::Apply_Render_State_Changes();
+
+	if (TheGlobalData && (TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex)) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+	}
+	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	}
+
+	switch (pass)
+	{
+		case 0:
+			DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+
+			// Modulate the diffuse color with the texture as lighting comes from diffuse.
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
+			break;
+		case 1:
+			DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+
+			// Modulate the diffuse color with the texture as lighting comes from diffuse.
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 1 );
+			// Blend the result using the alpha. (came from diffuse mod texture)
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
+			// Disable stage 2.
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+			break;
+		case 2:
+			// Noise/cloud pass
+			Matrix4x4 curView;
+			DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+			//these states apply to all noise/cloud combination passes
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+			// Two output coordinates are used.
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+			//blend into frame buffer
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_DESTCOLOR);
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
+
+
+			D3DXMATRIX inv;
+			float det;
+
+			D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+			if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE12)
+			{
+				//setup cloud pass
+				DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
+
+				updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
+				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, curView);
+				//clouds always need bilinear filtering
+				DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+				DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+				//setup noise pass
+				DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
+
+				updateNoise2(((D3DXMATRIX*)&curView),&inv);
+				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
+				//noise always needs point/linear filtering.  Why point!?
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+				// Two output coordinates are used.
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+			}
+			else
+			{	//only 1 noise or cloud texture
+				// Now setup the texture pipeline.
+				if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE1)
+				{	//setup cloud pass
+					DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
+					updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
+					DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+					DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+				}
+				else
+				{
+					//setup noise pass
+					DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
+					updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
+					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
+					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+				}
+
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&curView));
+			}
+			break;
+	}
+
+	return TRUE;
+}
+
+Int TerrainShader8Stage::init( void )
+{
+	ChipsetType res;
+
+	//this shader will also use the 2Stage shader for some of the passes so initialize it too.
+	if (terrainShader2Stage.init() && (res=W3DShaderManager::getChipset()) >= DC_TNT && res <= DC_GEFORCE2)
+	{
+		W3DShaders[W3DShaderManager::ST_TERRAIN_BASE]=&terrainShader8Stage;
+		W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE]=1;
+		W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=&terrainShader8Stage;
+		W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=2;
+		W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=&terrainShader8Stage;
+		W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=2;
+		W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=&terrainShader8Stage;
+		W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=2;
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+Int TerrainShader8Stage::set(Int pass)
+{
+	if (pass == 0)
+	{
+		//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
+		DX8Wrapper::Apply_Render_State_Changes();
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+
+		if (TheGlobalData && (TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex)) {
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+		} else {
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_POINT);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+		}
+		if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+		} else {
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+		}
+
+		DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
+		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP, D3DTOP_ADD);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_DIFFUSE | D3DTA_COMPLEMENT | D3DTA_ALPHAREPLICATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_ADD);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TFACTOR | D3DTA_COMPLEMENT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
+
+		DX8Wrapper::Set_DX8_Texture(2, NULL);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_MODULATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, 2);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLORARG1, D3DTA_TEXTURE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLORARG2, D3DTA_TEXTURE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
+
+		DX8Wrapper::Set_DX8_Texture(3, NULL);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, 3);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLORARG1, D3DTA_DIFFUSE | 0 | D3DTA_ALPHAREPLICATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
+
+		DX8Wrapper::Set_DX8_Texture(4, NULL);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLOROP, D3DTOP_MODULATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_TEXCOORDINDEX, 4);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLORARG1, D3DTA_CURRENT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAARG1, D3DTA_CURRENT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
+
+		DX8Wrapper::Set_DX8_Texture(5, NULL);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLOROP, D3DTOP_ADD);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_TEXCOORDINDEX, 5);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLORARG1, D3DTA_DIFFUSE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAOP,   D3DTOP_ADD);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAARG1, D3DTA_TFACTOR | D3DTA_COMPLEMENT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
+
+		DX8Wrapper::Set_DX8_Texture(6, NULL);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLOROP, D3DTOP_MODULATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_TEXCOORDINDEX, 6);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLORARG1, D3DTA_TFACTOR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLORARG2, D3DTA_TFACTOR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
+
+		DX8Wrapper::Set_DX8_Texture(7, NULL);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_TEXCOORDINDEX, 7);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLORARG1, D3DTA_TFACTOR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLORARG2, D3DTA_TFACTOR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
+	}
+	else
+	{	//setup cloud noise/pass
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_DISABLE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLOROP, D3DTOP_DISABLE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
+		DX8Wrapper::Invalidate_Cached_Render_States();
+
+		terrainShader2Stage.set(2);
+	}
+	return TRUE;
+}
+
+void TerrainShader8Stage::reset(void)
+{
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLOROP, D3DTOP_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLOROP, D3DTOP_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
+
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
+	DX8Wrapper::Invalidate_Cached_Render_States();
+}
+
+Int TerrainShaderPixelShader::shutdown(void)
+{
+	if (m_dwBasePixelShader)
+		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBasePixelShader);
+
+	if (m_dwBaseNoise1PixelShader)
+		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise1PixelShader);
+
+	if (m_dwBaseNoise2PixelShader)
+		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise2PixelShader);
+
+	m_dwBasePixelShader=NULL;
+	m_dwBaseNoise1PixelShader=NULL;
+	m_dwBaseNoise2PixelShader=NULL;
+
+	return TRUE;
+}
+
+Int TerrainShaderPixelShader::init( void )
+{
+	Int res;
+#ifdef DISABLE_PIXEL_SHADERS
+	return false;
+#endif
+	//this shader will also use the 2Stage shader for some of the passes so initialize it too.
+	if (terrainShader2Stage.init() && (res=W3DShaderManager::getChipset()) >= DC_GENERIC_PIXEL_SHADER_1_1)
+	{
+		if (res >= DC_GENERIC_PIXEL_SHADER_1_1)
+		{
+			//this shader needs some assets that need to be loaded
+			//shader decleration
+			DWORD Declaration[]=
+			{
+				(D3DVSD_STREAM(0)),
+				(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
+				(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
+				(D3DVSD_REG(2, D3DVSDT_FLOAT2)), //  Texture Coordinates
+				(D3DVSD_REG(3, D3DVSDT_FLOAT2)), //  Texture Coordinates
+				(D3DVSD_END())
+			};
+
+			//base version which doesn't apply any noise textures.
+			HRESULT hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\terrain.pso", &Declaration[0], 0, false, &m_dwBasePixelShader);
+			if (FAILED(hr))
+				return FALSE;
+
+			//version which blends 1 noise texture.
+			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\terrainnoise.pso", &Declaration[0], 0, false, &m_dwBaseNoise1PixelShader);
+			if (FAILED(hr))
+				return FALSE;
+
+			//version which blends 2 noise textures.
+			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\terrainnoise2.pso", &Declaration[0], 0, false, &m_dwBaseNoise2PixelShader);
+			if (FAILED(hr))
+				return FALSE;
+
+			W3DShaders[W3DShaderManager::ST_TERRAIN_BASE]=&terrainShaderPixelShader;
+			W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=&terrainShaderPixelShader;
+			W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=&terrainShaderPixelShader;
+			W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=&terrainShaderPixelShader;
+			W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE]=1;
+			W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=1;
+			W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=1;
+			W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=1;
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+Int TerrainShaderPixelShader::set(Int pass)
+{
+	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
+	DX8Wrapper::Apply_Render_State_Changes();
+
+	//setup base pass
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+
+	//tell pixel shader which UV set to use for each stage
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1 );
+
+	if (TheGlobalData && (TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex)) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+	}
+	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	}
+
+	if (W3DShaderManager::getCurrentShader() >= W3DShaderManager::ST_TERRAIN_BASE_NOISE1)
+	{
+		Matrix4x4 curView;
+		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+		D3DXMATRIX inv;
+		float det;
+		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+		// Two output coordinates are used.
+		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+		if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE12)
+		{	//full shader
+			DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+			DX8Wrapper::_Get_D3D_Device8()->SetTexture(2, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
+			DX8Wrapper::_Get_D3D_Device8()->SetTexture(3, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
+			DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise2PixelShader);
+
+			DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+			DX8Wrapper::Set_DX8_Texture_Stage_State(3, D3DTSS_MINFILTER, D3DTEXF_POINT);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(3, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+			terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
+			DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, curView);
+
+			terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
+			DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE3, curView);
+
+			DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+			// Two output coordinates are used.
+			DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+		}
+		else
+		{	//single noise texture shader
+			DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise1PixelShader);
+
+			if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE1)
+			{	//cloud map
+				DX8Wrapper::_Get_D3D_Device8()->SetTexture(2, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
+				terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
+				DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+				DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+			}
+			else
+			{	//light map
+				DX8Wrapper::_Get_D3D_Device8()->SetTexture(2, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
+				terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
+				DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_POINT);
+				DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+			}
+			DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, curView);
+		}
+	}
+	else
+	{	//just base texturing
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBasePixelShader);
+	}
+
+	return TRUE;
+}
+
+void TerrainShaderPixelShader::reset(void)
+{
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(2,NULL);	//release reference to any texture
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,NULL);	//release reference to any texture
+
+	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(0);	//turn off pixel shader
+
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|2);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|3);
+
+
+	DX8Wrapper::Invalidate_Cached_Render_States();
+}
+
+///Cloud layer rendering shader - used for objects similar to terrain which only need the cloud layer.
+class CloudTextureShader : public W3DShaderInterface
+{
+	virtual Int set(Int stage);		///<setup shader for the specified rendering pass.
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	Int m_stageOfSet;
+} cloudTextureShader;
+
+///List of different cloud shader implementations in order of preference
+W3DShaderInterface *CloudShaderList[]=
+{
+	&cloudTextureShader,
+	NULL
+};
+
+Int CloudTextureShader::init(void)
+{
+	W3DShaders[W3DShaderManager::ST_CLOUD_TEXTURE]=&cloudTextureShader;
+	W3DShadersPassCount[W3DShaderManager::ST_CLOUD_TEXTURE]=1;
+
+	return TRUE;
+}
+
+/**Setup a certain texture stage to project our cloud texture*/
+Int CloudTextureShader::set(Int stage)
+{
+	Matrix4x4 curView;
+	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+	D3DXMATRIX inv;
+	float det;
+
+	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+	//Get a texture matrix that applies the current cloud position
+	terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv,false);	//update curView with texture matrix
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+	DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), curView);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG2, D3DTA_CURRENT );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
+
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(stage, W3DShaderManager::getShaderTexture(stage)->Peek_D3D_Texture());
+
+	m_stageOfSet=stage;
+	return TRUE;
+}
+
+void CloudTextureShader::reset(void)
+{
+	//Free reference to texture
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(m_stageOfSet, NULL);
+	//Turn off texture projection
+	DX8Wrapper::Set_DX8_Texture_Stage_State( m_stageOfSet, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( m_stageOfSet, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|m_stageOfSet);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( m_stageOfSet, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( m_stageOfSet, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+}
+
+/*===========================================================================================*/
+/*=========      Road Shaders	=========================================================*/
+/*===========================================================================================*/
+class RoadShaderPixelShader : public W3DShaderInterface
+{
+	DWORD					m_dwBaseNoise2PixelShader;	///<handle to road/double noise D3D pixel shader
+
+	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
+	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual Int shutdown(void);			///<release resources used by shader
+} roadShaderPixelShader;
+
+class RoadShader2Stage : public W3DShaderInterface
+{	friend class RoadShaderPixelShader;	//pixel shader version uses some of the same features.
+
+	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
+	virtual Int init(void);			///<perform any one time initialization and validation
+	virtual void reset(void);
+} roadShader2Stage;
+
+///List of different terrain shader implementations in order of preference
+W3DShaderInterface *RoadShaderList[]=
+{
+	&roadShaderPixelShader,
+	&roadShader2Stage,
+	NULL
+};
+
+Int RoadShaderPixelShader::shutdown(void)
+{
+	if (m_dwBaseNoise2PixelShader)
+		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise2PixelShader);
+
+	m_dwBaseNoise2PixelShader=NULL;
+
+	return TRUE;
+}
+
+Int RoadShaderPixelShader::init( void )
+{
+	Int res;
+
+	//this shader will also use the 2Stage shader for some of the passes so initialize it too.
+	if (roadShader2Stage.init() && (res=W3DShaderManager::getChipset()) >= DC_GENERIC_PIXEL_SHADER_1_1)
+	{
+		if (res >= DC_GENERIC_PIXEL_SHADER_1_1)
+		{
+			//this shader needs some assets that need to be loaded
+			//shader decleration
+			DWORD Declaration[]=
+			{
+				(D3DVSD_STREAM(0)),
+				(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
+				(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
+				(D3DVSD_REG(2, D3DVSDT_FLOAT2)), //  Texture Coordinates
+				(D3DVSD_END())
+			};
+
+			//version which blends 2 noise textures.
+			HRESULT hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\roadnoise2.pso", &Declaration[0], 0, false, &m_dwBaseNoise2PixelShader);
+			if (FAILED(hr))
+				return FALSE;
+
+			//Only set this shader for use in dual noise mode.  The 2Stage shader will take care of
+			//all the other modes.
+			W3DShaders[W3DShaderManager::ST_ROAD_BASE_NOISE12]=&roadShaderPixelShader;
+			W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE_NOISE12]=1;
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+Int RoadShaderPixelShader::set(Int pass)
+{
+	DX8Wrapper::Set_Texture(0,W3DShaderManager::getShaderTexture(0));
+	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
+	DX8Wrapper::Apply_Render_State_Changes();
+
+	//tell pixel shader which UV set to use for each stage
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
+
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_LESSEQUAL);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_LIGHTING, FALSE);
+
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);	//blend roads into terrain
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
+
+	Matrix4x4 curView;
+	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+	D3DXMATRIX inv;
+	float det;
+	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex)
+	{	DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	}
+	else
+	{	DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+	}
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+	// Two output coordinates are used.
+	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+	DX8Wrapper::Set_Texture(1,W3DShaderManager::getShaderTexture(1));
+	DX8Wrapper::Set_Texture(2,W3DShaderManager::getShaderTexture(2));
+
+	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise2PixelShader);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_POINT);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+	terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv, false);	//get texture projection matrix
+	DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
+
+	terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv, false);	//get texture projection matrix
+	DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, curView);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+	// Two output coordinates are used.
+	DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+	return TRUE;
+}
+
+void RoadShaderPixelShader::reset(void)
+{
+
+	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(0);	//turn off pixel shader
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|2);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|3);
+
+
+	DX8Wrapper::Invalidate_Cached_Render_States();
+}
+
+Int RoadShader2Stage::init( void )
+{
+	//no special device validation needed - anything in our min spec should handle this.
+	W3DShaders[W3DShaderManager::ST_ROAD_BASE]=&roadShader2Stage;
+	W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE]=1;
+	W3DShaders[W3DShaderManager::ST_ROAD_BASE_NOISE1]=&roadShader2Stage;
+	W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE_NOISE1]=1;
+	W3DShaders[W3DShaderManager::ST_ROAD_BASE_NOISE2]=&roadShader2Stage;
+	W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE_NOISE2]=1;
+	W3DShaders[W3DShaderManager::ST_ROAD_BASE_NOISE12]=&roadShader2Stage;
+	W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE_NOISE12]=2;
+
+	return TRUE;
+}
+
+Int RoadShader2Stage::set(Int pass)
+{
+	//First stage always contains base texture.
+	DX8Wrapper::Set_Texture(0,W3DShaderManager::getShaderTexture(0));
+	//Force system to apply world/view transforms.
+	DX8Wrapper::Apply_Render_State_Changes();
+
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_LESSEQUAL);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_LIGHTING, FALSE);
+
+	// Modulate the diffuse color with the texture as lighting comes from diffuse.
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE );
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);	//blend roads into terrain
+
+	if (pass == 0)
+	{
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
+
+		if (W3DShaderManager::getCurrentShader() >= W3DShaderManager::ST_ROAD_BASE_NOISE1)
+		{	//second texture unit will contain a noise pass
+			Matrix4x4 curView;
+			DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+			D3DXMATRIX inv;
+			float det;
+			D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+			if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex)
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+			else
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+
+			DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+			// Two output coordinates are used.
+			DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+			DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
+
+			if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_ROAD_BASE_NOISE12)
+			{	//full shader, apply noise 1 in pass 0.
+				DX8Wrapper::Set_Texture(1,W3DShaderManager::getShaderTexture(1));
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+				terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv, false);	//get texture projection matrix
+				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
+			}
+			else
+			{	//single noise texture shader
+				if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_ROAD_BASE_NOISE1)
+				{	//cloud map
+					DX8Wrapper::Set_Texture(1,W3DShaderManager::getShaderTexture(1));
+					terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv, false);	//update curView with texture matrix
+					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+				}
+				else
+				{	//light map
+					DX8Wrapper::Set_Texture(1,W3DShaderManager::getShaderTexture(2));
+					terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv, false);	//update curView with texture matrix
+					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
+					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+				}
+				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
+			}
+		}
+		else
+		{	//just base texturing
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+		}
+	}
+	else
+	{	//pass 1, apply additional noise pass
+		Matrix4x4 curView;
+		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+		D3DXMATRIX inv;
+		float det;
+		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+		if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex)
+			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+		else
+			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+
+		DX8Wrapper::Set_Texture(1,W3DShaderManager::getShaderTexture(2));
+
+		terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv, false);	//update curView with texture matrix
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+		// Two output coordinates are used.
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+		//Copy alpha channel into stage 1 but mask out color channel by replacing with white.
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+		//Force color channel to white by copying the alpha into RGB
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE|D3DTA_ALPHAREPLICATE);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG2);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_BLENDCURRENTALPHA);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+		//Modulate into existing roads with clouds applied. - only apply where roads are transparent by
+		//using road texture as a mask.
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_ZERO);
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_SRCCOLOR);
+
+		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, curView);
+	}
+
+	return TRUE;
+}
+
+void RoadShader2Stage::reset(void)
+{
+	ShaderClass::Invalidate();
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
+}
+
+/** List of all custom shader lists - each list in this list contains variations of the same
+	shader to allow it to work on different hardware configurations.
+*/
+W3DShaderInterface **MasterShaderList[]=
+{
+	TerrainShaderList,
+	ShroudShaderList,
+	FlatShroudShaderList,
+	RoadShaderList,
+	MaskShaderList,
+	CloudShaderList,
+	FlatTerrainShaderList,
+	NULL
+};
+
+/** List of all custom filter lists - each list in this list contains variations of the same
+	filter to allow it to work on different hardware configurations.
+*/
+W3DFilterInterface **MasterFilterList[]=
+{
+	ScreenDefaultFilterList,
+	ScreenBWFilterList,
+	ScreenMotionBlurFilterList,
+	ScreenCrossFadeFilterList,
+	NULL
+};
+
+// W3DShaderManager::W3DShaderManager =========================================
+/** Constructor - just clears some variables */
+//=============================================================================
+W3DShaderManager::W3DShaderManager(void)
+{
+	m_currentShader = ST_INVALID;
+	m_currentFilter = FT_NULL_FILTER;
+	m_oldRenderSurface = NULL;
+	m_renderTexture = NULL;
+	m_newRenderSurface = NULL;
+	m_oldDepthSurface = NULL;
+	m_renderingToTexture = false;
+	Int i;
+	for (i=0; i<W3DShaderManager::ST_MAX; i++)
+	{	W3DShaders[i]=NULL;
+		W3DShadersPassCount[i]=0;
+	}
+	for (i=0; i<FT_MAX; i++)
+	{	W3DFilters[i]=NULL;
+	}
+	for (i=0; i<8; i++)
+	{
+		m_Textures[i]=NULL;
+	}
+	m_currentShader=(W3DShaderManager::ShaderTypes)-1;
+}
+
+// W3DShaderManager::init =======================================================
+/** Walk through all shaders and find versions suitable for current hardware */
+//=============================================================================
+void W3DShaderManager::init(void)
+{
+	int i,j;
+
+	D3DSURFACE_DESC desc;
+	// For now, check & see if we are gf3 or higher on the food chain.
+
+	ChipsetType res=DC_UNKNOWN;
+	if ((res=W3DShaderManager::getChipset()) != 0)
+	{
+		m_currentChipset = res;	//cache the current chipset.
+
+		//Some of our effects require an offscreen render target, so try creating it here.
+		HRESULT hr=DX8Wrapper::_Get_D3D_Device8()->GetRenderTarget(&m_oldRenderSurface);
+
+		m_oldRenderSurface->GetDesc(&desc);
+
+		hr=DX8Wrapper::_Get_D3D_Device8()->CreateTexture(desc.Width,desc.Height,1,D3DUSAGE_RENDERTARGET,desc.Format,D3DPOOL_DEFAULT,&m_renderTexture);
+
+		if (hr != S_OK)
+		{
+			if (m_oldRenderSurface) m_oldRenderSurface->Release();
+			m_oldRenderSurface = NULL;
+			m_renderTexture = NULL;
+		} else {
+			hr = m_renderTexture->GetSurfaceLevel(0, &m_newRenderSurface);
+			if (hr != S_OK)
+			{
+				if (m_renderTexture) m_renderTexture->Release();
+				m_renderTexture = NULL;
+				m_newRenderSurface = NULL;
+			}	else {
+				hr = DX8Wrapper::_Get_D3D_Device8()->GetDepthStencilSurface(&m_oldDepthSurface);
+				if (hr != S_OK)
+				{
+					if (m_newRenderSurface) m_newRenderSurface->Release();
+					if (m_renderTexture) m_renderTexture->Release();
+					m_renderTexture = NULL;
+					m_newRenderSurface = NULL;
+					m_oldDepthSurface = NULL;
+				}
+			}
+		}
+	}
+
+	W3DShaderInterface **shaders;
+
+	for (i=0; MasterShaderList[i] != NULL; i++)
+	{
+		shaders=MasterShaderList[i];
+		for (j=0; shaders[j] != NULL; j++)
+		{
+			if (shaders[j]->init())
+				break;	//found a working shader
+		}
+	}
+	W3DFilterInterface **filters;
+
+	for (i=0; MasterFilterList[i] != NULL; i++)
+	{
+		filters=MasterFilterList[i];
+		for (j=0; filters[j] != NULL; j++)
+		{
+			if (filters[j]->init())
+				break;	//found a working shader
+		}
+	}
+
+	DEBUG_LOG(("ShaderManager ChipsetID %d", res));
+}
+
+// W3DShaderManager::shutdown =======================================================
+/** Any shaders which allocate resources will be allowed to free them */
+//=============================================================================
+void W3DShaderManager::shutdown(void)
+{
+	if (m_newRenderSurface) m_newRenderSurface->Release();
+	if (m_renderTexture) m_renderTexture->Release();
+	if (m_oldRenderSurface) m_oldRenderSurface->Release();
+	if (m_oldDepthSurface) m_oldDepthSurface->Release();
+	m_renderTexture = NULL;
+	m_newRenderSurface = NULL;
+	m_oldDepthSurface = NULL;
+	m_oldRenderSurface = NULL;
+	m_currentShader = ST_INVALID;
+	m_currentFilter = FT_NULL_FILTER;
+	//release any assets associated with a shader (vertex/pixel shaders, textures, etc.)
+	Int i=0;
+	for (; i<W3DShaderManager::ST_MAX; i++) {
+		if (W3DShaders[i]) {
+			W3DShaders[i]->shutdown();
+		}
+	}
+
+	for (i=0; i < FT_MAX; i++)
+	{
+		if (W3DFilters[i])
+		{
+			W3DFilters[i]->shutdown();
+		}
+	}
+}
+
+//=============================================================================
+void W3DShaderManager::updateCloud()
+{
+	terrainShader2Stage.updateCloud();
+}
+
+// W3DShaderManager::getShaderPasses =======================================================
+/** Return number of renderig passes required in perform the desired shader on current
+	hardware.  App will need to re-render the polygons this many times to complete the
+	effect.
+ */
+//=============================================================================
+Int W3DShaderManager::getShaderPasses(ShaderTypes shader)
+{
+	return W3DShadersPassCount[shader];
+}
+
+// W3DShaderManager::setShader =======================================================
+/** Must call this method before each rendering pass in order to perform proper D3D
+	setup for each shader.
+ */
+//=============================================================================
+Int W3DShaderManager::setShader(ShaderTypes shader, Int pass)
+{
+	if (shader == m_currentShader && pass == m_currentShaderPass)
+		return TRUE;	//shader is already set
+	m_currentShader=shader;
+	m_currentShaderPass = pass;
+	if (W3DShaders[shader])
+		return W3DShaders[shader]->set(pass);
+	return FALSE;
+}
+
+// W3DShaderManager::resetShader =======================================================
+/** Must call this method after all polygons and rendering passes have been submitted.
+	This method allows D3D to reset itself to a default state that doesn't conflict
+	with the WW3D2 Shader system.
+ */
+//=============================================================================
+void W3DShaderManager::resetShader(ShaderTypes shader)
+{
+	if (m_currentShader == ST_INVALID)
+		return;	//last shader is already reset.
+	if (W3DShaders[shader])
+		W3DShaders[shader]->reset();
+	m_currentShader = ST_INVALID;
+}
+// W3DShaderManager::filterPreRender =======================================================
+/** Call to view filter shaders before rendering starts.
+ */
+//=============================================================================
+Bool W3DShaderManager::filterPreRender(FilterTypes filter, Bool &skipRender, CustomScenePassModes &scenePassMode)
+{
+	if (W3DFilters[filter])
+	{	Bool result=W3DFilters[filter]->preRender(skipRender,scenePassMode);
+		if (result)
+			m_currentFilter = filter;
+		return result;
+	}
+	return FALSE;
+}
+
+// W3DShaderManager::filterPostRender =======================================================
+/** Call to view filter shaders after rendering is complete.
+ */
+//=============================================================================
+Bool W3DShaderManager::filterPostRender(FilterTypes filter, FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender)
+{
+	if (W3DFilters[filter])
+		return W3DFilters[filter]->postRender(mode, scrollDelta,doExtraRender);
+
+	m_currentFilter = FT_NULL_FILTER;
+	return FALSE;
+}
+
+// W3DShaderManager::filterPostRender =======================================================
+/** Call to view filter shaders after rendering is complete.
+ */
+//=============================================================================
+	static Bool filterSetup(FilterTypes filter, FilterModes mode);
+Bool W3DShaderManager::filterSetup(FilterTypes filter, FilterModes mode)
+{
+	if (W3DFilters[filter])
+		return W3DFilters[filter]->setup(mode);
+	return FALSE;
+}
+
+/*Draws 2 triangles covering the viewport given the current render states*/
+void W3DShaderManager::drawViewport(Int color)
+{
+	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
+
+	struct _TRANS_LIT_TEX_VERTEX {
+		D3DXVECTOR4 p;
+		DWORD color;   // diffuse color
+		float	u;
+		float	v;
+	} v[4];
+
+	Int xpos, ypos, width, height;
+
+	TheTacticalView->getOrigin(&xpos,&ypos);
+	width=TheTacticalView->getWidth();
+	height=TheTacticalView->getHeight();
+
+	//bottom right
+	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
+	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
+	//top right
+	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
+	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
+	//bottom left
+	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
+	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
+	//top left
+	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
+	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
+	v[0].color = color;
+	v[1].color = color;
+	v[2].color = color;
+	v[3].color = color;
+
+	//draw polygons like this is very inefficient but for only 2 triangles, it's
+	//not worth bothering with index/vertex buffers.
+	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
+
+	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
+}
+
+// W3DShaderManager::startRenderToTexture =======================================================
+/** Starts rendering to a texture.
+ */
+//=============================================================================
+void W3DShaderManager::startRenderToTexture(void)
+{
+	DEBUG_ASSERTCRASH(!m_renderingToTexture, ("Already rendering to texture - cannot nest calls."));
+
+	if (m_renderingToTexture || m_newRenderSurface==NULL || m_oldDepthSurface==NULL) return;
+	HRESULT hr = DX8Wrapper::_Get_D3D_Device8()->SetRenderTarget(m_newRenderSurface,m_oldDepthSurface);
+	DEBUG_ASSERTCRASH(hr==S_OK, ("Set target failed unexpectedly."));
+	if (hr != S_OK)
+		return;
+	m_renderingToTexture = true;
+	if (TheGlobalData->m_showSoftWaterEdge)
+	{	//Soft water edges use frame buffer destination alpha so we must clear it to a known value.
+		if (m_currentFilter == FT_VIEW_MOTION_BLUR_FILTER || m_currentFilter == FT_VIEW_CROSSFADE)
+		{	//these filters rely on the previous frame being visible so we must be careful about clearing
+			//frame buffer.  Only clear the alpha channel
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_ALPHA);	//only clear alpha
+			ShaderClass shader=ShaderClass::_PresetOpaqueSolidShader;
+			shader.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);
+			shader.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);
+			DX8Wrapper::Set_Shader(shader);
+
+			VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+			DX8Wrapper::Set_Material(vmat);
+			REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
+
+			drawViewport(0x00ffffff | (((Int)(TheWaterTransparency->m_minWaterOpacity*255.0f)) <<24));
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_RED|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_BLUE);	//disable writes to alpha
+		}
+		else	//normal clear that overwrites everything.
+			DX8Wrapper::Clear(true, false, Vector3( 0.0f, 0.0f, 0.0f ), TheWaterTransparency->m_minWaterOpacity);
+	}
+}
+
+// W3DShaderManager::startRenderToTexture =======================================================
+/** Ends rendering to a texture.
+ */
+//=============================================================================
+IDirect3DTexture8 *W3DShaderManager::endRenderToTexture(void)
+{
+	DEBUG_ASSERTCRASH(m_renderingToTexture, ("Not rendering to texture."));
+	if (!m_renderingToTexture) return NULL;
+	HRESULT hr = DX8Wrapper::_Get_D3D_Device8()->SetRenderTarget(m_oldRenderSurface,m_oldDepthSurface);	//restore original render target
+	DEBUG_ASSERTCRASH(hr==S_OK, ("Set target failed unexpectedly."));
+	if (hr == S_OK)
+	{
+		//assume render target texure will be in stage 0.  Most hardware has "conditional" support for
+		//non-power-of-2 textures so we must force some required states:
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSW, D3DTADDRESS_CLAMP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_MIPFILTER, D3DTEXF_NONE);
+
+		m_renderingToTexture = false;
+	}
+	return m_renderTexture;
+}
+
+/**Returns texture containing the image that was last rendered using any of the effects requiring render target
+textures.  Used mostly for cross-fading effects that need an unmodified version of the view before the effect
+was applied.  NOTE: This texture does not survive device reset.. so quit effect on reset!*/
+IDirect3DTexture8 *W3DShaderManager::getRenderTexture(void)
+{
+	return m_renderTexture;
+}
+
+enum GraphicsVenderID CPP_11(: Int)
+{
+	DC_NVIDIA_VENDOR_ID	= 0x10DE,
+	DC_3DFX_VENDOR_ID	= 0x121A,
+	DC_ATI_VENDOR_ID	= 0x1002
+};
+
+// W3DShaderManager::ChipsetType =======================================================
+/** Returns the chipset used by the currently active rendering device.  Can be useful
+	for coding around specific driver bugs.
+ */
+//=============================================================================
+ChipsetType W3DShaderManager::getChipset( void )
+{
+	//check if globaldata has an override for current chipset
+	if (TheGlobalData && TheGlobalData->m_chipSetType != DC_UNKNOWN)
+		return (ChipsetType)TheGlobalData->m_chipSetType;
+
+	ChipsetType chip=DC_UNKNOWN;
+	IDirect3D8* d3d8Interface=DX8Wrapper::_Get_D3D8();
+
+	if (d3d8Interface && DX8Wrapper::_Get_D3D_Device8())
+	{
+
+		D3DADAPTER_IDENTIFIER8 did;
+		::ZeroMemory(&did, sizeof(D3DADAPTER_IDENTIFIER8));
+	/*	HRESULT res = */ d3d8Interface->GetAdapterIdentifier(0,D3DENUM_NO_WHQL_LEVEL,&did);
+		*((LARGE_INTEGER*)&m_driverVersion) = did.DriverVersion;
+
+		if(did.VendorId == DC_NVIDIA_VENDOR_ID)
+		{
+			m_currentVendor = DC_NVIDIA_VENDOR_ID;
+
+			if (did.DeviceId == 0x20)
+				return DC_TNT;
+
+			if (did.DeviceId >= 0x28 && did.DeviceId < 0x100)
+				return DC_TNT2;
+
+			if ( (did.DeviceId >= 0x100 && did.DeviceId <= 0x103) ||	//GeForce
+				 (did.DeviceId >= 0x110 && did.DeviceId <= 0x113) ||	//GeForce2 MX
+						 (did.DeviceId >= 0x150 && did.DeviceId <= 0x153) )	//GeForce2
+           		return DC_GEFORCE2;
+
+			if (did.DeviceId >= 0x200 && did.DeviceId < 0x250)
+				return DC_GEFORCE3;
+
+			if (did.DeviceId >= 0x250)
+				return DC_GEFORCE4;
+		}
+		else
+		if(did.VendorId == DC_3DFX_VENDOR_ID)
+		{
+			m_currentVendor = DC_3DFX_VENDOR_ID;
+
+			if (did.DeviceId == 0x0002)
+				return DC_VOODOO2;
+			if (did.DeviceId == 0x0005)
+				return DC_VOODOO3;
+			if (did.DeviceId == 0x0008)	///@todo: Just guessing on this one - find actual Voodoo4 deviceID.
+				return DC_VOODOO4;
+			if (did.DeviceId == 0x0009)
+				return DC_VOODOO5;
+		}
+		else
+		if(did.VendorId == DC_ATI_VENDOR_ID)
+		{
+			m_currentVendor = DC_ATI_VENDOR_ID;
+
+			if (did.DeviceId == 0x5144)
+				return DC_RADEON;
+			if (did.DeviceId == 0x514C)
+				return DC_RADEON_8500;
+			if (did.DeviceId == 0x4e44)
+				return DC_RADEON_9700;
+		}
+
+		//None of the vendor specific ID's matched so use generic means to classify the card
+		Int maxTextures=DX8Wrapper::Get_Current_Caps()->Get_Max_Simultaneous_Textures();
+		Real pixelShaderVersion;
+
+		char buf[256];
+
+		//Convert version to Real
+		sprintf(buf,"%d.%d",DX8Wrapper::Get_Current_Caps()->Get_Pixel_Shader_Major_Version(),DX8Wrapper::Get_Current_Caps()->Get_Pixel_Shader_Minor_Version());
+		sscanf(buf,"%f",&pixelShaderVersion);
+
+		if (maxTextures >= 4)
+		{	if (pixelShaderVersion >= 1.1f)
+				chip=DC_GENERIC_PIXEL_SHADER_1_1;
+			if (pixelShaderVersion >= 1.4f)
+				chip=DC_GENERIC_PIXEL_SHADER_1_4;
+			if (maxTextures >= 8 && pixelShaderVersion >= 2.0f)
+				chip=DC_GENERIC_PIXEL_SHADER_2_0;
+		}
+	}
+
+	return chip;
+}
+
+//=============================================================================
+// WaterRenderObjClass::LoadAndCreateShader
+//=============================================================================
+/** Loads and creates a D3D pixel or vertex shader.*/
+//=============================================================================
+HRESULT W3DShaderManager::LoadAndCreateD3DShader(const char* strFilePath, const DWORD* pDeclaration, DWORD Usage, Bool ShaderType, DWORD* pHandle)
+{
+	if (getChipset() < DC_GENERIC_PIXEL_SHADER_1_1)
+		return E_FAIL;	//don't allow loading any shaders if hardware can't handle it.
+
+	try
+	{
+		File *file = NULL;
+		HRESULT hr;
+
+		file = TheFileSystem->openFile(strFilePath, File::READ | File::BINARY);
+		if (file == NULL)
+		{
+			OutputDebugString("Could not find file \n" );
+			return E_FAIL;
+		}
+
+		FileInfo fileInfo;
+		TheFileSystem->getFileInfo(AsciiString(strFilePath), &fileInfo);
+		DWORD dwFileSize = fileInfo.sizeLow;
+
+		const DWORD* pShader = (DWORD*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwFileSize);
+		if (!pShader)
+		{
+			OutputDebugString( "Failed to allocate memory to load shader\n " );
+			return E_FAIL;
+		}
+
+		file->read((void *)pShader, dwFileSize);
+
+		file->close();
+		file = NULL;
+
+		if (ShaderType) // SHADERTYPE_VERTEX
+		{
+			hr = DX8Wrapper::_Get_D3D_Device8()->CreateVertexShader(pDeclaration, pShader, pHandle, Usage);
+		}
+		else // SHADERTYPE_PIXEL
+		{
+			hr = DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader(pShader, pHandle);
+		}
+
+		HeapFree(GetProcessHeap(), 0, (void*)pShader);
+
+		if (FAILED(hr))
+		{
+			OutputDebugString( "Failed to create shader\n ");
+			return E_FAIL;
+		}
+	}
+	catch(...)
+	{
+		OutputDebugString( "Error opening file \n" );
+		return E_FAIL;
+	}
+
+	return S_OK;
+}
+
+//For the MP test, we're enforcing high min-spec requirements that need to be verified.
+#define MIN_INTEL_CPU_FREQ	1300
+#define MIN_AMD_CPU_FREQ	1100
+#define MIN_ACCEPTED_FREQUENCY	1300
+#define MIN_ACCEPTED_MEMORY	(1024*1024*256)	//256 MB
+#define MIN_ACCEPTED_TEXTURE_MEMORY	(1024*1024*30)	//30 MB
+
+/**Hack to give gameengine access to this function*/
+Bool testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, MemValueType *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex)
+{
+	return W3DShaderManager::testMinimumRequirements(videoChipType,cpuType,cpuFreq,numRAM,intBenchIndex,floatBenchIndex,memBenchIndex);
+}
+
+Bool W3DShaderManager::testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, MemValueType *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex)
+{
+	if (videoChipType)
+		*videoChipType = getChipset();
+
+	if (cpuType)
+	{
+		*cpuType = XX;	//unknown
+
+		//Check if it's an Athlon
+		if (CPUDetectClass::Get_Processor_Manufacturer() == CPUDetectClass::MANUFACTURER_AMD &&
+				CPUDetectClass::Get_AMD_Processor() >= CPUDetectClass::AMD_PROCESSOR_ATHLON_025)
+				*cpuType = K7;
+
+		//Check if it's a P3
+		if (CPUDetectClass::Get_Processor_Manufacturer() == CPUDetectClass::MANUFACTURER_INTEL &&
+				CPUDetectClass::Get_Intel_Processor() >= CPUDetectClass::INTEL_PROCESSOR_PENTIUM_III_MODEL_7)
+				*cpuType = P3;
+		//Check if it's a P4
+		if (CPUDetectClass::Get_Processor_Manufacturer() == CPUDetectClass::MANUFACTURER_INTEL &&
+				CPUDetectClass::Get_Intel_Processor() >= CPUDetectClass::INTEL_PROCESSOR_PENTIUM4)
+				*cpuType = P4;
+	}
+
+	if (cpuFreq)
+		*cpuFreq=CPUDetectClass::Get_Processor_Speed();
+
+	if (numRAM)
+		*numRAM=CPUDetectClass::Get_Total_Physical_Memory();
+
+	if (intBenchIndex && floatBenchIndex && memBenchIndex)
+	{
+		// TheSuperHackers @tweak Aliendroid1 19/06/2025 Legacy benchmarking code was removed.
+		// Since modern hardware always meets the minimum requirements, we preset the benchmark "results" to a high value.
+		*intBenchIndex = 10.0f;
+		*floatBenchIndex = 10.0f;
+		*memBenchIndex = 10.0f;
+	}
+
+	return TRUE;
+}
+
+/**Try to guess how well the video card will handle the game assuming very fast CPU*/
+StaticGameLODLevel W3DShaderManager::getGPUPerformanceIndex(void)
+{
+	ChipsetType	chipType;
+	StaticGameLODLevel detailSetting=STATIC_GAME_LOD_LOW;	//assume lowest settings for now.
+
+	if ((chipType=getChipset()) != DC_UNKNOWN)
+	{	//a known video card so we can make some assumptions
+		if (chipType >=	DC_GEFORCE2)
+			detailSetting=STATIC_GAME_LOD_LOW;	//these cards need multiple terrain passes.
+		if (chipType >= DC_GENERIC_PIXEL_SHADER_1_1)	//these cards can do terrain in single pass.
+			detailSetting=STATIC_GAME_LOD_VERY_HIGH;
+	}
+
+	return detailSetting;
+}
+
+/**We need a hardware independent method to compare different CPU's.  For lack of anything better, we'll
+use time to calculate PIE using a slow random number algorithm.*/
+
+/**Used to test function call overhead*/
+void add(float *sum,float *addend)
+{
+	*sum = *sum + *addend;
+}
+
+/**Returns seconds needed to run the test*/
+Real W3DShaderManager::GetCPUBenchTime(void)
+{
+	float ztot, yran, ymult, ymod, x, y, z, pi, prod;
+    long int low, ixran, itot, j, iprod;
+
+  	__int64 endTime64,freq64,startTime64;
+	QueryPerformanceFrequency((LARGE_INTEGER *)&freq64);
+	QueryPerformanceCounter((LARGE_INTEGER *)&startTime64);
+
+    ztot = 0.0;
+    low = 1;
+    ixran = 1907;
+    yran = 5813.0;
+    ymult = 1307.0;
+    ymod = 5471.0;
+    itot = 560000;	//total iterations. This value ends up running at ~30 fps on our P4-2.2Ghz.
+
+    for(j=1; j<=itot; j++)
+    {
+		iprod = 27611 * ixran;
+		ixran = iprod - 74383*(long int)(iprod/74383);
+		x = (float)ixran / 74383.0;
+		prod = ymult * yran;
+		yran = (prod - ymod*(long int)(prod/ymod));
+		y = yran / ymod;
+		z = x*x + y*y;
+		add(&ztot,&z);
+		if ( z <= 1.0 )
+		{
+		  low = low + 1;
+		}
+	}
+	pi = 4.0 * (float)low/(float)itot;
+
+	QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
+	return ((double)(endTime64-startTime64)/(double)(freq64));
+}
+
+
+// W3DShaderManager::setShroudTex =======================================================
+/** Puts the shroud texture into a texture stage.
+ */
+//=============================================================================
+Int W3DShaderManager::setShroudTex(Int stage)
+{
+	//We need to scale so shroud texel stretches over one full terrain cell.  Each texel
+	//is 1/128 the size of full texture. (assuming 128x128 vid-mem texture).
+	W3DShroud *shroud;
+	if ((shroud=TheTerrainRenderObject->getShroud()) != 0)
+	{
+		DX8Wrapper::Set_Texture(stage, shroud->getShroudTexture());
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG2, D3DTA_CURRENT );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG2 );
+		D3DXMATRIX inv;
+		float det;
+
+		Matrix4x4 curView;
+		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+		D3DXMATRIX scale,offset;
+
+		//We need to make all world coordinates be relative to the heightmap data origin since that
+		//is where the shroud begins.
+
+		float xoffset = 0;
+		float yoffset = 0;
+		Real width=shroud->getCellWidth();
+		Real height=shroud->getCellHeight();
+
+		if (TheTerrainRenderObject->getMap())
+		{	//subtract origin position from all coordinates.  Origin is shifted by 1 cell width/height to allow for unused border texels.
+			xoffset = -(float)shroud->getDrawOriginX() + width;
+			yoffset = -(float)shroud->getDrawOriginY() + height;
+		}
+
+		D3DXMatrixTranslation(&offset, xoffset, yoffset,0);
+
+		width = 1.0f/(width*shroud->getTextureWidth());
+		height = 1.0f/(height*shroud->getTextureHeight());
+		D3DXMatrixScaling(&scale, width, height, 1);
+		*((D3DXMATRIX *)&curView) = (inv * offset) * scale;
+		DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), *((Matrix4x4*)&curView));
+		return TRUE;
+	}
+	return FALSE;
+}
+
+
+
+Int FlatTerrainShader2Stage::init( void )
+{
+	//no special device validation needed - anything in our min spec should handle this.
+
+	W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE]=&flatTerrainShader2Stage;
+	W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE]=1;
+	W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1]=&flatTerrainShader2Stage;
+	W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1]=2;
+	W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE2]=&flatTerrainShader2Stage;
+	W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE2]=2;
+	W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12]=&flatTerrainShader2Stage;
+	W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12]=2;
+
+	return TRUE;
+}
+
+void FlatTerrainShader2Stage::reset(void)
+{
+	ShaderClass::Invalidate();
+
+	//Free references to textures
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
+}
+
+
+Int FlatTerrainShader2Stage::set(Int pass)
+{
+	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
+	DX8Wrapper::Apply_Render_State_Changes();
+
+	if (TheGlobalData && (TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex)) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+	}
+	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+	}
+
+	switch (pass)
+	{
+		case 0:
+
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+
+			// Modulate the diffuse color with the texture as lighting comes from diffuse.
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+			if (W3DShaderManager::getShaderTexture(0)) {
+				DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_CURRENT );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+				DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+				DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+				//We need to scale so shroud texel stretches over one full terrain cell.  Each texel
+				//is 1/128 the size of full texture. (assuming 128x128 vid-mem texture).
+				W3DShroud *shroud;
+				if ((shroud=TheTerrainRenderObject->getShroud()) != 0)
+				{
+					D3DXMATRIX inv;
+					float det;
+
+					Matrix4x4 curView;
+					DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+					D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+					D3DXMATRIX scale,offset;
+
+					//We need to make all world coordinates be relative to the heightmap data origin since that
+					//is where the shroud begins.
+
+					float xoffset = 0;
+					float yoffset = 0;
+					Real width=shroud->getCellWidth();
+					Real height=shroud->getCellHeight();
+
+					if (TheTerrainRenderObject->getMap())
+					{	//subtract origin position from all coordinates.  Origin is shifted by 1 cell width/height to allow for unused border texels.
+						xoffset = -(float)shroud->getDrawOriginX() + width;
+						yoffset = -(float)shroud->getDrawOriginY() + height;
+					}
+
+					D3DXMatrixTranslation(&offset, xoffset, yoffset,0);
+
+					width = 1.0f/(width*shroud->getTextureWidth());
+					height = 1.0f/(height*shroud->getTextureHeight());
+					D3DXMatrixScaling(&scale, width, height, 1);
+					*((D3DXMATRIX *)&curView) = (inv * offset) * scale;
+					DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0), *((Matrix4x4*)&curView));
+				}
+			}	else {
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG2 );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
+			}
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+
+			// Modulate the diffuse color with the texture as lighting comes from diffuse.
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 0 );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
+			break;
+		case 1:
+			// Noise/cloud pass
+			Matrix4x4 curView;
+			DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+			//these states apply to all noise/cloud combination passes
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
+			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+			// Two output coordinates are used.
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+			//blend into frame buffer
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_DESTCOLOR);
+			DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
+
+
+			D3DXMATRIX inv;
+			float det;
+
+			D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+			if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12)
+			{
+				//setup cloud pass
+
+				terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
+				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, curView);
+				//clouds always need bilinear filtering
+				DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+				DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+				DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
+
+				//setup noise pass
+
+				terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv);
+				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
+				//noise always needs point/linear filtering.  Why point!?
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+				// Two output coordinates are used.
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+				DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
+			}
+			else
+			{	//only 1 noise or cloud texture
+				// Now setup the texture pipeline.
+				if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1)
+				{	//setup cloud pass
+					DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
+					terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
+					DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+					DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+				}
+				else
+				{
+					//setup noise pass
+					DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
+					terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
+					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
+					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+				}
+
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&curView));
+			}
+			break;
+	}
+
+	return TRUE;
+}
+
+
+
+
+
+
+Int FlatTerrainShaderPixelShader::shutdown(void)
+{
+	if (m_dwBasePixelShader)
+		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBasePixelShader);
+
+	if (m_dwBase0PixelShader)
+		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBase0PixelShader);
+
+	if (m_dwBaseNoise1PixelShader)
+		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise1PixelShader);
+
+	if (m_dwBaseNoise2PixelShader)
+		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise2PixelShader);
+
+	m_dwBasePixelShader=NULL;
+	m_dwBase0PixelShader=NULL;
+	m_dwBaseNoise1PixelShader=NULL;
+	m_dwBaseNoise2PixelShader=NULL;
+
+	return TRUE;
+}
+
+Int FlatTerrainShaderPixelShader::init( void )
+{
+	Int res;
+
+#ifdef DISABLE_PIXEL_SHADERS
+	return false;
+#endif
+
+	//this shader will also use the 2Stage shader for some of the passes so initialize it too.
+	if ((res=W3DShaderManager::getChipset()) >= DC_GENERIC_PIXEL_SHADER_1_1)
+	{
+		if (res >= DC_GENERIC_PIXEL_SHADER_1_1)
+		{
+			//this shader needs some assets that need to be loaded
+			//shader decleration
+			DWORD Declaration[]=
+			{
+				(D3DVSD_STREAM(0)),
+				(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
+				(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
+				(D3DVSD_REG(2, D3DVSDT_FLOAT2)), //  Texture Coordinates
+				(D3DVSD_REG(3, D3DVSDT_FLOAT2)), //  Texture Coordinates
+				(D3DVSD_END())
+			};
+
+			//base version which doesn't apply any noise textures.
+			HRESULT hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\fterrain.pso", &Declaration[0], 0, false, &m_dwBasePixelShader);
+			if (FAILED(hr))
+				return FALSE;
+
+			//base version which doesn't apply any shroud textures.
+			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\fterrain0.pso", &Declaration[0], 0, false, &m_dwBase0PixelShader);
+			if (FAILED(hr))
+				return FALSE;
+
+			//version which blends 1 noise texture.
+			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\fterrainnoise.pso", &Declaration[0], 0, false, &m_dwBaseNoise1PixelShader);
+			if (FAILED(hr))
+				return FALSE;
+
+			//version which blends 2 noise textures.
+			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\fterrainnoise2.pso", &Declaration[0], 0, false, &m_dwBaseNoise2PixelShader);
+			if (FAILED(hr))
+				return FALSE;
+
+			W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE]=&flatTerrainShaderPixelShader;
+			W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1]=&flatTerrainShaderPixelShader;
+			W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE2]=&flatTerrainShaderPixelShader;
+			W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12]=&flatTerrainShaderPixelShader;
+			W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE]=1;
+			W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1]=1;
+			W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE2]=1;
+			W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12]=1;
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+Int FlatTerrainShaderPixelShader::set(Int pass)
+{
+	//setup base pass
+	Int curStage = 1;
+	// setup terrain [3/31/2003]
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+	DX8Wrapper::Set_Texture(0, W3DShaderManager::getShaderTexture(2));
+	DX8Wrapper::Set_Texture(1, W3DShaderManager::getShaderTexture(2));
+	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
+	DX8Wrapper::Apply_Render_State_Changes();
+
+
+
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+	//tell pixel shader which UV set to use for each stage
+	DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_TEXCOORDINDEX, 0 );
+	DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+
+	if (TheGlobalData && (TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex)) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MINFILTER, D3DTEXF_POINT);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+	}
+	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
+	} else {
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+	}
+
+	curStage = 0;
+
+	W3DShroud *shroud = TheTerrainRenderObject->getShroud();
+	if (shroud) {
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+		//We need to scale so shroud texel stretches over one full terrain cell.  Each texel
+		//is 1/128 the size of full texture. (assuming 128x128 vid-mem texture).
+		{
+			D3DXMATRIX inv;
+			float det;
+
+			Matrix4x4 curView;
+			DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+			D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+			D3DXMATRIX scale,offset;
+
+			//We need to make all world coordinates be relative to the heightmap data origin since that
+			//is where the shroud begins.
+
+			float xoffset = 0;
+			float yoffset = 0;
+			Real width=shroud->getCellWidth();
+			Real height=shroud->getCellHeight();
+
+			if (TheTerrainRenderObject->getMap())
+			{	//subtract origin position from all coordinates.  Origin is shifted by 1 cell width/height to allow for unused border texels.
+				xoffset = -(float)shroud->getDrawOriginX() + width;
+				yoffset = -(float)shroud->getDrawOriginY() + height;
+			}
+
+			D3DXMatrixTranslation(&offset, xoffset, yoffset,0);
+
+			width = 1.0f/(width*shroud->getTextureWidth());
+			height = 1.0f/(height*shroud->getTextureHeight());
+			D3DXMatrixScaling(&scale, width, height, 1);
+			*((D3DXMATRIX *)&curView) = (inv * offset) * scale;
+			DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+curStage), *((Matrix4x4*)&curView));
+		}
+		DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::_Get_D3D_Device8()->SetTexture(curStage, shroud->getShroudTexture()->Peek_D3D_Texture());
+		curStage++;
+		if (curStage==1) curStage++;
+	}
+
+	Bool doNoise1 = (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1 ||
+						W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12);
+	if (doNoise1) {	 // Cloud pass.
+		Matrix4x4 curView;
+		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+		D3DXMATRIX inv;
+		float det;
+		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+		// Two output coordinates are used.
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+		DX8Wrapper::_Get_D3D_Device8()->SetTexture(curStage, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
+		terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
+		DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+curStage), *((Matrix4x4*)&curView));
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+		curStage++;
+		if (curStage==1) curStage++;
+	}
+
+	Bool doNoise2 = (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE2 ||
+						W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12);
+	if (doNoise2)
+	{
+		Matrix4x4 curView;
+		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+		D3DXMATRIX inv;
+		float det;
+		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+		// Two output coordinates are used.
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+		DX8Wrapper::_Get_D3D_Device8()->SetTexture(curStage, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
+		terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
+		DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+curStage), *((Matrix4x4*)&curView));
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
+
+		curStage++;
+		if (curStage==1) curStage++;
+	}
+	if (curStage<2) {
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBase0PixelShader);
+	}	else if (curStage==2) {
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBasePixelShader);
+	}	else if (curStage==3) {
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise1PixelShader);
+	}else if (curStage==4) {
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise2PixelShader);
+	}
+	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ALPHABLENDENABLE, false);
+	DX8Wrapper::Apply_Render_State_Changes();
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(curStage, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
+	return TRUE;
+}
+
+void FlatTerrainShaderPixelShader::reset(void)
+{
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(2,NULL);	//release reference to any texture
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,NULL);	//release reference to any texture
+
+	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(0);	//turn off pixel shader
+
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|2);
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|3);
+
+
+	DX8Wrapper::Invalidate_Cached_Render_States();
+}
+
+
+
+
+
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp
similarity index 96%
rename from GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp
rename to Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp
index 80f4d966b51..d11d305123f 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp
@@ -41,11 +41,6 @@
 #include "WW3D2/camera.h"
 #include "WW3D2/sortingrenderer.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 SmudgeManager *TheSmudgeManager=NULL;
 
@@ -154,9 +149,9 @@ Int copyRect(unsigned char *buf, Int bufSize, int oX, int oY, int width, int hei
 		goto error;
 
  	D3DSURFACE_DESC desc;
- 
+
  	surface->GetDesc(&desc);
- 
+
 	RECT srcRect;
 	srcRect.left=oX;
 	srcRect.top=oY;
@@ -171,14 +166,14 @@ Int copyRect(unsigned char *buf, Int bufSize, int oX, int oY, int width, int hei
 
 	if (hr != S_OK)
 		goto error;
- 
+
  	hr=m_pDev->CopyRects(surface,&srcRect,1,tempSurface,&dstPoint);
 
 	if (hr != S_OK)
 		goto error;
 
  	D3DLOCKED_RECT lrect;
- 
+
  	hr=tempSurface->LockRect(&lrect,NULL,D3DLOCK_READONLY);
 
 	if (hr != S_OK)
@@ -188,7 +183,7 @@ Int copyRect(unsigned char *buf, Int bufSize, int oX, int oY, int width, int hei
 
 	if (desc.Size < bufSize)
 		bufSize = desc.Size;
-		
+
 	memcpy(buf,lrect.pBits,bufSize);
 	result = bufSize;
 
@@ -224,7 +219,7 @@ Bool W3DSmudgeManager::testHardwareSupport(void)
 		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 		DX8Wrapper::Set_Material(vmat);
 		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-		
+
 		ShaderClass shader=ShaderClass::_PresetOpaqueShader;
 		shader.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);
 		shader.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);
@@ -234,14 +229,14 @@ Bool W3DSmudgeManager::testHardwareSupport(void)
 
 		struct _TRANS_LIT_TEX_VERTEX {
 			Vector4 p;
-			DWORD color;   // diffuse color    
+			DWORD color;   // diffuse color
 			float	u;
 			float	v;
 		} v[4];
 
 		//bottom right
 		v[0].p = Vector4( BLOCK_SIZE-0.5f, BLOCK_SIZE-0.5f, 0.0f, 1.0f );
-		v[0].u = BLOCK_SIZE/(Real)TheDisplay->getWidth();	v[0].v = BLOCK_SIZE/(Real)TheDisplay->getHeight();;
+		v[0].u = BLOCK_SIZE/(Real)TheDisplay->getWidth();	v[0].v = BLOCK_SIZE/(Real)TheDisplay->getHeight();
 		//top right
 		v[1].p = Vector4( BLOCK_SIZE-0.5f, 0-0.5f, 0.0f, 1.0f );
 		v[1].u = BLOCK_SIZE/(Real)TheDisplay->getWidth();	v[1].v = 0;
@@ -445,8 +440,8 @@ void W3DSmudgeManager::render(RenderInfoClass &rinfo)
 #endif
 
 	Matrix4x4 identity(true);
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,identity);	
-	DX8Wrapper::Set_Transform(D3DTS_VIEW,identity);	
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,identity);
+	DX8Wrapper::Set_Transform(D3DTS_VIEW,identity);
 
 	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
 	//DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueSpriteShader);
@@ -470,8 +465,8 @@ void W3DSmudgeManager::render(RenderInfoClass &rinfo)
 	DX8Wrapper::Apply_Render_State_Changes();
 
 	//Disable reading texture alpha since it's undefined.
-	//DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_SELECTARG1);			
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_ALPHAOP,D3DTOP_SELECTARG2);			
+	//DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_SELECTARG1);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_ALPHAOP,D3DTOP_SELECTARG2);
 
 	Int smudgesRemaining=count;
 	set=m_usedSmudgeSetList.Head();	//first smudge set that needs rendering.
@@ -539,21 +534,21 @@ void W3DSmudgeManager::render(RenderInfoClass &rinfo)
 			DX8Wrapper::Set_Vertex_Buffer(vb_access);
 		}
 
-		DX8Wrapper::Draw_Triangles(	0,smudgesInRenderBatch*4, 0, smudgesInRenderBatch*5);	
+		DX8Wrapper::Draw_Triangles(	0,smudgesInRenderBatch*4, 0, smudgesInRenderBatch*5);
 
 //Debug Code which draws outline around smudge
 /*		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_WIREFRAME);
 		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ALPHABLENDENABLE,FALSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_SELECTARG2);			
-		DX8Wrapper::Draw_Triangles(	0,smudgesInRenderBatch*4, 0, smudgesInRenderBatch*5);	
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_SELECTARG2);
+		DX8Wrapper::Draw_Triangles(	0,smudgesInRenderBatch*4, 0, smudgesInRenderBatch*5);
 		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
 		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ALPHABLENDENABLE,TRUE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_SELECTARG1);			
+		DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_SELECTARG1);
 */
 		smudgesRemaining -= smudgesInRenderBatch;
 	}
 
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_MODULATE);			
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_ALPHAOP,D3DTOP_MODULATE);			
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_MODULATE);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_ALPHAOP,D3DTOP_MODULATE);
 
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DSnow.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DSnow.cpp
similarity index 97%
rename from GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DSnow.cpp
rename to Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DSnow.cpp
index 55ee8317ce7..bed66d1c65d 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DSnow.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DSnow.cpp
@@ -27,11 +27,6 @@
 #include "WW3D2/assetmgr.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define D3DFVF_POINTVERTEX (D3DFVF_XYZ)
 #define SNOW_BUFFER_SIZE 4096	//size of vertex buffer holding particles.
@@ -93,9 +88,9 @@ Bool W3DSnowManager::ReAcquireResources(void)
 			if (FAILED(m_pDev->CreateVertexBuffer
 			(
 				SNOW_BUFFER_SIZE*sizeof(POINTVERTEX),
-				D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC|D3DUSAGE_POINTS, 
+				D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC|D3DUSAGE_POINTS,
 				D3DFVF_POINTVERTEX,
-				D3DPOOL_DEFAULT, 
+				D3DPOOL_DEFAULT,
 				&m_VertexBufferD3D
 			)))
 				return FALSE;
@@ -126,7 +121,7 @@ Bool W3DSnowManager::ReAcquireResources(void)
 				ib[3]=vbCount+2;
 				ib[4]=vbCount;
 				ib[5]=vbCount+1;
-		
+
 				vbCount += 4;
 				ib+=6;
 			}
@@ -148,7 +143,7 @@ void W3DSnowManager::updateIniSettings(void)
 	SnowManager::updateIniSettings();
 
 	if (m_snowTexture && stricmp(m_snowTexture->Get_Texture_Name(),TheWeatherSetting->m_snowTexture.str()) != 0)
-	{	
+	{
 		REF_PTR_RELEASE(m_snowTexture);
 		m_snowTexture = WW3DAssetManager::Get_Instance()->Get_Texture(TheWeatherSetting->m_snowTexture.str());
 	}
@@ -161,8 +156,8 @@ void W3DSnowManager::reset( void )
 
 void W3DSnowManager::update(void)
 {
-
-	m_time += WW3D::Get_Frame_Time() / 1000.0f;
+	// TheSuperHackers @tweak The snow render update is now decoupled from the logic step.
+	m_time += WW3D::Get_Logic_Frame_Time_Seconds();
 
 	//find current time offset, adjusting for overflow
 	m_time=fmod(m_time,m_fullTimePeriod);
@@ -300,8 +295,8 @@ void W3DSnowManager::renderSubBox(RenderInfoClass &rinfo, Int originX, Int origi
 				snowCenter.Set(x*m_emitterSpacing,y*m_emitterSpacing,h0);
 
 				//Adjust position so snow flakes don't fall straight down.
-				snowCenter.X += m_amplitude * WWMath::Fast_Sin( h0 * m_frequencyScaleX + (Real)x); 
-				snowCenter.Y += m_amplitude * WWMath::Fast_Sin( h0 * m_frequencyScaleY + (Real)y); 
+				snowCenter.X += m_amplitude * WWMath::Fast_Sin( h0 * m_frequencyScaleX + (Real)x);
+				snowCenter.Y += m_amplitude * WWMath::Fast_Sin( h0 * m_frequencyScaleY + (Real)y);
 
 				*(Vector3 *)verts=snowCenter;
 				verts++;
@@ -397,7 +392,7 @@ void W3DSnowManager::render(RenderInfoClass &rinfo)
 	m_heightTraveled=m_time*m_velocity+cameraOffset;	//height that snow flake traveled this frame.
 
 	Matrix4x4 identity(true);
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,identity);	
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,identity);
 
 	DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaShader);
 
@@ -415,7 +410,7 @@ void W3DSnowManager::render(RenderInfoClass &rinfo)
 	DX8Wrapper::Set_Texture(0,m_snowTexture);
 
 	if (!usePointSprites)
-	{	
+	{
 		renderAsQuads(rinfo,cubeOriginX,cubeOriginY,cubeDimX,cubeDimY);
 		return;
 	}
@@ -488,7 +483,7 @@ void W3DSnowManager::renderAsQuads(RenderInfoClass &rinfo, Int cubeOriginX, Int
 	}
 
 	Matrix4x4 identity(true);
-	DX8Wrapper::Set_Transform(D3DTS_VIEW,identity);	
+	DX8Wrapper::Set_Transform(D3DTS_VIEW,identity);
 
 	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
 
@@ -569,8 +564,8 @@ void W3DSnowManager::renderAsQuads(RenderInfoClass &rinfo, Int cubeOriginX, Int
 		if (numberInBatch)
 		{
 			DX8Wrapper::Set_Vertex_Buffer(vb_access);
-			DX8Wrapper::Draw_Triangles(	0,numberInBatch*2, 0, numberInBatch*4);	
+			DX8Wrapper::Draw_Triangles(	0,numberInBatch*2, 0, numberInBatch*4);
 			totalPart -= numberInBatch;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
similarity index 95%
rename from GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
rename to Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
index 80eb3d51350..d7691c63168 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DTerrainBackground.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       EA Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2003 - All Rights Reserved                  
-//                                                                          
+//
+//                       EA Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2003 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,12 +43,10 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/W3DTerrainBackground.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include "Common/GlobalData.h"
@@ -59,14 +57,9 @@
 #include "WW3D2/dx8renderer.h"
 #include "WW3D2/camera.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 // A W3D shader that does alpha, texturing, tests zbuffer, doesn't update zbuffer.
 #define SC_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
@@ -79,7 +72,7 @@ static ShaderClass detailShader(SC_DETAIL);
 const Int PIXELS_PER_GRID = 8; // default tex resolution allocated for each tile. jba. [3/24/2003]
 
 //-----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //-----------------------------------------------------------------------------
 
 
@@ -113,7 +106,7 @@ The coordinates in partialRange are map cell coordinates, relative to the entire
 The vertex coordinates and texture coordinates, as well as static lighting are updated.
 */
 void W3DTerrainBackground::doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, Bool doTextures )
-{	
+{
 	if (m_map==NULL) return;
 	if (htMap) {
 		REF_PTR_SET(m_map, htMap);
@@ -174,7 +167,7 @@ void W3DTerrainBackground::doPartialUpdate(const IRegion2D &partialRange, WorldH
 			curVb->diffuse = (0<<24)|TheTerrainRenderObject->getStaticDiffuse(i,j);
 			Vector3 pos;
 			pos.Z = ((float)m_map->getHeight(i,j)*MAP_HEIGHT_SCALE);
-			pos.X = (i)*MAP_XY_FACTOR - m_map->getBorderSizeInline()*MAP_XY_FACTOR; 
+			pos.X = (i)*MAP_XY_FACTOR - m_map->getBorderSizeInline()*MAP_XY_FACTOR;
 			pos.Y = (j)*MAP_XY_FACTOR - m_map->getBorderSizeInline()*MAP_XY_FACTOR;
 			curVb->u1 = (float)(i-minX)/(float)(m_width);
 			curVb->v1 = 1.0f - (float)(j-minY)/(float)(m_width);
@@ -193,7 +186,7 @@ void W3DTerrainBackground::doPartialUpdate(const IRegion2D &partialRange, WorldH
 		REF_PTR_RELEASE(m_terrainTexture2X);
 		REF_PTR_RELEASE(m_terrainTexture4X);
 		m_terrainTexture = m_map->getFlatTexture(m_xOrigin, m_yOrigin, m_width, PIXELS_PER_GRID);
-		//	DEBUG ONLY. jba. m_terrainTexture =  (TerrainTextureClass *)NEW_REF(TextureClass, ("TBBib.tga"));  
+		//	DEBUG ONLY. jba. m_terrainTexture =  (TerrainTextureClass *)NEW_REF(TextureClass, ("TBBib.tga"));
 		m_terrainTexture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 		m_terrainTexture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 	}
@@ -281,10 +274,10 @@ Bool W3DTerrainBackground::advanceRight(ICoord2D &right, Int xOffset, Int yOffse
 //=============================================================================
 /** Fills in vertex & index buffers.
 */
-void W3DTerrainBackground::fillVBRecursive(UnsignedShort *ib, Int xOffset, Int yOffset, 
+void W3DTerrainBackground::fillVBRecursive(UnsignedShort *ib, Int xOffset, Int yOffset,
 																					 Int width, UnsignedShort *ndx, Int &curIndex)
 {
-	
+
 	Int bottomLeftNdx	= ndx[xOffset+yOffset*(m_width+1)];
 	Int topRightNdx	= ndx[xOffset+width + (yOffset+width)*(m_width+1)];
 
@@ -410,7 +403,7 @@ void W3DTerrainBackground::fillVBRecursive(UnsignedShort *ib, Int xOffset, Int y
 	fillVBRecursive(ib, xOffset, yOffset+halfWidth, halfWidth, ndx, curIndex);
 	fillVBRecursive(ib, xOffset+halfWidth, yOffset, halfWidth, ndx, curIndex);
 	fillVBRecursive(ib, xOffset+halfWidth, yOffset+halfWidth, halfWidth, ndx, curIndex);
-	
+
 }
 
 //=============================================================================
@@ -420,7 +413,7 @@ void W3DTerrainBackground::fillVBRecursive(UnsignedShort *ib, Int xOffset, Int y
 */
 void W3DTerrainBackground::setFlipRecursive(Int xOffset, Int yOffset, Int width)
 {
-	
+
 	Int limitX = m_map->getXExtent()-1;
 	Int limitY = m_map->getYExtent()-1;
 	Int i, j;
@@ -459,7 +452,7 @@ void W3DTerrainBackground::setFlipRecursive(Int xOffset, Int yOffset, Int width)
 	setFlipRecursive(xOffset, yOffset+halfWidth, halfWidth);
 	setFlipRecursive(xOffset+halfWidth, yOffset, halfWidth);
 	setFlipRecursive(xOffset+halfWidth, yOffset+halfWidth, halfWidth);
-	
+
 }
 
 //=============================================================================
@@ -470,7 +463,7 @@ The coordinates in partialRange are map cell coordinates, relative to the entire
 The vertex coordinates and texture coordinates, as well as static lighting are updated.
 */
 void W3DTerrainBackground::doTesselatedUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, Bool doTextures )
-{	
+{
 	if (m_map==NULL) return;
 	if (htMap) {
 		REF_PTR_SET(m_map, htMap);
@@ -530,7 +523,7 @@ void W3DTerrainBackground::doTesselatedUpdate(const IRegion2D &partialRange, Wor
 				Int k = i<limitX?i:limitX;
 				Int l = j<limitY?j:limitY;
 				pos.Z = ((float)m_map->getHeight(k,l)*MAP_HEIGHT_SCALE);
-				pos.X = (i)*MAP_XY_FACTOR - m_map->getBorderSizeInline()*MAP_XY_FACTOR; 
+				pos.X = (i)*MAP_XY_FACTOR - m_map->getBorderSizeInline()*MAP_XY_FACTOR;
 				pos.Y = (j)*MAP_XY_FACTOR - m_map->getBorderSizeInline()*MAP_XY_FACTOR;
 				curVb->u1 = (float)(i-minX)/(float)(m_width);
 				curVb->v1 = 1.0f - (float)(j-minY)/(float)(m_width);
@@ -574,7 +567,7 @@ void W3DTerrainBackground::doTesselatedUpdate(const IRegion2D &partialRange, Wor
 			Int k = i<limitX?i:limitX;
 			Int l = j<limitY?j:limitY;
 			pos.Z = ((float)m_map->getHeight(k,l)*MAP_HEIGHT_SCALE);
-			pos.X = (i)*MAP_XY_FACTOR - m_map->getBorderSizeInline()*MAP_XY_FACTOR; 
+			pos.X = (i)*MAP_XY_FACTOR - m_map->getBorderSizeInline()*MAP_XY_FACTOR;
 			pos.Y = (j)*MAP_XY_FACTOR - m_map->getBorderSizeInline()*MAP_XY_FACTOR;
 			bounds.Add_Point(pos);
 		}
@@ -586,7 +579,7 @@ void W3DTerrainBackground::doTesselatedUpdate(const IRegion2D &partialRange, Wor
 		REF_PTR_RELEASE(m_terrainTexture2X);
 		REF_PTR_RELEASE(m_terrainTexture4X);
 		m_terrainTexture = m_map->getFlatTexture(m_xOrigin, m_yOrigin, m_width, PIXELS_PER_GRID);
-		//	DEBUG ONLY. jba. m_terrainTexture =  (TerrainTextureClass *)NEW_REF(TextureClass, ("TBBib.tga"));  
+		//	DEBUG ONLY. jba. m_terrainTexture =  (TerrainTextureClass *)NEW_REF(TextureClass, ("TBBib.tga"));
 		m_terrainTexture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 		m_terrainTexture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 	}
@@ -594,7 +587,7 @@ void W3DTerrainBackground::doTesselatedUpdate(const IRegion2D &partialRange, Wor
 }
 
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -712,7 +705,7 @@ void W3DTerrainBackground::updateCenter(CameraClass *camera)
 	} else {
 		REF_PTR_RELEASE(m_terrainTexture4X);
 		REF_PTR_RELEASE(m_terrainTexture2X);
-		Int LOD = 0; 
+		Int LOD = 0;
 		if (minDistSqr>mipLODDistanceSqr) {
 			LOD = 1;
 		}
@@ -740,14 +733,14 @@ void W3DTerrainBackground::updateTexture(void)
 			m_terrainTexture4X = m_map->getFlatTexture(m_xOrigin, m_yOrigin, m_width, 4*PIXELS_PER_GRID);
 			m_terrainTexture4X->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 			m_terrainTexture4X->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-		}	
+		}
 	} else if (m_texMultiplier == TEX2X) {
 		REF_PTR_RELEASE(m_terrainTexture4X);
 		if (m_terrainTexture2X == NULL) {
 			m_terrainTexture2X = m_map->getFlatTexture(m_xOrigin, m_yOrigin, m_width, 2*PIXELS_PER_GRID);
 			m_terrainTexture2X->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 			m_terrainTexture2X->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-		}	
+		}
 	} else {
 		REF_PTR_RELEASE(m_terrainTexture4X);
 		REF_PTR_RELEASE(m_terrainTexture2X);
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
new file mode 100644
index 00000000000..83a391b5d78
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
@@ -0,0 +1,974 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DTerrainTracks.cpp ////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:   RTS3
+//
+// File name: W3DTerrainTracks.cpp
+//
+// Created:   Mark Wilczynski, May 2001
+//
+// Desc:      Draw track marks on the terrain.  Uses a sequence of connected
+//			  quads that are oriented to fit the terrain and updated when object
+//			  moves.
+//-----------------------------------------------------------------------------
+
+#include "W3DDevice/GameClient/W3DTerrainTracks.h"
+#include "W3DDevice/GameClient/HeightMap.h"
+#include "Common/PerfTimer.h"
+#include "Common/GlobalData.h"
+#include "Common/Debug.h"
+#include "texture.h"
+#include "colmath.h"
+#include "coltest.h"
+#include "rinfo.h"
+#include "camera.h"
+#include "assetmgr.h"
+#include "WW3D2/dx8wrapper.h"
+#include "WW3D2/scene.h"
+#include "GameLogic/TerrainLogic.h"
+#include "GameLogic/Object.h"
+#include "GameClient/Drawable.h"
+
+
+#define BRIDGE_OFFSET_FACTOR	0.25f	//amount to raise tracks above bridges.
+//=============================================================================
+// TerrainTracksRenderObjClass::~TerrainTracksRenderObjClass
+//=============================================================================
+/** Destructor. Releases w3d assets. */
+//=============================================================================
+TerrainTracksRenderObjClass::~TerrainTracksRenderObjClass(void)
+{
+	freeTerrainTracksResources();
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClass::TerrainTracksRenderObjClass
+//=============================================================================
+/** Constructor. Just nulls out some variables. */
+//=============================================================================
+TerrainTracksRenderObjClass::TerrainTracksRenderObjClass(void)
+{
+	m_stageZeroTexture=NULL;
+	m_lastAnchor=Vector3(0,1,2.25);
+	m_haveAnchor=false;
+	m_haveCap=true;
+	m_topIndex=0;
+	m_bottomIndex=0;
+	m_activeEdgeCount=0;
+	m_totalEdgesAdded=0;
+	m_bound=false;
+	m_ownerDrawable = NULL;
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClass::Get_Obj_Space_Bounding_Sphere
+//=============================================================================
+/** WW3D method that returns object bounding sphere used in frustum culling*/
+//=============================================================================
+void TerrainTracksRenderObjClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
+{	/// @todo: Add code to cull track marks to screen by constantly updating bounding volumes
+	sphere=m_boundingSphere;
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClass::Get_Obj_Space_Bounding_Box
+//=============================================================================
+/** WW3D method that returns object bounding box used in collision detection*/
+//=============================================================================
+void TerrainTracksRenderObjClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
+{
+	box=m_boundingBox;
+}
+
+//=============================================================================
+// MirrorRenderObjClass::Class_ID
+//=============================================================================
+/** returns the class id, so the scene can tell what kind of render object it has. */
+//=============================================================================
+Int TerrainTracksRenderObjClass::Class_ID(void) const
+{
+	return RenderObjClass::CLASSID_IMAGE3D;
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClass::Clone
+//=============================================================================
+/** Not used, but required virtual method. */
+//=============================================================================
+RenderObjClass *	 TerrainTracksRenderObjClass::Clone(void) const
+{
+	assert(false);
+	return NULL;
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClass::freeTerrainTracksResources
+//=============================================================================
+/** Free any W3D resources associated with this object */
+//=============================================================================
+Int TerrainTracksRenderObjClass::freeTerrainTracksResources(void)
+{
+	REF_PTR_RELEASE(m_stageZeroTexture);
+	m_haveAnchor=false;
+	m_haveCap=true;
+	m_topIndex=0;
+	m_bottomIndex=0;
+	m_activeEdgeCount=0;
+	m_totalEdgesAdded=0;
+	m_ownerDrawable = NULL;
+
+	return 0;
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClass::init
+//=============================================================================
+/** Setup size settings and allocate W3D texture */
+//=============================================================================
+void TerrainTracksRenderObjClass::init( Real width, Real length, const Char *texturename)
+{
+	freeTerrainTracksResources();	//free old data and ib/vb
+
+	m_boundingSphere.Init(Vector3(0,0,0),400*MAP_XY_FACTOR);
+	m_boundingBox.Center.Set(0.0f, 0.0f, 0.0f);
+	m_boundingBox.Extent.Set(400.0f*MAP_XY_FACTOR, 400.0f*MAP_XY_FACTOR, 1.0f);
+	m_width=width;
+	m_length=length;
+	//no sense culling these things since they have very irregular shape and fade
+	//out over time.
+	Set_Force_Visible(TRUE);
+	m_stageZeroTexture=WW3DAssetManager::Get_Instance()->Get_Texture(texturename);
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClass::addCapEdgeToTrack
+//=============================================================================
+/** Cap the current track (adding an feathered edge) so we're ready to resume
+		the track at a new location.  Used by objects entering FOW where we need to
+		stop adding edges to the track when they enter the fog boundary but resume
+		elsewhere if they become visible again.
+*/
+//=============================================================================
+void TerrainTracksRenderObjClass::addCapEdgeToTrack(Real x, Real y)
+{
+	/// @todo: Have object pass its height and orientation so we can remove extra calls.
+
+	if (m_haveCap)
+	{	//we already have a cap or there are no segments to cap
+		return;
+	}
+
+	if (m_activeEdgeCount == 1)
+	{	//if we only have one edge, then it must be the current anchor edge.
+		//since achnors are caps, there is not point in adding another.
+		m_haveCap=TRUE;
+		m_haveAnchor=false;	//recreate a new anchor when track resumes.
+		return;
+	}
+
+	Vector3	vPos,vZ;
+	Coord3D vZTmp;
+	PathfindLayerEnum objectLayer;
+	Real eHeight;
+
+	if (m_ownerDrawable && (objectLayer=m_ownerDrawable->getObject()->getLayer()) != LAYER_GROUND)
+		eHeight=BRIDGE_OFFSET_FACTOR+TheTerrainLogic->getLayerHeight(x,y,objectLayer,&vZTmp);
+	else
+		eHeight=TheTerrainLogic->getGroundHeight(x,y,&vZTmp);
+
+	vZ.X = vZTmp.x;
+	vZ.Y = vZTmp.y;
+	vZ.Z = vZTmp.z;
+
+	vPos.X=x;
+	vPos.Y=y;
+	vPos.Z=eHeight;
+
+	Vector3	vDir=Vector3(x,y,eHeight)-m_lastAnchor;
+	Int maxEdgeCount=TheTerrainTracksRenderObjClassSystem->m_maxTankTrackEdges;
+
+	//avoid sqrt() by checking distance squared since last track mark
+	if (vDir.Length2() < sqr(m_length))
+	{	//not far enough from anchor to add track
+		//since this is a  cap, we'll force the previous segment to transparent
+		Int lastAddedEdge=m_topIndex-1;
+		if (lastAddedEdge < 0)
+			lastAddedEdge = maxEdgeCount-1;
+		m_edges[lastAddedEdge].alpha=0.0f;	//force the last added edge to transparent.
+		m_haveCap=TRUE;
+		m_haveAnchor=false;	//recreate a new anchor when track resumes.
+		return;
+	}
+
+	if (m_activeEdgeCount >= maxEdgeCount)
+	{	//no more room in buffer so release oldest edge
+		m_bottomIndex++;
+		m_activeEdgeCount--;
+
+		if (m_bottomIndex >= maxEdgeCount)
+			m_bottomIndex=0;	//roll buffer back to start
+	}
+
+	if (m_topIndex >= maxEdgeCount)
+		m_topIndex=0;	//roll around buffer
+
+	//we traveled far enough from last point.
+	//accept new point
+	vDir.Z=0;	//ignore height
+	vDir.Normalize();
+
+	Vector3	vX;
+
+	Vector3::Cross_Product(vDir,vZ,&vX);
+
+	//calculate left end point
+	edgeInfo& topEdge = m_edges[m_topIndex];
+
+	topEdge.endPointPos[0]=vPos-(m_width*0.5f*vX);	///@todo: try getting height at endpoint
+	topEdge.endPointPos[0].Z += 0.2f * MAP_XY_FACTOR;	//raise above terrain slightly
+
+	if (m_totalEdgesAdded&1)	//every other edge has different set of UV's
+	{
+		topEdge.endPointUV[0].X=0.0f;
+		topEdge.endPointUV[0].Y=0.0f;
+	}
+	else
+	{
+		topEdge.endPointUV[0].X=0.0f;
+		topEdge.endPointUV[0].Y=1.0f;
+	}
+
+	//calculate right end point
+	topEdge.endPointPos[1]=vPos+(m_width*0.5f*vX);	///@todo: try getting height at endpoint
+	topEdge.endPointPos[1].Z += 0.2f * MAP_XY_FACTOR;	//raise above terrain slightly
+
+	if (m_totalEdgesAdded&1)	//every other edge has different set of UV's
+	{
+		topEdge.endPointUV[1].X=1.0f;
+		topEdge.endPointUV[1].Y=0.0f;
+	}
+	else
+	{
+		topEdge.endPointUV[1].X=1.0f;
+		topEdge.endPointUV[1].Y=1.0f;
+	}
+
+	topEdge.timeAdded=WW3D::Get_Sync_Time();
+	topEdge.alpha=0.0f;	//fully transparent at cap.
+	m_lastAnchor=vPos;
+	m_activeEdgeCount++;
+	m_totalEdgesAdded++;
+	m_topIndex++;	//make space for new edge
+	m_haveCap=TRUE;
+	m_haveAnchor=false;
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClass::addEdgeToTrack
+//=============================================================================
+/** Try to add an additional segment to track mark.  Will do nothing if distance
+* from last edge is too small.  Will overwrite the oldest edge if maximum track
+* length is reached.  Oldest edges should by faded out by that time.
+*/
+//=============================================================================
+void TerrainTracksRenderObjClass::addEdgeToTrack(Real x, Real y)
+{
+	/// @todo: Have object pass its height and orientation so we can remove extra calls.
+
+	if (!m_haveAnchor)
+	{	//no anchor yet, make this point an anchor.
+		PathfindLayerEnum objectLayer;
+		if (m_ownerDrawable && (objectLayer=m_ownerDrawable->getObject()->getLayer()) != LAYER_GROUND)
+			m_lastAnchor=Vector3(x,y,TheTerrainLogic->getLayerHeight(x,y,objectLayer)+BRIDGE_OFFSET_FACTOR);
+		else
+			m_lastAnchor=Vector3(x,y,TheTerrainLogic->getGroundHeight(x,y));
+
+		m_haveAnchor=true;
+		m_airborne = true;
+		m_haveCap = true;	//single segment tracks are always capped because nothing is drawn.
+		return;
+	}
+
+	m_haveCap = false;	//have more than 1 segment now so will need to cap if it's interrupted.
+
+	Vector3	vPos,vZ;
+	Coord3D vZTmp;
+	Real eHeight;
+	PathfindLayerEnum objectLayer;
+
+	if (m_ownerDrawable && (objectLayer=m_ownerDrawable->getObject()->getLayer()) != LAYER_GROUND)
+		eHeight=BRIDGE_OFFSET_FACTOR+TheTerrainLogic->getLayerHeight(x,y,objectLayer,&vZTmp);
+	else
+		eHeight=TheTerrainLogic->getGroundHeight(x,y,&vZTmp);
+
+	vZ.X = vZTmp.x;
+	vZ.Y = vZTmp.y;
+	vZ.Z = vZTmp.z;
+
+	vPos.X=x;
+	vPos.Y=y;
+	vPos.Z=eHeight;
+
+	Vector3	vDir=Vector3(x,y,eHeight)-m_lastAnchor;
+
+	//avoid sqrt() by checking distance squared since last track mark
+	if (vDir.Length2() < sqr(m_length))
+		return;	//not far enough from anchor to add track
+
+	Int maxEdgeCount=TheTerrainTracksRenderObjClassSystem->m_maxTankTrackEdges;
+
+	if (m_activeEdgeCount >= maxEdgeCount)
+	{	//no more room in buffer so release oldest edge
+		m_bottomIndex++;
+		m_activeEdgeCount--;
+
+		if (m_bottomIndex >= maxEdgeCount)
+			m_bottomIndex=0;	//roll buffer back to start
+	}
+
+	if (m_topIndex >= maxEdgeCount)
+		m_topIndex=0;	//roll around buffer
+
+	//we traveled far enough from last point.
+	//accept new point
+	vDir.Z=0;	//ignore height
+	vDir.Normalize();
+
+	Vector3	vX;
+
+	Vector3::Cross_Product(vDir,vZ,&vX);
+
+	edgeInfo& topEdge = m_edges[m_topIndex];
+
+	//calculate left end point
+	topEdge.endPointPos[0]=vPos-(m_width*0.5f*vX);	///@todo: try getting height at endpoint
+	topEdge.endPointPos[0].Z += 0.2f * MAP_XY_FACTOR;	//raise above terrain slightly
+
+	if (m_totalEdgesAdded&1)	//every other edge has different set of UV's
+	{
+		topEdge.endPointUV[0].X=0.0f;
+		topEdge.endPointUV[0].Y=0.0f;
+	}
+	else
+	{
+		topEdge.endPointUV[0].X=0.0f;
+		topEdge.endPointUV[0].Y=1.0f;
+	}
+
+	//calculate right end point
+	topEdge.endPointPos[1]=vPos+(m_width*0.5f*vX);	///@todo: try getting height at endpoint
+	topEdge.endPointPos[1].Z += 0.2f * MAP_XY_FACTOR;	//raise above terrain slightly
+
+	if (m_totalEdgesAdded&1)	//every other edge has different set of UV's
+	{
+		topEdge.endPointUV[1].X=1.0f;
+		topEdge.endPointUV[1].Y=0.0f;
+	}
+	else
+	{
+		topEdge.endPointUV[1].X=1.0f;
+		topEdge.endPointUV[1].Y=1.0f;
+	}
+
+	topEdge.timeAdded=WW3D::Get_Sync_Time();
+	topEdge.alpha=1.0f;	//fully opaque at start.
+	if (m_airborne || m_activeEdgeCount <= 1) {
+		topEdge.alpha=0.0f;	//smooth out track restarts by setting transparent
+	}
+	m_airborne = false;
+
+	m_lastAnchor=vPos;
+	m_activeEdgeCount++;
+	m_totalEdgesAdded++;
+	m_topIndex++;	//make space for new edge
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClass::Render
+//=============================================================================
+/** Does nothing.  Just increments a counter of how many track edges were
+*  requested for rendering this frame.  Actual rendering is done in flush().
+*/
+//=============================================================================
+void TerrainTracksRenderObjClass::Render(RenderInfoClass & rinfo)
+{	///@todo: After adding track mark visibility tests, add visible marks to another list.
+	if (TheGlobalData->m_makeTrackMarks && m_activeEdgeCount >= 2)
+		TheTerrainTracksRenderObjClassSystem->m_edgesToFlush += m_activeEdgeCount;
+}
+
+#define DEFAULT_TRACK_SPACING  (MAP_XY_FACTOR  * 1.4f)
+#define DEFAULT_TRACK_WIDTH	4.0f;
+
+/**Find distance between the "trackfx" bones of the model.  This tells us the correct
+   width for the trackmarks.
+*/
+static Real computeTrackSpacing(RenderObjClass *renderObj)
+{
+	Real trackSpacing = DEFAULT_TRACK_SPACING;
+	Int leftTrack;
+	Int rightTrack;
+
+	if ((leftTrack=renderObj->Get_Bone_Index( "TREADFX01" )) != 0 && (rightTrack=renderObj->Get_Bone_Index( "TREADFX02" )) != 0)
+	{	//both bones found, determine distance between them.
+		Vector3 leftPos,rightPos;
+		leftPos=renderObj->Get_Bone_Transform( leftTrack ).Get_Translation();
+		rightPos=renderObj->Get_Bone_Transform( rightTrack ).Get_Translation();
+		rightPos -= leftPos;	//get distance between centers of tracks
+		trackSpacing = rightPos.Length() + DEFAULT_TRACK_WIDTH;	//add width of each track
+		///@todo: It's assumed that all tank treads have the same width.
+	};
+
+	return trackSpacing;
+}
+
+//=============================================================================
+//TerrainTracksRenderObjClassSystem::bindTrack
+//=============================================================================
+/** Grab a track from the free store. If no free tracks exist, return NULL.
+	As long as a track is bound to an object (like a tank) it is ready to accept
+	updates with additional edges.  Once it is unbound, it will expire and return
+	to the free store once all tracks have faded out.
+
+	Input: width in world units of each track edge (should probably width of vehicle).
+		   length in world units between edges.  Shorter lengths produce more edges and
+		   smoother curves.
+		   texture to use for the tracks - image should be symetrical and include alpha channel.
+*/
+//=============================================================================
+TerrainTracksRenderObjClass *TerrainTracksRenderObjClassSystem::bindTrack( RenderObjClass *renderObject, Real length, const Char *texturename)
+{
+	TerrainTracksRenderObjClass *mod;
+
+	mod = m_freeModules;
+	if( mod )
+	{
+		// take module off the free list
+		if( mod->m_nextSystem )
+			mod->m_nextSystem->m_prevSystem = mod->m_prevSystem;
+		if( mod->m_prevSystem )
+			mod->m_prevSystem->m_nextSystem = mod->m_nextSystem;
+		else
+			m_freeModules = mod->m_nextSystem;
+
+		// put module on the used list
+		mod->m_prevSystem = NULL;
+		mod->m_nextSystem = m_usedModules;
+		if( m_usedModules )
+			m_usedModules->m_prevSystem = mod;
+		m_usedModules = mod;
+
+		mod->init(computeTrackSpacing(renderObject),length,texturename);
+		mod->m_bound=true;
+		m_TerrainTracksScene->Add_Render_Object( mod);
+	}
+
+	return mod;
+
+}
+
+//=============================================================================
+//TerrainTracksRenderObjClassSystem::unbindTrack
+//=============================================================================
+/** Called when an object (i.e Tank) will not lay down any more tracks and
+doesn't need this object anymore.  The track-laying object will be returned
+to pool of available tracks as soon as any remaining track edges have faded out.
+*/
+//=============================================================================
+void TerrainTracksRenderObjClassSystem::unbindTrack( TerrainTracksRenderObjClass *mod )
+{
+	//this object should return to free store as soon as there is nothing
+	//left to render.
+	mod->m_bound=false;
+	mod->m_ownerDrawable = NULL;
+}
+
+//=============================================================================
+//TerrainTracksRenderObjClassSystem::releaseTrack
+//=============================================================================
+/** Returns a track laying object to free store to be used again later.
+*/
+void TerrainTracksRenderObjClassSystem::releaseTrack( TerrainTracksRenderObjClass *mod )
+{
+	if (mod==NULL)
+		return;
+
+	DEBUG_ASSERTCRASH(mod->m_bound == false, ("mod is bound."));
+
+	// remove module from used list
+	if( mod->m_nextSystem )
+		mod->m_nextSystem->m_prevSystem = mod->m_prevSystem;
+	if( mod->m_prevSystem )
+		mod->m_prevSystem->m_nextSystem = mod->m_nextSystem;
+	else
+		m_usedModules = mod->m_nextSystem;
+
+	// add module to free list
+	mod->m_prevSystem = NULL;
+	mod->m_nextSystem = m_freeModules;
+	if( m_freeModules )
+		m_freeModules->m_prevSystem = mod;
+	m_freeModules = mod;
+	mod->freeTerrainTracksResources();
+	m_TerrainTracksScene->Remove_Render_Object(mod);
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClassSystem::TerrainTracksRenderObjClassSystem
+//=============================================================================
+/** Constructor. Just nulls out some variables. */
+//=============================================================================
+TerrainTracksRenderObjClassSystem::TerrainTracksRenderObjClassSystem()
+{
+	m_usedModules = NULL;
+	m_freeModules = NULL;
+	m_TerrainTracksScene = NULL;
+	m_edgesToFlush = 0;
+	m_indexBuffer = NULL;
+	m_vertexMaterialClass = NULL;
+	m_vertexBuffer = NULL;
+
+	m_maxTankTrackEdges=TheGlobalData->m_maxTankTrackEdges;
+	m_maxTankTrackOpaqueEdges=TheGlobalData->m_maxTankTrackOpaqueEdges;
+	m_maxTankTrackFadeDelay=TheGlobalData->m_maxTankTrackFadeDelay;
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClassSystem::~TerrainTracksRenderObjClassSystem
+//=============================================================================
+/** Destructor.  Free all pre-allocated track laying render objects*/
+//=============================================================================
+TerrainTracksRenderObjClassSystem::~TerrainTracksRenderObjClassSystem( void )
+{
+
+	// free all data
+	shutdown();
+
+	m_vertexMaterialClass=NULL;
+	m_TerrainTracksScene=NULL;
+
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClassSystem::ReAcquireResources
+//=============================================================================
+/** (Re)allocates all W3D assets after a reset.. */
+//=============================================================================
+void TerrainTracksRenderObjClassSystem::ReAcquireResources(void)
+{
+	Int i;
+	const Int numModules=TheGlobalData->m_maxTerrainTracks;
+
+	// just for paranoia's sake.
+	REF_PTR_RELEASE(m_indexBuffer);
+	REF_PTR_RELEASE(m_vertexBuffer);
+
+	//Create static index buffers.  These will index the vertex buffers holding the track segments
+	m_indexBuffer=NEW_REF(DX8IndexBufferClass,((m_maxTankTrackEdges-1)*6));
+
+	// Fill up the IB
+	{
+		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
+		UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
+
+		for (i=0; i<(m_maxTankTrackEdges-1); i++)
+		{
+			ib[3]=ib[0]=i*2;
+			ib[1]=i*2+1;
+			ib[4]=ib[2]=(i+1)*2+1;
+			ib[5]=(i+1)*2;
+			ib+=6;	//skip the 6 indices we just filled
+		}
+	}
+
+	DEBUG_ASSERTCRASH(numModules*m_maxTankTrackEdges*2 < 65535, ("Too many terrain track edges"));
+
+	m_vertexBuffer=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZDUV1,numModules*m_maxTankTrackEdges*2,DX8VertexBufferClass::USAGE_DYNAMIC));
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClassSystem::ReleaseResources
+//=============================================================================
+/** (Re)allocates all W3D assets after a reset.. */
+//=============================================================================
+void TerrainTracksRenderObjClassSystem::ReleaseResources(void)
+{
+	REF_PTR_RELEASE(m_indexBuffer);
+	REF_PTR_RELEASE(m_vertexBuffer);
+	// Note - it is ok to not release the material, as it is a w3d object that
+	// has no dx8 resources. jba.
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClassSystem::init
+//=============================================================================
+/**  initialize the system, allocate all the render objects we will need */
+//=============================================================================
+void TerrainTracksRenderObjClassSystem::init( SceneClass *TerrainTracksScene )
+{
+	const Int numModules=TheGlobalData->m_maxTerrainTracks;
+
+	Int i;
+	TerrainTracksRenderObjClass *mod;
+
+	m_TerrainTracksScene=TerrainTracksScene;
+
+	ReAcquireResources();
+	//go with a preset material for now.
+	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+
+	//use a multi-texture shader: (text1*diffuse)*text2.
+	m_shaderClass = ShaderClass::_PresetAlphaShader;//_PresetATestSpriteShader;//_PresetOpaqueShader;
+
+	// we cannot initialize a system that is already initialized
+	if( m_freeModules || m_usedModules )
+	{
+
+		// system already online!
+		assert( 0 );
+		return;
+
+	}
+
+	// allocate our modules for this system
+	for( i = 0; i < numModules; i++ )
+	{
+
+		mod = NEW_REF( TerrainTracksRenderObjClass, () );
+
+		if( mod == NULL )
+		{
+
+			// unable to allocate modules needed
+			assert( 0 );
+			return;
+
+		}
+
+		mod->m_prevSystem = NULL;
+		mod->m_nextSystem = m_freeModules;
+		if( m_freeModules )
+			m_freeModules->m_prevSystem = mod;
+		m_freeModules = mod;
+
+	}
+
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClassSystem::shutdown
+//=============================================================================
+/** Shutdown and free all memory for this system */
+//=============================================================================
+void TerrainTracksRenderObjClassSystem::shutdown( void )
+{
+	TerrainTracksRenderObjClass *nextMod,*mod;
+
+	//release unbound tracks that may still be fading out
+	mod=m_usedModules;
+
+	while(mod)
+	{
+		nextMod=mod->m_nextSystem;
+
+		if (!mod->m_bound)
+			releaseTrack(mod);
+
+		mod = nextMod;
+	}
+
+
+	// free all attached things and used modules
+	assert( m_usedModules == NULL );
+
+	// free all module storage
+	while( m_freeModules )
+	{
+
+		nextMod = m_freeModules->m_nextSystem;
+		REF_PTR_RELEASE (m_freeModules);
+		m_freeModules = nextMod;
+
+	}
+
+	REF_PTR_RELEASE(m_indexBuffer);
+	REF_PTR_RELEASE(m_vertexMaterialClass);
+	REF_PTR_RELEASE(m_vertexBuffer);
+
+}
+
+//=============================================================================
+// TerrainTracksRenderObjClassSystem::update
+//=============================================================================
+/** Update the state of all active track marks - fade, expire, etc. */
+//=============================================================================
+void TerrainTracksRenderObjClassSystem::update()
+{
+
+	Int		iTime=WW3D::Get_Sync_Time();
+	Real	iDiff;
+	TerrainTracksRenderObjClass *mod=m_usedModules,*nextMod;
+
+	//first update all the tracks
+	while( mod )
+	{
+		Int i,index;
+		Vector3 *endPoint;
+		Vector2 *endPointUV;
+
+		nextMod = mod->m_nextSystem;
+
+		if (!TheGlobalData->m_makeTrackMarks)
+			mod->m_haveAnchor=false;	//force a track restart next time around.
+
+		for (i=0,index=mod->m_bottomIndex; i<mod->m_activeEdgeCount; i++,index++)
+		{
+			if (index >= m_maxTankTrackEdges)
+				index=0;
+
+			endPoint=&mod->m_edges[index].endPointPos[0];	//left endpoint
+			endPointUV=&mod->m_edges[index].endPointUV[0];
+			iDiff=(float)(iTime-mod->m_edges[index].timeAdded);
+			iDiff = 1.0f - iDiff/(Real)m_maxTankTrackFadeDelay;
+			if (iDiff < 0.0)
+				iDiff=0.0f;
+			if (mod->m_edges[index].alpha>0.0f) {
+				mod->m_edges[index].alpha=iDiff;
+			}
+
+			if (iDiff == 0.0f)
+			{	//this edge was invisible, we can remove it
+				mod->m_bottomIndex++;
+				mod->m_activeEdgeCount--;
+
+				if (mod->m_bottomIndex >= m_maxTankTrackEdges)
+					mod->m_bottomIndex=0;	//roll buffer back to start
+			}
+			if (mod->m_activeEdgeCount == 0 && !mod->m_bound)
+				releaseTrack(mod);
+		}
+		mod = nextMod;
+	}
+}
+
+
+//=============================================================================
+// TerrainTracksRenderObjClassSystem::flush
+//=============================================================================
+/** Draw all active track marks for this frame */
+//=============================================================================
+void TerrainTracksRenderObjClassSystem::flush()
+{
+/** @todo: Optimize system by drawing tracks as triangle strips and use dynamic vertex buffer access.
+May also try rendering all tracks with one call to W3D/D3D by grouping them by texture.
+Try improving the fit to vertical surfaces like cliffs.
+*/
+
+	Int	diffuseLight;
+	TerrainTracksRenderObjClass *mod=m_usedModules;
+	if (!mod)
+		return;	//nothing to render
+
+	Int	trackStartIndex;
+	Real distanceFade;
+
+	if (ShaderClass::Is_Backface_Culling_Inverted())
+		return;	//don't render track marks in reflections.
+
+	// adjust shading for time of day.
+	Real shadeR, shadeG, shadeB;
+	shadeR = TheGlobalData->m_terrainAmbient[0].red;
+	shadeG = TheGlobalData->m_terrainAmbient[0].green;
+	shadeB = TheGlobalData->m_terrainAmbient[0].blue;
+	shadeR += TheGlobalData->m_terrainDiffuse[0].red/2;
+	shadeG += TheGlobalData->m_terrainDiffuse[0].green/2;
+	shadeB += TheGlobalData->m_terrainDiffuse[0].blue/2;
+	shadeR*=255.0f;
+	shadeG*=255.0f;
+	shadeB*=255.0f;
+
+	diffuseLight = REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16);
+	Real numFadedEdges=m_maxTankTrackEdges-m_maxTankTrackOpaqueEdges;
+
+	//check if there is anything to draw and fill vertex buffer
+	if (m_edgesToFlush >= 2)
+	{
+		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexBuffer);
+		VertexFormatXYZDUV1 *verts = (VertexFormatXYZDUV1*)lockVtxBuffer.Get_Vertex_Array();
+		trackStartIndex=0;
+
+		mod=m_usedModules;
+		//Fill our vertex buffer with all the tracks
+		while( mod )
+		{
+			Int i,index;
+			Vector3 *endPoint;
+			Vector2 *endPointUV;
+
+			if (mod->m_activeEdgeCount >= 2 && mod->Is_Really_Visible())
+			{
+				for (i=0,index=mod->m_bottomIndex; i<mod->m_activeEdgeCount; i++,index++)
+				{
+					if (index >= m_maxTankTrackEdges)
+						index=0;
+
+					endPoint=&mod->m_edges[index].endPointPos[0];	//left endpoint
+					endPointUV=&mod->m_edges[index].endPointUV[0];
+
+					distanceFade=1.0f;
+
+					if ((mod->m_activeEdgeCount -1 -i) >= m_maxTankTrackOpaqueEdges)// && i < (MAX_PER_TRACK_EDGE_COUNT-FORCE_FADE_AT_EDGE))
+					{	//we're getting close to the limit on the number of track pieces allowed
+						//so force it to fade out.
+						distanceFade=1.0f-(float)((mod->m_activeEdgeCount -i)-m_maxTankTrackOpaqueEdges)/numFadedEdges;
+					}
+
+					distanceFade *= mod->m_edges[index].alpha;	//adjust fade with distance from start of track
+
+					verts->x=endPoint->X;
+					verts->y=endPoint->Y;
+					verts->z=endPoint->Z;
+
+					verts->u1=endPointUV->X;
+					verts->v1=endPointUV->Y;
+
+					//fade the alpha channel with distance
+					verts->diffuse=diffuseLight | ( REAL_TO_INT(distanceFade*255.0f) <<24);
+					verts++;
+
+					endPoint=&mod->m_edges[index].endPointPos[1];	//right endpoint
+					endPointUV=&mod->m_edges[index].endPointUV[1];
+
+					verts->x=endPoint->X;
+					verts->y=endPoint->Y;
+					verts->z=endPoint->Z;
+
+					verts->u1=endPointUV->X;
+					verts->v1=endPointUV->Y;			///@todo: Add diffuse lighting.
+
+					verts->diffuse=diffuseLight | ( REAL_TO_INT(distanceFade*255.0f) <<24);
+					verts++;
+				}
+			}
+			mod = mod->m_nextSystem;
+		}
+	}
+
+	//draw the filled vertex buffers
+	if (m_edgesToFlush >= 2)
+	{
+		ShaderClass::Invalidate();
+		DX8Wrapper::Set_Material(m_vertexMaterialClass);
+		DX8Wrapper::Set_Shader(m_shaderClass);
+		DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
+		DX8Wrapper::Set_Vertex_Buffer(m_vertexBuffer);
+
+		trackStartIndex=0;
+		mod=m_usedModules;
+		Matrix3D tm(mod->Transform);
+		DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
+		while (mod)
+		{
+			if (mod->m_activeEdgeCount >= 2 && mod->Is_Really_Visible())
+			{
+				DX8Wrapper::Set_Texture(0,mod->m_stageZeroTexture);
+				DX8Wrapper::Set_Index_Buffer_Index_Offset(trackStartIndex);
+				DX8Wrapper::Draw_Triangles(	0,(mod->m_activeEdgeCount-1)*2, 0, mod->m_activeEdgeCount*2);
+
+				trackStartIndex += mod->m_activeEdgeCount*2;
+			}
+			mod=mod->m_nextSystem;
+		}
+	}
+
+	m_edgesToFlush=0;	//reset count for next flush
+}
+
+/**Removes all remaining tracks from the rendering system*/
+void TerrainTracksRenderObjClassSystem::Reset(void)
+{
+	TerrainTracksRenderObjClass *nextMod,*mod=m_usedModules;
+
+	while(mod)
+	{
+		nextMod=mod->m_nextSystem;
+
+		releaseTrack(mod);
+
+		mod = nextMod;
+	}
+
+
+	// free all attached things and used modules
+	assert( m_usedModules == NULL );
+	m_edgesToFlush=0;
+}
+
+/**Clear the treads from each track laying object without freeing the objects.
+Mostly used when user changed LOD level*/
+void TerrainTracksRenderObjClassSystem::clearTracks(void)
+{
+	TerrainTracksRenderObjClass *mod=m_usedModules;
+
+	while(mod)
+	{
+		mod->m_haveAnchor=false;
+		mod->m_haveCap=true;
+		mod->m_topIndex=0;
+		mod->m_bottomIndex=0;
+		mod->m_activeEdgeCount=0;
+		mod->m_totalEdgesAdded=0;
+
+		mod = mod->m_nextSystem;
+	}
+
+	m_edgesToFlush=0;
+}
+
+/**Adjust various paremeters which affect the cost of rendering tracks on the map.
+Parameters are passed via GlobalData*/
+void TerrainTracksRenderObjClassSystem::setDetail(void)
+{
+	//Remove all existing track segments from screen.
+	clearTracks();
+	ReleaseResources();
+
+	m_maxTankTrackEdges=TheGlobalData->m_maxTankTrackEdges;
+	m_maxTankTrackOpaqueEdges=TheGlobalData->m_maxTankTrackOpaqueEdges;
+	m_maxTankTrackFadeDelay=TheGlobalData->m_maxTankTrackFadeDelay;
+
+	//We changed the maximum number of visible edges so re-allocate our resources to match.
+	ReAcquireResources();
+};
+
+TerrainTracksRenderObjClassSystem *TheTerrainTracksRenderObjClassSystem=NULL;	///< singleton for track drawing system.
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
new file mode 100644
index 00000000000..77935049c58
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
@@ -0,0 +1,1261 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DTerrainVisual.cpp /////////////////////////////////////////////////////////////////////
+// W3D implementation details for visual aspects of terrain
+// Author: Colin Day, April 2001
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include <stdlib.h>
+#include <windows.h>
+
+#include "Common/GameState.h"
+#include "Common/GlobalData.h"
+#include "Common/PerfTimer.h"
+#include "Common/MapReaderWriterInfo.h"
+#include "Common/ThingTemplate.h"
+#include "Common/WellKnownKeys.h"
+#include "Common/TerrainTypes.h"
+#include "Common/Xfer.h"
+#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
+
+#include "GameClient/Drawable.h"
+#include "GameClient/ClientRandomValue.h"
+
+#include "GameLogic/Object.h"
+#include "GameLogic/GameLogic.h"
+
+#include "W3DDevice/GameClient/W3DScene.h"
+#include "W3DDevice/GameClient/W3DTerrainVisual.h"
+#include "W3DDevice/GameClient/WorldHeightMap.h"
+#include "W3DDevice/GameClient/W3DWater.h"
+#include "W3DDevice/GameClient/W3DDisplay.h"
+#include "W3DDevice/GameClient/W3DDebugIcons.h"
+#include "W3DDevice/GameClient/W3DTerrainTracks.h"
+#include "W3DDevice/GameClient/W3DShadow.h"
+#include "W3DDevice/GameClient/HeightMap.h"
+#include "W3DDevice/GameClient/FlatHeightMap.h"
+#include "W3DDevice/GameClient/W3DSmudge.h"
+#include "W3DDevice/GameClient/Module/W3DModelDraw.h"
+#include "WW3D2/light.h"
+#include "WW3D2/rendobj.h"
+#include "WW3D2/coltype.h"
+#include "WW3D2/coltest.h"
+#include "WW3D2/assetmgr.h"
+
+
+
+class TestSeismicFilter : public SeismicSimulationFilterBase
+{
+
+  virtual SeismicSimStatusCode filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node )
+  {
+
+
+    Int life = node->m_life;
+
+    if ( heightMap == NULL )
+      return SEISMIC_STATUS_INVALID;
+
+
+    if ( life == 0 )
+      return SEISMIC_STATUS_ACTIVE;
+    if ( life < 15 )
+    {
+      // ADD HEIGHT BECAUSE THE EXPLOSION IS PUSHING DIRT UP
+
+      Real magnitude = node->m_magnitude;
+
+      Real offsScalar =  magnitude / (Real)life; // real-life, get it?
+      Int radius = node->m_radius;
+      Int border = heightMap->getBorderSize();
+      Int centerX = node->m_center.x + border ;
+      Int centerY = node->m_center.y + border ;
+
+      UnsignedInt workspaceWidth = radius*2;
+      Real *workspace = NEW Real[ sqr(workspaceWidth) ];
+      Real *workspaceEnd = workspace + sqr(workspaceWidth);
+
+
+      for ( Real *t = workspace; t < workspaceEnd; ++t ) *t = 0.0f;// clear the workspace
+
+      Int x = 0;
+      for (; x < radius; ++x)
+      {
+        for (Int y = 0; y < radius; ++y)
+        {
+
+          Real distance = sqrt( sqr(x) + sqr(y) );//Pythagoras
+
+          if ( distance < radius )
+          {
+            Real distScalar = cos( ( distance / radius * (PI/2) ) );
+            Real height = (offsScalar * distScalar);
+
+            workspace[ (radius + x) +  workspaceWidth * (radius + y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX + x,  centerY + y ) ;//kaleidoscope
+
+            if ( x != 0 ) // non-zero test prevents cross-shaped double stamp
+            {
+      			  workspace[ (radius - x) + workspaceWidth * (radius + y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX - x,  centerY + y ) ;
+              if ( y != 0 )
+                workspace[ (radius - x) + workspaceWidth * (radius - y) ] =  height + heightMap->getBilinearSampleSeismicZVelocity( centerX - x,  centerY - y ) ;
+            }
+            if ( y != 0 )
+      			  workspace[ (radius + x) + workspaceWidth * (radius - y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX + x,  centerY - y ) ;
+          }
+        }
+      }
+
+      // stuff the values from the workspace into the heightmap's velocities
+      for (x = 0; x < workspaceWidth; ++x)
+        for (Int y = 0; y < workspaceWidth; ++y)
+    			heightMap->setSeismicZVelocity( centerX - radius + x, centerY - radius + y,  workspace[  x + workspaceWidth * y ]  );
+
+      delete [] workspace;
+
+      return SEISMIC_STATUS_ACTIVE;
+    }
+    else
+      return SEISMIC_STATUS_ZERO_ENERGY;
+  }
+
+  virtual Real applyGravityCallback( Real velocityIn )
+  {
+    Real velocityOut = velocityIn;
+    velocityOut -= 1.5f;
+    return velocityOut;
+  }
+
+
+};
+static TestSeismicFilter testSeismicFilter;
+
+
+
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+W3DTerrainVisual::W3DTerrainVisual()
+{
+
+	m_terrainRenderObject = NULL;
+	m_waterRenderObject = NULL;
+	TheWaterRenderObj = NULL;
+
+  m_logicHeightMap   = NULL;
+
+#ifdef DO_SEISMIC_SIMULATIONS
+  m_clientHeightMap = NULL;
+#endif
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+W3DTerrainVisual::~W3DTerrainVisual()
+{
+	// release our render object
+	if (TheTerrainRenderObject == m_terrainRenderObject) {
+		TheTerrainRenderObject = NULL;
+	}
+
+	delete TheTerrainTracksRenderObjClassSystem;
+	TheTerrainTracksRenderObjClassSystem=NULL;
+
+	delete TheW3DShadowManager;
+	TheW3DShadowManager=NULL;
+
+	delete TheSmudgeManager;
+	TheSmudgeManager=NULL;
+
+	REF_PTR_RELEASE( m_waterRenderObject );
+	TheWaterRenderObj=NULL;
+	REF_PTR_RELEASE( m_terrainRenderObject );
+	REF_PTR_RELEASE( m_logicHeightMap );
+
+#ifdef DO_SEISMIC_SIMULATIONS
+  REF_PTR_RELEASE( m_clientHeightMap );
+#endif
+}
+
+//-------------------------------------------------------------------------------------------------
+/** init */
+//-------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::init( void )
+{
+
+	// extend
+	TerrainVisual::init();
+	// create a new render object for W3D
+	m_terrainRenderObject = NEW_REF( HeightMapRenderObjClass, () );
+	m_terrainRenderObject->Set_Collision_Type( PICK_TYPE_TERRAIN );
+	TheTerrainRenderObject = m_terrainRenderObject;
+
+	if (!TheGlobalData->m_headless)
+	{
+		// initialize track drawing system
+		TheTerrainTracksRenderObjClassSystem = NEW TerrainTracksRenderObjClassSystem;
+		TheTerrainTracksRenderObjClassSystem->init(W3DDisplay::m_3DScene);
+
+		// initialize object shadow drawing system
+		TheW3DShadowManager = NEW W3DShadowManager;
+ 		TheW3DShadowManager->init();
+
+		// create a water plane render object
+		TheWaterRenderObj=m_waterRenderObject = NEW_REF( WaterRenderObjClass, () );
+		m_waterRenderObject->init(TheGlobalData->m_waterPositionZ, TheGlobalData->m_waterExtentX, TheGlobalData->m_waterExtentY, W3DDisplay::m_3DScene, (WaterRenderObjClass::WaterType)TheGlobalData->m_waterType);	//create a water plane that's 128x128 units
+		m_waterRenderObject->Set_Position(Vector3(TheGlobalData->m_waterPositionX,TheGlobalData->m_waterPositionY,TheGlobalData->m_waterPositionZ));	//place water in world
+
+		// create smudge rendering system.
+		TheSmudgeManager = NEW(W3DSmudgeManager);
+		TheSmudgeManager->init();
+
+#ifdef DO_UNIT_TIMINGS
+#pragma MESSAGE("********************* WARNING- Doing UNIT TIMINGS. ")
+#else
+		if (TheGlobalData->m_waterType == WaterRenderObjClass::WATER_TYPE_1_FB_REFLECTION)
+		{	// add water render object to the pre-pass scene (to be rendered before main scene)
+ 			//W3DDisplay::m_prePass3DScene->Add_Render_Object( m_waterRenderObject);
+		}
+		else
+		{	// add water render object to the post-pass scene (to be rendered after main scene)
+			W3DDisplay::m_3DScene->Add_Render_Object( m_waterRenderObject);
+		}
+#endif
+		if (TheGlobalData->m_useCloudPlane)
+			m_waterRenderObject->toggleCloudLayer(true);
+		else
+			m_waterRenderObject->toggleCloudLayer(false);
+	}
+
+	// set the vertex animated water properties
+	Int waterSettingIndex = 0;  // use index 0 settings by default
+	TheTerrainVisual->setWaterGridHeightClamps( NULL,
+																							TheGlobalData->m_vertexWaterHeightClampLow[ waterSettingIndex ],
+																							TheGlobalData->m_vertexWaterHeightClampHi[ waterSettingIndex ] );
+	TheTerrainVisual->setWaterTransform( NULL,
+																			 TheGlobalData->m_vertexWaterAngle[ waterSettingIndex ],
+																			 TheGlobalData->m_vertexWaterXPosition[ waterSettingIndex ],
+																			 TheGlobalData->m_vertexWaterYPosition[ waterSettingIndex ],
+																			 TheGlobalData->m_vertexWaterZPosition[ waterSettingIndex ] );
+	TheTerrainVisual->setWaterGridResolution( NULL,
+																						TheGlobalData->m_vertexWaterXGridCells[ waterSettingIndex ],
+																						TheGlobalData->m_vertexWaterYGridCells[ waterSettingIndex ],
+																						TheGlobalData->m_vertexWaterGridSize[ waterSettingIndex ] );
+	TheTerrainVisual->setWaterAttenuationFactors( NULL,
+																								TheGlobalData->m_vertexWaterAttenuationA[ waterSettingIndex ],
+																								TheGlobalData->m_vertexWaterAttenuationB[ waterSettingIndex ],
+																								TheGlobalData->m_vertexWaterAttenuationC[ waterSettingIndex ],
+																								TheGlobalData->m_vertexWaterAttenuationRange[ waterSettingIndex ] );
+	m_isWaterGridRenderingEnabled = FALSE;
+
+#ifdef DO_SEISMIC_SIMULATIONS
+  m_seismicSimulationList.clear();
+#endif
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** reset */
+//-------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::reset( void )
+{
+
+	// extend
+	TerrainVisual::reset();
+
+	m_terrainRenderObject->reset();
+
+	if (TheW3DShadowManager)
+		TheW3DShadowManager->Reset();
+
+	if (TheSmudgeManager)
+		TheSmudgeManager->reset();
+
+	if (TheTerrainTracksRenderObjClassSystem)
+		TheTerrainTracksRenderObjClassSystem->Reset();
+
+	// reset water render object if present
+	if( m_waterRenderObject )
+	{
+		for (Int i=0; i<5; i++)
+		{
+			//check if this texture was ever changed from default
+			if (m_currentSkyboxTexNames[i] != m_initialSkyboxTexNames[i])
+			{
+				m_waterRenderObject->replaceSkyboxTexture(m_currentSkyboxTexNames[i], m_initialSkyboxTexNames[i]);
+				m_currentSkyboxTexNames[i]=m_initialSkyboxTexNames[i];	//update current state to new texture
+			}
+		}
+
+		m_waterRenderObject->reset();
+	}
+
+#ifdef DO_SEISMIC_SIMULATIONS
+  m_seismicSimulationList.clear();
+#endif
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** update */
+//-------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::update( void )
+{
+
+	// extend
+	TerrainVisual::update();
+
+#ifdef DO_SEISMIC_SIMULATIONS
+  handleSeismicSimulations();
+#endif
+	// if we have a water render object, it has an update method
+	if( m_waterRenderObject )
+		m_waterRenderObject->update();
+
+}
+
+
+#ifdef DO_SEISMIC_SIMULATIONS
+
+void W3DTerrainVisual::addSeismicSimulation( const SeismicSimulationNode& sim )
+{
+    // HERE WOULD BE A GREAT PLACE FOR AN IDIOT TEST:
+  // REJECT SIMULATION NODES THAT ARE OFF SCREEN!!!!!!!!!!
+    // HERE WOULD BE A GREAT PLACE FOR AN IDIOT TEST:
+  // REJECT SIMULATION NODES THAT ARE OFF SCREEN!!!!!!!!!!
+
+
+  m_seismicSimulationList.push_back( sim );
+}
+
+
+
+void W3DTerrainVisual::handleSeismicSimulations( void )
+{
+  if ( ! m_clientHeightMap || ! m_logicHeightMap || ! m_terrainRenderObject )
+    return;
+
+
+  if ( ! m_seismicSimulationList.empty() )
+  {
+    SeismicSimulationListIt it = m_seismicSimulationList.begin();
+
+
+    m_clientHeightMap->clearSeismicUpdateFlags();
+
+
+    while ( it != m_seismicSimulationList.end() )
+	  {
+      SeismicSimulationNode *ssn = &*it;
+
+      if ( ssn )
+      {
+        SeismicSimulationFilterBase::SeismicSimStatusCode code = ssn->handleFilterCallback( m_clientHeightMap );
+        DEBUG_ASSERTCRASH( code != SeismicSimulationFilterBase::SEISMIC_STATUS_INVALID, ("Trouble in the Seismic simulator.") );
+
+        switch ( code )
+        {
+          case SeismicSimulationFilterBase::SEISMIC_STATUS_ACTIVE:
+          {
+        	  break;
+          }
+          case SeismicSimulationFilterBase::SEISMIC_STATUS_ZERO_ENERGY:
+          {
+        	  break;
+          }
+        }
+
+        Int border = m_clientHeightMap->getBorderSizeInline();
+
+        // Now we apply some gravity to the dirt, so it falls back to its "original" height
+        UnsignedInt fallCount = 0;
+        for (Int x = border+ssn->m_region.lo.x; x < border+ssn->m_region.hi.x; ++x)
+        {
+          for (Int y = border+ssn->m_region.lo.y; y < border+ssn->m_region.hi.y; ++y)
+          {
+            if ( ! m_clientHeightMap->getSeismicUpdateFlag( x, y ) )
+            {
+              UnsignedByte heightOfOriginal = m_logicHeightMap->getHeight( x, y ); // LOGIC, YES DEFINITELY THE LOGIC
+
+              Real oldSpeed = m_clientHeightMap->getSeismicZVelocity( x, y );
+              Real newSpeed = ssn->applyGravity( oldSpeed );// - 0.5f;
+
+              m_clientHeightMap->setSeismicZVelocity( x, y, newSpeed );
+
+              Int heightToUse = m_clientHeightMap->getHeight( x, y ) + newSpeed ;
+
+
+              if (heightToUse <= heightOfOriginal)
+              {
+                heightToUse = heightOfOriginal;
+                m_clientHeightMap->setSeismicZVelocity( x, y, 0.0f ); //poof! the dirt hit ground level so stop "falling"
+              }
+              else
+              {
+                ++fallCount;
+
+                if ( heightToUse > 255 )
+                  heightToUse = 255;
+
+              }
+    			    m_clientHeightMap->setRawHeight( x, y, heightToUse );
+              m_clientHeightMap->setSeismicUpdateFlag( x, y, TRUE );
+            }
+
+          }
+        }
+
+        if ( fallCount == 0 )
+          ssn->m_clean = TRUE;
+
+      }
+
+      ++it;
+
+	  }
+  }
+
+}
+
+  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void W3DTerrainVisual::updateSeismicSimulations( void )
+{
+
+	if (m_logicHeightMap==NULL)
+		return;
+
+	if (m_clientHeightMap==NULL)
+		return;
+
+  if (m_terrainRenderObject==NULL)
+    return;
+
+  if ( ! m_seismicSimulationList.empty() )
+  {
+    SeismicSimulationListIt it = m_seismicSimulationList.begin();
+
+    // First we run through the list and do our business for each region
+
+	  while ( it != m_seismicSimulationList.end() )
+	  {
+      SeismicSimulationNode *hur = &*it;
+      if ( hur )
+      {
+        Int border = m_clientHeightMap->getBorderSizeInline();
+
+		    TheTerrainRenderObject->updateBlock(
+          hur->m_region.lo.x + border,
+          hur->m_region.lo.y + border,
+          hur->m_region.hi.x + border,
+          hur->m_region.hi.y + border,
+          m_clientHeightMap,
+          0);
+      }
+
+      ++it;
+
+	  }
+    // Then we check to see if these need to get erased from the list
+    it = m_seismicSimulationList.begin();
+	  while ( it != m_seismicSimulationList.end() )
+	  {
+      SeismicSimulationNode *hur = &*it;
+      if ( hur->m_clean )
+      {
+		    it = m_seismicSimulationList.erase( it );
+      }
+      else
+        ++it;
+
+	  }
+
+  }
+}
+
+
+#endif //#defined DO_SEISMIC_SIMULATIONS
+  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+
+//-------------------------------------------------------------------------------------------------
+/** load method for W3D visual terrain */
+//-------------------------------------------------------------------------------------------------
+Bool W3DTerrainVisual::load( AsciiString filename )
+{
+
+#if 0
+	// (gth) Testing exclusion list asset releasing
+	DynamicVectorClass<StringClass> exclusion_list(8000);
+
+	WW3DAssetManager::Get_Instance()->Create_Asset_List(exclusion_list);
+
+	exclusion_list.Add(StringClass("avcomanche"));
+	exclusion_list.Add(StringClass("avcomanche_d"));
+	exclusion_list.Add(StringClass("ptdogwood08"));
+	exclusion_list.Add(StringClass("ptdogwood01_b"));
+	exclusion_list.Add(StringClass("ptpalm01"));
+	exclusion_list.Add(StringClass("ptpalm01_b"));
+	exclusion_list.Add(StringClass("avhummer"));
+	exclusion_list.Add(StringClass("avhummer_d"));
+	exclusion_list.Add(StringClass("avleopard"));
+	exclusion_list.Add(StringClass("avleopard_d"));
+
+	WW3DAssetManager::Get_Instance()->Free_Assets_With_Exclusion_List(exclusion_list);
+#endif
+
+	// enhancing functionality specific for W3D terrain
+	if( TerrainVisual::load( filename ) == FALSE )
+		return FALSE;  // failed
+
+	// open the terrain file
+	CachedFileInputStream fileStrm;
+	if( !fileStrm.open(filename) )
+	{
+
+		REF_PTR_RELEASE( m_terrainRenderObject );
+		return FALSE;
+
+	}
+
+	if( m_terrainRenderObject == NULL )
+		return FALSE;
+
+
+  ChunkInputStream *pStrm = &fileStrm;
+
+  // allocate new height map data to read from file
+  REF_PTR_RELEASE( m_logicHeightMap );
+	m_logicHeightMap = NEW WorldHeightMap(pStrm);
+
+#ifdef DO_SEISMIC_SIMULATIONS
+
+  fileStrm.close();
+  fileStrm.open(filename);
+  pStrm = &fileStrm;
+
+	REF_PTR_RELEASE( m_clientHeightMap );
+  m_clientHeightMap = NEW WorldHeightMap( pStrm );
+
+#endif
+
+	// Add any lights loaded by map.
+	MapObject *pMapObj = MapObject::getFirstMapObject();
+	while (pMapObj)
+	{
+		Dict *d = pMapObj->getProperties();
+		if (pMapObj->isLight())
+		{
+			Coord3D loc = *pMapObj->getLocation();
+			if (loc.z < 0) {
+				Vector3 vec;
+				loc.z = m_terrainRenderObject->getHeightMapHeight(loc.x, loc.y, NULL);
+				loc.z += d->getReal(TheKey_lightHeightAboveTerrain);
+			}
+			// It is a light, and handled at the device level.  jba.
+			LightClass* lightP = NEW_REF(LightClass, (LightClass::POINT));
+
+			RGBColor c;
+			c.setFromInt(d->getInt(TheKey_lightAmbientColor));
+			lightP->Set_Ambient( Vector3( c.red, c.green, c.blue ) );
+
+			c.setFromInt(d->getInt(TheKey_lightDiffuseColor));
+			lightP->Set_Diffuse( Vector3(  c.red, c.green, c.blue) );
+
+			lightP->Set_Position(Vector3(loc.x, loc.y, loc.z));
+
+			lightP->Set_Far_Attenuation_Range(d->getReal(TheKey_lightInnerRadius), d->getReal(TheKey_lightOuterRadius));
+ 			W3DDisplay::m_3DScene->Add_Render_Object(lightP);
+			REF_PTR_RELEASE( lightP );
+		}
+		pMapObj = pMapObj->getNext();
+	}
+
+
+	RefRenderObjListIterator *it = W3DDisplay::m_3DScene ? W3DDisplay::m_3DScene->createLightsIterator() : NULL;
+	// apply the heightmap to the terrain render object
+
+#ifdef DO_SEISMIC_SIMULATIONS
+	m_terrainRenderObject->initHeightData( m_clientHeightMap->getDrawWidth(),
+																				 m_clientHeightMap->getDrawHeight(),
+																				 m_clientHeightMap,
+																				 it);
+#else
+	m_terrainRenderObject->initHeightData( m_logicHeightMap->getDrawWidth(),
+																				 m_logicHeightMap->getDrawHeight(),
+																				 m_logicHeightMap,
+																				 it);
+#endif
+
+
+	if (it) {
+	 W3DDisplay::m_3DScene->destroyLightsIterator(it);
+	 it = NULL;
+	}
+	// add our terrain render object to the scene
+	if (W3DDisplay::m_3DScene != NULL)
+		W3DDisplay::m_3DScene->Add_Render_Object( m_terrainRenderObject );
+
+#if defined(RTS_DEBUG)
+	// Icon drawing utility object for pathfinding.
+	if (W3DDisplay::m_3DScene != NULL)
+	{
+		W3DDebugIcons *icons = NEW W3DDebugIcons;
+		W3DDisplay::m_3DScene->Add_Render_Object( icons );
+		icons->Release_Ref(); // belongs to scene.
+	}
+#endif
+
+#ifdef DO_UNIT_TIMINGS
+#pragma MESSAGE("********************* WARNING- Doing UNIT TIMINGS. ")
+#else
+	if (m_waterRenderObject)
+	{
+		W3DDisplay::m_3DScene->Add_Render_Object( m_waterRenderObject);
+		m_waterRenderObject->enableWaterGrid(false);
+		m_waterRenderObject->updateMapOverrides();
+	}
+#endif
+
+	pMapObj = MapObject::getFirstMapObject();
+	while (pMapObj)
+	{
+		Dict *d = pMapObj->getProperties();
+		if (pMapObj->isScorch()) {
+			const Coord3D *pos = pMapObj->getLocation();
+			Vector3 loc(pos->x, pos->y, pos->z);
+			Real radius = d->getReal(TheKey_objectRadius);
+			Scorches type = (Scorches)d->getInt(TheKey_scorchType);
+			m_terrainRenderObject->addScorch(loc, radius, type);
+		}
+		pMapObj = pMapObj->getNext();
+	}
+
+	// reset water render object if present
+	if( m_waterRenderObject )
+	{
+		m_waterRenderObject->load();
+	}
+
+	return TRUE;  // success
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::enableWaterGrid( Bool enable )
+{
+
+	//Get default water type
+	m_isWaterGridRenderingEnabled = enable;
+
+	// make the changes in the water render object
+	if( m_waterRenderObject )
+		m_waterRenderObject->enableWaterGrid( enable );
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** intersect the ray with the terrain, if a hit occurs TRUE is returned
+	* and the result point on the terrain is returned in "result" */
+//-------------------------------------------------------------------------------------------------
+Bool W3DTerrainVisual::intersectTerrain( Coord3D *rayStart,
+																				 Coord3D *rayEnd,
+																				 Coord3D *result )
+{
+	Bool hit = FALSE;
+
+	// sanity
+	if( rayStart == NULL || rayEnd == NULL )
+		return hit;
+
+	if( m_terrainRenderObject )
+	{
+		CastResultStruct res;
+		LineSegClass lineSeg( Vector3( rayStart->x, rayStart->y, rayStart->z ),
+													Vector3( rayEnd->x, rayEnd->y, rayEnd->z ) );
+		RayCollisionTestClass rayTest( lineSeg, &res );
+
+		hit = m_terrainRenderObject->Cast_Ray( rayTest );
+		if( hit && result )
+		{
+			Vector3 point = rayTest.Result->ContactPoint;
+
+			result->x = point.X;
+			result->y = point.Y;
+			result->z = point.Z;
+
+		}
+
+	}
+
+	// return hit result
+	return hit;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::getTerrainColorAt( Real x, Real y, RGBColor *pColor )
+{
+
+#ifdef DO_SEISMIC_SIMULATIONS
+  if( m_clientHeightMap )
+		m_clientHeightMap->getTerrainColorAt( x, y, pColor );
+#else
+  if( m_logicHeightMap )
+		m_logicHeightMap->getTerrainColorAt( x, y, pColor );
+#endif
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+TerrainType *W3DTerrainVisual::getTerrainTile( Real x, Real y )
+{
+	TerrainType *tile = NULL;
+
+#ifdef DO_SEISMIC_SIMULATIONS
+	if( m_clientHeightMap )
+	{
+		AsciiString tileName = m_clientHeightMap->getTerrainNameAt( x, y );
+		tile = TheTerrainTypes->findTerrain( tileName );
+	}
+#else
+  if( m_logicHeightMap )
+	{
+		AsciiString tileName = m_logicHeightMap->getTerrainNameAt( x, y );
+		tile = TheTerrainTypes->findTerrain( tileName );
+	}
+#endif
+
+	return tile;
+}
+
+// ------------------------------------------------------------------------------------------------
+/** set min/max height values allowed in water grid pointed to by waterTable */
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::setWaterGridHeightClamps( const WaterHandle *waterTable,
+																								 Real minZ, Real maxZ )
+{
+
+	if( m_waterRenderObject )
+		m_waterRenderObject->setGridHeightClamps( minZ, maxZ );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** adjust fallof parameters for grid change method */
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::setWaterAttenuationFactors( const WaterHandle *waterTable,
+																									 Real a, Real b, Real c, Real range )
+{
+
+	if( m_waterRenderObject )
+		m_waterRenderObject->setGridChangeAttenuationFactors( a, b, c, range );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** set the water table position and orientation in world space */
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::setWaterTransform( const WaterHandle *waterTable,
+																					Real angle, Real x, Real y, Real z )
+{
+
+	if( m_waterRenderObject )
+		m_waterRenderObject->setGridTransform( angle, x, y, z );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** set water table transform by matrix */
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::setWaterTransform( const Matrix3D *transform )
+{
+
+	if( m_waterRenderObject )
+		m_waterRenderObject->setGridTransform( transform );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** get the water transform matrix */
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::getWaterTransform( const WaterHandle *waterTable, Matrix3D *transform )
+{
+
+	if( m_waterRenderObject )
+		m_waterRenderObject->getGridTransform( transform );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** water grid resolution spacing */
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::setWaterGridResolution( const WaterHandle *waterTable,
+																							 Real gridCellsX, Real gridCellsY, Real cellSize )
+{
+
+	if( m_waterRenderObject )
+		m_waterRenderObject->setGridResolution( gridCellsX, gridCellsY, cellSize );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** get water grid resolution spacing */
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::getWaterGridResolution( const WaterHandle *waterTable,
+																							 Real *gridCellsX, Real *gridCellsY, Real *cellSize )
+{
+
+	if( m_waterRenderObject )
+		m_waterRenderObject->getGridResolution( gridCellsX, gridCellsY, cellSize );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** adjust the water grid in world coords by the delta */
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::changeWaterHeight( Real x, Real y, Real delta )
+{
+
+	if( m_waterRenderObject )
+		m_waterRenderObject->changeGridHeight( x, y, delta );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::addWaterVelocity( Real worldX, Real worldY,
+																				 Real velocity, Real preferredHeight )
+{
+
+	if( m_waterRenderObject )
+		m_waterRenderObject->addVelocity( worldX, worldY, velocity, preferredHeight );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+Bool W3DTerrainVisual::getWaterGridHeight( Real worldX, Real worldY, Real *height)
+{
+	Real gridX, gridY;
+
+	if (m_isWaterGridRenderingEnabled && m_waterRenderObject &&
+		m_waterRenderObject->worldToGridSpace(worldX, worldY, gridX, gridY))
+	{	//point falls within grid, return correct height
+		m_waterRenderObject->getGridVertexHeight(REAL_TO_INT(gridX),REAL_TO_INT(gridY),height);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::setRawMapHeight(const ICoord2D *gridPos, Int height)
+{
+  // This method writes to the m_logicHeightMap member,
+  // since m_logicHeightMap is the true, golden standard to which m_clientHeightMap
+  // interpolates during or after its Seismic simulation displaces it..
+  // THIS IS TRUE ONLY WHEN DO_SEISMIC_SIMULATIONS is defined M Lorenzen, 8/23/03
+
+	if (m_logicHeightMap)
+  {
+		Int x = gridPos->x+m_logicHeightMap->getBorderSizeInline();
+		Int y = gridPos->y+m_logicHeightMap->getBorderSizeInline();
+ 		//if (m_logicHeightMap->getHeight(x,y) != height) //ML changed to prevent scissoring with roads
+ 		if (m_logicHeightMap->getHeight(x,y) > height)
+		{
+			m_logicHeightMap->setRawHeight(x, y, height);
+			m_terrainRenderObject->staticLightingChanged(); // OOH! this could benefit from the new Seismic update code
+
+
+#ifdef DO_SEISMIC_SIMULATIONS
+      if ( m_clientHeightMap )
+      {
+        if ( height < m_clientHeightMap->getHeight( x,y ) )
+          m_clientHeightMap->setRawHeight( x, y, height ); // if the client map is heigher than this height, it will fall down to it anyway!
+      }
+#endif
+
+		}
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+Int W3DTerrainVisual::getRawMapHeight(const ICoord2D *gridPos)
+{
+	if (m_logicHeightMap)
+  {
+		Int x = gridPos->x+m_logicHeightMap->getBorderSizeInline();
+		Int y = gridPos->y+m_logicHeightMap->getBorderSizeInline();
+ 		//if (m_logicHeightMap->getHeight(x,y) != height) //ML changed to prevent scissoring with roads
+    return m_logicHeightMap->getHeight(x,y) ;
+	}
+  return 0;
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::addFactionBibDrawable(Drawable *factionBuilding, Bool highlight, Real extra)
+{
+#ifdef DO_SEISMIC_SIMULATIONS
+	if (m_clientHeightMap)
+#else
+	if (m_logicHeightMap)
+#endif
+  {
+		const Matrix3D * mtx = factionBuilding->getTransformMatrix();
+		Vector3 corners[4];
+		Coord3D pos;
+		pos.set(0,0,0);
+		Real exitWidth = factionBuilding->getTemplate()->getFactoryExitWidth();
+		Real extraWidth = factionBuilding->getTemplate()->getFactoryExtraBibWidth() + extra;
+		const GeometryInfo info = factionBuilding->getTemplate()->getTemplateGeometryInfo();
+		Real sizeX = info.getMajorRadius();
+		Real sizeY = info.getMinorRadius();
+		if (info.getGeomType() != GEOMETRY_BOX) {
+			sizeY = sizeX;
+		}
+		corners[0].Set(pos.x, pos.y, pos.z);
+		corners[0].X -= sizeX+extraWidth;
+		corners[0].Y -= sizeY+extraWidth;
+		corners[1].Set(pos.x, pos.y, pos.z);
+		corners[1].X += sizeX+exitWidth+extraWidth;
+		corners[1].Y -= sizeY+extraWidth;
+		corners[2].Set(pos.x, pos.y, pos.z);
+		corners[2].X += sizeX+exitWidth+extraWidth;
+		corners[2].Y += sizeY+extraWidth;
+		corners[3].Set(pos.x, pos.y, pos.z);
+		corners[3].X -= sizeX+extraWidth;
+		corners[3].Y += sizeY+extraWidth;
+		mtx->Transform_Vector(*mtx, corners[0], &corners[0]);
+		mtx->Transform_Vector(*mtx, corners[1], &corners[1]);
+		mtx->Transform_Vector(*mtx, corners[2], &corners[2]);
+		mtx->Transform_Vector(*mtx, corners[3], &corners[3]);
+		m_terrainRenderObject->addTerrainBibDrawable(corners, factionBuilding->getID(), highlight);
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::addFactionBib(Object *factionBuilding, Bool highlight, Real extra)
+{
+#ifdef DO_SEISMIC_SIMULATIONS
+	if (m_clientHeightMap)
+#else
+	if (m_logicHeightMap)
+#endif
+  {
+		const Matrix3D * mtx = factionBuilding->getTransformMatrix();
+		Vector3 corners[4];
+		Coord3D pos;
+		pos.set(0,0,0);
+		Real exitWidth = factionBuilding->getTemplate()->getFactoryExitWidth();
+		Real extraWidth = factionBuilding->getTemplate()->getFactoryExtraBibWidth() + extra;
+		const GeometryInfo info = factionBuilding->getGeometryInfo();
+		Real sizeX = info.getMajorRadius();
+		Real sizeY = info.getMinorRadius();
+		if (info.getGeomType() != GEOMETRY_BOX) {
+			sizeY = sizeX;
+		}
+		corners[0].Set(pos.x, pos.y, pos.z);
+		corners[0].X -= sizeX+extraWidth;
+		corners[0].Y -= sizeY+extraWidth;
+		corners[1].Set(pos.x, pos.y, pos.z);
+		corners[1].X += sizeX+exitWidth+extraWidth;
+		corners[1].Y -= sizeY+extraWidth;
+		corners[2].Set(pos.x, pos.y, pos.z);
+		corners[2].X += sizeX+exitWidth+extraWidth;
+		corners[2].Y += sizeY+extraWidth;
+		corners[3].Set(pos.x, pos.y, pos.z);
+		corners[3].X -= sizeX+extraWidth;
+		corners[3].Y += sizeY+extraWidth;
+		mtx->Transform_Vector(*mtx, corners[0], &corners[0]);
+		mtx->Transform_Vector(*mtx, corners[1], &corners[1]);
+		mtx->Transform_Vector(*mtx, corners[2], &corners[2]);
+		mtx->Transform_Vector(*mtx, corners[3], &corners[3]);
+		m_terrainRenderObject->addTerrainBib(corners, factionBuilding->getID(), highlight);
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::removeFactionBibDrawable(Drawable *factionBuilding)
+{
+	if (m_terrainRenderObject) {
+		m_terrainRenderObject->removeTerrainBibDrawable(factionBuilding->getID());
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::removeFactionBib(Object *factionBuilding)
+{
+	if (m_terrainRenderObject) {
+		m_terrainRenderObject->removeTerrainBib(factionBuilding->getID());
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::removeAllBibs(void)
+{
+	if (m_terrainRenderObject) {
+		m_terrainRenderObject->removeAllTerrainBibs();
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::removeBibHighlighting(void)
+{
+	if (m_terrainRenderObject) {
+		m_terrainRenderObject->removeTerrainBibHighlighting();
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::removeTreesAndPropsForConstruction(const Coord3D* pos,
+																				const GeometryInfo& geom,
+																				Real angle)
+{
+	if (m_terrainRenderObject) {
+		m_terrainRenderObject->removeTreesAndPropsForConstruction(pos, geom, angle);
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::addProp(const ThingTemplate *tTemplate, const Coord3D *pos, Real angle)
+{
+	ModelConditionFlags state;
+	state.clear();
+	if (TheGlobalData->m_weather == WEATHER_SNOWY)
+	{
+		state.set(MODELCONDITION_SNOW);
+	}
+	if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
+	{
+		state.set(MODELCONDITION_NIGHT);
+	}
+	AsciiString modelName;
+	Real scale = tTemplate->getAssetScale();
+	const ModuleInfo& mi = tTemplate->getDrawModuleInfo();
+	if (mi.getCount() > 0)
+	{
+		const ModuleData* mdd = mi.getNthData(0);
+		const W3DModelDrawModuleData* md = mdd ? mdd->getAsW3DModelDrawModuleData() : NULL;
+		if (md)
+		{
+			modelName = md->getBestModelNameForWB(state);
+		}
+	}
+	if (m_terrainRenderObject && modelName.isNotEmpty()) {
+		m_terrainRenderObject->addProp(1, *pos, angle, scale, modelName);
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::setTerrainTracksDetail(void)
+{
+	if (TheTerrainTracksRenderObjClassSystem)
+		TheTerrainTracksRenderObjClassSystem->setDetail();
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::setShoreLineDetail(void)
+{
+	if (m_terrainRenderObject)
+		m_terrainRenderObject->setShoreLineDetail();
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+/// Replace the skybox texture
+void W3DTerrainVisual::replaceSkyboxTextures(const AsciiString *oldTexName[5], const AsciiString *newTexName[5])
+{
+	if (m_waterRenderObject)
+	{
+		for (Int i=0; i<5; i++)
+		{
+			//check if this texture was never changed before and is still using the default art.
+			if (m_initialSkyboxTexNames[i].isEmpty())
+			{	m_initialSkyboxTexNames[i]=*oldTexName[i];
+				m_currentSkyboxTexNames[i]=*oldTexName[i];
+			}
+
+			if (m_currentSkyboxTexNames[i] != *newTexName[i])
+			{	m_waterRenderObject->replaceSkyboxTexture(m_currentSkyboxTexNames[i], *newTexName[i]);
+				m_currentSkyboxTexNames[i]=*newTexName[i];	//update current state to new texture
+			}
+		}
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+/** CRC */
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::crc( Xfer *xfer )
+{
+
+	// extend base class
+	TerrainVisual::crc( xfer );
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Xfer
+	* Version Info:
+	* 1: Initial version
+	* 2: Add height map heights.
+	* 3: Add client side trees & props. jba. (Added for Zero Hour)
+*/
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::xfer( Xfer *xfer )
+{
+
+	// version
+#if RTS_GENERALS && RETAIL_COMPATIBLE_XFER_SAVE
+	XferVersion currentVersion = 2;
+#else
+	XferVersion currentVersion = 3;
+#endif
+	XferVersion version = currentVersion;
+	xfer->xferVersion( &version, currentVersion );
+
+	// extend base class
+	TerrainVisual::xfer( xfer );
+
+	// flag for whether or not the water grid is enabled
+	Bool gridEnabled = m_isWaterGridRenderingEnabled;
+	xfer->xferBool( &gridEnabled );
+	if( gridEnabled != m_isWaterGridRenderingEnabled )
+	{
+
+		DEBUG_CRASH(( "W3DTerrainVisual::xfer - m_isWaterGridRenderingEnabled mismatch" ));
+		throw SC_INVALID_DATA;
+
+	}
+
+	// xfer grid data if enabled
+	if( gridEnabled )
+		xfer->xferSnapshot( m_waterRenderObject );
+
+/*
+	{
+
+		// grid width and height
+		Int width = getGridWidth();
+		Int height = getGridheight();
+		xfer->xferInt( &width );
+		xfer->xferInt( &height );
+		if( width != getGridWidth() )
+		{
+
+			DEBUG_CRASH(( "W3DTerainVisual::xfer - grid width mismatch '%d' should be '%d'",
+										width, getGridWidth() ));
+			throw SC_INVALID_DATA;
+
+		}
+		if( height != getGridHeight() )
+		{
+
+			DEBUG_CRASH(( "W3DTerainVisual::xfer - grid height mismatch '%d' should be '%d'",
+										height, getGridHeight() ));
+			throw SC_INVALID_DATA;
+
+		}
+
+		// write data for each grid
+
+	}
+*/
+
+	// Write out the terrain height data.
+	if (version >= 2) {
+		UnsignedByte *data = m_logicHeightMap->getDataPtr();
+		Int len = m_logicHeightMap->getXExtent()*m_logicHeightMap->getYExtent();
+		Int xferLen = len;
+		xfer->xferInt(&xferLen);
+		if (len!=xferLen) {
+			DEBUG_CRASH(("Bad height map length."));
+			if (len>xferLen) {
+				len = xferLen;
+			}
+		}
+		xfer->xferUser(data, len);
+		if (xfer->getXferMode() == XFER_LOAD)
+    {
+			// Update the display height map.
+			m_terrainRenderObject->staticLightingChanged();
+		}
+	}
+
+	if (version >= 3) {
+		xfer->xferSnapshot(m_terrainRenderObject);
+	}
+
+         // XFER //
+         // X  R //
+         // X  R //
+         // XFER //
+ /////   /USE CLIENT HEIGHT MAPCLIENT HEIGHT MAP
+//   //  /USE CLIENT HEIGHT MAPCLIENT HEIGHT MAP
+//    ////USE CLIENT HEIGHT MAPCLIENT HEIGHT MAP----------------------------
+//   //  /USE CLIENT HEIGHT MAPCLIENT HEIGHT MAP                            ^
+ /////   /USE CLIENT HEIGHT MAPCLIENT HEIGHT MAP                            0
+         // XFER //
+         // X  R //
+         // X  R //
+         // XFER //
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Load post process */
+// ------------------------------------------------------------------------------------------------
+void W3DTerrainVisual::loadPostProcess( void )
+{
+
+	// extend base class
+	TerrainVisual::loadPostProcess();
+
+}
+
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
new file mode 100644
index 00000000000..1b5ba203361
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
@@ -0,0 +1,2039 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DTreeBuffer.cpp ////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:   RTS3
+//
+// File name: W3DTreeBuffer.cpp
+//
+// Created:   John Ahlquist, May 2001
+//
+// Desc:      Draw buffer to handle all the trees in a scene.
+//
+//-----------------------------------------------------------------------------
+
+// ------------------------------------------------------------------------------------------------
+/** Topple options */
+// ------------------------------------------------------------------------------------------------
+enum
+{
+	W3D_TOPPLE_OPTIONS_NONE			 = 0x00000000,
+	W3D_TOPPLE_OPTIONS_NO_BOUNCE = 0x00000001,  ///< do not bounce when hit the ground
+	W3D_TOPPLE_OPTIONS_NO_FX		 = 0x00000002	///< do not play any FX when hit the ground
+};
+//-----------------------------------------------------------------------------
+//         Includes
+//-----------------------------------------------------------------------------
+#include "W3DDevice/GameClient/W3DTreeBuffer.h"
+
+#include <assetmgr.h>
+#include <texture.h>
+#include "Common/FramePacer.h"
+#include "Common/GameUtility.h"
+#include "Common/MapReaderWriterInfo.h"
+#include "Common/FileSystem.h"
+#include "Common/file.h"
+#include "Common/PerfTimer.h"
+#include "Common/Player.h"
+#include "Common/PlayerList.h"
+#include "GameLogic/ScriptEngine.h"
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/Object.h"
+#include "GameLogic/PartitionManager.h"
+#include "GameClient/ClientRandomValue.h"
+#include "GameClient/FXList.h"
+#include "W3DDevice/GameClient/TerrainTex.h"
+#include "W3DDevice/GameClient/HeightMap.h"
+#include "W3DDevice/GameClient/W3DDynamicLight.h"
+#include "W3DDevice/GameClient/Module/W3DTreeDraw.h"
+#include "W3DDevice/GameClient/W3DShaderManager.h"
+#include "W3DDevice/GameClient/W3DShadow.h"
+#include "W3DDevice/GameClient/W3DShroud.h"
+#include "W3DDevice/GameClient/W3DProjectedShadow.h"
+#include "WW3D2/camera.h"
+#include "WW3D2/dx8wrapper.h"
+#include "WW3D2/dx8renderer.h"
+#include "WW3D2/matinfo.h"
+#include "WW3D2/mesh.h"
+#include "WW3D2/meshmdl.h"
+#include "d3dx8tex.h"
+
+
+// If TEST_AND_BLEND is defined, it will do an alpha test and blend.  Otherwise just alpha test. jba. [5/30/2003]
+#define dontTEST_AND_BLEND 1
+
+#define USE_STATIC 1
+
+#define END_OF_PARTITION (-1)
+
+#define DELETED_TREE_TYPE (-2)
+
+/******************************************************************************
+						W3DTreeTextureClass
+******************************************************************************/
+//-----------------------------------------------------------------------------
+//         Public Functions
+//-----------------------------------------------------------------------------
+
+//=============================================================================
+// W3DTreeBuffer::W3DTreeTextureClass::W3DTreeTextureClass
+//=============================================================================
+/** Constructor. Calls parent constructor to create a 16 bit per pixel D3D
+texture of the desired height and mip level. */
+//=============================================================================
+W3DTreeBuffer::W3DTreeTextureClass::W3DTreeTextureClass(unsigned width, unsigned height) :
+	TextureClass(width, height,
+		WW3D_FORMAT_A8R8G8B8, MIP_LEVELS_ALL )
+{
+}
+
+//=============================================================================
+// W3DTreeBuffer::W3DTreeTextureClass::update
+//=============================================================================
+/** Sets the tile bitmap data into the texture.  The tiles are placed with 4
+	pixel borders around them, so that when the tiles are scaled and bilinearly
+	interpolated, you don't get seams between the tiles.  */
+//=============================================================================
+int W3DTreeBuffer::W3DTreeTextureClass::update(W3DTreeBuffer *buffer)
+{
+
+	//Set to clamp.
+	Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+	Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+
+	IDirect3DSurface8 *surface_level;
+	D3DSURFACE_DESC surface_desc;
+	D3DLOCKED_RECT locked_rect;
+	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0, &surface_level));
+	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
+
+	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
+
+	Int tilePixelExtent = TILE_PIXEL_EXTENT;
+//	Int numRows = surface_desc.Height/(tilePixelExtent+TILE_OFFSET);
+#ifdef RTS_DEBUG
+	//DASSERT_MSG(tilesPerRow*numRows >= htMap->m_numBitmapTiles,Debug::Format ("Too many tiles."));
+	//DEBUG_ASSERTCRASH((Int)surface_desc.Width >= tilePixelExtent*tilesPerRow, ("Bitmap too small."));
+#endif
+	if (surface_desc.Format == D3DFMT_A8R8G8B8) {
+		Int tileNdx;
+		Int pixelBytes = 4;
+#if 0 // Fill unused texture for debug display.
+		UnsignedInt cellX, cellY;
+		for (cellX = 0; cellX < surface_desc.Width; cellX++) {
+			for (cellY = 0; cellY < surface_desc.Height; cellY++) {
+				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(cellY*surface_desc.Width+cellX)*pixelBytes;
+				//*((Short*)pBGR) =  0x8000 + (((255-2*cellY)>>3)<<10) + ((4*cellX)>>4);
+				*((Int*)pBGR) =  0xFF000000 | ( (((255-cellY))<<16) + ((cellX)) );
+
+			}
+		}
+#endif
+		for (tileNdx=0; tileNdx < buffer->getNumTiles(); tileNdx++) {
+			TileData *pTile = buffer->getSourceTile(tileNdx);
+			if (!pTile) continue;
+			ICoord2D position = pTile->m_tileLocationInTexture;
+			if (position.x<0) {
+				continue;
+			}
+			Int i,j;
+			for (j=0; j<tilePixelExtent; j++) {
+				UnsignedByte *pBGR = pTile->getRGBDataForWidth(tilePixelExtent);
+				pBGR += (tilePixelExtent-(1+j))*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
+				Int row = position.y+j;
+				UnsignedByte *pBGRA = ((UnsignedByte*)locked_rect.pBits) +
+							(row)*surface_desc.Width*pixelBytes;
+
+				Int column = position.x;
+				pBGRA += column*pixelBytes;
+				for (i=0; i<tilePixelExtent; i++) {
+					// 15 bit color *((Short*)pBGRA) = 0x8000 + ((pBGR[2]>>3)<<10) + ((pBGR[1]>>3)<<5) + (pBGR[0]>>3);
+					*((Int *)pBGRA) = (pBGR[3]<<24) + (pBGR[2]<<16) + (pBGR[1]<<8) + (pBGR[0]);
+					pBGRA +=pixelBytes;
+					pBGR +=TILE_BYTES_PER_PIXEL;
+				}
+			}
+		}
+
+	}
+	DX8_ErrorCode(surface_level->UnlockRect());
+	surface_level->Release();
+	DX8_ErrorCode(D3DXFilterTexture(Peek_D3D_Texture(), NULL, (UINT)0, D3DX_FILTER_BOX));
+	if (WW3D::Get_Texture_Reduction()) {
+		DX8_ErrorCode(Peek_D3D_Texture()->SetLOD((DWORD)WW3D::Get_Texture_Reduction()));
+	}
+	return(surface_desc.Height);
+}
+
+
+//=============================================================================
+// W3DTreeBuffer::W3DTreeTextureClass::setLOD
+//=============================================================================
+/** Sets the lod of the texture to be loaded into the video card.  */
+//=============================================================================
+void W3DTreeBuffer::W3DTreeTextureClass::setLOD(Int LOD) const
+{
+	if (Peek_D3D_Texture()) {
+		DX8_ErrorCode(Peek_D3D_Texture()->SetLOD((DWORD)LOD));
+	}
+}
+//=============================================================================
+// W3DTreeBuffer::W3DTreeTextureClass::Apply
+//=============================================================================
+/** Sets the texture as the current D3D texture, and does some custom setup
+(standard D3D setup, but beyond the scope of W3D).  */
+//=============================================================================
+void W3DTreeBuffer::W3DTreeTextureClass::Apply(unsigned int stage)
+{
+	// Do the base apply.
+	TextureClass::Apply(stage);
+}
+//-----------------------------------------------------------------------------
+//         Private Data
+//-----------------------------------------------------------------------------
+
+#ifdef TEST_AND_BLEND
+// A W3D shader that does alpha, texturing, tests zbuffer, doesn't update zbuffer.
+#define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
+	ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
+	ShaderClass::ALPHATEST_ENABLE, ShaderClass::CULL_MODE_ENABLE, \
+	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
+
+#define SC_ALPHA_DETAIL_2X ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
+	ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE2X, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
+	ShaderClass::ALPHATEST_ENABLE, ShaderClass::CULL_MODE_ENABLE, \
+	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
+
+#else
+#define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
+	ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
+	ShaderClass::ALPHATEST_ENABLE, ShaderClass::CULL_MODE_DISABLE, \
+	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
+
+#define SC_ALPHA_DETAIL_2X ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
+	ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE2X, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
+	ShaderClass::ALPHATEST_ENABLE, ShaderClass::CULL_MODE_ENABLE, \
+	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
+#endif
+static ShaderClass detailAlphaShader(SC_ALPHA_DETAIL);
+static ShaderClass detailAlphaShader2X(SC_ALPHA_DETAIL_2X);
+
+
+/*
+#define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
+	ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
+	ShaderClass::ALPHATEST_ENABLE, ShaderClass::CULL_MODE_DISABLE, \
+	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
+
+static ShaderClass detailAlphaShader(SC_ALPHA_DETAIL);
+*/
+
+/*
+#define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
+	ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
+	ShaderClass::ALPHATEST_ENABLE, ShaderClass::CULL_MODE_ENABLE, \
+	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
+
+static ShaderClass detailAlphaShader(SC_ALPHA_DETAIL);
+*/
+
+/*
+#define SC_ALPHA_MIRROR ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
+	ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
+	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, \
+	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
+
+static ShaderClass mirrorAlphaShader(SC_ALPHA_DETAIL);
+
+// ShaderClass::PASS_ALWAYS,
+
+#define SC_ALPHA_2D ( SHADE_CNST(PASS_ALWAYS, DEPTH_WRITE_DISABLE, COLOR_WRITE_ENABLE, \
+	SRCBLEND_SRC_ALPHA, DSTBLEND_ONE_MINUS_SRC_ALPHA, FOG_DISABLE, GRADIENT_DISABLE, \
+	SECONDARY_GRADIENT_DISABLE, TEXTURING_ENABLE, DETAILCOLOR_DISABLE, DETAILALPHA_DISABLE, \
+	ALPHATEST_DISABLE, CULL_MODE_ENABLE, DETAILCOLOR_DISABLE, DETAILALPHA_DISABLE) )
+ShaderClass ShaderClass::_PresetAlpha2DShader(SC_ALPHA_2D);
+*/
+//-----------------------------------------------------------------------------
+//         Private Functions
+//-----------------------------------------------------------------------------
+
+//=============================================================================
+// W3DTreeBuffer::cull
+//=============================================================================
+/** Culls the trees, marking the visible flag.  If a tree becomes visible, it sets
+it's sortKey */
+//=============================================================================
+void W3DTreeBuffer::cull(const CameraClass * camera)
+{
+	Int curTree;
+
+	// Calulate the vector direction that the camera is looking at.
+	Matrix3D camera_matrix = camera->Get_Transform();
+	float zmod = -1;
+	float x = zmod * camera_matrix[0][2] ;
+	float y = zmod * camera_matrix[1][2] ;
+	float z = zmod * camera_matrix[2][2] ;
+	m_cameraLookAtVector.Set(x,y,z);
+
+	for (curTree=0; curTree<m_numTrees; curTree++) {
+		Bool doKey = false;	// We calculate the key when a tree becomes visible.
+		Bool visible = !camera->Cull_Sphere(m_trees[curTree].bounds);
+		if (visible != m_trees[curTree].visible) {
+			m_trees[curTree].visible=visible;
+			m_anythingChanged = true;
+			if (visible) {
+				doKey = true;
+			}
+		}
+		// Also calculate sort key if a tree is visible, and the view changed setting m_updateAllKeys to true.
+		if (doKey || (visible&&m_updateAllKeys)) {
+			// The sort key is essentially the distance of location in the direction of the
+			// camera look at.
+			m_trees[curTree].sortKey = Vector3::Dot_Product(m_trees[curTree].location, m_cameraLookAtVector);
+		}
+	}
+	m_updateAllKeys = false;
+}
+//=============================================================================
+// W3DTreeBuffer::getPartitionBucket
+//=============================================================================
+/** Returns the bucket index into m_areaPartition for a given location. */
+//=============================================================================
+Int W3DTreeBuffer::getPartitionBucket(const Coord3D &pos) const
+{
+	Real x = pos.x;
+	Real y = pos.y;
+	if (x<m_bounds.lo.x) x = m_bounds.lo.x;
+	if (y<m_bounds.lo.y) y = m_bounds.lo.y;
+	if (x>m_bounds.hi.x) x = m_bounds.hi.x;
+	if (y>m_bounds.hi.y) y = m_bounds.hi.y;
+	Int xIndex = REAL_TO_INT_FLOOR ( (x/(m_bounds.hi.x-m_bounds.lo.x)) * (PARTITION_WIDTH_HEIGHT-0.1f) );
+	Int yIndex = REAL_TO_INT_FLOOR ( (y/(m_bounds.hi.y-m_bounds.lo.y)) * (PARTITION_WIDTH_HEIGHT-0.1f) );
+	DEBUG_ASSERTCRASH(xIndex>=0 && yIndex>=0 && xIndex<PARTITION_WIDTH_HEIGHT && yIndex<PARTITION_WIDTH_HEIGHT, ("Invalid range."));
+	return yIndex*PARTITION_WIDTH_HEIGHT + xIndex;
+}
+
+//=============================================================================
+// W3DTreeBuffer::updateSway
+//=============================================================================
+void W3DTreeBuffer::updateSway(const BreezeInfo& info)
+{
+	Int i;
+	for	(i=0; i<NUM_SWAY_ENTRIES; i++) {
+		Real factor = Cos(i*2.0f*PI/(NUM_SWAY_ENTRIES+1.0f));
+		Real angle = info.m_lean + (info.m_intensity  * factor);
+		Real S = Sin(angle);
+		Real C = Cos(angle);
+		m_swayOffsets[i].X = info.m_directionVec.x * S;
+		m_swayOffsets[i].Y = info.m_directionVec.y * S;
+		m_swayOffsets[i].Z = C - 1.0f;
+	}
+
+	Real delta = info.m_randomness * 0.5f;
+
+	for (i=0; i<MAX_SWAY_TYPES; i++) {
+		m_curSwayStep[i] = NUM_SWAY_ENTRIES / (Real)info.m_breezePeriod;
+		m_curSwayStep[i]	*= GameClientRandomValueReal(1.0f-delta, 1.0f+delta);
+		if (m_curSwayStep[i]<0.0f) {
+			m_curSwayStep[i] = 0.0f;
+		}
+		m_curSwayOffset[i] = 0;
+		m_curSwayFactor[i] = GameClientRandomValueReal(1.0f-delta, 1.0f+delta);
+	}
+	m_curSwayVersion = info.m_breezeVersion;
+}
+
+#if 0 // sort is not used, and messes up the order jba. [6/6/2003]
+//=============================================================================
+// W3DTreeBuffer::sort
+//=============================================================================
+/** Sorts the trees.  Does num_iterations of a bubble sort.  This is good because
+it ends immediately if the trees are already sorted (which is most of the time)
+and will perform a fixed amount of work each frame until it becomes sorted. */
+//=============================================================================
+void W3DTreeBuffer::sort(Int numIterations)
+{
+	// sort in descending order.
+	Int iter;
+	Bool swap = false;
+	for (iter = 0; iter<numIterations; iter++) {
+		Int cur = 0;
+		// Note - only sorts the visible trees.
+		while (cur<m_numTrees-iter && !m_trees[cur].visible) {
+			cur++;
+		}
+		Int i;
+		for (i=cur+1; i<m_numTrees-iter; i++) {
+			if (m_trees[i].visible) {
+				if (m_trees[cur].sortKey > m_trees[i].sortKey) {
+					TTree tmp = m_trees[cur];
+					m_trees[cur] = m_trees[i];
+					m_trees[i] = tmp;
+					swap = true;
+				}
+				cur = i;
+			}
+		}
+		if (!swap) {
+			return;
+		}
+		m_anythingChanged = true;
+	}
+}
+#endif
+
+/********** GDIFileStream2 class ****************************/
+class GDIFileStream2 : public InputStream
+{
+protected:
+	File* m_file;
+public:
+	GDIFileStream2():m_file(NULL) {};
+	GDIFileStream2(File* pFile):m_file(pFile) {};
+	virtual Int read(void *pData, Int numBytes) {
+		return(m_file?m_file->read(pData, numBytes):0);
+	};
+};
+
+//=============================================================================
+// W3DTreeBuffer::updateTexture
+//=============================================================================
+/** Creates a new texture. */
+//=============================================================================
+void W3DTreeBuffer::updateTexture(void)
+{
+
+	const Int MAX_TEX_WIDTH = 2048;
+
+	Int i, j;
+	Int maxHeight = 0;
+	const Int maxTilesPerRow = MAX_TEX_WIDTH/(TILE_PIXEL_EXTENT);
+
+	REF_PTR_RELEASE(m_treeTexture);
+
+	Bool availableGrid[maxTilesPerRow][maxTilesPerRow];
+	Int row, column;
+	for (row=0; row<maxTilesPerRow; row++) {
+		for (column=0; column<maxTilesPerRow; column++) {
+			availableGrid[row][column] = true;
+		}
+	}
+
+	for (i=0; i<m_numTiles; i++) {
+		REF_PTR_RELEASE (m_sourceTiles[i]);
+	}
+	m_numTiles = 0;
+	File *theFile = NULL;
+	for (i=0; i<m_numTreeTypes; i++) {
+		char texturePath[ _MAX_PATH ];
+		m_treeTypes[i].m_numTiles = 0;
+		sprintf( texturePath, "%s%s", TERRAIN_TGA_DIR_PATH, m_treeTypes[i].m_data->m_textureName.str() );
+		theFile = TheFileSystem->openFile( texturePath, File::READ|File::BINARY);
+		if (theFile==NULL) {
+			sprintf( texturePath, "%s%s", TGA_DIR_PATH, m_treeTypes[i].m_data->m_textureName.str() );
+			theFile = TheFileSystem->openFile( texturePath, File::READ|File::BINARY);
+		}
+		if (theFile != NULL) {
+			GDIFileStream2 theStream(theFile);
+			InputStream *pStr = &theStream;
+			Bool halfTile;
+			Int numTiles = WorldHeightMap::countTiles(pStr, &halfTile);
+			Int width;
+			for (width = 10; width >= 1; width--) {
+				if (numTiles >= width*width) {
+					numTiles = width*width;
+					break;
+				}
+			}
+			Bool texFound = false;
+			for	(j=0; j<i; j++) {
+				if (m_treeTypes[j].m_data->m_textureName.compareNoCase(m_treeTypes[i].m_data->m_textureName)==0) {
+					m_treeTypes[i].m_firstTile = 0;
+					m_treeTypes[i].m_tileWidth = width;
+					m_treeTypes[i].m_numTiles = 0;
+					texFound = true;
+					break;
+				}
+			}
+			if (texFound) {
+				theFile->close();
+				continue;
+			}
+			if (m_numTiles+numTiles<=MAX_TILES) {
+				theFile->seek(0, File::START);
+				m_treeTypes[i].m_firstTile = m_numTiles;
+				m_treeTypes[i].m_tileWidth = width;
+				m_treeTypes[i].m_numTiles = numTiles;
+				m_treeTypes[i].m_halfTile = halfTile;
+				WorldHeightMap::readTiles(pStr, m_sourceTiles+m_treeTypes[i].m_firstTile, width);
+				m_numTiles += numTiles;
+			} else {
+				m_treeTypes[i].m_firstTile = 0;
+				m_treeTypes[i].m_tileWidth = 0;
+				m_treeTypes[i].m_numTiles = 0;
+			}
+			theFile->close();
+		} else {
+			DEBUG_CRASH(("Could not find texture %s", m_treeTypes[i].m_data->m_textureName.str()));
+			m_treeTypes[i].m_firstTile = 0;
+			m_treeTypes[i].m_tileWidth = 0;
+			m_treeTypes[i].m_numTiles = 0;
+		}
+	}
+
+	Int tmpWidth = 8;
+	while (tmpWidth*tmpWidth<m_numTiles) {
+		tmpWidth*=2;
+	}
+	Int tilesPerRow = tmpWidth;
+	m_textureWidth = tmpWidth*TILE_PIXEL_EXTENT;
+
+	if (m_textureWidth>MAX_TEX_WIDTH) {
+		m_textureWidth = 64;
+		m_textureHeight = 64;
+		if (m_treeTexture==NULL) {
+			m_treeTexture = new TextureClass("missing.tga");
+		}
+		DEBUG_CRASH(("Too many trees in a scene."));
+		return;
+	}
+
+	for (i=0; i<m_numTiles; i++) {
+		if (m_sourceTiles[i]) {
+			m_sourceTiles[i]->m_tileLocationInTexture.x = -1;
+			m_sourceTiles[i]->m_tileLocationInTexture.y = -1;
+		}
+	}
+
+	/* put the tree tiles into the texture */
+	Int texClass;
+	Int tileWidth;
+	for (tileWidth = tilesPerRow; tileWidth>0; tileWidth--) {
+		for (texClass=0; texClass<m_numTreeTypes; texClass++) {
+			Int width = m_treeTypes[texClass].m_tileWidth;
+			if (width != tileWidth) continue;
+			Bool texFound = false;
+			for	(i=0; i<texClass; i++) {
+				if (m_treeTypes[i].m_data->m_textureName.compareNoCase(m_treeTypes[texClass].m_data->m_textureName)==0) {
+					m_treeTypes[texClass].m_textureOrigin.x = m_treeTypes[i].m_textureOrigin.x;
+					m_treeTypes[texClass].m_textureOrigin.y = m_treeTypes[i].m_textureOrigin.y;
+					texFound = true;
+					break;
+				}
+			}
+			if (texFound) {
+				continue;
+			}
+
+			// Find an available block of space.
+			Bool found = false;
+			for (row=0; row<(tilesPerRow-width)+1 && !found; row++) {
+				for (column=0; column<(tilesPerRow-width)+1 && !found; column++) {
+					if (availableGrid[row][column]) {
+						Bool open = true;
+						for (i=0; i<width && open; i++) {
+							for (j=0; j<width&&open; j++) {
+								if (!availableGrid[row+j][column+i]) {
+									open = false;
+								}
+							}
+						}
+						if (open) found = true;
+						break;
+					}
+				}
+				if (found) break;
+			}
+			if (!found) {
+				m_treeTypes[texClass].m_textureOrigin.x = 0;
+				m_treeTypes[texClass].m_textureOrigin.y = 0;
+				continue;
+			}
+
+			Int xOrigin = column*(TILE_PIXEL_EXTENT);
+			Int yOrigin = row*(TILE_PIXEL_EXTENT);
+			m_treeTypes[texClass].m_textureOrigin.x = xOrigin;
+			m_treeTypes[texClass].m_textureOrigin.y = yOrigin;
+			Int classHeight = yOrigin + width*TILE_PIXEL_EXTENT;
+			if (maxHeight < classHeight) maxHeight = classHeight;
+
+			for (i=0; i<width; i++) {
+				for (j=0; j<width; j++) {
+					availableGrid[row+j][column+i] = false;
+					Int baseNdx = m_treeTypes[texClass].m_firstTile + i + j*width;
+					Int x = xOrigin + i*TILE_PIXEL_EXTENT;
+					Int y = yOrigin + ((width-j)-1)*TILE_PIXEL_EXTENT;
+					m_sourceTiles[baseNdx]->m_tileLocationInTexture.x = x;
+					m_sourceTiles[baseNdx]->m_tileLocationInTexture.y = y;
+				}
+			}
+		}
+	}
+	DEBUG_ASSERTCRASH(maxHeight<=m_textureWidth, ("Bad max height."));
+	W3DTreeTextureClass *tex = new W3DTreeTextureClass((DWORD)m_textureWidth, (DWORD)m_textureWidth);
+	m_textureHeight = tex->update(this);
+
+	m_treeTexture = tex;
+
+	for (i=0; i<m_numTiles; i++) {
+		REF_PTR_RELEASE (m_sourceTiles[i]);
+	}
+	//	m_treeTexture = NEW_REF (TextureClass, (m_treeTypes[0].m_textureName.str()));
+
+}
+
+/**Adjust the resolution of tree texture uploaded to the video card.  The system memory
+version always remains at full resolution.  Someone should probably optimize this at
+some point since it wastes a lot of system memory on low-end systems. -MW
+*/
+void W3DTreeBuffer::setTextureLOD(Int lod)
+{
+	if (m_treeTexture)
+		((W3DTreeTextureClass*)m_treeTexture)->setLOD(lod);
+}
+
+//=============================================================================
+// W3DTreeBuffer::doLighting
+//=============================================================================
+/** Calculates the diffuse lighting as affected by dynamic lighting. */
+//=============================================================================
+UnsignedInt W3DTreeBuffer::doLighting(const Vector3 *normal,
+															const GlobalData::TerrainLighting	*objectLighting,
+															const Vector3 *emissive, UnsignedInt vertDiffuse, Real scale) const
+{
+
+	Real shadeR, shadeG, shadeB;
+	Real shade;
+	shadeR = objectLighting[0].ambient.red+emissive->X;	//only the first light contributes to ambient
+	shadeG = objectLighting[0].ambient.green+emissive->Y;
+	shadeB = objectLighting[0].ambient.blue+emissive->Z;
+
+	Int i;
+	for	(i=0; i<MAX_GLOBAL_LIGHTS; i++) {
+		Vector3 lightDirection(objectLighting[i].lightPos.x, objectLighting[i].lightPos.y, objectLighting[i].lightPos.z);
+		lightDirection.Normalize();
+		Vector3 lightRay(-lightDirection.X, -lightDirection.Y, -lightDirection.Z);
+		shade = Vector3::Dot_Product(lightRay, *normal);
+
+		if (shade > 1.0) shade = 1.0;
+		if(shade < 0.0f) shade = 0.0f;
+		shadeR += shade*objectLighting[i].diffuse.red;
+		shadeG += shade*objectLighting[i].diffuse.green;
+		shadeB += shade*objectLighting[i].diffuse.blue;
+	}
+
+	shadeR *= scale;
+	shadeG *= scale;
+	shadeB *= scale;
+
+	if (shadeR > 1.0) shadeR = 1.0;
+	if(shadeR < 0.0f) shadeR = 0.0f;
+	if (shadeG > 1.0) shadeG = 1.0;
+	if(shadeG < 0.0f) shadeG = 0.0f;
+	if (shadeB > 1.0) shadeB = 1.0;
+	if(shadeB < 0.0f) shadeB = 0.0f;
+
+	if (vertDiffuse!=0xFFFFFFFF) {
+		shade = vertDiffuse&0xff; //blue;
+		shadeB *= shade/255.0f;
+		shade = (vertDiffuse>>8)&0xFF; // green;
+		shadeG *= shade/255.0f;
+		shade = (vertDiffuse>>16)&0xFF; // red;
+		shadeR *= shade/255.0f;
+	}
+
+	shadeR*=255.0f;
+	shadeG*=255.0f;
+	shadeB*=255.0f;
+	const Real alpha = 255.0;
+	return REAL_TO_UNSIGNEDINT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16) | ((Int)alpha << 24);
+
+}
+
+//=============================================================================
+// W3DTreeBuffer::loadTreesInVertexAndIndexBuffers
+//=============================================================================
+/** Loads the trees into the vertex buffer for drawing. */
+//=============================================================================
+void W3DTreeBuffer::loadTreesInVertexAndIndexBuffers(RefRenderObjListIterator *pDynamicLightsIterator)
+{
+	if (!m_indexTree[0] || !m_vertexTree[0] || !m_initialized) {
+		return;
+	}
+	if (!m_anythingChanged) {
+		return;
+	}
+
+	if (m_shadow == NULL && TheW3DProjectedShadowManager) {
+		Shadow::ShadowTypeInfo shadowInfo;
+		shadowInfo.m_ShadowName[0] = 0;
+		shadowInfo.allowUpdates=FALSE;	//shadow image will never update
+		shadowInfo.allowWorldAlign=TRUE;	//shadow image will wrap around world objects
+		shadowInfo.m_type = (ShadowType)SHADOW_DECAL;
+		shadowInfo.m_sizeX=20;
+		shadowInfo.m_sizeY=20;
+		shadowInfo.m_offsetX=0;
+		shadowInfo.m_offsetY=0;
+		m_shadow = TheW3DProjectedShadowManager->createDecalShadow(&shadowInfo);
+	}
+
+	m_anythingChanged = false;
+	Int curTree=0;
+	Int bNdx;
+	const GlobalData::TerrainLighting *objectLighting = TheGlobalData->m_terrainObjectsLighting[TheGlobalData->m_timeOfDay];
+	for (bNdx=0; bNdx<MAX_BUFFERS; bNdx++) {
+		m_curNumTreeVertices[bNdx] = 0;
+		m_curNumTreeIndices[bNdx] = 0;
+		if (curTree >= m_numTrees) {
+			break;
+		}
+		VertexFormatXYZNDUV1 *vb;
+		UnsignedShort *ib;
+		// Lock the buffers.
+	#ifdef USE_STATIC
+		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexTree[bNdx], 0);
+		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexTree[bNdx], 0);
+	#else
+		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexTree[bNdx], D3DLOCK_DISCARD);
+		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexTree[bNdx], D3DLOCK_DISCARD);
+	#endif
+		vb=(VertexFormatXYZNDUV1*)lockVtxBuffer.Get_Vertex_Array();
+		ib = lockIdxBuffer.Get_Index_Array();
+		// Add to the index buffer & vertex buffer.
+		Vector2 lookAtVector(m_cameraLookAtVector.X, m_cameraLookAtVector.Y);
+		lookAtVector.Normalize();
+		// We draw from back to front, so we put the indexes in the buffer
+		// from back to front.
+		UnsignedShort *curIb = ib;
+
+		VertexFormatXYZNDUV1 *curVb = vb;
+
+
+
+
+		for ( ;curTree<m_numTrees;curTree++) {
+			Int type = m_trees[curTree].treeType;
+			if (type<0) {
+				continue; // Deleted tree. [6/9/2003]
+			}
+			if (!m_trees[curTree].visible) continue;
+			Real scale = m_trees[curTree].scale;
+			Vector3 loc = m_trees[curTree].location;
+			Real theSin = m_trees[curTree].sin;
+			Real theCos = m_trees[curTree].cos;
+			if (type<0 || m_treeTypes[type].m_mesh == 0) {
+				continue;
+			}
+
+			Bool doVertexLighting = true;
+
+	#if 0 // no dynamic lighting.
+			for (pDynamicLightsIterator->First(); !pDynamicLightsIterator->Is_Done(); pDynamicLightsIterator->Next())
+			{
+				W3DDynamicLight *pLight = (W3DDynamicLight*)pDynamicLightsIterator->Peek_Obj();
+				if (!pLight->isEnabled()) {
+					continue; // he is turned off.
+				}
+				if (CollisionMath::Overlap_Test(m_trees[curTree].bounds, pLight->Get_Bounding_Sphere()) == CollisionMath::OUTSIDE) {
+					continue; // this tree is outside of the light's influence.
+				}
+				doVertexLighting = true;
+			}
+	#endif
+			Vector3 emissive(0.0f,0.0f,0.0f);
+			MaterialInfoClass * matInfo = m_treeTypes[type].m_mesh->Get_Material_Info();
+			if (matInfo) {
+				VertexMaterialClass *vertMat = matInfo->Peek_Vertex_Material(0);
+				if (vertMat) {
+					vertMat->Get_Emissive(&emissive);
+				}
+			}
+			REF_PTR_RELEASE(matInfo);
+
+
+			Int startVertex = m_curNumTreeVertices[bNdx];
+			m_trees[curTree].firstIndex = startVertex;
+			m_trees[curTree].bufferNdx = bNdx;
+			Int i;
+			Int numVertex = m_treeTypes[type].m_mesh->Peek_Model()->Get_Vertex_Count();
+			Vector3 *pVert = m_treeTypes[type].m_mesh->Peek_Model()->Get_Vertex_Array();
+
+
+
+			// If we happen to have too many trees, stop.
+			if (m_curNumTreeVertices[bNdx]+numVertex+2>= MAX_TREE_VERTEX) {
+				break;
+			}
+			Int numIndex = m_treeTypes[type].m_mesh->Peek_Model()->Get_Polygon_Count();
+			const TriIndex *pPoly = m_treeTypes[type].m_mesh->Peek_Model()->Get_Polygon_Array();
+			if (m_curNumTreeIndices[bNdx]+3*numIndex+6 >= MAX_TREE_INDEX) {
+				break;
+			}
+
+			const Vector2*uvs=m_treeTypes[type].m_mesh->Peek_Model()->Get_UV_Array_By_Index(0);
+
+			const Vector3*normals = m_treeTypes[type].m_mesh->Peek_Model()->Get_Vertex_Normal_Array();
+			const unsigned *vecDiffuse = m_treeTypes[type].m_mesh->Peek_Model()->Get_Color_Array(0, false);
+
+			Int diffuse = 0;
+			if (normals == NULL) {
+				doVertexLighting = false;
+				Vector3 normal(0.0f,0.0f,1.0f);
+				diffuse = doLighting(&normal, objectLighting, &emissive, 0xFFFFFFFF, 1.0f);
+			}
+	/*
+	 *
+			// If we are doing reduced resolution terrain, do reduced
+			// poly trees.
+			Bool doPanel = (TheGlobalData->m_useHalfHeightMap || TheGlobalData->m_stretchTerrain);
+
+			if (doPanel) {
+				if (m_trees[curTree].rotates) {
+					theSin = -lookAtVector.X;
+					theCos = lookAtVector.Y;
+				}
+				// panel start is index offset, there are 3 index per triangle.
+				if (m_trees[curTree].panelStart/3 + 2 > numIndex) {
+					continue; // not enought polygons for the offset.  jba.
+				}
+				for (j=0; j<6; j++) {
+					i = ((Int *)pPoly)[j+m_trees[curTree].panelStart];
+					if (m_curNumTreeVertices >= MAX_TREE_VERTEX)
+						break;
+
+					// Update the uv values.  The W3D models each have their own texture, and
+					// we use one texture with all images in one, so we have to change the uvs to
+					// match.
+					Real U, V;
+					if (type==SHRUB) {
+						// shrub texture is tucked in the corner
+						U = ((512-64)+uvs[i].U*64.0f)/512.0f;
+						V = ((256-64)+uvs[i].V*64.0f)/256.0f;
+					} else if (type==FENCE) {
+						U = uvs[i].U*0.5f;
+						V = 1.0f + uvs[i].V;
+					} else {
+						U = typeOffset+uvs[i].U*0.5f;
+						V = uvs[i].V;
+					}
+
+					curVb->u1 = U;
+					curVb->v1 = V/2.0;
+					Vector3 vLoc;
+					vLoc.X = pVert[i].X*scale*theCos - pVert[i].Y*scale*theSin;
+					vLoc.Y = pVert[i].Y*scale*theCos + pVert[i].X*scale*theSin;
+
+					vLoc.X += loc.X;
+					vLoc.Y += loc.Y;
+					vLoc.Z = loc.Z + pVert[i].Z*scale;
+
+					curVb->x = vLoc.X;
+					curVb->y = vLoc.Y;
+					curVb->z = vLoc.Z;
+					if (doVertexLighting) {
+						curVb->diffuse = doLighting(&vLoc, shadeR, shadeG, shadeB, m_trees[curTree].bounds, pDynamicLightsIterator);
+					} else {
+						curVb->diffuse = diffuse;
+					}
+					curVb++;
+					m_curNumTreeVertices++;
+				}
+
+				for (i=0; i<6; i++) {
+					if (m_curNumTreeIndices+4 > MAX_TREE_INDEX)
+						break;
+					curIb--;
+					*curIb = startVertex + i;
+					m_curNumTreeIndices++;
+				}
+			} else {
+	 */
+			Real Uscale = m_treeTypes[type].m_tileWidth * (Real)TILE_PIXEL_EXTENT / (Real)m_textureWidth;
+			Real Vscale = m_treeTypes[type].m_tileWidth * (Real)TILE_PIXEL_EXTENT / (Real)m_textureHeight;
+			Real UOffset = m_treeTypes[type].m_textureOrigin.x/(Real)m_textureWidth;
+			Real VOffset = m_treeTypes[type].m_textureOrigin.y/(Real)m_textureHeight;
+			if (m_treeTypes[type].m_halfTile) {
+				Uscale *= 0.5f;
+				Vscale *= 0.5f;
+				VOffset += (TILE_PIXEL_EXTENT/2) / (Real)m_textureHeight;
+			}
+			for (i=0; i<numVertex; i++) {
+				if (m_curNumTreeVertices[bNdx] >= MAX_TREE_VERTEX)
+					break;
+
+				// Update the uv values.  The W3D models each have their own texture, and
+				// we use one texture with all images in one, so we have to change the uvs to
+				// match.
+				Real U, V;
+				U = uvs[i].U;
+				V = uvs[i].V;
+
+				if (U>1.0f) U=1.0f;
+				if (U<0.0f) U=0.0f;
+				if (V>1.0f) V=1.0f;
+				if (V<0.0f) V=0.0f;
+
+				curVb->u1 = U*Uscale + UOffset;
+				curVb->v1 = V*Vscale + VOffset;
+				Real x = pVert[i].X;
+				Real y = pVert[i].Y;
+
+
+				Vector3 vLoc;
+				x += m_treeTypes[type].m_offset.X;
+				y += m_treeTypes[type].m_offset.Y;
+				vLoc.X = x*scale*theCos - y*scale*theSin;
+				vLoc.Y = y*scale*theCos + x*scale*theSin;
+				vLoc.Z = pVert[i].Z*scale;
+				vLoc.Z += m_treeTypes[type].m_offset.Z;
+
+				if (m_trees[curTree].m_toppleState != TOPPLE_UPRIGHT) {
+					Matrix3D::Transform_Vector(m_trees[curTree].m_mtx, vLoc, &vLoc);
+				} else {
+					if (m_trees[curTree].pushAside>0.0f) {
+						vLoc.X += pVert[i].Z * m_trees[curTree].pushAside * m_trees[curTree].pushAsideCos * m_treeTypes[type].m_data->m_maxOutwardMovement;
+						vLoc.Y += pVert[i].Z * m_trees[curTree].pushAside * m_trees[curTree].pushAsideSin* m_treeTypes[type].m_data->m_maxOutwardMovement;
+					}
+					vLoc.X += loc.X;
+					vLoc.Y += loc.Y;
+					vLoc.Z += loc.Z;
+				}
+
+
+				curVb->x = vLoc.X;
+				curVb->y = vLoc.Y;
+				curVb->z = vLoc.Z;
+				curVb->nx = m_trees[curTree].swayType;
+				curVb->ny = 1.0f - m_treeTypes[type].m_data->m_darkening*m_trees[curTree].pushAside;
+				curVb->nz = loc.Z;
+				if (doVertexLighting) {
+					Vector3 normal(0.0f, 0.0f, 1.0f);
+					if (normals) {
+						normal.X = normals[i].X*theCos - normals[i].Y*theSin;
+						normal.Y = normals[i].Y*theCos + normals[i].X*theSin;
+						normal.Z = normals[i].Z;
+					}
+					UnsignedInt vertexDiffuse;
+					if (vecDiffuse) {
+						vertexDiffuse = vecDiffuse[i];
+					} else {
+						vertexDiffuse = 0xffffffff;
+					}
+					curVb->diffuse = doLighting(&normal, objectLighting, &emissive,
+														vertexDiffuse, 1.0f);
+				} else {
+					curVb->diffuse = diffuse;
+				}
+				curVb++;
+				m_curNumTreeVertices[bNdx]++;
+			}
+
+			for (i=0; i<numIndex; i++) {
+				if (m_curNumTreeIndices[bNdx]+4 > MAX_TREE_INDEX)
+					break;
+				*curIb++ = startVertex + pPoly[i].I;
+				*curIb++ = startVertex + pPoly[i].J;
+				*curIb++ = startVertex + pPoly[i].K;
+				m_curNumTreeIndices[bNdx]+=3;
+			}
+		}
+	}
+
+}
+//=============================================================================
+// W3DTreeBuffer::updateVertexBuffer
+//=============================================================================
+/** Updates the push aside offset in vertex buffer. */
+//=============================================================================
+void W3DTreeBuffer::updateVertexBuffer(void)
+{
+	if (!m_indexTree[0] || !m_vertexTree[0] || !m_initialized) {
+		return;
+	}
+	Int bNdx;
+	for	(bNdx = 0; bNdx<MAX_BUFFERS; bNdx++) {
+		if (m_curNumTreeIndices[bNdx]==0) {
+			break;
+		}
+		VertexFormatXYZNDUV1 *vb;
+		// Lock the buffers.
+	#ifdef USE_STATIC
+		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexTree[bNdx], 0);
+	#else
+		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexTree[bNdx], D3DLOCK_DISCARD);
+	#endif
+		vb=(VertexFormatXYZNDUV1*)lockVtxBuffer.Get_Vertex_Array();
+
+		VertexFormatXYZNDUV1 *curVb;
+
+		Int curTree;
+		for (curTree=0; curTree<m_numTrees; curTree++) {
+			if (m_trees[curTree].bufferNdx!=bNdx) {
+				continue;
+			}
+			Int type = m_trees[curTree].treeType;
+			if (type<0) {
+				continue; // Deleted tree. [6/9/2003]
+			}
+			if (m_trees[curTree].pushAsideDelta==0.0f && m_trees[curTree].m_toppleState == TOPPLE_UPRIGHT) {
+				continue; // not toppling or pushed, no need to update. jba [7/11/2003]
+			}
+			m_anyPushChanged = true;
+			if (!m_trees[curTree].visible) continue;
+			Real scale = m_trees[curTree].scale;
+			Vector3 loc = m_trees[curTree].location;
+			Real theSin = m_trees[curTree].sin;
+			Real theCos = m_trees[curTree].cos;
+			if (type<0 || m_treeTypes[type].m_mesh == 0) {
+				type = 0;
+			}
+
+			Int startVertex = m_trees[curTree].firstIndex;
+			curVb = vb+startVertex;
+			Int i;
+			Int numVertex = m_treeTypes[type].m_mesh->Peek_Model()->Get_Vertex_Count();
+			Vector3 *pVert = m_treeTypes[type].m_mesh->Peek_Model()->Get_Vertex_Array();
+
+			for (i=0; i<numVertex; i++) {
+				Real x = pVert[i].X;
+				Real y = pVert[i].Y;
+
+
+				Vector3 vLoc;
+				x += m_treeTypes[type].m_offset.X;
+				y += m_treeTypes[type].m_offset.Y;
+				vLoc.X = x*scale*theCos - y*scale*theSin;
+				vLoc.Y = y*scale*theCos + x*scale*theSin;
+				vLoc.Z = pVert[i].Z*scale;
+				vLoc.Z += m_treeTypes[type].m_offset.Z;
+
+				if (m_trees[curTree].m_toppleState != TOPPLE_UPRIGHT) {
+					m_trees[curTree].m_mtx.Transform_Vector(m_trees[curTree].m_mtx, vLoc, &vLoc);
+				} else {
+					if (m_trees[curTree].pushAside>0.0f) {
+						vLoc.X += pVert[i].Z * m_trees[curTree].pushAside * m_trees[curTree].pushAsideCos * m_treeTypes[type].m_data->m_maxOutwardMovement;
+						vLoc.Y += pVert[i].Z * m_trees[curTree].pushAside * m_trees[curTree].pushAsideSin* m_treeTypes[type].m_data->m_maxOutwardMovement;
+					}
+					vLoc.X += loc.X;
+					vLoc.Y += loc.Y;
+					vLoc.Z += loc.Z;
+				}
+
+				curVb->x = vLoc.X;
+				curVb->y = vLoc.Y;
+				curVb->z = vLoc.Z;
+				curVb->ny = 1.0f - m_treeTypes[type].m_data->m_darkening*m_trees[curTree].pushAside;
+				curVb++;
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+//         Public Functions
+//-----------------------------------------------------------------------------
+
+//=============================================================================
+// W3DTreeBuffer::~W3DTreeBuffer
+//=============================================================================
+/** Destructor. Releases w3d assets. */
+//=============================================================================
+W3DTreeBuffer::~W3DTreeBuffer(void)
+{
+	freeTreeBuffers();
+	REF_PTR_RELEASE(m_treeTexture);
+	Int i;
+	for (i=0; i<MAX_TYPES; i++) {
+		REF_PTR_RELEASE(m_treeTypes[i].m_mesh);
+	}
+
+	delete m_shadow;
+	m_shadow = NULL;
+}
+
+//=============================================================================
+// W3DTreeBuffer::W3DTreeBuffer
+//=============================================================================
+/** Constructor. Sets m_initialized to true if it finds the w3d models it needs
+for the trees. */
+//=============================================================================
+W3DTreeBuffer::W3DTreeBuffer(void)
+{
+	m_initialized = false;
+	Int i;
+	for	(i=0; i<MAX_BUFFERS; i++) {
+		m_vertexTree[i] = NULL;
+		m_indexTree[i] = NULL;
+		m_curNumTreeVertices[i]=0;
+		m_curNumTreeIndices[i]=0;
+	}
+	m_treeTexture = NULL;
+	m_dwTreeVertexShader = 0;
+	m_dwTreePixelShader = 0;
+	clearAllTrees();
+	allocateTreeBuffers();
+	m_initialized = true;
+	m_curSwayVersion = -1;
+
+	m_shadow = NULL;
+
+}
+
+
+//=============================================================================
+// W3DTreeBuffer::freeTreeBuffers
+//=============================================================================
+/** Frees the index and vertex buffers. */
+//=============================================================================
+void W3DTreeBuffer::freeTreeBuffers(void)
+{
+	Int i;
+	for	(i=0; i<MAX_BUFFERS; i++) {
+		REF_PTR_RELEASE(m_vertexTree[i]);
+		REF_PTR_RELEASE(m_indexTree[i]);
+	}
+
+	if (m_dwTreePixelShader)
+		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwTreePixelShader);
+	m_dwTreePixelShader = 0;
+
+	if (m_dwTreeVertexShader)
+		DX8Wrapper::_Get_D3D_Device8()->DeleteVertexShader(m_dwTreeVertexShader);
+	m_dwTreeVertexShader = 0;
+}
+
+//=============================================================================
+// W3DTreeBuffer::unitMoved
+//=============================================================================
+/** Check to see if a unit collided with a tree/grass/bush. */
+//=============================================================================
+void W3DTreeBuffer::unitMoved(Object *unit)
+{
+	if (unit->isKindOf(KINDOF_IMMOBILE)) {
+		// This is the initial positioning of the object, and we don't care. jba. [6/5/2003]
+		return;
+	}
+	Real radius = unit->getGeometryInfo().getMajorRadius();
+	if (unit->getGeometryInfo().getGeomType()==GEOMETRY_BOX) {
+		if (radius>unit->getGeometryInfo().getMinorRadius()) {
+			radius = unit->getGeometryInfo().getMinorRadius();
+		}
+	}
+	// Value to assume for the tree radius.
+#define TREE_RADIUS_APPROX 7.0f
+	radius += TREE_RADIUS_APPROX;
+
+	Coord3D pos = *unit->getPosition();
+	Real x = pos.x-radius;
+	Real y = pos.y-radius;
+	if (x<m_bounds.lo.x) x = m_bounds.lo.x;
+	if (y<m_bounds.lo.y) y = m_bounds.lo.y;
+	if (x>m_bounds.hi.x) x = m_bounds.hi.x;
+	if (y>m_bounds.hi.y) y = m_bounds.hi.y;
+	Int xIndex = REAL_TO_INT_FLOOR ( (x/(m_bounds.hi.x-m_bounds.lo.x)) * (PARTITION_WIDTH_HEIGHT-0.1f) );
+	Int yIndex = REAL_TO_INT_FLOOR ( (y/(m_bounds.hi.y-m_bounds.lo.y)) * (PARTITION_WIDTH_HEIGHT-0.1f) );
+	DEBUG_ASSERTCRASH(xIndex>=0 && yIndex>=0 && xIndex<PARTITION_WIDTH_HEIGHT && yIndex<PARTITION_WIDTH_HEIGHT, ("Invalid range."));
+
+	x = pos.x+radius;
+	y = pos.y+radius;
+	if (x<m_bounds.lo.x) x = m_bounds.lo.x;
+	if (y<m_bounds.lo.y) y = m_bounds.lo.y;
+	if (x>m_bounds.hi.x) x = m_bounds.hi.x;
+	if (y>m_bounds.hi.y) y = m_bounds.hi.y;
+	Int xMax = REAL_TO_INT_CEIL ( (x/(m_bounds.hi.x-m_bounds.lo.x)) * (PARTITION_WIDTH_HEIGHT-0.1f) );
+	Int yMax = REAL_TO_INT_CEIL ( (y/(m_bounds.hi.y-m_bounds.lo.y)) * (PARTITION_WIDTH_HEIGHT-0.1f) );
+	DEBUG_ASSERTCRASH(xMax>=0 && yMax>=0 && xMax<=PARTITION_WIDTH_HEIGHT && yMax<=PARTITION_WIDTH_HEIGHT, ("Invalid range."));
+	Int i, j;
+	for (i=xIndex; i<xMax; i++) {
+		for (j=yIndex; j<yMax; j++) {
+			Int treeNdx = m_areaPartition[i + PARTITION_WIDTH_HEIGHT*j];
+			while (treeNdx != END_OF_PARTITION) {
+				// paranoia [7/7/2003]
+				if (treeNdx<0 || treeNdx>=m_numTrees) {
+					DEBUG_CRASH(("Invalid index."));
+					break;
+				}
+				if (m_trees[treeNdx].treeType<0) {
+					treeNdx = m_trees[treeNdx].nextInPartition;
+					continue;	//  Tree is deleted. [7/11/2003]
+				}
+				Coord3D delta;
+				delta.set(m_trees[treeNdx].location.X, m_trees[treeNdx].location.Y, m_trees[treeNdx].location.Z );
+				delta.sub(&pos);
+				if (radius*radius>delta.lengthSqr()) {
+					bool canTopple = unit->getCrusherLevel() > 1;
+					if (canTopple && m_treeTypes[m_trees[treeNdx].treeType].m_data->m_doTopple) {
+						// Give a vector with direction to thing.
+						Coord3D toppleVector;
+						toppleVector.set(m_trees[treeNdx].location.X, m_trees[treeNdx].location.Y, 0);
+						toppleVector.x -= unit->getPosition()->x;
+						toppleVector.y -= unit->getPosition()->y;
+						applyTopplingForce(m_trees+treeNdx, &toppleVector, 0, W3D_TOPPLE_OPTIONS_NONE);
+					} else if (m_treeTypes[m_trees[treeNdx].treeType].m_data->m_framesToMoveOutward>1) {
+						pushAsideTree(m_trees[treeNdx].drawableID, &pos, unit->getUnitDirectionVector2D(), unit->getID());
+					}
+				}
+				treeNdx = m_trees[treeNdx].nextInPartition;
+			}
+		}
+	}
+
+
+}
+
+//=============================================================================
+// W3DTreeBuffer::allocateTreeBuffers
+//=============================================================================
+/** Allocates the index and vertex buffers. */
+//=============================================================================
+void W3DTreeBuffer::allocateTreeBuffers(void)
+{
+	Int i;
+	for	(i=0; i<MAX_BUFFERS; i++) {
+	#ifdef USE_STATIC
+		m_vertexTree[i]=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZNDUV1,MAX_TREE_VERTEX+4,DX8VertexBufferClass::USAGE_DEFAULT));
+		m_indexTree[i]=NEW_REF(DX8IndexBufferClass,(MAX_TREE_INDEX+4, DX8IndexBufferClass::USAGE_DEFAULT));
+	#else
+		m_vertexTree[i]=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZNDUV1,MAX_TREE_VERTEX+4,DX8VertexBufferClass::USAGE_DYNAMIC));
+		m_indexTree[i]=NEW_REF(DX8IndexBufferClass,(MAX_TREE_INDEX+4, DX8IndexBufferClass::USAGE_DYNAMIC));
+	#endif
+		m_curNumTreeVertices[i]=0;
+		m_curNumTreeIndices[i]=0;
+	}
+
+		//shader decleration
+	// DX8_FVF_XYZNDUV1
+	DWORD Declaration[] =
+	{
+		D3DVSD_STREAM( 0 ),
+		D3DVSD_REG( 0, D3DVSDT_FLOAT3 ),  // Position
+		D3DVSD_REG( 1, D3DVSDT_FLOAT3 ),  // Normal
+		D3DVSD_REG( 2, D3DVSDT_D3DCOLOR), // Diffuse color
+		D3DVSD_REG( 7, D3DVSDT_FLOAT2 ),  // Tex coord
+		D3DVSD_END()
+	};
+
+	HRESULT hr;
+	hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\Trees.vso", &Declaration[0], 0, true, &m_dwTreeVertexShader);
+	if (FAILED(hr))
+		return;
+
+	hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\Trees.pso", &Declaration[0], 0, false, &m_dwTreePixelShader);
+	if (FAILED(hr))
+		return;
+}
+
+//=============================================================================
+// W3DTreeBuffer::clearAllTrees
+//=============================================================================
+/** Removes all trees. */
+//=============================================================================
+void W3DTreeBuffer::clearAllTrees(void)
+{
+	m_numTrees=0;
+	m_bounds.lo.x = m_bounds.lo.y = 0;
+	m_bounds.hi.x = m_bounds.hi.y = 1;
+	REF_PTR_RELEASE(m_treeTexture);
+	m_curNumTreeIndices[0]=0;
+	m_anythingChanged = true;
+	Int i;
+	for (i=0; i<MAX_TYPES; i++) {
+		REF_PTR_RELEASE(m_treeTypes[i].m_mesh);
+	}
+	for (i=0; i<PARTITION_WIDTH_HEIGHT*PARTITION_WIDTH_HEIGHT; i++) {
+		m_areaPartition[i] = END_OF_PARTITION;
+	}
+	m_numTreeTypes = 0;
+}
+
+//=============================================================================
+// W3DTreeBuffer::removeTree
+//=============================================================================
+/** Removes a tree.  */
+//=============================================================================
+void W3DTreeBuffer::removeTree(DrawableID id)
+{
+	Int i;
+	for (i=0; i<m_numTrees; i++) {
+		if (m_trees[i].drawableID == id) {
+			m_trees[i].location = Vector3(0,0,0);
+			m_trees[i].treeType = DELETED_TREE_TYPE;
+			// Translate the bounding sphere of the model.
+			m_trees[i].bounds.Center = Vector3(0,0,0);
+			m_trees[i].bounds.Radius = 1;
+			m_anythingChanged = true;
+		}
+	}
+}
+
+//=============================================================================
+// W3DTreeBuffer::removeTree
+//=============================================================================
+/** Removes any trees that would be under a building.  */
+//=============================================================================
+void W3DTreeBuffer::removeTreesForConstruction(const Coord3D* pos, const GeometryInfo& geom, Real angle )
+{
+	// Just iterate all trees, as even non-collidable ones get removed. jba. [7/11/2003]
+	Int i;
+	for (i=0; i<m_numTrees; i++) {				// small, height,							radius,									minor radius
+		if (m_trees[i].treeType < 0) {
+			continue; // already deleted. jba [7/11/2003]
+		}
+		GeometryInfo info(GEOMETRY_CYLINDER, false, 5*TREE_RADIUS_APPROX, 2*TREE_RADIUS_APPROX, 2*TREE_RADIUS_APPROX);
+		Coord3D treePos;
+		treePos.set(m_trees[i].location.X, m_trees[i].location.Y, m_trees[i].location.Z);
+		if (ThePartitionManager->geomCollidesWithGeom( pos, geom, angle, &treePos, info, 0.0f)) {
+			// remove it [7/11/2003]
+			m_trees[i].treeType = DELETED_TREE_TYPE;
+			m_anythingChanged = true;
+		}
+	}
+}
+
+
+//=============================================================================
+// W3DTreeBuffer::addTreeTypes
+//=============================================================================
+/** Adds a type of tree (model & texture). */
+//=============================================================================
+Int W3DTreeBuffer::addTreeType(const W3DTreeDrawModuleData *data)
+{
+	if (m_numTreeTypes>=MAX_TYPES) {
+		DEBUG_CRASH(("Too many kinds of trees in map.  Reduce kinds of trees, or raise tree limit. jba."));
+		return 0;
+	}
+	m_needToUpdateTexture = true;
+
+	m_treeTypes[m_numTreeTypes].m_mesh = NULL;
+
+	RenderObjClass *robj=WW3DAssetManager::Get_Instance()->Create_Render_Obj(data->m_modelName.str());
+
+	if (robj==NULL) {
+		DEBUG_CRASH(("Unable to find model for tree %s", data->m_modelName.str()));
+		return 0;
+	}
+	AABoxClass box;
+
+	robj->Get_Obj_Space_Bounding_Box(box);
+	Vector3 offset(0,0,0);
+	if (robj->Class_ID() == RenderObjClass::CLASSID_HLOD) {
+		RenderObjClass *hlod = robj;
+		robj = hlod->Get_Sub_Object(0);
+		const Matrix3D xfm = robj->Get_Bone_Transform(0);
+		xfm.Get_Translation(&offset);
+		REF_PTR_RELEASE(hlod);
+	}
+
+	if (robj->Class_ID() == RenderObjClass::CLASSID_MESH)
+		m_treeTypes[m_numTreeTypes].m_mesh = (MeshClass*)robj;
+
+	if (m_treeTypes[m_numTreeTypes].m_mesh==NULL) {
+		DEBUG_CRASH(("Tree %s is not simple mesh. Tell artist to re-export. Don't Ignore!!!", data->m_modelName.str()));
+		return 0;
+	}
+
+	Int numVertex = m_treeTypes[m_numTreeTypes].m_mesh->Peek_Model()->Get_Vertex_Count();
+	Vector3 *pVert = m_treeTypes[m_numTreeTypes].m_mesh->Peek_Model()->Get_Vertex_Array();
+
+	const Matrix3D xfm = m_treeTypes[m_numTreeTypes].m_mesh->Get_Transform();
+	SphereClass bounds(pVert, numVertex);
+	bounds.Center += offset;
+	m_treeTypes[m_numTreeTypes].m_bounds = bounds;
+	m_treeTypes[m_numTreeTypes].m_textureOrigin.x = 0;
+	m_treeTypes[m_numTreeTypes].m_textureOrigin.y = 0;
+	m_treeTypes[m_numTreeTypes].m_data = data;
+	m_treeTypes[m_numTreeTypes].m_offset = offset;
+	m_treeTypes[m_numTreeTypes].m_shadowSize = (box.Extent.X + box.Extent.Y); // Average extent * 2. jba.
+	m_treeTypes[m_numTreeTypes].m_doShadow = data->m_doShadow;
+	m_numTreeTypes++;
+	return m_numTreeTypes-1;
+}
+
+//=============================================================================
+// W3DTreeBuffer::addTree
+//=============================================================================
+/** Adds a tree.  Name is the W3D model name, supported models are
+ALPINE, DECIDUOUS and SHRUB. */
+//=============================================================================
+void W3DTreeBuffer::addTree(DrawableID id, Coord3D location, Real scale, Real angle,
+								Real randomScaleAmount, const W3DTreeDrawModuleData *data)
+{
+	if (m_numTrees >= MAX_TREES) {
+		return;
+	}
+	if (!m_initialized) {
+		return;
+	}
+	Int treeType = DELETED_TREE_TYPE;
+	Int i;
+	for (i=0; i<m_numTreeTypes; i++) {
+		if (m_treeTypes[i].m_data->m_modelName.compareNoCase(data->m_modelName)==0 &&
+				m_treeTypes[i].m_data->m_textureName.compareNoCase(data->m_textureName)==0) {
+			treeType = i;
+			break;
+		}
+	}
+	if (treeType<0) {
+		treeType = addTreeType(data);
+		if (treeType<0) {
+			return;
+		}
+		m_needToUpdateTexture = true;
+	}
+	if (data->m_framesToMoveOutward > 2 || data->m_doTopple) {
+		// Trees/grass that topples or gets pushed aside (outward) gets put in the area partition. jba [7/7/2003]
+		Short bucket = getPartitionBucket(location);
+		m_trees[m_numTrees].nextInPartition = m_areaPartition[bucket];
+		m_areaPartition[bucket] = m_numTrees;
+	} else {
+		m_trees[m_numTrees].nextInPartition = END_OF_PARTITION;
+	}
+
+	Real randomScale = GameClientRandomValueReal( 1.0f - randomScaleAmount, 1.0f+ randomScaleAmount );
+	m_trees[m_numTrees].sin = WWMath::Sin(angle);
+	m_trees[m_numTrees].cos = WWMath::Cos(angle);
+	if (randomScaleAmount>0.0f) {
+		// Randomizes the scale and orientation of trees.
+		m_trees[m_numTrees].scale = scale*randomScale;
+	} else {
+		// Don't randomly scale & orient
+		m_trees[m_numTrees].scale = scale;
+	}
+	m_trees[m_numTrees].location = Vector3(location.x, location.y, location.z);
+	m_trees[m_numTrees].treeType = treeType;
+	// Translate the bounding sphere of the model.
+	m_trees[m_numTrees].bounds = m_treeTypes[treeType].m_bounds;
+	m_trees[m_numTrees].bounds.Center *= m_trees[m_numTrees].scale;
+	m_trees[m_numTrees].bounds.Radius *= m_trees[m_numTrees].scale;
+	m_trees[m_numTrees].bounds.Center += m_trees[m_numTrees].location;
+	// Initially set it invisible.  cull will update it's visibility flag.
+	m_trees[m_numTrees].visible = false;
+	m_trees[m_numTrees].drawableID = id;
+
+	m_trees[m_numTrees].firstIndex = 0;
+	m_trees[m_numTrees].bufferNdx = -1;
+
+	m_trees[m_numTrees].swayType = GameClientRandomValue(1, MAX_SWAY_TYPES);
+	m_trees[m_numTrees].pushAside = 0;
+	m_trees[m_numTrees].lastFrameUpdated = 0;
+	m_trees[m_numTrees].pushAsideSource = INVALID_ID;
+	m_trees[m_numTrees].pushAsideDelta = 0;
+	m_trees[m_numTrees].pushAsideCos = 1;
+	m_trees[m_numTrees].pushAsideSin = 1;
+	m_trees[m_numTrees].m_toppleState = TOPPLE_UPRIGHT;
+	m_numTrees++;
+}
+
+//=============================================================================
+// W3DTreeBuffer::updateTreePosition
+//=============================================================================
+/** Updates a tree's position */
+//=============================================================================
+Bool W3DTreeBuffer::updateTreePosition(DrawableID id, Coord3D location, Real angle)
+{
+	Int i;
+	for (i=0; i<m_numTrees; i++) {
+		if (m_trees[i].drawableID == id) {
+			m_trees[i].location = Vector3(location.x, location.y, location.z);
+			m_trees[i].sin = WWMath::Sin(angle);
+			m_trees[i].cos = WWMath::Cos(angle);
+			// Translate the bounding sphere of the model.
+			m_trees[i].bounds = m_treeTypes[m_trees[i].treeType].m_bounds;
+			m_trees[i].bounds.Center *= m_trees[i].scale;
+			m_trees[i].bounds.Radius *= m_trees[i].scale;
+			m_trees[i].bounds.Center += m_trees[i].location;
+			m_anythingChanged = true;
+			return true;
+		}
+	}
+	return false;
+}
+
+//=============================================================================
+// W3DTreeBuffer::pushAsideTree
+//=============================================================================
+/** Push sideways tree or grass. */
+//=============================================================================
+void W3DTreeBuffer::pushAsideTree(DrawableID id, const Coord3D *pusherPos,
+																	const Coord3D *pusherDirection, ObjectID pusherID )
+{
+	Int i;
+	for (i=0; i<m_numTrees; i++) {
+		if (m_trees[i].drawableID == id) {
+			UnsignedInt lastFrame = m_trees[i].lastFrameUpdated;
+			m_trees[i].lastFrameUpdated = TheGameLogic->getFrame();
+			if(m_trees[i].pushAsideSource == pusherID) {
+				if (m_trees[i].lastFrameUpdated - lastFrame < 3)
+					return; // already pushing. [5/28/2003]
+			}
+
+			if(m_trees[i].pushAside != 0.0f) {
+				return; // already pushing. [5/28/2003]
+			}
+			m_trees[i].pushAsideSource = pusherID;
+			Coord3D delta;
+			delta.set(m_trees[i].location.X, m_trees[i].location.Y, m_trees[i].location.Z);
+			delta.sub(pusherPos);
+
+			if (pusherDirection->x*delta.y - pusherDirection->y*delta.x > 0.0f) {
+				m_trees[i].pushAsideCos = -pusherDirection->y;
+				m_trees[i].pushAsideSin = pusherDirection->x;
+			} else {
+				m_trees[i].pushAsideCos = pusherDirection->y;
+				m_trees[i].pushAsideSin = -pusherDirection->x;
+			}
+			m_anyPushChanged = true;
+			m_trees[i].pushAsideDelta = 1.0f/(Real)m_treeTypes[m_trees[i].treeType].m_data->m_framesToMoveOutward;
+		}
+	}
+}
+
+DECLARE_PERF_TIMER(Tree_Render)
+
+//=============================================================================
+// W3DTreeBuffer::drawTrees
+//=============================================================================
+/** Draws the trees.  Uses camera to cull. */
+//=============================================================================
+void W3DTreeBuffer::drawTrees(CameraClass * camera, RefRenderObjListIterator *pDynamicLightsIterator)
+{
+	USE_PERF_TIMER(Tree_Render)
+	if (!m_isTerrainPass) {
+		return;
+	}
+
+	// if breeze changes, always process the full update, even if not visible,
+	// so that things offscreen won't 'pop' when first viewed
+	const BreezeInfo& info = TheScriptEngine->getBreezeInfo();
+	if (info.m_breezeVersion != m_curSwayVersion)
+	{
+		updateSway(info);
+	}
+
+	// TheSuperHackers @tweak The tree sway, topple and sink time steps are now decoupled from the render update.
+	const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
+	Vector3 swayFactor[MAX_SWAY_TYPES];
+	Int i;
+	for (i=0; i<MAX_SWAY_TYPES; i++)
+	{
+		m_curSwayOffset[i] += m_curSwayStep[i] * timeScale;
+		if (m_curSwayOffset[i] > NUM_SWAY_ENTRIES-1) {
+			m_curSwayOffset[i] -= NUM_SWAY_ENTRIES-1;
+		}
+		Int minOffset = REAL_TO_INT_FLOOR(m_curSwayOffset[i]);
+		if (minOffset>=0 && minOffset+1<NUM_SWAY_ENTRIES) {
+			Real f2 = m_curSwayOffset[i] - minOffset;
+			Real f1 = 1.0f - f2;
+			swayFactor[i] = f1*m_swayOffsets[minOffset] + f2*m_swayOffsets[minOffset+1];
+			swayFactor[i] *= m_curSwayFactor[i];
+		}
+	}
+
+	m_isTerrainPass = false;
+
+	if (m_needToUpdateTexture) {
+		m_needToUpdateTexture = false;
+		updateTexture();
+	}
+	if (m_treeTexture==NULL) {
+		return;
+	}
+	if (m_updateAllKeys) {
+		cull(camera);
+	}
+
+	Int curTree;
+	// Draw tree shadows.
+	if (m_shadow && TheW3DProjectedShadowManager && TheGlobalData->m_useShadowDecals) {
+		for (curTree=0; curTree<m_numTrees; curTree++) {
+			Int type = m_trees[curTree].treeType;
+			if (type<0) { // deleted.
+				continue;
+			}
+			if (!m_trees[curTree].visible || !m_treeTypes[type].m_doShadow) {
+				continue;
+			}
+
+			if (m_trees[curTree].m_toppleState == TOPPLE_FALLING ||
+					m_trees[curTree].m_toppleState == TOPPLE_DOWN) {
+				continue;
+			}
+			m_shadow->setSize(m_treeTypes[type].m_shadowSize, m_treeTypes[type].m_shadowSize);
+			m_shadow->setPosition(m_trees[curTree].location.X, m_trees[curTree].location.Y, m_trees[curTree].location.Z);
+			TheW3DProjectedShadowManager->queueDecal(m_shadow);
+		}
+		TheW3DProjectedShadowManager->flushDecals(m_shadow->getTexture(0), SHADOW_DECAL);
+	}
+
+	// Update pushed aside and toppling trees.
+	for (curTree=0; curTree<m_numTrees; curTree++) {
+		Int type = m_trees[curTree].treeType;
+		if (type<0) { // deleted.
+			continue;
+		}
+		const W3DTreeDrawModuleData *moduleData = m_treeTypes[type].m_data;
+		if(m_trees[curTree].m_toppleState == TOPPLE_FALLING ||
+			 m_trees[curTree].m_toppleState == TOPPLE_FOGGED) {
+			updateTopplingTree(m_trees+curTree, timeScale);
+		} else if(m_trees[curTree].m_toppleState == TOPPLE_DOWN) {
+			if (moduleData->m_killWhenToppled) {
+				if (m_trees[curTree].m_sinkFramesLeft <= 0.0f) {
+					m_trees[curTree].treeType = DELETED_TREE_TYPE; // delete it. [7/11/2003]
+					m_anythingChanged = true; // need to regenerate trees. [7/11/2003]
+				}
+				const Real sinkDistancePerFrame = moduleData->m_sinkDistance / moduleData->m_sinkFrames;
+				m_trees[curTree].m_sinkFramesLeft -= timeScale;
+				m_trees[curTree].location.Z -= sinkDistancePerFrame * timeScale;
+				m_trees[curTree].m_mtx.Set_Translation(m_trees[curTree].location);
+			}
+		} else if (m_trees[curTree].pushAsideDelta!=0.0f) {
+			m_trees[curTree].pushAside += m_trees[curTree].pushAsideDelta;
+			if (m_trees[curTree].pushAside>=1.0f) {
+				m_trees[curTree].pushAsideDelta = -1.0f/(Real)moduleData->m_framesToMoveInward;
+			} else if (m_trees[curTree].pushAside<=0.0f) {
+				m_trees[curTree].pushAsideDelta = 0.0f;
+				m_trees[curTree].pushAside = 0.0f;
+			}
+		}
+	}
+
+	if (m_anythingChanged) {
+		loadTreesInVertexAndIndexBuffers(pDynamicLightsIterator);
+		m_anythingChanged = false;
+	} else if (m_anyPushChanged) {
+		m_anyPushChanged = false;
+		updateVertexBuffer();
+	}
+
+//#define DEBUG_TEXTURE 1
+#ifdef DEBUG_TEXTURE // Draw the combined texture for debugging. jba. [4/21/2003]
+	// Setup the vertex buffer, shader & texture.
+	DX8Wrapper::Set_Shader(detailAlphaShader);
+	DX8Wrapper::Set_Texture(0,m_treeTexture);
+	DynamicIBAccessClass ib_access(BUFFER_TYPE_DYNAMIC_DX8, 6);
+	//draw an infinite sky plane
+	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8, DX8_FVF_XYZNDUV2, 4);
+	{
+		DynamicIBAccessClass::WriteLockClass ibLock(&ib_access);
+		UnsignedShort *ndx = ibLock.Get_Index_Array();
+
+		if (ndx) {
+			ndx[0] = 0;
+			ndx[1] = 1;
+			ndx[2] = 2;
+			ndx[3] = 1;
+			ndx[4] = 3;
+			ndx[5] = 2;
+		}
+		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
+		VertexFormatXYZNDUV2* verts=lock.Get_Formatted_Vertex_Array();
+		if(verts)
+		{
+			Real width = 300;
+			Real origin = 40;
+			verts[0].x=origin;
+			verts[0].y=origin;
+			verts[0].z=15;
+			verts[0].u1=0;
+			verts[0].v1=0;
+			verts[0].diffuse=0xffffffff;
+
+			verts[1].x=origin+width;
+			verts[1].y=origin;
+			verts[1].z=15;
+			verts[1].u1=1;
+			verts[1].v1=0;
+			verts[1].diffuse=0xffffffff;
+
+			verts[2].x=origin;
+			verts[2].y=origin+width;
+			verts[2].z=15;
+			verts[2].u1=0;
+			verts[2].v1=1;
+			verts[2].diffuse=0xffffffff;
+
+			verts[3].x=origin+width;
+			verts[3].y=origin+width;
+			verts[3].z=15;
+			verts[3].u1=1;
+			verts[3].v1=1;
+			verts[3].diffuse=0xffffffff;
+		}
+	}
+
+	DX8Wrapper::Set_Index_Buffer(ib_access,0);
+	DX8Wrapper::Set_Vertex_Buffer(vb_access);
+
+	Matrix3D tm(1);
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
+
+	DX8Wrapper::Draw_Triangles(	0,2, 0,	4);	//draw a quad, 2 triangles, 4 verts
+#endif
+
+
+	if (m_curNumTreeIndices[0] == 0) {
+		return;
+	}
+	DX8Wrapper::Set_Shader(detailAlphaShader);
+
+	DX8Wrapper::Set_Texture(0,m_treeTexture);
+	DX8Wrapper::Set_Texture(1,NULL);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, 1);
+	// Draw all the trees.
+	DX8Wrapper::Apply_Render_State_Changes();
+	W3DShaderManager::setShroudTex(1);
+	DX8Wrapper::Apply_Render_State_Changes();
+
+	if (m_dwTreeVertexShader) {
+		D3DXMATRIX matProj, matView, matWorld;
+		DX8Wrapper::_Get_DX8_Transform(D3DTS_WORLD, *(Matrix4x4*)&matWorld);
+		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, *(Matrix4x4*)&matView);
+		DX8Wrapper::_Get_DX8_Transform(D3DTS_PROJECTION, *(Matrix4x4*)&matProj);
+		D3DXMATRIX mat;
+		D3DXMatrixMultiply( &mat, &matView, &matProj );
+		D3DXMatrixMultiply( &mat, &matWorld, &mat );
+		D3DXMatrixTranspose( &mat, &mat );
+
+		// c4  - Composite World-View-Projection Matrix
+		DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  4, &mat,  4 );
+		Vector4 noSway(0,0,0,0);
+		DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  8, &noSway,  1 );
+
+		// c8 - c8+MAX_SWAY_TYPES - the sway amount.
+		for	(i=0; i<MAX_SWAY_TYPES; i++) {
+			Vector4 sway4(swayFactor[i].X, swayFactor[i].Y, swayFactor[i].Z, 0);
+			DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  9+i, &sway4,  1 );
+		}
+
+		W3DShroud *shroud;
+		if ((shroud=TheTerrainRenderObject->getShroud()) != 0) {
+			// Setup shroud texture info [6/6/2003]
+			float xoffset = 0;
+			float yoffset = 0;
+			Real width=shroud->getCellWidth();
+			Real height=shroud->getCellHeight();
+
+			xoffset = -(float)shroud->getDrawOriginX() + width;
+			yoffset = -(float)shroud->getDrawOriginY() + height;
+			Vector4 offset(xoffset, yoffset, 0, 0);
+			DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  32, &offset,  1 );
+			width = 1.0f/(width*shroud->getTextureWidth());
+			height = 1.0f/(height*shroud->getTextureHeight());
+			offset.Set(width, height, 1, 1);
+			DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  33, &offset,  1 );
+
+		} else {
+			Vector4 offset(0,0,0,0);
+			DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  32, &offset,  1 );
+			DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  33, &offset,  1 );
+		}
+
+		DX8Wrapper::Set_Vertex_Shader(m_dwTreeVertexShader);
+#if 0
+		DX8Wrapper::Set_Pixel_Shader(m_dwTreePixelShader);
+		// a.c. 6/16 - allow switching between normal and 2X mode for terrain
+		Real mulTwoX = 0.5f;
+		if(TheGlobalData && TheGlobalData->m_useOverbright)
+			mulTwoX = 1.0f;
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(1, D3DXVECTOR4(mulTwoX, mulTwoX, mulTwoX, mulTwoX), 1);
+#endif
+
+	} else {
+		DX8Wrapper::Set_Vertex_Shader(DX8_FVF_XYZNDUV1);
+	}
+
+
+	Int bNdx;
+	for (bNdx=0;bNdx<MAX_BUFFERS; bNdx++) {
+		if (m_curNumTreeIndices[bNdx]==0) {
+			break;
+		}
+		DX8Wrapper::Set_Index_Buffer(m_indexTree[bNdx],0);
+		DX8Wrapper::Set_Vertex_Buffer(m_vertexTree[bNdx]);
+		// Render the waving grass
+		DX8Wrapper::Apply_Render_State_Changes();
+		if (m_dwTreeVertexShader) {
+			DX8Wrapper::_Get_D3D_Device8()->SetVertexShader(m_dwTreeVertexShader);
+			DX8Wrapper::_Get_D3D_Device8()->SetTextureStageState(0,  D3DTSS_TEXCOORDINDEX, 0);
+			DX8Wrapper::_Get_D3D_Device8()->SetTextureStageState(1,  D3DTSS_TEXCOORDINDEX, 1);
+			DX8Wrapper::_Get_D3D_Device8()->SetTextureStageState(1,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+		}
+		DX8Wrapper::Draw_Triangles(	0, m_curNumTreeIndices[bNdx]/3, 0,	m_curNumTreeVertices[bNdx]);
+	}
+
+	DX8Wrapper::Set_Vertex_Shader(DX8_FVF_XYZNDUV1);
+	DX8Wrapper::Set_Pixel_Shader(NULL);
+	DX8Wrapper::Invalidate_Cached_Render_States();	//code above mucks around with W3D states so make sure we reset
+
+}
+
+//-------------------------------------------------------------------------------------------------
+///< Start the toppling process by giving a force vector
+//-------------------------------------------------------------------------------------------------
+void W3DTreeBuffer::applyTopplingForce( TTree *tree, const Coord3D* toppleDirection, Real toppleSpeed,
+																			 UnsignedInt options )
+{
+	if (tree->m_toppleState != TOPPLE_UPRIGHT) {
+		return;
+	}
+	const W3DTreeDrawModuleData* d = m_treeTypes[tree->treeType].m_data;
+  // Having a low toppleSpeed is BAD. In particular, if the toppleSpeed is exactly 0, the
+  // tree will stay upright forever, frozen in place (because the sway update is dead)
+  // but never dying
+  if ( toppleSpeed < d->m_minimumToppleSpeed )
+  {
+    toppleSpeed = d->m_minimumToppleSpeed;
+  }
+
+	tree->m_toppleDirection = *toppleDirection;
+	tree->m_toppleDirection.normalize();
+	tree->m_angularAccumulation = 0;
+
+	tree->m_angularVelocity = toppleSpeed * d->m_initialVelocityPercent;
+	tree->m_angularAcceleration = toppleSpeed * d->m_initialAccelPercent;
+	tree->m_toppleState = TOPPLE_FALLING;
+	tree->m_options = options;
+	Coord3D pos;
+	pos.set(tree->location.X, tree->location.Y, tree->location.Z);
+	FXList::doFXPos(d->m_toppleFX, &pos);
+	m_anyPushChanged = true;
+	tree->m_mtx.Make_Identity();
+	tree->m_mtx.Set_Translation(tree->location);
+
+}
+
+// this is our "bounce" limit -- slightly less that 90 degrees, to account for slop.
+static const Real ANGULAR_LIMIT = PI/2 - PI/64;
+
+//-------------------------------------------------------------------------------------------------
+///< Keep track of rotational fall distance, bounce and/or stop when needed.
+//-------------------------------------------------------------------------------------------------
+void W3DTreeBuffer::updateTopplingTree(TTree *tree, Real timeScale)
+{
+	//DLOG(Debug::Format("updating W3DTreeBuffer %08lx\n",this));
+	DEBUG_ASSERTCRASH(tree->m_toppleState != TOPPLE_UPRIGHT, ("hmm, we should be sleeping here"));
+	if ( (tree->m_toppleState == TOPPLE_UPRIGHT)  ||  (tree->m_toppleState == TOPPLE_DOWN) )
+		return;
+
+	const W3DTreeDrawModuleData* d = m_treeTypes[tree->treeType].m_data;
+	const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
+	Coord3D pos;
+	pos.set(tree->location.X, tree->location.Y, tree->location.Z);
+	ObjectShroudStatus ss = ThePartitionManager->getPropShroudStatusForPlayer(localPlayerIndex, &pos);
+	if (ss==OBJECTSHROUD_FOGGED) {
+		// Don't update fogged trees. [8/11/2003]
+		tree->m_toppleState = TOPPLE_FOGGED;
+		return;
+	} else if (tree->m_toppleState == TOPPLE_FOGGED) {
+		// was fogged, now isn't.
+		tree->m_angularVelocity = 0;
+		tree->m_toppleState = TOPPLE_DOWN;
+		tree->m_mtx.In_Place_Pre_Rotate_X(-ANGULAR_LIMIT * tree->m_toppleDirection.y);
+		tree->m_mtx.In_Place_Pre_Rotate_Y(ANGULAR_LIMIT * tree->m_toppleDirection.x);
+		if (d->m_killWhenToppled) {
+			// If got killed in the fog, just remove. jba [8/11/2003]
+			tree->m_sinkFramesLeft = 0.0f;
+		}
+		return;
+	}
+	const Real VELOCITY_BOUNCE_LIMIT = 0.01f;				// if the velocity after a bounce will be this or lower, just stop at zero
+	const Real VELOCITY_BOUNCE_SOUND_LIMIT = 0.03f;	// and if this low, then skip the bounce sound
+
+	Real curVelToUse = tree->m_angularVelocity * timeScale;
+	if (tree->m_angularAccumulation + curVelToUse > ANGULAR_LIMIT)
+		curVelToUse = ANGULAR_LIMIT - tree->m_angularAccumulation;
+
+	tree->m_mtx.In_Place_Pre_Rotate_X(-curVelToUse * tree->m_toppleDirection.y);
+	tree->m_mtx.In_Place_Pre_Rotate_Y(curVelToUse * tree->m_toppleDirection.x);
+
+	tree->m_angularAccumulation += curVelToUse;
+	if ((tree->m_angularAccumulation >= ANGULAR_LIMIT) && (tree->m_angularVelocity > 0))
+	{
+		// Hit so either bounce or stop if too little remaining velocity.
+		tree->m_angularVelocity *= -d->m_bounceVelocityPercent;
+
+		if( BitIsSet( tree->m_options, W3D_TOPPLE_OPTIONS_NO_BOUNCE ) == TRUE ||
+				fabs(tree->m_angularVelocity) < VELOCITY_BOUNCE_LIMIT )
+		{
+			// too slow, just stop
+			tree->m_angularVelocity = 0;
+			tree->m_toppleState = TOPPLE_DOWN;
+			if (d->m_killWhenToppled) {
+				tree->m_sinkFramesLeft = d->m_sinkFrames;
+			}
+		}
+		else if( fabs(tree->m_angularVelocity) >= VELOCITY_BOUNCE_SOUND_LIMIT )
+		{
+			// fast enough bounce to warrant the bounce fx
+			if( BitIsSet( tree->m_options, W3D_TOPPLE_OPTIONS_NO_FX ) == FALSE ) {
+				Vector3 loc(0, 0, 3*TREE_RADIUS_APPROX); // Kinda towards the top of the tree. jba. [7/11/2003]
+				Vector3 xloc;
+				tree->m_mtx.Transform_Vector(tree->m_mtx, loc, &xloc);
+				Coord3D pos;
+				pos.set(xloc.X, xloc.Y, xloc.Z);
+				FXList::doFXPos(d->m_bounceFX, &pos);
+			}
+		}
+	}
+	else
+	{
+		tree->m_angularVelocity += tree->m_angularAcceleration * timeScale;
+	}
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** CRC */
+// ------------------------------------------------------------------------------------------------
+void W3DTreeBuffer::crc( Xfer *xfer )
+{
+	// empty. jba [8/11/2003]
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Xfer
+	* Version Info:
+	* 1: Initial version */
+// ------------------------------------------------------------------------------------------------
+void W3DTreeBuffer::xfer( Xfer *xfer )
+{
+
+	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
+	XferVersion currentVersion = 1;
+#else
+	XferVersion currentVersion = 2;
+#endif
+	XferVersion version = currentVersion;
+	xfer->xferVersion( &version, currentVersion );
+
+	Int i;
+	Int numTrees = m_numTrees;
+	xfer->xferInt(&numTrees);
+	if (xfer->getXferMode() == XFER_LOAD)	{
+		m_numTrees = 0;
+		for (i=0; i<PARTITION_WIDTH_HEIGHT*PARTITION_WIDTH_HEIGHT; i++) {
+			m_areaPartition[i] = END_OF_PARTITION;
+		}
+	}
+
+	// Save trees. [8/11/2003]
+	for	(i=0; i<numTrees; i++) {
+		TTree tree;
+		memset(&tree, 0, sizeof(tree));
+		AsciiString modelName;
+		AsciiString modelTexture;
+		Int treeType = DELETED_TREE_TYPE;
+		if (xfer->getXferMode() != XFER_LOAD) {
+			tree = m_trees[i];
+			treeType = m_trees[i].treeType;
+			if (treeType != DELETED_TREE_TYPE) {
+				modelName = m_treeTypes[treeType].m_data->m_modelName;
+				modelTexture = m_treeTypes[treeType].m_data->m_textureName;
+			}
+		}
+		xfer->xferAsciiString(&modelName);
+		xfer->xferAsciiString(&modelTexture);
+		if (xfer->getXferMode() == XFER_LOAD) {
+			Int j;
+			for (j=0; j<m_numTreeTypes; j++) {
+				if (m_treeTypes[j].m_data->m_modelName.compareNoCase(modelName)==0 &&
+						m_treeTypes[j].m_data->m_textureName.compareNoCase(modelTexture)==0) {
+					treeType = j;
+					break;
+				}
+			}
+		}
+
+		xfer->xferReal(&tree.location.X);
+		xfer->xferReal(&tree.location.Y);
+		xfer->xferReal(&tree.location.Z);
+
+		xfer->xferReal(&tree.scale);	///< Scale at location.
+		xfer->xferReal(&tree.sin);	///< Sine of the rotation angle at location.
+		xfer->xferReal(&tree.cos);	///< Cosine of the rotation angle at location.
+
+		xfer->xferDrawableID(&tree.drawableID);	///< Drawable this tree corresponds to.
+
+		// Topple parameters. [7/7/2003]
+		xfer->xferReal(&tree.m_angularVelocity);	///< Velocity in degrees per frame (or is it radians per frame?)
+		xfer->xferReal(&tree.m_angularAcceleration);	///< Acceleration angularVelocity is increasing
+		xfer->xferCoord3D(&tree.m_toppleDirection);	///< Z-less direction we are toppling
+		xfer->xferUser(&tree.m_toppleState, sizeof(tree.m_toppleState));	///< Stage this module is in.
+		xfer->xferReal(&tree.m_angularAccumulation);	///< How much have I rotated so I know when to bounce.
+		xfer->xferUnsignedInt(&tree.m_options);	///< topple options
+		xfer->xferMatrix3D(&tree.m_mtx);
+
+		if (version <= 1)
+		{
+			UnsignedInt sinkFramesLeft = (UnsignedInt)tree.m_sinkFramesLeft;
+			xfer->xferUnsignedInt(&sinkFramesLeft);	///< Toppled trees sink into the terrain & disappear, how many frames left.
+			tree.m_sinkFramesLeft = (Real)sinkFramesLeft;
+		}
+		else
+		{
+			xfer->xferReal(&tree.m_sinkFramesLeft);	///< Toppled trees sink into the terrain & disappear, how many frames left.
+		}
+
+		if (xfer->getXferMode() == XFER_LOAD && treeType != DELETED_TREE_TYPE && treeType < m_numTreeTypes) {
+			Coord3D pos;
+			pos.set(tree.location.X, tree.location.Y, tree.location.Z);
+			Real angle = 0;
+			addTree(tree.drawableID, pos, tree.scale, angle, 0, m_treeTypes[treeType].m_data);
+			if (m_numTrees) {
+				TTree *curTree = &m_trees[m_numTrees-1];
+				curTree->m_angularAcceleration = tree.m_angularAcceleration;
+				curTree->m_angularVelocity = tree.m_angularVelocity;
+				curTree->m_toppleDirection = tree.m_toppleDirection;
+				curTree->m_toppleState = tree.m_toppleState;
+				curTree->m_options = tree.m_options;
+				curTree->m_mtx = tree.m_mtx;
+				curTree->m_sinkFramesLeft = tree.m_sinkFramesLeft;
+			}
+		}
+	}
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Load post process */
+// ------------------------------------------------------------------------------------------------
+void W3DTreeBuffer::loadPostProcess( void )
+{
+	// empty. jba [8/11/2003]
+}
+
+
+
+
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
new file mode 100644
index 00000000000..6f190d0063f
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
@@ -0,0 +1,282 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//----------------------------------------------------------------------------
+//
+// Project:   Generals
+//
+// Module:    Video
+//
+// File name: W3DDevice/GameClient/W3DVideoBuffer.cpp
+//
+// Created:   10/23/01 TR
+//
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+//         Includes
+//----------------------------------------------------------------------------
+
+#include "Common/GameMemory.h"
+#include "WW3D2/texture.h"
+#include "WW3D2/textureloader.h"
+#include "W3DDevice/GameClient/W3DVideoBuffer.h"
+
+//----------------------------------------------------------------------------
+//         Externals
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Defines
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Types
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Data
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Prototypes
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Private Functions
+//----------------------------------------------------------------------------
+
+
+
+//----------------------------------------------------------------------------
+//         Public Functions
+//----------------------------------------------------------------------------
+
+
+//============================================================================
+// W3DVideoBuffer::W3DVideoBuffer
+//============================================================================
+
+W3DVideoBuffer::W3DVideoBuffer( VideoBuffer::Type format )
+: VideoBuffer(format),
+	m_texture(NULL),
+	m_surface(NULL)
+{
+
+}
+
+
+//============================================================================
+// W3DVideoBuffer::SetBuffer
+//============================================================================
+
+Bool W3DVideoBuffer::allocate( UnsignedInt width, UnsignedInt height )
+{
+	free();
+
+	m_width = width;
+	m_height = height;
+	m_textureWidth = width;
+	m_textureHeight = height;
+	unsigned int temp_depth=1;
+	TextureLoader::Validate_Texture_Size( m_textureWidth, m_textureHeight, temp_depth);
+
+	WW3DFormat w3dFormat = TypeToW3DFormat(  m_format );
+
+	if ( w3dFormat == WW3D_FORMAT_UNKNOWN )
+	{
+		return NULL;
+	}
+
+	m_texture  = MSGNEW("TextureClass") TextureClass ( m_textureWidth, m_textureHeight, w3dFormat, MIP_LEVELS_1 );
+
+	if ( m_texture == NULL )
+	{
+		return FALSE;
+	}
+
+	if ( lock() == NULL )
+	{
+		free();
+		return FALSE;
+	}
+
+	unlock();
+
+
+	return TRUE;
+}
+
+//============================================================================
+// W3DVideoBuffer::~W3DVideoBuffer
+//============================================================================
+
+W3DVideoBuffer::~W3DVideoBuffer()
+{
+	free();
+}
+
+//============================================================================
+// W3DVideoBuffer::lock
+//============================================================================
+
+void*		W3DVideoBuffer::lock( void )
+{
+	void *mem = NULL;
+
+	if ( m_surface != NULL )
+	{
+		unlock();
+	}
+
+	m_surface = m_texture->Get_Surface_Level();
+
+	if ( m_surface )
+	{
+		mem = m_surface->Lock( (Int*) &m_pitch );
+	}
+
+	return mem;
+}
+
+//============================================================================
+// W3DVideoBuffer::unlock
+//============================================================================
+
+void		W3DVideoBuffer::unlock( void )
+{
+	if ( m_surface != NULL )
+	{
+		m_surface->Unlock();
+		m_surface->Release_Ref();
+		m_surface = NULL;
+	}
+}
+
+//============================================================================
+// W3DVideoBuffer::valid
+//============================================================================
+
+Bool		W3DVideoBuffer::valid( void )
+{
+	return m_texture != NULL;
+}
+
+//============================================================================
+// W3DVideoBuffer::reset
+//============================================================================
+
+void	W3DVideoBuffer::free( void )
+{
+	unlock();
+
+	if ( m_texture )
+	{
+		unlock();
+		m_texture->Release_Ref();
+		m_texture = NULL;
+	}
+	m_surface = NULL;
+
+	VideoBuffer::free();
+}
+
+
+//============================================================================
+// W3DVideoBuffer::TypeToW3DFormat
+//============================================================================
+
+WW3DFormat W3DVideoBuffer::TypeToW3DFormat( VideoBuffer::Type format )
+{
+	WW3DFormat w3dFormat = WW3D_FORMAT_UNKNOWN;
+	switch ( format )
+	{
+		case TYPE_X8R8G8B8:
+			w3dFormat = WW3D_FORMAT_X8R8G8B8;
+			break;
+
+ 		case TYPE_R8G8B8:
+			w3dFormat = WW3D_FORMAT_R8G8B8;
+			break;
+
+ 		case TYPE_R5G6B5:
+			w3dFormat = WW3D_FORMAT_R5G6B5;
+			break;
+
+ 		case TYPE_X1R5G5B5:
+			w3dFormat = WW3D_FORMAT_X1R5G5B5;
+			break;
+	}
+
+	return w3dFormat;
+}
+
+//============================================================================
+// W3DFormatToType
+//============================================================================
+
+VideoBuffer::Type W3DVideoBuffer::W3DFormatToType( WW3DFormat w3dFormat )
+{
+	Type format = TYPE_UNKNOWN;
+	switch ( w3dFormat )
+	{
+		case WW3D_FORMAT_X8R8G8B8:
+				format = VideoBuffer::TYPE_X8R8G8B8;
+				break;
+		case WW3D_FORMAT_R8G8B8:
+				format = VideoBuffer::TYPE_R8G8B8;
+				break;
+		case WW3D_FORMAT_R5G6B5:
+				format = VideoBuffer::TYPE_R5G6B5;
+				break;
+		case WW3D_FORMAT_X1R5G5B5:
+				format = VideoBuffer::TYPE_X1R5G5B5;
+				break;
+	}
+
+	return format;
+}
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
new file mode 100644
index 00000000000..704f000e259
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
@@ -0,0 +1,3382 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DView.cpp //////////////////////////////////////////////////////////////////////////////
+//
+// W3D implementation of the game view class.  This view allows us to have
+// a "window" into the game world that can change its width, height as
+// well as camera positioning controls
+//
+// Author: Colin Day, April 2001
+//
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+// SYSTEM INCLUDES ////////////////////////////////////////////////////////////////////////////////
+#include <stdlib.h>
+#include <windows.h>
+
+// USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
+#include "Common/BuildAssistant.h"
+#include "Common/FramePacer.h"
+#include "Common/GameUtility.h"
+#include "Common/GlobalData.h"
+#include "Common/Module.h"
+#include "Common/RandomValue.h"
+#include "Common/ThingTemplate.h"
+#include "Common/ThingSort.h"
+#include "Common/PerfTimer.h"
+#include "Common/PlayerList.h"
+#include "Common/Player.h"
+
+#include "GameClient/Color.h"
+#include "GameClient/CommandXlat.h"
+#include "GameClient/Drawable.h"
+#include "GameClient/GameClient.h"
+#include "GameClient/GameWindowManager.h"
+#include "GameClient/Image.h"
+#include "GameClient/InGameUI.h"
+#include "GameClient/Line2D.h"
+#include "GameClient/SelectionInfo.h"
+#include "GameClient/Shell.h"
+#include "GameClient/TerrainVisual.h"
+#include "GameClient/Water.h"
+
+#include "GameLogic/AI.h"			///< For AI debug (yes, I'm cheating for now)
+#include "GameLogic/AIPathfind.h"			///< For AI debug (yes, I'm cheating for now)
+#include "GameLogic/ExperienceTracker.h"
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/Module/AIUpdate.h"
+#include "GameLogic/Module/BodyModule.h"
+#include "GameLogic/Module/ContainModule.h"
+#include "GameLogic/Module/OpenContain.h"
+#include "GameLogic/Object.h"
+#include "GameLogic/ScriptEngine.h"
+#include "GameLogic/TerrainLogic.h"									///< @todo This should be TerrainVisual (client side)
+#include "Common/AudioEventInfo.h"
+
+#include "W3DDevice/Common/W3DConvert.h"
+#include "W3DDevice/GameClient/HeightMap.h"
+#include "W3DDevice/GameClient/W3DAssetManager.h"
+#include "W3DDevice/GameClient/W3DDisplay.h"
+#include "W3DDevice/GameClient/W3DScene.h"
+#include "W3DDevice/GameClient/W3DView.h"
+#include "d3dx8math.h"
+#include "W3DDevice/GameClient/W3DShaderManager.h"
+#include "W3DDevice/GameClient/Module/W3DModelDraw.h"
+#include "W3DDevice/GameClient/W3DCustomScene.h"
+
+#include "WW3D2/dx8renderer.h"
+#include "WW3D2/light.h"
+#include "WW3D2/camera.h"
+#include "WW3D2/coltype.h"
+#include "WW3D2/predlod.h"
+#include "WW3D2/ww3d.h"
+
+#include "W3DDevice/GameClient/CameraShakeSystem.h"
+
+#include "WinMain.h"  /** @todo Remove this, it's only here because we
+													are using timeGetTime, but we can remove that
+													when we have our own timer */
+
+
+
+// 30 fps
+Real TheW3DFrameLengthInMsec = MSEC_PER_LOGICFRAME_REAL; // default is 33msec/frame == 30fps. but we may change it depending on sys config.
+static const Int MAX_REQUEST_CACHE_SIZE = 40;	// Any size larger than 10, or examine code below for changes. jkmcd.
+static const Real DRAWABLE_OVERSCAN = 75.0f;  ///< 3D world coords of how much to overscan in the 3D screen region
+
+
+
+
+
+
+//=================================================================================================
+inline Real minf(Real a, Real b) { if (a < b) return a; else return b; }
+inline Real maxf(Real a, Real b) { if (a > b) return a; else return b; }
+
+//-------------------------------------------------------------------------------------------------
+// Normalizes angle to +- PI.
+//-------------------------------------------------------------------------------------------------
+static void normAngle(Real &angle)
+{
+	angle = WWMath::Normalize_Angle(angle);
+}
+
+#define TERRAIN_SAMPLE_SIZE 40.0f
+static Real getHeightAroundPos(Real x, Real y)
+{
+	// terrain height + desired height offset == cameraOffset * actual zoom
+	Real terrainHeight = TheTerrainLogic->getGroundHeight(x, y);
+
+	// find best approximation of max terrain height we can see
+	Real terrainHeightMax = terrainHeight;
+	terrainHeightMax = max(terrainHeightMax, TheTerrainLogic->getGroundHeight(x+TERRAIN_SAMPLE_SIZE, y-TERRAIN_SAMPLE_SIZE));
+	terrainHeightMax = max(terrainHeightMax, TheTerrainLogic->getGroundHeight(x-TERRAIN_SAMPLE_SIZE, y-TERRAIN_SAMPLE_SIZE));
+	terrainHeightMax = max(terrainHeightMax, TheTerrainLogic->getGroundHeight(x+TERRAIN_SAMPLE_SIZE, y+TERRAIN_SAMPLE_SIZE));
+	terrainHeightMax = max(terrainHeightMax, TheTerrainLogic->getGroundHeight(x-TERRAIN_SAMPLE_SIZE, y+TERRAIN_SAMPLE_SIZE));
+
+	return terrainHeightMax;
+}
+
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+W3DView::W3DView()
+{
+
+	m_3DCamera = NULL;
+	m_2DCamera = NULL;
+	m_groundLevel = 10.0;
+	m_cameraOffset.z = TheGlobalData->m_cameraHeight;
+	m_cameraOffset.y = -(m_cameraOffset.z / tan(TheGlobalData->m_cameraPitch * (PI / 180.0)));
+	m_cameraOffset.x = -(m_cameraOffset.y * tan(TheGlobalData->m_cameraYaw * (PI / 180.0)));
+
+	m_viewFilterMode = FM_VIEW_DEFAULT;
+	m_viewFilter = FT_VIEW_DEFAULT;
+	m_isWireFrameEnabled = m_nextWireFrameEnabled = FALSE;
+	m_shakeOffset.x = 0.0f;
+	m_shakeOffset.y = 0.0f;
+	m_shakeIntensity = 0.0f;
+	m_FXPitch = 1.0f;
+	m_freezeTimeForCameraMovement = false;
+	m_cameraHasMovedSinceRequest = true;
+	m_locationRequests.clear();
+	m_locationRequests.reserve(MAX_REQUEST_CACHE_SIZE + 10);	// This prevents the vector from ever re-allocing
+
+	//Enhancements from CNC3 WST 4/15/2003. JSC Integrated 5/20/03.
+	m_CameraArrivedAtWaypointOnPathFlag = false;	// Scripts for polling camera reached targets
+	m_isCameraSlaved = false;						// This is for 3DSMax camera playback
+	m_useRealZoomCam = false;						// true;	//WST 10/18/2002
+	m_shakerAngles.X =0.0f;							// Proper camera shake generator & sources
+	m_shakerAngles.Y =0.0f;
+	m_shakerAngles.Z =0.0f;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+W3DView::~W3DView()
+{
+
+	REF_PTR_RELEASE( m_2DCamera );
+	REF_PTR_RELEASE( m_3DCamera );
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Sets the height of the viewport, while maintaining original camera perspective. */
+//-------------------------------------------------------------------------------------------------
+void W3DView::setHeight(Int height)
+{
+	// extend View functionality
+	View::setHeight(height);
+
+	Vector2 vMin,vMax;
+	m_3DCamera->Set_Aspect_Ratio((Real)getWidth()/(Real)height);
+ 	m_3DCamera->Get_Viewport(vMin,vMax);
+ 	vMax.Y=(Real)(m_originY+height)/(Real)TheDisplay->getHeight();
+ 	m_3DCamera->Set_Viewport(vMin,vMax);
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Sets the width of the viewport, while maintaining original camera perspective. */
+//-------------------------------------------------------------------------------------------------
+void W3DView::setWidth(Int width)
+{
+	// extend View functionality
+	View::setWidth(width);
+
+	Vector2 vMin,vMax;
+	m_3DCamera->Set_Aspect_Ratio((Real)width/(Real)getHeight());
+ 	m_3DCamera->Get_Viewport(vMin,vMax);
+ 	vMax.X=(Real)(m_originX+width)/(Real)TheDisplay->getWidth();
+ 	m_3DCamera->Set_Viewport(vMin,vMax);
+
+	//we want to maintain the same scale, so we'll need to adjust the fov.
+	//default W3D fov for full-screen is 50 degrees.
+	m_3DCamera->Set_View_Plane((Real)width/(Real)TheDisplay->getWidth()*DEG_TO_RADF(50.0f),-1);
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Sets location of top-left view corner on display */
+//-------------------------------------------------------------------------------------------------
+void W3DView::setOrigin( Int x, Int y)
+{
+	// extend View functionality
+	View::setOrigin(x,y);
+
+	Vector2 vMin,vMax;
+
+ 	m_3DCamera->Get_Viewport(vMin,vMax);
+ 	vMin.X=(Real)x/(Real)TheDisplay->getWidth();
+	vMin.Y=(Real)y/(Real)TheDisplay->getHeight();
+ 	m_3DCamera->Set_Viewport(vMin,vMax);
+
+	// bottom-right border was also moved my this call, so force an update of extents.
+	setWidth(m_width);
+	setHeight(m_height);
+}
+
+//-------------------------------------------------------------------------------------------------
+/** @todo This is inefficient. We should construct the matrix directly using vectors. */
+//-------------------------------------------------------------------------------------------------
+#define MIN_CAPPED_ZOOM (0.5f) //WST 10.19.2002. JSC integrated 5/20/03.
+void W3DView::buildCameraTransform( Matrix3D *transform )
+{
+	Vector3 sourcePos, targetPos;
+
+	Real groundLevel = m_groundLevel; // 93.0f;
+
+	Real zoom = getZoom();
+	Real angle = getAngle();
+	Real pitch = getPitch();
+	Coord3D pos = *getPosition();
+
+	// add in the camera shake, if any
+	pos.x += m_shakeOffset.x;
+	pos.y += m_shakeOffset.y;
+
+	if (m_cameraConstraintValid)
+	{
+		pos.x = maxf(m_cameraConstraint.lo.x, pos.x);
+		pos.x = minf(m_cameraConstraint.hi.x, pos.x);
+		pos.y = maxf(m_cameraConstraint.lo.y, pos.y);
+		pos.y = minf(m_cameraConstraint.hi.y, pos.y);
+	}
+
+	// set position of camera itself
+	if (m_useRealZoomCam) //WST 10/10/2002 Real Zoom using FOV
+	{
+		sourcePos.X = m_cameraOffset.x;
+		sourcePos.Y = m_cameraOffset.y;
+		sourcePos.Z = m_cameraOffset.z;
+		Real capped_zoom = zoom;
+		if (capped_zoom > 1.0f)
+		{
+			capped_zoom= 1.0f;
+		}
+		if (capped_zoom < MIN_CAPPED_ZOOM)
+		{
+			capped_zoom = MIN_CAPPED_ZOOM;
+		}
+		m_FOV = 50.0f * PI/180.0f * capped_zoom * capped_zoom;
+	}
+	else
+	{
+		sourcePos.X = m_cameraOffset.x*zoom;
+		sourcePos.Y = m_cameraOffset.y*zoom;
+		sourcePos.Z = m_cameraOffset.z*zoom;
+	}
+
+#ifdef NOT_IN_USE
+	if (TheGlobalData->m_isOffsetCameraZ && TheTerrainLogic)
+	{
+		sourcePos.Z += TheTerrainLogic->getGroundHeight(pos.x, pos.y);
+		if (m_prevSourcePosZ != SOURCEPOS_INVALID)
+		{
+			const Real MAX_SPZ_VARIATION = 0.05f;
+			Real spzMin = m_prevSourcePosZ*(1.0-MAX_SPZ_VARIATION);
+			Real spzMax			Coord3D center;
+ = m_prevSourcePosZ*(1.0+MAX_SPZ_VARIATION);
+			if (sourcePos.Z < spzMin) sourcePos.Z = spzMin;
+			if (sourcePos.Z > spzMax) sourcePos.Z = spzMax;
+		}
+		m_prevSourcePosZ = sourcePos.Z;
+	}
+#endif
+
+	// camera looking at origin
+	targetPos.X = 0;
+	targetPos.Y = 0;
+	targetPos.Z = 0;
+
+
+	Real factor = 1.0 - (groundLevel/sourcePos.Z );
+
+	// construct a matrix to rotate around the up vector by the given angle
+	Matrix3D angleTransform( Vector3( 0.0f, 0.0f, 1.0f ), angle );
+
+	// construct a matrix to rotate around the horizontal vector by the given angle
+	Matrix3D pitchTransform( Vector3( 1.0f, 0.0f, 0.0f ), pitch );
+
+	// rotate camera position (pitch, then angle)
+#ifdef ALLOW_TEMPORARIES
+	sourcePos = pitchTransform * sourcePos;
+	sourcePos = angleTransform * sourcePos;
+#else
+	pitchTransform.mulVector3(sourcePos);
+	angleTransform.mulVector3(sourcePos);
+#endif
+	sourcePos *= factor;
+
+	// translate to current XY position
+	sourcePos.X += pos.x;
+	sourcePos.Y += pos.y;
+	sourcePos.Z += groundLevel;
+
+	targetPos.X += pos.x;
+	targetPos.Y += pos.y;
+	targetPos.Z += groundLevel;
+
+	// do m_FXPitch adjustment.
+	//WST Real height = sourcePos.Z - targetPos.Z;
+	//WST height *= m_FXPitch;
+	//WST targetPos.Z = sourcePos.Z - height;
+
+
+	// The following code moves camera down and pitch up when player zooms in.
+	// Use scripts to switch to useRealZoomCam
+	if (m_useRealZoomCam)
+	{
+		Real pitch_adjust = 1.0f;
+
+		if (!TheDisplay->isLetterBoxed())
+		{
+			Real capped_zoom = zoom;
+			if (capped_zoom > 1.0f)
+			{
+				 capped_zoom= 1.0f;
+			}
+			if (capped_zoom < MIN_CAPPED_ZOOM)
+			{
+				capped_zoom = MIN_CAPPED_ZOOM;
+			}
+			sourcePos.Z = sourcePos.Z * ( 0.5f + capped_zoom * 0.5f); // move camera down physically
+			pitch_adjust = capped_zoom;	// adjust camera to pitch up
+		}
+		m_FXPitch = 1.0f * (0.25f + pitch_adjust*0.75f);
+	}
+
+
+	// do fxPitch adjustment
+	if (m_useRealZoomCam)
+	{
+		sourcePos.X = targetPos.X + ((sourcePos.X - targetPos.X) / m_FXPitch);
+		sourcePos.Y = targetPos.Y + ((sourcePos.Y - targetPos.Y) / m_FXPitch);
+	}
+	else
+	{
+		// TheSuperHackers @todo Investigate whether the non Generals code is correct for Zero Hour.
+		// It certainly is incorrect for Generals when m_FXPitch goes above 1:
+		// Seen in USA mission 1 second cut scene with SCUD Storm.
+#if RTS_GENERALS
+		Real height = sourcePos.Z - targetPos.Z;
+		height *= m_FXPitch;
+		targetPos.Z = sourcePos.Z - height;
+#else
+		if (m_FXPitch <= 1.0f)
+		{
+			Real height = sourcePos.Z - targetPos.Z;
+			height *= m_FXPitch;
+			targetPos.Z = sourcePos.Z - height;
+		}
+		else
+		{
+			sourcePos.X = targetPos.X + ((sourcePos.X - targetPos.X) / m_FXPitch);
+			sourcePos.Y = targetPos.Y + ((sourcePos.Y - targetPos.Y) / m_FXPitch);
+		}
+#endif
+	}
+
+	//m_3DCamera->Set_View_Plane(DEG_TO_RADF(50.0f));
+	//DEBUG_LOG(("zoom %f, SourceZ %f, posZ %f, groundLevel %f CamOffZ %f",
+	//			zoom, sourcePos.Z, pos.z, groundLevel,m_cameraOffset.z));
+
+	// build new camera transform
+	transform->Make_Identity();
+	transform->Look_At( sourcePos, targetPos, 0 );
+
+	//WST 11/12/2002 New camera shaker system
+	// TheSuperHackers @tweak The camera shaker is now decoupled from the render update.
+	CameraShakerSystem.Timestep(TheFramePacer->getLogicTimeStepMilliseconds());
+	CameraShakerSystem.Update_Camera_Shaker(sourcePos, &m_shakerAngles);
+	transform->Rotate_X(m_shakerAngles.X);
+	transform->Rotate_Y(m_shakerAngles.Y);
+	transform->Rotate_Z(m_shakerAngles.Z);
+
+	//if (m_shakerAngles.X >= 0.0f)
+	//{
+	//	DEBUG_LOG(("m_shakerAngles %f, %f, %f", m_shakerAngles.X, m_shakerAngles.Y, m_shakerAngles.Z));
+	//}
+
+	// (gth) check if the camera is being controlled by an animation
+	if (m_isCameraSlaved) {
+		// find object named m_cameraSlaveObjectName
+		Object * obj = TheScriptEngine->getUnitNamed(m_cameraSlaveObjectName);
+
+		if (obj != NULL) {
+			// dig out the drawable
+			Drawable * draw = obj->getDrawable();
+			if (draw != NULL) {
+
+				// dig out the first draw module with an ObjectDrawInterface
+				for (DrawModule ** dm = draw->getDrawModules(); *dm; ++dm) {
+					const ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
+					if (di) {
+						Matrix3D tm;
+						di->clientOnly_getRenderObjBoneTransform(m_cameraSlaveObjectBoneName,&tm);
+
+						// Ok, slam it into the camera!
+						*transform = tm;
+
+						//--------------------------------------------------------------------
+						// WST 10.22.2002. Update the Listener positions used by audio system
+						//--------------------------------------------------------------------
+						Vector3 position = transform->Get_Translation();
+						Coord3D coord;
+						coord.set(position.X, position.Y, position.Z);
+						View::setPosition(&coord);
+						break;
+					}
+				}
+
+			} else {
+				m_isCameraSlaved = false;
+			}
+		} else {
+			m_isCameraSlaved = false;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DView::calcCameraConstraints()
+{
+//	const Matrix3D& cameraTransform = m_3DCamera->Get_Transform();
+
+//	DEBUG_LOG(("*** rebuilding cam constraints"));
+
+	// ok, now check to ensure that we can't see outside the map region,
+	// and twiddle the camera if needed
+	if (TheTerrainLogic)
+	{
+		Region3D mapRegion;
+		TheTerrainLogic->getExtent( &mapRegion );
+
+	/*
+		Note the following restrictions on camera constraints!
+
+		-- they assume that all maps are height 'm_groundLevel' at the edges.
+				(since you need to add some "buffer" around the edges of your map
+				anyway, this shouldn't be an issue.)
+
+		-- for angles/pitches other than zero, it may show boundaries.
+				since we currently plan the game to be restricted to this,
+				it shouldn't be an issue.
+
+	*/
+		Real maxEdgeZ = m_groundLevel;
+//		const Real BORDER_FUDGE = MAP_XY_FACTOR * 1.414f;
+		Coord3D center, bottom;
+		ICoord2D screen;
+
+		//Pick at the center
+		screen.x=0.5f*getWidth()+m_originX;
+		screen.y=0.5f*getHeight()+m_originY;
+
+		Vector3 rayStart,rayEnd;
+
+		getPickRay(&screen,&rayStart,&rayEnd);
+
+		center.x = Vector3::Find_X_At_Z(maxEdgeZ, rayStart, rayEnd);
+		center.y = Vector3::Find_Y_At_Z(maxEdgeZ, rayStart, rayEnd);
+		center.z = maxEdgeZ;
+
+		screen.y = m_originY+ 0.95f*getHeight();
+ 		getPickRay(&screen,&rayStart,&rayEnd);
+ 		bottom.x = Vector3::Find_X_At_Z(maxEdgeZ, rayStart, rayEnd);
+		bottom.y = Vector3::Find_Y_At_Z(maxEdgeZ, rayStart, rayEnd);
+		bottom.z = maxEdgeZ;
+		center.x -= bottom.x;
+		center.y -= bottom.y;
+
+		Real offset = center.length();
+
+		if (TheGlobalData->m_debugAI) {
+			offset = -1000; // push out the constraints so we can look at staging areas.
+		}
+
+		m_cameraConstraint.lo.x = mapRegion.lo.x + offset;
+		m_cameraConstraint.hi.x = mapRegion.hi.x - offset;
+		// this looks inverted, but is correct
+		m_cameraConstraint.lo.y = mapRegion.lo.y + offset;
+		m_cameraConstraint.hi.y = mapRegion.hi.y - offset;
+		m_cameraConstraintValid = true;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Returns a world-space ray originating at a given screen pixel position
+	and ending at the far clip plane for current camera.  Screen coordinates
+	assumed in absolute values relative to full display resolution.*/
+//-------------------------------------------------------------------------------------------------
+void W3DView::getPickRay(const ICoord2D *screen, Vector3 *rayStart, Vector3 *rayEnd)
+{
+	Real logX,logY;
+
+	//W3D Screen coordinates are -1 to 1, so we need to do some conversion:
+	PixelScreenToW3DLogicalScreen(screen->x - m_originX,screen->y - m_originY, &logX, &logY,getWidth(),getHeight());
+
+	*rayStart = m_3DCamera->Get_Position();	//get camera location
+	m_3DCamera->Un_Project(*rayEnd,Vector2(logX,logY));	//get world space point
+	*rayEnd -= *rayStart;	//vector camera to world space point
+	rayEnd->Normalize();	//make unit vector
+	*rayEnd *= m_3DCamera->Get_Depth();	//adjust length to reach far clip plane
+	*rayEnd += *rayStart;	//get point on far clip plane along ray from camera.
+}
+
+//-------------------------------------------------------------------------------------------------
+/** set the transform matrix of m_3DCamera, based on m_pos & m_angle */
+//-------------------------------------------------------------------------------------------------
+void W3DView::setCameraTransform( void )
+{
+	if (TheGlobalData->m_headless)
+		return;
+
+	if (m_viewLockedUntilFrame > TheGameClient->getFrame())
+		return;
+
+	m_cameraHasMovedSinceRequest = true;
+	Matrix3D cameraTransform( 1 );
+
+	Real nearZ, farZ;
+	// m_3DCamera->Get_Clip_Planes(nearZ, farZ);
+	// Set the near to MAP_XY_FACTOR.  Improves zbuffer resolution.
+	nearZ = MAP_XY_FACTOR;
+	farZ = 1200.0f;
+
+	if (m_useRealZoomCam)	//WST 10.19.2002
+	{
+		if (m_FXPitch<0.95f)
+		{
+			farZ = farZ / m_FXPitch; //Extend far Z when we pitch up for RealZoomCam
+		}
+	}
+	else
+	{
+		if ((TheGlobalData && TheGlobalData->m_drawEntireTerrain) || (m_FXPitch<0.95f || m_zoom>1.05))
+		{	//need to extend far clip plane so entire terrain can be visible
+			farZ *= MAP_XY_FACTOR;
+		}
+	}
+
+	m_3DCamera->Set_Clip_Planes(nearZ, farZ);
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_useCameraConstraints)
+#endif
+	{
+		if (!m_cameraConstraintValid)
+		{
+			buildCameraTransform(&cameraTransform);
+			m_3DCamera->Set_Transform( cameraTransform );
+			calcCameraConstraints();
+		}
+		DEBUG_ASSERTLOG(m_cameraConstraintValid,("*** cam constraints are not valid!!!"));
+
+		if (m_cameraConstraintValid)
+		{
+			Coord3D pos = *getPosition();
+			pos.x = maxf(m_cameraConstraint.lo.x, pos.x);
+			pos.x = minf(m_cameraConstraint.hi.x, pos.x);
+			pos.y = maxf(m_cameraConstraint.lo.y, pos.y);
+			pos.y = minf(m_cameraConstraint.hi.y, pos.y);
+			setPosition(&pos);
+		}
+	}
+
+#if defined(RTS_DEBUG)
+	m_3DCamera->Set_View_Plane( m_FOV, -1 );
+#endif
+
+	// rebuild it (even if we just did it due to camera constraints)
+	buildCameraTransform( &cameraTransform );
+	m_3DCamera->Set_Transform( cameraTransform );
+
+	if (TheTerrainRenderObject)
+	{
+		RefRenderObjListIterator *it = W3DDisplay::m_3DScene->createLightsIterator();
+		TheTerrainRenderObject->updateCenter(m_3DCamera, it);
+		if (it)
+		{
+		 W3DDisplay::m_3DScene->destroyLightsIterator(it);
+		 it = NULL;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DView::init( void )
+{
+	// extend View functionality
+	View::init();
+	setName("W3DView");
+	// set default camera "lookat" point
+	Coord3D pos;
+	pos.x = 87.0f;
+	pos.y = 77.0f;
+	pos.z = 0;
+
+	pos.x *= MAP_XY_FACTOR;
+	pos.y *= MAP_XY_FACTOR;
+
+	setPosition(&pos);
+
+	// create our 3D camera
+	m_3DCamera = NEW_REF( CameraClass, () );
+
+
+	setCameraTransform();
+
+	// create our 2D camera for the GUI overlay
+	m_2DCamera = NEW_REF( CameraClass, () );
+	m_2DCamera->Set_Position( Vector3( 0, 0, 1 ) );
+	Vector2 min = Vector2( -1, -0.75f );
+	Vector2 max = Vector2( +1, +0.75f );
+	m_2DCamera->Set_View_Plane( min, max );
+	m_2DCamera->Set_Clip_Planes( 0.995f, 2.0f );
+
+	m_cameraConstraintValid = false;
+
+	m_scrollAmountCutoff = TheGlobalData->m_scrollAmountCutoff;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+const Coord3D& W3DView::get3DCameraPosition() const
+{
+	Vector3 camera = m_3DCamera->Get_Position();
+	static Coord3D pos;
+	pos.set( camera.X, camera.Y, camera.Z );
+	return pos;
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DView::reset( void )
+{
+	View::reset();
+
+	// Just in case...
+	setTimeMultiplier(1); // Set time rate back to 1.
+
+	Coord3D arbitraryPos = { 0, 0, 0 };
+	// Just move the camera to 0, 0, 0. It'll get repositioned at the beginning of the next game
+	// anyways.
+	resetCamera(&arbitraryPos, 1, 0.0f, 0.0f);
+
+	setViewFilter(FT_VIEW_DEFAULT);
+
+	Coord2D gb = { 0,0 };
+	setGuardBandBias( &gb );
+}
+
+//-------------------------------------------------------------------------------------------------
+/** draw worker for drawables in the view region */
+//-------------------------------------------------------------------------------------------------
+static void drawDrawable( Drawable *draw, void *userData )
+{
+
+	draw->draw();
+
+}
+
+// ------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+static void drawTerrainNormal( Drawable *draw, void *userData )
+{
+	UnsignedInt color = GameMakeColor( 255, 255, 0, 255 );
+  if (TheTerrainLogic)
+  {
+    Coord3D pos = *draw->getPosition();
+    Coord3D normal;
+    pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y, &normal);
+    const Real NORMLEN = 20;
+    normal.x = pos.x + normal.x * NORMLEN;
+    normal.y = pos.y + normal.y * NORMLEN;
+    normal.z = pos.z + normal.z * NORMLEN;
+    ICoord2D start, end;
+		TheTacticalView->worldToScreen(&pos, &start);
+		TheTacticalView->worldToScreen(&normal, &end);
+		TheDisplay->drawLine(start.x, start.y, end.x, end.y, 1.0f, color);
+  }
+}
+
+#if defined(RTS_DEBUG)
+// ------------------------------------------------------------------------------------------------
+// Draw a crude circle. Appears on top of any world geometry
+// ------------------------------------------------------------------------------------------------
+void drawDebugCircle( const Coord3D & center, Real radius, Real width, Color color )
+{
+  const Real inc = PI/4.0f;
+  Real angle = 0.0f;
+  Coord3D pnt, lastPnt;
+  ICoord2D start, end;
+  Bool endValid, startValid;
+
+  lastPnt.x = center.x + radius * (Real)cos(angle);
+  lastPnt.y = center.y + radius * (Real)sin(angle);
+  lastPnt.z = center.z;
+  endValid = ( TheTacticalView->worldToScreenTriReturn( &lastPnt, &end ) != View::WTS_INVALID );
+
+  for( angle = inc; angle <= 2.0f * PI; angle += inc )
+  {
+    pnt.x = center.x + radius * (Real)cos(angle);
+    pnt.y = center.y + radius * (Real)sin(angle);
+    pnt.z = center.z;
+    startValid = ( TheTacticalView->worldToScreenTriReturn( &pnt, &start ) != View::WTS_INVALID );
+
+    if ( startValid && endValid )
+      TheDisplay->drawLine( start.x, start.y, end.x, end.y, width, color );
+
+    lastPnt = pnt;
+    end = start;
+    endValid = startValid;
+  }
+}
+
+void drawDrawableExtents( Drawable *draw, void *userData );  // FORWARD DECLARATION
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+static void drawContainedDrawable( Object *obj, void *userData )
+{
+	Drawable *draw = obj->getDrawable();
+
+	if( draw )
+		drawDrawableExtents( draw, userData );
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+static void drawDrawableExtents( Drawable *draw, void *userData )
+{
+	UnsignedInt color = GameMakeColor( 0, 255, 0, 255 );
+
+	switch( draw->getDrawableGeometryInfo().getGeomType() )
+	{
+
+		//---------------------------------------------------------------------------------------------
+		case GEOMETRY_BOX:
+		{
+			Real angle = draw->getOrientation();
+			Real c = (Real)cos(angle);
+			Real s = (Real)sin(angle);
+			Real exc = draw->getDrawableGeometryInfo().getMajorRadius()*c;
+			Real eyc = draw->getDrawableGeometryInfo().getMinorRadius()*c;
+			Real exs = draw->getDrawableGeometryInfo().getMajorRadius()*s;
+			Real eys = draw->getDrawableGeometryInfo().getMinorRadius()*s;
+			Coord3D pts[4];
+			pts[0].x = draw->getPosition()->x - exc - eys;
+			pts[0].y = draw->getPosition()->y + eyc - exs;
+			pts[0].z = 0;
+			pts[1].x = draw->getPosition()->x + exc - eys;
+			pts[1].y = draw->getPosition()->y + eyc + exs;
+			pts[1].z = 0;
+			pts[2].x = draw->getPosition()->x + exc + eys;
+			pts[2].y = draw->getPosition()->y - eyc + exs;
+			pts[2].z = 0;
+			pts[3].x = draw->getPosition()->x - exc + eys;
+			pts[3].y = draw->getPosition()->y - eyc - exs;
+			pts[3].z = 0;
+			Real z = draw->getPosition()->z;
+			for( int i = 0; i < 2; i++ )
+			{
+
+				for (int corner = 0; corner < 4; corner++)
+				{
+					ICoord2D start, end;
+					pts[corner].z = z;
+					pts[(corner+1)&3].z = z;
+					TheTacticalView->worldToScreen(&pts[corner], &start);
+					TheTacticalView->worldToScreen(&pts[(corner+1)&3], &end);
+					TheDisplay->drawLine(start.x, start.y, end.x, end.y, 1.0f, color);
+				}
+
+				z += draw->getDrawableGeometryInfo().getMaxHeightAbovePosition();
+
+			}
+
+			break;
+
+		}
+
+		//---------------------------------------------------------------------------------------------
+		case GEOMETRY_SPHERE:	// not quite right, but close enough
+		case GEOMETRY_CYLINDER:
+		{
+      Coord3D center = *draw->getPosition();
+      const Real radius = draw->getDrawableGeometryInfo().getMajorRadius();
+
+			// draw cylinder
+			for( int i=0; i<2; i++ )
+			{
+        drawDebugCircle( center, radius, 1.0f, color );
+
+        // next time 'round, draw the top of the cylinder
+        center.z += draw->getDrawableGeometryInfo().getMaxHeightAbovePosition();
+			}
+
+			// draw centerline
+      ICoord2D start, end;
+      center = *draw->getPosition();
+      TheTacticalView->worldToScreen( &center, &start );
+      center.z += draw->getDrawableGeometryInfo().getMaxHeightAbovePosition();
+      TheTacticalView->worldToScreen( &center, &end );
+			TheDisplay->drawLine( start.x, start.y, end.x, end.y, 1.0f, color );
+
+			break;
+
+		}
+
+	}
+
+	// draw any extents for things that are contained by this
+	Object *obj = draw->getObject();
+	if( obj )
+	{
+		ContainModuleInterface *contain = obj->getContain();
+
+		if( contain )
+			contain->iterateContained( drawContainedDrawable, userData, FALSE );
+
+	}
+
+}
+
+
+void drawAudioLocations( Drawable *draw, void *userData );
+// ------------------------------------------------------------------------------------------------
+// Helper for drawAudioLocations
+// ------------------------------------------------------------------------------------------------
+static void drawContainedAudioLocations( Object *obj, void *userData )
+{
+  Drawable *draw = obj->getDrawable();
+
+  if( draw )
+    drawAudioLocations( draw, userData );
+
+}
+
+
+//-------------------------------------------------------------------------------------------------
+// Draw the location of audio objects in the world
+//-------------------------------------------------------------------------------------------------
+static void drawAudioLocations( Drawable *draw, void *userData )
+{
+  // draw audio for things that are contained by this
+  Object *obj = draw->getObject();
+  if( obj )
+  {
+    ContainModuleInterface *contain = obj->getContain();
+
+    if( contain )
+      contain->iterateContained( drawContainedAudioLocations, userData, FALSE );
+
+  }
+
+  const ThingTemplate * thingTemplate = draw->getTemplate();
+
+  if ( thingTemplate == NULL || thingTemplate->getEditorSorting() != ES_AUDIO )
+  {
+    return; // All done
+  }
+
+  // Copied in hideously inappropriate code copying ways from DrawObject.cpp
+  // Should definately be a global, probably read in from an INI file <gasp>
+  static const Int poleHeight = 20;
+  static const Int flagHeight = 10;
+  static const Int flagWidth = 10;
+  const Color color = GameMakeColor(0x25, 0x25, 0xEF, 0xFF);
+
+  // Draw flag for audio-only objects:
+  //  *
+  //  * *
+  //  *   *
+  //  *     *
+  //  *   *
+  //  * *
+  //  *
+  //  *
+  //  *
+  //  *
+  //  *
+
+  Coord3D worldPoint;
+  ICoord2D start, end;
+
+  worldPoint = *draw->getPosition();
+  TheTacticalView->worldToScreen( &worldPoint, &start );
+  worldPoint.z += poleHeight;
+  TheTacticalView->worldToScreen( &worldPoint, &end );
+  TheDisplay->drawLine( start.x, start.y, end.x, end.y, 1.0f, color );
+
+  worldPoint.z -= flagHeight / 2;
+  worldPoint.x += flagWidth;
+  TheTacticalView->worldToScreen( &worldPoint, &start );
+  TheDisplay->drawLine( start.x, start.y, end.x, end.y, 1.0f, color );
+
+  worldPoint.z -= flagHeight / 2;
+  worldPoint.x -= flagWidth;
+  TheTacticalView->worldToScreen( &worldPoint, &end );
+  TheDisplay->drawLine( start.x, start.y, end.x, end.y, 1.0f, color );
+}
+
+//-------------------------------------------------------------------------------------------------
+// Draw the radii of sounds attached to any type of object.
+//-------------------------------------------------------------------------------------------------
+static void drawAudioRadii( const Drawable * drawable )
+{
+
+  // Draw radii, if sound is playing
+  const AudioEventRTS * ambientSound = drawable->getAmbientSound();
+
+  if ( ambientSound && ambientSound->isCurrentlyPlaying() )
+  {
+    const AudioEventInfo * ambientInfo = ambientSound->getAudioEventInfo();
+
+    if ( ambientInfo == NULL )
+    {
+      // I don't think that's right...
+      OutputDebugString( ("Playing sound has NULL AudioEventInfo?\n" ) );
+
+      if ( TheAudio != NULL )
+      {
+        ambientInfo = TheAudio->findAudioEventInfo( ambientSound->getEventName() );
+      }
+    }
+
+    if ( ambientInfo != NULL )
+    {
+      // Colors match those used in WorldBuilder
+      drawDebugCircle( *drawable->getPosition(), ambientInfo->m_minDistance, 1.0f, GameMakeColor(0x00, 0x00, 0xFF, 0xFF) );
+      drawDebugCircle( *drawable->getPosition(), ambientInfo->m_maxDistance, 1.0f, GameMakeColor(0xFF, 0x00, 0xFF, 0xFF) );
+    }
+  }
+}
+
+#endif
+
+//-------------------------------------------------------------------------------------------------
+/** An opportunity to draw something after all drawables have been drawn once */
+//-------------------------------------------------------------------------------------------------
+static void drawablePostDraw( Drawable *draw, void *userData )
+{
+	Real FXPitch = TheTacticalView->getFXPitch();
+	if (draw->isDrawableEffectivelyHidden() || FXPitch < 0.0f)
+		return;
+
+	Object* obj = draw->getObject();
+	const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
+#if ENABLE_CONFIGURABLE_SHROUD
+	ObjectShroudStatus ss = (!obj || !TheGlobalData->m_shroudOn) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex);
+#else
+	ObjectShroudStatus ss = (!obj) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex);
+#endif
+	if (ss > OBJECTSHROUD_PARTIAL_CLEAR)
+		return;
+
+	// draw the any "icon" UI for a drawable (health bars, veterency, etc);
+
+	//*****
+	//@TODO: Create a way to reject this call easily -- like objects that have no compatible modules.
+	//*****
+	//if( draw->getStatusBits() )
+	//{
+			draw->drawIconUI();
+	//}
+
+#if defined(RTS_DEBUG)
+	// debug collision extents
+	if( TheGlobalData->m_showCollisionExtents )
+	  drawDrawableExtents( draw, userData );
+
+  if ( TheGlobalData->m_showAudioLocations )
+    drawAudioLocations( draw, userData );
+#endif
+
+	// debug terrain normals at object positions
+	if( TheGlobalData->m_showTerrainNormals )
+	  drawTerrainNormal( draw, userData );
+
+	TheGameClient->incrementRenderedObjectCount();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+// Display AI debug visuals
+//-------------------------------------------------------------------------------------------------
+static void renderAIDebug( void )
+{
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+Bool W3DView::updateCameraMovements()
+{
+	Bool didUpdate = false;
+
+	if (m_doingZoomCamera)
+	{
+		zoomCameraOneFrame();
+		didUpdate = true;
+	}
+	if (m_doingPitchCamera)
+	{
+		pitchCameraOneFrame();
+		didUpdate = true;
+	}
+	if (m_doingRotateCamera) {
+		m_previousLookAtPosition = *getPosition();
+		rotateCameraOneFrame();
+		didUpdate = true;
+	} else if (m_doingMoveCameraOnWaypointPath) {
+		m_previousLookAtPosition = *getPosition();
+		// TheSuperHackers @tweak The scripted camera movement is now decoupled from the render update.
+		// The scripted camera will still move when the time is frozen, but not when the game is halted.
+		moveAlongWaypointPath(TheFramePacer->getLogicTimeStepMilliseconds(FramePacer::IgnoreFrozenTime));
+		didUpdate = true;
+	}
+	if (m_doingScriptedCameraLock)
+	{
+		didUpdate = true;
+	}
+	return didUpdate;
+}
+
+
+/** This function performs all actions which affect the camera transform or 3D objects
+	rendered in this frame.
+
+   MW: I moved this code out out W3DView::draw() so that we can get final camera and object
+   positions before any rendering begins.  This was necessary so that reflection textures
+   (which update before the main rendering loop) could get a correct version of the scene.
+   Without this change, the reflections were always 1 frame behind the non-reflected view.
+*/
+void W3DView::updateView(void)
+{
+	UPDATE();
+}
+
+// TheSuperHackers @tweak xezon 12/08/2025 The camera shaker is no longer tied to the render
+// update. The shake does sharp shakes on every fixed time step, and is not intended to have
+// linear interpolation during the render update.
+void W3DView::stepView()
+{
+	//
+	// Process camera shake
+	//
+	if (m_shakeIntensity > 0.01f)
+	{
+		m_shakeOffset.x = m_shakeIntensity * m_shakeAngleCos;
+		m_shakeOffset.y = m_shakeIntensity * m_shakeAngleSin;
+
+		// fake a stiff spring/damper
+		const Real dampingCoeff = 0.75f;
+		m_shakeIntensity *= dampingCoeff;
+
+		// spring is so "stiff", it pulls 180 degrees opposite each frame
+		m_shakeAngleCos = -m_shakeAngleCos;
+		m_shakeAngleSin = -m_shakeAngleSin;
+	}
+	else
+	{
+		m_shakeIntensity = 0.0f;
+		m_shakeOffset.x = 0.0f;
+		m_shakeOffset.y = 0.0f;
+	}
+}
+
+//DECLARE_PERF_TIMER(W3DView_updateView)
+void W3DView::update(void)
+{
+	//USE_PERF_TIMER(W3DView_updateView)
+	Bool recalcCamera = false;
+	Bool didScriptedMovement = false;
+#ifdef LOG_FRAME_TIMES
+	__int64 curTime64,freq64;
+	static __int64 prevTime64=0;
+	QueryPerformanceFrequency((LARGE_INTEGER *)&freq64);
+	QueryPerformanceCounter((LARGE_INTEGER *)&curTime64);
+	freq64 /= 1000;
+
+	Int elapsedTimeMs = (curTime64 - prevTime64)/freq64;
+	prevTime64 = curTime64;
+
+#endif
+
+//	Int elapsedTimeMs = TheW3DFrameLengthInMsec; // Assume a constant time flow.  It just works out better.  jba.
+
+	if (TheTerrainRenderObject->doesNeedFullUpdate()) {
+		RefRenderObjListIterator *it = W3DDisplay::m_3DScene->createLightsIterator();
+		TheTerrainRenderObject->updateCenter(m_3DCamera, it);
+		if (it)
+		{
+		 W3DDisplay::m_3DScene->destroyLightsIterator(it);
+		 it = NULL;
+		}
+	}
+
+	static Real followFactor = -1;
+	ObjectID cameraLock = getCameraLock();
+	if (cameraLock == INVALID_ID)
+	{
+		followFactor = -1;
+	}
+	if (cameraLock != INVALID_ID)
+	{
+		m_doingMoveCameraOnWaypointPath = false;
+		m_CameraArrivedAtWaypointOnPathFlag = false;
+
+		Object* cameraLockObj = TheGameLogic->findObjectByID(cameraLock);
+		Bool loseLock = false;
+
+		// check if object has been destroyed or is dead -> lose lock
+		if (cameraLockObj == NULL)
+		{
+			loseLock = true;
+		}
+#if 0
+		else
+		{
+			AIUpdateInterface *ai = cameraLockObj->getAIUpdateInterface();
+			if (ai && ai->isDead())
+				loseLock = true;
+		}
+#endif
+
+
+		if (loseLock)
+		{
+			setCameraLock(INVALID_ID);
+			setCameraLockDrawable(NULL);
+			followFactor = -1;
+		}
+		else
+		{
+			if (followFactor<0) {
+				followFactor = 0.05f;
+			} else {
+				followFactor += 0.05f;
+				if (followFactor>1.0f) followFactor = 1.0f;
+			}
+			if (getCameraLockDrawable() != NULL)
+			{
+				Drawable* cameraLockDrawable = (Drawable *)getCameraLockDrawable();
+
+				if (!cameraLockDrawable)
+				{
+					setCameraLockDrawable(NULL);
+				}
+				else
+				{
+					Coord3D pos;
+					Real boundingSphereRadius;
+					Matrix3D transform;
+					// this method must ONLY be called from the client, NEVER From the logic, not even indirectly.
+					if (cameraLockDrawable->clientOnly_getFirstRenderObjInfo(&pos, &boundingSphereRadius, &transform))
+					{
+						Vector3 zaxis(0,0,1);
+
+						Vector3 objPos;
+						objPos.X = pos.x;
+						objPos.Y = pos.y;
+						objPos.Z = pos.z;
+
+						//get position of top of object, assuming world z roughly along local z.
+						objPos += boundingSphereRadius * 1.0f * zaxis;
+						Vector3 objview = transform.Get_X_Vector();	//get view vector of object
+						//move camera back behind object far enough not to intersect bounding sphere
+						Vector3 camtran = objPos - objview * boundingSphereRadius*4.5f;
+
+						Vector3 prevCamTran = m_3DCamera->Get_Position();	//get current camera position.
+
+						Vector3 tranDiff = (camtran - prevCamTran);	//vector old position to new position.
+
+						camtran = prevCamTran + tranDiff * 0.1f;	//slowly move camera to new position.
+
+						Matrix3D camXForm;
+						camXForm.Look_At(camtran,objPos,0);
+						m_3DCamera->Set_Transform(camXForm);
+
+						recalcCamera = false;	//we already did it
+					}
+				}
+			}
+			else
+			{	Coord3D objpos = *cameraLockObj->getPosition();
+				Coord3D curpos = *getPosition();
+				// don't "snap" directly to the pos, but move there smoothly.
+				Real snapThreshSqr = sqr(TheGlobalData->m_partitionCellSize);
+				Real curDistSqr = sqr(curpos.x - objpos.x) + sqr(curpos.y - objpos.y);
+				if ( m_snapImmediate)
+				{
+					// close enough.
+					curpos.x = objpos.x;
+					curpos.y = objpos.y;
+				}
+				else
+				{
+//					Real ratio = 1.0f - snapThreshSqr/curDistSqr;
+					Real dx = objpos.x-curpos.x;
+					Real dy = objpos.y-curpos.y;
+					if (m_lockType == LOCK_TETHER)
+					{
+						//snapThreshSqr = sqr( m_lockDist * TheGlobalData->m_partitionCellSize );
+						if (curDistSqr >= snapThreshSqr)
+						{
+							Real ratio = 1.0f - snapThreshSqr/curDistSqr;
+
+							// move halfway there.
+							curpos.x += dx*ratio*0.5f;
+							curpos.y += dy*ratio*0.5f;
+						}
+						else
+						{
+							// we're inside our 'play' tolerance.  Move slowly to the obj
+							Real ratio = 0.01f * m_lockDist;
+							Real dx = objpos.x-curpos.x;
+							Real dy = objpos.y-curpos.y;
+							curpos.x += dx*ratio;
+							curpos.y += dy*ratio;
+						}
+					}
+					else
+					{
+						curpos.x += dx*followFactor;
+						curpos.y += dy*followFactor;
+					}
+				}
+				if (!(TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript()) && !TheGameLogic->isGamePaused()) {
+					m_previousLookAtPosition = *getPosition();
+				}
+				setPosition(&curpos);
+
+				if (m_lockType == LOCK_FOLLOW)
+				{
+					// camera follow objects if they are flying
+					if (cameraLockObj->isUsingAirborneLocomotor() && cameraLockObj->isAboveTerrainOrWater())
+					{
+						Matrix3D camXForm;
+						Real oldZRot = m_angle;
+						Real idealZRot = cameraLockObj->getOrientation() - M_PI_2;
+						normAngle(oldZRot);
+						normAngle(idealZRot);
+						Real diff = idealZRot - oldZRot;
+						normAngle(diff);
+
+						if (m_snapImmediate)
+						{
+							m_angle = idealZRot;
+						}
+						else
+						{
+							m_angle += diff * 0.1f;
+						}
+						normAngle(m_angle);
+					}
+				}
+				if (m_snapImmediate)
+					m_snapImmediate = FALSE;
+
+				m_groundLevel = objpos.z;
+				didScriptedMovement = true;
+				recalcCamera = true;
+			}
+		}
+	}
+
+	if (!(TheScriptEngine->isTimeFrozenDebug()/* || TheScriptEngine->isTimeFrozenScript()*/) && !TheGameLogic->isGamePaused()) {
+		// If we aren't frozen for debug, allow the camera to follow scripted movements.
+		if (updateCameraMovements()) {
+			didScriptedMovement = true;
+			recalcCamera = true;
+		}
+	} else {
+		if (m_doingRotateCamera || m_doingMoveCameraOnWaypointPath || m_doingPitchCamera || m_doingZoomCamera || m_doingScriptedCameraLock) {
+			didScriptedMovement = true; // don't mess up the scripted movement
+		}
+	}
+	//
+	// Process camera shake
+	//
+	if (m_shakeIntensity > 0.01f)
+	{
+		recalcCamera = true;
+	}
+
+	//Process New C3 Camera Shaker system
+	if (CameraShakerSystem.IsCameraShaking())
+	{
+		recalcCamera = true;
+	}
+
+	/*
+	 * In order to have the camera follow the terrain in a non-dizzying way, we will have a
+	 * "desired height" value that the user sets.  While scrolling, the actual height (set by
+	 * zoom) will not get updated unless we are scrolling uphill and our view either goes
+	 * underground or higher than the max allowed height.  When the camera is at rest (not
+	 * scrolling), the zoom will move toward matching the desired height.
+	 */
+	// TheSuperHackers @tweak Can now also zoom when the game is paused.
+	// TheSuperHackers @tweak The camera zoom speed is now decoupled from the render update.
+	// TheSuperHackers @bugfix The camera terrain height adjustment now also works in replay playback.
+
+	m_terrainHeightUnderCamera = getHeightAroundPos(m_pos.x, m_pos.y);
+	m_currentHeightAboveGround = m_cameraOffset.z * m_zoom - m_terrainHeightUnderCamera;
+
+	if (TheTerrainLogic && TheGlobalData && TheInGameUI && m_okToAdjustHeight)
+	{
+		Real desiredHeight = (m_terrainHeightUnderCamera + m_heightAboveGround);
+		Real desiredZoom = desiredHeight / m_cameraOffset.z;
+
+  	if (didScriptedMovement)
+  	{
+  		// if we are in a scripted camera movement, take its height above ground as our desired height.
+  		m_heightAboveGround = m_currentHeightAboveGround;
+			//DEBUG_LOG(("Frame %d: height above ground: %g %g %g %g", TheGameLogic->getFrame(), m_heightAboveGround,
+			//	m_cameraOffset.z, m_zoom, m_terrainHeightUnderCamera));
+  	}
+
+		if (TheInGameUI->isScrolling())
+		{
+			// if scrolling, only adjust if we're too close or too far
+			if (m_scrollAmount.length() < m_scrollAmountCutoff || (m_currentHeightAboveGround < m_minHeightAboveGround) || (TheGlobalData->m_enforceMaxCameraHeight && m_currentHeightAboveGround > m_maxHeightAboveGround))
+			{
+				const Real fpsRatio = TheFramePacer->getBaseOverUpdateFpsRatio();
+				const Real zoomAdj = (desiredZoom - m_zoom) * TheGlobalData->m_cameraAdjustSpeed * fpsRatio;
+				if (fabs(zoomAdj) >= 0.0001f)	// only do positive
+				{
+					m_zoom += zoomAdj;
+					recalcCamera = true;
+				}
+			}
+		}
+		else if (!didScriptedMovement)
+		{
+			// we're not scrolling; settle toward desired height above ground
+			const Real fpsRatio = TheFramePacer->getBaseOverUpdateFpsRatio();
+			const Real zoomAdj = (m_zoom - desiredZoom) * TheGlobalData->m_cameraAdjustSpeed * fpsRatio;
+			if (fabs(zoomAdj) >= 0.0001f)
+			{
+				m_zoom -= zoomAdj;
+				recalcCamera = true;
+			}
+		}
+	}
+	if (TheScriptEngine->isTimeFast()) {
+		return; // don't draw - makes it faster :) jba.
+	}
+
+	// (gth) C&C3 if m_isCameraSlaved then force the camera to update each frame
+	if ((recalcCamera) || (m_isCameraSlaved)) {
+		setCameraTransform();
+	}
+
+
+#ifdef DO_SEISMIC_SIMULATIONS
+  // Give the terrain a chance to refresh animating (Seismic) regions, if any.
+  TheTerrainVisual->updateSeismicSimulations();
+#endif
+
+	Region3D axisAlignedRegion;
+	getAxisAlignedViewRegion(axisAlignedRegion);
+
+	// render all of the visible Drawables
+	/// @todo this needs to use a real region partition or something
+	TheGameClient->iterateDrawablesInRegion( &axisAlignedRegion, drawDrawable, NULL );
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Find region which contains all drawables in 3D space. */
+//-------------------------------------------------------------------------------------------------
+void W3DView::getAxisAlignedViewRegion(Region3D &axisAlignedRegion)
+{
+	//
+	// get the 4 points in 3D space of the 4 corners of the view, we will use a z = 0.0f
+	// value so that we can get everything ... even stuff below the terrain
+	//
+	Coord3D box[ 4 ];
+	getScreenCornerWorldPointsAtZ( &box[ 0 ], &box[ 1 ], &box[ 2 ], &box[ 3 ], 0.0f );
+
+	//
+	// take those 4 corners projected into the world and create an axis aligned bounding
+	// box, we will use this box to iterate the drawables in 3D space
+	//
+	axisAlignedRegion.lo = box[ 0 ];
+	axisAlignedRegion.hi = box[ 0 ];
+	for( Int i = 0; i < 4; i++ )
+	{
+
+		if( box[ i ].x < axisAlignedRegion.lo.x )
+			axisAlignedRegion.lo.x = box[ i ].x;
+		if( box[ i ].y < axisAlignedRegion.lo.y )
+			axisAlignedRegion.lo.y = box[ i ].y;
+		if( box[ i ].x > axisAlignedRegion.hi.x )
+		  axisAlignedRegion.hi.x = box[ i ].x;
+		if( box[ i ].y > axisAlignedRegion.hi.y )
+		  axisAlignedRegion.hi.y = box[ i ].y;
+
+	}
+
+	// low and high regions will be based of the extent of the map
+	Region3D mapExtent;
+	Real safeValue = 999999;
+	TheTerrainLogic->getExtent( &mapExtent );
+	axisAlignedRegion.lo.z = mapExtent.lo.z - safeValue;
+	axisAlignedRegion.hi.z = mapExtent.hi.z + safeValue;
+
+	// we want to overscan a little bit so that we get objects that are partially offscreen
+	axisAlignedRegion.lo.x -= (DRAWABLE_OVERSCAN + m_guardBandBias.x);
+	axisAlignedRegion.lo.y -= (DRAWABLE_OVERSCAN + m_guardBandBias.y + 60.0f );
+	axisAlignedRegion.hi.x += (DRAWABLE_OVERSCAN + m_guardBandBias.x);
+	axisAlignedRegion.hi.y += (DRAWABLE_OVERSCAN + m_guardBandBias.y);
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DView::setFadeParameters(Int fadeFrames, Int direction)
+{
+	ScreenBWFilter::setFadeParameters(fadeFrames, direction);
+	ScreenCrossFadeFilter::setFadeParameters(fadeFrames,direction);
+}
+
+void W3DView::set3DWireFrameMode(Bool enable)
+{
+	m_nextWireFrameEnabled = enable;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Sets the view filter mode. */
+//-------------------------------------------------------------------------------------------------
+void W3DView::setViewFilterPos(const Coord3D *pos)
+{
+	ScreenMotionBlurFilter::setZoomToPos(pos);
+}
+//-------------------------------------------------------------------------------------------------
+/** Sets the view filter mode. */
+//-------------------------------------------------------------------------------------------------
+Bool W3DView::setViewFilterMode(FilterModes filterMode)
+{
+	FilterModes oldMode = m_viewFilterMode;	//save previous mode in case setup fails.
+
+	m_viewFilterMode = filterMode;
+	if (m_viewFilterMode != FM_NULL_MODE &&
+		m_viewFilter != FT_NULL_FILTER) {
+		if (!W3DShaderManager::filterSetup(m_viewFilter, m_viewFilterMode))
+		{	//setup failed so restore previous mode.
+			m_viewFilterMode = oldMode;
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+//-------------------------------------------------------------------------------------------------
+/** Sets the view filter. */
+//-------------------------------------------------------------------------------------------------
+Bool W3DView::setViewFilter(FilterTypes filter)
+{
+	FilterTypes oldFilter = m_viewFilter;	//save previous filter in case setup fails.
+
+	m_viewFilter = filter;
+	if (m_viewFilterMode != FM_NULL_MODE &&
+		m_viewFilter != FT_NULL_FILTER) {
+		if (!W3DShaderManager::filterSetup(m_viewFilter, m_viewFilterMode))
+		{	//setup failed so restore previous mode.
+			m_viewFilter = oldFilter;
+			return FALSE;
+		};
+	}
+	return TRUE;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Calculates how many pixels we scrolled since last frame for motion blur calculations. */
+//-------------------------------------------------------------------------------------------------
+void W3DView::calcDeltaScroll(Coord2D &screenDelta)
+{
+	screenDelta.x = 0;
+	screenDelta.y = 0;
+	Vector3 prevPos(m_previousLookAtPosition.x,m_previousLookAtPosition.y, m_groundLevel);
+	Vector3 prevScreen;
+	if (m_3DCamera->Project( prevScreen, prevPos ) != CameraClass::INSIDE_FRUSTUM)
+	{
+		return;
+	}
+	Vector3 pos(m_pos.x,m_pos.y, m_groundLevel);
+	Vector3 screen;
+	if (m_3DCamera->Project( screen, pos ) != CameraClass::INSIDE_FRUSTUM)
+	{
+		return;
+	}
+	screenDelta.x = screen.X-prevScreen.X;
+	screenDelta.y = screen.Y-prevScreen.Y;
+}
+
+
+//-------------------------------------------------------------------------------------------------
+/** Draw member for the W3D window, this will literally draw the window
+  * for this view */
+//-------------------------------------------------------------------------------------------------
+void W3DView::drawView( void )
+{
+	DRAW();
+}
+
+//DECLARE_PERF_TIMER(W3DView_drawView)
+void W3DView::draw( void )
+{
+	//USE_PERF_TIMER(W3DView_drawView)
+	Bool skipRender = false;
+	Bool doExtraRender = false;
+	CustomScenePassModes customScenePassMode  = SCENE_PASS_DEFAULT;
+	Bool preRenderResult = false;
+
+	if (m_viewFilterMode &&
+			m_viewFilter > FT_NULL_FILTER &&
+			m_viewFilter < FT_MAX)
+	{
+		// Most likely will redirect rendering to a texture.
+		preRenderResult=W3DShaderManager::filterPreRender(m_viewFilter, skipRender, customScenePassMode);
+		if (!skipRender && getCameraLock())
+		{
+			Object* cameraLockObj = TheGameLogic->findObjectByID(getCameraLock());
+			if (cameraLockObj)
+			{
+				Drawable *drawable = cameraLockObj->getDrawable();
+				drawable->setDrawableHidden(true);
+			}
+		}
+	}
+
+	if (!skipRender)
+	{
+		// Render 3D scene from our camera
+		W3DDisplay::m_3DScene->setCustomPassMode(customScenePassMode);
+		if (m_isWireFrameEnabled)
+			W3DDisplay::m_3DScene->Set_Extra_Pass_Polygon_Mode(SceneClass::EXTRA_PASS_CLEAR_LINE);
+		W3DDisplay::m_3DScene->doRender( m_3DCamera );
+		W3DDisplay::m_3DScene->Set_Extra_Pass_Polygon_Mode(SceneClass::EXTRA_PASS_DISABLE);
+		m_isWireFrameEnabled = m_nextWireFrameEnabled;
+	}
+
+	if (m_viewFilterMode &&
+			m_viewFilter > FT_NULL_FILTER &&
+			m_viewFilter < FT_MAX)
+	{
+		Coord2D deltaScroll;
+		calcDeltaScroll(deltaScroll);
+		Bool continueTheEffect = false;
+		if (preRenderResult)	//if prerender passed, do the post render.
+			continueTheEffect = W3DShaderManager::filterPostRender(m_viewFilter, m_viewFilterMode, deltaScroll,doExtraRender);
+		if (!skipRender && getCameraLock())
+		{
+			Object* cameraLockObj = TheGameLogic->findObjectByID(getCameraLock());
+			if (cameraLockObj)
+			{
+				Drawable *drawable = cameraLockObj->getDrawable();
+				drawable->setDrawableHidden(false);
+				RenderInfoClass rinfo(*m_3DCamera);
+				// Apply the camera and viewport (including depth range)
+				m_3DCamera->Apply();
+				TheDX8MeshRenderer.Set_Camera(&rinfo.Camera);
+				W3DDisplay::m_3DScene->renderSpecificDrawables(rinfo, 1, &drawable);
+				WW3D::Flush(rinfo);
+			}
+		}
+		if (!continueTheEffect)
+		{
+			// shut it down.
+			m_viewFilter = FT_VIEW_DEFAULT;
+			m_viewFilterMode = FM_VIEW_DEFAULT;
+		}
+	}
+
+	//Some effects require that we render a modified version of the scene into a texture but also require
+	//an unaltered version in the framebuffer.  So we re-render again into framebuffer after texture rendering
+	//was turned off by filterPostRender().
+	if (doExtraRender)
+	{
+		//Reset to normal scene rendering.
+		//The pass that rendered into a texture may have left the z-buffer in a weird state
+		//so clear it before rendering normal scene.
+		///@todo: Don't clear z-buffer unless shader uses z-bias or anything else that would cause <= z to fail on normal render.
+		DX8Wrapper::Clear(false, true, Vector3(0.0f,0.0f,0.0f), TheWaterTransparency->m_minWaterOpacity);	// Clear z but not color
+		W3DDisplay::m_3DScene->setCustomPassMode(SCENE_PASS_DEFAULT);
+		W3DDisplay::m_3DScene->doRender( m_3DCamera );
+		Coord2D deltaScroll;
+		W3DShaderManager::filterPostRender(m_viewFilter, m_viewFilterMode, deltaScroll, doExtraRender);
+	}
+
+	if( TheGlobalData->m_debugAI )
+	{
+		if (TheAI->pathfinder()->getDebugPath())
+		{
+			// setup screen clipping region
+			IRegion2D clipRegion;
+			clipRegion.lo.x = 0;
+			clipRegion.lo.y = 0;
+			clipRegion.hi.x = getWidth();
+			clipRegion.hi.y = getHeight();
+
+			UnsignedInt color = 0xFFFFFF00;  //0xAARRGGBB
+			ICoord2D start, end;
+			PathNode *prevNode = TheAI->pathfinder()->getDebugPath()->getFirstNode();
+
+			if (worldToScreen( prevNode->getPosition(), &start )) {
+				TheDisplay->drawLine( start.x-3, start.y-3, start.x+3, start.y-3, 1.0f, color );
+				TheDisplay->drawLine( start.x+3, start.y-3, start.x+3, start.y+3, 1.0f, color );
+				TheDisplay->drawLine( start.x+3, start.y+3, start.x-3, start.y+3, 1.0f, color );
+				TheDisplay->drawLine( start.x-3, start.y+3, start.x-3, start.y-3, 1.0f, color );
+			}
+			for( PathNode *node = prevNode->getNext(); node; node = node->getNext() )
+			{
+				Int k;
+				Coord3D s, e;
+				Coord3D delta;
+				s = *node->getPosition();
+				e = *prevNode->getPosition();
+				delta.x = e.x-s.x;
+				delta.y = e.y-s.y;
+				delta.z = e.z-s.z;
+				for (k = 0; k<10; k++) {
+					Real factor1 = (k)/10.0;
+					Real factor2 = (k+1)/10.0;
+					s = *node->getPosition();
+					e = *node->getPosition();
+					s.x += delta.x*factor1;
+					s.y += delta.y*factor1;
+					s.z += delta.z*factor1;
+					e.x += delta.x*factor2;
+					e.y += delta.y*factor2;
+					e.z += delta.z*factor2;
+					Bool onScreen1 = worldToScreen( &e, &end );
+					Bool onScreen2 = worldToScreen( &s, &start );
+					if (!onScreen1 && !onScreen2) {
+						continue; // neither point visible.
+					}
+					ICoord2D clipStart, clipEnd;
+
+					if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) ) {
+						TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y, 1.0f, color );
+					}
+				}
+				prevNode = node;
+				if (node->getNext()) {
+					if (worldToScreen( node->getPosition(), &start )) {
+ 						TheDisplay->drawLine( start.x-4, start.y, start.x+3, start.y, 1.0f, color );
+					}
+				}
+			}
+			if (prevNode && worldToScreen( prevNode->getPosition(), &start )) {
+ 				TheDisplay->drawLine( start.x-4, start.y, start.x+3, start.y, 1.0f, color );
+				TheDisplay->drawLine( start.x, start.y-4, start.x, start.y+3, 1.0f, color );
+			}
+			color = 0xFFFF0000;  //0xAARRGGBB
+			if (worldToScreen( TheAI->pathfinder()->getDebugPathPosition(), &start )) {
+				TheDisplay->drawLine( start.x-3, start.y, start.x+3, start.y, 1.0f, color );
+				TheDisplay->drawLine( start.x, start.y-3, start.x, start.y+3, 1.0f, color );
+			}
+		}
+
+	}
+
+#if defined(RTS_DEBUG)
+	if( TheGlobalData->m_debugCamera )
+	{
+		UnsignedInt c = 0xaaffffff;
+		Coord3D worldPos = *getPosition();
+		worldPos.z = TheTerrainLogic->getGroundHeight(worldPos.x, worldPos.y);
+
+		Coord3D p1, p2;
+		ICoord2D s1, s2;
+		p1 = worldPos;
+		p1.x += TERRAIN_SAMPLE_SIZE;
+		p1.y += TERRAIN_SAMPLE_SIZE;
+		p1.z = TheTerrainLogic->getGroundHeight(p1.x, p1.y);
+		p2 = worldPos;
+		p2.x += TERRAIN_SAMPLE_SIZE;
+		p2.y -= TERRAIN_SAMPLE_SIZE;
+		p2.z = TheTerrainLogic->getGroundHeight(p2.x, p2.y);
+		worldToScreen( &p1, &s1 );
+		worldToScreen( &p2, &s2 );
+		TheDisplay->drawLine(s1.x, s1.y, s2.x, s2.y, 1.0f, c);
+
+		p1 = worldPos;
+		p1.x += TERRAIN_SAMPLE_SIZE;
+		p1.y -= TERRAIN_SAMPLE_SIZE;
+		p1.z = TheTerrainLogic->getGroundHeight(p1.x, p1.y);
+		p2 = worldPos;
+		p2.x -= TERRAIN_SAMPLE_SIZE;
+		p2.y -= TERRAIN_SAMPLE_SIZE;
+		p2.z = TheTerrainLogic->getGroundHeight(p2.x, p2.y);
+		worldToScreen( &p1, &s1 );
+		worldToScreen( &p2, &s2 );
+		TheDisplay->drawLine(s1.x, s1.y, s2.x, s2.y, 1.0f, c);
+
+		p1 = worldPos;
+		p1.x -= TERRAIN_SAMPLE_SIZE;
+		p1.y -= TERRAIN_SAMPLE_SIZE;
+		p1.z = TheTerrainLogic->getGroundHeight(p1.x, p1.y);
+		p2 = worldPos;
+		p2.x -= TERRAIN_SAMPLE_SIZE;
+		p2.y += TERRAIN_SAMPLE_SIZE;
+		p2.z = TheTerrainLogic->getGroundHeight(p2.x, p2.y);
+		worldToScreen( &p1, &s1 );
+		worldToScreen( &p2, &s2 );
+		TheDisplay->drawLine(s1.x, s1.y, s2.x, s2.y, 1.0f, c);
+
+		p1 = worldPos;
+		p1.x -= TERRAIN_SAMPLE_SIZE;
+		p1.y += TERRAIN_SAMPLE_SIZE;
+		p1.z = TheTerrainLogic->getGroundHeight(p1.x, p1.y);
+		p2 = worldPos;
+		p2.x += TERRAIN_SAMPLE_SIZE;
+		p2.y += TERRAIN_SAMPLE_SIZE;
+		p2.z = TheTerrainLogic->getGroundHeight(p2.x, p2.y);
+		worldToScreen( &p1, &s1 );
+		worldToScreen( &p2, &s2 );
+		TheDisplay->drawLine(s1.x, s1.y, s2.x, s2.y, 1.0f, c);
+
+	}
+
+  if ( TheGlobalData->m_showAudioLocations )
+  {
+    // Draw audio radii for ALL drawables, not just those on screen
+    const Drawable * drawable = TheGameClient->getDrawableList();
+
+    while ( drawable != NULL )
+    {
+      drawAudioRadii( drawable );
+      drawable = drawable->getNextDrawable();
+    }
+  }
+#endif // RTS_DEBUG
+
+	Region3D axisAlignedRegion;
+	getAxisAlignedViewRegion(axisAlignedRegion);
+
+	//
+	// there are several things we might want to do as a post pass on the objects after
+	// they are all drawn
+	/// @todo we might want to consider wiping this iterate out if there is nothing to post draw
+	//
+	TheGameClient->resetRenderedObjectCount();
+	TheGameClient->iterateDrawablesInRegion( &axisAlignedRegion, drawablePostDraw, this );
+
+	TheGameClient->flushTextBearingDrawables();
+
+	// Render 2D scene
+	W3DDisplay::m_2DScene->doRender( m_2DCamera );
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DView::setCameraLock(ObjectID id)
+{
+	// If we're disabling camera movements, don't lock onto the object.
+	if (TheGlobalData->m_disableCameraMovement && id!=INVALID_ID) {
+		return;
+	}
+	View::setCameraLock(id);
+	m_doingScriptedCameraLock = FALSE;
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DView::setSnapMode( CameraLockType lockType, Real lockDist )
+{
+	View::setSnapMode(lockType, lockDist);
+	m_doingScriptedCameraLock = TRUE;
+}
+
+//-------------------------------------------------------------------------------------------------
+// Scroll the view by the given delta in SCREEN COORDINATES, this interface
+// assumes we will be scrolling along the X,Y plane
+//
+// TheSuperHackers @bugfix Now rotates the view plane on the Z axis only to properly discard the
+// camera pitch. The aspect ratio also no longer modifies the vertical scroll speed.
+//-------------------------------------------------------------------------------------------------
+void W3DView::scrollBy( Coord2D *delta )
+{
+	// if we haven't moved, ignore
+	if( delta && (delta->x != 0 || delta->y != 0) )
+	{
+		constexpr const Real SCROLL_RESOLUTION = 250.0f;
+
+		Vector3 world, worldStart, worldEnd;
+		Vector2 start, end;
+
+		m_scrollAmount = *delta;
+
+		start.X = getWidth();
+		start.Y = getHeight();
+
+		end.X = start.X + delta->x * SCROLL_RESOLUTION;
+		end.Y = start.Y + delta->y * SCROLL_RESOLUTION;
+
+		m_3DCamera->Device_To_View_Space( start, &worldStart );
+		m_3DCamera->Device_To_View_Space( end, &worldEnd );
+
+		const Real zRotation = m_3DCamera->Get_Transform().Get_Z_Rotation();
+		worldStart.Rotate_Z(zRotation);
+		worldEnd.Rotate_Z(zRotation);
+
+		world.X = worldEnd.X - worldStart.X;
+		world.Y = worldEnd.Y - worldStart.Y;
+		world.Z = worldEnd.Z - worldStart.Z;
+
+		// scroll by delta
+		Coord3D pos = *getPosition();
+		pos.x += world.X;
+		pos.y += world.Y;
+		//DEBUG_LOG(("Delta %.2f, %.2f", world.X, world.Z));
+		// no change to z
+		setPosition(&pos);
+
+		//m_cameraConstraintValid = false;	// pos change does NOT invalidate cam constraints
+
+		m_doingRotateCamera = false;
+		// set new camera position
+		setCameraTransform();
+
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DView::forceRedraw()
+{
+
+	// set the camera
+	setCameraTransform();
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Rotate the view around the up axis to the given angle. */
+//-------------------------------------------------------------------------------------------------
+void W3DView::setAngle( Real angle )
+{
+	// Normalize to +-PI.
+	normAngle(angle);
+	// call our base class, we are adding functionality
+	View::setAngle( angle );
+
+
+	m_doingMoveCameraOnWaypointPath = false;
+	m_CameraArrivedAtWaypointOnPathFlag = false;
+
+	m_doingRotateCamera = false;
+	m_doingPitchCamera = false;
+	m_doingZoomCamera = false;
+	m_doingScriptedCameraLock = false;
+	// set the camera
+	setCameraTransform();
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Rotate the view around the horizontal (X) axis to the given angle. */
+//-------------------------------------------------------------------------------------------------
+void W3DView::setPitch( Real angle )
+{
+	// call our base class, we are extending functionality
+	View::setPitch( angle );
+
+
+	m_doingMoveCameraOnWaypointPath = false;
+	m_doingRotateCamera = false;
+	m_doingPitchCamera = false;
+	m_doingZoomCamera = false;
+	m_doingScriptedCameraLock = false;
+	// set the camera
+	setCameraTransform();
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Set the view angle & pitch back to default */
+//-------------------------------------------------------------------------------------------------
+void W3DView::setAngleAndPitchToDefault( void )
+{
+	// call our base class, we are adding functionality
+	View::setAngleAndPitchToDefault();
+
+	m_FXPitch = 1.0;
+
+	// set the camera
+	setCameraTransform();
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DView::setDefaultView(Real pitch, Real angle, Real maxHeight)
+{
+	// MDC - we no longer want to rotate maps (design made all of them right to begin with)
+	//	m_defaultAngle = angle * M_PI/180.0f;
+	m_defaultPitchAngle = pitch;
+	m_maxHeightAboveGround = TheGlobalData->m_maxCameraHeight*maxHeight;
+	if (m_minHeightAboveGround > m_maxHeightAboveGround)
+		m_maxHeightAboveGround = m_minHeightAboveGround;
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DView::setHeightAboveGround(Real z)
+{
+	View::setHeightAboveGround(z);
+
+	m_doingMoveCameraOnWaypointPath = false;
+	m_CameraArrivedAtWaypointOnPathFlag = false;
+	m_doingRotateCamera = false;
+	m_doingPitchCamera = false;
+	m_doingZoomCamera = false;
+	m_doingScriptedCameraLock = false;
+	m_cameraConstraintValid = false; // recalc it.
+	setCameraTransform();
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+// TheSuperHackers @bugfix xezon 18/09/2025 setZoom is no longer clamped by a min and max zoom.
+// Instead the min and max camera height will be clamped elsewhere. Clamping the zoom would cause
+// issues with camera playback in replay playback where changes in terrain elevation would not raise
+// the camera height.
+void W3DView::setZoom(Real z)
+{
+	View::setZoom(z);
+
+	m_doingMoveCameraOnWaypointPath = false;
+	m_CameraArrivedAtWaypointOnPathFlag = false;
+	m_doingRotateCamera = false;
+	m_doingPitchCamera = false;
+	m_doingZoomCamera = false;
+	m_doingScriptedCameraLock = false;
+	m_cameraConstraintValid = false; // recalc it.
+	setCameraTransform();
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DView::setZoomToDefault( void )
+{
+	// default zoom has to be max, otherwise players will just zoom to max always
+
+	// terrain height + desired height offset == cameraOffset * actual zoom
+	// find best approximation of max terrain height we can see
+	Real terrainHeightMax = getHeightAroundPos(m_pos.x, m_pos.y);
+
+	Real desiredHeight = (terrainHeightMax + m_maxHeightAboveGround);
+	Real desiredZoom = desiredHeight / m_cameraOffset.z;
+
+	//DEBUG_LOG(("W3DView::setZoomToDefault() Current zoom: %g  Desired zoom: %g", m_zoom, desiredZoom));
+
+	m_zoom = desiredZoom;
+	m_heightAboveGround = m_maxHeightAboveGround;
+
+	m_doingMoveCameraOnWaypointPath = false;
+	m_CameraArrivedAtWaypointOnPathFlag = false;
+	m_doingRotateCamera = false;
+	m_doingPitchCamera = false;
+	m_doingZoomCamera = false;
+	m_doingScriptedCameraLock = false;
+	m_cameraConstraintValid = false; // recalc it.
+	setCameraTransform();
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Set the horizontal field of view angle */
+//-------------------------------------------------------------------------------------------------
+void W3DView::setFieldOfView( Real angle )
+{
+	View::setFieldOfView( angle );
+
+#if defined(RTS_DEBUG)
+	// this is only for testing, and recalculating the
+	// camera every frame is wasteful
+	setCameraTransform();
+#endif
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Using the W3D camera translate the world coordinate to a screen coord.
+	Screen coordinates returned in absolute values relative to full display resolution.
+  Returns if the point is on screen, off screen, or not transformable */
+//-------------------------------------------------------------------------------------------------
+View::WorldToScreenReturn W3DView::worldToScreenTriReturn( const Coord3D *w, ICoord2D *s )
+{
+	// sanity
+	if( w == NULL || s == NULL )
+    return WTS_INVALID;
+
+	if( m_3DCamera )
+	{
+		Vector3 world;
+		Vector3 screen;
+
+		world.Set( w->x, w->y, w->z );
+		enum CameraClass::ProjectionResType projection = m_3DCamera->Project( screen, world );
+		if (projection != CameraClass::INSIDE_FRUSTUM && projection!=CameraClass::OUTSIDE_FRUSTUM)
+		{
+			// Can't get a valid number if it's beyond the clip planes.  jba
+			s->x = 0;
+			s->y = 0;
+      return WTS_INVALID;
+		}
+
+		//
+		// note that the screen coord returned from the project W3D camera
+		// gave us a screen coords that range from (-1,-1) bottom left to
+		// (1,1) top right ... we are turning that into (0,0) upper left
+		// coords now
+		//
+		W3DLogicalScreenToPixelScreen( screen.X, screen.Y,
+																	 &s->x, &s->y,
+																	 getWidth(), getHeight());
+		s->x += m_originX;	//convert viewport coordinates to full screen coordinates
+		s->y += m_originY;
+
+//		s->x = (getWidth()  * (screen.X + 1.0f)) / 2.0f;
+//		s->y = (getHeight() * (-screen.Y + 1.0f)) / 2.0f;
+		if (projection != CameraClass::INSIDE_FRUSTUM)
+		{
+      return WTS_OUTSIDE_FRUSTUM;
+		}
+
+    return WTS_INSIDE_FRUSTUM;
+
+	}
+
+  return WTS_INVALID;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Using the W3D camera translate the screen coord to world coord */
+//-------------------------------------------------------------------------------------------------
+void W3DView::screenToWorld( const ICoord2D *s, Coord3D *w )
+{
+
+	// sanity
+	if( s == NULL || w == NULL )
+		return;
+
+	if( m_3DCamera )
+	{
+		DEBUG_CRASH(("implement me"));
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** all the drawables in the view, that fall within the 2D screen region
+	* will call the callback function.  The number of drawables that passed
+	* the test are returned.
+	Screen coordinates assumed in absolute values relative to full display resolution. */
+//-------------------------------------------------------------------------------------------------
+Int W3DView::iterateDrawablesInRegion( IRegion2D *screenRegion,
+																			 Bool (*callback)( Drawable *draw, void *userData ),
+																			 void *userData )
+{
+	Bool inside = FALSE;
+	Int count = 0;
+	Drawable *draw;
+	Vector3 screen, world;
+	Coord3D pos;
+	Region2D normalizedRegion;
+
+	/** @todo we need to have partitions of which drawables are in the
+	view so we don't have to march through the whole list */
+
+	//
+	// to do this we are projecting the drawable centers onto the screen,
+	// the W3D camera->project method is used to do this and that method
+	// will return normalized screen coords from (-1,-1) bottom left to
+	// (1,1) top right, normalize our screen region for comparison
+	//
+	/// @todo use fast int->real type casts here later
+
+	Bool regionIsPoint = FALSE;
+
+	if( screenRegion )
+	{
+		if (screenRegion->height() == 0 && screenRegion->width() == 0)
+		{
+			regionIsPoint = TRUE;
+		}
+
+		normalizedRegion.lo.x = ((Real)(screenRegion->lo.x - m_originX) / (Real)getWidth()) * 2.0f - 1.0f;
+		normalizedRegion.lo.y = -(((Real)(screenRegion->hi.y - m_originY) / (Real)getHeight()) * 2.0f - 1.0f);
+		normalizedRegion.hi.x = ((Real)(screenRegion->hi.x - m_originX) / (Real)getWidth()) * 2.0f - 1.0f;
+		normalizedRegion.hi.y = -(((Real)(screenRegion->lo.y - m_originY) / (Real)getHeight()) * 2.0f - 1.0f);
+
+	}
+
+
+	Drawable *onlyDrawableToTest = NULL;
+	if (regionIsPoint)
+	{
+		// Allow all drawables to be picked.
+		onlyDrawableToTest = pickDrawable(&screenRegion->lo, TRUE, (PickType) getPickTypesForContext(TheInGameUI->isInForceAttackMode()));
+		if (onlyDrawableToTest == NULL) {
+			return 0;
+		}
+	}
+
+	for( draw = TheGameClient->firstDrawable();
+			 draw;
+			 draw = draw->getNextDrawable() )
+	{
+		if (onlyDrawableToTest)
+		{
+		 draw = onlyDrawableToTest;
+		 inside = TRUE;
+		}
+		else
+		{
+
+			// not inside
+			inside = FALSE;
+
+			// no screen region, means all drawbles
+			if( screenRegion == NULL )
+				inside = TRUE;
+			else
+			{
+
+				// project the center of the drawable to the screen
+				/// @todo use a real 3D position in the drawable
+				pos = *draw->getPosition();
+				world.X = pos.x;
+				world.Y = pos.y;
+				world.Z = pos.z;
+
+				// project the world point to the screen
+				if( m_3DCamera->Project( screen, world ) == CameraClass::INSIDE_FRUSTUM &&
+						screen.X >= normalizedRegion.lo.x &&
+						screen.X <= normalizedRegion.hi.x &&
+						screen.Y >= normalizedRegion.lo.y &&
+						screen.Y <= normalizedRegion.hi.y )
+				{
+
+					inside = TRUE;
+
+				}
+			}
+
+		}
+
+		// if inside do the callback and count up
+		if( inside )
+		{
+
+			if( callback( draw, userData ) )
+				++count;
+
+		}
+
+		// If onlyDrawableToTest, then we should bail out now.
+		if (onlyDrawableToTest != NULL)
+			break;
+
+	}
+
+	return count;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** cast a ray from the screen coords into the scene and return a drawable
+  * there if present. Screen coordinates assumed in absolute values relative
+  * to full display resolution. */
+//-------------------------------------------------------------------------------------------------
+Drawable *W3DView::pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType )
+{
+	RenderObjClass *renderObj = NULL;
+	Drawable *draw = NULL;
+	DrawableInfo *drawInfo = NULL;
+
+	// sanity
+	if( screen == NULL )
+		return NULL;
+
+	// don't pick a drawable if there is a window under the cursor
+	GameWindow *window = NULL;
+	if (TheWindowManager)
+		window = TheWindowManager->getWindowUnderCursor(screen->x, screen->y);
+
+	while (window)
+	{
+		// check to see if it or any of its parents are opaque.  If so, we can't select anything.
+		if (!BitIsSet( window->winGetStatus(), WIN_STATUS_SEE_THRU ))
+			return NULL;
+
+		window = window->winGetParent();
+	}
+
+	Vector3 rayStart,rayEnd;
+	getPickRay(screen,&rayStart,&rayEnd);
+
+	LineSegClass lineseg;
+	lineseg.Set(rayStart,rayEnd);
+
+	CastResultStruct result;
+
+	if (forceAttack)
+		result.ComputeContactPoint = true;
+
+	//Don't check against translucent or hidden objects
+	RayCollisionTestClass raytest(lineseg,&result,COLL_TYPE_ALL,false,false);
+
+	if( W3DDisplay::m_3DScene->castRay( raytest, false, (Int)pickType ) )
+		renderObj = raytest.CollidedRenderObj;
+
+	// for right now there is no drawable data in a render object which is			 	// if we've found a render object, return our drawable associated with it,
+
+	// the terrain, therefore the userdata is NULL
+	/// @todo terrain and picking!
+	if( renderObj )
+		drawInfo = (DrawableInfo *)renderObj->Get_User_Data();
+	if (drawInfo)
+		draw=drawInfo->m_drawable;
+
+	return draw;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** convert a pixel (x,y) to a location in the world on the terrain.
+	Screen coordinates assumed in absolute values relative to full display resolution.  */
+//-------------------------------------------------------------------------------------------------
+void W3DView::screenToTerrain( const ICoord2D *screen, Coord3D *world )
+{
+	// sanity
+	if( screen == NULL || world == NULL || TheTerrainRenderObject == NULL )
+		return;
+
+	if (m_cameraHasMovedSinceRequest) {
+		m_locationRequests.clear();
+		m_cameraHasMovedSinceRequest = false;
+	}
+
+	if (m_locationRequests.size() > MAX_REQUEST_CACHE_SIZE) {
+		m_locationRequests.erase(m_locationRequests.begin(), m_locationRequests.begin() + 10);
+	}
+
+
+	// We insert them at the end for speed (no copies needed), but using the princ of locality, we should
+	// start searching where we most recently inserted
+	for (int i = m_locationRequests.size() - 1; i >= 0; --i) {
+		if (m_locationRequests[i].first.x == screen->x && m_locationRequests[i].first.y == screen->y) {
+			(*world) = m_locationRequests[i].second;
+			return;
+		}
+	}
+
+	Vector3 rayStart,rayEnd;
+	LineSegClass lineseg;
+	CastResultStruct result;
+	Vector3 intersection(0,0,0);
+
+	getPickRay(screen,&rayStart,&rayEnd);
+
+	lineseg.Set(rayStart,rayEnd);
+
+	RayCollisionTestClass raytest(lineseg,&result);
+
+	if( TheTerrainRenderObject->Cast_Ray(raytest) )
+	{
+		// get the point of intersection according to W3D
+		intersection = result.ContactPoint;
+
+	}
+
+	// Pick bridges.
+	Vector3 bridgePt;
+	Drawable *bridge = TheTerrainLogic->pickBridge(rayStart, rayEnd, &bridgePt);
+	if (bridge && bridgePt.Z > intersection.Z) {
+		intersection = bridgePt;
+	}
+
+	world->x = intersection.X;
+	world->y = intersection.Y;
+	world->z = intersection.Z;
+
+	PosRequest req;
+	req.first = (*screen);
+	req.second = (*world);
+	m_locationRequests.push_back(req);	// Insert this request at the end, requires no extra copies
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DView::lookAt( const Coord3D *o )
+{
+	Coord3D pos = *o;
+
+
+// no, don't call the super-lookAt, since it will munge our coords
+// as for a 2d view. just call setPosition.
+//View::lookAt(&pos);
+
+	if (o->z > PATHFIND_CELL_SIZE_F+TheTerrainLogic->getGroundHeight(pos.x, pos.y)) {
+		// Pos.z is not used, so if we want to look at something off the ground,
+		// we have to look at the spot on the ground such that the object intersects
+		// with the look at vector in the center of the screen.  jba.
+		Vector3 rayStart,rayEnd;
+		LineSegClass lineseg;
+		CastResultStruct result;
+		Vector3 intersection(0,0,0);
+
+		rayStart = m_3DCamera->Get_Position();	//get camera location
+		m_3DCamera->Un_Project(rayEnd,Vector2(0.0f,0.0f));	//get world space point
+		rayEnd -= rayStart;	//vector camera to world space point
+		rayEnd.Normalize();	//make unit vector
+		rayEnd *= m_3DCamera->Get_Depth();	//adjust length to reach far clip plane
+		rayStart.Set(pos.x, pos.y, pos.z);
+		rayEnd += rayStart;	//get point on far clip plane along ray from camera.
+		lineseg.Set(rayStart,rayEnd);
+
+		RayCollisionTestClass raytest(lineseg,&result);
+
+		if( TheTerrainRenderObject->Cast_Ray(raytest) )
+		{
+			// get the point of intersection according to W3D
+			pos.x = result.ContactPoint.X;
+			pos.y = result.ContactPoint.Y;
+
+		}
+	}
+	pos.z = 0;
+	setPosition(&pos);
+	m_doingRotateCamera = false;
+	m_doingMoveCameraOnWaypointPath = false;
+	m_CameraArrivedAtWaypointOnPathFlag = false;
+	m_doingScriptedCameraLock = false;
+
+	setCameraTransform();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DView::initHeightForMap( void )
+{
+	m_groundLevel = TheTerrainLogic->getGroundHeight(m_pos.x, m_pos.y);
+	const Real MAX_GROUND_LEVEL = 120.0; // jba - starting ground level can't exceed this height.
+	if (m_groundLevel>MAX_GROUND_LEVEL) {
+		m_groundLevel = MAX_GROUND_LEVEL;
+	}
+
+	m_cameraOffset.z = m_groundLevel+TheGlobalData->m_cameraHeight;
+	m_cameraOffset.y = -(m_cameraOffset.z / tan(TheGlobalData->m_cameraPitch * (PI / 180.0)));
+	m_cameraOffset.x = -(m_cameraOffset.y * tan(TheGlobalData->m_cameraYaw * (PI / 180.0)));
+	m_cameraConstraintValid = false;	// possible ground level change invalidates cam constraints
+	setCameraTransform();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Move camera to in an interesting fashion.  Sets up parameters that get
+ * evaluated in draw(). */
+//-------------------------------------------------------------------------------------------------
+void W3DView::moveCameraTo(const Coord3D *o, Int milliseconds, Int shutter, Bool orient, Real easeIn, Real easeOut)
+{
+	m_mcwpInfo.waypoints[0] = *getPosition();
+	m_mcwpInfo.cameraAngle[0] = getAngle();
+	m_mcwpInfo.waySegLength[0] = 0;
+
+	m_mcwpInfo.waypoints[1] = *getPosition();
+	m_mcwpInfo.waySegLength[1] = 0;
+
+	m_mcwpInfo.waypoints[2] = *o;
+	m_mcwpInfo.waySegLength[2] = 0;
+
+	m_mcwpInfo.numWaypoints = 2;
+	if (milliseconds<1) milliseconds = 1;
+	m_mcwpInfo.totalTimeMilliseconds = milliseconds;
+	m_mcwpInfo.shutter = 1;
+	m_mcwpInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
+	m_mcwpInfo.curSegment = 1;
+	m_mcwpInfo.curSegDistance = 0;
+	m_mcwpInfo.totalDistance = 0;
+
+	setupWaypointPath(orient);
+	if (m_mcwpInfo.totalTimeMilliseconds==1) {
+		// do it instantly.
+		moveAlongWaypointPath(1);
+		m_doingMoveCameraOnWaypointPath = true;
+		m_CameraArrivedAtWaypointOnPathFlag = false;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Rotate the camera */
+//-------------------------------------------------------------------------------------------------
+void W3DView::rotateCamera(Real rotations, Int milliseconds, Real easeIn, Real easeOut)
+{
+	m_rcInfo.numHoldFrames = 0;
+	m_rcInfo.trackObject = FALSE;
+
+	if (milliseconds<1) milliseconds = 1;
+	m_rcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
+	if (m_rcInfo.numFrames < 1) {
+		m_rcInfo.numFrames = 1;
+	}
+	m_rcInfo.curFrame = 0;
+	m_doingRotateCamera = true;
+	m_rcInfo.angle.startAngle = m_angle;
+	m_rcInfo.angle.endAngle = m_angle + 2*PI*rotations;
+	m_rcInfo.startTimeMultiplier = m_timeMultiplier;
+	m_rcInfo.endTimeMultiplier = m_timeMultiplier;
+	m_rcInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
+
+	m_doingMoveCameraOnWaypointPath = false;
+	m_CameraArrivedAtWaypointOnPathFlag = false;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Rotate the camera to follow a unit */
+//-------------------------------------------------------------------------------------------------
+void W3DView::rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut)
+{
+	m_rcInfo.trackObject = TRUE;
+	if (holdMilliseconds<1) holdMilliseconds = 0;
+	m_rcInfo.numHoldFrames = holdMilliseconds/TheW3DFrameLengthInMsec;
+	if (m_rcInfo.numHoldFrames < 1) {
+		m_rcInfo.numHoldFrames = 0;
+	}
+
+	if (milliseconds<1) milliseconds = 1;
+	m_rcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
+	if (m_rcInfo.numFrames < 1) {
+		m_rcInfo.numFrames = 1;
+	}
+	m_rcInfo.curFrame = 0;
+	m_doingRotateCamera = true;
+	m_rcInfo.target.targetObjectID = id;
+	m_rcInfo.startTimeMultiplier = m_timeMultiplier;
+	m_rcInfo.endTimeMultiplier = m_timeMultiplier;
+	m_rcInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
+
+	m_doingMoveCameraOnWaypointPath = false;
+	m_CameraArrivedAtWaypointOnPathFlag = false;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Rotate camera to face a location */
+//-------------------------------------------------------------------------------------------------
+void W3DView::rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds, Real easeIn, Real easeOut, Bool reverseRotation)
+{
+	m_rcInfo.numHoldFrames = 0;
+	m_rcInfo.trackObject = FALSE;
+
+	if (milliseconds<1) milliseconds = 1;
+	m_rcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
+	if (m_rcInfo.numFrames < 1) {
+		m_rcInfo.numFrames = 1;
+	}
+	Coord3D curPos = *getPosition();
+	Vector2 dir(pLoc->x-curPos.x, pLoc->y-curPos.y);
+	const Real dirLength = dir.Length();
+	if (dirLength<0.1f) return;
+	Real angle = WWMath::Acos(dir.X/dirLength);
+	if (dir.Y<0.0f) {
+		angle = -angle;
+	}
+	// Default camera is rotated 90 degrees, so match.
+	angle -= PI/2;
+	normAngle(angle);
+
+	if (reverseRotation) {
+		if (m_angle < angle) {
+			angle -= 2.0f*WWMATH_PI;
+		} else {
+			angle += 2.0f*WWMATH_PI;
+		}
+	}
+
+	m_rcInfo.curFrame = 0;
+	m_doingRotateCamera = true;
+	m_rcInfo.angle.startAngle = m_angle;
+	// TheSuperHackers @todo Investigate if the non Generals code is correct for Zero Hour.
+	// It certainly is incorrect for Generals: Seen in GLA mission 1 opening cut scene.
+#if RTS_GENERALS
+	m_rcInfo.angle.endAngle = m_angle + angle;
+#else
+	m_rcInfo.angle.endAngle = angle;
+#endif
+	m_rcInfo.startTimeMultiplier = m_timeMultiplier;
+	m_rcInfo.endTimeMultiplier = m_timeMultiplier;
+	m_rcInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
+
+	m_doingMoveCameraOnWaypointPath = false;
+	m_CameraArrivedAtWaypointOnPathFlag = false;
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DView::zoomCamera( Real finalZoom, Int milliseconds, Real easeIn, Real easeOut )
+{
+	if (milliseconds<1) milliseconds = 1;
+	m_zcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
+	if (m_zcInfo.numFrames < 1) {
+		m_zcInfo.numFrames = 1;
+	}
+	m_zcInfo.curFrame = 0;
+	m_doingZoomCamera = TRUE;
+	m_zcInfo.startZoom = m_zoom;
+	m_zcInfo.endZoom = finalZoom;
+	m_zcInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DView::pitchCamera( Real finalPitch, Int milliseconds, Real easeIn, Real easeOut )
+{
+	if (milliseconds<1) milliseconds = 1;
+	m_pcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
+	if (m_pcInfo.numFrames < 1) {
+		m_pcInfo.numFrames = 1;
+	}
+	m_pcInfo.curFrame = 0;
+	m_doingPitchCamera = TRUE;
+	m_pcInfo.startPitch = m_FXPitch;
+	m_pcInfo.endPitch = finalPitch;
+	m_pcInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Sets the final zoom for a camera movement. */
+//-------------------------------------------------------------------------------------------------
+void W3DView::cameraModFinalZoom( Real finalZoom, Real easeIn, Real easeOut )
+{
+
+	if (m_doingRotateCamera)
+	{
+		Real terrainHeightMax = getHeightAroundPos(m_pos.x, m_pos.y);
+		Real maxHeight = (terrainHeightMax + m_maxHeightAboveGround);
+		Real maxZoom = maxHeight / m_cameraOffset.z;
+
+		Real time = (m_rcInfo.numFrames + m_rcInfo.numHoldFrames - m_rcInfo.curFrame)*TheW3DFrameLengthInMsec;
+		zoomCamera( finalZoom*maxZoom, time, time*easeIn, time*easeOut );
+	}
+	if (m_doingMoveCameraOnWaypointPath)
+	{
+		Coord3D pos = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
+		Real terrainHeightMax = getHeightAroundPos(pos.x, pos.y);
+		Real maxHeight = (terrainHeightMax + m_maxHeightAboveGround);
+		Real maxZoom = maxHeight / m_cameraOffset.z;
+
+		Real time = m_mcwpInfo.totalTimeMilliseconds - m_mcwpInfo.elapsedTimeMilliseconds;
+		zoomCamera( finalZoom*maxZoom, time, time*easeIn, time*easeOut );
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Sets the final zoom for a camera movement. */
+//-------------------------------------------------------------------------------------------------
+void W3DView::cameraModFreezeAngle(void)
+{
+	if (m_doingRotateCamera) {
+		if (m_rcInfo.trackObject) {
+			m_rcInfo.target.targetObjectID = INVALID_ID;
+		} else {
+			m_rcInfo.angle.startAngle = m_rcInfo.angle.endAngle = m_angle; // Silly, but consistent.
+		}
+	}
+	if (m_doingMoveCameraOnWaypointPath) {
+		Int i;
+//		Real curDistance = 0;
+		for (i=0; i<m_mcwpInfo.numWaypoints; i++) {
+			m_mcwpInfo.cameraAngle[i+1] = m_mcwpInfo.cameraAngle[0];
+		}
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Sets the look toward point for a camera movement. */
+// ------------------------------------------------------------------------------------------------
+void W3DView::cameraModLookToward(Coord3D *pLoc)
+{
+	if (m_doingRotateCamera) {
+		return; // Doesn't apply to rotate about a point.
+	}
+	if (m_doingMoveCameraOnWaypointPath) {
+		Int i;
+//		Real curDistance = 0;
+		for (i=2; i<=m_mcwpInfo.numWaypoints; i++) {
+			Coord3D start, mid, end;
+			Real factor = 0.5;
+			start = m_mcwpInfo.waypoints[i-1];
+			start.x += m_mcwpInfo.waypoints[i].x;
+			start.y += m_mcwpInfo.waypoints[i].y;
+			start.x /= 2;
+			start.y /= 2;
+			mid = m_mcwpInfo.waypoints[i];
+			end = m_mcwpInfo.waypoints[i];
+			end.x += m_mcwpInfo.waypoints[i+1].x;
+			end.y += m_mcwpInfo.waypoints[i+1].y;
+			end.x /= 2;
+			end.y /= 2;
+			Coord3D result = start;
+			result.x += factor*(end.x-start.x);
+			result.y += factor*(end.y-start.y);
+			result.x += (1-factor)*factor*(mid.x-end.x + mid.x-start.x);
+			result.y += (1-factor)*factor*(mid.y-end.y + mid.y-start.y);
+			result.z = 0;
+			Vector2 dir(pLoc->x-result.x, pLoc->y-result.y);
+			const Real dirLength = dir.Length();
+			if (dirLength<0.1f) continue;
+			Real angle = WWMath::Acos(dir.X/dirLength);
+			if (dir.Y<0.0f) {
+				angle = -angle;
+			}
+			// Default camera is rotated 90 degrees, so match.
+			angle -= PI/2;
+			normAngle(angle);
+			m_mcwpInfo.cameraAngle[i] = angle;
+		}
+		if (m_mcwpInfo.totalTimeMilliseconds==1) {
+			// do it instantly.
+			moveAlongWaypointPath(1);
+			m_doingMoveCameraOnWaypointPath = true;
+			m_CameraArrivedAtWaypointOnPathFlag = false;
+		}
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Sets the look toward point for the end of a camera movement. */
+// ------------------------------------------------------------------------------------------------
+void W3DView::cameraModFinalMoveTo(Coord3D *pLoc)
+{
+	if (m_doingRotateCamera) {
+		return; // Doesn't apply to rotate about a point.
+	}
+	if (m_doingMoveCameraOnWaypointPath) {
+		Int i;
+		Coord3D start, delta;
+		start = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
+		delta.x = pLoc->x - start.x;
+		delta.y = pLoc->y - start.y;
+		for (i=2; i<=m_mcwpInfo.numWaypoints; i++) {
+			Coord3D result = m_mcwpInfo.waypoints[i];
+			result.x += delta.x;
+			result.y += delta.y;
+			m_mcwpInfo.waypoints[i] = result;
+		}
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Sets the look toward point for the end of a camera movement. */
+// ------------------------------------------------------------------------------------------------
+void W3DView::cameraModFinalLookToward(Coord3D *pLoc)
+{
+	if (m_doingRotateCamera) {
+		return; // Doesn't apply to rotate about a point.
+	}
+	if (m_doingMoveCameraOnWaypointPath) {
+		Int i;
+		Int min = m_mcwpInfo.numWaypoints-1;
+		if (min<2) min=2;
+//		Real curDistance = 0;
+		for (i=min; i<=m_mcwpInfo.numWaypoints; i++) {
+			Coord3D start, mid, end;
+			Real factor = 0.5;
+			start = m_mcwpInfo.waypoints[i-1];
+			start.x += m_mcwpInfo.waypoints[i].x;
+			start.y += m_mcwpInfo.waypoints[i].y;
+			start.x /= 2;
+			start.y /= 2;
+			mid = m_mcwpInfo.waypoints[i];
+			end = m_mcwpInfo.waypoints[i];
+			end.x += m_mcwpInfo.waypoints[i+1].x;
+			end.y += m_mcwpInfo.waypoints[i+1].y;
+			end.x /= 2;
+			end.y /= 2;
+			Coord3D result = start;
+			result.x += factor*(end.x-start.x);
+			result.y += factor*(end.y-start.y);
+			result.x += (1-factor)*factor*(mid.x-end.x + mid.x-start.x);
+			result.y += (1-factor)*factor*(mid.y-end.y + mid.y-start.y);
+			result.z = 0;
+			Vector2 dir(pLoc->x-result.x, pLoc->y-result.y);
+			const Real dirLength = dir.Length();
+			if (dirLength<0.1f) continue;
+			Real angle = WWMath::Acos(dir.X/dirLength);
+			if (dir.Y<0.0f) {
+				angle = -angle;
+			}
+			// Default camera is rotated 90 degrees, so match.
+			angle -= PI/2;
+			normAngle(angle);
+			if (i==m_mcwpInfo.numWaypoints) {
+				m_mcwpInfo.cameraAngle[i] = angle;
+			} else {
+				Real deltaAngle = angle - m_mcwpInfo.cameraAngle[i];
+				normAngle(deltaAngle);
+				angle = m_mcwpInfo.cameraAngle[i] + deltaAngle/2;
+				normAngle(angle);
+				m_mcwpInfo.cameraAngle[i] = angle;
+			}
+		}
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Sets the final time multiplier for a camera movement. */
+// ------------------------------------------------------------------------------------------------
+void W3DView::cameraModFinalTimeMultiplier(Int finalMultiplier)
+{
+	if (m_doingZoomCamera)
+		m_zcInfo.endTimeMultiplier = finalMultiplier;
+	if (m_doingPitchCamera)
+		m_pcInfo.endTimeMultiplier = finalMultiplier;
+	if (m_doingRotateCamera) {
+		m_rcInfo.endTimeMultiplier = finalMultiplier;
+	} else if (m_doingMoveCameraOnWaypointPath) {
+		Int i;
+		Real curDistance = 0;
+		for (i=0; i<m_mcwpInfo.numWaypoints; i++) {
+			curDistance += m_mcwpInfo.waySegLength[i];
+			Real factor2 = curDistance / m_mcwpInfo.totalDistance;
+			Real factor1 = 1.0-factor2;
+			m_mcwpInfo.timeMultiplier[i+1] = REAL_TO_INT_FLOOR(0.5+m_mcwpInfo.timeMultiplier[i+1]*factor1 + finalMultiplier*factor2);
+		}
+	} else {
+		// If we aren't doing a camera movement, just set the time.
+		m_timeMultiplier = finalMultiplier;
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Sets the number of frames to average motion for a camera movement */
+// ------------------------------------------------------------------------------------------------
+void W3DView::cameraModRollingAverage(Int framesToAverage)
+{
+	if (framesToAverage < 1) framesToAverage = 1;
+	m_mcwpInfo.rollingAverageFrames = framesToAverage;
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Sets the final pitch for a camera movement. */
+// ------------------------------------------------------------------------------------------------
+void W3DView::cameraModFinalPitch(Real finalPitch, Real easeIn, Real easeOut) {
+	if (m_doingRotateCamera) {
+		Real time = (m_rcInfo.numFrames + m_rcInfo.numHoldFrames - m_rcInfo.curFrame)*TheW3DFrameLengthInMsec;
+		pitchCamera( finalPitch, time, time*easeIn, time*easeOut );
+	}
+	if (m_doingMoveCameraOnWaypointPath) {
+		Real time = m_mcwpInfo.totalTimeMilliseconds - m_mcwpInfo.elapsedTimeMilliseconds;
+		pitchCamera( finalPitch, time, time*easeIn, time*easeOut );
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Move camera to a waypoint, resetting the default angle, pitch & zoom along the way.. */
+// ------------------------------------------------------------------------------------------------
+void W3DView::resetCamera(const Coord3D *location, Int milliseconds, Real easeIn, Real easeOut)
+{
+	moveCameraTo(location, milliseconds, 0, false, easeIn, easeOut);
+	m_mcwpInfo.cameraAngle[2] = 0.0; // default angle.
+	// m_mcwpInfo.cameraAngle[2] = m_defaultAngle;
+	m_angle = m_mcwpInfo.cameraAngle[0];
+
+	// terrain height + desired height offset == cameraOffset * actual zoom
+	// find best approximation of max terrain height we can see
+	//Real terrainHeightMax = getHeightAroundPos(m_pos.x, m_pos.y);
+	Real terrainHeightMax = getHeightAroundPos(location->x, location->y);
+	Real desiredHeight = (terrainHeightMax + m_maxHeightAboveGround);
+	Real desiredZoom = desiredHeight / m_cameraOffset.z;
+
+	zoomCamera( desiredZoom, milliseconds, easeIn, easeOut );	// this isn't right... or is it?
+
+	pitchCamera( 1.0, milliseconds, easeIn, easeOut );
+	// pitchCamera( m_defaultPitchAngle, milliseconds, easeIn, easeOut );
+	//DEBUG_LOG(("W3DView::resetCamera() Current zoom: %g  Desired zoom: %g  Current pitch: %g  Desired pitch: %g",
+	//	m_zoom, desiredZoom, m_pitchAngle, m_defaultPitchAngle));
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+Bool W3DView::isCameraMovementFinished(void)
+{
+	if (m_viewFilter == FT_VIEW_MOTION_BLUR_FILTER) {
+		// Several of the motion blur effects are similar to camera movements.
+		if (m_viewFilterMode == FM_VIEW_MB_IN_AND_OUT_ALPHA ||
+				m_viewFilterMode == FM_VIEW_MB_IN_AND_OUT_SATURATE ||
+				m_viewFilterMode == FM_VIEW_MB_IN_ALPHA ||
+				m_viewFilterMode == FM_VIEW_MB_OUT_ALPHA ||
+				m_viewFilterMode == FM_VIEW_MB_IN_SATURATE ||
+				m_viewFilterMode == FM_VIEW_MB_OUT_SATURATE ) {
+			return true;
+		}
+	}
+	return !m_doingMoveCameraOnWaypointPath && !m_doingRotateCamera && !m_doingPitchCamera && !m_doingZoomCamera;
+}
+
+
+Bool W3DView::isCameraMovementAtWaypointAlongPath(void)
+{
+	// WWDEBUG_SAY((( "MBL: Polling W3DView::isCameraMovementAtWaypointAlongPath" )));
+
+	Bool return_value = m_CameraArrivedAtWaypointOnPathFlag;
+	#pragma message( "MBL: Clearing variable after polling - for scripting - see Adam.\n" )
+	m_CameraArrivedAtWaypointOnPathFlag = false;
+	return( return_value );
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Move camera along a waypoint path in an interesting fashion.  Sets up parameters that get
+ * evaluated in draw(). */
+ // ------------------------------------------------------------------------------------------------
+void W3DView::moveCameraAlongWaypointPath(Waypoint *pWay, Int milliseconds, Int shutter, Bool orient, Real easeIn, Real easeOut)
+{
+	const Real MIN_DELTA = MAP_XY_FACTOR;
+
+	m_mcwpInfo.waypoints[0] = *getPosition();
+	m_mcwpInfo.cameraAngle[0] = getAngle();
+	m_mcwpInfo.waySegLength[0] = 0;
+	m_mcwpInfo.waypoints[1] = *getPosition();
+	m_mcwpInfo.numWaypoints = 1;
+	if (milliseconds<1) milliseconds = 1;
+	m_mcwpInfo.totalTimeMilliseconds = milliseconds;
+	m_mcwpInfo.shutter = shutter/TheW3DFrameLengthInMsec;
+	if (m_mcwpInfo.shutter<1) m_mcwpInfo.shutter = 1;
+	m_mcwpInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
+
+	while (pWay && m_mcwpInfo.numWaypoints <MAX_WAYPOINTS) {
+		m_mcwpInfo.numWaypoints++;
+		m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints] = *pWay->getLocation();
+		if (pWay->getNumLinks()>0) {
+			pWay = pWay->getLink(0);
+		} else {
+			pWay = NULL;
+		}
+		Vector2 dir(m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints].x-m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints-1].x, m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints].y-m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints-1].y);
+		if (dir.Length()<MIN_DELTA) {
+			if (pWay) {
+				m_mcwpInfo.numWaypoints--; // drop this one.
+			} else {
+				m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints-1] = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
+				m_mcwpInfo.numWaypoints--; // Push this one back.
+			}
+		}
+	}
+	setupWaypointPath(orient);
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Calculates angles and distances for moving along a waypoint path.  Sets up parameters that get
+ * evaluated in draw(). */
+// ------------------------------------------------------------------------------------------------
+void W3DView::setupWaypointPath(Bool orient)
+{
+	m_mcwpInfo.curSegment = 1;
+	m_mcwpInfo.curSegDistance = 0;
+	m_mcwpInfo.totalDistance = 0;
+	m_mcwpInfo.rollingAverageFrames = 1;
+	Int i;
+	Real angle = getAngle();
+	for (i=1; i<m_mcwpInfo.numWaypoints; i++) {
+		Vector2 dir(m_mcwpInfo.waypoints[i+1].x-m_mcwpInfo.waypoints[i].x, m_mcwpInfo.waypoints[i+1].y-m_mcwpInfo.waypoints[i].y);
+		m_mcwpInfo.waySegLength[i] = dir.Length();
+		m_mcwpInfo.totalDistance += m_mcwpInfo.waySegLength[i];
+		if (orient) {
+			angle = WWMath::Acos(dir.X/m_mcwpInfo.waySegLength[i]);
+			if (dir.Y<0.0f) {
+				angle = -angle;
+			}
+
+			// Default camera is rotated 90 degrees, so match.
+			angle -= PI/2;
+			normAngle(angle);
+		}
+		//DEBUG_LOG(("Original Index %d, angle %.2f", i, angle*180/PI));
+		m_mcwpInfo.cameraAngle[i] = angle;
+	}
+	m_mcwpInfo.cameraAngle[1] = getAngle();
+	m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints] = m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints-1];
+	for (i=m_mcwpInfo.numWaypoints-1; i>1; i--) {
+		m_mcwpInfo.cameraAngle[i] = (m_mcwpInfo.cameraAngle[i] + m_mcwpInfo.cameraAngle[i-1]) / 2;
+	}
+	m_mcwpInfo.waySegLength[m_mcwpInfo.numWaypoints+1] = m_mcwpInfo.waySegLength[m_mcwpInfo.numWaypoints];
+
+	// Prevent a possible divide by zero.
+	if (m_mcwpInfo.totalDistance<1.0) {
+		m_mcwpInfo.waySegLength[m_mcwpInfo.numWaypoints-1] += 1.0-m_mcwpInfo.totalDistance;
+		m_mcwpInfo.totalDistance = 1.0;
+	}
+
+	Real curDistance = 0;
+	Coord3D finalPos = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
+	Real newGround = TheTerrainLogic->getGroundHeight(finalPos.x, finalPos.y);
+	for (i=0; i<=m_mcwpInfo.numWaypoints+1; i++) {
+		Real factor2 = curDistance / m_mcwpInfo.totalDistance;
+		Real factor1 = 1.0-factor2;
+		m_mcwpInfo.timeMultiplier[i] = m_timeMultiplier;
+		m_mcwpInfo.groundHeight[i] = m_groundLevel*factor1 + newGround*factor2;
+		curDistance += m_mcwpInfo.waySegLength[i];
+		//DEBUG_LOG(("New Index %d, angle %.2f", i, m_mcwpInfo.cameraAngle[i]*180/PI));
+	}
+
+	// Pad the end.
+	m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints+1] = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
+	Coord3D cur = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
+	Coord3D prev = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints-1];
+	m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints+1].x += cur.x-prev.x;
+	m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints+1].y += cur.y-prev.y;
+	m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints+1] = m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints];
+	m_mcwpInfo.groundHeight[m_mcwpInfo.numWaypoints+1] = newGround;
+
+
+	cur = m_mcwpInfo.waypoints[2];
+	prev = m_mcwpInfo.waypoints[1];
+	m_mcwpInfo.waypoints[0].x -= cur.x-prev.x;
+	m_mcwpInfo.waypoints[0].y -= cur.y-prev.y;
+
+	m_doingMoveCameraOnWaypointPath = m_mcwpInfo.numWaypoints>1;
+	m_CameraArrivedAtWaypointOnPathFlag = false;
+	m_doingRotateCamera = false;
+
+	m_mcwpInfo.elapsedTimeMilliseconds = 0;
+	m_mcwpInfo.curShutter = m_mcwpInfo.shutter;
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+static Real makeQuadraticS(Real t)
+{
+	// for t = linear 0-1, convert to quadratic s where 0==0, 0.5==0.5 && 1.0 == 1.0.
+	Real tPrime = t;
+	if (t<0.5) {
+		tPrime = 0.5 * (2*t*2*t);
+	} else {
+		tPrime = (t-0.5)*2;
+		tPrime = WWMath::Sqrt(tPrime);
+		tPrime = 0.5 + 0.5*(tPrime);
+	}
+	return tPrime*0.5 + t*0.5;
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DView::rotateCameraOneFrame(void)
+{
+	m_rcInfo.curFrame++;
+	if (TheGlobalData->m_disableCameraMovement) {
+		if (m_rcInfo.curFrame >= m_rcInfo.numFrames + m_rcInfo.numHoldFrames) {
+			m_doingRotateCamera = false;
+			m_freezeTimeForCameraMovement = false;
+		}
+		return;
+	}
+
+	if (m_rcInfo.trackObject)
+	{
+		if (m_rcInfo.curFrame <= m_rcInfo.numFrames + m_rcInfo.numHoldFrames)
+		{
+			const Object *obj = TheGameLogic->findObjectByID(m_rcInfo.target.targetObjectID);
+			if (obj)
+			{
+				// object has not been destroyed
+				m_rcInfo.target.targetObjectPos = *obj->getPosition();
+			}
+
+			const Vector2 dir(m_rcInfo.target.targetObjectPos.x - m_pos.x, m_rcInfo.target.targetObjectPos.y - m_pos.y);
+			const Real dirLength = dir.Length();
+			if (dirLength>=0.1f)
+			{
+				Real angle = WWMath::Acos(dir.X/dirLength);
+				if (dir.Y<0.0f) {
+					angle = -angle;
+				}
+				// Default camera is rotated 90 degrees, so match.
+				angle -= PI/2;
+				normAngle(angle);
+
+				if (m_rcInfo.curFrame <= m_rcInfo.numFrames)
+				{
+					Real factor = m_rcInfo.ease(((Real)m_rcInfo.curFrame)/m_rcInfo.numFrames);
+					Real angleDiff = angle - m_angle;
+					normAngle(angleDiff);
+					angleDiff *= factor;
+					m_angle += angleDiff;
+					normAngle(m_angle);
+					m_timeMultiplier = m_rcInfo.startTimeMultiplier + REAL_TO_INT_FLOOR(0.5 + (m_rcInfo.endTimeMultiplier-m_rcInfo.startTimeMultiplier)*factor);
+				}
+				else
+				{
+					m_angle = angle;
+				}
+			}
+		}
+	}
+	else if (m_rcInfo.curFrame <= m_rcInfo.numFrames)
+	{
+		Real factor = m_rcInfo.ease(((Real)m_rcInfo.curFrame)/m_rcInfo.numFrames);
+		m_angle = WWMath::Lerp(m_rcInfo.angle.startAngle, m_rcInfo.angle.endAngle, factor);
+		normAngle(m_angle);
+		m_timeMultiplier = m_rcInfo.startTimeMultiplier + REAL_TO_INT_FLOOR(0.5 + (m_rcInfo.endTimeMultiplier-m_rcInfo.startTimeMultiplier)*factor);
+	}
+
+
+	if (m_rcInfo.curFrame >= m_rcInfo.numFrames + m_rcInfo.numHoldFrames) {
+		m_doingRotateCamera = false;
+		m_freezeTimeForCameraMovement = false;
+		if (! m_rcInfo.trackObject)
+		{
+			m_angle = m_rcInfo.angle.endAngle;
+		}
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DView::zoomCameraOneFrame(void)
+{
+	m_zcInfo.curFrame++;
+	if (TheGlobalData->m_disableCameraMovement) {
+		if (m_zcInfo.curFrame >= m_zcInfo.numFrames) {
+			m_doingZoomCamera = false;
+		}
+		return;
+	}
+	if (m_zcInfo.curFrame <= m_zcInfo.numFrames)
+	{
+		// not just holding; do the camera adjustment
+		Real factor = m_zcInfo.ease(((Real)m_zcInfo.curFrame)/m_zcInfo.numFrames);
+		m_zoom = WWMath::Lerp(m_zcInfo.startZoom, m_zcInfo.endZoom, factor);
+	}
+
+	if (m_zcInfo.curFrame >= m_zcInfo.numFrames) {
+		m_doingZoomCamera = false;
+		m_zoom = m_zcInfo.endZoom;
+	}
+
+	//DEBUG_LOG(("W3DView::zoomCameraOneFrame() - m_zoom = %g", m_zoom));
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DView::pitchCameraOneFrame(void)
+{
+	m_pcInfo.curFrame++;
+	if (TheGlobalData->m_disableCameraMovement) {
+		if (m_pcInfo.curFrame >= m_pcInfo.numFrames) {
+			m_doingPitchCamera = false;
+		}
+		return;
+	}
+	if (m_pcInfo.curFrame <= m_pcInfo.numFrames)
+	{
+		// not just holding; do the camera adjustment
+		Real factor = m_pcInfo.ease(((Real)m_pcInfo.curFrame)/m_pcInfo.numFrames);
+		m_FXPitch = WWMath::Lerp(m_pcInfo.startPitch, m_pcInfo.endPitch, factor);
+	}
+
+	if (m_pcInfo.curFrame >= m_pcInfo.numFrames) {
+		m_doingPitchCamera = false;
+		m_FXPitch = m_pcInfo.endPitch;
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void W3DView::moveAlongWaypointPath(Real milliseconds)
+{
+	m_mcwpInfo.elapsedTimeMilliseconds += milliseconds;
+	if (TheGlobalData->m_disableCameraMovement) {
+		if (m_mcwpInfo.elapsedTimeMilliseconds>m_mcwpInfo.totalTimeMilliseconds) {
+			m_doingMoveCameraOnWaypointPath = false;
+			m_freezeTimeForCameraMovement = false;
+		}
+		return;
+	}
+	if (m_mcwpInfo.elapsedTimeMilliseconds>m_mcwpInfo.totalTimeMilliseconds) {
+		m_doingMoveCameraOnWaypointPath = false;
+		m_CameraArrivedAtWaypointOnPathFlag = false;
+
+		m_freezeTimeForCameraMovement = false;
+		m_angle = m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints];
+
+		m_groundLevel = m_mcwpInfo.groundHeight[m_mcwpInfo.numWaypoints];
+		/////////////////////m_cameraOffset.z = m_groundLevel+TheGlobalData->m_cameraHeight;
+		m_cameraOffset.y = -(m_cameraOffset.z / tan(TheGlobalData->m_cameraPitch * (PI / 180.0)));
+		m_cameraOffset.x = -(m_cameraOffset.y * tan(TheGlobalData->m_cameraYaw * (PI / 180.0)));
+
+		Coord3D pos = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
+		pos.z = 0;
+		setPosition(&pos);
+		// Note - assuming that the scripter knows what he is doing, we adjust the constraints so that
+		// the scripted action can occur.
+		m_cameraConstraint.lo.x = minf(m_cameraConstraint.lo.x, pos.x);
+		m_cameraConstraint.hi.x = maxf(m_cameraConstraint.hi.x, pos.x);
+		m_cameraConstraint.lo.y = minf(m_cameraConstraint.lo.y, pos.y);
+		m_cameraConstraint.hi.y = maxf(m_cameraConstraint.hi.y, pos.y);
+		return;
+	}
+
+	const Real totalTime = m_mcwpInfo.totalTimeMilliseconds;
+	const Real deltaTime = m_mcwpInfo.ease(m_mcwpInfo.elapsedTimeMilliseconds/totalTime) -
+		m_mcwpInfo.ease((m_mcwpInfo.elapsedTimeMilliseconds - milliseconds)/totalTime);
+	m_mcwpInfo.curSegDistance += deltaTime*m_mcwpInfo.totalDistance;
+	// TheSuperHacker @todo Investigate which one is really correct.
+	// The non Generals condition causes camera bug in Generals Shell Map.
+#if RTS_GENERALS
+	while (m_mcwpInfo.curSegDistance > m_mcwpInfo.waySegLength[m_mcwpInfo.curSegment])
+#else
+	while (m_mcwpInfo.curSegDistance >= m_mcwpInfo.waySegLength[m_mcwpInfo.curSegment])
+#endif
+	{
+		if ( m_doingMoveCameraOnWaypointPath )
+		{
+			//WWDEBUG_SAY(( "MBL TEST: Camera waypoint along path reached!" ));
+			m_CameraArrivedAtWaypointOnPathFlag = true;
+		}
+
+		m_mcwpInfo.curSegDistance -= m_mcwpInfo.waySegLength[m_mcwpInfo.curSegment];
+		m_mcwpInfo.curSegment++;
+		if (m_mcwpInfo.curSegment >= m_mcwpInfo.numWaypoints) {
+			m_mcwpInfo.totalTimeMilliseconds = 0; // Will end following next frame.
+			return;
+		}
+	}
+	Real avgFactor = 1.0/m_mcwpInfo.rollingAverageFrames;
+	m_mcwpInfo.curShutter--;
+	if (m_mcwpInfo.curShutter>0) {
+		return;
+	}
+	m_mcwpInfo.curShutter = m_mcwpInfo.shutter;
+	Real factor = m_mcwpInfo.curSegDistance / m_mcwpInfo.waySegLength[m_mcwpInfo.curSegment];
+	if (m_mcwpInfo.curSegment == m_mcwpInfo.numWaypoints-1) {
+		avgFactor = avgFactor + (1.0-avgFactor)*factor;
+	}
+	Real factor1;
+	Real factor2;
+	factor1 = 1.0-factor;
+	//factor1 = makeQuadraticS(factor1);
+	factor2 = 1.0-factor1;
+	Real angle1 = m_mcwpInfo.cameraAngle[m_mcwpInfo.curSegment];
+	Real angle2 = m_mcwpInfo.cameraAngle[m_mcwpInfo.curSegment+1];
+	if (angle2-angle1 > PI) angle1 += 2*PI;
+	if (angle2-angle1 < -PI) angle1 -= 2*PI;
+	Real angle = angle1 * (factor1) + angle2 * (factor2);
+
+	normAngle(angle);
+	Real deltaAngle = angle-m_angle;
+	normAngle(deltaAngle);
+	if (fabs(deltaAngle) > PI/10) {
+		DEBUG_LOG(("Huh."));
+	}
+	m_angle += avgFactor*(deltaAngle);
+	normAngle(m_angle);
+
+	Real timeMultiplier = m_mcwpInfo.timeMultiplier[m_mcwpInfo.curSegment]*factor1 +
+			m_mcwpInfo.timeMultiplier[m_mcwpInfo.curSegment+1]*factor2;
+	m_timeMultiplier = REAL_TO_INT_FLOOR(0.5 + timeMultiplier);
+
+	m_groundLevel = m_mcwpInfo.groundHeight[m_mcwpInfo.curSegment]*factor1 +
+			m_mcwpInfo.groundHeight[m_mcwpInfo.curSegment+1]*factor2;
+	//////////////m_cameraOffset.z = m_groundLevel+TheGlobalData->m_cameraHeight;
+	m_cameraOffset.y = -(m_cameraOffset.z / tan(TheGlobalData->m_cameraPitch * (PI / 180.0)));
+	m_cameraOffset.x = -(m_cameraOffset.y * tan(TheGlobalData->m_cameraYaw * (PI / 180.0)));
+
+	Coord3D start, mid, end;
+	if (factor<0.5) {
+		start = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment-1];
+		start.x += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment].x;
+		start.y += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment].y;
+		start.x /= 2;
+		start.y /= 2;
+		mid = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment];
+		end = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment];
+		end.x += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1].x;
+		end.y += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1].y;
+		end.x /= 2;
+		end.y /= 2;
+		factor += 0.5;
+	} else {
+		start = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment];
+		start.x += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1].x;
+		start.y += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1].y;
+		start.x /= 2;
+		start.y /= 2;
+		mid = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1];
+		end = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1];
+		end.x += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+2].x;
+		end.y += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+2].y;
+		end.x /= 2;
+		end.y /= 2;
+		factor -= 0.5;
+	}
+
+	Coord3D result = start;
+	result.x += factor*(end.x-start.x);
+	result.y += factor*(end.y-start.y);
+	result.x += (1-factor)*factor*(mid.x-end.x + mid.x-start.x);
+	result.y += (1-factor)*factor*(mid.y-end.y + mid.y-start.y);
+	result.z = 0;
+/*
+	static Real prevGround = 0;
+	DEBUG_LOG(("Dx %.2f, dy %.2f, DeltaANgle = %.2f, %.2f DeltaGround %.2f", m_pos.x-result.x, m_pos.y-result.y, deltaAngle, m_groundLevel, m_groundLevel-prevGround));
+	prevGround = m_groundLevel;
+*/
+	setPosition(&result);
+	// Note - assuming that the scripter knows what he is doing, we adjust the constraints so that
+	// the scripted action can occur.
+	m_cameraConstraint.lo.x = minf(m_cameraConstraint.lo.x, result.x);
+	m_cameraConstraint.hi.x = maxf(m_cameraConstraint.hi.x, result.x);
+	m_cameraConstraint.lo.y = minf(m_cameraConstraint.lo.y, result.y);
+	m_cameraConstraint.hi.y = maxf(m_cameraConstraint.hi.y, result.y);
+
+}
+
+
+// ------------------------------------------------------------------------------------------------
+/** Add an impulse force to shake the camera.
+ * The camera shake is a simple simulation of an oscillating spring/damper.
+ * The idea is that some sort of shock has "pushed" the camera once, as an
+ * impluse, after which the camera vibrates back to its rest position.
+ * @todo This should be part of "View", not "W3DView". */
+// ------------------------------------------------------------------------------------------------
+void W3DView::shake( const Coord3D *epicenter, CameraShakeType shakeType )
+{
+	Real angle = GameClientRandomValueReal( 0, 2*PI );
+
+	m_shakeAngleCos = (Real)cos( angle );
+	m_shakeAngleSin = (Real)sin( angle );
+
+	Real intensity = 0.0f;
+	switch( shakeType )
+	{
+		case SHAKE_SUBTLE:
+			intensity = TheGlobalData->m_shakeSubtleIntensity;
+			break;
+
+		case SHAKE_NORMAL:
+			intensity = TheGlobalData->m_shakeNormalIntensity;
+			break;
+
+		case SHAKE_STRONG:
+			intensity = TheGlobalData->m_shakeStrongIntensity;
+			break;
+
+		case SHAKE_SEVERE:
+			intensity = TheGlobalData->m_shakeSevereIntensity;
+			break;
+
+		case SHAKE_CINE_EXTREME:
+			intensity = TheGlobalData->m_shakeCineExtremeIntensity;
+			break;
+
+		case SHAKE_CINE_INSANE:
+			intensity = TheGlobalData->m_shakeCineInsaneIntensity;
+			break;
+	}
+
+	// intensity falls off with distance
+	const Coord3D *viewPos = getPosition();
+	Coord3D d;
+	d.x = epicenter->x - viewPos->x;
+	d.y = epicenter->y - viewPos->y;
+	/// @todo make this 3D once we have the real "lookat" spot
+	//d.z = epicenter->z - viewPos->z;
+
+	Real dist = (Real)sqrt( d.x*d.x + d.y*d.y );
+
+	if (dist > TheGlobalData->m_maxShakeRange)
+		return;
+
+	intensity *= 1.0f - (dist/TheGlobalData->m_maxShakeRange);
+
+	// add intensity and clamp
+	m_shakeIntensity += intensity;
+
+	//const Real maxIntensity = 10.0f;
+	const Real maxIntensity = 3.0f;
+	if (m_shakeIntensity > TheGlobalData->m_maxShakeIntensity)
+		m_shakeIntensity = maxIntensity;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Transformt he screen pixel coord passed in, to a world coordinate at the specified
+	* z value */
+//-------------------------------------------------------------------------------------------------
+void W3DView::screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z )
+{
+	Vector3 rayStart, rayEnd;
+
+	getPickRay( s, &rayStart, &rayEnd );
+	w->x = Vector3::Find_X_At_Z( z, rayStart, rayEnd );
+	w->y = Vector3::Find_Y_At_Z( z, rayStart, rayEnd );
+	w->z = z;
+
+}
+
+void W3DView::cameraEnableSlaveMode(const AsciiString & objectName, const AsciiString & boneName)
+{
+	m_isCameraSlaved = true;
+	m_cameraSlaveObjectName = objectName;
+	m_cameraSlaveObjectBoneName = boneName;
+}
+
+void W3DView::cameraDisableSlaveMode(void)
+{
+	m_isCameraSlaved = false;
+}
+
+void W3DView::cameraEnableRealZoomMode(void) //WST added 10/18/2002
+{
+	m_useRealZoomCam = true;
+	m_FXPitch = 1.0f;	//Reset to default
+	//m_zoom = 1.0f;
+	updateView();
+}
+
+void W3DView::cameraDisableRealZoomMode(void) //WST added 10/18/2002
+{
+	m_useRealZoomCam = false;
+	m_FXPitch = 1.0f;	//Reset to default
+	//m_zoom = 1.0f;
+	m_FOV = 50.0f * PI/180.0f;
+	setCameraTransform();
+	updateView();
+}
+
+void W3DView::Add_Camera_Shake (const Coord3D & position,float radius,float duration,float power) //WST added 11/13/02
+{
+	Vector3 vpos;
+
+	vpos.X = position.x;
+	vpos.Y = position.y;
+	vpos.Z = position.z;
+
+
+	CameraShakerSystem.Add_Camera_Shake(vpos,radius,duration,power);
+}
+
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp
new file mode 100644
index 00000000000..2addc0e8ba6
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp
@@ -0,0 +1,3489 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DWater.cpp /////////////////////////////////////////////////////////////////////////////
+// Created:   Mark Wilczynski, June 2001
+// Desc:      Draw reflective water surface.  Also handles drawing of waves/ripples
+//			  on the surface.
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#define SCROLL_UV
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "W3DDevice/GameClient/W3DWater.h"
+#include "W3DDevice/GameClient/HeightMap.h"
+#include "W3DDevice/GameClient/W3DShroud.h"
+#include "W3DDevice/GameClient/W3DWaterTracks.h"
+#include "W3DDevice/GameClient/W3DAssetManager.h"
+#include "texture.h"
+#include "assetmgr.h"
+#include "rinfo.h"
+#include "camera.h"
+#include "scene.h"
+#include "dx8wrapper.h"
+#include "light.h"
+#include "d3dx8math.h"
+#include "simplevec.h"
+#include "mesh.h"
+#include "matinfo.h"
+
+#include "Common/FramePacer.h"
+#include "Common/GameState.h"
+#include "Common/GlobalData.h"
+#include "Common/PerfTimer.h"
+#include "Common/Xfer.h"
+#include "Common/GameLOD.h"
+
+#include "GameClient/Water.h"
+#include "GameLogic/GameLogic.h"
+#include "GameLogic/PolygonTrigger.h"
+#include "GameLogic/ScriptEngine.h"
+#include "W3DDevice/GameClient/W3DShaderManager.h"
+#include "W3DDevice/GameClient/W3DDisplay.h"
+#include "W3DDevice/GameClient/W3DPoly.h"
+#include "W3DDevice/GameClient/W3DScene.h"
+#include "W3DDevice/GameClient/W3DCustomScene.h"
+
+
+
+#define MIPMAP_BUMP_TEXTURE
+
+// DEFINES ////////////////////////////////////////////////////////////////////////////////////////
+#define SKYPLANE_SIZE	(384.0f*MAP_XY_FACTOR)
+#define SKYPLANE_HEIGHT	(30.0f)
+
+#define SKYBODY_TEXTURE	"TSMoonLarg.tga"
+#define SKYBODY_SIZE	45.0f		//extent or radius of sky body
+
+#define SKYBODY_X	150.0f	//location of skybody
+#define SKYBODY_Y	550.0f	//location of skybody
+
+/* in the bay
+#define SKYBODY_X	120.0f			//location of skybody
+#define SKYBODY_Y	75.0f			//location of skybody
+*/
+
+#define SKYBODY_HEIGHT	SKYPLANE_HEIGHT	//altitude of sky body (z-buffer disabled, so can equal sky height).
+
+//GeForce3 water system defines
+#define PATCH_SIZE 15		//number of vertices on patch edge.  Large patches may waste vertices off edge of screen.
+#define PATCH_UV_TILES	42	//number of times the bump map texture is tiled across patch (must be integer!).
+#define PATCH_SCALE (4.0f * MAP_XY_FACTOR)	//horizontal scale factor. Adjust this and size to get desired vertex density.
+#define SEA_REFLECTION_SIZE 256		//dimensions of reflection texture
+
+#define SEA_BUMP_SCALE		(0.06f)		//scales the du/dv offsets stored in bump map (~ amount to perturb)
+#define BUMP_SIZE (50.f)
+#define REFLECTION_FACTOR 0.1f
+
+#define PATCH_WIDTH (PATCH_SIZE-1)	//internal defines
+#define PATCH_UV_SCALE	((Real)PATCH_UV_TILES/(Real)PATCH_WIDTH)
+
+//3D Grid Mesh Water defines.
+#define WATER_MESH_OPACITY		0.5f
+#define WATER_MESH_X_VERTICES	128
+#define WATER_MESH_Y_VERTICES	128
+#define WATER_MESH_SPACING	MAP_XY_FACTOR	//same as terrain
+
+#ifdef USE_MESH_NORMALS
+#define WATER_MESH_FVF	DX8_FVF_XYZNDUV2
+typedef VertexFormatXYZNDUV2 MaterMeshVertexFormat;
+#else
+#define WATER_MESH_FVF	DX8_FVF_XYZDUV2
+typedef VertexFormatXYZDUV2 MaterMeshVertexFormat;
+#endif
+
+// Converts a FLOAT to a DWORD for use in SetRenderState() calls
+static inline DWORD F2DW( FLOAT f ) { return *((DWORD*)&f); }
+
+#define DRAW_WATER_WAKES
+/// @todo: Fix clipping of objects that intersect the mirror surface
+//#define CLIP_GEOMETRY_TO_PLANE	// this enables clipping of objects that intersect the mirror surfaces
+
+// Some shader combinations that can be useful in rendering water:
+
+// Modulate stage0 with stage1 texture.  Also modulate stage 0 with vertex color.
+#define SC_DETAIL_BLEND ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
+	ShaderClass::SRCBLEND_SRC_ALPHA,ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
+	ShaderClass::TEXTURING_ENABLE, 	ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_ENABLE, ShaderClass::DETAILCOLOR_DETAILBLEND, ShaderClass::DETAILALPHA_DISABLE) )
+
+// Just a z-buffer fill, nothing is written to the color buffer.
+#define SC_ZFILL_BLEND ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_DISABLE, ShaderClass::SRCBLEND_ZERO, \
+	ShaderClass::DSTBLEND_ONE, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
+	ShaderClass::DETAILCOLOR_SCALE, ShaderClass::DETAILALPHA_DISABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_ENABLE, \
+	ShaderClass::DETAILCOLOR_SCALE, ShaderClass::DETAILALPHA_DISABLE) )
+
+// No texturing, just vertex color with vertex alpha
+#define SC_ZFILL_BLENDx ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, \
+	ShaderClass::SRCBLEND_ZERO, ShaderClass::DSTBLEND_SRC_COLOR, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
+	ShaderClass::TEXTURING_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_ENABLE, \
+	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
+
+// Modulate blended with vertex alpha modulation
+#define SC_ZFILL_MODULATE_TEX ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
+	ShaderClass::SRCBLEND_ZERO, ShaderClass::DSTBLEND_SRC_COLOR, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
+	ShaderClass::TEXTURING_ENABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
+
+// Alpha blended with vertex alpha modulation
+#define SC_ZFILL_ALPHA_TEX ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
+	ShaderClass::SRCBLEND_SRC_ALPHA, ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_DISABLE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
+	ShaderClass::TEXTURING_ENABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
+
+// Alpha blended with vertex alpha modulation
+#define SC_OPAQUE_TEXONLY ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
+	ShaderClass::SRCBLEND_ONE, ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_DISABLE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
+	ShaderClass::TEXTURING_ENABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
+
+// Alpha blended with vertex alpha modulation
+#define SC_ZFILL_BLEND3 ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
+	ShaderClass::SRCBLEND_SRC_ALPHA, ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
+	ShaderClass::TEXTURING_ENABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
+
+static ShaderClass zFillAlphaShader(SC_ZFILL_BLEND3);
+static ShaderClass blendStagesShader(SC_DETAIL_BLEND);
+
+WaterRenderObjClass *TheWaterRenderObj=NULL; ///<global water rendering object
+
+#define SAFE_RELEASE(p)      { if(p) { (p)->Release(); (p)=NULL; } }
+
+void doSkyBoxSet(Bool startDraw)
+{
+	if (TheWritableGlobalData)
+		TheWritableGlobalData->m_drawSkyBox = startDraw;
+}
+
+
+#define DONUT_SIDES	90
+#define INNER_RADIUS 200.0f
+#define OUTER_RADIUS 250.0f
+#define TEXTURE_REPEAT_COUNT 16
+#define DONUT_HEIGHT	15.0f
+//#define DO_FLAT_DONUT
+#define AMP_SCALE	(30.0f/120.0f)
+#define WAVE_FREQ	0.3f
+#define AMP_SCALE2	(10.0f/120.0f)
+#define NOISE_FREQ	(2.0f*PI/WAVE_FREQ)
+
+#define NOISE_REPEAT_FACTOR ((float)(1.0f/(16.0f)))
+
+
+static Bool wireframeForDebug = 0;
+
+void WaterRenderObjClass::setupJbaWaterShader(void)
+{
+	if (!TheWaterTransparency->m_additiveBlend)
+		DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaShader);
+	else
+		DX8Wrapper::Set_Shader(ShaderClass::_PresetAdditiveShader);
+
+	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+	DX8Wrapper::Set_Material(vmat);
+	REF_PTR_RELEASE(vmat);
+	m_riverTexture->Get_Filter().Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_BEST);
+	m_riverTexture->Get_Filter().Set_Min_Filter(TextureFilterClass::FILTER_TYPE_BEST);
+	m_riverTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_BEST);
+
+
+//	Setting *setting=&m_settings[m_tod];
+
+
+	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_ADD );
+	if (!m_riverAlphaEdge->Is_Initialized())
+		m_riverAlphaEdge->Init();
+	DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,m_riverAlphaEdge->Peek_D3D_Texture());
+	DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, 0);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_TEXCOORDINDEX, 1);
+
+	Bool doSparkles = true;
+
+	if (m_riverWaterPixelShader && doSparkles) {
+		if (!m_waterSparklesTexture->Is_Initialized())
+			m_waterSparklesTexture->Init();
+		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1,m_waterSparklesTexture->Peek_D3D_Texture());
+
+		if (!m_waterNoiseTexture->Is_Initialized())
+			m_waterNoiseTexture->Init();
+		DX8Wrapper::_Get_D3D_Device8()->SetTexture(2,m_waterNoiseTexture->Peek_D3D_Texture());
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+		// Two output coordinates are used.
+		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+		D3DXMATRIX inv;
+		float det;
+
+		Matrix4x4 curView;
+		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+		D3DXMATRIX scale;
+
+		D3DXMatrixScaling(&scale, NOISE_REPEAT_FACTOR, NOISE_REPEAT_FACTOR,1);
+		D3DXMATRIX destMatrix = inv * scale;
+		D3DXMatrixTranslation(&scale, m_riverVOrigin, m_riverVOrigin,0);
+		destMatrix = destMatrix*scale;
+		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, *(Matrix4x4*)&destMatrix);
+
+	}
+	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 1, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 2, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 3, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 3, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
+	if (m_riverWaterPixelShader){
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(0,   D3DXVECTOR4(REFLECTION_FACTOR, REFLECTION_FACTOR, REFLECTION_FACTOR, 1.0f), 1);
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_riverWaterPixelShader);
+	}
+}
+
+
+
+
+//-------------------------------------------------------------------------------------------------
+/** Destructor. Releases w3d assets. */
+//-------------------------------------------------------------------------------------------------
+WaterRenderObjClass::~WaterRenderObjClass(void)
+{
+	REF_PTR_RELEASE(m_meshVertexMaterialClass);
+	REF_PTR_RELEASE(m_vertexMaterialClass);
+	REF_PTR_RELEASE(m_meshLight);
+	REF_PTR_RELEASE(m_alphaClippingTexture);
+	REF_PTR_RELEASE (m_skyBox);
+
+	REF_PTR_RELEASE (m_riverTexture);
+	REF_PTR_RELEASE (m_whiteTexture);
+	REF_PTR_RELEASE (m_waterNoiseTexture);
+	REF_PTR_RELEASE (m_riverAlphaEdge);
+	REF_PTR_RELEASE (m_waterSparklesTexture);
+
+	Int i;
+
+	for(i=0; i<TIME_OF_DAY_COUNT; i++)
+	{	REF_PTR_RELEASE(m_settings[i].skyTexture);
+		REF_PTR_RELEASE(m_settings[i].waterTexture);
+	}
+
+	i=NUM_BUMP_FRAMES;
+	while (i--)
+	{	SAFE_RELEASE( m_pBumpTexture[i]);
+		SAFE_RELEASE( m_pBumpTexture2[i]);
+	}
+
+	delete [] m_meshData;
+	m_meshData = NULL;
+	m_meshDataSize = 0;
+
+	//Release strings allocated inside global water settings.
+	for  (i=0; i<TIME_OF_DAY_COUNT; i++)
+	{	WaterSettings[i].m_skyTextureFile.clear();
+		WaterSettings[i].m_waterTextureFile.clear();
+	}
+	deleteInstance((WaterTransparencySetting*)TheWaterTransparency.getNonOverloadedPointer());
+	TheWaterTransparency = NULL;
+	ReleaseResources();
+
+	delete m_waterTrackSystem;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Constructor. Just nulls out some variables. */
+//-------------------------------------------------------------------------------------------------
+WaterRenderObjClass::WaterRenderObjClass(void)
+{
+	memset( &m_settings, 0, sizeof( m_settings ) );
+	m_dx=0;
+	m_dy=0;
+	m_indexBuffer=NULL;
+	m_waterTrackSystem = NULL;
+	m_doWaterGrid = FALSE;
+	m_meshVertexMaterialClass=NULL;
+	m_meshLight=NULL;
+	m_vertexMaterialClass=NULL;
+	m_alphaClippingTexture=NULL;
+	m_useCloudLayer=true;
+	m_waterType = WATER_TYPE_0_TRANSLUCENT;
+	m_tod=TIME_OF_DAY_AFTERNOON;
+	m_pReflectionTexture=NULL;
+	m_skyBox=NULL;
+	m_vertexBufferD3D=NULL;
+	m_indexBufferD3D=NULL;
+	m_vertexBufferD3DOffset=0;
+
+	m_dwWavePixelShader=NULL;
+	m_dwWaveVertexShader=NULL;
+	m_meshData=NULL;
+	m_meshDataSize = 0;
+	m_meshInMotion = FALSE;
+	m_gridOrigin=Vector2(0,0);
+	m_gridDirectionX=Vector2(1.0f,0.0f);
+	m_gridDirectionY=Vector2(1.0f,0.0f);
+
+	m_gridCellSize=WATER_MESH_SPACING;
+	m_gridCellsX=WATER_MESH_X_VERTICES;
+	m_gridCellsY=WATER_MESH_Y_VERTICES;
+	m_gridWidth = m_gridCellsX * m_gridCellSize;
+	m_gridHeight = m_gridCellsY * m_gridCellSize;
+
+	Int i=NUM_BUMP_FRAMES;
+	while (i--)
+		m_pBumpTexture[i]=NULL;
+
+	m_riverVOrigin=0;
+	m_riverTexture=NULL;
+	m_whiteTexture=NULL;
+	m_waterNoiseTexture=NULL;
+	m_riverAlphaEdge=NULL;
+	m_waterPixelShader=0;		///<D3D handle to pixel shader.
+	m_riverWaterPixelShader=0;		///<D3D handle to pixel shader.
+	m_trapezoidWaterPixelShader=0;		///<D3D handle to pixel shader.
+	m_waterSparklesTexture=0;
+	m_riverXOffset=0;
+	m_riverYOffset=0;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** WW3D method that returns object bounding sphere used in frustum culling*/
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
+{
+	//Since this object is more of a system (containing lots of water pieces),
+	//let's disable culling by making bounds huge.  Let each piece do it's own cull.
+	Vector3	ObjSpaceCenter(0,0,0);
+//	Vector3	ObjSpaceRadius(m_dx,m_dy,0);
+	Vector3	ObjSpaceRadius(50000,50000,0);
+
+	sphere.Init(ObjSpaceCenter,ObjSpaceRadius.Length());
+}
+
+//-------------------------------------------------------------------------------------------------
+/** WW3D method that returns object bounding box used in collision detection*/
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
+{
+	//Since this object is more of a system (containing lots of water pieces),
+	//let's disable culling by making bounds huge.  Let each piece do it's own cull.
+
+	Vector3	ObjSpaceCenter(0,0,0);
+	Vector3	ObjSpaceExtents(50000,50000,0.001f*m_dy);	//since mirror is a plane, it has no thickness. Set to m_dy/1000.
+
+	box.Init(ObjSpaceCenter,ObjSpaceExtents);
+}
+
+//-------------------------------------------------------------------------------------------------
+/** returns the class id, so the scene can tell what kind of render object it has. */
+//-------------------------------------------------------------------------------------------------
+Int WaterRenderObjClass::Class_ID(void) const
+{
+	return RenderObjClass::CLASSID_UNKNOWN;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Not used, but required virtual method. */
+//-------------------------------------------------------------------------------------------------
+RenderObjClass *	 WaterRenderObjClass::Clone(void) const
+{
+	assert(false);
+	return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Copies raw bits from pBumpSrc (a regular grayscale texture) into a D3D
+	*   bump-map format. */
+//-------------------------------------------------------------------------------------------------
+HRESULT WaterRenderObjClass::initBumpMap(LPDIRECT3DTEXTURE8 *pTex, TextureClass *pBumpSource)
+{
+    SurfaceClass::SurfaceDescription    d3dsd;
+	SurfaceClass * surf;
+    D3DLOCKED_RECT     d3dlr;
+	DWORD dwSrcPitch;
+	BYTE* pSrc;
+	Int numLevels;
+
+#ifdef MIPMAP_BUMP_TEXTURE
+
+	pBumpSource->Get_Level_Description(d3dsd);
+
+	if (Get_Bytes_Per_Pixel(d3dsd.Format) != 4)
+	{
+		// LORENZEN WAS BUGGED BY THIS,
+		//		DEBUG_CRASH(("WaterRenderObjClass::Invalid BumpMap format - Was it compressed?") );
+		return S_OK;
+	}
+
+	if (pBumpSource->Peek_D3D_Texture())
+	{
+		numLevels=pBumpSource->Peek_D3D_Texture()->GetLevelCount();
+	}
+	else
+		return S_OK;
+
+	pTex[0]=DX8Wrapper::_Create_DX8_Texture(d3dsd.Width,d3dsd.Height,WW3D_FORMAT_U8V8,MIP_LEVELS_ALL,D3DPOOL_MANAGED,false);
+
+	for (Int level=0; level < numLevels; level++)
+	{
+		surf=pBumpSource->Get_Surface_Level(level);
+		surf->Get_Description(d3dsd);
+		pSrc=(unsigned char *)surf->Lock((int *)&dwSrcPitch);
+
+		pTex[0]->LockRect( level, &d3dlr, 0, 0 );
+		DWORD dwDstPitch = (DWORD)d3dlr.Pitch;
+		BYTE* pDst       = (BYTE*)d3dlr.pBits;
+
+		for( DWORD y=0; y<d3dsd.Height; y++ )
+		{
+			BYTE* pDstT  = pDst;
+			BYTE* pSrcB0 = (BYTE*)pSrc;
+			BYTE* pSrcB1 = ( pSrcB0 + dwSrcPitch );
+			BYTE* pSrcB2 = ( pSrcB0 - dwSrcPitch );
+
+			if( y == d3dsd.Height-1 )  // Don't go past the last line
+				pSrcB1 = pSrcB0;
+			if( y == 0 )               // Don't go before first line
+				pSrcB2 = pSrcB0;
+
+			for( DWORD x=0; x<d3dsd.Width; x++ )
+			{
+				LONG v00 = 256-*(pSrcB0+0); // Get the current pixel
+				LONG v01 = 256-*(pSrcB0+4); // and the pixel to the right
+				LONG vM1 = 256-*(pSrcB0-4); // and the pixel to the left
+				LONG v10 = 256-*(pSrcB1+0); // and the pixel one line below.
+				LONG v1M = 256-*(pSrcB2+0); // and the pixel one line above.
+
+				LONG iDu = (vM1-v01); // The delta-u bump value
+				LONG iDv = (v1M-v10); // The delta-v bump value
+
+				if( (v00 < vM1) && (v00 < v01) )  // If we are at valley
+				{
+					iDu = vM1-v00;                 // Choose greater of 1st order diffs
+					if( iDu < v00-v01 )
+						iDu = v00-v01;
+				}
+
+				// The luminance bump value (land masses are less shiny)
+				WORD uL = ( v00>1 ) ? 63 : 127;
+
+				switch( D3DFMT_V8U8)//m_BumpMapFormat )
+				{
+					case D3DFMT_V8U8:
+						*pDstT++ = (BYTE)iDu;
+						*pDstT++ = (BYTE)iDv;
+						break;
+
+					case D3DFMT_L6V5U5:
+						*(WORD*)pDstT  = (WORD)( ( (iDu>>3) & 0x1f ) <<  0 );
+						*(WORD*)pDstT |= (WORD)( ( (iDv>>3) & 0x1f ) <<  5 );
+						*(WORD*)pDstT |= (WORD)( ( ( uL>>2) & 0x3f ) << 10 );
+						pDstT += 2;
+						break;
+
+					case D3DFMT_X8L8V8U8:
+						*pDstT++ = (BYTE)iDu;
+						*pDstT++ = (BYTE)iDv;
+						*pDstT++ = (BYTE)uL;
+						*pDstT++ = (BYTE)0L;
+						break;
+				}
+
+				// Move one pixel to the left (src is 32-bpp)
+				pSrcB0+=4;   pSrcB1+=4;   pSrcB2+=4;
+			}
+
+			// Move to the next line
+			pSrc += dwSrcPitch;    pDst += dwDstPitch;
+		}
+
+		pTex[0]->UnlockRect(level);
+		surf->Unlock();
+		REF_PTR_RELEASE (surf);
+	}
+
+#else
+	surf=pBumpSource->Get_Surface_Level();
+	surf->Get_Description(d3dsd);
+	pSrc=(unsigned char *)surf->Lock((int *)&dwSrcPitch);
+
+    // Create the bumpmap's surface and texture objects
+	m_pBumpTexture[i]=DX8Wrapper::_Create_DX8_Texture(d3dsd.Width,d3dsd.Height,WW3D_FORMAT_U8V8,TextureClass::MIP_LEVELS_1,D3DPOOL_MANAGED,false);
+
+    // Fill the bits of the new texture surface with bits from
+    // a private format.
+
+    m_pBumpTexture[i]->LockRect( 0, &d3dlr, 0, 0 );
+    DWORD dwDstPitch = (DWORD)d3dlr.Pitch;
+    BYTE* pDst       = (BYTE*)d3dlr.pBits;
+
+    for( DWORD y=0; y<d3dsd.Height; y++ )
+    {
+        BYTE* pDstT  = pDst;
+        BYTE* pSrcB0 = (BYTE*)pSrc;
+        BYTE* pSrcB1 = ( pSrcB0 + dwSrcPitch );
+        BYTE* pSrcB2 = ( pSrcB0 - dwSrcPitch );
+
+        if( y == d3dsd.Height-1 )  // Don't go past the last line
+            pSrcB1 = pSrcB0;
+        if( y == 0 )               // Don't go before first line
+            pSrcB2 = pSrcB0;
+
+        for( DWORD x=0; x<d3dsd.Width; x++ )
+        {
+            LONG v00 = 256-*(pSrcB0+0); // Get the current pixel
+            LONG v01 = 256-*(pSrcB0+4); // and the pixel to the right
+            LONG vM1 = 256-*(pSrcB0-4); // and the pixel to the left
+            LONG v10 = 256-*(pSrcB1+0); // and the pixel one line below.
+            LONG v1M = 256-*(pSrcB2+0); // and the pixel one line above.
+
+            LONG iDu = (vM1-v01); // The delta-u bump value
+            LONG iDv = (v1M-v10); // The delta-v bump value
+
+            if( (v00 < vM1) && (v00 < v01) )  // If we are at valley
+            {
+                iDu = vM1-v00;                 // Choose greater of 1st order diffs
+                if( iDu < v00-v01 )
+                    iDu = v00-v01;
+            }
+
+            // The luminance bump value (land masses are less shiny)
+            WORD uL = ( v00>1 ) ? 63 : 127;
+
+            switch( D3DFMT_V8U8)//m_BumpMapFormat )
+            {
+                case D3DFMT_V8U8:
+                    *pDstT++ = (BYTE)iDu;
+                    *pDstT++ = (BYTE)iDv;
+                    break;
+
+                case D3DFMT_L6V5U5:
+                    *(WORD*)pDstT  = (WORD)( ( (iDu>>3) & 0x1f ) <<  0 );
+                    *(WORD*)pDstT |= (WORD)( ( (iDv>>3) & 0x1f ) <<  5 );
+                    *(WORD*)pDstT |= (WORD)( ( ( uL>>2) & 0x3f ) << 10 );
+                    pDstT += 2;
+                    break;
+
+                case D3DFMT_X8L8V8U8:
+                    *pDstT++ = (BYTE)iDu;
+                    *pDstT++ = (BYTE)iDv;
+                    *pDstT++ = (BYTE)uL;
+                    *pDstT++ = (BYTE)0L;
+                    break;
+            }
+
+            // Move one pixel to the left (src is 32-bpp)
+            pSrcB0+=4;   pSrcB1+=4;   pSrcB2+=4;
+        }
+
+        // Move to the next line
+        pSrc += dwSrcPitch;    pDst += dwDstPitch;
+    }
+
+    m_pBumpTexture[i]->UnlockRect(0);
+    surf->Unlock();
+#endif
+
+    return S_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Create and fill a D3D vertex buffer with water surface vertices */
+//-------------------------------------------------------------------------------------------------
+HRESULT WaterRenderObjClass::generateVertexBuffer( Int sizeX, Int sizeY, Int vertexSize, Bool doStatic)
+{
+	m_numVertices=sizeX*sizeY;
+	//Assuming dynamic vertex buffer, allocate maximum multiple of required size to allow rendering from
+	//different parts of the buffer. 5-15-03: Disabled this since we use DISCARD mode instead to avoid Nvidia Runtime bug. -MW
+	//m_numVertices=(65536 / (sizeX*sizeY))*sizeX*sizeY;
+
+	SEA_PATCH_VERTEX* pVertices;
+
+	Setting *setting=&m_settings[m_tod];
+
+	HRESULT hr;
+
+	//default setting for a dynamic vertex buffer
+	D3DPOOL pool = D3DPOOL_DEFAULT;
+	DWORD usage = D3DUSAGE_WRITEONLY | D3DUSAGE_DYNAMIC;
+	DWORD fvf = WATER_MESH_FVF;
+
+	if (doStatic)
+	{	//change settings for a static vertex buffer
+		pool = D3DPOOL_MANAGED;
+		usage = D3DUSAGE_WRITEONLY;
+		fvf=0;// DX8 Docs confusing on this. Say no FVF for vertex shaders. Else DX8_FVF_XYZDUV1;
+		m_numVertices=sizeX*sizeY;
+	}
+
+	if (m_vertexBufferD3D == NULL)
+	{	// Create vertex buffer
+
+		if (FAILED(hr=m_pDev->CreateVertexBuffer
+		(
+			m_numVertices*vertexSize,
+			usage,
+			fvf,
+			pool,
+			&m_vertexBufferD3D
+		)))
+			return hr;
+	}
+
+	m_vertexBufferD3DOffset=0;
+
+	if (!doStatic)
+		return S_OK;	//only create the buffer, other code will fill it.
+
+	// load results into buffer
+	if (FAILED(hr=m_vertexBufferD3D->Lock
+	(
+		0,
+		m_numVertices*sizeof(SEA_PATCH_VERTEX),
+		(BYTE**)&pVertices,
+		0//D3DLOCK_DISCARD
+	)))
+		return hr;
+
+	Int x,z;
+	for (z=0; z<sizeY; z++)
+	{
+		for (x=0; x<sizeX; x++)
+		{
+			pVertices->x=(float)x;
+			pVertices->y=m_level;
+			pVertices->z=(float)z;
+
+			pVertices->tu=(float)x*PATCH_UV_SCALE;
+			pVertices->tv=(float)z*PATCH_UV_SCALE;
+			pVertices->c=setting->transparentWaterDiffuse;	//vertex alpha/color
+			pVertices++;
+		}
+	}
+
+	if (FAILED(hr=m_vertexBufferD3D->Unlock())) return hr;
+
+	return S_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Create and fill a D3D index buffer with water surface strip indices */
+//-------------------------------------------------------------------------------------------------
+HRESULT WaterRenderObjClass::generateIndexBuffer(Int sizeX, Int sizeY)
+{
+	HRESULT hr;
+
+	//Will need SizeY-1 strips, each of length SizeX*2 (2 indices per strip segment).
+	//Will also need 2 extra indices to connect each strip to next one (except last strip)
+	//Total index buffer size = (SizeY-1)*(SizeX*2+2) - 2 (drop the extra 2 indices from last strip)
+
+	m_numIndices=(sizeY-1)*(sizeX*2+2) - 2;
+
+	//old way
+
+	// Create index buffer
+	WORD* pIndices;
+
+	if (FAILED(hr=m_pDev->CreateIndexBuffer
+	(
+		(m_numIndices+2)*sizeof(WORD),
+		D3DUSAGE_WRITEONLY,
+		D3DFMT_INDEX16,
+		D3DPOOL_MANAGED,
+		&m_indexBufferD3D
+	)))
+		return hr;
+
+	if (FAILED(hr=m_indexBufferD3D->Lock
+	(
+		0,
+		m_numIndices*sizeof(WORD),
+		(BYTE**)&pIndices,
+		0
+	)))
+		return hr;
+
+	Int i,j,k;
+
+	for (i=0,j=0,k=0; i<m_numIndices; j++)
+	{
+		for (;k<(sizeX*(j+1)); k++,i+=2)
+		{
+			pIndices[i]=(UnsignedShort) k+sizeX;
+			pIndices[i+1]=(UnsignedShort) k;
+		}
+		//Generate 4 degenerate triangle to connect current strip to next strip/row of map
+		//To do this, we just repeat the last index of first strip and first index of new strip.
+		//Any triangles with repeated vertices will be skipped during rendering.
+		if (i<m_numIndices) //check if there is at least 1 more strip to go
+		{
+			pIndices[i]=k-1;
+			pIndices[i+1]=k+sizeX;
+			i+=2;
+		}
+	}
+
+	/*Old way
+	Int step=1;
+	Int psize=(size-1)/step;
+
+	m_numIndices=psize*((psize+1)*2)+(psize*2)-2;
+
+
+	Int x,z,s_toggle=1;
+	for (z=step; z<size; z+=step)
+	{
+		if (s_toggle)
+		{
+			for (x=0; x<(size-step); x+=step)
+			{
+				*pIndices++=(WORD)((z-0)*size+(x));
+				*pIndices++=(WORD)((z-step)*size+(x));
+			}
+				*pIndices++=(WORD)((z-0)*size+(size-1));
+			*pIndices++=(WORD)((z-step)*size+(size-1));
+			// insert additional degenerate to start next row
+			*pIndices++=pIndices[-2];
+			*pIndices++=pIndices[-1];
+		}
+		else
+		{
+			*pIndices++=(WORD)((z-step)*size+(size-1));
+			*pIndices++=(WORD)((z-0)*size+(size-1));
+			for (x=size-1; x>0; x-=step)
+			{
+				*pIndices++=(WORD)((z-step)*size+(x-step));
+				*pIndices++=(WORD)((z-0)*size+(x-step));
+			}
+			// insert additional degenerate to start next row
+			*pIndices++=pIndices[-1];
+			*pIndices++=pIndices[-1];
+		}
+
+		s_toggle=!s_toggle;
+	}
+*/
+	if (FAILED(hr=m_indexBufferD3D->Unlock())) return hr;
+
+	return S_OK;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Releases all w3d assets, to prepare for Reset device call. */
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::ReleaseResources(void)
+{
+
+	REF_PTR_RELEASE(m_indexBuffer);
+
+	REF_PTR_RELEASE(m_pReflectionTexture);
+	SAFE_RELEASE(m_vertexBufferD3D);
+	SAFE_RELEASE(m_indexBufferD3D);
+
+	if (m_waterTrackSystem)
+		m_waterTrackSystem->ReleaseResources();
+
+	if (m_dwWavePixelShader)
+		m_pDev->DeletePixelShader(m_dwWavePixelShader);
+
+	if (m_dwWaveVertexShader)
+		m_pDev->DeleteVertexShader(m_dwWaveVertexShader);
+
+	if (m_waterPixelShader)
+		m_pDev->DeletePixelShader(m_waterPixelShader);
+
+	if (m_trapezoidWaterPixelShader)
+		m_pDev->DeletePixelShader(m_trapezoidWaterPixelShader);
+
+	if (m_riverWaterPixelShader)
+		m_pDev->DeletePixelShader(m_riverWaterPixelShader);
+
+	m_dwWavePixelShader=0;
+	m_dwWaveVertexShader=0;
+	m_waterPixelShader = 0;
+	m_trapezoidWaterPixelShader=0;
+	m_riverWaterPixelShader=0;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** (Re)allocates all W3D assets after a reset.. */
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::ReAcquireResources(void)
+{
+	HRESULT hr;
+
+	m_indexBuffer=NEW_REF(DX8IndexBufferClass,(6));
+	// Fill up the IB
+	{
+		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
+		UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
+		//quad of 2 triangles:
+		//	3-----2
+		//  |    /|
+		//  |  /  |
+		//	|/    |
+		//  0-----1
+		ib[0]=3;
+		ib[1]=0;
+		ib[2]=2;
+		ib[3]=2;
+		ib[4]=0;
+		ib[5]=1;
+	}
+
+	m_pDev=DX8Wrapper::_Get_D3D_Device8();
+
+	//We're using the same grid for either 3D Water Mesh or Pixel/Vertex shader.  Just
+	//allocate the right size depending on usage
+	if (m_meshData)
+	{
+		//Create new grid data
+		if (FAILED(generateIndexBuffer(m_gridCellsX+1,m_gridCellsY+1)))
+			return;
+		if (FAILED(generateVertexBuffer(m_gridCellsX+1,m_gridCellsY+1,sizeof(MaterMeshVertexFormat),false)))
+			return;
+	}
+	else
+	if (m_waterType == WATER_TYPE_2_PVSHADER)
+	{	//pixel/vertex shader based water assets.
+		if (FAILED(hr=generateIndexBuffer(PATCH_SIZE,PATCH_SIZE)))
+			return;
+
+		if (FAILED(hr=generateVertexBuffer(PATCH_SIZE,PATCH_SIZE,sizeof(SEA_PATCH_VERTEX),true)))
+			return;
+
+		//shader decleration
+		DWORD Declaration[]=
+		{
+			(D3DVSD_STREAM(0)),
+			(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
+			(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
+			(D3DVSD_REG(2, D3DVSDT_FLOAT2)), // Bump map texture
+			(D3DVSD_END())
+		};
+
+		hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\wave.pso", &Declaration[0], 0, false, &m_dwWavePixelShader);
+		if (FAILED(hr))
+			return;
+
+		hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\wave.vso", &Declaration[0], 0, true, &m_dwWaveVertexShader);
+		if (FAILED(hr))
+			return;
+
+		// Create reflection texture
+		m_pReflectionTexture = DX8Wrapper::Create_Render_Target (SEA_REFLECTION_SIZE, SEA_REFLECTION_SIZE);
+	}
+
+	if (m_waterTrackSystem)
+		m_waterTrackSystem->ReAcquireResources();
+
+	if (W3DShaderManager::getChipset() >= DC_GENERIC_PIXEL_SHADER_1_1)
+	{
+		ID3DXBuffer *compiledShader;
+		const char *shader =
+			"ps.1.1\n \
+			tex t0 \n\
+			tex t1	\n\
+			tex t2	\n\
+			tex t3\n\
+			mul r0,v0,t0 ; blend vertex color into t0. \n\
+			mul r1, t1, t2 ; mul\n\
+			add r0.rgb, r0, t3\n\
+			+mul r0.a, r0, t3\n\
+			add r0.rgb, r0, r1\n";
+		hr = D3DXAssembleShader( shader, strlen(shader), 0, NULL, &compiledShader, NULL);
+		if (hr==0) {
+			hr = 	DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader((DWORD*)compiledShader->GetBufferPointer(), &m_riverWaterPixelShader);
+			compiledShader->Release();
+		}
+		shader =
+			"ps.1.1\n \
+			tex t0 \n\
+			tex t1	\n\
+			texbem t2, t1 ; use t1 as env map adjustment on t2.\n\
+			mul r0,v0,t0 ; blend vertex color into t0. \n\
+			mul r1.rgb,t2,c0 ; reduce t2 (environment mapped reflection) by constant\n\
+			add r0.rgb, r0, r1";
+		hr = D3DXAssembleShader( shader, strlen(shader), 0, NULL, &compiledShader, NULL);
+		if (hr==0) {
+			hr = 	DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader((DWORD*)compiledShader->GetBufferPointer(), &m_waterPixelShader);
+			compiledShader->Release();
+		}
+		shader =
+			"ps.1.1\n \
+			tex t0 ;get water texture\n\
+			tex t1 ;get white highlights on black background\n\
+			tex t2 ;get white highlights with more tiling\n\
+			tex t3	; get black shroud \n\
+			mul r0,v0,t0 ; blend vertex color and alpha into base texture. \n\
+			mad r0.rgb, t1, t2, r0	; blend sparkles and noise \n\
+			mul r0.rgb, r0, t3 ; blend in black shroud \n\
+			;\n";
+		hr = D3DXAssembleShader( shader, strlen(shader), 0, NULL, &compiledShader, NULL);
+		if (hr==0) {
+			hr = 	DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader((DWORD*)compiledShader->GetBufferPointer(), &m_trapezoidWaterPixelShader);
+			compiledShader->Release();
+		}
+	}
+
+	//W3D Invalidate textures after losing the device and since we peek at the textures directly, it won't
+	//know to reinit them for us.  Do it here manually:
+	if (m_riverTexture && !m_riverTexture->Is_Initialized())
+		m_riverTexture->Init();
+	if (m_waterNoiseTexture && !m_waterNoiseTexture->Is_Initialized())
+		m_waterNoiseTexture->Init();
+	if (m_riverAlphaEdge && !m_riverAlphaEdge->Is_Initialized())
+		m_riverAlphaEdge->Init();
+	if (m_waterSparklesTexture && !m_waterSparklesTexture->Is_Initialized())
+		m_waterSparklesTexture->Init();
+	if (m_whiteTexture && !m_whiteTexture->Is_Initialized())
+	{	m_whiteTexture->Init();
+		SurfaceClass *surface=m_whiteTexture->Get_Surface_Level();
+		surface->DrawPixel(0,0,0xffffffff);
+		REF_PTR_RELEASE(surface);
+	}
+}
+
+void WaterRenderObjClass::load(void)
+{
+	if (m_waterTrackSystem)
+		m_waterTrackSystem->loadTracks();
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Initializes water with dimensions and parent scene.
+	* During rendering, we will render a water surface of given dimensions
+	* and reflect the parent scene in its surface.  For now, waters are
+	* forced to be rectangles. */
+//-------------------------------------------------------------------------------------------------
+Int WaterRenderObjClass::init(Real waterLevel, Real dx, Real dy, SceneClass *parentScene, WaterType type)
+{
+
+	m_fBumpFrame=0;
+	m_fBumpScale=SEA_BUMP_SCALE;
+
+	m_dx=dx;
+	m_dy=dy;
+	m_level=waterLevel;
+
+	m_LastUpdateTime=timeGetTime();
+	m_uScrollPerMs=0.001f;
+	m_vScrollPerMs=0.001f;
+	m_uOffset=0;
+	m_vOffset=0;
+
+	m_parentScene=parentScene;
+	m_waterType = type;
+
+	/// Hack for now
+	//m_waterType = WATER_TYPE_0_TRANSLUCENT;
+
+	///@todo: calculate a real normal/distance for arbitrary planes.
+	m_planeNormal=Vector3(0,0,1);		//water plane normal
+	m_planeDistance=m_level;	//water plane distance(always at zero for now)
+
+	m_meshLight=NEW_REF(LightClass,(LightClass::DIRECTIONAL));
+	m_meshLight->Set_Ambient(Vector3(0.1f,0.1f,0.1f));
+	m_meshLight->Set_Diffuse(Vector3(1.0f,1.0f,1.0f));
+	m_meshLight->Set_Specular(Vector3(1.0f,1.0f,1.0f));
+	m_meshLight->Set_Position(Vector3(1000,1000,1000));
+	//testLight->Set_Spot_Direction(Vector3(TheGlobalData->m_terrainLightX,TheGlobalData->m_terrainLightY,TheGlobalData->m_terrainLightZ));
+	m_meshLight->Set_Spot_Direction(Vector3(-0.57f,-0.57f,-0.57f));
+
+	//Setup material for 3D Mesh water.
+	m_meshVertexMaterialClass=NEW_REF(VertexMaterialClass,());
+	m_meshVertexMaterialClass->Set_Shininess(20.0);
+	m_meshVertexMaterialClass->Set_Ambient(1.0f,1.0f,1.0f);
+	m_meshVertexMaterialClass->Set_Diffuse(1.0f,1.0f,1.0f);
+	m_meshVertexMaterialClass->Set_Specular(0.5,0.5,0.5);
+	m_meshVertexMaterialClass->Set_Opacity(WATER_MESH_OPACITY);
+	m_meshVertexMaterialClass->Set_Lighting(true);
+
+	//
+	// assign the data from the WaterSettings[] global to the data for this
+	// render object (we at present only have one water plane)
+	//
+	loadSetting( &m_settings[ TIME_OF_DAY_MORNING ], TIME_OF_DAY_MORNING );
+	loadSetting( &m_settings[ TIME_OF_DAY_AFTERNOON ], TIME_OF_DAY_AFTERNOON );
+	loadSetting( &m_settings[ TIME_OF_DAY_EVENING ], TIME_OF_DAY_EVENING );
+	loadSetting( &m_settings[ TIME_OF_DAY_NIGHT ], TIME_OF_DAY_NIGHT );
+
+	Set_Sort_Level(2);	//force water to be drawn after all other non translucent objects in scene.
+	Set_Force_Visible(TRUE);	//water is always visible since it's a composite object made of multiple planes all over the map.
+
+	ReAcquireResources();
+#if 0	//MD does not support the old bump-mapped water at all so no point loading textures. -MW 8-11-03
+	if (type == WATER_TYPE_2_PVSHADER || (W3DShaderManager::getChipset() >= DC_GENERIC_PIXEL_SHADER_1_1))
+	{	//geforce3 specific water requires some extra D3D assets
+		m_pDev=DX8Wrapper::_Get_D3D_Device8();
+		//save previous thumbnail mode
+		bool thumbnails_enabled = WW3D::Get_Thumbnail_Enabled();
+		WW3D::Set_Thumbnail_Enabled(false);
+
+		//load bump map textures off disk
+		TextureClass *pBumpSource;	//temporary textures in a format W3D understands
+		TextureClass *pBumpSource2;	//temporary textures in a format W3D understands
+		Int i;
+		i=NUM_BUMP_FRAMES;
+		while (i--)
+		{
+			char bump_name[128];
+
+			sprintf(bump_name,"caust%.2d.tga",i);
+			pBumpSource=WW3DAssetManager::Get_Instance()->Get_Texture(bump_name);
+			sprintf(bump_name,"caustS%.2d.tga",i);
+			pBumpSource2=WW3DAssetManager::Get_Instance()->Get_Texture(bump_name);
+			initBumpMap(m_pBumpTexture+i, pBumpSource);
+			initBumpMap(m_pBumpTexture2+i, pBumpSource2);
+			WW3DAssetManager::Get_Instance()->Release_Texture(pBumpSource);
+			WW3DAssetManager::Get_Instance()->Release_Texture(pBumpSource2);
+			REF_PTR_RELEASE(pBumpSource);
+			REF_PTR_RELEASE(pBumpSource2);
+		}
+		//restore previous thumpnail mode
+		WW3D::Set_Thumbnail_Enabled(thumbnails_enabled);
+	}
+#endif
+
+	//Setup material for regular water
+	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+
+
+
+	m_shaderClass = zFillAlphaShader;//ShaderClass::_PresetAlphaShader;ShaderClass::_PresetOpaqueShader;//detailOpaqueShader;
+	m_shaderClass.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);	//water should be visible from both sides
+
+	//Assets used for all types of water
+	m_alphaClippingTexture=WW3DAssetManager::Get_Instance()->Get_Texture(SKYBODY_TEXTURE);
+
+#ifdef CLIP_GEOMETRY_TO_PLANE
+	m_alphaClippingTexture=WW3DAssetManager::Get_Instance()->Get_Texture("alphaclip.tga");
+#endif
+
+	m_skyBox = ((W3DAssetManager*)W3DAssetManager::Get_Instance())->Create_Render_Obj( "new_skybox", TheGlobalData->m_skyBoxScale, 0);
+
+	//Enable clamping on all textures used by the skybox (to reduce corner seams).
+	if (m_skyBox && m_skyBox->Class_ID() == RenderObjClass::CLASSID_MESH)
+	{
+		MeshClass *mesh=(MeshClass*) m_skyBox;
+		MaterialInfoClass	*material = mesh->Get_Material_Info();
+
+		for (Int i=0; i<material->Texture_Count(); i++)
+		{
+			if (material->Peek_Texture(i))
+			{
+				material->Peek_Texture(i)->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+				material->Peek_Texture(i)->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+			}
+		}
+
+		REF_PTR_RELEASE(material);
+	}
+
+	m_riverTexture=WW3DAssetManager::Get_Instance()->Get_Texture(TheWaterTransparency->m_standingWaterTexture.str());
+
+	//For some reason setting a NULL texture does not result in 0xffffffff for pixel shaders so using explicit "white" texture.
+	m_whiteTexture=MSGNEW("TextureClass") TextureClass(1,1,WW3D_FORMAT_A4R4G4B4,MIP_LEVELS_1);
+	SurfaceClass *surface=m_whiteTexture->Get_Surface_Level();
+	surface->DrawPixel(0,0,0xffffffff);
+	REF_PTR_RELEASE(surface);
+
+	m_waterNoiseTexture=WW3DAssetManager::Get_Instance()->Get_Texture("Noise0000.tga");
+	m_riverAlphaEdge=WW3DAssetManager::Get_Instance()->Get_Texture("TWAlphaEdge.tga");
+	m_waterSparklesTexture=WW3DAssetManager::Get_Instance()->Get_Texture("WaterSurfaceBubbles.tga");
+#ifdef DRAW_WATER_WAKES
+	m_waterTrackSystem = NEW WaterTracksRenderSystem;
+	m_waterTrackSystem->init();
+#endif
+
+	return 0;
+}
+
+void WaterRenderObjClass::updateMapOverrides(void)
+{
+	if (m_riverTexture && TheWaterTransparency->m_standingWaterTexture.compareNoCase(m_riverTexture->Get_Texture_Name()) != 0)
+	{
+		REF_PTR_RELEASE(m_riverTexture);
+		m_riverTexture = WW3DAssetManager::Get_Instance()->Get_Texture(TheWaterTransparency->m_standingWaterTexture.str());
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::reset( void )
+{
+
+	// for vertex animated water mesh reset the values
+	if( m_meshData)
+	{
+		Int i, j;
+		WaterMeshData *pData;
+		Int	mx = m_gridCellsX + 1;
+		Int my = m_gridCellsY + 1;
+
+		// go through each mesh point and adjust the height according to the velocity
+		for( j = 0, pData = m_meshData; j < (my + 2); j++ )
+		{
+
+			for( i = 0; i < (mx + 2); i++ )
+			{
+
+				// areset grid values for this cell
+				pData->velocity = 0.0f;
+				pData->height = 0.0f;
+				pData->preferredHeight = 0.0f;
+				pData->status = WaterRenderObjClass::AT_REST;
+
+				// on to the next one
+				pData++;
+
+			}
+
+		}
+
+		// mesh data is no longer in motion
+		m_meshInMotion = FALSE;
+
+	}
+
+	if (m_waterTrackSystem)
+		m_waterTrackSystem->reset();
+}
+
+void WaterRenderObjClass::enableWaterGrid(Bool state)
+{
+	m_doWaterGrid = state;
+
+	m_drawingRiver = false;
+	m_disableRiver = false;
+
+	if (state && m_meshData == NULL)
+	{	//water type has changed, must allocate necessary assets for new water.
+		//contains the current deformed water surface z(height) values.  With 1 vertex invisible border
+		//around surface to speed up normal calculations.
+		m_meshDataSize = (m_gridCellsX+1+2)*(m_gridCellsY+1+2);
+		m_meshData=NEW WaterMeshData[ m_meshDataSize ];
+		memset(m_meshData,0,sizeof(WaterMeshData)*(m_gridCellsX+1+2)*(m_gridCellsY+1+2));
+		reset();
+
+		//Release existing grid data
+		SAFE_RELEASE(m_vertexBufferD3D);
+		SAFE_RELEASE(m_indexBufferD3D);
+
+		//Create new grid data
+		if (FAILED(generateIndexBuffer(m_gridCellsX+1,m_gridCellsY+1)))
+			return;
+		if (FAILED(generateVertexBuffer(m_gridCellsX+1,m_gridCellsY+1,sizeof(MaterMeshVertexFormat),false)))
+			return;
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Update phase for water if we need it. */
+// ------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::update( void )
+{
+	// TheSuperHackers @tweak The water movement time step is now decoupled from the render update.
+	const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
+
+	{
+		constexpr const Real MagicOffset = 0.0125f * 33 / 5000; ///< the work of top Munkees; do not question it
+
+		m_riverVOrigin += 0.002f * timeScale;
+		m_riverXOffset += (Real)(MagicOffset * timeScale);
+		m_riverYOffset += (Real)(2 * MagicOffset * timeScale);
+
+		// This moves offsets towards zero when smaller -1.0 or larger 1.0
+		m_riverXOffset -= (Int)m_riverXOffset;
+		m_riverYOffset -= (Int)m_riverYOffset;
+
+		m_fBumpFrame += timeScale;
+		if (m_fBumpFrame >= NUM_BUMP_FRAMES)
+			m_fBumpFrame = 0.0f;
+
+		// for vertex animated water we need to update the vector field
+		if( m_doWaterGrid && m_meshInMotion == TRUE )
+		{
+			const Real PREFERRED_HEIGHT_FUDGE = 1.0f;		///< this is close enough to at rest
+			const Real AT_REST_VELOCITY_FUDGE = 1.0f;		///< when we're close enough to at rest height and velocity we will stop
+			const Real WATER_DAMPENING = 0.93f;					///< use with up force of 15.0
+			Int i, j;
+			Int	mx = m_gridCellsX+1;
+			Int my = m_gridCellsY+1;
+			WaterMeshData *pData;
+
+			//
+			// we will mark the mesh as clean now ... if any of the fields are still in motion
+			// they will continue to mark the mesh as dirty so processing continues next frame
+			//
+			m_meshInMotion = FALSE;
+
+			// go through each mesh point and adjust the height according to the velocity
+			for( j = 0, pData = m_meshData; j < (my + 2); j++ )
+			{
+
+				for( i = 0; i < (mx + 2); i++ )
+				{
+
+					// only pay attention to mesh points that are in motion
+					if( BitIsSet( pData->status, WaterRenderObjClass::IN_MOTION ) )
+					{
+
+						// DAMPENING to slow the changes down
+						pData->velocity *= WATER_DAMPENING;
+
+						// if the height here is below our preferred height, we want to add upward force to counteract it
+						if( pData->height < pData->preferredHeight )
+							pData->velocity -= TheGlobalData->m_gravity * 3.0f;
+						else
+							pData->velocity += TheGlobalData->m_gravity * 3.0f;
+
+						// adjust the height at this grid location according to the current velocity
+						pData->height = pData->height + pData->velocity;
+
+						//
+						// if we are close enough to our preferred height and our velocity is small enough
+						// this will be our resting location
+						//
+						if( fabs( pData->height - pData->preferredHeight ) < PREFERRED_HEIGHT_FUDGE &&
+								fabs( pData->velocity ) < AT_REST_VELOCITY_FUDGE )
+						{
+
+							BitClear( pData->status, WaterRenderObjClass::IN_MOTION );
+							pData->height = pData->preferredHeight;
+							pData->velocity = 0.0f;
+
+						}
+						else
+						{
+
+							// there is still motion in the mesh, we need to process next frame
+							m_meshInMotion = TRUE;
+
+						}
+
+					}
+
+					// on to the next one
+					pData++;
+
+				}
+
+			}
+
+		}
+
+	}
+
+}
+
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::replaceSkyboxTexture(const AsciiString& oldTexName, const AsciiString& newTextName)
+{
+	W3DAssetManager* assetManager = ((W3DAssetManager*)W3DAssetManager::Get_Instance());
+
+	assetManager->replacePrototypeTexture(m_skyBox, oldTexName.str(), newTextName.str());
+
+	//Enable clamping on all textures used by the skybox (to reduce corner seams).
+	if (m_skyBox && m_skyBox->Class_ID() == RenderObjClass::CLASSID_MESH)
+	{
+		MeshClass *mesh=(MeshClass*) m_skyBox;
+		MaterialInfoClass	*material = mesh->Get_Material_Info();
+
+		for (Int i=0; i<material->Texture_Count(); i++)
+		{
+			if (material->Peek_Texture(i))
+			{
+				material->Peek_Texture(i)->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+				material->Peek_Texture(i)->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+			}
+		}
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Adjusts various water/sky rendering settings that depend on time of day. */
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::setTimeOfDay(TimeOfDay tod)
+{
+	m_tod=tod;
+	if (m_waterType == WATER_TYPE_2_PVSHADER)
+		generateVertexBuffer(PATCH_SIZE,PATCH_SIZE,sizeof(SEA_PATCH_VERTEX),true);	//update the water mesh with new lighting/alpha
+}
+
+//-------------------------------------------------------------------------------------------------
+/**Copies GDF settings dealing with a particular time of day into our own
+	* structures.  Also allocates any required W3D assets (textures). */
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::loadSetting( Setting *setting, TimeOfDay timeOfDay )
+{
+	SurfaceClass::SurfaceDescription surfaceDesc;
+
+	// sanity
+	DEBUG_ASSERTCRASH( setting, ("WaterRenderObjClass::loadSetting, NULL setting") );
+
+	// textures
+	setting->skyTexture = WW3DAssetManager::Get_Instance()->Get_Texture( WaterSettings[ timeOfDay ].m_skyTextureFile.str() );
+	setting->waterTexture = WW3DAssetManager::Get_Instance()->Get_Texture( WaterSettings[ timeOfDay ].m_waterTextureFile.str() );
+
+	// texelss per unit
+	setting->skyTexelsPerUnit = WaterSettings[ timeOfDay ].m_skyTexelsPerUnit;
+	setting->waterTexture->Get_Level_Description( surfaceDesc, 0 );
+	setting->skyTexelsPerUnit /= (Real)surfaceDesc.Width;
+
+	// water repeat
+	setting->waterRepeatCount = WaterSettings[ timeOfDay ].m_waterRepeatCount;
+
+	// U and V scroll per ms
+	setting->uScrollPerMs = WaterSettings[ timeOfDay ].m_uScrollPerMs;
+	setting->vScrollPerMs = WaterSettings[ timeOfDay ].m_vScrollPerMs;
+
+	//
+	// vertex colors
+	//
+	// bottom left
+	setting->vertex00Diffuse = (WaterSettings[ timeOfDay ].m_vertex00Diffuse.red << 16) |
+														 (WaterSettings[ timeOfDay ].m_vertex00Diffuse.green << 8) |
+														  WaterSettings[ timeOfDay ].m_vertex00Diffuse.blue;
+	// top left
+	setting->vertex01Diffuse = (WaterSettings[ timeOfDay ].m_vertex01Diffuse.red << 16) |
+														 (WaterSettings[ timeOfDay ].m_vertex01Diffuse.green << 8) |
+														  WaterSettings[ timeOfDay ].m_vertex01Diffuse.blue;
+	// bottom right
+	setting->vertex10Diffuse = (WaterSettings[ timeOfDay ].m_vertex10Diffuse.red << 16) |
+														 (WaterSettings[ timeOfDay ].m_vertex10Diffuse.green << 8) |
+														  WaterSettings[ timeOfDay ].m_vertex10Diffuse.blue;
+	// top right
+	setting->vertex11Diffuse = (WaterSettings[ timeOfDay ].m_vertex11Diffuse.red << 16) |
+														 (WaterSettings[ timeOfDay ].m_vertex11Diffuse.green << 8) |
+														  WaterSettings[ timeOfDay ].m_vertex11Diffuse.blue;
+
+	// diffuse water color
+	setting->waterDiffuse = (WaterSettings[ timeOfDay ].m_waterDiffuseColor.alpha << 24) |
+												  (WaterSettings[ timeOfDay ].m_waterDiffuseColor.red		<< 16) |
+													(WaterSettings[ timeOfDay ].m_waterDiffuseColor.green << 8) |
+												   WaterSettings[ timeOfDay ].m_waterDiffuseColor.blue;
+
+	// transparent water color
+	setting->transparentWaterDiffuse = (WaterSettings[ timeOfDay ].m_transparentWaterDiffuse.alpha << 24) |
+																		 (WaterSettings[ timeOfDay ].m_transparentWaterDiffuse.red	 << 16) |
+																		 (WaterSettings[ timeOfDay ].m_transparentWaterDiffuse.green << 8) |
+																		  WaterSettings[ timeOfDay ].m_transparentWaterDiffuse.blue;
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Our water may use effects that require run-time rendered textures.  These
+	*	textures need to be updated before we start rendering to the main screen
+	* render target because D3D doesn't multiple render targets. */
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::updateRenderTargetTextures(CameraClass *cam)
+{
+	if (m_waterType == WATER_TYPE_2_PVSHADER && getClippedWaterPlane(cam, NULL) &&
+		TheTerrainRenderObject && TheTerrainRenderObject->getMap())
+		renderMirror(cam);	//generate texture containing reflected scene
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Renders the reflected scene into an offscreen texture. */
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::renderMirror(CameraClass *cam)
+{
+#ifdef EXTENDED_STATS
+	if (DX8Wrapper::stats.m_disableWater) {
+		return;
+	}
+#endif
+	Matrix3D	OldCameraMatrix=cam->Get_Transform();
+	Matrix4x4	FullMatrix4(cam->Get_Transform());	//copy 3x4 matrix into a 4x4
+	Vector3		WaterNormal(0,0,1);	//normal of plane used for reflection
+	Vector4		WaterPlane(WaterNormal.X,WaterNormal.Y,WaterNormal.Z,m_level);
+	Vector3		rRight,rUp,rN,rPos;	//orientation and translation vectors of camera
+
+	Matrix4x4	FullMatrix(FullMatrix4.Transpose());	//swap rows/columns
+
+	//reflect camera right vector
+	Real axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[0],WaterNormal);
+	rRight = (Vector3&)FullMatrix[0] - (2.0f*axis_distance*WaterNormal);
+
+	//reflect camera up vector
+	axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[1],WaterNormal);
+	rUp = (Vector3&)FullMatrix[1] - (2.0f*axis_distance*WaterNormal);
+
+	//reflect camera n vector
+	axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[2],WaterNormal);
+	rN = (Vector3&)FullMatrix[2] - (2.0f*axis_distance*WaterNormal);
+
+	//reflect camera position
+	axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[3],WaterNormal);	//distance cam to origin
+	axis_distance -= WaterPlane.W;	// subtract mirror plane distance to get distance camera to plane
+	rPos = (Vector3&)FullMatrix[3] - (2.0f*axis_distance*WaterNormal);
+
+	//generate a new camera matrix from reflected vectors
+	Matrix3D reflectedTransform(rRight,rUp,rN,rPos);
+
+
+	DX8Wrapper::Set_Render_Target_With_Z((TextureClass*)m_pReflectionTexture);
+
+	// Clear the backbuffer
+	WW3D::Begin_Render(false,true,Vector3(0.0f,0.0f,0.0f));	//clearing only z-buffer since background always filled with clouds
+
+	cam->Set_Transform( reflectedTransform );
+
+	//Force reflected image to be drawn into full texture size - not a viewport inside texture.
+	Vector2 vMin,vMax,vOldMax,vOldMin;
+ 	cam->Get_Viewport(vOldMin,vOldMax);
+ 	vMax.X=vMax.Y=1.0f;
+	vMin.X=vMin.Y=0.0f;
+ 	cam->Set_Viewport(vMin,vMax);
+
+	cam->Apply();	//force an update of all the camera dependent parameters like frustum clip planes
+
+	//flip the winding order of polygons to draw the reflected back sides.
+	ShaderClass::Invert_Backface_Culling(true);
+
+	// Render the scene
+	renderSky();
+	if (m_tod == TIME_OF_DAY_NIGHT)
+		renderSkyBody(&reflectedTransform);
+
+	WW3D::Render(m_parentScene,cam);
+
+	cam->Set_Transform(OldCameraMatrix);	//restore original non-reflected matrix
+ 	cam->Set_Viewport(vOldMin,vOldMax);
+
+	cam->Apply();	//force an update of all the camera dependent parameters like frustum clip planes
+
+	ShaderClass::Invert_Backface_Culling(false);
+
+	WW3D::End_Render(false);
+
+	// Change the rendertarget back to the main backbuffer
+	DX8Wrapper::Set_Render_Target((IDirect3DSurface8 *)NULL);
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Renders (draws) the water.
+	*	Algorithm:
+	*	Draw reflected scene.
+	*	Draw reflected sky layer(s) and bodies.
+	*	Clear Zbuffer
+	*	Fill Zbuffer by drawing water surface (allows proper sorting into regular scene).
+	*	Draw non-reflected scene (done in regular app render loop).
+	*
+	*	This algorithm doesn't apply to translucent water, which is rendered into a
+	*   texture and rendered at end of scene. */
+//-------------------------------------------------------------------------------------------------
+//DECLARE_PERF_TIMER(Water)
+void WaterRenderObjClass::Render(RenderInfoClass & rinfo)
+{
+	//USE_PERF_TIMER(Water)
+	if (TheTerrainRenderObject && !TheTerrainRenderObject->getMap())
+		return;	//no map has been loaded yet.
+
+	if (((RTS3DScene *)rinfo.Camera.Get_User_Data())->getCustomPassMode() == SCENE_PASS_ALPHA_MASK ||
+		((SceneClass *)rinfo.Camera.Get_User_Data())->Get_Extra_Pass_Polygon_Mode() == SceneClass::EXTRA_PASS_CLEAR_LINE)
+		return;	//water is not drawn in wireframe or custom scene passes
+
+#ifdef EXTENDED_STATS
+	if (DX8Wrapper::stats.m_disableWater) {
+		return;
+	}
+#endif
+	if (ShaderClass::Is_Backface_Culling_Inverted())
+		return;	//the water object will not reflect in itself, so don't do anything if rendering a mirror.
+
+	//this water type needs to rendered after the rest of scene, so buffer it up for later
+
+	// If static sort lists are enabled and this mesh has a sort level, put it on the list instead
+	// of rendering it.
+	unsigned int sort_level = (unsigned int)Get_Sort_Level();
+
+	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level != SORT_LEVEL_NONE)
+	{
+		WW3D::Add_To_Static_Sort_List(this, sort_level);
+		return;
+	}
+
+	switch(m_waterType)
+	{
+		case WATER_TYPE_0_TRANSLUCENT:
+		case WATER_TYPE_3_GRIDMESH:
+			//Draw the water surface as a bunch of alpha blended tiles covering areas where water is visible
+			renderWater();
+			if (!m_drawingRiver || m_disableRiver) {
+				renderWaterMesh();	//Draw water surface as 3D deforming mesh if it's enabled on this map.
+			}
+			break;
+
+		case WATER_TYPE_2_PVSHADER:
+			//Pixel/Vertex Shader based water which uses an off-screen rendered reflection texture
+			drawSea(rinfo);	//draw water surface
+			break;
+
+		case WATER_TYPE_1_FB_REFLECTION:
+			{
+				//Normal frame buffer reflection water type. Non translucent.  Legacy code we're not using anymore.
+				Matrix3D	OldCameraMatrix=rinfo.Camera.Get_Transform();
+				Matrix4x4	FullMatrix4(rinfo.Camera.Get_Transform());	//copy 3x4 matrix into a 4x4
+				Vector3		WaterNormal(0,0,1);	//normal of plane used for reflection
+				Vector4		WaterPlane(WaterNormal.X,WaterNormal.Y,WaterNormal.Z,m_level);	//assume distance to origin 0
+				Vector3		rRight,rUp,rN,rPos;	//orientation and translation vectors of camera
+
+				Matrix4x4	FullMatrix(FullMatrix4.Transpose());	//swap rows/columns
+
+				//reflect camera right vector
+				Real axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[0],WaterNormal);
+				rRight = (Vector3&)FullMatrix[0] - (2.0f*axis_distance*WaterNormal);
+
+				//reflect camera up vector
+				axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[1],WaterNormal);
+				rUp = (Vector3&)FullMatrix[1] - (2.0f*axis_distance*WaterNormal);
+
+				//reflect camera n vector
+				axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[2],WaterNormal);
+				rN = (Vector3&)FullMatrix[2] - (2.0f*axis_distance*WaterNormal);
+
+				//reflect camera position
+				axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[3],WaterNormal);	//distance cam to origin
+				axis_distance -= WaterPlane.W;	// subtract mirror plane distance to get distance camera to plane
+				rPos = (Vector3&)FullMatrix[3] - (2.0f*axis_distance*WaterNormal);
+
+				//generate a new camera matrix from reflected vectors
+				Matrix3D reflectedTransform(rRight,rUp,rN,rPos);
+
+				//flip the winding order of polygons to draw the reflected back sides.
+				ShaderClass::Invert_Backface_Culling(true);
+
+			#ifdef CLIP_GEOMETRY_TO_PLANE
+			  // Set a clip plane, so that only objects above the water are reflected
+				WaterPlane.W *= -1.0f;	//flip sign of plane distance for D3D use.
+
+			//	DX8Wrapper::Set_DX8_Clip_Plane( 0, &WaterPlane.X );
+			//	DX8Wrapper::Set_DX8_Render_State(D3DRS_CLIPPLANEENABLE, D3DCLIPPLANE0 );	//turn on first clip plane
+
+				// Alternate Clipping Method using alpha testing hack!
+				/**************************************************************************************/
+
+				D3DXMATRIX inv;
+				D3DXMATRIX clipMatrix;
+				Real det;
+				Matrix4x4 curView;
+
+				//get current view matrix
+				DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+
+				//get inverse of view matrix(= view to world matrix)
+				D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+
+				//create clipping matrix by inserting our plane equation into the 1st column
+				D3DXMatrixIdentity(&clipMatrix);
+				clipMatrix(0,0)=WaterNormal.X;
+				clipMatrix(1,0)=WaterNormal.Y;
+				clipMatrix(2,0)=WaterNormal.Z;
+				clipMatrix(3,0)=WaterPlane.W+0.5f;
+				inv *=clipMatrix;
+
+				// Change texture wrapping mode to 'clamp' for texture stage 1
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+
+				// Use CameraSpace vertices as input to matrix and use texture wrap mode from stage 1
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION|1);
+				// Two output coordinates are used.
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+				// Set texture generation matrix for stage 1
+				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, *((Matrix4*)&inv));
+
+				// Disable bilinear filtering
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
+
+				// Pass stage 0 texture data untouched(by modulating with white)
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );	//stage 1 texture
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );	//previous stage texture
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );	//module with white => does nothing
+
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );	//stage 1 texture
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );	//previous stage texture
+				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );	//modulate with clipping texture
+
+				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHAREF,0x00);
+				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHAFUNC,D3DCMP_NOTEQUAL);	//pass pixels who's alpha is not zero
+				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHATESTENABLE, true);	//test pixels if transparent(clipped) before rendering.
+
+				// Set clipping texture
+				m_alphaClippingTexture->Set_U_Addr_Mode(TextureClass::TEXTURE_ADDRESS_CLAMP);
+				m_alphaClippingTexture->Set_V_Addr_Mode(TextureClass::TEXTURE_ADDRESS_CLAMP);
+				m_alphaClippingTexture->Set_Min_Filter(TextureClass::FILTER_TYPE_NONE);
+				m_alphaClippingTexture->Set_Mag_Filter(TextureClass::FILTER_TYPE_NONE);
+				m_alphaClippingTexture->Set_Mip_Mapping(TextureClass::FILTER_TYPE_NONE);
+
+				DX8Wrapper::Set_Texture(0,m_alphaClippingTexture);
+
+				//TODO: Will have to make sure that the shader system is not resetting my stage 1 setup
+				//while rendering the scene
+
+				/*************************************************************************************/
+			#endif
+
+			#if 0	// No longer do simple rendering.
+				if (TheGlobalData->m_useWaterPlane)
+				{
+					//@todo : Would it be better to create a new camera or change the transform of the
+					//existing one?
+					rinfo.Camera.Set_Transform( reflectedTransform );
+					rinfo.Camera.Apply();	//force an update of all the camera dependent parameters like frustum clip planes
+
+					if(m_useCloudLayer)
+					{
+						if (TheGlobalData && TheGlobalData->m_drawEntireTerrain)
+							m_skyBox->Render(rinfo);
+						else
+						{
+							renderSky();
+							if (m_tod == TIME_OF_DAY_NIGHT)
+								renderSkyBody(&reflectedTransform);
+						}
+					}
+
+					WW3D::Render(m_parentScene,&rinfo.Camera);
+
+					rinfo.Camera.Set_Transform(OldCameraMatrix);	//restore original non-reflected matrix
+					rinfo.Camera.Apply();	//force an update of all the camera dependent parameters like frustum clip planes
+
+					//clear the z-buffer to remove changes made by objects inside mirror
+					DX8Wrapper::Clear(false,true,Vector3(0.1f,0.1f,0.1f));
+				}
+			#endif
+
+			#ifdef CLIP_GEOMETRY_TO_PLANE
+				//restore default culling mode
+			//	DX8Wrapper::Set_DX8_Render_State(D3DRS_CLIPPLANEENABLE, 0 );	//turn off first clip plane
+
+				//disable texture coordinate generation
+				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHATESTENABLE, false);	//disable alpha testing
+			#endif
+
+				ShaderClass::Invert_Backface_Culling(false);	//return culling back to normal
+
+				ShaderClass::Invalidate();	//reset shading system so it forces full state set.
+
+				renderWater();
+			}
+			break;
+
+		default:
+			break;
+	}
+
+	if (TheGlobalData && TheGlobalData->m_drawSkyBox)
+	{	//center skybox around camera
+		Vector3 pos=rinfo.Camera.Get_Position();
+		pos.Z = TheGlobalData->m_skyBoxPositionZ;
+		m_skyBox->Set_Position(pos);
+		m_skyBox->Render(rinfo);
+	}
+
+	//Clean up after any pixel shaders.
+	//Force render state apply so that the "NULL" texture gets applied to D3D, thus releasing shroud reference count.
+	DX8Wrapper::Apply_Render_State_Changes();
+	DX8Wrapper::Invalidate_Cached_Render_States();
+
+	if (m_waterTrackSystem)
+		m_waterTrackSystem->flush(rinfo);
+
+//	renderWaterMesh();
+//	renderWaterWave();
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Clips the water plane to the current camera frustum and returns a bounding
+	* box enclosing the clipped plane.  Returns false if water plane is not visible. */
+//-------------------------------------------------------------------------------------------------
+Bool WaterRenderObjClass::getClippedWaterPlane(CameraClass *cam, AABoxClass *box)
+{
+	const FrustumClass & frustum = cam->Get_Frustum();
+
+	ClipPolyClass	ClippedPoly0;
+	ClipPolyClass	ClippedPoly1;
+
+	///@todo: generate proper sized polygon
+	ClippedPoly0.Reset();
+	ClippedPoly0.Add_Vertex(Vector3(0,0,m_level));
+	ClippedPoly0.Add_Vertex(Vector3(0,m_dy,m_level));
+	ClippedPoly0.Add_Vertex(Vector3(m_dx,m_dy,m_level));
+	ClippedPoly0.Add_Vertex(Vector3(m_dx,0,m_level));
+
+	//clip against all 6 frustum planes
+	ClippedPoly0.Clip(frustum.Planes[0],ClippedPoly1);
+	ClippedPoly1.Clip(frustum.Planes[1],ClippedPoly0);
+	ClippedPoly0.Clip(frustum.Planes[2],ClippedPoly1);
+	ClippedPoly1.Clip(frustum.Planes[3],ClippedPoly0);
+	ClippedPoly0.Clip(frustum.Planes[4],ClippedPoly1);
+	ClippedPoly1.Clip(frustum.Planes[5],ClippedPoly0);
+
+	Int final_vcount = ClippedPoly0.Verts.Count();
+
+	//make sure the polygon is visible
+	if (final_vcount >= 3)
+	{
+		//find axis aligned bounding box around visible polygon
+		if (box)
+  			box->Init(&(ClippedPoly0.Verts[0]),final_vcount);
+		return TRUE;
+	}
+
+	return FALSE;	//water plane is not visible
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Draws the water surface using a custom D3D vertex/pixel shader and a
+	* reflection texture.  Only tested to work on GeForce3. */
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::drawSea(RenderInfoClass & rinfo)
+{
+	AABoxClass	seaBox;
+
+	if (!getClippedWaterPlane(&rinfo.Camera,&seaBox))
+		return;	//the sea is not visible
+
+	D3DXMATRIX matProj, matView, matWW3D;
+
+	//create a transform which will flip the y and z coordinates to fit our system
+	memset(&matWW3D,0,sizeof(D3DMATRIX));
+	matWW3D._11=1.0f;
+	matWW3D._32=1.0f;
+	matWW3D._23=1.0f;
+	matWW3D._44=1.0f;
+
+	Matrix3D tm(Transform);
+
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
+	DX8Wrapper::Set_Texture(0,NULL);	//we'll be setting our own textures, so reset W3D
+	DX8Wrapper::Set_Texture(1,NULL);	//we'll be setting our own textures, so reset W3D
+
+
+	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+
+	Vector3 camTran;
+
+	rinfo.Camera.Get_Transform().Get_Translation(&camTran);
+
+	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, *(Matrix4x4*)&matView);
+	DX8Wrapper::_Get_DX8_Transform(D3DTS_PROJECTION, *(Matrix4x4*)&matProj);
+
+	//default setup from Kenny's demo
+	m_pDev->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+	m_pDev->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
+	m_pDev->SetTextureStageState( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE);
+	m_pDev->SetTextureStageState( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+	m_pDev->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, 0 );
+
+	m_pDev->SetTextureStageState( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
+	m_pDev->SetTextureStageState( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
+	m_pDev->SetTextureStageState( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE);
+	m_pDev->SetTextureStageState( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+	m_pDev->SetTextureStageState( 1, D3DTSS_TEXCOORDINDEX, 1 );
+
+	m_pDev->SetTextureStageState( 2, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	m_pDev->SetTextureStageState( 2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|2);
+
+	m_pDev->SetTextureStageState( 3, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	m_pDev->SetTextureStageState( 3, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|3);
+
+//	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
+//	m_pDev->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
+//	m_pDev->SetTextureStageState( 0, D3DTSS_MIPFILTER, D3DTEXF_POINT );
+
+//	m_pDev->SetTextureStageState( 1, D3DTSS_MINFILTER, D3DTEXF_POINT );
+//	m_pDev->SetTextureStageState( 1, D3DTSS_MAGFILTER, D3DTEXF_POINT );
+//	m_pDev->SetTextureStageState( 1, D3DTSS_MIPFILTER, D3DTEXF_NONE );
+	//end of default setup
+
+	m_pDev->SetTextureStageState(0, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+	m_pDev->SetTextureStageState(0, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+	m_pDev->SetRenderState( D3DRS_WRAP0, D3DWRAP_U | D3DWRAP_V);
+
+	m_pDev->SetTextureStageState(1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+	m_pDev->SetTextureStageState(1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+
+	m_pDev->SetTexture( 0, m_pBumpTexture[(Int)m_fBumpFrame]);
+#ifdef MIPMAP_BUMP_TEXTURE
+	m_pDev->SetTextureStageState( 0, D3DTSS_MIPFILTER, D3DTEXF_POINT );
+	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
+#endif
+	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVMAT00, F2DW(m_fBumpScale) );
+	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVMAT01, F2DW(0.0f) );
+	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVMAT10, F2DW(0.0f) );
+	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVMAT11, F2DW(m_fBumpScale) );
+	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVLSCALE, F2DW(1.0f) );
+	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVLOFFSET, F2DW(0.0f) );
+
+	m_pDev->SetTextureStageState( 2, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+	m_pDev->SetTextureStageState( 2, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+	m_pDev->SetRenderState(D3DRS_ZWRITEENABLE , FALSE);
+
+	D3DXMATRIX mat;
+	memset(&mat,0,sizeof(D3DXMATRIX));
+
+	mat._11 = 0.5f; mat._12 = -0.5f; mat._13 = 0.5f;   mat._14=0.5f;
+	mat._21 = 0.5f; mat._22 = 0.5f; mat._23 = 0.0f;   mat._24=0.0f;
+	mat._31 = 0.0f; mat._32 = 0.0f; mat._33 = 0.0f;   mat._34=1.0f;
+	mat._41 = 0.0f; mat._42 = 0.0f; mat._43 = 0.0f;   mat._44=1.0f;
+
+	m_pDev->SetVertexShaderConstant(CV_TEXPROJ_0, &mat, 4);
+
+	// Setup constants
+	m_pDev->SetVertexShaderConstant(CV_ZERO,   D3DXVECTOR4(0.0f, 0.0f, 0.0f, 0.0f), 1);
+	m_pDev->SetVertexShaderConstant(CV_ONE,    D3DXVECTOR4(1.0f, 1.0f, 1.0f, 1.0f), 1);
+
+	m_pDev->SetVertexShader(m_dwWaveVertexShader);
+	m_pDev->SetPixelShader(m_dwWavePixelShader);
+
+//	Make reflection brighter to compensate for darker coloring on sea floor
+//	m_pDev->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_ONE );
+//	m_pDev->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_SRCCOLOR );
+
+	m_pDev->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_SRCALPHA );
+	m_pDev->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA );
+
+	m_pDev->SetRenderState(D3DRS_ALPHABLENDENABLE , TRUE);
+	m_pDev->SetTexture( 1, m_pReflectionTexture->Peek_D3D_Texture());
+
+//	m_pDev->SetRenderState(D3DRS_FILLMODE,D3DFILL_WIREFRAME);//LORENZEN
+
+	Int patchX,patchY,startX,startY;
+
+	D3DXMATRIX patchMatrix;
+	memset(&patchMatrix,0,sizeof(D3DXMATRIX));
+	patchMatrix._11=PATCH_SCALE;
+	patchMatrix._22=1.0f;
+	patchMatrix._33=PATCH_SCALE;
+	patchMatrix._44=1.0f;
+
+	m_pDev->SetStreamSource(0,m_vertexBufferD3D,sizeof(WaterRenderObjClass::SEA_PATCH_VERTEX));
+	m_pDev->SetIndices(m_indexBufferD3D,0);
+
+	for (startY=patchY=(seaBox.Center.Y-seaBox.Extent.Y)/(PATCH_WIDTH*PATCH_SCALE); (patchY*PATCH_WIDTH*PATCH_SCALE)<(seaBox.Center.Y+seaBox.Extent.Y); patchY++)
+	{
+		for (startX=patchX=(seaBox.Center.X-seaBox.Extent.X)/(PATCH_WIDTH*PATCH_SCALE); (patchX*PATCH_WIDTH*PATCH_SCALE)<(seaBox.Center.X+seaBox.Extent.X); patchX++)
+		{
+			D3DXMATRIX matWorldViewProj, matTemp, matTempWorld;
+			patchMatrix._41=(float)(patchX*PATCH_WIDTH*PATCH_SCALE );
+			patchMatrix._43=(float)(patchY*PATCH_WIDTH*PATCH_SCALE );
+			//convert the default D3D coordinate system into ours
+			D3DXMatrixMultiply(&matTempWorld, &patchMatrix, &matWW3D);
+
+			D3DXMatrixMultiply(&matTemp, &matTempWorld, &matView);
+			D3DXMatrixMultiply(&matWorldViewProj, &matTemp, &matProj);
+			//matrices must be transposed before loading into vertex shader registers
+			D3DXMatrixTranspose(&matWorldViewProj, &matWorldViewProj);
+			m_pDev->SetVertexShaderConstant(CV_WORLDVIEWPROJ_0, &matWorldViewProj, 4);	//pass transform matrix into shader
+
+			m_pDev->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,0,m_numVertices,0,m_numIndices);
+		}
+	}
+//	m_pDev->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
+	m_pDev->SetRenderState(D3DRS_ALPHABLENDENABLE , FALSE);
+	m_pDev->SetTexture( 0, NULL);	//release reference to bump texture
+	m_pDev->SetTexture( 1, NULL);	//release reference to reflection texture
+	m_pDev->SetTexture( 2, NULL);	//release reference to reflection texture
+
+	m_pDev->SetTextureStageState( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	m_pDev->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
+	m_pDev->SetTextureStageState( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
+	m_pDev->SetTextureStageState( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
+	m_pDev->SetRenderState(D3DRS_ZWRITEENABLE , TRUE);
+
+	m_pDev->SetTextureStageState(1, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+	m_pDev->SetTextureStageState(1, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+	m_pDev->SetRenderState( D3DRS_WRAP0, 0);	//turn off texture wrapping
+
+	m_pDev->SetTextureStageState( 0, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+	m_pDev->SetTextureStageState( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+	m_pDev->SetTextureStageState( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+	m_pDev->SetTextureStageState( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+	m_pDev->SetTextureStageState( 2, D3DTSS_COLOROP,   D3DTOP_DISABLE );
+	m_pDev->SetTextureStageState( 2, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
+
+	//Restore old transforms
+	DX8Wrapper::_Set_DX8_Transform(D3DTS_VIEW, *(Matrix4x4*)&matView);
+	DX8Wrapper::_Set_DX8_Transform(D3DTS_PROJECTION, *(Matrix4x4*)&matProj);
+
+	m_pDev->SetPixelShader(0);	//turn off pixel shader
+	m_pDev->SetVertexShader(DX8_FVF_XYZDUV1);	//turn off custom vertex shader
+
+	DX8Wrapper::Invalidate_Cached_Render_States();
+
+	if (TheTerrainRenderObject->getShroud())
+	{
+		//do second pass to apply the shroud on water plane
+		W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
+		W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 0);
+		m_pDev->SetStreamSource(0,m_vertexBufferD3D,sizeof(WaterRenderObjClass::SEA_PATCH_VERTEX));
+		m_pDev->SetIndices(m_indexBufferD3D,0);
+		for (startY=patchY=(seaBox.Center.Y-seaBox.Extent.Y)/(PATCH_WIDTH*PATCH_SCALE); (patchY*PATCH_WIDTH*PATCH_SCALE)<(seaBox.Center.Y+seaBox.Extent.Y); patchY++)
+		{
+			for (startX=patchX=(seaBox.Center.X-seaBox.Extent.X)/(PATCH_WIDTH*PATCH_SCALE); (patchX*PATCH_WIDTH*PATCH_SCALE)<(seaBox.Center.X+seaBox.Extent.X); patchX++)
+			{
+				D3DXMATRIX matTemp;
+				patchMatrix._41=(float)(patchX*PATCH_WIDTH*PATCH_SCALE);
+				patchMatrix._43=(float)(patchY*PATCH_WIDTH*PATCH_SCALE);
+
+				D3DXMatrixMultiply(&matTemp, &patchMatrix, &matWW3D);
+
+				DX8Wrapper::_Set_DX8_Transform(D3DTS_WORLD, *(Matrix4x4*)&matTemp);
+
+				m_pDev->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,0,m_numVertices,0,m_numIndices);
+			}
+		}
+		W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
+	}
+
+}
+
+
+#define FEATHER_LAYER_COUNT (5.0f)
+#define FEATHER_THICKNESS   (4.0f)
+
+//-------------------------------------------------------------------------------------------------
+/** Renders (draws) the water surface.*/
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::renderWater(void)
+{
+	for (PolygonTrigger *pTrig=PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
+		if (pTrig->isWaterArea()) {
+			if (pTrig->getNumPoints()>2) {
+				if (pTrig->isRiver()) {
+					drawRiverWater(pTrig);
+					continue;
+				}
+				Int k;
+				for (k=1; k<pTrig->getNumPoints()-1; k=k+2) {
+					ICoord3D pt3 = *pTrig->getPoint(0);
+					ICoord3D pt2 = *pTrig->getPoint(k);
+					ICoord3D pt1 = *pTrig->getPoint(k+1);
+					ICoord3D pt0 = *pTrig->getPoint(k+1);
+					if (k+2<pTrig->getNumPoints()) {
+						pt0 = *pTrig->getPoint(k+2);
+					}
+					Vector3 points[4];
+					points[0].Set(pt0.x, pt0.y, pt0.z);
+					points[1].Set(pt1.x, pt1.y, pt1.z);
+					points[2].Set(pt2.x, pt2.y, pt2.z);
+					points[3].Set(pt3.x, pt3.y, pt3.z);
+
+					if ( TheGlobalData->m_featherWater )
+					{
+						for (int r = 0; r < TheGlobalData->m_featherWater; ++r)
+						{
+							drawTrapezoidWater(points);
+							points[0].Z += (FEATHER_THICKNESS/TheGlobalData->m_featherWater);
+						}
+					}
+
+					else
+						drawTrapezoidWater(points);
+
+
+				}
+			}
+		}
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Renders (draws) the sky plane.  Will apply current time-of-day settings including
+	* some simple UV scrolling animation. */
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::renderSky(void)
+{
+	Int timeNow,timeDiff;
+	Real fu,fv;
+
+	Setting *setting=&m_settings[m_tod];
+
+	timeNow=timeGetTime();
+
+	timeDiff=timeNow-m_LastUpdateTime;
+	m_LastUpdateTime=timeNow;
+
+	m_uOffset += timeDiff * setting->uScrollPerMs * setting->skyTexelsPerUnit;
+	m_vOffset += timeDiff * setting->vScrollPerMs * setting->skyTexelsPerUnit;
+
+	//clamp uv coordinate into 0,1 range
+	m_uOffset = m_uOffset - (Real)((Int) m_uOffset);
+	m_vOffset = m_vOffset - (Real)((Int) m_vOffset);
+
+	fu= m_uOffset + (SKYPLANE_SIZE * 2) * setting->skyTexelsPerUnit;
+	fv= m_vOffset + (SKYPLANE_SIZE * 2) * setting->skyTexelsPerUnit;
+
+
+	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+	DX8Wrapper::Set_Material(vmat);
+	REF_PTR_RELEASE(vmat);
+
+	ShaderClass m_shader2=ShaderClass::_PresetOpaqueShader;
+	m_shader2.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);
+	m_shader2.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);	//no need to check against z-buffer, sky always rendered first.
+	m_shader2.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);	//sky is always behind everything so no need to update z-buffer
+
+	DX8Wrapper::Set_Shader(m_shader2);
+
+	DX8Wrapper::Set_Texture(0,setting->skyTexture);
+
+	//draw an infinite sky plane
+	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,4);
+	{
+		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
+		VertexFormatXYZNDUV2* verts=lock.Get_Formatted_Vertex_Array();
+		if(verts)
+		{
+			verts[0].x=-SKYPLANE_SIZE;
+			verts[0].y=SKYPLANE_SIZE;
+			verts[0].z=SKYPLANE_HEIGHT;
+			verts[0].u1=m_uOffset;
+			verts[0].v1=fv;
+			verts[0].diffuse=setting->vertex01Diffuse;
+
+			verts[1].x=SKYPLANE_SIZE;
+			verts[1].y=SKYPLANE_SIZE;
+			verts[1].z=SKYPLANE_HEIGHT;
+			verts[1].u1=fu;
+			verts[1].v1=fv;
+			verts[1].diffuse=setting->vertex11Diffuse;
+
+			verts[2].x=SKYPLANE_SIZE;
+			verts[2].y=-SKYPLANE_SIZE;
+			verts[2].z=SKYPLANE_HEIGHT;
+			verts[2].u1=fu;
+			verts[2].v1=m_vOffset;
+			verts[2].diffuse=setting->vertex10Diffuse;
+
+			verts[3].x=-SKYPLANE_SIZE;
+			verts[3].y=-SKYPLANE_SIZE;
+			verts[3].z=SKYPLANE_HEIGHT;
+			verts[3].u1=m_uOffset;
+			verts[3].v1=m_vOffset;
+			verts[3].diffuse=setting->vertex00Diffuse;
+		}
+	}
+
+	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
+	DX8Wrapper::Set_Vertex_Buffer(vb_access);
+
+	Matrix3D tm(1);
+	tm.Set_Translation(Vector3(0,0,0));
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
+
+	DX8Wrapper::Draw_Triangles(	0,2, 0,	4);	//draw a quad, 2 triangles, 4 verts
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Renders (draws) the sky body.  Used for moon and sun.  We rotate the image
+	* so that it always faces the camera.  This removes perspective and helps hide that
+	* it's a flat image. */
+//-------------------------------------------------------------------------------------------------
+///	@todo: Add code to render properly sorted sun sky body.
+void WaterRenderObjClass::renderSkyBody(Matrix3D *mat)
+{
+	Vector3 cPos;
+
+	Vector3 pView,pRight,pUp,pPos(SKYBODY_X,SKYBODY_Y,SKYBODY_HEIGHT);
+
+	mat->Get_Translation(&cPos);
+
+	pView=cPos-pPos;	//billboard to camera
+	pView.Normalize();	//particle view direction
+
+	Vector3 WorldUp(0,0,-1);	///@todo: hacked so only works for reflections across xy plane
+
+#ifdef ALLOW_TEMPORARIES
+	Vector3 rotAxis=Vector3::Cross_Product(WorldUp,pView);	//get axis of rotation.
+	rotAxis.Normalize();
+#else
+	Vector3 rotAxis;
+	Vector3::Normalized_Cross_Product(WorldUp, pView, &rotAxis);
+#endif
+
+	Real angle=Vector3::Dot_Product(WorldUp,pView);
+
+	angle = acos(angle);
+
+
+	Matrix3D tm(1);
+	tm.Set(rotAxis,angle);
+	tm.Adjust_Translation(Vector3(SKYBODY_X,SKYBODY_Y,SKYBODY_HEIGHT));
+
+
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
+
+
+	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+	DX8Wrapper::Set_Material(vmat);
+	REF_PTR_RELEASE(vmat);
+
+	ShaderClass m_shader2=ShaderClass::_PresetAlphaShader;
+	m_shader2.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);
+	m_shader2.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);	//no need to check against z-buffer, sky always rendered first.
+	m_shader2.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);	//sky is always behind everything so no need to update z-buffer
+
+	DX8Wrapper::Set_Shader(m_shader2);
+
+
+//	DX8Wrapper::Set_Shader(ShaderClass::/*_PresetAdditiveShader*//*_PresetOpaqueShader*/_PresetAlphaShader);
+//	DX8Wrapper::Set_Texture(0,setting->skyBodyTexture);
+
+	DX8Wrapper::Set_Texture(0,m_alphaClippingTexture);
+
+	//draw an infinite sky plane
+	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,4);
+	{
+		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
+		VertexFormatXYZNDUV2* verts=lock.Get_Formatted_Vertex_Array();
+		if(verts)
+		{
+			verts[0].x=-SKYBODY_SIZE;
+			verts[0].y=SKYBODY_SIZE;
+			verts[0].z=0;
+			verts[0].u2=0;
+			verts[0].v2=1;
+			verts[0].diffuse=0xffffffff;
+
+			verts[1].x=SKYBODY_SIZE;
+			verts[1].y=SKYBODY_SIZE;
+			verts[1].z=0;
+			verts[1].u2=1;
+			verts[1].v2=1;
+			verts[1].diffuse=0xffffffff;
+
+			verts[2].x=SKYBODY_SIZE;
+			verts[2].y=-SKYBODY_SIZE;
+			verts[2].z=0;
+			verts[2].u2=1;
+			verts[2].v2=0;
+			verts[2].diffuse=0xffffffff;
+
+			verts[3].x=-SKYBODY_SIZE;
+			verts[3].y=-SKYBODY_SIZE;
+			verts[3].z=0;
+			verts[3].u2=0;
+			verts[3].v2=0;
+			verts[3].diffuse=0xffffffff;
+		}
+	}
+
+	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
+	DX8Wrapper::Set_Vertex_Buffer(vb_access);
+
+	DX8Wrapper::Draw_Triangles(	0,2, 0,	4);	//draw a quad, 2 triangles, 4 verts
+}
+
+//Defines for procedural water animation.
+#define WATER_FREQ	(2.0*3.2831/4.0)	//2pi (full cycle) cover 4 units
+#define WATER_AMP	(1.0f)
+#define	WATER_OFFSET (0.1f)
+
+//-------------------------------------------------------------------------------------------------
+/** Renders (draws) the water surface mesh geometry.
+	*	This is a work-in-progress!  Do not use this code! */
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::renderWaterMesh(void)
+{
+
+	if (!m_doWaterGrid)
+		return;	//the water grid is disabled.
+
+	//According to Nvidia there's a D3D bug that happens if you don't start with a
+	//new dynamic VB each frame - so we force a DISCARD by overflowing the counter.
+	m_vertexBufferD3DOffset = 0xffff;
+
+	Setting *setting=&m_settings[m_tod];
+
+	WaterMeshData *pData;
+	Int	mx=m_gridCellsX+1;
+	Int my=m_gridCellsY+1;
+	Int i,j;
+
+	Real cellSizeX=m_gridCellSize;
+	Real cellSizeY=m_gridCellSize;
+//	Real	uScale2=5.0f*setting->waterRepeatCount/(128.0f)*cellSizeX/10.0f;
+//	Real	vScale2=5.0f*setting->waterRepeatCount/(128.0f)*cellSizeY/10.0f;
+
+	//Old waterRepeatCount settings in INI were based on 128x128 water grid of cellsize=10
+	//Scale values to correct size.
+	Real	uScale=setting->waterRepeatCount/(128.0f)*cellSizeX/10.0f*0.2f;
+	Real	vScale=setting->waterRepeatCount/(128.0f)*cellSizeY/10.0f*0.2f;
+
+	Vector3	nx(cellSizeX*2.0f,0,0);
+	Vector3 ny(0,cellSizeY*2.0f,0);
+	Vector3 C;
+
+#ifdef DO_WATER_SIMULATION		//Debug code used to create a dummy water animation
+	//
+	// Mark: If you re-enable this water simulation, you might want to consider moving
+	// this code to the update() method of the water render object (Colin)
+	//
+
+	static Real PhasePerFrameX=0.1f;
+	static Real PhasePerFrameY=0.1f;
+
+	//update the mesh heights for this frame (update buffer is 2 samples wider/taller due to border)
+	for (j=0,pData=m_meshData; j<(my+2); j++)
+	{
+		for (i=0; i<(mx+2); i++)
+		{
+			//*pData = WATER_AMP * sin(WATER_FREQ*(0.7f*i + 0.7f*j) - PhasePerFrame);
+
+			pData->height=WATER_OFFSET+WATER_AMP*(sin((float)i*WATER_FREQ*0.4+PhasePerFrameX*0.5)+sin((float)i*WATER_FREQ*0.6+PhasePerFrameX*0.2)+sin((float)j*WATER_FREQ+PhasePerFrameX)+sin((float)j*WATER_FREQ*0.7+PhasePerFrameX*0.3));
+//			*pData=WATER_OFFSET+WATER_AMP*(sin((float)i*WATER_FREQ*0.4+PhasePerFrameX*0.5)+sin((float)i*WATER_FREQ*0.6+PhasePerFrameX*0.2)+sin((float)j*WATER_FREQ+PhasePerFrameX)+sin((float)j*WATER_FREQ*0.7+PhasePerFrameX*0.3));
+			pData++;
+		}
+	}
+
+	PhasePerFrameX -= 0.08f;
+	PhasePerFrameY -= 0.1f;
+#endif
+
+	MaterMeshVertexFormat *vb;
+	if (m_vertexBufferD3DOffset < m_numVertices)
+	{	//we have room in current VB, append new verts
+		if(m_vertexBufferD3D->Lock(m_vertexBufferD3DOffset*sizeof(MaterMeshVertexFormat),mx*my*sizeof(MaterMeshVertexFormat),(unsigned char**)&vb,D3DLOCK_NOOVERWRITE) != D3D_OK)
+			return;
+	}
+	else
+	{	//ran out of room in last VB, request a substitute VB.
+		if(m_vertexBufferD3D->Lock(0,mx*my*sizeof(MaterMeshVertexFormat),(unsigned char**)&vb,D3DLOCK_DISCARD) != D3D_OK)
+			return;
+		m_vertexBufferD3DOffset=0;	//reset start of page to first vertex
+	}
+	Int diffuse;
+	diffuse = setting->waterDiffuse&0x00ffffff;
+	Int alpha = (setting->waterDiffuse & 0xff000000)>>24;
+	// Reduce alpha for wave mesh
+	alpha -= 0x20;
+	diffuse |= alpha<<24;
+
+	//I pulled some of these constants out of the loops for speed:
+	Real uvCosScale=0.02*cos(3*m_riverVOrigin);
+	Real sinOffset=25*m_riverVOrigin;
+	Real originScale=m_riverVOrigin/vScale;
+	Real bumpSizeDiv=cellSizeY/BUMP_SIZE;
+	Real bumpSizeDiv2=0.3f*cellSizeY/BUMP_SIZE;
+
+	//Data has a 1 vertex padding all around it so we don't need to special-case edges.  Improves performance
+	for (j=0,pData=m_meshData+mx+2+1; j<my; j++,pData+=2)	//skip 2 horizontal border samples after each row
+	{
+		Real y=(float)j*cellSizeY;
+		Real v1Offset=m_riverVOrigin+(float)j*vScale + uvCosScale*WWMath::Fast_Sin(sinOffset+y*PI/(8*MAP_XY_FACTOR));
+		Real v2Offset=((float)j+originScale)*bumpSizeDiv + (float)j*bumpSizeDiv2;
+
+		for (i=0; i<mx; i++)
+		{
+			//compute normal by looking at 4 vertex neightbors
+#ifdef USE_MESH_NORMALS
+			nx.Z=(pData+1)->height - (pData-1)->height;
+			ny.Z=(pData+mx+2)->height - (pData-mx-2)->height;
+//			nx.Z=*(pData+1)-*(pData-1);
+//			ny.Z=*(pData+mx+2)-*(pData-mx-2);
+			Vector3::Cross_Product(nx,ny,&C);
+			C.Normalize();
+			vb->nx = C.X;
+			vb->ny = C.X;
+			vb->nz = C.X;
+#endif
+			Real x = (float)i*cellSizeX;
+			vb->x=	x;
+			vb->y=	y;
+			vb->z=  pData->height;//WATER_OFFSET+WATER_AMP*(sin((float)i*WATER_FREQ+PhasePerFrame)+cos((float)j*WATER_FREQ+PhasePerFrame));
+
+			vb->diffuse = diffuse;
+#ifdef SCROLL_UV
+//			vb->diffuse=0x80ffffff;
+			vb->u1=(float)i*uScale;
+			vb->v1=v1Offset;
+
+			//old slow version
+			//vb->v1=m_riverVOrigin+(float)j*vScale + 0.02*cos(3*m_riverVOrigin)*sin(25*m_riverVOrigin+y*PI/(8*MAP_XY_FACTOR));
+
+//			vb->u2=m_initialGridU2+(float)i*uScale2;
+//			vb->v2=m_initialGridV2+(float)j*vScale2;
+#else
+			vb->u1=(float)i*uScale;
+			vb->v1=(float)j*vScale;
+#endif
+			vb->u2=(float)(i)*cellSizeX/BUMP_SIZE;
+			vb->v2=v2Offset;
+			//old slow code
+			//vb->v2=(float)(j+m_riverVOrigin/vScale )*cellSizeY/BUMP_SIZE+ 0.3f*(float)j*cellSizeY/BUMP_SIZE;
+			vb++;
+			pData++;
+		}
+	}
+
+	m_vertexBufferD3D->Unlock();
+
+	Matrix3D tm(Transform);
+
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
+	DX8Wrapper::Set_Material(m_meshVertexMaterialClass);
+
+	ShaderClass::CullModeType oldCullMode=m_shaderClass.Get_Cull_Mode();
+
+	ShaderClass::DepthMaskType oldDepthMask=m_shaderClass.Get_Depth_Mask();
+	m_shaderClass.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);	//disable writing to z-buffer to prevent particle clipping.
+
+	m_shaderClass.Set_Cull_Mode(ShaderClass::CULL_MODE_ENABLE);	//water should be visible from both sides
+
+	DX8Wrapper::Set_Shader(m_shaderClass);
+#if 1
+	setupFlatWaterShader();
+#else
+	//DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
+	DX8Wrapper::Set_Texture(0,setting->waterTexture);
+	DX8Wrapper::Set_Texture(1,setting->waterTexture);
+
+	DX8Wrapper::Set_Light(0,*m_meshLight);
+	DX8Wrapper::Set_Light(1,NULL);
+	DX8Wrapper::Set_Light(2,NULL);
+	DX8Wrapper::Set_Light(3,NULL);
+/*
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_AMBIENT,0);	//turn off scene ambient
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_SPECULARENABLE,TRUE);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_LOCALVIEWER,TRUE);
+*/
+
+	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+#endif
+
+
+//	m_pDev->SetRenderState(D3DRS_ZFUNC,D3DCMP_ALWAYS);	//used to display grid under map.
+
+	m_pDev->SetIndices(m_indexBufferD3D,m_vertexBufferD3DOffset);
+	m_pDev->SetStreamSource(0,m_vertexBufferD3D,sizeof(MaterMeshVertexFormat));
+	m_pDev->SetVertexShader(WATER_MESH_FVF);
+
+
+	if (TheTerrainRenderObject->getShroud() && !m_trapezoidWaterPixelShader)
+	{	//we have a shroud to apply and can't do it inside the pixel shader.
+		//so do it in stage1
+		W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
+		W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 1);
+
+		//modulate with shroud texture
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );	//stage 1 texture
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );	//previous stage texture
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
+
+		//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
+		//write to the zbuffer.  Change to LESSEQUAL.
+		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
+		m_pDev->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,0,mx*my,0,m_numIndices-2);
+		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
+		W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
+	}
+	else
+		m_pDev->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,0,mx*my,0,m_numIndices-2);
+
+	Debug_Statistics::Record_DX8_Polys_And_Vertices(m_numIndices-2,mx*my,ShaderClass::_PresetOpaqueShader);
+
+//	m_pDev->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
+
+	if (m_trapezoidWaterPixelShader) DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(NULL);
+
+	m_vertexBufferD3DOffset += mx*my;	//advance past vertices already in buffer
+
+	DX8Wrapper::Set_Texture(0,NULL);
+	DX8Wrapper::Set_Texture(1,NULL);
+	ShaderClass::Invalidate();
+	m_shaderClass.Set_Cull_Mode(oldCullMode);	//water should be visible from both sides
+
+	// restore shader to old mask
+	m_shaderClass.Set_Depth_Mask(oldDepthMask);
+
+	//W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
+
+}
+
+inline void WaterRenderObjClass::setGridVertexHeight(Int x, Int y, Real value)
+{
+	DEBUG_ASSERTCRASH( x < (m_gridCellsX+1) && y < (m_gridCellsY+1), ("Invalid Water Mesh Coordinates") );
+
+	if (m_meshData)
+	{
+		m_meshData[(y+1)*(m_gridCellsX+1+2)+x+1].height = value;
+	}
+}
+
+void WaterRenderObjClass::setGridHeightClamps(Real minz, Real maxz)
+{
+	m_minGridHeight = minz;
+	m_maxGridHeight = maxz;
+}
+
+void WaterRenderObjClass::addVelocity( Real worldX, Real worldY,
+																			 Real zVelocity, Real preferredHeight )
+{
+
+	if( m_doWaterGrid)
+	{
+		Real gx,gy;
+		Real minX,maxX,minY,maxY;
+		Int x,y;
+		WaterMeshData *meshPoint;
+		m_disableRiver = true;
+
+		//check if center falls within grid bounds
+		if (worldToGridSpace(worldX, worldY, gx, gy))
+		{
+
+			//find extents of influence
+			minX = floorf(gx - m_gridChangeMaxRange);
+			if (minX < 0 )
+				minX = 0;	//clamp extent to fall within box
+			maxX = ceilf(gx + m_gridChangeMaxRange);
+			if (maxX > m_gridCellsX)
+				maxX = m_gridCellsX;	//clamp extent to fall within box
+
+			minY = floorf(gy - m_gridChangeMaxRange);
+			if (minY < 0 )
+				minY = 0;	//clamp extent to fall within box
+			maxY = ceilf(gy + m_gridChangeMaxRange);
+			if (maxY > m_gridCellsY)
+				maxY = m_gridCellsY;	//clamp extent to fall within box
+
+			for (y=minY; y<=maxY; y++)
+			{
+				for (x=minX; x<=maxX; x++)
+				{
+
+					// get the mesh point that we're concerned with
+					meshPoint = &m_meshData[ (y + 1) * (m_gridCellsX + 1 + 2) + x + 1 ];
+
+					// we now have a new preferred height
+					meshPoint->preferredHeight = preferredHeight;
+
+					//
+					// set the velocity of this point based on the distance from the center of the
+					// "core" point for this call
+					//
+					meshPoint->velocity = meshPoint->velocity + zVelocity;
+
+					// this point is now "in motion"
+					BitSet( meshPoint->status, WaterRenderObjClass::IN_MOTION );
+
+				}
+			}
+
+			//
+			// the mesh data is now dirty, we need to pass through the velocity field
+			// during an update phase to update the positions
+			//
+			m_meshInMotion = TRUE;
+
+		}
+
+	}
+
+}
+
+void WaterRenderObjClass::changeGridHeight(Real wx, Real wy, Real delta)
+{
+	Real gx,gy;
+	Real *oldData;
+	Real newData;
+	Real distance;
+	Real minX,maxX,minY,maxY;
+	Int x,y;
+
+	//check if center falls within grid bounds
+	if (worldToGridSpace(wx, wy, gx, gy))
+	{	//find extents of influence
+		minX = floorf(gx - m_gridChangeMaxRange);
+		if (minX < 0 )
+			minX = 0;	//clamp extent to fall within box
+		maxX = ceilf(gx + m_gridChangeMaxRange);
+		if (maxX > m_gridCellsX)
+			maxX = m_gridCellsX;	//clamp extent to fall within box
+
+		minY = floorf(gy - m_gridChangeMaxRange);
+		if (minY < 0 )
+			minY = 0;	//clamp extent to fall within box
+		maxY = ceilf(gy + m_gridChangeMaxRange);
+		if (maxY > m_gridCellsY)
+			maxY = m_gridCellsY;	//clamp extent to fall within box
+
+		for (y=minY; y<=maxY; y++)
+		{
+			for (x=minX; x<=maxX; x++)
+			{	oldData = &m_meshData[(y+1)*(m_gridCellsX+1+2)+x+1].height;
+				distance = (gx - (Real)x)*(gx - (Real)x) + (gy - (Real)y)*(gy - (Real)y);
+				distance = sqrt(distance);
+				newData = *oldData + 1.0f/(m_gridChangeAtt0+m_gridChangeAtt1*distance+distance*distance*m_gridChangeAtt2)*delta;
+				//Clamp to min/max values
+				if (newData < m_minGridHeight)
+					newData = m_minGridHeight;
+				if (newData > m_maxGridHeight)
+					newData = m_maxGridHeight;
+				*oldData = newData;
+			}
+		}
+	}
+}
+
+void WaterRenderObjClass::setGridChangeAttenuationFactors(Real a, Real b, Real c, Real range)
+{
+	m_gridChangeAtt0 = a;
+	m_gridChangeAtt1 = b;
+	m_gridChangeAtt2 = c;
+	m_gridChangeMaxRange = range/m_gridCellSize;	//convert range to grid space
+}
+
+void WaterRenderObjClass::setGridTransform(Real angle, Real x, Real y, Real z)
+{
+	m_gridDirectionX = Vector2(1.0f,0.0f);
+
+	m_gridOrigin.X = x;
+	m_gridOrigin.Y = y;
+
+	Matrix3D xform(1);
+	xform.Rotate_Z(angle);
+
+	m_gridDirectionX.X = xform.Get_X_Vector().X;
+	m_gridDirectionX.Y = xform.Get_X_Vector().Y;
+
+	m_gridDirectionY.X = xform.Get_Y_Vector().X;
+	m_gridDirectionY.Y = xform.Get_Y_Vector().Y;
+
+	xform.Set_Translation(Vector3(x,y,z));
+	Set_Transform(xform);
+}
+
+void WaterRenderObjClass::setGridTransform(const Matrix3D *transform )
+{
+
+	if( transform )
+		Set_Transform( *transform );
+
+}
+
+void WaterRenderObjClass::getGridTransform(Matrix3D *transform )
+{
+
+	if( transform )
+		*transform = Get_Transform();
+
+}
+
+void WaterRenderObjClass::setGridResolution(Real gridCellsX, Real gridCellsY, Real cellSize)
+{
+	m_gridCellSize=cellSize;
+
+	if (m_gridCellsX != gridCellsX || m_gridCellsY != gridCellsY)
+	{	//resolution has changed
+		m_gridCellsX=gridCellsX;
+		m_gridCellsY=gridCellsY;
+
+		if (m_meshData)
+		{
+
+			delete [] m_meshData;//free previously allocated grid and allocate new size
+			m_meshData = NULL;	 // must set to NULL so that we properly re-allocate
+			m_meshDataSize = 0;
+
+			Bool enable = m_doWaterGrid;
+			enableWaterGrid(true);	// allocates buffers.
+			m_doWaterGrid = enable;
+
+		}
+	}
+}
+
+void WaterRenderObjClass::getGridResolution( Real *gridCellsX, Real *gridCellsY, Real *cellSize )
+{
+
+	if( gridCellsX )
+		*gridCellsX = m_gridCellsX;
+	if( gridCellsY )
+		*gridCellsY = m_gridCellsY;
+	if( cellSize )
+		*cellSize = m_gridCellSize;
+
+}
+
+static Real wobble(Real baseV, Real offset, Bool wobble)
+{
+	if (!wobble) return 0;
+	offset = sin(2*PI*baseV - 3*offset);
+	return offset/22;
+}
+
+/**Utility function used to query water heights in a manner that works in both RTS and WB.*/
+Real WaterRenderObjClass::getWaterHeight(Real x, Real y)
+{
+	const WaterHandle *waterHandle = NULL;
+	Real waterZ = 0.0f;
+	ICoord3D iLoc;
+
+	iLoc.x = REAL_TO_INT_FLOOR( x + 0.5f );
+	iLoc.y = REAL_TO_INT_FLOOR( y + 0.5f );
+	iLoc.z = 0;
+
+	for( PolygonTrigger *pTrig = PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext() )
+	{
+
+		if( !pTrig->isWaterArea() )
+			continue;
+
+		// See if point is in a water area
+		if( pTrig->pointInTrigger( iLoc ) )
+		{
+
+			if( pTrig->getPoint( 0 )->z >= waterZ )
+			{
+
+				waterZ = pTrig->getPoint( 0 )->z;
+				waterHandle = pTrig->getWaterHandle();
+
+			}
+
+		}
+
+	}
+
+	if (waterHandle)
+		return waterHandle->m_polygon->getPoint( 0 )->z;
+	return INVALID_WATER_HEIGHT;	//point not underwater
+}
+
+//-------------------------------------------------------------------------------------------------
+//Draw a many sided river polygon.
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::drawRiverWater(PolygonTrigger *pTrig)
+{
+	DX8Wrapper::Invalidate_Cached_Render_States();	///@todo: Figure out why rivers don't draw without reset of all states.
+
+	Int rectangleCount = pTrig->getNumPoints()/2;
+	rectangleCount--;
+
+	Real bumpFactor = 5;
+	static Bool doWobble = true;
+
+	if (m_disableRiver) return;
+	m_drawingRiver = true;
+
+	//allocate 2 triangles per side with 3 indices per triangle
+	DynamicIBAccessClass ib_access(BUFFER_TYPE_DYNAMIC_DX8,(rectangleCount+1)*2*3);
+	{
+		DynamicIBAccessClass::WriteLockClass lockib(&ib_access);
+ 		UnsignedShort *curIb = lockib.Get_Index_Array();
+		for (Int i=0; i<rectangleCount; i++)
+		{
+			//triangle 1
+			curIb[0] = i*2;
+			curIb[1] = i*2+1;
+			curIb[2] = i*2+3;
+
+			//triangle 2
+			curIb[3] = i*2;
+			curIb[4] = i*2+3;
+			curIb[5] = i*2+2;
+
+			curIb += 6;	//skip the 6 indices we just added.
+		}
+	}
+
+
+	Real shadeR=TheWaterTransparency->m_standingWaterColor.red;
+	Real shadeG=TheWaterTransparency->m_standingWaterColor.green;
+	Real shadeB=TheWaterTransparency->m_standingWaterColor.blue;
+
+	//If the water color is not overridden, use legacy lighting code.
+	if ( shadeR==1.0f && shadeG==1.0f && shadeB==1.0f)
+	{
+		shadeR = TheGlobalData->m_terrainAmbient[0].red;
+		shadeG = TheGlobalData->m_terrainAmbient[0].green;
+		shadeB = TheGlobalData->m_terrainAmbient[0].blue;
+
+		//Add in diffuse lighting from each terrain light
+		for (Int lightIndex=0; lightIndex < TheGlobalData->m_numGlobalLights; lightIndex++)
+		{
+			if (-TheGlobalData->m_terrainLightPos[lightIndex].z > 0)
+			{	shadeR += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].red;
+				shadeG += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].green;
+				shadeB += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].blue;
+			}
+		}
+
+		//Get water material colors
+		Real waterShadeR = (m_settings[m_tod].waterDiffuse & 0xff) / 255.0f;
+		Real waterShadeG = ((m_settings[m_tod].waterDiffuse >> 8) & 0xff) / 255.0f;
+		Real waterShadeB = ((m_settings[m_tod].waterDiffuse >> 16) & 0xff) / 255.0f;
+
+		shadeR=shadeR*waterShadeR*255.0f;
+		shadeG=shadeG*waterShadeG*255.0f;
+		shadeB=shadeB*waterShadeB*255.0f;
+	}
+	else
+	{
+		shadeR=shadeR*255.0f;
+		shadeG=shadeG*255.0f;
+		shadeB=shadeB*255.0f;
+
+		if (shadeR == 0 && shadeG == 0 && shadeB == 0)
+		{	//special case where we disable lighting
+			shadeR=255;
+			shadeG=255;
+			shadeB=255;
+		}
+	}
+
+	Int diffuse=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16);
+
+	//Keep diffuse from lighting calculations but substitute custom alpha
+	diffuse |= m_settings[m_tod].waterDiffuse & 0xff000000;	//copy alpha/opacity from ini setting
+
+	Int innerNdx = pTrig->getRiverStart();
+	Int outerNdx = innerNdx+1;
+
+	Real endLen=0;
+	Real totalLen=0;
+	Int i;
+	for (i=0; i<pTrig->getNumPoints()-1; i++) {
+		ICoord3D innerPt = *pTrig->getPoint(i);
+		ICoord3D outerPt = *pTrig->getPoint(i+1);
+		Real dx = innerPt.x-outerPt.x;
+		Real dy = innerPt.y-outerPt.y;
+		Real curLen = sqrt(dx*dx+dy*dy);
+		totalLen += curLen;
+		if ( i==innerNdx) {
+			endLen = curLen;
+		}
+	}
+	bumpFactor = endLen/BUMP_SIZE;
+
+	Real lengthOfRiver = (totalLen/2)-endLen;
+	Real repeatCount = lengthOfRiver / (endLen);
+
+	Real vScale=(Real)repeatCount/(Real)rectangleCount;
+
+#define HEIGHT_TO_USE (0.5f)
+	if (innerNdx >= pTrig->getNumPoints()-1) return;
+	//allocate 2 vertices per side
+	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,(rectangleCount+1)*2);
+	{
+		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
+		VertexFormatXYZNDUV2* vb=lock.Get_Formatted_Vertex_Array();
+
+		Real constA=3*m_riverVOrigin;
+
+		for (i=0; i<(pTrig->getNumPoints()/2); i++)
+		{
+			Real x,y;
+			ICoord3D innerPt = *pTrig->getPoint(outerNdx);
+			ICoord3D outerPt = *pTrig->getPoint(innerNdx);
+			outerNdx++;
+			innerNdx--;
+			if (innerNdx<0) {
+				innerNdx = pTrig->getNumPoints()-1;
+			}
+			if (outerNdx >= pTrig->getNumPoints()) {
+				outerNdx = 0;
+			}
+			x=innerPt.x;
+			y=innerPt.y;
+
+			vb->x=x;
+			vb->y=y;
+
+			vb->z=innerPt.z;
+			vb->diffuse= diffuse;
+
+			Real wobbleConst=-m_riverVOrigin+vScale*(Real)i + WWMath::Fast_Sin(2*PI*(vScale*(Real)i) - constA)/22.0f;
+ 			//old slower version
+			//vb->v1=-m_riverVOrigin+vScale*(Real)i + wobble(vScale*i, m_riverVOrigin, doWobble);
+			vb->v1=wobbleConst;
+			vb->u1=HEIGHT_TO_USE ;
+			//old slower version
+			//vb->v2 = -m_riverVOrigin+vScale*(Real)i + wobble(vScale*i, m_riverVOrigin, doWobble);
+			vb->v2=wobbleConst;
+			vb->u2 = 1.0f;
+			vb->nx = 0;
+			vb->ny = 0;
+			vb->nz = 1.0f;
+			vb++;
+
+			x=outerPt.x;
+			y=outerPt.y;
+
+			vb->x=x;
+			vb->y=y;
+			vb->z=outerPt.z;
+			vb->diffuse= diffuse;
+ 			//old slower version
+			//vb->v1=-m_riverVOrigin+vScale*(Real)i + wobble(vScale*i, m_riverVOrigin, doWobble);
+			vb->v1=wobbleConst;
+			vb->u1=0;
+			//old slower version
+ 			//vb->v2 = -m_riverVOrigin+vScale*(Real)i + wobble(vScale*i, m_riverVOrigin, doWobble);
+			vb->v2 =wobbleConst;
+			vb->u2 = 0;
+			vb->nx = 0;
+			vb->ny = 0;
+			vb->nz = 1.0f;
+			vb++;
+
+		}
+	}
+
+	Matrix3D tm(1);
+
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
+	DX8Wrapper::Set_Index_Buffer(ib_access,0);
+	DX8Wrapper::Set_Vertex_Buffer(vb_access);
+	DX8Wrapper::Set_Texture(0,m_riverTexture);	//set to blue
+
+	setupJbaWaterShader();
+
+	//In additive blending we need to use the alpha at the edges of river to darken
+	//rgb instead.
+	if (TheWaterTransparency->m_additiveBlend)
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA );
+
+	if (m_riverWaterPixelShader) DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_riverWaterPixelShader);
+ 	DWORD cull;
+	DX8Wrapper::_Get_D3D_Device8()->GetRenderState(D3DRS_CULLMODE, &cull);
+	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
+
+
+
+	if (wireframeForDebug) {
+		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_WIREFRAME);
+	}
+	DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);
+	if (wireframeForDebug) {
+		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
+	}
+
+	if (m_riverWaterPixelShader) DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(NULL);
+
+	//restore blend mode to what W3D expects.
+	if (TheWaterTransparency->m_additiveBlend)
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_ONE );
+
+	//do second pass to apply the shroud on water plane
+	if (TheTerrainRenderObject->getShroud())
+	{
+		W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
+		W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 0);
+		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
+		//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
+		//write to the zbuffer.  Change to LESSEQUAL.
+		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
+		DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);
+		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
+		W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
+	}
+	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, cull);
+
+
+}
+
+void WaterRenderObjClass::setupFlatWaterShader(void)
+{
+
+	DX8Wrapper::Set_Texture(0,m_riverTexture);
+	if (!TheWaterTransparency->m_additiveBlend)
+		DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaShader);
+	else
+		DX8Wrapper::Set_Shader(ShaderClass::_PresetAdditiveShader);
+
+	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+	DX8Wrapper::Set_Material(vmat);
+	REF_PTR_RELEASE(vmat);
+	m_riverTexture->Get_Filter().Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_BEST);
+	m_riverTexture->Get_Filter().Set_Min_Filter(TextureFilterClass::FILTER_TYPE_BEST);
+	m_riverTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_BEST);
+
+	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
+
+	//Setup shroud to render in same pass as water
+	if (m_trapezoidWaterPixelShader)
+	{	if (TheTerrainRenderObject->getShroud())
+		{
+			W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
+			//Use stage 3 to apply the shroud
+			W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 3);
+			//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
+			//write to the zbuffer.  Change to LESSEQUAL.
+			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
+		}
+		else
+		{	//Assume no shroud, so stage 3 will be "NULL" texture but using actual white because
+			//pixel shader on GF4 generates random colors with SetTexture(3,NULL).
+			if (!m_whiteTexture->Is_Initialized())
+			{	m_whiteTexture->Init();
+				SurfaceClass *surface=m_whiteTexture->Get_Surface_Level();
+				surface->DrawPixel(0,0,0xffffffff);
+				REF_PTR_RELEASE(surface);
+			}
+			DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,m_whiteTexture->Peek_D3D_Texture());
+		}
+	}
+
+	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_ADD );
+	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, 0);
+
+	Bool doSparkles = true;
+
+	if (m_trapezoidWaterPixelShader && doSparkles) {
+
+		if (!m_waterSparklesTexture->Is_Initialized())
+			m_waterSparklesTexture->Init();
+
+		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1,m_waterSparklesTexture->Peek_D3D_Texture());
+
+		if (!m_waterNoiseTexture->Is_Initialized())
+			m_waterNoiseTexture->Init();
+
+		DX8Wrapper::_Get_D3D_Device8()->SetTexture(2,m_waterNoiseTexture->Peek_D3D_Texture());
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
+		// Two output coordinates are used.
+		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+		D3DXMATRIX inv;
+		float det;
+
+		Matrix4x4 curView;
+		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
+		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+		D3DXMATRIX scale;
+
+		D3DXMatrixScaling(&scale, NOISE_REPEAT_FACTOR, NOISE_REPEAT_FACTOR,1);
+		D3DXMATRIX destMatrix = inv * scale;
+		D3DXMatrixTranslation(&scale, m_riverVOrigin, m_riverVOrigin,0);
+		destMatrix = destMatrix*scale;
+		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, *(Matrix4x4*)&destMatrix);
+
+	}
+	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 1, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 2, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
+	m_pDev->SetTextureStageState( 2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
+	if (m_trapezoidWaterPixelShader){
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(0,   D3DXVECTOR4(REFLECTION_FACTOR, REFLECTION_FACTOR, REFLECTION_FACTOR, 1.0f), 1);
+		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_trapezoidWaterPixelShader);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+//Draw a 4 sided flat water area.
+//-------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::drawTrapezoidWater(Vector3 points[4])
+{
+	Vector3 origin(points[0]);
+	Vector3 uVec1(points[1]);
+	Vector3 vVec1(points[3]);
+	Vector3 uVec2(points[2]);
+	Vector3 vVec2(points[2]);
+	uVec2 -= vVec1;
+	vVec2	-= uVec1;
+	uVec1 -= origin;
+	vVec1 -= origin;
+	Int uCount = (uVec1.Length()+uVec2.Length()) / (8*MAP_XY_FACTOR);
+	if (uCount<1) uCount = 1;
+	Int vCount = (vVec1.Length()+vVec2.Length()) / (8*MAP_XY_FACTOR);
+	if (vCount<1) vCount = 1;
+
+	if (uCount>50) uCount = 50;
+	if (vCount>50) vCount = 50;
+
+	static Bool doWobble = true;
+
+	Int rectangleCount = uCount*vCount;
+
+	uCount++;
+	vCount++;
+
+	Int i, j;
+	//allocate 2 triangles per side with 3 indices per triangle
+	DynamicIBAccessClass ib_access(BUFFER_TYPE_DYNAMIC_DX8,(rectangleCount+1)*2*3);
+	{
+		DynamicIBAccessClass::WriteLockClass lockib(&ib_access);
+ 		UnsignedShort *curIb = lockib.Get_Index_Array();
+		for (j=0; j<vCount-1; j++)
+		{	for (i=0; i<uCount-1; i++)
+			{
+				//triangle 1
+				curIb[0] = (j)*uCount + i;
+				curIb[1] = (j+1)*uCount + i+1;
+				curIb[2] = (j+1)*uCount + i;
+
+				//triangle 2
+				curIb[3] = (j)*uCount + i;
+				curIb[4] = (j)*uCount + i+1;
+				curIb[5] = (j+1)*uCount + i+1;
+
+				curIb += 6;	//skip the 6 indices we just added.
+			}
+		}
+	}
+
+	Real	waterFactor=150;
+	Real shadeR=TheWaterTransparency->m_standingWaterColor.red;
+	Real shadeG=TheWaterTransparency->m_standingWaterColor.green;
+	Real shadeB=TheWaterTransparency->m_standingWaterColor.blue;
+
+	//If the water color is not overridden, use legacy lighting code.
+	if ( shadeR==1.0f && shadeG==1.0f && shadeB==1.0f)
+	{
+		shadeR = TheGlobalData->m_terrainAmbient[0].red;
+		shadeG = TheGlobalData->m_terrainAmbient[0].green;
+		shadeB = TheGlobalData->m_terrainAmbient[0].blue;
+
+		//Add in diffuse lighting from each terrain light
+		for (Int lightIndex=0; lightIndex < TheGlobalData->m_numGlobalLights; lightIndex++)
+		{
+			if (-TheGlobalData->m_terrainLightPos[lightIndex].z > 0)
+			{	shadeR += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].red;
+				shadeG += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].green;
+				shadeB += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].blue;
+			}
+		}
+
+		//Get water material colors
+		Real waterShadeR = (m_settings[m_tod].waterDiffuse & 0xff) / 255.0f;
+		Real waterShadeG = ((m_settings[m_tod].waterDiffuse >> 8) & 0xff) / 255.0f;
+		Real waterShadeB = ((m_settings[m_tod].waterDiffuse >> 16) & 0xff) / 255.0f;
+
+		shadeR=shadeR*waterShadeR*255.0f;
+		shadeG=shadeG*waterShadeG*255.0f;
+		shadeB=shadeB*waterShadeB*255.0f;
+	}
+	else
+	{
+		shadeR=shadeR*255.0f;
+		shadeG=shadeG*255.0f;
+		shadeB=shadeB*255.0f;
+
+		if (shadeR == 0 && shadeG == 0 && shadeB == 0)
+		{	//special case where we disable lighting
+			shadeR=255;
+			shadeG=255;
+			shadeB=255;
+		}
+	}
+
+	Int diffuse=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16);
+
+	//Keep diffuse from lighting calculations but substitute custom alpha
+	diffuse |= m_settings[m_tod].waterDiffuse & 0xff000000;	//copy alpha/opacity from ini setting
+
+	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,(rectangleCount+1)*2);
+
+//#define WAVY_WATER
+//#define FEATHER_LAYER_COUNT (3) //LORENZEN
+//#define FEATHER_LAYER_THICKNESS (2.5f)
+//#define FEATHER_WATER
+
+//#ifdef WAVY_WATER // the NEW WATER a'la LORENZEN
+	if ( TheGlobalData->m_featherWater )
+	{
+
+		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
+		VertexFormatXYZNDUV2* vb=lock.Get_Formatted_Vertex_Array();
+
+		Real phase = 0;
+		Real mapCoeff = PI/(4*MAP_XY_FACTOR);
+		Real wave = 0;
+		Real amplitude = 0.5f;
+
+		//The first (high order) byte is the Alpha value for this patch
+		// It needs to be set proportional to the number of feather layers
+		// this comes from TheGlobalData->m_featherWater, which is a count of layers
+
+
+		Int Alpha = 0;
+		if ( TheGlobalData->m_featherWater == 5) Alpha = 80;
+		if ( TheGlobalData->m_featherWater == 4) Alpha = 110;
+		if ( TheGlobalData->m_featherWater == 3) Alpha = 140;
+		if ( TheGlobalData->m_featherWater == 2) Alpha = 200;
+		if ( TheGlobalData->m_featherWater == 1) Alpha = 255;
+
+		//Keep diffuse from lighting calculations but substitute custom alpha
+		Int customDiffuse = (diffuse & 0x00ffffff) | (Alpha<< 24);//(0x80 << 16)|(0x90 << 8)|0xa0;
+
+		for (j=0; j<vCount; j++)
+		{
+			Real dv = j;
+			dv /= (vCount-1);
+			for (i=0; i<uCount; i++)
+			{
+				Real du = i;
+				du /= (uCount-1);
+				Vector3 vertex = origin;
+				vertex += uVec1*du;
+				vertex += vVec1*dv;
+				vertex += (dv)*(du)*(vVec2-vVec1);
+
+				vb->x=vertex.X;
+				vb->y=vertex.Y;
+
+				// common to all the waving effects
+				phase = 25 * m_riverVOrigin + vertex.X * mapCoeff;
+				wave = (sin(phase) - 1.0f) * amplitude;
+
+				vb->z = (vertex.Z + wave);
+				vb->diffuse = customDiffuse;
+				vb->u1 = (vertex.X/waterFactor) + 0.02*cos(11*m_riverVOrigin)*wave;
+				vb->v1 = (vertex.Y/waterFactor) + 0.02*cos(5*m_riverVOrigin)*wave;
+				vb->u2 = vertex.X/BUMP_SIZE;
+				vb->v2 = vertex.Y/BUMP_SIZE + 0.3f*vertex.X/BUMP_SIZE;
+				vb->nx = 0;
+				vb->ny = 0;
+				vb->nz = 1.0f;
+				vb++;
+			}
+		}
+	}
+//#else // STILL THE OLD FLAT WATER
+	else
+
+	{
+		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
+		VertexFormatXYZNDUV2* vb=lock.Get_Formatted_Vertex_Array();
+
+		//Pulling some constants out of the inner loops to improve performance -MW
+		Real constA=0.02*cos(11*m_riverVOrigin);
+		Real constB=0.02*cos(5*m_riverVOrigin);
+		Real constC=25*m_riverVOrigin;
+		Real ooWaterFactor = 1.0f/waterFactor;
+		const Real constD=PI/(4*MAP_XY_FACTOR);
+		Real constE=1.0f/(Real)(vCount-1);
+		Real constF=1.0f/(Real)(uCount-1);
+
+		for (j=0; j<vCount; j++)
+		{
+			Real dv = (Real)j * constE;
+
+			for (i=0; i<uCount; i++)
+			{
+				Real du = (Real)i * constF;
+				Vector3 vertex = origin;
+				vertex += uVec1*du;
+				vertex += vVec1*dv;
+				vertex += (dv)*(du)*(vVec2-vVec1);
+
+				vb->x=vertex.X;
+				vb->y=vertex.Y;
+				vb->z=vertex.Z;
+
+				vb->diffuse= diffuse;
+				//Old slower version
+ 				//vb->u1=(vertex.X/waterFactor) + 0.02*cos(11*m_riverVOrigin)*sin(25*m_riverVOrigin+vertex.X*PI/(4*MAP_XY_FACTOR));
+ 				//vb->v1=(vertex.Y/waterFactor) + 0.02*cos(5*m_riverVOrigin)*sin(25*m_riverVOrigin+vertex.Y*PI/(4*MAP_XY_FACTOR));
+				vb->u1=vertex.X*ooWaterFactor + constA*WWMath::Fast_Sin(constC+vertex.X*constD);
+				vb->v1=vertex.Y*ooWaterFactor + constB*WWMath::Fast_Sin(constC+vertex.Y*constD);
+				vb->u2 = vertex.X/BUMP_SIZE;
+				//Old slower version
+ 				//vb->v2 = vertex.Y/BUMP_SIZE + 0.3f*vertex.X/BUMP_SIZE;
+				vb->v2 = (vertex.Y+0.3f*vertex.X)/BUMP_SIZE;
+				vb->nx = 0;
+				vb->ny = 0;
+				vb->nz = 1.0f;
+				vb++;
+			}
+		}
+	}
+
+//#endif // OLD VS NEW WATER
+
+
+
+	Matrix3D tm(1);
+
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
+	DX8Wrapper::Set_Index_Buffer(ib_access,0);
+	DX8Wrapper::Set_Vertex_Buffer(vb_access);
+
+	setupFlatWaterShader();// lorenzen sez use the alpha shader
+
+	//If video card supports it and it's enabled, feather the water edge using destination alpha
+	if (DX8Wrapper::getBackBufferFormat() == WW3D_FORMAT_A8R8G8B8 && TheGlobalData->m_showSoftWaterEdge && TheWaterTransparency->m_transparentWaterDepth !=0)
+	{		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_DESTALPHA );
+			if (!TheWaterTransparency->m_additiveBlend)
+				DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND, D3DBLEND_INVDESTALPHA );
+	}
+
+
+ 	DWORD cull;
+	DX8Wrapper::_Get_D3D_Device8()->GetRenderState(D3DRS_CULLMODE, &cull);
+	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
+
+
+
+//#ifdef FEATHER_WATER // the NEW WATER a'la LORENZEN
+
+//	int layer = 0;//LORENZEN
+//	for (layer = 0; layer < FEATHER_LAYER_COUNT; ++layer)//LORENZEN
+//#endif // FEATHER_WATER
+	{
+//#ifdef WAVY_WATER // the NEW WATER a'la LORENZEN
+
+		//increment the depth of the water's surface for every vert in the buffer
+//#ifdef  FEATHER_WATER
+//		VertexFormatXYZNDUV2 *vertBuf = vertexBufferStart;
+//		while (vertBuf < vertexBufferStart + vCount * uCount)
+//		{
+//			vertBuf->z *= FEATHER_LAYER_THICKNESS;
+//			++vertBuf;
+//		}
+//#endif // FEATHER_WATER
+//#endif //WAVY_WATER
+		DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);//lorenzen thinks this is where to itereate the soft shoreline effect
+	}
+
+
+
+
+	if (false) {
+		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_WIREFRAME);
+		m_pDev->SetRenderState(D3DRS_ALPHABLENDENABLE , false);
+		DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);
+		m_pDev->SetRenderState(D3DRS_ALPHABLENDENABLE , true);
+		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
+	}
+
+	if (m_riverWaterPixelShader) DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(NULL);
+	//Restore alpha blend to default values since we may have changed them to feather edges.
+	if (!TheWaterTransparency->m_additiveBlend)
+	{	DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA );
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA );
+	}
+	else
+	{
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_ONE );
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND, D3DBLEND_ONE );
+	}
+
+	if (TheTerrainRenderObject->getShroud())
+	{
+		if (m_trapezoidWaterPixelShader)
+		{	//shroud was applied in stage3 of main pass so just need to restore state here.
+			W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
+			DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,NULL);	//free possible reference to shroud texture
+			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
+		}
+		else
+		{	//do second pass to apply the shroud on water plane for cards that can't do it in main pass.
+			W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
+			W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 0);
+			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
+			//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
+			//write to the zbuffer.  Change to LESSEQUAL.
+			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
+			DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);
+			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
+			W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
+		}
+	}
+	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, cull);
+}
+
+
+
+//-------------------------------------------------------------------------------------------------
+//debug version where moon rotates with the camera	(always upright on screen)
+//-------------------------------------------------------------------------------------------------
+#if 0
+void WaterRenderObjClass::renderSkyBody(Matrix3D *mat)
+{
+	Vector3 vRight,vUp,V0,V1,V2,V3;
+
+	mat->Get_X_Vector(&vRight);
+	mat->Get_Y_Vector(&vUp);
+
+	//calculate offsets from quad center to each of the 4 corners
+	//	0-----1
+	//  |    /|
+	//  |  /  |
+	//	|/    |
+	//  3-----2
+	V0=-vRight+vUp;
+	V2=vRight+vUp;
+	V2=vRight-vUp;
+	V3=-vRight-vUp;
+
+	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+	DX8Wrapper::Set_Material(vmat);
+	REF_PTR_RELEASE(vmat);
+	DX8Wrapper::Set_Shader(ShaderClass::/*_PresetAdditiveShader*//*_PresetOpaqueShader*/_PresetAlphaShader);
+//	DX8Wrapper::Set_Texture(0,setting->skyBodyTexture);
+
+	DX8Wrapper::Set_Texture(0,m_alphaClippingTexture);
+
+	//draw an infinite sky plane
+	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,4);
+	{
+		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
+		VertexFormatXYZNDUV2* verts=lock.Get_Formatted_Vertex_Array();
+		if(verts)
+		{
+			verts[0].x=SKYBODY_SIZE*V0.X;
+			verts[0].y=SKYBODY_SIZE*V0.Y;
+			verts[0].z=SKYBODY_SIZE*V0.Z;
+			verts[0].u2=0;
+			verts[0].v2=1;
+			verts[0].diffuse=0xffffffff;
+
+			verts[1].x=SKYBODY_SIZE*V1.X;
+			verts[1].y=SKYBODY_SIZE*V1.Y;
+			verts[1].z=SKYBODY_SIZE*V1.Z;
+			verts[1].u2=1;
+			verts[1].v2=1;
+			verts[1].diffuse=0xffffffff;
+
+			verts[2].x=SKYBODY_SIZE*V2.X;
+			verts[2].y=SKYBODY_SIZE*V2.Y;
+			verts[2].z=SKYBODY_SIZE*V2.Z;
+			verts[2].u2=1;
+			verts[2].v2=0;
+			verts[2].diffuse=0xffffffff;
+
+			verts[3].x=SKYBODY_SIZE*V3.X;
+			verts[3].y=SKYBODY_SIZE*V3.Y;
+			verts[3].z=SKYBODY_SIZE*V3.Z;
+			verts[3].u2=0;
+			verts[3].v2=0;
+			verts[3].diffuse=0xffffffff;
+		}
+	}
+
+	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
+	DX8Wrapper::Set_Vertex_Buffer(vb_access);
+
+	Matrix3D tm(1);
+	//set postion of skybody in world
+//	tm.Set_Translation(Vector3(40,0,0));
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
+
+	DX8Wrapper::Draw_Triangles(	0,2, 0,	4);	//draw a quad, 2 triangles, 4 verts
+}
+#endif
+
+// ------------------------------------------------------------------------------------------------
+/** CRC */
+// ------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::crc( Xfer *xfer )
+{
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Xfer
+	* Version Info:
+	* 1: Initial version */
+// ------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::xfer( Xfer *xfer )
+{
+
+	// version
+	XferVersion currentVersion = 1;
+	XferVersion version = currentVersion;
+	xfer->xferVersion( &version, currentVersion );
+
+	// grid cells x
+	Int cellsX = m_gridCellsX;
+	xfer->xferInt( &cellsX );
+	if( cellsX != m_gridCellsX )
+	{
+
+		DEBUG_CRASH(( "WaterRenderObjClass::xfer - cells X mismatch" ));
+		throw SC_INVALID_DATA;
+
+	}
+
+	// grid cells Y
+	Int cellsY = m_gridCellsY;
+	xfer->xferInt( &cellsY );
+	if( cellsY != m_gridCellsY )
+	{
+
+		DEBUG_CRASH(( "WaterRenderObjClass::xfer - cells Y mismatch" ));
+		throw SC_INVALID_DATA;
+
+	}
+
+	// xfer each of the mesh data points
+	for( UnsignedInt i = 0; i < m_meshDataSize; ++i )
+	{
+
+		// height
+		xfer->xferReal( &m_meshData[ i ].height );
+
+		// velocity
+		xfer->xferReal( &m_meshData[ i ].velocity );
+
+		// status
+		xfer->xferUnsignedByte( &m_meshData[ i ].status );
+
+		// preferred height
+		xfer->xferUnsignedByte( &m_meshData[ i ].preferredHeight );
+
+	}
+
+}
+
+// ------------------------------------------------------------------------------------------------
+/** Load post process */
+// ------------------------------------------------------------------------------------------------
+void WaterRenderObjClass::loadPostProcess( void )
+{
+
+}
+
+
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
new file mode 100644
index 00000000000..6f34e7e7e78
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
@@ -0,0 +1,1309 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// FILE: W3DWaterTracks.cpp ////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
+//-----------------------------------------------------------------------------
+//
+// Project:   RTS3
+//
+// File name: W3DWaterTracks.cpp
+//
+// Created:   Mark Wilczynski, July 2001
+//
+// Desc:      Draw waves and splash marks on water surface.  System allows for
+//			  some simple animation : dynamic uv coordinates, scaling, scrolling,
+//			  and alpha.
+//-----------------------------------------------------------------------------
+
+#include "W3DDevice/GameClient/HeightMap.h"
+#include "W3DDevice/GameClient/W3DWaterTracks.h"
+#include "W3DDevice/GameClient/W3DShaderManager.h"
+#include "W3DDevice/GameClient/W3DShroud.h"
+#include "GameClient/InGameUI.h"
+#include "GameClient/Water.h"
+#include "GameLogic/TerrainLogic.h"
+#include "Common/FramePacer.h"
+#include "Common/GlobalData.h"
+#include "Common/UnicodeString.h"
+#include "Common/file.h"
+#include "Common/FileSystem.h"
+#include "texture.h"
+#include "colmath.h"
+#include "coltest.h"
+#include "rinfo.h"
+#include "camera.h"
+#include "assetmgr.h"
+#include "WW3D2/dx8wrapper.h"
+
+//number of vertex pages allocated - allows double buffering of vertex updates.
+//while one is being rendered, another is being updated.  Improves HW parallelism.
+#define WATER_VB_PAGES	1000
+#define WATER_STRIP_X	2		//vertex resolution of each strip
+#define WATER_STRIP_Y	2
+#define SYNC_WAVES			//all the waves are in sync - movement resets at same time.
+//#define DEFAULT_FINAL_WAVE_WIDTH	28.0f
+//#define DEFAULT_FINAL_WAVE_HEIGHT	18.0f
+//#define DEFAULT_SECOND_WAVE_TIME_OFFSET 6267	//should always be half of totalMs
+
+WaterTracksRenderSystem *TheWaterTracksRenderSystem=NULL;	///< singleton for track drawing system.
+
+static Bool pauseWaves=FALSE;
+
+enum waveType CPP_11(: Int)
+{
+	WaveTypeFirst,
+	WaveTypePond=WaveTypeFirst,
+	WaveTypeOcean,
+	WaveTypeCloseOcean,	//same as above but appears much closer to beach.
+	WaveTypeCloseOceanDouble,	//same as above but waves much sloser together.
+	WaveTypeRadial,
+	WaveTypeLast = WaveTypeRadial,
+	WaveTypeStationary,
+	WaveTypeMax,
+};
+
+struct waveInfo
+{
+	Real m_finalWidth;				//final width of of wave when it reaches beach.
+	Real m_finalHeight;				//final height of wave after it stretched out on beach.
+	Real m_waveDistance;			//distance away from beach where wave starts.
+	Real m_initialVelocity;
+	Int m_fadeMs;					//time to fade out wave after it stops on shore.
+	Real m_initialWidthFraction;	//fraction of m_finalWidth when wave first appears.
+	Real m_initialHeightWidthFraction;	//fraction of initial width to use as the initial height.
+	Int m_timeToCompress;			//time for back of wave to continue moving forward after front starts retreating.
+	Int m_secondWaveTimeOffset;		//time for second wave to start.  Should always be half of first wave's TotalMs.
+	const char *m_textureName;			//name of texture to use on wave.
+	const char *m_waveTypeName;			//name of this wave type.
+};
+
+waveInfo waveTypeInfo[WaveTypeMax]=
+{
+	{28.0f, 18.0f, 25.0f, 0.018f, 900, 0.01f, 0.18f, 1500, 0,"wave256.tga","Pond"},	//pond
+	{55.0f, 36.0f, 80.0f, 0.015f, 2000, 0.5f, 0.18f, 1000, 6267,"wave256.tga","Ocean"},	//ocean
+	{55.0f, 36.0f, 80.0f, 0.015f, 2000, 0.05f, 0.18f, 1000, 6267,"wave256.tga","Close Ocean"},
+	{55.0f, 36.0f, 80.0f, 0.015f, 4000, 0.01f, 0.18f, 2000, 6267,"wave256.tga","Close Ocean Double"},
+	{55.0f, 27.0f, 80.0f, 0.015f, 2000, 0.01f, 8.0f, 2000, 5367,"wave256.tga","Radial"},
+};
+
+//=============================================================================
+// WaterTracksObj::~WaterTracksObj
+//=============================================================================
+/** Destructor. Releases w3d assets. */
+//=============================================================================
+WaterTracksObj::~WaterTracksObj(void)
+{
+	freeWaterTracksResources();
+}
+
+//=============================================================================
+// WaterTracksObj::WaterTracksObj
+//=============================================================================
+/** Constructor. Just nulls out some variables. */
+//=============================================================================
+WaterTracksObj::WaterTracksObj(void)
+{
+	m_stageZeroTexture=NULL;
+	m_bound=false;
+	m_initTimeOffset=0;
+}
+
+//=============================================================================
+// WaterTracksObj::Get_Obj_Space_Bounding_Sphere
+//=============================================================================
+/** WW3D method that returns object bounding sphere used in frustum culling*/
+//=============================================================================
+void WaterTracksObj::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
+{	/// @todo: Add code to cull track marks to screen by constantly updating bounding volumes
+	sphere=m_boundingSphere;
+}
+
+//=============================================================================
+// WaterTracksObj::Get_Obj_Space_Bounding_Box
+//=============================================================================
+/** WW3D method that returns object bounding box used in collision detection*/
+//=============================================================================
+void WaterTracksObj::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
+{
+	box=m_boundingBox;
+}
+
+//=============================================================================
+// WaterTracksObj::freeWaterTracksResources
+//=============================================================================
+/** Free any W3D resources associated with this object */
+//=============================================================================
+Int WaterTracksObj::freeWaterTracksResources(void)
+{
+	REF_PTR_RELEASE(m_stageZeroTexture);
+	return 0;
+}
+
+//=============================================================================
+// WaterTracksObj::init
+//=============================================================================
+/** Setup size settings and allocate W3D texture
+*	The width/length define the size of the polygon quad which will contain
+*	the specified texture.
+ */
+//=============================================================================
+void WaterTracksObj::init( Real width, Real length, const Vector2 &start, const Vector2 &end, const Char *texturename, Int waveTimeOffset)
+{
+	freeWaterTracksResources();	//free old resources used by this track
+
+	//save original settings used to create this wave
+	m_initStartPos = start;
+	m_initEndPos = end;
+	m_initTimeOffset = waveTimeOffset;
+
+	m_boundingSphere.Init(Vector3(0,0,0),400);
+	m_boundingBox.Center.Set(0.0f, 0.0f, 0.0f);
+	m_boundingBox.Extent.Set(400.0f, 400.0f, 1.0f);
+	m_x=WATER_STRIP_X;
+	m_y=WATER_STRIP_Y;
+	m_elapsedMs=m_initTimeOffset;
+	m_startPos=start;
+	m_perpDir=m_waveDir=end-start;
+	m_perpDir.Rotate(-1.57079632679f);	//get vector perpendicular to wave motion.
+	m_perpDir.Normalize();
+
+	m_waveDir=m_perpDir;
+	m_waveDir.Rotate(PI/2);	//get vector along wave travel direction.
+	//move back by width of wave so start point turns into maximum reach of wave.
+	//m_startPos -= m_waveDir*m_width;
+	//move back initial tip off of wave a couple units off the final position
+	//to give it some room to travel. Travel vector is stored in m_waveDir.
+	m_waveDistance = waveTypeInfo[m_type].m_waveDistance;	//total distance traveled by wave front
+
+	m_waveDir *= m_waveDistance;
+	m_startPos -= m_waveDir;	//move start point down away from shoreline
+
+	m_initialVelocity=waveTypeInfo[m_type].m_initialVelocity;			//velocity per ms
+	m_totalMs = m_waveDistance/m_initialVelocity; //amount of time for wave to travel complete distance
+
+	m_fadeMs = waveTypeInfo[m_type].m_fadeMs;		//time for wave to fade out after it stops on beach
+
+	m_waveInitialWidth=length * waveTypeInfo[m_type].m_initialWidthFraction;///<width of wave segment when it first appears
+	m_waveInitialHeight=m_waveInitialWidth * waveTypeInfo[m_type].m_initialHeightWidthFraction;	///<height of wave segment when it first appears
+	m_waveFinalWidth=length;	///<width of wave segment at full size
+	m_waveFinalHeight=width;		///<final height of unstretched wave
+
+	//get total time for front to complete its cycle
+	m_timeToReachBeach=(m_waveDistance - m_waveFinalHeight)/m_initialVelocity;
+	m_frontSlowDownAcc= -(m_initialVelocity*m_initialVelocity)/(2*m_waveFinalHeight);	//deceleration of wave after it hits land
+	m_timeToStop = -m_initialVelocity/m_frontSlowDownAcc;
+	m_timeToRetreat = sqrt(fabs(2.0f*m_waveFinalHeight/m_frontSlowDownAcc));
+	m_totalMs = m_timeToReachBeach + m_timeToStop + m_timeToRetreat;	//total time that wave front is on screen
+	m_backSlowDownAcc = (2.0f*m_waveInitialHeight/(m_timeToStop*m_timeToStop));//((m_waveInitialHeight - m_velocity*m_timeToStop)*2.0f)/(m_timeToStop*m_timeToStop);
+	m_timeToCompress = waveTypeInfo[m_type].m_timeToCompress;	//time for back of wave to continue moving forward after front starts retreating.
+
+
+	if (m_type == WaveTypeStationary)
+	{	//this is a stationary wave slightly behind starting point
+		m_timeToRetreat = 1000; //time to fade out.
+		m_totalMs = m_timeToReachBeach + m_timeToStop+m_fadeMs+m_timeToRetreat;	//trigger when other wave stops.
+		m_startPos = start;
+		m_fadeMs = 1000;		//time for wave to fade out after it stops on beach
+	}
+
+	m_stageZeroTexture=WW3DAssetManager::Get_Instance()->Get_Texture(texturename);
+}
+
+//=============================================================================
+// WaterTracksObj::init
+//=============================================================================
+/** Setup size settings and allocate W3D texture
+*	Alternate version of init where:
+*	(start, end) define a vector perpendicular to wave travel.  The length of this
+*	vector is used as the length of the wave segment.  The line between start-end
+*	defines the maximum distance the wave will reach.
+ */
+//=============================================================================
+void WaterTracksObj::init( Real width, const Vector2 &start, const Vector2 &end, const Char *texturename)
+{
+	freeWaterTracksResources();	//free old resources used by this track
+	m_boundingSphere.Init(Vector3(0,0,0),400);
+	m_boundingBox.Center.Set(0.0f, 0.0f, 0.0f);
+	m_boundingBox.Extent.Set(400.0f, 400.0f, 1.0f);
+	m_perpDir=end-start;
+	m_startPos=start + m_perpDir*0.5f;	//move start point to middle
+	Real length=m_perpDir.Length();
+	m_perpDir *= 1.0f/length;	//normalize it.
+	m_waveDir=m_perpDir;
+	m_waveDir.Rotate(PI/2);	//get vector along wave travel direction.
+	m_startPos -= m_waveDir*width;	//move back by width of wave
+	m_waveDir *= 1.3f*MAP_XY_FACTOR;	//travel 4 units
+	m_startPos -= m_waveDir;	//move start point down away from shoreline
+	m_x=WATER_STRIP_X;
+	m_y=WATER_STRIP_Y;
+	m_elapsedMs=0;
+	m_initialVelocity=0.001f*MAP_XY_FACTOR;		//velocity per ms
+	m_totalMs=m_waveDir.Length()/m_initialVelocity;
+	m_fadeMs = 3000;		//time for wave to fade out after it stops on beach
+
+	m_stageZeroTexture=WW3DAssetManager::Get_Instance()->Get_Texture(texturename);
+}
+
+//=============================================================================
+// WaterTracksObj::update
+//=============================================================================
+/** Update state of object - advance animations and other states.
+ */
+//=============================================================================
+Int WaterTracksObj::update(Int msElapsed)
+{
+	return TRUE;	//assume we had an update
+}
+
+#define waveInitialV = 0.01f
+#define waveAcceleration = -0.01f
+
+//=============================================================================
+// WaterTracksObj::render
+//=============================================================================
+/** Draws the object in it's current state.
+ */
+//=============================================================================
+
+Int WaterTracksObj::render(DX8VertexBufferClass	*vertexBuffer, Int batchStart)
+{
+	// TheSuperHackers @tweak The wave movement time step is now decoupled from the render update.
+	m_elapsedMs += TheFramePacer->getLogicTimeStepMilliseconds();
+
+	VertexFormatXYZDUV1 *vb;
+	Vector2	waveTailOrigin,waveFrontOrigin;
+	Real	ooWaveDirLen=1.0f/m_waveDir.Length();	//one over length
+	Real	waterHeight;
+	Real	waveAlpha;
+	Real	widthFrac;
+	Real	heightFrac;
+
+	if (batchStart < (WATER_VB_PAGES*WATER_STRIP_X*WATER_STRIP_Y-m_x*m_y))
+	{	//we have room in current VB, append new verts
+		if(vertexBuffer->Get_DX8_Vertex_Buffer()->Lock(batchStart*vertexBuffer->FVF_Info().Get_FVF_Size(),m_x*m_y*vertexBuffer->FVF_Info().Get_FVF_Size(),(unsigned char**)&vb,D3DLOCK_NOOVERWRITE) != D3D_OK)
+			return batchStart;
+	}
+	else
+	{	//ran out of room in last VB, request a substitute VB.
+		if(vertexBuffer->Get_DX8_Vertex_Buffer()->Lock(0,m_x*m_y*vertexBuffer->FVF_Info().Get_FVF_Size(),(unsigned char**)&vb,D3DLOCK_DISCARD) != D3D_OK)
+			return batchStart;
+		batchStart=0;	//reset start of page to first vertex
+	}
+
+	//Adjust wave position in a non-linear way so that it slows down as it hits the target.  Using 1/4 sine wave
+	//seems to work okay since it maxes out at 1.0 at our final position.
+	//Real	timeFrac=(Real)m_elapsedMs/(Real)m_totalMs;//sinf(0.5f*3.14159f*(Real)m_elapsedMs/(Real)m_totalMs);
+
+	//Real displacement=m_elapsedMs*waveInitialV+0.5*waveAcceleration*m_elapsed*m_elapsed;
+
+	heightFrac=1.0f;
+	widthFrac = 1.0f;
+
+	if (m_type == WaveTypeStationary)
+	{	//stationary wave
+		waveFrontOrigin = m_startPos;
+		waveFrontOrigin -= m_perpDir*m_waveFinalWidth*0.5f;	//offset to left edge of wave
+		waveTailOrigin = waveFrontOrigin - m_waveFinalHeight * ooWaveDirLen*m_waveDir;
+		waveAlpha = 0.0f;
+
+		if (m_elapsedMs >= m_totalMs)
+			m_elapsedMs = 0;	//done with effect*/
+		if (m_elapsedMs > (m_timeToReachBeach + m_timeToStop -1000 + m_fadeMs))
+		{	//fading out
+			waveAlpha = m_elapsedMs-(m_timeToReachBeach + m_timeToStop - 1000 +m_fadeMs);//(m_totalMs-m_timeToRetreat -m_fadeMs - m_elapsedMs)/m_fadeMs;
+			waveAlpha = waveAlpha / m_timeToRetreat;
+			waveAlpha = 1.0f - waveAlpha;
+			if (waveAlpha < 0.0f)
+				waveAlpha = 0.0f;
+		}
+		else
+		if (m_elapsedMs > (m_timeToReachBeach + m_timeToStop - 1000))
+		{	//start fading up
+
+			waveAlpha = m_elapsedMs-(m_timeToReachBeach + m_timeToStop - 1000);//(m_totalMs-m_timeToRetreat -m_fadeMs - m_elapsedMs)/m_fadeMs;
+			waveAlpha = waveAlpha / m_fadeMs;
+			if (waveAlpha > 1.0f)
+				waveAlpha = 1.0f;
+		}
+	}
+	else
+	{	//moving wave
+
+		//get coordinate of top left of wave strip
+		if (m_elapsedMs < m_timeToReachBeach)
+		{	//wave has not reached beach yet so position only depends on velocity
+			waveAlpha = m_elapsedMs / m_timeToReachBeach;
+			widthFrac = waveAlpha;
+			widthFrac=(m_waveInitialWidth + widthFrac* (m_waveFinalWidth-m_waveInitialWidth))/m_waveFinalWidth;
+
+			waveFrontOrigin = m_startPos + m_initialVelocity*m_elapsedMs*ooWaveDirLen*m_waveDir;
+			waveFrontOrigin -= m_perpDir*m_waveFinalWidth*0.5f*widthFrac;	//offset to left edge of wave
+			//Tail of wave will be behind the front by fixed amount.
+			waveTailOrigin = waveFrontOrigin - m_waveInitialHeight * ooWaveDirLen*m_waveDir;
+		}
+		else	//wave has reached beach and is decelerating
+		if (m_elapsedMs < m_totalMs)
+		{	waveAlpha = 1.0f;
+			widthFrac = 1.0f;
+			//Get position of wave when it hit the beach
+			waveFrontOrigin = m_startPos + m_initialVelocity*m_timeToReachBeach*ooWaveDirLen*m_waveDir;
+			waveTailOrigin = waveFrontOrigin;	//store position for calculating tail position
+			//Add movement after it hit the beach
+			Real elapsedMs=m_elapsedMs - m_timeToReachBeach;
+			waveFrontOrigin += (m_initialVelocity*elapsedMs+0.5f*m_frontSlowDownAcc*elapsedMs*elapsedMs)*ooWaveDirLen*m_waveDir;
+			waveFrontOrigin -= m_perpDir*m_waveFinalWidth*0.5f*widthFrac;	//offset to left edge of wave
+
+			Real timeSinceBacktrack = m_elapsedMs - m_timeToReachBeach - m_timeToStop;
+			if (timeSinceBacktrack < 0)
+				timeSinceBacktrack = 0;
+			waveAlpha = timeSinceBacktrack/m_fadeMs;
+			if (waveAlpha > 1.0f)
+				waveAlpha = 1.0f;
+
+			waveAlpha = 1.0f - waveAlpha;
+
+			//Get position of tail when front hits the beach.
+			waveTailOrigin -= m_waveInitialHeight * ooWaveDirLen*m_waveDir;
+
+			if (m_elapsedMs > (m_timeToReachBeach+m_timeToStop+m_timeToCompress))
+			{	elapsedMs=elapsedMs;	///@todo: bug?
+				waveTailOrigin += (0.5f*m_backSlowDownAcc*(m_timeToStop+m_timeToCompress)*(m_timeToStop+m_timeToCompress))*ooWaveDirLen*m_waveDir;
+				//get time since wave should have stopped moving forward
+				Real newElapsed = m_elapsedMs - (m_timeToReachBeach+m_timeToStop+m_timeToCompress);
+				waveTailOrigin += (0.5f*m_frontSlowDownAcc*newElapsed*newElapsed)*ooWaveDirLen*m_waveDir;
+			}
+			else
+	//		if (m_elapsedMs < (m_totalMs-m_timeToRetreat))
+				//find position of tail including slowdown after it hit the beach
+	//		waveTailOrigin += (m_initialVelocity*elapsedMs+0.5f*m_backSlowDownAcc*elapsedMs*elapsedMs)*ooWaveDirLen*m_waveDir;
+			waveTailOrigin += (0.5f*m_backSlowDownAcc*elapsedMs*elapsedMs)*ooWaveDirLen*m_waveDir;
+
+			waveTailOrigin -= m_perpDir*m_waveFinalWidth*0.5f*widthFrac;	//offset to left edge of wave
+		}
+		else
+		{	m_elapsedMs = 0;
+			waveAlpha = m_elapsedMs / m_timeToReachBeach;
+			widthFrac = waveAlpha;
+			widthFrac=(m_waveInitialWidth + widthFrac* (m_waveFinalWidth-m_waveInitialWidth))/m_waveFinalWidth;
+
+			waveFrontOrigin = m_startPos + m_initialVelocity*m_elapsedMs*ooWaveDirLen*m_waveDir;
+			waveFrontOrigin -= m_perpDir*m_waveFinalWidth*0.5f*widthFrac;	//offset to left edge of wave
+			//Tail of wave will be behind the front by fixed amount.
+			waveTailOrigin = waveFrontOrigin - m_waveInitialHeight * ooWaveDirLen*m_waveDir;
+		}
+	}
+
+	//First insert tail of wave:
+	Vector2 testPoint(waveTailOrigin);
+	TheTerrainLogic->isUnderwater(testPoint.X,testPoint.Y,&waterHeight);
+	vb->x=	testPoint.X;
+	vb->y=	testPoint.Y;
+	vb->z=waterHeight+1.5f;
+	vb->diffuse=(REAL_TO_INT(waveAlpha*255.0f)<<24) |0xffffff;
+	if (m_flipU)
+		vb->u1=1;
+	else
+		vb->u1=0;
+	vb->v1=0;
+	vb++;
+	testPoint.Set(waveTailOrigin + m_perpDir*m_waveFinalWidth*widthFrac);
+	vb->x=	testPoint.X;
+	vb->y=	testPoint.Y;
+	vb->z=waterHeight+1.5f;
+	vb->diffuse=(REAL_TO_INT(waveAlpha*255.0f)<<24) |0xffffff;
+	if (m_flipU)
+		vb->u1=0.0f;
+	else
+		vb->u1=1.0f;
+	vb->v1=0;
+	vb++;
+	//insert front of wave
+	testPoint.Set(waveFrontOrigin);
+	vb->x=	testPoint.X;
+	vb->y=	testPoint.Y;
+	vb->z=waterHeight+1.5f;
+	vb->diffuse=(REAL_TO_INT(waveAlpha*255.0f)<<24) |0xffffff;
+	if (m_flipU)
+		vb->u1=1;
+	else
+		vb->u1=0;
+	vb->v1=1.0f;
+	vb++;
+	testPoint.Set(waveFrontOrigin + m_perpDir*m_waveFinalWidth*widthFrac);
+	vb->x=	testPoint.X;
+	vb->y=	testPoint.Y;
+	vb->z=waterHeight+1.5f;
+	vb->diffuse=(REAL_TO_INT(waveAlpha*255.0f)<<24) |0xffffff;
+	if (m_flipU)
+		vb->u1=0;
+	else
+		vb->u1=1.0f;
+	vb->v1=1.0f;
+	vb++;
+
+	vertexBuffer->Get_DX8_Vertex_Buffer()->Unlock();
+
+	Int idxCount=(m_y-1)*(m_x*2+2) - 2;	//index count
+
+	DX8Wrapper::Set_Index_Buffer(TheWaterTracksRenderSystem->m_indexBuffer,batchStart);
+	DX8Wrapper::Draw_Strip(0,idxCount-2,0,m_x*m_y);	//there are always n-2 primitives for n index strip.
+
+	return batchStart+m_x*m_y;	//return new offset into unused area of vertex buffer
+}
+
+//=============================================================================
+//WaterTracksRenderSystem::bindTrack
+//=============================================================================
+/** Grab a track from the free store. If no free tracks exist, return NULL.
+	As long as a track is bound to an object (like a tank) it is ready to accept
+	updates with additional edges.  Once it is unbound, it will expire and return
+	to the free store once all tracks have faded out.
+*/
+//=============================================================================
+WaterTracksObj *WaterTracksRenderSystem::bindTrack(waveType type)
+{
+	WaterTracksObj *mod,*nextmod,*prevmod;
+
+	mod = m_freeModules;
+	if( mod )
+	{
+		// take module off the free list
+		if( mod->m_nextSystem )
+			mod->m_nextSystem->m_prevSystem = mod->m_prevSystem;
+		if( mod->m_prevSystem )
+			mod->m_prevSystem->m_nextSystem = mod->m_nextSystem;
+		else
+			m_freeModules = mod->m_nextSystem;
+
+		mod->m_type=type;
+
+		// put module on the used list (sorted next to similar types)
+		nextmod=NULL,prevmod=NULL;
+		for( nextmod = m_usedModules; nextmod; prevmod=nextmod,nextmod = nextmod->m_nextSystem )
+		{
+			if (nextmod->m_type==type)
+			{	//found start of other shadows using same texture, insert new shadow here.
+				mod->m_nextSystem=nextmod;
+				mod->m_prevSystem=prevmod;
+				nextmod->m_prevSystem=mod;
+				if (prevmod)
+				{	prevmod->m_nextSystem=mod;
+				}
+				else
+					m_usedModules=mod;
+				break;
+			}
+		}
+
+		if (nextmod==NULL)
+		{	//shadow with new texture. Add to top of list.
+			mod->m_nextSystem = m_usedModules;
+			if (m_usedModules)
+				m_usedModules->m_prevSystem=mod;
+			m_usedModules = mod;
+		}
+
+		mod->m_bound=true;
+	}
+
+	#ifdef SYNC_WAVES
+	nextmod=m_usedModules;
+
+	while(nextmod)
+	{
+		nextmod->m_elapsedMs=nextmod->m_initTimeOffset;
+		nextmod=nextmod->m_nextSystem;
+	}
+	#endif
+
+	return mod;
+}
+
+//=============================================================================
+//WaterTracksRenderSystem::unbindTrack
+//=============================================================================
+/** Called when an object (i.e Tank) will not lay down any more tracks and
+doesn't need this object anymore.  The track-laying object will be returned
+to pool of available tracks as soon as any remaining track edges have faded out.
+*/
+//=============================================================================
+void WaterTracksRenderSystem::unbindTrack( WaterTracksObj *mod )
+{
+	//this object should return to free store as soon as there is nothing
+	//left to render.
+	mod->m_bound=false;
+	releaseTrack(mod);
+}
+
+//=============================================================================
+//WaterTracksRenderSystem::releaseTrack
+//=============================================================================
+/** Returns a track laying object to free store to be used again later.
+*/
+void WaterTracksRenderSystem::releaseTrack( WaterTracksObj *mod )
+{
+	if (mod==NULL)
+		return;
+
+	assert(mod->m_bound == false);
+
+	// remove module from used list
+	if( mod->m_nextSystem )
+		mod->m_nextSystem->m_prevSystem = mod->m_prevSystem;
+	if( mod->m_prevSystem )
+		mod->m_prevSystem->m_nextSystem = mod->m_nextSystem;
+	else
+		m_usedModules = mod->m_nextSystem;
+
+	// add module to free list
+	mod->m_prevSystem = NULL;
+	mod->m_nextSystem = m_freeModules;
+	if( m_freeModules )
+		m_freeModules->m_prevSystem = mod;
+	m_freeModules = mod;
+	mod->freeWaterTracksResources();
+}
+
+//=============================================================================
+// WaterTracksRenderSystem::WaterTracksRenderSystem
+//=============================================================================
+/** Constructor. Just nulls out some variables. */
+//=============================================================================
+WaterTracksRenderSystem::WaterTracksRenderSystem()
+{
+	m_usedModules = NULL;
+	m_freeModules = NULL;
+	m_indexBuffer = NULL;
+	m_vertexMaterialClass = NULL;
+	m_vertexBuffer = NULL;
+	m_stripSizeX=WATER_STRIP_X;
+	m_stripSizeY=WATER_STRIP_Y;
+	m_batchStart=0;
+	TheWaterTracksRenderSystem = this;	//only allow one instance of this object.
+}
+
+//=============================================================================
+// WaterTracksRenderSystem::~WaterTracksRenderSystem
+//=============================================================================
+/** Destructor.  Free all pre-allocated track laying render objects*/
+//=============================================================================
+WaterTracksRenderSystem::~WaterTracksRenderSystem( void )
+{
+
+	// free all data
+	shutdown();
+
+	m_vertexMaterialClass=NULL;
+
+}
+
+//=============================================================================
+// WaterTracksRenderSystem::ReAcquireResources
+//=============================================================================
+/** (Re)allocates all W3D assets after a reset.. */
+//=============================================================================
+void WaterTracksRenderSystem::ReAcquireResources(void)
+{
+	Int i,j,k;
+//	const Int numModules=16;	///@todo: Get a value out of gdf
+
+	// just for paranoia's sake.
+	REF_PTR_RELEASE(m_indexBuffer);
+	REF_PTR_RELEASE(m_vertexBuffer);
+
+	//Will need m_y-1 strips, each of length m_x*2.
+	//Will also need 2 extra indices to connect each strip to next one (except last strip)
+	//Total index buffer size = (m_y-1)*(m_x*2+2) - 2 (drop the extra 2 indices from last strip)
+
+	Int idxCount=(m_stripSizeY-1)*(m_stripSizeX*2+2) - 2;
+
+	m_indexBuffer=NEW_REF(DX8IndexBufferClass,(idxCount));
+
+	// Fill up the IB
+	{
+		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
+		UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
+
+		for (i=0,j=0,k=0; i<idxCount; j++)
+		{
+			for (;k<(m_stripSizeX*(j+1)); k++,i+=2)
+			{
+				ib[i]=(UnsignedShort) k+m_stripSizeX;
+				ib[i+1]=(UnsignedShort) k;
+			}
+			//Generate 4 degenerate triangle to connect current strip to next strip/row of map
+			//To do this, we just repeat the last index of first strip and first index of new strip.
+			//Any triangles with repeated vertices will be skipped during rendering.
+			if (i<idxCount) //check if there is at least 1 more strip to go
+			{
+				ib[i]=k-1;
+				ib[i+1]=k+m_stripSizeX;
+				i+=2;
+			}
+		}
+	}
+
+	m_vertexBuffer=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZDUV1,m_stripSizeX*m_stripSizeY*WATER_VB_PAGES,DX8VertexBufferClass::USAGE_DYNAMIC));
+	m_batchStart=0;
+}
+
+//=============================================================================
+// WaterTracksRenderSystem::ReleaseResources
+//=============================================================================
+/** (Re)allocates all W3D assets after a reset.. */
+//=============================================================================
+void WaterTracksRenderSystem::ReleaseResources(void)
+{
+	REF_PTR_RELEASE(m_indexBuffer);
+	REF_PTR_RELEASE(m_vertexBuffer);
+	// Note - it is ok to not release the material, as it is a w3d object that
+	// has no dx8 resources. jba.
+}
+
+//=============================================================================
+// WaterTracksRenderSystem::init
+//=============================================================================
+/**  initialize the system, allocate all the render objects we will need */
+//=============================================================================
+void WaterTracksRenderSystem::init(void)
+{
+	const Int numModules=2000;	///@todo: Get a value out of gdf
+	Int i;
+	WaterTracksObj *mod;
+
+	m_stripSizeX=WATER_STRIP_X;	///@todo: grab these out of gdf or define
+	m_stripSizeY=WATER_STRIP_Y;
+	m_level=TheGlobalData->m_waterPositionZ;
+
+	ReAcquireResources();
+	//go with a preset material for now.
+	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
+
+	//use a multi-texture shader:
+	m_shaderClass = ShaderClass::_PresetAlphaShader;
+	m_shaderClass.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);	//water should be visible from both sides
+
+	// we cannot initialize a system that is already initialized
+	if( m_freeModules || m_usedModules )
+	{
+
+		// system already online!
+		assert( 0 );
+		return;
+
+	}
+
+	// allocate our modules for this system
+	for( i = 0; i < numModules; i++ )
+	{
+
+		mod = NEW WaterTracksObj;
+
+		if( mod == NULL )
+		{
+
+			// unable to allocate modules needed
+			assert( 0 );
+			return;
+
+		}
+
+		mod->m_prevSystem = NULL;
+		mod->m_nextSystem = m_freeModules;
+		if( m_freeModules )
+			m_freeModules->m_prevSystem = mod;
+		m_freeModules = mod;
+
+	}
+
+}
+
+void WaterTracksRenderSystem::reset(void)
+{
+	WaterTracksObj *nextMod,*mod;
+
+	//release unbound tracks that may still be fading out
+	mod=m_usedModules;
+
+	while(mod)
+	{
+		nextMod=mod->m_nextSystem;
+		mod->m_bound=false;
+		releaseTrack(mod);
+
+		mod = nextMod;
+	}
+
+
+	// free all attached things and used modules
+	assert( m_usedModules == NULL );
+}
+
+//=============================================================================
+// WaterTracksRenderSystem::shutdown
+//=============================================================================
+/** Shutdown and free all memory for this system */
+//=============================================================================
+void WaterTracksRenderSystem::shutdown( void )
+{
+	WaterTracksObj *nextMod,*mod;
+
+	//release unbound tracks that may still be fading out
+	mod=m_usedModules;
+
+	while(mod)
+	{
+		nextMod=mod->m_nextSystem;
+
+		if (!mod->m_bound)
+			releaseTrack(mod);
+
+		mod = nextMod;
+	}
+
+
+	// free all attached things and used modules
+	assert( m_usedModules == NULL );
+
+	// free all module storage
+	while( m_freeModules )
+	{
+
+		nextMod = m_freeModules->m_nextSystem;
+		delete m_freeModules;
+		m_freeModules = nextMod;
+
+	}
+
+	REF_PTR_RELEASE(m_indexBuffer);
+	REF_PTR_RELEASE(m_vertexMaterialClass);
+	REF_PTR_RELEASE(m_vertexBuffer);
+
+}
+
+//=============================================================================
+// WaterTracksRenderSystem::update
+//=============================================================================
+/** Update the state of all active track marks - fade, expire, etc. */
+//=============================================================================
+void WaterTracksRenderSystem::update()
+{
+
+	static  Int iLastTime=timeGetTime();
+	WaterTracksObj *mod=m_usedModules,*nextMod;
+
+	Int timeDiff = timeGetTime()-iLastTime;
+	iLastTime += timeDiff;
+
+	//first update all the tracks
+	while( mod )
+	{
+		nextMod = mod->m_nextSystem;
+
+		if (!mod->m_bound || (!mod->update(timeDiff) && !mod->m_bound))
+		{ //object is not longer updating and is unbound so ok to release it.
+			releaseTrack(mod);
+		}
+
+		mod = nextMod;
+	}
+}
+
+
+void TestWaterUpdate(void);
+void setFPMode( void );
+
+//=============================================================================
+// WaterTracksRenderSystem::flush
+//=============================================================================
+/** Draw all active track marks for this frame */
+//=============================================================================
+void WaterTracksRenderSystem::flush(RenderInfoClass & rinfo)
+{
+/** @todo: Optimize system by drawing tracks as triangle strips and use dynamic vertex buffer access.
+May also try rendering all tracks with one call to W3D/D3D by grouping them by texture.
+Try improving the fit to vertical surfaces like cliffs.
+*/
+	Int	diffuseLight;
+
+	if (!TheGlobalData->m_showSoftWaterEdge || TheWaterTransparency->m_transparentWaterDepth ==0 )
+		return;
+
+	if (TheGlobalData->m_usingWaterTrackEditor)
+		TestWaterUpdate();
+
+	update();	//update positions of all the tracks
+
+	rinfo.Camera.Apply();
+
+	if (!m_usedModules || ShaderClass::Is_Backface_Culling_Inverted())
+		return;	//don't render track marks in reflections.
+
+	//According to Nvidia there's a D3D bug that happens if you don't start with a
+	//new dynamic VB each frame - so we force a DISCARD by overflowing the counter.
+	m_batchStart = 0xffff;
+
+	// adjust shading for time of day.
+	Real shadeR, shadeG, shadeB;
+	shadeR = TheGlobalData->m_terrainAmbient[0].red;
+	shadeG = TheGlobalData->m_terrainAmbient[0].green;
+	shadeB = TheGlobalData->m_terrainAmbient[0].blue;
+	shadeR += TheGlobalData->m_terrainDiffuse[0].red/2;
+	shadeG += TheGlobalData->m_terrainDiffuse[0].green/2;
+	shadeB += TheGlobalData->m_terrainDiffuse[0].blue/2;
+	shadeR*=255.0f;
+	shadeG*=255.0f;
+	shadeB*=255.0f;
+
+	diffuseLight=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16);
+
+	Matrix3D tm(1);	///set to identity
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
+
+	DX8Wrapper::Set_Material(m_vertexMaterialClass);
+	DX8Wrapper::Set_Shader(m_shaderClass);
+
+	DX8Wrapper::Set_Vertex_Buffer(m_vertexBuffer);
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZBIAS,8);
+	//Force apply of render states so we can override them.
+	DX8Wrapper::Apply_Render_State_Changes();
+
+	if (TheTerrainRenderObject->getShroud())
+	{
+		W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
+		W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 1);
+
+		//modulate with shroud texture
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );	//stage 1 texture
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );	//previous stage texture
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
+		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
+
+		//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
+		//write to the zbuffer.  Change to LESSEQUAL.
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
+	}
+
+	Int LastTextureType=-1;
+
+	WaterTracksObj *mod=m_usedModules;
+
+	while( mod )
+	{
+		if (LastTextureType != mod->m_type)
+			DX8Wrapper::Set_Texture(0,mod->m_stageZeroTexture);
+
+		Int vertsRendered=mod->render(m_vertexBuffer,m_batchStart);
+
+		m_batchStart = vertsRendered;	//advance past vertices already in buffer
+
+		mod = mod->m_nextSystem;
+	}
+
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZBIAS,0);
+
+	if (TheTerrainRenderObject->getShroud())
+	{	//we used the shroud shader, so reset it.
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC, D3DCMP_EQUAL);
+		W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
+	}
+}
+
+WaterTracksObj *WaterTracksRenderSystem::findTrack(Vector2 &start, Vector2 &end, waveType type)
+{
+	WaterTracksObj *mod=m_usedModules;
+
+	while( mod )
+	{
+		if (mod->m_initEndPos == end &&
+			mod->m_initStartPos == start &&
+			mod->m_type == type)
+			return mod;
+		mod = mod->m_nextSystem;
+	}
+	return NULL;
+}
+void WaterTracksRenderSystem::saveTracks(void)
+{
+
+	if (!TheTerrainLogic)
+		return;
+
+	AsciiString fileName=TheTerrainLogic->getSourceFilename();
+	char path[256];
+
+	strlcpy(path, fileName.str(), ARRAY_SIZE(path));
+	strlcat(path, ".wak", ARRAY_SIZE(path));
+
+	WaterTracksObj *umod;
+	Int trackCount=0;
+
+	FILE *fp=fopen(path,"wb");
+
+	if (fp)
+	{
+		umod=m_usedModules;
+		while(umod)
+		{	if (umod->m_initTimeOffset == 0)
+			{	//only save the primary wave front, second layer is added automatically.
+				fwrite(&umod->m_initStartPos,sizeof(umod->m_startPos),1,fp);
+				fwrite(&umod->m_initEndPos,sizeof(umod->m_perpDir),1,fp);
+				fwrite(&umod->m_type,sizeof(umod->m_type),1,fp);
+	//			fwrite(&umod->m_initTimeOffset,sizeof(umod->m_initTimeOffset),1,fp);
+				trackCount++;
+			}
+			umod=umod->m_nextSystem;
+		}
+		fwrite(&trackCount,sizeof(trackCount),1,fp);
+		fclose(fp);
+	}
+}
+
+void WaterTracksRenderSystem::loadTracks(void)
+{
+
+	if (!TheTerrainLogic)
+		return;
+
+	AsciiString fileName=TheTerrainLogic->getSourceFilename();
+	char path[256];
+
+	strlcpy(path, fileName.str(), ARRAY_SIZE(path));
+	strlcat(path, ".wak", ARRAY_SIZE(path));
+
+	File *file = TheFileSystem->openFile(path, File::READ | File::BINARY);
+	WaterTracksObj *umod;
+	Int trackCount=0;
+	Int flipU=0;
+	Vector2 startPos,endPos;
+	waveType wtype;
+
+	if (file)
+	{
+		file->seek(-4,File::END);
+		file->read(&trackCount,sizeof(trackCount));
+		file->seek(0, File::START);
+		for (Int i=0; i<trackCount; i++)
+		{
+		tryagain:
+			file->read(&startPos,sizeof(startPos));
+			file->read(&endPos,sizeof(endPos));
+			file->read(&wtype,sizeof(wtype));
+			//Check if this track already exists.
+			if (findTrack(startPos,endPos,wtype))
+			{	i++;
+				goto tryagain;
+			}
+
+			umod=bindTrack(wtype);
+			if (umod)
+			{	//umod->init(1.5f*MAP_XY_FACTOR,Vector2(0,0),Vector2(1,1),"wave256.tga");
+				flipU ^= 1;	//toggle flip state
+				umod->init(waveTypeInfo[wtype].m_finalHeight,waveTypeInfo[wtype].m_finalWidth,startPos,endPos,waveTypeInfo[wtype].m_textureName,0);
+				umod->m_flipU=flipU;
+
+				if (waveTypeInfo[wtype].m_secondWaveTimeOffset)	//check if we need a second wave to follow
+				{
+					umod=bindTrack(wtype);
+					if (umod)
+					{
+						umod->init(waveTypeInfo[wtype].m_finalHeight,waveTypeInfo[wtype].m_finalWidth,startPos,endPos,waveTypeInfo[wtype].m_textureName,waveTypeInfo[wtype].m_secondWaveTimeOffset);
+						umod->m_flipU = !flipU;
+					}
+				}
+			}
+		}
+		file->close();
+	}
+
+#if 0	//Obsolete code used before there was another editor to place waves.
+	//Look for all waypoints that start with "waveStart_"
+	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext())
+	{
+		if (way->getName().startsWith("waveStart_") && way->getNumLinks() == 1)
+		{
+			Waypoint *nextWay = way->getLink(0);
+			Coord3D startPos = *way->getLocation();
+			Coord3D endPos = *nextWay->getLocation();
+
+			//initialize surface layer (1)
+			WaterTracksObj *umod=TheWaterTracksRenderSystem->bindTrack(1);
+			if (umod)
+			{
+				umod->init(DEFAULT_FINAL_WAVE_HEIGHT,DEFAULT_FINAL_WAVE_WIDTH,Vector2(startPos.x,startPos.y),Vector2(endPos.x,endPos.y),"wave1.tga",0);
+			}
+/*
+			//initialize foam layer (0)
+			umod=TheWaterTracksRenderSystem->bindTrack(0);
+			if (umod)
+			{
+				umod->init(2.5f*MAP_XY_FACTOR,5.0f*MAP_XY_FACTOR,Vector2(startPos.x,startPos.y),Vector2(endPos.x,endPos.y),"wave2.tga");
+//				umod->m_fadeMs += 1500;	//take extra 500 ms to fade out wave.
+//				umod->m_retreatFrac = 1.0f;	//don't move wave back after it hits final position.
+			}*/
+		}
+	}
+#endif
+}
+
+/**@todo: this is a quick hack for adding/removing/testing breaking waves inside the client.
+Will need to move this code to an external editor at some pont. */
+#include "GameClient/Display.h"
+
+extern HWND ApplicationHWnd;
+
+//TODO: Fix editor so it actually draws the wave segment instead of line while editing
+//Could freeze all the water while editing?  Or keep setting elapsed time on current segment.
+//Have to make it so seamless merge of segments at final position.
+static void TestWaterUpdate(void)
+{
+	static Int doInit=1;
+	static WaterTracksObj *track=NULL,*track2=NULL;
+	static Int trackEditMode=0;
+	static waveType currentWaveType = WaveTypeOcean;
+	POINT	screenPoint;
+	POINT	endPoint;
+	static POINT	mouseAnchor;
+	static Int		haveStart=0;
+	static Int		haveEnd=0;
+	static Coord3D	terrainPointStart,terrainPointEnd;
+	//flags to tell me when the user lets go of a key
+	static Int trackEditModeReset=1;
+	static Int addPointReset=1;
+	static Int deleteTrackReset=1;
+	static Int saveTracksReset=1;
+	static Int loadTracksReset=1;
+	static Int changeTypeReset=1;
+
+	pauseWaves=FALSE;
+
+	if (doInit)
+	{	//create the system
+		doInit=0;
+
+//		TheWaterTracksRenderSystem = NEW (WaterTracksRenderSystem);
+//		TheWaterTracksRenderSystem->init();
+
+		//create a dummy track
+//		track=TheWaterTracksRenderObjClassSystem->bindTrack(0);
+//		track->init(1.5f,8.0f,Vector2(147.0f,67.0f),Vector2(146.9f,68.6f),"wave2.tga");
+
+//		track=TheWaterTracksRenderObjClassSystem->bindTrack(0);
+//		track->init(1.5f,8.0f,Vector2(139.0f,66.0f),Vector2(138.8f,67.6f),"wave2.tga");
+	}
+
+	if (GetAsyncKeyState(VK_F5) & 0x8001)	//check if F5 pressed since last call
+	{
+		if (trackEditModeReset)
+		{
+			if (trackEditMode)
+			{
+				UnicodeString string;
+				string.format(L"Leaving Water Track Edit Mode");
+				TheInGameUI->message(string);
+			}
+			else
+			{
+				UnicodeString string;
+				string.format(L"Entering Water Track Edit Mode");
+				TheInGameUI->message(string);
+
+				string.format(L"Wave Type: %hs",waveTypeInfo[currentWaveType].m_waveTypeName);
+				TheInGameUI->message(string);
+			}
+
+			trackEditMode ^= 1;	//toggle editor on/off
+
+			if (trackEditMode == 0)
+			{	//editor was turned off, save changes
+				haveStart=0;
+				haveEnd=0;
+			}
+			trackEditModeReset=0;
+		}
+	}
+	else
+		trackEditModeReset=1;
+
+	if (trackEditMode)
+	{   //we are in wave edit mode
+
+		if (GetCursorPos(&screenPoint))	//read mouse position
+		{
+			ScreenToClient( ApplicationHWnd, &screenPoint);
+
+			if (GetAsyncKeyState(VK_F6) & 0x8001)
+			{
+				if (addPointReset)
+				{
+					if (!haveStart)
+					{	mouseAnchor=screenPoint;
+						TheTacticalView->screenToTerrain( (ICoord2D *)&screenPoint, &terrainPointStart);
+						haveStart=1;
+						UnicodeString string;
+						string.format(L"Added Start");
+						TheInGameUI->message(string);
+					}
+					else
+					{
+						endPoint=screenPoint;
+						TheTacticalView->screenToTerrain( (ICoord2D *)&screenPoint, &terrainPointEnd);
+						haveEnd=1;
+						//Have enough info to add a wave now
+						track=TheWaterTracksRenderSystem->bindTrack(currentWaveType);
+						if (track)
+						{//	track->init(1.5f*MAP_XY_FACTOR,Vector2(terrainPointStart.x,terrainPointStart.y),Vector2(terrainPointEnd.x,terrainPointEnd.y),"wave256.tga");
+							//Generate valid input for the 2 points
+							Vector2 startPoint(terrainPointStart.x,terrainPointStart.y);
+							Vector2 endPoint(terrainPointEnd.x,terrainPointEnd.y);
+							Vector2 midPoint = endPoint - startPoint;
+							Vector2 m_perpDir = midPoint;
+							m_perpDir.Rotate(1.57079632679f);	//get vector perpendicular to wave motion.
+							m_perpDir.Normalize();
+							midPoint = startPoint + (midPoint)*0.5f;
+							Vector2 dirMidPoint = midPoint + m_perpDir;
+
+							track->init(waveTypeInfo[currentWaveType].m_finalHeight,waveTypeInfo[currentWaveType].m_finalWidth,Vector2(midPoint.X,midPoint.Y),Vector2(dirMidPoint.X,dirMidPoint.Y),waveTypeInfo[currentWaveType].m_textureName,0);
+
+							if (waveTypeInfo[currentWaveType].m_secondWaveTimeOffset)
+							{
+								//Add a second track slightly behind this one
+								track2=TheWaterTracksRenderSystem->bindTrack(currentWaveType);
+								if (track2)
+								{
+									track2->init(waveTypeInfo[currentWaveType].m_finalHeight,waveTypeInfo[currentWaveType].m_finalWidth,Vector2(midPoint.X,midPoint.Y),Vector2(dirMidPoint.X,dirMidPoint.Y),waveTypeInfo[currentWaveType].m_textureName,waveTypeInfo[currentWaveType].m_secondWaveTimeOffset);
+								}
+							}
+
+							UnicodeString string;
+							string.format(L"Added End");
+							TheInGameUI->message(string);
+						}
+						haveStart=0;	//reset for next segment
+						haveEnd=0;
+					}
+					addPointReset=0;
+				}
+			}
+			else
+				addPointReset=1;
+
+			if (GetAsyncKeyState(VK_DELETE) & 0x8001)
+			{	//delete last segment added
+				if (deleteTrackReset && track)
+				{	deleteTrackReset=0;
+					TheWaterTracksRenderSystem->unbindTrack(track);
+					if (track2)
+						TheWaterTracksRenderSystem->unbindTrack(track2);
+					haveStart=0;	//reset for next segment
+					haveEnd=0;
+					track=NULL;
+					track2=NULL;
+				}
+			}
+			else
+				deleteTrackReset=1;
+
+			if (GetAsyncKeyState(VK_INSERT) & 0x8001)
+			{	//change current wave type
+				if (changeTypeReset)
+				{	changeTypeReset=0;
+					currentWaveType = (waveType)((Int)currentWaveType + 1);
+					if (currentWaveType > WaveTypeLast)
+						currentWaveType = WaveTypeFirst;
+
+					UnicodeString string;
+					string.format(L"Wave Type: %hs",waveTypeInfo[currentWaveType].m_waveTypeName);
+					TheInGameUI->message(string);
+				}
+			}
+			else
+				changeTypeReset=1;
+
+			if (GetAsyncKeyState(VK_F7) & 0x8001)
+			{	//save all segments added
+				if (saveTracksReset)
+				{	saveTracksReset=0;
+					TheWaterTracksRenderSystem->saveTracks();
+					haveStart=0;	//reset for next segment
+					haveEnd=0;
+					track=NULL;
+					track2=NULL;
+					UnicodeString string;
+					string.format(L"Saved Tracks");
+					TheInGameUI->message(string);
+				}
+			}
+			else
+				saveTracksReset=1;
+
+			if (GetAsyncKeyState(VK_F8) & 0x8001)
+			{	//load tracks for map
+				if (loadTracksReset)
+				{	loadTracksReset=0;
+					TheWaterTracksRenderSystem->reset();
+					TheWaterTracksRenderSystem->loadTracks();
+					haveStart=0;	//reset for next segment
+					haveEnd=0;
+					track=NULL;
+					track2=NULL;
+					UnicodeString string;
+					string.format(L"Loaded Tracks");
+					TheInGameUI->message(string);
+				}
+			}
+			else
+				saveTracksReset=1;
+		};
+
+		if (haveStart && !haveEnd)
+		{	//draw a guide line
+//			View *tacticalView = TheDisplay->getFirstView();
+//			tacticalView->worldToScreen( &m_moveHint[i].pos, &pos );
+
+			TheTacticalView->screenToTerrain( (ICoord2D *)&screenPoint, &terrainPointEnd);
+			//Check if point is within correct distance of start
+			Real xdiff=terrainPointEnd.x - terrainPointStart.x;
+			Real ydiff=terrainPointEnd.y - terrainPointStart.y;
+			if (sqrt (xdiff * xdiff + ydiff * ydiff) <= waveTypeInfo[currentWaveType].m_finalWidth)
+			{	TheDisplay->drawLine(mouseAnchor.x, mouseAnchor.y, screenPoint.x, screenPoint.y,1,0xffccccff);
+				DX8Wrapper::Invalidate_Cached_Render_States();
+				ShaderClass::Invalidate();
+			}
+
+			pauseWaves=TRUE;
+
+//			char buffer[64];
+//			sprintf(buffer,"\n%d,%d,%d,%d",mouseAnchor.x, mouseAnchor.y, screenPoint.x, screenPoint.y);
+//			OutputDebugString (buffer);
+		}
+	}
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvp
similarity index 100%
rename from GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvp
rename to Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvp
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvv b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvv
similarity index 100%
rename from GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvv
rename to Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvv
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
new file mode 100644
index 00000000000..18d134fb532
--- /dev/null
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
@@ -0,0 +1,2549 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+// WorldHeightMap.cpp
+// Class to encapsulate height map.
+// Author: John Ahlquist, April 2001
+
+#define INSTANTIATE_WELL_KNOWN_KEYS
+
+#include "windows.h"
+#include "stdlib.h"
+#include "Common/STLTypedefs.h"
+
+#include "Common/DataChunk.h"
+//#include "Common/GameFileSystem.h"
+#include "Common/FileSystem.h" // for LOAD_TEST_ASSETS
+#include "Common/GlobalData.h"
+#include "Common/MapReaderWriterInfo.h"
+#include "Common/TerrainTypes.h"
+#include "Common/ThingFactory.h"
+#include "Common/ThingTemplate.h"
+#include "Common/WellKnownKeys.h"
+
+#include "GameLogic/PolygonTrigger.h"
+#include "GameLogic/SidesList.h"
+
+#include "W3DDevice/GameClient/WorldHeightMap.h"
+#include "W3DDevice/GameClient/TileData.h"
+#include "W3DDevice/GameClient/HeightMap.h"
+#include "W3DDevice/GameClient/TerrainTex.h"
+#include "W3DDevice/GameClient/W3DShadow.h"
+
+#include "Common/file.h"
+
+
+#define K_OBSOLETE_HEIGHT_MAP_VERSION 8
+
+#define PATHFIND_CLIFF_SLOPE_LIMIT_F	9.8f
+
+// -----------------------------------------------------------
+static AsciiString validateName(AsciiString n, Int flags)
+{
+
+	return n;
+
+}
+
+/* ********* GDIFileStream class ****************************/
+class GDIFileStream : public InputStream
+{
+protected:
+	File* m_file;
+public:
+	GDIFileStream(File* pFile):m_file(pFile) {};
+	virtual Int read(void *pData, Int numBytes) {
+			return(m_file->read(pData, numBytes));
+	};
+};
+
+
+/* ********* MapObject class ****************************/
+/*static*/ MapObject *MapObject::TheMapObjectListPtr = NULL;
+/*static*/ Dict MapObject::TheWorldDict;
+
+MapObject::MapObject(Coord3D loc, AsciiString name, Real angle, Int flags, const Dict* props,
+										 const ThingTemplate *thingTemplate )
+{
+	m_objectName = validateName( name, flags );
+	m_thingTemplate = thingTemplate;
+	m_nextMapObject = NULL;
+	m_location = loc;
+	m_angle = normalizeAngle(angle);
+	m_color = (0xff)<<8; // Bright green.
+	m_flags = flags;
+	m_renderObj = NULL;
+	m_shadowObj = NULL;
+	m_runtimeFlags = 0;
+	// Note - do NOT set TheKey_objectSelectable on creation - allow it to follow the .ini value unless specified by user action.  jba. [3/20/2003]
+	if (props)
+	{
+		m_properties = *props;
+	}
+	else
+	{
+		m_properties.setInt(TheKey_objectInitialHealth, 100);
+		m_properties.setBool(TheKey_objectEnabled, true);
+		m_properties.setBool(TheKey_objectIndestructible, false);
+		m_properties.setBool(TheKey_objectUnsellable, false);
+		m_properties.setBool(TheKey_objectPowered, true);
+		m_properties.setBool(TheKey_objectRecruitableAI, true);
+		m_properties.setBool(TheKey_objectTargetable, false );
+	}
+
+	for( Int i = 0; i < BRIDGE_MAX_TOWERS; ++i )
+		setBridgeRenderObject( (BridgeTowerType)i, NULL );
+
+}
+
+
+MapObject::~MapObject(void)
+{
+	setRenderObj(NULL);
+	setShadowObj(NULL);
+	if (m_nextMapObject) {
+		MapObject *cur = m_nextMapObject;
+		MapObject *next;
+		while (cur) {
+			next = cur->getNext();
+			cur->setNextMap(NULL); // prevents recursion.
+			deleteInstance(cur);
+			cur = next;
+		}
+	}
+	for( Int i = 0; i < BRIDGE_MAX_TOWERS; ++i )
+		setBridgeRenderObject( (BridgeTowerType)i, NULL );
+
+}
+
+MapObject *MapObject::duplicate(void)
+{
+	MapObject *pObj = newInstance( MapObject)(m_location, m_objectName, m_angle, m_flags, &m_properties, m_thingTemplate);
+	pObj->setColor(getColor());
+	pObj->m_runtimeFlags = m_runtimeFlags;
+	return pObj;
+}
+
+void MapObject::setRenderObj(RenderObjClass *pObj)
+{
+	REF_PTR_SET(m_renderObj, pObj);
+}
+
+void MapObject::setBridgeRenderObject( BridgeTowerType type, RenderObjClass* renderObj )
+{
+
+	if( type >= 0 && type < BRIDGE_MAX_TOWERS )
+		REF_PTR_SET( m_bridgeTowers[ type ], renderObj );
+
+}
+
+RenderObjClass* MapObject::getBridgeRenderObject( BridgeTowerType type )
+{
+
+	if( type >= 0 && type < BRIDGE_MAX_TOWERS )
+		return m_bridgeTowers[ type ];
+	return NULL;
+
+}
+
+void MapObject::validate(void)
+{
+	verifyValidTeam();
+	verifyValidUniqueID();
+}
+
+void MapObject::verifyValidTeam(void)
+{
+	// if this map object has a valid team, then do nothing.
+	// if it has an invalid team, the place it on the default neutral team, (by clearing the
+	// existing team name.)
+	Bool exists;
+	AsciiString teamName = getProperties()->getAsciiString(TheKey_originalOwner, &exists);
+	if (exists) {
+		Bool valid = false;
+
+		int numSides = TheSidesList->getNumTeams();
+
+		for (int i = 0; i < numSides; ++i) {
+			TeamsInfo *teamInfo = TheSidesList->getTeamInfo(i);
+			if (!teamInfo) {
+				continue;
+			}
+
+			Bool itBetter;
+			AsciiString testAgainstTeamName = teamInfo->getDict()->getAsciiString(TheKey_teamName, &itBetter);
+			if (itBetter) {
+				if (testAgainstTeamName.compare(teamName) == 0) {
+					valid = true;
+				}
+			}
+		}
+
+		if (!valid) {
+			getProperties()->remove(TheKey_originalOwner);
+		}
+	}
+}
+
+void MapObject::verifyValidUniqueID(void)
+{
+	Bool exists;
+	AsciiString uniqueID = getProperties()->getAsciiString(TheKey_uniqueID, &exists);
+	MapObject *obj = MapObject::getFirstMapObject();
+
+	// -1 is the sentinel
+	int highestIndex = -1;
+
+	while (obj) {
+		if (obj == this) {
+			// the first object is THIS OBJECT, cause we've already been added.
+			obj = obj->getNext();
+			continue;
+		}
+
+		if (obj->isWaypoint()) {
+			// waypoints throw this off. Sad but true. :-(
+			obj = obj->getNext();
+			continue;
+		}
+
+		Bool iterateExists;
+		AsciiString tempStr = obj->getProperties()->getAsciiString(TheKey_uniqueID, &iterateExists);
+		const char* lastSpace = tempStr.reverseFind(' ');
+
+		int testIndex = -1;
+		if (lastSpace) {
+			testIndex = atoi(lastSpace);
+		}
+
+		if (testIndex > highestIndex) {
+			highestIndex = testIndex;
+		}
+		break;
+	}
+
+	int indexOfThisObject = highestIndex + 1;
+
+	const char* thingName;
+	if (getThingTemplate()) {
+		thingName = getThingTemplate()->getName().str();
+	} else if (isWaypoint()) {
+		thingName = getWaypointName().str();
+	} else {
+		thingName = getName().str();
+	}
+	const char* pName = thingName;
+
+	while (*thingName) {
+		if ((*thingName) == '/') {
+			pName = thingName + 1;
+		}
+		++thingName;
+	}
+
+	AsciiString newID;
+	if (isWaypoint()) {
+		newID.format("%s", pName);
+	} else {
+		newID.format("%s %d", pName, indexOfThisObject);
+	}
+	getProperties()->setAsciiString(TheKey_uniqueID, newID);
+}
+
+void MapObject::fastAssignAllUniqueIDs(void)
+{
+	// here's what we do. Take all of them, push them onto a stack. Then, pop each one, setting its id.
+	// should be much faster than what we currently do.
+
+	MapObject *pMapObj = getFirstMapObject();
+
+	std::stack<MapObject*> objStack;
+	Int actualNumObjects = 0;
+
+	while (pMapObj) {
+		++actualNumObjects;
+		objStack.push(pMapObj);
+		pMapObj = pMapObj->getNext();
+	}
+
+	Int indexOfThisObject = 0;
+	while (actualNumObjects) {
+		MapObject *obj = objStack.top();
+
+
+		const char* thingName;
+		if (obj->getThingTemplate()) {
+			thingName = obj->getThingTemplate()->getName().str();
+		} else if (obj->isWaypoint()) {
+			thingName = obj->getWaypointName().str();
+		} else {
+			thingName = obj->getName().str();
+		}
+		const char* pName = thingName;
+
+		while (*thingName) {
+			if ((*thingName) == '/') {
+				pName = thingName + 1;
+			}
+			++thingName;
+		}
+
+		AsciiString newID;
+		if (obj->isWaypoint()) {
+			newID.format("%s", pName);
+		} else {
+			newID.format("%s %d", pName, indexOfThisObject);
+		}
+
+		obj->getProperties()->setAsciiString(TheKey_uniqueID, newID);
+		objStack.pop();
+
+		++indexOfThisObject;
+		--actualNumObjects;
+	}
+}
+
+
+
+void MapObject::setThingTemplate(const ThingTemplate *thing)
+{
+	m_thingTemplate = thing;
+	m_objectName = thing->getName();
+}
+
+
+void MapObject::setName(AsciiString name)
+{
+	m_objectName = name;
+}
+
+WaypointID MapObject::getWaypointID() { return (WaypointID)getProperties()->getInt(TheKey_waypointID); }
+AsciiString MapObject::getWaypointName() { return getProperties()->getAsciiString(TheKey_waypointName); }
+void MapObject::setWaypointID(Int i) { getProperties()->setInt(TheKey_waypointID, i); }
+void MapObject::setWaypointName(AsciiString n) { getProperties()->setAsciiString(TheKey_waypointName, n); }
+
+/*static */ Int MapObject::countMapObjectsWithOwner(const AsciiString& n)
+{
+	Int count = 0;
+	for (MapObject *pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
+	{
+		if (pMapObj->getProperties()->getAsciiString(TheKey_originalOwner) == n)
+			++count;
+	}
+	return count;
+}
+
+//-------------------------------------------------------------------------------------------------
+const ThingTemplate *MapObject::getThingTemplate( void ) const
+{
+	if (m_thingTemplate)
+		return (const ThingTemplate*) m_thingTemplate->getFinalOverride();
+
+	return NULL;
+}
+
+
+/* ********* WorldHeightMap class ****************************/
+
+TileData *WorldHeightMap::m_alphaTiles[NUM_ALPHA_TILES]={0,0,0,0,0,0,0,0,0,0,0,0};
+
+//
+// WorldHeightMap destructor .
+//
+WorldHeightMap::~WorldHeightMap(void)
+{
+	delete[](m_data);
+	m_data = NULL;
+
+	delete[](m_tileNdxes);
+	m_tileNdxes = NULL;
+
+	delete[](m_blendTileNdxes);
+	m_blendTileNdxes = NULL;
+
+	delete[](m_extraBlendTileNdxes);
+	m_extraBlendTileNdxes = NULL;
+
+	delete[](m_cliffInfoNdxes);
+	m_cliffInfoNdxes = NULL;
+
+	delete[](m_cellFlipState);
+	m_cellFlipState = NULL;
+
+	delete[](m_seismicUpdateFlag);
+	m_seismicUpdateFlag = NULL;
+
+	delete[](m_seismicZVelocities);
+	m_seismicZVelocities = NULL;
+
+	delete[](m_cellCliffState);
+	m_cellCliffState = NULL;
+
+	int i;
+	for (i=0; i<NUM_SOURCE_TILES; i++) {
+		REF_PTR_RELEASE(m_sourceTiles[i]);
+		REF_PTR_RELEASE(m_edgeTiles[i]);
+	}
+	for (i=0; i<NUM_ALPHA_TILES; i++) {
+		REF_PTR_RELEASE(m_alphaTiles[i]);
+	}
+	REF_PTR_RELEASE(m_terrainTex);
+	REF_PTR_RELEASE(m_alphaTerrainTex);
+	REF_PTR_RELEASE(m_alphaEdgeTex);
+}
+
+void WorldHeightMap::freeListOfMapObjects(void)
+{
+	if (MapObject::TheMapObjectListPtr)
+	{
+		deleteInstance(MapObject::TheMapObjectListPtr);
+		MapObject::TheMapObjectListPtr = NULL;
+	}
+	MapObject::getWorldDict()->clear();
+}
+
+
+/**
+ WorldHeightMap - create a new height map for class WorldHeightMap.
+ Note that there is 1 m_numBlendedTiles, which is the implied
+ transparent tile for non-blended tiles.
+*/
+WorldHeightMap::WorldHeightMap():
+	m_width(0), m_height(0),  m_dataSize(0), m_data(NULL), m_cellFlipState(NULL), m_seismicUpdateFlag(NULL), m_seismicZVelocities(NULL),
+	m_drawOriginX(0), m_drawOriginY(0),
+	m_numTextureClasses(0),
+	m_drawWidthX(NORMAL_DRAW_WIDTH), m_drawHeightY(NORMAL_DRAW_HEIGHT),
+	m_tileNdxes(NULL), m_blendTileNdxes(NULL), m_extraBlendTileNdxes(NULL), m_cliffInfoNdxes(NULL),
+	m_terrainTexHeight(1), m_alphaTexHeight(1),	m_cellCliffState(NULL),
+#ifdef EVAL_TILING_MODES
+	m_tileMode(TILE_4x4),
+#endif
+	m_numCliffInfo(1),
+	m_terrainTex(NULL), m_alphaTerrainTex(NULL), m_numBitmapTiles(0), m_numBlendedTiles(1)
+{
+	Int i;
+	for (i=0; i<NUM_SOURCE_TILES; i++) {
+		m_sourceTiles[i] = NULL;
+		m_edgeTiles[i] = NULL;
+	}
+
+	TheSidesList->validateSides();
+	setupAlphaTiles();
+}
+
+#ifdef EVAL_TILING_MODES
+static Bool ParseFunkyTilingDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	WorldHeightMap *pThis = (WorldHeightMap *)userData;
+	*((Int *)&pThis->m_tileMode) = file.readInt();
+	return true;
+}
+#endif
+
+/**
+* WorldHeightMap - read a height map from a file.
+* Format is  Chunky.
+*
+*	Input: ChunkInputStream,
+*
+*/
+WorldHeightMap::WorldHeightMap(ChunkInputStream *pStrm, Bool logicalDataOnly):
+	m_width(0), m_height(0),  m_dataSize(0), m_data(NULL), m_cellFlipState(NULL), m_seismicUpdateFlag(NULL), m_seismicZVelocities(NULL),
+	m_drawOriginX(0),	m_cellCliffState(NULL), m_drawOriginY(0),
+	m_numTextureClasses(0),
+	m_drawWidthX(NORMAL_DRAW_WIDTH), m_drawHeightY(NORMAL_DRAW_HEIGHT),
+	m_tileNdxes(NULL), m_blendTileNdxes(NULL), m_extraBlendTileNdxes(NULL), m_cliffInfoNdxes(NULL),
+	m_terrainTexHeight(1), m_alphaTexHeight(1),
+#ifdef EVAL_TILING_MODES
+	m_tileMode(TILE_4x4),
+#endif
+	m_numCliffInfo(1),
+	m_terrainTex(NULL), m_alphaTerrainTex(NULL), m_numBitmapTiles(0), m_numBlendedTiles(1)
+{
+
+	int i;
+	for (i=0; i<NUM_SOURCE_TILES; i++) {
+		m_sourceTiles[i]=NULL;
+		m_edgeTiles[i]=NULL;
+	}
+	if (TheGlobalData && TheGlobalData->m_stretchTerrain) {
+		m_drawWidthX=STRETCH_DRAW_WIDTH;
+		m_drawHeightY=STRETCH_DRAW_HEIGHT;
+	}
+
+	DataChunkInput file( pStrm );
+
+	if (logicalDataOnly) {
+		file.registerParser( "HeightMapData", AsciiString::TheEmptyString, ParseSizeOnlyInChunk );
+		file.registerParser( "WorldInfo", AsciiString::TheEmptyString, ParseWorldDictDataChunk );
+		file.registerParser( "ObjectsList", AsciiString::TheEmptyString, ParseObjectsDataChunk );
+		freeListOfMapObjects(); // just in case.
+		file.registerParser( "PolygonTriggers", AsciiString::TheEmptyString, PolygonTrigger::ParsePolygonTriggersDataChunk );
+		PolygonTrigger::deleteTriggers(); // just in case.
+		TheSidesList->emptySides();
+		file.registerParser("SidesList", AsciiString::TheEmptyString,	SidesList::ParseSidesDataChunk );
+	}	else {
+		file.registerParser( "HeightMapData", AsciiString::TheEmptyString, ParseHeightMapDataChunk );
+		file.registerParser( "BlendTileData", AsciiString::TheEmptyString, ParseBlendTileDataChunk );
+#ifdef EVAL_TILING_MODES
+		file.registerParser( "FUNKY_TILING", AsciiString::TheEmptyString, ParseFunkyTilingDataChunk );
+#endif
+		file.registerParser( "GlobalLighting", AsciiString::TheEmptyString, ParseLightingDataChunk );
+	}
+	if (!file.parse(this)) {
+
+		throw(ERROR_CORRUPT_FILE_FORMAT);
+	}
+	// patch bad maps.
+	if (!logicalDataOnly) {
+		for(i=0; i<m_dataSize; i++) {
+			if (m_cliffInfoNdxes[i]<0 || m_cliffInfoNdxes[i]>= m_numCliffInfo) {
+				m_cliffInfoNdxes[i] = 0;
+			}
+			if (m_blendTileNdxes[i]<0 || m_blendTileNdxes[i]>= m_numBlendedTiles) {
+				m_blendTileNdxes[i] = 0;
+			}
+			if (m_extraBlendTileNdxes[i]<0 || m_extraBlendTileNdxes[i]>= m_numBlendedTiles) {
+				m_extraBlendTileNdxes[i] = 0;
+			}
+		}
+	}
+	if (TheGlobalData && TheGlobalData->m_drawEntireTerrain) {
+		m_drawWidthX=m_width;
+		m_drawHeightY=m_height;
+	}
+	if (m_drawWidthX > m_width) {
+		m_drawWidthX = m_width;
+	}
+	if (m_drawHeightY > m_height) {
+		m_drawHeightY = m_height;
+	}
+
+	TheSidesList->validateSides();
+	setupAlphaTiles();
+}
+
+/** Optimized version of method to get triangle flip state of a terrain cell.  Use this
+*	instead of getAlphaUVData() whenever possible.
+*/
+Bool WorldHeightMap::getFlipState(Int xIndex, Int yIndex) const
+{
+	if (xIndex<0 || yIndex<0) return false;
+	if (yIndex>=m_height) return false;
+	if (xIndex>=m_width) return false;
+	if (!m_cellFlipState) return false;
+	return m_cellFlipState[yIndex*m_flipStateWidth + (xIndex >> 3)] & (1<<(xIndex&0x7));
+}
+
+/** Sets the value of the flip state bit.
+*/
+void WorldHeightMap::setFlipState(Int xIndex, Int yIndex, Bool value)
+{
+	if (xIndex<0 || yIndex<0) return ;
+	if (yIndex>=m_height) return ;
+	if (xIndex>=m_width) return ;
+	if (!m_cellFlipState) return ;
+	UnsignedByte *curVal = &m_cellFlipState[yIndex*m_flipStateWidth + (xIndex >> 3)];
+	if (value) {
+		*curVal |= (1<<(xIndex&0x7));
+	}	else {
+		*curVal &= ~(1<<(xIndex&0x7));
+	}
+}
+
+/** Clears all flip state bits.
+*/
+void WorldHeightMap::clearFlipStates(void) {
+	if (m_cellFlipState) {
+		memset(m_cellFlipState,0,m_flipStateWidth*m_height);	//clear all flags
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////////m_SeismicUpdateFlag
+Bool WorldHeightMap::getSeismicUpdateFlag(Int xIndex, Int yIndex) const
+{
+	if (xIndex<0 || yIndex<0) return false;
+	if (yIndex>=m_height) return false;
+	if (xIndex>=m_width) return false;
+	if (!m_seismicUpdateFlag) return false;
+	return m_seismicUpdateFlag[yIndex*m_seismicUpdateWidth + (xIndex >> 3)] & (1<<(xIndex&0x7));
+}
+void WorldHeightMap::setSeismicUpdateFlag(Int xIndex, Int yIndex, Bool value)
+{
+	if (xIndex<0 || yIndex<0) return ;
+	if (yIndex>=m_height) return ;
+	if (xIndex>=m_width) return ;
+	if (!m_seismicUpdateFlag) return ;
+	UnsignedByte *curVal = &m_seismicUpdateFlag[yIndex*m_seismicUpdateWidth + (xIndex >> 3)];
+	if (value) {
+		*curVal |= (1<<(xIndex&0x7));
+	}	else {
+		*curVal &= ~(1<<(xIndex&0x7));
+	}
+}
+void WorldHeightMap::clearSeismicUpdateFlags(void)
+{
+	if (m_seismicUpdateFlag) {
+		memset(m_seismicUpdateFlag,0,m_seismicUpdateWidth*m_height);	//clear all flags
+	}
+}
+
+///////////////////////////////////////////////m_SeismicZVelocities
+Real WorldHeightMap::getSeismicZVelocity(Int xIndex, Int yIndex) const
+{
+	if (xIndex<0 || yIndex<0) return false;
+	if (yIndex>=m_height) return false;
+	if (xIndex>=m_width) return false;
+	if (!m_seismicZVelocities) return false;
+	return m_seismicZVelocities[yIndex*m_width + xIndex];
+}
+void WorldHeightMap::setSeismicZVelocity(Int xIndex, Int yIndex, Real value)
+{
+	if (xIndex<0 || yIndex<0) return ;
+	if (yIndex>=m_height) return ;
+	if (xIndex>=m_width) return ;
+	if (!m_seismicZVelocities) return ;
+	m_seismicZVelocities[yIndex*m_width + xIndex] = value;
+}
+void WorldHeightMap::fillSeismicZVelocities( Real value )
+{
+	if (!m_seismicZVelocities) return ;
+  for (Int idx = 0; idx < m_width*m_height; ++idx)
+    m_seismicZVelocities[idx] = value;
+}
+
+Real WorldHeightMap::getBilinearSampleSeismicZVelocity( Int x, Int y)
+{
+	if ( x < 0 || y < 0 ) return 0;
+	if ( y >= m_height ) return 0;
+	if ( x >= m_width ) return 0;
+	if (!m_seismicZVelocities) return 0;
+
+  Real collector = 0.0f;
+  Real divisor = 0.0f;
+
+  collector += m_seismicZVelocities[ y * m_width + x ];
+  ++divisor;
+
+  if ( y > 0 )
+  {
+    collector += m_seismicZVelocities[ (y-1) * m_width + x ];//bottom
+    ++divisor;
+
+    if( x > 0 )
+    {
+      collector += m_seismicZVelocities[ (y-1) * m_width + (x-1) ];//lower left
+      ++divisor;
+    }
+    if ( x < m_width-1 )
+    {
+      collector += m_seismicZVelocities[ (y-1) * m_width + (x+1) ];//lower right
+      ++divisor;
+    }
+  }
+  if ( y < m_height-1 )
+  {
+    collector += m_seismicZVelocities[ (y+1) * m_width + x ];//top
+    ++divisor;
+
+    if( x > 0 )
+    {
+      collector += m_seismicZVelocities[ (y+1) * m_width + (x-1) ];//upper left
+      ++divisor;
+    }
+    if ( x < m_width-1 )
+    {
+      collector += m_seismicZVelocities[ (y+1) * m_width + (x+1) ];//upper right
+      ++divisor;
+    }
+  }
+  if( x > 0 )
+  {
+    collector += m_seismicZVelocities[ y * m_width + (x-1) ];//left
+    ++divisor;
+  }
+  if ( x < m_width-1 )
+  {
+    collector += m_seismicZVelocities[ y * m_width + (x+1) ];//right
+    ++divisor;
+  }
+
+  collector /= divisor;
+
+  return collector;
+
+}
+
+/** Get whether the cell is a cliff cell (impassable to ground vehicles).
+*/
+Bool WorldHeightMap::getCliffState(Int xIndex, Int yIndex) const
+{
+	if (xIndex<0 || yIndex<0) return false;
+	if (yIndex>=m_height) return false;
+	if (xIndex>=m_width) return false;
+	if (!m_cellCliffState) return false;
+	return m_cellCliffState[yIndex*m_flipStateWidth + (xIndex >> 3)] & (1<<(xIndex&0x7));
+}
+
+//=============================================================================
+// setCliffState
+//=============================================================================
+/** Sets the cliff state for a given cell. */
+//=============================================================================
+void WorldHeightMap::setCliffState(Int xIndex, Int yIndex, Bool state)
+{
+	if (xIndex<0 || yIndex<0) return;
+	if (yIndex>=m_height) return;
+	if (xIndex>=m_width) return;
+	if (!m_cellCliffState) return;
+	UnsignedByte	flagByte = m_cellCliffState[yIndex*m_flipStateWidth + (xIndex >> 3)];
+	UnsignedByte flagMask = (1<<(xIndex&0x7));
+	if (state) {
+		flagByte |= flagMask;
+	} else {
+		flagByte &= (~flagMask);
+	}
+	m_cellCliffState[yIndex*m_flipStateWidth + (xIndex >> 3)] = flagByte;
+}
+
+Bool WorldHeightMap::ParseWorldDictDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	Dict d = file.readDict();
+	*MapObject::getWorldDict() = d;
+	Bool exists;
+	Int theWeather = MapObject::getWorldDict()->getInt(TheKey_weather, &exists);
+	if (exists) {
+		TheWritableGlobalData->m_weather = (Weather) theWeather;
+	}
+	return true;
+}
+
+/**
+* WorldHeightMap::ParseLightingDataChunk - read a global lights chunk.
+* Format is the newer CHUNKY format.
+*	See WHeightMapEdit.cpp for the writer.
+*	Input: DataChunkInput
+*
+*/
+Bool WorldHeightMap::ParseLightingDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+		TheWritableGlobalData->m_timeOfDay = (TimeOfDay)file.readInt();
+		Int i;
+		GlobalData::TerrainLighting	initLightValues	= { { 0,0,0},{0,0,0},{0,0,-1.0f}};
+
+		// initialize the directions of the lights to not be totally invalid, in case old maps are read
+		for (i=0; i<4; i++) {
+			for (Int j=0;j<MAX_GLOBAL_LIGHTS; j++) {
+				TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j]=initLightValues;
+				TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j]=initLightValues;
+			}
+		}
+
+		for (i=0; i<4; i++) {
+			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].ambient.red = file.readReal();
+			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].ambient.green = file.readReal();
+			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].ambient.blue = file.readReal();
+			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].diffuse.red = file.readReal();
+			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].diffuse.green = file.readReal();
+			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].diffuse.blue = file.readReal();
+			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].lightPos.x = file.readReal();
+			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].lightPos.y = file.readReal();
+			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].lightPos.z = file.readReal();
+
+			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].ambient.red = file.readReal();
+			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].ambient.green = file.readReal();
+			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].ambient.blue = file.readReal();
+			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].diffuse.red = file.readReal();
+			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].diffuse.green = file.readReal();
+			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].diffuse.blue = file.readReal();
+			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].lightPos.x = file.readReal();
+			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].lightPos.y = file.readReal();
+			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].lightPos.z = file.readReal();
+
+			if (info->version >= K_LIGHTING_VERSION_2) {
+				for (Int j=1; j<3; j++)	//added support for 2 extra object lights
+				{
+					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].ambient.red = file.readReal();
+					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].ambient.green = file.readReal();
+					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].ambient.blue = file.readReal();
+					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].diffuse.red = file.readReal();
+					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].diffuse.green = file.readReal();
+					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].diffuse.blue = file.readReal();
+					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].lightPos.x = file.readReal();
+					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].lightPos.y = file.readReal();
+					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].lightPos.z = file.readReal();
+				}
+			}
+			if (info->version >= K_LIGHTING_VERSION_3) {
+				for (Int j=1; j<3; j++)	//added support for 2 extra terrain lights
+				{
+					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].ambient.red = file.readReal();
+					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].ambient.green = file.readReal();
+					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].ambient.blue = file.readReal();
+					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].diffuse.red = file.readReal();
+					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].diffuse.green = file.readReal();
+					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].diffuse.blue = file.readReal();
+					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].lightPos.x = file.readReal();
+					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].lightPos.y = file.readReal();
+					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].lightPos.z = file.readReal();
+				}
+			}
+		}
+		if (!file.atEndOfChunk()) {
+			UnsignedInt shadowColor = file.readInt();
+			if (TheW3DShadowManager) {
+				TheW3DShadowManager->setShadowColor(shadowColor);
+			}
+		}
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
+	return true;
+}
+
+/**
+* WorldHeightMap::ParseObjectsDataChunk - read a height map chunk.
+* Format is the newer CHUNKY format.
+*	See WHeightMapEdit.cpp for the writer.
+*	Input: DataChunkInput
+*
+*/
+Bool WorldHeightMap::ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	file.m_currentObject = NULL;
+	file.registerParser( "Object", info->label, ParseObjectDataChunk );
+	return (file.parse(userData));
+}
+
+/**
+* WorldHeightMap::ParseHeightMapData - read a height map chunk.
+* Format is the newer CHUNKY format.
+*	See WHeightMapEdit.cpp for the writer.
+*	Input: DataChunkInput
+*
+*/
+Bool WorldHeightMap::ParseHeightMapDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	WorldHeightMap *pThis = (WorldHeightMap *)userData;
+	return pThis->ParseHeightMapData(file, info, userData);
+}
+
+/**
+* WorldHeightMap::ParseHeightMapData - read a height map chunk.
+* Format is the newer CHUNKY format.
+*	See WHeightMapEdit.cpp for the writer.
+*	Input: DataChunkInput
+*
+*/
+Bool WorldHeightMap::ParseHeightMapData(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	m_width = file.readInt();
+	m_height = file.readInt();
+	if (info->version >= K_HEIGHT_MAP_VERSION_3) {
+		m_borderSize = file.readInt();
+	} else {
+		m_borderSize = 0;
+	}
+
+	if (info->version >= K_HEIGHT_MAP_VERSION_4) {
+		Int numBorders = file.readInt();
+		m_boundaries.resize(numBorders);
+		for (int i = 0; i < numBorders; ++i) {
+			m_boundaries[i].x = file.readInt();
+			m_boundaries[i].y = file.readInt();
+		}
+	} else {
+		m_boundaries.resize(1);
+		m_boundaries[0].x = m_width - 2 * m_borderSize;
+		m_boundaries[0].y = m_height - 2 * m_borderSize;
+	}
+
+	m_dataSize = file.readInt();
+	m_data = MSGNEW("WorldHeightMap_ParseHeightMapData") UnsignedByte[m_dataSize];
+	if (m_dataSize <= 0 || (m_dataSize != (m_width*m_height))) {
+		throw ERROR_CORRUPT_FILE_FORMAT	;
+	}
+
+	Int numBytesX = (m_width+7)/8;	//how many bytes to fit all bitflags
+	Int numBytesY = m_height;
+	m_seismicUpdateWidth=numBytesX;
+	m_seismicUpdateFlag	= MSGNEW("WorldHeightMap::ParseHeightMapData _ m_seismicUpdateFlag allocated") UnsignedByte[numBytesX*numBytesY];
+  clearSeismicUpdateFlags();
+  m_seismicZVelocities = MSGNEW("WorldHeightMap_ParseHeightMapData _ zvelocities allocated") Real[m_dataSize];
+  fillSeismicZVelocities( 0 );
+
+
+	file.readArrayOfBytes((char *)m_data, m_dataSize);
+	// Resize me.
+	if (info->version == K_HEIGHT_MAP_VERSION_1) {
+		Int newWidth = (m_width+1)/2;
+		Int newHeight = (m_height+1)/2;
+		Int i, j;
+		for (i=0; i<newHeight; i++) {
+			for (j=0; j<newWidth; j++) {
+				m_data[i*newWidth+j] = m_data[2*i*m_width+2*j];
+			}
+		}
+	}
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
+	return true;
+}
+
+/**
+* WorldHeightMap::ParseHeightMapData - read a height map chunk.
+* Format is the newer CHUNKY format.
+*	See WHeightMapEdit.cpp for the writer.
+*	Input: DataChunkInput
+*
+*/
+Bool WorldHeightMap::ParseSizeOnlyInChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	WorldHeightMap *pThis = (WorldHeightMap *)userData;
+	return pThis->ParseSizeOnly(file, info, userData);
+}
+
+/**
+* WorldHeightMap::ParseHeightMapData - read a height map chunk.
+* Format is the newer CHUNKY format.
+*	See WHeightMapEdit.cpp for the writer.
+*	Input: DataChunkInput
+*
+*/
+Bool WorldHeightMap::ParseSizeOnly(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	m_width = file.readInt();
+	m_height = file.readInt();
+	if (info->version >= K_HEIGHT_MAP_VERSION_3) {
+		m_borderSize = file.readInt();
+	} else {
+		m_borderSize = 0;
+	}
+
+	if (info->version >= K_HEIGHT_MAP_VERSION_4) {
+		Int numBorders = file.readInt();
+		m_boundaries.resize(numBorders);
+		for (int i = 0; i < numBorders; ++i) {
+			m_boundaries[i].x = file.readInt();
+			m_boundaries[i].y = file.readInt();
+		}
+	} else {
+		m_boundaries.resize(1);
+		m_boundaries[0].x = m_width - 2 * m_borderSize;
+		m_boundaries[0].y = m_height - 2 * m_borderSize;
+	}
+
+	m_dataSize = file.readInt();
+	m_data = MSGNEW("WorldHeightMap_ParseSizeOnly") UnsignedByte[m_dataSize];
+	if (m_dataSize <= 0 || (m_dataSize != (m_width*m_height))) {
+		throw ERROR_CORRUPT_FILE_FORMAT	;
+	}
+	file.readArrayOfBytes((char *)m_data, m_dataSize);
+	// Resize me.
+	if (info->version == K_HEIGHT_MAP_VERSION_1) {
+		Int newWidth = (m_width+1)/2;
+		Int newHeight = (m_height+1)/2;
+		Int i, j;
+		for (i=0; i<newHeight; i++) {
+			for (j=0; j<newWidth; j++) {
+				m_data[i*newWidth+j] = m_data[2*i*m_width+2*j];
+			}
+		}
+		m_width = newWidth;
+		m_height = newHeight;
+	}
+	return true;
+}
+
+/**
+* WorldHeightMap::ParseBlendTileDataChunk - read a blend tile info chunk.
+* Format is the newer CHUNKY format.
+*	See WHeightMapEdit.cpp for the writer.
+*	Input: DataChunkInput
+*
+*/
+Bool WorldHeightMap::ParseBlendTileDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	WorldHeightMap *pThis = (WorldHeightMap *)userData;
+	return pThis->ParseBlendTileData(file, info, userData);
+}
+
+/** Function to read in the tiles for a texture class. */
+void WorldHeightMap::readTexClass(TXTextureClass *texClass, TileData **tileData)
+{
+	char path[_MAX_PATH];
+	path[0] = 0;
+	File *theFile = NULL;
+
+	// get the file from the description in TheTerrainTypes
+	TerrainType *terrain = TheTerrainTypes->findTerrain( texClass->name );
+	char texturePath[ _MAX_PATH ];
+	if (terrain==NULL)
+	{
+#ifdef LOAD_TEST_ASSETS
+		theFile = TheFileSystem->openFile( texClass->name.str(), File::READ|File::BINARY);
+#endif
+	}
+	else
+	{
+		sprintf( texturePath, "%s%s", TERRAIN_TGA_DIR_PATH, terrain->getTexture().str() );
+		theFile = TheFileSystem->openFile( texturePath, File::READ|File::BINARY);
+	}
+
+	if (theFile != NULL) {
+		GDIFileStream theStream(theFile);
+		InputStream *pStr = &theStream;
+		Int numTiles = WorldHeightMap::countTiles(pStr);
+		theFile->seek(0, File::START);
+		if (numTiles >= texClass->numTiles) {
+			numTiles = texClass->numTiles;
+			Int width;
+			for (width = 10; width >= 1; width--) {
+				if (numTiles >= width*width) {
+					numTiles = width*width;
+					break;
+				}
+			}
+			WorldHeightMap::readTiles(pStr, tileData+texClass->firstTile, width);
+		}
+		theFile->close();
+	}
+}
+
+/**
+* WorldHeightMap::ParseBlendTileData - read a blend tile info chunk.
+* Format is the newer CHUNKY format.
+*	See WHeightMapEdit.cpp for the writer.
+*	Input: DataChunkInput
+*
+*/
+Bool WorldHeightMap::ParseBlendTileData(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	int i, j;
+	Int len = file.readInt();
+	if (m_dataSize != len) {
+		throw ERROR_CORRUPT_FILE_FORMAT	;
+	}
+	m_tileNdxes = MSGNEW("WorldHeightMap_ParseBlendTileData") Short[m_dataSize];
+	m_cliffInfoNdxes = MSGNEW("WorldHeightMap_ParseBlendTileData") Short[m_dataSize];
+	m_blendTileNdxes = MSGNEW("WorldHeightMap_ParseBlendTileData") Short[m_dataSize];
+	m_extraBlendTileNdxes = MSGNEW("WorldHeightMap_ParseBlendTileData") Short[m_dataSize];
+	// Note - we have one less cell than the width & height. But for paranoia, allocate
+	// extra row. jba.
+	//
+	Int numBytesX = (m_width+7)/8;	//how many bytes to fit all bitflags
+	Int numBytesY = m_height;
+
+	m_flipStateWidth=numBytesX;
+
+	m_cellFlipState	= MSGNEW("WorldHeightMap_getTerrainTexture") UnsignedByte[numBytesX*numBytesY];
+	m_cellCliffState	= MSGNEW("WorldHeightMap_getTerrainTexture") UnsignedByte[numBytesX*numBytesY];
+	memset(m_cellFlipState,0,numBytesX*numBytesY);	//clear all flags
+	memset(m_cellCliffState,0,numBytesX*numBytesY);	//clear all flags
+
+	file.readArrayOfBytes((char*)m_tileNdxes, m_dataSize*sizeof(Short));
+	file.readArrayOfBytes((char*)m_blendTileNdxes, m_dataSize*sizeof(Short));
+	if (info->version >= K_BLEND_TILE_VERSION_6) {
+		file.readArrayOfBytes((char*)m_extraBlendTileNdxes, m_dataSize*sizeof(Short));
+		//Allow clearing of extra blend tiles via ini and resaving of map.
+		//Useful for flushing out initial maps made with buggy 3-way blending.
+		if (!TheGlobalData->m_use3WayTerrainBlends)
+			memset(m_extraBlendTileNdxes,0,m_dataSize*sizeof(Short));
+	}
+	if (info->version >= K_BLEND_TILE_VERSION_5) {
+		file.readArrayOfBytes((char*)m_cliffInfoNdxes, m_dataSize*sizeof(Short));
+	}
+	if (info->version >= K_BLEND_TILE_VERSION_7) {
+		if (info->version==K_BLEND_TILE_VERSION_7) {
+			Int byteWidth = (m_width+1)/8; // previous incorrect length that got used to save the file.  jba. [4/3/2003]
+			UnsignedByte *data = new UnsignedByte[m_height*byteWidth];
+			file.readArrayOfBytes((char*)data, m_height*byteWidth);
+			for (j=0; j<m_height; j++) {
+				for (i=0; i<byteWidth; i++) {
+					m_cellCliffState[j*m_flipStateWidth + i] = data[j*byteWidth + i];
+				}
+			}
+		} else {
+			file.readArrayOfBytes((char*)m_cellCliffState, m_height*m_flipStateWidth);
+		}
+	} else {
+		initCliffFlagsFromHeights();
+	}
+	m_numBitmapTiles = file.readInt();
+	DEBUG_ASSERTCRASH(m_numBitmapTiles>0 && m_numBitmapTiles<2048, ("Unlikely numBitmapTiles."));
+	m_numBlendedTiles = file.readInt();
+	DEBUG_ASSERTCRASH(m_numBlendedTiles>0 && m_numBlendedTiles<NUM_BLEND_TILES+1, ("Unlikely numBlendedTiles."));
+	if (info->version >= K_BLEND_TILE_VERSION_5) {
+		m_numCliffInfo = file.readInt();
+	} else {
+		m_numCliffInfo = 1;	// cliffInfo[0] is the default info.
+	}
+// --> file loading here
+	m_numTextureClasses	= file.readInt();
+	DEBUG_ASSERTCRASH(m_numTextureClasses>0 && m_numTextureClasses<200, ("Unlikely m_numTextureClasses."));
+	for (i=0; i<m_numTextureClasses; i++) {
+		m_textureClasses[i].globalTextureClass = -1;
+		m_textureClasses[i].firstTile = file.readInt();
+		m_textureClasses[i].numTiles = file.readInt();
+		m_textureClasses[i].width = file.readInt();
+
+		// legacy GDF data
+		// used to read "m_textureClasses[i].isGDF = file.readInt();"
+	/*	Int legacy = */ file.readInt();
+
+		m_textureClasses[i].name = file.readAsciiString();
+		readTexClass(&m_textureClasses[i], m_sourceTiles);
+	}
+	m_numEdgeTextureClasses = 0;
+	m_numEdgeTiles = 0;
+	if (info->version >= K_BLEND_TILE_VERSION_4) {
+		m_numEdgeTiles	= file.readInt();
+		m_numEdgeTextureClasses	= file.readInt();
+		for (i=0; i<m_numEdgeTextureClasses; i++) {
+			m_edgeTextureClasses[i].globalTextureClass = -1;
+			m_edgeTextureClasses[i].firstTile = file.readInt();
+			m_edgeTextureClasses[i].numTiles = file.readInt();
+			m_edgeTextureClasses[i].width = file.readInt();
+			m_edgeTextureClasses[i].name = file.readAsciiString();
+			readTexClass(&m_edgeTextureClasses[i], m_edgeTiles);
+		}
+	}
+	for (i=1; i<m_numBlendedTiles; i++) {
+		Int flag;
+		m_blendedTiles[i].blendNdx = file.readInt();
+		m_blendedTiles[i].horiz = file.readByte();
+		m_blendedTiles[i].vert = file.readByte();
+		m_blendedTiles[i].rightDiagonal = file.readByte();
+		m_blendedTiles[i].leftDiagonal = file.readByte();
+		m_blendedTiles[i].inverted = file.readByte();
+		//Allow clearing of extra blend tiles via ini and resaving of map.
+		//Useful for flushing out initial maps made with buggy 3-way blending.
+		if (!TheGlobalData->m_use3WayTerrainBlends)
+			m_blendedTiles[i].inverted &= ~FLIPPED_MASK;	//filter out extra flips from 3-way
+
+		if (info->version >= K_BLEND_TILE_VERSION_3) {
+			m_blendedTiles[i].longDiagonal = file.readByte();
+		} else {
+			m_blendedTiles[i].longDiagonal = false;
+		}
+		if (info->version >= K_BLEND_TILE_VERSION_4) {
+			m_blendedTiles[i].customBlendEdgeClass = file.readInt();
+		} else {
+			m_blendedTiles[i].customBlendEdgeClass = -1;
+		}
+
+		flag = file.readInt();
+		DEBUG_ASSERTCRASH(flag==FLAG_VAL, ("Invalid format."));
+		if (flag != FLAG_VAL) {
+			throw ERROR_CORRUPT_FILE_FORMAT;
+		}
+	}
+	if (info->version >= K_BLEND_TILE_VERSION_5) {
+		for (i=1; i<m_numCliffInfo; i++) {
+			m_cliffInfo[i].tileIndex = file.readInt();
+			m_cliffInfo[i].u0 = file.readReal();
+			m_cliffInfo[i].v0 = file.readReal();
+			m_cliffInfo[i].u1 = file.readReal();
+			m_cliffInfo[i].v1 = file.readReal();
+			m_cliffInfo[i].u2 = file.readReal();
+			m_cliffInfo[i].v2 = file.readReal();
+			m_cliffInfo[i].u3 = file.readReal();
+			m_cliffInfo[i].v3 = file.readReal();
+			m_cliffInfo[i].flip = file.readByte();
+			m_cliffInfo[i].mutant = file.readByte();
+		}
+	}
+	// Resize me.
+	if (info->version == K_BLEND_TILE_VERSION_1) {
+		Int newWidth = (m_width+1)/2;
+		Int newHeight = (m_height+1)/2;
+		Int i, j;
+		for (i=0; i<newHeight; i++) {
+			for (j=0; j<newWidth; j++) {
+				m_tileNdxes[i*newWidth+j] = m_tileNdxes[2*i*m_width+2*j];
+				m_blendTileNdxes[i*newWidth+j] = 0;
+				m_extraBlendTileNdxes[i*newWidth+j] = 0;
+				m_cliffInfoNdxes[i*newWidth+j] = 0;
+			}
+		}
+		m_numBlendedTiles = 1;
+		m_numCliffInfo = 1;
+		m_width= newWidth;
+		m_height = newHeight;
+		m_dataSize = m_width*m_height;
+	}
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
+	return true;
+}
+
+
+/**
+* WorldHeightMap::ParseObjectData - read a object info chunk.
+* Format is the newer CHUNKY format.
+*	See WHeightMapEdit.cpp for the writer.
+*	Input: DataChunkInput
+*
+*/
+Bool WorldHeightMap::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
+{
+	WorldHeightMap *pThis = (WorldHeightMap *)file.m_userData;
+	return pThis->ParseObjectData(file, info, userData, info->version >= K_OBJECTS_VERSION_2);
+}
+
+/**
+* WorldHeightMap::ParseObjectData - read a object info chunk.
+* Format is the newer CHUNKY format.
+*	See WHeightMapEdit.cpp for the writer.
+*	Input: DataChunkInput
+*
+*/
+Bool WorldHeightMap::ParseObjectData(DataChunkInput &file, DataChunkInfo *info, void *userData, Bool readDict)
+{
+	MapObject *pPrevious = (MapObject *)file.m_currentObject;
+
+	Coord3D loc;
+	loc.x = file.readReal();
+	loc.y = file.readReal();
+	loc.z = file.readReal();
+
+	Real minZ = -100*MAP_XY_FACTOR;
+	Real maxZ = (255*10)*MAP_HEIGHT_SCALE;
+
+	if (info->version <= K_OBJECTS_VERSION_2) {
+		loc.z = 0;
+	}
+
+	Real angle = file.readReal();
+	Int flags = file.readInt();
+	AsciiString name = file.readAsciiString();
+	Dict d;
+	if (readDict)
+	{
+		d = file.readDict();
+	}
+
+	if (loc.z<minZ || loc.z>maxZ) {
+		DEBUG_LOG(("Removing object at z height %f", loc.z));
+		return true;
+	}
+
+	MapObject *pThisOne;
+
+	// create the map object
+	pThisOne = newInstance( MapObject )( loc, name, angle, flags, &d,
+														TheThingFactory->findTemplate( name, FALSE ) );
+
+//DEBUG_LOG(("obj %s owner %s",name.str(),d.getAsciiString(TheKey_originalOwner).str()));
+
+	if (pThisOne->getProperties()->getType(TheKey_waypointID) == Dict::DICT_INT)
+		pThisOne->setIsWaypoint();
+
+	if (pThisOne->getProperties()->getType(TheKey_lightHeightAboveTerrain) == Dict::DICT_REAL)
+		pThisOne->setIsLight();
+
+	if (pThisOne->getProperties()->getType(TheKey_scorchType) == Dict::DICT_INT)
+		pThisOne->setIsScorch();
+
+
+	if (pPrevious) {
+		DEBUG_ASSERTCRASH(MapObject::TheMapObjectListPtr != NULL && pPrevious->getNext() == NULL, ("Bad linkage."));
+		pPrevious->setNextMap(pThisOne);
+	}	else {
+		DEBUG_ASSERTCRASH(MapObject::TheMapObjectListPtr == NULL, ("Bad linkage."));
+		MapObject::TheMapObjectListPtr = pThisOne;
+	}
+	file.m_currentObject = pThisOne;
+	return true;
+}
+
+
+
+// Targa format:  Header
+
+typedef struct {
+	UnsignedByte	idLength;
+	UnsignedByte	colorMapType; // 0 = rgb, 1 = indexed.
+	UnsignedByte	imageType; //0x1 = indexed, 0x2 = rgb, 0x8 = rle.
+	UnsignedByte	colorMapInfo[5]; // we ignore, only do rgb.
+	Short			xOrigin;
+	Short			yOrigin;
+	Short			imageWidth;
+	Short			imageHeight;
+	UnsignedByte	pixelDepth;
+	UnsignedByte	flags; //  &0x0F = alpha channel bits, &0x10 is right to left flag,
+						   // 0x20 is top to bottom flag.  (0x0? is left to right, bottom to top)
+						   // 0x3? is top to bottom, right to left.
+} TTargaHeader;
+
+// followed by idLength bytes of ascii data
+
+// followed by pixel data
+
+// followed by optional data.
+
+
+
+/// Count how many tiles come in from a targa file.
+Int WorldHeightMap::countTiles(InputStream *pStr, Bool *halfTile)
+{
+	TTargaHeader hdr;
+	if (halfTile) {
+		*halfTile = false;
+	}
+	Int len = pStr->read(&hdr,sizeof(hdr));
+	if (len!=sizeof(hdr)) return(0);
+	Int tileWidth = hdr.imageWidth/TILE_PIXEL_EXTENT;
+	Int tileHeight = hdr.imageHeight/TILE_PIXEL_EXTENT;
+
+	if (hdr.colorMapType != 0) {
+		return(0); // we don't do indexed at this time. jba.
+	}
+	if (hdr.imageType != 0x2 && hdr.imageType != 0xA) {
+		return(0); // we don't do indexed at this time. jba.
+	}
+
+	if (hdr.pixelDepth < 24) return(false);
+	if (hdr.pixelDepth > 32) return(false);
+	// 3x3 gives 9,
+	// 2x2 gives 4,
+	// 1x1 gives 1,
+	// else 0;
+	if (tileWidth>10 || tileHeight>10) return(0);  // don't do huge images, or bad files.
+	if (tileWidth>=10 && tileHeight >=10) return(100);
+	if (tileWidth>=9 && tileHeight >=9) return(81);
+	if (tileWidth>=8 && tileHeight >=8) return(64);
+	if (tileWidth>=7 && tileHeight >=7) return(49);
+	if (tileWidth>=6 && tileHeight >=6) return(36);
+	if (tileWidth>=5 && tileHeight >=5) return(25);
+	if (tileWidth>=4 && tileHeight >=4) return(16);
+	if (tileWidth>=3 && tileHeight >=3) return(9);
+	if (tileWidth>=2 && tileHeight >=2) return(4);
+	if (tileWidth>=1 && tileHeight >=1) return(1);
+	if (halfTile && hdr.imageHeight==TILE_PIXEL_EXTENT/2 && hdr.imageWidth==TILE_PIXEL_EXTENT/2) {
+		*halfTile = true;
+		return 1;
+	}
+	return(0);
+}
+/*Break down a .tga file into a collection of tiles.  numRows * numRows total tiles.*/
+Bool WorldHeightMap::readTiles(InputStream *pStr, TileData **tiles, Int numRows)
+{
+	TTargaHeader hdr;
+	pStr->read(&hdr, sizeof(hdr));
+	Int tileWidth = hdr.imageWidth/TILE_PIXEL_EXTENT;
+	Int tileHeight = hdr.imageHeight/TILE_PIXEL_EXTENT;
+
+	if (hdr.imageHeight==TILE_PIXEL_EXTENT/2) {
+		tileHeight = 1;
+	}
+	if (hdr.imageWidth==TILE_PIXEL_EXTENT/2) {
+		tileWidth = 1;
+	}
+
+	if (tileWidth<numRows && tileHeight<numRows) {
+		return(false);
+	}
+	Bool compressed = false;
+	if (hdr.imageType & 0x08) {
+		compressed = true;
+	}
+	int row = 0;
+	int column = 0;
+	int bytesPerPixel = (hdr.pixelDepth+7)/8;
+	if (bytesPerPixel < 3) return(false);
+	if (bytesPerPixel > 4) return(false);
+	int i;
+	for (i=0; i<numRows*numRows; i++) {
+		if (tiles[i] == NULL)
+			tiles[i] = MSGNEW("WorldHeightMap_readTiles") TileData;
+	}
+	UnsignedByte buf[4];
+	int repeatCount = 0;
+//	Bool read = false;
+	Bool running = false;
+	for (row = 0; row < numRows*TILE_PIXEL_EXTENT; row++) {
+		for (column=0; column<hdr.imageWidth; column++) {
+			UnsignedByte r, g, b, a;
+			if (row < hdr.imageHeight) {
+				if (compressed && repeatCount==0) {
+					UnsignedByte flag;
+					pStr->read(&flag, 1);
+					repeatCount = flag&0x7f;
+					repeatCount++;
+					if (flag&0x80) {
+						running = true;
+						pStr->read(buf, bytesPerPixel);
+					} else {
+						running = false;
+					}
+				}
+				if (compressed) repeatCount--;
+				if (!running) {
+					pStr->read(buf, bytesPerPixel);
+				}
+				r = buf[2]; g = buf[1]; b = buf[0];
+				if (bytesPerPixel==4) {
+					a = buf[3];
+				} else {
+					a = 255;// solid alpha.
+				}
+			} else {
+				r = g = b = a = 0;
+			}
+			if (column >= (numRows*TILE_PIXEL_EXTENT)) continue;
+			int tileNdx = (column/TILE_PIXEL_EXTENT) + numRows*(row/TILE_PIXEL_EXTENT);
+			int pixelNdx = (column%TILE_PIXEL_EXTENT) + TILE_PIXEL_EXTENT*(row%TILE_PIXEL_EXTENT);
+
+			UnsignedByte *pixel = tiles[tileNdx]->getDataPtr();
+
+			pixel += pixelNdx*TILE_BYTES_PER_PIXEL;
+			*pixel++ = b;
+			*pixel++ = g;
+			*pixel++ = r;
+			*pixel = a;
+
+		}
+		DEBUG_ASSERTCRASH(repeatCount==0, ("Invalid tga."));
+	}
+	for (i=0; i<numRows*numRows; i++) {
+		tiles[i]->updateMips();
+	}
+	return(true);
+}
+
+
+
+/** updateTileTexturePositions - assigns each tile a location in the texture.
+*/
+Int WorldHeightMap::updateTileTexturePositions(Int *edgeHeight)
+{
+	Int i, j;
+	Int maxHeight = 0;
+	const Int tilesPerRow = TEXTURE_WIDTH/(TILE_PIXEL_EXTENT+TILE_OFFSET);
+
+	Bool availableGrid[tilesPerRow][tilesPerRow];
+	Int row, column;
+	for (row=0; row<tilesPerRow; row++) {
+		for (column=0; column<tilesPerRow; column++) {
+			availableGrid[row][column] = true;
+		}
+	}
+
+	for (i=0; i<m_numBitmapTiles; i++) {
+		if (m_sourceTiles[i]) {
+			m_sourceTiles[i]->m_tileLocationInTexture.x = 0;
+			m_sourceTiles[i]->m_tileLocationInTexture.y = 0;
+		}
+	}
+
+	/* put the normal tiles into the terrain texture */
+	Int texClass;
+	Int tileWidth;
+	for (tileWidth = tilesPerRow; tileWidth>0; tileWidth--) {
+		for (texClass=0; texClass<m_numTextureClasses; texClass++) {
+			Int width = m_textureClasses[texClass].width;
+			if (width != tileWidth) continue;
+			// Find an available block of space.
+			Bool found = false;
+			for (row=0; row<tilesPerRow-width+1 && !found; row++) {
+				for (column=0; column<tilesPerRow-width+1 && !found; column++) {
+					if (availableGrid[row][column]) {
+						Bool open = true;
+						for (i=0; i<width && open; i++) {
+							for (j=0; j<width&&open; j++) {
+								if (!availableGrid[row+j][column+i]) {
+									open = false;
+								}
+							}
+						}
+						if (open) found = true;
+						break;
+					}
+				}
+				if (found) break;
+			}
+			if (!found) {
+				m_textureClasses[texClass].positionInTexture.x = 0;
+				m_textureClasses[texClass].positionInTexture.y = 0;
+				continue;
+			}
+
+			Int xOrigin = TILE_OFFSET/2 + column*(TILE_PIXEL_EXTENT+TILE_OFFSET);
+			Int yOrigin = TILE_OFFSET/2 + row*(TILE_PIXEL_EXTENT+TILE_OFFSET);
+			m_textureClasses[texClass].positionInTexture.x = xOrigin;
+			m_textureClasses[texClass].positionInTexture.y = yOrigin;
+			Int classHeight = yOrigin + width*TILE_PIXEL_EXTENT+ TILE_OFFSET/2;
+			if (maxHeight < classHeight) maxHeight = classHeight;
+
+			for (i=0; i<width; i++) {
+				for (j=0; j<width; j++) {
+					availableGrid[row+j][column+i] = false;
+					Int baseNdx = m_textureClasses[texClass].firstTile + i + j*width;
+					// In case we are just checking for room...
+					if (m_sourceTiles[baseNdx] == NULL) continue;
+					Int x = xOrigin + i*TILE_PIXEL_EXTENT;
+					Int y = yOrigin + (width-j-1)*TILE_PIXEL_EXTENT;
+					m_sourceTiles[baseNdx]->m_tileLocationInTexture.x = x;
+					m_sourceTiles[baseNdx]->m_tileLocationInTexture.y = y;
+				}
+			}
+		}
+	}
+
+	for (i=0; i<m_numBitmapTiles; i++) {
+		if (m_edgeTiles[i]) {
+			m_edgeTiles[i]->m_tileLocationInTexture.x = 0;
+			m_edgeTiles[i]->m_tileLocationInTexture.y = 0;
+		}
+	}
+
+	/* put the blend edge tiles into the blend edges texture */
+	Int maxEdgeHeight = 0;
+	// Reset the grid, cause we're using a different texture now.
+	for (row=0; row<tilesPerRow; row++) {
+		for (column=0; column<tilesPerRow; column++) {
+			availableGrid[row][column] = true;
+		}
+	}
+	for (texClass=0; texClass<m_numEdgeTextureClasses; texClass++) {
+		Int width = m_edgeTextureClasses[texClass].width;
+		// Find an available block of space.
+		Bool found = false;
+		for (row=0; row<tilesPerRow-width+1 && !found; row++) {
+			for (column=0; column<tilesPerRow-width+1 && !found; column++) {
+				if (availableGrid[row][column]) {
+					Bool open = true;
+					for (i=0; i<width && open; i++) {
+						for (j=0; j<width&&open; j++) {
+							if (!availableGrid[row+j][column+i]) {
+								open = false;
+							}
+						}
+					}
+					if (open) found = true;
+					break;
+				}
+			}
+			if (found) break;
+		}
+		if (!found) {
+			m_edgeTextureClasses[texClass].positionInTexture.x = 0;
+			m_edgeTextureClasses[texClass].positionInTexture.y = 0;
+			continue;
+		}
+
+		Int xOrigin = TILE_OFFSET/2 + column*(TILE_PIXEL_EXTENT+TILE_OFFSET);
+		Int yOrigin = TILE_OFFSET/2 + row*(TILE_PIXEL_EXTENT+TILE_OFFSET);
+		m_edgeTextureClasses[texClass].positionInTexture.x = xOrigin;
+		m_edgeTextureClasses[texClass].positionInTexture.y = yOrigin;
+		Int classHeight = yOrigin + width*TILE_PIXEL_EXTENT+ TILE_OFFSET/2;
+		if (maxEdgeHeight < classHeight) maxEdgeHeight = classHeight;
+
+		for (i=0; i<width; i++) {
+			for (j=0; j<width; j++) {
+				availableGrid[row+j][column+i] = false;
+				Int baseNdx = m_edgeTextureClasses[texClass].firstTile + i + j*width;
+				// In case we are just checking for room...
+				if (m_edgeTiles[baseNdx] == NULL) continue;
+				Int x = xOrigin + i*TILE_PIXEL_EXTENT;
+				Int y = yOrigin + (width-j-1)*TILE_PIXEL_EXTENT;
+				// Use negative offsets to differentiate between tiles & edges.
+				m_edgeTiles[baseNdx]->m_tileLocationInTexture.x = x;
+				m_edgeTiles[baseNdx]->m_tileLocationInTexture.y = y;
+			}
+		}
+	}
+	if (edgeHeight) *edgeHeight = maxEdgeHeight;
+	return maxHeight;
+}
+
+/** getUVData - Gets the texture coordinates to use.  See getTerrainTexture.
+*/
+void WorldHeightMap::getUVForNdx(Int tileNdx, float *minU, float *minV, float *maxU, float*maxV, Bool fullTile)
+{
+	Short baseNdx = tileNdx>>2;
+	if (m_sourceTiles[baseNdx] == NULL) {
+		// Missing texture.
+		*minU = *minV = *maxU = *maxV = 0.0f;
+		return;
+	}
+	ICoord2D pos = m_sourceTiles[baseNdx]->m_tileLocationInTexture;
+	*minU = pos.x;
+	*minV = pos.y;
+	*maxU = *minU+TILE_PIXEL_EXTENT;
+	*maxV = *minV+TILE_PIXEL_EXTENT;
+#ifdef EVAL_TILING_MODES
+	if (m_tileMode == TILE_8x8) {
+		*maxU = *minU+TILE_PIXEL_EXTENT/2.0f;
+		*maxV = *minV+TILE_PIXEL_EXTENT/2.0f;
+	} else if (m_tileMode == TILE_6x6) {
+		*maxU = *minU+2.0f*TILE_PIXEL_EXTENT/3.0f;
+		*maxV = *minV+2.0f*TILE_PIXEL_EXTENT/3.0f;
+	} else {
+		*maxU = *minU+TILE_PIXEL_EXTENT;
+		*maxV = *minV+TILE_PIXEL_EXTENT;
+	}
+#endif
+	*minU/=TEXTURE_WIDTH;
+	*minV/=m_terrainTexHeight;
+	*maxU/=TEXTURE_WIDTH;
+	*maxV/=m_terrainTexHeight;
+	if (!fullTile) {
+		// Tiles are 64x64 pixels, height grids map to 32x32.
+		// So get the proper quadrant of the tile.
+		Real midX = (*minU+*maxU)/2;
+		Real midY = (*minV+*maxV)/2;
+		if (tileNdx&2) {		// y's are flipped.
+			*maxV = midY;
+		} else {
+			*minV = midY;
+		}
+		if (tileNdx&1) {
+			*minU = midX;
+		} else {
+			*maxU = midX;
+		}
+	}
+}
+
+/** getUVData - Gets the texture coordinates to use.  See getTerrainTexture.
+*/
+void WorldHeightMap::getUVForBlend(Int edgeClass, Region2D *range)
+{
+	ICoord2D pos = m_edgeTextureClasses[edgeClass].positionInTexture;
+	Int width = m_edgeTextureClasses[edgeClass].width;
+	range->lo.x = (Real)pos.x/TEXTURE_WIDTH;
+	range->lo.y = (Real)pos.y/m_alphaEdgeHeight;
+	range->hi.x = ((Real)pos.x + width*TILE_PIXEL_EXTENT)/TEXTURE_WIDTH;
+	range->hi.y = ((Real)pos.y + width*TILE_PIXEL_EXTENT)/m_alphaEdgeHeight;
+}
+
+/// Get whether something is cliff indexed with the offset that HeightMapRenderObjClass uses built in.
+Bool WorldHeightMap::isCliffMappedTexture(Int x, Int y) {
+	Int ndx = x+m_drawOriginX+m_width*(y+m_drawOriginY);
+	if (ndx>=0 && ndx<m_dataSize) {
+		return m_cliffInfoNdxes[ndx] != 0;
+	}
+	return false;
+};
+
+/** getUVData - Gets the texture coordinates to use.  See getTerrainTexture.
+		xIndex and yIndex are the integer coorddinates into the height map.
+		U and V are the texture coordiantes for the 4 corners of a height map cell.
+		fullTile is true if we are doing 1/2 resolution height map, and require a full
+		tile to texture  a cell.  Otherwise, we use quarter tiles per cell.
+*/
+Bool WorldHeightMap::getUVData(Int xIndex, Int yIndex, float U[4], float V[4], Bool fullTile)
+{
+#define dont_SHOW_THE_TEXTURE_FOR_DEBUG 1
+#if SHOW_THE_TEXTURE_FOR_DEBUG
+		// This is debug code that just shows the generated texture laid on the terrain.
+		// For debugging ;) jba.
+		xIndex += m_drawOriginX;
+		yIndex += m_drawOriginY;
+		float nU= xIndex;
+		float xU = xIndex+1;
+		float nV = 48-yIndex-1;
+		float xV = 48-yIndex;
+		float k = 48;
+		nU /= k;
+		xU /= k;
+		k = k*m_terrainTexHeight/TEXTURE_WIDTH;
+		nV /= k;
+		xV /= k;
+		U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
+		V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
+		return(true);
+#else
+	xIndex += m_drawOriginX;
+	yIndex += m_drawOriginY;
+	Int ndx = (yIndex*m_width)+xIndex;
+	if ((ndx<m_dataSize) && m_tileNdxes) {
+		Short tileNdx = m_tileNdxes[ndx];
+		return getUVForTileIndex(ndx, tileNdx, U, V, fullTile);
+	}
+	return false;
+#endif
+}
+
+/** getUVForTileIndex - Gets the texture coordinates to use.  See getTerrainTexture.
+		ndx is the index into the linear height array.
+		tileNdx is the index into the texture tiles array.
+		U and V are the texture coordiantes for the 4 corners of a height map cell.
+		fullTile is true if we are doing 1/2 resolution height map, and require a full
+		tile to texture  a cell.  Otherwise, we use quarter tiles per cell.
+*/
+
+Bool WorldHeightMap::getUVForTileIndex(Int ndx, Short tileNdx, float U[4], float V[4], Bool fullTile)
+{
+	Real nU, nV, xU, xV;
+	nU=nV=xU=xV = 0.0f;
+	Int tilesPerRow = TEXTURE_WIDTH/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
+	tilesPerRow *= 4;
+
+	if ((ndx<m_dataSize) && m_tileNdxes) {
+		getUVForNdx(tileNdx, &nU, &nV, &xU, &xV, fullTile);
+		U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
+		V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
+		if (TheGlobalData && !TheGlobalData->m_adjustCliffTextures) {
+			return false;
+		}
+		if (nU==0.0) {
+			return false; // missing texture.
+		}
+		if (fullTile) {
+			return false;
+		}
+		if (m_cliffInfoNdxes[ndx]) {
+			TCliffInfo info = m_cliffInfo[m_cliffInfoNdxes[ndx]];
+			Bool tilesMatch = false;
+			Int ndx1 = tileNdx>>2;
+			Int ndx2 = info.tileIndex>>2;
+			Int i;
+			for (i=0; i<this->m_numTextureClasses; i++) {
+				if (ndx1 >= m_textureClasses[i].firstTile && ndx1 < m_textureClasses[i].firstTile + m_textureClasses[i].numTiles) {
+					tilesMatch = ndx2 >= m_textureClasses[i].firstTile && ndx2 < m_textureClasses[i].firstTile + m_textureClasses[i].numTiles;
+					//tilesMatch = true;
+					break;
+				}
+			}
+			if (tilesMatch) {
+				Real minU = m_textureClasses[i].positionInTexture.x;
+				Real maxV = m_textureClasses[i].positionInTexture.y + m_textureClasses[i].width*TILE_PIXEL_EXTENT;
+				minU/=TEXTURE_WIDTH;
+				maxV/=m_terrainTexHeight;
+				Real vFactor = TEXTURE_WIDTH/m_terrainTexHeight;
+				U[0] = info.u0+minU;
+				U[1] = info.u1+minU;
+				U[2] = info.u2+minU;
+				U[3] = info.u3+minU;
+				V[0] = info.v0*vFactor+maxV;
+				V[1] = info.v1*vFactor+maxV;
+				V[2] = info.v2*vFactor+maxV;
+				V[3] = info.v3*vFactor+maxV;
+				return info.flip;
+			}
+		}
+
+// TheSuperHackers @bugfix xezon 11/12/2025 Disables the old uv adjustment for cliffs,
+// because it produces bad uv tiles on steep terrain and is also not helping performance.
+// @todo Delete this code when we are certain we never need this again.
+//#define DO_OLD_UV
+#ifdef DO_OLD_UV
+// old uv adjustment for cliffs
+		static Real STRETCH_LIMIT = 1.5f;	 // If it is stretching less than this, don't adjust.
+		static Real TILE_LIMIT = 4.0;			// Our tiles are currently 4 cells wide & tall, so dont'
+																			// adjust to more than 4.0.
+
+		static Real TALL_STRETCH_LIMIT = 2.0f;
+		static Real DIAMOND_STRETCH_LIMIT = 2.4f;
+		static Real HEIGHT_SCALE = MAP_HEIGHT_SCALE / MAP_XY_FACTOR;
+
+		Real nU, nV, xU, xV;
+		nU=nV=xU=xV = 0.0f;
+		Int tilesPerRow = TEXTURE_WIDTH/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
+		tilesPerRow *= 4;
+
+
+		getUVForNdx(tileNdx, &nU, &nV, &xU, &xV, fullTile);
+		U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
+		V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
+		if (TheGlobalData && !TheGlobalData->m_adjustCliffTextures) {
+			return false;
+		}
+		if (nU==0.0) {
+			return false; // missing texture.
+		}
+		if (fullTile) {
+			return false;
+		}
+		// check for excessive heights.
+		if (ndx < this->m_dataSize - m_width - 1) {
+			Int h0 = m_data[ndx];
+			Int h1 = m_data[ndx+1];
+			Int h2 = m_data[ndx+m_width+1];
+			Int h3 = m_data[ndx+m_width];
+			Int minH, maxH;
+			minH = maxH = h0;
+			if (minH>h1) minH = h1;
+			if (maxH<h1) maxH = h1;
+			if (minH>h2) minH = h2;
+			if (maxH<h2) maxH = h2;
+			if (minH>h3) minH = h3;
+			if (maxH<h3) maxH = h3;
+//			Int avgH = (h1+h2+h3+h0+2)/4;
+			Int deltaH = maxH-minH;
+			Int below = 0;
+			Int above = 0;
+			Int belowLimit = minH+(2*deltaH+1)/3;
+			Int aboveLimit = minH+(deltaH+1)/3;
+			if (h0<belowLimit) below++;
+			if (h1<belowLimit) below++;
+			if (h2<belowLimit) below++;
+			if (h3<belowLimit) below++;
+			if (h0>aboveLimit) above++;
+			if (h1>aboveLimit) above++;
+			if (h2>aboveLimit) above++;
+			if (h3>aboveLimit) above++;
+			if (deltaH*HEIGHT_SCALE < STRETCH_LIMIT) {
+				return false;
+			}
+
+			Short baseNdx = tileNdx>>2;
+			Short texClass;
+			for (texClass=0; texClass<m_numTextureClasses; texClass++) {
+				if (m_textureClasses[texClass].firstTile<0) {
+					continue;
+				}
+				// see if the blend tile is in a texture class, and get the right tile for xIndex, yIndex.
+				if (baseNdx >= m_textureClasses[texClass].firstTile &&
+					baseNdx < m_textureClasses[texClass].firstTile+m_textureClasses[texClass].numTiles) {
+					break;
+				}
+			}
+			if (texClass>= m_numTextureClasses) return false;
+			Real nUb, nVb, xUb, xVb;
+			nUb = m_textureClasses[texClass].positionInTexture.x;
+			nVb = m_textureClasses[texClass].positionInTexture.y;
+			xUb = nUb+m_textureClasses[texClass].width*TILE_PIXEL_EXTENT;
+			xVb = nVb+m_textureClasses[texClass].width*TILE_PIXEL_EXTENT;
+			nUb/=TEXTURE_WIDTH;
+			nVb/=m_terrainTexHeight;
+			xUb/=TEXTURE_WIDTH;
+			xVb/=m_terrainTexHeight;
+			// Now covers texture bounds.
+			// too much stretch.
+			Real divisor = TILE_LIMIT/(deltaH*HEIGHT_SCALE);
+			if (divisor > TILE_LIMIT) divisor = TILE_LIMIT;
+			if (divisor < 1.0f) divisor = 1.0f;
+			Real deltaV = (xVb-nVb);
+//			Real deltaU = (xUb-nUb);
+
+			if (above != 1 && below != 1 && (above!=2 || below != 2)) {
+				// diamond shaped.  Use default if it is not too stretched, as
+				// the fix is not that appealing either.
+				if (deltaH*HEIGHT_SCALE < DIAMOND_STRETCH_LIMIT) {
+					return false;
+				}
+			}
+
+			if (below==1 || above>below) { //(avgH > minH + (2*deltaH+2)/3)
+				// we got one low guy.
+				if (h0==minH) {
+					V[0] = nV+deltaV/divisor;
+				} else if (h1 == minH) {
+					V[1] = nV+deltaV/divisor;
+				}	else if (h2 == minH) {
+					V[2] = xV-deltaV/divisor;
+				} else if (h3 == minH) {
+					V[3] = xV-deltaV/divisor;
+				}
+#if 0
+				nU = nV = xU = xV = 1.0f;
+				U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
+				V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
+				return false;
+#endif
+			}	else if (above==1 || below>above) { //(avgH < minH + (deltaH+1)/3)
+				// we got one high guy
+				if (h0==maxH) {
+					V[0] = nV+deltaV/divisor;
+				} else if (h1 == maxH) {
+					V[1] = nV+deltaV/divisor;
+				}	else if (h2 == maxH) {
+					V[2] = xV-deltaV/divisor;
+				} else if (h3 == maxH) {
+					V[3] = xV-deltaV/divisor;
+				}
+#if 0
+				nU = nV = xU = xV = 0.0f;
+				U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
+				V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
+				return false;
+#endif
+			} else {
+				// we got two up and two down.
+				if (deltaH*HEIGHT_SCALE < TALL_STRETCH_LIMIT) {
+					return false;
+				}
+#if 0
+				nU = nV = xU = xV = 0.0f;
+				U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
+				V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
+				return;
+#endif
+				Real dx = (h3-h2)*HEIGHT_SCALE;
+				dx = sqrt(1+dx*dx); // lenght of the bottom of the cell
+				Real dy =	(h3-h0)*HEIGHT_SCALE;
+				dy = sqrt(1+dy*dy); // length of the left side.
+				if (dx<STRETCH_LIMIT) dx = 1.0f; // don't make a seam unless there is great stretch.
+				if (dy<STRETCH_LIMIT) dy = 1.0f; // don't make a seam unless there is great stretch.
+				if (dx>TILE_LIMIT) dx = TILE_LIMIT; // don't tile past the texture's edge.
+				if (dy>TILE_LIMIT) dy = TILE_LIMIT; // don't tile past the texture's edge.
+				dx *= xU-nU;
+				dy *= xV-nV;
+				U[0] = nU; U[1] = nU+dx; U[2] = nU+dx; U[3] = nU;
+				V[0] = nV+dy; V[1] = nV+dy; V[2] = nV; V[3] = nV;
+				if (below==1) {
+					below = 1;
+				}
+				// recalc for point 1.
+				dx = (h1-h0)*HEIGHT_SCALE;
+				dx = sqrt(1+dx*dx); // lenght of the bottom of the cell
+				dy =	(h2-h1)*HEIGHT_SCALE;
+				dy = sqrt(1+dy*dy); // length of the left side.
+				if (dx<STRETCH_LIMIT) dx = 1.0f; // don't make a seam unless there is great stretch.
+				if (dy<STRETCH_LIMIT) dy = 1.0f; // don't make a seam unless there is great stretch.
+				if (dx>TILE_LIMIT) dx = TILE_LIMIT; // don't tile past the texture's edge.
+				if (dy>TILE_LIMIT) dy = TILE_LIMIT; // don't tile past the texture's edge.
+				dx *= xU-nU;
+				dy *= xV-nV;
+				U[1] = U[0]+dx;
+				V[1] = V[3] + dy;
+			}
+			// Make sure we are within the texture;
+			Real adjU = 0;
+			Real adjV = 0;
+			Int i;
+			for (i=0; i<4; i++) {
+				if (nVb - V[i] > adjV) adjV = nVb - V[i];
+			}
+			for (i=0; i<4; i++) {
+				V[i] += adjV;
+			}
+			adjV = 0;
+			for (i=0; i<4; i++) {
+				if (U[i] - xUb > adjU) adjU = U[i]-xUb;
+				if (V[i] - xVb > adjV) adjV = V[i]-xVb;
+			}
+			for (i=0; i<4; i++) {
+				U[i] -= adjU;
+				V[i] -= adjV;
+			}
+		}
+		return true;
+//
+#endif
+
+	}
+	return false;
+}
+
+///@todo: Are the different "if" cases mutually exclusive?  If so, should add else statements.
+Bool WorldHeightMap::getExtraAlphaUVData(Int xIndex, Int yIndex, float U[4], float V[4], UnsignedByte alpha[4], Bool *needFlip, Bool *cliff)
+{
+	Int ndx = (yIndex*m_width)+xIndex;
+	*needFlip = FALSE;
+	*cliff = FALSE;
+
+	if ( (ndx>=0) && (ndx<m_dataSize) && m_tileNdxes) {
+		Short blendNdx = m_extraBlendTileNdxes[ndx];
+		if (blendNdx == 0) {
+			return FALSE;
+		} else {
+			*cliff = getUVForTileIndex(ndx, m_blendedTiles[blendNdx].blendNdx, U, V, FALSE);
+			alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
+			if (m_blendedTiles[blendNdx].horiz) {
+				// Horizontals don't need flipping unless forced because of 3way blend
+				// and a diagonal in base blend layer.
+				*needFlip = m_blendedTiles[blendNdx].inverted & FLIPPED_MASK;
+				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
+					alpha[0] = alpha[3] = 255;
+				} else {
+					alpha[1] = alpha[2] = 255;
+				}
+			}
+			if (m_blendedTiles[blendNdx].vert) {
+				// Verticals don't need flipping unless forced because of 3way blend
+				// and a diagonal in base blend layer.
+				*needFlip = m_blendedTiles[blendNdx].inverted & FLIPPED_MASK;
+				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
+					alpha[0] = alpha[1] = 255;
+				} else {
+					alpha[2] = alpha[3]  = 255;
+				}
+			}
+			if (m_blendedTiles[blendNdx].rightDiagonal) {
+				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
+					alpha[1] = 255;
+					if (m_blendedTiles[blendNdx].longDiagonal) {
+						alpha[0] = 255;
+						alpha[2] = 255;
+					}
+				} else {
+					// Uninverted right diagonals need flipping.
+					*needFlip = TRUE;
+					alpha[2] = 255;
+					if (m_blendedTiles[blendNdx].longDiagonal) {
+						alpha[1] = 255;
+						alpha[3] = 255;
+					}
+				}
+			}
+			if (m_blendedTiles[blendNdx].leftDiagonal) {
+				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
+					// Inverted left diagonals need flipping.
+					*needFlip = TRUE;
+					alpha[0] = 255;
+					if (m_blendedTiles[blendNdx].longDiagonal) {
+						alpha[1] = 255;
+						alpha[3] = 255;
+					}
+				} else {
+					alpha[3] = 255;
+					if (m_blendedTiles[blendNdx].longDiagonal) {
+						alpha[0] = 255;
+						alpha[2] = 255;
+					}
+				}
+			}
+			if (m_blendedTiles[blendNdx].customBlendEdgeClass>=0) {
+				alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
+				// No alpha blend, so never need to flip.
+				*needFlip = FALSE;
+			}
+		}
+	}
+
+	return TRUE;
+}
+
+/** getUVData - Gets the texture coordinates to use with the alpha texture.
+		xIndex and yIndex are the integer coorddinates into the height map.
+		U and V are the texture coordiantes for the 4 corners of a height map cell.
+		fullTile is true if we are doing 1/2 resolution height map, and require a full
+		tile to texture  a cell.  Otherwise, we use quarter tiles per cell.
+		flip is set if we need to flip the diagonal across the cell to make the
+		alpha coordinates blend properly.  Filling a square with 2 triangles is not symmetrical :)
+*/
+void WorldHeightMap::getAlphaUVData(Int xIndex, Int yIndex, float U[4], float V[4],
+																		UnsignedByte alpha[4], Bool *flip, Bool fullTile)
+{
+	xIndex += m_drawOriginX;
+	yIndex += m_drawOriginY;
+	Int ndx = (yIndex*m_width)+xIndex;
+	Bool stretchedForCliff = false;
+	Bool needFlip = false;
+
+	if ((ndx<m_dataSize) && m_tileNdxes) {
+		Short blendNdx = m_blendTileNdxes[ndx];
+		if (fullTile) blendNdx = 0;
+		if (blendNdx == 0) {
+			stretchedForCliff = getUVForTileIndex(ndx, m_tileNdxes[ndx], U, V, fullTile);
+			alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
+			// No alpha blend, so never need to flip.
+			needFlip = false;
+		} else {
+			stretchedForCliff = getUVForTileIndex(ndx, m_blendedTiles[blendNdx].blendNdx, U, V, fullTile);
+			alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
+			if (m_blendedTiles[blendNdx].horiz) {
+				// Horizontals don't need flipping unless forced because of 3way blend.
+				needFlip = m_blendedTiles[blendNdx].inverted & FLIPPED_MASK;
+				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
+					alpha[0] = alpha[3] = 255;
+				} else {
+					alpha[1] = alpha[2] = 255;
+				}
+			}
+			if (m_blendedTiles[blendNdx].vert) {
+				// Verticals don't need flipping unless forced because of 3way blend.
+				needFlip = m_blendedTiles[blendNdx].inverted & FLIPPED_MASK;
+				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
+					alpha[0] = alpha[1] = 255;
+				} else {
+					alpha[2] = alpha[3]  = 255;
+				}
+			}
+			if (m_blendedTiles[blendNdx].rightDiagonal) {
+				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
+					alpha[1] = 255;
+					if (m_blendedTiles[blendNdx].longDiagonal) {
+						alpha[0] = 255;
+						alpha[2] = 255;
+					}
+				} else {
+					// Uninverted right diagonals need flipping.
+					needFlip = true;
+					alpha[2] = 255;
+					if (m_blendedTiles[blendNdx].longDiagonal) {
+						alpha[1] = 255;
+						alpha[3] = 255;
+					}
+				}
+			}
+			if (m_blendedTiles[blendNdx].leftDiagonal) {
+				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
+					// Inverted left diagonals need flipping.
+					needFlip = true;
+					alpha[0] = 255;
+					if (m_blendedTiles[blendNdx].longDiagonal) {
+						alpha[1] = 255;
+						alpha[3] = 255;
+					}
+				} else {
+					alpha[3] = 255;
+					if (m_blendedTiles[blendNdx].longDiagonal) {
+						alpha[0] = 255;
+						alpha[2] = 255;
+					}
+				}
+			}
+			if (m_blendedTiles[blendNdx].customBlendEdgeClass>=0) {
+				alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
+				// No alpha blend, so never need to flip.
+				needFlip = false;
+			}
+		}
+	}
+	if (stretchedForCliff) {
+		// If we had to stretch for clif, check heights.
+		Int p0=getHeight(xIndex, yIndex);
+		Int p1=getHeight(xIndex+1, yIndex);
+		Int p2=getHeight(xIndex+1, yIndex+1);
+		Int p3=getHeight(xIndex, yIndex+1);
+		Int dz1 = abs(p0-p2);
+		Int dz2 = abs(p1-p3);
+		needFlip = dz1>dz2;
+	}
+#ifdef FLIP_TRIANGLES
+	*flip = needFlip;
+#endif
+}
+
+void WorldHeightMap::setTextureLOD(Int lod)
+{
+	if (m_terrainTex)
+		m_terrainTex->setLOD(lod);
+}
+
+TextureClass *WorldHeightMap::getTerrainTexture(void)
+{
+	if (m_terrainTex == NULL) {
+		Int edgeHeight;
+		Int height = updateTileTexturePositions(&edgeHeight);
+		Int pow2Height = 1;
+		while (pow2Height<height) {
+			pow2Height *=2;
+		}
+		REF_PTR_RELEASE(m_terrainTex);
+		m_terrainTex = MSGNEW("WorldHeightMap_getTerrainTexture") TerrainTextureClass(pow2Height);
+		m_terrainTexHeight = m_terrainTex->update(this);
+		char buf[64];
+		sprintf(buf, "Base tex height %d", pow2Height);
+		DEBUG_LOG((buf));
+		REF_PTR_RELEASE(m_alphaTerrainTex);
+		m_alphaTerrainTex = MSGNEW("WorldHeightMap_getTerrainTexture") AlphaTerrainTextureClass(m_terrainTex);
+
+		pow2Height = 1;
+		while (pow2Height<edgeHeight) {
+			pow2Height *=2;
+		}
+		REF_PTR_RELEASE(m_alphaEdgeTex);
+		m_alphaEdgeTex = MSGNEW("WorldHeightMap_getTerrainTexture") AlphaEdgeTextureClass(pow2Height);
+		m_alphaEdgeHeight = m_alphaEdgeTex->update(this);
+
+		//Generate lookup table for determining triangle order in each terrain cell.
+		//Not the best place to put this but getAlphaUVData() requires a valid terrain
+		//texture to return valid values.
+
+		for (Int y=0; y<(m_height-1); y++)
+			for (Int x=0; x<(m_width-1); x++)
+			{
+				UnsignedByte alpha[4];
+				float UA[4], VA[4];
+				Bool flipForBlend;
+
+				getAlphaUVData(x, y, UA, VA, alpha, &flipForBlend, false);
+
+				m_cellFlipState[y*m_flipStateWidth+(x>>3)] |= flipForBlend << (x & 0x7);
+				DEBUG_ASSERTCRASH ((y*m_flipStateWidth+(x>>3)) < (m_flipStateWidth * m_height), ("Bad range"));
+			}
+	}
+
+	return m_terrainTex;
+}
+
+TextureClass *WorldHeightMap::getAlphaTerrainTexture(void)
+{
+	if (m_alphaTerrainTex == NULL) {
+		getTerrainTexture();
+	}
+	return m_alphaTerrainTex;
+}
+
+TextureClass *WorldHeightMap::getEdgeTerrainTexture(void)
+{
+	if (m_alphaEdgeTex == NULL) {
+		getTerrainTexture();
+	}
+	return m_alphaEdgeTex;
+}
+
+TerrainTextureClass *WorldHeightMap::getFlatTexture(Int xCell, Int yCell, Int cellWidth, Int pixelsPerCell)
+{
+	if (WW3D::Get_Texture_Reduction()) {
+		if (WW3D::Get_Texture_Reduction()>1) {
+			pixelsPerCell /= 4;
+		} else {
+			pixelsPerCell /= 2;
+		}
+	}
+	Int pow2Height = 1;
+	while (pow2Height<cellWidth*pixelsPerCell) {
+		pow2Height *=2;
+	}
+	TerrainTextureClass *newTexture = MSGNEW("WorldHeightMap_getTerrainTexture") TerrainTextureClass(pow2Height, pow2Height);
+	newTexture->updateFlat(this, xCell, yCell, cellWidth, pixelsPerCell);
+	return newTexture;
+}
+
+
+Bool WorldHeightMap::setDrawOrg(Int xOrg, Int yOrg)
+{
+	Int newX, newY;
+	Int newWidth, newHeight;
+	newX = xOrg;
+	newY = yOrg;
+	newWidth = m_drawWidthX;
+	newHeight = m_drawHeightY;
+	if (TheGlobalData && TheGlobalData->m_stretchTerrain) {
+		newWidth=STRETCH_DRAW_WIDTH;
+		newHeight=STRETCH_DRAW_HEIGHT;
+	}
+	if (TheGlobalData && TheGlobalData->m_drawEntireTerrain) {
+		newWidth=m_width;
+		newHeight=m_height;
+	}
+	if (newWidth > m_width) newWidth = m_width;
+	if (newHeight > m_height) newHeight = m_height;
+	if (newX > m_width - newWidth) newX = m_width-newWidth;
+	if (newX<0) newX=0;
+	if (newY > m_height - newHeight) newY = m_height - newHeight;
+	if (newY<0) newY=0;
+	Bool anythingDifferent = (m_drawOriginX!=newX) ||
+										 (m_drawOriginY!=newY) ||
+										 (m_drawWidthX!=newWidth) ||
+										 (m_drawHeightY!=newHeight) ;
+
+	if (anythingDifferent) {
+		m_drawOriginX=newX;
+		m_drawOriginY=newY;
+		m_drawWidthX=newWidth;
+		m_drawHeightY=newHeight;
+		return(true);
+	}
+	return(false);
+}
+
+/** Gets global texture class. */
+Int WorldHeightMap::getTextureClass(Int xIndex, Int yIndex, Bool baseClass)
+{
+	Int ndx = (yIndex*m_width)+xIndex;
+	DEBUG_ASSERTCRASH((ndx>=0 && ndx<this->m_dataSize),("oops"));
+	if (ndx<0 || ndx >= this->m_dataSize) return(-1);
+	Int textureNdx = m_tileNdxes[ndx];
+	if (!baseClass && (m_blendTileNdxes[ndx] != 0 || m_extraBlendTileNdxes[ndx] != 0)) {
+		return(-1);  // blended, so not of the original class.
+	}
+	return getTextureClassFromNdx(textureNdx);
+}
+
+
+/** Sets all the cliff flags in map based on height. */
+void WorldHeightMap::initCliffFlagsFromHeights()
+{
+	Int xIndex, yIndex;
+
+	for (xIndex=0; xIndex<m_width-1; xIndex++) {
+		for (yIndex=0; yIndex<m_height-1; yIndex++) {
+			setCellCliffFlagFromHeights(xIndex, yIndex);
+		}
+	}
+}
+
+/** Sets the cliff flag for a cell based on height. */
+void WorldHeightMap::setCellCliffFlagFromHeights(Int xIndex, Int yIndex)
+{
+	Real height1 = getHeight(xIndex, yIndex)*MAP_HEIGHT_SCALE;
+	Real height2 = getHeight(xIndex+1, yIndex)*MAP_HEIGHT_SCALE;
+	Real height3 = getHeight(xIndex, yIndex+1)*MAP_HEIGHT_SCALE;
+	Real height4 = getHeight(xIndex+1, yIndex+1)*MAP_HEIGHT_SCALE;
+	Real minZ = height1;
+	if (minZ > height2) minZ = height2;
+	if (minZ > height3) minZ = height3;
+	if (minZ > height4) minZ = height4;
+	Real maxZ = height1;
+	if (maxZ < height2) maxZ = height2;
+	if (maxZ < height3) maxZ = height3;
+	if (maxZ < height4) maxZ = height4;
+	const Real cliffRange = PATHFIND_CLIFF_SLOPE_LIMIT_F;
+	Bool isCliff = (maxZ-minZ > cliffRange);
+	setCliffState(xIndex, yIndex, isCliff);
+
+}
+
+/** Gets global texture class. */
+Int WorldHeightMap::getTextureClassFromNdx(Int tileNdx)
+{
+	Int i;
+	tileNdx = tileNdx>>2;
+	for (i=0; i<m_numTextureClasses; i++) {
+		if (m_textureClasses[i].firstTile<0) {
+			continue;
+		}
+		// see if the blend tile is in a texture class, and get the right tile for xIndex, yIndex.
+		if (tileNdx >= m_textureClasses[i].firstTile &&
+			tileNdx < m_textureClasses[i].firstTile+m_textureClasses[i].numTiles) {
+			return(m_textureClasses[i].globalTextureClass);
+		}
+	}
+	return(-1);
+}
+
+TXTextureClass WorldHeightMap::getTextureFromIndex( Int textureIndex )
+{
+	return m_textureClasses[textureIndex];
+}
+
+void WorldHeightMap::getTerrainColorAt(Real x, Real y, RGBColor *pColor)
+{
+	Int xIndex = REAL_TO_INT_FLOOR(x/MAP_XY_FACTOR);
+	Int yIndex = REAL_TO_INT_FLOOR(y/MAP_XY_FACTOR);
+	xIndex += m_borderSize;
+	yIndex += m_borderSize;
+	pColor->red = pColor->green = pColor->blue = 0;
+	if (xIndex<0) xIndex = 0;
+	if (yIndex<0) yIndex = 0;
+	if (xIndex >= m_width) xIndex = m_width-1;
+	if (yIndex >= m_height) yIndex = m_height-1;
+	Int ndx = (yIndex*m_width)+xIndex;
+	if (ndx<0 || ndx >= this->m_dataSize) return;
+	Int tileNdx = m_tileNdxes[ndx];
+	tileNdx = tileNdx>>2;	 // We pack 4 grids into a tile.
+
+	TileData *pTile = getSourceTile(tileNdx);
+	if (pTile) {
+		// pTile contains the bitmap data for 4 squares.
+		// Get the data mipped down to one pixel for the tile.
+		UnsignedByte *pData = pTile->getRGBDataForWidth(1);
+		// Data is in microsoft bgra format.
+		pColor->red = pData[2]/255.0;
+		pColor->green = pData[1]/255.0;
+		pColor->blue = pData[0]/255.0;
+	}
+}
+
+AsciiString WorldHeightMap::getTerrainNameAt(Real x, Real y)
+{
+	Int xIndex = REAL_TO_INT_FLOOR(x/MAP_XY_FACTOR);
+	Int yIndex = REAL_TO_INT_FLOOR(y/MAP_XY_FACTOR);
+	xIndex += m_borderSize;
+	yIndex += m_borderSize;
+	if (xIndex<0) xIndex = 0;
+	if (yIndex<0) yIndex = 0;
+	if (xIndex >= m_width) xIndex = m_width-1;
+	if (yIndex >= m_height) yIndex = m_height-1;
+	Int ndx = (yIndex*m_width)+xIndex;
+	if (ndx<0 || ndx >= this->m_dataSize) return AsciiString::TheEmptyString;
+	Int tileNdx = m_tileNdxes[ndx];
+	tileNdx = tileNdx>>2;	 // We pack 4 grids into a tile.
+
+	Int i;
+	for (i=0; i<this->m_numTextureClasses; i++) {
+		if (tileNdx >= m_textureClasses[i].firstTile && tileNdx < m_textureClasses[i].firstTile + m_textureClasses[i].numTiles) {
+			return(m_textureClasses[i].name);
+		}
+	}
+	return AsciiString::TheEmptyString;
+}
+
+
+static UnsignedByte s_buffer[DATA_LEN_BYTES];
+static UnsignedByte s_blendBuffer[DATA_LEN_BYTES];
+
+UnsignedByte * WorldHeightMap::getPointerToTileData(Int xIndex, Int yIndex, Int width)
+{
+	Int ndx = (yIndex*m_width)+xIndex;
+	if (yIndex<0 || xIndex<0 || xIndex>=m_width || yIndex>=m_height) {
+		return NULL;
+	}
+	if (ndx<0 || ndx>=m_dataSize) {
+		return NULL;
+	}
+	TBlendTileInfo *pBlend = NULL;
+	Short tileNdx = m_tileNdxes[ndx];
+	if (getRawTileData(tileNdx, width, s_buffer, DATA_LEN_BYTES)) {
+		Short blendTileNdx = m_blendTileNdxes[ndx];
+		if (blendTileNdx>0 && blendTileNdx < NUM_BLEND_TILES) {
+			pBlend = &m_blendedTiles[blendTileNdx];
+			if (getRawTileData(pBlend->blendNdx, width, s_blendBuffer, DATA_LEN_BYTES)) {
+				UnsignedByte *pAlpha = getRGBAlphaDataForWidth(width, pBlend);
+				pAlpha += 3;  // skip over the rgb to the a.
+				Int i, limit;
+				limit = width*width;
+				UnsignedByte *pBlendData = s_blendBuffer;
+				UnsignedByte *pDestData = s_buffer;
+				for (i=0; i<limit; i++) {
+					Int r,g,b,a;
+					b = *pBlendData++;
+					g = *pBlendData++;
+					r = *pBlendData++; pBlendData++;
+					a = *pAlpha; pAlpha += 4;
+					*pDestData++ = ((b*a)/255) + (((*pDestData)*(255-a))/255);
+					*pDestData++ = ((g*a)/255) + (((*pDestData)*(255-a))/255);
+					*pDestData++ = ((r*a)/255) + (((*pDestData)*(255-a))/255);
+					*pDestData++ = 255; // just skip alpha.  not really used. jba.
+				}
+			}
+		}
+		return(s_buffer);
+	}
+
+	return(NULL);
+}
+
+#define K_HORIZ 0
+#define K_VERT 1
+#define K_LDIAG 2
+#define K_RDIAG 3
+#define K_LLDIAG 4
+#define K_LRDIAG 5
+#define K_DIR_MOD 0x05
+#define K_INV 6
+
+UnsignedByte *WorldHeightMap::getRGBAlphaDataForWidth(Int width, TBlendTileInfo *pBlend)
+{
+	Int alphaTileNdx = 0;
+	if (pBlend->horiz) {
+		alphaTileNdx = K_HORIZ;
+	} else if (pBlend->vert) {
+		alphaTileNdx = K_VERT;
+	} else if (pBlend->rightDiagonal) {
+		alphaTileNdx = K_RDIAG;
+		if (pBlend->longDiagonal) alphaTileNdx=K_LRDIAG;
+	} else if (pBlend->leftDiagonal) {
+		alphaTileNdx = K_LDIAG;
+		if (pBlend->longDiagonal) alphaTileNdx=K_LLDIAG;
+	}
+	if (pBlend->inverted) {
+		alphaTileNdx += K_INV;
+	}
+	return m_alphaTiles[alphaTileNdx]->getRGBDataForWidth(width);
+}
+
+void WorldHeightMap::setupAlphaTiles(void)
+{
+	TBlendTileInfo blendInfo;
+	if (m_alphaTiles[0] != NULL) return;
+	Int k;
+	for (k=0; k<NUM_ALPHA_TILES; k++) {
+		memset(&blendInfo, 0, sizeof(blendInfo));
+		Int baseK = k;
+		if (k>=K_INV) {
+			blendInfo.inverted = true;
+			baseK -= K_INV;
+		}
+		switch(baseK) {
+			case K_HORIZ : blendInfo.horiz = true; break;
+			case K_VERT : blendInfo.vert = true; break;
+			case K_LDIAG : blendInfo.leftDiagonal = true; break;
+			case K_RDIAG : blendInfo.rightDiagonal = true; break;
+			case K_LLDIAG : blendInfo.leftDiagonal = true; blendInfo.longDiagonal = true; break;
+			case K_LRDIAG : blendInfo.rightDiagonal = true; blendInfo.longDiagonal = true; break;
+		}
+		m_alphaTiles[k] = new TileData;
+		TileData *pTile = m_alphaTiles[k];
+
+		Int i, j;
+		UnsignedByte *pDest = pTile->getDataPtr();
+		for (j=0; j<TILE_PIXEL_EXTENT; j++) {
+			for (i=0; i<TILE_PIXEL_EXTENT; i++) {
+				Int h = i;
+				Int v = j;
+				Int alpha = 255;  // 0 - 255.
+				if (blendInfo.horiz) {
+					if (!blendInfo.inverted) h = TILE_PIXEL_EXTENT-h-1;
+					alpha = (alpha*h)/(TILE_PIXEL_EXTENT-1);
+				} else if (blendInfo.vert) {
+					if (!blendInfo.inverted) v = TILE_PIXEL_EXTENT-v-1;
+					alpha = (alpha*v)/(TILE_PIXEL_EXTENT-1);
+				} else if (blendInfo.rightDiagonal) {
+					h = TILE_PIXEL_EXTENT-h-1;
+					if (!blendInfo.inverted) v = TILE_PIXEL_EXTENT-v-1;
+					v += h;				// angled
+					if (blendInfo.longDiagonal) {
+						v -= TILE_PIXEL_EXTENT;
+					}
+					alpha = (alpha*v)/(TILE_PIXEL_EXTENT-1);
+				} else if (blendInfo.leftDiagonal) {
+					if (!blendInfo.inverted) v = TILE_PIXEL_EXTENT-v-1;
+					v += h;				// angled
+					if (blendInfo.longDiagonal) {
+						v -= TILE_PIXEL_EXTENT;
+					}
+					alpha = (alpha*v)/(TILE_PIXEL_EXTENT-1);
+				}
+
+				if (alpha > 255) alpha = 255;
+				if (alpha<0) alpha = 0;
+				alpha = 255-alpha;
+
+				pDest += 3; // skip blue, green & red bytes.
+				*pDest = alpha;		// alpha.
+				//*pDest = 255;
+				pDest++;
+			}
+		}
+		pTile->updateMips();
+	}
+}
+
+
+Bool  WorldHeightMap::getRawTileData(Short tileNdx, Int width,
+																				 UnsignedByte *buffer, Int bufLen)
+{
+	TileData *pSrc = NULL;
+	if (tileNdx/4 < NUM_SOURCE_TILES) {
+		pSrc = m_sourceTiles[tileNdx/4];
+	}
+	if (bufLen < (width*width*TILE_BYTES_PER_PIXEL)) {
+		return(false);
+	}
+	if (pSrc && pSrc->hasRGBDataForWidth(2*width)) {
+		Int j;
+		UnsignedByte *pSrcData = pSrc->getRGBDataForWidth(2*width);
+		Int xOffset=0;
+		Int yOffset=0;
+		if (tileNdx & 1) xOffset = width;
+		if (tileNdx & 2) yOffset = width;
+		for (j=0; j<width; j++) {
+			UnsignedByte *pDestData = buffer;
+			pDestData += j*(width)*TILE_BYTES_PER_PIXEL;
+			UnsignedByte *pSrc = pSrcData;
+			pSrc += (j+yOffset)*width*TILE_BYTES_PER_PIXEL*2;
+			pSrc += xOffset*TILE_BYTES_PER_PIXEL;
+			memcpy(pDestData, pSrc, width*TILE_BYTES_PER_PIXEL);
+		}
+		return(true);
+	}
+	return(false);
+}
+
diff --git a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp
new file mode 100644
index 00000000000..9379f1042a1
--- /dev/null
+++ b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp
@@ -0,0 +1,168 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+////// Win32BIGFile.cpp /////////////////////////
+// Bryan Cleveland, August 2002
+/////////////////////////////////////////////////////
+
+#include "Common/LocalFile.h"
+#include "Common/LocalFileSystem.h"
+#include "Common/RAMFile.h"
+#include "Common/StreamingArchiveFile.h"
+#include "Common/GameMemory.h"
+#include "Common/PerfTimer.h"
+#include "Win32Device/Common/Win32BIGFile.h"
+
+//============================================================================
+// Win32BIGFile::Win32BIGFile
+//============================================================================
+
+Win32BIGFile::Win32BIGFile(AsciiString name, AsciiString path)
+	: m_name(name)
+	, m_path(path)
+{
+
+}
+
+//============================================================================
+// Win32BIGFile::~Win32BIGFile
+//============================================================================
+
+Win32BIGFile::~Win32BIGFile()
+{
+
+}
+
+//============================================================================
+// Win32BIGFile::openFile
+//============================================================================
+
+File* Win32BIGFile::openFile( const Char *filename, Int access )
+{
+	const ArchivedFileInfo *fileInfo = getArchivedFileInfo(AsciiString(filename));
+
+	if (fileInfo == NULL) {
+		return NULL;
+	}
+
+	RAMFile *ramFile = NULL;
+
+	if (BitIsSet(access, File::STREAMING))
+		ramFile = newInstance( StreamingArchiveFile );
+	else
+		ramFile = newInstance( RAMFile );
+
+	ramFile->deleteOnClose();
+	if (ramFile->openFromArchive(m_file, fileInfo->m_filename, fileInfo->m_offset, fileInfo->m_size) == FALSE) {
+		ramFile->close();
+		ramFile = NULL;
+		return NULL;
+	}
+
+	if ((access & File::WRITE) == 0) {
+		// requesting read only access. Just return the RAM file.
+		return ramFile;
+	}
+
+	// whoever is opening this file wants write access, so copy the file to the local disk
+	// and return that file pointer.
+
+	constexpr size_t bufferSize = 0;
+	File *localFile = TheLocalFileSystem->openFile(filename, access, bufferSize);
+	if (localFile != NULL) {
+		ramFile->copyDataToFile(localFile);
+	}
+
+	ramFile->close();
+	ramFile = NULL;
+
+	return localFile;
+}
+
+//============================================================================
+// Win32BIGFile::closeAllFiles
+//============================================================================
+
+void Win32BIGFile::closeAllFiles( void )
+{
+
+}
+
+//============================================================================
+// Win32BIGFile::getName
+//============================================================================
+
+AsciiString Win32BIGFile::getName( void )
+{
+	return m_name;
+}
+
+//============================================================================
+// Win32BIGFile::getPath
+//============================================================================
+
+AsciiString Win32BIGFile::getPath( void )
+{
+	return m_path;
+}
+
+//============================================================================
+// Win32BIGFile::setSearchPriority
+//============================================================================
+
+void Win32BIGFile::setSearchPriority( Int new_priority )
+{
+
+}
+
+//============================================================================
+// Win32BIGFile::close
+//============================================================================
+
+void Win32BIGFile::close( void )
+{
+
+}
+
+//============================================================================
+// Win32BIGFile::getFileInfo
+//============================================================================
+
+Bool Win32BIGFile::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
+{
+	const ArchivedFileInfo *tempFileInfo = getArchivedFileInfo(filename);
+
+	if (tempFileInfo == NULL) {
+		return FALSE;
+	}
+
+	TheLocalFileSystem->getFileInfo(AsciiString(m_file->getName()), fileInfo);
+
+	// fill in the size info.  Since the size can't be bigger than a JUNK file, the high Int will always be 0.
+	fileInfo->sizeHigh = 0;
+	fileInfo->sizeLow = tempFileInfo->m_size;
+
+	return TRUE;
+}
+
diff --git a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
new file mode 100644
index 00000000000..5aaedc2f1b8
--- /dev/null
+++ b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
@@ -0,0 +1,243 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+//////// Win32BIGFileSystem.h ///////////////////////////
+// Bryan Cleveland, August 2002
+/////////////////////////////////////////////////////////////
+
+#include "Common/AudioAffect.h"
+#include "Common/ArchiveFile.h"
+#include "Common/ArchiveFileSystem.h"
+#include "Common/file.h"
+#include "Common/GameAudio.h"
+#include "Common/GameMemory.h"
+#include "Common/LocalFileSystem.h"
+
+#if RTS_ZEROHOUR
+#include "Common/Registry.h"
+#endif
+
+#include "Win32Device/Common/Win32BIGFile.h"
+#include "Win32Device/Common/Win32BIGFileSystem.h"
+#include "Utility/endian_compat.h"
+
+
+static const char *BIGFileIdentifier = "BIGF";
+
+Win32BIGFileSystem::Win32BIGFileSystem() : ArchiveFileSystem() {
+}
+
+Win32BIGFileSystem::~Win32BIGFileSystem() {
+}
+
+void Win32BIGFileSystem::init() {
+	DEBUG_ASSERTCRASH(TheLocalFileSystem != NULL, ("TheLocalFileSystem must be initialized before TheArchiveFileSystem."));
+	if (TheLocalFileSystem == NULL) {
+		return;
+	}
+
+	loadBigFilesFromDirectory("", "*.big");
+
+#if RTS_ZEROHOUR
+    // load original Generals assets
+    AsciiString installPath;
+    GetStringFromGeneralsRegistry("", "InstallPath", installPath );
+    //@todo this will need to be ramped up to a crash for release
+    DEBUG_ASSERTCRASH(!installPath.isEmpty(), ("Be 1337! Go install Generals!"));
+    if (!installPath.isEmpty())
+      loadBigFilesFromDirectory(installPath, "*.big");
+#endif
+}
+
+void Win32BIGFileSystem::reset() {
+}
+
+void Win32BIGFileSystem::update() {
+}
+
+void Win32BIGFileSystem::postProcessLoad() {
+}
+
+ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
+	File *fp = TheLocalFileSystem->openFile(filename, File::READ | File::BINARY);
+	AsciiString archiveFileName;
+	archiveFileName = filename;
+	archiveFileName.toLower();
+	Int archiveFileSize = 0;
+	Int numLittleFiles = 0;
+
+	DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - opening BIG file %s", filename));
+
+	if (fp == NULL) {
+		DEBUG_CRASH(("Could not open archive file %s for parsing", filename));
+		return NULL;
+	}
+
+	AsciiString asciibuf;
+	char buffer[_MAX_PATH];
+	fp->read(buffer, 4); // read the "BIG" at the beginning of the file.
+	buffer[4] = 0;
+	if (strcmp(buffer, BIGFileIdentifier) != 0) {
+		DEBUG_CRASH(("Error reading BIG file identifier in file %s", filename));
+		fp->close();
+		fp = NULL;
+		return NULL;
+	}
+
+	// read in the file size.
+	fp->read(&archiveFileSize, 4);
+
+	DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - size of archive file is %d bytes", archiveFileSize));
+
+//	char t;
+
+	// read in the number of files contained in this BIG file.
+	// change the order of the bytes cause the file size is in reverse byte order for some reason.
+	fp->read(&numLittleFiles, 4);
+	numLittleFiles = betoh(numLittleFiles);
+
+	DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - %d are contained in archive", numLittleFiles));
+//	for (Int i = 0; i < 2; ++i) {
+//		t = buffer[i];
+//		buffer[i] = buffer[(4-i)-1];
+//		buffer[(4-i)-1] = t;
+//	}
+
+	// seek to the beginning of the directory listing.
+	fp->seek(0x10, File::START);
+	// read in each directory listing.
+	ArchivedFileInfo *fileInfo = NEW ArchivedFileInfo;
+	// TheSuperHackers @fix Mauller 23/04/2025 Create new file handle when necessary to prevent memory leak
+	ArchiveFile *archiveFile = NEW Win32BIGFile(filename, AsciiString::TheEmptyString);
+
+	for (Int i = 0; i < numLittleFiles; ++i) {
+		Int filesize = 0;
+		Int fileOffset = 0;
+		fp->read(&fileOffset, 4);
+		fp->read(&filesize, 4);
+
+		filesize = betoh(filesize);
+		fileOffset = betoh(fileOffset);
+
+		fileInfo->m_archiveFilename = archiveFileName;
+		fileInfo->m_offset = fileOffset;
+		fileInfo->m_size = filesize;
+
+		// read in the path name of the file.
+		Int pathIndex = -1;
+		do {
+			++pathIndex;
+			fp->read(buffer + pathIndex, 1);
+		} while (buffer[pathIndex] != 0);
+
+		Int filenameIndex = pathIndex;
+		while ((filenameIndex >= 0) && (buffer[filenameIndex] != '\\') && (buffer[filenameIndex] != '/')) {
+			--filenameIndex;
+		}
+
+		fileInfo->m_filename = (char *)(buffer + filenameIndex + 1);
+		fileInfo->m_filename.toLower();
+		buffer[filenameIndex + 1] = 0;
+
+		AsciiString path;
+		path = buffer;
+
+		AsciiString debugpath;
+		debugpath = path;
+		debugpath.concat(fileInfo->m_filename);
+//		DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - adding file %s to archive file %s, file number %d", debugpath.str(), fileInfo->m_archiveFilename.str(), i));
+
+		archiveFile->addFile(path, fileInfo);
+	}
+
+	archiveFile->attachFile(fp);
+
+	delete fileInfo;
+	fileInfo = NULL;
+
+	// leave fp open as the archive file will be using it.
+
+	return archiveFile;
+}
+
+void Win32BIGFileSystem::closeArchiveFile(const Char *filename) {
+	// Need to close the specified big file
+	ArchiveFileMap::iterator it =  m_archiveFileMap.find(filename);
+	if (it == m_archiveFileMap.end()) {
+		return;
+	}
+
+	if (stricmp(filename, MUSIC_BIG) == 0) {
+		// Stop the current audio
+		TheAudio->stopAudio(AudioAffect_Music);
+
+		// No need to turn off other audio, as the lookups will just fail.
+	}
+	DEBUG_ASSERTCRASH(stricmp(filename, MUSIC_BIG) == 0, ("Attempting to close Archive file '%s', need to add code to handle its shutdown correctly.", filename));
+
+	// may need to do some other processing here first.
+
+	delete (it->second);
+	m_archiveFileMap.erase(it);
+}
+
+void Win32BIGFileSystem::closeAllArchiveFiles() {
+}
+
+void Win32BIGFileSystem::closeAllFiles() {
+}
+
+Bool Win32BIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite) {
+
+	FilenameList filenameList;
+	TheLocalFileSystem->getFileListInDirectory(dir, "", fileMask, filenameList, TRUE);
+
+	Bool actuallyAdded = FALSE;
+	FilenameListIter it = filenameList.begin();
+	while (it != filenameList.end()) {
+#if RTS_ZEROHOUR
+		// TheSuperHackers @bugfix bobtista 18/11/2025 Skip duplicate INIZH.big in Data\INI to prevent CRC mismatches.
+		// English, Chinese, and Korean SKUs shipped with two INIZH.big files (one in Run directory, one in Run\Data\INI).
+		// The DeleteFile cleanup doesn't work on EA App/Origin installs because the folder is not writable, so we skip loading it instead.
+		if (it->endsWithNoCase("Data\\INI\\INIZH.big") || it->endsWithNoCase("Data/INI/INIZH.big")) {
+			it++;
+			continue;
+		}
+#endif
+
+		ArchiveFile *archiveFile = openArchiveFile((*it).str());
+
+		if (archiveFile != NULL) {
+			DEBUG_LOG(("Win32BIGFileSystem::loadBigFilesFromDirectory - loading %s into the directory tree.", (*it).str()));
+			loadIntoDirectoryTree(archiveFile, overwrite);
+			m_archiveFileMap[(*it)] = archiveFile;
+			DEBUG_LOG(("Win32BIGFileSystem::loadBigFilesFromDirectory - %s inserted into the archive file map.", (*it).str()));
+			actuallyAdded = TRUE;
+		}
+
+		it++;
+	}
+
+	return actuallyAdded;
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32LocalFile.cpp b/Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFile.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32LocalFile.cpp
rename to Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFile.cpp
diff --git a/Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp b/Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp
new file mode 100644
index 00000000000..424c446996d
--- /dev/null
+++ b/Core/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp
@@ -0,0 +1,233 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///////// Win32LocalFileSystem.cpp /////////////////////////
+// Bryan Cleveland, August 2002
+////////////////////////////////////////////////////////////
+
+#include <windows.h>
+#include "Common/AsciiString.h"
+#include "Common/GameMemory.h"
+#include "Common/PerfTimer.h"
+#include "Win32Device/Common/Win32LocalFileSystem.h"
+#include "Win32Device/Common/Win32LocalFile.h"
+#include <io.h>
+
+Win32LocalFileSystem::Win32LocalFileSystem() : LocalFileSystem()
+{
+}
+
+Win32LocalFileSystem::~Win32LocalFileSystem() {
+}
+
+//DECLARE_PERF_TIMER(Win32LocalFileSystem_openFile)
+File * Win32LocalFileSystem::openFile(const Char *filename, Int access, size_t bufferSize)
+{
+	//USE_PERF_TIMER(Win32LocalFileSystem_openFile)
+
+	// sanity check
+	if (strlen(filename) <= 0) {
+		return NULL;
+	}
+
+	if (access & File::WRITE) {
+		// if opening the file for writing, we need to make sure the directory is there
+		// before we try to create the file.
+		AsciiString string;
+		string = filename;
+		AsciiString token;
+		AsciiString dirName;
+		string.nextToken(&token, "\\/");
+		dirName = token;
+		while ((token.find('.') == NULL) || (string.find('.') != NULL)) {
+			createDirectory(dirName);
+			string.nextToken(&token, "\\/");
+			dirName.concat('\\');
+			dirName.concat(token);
+		}
+	}
+
+	// TheSuperHackers @fix Mauller 21/04/2025 Create new file handle when necessary to prevent memory leak
+	Win32LocalFile *file = newInstance( Win32LocalFile );
+
+	if (file->open(filename, access, bufferSize) == FALSE) {
+		deleteInstance(file);
+		file = NULL;
+	} else {
+		file->deleteOnClose();
+	}
+
+// this will also need to play nice with the STREAMING type that I added, if we ever enable this
+
+// srj sez: this speeds up INI loading, but makes BIG files unusable.
+// don't enable it without further tweaking.
+//
+// unless you like running really slowly.
+//	if (!(access&File::WRITE)) {
+//		// Return a ramfile.
+//		RAMFile *ramFile = newInstance( RAMFile );
+//		if (ramFile->open(file)) {
+//			file->close(); // is deleteonclose, so should delete.
+//			ramFile->deleteOnClose();
+//			return ramFile;
+//		}	else {
+//			ramFile->close();
+//			deleteInstance(ramFile);
+//		}
+//	}
+
+	return file;
+}
+
+void Win32LocalFileSystem::update()
+{
+}
+
+void Win32LocalFileSystem::init()
+{
+}
+
+void Win32LocalFileSystem::reset()
+{
+}
+
+//DECLARE_PERF_TIMER(Win32LocalFileSystem_doesFileExist)
+Bool Win32LocalFileSystem::doesFileExist(const Char *filename) const
+{
+	//USE_PERF_TIMER(Win32LocalFileSystem_doesFileExist)
+	if (_access(filename, 0) == 0) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+void Win32LocalFileSystem::getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList & filenameList, Bool searchSubdirectories) const
+{
+	HANDLE fileHandle = NULL;
+	WIN32_FIND_DATA findData;
+
+	AsciiString asciisearch;
+	asciisearch = originalDirectory;
+	asciisearch.concat(currentDirectory);
+	asciisearch.concat(searchName);
+
+	Bool done = FALSE;
+
+	fileHandle = FindFirstFile(asciisearch.str(), &findData);
+	done = (fileHandle == INVALID_HANDLE_VALUE);
+
+	while (!done)	{
+		if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
+				(strcmp(findData.cFileName, ".") != 0 && strcmp(findData.cFileName, "..") != 0)) {
+			// if we haven't already, add this filename to the list.
+				// a stl set should only allow one copy of each filename
+				AsciiString newFilename;
+				newFilename = originalDirectory;
+				newFilename.concat(currentDirectory);
+				newFilename.concat(findData.cFileName);
+				if (filenameList.find(newFilename) == filenameList.end()) {
+					filenameList.insert(newFilename);
+				}
+		}
+
+		done = (FindNextFile(fileHandle, &findData) == 0);
+	}
+	FindClose(fileHandle);
+
+	if (searchSubdirectories) {
+		AsciiString subdirsearch;
+		subdirsearch = originalDirectory;
+		subdirsearch.concat(currentDirectory);
+		subdirsearch.concat("*.");
+		fileHandle = FindFirstFile(subdirsearch.str(), &findData);
+		done = fileHandle == INVALID_HANDLE_VALUE;
+
+		while (!done) {
+			if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
+					(strcmp(findData.cFileName, ".") != 0 && strcmp(findData.cFileName, "..") != 0)) {
+
+					AsciiString tempsearchstr;
+					tempsearchstr.concat(currentDirectory);
+					tempsearchstr.concat(findData.cFileName);
+					tempsearchstr.concat('\\');
+
+					// recursively add files in subdirectories if required.
+					getFileListInDirectory(tempsearchstr, originalDirectory, searchName, filenameList, searchSubdirectories);
+			}
+
+			done = (FindNextFile(fileHandle, &findData) == 0);
+		}
+
+		FindClose(fileHandle);
+	}
+
+}
+
+Bool Win32LocalFileSystem::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
+{
+	WIN32_FIND_DATA findData;
+	HANDLE findHandle = NULL;
+	findHandle = FindFirstFile(filename.str(), &findData);
+
+	if (findHandle == INVALID_HANDLE_VALUE) {
+		return FALSE;
+	}
+
+	fileInfo->timestampHigh = findData.ftLastWriteTime.dwHighDateTime;
+	fileInfo->timestampLow = findData.ftLastWriteTime.dwLowDateTime;
+	fileInfo->sizeHigh = findData.nFileSizeHigh;
+	fileInfo->sizeLow = findData.nFileSizeLow;
+
+	FindClose(findHandle);
+
+	return TRUE;
+}
+
+Bool Win32LocalFileSystem::createDirectory(AsciiString directory)
+{
+	if ((!directory.isEmpty()) && (directory.getLength() < _MAX_DIR)) {
+		return (CreateDirectory(directory.str(), NULL) != 0);
+	}
+	return FALSE;
+}
+
+AsciiString Win32LocalFileSystem::normalizePath(const AsciiString& filePath) const
+{
+	DWORD retval = GetFullPathNameA(filePath.str(), 0, NULL, NULL);
+	if (retval == 0)
+	{
+		DEBUG_LOG(("Unable to determine buffer size for normalized file path. Error=(%u).", GetLastError()));
+		return AsciiString::TheEmptyString;
+	}
+
+	AsciiString normalizedFilePath;
+	retval = GetFullPathNameA(filePath.str(), retval, normalizedFilePath.getBufferForRead(retval - 1), NULL);
+	if (retval == 0)
+	{
+		DEBUG_LOG(("Unable to normalize file path '%s'. Error=(%u).", filePath.str(), GetLastError()));
+		return AsciiString::TheEmptyString;
+	}
+
+	return normalizedFilePath;
+}
diff --git a/Core/Libraries/Include/Lib/BaseTypeCore.h b/Core/Libraries/Include/Lib/BaseTypeCore.h
index 0b542dcb519..550bdd5adf8 100644
--- a/Core/Libraries/Include/Lib/BaseTypeCore.h
+++ b/Core/Libraries/Include/Lib/BaseTypeCore.h
@@ -21,27 +21,24 @@
 //
 // Basic types and constants
 // Author: Michael S. Booth, January 1995, September 2000
-// TheSuperHackers @compile feliwir 11/04/2025 Move common BaseType.h code to BaseTypeCore.h
+// TheSuperHackers @build feliwir 11/04/2025 Move common BaseType.h code to BaseTypeCore.h
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 // tell the compiler to only load this file once
-#pragma once
-
 
-#ifndef _BASE_TYPE_CORE_H_
-#define _BASE_TYPE_CORE_H_
+#pragma once
 
 #include <math.h>
 #include <string.h>
-// TheSuperHackers @compile feliwir 07/04/2025 Adds utility macros for cross-platform compatibility
+// TheSuperHackers @build feliwir 07/04/2025 Adds utility macros for cross-platform compatibility
 #include <Utility/compat.h>
 #include <Utility/CppMacros.h>
 #include <Utility/stdint_adapter.h>
 
 /*
 **	Turn off some unneeded warnings.
-**	Within the windows headers themselves, Microsoft has disabled the warnings 4290, 4514, 
+**	Within the windows headers themselves, Microsoft has disabled the warnings 4290, 4514,
 **	4069, 4200, 4237, 4103, 4001, 4035, 4164. Makes you wonder, eh?
 */
 
@@ -63,7 +60,7 @@
 #pragma warning(disable : 4711)
 
 #if 0
-// 'assignment within condition expression'. actually a pretty useful warning, 
+// 'assignment within condition expression'. actually a pretty useful warning,
 // but way too much existing code violates it.
 //#pragma warning(disable : 4706)
 #else
@@ -117,25 +114,18 @@
 #define FALSE false
 #endif
 
-// Elements in an array
-#ifndef ELEMENTS_OF
-#define ELEMENTS_OF( x ) ( sizeof( x ) / sizeof( x[0] ) )
-#endif
-
 //--------------------------------------------------------------------
 // Fundamental type definitions
 //--------------------------------------------------------------------
-typedef float						Real;					// 4 bytes 
-typedef int32_t						Int;					// 4 bytes 
-typedef uint32_t	                UnsignedInt;	  	    // 4 bytes 
-typedef uint16_t	                UnsignedShort;		    // 2 bytes 
-typedef int16_t						Short;					// 2 bytes 
+typedef float						Real;					// 4 bytes
+typedef int32_t						Int;					// 4 bytes
+typedef uint32_t	                UnsignedInt;	  	    // 4 bytes
+typedef uint16_t	                UnsignedShort;		    // 2 bytes
+typedef int16_t						Short;					// 2 bytes
 typedef unsigned char	            UnsignedByte;			// 1 byte		USED TO BE "Byte"
 typedef char						Byte;					// 1 byte		USED TO BE "SignedByte"
 typedef char						Char;					// 1 byte of text
-typedef bool						Bool;					// 
+typedef bool						Bool;					//
 // note, the types below should use "long long", but MSVC doesn't support it yet
 typedef int64_t						Int64;						// 8 bytes
 typedef uint64_t					UnsignedInt64;	  	        // 8 bytes
-
-#endif // _BASE_TYPE_CORE_H_
\ No newline at end of file
diff --git a/Core/Libraries/Include/rts/debug.h b/Core/Libraries/Include/rts/debug.h
index cfe69a3bb84..d758693cbc9 100644
--- a/Core/Libraries/Include/rts/debug.h
+++ b/Core/Libraries/Include/rts/debug.h
@@ -26,12 +26,7 @@
 //
 // Proxy header for debug module
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef PROXY_DEBUG_H // Include guard
-#define PROXY_DEBUG_H
 
-#include "../../Source/debug/debug.h"
+#pragma once
 
-#endif // PROXY_DEBUG_H
+#include "../../Source/debug/debug.h"
diff --git a/Core/Libraries/Include/rts/profile.h b/Core/Libraries/Include/rts/profile.h
index 34cf2d4d46d..06faf42d045 100644
--- a/Core/Libraries/Include/rts/profile.h
+++ b/Core/Libraries/Include/rts/profile.h
@@ -26,12 +26,7 @@
 //
 // Proxy header for profile module
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
+
 #  pragma once
-#endif
-#ifndef PROXY_PROFILE_H // Include guard
-#define PROXY_PROFILE_H
 
 #include "../../Source/profile/profile.h"
-
-#endif // PROXY_PROFILE_H
diff --git a/Core/Libraries/Source/Compression/Compression.h b/Core/Libraries/Source/Compression/Compression.h
index bea68a6b403..d93ac23226c 100644
--- a/Core/Libraries/Source/Compression/Compression.h
+++ b/Core/Libraries/Source/Compression/Compression.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef __COMPRESSION_H__
-#define __COMPRESSION_H__
-
 #include "Lib/BaseTypeCore.h"
 
 enum CompressionType
@@ -67,5 +64,3 @@ class CompressionManager
 
 	static CompressionType getPreferredCompression( void );
 };
-
-#endif // __COMPRESSION_H__
diff --git a/Core/Libraries/Source/Compression/CompressionManager.cpp b/Core/Libraries/Source/Compression/CompressionManager.cpp
index a4e7325832b..0853a26745c 100644
--- a/Core/Libraries/Source/Compression/CompressionManager.cpp
+++ b/Core/Libraries/Source/Compression/CompressionManager.cpp
@@ -32,11 +32,6 @@
 #include "EAC/huffcodex.h"
 #include "EAC/refcodex.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // TheSuperHackers @todo Recover debug logging in this file?
 #define DEBUG_LOG(x) {}
@@ -267,7 +262,7 @@ Int CompressionManager::compressData( CompressionType compType, void *srcVoid, I
 		}
 		else
 		{
-			DEBUG_LOG(("ZLib compression error (level is %d, src len is %d) %d\n", level, srcLen, err));
+			DEBUG_LOG(("ZLib compression error (level is %d, src len is %d) %d", level, srcLen, err));
 			return 0;
 		}
 	}
@@ -332,7 +327,7 @@ Int CompressionManager::decompressData( void *srcVoid, Int srcLen, void *destVoi
 		}
 		else
 		{
-			DEBUG_LOG(("ZLib decompression error (src is level %d, %d bytes long) %d\n",
+			DEBUG_LOG(("ZLib decompression error (src is level %d, %d bytes long) %d",
 				compType - COMPRESSION_ZLIB1 + 1 /* 1-9 */, srcLen, err));
 			return 0;
 		}
@@ -365,7 +360,7 @@ struct CompData
 
 void DoCompressTest( void )
 {
-	
+
 	Int i;
 
 	PerfGather *s_compressGathers[COMPRESSION_MAX+1];
@@ -392,7 +387,7 @@ void DoCompressTest( void )
 		File *f = TheFileSystem->openFile(it->first.str());
 		if (f)
 		{
-			DEBUG_LOG(("***************************\nTesting '%s'\n\n", it->first.str()));
+			DEBUG_LOG(("***************************\nTesting '%s'\n", it->first.str()));
 			Int origSize = f->size();
 			UnsignedByte *buf = (UnsignedByte *)f->readEntireAndClose();
 			UnsignedByte *uncompressedBuf = NEW UnsignedByte[origSize];
@@ -403,11 +398,11 @@ void DoCompressTest( void )
 
 			for (i=COMPRESSION_MIN; i<=COMPRESSION_MAX; ++i)
 			{
-				DEBUG_LOG(("=================================================\n"));
-				DEBUG_LOG(("Compression Test %d\n", i));
+				DEBUG_LOG(("================================================="));
+				DEBUG_LOG(("Compression Test %d", i));
 
 				Int maxCompressedSize = CompressionManager::getMaxCompressedSize( origSize, (CompressionType)i );
-				DEBUG_LOG(("Orig size is %d, max compressed size is %d bytes\n", origSize, maxCompressedSize));
+				DEBUG_LOG(("Orig size is %d, max compressed size is %d bytes", origSize, maxCompressedSize));
 
 				UnsignedByte *compressedBuf = NEW UnsignedByte[maxCompressedSize];
 				memset(compressedBuf, 0, maxCompressedSize);
@@ -415,7 +410,7 @@ void DoCompressTest( void )
 
 				Int compressedLen, decompressedLen;
 
-				for (Int j=0; j < NUM_TIMES; ++j) 
+				for (Int j=0; j < NUM_TIMES; ++j)
 				{
 					s_compressGathers[i]->startTimer();
 					compressedLen = CompressionManager::compressData((CompressionType)i, buf, origSize, compressedBuf, maxCompressedSize);
@@ -425,17 +420,17 @@ void DoCompressTest( void )
 					s_decompressGathers[i]->stopTimer();
 				}
 				d.compressedSize[i] = compressedLen;
-				DEBUG_LOG(("Compressed len is %d (%g%% of original size)\n", compressedLen, (double)compressedLen/(double)origSize*100.0));
-				DEBUG_ASSERTCRASH(compressedLen, ("Failed to compress\n"));
-				DEBUG_LOG(("Decompressed len is %d (%g%% of original size)\n", decompressedLen, (double)decompressedLen/(double)origSize*100.0));
+				DEBUG_LOG(("Compressed len is %d (%g%% of original size)", compressedLen, (double)compressedLen/(double)origSize*100.0));
+				DEBUG_ASSERTCRASH(compressedLen, ("Failed to compress"));
+				DEBUG_LOG(("Decompressed len is %d (%g%% of original size)", decompressedLen, (double)decompressedLen/(double)origSize*100.0));
 
-				DEBUG_ASSERTCRASH(decompressedLen == origSize, ("orig size does not match compressed+uncompressed output\n"));
+				DEBUG_ASSERTCRASH(decompressedLen == origSize, ("orig size does not match compressed+uncompressed output"));
 				if (decompressedLen == origSize)
 				{
 					Int ret = memcmp(buf, uncompressedBuf, origSize);
 					if (ret != 0)
 					{
-						DEBUG_CRASH(("orig buffer does not match compressed+uncompressed output - ret was %d\n", ret));
+						DEBUG_CRASH(("orig buffer does not match compressed+uncompressed output - ret was %d", ret));
 					}
 				}
 
@@ -443,9 +438,9 @@ void DoCompressTest( void )
 				compressedBuf = NULL;
 			}
 
-			DEBUG_LOG(("d = %d -> %d\n", d.origSize, d.compressedSize[i]));
+			DEBUG_LOG(("d = %d -> %d", d.origSize, d.compressedSize[i]));
 			s_sizes[it->first] = d;
-			DEBUG_LOG(("s_sizes[%s] = %d -> %d\n", it->first.str(), s_sizes[it->first].origSize, s_sizes[it->first].compressedSize[i]));
+			DEBUG_LOG(("s_sizes[%s] = %d -> %d", it->first.str(), s_sizes[it->first].origSize, s_sizes[it->first].compressedSize[i]));
 
 			delete[] buf;
 			buf = NULL;
@@ -474,13 +469,13 @@ void DoCompressTest( void )
 			totalUncompressedBytes += d.origSize;
 			totalCompressedBytes += d.compressedSize[i];
 		}
-		DEBUG_LOG(("***************************************************\n"));
-		DEBUG_LOG(("Compression method %s:\n", CompressionManager::getCompressionNameByType((CompressionType)i)));
-		DEBUG_LOG(("%d bytes compressed to %d (%g%%)\n", totalUncompressedBytes, totalCompressedBytes,
+		DEBUG_LOG(("***************************************************"));
+		DEBUG_LOG(("Compression method %s:", CompressionManager::getCompressionNameByType((CompressionType)i)));
+		DEBUG_LOG(("%d bytes compressed to %d (%g%%)", totalUncompressedBytes, totalCompressedBytes,
 			totalCompressedBytes/(Real)totalUncompressedBytes*100.0f));
-		DEBUG_LOG(("Min ratio: %g%%, Max ratio: %g%%\n",
+		DEBUG_LOG(("Min ratio: %g%%, Max ratio: %g%%",
 			minCompression*100.0f, maxCompression*100.0f));
-		DEBUG_LOG(("\n"));
+		DEBUG_LOG((""));
 	}
 
 	PerfGather::dumpAll(10000);
@@ -488,7 +483,7 @@ void DoCompressTest( void )
 	PerfGather::resetAll();
 	CopyFile( "AAAPerfStats.csv", "AAACompressPerfStats.csv", FALSE );
 
-	for (i = 0; i < COMPRESSION_MAX+1; ++i) 
+	for (i = 0; i < COMPRESSION_MAX+1; ++i)
 	{
 		delete s_compressGathers[i];
 		s_compressGathers[i] = NULL;
diff --git a/Core/Libraries/Source/Compression/EAC/btreecodex.h b/Core/Libraries/Source/Compression/EAC/btreecodex.h
index cf28f5bea67..ed72b835978 100644
--- a/Core/Libraries/Source/Compression/EAC/btreecodex.h
+++ b/Core/Libraries/Source/Compression/EAC/btreecodex.h
@@ -18,16 +18,12 @@
 
 /* Copyright (C) Electronic Arts Canada Inc. 1995-2002.  All rights reserved. */
 
-#ifndef __BTRCODEX
-#define __BTRCODEX 1
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef __CODEX_H
-#error "Include codex.h before btreecodex.h"
-#endif
+#include "codex.h"
 
 /****************************************************************/
 /*  BTR Codex                                                   */
@@ -58,5 +54,4 @@ int        GCALL BTREE_encode(void *compresseddata, const void *source, int sour
 #ifdef __cplusplus
 }
 #endif
-#endif
 
diff --git a/Core/Libraries/Source/Compression/EAC/btreeencode.cpp b/Core/Libraries/Source/Compression/EAC/btreeencode.cpp
index 0ffbe0bae1a..0afc2cfa57f 100644
--- a/Core/Libraries/Source/Compression/EAC/btreeencode.cpp
+++ b/Core/Libraries/Source/Compression/EAC/btreeencode.cpp
@@ -367,11 +367,18 @@ static void BTREE_treepack(struct BTreeEncodeContext *EC,
 
 	EC->buf1 =	(unsigned char *) galloc(buf1size);
 	if (!EC->buf1)
-        return; /* failure Insufficient memory for work buffer */
+	{
+		gfree(treebuf);
+		return; /* failure Insufficient memory for work buffer */
+	}
 
 	EC->buf2 =	(unsigned char *) galloc(buf2size);
 	if (!EC->buf2)
-        return; /* failure Insufficient memory for work buffer */
+	{
+		gfree(treebuf);
+		gfree(EC->buf1);
+		return; /* failure Insufficient memory for work buffer */
+	}
 
     memcpy(EC->buf1, EC->buffer, EC->ulen); /* copy to scratch buffer */
 
diff --git a/Core/Libraries/Source/Compression/EAC/codex.h b/Core/Libraries/Source/Compression/EAC/codex.h
index f4d3441e553..2b80d2171fe 100644
--- a/Core/Libraries/Source/Compression/EAC/codex.h
+++ b/Core/Libraries/Source/Compression/EAC/codex.h
@@ -37,12 +37,7 @@
 /*                                                                  */
 /*------------------------------------------------------------------*/
 
-#ifndef __CODEX_H
-#define __CODEX_H 1
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -119,5 +114,4 @@ int GCALL CODEX_encode(void *dest, const void *source, int sourcesize, int *opts
 #ifdef __cplusplus
 }
 #endif
-#endif
 
diff --git a/Core/Libraries/Source/Compression/EAC/gimex.h b/Core/Libraries/Source/Compression/EAC/gimex.h
index 51260341f55..c1cc3325e13 100644
--- a/Core/Libraries/Source/Compression/EAC/gimex.h
+++ b/Core/Libraries/Source/Compression/EAC/gimex.h
@@ -63,11 +63,9 @@ gimex.h - Primary header file for the GIMEX API.
 /*                                                                  */
 /*------------------------------------------------------------------*/
 
-#ifndef __GIMEX_H
-#define __GIMEX_H 1
+#pragma once
 
 #if defined(_MSC_VER)
-#pragma once
 #pragma warning(disable : 4100)
 /* warning C4100: unreferenced parameter */
 #endif
@@ -492,6 +490,4 @@ static __inline void gputi(void *dst, unsigned int data, int bytes)
     }
 }
 
-#endif /* __GIMEX_H */
-
 /* END ABSTRACT */
diff --git a/Core/Libraries/Source/Compression/EAC/huffcodex.h b/Core/Libraries/Source/Compression/EAC/huffcodex.h
index af1d756d4be..027a4f38b0f 100644
--- a/Core/Libraries/Source/Compression/EAC/huffcodex.h
+++ b/Core/Libraries/Source/Compression/EAC/huffcodex.h
@@ -18,16 +18,12 @@
 
 /* Copyright (C) Electronic Arts Canada Inc. 1995-2002.  All rights reserved. */
 
-#ifndef __HUFCODEX
-#define __HUFCODEX 1
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef __CODEX_H
-#error "Include codex.h before huffcodex.h"
-#endif
+#include "codex.h"
 
 /****************************************************************/
 /*  HUF Codex                                                   */
@@ -70,5 +66,4 @@ int        GCALL HUFF_encode(void *compresseddata, const void *source, int sourc
 #ifdef __cplusplus
 }
 #endif
-#endif
 
diff --git a/Core/Libraries/Source/Compression/EAC/huffencode.cpp b/Core/Libraries/Source/Compression/EAC/huffencode.cpp
index a2707b21b6d..d01f8a99117 100644
--- a/Core/Libraries/Source/Compression/EAC/huffencode.cpp
+++ b/Core/Libraries/Source/Compression/EAC/huffencode.cpp
@@ -167,8 +167,8 @@ static void HUFF_maketree(struct HuffEncodeContext *EC)
 /* registers vars usage
     i  - code index/temp
     i1 - number of unjoined codes
-    i2 - 
-    i3 - 
+    i2 -
+    i3 -
 */
 
 	if (i1>2)
@@ -571,8 +571,8 @@ static void HUFF_analysis(struct HuffEncodeContext *EC,
 /* registers vars usage
     i  - clues
     i1 - minrep
-    i2 - 
-    i3 - 
+    i2 -
+    i3 -
 */
 
 	if (EC->clues>1)
@@ -778,8 +778,8 @@ static void HUFF_analysis(struct HuffEncodeContext *EC,
 /* registers vars usage
     i  - code
     i1 - 8
-    i2 - 
-    i3 - 
+    i2 -
+    i3 -
 */
 
 	if ((~opt) & 8)
@@ -793,8 +793,8 @@ static void HUFF_analysis(struct HuffEncodeContext *EC,
 
 /* registers vars usage
     i  - code/bits
-    i1 - 
-    i2 - 
+    i1 -
+    i2 -
     i3 -
 */
 
diff --git a/Core/Libraries/Source/Compression/EAC/refcodex.h b/Core/Libraries/Source/Compression/EAC/refcodex.h
index 80fdb92c20e..ca92f004b32 100644
--- a/Core/Libraries/Source/Compression/EAC/refcodex.h
+++ b/Core/Libraries/Source/Compression/EAC/refcodex.h
@@ -18,16 +18,12 @@
 
 /* Copyright (C) Electronic Arts Canada Inc. 1995-2002.  All rights reserved. */
 
-#ifndef __REFCODEX
-#define __REFCODEX 1
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef __CODEX_H
-#error "Include codex.h before refcodex.h"
-#endif
+#include "codex.h"
 
 /****************************************************************/
 /*  REF Codex                                                   */
@@ -70,5 +66,4 @@ int        GCALL REF_encode(void *compresseddata, const void *source, int source
 #ifdef __cplusplus
 }
 #endif
-#endif
 
diff --git a/Core/Libraries/Source/Compression/EAC/refencode.cpp b/Core/Libraries/Source/Compression/EAC/refencode.cpp
index f88414d7891..2f12606d5c6 100644
--- a/Core/Libraries/Source/Compression/EAC/refencode.cpp
+++ b/Core/Libraries/Source/Compression/EAC/refencode.cpp
@@ -79,7 +79,10 @@ static int refcompress(unsigned char *from, int len, unsigned char *dest, int ma
         return(0);
 	link = (int *) galloc(131072L*sizeof(int));
 	if (!link)
-        return(0);
+	{
+	    gfree(hashtbl);
+	    return(0);
+	}
 
     memset(hashtbl,-1,65536L*sizeof(int));
 
diff --git a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp
index b79db73c46e..224084152a1 100644
--- a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp
+++ b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.cpp
@@ -20,17 +20,11 @@
 // Compress interface for packets and files
 // Author: Jeff Brown, January 1999
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "Lib/BaseTypeCore.h"
 #include "NoxCompress.h"
 #include "CompLibHeader/lzhl.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define BLOCKSIZE 500000
 #define NoxRead fread
@@ -50,7 +44,7 @@ Bool DecompressFile		(char *infile, char *outfile)
 	size_t srcSz, dstSz;
 
 	// Parameter checking
-	 
+
 	if (( infile == NULL ) || ( outfile == NULL ))
 		return FALSE;
 
@@ -65,7 +59,7 @@ Bool DecompressFile		(char *infile, char *outfile)
 
 		compressedSize -= sizeof(UnsignedInt);
 
-		// Get uncompressed size. Don't worry about endian, 
+		// Get uncompressed size. Don't worry about endian,
 		// this is always INTEL baby!
 		NoxRead(&rawSize, 1, sizeof(UnsignedInt), inFilePtr);
 
@@ -74,7 +68,11 @@ Bool DecompressFile		(char *infile, char *outfile)
 		outBlock= (char *) DbgMalloc( rawSize );
 
 		if (( inBlock == NULL ) || ( outBlock == NULL ))
+		{
+			if (inBlock) DbgFree(inBlock);
+			if (outBlock) DbgFree(outBlock);
 			return FALSE;
+		}
 
 		// Read in a big chunk o file
 		NoxRead(inBlock, 1, compressedSize, inFilePtr);
@@ -84,13 +82,13 @@ Bool DecompressFile		(char *infile, char *outfile)
 		// Decompress
 		srcSz = compressedSize;
 		dstSz = rawSize;
-		
+
 		// Just Do it!
 		decompress = LZHLCreateDecompressor();
 
 		for (;;)
 		{
-			ok = LZHLDecompress( decompress, outBlock + rawSize - dstSz, &dstSz, 
+			ok = LZHLDecompress( decompress, outBlock + rawSize - dstSz, &dstSz,
 																			 inBlock + compressedSize - srcSz, &srcSz);
 
 			if ( !ok )
@@ -100,24 +98,22 @@ Bool DecompressFile		(char *infile, char *outfile)
 				break;
 		}
 
-		DEBUG_LOG(("Decompressed %s to %s, output size = %d\n", infile, outfile, rawSize));
+		DEBUG_LOG(("Decompressed %s to %s, output size = %d", infile, outfile, rawSize));
 
+		Bool success = FALSE;
 		LZHLDestroyDecompressor(decompress);
 		outFilePtr = fopen(outfile, "wb");
 		if (outFilePtr)
 		{
 			fwrite (outBlock, rawSize, 1, outFilePtr);
 			fclose(outFilePtr);
+			success = TRUE;
 		}
-		else
-			return FALSE;
 
-		// Clean up this mess
 		DbgFree(inBlock);
 		DbgFree(outBlock);
-		return TRUE;
-
-	} // End of if fileptr
+		return success;
+	}
 
 	return FALSE;
 }
@@ -135,7 +131,7 @@ Bool CompressFile			(char *infile, char *outfile)
 	UnsignedInt blocklen;
 
 	// Parameter checking
-	 
+
 	if (( infile == NULL ) || ( outfile == NULL ))
 		return FALSE;
 
@@ -153,7 +149,11 @@ Bool CompressFile			(char *infile, char *outfile)
 		outBlock= (char *) DbgMalloc( LZHLCompressorCalcMaxBuf( rawSize ));
 
 		if (( inBlock == NULL ) || ( outBlock == NULL ))
+		{
+			DbgFree(inBlock);
+			DbgFree(outBlock);
 			return FALSE;
+		}
 
 		// Read in a big chunk o file
 		NoxRead(inBlock, 1, rawSize, inFilePtr);
@@ -169,8 +169,8 @@ Bool CompressFile			(char *infile, char *outfile)
 			compressedSize += compressed;
 		}
 
+		Bool success = FALSE;
 		LZHLDestroyCompressor(compressor);
-
 		outFilePtr = fopen(outfile, "wb");
 		if (outFilePtr)
 		{
@@ -178,14 +178,12 @@ Bool CompressFile			(char *infile, char *outfile)
 			fwrite(&rawSize, sizeof(UnsignedInt), 1, outFilePtr);
 			fwrite(outBlock, compressedSize, 1, outFilePtr);
 			fclose(outFilePtr);
+			success = TRUE;
 		}
-		else
-			return FALSE;
 
-		// Clean up
 		DbgFree(inBlock);
 		DbgFree(outBlock);
-		return TRUE;
+		return success;
 	}
 
 	return FALSE;
@@ -194,7 +192,7 @@ Bool CompressFile			(char *infile, char *outfile)
 Bool CompressPacket		(char *inPacket, char *outPacket)
 {
 	// Parameter checking
-	 
+
 	if (( inPacket == NULL ) || ( outPacket == NULL ))
 		return FALSE;
 
@@ -205,7 +203,7 @@ Bool CompressPacket		(char *inPacket, char *outPacket)
 Bool DecompressPacket	(char *inPacket, char *outPacket)
 {
 	// Parameter checking
-	 
+
 	if (( inPacket == NULL ) || ( outPacket == NULL ))
 		return FALSE;
 	return TRUE;
@@ -227,7 +225,7 @@ Bool DecompressMemory		(void *inBufferVoid, Int inSize, void *outBufferVoid, Int
 	size_t srcSz, dstSz;
 
 	// Parameter checking
-	 
+
 	if (( inBuffer == NULL ) || ( outBuffer == NULL ) || ( inSize < 4 ) || ( outSize == 0 ))
 		return FALSE;
 
@@ -240,13 +238,13 @@ Bool DecompressMemory		(void *inBufferVoid, Int inSize, void *outBufferVoid, Int
 	// Decompress
 	srcSz = compressedSize;
 	dstSz = rawSize;
-	
+
 	// Just Do it!
 	decompress = LZHLCreateDecompressor();
 
 	for (;;)
 	{
-		ok = LZHLDecompress( decompress, outBuffer + rawSize - dstSz, &dstSz, 
+		ok = LZHLDecompress( decompress, outBuffer + rawSize - dstSz, &dstSz,
 																		 inBuffer + compressedSize - srcSz, &srcSz);
 
 		if ( !ok )
@@ -274,7 +272,7 @@ Bool CompressMemory			(void *inBufferVoid, Int inSize, void *outBufferVoid, Int&
 	UnsignedInt blocklen;
 
 	// Parameter checking
-	 
+
 	if (( inBuffer == NULL ) || ( outBuffer == NULL ) || ( inSize < 4 ) || ( outSize == 0 ))
 		return FALSE;
 
diff --git a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h
index e36ccffdfe3..0a14bd00aff 100644
--- a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h
+++ b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h
@@ -20,9 +20,7 @@
 // Compress/Decompression header.
 // Author: Jeff Brown, January 1999
 
-
-#ifndef __compress_h
-#define __compress_h
+#pragma once
 
 #define MAP_EXTENSION ".map"
 #define LZH_EXTENSION ".nxz"
@@ -36,5 +34,3 @@ UnsignedInt CalcNewSize		(UnsignedInt rawSize);
 
 Bool DecompressMemory		(void *inBufferVoid, Int inSize, void *outBufferVoid, Int& outSize);
 Bool CompressMemory			(void *inBufferVoid, Int inSize, void *outBufferVoid, Int& outSize);
-
-#endif // __compress_h
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
index 628746e29f8..35c7ff4bd6e 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
+++ b/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
@@ -15,8 +15,8 @@ set(WW3D2_SRC
     assetstatus.h
     bitmaphandler.cpp
     bitmaphandler.h
-    #bmp2d.cpp
-    #bmp2d.h
+    bmp2d.cpp
+    bmp2d.h
     #boxrobj.cpp
     #boxrobj.h
     bwrender.cpp
@@ -56,8 +56,8 @@ set(WW3D2_SRC
     #dx8renderer.h
     #dx8rendererdebugger.cpp
     #dx8rendererdebugger.h
-    #dx8texman.cpp
-    #dx8texman.h
+    dx8texman.cpp
+    dx8texman.h
     #dx8vertexbuffer.cpp
     #dx8vertexbuffer.h
     dx8webbrowser.cpp
@@ -81,7 +81,7 @@ set(WW3D2_SRC
     #hlod.cpp
     #hlod.h
     hmdldef.cpp
-    hmdldef.H
+    hmdldef.h
     #hmorphanim.cpp
     #hmorphanim.h
     #hrawanim.cpp
@@ -108,8 +108,8 @@ set(WW3D2_SRC
     #mapper.h
     matinfo.cpp
     matinfo.h
-    #matpass.cpp
-    #matpass.h
+    matpass.cpp
+    matpass.h
     #matrixmapper.cpp
     #matrixmapper.h
     #mesh.cpp
@@ -200,18 +200,18 @@ set(WW3D2_SRC
     stripoptimizer.h
     surfaceclass.cpp
     surfaceclass.h
-    #texproject.cpp
-    #texproject.h
+    texproject.cpp
+    texproject.h
     #textdraw.cpp # unused
     textdraw.h
-    #texture.cpp
-    #texture.h
-    #texturefilter.cpp
-    #texturefilter.h
-    #textureloader.cpp
-    #textureloader.h
-    #texturethumbnail.cpp
-    #texturethumbnail.h
+    texture.cpp
+    texture.h
+    texturefilter.cpp
+    texturefilter.h
+    textureloader.cpp
+    textureloader.h
+    texturethumbnail.cpp
+    texturethumbnail.h
     #vertmaterial.cpp
     #vertmaterial.h
     visrasterizer.cpp
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/FramGrab.cpp b/Core/Libraries/Source/WWVegas/WW3D2/FramGrab.cpp
index de107c287c3..0fb36d93ac3 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/FramGrab.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/FramGrab.cpp
@@ -21,7 +21,6 @@
 //////////////////////////////////////////////////////////////////////
 
 #include "framgrab.h"
-#include <stdio.h>
 #include <io.h>
 //#include <errno.h>
 
@@ -31,8 +30,8 @@
 
 FrameGrabClass::FrameGrabClass(const char *filename, MODE mode, int width, int height, int bitcount, float framerate)
 {
-	HRESULT          hr; 
-	
+	HRESULT          hr;
+
 	Mode = mode;
 	Filename = filename;
 	FrameRate = framerate;
@@ -43,7 +42,7 @@ FrameGrabClass::FrameGrabClass(const char *filename, MODE mode, int width, int h
 
 	if(Mode != AVI) return;
 
-	AVIFileInit();          // opens AVIFile library  
+	AVIFileInit();          // opens AVIFile library
 
 	// find the first free file with this prefix
 	int counter = 0;
@@ -54,8 +53,8 @@ FrameGrabClass::FrameGrabClass(const char *filename, MODE mode, int width, int h
 		result = _access(file, 0);
 	} while(result != -1);
 
-	// Create new AVI file using AVIFileOpen. 
-    hr = AVIFileOpen(&AVIFile, file, OF_WRITE | OF_CREATE, NULL); 
+	// Create new AVI file using AVIFileOpen.
+    hr = AVIFileOpen(&AVIFile, file, OF_WRITE | OF_CREATE, NULL);
     if (hr != 0) {
 		char buf[256];
 		sprintf(buf, "Unable to open %s\n", Filename);
@@ -63,9 +62,9 @@ FrameGrabClass::FrameGrabClass(const char *filename, MODE mode, int width, int h
 		CleanupAVI();
 		return;
 	}
-    
 
-    // Create a stream using AVIFileCreateStream. 
+
+    // Create a stream using AVIFileCreateStream.
 	AVIStreamInfo.fccType = streamtypeVIDEO;
 	AVIStreamInfo.fccHandler = mmioFOURCC('M','S','V','C');
 	AVIStreamInfo.dwFlags = 0;
@@ -80,22 +79,22 @@ FrameGrabClass::FrameGrabClass(const char *filename, MODE mode, int width, int h
 	AVIStreamInfo.dwSuggestedBufferSize = 0;
 	AVIStreamInfo.dwQuality = 0;
 	AVIStreamInfo.dwSampleSize = 0;
-	SetRect(&AVIStreamInfo.rcFrame, 0, 0, width, height);  
+	SetRect(&AVIStreamInfo.rcFrame, 0, 0, width, height);
 	AVIStreamInfo.dwEditCount = 0;
 	AVIStreamInfo.dwFormatChangeCount = 0;
 	sprintf(AVIStreamInfo.szName,"G");
 
-    hr = AVIFileCreateStream(AVIFile, &Stream, &AVIStreamInfo); 
-    if (hr != 0) {   
+    hr = AVIFileCreateStream(AVIFile, &Stream, &AVIStreamInfo);
+    if (hr != 0) {
 		CleanupAVI();
-		return;     
+		return;
 	}
-	
+
     // Set format of new stream
 	BitmapInfoHeader.biWidth = width;
-	BitmapInfoHeader.biHeight = height; 
+	BitmapInfoHeader.biHeight = height;
 	BitmapInfoHeader.biBitCount = (unsigned short)bitcount;
-    BitmapInfoHeader.biSizeImage = ((((UINT)BitmapInfoHeader.biBitCount * BitmapInfoHeader.biWidth + 31) & ~31) / 8) * BitmapInfoHeader.biHeight; 
+    BitmapInfoHeader.biSizeImage = ((((UINT)BitmapInfoHeader.biBitCount * BitmapInfoHeader.biWidth + 31) & ~31) / 8) * BitmapInfoHeader.biHeight;
 	BitmapInfoHeader.biSize = sizeof(BITMAPINFOHEADER); // size of structure
 	BitmapInfoHeader.biPlanes = 1; // must be set to 1
 	BitmapInfoHeader.biCompression = BI_RGB; // uncompressed
@@ -104,13 +103,13 @@ FrameGrabClass::FrameGrabClass(const char *filename, MODE mode, int width, int h
 	BitmapInfoHeader.biClrUsed = 0; // all colors are used
 	BitmapInfoHeader.biClrImportant = 0; // all colors are important
 
-    hr = AVIStreamSetFormat(Stream, 0, &BitmapInfoHeader, sizeof(BitmapInfoHeader)); 
+    hr = AVIStreamSetFormat(Stream, 0, &BitmapInfoHeader, sizeof(BitmapInfoHeader));
     if (hr != 0) {
 		CleanupAVI();
-		return;     
-	}  
+		return;
+	}
 
-    Bitmap = (long *) GlobalAllocPtr(GMEM_MOVEABLE, BitmapInfoHeader.biSizeImage); 
+    Bitmap = (long *) GlobalAllocPtr(GMEM_MOVEABLE, BitmapInfoHeader.biSizeImage);
 }
 
 FrameGrabClass::~FrameGrabClass()
@@ -124,22 +123,22 @@ void FrameGrabClass::CleanupAVI() {
 	if(Bitmap != 0) { GlobalFreePtr(Bitmap); Bitmap = 0; }
 	if(Stream != 0) { AVIStreamRelease(Stream); Stream = 0; }
 	if(AVIFile != 0) { AVIFileRelease(AVIFile); AVIFile = 0; }
-	
+
 	AVIFileExit();
 	Mode = RAW;
 }
 
 void FrameGrabClass::GrabAVI(void *BitmapPointer)
 {
-    // CompressDIB(&bi, lpOld, &biNew, lpNew);  
+    // CompressDIB(&bi, lpOld, &biNew, lpNew);
 
-    // Save the compressed data using AVIStreamWrite. 
-    HRESULT hr = AVIStreamWrite(Stream, Counter++, 1, BitmapPointer, BitmapInfoHeader.biSizeImage, AVIIF_KEYFRAME, NULL, NULL);     
+    // Save the compressed data using AVIStreamWrite.
+    HRESULT hr = AVIStreamWrite(Stream, Counter++, 1, BitmapPointer, BitmapInfoHeader.biSizeImage, AVIIF_KEYFRAME, NULL, NULL);
 	if(hr != 0) {
 		char buf[256];
 		sprintf(buf, "avi write error %x/%d\n", hr, hr);
 		OutputDebugString(buf);
-	} 
+	}
 }
 
 void FrameGrabClass::GrabRawFrame(void * /*BitmapPointer*/)
@@ -148,23 +147,23 @@ void FrameGrabClass::GrabRawFrame(void * /*BitmapPointer*/)
 }
 
 
-void FrameGrabClass::ConvertGrab(void *BitmapPointer) 
+void FrameGrabClass::ConvertGrab(void *BitmapPointer)
 {
 	ConvertFrame(BitmapPointer);
 	Grab( Bitmap );
 }
 
 
-void FrameGrabClass::Grab(void *BitmapPointer) 
+void FrameGrabClass::Grab(void *BitmapPointer)
 {
-	if(Mode == AVI) 
+	if(Mode == AVI)
 		GrabAVI(BitmapPointer);
 	else
 		GrabRawFrame(BitmapPointer);
 }
 
 
-void FrameGrabClass::ConvertFrame(void *BitmapPointer) 
+void FrameGrabClass::ConvertFrame(void *BitmapPointer)
 {
 
 	int width = BitmapInfoHeader.biWidth;
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp
index ed2c28c919f..0dc4fb8cc29 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp
@@ -141,8 +141,8 @@ AABTreeClass::AABTreeClass(const AABTreeClass & that) :
 	PolyCount(0),
 	PolyIndices(0),
 	Mesh(NULL)
-{ 
-	*this = that; 
+{
+	*this = that;
 }
 
 /***********************************************************************************************
@@ -177,7 +177,7 @@ AABTreeClass::~AABTreeClass(void)
 AABTreeClass & AABTreeClass::operator = (const AABTreeClass & that)
 {
 	Reset();
-	
+
 	NodeCount = that.NodeCount;
 	if (NodeCount > 0) {
 		Nodes = W3DNEWARRAY CullNodeStruct[NodeCount];
@@ -211,18 +211,14 @@ AABTreeClass & AABTreeClass::operator = (const AABTreeClass & that)
 void AABTreeClass::Reset(void)
 {
 	NodeCount = 0;
-	if (Nodes) {
-		delete[] Nodes;
-		Nodes = NULL;
-	}
+	delete[] Nodes;
+	Nodes = NULL;
+
 	PolyCount = 0;
-	if (PolyIndices) {
-		delete[] PolyIndices;
-		PolyIndices = NULL;
-	}
-	if (Mesh) {
-		Mesh = NULL;
-	}
+	delete[] PolyIndices;
+	PolyIndices = NULL;
+
+	Mesh = NULL;
 }
 
 /***********************************************************************************************
@@ -267,7 +263,7 @@ void AABTreeClass::Build_Tree_Recursive(AABTreeBuilderClass::CullNodeStruct * no
 
 	newnode->Min = node->Min;
 	newnode->Max = node->Max;
-	
+
 	/*
 	** If this is a non-leaf node, set up the child indices, otherwise set up the polygon indices
 	*/
@@ -276,7 +272,7 @@ void AABTreeClass::Build_Tree_Recursive(AABTreeBuilderClass::CullNodeStruct * no
 		WWASSERT(node->Back != NULL);		// if we have one child, we better have both!
 		newnode->Set_Front_Child(node->Front->Index);
 		newnode->Set_Back_Child(node->Back->Index);
-	
+
 	} else {
 
 		newnode->Set_Poly0(curpolyindex);
@@ -364,11 +360,11 @@ void AABTreeClass::Generate_OBBox_APT_Recursive(CullNodeStruct * node,OBBoxAPTCo
 	*/
 	AABoxClass nodebox;
 	nodebox.Init_Min_Max(node->Min,node->Max);				// NOTE: too bad we have to compute the nodebox!!!
-	
+
 	if (!CollisionMath::Intersection_Test(context.Box,nodebox)) {
 		return;
 	}
-	
+
 	/*
 	** If this is a leaf, test its polygons, otherwise recurse into the children
 	*/
@@ -387,7 +383,7 @@ void AABTreeClass::Generate_OBBox_APT_Recursive(CullNodeStruct * node,OBBoxAPTCo
 			for (int poly_counter=0; poly_counter<polycount; poly_counter++) {
 
 				int poly_index = PolyIndices[poly0 + poly_counter];
-				
+
 				tri.V[0] = &(loc[ polys[poly_index][0] ]);
 				tri.V[1] = &(loc[ polys[poly_index][1] ]);
 				tri.V[2] = &(loc[ polys[poly_index][2] ]);
@@ -400,7 +396,7 @@ void AABTreeClass::Generate_OBBox_APT_Recursive(CullNodeStruct * node,OBBoxAPTCo
 #endif
 				if (CollisionMath::Intersection_Test(context.Box,tri)) {;
 					context.APT.Add(poly_index);
-				} 
+				}
 			}
 		}
 
@@ -459,11 +455,11 @@ void AABTreeClass::Generate_OBBox_APT_Recursive(CullNodeStruct * node, OBBoxRayA
 	*/
 	AABoxClass nodebox;
 	nodebox.Init_Min_Max(node->Min,node->Max);				// NOTE: too bad we have to compute the nodebox!!!
-	
+
 	if (!CollisionMath::Intersection_Test(context.Box,nodebox)) {
 		return;
 	}
-	
+
 	/*
 	** If this is a leaf, test its polygons, otherwise recurse into the children
 	*/
@@ -483,7 +479,7 @@ void AABTreeClass::Generate_OBBox_APT_Recursive(CullNodeStruct * node, OBBoxRayA
 			for (int poly_counter=0; poly_counter<polycount; poly_counter++) {
 
 				int poly_index = PolyIndices[poly0 + poly_counter];
-				
+
 				tri.V[0] = &(loc[ polys[poly_index][0] ]);
 				tri.V[1] = &(loc[ polys[poly_index][1] ]);
 				tri.V[2] = &(loc[ polys[poly_index][2] ]);
@@ -497,7 +493,7 @@ void AABTreeClass::Generate_OBBox_APT_Recursive(CullNodeStruct * node, OBBoxRayA
 				if (Vector3::Dot_Product(*tri.N,context.ViewVector) < 0.0f) {
 					if (CollisionMath::Intersection_Test(context.Box,tri)) {
 						context.APT.Add(poly_index);
-					} 
+					}
 				}
 			}
 		}
@@ -533,19 +529,19 @@ bool AABTreeClass::Cast_Ray_Recursive(CullNodeStruct * node,RayCollisionTestClas
 	if (raytest.Cull(node->Min,node->Max)) {
 		return false;
 	}
-	
+
 	bool res = false;
 	if (node->Is_Leaf()) {
-	
+
 		return Cast_Ray_To_Polys(node,raytest);
-	
+
 	} else {
 
 		res = res | Cast_Ray_Recursive(&(Nodes[node->Get_Front_Child()]),raytest);
 		res = res | Cast_Ray_Recursive(&(Nodes[node->Get_Back_Child()]),raytest);
 
 	}
-	
+
 	return res;
 }
 
@@ -595,10 +591,10 @@ int AABTreeClass::Cast_Semi_Infinite_Axis_Aligned_Ray_Recursive(CullNodeStruct *
 
 	int count = 0;
 	if (node->Is_Leaf()) {
-	
+
 		return Cast_Semi_Infinite_Axis_Aligned_Ray_To_Polys(node, start_point, axis_r, axis_1,
 			axis_2, direction, flags);
-	
+
 	} else {
 
 		count += Cast_Semi_Infinite_Axis_Aligned_Ray_Recursive(&(Nodes[node->Get_Front_Child()]),
@@ -607,7 +603,7 @@ int AABTreeClass::Cast_Semi_Infinite_Axis_Aligned_Ray_Recursive(CullNodeStruct *
 			start_point, axis_r, axis_1, axis_2, direction, flags);
 
 	}
-	
+
 	return count;
 }
 
@@ -647,7 +643,7 @@ bool AABTreeClass::Cast_AABox_Recursive(CullNodeStruct * node,AABoxCollisionTest
 		res = res | Cast_AABox_Recursive(&(Nodes[node->Get_Back_Child()]),boxtest);
 
 	}
-	
+
 	return res;
 }
 
@@ -680,7 +676,7 @@ bool AABTreeClass::Cast_OBBox_Recursive(CullNodeStruct * node,OBBoxCollisionTest
 	if (node->Is_Leaf()) {
 
 		return Cast_OBBox_To_Polys(node,boxtest);
-	
+
 	} else {
 
 		res = res | Cast_OBBox_Recursive(&(Nodes[node->Get_Front_Child()]),boxtest);
@@ -718,7 +714,7 @@ bool AABTreeClass::Intersect_OBBox_Recursive(AABTreeClass::CullNodeStruct * node
 	if (node->Is_Leaf()) {
 
 		return Intersect_OBBox_With_Polys(node,test);
-		
+
 	} else {
 
 		res = res | Intersect_OBBox_Recursive(&(Nodes[node->Get_Front_Child()]),test);
@@ -728,10 +724,6 @@ bool AABTreeClass::Intersect_OBBox_Recursive(AABTreeClass::CullNodeStruct * node
 	return res;
 }
 
-#ifdef RTS_DEBUG
-#pragma optimize("", off)	 // We get an odd error when using optimized in the debug.  
-// All optimized seems to work.  jba.
-#endif
 /***********************************************************************************************
  * AABTreeClass::Cast_Ray_To_Polys -- cast the ray to polys in the given node                  *
  *                                                                                             *
@@ -791,10 +783,6 @@ bool AABTreeClass::Cast_Ray_To_Polys(CullNodeStruct * node,RayCollisionTestClass
 	}
 	return false;
 }
-#ifdef RTS_DEBUG
-#pragma optimize("", on)
-#endif
-
 
 /***********************************************************************************************
  * AABTreeClass::Cast_Semi_Infinite_Axis_Aligned_Ray_To_Polys -- cast ray to polys in the node *
@@ -831,7 +819,7 @@ int AABTreeClass::Cast_Semi_Infinite_Axis_Aligned_Ray_To_Polys(CullNodeStruct *
 		const Vector4 * plane = Mesh->Get_Plane_Array();
 		int poly0 = node->Get_Poly0();
 		int polycount = node->Get_Poly_Count();
-		
+
 		for (int poly_counter=0; poly_counter < polycount; poly_counter++) {
 
 			int poly_index = PolyIndices[poly0 + poly_counter];
@@ -868,7 +856,7 @@ bool AABTreeClass::Cast_AABox_To_Polys(CullNodeStruct * node,AABoxCollisionTestC
 	if (node->Get_Poly_Count() > 0) {
 		/*
 		** Simply loop through the polys in this node, checking each for collision
-		*/	  
+		*/
 		TriClass tri;
 
 		const Vector3 * loc = Mesh->Get_Vertex_Array();
@@ -932,7 +920,7 @@ bool AABTreeClass::Cast_OBBox_To_Polys(CullNodeStruct * node,OBBoxCollisionTestC
 	if (polycount > 0) {
 		/*
 		** Simply loop through the polys in this node, checking each for collision
-		*/	  
+		*/
 		TriClass tri;
 
 		const Vector3 * loc = Mesh->Get_Vertex_Array();
@@ -1000,7 +988,7 @@ bool AABTreeClass::Intersect_OBBox_With_Polys
 	if (polycount > 0) {
 		/*
 		** Simply loop through the polys in this node, checking each for collision
-		*/	  
+		*/
 		TriClass tri;
 
 		const Vector3 * loc = Mesh->Get_Vertex_Array();
@@ -1072,7 +1060,7 @@ void AABTreeClass::Update_Bounding_Boxes_Recursive(CullNodeStruct * node)
 
 		if (Nodes[front].Min.Y < node->Min.Y) node->Min.Y = Nodes[front].Min.Y;
 		if (Nodes[front].Max.Y > node->Max.Y) node->Max.Y = Nodes[front].Max.Y;
-		
+
 		if (Nodes[front].Min.Z < node->Min.Z) node->Min.Z = Nodes[front].Min.Z;
 		if (Nodes[front].Max.Z > node->Max.Z) node->Max.Z = Nodes[front].Max.Z;
 
@@ -1081,12 +1069,12 @@ void AABTreeClass::Update_Bounding_Boxes_Recursive(CullNodeStruct * node)
 
 		if (Nodes[back].Min.Y < node->Min.Y) node->Min.Y = Nodes[back].Min.Y;
 		if (Nodes[back].Max.Y > node->Max.Y) node->Max.Y = Nodes[back].Max.Y;
-		
+
 		if (Nodes[back].Min.Z < node->Min.Z) node->Min.Z = Nodes[back].Min.Z;
 		if (Nodes[back].Max.Z > node->Max.Z) node->Max.Z = Nodes[back].Max.Z;
 
 	} else {
-		
+
 		/*
 		** Bound our polygons
 		*/
@@ -1154,7 +1142,7 @@ void AABTreeClass::Update_Min_Max(int poly_index,Vector3 & min,Vector3 & max)
 void AABTreeClass::Load_W3D(ChunkLoadClass & cload)
 {
 	Reset();
-	
+
 	W3dMeshAABTreeHeader header;
 	cload.Open_Chunk();
 	WWASSERT(cload.Cur_Chunk_ID() == W3D_CHUNK_AABTREE_HEADER);
@@ -1167,7 +1155,7 @@ void AABTreeClass::Load_W3D(ChunkLoadClass & cload)
 	PolyIndices = W3DNEWARRAY uint32[PolyCount];
 
 	while (cload.Open_Chunk()) {
-		switch (cload.Cur_Chunk_ID()) 
+		switch (cload.Cur_Chunk_ID())
 		{
 		case W3D_CHUNK_AABTREE_POLYINDICES:
 			Read_Poly_Indices(cload);
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h
index b89adc61080..d38dc9d6d01 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h
@@ -37,15 +37,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef AABTREE_H
-#define AABTREE_H
 
 #include "always.h"
-#include "refcount.h"
 #include "simplevec.h"
 #include "vector3.h"
 #include "Vector3i.h"
@@ -116,12 +110,12 @@ class AABTreeClass : public W3DMPO, public RefCountClass
 	void						Set_Mesh(MeshGeometryClass * mesh);
 
 private:
-	
+
 	AABTreeClass &			operator = (const AABTreeClass & that);
 
 	void						Read_Poly_Indices(ChunkLoadClass & cload);
 	void						Read_Nodes(ChunkLoadClass & cload);
-	
+
 	void						Build_Tree_Recursive(AABTreeBuilderClass::CullNodeStruct * node,int &curpolyindex);
 	void						Reset(void);
 	void						Update_Bounding_Boxes(void);
@@ -139,13 +133,13 @@ class AABTreeClass : public W3DMPO, public RefCountClass
 	{
 		Vector3				Min;
 		Vector3				Max;
-		
+
 		uint32				FrontOrPoly0;
 		uint32				BackOrPolyCount;
 
 		// accessors
-		inline bool			Is_Leaf(void);				
-		
+		inline bool			Is_Leaf(void);
+
 		inline int			Get_Back_Child(void);		// returns index of back child (only call for non-LEAFs!!!)
 		inline int			Get_Front_Child(void);		// returns index of front child (only call for non-LEAFs!!!)
 		inline int			Get_Poly0(void);				// returns index of first polygon (only call on LEAFs)
@@ -164,7 +158,7 @@ class AABTreeClass : public W3DMPO, public RefCountClass
 	*/
 	struct OBBoxAPTContextStruct
 	{
-		OBBoxAPTContextStruct(const OBBoxClass & box,SimpleDynVecClass<uint32> & apt) : 
+		OBBoxAPTContextStruct(const OBBoxClass & box,SimpleDynVecClass<uint32> & apt) :
 			Box(box), APT(apt)
 		{ }
 
@@ -221,8 +215,8 @@ class AABTreeClass : public W3DMPO, public RefCountClass
 
 };
 
-inline int AABTreeClass::Compute_Ram_Size(void) 
-{ 
+inline int AABTreeClass::Compute_Ram_Size(void)
+{
 	return	NodeCount * sizeof(CullNodeStruct) +
 				PolyCount * sizeof(int) +
 				sizeof(AABTreeClass);
@@ -254,7 +248,7 @@ inline int AABTreeClass::Cast_Semi_Infinite_Axis_Aligned_Ray(const Vector3 & sta
 	// The functions called after this point will 'or' bits into this variable, so it needs to
 	// be initialized here to TRI_RAYCAST_FLAG_NONE.
 	flags = TRI_RAYCAST_FLAG_NONE;
-	
+
 	return Cast_Semi_Infinite_Axis_Aligned_Ray_Recursive(&(Nodes[0]), start_point,
 		axis_r[axis_dir], axis_1[axis_dir], axis_2[axis_dir], direction[axis_dir], flags);
 }
@@ -350,5 +344,3 @@ inline void AABTreeClass::CullNodeStruct::Set_Poly_Count(uint32 count)
 	WWASSERT(count < 0x7FFFFFFF);
 	BackOrPolyCount = count;
 }
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp
index 6bf70546236..9353b289781 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp
@@ -24,7 +24,7 @@
  *                                                                                             *
  *                     $Archive:: /Commando/Code/ww3d2/agg_def.cpp          $*
  *                                                                                             *
- *                       Author:: Patrick Smith                                                
+ *                       Author:: Patrick Smith
  *                                                                                             *
  *                     $Modtime:: 4/05/01 10:21a                                              $*
  *                                                                                             *
@@ -118,11 +118,11 @@ AggregateDefClass::~AggregateDefClass (void)
 {
 	// Free the name buffer if necessary
 	if (m_pName != NULL) {
-		
+
 		// free() is used because the buffer was allocated with ::_strdup().
 		::free (m_pName);
 		m_pName = NULL;
-	}	
+	}
 
 	Free_Subobject_List ();
 	return ;
@@ -139,10 +139,10 @@ AggregateDefClass::operator= (const AggregateDefClass &src)
 	int index;
 
 	// Free the name buffer if necessary
-	if (m_pName != NULL) {		
+	if (m_pName != NULL) {
 		::free (m_pName);
 		m_pName = NULL;
-	}	
+	}
 
 	// Start with a fresh set of data
 	Free_Subobject_List ();
@@ -150,7 +150,7 @@ AggregateDefClass::operator= (const AggregateDefClass &src)
 	// Copy the src object's name and info struct
 	Set_Name (src.Get_Name ());
 	::memcpy (&m_Info, &src.m_Info, sizeof (m_Info));
-	::memcpy (&m_MiscInfo, &src.m_MiscInfo, sizeof (m_MiscInfo));	
+	::memcpy (&m_MiscInfo, &src.m_MiscInfo, sizeof (m_MiscInfo));
 	m_Version = src.m_Version;
 
 	// Loop through all the entries in the src object's subobj list
@@ -182,9 +182,7 @@ AggregateDefClass::Free_Subobject_List (void)
 	// Delete all the stucture pointers contained in the subobject list
 	for (int index = 0; index < m_SubobjectList.Count (); index ++) {
 		W3dAggregateSubobjectStruct *pinfo = m_SubobjectList[index];
-		if (pinfo) {
-			delete pinfo;
-		}
+		delete pinfo;
 	}
 
 	// Reset the lists contents
@@ -203,7 +201,7 @@ AggregateDefClass::Create (void)
 	// Attempt to create an instance of the hierarchy
 	RenderObjClass *pmodel = Create_Render_Object (m_Info.BaseModelName);
 	if (pmodel != NULL) {
-		
+
 		// Perform the aggregation
 		Attach_Subobjects (*pmodel);
 
@@ -213,7 +211,7 @@ AggregateDefClass::Create (void)
 		pmodel->Set_Sub_Objects_Match_LOD ((m_MiscInfo.Flags & W3D_AGGREGATE_FORCE_SUB_OBJ_LOD) == W3D_AGGREGATE_FORCE_SUB_OBJ_LOD);
 
 	} else {
-		WWDEBUG_SAY (("Unable to load aggregate %s.\r\n", m_Info.BaseModelName));
+		WWDEBUG_SAY (("Unable to load aggregate %s.", m_Info.BaseModelName));
 	}
 
 	// Return a pointer to the new aggregate
@@ -235,7 +233,7 @@ AggregateDefClass::Find_Subobject
 {
 	RenderObjClass *parent_model = &model;
 	parent_model->Add_Ref ();
-	
+
 	// Loop through all the models in our "path" until we've either failed
 	// or found the exact mesh we were looking for...
 	for (int index = 1;
@@ -247,15 +245,18 @@ AggregateDefClass::Find_Subobject
 		if (bone_path[index][0] == 0) {
 			sub_obj = parent_model->Get_Sub_Object_By_Name (mesh_path[index]);
 		} else {
-			
+
 			int bone_index = parent_model->Get_Bone_Index (bone_path[index]);
 			int subobj_count = parent_model->Get_Num_Sub_Objects_On_Bone (bone_index);
-			
+
 			// Loop through all the subobjects on this bone
-			for (int subobj_index = 0; (subobj_index < subobj_count) && (sub_obj == NULL); subobj_index ++) {				
-				
+			for (int subobj_index = 0; (subobj_index < subobj_count) && (sub_obj == NULL); subobj_index ++) {
+
 				// Is this the subobject we were looking for?
 				RenderObjClass *ptemp_obj = parent_model->Get_Sub_Object_On_Bone (subobj_index, bone_index);
+				if (ptemp_obj == NULL)
+					continue;
+
 				if (::lstrcmpi (ptemp_obj->Get_Name (), mesh_path[index]) == 0) {
 					sub_obj = ptemp_obj;
 				} else {
@@ -286,24 +287,24 @@ AggregateDefClass::Attach_Subobjects (RenderObjClass &base_model)
 	for (int index = 0; index < m_SubobjectList.Count (); index ++) {
 		W3dAggregateSubobjectStruct *psubobj_info = m_SubobjectList[index];
 		if (psubobj_info != NULL) {
-			
+
 			// Now create this subobject and attach it to its bone.
 			RenderObjClass *prender_obj = Create_Render_Object (psubobj_info->SubobjectName);
 			if (prender_obj != NULL) {
 
 				// Attach this object to the requested bone
 				if (base_model.Add_Sub_Object_To_Bone (prender_obj, psubobj_info->BoneName) == false) {
-					WWDEBUG_SAY (("Unable to attach %s to %s.\r\n", psubobj_info->SubobjectName, psubobj_info->BoneName));
+					WWDEBUG_SAY (("Unable to attach %s to %s.", psubobj_info->SubobjectName, psubobj_info->BoneName));
 				}
 
 				// Release our hold on this pointer
 				prender_obj->Release_Ref ();
 			} else {
-				WWDEBUG_SAY (("Unable to load aggregate subobject %s.\r\n", psubobj_info->SubobjectName));
+				WWDEBUG_SAY (("Unable to load aggregate subobject %s.", psubobj_info->SubobjectName));
 			}
 		}
 	}
-	
+
 	return ;
 }
 
@@ -320,7 +321,7 @@ AggregateDefClass::Create_Render_Object (const char *passet_name)
 
 	// Attempt to get an instance of the render object from the asset manager
 	prender_obj = WW3DAssetManager::Get_Instance()->Create_Render_Obj (passet_name);
-	
+
 	// If we couldn't find the render object in the asset manager, then attempt to
 	// load it from file
 	if ((prender_obj == NULL) &&
@@ -329,7 +330,7 @@ AggregateDefClass::Create_Render_Object (const char *passet_name)
 		// It should be in the asset manager now, so attempt to get it again.
 		prender_obj = WW3DAssetManager::Get_Instance()->Create_Render_Obj (passet_name);
 	}
-	
+
 	// Return a pointer to the render object
 	return prender_obj;
 }
@@ -347,7 +348,7 @@ AggregateDefClass::Load_Assets (const char *passet_name)
 
 	// Param OK?
 	if (passet_name != NULL) {
-		
+
 		// Determine what the current working directory is
 		char path[MAX_PATH];
 		::GetCurrentDirectory (sizeof (path), path);
@@ -390,9 +391,9 @@ AggregateDefClass::Initialize (RenderObjClass &base_model)
 	::lstrcpy (m_Info.BaseModelName, orig_model_name);
 	m_Info.SubobjectCount = 0;
 	m_MiscInfo.OriginalClassID = base_model.Class_ID ();
-	m_MiscInfo.Flags = 0;	
+	m_MiscInfo.Flags = 0;
 	m_MiscInfo.Flags |= base_model.Is_Sub_Objects_Match_LOD_Enabled () ? W3D_AGGREGATE_FORCE_SUB_OBJ_LOD : 0;
-	
+
 
 	// Pass the aggregate name along
 	Set_Name (base_model.Get_Name ());
@@ -406,7 +407,7 @@ AggregateDefClass::Initialize (RenderObjClass &base_model)
 	Build_Subobject_List (*pvanilla_model, base_model);
 
 	// Release the model if necessary
-	REF_PTR_RELEASE (pvanilla_model);	
+	REF_PTR_RELEASE (pvanilla_model);
 	return ;
 }
 
@@ -427,9 +428,9 @@ AggregateDefClass::Build_Subobject_List
 
 	// Loop through all the bones in this render obj
 	int bone_count = model.Get_Num_Bones ();
-	for (int bone_index = 0; bone_index < bone_count; bone_index ++) {			
+	for (int bone_index = 0; bone_index < bone_count; bone_index ++) {
 		const char *pbone_name = model.Get_Bone_Name (bone_index);
-		
+
 		// Build a list of nodes that are contained in the vanilla model
 		DynamicVectorClass <RenderObjClass *> orig_node_list;
 		for (index = 0;
@@ -454,18 +455,18 @@ AggregateDefClass::Build_Subobject_List
 
 		int node_count = node_list.Count ();
 		if (node_count > 0) {
-			
+
 			// Loop through the subobjects and add each one to our internal list
 			W3dAggregateSubobjectStruct subobj_info = { 0 };
 			for (int node_index = 0; node_index < node_count; node_index ++) {
 				RenderObjClass *psubobject = node_list[node_index];
 				WWASSERT (psubobject != NULL);
-				
+
 				// Is this subobject new?  (i.e. not in a 'vanilla' instance?)
 				const char *prototype_name = psubobject->Get_Name ();
 				if (psubobject != NULL &&
 					 (Is_Object_In_List (prototype_name, orig_node_list) == false)) {
-					
+
 					// Add this subobject to our list
 					::lstrcpy (subobj_info.SubobjectName, prototype_name);
 					::lstrcpy (subobj_info.BoneName, pbone_name);
@@ -516,13 +517,13 @@ AggregateDefClass::Is_Object_In_List
 	// were are looking for.
 	for (int node_index = 0; (node_index < node_list.Count ()) && (retval == false); node_index ++) {
 		RenderObjClass *prender_obj = node_list[node_index];
-		
+
 		// Is this the render object we were looking for?
 		if (prender_obj != NULL &&
 		    ::lstrcmpi (prender_obj->Get_Name (), passet_name) == 0) {
 			retval = true;
 		}
-	}	
+	}
 
 	// Return the true/false result code
 	return retval;
@@ -538,7 +539,7 @@ AggregateDefClass::Load_W3D (ChunkLoadClass &chunk_load)
 {
 	W3dTextureReplacerHeaderStruct header = { 0 };
 
-	
+
 	while (chunk_load.Open_Chunk()) {
 
 		WW3DErrorType error = WW3D_ERROR_OK;
@@ -556,9 +557,9 @@ AggregateDefClass::Load_W3D (ChunkLoadClass &chunk_load)
 			case W3D_CHUNK_TEXTURE_REPLACER_INFO:
 				if (chunk_load.Read (&header, sizeof (header)) == sizeof (header)) {
 					if (header.ReplacedTexturesCount > 0) {
-						WWDEBUG_SAY(("Obsolete texture replacement chunk encountered in aggregate: %s\r\n",m_pName));
+						WWDEBUG_SAY(("Obsolete texture replacement chunk encountered in aggregate: %s",m_pName));
 					}
-				} 
+				}
 				break;
 
 			case W3D_CHUNK_AGGREGATE_CLASS_INFO:
@@ -566,14 +567,14 @@ AggregateDefClass::Load_W3D (ChunkLoadClass &chunk_load)
 				break;
 
 			default:
-				
+
 				// Unknown chunk.
 				break;
-		}	
+		}
 		chunk_load.Close_Chunk();
 		if (error != WW3D_ERROR_OK) return (error);
 	}
-	
+
 	return WW3D_ERROR_OK;
 }
 
@@ -629,7 +630,7 @@ AggregateDefClass::Read_Info (ChunkLoadClass &chunk_load)
 
 			// Read this subobject's definition from the file
 			ret_val = Read_Subobject (chunk_load);
-		}				
+		}
 	}
 
 	// Return the WW3D_ERROR_TYPE return code
@@ -716,12 +717,12 @@ AggregateDefClass::Save_W3D (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies an aggregate
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_AGGREGATE) == TRUE) {
-		
+
 		// Attempt to save the different sections of the aggregate definition
 		if ((Save_Header (chunk_save) == WW3D_ERROR_OK) &&
 			 (Save_Info (chunk_save) == WW3D_ERROR_OK) &&
 			 (Save_Class_Info (chunk_save) == WW3D_ERROR_OK)) {
-			
+
 			// Success!
 			ret_val = WW3D_ERROR_OK;
 		}
@@ -747,7 +748,7 @@ AggregateDefClass::Save_Header (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the aggregate
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_AGGREGATE_HEADER) == TRUE) {
-		
+
 		// Fill the header structure
 		W3dAggregateHeaderStruct header = { 0 };
 		header.Version = W3D_CURRENT_AGGREGATE_VERSION;
@@ -757,7 +758,7 @@ AggregateDefClass::Save_Header (ChunkSaveClass &chunk_save)
 		// Write the header out to the chunk
 		if (chunk_save.Write (&header, sizeof (header)) == sizeof (header)) {
 			// Success!
-			ret_val = WW3D_ERROR_OK;			
+			ret_val = WW3D_ERROR_OK;
 		}
 
 		// End the header chunk
@@ -781,7 +782,7 @@ AggregateDefClass::Save_Info (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the aggregate settings
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_AGGREGATE_INFO) == TRUE) {
-		
+
 		// Write the settings structure out to the chunk
 		if (chunk_save.Write (&m_Info, sizeof (m_Info)) == sizeof (m_Info)) {
 			// Success!
@@ -844,10 +845,10 @@ AggregateDefClass::Save_Class_Info (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the texture replacer header
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_AGGREGATE_CLASS_INFO) == TRUE) {
-		
+
 		// Write the class information structure out to the chunk
 		if (chunk_save.Write (&m_MiscInfo, sizeof (m_MiscInfo)) == sizeof (m_MiscInfo)) {
-			
+
 			// Success!
 			ret_val = WW3D_ERROR_OK;
 		}
@@ -874,13 +875,13 @@ AggregateLoaderClass::Load_W3D (ChunkLoadClass &chunk_load)
 	// Create a definition object
 	AggregateDefClass *pdefinition = W3DNEW AggregateDefClass;
 	if (pdefinition != NULL) {
-		
+
 		// Ask the definition object to load the aggregate data
 		if (pdefinition->Load_W3D (chunk_load) != WW3D_ERROR_OK) {
-			
+
 			// Error!  Free the definition
 			delete pdefinition;
-			pdefinition = NULL;
+
 		} else {
 
 			// Success!  Create a prototype from the definition
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h
index fa111e09495..be2d636e0c6 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h
@@ -32,21 +32,14 @@
  *                                                                                             *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef AGGREGATE_DEF_H
-#define AGGREGATE_DEF_H
 
 #include "proto.h"
 #include "rendobj.h"
 #include "w3d_file.h"
 #include "w3derr.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "bittype.h"
-#include <string.h>
 
 #ifdef _UNIX
 #include "osdep.h"
@@ -90,23 +83,23 @@ class AggregateDefClass
 		///////////////////////////////////////////////////////////
 		//
 		//	Public constructors/destructors
-		//		
+		//
 		AggregateDefClass (void);
 		AggregateDefClass (RenderObjClass &base_model);
 		AggregateDefClass (const AggregateDefClass &src);
 		virtual ~AggregateDefClass (void);
 
-		
+
 		///////////////////////////////////////////////////////////
 		//
 		//	Public operators
-		//		
+		//
 		const AggregateDefClass &operator= (const AggregateDefClass &src);
 
 		///////////////////////////////////////////////////////////
 		//
 		//	Public methods
-		//		
+		//
 		virtual WW3DErrorType	Load_W3D (ChunkLoadClass &chunk_load);
 		virtual WW3DErrorType	Save_W3D (ChunkSaveClass &chunk_save);
 		const char *				Get_Name (void) const					{ return m_pName; }
@@ -138,13 +131,13 @@ class AggregateDefClass
 			bool operator == (_TEXTURE_INFO &src) { return false; }
 			bool operator != (_TEXTURE_INFO &src) { return true; }
 		} TEXTURE_INFO;
-		
+
 
 		///////////////////////////////////////////////////////////
 		//
 		//	Protected methods
 		//
-		
+
 		//
 		//	Loading methods
 		//
@@ -201,7 +194,7 @@ class AggregateDefClass
 //
 //	AggregatePrototypeClass
 //
-class AggregatePrototypeClass : public W3DMPO, public PrototypeClass 
+class AggregatePrototypeClass : public W3DMPO, public PrototypeClass
 {
 	W3DMPO_GLUE(AggregatePrototypeClass)
 	public:
@@ -209,9 +202,9 @@ class AggregatePrototypeClass : public W3DMPO, public PrototypeClass
 		///////////////////////////////////////////////////////////
 		//
 		//	Public constructors/destructors
-		//		
+		//
 		AggregatePrototypeClass (AggregateDefClass *pdef)		{ m_pDefinition = pdef; }
-		
+
 		///////////////////////////////////////////////////////////
 		//
 		//	Public methods
@@ -254,6 +247,3 @@ class AggregateLoaderClass : public PrototypeLoaderClass
 //	Global variables
 //
 extern AggregateLoaderClass	_AggregateLoader;
-
-
-#endif //__AGGREGATE_DEF_H
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp
index 68ce41b0444..a521e5679e5 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp
@@ -37,13 +37,11 @@
 // MBL Update for CNC3 INCURSION - 10.23.2002 - Expanded param handling, Added STOP command
 //
 
-#include <string.h>	// stricmp()
 #include "animatedsoundmgr.h"
-#include "INI.H"
+#include "INI.h"
 #include "inisup.h"
 #include "ffactory.h"
-#include "WWFILE.H"
-#include <stdio.h>
+#include "WWFILE.h"
 #include "definition.h"
 #include "definitionmgr.h"
 #include "definitionclassids.h"
@@ -75,7 +73,7 @@ Get_INI (const char *filename)
 	//
 	FileClass *file = _TheFileFactory->Get_File (filename);
 	if (file) {
-		
+
 		//
 		//	Create the INI object
 		//
@@ -119,7 +117,7 @@ Build_List_From_String
 			  (entry != NULL) && (entry[1] != 0);
 			  entry = ::strstr (entry, delimiter))
 		{
-			
+
 			//
 			// Move past the current delimiter (if necessary)
 			//
@@ -130,14 +128,14 @@ Build_List_From_String
 			// Increment the count of entries
 			count ++;
 		}
-	
+
 		if (count > 0) {
 
 			//
 			// Allocate enough StringClass objects to hold all the strings in the list
 			//
 			(*string_list) = new StringClass[count];
-		
+
 			//
 			// Parse the string and pull out its entries.
 			//
@@ -146,7 +144,7 @@ Build_List_From_String
 				  (entry != NULL) && (entry[1] != 0);
 				  entry = ::strstr (entry, delimiter))
 			{
-				
+
 				//
 				// Move past the current delimiter (if necessary)
 				//
@@ -158,7 +156,7 @@ Build_List_From_String
 				// Copy this entry into its own string
 				//
 				StringClass entry_string = entry;
-				char *delim_start = ::strstr (entry_string.Peek_Buffer(), delimiter);				
+				char *delim_start = ::strstr (entry_string.Peek_Buffer(), delimiter);
 				if (delim_start != NULL) {
 					delim_start[0] = 0;
 				}
@@ -166,7 +164,7 @@ Build_List_From_String
 				//
 				// Add this entry to our list
 				//
-				if ((entry_string.Get_Length () > 0) || (count == 0)) {
+				if ((!entry_string.Is_Empty()) || (count == 0)) {
 					(*string_list)[count++] = entry_string;
 				}
 			}
@@ -176,7 +174,7 @@ Build_List_From_String
 			(*string_list) = new StringClass[count];
 			(*string_list)[0] = buffer;
 		}
-				
+
 	}
 
 	//
@@ -254,7 +252,7 @@ AnimatedSoundMgrClass::Initialize (const char *ini_filename)
 	}
 
 	const char *DEFAULT_INI_FILENAME	= "w3danimsound.ini";
-	
+
 	//
 	//	Determine which filename to use
 	//
@@ -327,7 +325,7 @@ AnimatedSoundMgrClass::Initialize (const char *ini_filename)
 					//
 					//	Extract the parameters from the section
 					//
-					int len = value.Get_Length ();					
+					int len = value.Get_Length ();
 					StringClass definition_name (len + 1, true);
 					int action_frame = 0;
 
@@ -337,7 +335,7 @@ AnimatedSoundMgrClass::Initialize (const char *ini_filename)
 					StringClass *param_list = NULL;
 					int param_count = ::Build_List_From_String (value, ",", &param_list);
 
-					// if ((param_count >= 2) && (param_count <= 3)) 
+					// if ((param_count >= 2) && (param_count <= 3))
 					{
 						action_frame		= ::atoi (param_list[0]);
 						definition_name	= param_list[1];
@@ -380,7 +378,7 @@ AnimatedSoundMgrClass::Initialize (const char *ini_filename)
 			}
 
 			if (sound_list->List.Count () != 0) {
-				
+
 				//
 				//	Add this sound list to our hash-table and vector-array
 				//
@@ -388,7 +386,7 @@ AnimatedSoundMgrClass::Initialize (const char *ini_filename)
 				AnimSoundLists.Add (sound_list);
 
 			} else {
-				//WWDEBUG_SAY (("AnimatedSoundMgrClass::Initialize -- No sounds added for %d!\n", animation_name.Peek_Buffer ()));
+				//WWDEBUG_SAY (("AnimatedSoundMgrClass::Initialize -- No sounds added for %d!", animation_name.Peek_Buffer ()));
 				delete sound_list;
 			}
 		}
@@ -505,8 +503,8 @@ AnimatedSoundMgrClass::Trigger_Sound
 	//
 	ANIM_SOUND_LIST *sound_list = Find_Sound_List (anim);
 	if (sound_list != NULL) {
-		
-		for (int index = 0; index < sound_list->List.Count (); index ++) {			
+
+		for (int index = 0; index < sound_list->List.Count (); index ++) {
 			int frame = sound_list->List[index]->Frame;
 
 			//
@@ -518,11 +516,11 @@ AnimatedSoundMgrClass::Trigger_Sound
 				//	Don't trigger the sound if its skipped too far past...
 				//
 				//if (WWMath::Fabs (new_frame - old_frame) < 3.0F) {
-					
+
 					//
 					// Stop the audio?
 					//
-					if (sound_list->List[index]->IsStop == true) 
+					if (sound_list->List[index]->IsStop == true)
 					{
 						//
 						// Stop the audio
@@ -534,17 +532,17 @@ AnimatedSoundMgrClass::Trigger_Sound
 						//
 						//	Play the audio
 						//
-						if (sound_list->List[index]->Is2D == true) 
+						if (sound_list->List[index]->Is2D == true)
 						{
 							SoundLibrary->Play_2D_Audio(sound_list->List[index]->SoundName.str());
-						} 
-						else 
+						}
+						else
 						{
 							SoundLibrary->Play_3D_Audio(sound_list->List[index]->SoundName.str(), tm);
 						}
 					}
 
-					//WWDEBUG_SAY (("Triggering Sound %d %s\n", GetTickCount (), sound_list->List[index]->SoundName));
+					//WWDEBUG_SAY (("Triggering Sound %d %s", GetTickCount (), sound_list->List[index]->SoundName));
 
 					retval = frame;
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h
index 54f01468008..980e259591b 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h
@@ -37,15 +37,10 @@
 // MBL Update for CNC3 INCURSION - 10.23.2002 - Expanded param handling, Added STOP command
 //
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __ANIMATEDSOUNDMGR_H
-#define __ANIMATEDSOUNDMGR_H
 
 #include "simplevec.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "hashtemplate.h"
 
 
@@ -84,7 +79,7 @@ class AnimatedSoundMgrClass
 
 	// Bridges E&B code with WW3D.
 	static void		Set_Sound_Library(SoundLibraryBridgeClass* library);
-	
+
 private:
 
 	///////////////////////////////////////////////////////////////////
@@ -104,7 +99,7 @@ class AnimatedSoundMgrClass
 	struct AnimSoundList
 	{
 		AnimSoundList() : List(), BoneName("root") {}
-		~AnimSoundList() 
+		~AnimSoundList()
 		{
 			for (int i = 0; i < List.Count(); i++) {
 				delete List[i];
@@ -117,7 +112,7 @@ class AnimatedSoundMgrClass
 	};
 
 	typedef AnimSoundList								ANIM_SOUND_LIST;
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Private member data
 	///////////////////////////////////////////////////////////////////
@@ -131,6 +126,3 @@ class AnimatedSoundMgrClass
 	///////////////////////////////////////////////////////////////////
 	static ANIM_SOUND_LIST *	Find_Sound_List (HAnimClass *anim);
 };
-
-
-#endif //__ANIMATEDSOUNDMGR_H
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.cpp b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.cpp
index 1f024c6fb0e..22d67d5c716 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.cpp
@@ -19,7 +19,7 @@
 #include "assetstatus.h"
 #include "hashtemplate.h"
 #include "wwstring.h"
-#include "RAWFILE.H"
+#include "RAWFILE.h"
 
 AssetStatusClass AssetStatusClass::Instance;
 
@@ -43,11 +43,11 @@ AssetStatusClass::~AssetStatusClass()
 {
 #ifdef WWDEBUG
 	if (Reporting) {
-		StringClass report("Load-on-demand and missing assets report\r\n\r\n");
+		StringClass report("Load-on-demand and missing assets report\n\n");
 		for (int i=0;i<REPORT_COUNT;++i) {
 			report+="Category: ";
 			report+=ReportCategoryNames[i];
-			report+="\r\n\r\n";
+			report+="\n\n";
 
 			HashTemplateIterator<StringClass,int> ite(ReportHashTables[i]);
 			for (ite.First();!ite.Is_Done();ite.Next()) {
@@ -58,9 +58,9 @@ AssetStatusClass::~AssetStatusClass()
 					tmp.Format("\t(reported %d times)",count);
 					report+=tmp;
 				}
-				report+="\r\n";
+				report+="\n";
 			}
-			report+="\r\n";
+			report+="\n";
 		}
 		if (report.Get_Length()) {
 			RawFileClass raw_log_file("asset_report.txt");
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h
index 0e7cb183adc..bb25aa729ce 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef WW3D_ASSET_STATUS_H
-#define WW3D_ASSET_STATUS_H
 
 #include "always.h"
 #include "hashtemplate.h"
@@ -42,7 +37,7 @@ class AssetStatusClass
 	AssetStatusClass();
 	~AssetStatusClass();
 
-	void Enable_Reporting(bool enable)					  { Reporting=enable; }	
+	void Enable_Reporting(bool enable)					  { Reporting=enable; }
 	void Enable_Load_On_Demand_Reporting(bool enable) { LoadOnDemandReporting=enable; }
 
 	void Report_Load_On_Demand_RObj(const char* name);
@@ -64,5 +59,3 @@ class AssetStatusClass
 	void Add_To_Report(int index, const char* name);
 
 };
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.cpp b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.cpp
index 8c0357be839..3b387a4a433 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.cpp
@@ -26,7 +26,7 @@ void Bitmap_Assert(bool condition)
 }
 
 void BitmapHandlerClass::Create_Mipmap_B8G8R8A8(
-	unsigned char* dest_surface, 
+	unsigned char* dest_surface,
 	unsigned dest_surface_pitch,
 	unsigned char* src_surface,
 	unsigned src_surface_pitch,
@@ -145,7 +145,7 @@ void BitmapHandlerClass::Copy_Image_Generate_Mipmap(
 // ----------------------------------------------------------------------------
 
 void BitmapHandlerClass::Copy_Image(
-	unsigned char* dest_surface, 
+	unsigned char* dest_surface,
 	unsigned dest_surface_width,
 	unsigned dest_surface_height,
 	unsigned dest_surface_pitch,
@@ -329,7 +329,7 @@ void BitmapHandlerClass::Copy_Image(
 			}
 		}
 		else {
-			
+
 			// For now do only point-sampling
 			for (unsigned y=0;y<dest_surface_height;++y) {
 				unsigned* dest_ptr=(unsigned*)dest_surface;
@@ -423,7 +423,7 @@ void BitmapHandlerClass::Copy_Image(
 		}
 	}
 	else {
-		
+
 		// For now do only point-sampling
 		for (unsigned y=0;y<dest_surface_height;++y) {
 			unsigned char* dest_ptr=dest_surface+y*dest_surface_pitch;
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h
index d7cfd7809b9..d12ceb63c5d 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef BITMAPHANDLER_H
-#define BITMAPHANDLER_H
 
 #include "always.h"
 #include "ww3dformat.h"
@@ -95,7 +90,7 @@ class BitmapHandlerClass
 		unsigned bgra4);
 
 	static void Create_Mipmap_B8G8R8A8(
-		unsigned char* dest_surface, 
+		unsigned char* dest_surface,
 		unsigned dest_surface_pitch,
 		unsigned char* src_surface,
 		unsigned src_surface_pitch,
@@ -116,7 +111,7 @@ class BitmapHandlerClass
 		const Vector3& hsv_shift=Vector3(0.0f,0.0f,0.0f));
 
 	static void Copy_Image(
-		unsigned char* dest_surface, 
+		unsigned char* dest_surface,
 		unsigned dest_surface_width,
 		unsigned dest_surface_height,
 		unsigned dest_surface_pitch,
@@ -199,7 +194,7 @@ WWINLINE void BitmapHandlerClass::Read_B8G8R8A8(
 		break;
 	case WW3D_FORMAT_L8:
 		{
-			unsigned char tmp=*src_ptr++;			
+			unsigned char tmp=*src_ptr++;
 			*argb++=tmp;
 			*argb++=tmp;
 			*argb++=tmp;
@@ -479,6 +474,3 @@ WWINLINE unsigned BitmapHandlerClass::Combine_A8R8G8B8(
 	bgra1+=bgra3;
 	return bgra1;
 }
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp
new file mode 100644
index 00000000000..67cfb912bb1
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp
@@ -0,0 +1,299 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : Commando/G                               *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/bmp2d.cpp          $*
+ *                                                                         *
+ *                  $Org Author:: Jani_p                                  $*
+ *                                                                         *
+ *                      $Author:: Kenny_m                                  $*
+ *                                                                         *
+ *                     $Modtime:: 08/05/02 10:44a                          $*
+ *                                                                         *
+ *                    $Revision:: 12                                      $*
+ *                                                                         *
+ * 08/05/02 KM Texture class redesign
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#include "bmp2d.h"
+#include "pot.h"
+#include "ww3d.h"
+#include "texture.h"
+#include "surfaceclass.h"
+#include "assetmgr.h"
+#include "textureloader.h"
+#include "ww3dformat.h"
+
+Bitmap2DObjClass::Bitmap2DObjClass
+(
+	const char *filename,
+	float screen_x,
+	float screen_y,
+	bool center,
+	bool additive,
+	bool colorizable,
+	int usable_width,
+	int usable_height,
+	bool ignore_alpha
+)
+	:	DynamicScreenMeshClass(2, 4)
+{
+
+	int resw, resh, resbits;
+	bool windowed;
+
+	// find the resolution (for centering and pixel to pixel translation)
+	WW3D::Get_Device_Resolution(resw, resh, resbits, windowed);
+	// This should be the correct way to do things
+	// but other code expects an aspect ratio of 1.0
+	// Hector Yee 2/22/01
+	// Set_Aspect(resh/(float)resw);
+
+
+	// load up the surfaces file name
+	TextureClass *tex = WW3DAssetManager::Get_Instance()->Get_Texture(filename, MIP_LEVELS_1);
+	if (!tex->Is_Initialized())
+		TextureLoader::Request_Foreground_Loading(tex);
+
+	SurfaceClass *surface = tex->Get_Surface_Level(0);
+
+	if (!surface) {
+		surface = NEW_REF(SurfaceClass, (32, 32, Get_Valid_Texture_Format(WW3D_FORMAT_R8G8B8,true)));
+	}
+
+	SurfaceClass::SurfaceDescription sd;
+	surface->Get_Description(sd);
+
+	if (usable_width == -1)
+		usable_width = sd.Width;
+	if (usable_height == -1)
+		usable_height = sd.Height;
+
+	// if we requested the image to be centered around a point adjust the
+	// coordinates accordingly.
+	if (center) {
+		screen_x -= ((float)usable_width  / resw) / 2;
+		screen_y -= ((float)usable_height / resh) / 2;
+	}
+
+	// The image will be broken down into square textures. The size of these
+	// textures will be the smallest POT (power of two) which is equal or
+	// greater than the smaller dimension of the image. Also, the pieces can
+	// never be larger than 256 texels because some rendering devices don't
+	// support textures larger than that.
+	int surf_w = usable_width;
+	int surf_h = usable_height;
+	int piece = Find_POT(MIN(surf_w, surf_h));
+	piece = MIN(piece, 256);
+
+	// now take the image in question and break it down into
+	// "piece"x"piece"-pixel polygons and calculate the number of textures
+	// based from those calculations.
+	int mw = (surf_w & (piece - 1)) ? (surf_w / piece)+1 : (surf_w /piece);
+	int mh = (surf_h & (piece - 1)) ? (surf_h / piece)+1 : (surf_h /piece);
+
+	// for every square texture it takes four vertexes to express the two
+	// polygons.
+	Resize(mw * mh *2, mw * mh * 4);
+
+	// Set shader to additive if requested, else alpha or opaque depending on
+	// whether the texture has an alpha channel. Sorting is always set so that
+	// sortbias can be used to determine occlusion between the various 2D
+	// elements.
+	ShaderClass shader;
+
+	if (additive) {
+		shader = ShaderClass::_PresetAdditive2DShader;
+	} else {
+		if (ignore_alpha == false && Has_Alpha(sd.Format)) {
+			shader = ShaderClass::_PresetAlpha2DShader;
+		} else {
+			shader = ShaderClass::_PresetOpaque2DShader;
+		}
+	}
+
+	Enable_Sort();
+
+
+	// If we want to be able to colorize this bitmap later (by setting
+	// emissive color for the vertex material, or via a vertex emissive color
+	// array) we need to enable the primary gradient in the shader (it is
+	// disabled in the 2D presets), and set an appropriate vertex material.
+	if (colorizable) {
+		shader.Set_Primary_Gradient(ShaderClass::GRADIENT_MODULATE);
+		VertexMaterialClass *vertex_material = NEW_REF( VertexMaterialClass, ());
+		vertex_material->Set_Ambient(0.0f, 0.0f, 0.0f);
+		vertex_material->Set_Diffuse(0.0f, 0.0f, 0.0f);
+		vertex_material->Set_Specular(0.0f, 0.0f, 0.0f);
+		vertex_material->Set_Emissive(1.0f, 1.0f, 1.0f);
+		Set_Vertex_Material(vertex_material, true);
+		vertex_material->Release_Ref();
+	}
+
+	// Set desired shader.
+	Set_Shader(shader);
+
+	// loop through the rows and columns of the image and make valid
+	// textures from the pieces.
+	for (int lpy = 0, tlpy=0; lpy < mh; lpy++, tlpy += piece) {
+		for (int lpx = 0, tlpx = 0; lpx < mw; lpx++, tlpx += piece) {
+
+			// figure the desired width and height of the texture (max "piece")
+			int iw				= MIN(piece, usable_width - (tlpx));
+			int ih				= MIN(piece, usable_height - (tlpy));
+			int pot				= MAX(Find_POT(iw), Find_POT(ih));
+
+			// create the texture and turn MIP-mapping off.
+			SurfaceClass *piece_surface=NEW_REF(SurfaceClass,(pot,pot,sd.Format));
+			piece_surface->Copy(0,0,tlpx,tlpy,pot,pot,surface);
+			TextureClass *piece_texture =NEW_REF(TextureClass,(piece_surface,MIP_LEVELS_1));
+			piece_texture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+			piece_texture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+			REF_PTR_RELEASE(piece_surface);
+
+			// calculate our actual texture coordinates based on the difference between
+			// the width and height of the texture and the width and height the font
+			// occupys.
+			float tw = (float)iw / (float)pot;
+			float th = (float)ih / (float)pot;
+
+			// convert image width and image height to normalized values
+			float vw = (float)iw / (float)resw;
+			float vh = (float)ih / (float)resh;
+
+			// figure out the screen space x and y positions of the object in question.
+			float x	= screen_x + (((float)tlpx) / (float)resw);
+			float y	= screen_y + (((float)tlpy) / (float)resh);
+
+			Set_Texture(piece_texture);
+			Begin_Tri_Strip();
+				Vertex( x, 			y, 		0, 	0, 	0);
+				Vertex( x + vw, 	y, 		0, 	tw, 	0);
+				Vertex( x, 			y + vh, 	0, 	0, 	th);
+				Vertex( x + vw, 	y + vh, 	0, 	tw, 	th);
+			End_Tri_Strip();
+
+			// release our reference to the texture
+			REF_PTR_RELEASE(piece_texture);
+		}
+	}
+	REF_PTR_RELEASE(tex);
+	REF_PTR_RELEASE(surface);
+
+	Set_Dirty();
+}
+
+Bitmap2DObjClass::Bitmap2DObjClass
+(
+	TextureClass *texture,
+	float screen_x,
+	float screen_y,
+	bool center,
+	bool additive,
+	bool colorizable,
+	bool ignore_alpha
+)
+	:	DynamicScreenMeshClass(2, 4)
+{
+	int resw, resh, resbits;
+	bool windowed;
+
+	// find the resolution (for centering and pixel to pixel translation)
+	WW3D::Get_Device_Resolution(resw, resh, resbits, windowed);
+	// This should be the correct way to do things
+	// but other code expects an aspect ratio of 1.0
+	// Hector Yee 2/22/01
+	//Set_Aspect(resh/(float)resw);
+
+	// Find the dimensions of the texture:
+//	SurfaceClass::SurfaceDescription sd;
+//	texture->Get_Level_Description(sd);
+
+	if (!texture->Is_Initialized())
+		TextureLoader::Request_Foreground_Loading(texture);
+
+	// convert image width and image height to normalized values
+	float vw = (float) texture->Get_Width() / (float)resw;
+	float vh = (float) texture->Get_Height() / (float)resh;
+
+	// if we requested the image to be centered around a point adjust the
+	// coordinates accordingly.
+	if (center) {
+		screen_x -= vw / 2;
+		screen_y -= vh / 2;
+	}
+
+	// Set shader to additive if requested, else alpha or opaque depending on whether the texture
+	// has an alpha channel. Sorting is never set - if you wish to sort these types of objects you
+	// should use static sort levels (note that static sort levels are not implemented for these
+	// objects yet, but it should be very simple to do).
+	ShaderClass shader;
+
+	if (additive) {
+		shader = ShaderClass::_PresetAdditive2DShader;
+	} else {
+		if (ignore_alpha == false && Has_Alpha(texture->Get_Texture_Format())) {
+			shader = ShaderClass::_PresetAlpha2DShader;
+		} else {
+			shader = ShaderClass::_PresetOpaque2DShader;
+		}
+	}
+	Disable_Sort();
+
+	// If we want to be able to colorize this bitmap later (by setting
+	// emissive color for the vertex material, or via a vertex emissive color
+	// array) we need to enable the primary gradient in the shader (it is
+	// disabled in the 2D presets), and set an appropriate vertex material.
+	if (colorizable) {
+		shader.Set_Primary_Gradient(ShaderClass::GRADIENT_MODULATE);
+		VertexMaterialClass *vertex_material = NEW_REF( VertexMaterialClass, ());
+		vertex_material->Set_Ambient(0.0f, 0.0f, 0.0f);
+		vertex_material->Set_Diffuse(0.0f, 0.0f, 0.0f);
+		vertex_material->Set_Specular(0.0f, 0.0f, 0.0f);
+		vertex_material->Set_Emissive(1.0f, 1.0f, 1.0f);
+		Set_Vertex_Material(vertex_material, true);
+		vertex_material->Release_Ref();
+	}
+
+	// Set desired shader.
+	Set_Shader(shader);
+
+	// Set texture to requested texture:
+	Set_Texture(texture);
+
+	Begin_Tri_Strip();
+		Vertex( screen_x,			screen_y,		0,	0,		0);
+		Vertex( screen_x + vw, 	screen_y,		0,	1.0,	0);
+		Vertex( screen_x, 		screen_y + vh,	0,	0,		1.0);
+		Vertex( screen_x + vw, 	screen_y + vh,	0,	1.0,	1.0);
+	End_Tri_Strip();
+
+	Set_Dirty();
+}
+
+RenderObjClass * Bitmap2DObjClass::Clone(void) const
+{
+	return NEW_REF( Bitmap2DObjClass, (*this));
+}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h
new file mode 100644
index 00000000000..abf993dd32b
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.h
@@ -0,0 +1,52 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : Commando/G                               *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/bmp2d.h            $*
+ *                                                                         *
+ *                      $Author:: Hector_y                                $*
+ *                                                                         *
+ *                     $Modtime:: 2/21/01 1:31p                           $*
+ *                                                                         *
+ *                    $Revision:: 3                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "dynamesh.h"
+
+class Bitmap2DObjClass : public DynamicScreenMeshClass
+{
+	public:
+		Bitmap2DObjClass(const char *filename, float norm_x, float norm_y,
+			bool center, bool additive, bool colorizable = false, int width = -1, int height = -1, bool ignore_alpha = false);
+		Bitmap2DObjClass(TextureClass *texture, float norm_x, float norm_y,
+			bool center, bool additive, bool colorizable = false, bool ignore_alpha = false);
+		Bitmap2DObjClass( const Bitmap2DObjClass & src) : DynamicScreenMeshClass(src) {}
+
+		virtual RenderObjClass * 	Clone(void) const;
+		virtual int						Class_ID(void) const { return CLASSID_BITMAP2D; }
+};
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bwrender.cpp b/Core/Libraries/Source/WWVegas/WW3D2/bwrender.cpp
index a922e263460..9f8f9dbfca1 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/bwrender.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/bwrender.cpp
@@ -39,7 +39,6 @@
 
 #include "bwrender.h"
 #include "vp.h"
-#include <string.h>
 
 
 BWRenderClass::Buffer::Buffer(unsigned char* buffer_, int scale_)
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bwrender.h b/Core/Libraries/Source/WWVegas/WW3D2/bwrender.h
index 887fec5d50b..0c6db33b9de 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/bwrender.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/bwrender.h
@@ -36,13 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef BWRENDER_H
-#define BWRENDER_H
-
 
 #include "always.h"
 #include "vector2.h"
@@ -74,7 +68,7 @@ class BWRenderClass
 
 		void Set_H_Line(int start_x, int end_x, int y);
 		void Fill(unsigned char c);
-		inline int Scale() const { return scale; }
+		int Scale() const { return scale; }
 	} pixel_buffer;
 
 	Vector2* vertices;
@@ -90,7 +84,3 @@ class BWRenderClass
 	void Render_Triangles(const unsigned long* indices,int index_count);
 	void Render_Triangle_Strip(const unsigned long* indices,int index_count);
 };
-
-
-#endif //BWRENDER_H
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/classid.h b/Core/Libraries/Source/WWVegas/WW3D2/classid.h
index 2dced25cc55..a734133cfb3 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/classid.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/classid.h
@@ -16,36 +16,30 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Commando	                              * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/classid.h          $* 
- *                                                                         * 
- *                      $Author:: Jani_p                                  $* 
- *                                                                         * 
- *                     $Modtime:: 3/29/01 1:13a                           $* 
- *                                                                         * 
- *                    $Revision:: 2                                       $* 
- *                                                                         * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : Commando	                              *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/classid.h          $*
+ *                                                                         *
+ *                      $Author:: Jani_p                                  $*
+ *                                                                         *
+ *                     $Modtime:: 3/29/01 1:13a                           $*
+ *                                                                         *
+ *                    $Revision:: 2                                       $*
+ *                                                                         *
  *-------------------------------------------------------------------------*/
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef CLASSID_H
-#define CLASSID_H
 
 #include "always.h"
 
 /*
 ** enum of all the WW3D class IDs.
 */
-enum 
+enum
 {
 	ID_INDIRECT_TEXTURE_CLASS = 0x10000,	// IndirectTextureClass					"texture.h"
 	ID_VARIABLE_TEXTURE_CLASS,					// VariableTextureClass					"texture.h"
@@ -60,6 +54,3 @@ enum
 	ID_STREAMING_TEXTURE_CLASS,				// StreamingTextureClass				"texture.h"
 	ID_STREAMING_TEXTURE_INSTANCE_CLASS,	// StreamingTextureInstanceClass		"texture.h"
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp
index cae8105be6d..43717fe6ae9 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp
@@ -114,7 +114,7 @@ class CollectionDefClass
 
 
 /*
-** CollectionPrototypeClass this is the render object prototype for 
+** CollectionPrototypeClass this is the render object prototype for
 ** Collections.
 */
 class CollectionPrototypeClass : public W3DMPO, public PrototypeClass
@@ -123,15 +123,15 @@ class CollectionPrototypeClass : public W3DMPO, public PrototypeClass
 public:
 	CollectionPrototypeClass(CollectionDefClass * def)		{ ColDef = def; WWASSERT(ColDef); }
 
-	virtual const char *			Get_Name(void) const			{ return ColDef->Get_Name(); }	
+	virtual const char *			Get_Name(void) const			{ return ColDef->Get_Name(); }
 	virtual int								Get_Class_ID(void) const	{ return RenderObjClass::CLASSID_COLLECTION; }
-	virtual RenderObjClass *	Create(void)							{ return NEW_REF( CollectionClass, (*ColDef)); }	
+	virtual RenderObjClass *	Create(void)							{ return NEW_REF( CollectionClass, (*ColDef)); }
 	virtual void							DeleteSelf()							{ delete this; }
 
 	CollectionDefClass *			ColDef;
 
 protected:
-	virtual ~CollectionPrototypeClass(void)					{ delete ColDef; }						 
+	virtual ~CollectionPrototypeClass(void)					{ delete ColDef; }
 };
 
 
@@ -167,7 +167,7 @@ CollectionClass::CollectionClass(void) :
  *   12/8/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 CollectionClass::CollectionClass(const CollectionDefClass & def) :
-	SubObjects(def.ObjectNames.Count()),	
+	SubObjects(def.ObjectNames.Count()),
 	SnapPoints(NULL)
 {
 	// Set our name
@@ -183,8 +183,8 @@ CollectionClass::CollectionClass(const CollectionDefClass & def) :
 
 	// Copy the list of placeholder objects from the definition
 	ProxyList = def.ProxyList;
-		
-	// grab ahold of the snap points.	
+
+	// grab ahold of the snap points.
 	SnapPoints = def.SnapPoints;
 	if (SnapPoints) SnapPoints->Add_Ref();
 
@@ -244,7 +244,7 @@ CollectionClass & CollectionClass::operator = (const CollectionClass & that)
 
 		// Copy the list of placeholder objects from the definition
 		ProxyList = that.ProxyList;
-		
+
 		SnapPoints = that.SnapPoints;
 		if (SnapPoints) SnapPoints->Add_Ref();
 
@@ -287,7 +287,7 @@ CollectionClass::~CollectionClass(void)
  *=============================================================================================*/
 RenderObjClass * CollectionClass::Clone(void) const
 {
-	return NEW_REF( CollectionClass, (*this));	
+	return NEW_REF( CollectionClass, (*this));
 }
 
 
@@ -313,7 +313,7 @@ void CollectionClass::Free(void)
 	SubObjects.Delete_All();
 	ProxyList.Delete_All ();
 
-	REF_PTR_RELEASE(SnapPoints);	
+	REF_PTR_RELEASE(SnapPoints);
 }
 
 
@@ -532,14 +532,14 @@ int CollectionClass::Add_Sub_Object(RenderObjClass * subobj)
 int CollectionClass::Remove_Sub_Object(RenderObjClass * robj)
 {
 	if (robj == NULL) return 0;
-	
+
 	int res = 0;
 
 	Matrix3D tm = Get_Transform();
 
 	for (int i=0; i<SubObjects.Count(); i++) {
 		if (robj == SubObjects[i]) {
-			
+
 			if (Is_In_Scene()) {
 				SubObjects[i]->Notify_Removed(Scene);
 			}
@@ -814,21 +814,21 @@ void CollectionClass::Update_Obj_Space_Bounding_Volumes(void)
 		BoundBox.Extent.Set(0,0,0);
 		return;
 	}
-	
+
 	Matrix3D tm = Get_Transform();
 	Set_Transform(Matrix3D(1));
 
 	// loop through all sub-objects, combining their bounding spheres.
 	BoundSphere = SubObjects[0]->Get_Bounding_Sphere();
 	for (i=1; i < SubObjects.Count(); i++) {
-		BoundSphere.Add_Sphere(SubObjects[i]->Get_Bounding_Sphere());				
+		BoundSphere.Add_Sphere(SubObjects[i]->Get_Bounding_Sphere());
 	}
 
-	// loop through the sub-objects, computing a box in the root coordinate 
+	// loop through the sub-objects, computing a box in the root coordinate
 	// system which bounds all of the meshes.  Note that we've set the
 	// root coordinate system to identity for this.
 	MinMaxAABoxClass box(Vector3(FLT_MAX,FLT_MAX,FLT_MAX),Vector3(-FLT_MAX,-FLT_MAX,-FLT_MAX));
-	
+
 	for (i=0; i < SubObjects.Count(); i++) {
 		box.Add_Box(SubObjects[i]->Get_Bounding_Box());
 	}
@@ -885,14 +885,14 @@ bool CollectionClass::Get_Proxy (int index, ProxyClass &proxy) const
 	bool retval = false;
 
 	if (index >= 0 && index < ProxyList.Count ()) {
-		
+
 		//
 		// Return the proxy information to the caller
 		//
 		proxy		= ProxyList[index];
 		retval	= true;
 	}
-	
+
 	return retval;
 }
 
@@ -968,6 +968,7 @@ void CollectionDefClass::Free(void)
 	for (int i=0; i<ObjectNames.Count(); i++) {
 		delete[] ObjectNames[i];
 	}
+	ObjectNames.Delete_All ();
 
 	ProxyList.Delete_All ();
 }
@@ -1006,7 +1007,7 @@ const char * CollectionDefClass::Get_Name(void) const
 WW3DErrorType CollectionDefClass::Load(ChunkLoadClass & cload)
 {
 	Free();
-	
+
 	// open the header chunk and read it in
 	W3dCollectionHeaderStruct header;
 	if (!cload.Open_Chunk()) goto Error;
@@ -1014,11 +1015,12 @@ WW3DErrorType CollectionDefClass::Load(ChunkLoadClass & cload)
 	if (cload.Read(&header,sizeof(header)) != sizeof(header)) goto Error;
 	if (!cload.Close_Chunk()) goto Error;
 
-	strncpy(Name,header.Name,W3D_NAME_LEN);
+	static_assert(ARRAY_SIZE(Name) >= ARRAY_SIZE(header.Name), "Incorrect array size");
+	strcpy(Name,header.Name);
 	ObjectNames.Resize(header.RenderObjectCount);
-	
+
 	while (cload.Open_Chunk()) {
-		switch (cload.Cur_Chunk_ID()) 
+		switch (cload.Cur_Chunk_ID())
 		{
 		case W3D_CHUNK_COLLECTION_OBJ_NAME:
 			{
@@ -1062,11 +1064,11 @@ WW3DErrorType CollectionDefClass::Load(ChunkLoadClass & cload)
 
 		cload.Close_Chunk();
 	}
-	
+
 	return WW3D_ERROR_OK;
 
 Error:
-	
+
 	return WW3D_ERROR_LOAD_FAILED;
 }
 
@@ -1097,11 +1099,11 @@ PrototypeClass * CollectionLoaderClass::Load_W3D(ChunkLoadClass & cload)
 		return NULL;
 
 	} else {
-	
-		// ok, accept this model! 
+
+		// ok, accept this model!
 		CollectionPrototypeClass * proto = W3DNEW CollectionPrototypeClass(def);
 		return proto;
-	
+
 	}
 }
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.h b/Core/Libraries/Source/WWVegas/WW3D2/collect.h
index ae8e99a8b51..7341f9cbdb5 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/collect.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.h
@@ -34,16 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef COLLECT_H
-#define COLLECT_H
 
 #include "rendobj.h"
 #include "composite.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "proto.h"
 #include "w3d_file.h"
 #include "wwstring.h"
@@ -66,8 +61,8 @@ class CollectionClass : public CompositeRenderObjClass
 	CollectionClass(const CollectionClass & src);
 	CollectionClass & operator = (const CollectionClass &);
 	virtual ~CollectionClass(void);
-	virtual RenderObjClass *	Clone(void) const;		
-	
+	virtual RenderObjClass *	Clone(void) const;
+
 	virtual int						Class_ID(void)	const;
 	virtual int						Get_Num_Polys(void) const;
 
@@ -88,7 +83,7 @@ class CollectionClass : public CompositeRenderObjClass
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void 					Set_Transform(const Matrix3D &m);
 	virtual void 					Set_Position(const Vector3 &v);
-	virtual int						Get_Num_Sub_Objects(void) const;	
+	virtual int						Get_Num_Sub_Objects(void) const;
 	virtual RenderObjClass *	Get_Sub_Object(int index) const;
 	virtual int						Add_Sub_Object(RenderObjClass * subobj);
 	virtual int						Remove_Sub_Object(RenderObjClass * robj);
@@ -122,7 +117,7 @@ class CollectionClass : public CompositeRenderObjClass
 
 	void								Free(void);
 	void								Update_Sub_Object_Transforms(void);
-	
+
 	DynamicVectorClass <ProxyClass>			ProxyList;
 	DynamicVectorClass <RenderObjClass *>	SubObjects;
 	SnapPointsClass *								SnapPoints;
@@ -145,5 +140,3 @@ class CollectionLoaderClass : public PrototypeLoaderClass
 };
 
 extern CollectionLoaderClass _CollectionLoader;
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h b/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h
index 20b1fb0ff93..e4974a00545 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h
@@ -36,12 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef COLORSPACE_H
-#define COLORSPACE_H
 
 #include "dx8wrapper.h"
 #include <wwmath.h>
@@ -88,12 +83,12 @@ inline void HSV_To_RGB(Vector3 &rgb, const Vector3 &hsv)
 {
 	float h=hsv.X;
 	float s=hsv.Y;
-	float v=hsv.Z;	
+	float v=hsv.Z;
 
 	if (hsv.Y==0.0f)	{
 		rgb.Set(v,v,v);
 	} else	{
-		float f,p,q,t;		
+		float f,p,q,t;
 
 		int i;
 
@@ -145,7 +140,7 @@ inline void Recolor(Vector3 &rgb, const Vector3 &hsv_shift)
 	if (hsv.X>360.0f) hsv.X-=360.0f;
 	// clamp saturation and value
 	hsv.Y=WWMath::Clamp(hsv.Y,0.0f,1.0f);
-	hsv.Z=WWMath::Clamp(hsv.Z,0.0f,1.0f);	
+	hsv.Z=WWMath::Clamp(hsv.Z,0.0f,1.0f);
 	HSV_To_RGB(rgb,hsv);
 }
 
@@ -155,7 +150,3 @@ inline void Recolor(unsigned& rgba, const Vector3 &hsv_shift)
 	Recolor((Vector3&)rgba_v, hsv_shift);
 	rgba = DX8Wrapper::Convert_Color(rgba_v);
 }
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/coltest.cpp b/Core/Libraries/Source/WWVegas/WW3D2/coltest.cpp
index 6183c8e35a8..5639973d50b 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/coltest.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/coltest.cpp
@@ -57,7 +57,7 @@ AABoxCollisionTestClass::AABoxCollisionTestClass(const AABoxClass & aabox,const
 
 	Vector3 endmin = Box.Center + move - Box.Extent;
 	Vector3 endmax = Box.Center + move + Box.Extent;
-	
+
 	if (endmax.X > SweepMax.X) SweepMax.X = endmax.X;
 	if (endmax.Y > SweepMax.Y) SweepMax.Y = endmax.Y;
 	if (endmax.Z > SweepMax.Z) SweepMax.Z = endmax.Z;
@@ -96,11 +96,11 @@ bool AABoxCollisionTestClass::Cull(const AABoxClass & box)
 }
 
 
-void AABoxCollisionTestClass::Rotate(ROTATION_TYPE rotation) 
+void AABoxCollisionTestClass::Rotate(ROTATION_TYPE rotation)
 {
 
-#ifndef NDEBUG
-	
+#ifdef RTS_DEBUG
+
 	int i;
 	Matrix3D tm(1);
 	switch(rotation) {
@@ -127,7 +127,7 @@ void AABoxCollisionTestClass::Rotate(ROTATION_TYPE rotation)
 	Vector3 pts[8];
 	Vector3 & min = SweepMin;
 	Vector3 & max = SweepMax;
-	
+
 	pts[0].Set(min.X,min.Y,min.Z);
 	pts[1].Set(min.X,max.Y,min.Z);
 	pts[2].Set(max.X,max.Y,min.Z);
@@ -150,16 +150,14 @@ void AABoxCollisionTestClass::Rotate(ROTATION_TYPE rotation)
 		if (realmin.X >= pts[i].X) realmin.X = pts[i].X;
 		if (realmin.Y >= pts[i].Y) realmin.Y = pts[i].Y;
 		if (realmin.Z >= pts[i].Z) realmin.Z = pts[i].Z;
-		
+
 		if (realmax.X <= pts[i].X) realmax.X = pts[i].X;
 		if (realmax.Y <= pts[i].Y) realmax.Y = pts[i].Y;
 		if (realmax.Z <= pts[i].Z) realmax.Z = pts[i].Z;
 	}
 
+#endif // RTS_DEBUG
 
-#endif
-	
-	
 	// rotate the test by the desired rotation about the Z axis, special cased for
 	// 90 degree rotations about Z.  arbitrary rotations cause the axis aligned
 	// box to not be aligned any more :-)
@@ -172,10 +170,10 @@ void AABoxCollisionTestClass::Rotate(ROTATION_TYPE rotation)
 			// rotate the center point and the move vector
 			tmp = Box.Center.X;		Box.Center.X = -Box.Center.Y;		Box.Center.Y = tmp;
 			tmp = Move.X;				Move.X = -Move.Y;						Move.Y = tmp;
-		
+
 			// swap x and y for the extent
 			tmp = Box.Extent.X;		Box.Extent.X = Box.Extent.Y;		Box.Extent.Y = tmp;
-			
+
 			// update sweep bounding box
 			minx = SweepMin.X; miny = SweepMin.Y; maxx = SweepMax.X; maxy = SweepMax.Y;
 			SweepMin.X = -maxy;
@@ -200,13 +198,13 @@ void AABoxCollisionTestClass::Rotate(ROTATION_TYPE rotation)
 			break;
 
 		case ROTATE_Z270:
-			// rotate center and move. 
+			// rotate center and move.
 			tmp = Box.Center.X;		Box.Center.X = Box.Center.Y;		Box.Center.Y = -tmp;
 			tmp = Move.X;				Move.X = Move.Y;						Move.Y = -tmp;
 
 			// update extent (x and y axis swap)
 			tmp = Box.Extent.X;		Box.Extent.X = Box.Extent.Y;		Box.Extent.Y = tmp;
-			
+
 			// update min/max boxes
 			minx = SweepMin.X; miny = SweepMin.Y; maxx = SweepMax.X; maxy = SweepMax.Y;
 			SweepMin.X = miny;
@@ -216,13 +214,13 @@ void AABoxCollisionTestClass::Rotate(ROTATION_TYPE rotation)
 			break;
 	}
 
-#ifndef NDEBUG
+#ifdef RTS_DEBUG
 
 	assert((Box.Center - realcenter).Length() < 0.001f);
 	assert((SweepMin - realmin).Length() < 0.001f);
 	assert((SweepMax - realmax).Length() < 0.001f);
 
-#endif
+#endif // RTS_DEBUG
 }
 
 
@@ -242,7 +240,7 @@ void AABoxCollisionTestClass::Transform(const Matrix3D & tm)
 	Vector3 pts[8];
 	Vector3 & min = SweepMin;
 	Vector3 & max = SweepMax;
-	
+
 	pts[0].Set(min.X,min.Y,min.Z);
 	pts[1].Set(min.X,max.Y,min.Z);
 	pts[2].Set(max.X,max.Y,min.Z);
@@ -265,7 +263,7 @@ void AABoxCollisionTestClass::Transform(const Matrix3D & tm)
 		if (realmin.X >= pts[i].X) realmin.X = pts[i].X;
 		if (realmin.Y >= pts[i].Y) realmin.Y = pts[i].Y;
 		if (realmin.Z >= pts[i].Z) realmin.Z = pts[i].Z;
-		
+
 		if (realmax.X <= pts[i].X) realmax.X = pts[i].X;
 		if (realmax.Y <= pts[i].Y) realmax.Y = pts[i].Y;
 		if (realmax.Z <= pts[i].Z) realmax.Z = pts[i].Z;
@@ -306,7 +304,7 @@ OBBoxCollisionTestClass::OBBoxCollisionTestClass
 
 	Vector3 endmin = Box.Center + move - max_extent;
 	Vector3 endmax = Box.Center + move + max_extent;
-	
+
 	if (endmax.X > SweepMax.X) SweepMax.X = endmax.X;
 	if (endmax.Y > SweepMax.Y) SweepMax.Y = endmax.Y;
 	if (endmax.Z > SweepMax.Z) SweepMax.Z = endmax.Z;
@@ -372,4 +370,4 @@ bool OBBoxCollisionTestClass::Cull(const AABoxClass & box)
 	}
 	return false;
 }
-	
+
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/coltest.h b/Core/Libraries/Source/WWVegas/WW3D2/coltest.h
index cdff562cb61..0601a819470 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/coltest.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/coltest.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                   Org Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 07/01/02 12:45p                                              $*
  *                                                                                             *
  *                    $Revision:: 5                                                           $*
@@ -37,13 +37,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef COLTEST_H
-#define COLTEST_H
 
 #include "always.h"
 #include "castres.h"
@@ -59,9 +53,9 @@ class RenderObjClass;
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // CollisionTestClass
-// 
+//
 // Each type of collision test will have an associated class which
-// ties together all of the information necessary for the test.  
+// ties together all of the information necessary for the test.
 // These classes also provide a perfect place to add any information
 // which can be pre-calculated.
 //
@@ -70,9 +64,9 @@ class RenderObjClass;
 // the collision test.  I store a pointer to a result structure
 // because in some cases, new CollisionTestClasses are created in
 // the process of checking (e.g. if the test needs to be transformed
-// into another coordinate system) and I did not want to be 
+// into another coordinate system) and I did not want to be
 // constantly copying the result structure around.  So, the user
-// must allocate a result structure (usually on the stack) and keep it 
+// must allocate a result structure (usually on the stack) and keep it
 // until the CollisionTestClass is discarded.
 //
 // Every CollisionTestClass should have the following functions:
@@ -82,8 +76,8 @@ class RenderObjClass;
 //		bool Cast_To_Triangle(const TriClass & tri);
 //
 // These are not virtual because I don't want to pay the price of virtual function
-// calls at the point in the code where these are used.  It may be possible to 
-// write template functions if we use these exact function prototpyes for all 
+// calls at the point in the code where these are used.  It may be possible to
+// write template functions if we use these exact function prototpyes for all
 // collision test classes though.
 //
 //
@@ -96,8 +90,8 @@ class CollisionTestClass
 
 public:
 	CastResultStruct *			Result;
-	int								CollisionType; 
-	RenderObjClass *				CollidedRenderObj;		
+	int								CollisionType;
+	RenderObjClass *				CollidedRenderObj;
 };
 
 
@@ -118,7 +112,7 @@ inline CollisionTestClass::CollisionTestClass(const CollisionTestClass & that) :
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // RayCollisionTestClass
-// 
+//
 // Contains a linesegment to be tested and of course the inherited
 // pointer to a CollisionStruct for the result
 //
@@ -126,10 +120,10 @@ inline CollisionTestClass::CollisionTestClass(const CollisionTestClass & that) :
 class RayCollisionTestClass : public CollisionTestClass
 {
 public:
-	
+
 	RayCollisionTestClass(const LineSegClass & ray,CastResultStruct * res,int collision_type = COLL_TYPE_0,bool check_translucent=false, bool check_hidden=false);
 	RayCollisionTestClass(const RayCollisionTestClass & raytest,const Matrix3D & tm);
-		
+
 	bool Cull(const Vector3 & min,const Vector3 & max);
 	bool Cull(const AABoxClass & box);
 	bool Cast_To_Triangle(const TriClass & tri);
@@ -141,7 +135,7 @@ class RayCollisionTestClass : public CollisionTestClass
 	bool CheckHidden;
 
 private:
-	
+
 	// not implemented
 	RayCollisionTestClass(const RayCollisionTestClass &);
 	RayCollisionTestClass & operator = (const RayCollisionTestClass &);
@@ -164,18 +158,18 @@ inline RayCollisionTestClass::RayCollisionTestClass(const RayCollisionTestClass
 	CheckHidden(raytest.CheckHidden)
 {
 }
-		
-inline bool RayCollisionTestClass::Cull(const Vector3 & min,const Vector3 & max) 
-{ 
+
+inline bool RayCollisionTestClass::Cull(const Vector3 & min,const Vector3 & max)
+{
 	return (CollisionMath::Overlap_Test(min,max,Ray) == CollisionMath::POS);
 }
 
-inline bool RayCollisionTestClass::Cull(const AABoxClass & box) 
-{ 
+inline bool RayCollisionTestClass::Cull(const AABoxClass & box)
+{
 	return (CollisionMath::Overlap_Test(box,Ray) == CollisionMath::POS);
 }
 
-inline bool RayCollisionTestClass::Cast_To_Triangle(const TriClass & tri) 
+inline bool RayCollisionTestClass::Cast_To_Triangle(const TriClass & tri)
 {
 	return CollisionMath::Collide(Ray,tri,Result);
 }
@@ -183,7 +177,7 @@ inline bool RayCollisionTestClass::Cast_To_Triangle(const TriClass & tri)
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // AABoxCollisionTestClass
-// 
+//
 // Contains an Axis Aligned Box and a movement vector to be tested
 // for collision.  Also adds Min and Max vectors both for the initial
 // box and for the volume swept out by the box.
@@ -192,11 +186,11 @@ inline bool RayCollisionTestClass::Cast_To_Triangle(const TriClass & tri)
 class AABoxCollisionTestClass : public CollisionTestClass
 {
 public:
-	
+
 	AABoxCollisionTestClass(const AABoxClass & aabox,const Vector3 & move,CastResultStruct * res,int collision_type = COLL_TYPE_0);
 	AABoxCollisionTestClass(const AABoxCollisionTestClass & that);
 
-	enum ROTATION_TYPE 
+	enum ROTATION_TYPE
 	{
 		ROTATE_NONE = 0,
 		ROTATE_Z90,
@@ -221,7 +215,7 @@ class AABoxCollisionTestClass : public CollisionTestClass
 	Vector3						SweepMax;
 
 private:
-	
+
 	// not implemented
 	AABoxCollisionTestClass & operator = (const AABoxCollisionTestClass &);
 
@@ -235,9 +229,9 @@ inline void AABoxCollisionTestClass::Translate(const Vector3 & translation)
 	SweepMin += translation;
 	SweepMax += translation;
 }
-	
-inline bool AABoxCollisionTestClass::Cull(const Vector3 & min,const Vector3 & max) 
-{ 
+
+inline bool AABoxCollisionTestClass::Cull(const Vector3 & min,const Vector3 & max)
+{
 	if ((SweepMin.X > max.X) || (SweepMax.X < min.X)) {
 		return true;
 	}
@@ -252,7 +246,7 @@ inline bool AABoxCollisionTestClass::Cull(const Vector3 & min,const Vector3 & ma
 	return false;
 }
 
-inline bool AABoxCollisionTestClass::Cast_To_Triangle(const TriClass & tri) 
+inline bool AABoxCollisionTestClass::Cast_To_Triangle(const TriClass & tri)
 {
 	return CollisionMath::Collide(Box,Move,tri,Result);
 }
@@ -260,9 +254,9 @@ inline bool AABoxCollisionTestClass::Cast_To_Triangle(const TriClass & tri)
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // OBBoxCollisionTestClass
-// 
+//
 // Contains an Oriented Bounding Box and a movement vector to be tested
-// for collision.  Also adds Min and Max vectors (axis aligned box) 
+// for collision.  Also adds Min and Max vectors (axis aligned box)
 // both for the initial box and for the volume swept out by the box.
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -274,7 +268,7 @@ class OBBoxCollisionTestClass : public CollisionTestClass
 	OBBoxCollisionTestClass(const OBBoxCollisionTestClass & that);
 	OBBoxCollisionTestClass(const OBBoxCollisionTestClass & that,const Matrix3D & tm);
 	OBBoxCollisionTestClass(const AABoxCollisionTestClass & that,const Matrix3D & tm);
-	
+
 	bool Cull(const Vector3 & min,const Vector3 & max);
 	bool Cull(const AABoxClass & box);
 	bool Cast_To_Triangle(const TriClass & tri);
@@ -292,8 +286,8 @@ class OBBoxCollisionTestClass : public CollisionTestClass
 };
 
 
-inline bool OBBoxCollisionTestClass::Cull(const Vector3 & min,const Vector3 & max) 
-{ 
+inline bool OBBoxCollisionTestClass::Cull(const Vector3 & min,const Vector3 & max)
+{
 	if ((SweepMin.X > max.X) || (SweepMax.X < min.X)) {
 		return true;
 	}
@@ -308,10 +302,7 @@ inline bool OBBoxCollisionTestClass::Cull(const Vector3 & min,const Vector3 & ma
 	return false;
 }
 
-inline bool OBBoxCollisionTestClass::Cast_To_Triangle(const TriClass & tri) 
+inline bool OBBoxCollisionTestClass::Cast_To_Triangle(const TriClass & tri)
 {
 	return CollisionMath::Collide(Box,Move,tri,Vector3(0,0,0),Result);
 }
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/coltype.h b/Core/Libraries/Source/WWVegas/WW3D2/coltype.h
index a5a74784c58..b0f10f2cc4d 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/coltype.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/coltype.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 07/01/02 12:45p                                              $*
  *                                                                                             *
  *                    $Revision:: 2                                                           $*
@@ -37,38 +37,30 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-#ifndef COLTYPE_H
-#define COLTYPE_H
-
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// 
+//
 // Collision 'Types'
 //
-// This enum defines the collision type bit-field that is used in render object 
+// This enum defines the collision type bit-field that is used in render object
 // collision detection.
 //
-// The collision type field in a collision or intersection test is used as a 
-// low-level collision mask.  It will be 'AND'ed with the collision type of 
+// The collision type field in a collision or intersection test is used as a
+// low-level collision mask.  It will be 'AND'ed with the collision type of
 // the render object and will ignore the object unless the result is
-// non-zero.  In Commando, we use this to implement separate collision 
-// representations for "physical" collisions versus "projectile" 
-// collisions.  I.e. we use a very simple mesh for the character's 
-// physical collision and a more complex set of meshes for checking whether 
-// a bullet hits a person.  This masking system is not meant to be a general 
+// non-zero.  In Commando, we use this to implement separate collision
+// representations for "physical" collisions versus "projectile"
+// collisions.  I.e. we use a very simple mesh for the character's
+// physical collision and a more complex set of meshes for checking whether
+// a bullet hits a person.  This masking system is not meant to be a general
 // "collision grouping" system.  You should use a higher level system for doing
 // things like making bullets ignore each other, etc.
 //
 // One more wrinkle to the system:  The collision type in the render obj
 // will always have the LSB set (COLL_TYPE_ALL) so that you can always
 // do queries against every piece of geometry in a render obj if desired.
-// 
+//
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 enum
 {
@@ -87,8 +79,3 @@ enum
 	COLL_TYPE_CAMERA		=			COLL_TYPE_3,		// camera collision (99% should match physical setting)
 	COLL_TYPE_VEHICLE		=		COLL_TYPE_4,		// vehicles will collide with physical and this.
 };
-
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/composite.cpp b/Core/Libraries/Source/WWVegas/WW3D2/composite.cpp
index ec30ca13a43..5924b3d8151 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/composite.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/composite.cpp
@@ -58,7 +58,6 @@
 #include "composite.h"
 #include "wwdebug.h"
 #include <stdlib.h>
-#include <string.h>
 
 
 /***********************************************************************************************
@@ -167,9 +166,9 @@ void CompositeRenderObjClass::Restart(void)
  * HISTORY:                                                                                    *
  *   1/26/00    gth : Created.                                                                 *
  *=============================================================================================*/
-const char * CompositeRenderObjClass::Get_Name(void) const															
-{ 
-	return Name; 
+const char * CompositeRenderObjClass::Get_Name(void) const
+{
+	return Name;
 }
 
 
@@ -185,8 +184,8 @@ const char * CompositeRenderObjClass::Get_Name(void) const
  * HISTORY:                                                                                    *
  *   1/26/00    gth : Created.                                                                 *
  *=============================================================================================*/
-void CompositeRenderObjClass::Set_Name(const char * name)												
-{ 
+void CompositeRenderObjClass::Set_Name(const char * name)
+{
 	Name=name;
 }
 
@@ -238,7 +237,7 @@ int CompositeRenderObjClass::Get_Num_Polys(void) const
 		WWASSERT(robj);
 		count += robj->Get_Num_Polys();
 		robj->Release_Ref();
-	}	
+	}
 	return count;
 }
 
@@ -490,7 +489,7 @@ void CompositeRenderObjClass::Update_Obj_Space_Bounding_Volumes(void)
 		return;
 	}
 
-	
+
 	AABoxClass obj_aabox;
 	MinMaxAABoxClass box;
 	SphereClass sphere;
@@ -504,10 +503,10 @@ void CompositeRenderObjClass::Update_Obj_Space_Bounding_Volumes(void)
 	box.Init(obj_aabox);
 
 	for (i=1; i<Get_Num_Sub_Objects(); i++) {
-		
+
 		robj = Get_Sub_Object(i);
 		WWASSERT(robj);
-		
+
 		robj->Get_Obj_Space_Bounding_Sphere(sphere);
 		robj->Get_Obj_Space_Bounding_Box(obj_aabox);
 
@@ -556,6 +555,6 @@ const char * CompositeRenderObjClass::Get_Base_Model_Name (void) const
 	if (BaseModelName.Is_Empty()) {
 		return NULL;
 	}
-	
+
 	return BaseModelName;
-}
\ No newline at end of file
+}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/composite.h b/Core/Libraries/Source/WWVegas/WW3D2/composite.h
index c6b8188feb1..74bd0e26cb7 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/composite.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/composite.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef COMPOSITE_H
-#define COMPOSITE_H
 
 #include "rendobj.h"
 #include "wwstring.h"
@@ -93,7 +87,3 @@ class CompositeRenderObjClass : public RenderObjClass
 	SphereClass						ObjSphere;				// object-space bounding sphere
 	AABoxClass						ObjBox;					// object-space bounding box
 };
-
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp
index 1eca363f9d8..6ea694d29d9 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 8                                                           $*
@@ -147,9 +147,9 @@ void DecalSystemClass::Unlock_Decal_Generator(DecalGeneratorClass * generator)
  * HISTORY:                                                                                    *
  *   1/26/00    gth : Created.                                                                 *
  *=============================================================================================*/
-uint32 DecalSystemClass::Generate_Unique_Global_Decal_Id(void)			
-{ 
-	return DecalIDGenerator++; 
+uint32 DecalSystemClass::Generate_Unique_Global_Decal_Id(void)
+{
+	return DecalIDGenerator++;
 }
 
 
@@ -300,7 +300,7 @@ MultiFixedPoolDecalSystemClass::MultiFixedPoolDecalSystemClass(uint32 num_pools,
 	Generator_PoolID(0),
 	Generator_SlotID(0)
 {
-	if (PoolCount) 
+	if (PoolCount)
 	{
 		WWASSERT(pool_sizes);
 		Pools = W3DNEWARRAY LogicalDecalPoolClass [PoolCount];
@@ -329,10 +329,8 @@ MultiFixedPoolDecalSystemClass::MultiFixedPoolDecalSystemClass(const MultiFixedP
 
 MultiFixedPoolDecalSystemClass::~MultiFixedPoolDecalSystemClass(void)
 {
-	if (Pools) {
-		delete [] Pools;
-		Pools = 0;
-	}
+	delete [] Pools;
+	Pools = NULL;
 }
 
 // This clears the slot in addition to locking the generator, thus preventing any decal id
@@ -411,7 +409,7 @@ MultiFixedPoolDecalSystemClass::LogicalDecalClass & MultiFixedPoolDecalSystemCla
 	return find_logical_decal(pool_id, slot_id);
 }
 
-	
+
 /*
 ** MultiFixedPoolDecalSystemClass::LogicalDecalClass implementation
 */
@@ -463,25 +461,21 @@ void MultiFixedPoolDecalSystemClass::LogicalDecalClass::Clear(uint32 decal_id)
 */
 
 MultiFixedPoolDecalSystemClass::LogicalDecalPoolClass::LogicalDecalPoolClass(void) :
-	Array(0),
+	Array(NULL),
 	Size(0)
 {
 }
 
 MultiFixedPoolDecalSystemClass::LogicalDecalPoolClass::~LogicalDecalPoolClass(void)
 {
-	if (Array) {
-		delete [] Array;
-		Array = 0;
-	}
+	delete [] Array;
+	Array = NULL;
 }
 
 void MultiFixedPoolDecalSystemClass::LogicalDecalPoolClass::Initialize(uint32 size)
 {
-	if (Array) {
-		delete [] Array;
-		Array = 0;
-	}
+	delete [] Array;
+	Array = NULL;
 
 	Size = size;
 	assert(Size);
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h
index 1d93cb69470..6d7cbc1aa6c 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h
@@ -36,12 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DECALSYS_H
-#define DECALSYS_H
 
 #include "always.h"
 #include "matrix3d.h"
@@ -61,7 +56,7 @@ class DecalMeshClass;
 **
 ** Sample Code:
 ** 1 - Create the generator.  The system gives it a unique id and gives you a clean decal generator
-** 
+**
 ** DecalGeneratorClass * gen = DecalSystem->Lock_Decal_Generator();
 ** gen->Set_Transform(tm);
 ** gen->Set_Projection(proj_tm);
@@ -89,7 +84,7 @@ class DecalSystemClass
 	virtual ~DecalSystemClass(void);
 
 	/*
-	**	Create and release DecalGenerators.  Note that this is the point at which the 
+	**	Create and release DecalGenerators.  Note that this is the point at which the
 	** decal system can track "logical" decals.  The generator will keep an internal list
 	** of all of the render objects which generated decals which you should copy if you
 	** want to track them (e.g. if you want to cap the maximum number of active decals and
@@ -99,7 +94,7 @@ class DecalSystemClass
 	virtual void							Unlock_Decal_Generator(DecalGeneratorClass * generator);
 
 	/*
-	** When a decal-mesh is destroyed, it must inform the DecalSystem.  Otherwise, systems 
+	** When a decal-mesh is destroyed, it must inform the DecalSystem.  Otherwise, systems
 	** which track decals can get dangling pointers.
 	*/
 	virtual void							Decal_Mesh_Destroyed(uint32 decal_id,DecalMeshClass * mesh)	{ }
@@ -114,7 +109,7 @@ class DecalSystemClass
 
 	/*
 	** Unique ID generation for decals.  Not all decal systems have to use
-	** this method of generating ids.  Some may wish to assign the id as the 
+	** this method of generating ids.  Some may wish to assign the id as the
 	** array index of the logical id or use some other aritrary method.
 	*/
 	static uint32							Generate_Unique_Global_Decal_Id(void);
@@ -158,19 +153,19 @@ class DecalGeneratorClass : public ProjectorClass
 	/*
 	** Normally, decals are not generated on translucent meshes.  This is due to the "floating
 	** decals" that you can get on things like trees.  The user can override this behavior
-	** through the following interface. 
+	** through the following interface.
 	*/
 	void								Apply_To_Translucent_Meshes(bool onoff)	{ ApplyToTranslucentMeshes = onoff; }
 	bool								Is_Applied_To_Translucent_Meshes(void)		{ return ApplyToTranslucentMeshes; }
 
 	/*
-	** Material parameters: just grab a pointer the material pass and modify it.  
+	** Material parameters: just grab a pointer the material pass and modify it.
 	** Remember to release your ref to it when you are done.
 	*/
 	MaterialPassClass *			Get_Material(void)								{ WWASSERT(Material != NULL); Material->Add_Ref(); return Material; }
 
 	/*
-	** Decal generation support.  Call Set_Mesh_Transform for the mesh you want to add 
+	** Decal generation support.  Call Set_Mesh_Transform for the mesh you want to add
 	** a decal to.  Then for each vertex, you can call 'Compute_Texture_Coordinate'
 	*/
 	void								Set_Mesh_Transform(const Matrix3D & tm);
@@ -183,7 +178,7 @@ class DecalGeneratorClass : public ProjectorClass
 	/*
 	** Logical Decal ID, DecalSystem that this generator is tied to
 	*/
-	DecalSystemClass *			System;		
+	DecalSystemClass *			System;
 	uint32							DecalID;								// unique ID generated by the DecalSystem
 
 	/*
@@ -196,11 +191,11 @@ class DecalGeneratorClass : public ProjectorClass
 	** Material settings
 	*/
 	MaterialPassClass *			Material;							// material settings for the decal
-	
+
 	/*
 	** Results, list of the meshes which actually generated decal polygons for this logical decal.
 	*/
-	NonRefRenderObjListClass	MeshList;		
+	NonRefRenderObjListClass	MeshList;
 
 	friend class DecalSystemClass;
 };
@@ -281,7 +276,7 @@ class MultiFixedPoolDecalSystemClass : public DecalSystemClass
 		// Just clears any existing logical decal information, leaving the decal empty.
 		void											Clear(uint32 decal_id);
 
-		NonRefRenderObjListClass	MeshList;		
+		NonRefRenderObjListClass	MeshList;
 	};
 
 	class LogicalDecalPoolClass
@@ -300,9 +295,3 @@ class MultiFixedPoolDecalSystemClass : public DecalSystemClass
 	uint32											PoolCount;
 
 };
-
-
-
-
-#endif //DECALSYS_H
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp b/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp
index f95767bde53..d64078d3f8f 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp
@@ -96,9 +96,9 @@
 DistLODLoaderClass			_DistLODLoader;
 
 
-RenderObjClass * DistLODPrototypeClass::Create(void)			
-{ 
-	DistLODClass * dist = NEW_REF( DistLODClass , ( *Definition ) ); 
+RenderObjClass * DistLODPrototypeClass::Create(void)
+{
+	DistLODClass * dist = NEW_REF( DistLODClass , ( *Definition ) );
 
 	// Have to pull each LOD out of the DistLOD, create a copy of the name
 	// and destroy the DistLOD so that the models are "containerless".  Also
@@ -110,13 +110,13 @@ RenderObjClass * DistLODPrototypeClass::Create(void)
 	RenderObjClass ** robj = W3DNEWARRAY RenderObjClass * [count];
 	int i=0;
 	for (; i<count; i++) {
-		
+
 		robj[count - 1 - i] = dist->Get_Sub_Object(i);
 		WWASSERT(robj[count - 1 - i] != NULL);
 	}
 	dist->Release_Ref();
-	
-	WWDEBUG_SAY(("OBSOLETE Dist-LOD model found! Please re-export %s!\r\n",name));
+
+	WWDEBUG_SAY(("OBSOLETE Dist-LOD model found! Please re-export %s!",name));
 	HLodClass * hlod = NEW_REF(HLodClass , (name,robj,count));
 
 	// Now, release the temporary refs and memory for the name
@@ -147,10 +147,10 @@ PrototypeClass *DistLODLoaderClass::Load_W3D( ChunkLoadClass &cload )
 		return NULL;
 
 	} else {
-	
-		// ok, accept this model! 
+
+		// ok, accept this model!
 		DistLODPrototypeClass *pCLODProto = W3DNEW DistLODPrototypeClass (pCDistLODClass);
-		return pCLODProto;	
+		return pCLODProto;
 	}
 }
 
@@ -168,7 +168,7 @@ PrototypeClass *DistLODLoaderClass::Load_W3D( ChunkLoadClass &cload )
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-DistLODDefClass::DistLODDefClass(void) : 
+DistLODDefClass::DistLODDefClass(void) :
 	Name(NULL),
 	LodCount(0),
 	Lods(NULL)
@@ -242,15 +242,12 @@ DistLODDefClass::~DistLODDefClass(void)
  *=============================================================================================*/
 void DistLODDefClass::Free(void)
 {
-	if (Name != NULL) { 
-		delete[] Name;
-		Name = NULL;
-	}
+	delete[] Name;
+	Name = NULL;
+
 	if (Lods != NULL) {
 		for (int i=0; i<LodCount; i++) {
-			if (Lods[i].Name != NULL) {
-				delete[] Lods[i].Name;
-			}
+			delete[] Lods[i].Name;
 		}
 		delete[] Lods;
 		Lods = NULL;
@@ -273,18 +270,18 @@ void DistLODDefClass::Free(void)
  *=============================================================================================*/
 WW3DErrorType DistLODDefClass::Load_W3D(ChunkLoadClass & cload)
 {
-	/* 
+	/*
 	** First make sure we release any memory in use
 	*/
 	Free();
 
-	if (read_header(cload) == false) {        
+	if (read_header(cload) == false) {
 	  return WW3D_ERROR_LOAD_FAILED;
 	}
 
 	/*
 	**	Loop through all the LODs and read the info from its chunk
-	*/    
+	*/
 	for (int iLOD = 0; iLOD < LodCount; iLOD ++) {
 
 		/*
@@ -506,7 +503,7 @@ void DistLODClass::Free(void)
  *=============================================================================================*/
 int DistLODClass::Get_Num_Polys(void) const
 {
-	return Lods[CurLod].Model->Get_Num_Polys();	
+	return Lods[CurLod].Model->Get_Num_Polys();
 }
 
 
@@ -586,7 +583,7 @@ RenderObjClass * DistLODClass::Get_Sub_Object(int index) const
 {
 	assert(index >= 0);
 	assert(index < LodCount);
-	
+
 	if (Lods[index].Model == NULL) {
 		return NULL;
 	} else {
@@ -598,7 +595,7 @@ RenderObjClass * DistLODClass::Get_Sub_Object(int index) const
 int DistLODClass::Add_Sub_Object_To_Bone(RenderObjClass * subobj,int bone_index)
 {
 	// NOTE: this is broken code, a render object cannot have two containers...
-	if (subobj->Class_ID() == CLASSID_DISTLOD) { 
+	if (subobj->Class_ID() == CLASSID_DISTLOD) {
 		// Add each lod of the sub object to a cooresponding model of mine
 		DistLODClass * sub_lod_obj = (DistLODClass *)subobj;
 		for (int i=0; i< LodCount; i++) {
@@ -721,7 +718,7 @@ void DistLODClass::Set_Animation( HAnimClass * motion0,float frame0,HAnimClass *
 	}
 }
 
- 
+
 /***********************************************************************************************
  * DistLODClass::Set_Animation -- set the animation state to a combination of anims            *
  *                                                                                             *
@@ -742,7 +739,7 @@ void DistLODClass::Set_Animation( HAnimComboClass * anim_combo)
 	}
 }
 
-	
+
 /***********************************************************************************************
  * DistLODClass::Peek_Animation													                          *
  *                                                                                             *
@@ -1099,7 +1096,7 @@ void DistLODClass::Update_Lod(const CameraClass & camera)
 {
 	// evaluate the distance from the camera and select an LOD based on it.
 	float dist =	(
-							camera.Get_Position() - 
+							camera.Get_Position() -
 							Lods[CurLod].Model->Get_Bounding_Sphere().Center
 						).Quick_Length();
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h
index e2571ad0cf7..01e39339b17 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DISTLOD_H
-#define DISTLOD_H
 
 #include "proto.h"
 #include "rendobj.h"
@@ -58,7 +52,7 @@ class		DistLODDefClass;
 ** based on the pre-set distances.  Note that the models are stored in order of
 ** descending resolution; i.e. the highest res model will be in index 0.
 ** Most functions in this class simply pass the call on to all of the LODs.
-** 
+**
 ** When the level of detail is changed, the LOD which was being used must be
 ** notified that it is being removed from the scene and the new LOD must be
 ** notified that it is being added.  This allows us to correctly handle lights
@@ -95,10 +89,10 @@ class DistLODClass : public CompositeRenderObjClass
 
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Hierarchical Animation
-	// Here again, these functions are passed on to all LODs.  Each LOD is 
+	// Here again, these functions are passed on to all LODs.  Each LOD is
 	// assumed to use the same HTree (or have no HTree, this is so that LODs are
-	// animation-compatible) so the bone query functions simply pass to the top 
-	// LOD.  
+	// animation-compatible) so the bone query functions simply pass to the top
+	// LOD.
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void					Set_Animation( void );
 	virtual void					Set_Animation( HAnimClass * motion, float frame, int anim_mode = ANIM_MODE_MANUAL);
@@ -126,7 +120,7 @@ class DistLODClass : public CompositeRenderObjClass
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Attributes, Options, Properties, etc
 	/////////////////////////////////////////////////////////////////////////////
-	virtual int						Get_Num_Snap_Points(void);				
+	virtual int						Get_Num_Snap_Points(void);
 	virtual void					Get_Snap_Point(int index,Vector3 * set);
 	virtual void					Scale(float scale);
 	virtual void					Scale(float scalex, float scaley, float scalez);
@@ -180,7 +174,7 @@ class DistLODLoaderClass : public PrototypeLoaderClass
 struct DistLODNodeDefStruct
 {
 	DistLODNodeDefStruct(void) : Name(NULL),ResDownDist(0.0f),ResUpDist(0.0f) {}
-	
+
 	char *	Name;
 	float		ResDownDist;
 	float		ResUpDist;
@@ -220,12 +214,12 @@ class DistLODDefClass
 /*
 ** Prototype for Dist-LOD objects
 */
-class DistLODPrototypeClass : public W3DMPO, public PrototypeClass 
+class DistLODPrototypeClass : public W3DMPO, public PrototypeClass
 {
 	W3DMPO_GLUE(DistLODPrototypeClass)
 public:
 	DistLODPrototypeClass( DistLODDefClass *def ) { Definition = def; }
-	
+
 	virtual const char *			Get_Name(void) const			{ return Definition->Get_Name(); }
 	virtual int								Get_Class_ID(void) const	{ return RenderObjClass::CLASSID_DISTLOD; }
 	virtual RenderObjClass *	Create(void);
@@ -242,5 +236,3 @@ class DistLODPrototypeClass : public W3DMPO, public PrototypeClass
 ** Instance of the loaders which the asset manager install
 */
 extern DistLODLoaderClass			_DistLODLoader;
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dllist.h b/Core/Libraries/Source/WWVegas/WW3D2/dllist.h
index 7a2b56cbadb..438268dfae9 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dllist.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dllist.h
@@ -36,13 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DLLIST_H
-#define DLLIST_H
-
 
 template <class T> class DLNodeClass;
 
@@ -78,7 +72,7 @@ class DLDestroyListClass : public DLListClass<T>
 public:
 	virtual ~DLDestroyListClass()
 	{
-		while (T* t=Head()) {		
+		while (T* t=Head()) {
 			delete t;
 		}
 	}
@@ -207,5 +201,3 @@ inline void DLListClass<T>::Remove_Tail()
 	else tail->succ=0;
 	n->Remove();
 }
-
-#endif //DLLIST_H
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h
index 6acf1512490..38facb816f7 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 5                                                           $*
@@ -37,13 +37,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8LIST_H
-#define DX8LIST_H
 
 #include "always.h"
 #include "multilist.h"
@@ -63,12 +57,8 @@ typedef MultiListIterator<DX8FVFCategoryContainer>		FVFCategoryListIterator;
 
 class DX8PolygonRendererClass;
 typedef MultiListClass<DX8PolygonRendererClass>			DX8PolygonRendererList;
-typedef MultiListIterator<DX8PolygonRendererClass>		DX8PolygonRendererListIterator; 
+typedef MultiListIterator<DX8PolygonRendererClass>		DX8PolygonRendererListIterator;
 
 class TextureTrackerClass;
 typedef MultiListClass<TextureTrackerClass>				TextureTrackerList;
 typedef MultiListIterator<TextureTrackerClass>			TextureTrackerListIterator;
-
-
-#endif //DX8LIST_H
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.cpp
index f738cb7b38e..37b7a9b5c0c 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.cpp
@@ -53,7 +53,7 @@ DX8PolygonRendererClass::DX8PolygonRendererClass(
 	bool strip_,
 	unsigned pass_)
 	:
-	mmc(mmc_), 
+	mmc(mmc_),
 	texture_category(tex_cat),
 	index_offset(index_offset_),
 	vertex_offset(vertex_offset_),
@@ -69,7 +69,7 @@ DX8PolygonRendererClass::DX8PolygonRendererClass(
 
 DX8PolygonRendererClass::DX8PolygonRendererClass(const DX8PolygonRendererClass& src,MeshModelClass* mmc_)
 	:
-	mmc(mmc_), 
+	mmc(mmc_),
 	texture_category(src.texture_category),
 	index_offset(src.index_offset),
 	vertex_offset(src.vertex_offset),
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h
index 0498d8216e9..f864f725fbb 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h
@@ -36,14 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8_POLYGON_RENDERER_H
-#define DX8_POLYGON_RENDERER_H
-
 
 #include "always.h"
 #include "meshmdl.h"
@@ -61,10 +54,10 @@ class DX8TextureCategoryClass;
 ** This is a record of a batch/range of polygons to be rendered.  These hang off of the DX8TextureCategoryClass's
 ** and are rendered after the system installs a vertex buffer and textures in the DX8 wrapper.
 */
-class DX8PolygonRendererClass : public MultiListObjectClass 
+class DX8PolygonRendererClass : public MultiListObjectClass
 {
 	MeshModelClass *				mmc;
-	DX8TextureCategoryClass *	texture_category;			
+	DX8TextureCategoryClass *	texture_category;
 	unsigned							index_offset;				// absolute index of index 0 for our parent mesh
 	unsigned							vertex_offset;				// absolute index of vertex 0 for our parent mesh
 	unsigned							index_count;				// number of indices
@@ -88,10 +81,10 @@ class DX8PolygonRendererClass : public MultiListObjectClass
 	void								Render(/*const Matrix3D & tm,*/int base_vertex_offset);
 	void								Render_Sorted(/*const Matrix3D & tm,*/int base_vertex_offset,const SphereClass & bounding_sphere);
 	void								Set_Vertex_Index_Range(unsigned min_vertex_index_,unsigned vertex_index_range_);
-	
+
 	unsigned							Get_Vertex_Offset(void)	{ return vertex_offset; }
 	unsigned							Get_Index_Offset(void)	{ return index_offset; }
-	inline unsigned						Get_Pass(void)	{ return pass; }
+	unsigned						Get_Pass(void)	{ return pass; }
 
 	MeshModelClass*				Get_Mesh_Model_Class() { return mmc; }
 	DX8TextureCategoryClass*	Get_Texture_Category() { return texture_category; }
@@ -104,7 +97,7 @@ class DX8PolygonRendererClass : public MultiListObjectClass
 
 inline void DX8PolygonRendererClass::Set_Vertex_Index_Range(unsigned min_vertex_index_,unsigned vertex_index_range_)
 {
-//	WWDEBUG_SAY(("Set_Vertex_Index_Range - min: %d, range: %d\n",min_vertex_index_,vertex_index_range_));
+//	WWDEBUG_SAY(("Set_Vertex_Index_Range - min: %d, range: %d",min_vertex_index_,vertex_index_range_));
 //	if (vertex_index_range_>30000) {
 //		int a=0;
 //		a++;
@@ -118,12 +111,12 @@ inline void DX8PolygonRendererClass::Set_Vertex_Index_Range(unsigned min_vertex_
 inline void DX8PolygonRendererClass::Render(/*const Matrix3D & tm,*/int base_vertex_offset)
 {
 //	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-//	SNAPSHOT_SAY(("Set_Transform\n"));
-	SNAPSHOT_SAY(("Set_Index_Buffer_Index_Offset(%d)\n",base_vertex_offset));
+//	SNAPSHOT_SAY(("Set_Transform"));
+	SNAPSHOT_SAY(("Set_Index_Buffer_Index_Offset(%d)",base_vertex_offset));
 
 	DX8Wrapper::Set_Index_Buffer_Index_Offset(base_vertex_offset);
 	if (strip) {
-		SNAPSHOT_SAY(("Draw_Strip(%d,%d,%d,%d)\n",index_offset,index_count-2,min_vertex_index,vertex_index_range));
+		SNAPSHOT_SAY(("Draw_Strip(%d,%d,%d,%d)",index_offset,index_count-2,min_vertex_index,vertex_index_range));
 		DX8Wrapper::Draw_Strip(
 			index_offset,
 			index_count-2,
@@ -131,7 +124,7 @@ inline void DX8PolygonRendererClass::Render(/*const Matrix3D & tm,*/int base_ver
 			vertex_index_range);
 	}
 	else {
-		SNAPSHOT_SAY(("Draw_Triangles(%d,%d,%d,%d)\n",index_offset,index_count-2,min_vertex_index,vertex_index_range));
+		SNAPSHOT_SAY(("Draw_Triangles(%d,%d,%d,%d)",index_offset,index_count-2,min_vertex_index,vertex_index_range));
 		DX8Wrapper::Draw_Triangles(
 			index_offset,
 			index_count/3,
@@ -144,9 +137,9 @@ inline void DX8PolygonRendererClass::Render_Sorted(/*const Matrix3D & tm,*/int b
 {
 	WWASSERT(!strip);	// Strips can't be sorted for now
 //	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-//	SNAPSHOT_SAY(("Set_Transform\n"));
-	SNAPSHOT_SAY(("Set_Index_Buffer_Index_Offset(%d)\n",base_vertex_offset));
-	SNAPSHOT_SAY(("Insert_Sorting_Triangles(%d,%d,%d,%d)\n",index_offset,index_count-2,min_vertex_index,vertex_index_range));
+//	SNAPSHOT_SAY(("Set_Transform"));
+	SNAPSHOT_SAY(("Set_Index_Buffer_Index_Offset(%d)",base_vertex_offset));
+	SNAPSHOT_SAY(("Insert_Sorting_Triangles(%d,%d,%d,%d)",index_offset,index_count-2,min_vertex_index,vertex_index_range));
 
 	DX8Wrapper::Set_Index_Buffer_Index_Offset(base_vertex_offset);
 	SortingRendererClass::Insert_Triangles(
@@ -157,5 +150,3 @@ inline void DX8PolygonRendererClass::Render_Sorted(/*const Matrix3D & tm,*/int b
 		vertex_index_range);
 
 }
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.cpp
new file mode 100644
index 00000000000..d92e5b9f71f
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.cpp
@@ -0,0 +1,198 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : DX8 Texture Manager                                          *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/dx8texman.cpp                          $*
+ *                                                                                             *
+ *              Original Author:: Hector Yee                                                   *
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *                     $Modtime:: 06/27/02 1:27p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 4                                                           $*
+ *                                                                                             *
+ * 06/27/02 KM Texture class abstraction																			*
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   DX8TextureManagerClass::Shutdown -- Shuts down the texture manager                        *
+ *   DX8TextureManagerClass::Add -- Adds a texture to be managed                               *
+ *   DX8TextureManagerClass::Remove -- Removes a texture from being managed                    *
+ *   DX8TextureManagerClass::Release_Textures -- Releases the internal d3d texture             *
+ *   DX8TextureManagerClass::Recreate_Textures -- Reallocates lost textures                    *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+
+// This class manages textures that are in the default pool
+// ensuring that they are released on device loss
+// and created on device reset
+
+// Note: It does NOT addref to textures because it is called in the texture
+// destructor
+
+#include "dx8texman.h"
+
+TextureTrackerList DX8TextureManagerClass::Managed_Textures;
+
+
+/***********************************************************************************************
+ * DX8TextureManagerClass::Shutdown -- Shuts down the texture manager                          *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   4/25/2001  hy : Created.                                                                  *
+ *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
+ *=============================================================================================*/
+void DX8TextureManagerClass::Shutdown()
+{
+	while (!Managed_Textures.Is_Empty())
+	{
+		TextureTrackerClass *track=Managed_Textures.Remove_Head();
+		delete track;
+	}
+}
+
+/***********************************************************************************************
+ * DX8TextureManagerClass::Add -- Adds a texture to be managed                                 *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   4/25/2001  hy : Created.                                                                  *
+ *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
+ *=============================================================================================*/
+void DX8TextureManagerClass::Add(TextureTrackerClass *track)
+{
+	// this function should only be called by the texture constructor
+	Managed_Textures.Add(track);
+}
+
+
+/***********************************************************************************************
+ * DX8TextureManagerClass::Remove -- Removes a texture from being managed                      *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   4/25/2001  hy : Created.                                                                  *
+ *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
+ *=============================================================================================*/
+void DX8TextureManagerClass::Remove(TextureBaseClass *tex)
+{
+	// this function should only be called by the texture destructor
+	TextureTrackerListIterator it(&Managed_Textures);
+
+	while (!it.Is_Done())
+	{
+		TextureTrackerClass *track=it.Peek_Obj();
+		if (track->Get_Texture()==tex)
+		{
+			it.Remove_Current_Object();
+			delete track;
+			break;
+		}
+		it.Next();
+	}
+}
+
+
+/***********************************************************************************************
+ * DX8TextureManagerClass::Release_Textures -- Releases the internal d3d texture               *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   4/25/2001  hy : Created.                                                                  *
+ *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
+ *=============================================================================================*/
+void DX8TextureManagerClass::Release_Textures()
+{
+	TextureTrackerListIterator it(&Managed_Textures);
+
+	while (!it.Is_Done())
+	{
+		TextureTrackerClass *track=it.Peek_Obj();
+		track->Release();
+		it.Next();
+	}
+}
+
+
+/***********************************************************************************************
+ * DX8TextureManagerClass::Recreate_Textures -- Reallocates lost textures                      *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   4/25/2001  hy : Created.                                                                  *
+ *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
+ *=============================================================================================*/
+void DX8TextureManagerClass::Recreate_Textures()
+{
+	TextureTrackerListIterator it(&Managed_Textures);
+
+	while (!it.Is_Done())
+	{
+		TextureTrackerClass *track=it.Peek_Obj();
+		track->Recreate();
+		track->Get_Texture()->Set_Dirty();
+		it.Next();
+	}
+}
+
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h
new file mode 100644
index 00000000000..378fdad9c2e
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h
@@ -0,0 +1,171 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : DX8 Texture Manager                                          *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/dx8texman.h                            $*
+ *                                                                                             *
+ *              Original Author:: Hector Yee                                                   *
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *                     $Modtime:: 06/27/02 1:27p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 4                                                           $*
+ *                                                                                             *
+ * 06/27/02 KM Texture class abstraction																			*
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "always.h"
+#include "texture.h"
+#include "dx8wrapper.h"
+#include "ww3dformat.h"
+#include "dx8list.h"
+#include "multilist.h"
+
+class DX8TextureManagerClass;
+
+class TextureTrackerClass : public MultiListObjectClass
+{
+public:
+	TextureTrackerClass
+	(
+		unsigned int w,
+		unsigned int h,
+		MipCountType count,
+		TextureBaseClass *tex
+	)
+	: Width(w),
+	  Height(h),
+	  Mip_level_count(count),
+	  Texture(tex)
+	{
+	}
+
+	virtual void Recreate() const =0;
+
+	void Release()
+	{
+		Texture->Set_D3D_Base_Texture(NULL);
+	}
+
+	TextureBaseClass* Get_Texture() const { return Texture; }
+
+
+protected:
+
+	unsigned int Width;
+	unsigned int Height;
+	MipCountType Mip_level_count;
+	TextureBaseClass *Texture;
+};
+
+class DX8TextureTrackerClass : public TextureTrackerClass
+{
+public:
+	DX8TextureTrackerClass
+	(
+		unsigned int w,
+		unsigned int h,
+		WW3DFormat format,
+		MipCountType count,
+		TextureBaseClass *tex,
+		bool rt
+	)
+	: TextureTrackerClass(w,h,count,tex), Format(format), RenderTarget(rt)
+	{
+	}
+
+	virtual void Recreate() const
+	{
+		WWASSERT(Texture->Peek_D3D_Base_Texture()==NULL);
+		Texture->Poke_Texture
+		(
+			DX8Wrapper::_Create_DX8_Texture
+			(
+				Width,
+				Height,
+				Format,
+				Mip_level_count,
+				D3DPOOL_DEFAULT,
+				RenderTarget
+			)
+		);
+	}
+
+private:
+	WW3DFormat Format;
+	bool RenderTarget;
+};
+
+class DX8ZTextureTrackerClass : public TextureTrackerClass
+{
+public:
+	DX8ZTextureTrackerClass
+	(
+		unsigned int w,
+		unsigned int h,
+		WW3DZFormat zformat,
+		MipCountType count,
+		TextureBaseClass* tex
+	)
+	: TextureTrackerClass(w,h,count,tex), ZFormat(zformat)
+	{
+	}
+
+	virtual void Recreate() const
+	{
+		WWASSERT(Texture->Peek_D3D_Base_Texture()==NULL);
+		Texture->Poke_Texture
+		(
+			DX8Wrapper::_Create_DX8_ZTexture
+			(
+				Width,
+				Height,
+				ZFormat,
+				Mip_level_count,
+				D3DPOOL_DEFAULT
+			)
+		);
+	}
+
+
+private:
+	WW3DZFormat ZFormat;
+};
+
+
+class DX8TextureManagerClass
+{
+public:
+	static void Shutdown();
+	static void Add(TextureTrackerClass *track);
+	static void Remove(TextureBaseClass *tex);
+	static void Release_Textures();
+	static void Recreate_Textures();
+private:
+	static TextureTrackerList Managed_Textures;
+};
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp
index e3dd485a5da..b8bfc7fb6b5 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp
@@ -27,7 +27,7 @@
 // Date of Creation	: 6/4/2002
 //
 //******************************************************************************************
-// $Header: $ 
+// $Header: $
 //******************************************************************************************
 
 #include "dx8webbrowser.h"
@@ -139,11 +139,11 @@ void DX8WebBrowser::Shutdown()
 // ******************************************************************************************
 // * Description: 	Updates the browser image surfaces by copying the bits from the browser
 // *						DCs to the D3D Image surfaces.
-// * 
-// * Return Type: 	
-// * 
+// *
+// * Return Type:
+// *
 // * Argument:    	void
-// * 
+// *
 // ******************************************************************************************
 void	DX8WebBrowser::Update(void)
 {
@@ -155,11 +155,11 @@ void	DX8WebBrowser::Update(void)
 // * Function Name: DX8WebBrowser::Render
 // ******************************************************************************************
 // * Description: 	Draws all browsers to the back buffer.
-// * 
-// * Return Type: 	
-// * 
+// *
+// * Return Type:
+// *
 // * Argument:    	int backbufferindex
-// * 
+// *
 // ******************************************************************************************
 void	DX8WebBrowser::Render(int backbufferindex)
 {
@@ -170,9 +170,9 @@ void	DX8WebBrowser::Render(int backbufferindex)
 // * Function Name: DX8WebBrowser::CreateBrowser
 // ******************************************************************************************
 // * Description: 	Creates a browser window.
-// * 
-// * Return Type: 	
-// * 
+// *
+// * Return Type:
+// *
 // * Argument:    	const char* browsername -	This is a "name" used to identify the
 // *															browser instance.  Multiple browsers can
 // *															be created, and are referenced using this name.
@@ -185,11 +185,11 @@ void	DX8WebBrowser::Render(int backbufferindex)
 // *												at the specified rate (number of milliseconds) regardless
 // *												of paint messages.  When this is zero (the default) the browser
 // *												image is only updated whenever a paint message is received.
-// * 
+// *
 // ******************************************************************************************
 void	DX8WebBrowser::CreateBrowser(const char* browsername, const char* url, int x, int y, int w, int h, int updateticks, LONG options, LPDISPATCH gamedispatch)
 {
-	WWDEBUG_SAY(("DX8WebBrowser::CreateBrowser - Creating browser with the name %s, url = %s, (x, y, w, h) = (%d, %d, %d, %d), update ticks = %d\n", browsername, url, x, y, h, w, updateticks));
+	WWDEBUG_SAY(("DX8WebBrowser::CreateBrowser - Creating browser with the name %s, url = %s, (x, y, w, h) = (%d, %d, %d, %d), update ticks = %d", browsername, url, x, y, h, w, updateticks));
 	if(pBrowser)
 	{
 		_bstr_t brsname(browsername);
@@ -204,15 +204,15 @@ void	DX8WebBrowser::CreateBrowser(const char* browsername, const char* url, int
 // ******************************************************************************************
 // * Description: 	Destroys the specified browser.  This closes the window and releases
 // *						the browser instance.
-// * 
-// * Return Type: 	
-// * 
+// *
+// * Return Type:
+// *
 // * Argument:    	const char* browsername - The name of the browser to destroy.
-// * 
+// *
 // ******************************************************************************************
 void	DX8WebBrowser::DestroyBrowser(const char* browsername)
 {
-	WWDEBUG_SAY(("DX8WebBrowser::DestroyBrowser - destroying browser %s\n", browsername));
+	WWDEBUG_SAY(("DX8WebBrowser::DestroyBrowser - destroying browser %s", browsername));
 	if(pBrowser)
 		pBrowser->DestroyBrowser(_bstr_t(browsername));
 }
@@ -223,11 +223,11 @@ void	DX8WebBrowser::DestroyBrowser(const char* browsername)
 // ******************************************************************************************
 // * Description: 	This function checks to see if a browser of the specified name exists and
 // *						is currently open.
-// * 
-// * Return Type: 	
-// * 
+// *
+// * Return Type:
+// *
 // * Argument:    	const char* browsername - The name of the browser to test.
-// * 
+// *
 // ******************************************************************************************
 bool	DX8WebBrowser::Is_Browser_Open(const char* browsername)
 {
@@ -244,12 +244,12 @@ bool	DX8WebBrowser::Is_Browser_Open(const char* browsername)
 // * Function Name: DX8WebBrowser::Navigate
 // ******************************************************************************************
 // * Description: 	This function causes the browser to navigate to the specified page.
-// * 
-// * Return Type: 	
-// * 
+// *
+// * Return Type:
+// *
 // * Argument:    	const char* browsername - The name of the browser to test.
 // *						const char* url - The url to navigate to.
-// * 
+// *
 // ******************************************************************************************
 void	DX8WebBrowser::Navigate(const char* browsername, const char* url)
 {
@@ -257,4 +257,4 @@ void	DX8WebBrowser::Navigate(const char* browsername, const char* url)
 	pBrowser->Navigate(_bstr_t(browsername),_bstr_t(url));
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h
index 6134daa6444..ad470a6df39 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h
@@ -27,11 +27,10 @@
 // Date of Creation	: 6/4/2002
 //
 //******************************************************************************************
-// $Header: $ 
+// $Header: $
 //******************************************************************************************
 
-#ifndef DX8_WEBBROWSER_H
-#define DX8_WEBBROWSER_H
+#pragma once
 
 #include <windows.h>
 #include "d3d8.h"
@@ -89,5 +88,3 @@ class DX8WebBrowser
 };
 
 #endif
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp
index f8b3a170530..38d7c9a6787 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Commando                                 * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/dynamesh.cpp       $* 
- *                                                                         * 
- *                      $Author:: Greg_h                                  $* 
- *                                                                         * 
- *                     $Modtime:: 12/03/01 4:50p                          $* 
- *                                                                         * 
- *                    $Revision:: 25                                      $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : Commando                                 *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/dynamesh.cpp       $*
+ *                                                                         *
+ *                      $Author:: Greg_h                                  $*
+ *                                                                         *
+ *                     $Modtime:: 12/03/01 4:50p                          $*
+ *                                                                         *
+ *                    $Revision:: 25                                      $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "dynamesh.h"
@@ -104,10 +104,9 @@ DynamicMeshModel::DynamicMeshModel(const DynamicMeshModel &src) :
 
 DynamicMeshModel::~DynamicMeshModel(void)
 {
-	if (MatDesc) {
-		delete MatDesc;
-		MatDesc = NULL;
-	}
+	delete MatDesc;
+	MatDesc = NULL;
+
 	REF_PTR_RELEASE(MatInfo);
 }
 
@@ -189,11 +188,11 @@ void DynamicMeshModel::Render(RenderInfoClass & rinfo)
 	*/
 	DynamicVBAccessClass dynamic_vb(buffer_type,dynamic_fvf_type,DynamicMeshVNum);
 	const FVFInfoClass &fvf_info = dynamic_vb.FVF_Info();
-	
+
 	{ // scope for lock
 
 		DynamicVBAccessClass::WriteLockClass lock(&dynamic_vb);
-		unsigned char *vertices = (unsigned char*)lock.Get_Formatted_Vertex_Array();			
+		unsigned char *vertices = (unsigned char*)lock.Get_Formatted_Vertex_Array();
 		const Vector3 *locs = Get_Vertex_Array();
 		const Vector3 *normals = Get_Vertex_Normal_Array();
 		const Vector2 *uvs = MatDesc->Get_UV_Array_By_Index(0, false);
@@ -223,9 +222,9 @@ void DynamicMeshModel::Render(RenderInfoClass & rinfo)
 				*(unsigned int *)(vertices + fvf_info.Get_Diffuse_Offset()) = default_color;
 			}
 			vertices += fvf_info.Get_FVF_Size();
-		}			
+		}
 
-	} // end scope for lock
+	}
 
 	/*
 	** Write index data to index buffers
@@ -244,7 +243,7 @@ void DynamicMeshModel::Render(RenderInfoClass & rinfo)
 			indices[i*3 + 2] = (unsigned short)tris[i][2];
 		}
 
-	} // end scope for lock
+	}
 
 	/*
 	** Set vertex and index buffers
@@ -290,7 +289,7 @@ void DynamicMeshModel::Render(RenderInfoClass & rinfo)
 		} else {
 			texture_array1 = NULL;
 		}
-		
+
 		VertexMaterialClass **material_array = NULL;
 		MatBufferClass * mat_buf = MatDesc->Get_Material_Array(pass, false);
 		if (mat_buf) {
@@ -325,7 +324,7 @@ void DynamicMeshModel::Render(RenderInfoClass & rinfo)
 		}
 
 		SphereClass sphere(Vector3(0.0f,0.0f,0.0f),0.0f);
-		Get_Bounding_Sphere(&sphere); 
+		Get_Bounding_Sphere(&sphere);
 
 		// If no texture, shader or material arrays for this pass just draw and go to next pass
 		if (!texture_array0 && !texture_array1 && !material_array && !shader_array) {
@@ -368,15 +367,15 @@ void DynamicMeshModel::Render(RenderInfoClass & rinfo)
 					SortingRendererClass::Insert_Triangles(
 						sphere,
 						(start_tri_idx * 3),
-						(1 + cur_tri_idx - start_tri_idx), 
-						min_vert_idx, 
+						(1 + cur_tri_idx - start_tri_idx),
+						min_vert_idx,
 						1 + max_vert_idx - min_vert_idx);
 				}
 				else {
 					DX8Wrapper::Draw_Triangles(
 						(start_tri_idx * 3),
-						(1 + cur_tri_idx - start_tri_idx), 
-						min_vert_idx, 
+						(1 + cur_tri_idx - start_tri_idx),
+						min_vert_idx,
 						1 + max_vert_idx - min_vert_idx);
 				}
 				start_tri_idx = next_tri_idx;
@@ -390,9 +389,9 @@ void DynamicMeshModel::Render(RenderInfoClass & rinfo)
 
 			cur_tri_idx = next_tri_idx;
 
-		}	// while (!done)
+		}
 
-	}	// for (pass)
+	}
 
 }
 
@@ -414,7 +413,7 @@ void DynamicMeshModel::Initialize_Material_Array(int pass, VertexMaterialClass *
 
 void DynamicMeshClass::Render(RenderInfoClass & rinfo)
 {
-	if (Is_Not_Hidden_At_All() == false)	return;	
+	if (Is_Not_Hidden_At_All() == false)	return;
 
 	// test for an empty mesh..
 	if (PolyCount == 0 ) return;
@@ -472,7 +471,7 @@ bool DynamicMeshClass::End_Vertex()
 
 	// if we have 3 or more vertices, add a new poly
 	if (TriVertexCount >= 3) {
-	
+
 		// check that we have room for a new poly
 		WWASSERT(PolyCount < Model->Get_Polygon_Count());
 
@@ -614,7 +613,7 @@ void DynamicMeshClass::Resize(int max_polys, int max_verts)
 }
 
 DynamicMeshClass::~DynamicMeshClass()
-{	
+{
 	REF_PTR_RELEASE(Model);
 }
 
@@ -643,7 +642,7 @@ void DynamicMeshClass::Move_Vertex(int index, float x, float y, float z)
 	loc[index][0] = x;
 	loc[index][1] = y;
 	loc[index][2] = z;
-}	 
+}
 
 /*
 ** Get a vertex value.
@@ -670,7 +669,7 @@ void DynamicMeshClass::Translate_Vertices(const Vector3 & offset)
 		loc[i].Y += offset.Y;
 		loc[i].Z += offset.Z;
 	}
-	
+
 	Set_Dirty_Bounds();
 	Set_Dirty_Planes();
 }
@@ -708,7 +707,7 @@ int DynamicMeshClass::Set_Vertex_Material(VertexMaterialClass *material, bool do
 		MultiVertexMaterial[pass] = true;
 	}
 
-	// add the material to the material info class if we cant find it in the 
+	// add the material to the material info class if we cant find it in the
 	// list.  if we are not supposed to search the list for it then just add
 	// it.
 	if (!dont_search) {
@@ -770,7 +769,7 @@ int DynamicMeshClass::Set_Texture(TextureClass *texture, bool dont_search, int p
 		MultiTexture[pass] = true;
 	}
 
-	// add the material to the material info class if we cant find it in the 
+	// add the material to the material info class if we cant find it in the
 	// list.  if we are not supposed to search the list for it then just add
 	// it.
 	if (!dont_search) {
@@ -806,27 +805,27 @@ int DynamicMeshClass::Set_Texture(TextureClass *texture, bool dont_search, int p
 **
 */
 // Remap locations to match a screen
-void DynamicScreenMeshClass::Location( float x, float y, float z)	
-{	
-	DynamicMeshClass::Location( (x * 2) - 1, Aspect - (y * 2 * Aspect), 0); 
+void DynamicScreenMeshClass::Location( float x, float y, float z)
+{
+	DynamicMeshClass::Location( (x * 2) - 1, Aspect - (y * 2 * Aspect), 0);
 }
 
 // For moving a vertex after the DynaMesh has already been created.
-void DynamicScreenMeshClass::Move_Vertex(int index, float x, float y, float z)	
-{	
-	DynamicMeshClass::Move_Vertex( index, (x * 2) - 1, Aspect - (y * 2 * Aspect), 0); 
+void DynamicScreenMeshClass::Move_Vertex(int index, float x, float y, float z)
+{
+	DynamicMeshClass::Move_Vertex( index, (x * 2) - 1, Aspect - (y * 2 * Aspect), 0);
 }
 
 // Set position
-void DynamicScreenMeshClass::Set_Position(const Vector3 &v)	
-{ 
-	DynamicMeshClass::Set_Position(Vector3(v.X * 2, -(v.Y * 2 * Aspect), 0)); 
+void DynamicScreenMeshClass::Set_Position(const Vector3 &v)
+{
+	DynamicMeshClass::Set_Position(Vector3(v.X * 2, -(v.Y * 2 * Aspect), 0));
 }
 
-void DynamicScreenMeshClass::Reset( void )		
-{	
-	Reset_Flags();	
-	Reset_Mesh_Counters();	
+void DynamicScreenMeshClass::Reset( void )
+{
+	Reset_Flags();
+	Reset_Mesh_Counters();
 }
 
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h
index cfb81ebcc7f..814c3aec385 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h
@@ -16,29 +16,23 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Commando	                              * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/dynamesh.h         $* 
- *                                                                         * 
- *                      $Author:: Greg_h                                  $* 
- *                                                                         * 
- *                     $Modtime:: 12/03/01 4:20p                          $* 
- *                                                                         * 
- *                    $Revision:: 15                                      $* 
- *                                                                         * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : Commando	                              *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/dynamesh.h         $*
+ *                                                                         *
+ *                      $Author:: Greg_h                                  $*
+ *                                                                         *
+ *                     $Modtime:: 12/03/01 4:20p                          $*
+ *                                                                         *
+ *                    $Revision:: 15                                      $*
+ *                                                                         *
  *-------------------------------------------------------------------------*/
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DYNAMESH_H
-#define DYNAMESH_H
 
 #include "meshgeometry.h"
 #include "meshmatdesc.h"
@@ -88,7 +82,7 @@ class DynamicMeshModel : public MeshGeometryClass
 	void			Set_Single_Material(VertexMaterialClass * vmat, int pass=0) { MatDesc->Set_Single_Material(vmat, pass); }
 	void			Set_Single_Texture(TextureClass * tex, int pass=0, int stage=0) { MatDesc->Set_Single_Texture(tex, pass, stage); }
 	void			Set_Single_Shader(ShaderClass shader, int pass=0) { MatDesc->Set_Single_Shader(shader, pass); }
-	
+
 	void			Set_Material(int vidx, VertexMaterialClass * vmat, int pass=0) { MatDesc->Set_Material(vidx, vmat, pass); }
 	void			Set_Shader(int pidx, ShaderClass shader, int pass=0)  { MatDesc->Set_Shader(pidx, shader, pass); }
 	void			Set_Texture(int pidx, TextureClass * tex, int pass=0, int stage=0)  { MatDesc->Set_Texture(pidx, tex, pass, stage); }
@@ -103,12 +97,12 @@ class DynamicMeshModel : public MeshGeometryClass
 	MaterialInfoClass		*Peek_Material_Info(void)			{ return MatInfo; }
 	MaterialInfoClass		*Get_Material_Info(void)			{ if (MatInfo) MatInfo->Add_Ref(); return MatInfo;}
 	void Set_Material_Info(MaterialInfoClass *mat_info)
-	{ 
-		if (MatInfo) 
-			MatInfo->Release_Ref(); 
+	{
+		if (MatInfo)
+			MatInfo->Release_Ref();
 		WWASSERT(MatInfo != 0);
-		MatInfo = mat_info; 
-		MatInfo->Add_Ref(); 
+		MatInfo = mat_info;
+		MatInfo->Add_Ref();
 	}
 
 	// New geometry accessors (non-const)
@@ -131,7 +125,7 @@ class DynamicMeshModel : public MeshGeometryClass
 };
 
 /*
-** Dynamic Meshes 
+** Dynamic Meshes
 */
 class DynamicMeshClass : public RenderObjClass {
 
@@ -181,7 +175,7 @@ class DynamicMeshClass : public RenderObjClass {
 
 	// Set the shader for the current triangle
 	int	Set_Shader( const ShaderClass & shader, int pass = 0) { Model->Set_Single_Shader(shader, pass); return 0; }
-	
+
 	// set the shader, texture, and vertex material as found in the polygon info object
 	void	Set_Polygon_Info(const PolygonInfoClass &polyInfo, bool dont_search_texture = false, bool dont_search_vertex_material = false, int pass = 0)
 	{
@@ -337,9 +331,9 @@ class DynamicMeshClass : public RenderObjClass {
 		return End_Vertex();
 	}
 
-	void End_Tri_Strip( void )	
-	{ 	
-		TriVertexCount = 0;	
+	void End_Tri_Strip( void )
+	{
+		TriVertexCount = 0;
 	}
 
 	void End_Tri_Fan( void )
@@ -407,9 +401,9 @@ class DynamicMeshClass : public RenderObjClass {
 	// features that DynamicMeshModel provides.  It may be dangerous to modify the model behind the
 	// DynamicMeshClass's back so use at your own risk!
 	DynamicMeshModel *		Peek_Model(void)	{ return Model; }
-	
+
 protected:
-	
+
 	inline void	Switch_To_Multi_Vertex_Color(int color_array_index = 0);
 
 	// tells when the triangle needs to be back flipped
@@ -434,7 +428,7 @@ class DynamicMeshClass : public RenderObjClass {
 
 	// triangle vertex number
 	int TriVertexCount;
-	
+
 	// base vertex when submitting fans
 	int FanVertex;
 
@@ -447,11 +441,11 @@ class DynamicMeshClass : public RenderObjClass {
 };
 
 inline Vector3 * DynamicMeshModel::Get_Non_Const_Vertex_Normal_Array(void)
-{ 
+{
 	if (Get_Flag(DIRTY_VNORMALS)) {
 		Compute_Vertex_Normals();
 	}
-	return get_vert_normals(); 
+	return get_vert_normals();
 }
 
 inline TriIndex * DynamicMeshModel::Get_Non_Const_Polygon_Array(void)
@@ -462,7 +456,7 @@ inline TriIndex * DynamicMeshModel::Get_Non_Const_Polygon_Array(void)
 inline void DynamicMeshClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
 {
 	if (!Bounding_Volumes_Valid()) {
-		Model->Compute_Bounds(NULL);	
+		Model->Compute_Bounds(NULL);
 	}
 	Model->Get_Bounding_Sphere(&sphere);
 }
@@ -470,7 +464,7 @@ inline void DynamicMeshClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere
 inline void DynamicMeshClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
 {
 	if (!Bounding_Volumes_Valid()) {
-		Model->Compute_Bounds(NULL);	
+		Model->Compute_Bounds(NULL);
 	}
 	Model->Get_Bounding_Box(&box);
 }
@@ -521,19 +515,19 @@ int DynamicMeshClass::Set_Vertex_Color(const Vector3 & color, int color_array_in
 
 
 /*
-** Dynamic Screen Meshes 
+** Dynamic Screen Meshes
 **
 ** Same as DynamicMesh, but mapped in Screen Coordinates
 **
 ** Screen -> 0,0		1,0
-**					 +---+	
+**					 +---+
 **					 |   |
 **					 +---+
 **				 0,1	   1,1
 **
 **
 ** View  -> -1,1		1,1
-**					 +---+	
+**					 +---+
 **					 |   |
 **					 +---+
 **				-1,-1    1,-1
@@ -578,5 +572,3 @@ class DynamicScreenMeshClass : public DynamicMeshClass {
 	// tells when the triangle needs to be back flipped
 	virtual	bool	Flip_Face( void) { return !DynamicMeshClass::Flip_Face(); }
 };
-
-#endif	// DYNAMESH
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp
index 9a9cebb7672..cc78b9ba331 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp
@@ -16,25 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/font3d.cpp                             $* 
- *                                                                                             * 
- *                  $Org Author:: Jani_p                                  $* 
- *                                                                         * 
- *                      $Author:: Kenny_m                                  $* 
- *                                                                         * 
- *                     $Modtime:: 08/05/02 10:44a                          $* 
- *                                                                                             * 
- *                    $Revision:: 17                                                          $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/font3d.cpp                             $*
+ *                                                                                             *
+ *                  $Org Author:: Jani_p                                  $*
+ *                                                                         *
+ *                      $Author:: Kenny_m                                  $*
+ *                                                                         *
+ *                     $Modtime:: 08/05/02 10:44a                          $*
+ *                                                                                             *
+ *                    $Revision:: 17                                                          $*
+ *                                                                                             *
  * 08/05/02 KM Texture class redesign
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "font3d.h"
@@ -48,12 +48,12 @@
 
 static	SurfaceClass	*_surface;
 
-/*********************************************************************************************** 
- *                                                                                             * 
- * Font3DDataClass::Font3DDataClass -- constructor																	  * 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
+ * Font3DDataClass::Font3DDataClass -- constructor																	  *
+ *                                                                                             *
  * Constructs and load a Targa font image to create a texture matetial								  *
- *                                                                                             * 
+ *                                                                                             *
  ***********************************************************************************************/
 Font3DDataClass::Font3DDataClass( const char *filename )
 {
@@ -64,30 +64,28 @@ Font3DDataClass::Font3DDataClass( const char *filename )
 }
 
 
-/*********************************************************************************************** 
- *                                                                                             * 
- * Font3DDataClass::~Font3DDataClass -- destructor																	  * 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
+ * Font3DDataClass::~Font3DDataClass -- destructor																	  *
+ *                                                                                             *
  ***********************************************************************************************/
 Font3DDataClass::~Font3DDataClass(void)
 {
-	if (Name != NULL) {
-		free(Name);
-		Name = NULL;
-	}
+	free(Name);
+	Name = NULL;
 
 	REF_PTR_RELEASE(Texture);
 }
 
 
-/*********************************************************************************************** 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
  * FontClass::Minimize_Font_Image																				  *
- *                                                                                             * 
+ *                                                                                             *
  * Rebuilds the give image to better pack characters and to insure a square power of two size  *
  * Must be called AFTER Make_Proportional() so each chars minimal bounding box is known        *
  * Will only create a new texture of size 128x128 or 256x256, dependent on original width      *
- *                                                                                             * 
+ *                                                                                             *
  ***********************************************************************************************/
 SurfaceClass *Font3DDataClass::Minimize_Font_Image( SurfaceClass *surface )
 {
@@ -98,7 +96,7 @@ SurfaceClass *Font3DDataClass::Minimize_Font_Image( SurfaceClass *surface )
 	float current_width = sd.Width;
 	float current_height = sd.Height;
 
-	// determine new width make the size of the new image either 128x128 or 256x256, 
+	// determine new width make the size of the new image either 128x128 or 256x256,
 	// dependent on the width of the original image
    int new_width;
 	if (current_width < 256) {
@@ -113,7 +111,7 @@ SurfaceClass *Font3DDataClass::Minimize_Font_Image( SurfaceClass *surface )
 	SurfaceClass	*new_surface = NEW_REF(SurfaceClass,(new_width, new_height,WW3D_FORMAT_A4R4G4B4));
 	//SurfaceClass	*new_surface0 = NEW_REF(SurfaceClass,(new_width, new_height,sd.Format));
 
-	// fill with transparent black	
+	// fill with transparent black
 	new_surface->Clear();
 
 	// indices for the location of each added char
@@ -142,13 +140,13 @@ SurfaceClass *Font3DDataClass::Minimize_Font_Image( SurfaceClass *surface )
 				// we assert because we have already modified tables for some of the chars
 				if (new_y + height > new_height) {
 					new_y -= height;
-					WWDEBUG_SAY(( "Font doesn't fit texture 2 on char %c\n", char_index ));
+					WWDEBUG_SAY(( "Font doesn't fit texture 2 on char %c", char_index ));
 				}
 			}
 
 			// blit from original image to new image
 
-			new_surface->Copy(new_x, new_y,src_x,src_y,width,height,surface);											
+			new_surface->Copy(new_x, new_y,src_x,src_y,width,height,surface);
 
 		}
 
@@ -176,17 +174,17 @@ SurfaceClass *Font3DDataClass::Minimize_Font_Image( SurfaceClass *surface )
 	return _surface;
 }
 
-/*********************************************************************************************** 
- *                                                                                             * 
- * FontClass::Make_Proportional																					  * 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
+ * FontClass::Make_Proportional																					  *
+ *                                                                                             *
  * Modifys U and Width tables to convert a monospace font into a proportional font.  Hieght	  *
  * remains the same.  Performed by getting the current mono-space bounding box and bringing	  *
  * in the left and right edges to the first non-transparent ( != 0 ) pixel.  Then the U and	  *
  * width tables are updated with the new values.  The image itself is not modified unless...	  *
  * 																														  *
- * we complete by calling Minimize_Font_Image to shink the image & insure a power of 2 square  * 
- *                                                                                             * 
+ * we complete by calling Minimize_Font_Image to shink the image & insure a power of 2 square  *
+ *                                                                                             *
  ***********************************************************************************************/
 SurfaceClass *Font3DDataClass::Make_Proportional( SurfaceClass	*surface )
 {
@@ -210,14 +208,14 @@ SurfaceClass *Font3DDataClass::Make_Proportional( SurfaceClass	*surface )
 		Vector2i maxb(x1,y1);
 
 		surface->FindBB(&minb,&maxb);
-	
+
 		// set the new edges
 		x0 = minb.I;
 		x1 = maxb.I+1;
 
 		// if we didn't find ANY non-transparent pixels, the char has no width.
 		if (x1 < x0) {
-			x1 = x0; 
+			x1 = x0;
 		}
 
 		// turn off all character after del
@@ -237,14 +235,14 @@ SurfaceClass *Font3DDataClass::Make_Proportional( SurfaceClass	*surface )
 	return NULL;
 }
 
-/*********************************************************************************************** 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
  * Font3DDataClass::Load_Font_Image( SR_SCENE *scene, char *filename )								  *
- *                                                                                             * 
+ *                                                                                             *
  * Loads a targa font image file, arranged as 16x16 characters, and builds u v tables to 		  *
  * find each character.  Converts the mono-space font into a proportional font, then uploads	  *
  * the image to the scene as a textur material.                                                *
- *                                                                                             * 
+ *                                                                                             *
  ***********************************************************************************************/
 bool	Font3DDataClass::Load_Font_Image( const char *filename )
 {
@@ -264,9 +262,9 @@ bool	Font3DDataClass::Load_Font_Image( const char *filename )
 
 		int	column = 0;
 		int	width = sd.Width;
-		
 
-		// for each char, find the uv start location and set the 
+
+		// for each char, find the uv start location and set the
 		// mono-spaced width and height in normalized screen units
 		for (int char_index = 0; char_index < 256; char_index++) {
 
@@ -286,9 +284,9 @@ bool	Font3DDataClass::Load_Font_Image( const char *filename )
 				// find the first transparent column...
 				while (( column < width ) && ( !surface->Is_Transparent_Column(column) )) column++;
 				int end = column;
-				
+
 				if ( end <= start ) {
-					WWDEBUG_SAY(( "Error Char %d start %d end %d width %d\n", char_index, start, end, width ));
+					WWDEBUG_SAY(( "Error Char %d start %d end %d width %d", char_index, start, end, width ));
 				}
 
 //				WWASSERT( end > start );
@@ -316,7 +314,7 @@ bool	Font3DDataClass::Load_Font_Image( const char *filename )
 		float	mono_pixel_width = (font_width / 16);
 		float	mono_pixel_height = (font_height / 16);
 
-		// for each char, find the uv start location and set the 
+		// for each char, find the uv start location and set the
 		// mono-spaced width and height in normalized screen units
 		for (int char_index = 0; char_index < 256; char_index++) {
 			UOffsetTable[ char_index ] = (float)((char_index % 16) * mono_pixel_width) / font_width;
@@ -345,12 +343,12 @@ bool	Font3DDataClass::Load_Font_Image( const char *filename )
 }
 
 
-/*********************************************************************************************** 
- *                                                                                             * 
- * Font3DInstanceClass::Font3DInstanceClass -- constructor											     * 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
+ * Font3DInstanceClass::Font3DInstanceClass -- constructor											     *
+ *                                                                                             *
  * Constructs and load a Targa font image to create a texture matetial								  *
- *                                                                                             * 
+ *                                                                                             *
  ***********************************************************************************************/
 Font3DInstanceClass::Font3DInstanceClass( const char *filename )
 {
@@ -362,10 +360,10 @@ Font3DInstanceClass::Font3DInstanceClass( const char *filename )
 	Build_Cached_Tables();
 }
 
-/*********************************************************************************************** 
- *                                                                                             * 
- * Font3DInstanceClass::~Font3DInstanceClass -- destructor																	  * 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
+ * Font3DInstanceClass::~Font3DInstanceClass -- destructor																	  *
+ *                                                                                             *
  ***********************************************************************************************/
 Font3DInstanceClass::~Font3DInstanceClass(void)
 {
@@ -376,9 +374,9 @@ Font3DInstanceClass::~Font3DInstanceClass(void)
 **
 */
 void	Font3DInstanceClass::Set_Mono_Spaced( void )
-{ 
+{
 	MonoSpacing = FontData->Char_Width('W') + 1;
-	Build_Cached_Tables(); 
+	Build_Cached_Tables();
 }
 
 void	Font3DInstanceClass::Build_Cached_Tables()
@@ -400,12 +398,12 @@ void	Font3DInstanceClass::Build_Cached_Tables()
 	ScaledHeight = floorf(Scale * (float)FontData->Char_Height('A'));
 }
 
-/*********************************************************************************************** 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
  * Font3DInstanceClass::String_Screen_Width( char *test_str )									        *
- *                                                                                             * 
+ *                                                                                             *
  * Finds the normalized screenspace width of a character string - useful for checking before   *
- * printing to avoid overflowing the screen.																	  *                                                                                             * 
+ * printing to avoid overflowing the screen.																	  *                                                                                             *
  ***********************************************************************************************/
 float	Font3DInstanceClass::String_Width( const WCHAR *test_str )
 {
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h
index 1fd70d19529..cbaf28a386d 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h
@@ -16,32 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/font3d.h                               $* 
- *                                                                                             * 
- *                      $Author:: Byon_g                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 4/05/01 2:19p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 4                                                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/font3d.h                               $*
+ *                                                                                             *
+ *                      $Author:: Byon_g                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 4/05/01 2:19p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 4                                                           $*
+ *                                                                                             *
  *---------------------------------------------------------------------------------------------*/
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef FONT3D_H
-#define FONT3D_H
 
 #include "always.h"
-#include "refcount.h"
 #include "vector4.h"
 #include "widestring.h"
 #include "rect.h"
@@ -55,7 +48,7 @@ class SurfaceClass;
 **
 ** This class provides an interface to a font texture.  Once
 ** created and loaded with a font, the object can return texture
-** u v coordinate for any character in the font, as well as the 
+** u v coordinate for any character in the font, as well as the
 ** character width for proportional fonts.  Fonts are loaded as
 ** 16-bit Targa files, then converted to proportional fonts by
 ** finding the minimum bounding box for each chacter.  The font
@@ -76,7 +69,7 @@ class Font3DDataClass : public RefCountClass {
 public:
 
 	/*
-	** Constructor,  Constructor which loads a targa file, 
+	** Constructor,  Constructor which loads a targa file,
 	** and Destructor
 	*/
 	Font3DDataClass( const char *filename );
@@ -88,21 +81,21 @@ class Font3DDataClass : public RefCountClass {
 	/*
 	** access character width and height in pixels (clamp char to 0.255)
 	*/
-	
+
 	unsigned char	Char_Width( WCHAR ch = (WCHAR)'H' )			{ return CharWidthTable[ch&0xFF]; }// & 0xFF]; } // No need to "& 0xff" with chars!!!
 	unsigned char	Char_Height( WCHAR /*ch = 'H'*/ )			{ return CharHeight; }
 
 	// u and v are in normalized texture space
-	inline float	Char_U_Offset( WCHAR ch = (WCHAR)'H')		{ return UOffsetTable[ch&0xFF]; }// & 0xFF]; }
-	inline float	Char_V_Offset( WCHAR ch = (WCHAR)'H')		{ return VOffsetTable[ch&0xFF]; }// & 0xFF]; }
-	inline float	Char_U_Width( WCHAR ch = (WCHAR)'H' )		{ return UWidthTable[ch&0xFF]; }// & 0xFF]; }
-	inline float	Char_V_Height( WCHAR /*ch = 'H'*/)			{ return VHeight; }
-	
+	float	Char_U_Offset( WCHAR ch = (WCHAR)'H')		{ return UOffsetTable[ch&0xFF]; }// & 0xFF]; }
+	float	Char_V_Offset( WCHAR ch = (WCHAR)'H')		{ return VOffsetTable[ch&0xFF]; }// & 0xFF]; }
+	float	Char_U_Width( WCHAR ch = (WCHAR)'H' )		{ return UWidthTable[ch&0xFF]; }// & 0xFF]; }
+	float	Char_V_Height( WCHAR /*ch = 'H'*/)			{ return VHeight; }
+
 	// get all four UV values as one vector4
 	Vector4 Char_UV_Corners( WCHAR ch = (WCHAR)'H' )
 	{
 //		ch &= 0xFF;
-		return Vector4( UOffsetTable[ch], VOffsetTable[ch], 
+		return Vector4( UOffsetTable[ch], VOffsetTable[ch],
 						UOffsetTable[ch] + UWidthTable[ch],
 						VOffsetTable[ch] + VHeight );
 	}
@@ -152,7 +145,7 @@ class Font3DInstanceClass : public RefCountClass {
 
 public:
 	/*
-	** Constructor which creates/gets a Font3DDataClass object, 
+	** Constructor which creates/gets a Font3DDataClass object,
 	** and Destructor
 	*/
 	Font3DInstanceClass( const char *filename );
@@ -200,14 +193,14 @@ class Font3DInstanceClass : public RefCountClass {
 	//	inline float	Char_U_Width( WCHAR ch = (WCHAR)'H' ) { return FontData->Char_U_Width( ch & 0xFF );  }
 	//	inline float	Char_V_Height( WCHAR ch = (WCHAR)'H') { return FontData->Char_V_Height( ch & 0xFF ); }
 	//	Vector4 Char_UV_Corners( WCHAR ch = (WCHAR)'H' )	{ return FontData->Char_UV_Corners( ch & 0xFF ); }
-	RectClass		Char_UV( WCHAR ch )	{ return RectClass(	FontData->Char_U_Offset(ch), 
-																				FontData->Char_V_Offset(ch), 
-																				FontData->Char_U_Offset(ch) + FontData->Char_U_Width(ch), 
+	RectClass		Char_UV( WCHAR ch )	{ return RectClass(	FontData->Char_U_Offset(ch),
+																				FontData->Char_V_Offset(ch),
+																				FontData->Char_U_Offset(ch) + FontData->Char_U_Width(ch),
 																				FontData->Char_V_Offset(ch) + FontData->Char_V_Height(ch) ); }
 private:
 
 	Font3DDataClass *	FontData;			// The font data
-	float					Scale;				// The current scale factor 
+	float					Scale;				// The current scale factor
 	float					SpaceSpacing; 		// non-scaled width of space in pixels ( defaults to 1/2 'H' width )
 	float					InterCharSpacing;	// non-scaled width between chars in pixels
 	float					MonoSpacing;		// non-scaled monospace char width in pixels (0 for proportional)
@@ -218,6 +211,3 @@ class Font3DInstanceClass : public RefCountClass {
 
 	void					Build_Cached_Tables();
 };
-
-
-#endif 
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/formconv.cpp b/Core/Libraries/Source/WWVegas/WW3D2/formconv.cpp
index 6350e653216..54980550846 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/formconv.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/formconv.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Nathaniel Hoffman                                            *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 3                                                           $*
@@ -67,26 +67,26 @@ D3DFORMAT WW3DFormatToD3DFormatConversionArray[WW3D_FORMAT_COUNT] = {
 };
 
 // adding depth stencil format conversion
-D3DFORMAT WW3DZFormatToD3DFormatConversionArray[WW3D_ZFORMAT_COUNT] = 
+D3DFORMAT WW3DZFormatToD3DFormatConversionArray[WW3D_ZFORMAT_COUNT] =
 {
 #ifndef _XBOX
 	D3DFMT_UNKNOWN,
-	D3DFMT_D16_LOCKABLE, // 16-bit z-buffer bit depth. This is an application-lockable surface format. 
-	D3DFMT_D32, // 32-bit z-buffer bit depth. 
-	D3DFMT_D15S1, // 16-bit z-buffer bit depth where 15 bits are reserved for the depth channel and 1 bit is reserved for the stencil channel. 
-	D3DFMT_D24S8, // 32-bit z-buffer bit depth using 24 bits for the depth channel and 8 bits for the stencil channel. 
-	D3DFMT_D16, // 16-bit z-buffer bit depth. 
-	D3DFMT_D24X8, // 32-bit z-buffer bit depth using 24 bits for the depth channel. 
-	D3DFMT_D24X4S4, // 32-bit z-buffer bit depth using 24 bits for the depth channel and 4 bits for the stencil channel. 
+	D3DFMT_D16_LOCKABLE, // 16-bit z-buffer bit depth. This is an application-lockable surface format.
+	D3DFMT_D32, // 32-bit z-buffer bit depth.
+	D3DFMT_D15S1, // 16-bit z-buffer bit depth where 15 bits are reserved for the depth channel and 1 bit is reserved for the stencil channel.
+	D3DFMT_D24S8, // 32-bit z-buffer bit depth using 24 bits for the depth channel and 8 bits for the stencil channel.
+	D3DFMT_D16, // 16-bit z-buffer bit depth.
+	D3DFMT_D24X8, // 32-bit z-buffer bit depth using 24 bits for the depth channel.
+	D3DFMT_D24X4S4, // 32-bit z-buffer bit depth using 24 bits for the depth channel and 4 bits for the stencil channel.
 #else
 	D3DFMT_UNKNOWN,
-	D3DFMT_D16_LOCKABLE, // 16-bit z-buffer bit depth. This is an application-lockable surface format. 
-	D3DFMT_D32, // 32-bit z-buffer bit depth. 
-	D3DFMT_D15S1, // 16-bit z-buffer bit depth where 15 bits are reserved for the depth channel and 1 bit is reserved for the stencil channel. 
-	D3DFMT_D24S8, // 32-bit z-buffer bit depth using 24 bits for the depth channel and 8 bits for the stencil channel. 
-	D3DFMT_D16, // 16-bit z-buffer bit depth. 
-	D3DFMT_D24X8, // 32-bit z-buffer bit depth using 24 bits for the depth channel. 
-	D3DFMT_D24X4S4, // 32-bit z-buffer bit depth using 24 bits for the depth channel and 4 bits for the stencil channel. 
+	D3DFMT_D16_LOCKABLE, // 16-bit z-buffer bit depth. This is an application-lockable surface format.
+	D3DFMT_D32, // 32-bit z-buffer bit depth.
+	D3DFMT_D15S1, // 16-bit z-buffer bit depth where 15 bits are reserved for the depth channel and 1 bit is reserved for the stencil channel.
+	D3DFMT_D24S8, // 32-bit z-buffer bit depth using 24 bits for the depth channel and 8 bits for the stencil channel.
+	D3DFMT_D16, // 16-bit z-buffer bit depth.
+	D3DFMT_D24X8, // 32-bit z-buffer bit depth using 24 bits for the depth channel.
+	D3DFMT_D24X4S4, // 32-bit z-buffer bit depth using 24 bits for the depth channel and 4 bits for the stencil channel.
 
 	D3DFMT_LIN_D24S8,
 	D3DFMT_LIN_F24S8,
@@ -133,7 +133,7 @@ WW3DFormat D3DFormatToWW3DFormatConversionArray[HIGHEST_SUPPORTED_D3DFORMAT + 1]
 #define HIGHEST_SUPPORTED_D3DFORMAT D3DFMT_X8L8V8U8
 #define HIGHEST_SUPPORTED_D3DZFORMAT D3DFMT_D16
 #else
-#define HIGHEST_SUPPORTED_D3DFORMAT  D3DFMT_LIN_R8G8B8A8 
+#define HIGHEST_SUPPORTED_D3DFORMAT  D3DFMT_LIN_R8G8B8A8
 #define HIGHEST_SUPPORTED_D3DZFORMAT    D3DFMT_LIN_F16
 #endif
 WW3DFormat D3DFormatToWW3DFormatConversionArray[HIGHEST_SUPPORTED_D3DFORMAT + 1];
@@ -170,13 +170,13 @@ WW3DFormat D3DFormat_To_WW3DFormat(D3DFORMAT d3d_format)
 //! Depth Stencil W3D to D3D format conversion
 /*! KJM
 */
-D3DFORMAT WW3DZFormat_To_D3DFormat(WW3DZFormat ww3d_zformat) 
+D3DFORMAT WW3DZFormat_To_D3DFormat(WW3DZFormat ww3d_zformat)
 {
-	if (ww3d_zformat >= WW3D_ZFORMAT_COUNT) 
+	if (ww3d_zformat >= WW3D_ZFORMAT_COUNT)
 	{
 		return D3DFMT_UNKNOWN;
 	}
-	else 
+	else
 	{
 		return WW3DZFormatToD3DFormatConversionArray[(unsigned int)ww3d_zformat];
 	}
@@ -188,11 +188,11 @@ D3DFORMAT WW3DZFormat_To_D3DFormat(WW3DZFormat ww3d_zformat)
 */
 WW3DZFormat D3DFormat_To_WW3DZFormat(D3DFORMAT d3d_format)
 {
-	if (d3d_format>HIGHEST_SUPPORTED_D3DZFORMAT) 
+	if (d3d_format>HIGHEST_SUPPORTED_D3DZFORMAT)
 	{
 		return WW3D_ZFORMAT_UNKNOWN;
 	}
-	else 
+	else
 	{
 		return D3DFormatToWW3DZFormatConversionArray[(unsigned int)d3d_format];
 	}
@@ -231,7 +231,7 @@ void Init_D3D_To_WW3_Conversion()
 	D3DFormatToWW3DFormatConversionArray[D3DFMT_X8L8V8U8]=WW3D_FORMAT_X8L8V8U8;	// Bumpmap
 
 	// init depth stencil conversion
-	for (i=0; i<HIGHEST_SUPPORTED_D3DZFORMAT; i++) 
+	for (i=0; i<HIGHEST_SUPPORTED_D3DZFORMAT; i++)
 	{
 		D3DFormatToWW3DZFormatConversionArray[i]=WW3D_ZFORMAT_UNKNOWN;
 	}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/formconv.h b/Core/Libraries/Source/WWVegas/WW3D2/formconv.h
index 43e106db0f8..55fbd189745 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/formconv.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/formconv.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Nathaniel Hoffman                                            *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 3                                                           $*
@@ -37,12 +37,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef FORMCONV_H
-#define FORMCONV_H
 
 #include "ww3dformat.h"
 #include <d3d8.h>
@@ -58,5 +53,3 @@ D3DFORMAT WW3DZFormat_To_D3DFormat(WW3DZFormat ww3d_zformat);
 WW3DZFormat D3DFormat_To_WW3DZFormat(D3DFORMAT d3d_format);
 
 void Init_D3D_To_WW3_Conversion();
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h b/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h
index aa34a071719..4ad91b0bb7a 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h
@@ -34,33 +34,17 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef FRAMEGRAB_H
-#define FRAMEGRAB_H
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
 
 #if defined (_MSC_VER)
 #pragma warning (push, 3)	// (gth) system headers complain at warning level 4...
 #endif
 
-#ifndef _WINDOWS_
 #include "windows.h"
-#endif
-
-#ifndef _INC_WINDOWSX
 #include "windowsx.h"
-#endif
-
-#ifndef _INC_VFW
 #include "vfw.h"
-#endif
 
 #if defined (_MSC_VER)
 #pragma warning (pop)
@@ -70,7 +54,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-class FrameGrabClass  
+class FrameGrabClass
 {
 public:
 	enum MODE {
@@ -100,11 +84,11 @@ class FrameGrabClass
 	void GrabRawFrame(void *BitmapPointer);
 
 	// avi settings
-	PAVIFILE				AVIFile;  
+	PAVIFILE				AVIFile;
 	long					*Bitmap;
-	PAVISTREAM			Stream;     
+	PAVISTREAM			Stream;
 	AVISTREAMINFO		AVIStreamInfo;
-	BITMAPINFOHEADER	BitmapInfoHeader; 
+	BITMAPINFOHEADER	BitmapInfoHeader;
 
 	// general purpose cleanup routine
 	void CleanupAVI();
@@ -113,5 +97,3 @@ class FrameGrabClass
 	void ConvertFrame(void *BitmapPointer);
 
 };
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp b/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp
index 9612eb0393e..479b6d764af 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/hanim.cpp 3     12/13/01 7:01p Patrick $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/hanim.cpp                              $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 12/13/01 6:54p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/hanim.cpp                              $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 12/13/01 6:54p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -43,7 +43,6 @@
 #include "chunkio.h"
 #include "w3d_file.h"
 #include "wwdebug.h"
-#include <string.h>
 #include <nstrdup.h>
 
 
@@ -61,12 +60,12 @@ NamedPivotMapClass::~NamedPivotMapClass(void)
 }
 
 NamedPivotMapClass::WeightInfoStruct & NamedPivotMapClass::WeightInfoStruct::operator = (WeightInfoStruct const &that)
-{	
-	if(Name) delete [] Name;
-	assert(that.Name != 0);
-	Name = nstrdup(that.Name); 
-	Weight = that.Weight; 
-	return *this; 
+{
+	delete [] Name;
+	assert(that.Name != NULL);
+	Name = nstrdup(that.Name);
+	Weight = that.Weight;
+	return *this;
 }
 
 // add a name & weight to the arrays
@@ -75,7 +74,7 @@ void NamedPivotMapClass::Add(const char *Name, float Weight)
 	WeightInfoStruct info;
 	info.Name = (char *) Name;
 	info.Weight = Weight;
-	WeightInfo.Add(info);	
+	WeightInfo.Add(info);
 	info.Name = 0;
 }
 
@@ -100,7 +99,7 @@ void NamedPivotMapClass::Update_Pivot_Map(const HTreeClass *Tree)
 		int actualPivot = Tree->Get_Bone_Index(WeightInfo[count].Name);
 		if(actualPivot != -1) {
 			(*this)[actualPivot] = WeightInfo[count].Weight;
-		} 
+		}
 	}
 }
 
@@ -109,8 +108,8 @@ void NamedPivotMapClass::Update_Pivot_Map(const HTreeClass *Tree)
 */
 DEFINE_AUTO_POOL(HAnimComboDataClass,256);
 
-HAnimComboDataClass::HAnimComboDataClass(bool shared) 
-: Shared(shared), HAnim(0), PivotMap(0), Frame(0), PrevFrame(0), Weight(1) 
+HAnimComboDataClass::HAnimComboDataClass(bool shared)
+: Shared(shared), HAnim(0), PivotMap(0), Frame(0), PrevFrame(0), Weight(1)
 {}
 
 
@@ -143,13 +142,13 @@ void HAnimComboDataClass::Copy(const HAnimComboDataClass *src)
 
 HAnimComboDataClass::~HAnimComboDataClass(void)
 {
-	if(HAnim) 
+	if(HAnim)
 		HAnim->Release_Ref();
 	if(PivotMap)
 		PivotMap->Release_Ref();
 }
 
-void HAnimComboDataClass::Clear(void) 
+void HAnimComboDataClass::Clear(void)
 {
 	if ( HAnim != NULL ) {
 		HAnim->Release_Ref();
@@ -196,7 +195,7 @@ void HAnimComboDataClass::Set_Pivot_Map(PivotMapClass *map)
 **	This function will replace the current pivot map (if any) with another pivot map that is
 ** set to 1 for only those pivot indices that actually have data.
 */
-void HAnimComboDataClass::Build_Active_Pivot_Map(void) 
+void HAnimComboDataClass::Build_Active_Pivot_Map(void)
 {
 	if ( PivotMap != NULL ) {
 		PivotMap->Release_Ref();
@@ -222,7 +221,7 @@ void HAnimComboDataClass::Build_Active_Pivot_Map(void)
 	}
 }
 
-/*	
+/*
 **	HAnimComboClass
 **
 **
@@ -263,7 +262,7 @@ void	HAnimComboClass::Reset( void )
 	while ( numAnimations-- ) {
 		HAnimComboDataClass *data = HAnimComboData[numAnimations];
 		if(data && (! data->Is_Shared())) {
-			delete data; 
+			delete data;
 		}
 	}
 	HAnimComboData.Reset_Active();
@@ -276,7 +275,7 @@ bool	HAnimComboClass::Normalize_Weights(void)
 	// adjust the pivot maps). Otherwise we do nothing and return false.
 	int anim_count = Get_Num_Anims();
 	if (!anim_count) return true;	// Trivially succeeded
-	
+
 	// Loop over all anims. Check if all or none have pivot maps, and also calculate the minimum
 	// number of pivots.
 	int anim_idx = 0;
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h
index 0fda514e8f3..a01069917cc 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h
@@ -17,41 +17,33 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/hanim.h 3     12/13/01 7:01p Patrick $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/hanim.h                                $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 12/13/01 6:54p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/hanim.h                                $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 12/13/01 6:54p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HANIM_H
-#define HANIM_H
 
 #include "always.h"
 #include "quat.h"
-#include "refcount.h"
 #include "w3d_file.h"
 #include "hash.h"
 #include "mempool.h"
-#include <refcount.h>
-#include <SLIST.H>
-#include <Vector.H>
+#include <SLIST.h>
+#include <Vector.h>
 
 struct NodeMotionStruct;
 class MotionChannelClass;
@@ -70,12 +62,12 @@ class HTreeClass;
 
 	This is the base class for all animation formats used in W3D.  It
 	contains the virtual interface that all animations must support.
-	
+
 **********************************************************************************/
 class HAnimClass : public RefCountClass, public	HashableClass
 {
 public:
-	enum 
+	enum
 	{
 		CLASSID_UNKNOWNANIM	= 0xFFFFFFFF,
 		CLASSID_HRAWANIM		= 0,
@@ -95,11 +87,7 @@ class HAnimClass : public RefCountClass, public	HashableClass
 	virtual float				Get_Frame_Rate() = 0;
 	virtual float				Get_Total_Time() = 0;
 
-//	virtual Vector3			Get_Translation(int pividx,float frame) = 0;
-//	virtual Quaternion		Get_Orientation(int pividx,float frame) = 0;
 	// Jani: Changed to pass in reference of destination to avoid copying
-	virtual void				Get_Translation(int pividx,float frame) {}	// todo: remove
-	virtual void				Get_Orientation(int pividx,float frame) {}	// todo: remove
 	virtual void				Get_Translation(Vector3& translation, int pividx,float frame) const = 0;
 	virtual void				Get_Orientation(Quaternion& orientation, int pividx,float frame) const = 0;
 	virtual void				Get_Transform(Matrix3D&, int pividx, float frame) const = 0;
@@ -122,7 +110,7 @@ class HAnimClass : public RefCountClass, public	HashableClass
 	virtual int					Get_Embedded_Sound_Bone_Index() {return EmbeddedSoundBoneIndex;}
 
 protected:
-	int EmbeddedSoundBoneIndex;					
+	int EmbeddedSoundBoneIndex;
 };
 
 
@@ -161,8 +149,8 @@ class NamedPivotMapClass : public PivotMapClass
 
 	// This info is packaged into a struct to minimize DynamicVectorClass overhead
 	struct WeightInfoStruct {
-		WeightInfoStruct() : Name(0) {}
-		~WeightInfoStruct() { if(Name) delete [] Name; } 
+		WeightInfoStruct() : Name(NULL) {}
+		~WeightInfoStruct() { delete [] Name; }
 
 		char *Name;
 		float Weight;
@@ -193,11 +181,11 @@ class HAnimComboDataClass : public AutoPoolClass<HAnimComboDataClass,256> {
 		void Set_HAnim(HAnimClass *motion);
 		void Give_HAnim(HAnimClass *motion) { if(HAnim) HAnim->Release_Ref(); HAnim = motion; }	// used for giving this object the reference
 
-		void Set_Frame(float frame)		{ PrevFrame = Frame; Frame = frame; }		
+		void Set_Frame(float frame)		{ PrevFrame = Frame; Frame = frame; }
 		void Set_Prev_Frame(float frame)	{ PrevFrame = frame; }
 		void Set_Weight(float weight)		{ Weight = weight; }
 		void Set_Pivot_Map(PivotMapClass *map);
-		
+
 
 		HAnimClass * Peek_HAnim(void)				const { return HAnim; }	// note: does not add reference
 		HAnimClass * Get_HAnim(void)				const { if(HAnim) HAnim->Add_Ref(); return HAnim; }	// note: does not add reference
@@ -255,12 +243,12 @@ class HAnimComboClass {
 	PivotMapClass	* Peek_Pivot_Weight_Map( int indx );
 
 
-	// add an entry to the dynamic vector 
+	// add an entry to the dynamic vector
 	void Append_Anim_Combo_Data(HAnimComboDataClass * AnimComboData);
 
 	// remove an entry from the vector
 	void Remove_Anim_Combo_Data(HAnimComboDataClass * AnimComboData);
-	
+
 	// retrieve a specific combo data
 	HAnimComboDataClass * Peek_Anim_Combo_Data(int index) { return HAnimComboData[index]; }
 
@@ -269,5 +257,3 @@ class HAnimComboClass {
 	DynamicVectorClass<HAnimComboDataClass *> HAnimComboData;
 
 };
-
-#endif 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp
index dc0eecf81ce..6813ca07851 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp
@@ -17,32 +17,32 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/hcanim.cpp 3     6/29/01 6:41p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/hcanim.cpp                             $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 6/27/01 7:50p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/hcanim.cpp                             $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 6/27/01 7:50p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   NodeMotionStruct::NodeMotionStruct -- constructor                                         *
  *   NodeMotionStruct::~NodeMotionStruct -- destructor                                         *
- *   HCompressedAnimClass::HCompressedAnimClass -- constructor                                 * 
- *   HCompressedAnimClass::~HCompressedAnimClass -- Destructor                                 * 
- *   HCompressedAnimClass::Free -- De-allocates all memory in use                              * 
- *   HCompressedAnimClass::Load -- Loads hierarchy animation from a file                       * 
- *   HCompressedAnimClass::read_channel -- Reads in a single channel of motion                 * 
- *   HCompressedAnimClass::add_channel -- Adds a motion channel to the animation               * 
- *   HCompressedAnimClass::Get_Translation -- returns the translation vector for the given fram* 
- *   HCompressedAnimClass::Get_Orientation -- returns a quaternion for the orientation of the p* 
+ *   HCompressedAnimClass::HCompressedAnimClass -- constructor                                 *
+ *   HCompressedAnimClass::~HCompressedAnimClass -- Destructor                                 *
+ *   HCompressedAnimClass::Free -- De-allocates all memory in use                              *
+ *   HCompressedAnimClass::Load -- Loads hierarchy animation from a file                       *
+ *   HCompressedAnimClass::read_channel -- Reads in a single channel of motion                 *
+ *   HCompressedAnimClass::add_channel -- Adds a motion channel to the animation               *
+ *   HCompressedAnimClass::Get_Translation -- returns the translation vector for the given fram*
+ *   HCompressedAnimClass::Get_Orientation -- returns a quaternion for the orientation of the p*
  *   HCompressedAnimClass::read_bit_channel -- read a bit channel from the file                *
  *   HCompressedAnimClass::add_bit_channel -- install a bit channel into the animation         *
  *   HCompressedAnimClass::Get_Visibility -- return visibility state for given pivot/frame     *
@@ -56,7 +56,6 @@
 #include "chunkio.h"
 #include "w3d_file.h"
 #include "wwdebug.h"
-#include <string.h>
 #include <nstrdup.h>
 
 
@@ -108,7 +107,7 @@ struct NodeCompressedMotionStruct
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-NodeCompressedMotionStruct::NodeCompressedMotionStruct() : 
+NodeCompressedMotionStruct::NodeCompressedMotionStruct() :
 	Vis(NULL)
 {
 		vd.X = NULL;
@@ -137,38 +136,38 @@ NodeCompressedMotionStruct::~NodeCompressedMotionStruct()
 
 	switch (Flavor) {
 		case ANIM_FLAVOR_TIMECODED:
-			if (tc.X) delete tc.X;
-			if (tc.Y) delete tc.Y;
-			if (tc.Z) delete tc.Z;
-			if (tc.Q) delete tc.Q;
+			delete tc.X;
+			delete tc.Y;
+			delete tc.Z;
+			delete tc.Q;
 			break;
 		case ANIM_FLAVOR_ADAPTIVE_DELTA:
-			if (ad.X) delete ad.X;
-			if (ad.Y) delete ad.Y;
-			if (ad.Z) delete ad.Z;
-			if (ad.Q) delete ad.Q;
+			delete ad.X;
+			delete ad.Y;
+			delete ad.Z;
+			delete ad.Q;
 			break;
 		default:
 			WWASSERT(0);	// unknown flavor
 			break;
 	}
 
-	if (Vis) delete Vis;
+	delete Vis;
 
-}  // ~NodeCompressedMotionStruct
+}
 
 
-/*********************************************************************************************** 
- * HCompressedAnimClass::HCompressedAnimClass -- constructor                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HCompressedAnimClass::HCompressedAnimClass -- constructor                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HCompressedAnimClass::HCompressedAnimClass(void) :
 	NumFrames(0),
@@ -182,17 +181,17 @@ HCompressedAnimClass::HCompressedAnimClass(void) :
 }
 
 
-/*********************************************************************************************** 
- * HCompressedAnimClass::~HCompressedAnimClass -- Destructor                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HCompressedAnimClass::~HCompressedAnimClass -- Destructor                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HCompressedAnimClass::~HCompressedAnimClass(void)
 {
@@ -200,42 +199,41 @@ HCompressedAnimClass::~HCompressedAnimClass(void)
 }
 
 
-/*********************************************************************************************** 
- * HCompressedAnimClass::Free -- De-allocates all memory in use                                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HCompressedAnimClass::Free -- De-allocates all memory in use                                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HCompressedAnimClass::Free(void)
 {
-	if (NodeMotion != NULL) {
-		delete[] NodeMotion;
-	}
+	delete[] NodeMotion;
+	NodeMotion = NULL;
 }
 
 
-/*********************************************************************************************** 
- * HCompressedAnimClass::Load -- Loads hierarchy animation from a file                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HCompressedAnimClass::Load -- Loads hierarchy animation from a file                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HCompressedAnimClass::Load_W3D(ChunkLoadClass & cload)
 {
 	int i = 0;
-	/* 
+	/*
 	** First make sure we release any memory in use
 	*/
 	Free();
@@ -257,15 +255,17 @@ int HCompressedAnimClass::Load_W3D(ChunkLoadClass & cload)
 
 	cload.Close_Chunk();
 
-	strcpy(Name,aheader.HierarchyName);
-	strcat(Name,".");
-	strcat(Name,aheader.Name);
+	static_assert(ARRAY_SIZE(Name) >= ARRAY_SIZE(aheader.HierarchyName), "Incorrect array size");
+	strcpy(Name, aheader.HierarchyName);
+	strlcat(Name, ".", ARRAY_SIZE(Name));
+	strlcat(Name, aheader.Name, ARRAY_SIZE(Name));
 
 	// TSS chasing crash bug 05/26/99
    WWASSERT(HierarchyName != NULL);
    WWASSERT(aheader.HierarchyName != NULL);
    WWASSERT(sizeof(HierarchyName) >= W3D_NAME_LEN);
-   strncpy(HierarchyName,aheader.HierarchyName,W3D_NAME_LEN);
+	 static_assert(ARRAY_SIZE(HierarchyName) >= ARRAY_SIZE(aheader.HierarchyName), "Incorrect array size");
+	 strcpy(HierarchyName, aheader.HierarchyName);
 
 	HTreeClass * base_pose = WW3DAssetManager::Get_Instance()->Get_HTree(HierarchyName);
 	if (base_pose == NULL) {
@@ -276,8 +276,8 @@ int HCompressedAnimClass::Load_W3D(ChunkLoadClass & cload)
 	NumFrames = aheader.NumFrames;
 	FrameRate = aheader.FrameRate;
 	Flavor    = aheader.Flavor;
-  																					
-	// Just for now                                          
+
+	// Just for now
 	WWASSERT((Flavor == ANIM_FLAVOR_TIMECODED)||(Flavor == ANIM_FLAVOR_ADAPTIVE_DELTA));
 
 	NodeMotion = W3DNEWARRAY NodeCompressedMotionStruct[ NumNodes ];
@@ -306,19 +306,19 @@ int HCompressedAnimClass::Load_W3D(ChunkLoadClass & cload)
 				switch ( Flavor ) {
 
 					case ANIM_FLAVOR_TIMECODED:
-						
+
 						if (!read_channel(cload,&tc_chan)) {
 							goto Error;
-						}			
+						}
 						if (tc_chan->Get_Pivot() < NumNodes) {
 							add_channel(tc_chan);
 						} else {
-							// PWG 12-14-98: we have only allocated space for NumNode pivots.  
+							// PWG 12-14-98: we have only allocated space for NumNode pivots.
 							// If we have an index thats equal or higher than NumNode we are
 							// gonna trash memory.  Boy will we trash memory.
 							// GTH 09-25-2000: print a warning and survive this error
 							delete tc_chan;
-							WWDEBUG_SAY(("ERROR! animation %s indexes a bone not present in the model. Please re-export!\r\n",Name));
+							WWDEBUG_SAY(("ERROR! animation %s indexes a bone not present in the model. Please re-export!",Name));
 						}
 
 						break;
@@ -326,21 +326,21 @@ int HCompressedAnimClass::Load_W3D(ChunkLoadClass & cload)
 					case ANIM_FLAVOR_ADAPTIVE_DELTA:
 						if (!read_channel(cload,&ad_chan)) {
 							goto Error;
-						}			
+						}
 						if (ad_chan->Get_Pivot() < NumNodes) {
 							add_channel(ad_chan);
 						} else {
-							// PWG 12-14-98: we have only allocated space for NumNode pivots.  
+							// PWG 12-14-98: we have only allocated space for NumNode pivots.
 							// If we have an index thats equal or higher than NumNode we are
 							// gonna trash memory.  Boy will we trash memory.
 							// GTH 09-25-2000: print a warning and survive this error
 							delete ad_chan;
-							WWDEBUG_SAY(("ERROR! animation %s indexes a bone not present in the model. Please re-export!\r\n",Name));
+							WWDEBUG_SAY(("ERROR! animation %s indexes a bone not present in the model. Please re-export!",Name));
 						}
 						break;
 				}
 				break;
-	
+
 			case W3D_CHUNK_COMPRESSED_BIT_CHANNEL:
 				if (!read_bit_channel(cload,&newbitchan)) {
 					goto Error;
@@ -348,12 +348,12 @@ int HCompressedAnimClass::Load_W3D(ChunkLoadClass & cload)
 				if (newbitchan->Get_Pivot() < NumNodes) {
 					add_bit_channel(newbitchan);
 				} else {
-					// PWG 12-14-98: we have only allocated space for NumNode pivots.  
+					// PWG 12-14-98: we have only allocated space for NumNode pivots.
 					// If we have an index thats equal or higher than NumNode we are
 					// gonna trash memory.  Boy will we trash memory.
 					// GTH 09-25-2000: print a warning and survive this error
 					delete newbitchan;
-					WWDEBUG_SAY(("ERROR! animation %s indexes a bone not present in the model. Please re-export!\r\n",Name));
+					WWDEBUG_SAY(("ERROR! animation %s indexes a bone not present in the model. Please re-export!",Name));
 				}
 
 				break;
@@ -371,50 +371,50 @@ int HCompressedAnimClass::Load_W3D(ChunkLoadClass & cload)
 	Free();
 	return LOAD_ERROR;
 
-}	 // Load_W3D
-
-/*********************************************************************************************** 
- * HCompressedAnimClass::read_channel -- Reads in a single channel of motion                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+}
+
+/***********************************************************************************************
+ * HCompressedAnimClass::read_channel -- Reads in a single channel of motion                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool HCompressedAnimClass::read_channel(ChunkLoadClass & cload,TimeCodedMotionChannelClass * * newchan)
 {
 	*newchan = W3DNEW TimeCodedMotionChannelClass;
-	bool result = (*newchan)->Load_W3D(cload);	
-	
+	bool result = (*newchan)->Load_W3D(cload);
+
 	return result;
-  
-}	// read_channel
+
+}
 
 bool HCompressedAnimClass::read_channel(ChunkLoadClass & cload,AdaptiveDeltaMotionChannelClass * * newchan)
 {
 	*newchan = W3DNEW AdaptiveDeltaMotionChannelClass;
-	bool result = (*newchan)->Load_W3D(cload);	
-	
+	bool result = (*newchan)->Load_W3D(cload);
+
 	return result;
-  
-}	// read_channel
-
-
-/*********************************************************************************************** 
- * HCompressedAnimClass::add_channel -- Adds a motion channel to the animation                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+
+}
+
+
+/***********************************************************************************************
+ * HCompressedAnimClass::add_channel -- Adds a motion channel to the animation                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HCompressedAnimClass::add_channel(TimeCodedMotionChannelClass * newchan)
 {
@@ -439,7 +439,7 @@ void HCompressedAnimClass::add_channel(TimeCodedMotionChannelClass * newchan)
 			break;
 	}
 
-}	// add_channel
+}
 
 void HCompressedAnimClass::add_channel(AdaptiveDeltaMotionChannelClass * newchan)
 {
@@ -464,7 +464,7 @@ void HCompressedAnimClass::add_channel(AdaptiveDeltaMotionChannelClass * newchan
 			break;
 	}
 
-}	// add_channel
+}
 
 
 
@@ -484,11 +484,11 @@ void HCompressedAnimClass::add_channel(AdaptiveDeltaMotionChannelClass * newchan
 bool HCompressedAnimClass::read_bit_channel(ChunkLoadClass & cload,TimeCodedBitChannelClass * * newchan)
 {
 	*newchan = W3DNEW TimeCodedBitChannelClass;
-	bool result = (*newchan)->Load_W3D(cload);	
+	bool result = (*newchan)->Load_W3D(cload);
 
-	return result;		 
-  
-}	// read_bit_channel
+	return result;
+
+}
 
 
 /***********************************************************************************************
@@ -515,22 +515,22 @@ void HCompressedAnimClass::add_bit_channel(TimeCodedBitChannelClass * newchan)
 	}
 }
 
-/*********************************************************************************************** 
- * HCompressedAnimClass::Get_Translation -- returns the translation vector for the given frame * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HCompressedAnimClass::Get_Translation -- returns the translation vector for the given frame *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HCompressedAnimClass::Get_Translation( Vector3& trans, int pividx, float frame ) const
 {
 	struct NodeCompressedMotionStruct * motion = &NodeMotion[pividx];
-	  
+
 	trans=Vector3(0,0,0);
 
 	switch(Flavor) {
@@ -550,20 +550,20 @@ void HCompressedAnimClass::Get_Translation( Vector3& trans, int pividx, float fr
 	}
 }
 
-/*********************************************************************************************** 
- * HCompressedAnimClass::Get_Orientation -- returns a quaternion for the orientation of the    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HCompressedAnimClass::Get_Orientation -- returns a quaternion for the orientation of the    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HCompressedAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) const
-{		
+{
 	switch(Flavor) {
 		case ANIM_FLAVOR_TIMECODED:
 			if (NodeMotion[pividx].tc.Q) q = NodeMotion[pividx].tc.Q->Get_QuatVector(frame);
@@ -577,24 +577,24 @@ void HCompressedAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame
 			WWASSERT(0); // unknown flavor
 			break;
 	}
-} // Get_Orientation
-
-/*********************************************************************************************** 
- * HCompressedAnimClass::Get_Transform -- returns the transform matrix for the given frame	  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+}
+
+/***********************************************************************************************
+ * HCompressedAnimClass::Get_Transform -- returns the transform matrix for the given frame	  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HCompressedAnimClass::Get_Transform( Matrix3D& mtx, int pividx, float frame ) const
 {
 	struct NodeCompressedMotionStruct * motion = &NodeMotion[pividx];
-	  
+
 	switch(Flavor) {
 		case ANIM_FLAVOR_TIMECODED:
 			if (NodeMotion[pividx].tc.Q) {
@@ -638,7 +638,7 @@ void HCompressedAnimClass::Get_Transform( Matrix3D& mtx, int pividx, float frame
  *   1/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 bool HCompressedAnimClass::Get_Visibility(int pividx,float frame)
-{		
+{
 
 	if (NodeMotion[pividx].Vis != NULL) {
 		return (NodeMotion[pividx].Vis->Get_Bit((int)frame) == 1);
@@ -663,7 +663,7 @@ bool HCompressedAnimClass::Get_Visibility(int pividx,float frame)
  * HISTORY:                                                                                    *
  *   3/23/99    EHC : Created.                                                                 *
  *=============================================================================================*/
-bool HCompressedAnimClass::Is_Node_Motion_Present(int pividx) 
+bool HCompressedAnimClass::Is_Node_Motion_Present(int pividx)
 {
 	WWASSERT((pividx >= 0) && (pividx < NumNodes));
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h
index ca34de3a3c0..ad8cb6a4f42 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h
@@ -17,38 +17,31 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/hcanim.h 2     6/29/01 6:41p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/hcanim.h                               $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 6/27/01 7:35p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 2                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/hcanim.h                               $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 6/27/01 7:35p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HCANIM_H
-#define HCANIM_H
 
 #include "always.h"
 #include "quat.h"
-#include "refcount.h"
 #include "w3d_file.h"
-#include "SLIST.H"
-#include "Vector.H"
+#include "SLIST.h"
+#include "Vector.h"
 #include "hanim.h"
 
 struct NodeCompressedMotionStruct;
@@ -74,13 +67,13 @@ class HCompressedAnimClass : public HAnimClass
 {
 
 public:
-	
+
 	enum
 	{
 		OK,
 		LOAD_ERROR
 	};
-	
+
 	HCompressedAnimClass(void);
 	~HCompressedAnimClass(void);
 
@@ -93,8 +86,6 @@ class HCompressedAnimClass : public HAnimClass
 	float							Get_Total_Time() { return (float)NumFrames / FrameRate; }
 	int							Get_Flavor() { return Flavor; }
 
-//	Vector3						Get_Translation(int pividx,float frame);
-//	Quaternion					Get_Orientation(int pividx,float frame);
 	void							Get_Translation(Vector3& translation, int pividx,float frame) const;
 	void							Get_Orientation(Quaternion& orientation, int pividx,float frame) const;
 	void							Get_Transform(Matrix3D& transform, int pividx,float frame) const;
@@ -114,7 +105,7 @@ class HCompressedAnimClass : public HAnimClass
 
 	char							Name[2*W3D_NAME_LEN];
 	char							HierarchyName[W3D_NAME_LEN];
-	
+
 	int							NumFrames;
 	int							NumNodes;
 	int							Flavor;
@@ -122,7 +113,7 @@ class HCompressedAnimClass : public HAnimClass
 
 	NodeCompressedMotionStruct *		NodeMotion;
 
-	void Free(void);	
+	void Free(void);
 	bool read_channel(ChunkLoadClass & cload,TimeCodedMotionChannelClass * * newchan);
 	bool read_channel(ChunkLoadClass & cload,AdaptiveDeltaMotionChannelClass * * newchan);
 	void add_channel(TimeCodedMotionChannelClass * newchan);
@@ -133,7 +124,3 @@ class HCompressedAnimClass : public HAnimClass
 	void add_bit_channel(TimeCodedBitChannelClass * newchan);
 
 };
-
-
-#endif // hcanim.h
- 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H
deleted file mode 100644
index 034846b1820..00000000000
--- a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/hmdldef.h                              $*
- *                                                                                             *
- *                       Author:: Greg_h                                                       *
- *                                                                                             *
- *                     $Modtime:: 1/08/01 10:04a                                              $*
- *                                                                                             *
- *                    $Revision:: 1                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef HMDLDEF_H
-#define HMDLDEF_H
-
-#include "always.h"
-#include "w3d_file.h"
-
-class FileClass;
-class ChunkLoadClass;
-class ChunkSaveClass;
-class SnapPointsClass;
-
-/*
-** Each render object to be attached into the hierarchy model
-** will be defined by an instance of the following structure.
-** The HmdlNodeDefStruct associates a named render object with
-** an indexed pivot/bone in the hierarchy tree.
-*/
-struct HmdlNodeDefStruct
-{
-	char	RenderObjName[2*W3D_NAME_LEN];
-	int	PivotID;
-};
-
-
-/*
-**	HModelDefClass
-**
-**	"Hierarchy Model Definition Class"
-**	This class serves as a blueprint for creating HierarchyModelClasses.  
-**	The asset manager stores these objects internally and uses them to 
-**	create instances of HierarchyModels for the user.
-*/
-class HModelDefClass
-{
-
-public:
-	
-	enum {
-		OK,
-		LOAD_ERROR
-	};
-
-	HModelDefClass(void);
-	~HModelDefClass(void);
-
-	int				Load_W3D(ChunkLoadClass & cload);
-	const char *	Get_Name(void) const { return Name; }
-
-private:
-
-	char							Name[2*W3D_NAME_LEN];			// <basepose>.<modelname>
-	char							ModelName[W3D_NAME_LEN];		// name of the model
-	char							BasePoseName[W3D_NAME_LEN];	// name of the base pose (hierarchy tree)
-
-	int							SubObjectCount;
-	HmdlNodeDefStruct *		SubObjects;
-	SnapPointsClass *			SnapPoints;
-
-	void Free(void);
-	bool read_header(ChunkLoadClass & cload);
-	bool read_connection(ChunkLoadClass & cload,HmdlNodeDefStruct * con,bool pre30);
-	bool read_mesh_connection(ChunkLoadClass & cload,int idx,bool pre30);
-	bool read_collision_connection(ChunkLoadClass & cload,int idx,bool pre30);
-	bool read_skin_connection(ChunkLoadClass & cload,int idx,bool pre30);
-
-	// HModelClass requires intimate knowlege of us
-	friend class HModelClass;
-	friend class HLodClass;
-};
-
-#endif 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp
index c211a460540..0a344c8e123 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp
@@ -36,9 +36,8 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "hmdldef.H"
+#include "hmdldef.h"
 #include <assert.h>
-#include <string.h>
 #include "w3d_file.h"
 #include "chunkio.h"
 #include "snapPts.h"
@@ -64,41 +63,39 @@ HModelDefClass::HModelDefClass(void) :
 
 }
 
-/*********************************************************************************************** 
- * HModelDefClass::~HModelDefClass -- destructor                                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HModelDefClass::~HModelDefClass -- destructor                                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HModelDefClass::~HModelDefClass(void)
 {
 	Free();
 }
 
-/*********************************************************************************************** 
- * HModelDefClass::Free -- de-allocate all memory in use                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HModelDefClass::Free -- de-allocate all memory in use                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HModelDefClass::Free(void)
 {
-	if (SubObjects != NULL) {
-		delete[] SubObjects;
-		SubObjects = NULL;
-	}
+	delete[] SubObjects;
+	SubObjects = NULL;
 	SubObjectCount = 0;
 
 	if (SnapPoints != NULL) {
@@ -108,17 +105,17 @@ void HModelDefClass::Free(void)
 }
 
 
-/*********************************************************************************************** 
- * HModelDefClass::Load -- load a set of mesh connections from a file                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HModelDefClass::Load -- load a set of mesh connections from a file                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HModelDefClass::Load_W3D(ChunkLoadClass & cload)
 {
@@ -137,7 +134,7 @@ int HModelDefClass::Load_W3D(ChunkLoadClass & cload)
 	if (cload.Cur_Chunk_ID() != W3D_CHUNK_HMODEL_HEADER) {
 		goto Error;
 	}
-	
+
 	/*
 	** read in the header
 	*/
@@ -151,11 +148,12 @@ int HModelDefClass::Load_W3D(ChunkLoadClass & cload)
 	/*
 	** process the header info
 	*/
-	strncpy(ModelName,header.Name,W3D_NAME_LEN);
-	ModelName[W3D_NAME_LEN - 1] = 0;
-	strncpy(BasePoseName,header.HierarchyName,W3D_NAME_LEN);
-	BasePoseName[W3D_NAME_LEN-1] = 0;
-	strcpy(Name,ModelName);
+	static_assert(ARRAY_SIZE(ModelName) >= ARRAY_SIZE(header.Name), "Incorrect array size");
+	static_assert(ARRAY_SIZE(BasePoseName) >= ARRAY_SIZE(header.HierarchyName), "Incorrect array size");
+	static_assert(ARRAY_SIZE(Name) >= ARRAY_SIZE(ModelName), "Incorrect array size");
+	strcpy(ModelName, header.Name);
+	strcpy(BasePoseName, header.HierarchyName);
+	strcpy(Name, ModelName);
 
 	/*
 	** Just allocate a node for the number of sub objects we're expecting
@@ -168,10 +166,10 @@ int HModelDefClass::Load_W3D(ChunkLoadClass & cload)
 
 	/*
 	** If this is pre-3.0 set a flag so that each render object's
-	** bone id will be incremented by one to account for the new 
+	** bone id will be incremented by one to account for the new
 	** root node added with version3.0 of the file format.  Basically,
 	** I'm making all of the code assume that node 0 is the root and
-	** therefore, pre-3.0 files have to have it added and all of 
+	** therefore, pre-3.0 files have to have it added and all of
 	** the indices adjusted
 	*/
 	if (header.Version < W3D_MAKE_VERSION(3,0)) {
@@ -188,14 +186,14 @@ int HModelDefClass::Load_W3D(ChunkLoadClass & cload)
 		switch (cload.Cur_Chunk_ID()) {
 
 			case W3D_CHUNK_NODE:
-			case W3D_CHUNK_COLLISION_NODE: 
+			case W3D_CHUNK_COLLISION_NODE:
 			case W3D_CHUNK_SKIN_NODE:
 				if (!read_connection(cload,&(SubObjects[subobjcounter]),pre30)) {
 					goto Error;
-				}			
+				}
 				subobjcounter++;
 				break;
-				
+
 			case W3D_CHUNK_POINTS:
 				SnapPoints = W3DNEW SnapPointsClass;
 				SnapPoints->Load_W3D(cload);
@@ -212,34 +210,35 @@ int HModelDefClass::Load_W3D(ChunkLoadClass & cload)
 Error:
 
 	return LOAD_ERROR;
-	
+
 }
 
 
-/*********************************************************************************************** 
- * HModelDefClass::read_connection -- read a single connection from the file                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HModelDefClass::read_connection -- read a single connection from the file                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *   10/22/97   GH  : Check for mesh connections with PivotID=-1                               *
  *=============================================================================================*/
 bool HModelDefClass::read_connection(ChunkLoadClass & cload,HmdlNodeDefStruct * node,bool pre30)
 {
-	
+
 	W3dHModelNodeStruct con;
 	if (cload.Read(&con,sizeof(W3dHModelNodeStruct)) != sizeof(W3dHModelNodeStruct)) {
 		return false;
 	}
 
-	strcpy(node->RenderObjName,ModelName);
-	strcat(node->RenderObjName,".");
-	strcat(node->RenderObjName,con.RenderObjName);
+	static_assert(ARRAY_SIZE(node->RenderObjName) >= ARRAY_SIZE(ModelName), "Incorrect array size");
+	strcpy(node->RenderObjName, ModelName);
+	strlcat(node->RenderObjName, ".", ARRAY_SIZE(node->RenderObjName));
+	strlcat(node->RenderObjName, con.RenderObjName, ARRAY_SIZE(node->RenderObjName));
 
 	if (pre30) {
 		if (con.PivotIdx == 65535) {
@@ -251,7 +250,7 @@ bool HModelDefClass::read_connection(ChunkLoadClass & cload,HmdlNodeDefStruct *
 		assert(con.PivotIdx != 65535);
 		node->PivotID = con.PivotIdx;
 	}
-	
+
 	return true;
 }
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h
new file mode 100644
index 00000000000..a14060eabfc
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h
@@ -0,0 +1,104 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3D                                                         *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/hmdldef.h                              $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 1/08/01 10:04a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "always.h"
+#include "w3d_file.h"
+
+class FileClass;
+class ChunkLoadClass;
+class ChunkSaveClass;
+class SnapPointsClass;
+
+/*
+** Each render object to be attached into the hierarchy model
+** will be defined by an instance of the following structure.
+** The HmdlNodeDefStruct associates a named render object with
+** an indexed pivot/bone in the hierarchy tree.
+*/
+struct HmdlNodeDefStruct
+{
+	char	RenderObjName[2*W3D_NAME_LEN];
+	int	PivotID;
+};
+
+
+/*
+**	HModelDefClass
+**
+**	"Hierarchy Model Definition Class"
+**	This class serves as a blueprint for creating HierarchyModelClasses.
+**	The asset manager stores these objects internally and uses them to
+**	create instances of HierarchyModels for the user.
+*/
+class HModelDefClass
+{
+
+public:
+
+	enum {
+		OK,
+		LOAD_ERROR
+	};
+
+	HModelDefClass(void);
+	~HModelDefClass(void);
+
+	int				Load_W3D(ChunkLoadClass & cload);
+	const char *	Get_Name(void) const { return Name; }
+
+private:
+
+	char							Name[2*W3D_NAME_LEN];			// <basepose>.<modelname>
+	char							ModelName[W3D_NAME_LEN];		// name of the model
+	char							BasePoseName[W3D_NAME_LEN];	// name of the base pose (hierarchy tree)
+
+	int							SubObjectCount;
+	HmdlNodeDefStruct *		SubObjects;
+	SnapPointsClass *			SnapPoints;
+
+	void Free(void);
+	bool read_header(ChunkLoadClass & cload);
+	bool read_connection(ChunkLoadClass & cload,HmdlNodeDefStruct * con,bool pre30);
+	bool read_mesh_connection(ChunkLoadClass & cload,int idx,bool pre30);
+	bool read_collision_connection(ChunkLoadClass & cload,int idx,bool pre30);
+	bool read_skin_connection(ChunkLoadClass & cload,int idx,bool pre30);
+
+	// HModelClass requires intimate knowlege of us
+	friend class HModelClass;
+	friend class HLodClass;
+};
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp b/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp
index 5a06b81c50e..63bc8f9acd3 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp
@@ -17,32 +17,32 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/htree.cpp 14    10/01/01 6:07p Patrick $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/htree.cpp                              $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 10/01/01 6:06p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 14                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   HTreeClass::HTreeClass -- constructor                                                     *  
- *   HTreeClass::~HTreeClass -- destructor                                                     * 
- *   HTreeClass::Load -- loads a hierarchy tree from a file                                    * 
- *   HTreeClass::read_pivots -- reads the pivots out of a file                                 * 
- *   HTreeClass::Free -- de-allocate all memory in use                                         * 
- *   HTreeClass::Base_Update -- Computes the base pose transform for each pivot                * 
- *   HTreeClass::Anim_Update -- Computes the transform for each pivot with motion              * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/htree.cpp                              $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 10/01/01 6:06p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 14                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   HTreeClass::HTreeClass -- constructor                                                     *
+ *   HTreeClass::~HTreeClass -- destructor                                                     *
+ *   HTreeClass::Load -- loads a hierarchy tree from a file                                    *
+ *   HTreeClass::read_pivots -- reads the pivots out of a file                                 *
+ *   HTreeClass::Free -- de-allocate all memory in use                                         *
+ *   HTreeClass::Base_Update -- Computes the base pose transform for each pivot                *
+ *   HTreeClass::Anim_Update -- Computes the transform for each pivot with motion              *
  *   HTreeClass::Blend_Update -- computes each pivot as a blend of two anims                   *
  *   HTreeClass::Combo_Update -- compute each pivot's transform using an anim combo            *
- *   HTreeClass::Get_Transform -- returns the transformation for the desired pivot             * 
+ *   HTreeClass::Get_Transform -- returns the transformation for the desired pivot             *
  *   HTreeClass::Find_Bone -- Find a bone by name                                              *
  *   HTreeClass::Get_Bone_Name -- get the name of a bone from its index                        *
  *   HTreeClass::Update_Parent_Need_Bits -- all "needed" children force their parents to be nee*
@@ -54,7 +54,6 @@
 #include "htree.h"
 #include "hanim.h"
 #include "hcanim.h"
-#include <string.h>
 #include <assert.h>
 #include "wwmath.h"
 #include "chunkio.h"
@@ -62,18 +61,19 @@
 #include "wwmemlog.h"
 #include "hrawanim.h"
 #include "motchan.h"
+#include "ww3d.h"
 
-/*********************************************************************************************** 
- * HTreeClass::HTreeClass -- constructor                                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeClass::HTreeClass -- constructor                                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HTreeClass::HTreeClass(void) :
 	NumPivots(0),
@@ -103,17 +103,17 @@ void HTreeClass::Init_Default(void)
 
 }
 
-/*********************************************************************************************** 
- * HTreeClass::~HTreeClass -- destructor                                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeClass::~HTreeClass -- destructor                                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HTreeClass::~HTreeClass(void)
 {
@@ -150,7 +150,7 @@ HTreeClass::HTreeClass(const HTreeClass & src) :
 
 	for (int pi = 0; pi < NumPivots; pi++) {
 		Pivot[pi] = src.Pivot[pi];
-		
+
 		if (src.Pivot[pi].Parent != NULL) {
 			Pivot[pi].Parent = &(Pivot[src.Pivot[pi].Parent->Index]);
 		} else {
@@ -161,17 +161,17 @@ HTreeClass::HTreeClass(const HTreeClass & src) :
 	ScaleFactor = src.ScaleFactor;
 }
 
-/*********************************************************************************************** 
- * HTreeClass::Load -- loads a hierarchy tree from a file                                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeClass::Load -- loads a hierarchy tree from a file                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HTreeClass::Load_W3D(ChunkLoadClass & cload)
 {
@@ -186,7 +186,7 @@ int HTreeClass::Load_W3D(ChunkLoadClass & cload)
 		// ERROR: Expected Hierarchy Header
 		return LOAD_ERROR;
 	}
-	
+
 	W3dHierarchyStruct header;
 	if (cload.Read(&header,sizeof(W3dHierarchyStruct)) != sizeof(W3dHierarchyStruct)) {
 		return LOAD_ERROR;
@@ -204,7 +204,7 @@ int HTreeClass::Load_W3D(ChunkLoadClass & cload)
 		header.NumPivots ++;
 		pre30 = true;
 	}
-	
+
 	/*
 	** Allocate the array of pivots
 	*/
@@ -225,7 +225,7 @@ int HTreeClass::Load_W3D(ChunkLoadClass & cload)
 			case W3D_CHUNK_PIVOTS:
 				if (!read_pivots(cload,pre30)) {
 					goto Error;
-				}			
+				}
 				break;
 
 			default:
@@ -244,23 +244,23 @@ int HTreeClass::Load_W3D(ChunkLoadClass & cload)
 }
 
 
-/*********************************************************************************************** 
- * HTreeClass::read_pivots -- reads the pivots out of a file                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeClass::read_pivots -- reads the pivots out of a file                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool HTreeClass::read_pivots(ChunkLoadClass & cload,bool pre30)
 {
 	W3dPivotStruct piv;
 	Matrix3D mtx;
-	
+
 	int first_piv = 0;
 
 	/*
@@ -284,15 +284,15 @@ bool HTreeClass::read_pivots(ChunkLoadClass & cload,bool pre30)
 		}
 
 		memcpy(Pivot[pidx].Name,piv.Name,W3D_NAME_LEN);
-		Pivot[pidx].Index = pidx;		
+		Pivot[pidx].Index = pidx;
 
 		Pivot[pidx].BaseTransform.Make_Identity();
 		Pivot[pidx].BaseTransform.Translate(Vector3(piv.Translation.X,piv.Translation.Y,piv.Translation.Z));
 
 #ifdef ALLOW_TEMPORARIES
-		Pivot[pidx].BaseTransform = 
-			Pivot[pidx].BaseTransform * 
-			Build_Matrix3D( 
+		Pivot[pidx].BaseTransform =
+			Pivot[pidx].BaseTransform *
+			Build_Matrix3D(
 				Quaternion(
 							piv.Rotation.Q[0],
 							piv.Rotation.Q[1],
@@ -302,8 +302,8 @@ bool HTreeClass::read_pivots(ChunkLoadClass & cload,bool pre30)
 				mtx
 			);
 #else
-		Pivot[pidx].BaseTransform.postMul( 
-			Build_Matrix3D( 
+		Pivot[pidx].BaseTransform.postMul(
+			Build_Matrix3D(
 				Quaternion(
 							piv.Rotation.Q[0],
 							piv.Rotation.Q[1],
@@ -343,24 +343,22 @@ bool HTreeClass::read_pivots(ChunkLoadClass & cload,bool pre30)
 }
 
 
-/*********************************************************************************************** 
- * HTreeClass::Free -- de-allocate all memory in use                                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeClass::Free -- de-allocate all memory in use                                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HTreeClass::Free(void)
 {
-	if (Pivot != NULL) {
-		delete[] Pivot;
-		Pivot = NULL;
-	}
+	delete[] Pivot;
+	Pivot = NULL;
 	NumPivots = 0;
 
 	// Also clean up other members:
@@ -368,20 +366,20 @@ void HTreeClass::Free(void)
 }
 
 
-/*********************************************************************************************** 
+/***********************************************************************************************
  * HTreeClass::Simple_Evaluate_Pivot -- Returns the transform of a pivot at the given frame.	  *
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   04/13/2000 PDS  : Created.                                                                * 
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   04/13/2000 PDS  : Created.                                                                *
  *=============================================================================================*/
 bool HTreeClass::Simple_Evaluate_Pivot
-(	
+(
 	HAnimClass *		motion,
 	int					pivot_index,
 	float					frame,
@@ -440,34 +438,34 @@ bool HTreeClass::Simple_Evaluate_Pivot
 		//	Transform the return value by the object's transform
 		//
 #ifdef ALLOW_TEMPORARIES
-		Matrix3D::Multiply (obj_tm, *end_tm, end_tm);		
+		Matrix3D::Multiply (obj_tm, *end_tm, end_tm);
 #else
 			end_tm->preMul(obj_tm);
 #endif
 
 		// Success!
 		retval = true;
-	}	
+	}
 
 	return retval;
 }
 
 
 
-/*********************************************************************************************** 
+/***********************************************************************************************
  * HTreeClass::Simple_Evaluate_Pivot -- Returns the transform of a pivot at the given frame.	  *
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   04/13/2000 PDS  : Created.                                                                * 
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   04/13/2000 PDS  : Created.                                                                *
  *=============================================================================================*/
 bool HTreeClass::Simple_Evaluate_Pivot
-(	
+(
 	int					pivot_index,
 	const Matrix3D &	obj_tm,
 	Matrix3D *			end_tm
@@ -508,25 +506,25 @@ bool HTreeClass::Simple_Evaluate_Pivot
 		//
 		//	Transform the return value by the object's transform
 		//
-		Matrix3D::Multiply (obj_tm, *end_tm, end_tm);		
+		Matrix3D::Multiply (obj_tm, *end_tm, end_tm);
 		retval = true;
-	}	
+	}
 
 	return retval;
 }
 
 
-/*********************************************************************************************** 
- * HTreeClass::Base_Update -- Computes the base pose transform for each pivot                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeClass::Base_Update -- Computes the base pose transform for each pivot                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HTreeClass::Base_Update(const Matrix3D & root)
 {
@@ -536,9 +534,9 @@ void HTreeClass::Base_Update(const Matrix3D & root)
 	Pivot[0].IsVisible = true;
 
 	for (int piv_idx=1; piv_idx < NumPivots; piv_idx++) {
-		
+
 		pivot = &Pivot[piv_idx];
-		
+
 		assert(pivot->Parent != NULL);
 		Matrix3D::Multiply(pivot->Parent->Transform, pivot->BaseTransform, &(pivot->Transform));
 		pivot->IsVisible = 1;
@@ -547,17 +545,17 @@ void HTreeClass::Base_Update(const Matrix3D & root)
 	}
 }
 
-/*********************************************************************************************** 
- * HTreeClass::Anim_Update -- Computes the transform for each pivot with motion                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeClass::Anim_Update -- Computes the transform for each pivot with motion                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HTreeClass::Anim_Update(const Matrix3D & root,HAnimClass * motion,float frame)
 {
@@ -575,10 +573,10 @@ void HTreeClass::Anim_Update(const Matrix3D & root,HAnimClass * motion,float fra
 		// base pose
 		assert(pivot->Parent != NULL);
 		Matrix3D::Multiply(pivot->Parent->Transform, pivot->BaseTransform, &(pivot->Transform));
-			
+
 		// Don't update this pivot if the HTree doesn't have animation data for it...
 		if (piv_idx < num_anim_pivots) {
-			
+
 			// animation
 			Vector3 trans;
 			motion->Get_Translation(trans,piv_idx,frame);
@@ -598,18 +596,26 @@ void HTreeClass::Anim_Update(const Matrix3D & root,HAnimClass * motion,float fra
 			pivot->IsVisible = motion->Get_Visibility(piv_idx,frame);
 		}
 
-		if (pivot->Is_Captured()) 
-		{ 
+		if (pivot->Is_Captured())
+		{
 			pivot->Capture_Update();
 			pivot->IsVisible = true;
-		} 
+		}
 	}
 }
-								
+
 /*Customized version of the above which excludes interpolation and assumes HRawAnimClass
 For use by 'Generals' -MW*/
-void HTreeClass::Anim_Update(const Matrix3D & root,HRawAnimClass * motion,float frame)
+void HTreeClass::Anim_Update_Without_Interpolation(const Matrix3D & root,HRawAnimClass * motion,float frame)
 {
+	if (WW3D::Get_Sync_Frame_Time() == 0 && (int)motion->Get_Frame_Rate() == WWSyncPerSecond)
+	{
+		// TheSuperHackers @tweak Keep the animation frame step in sync with the ww3d frame step if they can align.
+		// @todo This needs improving if the WWSyncPerSecond is changed or the animation frame rates can be larger.
+		static_assert(WWSyncPerSecond == 30, "This is currently catered to a 30 fps sync");
+		return;
+	}
+
 	PivotClass *pivot,*endpivot,*lastAnimPivot;
 
 	Pivot[0].Transform = root;
@@ -619,7 +625,7 @@ void HTreeClass::Anim_Update(const Matrix3D & root,HRawAnimClass * motion,float
 
 	//Get integer frame
 	int iframe=WWMath::Float_To_Long(frame);
-	if (iframe >= motion->Get_Num_Frames()) 
+	if (iframe >= motion->Get_Num_Frames())
 		iframe = 0;
 
 	Vector3 trans;
@@ -638,11 +644,11 @@ void HTreeClass::Anim_Update(const Matrix3D & root,HRawAnimClass * motion,float
 		// base pose
 		assert(pivot->Parent != NULL);
 		Matrix3D::Multiply(pivot->Parent->Transform, pivot->BaseTransform, &(pivot->Transform));
-			
+
 		// Don't update this pivot if the HTree doesn't have animation data for it...
 		if (pivot < lastAnimPivot)
 		{
-			
+
 			// animation
 			trans.Set(0.0f,0.0f,0.0f);
 			Matrix3D *xform=&pivot->Transform;
@@ -659,7 +665,7 @@ void HTreeClass::Anim_Update(const Matrix3D & root,HRawAnimClass * motion,float
 			else
 				xform->Translate(trans*ScaleFactor);
 
-			if (nodeMotion->Q != NULL) 
+			if (nodeMotion->Q != NULL)
 			{	nodeMotion->Q->Get_Vector_As_Quat(iframe, q);
 #ifdef ALLOW_TEMPORARIES
 				*xform = *xform * ::Build_Matrix3D(q,mtx);
@@ -675,13 +681,13 @@ void HTreeClass::Anim_Update(const Matrix3D & root,HRawAnimClass * motion,float
 				pivot->IsVisible=1;
 		}
 
-		if (pivot->Is_Captured()) 
-		{ 
+		if (pivot->Is_Captured())
+		{
 			pivot->Capture_Update();
 			pivot->IsVisible = true;
-		} 
+		}
 	}
-}								
+}
 
 
 /***********************************************************************************************
@@ -746,13 +752,13 @@ void HTreeClass::Blend_Update
 			pivot->IsVisible = (motion0->Get_Visibility(piv_idx,frame0) || motion1->Get_Visibility(piv_idx,frame1));
 		}
 
-		if (pivot->Is_Captured()) 
+		if (pivot->Is_Captured())
 		{
 			pivot->Capture_Update();
 			pivot->IsVisible = true;
-		} 
+		}
 	}
-}																							
+}
 
 
 
@@ -779,7 +785,7 @@ void HTreeClass::Combo_Update
 
 	Pivot[0].Transform = root;
 	Pivot[0].IsVisible = true;
-	
+
 	int num_anim_pivots = 100000;
 	for ( int anim_num = 0; anim_num < anim->Get_Num_Anims(); anim_num++ ) {
 		num_anim_pivots = MIN( num_anim_pivots, anim->Peek_Motion( anim_num )->Get_Num_Pivots() );
@@ -789,11 +795,11 @@ void HTreeClass::Combo_Update
 	}
 
 	for (int piv_idx=1; piv_idx < NumPivots; piv_idx++) {
-		
+
 		pivot = &Pivot[piv_idx];
 		assert(pivot->Parent != NULL);
 		Matrix3D::Multiply(pivot->Parent->Transform,pivot->BaseTransform,&(pivot->Transform));
-		
+
 		if (piv_idx < num_anim_pivots) {
 
 #define	ASSUME_NORMALIZED_ANIM_COMBO_WEIGHTS
@@ -845,7 +851,7 @@ void HTreeClass::Combo_Update
 							Fast_Slerp(q0, q0, q1, weight / weight_total );
 						}
 #else
-						q0 = q1;	
+						q0 = q1;
 						motion->Get_Orientation(q1, piv_idx, frame_num );
 						last_weight = weight;
 #endif
@@ -860,7 +866,7 @@ void HTreeClass::Combo_Update
 
 			if (weight_total != 0.0f ) {
 				// SKB: Removed assert because I have a case where I don't want normalization.
-				// 	  One anim moves X, the other moves Y.  Assert was just in to warn programmers.	
+				// 	  One anim moves X, the other moves Y.  Assert was just in to warn programmers.
 //				WWASSERT(WWMath::Fabs( weight_total - 1.0 ) < WWMATH_EPSILON);
 
 				pivot->Transform.Translate(trans);
@@ -872,7 +878,7 @@ void HTreeClass::Combo_Update
 			}
 #else
 			if (( weight_total != 0.0f ) && (wcount >= 2)) {
-			
+
 				pivot->Transform.Translate( trans / weight_total );
 				Quaternion q = Slerp_( q0, q1, last_weight / weight_total );
 				pivot->Transform = pivot->Transform * Build_Matrix3D(q);
@@ -898,13 +904,13 @@ void HTreeClass::Combo_Update
 			}
 		}
 
-		if (pivot->Is_Captured()) 
+		if (pivot->Is_Captured())
 		{
 			pivot->Capture_Update();
 			pivot->IsVisible = true;
 		}
 	}
-}						 
+}
 
 
 /***********************************************************************************************
@@ -1003,7 +1009,7 @@ void HTreeClass::Capture_Bone(int boneindex)
 	assert(boneindex >= 0);
 	assert(boneindex < NumPivots);
 #ifdef LAZY_CAP_MTX_ALLOC
-	if (Pivot[boneindex].CapTransformPtr == NULL) 
+	if (Pivot[boneindex].CapTransformPtr == NULL)
 	{
 		Pivot[boneindex].CapTransformPtr = MSGW3DNEW("PivotClassCaptureBoneMtx") DynamicMatrix3D;
 		Pivot[boneindex].CapTransformPtr->Mat.Make_Identity();
@@ -1018,11 +1024,8 @@ void HTreeClass::Release_Bone(int boneindex)
 	assert(boneindex >= 0);
 	assert(boneindex < NumPivots);
 #ifdef LAZY_CAP_MTX_ALLOC
-	if (Pivot[boneindex].CapTransformPtr) 
-	{
-		delete Pivot[boneindex].CapTransformPtr;
-		Pivot[boneindex].CapTransformPtr = NULL;
-	}
+	delete Pivot[boneindex].CapTransformPtr;
+	Pivot[boneindex].CapTransformPtr = NULL;
 #else
 	Pivot[boneindex].IsCaptured = false;
 #endif
@@ -1078,7 +1081,7 @@ HTreeClass * HTreeClass::Alter_Avatar_HTree( const HTreeClass *tree, Vector3 &sc
 	// below are ones that I will special case and scale them based on the Z-axis scaling factor instead of the Y-axis
 	// scaling factor.
 	const char * flip_list[] = { " RIGHTFOREARM", " RIGHTHAND", " LEFTFOREARM", " LEFTHAND", "RIGHTINDEX", "RIGHTFINGERS", "RIGHTTHUMB", "LEFTINDEX", "LEFTFINGERS", "LEFTTHUMB", 0 };
-		
+
 	// Clone the new tree with the tree that is passed in
 	HTreeClass * new_tree = new HTreeClass( *tree );
 
@@ -1086,11 +1089,11 @@ HTreeClass * HTreeClass::Alter_Avatar_HTree( const HTreeClass *tree, Vector3 &sc
 	for(int pi = 0; pi < new_tree->NumPivots; ++pi) {
 		PivotClass piv = tree->Pivot[pi];
 		Vector3 adjusted_scale = scale;
-		
+
 		// If there is no parent, skip
 		if(!piv.Parent) continue;
 
-		// If the pivot is on the flip list, use the Z scale to scale both the Z & Y axis 
+		// If the pivot is on the flip list, use the Z scale to scale both the Z & Y axis
 		int index = 0;
 		while(true) {
 			if(!flip_list[index]) {
@@ -1115,7 +1118,7 @@ HTreeClass * HTreeClass::Alter_Avatar_HTree( const HTreeClass *tree, Vector3 &sc
 		// Get the new desired vector in worldspace
 		Vector3 new_relative_vector = pivot_pos - pivot_parent_pos;
 
-		// Rotate the new vector by the pivot's parent's inverse transform to put it in local space 
+		// Rotate the new vector by the pivot's parent's inverse transform to put it in local space
 		new_relative_vector = parent_inverse_transform.Rotate_Vector(new_relative_vector);
 
 		// Store the final result in the new HTree
@@ -1160,10 +1163,10 @@ HTreeClass * HTreeClass::Create_Morphed(	int num_morph_sources,
 }
 
 // Create an HTree by Interpolating between others
-HTreeClass * HTreeClass::Create_Interpolated(	const HTreeClass * tree_a0_b0, 
-																const HTreeClass * tree_a0_b1, 
-																const HTreeClass * tree_a1_b0, 
-																const HTreeClass * tree_a1_b1, 
+HTreeClass * HTreeClass::Create_Interpolated(	const HTreeClass * tree_a0_b0,
+																const HTreeClass * tree_a0_b1,
+																const HTreeClass * tree_a1_b0,
+																const HTreeClass * tree_a1_b1,
 																float lerp_a, float lerp_b )
 {
 	assert( tree_a0_b0->NumPivots == tree_a0_b1->NumPivots );
@@ -1192,9 +1195,9 @@ HTreeClass * HTreeClass::Create_Interpolated(	const HTreeClass * tree_a0_b0,
 }
 
 // Create an HTree by Interpolating between others
-HTreeClass * HTreeClass::Create_Interpolated(const HTreeClass * tree_base, 
-														   const HTreeClass * tree_a, 
-														   const HTreeClass * tree_b, 
+HTreeClass * HTreeClass::Create_Interpolated(const HTreeClass * tree_base,
+														   const HTreeClass * tree_a,
+														   const HTreeClass * tree_b,
 														   float a_scale, float b_scale )
 {
 	WWMEMLOG(MEM_ANIMATION);
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/htree.h b/Core/Libraries/Source/WWVegas/WW3D2/htree.h
index 7b45e435cb1..a3a2e42b71c 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/htree.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.h
@@ -17,30 +17,25 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/htree.h 6     10/01/01 5:55p Patrick $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/htree.h                                $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 9/28/01 3:05p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 6                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/htree.h                                $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 9/28/01 3:05p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 6                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HTREE_H
-#define HTREE_H
 
 #include "always.h"
 #include "pivot.h"
@@ -64,7 +59,7 @@ class HRawAnimClass;
 	A hierarchy of coordinate systems in an initial
 	configuration.  All motion data is applied to one
 	of these objects.  Motion is stored as deltas from
-	the hierarchy tree's initial configuration.  
+	the hierarchy tree's initial configuration.
 
 	Normally, the user will probably not deal with
 	HTreeClasses; they are used internally
@@ -85,7 +80,7 @@ class HTreeClass : public W3DMPO
 	HTreeClass(void);
 	HTreeClass(const HTreeClass & src);
 	~HTreeClass(void);
-	
+
 	int					Load_W3D(ChunkLoadClass & cload);
 	void					Init_Default(void);
 
@@ -100,7 +95,7 @@ class HTreeClass : public W3DMPO
 	void					Anim_Update(		const Matrix3D &		root,
 													HAnimClass *			motion,
 													float						frame);
-	void					Anim_Update(const Matrix3D & root,HRawAnimClass * motion,float frame);
+	void					Anim_Update_Without_Interpolation(const Matrix3D & root,HRawAnimClass * motion,float frame);
 
 	void					Blend_Update(		const Matrix3D &		root,
 													HAnimClass *			motion0,
@@ -116,7 +111,7 @@ class HTreeClass : public W3DMPO
 	WWINLINE bool					Get_Visibility(int pivot) const;
 
 	WWINLINE const Matrix3D &	Get_Root_Transform(void) const;
-	
+
 	// User control over a bone.  While a bone is captured, you can over-ride the
 	// animation transform used by the bone.
 	void					Capture_Bone(int boneindex);
@@ -145,18 +140,18 @@ class HTreeClass : public W3DMPO
 	static HTreeClass *	Create_Morphed( int num_morph_sources,
 													 const float morph_weights[],
 													 const HTreeClass *tree_array[] );
-	
+
 	// Create an HTree by Interpolating between others
-	static HTreeClass	*	Create_Interpolated( const HTreeClass * tree_a0_b0, 
-														   const HTreeClass * tree_a0_b1, 
-														   const HTreeClass * tree_a1_b0, 
-														   const HTreeClass * tree_a1_b1, 
+	static HTreeClass	*	Create_Interpolated( const HTreeClass * tree_a0_b0,
+														   const HTreeClass * tree_a0_b1,
+														   const HTreeClass * tree_a1_b0,
+														   const HTreeClass * tree_a1_b1,
 														   float lerp_a, float lerp_b );
 
 	// Create an HTree by Interpolating between others
-	static HTreeClass	*	Create_Interpolated( const HTreeClass * tree_base, 
-														   const HTreeClass * tree_a, 
-														   const HTreeClass * tree_b, 
+	static HTreeClass	*	Create_Interpolated( const HTreeClass * tree_base,
+														   const HTreeClass * tree_a,
+														   const HTreeClass * tree_b,
 														   float a_scale, float b_scale );
 
 private:
@@ -166,7 +161,7 @@ class HTreeClass : public W3DMPO
 	PivotClass *		Pivot;
 	float					ScaleFactor;
 
-	void					Free(void);	
+	void					Free(void);
 	bool					read_pivots(ChunkLoadClass & cload,bool pre30);
 
 	friend class MeshClass;
@@ -187,17 +182,17 @@ WWINLINE bool HTreeClass::Get_Visibility(int pivot) const
 	return Pivot[pivot].IsVisible;
 }
 
-/*********************************************************************************************** 
- * HTreeClass::Get_Transform -- returns the transformation for the desired pivot               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeClass::Get_Transform -- returns the transformation for the desired pivot               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE const Matrix3D & HTreeClass::Get_Transform(int pivot) const
 {
@@ -206,7 +201,3 @@ WWINLINE const Matrix3D & HTreeClass::Get_Transform(int pivot) const
 
 	return Pivot[pivot].Transform;
 }
-
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp b/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp
index 2ad2ba3de8e..38fe2c904de 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp
@@ -40,7 +40,6 @@
 #include "camera.h"
 #include "scene.h"
 #include "intersec.inl"
-#include "Utility/CppMacros.h"
 
 
 //////////////////////////////////////////////////////////////////////
@@ -66,14 +65,14 @@ bool IntersectionClass::Intersect_RenderObject(RenderObjClass *RObj, Intersectio
 
 	return RObj->Intersect(this, FinalResult);
 }
-	
+
 // iterate through the layers of a world, front to back, returning true if/when an intersection
 // with an object occurs.
 bool IntersectionClass::Intersect_Screen_Point_Layer_Range
 (
 	float screen_x,
-	float screen_y, 
-	const LayerClass &TopLayer, 
+	float screen_y,
+	const LayerClass &TopLayer,
 	const LayerClass &BackLayer
 )
 {
@@ -91,7 +90,7 @@ bool IntersectionClass::Intersect_Screen_Point_Layer_Range
 			return true;
 
 		// if this is the back layer then that is all we need to test
-		if(Layer == &BackLayer) 
+		if(Layer == &BackLayer)
 			return false;
 
 		Layer = Layer->Next();
@@ -156,8 +155,8 @@ bool IntersectionClass::Intersect_Layer(const LayerClass &Layer, bool Test_All)
 
 
 void IntersectionClass::Append_Object_Array(
-	int MaxCount, 
-	int &CurrentCount, 
+	int MaxCount,
+	int &CurrentCount,
 	RenderObjClass **ObjectArray,
 	RenderObjClass *Object)
 {
@@ -166,7 +165,7 @@ void IntersectionClass::Append_Object_Array(
 		CurrentCount++;
 		return;
 	}
-	WWDEBUG_SAY(("IntersectionClass::Append_Object_Array - Too many objects\n"));
+	WWDEBUG_SAY(("IntersectionClass::Append_Object_Array - Too many objects"));
 }
 
 // determines if specified plane-intersection point (co-planar with polygon) is within the the passed polygon.
@@ -190,9 +189,9 @@ bool IntersectionClass::Intersect_Box(Vector3 &Box_Min, Vector3 &Box_Max, Inters
 	int counter;
 	float distance[PLANE_COUNT];
 	float candidate_plane[PLANE_COUNT];
-	
+
 	REGISTER Vector3 *intersection = &FinalResult->Intersection;
-	
+
 	// Find candidate planes and determine if the ray is outside the box
 	for (counter = 0; counter < PLANE_COUNT; counter++) {
 		if((*RayLocation)[counter] < Box_Min[counter]) {
@@ -209,13 +208,13 @@ bool IntersectionClass::Intersect_Box(Vector3 &Box_Min, Vector3 &Box_Max, Inters
 			}
 		}
 	}
-	
+
 	// check to see if the ray origin is inside bounding box
 	if(inside)	{
 		*intersection = *RayLocation;
 		return FinalResult->Intersects = true;
 	}
-	
+
 	// Calculate distances to candidate planes
 	for (counter = 0; counter < PLANE_COUNT; counter++) {
 		if ((quadrant[counter] != MIDDLE) && ((*RayDirection)[counter] != 0.0f))
@@ -229,10 +228,10 @@ bool IntersectionClass::Intersect_Box(Vector3 &Box_Min, Vector3 &Box_Max, Inters
 	for (counter = 1; counter < PLANE_COUNT; counter++) {
 		if (distance[nearest_plane] < distance[counter])
 			nearest_plane = counter;
-	}	
+	}
 
 	// Check to make sure the nearest plane is not behind the ray (inside box tested above)
-	if (distance[nearest_plane] < 0.0f) 
+	if (distance[nearest_plane] < 0.0f)
 		return FinalResult->Intersects = false;
 
 	for (counter = 0; counter < PLANE_COUNT; counter++) {
@@ -245,14 +244,14 @@ bool IntersectionClass::Intersect_Box(Vector3 &Box_Min, Vector3 &Box_Max, Inters
 		}
 	}
 	return FinalResult->Intersects = true; // ray hits box
-}	
+}
 
 
 // simply returns true if a ray hits the bounding sphere of any node in a hierarchy
 // note: Result will only contain range, not the intersection point/normal.
-bool IntersectionClass::Intersect_Hierarchy_Sphere_Quick(RenderObjClass *Hierarchy, IntersectionResultClass *FinalResult) 
+bool IntersectionClass::Intersect_Hierarchy_Sphere_Quick(RenderObjClass *Hierarchy, IntersectionResultClass *FinalResult)
 {
-	
+
 	int counter = Hierarchy->Get_Num_Sub_Objects();
 	while(counter--) {
 		RenderObjClass *obj = Hierarchy->Get_Sub_Object(counter);
@@ -266,7 +265,7 @@ bool IntersectionClass::Intersect_Hierarchy_Sphere_Quick(RenderObjClass *Hierarc
 // returns true if a ray hits the bounding sphere of any node in a hierarchy
 // note: Result will contain range and the intersection point/normal.
 bool IntersectionClass::Intersect_Hierarchy_Sphere(RenderObjClass *Hierarchy, IntersectionResultClass *FinalResult) {
-	
+
 	int counter = Hierarchy->Get_Num_Sub_Objects();
 	while(counter--) {
 		RenderObjClass *obj = Hierarchy->Get_Sub_Object(counter);
@@ -278,9 +277,9 @@ bool IntersectionClass::Intersect_Hierarchy_Sphere(RenderObjClass *Hierarchy, In
 }
 
 void IntersectionClass::Append_Hierarchy_Objects(
-	int MaxCount, 
-	int &CurrentCount, 
-	RenderObjClass **ObjectArray, 
+	int MaxCount,
+	int &CurrentCount,
+	RenderObjClass **ObjectArray,
 	RenderObjClass *Hierarchy,
 	bool Test_Bounding_Sphere,
 	bool Convex)
@@ -324,7 +323,7 @@ bool IntersectionClass::Intersect_Hierarchy(RenderObjClass *Hierarchy, Intersect
 	// make sure there's at least one sphere hit before continuing to more expensive tests below..
 	if(candidate_count == 0) {
 	//			OutputDebugString("/"); // no sphere intersections
-		return FinalResult->Intersects = false; 
+		return FinalResult->Intersects = false;
 	}
 
 	// note: Test_Bounding_Sphere argument is false because the Append_Hierarchy_Objects will have
@@ -358,8 +357,8 @@ RenderObjClass *IntersectionClass::Intersect_Sub_Object(float screenx, float scr
 bool IntersectionClass::Intersect_Object_Array(
 	int Object_Count,
 	RenderObjClass **ObjectArray,
-	IntersectionResultClass *FinalResult, 
-	bool Test_Bounding_Sphere, 
+	IntersectionResultClass *FinalResult,
+	bool Test_Bounding_Sphere,
 	bool Convex
 	)
 {
@@ -371,9 +370,9 @@ bool IntersectionClass::Intersect_Object_Array(
 bool IntersectionClass::Intersect_Object_Array(
 	int Object_Count,
 	RenderObjClass **ObjectArray,
-	IntersectionResultClass *FinalResult, 
+	IntersectionResultClass *FinalResult,
 	IntersectionResultClass *TemporaryResults,
-	bool Test_Bounding_Sphere, 
+	bool Test_Bounding_Sphere,
 	bool Convex
 	)
 {
@@ -395,7 +394,7 @@ bool IntersectionClass::Intersect_Object_Array(
 					nearest_index = counter;
 					counter = 0;
 				}
-			}		
+			}
 		} else {
 			while(counter--) {
 				hit = ObjectArray[counter]->Intersect(this, FinalResult);
@@ -403,7 +402,7 @@ bool IntersectionClass::Intersect_Object_Array(
 					nearest_index = counter;
 					counter = 0;
 				}
-			}		
+			}
 		}
 	} else {
 		if(Test_Bounding_Sphere) {
@@ -415,13 +414,13 @@ bool IntersectionClass::Intersect_Object_Array(
 		} else {
 			while(counter--) {
 				hit |= ObjectArray[counter]->Intersect(this, &TemporaryResults[counter]);
-			}		
+			}
 		}
 	}
 	// test to see if anything actually hit a mesh
 	if( ! hit ) {
-//		OutputDebugString("!"); // no mesh intersections 
-		return FinalResult->Intersects = false; 
+//		OutputDebugString("!"); // no mesh intersections
+		return FinalResult->Intersects = false;
 	}
 
 	if(! (Convex || ConvexTest)) {
@@ -436,7 +435,7 @@ bool IntersectionClass::Intersect_Object_Array(
 		}
 		Copy_Results(FinalResult, &TemporaryResults[nearest_index]);
 	}
-//	OutputDebugString("+");	
+//	OutputDebugString("+");
 //	Debug.Print("Mesh ", Object_Array[nearest_index]);
 //	Intersection_Node = candidate_indices[nearest_index];
 	return true;
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/intersec.h b/Core/Libraries/Source/WWVegas/WW3D2/intersec.h
index efc8a81738f..75b49640bd1 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/intersec.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/intersec.h
@@ -47,12 +47,7 @@
 
 */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef INTERSEC_H
-#define INTERSEC_H
 
 #include "always.h"
 #include "matrix3d.h"
@@ -68,11 +63,11 @@ typedef unsigned short POLYGONINDEX;
 /*
 **
 */
-class IntersectionResultClass 
+class IntersectionResultClass
 {
 public:
 	RenderObjClass *	IntersectedRenderObject;
-	POLYGONINDEX		IntersectedPolygon;       
+	POLYGONINDEX		IntersectedPolygon;
 
 	Matrix3D				ModelMatrix;		// this is required for transforming mesh normals from model coords
 	Vector3				ModelLocation;		// ditto
@@ -85,7 +80,7 @@ class IntersectionResultClass
 
 	enum INTERSECTION_TYPE {
 		NONE = 0,
-		GENERIC, 
+		GENERIC,
 		POLYGON
 	} IntersectionType;
 };
@@ -98,15 +93,15 @@ class IntersectionClass
 public:
 	enum {
 		MAX_POLY_INTERSECTION_COUNT = 1000, // arbitrary size of stack array used for storing intersection results within Intersect_Mesh(). Non-recursive function.
-		MAX_HIERARCHY_NODE_COUNT = 256			
+		MAX_HIERARCHY_NODE_COUNT = 256
 	};
-	
-	// this structure is used to store all intersections on the stack for sorting before 
+
+	// this structure is used to store all intersections on the stack for sorting before
 	// copying the nearest intersection to IntersectionClassObject->Result.
 	// note: the convex intersection functions return with the first intersection results.
 
 	Vector3 *RayLocation; // note: these pointers must be Set() to valid pointers by external code
-	Vector3 *RayDirection; 
+	Vector3 *RayDirection;
 	Vector3 *IntersectionNormal; // if non-zero then Process_Intersection_Results() will place the (perhaps vertex interpolated) surface normal here.
 
 	// 2d screen coordinates for use by Intersect_Screen_Point...() routines.
@@ -117,27 +112,27 @@ class IntersectionClass
 	// the normal since they are intended to be used to find the nearest of several intersections
 	// and interpolating the normal for intersections that are tossed would be wasteful.
 	// If you need the normal interpolated in that case anyways then call Interpolate_Normal().
-	bool InterpolateNormal; 
+	bool InterpolateNormal;
 
-	// if true, then perform potentially much faster convex intersection test which will return 
+	// if true, then perform potentially much faster convex intersection test which will return
 	// the first valid intersection. Generally used for producing silhouettes.
 	// If true, all intersections will be convex tests. If false, test mode will be determined (generally)
 	// by the render object or whatever called the intersection functions and passes the Convex argument.
 	bool ConvexTest;
-						
+
 	// do not consider intersections beyond this range as an intersection.
 	// Note: Get_Screen_Ray sets this to scene->zstop.
-	float MaxDistance; 
+	float MaxDistance;
 
 	// final intersection results are contained here
-	IntersectionResultClass Result; 
+	IntersectionResultClass Result;
 
 	//
 	// Implementation
 	//
 
 	// configures the member data to use the passed pointers
-	inline void Set(Vector3 *location, Vector3 *direction, Vector3 *intersection_normal, bool interpolate_normal, float max_distance, bool convex_test = false)
+	void Set(Vector3 *location, Vector3 *direction, Vector3 *intersection_normal, bool interpolate_normal, float max_distance, bool convex_test = false)
 	{
 		RayLocation = location;
 		RayDirection = direction;
@@ -148,11 +143,11 @@ class IntersectionClass
 	}
 
 
-	
+
 	// this constructor uses static variables for the location/direction/normal variables
-	// so can be only used one thread at a time unless the Set() function is used to 
+	// so can be only used one thread at a time unless the Set() function is used to
 	// set them to private vector3's
-	inline IntersectionClass()
+	IntersectionClass()
 	: ConvexTest(false)
 	{
 		RayLocation = &_RayLocation;
@@ -161,11 +156,11 @@ class IntersectionClass
 		Result.CollisionType=COLL_TYPE_ALL;	//added for 'Generals'. MW
 	}
 
-	
+
 	// This will be the most commonly used constructor
-	inline IntersectionClass(Vector3 *location, Vector3 *direction, Vector3 *intersection_normal, bool interpolate_normal = false, float max_distance = WWMATH_FLOAT_MAX, bool convex_test = false)
+	IntersectionClass(Vector3 *location, Vector3 *direction, Vector3 *intersection_normal, bool interpolate_normal = false, float max_distance = WWMATH_FLOAT_MAX, bool convex_test = false)
 	{
-		Set(location, direction, intersection_normal, interpolate_normal, max_distance, convex_test);	
+		Set(location, direction, intersection_normal, interpolate_normal, max_distance, convex_test);
 	}
 
 
@@ -173,7 +168,7 @@ class IntersectionClass
 
 
 	// this copy routine is used when the model coords are needed to be copied along with the other information.
-	inline void Copy_Results(IntersectionResultClass *Destination, IntersectionResultClass *Source) {
+	void Copy_Results(IntersectionResultClass *Destination, IntersectionResultClass *Source) {
 		Destination->ModelMatrix = Source->ModelMatrix;
 		Destination->ModelLocation = Source->ModelLocation;
 		Copy_Partial_Results(Destination, Source);
@@ -181,7 +176,7 @@ class IntersectionClass
 	}
 
 
-	inline void Copy_Results(IntersectionResultClass *Source) {
+	void Copy_Results(IntersectionResultClass *Source) {
 		Copy_Results(&Result, Source);
 	}
 
@@ -190,7 +185,7 @@ class IntersectionClass
 	// otherwise the results are copied into the request structure.
 	// This does not copy the matrix or location members; it is intended to be used during poly testing
 	// where these values are identical between results, or as a completion function for Copy_Results()
-	inline void Copy_Partial_Results(IntersectionResultClass *Destination, IntersectionResultClass *Source) 
+	void Copy_Partial_Results(IntersectionResultClass *Destination, IntersectionResultClass *Source)
 	{
 		Destination->IntersectedPolygon = Source->IntersectedPolygon;
 		Destination->Intersection = Source->Intersection;
@@ -203,13 +198,13 @@ class IntersectionClass
 
 
 	// used for creating temporary copies
-	inline IntersectionClass(IntersectionClass *source)
+	IntersectionClass(IntersectionClass *source)
 	{
 		*this = source;
 	}
 
 
-	inline IntersectionClass *operator =(IntersectionClass *source)
+	IntersectionClass *operator =(IntersectionClass *source)
 	{
 		Set(source->RayLocation, source->RayDirection, source->IntersectionNormal, source->InterpolateNormal, source->MaxDistance, source->ConvexTest);
 		Copy_Results(&source->Result);
@@ -225,11 +220,11 @@ class IntersectionClass
 	// this will only set the result's range if intersection occurs; it is intended to be used as a first pass intersection test
 	// before intersecting the mesh polygons itself.
 	// Note: Does NOT do Max_Distance testing
-	inline bool Intersect_Sphere_Quick(SphereClass &Sphere, IntersectionResultClass *FinalResult) 
+	bool Intersect_Sphere_Quick(SphereClass &Sphere, IntersectionResultClass *FinalResult)
 	{
 		// make a unit vector from the ray origin to the sphere center
 		Vector3 sphere_vector(Sphere.Center - *RayLocation);
-		
+
 		// get the dot product between the sphere_vector and the ray vector
 		FinalResult->Alpha = Vector3::Dot_Product(sphere_vector, *RayDirection);
 
@@ -243,9 +238,9 @@ class IntersectionClass
 
 
 	// this will find the intersection with the sphere and the intersection normal if needed.
-	inline bool Intersect_Sphere(SphereClass &Sphere, IntersectionResultClass *FinalResult) 
+	bool Intersect_Sphere(SphereClass &Sphere, IntersectionResultClass *FinalResult)
 	{
-		if(!Intersect_Sphere_Quick(Sphere, FinalResult)) 
+		if(!Intersect_Sphere_Quick(Sphere, FinalResult))
 			return false;
 
 		// determine range to intersection based on stored alpha/beta values
@@ -255,9 +250,9 @@ class IntersectionClass
 		if(FinalResult->Range > MaxDistance) return false;
 
 		FinalResult->Intersection = *RayLocation +  FinalResult->Range * (*RayDirection);
-		
+
 		if(IntersectionNormal != 0) {
-			(*IntersectionNormal) = FinalResult->Intersection - Sphere.Center;	
+			(*IntersectionNormal) = FinalResult->Intersection - Sphere.Center;
 		}
 		return true;
 	}
@@ -265,10 +260,10 @@ class IntersectionClass
 
 	// inline declarations
 	// Usage of these functions requires including intersec.inl
-	
+
 	// determine location & direction for projected screen coordinate ray
-	inline void Get_Screen_Ray(float ScreenX, float ScreenY, const LayerClass &Layer); 
-	
+	inline void Get_Screen_Ray(float ScreenX, float ScreenY, const LayerClass &Layer);
+
 	// uses the Result's range & the Ray_Direction to calculate the actual point of intersection.
 	inline void Calculate_Intersection(IntersectionResultClass *Result);
 
@@ -285,16 +280,16 @@ class IntersectionClass
 
 	/*
 	**	This function will fill the passed array with the set of points & uv values that represent
-	**	the boolean operation of the anding of the ClipPoints with the TrianglePoints. The UV values	
+	**	the boolean operation of the anding of the ClipPoints with the TrianglePoints. The UV values
 	**	provided for the TrianglePoints triangle are used to generate accurate UV values for any
 	**	new points created by this operation.
 	**	The clipped points have Z values that make them sit on the ClipPoints triangle plane.
 	*/
-	static inline int _Intersect_Triangles_Z(	
-		Vector3 ClipPoints[3], 
-		Vector3 TrianglePoints[3], 
+	static inline int _Intersect_Triangles_Z(
+		Vector3 ClipPoints[3],
+		Vector3 TrianglePoints[3],
 		Vector2 UV[3],
-		Vector3 ClippedPoints[6], 
+		Vector3 ClippedPoints[6],
 		Vector2 ClippedUV[6]
 	);
 
@@ -305,7 +300,7 @@ class IntersectionClass
 	static inline float _Get_Z_Elevation(Vector3 &Point, Vector3 &PlanePoint, Vector3 &PlaneNormal);
 
 
-	// test a 2d screen area with the intersection's screen coords, assigning a GENERIC intersection 
+	// test a 2d screen area with the intersection's screen coords, assigning a GENERIC intersection
 	// to the specified object.
 	inline bool Intersect_Screen_Object(IntersectionResultClass *Final_Result, Vector4 &Area, RenderObjClass *obj = 0);
 
@@ -337,7 +332,7 @@ class IntersectionClass
 	bool Intersect_Box(Vector3 &Box_Min, Vector3 &Box_Max, IntersectionResultClass *FinalResult);
 	bool Intersect_Hierarchy(RenderObjClass *Hierarchy, IntersectionResultClass *FinalResult, bool Test_Bounding_Sphere = true,  bool Convex = false);
 	bool Intersect_Hierarchy_Sphere(RenderObjClass *Hierarchy, IntersectionResultClass *FinalResult);
-	bool Intersect_Hierarchy_Sphere_Quick(RenderObjClass *Hierarchy, IntersectionResultClass *FinalResult); 
+	bool Intersect_Hierarchy_Sphere_Quick(RenderObjClass *Hierarchy, IntersectionResultClass *FinalResult);
 
 	/*
 	** Identifies exactly what sub object of a render object is under the screen space vector
@@ -378,7 +373,7 @@ class IntersectionClass
 		const Vector3 & de			// direction of clipping edge
 	);
 
-	static inline int Clip_Triangle_To_LineXY(	
+	static inline int Clip_Triangle_To_LineXY(
 		int incount,
 		Vector3 * InPoints,
 		Vector2 * InUVs,
@@ -399,6 +394,3 @@ class IntersectionClass
 	static Vector3 _RayLocation, _RayDirection, _IntersectionNormal;
 
 };
-
-
-#endif 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/intersec.inl b/Core/Libraries/Source/WWVegas/WW3D2/intersec.inl
index c69af52eb35..db4027ba455 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/intersec.inl
+++ b/Core/Libraries/Source/WWVegas/WW3D2/intersec.inl
@@ -17,9 +17,7 @@
 */
 
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
 #ifndef INTERSEC_INL
 #define INTERSEC_INL
@@ -43,7 +41,7 @@ inline bool Verify_Normal(Vector3 &Normal, Vector3 &loc1, Vector3 &loc2, Vector3
 	double e1 = d1 - d2;
 	double e2 = d2 - d3;
 	double e3 = d3 - d1;
-	
+
 	if((fabs(e1) > 0.001) || (fabs(e2) > 0.001) || (fabs(e3) > 0.001)) {
 		Debug.Print("----------\n");
 		Debug.Print("dots", Vector3(d1,d2,d3));
@@ -74,7 +72,7 @@ inline void Verify_Normal2(Vector3 &Normal, Vector3 &loc1, Vector3 &loc2, Vector
 //// end of debug code to toss
 
 /*
-**	Determine the ray that corresponds to the specified screen coordinates with respect 
+**	Determine the ray that corresponds to the specified screen coordinates with respect
 ** to the camera location, direction and projection information.
 */
 
@@ -93,7 +91,7 @@ inline void IntersectionClass::Get_Screen_Ray(float screen_x, float screen_y, co
 	Vector3 camera_location  = camera->Get_Position();
 
 	// the projected ray has the same origin as the camera
-	*RayLocation = camera_location; 
+	*RayLocation = camera_location;
 
 // these 6 lines worked for SR 1.1
 // build the projected screen vector
@@ -146,28 +144,28 @@ inline void IntersectionClass::Get_Screen_Ray(float screen_x, float screen_y, co
 **	If it is inside, it will adjust the Z value of the point to be on the triangle plane.
 */
 inline bool IntersectionClass::_Point_In_Polygon_Z(
-	Vector3 &Point, 
+	Vector3 &Point,
 	Vector3 &Corner1,
 	Vector3 &Corner2,
 	Vector3 &Corner3
-) 
+)
 {
 // these defines could be variables if support for other axis were neccessary
 #define AXIS_1 0
 #define AXIS_2 1
 #define AXIS_3 2
 
-	double u0 = Point[AXIS_1] - Corner1[AXIS_1]; 
+	double u0 = Point[AXIS_1] - Corner1[AXIS_1];
 	double v0 = Point[AXIS_2] - Corner1[AXIS_2];
 
 	// determine the 2d vectors on the dominant plane from the first vertex to the other two
-	double u1 = Corner2[AXIS_1] - Corner1[AXIS_1]; 
+	double u1 = Corner2[AXIS_1] - Corner1[AXIS_1];
 	double v1 = Corner2[AXIS_2] - Corner1[AXIS_2];
-	double u2 = Corner3[AXIS_1] - Corner1[AXIS_1]; 
+	double u2 = Corner3[AXIS_1] - Corner1[AXIS_1];
 	double v2 = Corner3[AXIS_2] - Corner1[AXIS_2];
 
 	double alpha, beta;
-	bool intersect = false; 
+	bool intersect = false;
 
 	// calculate alpha and beta as normalized (0..1) percentages across the 2d projected triangle
 	// and do bounds checking (sum <= 1)  to determine whether or not the triangle intersection occurs.
@@ -180,7 +178,7 @@ inline bool IntersectionClass::_Point_In_Polygon_Z(
 			// if alpha is valid & the sum of alpha & beta is <= 1 then it's within the triangle
 			// note:       0.00001 added after testing an intersection of a square in the middle indicated
 			// an error of 0.0000001350, apparently due to roundoff.
-			intersect = ((alpha >= 0.0) && ((alpha + beta) <= 1.0)); 
+			intersect = ((alpha >= 0.0) && ((alpha + beta) <= 1.0));
 	  }
 	} else {
 	  beta = (v0 * u1 - u0 * v1) / (v2 * u1 - u2 * v1);
@@ -206,9 +204,9 @@ inline bool IntersectionClass::_Point_In_Polygon_Z(
 **
 */
 inline bool IntersectionClass::_Point_In_Polygon_Z(
-	Vector3 &Point, 
+	Vector3 &Point,
 	Vector3 Corners[3]
-) 
+)
 {
 	return _Point_In_Polygon_Z(Point, Corners[0], Corners[1], Corners[2]);
 }
@@ -218,27 +216,27 @@ inline bool IntersectionClass::_Point_In_Polygon_Z(
 **	the dominant projection axes, such as in the case of 2d intersecion with heightfields.
 */
 inline bool IntersectionClass::_Point_In_Polygon(
-	Vector3 &Point, 
-	Vector3 &loc1, 
-	Vector3 &loc2, 
-	Vector3 &loc3, 
-	int axis_1, 
+	Vector3 &Point,
+	Vector3 &loc1,
+	Vector3 &loc2,
+	Vector3 &loc3,
+	int axis_1,
 	int axis_2,
 	float &Alpha,
-	float &Beta) 
+	float &Beta)
 {
 
-	double u0 = Point[axis_1] - loc1[axis_1]; 
+	double u0 = Point[axis_1] - loc1[axis_1];
 	double v0 = Point[axis_2] - loc1[axis_2];
 
 	// determine the 2d vectors on the dominant plane from the first vertex to the other two
-	double u1 = loc2[axis_1] - loc1[axis_1]; 
+	double u1 = loc2[axis_1] - loc1[axis_1];
 	double v1 = loc2[axis_2] - loc1[axis_2];
-	double u2 = loc3[axis_1] - loc1[axis_1]; 
+	double u2 = loc3[axis_1] - loc1[axis_1];
 	double v2 = loc3[axis_2] - loc1[axis_2];
 
 	double alpha, beta;
-	bool intersect = false; 
+	bool intersect = false;
 
 	// calculate alpha and beta as normalized (0..1) percentages across the 2d projected triangle
 	// and do bounds checking (sum <= 1)  to determine whether or not the triangle intersection occurs.
@@ -258,7 +256,7 @@ inline bool IntersectionClass::_Point_In_Polygon(
 			// if alpha is valid & the sum of alpha & beta is <= 1 then it's within the triangle
 			// note:       0.00001 added after testing an intersection of a square in the middle indicated
 			// an error of 0.0000001350, apparently due to roundoff.
-			intersect = ((alpha >= 0.0) && ((alpha + beta) <= 1.0)); 
+			intersect = ((alpha >= 0.0) && ((alpha + beta) <= 1.0));
 	  }
 	} else {
 	  Beta = beta = (v0 * u1 - u0 * v1) / (v2 * u1 - u2 * v1);
@@ -271,10 +269,10 @@ inline bool IntersectionClass::_Point_In_Polygon(
 #ifdef DEBUG_NORMALS
 	if(debugmode) {
 		Debug.Print("Intersect", intersect);
-		Debug.Print("Normal ", Normal);		
-		Debug.Print("Point 1", loc1);		
-		Debug.Print("Point 2", loc2);		
-		Debug.Print("Point 3", loc3);		
+		Debug.Print("Normal ", Normal);
+		Debug.Print("Point 1", loc1);
+		Debug.Print("Point 2", loc2);
+		Debug.Print("Point 3", loc3);
 		Debug.Print("Inter  ", FinalResult->Intersection);
 		Debug.Print("a/b", (float) alpha, (float) beta);
 		Debug.Print("sum", (float) alpha + (float) beta);
@@ -297,18 +295,18 @@ inline bool IntersectionClass::_Point_In_Polygon(
 }
 
 /*
-**	This version calls the base form using member data from the FinalResult struct for 
+**	This version calls the base form using member data from the FinalResult struct for
 **	some of it's arguments.
 */
 inline bool IntersectionClass::_Point_In_Polygon(
-	IntersectionResultClass *FinalResult, 
-	Vector3 &loc1, 
-	Vector3 &loc2, 
-	Vector3 &loc3, 
-	int axis_1, 
-	int axis_2) 
+	IntersectionResultClass *FinalResult,
+	Vector3 &loc1,
+	Vector3 &loc2,
+	Vector3 &loc3,
+	int axis_1,
+	int axis_2)
 {
-	return (FinalResult->Intersects = _Point_In_Polygon(	FinalResult->Intersection, loc1, loc2, loc3, 
+	return (FinalResult->Intersects = _Point_In_Polygon(	FinalResult->Intersection, loc1, loc2, loc3,
 								axis_1, axis_2, FinalResult->Alpha, FinalResult->Beta));
 }
 
@@ -329,7 +327,7 @@ inline bool IntersectionClass::_Point_In_Polygon(IntersectionResultClass *FinalR
 /*
 **	Determine the Z distance to the specified polygon.
 */
-inline float IntersectionClass::Plane_Z_Distance(Vector3 &PlaneNormal, Vector3 &PlanePoint) 
+inline float IntersectionClass::Plane_Z_Distance(Vector3 &PlaneNormal, Vector3 &PlanePoint)
 {
 	// do a parallel check
 	float divisor = (PlaneNormal[0] *(*RayDirection)[0] + PlaneNormal[1] *(*RayDirection)[1] + PlaneNormal[2] * (*RayDirection)[2]);
@@ -348,11 +346,11 @@ inline float IntersectionClass::Plane_Z_Distance(Vector3 &PlaneNormal, Vector3 &
 **	are defined, using the specified vertex & surface normal to determine the correct value
 */
 inline float IntersectionClass::_Get_Z_Elevation(
-	Vector3 &Point, 
-	Vector3 &PlanePoint, 
+	Vector3 &Point,
+	Vector3 &PlanePoint,
 	Vector3 &PlaneNormal)
 {
-	
+
 	// do a parallel check
 	if(PlaneNormal[2] == 0) return false;
 
@@ -390,11 +388,11 @@ void IntersectionClass::Calculate_Intersection(IntersectionResultClass *Result)
 }
 
 /*
-**	Plane intersection test that assumes a normalized RayDirection. Only determines if 
+**	Plane intersection test that assumes a normalized RayDirection. Only determines if
 **	plane is parallel and if not, the range to it (which may be negative or beyond MaxRange).
 **	It doesn't determine point of intersection either.
 */
-inline bool IntersectionClass::Intersect_Plane_Quick(IntersectionResultClass *Result, Vector3 &PlaneNormal, Vector3 &PlanePoint) 
+inline bool IntersectionClass::Intersect_Plane_Quick(IntersectionResultClass *Result, Vector3 &PlaneNormal, Vector3 &PlanePoint)
 {
 	// do a parallel check
 	float divisor = (PlaneNormal[0] *(*RayDirection)[0] + PlaneNormal[1] *(*RayDirection)[1] + PlaneNormal[2] * (*RayDirection)[2]);
@@ -408,13 +406,13 @@ inline bool IntersectionClass::Intersect_Plane_Quick(IntersectionResultClass *Re
 }
 
 /*
-**	Determine if the specified ray will intersect the plane; returns false for planes 
+**	Determine if the specified ray will intersect the plane; returns false for planes
 **	parallel and behind ray origin.
-**	Sets Range to the distance from the ray location to the intersection. 
+**	Sets Range to the distance from the ray location to the intersection.
 **	Note: Range is undefined if an intersection didn't occur.
 */
 inline bool IntersectionClass::Intersect_Plane(IntersectionResultClass *Result, Vector3 &PlaneNormal, Vector3 &PlanePoint) {
-								 
+
 	// normalize the ray direction
 	RayDirection->Normalize();
 
@@ -422,7 +420,7 @@ inline bool IntersectionClass::Intersect_Plane(IntersectionResultClass *Result,
 	if(!Intersect_Plane_Quick(Result, PlaneNormal, PlanePoint)) return false;
 
 	// check to make sure it's not behind the ray's origin
-	if(Result->Range <= 0) return false; 
+	if(Result->Range <= 0) return false;
 
 	// check to make sure it's not beyond max distance
 	if(Result->Range > MaxDistance) return false;
@@ -450,7 +448,7 @@ inline int IntersectionClass::_Largest_Normal_Index(Vector3 &v)
 		}
 		return 2; // x > y && !(x > z) --> z is the max
 	}
-	if(y > z) 
+	if(y > z)
 		return 1; //  x <= y && y > z --> y is the max
 	return 2; // y > x &&  y > z --> z is the max
 }
@@ -461,19 +459,19 @@ inline int IntersectionClass::_Largest_Normal_Index(Vector3 &v)
 */
 inline void IntersectionClass::_Find_Polygon_Dominant_Plane(Vector3 &Normal, int &Axis_1, int &Axis_2)
 {
-	switch (_Largest_Normal_Index(Normal)) 
+	switch (_Largest_Normal_Index(Normal))
 	{
-	case 0: 
+	case 0:
 		// Dominant is the X axis
 		Axis_1 = 2;
 		Axis_2 = 1;
 		break;
-	case 1: 
+	case 1:
 		// Dominant is the Y axis
 		Axis_1 = 2;
 		Axis_2 = 0;
 		break;
-	case 2: 
+	case 2:
 		// Dominant is the Z axis
 		Axis_1 = 0;
 		Axis_2 = 1;
@@ -483,21 +481,21 @@ inline void IntersectionClass::_Find_Polygon_Dominant_Plane(Vector3 &Normal, int
 
 /*
 **	Returns true if ray intersects polygon.
-**	Changes passed Intersection argument to location of intersection if it occurs, 
+**	Changes passed Intersection argument to location of intersection if it occurs,
 **	and sets Range to the distance from the ray location to the intersection.
-**	If Interpolated_Normal is specified it will interpolate the surface normal based 
+**	If Interpolated_Normal is specified it will interpolate the surface normal based
 **	on the vertex normals.
 */
 inline bool IntersectionClass::Intersect_Polygon(IntersectionResultClass *Result, Vector3 &PolygonNormal, Vector3 &v1, Vector3 &v2, Vector3 &v3)
 {
 	// first check to see if it hits the plane; determine plane normal and find point on plane (from a vertex)
-	
+
 #ifdef DEBUG_NORMALS
 	Verify_Normal2(PolygonNormal, v1,v2,v3);
 #endif
 
 	if(Intersect_Plane(Result, PolygonNormal, v1)) {
-		// then check to see if it it actually intersects the polygon. 
+		// then check to see if it it actually intersects the polygon.
 		return _Point_In_Polygon(Result, PolygonNormal, v1, v2, v3);
 	}
 	// doesn't even hit the plane, return false.
@@ -525,19 +523,19 @@ inline bool IntersectionClass::Intersect_Polygon(IntersectionResultClass *Result
 
 // called after Interpolate_Intersection_Normal.
 // transform the intersection and the normal from model coords into world coords
-inline void IntersectionClass::Transform_Model_To_World_Coords(IntersectionResultClass *FinalResult) 
+inline void IntersectionClass::Transform_Model_To_World_Coords(IntersectionResultClass *FinalResult)
 {
 #ifdef ALLOW_TEMPORARIES
 	FinalResult->Intersection = FinalResult->ModelMatrix * FinalResult->Intersection + FinalResult->ModelLocation;
-	if(IntersectionNormal != 0) 
+	if(IntersectionNormal != 0)
 	{
 		Vector3 normal(*IntersectionNormal);
-		*IntersectionNormal = FinalResult->ModelMatrix * normal; 
+		*IntersectionNormal = FinalResult->ModelMatrix * normal;
 	}
 #else
 	FinalResult->ModelMatrix.mulVector3(FinalResult->Intersection);
 	FinalResult->Intersection += FinalResult->ModelLocation;
-	if(IntersectionNormal != 0) 
+	if(IntersectionNormal != 0)
 	{
 		FinalResult->ModelMatrix.mulVector3(*IntersectionNormal);
 	}
@@ -547,7 +545,7 @@ inline void IntersectionClass::Transform_Model_To_World_Coords(IntersectionResul
 
 
 bool IntersectionClass::Intersect_Screen_Object(	IntersectionResultClass *Final_Result,
-											Vector4 &Area, 
+											Vector4 &Area,
 											RenderObjClass *obj)
 {
 	if(Final_Result->Intersects =  ((ScreenX >= Area[0]) && (ScreenX <= Area[2]) && (ScreenY >= Area[1]) && (ScreenY <= Area[3]))) {
@@ -561,20 +559,20 @@ bool IntersectionClass::Intersect_Screen_Object(	IntersectionResultClass *Final_
 
 
 /*
-**	Determines the point of intersection, if any between the line segments AB and CD. 
+**	Determines the point of intersection, if any between the line segments AB and CD.
 **	If an intersection occurs, then the UV values are interpolated along AB.
 **	Disregards the Z value and considers only the X/Y data except for determining
 **	the Z value of the intersection.
 **	This function could be easily modified to support other axes.
 * /
-void IntersectionClass::_Intersect_Lines_Z(	
-	Vector3 &A, 
+void IntersectionClass::_Intersect_Lines_Z(
+	Vector3 &A,
 	Vector3 &B,
 	Vector2 &UVStart,
 	Vector2 &UVEnd,
-	Vector3 &C, 
+	Vector3 &C,
 	Vector3 &D,
-	Vector3 ClippedPoints[6], 
+	Vector3 ClippedPoints[6],
 	Vector2 ClippedUV[6],
 	int &DestIndex)
 {
@@ -656,7 +654,7 @@ void IntersectionClass::_Intersect_Lines_Z(
 			// degenerate triangle test
 			if(len == 0)
 				return;
-			
+
 			len = 1.0 / len;
 			cpos = (C[AXIS_2] - A[AXIS_2]) * len;
 			dpos = (D[AXIS_2] - A[AXIS_2]) * len;
@@ -665,7 +663,7 @@ void IntersectionClass::_Intersect_Lines_Z(
 		// check to see if there's any overlap
 		// one of the two pos values must be 0>pos>1 or there is no intersection.
 		// this test will ensure that cpos & dpos will not both be outside the same end of the segment.
-		if(((cpos < 0) && (dpos < 0)) || ((cpos > 1) && (dpos > 1))) 
+		if(((cpos < 0) && (dpos < 0)) || ((cpos > 1) && (dpos > 1)))
 			return;
 
 		if(cpos < 0) {
@@ -703,7 +701,7 @@ void IntersectionClass::_Intersect_Lines_Z(
 		}
 		return;
 
-	} 
+	}
 
 	// determine the percentage into the line segments that the intersection occurs.
 	// an intersection of segments will produce r & s values between 0 & 1.
@@ -717,11 +715,11 @@ void IntersectionClass::_Intersect_Lines_Z(
 	if((0.0 <= r) && (r <= 1.0) && (0.0 <= s) && (s <= 1.0)) {
 
 		// they intersect.
-		// determine intersection point 
+		// determine intersection point
 		Vector3 v = D - C;
 //		float len = v.Length();
 		ClippedPoints[DestIndex] = C + v * s;
-		
+
 		// interpolate UV values
 		Vector2 uv = UVEnd - UVStart;
 //		len = uv.Length();
@@ -763,7 +761,7 @@ void IntersectionClass::_Intersect_Lines_Z(
     if ( r1 != 0 && r2 != 0 && (((r1 < 0) && (r2 < 0)) || ((r1 > 0) && (r2 > 0))))
         return; // ( DONT_INTERSECT );
 
-    // Line segments intersect: compute intersection point. 
+    // Line segments intersect: compute intersection point.
     float denom = a1 * b2 - a2 * b1;
     if ( denom == 0 )
         return; // ( COLLINEAR );
@@ -773,7 +771,7 @@ void IntersectionClass::_Intersect_Lines_Z(
     // The denom/2 is to get rounding instead of truncating.  It
     // is added or subtracted to the numerator, depending upon the
     // sign of the numerator.
- 
+
     float num = b1 * c2 - b2 * c1;
     float x = ( num < 0 ? num - offset : num + offset ) / denom;
 
@@ -812,7 +810,7 @@ inline float IntersectionClass::Intersect_Lines
 	float dpy = p1.Y - p0.Y;
 
 	float den = de.Y * dpx - de.X * dpy;
-	
+
 	if (fabs(den) > WWMATH_EPSILON) {
 
 		float num = p0.Y*de.X - p0.X*de.Y + e0.X*de.Y - e0.Y*de.X;
@@ -829,7 +827,7 @@ inline float IntersectionClass::Intersect_Lines
 #define EMIT(p,uv) OutPoints[outnum] = p; OutUVs[outnum] = uv; outnum++;
 
 
-inline int IntersectionClass::Clip_Triangle_To_LineXY(	
+inline int IntersectionClass::Clip_Triangle_To_LineXY(
 	int incount,
 	Vector3 * InPoints,
 	Vector2 * InUVs,
@@ -841,14 +839,14 @@ inline int IntersectionClass::Clip_Triangle_To_LineXY(
 {
 	Vector3 e0 = edge_point0;
 	Vector3 de = edge_point1 - edge_point0;
-	
+
 	// number of verts output.
 	int outnum = 0;
 
 	// start and end verts of the current edge
 	int p0,p1;
 	p0 = incount-1;
-	
+
 	// intersection temporaries.
 	float intersection;
 	Vector3 intersection_point;
@@ -862,7 +860,7 @@ inline int IntersectionClass::Clip_Triangle_To_LineXY(
 
 				// both inside, emit p1
 				EMIT(InPoints[p1],InUVs[p1]);
-				
+
 			} else {
 
 				// edge going out->in, emit intersection and endpoint
@@ -875,7 +873,7 @@ inline int IntersectionClass::Clip_Triangle_To_LineXY(
 		} else {
 
 			if (In_Front_Of_Line(InPoints[p0], e0, de)) {
-				
+
 				// edge going in->out, emit intersection
 				intersection = Intersect_Lines(InPoints[p0],InPoints[p1], e0, de);
 				intersection_point = (1.0f - intersection) * InPoints[p0] + intersection * InPoints[p1];
@@ -893,37 +891,37 @@ inline int IntersectionClass::Clip_Triangle_To_LineXY(
 	return outnum;
 }
 
-inline int IntersectionClass::_Intersect_Triangles_Z(	
-	Vector3 ClipPoints[3], 
-	Vector3 TrianglePoints[3], 
+inline int IntersectionClass::_Intersect_Triangles_Z(
+	Vector3 ClipPoints[3],
+	Vector3 TrianglePoints[3],
 	Vector2 UV[3],
-	Vector3 ClippedPoints[6], 
+	Vector3 ClippedPoints[6],
 	Vector2 ClippedUV[6]
 )
 {
 	int count;
 	Vector3 tmp_points[6];
 	Vector2 tmp_uv[6];
-	
+
 	count = Clip_Triangle_To_LineXY(3,TrianglePoints,UV,ClippedPoints,ClippedUV,ClipPoints[0],ClipPoints[1]);
 	count = Clip_Triangle_To_LineXY(count,ClippedPoints,ClippedUV,tmp_points,tmp_uv,ClipPoints[1],ClipPoints[2]);
 	count = Clip_Triangle_To_LineXY(count,tmp_points,tmp_uv,ClippedPoints,ClippedUV,ClipPoints[2],ClipPoints[0]);
-	
+
 	return count;
 }
 
 /*
 **	This function will fill the passed array with the set of points & uv values that represent
-**	the boolean operation of the anding of the ClipPoints with the TrianglePoints. The UV values	
+**	the boolean operation of the anding of the ClipPoints with the TrianglePoints. The UV values
 **	provided for the TrianglePoints triangle are used to generate accurate UV values for any
 **	new points created by this operation.
 **	This function returns the number of vertices it required to define the intersection.
 * /
-int IntersectionClass::_Intersect_Triangles_Z(	
-	Vector3 ClipPoints[3], 
-	Vector3 TrianglePoints[3], 
+int IntersectionClass::_Intersect_Triangles_Z(
+	Vector3 ClipPoints[3],
+	Vector3 TrianglePoints[3],
 	Vector2 UV[3],
-	Vector3 ClippedPoints[6], 
+	Vector3 ClippedPoints[6],
 	Vector2 ClippedUV[6]
 )
 {
@@ -958,21 +956,21 @@ int IntersectionClass::_Intersect_Triangles_Z(
 		ClippedPoints[points] = ClipPoints[0];
 		Vector2 uv1 = UV[1] - UV[0];
 		Vector2 uv2 = UV[2] - UV[0];
-		ClippedUV[points++] = UV[0] + alpha * uv1 + beta * uv2; 
+		ClippedUV[points++] = UV[0] + alpha * uv1 + beta * uv2;
 	}
 
 	if(_Point_In_Polygon(ClipPoints[1], TrianglePoints[0], TrianglePoints[1], TrianglePoints[2], 0, 1, alpha, beta)) {
 		ClippedPoints[points] = ClipPoints[1];
 		Vector2 uv1 = UV[1] - UV[0];
 		Vector2 uv2 = UV[2] - UV[0];
-		ClippedUV[points++] = UV[0] + alpha * uv1 + beta * uv2; 
+		ClippedUV[points++] = UV[0] + alpha * uv1 + beta * uv2;
 	}
 
 	if(_Point_In_Polygon(ClipPoints[2], TrianglePoints[0], TrianglePoints[1], TrianglePoints[2], 0, 1, alpha, beta)) {
 		ClippedPoints[points] = ClipPoints[2];
 		Vector2 uv1 = UV[1] - UV[0];
 		Vector2 uv2 = UV[2] - UV[0];
-		ClippedUV[points++] = UV[0] + alpha * uv1 + beta * uv2; 
+		ClippedUV[points++] = UV[0] + alpha * uv1 + beta * uv2;
 	}
 
 	// if all 3 clip points are inside the decal triangle then return
@@ -981,7 +979,7 @@ int IntersectionClass::_Intersect_Triangles_Z(
 
 	//	The clip triangle does not fully contain the uv triangle, and the uv triangle
 	//	does not fully contain the clip triangle.
-	//	Intersect any edge which has at least one outside point with all of the clip edges. 
+	//	Intersect any edge which has at least one outside point with all of the clip edges.
 	//	First, determine which edges to test. Those points that are already clipped (by being inside)
 	//	are immediately copied to the clipped point & uv arrays.
 
@@ -990,9 +988,9 @@ int IntersectionClass::_Intersect_Triangles_Z(
 	bool test_02 = false;
 	bool test_12 = false;
 
-	if( inside[0] )	{	ClippedPoints[points] = TrianglePoints[0]; ClippedUV[points++] = UV[0];	} 
-	else {	test_01 = test_02 = true; } 
-	
+	if( inside[0] )	{	ClippedPoints[points] = TrianglePoints[0]; ClippedUV[points++] = UV[0];	}
+	else {	test_01 = test_02 = true; }
+
 	if( inside[1] )	{	ClippedPoints[points] = TrianglePoints[1]; ClippedUV[points++] = UV[1];	}
 	else {	test_01 = test_12 = true; }
 
@@ -1007,19 +1005,19 @@ int IntersectionClass::_Intersect_Triangles_Z(
 		_Intersect_Lines_Z(	TrianglePoints[0], TrianglePoints[1],
 							UV[0], UV[1],
 							ClipPoints[0], ClipPoints[1],
-							ClippedPoints, 
+							ClippedPoints,
 							ClippedUV,
 							points);
 		_Intersect_Lines_Z(	TrianglePoints[0], TrianglePoints[1],
 							UV[0], UV[1],
 							ClipPoints[0], ClipPoints[2],
-							ClippedPoints, 
+							ClippedPoints,
 							ClippedUV,
 							points);
 		_Intersect_Lines_Z(	TrianglePoints[0], TrianglePoints[1],
 							UV[0], UV[1],
 							ClipPoints[1], ClipPoints[2],
-							ClippedPoints, 
+							ClippedPoints,
 							ClippedUV,
 							points);
 	}
@@ -1027,19 +1025,19 @@ int IntersectionClass::_Intersect_Triangles_Z(
 		_Intersect_Lines_Z(	TrianglePoints[0], TrianglePoints[2],
 							UV[0], UV[2],
 							ClipPoints[0], ClipPoints[1],
-							ClippedPoints, 
+							ClippedPoints,
 							ClippedUV,
 							points);
 		_Intersect_Lines_Z(	TrianglePoints[0], TrianglePoints[2],
 							UV[0], UV[2],
 							ClipPoints[0], ClipPoints[2],
-							ClippedPoints, 
+							ClippedPoints,
 							ClippedUV,
 							points);
 		_Intersect_Lines_Z(	TrianglePoints[0], TrianglePoints[2],
 							UV[0], UV[2],
 							ClipPoints[1], ClipPoints[2],
-							ClippedPoints, 
+							ClippedPoints,
 							ClippedUV,
 							points);
 	}
@@ -1047,19 +1045,19 @@ int IntersectionClass::_Intersect_Triangles_Z(
 		_Intersect_Lines_Z(	TrianglePoints[1], TrianglePoints[2],
 							UV[1], UV[2],
 							ClipPoints[0], ClipPoints[1],
-							ClippedPoints, 
+							ClippedPoints,
 							ClippedUV,
 							points);
 		_Intersect_Lines_Z(	TrianglePoints[1], TrianglePoints[2],
 							UV[1], UV[2],
 							ClipPoints[0], ClipPoints[2],
-							ClippedPoints, 
+							ClippedPoints,
 							ClippedUV,
 							points);
 		_Intersect_Lines_Z(	TrianglePoints[1], TrianglePoints[2],
 							UV[1], UV[2],
 							ClipPoints[1], ClipPoints[2],
-							ClippedPoints, 
+							ClippedPoints,
 							ClippedUV,
 							points);
 	}
@@ -1081,7 +1079,7 @@ int IntersectionClass::_Intersect_Triangles_Z(
 		return 3;
 	}
 * /
-	// points will be 0, 3, 4, 5 or 6 
+	// points will be 0, 3, 4, 5 or 6
 	if(!((points == 0) || (points == 3) || (points == 4) || (points == 5) || (points == 6))) {
 		Debug.Print("points", points);
 		return 0; //_Intersect_Triangles_Z(	ClipPoints, TrianglePoints, UV, ClippedPoints, ClippedUV);
@@ -1093,4 +1091,4 @@ int IntersectionClass::_Intersect_Triangles_Z(
 */
 
 
-#endif 
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/inttest.h b/Core/Libraries/Source/WWVegas/WW3D2/inttest.h
index f3a9f9dc4b2..720d0a007ed 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/inttest.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/inttest.h
@@ -36,12 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef INTTEST_H
-#define INTTEST_H
 
 #include "always.h"
 #include "aabox.h"
@@ -54,8 +49,8 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // IntersectionTestClass
 //
-// This is the base class for all of the 'Intersection' functions.  The intersection tests are 
-// purely boolean tests.  The base class only contains the CollisionType of the test.  
+// This is the base class for all of the 'Intersection' functions.  The intersection tests are
+// purely boolean tests.  The base class only contains the CollisionType of the test.
 //
 // Every IntersectionTestClass should have the following functions:
 //
@@ -64,10 +59,10 @@
 //		bool Intersect_Triangle(const TriClass & tri);
 //
 // These are not virtual because I don't want to pay the price of virtual function
-// calls at the point in the code where these are used.  It may be possible to 
-// write template functions if we use these exact function prototpyes for all 
+// calls at the point in the code where these are used.  It may be possible to
+// write template functions if we use these exact function prototpyes for all
 // collision test classes though.
-//  
+//
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 class IntersectionTestClass
 {
@@ -76,7 +71,7 @@ class IntersectionTestClass
 	IntersectionTestClass(const IntersectionTestClass & that) :	CollisionType(that.CollisionType)	{ }
 
 public:
-	int								CollisionType; 
+	int								CollisionType;
 };
 
 
@@ -84,7 +79,7 @@ class IntersectionTestClass
 // AABoxIntersectionTestClass
 //
 // This is an intersection test which uses an Axis-Aligned Box
-//  
+//
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 class AABoxIntersectionTestClass : public IntersectionTestClass
 {
@@ -114,7 +109,7 @@ inline bool AABoxIntersectionTestClass::Cull(const Vector3 & cull_min,const Vect
 {
 	Vector3 box_min;
 	Vector3::Subtract(Box.Center,Box.Extent,&box_min);
-	
+
 	Vector3 box_max;
 	Vector3::Add(Box.Center,Box.Extent,&box_max);
 
@@ -149,7 +144,7 @@ inline bool AABoxIntersectionTestClass::Intersect_Triangle(const TriClass & tri)
 // OBBoxIntersectionTestClass
 //
 // This is an intersection test which uses an Axis-Aligned Box
-//  
+//
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 class OBBoxIntersectionTestClass : public IntersectionTestClass
 {
@@ -164,7 +159,7 @@ class OBBoxIntersectionTestClass : public IntersectionTestClass
 	bool								Cull(const AABoxClass & box);
 	bool								Intersect_Triangle(const TriClass & tri);
 
-protected:	
+protected:
 	void								update_bounding_box(void);
 
 public:
@@ -215,14 +210,14 @@ inline bool OBBoxIntersectionTestClass::Cull(const Vector3 & cull_min,const Vect
 {
 	Vector3 box_min;
 	Vector3::Subtract(BoundingBox.Center,BoundingBox.Extent,&box_min);
-	
+
 	Vector3 box_max;
 	Vector3::Add(BoundingBox.Center,BoundingBox.Extent,&box_max);
 
 	if ((box_min.X > cull_max.X) || (box_max.X < cull_min.X)) return true;
 	if ((box_min.Y > cull_max.Y) || (box_max.Y < cull_min.Y)) return true;
 	if ((box_min.Z > cull_max.Z) || (box_max.Z < cull_min.Z)) return true;
-	
+
 	return false;
 }
 
@@ -250,7 +245,3 @@ inline void OBBoxIntersectionTestClass::update_bounding_box(void)
 	BoundingBox.Center = Box.Center;
 	Box.Basis.Rotate_AABox_Extent(Box.Extent,&BoundingBox.Extent);
 }
-
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp
index 8d7f8488011..327075303c0 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp
@@ -40,8 +40,8 @@
  *   LayerClass::Set_Camera -- Set the camera being used by this layer                         *
  *   LayerClass::Get_Camera -- get the camera being used by this layer                         *
  *   LayerClass::LayerClass -- default constructor                                             *
- *   LC::Peek_Camera -- Get copy of camera.                                                    * 
- *   LC::Set -- Kinda like an assignment operator.                                             * 
+ *   LC::Peek_Camera -- Get copy of camera.                                                    *
+ *   LC::Set -- Kinda like an assignment operator.                                             *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -69,7 +69,7 @@ LayerClass::LayerClass(void) :
 	ClearZ(true),
 	ClearColor(0,0,0)
 {
-}	
+}
 
 LayerClass::LayerClass(const LayerClass &src) :
 	Scene(src.Get_Scene()),
@@ -78,7 +78,7 @@ LayerClass::LayerClass(const LayerClass &src) :
 	ClearZ(src.ClearZ),
 	ClearColor(src.ClearColor)
 {
-}	
+}
 
 /***********************************************************************************************
  * LayerClass::LayerClass -- constructor                                                       *
@@ -102,17 +102,17 @@ LayerClass::LayerClass
 		bool clear,
 		bool clearz,
 		const Vector3 & color
-) 
-{ 
+)
+{
 	if (scene) scene->Add_Ref();
 	Scene = scene;
 
 	if (cam) cam->Add_Ref();
 	Camera = cam;
 
-	Clear = clear; 
+	Clear = clear;
 	ClearZ = clearz;
-	ClearColor = color; 
+	ClearColor = color;
 }
 
 
@@ -128,7 +128,7 @@ LayerClass::LayerClass
  * HISTORY:                                                                                    *
  *   3/27/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-LayerClass::~LayerClass(void) 
+LayerClass::~LayerClass(void)
 {
 	if (Scene) {
 		Scene->Release_Ref();
@@ -153,7 +153,7 @@ LayerClass::~LayerClass(void)
  * HISTORY:                                                                                    *
  *   3/27/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-void LayerClass::Set_Scene(SceneClass * scene) 
+void LayerClass::Set_Scene(SceneClass * scene)
 {
 	if (Scene) {
 		Scene->Release_Ref();
@@ -216,7 +216,7 @@ SceneClass * LayerClass::Peek_Scene(void) const
  * HISTORY:                                                                                    *
  *   3/27/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-void LayerClass::Set_Camera(CameraClass * cam) 
+void LayerClass::Set_Camera(CameraClass * cam)
 {
 	if (Camera) {
 		Camera->Release_Ref();
@@ -249,17 +249,17 @@ CameraClass * LayerClass::Get_Camera(void) const
 }
 
 
-/*********************************************************************************************** 
- * LC::Peek_Camera -- Get copy of camera.                                                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/14/2001 SKB : Created.                                                                 * 
+/***********************************************************************************************
+ * LC::Peek_Camera -- Get copy of camera.                                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/14/2001 SKB : Created.                                                                 *
  *=============================================================================================*/
 CameraClass * LayerClass::Peek_Camera(void) const
 {
@@ -267,17 +267,17 @@ CameraClass * LayerClass::Peek_Camera(void) const
 }
 
 
-/*********************************************************************************************** 
- * LC::Set -- Kinda like an assignment operator.                                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/14/2001 SKB : Created.                                                                 * 
+/***********************************************************************************************
+ * LC::Set -- Kinda like an assignment operator.                                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/14/2001 SKB : Created.                                                                 *
  *=============================================================================================*/
 void LayerClass::Set(const LayerClass & layer)
 {
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/layer.h b/Core/Libraries/Source/WWVegas/WW3D2/layer.h
index 0ccf4f34526..40397198231 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/layer.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/layer.h
@@ -34,16 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef LAYER_H
-#define LAYER_H
 
 #include "always.h"
-#include "LISTNODE.H"
+#include "LISTNODE.h"
 #include "vector3.h"
 
 class SceneClass;
@@ -58,7 +52,7 @@ class LayerClass : public LayerNodeClass
 public:
 
 	LayerClass(void);
-	LayerClass(SceneClass * s,CameraClass * c,bool clear = false,bool clearz = false,const Vector3 & color = Vector3(0,0,0)); 
+	LayerClass(SceneClass * s,CameraClass * c,bool clear = false,bool clearz = false,const Vector3 & color = Vector3(0,0,0));
 	LayerClass(const LayerClass & src);
 	~LayerClass(void);
 
@@ -93,8 +87,3 @@ class LayerClass : public LayerNodeClass
 };
 
 typedef List<LayerClass *> LayerListClass;
-
-
-#endif //LAYER_H
-
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp
index b0e6477c2d4..d2ba6b4a041 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp
@@ -16,34 +16,34 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/line3d.cpp         $* 
- *                                                                         * 
- *                      $Author:: Jani_p                                  $* 
- *                                                                         * 
- *                     $Modtime:: 7/05/01 4:15p                           $* 
- *                                                                         * 
- *                    $Revision:: 11                                      $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- *   Line3DClass::Line3DClass -- Constructor                               * 
- *   Line3DClass::Line3DClass -- Copy constructor.                         * 
- *   Line3DClass::operator = -- assignment operator                        * 
- *   Line3DClass::~Line3DClass -- Destructor.                              * 
- *   Line3DClass::Clone -- Creates a clone of this Line3D                  * 
- *   Line3DClass::Scale -- Scale object                                    * 
- *   Line3DClass::Scale -- Scale object                                    * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/line3d.cpp         $*
+ *                                                                         *
+ *                      $Author:: Jani_p                                  $*
+ *                                                                         *
+ *                     $Modtime:: 7/05/01 4:15p                           $*
+ *                                                                         *
+ *                    $Revision:: 11                                      $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ *   Line3DClass::Line3DClass -- Constructor                               *
+ *   Line3DClass::Line3DClass -- Copy constructor.                         *
+ *   Line3DClass::operator = -- assignment operator                        *
+ *   Line3DClass::~Line3DClass -- Destructor.                              *
+ *   Line3DClass::Clone -- Creates a clone of this Line3D                  *
+ *   Line3DClass::Scale -- Scale object                                    *
+ *   Line3DClass::Scale -- Scale object                                    *
  *   Line3DClass::Update_Cached_Bounding_Volumes -- update bounding vols   *
- *   Line3DClass::Reset -- Reset line start and end points.                * 
- *   Line3DClass::Reset -- Reset line start and end points, and line width.* 
- *   Re_Color -- Reset the line color.                                     * 
- *	  Set_Opacity -- Reset the line opacity.                                * 
+ *   Line3DClass::Reset -- Reset line start and end points.                *
+ *   Line3DClass::Reset -- Reset line start and end points, and line width.*
+ *   Re_Color -- Reset the line color.                                     *
+ *	  Set_Opacity -- Reset the line opacity.                                *
  *   Line3DClass::Render -- render the 3d line                             *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
@@ -76,21 +76,21 @@ const unsigned short Indices[]=
 };
 
 
-/************************************************************************** 
- * Line3DClass::Line3DClass -- Constructor                                * 
- *                                                                        * 
- * INPUT:	Vector3 start, end - start, end points of line (world coords).* 
- *       	float width - width of line (in world units).                 * 
- *       	float r, g, b - R, G, B components of line color.             * 
- *       	float opacity - opacity of line.                              * 
- *                                                                        * 
- * OUTPUT:	none.                                                         * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   01/15/1998 NH  : Created.                                            * 
- *   04/21/1998 NH  : Ported to SR 1.3.                                   * 
+/**************************************************************************
+ * Line3DClass::Line3DClass -- Constructor                                *
+ *                                                                        *
+ * INPUT:	Vector3 start, end - start, end points of line (world coords).*
+ *       	float width - width of line (in world units).                 *
+ *       	float r, g, b - R, G, B components of line color.             *
+ *       	float opacity - opacity of line.                              *
+ *                                                                        *
+ * OUTPUT:	none.                                                         *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   01/15/1998 NH  : Created.                                            *
+ *   04/21/1998 NH  : Ported to SR 1.3.                                   *
  *	  02/16/2001 HY  : Ported to DX8													  *
  *========================================================================*/
 Line3DClass::Line3DClass (const Vector3 & start, const Vector3 & end,
@@ -99,9 +99,9 @@ Line3DClass::Line3DClass (const Vector3 & start, const Vector3 & end,
 	Length = (end - start).Length();
    Width = width;
 
-	// Create box model with origin at start point (X is major axis).	
+	// Create box model with origin at start point (X is major axis).
 
-	// 8 Vertices	
+	// 8 Vertices
 	float halfw = Width * 0.5f;
 
 	vert[0].X = 0.0f;
@@ -128,7 +128,7 @@ Line3DClass::Line3DClass (const Vector3 & start, const Vector3 & end,
 	vert[7].X = Length;
 	vert[7].Y = halfw;
 	vert[7].Z = halfw;
-	
+
 	Color.X=r;
 	Color.Y=g;
 	Color.Z=b;
@@ -142,18 +142,18 @@ Line3DClass::Line3DClass (const Vector3 & start, const Vector3 & end,
 }
 
 
-/************************************************************************** 
- * Line3DClass::Line3DClass -- Copy constructor.                          * 
- *                                                                        * 
- * INPUT:	const Line3DClass & src - source to copy from.                * 
- *                                                                        * 
- * OUTPUT:	none.                                                         * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   01/15/1998 NH  : Created.                                            * 
- *   04/21/1998 NH  : Ported to SR 1.3.                                   * 
+/**************************************************************************
+ * Line3DClass::Line3DClass -- Copy constructor.                          *
+ *                                                                        *
+ * INPUT:	const Line3DClass & src - source to copy from.                *
+ *                                                                        *
+ * OUTPUT:	none.                                                         *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   01/15/1998 NH  : Created.                                            *
+ *   04/21/1998 NH  : Ported to SR 1.3.                                   *
  *	  02/16/2001 HY  : Ported to DX8													  *
  *========================================================================*/
 Line3DClass::Line3DClass(const Line3DClass & src) :
@@ -167,17 +167,17 @@ Line3DClass::Line3DClass(const Line3DClass & src) :
 }
 
 
-/************************************************************************** 
- * Line3DClass::operator = -- assignment operator                         * 
- *                                                                        * 
- * INPUT:	const Line3DClass & that - source to copy from.               * 
- *                                                                        * 
- * OUTPUT:	Line3DClass & - result of assignment.                         * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   01/15/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * Line3DClass::operator = -- assignment operator                         *
+ *                                                                        *
+ * INPUT:	const Line3DClass & that - source to copy from.               *
+ *                                                                        *
+ * OUTPUT:	Line3DClass & - result of assignment.                         *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   01/15/1998 NH  : Created.                                            *
  *   04/21/1998 NH  : Ported to SR 1.3.                                   *
  *	  02/16/2001 HY  : Ported to DX8													  *
  *========================================================================*/
@@ -190,7 +190,7 @@ Line3DClass & Line3DClass::operator = (const Line3DClass & that)
 
 	if (this != &that) {
 		Length = that.Length;
-      Width = that.Width;		
+      Width = that.Width;
 		Shader=that.Shader;
 		Color=that.Color;
 		for (int i=0; i<8; i++)
@@ -201,35 +201,35 @@ Line3DClass & Line3DClass::operator = (const Line3DClass & that)
 }
 
 
-/************************************************************************** 
- * Line3DClass::~Line3DClass -- Destructor.                               * 
- *                                                                        * 
- * INPUT:	none.                                                         * 
- *                                                                        * 
- * OUTPUT:	none.                                                         * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   01/15/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * Line3DClass::~Line3DClass -- Destructor.                               *
+ *                                                                        *
+ * INPUT:	none.                                                         *
+ *                                                                        *
+ * OUTPUT:	none.                                                         *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   01/15/1998 NH  : Created.                                            *
  *   04/21/1998 NH  : Ported to SR 1.3.                                   *
  *	  02/16/2001 HY  : Ported to DX8													  *
  *========================================================================*/
 Line3DClass::~Line3DClass(void)
-{	
+{
 }
 
 
-/************************************************************************** 
- * Line3DClass::Clone -- Creates a clone of this Line3D                   * 
- *                                                                        * 
- * INPUT:	none.                                                         * 
- *                                                                        * 
- * OUTPUT:	RenderObjClass * - pointer to cloned object.                  * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Line3DClass::Clone -- Creates a clone of this Line3D                   *
+ *                                                                        *
+ * INPUT:	none.                                                         *
+ *                                                                        *
+ * OUTPUT:	RenderObjClass * - pointer to cloned object.                  *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *   01/15/1998 NH  : Created.                                            *
  *========================================================================*/
 RenderObjClass * Line3DClass::Clone(void) const
@@ -261,19 +261,19 @@ void Line3DClass::Render(RenderInfoClass & rinfo)
 	// of rendering it.
 	unsigned int sort_level = (unsigned int)Get_Sort_Level();
 
-	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level != SORT_LEVEL_NONE) 
-	{	
+	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level != SORT_LEVEL_NONE)
+	{
 		WW3D::Add_To_Static_Sort_List(this, sort_level);
 		return;
 	}
 
 	DX8Wrapper::Set_Shader(Shader);
-	DX8Wrapper::Set_Texture(0,NULL);	
+	DX8Wrapper::Set_Texture(0,NULL);
 	VertexMaterialClass *vm=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 	DX8Wrapper::Set_Material(vm);
 	REF_PTR_RELEASE(vm);
 
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,Transform);	
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,Transform);
 
 	DynamicVBAccessClass vb(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,8);
 	{
@@ -284,11 +284,11 @@ void Line3DClass::Render(RenderInfoClass & rinfo)
 		unsigned int color=DX8Wrapper::Convert_Color(Color);
 
 		for (i=0; i<8; i++)
-		{			
+		{
 			*(Vector3*)(vb+fi.Get_Location_Offset())=vert[i];
 			*(unsigned int*)(vb+fi.Get_Diffuse_Offset())=color;
 			vb+=fi.Get_FVF_Size();
-		}		
+		}
 	}
 
 	DynamicIBAccessClass ib(BUFFER_TYPE_DYNAMIC_DX8,36);
@@ -297,29 +297,29 @@ void Line3DClass::Render(RenderInfoClass & rinfo)
 		unsigned short *mem=Lock.Get_Index_Array();
 		for (int i=0; i<36; i++)
 			mem[i]=Indices[i];
-	}	
+	}
 
 	DX8Wrapper::Set_Vertex_Buffer(vb);
 	DX8Wrapper::Set_Index_Buffer(ib,0);
 	DX8Wrapper::Draw_Triangles(0,36/3,0,8);
 }
 
-/************************************************************************** 
- * Line3DClass::Scale -- Scale object                                     * 
- *                                                                        * 
- * INPUT:	float scale - uniform scale factor.                           * 
- *                                                                        * 
- * OUTPUT:	none.                                                         * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   01/27/1998 NH  : Created.                                            * 
- *   04/21/1998 NH  : Ported to SR 1.3.                                   * 
+/**************************************************************************
+ * Line3DClass::Scale -- Scale object                                     *
+ *                                                                        *
+ * INPUT:	float scale - uniform scale factor.                           *
+ *                                                                        *
+ * OUTPUT:	none.                                                         *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   01/27/1998 NH  : Created.                                            *
+ *   04/21/1998 NH  : Ported to SR 1.3.                                   *
  *	  02/16/2001 HY  : Ported to DX8													  *
  *========================================================================*/
 void Line3DClass::Scale(float scale)
-{	
+{
 	for (int i=0; i<8; i++) vert[i]*=scale;
 	Length *= scale;
    Width *= scale;
@@ -332,17 +332,17 @@ void Line3DClass::Scale(float scale)
 }
 
 
-/************************************************************************** 
- * Line3DClass::Scale -- Scale object                                     * 
- *                                                                        * 
- * INPUT:	float scalex, scaley, scalez - axis scale factors.            * 
- *                                                                        * 
- * OUTPUT:	none.                                                         * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   01/27/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * Line3DClass::Scale -- Scale object                                     *
+ *                                                                        *
+ * INPUT:	float scalex, scaley, scalez - axis scale factors.            *
+ *                                                                        *
+ * OUTPUT:	none.                                                         *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   01/27/1998 NH  : Created.                                            *
  *   04/21/1998 NH  : Ported to SR 1.3.                                   *
  *	  02/16/2001 HY  : Ported to DX8													  *
  *========================================================================*/
@@ -351,7 +351,7 @@ void Line3DClass::Scale(float scalex, float scaley, float scalez)
 	// The line width is always the same in the y and z axes (the line
 	// approximates a cylinder).
 	Vector3 scale(scalex,scaley,scalez);
-	for (int i=0; i<8; i++) vert[i].Scale(scale);	
+	for (int i=0; i<8; i++) vert[i].Scale(scale);
 	Length *= scalex;
    Width *= scaley;
 
@@ -378,18 +378,18 @@ void Line3DClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
 	box.Extent.Set(half_l, 0.0f, 0.0f);
 }
 
-/************************************************************************** 
- * Line3DClass::Reset -- Reset line start and end points.                 * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   01/19/1998 NH  : Created.                                            * 
- *   04/21/1998 NH  : Ported to SR 1.3.                                   * 
+/**************************************************************************
+ * Line3DClass::Reset -- Reset line start and end points.                 *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   01/19/1998 NH  : Created.                                            *
+ *   04/21/1998 NH  : Ported to SR 1.3.                                   *
  *========================================================================*/
 void Line3DClass::Reset(const Vector3 & new_start, const Vector3 & new_end)
 {
@@ -414,18 +414,18 @@ void Line3DClass::Reset(const Vector3 & new_start, const Vector3 & new_end)
 }
 
 
-/************************************************************************** 
- * Line3DClass::Reset -- Reset line start and end points, and line width. * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   01/19/1998 NH  : Created.                                            * 
- *   04/21/1998 NH  : Ported to SR 1.3.                                   * 
+/**************************************************************************
+ * Line3DClass::Reset -- Reset line start and end points, and line width. *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   01/19/1998 NH  : Created.                                            *
+ *   04/21/1998 NH  : Ported to SR 1.3.                                   *
  *========================================================================*/
 void Line3DClass::Reset(const Vector3 & new_start, const Vector3 & new_end, float new_width)
 {
@@ -460,18 +460,18 @@ void Line3DClass::Reset(const Vector3 & new_start, const Vector3 & new_end, floa
 }
 
 
-/************************************************************************** 
- * Re_Color -- Reset the line color.                                      * 
- *                                                                        * 
- * INPUT:	float r, g, b - components of the new color.                  * 
- *                                                                        * 
- * OUTPUT:	none.                                                         * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   01/26/1998 NH  : Created.                                            * 
- *   04/21/1998 NH  : Ported to SR 1.3.                                   * 
+/**************************************************************************
+ * Re_Color -- Reset the line color.                                      *
+ *                                                                        *
+ * INPUT:	float r, g, b - components of the new color.                  *
+ *                                                                        *
+ * OUTPUT:	none.                                                         *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   01/26/1998 NH  : Created.                                            *
+ *   04/21/1998 NH  : Ported to SR 1.3.                                   *
  *========================================================================*/
 void Line3DClass::Re_Color(float r, float g, float b)
 {
@@ -479,17 +479,17 @@ void Line3DClass::Re_Color(float r, float g, float b)
 }
 
 
-/************************************************************************** 
- * Set_Opacity -- Reset the line opacity.                                 * 
- *                                                                        * 
- * INPUT:	float opacity - new opacity.                                  * 
- *                                                                        * 
- * OUTPUT:	none.                                                         * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/03/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * Set_Opacity -- Reset the line opacity.                                 *
+ *                                                                        *
+ * INPUT:	float opacity - new opacity.                                  *
+ *                                                                        *
+ * OUTPUT:	none.                                                         *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/03/1998 NH  : Created.                                            *
  *========================================================================*/
 void Line3DClass::Set_Opacity(float opacity)
 {
@@ -508,7 +508,7 @@ void Line3DClass::Set_Opacity(float opacity)
 **
 */
 int Line3DClass::Get_Num_Polys(void) const
-{ 
+{
 	return 12;
 }
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h
index 82d80830961..9c7ae3c9ee2 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h
@@ -16,30 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/line3d.h           $* 
- *                                                                         * 
- *                      $Author:: Hector_y                                $* 
- *                                                                         * 
- *                     $Modtime:: 2/16/01 3:52p                           $* 
- *                                                                         * 
- *                    $Revision:: 2                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/line3d.h           $*
+ *                                                                         *
+ *                      $Author:: Hector_y                                $*
+ *                                                                         *
+ *                     $Modtime:: 2/16/01 3:52p                           $*
+ *                                                                         *
+ *                    $Revision:: 2                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef LINE3D_H
-#define LINE3D_H
 
 #include "always.h"
 #include "rendobj.h"
@@ -72,7 +67,7 @@ class Line3DClass : public W3DMPO, public RenderObjClass
 
 		// class id of this render object
 		virtual int Class_ID(void) const { return CLASSID_LINE3D; }
-	
+
 		virtual void		Render(RenderInfoClass & rfinfo);
 
 		// scale the 3D line symmetrically about its center.
@@ -104,14 +99,14 @@ class Line3DClass : public W3DMPO, public RenderObjClass
 		void							Set_Sort_Level(int level)									{ SortLevel = level; }
 		int							Get_Sort_Level(void) const									{ return SortLevel; }
 
-	protected:		
+	protected:
 
 		// This is kept to facilitate changing the line endpoints.
 		float Length;
 
 		// This is kept to facilitate changing the line width.
 		float Width;
-		
+
 		// shader
 		ShaderClass				Shader;
 		// vertices
@@ -120,5 +115,3 @@ class Line3DClass : public W3DMPO, public RenderObjClass
 		Vector4						Color;
 		char														SortLevel;
 };
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp
index 731791c739a..7a413efd890 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp
@@ -51,7 +51,7 @@ MaterialInfoClass::MaterialInfoClass(const MaterialInfoClass & src)
 		vmat = src.VertexMaterials[mi]->Clone();
 		VertexMaterials.Add(vmat);
 	}
-	
+
 	for (int ti=0; ti<src.Textures.Count(); ti++) {
 		TextureClass * tex = src.Textures[ti];
 		tex->Add_Ref();
@@ -67,8 +67,8 @@ MaterialInfoClass::~MaterialInfoClass(void)
 
 
 MaterialInfoClass * MaterialInfoClass::Clone(void) const
-{ 
-	return W3DNEW MaterialInfoClass(*this); 
+{
+	return W3DNEW MaterialInfoClass(*this);
 }
 
 int MaterialInfoClass::Add_Texture(TextureClass * tex)
@@ -115,14 +115,14 @@ void MaterialInfoClass::Process_Texture_Reduction(void)
 	}
 }
 */
-void MaterialInfoClass::Free(void) 
+void MaterialInfoClass::Free(void)
 {
 	int i;
-	
+
 	for (i=0; i<VertexMaterials.Count(); i++) {
 		REF_PTR_RELEASE(VertexMaterials[i]);
 	}
-	VertexMaterials.Delete_All(); 
+	VertexMaterials.Delete_All();
 
 	for (i=0; i<Textures.Count(); i++) {
 		REF_PTR_RELEASE(Textures[i]);
@@ -175,12 +175,8 @@ MaterialRemapperClass::~MaterialRemapperClass(void)
 	SrcMatInfo->Release_Ref();
 	DestMatInfo->Release_Ref();
 
-	if (TextureRemaps) {
-		delete[] TextureRemaps;
-	}
-	if (VertexMaterialRemaps) {
-		delete[] VertexMaterialRemaps;
-	}
+	delete[] TextureRemaps;
+	delete[] VertexMaterialRemaps;
 }
 
 TextureClass * MaterialRemapperClass::Remap_Texture(TextureClass * src)
@@ -219,43 +215,43 @@ void MaterialRemapperClass::Remap_Mesh(const MeshMatDescClass * srcmeshmatdesc,
 	** Remap the vertex materials if there is at least one of them
 	*/
 	if (SrcMatInfo->Vertex_Material_Count() >= 1) {
-	
+
 		for (int pass = 0;pass < srcmeshmatdesc->Get_Pass_Count(); pass++) {
 
 			if (srcmeshmatdesc->Has_Material_Array(pass)) {
-				
+
 				for (int vert_index = 0; vert_index < srcmeshmatdesc->Get_Vertex_Count(); vert_index++) {
 					VertexMaterialClass * src = srcmeshmatdesc->Peek_Material(vert_index, pass);
 					destmeshmatdesc->Set_Material(vert_index, Remap_Vertex_Material(src),pass);
 				}
 
 			} else {
-			
+
 				VertexMaterialClass * src = srcmeshmatdesc->Peek_Single_Material(pass);
 				destmeshmatdesc->Set_Single_Material(Remap_Vertex_Material(src), pass);
-				
+
 			}
 		}
 	}
-	
+
 	/*
 	** Remap the textures if there is at least one of them
 	*/
 	if (SrcMatInfo->Texture_Count() >= 1) {
-	
+
 		for (int pass = 0;pass < srcmeshmatdesc->Get_Pass_Count(); pass++) {
 
 			for (int stage = 0; stage < MeshMatDescClass::MAX_TEX_STAGES; stage++) {
-			
+
 				if (srcmeshmatdesc->Has_Texture_Array(pass, stage)) {
-					
+
 					for (int poly_index = 0; poly_index < srcmeshmatdesc->Get_Polygon_Count(); poly_index++) {
 						TextureClass * src = srcmeshmatdesc->Peek_Texture(poly_index, pass, stage);
 						destmeshmatdesc->Set_Texture(poly_index, Remap_Texture(src), pass, stage);
 					}
 
 				} else {
-				
+
 					TextureClass * src = srcmeshmatdesc->Peek_Single_Texture(pass, stage);
 					destmeshmatdesc->Set_Single_Texture(Remap_Texture(src), pass, stage);
 
@@ -283,7 +279,7 @@ void MaterialCollectorClass::Collect_Materials(MeshModelClass * mesh)
 
 		// Vertex materials (either single or per vertex)
 		if (mesh->Has_Material_Array(pass)) {
-			
+
 			for (int vert_index = 0;vert_index < mesh->Get_Vertex_Count(); vert_index++) {
 				VertexMaterialClass * mat = mesh->Peek_Material(vert_index,pass);
 				Add_Vertex_Material(mat);
@@ -294,7 +290,7 @@ void MaterialCollectorClass::Collect_Materials(MeshModelClass * mesh)
 			Add_Vertex_Material(mat);
 			REF_PTR_RELEASE(mat);
 		}
-		
+
 
 		// Shaders (single or per poly...)
 		if (mesh->Has_Shader_Array(pass)) {
@@ -305,20 +301,20 @@ void MaterialCollectorClass::Collect_Materials(MeshModelClass * mesh)
 			ShaderClass sh = mesh->Get_Single_Shader(pass);
 			Add_Shader(sh);
 		}
-				
-		
+
+
 		// Textures per pass, per stage (either array or single...)
 		for (int stage = 0; stage < MeshMatDescClass::MAX_TEX_STAGES; stage++) {
 
 			if (mesh->Has_Texture_Array(pass,stage)) {
-				
+
 				for (int poly_index = 0;poly_index < mesh->Get_Polygon_Count(); poly_index++) {
 					TextureClass * tex = mesh->Peek_Texture(poly_index,pass,stage);
 					Add_Texture(tex);
 				}
 
 			} else {
-			
+
 				TextureClass * tex = mesh->Peek_Single_Texture(pass,stage);
 				Add_Texture(tex);
 
@@ -382,7 +378,7 @@ int MaterialCollectorClass::Get_Texture_Count(void)
 {
 	return Textures.Count();
 }
-	
+
 ShaderClass MaterialCollectorClass::Peek_Shader(int i)
 {
 	return Shaders[i];
@@ -426,4 +422,4 @@ int MaterialCollectorClass::Find_Vertex_Material(VertexMaterialClass * mat)
 		}
 	}
 	return -1;
-}
\ No newline at end of file
+}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h
index 7f144e7ba33..2c2dca540b0 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h
@@ -34,17 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MATINFO_H
-#define MATINFO_H
 
 #include "always.h"
 #include "wwdebug.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "vertmaterial.h"
 #include "texture.h"
 #include "shader.h"
@@ -58,7 +52,7 @@ class MeshMatDescClass;
 /***********************************************************************************************
 ** MaterialInfoClass
 **
-** This class gives an interface to the "changeable" material parameters inside a 
+** This class gives an interface to the "changeable" material parameters inside a
 ** W3D render object.  Typically, this will include things like the following:
 ** - one or more textures,
 ** - the vertex material used by the mesh (defines lighting properties, etc)
@@ -85,7 +79,7 @@ class MaterialInfoClass : public W3DMPO, public RefCountClass
 
 	int							Add_Vertex_Material(VertexMaterialClass * vmat);
 	int							Add_Texture(TextureClass * tex);
-	
+
 	int							Get_Vertex_Material_Index(const char * name);
 	int							Get_Texture_Index(const char * name);
 
@@ -110,10 +104,10 @@ class MaterialInfoClass : public W3DMPO, public RefCountClass
 private:
 
 	void Free(void);
-	
+
 	DynamicVectorClass<VertexMaterialClass *>		VertexMaterials;
-	DynamicVectorClass<TextureClass *>			Textures;			
-	
+	DynamicVectorClass<TextureClass *>			Textures;
+
 };
 
 
@@ -173,7 +167,7 @@ class MaterialRemapperClass
 
 /***********************************************************************************************
 ** MaterialCollectorClass
-** 
+**
 ** This class can be used to collect all of the unique instances of materials from a mesh.
 ** Its original motivation is to solve a problem encountered in trying to save a mesh
 ** to disk.  There are arrays of pointers to vertex materials in the mesh but no record of
@@ -185,7 +179,7 @@ class MaterialRemapperClass
 ** check whether the contents of the objects are identical.  (Exporter does this, I assume
 ** that if there are two separate objects, they are that way for a reason here.)
 ***********************************************************************************************/
-class MaterialCollectorClass 
+class MaterialCollectorClass
 {
 public:
 
@@ -201,7 +195,7 @@ class MaterialCollectorClass
 	int							Get_Shader_Count(void);
 	int							Get_Vertex_Material_Count(void);
 	int							Get_Texture_Count(void);
-	
+
 	ShaderClass					Peek_Shader(int i);
 	TextureClass *				Peek_Texture(int i);
 	VertexMaterialClass *	Peek_Vertex_Material(int i);
@@ -331,5 +325,3 @@ inline void	MaterialInfoClass::Replace_Texture(int index, TextureClass *newTextu
 {
 	REF_PTR_SET(Textures[index],newTexture);
 }
-
-#endif // MATINFO_H
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matpass.cpp b/Core/Libraries/Source/WWVegas/WW3D2/matpass.cpp
new file mode 100644
index 00000000000..f8cc3e348f4
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/matpass.cpp
@@ -0,0 +1,234 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3d                                                         *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/matpass.cpp                            $*
+ *                                                                                             *
+ *              Original Author:: Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *                     $Modtime:: 06/27/02 1:27p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 8                                                           $*
+ *                                                                                             *
+ * 06/27/02 KM Changes to max texture stage caps															*
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   MaterialPassClass::MaterialPassClass -- Constructor                                       *
+ *   MaterialPassClass::~MaterialPassClass -- Destructor                                       *
+ *   MaterialPassClass::Install_Materials -- Plug our material settings into D3D               *
+ *   MaterialPassClass::Set_Texture -- Set texture to use                                      *
+ *   MaterialPassClass::Set_Shader -- Set the shader to use                                    *
+ *   MaterialPassClass::Set_Material -- set vertex material to use                             *
+ *   MaterialPassClass::Get_Texture -- Get a pointer to the texture                            *
+ *   MaterialPassClass::Get_Material -- get the vertex material                                *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+
+#include "matpass.h"
+#include "vertmaterial.h"
+#include "shader.h"
+#include "texture.h"
+#include "statistics.h"
+#include "dx8wrapper.h"
+
+
+bool MaterialPassClass::EnablePerPolygonCulling = true;
+
+
+/***********************************************************************************************
+ * MaterialPassClass::MaterialPassClass -- Constructor                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/26/2001  gth : Created.                                                                 *
+ *=============================================================================================*/
+MaterialPassClass::MaterialPassClass(void) :
+	Shader(0),
+	Material(NULL),
+	CullVolume(NULL),
+	EnableOnTranslucentMeshes(true)
+{
+	for (int i=0; i<MAX_TEX_STAGES; i++) {
+		Texture[i] = NULL;
+	}
+}
+
+/***********************************************************************************************
+ * MaterialPassClass::~MaterialPassClass -- Destructor                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/9/99    gth : Created.                                                                 *
+ *	  06/27/02   kjm : Changes to max texture stage caps															*
+ *=============================================================================================*/
+MaterialPassClass::~MaterialPassClass(void)
+{
+	for (int i=0; i<MAX_TEX_STAGES; i++) {
+		REF_PTR_RELEASE(Texture[i]);
+	}
+	REF_PTR_RELEASE(Material);
+}
+
+
+/***********************************************************************************************
+ * MaterialPassClass::Install_Materials -- Plug our material settings into D3D                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/9/99    gth : Created.                                                                 *
+ *   2/26/2001  gth : Changed to Install_Materials                                             *
+ *=============================================================================================*/
+void MaterialPassClass::Install_Materials(void) const
+{
+	DX8Wrapper::Set_Material(Peek_Material());
+	DX8Wrapper::Set_Shader(Peek_Shader());
+	for (int i=0;i<DX8Wrapper::Get_Current_Caps()->Get_Max_Textures_Per_Pass();++i)
+	{
+		DX8Wrapper::Set_Texture(i,Peek_Texture(i));
+	}
+}
+
+
+/***********************************************************************************************
+ * MaterialPassClass::Set_Texture -- Set texture to use                                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * tex - pointer to the texture for this material pass (or NULL)                               *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/9/99    gth : Created.                                                                 *
+ *=============================================================================================*/
+void MaterialPassClass::Set_Texture(TextureClass * tex,int stage)
+{
+	WWASSERT(stage >= 0);
+	WWASSERT(stage < MAX_TEX_STAGES);
+
+	REF_PTR_SET(Texture[stage],tex);
+}
+
+
+/***********************************************************************************************
+ * MaterialPassClass::Set_Shader -- Set the shader to use                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * shader - shader for this material pass                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/9/99    gth : Created.                                                                 *
+ *=============================================================================================*/
+void MaterialPassClass::Set_Shader(ShaderClass shader)
+{
+	Shader = shader;
+	Shader.Enable_Fog ("MaterialPassClass");
+}
+
+
+/***********************************************************************************************
+ * MaterialPassClass::Set_Material -- set vertex material to use                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * mat - pointer to the vertex material this material pass uses                                *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/9/99    gth : Created.                                                                 *
+ *=============================================================================================*/
+void MaterialPassClass::Set_Material(VertexMaterialClass * mat)
+{
+	REF_PTR_SET(Material,mat);
+}
+
+
+/***********************************************************************************************
+ * MaterialPassClass::Get_Texture -- Get a pointer to the texture                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ * reference counted pointer to the texture this material pass is using                        *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/9/99    gth : Created.                                                                 *
+ *=============================================================================================*/
+TextureClass * MaterialPassClass::Get_Texture(int stage) const
+{
+	WWASSERT(stage >= 0);
+	WWASSERT(stage < MAX_TEX_STAGES);
+
+	if (Texture[stage]) {
+		Texture[stage]->Add_Ref();
+	}
+	return Texture[stage];
+}
+
+
+/***********************************************************************************************
+ * MaterialPassClass::Get_Material -- get the vertex material                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ * reference counted pointer to the vertex material being used by this material pass           *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/9/99    gth : Created.                                                                 *
+ *=============================================================================================*/
+VertexMaterialClass * MaterialPassClass::Get_Material(void) const
+{
+	if (Material) {
+		Material->Add_Ref();
+	}
+	return Material;
+}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matpass.h b/Core/Libraries/Source/WWVegas/WW3D2/matpass.h
new file mode 100644
index 00000000000..3dad1fc9df0
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/matpass.h
@@ -0,0 +1,114 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : ww3d                                                         *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/matpass.h                              $*
+ *                                                                                             *
+ *              Original Author:: Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *                     $Modtime:: 06/27/02 1:27p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 6                                                           $*
+ *                                                                                             *
+ * 06/27/02 KM Texture class abstraction																			*
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "always.h"
+#include "shader.h"
+
+class TextureClass;
+class VertexMaterialClass;
+class MeshModelClass;
+class OBBoxClass;
+
+/**
+** MaterialPassClass
+**
+** This class wraps all of the data needed to describe an additional
+** material pass for any object.  The motivation for this class is to
+** implement certain types of special effects.  All data needed to
+** apply the pass should be generated procedurally.  Typically a
+** vertex processor will be used to generate any needed u-v's or vertex
+** colors.  Alternatively, we could add the option to request to
+** re-use the model's existing u-v's or vertex colors.
+**
+**
+*/
+class MaterialPassClass : public RefCountClass
+{
+public:
+
+	MaterialPassClass(void);
+	~MaterialPassClass(void);
+
+	/// MW: Had to make this virtual so app can perform direct/custom D3D setup.
+	virtual void	Install_Materials(void) const;
+	virtual void	UnInstall_Materials(void) const { };	///< reset/cleanup D3D states
+
+	void							Set_Texture(TextureClass * Texture,int stage = 0);
+	void							Set_Shader(ShaderClass shader);
+	void							Set_Material(VertexMaterialClass * mat);
+
+	TextureClass *				Get_Texture(int stage = 0) const;
+	VertexMaterialClass *	Get_Material(void) const;
+
+	TextureClass *				Peek_Texture(int stage = 0) const;
+	ShaderClass					Peek_Shader(void)	const							{ return Shader; }
+	VertexMaterialClass *	Peek_Material(void) const						{ return Material; }
+
+	void							Set_Cull_Volume(OBBoxClass * volume)		{ CullVolume = volume; }
+	OBBoxClass *				Get_Cull_Volume(void) const					{ return CullVolume; }
+
+	void							Enable_On_Translucent_Meshes(bool onoff)	{ EnableOnTranslucentMeshes = onoff; }
+	bool							Is_Enabled_On_Translucent_Meshes(void)		{ return EnableOnTranslucentMeshes; }
+
+	static void					Enable_Per_Polygon_Culling(bool onoff)		{ EnablePerPolygonCulling = onoff; }
+	static bool					Is_Per_Polygon_Culling_Enabled(void)		{ return EnablePerPolygonCulling; }
+
+protected:
+
+	enum { MAX_TEX_STAGES = 8 };
+
+	TextureClass *				Texture[MAX_TEX_STAGES];
+	ShaderClass					Shader;
+	VertexMaterialClass *	Material;
+	bool							EnableOnTranslucentMeshes;
+
+	OBBoxClass *				CullVolume;
+	static bool					EnablePerPolygonCulling;
+
+};
+
+
+inline TextureClass * MaterialPassClass::Peek_Texture(int stage) const
+{
+	WWASSERT(stage >= 0);
+	WWASSERT(stage < MAX_TEX_STAGES);
+	return Texture[stage];
+}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp
index 1648ec5fdab..410ea5f39df 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp
@@ -45,17 +45,17 @@
 //#include <sr.hpp>
 
 
-/*********************************************************************************************** 
- * DamageClass::DamageClass -- constructor                                                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * DamageClass::DamageClass -- constructor                                                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 DamageClass::DamageClass(void):
 	DamageIndex(0),
@@ -68,42 +68,38 @@ DamageClass::DamageClass(void):
 }
 
 
-/*********************************************************************************************** 
- * DamageClass::~DamageClass -- destructor                                                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * DamageClass::~DamageClass -- destructor                                                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 DamageClass::~DamageClass(void)
 {
-	if (Verts != NULL) {
-		delete [] Verts;
-		Verts = NULL;
-	}
+	delete [] Verts;
+	Verts = NULL;
 
-	if (Colors != NULL) {
-		delete[] Colors;
-		Colors = NULL;
-	}
+	delete[] Colors;
+	Colors = NULL;
 }
 
-/*********************************************************************************************** 
- * DamageClass::Load -- load damage data from a W3D file                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * DamageClass::Load -- load damage data from a W3D file                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WW3DErrorType DamageClass::Load(ChunkLoadClass & cload,MeshModelClass * basemesh)
 {
@@ -131,17 +127,17 @@ WW3DErrorType DamageClass::Load(ChunkLoadClass & cload,MeshModelClass * basemesh
 	if (NumVerts > 0) {
 		Verts = W3DNEWARRAY DamageVertexStruct[NumVerts];
 	}
-	
+
 	NumColors = header.NumDamageColors;
 	if (NumColors > 0) {
 		Colors = W3DNEWARRAY DamageColorStruct[NumColors];
 	}
 
 	// TODO: allocate materials
-	
+
 	/*
 	** Now read in the rest of the chunks
-	*/		
+	*/
 	while (1) {
 
 		/*
@@ -174,8 +170,8 @@ WW3DErrorType DamageClass::Load(ChunkLoadClass & cload,MeshModelClass * basemesh
 			default:
 					break;
 
-		}	
-		
+		}
+
 		cload.Close_Chunk();
 
 		if (error != WW3D_ERROR_OK) {
@@ -187,17 +183,17 @@ WW3DErrorType DamageClass::Load(ChunkLoadClass & cload,MeshModelClass * basemesh
 	return WW3D_ERROR_OK;
 }
 
-/*********************************************************************************************** 
- * DamageClass::read_vertices -- read damage vertices from a W3D file                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   11/04/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * DamageClass::read_vertices -- read damage vertices from a W3D file                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/04/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WW3DErrorType DamageClass::read_vertices(ChunkLoadClass & cload,MeshModelClass * basemesh)
 {
@@ -209,31 +205,31 @@ WW3DErrorType DamageClass::read_vertices(ChunkLoadClass & cload,MeshModelClass *
 		if (cload.Read(&dv,sizeof(W3dMeshDamageVertexStruct)) != sizeof(W3dMeshDamageVertexStruct)) {
 			return WW3D_ERROR_LOAD_FAILED;
 		}
-		
+
 		srVector3 * vert_array = basemesh->getVertexLoc();
 
 		srVector3 sr_v;
 		sr_v = vert_array[dv.VertexIndex];
 
-		Verts[i].VertexIdx = dv.VertexIndex;		
-		Verts[i].Vertex0.Set(sr_v[0],sr_v[1],sr_v[2]);		
+		Verts[i].VertexIdx = dv.VertexIndex;
+		Verts[i].Vertex0.Set(sr_v[0],sr_v[1],sr_v[2]);
 		Verts[i].Vertex1.Set(dv.NewVertex.X,dv.NewVertex.Y,dv.NewVertex.Z);
 	}
 #endif
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
-/*********************************************************************************************** 
- * DamageClass::read_colors -- read damage colors from a w3d file                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   11/04/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * DamageClass::read_colors -- read damage colors from a w3d file                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/04/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WW3DErrorType DamageClass::read_colors(ChunkLoadClass & cload,MeshModelClass * basemesh)
 {
@@ -245,22 +241,22 @@ WW3DErrorType DamageClass::read_colors(ChunkLoadClass & cload,MeshModelClass * b
 		if (cload.Read(&dc,sizeof(W3dMeshDamageColorStruct)) != sizeof(W3dMeshDamageColorStruct)) {
 			return WW3D_ERROR_LOAD_FAILED;
 		}
-		
 
-		Colors[i].VertexIdx = dc.VertexIndex;		
+
+		Colors[i].VertexIdx = dc.VertexIndex;
 
 		// TODO: check for existing vertex colors, store original here
-		Colors[i].Color0.R = 255;		
-		Colors[i].Color0.G = 255;		
-		Colors[i].Color0.B = 255;		
+		Colors[i].Color0.R = 255;
+		Colors[i].Color0.G = 255;
+		Colors[i].Color0.B = 255;
 
 		Colors[i].Color1.R = dc.NewColor.R;
 		Colors[i].Color1.G = dc.NewColor.G;
 		Colors[i].Color1.B = dc.NewColor.B;
-	}	
+	}
 #endif
 	return WW3D_ERROR_OK;
 }
 
 
-#endif //0
\ No newline at end of file
+#endif //0
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h
index fdeee726537..498ddb96b87 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h
@@ -36,12 +36,7 @@
 
 #if 0
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MESHDAM_H
-#define MESHDAM_H
 
 #include "always.h"
 #include "vector3.h"
@@ -51,7 +46,7 @@
 class MeshModelClass;
 class ChunkLoadClass;
 
-struct RGBStruct 
+struct RGBStruct
 {
 	uint8	R,G,B;
 };
@@ -96,13 +91,11 @@ class DamageClass
 	int							NumColors;
 
 	DamageVertexStruct *		Verts;
-	DamageColorStruct *		Colors;	
+	DamageColorStruct *		Colors;
 
 	friend class MeshClass;
 };
 
 
-#endif
-
 
-#endif //0
\ No newline at end of file
+#endif //0
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp
index d23027940d6..ead093ca602 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp
@@ -24,11 +24,11 @@
  *                                                                                             *
  *                     $Archive:: /Commando/Code/ww3d2/metalmap.cpp                           $*
  *                                                                                             *
- *                  $Org Author:: Hector_y                                  $* 
- *                                                                         * 
- *                      $Author:: Kenny_m                                  $* 
- *                                                                         * 
- *                     $Modtime:: 08/05/02 10:44a                          $* 
+ *                  $Org Author:: Hector_y                                  $*
+ *                                                                         *
+ *                      $Author:: Kenny_m                                  $*
+ *                                                                         *
+ *                     $Modtime:: 08/05/02 10:44a                          $*
  *                                                                                             *
  *                    $Revision:: 4                                                           $*
  *                                                                                             *
@@ -51,9 +51,8 @@
 #include "ww3dformat.h"
 #include "ww3d.h"
 #include <vp.h>
-#include <INI.H>
+#include <INI.h>
 #include <Point.h>
-#include <stdio.h>
 #include <hashtemplate.h>
 #include <wwstring.h>
 #include <wwmath.h>
@@ -139,18 +138,18 @@ MetalMapManagerClass::MetalMapManagerClass(INIClass &ini) :
 	bool windowed;
 
 	WW3D::Get_Device_Resolution(w,h,bits,windowed);
-	Use16Bit=(bits<=16);	
+	Use16Bit=(bits<=16);
 
 	WW3DFormat format=(Use16Bit?WW3D_FORMAT_A4R4G4B4:WW3D_FORMAT_A8R8G8B8);
 
 
-	for (int i = 0; i < lp; i++) {		
+	for (int i = 0; i < lp; i++) {
 		Textures[i]=NEW_REF(TextureClass,(METALMAP_SIZE,METALMAP_SIZE,format,MIP_LEVELS_1));
 		Textures[i]->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 		Textures[i]->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 		StringClass tex_name;
-		tex_name.Format("!m%02d.tga", i);		
-		Textures[i]->Set_Texture_Name(tex_name);		
+		tex_name.Format("!m%02d.tga", i);
+		Textures[i]->Set_Texture_Name(tex_name);
 	}
 }
 
@@ -175,12 +174,11 @@ MetalMapManagerClass::~MetalMapManagerClass(void)
 			REF_PTR_RELEASE(Textures[i]);
 		}
 		delete [] Textures;
-		Textures = 0;
-	}
-	if (MetalParameters) {
-		delete [] MetalParameters;
-		MetalParameters = 0;
+		Textures = NULL;
 	}
+
+	delete [] MetalParameters;
+	MetalParameters = NULL;
 }
 
 
@@ -266,7 +264,7 @@ void MetalMapManagerClass::Update_Textures(void)
 	Vector3 &v = CurrentCameraDir;
 
 	// Calculate halfway vector
-	Vector3 h = l+v;	
+	Vector3 h = l+v;
 	h.Normalize();
 
 	// NOTE: when our lighting equation gets more complicated we might want to do some testing to
@@ -274,15 +272,15 @@ void MetalMapManagerClass::Update_Textures(void)
 
 	// Calculate quantities which are the same for all metal maps
 	float n_dot_l[METALMAP_SIZE_2];
-	float n_dot_h[METALMAP_SIZE_2];	
-	
-	VectorProcessorClass::DotProduct(n_dot_l,l,_NormalTable,METALMAP_SIZE_2);	
-	VectorProcessorClass::ClampMin(n_dot_l, n_dot_l, 0.0f, METALMAP_SIZE_2);					
+	float n_dot_h[METALMAP_SIZE_2];
+
+	VectorProcessorClass::DotProduct(n_dot_l,l,_NormalTable,METALMAP_SIZE_2);
+	VectorProcessorClass::ClampMin(n_dot_l, n_dot_l, 0.0f, METALMAP_SIZE_2);
 	VectorProcessorClass::DotProduct(n_dot_h,h,_NormalTable, METALMAP_SIZE_2);
-	VectorProcessorClass::ClampMin(n_dot_h, n_dot_h, 0.0f, METALMAP_SIZE_2);					
+	VectorProcessorClass::ClampMin(n_dot_h, n_dot_h, 0.0f, METALMAP_SIZE_2);
 
 	// Loop over each metal map and update it
-	for (int i = 0; i < MapCount; i++) {		
+	for (int i = 0; i < MapCount; i++) {
 		MetalParams &cur_params = MetalParameters[i];
 
 		// If shinyness > 1, apply it to specular value array
@@ -305,25 +303,25 @@ void MetalMapManagerClass::Update_Textures(void)
 			cur_params.DiffuseColor.Z * CurrentMainLightColor.Z);
 		Vector3 ambient_color(cur_params.AmbientColor.X * CurrentAmbient.X,
 			cur_params.AmbientColor.Y * CurrentAmbient.Y,
-			cur_params.AmbientColor.Z * CurrentAmbient.Z);		
+			cur_params.AmbientColor.Z * CurrentAmbient.Z);
 		Vector3 white(1.0f, 1.0f, 1.0f);
 
 		SurfaceClass * metal_map_surface = Textures[i]->Get_Surface_Level(0);
 		int pitch;
 		unsigned char *map=(unsigned char *) metal_map_surface->Lock(&pitch);
 		int idx=0;
-		for (int y = 0; y < METALMAP_SIZE; y++) {			
-			for (int x = 0; x < METALMAP_SIZE; x++) {				
+		for (int y = 0; y < METALMAP_SIZE; y++) {
+			for (int x = 0; x < METALMAP_SIZE; x++) {
 				Vector3 result = ambient_color + (diffuse_color * n_dot_l[idx]) + (specular_color * specular[idx]);
 				result.Update_Min(white);	// Clamp to white
-				
+
 				unsigned char b,g,r,a;
 				b= (unsigned char)WWMath::Floor(result.Z * 255.99f);	// B
 				g= (unsigned char)WWMath::Floor(result.Y * 255.99f);	// G
 				r= (unsigned char)WWMath::Floor(result.X * 255.99f);	// R
 				a= 0xFF;													// A
 
-				if (Use16Bit) {					
+				if (Use16Bit) {
 					unsigned short tmp;
 					tmp=(a&0xf0)<<8;
 					tmp|=(r&0xf0)<<4;
@@ -342,7 +340,7 @@ void MetalMapManagerClass::Update_Textures(void)
 		}
 		metal_map_surface->Unlock();
 		REF_PTR_RELEASE(metal_map_surface);
-	} // for i
+	}
 }
 
 /***********************************************************************************************
@@ -402,7 +400,7 @@ void MetalMapManagerClass::initialize_normal_table(void)
  *=============================================================================================*/
 void MetalMapManagerClass::initialize_metal_params(int map_count, MetalParams *metal_params)
 {
-	MapCount = map_count;	
+	MapCount = map_count;
 	if (MapCount > 0) {
 		Textures = W3DNEWARRAY TextureClass *[MapCount];
 		MetalParameters = W3DNEWARRAY MetalParams[MapCount];
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h
index ade782a6ed3..0618719438d 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef METALMAP_H
-#define METALMAP_H
 
 #include <vector3.h>
 
@@ -117,5 +112,3 @@ class MetalMapManagerClass {
 	// Use 16-bit metal maps or not
 	bool					Use16Bit;
 };
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.cpp b/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.cpp
index 94bf2f82dfe..d2bfe954fa4 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.cpp
@@ -45,12 +45,12 @@ IDirect3DSurface8* MissingTexture::_Create_Missing_Surface()
 	D3DSURFACE_DESC texture_surface_desc;
 	::ZeroMemory(&texture_surface_desc, sizeof(D3DSURFACE_DESC));
 	DX8_ErrorCode(texture_surface->GetDesc(&texture_surface_desc));
-	
-	IDirect3DSurface8 *surface = NULL;	
+
+	IDirect3DSurface8 *surface = NULL;
 	DX8CALL(CreateImageSurface(
-		texture_surface_desc.Width, 
-		texture_surface_desc.Height, 
-		texture_surface_desc.Format, 
+		texture_surface_desc.Width,
+		texture_surface_desc.Height,
+		texture_surface_desc.Format,
 		&surface));
 	DX8CALL(CopyRects(texture_surface, NULL, 0, surface, NULL));
 	texture_surface->Release();
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h b/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h
index 99c2949806e..106ca115125 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8_MISSING_TEXTURE_H
-#define DX8_MISSING_TEXTURE_H
 
 #include "always.h"
 
@@ -37,6 +32,3 @@ class MissingTexture
 	static IDirect3DTexture8* _Get_Missing_Texture();		// Return a reference to missing texture
 	static IDirect3DSurface8* _Create_Missing_Surface();	// Create new surface which contain missing texture image
 };
-
-
-#endif // DX8_MISSING_TEXTURE
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pivot.cpp b/Core/Libraries/Source/WWVegas/WW3D2/pivot.cpp
index 80400355f8f..b7f1c700e66 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/pivot.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/pivot.cpp
@@ -17,43 +17,42 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/pivot.cpp 1     1/22/01 3:36p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/pivot.cpp                              $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 1/08/01 10:04a                                              $* 
- *                                                                                             * 
- *                    $Revision:: 1                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   PivotClass::PivotClass -- Constructor for PivotClass                                      * 
- *   PivotClass::Compute_Transform -- Update the pivot's transformation matrix                 * 
- *   PivotClass::Compute_Transform -- Update the pivot's transformation matrix                 * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/pivot.cpp                              $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 1/08/01 10:04a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   PivotClass::PivotClass -- Constructor for PivotClass                                      *
+ *   PivotClass::Compute_Transform -- Update the pivot's transformation matrix                 *
+ *   PivotClass::Compute_Transform -- Update the pivot's transformation matrix                 *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "pivot.h"
 #include "wwmath.h"
-#include <string.h>
 
 
-/*********************************************************************************************** 
- * PivotClass::PivotClass -- Constructor for PivotClass                                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * PivotClass::PivotClass -- Constructor for PivotClass                                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 PivotClass::PivotClass(void) :
 	Parent(NULL),
@@ -145,7 +144,7 @@ void PivotClass::Capture_Update(void)
 	const Matrix3D* ct = &CapTransform;
 #endif
 
-	if ( WorldSpaceTranslation ) 
+	if ( WorldSpaceTranslation )
 	{
 		// The Translation of CapTransform is meant to be in world space,
 		// so remove before applying orientation
@@ -158,8 +157,8 @@ void PivotClass::Capture_Update(void)
 #endif
 		// Now apply translation in world space
 		Transform.Adjust_Translation( ct->Get_Translation() );
-	} 
-	else 
+	}
+	else
 	{
 #ifdef ALLOW_TEMPORARIES
 		Matrix3D::Multiply(Transform, *ct, &(Transform));
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h
index cb5445103cb..f8ab446df9d 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h
@@ -17,30 +17,25 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/pivot.h 1     1/22/01 3:36p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/pivot.h                                $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 1/08/01 10:04a                                              $* 
- *                                                                                             * 
- *                    $Revision:: 1                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/pivot.h                                $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 1/08/01 10:04a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef PIVOT_H
-#define PIVOT_H
 
 #include "always.h"
 #include "vector3.h"
@@ -53,9 +48,9 @@
 
 	PivotClass
 
-	Each node of the hierarchy tree is represented by a 
+	Each node of the hierarchy tree is represented by a
 	PivotClass.
-	
+
 */
 
 //#define LAZY_CAP_MTX_ALLOC
@@ -68,11 +63,10 @@ struct PivotClass
 	PivotClass(const PivotClass& that);
 	PivotClass& operator=(const PivotClass& that);
 
-	~PivotClass(void) 
+	~PivotClass(void)
 	{
 #ifdef LAZY_CAP_MTX_ALLOC
-		if (CapTransformPtr)
-			delete CapTransformPtr;
+		delete CapTransformPtr;
 #endif
 	}
 
@@ -108,7 +102,3 @@ struct PivotClass
 #endif
 
 };
-
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp
index 7522ed8a190..34efa1c77d9 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp
@@ -16,57 +16,57 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /VSS_Sync/ww3d2/pointgr.cpp             $* 
- *                                                                         * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /VSS_Sync/ww3d2/pointgr.cpp             $*
+ *                                                                         *
  *                    Org Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
- *                    $Revision:: 38                                      $* 
- *                                                                         * 
+ *                    $Revision:: 38                                      $*
+ *                                                                         *
  * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- *   PointGroupClass::PointGroupClass -- PointGroupClass CTor.             * 
- *   PointGroupClass::~PointGroupClass -- PointGroupClass DTor.            * 
- *   PointGroupClass::operator = -- PointGroupClass assignment operator.   * 
- *   PointGroupClass::Set_Arrays -- Set point location/color/enable arrays.* 
- *   PointGroupClass::Set_Point_Size -- Set default point size.            * 
- *   PointGroupClass::Get_Point_Size -- Get default point size.            * 
- *   PointGroupClass::Set_Point_Color -- Set default point color.          * 
- *   PointGroupClass::Get_Point_Color -- Get default point color.          * 
- *   PointGroupClass::Set_Point_Alpha -- Set default point alpha.          * 
- *   PointGroupClass::Get_Point_Alpha -- Get default point alpha.          * 
- *   PointGroupClass::Set_Point_Orientation -- Set default point orientatio* 
- *   PointGroupClass::Get_Point_Orientation -- Get default point orientatio* 
- *   PointGroupClass::Set_Point_Frame -- Set default point frame.          * 
- *   PointGroupClass::Get_Point_Frame -- Get default point frame.          * 
- *   PointGroupClass::Set_Point_Mode -- Set point rendering method.        * 
- *   PointGroupClass::Get_Point_Mode -- Get point rendering method.        * 
- *   PointGroupClass::Set_Flag -- Set given flag to on or off.             * 
- *   PointGroupClass::Get_Flag -- Get current value (on/off) of given flag.* 
- *   PointGroupClass::Set_Texture -- Set texture used.                     * 
- *   PointGroupClass::Get_Texture -- Get texture used.                     * 
- *   PointGroupClass::Set_Shader -- Set shader used.                       * 
- *   PointGroupClass::Get_Shader -- Get shader used.                       * 
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ *   PointGroupClass::PointGroupClass -- PointGroupClass CTor.             *
+ *   PointGroupClass::~PointGroupClass -- PointGroupClass DTor.            *
+ *   PointGroupClass::operator = -- PointGroupClass assignment operator.   *
+ *   PointGroupClass::Set_Arrays -- Set point location/color/enable arrays.*
+ *   PointGroupClass::Set_Point_Size -- Set default point size.            *
+ *   PointGroupClass::Get_Point_Size -- Get default point size.            *
+ *   PointGroupClass::Set_Point_Color -- Set default point color.          *
+ *   PointGroupClass::Get_Point_Color -- Get default point color.          *
+ *   PointGroupClass::Set_Point_Alpha -- Set default point alpha.          *
+ *   PointGroupClass::Get_Point_Alpha -- Get default point alpha.          *
+ *   PointGroupClass::Set_Point_Orientation -- Set default point orientatio*
+ *   PointGroupClass::Get_Point_Orientation -- Get default point orientatio*
+ *   PointGroupClass::Set_Point_Frame -- Set default point frame.          *
+ *   PointGroupClass::Get_Point_Frame -- Get default point frame.          *
+ *   PointGroupClass::Set_Point_Mode -- Set point rendering method.        *
+ *   PointGroupClass::Get_Point_Mode -- Get point rendering method.        *
+ *   PointGroupClass::Set_Flag -- Set given flag to on or off.             *
+ *   PointGroupClass::Get_Flag -- Get current value (on/off) of given flag.*
+ *   PointGroupClass::Set_Texture -- Set texture used.                     *
+ *   PointGroupClass::Get_Texture -- Get texture used.                     *
+ *   PointGroupClass::Set_Shader -- Set shader used.                       *
+ *   PointGroupClass::Get_Shader -- Get shader used.                       *
  *   PointGroupClass::Set_Billboard -- Set whether to billboard.           *
  *   PointGroupClass::Get_Billboard -- Get whether to billboard.           *
- *   PointGroupClass::Get_Discrete_Orientation_Count_Log2 -- what it says  * 
- *   PointGroupClass::Set_Discrete_Orientation_Count_Log2 -- what it says. * 
- *   PointGroupClass::Get_Frame_Row_Column_Count_Log2 -- what it says      * 
- *   PointGroupClass::Set_Frame_Row_Column_Count_Log2 -- what it says.     * 
- *   PointGroupClass::Get_Polygon_Count -- Get estimated polygon count.    * 
- *   PointGroupClass::Render -- draw point group.                          * 
- *   PointGroupClass::vInstance -- Create instance of class.               * 
- *   PointGroupClass::sGetClassName -- Get name of class.                  * 
+ *   PointGroupClass::Get_Discrete_Orientation_Count_Log2 -- what it says  *
+ *   PointGroupClass::Set_Discrete_Orientation_Count_Log2 -- what it says. *
+ *   PointGroupClass::Get_Frame_Row_Column_Count_Log2 -- what it says      *
+ *   PointGroupClass::Set_Frame_Row_Column_Count_Log2 -- what it says.     *
+ *   PointGroupClass::Get_Polygon_Count -- Get estimated polygon count.    *
+ *   PointGroupClass::Render -- draw point group.                          *
+ *   PointGroupClass::vInstance -- Create instance of class.               *
+ *   PointGroupClass::sGetClassName -- Get name of class.                  *
  *   PointGroupClass::Update_Arrays -- Update all arrays used in rendering *
  *   PointGroupClass::Peek_Texture -- Peeks texture                        *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
@@ -77,7 +77,7 @@
 #include "statistics.h"
 #include "simplevec.h"
 #include "texture.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "vp.h"
 #include "matrix4.h"
 #include "dx8wrapper.h"
@@ -109,11 +109,11 @@ VectorClass<Vector3>		PointGroupClass::transformed_loc;		// transformed point lo
 // This array has vertex locations for screenspace mode - calculated to cover exactly 1x1 and 2x2 pixels.
 Vector3 PointGroupClass::_ScreenspaceVertexLocationSizeTable[2][3] =
 {
-	Vector3(0.5f, 0.0f, -1.0f), 
+	Vector3(0.5f, 0.0f, -1.0f),
 	Vector3(1.0f, 1.0f, -1.0f),
-	Vector3(0.0f, 1.0f, -1.0f), 
+	Vector3(0.0f, 1.0f, -1.0f),
 	Vector3(1.0f, -0.5f, -1.0f),
-	Vector3(2.7f, 2.0f, -1.0f), 
+	Vector3(2.7f, 2.0f, -1.0f),
 	Vector3(-0.7f, 2.0f, -1.0f)
 };
 
@@ -136,21 +136,21 @@ VectorClass<Vector2>			VertexUV;		// vertex texture coords
 DX8IndexBufferClass			*Tris, *Quads;						// Index buffers.
 SortingIndexBufferClass		*SortingTris, *SortingQuads;	// Sorting index buffers.
 
-/************************************************************************** 
- * PointGroupClass::PointGroupClass -- PointGroupClass CTor.              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/17/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::PointGroupClass -- PointGroupClass CTor.              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/17/1998 NH  : Created.                                            *
  *========================================================================*/
 PointGroupClass::PointGroupClass(void) :
 	PointLoc(NULL),
-	PointDiffuse(NULL),	
+	PointDiffuse(NULL),
 	APT(NULL),
 	PointSize(NULL),
 	PointOrientation(NULL),
@@ -163,7 +163,7 @@ PointGroupClass::PointGroupClass(void) :
 	PointMode(TRIS),
 	DefaultPointSize(0.0f),
 	DefaultPointColor(1.0f, 1.0f, 1.0f),
-	DefaultPointAlpha(1.0f),	
+	DefaultPointAlpha(1.0f),
 	DefaultPointOrientation(0),
 	DefaultPointFrame(0),
 	VPXMin(0.0f),
@@ -173,17 +173,17 @@ PointGroupClass::PointGroupClass(void) :
 {
 }
 
-/************************************************************************** 
- * PointGroupClass::~PointGroupClass -- PointGroupClass DTor.             * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/17/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::~PointGroupClass -- PointGroupClass DTor.             *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/17/1998 NH  : Created.                                            *
  *========================================================================*/
 PointGroupClass::~PointGroupClass(void)
 {
@@ -212,22 +212,22 @@ PointGroupClass::~PointGroupClass(void)
 		PointFrame = NULL;
 	}
 	if (Texture) {
-		REF_PTR_RELEASE(Texture);		
+		REF_PTR_RELEASE(Texture);
 		Texture = NULL;
 	}
 }
 
-/************************************************************************** 
- * PointGroupClass::operator = -- PointGroupClass assignment operator.    * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/17/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::operator = -- PointGroupClass assignment operator.    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/17/1998 NH  : Created.                                            *
  *========================================================================*/
 PointGroupClass & PointGroupClass::operator = (const PointGroupClass & that)
 {
@@ -238,40 +238,40 @@ PointGroupClass & PointGroupClass::operator = (const PointGroupClass & that)
 }
 
 
-/************************************************************************** 
- * PointGroupClass::Set_Arrays -- Set point location/color/enable arrays. * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
+/**************************************************************************
+ * PointGroupClass::Set_Arrays -- Set point location/color/enable arrays. *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
  * NOTES:	colors, alphas, APT, sizes, orientations and frames are       *
  *          optional. active_point_count can also be used with a NULL apt.*
  *          In this case active_point_count is ignored if it is -1        *
  *          (default value) and otherwise it indicates the first N active *
- *          points in the arrays.                                         * 
- *          The view plane rectangle may optionally be passed as well -   * 
- *				this is only used in SCREENSPACE mode.                        * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/17/1998 NH  : Created.                                            * 
- *   08/25/1999 NH  : Alphas added.                                       * 
- *   06/28/2000 NH  : Orientations and frames added.                      * 
+ *          points in the arrays.                                         *
+ *          The view plane rectangle may optionally be passed as well -   *
+ *				this is only used in SCREENSPACE mode.                        *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/17/1998 NH  : Created.                                            *
+ *   08/25/1999 NH  : Alphas added.                                       *
+ *   06/28/2000 NH  : Orientations and frames added.                      *
  *   02/08/2001 HY  : Upgraded to DX8                                     *
  *========================================================================*/
 void PointGroupClass::Set_Arrays(
 	ShareBufferClass<Vector3> *locs,
-	ShareBufferClass<Vector4> *diffuse,		
+	ShareBufferClass<Vector4> *diffuse,
 	ShareBufferClass<unsigned int> *apt,
 	ShareBufferClass<float> *sizes,
 	ShareBufferClass<unsigned char> *orientations,
-	ShareBufferClass<unsigned char> *frames, 
+	ShareBufferClass<unsigned char> *frames,
 	int active_point_count,
-	float vpxmin, 
-	float vpymin, 
-	float vpxmax, 
+	float vpxmin,
+	float vpymin,
+	float vpxmax,
 	float vpymax)
 {
 	// The point locations array is NOT optional!
@@ -304,17 +304,17 @@ void PointGroupClass::Set_Arrays(
 	VPYMax = vpymax;
 }
 
-/************************************************************************** 
- * PointGroupClass::Set_Point_Size -- Set default point size.             * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS: This size is ignored if a size array is present.             * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/17/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Set_Point_Size -- Set default point size.             *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS: This size is ignored if a size array is present.             *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/17/1998 NH  : Created.                                            *
  *========================================================================*/
 void PointGroupClass::Set_Point_Size(float size)
 {
@@ -322,17 +322,17 @@ void PointGroupClass::Set_Point_Size(float size)
 }
 
 
-/************************************************************************** 
- * PointGroupClass::Get_Point_Size -- Get default point size.             * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS: This size is ignored if a size array is present.             * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/17/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Get_Point_Size -- Get default point size.             *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS: This size is ignored if a size array is present.             *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/17/1998 NH  : Created.                                            *
  *========================================================================*/
 float PointGroupClass::Get_Point_Size(void)
 {
@@ -340,51 +340,51 @@ float PointGroupClass::Get_Point_Size(void)
 }
 
 
-/************************************************************************** 
- * PointGroupClass::Set_Point_Color -- Set default point color.           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS: This color is ignored if a color array is present.           * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/20/1999 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Set_Point_Color -- Set default point color.           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS: This color is ignored if a color array is present.           *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/20/1999 NH  : Created.                                            *
  *========================================================================*/
 void PointGroupClass::Set_Point_Color(Vector3 color)
 {
 	DefaultPointColor = color;
 }
 
-/************************************************************************** 
- * PointGroupClass::Get_Point_Color -- Get default point color.           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS: This color is ignored if a color array is present.           * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/20/1999 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Get_Point_Color -- Get default point color.           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS: This color is ignored if a color array is present.           *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/20/1999 NH  : Created.                                            *
  *========================================================================*/
 Vector3 PointGroupClass::Get_Point_Color(void)
 {
 	return DefaultPointColor;
 }
 
-/************************************************************************** 
- * PointGroupClass::Set_Point_Alpha -- Set default point alpha.           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS: This alpha is ignored if an alpha array is present.          * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   08/25/1999 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Set_Point_Alpha -- Set default point alpha.           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS: This alpha is ignored if an alpha array is present.          *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   08/25/1999 NH  : Created.                                            *
  *========================================================================*/
 void PointGroupClass::Set_Point_Alpha(float alpha)
 {
@@ -392,17 +392,17 @@ void PointGroupClass::Set_Point_Alpha(float alpha)
 }
 
 
-/************************************************************************** 
- * PointGroupClass::Get_Point_Alpha -- Get default point alpha.           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS: This alpha is ignored if an alpha array is present.          * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   08/25/1999 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Get_Point_Alpha -- Get default point alpha.           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS: This alpha is ignored if an alpha array is present.          *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   08/25/1999 NH  : Created.                                            *
  *========================================================================*/
 float PointGroupClass::Get_Point_Alpha(void)
 {
@@ -410,19 +410,19 @@ float PointGroupClass::Get_Point_Alpha(void)
 }
 
 
-/************************************************************************** 
- * PointGroupClass::Set_Point_Orientation -- Set default point orientation* 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS: This is ignored if an orientation array is present.          * 
- *                                                                        * 
+/**************************************************************************
+ * PointGroupClass::Set_Point_Orientation -- Set default point orientation*
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS: This is ignored if an orientation array is present.          *
+ *                                                                        *
  * NOTE: No need to ensure value in valid range - it will be masked later.*
- *                                                                        * 
- * HISTORY:                                                               * 
- *   06/28/2000 NH  : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   06/28/2000 NH  : Created.                                            *
  *========================================================================*/
 void PointGroupClass::Set_Point_Orientation(unsigned char orientation)
 {
@@ -430,17 +430,17 @@ void PointGroupClass::Set_Point_Orientation(unsigned char orientation)
 }
 
 
-/************************************************************************** 
- * PointGroupClass::Get_Point_Orientation -- Get default point orientation* 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS: This is ignored if an orientation array is present.          * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   06/28/2000 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Get_Point_Orientation -- Get default point orientation*
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS: This is ignored if an orientation array is present.          *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   06/28/2000 NH  : Created.                                            *
  *========================================================================*/
 unsigned char PointGroupClass::Get_Point_Orientation(void)
 {
@@ -448,19 +448,19 @@ unsigned char PointGroupClass::Get_Point_Orientation(void)
 }
 
 
-/************************************************************************** 
- * PointGroupClass::Set_Point_Frame -- Set default point frame.           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS: This frame is ignored if an frame array is present.          * 
- *                                                                        * 
+/**************************************************************************
+ * PointGroupClass::Set_Point_Frame -- Set default point frame.           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS: This frame is ignored if an frame array is present.          *
+ *                                                                        *
  * NOTE: No need to ensure value in valid range - it will be masked later.*
- *                                                                        * 
- * HISTORY:                                                               * 
- *   06/28/2000 NH  : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   06/28/2000 NH  : Created.                                            *
  *========================================================================*/
 void PointGroupClass::Set_Point_Frame(unsigned char frame)
 {
@@ -468,17 +468,17 @@ void PointGroupClass::Set_Point_Frame(unsigned char frame)
 }
 
 
-/************************************************************************** 
- * PointGroupClass::Get_Point_Frame -- Get default point frame.           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS: This frame is ignored if an frame array is present.          * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   06/28/2000 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Get_Point_Frame -- Get default point frame.           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS: This frame is ignored if an frame array is present.          *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   06/28/2000 NH  : Created.                                            *
  *========================================================================*/
 unsigned char PointGroupClass::Get_Point_Frame(void)
 {
@@ -486,17 +486,17 @@ unsigned char PointGroupClass::Get_Point_Frame(void)
 }
 
 
-/************************************************************************** 
- * PointGroupClass::Set_Point_Mode -- Set point rendering method.         * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/17/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Set_Point_Mode -- Set point rendering method.         *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/17/1998 NH  : Created.                                            *
  *========================================================================*/
 void PointGroupClass::Set_Point_Mode(PointModeEnum mode)
 {
@@ -504,17 +504,17 @@ void PointGroupClass::Set_Point_Mode(PointModeEnum mode)
 }
 
 
-/************************************************************************** 
- * PointGroupClass::Get_Point_Mode -- Get point rendering method.         * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/17/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Get_Point_Mode -- Get point rendering method.         *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/17/1998 NH  : Created.                                            *
  *========================================================================*/
 PointGroupClass::PointModeEnum PointGroupClass::Get_Point_Mode(void)
 {
@@ -522,52 +522,52 @@ PointGroupClass::PointModeEnum PointGroupClass::Get_Point_Mode(void)
 }
 
 
-/************************************************************************** 
- * Set_Flag -- PointGroupClass::Set given flag to on or off.              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/17/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * Set_Flag -- PointGroupClass::Set given flag to on or off.              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/17/1998 NH  : Created.                                            *
  *========================================================================*/
 void PointGroupClass::Set_Flag(FlagsType flag, bool onoff)
 {
-	if (onoff) Flags|=1<<flag; 
-	else 
+	if (onoff) Flags|=1<<flag;
+	else
 		Flags&=~(1<<flag);
 }
 
-/************************************************************************** 
+/**************************************************************************
  * PointGroupClass::Get_Flag -- Get current value (on/off) of given flag. *
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/17/1998 NH  : Created.                                            * 
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/17/1998 NH  : Created.                                            *
  *========================================================================*/
 int PointGroupClass::Get_Flag(FlagsType flag)
 {
 	return (Flags>>flag) & 0x1;
 }
 
-/************************************************************************** 
- * PointGroupClass::Set_Texture -- Set texture used.                      * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * PointGroupClass::Set_Texture -- Set texture used.                      *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *   11/17/1998 NH  : Created.                                            *
  *   02/08/2001 HY  : Upgraded to DX8                                     *
  *========================================================================*/
@@ -576,16 +576,16 @@ void PointGroupClass::Set_Texture(TextureClass* texture)
 	REF_PTR_SET(Texture,texture);
 }
 
-/************************************************************************** 
- * PointGroupClass::Get_Texture -- Get texture used.                      * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * PointGroupClass::Get_Texture -- Get texture used.                      *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *   11/17/1998 NH  : Created.                                            *
  *   02/08/2001 HY  : Upgraded to DX8                                     *
  *========================================================================*/
@@ -616,13 +616,13 @@ TextureClass * PointGroupClass::Peek_Texture(void)
 	return Texture;
 }
 
-/************************************************************************** 
- * PointGroupClass::Set_Shader -- Set shader used.                        * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
+/**************************************************************************
+ * PointGroupClass::Set_Shader -- Set shader used.                        *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
  * WARNINGS:	the primary gradient will be set to MODULATE/DISABLE in    *
  * 				the shader depending on whether a color or alpha array was *
  * 				passed in Set_Point_Arrays. also, texturing will be        *
@@ -630,8 +630,8 @@ TextureClass * PointGroupClass::Peek_Texture(void)
  * 				texture was set.                                           *
  *					these will override the primary gradient/texturing         *
  *					settings in the given shader.                              *
- *                                                                        * 
- * HISTORY:                                                               * 
+ *                                                                        *
+ * HISTORY:                                                               *
  *   11/17/1998 NH  : Created.                                            *
  *   02/08/2001 HY  : Upgraded to DX8                                     *
  *========================================================================*/
@@ -641,17 +641,17 @@ void PointGroupClass::Set_Shader(ShaderClass shader)
 }
 
 
-/************************************************************************** 
- * PointGroupClass::Get_Shader -- Get shader used.                        * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/17/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Get_Shader -- Get shader used.                        *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/17/1998 NH  : Created.                                            *
  *   02/08/2001 HY  : Upgraded to DX8                                     *
  *========================================================================*/
 ShaderClass PointGroupClass::Get_Shader(void)
@@ -659,16 +659,16 @@ ShaderClass PointGroupClass::Get_Shader(void)
 	return Shader;
 }
 
-/************************************************************************** 
- * PointGroupClass::Set_Billboard -- Set whether to Billboard.            * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * PointGroupClass::Set_Billboard -- Set whether to Billboard.            *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *   04/25/2002 JM  : Created.                                            *
  *========================================================================*/
 void PointGroupClass::Set_Billboard(bool shouldBillboard)
@@ -676,16 +676,16 @@ void PointGroupClass::Set_Billboard(bool shouldBillboard)
 	Billboard = shouldBillboard;
 }
 
-/************************************************************************** 
- * PointGroupClass::Get_Billboard -- Get whether to Billboard.            * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * PointGroupClass::Get_Billboard -- Get whether to Billboard.            *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *   04/25/2002 JM  : Created.                                            *
  *========================================================================*/
 bool PointGroupClass::Get_Billboard(void)
@@ -693,18 +693,18 @@ bool PointGroupClass::Get_Billboard(void)
 	return Billboard;
 }
 
-/************************************************************************** 
- * PointGroupClass::Get_Frame_Row_Column_Count_Log2 -- what it says       * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   06/28/2000 NH  : Created.                                            * 
- *   02/08/2001 HY  : Upgraded to DX8                                     * 
+/**************************************************************************
+ * PointGroupClass::Get_Frame_Row_Column_Count_Log2 -- what it says       *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   06/28/2000 NH  : Created.                                            *
+ *   02/08/2001 HY  : Upgraded to DX8                                     *
  *========================================================================*/
 unsigned char PointGroupClass::Get_Frame_Row_Column_Count_Log2(void)
 {
@@ -712,16 +712,16 @@ unsigned char PointGroupClass::Get_Frame_Row_Column_Count_Log2(void)
 }
 
 
-/************************************************************************** 
- * PointGroupClass::Set_Frame_Row_Column_Count_Log2 -- what it says.      * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * PointGroupClass::Set_Frame_Row_Column_Count_Log2 -- what it says.      *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *   06/28/2000 NH  : Created.                                            *
  *   02/08/2001 HY  : Upgraded to DX8                                     *
  *========================================================================*/
@@ -730,17 +730,17 @@ void PointGroupClass::Set_Frame_Row_Column_Count_Log2(unsigned char frccl2)
 	FrameRowColumnCountLog2 = MIN(frccl2, 4);
 }
 
-/************************************************************************** 
- * PointGroupClass::Get_Polygon_Count -- Get estimated polygon count.     * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/18/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Get_Polygon_Count -- Get estimated polygon count.     *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/18/1998 NH  : Created.                                            *
  *   02/08/2001 HY  : Upgraded to DX8                                     *
  *========================================================================*/
 int PointGroupClass::Get_Polygon_Count(void)
@@ -758,17 +758,17 @@ int PointGroupClass::Get_Polygon_Count(void)
 	return 0;
 }
 
-/************************************************************************** 
- * PointGroupClass::Render -- draw point group.                           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   12/10/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Render -- draw point group.                           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   12/10/1998 NH  : Created.                                            *
  *   02/08/2001 HY  : Upgraded to DX8                                     *
  *========================================================================*/
 static SimpleVecClass<unsigned long> remap;
@@ -789,7 +789,7 @@ void PointGroupClass::Render(RenderInfoClass &rinfo)
 
 	// Pointers which point into existing buffers (member or static):
 	Vector3 *current_loc = NULL;
-	Vector4 *current_diffuse = NULL;	
+	Vector4 *current_diffuse = NULL;
 	float *current_size = NULL;
 	unsigned char *current_orient = NULL;
 	unsigned char *current_frame = NULL;
@@ -837,7 +837,7 @@ void PointGroupClass::Render(RenderInfoClass &rinfo)
 			VectorProcessorClass::CopyIndexed(&compressed_diffuse[0],
 				PointDiffuse->Get_Array(), APT->Get_Array(), PointCount);
 			current_diffuse = &compressed_diffuse[0];
-		}		
+		}
 		if (PointSize) {
 			if (compressed_size.Length() < PointCount) {
 				compressed_size.Resize(PointCount * 2);
@@ -866,7 +866,7 @@ void PointGroupClass::Render(RenderInfoClass &rinfo)
 		current_loc = PointLoc->Get_Array();
 		if (PointDiffuse) {
 			current_diffuse = PointDiffuse->Get_Array();
-		}		
+		}
 		if (PointSize) {
 			current_size = PointSize->Get_Array();
 		}
@@ -887,27 +887,27 @@ void PointGroupClass::Render(RenderInfoClass &rinfo)
 
 	// need to interrupt this processing. If we are not billboarding, then we need the actual position
 	// of the vertice to lay it down flat.
-	
+
 	// (gth) changed this 'if' to use OR rather than AND... The way it was caused all emitters to break
 	if (Get_Flag(TRANSFORM) && Billboard) {
 		// Resize transformed location array if needed (2x guardband to prevent
 		// frequent reallocations):
 		if (transformed_loc.Length() < PointCount) {
 			transformed_loc.Resize(PointCount * 2);
-		}		
+		}
 		// Not using vector processor class because we are discarding w
 		// Not using T&L in DX8 because we don't want DX8 to transform
 		// 3 times per particle when we can do it once
 		for (int i=0; i<PointCount; i++)
-		{			
+		{
 			/// @todo lorenzen sez: use pointer arithmetic here and a fast while loop
 			Vector4 result=view*current_loc[i];
 			transformed_loc[i].X=result.X;
 			transformed_loc[i].Y=result.Y;
 			transformed_loc[i].Z=result.Z;
-		}		
-		current_loc = &transformed_loc[0];				
-	} // if transform
+		}
+		current_loc = &transformed_loc[0];
+	}
 
 	// Update the arrays with the offsets.
 	int vnum, pnum;
@@ -917,10 +917,10 @@ void PointGroupClass::Render(RenderInfoClass &rinfo)
 
 	// the locations are now in view space
 	// so set world and view matrices to identity and render
-	
+
 	Matrix4x4 identity(true);
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,identity);	
-	DX8Wrapper::Set_Transform(D3DTS_VIEW,identity);	
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,identity);
+	DX8Wrapper::Set_Transform(D3DTS_VIEW,identity);
 
 	DX8Wrapper::Set_Material(PointMaterial);
 	DX8Wrapper::Set_Shader(Shader);
@@ -953,8 +953,8 @@ void PointGroupClass::Render(RenderInfoClass &rinfo)
 		{
 			DynamicVBAccessClass::WriteLockClass Lock(&PointVerts);
 			int i;
-			unsigned char *vb=(unsigned char*)Lock.Get_Formatted_Vertex_Array();			
-			const FVFInfoClass& fvfinfo=PointVerts.FVF_Info();			
+			unsigned char *vb=(unsigned char*)Lock.Get_Formatted_Vertex_Array();
+			const FVFInfoClass& fvfinfo=PointVerts.FVF_Info();
 
 			for (i = current; i < current + delta; i++)
 			{
@@ -972,13 +972,13 @@ void PointGroupClass::Render(RenderInfoClass &rinfo)
 						DX8Wrapper::Convert_Color_Clamp(Vector4(DefaultPointColor[0],DefaultPointColor[1],DefaultPointColor[2],DefaultPointAlpha));
 				*(Vector2*)(vb+fvfinfo.Get_Tex_Offset(0))=VertexUV[i];
 				vb+=fvfinfo.Get_FVF_Size();
-			}			
-		} // copy
+			}
+		}
 
 		DX8Wrapper::Set_Index_Buffer (indexbuffer, 0);
 		DX8Wrapper::Set_Vertex_Buffer (PointVerts);
-		
-		if ( sort ) 
+
+		if ( sort )
 		{
 				SortingRendererClass::Insert_Triangles (0, delta / verticesperprimitive, 0, delta);
 		}
@@ -986,9 +986,9 @@ void PointGroupClass::Render(RenderInfoClass &rinfo)
 		{
 			DX8Wrapper::Draw_Triangles (0, delta / verticesperprimitive, 0, delta);
 		}
-		
+
 		current+=delta;
-	} // loop while (current<vnum)							  
+	}
 
 	// restore the matrices
 	DX8Wrapper::Set_Transform(D3DTS_VIEW,view);
@@ -1000,27 +1000,27 @@ void PointGroupClass::Render(RenderInfoClass &rinfo)
 
 
 
-/************************************************************************** 
- * PointGroupClass::Update_Arrays -- Update all arrays used in rendering  * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   11/17/1998 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::Update_Arrays -- Update all arrays used in rendering  *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   11/17/1998 NH  : Created.                                            *
  *========================================================================*/
 void PointGroupClass::Update_Arrays(
-	Vector3 *point_loc, 
-	Vector4 *point_diffuse,	
-	float *point_size, 
-	unsigned char *point_orientation, 
+	Vector3 *point_loc,
+	Vector4 *point_diffuse,
+	float *point_size,
+	unsigned char *point_orientation,
 	unsigned char *point_frame,
-	int active_points, 
-	int total_points, 
-	int &vnum, 
+	int active_points,
+	int total_points,
+	int &vnum,
 	int &pnum)
 {
 	int verts_per_point = (PointMode == QUADS) ? 4 : 3;
@@ -1033,7 +1033,7 @@ void PointGroupClass::Update_Arrays(
 	int total_vnum = verts_per_point * total_points;
 	vnum = verts_per_point * active_points;
 	pnum = polys_per_point * active_points;
-	
+
 	// Resize the arrays if they are too small. We only need to check the length of one array
 	// since they always all have the same length.
 
@@ -1041,7 +1041,7 @@ void PointGroupClass::Update_Arrays(
 
 	if (VertexLoc.Length() < total_vnum) {
 		// Resize arrays (2x guardband to prevent frequent reallocations).
-		VertexLoc.Resize(total_vnum * 2, NULL);		
+		VertexLoc.Resize(total_vnum * 2, NULL);
 		VertexUV.Resize(total_vnum * 2, NULL);
 		VertexDiffuse.Resize(total_vnum * 2, NULL);
 	}
@@ -1212,7 +1212,7 @@ void PointGroupClass::Update_Arrays(
 						// If we're not billboarding, then the coordinate we have is in screen space.
 						Matrix4x4 rotMat;
 						D3DXMatrixRotationZ(&(D3DXMATRIX&) rotMat, ((float)point_orientation[i] / 255.0f * 2 * D3DX_PI));
-						
+
 						Vector4 orientedVecX = rotMat * GroundMultiplierX;
 						Vector4 orientedVecY = rotMat * GroundMultiplierY;
 
@@ -1280,10 +1280,10 @@ void PointGroupClass::Update_Arrays(
    			int xres, yres, bitdepth;
    			bool windowed;
    			WW3D::Get_Render_Target_Resolution(xres, yres, bitdepth, windowed);
-   
+
    			float x_scale = (VPXMax - VPXMin) / xres;
    			float y_scale = (VPYMax - VPYMin) / yres;
-   
+
 				Vector3 scaled_locs[2][3];
 				for (int i = 0; i < 2; i++) {
 					for (int j = 0; j < 3; j++) {
@@ -1303,7 +1303,7 @@ void PointGroupClass::Update_Arrays(
 				}
 			}
 			break;
-			
+
 		case SCREEN_SIZE_NOORIENT:
 		case SCREEN_SIZE_ORIENT:
 			{
@@ -1314,10 +1314,10 @@ void PointGroupClass::Update_Arrays(
    			int xres, yres, bitdepth;
    			bool windowed;
    			WW3D::Get_Render_Target_Resolution(xres, yres, bitdepth, windowed);
-   
+
    			float x_scale = (VPXMax - VPXMin) / xres;
    			float y_scale = (VPYMax - VPYMin) / yres;
-   
+
 				Vector3 scaled_locs[2][3];
 				for (int i = 0; i < 2; i++) {
 					for (int j = 0; j < 3; j++) {
@@ -1410,7 +1410,7 @@ void PointGroupClass::Update_Arrays(
 	*/
 	/// @todo lorenzen sez: use a quicker, unwrapped loop, and pointer arithmetic
 	/// @todo lorenzen sez: this is a leaf function, dang it
-	vert = 0;	
+	vert = 0;
 	if (point_diffuse) {
 		Vector4* vertex_color = &VertexDiffuse[0];
 		for (i = 0; i < active_points; i++) {
@@ -1423,17 +1423,17 @@ void PointGroupClass::Update_Arrays(
 }
 
 
-/************************************************************************** 
- * PointGroupClass::_Init -- Create static data.                          * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   06/28/2000 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::_Init -- Create static data.                          *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   06/28/2000 NH  : Created.                                            *
  *========================================================================*/
 void PointGroupClass::_Init(void)
 {
@@ -1445,8 +1445,8 @@ void PointGroupClass::_Init(void)
 
 	// Unrotated locations
 	Vector3 tri_locs[3] = {
-		Vector3(0.0f, -2.0f, 0.0f), 
-		Vector3(-1.732f, 1.0f, 0.0f), 
+		Vector3(0.0f, -2.0f, 0.0f),
+		Vector3(-1.732f, 1.0f, 0.0f),
 		Vector3(1.732f, 1.0f, 0.0f)
 	};
 	Vector3 quad_locs[4] = {
@@ -1526,17 +1526,17 @@ void PointGroupClass::_Init(void)
 	}
 
 	// Create the IBs
-	Tris=NEW_REF(DX8IndexBufferClass,(MAX_TRI_IB_SIZE));	
-	Quads=NEW_REF(DX8IndexBufferClass,(MAX_QUAD_IB_SIZE));	
-	SortingTris=NEW_REF(SortingIndexBufferClass,(MAX_TRI_IB_SIZE));	
-	SortingQuads=NEW_REF(SortingIndexBufferClass,(MAX_QUAD_IB_SIZE));	
+	Tris=NEW_REF(DX8IndexBufferClass,(MAX_TRI_IB_SIZE));
+	Quads=NEW_REF(DX8IndexBufferClass,(MAX_QUAD_IB_SIZE));
+	SortingTris=NEW_REF(SortingIndexBufferClass,(MAX_TRI_IB_SIZE));
+	SortingQuads=NEW_REF(SortingIndexBufferClass,(MAX_QUAD_IB_SIZE));
 
 	// Fill up the IBs
 	{
 		DX8IndexBufferClass::WriteLockClass locktris(Tris);
-		unsigned short *ib=locktris.Get_Index_Array();	
+		unsigned short *ib=locktris.Get_Index_Array();
 		for (i=0; i<MAX_TRI_IB_SIZE; i++) ib[i]=(unsigned short) i;
-	}	
+	}
 
 	{
 		unsigned short vert=0;
@@ -1550,19 +1550,19 @@ void PointGroupClass::_Init(void)
 			ib[i]=vert;
 			ib[i+1]=vert+1;
 			ib[i+2]=vert+2;
-			
+
 			ib[i+3]=vert+2;
 			ib[i+4]=vert+3;
 			ib[i+5]=vert;
 			vert+=4;
 		}
-	}	
+	}
 
 	{
 		SortingIndexBufferClass::WriteLockClass locktris(SortingTris);
-		unsigned short *ib=locktris.Get_Index_Array();	
+		unsigned short *ib=locktris.Get_Index_Array();
 		for (i=0; i<MAX_TRI_IB_SIZE; i++) ib[i]=(unsigned short) i;
-	}	
+	}
 
 	{
 		unsigned short vert=0;
@@ -1575,29 +1575,29 @@ void PointGroupClass::_Init(void)
 			ib[i]=vert;
 			ib[i+1]=vert+1;
 			ib[i+2]=vert+2;
-			
+
 			ib[i+3]=vert+2;
 			ib[i+4]=vert+3;
 			ib[i+5]=vert;
 			vert+=4;
 		}
-	}	
+	}
 
 	PointMaterial=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 }
 
 
-/************************************************************************** 
- * PointGroupClass::_Shutdown -- Destroy static data.                     * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   06/28/2000 NH  : Created.                                            * 
+/**************************************************************************
+ * PointGroupClass::_Shutdown -- Destroy static data.                     *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   06/28/2000 NH  : Created.                                            *
  *========================================================================*/
 void PointGroupClass::_Shutdown(void)
 {
@@ -1621,22 +1621,22 @@ void PointGroupClass::_Shutdown(void)
 
 
 
-/************************************************************************** 
- * PointGroupClass::RenderVolumeParticles -- draw a point group.sandwich  * 
- *                                                                        * 
- *	This is a specialized renderer. It will draw the particle repeatedly  * 
+/**************************************************************************
+ * PointGroupClass::RenderVolumeParticles -- draw a point group.sandwich  *
+ *                                                                        *
+ *	This is a specialized renderer. It will draw the particle repeatedly  *
  *  while attenuating opacity appropriately, and bumping the z-position.  *
- *  This is actually done by cloning the particle over and over at        * 
+ *  This is actually done by cloning the particle over and over at        *
  *  successively closer positions to the camera. Very Slow!               *
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:      USE SPARINGLY, IT IS EXPENSIVE!!!!!                     * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   12/03/2002	Mark Lorenzen		Created.                                  * 
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:      USE SPARINGLY, IT IS EXPENSIVE!!!!!                     *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   12/03/2002	Mark Lorenzen		Created.                                  *
  *																		                                    *
  *========================================================================*/
 #define MAX_VOLUME_PARTICLE_DEPTH ( 16 )
@@ -1654,14 +1654,14 @@ void PointGroupClass::RenderVolumeParticle(RenderInfoClass &rinfo, unsigned int
 
 	Shader.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);
 
-	if (PointCount == 0) 
+	if (PointCount == 0)
 		return;
 
 	WWASSERT(PointLoc && PointLoc->Get_Array());
 
 	// Pointers which point into existing buffers (member or static):
 	Vector3 *current_loc = NULL;
-	Vector4 *current_diffuse = NULL;	
+	Vector4 *current_diffuse = NULL;
 	float *current_size = NULL;
 	unsigned char *current_orient = NULL;
 	unsigned char *current_frame = NULL;
@@ -1723,7 +1723,7 @@ void PointGroupClass::RenderVolumeParticle(RenderInfoClass &rinfo, unsigned int
 				VectorProcessorClass::CopyIndexed(&compressed_diffuse[0],
 					PointDiffuse->Get_Array(), APT->Get_Array(), PointCount);
 				current_diffuse = &compressed_diffuse[0];
-			}		
+			}
 			if (PointSize) {
 				if (compressed_size.Length() < PointCount) {
 					compressed_size.Resize(PointCount * 2);
@@ -1752,7 +1752,7 @@ void PointGroupClass::RenderVolumeParticle(RenderInfoClass &rinfo, unsigned int
 			current_loc = PointLoc->Get_Array();
 			if (PointDiffuse) {
 				current_diffuse = PointDiffuse->Get_Array();
-			}		
+			}
 			if (PointSize) {
 				current_size = PointSize->Get_Array();
 			}
@@ -1778,7 +1778,7 @@ void PointGroupClass::RenderVolumeParticle(RenderInfoClass &rinfo, unsigned int
 			// frequent reallocations):
 			if (transformed_loc.Length() < PointCount) {
 				transformed_loc.Resize(PointCount * 2);
-			}		
+			}
 			// Not using vector processor class because we are discarding w
 			// Not using T&L in DX8 because we don't want DX8 to transform
 			// 3 times per particle when we can do it once
@@ -1790,7 +1790,7 @@ void PointGroupClass::RenderVolumeParticle(RenderInfoClass &rinfo, unsigned int
 			Vector3 cameraPosition = rinfo.Camera.Get_Position();
 
 			for (int i=0; i<PointCount; i++)
-			{			
+			{
 				/// @todo lorenzen sez: use pointer arithmetic here and a fast while loop
 				Vector3 cameraToPointDelta;
 				Vector3::Subtract( cameraPosition, current_loc[i], &cameraToPointDelta );
@@ -1808,9 +1808,9 @@ void PointGroupClass::RenderVolumeParticle(RenderInfoClass &rinfo, unsigned int
 				transformed_loc[i].X=result.X;
 				transformed_loc[i].Y=result.Y;
 				transformed_loc[i].Z=result.Z;
-			}		
-			current_loc = &transformed_loc[0];				
-		} // if transform
+			}
+			current_loc = &transformed_loc[0];
+		}
 
 		// Update the arrays with the offsets.
 		int vnum, pnum;
@@ -1826,10 +1826,10 @@ void PointGroupClass::RenderVolumeParticle(RenderInfoClass &rinfo, unsigned int
 
 		// the locations are now in view space
 		// so set world and view matrices to identity and render
-		
+
 		Matrix4x4 identity(true);
-		DX8Wrapper::Set_Transform(D3DTS_WORLD,identity);	
-		DX8Wrapper::Set_Transform(D3DTS_VIEW,identity);	
+		DX8Wrapper::Set_Transform(D3DTS_WORLD,identity);
+		DX8Wrapper::Set_Transform(D3DTS_VIEW,identity);
 
 		DX8Wrapper::Set_Material(PointMaterial);
 		DX8Wrapper::Set_Shader(Shader);
@@ -1865,8 +1865,8 @@ void PointGroupClass::RenderVolumeParticle(RenderInfoClass &rinfo, unsigned int
 			{
 				DynamicVBAccessClass::WriteLockClass Lock(&PointVerts);
 				int i;
-				unsigned char *vb=(unsigned char*)Lock.Get_Formatted_Vertex_Array();			
-				const FVFInfoClass& fvfinfo = PointVerts.FVF_Info();			
+				unsigned char *vb=(unsigned char*)Lock.Get_Formatted_Vertex_Array();
+				const FVFInfoClass& fvfinfo = PointVerts.FVF_Info();
 
 
 				for (i = current; i < current + delta; i++)
@@ -1886,27 +1886,27 @@ void PointGroupClass::RenderVolumeParticle(RenderInfoClass &rinfo, unsigned int
 							DX8Wrapper::Convert_Color_Clamp(Vector4(DefaultPointColor[0],DefaultPointColor[1],DefaultPointColor[2],DefaultPointAlpha));
 					*(Vector2*)(vb+fvfinfo.Get_Tex_Offset(0))=VertexUV[i];
 					vb+=fvfinfo.Get_FVF_Size();
-				}			
-			} // copy
+				}
+			}
 
 			DX8Wrapper::Set_Index_Buffer (indexbuffer, 0);
 			DX8Wrapper::Set_Vertex_Buffer (PointVerts);
-			
+
 			/// @todo lorenzen sez: precompute these params, above
 
 
-			if ( sort ) 
+			if ( sort )
 					SortingRendererClass::Insert_Triangles (0, delta / verticesperprimitive, 0, delta);
 			else
 				DX8Wrapper::Draw_Triangles (0, delta / verticesperprimitive, 0, delta);
-			
+
 
 			current+=delta;
-		} // loop while (current<vnum)							  
+		}
 
 
 
-	}// next volume layer
+	}
 
 
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h
index 7ff79e1f8f6..021c56e5493 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h
@@ -16,44 +16,39 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/pointgr.h          $* 
- *                                                                         * 
- *                      $Author:: Naty_h                                  $* 
- *                                                                         * 
- *                     $Modtime:: 8/02/01 8:34p                           $* 
- *                                                                         * 
- *                    $Revision:: 10                                      $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/pointgr.h          $*
+ *                                                                         *
+ *                      $Author:: Naty_h                                  $*
+ *                                                                         *
+ *                     $Modtime:: 8/02/01 8:34p                           $*
+ *                                                                         *
+ *                    $Revision:: 10                                      $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef POINTGR_H
-#define POINTGR_H
 
 #include "sharebuf.h"
 #include "shader.h"
 #include "vector4.h"
 #include "vector3.h"
 #include "vector2.h"
-#include "Vector.H"
+#include "Vector.h"
 
 class VertexMaterialClass;
 class RenderInfoClass;
 class TextureClass;
 
 /*
-** PointGroupClass -- a custom object for rendering 
+** PointGroupClass -- a custom object for rendering
 ** groups of points (such as particle systems).
 ** It is possible to change mode/number of points/shader/etc. but these
 ** changes tend to be expensive if done often. Expected usage is to set the
@@ -62,7 +57,7 @@ class TextureClass;
 ** NOTE: Currently it is implemented using general triangles (1 or 2 per
 ** point), so it is probably suboptimal for software rasterization devices
 ** (which would probably perform better with some kind of blit/sprite code).
-*/ 
+*/
 class PointGroupClass
 {
 public:
@@ -83,7 +78,7 @@ class PointGroupClass
 
 	// PointGroupClass interface:
 	void						Set_Arrays(ShareBufferClass<Vector3> *locs,
-									ShareBufferClass<Vector4> *diffuse = NULL,																		
+									ShareBufferClass<Vector4> *diffuse = NULL,
 									ShareBufferClass<unsigned int> *apt = NULL,
 									ShareBufferClass<float> *sizes = NULL,
 									ShareBufferClass<unsigned char> *orientations = NULL,
@@ -128,18 +123,18 @@ class PointGroupClass
 protected:
 	// Update arrays.
 	void						Update_Arrays(Vector3 *point_loc,
-									Vector4 *point_diffuse,									
+									Vector4 *point_diffuse,
 									float *point_size,
 									unsigned char *point_orientation,
-									unsigned char *point_frame, 
+									unsigned char *point_frame,
 									int active_points,
-									int total_points, 
-									int &vnum, 
+									int total_points,
+									int &vnum,
 									int &pnum);
 
 	// These shared buffers are used for communication to the point group - to
 	// pass point locations, colors and enables. The location and color arrays
-	// are 'compressed' using the active point table (if present) and then 
+	// are 'compressed' using the active point table (if present) and then
 	// are processed into other arrays which are passed to the GERD.
 	// SR rather than WWMath types are used so Vector Processors can be used.
 	// The arrays override the default value if present.
@@ -175,7 +170,7 @@ class PointGroupClass
 	unsigned int			Flags;						// operation control flags
 	float						DefaultPointSize;			// point size (size array overrides if present)
 	Vector3					DefaultPointColor;		// point color (color array overrides if present)
-	float						DefaultPointAlpha;		// point alpha (alpha array overrides if present)	
+	float						DefaultPointAlpha;		// point alpha (alpha array overrides if present)
 	unsigned char			DefaultPointOrientation;// point orientation (orientation array overrides if present)
 	unsigned char			DefaultPointFrame;		// point texture frame (frame array overrides if present)
 
@@ -236,7 +231,3 @@ class SegmentGroupClass : public PointGroupClass
 	virtual ~SegmentGroupClass(void);
 
 };
-
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp b/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp
index 8cacc07731b..0e5751d1939 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp
@@ -42,7 +42,7 @@
 #include "vertmaterial.h"
 #include "shader.h"
 
-void PolygonInfoClass::Set_Texture(TextureClass *texture) 
+void PolygonInfoClass::Set_Texture(TextureClass *texture)
 {
 	if(texture)
 		texture->Add_Ref();
@@ -50,7 +50,7 @@ void PolygonInfoClass::Set_Texture(TextureClass *texture)
 		Texture->Release_Ref();
 	Texture = texture;
 }
-void PolygonInfoClass::Set_Vertex_Material(VertexMaterialClass *vertexMaterial) 
+void PolygonInfoClass::Set_Vertex_Material(VertexMaterialClass *vertexMaterial)
 {
 	if(vertexMaterial)
 		vertexMaterial->Add_Ref();
@@ -62,8 +62,7 @@ void PolygonInfoClass::Set_Vertex_Material(VertexMaterialClass *vertexMaterial)
 
 void PolygonInfoClass::Set_Shader(ShaderClass *shader)
 {
-	if(Shader)
-		delete Shader;
+	delete Shader;
 
 	// todo : update for refcounted shaders
 	Shader = W3DNEW ShaderClass(* shader);
@@ -77,9 +76,8 @@ PolygonInfoClass::~PolygonInfoClass()
 	if(VertexMaterial)
 		VertexMaterial->Release_Ref();
 
-	// todo : update for refcounted shaders	
-	if(Shader)
-		delete Shader;
+	// todo : update for refcounted shaders
+	delete Shader;
 }
 
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.h b/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.h
index 5e94983f2ed..8eab24e8554 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef POLYINFO_H
-#define POLYINFO_H
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 class TextureClass;
 class VertexMaterialClass;
@@ -89,6 +83,3 @@ class PolygonInfoClass
 	VertexMaterialClass *VertexMaterial;
 	ShaderClass *Shader;
 };
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/predlod.cpp b/Core/Libraries/Source/WWVegas/WW3D2/predlod.cpp
index 6c958f13691..dfe2a899629 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/predlod.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/predlod.cpp
@@ -16,26 +16,26 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/predlod.cpp        $* 
- *                                                                         * 
- *                      $Author:: Jani_p                                  $* 
- *                                                                         * 
- *                     $Modtime:: 9/20/01 10:10a                          $* 
- *                                                                         * 
- *                    $Revision:: 5                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- *   PredictiveLODOptimizerClass::Clear -- clear object list and total cost* 
- *   PredictiveLODOptimizerClass::Add_Object -- adds object to list, cost  * 
- *   PredictiveLODOptimizerClass::Optimize_LODs -- does LOD optimization   * 
- *   PredictiveLODOptimizerClass::Free -- releases all memory used.        * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/predlod.cpp        $*
+ *                                                                         *
+ *                      $Author:: Jani_p                                  $*
+ *                                                                         *
+ *                     $Modtime:: 9/20/01 10:10a                          $*
+ *                                                                         *
+ *                    $Revision:: 5                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ *   PredictiveLODOptimizerClass::Clear -- clear object list and total cost*
+ *   PredictiveLODOptimizerClass::Add_Object -- adds object to list, cost  *
+ *   PredictiveLODOptimizerClass::Optimize_LODs -- does LOD optimization   *
+ *   PredictiveLODOptimizerClass::Free -- releases all memory used.        *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "predlod.h"
@@ -54,7 +54,7 @@
 ** and performing Add_Ref and Release_Ref every time a pointer is copied
 ** would hurt performance.
 */
- 
+
 class LODHeapNode {
 	public:
 		LODHeapNode(void)												{ Item = NULL; }
@@ -141,7 +141,7 @@ class LODHeap {
 		// Two utility methods used by various other methods: both take a
 		// single entry which violates the heap condition and moves it in the
 		// heap until the heap condition is fulfilled.
-		
+
 		// Upheap takes an entry with a (possibly) overlarge key and moves it
 		// up until the heap condition is satisfied. (this is a private
 		// method, so no error checking is needed).
@@ -182,17 +182,17 @@ LODHeapNode	*		PredictiveLODOptimizerClass::VisibleObjArray2;
 int					PredictiveLODOptimizerClass::VisibleObjArraySize;
 
 
-/************************************************************************** 
- * PredictiveLODOptimizerClass::Clear -- clear object list and total cost * 
- *                                                                        * 
- * INPUT:	                                                              * 
- *                                                                        * 
- * OUTPUT:	                                                              * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/12/1999 NH  : Created.                                            * 
+/**************************************************************************
+ * PredictiveLODOptimizerClass::Clear -- clear object list and total cost *
+ *                                                                        *
+ * INPUT:	                                                              *
+ *                                                                        *
+ * OUTPUT:	                                                              *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/12/1999 NH  : Created.                                            *
  *========================================================================*/
 void PredictiveLODOptimizerClass::Clear(void)
 {
@@ -211,17 +211,17 @@ void PredictiveLODOptimizerClass::Clear(void)
 }
 
 
-/************************************************************************** 
- * PredictiveLODOptimizerClass::Add_Object -- adds object to list, cost   * 
- *                                                                        * 
- * INPUT:	                                                              * 
- *                                                                        * 
- * OUTPUT:	                                                              * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/12/1999 NH  : Created.                                            * 
+/**************************************************************************
+ * PredictiveLODOptimizerClass::Add_Object -- adds object to list, cost   *
+ *                                                                        *
+ * INPUT:	                                                              *
+ *                                                                        *
+ * OUTPUT:	                                                              *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/12/1999 NH  : Created.                                            *
  *========================================================================*/
 void PredictiveLODOptimizerClass::Add_Object(RenderObjClass *robj)
 {
@@ -253,26 +253,26 @@ void PredictiveLODOptimizerClass::Add_Object(RenderObjClass *robj)
 }
 
 
-/************************************************************************** 
- * PredictiveLODOptimizerClass::Optimize_LODs -- does LOD optimization    * 
- *                                                                        * 
- * INPUT:	float max_cost - the upper bound on the total scene Cost.     * 
- *                                                                        * 
- * OUTPUT:	none.                                                         * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   12/08/1997 NH  : Created.                                            * 
- *   04/23/1997 NH  : Ported to SR 1.3.                                   * 
- *   03/12/1999 NH  : Moved to PredictiveLODOptimizerClass.               * 
- *                                                                        * 
- * COMMENTS:                                                              * 
+/**************************************************************************
+ * PredictiveLODOptimizerClass::Optimize_LODs -- does LOD optimization    *
+ *                                                                        *
+ * INPUT:	float max_cost - the upper bound on the total scene Cost.     *
+ *                                                                        *
+ * OUTPUT:	none.                                                         *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   12/08/1997 NH  : Created.                                            *
+ *   04/23/1997 NH  : Ported to SR 1.3.                                   *
+ *   03/12/1999 NH  : Moved to PredictiveLODOptimizerClass.               *
+ *                                                                        *
+ * COMMENTS:                                                              *
  *   This function implements the algorithm outlined in "Adaptive         *
  *   Display Algorithm for Interactive Frame Rates During Visualization   *
  *   of Complex Virtual Environments", Thomas Funkhouser & Carlo Sequin,  *
- *   SIGGRAPH '93 Proceedings, pp. 247-253.                               * 
- *   Modifications have been made to support screensize clamping of LODs. * 
+ *   SIGGRAPH '93 Proceedings, pp. 247-253.                               *
+ *   Modifications have been made to support screensize clamping of LODs. *
  *========================================================================*/
 void PredictiveLODOptimizerClass::Optimize_LODs(float max_cost)
 {
@@ -365,30 +365,28 @@ void PredictiveLODOptimizerClass::Optimize_LODs(float max_cost)
 }
 
 
-/************************************************************************** 
- * PredictiveLODOptimizerClass::Free -- releases all memory used.         * 
- *                                                                        * 
- * INPUT:	                                                              * 
- *                                                                        * 
- * OUTPUT:	                                                              * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/12/1999 NH  : Created.                                            * 
+/**************************************************************************
+ * PredictiveLODOptimizerClass::Free -- releases all memory used.         *
+ *                                                                        *
+ * INPUT:	                                                              *
+ *                                                                        *
+ * OUTPUT:	                                                              *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/12/1999 NH  : Created.                                            *
  *========================================================================*/
 void PredictiveLODOptimizerClass::Free(void)
 {
 	Clear();
 
-	if (ObjectArray) {
-		delete [] ObjectArray;
-		ObjectArray = NULL;
-		ArraySize = 0;
-	}
+	delete [] ObjectArray;
+	ObjectArray = NULL;
+	ArraySize = 0;
 
 	// Only the array number one has been allocated...
-	if (VisibleObjArray1) delete[] VisibleObjArray1;
+	delete[] VisibleObjArray1;
 	VisibleObjArray1=NULL;
 	VisibleObjArray2=NULL;
 	VisibleObjArraySize = 0;
@@ -398,7 +396,7 @@ void PredictiveLODOptimizerClass::AllocVisibleObjArrays(int num_objects)
 {
 	if (VisibleObjArraySize<num_objects) {
 		VisibleObjArraySize=num_objects;
-		if (VisibleObjArray1) delete[] VisibleObjArray1;	// Only the first array is actually allocated
+		delete[] VisibleObjArray1;	// Only the first array is actually allocated
 		VisibleObjArray1=W3DNEWARRAY LODHeapNode[2*(num_objects + 1)];
 		VisibleObjArray2=VisibleObjArray1+(num_objects + 1);
 	}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/predlod.h b/Core/Libraries/Source/WWVegas/WW3D2/predlod.h
index dbd6a54fa70..55d69b13615 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/predlod.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/predlod.h
@@ -16,30 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/predlod.h          $* 
- *                                                                         * 
- *                      $Author:: Jani_p                                  $* 
- *                                                                         * 
- *                     $Modtime:: 9/20/01 10:10a                          $* 
- *                                                                         * 
- *                    $Revision:: 3                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/predlod.h          $*
+ *                                                                         *
+ *                      $Author:: Jani_p                                  $*
+ *                                                                         *
+ *                     $Modtime:: 9/20/01 10:10a                          $*
+ *                                                                         *
+ *                    $Revision:: 3                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef PREDLOD_H
-#define PREDLOD_H
 
 // This file contains the classes which support predictive LOD management
 // similar to that outlined in "Adaptive Display Algorithm for Interactive
@@ -50,7 +45,7 @@
 
 #include "rendobj.h"
 #include "float.h"
-#include "Vector.H"
+#include "Vector.h"
 
 class LODHeapNode;
 
@@ -82,5 +77,3 @@ class PredictiveLODOptimizerClass {
 		static int VisibleObjArraySize;
 
 };
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h b/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h
index 3fe1c5ab9ea..d92d48d4dd9 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __PRIM_ANIM_H
-#define __PRIM_ANIM_H
-
 
 #include "simplevec.h"
 #include "chunkio.h"
@@ -55,7 +49,7 @@ class ChunkLoadClass;
 //
 //	PrimitiveAnimationChannelClass
 //
-//	This template class provides animated 'channels' of data for the 
+//	This template class provides animated 'channels' of data for the
 // RingRenderObjClass and SphereRenderObjClass objects.
 //
 /////////////////////////////////////////////////////////////////////
@@ -101,7 +95,7 @@ class PrimitiveAnimationChannelClass
 	/////////////////////////////////////////////////////////
 	const PrimitiveAnimationChannelClass<T> &operator= (const PrimitiveAnimationChannelClass<T> &src);
 	const KeyClass &		operator[] (int index)	{ return Get_Key (index); }
-	
+
 	/////////////////////////////////////////////////////////
 	//	Public methods
 	/////////////////////////////////////////////////////////
@@ -115,7 +109,7 @@ class PrimitiveAnimationChannelClass
 	void						Insert_Key (int index, const T &value, float time);
 	void						Delete_Key (int index);
 	void						Reset (void);
-	
+
 	virtual void			Save (ChunkSaveClass &csave);
 	virtual void			Load (ChunkLoadClass &cload);
 
@@ -163,7 +157,7 @@ class LERPAnimationChannelClass : public PrimitiveAnimationChannelClass<T>
 	using PrimitiveAnimationChannelClass<T>::m_Data;
 	using PrimitiveAnimationChannelClass<T>::m_LastIndex;
 public:
-	using PrimitiveAnimationChannelClass<T>::KeyClass;
+	using typename PrimitiveAnimationChannelClass<T>::KeyClass;
 
 public:
 
@@ -187,7 +181,7 @@ int PrimitiveAnimationChannelClass<T>::Get_Key_Count (void) const
 //	Set_Key_Value
 /////////////////////////////////////////////////////////
 template<class T>
-typename const PrimitiveAnimationChannelClass<T>::KeyClass &PrimitiveAnimationChannelClass<T>::Get_Key (int index) const
+const typename PrimitiveAnimationChannelClass<T>::KeyClass &PrimitiveAnimationChannelClass<T>::Get_Key (int index) const
 {
 	return m_Data[index];
 }
@@ -265,7 +259,7 @@ PrimitiveAnimationChannelClass<T>::operator= (const PrimitiveAnimationChannelCla
 	//
 	//	Copy the data array
 	//
-	for (int index = 0; index < src.Get_Key_Count (); index ++) {		
+	for (int index = 0; index < src.Get_Key_Count (); index ++) {
 		m_Data.Add (src.Get_Key (index));
 	}
 
@@ -280,7 +274,7 @@ template<class T> void
 PrimitiveAnimationChannelClass<T>::Save (ChunkSaveClass &csave)
 {
 	csave.Begin_Chunk (CHUNKID_VARIABLES);
-		
+
 		//
 		//	Save each key
 		//
@@ -304,7 +298,7 @@ PrimitiveAnimationChannelClass<T>::Load (ChunkLoadClass &cload)
 
 	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
-			
+
 			case CHUNKID_VARIABLES:
 				Load_Variables (cload);
 				break;
@@ -327,7 +321,7 @@ PrimitiveAnimationChannelClass<T>::Load_Variables (ChunkLoadClass &cload)
 	//
 	while (cload.Open_Micro_Chunk ()) {
 		switch (cload.Cur_Micro_Chunk_ID ()) {
-			
+
 			case VARID_KEY:
 			{
 				KeyClass value;
@@ -339,7 +333,7 @@ PrimitiveAnimationChannelClass<T>::Load_Variables (ChunkLoadClass &cload)
 
 		cload.Close_Micro_Chunk ();
 	}
-	
+
 	return ;
 }
 
@@ -387,5 +381,3 @@ LERPAnimationChannelClass<T>::Evaluate (float time)
 
 	return value;
 }
-
-#endif //__PRIM_ANIM_H
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp b/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp
index 8238dbe42c6..1ce6e7bdf2a 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 6                                                           $*
@@ -46,7 +46,6 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "projector.h"
-#include "refcount.h"
 #include "matrixmapper.h"
 
 
@@ -150,7 +149,7 @@ void ProjectorClass::Set_Perspective_Projection(float hfov,float vfov,float znea
 {
 	Mapper->Set_Type(MatrixMapperClass::PERSPECTIVE_PROJECTION);
 	Projection.Init_Perspective(hfov,vfov,0.1f,zfar);					// don't use znear for the projection matrix
-	
+
 	float tan_hfov2 = tan(hfov) * 0.5f;
 	float tan_vfov2 = tan(vfov) * 0.5f;
 
@@ -231,6 +230,6 @@ void ProjectorClass::Update_WS_Bounding_Volume(void)
 	** Recompute our world-space bounding volume
 	*/
 	OBBoxClass localbox(LocalBoundingVolume.Center,LocalBoundingVolume.Extent,Matrix3x3(1));
-	OBBoxClass::Transform(Transform,localbox,&WorldBoundingVolume);	
+	OBBoxClass::Transform(Transform,localbox,&WorldBoundingVolume);
 }
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/projector.h b/Core/Libraries/Source/WWVegas/WW3D2/projector.h
index be182bc3242..24b8632af44 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/projector.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/projector.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 2                                                           $*
@@ -37,8 +37,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef PROJECTOR_H
-#define PROJECTOR_H
+#pragma once
 
 #include "always.h"
 #include "matrix3d.h"
@@ -58,7 +57,7 @@ class MatrixMapperClass;
 class ProjectorClass
 {
 public:
-	
+
 	ProjectorClass(void);
 	virtual ~ProjectorClass(void);
 
@@ -85,8 +84,3 @@ class ProjectorClass
 
 	MatrixMapperClass *			Mapper;
 };
-
-
-#endif
-
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp
index f56cca8fe32..c19af3b2050 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                   Org Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 3:51p                                              $*
  *                                                                                             *
  *                    $Revision:: 2                                                           $*
@@ -42,7 +42,7 @@
 
 #include "proto.h"
 #include "mesh.h"
-#include "hmdldef.H"
+#include "hmdldef.h"
 #include "hlod.h"
 #include "w3derr.h"
 
@@ -57,33 +57,33 @@ HModelLoaderClass		_HModelLoader;
 ** Prototype Classes
 ** These prototypes are the "built-in" ones for the W3D library.
 */
-PrimitivePrototypeClass::PrimitivePrototypeClass(RenderObjClass * proto)			
-{ 
-	Proto = proto; 
-	assert(Proto); 
-	Proto->Add_Ref(); 
+PrimitivePrototypeClass::PrimitivePrototypeClass(RenderObjClass * proto)
+{
+	Proto = proto;
+	assert(Proto);
+	Proto->Add_Ref();
 }
-PrimitivePrototypeClass::~PrimitivePrototypeClass(void)						
-{ 
-	if (Proto) { 
-		Proto->Release_Ref(); 
+PrimitivePrototypeClass::~PrimitivePrototypeClass(void)
+{
+	if (Proto) {
+		Proto->Release_Ref();
 	}
 }
 
-const char * PrimitivePrototypeClass::Get_Name(void) const			
-{ 
-	return Proto->Get_Name(); 
-}	
+const char * PrimitivePrototypeClass::Get_Name(void) const
+{
+	return Proto->Get_Name();
+}
 
-int PrimitivePrototypeClass::Get_Class_ID(void) const	
-{ 
-	return Proto->Class_ID(); 
+int PrimitivePrototypeClass::Get_Class_ID(void) const
+{
+	return Proto->Class_ID();
 }
 
-RenderObjClass * PrimitivePrototypeClass::Create(void)					
-{ 
-	return (RenderObjClass *)( SET_REF_OWNER( Proto->Clone() ) ); 
-}	
+RenderObjClass * PrimitivePrototypeClass::Create(void)
+{
+	return (RenderObjClass *)( SET_REF_OWNER( Proto->Clone() ) );
+}
 
 
 class HModelPrototypeClass : public W3DMPO, public PrototypeClass
@@ -92,15 +92,15 @@ class HModelPrototypeClass : public W3DMPO, public PrototypeClass
 public:
 	HModelPrototypeClass(HModelDefClass * def)				{ HModelDef = def; assert(HModelDef); }
 
-	virtual const char *			Get_Name(void)	const			{ return HModelDef->Get_Name(); }	
+	virtual const char *			Get_Name(void)	const			{ return HModelDef->Get_Name(); }
 	virtual int								Get_Class_ID(void) const	{ return RenderObjClass::CLASSID_HLOD; }
-	virtual RenderObjClass *	Create(void)					{ return NEW_REF( HLodClass, (*HModelDef) ); }	
+	virtual RenderObjClass *	Create(void)					{ return NEW_REF( HLodClass, (*HModelDef) ); }
 	virtual void							DeleteSelf()										{ delete this; }
 
 	HModelDefClass *				HModelDef;
 
 protected:
-	virtual ~HModelPrototypeClass(void)							{ if (HModelDef) delete HModelDef; }						 
+	virtual ~HModelPrototypeClass(void)							{ delete HModelDef; }
 
 };
 
@@ -138,7 +138,7 @@ PrototypeClass * MeshLoaderClass::Load_W3D(ChunkLoadClass & cload)
 		PrimitivePrototypeClass * newproto = W3DNEW PrimitivePrototypeClass(mesh);
 		mesh->Release_Ref();
 		return newproto;
-	
+
 	}
 }
 
@@ -170,11 +170,11 @@ PrototypeClass * HModelLoaderClass::Load_W3D(ChunkLoadClass & cload)
 		return NULL;
 
 	} else {
-	
-		// ok, accept this model! 
+
+		// ok, accept this model!
 		HModelPrototypeClass * hproto = W3DNEW HModelPrototypeClass(hdef);
 		return hproto;
-	
+
 	}
 }
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.h b/Core/Libraries/Source/WWVegas/WW3D2/proto.h
index 85e12a84a81..eb375602e23 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/proto.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef PROTO_H
-#define PROTO_H
 
 #include "always.h"
 #include <stdlib.h>
@@ -78,24 +72,24 @@ class ChunkLoadClass;
 ** Some simple render objects will be created through cloning.  In
 ** that case, their associated prototype simply stores an object and
 ** clones it whenever the Create method is called.  More complex
-** composite render objects will be created from a "blueprint" object.  
-** Basically this class simply associates a name with a render object 
+** composite render objects will be created from a "blueprint" object.
+** Basically this class simply associates a name with a render object
 ** creation function.
 */
-class PrototypeClass 
+class PrototypeClass
 {
 
 public:
 
 	PrototypeClass(void) : NextHash(NULL) {}
-	
+
 	virtual const char *			Get_Name(void)	const = 0;
 	virtual int								Get_Class_ID(void) const = 0;
 	virtual RenderObjClass *	Create(void) = 0;
 	virtual void							DeleteSelf() = 0;
 
-	inline void friend_setNextHash(PrototypeClass* n) { NextHash = n; }
-	inline PrototypeClass* friend_getNextHash() { return NextHash; }
+	void friend_setNextHash(PrototypeClass* n) { NextHash = n; }
+	PrototypeClass* friend_getNextHash() { return NextHash; }
 
 protected:
 	virtual ~PrototypeClass(void) {};
@@ -129,9 +123,9 @@ class PrimitivePrototypeClass : public W3DMPO, public PrototypeClass
 ** PrototypeLoaderClass
 ** This is the interface for an object which recognizes a certain
 ** chunk type in a W3D file and can load it and create a PrototypeClass
-** for it.  
+** for it.
 */
-class PrototypeLoaderClass 
+class PrototypeLoaderClass
 {
 
 public:
@@ -177,7 +171,3 @@ class HModelLoaderClass : public PrototypeLoaderClass
 */
 extern MeshLoaderClass			_MeshLoader;
 extern HModelLoaderClass		_HModelLoader;
-
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proxy.h b/Core/Libraries/Source/WWVegas/WW3D2/proxy.h
index 2cbb1d81d41..faf45a367e2 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/proxy.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/proxy.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __PROXY_H
-#define __PROXY_H
 
 #include "wwstring.h"
 #include "matrix3d.h"
@@ -109,7 +104,3 @@ ProxyClass::operator!= (const ProxyClass &src)
 {
 	return ((Name != src.Name) || (Transform != src.Transform));
 }
-
-
-#endif //__PROXY_H
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h b/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h
index 398e69e18c0..06fcbd4b510 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h
@@ -34,15 +34,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef RDDESC_H
-#define RDDESC_H
 
-#include "Vector.H"
+#include "Vector.h"
 #include "wwstring.h"
 #include <d3d8types.h>
 #include <d3d8caps.h>
@@ -54,7 +48,7 @@ class ResolutionDescClass
 	ResolutionDescClass(int w,int h,int bits) : Width(w), Height(h), BitDepth(bits) { }
 	bool operator == (const ResolutionDescClass & src) { return ((Width==src.Width) && (Height==src.Height) && (BitDepth==src.BitDepth)); }
 	bool operator != (const ResolutionDescClass & src) { return ((Width!=src.Width) || (Height!=src.Height) || (BitDepth!=src.BitDepth)); }
-	
+
 	int			Width;
 	int			Height;
 	int			BitDepth;
@@ -67,7 +61,7 @@ class RenderDeviceDescClass
 
 public:
 
-	RenderDeviceDescClass(void) : DeviceName(NULL), DeviceVendor(NULL), DevicePlatform(NULL), 
+	RenderDeviceDescClass(void) : DeviceName(NULL), DeviceVendor(NULL), DevicePlatform(NULL),
 											DriverName(NULL), DriverVendor(NULL), DriverVersion(NULL),
 											HardwareName(NULL), HardwareVendor(NULL), HardwareChipset(NULL)
 	{
@@ -77,7 +71,7 @@ class RenderDeviceDescClass
 	{
 	}
 
-	RenderDeviceDescClass & operator = (const RenderDeviceDescClass & src) 
+	RenderDeviceDescClass & operator = (const RenderDeviceDescClass & src)
 	{
 		set_device_name(src.Get_Device_Name());
 		set_device_vendor(src.Get_Device_Vendor());
@@ -92,7 +86,7 @@ class RenderDeviceDescClass
 		AdapterIdentifier=src.AdapterIdentifier;
 		ResArray = src.ResArray;
 		return *this;
-	}	
+	}
 
 	bool operator == (const RenderDeviceDescClass & /*src*/) { return false; }
 	bool operator != (const RenderDeviceDescClass & /*src*/) { return true; }
@@ -142,7 +136,7 @@ class RenderDeviceDescClass
 
 	D3DCAPS8				Caps;
 	D3DADAPTER_IDENTIFIER8 AdapterIdentifier;
-	
+
 	DynamicVectorClass<ResolutionDescClass>	ResArray;
 
 	friend class WW3D;
@@ -150,8 +144,8 @@ class RenderDeviceDescClass
 };
 
 
-inline void RenderDeviceDescClass::add_resolution(int w,int h,int bits)		
-{ 
+inline void RenderDeviceDescClass::add_resolution(int w,int h,int bits)
+{
 	bool found = false;
 	for (int i=0; i<ResArray.Count(); i++) {
 		if (	(ResArray[i].Width == w) &&
@@ -161,12 +155,8 @@ inline void RenderDeviceDescClass::add_resolution(int w,int h,int bits)
 			found = true;
 		}
 	}
-	
+
 	if (!found) {
-		ResArray.Add(ResolutionDescClass(w,h,bits)); 
+		ResArray.Add(ResolutionDescClass(w,h,bits));
 	}
 }
-
-
-#endif 
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp
index 97b6ac508a4..e307f2e41f3 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp
@@ -41,11 +41,6 @@
 #include "wwmemlog.h"
 #include "dx8wrapper.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ////////////////////////////////////////////////////////////////////////////////////
 //	Local constants
@@ -175,7 +170,7 @@ void
 Render2DSentenceClass::Make_Additive (void)
 {
 	Shader.Set_Dst_Blend_Func (ShaderClass::DSTBLEND_ONE);
-	Shader.Set_Src_Blend_Func (ShaderClass::SRCBLEND_ONE);	
+	Shader.Set_Src_Blend_Func (ShaderClass::SRCBLEND_ONE);
 	Shader.Set_Primary_Gradient (ShaderClass::GRADIENT_MODULATE);
 	Shader.Set_Secondary_Gradient (ShaderClass::SECONDARY_GRADIENT_DISABLE);
 
@@ -237,7 +232,7 @@ Render2DSentenceClass::Render (void)
 ////////////////////////////////////////////////////////////////////////////////////
 void
 Render2DSentenceClass::Set_Base_Location (const Vector2 &loc)
-{ 
+{
 	Vector2 dif		= loc - BaseLocation;
 	BaseLocation	= loc;
 	for (int i = 0; i < Renderers.Count (); i ++) {
@@ -255,8 +250,8 @@ Render2DSentenceClass::Set_Base_Location (const Vector2 &loc)
 ////////////////////////////////////////////////////////////////////////////////////
 void
 Render2DSentenceClass::Set_Location (const Vector2 &loc)
-{ 
-	Location	= loc; 
+{
+	Location	= loc;
 	return ;
 }
 
@@ -328,13 +323,13 @@ Render2DSentenceClass::Release_Pending_Surfaces (void)
 	//
 	//	Release our hold on each pending surface
 	//
-	for (int index = 0; index < PendingSurfaces.Count (); index ++) {		
+	for (int index = 0; index < PendingSurfaces.Count (); index ++) {
 		SurfaceClass *curr_surface = PendingSurfaces[index].Surface;
 		REF_PTR_RELEASE (curr_surface);
 	}
 
 	if (PendingSurfaces.Count()>0) PendingSurfaces.Delete_All ();
-	return; 
+	return;
 }
 
 
@@ -355,7 +350,7 @@ Render2DSentenceClass::Build_Textures (void)
 		CurSurface->Unlock ();
 		LockedPtr = NULL;
 	}
-	
+
 	//
 	//	Release our hold on the current surface
 	//
@@ -366,7 +361,7 @@ Render2DSentenceClass::Build_Textures (void)
 	//
 	//	Convert all pending surfaces to textures
 	//
-	for (int index = 0; index < PendingSurfaces.Count (); index ++) {		
+	for (int index = 0; index < PendingSurfaces.Count (); index ++) {
 		PendingSurfaceStruct &surface_info = PendingSurfaces[index];
 		SurfaceClass *curr_surface = surface_info.Surface;
 
@@ -375,7 +370,7 @@ Render2DSentenceClass::Build_Textures (void)
 		//
 		SurfaceClass::SurfaceDescription desc;
 		curr_surface->Get_Description (desc);
-		
+
 		//
 		//	Create the new texture
 		//
@@ -393,7 +388,7 @@ Render2DSentenceClass::Build_Textures (void)
 		//
 		DX8Wrapper::_Copy_DX8_Rects (curr_surface->Peek_D3D_Surface (), NULL, 0, texture_surface->Peek_D3D_Surface (), NULL);
 		REF_PTR_RELEASE (texture_surface);
-	
+
 		//
 		//	Assign this texture to any renderers that need it
 		//
@@ -456,7 +451,7 @@ Render2DSentenceClass::Draw_Sentence (uint32 color)
 					break;
 				}
 			}
-			
+
 			//
 			//	Create a new renderer if we couldn't find an appropriate one
 			//
@@ -469,7 +464,7 @@ Render2DSentenceClass::Draw_Sentence (uint32 color)
 				curr_renderer->Set_Coordinate_Range (Render2DClass::Get_Screen_Resolution ());
 				ShaderClass *curr_shader = curr_renderer->Get_Shader ();
 				(*curr_shader) = Shader;
-				
+
 				//
 				//	Add it to our list
 				//
@@ -508,7 +503,7 @@ Render2DSentenceClass::Draw_Sentence (uint32 color)
 		//
 		bool add_quad = true;
 		if (IsClippedEnabled) {
-			
+
 			//
 			//	Check for completely clipped
 			//
@@ -560,7 +555,7 @@ Render2DSentenceClass::Draw_Sentence (uint32 color)
 		if (add_quad) {
 			//uv_rect.Bottom += 0.5f;
 			uv_rect *=  1.0F / ((float)desc.Width);
-#ifdef TEST_PLACEMENT	 
+#ifdef TEST_PLACEMENT
 			screen_rect.Left += offset*3;
 			screen_rect.Right += offset*3;
 #endif
@@ -596,7 +591,7 @@ Render2DSentenceClass::Record_Sentence_Chunk (void)
 	int width = TextureOffset.I - TextureStartX;
 	if (width > 0) {
 		float char_height = Font->Get_Char_Height ();
-		
+
 		//
 		//	Build a structure that contains enough information
 		// to hold this portion of the sentence
@@ -611,7 +606,7 @@ Render2DSentenceClass::Record_Sentence_Chunk (void)
 		sentence_data.UVRect.Left			= TextureStartX;
 		sentence_data.UVRect.Top			= TextureOffset.J;
 		sentence_data.UVRect.Right			= TextureOffset.I;
-		sentence_data.UVRect.Bottom		= TextureOffset.J + char_height;		
+		sentence_data.UVRect.Bottom		= TextureOffset.J + char_height;
 
 		//
 		//	Add this information to our list
@@ -644,12 +639,12 @@ Render2DSentenceClass::Allocate_New_Surface (const WCHAR *text, bool justCalcExt
 
 	//
 	// Calculate the width of the text
-	//	
+	//
 	int text_width = 0;
 	for (int index = 0; text[index] != 0; index ++) {
 		text_width += Font->Get_Char_Spacing (text[index]);
 	}
-	
+
 	int char_height = Font->Get_Char_Height ();
 
 	//
@@ -657,16 +652,16 @@ Render2DSentenceClass::Allocate_New_Surface (const WCHAR *text, bool justCalcExt
 	//
 	CurrTextureSize = 256;
 	int best_tex_mem_usage = 999999999;
-	for (int pow2 = 6; pow2 <= 8; pow2 ++) {		
-		
+	for (int pow2 = 6; pow2 <= 8; pow2 ++) {
+
 		int size					= 1 << pow2;
 		int row_count			= (text_width / size) + 1;
 		int rows_per_texture	= size / (char_height + 1);
-		
+
 		//
 		//	Can we even fit one character on this texture?
 		//
-		if (rows_per_texture > 0) {			
+		if (rows_per_texture > 0) {
 
 			//
 			//	How many textures (at this size) would it take to render
@@ -700,7 +695,7 @@ Render2DSentenceClass::Allocate_New_Surface (const WCHAR *text, bool justCalcExt
 
 		//
 		//	Create the new surface
-		//	
+		//
 		CurSurface = NEW_REF (SurfaceClass, (CurrTextureSize, CurrTextureSize, WW3D_FORMAT_A4R4G4B4));
 		WWASSERT (CurSurface != NULL);
 		CurSurface->Add_Ref ();
@@ -717,7 +712,7 @@ Render2DSentenceClass::Allocate_New_Surface (const WCHAR *text, bool justCalcExt
 	//	Reset to the upper left corner
 	//
 	TextureOffset.Set (0, 0);
-	TextureStartX = 0;	
+	TextureStartX = 0;
 	return ;
 }
 
@@ -738,22 +733,22 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 	int notCenteredHotkeyX = 0;
 	int notCenteredHotkeyY = 0;
 	Vector2 extent = Build_Sentence_Not_Centered(text,&notCenteredHotkeyX, &notCenteredHotkeyY, TRUE); //Get_Formatted_Text_Extents(text);
-	
+
 	//
 	//	Start fresh
 	//
 	Reset_Sentence_Data ();
 	Cursor.Set (0, 0);
-	
+
 	//
 	//	Ensure we have a surface to start with
 	//
 	if (CurSurface == NULL) {
 		Allocate_New_Surface (text);
 	}
-	
-	
-	
+
+
+
 	//
 	//	Loop over all the characters in the string
 	//
@@ -790,7 +785,6 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 				if( ParseHotKey && (*word == L'&') && (*word+1 != 0) && (*word+1 > L' ') && (*word+1 != L'\n'))
 				{
 					int offset = 0;
-					//Added By Saad
 					if (word_width != 0 )
 					{
 						const WCHAR *word_back = word;
@@ -801,19 +795,18 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 							offset =-1;
 						}
 					}
-					//
 					*word++;
 					calcHotKeyX = true;
 				}
-				
+
 				charWidth = Font->Get_Char_Spacing (*word++);
 				word_width += charWidth;
 				wordCount++;
-				
+
 				if (WrapWidth > 0 && word_width >= WrapWidth && useHardWordWrap)
 					break;
 			}
-			// 
+			//
 			// If this word is unworthy to be on the current line, decrement the space and break
 			//
 			if(WrapWidth > 0 && (line_width + word_width >= WrapWidth))
@@ -823,9 +816,9 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 				//If that's the case, drop out and process the word anyway
 				//
 				if(charCount == 0)
-				{	
+				{
 					charCount +=wordCount - 1;
-					line_width += word_width - charWidth;	
+					line_width += word_width - charWidth;
 					if(*word == 0)
 						end = true;
 					break;
@@ -847,7 +840,7 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 			// otherwise, increment the counts
 			//
 			charCount +=wordCount + 1;
-			line_width += word_width;	
+			line_width += word_width;
 			//
 			// We were some a new line character break and process
 			//
@@ -858,7 +851,6 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 			//
 			word_width = Font->Get_Char_Spacing (*word++);
 			wordCount = 0;
-			//Added By Saad
 			line_width += word_width;
 		}
 		//
@@ -872,7 +864,7 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 			calcHotKeyX = false;
 			hotKeyPosX = Cursor.X + notCenteredHotkeyX;
 		}
-		
+
 		for(int i = 0; i <= charCount; i++) {
 			WCHAR ch = *text++;
 			dontBlit = false;
@@ -885,22 +877,22 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 				dontBlit = true;
 			}
 			float char_spacing = Font->Get_Char_Spacing (ch);
-			
+
 			bool exceeded_texture_width	= ((TextureOffset.I + char_spacing) >= CurrTextureSize);
 			bool encountered_break_char	= (ch == L' ' || ch == L'\n' || ch == 0);
-			
+
 			//
 			//	Do we need to record this portion of the sentence to its own chunk?
 			//
 			if (exceeded_texture_width || encountered_break_char) {
 				Record_Sentence_Chunk ();
-				
+
 				//
 				//	Adjust the positions
 				//
 				Cursor.X			+= (TextureOffset.I - TextureStartX);
 				TextureStartX	= TextureOffset.I;
-				
+
 				//
 				//	Adjust the output coordinates
 				//
@@ -909,7 +901,7 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 				} else if ((ch == 0 )|| (ch == L'\n')) {
 					break;
 				}
-								
+
 				//
 				//	Did the text extend past the edge of the texture?
 				//
@@ -917,7 +909,7 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 					TextureStartX		= 0;
 					TextureOffset.I	= TextureStartX;
 					TextureOffset.J	+= char_height;
-					
+
 					//
 					//	Did the text extent completely off the texture?
 					//
@@ -930,26 +922,26 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 			//	Adjust the output coordinates
 			//
 			if (ch != L'\n' && ch != L' ') {
-				
+
 				//
-				//	Ensure the surface is locked	
+				//	Ensure the surface is locked
 				//
 				if (LockedPtr == NULL) {
 					LockedPtr = (uint16 *)CurSurface->Lock (&LockedStride);
 					WWASSERT (LockedPtr != NULL);
 				}
-				
+
 				//
 				//	Check to ensure the text will fit on this texture
 				//
 				WWASSERT (((TextureOffset.I + char_spacing) < CurrTextureSize) && ((TextureOffset.J + char_height) < CurrTextureSize));
-				
+
 				//
 				//	Blit the character to the surface
 				//
 				if(!dontBlit)
 					Font->Blit_Char (ch, LockedPtr, LockedStride, TextureOffset.I, TextureOffset.J);
-				
+
 				if (dontBlit) {
 					// we don't blit for a hot key character.  So add extra spacing.
 					char_spacing += Font->Get_Extra_Overlap();
@@ -958,7 +950,7 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 						char_spacing++;
 					}
 				}
-				
+
 				TextureOffset.I += char_spacing;
 			}
 		}
@@ -969,8 +961,8 @@ void	Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
 		Cursor.Y += char_height;
 		line_width = 0;
 		}
-		
-		if(hkX)						
+
+		if(hkX)
 			*hkX = hotKeyPosX;
 		if(hkX)
 			*hkY = hotKeyPosY;
@@ -1011,7 +1003,7 @@ Vector2	Render2DSentenceClass::Build_Sentence_Not_Centered (const WCHAR *text, i
 	}
 
 	TextureOffset.Set (TEXTURE_OFFSET, 0);
-	TextureStartX = TEXTURE_OFFSET;	
+	TextureStartX = TEXTURE_OFFSET;
 
 	float char_height = Font->Get_Char_Height ();
 
@@ -1067,7 +1059,7 @@ Vector2	Render2DSentenceClass::Build_Sentence_Not_Centered (const WCHAR *text, i
 				// Check to see if we need to wrap on this word-break
 				//
 				if (WrapWidth > 0) {
-					
+
 					//
 					//	Find the length of the next word
 					//
@@ -1099,7 +1091,7 @@ Vector2	Render2DSentenceClass::Build_Sentence_Not_Centered (const WCHAR *text, i
 				Cursor.Y += char_height;
 			}
 
-			
+
 			//
 			//	Did the text extend past the edge of the texture?
 			//
@@ -1116,11 +1108,11 @@ Vector2	Render2DSentenceClass::Build_Sentence_Not_Centered (const WCHAR *text, i
 				}
 			}
 		}
-		
+
 		if (ch != L'\n' ) {
 
 			//
-			//	Ensure the surface is locked	
+			//	Ensure the surface is locked
 			//
 			if (!justCalcExtents)
 			{
@@ -1140,10 +1132,10 @@ Vector2	Render2DSentenceClass::Build_Sentence_Not_Centered (const WCHAR *text, i
 			//
 			if (!justCalcExtents && !dontBlit )
 			{
-				Font->Blit_Char (ch, LockedPtr, LockedStride, TextureOffset.I, TextureOffset.J);			
+				Font->Blit_Char (ch, LockedPtr, LockedStride, TextureOffset.I, TextureOffset.J);
 			}
 			TextureOffset.I += char_spacing;
-		} 
+		}
 	}
 
 	Vector2 extent;
@@ -1153,8 +1145,8 @@ Vector2	Render2DSentenceClass::Build_Sentence_Not_Centered (const WCHAR *text, i
 	Cursor = cursor;
 	TextureOffset = textureOffset;
 	TextureStartX = textureStartX;
-	
-	if(hkX)						
+
+	if(hkX)
 		*hkX = hotKeyPosX;
 	if(hkX)
 		*hkY = hotKeyPosY;
@@ -1175,14 +1167,16 @@ Render2DSentenceClass::Build_Sentence (const WCHAR *text, int *hkX, int *hkY)
 		return ;
 	}
 
+	if (Font == NULL)
+		return;
 
 	if(Centered && (WrapWidth > 0 || wcschr(text,L'\n')))
 		Build_Sentence_Centered(text, hkX, hkY);
 	else
 		Build_Sentence_Not_Centered(text, hkX, hkY);
-	
+
 	return;
-	
+
 }
 
 
@@ -1217,7 +1211,7 @@ FontCharsClass::FontCharsClass (void) :
 //	~FontCharsClass
 //
 ////////////////////////////////////////////////////////////////////////////////////
-FontCharsClass::~FontCharsClass (void) 
+FontCharsClass::~FontCharsClass (void)
 {
 	while ( BufferList.Count() ) {
 		delete BufferList[0];
@@ -1240,10 +1234,10 @@ FontCharsClass::Get_Char_Data (WCHAR ch)
 {
 	const FontCharsClassCharDataStruct *retval = NULL;
 
-	if ( ch < 256 ) 
+	if ( ch < 256 )
 	{
 		retval = ASCIICharArray[ch];
-	} 
+	}
  	else if ( AlternateUnicodeFont && this != AlternateUnicodeFont )
 	{
 		return AlternateUnicodeFont->Get_Char_Data( ch );
@@ -1252,7 +1246,7 @@ FontCharsClass::Get_Char_Data (WCHAR ch)
 	{
 		Grow_Unicode_Array( ch );
 		retval = UnicodeCharArray[ch - FirstUnicodeChar];
-	}	
+	}
 
 	//
 	//	If the character wasn't found, then add it to our list
@@ -1328,12 +1322,12 @@ FontCharsClass::Blit_Char (WCHAR ch, uint16 *dest_ptr, int dest_stride, int x, i
 				uint16 curData = *src_ptr;
 				if (col<PixelOverlap) {
 					curData |= dest_ptr[col];
-				} 
+				}
 				dest_ptr[col] = curData;
 				src_ptr++;
 			}
 			dest_ptr	+= dest_inc;
-		}		
+		}
 	}
 
 	return ;
@@ -1365,7 +1359,7 @@ FontCharsClass::Store_GDI_Char (WCHAR ch)
 	//	Get the size of the character we just drew
 	//
 	SIZE char_size = { 0 };
-	::GetTextExtentPoint32W( MemDC, &ch, 1, &char_size );	
+	::GetTextExtentPoint32W( MemDC, &ch, 1, &char_size );
 	char_size.cx += PixelOverlap + xOrigin;
 	//
 	//	Get a pointer to the surface that this character should use
@@ -1373,13 +1367,13 @@ FontCharsClass::Store_GDI_Char (WCHAR ch)
 	Update_Current_Buffer( char_size.cx );
 	uint16* curr_buffer_p = BufferList[BufferList.Count () - 1]->Buffer;
 	curr_buffer_p += CurrPixelOffset;
-	
+
 	//
 	//	Copy the BMP contents to the buffer
 	//
 	int stride = (((width * 3) + 3) & ~3);
 	for (int row = 0; row < char_size.cy; row ++) {
-		
+
 		//
 		//	Compute the indices into the BMP and surface
 		//
@@ -1389,7 +1383,7 @@ FontCharsClass::Store_GDI_Char (WCHAR ch)
 		//	Loop over each column
 		//
 		for (int col = 0; col < char_size.cx; col ++) {
-			
+
 			//
 			//	Get the pixel color at this location
 			//
@@ -1429,7 +1423,7 @@ FontCharsClass::Store_GDI_Char (WCHAR ch)
 			if (pixel_value != 0) {
 				pixel_color = 0x0FFF;
 			}
-			
+
 			//
 			//	Convert the pixel intensity from 8bit to 4bit and
 			// store it in our buffer
@@ -1454,7 +1448,7 @@ FontCharsClass::Store_GDI_Char (WCHAR ch)
 		ASCIICharArray[ch] = char_data;
 	} else {
 		UnicodeCharArray[ch - FirstUnicodeChar] = char_data;
-	}	
+	}
 
 	//
 	//	Advance the character position
@@ -1481,7 +1475,7 @@ FontCharsClass::Update_Current_Buffer (int char_width)
 	//
 	bool needs_new_buffer = (BufferList.Count () == 0);
 	if (needs_new_buffer == false) {
-		
+
 		//
 		//	Would we extend past this buffer?
 		//
@@ -1493,7 +1487,7 @@ FontCharsClass::Update_Current_Buffer (int char_width)
 	//
 	//	Do we need to create a new surface?
 	//
-	if (needs_new_buffer) 
+	if (needs_new_buffer)
 	{
 		FontCharsBuffer* new_buffer = W3DNEW FontCharsBuffer;
 		BufferList.Add( new_buffer );
@@ -1509,7 +1503,7 @@ FontCharsClass::Update_Current_Buffer (int char_width)
 //	Create_GDI_Font
 //
 ////////////////////////////////////////////////////////////////////////////////////
-void
+bool
 FontCharsClass::Create_GDI_Font (const char *font_name)
 {
 	HDC screen_dc = ::GetDC ((HWND)WW3D::Get_Window());
@@ -1546,7 +1540,7 @@ FontCharsClass::Create_GDI_Font (const char *font_name)
 								FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS,
 								CLIP_DEFAULT_PRECIS, ANTIALIASED_QUALITY,
 								VARIABLE_PITCH, font_name);
-	
+
 	//
 	// Set-up the fields of the BITMAPINFOHEADER
 	//	Note: Top-down DIBs use negative height in Win32.
@@ -1597,12 +1591,14 @@ FontCharsClass::Create_GDI_Font (const char *font_name)
 	//
 	TEXTMETRIC text_metric = { 0 };
 	::GetTextMetrics (MemDC, &text_metric);
-	CharHeight = text_metric.tmHeight;	
+	CharHeight = text_metric.tmHeight;
 	CharAscent = text_metric.tmAscent;
 	CharOverhang = text_metric.tmOverhang;
 	if (doingGenerals) {
 		CharOverhang = 0;
 	}
+
+	return GDIFont != NULL && GDIBitmap != NULL;
 }
 
 
@@ -1637,7 +1633,7 @@ FontCharsClass::Free_GDI_Font (void)
 	//
 	//	Delete our memory DC
 	//
-	if ( MemDC != NULL ) {		
+	if ( MemDC != NULL ) {
 		::DeleteDC( MemDC );
 		MemDC = NULL;
 	}
@@ -1651,7 +1647,7 @@ FontCharsClass::Free_GDI_Font (void)
 //	Initialize_GDI_Font
 //
 ////////////////////////////////////////////////////////////////////////////////////
-void
+bool
 FontCharsClass::Initialize_GDI_Font (const char *font_name, int point_size, bool is_bold)
 {
 	//
@@ -1669,8 +1665,7 @@ FontCharsClass::Initialize_GDI_Font (const char *font_name, int point_size, bool
 	//
 	//	Create the actual font object
 	//
-	Create_GDI_Font (font_name);
-	return ;
+	return Create_GDI_Font (font_name);
 }
 
 
@@ -1718,7 +1713,7 @@ FontCharsClass::Grow_Unicode_Array (WCHAR ch)
 	//
 	if ( ch >= FirstUnicodeChar && ch <= LastUnicodeChar ) {
 		return ;
-	} 
+	}
 
 	uint16 first_index	= min( FirstUnicodeChar, static_cast<uint16>(ch) );
 	uint16 last_index		= max( LastUnicodeChar, static_cast<uint16>(ch) );
@@ -1763,15 +1758,13 @@ FontCharsClass::Free_Character_Arrays (void)
 	if ( UnicodeCharArray != NULL ) {
 
 		int count = (LastUnicodeChar - FirstUnicodeChar) + 1;
-		
+
 		//
 		//	Delete each member of the unicode array
 		//
 		for (int index = 0; index < count; index ++) {
-			if ( UnicodeCharArray[index] != NULL ) {
-				delete UnicodeCharArray[index];
-				UnicodeCharArray[index] = NULL;
-			}
+			delete UnicodeCharArray[index];
+			UnicodeCharArray[index] = NULL;
 		}
 
 		//
@@ -1784,12 +1777,10 @@ FontCharsClass::Free_Character_Arrays (void)
 	//
 	//	Delete each member of the ascii character array
 	//
-	for (int index = 0; index < 256; index ++) {		
-		if ( ASCIICharArray[index] != NULL ) {
-			delete ASCIICharArray[index];
-			ASCIICharArray[index] = NULL;
-		}
+	for (int index = 0; index < 256; index ++) {
+		delete ASCIICharArray[index];
+		ASCIICharArray[index] = NULL;
 	}
-	
+
 	return ;
 }
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h
index 38d8de26fc1..db8771a66a7 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h
@@ -34,16 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef RENDER2DSENTENCE_H
-#define RENDER2DSENTENCE_H
 
+#include "always.h"
 #include "render2d.h"
-#include "refcount.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "vector2i.h"
 #include "wwstring.h"
 #include "win.h"
@@ -75,7 +70,7 @@ class FontCharsBuffer : public W3DMPO
 };
 
 
-class FontCharsClass : public W3DMPO, public RefCountClass 
+class FontCharsClass : public W3DMPO, public RefCountClass
 {
 	W3DMPO_GLUE(FontCharsClass)
 
@@ -84,17 +79,17 @@ class FontCharsClass : public W3DMPO, public RefCountClass
 	~FontCharsClass();
 
 	// TR: Hack for unicode font support
-	FontCharsClass					*AlternateUnicodeFont;		
+	FontCharsClass					*AlternateUnicodeFont;
 
 
-	void	Initialize_GDI_Font( const char *font_name, int point_size, bool is_bold );
+	bool	Initialize_GDI_Font( const char *font_name, int point_size, bool is_bold );
 	bool	Is_Font( const char *font_name, int point_size, bool is_bold );
-	const char * Get_Name( void )			{ return Name; }	
+	const char * Get_Name( void )			{ return Name; }
 
 	int	Get_Char_Height( void )			{ return CharHeight; }
 	int	Get_Char_Width( WCHAR ch );
 	int	Get_Char_Spacing( WCHAR ch );
-	
+
 	int Get_Extra_Overlap(void) {return PixelOverlap;}
 
 	void	Blit_Char( WCHAR ch, uint16 *dest_ptr, int dest_stride, int x, int y );
@@ -104,7 +99,7 @@ class FontCharsClass : public W3DMPO, public RefCountClass
 	//
 	//	Private methods
 	//
-	void							Create_GDI_Font( const char *font_name );
+	bool							Create_GDI_Font( const char *font_name );
 	void							Free_GDI_Font( void );
 	const FontCharsClassCharDataStruct *	Store_GDI_Char( WCHAR ch );
 	void							Update_Current_Buffer( int char_width );
@@ -121,13 +116,13 @@ class FontCharsClass : public W3DMPO, public RefCountClass
 	int									CurrPixelOffset;
 	int									CharHeight;
 	int									CharAscent;
-	int									CharOverhang;	
+	int									CharOverhang;
 	int									PixelOverlap;
 	int									PointSize;
 	StringClass							GDIFontName;
 	HFONT									OldGDIFont;
 	HBITMAP								OldGDIBitmap;
-	HBITMAP								GDIBitmap;	
+	HBITMAP								GDIBitmap;
 	HFONT									GDIFont;
 	uint8 *								GDIBitmapBits;
 	HDC									MemDC;
@@ -158,11 +153,11 @@ class Render2DSentenceClass {
 	void	Set_Base_Location( const Vector2 & loc );
 	bool	Set_Wrapping_Width (float width)					{ if(WrapWidth == width)
 																											return false;
-																										WrapWidth = width; 
+																										WrapWidth = width;
 																										return true;	}
 	bool	Set_Word_Wrap_Centered( bool isCentered ) { if(Centered == isCentered)
 																											return false;
-																										Centered = isCentered; 
+																										Centered = isCentered;
 																										return true;}
 	void Set_Hot_Key_Parse( bool parseHotKey ){ ParseHotKey = parseHotKey; }
 	void Set_Use_Hard_Word_Wrap( bool useHardWrap){ useHardWordWrap = useHardWrap;	}
@@ -242,7 +237,7 @@ class Render2DSentenceClass {
 	void	Allocate_New_Surface (const WCHAR *text, bool justCalcExtents = false);
 	void	Release_Pending_Surfaces (void);
 	void	Build_Sentence_Centered (const WCHAR *text, int *hkX, int *hkY);
-	Vector2	Build_Sentence_Not_Centered (const WCHAR *text, int *hkX, int *hkY,bool justCalcExtents = false );		
+	Vector2	Build_Sentence_Not_Centered (const WCHAR *text, int *hkX, int *hkY,bool justCalcExtents = false );
 	//
 	//	Private member data
 	//
@@ -266,11 +261,9 @@ class Render2DSentenceClass {
 	bool												IsClippedEnabled;
 	bool												ParseHotKey;
 	bool												useHardWordWrap;
-														
+
 	uint16 *										LockedPtr;
 	int													LockedStride;
 	TextureClass *							CurTexture;
 	ShaderClass									Shader;
 };
-
-#endif	// RENDER2DSENTENCE_H
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp
index bf64d1a957c..f6d787fc139 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp
@@ -42,7 +42,6 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "renderobjectrecycler.h"
-#include <string.h>
 #include "rendobj.h"
 #include "assetmgr.h"
 #include "part_emt.h"
@@ -82,7 +81,7 @@ void RenderObjectRecyclerClass::Reset(void)
 RenderObjClass * RenderObjectRecyclerClass::Get_Render_Object(const char * name,const Matrix3D & tm)
 {
 	RefRenderObjListIterator it(&InactiveModels);
-	
+
 	RenderObjClass * found = NULL;
 	while (!it.Is_Done()) {
 		if (stricmp(it.Peek_Obj()->Get_Name(),name) == 0) {
@@ -100,14 +99,14 @@ RenderObjClass * RenderObjectRecyclerClass::Get_Render_Object(const char * name,
 		return found;
 
 	} else {
-		
+
 		RenderObjClass * new_model = WW3DAssetManager::Get_Instance()->Create_Render_Obj(name);
 		if (new_model != NULL) {
 			new_model->Set_Transform(tm);
 			return new_model;
-		} 
-	}	
-	
+		}
+	}
+
 	return NULL;
 }
 
@@ -170,7 +169,7 @@ void RenderObjectRecyclerClass::Reset_Model(RenderObjClass * model)
 		Reset_Model(robj);
 		robj->Release_Ref();
 	}
-	
+
 	/*
 	** particle emitters must be reset (this should release their buffers)
 	*/
@@ -178,7 +177,7 @@ void RenderObjectRecyclerClass::Reset_Model(RenderObjClass * model)
 		ParticleEmitterClass * emitter = (ParticleEmitterClass *)model;
 		emitter->Reset();
 	}
-	
+
 	/*
 	** animated models must have their animation reset (if present)
 	*/
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h
index f2eba20e440..aabc0c4c79f 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h
@@ -36,9 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef RENDEROBJECTRECYCLER_H
-#define RENDEROBJECTRECYCLER_H
+#pragma once
 
 #include "always.h"
 #include "robjlist.h"
@@ -48,12 +46,12 @@ class Matrix3D;
 
 /**
 ** RenderObjectRecyclerClass
-** This class can be used to eliminate dynamic render object allocation.  An example usage would be 
+** This class can be used to eliminate dynamic render object allocation.  An example usage would be
 ** the case where you have a projectile system in a game.  Projectiles could be set up to use a
 ** variety of render objects and would be rapidly created and destroyed as the players and AI's fire
 ** their weapons.  If all of your bullet objects request their models from a RenderObjectCache, and
-** return their models to the cache when the bullet is destroyed; the model will get re-used by 
-** the next bullet that requests that same model type (highly likely in a game situation).  
+** return their models to the cache when the bullet is destroyed; the model will get re-used by
+** the next bullet that requests that same model type (highly likely in a game situation).
 **
 ** Public member functions:
 ** Reset - release all of the models in the cache.
@@ -67,7 +65,7 @@ class RenderObjectRecyclerClass
 	void					Reset(void);
 	RenderObjClass*	Get_Render_Object(const char * name,const Matrix3D & tm);
 	void					Return_Render_Object(RenderObjClass * obj);
-	
+
 private:
 
 	void					Insert_Inactive_Model(RenderObjClass * obj);
@@ -77,8 +75,3 @@ class RenderObjectRecyclerClass
 	RefRenderObjListClass	InactiveModels;
 
 };
-
-
-
-
-#endif //RENDEROBJECTRECYCLER_H
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp
index 8e42e9f998b..b5d0671fc17 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp
@@ -17,26 +17,26 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/rendobj.cpp 16    12/17/01 8:06p Byon_g $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Engine                                       * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/rendobj.cpp                            $* 
- *                                                                                             * 
- *                   Org Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Engine                                       *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/rendobj.cpp                            $*
+ *                                                                                             *
+ *                   Org Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 07/01/02 12:45p                                              $*
- *                                                                                             * 
- *                    $Revision:: 17                                                          $* 
- *                                                                                             * 
+ *                                                                                             *
+ *                    $Revision:: 17                                                          $*
+ *                                                                                             *
  * 07/01/02 KM Coltype enum change to avoid MAX conflicts									   *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   RenderObjClass::RenderObjClass -- constructor                                             * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   RenderObjClass::RenderObjClass -- constructor                                             *
  *   RenderObjClass::RenderObjClass -- copy constructor                                        *
  *   RenderObjClass::operator == -- assignment operator                                        *
  *   RenderObjClass::Calculate_Texture_Reduction_Factor -- calculate texture reduction factor  *
@@ -57,7 +57,7 @@
  *   RenderObjClass::Update_Sub_Object_Bits -- updates our bits according to our sub-objects   *
  *   RenderObjClass::Update_Sub_Object_Transforms -- re-evaluate the transforms my sub-objects *
  *   RenderObjClass::Add -- Generic add for render objects                                     *
- *   RenderObjClass::Remove -- Generic Remove for Render Objects                               * 
+ *   RenderObjClass::Remove -- Generic Remove for Render Objects                               *
  *   RenderObjClass::Notify_Added -- notifies the object that it is in a scene                 *
  *   RenderObjClass::Notify_Removed -- notifies an object that it has been removed             *
  *   RenderObjClass::Update_Cached_Bounding_Volumes -- default collision sphere.               *
@@ -93,11 +93,6 @@
 #include "intersec.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off) 
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // Definitions of static members:
 const float	RenderObjClass::AT_MIN_LOD = FLT_MAX;
@@ -109,12 +104,12 @@ Filename_From_Asset_Name (const char *asset_name)
 {
 	StringClass filename;
 	if (asset_name != NULL) {
-		
+
 		//
 		// Copy the model name into a new filename buffer
 		//
 		::lstrcpy (filename.Get_Buffer (::lstrlen (asset_name) + 5), asset_name);
-		
+
 		//
 		// Do we need to strip off the model's suffix?
 		//
@@ -154,17 +149,17 @@ static inline bool Check_Is_Transform_Identity(const Matrix3D& m)
 }
 
 
-/*********************************************************************************************** 
- * RenderObjClass::RenderObjClass -- constructor                                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   11/04/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * RenderObjClass::RenderObjClass -- constructor                                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/04/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 RenderObjClass::RenderObjClass(void) :
 	Bits(DEFAULT_BITS),
@@ -241,7 +236,7 @@ RenderObjClass & RenderObjClass::operator = (const RenderObjClass & that)
 	}
 	return *this;
 }
-	
+
 
 /***********************************************************************************************
  * RenderObjClass::Calculate_Texture_Reduction_Factor -- calculate texture reduction factor.   *
@@ -379,11 +374,11 @@ SceneClass * RenderObjClass::Get_Scene(void)
  *   3/4/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 void RenderObjClass::Set_Container(RenderObjClass * con)
-{ 
+{
 	// Either we arent currently in a container or we are clearing our container, otherwise
 	// Houston, there is a problem!
 	WWASSERT((con == NULL) || (Container == NULL));
-	Container = con; 
+	Container = con;
 }
 
 #ifdef GET_CONTAINER_INLINE
@@ -401,9 +396,9 @@ void RenderObjClass::Set_Container(RenderObjClass * con)
  * HISTORY:                                                                                    *
  *   3/4/99     GTH : Created.                                                                 *
  *=============================================================================================*/
-RenderObjClass * RenderObjClass::Get_Container(void) const													
-{ 
-	return Container; 
+RenderObjClass * RenderObjClass::Get_Container(void) const
+{
+	return Container;
 }
 #endif
 
@@ -438,7 +433,7 @@ void RenderObjClass::Set_Transform(const Matrix3D &m)
  *                                                                                             *
  * HISTORY:                                                                                    *
  *   2/25/99    GTH : Created.                                                                 *
- *   07/14/2001 SKB : Add Check_Is_Transform_Identity                                          * 
+ *   07/14/2001 SKB : Add Check_Is_Transform_Identity                                          *
  *=============================================================================================*/
 void RenderObjClass::Set_Position(const Vector3 &v)
 {
@@ -463,16 +458,16 @@ void RenderObjClass::Set_Position(const Vector3 &v)
 void RenderObjClass::Validate_Transform(void) const
 {
 	/*
-	** Recurse up the tree to see if any of my parents are saying that their sub-object 
+	** Recurse up the tree to see if any of my parents are saying that their sub-object
 	** transforms are dirty
 	*/
 	RenderObjClass * con = Get_Container();
 	bool dirty = false;
-	if (con != NULL) 
+	if (con != NULL)
 	{
 		dirty = con->Are_Sub_Object_Transforms_Dirty();
 
-		while (con->Get_Container() != NULL) 
+		while (con->Get_Container() != NULL)
 		{
 			dirty |= con->Are_Sub_Object_Transforms_Dirty();
 			con = con->Get_Container();
@@ -481,12 +476,12 @@ void RenderObjClass::Validate_Transform(void) const
 		/*
 		** If the transforms are dirty, update them
 		*/
-		if (dirty) 
+		if (dirty)
 		{
 			con->Update_Sub_Object_Transforms();
 		}
 	}
-	if (dirty) 
+	if (dirty)
 		IsTransformIdentity = Check_Is_Transform_Identity(Transform);
 }
 
@@ -546,7 +541,7 @@ RenderObjClass * RenderObjClass::Get_Sub_Object_By_Name(const char * name, int *
 		if (robj) {
 			const char * subobjname = strchr(robj->Get_Name(),'.');
 			if (subobjname == NULL) {
-				subobjname = robj->Get_Name();	
+				subobjname = robj->Get_Name();
 			} else {
 				// skip past the period.
 				subobjname = subobjname+1;
@@ -572,7 +567,7 @@ RenderObjClass * RenderObjClass::Get_Sub_Object_By_Name(const char * name, int *
  *                                                                                             *
  * OUTPUT:                                                                                     *
  *                                                                                             *
- * WARNINGS:	If the bone name is unknown then this function will add the the object to the   *  
+ * WARNINGS:	If the bone name is unknown then this function will add the the object to the   *
  *					root transform rather than failing.  This is due to the fact that GetBoneIndex  *
  *					returns the root tranform for unknown bones.												  *
  *                                                                                             *
@@ -730,7 +725,7 @@ void RenderObjClass::Update_Sub_Object_Bits(void)
 {
 	// this doesn't do anything for non-composite objects
 	if (Get_Num_Sub_Objects() == 0) return;
-	
+
 	// go through all of our sub-objects
 	int coltype = 0;
 	int istrans = 0;
@@ -745,9 +740,9 @@ void RenderObjClass::Update_Sub_Object_Bits(void)
 		isadditive |= robj->Is_Additive();
 		robj->Release_Ref();
 	}
-	
+
 	Set_Collision_Type(coltype);
-	Set_Translucent(istrans);	
+	Set_Translucent(istrans);
 	Set_Alpha(isalpha);
 	Set_Additive(isadditive);
 
@@ -777,18 +772,18 @@ void RenderObjClass::Update_Sub_Object_Transforms(void)
 {
 }
 
-	
-/*********************************************************************************************** 
+
+/***********************************************************************************************
  * RenderObjClass::Add -- Generic add for render objects                                       *
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   11/04/1997 GH  : Created.                                                                 * 
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/04/1997 GH  : Created.                                                                 *
  *   2/25/99    GTH : Moved to the base RenderObjClass                                         *
  *=============================================================================================*/
 void RenderObjClass::Add(SceneClass * scene)
@@ -799,20 +794,20 @@ void RenderObjClass::Add(SceneClass * scene)
 	Scene->Add_Render_Object(this);
 }
 
-/*********************************************************************************************** 
- * RenderObjClass::Remove -- Generic Remove for Render Objects                                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   11/04/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * RenderObjClass::Remove -- Generic Remove for Render Objects                                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/04/1997 GH  : Created.                                                                 *
  *   2/25/99    GTH : moved to the base RenderObjClass                                         *
  *=============================================================================================*/
-void RenderObjClass::Remove(void)
+bool RenderObjClass::Remove(void)
 {
 	// All render objects have their scene pointers set.  To check if this is a "top level"
 	// object, (i.e. directly in the scene) you see if its Container pointer is NULL.
@@ -820,16 +815,19 @@ void RenderObjClass::Remove(void)
 	if (Container == NULL) {
 		if (Scene != NULL) {
 			Scene->Remove_Render_Object(this);
-			return;
+			return true;
 		}
+		return false;
 	} else {
 		Container->Remove_Sub_Object(this);
-		return;
+		return true;
 	}
 #else
-	if (!Scene) return;
+	if (!Scene)
+		return false;
 	Scene->Remove_Render_Object(this);
 	Scene = NULL;
+	return true;
 #endif
 }
 
@@ -968,7 +966,7 @@ void RenderObjClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
  * HISTORY:                                                                                    *
  *   2/25/99    GTH : Moved into RenderObjClass                                                *
  *=============================================================================================*/
-bool RenderObjClass::Intersect(IntersectionClass *Intersection, IntersectionResultClass *Final_Result) 
+bool RenderObjClass::Intersect(IntersectionClass *Intersection, IntersectionResultClass *Final_Result)
 {
 
 	// do the quick sphere test just to make sure it is worth the more expensive intersection test
@@ -1014,7 +1012,7 @@ bool RenderObjClass::Intersect(IntersectionClass *Intersection, IntersectionResu
 bool RenderObjClass::Intersect_Sphere(IntersectionClass *Intersection, IntersectionResultClass *Final_Result)
 {
 	SphereClass sphere = Get_Bounding_Sphere();
-	return Intersection->Intersect_Sphere(sphere, Final_Result); 
+	return Intersection->Intersect_Sphere(sphere, Final_Result);
 }
 
 
@@ -1033,7 +1031,7 @@ bool RenderObjClass::Intersect_Sphere(IntersectionClass *Intersection, Intersect
 bool RenderObjClass::Intersect_Sphere_Quick(IntersectionClass *Intersection, IntersectionResultClass *Final_Result)
 {
 	SphereClass sphere = Get_Bounding_Sphere();
-	return Intersection->Intersect_Sphere_Quick(sphere, Final_Result); 
+	return Intersection->Intersect_Sphere_Quick(sphere, Final_Result);
 }
 
 /***********************************************************************************************
@@ -1055,7 +1053,7 @@ bool RenderObjClass::Build_Dependency_List (DynamicVectorClass<StringClass> &fil
 		// Loop through all this object's subobj's
 		int subobj_count = Get_Num_Sub_Objects ();
 		for (int index = 0; index < subobj_count; index ++) {
-			
+
 			// Ask this subobj to add all of its file dependencies to the list
 			RenderObjClass *psub_obj = Get_Sub_Object (index);
 			if (psub_obj != NULL) {
@@ -1071,7 +1069,7 @@ bool RenderObjClass::Build_Dependency_List (DynamicVectorClass<StringClass> &fil
 	// Return the true/false result code
 	return (file_list.Count () > 0);
 }
- 
+
 
 /***********************************************************************************************
  * RenderObjClass::Build_Texture_List -- Builds a list of texture files this obj depends on.   *
@@ -1098,7 +1096,7 @@ bool RenderObjClass::Build_Texture_List
 		//
 		int subobj_count = Get_Num_Sub_Objects ();
 		for (int index = 0; index < subobj_count; index ++) {
-			
+
 			//
 			// Ask this subobj to add all of its texture file dependencies to the list
 			//
@@ -1118,7 +1116,7 @@ bool RenderObjClass::Build_Texture_List
 	// Return the true/false result code
 	return (texture_file_list.Count () > 0);
 }
- 
+
 /***********************************************************************************************
  * RenderObjClass::Add_Dependencies_To_List -- Add dependent files to the list.                *
  *                                                                                             *
@@ -1141,7 +1139,7 @@ void RenderObjClass::Add_Dependencies_To_List
 	// Should we add W3D files to the list?
 	//
 	if (textures_only == false) {
-		
+
 		//
 		// Main W3D file
 		//
@@ -1155,7 +1153,7 @@ void RenderObjClass::Add_Dependencies_To_List
 		if (phtree != NULL) {
 			const char *htree_name = phtree->Get_Name ();
 			if (::lstrcmpi (htree_name, model_name) != 0) {
-								
+
 				//
 				// Add this file to the list
 				//
@@ -1168,7 +1166,7 @@ void RenderObjClass::Add_Dependencies_To_List
 		//
 		const char *base_model_name = Get_Base_Model_Name ();
 		if (base_model_name != NULL) {
-				
+
 			//
 			// Add this file to the list
 			//
@@ -1189,7 +1187,7 @@ void RenderObjClass::Add_Dependencies_To_List
 	NOTE: For now, the render obj PersistFactory is going to cheat by simply storing
 	the name of the render object that was saved.  At load time, it will ask the
 	asset manager for that object again.  If the asset manager fails to re-create the
-	object, 
+	object,
 
 
 ****************************************************************************************/
@@ -1200,7 +1198,7 @@ class RenderObjPersistFactoryClass : public PersistFactoryClass
 	virtual PersistClass *	Load(ChunkLoadClass & cload) const;
 	virtual void				Save(ChunkSaveClass & csave,PersistClass * obj)	const;
 
-	enum 
+	enum
 	{
 		RENDOBJFACTORY_CHUNKID_VARIABLES		= 0x00555040,
 		RENDOBJFACTORY_VARIABLE_OBJPOINTER	= 0x00,
@@ -1221,47 +1219,48 @@ PersistClass *	RenderObjPersistFactoryClass::Load(ChunkLoadClass & cload) const
 	RenderObjClass * old_obj = NULL;
 	Matrix3D tm(1);
 	char name[64];
+	name[0] = '\0';
 
 	while (cload.Open_Chunk()) {
 		switch (cload.Cur_Chunk_ID()) {
 
 			case RENDOBJFACTORY_CHUNKID_VARIABLES:
-			
+
 				while (cload.Open_Micro_Chunk()) {
 					switch(cload.Cur_Micro_Chunk_ID()) {
-						READ_MICRO_CHUNK(cload,RENDOBJFACTORY_VARIABLE_OBJPOINTER,old_obj);	
+						READ_MICRO_CHUNK(cload,RENDOBJFACTORY_VARIABLE_OBJPOINTER,old_obj);
 						READ_MICRO_CHUNK(cload,RENDOBJFACTORY_VARIABLE_TRANSFORM,tm);
 						READ_MICRO_CHUNK_STRING(cload,RENDOBJFACTORY_VARIABLE_NAME,name,sizeof(name));
 					}
-					cload.Close_Micro_Chunk();	
+					cload.Close_Micro_Chunk();
 				}
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		};
 		cload.Close_Chunk();
 	}
-	
+
 	// if the object we saved didn't have a name, replace it with null
 	if (strlen(name) == 0) {
 		static int count = 0;
-		if ( ++count < 10 ) {
-			WWDEBUG_SAY(("RenderObjPersistFactory attempted to load an un-named render object!\r\n"));
-			WWDEBUG_SAY(("Replacing it with a NULL render object!\r\n"));
+		if ( count++ < 10 ) {
+			WWDEBUG_SAY(("RenderObjPersistFactory attempted to load an un-named render object!"));
+			WWDEBUG_SAY(("Replacing it with a NULL render object!"));
 		}
 		strcpy(name,"NULL");
 	}
 
 	RenderObjClass * new_obj = WW3DAssetManager::Get_Instance()->Create_Render_Obj(name);
-	
+
 	if (new_obj == NULL) {
 		static int count = 0;
-		if ( ++count < 10 ) {
-			WWDEBUG_SAY(("RenderObjPersistFactory failed to create object: %s!!\r\n",name));
-			WWDEBUG_SAY(("Either the asset for this object is gone or you tried to save a procedural object.\r\n"));
-			WWDEBUG_SAY(("Replacing it with a NULL render object!\r\n"));
+		if ( count++ < 10 ) {
+			WWDEBUG_SAY(("RenderObjPersistFactory failed to create object: %s!!",name));
+			WWDEBUG_SAY(("Either the asset for this object is gone or you tried to save a procedural object."));
+			WWDEBUG_SAY(("Replacing it with a NULL render object!"));
 		}
 		strcpy(name,"NULL");
 		new_obj = WW3DAssetManager::Get_Instance()->Create_Render_Obj(name);
@@ -1271,7 +1270,7 @@ PersistClass *	RenderObjPersistFactoryClass::Load(ChunkLoadClass & cload) const
 	if (new_obj) {
 		new_obj->Set_Transform(tm);
 	}
-	
+
 	SaveLoadSystemClass::Register_Pointer(old_obj,new_obj);
 	return new_obj;
 }
@@ -1291,21 +1290,21 @@ void RenderObjPersistFactoryClass::Save(ChunkSaveClass & csave,PersistClass * ob
 
 
 /*
-** RenderObj save-load. 
+** RenderObj save-load.
 */
 const PersistFactoryClass & RenderObjClass::Get_Factory (void) const
 {
-	return _RenderObjPersistFactory;	
+	return _RenderObjPersistFactory;
 }
 
 bool RenderObjClass::Save (ChunkSaveClass &csave)
 {
 	// This should never hit with the persist factory we're using...
-	// Yes this looks like a design flaw but the way we're saving render objects is 
+	// Yes this looks like a design flaw but the way we're saving render objects is
 	// a "shortcut".  We specifically designed this capability into the persistant
 	// object system so that we could avoid making all render object's save and
 	// load themselves if possible.
-	WWASSERT(0); 
+	WWASSERT(0);
 	return true;
 }
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h
index d2b9483f395..fe1005ff48e 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                   Org Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 9:23a                                              $*
  *                                                                                             *
  *                    $Revision:: 14                                                          $*
@@ -38,16 +38,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef RENDOBJ_H
-#define RENDOBJ_H
 
 #include "always.h"
-#include "refcount.h"
 #include "sphere.h"
 #include "coltype.h"
 #include "aabox.h"
@@ -82,27 +75,13 @@ class RenderObjProxyClass;
 class StringClass;
 template<class T> class DynamicVectorClass;
 
-// "unreferenced formal parameter" 
+// "unreferenced formal parameter"
 #pragma warning(disable : 4100)
 
-#ifdef DEFINE_W3DANIMMODE_NAMES
-static const char* TheAnimModeNames[] =
-{
-	"MANUAL",
-	"LOOP",
-	"ONCE",
-	"LOOP_PINGPONG",
-	"LOOP_BACKWARDS",
-	"ONCE_BACKWARDS",
-	NULL
-};
-#endif
-
-
 //////////////////////////////////////////////////////////////////////////////////
 // RenderObjClass
 // This is the interface for all objects that get rendered by WW3D.
-// 
+//
 // Render object RTTI:  If you really need to typecast a render object
 //		pointer that you got from the asset manager, the class id mechanism
 //		can be used to check what you really have.  User class id's can come
@@ -128,14 +107,14 @@ static const char* TheAnimModeNames[] =
 //	VertexProcessors: Vertex processors are classes that are not actually 'rendered'
 //		They insert into the system an object that performs operations on all of
 //		the subsequent vertices that are processed.  Lights and Fogs are types of
-//		vertex processors.  
+//		vertex processors.
 //
-// "Scene Graph": A scene is organized as a list of render objects.  There is no 
-//		implied hierarchical structure to a scene.  RenderObjects can contain other 
+// "Scene Graph": A scene is organized as a list of render objects.  There is no
+//		implied hierarchical structure to a scene.  RenderObjects can contain other
 //		render objects (they follow the 'Composite' pattern) which is how hierarchical
 //		objects are built.  Hierarchical models are render objects that just
 //		contain other render objects and apply hierarchical transforms to them.
-//		Hierarchical Models can be inserted inside of other hierarchical models.   
+//		Hierarchical Models can be inserted inside of other hierarchical models.
 //
 //	Predictive LOD: The predictive LOD system selects LODs for the visible objects
 //		so that the various resources (polys, vertices, etc.) do not pass given
@@ -177,14 +156,14 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
  	//User_Data to signal that it points at custom mesh material settings.
 	//Added for 'Generals' - MW
  	enum	{USER_DATA_MATERIAL_OVERRIDE = 0x01234567};
- 
+
  	//This strucutre is used to pass custom rendering parameters into the W3D
  	//mesh renderer so it can override settings which are usually shared across
  	//all instances of a model - typically material settings like alpha, texture
- 	//animation, texture uv scrolling, etc.  Added for 'Generals' -MW 
+ 	//animation, texture uv scrolling, etc.  Added for 'Generals' -MW
  	struct Material_Override
  	{	Material_Override(void)	: Struct_ID(USER_DATA_MATERIAL_OVERRIDE),customUVOffset(0,0) {}
- 
+
  		int Struct_ID;	//ID used to identify this structure from a pointer to it.
  		Vector2 customUVOffset;
  	};
@@ -193,7 +172,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 	//	Note:  It is very important that these values NEVER CHANGE.  That means
 	//	when adding a new class id, it should be added to the end of the enum.
 	//
-	enum 
+	enum
 	{
 		CLASSID_UNKNOWN	= 0xFFFFFFFF,
 		CLASSID_MESH		= 0,
@@ -209,7 +188,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 		CLASSID_DYNASCREENMESH,
 		CLASSID_TEXTDRAW,
 		CLASSID_FOG,
-		CLASSID_LAYERFOG,		
+		CLASSID_LAYERFOG,
 		CLASSID_LIGHT,
 		CLASSID_PARTICLEEMITTER,
 		CLASSID_PARTICLEBUFFER,
@@ -245,7 +224,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Cloning and Identification
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	virtual RenderObjClass *	Clone(void) const																= 0;		
+	virtual RenderObjClass *	Clone(void) const																= 0;
 	virtual int						Class_ID(void)	const															{ return CLASSID_UNKNOWN; }
 	virtual const char *			Get_Name(void) const															{ return "UNNAMED"; }
 	virtual void					Set_Name(const char * name)												{ }
@@ -259,27 +238,27 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 	//
 	// Render - this object should render its polygons.  Typically called from a SceneClass
 	// Special_Render - all special-case rendering goes here to avoid polluting the main render pipe (e.g. VIS)
-	// On_Frame_Update - render objects can register for an On_Frame_Update call; the scene will call this once 
+	// On_Frame_Update - render objects can register for an On_Frame_Update call; the scene will call this once
 	//                   per frame if they do so.
 	// Restart - This interface is used to facilitate model recycling.  If a render object is "Restarted" it should
-	//           put itself back into a state as if it has never been rendered (e.g. particle emitters 
+	//           put itself back into a state as if it has never been rendered (e.g. particle emitters
 	//           should reset their "emitted particle counts" so they can be re-used.)
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	virtual void					Render(RenderInfoClass & rinfo)											= 0;
 	virtual void					Special_Render(SpecialRenderInfoClass & rinfo)						{ }
 	virtual void					On_Frame_Update() 														{ }
-	virtual void					Restart(void)																	{ }	
+	virtual void					Restart(void)																	{ }
 
 
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - "Scene Graph"
-	// Some of the functions in this group are non-virtual as they are meant 
-	// to be never overriden or are supposed to be implemented in terms of 
+	// Some of the functions in this group are non-virtual as they are meant
+	// to be never overriden or are supposed to be implemented in terms of
 	// the other virtual functions.  We want to keep the virtual interface
-	// as small as possible 
+	// as small as possible
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	virtual void					Add(SceneClass * scene);
-	virtual void					Remove(void);
+	virtual bool					Remove(void);
 	virtual SceneClass *			Get_Scene(void);
 	virtual SceneClass *			Peek_Scene(void)																{ return Scene; }
 	virtual void					Set_Container(RenderObjClass * con);
@@ -288,7 +267,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 #define GET_CONTAINER_INLINE
 #ifdef GET_CONTAINER_INLINE
 	// srj sez: this is called a ton and never overridden, so inline it
-	inline RenderObjClass *	Get_Container(void) const { return Container; }
+	RenderObjClass *	Get_Container(void) const { return Container; }
 #else
 	virtual RenderObjClass *	Get_Container(void) const;
 #endif
@@ -306,7 +285,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 	virtual void					Notify_Added(SceneClass * scene);
 	virtual void					Notify_Removed(SceneClass * scene);
 
-	virtual int						Get_Num_Sub_Objects(void) const											{ return 0; } 					
+	virtual int						Get_Num_Sub_Objects(void) const											{ return 0; }
 	virtual RenderObjClass *	Get_Sub_Object(int index) const											{ return NULL; }
 	virtual int						Add_Sub_Object(RenderObjClass * subobj)								{ return 0; }
 	virtual int						Remove_Sub_Object(RenderObjClass * robj)								{ return 0; }
@@ -328,7 +307,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Hierarchical Animation
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	enum AnimMode 
+	enum AnimMode
 	{
 		ANIM_MODE_MANUAL		= 0,
 		ANIM_MODE_LOOP,
@@ -336,6 +315,8 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 		ANIM_MODE_LOOP_PINGPONG,
 		ANIM_MODE_LOOP_BACKWARDS,	//make sure only backwards playing animations after this one
 		ANIM_MODE_ONCE_BACKWARDS,
+
+		ANIM_MODE_COUNT
 	};
 
 	virtual void					Set_Animation( void )														{ }
@@ -355,13 +336,13 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 	virtual const Matrix3D &	Get_Bone_Transform(const char * bonename)    						{ return Get_Transform(); }
 	virtual const Matrix3D &	Get_Bone_Transform(int boneindex)      								{ return Get_Transform(); }
 	virtual void					Capture_Bone(int bindex)													{ }
-	
+
 
 	virtual void					Release_Bone(int bindex)													{ }
 	virtual bool					Is_Bone_Captured(int bindex) const										{ return false; }
 	virtual void					Control_Bone(int bindex,const Matrix3D & objtm,bool world_space_translation = false)						{ }
 	virtual const HTreeClass *	Get_HTree(void) const														{ return NULL; }
-	
+
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Collision Detection
 	// Cast_Ray - intersects a ray with the render object
@@ -376,7 +357,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 	virtual bool					Cast_Ray(RayCollisionTestClass & raytest)								{ return false; }
 	virtual bool					Cast_AABox(AABoxCollisionTestClass & boxtest)						{ return false; }
 	virtual bool					Cast_OBBox(OBBoxCollisionTestClass & boxtest)						{ return false; }
-	
+
 	virtual bool					Intersect_AABox(AABoxIntersectionTestClass & boxtest)				{ return false; }
 	virtual bool					Intersect_OBBox(OBBoxIntersectionTestClass & boxtest)				{ return false; }
 
@@ -422,7 +403,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Dependency Generation
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	
+
 	//
 	//	Note:  The strings contained in these lists need to be freed by the caller.
 	// They should be freed using the delete operator.
@@ -437,7 +418,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	virtual void					Create_Decal(DecalGeneratorClass * generator)						{ }
 	virtual void					Delete_Decal(uint32 decal_id)												{ }
-	
+
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Attributes, Options, Properties, etc
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -458,7 +439,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 
    virtual int						Get_Sort_Level(void) const													{ return 0; /* SORT_LEVEL_NONE */ }
    virtual void					Set_Sort_Level(int level)													{ }
-	
+
 	virtual int						Is_Really_Visible(void)														{ return ((Bits & IS_REALLY_VISIBLE) == IS_REALLY_VISIBLE); }
 	virtual int						Is_Not_Hidden_At_All(void)													{ return ((Bits & IS_NOT_HIDDEN_AT_ALL) == IS_NOT_HIDDEN_AT_ALL); }
 	virtual int						Is_Visible(void) const														{ return (Bits & IS_VISIBLE); }
@@ -518,20 +499,20 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 
 	virtual void					Update_Cached_Bounding_Volumes(void) const;
 	virtual void					Update_Sub_Object_Bits(void);
-	
+
 	bool								Bounding_Volumes_Valid(void) const										{ return (Bits & BOUNDING_VOLUMES_VALID) != 0; }
 	void								Invalidate_Cached_Bounding_Volumes(void) const						{ Bits &= ~BOUNDING_VOLUMES_VALID; }
 	void								Validate_Cached_Bounding_Volumes(void)	const							{ Bits |= BOUNDING_VOLUMES_VALID; }
 
-	enum 
+	enum
 	{
-		COLL_TYPE_MASK =		0x000000FF, 
+		COLL_TYPE_MASK =		0x000000FF,
 
 		IS_VISIBLE =					0x00000100,
 		IS_NOT_HIDDEN =				0x00000200,
 		IS_NOT_ANIMATION_HIDDEN =	0x00000400,
 		IS_FORCE_VISIBLE =			0x00000800,
-		BOUNDING_VOLUMES_VALID =	0x00002000,		
+		BOUNDING_VOLUMES_VALID =	0x00002000,
 		IS_TRANSLUCENT =				0x00004000,			// is additive or alpha blended on any poly
 		IGNORE_LOD_COST =				0x00008000,			// used to define if we should ignore object from LOD calculations
 		SUBOBJS_MATCH_LOD =			0x00010000,			// force sub-objects to have same LOD level
@@ -559,7 +540,7 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 	void *							User_Data;
 
 	RenderHookClass *				RenderHook;
-	
+
 	friend class SceneClass;
 	friend class RenderObjProxyClass;
 };
@@ -568,7 +549,7 @@ WWINLINE const SphereClass & RenderObjClass::Get_Bounding_Sphere(void) const
 {
 	if (!(Bits & BOUNDING_VOLUMES_VALID)) {
 		Update_Cached_Bounding_Volumes();
-	} 
+	}
 	return CachedBoundingSphere;
 }
 
@@ -580,17 +561,17 @@ WWINLINE const AABoxClass & RenderObjClass::Get_Bounding_Box(void) const
 	return CachedBoundingBox;
 }
 
-/************************************************************************** 
- * Bound_Degrees -- Bounds a degree value between 0 and 360.              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   09/22/1997 PWG : Created.                                            * 
+/**************************************************************************
+ * Bound_Degrees -- Bounds a degree value between 0 and 360.              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   09/22/1997 PWG : Created.                                            *
  *========================================================================*/
 WWINLINE float Bound_Degrees(float angle)
 {
@@ -653,6 +634,16 @@ WWINLINE bool RenderObjClass::Is_Transform_Identity_No_Validity_Check() const
 }
 
 
-
-
-#endif
\ No newline at end of file
+#ifdef DEFINE_W3DANIMMODE_NAMES
+static const char* const TheAnimModeNames[] =
+{
+	"MANUAL",
+	"LOOP",
+	"ONCE",
+	"LOOP_PINGPONG",
+	"LOOP_BACKWARDS",
+	"ONCE_BACKWARDS",
+	NULL
+};
+static_assert(ARRAY_SIZE(TheAnimModeNames) == RenderObjClass::ANIM_MODE_COUNT + 1, "Incorrect array size");
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp
index 675dc115023..5108aa7152a 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp
@@ -128,7 +128,7 @@ friend class RingRenderObjClass;
 	float	Radius;
 	int	Slices;
 	int	face_ct;			//# of faces
-	
+
 	int		TileCount;
 	Vector2	InnerScale;
 	Vector2	OuterScale;
@@ -229,13 +229,13 @@ RingRenderObjClass::RingRenderObjClass(const W3dRingStruct & def)
 {
 	Generate_Shared_Mesh_Arrays ();
 	Init_Material ();
-	
+
 	//
 	//	Initialize from the defintion
 	//
 	Set_Name(def.Name);
 	Set_Local_Center_Extent (	Vector3 (def.Center.X, def.Center.Y, def.Center.Z),
-										Vector3 (def.Extent.X, def.Extent.Y, def.Extent.Z));	
+										Vector3 (def.Extent.X, def.Extent.Y, def.Extent.Z));
 	if (def.TextureName[0] != 0) {
 		RingTexture = WW3DAssetManager::Get_Instance ()->Get_Texture (def.TextureName);
 	}
@@ -306,7 +306,7 @@ RingRenderObjClass::~RingRenderObjClass()
 {
 	REF_PTR_RELEASE(RingMaterial);
 	REF_PTR_RELEASE(RingTexture);
-} // destructor
+}
 
 
 /***********************************************************************************************
@@ -344,7 +344,7 @@ RingRenderObjClass & RingRenderObjClass::operator = (const RingRenderObjClass &
 		InnerExtent			= that.InnerExtent;
 		OuterExtent			= that.OuterExtent;
 		TextureTileCount	= that.TextureTileCount;
-		
+
 		Set_Texture (that.RingTexture);
 	}
 
@@ -430,7 +430,7 @@ void RingRenderObjClass::Init_Material (void)
 	// Texturing, zbuffer, primary gradient, alpha blending
 	RingShader = ShaderClass::_PresetAlphaShader;
 
-}	// Init_Material
+}
 
 
 
@@ -502,8 +502,8 @@ const char * RingRenderObjClass::Get_Name(void) const
 void RingRenderObjClass::Set_Name(const char * name)
 {
 	WWASSERT(name != NULL);
-	WWASSERT(strlen(name) < 2*W3D_NAME_LEN);
-	strcpy(Name,name);
+	const size_t nameLen = strlcpy(Name, name, ARRAY_SIZE(Name));
+	(void)nameLen; WWASSERT(nameLen < ARRAY_SIZE(Name));
 }
 
 /***********************************************************************************************
@@ -535,7 +535,7 @@ void RingRenderObjClass::render_ring(RenderInfoClass & rinfo,const Vector3 & cen
 	}
 	DX8Wrapper::Set_Shader(RingShader);
 	DX8Wrapper::Set_Texture(0,RingTexture);
-	DX8Wrapper::Set_Material(RingMaterial);	
+	DX8Wrapper::Set_Material(RingMaterial);
 
 	// Enable sorting if the primitive is translucent, alpha testing is not enabled, and sorting is enabled globally.
 	const bool sort = (RingShader.Get_Dst_Blend_Func() != ShaderClass::DSTBLEND_ZERO) && (RingShader.Get_Alpha_Test() == ShaderClass::ALPHATEST_DISABLE) && (WW3D::Is_Sorting_Enabled());
@@ -554,26 +554,26 @@ void RingRenderObjClass::render_ring(RenderInfoClass & rinfo,const Vector3 & cen
 			color = DX8Wrapper::Convert_Color(Alpha * Color,1.0f);
 		} else {
 			color = DX8Wrapper::Convert_Color(Color,Alpha);
-		}	
+		}
 
 		for (int i=0; i<ring.Vertex_ct; i++)
-		{			
+		{
 			vb->x = ring.vtx[i].X;
 			vb->y = ring.vtx[i].Y;
 			vb->z = ring.vtx[i].Z;
-			
+
 			vb->nx = ring.vtx_normal[i].X;		// may not need this!
 			vb->ny = ring.vtx_normal[i].Y;
 			vb->nz = ring.vtx_normal[i].Z;
 
 			vb->diffuse = color;
-			
+
 			if (RingTexture) {
 				vb->u1 = ring.vtx_uv[i].X;
 				vb->v1 = ring.vtx_uv[i].Y;
 			}
 			vb++;
-		}		
+		}
 	}
 
 	DynamicIBAccessClass ib(buffer_type, ring.face_ct * 3);
@@ -586,18 +586,18 @@ void RingRenderObjClass::render_ring(RenderInfoClass & rinfo,const Vector3 & cen
 			mem[3*i+1]=ring.tri_poly[i].J;
 			mem[3*i+2]=ring.tri_poly[i].K;
 		}
-	}	
+	}
 
 	DX8Wrapper::Set_Vertex_Buffer(vb);
 	DX8Wrapper::Set_Index_Buffer(ib,0);
-	
+
 	if (sort) {
 		SortingRendererClass::Insert_Triangles(Get_Bounding_Sphere(), 0, ring.face_ct, 0, ring.Vertex_ct);
 	} else {
 		DX8Wrapper::Draw_Triangles(0, ring.face_ct, 0, ring.Vertex_ct);
 	}
 
-} // render_ring
+}
 
 
 /***********************************************************************************************
@@ -617,7 +617,7 @@ void RingRenderObjClass::render_ring(RenderInfoClass & rinfo,const Vector3 & cen
 void RingRenderObjClass::vis_render_ring(SpecialRenderInfoClass & rinfo,const Vector3 & center,const Vector3 & extent)
 {
 	WWASSERT(0);
-}	// vis_render_ring
+}
 
 
 /***********************************************************************************************
@@ -676,7 +676,7 @@ void RingRenderObjClass::Render(RenderInfoClass & rinfo)
 	if (Is_Not_Hidden_At_All() == false) {
 		return;
 	}
-	
+
 	unsigned int sort_level = SORT_LEVEL_NONE;
 
 	if (!WW3D::Is_Sorting_Enabled()) {
@@ -688,10 +688,10 @@ void RingRenderObjClass::Render(RenderInfoClass & rinfo)
 		WW3D::Add_To_Static_Sort_List(this, sort_level);
 
 	} else {
-	
+
 		// Process texture reductions:
 //		if (RingTexture) RingTexture->Process_Reduction();
-		
+
 		Matrix3D temp = Transform;
 
 		// Do Time Based Animation
@@ -718,15 +718,15 @@ void RingRenderObjClass::Render(RenderInfoClass & rinfo)
 		if (Flags & USE_CAMERA_ALIGN) {
 			Vector3 obj_position;
 			Vector3 camera_z_vector;
-			
+
 			rinfo.Camera.Get_Transform().Get_Z_Vector(&camera_z_vector);
 			Transform.Get_Translation(&obj_position);
 
 			Matrix3D temp;
 			temp.Look_At(obj_position, obj_position + camera_z_vector, 0.0f);
-			DX8Wrapper::Set_Transform(D3DTS_WORLD, temp);	
+			DX8Wrapper::Set_Transform(D3DTS_WORLD, temp);
 		} else {
-			DX8Wrapper::Set_Transform(D3DTS_WORLD, Transform);	
+			DX8Wrapper::Set_Transform(D3DTS_WORLD, Transform);
 		}
 
 		//
@@ -734,7 +734,7 @@ void RingRenderObjClass::Render(RenderInfoClass & rinfo)
 		//
 		render_ring (rinfo, ObjSpaceCenter, ObjSpaceExtent);
 	}
-}	// Render
+}
 
 
 /***********************************************************************************************
@@ -752,7 +752,7 @@ void RingRenderObjClass::Render(RenderInfoClass & rinfo)
 Vector3 RingRenderObjClass::Get_Default_Color(void) const
 {
 	Vector3 value;
-	
+
 	if (ColorChannel.Get_Key_Count () > 0) {
 		value = ColorChannel.Get_Key (0).Get_Value ();
 	} else {
@@ -778,7 +778,7 @@ Vector3 RingRenderObjClass::Get_Default_Color(void) const
 float RingRenderObjClass::Get_Default_Alpha(void) const
 {
 	float  value;
-	
+
 	if (AlphaChannel.Get_Key_Count () > 0) {
 		value = AlphaChannel.Get_Key (0).Get_Value ();
 	} else {
@@ -804,7 +804,7 @@ float RingRenderObjClass::Get_Default_Alpha(void) const
 Vector2 RingRenderObjClass::Get_Default_Inner_Scale(void) const
 {
 	Vector2 value;
-	
+
 	if (InnerScaleChannel.Get_Key_Count () > 0) {
 		value = InnerScaleChannel.Get_Key (0).Get_Value ();
 	} else {
@@ -830,7 +830,7 @@ Vector2 RingRenderObjClass::Get_Default_Inner_Scale(void) const
 Vector2 RingRenderObjClass::Get_Default_Outer_Scale(void) const
 {
 	Vector2 value;
-	
+
 	if (OuterScaleChannel.Get_Key_Count () > 0) {
 		value = OuterScaleChannel.Get_Key (0).Get_Value ();
 	} else {
@@ -857,7 +857,7 @@ void RingRenderObjClass::Special_Render(SpecialRenderInfoClass & rinfo)
 {
 	Matrix3D temp(1);
 	temp.Translate(Transform.Get_Translation());
-	
+
 	if (rinfo.RenderType == SpecialRenderInfoClass::RENDER_VIS) {
 		WWASSERT(rinfo.VisRasterizer != NULL);
 		rinfo.VisRasterizer->Set_Model_Transform(temp);
@@ -1145,14 +1145,10 @@ void RingRenderObjClass::animate()
 				AlphaChannel.Get_Key_Count () > 0 ||
 				InnerScaleChannel.Get_Key_Count () > 0 ||
 				OuterScaleChannel.Get_Key_Count () > 0)
-		{		
-			//
-			// Convert from milliseconds to seconds and normalize the time
-			//
+		{
 			if (AnimDuration > 0) {
-				float	frametime = WW3D::Get_Frame_Time();
-				frametime = (frametime * 0.001F) / AnimDuration;
-				anim_time += frametime;
+				float frametime = WW3D::Get_Logic_Frame_Time_Seconds();
+				anim_time += frametime / AnimDuration;
 			} else {
 				anim_time = 1.0F;
 			}
@@ -1165,11 +1161,11 @@ void RingRenderObjClass::animate()
 			if (ColorChannel.Get_Key_Count () > 0) {
 				Color	= ColorChannel.Evaluate (anim_time);
 			}
-			
+
 			if (AlphaChannel.Get_Key_Count () > 0) {
 				Alpha	= AlphaChannel.Evaluate (anim_time);
 			}
-			
+
 			if (InnerScaleChannel.Get_Key_Count () > 0) {
 				InnerScale	= InnerScaleChannel.Evaluate (anim_time);
 			}
@@ -1185,7 +1181,7 @@ void RingRenderObjClass::animate()
 	}
 
 	return ;
-} // animate
+}
 
 
 /*
@@ -1209,9 +1205,9 @@ RingPrototypeClass::RingPrototypeClass (void)
 
 RingPrototypeClass::RingPrototypeClass(RingRenderObjClass *ring)
 {
-	::memset (&Definition, 0, sizeof (Definition));	
-	::strcpy (Definition.Name, ring->Get_Name ());
-	
+	::memset (&Definition, 0, sizeof (Definition));
+	strlcpy(Definition.Name, ring->Get_Name(), ARRAY_SIZE(Definition.Name));
+
 	Definition.AnimDuration			= ring->AnimDuration;
 	Definition.Attributes			= ring->Get_Flags ();
 	Definition.DefaultAlpha			= ring->Get_Default_Alpha ();
@@ -1221,13 +1217,13 @@ RingPrototypeClass::RingPrototypeClass(RingRenderObjClass *ring)
 
 	Definition.InnerExtent			= ring->Get_Inner_Extent ();
 	Definition.OuterExtent			= ring->Get_Outer_Extent ();
-	
+
 	Vector3 def_color = ring->Get_Default_Color ();
 	W3dUtilityClass::Convert_Vector (def_color, &Definition.DefaultColor);
-	
+
 	W3dUtilityClass::Convert_Vector (ring->Get_Box ().Center, &Definition.Center);
-	W3dUtilityClass::Convert_Vector (ring->Get_Box ().Extent, &Definition.Extent);	
-	W3dUtilityClass::Convert_Shader (ring->RingShader, &Definition.Shader);	
+	W3dUtilityClass::Convert_Vector (ring->Get_Box ().Extent, &Definition.Extent);
+	W3dUtilityClass::Convert_Shader (ring->RingShader, &Definition.Shader);
 
 	//
 	//	Determine the texture name for this ring
@@ -1241,7 +1237,7 @@ RingPrototypeClass::RingPrototypeClass(RingRenderObjClass *ring)
 			filename = name;
 		}
 
-		::strcpy (Definition.TextureName, filename);
+		strlcpy(Definition.TextureName, filename, ARRAY_SIZE(Definition.TextureName));
 	}
 
 	//
@@ -1287,7 +1283,7 @@ bool RingPrototypeClass::Load (ChunkLoadClass &cload)
 
 	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
-			
+
 			case CHUNKID_RING_DEF:
 				cload.Read (&Definition, sizeof (Definition));
 				break;
@@ -1350,14 +1346,14 @@ bool RingPrototypeClass::Save (ChunkSaveClass &csave)
 	csave.End_Chunk ();
 	return true;
 }
-	
+
 RenderObjClass * RingPrototypeClass::Create(void)
 {
 	//
 	//	Create the new render object
 	//
 	RingRenderObjClass *ring = W3DNEW RingRenderObjClass (Definition);
-	
+
 	//
 	//	Configure the ring
 	//
@@ -1375,7 +1371,7 @@ RenderObjClass * RingPrototypeClass::Create(void)
 	ring->Set_Inner_Extent (Definition.InnerExtent);
 	ring->Set_Outer_Extent (Definition.OuterExtent);
 	ring->Set_Texture_Tiling (Definition.TextureTileCount);
-	
+
 	//
 	//	Initialize the render object with the keyframe arrays
 	//
@@ -1451,7 +1447,7 @@ TileCount (5),
 InnerScale (1.0F, 1.0F),
 OuterScale (1.0F, 1.0F)
 {
-} // empty ringmesh Constructor
+}
 
 
 void RingMeshClass::Set_Tiling (int count)
@@ -1468,7 +1464,7 @@ void RingMeshClass::Set_Tiling (int count)
 		//
 		//	Reassign the UVs
 		//
-		for (int index = 0; index < Vertex_ct; index += 2) {			
+		for (int index = 0; index < Vertex_ct; index += 2) {
 			vtx_uv[index].Set (u_value, 0.0F);
 			vtx_uv[index + 1].Set (u_value, 1.0F);
 			u_value += u_inc;
@@ -1502,7 +1498,7 @@ void RingMeshClass::Scale (const Vector2 &inner_scale, const Vector2 &outer_scal
 	//	Only scale the outer ring if necessary
 	//
 	if (do_outer) {
-		
+
 		for (int index = 1; index < Vertex_ct; index += 2) {
 			vtx[index].X = orig_vtx[index].X * outer_scale.X;
 			vtx[index].Y = orig_vtx[index].Y * outer_scale.Y;
@@ -1554,10 +1550,10 @@ void RingMeshClass::Generate(float radius, int slices)
 	int	index			= 0;
 
 	for (index = 0; index < Vertex_ct; index += 2) {
-		
+
 		float x_pos = -WWMath::Sin (angle);
 		float y_pos = WWMath::Cos (angle);
-		
+
 		//
 		//	Place the inner index
 		//
@@ -1577,7 +1573,7 @@ void RingMeshClass::Generate(float radius, int slices)
 		//
 		vtx_normal[index].Set (0, 0, 1);
 		vtx_normal[index + 1].Set (0, 0, 1);
-		
+
 		//
 		//	Assign the UVs
 		//
@@ -1595,7 +1591,7 @@ void RingMeshClass::Generate(float radius, int slices)
 		tri_poly[index].I = index;
 		tri_poly[index].J = index+1;
 		tri_poly[index].K = index+2;
-	}	
+	}
 
 	return ;
 }
@@ -1633,11 +1629,11 @@ RingMeshClass::~RingMeshClass(void)
 void RingMeshClass::Free(void)
 {
 
-	if (vtx)				delete vtx;
-	if (orig_vtx)		delete orig_vtx;
-	if (vtx_normal)	delete vtx_normal;
-	if (vtx_uv)			delete vtx_uv;
-	if (tri_poly)		delete tri_poly;
+	delete vtx;
+	delete orig_vtx;
+	delete vtx_normal;
+	delete vtx_uv;
+	delete tri_poly;
 
 	vtx			= NULL;
 	orig_vtx		= NULL;
@@ -1645,6 +1641,6 @@ void RingMeshClass::Free(void)
 	vtx_uv		= NULL;
 	tri_poly		= NULL;
 
-} // Free
+}
 
 // EOF - ringobj.cpp
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h
index 6e3213dc57f..b4ab20f4944 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef RINGOBJ_H
-#define RINGOBJ_H
 
 #include "always.h"
 #include "rendobj.h"
@@ -102,7 +97,7 @@ struct W3dRingStruct
 **
 */
 class RingRenderObjClass : public RenderObjClass
-{	
+{
 
 public:
 
@@ -119,13 +114,13 @@ class RingRenderObjClass : public RenderObjClass
 	~RingRenderObjClass(void);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
 	virtual void					Render(RenderInfoClass & rinfo);
 	virtual void					Special_Render(SpecialRenderInfoClass & rinfo);
-	virtual void 					Set_Transform(const Matrix3D &m); 
+	virtual void 					Set_Transform(const Matrix3D &m);
 	virtual void 					Set_Position(const Vector3 &v);
    virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass	& sphere) const;
    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & box) const;
@@ -206,8 +201,8 @@ class RingRenderObjClass : public RenderObjClass
 
 	// Animatable channel access
 	RingColorChannelClass &			Get_Color_Channel (void)				{ return ColorChannel; }
-	const RingColorChannelClass &	Peek_Color_Channel (void)				{ return ColorChannel; }	
-	
+	const RingColorChannelClass &	Peek_Color_Channel (void)				{ return ColorChannel; }
+
 	RingAlphaChannelClass &			Get_Alpha_Channel (void)				{ return AlphaChannel; }
 	const RingAlphaChannelClass &	Peek_Alpha_Channel (void)				{ return AlphaChannel; }
 
@@ -223,7 +218,7 @@ class RingRenderObjClass : public RenderObjClass
 	void								Set_Outer_Scale_Channel (const RingScaleChannelClass &data)		{ OuterScaleChannel = data; }
 
 protected:
-	
+
 	virtual void					update_cached_box(void);
 	void								Update_On_Visibilty(void);
 
@@ -309,11 +304,11 @@ inline void RingRenderObjClass::Set_Local_Min_Max(const Vector3 & min,const Vect
 	update_cached_box();
 }
 
-inline const AABoxClass & RingRenderObjClass::Get_Box(void) 
-{ 
+inline const AABoxClass & RingRenderObjClass::Get_Box(void)
+{
 	Validate_Transform();
 	update_cached_box();
-	return CachedBox; 
+	return CachedBox;
 }
 
 /*
@@ -363,8 +358,4 @@ class RingPrototypeClass : public W3DMPO, public PrototypeClass
 extern RingLoaderClass			_RingLoader;
 
 
-#endif // RINGOBJ_H
-
 // EOF - ringobj,h
-
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h b/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h
index 4f3ca52bd63..fc24a6ad78b 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h
@@ -34,25 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef ROBJLIST_H
-#define ROBJLIST_H
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
-#ifndef MULTILIST_H
 #include "multilist.h"
-#endif
-
-#ifndef WWDEBUG_H
 #include "wwdebug.h"
-#endif
 
 class RenderObjClass;
 
@@ -61,7 +47,3 @@ typedef RefMultiListIterator<RenderObjClass>	RefRenderObjListIterator;
 
 typedef MultiListClass<RenderObjClass>			NonRefRenderObjListClass;
 typedef MultiListIterator<RenderObjClass>		NonRefRenderObjListIterator;
-
-#endif
-
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp b/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp
index 2701d7a88dd..be885b61fd2 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp
@@ -189,7 +189,7 @@ unsigned int SegmentedLineClass::Get_Subdivision_Levels(void)
 
 SegLineRendererClass::TextureMapMode SegmentedLineClass::Get_Texture_Mapping_Mode(void)
 {
-	return LineRenderer.Get_Texture_Mapping_Mode(); 
+	return LineRenderer.Get_Texture_Mapping_Mode();
 }
 
 float SegmentedLineClass::Get_Texture_Tile_Factor(void)
@@ -317,7 +317,7 @@ void SegmentedLineClass::Set_End_Caps(int onoff)
 
 RenderObjClass * SegmentedLineClass::Clone(void) const
 {
-	return NEW_REF( SegmentedLineClass, (*this)); 
+	return NEW_REF( SegmentedLineClass, (*this));
 }
 
 int SegmentedLineClass::Get_Num_Polys(void) const
@@ -337,14 +337,14 @@ void SegmentedLineClass::Render(RenderInfoClass & rinfo)
 
 	unsigned int sort_level = SORT_LEVEL_NONE;
 
-	if (!WW3D::Is_Sorting_Enabled())	
-		sort_level=Get_Shader().Guess_Sort_Level();	
+	if (!WW3D::Is_Sorting_Enabled())
+		sort_level=Get_Shader().Guess_Sort_Level();
+
+	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level!=SORT_LEVEL_NONE) {
 
-	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level!=SORT_LEVEL_NONE) {		
-		
 		WW3D::Add_To_Static_Sort_List(this, sort_level);
 
-	} else 
+	} else
 		Render_Seg_Line(rinfo);
 }
 
@@ -362,9 +362,9 @@ void SegmentedLineClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) con
 void SegmentedLineClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
 {
 	unsigned int num_points = PointLocations.Count();
-	
+
 	// Line must have at least two points to be valid
-	
+
 	if (num_points >= 2) {
 
 		// Find object-space axis-aligned bounding box
@@ -450,9 +450,9 @@ void SegmentedLineClass::Prepare_LOD(CameraClass &camera)
 void SegmentedLineClass::Increment_LOD(void)
 {
 	unsigned int lvl = LineRenderer.Get_Current_Subdivision_Level();
-	
+
 	lvl = MIN(lvl+1,MaxSubdivisionLevels);
-	
+
 	LineRenderer.Set_Current_Subdivision_Level(lvl);
 }
 
@@ -525,7 +525,7 @@ void SegmentedLineClass::Render_Seg_Line(RenderInfoClass & rinfo)
 	if (PointLocations.Count() < 2) return;
 
 	SphereClass bounding_sphere;
-	Get_Obj_Space_Bounding_Sphere(bounding_sphere);			
+	Get_Obj_Space_Bounding_Sphere(bounding_sphere);
 
 	LineRenderer.Render(
 		rinfo,
@@ -547,7 +547,7 @@ bool SegmentedLineClass::Cast_Ray(RayCollisionTestClass & raytest)
 	//	Check each line segment against the ray
 	//
 	float fraction = 1.0F;
-	for (uint32 index = 1; index < (unsigned int)PointLocations.Count(); index ++) 
+	for (uint32 index = 1; index < (unsigned int)PointLocations.Count(); index ++)
 	{
 #ifdef ALLOW_TEMPORARIES
 		Vector3 curr_start	= Transform * PointLocations[index-1];
@@ -558,11 +558,11 @@ bool SegmentedLineClass::Cast_Ray(RayCollisionTestClass & raytest)
 		Transform.mulVector3Array(&PointLocations[index-1], curr, 2);
 		LineSegClass line_seg(curr[0], curr[1]);
 #endif
-		
+
 		Vector3 p0;
 		Vector3 p1;
 		if (raytest.Ray.Find_Intersection (line_seg, &p0, &fraction, &p1, NULL)) {
-			
+
 			//
 			//	Determine if the ray was close enough to this line to be
 			// considered intersecting
@@ -573,7 +573,7 @@ bool SegmentedLineClass::Cast_Ray(RayCollisionTestClass & raytest)
 				retval = true;
 				break;
 			}
-		}			
+		}
 	}
 
 	//
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/segline.h b/Core/Libraries/Source/WWVegas/WW3D2/segline.h
index 7ca6be2e8d7..576957a568a 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/segline.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SEGLINE_H
-#define SEGLINE_H
 
 #include "rendobj.h"
 #include "shader.h"
@@ -51,7 +46,7 @@ class TextureClass;
 
 /*
 ** SegmentedLineClass -- a render object for rendering thick segmented lines.
-*/ 
+*/
 class SegmentedLineClass : public RenderObjClass
 {
 	public:
@@ -122,7 +117,7 @@ class SegmentedLineClass : public RenderObjClass
 		/////////////////////////////////////////////////////////////////////////////
 		// Render Object Interface - Cloning and Identification
 		/////////////////////////////////////////////////////////////////////////////
-		virtual RenderObjClass *	Clone(void) const;		
+		virtual RenderObjClass *	Clone(void) const;
 		virtual int						Class_ID(void)	const { return CLASSID_SEGLINE; }
 		virtual int						Get_Num_Polys(void) const;
 
@@ -178,5 +173,3 @@ class SegmentedLineClass : public RenderObjClass
 		// LineRenderer, contains most of the line settings.
 		SegLineRendererClass		LineRenderer;
 };
-
-#endif // SEGLINE_H
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp
index a8447699c7e..07245f20350 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 5                                                           $*
@@ -44,7 +44,7 @@
 #include "sortingrenderer.h"
 #include "vp.h"
 #include "Vector3i.h"
-#include "RANDOM.H"
+#include "RANDOM.h"
 #include "v3_rnd.h"
 #include "meshgeometry.h"
 
@@ -60,11 +60,6 @@
 #define SEGLINE_CHUNK_SIZE (128)
 #endif
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define MAX_SEGLINE_POINT_BUFFER_SIZE (1 + SEGLINE_CHUNK_SIZE)
 // This macro depends on the assumption that each line segment is two polys.
@@ -83,7 +78,7 @@ SegLineRendererClass::SegLineRendererClass(void) :
 		NoiseAmplitude(0.0f),
 		MergeAbortFactor(1.5f),
 		TextureTileFactor(1.0f),
-		LastUsedSyncTime(WW3D::Get_Sync_Time()),
+		LastUsedSyncTime(WW3D::Get_Logic_Time_Milliseconds()),
 		CurrentUVOffset(0.0f,0.0f),
 		UVOffsetDeltaPerMS(0.0f, 0.0f),
 		Bits(DEFAULT_BITS),
@@ -149,16 +144,16 @@ void SegLineRendererClass::Init(const W3dEmitterLinePropertiesStruct & props)
 	Set_End_Caps(props.Flags & W3D_ELINE_END_CAPS);
 
 	int texture_mode = ((props.Flags & W3D_ELINE_TEXTURE_MAP_MODE_MASK) >> W3D_ELINE_TEXTURE_MAP_MODE_OFFSET);
-	switch (texture_mode) 
+	switch (texture_mode)
 	{
 	case W3D_ELINE_UNIFORM_WIDTH_TEXTURE_MAP:
 		Set_Texture_Mapping_Mode(UNIFORM_WIDTH_TEXTURE_MAP);
 		break;
 	case W3D_ELINE_UNIFORM_LENGTH_TEXTURE_MAP:
-		Set_Texture_Mapping_Mode(UNIFORM_LENGTH_TEXTURE_MAP);		
+		Set_Texture_Mapping_Mode(UNIFORM_LENGTH_TEXTURE_MAP);
 		break;
 	case W3D_ELINE_TILED_TEXTURE_MAP:
-		Set_Texture_Mapping_Mode(TILED_TEXTURE_MAP);		
+		Set_Texture_Mapping_Mode(TILED_TEXTURE_MAP);
 		break;
 	};
 
@@ -172,8 +167,8 @@ void SegLineRendererClass::Init(const W3dEmitterLinePropertiesStruct & props)
 
 
 void SegLineRendererClass::Set_Texture(TextureClass *texture)
-{ 
-	REF_PTR_SET(Texture,texture); 
+{
+	REF_PTR_SET(Texture,texture);
 }
 
 TextureClass * SegLineRendererClass::Get_Texture(void) const
@@ -196,7 +191,7 @@ void SegLineRendererClass::Set_Texture_Tile_Factor(float factor)
 	///@todo: I raised this number and didn't see much difference on our min-spec. -MW
 	const static float MAX_LINE_TILING_FACTOR = 50.0f;
 	if (factor > MAX_LINE_TILING_FACTOR) {
-		WWDEBUG_SAY(("Texture (%s) Tile Factor (%.2f) too large in SegLineRendererClass!\r\n", Get_Texture()->Get_Texture_Name(), TextureTileFactor));
+		WWDEBUG_SAY(("Texture (%s) Tile Factor (%.2f) too large in SegLineRendererClass!", Get_Texture()->Get_Texture_Name().str(), TextureTileFactor));
 		factor = MAX_LINE_TILING_FACTOR;
 	} else {
 		factor = MAX(factor, 0.0f);
@@ -206,14 +201,14 @@ void SegLineRendererClass::Set_Texture_Tile_Factor(float factor)
 
 void SegLineRendererClass::Reset_Line(void)
 {
-	LastUsedSyncTime = WW3D::Get_Sync_Time();
+	LastUsedSyncTime = WW3D::Get_Logic_Time_Milliseconds();
 	CurrentUVOffset.Set(0.0f,0.0f);
 }
 
 
 
 void SegLineRendererClass::Render
-(	
+(
 	RenderInfoClass & rinfo,
 	const Matrix3D & transform,
 	unsigned int num_points,
@@ -226,23 +221,23 @@ void SegLineRendererClass::Render
 	DX8Wrapper::Get_Transform(D3DTS_VIEW,view);
 
 	Matrix4x4 identity(true);
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,identity);	
-	DX8Wrapper::Set_Transform(D3DTS_VIEW,identity);	
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,identity);
+	DX8Wrapper::Set_Transform(D3DTS_VIEW,identity);
 
-	/* 
+	/*
 	** Handle texture UV offset animation (done once for entire line).
 	*/
-	unsigned int delta = WW3D::Get_Sync_Time() - LastUsedSyncTime;
-	float del = (float)delta;
-	Vector2 uv_offset = CurrentUVOffset + UVOffsetDeltaPerMS * del;
+	// TheSuperHackers @tweak The render update is now decoupled from the logic step.
+	const unsigned int delta = WW3D::Get_Logic_Time_Milliseconds() - LastUsedSyncTime;
+	Vector2 uv_offset = CurrentUVOffset + UVOffsetDeltaPerMS * (float)delta;
 
 	// ensure offsets are in [0, 1] range:
 	uv_offset.X = uv_offset.X - floorf(uv_offset.X);
 	uv_offset.Y = uv_offset.Y - floorf(uv_offset.Y);
-	
+
 	// Update state
 	CurrentUVOffset = uv_offset;
-	LastUsedSyncTime = WW3D::Get_Sync_Time();
+	LastUsedSyncTime = WW3D::Get_Logic_Time_Milliseconds();
 
 	// Used later
 	TextureMapMode map_mode = Get_Texture_Mapping_Mode();
@@ -377,7 +372,7 @@ void SegLineRendererClass::Render
 		};
 
 		bool switch_edges = false;
-		
+
 		// We have dummy segments for "before the first point" and "after the last point" - in these
 		// segments the top and bottom edge are the same - they are a perpendicular plane defined by
 		// the endpoint vertices. This is so we can merge intersections properly for the first and
@@ -547,7 +542,7 @@ void SegLineRendererClass::Render
 		bottom = first_point - first_plane[BOTTOM_EDGE] * Vector3::Dot_Product(first_plane[BOTTOM_EDGE], first_point);
 		bottom.Normalize();
 		intersection[1][BOTTOM_EDGE].Direction = bottom;
-		
+
 		Vector3 segdir = points[1] - points[0];
 		segdir.Normalize();	// Is this needed? Probably not - remove later when all works
 		Vector3 start_pl;
@@ -592,7 +587,7 @@ void SegLineRendererClass::Render
 		bottom = last_point - last_plane[BOTTOM_EDGE] * Vector3::Dot_Product(last_plane[BOTTOM_EDGE], last_point);
 		bottom.Normalize();
 		intersection[last_isec][BOTTOM_EDGE].Direction = bottom;
-		
+
 		segdir = points[point_cnt - 1] - points[point_cnt - 2];
 		segdir.Normalize();	// Is this needed? Probably not - remove later when all works
 		Vector3::Cross_Product(top, bottom, &start_pl);
@@ -719,7 +714,7 @@ void SegLineRendererClass::Render
 				segment[iidx].StartPlane = -start_pl;
 			}
 
-		}	// for iidx
+		}
 
 
 		/*
@@ -738,7 +733,7 @@ void SegLineRendererClass::Render
 			// The merges will be repeated in multiple passes until none are performed. The reason
 			// for this is that one merge may cause the need for another merge elsewhere.
 			bool merged = true;
-			
+
 			while (merged) {
 
 				merged = false;
@@ -880,7 +875,7 @@ void SegLineRendererClass::Render
 							next_int = &(intersection[iidx_r + 1][edge]);
 							next_seg = &(segment[next_int->NextSegmentID]);
 
-						}	// while <merging needed>
+						}
 
 						// Copy from "read index" to "write index"
 						write_int->PointCount		= curr_int->PointCount;
@@ -891,7 +886,7 @@ void SegLineRendererClass::Render
 						write_int->Direction			= curr_int->Direction;
 						write_int->Fold				= curr_int->Fold;
 
-					}	// for iidx
+					}
 
 					// If iidx_r is exactly equal to num_isects (rather than being larger by one) at this
 					// point, this means that the last intersection was not merged with the previous one. In
@@ -917,9 +912,9 @@ void SegLineRendererClass::Render
 					assert(total_cnt == point_cnt);
 #endif
 
-				}	// for edge
-			}	// while (merged)
-		}	// if (Is_Merge_Intersections())
+				}
+			}
+		}
 
 		/*
 		** Find vertex positions, generate vertices and triangles:
@@ -929,10 +924,10 @@ void SegLineRendererClass::Render
 		*/
 
 		// Configure vertex array and setup renderer.
-		unsigned int vnum = num_intersections[TOP_EDGE] + num_intersections[BOTTOM_EDGE];		
+		unsigned int vnum = num_intersections[TOP_EDGE] + num_intersections[BOTTOM_EDGE];
 		VertexFormatXYZDUV1 *vArray = getVertexBuffer(vnum);
 		TriIndex v_index_array[MAX_SEGLINE_POLY_BUFFER_SIZE];
-		
+
 		// Vertex and triangle indices
 		unsigned int vidx = 0;
 		unsigned int tidx = 0;
@@ -958,7 +953,7 @@ void SegLineRendererClass::Render
 		vArray[vidx].u1 = u_values[1] + uv_offset.X;
 		vArray[vidx].v1 = intersection[1][BOTTOM_EDGE].TexV + uv_offset.Y;
 		vidx++;
-		
+
 		unsigned int last_top_vidx = 0;
 		unsigned int last_bottom_vidx = 1;
 
@@ -1046,7 +1041,7 @@ void SegLineRendererClass::Render
 					vArray[vidx].z = bottom.Z;
 					vArray[vidx].diffuse = DX8Wrapper::Convert_Color(intersection[bottom_int_idx][BOTTOM_EDGE].RGBA);
 					vArray[vidx].u1 = u_values[1] + uv_offset.X;
-					vArray[vidx].v1 = intersection[bottom_int_idx][BOTTOM_EDGE].TexV + uv_offset.Y;					
+					vArray[vidx].v1 = intersection[bottom_int_idx][BOTTOM_EDGE].TexV + uv_offset.Y;
 					vidx++;
 				} else {
 
@@ -1096,13 +1091,13 @@ void SegLineRendererClass::Render
 				assert(pidx == point_cnt - 1);
 				break;
 			}
-		}		
+		}
 
 		/*
 		** Set color, opacity, vertex flags:
 		*/
-		
-		// If color is not white or opacity not 100%, enable gradient in shader and in renderer - otherwise disable.		
+
+		// If color is not white or opacity not 100%, enable gradient in shader and in renderer - otherwise disable.
 		unsigned int rgba;
 		rgba=DX8Wrapper::Convert_Color(Color,Opacity);
 		bool rgba_all=(rgba==0xFFFFFFFF);
@@ -1113,11 +1108,11 @@ void SegLineRendererClass::Render
 		ShaderClass shader = Shader;
 		shader.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);
 
-		VertexMaterialClass *mat;		
+		VertexMaterialClass *mat;
 
 		// if there's a default color or an rgba array modulate
 		if (!rgba_all || (rgba != 0) ) {
-			shader.Set_Primary_Gradient(ShaderClass::GRADIENT_MODULATE);			
+			shader.Set_Primary_Gradient(ShaderClass::GRADIENT_MODULATE);
 			mat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 		} else {
 			// othewise it's texture only
@@ -1127,7 +1122,7 @@ void SegLineRendererClass::Render
 
 		// If Texture is non-NULL enable texturing in shader - otherwise disable.
 		if (Texture) {
-			shader.Set_Texturing(ShaderClass::TEXTURING_ENABLE);			
+			shader.Set_Texturing(ShaderClass::TEXTURING_ENABLE);
 		} else {
 			shader.Set_Texturing(ShaderClass::TEXTURING_DISABLE);
 		}
@@ -1135,15 +1130,15 @@ void SegLineRendererClass::Render
 
 		/*
 		** Render
-		*/		
-		
+		*/
+
 		DynamicVBAccessClass Verts((sorting?BUFFER_TYPE_DYNAMIC_SORTING:BUFFER_TYPE_DYNAMIC_DX8),dynamic_fvf_type,vnum);
 		// Copy in the data to the  VB
 		{
 			DynamicVBAccessClass::WriteLockClass Lock(&Verts);
 			unsigned int i;
-			unsigned char *vb=(unsigned char*)Lock.Get_Formatted_Vertex_Array();			
-			const FVFInfoClass& fvfinfo=Verts.FVF_Info();			
+			unsigned char *vb=(unsigned char*)Lock.Get_Formatted_Vertex_Array();
+			const FVFInfoClass& fvfinfo=Verts.FVF_Info();
 
 			const unsigned int verticesOffset = fvfinfo.Get_Location_Offset();
 			const unsigned diffuseOffset = fvfinfo.Get_Diffuse_Offset();
@@ -1162,9 +1157,9 @@ void SegLineRendererClass::Render
 				texture->U = vArray[i].u1;
 				texture->V = vArray[i].v1;
 				vb += vbSize;
-			}			
-		} // copy
-		
+			}
+		}
+
 		DynamicIBAccessClass ib_access((sorting?BUFFER_TYPE_DYNAMIC_SORTING:BUFFER_TYPE_DYNAMIC_DX8),tidx*3);
 		{
 			unsigned int i;
@@ -1178,22 +1173,22 @@ void SegLineRendererClass::Render
 				*inds++=v_index_array[i].K;
 			}
 		}
-		
+
 		DX8Wrapper::Set_Index_Buffer(ib_access,0);
-		DX8Wrapper::Set_Vertex_Buffer(Verts);				
-		DX8Wrapper::Set_Material(mat);		
+		DX8Wrapper::Set_Vertex_Buffer(Verts);
+		DX8Wrapper::Set_Material(mat);
 		DX8Wrapper::Set_Texture(0,Texture);
 		DX8Wrapper::Set_Shader(shader);
 
-		if (sorting) {	
+		if (sorting) {
 			SortingRendererClass::Insert_Triangles(obj_sphere,0,tidx,0,vnum);
 		} else {
 			DX8Wrapper::Draw_Triangles(0,tidx,0,vnum);
 		}
-		
+
 		REF_PTR_RELEASE(mat);
 
-	}	// Chunking loop
+	}
 
 	DX8Wrapper::Set_Transform(D3DTS_VIEW,view);
 
@@ -1236,7 +1231,7 @@ void SegLineRendererClass::subdivision_util(unsigned int point_cnt, const Vector
 		stack[0].EndPos = xformed_pts[pidx + 1];
 		stack[0].StartTexV = base_tex_v[pidx];
 		stack[0].EndTexV = base_tex_v[pidx + 1];
-		
+
 		if (base_diffuse) {
 			stack[0].StartDiffuse = base_diffuse[pidx];
 			stack[0].EndDiffuse = base_diffuse[pidx+1];
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h
index 2967a74e244..f55809f1c25 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h
@@ -36,8 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef SEGLINERENDERER_H
-#define SEGLINERENDERER_H
+#pragma once
 
 #include "always.h"
 #include "shader.h"
@@ -114,8 +113,8 @@ class SegLineRendererClass
 	void					Set_Freeze_Random(int onoff)							{ if (onoff) { Bits |= FREEZE_RANDOM; } else { Bits &= ~FREEZE_RANDOM; }; }
 	void					Set_Disable_Sorting(int onoff)						{ if (onoff) { Bits |= DISABLE_SORTING; } else { Bits &= ~DISABLE_SORTING; }; }
 	void					Set_End_Caps(int onoff)									{ if (onoff) { Bits |= END_CAPS; } else { Bits &= ~END_CAPS; }; }
-	
-	
+
+
 	void					Render(	RenderInfoClass & rinfo,
 										const Matrix3D & transform,
 										unsigned int point_count,
@@ -140,9 +139,9 @@ class SegLineRendererClass
 	float								Width;
 	Vector3							Color;
 	float								Opacity;
-	
+
 	// Subdivision properties
-	unsigned int					SubdivisionLevel;	
+	unsigned int					SubdivisionLevel;
 	float								NoiseAmplitude;
 
 	// If >0, will abort a merge which causes an intersection to move
@@ -156,10 +155,10 @@ class SegLineRendererClass
 	float								TextureTileFactor;
 
 	// Used for texture coordinate animation
-	unsigned int					LastUsedSyncTime;		// Last sync time used	
+	unsigned int					LastUsedSyncTime;		// Last sync time used
 	Vector2							CurrentUVOffset;		// Current UV offset
 	Vector2							UVOffsetDeltaPerMS;	// Amount to increase offset each millisec
-	
+
 	// Various flags
 	enum BitShiftOffsets {
 		TEXTURE_MAP_MODE_OFFSET = 24	// By how many bits do I need to shift the texture mapping mode?
@@ -187,8 +186,8 @@ class SegLineRendererClass
 
 
 inline SegLineRendererClass::TextureMapMode SegLineRendererClass::Get_Texture_Mapping_Mode(void) const
-{ 
-	return (TextureMapMode)((Bits & TEXTURE_MAP_MODE_MASK) >> TEXTURE_MAP_MODE_OFFSET); 
+{
+	return (TextureMapMode)((Bits & TEXTURE_MAP_MODE_MASK) >> TEXTURE_MAP_MODE_OFFSET);
 }
 
 inline void SegLineRendererClass::Set_Texture_Mapping_Mode(SegLineRendererClass::TextureMapMode mode)
@@ -198,7 +197,7 @@ inline void SegLineRendererClass::Set_Texture_Mapping_Mode(SegLineRendererClass:
 }
 
 inline Vector2 SegLineRendererClass::Get_UV_Offset_Rate(void) const
-{	
+{
 	return UVOffsetDeltaPerMS * 1000.0f;
 }
 
@@ -206,7 +205,3 @@ inline void SegLineRendererClass::Set_UV_Offset_Rate(const Vector2 &rate)
 {
 	UVOffsetDeltaPerMS = rate * 0.001f;
 }
-
-
-#endif //SEGLINERENDERER_H
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp
index 0b7a2e5276c..6a42f6586a2 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp
@@ -69,7 +69,7 @@
 #define BPT_BOTH						0x08
 #define BPT_EPSILON					0.0001f
 #define BPT_COINCIDENCE_EPSILON	0.000001f
- 
+
 
 /**
 ** Mesh Material Parameters
@@ -105,17 +105,17 @@ class VertexClass
 	VertexClass(void);
 	VertexClass(const VertexClass & that);
 	VertexClass &		operator = (const VertexClass & that);
-	
+
 	int					Which_Side(const PlaneClass & plane) const;
-	
+
 	Vector3				Position;
 	Vector3				Normal;
-	
+
 	int					PassCount;
 	unsigned				DCG[MeshMatDescClass::MAX_PASSES];
 	unsigned				DIG[MeshMatDescClass::MAX_PASSES];
 	Vector2				TexCoord[MeshMatDescClass::MAX_PASSES][MeshMatDescClass::MAX_TEX_STAGES];
-	
+
 	static void			Lerp(const VertexClass & v0,const VertexClass & v1,float lerp,VertexClass * res);
 	static void			Intersect_Plane(const VertexClass & v0,const VertexClass & v1,const PlaneClass & plane,VertexClass * res);
 };
@@ -159,7 +159,7 @@ class PolygonClass
 	int							MaterialId;
 	int							NumVerts;
 	VertexClass					Verts[BPT_POLY_MAX_VERTS];
-	
+
 	PlaneClass					Plane;
 
 };
@@ -169,9 +169,9 @@ class PolygonClass
 ** Representation of a node in a BSP clipping tree in the shatter system
 ** Meshes are "shattered" by clipping them with a fixed BSP tree.
 ** The resulting leaf polygons are turned into separate dynamic objects
-** which are thrown around in the world.  The BSP tree is constructed 
-** using an HTree where each transform in the tree is used as a clipping 
-** plane.  The plane is defined by the x-y plane of the coordinate system 
+** which are thrown around in the world.  The BSP tree is constructed
+** using an HTree where each transform in the tree is used as a clipping
+** plane.  The plane is defined by the x-y plane of the coordinate system
 ** (i.e. z-axis is the normal of the plane, origin is a point on the plane).
 ** Leaf nodes of this tree will have two indices.  These are indices into
 ** the MeshFragments array where they put the polygons in thier front and
@@ -192,7 +192,7 @@ class BSPClass
 protected:
 
 	void						Set_Plane_From_Transform(const Matrix3D & tm);
-	
+
 	PlaneClass				Plane;					// plane equation
 	BSPClass *				Front;					// pointers to child clipping planes
 	BSPClass *				Back;
@@ -204,9 +204,9 @@ class BSPClass
 /***********************************************************************************************
 **
 ** Static Variables
-** ShatterPatterns - Array of BSP-trees for clipping (shattering) messhes 
+** ShatterPatterns - Array of BSP-trees for clipping (shattering) messhes
 ** ClippedPolygonPool - Array of polygon arrays, one per leaf.
-** MeshFragments - Array of resultant clipped meshes, one per leaf 
+** MeshFragments - Array of resultant clipped meshes, one per leaf
 ** TmpVertPositions - Workspace for transforming vertex positions
 ** TmpVertNormals - Workspace for transforming vertex normals
 **
@@ -249,11 +249,11 @@ static Vector3 * _get_temp_vertex_normal_array(int count)
 MeshMtlParamsClass::MeshMtlParamsClass(MeshModelClass * model)
 {
 	PassCount = model->Get_Pass_Count();
-	
+
 	for (int ipass=0; ipass<MeshMatDescClass::MAX_PASSES; ipass++) {
 
 		DCG[ipass] = model->Get_DCG_Array(ipass);
-		DIG[ipass] = model->Get_DIG_Array(ipass);		
+		DIG[ipass] = model->Get_DIG_Array(ipass);
 //		UVIndexArray[ipass] = model->Get_UVIndex_Array(ipass,false);
 		for (int istage=0; istage<MeshMatDescClass::MAX_TEX_STAGES; istage++) {
 			UV[ipass][istage] = const_cast<Vector2*>(model->Get_UV_Array(ipass,istage));
@@ -360,7 +360,7 @@ int VertexClass::Which_Side(const PlaneClass & plane) const
 
 	if (d > BPT_EPSILON) {
 		return BPT_FRONT;
-	} 
+	}
 
 	if (d < -BPT_EPSILON) {
 		return BPT_BACK;
@@ -379,7 +379,7 @@ void VertexClass::Intersect_Plane
 {
 	float alpha = 0.0f;
 	plane.Compute_Intersection(p0.Position,p1.Position,&alpha);
-	VertexClass::Lerp(p0,p1,alpha,res);				
+	VertexClass::Lerp(p0,p1,alpha,res);
 }
 
 
@@ -436,7 +436,7 @@ void PolygonClass::Compute_Plane(void)
 
 	for (i=0; i<NumVerts; i++) {
 		j = (i+1) % NumVerts;
-		
+
 		nx += (double)(Verts[i].Position.Y - Verts[j].Position.Y) * (double)(Verts[i].Position.Z + Verts[j].Position.Z);
 		ny += (double)(Verts[i].Position.Z - Verts[j].Position.Z) * (double)(Verts[i].Position.X + Verts[j].Position.X);
 		nz += (double)(Verts[i].Position.X - Verts[j].Position.X) * (double)(Verts[i].Position.Y + Verts[j].Position.Y);
@@ -454,7 +454,7 @@ void PolygonClass::Compute_Plane(void)
 	nx /= len;
 	ny /= len;
 	nz /= len;
-	
+
 	Plane.Set(Vector3(nx,ny,nz),Vector3(ax,ay,az));
 }
 
@@ -492,7 +492,7 @@ void PolygonClass::Split(const PlaneClass & plane,PolygonClass & front,PolygonCl
 	assert(Which_Side(plane) == BPT_BOTH);
 
 	VertexClass point;
-	front.NumVerts = 0; 
+	front.NumVerts = 0;
 	back.NumVerts = 0;
 
 	// find a vertex on one side or the other
@@ -504,17 +504,17 @@ void PolygonClass::Split(const PlaneClass & plane,PolygonClass & front,PolygonCl
 	int iprev = i;
 	int sideprev = side;
 	int sidelastdefinite = 0;
-	
+
 	i = (i+1) % NumVerts;
 
-	for (int j=0; j<NumVerts; j++) { 
-		
+	for (int j=0; j<NumVerts; j++) {
+
 		side = Verts[i].Which_Side(plane);
-		
+
 		if (sideprev == BPT_FRONT) {
 
 			if (side == BPT_FRONT) {
-			
+
 				// Previous vertex was in front of plane and this vertex is in
 				// front of the plane so we emit this vertex in the front poly
 				front.Verts[(front.NumVerts)++] = Verts[i];
@@ -525,7 +525,7 @@ void PolygonClass::Split(const PlaneClass & plane,PolygonClass & front,PolygonCl
 				// the vertex into the front poly.
 				sidelastdefinite = BPT_FRONT;
 				front.Verts[(front.NumVerts)++] = Verts[i];
-			
+
 			} else { // side == BPT_BACK
 
 				// Previous vert was in front, this vert is behind, compute
@@ -549,11 +549,11 @@ void PolygonClass::Split(const PlaneClass & plane,PolygonClass & front,PolygonCl
 				back.Verts[(back.NumVerts)++] = point;
 				front.Verts[(front.NumVerts)++] = point;
 				front.Verts[(front.NumVerts)++] = Verts[i];
-			
+
 			} else if (side == BPT_ON) {
-			
+
 				// segment went from back halfspace to "on" the plane.  Emit
-				// the vertex into the back poly and remember that we came 
+				// the vertex into the back poly and remember that we came
 				// from the back halfspace.
 				sidelastdefinite = BPT_BACK;
 				back.Verts[(back.NumVerts)++] = Verts[i];
@@ -565,7 +565,7 @@ void PolygonClass::Split(const PlaneClass & plane,PolygonClass & front,PolygonCl
 				back.Verts[(back.NumVerts)++] = Verts[i];
 
 			}
-		
+
 		} else if (sideprev == BPT_ON) {
 
 			if (side == BPT_FRONT) {
@@ -575,7 +575,7 @@ void PolygonClass::Split(const PlaneClass & plane,PolygonClass & front,PolygonCl
 					front.Verts[(front.NumVerts)++] =	Verts[iprev];
 				}
 				front.Verts[(front.NumVerts)++] = Verts[i];
-			
+
 			} else if (side == BPT_ON) {
 
 				if (sidelastdefinite == BPT_FRONT) {
@@ -583,7 +583,7 @@ void PolygonClass::Split(const PlaneClass & plane,PolygonClass & front,PolygonCl
 				} else {
 					back.Verts[(back.NumVerts)++] = Verts[i];
 				}
-			
+
 			} else { // side == BPT_BACK
 
 				if (sidelastdefinite == BPT_FRONT) {
@@ -592,7 +592,7 @@ void PolygonClass::Split(const PlaneClass & plane,PolygonClass & front,PolygonCl
 				back.Verts[(back.NumVerts)++] = Verts[i];
 			}
 		} else {
-			WWASSERT_PRINT(0,"PolygonClass::Split : invalid side\n");
+			WWASSERT_PRINT(0,"PolygonClass::Split : invalid side");
 		}
 
 		sideprev = side;
@@ -620,16 +620,16 @@ bool PolygonClass::Is_Degenerate(void)
 	int i,j;
 
 	if (NumVerts <= 2) {
-		WWDEBUG_SAY(("Degenerate Poly - fewer than 3 vertices\r\n"));
+		WWDEBUG_SAY(("Degenerate Poly - fewer than 3 vertices"));
 		return true;
 	}
 
 	for (i=0; i<NumVerts; i++) {
 		for (j = i+1; j < NumVerts; j++) {
-			
+
 			float delta = (Verts[i].Position - Verts[j].Position).Length();
 			if (delta < BPT_COINCIDENCE_EPSILON) {
-				WWDEBUG_SAY(("Degenerate Poly - coincident vertices!\r\n"));
+				WWDEBUG_SAY(("Degenerate Poly - coincident vertices!"));
 				return true;
 			}
 		}
@@ -643,7 +643,7 @@ bool PolygonClass::Is_Degenerate(void)
 			Compute_Plane();
 
 			if (Verts[i].Which_Side(Plane) != BPT_ON) {
-				WWDEBUG_SAY(("Degenerate Poly - invalid plane!\r\n"));
+				WWDEBUG_SAY(("Degenerate Poly - invalid plane!"));
 				return true;
 			}
 		}
@@ -662,13 +662,13 @@ bool PolygonClass::Salvage_Degenerate(void)
 
 		float delta = (Verts[i].Position - Verts[i+1].Position).Length();
 		if (delta < BPT_COINCIDENCE_EPSILON) {
-			
+
 			for (int j=i+1; j<NumVerts-1; j++) {
 				Verts[j] = Verts[j+1];
 			}
 
 			NumVerts--;
-		
+
 		} else {
 
 			i++;
@@ -728,12 +728,8 @@ BSPClass::BSPClass(HTreeClass * tree,int bone_index,int & leaf_index) :
 
 BSPClass::~BSPClass(void)
 {
-	if (Front != NULL) {
-		delete Front;
-	}
-	if (Back != NULL) {
-		delete Back;
-	}
+	delete Front;
+	delete Back;
 	Front = Back = NULL;
 }
 
@@ -747,8 +743,8 @@ void BSPClass::Clip_Polygon(const PolygonClass & polygon)
 	PolygonClass front_poly,back_poly;
 	front_poly.Set_Vertex_Count(0);
 	back_poly.Set_Vertex_Count(0);
-	
-	switch(polygon.Which_Side(Plane)) 
+
+	switch(polygon.Which_Side(Plane))
 	{
 	case BPT_FRONT: case BPT_ON:
 		front_poly = polygon;
@@ -762,12 +758,12 @@ void BSPClass::Clip_Polygon(const PolygonClass & polygon)
 	};
 
 	// Process the front halfspace: Recurse if we have a child clipping plane,
-	// otherwise add our polygons to our assigned clipping pool 
+	// otherwise add our polygons to our assigned clipping pool
 	if (Front == NULL) {
 		// We're a leaf node so put the polygons into the mesh fragment arrays
 		if (front_poly.Get_Vertex_Count() >= 3) {
-			ClipPools[FrontLeafIndex].Add(front_poly);	
-		} 
+			ClipPools[FrontLeafIndex].Add(front_poly);
+		}
 	} else {
 		// Pass the polygons to our child for further clipping
 		if (front_poly.Get_Vertex_Count() >= 3) {
@@ -778,7 +774,7 @@ void BSPClass::Clip_Polygon(const PolygonClass & polygon)
 	// Process the back halfspace:
 	if (Back==NULL) {
 		if (back_poly.Get_Vertex_Count() >= 3) {
-			ClipPools[BackLeafIndex].Add(back_poly);	
+			ClipPools[BackLeafIndex].Add(back_poly);
 		}
 	} else {
 		if (back_poly.Get_Vertex_Count() >= 3) {
@@ -793,7 +789,7 @@ void BSPClass::Clip_Polygon(const PolygonClass & polygon)
 /***********************************************************************************************
 **
 ** ShatterSystem Implementation - this is the interface with the outside world
-** 
+**
 ** Transform meshes into space needed for shattering:
 ** Vshatter = Mscale-to-unit * Mworld-shatterview * Mobj-world * Vobj
 **
@@ -824,9 +820,9 @@ void ShatterSystem::Init(void)
 		if ((htree->Num_Pivots() > 1) && (htree->Num_Pivots() < MAX_MESH_FRAGMENTS)) {
 			int leaf_counter = 0;
 			htree->Base_Update(Matrix3D(1));
-			ShatterPatterns.Add(W3DNEW BSPClass(htree,1,leaf_counter));			
+			ShatterPatterns.Add(W3DNEW BSPClass(htree,1,leaf_counter));
 		}
-		
+
 		/*
 		** Try to load the next tree
 		*/
@@ -847,7 +843,6 @@ void ShatterSystem::Shutdown(void)
 	*/
 	for (int i=0; i<ShatterPatterns.Count(); i++) {
 		delete ShatterPatterns[i];
-		ShatterPatterns[i] = NULL;
 	}
 	ShatterPatterns.Delete_All();
 }
@@ -878,20 +873,20 @@ void ShatterSystem::Shatter_Mesh(MeshClass * mesh,const Vector3 & point,const Ve
 	*/
 	MeshModelClass * model = mesh->Get_Model();
 	if (model->Get_Pass_Count() > MeshMatDescClass::MAX_PASSES) {
-		WWDEBUG_SAY(("Failed to shatter model: %s.  Too many passes (%d)\n",model->Get_Name(),model->Get_Pass_Count()));
+		WWDEBUG_SAY(("Failed to shatter model: %s.  Too many passes (%d)",model->Get_Name(),model->Get_Pass_Count()));
 		REF_PTR_RELEASE(model);
 		return;
 	}
 	for (ipass=0; ipass<model->Get_Pass_Count(); ipass++) {
 		if (model->Has_Material_Array(ipass) || model->Has_Shader_Array(ipass)) {
-			WWDEBUG_SAY(("Failed to shatter model: %s.  It has shader or material arrays\n",model->Get_Name()));
+			WWDEBUG_SAY(("Failed to shatter model: %s.  It has shader or material arrays",model->Get_Name()));
 			REF_PTR_RELEASE(model);
 			return;
 		}
-		
+
 		for (istage=0; istage<MeshMatDescClass::MAX_TEX_STAGES; istage++) {
 			if (model->Has_Texture_Array(ipass,istage)) {
-				WWDEBUG_SAY(("Failed to shatter model: %s.  Texture array in pass: %d stage: %d\n",model->Get_Name(),ipass,istage));
+				WWDEBUG_SAY(("Failed to shatter model: %s.  Texture array in pass: %d stage: %d",model->Get_Name(),ipass,istage));
 				REF_PTR_RELEASE(model);
 				return;
 			}
@@ -905,21 +900,21 @@ void ShatterSystem::Shatter_Mesh(MeshClass * mesh,const Vector3 & point,const Ve
 
 	/*
 	** Compute transforms which take vertices from mesh-space to shatter-space
-	** and back again.  Transform polygons into "shatter-space", clip, then 
+	** and back again.  Transform polygons into "shatter-space", clip, then
 	** transform the results back out
 	**
 	** Take vertices from obj-space to shatter space:
 	** Vshatter = Mscale-to-unit * Mworld-shatterview * Mobj-world * Vobj
-	** 
+	**
 	** Clip the polygons to the BSP
 	** Vclipped = BSP_CLIP(Vshatter)
 	**
 	** Next, take the verts back to object space:
 	** Vobjclip = Inverse(Mscale-to-unit * Mworld-shatter * Mobj-world) * Vclipped
 	**          = Inv(Mobj-world)*Inv(Mworld-shatter)*Inv(Mscl-to-unit) * Vclipped
-	** 
+	**
 	** Next, create separate, re-centered meshes
-	** Vnewobj = Mold-obj-to-new-obj * Vobjclip 
+	** Vnewobj = Mold-obj-to-new-obj * Vobjclip
 	*/
 
 	/*
@@ -949,13 +944,13 @@ void ShatterSystem::Shatter_Mesh(MeshClass * mesh,const Vector3 & point,const Ve
 	*/
 	SphereClass sphere;
 	model->Get_Bounding_Sphere(&sphere);
-	
+
 	float scale_factor = 5.0f / sphere.Radius;	// mesh scales to 5x shatter pattern.
 	Matrix3D Mscale_to_shatter(1);
 	Matrix3D Mscale_from_shatter(1);
 	Mscale_to_shatter.Scale(scale_factor);
 	Mscale_from_shatter.Scale(1.0f / scale_factor);
-	
+
 	Matrix3D::Multiply(Mscale_to_shatter,Mobj_to_shatter,&Mobj_to_shatter);
 	Matrix3D::Multiply(Mshatter_to_obj,Mscale_from_shatter,&Mshatter_to_obj);
 
@@ -975,10 +970,10 @@ void ShatterSystem::Shatter_Mesh(MeshClass * mesh,const Vector3 & point,const Ve
 	*/
 	MeshMtlParamsClass mtl_params(model);
 
-	
-	SHATTER_DEBUG_SAY(("****************************************************\n"));
-	SHATTER_DEBUG_SAY((" Clipping model: %s\n",model->Get_Name()));
-	SHATTER_DEBUG_SAY(("****************************************************\n"));
+
+	SHATTER_DEBUG_SAY(("****************************************************"));
+	SHATTER_DEBUG_SAY((" Clipping model: %s",model->Get_Name()));
+	SHATTER_DEBUG_SAY(("****************************************************"));
 
 	/*
 	** Pass each polygon of the source model through the BSP clipper
@@ -988,39 +983,39 @@ void ShatterSystem::Shatter_Mesh(MeshClass * mesh,const Vector3 & point,const Ve
 		/*
 		** Set up a PolygonClass for polygon 'i' in the mesh
 		*/
-		SHATTER_DEBUG_SAY(("Passing polygon %d to clipper.\n",ipoly));
+		SHATTER_DEBUG_SAY(("Passing polygon %d to clipper.",ipoly));
 		PolygonClass polygon;
-		for (ivert=0; ivert<3; ivert++) { 
-			
+		for (ivert=0; ivert<3; ivert++) {
+
 			int vert_index = polys[ipoly][ivert];
 			polygon.Verts[ivert].PassCount = mtl_params.PassCount;
 			polygon.Verts[ivert].Position = verts[vert_index];
 			polygon.Verts[ivert].Normal = src_vnorms[vert_index];
-			SHATTER_DEBUG_SAY(("position: %f %f %f\n",verts[vert_index].X,verts[vert_index].Y,verts[vert_index].Z));
-			SHATTER_DEBUG_SAY(("normal: %f %f %f\n",src_vnorms[vert_index].X,src_vnorms[vert_index].Y,src_vnorms[vert_index].Z));
-			
+			SHATTER_DEBUG_SAY(("position: %f %f %f",verts[vert_index].X,verts[vert_index].Y,verts[vert_index].Z));
+			SHATTER_DEBUG_SAY(("normal: %f %f %f",src_vnorms[vert_index].X,src_vnorms[vert_index].Y,src_vnorms[vert_index].Z));
+
 			for (ipass=0; ipass<MeshMatDescClass::MAX_PASSES; ipass++) {
 				if (mtl_params.DCG[ipass] != NULL) {
 					polygon.Verts[ivert].DCG[ipass] = mtl_params.DCG[ipass][vert_index];
-					SHATTER_DEBUG_SAY(("DCG: pass: %d : %f %f %f\n",ipass,mtl_params.DCG[ipass][vert_index].X,mtl_params.DCG[ipass][vert_index].Y,mtl_params.DCG[ipass][vert_index].Z));
+					SHATTER_DEBUG_SAY(("DCG: pass: %d : %f %f %f",ipass,mtl_params.DCG[ipass][vert_index].X,mtl_params.DCG[ipass][vert_index].Y,mtl_params.DCG[ipass][vert_index].Z));
 				}
-				
+
 				if (mtl_params.DIG[ipass] != NULL) {
 					polygon.Verts[ivert].DIG[ipass] = mtl_params.DIG[ipass][vert_index];
-					SHATTER_DEBUG_SAY(("DIG: pass: %d : %f %f %f\n",ipass,mtl_params.DIG[ipass][vert_index].X,mtl_params.DIG[ipass][vert_index].Y,mtl_params.DIG[ipass][vert_index].Z));
+					SHATTER_DEBUG_SAY(("DIG: pass: %d : %f %f %f",ipass,mtl_params.DIG[ipass][vert_index].X,mtl_params.DIG[ipass][vert_index].Y,mtl_params.DIG[ipass][vert_index].Z));
 				}
 
 				for (istage=0; istage<MeshMatDescClass::MAX_TEX_STAGES; istage++) {
 					if (mtl_params.UV[ipass][istage] != NULL) {
 						polygon.Verts[ivert].TexCoord[ipass][istage] = mtl_params.UV[ipass][istage][vert_index];
-						SHATTER_DEBUG_SAY(("UV pass: %d stage: %d: %f %f\n",ipass,istage,mtl_params.UV[ipass][istage][vert_index].X,mtl_params.UV[ipass][istage][vert_index].Y));
+						SHATTER_DEBUG_SAY(("UV pass: %d stage: %d: %f %f",ipass,istage,mtl_params.UV[ipass][istage][vert_index].X,mtl_params.UV[ipass][istage][vert_index].Y));
 					}
 				}
 
 /*				if (mtl_params.UVIndexArray[ipass] != NULL) {
 					int uv_index = mtl_params.UVIndexArray[ipass][ipoly][ivert];
 					polygon.Verts[ivert].TexCoord[ipass][0] = mtl_params.UV[ipass][0][uv_index];
-					SHATTER_DEBUG_SAY(("Per-Face UV pass: %d: %f %f\n",ipass,polygon.Verts[ivert].TexCoord[ipass][0].X,polygon.Verts[ivert].TexCoord[ipass][0].Y));
+					SHATTER_DEBUG_SAY(("Per-Face UV pass: %d: %f %f",ipass,polygon.Verts[ivert].TexCoord[ipass][0].X,polygon.Verts[ivert].TexCoord[ipass][0].Y));
 				}
 */			}
 		}
@@ -1068,16 +1063,16 @@ void ShatterSystem::Release_Fragments(void)
 	for (int i=0; i<MeshFragments.Count(); i++) {
 		REF_PTR_RELEASE(MeshFragments[i]);
 	}
-	
+
 	// reset array but don't resize
-	MeshFragments.Delete_All(false);					
+	MeshFragments.Delete_All(false);
 }
 
 void ShatterSystem::Reset_Clip_Pools(void)
 {
 	for (int i=0; i<MAX_MESH_FRAGMENTS; i++) {
 		// reset array but don't resize
-		ClipPools[i].Delete_All(false);				
+		ClipPools[i].Delete_All(false);
 	}
 }
 
@@ -1092,7 +1087,7 @@ void ShatterSystem::Process_Clip_Pools
 	** Release any render objects we currently have and reset the array count
 	*/
 	Release_Fragments();
-	
+
 	/*
 	** Grab the model
 	*/
@@ -1119,10 +1114,10 @@ void ShatterSystem::Process_Clip_Pools
 				pcount += poly_vert_count-2;
 			}
 
-			SHATTER_DEBUG_SAY(("****************************************************\n"));
-			SHATTER_DEBUG_SAY((" Reassembling fragment %d of model: %s\n",ipool,model->Get_Name()));
-			SHATTER_DEBUG_SAY((" polycount = %d   vertexcount = %d\n",pcount,vcount));
-			SHATTER_DEBUG_SAY(("****************************************************\n"));
+			SHATTER_DEBUG_SAY(("****************************************************"));
+			SHATTER_DEBUG_SAY((" Reassembling fragment %d of model: %s",ipool,model->Get_Name()));
+			SHATTER_DEBUG_SAY((" polycount = %d   vertexcount = %d",pcount,vcount));
+			SHATTER_DEBUG_SAY(("****************************************************"));
 
 			/*
 			** Create the new mesh, install materials
@@ -1134,7 +1129,7 @@ void ShatterSystem::Process_Clip_Pools
 				new_mesh->Enable_Sort();
 			}
 			new_mesh->Set_Pass_Count(mtl_params.PassCount);
-			
+
 			bool has_textures = false;
 			for (ipass=0; ipass<model->Get_Pass_Count(); ipass++) {
 				if (model->Peek_Single_Material(ipass) != NULL) {
@@ -1148,19 +1143,19 @@ void ShatterSystem::Process_Clip_Pools
 				}
 			}
 			new_mesh->Set_Material_Info(matinfo);
-			
+
 			for (ipass=0; ipass<model->Get_Pass_Count(); ipass++) {
 				new_mesh->Set_Vertex_Material(model->Peek_Single_Material(ipass),false,ipass);
 				new_mesh->Set_Shader(model->Get_Single_Shader(ipass),ipass);
 
 				for (istage=0; istage<MeshMatDescClass::MAX_TEX_STAGES; istage++) {
-					TextureClass * tex = model->Peek_Single_Texture(ipass,istage);	
+					TextureClass * tex = model->Peek_Single_Texture(ipass,istage);
 					if (tex != NULL) {
 						new_mesh->Peek_Model()->Set_Single_Texture(tex,ipass,istage);
 					}
 				}
 			}
-			
+
 			REF_PTR_RELEASE(matinfo);
 
 
@@ -1169,46 +1164,46 @@ void ShatterSystem::Process_Clip_Pools
 			** back into the original mesh's coordinate system as we do this
 			*/
 			for (ipoly=0; ipoly<ClipPools[ipool].Count(); ipoly++) {
-				
+
 				PolygonClass & poly = ClipPools[ipool][ipoly];
-				
+
 				new_mesh->Begin_Tri_Fan();
-				SHATTER_DEBUG_SAY(("Begin Tri Fan\n"));
+				SHATTER_DEBUG_SAY(("Begin Tri Fan"));
 
 				for(ivert=0; ivert<poly.Get_Vertex_Count(); ivert++) {
 
 					Vector3 pos,norm;
 					VertexClass & vert = poly[ivert];
-				
+
 					Matrix3D::Transform_Vector(Mshatter_to_mesh,vert.Position,&pos);
 					norm = vert.Normal;
 
-					SHATTER_DEBUG_SAY(("Begin Vertex:\n"));
+					SHATTER_DEBUG_SAY(("Begin Vertex:"));
 					new_mesh->Begin_Vertex();
-					SHATTER_DEBUG_SAY(("postion: %f %f %f\n",pos.X,pos.Y,pos.Z));
+					SHATTER_DEBUG_SAY(("postion: %f %f %f",pos.X,pos.Y,pos.Z));
 					new_mesh->Location_Inline(pos);
 					new_mesh->Normal(norm);
 
 					for (ipass=0; ipass<mtl_params.PassCount; ipass++) {
 
 						unsigned mycolor=0;
-						
+
 						/*
 						** If there were vertex colors for this pass in the original mesh, then
 						** copy the color out of the vertex into the new mesh.
 						*/
 						if (mtl_params.DCG[ipass] != NULL) {
-							SHATTER_DEBUG_SAY(("DCG: pass:%d: %f %f %f\n",ipass,vert.DCG[ipass].X,vert.DCG[ipass].Y,vert.DCG[ipass].Z));
+							SHATTER_DEBUG_SAY(("DCG: pass:%d: %f %f %f",ipass,vert.DCG[ipass].X,vert.DCG[ipass].Y,vert.DCG[ipass].Z));
 							/* OLD CODE
 							new_mesh->DCG(Vector3(vert.DCG[ipass].X,vert.DCG[ipass].Y,vert.DCG[ipass].Z),ipass);
 							new_mesh->Alpha(vert.DCG[ipass].W,ipass);
 							*/
-							mycolor=vert.DCG[ipass];							
+							mycolor=vert.DCG[ipass];
 						}
-						
+
 						// HY- Multiplying DIG with DCG as in meshmdlio
 						if (mtl_params.DIG[ipass] != NULL) {
-							SHATTER_DEBUG_SAY(("DIG: pass:%d: %f %f %f\n",ipass,vert.DIG[ipass].X,vert.DIG[ipass].Y,vert.DIG[ipass].Z));
+							SHATTER_DEBUG_SAY(("DIG: pass:%d: %f %f %f",ipass,vert.DIG[ipass].X,vert.DIG[ipass].Y,vert.DIG[ipass].Z));
 							Vector4 mc=DX8Wrapper::Convert_Color(mycolor);
 							Vector4 dc=DX8Wrapper::Convert_Color(vert.DIG[ipass]);
 							mc=Vector4(mc.X*dc.X,mc.Y*dc.Y,mc.Z*dc.Z,mc.W);
@@ -1224,14 +1219,14 @@ void ShatterSystem::Process_Clip_Pools
 //						#pragma MESSAGE("HY- Naty, will dynamesh support multiple stages of UV?")
 						for (istage=0; istage<MeshMatDescClass::MAX_TEX_STAGES; istage++) {
 							if (mtl_params.UV[ipass][istage] != NULL) {
-								SHATTER_DEBUG_SAY(("UV: pass:%d stage: %d: %f %f\n",ipass,istage,vert.TexCoord[ipass][istage].X,vert.TexCoord[ipass][istage].Y));
+								SHATTER_DEBUG_SAY(("UV: pass:%d stage: %d: %f %f",ipass,istage,vert.TexCoord[ipass][istage].X,vert.TexCoord[ipass][istage].Y));
 								new_mesh->UV(vert.TexCoord[ipass][istage],istage);
 							}
 						}
 					}
 
 					new_mesh->End_Vertex();
-			
+
 				}
 				new_mesh->End_Tri_Fan();
 			}
@@ -1244,12 +1239,12 @@ void ShatterSystem::Process_Clip_Pools
 			Vector3 center = new_mesh->Get_Bounding_Box().Center;
 
 			new_mesh->Translate_Vertices(-center);
-			
+
 			Matrix3D tm(1);// = mesh->Get_Transform();
 			tm.Translate(center);
 			Matrix3D::Multiply(tm,mesh->Get_Transform(),&tm);
 			new_mesh->Set_Transform(tm);
-			
+
 			/*
 			** We gave it good vertex normals so clear their dirty flag
 			*/
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h
index 86d542dcdf5..9040e4f5df6 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h
@@ -36,12 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SHATTERSYSTEM_H
-#define SHATTERSYSTEM_H
 
 #include "always.h"
 
@@ -80,8 +75,8 @@ class ShatterSystem
 	/*
 	** Use these methods to get access to the resultant mesh fragments
 	** Get_Fragment_Count - returns the number of meshes created
-	** Get_Fragment - returns a pointer (ref-counted!) to the 'n'th mesh 
-	** Relese_Fragments - call this when you are done, it causes the ShatterSystem 
+	** Get_Fragment - returns a pointer (ref-counted!) to the 'n'th mesh
+	** Relese_Fragments - call this when you are done, it causes the ShatterSystem
 	**                    to release its references to the fragments.
 	*/
 	static int		Get_Fragment_Count(void);
@@ -96,8 +91,3 @@ class ShatterSystem
 
 
 };
-
-
-#endif
-
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h
index 23d37114471..c44cec588ed 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h
@@ -34,15 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef SNAPPTS_H
-#define SNAPPTS_H
-
-#include "refcount.h"
-#include "Vector.H"
+#include "always.h"
+#include "Vector.h"
 #include "vector3.h"
 #include "w3derr.h"
 
@@ -60,5 +55,3 @@ class SnapPointsClass : public DynamicVectorClass<Vector3>, public RefCountClass
 	~SnapPointsClass(void) {}
 
 };
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp b/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp
index 94cfa17f0cc..814459f04be 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp
@@ -44,7 +44,7 @@ WW3DErrorType SnapPointsClass::Load_W3D(ChunkLoadClass & cload)
 	// this function assumes that a W3D_CHUNK_POINTS has been opened
 	int size = cload.Cur_Chunk_Length();
 	int count = size / sizeof (W3dVectorStruct);
-	
+
 	Resize(count);
 	for (int i=0; i<count; i++) {
 		W3dVectorStruct vec;
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h b/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h
index 36c65bcefc6..367fcc4573b 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h
@@ -19,31 +19,29 @@
  /***********************************************************************************************
  ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
  ***********************************************************************************************
- *                                                                                             
- *                 Project name : Earth and Beyond                                             
- *                                                                                             
- *                    File name : soundlibrarybridge.h                                         
- *                                                                                             
- *                   Programmer : Mike Lytle                                                   
- *                                                                                             
- *                   Start date : 6/21/2002                                                    
- *                                                                                             
- *                  Last update : 10/23/2002 MBL                                                    
- *                                                                                             
+ *
+ *                 Project name : Earth and Beyond
+ *
+ *                    File name : soundlibrarybridge.h
+ *
+ *                   Programmer : Mike Lytle
+ *
+ *                   Start date : 6/21/2002
+ *
+ *                  Last update : 10/23/2002 MBL
+ *
  *---------------------------------------------------------------------------------------------
- * Functions:                                                                                  
+ * Functions:
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#ifndef SOUNDLIBRARYBRIDGE_H
-#define SOUNDLIBRARYBRIDGE_H
+
+#pragma once
 
 // Forward declarations.
 class		Matrix3D;
 
 class SoundLibraryBridgeClass {
 	public:
-		virtual	void			Play_3D_Audio(const char * name, const Matrix3D & tm) = 0; 
-		virtual	void			Play_2D_Audio(const char * name) = 0; 
+		virtual	void			Play_3D_Audio(const char * name, const Matrix3D & tm) = 0;
+		virtual	void			Play_2D_Audio(const char * name) = 0;
 		virtual	void			Stop_Playing_Audio(const char * name) = 0;
 };
-
-#endif //SOUNDLIBRARYBRIDGE_H
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp
index ccda2d9b30a..4bd67a6eda9 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp
@@ -42,7 +42,7 @@
 #include "Sound3D.h"
 #include "WWAudio.h"
 #include "ffactory.h"
-#include "WWFILE.H"
+#include "WWFILE.h"
 #include "chunkio.h"
 #include "scene.h"
 
@@ -109,7 +109,7 @@ SoundRenderObjClass::~SoundRenderObjClass (void)
 //////////////////////////////////////////////////////////////////////////////////
 const SoundRenderObjClass &
 SoundRenderObjClass::operator= (const SoundRenderObjClass &src)
-{	
+{
 	//
 	//	Create a definition from the src sound object
 	//
@@ -195,7 +195,7 @@ SoundRenderObjClass::Set_Hidden (int onoff)
 	//
 	if (IsInitialized == false || Is_Not_Hidden_At_All () != before) {
 		IsInitialized = true;
-		Update_On_Visibilty ();		
+		Update_On_Visibilty ();
 	}
 
 	return ;
@@ -296,7 +296,7 @@ SoundRenderObjClass::Update_On_Visibilty (void)
 	if (	Is_Not_Hidden_At_All () &&
 			Sound->Is_In_Scene () == false &&
 			Peek_Scene () != NULL)
-	{		
+	{
 		//
 		//	Make sure the sound is properly attached to this render
 		// object and then add it to the scene
@@ -305,7 +305,7 @@ SoundRenderObjClass::Update_On_Visibilty (void)
 		Sound->Add_To_Scene (true);
 
 	} else if ((Is_Not_Hidden_At_All () == false) || (Peek_Scene () == NULL)) {
-		
+
 		//
 		//	Remove the sound from the scene (it will stop playing)
 		//
@@ -579,7 +579,7 @@ SoundRenderObjDefClass::Save_W3D (ChunkSaveClass &csave)
 	// Begin a chunk that identifies a sound render object
 	//
 	if (csave.Begin_Chunk (W3D_CHUNK_SOUNDROBJ) == TRUE) {
-		
+
 		//
 		// Attempt to save the different sections of the aggregate definition
 		//
@@ -655,9 +655,9 @@ SoundRenderObjDefClass::Read_Definition (ChunkLoadClass &cload)
 		//
 		if (Definition.Load (cload)) {
 			retval = WW3D_ERROR_OK;
-		}		
-		
-		cload.Close_Chunk ();		
+		}
+
+		cload.Close_Chunk ();
 	}
 
 	return retval;
@@ -678,7 +678,7 @@ SoundRenderObjDefClass::Write_Header (ChunkSaveClass &csave)
 	// Begin a chunk that identifies the aggregate
 	//
 	if (csave.Begin_Chunk (W3D_CHUNK_SOUNDROBJ_HEADER) == TRUE) {
-		
+
 		//
 		// Fill the header structure
 		//
@@ -716,7 +716,7 @@ SoundRenderObjDefClass::Write_Definition (ChunkSaveClass &csave)
 	//
 	// Save the definition to its own chunk
 	//
-	if (csave.Begin_Chunk (W3D_CHUNK_SOUNDROBJ_DEFINITION) == TRUE) {		
+	if (csave.Begin_Chunk (W3D_CHUNK_SOUNDROBJ_DEFINITION) == TRUE) {
 		if (Definition.Save (csave)) {
 			retval = WW3D_ERROR_OK;
 		}
@@ -749,7 +749,7 @@ SoundRenderObjLoaderClass::Load_W3D (ChunkLoadClass &cload)
 	//
 	SoundRenderObjDefClass *definition = W3DNEW SoundRenderObjDefClass;
 	if (definition != NULL) {
-		
+
 		//
 		// Ask the definition object to load the sound data
 		//
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h
index 945c1310aee..c5ce0b6815a 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h
@@ -34,14 +34,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef __SOUNDROBJ_H
-#define __SOUNDROBJ_H
-
-// TheSuperHackers @compile xezon 05/04/2025 Compile in WWAUDIO for Renegade's w3dview tool.
+// TheSuperHackers @build xezon 05/04/2025 Compile in WWAUDIO for Renegade's w3dview tool.
 #define noWWAUDIO 1
 
 #if noWWAUDIO // (gth) removing dependency on WWAUDIO
@@ -83,7 +78,7 @@ class SoundRenderObjClass : public RenderObjClass
 	typedef enum
 	{
 		FLAG_STOP_WHEN_HIDDEN	= 0x00000001,
-		
+
 	} FLAGS;
 
 	///////////////////////////////////////////////////////////
@@ -148,7 +143,7 @@ class SoundRenderObjClass : public RenderObjClass
 	///////////////////////////////////////////////////////////
 	//	Private member data
 	///////////////////////////////////////////////////////////
-	bool						IsInitialized;	
+	bool						IsInitialized;
 	StringClass				Name;
 	AudibleSoundClass *	Sound;
 	uint32					Flags;
@@ -171,7 +166,7 @@ class SoundRenderObjDefClass : public RefCountClass
 	SoundRenderObjDefClass (SoundRenderObjClass &render_obj);
 	SoundRenderObjDefClass (const SoundRenderObjDefClass &src);
 	virtual ~SoundRenderObjDefClass (void);
-	
+
 	///////////////////////////////////////////////////////////
 	//	Public operators
 	///////////////////////////////////////////////////////////
@@ -179,12 +174,12 @@ class SoundRenderObjDefClass : public RefCountClass
 
 	///////////////////////////////////////////////////////////
 	//	Public methods
-	///////////////////////////////////////////////////////////	
+	///////////////////////////////////////////////////////////
 	RenderObjClass *				Create (void);
 	WW3DErrorType					Load_W3D (ChunkLoadClass &cload);
 	WW3DErrorType					Save_W3D (ChunkSaveClass &csave);
 	const char *					Get_Name (void) const					{ return Name; }
-	void								Set_Name (const char *name)			{ Name = name; }	
+	void								Set_Name (const char *name)			{ Name = name; }
 	SoundRenderObjDefClass *	Clone (void) const						{ return NEW_REF( SoundRenderObjDefClass, (*this) ); }
 
 	//
@@ -197,7 +192,7 @@ class SoundRenderObjDefClass : public RefCountClass
 	///////////////////////////////////////////////////////////
 	//	Protected methods
 	///////////////////////////////////////////////////////////
-	
+
 	//
 	//	Loading methods
 	//
@@ -227,7 +222,7 @@ class SoundRenderObjDefClass : public RefCountClass
 //	SoundRenderObjPrototypeClass
 //
 ///////////////////////////////////////////////////////////////////////////////////
-class SoundRenderObjPrototypeClass : public W3DMPO, public PrototypeClass 
+class SoundRenderObjPrototypeClass : public W3DMPO, public PrototypeClass
 {
 	W3DMPO_GLUE(SoundRenderObjPrototypeClass)
 public:
@@ -237,7 +232,7 @@ class SoundRenderObjPrototypeClass : public W3DMPO, public PrototypeClass
 	///////////////////////////////////////////////////////////
 	SoundRenderObjPrototypeClass (SoundRenderObjDefClass *def)
 		: Definition (NULL)													{ Set_Definition (def); }
-	
+
 	///////////////////////////////////////////////////////////
 	//	Public methods
 	///////////////////////////////////////////////////////////
@@ -245,7 +240,7 @@ class SoundRenderObjPrototypeClass : public W3DMPO, public PrototypeClass
 	int								Get_Class_ID(void) const			{ return RenderObjClass::CLASSID_SOUND; }
 	RenderObjClass *				Create (void)							{ return Definition->Create (); }
 	virtual void							DeleteSelf()										{ delete this; }
-	
+
 	SoundRenderObjDefClass	*	Peek_Definition (void) const						{ return Definition; }
 	void								Set_Definition (SoundRenderObjDefClass *def)	{ REF_PTR_SET (Definition, def); }
 
@@ -280,6 +275,3 @@ class SoundRenderObjLoaderClass : public PrototypeLoaderClass
 extern SoundRenderObjLoaderClass		_SoundRenderObjLoader;
 
 #endif //noWWAUDIO (gth) removing dependency on wwaudio
-
-#endif //__SOUNDROBJ_H
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp
index fcca783682d..3b24f5e09d4 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                   Org Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 24                                                          $*
@@ -174,13 +174,13 @@ SphereRenderObjClass::SphereRenderObjClass(const W3dSphereStruct & def)
 	Generate_Shared_Mesh_Arrays ( CurrentVector );
 	Init_Material ();
 	Orientation.Make_Identity();
-	
+
 	//
 	//	Initialize from the defintion
 	//
 	Set_Name(def.Name);
 	Set_Local_Center_Extent (	Vector3 (def.Center.X, def.Center.Y, def.Center.Z),
-										Vector3 (def.Extent.X, def.Extent.Y, def.Extent.Z));	
+										Vector3 (def.Extent.X, def.Extent.Y, def.Extent.Z));
 
 	if (def.TextureName[0] != 0) {
 		SphereTexture = WW3DAssetManager::Get_Instance ()->Get_Texture (def.TextureName);
@@ -221,7 +221,7 @@ SphereRenderObjClass::SphereRenderObjClass(const SphereRenderObjClass & src)
 		ObjSpaceCenter (0, 0, 0),
 		ObjSpaceExtent (1, 1, 1)
 {
-	Generate_Shared_Mesh_Arrays ( CurrentVector );	
+	Generate_Shared_Mesh_Arrays ( CurrentVector );
 	Init_Material ();
 	Orientation.Make_Identity();
 
@@ -236,7 +236,7 @@ SphereRenderObjClass::SphereRenderObjClass(const SphereRenderObjClass & src)
 SphereRenderObjClass::~SphereRenderObjClass()
 {
 	REF_PTR_RELEASE(SphereMaterial);
-} // destructor
+}
 
 /***********************************************************************************************
  * SphereRenderObjClass::operator -- assignment operator                                       *
@@ -271,7 +271,7 @@ SphereRenderObjClass & SphereRenderObjClass::operator = (const SphereRenderObjCl
 		AlphaChannel		= that.AlphaChannel;
 		ScaleChannel		= that.ScaleChannel;
 		VectorChannel		= that.VectorChannel;
-		
+
 		Set_Texture (that.SphereTexture);
 	}
 
@@ -354,18 +354,18 @@ void SphereRenderObjClass::Init_Material (void)
 	SphereMaterial->Set_Diffuse(0,0,0);
 	SphereMaterial->Set_Specular(0,0,0);
 	SphereMaterial->Set_Emissive(1,1,1);
-	SphereMaterial->Set_Opacity(0.25f);	
+	SphereMaterial->Set_Opacity(0.25f);
 	SphereMaterial->Set_Shininess(0.0f);
 	SphereMaterial->Set_Lighting(true);
 
 	// Texturing, zbuffer, primary gradient, alpha blending
 	SphereShader = ShaderClass::_PresetAlphaShader;
-	
+
 	// (gth) Looks like sphere's were coded with backwards normals! Quick fix (though expensive)
 	// is to turn off backface culling...  ug...
 	SphereShader.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);
 
-}	// Init_Material
+}
 
 
 /***********************************************************************************************
@@ -437,8 +437,8 @@ const char * SphereRenderObjClass::Get_Name(void) const
 void SphereRenderObjClass::Set_Name(const char * name)
 {
 	WWASSERT(name != NULL);
-	WWASSERT(strlen(name) < 2*W3D_NAME_LEN);
-	strcpy(Name,name);
+	const size_t nameLen = strlcpy(Name, name, ARRAY_SIZE(Name));
+	(void)nameLen; WWASSERT(nameLen < ARRAY_SIZE(Name));
 }
 
 
@@ -472,7 +472,7 @@ void SphereRenderObjClass::render_sphere()
 	}
 	DX8Wrapper::Set_Shader(SphereShader);
 	DX8Wrapper::Set_Texture(0,SphereTexture);
-	DX8Wrapper::Set_Material(SphereMaterial);	
+	DX8Wrapper::Set_Material(SphereMaterial);
 
 	// Enable sorting if the primitive is translucent, alpha testing is not enabled, and sorting is enabled globally.
 	const bool sort = (SphereShader.Get_Dst_Blend_Func() != ShaderClass::DSTBLEND_ZERO) && (SphereShader.Get_Alpha_Test() == ShaderClass::ALPHATEST_DISABLE) && (WW3D::Is_Sorting_Enabled());
@@ -484,11 +484,11 @@ void SphereRenderObjClass::render_sphere()
 		VertexFormatXYZNDUV2 *vb = Lock.Get_Formatted_Vertex_Array();
 
 		for (int i=0; i<mesh.Vertex_ct; i++)
-		{			
+		{
 			vb->x = mesh.vtx[i].X;
 			vb->y = mesh.vtx[i].Y;
 			vb->z = mesh.vtx[i].Z;
-			
+
 			vb->nx = mesh.vtx_normal[i].X;		// may not need this!
 			vb->ny = mesh.vtx_normal[i].Y;
 			vb->nz = mesh.vtx_normal[i].Z;
@@ -498,13 +498,13 @@ void SphereRenderObjClass::render_sphere()
 			} else {
 				vb->diffuse = 0xFFFFFFFF;		// TODO could combine the material color with this and turn off lighting
 			}
-			
+
 			if (SphereTexture) {
 				vb->u1 = mesh.vtx_uv[i].X;
 				vb->v1 = mesh.vtx_uv[i].Y;
 			}
 			vb++;
-		}		
+		}
 	}
 
 	DynamicIBAccessClass ib(buffer_type, mesh.face_ct*3);
@@ -517,7 +517,7 @@ void SphereRenderObjClass::render_sphere()
 			mem[3*i+1]=mesh.tri_poly[i].J;
 			mem[3*i+2]=mesh.tri_poly[i].K;
 		}
-	}	
+	}
 
 	DX8Wrapper::Set_Vertex_Buffer(vb);
 	DX8Wrapper::Set_Index_Buffer(ib,0);
@@ -528,7 +528,7 @@ void SphereRenderObjClass::render_sphere()
 		DX8Wrapper::Draw_Triangles(0,mesh.face_ct,0,mesh.Vertex_ct);
 	}
 
-} // render_sphere
+}
 
 
 /***********************************************************************************************
@@ -547,7 +547,7 @@ void SphereRenderObjClass::render_sphere()
  *=============================================================================================*/
 void SphereRenderObjClass::vis_render_sphere(SpecialRenderInfoClass & rinfo,const Vector3 & center,const Vector3 & extent)
 {
-}	// vis_render_sphere
+}
 
 
 /***********************************************************************************************
@@ -606,7 +606,7 @@ void SphereRenderObjClass::Render(RenderInfoClass & rinfo)
 	if (Is_Not_Hidden_At_All() == false) {
 		return;
 	}
-	
+
 	unsigned int sort_level = SORT_LEVEL_NONE;
 
 	if (!WW3D::Is_Sorting_Enabled()) {
@@ -673,13 +673,13 @@ void SphereRenderObjClass::Render(RenderInfoClass & rinfo)
 
 			tm.Scale(real_scale);
 			DX8Wrapper::Set_Transform(D3DTS_WORLD,ident);
-			DX8Wrapper::Set_Transform(D3DTS_VIEW,tm); 
+			DX8Wrapper::Set_Transform(D3DTS_VIEW,tm);
 			render_sphere();
 			DX8Wrapper::Set_Transform(D3DTS_VIEW,view);
 		} else {
-			DX8Wrapper::Set_Transform(D3DTS_WORLD,temp);	
+			DX8Wrapper::Set_Transform(D3DTS_WORLD,temp);
 			render_sphere();
-		}		
+		}
 	}
 }
 
@@ -700,7 +700,7 @@ void SphereRenderObjClass::Special_Render(SpecialRenderInfoClass & rinfo)
 {
 	Matrix3D temp(1);
 	temp.Translate(Transform.Get_Translation());
-	
+
 	if (rinfo.RenderType == SpecialRenderInfoClass::RENDER_VIS) {
 		WWASSERT(rinfo.VisRasterizer != NULL);
 		rinfo.VisRasterizer->Set_Model_Transform(temp);
@@ -968,7 +968,7 @@ void SphereRenderObjClass::Update_Cached_Bounding_Volumes(void) const
 Vector3 SphereRenderObjClass::Get_Default_Color(void) const
 {
 	Vector3 value;
-	
+
 	if (ColorChannel.Get_Key_Count () > 0) {
 		value = ColorChannel.Get_Key (0).Get_Value ();
 	} else {
@@ -994,7 +994,7 @@ Vector3 SphereRenderObjClass::Get_Default_Color(void) const
 float SphereRenderObjClass::Get_Default_Alpha(void) const
 {
 	float  value;
-	
+
 	if (AlphaChannel.Get_Key_Count () > 0) {
 		value = AlphaChannel.Get_Key (0).Get_Value ();
 	} else {
@@ -1020,7 +1020,7 @@ float SphereRenderObjClass::Get_Default_Alpha(void) const
 Vector3 SphereRenderObjClass::Get_Default_Scale(void) const
 {
 	Vector3 value;
-	
+
 	if (ScaleChannel.Get_Key_Count () > 0) {
 		value = ScaleChannel.Get_Key (0).Get_Value ();
 	} else {
@@ -1046,7 +1046,7 @@ Vector3 SphereRenderObjClass::Get_Default_Scale(void) const
 AlphaVectorStruct SphereRenderObjClass::Get_Default_Vector(void) const
 {
 	AlphaVectorStruct value;
-	
+
 	if (VectorChannel.Get_Key_Count () > 0) {
 		value = VectorChannel.Get_Key (0).Get_Value ();
 	} else {
@@ -1103,14 +1103,10 @@ void SphereRenderObjClass::animate (void)
 				AlphaChannel.Get_Key_Count () > 0 ||
 				ScaleChannel.Get_Key_Count () > 0 ||
 				VectorChannel.Get_Key_Count () > 0)
-		{		
-			//
-			// Convert from milliseconds to seconds and normalize the time
-			//
+		{
 			if (AnimDuration > 0) {
-				float	frametime = WW3D::Get_Frame_Time();
-				frametime = (frametime * 0.001F) / AnimDuration;
-				anim_time += frametime;
+				float frametime = WW3D::Get_Logic_Frame_Time_Seconds();
+				anim_time += frametime / AnimDuration;
 			} else {
 				anim_time = 1.0F;
 			}
@@ -1123,16 +1119,16 @@ void SphereRenderObjClass::animate (void)
 			if (ColorChannel.Get_Key_Count () > 0) {
 				CurrentColor	= ColorChannel.Evaluate (anim_time);
 			}
-			
+
 			if (AlphaChannel.Get_Key_Count () > 0) {
 				CurrentAlpha	= AlphaChannel.Evaluate (anim_time);
 			}
-			
+
 			if (ScaleChannel.Get_Key_Count () > 0) {
 				CurrentScale	= ScaleChannel.Evaluate (anim_time);
 				Update_Cached_Bounding_Volumes ();
 			}
-			
+
 			if (VectorChannel.Get_Key_Count () > 0) {
 				CurrentVector = VectorChannel.Evaluate (anim_time);
 			}
@@ -1141,7 +1137,7 @@ void SphereRenderObjClass::animate (void)
 
 	return ;
 
-} // animate
+}
 
 
 /*
@@ -1165,22 +1161,22 @@ SpherePrototypeClass::SpherePrototypeClass (void)
 
 SpherePrototypeClass::SpherePrototypeClass(SphereRenderObjClass *sphere)
 {
-	::memset (&Definition, 0, sizeof (Definition));	
-	::strcpy (Definition.Name, sphere->Get_Name ());
+	::memset (&Definition, 0, sizeof (Definition));
+	strlcpy(Definition.Name, sphere->Get_Name(), ARRAY_SIZE(Definition.Name));
 
 	Definition.DefaultAlpha = sphere->Get_Default_Alpha ();
 	Definition.AnimDuration = sphere->AnimDuration;
 	Definition.Attributes	= sphere->Get_Flags ();
 	Definition.DefaultVector = sphere->Get_Default_Vector ();
-	
+
 	Vector3 def_color = sphere->Get_Default_Color ();
 	Vector3 def_scale = sphere->Get_Default_Scale ();
 	W3dUtilityClass::Convert_Vector (def_color, &Definition.DefaultColor);
 	W3dUtilityClass::Convert_Vector (def_scale, &Definition.DefaultScale);
-	
+
 	W3dUtilityClass::Convert_Vector (sphere->Get_Box ().Center, &Definition.Center);
-	W3dUtilityClass::Convert_Vector (sphere->Get_Box ().Extent, &Definition.Extent);	
-	W3dUtilityClass::Convert_Shader (sphere->SphereShader, &Definition.Shader);	
+	W3dUtilityClass::Convert_Vector (sphere->Get_Box ().Extent, &Definition.Extent);
+	W3dUtilityClass::Convert_Shader (sphere->SphereShader, &Definition.Shader);
 
 	//
 	//	Determine the texture name for this sphere
@@ -1194,7 +1190,7 @@ SpherePrototypeClass::SpherePrototypeClass(SphereRenderObjClass *sphere)
 			filename = name;
 		}
 
-		::strcpy (Definition.TextureName, filename);
+		strlcpy(Definition.TextureName, filename, ARRAY_SIZE(Definition.TextureName));
 
 	}
 
@@ -1231,7 +1227,7 @@ bool SpherePrototypeClass::Load (ChunkLoadClass &cload)
 
 	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
-			
+
 			case CHUNKID_SPHERE_DEF:
 				cload.Read (&Definition, sizeof (Definition));
 				break;
@@ -1260,7 +1256,7 @@ bool SpherePrototypeClass::Load (ChunkLoadClass &cload)
 }
 
 bool SpherePrototypeClass::Save (ChunkSaveClass &csave)
-{	
+{
 	csave.Begin_Chunk (W3D_CHUNK_SPHERE);
 
 		csave.Begin_Chunk (CHUNKID_SPHERE_DEF);
@@ -1305,28 +1301,28 @@ int SpherePrototypeClass::Get_Class_ID(void) const
 {
 	return RenderObjClass::CLASSID_SPHERE;
 }
-	
+
 RenderObjClass * SpherePrototypeClass::Create(void)
 {
 	//
 	//	Create the new render object
 	//
 	SphereRenderObjClass *sphere = W3DNEW SphereRenderObjClass (Definition);
-	
+
 	//
 	//	Configure the sphere
 	//
-	W3dUtilityClass::Convert_Shader (Definition.Shader, &sphere->SphereShader);		
+	W3dUtilityClass::Convert_Shader (Definition.Shader, &sphere->SphereShader);
 	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) {
 		sphere->SphereShader.Enable_Fog ("SpherePrototypeClass");
 	}
 	W3dUtilityClass::Convert_Vector (Definition.DefaultColor, &sphere->CurrentColor);
 	W3dUtilityClass::Convert_Vector (Definition.DefaultScale, &sphere->CurrentScale);
 	sphere->CurrentVector = Definition.DefaultVector;
-	sphere->Set_Animation_Duration (Definition.AnimDuration);	
+	sphere->Set_Animation_Duration (Definition.AnimDuration);
 	sphere->CurrentAlpha = Definition.DefaultAlpha;
 	sphere->Set_Flags (Definition.Attributes);
-	
+
 	//
 	//	Initialize the render object with the keyframe arrays
 	//
@@ -1363,7 +1359,7 @@ SphereMeshClass::SphereMeshClass(float radius, int slices, int stacks):
 Radius(radius),
 Slices(slices),
 Stacks(stacks),
-Vertex_ct(0),	
+Vertex_ct(0),
 vtx(NULL),
 vtx_normal(NULL),
 vtx_uv(NULL),
@@ -1379,10 +1375,10 @@ inverse_alpha(false)
 {
 	// compute # of vertices
 	// 1st 2 vertices, represent, north, and south pole (Y - axis)
-	
+
 	Generate(radius, slices, stacks);
 
-} // SphereMesh Constructor
+}
 
 /***********************************************************************************************
  * SphereMeshClass::SphereMeshClass -- Constructor for SphereMesh Geometry							  *
@@ -1400,7 +1396,7 @@ SphereMeshClass::SphereMeshClass(void):
 Radius(0.0f),
 Slices(0),
 Stacks(0),
-Vertex_ct(0),	
+Vertex_ct(0),
 vtx(NULL),
 vtx_normal(NULL),
 vtx_uv(NULL),
@@ -1415,7 +1411,7 @@ tri_poly(NULL),
 inverse_alpha(false)
 {
 
-} // Empty SphereMesh Constructor
+}
 
 
 
@@ -1459,9 +1455,9 @@ void	SphereMeshClass::Set_Alpha_Vector (const AlphaVectorStruct &v, bool inverse
 			float temp;
 			temp = Vector3::Dot_Product(vec, vtx_normal[idx]);
 			temp*= Intensity;
-			
+
 			temp = fabs(temp);
-			
+
 			if (temp > 1.0f) temp = 1.0f;
 
 			Set_DCG (is_additive, idx, temp);
@@ -1474,9 +1470,9 @@ void	SphereMeshClass::Set_Alpha_Vector (const AlphaVectorStruct &v, bool inverse
 			float temp;
 			temp = Vector3::Dot_Product(vec, vtx_normal[idx]);
 			temp*= Intensity;
-			
+
 			temp = fabs(temp);
-			
+
 			if (temp > 1.0f) temp = 1.0f;
 
 			Set_DCG (is_additive, idx, 1.0F - temp);
@@ -1484,7 +1480,7 @@ void	SphereMeshClass::Set_Alpha_Vector (const AlphaVectorStruct &v, bool inverse
 	}
 
 	return ;
-} // Set_Alpha_Vector
+}
 
 
 /***********************************************************************************************
@@ -1505,7 +1501,7 @@ void SphereMeshClass::Generate(float radius, int slices, int stacks)
 	// 1st 2 vertices, represent, north, and south pole (Y - axis)
 
 	Free();
-	
+
 	Slices = slices;
 	Stacks = stacks;
 	Radius = radius;
@@ -1540,7 +1536,7 @@ void SphereMeshClass::Generate(float radius, int slices, int stacks)
 	uv++;
 
 	for (stacks = 0; stacks < Stacks; stacks++) {
-		
+
 		float stackstep  = ((float)stacks + 1) / ((float) Stacks+1);
 		float XAxisAngle = WWMATH_PI * stackstep;
 
@@ -1563,8 +1559,8 @@ void SphereMeshClass::Generate(float radius, int slices, int stacks)
 			uv->V = stackstep;
 			uv++;
 
-		} // for slices
-	} // for stacks
+		}
+	}
 
 	// Assign vertex for south pole;
 	*veclist = -1.0f * vec;
@@ -1576,7 +1572,7 @@ void SphereMeshClass::Generate(float radius, int slices, int stacks)
 	Vector3 *dst = vtx_normal;
 
 	for(int idx = 0; idx < Vertex_ct; idx++) {
-		
+
 		Vector3 temp;
 
 		temp = src[idx];
@@ -1589,7 +1585,7 @@ void SphereMeshClass::Generate(float radius, int slices, int stacks)
 	fan_ct = 2;
 	fan_size = Slices+2;
 	fans = W3DNEWARRAY int[fan_size * fan_ct];
-	
+
 	// Do Fan #1
 	int ct = 0;
 	for (; ct < fan_size; ct++) {
@@ -1654,7 +1650,7 @@ void SphereMeshClass::Generate(float radius, int slices, int stacks)
 
 			out++;
 			in++;
-			
+
 			fidx++;
 			if (fidx >= (strip_size-2)) break;
 
@@ -1698,7 +1694,7 @@ void SphereMeshClass::Generate(float radius, int slices, int stacks)
 	Set_Alpha_Vector (alpha_vector, inverse_alpha, IsAdditive, true);
 	return ;
 
-} // Generate
+}
 
 
 
@@ -1715,7 +1711,7 @@ SphereMeshClass::~SphereMeshClass(void)
 
 	Free();
 
-} // Destructor
+}
 
 
 /***********************************************************************************************
@@ -1732,13 +1728,13 @@ SphereMeshClass::~SphereMeshClass(void)
  *=============================================================================================*/
 void SphereMeshClass::Free(void)
 {
-	if (vtx)				delete [] vtx;
-	if (vtx_normal)	delete [] vtx_normal;
-	if (vtx_uv)			delete [] vtx_uv;
-	if (dcg)				delete [] dcg;
-	if (strips)			delete [] strips;
-	if (fans)			delete [] fans;
-	if (tri_poly)		delete [] tri_poly;
+	delete [] vtx;
+	delete [] vtx_normal;
+	delete [] vtx_uv;
+	delete [] dcg;
+	delete [] strips;
+	delete [] fans;
+	delete [] tri_poly;
 
 	vtx			= NULL;
 	vtx_normal	= NULL;
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h
index 4530ba86ba6..5b854cf4fb0 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SPHEREOBJ_H
-#define SPHEREOBJ_H
 
 #include "always.h"
 #include "rendobj.h"
@@ -121,7 +116,7 @@ struct W3dSphereStruct
 	uint32				Version;							// file format version
 	uint32				Attributes;						// sphere attributes (above #define's)
 	char					Name[2*W3D_NAME_LEN];		// name is in the form <containername>.<spherename>
-	
+
 	W3dVectorStruct	Center;							// center of the sphere
 	W3dVectorStruct	Extent;							// extent of the sphere
 
@@ -174,7 +169,7 @@ friend class SphereRenderObjClass;
 
 	float		Radius;
 	int		Slices;
-	int		Stacks;			
+	int		Stacks;
 	int		face_ct;	  		// # of faces
 
 	int		Vertex_ct;		// vertex count
@@ -227,7 +222,7 @@ SphereMeshClass::Set_DCG (bool is_additive, int index, float value)
 **
 */
 class SphereRenderObjClass : public RenderObjClass
-{	
+{
 
 public:
 
@@ -246,13 +241,13 @@ class SphereRenderObjClass : public RenderObjClass
 	~SphereRenderObjClass(void);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
 	virtual void					Render(RenderInfoClass & rinfo);
 	virtual void					Special_Render(SpecialRenderInfoClass & rinfo);
-	virtual void 					Set_Transform(const Matrix3D &m); 
+	virtual void 					Set_Transform(const Matrix3D &m);
 	virtual void 					Set_Position(const Vector3 &v);
    virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;
    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;
@@ -326,8 +321,8 @@ class SphereRenderObjClass : public RenderObjClass
 
 	// Animatable channel access
 	SphereColorChannelClass &			Get_Color_Channel (void)				{ return ColorChannel; }
-	const SphereColorChannelClass &	Peek_Color_Channel (void)				{ return ColorChannel; }	
-	
+	const SphereColorChannelClass &	Peek_Color_Channel (void)				{ return ColorChannel; }
+
 	SphereAlphaChannelClass &			Get_Alpha_Channel (void)				{ return AlphaChannel; }
 	const SphereAlphaChannelClass &	Peek_Alpha_Channel (void)				{ return AlphaChannel; }
 
@@ -343,7 +338,7 @@ class SphereRenderObjClass : public RenderObjClass
 	void								Set_Vector_Channel (const SphereVectorChannelClass &data)	{ VectorChannel = data; }
 
 protected:
-	
+
 	virtual void			 		update_cached_box(void);
 	virtual void			 		Update_Cached_Bounding_Volumes(void) const;
 	void								Update_On_Visibilty(void);
@@ -357,7 +352,7 @@ class SphereRenderObjClass : public RenderObjClass
 	float								anim_time;			// what time in seconds are we in the animation
 	float								AnimDuration;
 	bool								IsAnimating;
-	
+
 	// LOD Stuff
 	void								calculate_value_array(float screen_area, float *values) const;
 	float								LODBias;
@@ -420,11 +415,11 @@ inline void SphereRenderObjClass::Set_Local_Min_Max(const Vector3 & min,const Ve
 }
 
 
-inline const AABoxClass & SphereRenderObjClass::Get_Box(void) 
-{ 
+inline const AABoxClass & SphereRenderObjClass::Get_Box(void)
+{
 	Validate_Transform();
 	update_cached_box();
-	return CachedBox; 
+	return CachedBox;
 }
 
 /*
@@ -472,8 +467,4 @@ class SpherePrototypeClass : public W3DMPO, public PrototypeClass
 */
 extern SphereLoaderClass			_SphereLoader;
 
-#endif // SPHEREOBJ_H
-
 // EOF - sphereobj,h
-
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.cpp b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.cpp
index 3dc56285010..ae049425439 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.cpp
@@ -16,24 +16,24 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************************************** 
- ***                  C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *************************************************************************************************** 
- *                                                                                                 * 
- *                     Project Name : G                                                            * 
- *                                                                                                 * 
- *                         $Archive::                                                             $* 
- *                                                                                                 * 
+/***************************************************************************************************
+ ***                  C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***************************************************************************************************
+ *                                                                                                 *
+ *                     Project Name : G                                                            *
+ *                                                                                                 *
+ *                         $Archive::                                                             $*
+ *                                                                                                 *
  *                          Creator::Scott K. Bowen - 7/15/2002                                        *
- *                                                                                                 * 
- *                          $Author::                                                             $* 
- *                                                                                                 * 
- *                         $Modtime::                                                             $* 
- *                                                                                                 * 
- *                        $Revision::                                                             $* 
- *                                                                                                 * 
- *-------------------------------------------------------------------------------------------------* 
- * Functions:                                                                                      * 
+ *                                                                                                 *
+ *                          $Author::                                                             $*
+ *                                                                                                 *
+ *                         $Modtime::                                                             $*
+ *                                                                                                 *
+ *                        $Revision::                                                             $*
+ *                                                                                                 *
+ *-------------------------------------------------------------------------------------------------*
+ * Functions:                                                                                      *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  - - -  - - */
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h
index 14326ab6840..d5e81a52fe2 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h
@@ -16,31 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/***************************************************************************************************************** 
- ***                      C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S                         *** 
- ***************************************************************************************************************** 
- *                                                                                                               * 
- *                         Project Name : G                                                                      * 
- *                                                                                                               * 
- *                             $Archive::                                                                       $* 
- *                                                                                                               * 
+/*****************************************************************************************************************
+ ***                      C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S                         ***
+ *****************************************************************************************************************
+ *                                                                                                               *
+ *                         Project Name : G                                                                      *
+ *                                                                                                               *
+ *                             $Archive::                                                                       $*
+ *                                                                                                               *
  *                              Creator::Scott K. Bowen - 7/15/2002                                                  *
- *                                                                                                               * 
- *                              $Author::                                                                       $* 
- *                                                                                                               * 
- *                             $Modtime::                                                                       $* 
- *                                                                                                               * 
- *                            $Revision::                                                                       $* 
- *                                                                                                               * 
- *---------------------------------------------------------------------------------------------------------------* 
- * Functions:                                                                                                    * 
+ *                                                                                                               *
+ *                              $Author::                                                                       $*
+ *                                                                                                               *
+ *                             $Modtime::                                                                       $*
+ *                                                                                                               *
+ *                            $Revision::                                                                       $*
+ *                                                                                                               *
+ *---------------------------------------------------------------------------------------------------------------*
+ * Functions:                                                                                                    *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if defined(_MSC_VER)
-#pragma once
-#endif
 
-#ifndef STATIC_SORT_LIST_H
-#define STATIC_SORT_LIST_H
+#pragma once
 
 #include "robjlist.h"
 #include "w3d_file.h"
@@ -59,7 +55,7 @@ class StaticSortListClass
 		virtual void 	Add_To_List(RenderObjClass * robj, unsigned int sort_level) = 0;
 		virtual void 	Render_And_Clear(RenderInfoClass & rinfo) = 0;
 
-}; // end StaticSortListClass
+};
 
 // The actual implementation for the standard ww3d StaticSortList.
 class DefaultStaticSortListClass : public StaticSortListClass
@@ -86,14 +82,8 @@ class DefaultStaticSortListClass : public StaticSortListClass
 		// are set to 1..MAX_SORT_LEVEL and then never changed.
 		unsigned int				MinSort;
 		unsigned int				MaxSort;
- 
+
 		// An array of lists - each object in a given list has same SortLevel.
 		RefRenderObjListClass 	SortLists[MAX_SORT_LEVEL + 1];
 
-}; // end StaticSortListClass
-
-
-
-
-#endif //STATIC_SORT_LIST_H
-
+};
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/statistics.cpp b/Core/Libraries/Source/WWVegas/WW3D2/statistics.cpp
index 89df67ff00a..09b0ce0fe03 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/statistics.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/statistics.cpp
@@ -24,7 +24,6 @@
 #include "dx8caps.h"
 #include "textureloader.h"
 #include "texture.h"
-#include <Utility/stdio_adapter.h>
 
 #include <memory.h>
 #ifdef _UNIX
@@ -132,11 +131,11 @@ static void Record_Texture_End()
 //				int percents=100-100*bytes/non_red_bytes;
 				working_string.Format("%4.4dkb         ",bytes/1024);
 				texture_statistics_string+=working_string;
+				texture_statistics_string+=t->Get_Texture_Name();//getTextureName();
 			}
 			else {
 				texture_statistics_string+="N/A  ";
 			}
-			texture_statistics_string+=t->Get_Texture_Name();//getTextureName();
 			texture_statistics_string+=error;
 			texture_statistics_string+="\n";
 		}
@@ -175,7 +174,7 @@ static bool Find_Record_Texture(TextureClass* t)
 					texture_statistics[a].change_count++;
 				}
 			}
-		
+
 			return true;
 		}
 	}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/statistics.h b/Core/Libraries/Source/WWVegas/WW3D2/statistics.h
index 408952f2902..1b89610cbc5 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/statistics.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/statistics.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef WW3D_STATISTICS_H
-#define WW3D_STATISTICS_H
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
 #include "always.h"
 //#include "wwstring.h"
@@ -76,5 +71,3 @@ namespace Debug_Statistics
 #define DX8_RECORD_RENDER(polys,verts,shader) Debug_Statistics::Record_DX8_Polys_And_Vertices(polys,verts,shader)
 #define DX8_RECORD_SORTING_RENDER(polys,verts) Debug_Statistics::Record_Sorting_Polys_And_Vertices(polys,verts)
 #define DX8_RECORD_SKIN_RENDER(polys,verts) Debug_Statistics::Record_DX8_Skin_Polys_And_Vertices(polys,verts)
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp b/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp
index 7827b7752e0..2c045a083e2 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp
@@ -160,9 +160,9 @@ void StreakLineClass::Set_Colors( unsigned int num_points, Vector4 *colors )
 
 }
 
-void StreakLineClass::Set_LocsWidthsColors( unsigned int num_points, 
-																					 Vector3 *locs, 
-																					 float *widths, 
+void StreakLineClass::Set_LocsWidthsColors( unsigned int num_points,
+																					 Vector3 *locs,
+																					 float *widths,
 																					 Vector4 *colors,
 																					 unsigned int *personalities)
 {
@@ -288,7 +288,7 @@ unsigned int StreakLineClass::Get_Subdivision_Levels(void)
 
 SegLineRendererClass::TextureMapMode StreakLineClass::Get_Texture_Mapping_Mode(void)
 {
-	return LineRenderer.Get_Texture_Mapping_Mode(); 
+	return LineRenderer.Get_Texture_Mapping_Mode();
 }
 
 float StreakLineClass::Get_Texture_Tile_Factor(void)
@@ -421,7 +421,7 @@ void StreakLineClass::Set_End_Caps(int onoff)
 
 RenderObjClass * StreakLineClass::Clone(void) const
 {
-	return NEW_REF( StreakLineClass, (*this)); 
+	return NEW_REF( StreakLineClass, (*this));
 }
 
 int StreakLineClass::Get_Num_Polys(void) const
@@ -441,14 +441,14 @@ void StreakLineClass::Render(RenderInfoClass & rinfo)
 
 	unsigned int sort_level = SORT_LEVEL_NONE;
 
-	if (!WW3D::Is_Sorting_Enabled())	
-		sort_level=Get_Shader().Guess_Sort_Level();	
+	if (!WW3D::Is_Sorting_Enabled())
+		sort_level=Get_Shader().Guess_Sort_Level();
+
+	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level!=SORT_LEVEL_NONE) {
 
-	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level!=SORT_LEVEL_NONE) {		
-		
 		WW3D::Add_To_Static_Sort_List(this, sort_level);
 
-	} 
+	}
 	else
 	{
 		if ( !PointColors.Count() || !PointWidths.Count() )
@@ -476,9 +476,9 @@ void StreakLineClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
 void StreakLineClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
 {
 	unsigned int num_points = PointLocations.Count();
-	
+
 	// Line must have at least two points to be valid
-	
+
 	if (num_points >= 2) {
 
 		// Find object-space axis-aligned bounding box
@@ -564,9 +564,9 @@ void StreakLineClass::Prepare_LOD(CameraClass &camera)
 void StreakLineClass::Increment_LOD(void)
 {
 	unsigned int lvl = LineRenderer.Get_Current_Subdivision_Level();
-	
+
 	lvl = MIN(lvl+1,MaxSubdivisionLevels);
-	
+
 	LineRenderer.Set_Current_Subdivision_Level(lvl);
 }
 
@@ -631,7 +631,7 @@ void StreakLineClass::Set_Texture_Reduction_Factor(float trf)
 	if (LineRenderer.Peek_Texture()) LineRenderer.Peek_Texture()->Set_Reduction_Factor(trf);
 }*/
 
- 
+
 
 void StreakLineClass::Render_Seg_Line(RenderInfoClass & rinfo)
 {
@@ -639,8 +639,8 @@ void StreakLineClass::Render_Seg_Line(RenderInfoClass & rinfo)
 	if (PointLocations.Count() < 2) return;
 
 	SphereClass bounding_sphere;
-	Get_Obj_Space_Bounding_Sphere(bounding_sphere);			
- 
+	Get_Obj_Space_Bounding_Sphere(bounding_sphere);
+
 //	LineRenderer.Set_Width(rand()%3);
 
 	LineRenderer.Render(
@@ -668,7 +668,7 @@ void StreakLineClass::Render_Streak_Line(RenderInfoClass & rinfo)
 	if(PointLocations.Count() != PointWidths.Count()) return;
 
 	SphereClass bounding_sphere;
-	Get_Obj_Space_Bounding_Sphere(bounding_sphere);			
+	Get_Obj_Space_Bounding_Sphere(bounding_sphere);
 
 
 //	StreakRenderer.Render(
@@ -701,7 +701,7 @@ bool StreakLineClass::Cast_Ray(RayCollisionTestClass & raytest)
 	//	Check each line segment against the ray
 	//
 	float fraction = 1.0F;
-	for (uint32 index = 1; index < (unsigned int)PointLocations.Count(); index ++) 
+	for (uint32 index = 1; index < (unsigned int)PointLocations.Count(); index ++)
 	{
 #ifdef ALLOW_TEMPORARIES
 		Vector3 curr_start	= Transform * PointLocations[index-1];
@@ -712,11 +712,11 @@ bool StreakLineClass::Cast_Ray(RayCollisionTestClass & raytest)
 		Transform.mulVector3Array(&PointLocations[index-1], curr, 2);
 		LineSegClass line_seg(curr[0], curr[1]);
 #endif
-		
+
 		Vector3 p0;
 		Vector3 p1;
 		if (raytest.Ray.Find_Intersection (line_seg, &p0, &fraction, &p1, NULL)) {
-			
+
 			//
 			//	Determine if the ray was close enough to this line to be
 			// considered intersecting
@@ -727,7 +727,7 @@ bool StreakLineClass::Cast_Ray(RayCollisionTestClass & raytest)
 				retval = true;
 				break;
 			}
-		}			
+		}
 	}
 
 	//
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streak.h b/Core/Libraries/Source/WWVegas/WW3D2/streak.h
index d2c8af196f3..f0eb918425e 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/streak.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.h
@@ -34,12 +34,7 @@
  * Functions:                                                                    *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef STREAK_H
-#define STREAK_H
 
 #include "rendobj.h"
 #include "shader.h"
@@ -56,7 +51,7 @@ class TextureClass;
 **										color and precise texture tiling...
 ** The reason this does not descend from segmentedlineclass, is to streamline
 ** the upcoming merge with the LasVegas code (to keep our changes out of their code)
-*/ 
+*/
 
 class StreakLineClass : public RenderObjClass
 {
@@ -128,7 +123,7 @@ class StreakLineClass : public RenderObjClass
 		/////////////////////////////////////////////////////////////////////////////
 		// Render Object Interface - Cloning and Identification
 		/////////////////////////////////////////////////////////////////////////////
-		virtual RenderObjClass *	Clone(void) const;		
+		virtual RenderObjClass *	Clone(void) const;
 		virtual int						Class_ID(void)	const { return CLASSID_SEGLINE; }
 		virtual int						Get_Num_Polys(void) const;
 
@@ -166,10 +161,10 @@ class StreakLineClass : public RenderObjClass
 		///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 		virtual bool					Cast_Ray(RayCollisionTestClass & raytest);
 
-		void	Set_LocsWidthsColors( unsigned int num_points, 
-																Vector3 *locs, 
-																float *widths = NULL, 
-																Vector4 *colors = NULL, 
+		void	Set_LocsWidthsColors( unsigned int num_points,
+																Vector3 *locs,
+																float *widths = NULL,
+																Vector4 *colors = NULL,
 																unsigned int *personalities = NULL);
 
 
@@ -195,12 +190,12 @@ class StreakLineClass : public RenderObjClass
 		float								NormalizedScreenArea;
 
 	// Per-point location array
-	//ShareBufferClass<Vector3> *PointLocations;	
+	//ShareBufferClass<Vector3> *PointLocations;
 	SimpleDynVecClass<Vector3>	PointLocations;   // World/cameraspace point locs
 	SimpleDynVecClass<Vector4>	PointColors;   // RGBA
 	SimpleDynVecClass<float>		PointWidths;   // float line thickness
 
-	
+
 
 
 
@@ -208,13 +203,3 @@ class StreakLineClass : public RenderObjClass
 	SegLineRendererClass		LineRenderer;
 	StreakRendererClass		StreakRenderer;//special, per-point alpha/color/size
 };
-
-
-
-
-
-
-
-
-
-#endif // SEGLINE_H
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp
index 6ae932191da..2fe4daf94bb 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp
@@ -32,14 +32,9 @@
 #include "sortingrenderer.h"
 #include "vp.h"
 #include "Vector3i.h"
-#include "RANDOM.H"
+#include "RANDOM.h"
 #include "v3_rnd.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-// #pragma optimize("", off)
-// #pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 /* We have chunking logic which handles N segments at a time. To simplify the subdivision logic,
 ** we will ensure that N is a power of two and that N >= 2^MAX_STREAK_SUBDIV_LEVELS, so that the
@@ -135,16 +130,16 @@ void StreakRendererClass::Init(const W3dEmitterLinePropertiesStruct & props)
 	Set_End_Caps(props.Flags & W3D_ELINE_END_CAPS);
 
 	int texture_mode = ((props.Flags & W3D_ELINE_TEXTURE_MAP_MODE_MASK) >> W3D_ELINE_TEXTURE_MAP_MODE_OFFSET);
-	switch (texture_mode) 
+	switch (texture_mode)
 	{
 	case W3D_ELINE_UNIFORM_WIDTH_TEXTURE_MAP:
 		Set_Texture_Mapping_Mode(UNIFORM_WIDTH_TEXTURE_MAP);
 		break;
 	case W3D_ELINE_UNIFORM_LENGTH_TEXTURE_MAP:
-		Set_Texture_Mapping_Mode(UNIFORM_LENGTH_TEXTURE_MAP);		
+		Set_Texture_Mapping_Mode(UNIFORM_LENGTH_TEXTURE_MAP);
 		break;
 	case W3D_ELINE_TILED_TEXTURE_MAP:
-		Set_Texture_Mapping_Mode(TILED_TEXTURE_MAP);		
+		Set_Texture_Mapping_Mode(TILED_TEXTURE_MAP);
 		break;
 	};
 
@@ -158,8 +153,8 @@ void StreakRendererClass::Init(const W3dEmitterLinePropertiesStruct & props)
 
 
 void StreakRendererClass::Set_Texture(TextureClass *texture)
-{ 
-	REF_PTR_SET(Texture,texture); 
+{
+	REF_PTR_SET(Texture,texture);
 }
 
 TextureClass * StreakRendererClass::Get_Texture(void) const
@@ -179,7 +174,7 @@ TextureClass * StreakRendererClass::Get_Texture(void) const
 // {
 // 	if (factor > 8.0f) {
 //		factor = 8.0f;
-//		WWDEBUG_SAY(("Texture Tile Factor too large in StreakRendererClass!\r\n"));
+//		WWDEBUG_SAY(("Texture Tile Factor too large in StreakRendererClass!"));
 //	} else {
 //		factor = MAX(factor, 0.0f);
 //	}
@@ -195,7 +190,7 @@ TextureClass * StreakRendererClass::Get_Texture(void) const
 ///////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////
 void StreakRendererClass::Render
-(	
+(
 	RenderInfoClass & rinfo,
 	const Matrix3D & transform,
 	unsigned int num_points,
@@ -292,20 +287,20 @@ void StreakRendererClass::subdivision_util(unsigned int point_cnt, const Vector3
 }
 
 
-///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////     
-///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////     
-///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////     
-///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////     
-///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////     
-///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////     
-///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////     
-///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////     
-///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////     
+///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////
+///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////
+///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////
+///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////
+///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////
+///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////
+///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////
+///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////
+///////     ///////     ///////     ///////     ///////     ///////     ///////     ///////
 
 
 
 void StreakRendererClass::RenderStreak
-(	
+(
 	RenderInfoClass & rinfo,
 	const Matrix3D & transform,
 	unsigned int num_points,
@@ -320,10 +315,10 @@ void StreakRendererClass::RenderStreak
 	DX8Wrapper::Get_Transform(D3DTS_VIEW,view);
 
 	Matrix4x4 identity(true);
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,identity);	
-	DX8Wrapper::Set_Transform(D3DTS_VIEW,identity);	
+	DX8Wrapper::Set_Transform(D3DTS_WORLD,identity);
+	DX8Wrapper::Set_Transform(D3DTS_VIEW,identity);
 
-	/* 
+	/*
 	** Handle texture UV offset animation (done once for entire line).
 	*/
 	// unsigned int delta = WW3D::Get_Sync_Time() - LastUsedSyncTime;
@@ -333,7 +328,7 @@ void StreakRendererClass::RenderStreak
 	// ensure offsets are in [0, 1] range:
 	//uv_offset.X = uv_offset.X - floorf(uv_offset.X);
 	//uv_offset.Y = uv_offset.Y - floorf(uv_offset.Y);
-	
+
 	// Update state
 	//CurrentUVOffset = uv_offset;
 	// LastUsedSyncTime = WW3D::Get_Sync_Time();
@@ -359,7 +354,7 @@ void StreakRendererClass::RenderStreak
 	// chunk must be reused as the first point of the next chunk. This is also the reason we stop
 	// when chunkIndex = NumPoints - 1: the last point has already been processed in the previous
 	// iteration so we don't need another one).
-	for (unsigned int chunkIndex = 0; chunkIndex < num_points - 1; chunkIndex += (chunk_size - 1)) 
+	for (unsigned int chunkIndex = 0; chunkIndex < num_points - 1; chunkIndex += (chunk_size - 1))
 	{
 		unsigned int point_cnt = num_points - chunkIndex;
 		point_cnt = MIN(point_cnt, chunk_size);
@@ -398,25 +393,25 @@ void StreakRendererClass::RenderStreak
 		float base_tex_v[MAX_STREAK_POINT_BUFFER_SIZE];
 		float u_values[2];
 
-		
+
 		// I HAVE HARD CODED IT TO USE UNIFORM WIDTH AND LENGTH
-		for (pointIndex = 0; pointIndex < point_cnt; pointIndex++) 
+		for (pointIndex = 0; pointIndex < point_cnt; pointIndex++)
 		{
 			// All 0
 			base_tex_v[pointIndex] = 0.0f;
 		}
 		u_values[0] = 0.0f;
 		u_values[1] = 1.0f;
-		
-		
-		
-		
-		
-		
-//		switch (map_mode) 
+
+
+
+
+
+
+//		switch (map_mode)
 //		{
 //			case UNIFORM_WIDTH_TEXTURE_MAP:// only non-dead case
-//				for (pointIndex = 0; pointIndex < point_cnt; pointIndex++) 
+//				for (pointIndex = 0; pointIndex < point_cnt; pointIndex++)
 //				{
 //					// All 0
 //					base_tex_v[pointIndex] = 0.0f;
@@ -425,7 +420,7 @@ void StreakRendererClass::RenderStreak
 //				u_values[1] = 1.0f;
 //				break;
 //			case UNIFORM_LENGTH_TEXTURE_MAP:
-//				for (pointIndex = 0; pointIndex < point_cnt; pointIndex++) 
+//				for (pointIndex = 0; pointIndex < point_cnt; pointIndex++)
 //				{
 //					// Increasing V
 //					base_tex_v[pointIndex] = (float)(pointIndex + chunkIndex) * TextureTileFactor;
@@ -434,7 +429,7 @@ void StreakRendererClass::RenderStreak
 //				u_values[1] = 0.0f;
 //				break;
 //			case TILED_TEXTURE_MAP:
-//				for (pointIndex = 0; pointIndex < point_cnt; pointIndex++) 
+//				for (pointIndex = 0; pointIndex < point_cnt; pointIndex++)
 //				{
 //					// Increasing V
 //					base_tex_v[pointIndex] = (float)(pointIndex + chunkIndex) * TextureTileFactor;
@@ -479,7 +474,7 @@ void StreakRendererClass::RenderStreak
 		// Since the line has thickness, each segment has two edges. We name these 'top' and
 		// 'bottom' - note however that the top/bottom distinction does not relate to screen
 		// up/down and remains consistent throughout the segmented line.
-		enum SegmentEdge 
+		enum SegmentEdge
 		{
 			FIRST_EDGE     = 0,	// For loop conditions
 			TOP_EDGE			= 0,	// Top Edge
@@ -489,13 +484,13 @@ void StreakRendererClass::RenderStreak
 		};
 
 		bool switch_edges = false;
-		
+
 		// We have dummy segments for "before the first point" and "after the last point" - in these
 		// segments the top and bottom edge are the same - they are a perpendicular plane defined by
 		// the endpoint vertices. This is so we can merge intersections properly for the first and
 		// last points.
 
-		struct LineSegment 
+		struct LineSegment
 		{
 			Vector3	StartPlane;
 			Vector3	EdgePlane[NUM_EDGES];
@@ -505,7 +500,7 @@ void StreakRendererClass::RenderStreak
 		LineSegment segment[MAX_STREAK_POINT_BUFFER_SIZE + 1];
 
 		// Intersections. This has data for two edges (top or bottom) intersecting.
-		struct LineSegmentIntersection  
+		struct LineSegmentIntersection
 		{
 			unsigned int	PointCount;			// How many points does this intersection represent
 			unsigned int	NextSegmentID;		// ID of segment after this intersection
@@ -517,7 +512,7 @@ void StreakRendererClass::RenderStreak
 		};
 
 		// Used to calculate the edge planes
-		float radius = Width * 0.5f; 
+		float radius = Width * 0.5f;
 
 
 		// The number of intersections is the number of points minus 2. However, we store
@@ -532,7 +527,7 @@ void StreakRendererClass::RenderStreak
 
 
 
-		for (segmentIndex = 1; segmentIndex < point_cnt; segmentIndex++) 
+		for (segmentIndex = 1; segmentIndex < point_cnt; segmentIndex++)
 		{	// #segments = #points - 1 (+ 2 dummy segments)
 
 			radius = widths[segmentIndex]; /// NEW ///// // TODO: Does not work correctly when subdivision are not 0
@@ -576,7 +571,7 @@ void StreakRendererClass::RenderStreak
 			// between the planes defined by each line segment and the eyepoint) is less than 90
 			// degrees, switch the top and bottom edges for the current and subsequent segments and
 			// mark the intersection as having a fold
-			if (segmentIndex > 1) 
+			if (segmentIndex > 1)
 			{
 
 				Vector3 prev_plane;
@@ -587,20 +582,20 @@ void StreakRendererClass::RenderStreak
 				Vector3::Cross_Product(curr_point, next_point, &curr_plane);
 				curr_plane.Normalize();
 
-				if (Vector3::Dot_Product(prev_plane, curr_plane) < 0.0f) 
+				if (Vector3::Dot_Product(prev_plane, curr_plane) < 0.0f)
 				{
 					switch_edges = !switch_edges;
 					intersection[segmentIndex][TOP_EDGE].Fold = true;
 					intersection[segmentIndex][BOTTOM_EDGE].Fold = true;
-				} 
-				else 
+				}
+				else
 				{
 					intersection[segmentIndex][TOP_EDGE].Fold = false;
 					intersection[segmentIndex][BOTTOM_EDGE].Fold = false;
 				}
 			}
 
-			if (switch_edges) 
+			if (switch_edges)
 			{
 				// We switch signs so the normals will always point inwards
 				segment[segmentIndex].EdgePlane[TOP_EDGE] = -bottom_normal;
@@ -672,17 +667,17 @@ void StreakRendererClass::RenderStreak
 		bottom = first_point - first_plane[BOTTOM_EDGE] * Vector3::Dot_Product(first_plane[BOTTOM_EDGE], first_point);
 		bottom.Normalize();
 		intersection[1][BOTTOM_EDGE].Direction = bottom;
-		
+
 		Vector3 segdir = points[1] - points[0];
 		segdir.Normalize();	// Is this needed? Probably not - remove later when all works
 		Vector3 start_pl;
 		Vector3::Cross_Product(top, bottom, &start_pl);
 		start_pl.Normalize();
 		float dp = Vector3::Dot_Product(segdir, start_pl);
-		if (dp > 0.0f) 
+		if (dp > 0.0f)
 		{
 			segment[0].StartPlane = segment[0].EdgePlane[TOP_EDGE] = segment[0].EdgePlane[BOTTOM_EDGE] = start_pl;
-		} 
+		}
 		else
 		{
 			segment[0].StartPlane = segment[0].EdgePlane[TOP_EDGE] = segment[0].EdgePlane[BOTTOM_EDGE] = -start_pl;
@@ -718,18 +713,18 @@ void StreakRendererClass::RenderStreak
 		bottom = last_point - last_plane[BOTTOM_EDGE] * Vector3::Dot_Product(last_plane[BOTTOM_EDGE], last_point);
 		bottom.Normalize();
 		intersection[last_isec][BOTTOM_EDGE].Direction = bottom;
-		
+
 		segdir = points[point_cnt - 1] - points[point_cnt - 2];
 		segdir.Normalize();	// Is this needed? Probably not - remove later when all works
 		Vector3::Cross_Product(top, bottom, &start_pl);
 		start_pl.Normalize();
 		dp = Vector3::Dot_Product(segdir, start_pl);
-		if (dp > 0.0f) 
+		if (dp > 0.0f)
 		{
 			segment[numsegs + 1].StartPlane = segment[numsegs + 1].EdgePlane[TOP_EDGE] =
 				segment[numsegs + 1].EdgePlane[BOTTOM_EDGE] = start_pl;
-		} 
-		else 
+		}
+		else
 		{
 			segment[numsegs + 1].StartPlane = segment[numsegs + 1].EdgePlane[TOP_EDGE] =
 				segment[numsegs + 1].EdgePlane[BOTTOM_EDGE] = -start_pl;
@@ -746,7 +741,7 @@ void StreakRendererClass::RenderStreak
 
 		float vdp;
 
-		for (intersectionIndex = 2; intersectionIndex < num_intersections[TOP_EDGE]; intersectionIndex++) 
+		for (intersectionIndex = 2; intersectionIndex < num_intersections[TOP_EDGE]; intersectionIndex++)
 		{
 
 			// Relevant midpoint:
@@ -759,14 +754,14 @@ void StreakRendererClass::RenderStreak
 			intersection[intersectionIndex][TOP_EDGE].Point = midpoint;
 
 //			intersection[intersectionIndex][TOP_EDGE].TexV = mid_tex_v;
-			intersection[intersectionIndex][TOP_EDGE].TexV = personalities[intersectionIndex]&1;//LORENZEN LORENZEN 
+			intersection[intersectionIndex][TOP_EDGE].TexV = personalities[intersectionIndex]&1;//LORENZEN LORENZEN
 
 			intersection[intersectionIndex][BOTTOM_EDGE].PointCount = 1;
 			intersection[intersectionIndex][BOTTOM_EDGE].NextSegmentID = intersectionIndex;
 			intersection[intersectionIndex][BOTTOM_EDGE].Point = midpoint;
 
 //			intersection[intersectionIndex][BOTTOM_EDGE].TexV = mid_tex_v;
-			intersection[intersectionIndex][BOTTOM_EDGE].TexV = personalities[intersectionIndex]&1;//LORENZEN LORENZEN 
+			intersection[intersectionIndex][BOTTOM_EDGE].TexV = personalities[intersectionIndex]&1;//LORENZEN LORENZEN
 
 			// Intersection calculation: if the top/bottom planes of both adjoining segments are not
 			// very close to being parallel, intersect them to get top/bottom intersection lines. If
@@ -775,7 +770,7 @@ void StreakRendererClass::RenderStreak
 
 			// Top:
 			vdp = Vector3::Dot_Product(segment[intersectionIndex - 1].EdgePlane[TOP_EDGE], segment[intersectionIndex].EdgePlane[TOP_EDGE]);
-			if (fabs(vdp) < parallel_factor) 
+			if (fabs(vdp) < parallel_factor)
 			{
 
 				// Not parallel - intersect planes to get line (get vector, normalize it, ensure it is
@@ -783,26 +778,26 @@ void StreakRendererClass::RenderStreak
 				Vector3::Cross_Product(segment[intersectionIndex - 1].EdgePlane[TOP_EDGE], segment[intersectionIndex].EdgePlane[TOP_EDGE],
 					&(intersection[intersectionIndex][TOP_EDGE].Direction));
 				intersection[intersectionIndex][TOP_EDGE].Direction.Normalize();
-				if (Vector3::Dot_Product(intersection[intersectionIndex][TOP_EDGE].Direction, midpoint) < 0.0f) 
+				if (Vector3::Dot_Product(intersection[intersectionIndex][TOP_EDGE].Direction, midpoint) < 0.0f)
 				{
 					intersection[intersectionIndex][TOP_EDGE].Direction = -intersection[intersectionIndex][TOP_EDGE].Direction;
 				}
 
 				intersection[intersectionIndex][TOP_EDGE].Parallel = false;
 
-			} 
-			else 
+			}
+			else
 			{
 
 				// Parallel (or almost): find point on av. plane closest to midpoint, convert to line
 
 				// Ensure average calculation is numerically stable:
 				Vector3 pl;
-				if (vdp > 0.0f) 
+				if (vdp > 0.0f)
 				{
 					pl = segment[intersectionIndex - 1].EdgePlane[TOP_EDGE] + segment[intersectionIndex].EdgePlane[TOP_EDGE];
-				} 
-				else 
+				}
+				else
 				{
 					pl = segment[intersectionIndex - 1].EdgePlane[TOP_EDGE] - segment[intersectionIndex].EdgePlane[TOP_EDGE];
 				}
@@ -816,7 +811,7 @@ void StreakRendererClass::RenderStreak
 
 			// Bottom:
 			vdp = Vector3::Dot_Product(segment[intersectionIndex - 1].EdgePlane[BOTTOM_EDGE], segment[intersectionIndex].EdgePlane[BOTTOM_EDGE]);
-			if (fabs(vdp) < parallel_factor) 
+			if (fabs(vdp) < parallel_factor)
 			{
 
 				// Not parallel - intersect planes to get line (get vector, normalize it, ensure it is
@@ -824,26 +819,26 @@ void StreakRendererClass::RenderStreak
 				Vector3::Cross_Product(segment[intersectionIndex - 1].EdgePlane[BOTTOM_EDGE], segment[intersectionIndex].EdgePlane[BOTTOM_EDGE],
 					&(intersection[intersectionIndex][BOTTOM_EDGE].Direction));
 				intersection[intersectionIndex][BOTTOM_EDGE].Direction.Normalize();
-				if (Vector3::Dot_Product(intersection[intersectionIndex][BOTTOM_EDGE].Direction, midpoint) < 0.0f) 
+				if (Vector3::Dot_Product(intersection[intersectionIndex][BOTTOM_EDGE].Direction, midpoint) < 0.0f)
 				{
 					intersection[intersectionIndex][BOTTOM_EDGE].Direction = -intersection[intersectionIndex][BOTTOM_EDGE].Direction;
 				}
 
 				intersection[intersectionIndex][BOTTOM_EDGE].Parallel = false;
 
-			} 
-			else 
+			}
+			else
 			{
 
 				// Parallel (or almost): find point on av. plane closest to midpoint, convert to line
 
 				// Ensure average calculation is numerically stable:
 				Vector3 pl;
-				if (vdp > 0.0f) 
+				if (vdp > 0.0f)
 				{
 					pl = segment[intersectionIndex - 1].EdgePlane[BOTTOM_EDGE] + segment[intersectionIndex].EdgePlane[BOTTOM_EDGE];
-				} 
-				else 
+				}
+				else
 				{
 					pl = segment[intersectionIndex - 1].EdgePlane[BOTTOM_EDGE] - segment[intersectionIndex].EdgePlane[BOTTOM_EDGE];
 				}
@@ -859,16 +854,16 @@ void StreakRendererClass::RenderStreak
 			Vector3::Cross_Product(intersection[intersectionIndex][TOP_EDGE].Direction, intersection[intersectionIndex][BOTTOM_EDGE].Direction, &start_pl);
 			start_pl.Normalize();
 			dp = Vector3::Dot_Product(segment[intersectionIndex].StartPlane, start_pl);
-			if (dp > 0.0f) 
+			if (dp > 0.0f)
 			{
 				segment[intersectionIndex].StartPlane = start_pl;
-			} 
-			else 
+			}
+			else
 			{
 				segment[intersectionIndex].StartPlane = -start_pl;
 			}
 
-		}	// for intersectionIndex
+		}
 
 
 		/*
@@ -877,7 +872,7 @@ void StreakRendererClass::RenderStreak
 		** caused by the polys folding over on themselves.
 		*/
 
-		if (Is_Merge_Intersections()) 
+		if (Is_Merge_Intersections())
 		{
 
 			// Since we are merging the intersections in-place, we have two index variables, a "read
@@ -888,14 +883,14 @@ void StreakRendererClass::RenderStreak
 			// The merges will be repeated in multiple passes until none are performed. The reason
 			// for this is that one merge may cause the need for another merge elsewhere.
 			bool merged = true;
-			
-			while (merged) 
+
+			while (merged)
 			{
 
 				merged = false;
 
 				SegmentEdge edge;
-				for (edge = FIRST_EDGE; edge <= MAX_EDGE; edge = (SegmentEdge)((int)edge + 1)) 
+				for (edge = FIRST_EDGE; edge <= MAX_EDGE; edge = (SegmentEdge)((int)edge + 1))
 				{
 					// Merge top and bottom edge intersections: loop through the intersections from the
 					// first intersection to the penultimate intersection, for each intersection check
@@ -933,7 +928,7 @@ void StreakRendererClass::RenderStreak
 										(Vector3::Dot_Product(curr_int->Direction, next_seg->EdgePlane[edge]) > 0.0f )) ||
 									(!curr_int->Fold &&
 										(Vector3::Dot_Product(next_int->Direction, -curr_seg->StartPlane) > 0.0f) &&
-										(Vector3::Dot_Product(next_int->Direction, prev_seg->EdgePlane[edge]) > 0.0f )) ) 
+										(Vector3::Dot_Product(next_int->Direction, prev_seg->EdgePlane[edge]) > 0.0f )) )
 						{
 
 							// First calculate location of merged intersection - this is so we can abort
@@ -951,22 +946,22 @@ void StreakRendererClass::RenderStreak
 							bool new_parallel;
 							Vector3 new_direction;
 							vdp = Vector3::Dot_Product(prev_seg->EdgePlane[edge], next_seg->EdgePlane[edge]);
-							if (fabs(vdp) < parallel_factor) 
+							if (fabs(vdp) < parallel_factor)
 							{
 
 								// Not parallel - intersect planes to get line (get vector, normalize it,
 								// ensure it is pointing towards the current point)
 								Vector3::Cross_Product(prev_seg->EdgePlane[edge], next_seg->EdgePlane[edge], &new_direction);
 								new_direction.Normalize();
-								if (Vector3::Dot_Product(new_direction, new_point) < 0.0f) 
+								if (Vector3::Dot_Product(new_direction, new_point) < 0.0f)
 								{
 									new_direction = -new_direction;
 								}
 
 								new_parallel = false;
 
-							} 
-							else 
+							}
+							else
 							{
 
 								// Parallel (or almost). If the current intersection is not parallel, take
@@ -977,21 +972,21 @@ void StreakRendererClass::RenderStreak
 
 								// Ensure average calculation is numerically stable:
 								Vector3 pl;
-								if (vdp > 0.0f) 
+								if (vdp > 0.0f)
 								{
 									pl = prev_seg->EdgePlane[edge] + next_seg->EdgePlane[edge];
-								} 
-								else 
+								}
+								else
 								{
 									pl = prev_seg->EdgePlane[edge] - next_seg->EdgePlane[edge];
 								}
 								pl.Normalize();
 
-								if (curr_int->Parallel) 
+								if (curr_int->Parallel)
 								{
 									new_direction = new_direction - pl * Vector3::Dot_Product(pl, new_direction);
 									new_direction.Normalize();
-								} 
+								}
 								else
 								{
 									Vector3::Cross_Product(curr_seg->EdgePlane[edge], pl, &new_direction);
@@ -1004,7 +999,7 @@ void StreakRendererClass::RenderStreak
 							// Now check to see if the merge caused any funky results - if so abort it.
 							// Currently we check to see if the distance of the direction from the two
 							// points is larger than the radius times the merge_abort factor.
-							if (MergeAbortFactor > 0.0f) 
+							if (MergeAbortFactor > 0.0f)
 							{
 								float abort_dist = radius * MergeAbortFactor;
 								float abort_dist2 = abort_dist * abort_dist;
@@ -1034,7 +1029,7 @@ void StreakRendererClass::RenderStreak
 							intersectionIndex_r++;
 
 							// If we are at the end then break:
-							if (intersectionIndex_r == num_isects) 
+							if (intersectionIndex_r == num_isects)
 							{
 								break;
 							}
@@ -1043,7 +1038,7 @@ void StreakRendererClass::RenderStreak
 							next_int = &(intersection[intersectionIndex_r + 1][edge]);
 							next_seg = &(segment[next_int->NextSegmentID]);
 
-						}	// while <merging needed>
+						}
 
 						// Copy from "read index" to "write index"
 						write_int->PointCount		= curr_int->PointCount;
@@ -1053,12 +1048,12 @@ void StreakRendererClass::RenderStreak
 						write_int->Direction			= curr_int->Direction;
 						write_int->Fold				= curr_int->Fold;
 
-					}	// for intersectionIndex
+					}
 
 					// If intersectionIndex_r is exactly equal to num_isects (rather than being larger by one) at this
 					// point, this means that the last intersection was not merged with the previous one. In
 					// this case, we need to do one last copy:
-					if (intersectionIndex_r == num_isects) 
+					if (intersectionIndex_r == num_isects)
 					{
 						LineSegmentIntersection *write_int = &(intersection[intersectionIndex_w][edge]);
 						LineSegmentIntersection *curr_int = &(intersection[intersectionIndex_r][edge]);
@@ -1073,16 +1068,16 @@ void StreakRendererClass::RenderStreak
 #ifdef ENABLE_WWDEBUGGING
 					// Testing code - ensure total PointCount fits the number of points
 					unsigned int total_cnt = 0;
-					for (unsigned int nidx = 0; nidx <= num_intersections[edge]; nidx++) 
+					for (unsigned int nidx = 0; nidx <= num_intersections[edge]; nidx++)
 					{
 						total_cnt += intersection[nidx][edge].PointCount;
 					}
 					assert(total_cnt == point_cnt);
 #endif
 
-				}	// for edge
-			}	// while (merged)
-		}	// if (Is_Merge_Intersections())
+				}
+			}
+		}
 
 		/*
 		** Find vertex positions, generate vertices and triangles:
@@ -1092,10 +1087,10 @@ void StreakRendererClass::RenderStreak
 		*/
 
 		// Configure vertex array and setup renderer.
-		unsigned int vnum = num_intersections[TOP_EDGE] + num_intersections[BOTTOM_EDGE];		
+		unsigned int vnum = num_intersections[TOP_EDGE] + num_intersections[BOTTOM_EDGE];
 		VertexFormatXYZUV1 *vertexArray = getVertexBuffer(vnum);
 		Vector3i v_index_array[MAX_STREAK_POLY_BUFFER_SIZE];
-		
+
 		// Vertex and triangle indices
 		unsigned int vertexIndex = 0;
 		unsigned int triangleIndex = 0;
@@ -1131,7 +1126,7 @@ void StreakRendererClass::RenderStreak
 		vertexArray[vertexIndex].u1 = u_values[1] ;
 		vertexArray[vertexIndex].v1 = intersection[1][BOTTOM_EDGE].TexV ;
 		vertexIndex++;
-		
+
 		unsigned int last_top_vertexIndex = 0;
 		unsigned int last_bottom_vertexIndex = 1;
 
@@ -1148,10 +1143,10 @@ void StreakRendererClass::RenderStreak
 		residual_bottom_points -= delta;
 		pointIndex += delta;
 
-		for (; ; ) 
+		for (; ; )
 		{
 
-			if (residual_top_points == 1 && residual_bottom_points == 1) 
+			if (residual_top_points == 1 && residual_bottom_points == 1)
 			{
 				// Advance both intersections, creating a tristrip segment
 				v_index_array[triangleIndex].I = last_top_vertexIndex;
@@ -1193,10 +1188,10 @@ void StreakRendererClass::RenderStreak
 				vertexArray[vertexIndex].v1 = intersection[bottom_int_idx][BOTTOM_EDGE].TexV ;
 				vertexIndex++;
 			}
-			else 
+			else
 			{
 				// Exactly one of the pointcounts is greater than one - advance it and draw one triangle
-				if (residual_top_points > 1) 
+				if (residual_top_points > 1)
 				{
 					// Draw one triangle (fan segment)
 					v_index_array[triangleIndex].I = last_top_vertexIndex;
@@ -1221,10 +1216,10 @@ void StreakRendererClass::RenderStreak
 					vertexArray[vertexIndex].y = bottom.Y;
 					vertexArray[vertexIndex].z = bottom.Z;
 					vertexArray[vertexIndex].u1 = u_values[1] ;
-					vertexArray[vertexIndex].v1 = intersection[bottom_int_idx][BOTTOM_EDGE].TexV ;					
+					vertexArray[vertexIndex].v1 = intersection[bottom_int_idx][BOTTOM_EDGE].TexV ;
 					vertexIndex++;
 				}
-				else 
+				else
 				{
 
 					// residual_bottom_points > 1
@@ -1263,7 +1258,7 @@ void StreakRendererClass::RenderStreak
 			pointIndex += delta;
 			// Exit conditions
 			if (	(top_int_idx >= num_intersections[TOP_EDGE] && residual_top_points == 1) ||
-					(bottom_int_idx >= num_intersections[BOTTOM_EDGE] && residual_bottom_points == 1)) 
+					(bottom_int_idx >= num_intersections[BOTTOM_EDGE] && residual_bottom_points == 1))
 			{
 				// Debugging check - if either intersection index is before end, both of them should be
 				// and the points should be before the end.
@@ -1272,7 +1267,7 @@ void StreakRendererClass::RenderStreak
 				assert(pointIndex == point_cnt - 1);
 				break;
 			}
-		}		
+		}
 
 
 
@@ -1280,14 +1275,14 @@ void StreakRendererClass::RenderStreak
 		/*
 		** Set color, opacity, vertex flags:
 		*/
-		
-		// If color is not white or opacity not 100%, enable gradient in shader and in renderer - otherwise disable.		
+
+		// If color is not white or opacity not 100%, enable gradient in shader and in renderer - otherwise disable.
 		//unsigned int rgba;
 		//rgba=DX8Wrapper::Convert_Color(Color,Opacity);
 		//bool rgba_all=(rgba==0xFFFFFFFF);
 
 //		int colorIndex = 0;
-//		for (vertexIndex = 0; vertexIndex < vnum; vertexIndex++)	
+//		for (vertexIndex = 0; vertexIndex < vnum; vertexIndex++)
 //		{
 //			//vertexArray[vertexIndex].diffuse = rgba;/// OLD WAY COLORS THEM ALL TO THE COLOR,OPACITY MEMBERS /////////////////
 //			unsigned int perPointARGB;
@@ -1305,19 +1300,19 @@ void StreakRendererClass::RenderStreak
 		///////////////////////////////////////////////////////////////////////////////////////
 		ShaderClass shader = Shader;
 		shader.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);
-		shader.Set_Primary_Gradient(ShaderClass::GRADIENT_MODULATE);			
+		shader.Set_Primary_Gradient(ShaderClass::GRADIENT_MODULATE);
 
-		VertexMaterialClass *mat;		
+		VertexMaterialClass *mat;
 		mat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 		DX8Wrapper::Set_Material(mat);
 		REF_PTR_RELEASE(mat);
 
 		// If Texture is non-NULL enable texturing in shader - otherwise disable.
-		if (Texture) 
+		if (Texture)
 		{
-			shader.Set_Texturing(ShaderClass::TEXTURING_ENABLE);			
-		} 
-		else 
+			shader.Set_Texturing(ShaderClass::TEXTURING_ENABLE);
+		}
+		else
 		{
 			shader.Set_Texturing(ShaderClass::TEXTURING_DISABLE);
 		}
@@ -1326,15 +1321,15 @@ void StreakRendererClass::RenderStreak
 
 		/*
 		** Render
-		*/		
-		
+		*/
+
 		DynamicVBAccessClass Verts((sorting?BUFFER_TYPE_DYNAMIC_SORTING:BUFFER_TYPE_DYNAMIC_DX8),dynamic_fvf_type,vnum);
 		// Copy in the data to the  VB
 		{
 			DynamicVBAccessClass::WriteLockClass Lock(&Verts);
 			unsigned int i;
-			unsigned char *vb=(unsigned char*)Lock.Get_Formatted_Vertex_Array();			
-			const FVFInfoClass& fvfinfo=Verts.FVF_Info();			
+			unsigned char *vb=(unsigned char*)Lock.Get_Formatted_Vertex_Array();
+			const FVFInfoClass& fvfinfo=Verts.FVF_Info();
 			int segIdx = 0;
 			unsigned int argb = 0x00000000;
 
@@ -1359,10 +1354,10 @@ void StreakRendererClass::RenderStreak
 				Vector2 *texture = reinterpret_cast<Vector2 *>(vb + textureOffset);
 				texture->U = vertexArray[i].u1;
 				texture->V = vertexArray[i].v1;
-				vb += vbSize;				
-			}			
-		} // copy
-		
+				vb += vbSize;
+			}
+		}
+
 		DynamicIBAccessClass ib_access((sorting?BUFFER_TYPE_DYNAMIC_SORTING:BUFFER_TYPE_DYNAMIC_DX8),triangleIndex*3);
 		{
 			unsigned int i;
@@ -1377,22 +1372,22 @@ void StreakRendererClass::RenderStreak
 			}
 		}
 
-	
+
 		DX8Wrapper::Set_Index_Buffer(ib_access,0);
-		DX8Wrapper::Set_Vertex_Buffer(Verts);				
+		DX8Wrapper::Set_Vertex_Buffer(Verts);
 		DX8Wrapper::Set_Texture(0,Texture);
 		DX8Wrapper::Set_Shader(shader);
 
-		if (sorting) 
-		{	
+		if (sorting)
+		{
 			SortingRendererClass::Insert_Triangles(obj_sphere,0,triangleIndex,0,vnum);
-		} 
-		else 
+		}
+		else
 		{
 			DX8Wrapper::Draw_Triangles(0,triangleIndex,0,vnum);
 		}
-		
-	}	// Chunking loop
+
+	}
 
 	DX8Wrapper::Set_Transform(D3DTS_VIEW,view);
 
@@ -1410,11 +1405,11 @@ VertexFormatXYZUV1 *StreakRendererClass::getVertexBuffer(unsigned int number)
 	{
 		unsigned int numberToAlloc = number + (number >> 1);
 	  delete [] m_vertexBuffer;
-		m_vertexBuffer = W3DNEWARRAY VertexFormatXYZUV1[numberToAlloc];		
+		m_vertexBuffer = W3DNEWARRAY VertexFormatXYZUV1[numberToAlloc];
 		m_vertexBufferSize = numberToAlloc;
 	}
 
-#ifdef RTS_INTERNAL
+#ifdef RTS_DEBUG
 	for (unsigned i = 0; i < number; ++i)
 	{
 	  m_vertexBuffer[i].x = m_vertexBuffer[i].y = m_vertexBuffer[i].z = m_vertexBuffer[i].u1 = m_vertexBuffer[i].v1 = (float)0xdeadbeef;
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h
index 948b67f44da..a51033d565c 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h
@@ -36,8 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef STREAKRENDER_H
-#define STREAKRENDER_H
+#pragma once
 
 #include "always.h"
 #include "shader.h"
@@ -121,7 +120,7 @@ class StreakRendererClass
 
 	void					Reset_Line(void);
 
-	
+
 	void	Render(	RenderInfoClass & rinfo,
 								const Matrix3D & transform,
 								unsigned int point_count,
@@ -150,9 +149,9 @@ class StreakRendererClass
 	float								Width;
 	Vector3							Color;
 	float								Opacity;
-	
+
 	// Subdivision properties
-	unsigned int					SubdivisionLevel;	
+	unsigned int					SubdivisionLevel;
 	float								NoiseAmplitude;
 
 	// If >0, will abort a merge which causes an intersection to move
@@ -166,10 +165,10 @@ class StreakRendererClass
 	// float								TextureTileFactor;
 
 	// Used for texture coordinate animation
-	// unsigned int					LastUsedSyncTime;		// Last sync time used	
+	// unsigned int					LastUsedSyncTime;		// Last sync time used
 	// Vector2							CurrentUVOffset;		// Current UV offset
 	// Vector2							UVOffsetDeltaPerMS;	// Amount to increase offset each millisec
-	
+
 	// Various flags
 	enum BitShiftOffsets {
 		TEXTURE_MAP_MODE_OFFSET = 24	// By how many bits do I need to shift the texture mapping mode?
@@ -198,8 +197,8 @@ class StreakRendererClass
 
 
 inline StreakRendererClass::TextureMapMode StreakRendererClass::Get_Texture_Mapping_Mode(void) const
-{ 
-	return (TextureMapMode)((Bits & TEXTURE_MAP_MODE_MASK) >> TEXTURE_MAP_MODE_OFFSET); 
+{
+	return (TextureMapMode)((Bits & TEXTURE_MAP_MODE_MASK) >> TEXTURE_MAP_MODE_OFFSET);
 }
 
 inline void StreakRendererClass::Set_Texture_Mapping_Mode(StreakRendererClass::TextureMapMode mode)
@@ -209,7 +208,7 @@ inline void StreakRendererClass::Set_Texture_Mapping_Mode(StreakRendererClass::T
 }
 
 // inline Vector2 StreakRendererClass::Get_UV_Offset_Rate(void) const
-// {	
+// {
 // 	return UVOffsetDeltaPerMS * 1000.0f;
 // }
 
@@ -222,6 +221,3 @@ inline void StreakRendererClass::Reset_Line(void)
 {
 	// Empty
 }
-
-#endif //STREAKRENDER_H
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.cpp
index b1d2db960ac..fdec676476a 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.cpp
@@ -64,16 +64,16 @@ template <class T> inline void Quick_Sort (T* a, int l, int r)
 	T			v = a[r];
 	int			i = l-1;
 	int			j = r;
-	do 
+	do
 	{
 		do { i++; } while (i < r && a[i] < v);
 		do { j--; } while (j > 0 && a[j] > v);
 		swap(a[i],a[j]);
 	} while (j > i);
-	
+
 	T t     = a[j];
-	a[j]	= a[i];	  
-	a[i]	= a[r];		
+	a[j]	= a[i];
+	a[i]	= a[r];
 	a[r]	= t;
 	if ((i-1) > l)
 		Quick_Sort (a,l,i-1);
@@ -116,7 +116,7 @@ int StripOptimizerClass::Get_Strip_Index_Count (const int* strips, int strip_cou
  *
  * Function:		StripOptimizerClass::optimizeStripOrder()
  *
- * Description:		
+ * Description:
  *
  * Parameters:
  *
@@ -158,7 +158,7 @@ void StripOptimizerClass::Optimize_Strip_Order (int* strips, int strip_count)
 	if (strip_count <= 0)
 		return;
 //	WWASSERT(strips);
-	
+
 	int**	ss = W3DNEWARRAY int*[strip_count];							// pointers to beginning of strips
 	int* s = strips;
 	int i = 0;
@@ -169,7 +169,7 @@ void StripOptimizerClass::Optimize_Strip_Order (int* strips, int strip_count)
 		s+=len;					// skip
 	}
 	int outSize = Get_Strip_Index_Count(strips, strip_count)+strip_count;	// output memory alloc size
-	int* out	= W3DNEWARRAY int[outSize];	
+	int* out	= W3DNEWARRAY int[outSize];
 	int* o		= out;											// output pointer
 
 	const int* prev = ss[0];								// previous strip
@@ -213,7 +213,7 @@ void StripOptimizerClass::Optimize_Strip_Order (int* strips, int strip_count)
  *
  * Function:		StripOptimizerClass::optimizeTriangleOrder()
  *
- * Description:		
+ * Description:
  *
  * Parameters:
  *
@@ -283,7 +283,7 @@ void StripOptimizerClass::Optimize_Triangle_Order (int *tris, int triangle_count
 			break;
 
 		*o++ = *t[bestIndex];
-		prev = t[bestIndex];								
+		prev = t[bestIndex];
 		t[bestIndex] = NULL;
 	}
 
@@ -330,7 +330,7 @@ int* StripOptimizerClass::Combine_Strips (const int* strips, int strip_count)
 		if (i != 0)
 		{
 			*o++ = *strips;						// duplicate first
-		
+
 			if (!prevEven)
 				*o++ = *strips;
 		}
@@ -360,7 +360,7 @@ namespace Strip
 /*****************************************************************************
  *
  * Struct:			Vector3i
- * 
+ *
  * Description:		Internal class for representing an edge
  *
  *****************************************************************************/
@@ -379,7 +379,7 @@ struct Vector3i
 /*****************************************************************************
  *
  * Struct:			Edge
- * 
+ *
  * Description:		Internal class for representing an edge
  *
  *****************************************************************************/
@@ -397,16 +397,16 @@ struct Edge
 /*****************************************************************************
  *
  * Struct:			Triangle
- * 
- * Description:		Internal class for representing a triangle and 
+ *
+ * Description:		Internal class for representing a triangle and
  *					associated connectivity information
  *
  *****************************************************************************/
 
 struct Triangle
 {
-	Triangle (void)					
-	{ 
+	Triangle (void)
+	{
 		m_neighbors[0] = 0;
 		m_neighbors[1] = 0;
 		m_neighbors[2] = 0;
@@ -433,7 +433,7 @@ struct Triangle
 /*****************************************************************************
  *
  * Class:			TriangleQueue
- * 
+ *
  * Description:		Internal class for maintaining triangles sorted by
  *					connectivity
  *
@@ -460,7 +460,7 @@ class TriangleQueue
 /*****************************************************************************
  *
  * Class:			Stripify
- * 
+ *
  * Description:		Class for performing stripification
  *
  *****************************************************************************/
@@ -481,7 +481,7 @@ class Stripify
 };
 
 int Stripify::s_mod[6] = {0,1,2,0,1,2};
-} // Strip
+}
 
 
 template <> inline unsigned int HashTemplateKeyClass<Strip::Edge>::Get_Hash_Value(const Strip::Edge& s)
@@ -522,10 +522,10 @@ inline Triangle* TriangleQueue::getTop	(void) const
  *
  *****************************************************************************/
 
-inline int	TriangleQueue::getVertexConnectivity (int i)  const  
-{ 
-	WWASSERT(i>=0 && i< m_vertexCount); 
-	return m_nodeConnectivity[i]; 
+inline int	TriangleQueue::getVertexConnectivity (int i)  const
+{
+	WWASSERT(i>=0 && i< m_vertexCount);
+	return m_nodeConnectivity[i];
 }
 
 /*****************************************************************************
@@ -568,7 +568,7 @@ inline void TriangleQueue::reinsert (Triangle* t)
 	}
 
 	if (t->m_next)
-		t->m_next->m_prev = t->m_prev;			
+		t->m_next->m_prev = t->m_prev;
 
 	t->m_prev = 0;
 	t->m_next = m_bin[w];
@@ -602,7 +602,7 @@ inline void TriangleQueue::removeTriangle	(Triangle* t)
 	}
 
 	if (t->m_next)
-		t->m_next->m_prev = t->m_prev;			
+		t->m_next->m_prev = t->m_prev;
 	t->m_bin = -1;
 
 	// update connectivity of t's neighbors
@@ -669,7 +669,7 @@ inline TriangleQueue::TriangleQueue	(Triangle* tris, int N)
 	}
 
 	m_vertexCount	   = largestIndex+1;
-	m_nodeConnectivity = W3DNEWARRAY int[m_vertexCount];			// 
+	m_nodeConnectivity = W3DNEWARRAY int[m_vertexCount];			//
 	for (i = 0; i < m_vertexCount; i++)
 		m_nodeConnectivity[i]  = 0;
 
@@ -677,7 +677,7 @@ inline TriangleQueue::TriangleQueue	(Triangle* tris, int N)
 	for (i = 0; i < N; i++)
 	{
 		Triangle* t = tris+i;
-		int w = t->getConnectivity();			
+		int w = t->getConnectivity();
 		WWASSERT(w>=0 && w <=3);
 		WWASSERT(!t->m_prev && !t->m_next && t->m_bin==-1);	// must not be in a bin
 		t->m_prev = 0;
@@ -722,7 +722,7 @@ inline Vector3i Stripify::getTriangleNodeConnectivityWeights (const TriangleQueu
 	for (i = 0; i < 3; i++) {
 		if (weight[0] == highestVal) v[i] = +1;
 	}
-		
+
 	return v;
 }
 
@@ -749,10 +749,10 @@ Triangle* Stripify::generateTriangleList (const Vector3i* inTris, int N)
 	int			i;
 
 	//--------------------------------------------------------------------
-	// Copy triangle vertex data 
+	// Copy triangle vertex data
 	//--------------------------------------------------------------------
 
-	for (i = 0; i < N; i++)				
+	for (i = 0; i < N; i++)
 	{
 		//--------------------------------------------------------------------
 		// We could perform random rotation here (this way we don't need random
@@ -779,7 +779,7 @@ Triangle* Stripify::generateTriangleList (const Vector3i* inTris, int N)
 			Edge	edge	= tris[i].getEdge(j);
 			Edge	e		= edge;
 			e.sort();													// sort vertices (smaller first)
-			
+
 			Triangle* n = hash.Get(e);
 			if (n)														// if edge is already in the hash...
 			{
@@ -869,7 +869,7 @@ int* Stripify::stripify  (const Vector3i* inTris, int N)
 		int		bestWeight	= 0x7fffffff;								// initialize to maximum width
 
 		Vector3i nodeWeights = getTriangleNodeConnectivityWeights(queue, *t);
-		
+
 		for (int i = 0; i < 3; i++)
 		if (t->m_neighbors[i])											// if triangle has a neighbor in this direction
 		{
@@ -894,7 +894,7 @@ int* Stripify::stripify  (const Vector3i* inTris, int N)
 		for (;;)
 		{
 			Triangle* next = 0;											// find next triangle
-		
+
 			int i;
 			for (i = 0; i < 3; i++)
 			if (t->m_neighbors[i])
@@ -921,13 +921,13 @@ int* Stripify::stripify  (const Vector3i* inTris, int N)
 			//--------------------------------------------------------------------
 			// Find out where we want to continue...
 			//--------------------------------------------------------------------
-	
+
 			int		bestEdge	= -1;
 			int		bestWeight	= 0x7fffffff;
 			bool	bestSwap	= false;
 
 			Vector3i nodeWeights = getTriangleNodeConnectivityWeights(queue, *next);
-			
+
 			for (i = 0; i < 3; i++)
 			if (next->m_neighbors[i])									// is there a neighbor?
 			{
@@ -943,7 +943,7 @@ int* Stripify::stripify  (const Vector3i* inTris, int N)
 				w += nodeWeights[getMod3(i+1)];							// add vertex weight
 
 				w += (swap) ? 1 : -1;									// add swap penalty
-							
+
 				if (w <= bestWeight)
 				{
 					bestWeight = w;
@@ -978,7 +978,7 @@ int* Stripify::stripify  (const Vector3i* inTris, int N)
 			len++;														// increase strip length
 			t = next;													// move to next triangle
 		}
-		
+
 		*pLen = len;													// patch final length
 		strip_count++;														// increase strip count
 
@@ -1009,7 +1009,7 @@ int* Stripify::stripify  (const Vector3i* inTris, int N)
 
 	return rOut;
 }
-} // Strip
+}
 int* StripOptimizerClass::Stripify(const int* tris, int N)
 {
 	return Strip::Stripify::stripify((const Strip::Vector3i*)tris,N);
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h
index 5ae9a8cd9f8..001840bb37e 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef WW3D2_STRIP_OPTIMIZER_H__
-#define WW3D2_STRIP_OPTIMIZER_H__
 
 #include "always.h"
 
@@ -44,5 +39,3 @@ class StripOptimizerClass
 
 	static int Get_Strip_Index_Count(const int* strips, int strips_count);
 };
-
-#endif // WW3D2_STRIP_OPTIMIZER_H__
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.cpp b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.cpp
index 81b61ae49ff..ae112b257bb 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.cpp
@@ -77,7 +77,7 @@ unsigned int PixelSize(const SurfaceClass::SurfaceDescription &sd)
 	unsigned int size=0;
 
 	switch (sd.Format)
-	{	
+	{
 	case WW3D_FORMAT_A8R8G8B8:
 	case WW3D_FORMAT_X8R8G8B8:
 		size=4;
@@ -91,7 +91,7 @@ unsigned int PixelSize(const SurfaceClass::SurfaceDescription &sd)
 	case WW3D_FORMAT_A4R4G4B4:
 	case WW3D_FORMAT_A8R3G3B2:
 	case WW3D_FORMAT_X4R4G4B4:
-	case WW3D_FORMAT_A8P8:	
+	case WW3D_FORMAT_A8P8:
 	case WW3D_FORMAT_A8L8:
 		size=2;
 		break;
@@ -111,7 +111,7 @@ void Convert_Pixel(Vector3 &rgb, const SurfaceClass::SurfaceDescription &sd, con
 {
 	const float scale=1/255.0f;
 	switch (sd.Format)
-	{	
+	{
 	case WW3D_FORMAT_A8R8G8B8:
 	case WW3D_FORMAT_X8R8G8B8:
 	case WW3D_FORMAT_R8G8B8:
@@ -127,22 +127,22 @@ void Convert_Pixel(Vector3 &rgb, const SurfaceClass::SurfaceDescription &sd, con
 			tmp=*(unsigned short*)&pixel[0];
 			rgb.X=((tmp&0x0f00)>>4);   // R
 			rgb.Y=((tmp&0x00f0));		// G
-			rgb.Z=((tmp&0x000f)<<4);	// B			
+			rgb.Z=((tmp&0x000f)<<4);	// B
 		}
 		break;
 	case WW3D_FORMAT_A1R5G5B5:
 		{
 			unsigned short tmp;
-			tmp=*(unsigned short*)&pixel[0];			
+			tmp=*(unsigned short*)&pixel[0];
 			rgb.X=(tmp>>7)&0xf8; // R
 			rgb.Y=(tmp>>2)&0xf8; // G
-			rgb.Z=(tmp<<3)&0xf8; // B			
+			rgb.Z=(tmp<<3)&0xf8; // B
 		}
 		break;
 	case WW3D_FORMAT_R5G6B5:
 		{
 			unsigned short tmp;
-			tmp=*(unsigned short*)&pixel[0];			
+			tmp=*(unsigned short*)&pixel[0];
 			rgb.X=(tmp>>8)&0xf8;
 			rgb.Y=(tmp>>3)&0xfc;
 			rgb.Z=(tmp<<3)&0xf8;
@@ -164,7 +164,7 @@ void Convert_Pixel(unsigned char * pixel,const SurfaceClass::SurfaceDescription
 	g=(unsigned char) (rgb.Y*255.0f);
 	b=(unsigned char) (rgb.Z*255.0f);
 	switch (sd.Format)
-	{	
+	{
 	case WW3D_FORMAT_A8R8G8B8:
 	case WW3D_FORMAT_X8R8G8B8:
 	case WW3D_FORMAT_R8G8B8:
@@ -179,7 +179,7 @@ void Convert_Pixel(unsigned char * pixel,const SurfaceClass::SurfaceDescription
 			tmp&=0xF000;
 			tmp|=(r&0xF0) << 4;
 			tmp|=(g&0xF0);
-			tmp|=(b&0xF0) >> 4;			
+			tmp|=(b&0xF0) >> 4;
 			*(unsigned short*)&pixel[0]=tmp;
 		}
 		break;
@@ -190,13 +190,13 @@ void Convert_Pixel(unsigned char * pixel,const SurfaceClass::SurfaceDescription
 			tmp&=0x8000;
 			tmp|=(r&0xF8) << 7;
 			tmp|=(g&0xF8) << 2;
-			tmp|=(b&0xF8) >> 3;			
+			tmp|=(b&0xF8) >> 3;
 			*(unsigned short*)&pixel[0]=tmp;
 		}
 		break;
 	case WW3D_FORMAT_R5G6B5:
 		{
-			unsigned short tmp;			
+			unsigned short tmp;
 			tmp=(r&0xf8) << 8;
 			tmp|=(g&0xfc) << 3;
 			tmp|=(b&0xf8) >> 3;
@@ -259,7 +259,7 @@ void SurfaceClass::Get_Description(SurfaceDescription &surface_desc)
 
 void * SurfaceClass::Lock(int * pitch)
 {
-	D3DLOCKED_RECT lock_rect;	
+	D3DLOCKED_RECT lock_rect;
 	::ZeroMemory(&lock_rect, sizeof(D3DLOCKED_RECT));
 	DX8_ErrorCode(D3DSurface->LockRect(&lock_rect, 0, 0));
 	*pitch = lock_rect.Pitch;
@@ -294,7 +294,7 @@ void SurfaceClass::Clear()
 	// size of each pixel in bytes
 	unsigned int size=PixelSize(sd);
 
-	D3DLOCKED_RECT lock_rect;	
+	D3DLOCKED_RECT lock_rect;
 	::ZeroMemory(&lock_rect, sizeof(D3DLOCKED_RECT));
 	DX8_ErrorCode(D3DSurface->LockRect(&lock_rect,0,0));
 	unsigned int i;
@@ -305,7 +305,7 @@ void SurfaceClass::Clear()
 		memset(mem,0,size*sd.Width);
 		mem+=lock_rect.Pitch;
 	}
-	
+
 	DX8_ErrorCode(D3DSurface->UnlockRect());
 }
 
@@ -333,7 +333,7 @@ void SurfaceClass::Copy(const unsigned char *other)
 	// size of each pixel in bytes
 	unsigned int size=PixelSize(sd);
 
-	D3DLOCKED_RECT lock_rect;	
+	D3DLOCKED_RECT lock_rect;
 	::ZeroMemory(&lock_rect, sizeof(D3DLOCKED_RECT));
 	DX8_ErrorCode(D3DSurface->LockRect(&lock_rect,0,0));
 	unsigned int i;
@@ -341,10 +341,10 @@ void SurfaceClass::Copy(const unsigned char *other)
 
 	for (i=0; i<sd.Height; i++)
 	{
-		memcpy(mem,&other[i*sd.Width*size],size*sd.Width);		
+		memcpy(mem,&other[i*sd.Width*size],size*sd.Width);
 		mem+=lock_rect.Pitch;
 	}
-	
+
 	DX8_ErrorCode(D3DSurface->UnlockRect());
 }
 
@@ -372,7 +372,7 @@ void SurfaceClass::Copy(Vector2i &min,Vector2i &max, const unsigned char *other)
 	// size of each pixel in bytes
 	unsigned int size=PixelSize(sd);
 
-	D3DLOCKED_RECT lock_rect;	
+	D3DLOCKED_RECT lock_rect;
 	::ZeroMemory(&lock_rect, sizeof(D3DLOCKED_RECT));
 	RECT rect;
 	rect.left=min.I;
@@ -381,15 +381,15 @@ void SurfaceClass::Copy(Vector2i &min,Vector2i &max, const unsigned char *other)
 	rect.bottom=max.J;
 	DX8_ErrorCode(D3DSurface->LockRect(&lock_rect,&rect,0));
 	int i;
-	unsigned char *mem=(unsigned char *) lock_rect.pBits;	
+	unsigned char *mem=(unsigned char *) lock_rect.pBits;
 	int dx=max.I-min.I;
 
 	for (i=min.J; i<max.J; i++)
 	{
-		memcpy(mem,&other[(i*sd.Width+min.I)*size],size*dx);		
+		memcpy(mem,&other[(i*sd.Width+min.I)*size],size*dx);
 		mem+=lock_rect.Pitch;
 	}
-	
+
 	DX8_ErrorCode(D3DSurface->UnlockRect());
 }
 
@@ -423,7 +423,7 @@ unsigned char *SurfaceClass::CreateCopy(int *width,int *height,int*size,bool fli
 
 	unsigned char *other=W3DNEWARRAY unsigned char [sd.Height*sd.Width*mysize];
 
-	D3DLOCKED_RECT lock_rect;	
+	D3DLOCKED_RECT lock_rect;
 	::ZeroMemory(&lock_rect, sizeof(D3DLOCKED_RECT));
 	DX8_ErrorCode(D3DSurface->LockRect(&lock_rect,0,D3DLOCK_READONLY));
 	unsigned int i;
@@ -433,14 +433,14 @@ unsigned char *SurfaceClass::CreateCopy(int *width,int *height,int*size,bool fli
 	{
 		if (flip)
 		{
-			memcpy(&other[(sd.Height-i-1)*sd.Width*mysize],mem,mysize*sd.Width);		
+			memcpy(&other[(sd.Height-i-1)*sd.Width*mysize],mem,mysize*sd.Width);
 		} else
 		{
-			memcpy(&other[i*sd.Width*mysize],mem,mysize*sd.Width);		
+			memcpy(&other[i*sd.Width*mysize],mem,mysize*sd.Width);
 		}
 		mem+=lock_rect.Pitch;
 	}
-	
+
 	DX8_ErrorCode(D3DSurface->UnlockRect());
 
 	return other;
@@ -464,7 +464,7 @@ unsigned char *SurfaceClass::CreateCopy(int *width,int *height,int*size,bool fli
  *=============================================================================================*/
 void SurfaceClass::Copy(
 	unsigned int dstx, unsigned int dsty,
-	unsigned int srcx, unsigned int srcy, 
+	unsigned int srcx, unsigned int srcy,
 	unsigned int width, unsigned int height,
 	const SurfaceClass *other)
 {
@@ -483,13 +483,13 @@ void SurfaceClass::Copy(
 	src.bottom=srcy+height;
 
 	if (src.right>int(osd.Width)) src.right=int(osd.Width);
-	if (src.bottom>int(osd.Height)) src.bottom=int(osd.Height);	
+	if (src.bottom>int(osd.Height)) src.bottom=int(osd.Height);
 
 	if (sd.Format==osd.Format && sd.Width==osd.Width && sd.Height==osd.Height)
 	{
 		POINT dst;
 		dst.x=dstx;
-		dst.y=dsty;	
+		dst.y=dsty;
 		DX8Wrapper::_Copy_DX8_Rects(other->D3DSurface,&src,1,D3DSurface,&dst);
 	}
 	else
@@ -536,7 +536,7 @@ void SurfaceClass::Stretch_Copy(
 	RECT src;
 	src.left=srcx;
 	src.right=srcx+srcwidth;
-	src.top=srcy;	
+	src.top=srcy;
 	src.bottom=srcy+srcheight;
 
 	RECT dest;
@@ -597,8 +597,8 @@ void SurfaceClass::FindBB(Vector2i *min,Vector2i*max)
 	int x,y;
 	unsigned int size=PixelSize(sd);
 	Vector2i realmin=*max;
-	Vector2i realmax=*min;	
-	
+	Vector2i realmax=*min;
+
 	// the assumption here is that whenever a pixel has alpha it's in the MSB
 	for (y = min->J; y < max->J; y++) {
 		for (x = min->I; x < max->I; x++) {
@@ -672,19 +672,19 @@ bool SurfaceClass::Is_Transparent_Column(unsigned int column)
 
 	DX8_ErrorCode(D3DSurface->LockRect(&lock_rect,&rect,D3DLOCK_READONLY));
 
-	int y;	
-	
+	int y;
+
 	// the assumption here is that whenever a pixel has alpha it's in the MSB
 	for (y = 0; y < (int) sd.Height; y++)
 	{
 		// HY - this is not endian safe
-		unsigned char *alpha=(unsigned char*) ((unsigned int)lock_rect.pBits+y*lock_rect.Pitch);		
-		unsigned char myalpha=alpha[size-1];		
-		myalpha=(myalpha>>(8-alphabits)) & mask;		
+		unsigned char *alpha=(unsigned char*) ((unsigned int)lock_rect.pBits+y*lock_rect.Pitch);
+		unsigned char myalpha=alpha[size-1];
+		myalpha=(myalpha>>(8-alphabits)) & mask;
 		if (myalpha) {
 			DX8_ErrorCode(D3DSurface->UnlockRect());
-			return false;			
-		}		
+			return false;
+		}
 	}
 
 	DX8_ErrorCode(D3DSurface->UnlockRect());
@@ -724,9 +724,9 @@ void SurfaceClass::Get_Pixel(Vector3 &rgb, int x,int y)
 	rect.left=x;
 	rect.right=x+1;
 
-	DX8_ErrorCode(D3DSurface->LockRect(&lock_rect,&rect,D3DLOCK_READONLY));	
+	DX8_ErrorCode(D3DSurface->LockRect(&lock_rect,&rect,D3DLOCK_READONLY));
 	Convert_Pixel(rgb,sd,(unsigned char *) lock_rect.pBits);
-	DX8_ErrorCode(D3DSurface->UnlockRect());	
+	DX8_ErrorCode(D3DSurface->UnlockRect());
 }
 
 /***********************************************************************************************
@@ -748,7 +748,7 @@ void SurfaceClass::Attach (IDirect3DSurface8 *surface)
 {
 	Detach ();
 	D3DSurface = surface;
-	
+
 	//
 	//	Lock a reference onto the object
 	//
@@ -858,7 +858,7 @@ void SurfaceClass::DrawPixel(const unsigned int x,const unsigned int y, unsigned
  *   4/9/2001   hy : Created.                                                                  *
  *=============================================================================================*/
 void SurfaceClass::DrawHLine(const unsigned int y,const unsigned int x1, const unsigned int x2, unsigned int color)
-{ 
+{
 	SurfaceDescription sd;
 	Get_Description(sd);
 
@@ -882,7 +882,7 @@ void SurfaceClass::DrawHLine(const unsigned int y,const unsigned int x1, const u
 	unsigned int x;
 	// the assumption here is that whenever a pixel has alpha it's in the MSB
 	for (x=x1; x<=x2; x++)
-	{		
+	{
 		switch (size)
 		{
 		case 1:
@@ -926,8 +926,8 @@ bool SurfaceClass::Is_Monochrome(void)
 	switch (sd.Format)
 	{
 		// these formats are always monochrome
-		case WW3D_FORMAT_A8L8:	
-		case WW3D_FORMAT_A8:		
+		case WW3D_FORMAT_A8L8:
+		case WW3D_FORMAT_A8:
 		case WW3D_FORMAT_L8:
 		case WW3D_FORMAT_A4L4:
 			return true;
@@ -935,13 +935,13 @@ bool SurfaceClass::Is_Monochrome(void)
 		// these formats cannot be determined to be monochrome or not
 		case WW3D_FORMAT_UNKNOWN:
 		case WW3D_FORMAT_A8P8:
-		case WW3D_FORMAT_P8:	
+		case WW3D_FORMAT_P8:
 		case WW3D_FORMAT_U8V8:		// Bumpmap
 		case WW3D_FORMAT_L6V5U5:	// Bumpmap
 		case WW3D_FORMAT_X8L8V8U8:	// Bumpmap
 			return false;
 		break;
-		// these formats need decompression first	
+		// these formats need decompression first
 		case WW3D_FORMAT_DXT1:
 		case WW3D_FORMAT_DXT2:
 		case WW3D_FORMAT_DXT3:
@@ -951,7 +951,7 @@ bool SurfaceClass::Is_Monochrome(void)
 		break;
 	}
 
-	// if it's in some compressed texture format, be sure to decompress first	
+	// if it's in some compressed texture format, be sure to decompress first
 	if (is_compressed) {
 		WW3DFormat new_format = Get_Valid_Texture_Format(sd.Format, false);
 		SurfaceClass *new_surf = NEW_REF( SurfaceClass, (sd.Width, sd.Height, new_format) );
@@ -1033,4 +1033,4 @@ void SurfaceClass::Hue_Shift(const Vector3 &hsv_shift)
 	}
 
 	Unlock();
-}
\ No newline at end of file
+}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h
index 5eea506ee3c..947199f2cd1 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h
@@ -36,15 +36,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SURFACECLASS_H
-#define SURFACECLASS_H
 
+#include "always.h"
 #include "ww3dformat.h"
-#include "refcount.h"
 
 struct IDirect3DSurface8;
 class Vector2i;
@@ -91,10 +86,10 @@ class SurfaceClass : public W3DMPO, public RefCountClass
 		// zaps the surface memory to zero
 		void Clear();
 
-		// copies the contents of one surface to another		
+		// copies the contents of one surface to another
 		void Copy(
 			unsigned int dstx, unsigned int dsty,
-			unsigned int srcx, unsigned int srcy, 
+			unsigned int srcx, unsigned int srcy,
 			unsigned int width, unsigned int height,
 			const SurfaceClass *other);
 
@@ -114,7 +109,7 @@ class SurfaceClass : public W3DMPO, public RefCountClass
 		void FindBB(Vector2i *min,Vector2i*max);
 
 		// tests a column to see if the alpha is nonzero, used in font3d
-		bool Is_Transparent_Column(unsigned int column);		
+		bool Is_Transparent_Column(unsigned int column);
 
 		// makes a copy of the surface into a byte array
 		unsigned char *CreateCopy(int *width,int *height,int*size,bool flip=false);
@@ -146,9 +141,5 @@ class SurfaceClass : public W3DMPO, public RefCountClass
 		IDirect3DSurface8 *D3DSurface;
 
 		WW3DFormat SurfaceFormat;
-	friend class TextureClass;	
+	friend class TextureClass;
 };
-
-#endif
-
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp
new file mode 100644
index 00000000000..38b5ceee3e2
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp
@@ -0,0 +1,1389 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3D                                                         *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/texproject.cpp                         $*
+ *                                                                                             *
+ *              Original Author:: Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
+ *								$Modtime:: 08/05/02 10:03a                                             $*
+ *                                                                                             *
+ *                    $Revision:: 22                                                          $*
+ *                                                                                             *
+ * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
+ * 06/27/02 KM Render to shadow buffer texture support														*
+ * 08/05/02 KM Texture class redesign
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   TexProjectClass::TexProjectClass -- Constructor                                           *
+ *   TexProjectClass::~TexProjectClass -- Destructor                                           *
+ *   TexProjectClass::Set_Texture_Size -- Set the size of texture to use                       *
+ *   TexProjectClass::Get_Texture_Size -- Returns the stored texture size                      *
+ *   TexProjectClass::Set_Flag -- Turn specified flag on or off                                *
+ *   TexProjectClass::Get_Flag -- Get the current state of specified flag                      *
+ *   TexProjectClass::Set_Intensity -- Set the intensity of this projector                     *
+ *   TexProjectClass::Get_Intensity -- returns the current "desired" intensity                 *
+ *   TexProjectClass::Set_Attenuation -- Set the attenuation factor                            *
+ *   TexProjectClass::Get_Attenuation -- Returns the attenuation value                         *
+ *   TexProjectClass::Enable_Attenuation -- Set the state of the ATTENUATE flag                *
+ *   TexProjectClass::Is_Attenuation_Enabled -- Get the state of the ATTENUATE flag            *
+ *   TexProjectClass::Is_Depth_Gradient_Enabled -- returns whether the depth gradient is enabl *
+ *   TexProjectClass::Enable_Depth_Gradient -- enable/disable depth gradient                   *
+ *   TexProjectClass::Init_Multiplicative -- Initialize this to be a multiplicative texture pr *
+ *   TexProjectClass::Is_Intensity_Zero -- check if we can eliminate this projector            *
+ *   TexProjectClass::Init_Additive -- Set up the projector to be additive                     *
+ *   TexProjectClass::Set_Perspective_Projection -- Set up a perspective projection            *
+ *   TexProjectClass::Set_Ortho_Projection -- Set up an orthographic projection                *
+ *   TexProjectClass::Set_Texture -- Set the texture to be projected                           *
+ *   TexProjectClass::Get_Texture -- Returns the texture being projected                       *
+ *   TexProjectClass::Peek_Texture -- Returns the texture being projected                      *
+ *   TexProjectClass::Peek_Material_Pass -- Returns the material pass object                   *
+ *   TexProjectClass::Compute_Perspective_Projection -- Set up a perspective projection of an  *
+ *   TexProjectClass::Compute_Perspective_Projection -- Set up a perspective projection of an  *
+ *   TexProjectClass::Compute_Ortho_Projection -- Automatic Orthographic projection            *
+ *   TexProjectClass::Compute_Ortho_Projection -- Automatic Orthographic projection            *
+ *   TexProjectClass::Compute_Texture -- Generates texture by rendering an object              *
+ *   TexProjectClass::Configure_Camera -- setup a camera to match this projector               *
+ *   TexProjectClass::Pre_Render_Update -- Prepare the projector for rendering                 *
+ *   TexProjectClass::Update_WS_Bounding_Volume -- Recalculate the world-space bounding box    *
+ *   TexProjectClass::Get_Surface -- Returns pointer to the texture surface                    *
+ *   TexProjectClass::Set_Render_Target -- Install a render target for this projector to use   *
+ *   TexProjectClass::Needs_Render_Target -- returns wheter this projector needs a render targ *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+
+#include "texproject.h"
+#include "vertmaterial.h"
+#include "shader.h"
+#include "texture.h"
+#include "rendobj.h"
+#include "rinfo.h"
+#include "camera.h"
+#include "matpass.h"
+#include "bwrender.h"
+#include "assetmgr.h"
+#include "dx8wrapper.h"
+
+
+// DEBUG DEBUG
+#include "MPU.h"
+
+#define DEBUG_SHADOW_RENDERING					0
+//#define DEFAULT_TEXTURE_SIZE						64
+
+const float INTENSITY_RATE_OF_CHANGE			= 1.0f;			// change in intensity per second
+
+
+/*
+**
+** Shadow mapping:  from pre-projected view coordinates back to world space
+** then to shadow space
+**
+** (1) Vshadow = PShadow * Mwrld-shadow * Vwrld
+**
+** (2) Vview = Mwrld-camera * Vwrld
+**
+** Using (2) to solve for Vwrld in terms of Vview
+**                -1
+** (3) Mwrld-camera  * Vview = Vwrld
+**
+** Substituting (3) into (1)
+**                                                   -1
+** (4) Vshadow = Pshadow * Mwrld-shadow * Mwrld-camera * Vview
+**
+** ---------------------------------------------------------------------------------
+**
+** Shadow mapping: from pre-projected view space to world space, to shadow space,
+** then projecting.
+**
+** (1) Vshadow = Mwrld-shadow * Vwrld
+**
+** (2) Vview = Mwrld-camera * Vwrld
+**
+** solving (2) for Vwrld:
+**                -1
+** (3) Mwrld-camera * Vview = Vwrld
+**
+** substitute into (1)
+**                                         -1
+** (4) Vshadow = Mwrld-shadow * Mwrld-camera * Vview
+**
+** project shadow
+**                                                         -1
+** (5) Vproj-shadow = Pshadow * (Mwrld-shadow * Mwrld-camera ) * Vview
+**
+** aaah! same thing :-)
+**
+** ---------------------------------------------------------------------------------
+**
+** Shadow mapping:  from pre-projected view coordinates back to obj space
+** then to shadow space
+**
+** (1) Vshadow = PShadow * Mwrld-shadow * Mobj-wrld * Vobj
+**
+** (2) Vview = Mwrld-camera * Mobj-wrld * Vobj
+**             -1             -1
+** (3) Mobj-wrld * Mwrld-camera * Vview = Vobj
+**                                                            -1             -1
+** (4) Vshadow = PShadow * Mwrld-shadow * Mobj-wrld * Mobj-wrld * Mwrld-camera * Vview
+**                                                   -1
+** (5) Vshadow = PShadow * Mwrld-shadow * Mvrld-camera * Vview
+**
+**
+** Ideas:
+** - Use Texture Projectors to implement spot lights and stained glass windows
+** - Attenuate texture projections with distance from the projector
+** - Should be able to handle lots of pre-calculated static texture projectors.  They
+**   should cull well and we can pre-generate the textures.
+**
+** Ideas maybe used in conjunction with texture projections:
+** - Light volumes: the problem is when the volume is cliped it looks funny, we can
+**   fill in the clipped face of a non-translucent object by rendering the backfaces
+** - Use the backface-fill to make the camera slicing through the commando look like
+**   its *really* slicing through the commando :-)
+** - The back-face-fill trick might be able to use el-cheapo screen mapping!
+**
+*/
+
+
+
+/***********************************************************************************************
+ * TexProjectClass::TexProjectClass -- Constructor                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+TexProjectClass::TexProjectClass(void) :
+	Flags(DEFAULT_FLAGS),
+	DesiredIntensity(1.0f),
+	Intensity(1.0f),
+	Attenuation(1.0f),
+	MaterialPass(NULL),
+	Mapper1(NULL),
+	RenderTarget(NULL),
+	DepthStencilTarget(NULL),
+	HFov(90.0f),
+	VFov(90.0f),
+	XMin(-10.0f),
+	XMax(10.0f),
+	YMin(-10.0f),
+	YMax(10.0f),
+	ZNear(1.0f),
+	ZFar(1000.0f)
+{
+	// create a material pass class
+	MaterialPass = NEW_REF(MaterialPassClass,());
+	MaterialPass->Set_Cull_Volume(&WorldBoundingVolume);
+
+	// create a vertex material
+	VertexMaterialClass * vmtl = NEW_REF(VertexMaterialClass,());
+	WWASSERT(vmtl != NULL);
+
+	// Plug our parent's mapper into our vertex material
+	// the mapper for stage1 will be allocated as needed
+	vmtl->Set_Mapper(Mapper);
+
+	MaterialPass->Set_Material(vmtl);
+	vmtl->Release_Ref();
+	vmtl = NULL;
+
+	// by default init our material pass to be multiplicative (shadow)
+	Init_Multiplicative();
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::~TexProjectClass -- Destructor                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+TexProjectClass::~TexProjectClass(void)
+{
+	REF_PTR_RELEASE(Mapper1);
+	REF_PTR_RELEASE(MaterialPass);
+	REF_PTR_RELEASE(RenderTarget);
+	REF_PTR_RELEASE(DepthStencilTarget);
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Set_Texture_Size -- Set the size of texture to use                         *
+ *                                                                                             *
+ *    This function stores the desired texture size in this TexProjectClass.  Note that        *
+ *    this size is only used if you have the TexProjectClass generate a texture.               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *    size - dimension of the texture in pixels                                                *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Set_Texture_Size(int size)
+{
+	WWASSERT(size > 0);
+	WWASSERT(size <= 512);
+	Flags &= ~SIZE_MASK;
+	Flags |= (size << SIZE_SHIFT);
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Get_Texture_Size -- Returns the stored texture size                        *
+ *                                                                                             *
+ *    Returns the size stored in the flags variable.  This can be different than the actual    *
+ *    texture's size if you manually installed a texture.  This size is only used when         *
+ *    automatically generating a texture as is the case when creating shadows.                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+int TexProjectClass::Get_Texture_Size(void)
+{
+	return (Flags & SIZE_MASK) >> SIZE_SHIFT;
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Set_Flag -- Turn specified flag on or off                                  *
+ *                                                                                             *
+ *    See the TexProjectClass header file for valid flags                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Set_Flag(uint32 flag,bool onoff)
+{
+	if (onoff) {
+		Flags |= flag;
+	} else {
+		Flags &= ~flag;
+	}
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Get_Flag -- Get the current state of specified flag                        *
+ *                                                                                             *
+ *    See the TexProjectClass header file for valid flags                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+bool TexProjectClass::Get_Flag(uint32 flag) const
+{
+	return (Flags & flag) == flag;
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Set_Intensity -- Set the intensity of this projector                       *
+ *                                                                                             *
+ *    The "intensity" is a value between 0 and 1.  At 0, the projector will have no effect     *
+ *    At 1, the projector will be at its highest strength.  The intensity will automatically   *
+ *    smoothly interpolate towards the value specified unless you use the immediate option.    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * intensity - desired intensity, 0 <= intensity <= 1                                          *
+ * immediate - should the intensity be immediately set to the desired value? (default = false) *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Set_Intensity(float intensity,bool immediate)
+{
+	WWASSERT(intensity <= 1.0f);
+	WWASSERT(intensity >= 0.0f);
+
+	DesiredIntensity = intensity;
+	if (immediate) {
+		Intensity = DesiredIntensity;
+	}
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Get_Intensity -- returns the current "desired" intensity                   *
+ *                                                                                             *
+ *    This will return the last value that was sent into this object through Set_Intensity.    *
+ *    Note however that the actual intensity used in rendering may not have arrived at         *
+ *    that value yet.                                                                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+float TexProjectClass::Get_Intensity(void)
+{
+	return DesiredIntensity;
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Is_Intensity_Zero -- check if we can eliminate this projector              *
+ *                                                                                             *
+ *    Only returns true if the current intensity is zero AND the target intensity is zero      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+bool TexProjectClass::Is_Intensity_Zero(void)
+{
+	return ((Intensity == 0.0f) && (DesiredIntensity == 0.0f));
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Set_Attenuation -- Set the attenuation factor                              *
+ *                                                                                             *
+ *    Attenuation scales the intensity.  I use attenuation to make shadows fade away as they   *
+ *    get farther away from the light source or from the viewer.                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Set_Attenuation(float attenuation)
+{
+	WWASSERT(attenuation >= 0.0f);
+	WWASSERT(attenuation <= 1.0f);
+	Attenuation = attenuation;
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Get_Attenuation -- Returns the attenuation value                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+float TexProjectClass::Get_Attenuation(void)
+{
+	return Attenuation;
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Enable_Attenuation -- Set the state of the ATTENUATE flag                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Enable_Attenuation(bool onoff)
+{
+	Set_Flag(ATTENUATE,onoff);
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Is_Attenuation_Enabled -- Get the state of the ATTENUATE flag              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+bool TexProjectClass::Is_Attenuation_Enabled(void)
+{
+	return Get_Flag(ATTENUATE);
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Enable_Depth_Gradient -- enable/disable depth gradient                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/25/2000  gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Enable_Depth_Gradient(bool onoff)
+{
+	Set_Flag(USE_DEPTH_GRADIENT,onoff);
+
+	// re-setup the shader settings
+	if (Get_Flag(ADDITIVE)) {
+		Init_Additive();
+	} else {
+		Init_Multiplicative();
+	}
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Is_Depth_Gradient_Enabled -- returns whether the depth gradient is enabled *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/25/2000  gth : Created.                                                                 *
+ *=============================================================================================*/
+bool TexProjectClass::Is_Depth_Gradient_Enabled(bool onoff)
+{
+	return Get_Flag(USE_DEPTH_GRADIENT);
+}
+
+/***********************************************************************************************
+ * TexProjectClass::Init_Multiplicative -- Initialize this to be a multiplicative texture proj *
+ *                                                                                             *
+ *    Set up the internal materials so that the texture is multiplied with whatever it is      *
+ *    projected onto.                                                                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/4/00     gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Init_Multiplicative(void)
+{
+	Set_Flag(ADDITIVE,false);
+
+	/*
+	** Set up the shader
+	*/
+	static ShaderClass mult_shader(		SHADE_CNST(	ShaderClass::PASS_LEQUAL,						//depth_compare,
+																	ShaderClass::DEPTH_WRITE_DISABLE,			//depth_mask,
+																	ShaderClass::COLOR_WRITE_ENABLE,				//color_mask,
+																	ShaderClass::SRCBLEND_ZERO,					//src_blend,
+																	ShaderClass::DSTBLEND_SRC_COLOR,				//dst_blend,
+																	ShaderClass::FOG_DISABLE,						//fog,
+																	ShaderClass::GRADIENT_ADD,						//pri_grad,
+																	ShaderClass::SECONDARY_GRADIENT_DISABLE,	//sec_grad,
+																	ShaderClass::TEXTURING_ENABLE,				//texture,
+
+																	ShaderClass::ALPHATEST_DISABLE,				//alpha_test,
+																	ShaderClass::CULL_MODE_ENABLE,				//cull mode
+																	0,														//post_det_color,
+																	0) );													//post_det_alpha
+
+	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) {
+		mult_shader.Enable_Fog ("TexProjectClass");
+	}
+
+	if (Get_Flag(USE_DEPTH_GRADIENT)) {
+
+		/*
+		** enable multi-texturing
+		*/
+		mult_shader.Set_Post_Detail_Color_Func(ShaderClass::DETAILCOLOR_ADD);
+
+		/*
+		** plug the gradient texture into the second stage
+		*/
+		TextureClass * grad_tex = WW3DAssetManager::Get_Instance()->Get_Texture("MultProjectorGradient.tga");
+		if (grad_tex) {
+			grad_tex->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+			grad_tex->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+			MaterialPass->Set_Texture(grad_tex,1);
+			grad_tex->Release_Ref();
+		} else {
+			WWDEBUG_SAY(("Could not find texture: MultProjectorGradient.tga!"));
+		}
+
+	} else {
+
+		/*
+		** disable multi-texturing
+		*/
+		mult_shader.Set_Post_Detail_Color_Func(ShaderClass::DETAILCOLOR_DISABLE);
+
+		/*
+		** remove the texture from the second stage
+		*/
+		MaterialPass->Set_Texture(NULL,1);
+	}
+
+#if (DEBUG_SHADOW_RENDERING)
+	// invert the shader so we can see what polygons it is hitting
+	mult_shader.Set_Dst_Blend_Func(ShaderClass::DSTBLEND_ONE);
+	mult_shader.Set_Src_Blend_Func(ShaderClass::SRCBLEND_ONE);
+#endif
+
+	MaterialPass->Set_Shader(mult_shader);
+
+	/*
+	** Set up the Vertex Material parameters
+	*/
+	VertexMaterialClass * vmtl = MaterialPass->Peek_Material();
+	vmtl->Set_Ambient(0,0,0);
+	vmtl->Set_Diffuse(0,0,0);
+	vmtl->Set_Specular(0,0,0);
+	vmtl->Set_Emissive(0.0f,0.0f,0.0f);
+	vmtl->Set_Opacity(1.0f);
+	vmtl->Set_Lighting(true); // I need the emissive value to scale the intensity of the shadow
+
+	/*
+	** Set up some mapper settings related to depth gradient
+	*/
+	if (Get_Flag(USE_DEPTH_GRADIENT)) {
+		if (Mapper1 == NULL) {
+			Mapper1 = NEW_REF(MatrixMapperClass,(1));
+		}
+		Mapper1->Set_Type(MatrixMapperClass::DEPTH_GRADIENT);
+		vmtl->Set_Mapper(Mapper1,1);
+	} else {
+		vmtl->Set_Mapper(NULL,1);
+	}
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Init_Additive -- Set up the projector to be additive                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Init_Additive(void)
+{
+	Set_Flag(ADDITIVE,true);
+
+	/*
+	** Set up the shader
+	*/
+	static ShaderClass add_shader(		SHADE_CNST(	ShaderClass::PASS_LEQUAL,						//depth_compare,
+																	ShaderClass::DEPTH_WRITE_DISABLE,			//depth_mask,
+																	ShaderClass::COLOR_WRITE_ENABLE,				//color_mask,
+																	ShaderClass::SRCBLEND_ONE,						//src_blend,
+																	ShaderClass::DSTBLEND_ONE,						//dst_blend,
+																	ShaderClass::FOG_DISABLE,						//fog,
+																	ShaderClass::GRADIENT_MODULATE,				//pri_grad,
+																	ShaderClass::SECONDARY_GRADIENT_DISABLE,	//sec_grad,
+																	ShaderClass::TEXTURING_ENABLE,				//texture,
+																	ShaderClass::ALPHATEST_DISABLE,				//alpha_test,
+																	ShaderClass::CULL_MODE_ENABLE,				//cullmode,
+																	ShaderClass::DETAILCOLOR_DISABLE,			//post_det_color,
+																	ShaderClass::DETAILALPHA_DISABLE) );		//post_det_alpha
+
+	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) {
+		add_shader.Enable_Fog ("TexProjectClass");
+	}
+
+	/*
+	** Additive projectors always use the normal gradient so they need multi-texturing
+	*/
+	add_shader.Set_Post_Detail_Color_Func(ShaderClass::DETAILCOLOR_SCALE);
+
+	/*
+	** plug in the gradient texture
+	*/
+	TextureClass * grad_tex = WW3DAssetManager::Get_Instance()->Get_Texture("AddProjectorGradient.tga");
+	if (grad_tex) {
+		grad_tex->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+		grad_tex->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+		MaterialPass->Set_Texture(grad_tex,1);
+		grad_tex->Release_Ref();
+	} else {
+		WWDEBUG_SAY(("Could not find texture: AddProjectorGradient.tga!"));
+	}
+
+#if (DEBUG_SHADOW_RENDERING)
+	// invert the shader so we can see what polygons it is hitting
+	add_shader.Set_Dst_Blend_Func(ShaderClass::DSTBLEND_SRC_COLOR);
+	add_shader.Set_Src_Blend_Func(ShaderClass::SRCBLEND_ZERO);
+#endif
+
+	MaterialPass->Set_Shader(add_shader);
+
+	/*
+	** Set up the Vertex Material parameters
+	*/
+	VertexMaterialClass * vmtl = MaterialPass->Peek_Material();
+	vmtl->Set_Ambient(0,0,0);
+	vmtl->Set_Diffuse(0,0,0);
+	vmtl->Set_Specular(0,0,0);
+	vmtl->Set_Emissive(1,1,1);
+	vmtl->Set_Opacity(1.0f);
+	vmtl->Set_Lighting(true); //need emissive to scale the intensity of the projector
+
+	/*
+	** Set up some mapper settings related to depth gradient
+	** Additive texture projections always use the normal gradient
+	*/
+	if (Mapper1 == NULL) {
+		Mapper1 = NEW_REF(MatrixMapperClass,(1));
+	}
+	Mapper1->Set_Type(MatrixMapperClass::NORMAL_GRADIENT);
+	vmtl->Set_Mapper(Mapper1,1);
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Set_Texture -- Set the texture to be projected                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Set_Texture(TextureClass * texture)
+{
+	if (texture != NULL)
+	{
+		texture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+		texture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
+		MaterialPass->Set_Texture(texture);
+	}
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Get_Texture -- Returns the texture being projected                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ * the pointer is ref-counted!  make sure to keep track of your references                     *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+TextureClass * TexProjectClass::Get_Texture(void) const
+{
+	return MaterialPass->Get_Texture();
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Peek_Texture -- Returns the texture being projected                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+TextureClass * TexProjectClass::Peek_Texture(void) const
+{
+	return MaterialPass->Peek_Texture();
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Peek_Material_Pass -- Returns the material pass object                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+MaterialPassClass * TexProjectClass::Peek_Material_Pass(void)
+{
+	return MaterialPass;
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Set_Perspective_Projection -- set up a perspective projection              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/27/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Set_Perspective_Projection(float hfov,float vfov,float znear,float zfar)
+{
+	HFov = hfov;
+	VFov = vfov;
+	ZNear = znear;
+	ZFar = zfar;
+
+	ProjectorClass::Set_Perspective_Projection(hfov,vfov,znear,zfar);
+	Set_Flag(PERSPECTIVE,true);
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Set_Ortho_Projection -- set up an orthographic projection                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/27/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Set_Ortho_Projection(float xmin,float xmax,float ymin,float ymax,float znear,float zfar)
+{
+	XMin = xmin;
+	XMax = xmax;
+	YMin = ymin;
+	YMax = ymax;
+	ZNear = znear;
+	ZFar = zfar;
+
+	ProjectorClass::Set_Ortho_Projection(xmin,xmax,ymin,ymax,znear,zfar);
+	Set_Flag(PERSPECTIVE,false);
+}
+
+/***********************************************************************************************
+ * TexProjectClass::Compute_Perspective_Projection -- Set up a perspective projection of an ob *
+ *                                                                                             *
+ * This function automates the process of generating the perspective parameters needed to      *
+ * tightly bound the projection of an object.                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * model - object which we are created a projection of                                         *
+ * lightpos - positional light source                                                          *
+ * znear - distance to near clipping plane for the projection (if -1.0, will be generated)     *
+ * zfar - distance to far clipping plane for the projection (if -1.0, will be generated)       *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+bool TexProjectClass::Compute_Perspective_Projection
+(
+	RenderObjClass *	model,
+	const Vector3 &	lightpos,
+	float					znear,
+	float					zfar
+)
+{
+	if (model == NULL) {
+		WWDEBUG_SAY(("Attempting to generate projection for a NULL model"));
+		return false;
+	}
+
+	AABoxClass box;
+	model->Get_Obj_Space_Bounding_Box(box);
+	const Matrix3D & tm = model->Get_Transform();
+
+	return Compute_Perspective_Projection(box,tm,lightpos,znear,zfar);
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Compute_Perspective_Projection -- Set up a perspective projection of an ob *
+ *                                                                                             *
+ * This function automates the process of generating the perspective parameters needed to      *
+ * tightly bound the projection of an object.                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * obj_box - object space bounding box of the object we are projecting                         *
+ * tm - transform of the object we are projecting                                              *
+ * lightpos - positional light source                                                          *
+ * user_znear - distance to near clipping plane for the projection (if -1.0, will be generated)*
+ * user_zfar - distance to far clipping plane for the projection (if -1.0, will be generated)  *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+bool TexProjectClass::Compute_Perspective_Projection
+(
+	const AABoxClass & obj_box,
+	const Matrix3D & tm,
+	const Vector3 & lightpos,
+	float user_znear,
+	float user_zfar
+)
+{
+	/*
+	** Compute the center of the box in world-space
+	*/
+	Vector3 wrld_center;
+	Matrix3D::Transform_Vector(tm,obj_box.Center,&wrld_center);
+
+	/*
+	** Create a camera transform looking at the object.
+	** Set this as our transform later in this routine.
+	*/
+	Matrix3D texture_tm,texture_tm_inv;
+	texture_tm.Look_At(lightpos,wrld_center,0.0f);
+	texture_tm.Get_Orthogonal_Inverse(texture_tm_inv);
+
+	/*
+	** Calculate the axis-aligned bounding box of the model in the camera's coordinate system.
+	*/
+	AABoxClass box = obj_box;
+	Matrix3D obj_to_world = tm;
+	Matrix3D obj_to_texture;
+	Matrix3D::Multiply(texture_tm_inv,obj_to_world,&obj_to_texture);
+	box.Transform(obj_to_texture);
+
+	/*
+	** If the box is behind the viewpoint or the viewpoint is inside the box
+	** our FOV will be > 180 degrees. Have to give up
+	*/
+	if ((box.Center.Z > 0.0f) || (box.Extent.Z > WWMath::Fabs(box.Center.Z))) {
+		return false;
+	}
+
+	/*
+	** Compute the frustum parameters. Remember that our z coordinates are negative but the
+	** projection code needs positive z distances.
+	*/
+	float znear = -box.Center.Z; //-(box.Center.Z + obj_box.Extent.Quick_Length());
+	float zfar = -(box.Center.Z - obj_box.Extent.Quick_Length()) * 2.0f;
+
+	if (user_znear != -1.0f) {
+		znear = box.Center.Z + user_znear;
+	}
+	if (user_zfar != -1.0f) {
+		zfar = box.Center.Z + user_zfar;
+	}
+
+	float tan_hfov2 = WWMath::Fabs(box.Extent.X / (box.Center.Z + box.Extent.Z));
+	float tan_vfov2 = WWMath::Fabs(box.Extent.Y / (box.Center.Z + box.Extent.Z));
+	float hfov = 2.0f * WWMath::Atan(tan_hfov2);
+	float vfov = 2.0f * WWMath::Atan(tan_vfov2);
+
+	/*
+	** Plug in the results.
+	*/
+	Set_Perspective_Projection(hfov,vfov,znear,zfar);
+	Set_Transform(texture_tm);
+	return true;
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Compute_Ortho_Projection -- Automatic Orthographic projection              *
+ *                                                                                             *
+ * Generates the orthographic projection parameters to tightly bound an object                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * model - object which we are created a projection of                                         *
+ * lightdir - directional light source                                                         *
+ * znear - distance to near clipping plane for the projection (if -1.0, will be generated)     *
+ * zfar - distance to far clipping plane for the projection (if -1.0, will be generated)       *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+bool TexProjectClass::Compute_Ortho_Projection
+(
+	RenderObjClass *	model,
+	const Vector3 &	lightdir,
+	float					znear,
+	float					zfar
+)
+{
+	if (model == NULL) {
+		WWDEBUG_SAY(("Attempting to generate projection for a NULL model"));
+		return false;
+	}
+
+	AABoxClass box;
+	model->Get_Obj_Space_Bounding_Box(box);
+	const Matrix3D & tm = model->Get_Transform();
+
+	return Compute_Ortho_Projection(box,tm,lightdir,znear,zfar);
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Compute_Ortho_Projection -- Automatic Orthographic projection              *
+ *                                                                                             *
+ * Generates the orthographic projection parameters to tightly bound an object                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * obj_box - object space bounding box of the object we are projecting                         *
+ * tm - transform of the object we are projecting                                              *
+ * lightdir - directional light                                                                *
+ * user_znear - distance to near clipping plane for the projection (if -1.0, will be generated)*
+ * user_zfar - distance to far clipping plane for the projection (if -1.0, will be generated)  *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+bool TexProjectClass::Compute_Ortho_Projection
+(
+	const AABoxClass & obj_box,
+	const Matrix3D & tm,
+	const Vector3 & lightdir,
+	float user_znear,
+	float user_zfar
+)
+{
+	/*
+	** Compute the center of the box in world-space
+	*/
+	AABoxClass wrldbox = obj_box;
+	wrldbox.Transform(tm);
+
+	/*
+	** Create a camera transform looking at the object.
+	** Set this as our transform later in this routine.
+	*/
+	Vector3 camera_target = wrldbox.Center;
+	Vector3 camera_position = camera_target - 2.0f * wrldbox.Extent.Length() * lightdir;
+
+	Matrix3D texture_tm,texture_tm_inv;
+	texture_tm.Look_At(camera_position,camera_target,0.0f);
+	texture_tm.Get_Orthogonal_Inverse(texture_tm_inv);
+
+	/*
+	** Calculate the axis-aligned bounding box of the model in the camera's coordinate system.
+	*/
+	AABoxClass box = obj_box;
+	Matrix3D obj_to_world = tm;
+	Matrix3D obj_to_texture;
+	Matrix3D::Multiply(texture_tm_inv,obj_to_world,&obj_to_texture);
+	box.Transform(obj_to_texture);
+
+	/*
+	** Expand the box to help with bounding box errors
+	*/
+	box.Extent *= 1.0f;
+
+	/*
+	** Compute the frustum parameters.  Note that znear and zfar are supposed to
+	** be positive distances for the projection code.
+	*/
+	float znear = -box.Center.Z; //-(box.Center.Z + obj_box.Extent.Quick_Length());
+	float zfar = -(box.Center.Z - obj_box.Extent.Quick_Length()) * 2.0f;
+
+	if (user_znear != -1.0f) {
+		znear = -box.Center.Z + user_znear;
+	}
+	if (user_zfar != -1.0f) {
+		zfar = -box.Center.Z + user_zfar;
+	}
+
+	/*
+	** All done!
+	*/
+	Set_Ortho_Projection(	box.Center.X - box.Extent.X,
+									box.Center.X + box.Extent.X,
+									box.Center.Y - box.Extent.Y,
+									box.Center.Y + box.Extent.Y,
+									znear,
+									zfar	);
+	Set_Transform(texture_tm);
+	return true;
+}
+
+/***********************************************************************************************
+ * TexProjectClass::Compute_Texture -- Generates texture by rendering an object                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * model - pointer to the render object to generate a shadow texture for                       *
+ * context - shadow render context which has been initialized to <TextureSize> resolution      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *   5/16/02    kjm : Added optional custom depth/stencil target										  *
+ *=============================================================================================*/
+bool TexProjectClass::Compute_Texture
+(
+	RenderObjClass * model,
+	SpecialRenderInfoClass * context
+)
+{
+	if ((model == NULL) || (context == NULL))
+	{
+		return false;
+	}
+	/*
+	** Render to texture
+	*/
+	TextureClass * rtarget=NULL;
+	ZTextureClass* ztarget=NULL;
+
+	Peek_Render_Target(&rtarget,&ztarget);
+
+	if (rtarget != NULL)
+	{
+		// set projector for render context KJM
+		context->Texture_Projector=this;
+
+		/*
+		** Set the render target
+		*/
+		DX8Wrapper::Set_Render_Target_With_Z (rtarget,ztarget);
+
+		/*
+		** Set up the camera
+		*/
+		Configure_Camera(context->Camera);
+
+		/*
+		** Render the object
+		*/
+		Vector3 color(0.0f,0.0f,0.0f);
+		if (Get_Flag(ADDITIVE) == false) {
+			color.Set(1.0f,1.0f,1.0f);
+		}
+
+		bool zclear=ztarget!=NULL;
+
+		bool snapshot=WW3D::Is_Snapshot_Activated();
+		SNAPSHOT_SAY(("TexProjectCLass::Begin_Render()"));
+		WW3D::Begin_Render(true,zclear,color);	// false to zclear as we don't have z-buffer
+		WW3D::Render(*model,*context);
+		SNAPSHOT_SAY(("TexProjectCLass::End_Render()"));
+		WW3D::End_Render(false);
+		WW3D::Activate_Snapshot(snapshot);	// End_Render() ends the shapsnot, so restore the state
+
+		DX8Wrapper::Set_Render_Target((IDirect3DSurface8 *)NULL);
+
+	}
+
+#if 0
+
+	/*
+	** Render the object with the BW Renderer into our color surface
+	*/
+	BWRenderClass bwr((unsigned char*)shadow_surface->getDataPtr(),tex_size);
+	bwr.Fill(0xff);
+	context->BWRenderer = &bwr;
+	model->Special_Render(*context);
+	context->BWRenderer = NULL;
+#endif
+	return true;
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Needs_Render_Target -- returns wheter this projector needs a render target *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   4/17/2001  gth : Created.                                                                 *
+ *=============================================================================================*/
+bool TexProjectClass::Needs_Render_Target(void)
+{
+	return Get_Flag(TEXTURE_DIRTY);
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Set_Render_Target -- Install a render target for this projector to use     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   4/16/2001  gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Set_Render_Target
+(
+	TextureClass* render_target,
+	ZTextureClass* zbuffer
+)
+{
+	REF_PTR_SET(RenderTarget,render_target);
+	Set_Texture(RenderTarget);
+	REF_PTR_SET(DepthStencilTarget,zbuffer);
+}
+
+/***********************************************************************************************
+ * TexProjectClass::Peek_Render_Target -- Returns pointer to the render target if we have one  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   4/5/2001   gth : Created.                                                                 *
+ *   5/16/2002  kjm : Added optional custom zbuffer                                            *
+ *=============================================================================================*/
+TextureClass* TexProjectClass::Peek_Render_Target
+(
+	TextureClass** rtarget,
+	ZTextureClass** ztarget
+)
+{
+	// some uses of this function just want to know if a render target exists
+	if (rtarget==NULL) return RenderTarget;
+
+	*rtarget=RenderTarget;
+
+	// don't set if pointer isn't supplied
+	if (ztarget!=NULL)
+		*ztarget=DepthStencilTarget;
+
+	return RenderTarget;
+}
+
+/***********************************************************************************************
+ * TexProjectClass::Configure_Camera -- set up a camera to match this projector                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Configure_Camera(CameraClass & camera)
+{
+	camera.Set_Transform(Transform);
+	camera.Set_Clip_Planes(0.01f,ZFar);
+
+	if (Get_Flag(PERSPECTIVE)) {
+		camera.Set_Projection_Type(CameraClass::PERSPECTIVE);
+		camera.Set_View_Plane(HFov,VFov);
+
+	} else {
+		camera.Set_Projection_Type(CameraClass::ORTHO);
+		camera.Set_View_Plane(Vector2(XMin,YMin),Vector2(XMax,YMax));
+	}
+
+	// Set one-pixel borders to the texture to avoid "flooding" shadows...
+	float size=Get_Texture_Size();
+	float inv_size=1.0f/size;
+	Vector2 vmin(1.0f*inv_size,1.0f*inv_size);
+	Vector2 vmax((size-1.0f)*inv_size,(size-1.0f)*inv_size);
+	camera.Set_Viewport(vmin,vmax);
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Pre_Render_Update -- Prepare the projector for rendering                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Pre_Render_Update(const Matrix3D & camera)
+{
+	/*
+	** Mview-texture = PShadow * Mwrld-texture * Mcamera-vrld
+	*/
+	Matrix3D		world_to_texture;
+	Matrix3D		tmp;
+	Matrix4x4	view_to_texture;
+
+	Transform.Get_Orthogonal_Inverse(world_to_texture);
+	Matrix3D::Multiply(world_to_texture,camera,&tmp);
+	Matrix4x4::Multiply(Projection,tmp,&view_to_texture);
+
+	/*
+	** update the current intensity by iterating it towards the desired intensity
+	*/
+	float intensity_delta = DesiredIntensity - Intensity;
+	float max_intensity_delta = INTENSITY_RATE_OF_CHANGE * WW3D::Get_Logic_Frame_Time_Seconds();
+
+	if (intensity_delta > max_intensity_delta) {
+		Intensity += max_intensity_delta;
+	} else if (intensity_delta < -max_intensity_delta) {
+		Intensity -= max_intensity_delta;
+	} else {
+		Intensity = DesiredIntensity;
+	}
+
+	float actual_intensity = Intensity * Attenuation;
+
+	/*
+	** install the current intensity
+	*/
+	VertexMaterialClass * vmat = MaterialPass->Peek_Material();
+	if (Get_Flag(ADDITIVE)) {
+		vmat->Set_Emissive(actual_intensity,actual_intensity,actual_intensity);
+	} else {
+		vmat->Set_Emissive(1.0f - actual_intensity,1.0f - actual_intensity,1.0f - actual_intensity);
+	}
+
+	/*
+	** update the mappers
+	*/
+	if (Get_Flag(PERSPECTIVE)) {
+		Mapper->Set_Type(MatrixMapperClass::PERSPECTIVE_PROJECTION);
+	} else {
+		Mapper->Set_Type(MatrixMapperClass::ORTHO_PROJECTION);
+	}
+
+	if (Get_Texture_Size() == 0) {
+//		SurfaceClass::SurfaceDescription surface_desc;
+//		MaterialPass->Peek_Texture()->Get_Level_Description(surface_desc);
+		Set_Texture_Size(MaterialPass->Peek_Texture()->Get_Width());
+		WWASSERT(Get_Texture_Size() != 0);
+	}
+
+	Mapper->Set_Texture_Transform(view_to_texture,Get_Texture_Size());
+	if (Mapper1) {
+		Mapper1->Set_Texture_Transform(view_to_texture,Get_Texture_Size());
+	}
+}
+
+
+/***********************************************************************************************
+ * TexProjectClass::Update_WS_Bounding_Volume -- Recalculate the world-space bounding box      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   1/11/00    gth : Created.                                                                 *
+ *=============================================================================================*/
+void TexProjectClass::Update_WS_Bounding_Volume(void)
+{
+	ProjectorClass::Update_WS_Bounding_Volume();
+
+	/*
+	** Tell our culling system that we've changed
+	*/
+	Vector3 extent;
+	WorldBoundingVolume.Compute_Axis_Aligned_Extent(&extent);
+	Set_Cull_Box(AABoxClass(WorldBoundingVolume.Center,extent));
+}
+
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texproject.h b/Core/Libraries/Source/WWVegas/WW3D2/texproject.h
new file mode 100644
index 00000000000..0489220f649
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texproject.h
@@ -0,0 +1,239 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3D                                                         *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/texproject.h                           $*
+ *                                                                                             *
+ *              Original Author:: Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
+ *                     $Modtime:: 06/26/02 4:04p                                             $*
+ *                                                                                             *
+ *                    $Revision:: 8                                                           $*
+ *                                                                                             *
+ * 06/27/02 KM Render to shadow buffer texture support														*
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "always.h"
+#include "matrix3d.h"
+#include "matrix4.h"
+#include "obbox.h"
+#include "matpass.h"
+#include "matrixmapper.h"
+#include "cullsys.h"
+#include "multilist.h"
+#include "projector.h"
+
+
+class SpecialRenderInfoClass;
+class RenderObjClass;
+class MaterialPassClass;
+class SurfaceClass;
+
+class TextureClass;
+class ZTextureClass;
+
+
+/**
+** TexProjectClass
+** This class is used to project textures onto object in the world.  It contains
+** a pointer to the texture to be projected, a bounding volume for the projection,
+** and a material pass which can perform the projection.
+**
+** Design Goals:
+** - Texture Projectors should be easy to place in the world and move around.
+**   solution: Store the bounding volume and any other parameters in a coordinate
+**   system local to the projector.  Update the world-space cache whenever needed.
+**   The automatically generated shadow texture projectors are a special case subset
+**   of the general texture projection code.  For this reason, a local bounding
+**   volume will be stored and its world-space equivalent will be updated whenever
+**   needed.
+**
+** - Texture projectors need to be compatible with the culling systems.
+**   solution: inherit the Cullable interface.
+**
+** - Texture projectors need to be quickly pulled in and out of many lists during
+**   the rendering process.
+**   solution: list system similar to PhysListClass?  I really need to templatize this.
+**   - done:  MultiListClass!
+**
+** - Dynamic Texture projectors need to be updated in stages.  Update/recompute only the
+**   bounding volume first, then defer computing the actual texture until it is
+**   determined that the volume falls into the frustum and is applied to at least one
+**   object.
+**   solution: Code the bounding volume/projection paramter generation separate from
+**   the texture generation code.  A derived texture projection object. Let texture
+**   projectors know about the object they are projecting so that they can have that
+**   object rendered from the desired viewpoint.  Need a 'Dirty' flag and a pointer to
+**   a 'parent' object.  Perhaps separate this code into a ShadowProjectClass since shadows
+**   are the only case I can think of that need the ability to re-render their 'parent'
+**   object.  Everything else should be a static texture-map either generated 'artistically'
+**   or generated off-line.
+**
+*/
+class TexProjectClass : public ProjectorClass, public CullableClass, public MultiListObjectClass
+{
+public:
+
+	TexProjectClass(void);
+	virtual ~TexProjectClass(void);
+
+	/*
+	** Material settings
+	*/
+	void						Set_Texture_Size(int size);
+	int						Get_Texture_Size(void);
+	void						Init_Multiplicative(void);
+	void						Init_Additive(void);
+	void						Set_Intensity(float intensity,bool immediate = false);	// 1.0 = on 100%, 0.0 = 'off'
+	float						Get_Intensity(void);
+	bool						Is_Intensity_Zero(void);
+	void						Set_Attenuation(float attenuation);								// 1.0 = on, 0.0 = off
+	float						Get_Attenuation(void);
+	void						Enable_Attenuation(bool onoff);
+	bool						Is_Attenuation_Enabled(void);
+	MaterialPassClass *	Peek_Material_Pass(void);
+
+	/*
+	** Options
+	*/
+	void						Enable_Affect_Dynamic_Objects(bool onoff)				{ Set_Flag(AFFECT_DYNAMIC_OBJS,onoff); }
+	bool						Is_Affect_Dynamic_Objects_Enabled(void)				{ return Get_Flag(AFFECT_DYNAMIC_OBJS); }
+	void						Enable_Affect_Static_Objects(bool onoff)				{ Set_Flag(AFFECT_STATIC_OBJS,onoff); }
+	bool						Is_Affect_Static_Objects_Enabled(void)					{ return Get_Flag(AFFECT_STATIC_OBJS); }
+	void						Enable_Depth_Gradient(bool onoff);
+	bool						Is_Depth_Gradient_Enabled(bool onoff);
+
+	/*
+	** Manual initialization of a TexProjectClass
+	** 1 - call ProjectorClass::Set_Transform
+	** 2 - call Set_Projection_Perspective -or- Set_Projection_Ortho
+	** 3 - call Set_Texture.
+	*/
+	virtual void			Set_Perspective_Projection(float hfov,float vfov,float znear,float zfar);
+	virtual void			Set_Ortho_Projection(float xmin,float xmax,float ymin,float ymax,float znear,float zfar);
+
+	void						Set_Texture(TextureClass * texture);
+	TextureClass *			Get_Texture(void) const;
+	TextureClass *			Peek_Texture(void) const;
+
+
+	void						Set_DepthStencilBuffer(ZTextureClass* ztex);
+	ZTextureClass*			Get_DepthStencilBuffer() const;
+	ZTextureClass*			Peek_DepthStencilBuffer() const;
+
+	/*
+	** Automatic initialization of a TexProjectClass.
+	** First set up your projection parameters, give the projector a render target, then call Compute_Texture
+	*/
+	bool						Compute_Perspective_Projection(RenderObjClass * obj,const Vector3 & lightpos,float znear=-1.0f,float zfar=-1.0f);
+	bool						Compute_Perspective_Projection(const AABoxClass & obj_box,const Matrix3D & tm,const Vector3 & lightpos,float znear=-1.0f,float zfar=-1.0f);
+
+	bool						Compute_Ortho_Projection(RenderObjClass * obj,const Vector3 & lightdir,float znear=-1.0f,float zfar=-1.0f);
+	bool						Compute_Ortho_Projection(const AABoxClass & obj_box,const Matrix3D & tm,const Vector3 & lightdir,float znear=-1.0f,float zfar=-1.0f);
+
+	bool						Needs_Render_Target(void);
+	void						Set_Render_Target(TextureClass* render_target, ZTextureClass* ztarget=NULL);
+	TextureClass*			Peek_Render_Target(TextureClass** rtarget=NULL, ZTextureClass** ztarget=NULL);
+
+	bool						Compute_Texture(RenderObjClass * model,SpecialRenderInfoClass * context);
+
+	/*
+	** Prep for rendering, called by the scene prior to usage.
+	*/
+	virtual void			Pre_Render_Update(const Matrix3D & camera);
+
+	/*
+	** virtual interface for getting the pointer of the object that generated this shadow.
+	** defaults to returning NULL.  This is implemented by some derived classes and used by
+	** the system to prevent a projection from being applied to the object that generated
+	** the projection...
+	** (gth) feels kludgy, this got a little messy when I moved this code into WW3D from WWPhys
+	*/
+	virtual void *			Get_Projection_Object_ID(void) const { return NULL; }
+
+protected:
+
+	void						Set_Flag(uint32 flag,bool onoff);
+	bool						Get_Flag(uint32 flag) const;
+	virtual void			Update_WS_Bounding_Volume(void);
+	void						Configure_Camera(CameraClass & camera);
+
+	enum FlagsType
+	{
+		PERSPECTIVE				= 0x00000001,		// PERSPECTIVE or ORTHO
+		ADDITIVE					= 0x00000002,		// ADDITIVE or MULTIPLICATIVE
+		TEXTURE_DIRTY			= 0x00000004,		// used by derived DynTexProjectClass
+		VOLATILE					= 0x00000008,		// this is a volatile texture.
+		ATTENUATE				= 0x00000010,		// this projector should be attenuated based on distance to viewer
+		AFFECT_DYNAMIC_OBJS	= 0x00000020,		// this projector affects dynamic objects
+		AFFECT_STATIC_OBJS	= 0x00000040,		// this projector affects static objects
+		USE_DEPTH_GRADIENT	= 0x00000080,		// fade the projection as a function of depth
+		HAS_RENDER_TARGET		= 0x00000100,		// the texture we have can be a render target
+		SIZE_MASK				= 0xFFF00000,		// desired texture size stored in upper 3 nibbles
+		SIZE_SHIFT				= 20,
+
+		DEFAULT_FLAGS			= ATTENUATE | AFFECT_DYNAMIC_OBJS | AFFECT_STATIC_OBJS
+	};
+
+	uint32						Flags;
+
+	/*
+	** Intensity Controls
+	*/
+	float							DesiredIntensity;					// last input desired intensity.
+	float							Intensity;							// basic shadow intensity.  value between 0 and 1
+	float							Attenuation;						// attenuation factor based on distance from camera.  value between 0 and 1
+
+	/*
+	** Material pass to be added to any object that intersects the volume
+	*/
+	MaterialPassClass *		MaterialPass;
+	MatrixMapperClass *		Mapper1;
+	TextureClass *				RenderTarget;
+	ZTextureClass*				DepthStencilTarget;
+
+	/*
+	** I have to remember all of these values so that I can properly initialize a CameraClass
+	** when we do render-to-texture.  Some day we will merge CameraClass and ProjectorClass.
+	*/
+	float							HFov;				// horizontal fov (for perspective mode)
+	float							VFov;				// vertical fov (for perspective mode)
+	float							XMin;				// left x clip plane (for ortho)
+	float							XMax;				// right x clip plane (for ortho)
+	float							YMin;				// bottom y clip plane (for ortho)
+	float							YMax;				// top y clip plane (for ortho)
+	float							ZNear,ZFar;		// z clip planes (for both modes)
+};
+
+
+/*
+** Texture Projector Lists
+*/
+typedef RefMultiListClass<TexProjectClass>		TexProjListClass;
+typedef RefMultiListIterator<TexProjectClass>	TexProjListIterator;
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.cpp b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.cpp
index f9644b71c0d..281eac76ae5 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.cpp
@@ -16,43 +16,43 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Commando                                 * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/textdraw.cpp       $* 
- *                                                                         * 
- *                      $Author:: Jani_p                                  $* 
- *                                                                         * 
- *                     $Modtime:: 3/22/01 8:03p                           $* 
- *                                                                         * 
- *                    $Revision:: 7                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : Commando                                 *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/textdraw.cpp       $*
+ *                                                                         *
+ *                      $Author:: Jani_p                                  $*
+ *                                                                         *
+ *                     $Modtime:: 3/22/01 8:03p                           $*
+ *                                                                         *
+ *                    $Revision:: 7                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "textdraw.h"
 #include "font3d.h"
 #include "simplevec.h"
 
-/*********************************************************************************************** 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
  * TextDrawClass::TextDrawClass( int ) -- Constructor										              *
- *                                                                                             * 
+ *                                                                                             *
  * Creates a TextDrawClass object by creating and initializing a Dynamic Mesh, inserting it	  *
  * into the given scene, and allocating space for the given number of maximum chars.			  *
- *                                                                                             * 
+ *                                                                                             *
  ***********************************************************************************************/
-TextDrawClass::TextDrawClass( int max_chars ) : 
+TextDrawClass::TextDrawClass( int max_chars ) :
 	DynamicMeshClass( max_chars * 2, max_chars * 4 ),
 	TextColor( 1.0f, 1.0f, 1.0f )
 {
 	// Build the default Vertex Material
 	DefaultVertexMaterial = NEW_REF( VertexMaterialClass, () );
-	DefaultVertexMaterial->Set_Diffuse( 0, 0, 0 );	
+	DefaultVertexMaterial->Set_Diffuse( 0, 0, 0 );
 	DefaultVertexMaterial->Set_Opacity(1);
 	DefaultVertexMaterial->Set_Emissive( 1, 1, 1 );
 	Set_Vertex_Material( DefaultVertexMaterial );
@@ -71,25 +71,25 @@ TextDrawClass::TextDrawClass( int max_chars ) :
 //	Set_Coordinate_Ranges( Vector2( -320,240 ), Vector2( 320,-240 ), Vector2( -320,240 ), Vector2( 320,-240 ) );
 }
 
-/*********************************************************************************************** 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
  * TextDrawClass::~TextDrawClass( void ) -- Destructor													  *
- *                                                                                             * 
+ *                                                                                             *
  ***********************************************************************************************/
 TextDrawClass::~TextDrawClass( void )
 {
 	DefaultVertexMaterial->Release_Ref();
 }
 
-/*********************************************************************************************** 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
  * TextDrawClass::Reset( void ) -- Flush the mesh
- *                                                                                             * 
+ *                                                                                             *
  ***********************************************************************************************/
 void TextDrawClass::Reset( void )
 {
-	Reset_Flags();	
-	Reset_Mesh_Counters();	
+	Reset_Flags();
+	Reset_Mesh_Counters();
 
 	// Reinstall the default vertex material and shader
 	Enable_Sort();
@@ -100,8 +100,8 @@ void TextDrawClass::Reset( void )
 /*
 **
 */
-void	TextDrawClass::Set_Coordinate_Ranges(	
-			const Vector2 & src_ul, const Vector2 & src_lr, 
+void	TextDrawClass::Set_Coordinate_Ranges(
+			const Vector2 & src_ul, const Vector2 & src_lr,
 			const Vector2 & dest_ul, const Vector2 & dest_lr )
 {
 	TranslateScale.X = (dest_lr.X - dest_ul.X) / (src_lr.X - src_ul.X);
@@ -184,22 +184,22 @@ void TextDrawClass::Line_Ends( const Vector2 & a, const Vector2 & b, float width
 }
 
 
-/*********************************************************************************************** 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
  * float	TextDrawClass::Get_Width( Font3DInstanceClass *, char * )									  *
- *                                                                                             * 
+ *                                                                                             *
  * WARNING:  Should not be used to draw characters which need to wrap or have embedded line    *
  *           feeds.                                                                            *
- *                                                                                             * 
+ *                                                                                             *
  * Returns the scaled string width in normalized screen unit                                   *
- *                                                                                             * 
+ *                                                                                             *
  ***********************************************************************************************/
 float	TextDrawClass::Get_Width( Font3DInstanceClass *font, const char *message )
 {
 	float total_width = 0.0f;
 
 	/*
-	** for each character, get_width it 
+	** for each character, get_width it
 	*/
 	while (*message != 0) {
 		total_width += font->Char_Spacing( *message++ );
@@ -221,15 +221,15 @@ float	TextDrawClass::Get_Height( Font3DInstanceClass *font, const char *message
 }
 
 
-/*********************************************************************************************** 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
  * float	TextDrawClass::Print( Font3DInstanceClass *, char, float, float, float )							  *
- *                                                                                             * 
+ *                                                                                             *
  * Draws (actually creates two trianlges to display) a character on the screen at the given    *
  * normalized screen unit coordinates at the current font scale.                               *
- *                                                                                             * 
+ *                                                                                             *
  * Returns the scaled character width in normalized screen unit                                *
- *                                                                                             * 
+ *                                                                                             *
  ***********************************************************************************************/
 float	TextDrawClass::Print( Font3DInstanceClass *font, char ch, float screen_x, float screen_y )
 {
@@ -288,19 +288,19 @@ float	TextDrawClass::Print( Font3DInstanceClass *font, char ch, float screen_x,
 }
 
 
-/*********************************************************************************************** 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
  * float	TextDrawClass::Print( Font3DInstanceClass *, char *, float, float, float )						  *
- *                                                                                             * 
+ *                                                                                             *
  * Draws the given string at the given pixel coordinates.  Uses the given font and its current *
  * scale.  Passes each character to the above routine and moves the x-coordinate forward after *
- * each char.                                                                                  *          * 
- *                                                                                             * 
+ * each char.                                                                                  *          *
+ *                                                                                             *
  * WARNING:  Should not be used to draw characters which need to wrap or have embedded line    *
- *           feeds.                                                                            *                * 
- *                                                                                             * 
+ *           feeds.                                                                            *                *
+ *                                                                                             *
  * Returns the string pixel width																				  *
- *                                                                                             * 
+ *                                                                                             *
  ***********************************************************************************************/
 float	TextDrawClass::Print( Font3DInstanceClass *font, const char *message, float screen_x, float screen_y )
 {
@@ -325,12 +325,12 @@ float	TextDrawClass::Print( Font3DInstanceClass *font, const char *message, floa
 }
 
 
-/*********************************************************************************************** 
- *                                                                                             * 
+/***********************************************************************************************
+ *                                                                                             *
  * void	TextDrawClass::Show_Font( Font3DInstanceClass *, float, float, float )								  *
- *                                                                                             * 
+ *                                                                                             *
  * Dumps the font texture to the screen as two triangles. For debugging only.						  *
- *                                                                                             * 
+ *                                                                                             *
  ***********************************************************************************************/
 void	TextDrawClass::Show_Font( Font3DInstanceClass *font, float screen_x, float screen_y )
 {
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h
index 8718017e2e9..668ace7d1ab 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h
@@ -16,29 +16,23 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Commando	                              * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/textdraw.h         $* 
- *                                                                         * 
- *                      $Author:: Greg_h                                  $* 
- *                                                                         * 
- *                     $Modtime:: 3/15/01 3:41p                           $* 
- *                                                                         * 
- *                    $Revision:: 4                                       $* 
- *                                                                         * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : Commando	                              *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/textdraw.h         $*
+ *                                                                         *
+ *                      $Author:: Greg_h                                  $*
+ *                                                                         *
+ *                     $Modtime:: 3/15/01 3:41p                           $*
+ *                                                                         *
+ *                    $Revision:: 4                                       $*
+ *                                                                         *
  *-------------------------------------------------------------------------*/
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef TEXTDRAW_H
-#define TEXTDRAW_H
 
 #include "always.h"
 #include "dynamesh.h"
@@ -53,8 +47,8 @@ class	Font3DInstanceClass;
 ** TextDrawClass
 **
 ** This class provides a simple method to draw 2D text into a scene.
-** Both strings and individual characters can be drawn to any normalized 
-** screen coordinates ( 0.. 1 ), or any scale/offset. 
+** Both strings and individual characters can be drawn to any normalized
+** screen coordinates ( 0.. 1 ), or any scale/offset.
 **  This class uses a dynamic mesh for all polygon and vertex management
 **
 *******************************************************************/
@@ -70,7 +64,7 @@ class TextDrawClass : public DynamicMeshClass
 	~TextDrawClass();
 
 	// Set Coordinate Range
-	void	Set_Coordinate_Ranges(	const Vector2 & param_ul, const Vector2 & param_lr, 
+	void	Set_Coordinate_Ranges(	const Vector2 & param_ul, const Vector2 & param_lr,
 											const Vector2 & dest_ul, const Vector2 & dest_lr );
 
 	// Reset all polys and verts
@@ -116,5 +110,3 @@ class TextDrawClass : public DynamicMeshClass
 	Vector2					TranslateOffset;
 	Vector2					PixelSize;
 };
-
-#endif	// TEXTDRAW_H
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp
new file mode 100644
index 00000000000..a87382f6478
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp
@@ -0,0 +1,1908 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3D                                                         *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/texture.cpp                            $*
+ *                                                                                             *
+ *                  $Org Author:: Steve_t                                                     $*
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *                     $Modtime:: 08/05/02 1:27p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 85                                                          $*
+ *                                                                                             *
+ * 06/27/02 KM Texture class abstraction																			*
+ * 08/05/02 KM Texture class redesign (revisited)
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   FileListTextureClass::Load_Frame_Surface -- Load source texture                           *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#include "texture.h"
+
+#include <d3d8.h>
+#include <d3dx8core.h>
+#include "dx8wrapper.h"
+#include "TARGA.h"
+#include <nstrdup.h>
+#include "w3d_file.h"
+#include "assetmgr.h"
+#include "formconv.h"
+#include "textureloader.h"
+#include "missingtexture.h"
+#include "ffactory.h"
+#include "dx8caps.h"
+#include "dx8texman.h"
+#include "meshmatdesc.h"
+#include "texturethumbnail.h"
+#include "wwprofile.h"
+
+const unsigned DEFAULT_INACTIVATION_TIME=20000;
+
+/*
+** Definitions of static members:
+*/
+
+static unsigned unused_texture_id;
+
+// This throttles submissions to the background texture loading queue.
+static unsigned TexturesAppliedPerFrame;
+const unsigned MAX_TEXTURES_APPLIED_PER_FRAME=2;
+
+
+/*!
+ * KM General base constructor for texture classes
+ */
+TextureBaseClass::TextureBaseClass
+(
+	unsigned int width,
+	unsigned int height,
+	enum MipCountType mip_level_count,
+	enum PoolType pool,
+	bool rendertarget,
+	bool reducible
+)
+:	MipLevelCount(mip_level_count),
+	D3DTexture(NULL),
+	Initialized(false),
+   Name(""),
+	FullPath(""),
+	texture_id(unused_texture_id++),
+	IsLightmap(false),
+	IsProcedural(false),
+	IsReducible(reducible),
+	IsCompressionAllowed(false),
+	InactivationTime(0),
+	ExtendedInactivationTime(0),
+	LastInactivationSyncTime(0),
+	LastAccessed(0),
+	Width(width),
+	Height(height),
+	Pool(pool),
+	Dirty(false),
+	TextureLoadTask(NULL),
+	ThumbnailLoadTask(NULL),
+	HSVShift(0.0f,0.0f,0.0f)
+{
+}
+
+
+//**********************************************************************************************
+//! Base texture class destructor
+/*! KJM
+*/
+TextureBaseClass::~TextureBaseClass(void)
+{
+	delete TextureLoadTask;
+	TextureLoadTask=NULL;
+	delete ThumbnailLoadTask;
+	ThumbnailLoadTask=NULL;
+
+	if (D3DTexture)
+	{
+		D3DTexture->Release();
+		D3DTexture = NULL;
+	}
+
+	DX8TextureManagerClass::Remove(this);
+}
+
+
+
+
+//**********************************************************************************************
+//! Invalidate old unused textures
+/*!
+*/
+void TextureBaseClass::Invalidate_Old_Unused_Textures(unsigned invalidation_time_override)
+{
+	// (gth) If thumbnails are not enabled, then we don't run this code.
+	if (WW3D::Get_Thumbnail_Enabled() == false) {
+		return;
+	}
+
+	// Zero the texture apply count in this function because this is called every frame...(this wasn't in E&B main branch KJM)
+	TexturesAppliedPerFrame=0;
+
+	unsigned synctime=WW3D::Get_Sync_Time();
+	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
+	// Loop through all the textures in the manager
+
+	for (ite.First ();!ite.Is_Done();ite.Next ())
+	{
+		TextureClass* tex=ite.Peek_Value();
+
+		// Consider invalidating if texture has been initialized and defines inactivation time
+		if (tex->Initialized && tex->InactivationTime)
+		{
+			unsigned age=synctime-tex->LastAccessed;
+
+			if (invalidation_time_override)
+			{
+				if (age>invalidation_time_override)
+				{
+					tex->Invalidate();
+					tex->LastInactivationSyncTime=synctime;
+				}
+			}
+			else
+			{
+				// Not used in the last n milliseconds?
+				if (age>(tex->InactivationTime+tex->ExtendedInactivationTime))
+				{
+					tex->Invalidate();
+					tex->LastInactivationSyncTime=synctime;
+				}
+			}
+		}
+	}
+}
+
+
+
+
+
+//**********************************************************************************************
+//! Invalidate this texture
+/*!
+*/
+void TextureBaseClass::Invalidate()
+{
+	if (TextureLoadTask) {
+		return;
+	}
+	if (ThumbnailLoadTask) {
+		return;
+	}
+
+	// Don't invalidate procedural textures
+	if (IsProcedural) {
+		return;
+	}
+
+	if (D3DTexture)
+	{
+		D3DTexture->Release();
+		D3DTexture = NULL;
+	}
+
+	Initialized=false;
+
+	LastAccessed=WW3D::Get_Sync_Time();
+/*	was battlefield version// If the texture has already been initialised we should exit now
+	if (Initialized) return;
+
+	WWPROFILE(("TextureClass::Init()"));
+
+	// If the texture has recently been inactivated, increase the inactivation time (this texture obviously
+	// should not have been inactivated yet).
+
+	if (InactivationTime && LastInactivationSyncTime) {
+		if ((WW3D::Get_Sync_Time()-LastInactivationSyncTime)<InactivationTime) {
+			ExtendedInactivationTime=3*InactivationTime;
+		}
+		LastInactivationSyncTime=0;
+	}
+
+	if (ThumbnailLoadTask)
+	{
+		return;
+	}
+
+	// Don't invalidate procedural textures
+	if (IsProcedural)
+	{
+		return;
+	}
+
+	if (D3DTexture)
+	{
+		D3DTexture->Release();
+		D3DTexture = NULL;
+	}
+
+	Initialized=false;
+
+	LastAccessed=WW3D::Get_Sync_Time();*/
+}
+
+//**********************************************************************************************
+//! Returns a pointer to the d3d texture
+/*!
+*/
+IDirect3DBaseTexture8 * TextureBaseClass::Peek_D3D_Base_Texture() const
+{
+	LastAccessed=WW3D::Get_Sync_Time();
+	return D3DTexture;
+}
+
+//**********************************************************************************************
+//! Set the d3d texture pointer.  Handles ref counts properly.
+/*!
+*/
+void TextureBaseClass::Set_D3D_Base_Texture(IDirect3DBaseTexture8* tex)
+{
+	// (gth) Generals does stuff directly with the D3DTexture pointer so lets
+	// reset the access timer whenever someon messes with this pointer.
+	LastAccessed=WW3D::Get_Sync_Time();
+
+	if (D3DTexture != NULL) {
+		D3DTexture->Release();
+	}
+	D3DTexture = tex;
+	if (D3DTexture != NULL) {
+		D3DTexture->AddRef();
+	}
+}
+
+
+//**********************************************************************************************
+//! Load locked surface
+/*!
+*/
+void TextureBaseClass::Load_Locked_Surface()
+{
+	WWPROFILE(("TextureClass::Load_Locked_Surface()"));
+	if (D3DTexture) D3DTexture->Release();
+	D3DTexture=0;
+	TextureLoader::Request_Thumbnail(this);
+	Initialized=false;
+}
+
+
+//**********************************************************************************************
+//! Is missing texture
+/*!
+*/
+bool TextureBaseClass::Is_Missing_Texture()
+{
+	bool flag = false;
+	IDirect3DBaseTexture8 *missing_texture = MissingTexture::_Get_Missing_Texture();
+
+	if (D3DTexture == missing_texture)
+		flag = true;
+
+	if (missing_texture)
+	{
+		missing_texture->Release();
+	}
+
+	return flag;
+}
+
+
+//**********************************************************************************************
+//! Set texture name
+/*!
+*/
+void TextureBaseClass::Set_Texture_Name(const char * name)
+{
+	Name=name;
+}
+
+
+
+
+//**********************************************************************************************
+//! Get priority
+/*!
+*/
+unsigned int TextureBaseClass::Get_Priority(void)
+{
+	if (!D3DTexture)
+	{
+		WWASSERT_PRINT(0, "Get_Priority: D3DTexture is NULL!");
+		return 0;
+	}
+
+#ifndef _XBOX
+	return D3DTexture->GetPriority();
+#else
+	return 0;
+#endif
+}
+
+
+//**********************************************************************************************
+//! Set priority
+/*!
+*/
+unsigned int TextureBaseClass::Set_Priority(unsigned int priority)
+{
+	if (!D3DTexture)
+	{
+		WWASSERT_PRINT(0, "Set_Priority: D3DTexture is NULL!");
+		return 0;
+	}
+
+#ifndef _XBOX
+	return D3DTexture->SetPriority(priority);
+#else
+	return 0;
+#endif
+}
+
+
+//**********************************************************************************************
+//! Get reduction mip levels
+/*!
+*/
+unsigned TextureBaseClass::Get_Reduction() const
+{
+	// don't reduce if the texture is too small already or
+	// has no mip map levels
+	if (MipLevelCount==MIP_LEVELS_1) return 0;
+	if (Width <= 32 || Height <= 32) return 0;
+
+	int reduction=WW3D::Get_Texture_Reduction();
+
+	// 'large texture extra reduction' causes textures above 256x256 to be reduced one more step.
+	if (WW3D::Is_Large_Texture_Extra_Reduction_Enabled() && (Width > 256 || Height > 256)) {
+		reduction++;
+	}
+	if (MipLevelCount && reduction>MipLevelCount) {
+		reduction=MipLevelCount;
+	}
+	return reduction;
+}
+
+
+
+//**********************************************************************************************
+//! Apply NULL texture state
+/*!
+*/
+void TextureBaseClass::Apply_Null(unsigned int stage)
+{
+	// This function sets the render states for a "NULL" texture
+	DX8Wrapper::Set_DX8_Texture(stage, NULL);
+}
+
+// ----------------------------------------------------------------------------
+// Setting HSV_Shift value is always relative to the original texture. This function invalidates the
+// texture surface and causes the texture to be reloaded. For thumbnailable textures, the hue shifting
+// is done in the background loading thread.
+// ----------------------------------------------------------------------------
+void TextureBaseClass::Set_HSV_Shift(const Vector3 &hsv_shift)
+{
+	Invalidate();
+	HSVShift=hsv_shift;
+}
+
+//**********************************************************************************************
+//! Get total locked surface size
+/*! KM
+*/
+int TextureBaseClass::_Get_Total_Locked_Surface_Size()
+{
+	int total_locked_surface_size=0;
+
+	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
+	// Loop through all the textures in the manager
+	for (ite.First ();!ite.Is_Done();ite.Next ())
+	{
+		// Get the current texture
+		TextureBaseClass* tex=ite.Peek_Value();
+		if (!tex->Initialized)
+		{
+			total_locked_surface_size+=tex->Get_Texture_Memory_Usage();
+		}
+	}
+	return total_locked_surface_size;
+}
+
+//**********************************************************************************************
+//! Get total texture size
+/*! KM
+*/
+int TextureBaseClass::_Get_Total_Texture_Size()
+{
+	int total_texture_size=0;
+
+	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
+	// Loop through all the textures in the manager
+	for (ite.First ();!ite.Is_Done();ite.Next ())
+	{
+		// Get the current texture
+		TextureBaseClass* tex=ite.Peek_Value();
+		total_texture_size+=tex->Get_Texture_Memory_Usage();
+	}
+	return total_texture_size;
+}
+
+// ----------------------------------------------------------------------------
+
+
+//**********************************************************************************************
+//! Get total lightmap texture size
+/*!
+*/
+int TextureBaseClass::_Get_Total_Lightmap_Texture_Size()
+{
+	int total_texture_size=0;
+
+	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
+	// Loop through all the textures in the manager
+	for (ite.First ();!ite.Is_Done();ite.Next ())
+	{
+		// Get the current texture
+		TextureBaseClass* tex=ite.Peek_Value();
+		if (tex->Is_Lightmap())
+		{
+			total_texture_size+=tex->Get_Texture_Memory_Usage();
+		}
+	}
+	return total_texture_size;
+}
+
+
+//**********************************************************************************************
+//! Get total procedural texture size
+/*!
+*/
+int TextureBaseClass::_Get_Total_Procedural_Texture_Size()
+{
+	int total_texture_size=0;
+
+	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
+	// Loop through all the textures in the manager
+	for (ite.First ();!ite.Is_Done();ite.Next ())
+	{
+		// Get the current texture
+		TextureBaseClass* tex=ite.Peek_Value();
+		if (tex->Is_Procedural())
+		{
+			total_texture_size+=tex->Get_Texture_Memory_Usage();
+		}
+	}
+	return total_texture_size;
+}
+
+//**********************************************************************************************
+//! Get total texture count
+/*!
+*/
+int TextureBaseClass::_Get_Total_Texture_Count()
+{
+	int texture_count=0;
+
+	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
+	// Loop through all the textures in the manager
+	for (ite.First ();!ite.Is_Done();ite.Next ())
+	{
+		texture_count++;
+	}
+
+	return texture_count;
+}
+
+// ----------------------------------------------------------------------------
+
+
+//**********************************************************************************************
+//! Get total light map texture count
+/*!
+*/
+int TextureBaseClass::_Get_Total_Lightmap_Texture_Count()
+{
+	int texture_count=0;
+
+	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
+	// Loop through all the textures in the manager
+	for (ite.First ();!ite.Is_Done();ite.Next ())
+	{
+		if (ite.Peek_Value()->Is_Lightmap())
+		{
+			texture_count++;
+		}
+	}
+
+	return texture_count;
+}
+
+//**********************************************************************************************
+//! Get total procedural texture count
+/*!
+*/
+int TextureBaseClass::_Get_Total_Procedural_Texture_Count()
+{
+	int texture_count=0;
+
+	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
+	// Loop through all the textures in the manager
+	for (ite.First ();!ite.Is_Done();ite.Next ())
+	{
+		if (ite.Peek_Value()->Is_Procedural())
+		{
+			texture_count++;
+		}
+	}
+
+	return texture_count;
+}
+
+
+//**********************************************************************************************
+//! Get total locked surface count
+/*!
+*/
+int TextureBaseClass::_Get_Total_Locked_Surface_Count()
+{
+	int texture_count=0;
+
+	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
+	// Loop through all the textures in the manager
+	for (ite.First ();!ite.Is_Done();ite.Next ())
+	{
+		// Get the current texture
+		TextureBaseClass* tex=ite.Peek_Value();
+		if (!tex->Initialized)
+		{
+			texture_count++;
+		}
+	}
+
+	return texture_count;
+}
+
+/*************************************************************************
+**                             TextureClass
+*************************************************************************/
+TextureClass::TextureClass
+(
+	unsigned width,
+	unsigned height,
+	WW3DFormat format,
+	MipCountType mip_level_count,
+	PoolType pool,
+	bool rendertarget,
+	bool allow_reduction
+)
+:	TextureBaseClass(width, height, mip_level_count, pool, rendertarget,allow_reduction),
+	Filter(mip_level_count),
+	TextureFormat(format)
+{
+	Initialized=true;
+	IsProcedural=true;
+	IsReducible=false;
+
+	switch (format)
+	{
+	case WW3D_FORMAT_DXT1:
+	case WW3D_FORMAT_DXT2:
+	case WW3D_FORMAT_DXT3:
+	case WW3D_FORMAT_DXT4:
+	case WW3D_FORMAT_DXT5:
+		IsCompressionAllowed=true;
+		break;
+	default : break;
+	}
+
+	D3DPOOL d3dpool=(D3DPOOL)0;
+	switch(pool)
+	{
+	case POOL_DEFAULT		: d3dpool=D3DPOOL_DEFAULT; break;
+	case POOL_MANAGED		: d3dpool=D3DPOOL_MANAGED; break;
+	case POOL_SYSTEMMEM	: d3dpool=D3DPOOL_SYSTEMMEM; break;
+	default: WWASSERT(0);
+	}
+
+	Poke_Texture
+	(
+		DX8Wrapper::_Create_DX8_Texture
+		(
+			width,
+			height,
+			format,
+			mip_level_count,
+			d3dpool,
+			rendertarget
+		)
+	);
+
+	if (pool==POOL_DEFAULT)
+	{
+		Set_Dirty();
+		DX8TextureTrackerClass *track=new DX8TextureTrackerClass
+		(
+			width,
+			height,
+			format,
+			mip_level_count,
+			this,
+			rendertarget
+		);
+		DX8TextureManagerClass::Add(track);
+	}
+	LastAccessed=WW3D::Get_Sync_Time();
+}
+
+
+
+// ----------------------------------------------------------------------------
+TextureClass::TextureClass
+(
+	const char *name,
+	const char *full_path,
+	MipCountType mip_level_count,
+	WW3DFormat texture_format,
+	bool allow_compression,
+	bool allow_reduction
+)
+:	TextureBaseClass(0, 0, mip_level_count),
+	Filter(mip_level_count),
+	TextureFormat(texture_format)
+{
+	IsCompressionAllowed=allow_compression;
+	InactivationTime=DEFAULT_INACTIVATION_TIME;		// Default inactivation time 30 seconds
+	IsReducible=allow_reduction;
+
+	switch (TextureFormat)
+	{
+	case WW3D_FORMAT_DXT1:
+	case WW3D_FORMAT_DXT2:
+	case WW3D_FORMAT_DXT3:
+	case WW3D_FORMAT_DXT4:
+	case WW3D_FORMAT_DXT5:
+		IsCompressionAllowed=true;
+		break;
+	case WW3D_FORMAT_U8V8:		// Bumpmap
+	case WW3D_FORMAT_L6V5U5:	// Bumpmap
+	case WW3D_FORMAT_X8L8V8U8:	// Bumpmap
+		// If requesting bumpmap format that isn't available we'll just return the surface in whatever color
+		// format the texture file is in. (This is illegal case, the format support should always be queried
+		// before creating a bump texture!)
+		if (!DX8Wrapper::Is_Initted() || !DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(TextureFormat))
+		{
+			TextureFormat=WW3D_FORMAT_UNKNOWN;
+		}
+		// If bump format is valid, make sure compression is not allowed so that we don't even attempt to load
+		// from a compressed file (quality isn't good enough for bump map). Also disable mipmapping.
+		else
+		{
+			IsCompressionAllowed=false;
+			MipLevelCount=MIP_LEVELS_1;
+			Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
+		}
+		break;
+	default:	break;
+	}
+
+	WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name");
+	int len=strlen(name);
+	for (int i=0;i<len;++i)
+	{
+		if (name[i]=='+')
+		{
+			IsLightmap=true;
+
+			// Set bilinear filtering for lightmaps (they are very stretched and
+			// low detail so we don't care for anisotropic or trilinear filtering...)
+			Filter.Set_Min_Filter(TextureFilterClass::FILTER_TYPE_FAST);
+			Filter.Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_FAST);
+			if (mip_level_count!=MIP_LEVELS_1) Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_FAST);
+			break;
+		}
+	}
+	Set_Texture_Name(name);
+	Set_Full_Path(full_path);
+	WWASSERT(name[0]!='\0');
+	if (!WW3D::Is_Texturing_Enabled())
+	{
+		Initialized=true;
+		Poke_Texture(NULL);
+	}
+
+	// Find original size from the thumbnail (but don't create thumbnail texture yet!)
+	ThumbnailClass* thumb=ThumbnailManagerClass::Peek_Thumbnail_Instance_From_Any_Manager(Get_Full_Path());
+	if (thumb)
+	{
+		Width=thumb->Get_Original_Texture_Width();
+		Height=thumb->Get_Original_Texture_Height();
+ 		if (MipLevelCount!=MIP_LEVELS_1) {
+ 			MipLevelCount=(MipCountType)thumb->Get_Original_Texture_Mip_Level_Count();
+ 		}
+	}
+
+	LastAccessed=WW3D::Get_Sync_Time();
+
+	// If the thumbnails are not enabled, init the texture at this point to avoid stalling when the
+	// mesh is rendered.
+	if (!WW3D::Get_Thumbnail_Enabled())
+	{
+		if (TextureLoader::Is_DX8_Thread())
+		{
+			Init();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------------
+TextureClass::TextureClass
+(
+	SurfaceClass *surface,
+	MipCountType mip_level_count
+)
+:  TextureBaseClass(0,0,mip_level_count),
+	Filter(mip_level_count),
+	TextureFormat(surface->Get_Surface_Format())
+{
+	IsProcedural=true;
+	Initialized=true;
+	IsReducible=false;
+
+	SurfaceClass::SurfaceDescription sd;
+	surface->Get_Description(sd);
+	Width=sd.Width;
+	Height=sd.Height;
+	switch (sd.Format)
+	{
+	case WW3D_FORMAT_DXT1:
+	case WW3D_FORMAT_DXT2:
+	case WW3D_FORMAT_DXT3:
+	case WW3D_FORMAT_DXT4:
+	case WW3D_FORMAT_DXT5:
+		IsCompressionAllowed=true;
+		break;
+	default: break;
+	}
+
+	Poke_Texture
+	(
+		DX8Wrapper::_Create_DX8_Texture
+		(
+			surface->Peek_D3D_Surface(),
+			mip_level_count
+		)
+	);
+	LastAccessed=WW3D::Get_Sync_Time();
+}
+
+// ----------------------------------------------------------------------------
+TextureClass::TextureClass(IDirect3DBaseTexture8* d3d_texture)
+:	TextureBaseClass
+	(
+		0,
+		0,
+		((MipCountType)d3d_texture->GetLevelCount())
+	),
+	Filter((MipCountType)d3d_texture->GetLevelCount())
+{
+	Initialized=true;
+	IsProcedural=true;
+	IsReducible=false;
+
+	Set_D3D_Base_Texture(d3d_texture);
+	IDirect3DSurface8* surface;
+	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0,&surface));
+	D3DSURFACE_DESC d3d_desc;
+	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
+	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
+	Width=d3d_desc.Width;
+	Height=d3d_desc.Height;
+	TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
+	switch (TextureFormat)
+	{
+	case WW3D_FORMAT_DXT1:
+	case WW3D_FORMAT_DXT2:
+	case WW3D_FORMAT_DXT3:
+	case WW3D_FORMAT_DXT4:
+	case WW3D_FORMAT_DXT5:
+		IsCompressionAllowed=true;
+		break;
+	default: break;
+	}
+
+	LastAccessed=WW3D::Get_Sync_Time();
+}
+
+//**********************************************************************************************
+//! Initialise the texture
+/*!
+*/
+void TextureClass::Init()
+{
+	// If the texture has already been initialised we should exit now
+	if (Initialized) return;
+
+	WWPROFILE("TextureClass::Init");
+
+	// If the texture has recently been inactivated, increase the inactivation time (this texture obviously
+	// should not have been inactivated yet).
+	if (InactivationTime && LastInactivationSyncTime)
+	{
+		if ((WW3D::Get_Sync_Time()-LastInactivationSyncTime)<InactivationTime)
+		{
+			ExtendedInactivationTime=3*InactivationTime;
+		}
+		LastInactivationSyncTime=0;
+	}
+
+
+	if (!Peek_D3D_Base_Texture())
+	{
+		if (!WW3D::Get_Thumbnail_Enabled() || MipLevelCount==MIP_LEVELS_1)
+		{
+//		if (MipLevelCount==MIP_LEVELS_1) {
+			TextureLoader::Request_Foreground_Loading(this);
+		}
+		else
+		{
+			WW3DFormat format=TextureFormat;
+			Load_Locked_Surface();
+			TextureFormat=format;
+		}
+	}
+
+	if (!Initialized)
+	{
+		TextureLoader::Request_Background_Loading(this);
+	}
+
+	LastAccessed=WW3D::Get_Sync_Time();
+}
+
+//**********************************************************************************************
+//! Apply new surface to texture
+/*!
+*/
+void TextureClass::Apply_New_Surface
+(
+	IDirect3DBaseTexture8* d3d_texture,
+	bool initialized,
+	bool disable_auto_invalidation
+)
+{
+	IDirect3DBaseTexture8* d3d_tex=Peek_D3D_Base_Texture();
+
+	if (d3d_tex) d3d_tex->Release();
+
+	Poke_Texture(d3d_texture);//TextureLoadTask->Peek_D3D_Texture();
+	d3d_texture->AddRef();
+
+	if (initialized) Initialized=true;
+	if (disable_auto_invalidation) InactivationTime = 0;
+
+	WWASSERT(d3d_texture);
+	IDirect3DSurface8* surface;
+	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0,&surface));
+	D3DSURFACE_DESC d3d_desc;
+	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
+	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
+	if (initialized)
+	{
+		TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
+		Width=d3d_desc.Width;
+		Height=d3d_desc.Height;
+	}
+	surface->Release();
+
+}
+
+
+//**********************************************************************************************
+//! Apply texture states
+/*!
+*/
+void TextureClass::Apply(unsigned int stage)
+{
+	// Initialization needs to be done when texture is used if it hasn't been done before.
+	// XBOX always initializes textures at creation time.
+	if (!Initialized)
+	{
+		Init();
+
+		/* was in battlefield// Non-thumbnailed textures are always initialized when used
+		if (MipLevelCount==MIP_LEVELS_1)
+		{
+		}
+		// Thumbnailed textures have delayed initialization and a background loading system
+		else
+		{
+			// Limit the number of texture initializations per frame to reduce stuttering
+			if (TexturesAppliedPerFrame<MAX_TEXTURES_APPLIED_PER_FRAME)
+			{
+				TexturesAppliedPerFrame++;
+				Init();
+			}
+			else
+			{
+				// If texture can't be initialized in this frame, at least make sure we have the thumbnail.
+				if (!Peek_Texture())
+				{
+					WW3DFormat format=TextureFormat;
+					Load_Locked_Surface();
+					TextureFormat=format;
+				}
+			}
+		}*/
+	}
+	LastAccessed=WW3D::Get_Sync_Time();
+
+	DX8_RECORD_TEXTURE(this);
+
+	// Set texture itself
+	if (WW3D::Is_Texturing_Enabled())
+	{
+		DX8Wrapper::Set_DX8_Texture(stage, Peek_D3D_Base_Texture());
+	}
+	else
+	{
+		DX8Wrapper::Set_DX8_Texture(stage, NULL);
+	}
+
+	Filter.Apply(stage);
+}
+
+//**********************************************************************************************
+//! Get surface from mip level
+/*!
+*/
+SurfaceClass *TextureClass::Get_Surface_Level(unsigned int level)
+{
+	if (!Peek_D3D_Texture())
+	{
+		WWASSERT_PRINT(0, "Get_Surface_Level: D3DTexture is NULL!");
+		return 0;
+	}
+
+	IDirect3DSurface8 *d3d_surface = NULL;
+	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(level, &d3d_surface));
+	SurfaceClass *surface = new SurfaceClass(d3d_surface);
+	d3d_surface->Release();
+
+	return surface;
+}
+
+//**********************************************************************************************
+//! Get surface description for a mip level
+/*!
+*/
+void TextureClass::Get_Level_Description( SurfaceClass::SurfaceDescription & desc, unsigned int level )
+{
+	SurfaceClass * surf = Get_Surface_Level(level);
+	if (surf != NULL) {
+		surf->Get_Description(desc);
+	}
+	REF_PTR_RELEASE(surf);
+}
+
+//**********************************************************************************************
+//! Get D3D surface from mip level
+/*!
+*/
+IDirect3DSurface8 *TextureClass::Get_D3D_Surface_Level(unsigned int level)
+{
+	if (!Peek_D3D_Texture())
+	{
+		WWASSERT_PRINT(0, "Get_D3D_Surface_Level: D3DTexture is NULL!");
+		return 0;
+	}
+
+	IDirect3DSurface8 *d3d_surface = NULL;
+	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(level, &d3d_surface));
+	return d3d_surface;
+}
+
+//**********************************************************************************************
+//! Get texture memory usage
+/*!
+*/
+unsigned TextureClass::Get_Texture_Memory_Usage() const
+{
+	int size=0;
+	if (!Peek_D3D_Texture()) return 0;
+	for (unsigned i=0;i<Peek_D3D_Texture()->GetLevelCount();++i)
+	{
+		D3DSURFACE_DESC desc;
+		DX8_ErrorCode(Peek_D3D_Texture()->GetLevelDesc(i,&desc));
+		size+=desc.Size;
+	}
+	return size;
+}
+
+
+// Utility functions
+TextureClass* Load_Texture(ChunkLoadClass & cload)
+{
+	// Assume failure
+	TextureClass *newtex = NULL;
+
+	char name[256];
+	if (cload.Open_Chunk () && (cload.Cur_Chunk_ID () == W3D_CHUNK_TEXTURE))
+	{
+
+		W3dTextureInfoStruct texinfo;
+		bool hastexinfo = false;
+
+		/*
+		** Read in the texture filename, and a possible texture info structure.
+		*/
+		while (cload.Open_Chunk()) {
+			switch (cload.Cur_Chunk_ID()) {
+				case W3D_CHUNK_TEXTURE_NAME:
+					cload.Read(&name,cload.Cur_Chunk_Length());
+					break;
+
+				case W3D_CHUNK_TEXTURE_INFO:
+					cload.Read(&texinfo,sizeof(W3dTextureInfoStruct));
+					hastexinfo = true;
+					break;
+			};
+			cload.Close_Chunk();
+		}
+		cload.Close_Chunk();
+
+		/*
+		** Get the texture from the asset manager
+		*/
+		if (hastexinfo)
+		{
+
+			MipCountType mipcount;
+
+			bool no_lod = ((texinfo.Attributes & W3DTEXTURE_NO_LOD) == W3DTEXTURE_NO_LOD);
+
+			if (no_lod)
+			{
+				mipcount = MIP_LEVELS_1;
+			}
+			else
+			{
+				switch (texinfo.Attributes & W3DTEXTURE_MIP_LEVELS_MASK) {
+
+					case W3DTEXTURE_MIP_LEVELS_ALL:
+						mipcount = MIP_LEVELS_ALL;
+						break;
+
+					case W3DTEXTURE_MIP_LEVELS_2:
+						mipcount = MIP_LEVELS_2;
+						break;
+
+					case W3DTEXTURE_MIP_LEVELS_3:
+						mipcount = MIP_LEVELS_3;
+						break;
+
+					case W3DTEXTURE_MIP_LEVELS_4:
+						mipcount = MIP_LEVELS_4;
+						break;
+
+					default:
+						WWASSERT (false);
+						mipcount = MIP_LEVELS_ALL;
+						break;
+				}
+			}
+
+			WW3DFormat format=WW3D_FORMAT_UNKNOWN;
+
+			switch (texinfo.Attributes & W3DTEXTURE_TYPE_MASK)
+			{
+
+				case W3DTEXTURE_TYPE_COLORMAP:
+					// Do nothing.
+					break;
+
+				case W3DTEXTURE_TYPE_BUMPMAP:
+				{
+					if (DX8Wrapper::Is_Initted() && DX8Wrapper::Get_Current_Caps()->Support_Bump_Envmap())
+					{
+						// No mipmaps to bumpmap for now
+						mipcount=MIP_LEVELS_1;
+
+						if (DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(WW3D_FORMAT_U8V8)) format=WW3D_FORMAT_U8V8;
+						else if (DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(WW3D_FORMAT_X8L8V8U8)) format=WW3D_FORMAT_X8L8V8U8;
+						else if (DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(WW3D_FORMAT_L6V5U5)) format=WW3D_FORMAT_L6V5U5;
+					}
+					break;
+				}
+
+				default:
+					WWASSERT (false);
+					break;
+			}
+
+			newtex = WW3DAssetManager::Get_Instance()->Get_Texture (name, mipcount, format);
+
+			if (no_lod)
+			{
+				newtex->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
+			}
+			bool u_clamp = ((texinfo.Attributes & W3DTEXTURE_CLAMP_U) != 0);
+			newtex->Get_Filter().Set_U_Addr_Mode(u_clamp ? TextureFilterClass::TEXTURE_ADDRESS_CLAMP : TextureFilterClass::TEXTURE_ADDRESS_REPEAT);
+			bool v_clamp = ((texinfo.Attributes & W3DTEXTURE_CLAMP_V) != 0);
+			newtex->Get_Filter().Set_V_Addr_Mode(v_clamp ? TextureFilterClass::TEXTURE_ADDRESS_CLAMP : TextureFilterClass::TEXTURE_ADDRESS_REPEAT);
+
+		} else
+		{
+			newtex = WW3DAssetManager::Get_Instance()->Get_Texture(name);
+		}
+
+		WWASSERT(newtex);
+	}
+
+	// Return a pointer to the new texture
+	return newtex;
+}
+
+// Utility function used by Save_Texture
+void setup_texture_attributes(TextureClass * tex, W3dTextureInfoStruct * texinfo)
+{
+	texinfo->Attributes = 0;
+
+	if (tex->Get_Filter().Get_Mip_Mapping() == TextureFilterClass::FILTER_TYPE_NONE) texinfo->Attributes |= W3DTEXTURE_NO_LOD;
+	if (tex->Get_Filter().Get_U_Addr_Mode() == TextureFilterClass::TEXTURE_ADDRESS_CLAMP) texinfo->Attributes |= W3DTEXTURE_CLAMP_U;
+	if (tex->Get_Filter().Get_V_Addr_Mode() == TextureFilterClass::TEXTURE_ADDRESS_CLAMP) texinfo->Attributes |= W3DTEXTURE_CLAMP_V;
+}
+
+
+void Save_Texture(TextureClass * texture,ChunkSaveClass & csave)
+{
+	const char * filename;
+	W3dTextureInfoStruct texinfo;
+	memset(&texinfo,0,sizeof(texinfo));
+
+	filename = texture->Get_Full_Path();
+
+	setup_texture_attributes(texture, &texinfo);
+
+	csave.Begin_Chunk(W3D_CHUNK_TEXTURE_NAME);
+	csave.Write(filename,strlen(filename)+1);
+	csave.End_Chunk();
+
+	if ((texinfo.Attributes != 0) || (texinfo.AnimType != 0) || (texinfo.FrameCount != 0)) {
+		csave.Begin_Chunk(W3D_CHUNK_TEXTURE_INFO);
+		csave.Write(&texinfo, sizeof(texinfo));
+		csave.End_Chunk();
+	}
+}
+
+
+/*!
+ *	KJM depth stencil texture constructor
+ */
+ZTextureClass::ZTextureClass
+(
+	unsigned width,
+	unsigned height,
+	WW3DZFormat zformat,
+	MipCountType mip_level_count,
+	PoolType pool
+)
+:	TextureBaseClass(width,height, mip_level_count, pool),
+	DepthStencilTextureFormat(zformat)
+{
+	D3DPOOL d3dpool=(D3DPOOL)0;
+	switch (pool)
+	{
+	case POOL_DEFAULT: d3dpool=D3DPOOL_DEFAULT; break;
+	case POOL_MANAGED: d3dpool=D3DPOOL_MANAGED; break;
+	case POOL_SYSTEMMEM: d3dpool=D3DPOOL_SYSTEMMEM;	break;
+	default:	WWASSERT(0);
+	}
+
+	Poke_Texture
+	(
+		DX8Wrapper::_Create_DX8_ZTexture
+		(
+			width,
+			height,
+			zformat,
+			mip_level_count,
+			d3dpool
+		)
+	);
+
+	if (pool==POOL_DEFAULT)
+	{
+		Set_Dirty();
+		DX8ZTextureTrackerClass *track=new DX8ZTextureTrackerClass
+		(
+			width,
+			height,
+			zformat,
+			mip_level_count,
+			this
+		);
+		DX8TextureManagerClass::Add(track);
+	}
+	Initialized=true;
+	IsProcedural=true;
+	IsReducible=false;
+
+	LastAccessed=WW3D::Get_Sync_Time();
+}
+
+
+//**********************************************************************************************
+//! Apply depth stencil texture
+/*! KM
+*/
+void ZTextureClass::Apply(unsigned int stage)
+{
+	DX8Wrapper::Set_DX8_Texture(stage, Peek_D3D_Base_Texture());
+}
+
+//**********************************************************************************************
+//! Apply new surface to texture
+/*! KM
+*/
+void ZTextureClass::Apply_New_Surface
+(
+	IDirect3DBaseTexture8* d3d_texture,
+	bool initialized,
+	bool disable_auto_invalidation
+)
+{
+	IDirect3DBaseTexture8* d3d_tex=Peek_D3D_Base_Texture();
+
+	if (d3d_tex) d3d_tex->Release();
+
+	Poke_Texture(d3d_texture);//TextureLoadTask->Peek_D3D_Texture();
+	d3d_texture->AddRef();
+
+	if (initialized) Initialized=true;
+	if (disable_auto_invalidation) InactivationTime = 0;
+
+	WWASSERT(Peek_D3D_Texture());
+	IDirect3DSurface8* surface;
+	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0,&surface));
+	D3DSURFACE_DESC d3d_desc;
+	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
+	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
+	if (initialized)
+	{
+		DepthStencilTextureFormat=D3DFormat_To_WW3DZFormat(d3d_desc.Format);
+		Width=d3d_desc.Width;
+		Height=d3d_desc.Height;
+	}
+	surface->Release();
+}
+
+//**********************************************************************************************
+//! Get D3D surface from mip level
+/*!
+*/
+IDirect3DSurface8* ZTextureClass::Get_D3D_Surface_Level(unsigned int level)
+{
+	if (!Peek_D3D_Texture())
+	{
+		WWASSERT_PRINT(0, "Get_D3D_Surface_Level: D3DTexture is NULL!");
+		return 0;
+	}
+
+	IDirect3DSurface8 *d3d_surface = NULL;
+	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(level, &d3d_surface));
+	return d3d_surface;
+}
+
+//**********************************************************************************************
+//! Get texture memory usage
+/*!
+*/
+unsigned ZTextureClass::Get_Texture_Memory_Usage() const
+{
+	int size=0;
+	if (!Peek_D3D_Texture()) return 0;
+	for (unsigned i=0;i<Peek_D3D_Texture()->GetLevelCount();++i)
+	{
+		D3DSURFACE_DESC desc;
+		DX8_ErrorCode(Peek_D3D_Texture()->GetLevelDesc(i,&desc));
+		size+=desc.Size;
+	}
+	return size;
+}
+
+
+
+/*************************************************************************
+**                             CubeTextureClass
+*************************************************************************/
+CubeTextureClass::CubeTextureClass
+(
+	unsigned width,
+	unsigned height,
+	WW3DFormat format,
+	MipCountType mip_level_count,
+	PoolType pool,
+	bool rendertarget,
+	bool allow_reduction
+)
+: TextureClass(width, height, format, mip_level_count, pool, rendertarget)
+{
+	Initialized=true;
+	IsProcedural=true;
+	IsReducible=false;
+
+	switch (format)
+	{
+	case WW3D_FORMAT_DXT1:
+	case WW3D_FORMAT_DXT2:
+	case WW3D_FORMAT_DXT3:
+	case WW3D_FORMAT_DXT4:
+	case WW3D_FORMAT_DXT5:
+		IsCompressionAllowed=true;
+		break;
+	default : break;
+	}
+
+	D3DPOOL d3dpool=(D3DPOOL)0;
+	switch(pool)
+	{
+	case POOL_DEFAULT		: d3dpool=D3DPOOL_DEFAULT; break;
+	case POOL_MANAGED		: d3dpool=D3DPOOL_MANAGED; break;
+	case POOL_SYSTEMMEM	: d3dpool=D3DPOOL_SYSTEMMEM; break;
+	default: WWASSERT(0);
+	}
+
+	Poke_Texture
+	(
+		DX8Wrapper::_Create_DX8_Cube_Texture
+		(
+			width,
+			height,
+			format,
+			mip_level_count,
+			d3dpool,
+			rendertarget
+		)
+	);
+
+	if (pool==POOL_DEFAULT)
+	{
+		Set_Dirty();
+		DX8TextureTrackerClass *track=new DX8TextureTrackerClass
+		(
+			width,
+			height,
+			format,
+			mip_level_count,
+			this,
+			rendertarget
+		);
+		DX8TextureManagerClass::Add(track);
+	}
+	LastAccessed=WW3D::Get_Sync_Time();
+}
+
+
+
+// ----------------------------------------------------------------------------
+CubeTextureClass::CubeTextureClass
+(
+	const char *name,
+	const char *full_path,
+	MipCountType mip_level_count,
+	WW3DFormat texture_format,
+	bool allow_compression,
+	bool allow_reduction
+)
+:	TextureClass(0,0,mip_level_count, POOL_MANAGED, false, texture_format)
+{
+	IsCompressionAllowed=allow_compression;
+	InactivationTime=DEFAULT_INACTIVATION_TIME;		// Default inactivation time 30 seconds
+
+	switch (TextureFormat)
+	{
+	case WW3D_FORMAT_DXT1:
+	case WW3D_FORMAT_DXT2:
+	case WW3D_FORMAT_DXT3:
+	case WW3D_FORMAT_DXT4:
+	case WW3D_FORMAT_DXT5:
+		IsCompressionAllowed=true;
+		break;
+	case WW3D_FORMAT_U8V8:		// Bumpmap
+	case WW3D_FORMAT_L6V5U5:	// Bumpmap
+	case WW3D_FORMAT_X8L8V8U8:	// Bumpmap
+		// If requesting bumpmap format that isn't available we'll just return the surface in whatever color
+		// format the texture file is in. (This is illegal case, the format support should always be queried
+		// before creating a bump texture!)
+		if (!DX8Wrapper::Is_Initted() || !DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(TextureFormat))
+		{
+			TextureFormat=WW3D_FORMAT_UNKNOWN;
+		}
+		// If bump format is valid, make sure compression is not allowed so that we don't even attempt to load
+		// from a compressed file (quality isn't good enough for bump map). Also disable mipmapping.
+		else
+		{
+			IsCompressionAllowed=false;
+			MipLevelCount=MIP_LEVELS_1;
+			Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
+		}
+		break;
+	default:	break;
+	}
+
+	WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name");
+	int len=strlen(name);
+	for (int i=0;i<len;++i)
+	{
+		if (name[i]=='+')
+		{
+			IsLightmap=true;
+
+			// Set bilinear filtering for lightmaps (they are very stretched and
+			// low detail so we don't care for anisotropic or trilinear filtering...)
+			Filter.Set_Min_Filter(TextureFilterClass::FILTER_TYPE_FAST);
+			Filter.Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_FAST);
+			if (mip_level_count!=MIP_LEVELS_1) Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_FAST);
+			break;
+		}
+	}
+	Set_Texture_Name(name);
+	Set_Full_Path(full_path);
+	WWASSERT(name[0]!='\0');
+	if (!WW3D::Is_Texturing_Enabled())
+	{
+		Initialized=true;
+		Poke_Texture(NULL);
+	}
+
+	// Find original size from the thumbnail (but don't create thumbnail texture yet!)
+	ThumbnailClass* thumb=ThumbnailManagerClass::Peek_Thumbnail_Instance_From_Any_Manager(Get_Full_Path());
+	if (thumb)
+	{
+		Width=thumb->Get_Original_Texture_Width();
+		Height=thumb->Get_Original_Texture_Height();
+ 		if (MipLevelCount!=MIP_LEVELS_1) {
+ 			MipLevelCount=(MipCountType)thumb->Get_Original_Texture_Mip_Level_Count();
+ 		}
+	}
+
+	LastAccessed=WW3D::Get_Sync_Time();
+
+	// If the thumbnails are not enabled, init the texture at this point to avoid stalling when the
+	// mesh is rendered.
+	if (!WW3D::Get_Thumbnail_Enabled())
+	{
+		if (TextureLoader::Is_DX8_Thread())
+		{
+			Init();
+		}
+	}
+}
+
+// don't know if these are needed
+#if 0
+// ----------------------------------------------------------------------------
+CubeTextureClass::CubeTextureClass
+(
+	SurfaceClass *surface,
+	MipCountType mip_level_count
+)
+:	TextureClass(0,0,mip_level_count, POOL_MANAGED, false, surface->Get_Surface_Format())
+{
+	IsProcedural=true;
+	Initialized=true;
+	IsReducible=false;
+
+	SurfaceClass::SurfaceDescription sd;
+	surface->Get_Description(sd);
+	Width=sd.Width;
+	Height=sd.Height;
+	switch (sd.Format)
+	{
+	case WW3D_FORMAT_DXT1:
+	case WW3D_FORMAT_DXT2:
+	case WW3D_FORMAT_DXT3:
+	case WW3D_FORMAT_DXT4:
+	case WW3D_FORMAT_DXT5:
+		IsCompressionAllowed=true;
+		break;
+	default: break;
+	}
+
+	Poke_Texture
+	(
+		DX8Wrapper::_Create_DX8_Cube_Texture
+		(
+			surface->Peek_D3D_Surface(),
+			mip_level_count
+		)
+	);
+	LastAccessed=WW3D::Get_Sync_Time();
+}
+
+// ----------------------------------------------------------------------------
+CubeTextureClass::CubeTextureClass(IDirect3DBaseTexture8* d3d_texture)
+:	TextureBaseClass
+	(
+		0,
+		0,
+		((MipCountType)d3d_texture->GetLevelCount())
+	),
+	Filter((MipCountType)d3d_texture->GetLevelCount())
+{
+	Initialized=true;
+	IsProcedural=true;
+	IsReducible=false;
+
+	Peek_Texture()->AddRef();
+	IDirect3DSurface8* surface;
+	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0,&surface));
+	D3DSURFACE_DESC d3d_desc;
+	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
+	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
+	Width=d3d_desc.Width;
+	Height=d3d_desc.Height;
+	TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
+	switch (TextureFormat)
+	{
+	case WW3D_FORMAT_DXT1:
+	case WW3D_FORMAT_DXT2:
+	case WW3D_FORMAT_DXT3:
+	case WW3D_FORMAT_DXT4:
+	case WW3D_FORMAT_DXT5:
+		IsCompressionAllowed=true;
+		break;
+	default: break;
+	}
+
+	LastAccessed=WW3D::Get_Sync_Time();
+}
+#endif
+
+//**********************************************************************************************
+//! Apply new surface to texture
+/*!
+*/
+void CubeTextureClass::Apply_New_Surface
+(
+	IDirect3DBaseTexture8* d3d_texture,
+	bool initialized,
+	bool disable_auto_invalidation
+)
+{
+	IDirect3DBaseTexture8* d3d_tex=Peek_D3D_Base_Texture();
+
+	if (d3d_tex) d3d_tex->Release();
+
+	Poke_Texture(d3d_texture);//TextureLoadTask->Peek_D3D_Texture();
+	d3d_texture->AddRef();
+
+	if (initialized) Initialized=true;
+	if (disable_auto_invalidation) InactivationTime = 0;
+
+	WWASSERT(d3d_texture);
+	D3DSURFACE_DESC d3d_desc;
+	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
+	DX8_ErrorCode(Peek_D3D_CubeTexture()->GetLevelDesc(0,&d3d_desc));
+
+	if (initialized)
+	{
+		TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
+		Width=d3d_desc.Width;
+		Height=d3d_desc.Height;
+	}
+}
+
+
+/*************************************************************************
+**                             VolumeTextureClass
+*************************************************************************/
+VolumeTextureClass::VolumeTextureClass
+(
+	unsigned width,
+	unsigned height,
+	unsigned depth,
+	WW3DFormat format,
+	MipCountType mip_level_count,
+	PoolType pool,
+	bool rendertarget,
+	bool allow_reduction
+)
+: TextureClass(width, height, format, mip_level_count, pool, rendertarget),
+  Depth(depth)
+{
+	Initialized=true;
+	IsProcedural=true;
+	IsReducible=false;
+
+	switch (format)
+	{
+	case WW3D_FORMAT_DXT1:
+	case WW3D_FORMAT_DXT2:
+	case WW3D_FORMAT_DXT3:
+	case WW3D_FORMAT_DXT4:
+	case WW3D_FORMAT_DXT5:
+		IsCompressionAllowed=true;
+		break;
+	default : break;
+	}
+
+	D3DPOOL d3dpool=(D3DPOOL)0;
+	switch(pool)
+	{
+	case POOL_DEFAULT		: d3dpool=D3DPOOL_DEFAULT; break;
+	case POOL_MANAGED		: d3dpool=D3DPOOL_MANAGED; break;
+	case POOL_SYSTEMMEM	: d3dpool=D3DPOOL_SYSTEMMEM; break;
+	default: WWASSERT(0);
+	}
+
+	Poke_Texture
+	(
+		DX8Wrapper::_Create_DX8_Volume_Texture
+		(
+			width,
+			height,
+			depth,
+			format,
+			mip_level_count,
+			d3dpool
+		)
+	);
+
+	if (pool==POOL_DEFAULT)
+	{
+		Set_Dirty();
+		DX8TextureTrackerClass *track=new DX8TextureTrackerClass
+		(
+			width,
+			height,
+			format,
+			mip_level_count,
+			this,
+			rendertarget
+		);
+		DX8TextureManagerClass::Add(track);
+	}
+	LastAccessed=WW3D::Get_Sync_Time();
+}
+
+
+
+// ----------------------------------------------------------------------------
+VolumeTextureClass::VolumeTextureClass
+(
+	const char *name,
+	const char *full_path,
+	MipCountType mip_level_count,
+	WW3DFormat texture_format,
+	bool allow_compression,
+	bool allow_reduction
+)
+:	TextureClass(0,0,mip_level_count, POOL_MANAGED, false, texture_format),
+	Depth(0)
+{
+	IsCompressionAllowed=allow_compression;
+	InactivationTime=DEFAULT_INACTIVATION_TIME;		// Default inactivation time 30 seconds
+
+	switch (TextureFormat)
+	{
+	case WW3D_FORMAT_DXT1:
+	case WW3D_FORMAT_DXT2:
+	case WW3D_FORMAT_DXT3:
+	case WW3D_FORMAT_DXT4:
+	case WW3D_FORMAT_DXT5:
+		IsCompressionAllowed=true;
+		break;
+	case WW3D_FORMAT_U8V8:		// Bumpmap
+	case WW3D_FORMAT_L6V5U5:	// Bumpmap
+	case WW3D_FORMAT_X8L8V8U8:	// Bumpmap
+		// If requesting bumpmap format that isn't available we'll just return the surface in whatever color
+		// format the texture file is in. (This is illegal case, the format support should always be queried
+		// before creating a bump texture!)
+		if (!DX8Wrapper::Is_Initted() || !DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(TextureFormat))
+		{
+			TextureFormat=WW3D_FORMAT_UNKNOWN;
+		}
+		// If bump format is valid, make sure compression is not allowed so that we don't even attempt to load
+		// from a compressed file (quality isn't good enough for bump map). Also disable mipmapping.
+		else
+		{
+			IsCompressionAllowed=false;
+			MipLevelCount=MIP_LEVELS_1;
+			Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
+		}
+		break;
+	default:	break;
+	}
+
+	WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name");
+	int len=strlen(name);
+	for (int i=0;i<len;++i)
+	{
+		if (name[i]=='+')
+		{
+			IsLightmap=true;
+
+			// Set bilinear filtering for lightmaps (they are very stretched and
+			// low detail so we don't care for anisotropic or trilinear filtering...)
+			Filter.Set_Min_Filter(TextureFilterClass::FILTER_TYPE_FAST);
+			Filter.Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_FAST);
+			if (mip_level_count!=MIP_LEVELS_1) Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_FAST);
+			break;
+		}
+	}
+	Set_Texture_Name(name);
+	Set_Full_Path(full_path);
+	WWASSERT(name[0]!='\0');
+	if (!WW3D::Is_Texturing_Enabled())
+	{
+		Initialized=true;
+		Poke_Texture(NULL);
+	}
+
+	// Find original size from the thumbnail (but don't create thumbnail texture yet!)
+	ThumbnailClass* thumb=ThumbnailManagerClass::Peek_Thumbnail_Instance_From_Any_Manager(Get_Full_Path());
+	if (thumb)
+	{
+		Width=thumb->Get_Original_Texture_Width();
+		Height=thumb->Get_Original_Texture_Height();
+ 		if (MipLevelCount!=MIP_LEVELS_1) {
+ 			MipLevelCount=(MipCountType)thumb->Get_Original_Texture_Mip_Level_Count();
+ 		}
+	}
+
+	LastAccessed=WW3D::Get_Sync_Time();
+
+	// If the thumbnails are not enabled, init the texture at this point to avoid stalling when the
+	// mesh is rendered.
+	if (!WW3D::Get_Thumbnail_Enabled())
+	{
+		if (TextureLoader::Is_DX8_Thread())
+		{
+			Init();
+		}
+	}
+}
+
+// don't know if these are needed
+#if 0
+// ----------------------------------------------------------------------------
+CubeTextureClass::CubeTextureClass
+(
+	SurfaceClass *surface,
+	MipCountType mip_level_count
+)
+:	TextureClass(0,0,mip_level_count, POOL_MANAGED, false, surface->Get_Surface_Format())
+{
+	IsProcedural=true;
+	Initialized=true;
+	IsReducible=false;
+
+	SurfaceClass::SurfaceDescription sd;
+	surface->Get_Description(sd);
+	Width=sd.Width;
+	Height=sd.Height;
+	switch (sd.Format)
+	{
+	case WW3D_FORMAT_DXT1:
+	case WW3D_FORMAT_DXT2:
+	case WW3D_FORMAT_DXT3:
+	case WW3D_FORMAT_DXT4:
+	case WW3D_FORMAT_DXT5:
+		IsCompressionAllowed=true;
+		break;
+	default: break;
+	}
+
+	Poke_Texture
+	(
+		DX8Wrapper::_Create_DX8_Cube_Texture
+		(
+			surface->Peek_D3D_Surface(),
+			mip_level_count
+		)
+	);
+	LastAccessed=WW3D::Get_Sync_Time();
+}
+
+// ----------------------------------------------------------------------------
+CubeTextureClass::CubeTextureClass(IDirect3DBaseTexture8* d3d_texture)
+:	TextureBaseClass
+	(
+		0,
+		0,
+		((MipCountType)d3d_texture->GetLevelCount())
+	),
+	Filter((MipCountType)d3d_texture->GetLevelCount())
+{
+	Initialized=true;
+	IsProcedural=true;
+	IsReducible=false;
+
+	Peek_Texture()->AddRef();
+	IDirect3DSurface8* surface;
+	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0,&surface));
+	D3DSURFACE_DESC d3d_desc;
+	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
+	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
+	Width=d3d_desc.Width;
+	Height=d3d_desc.Height;
+	TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
+	switch (TextureFormat)
+	{
+	case WW3D_FORMAT_DXT1:
+	case WW3D_FORMAT_DXT2:
+	case WW3D_FORMAT_DXT3:
+	case WW3D_FORMAT_DXT4:
+	case WW3D_FORMAT_DXT5:
+		IsCompressionAllowed=true;
+		break;
+	default: break;
+	}
+
+	LastAccessed=WW3D::Get_Sync_Time();
+}
+#endif
+
+
+
+
+//**********************************************************************************************
+//! Apply new surface to texture
+/*!
+*/
+void VolumeTextureClass::Apply_New_Surface
+(
+	IDirect3DBaseTexture8* d3d_texture,
+	bool initialized,
+	bool disable_auto_invalidation
+)
+{
+	IDirect3DBaseTexture8* d3d_tex=Peek_D3D_Base_Texture();
+
+	if (d3d_tex) d3d_tex->Release();
+
+	Poke_Texture(d3d_texture);//TextureLoadTask->Peek_D3D_Texture();
+	d3d_texture->AddRef();
+
+	if (initialized) Initialized=true;
+	if (disable_auto_invalidation) InactivationTime = 0;
+
+	WWASSERT(d3d_texture);
+	D3DVOLUME_DESC d3d_desc;
+	::ZeroMemory(&d3d_desc, sizeof(D3DVOLUME_DESC));
+
+	DX8_ErrorCode(Peek_D3D_VolumeTexture()->GetLevelDesc(0,&d3d_desc));
+
+	if (initialized)
+	{
+		TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
+		Width=d3d_desc.Width;
+		Height=d3d_desc.Height;
+		Depth=d3d_desc.Depth;
+	}
+}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texture.h b/Core/Libraries/Source/WWVegas/WW3D2/texture.h
new file mode 100644
index 00000000000..06e623fb6b6
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texture.h
@@ -0,0 +1,475 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3D                                                         *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/texture.h                              $*
+ *                                                                                             *
+ *                  $Org Author:: Jani_p                                                      $*
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *                     $Modtime:: 08/05/02 1:27p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 46                                                          $*
+ *                                                                                             *
+ * 05/16/02 KM Base texture class to abstract major texture types, e.g. 3d, z, cube, etc.
+ * 06/27/02 KM Texture class abstraction																			*
+ * 08/05/02 KM Texture class redesign (revisited)
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "always.h"
+#include "chunkio.h"
+#include "surfaceclass.h"
+#include "ww3dformat.h"
+#include "wwstring.h"
+#include "vector3.h"
+#include "texturefilter.h"
+
+struct IDirect3DBaseTexture8;
+struct IDirect3DTexture8;
+struct IDirect3DCubeTexture8;
+struct IDirect3DVolumeTexture8;
+
+class DX8Wrapper;
+class TextureLoader;
+class LoaderThreadClass;
+class TextureLoadTaskClass;
+class CubeTextureClass;
+class VolumeTextureClass;
+
+class TextureBaseClass : public RefCountClass
+{
+	friend class TextureLoader;
+	friend class LoaderThreadClass;
+	friend class DX8TextureTrackerClass;  //(gth) so it can call Poke_Texture,
+	friend class DX8ZTextureTrackerClass;
+
+public:
+
+	enum PoolType
+	{
+		POOL_DEFAULT=0,
+		POOL_MANAGED,
+		POOL_SYSTEMMEM
+	};
+
+	enum TexAssetType
+	{
+		TEX_REGULAR,
+		TEX_CUBEMAP,
+		TEX_VOLUME
+	};
+
+	// base constructor for derived classes
+	TextureBaseClass
+	(
+		unsigned width,
+		unsigned height,
+		MipCountType mip_level_count=MIP_LEVELS_ALL,
+		PoolType pool=POOL_MANAGED,
+		bool rendertarget=false,
+		bool reducible=true
+	);
+
+	virtual ~TextureBaseClass();
+
+	virtual TexAssetType Get_Asset_Type() const=0;
+
+	// Names
+	void	Set_Texture_Name(const char * name);
+	void	Set_Full_Path(const char * path)			{ FullPath = path; }
+	const StringClass& Get_Texture_Name(void) const		{ return Name; }
+	const StringClass& Get_Full_Path(void) const			{ if (FullPath.Is_Empty ()) return Name; return FullPath; }
+
+	unsigned Get_ID() const { return texture_id; }	// Each textrure has a unique id
+
+	// The number of Mip levels in the texture
+	unsigned int Get_Mip_Level_Count(void) const
+	{
+		return MipLevelCount;
+	}
+
+	// Note! Width and Height may be zero and may change if texture uses mipmaps
+	int Get_Width() const
+	{
+		return Width;
+	}
+	int Get_Height() const
+	{
+		return Height;
+	}
+
+	// Time, after which the texture is invalidated if not used. Set to zero to indicate infinite.
+	// Time is in milliseconds.
+	void Set_Inactivation_Time(unsigned time) { InactivationTime=time; }
+	int Get_Inactivation_Time() const { return InactivationTime; }
+
+	// Texture priority affects texture management and caching.
+	unsigned int Get_Priority(void);
+	unsigned int Set_Priority(unsigned int priority);	// Returns previous priority
+
+	// Debug utility functions for returning the texture memory usage
+	virtual unsigned Get_Texture_Memory_Usage() const=0;
+
+	bool Is_Initialized() const { return Initialized; }
+	bool Is_Lightmap() const { return IsLightmap; }
+	bool Is_Procedural() const { return IsProcedural; }
+	bool Is_Reducible() const { return IsReducible; } //can texture be reduced in resolution for LOD purposes?
+
+	static int _Get_Total_Locked_Surface_Size();
+	static int _Get_Total_Texture_Size();
+	static int _Get_Total_Lightmap_Texture_Size();
+	static int _Get_Total_Procedural_Texture_Size();
+	static int _Get_Total_Locked_Surface_Count();
+	static int _Get_Total_Texture_Count();
+	static int _Get_Total_Lightmap_Texture_Count();
+	static int _Get_Total_Procedural_Texture_Count();
+
+	virtual void Init()=0;
+
+	// This utility function processes the texture reduction (used during rendering)
+	void Invalidate();
+
+	// texture accessors (dx8)
+	IDirect3DBaseTexture8 *Peek_D3D_Base_Texture() const;
+	void Set_D3D_Base_Texture(IDirect3DBaseTexture8* tex);
+
+	PoolType Get_Pool() const { return Pool; }
+
+	bool Is_Missing_Texture();
+
+	// Support for self managed textures
+	bool Is_Dirty() { WWASSERT(Pool==POOL_DEFAULT); return Dirty; };
+	void Set_Dirty() { WWASSERT(Pool==POOL_DEFAULT); Dirty=true; }
+	void Clean() { Dirty=false; };
+
+	void Set_HSV_Shift(const Vector3 &hsv_shift);
+	const Vector3& Get_HSV_Shift() { return HSVShift; }
+
+	bool Is_Compression_Allowed() const { return IsCompressionAllowed; }
+
+	unsigned Get_Reduction() const;
+
+	// Background texture loader will call this when texture has been loaded
+	virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false)=0;	// If the parameter is true, the texture will be flagged as initialised
+
+	MipCountType MipLevelCount;
+
+	// Inactivate textures that haven't been used in a while. Pass zero to use textures'
+	// own inactive times (default). In urgent need to free up texture memory, try
+	// calling with relatively small (just few seconds) time override to free up everything
+	// but the currently used textures.
+	static void Invalidate_Old_Unused_Textures(unsigned inactive_time_override);
+
+	// Apply this texture's settings into D3D
+	virtual void Apply(unsigned int stage)=0;
+
+	// Apply a Null texture's settings into D3D
+	static void Apply_Null(unsigned int stage);
+
+	virtual TextureClass* As_TextureClass() { return NULL; }
+	virtual CubeTextureClass* As_CubeTextureClass() { return NULL; }
+	virtual VolumeTextureClass* As_VolumeTextureClass() { return NULL; }
+
+	IDirect3DTexture8* Peek_D3D_Texture() const { return (IDirect3DTexture8*)Peek_D3D_Base_Texture(); }
+	IDirect3DVolumeTexture8* Peek_D3D_VolumeTexture() const { return (IDirect3DVolumeTexture8*)Peek_D3D_Base_Texture(); }
+	IDirect3DCubeTexture8* Peek_D3D_CubeTexture() const { return (IDirect3DCubeTexture8*)Peek_D3D_Base_Texture(); }
+
+protected:
+
+	void Load_Locked_Surface();
+	void Poke_Texture(IDirect3DBaseTexture8* tex) { D3DTexture = tex; }
+
+	bool Initialized;
+
+	// For debug purposes the texture sets this true if it is a lightmap texture
+	bool IsLightmap;
+	bool IsCompressionAllowed;
+	bool IsProcedural;
+	bool IsReducible;
+
+
+	unsigned InactivationTime;	// In milliseconds
+	unsigned ExtendedInactivationTime;	// This is set by the engine, if needed
+	unsigned LastInactivationSyncTime;
+	mutable unsigned LastAccessed;
+
+	// If this is non-zero, the texture will have a hue shift done at the next init (this
+	// value should only be changed by Set_HSV_Shift() function, which also invalidates the
+	// texture).
+	Vector3 HSVShift;
+
+	int Width;
+	int Height;
+
+private:
+
+	// Direct3D texture object
+	IDirect3DBaseTexture8 *D3DTexture;
+
+	// Name
+	StringClass Name;
+	StringClass	FullPath;
+
+	// Unique id
+	unsigned texture_id;
+
+	// Support for self-managed textures
+
+	PoolType Pool;
+	bool Dirty;
+
+	friend class TextureLoadTaskClass;
+	friend class CubeTextureLoadTaskClass;
+	friend class VolumeTextureLoadTaskClass;
+	TextureLoadTaskClass* TextureLoadTask;
+	TextureLoadTaskClass* ThumbnailLoadTask;
+
+};
+
+
+/*************************************************************************
+**                             TextureClass
+**
+** This is our regular texture class. For legacy reasons it contains some
+** information beyond the D3D texture itself, such as texture addressing
+** modes.
+**
+*************************************************************************/
+class TextureClass : public TextureBaseClass
+{
+	W3DMPO_GLUE(TextureClass)
+//	friend DX8Wrapper;
+
+public:
+
+	// Create texture with desired height, width and format.
+	TextureClass
+	(
+		unsigned width,
+		unsigned height,
+		WW3DFormat format,
+		MipCountType mip_level_count=MIP_LEVELS_ALL,
+		PoolType pool=POOL_MANAGED,
+		bool rendertarget=false,
+		bool allow_reduction=true
+	);
+
+	// Create texture from a file. If format is specified the texture is converted to that format.
+	// Note that the format must be supported by the current device and that a texture can't exist
+	// in the system with the same name in multiple formats.
+	TextureClass
+	(
+		const char *name,
+		const char *full_path=NULL,
+		MipCountType mip_level_count=MIP_LEVELS_ALL,
+		WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN,
+		bool allow_compression=true,
+		bool allow_reduction=true
+	);
+
+	// Create texture from a surface.
+	TextureClass
+	(
+		SurfaceClass *surface,
+		MipCountType mip_level_count=MIP_LEVELS_ALL
+	);
+
+	TextureClass(IDirect3DBaseTexture8* d3d_texture);
+
+	// defualt constructors for derived classes (cube & vol)
+	TextureClass
+	(
+		unsigned width,
+		unsigned height,
+		MipCountType mip_level_count=MIP_LEVELS_ALL,
+		PoolType pool=POOL_MANAGED,
+		bool rendertarget=false,
+		WW3DFormat format=WW3D_FORMAT_UNKNOWN,
+		bool allow_reduction=true
+	)
+	: TextureBaseClass(width,height,mip_level_count,pool,rendertarget,allow_reduction), TextureFormat(format), Filter(mip_level_count) { }
+
+	virtual TexAssetType Get_Asset_Type() const { return TEX_REGULAR; }
+
+	virtual void Init();
+
+	// Background texture loader will call this when texture has been loaded
+	virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false);	// If the parameter is true, the texture will be flagged as initialised
+
+	// Get the surface of one of the mipmap levels (defaults to highest-resolution one)
+	SurfaceClass *Get_Surface_Level(unsigned int level = 0);
+	IDirect3DSurface8 *Get_D3D_Surface_Level(unsigned int level = 0);
+	void Get_Level_Description( SurfaceClass::SurfaceDescription & desc, unsigned int level = 0 );
+
+	TextureFilterClass& Get_Filter() { return Filter; }
+
+	WW3DFormat Get_Texture_Format() const { return TextureFormat; }
+
+	virtual void Apply(unsigned int stage);
+
+	virtual unsigned Get_Texture_Memory_Usage() const;
+
+	virtual TextureClass* As_TextureClass() { return this; }
+
+protected:
+
+	WW3DFormat				TextureFormat;
+
+	// legacy
+	TextureFilterClass	Filter;
+};
+
+class ZTextureClass : public TextureBaseClass
+{
+public:
+	// Create a z texture with desired height, width and format
+	ZTextureClass
+	(
+		unsigned width,
+		unsigned height,
+		WW3DZFormat zformat,
+		MipCountType mip_level_count=MIP_LEVELS_ALL,
+		PoolType pool=POOL_MANAGED
+	);
+
+	WW3DZFormat Get_Texture_Format() const { return DepthStencilTextureFormat; }
+
+	virtual TexAssetType Get_Asset_Type() const { return TEX_REGULAR; }
+
+	virtual void Init() {}
+
+	// Background texture loader will call this when texture has been loaded
+	virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false);	// If the parameter is true, the texture will be flagged as initialised
+
+	virtual void Apply(unsigned int stage);
+
+	IDirect3DSurface8 *Get_D3D_Surface_Level(unsigned int level = 0);
+	virtual unsigned Get_Texture_Memory_Usage() const;
+
+private:
+
+	WW3DZFormat DepthStencilTextureFormat;
+};
+
+class CubeTextureClass : public TextureClass
+{
+public:
+	// Create texture with desired height, width and format.
+	CubeTextureClass
+	(
+		unsigned width,
+		unsigned height,
+		WW3DFormat format,
+		MipCountType mip_level_count=MIP_LEVELS_ALL,
+		PoolType pool=POOL_MANAGED,
+		bool rendertarget=false,
+		bool allow_reduction=true
+	);
+
+	// Create texture from a file. If format is specified the texture is converted to that format.
+	// Note that the format must be supported by the current device and that a texture can't exist
+	// in the system with the same name in multiple formats.
+	CubeTextureClass
+	(
+		const char *name,
+		const char *full_path=NULL,
+		MipCountType mip_level_count=MIP_LEVELS_ALL,
+		WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN,
+		bool allow_compression=true,
+		bool allow_reduction=true
+	);
+
+	// Create texture from a surface.
+	CubeTextureClass
+	(
+		SurfaceClass *surface,
+		MipCountType mip_level_count=MIP_LEVELS_ALL
+	);
+
+	CubeTextureClass(IDirect3DBaseTexture8* d3d_texture);
+
+	virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false);	// If the parameter is true, the texture will be flagged as initialised
+
+	virtual TexAssetType Get_Asset_Type() const { return TEX_CUBEMAP; }
+
+	virtual CubeTextureClass* As_CubeTextureClass() { return this; }
+
+};
+
+class VolumeTextureClass : public TextureClass
+{
+public:
+	// Create texture with desired height, width and format.
+	VolumeTextureClass
+	(
+		unsigned width,
+		unsigned height,
+		unsigned depth,
+		WW3DFormat format,
+		MipCountType mip_level_count=MIP_LEVELS_ALL,
+		PoolType pool=POOL_MANAGED,
+		bool rendertarget=false,
+		bool allow_reduction=true
+	);
+
+	// Create texture from a file. If format is specified the texture is converted to that format.
+	// Note that the format must be supported by the current device and that a texture can't exist
+	// in the system with the same name in multiple formats.
+	VolumeTextureClass
+	(
+		const char *name,
+		const char *full_path=NULL,
+		MipCountType mip_level_count=MIP_LEVELS_ALL,
+		WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN,
+		bool allow_compression=true,
+		bool allow_reduction=true
+	);
+
+	// Create texture from a surface.
+	VolumeTextureClass
+	(
+		SurfaceClass *surface,
+		MipCountType mip_level_count=MIP_LEVELS_ALL
+	);
+
+	VolumeTextureClass(IDirect3DBaseTexture8* d3d_texture);
+
+	virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false);	// If the parameter is true, the texture will be flagged as initialised
+
+	virtual TexAssetType Get_Asset_Type() const { return TEX_VOLUME; }
+
+	virtual VolumeTextureClass* As_VolumeTextureClass() { return this; }
+
+protected:
+
+	int Depth;
+};
+
+// Utility functions for loading and saving texture descriptions from/to W3D files
+TextureClass *Load_Texture(ChunkLoadClass & cload);
+void Save_Texture(TextureClass * texture, ChunkSaveClass & csave);
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texturefilter.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texturefilter.cpp
new file mode 100644
index 00000000000..7fb9b85a24e
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texturefilter.cpp
@@ -0,0 +1,251 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3D                                                         *
+ *                                                                                             *
+ *                     $Archive:: ww3d2/texturefilter.cpp												$*
+ *                                                                                             *
+ *                  $Org Author:: Kenny Mitchell                                              $*
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *                     $Modtime:: 08/05/02 1:27p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                          $*
+ *                                                                                             *
+ * 08/05/02 KM Texture filter class abstraction																			*
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#include "texturefilter.h"
+#include "dx8wrapper.h"
+
+unsigned _MinTextureFilters[MAX_TEXTURE_STAGES][TextureFilterClass::FILTER_TYPE_COUNT];
+unsigned _MagTextureFilters[MAX_TEXTURE_STAGES][TextureFilterClass::FILTER_TYPE_COUNT];
+unsigned _MipMapFilters[MAX_TEXTURE_STAGES][TextureFilterClass::FILTER_TYPE_COUNT];
+
+/*************************************************************************
+**                             TextureFilterClass
+*************************************************************************/
+TextureFilterClass::TextureFilterClass(MipCountType mip_level_count)
+:	TextureMinFilter(FILTER_TYPE_DEFAULT),
+	TextureMagFilter(FILTER_TYPE_DEFAULT),
+	UAddressMode(TEXTURE_ADDRESS_REPEAT),
+	VAddressMode(TEXTURE_ADDRESS_REPEAT)
+{
+	if (mip_level_count!=MIP_LEVELS_1)
+	{
+		MipMapFilter=FILTER_TYPE_DEFAULT;
+	}
+	else
+	{
+		MipMapFilter=FILTER_TYPE_NONE;
+	}
+}
+
+//**********************************************************************************************
+//! Apply filters (legacy)
+/*!
+*/
+void TextureFilterClass::Apply(unsigned int stage)
+{
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,D3DTSS_MINFILTER,_MinTextureFilters[stage][TextureMinFilter]);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,D3DTSS_MAGFILTER,_MagTextureFilters[stage][TextureMagFilter]);
+	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,D3DTSS_MIPFILTER,_MipMapFilters[stage][MipMapFilter]);
+
+	switch (Get_U_Addr_Mode())
+	{
+	case TEXTURE_ADDRESS_REPEAT:
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
+		break;
+
+	case TEXTURE_ADDRESS_CLAMP:
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
+		break;
+	}
+
+	switch (Get_V_Addr_Mode())
+	{
+	case TEXTURE_ADDRESS_REPEAT:
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
+		break;
+
+	case TEXTURE_ADDRESS_CLAMP:
+		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
+		break;
+	}
+}
+
+//**********************************************************************************************
+//! Init filters (legacy)
+/*!
+*/
+void TextureFilterClass::_Init_Filters(TextureFilterMode filter_type)
+{
+	const D3DCAPS8& dx8caps=DX8Wrapper::Get_Current_Caps()->Get_DX8_Caps();
+
+#ifndef _XBOX
+   	_MinTextureFilters[0][FILTER_TYPE_NONE]=D3DTEXF_POINT;
+   	_MagTextureFilters[0][FILTER_TYPE_NONE]=D3DTEXF_POINT;
+   	_MipMapFilters[0][FILTER_TYPE_NONE]=D3DTEXF_NONE;
+
+   	_MinTextureFilters[0][FILTER_TYPE_FAST]=D3DTEXF_LINEAR;
+   	_MagTextureFilters[0][FILTER_TYPE_FAST]=D3DTEXF_LINEAR;
+   	_MipMapFilters[0][FILTER_TYPE_FAST]=D3DTEXF_POINT;
+
+   	_MagTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_POINT;
+   	_MinTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_POINT;
+   	_MipMapFilters[0][FILTER_TYPE_BEST]=D3DTEXF_POINT;
+#else
+	_MinTextureFilters[0][FILTER_TYPE_NONE]=D3DTEXF_ANISOTROPIC;
+	_MagTextureFilters[0][FILTER_TYPE_NONE]=D3DTEXF_ANISOTROPIC;
+	_MipMapFilters[0][FILTER_TYPE_NONE]=D3DTEXF_LINEAR;
+
+	_MinTextureFilters[0][FILTER_TYPE_FAST]=D3DTEXF_ANISOTROPIC;
+	_MagTextureFilters[0][FILTER_TYPE_FAST]=D3DTEXF_ANISOTROPIC;
+	_MipMapFilters[0][FILTER_TYPE_FAST]=D3DTEXF_LINEAR;
+
+	_MagTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_ANISOTROPIC;
+	_MinTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_ANISOTROPIC;
+	_MipMapFilters[0][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
+#endif
+
+#ifndef _XBOX
+	if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MAGFLINEAR) _MagTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
+	if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MINFLINEAR) _MinTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
+
+	// Set anisotropic filtering only if requested and available
+	if (filter_type==TEXTURE_FILTER_ANISOTROPIC) {
+		if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MAGFANISOTROPIC) _MagTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_ANISOTROPIC;
+		if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MINFANISOTROPIC) _MinTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_ANISOTROPIC;
+	}
+
+	// Set linear mip filter only if requested trilinear or anisotropic, and linear available
+	if (filter_type==TEXTURE_FILTER_ANISOTROPIC || filter_type==TEXTURE_FILTER_TRILINEAR) {
+		if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MIPFLINEAR) _MipMapFilters[0][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
+	}
+#endif
+
+	// For stages above zero, set best filter to the same as the stage zero, except if anisotropic
+	int i=1;
+	for (;i<MAX_TEXTURE_STAGES;++i) {
+/*		_MinTextureFilters[i][FILTER_TYPE_NONE]=D3DTEXF_POINT;
+		_MagTextureFilters[i][FILTER_TYPE_NONE]=D3DTEXF_POINT;
+		_MipMapFilters[i][FILTER_TYPE_NONE]=D3DTEXF_NONE;
+
+		_MinTextureFilters[i][FILTER_TYPE_FAST]=D3DTEXF_LINEAR;
+		_MagTextureFilters[i][FILTER_TYPE_FAST]=D3DTEXF_LINEAR;
+		_MipMapFilters[i][FILTER_TYPE_FAST]=D3DTEXF_POINT;
+
+		_MagTextureFilters[i][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
+		_MinTextureFilters[i][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
+		_MipMapFilters[i][FILTER_TYPE_BEST]=D3DTEXF_POINT;
+*/
+		_MinTextureFilters[i][FILTER_TYPE_NONE]=_MinTextureFilters[i-1][FILTER_TYPE_NONE];
+		_MagTextureFilters[i][FILTER_TYPE_NONE]=_MagTextureFilters[i-1][FILTER_TYPE_NONE];
+		_MipMapFilters[i][FILTER_TYPE_NONE]=_MipMapFilters[i-1][FILTER_TYPE_NONE];
+
+		_MinTextureFilters[i][FILTER_TYPE_FAST]=_MinTextureFilters[i-1][FILTER_TYPE_FAST];
+		_MagTextureFilters[i][FILTER_TYPE_FAST]=_MagTextureFilters[i-1][FILTER_TYPE_FAST];
+		_MipMapFilters[i][FILTER_TYPE_FAST]=_MipMapFilters[i-1][FILTER_TYPE_FAST];
+
+		if (_MagTextureFilters[i-1][FILTER_TYPE_BEST]==D3DTEXF_ANISOTROPIC) {
+			_MagTextureFilters[i][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
+		}
+		else {
+			_MagTextureFilters[i][FILTER_TYPE_BEST]=_MagTextureFilters[i-1][FILTER_TYPE_BEST];
+		}
+
+		if (_MinTextureFilters[i-1][FILTER_TYPE_BEST]==D3DTEXF_ANISOTROPIC) {
+			_MinTextureFilters[i][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
+		}
+		else {
+			_MinTextureFilters[i][FILTER_TYPE_BEST]=_MinTextureFilters[i-1][FILTER_TYPE_BEST];
+		}
+		_MipMapFilters[i][FILTER_TYPE_BEST]=_MipMapFilters[i-1][FILTER_TYPE_BEST];
+
+
+	}
+
+	// Set default to best. The level of best filter mode is controlled by the input parameter.
+	for (i=0;i<MAX_TEXTURE_STAGES;++i) {
+		_MinTextureFilters[i][FILTER_TYPE_DEFAULT]=_MinTextureFilters[i][FILTER_TYPE_BEST];
+		_MagTextureFilters[i][FILTER_TYPE_DEFAULT]=_MagTextureFilters[i][FILTER_TYPE_BEST];
+		_MipMapFilters[i][FILTER_TYPE_DEFAULT]=_MipMapFilters[i][FILTER_TYPE_BEST];
+
+		DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_MAXANISOTROPY,2);
+	}
+
+}
+
+
+//**********************************************************************************************
+//! Set mip mapping filter (legacy)
+/*!
+*/
+void TextureFilterClass::Set_Mip_Mapping(FilterType mipmap)
+{
+//	if (mipmap != FILTER_TYPE_NONE && Get_Mip_Level_Count() <= 1 && Is_Initialized())
+//	{
+//		WWASSERT_PRINT(0, "Trying to enable MipMapping on texture w/o Mip levels!");
+//		return;
+//	}
+	MipMapFilter=mipmap;
+}
+
+//**********************************************************************************************
+//! Set default min filter (legacy)
+/*!
+*/
+void TextureFilterClass::_Set_Default_Min_Filter(FilterType filter)
+{
+	for (int i=0;i<MAX_TEXTURE_STAGES;++i)
+	{
+		_MinTextureFilters[i][FILTER_TYPE_DEFAULT]=_MinTextureFilters[i][filter];
+	}
+}
+
+
+//**********************************************************************************************
+//! Set default mag filter (legacy)
+/*!
+*/
+void TextureFilterClass::_Set_Default_Mag_Filter(FilterType filter)
+{
+	for (int i=0;i<MAX_TEXTURE_STAGES;++i)
+	{
+		_MagTextureFilters[i][FILTER_TYPE_DEFAULT]=_MagTextureFilters[i][filter];
+	}
+}
+
+//**********************************************************************************************
+//! Set default mip filter (legacy)
+/*!
+*/
+void TextureFilterClass::_Set_Default_Mip_Filter(FilterType filter)
+{
+	for (int i=0;i<MAX_TEXTURE_STAGES;++i)
+	{
+		_MipMapFilters[i][FILTER_TYPE_DEFAULT]=_MipMapFilters[i][filter];
+	}
+}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texturefilter.h b/Core/Libraries/Source/WWVegas/WW3D2/texturefilter.h
new file mode 100644
index 00000000000..3571471e4e9
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texturefilter.h
@@ -0,0 +1,130 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3D                                                         *
+ *                                                                                             *
+ *                     $Archive:: ww3d2/texturefilter.h												$*
+ *                                                                                             *
+ *                  $Org Author:: Kenny Mitchell                                              $*
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *                     $Modtime:: 08/05/02 1:27p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                          $*
+ *                                                                                             *
+ * 08/05/02 KM Texture filter class abstraction																			*
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#ifndef DX8_WRAPPER_H
+//#include "dx8wrapper.h"
+#endif
+
+enum MipCountType
+{
+	MIP_LEVELS_ALL=0,		// generate all mipmap levels down to 1x1 size
+	MIP_LEVELS_1,			// no mipmapping at all (just one mip level)
+	MIP_LEVELS_2,
+	MIP_LEVELS_3,
+	MIP_LEVELS_4,
+	MIP_LEVELS_5,
+	MIP_LEVELS_6,
+	MIP_LEVELS_7,
+	MIP_LEVELS_8,
+	MIP_LEVELS_10,
+	MIP_LEVELS_11,
+	MIP_LEVELS_12,
+	MIP_LEVELS_MAX			// This isn't to be used (use MIP_LEVELS_ALL instead), it is just an enum for creating static tables etc.
+};
+
+
+// NOTE: Since "texture wrapping" (NOT TEXTURE WRAP MODE - THIS IS
+// SOMETHING ELSE) is a global state that affects all texture stages,
+// and this class only affects its own stage, we will not worry about
+// it for now. Later (probably when we implement world-oriented
+// environment maps) we will consider where to put it.
+
+// This is legacy and should be phased out into wwshade shader states
+// keeping as an abstracted class for now to support this transition later
+class TextureFilterClass
+{
+public:
+
+	enum FilterType
+	{
+		FILTER_TYPE_NONE,
+		FILTER_TYPE_FAST,
+		FILTER_TYPE_BEST,
+		FILTER_TYPE_DEFAULT,
+		FILTER_TYPE_COUNT
+	};
+
+	enum TextureFilterMode
+	{
+		TEXTURE_FILTER_BILINEAR,
+		TEXTURE_FILTER_TRILINEAR,
+		TEXTURE_FILTER_ANISOTROPIC
+	};
+
+	enum TxtAddrMode
+	{
+		TEXTURE_ADDRESS_REPEAT=0,
+		TEXTURE_ADDRESS_CLAMP
+	};
+
+	TextureFilterClass(MipCountType mip_level_count=MIP_LEVELS_1);
+
+	void Apply(unsigned int stage);
+
+	// Filter and MIPmap settings:
+	FilterType Get_Min_Filter(void) const { return TextureMinFilter; }
+	FilterType Get_Mag_Filter(void) const { return TextureMagFilter; }
+	FilterType Get_Mip_Mapping(void) const { return MipMapFilter; }
+	void Set_Min_Filter(FilterType filter) { TextureMinFilter=filter; }
+	void Set_Mag_Filter(FilterType filter) { TextureMagFilter=filter; }
+	void Set_Mip_Mapping(FilterType mipmap);
+
+	// Texture address mode
+	TxtAddrMode Get_U_Addr_Mode(void) const { return UAddressMode; }
+	TxtAddrMode Get_V_Addr_Mode(void) const { return VAddressMode; }
+	void Set_U_Addr_Mode(TxtAddrMode mode) { UAddressMode=mode; }
+	void Set_V_Addr_Mode(TxtAddrMode mode) { VAddressMode=mode; }
+
+	// This needs to be called after device has been created
+	static void _Init_Filters(TextureFilterMode texture_filter);
+
+	static void _Set_Default_Min_Filter(FilterType filter);
+	static void _Set_Default_Mag_Filter(FilterType filter);
+	static void _Set_Default_Mip_Filter(FilterType filter);
+
+private:
+	// State not contained in the Direct3D texture object:
+	FilterType TextureMinFilter;
+	FilterType TextureMagFilter;
+	FilterType MipMapFilter;
+	TxtAddrMode UAddressMode;
+	TxtAddrMode VAddressMode;
+};
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
new file mode 100644
index 00000000000..3b1fcfa61df
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
@@ -0,0 +1,2819 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : DX8 Texture Manager                                          *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/textureloader.h                            $*
+ *                                                                                             *
+ *              Original Author:: vss_sync                                                   *
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *								$Modtime:: 08/05/02 10:03a                                             $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ * 06/27/02 KM Texture class abstraction																			*
+ * 08/05/02 KM Texture class redesign (revisited)
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#include "textureloader.h"
+#include "mutex.h"
+#include "thread.h"
+#include "wwdebug.h"
+#include "texture.h"
+#include "ffactory.h"
+#include "wwstring.h"
+#include	"bufffile.h"
+#include "ww3d.h"
+#include "assetmgr.h"
+#include "dx8wrapper.h"
+#include "dx8caps.h"
+#include "missingtexture.h"
+#include "TARGA.h"
+#include <d3dx8tex.h>
+#include "wwmemlog.h"
+#include "formconv.h"
+#include "texturethumbnail.h"
+#include "ddsfile.h"
+#include "bitmaphandler.h"
+#include "wwprofile.h"
+
+bool TextureLoader::TextureLoadSuspended;
+int TextureLoader::TextureInactiveOverrideTime = 0;
+
+#define USE_MANAGED_TEXTURES
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// TextureLoadTaskListClass implementation
+//
+////////////////////////////////////////////////////////////////////////////////
+
+TextureLoadTaskListClass::TextureLoadTaskListClass(void)
+: Root()
+{
+	Root.Next = Root.Prev = &Root;
+}
+
+void TextureLoadTaskListClass::Push_Front	(TextureLoadTaskClass *task)
+{
+	// task should non-null and not on any list
+	WWASSERT(task != NULL && task->Next == NULL && task->Prev == NULL);
+
+	// update inserted task to point to list
+	task->Next			= Root.Next;
+	task->Prev			= &Root;
+	task->List			= this;
+
+	// update list to point to inserted task
+	Root.Next->Prev	= task;
+	Root.Next			= task;
+}
+
+void TextureLoadTaskListClass::Push_Back(TextureLoadTaskClass *task)
+{
+	// task should be non-null and not on any list
+	WWASSERT(task != NULL && task->Next == NULL && task->Prev == NULL);
+
+	// update inserted task to point to list
+	task->Next			= &Root;
+	task->Prev			= Root.Prev;
+	task->List			= this;
+
+	// update list to point to inserted task
+	Root.Prev->Next	= task;
+	Root.Prev			= task;
+}
+
+TextureLoadTaskClass *TextureLoadTaskListClass::Pop_Front(void)
+{
+	// exit early if list is empty
+	if (Is_Empty()) {
+		return 0;
+	}
+
+	// otherwise, grab first task and remove it.
+	TextureLoadTaskClass *task = (TextureLoadTaskClass *)Root.Next;
+	Remove(task);
+	return task;
+
+}
+
+TextureLoadTaskClass *TextureLoadTaskListClass::Pop_Back(void)
+{
+	// exit early if list is empty
+	if (Is_Empty()) {
+		return 0;
+	}
+
+	// otherwise, grab last task and remove it.
+	TextureLoadTaskClass *task = (TextureLoadTaskClass *)Root.Prev;
+	Remove(task);
+	return task;
+}
+
+void TextureLoadTaskListClass::Remove(TextureLoadTaskClass *task)
+{
+	// exit early if task is not on this list.
+	if (task->List != this) {
+		return;
+	}
+
+	// update list to skip task
+	task->Prev->Next = task->Next;
+	task->Next->Prev = task->Prev;
+
+	// update task to no longer point at list
+	task->Prev	= 0;
+	task->Next	= 0;
+	task->List	= 0;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// SynchronizedTextureLoadTaskListClass implementation
+//
+////////////////////////////////////////////////////////////////////////////////
+
+SynchronizedTextureLoadTaskListClass::SynchronizedTextureLoadTaskListClass(void)
+:	TextureLoadTaskListClass(),
+	CriticalSection()
+{
+}
+
+void SynchronizedTextureLoadTaskListClass::Push_Front(TextureLoadTaskClass *task)
+{
+	FastCriticalSectionClass::LockClass lock(CriticalSection);
+	TextureLoadTaskListClass::Push_Front(task);
+}
+
+void SynchronizedTextureLoadTaskListClass::Push_Back(TextureLoadTaskClass *task)
+{
+	FastCriticalSectionClass::LockClass lock(CriticalSection);
+	TextureLoadTaskListClass::Push_Back(task);
+}
+
+TextureLoadTaskClass *SynchronizedTextureLoadTaskListClass::Pop_Front(void)
+{
+	// this duplicates code inside base class, but saves us an unnecessary lock.
+	if (Is_Empty()) {
+		return 0;
+	}
+
+	FastCriticalSectionClass::LockClass lock(CriticalSection);
+	return TextureLoadTaskListClass::Pop_Front();
+
+}
+
+TextureLoadTaskClass *SynchronizedTextureLoadTaskListClass::Pop_Back(void)
+{
+	// this duplicates code inside base class, but saves us an unnecessary lock.
+	if (Is_Empty()) {
+		return 0;
+	}
+
+	FastCriticalSectionClass::LockClass lock(CriticalSection);
+	return TextureLoadTaskListClass::Pop_Back();
+}
+
+void SynchronizedTextureLoadTaskListClass::Remove(TextureLoadTaskClass *task)
+{
+	FastCriticalSectionClass::LockClass lock(CriticalSection);
+	TextureLoadTaskListClass::Remove(task);
+}
+
+
+// Locks
+
+// To prevent deadlock, threads should acquire locks in the order in which
+// they are defined below. No ordering is necessary for the task list locks,
+// since one thread can never hold two at once.
+
+static FastCriticalSectionClass					_ForegroundCriticalSection;
+static FastCriticalSectionClass					_BackgroundCriticalSection;
+
+// Lists
+
+static SynchronizedTextureLoadTaskListClass	_ForegroundQueue;
+static SynchronizedTextureLoadTaskListClass	_BackgroundQueue;
+
+static TextureLoadTaskListClass					_TexLoadFreeList;
+static TextureLoadTaskListClass					_CubeTexLoadFreeList;
+static TextureLoadTaskListClass					_VolTexLoadFreeList;
+
+
+// The background texture loading thread.
+static class LoaderThreadClass : public ThreadClass
+{
+public:
+#ifdef Exception_Handler
+	LoaderThreadClass(const char *thread_name = "Texture loader thread") : ThreadClass(thread_name, &Exception_Handler) {}
+#else
+	LoaderThreadClass(const char *thread_name = "Texture loader thread") : ThreadClass(thread_name) {}
+#endif
+
+	void Thread_Function();
+} _TextureLoadThread;
+
+
+// TODO: Legacy - remove this call!
+IDirect3DTexture8* Load_Compressed_Texture(
+	const StringClass& filename,
+	unsigned reduction_factor,
+	MipCountType mip_level_count,
+	WW3DFormat dest_format)
+{
+	// If DDS file isn't available, use TGA file to convert to DDS.
+
+	DDSFileClass dds_file(filename,reduction_factor);
+	if (!dds_file.Is_Available()) return NULL;
+	if (!dds_file.Load()) return NULL;
+
+	unsigned width=dds_file.Get_Width(0);
+	unsigned height=dds_file.Get_Height(0);
+	unsigned mips=dds_file.Get_Mip_Level_Count();
+
+	// If format isn't defined get the nearest valid texture format to the compressed file format
+	// Note that the nearest valid format could be anything, even uncompressed.
+	if (dest_format==WW3D_FORMAT_UNKNOWN) dest_format=Get_Valid_Texture_Format(dds_file.Get_Format(),true);
+
+	IDirect3DTexture8* d3d_texture = DX8Wrapper::_Create_DX8_Texture
+	(
+		width,
+		height,
+		dest_format,
+		(MipCountType)mips
+	);
+
+	for (unsigned level=0;level<mips;++level) {
+		IDirect3DSurface8* d3d_surface=NULL;
+		WWASSERT(d3d_texture);
+		DX8_ErrorCode(d3d_texture->GetSurfaceLevel(level/*-reduction_factor*/,&d3d_surface));
+		dds_file.Copy_Level_To_Surface(level,d3d_surface);
+		d3d_surface->Release();
+	}
+	return d3d_texture;
+}
+
+static bool Is_Format_Compressed(WW3DFormat texture_format,bool allow_compression)
+{
+	// Verify that the user isn't requesting compressed texture without hardware support
+
+	bool compressed=false;
+	if (texture_format!=WW3D_FORMAT_UNKNOWN) {
+		if (!DX8Wrapper::Get_Current_Caps()->Support_DXTC() || !allow_compression) {
+			WWASSERT(texture_format!=WW3D_FORMAT_DXT1);
+			WWASSERT(texture_format!=WW3D_FORMAT_DXT2);
+			WWASSERT(texture_format!=WW3D_FORMAT_DXT3);
+			WWASSERT(texture_format!=WW3D_FORMAT_DXT4);
+			WWASSERT(texture_format!=WW3D_FORMAT_DXT5);
+		}
+		if (texture_format==WW3D_FORMAT_DXT1 ||
+			texture_format==WW3D_FORMAT_DXT2 ||
+			texture_format==WW3D_FORMAT_DXT3 ||
+			texture_format==WW3D_FORMAT_DXT4 ||
+			texture_format==WW3D_FORMAT_DXT5) {
+			compressed=true;
+		}
+	}
+
+	// If hardware supports DXTC compression, load a compressed texture. Proceed only if the texture format hasn't been
+	// defined as non-compressed.
+	compressed|=(
+		texture_format==WW3D_FORMAT_UNKNOWN &&
+		DX8Wrapper::Get_Current_Caps()->Support_DXTC() &&
+		allow_compression);
+
+	return compressed;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// TextureLoader implementation
+//
+////////////////////////////////////////////////////////////////////////////////
+
+void TextureLoader::Init()
+{
+	WWASSERT(!_TextureLoadThread.Is_Running());
+
+	ThumbnailManagerClass::Init();
+
+	_TextureLoadThread.Execute();
+	_TextureLoadThread.Set_Priority(-4);
+	TextureInactiveOverrideTime = 0;
+}
+
+
+void TextureLoader::Deinit()
+{
+	FastCriticalSectionClass::LockClass lock(_BackgroundCriticalSection);
+	_TextureLoadThread.Stop();
+
+	ThumbnailManagerClass::Deinit();
+	TextureLoadTaskClass::Delete_Free_Pool();
+}
+
+
+bool TextureLoader::Is_DX8_Thread(void)
+{
+	return (ThreadClass::_Get_Current_Thread_ID() == DX8Wrapper::_Get_Main_Thread_ID());
+}
+
+
+// ----------------------------------------------------------------------------
+//
+// Modify given texture size to nearest valid size on current hardware.
+//
+// ----------------------------------------------------------------------------
+
+void TextureLoader::Validate_Texture_Size
+(
+	unsigned& width,
+	unsigned& height,
+	unsigned& depth
+)
+{
+	const D3DCAPS8& dx8caps=DX8Wrapper::Get_Current_Caps()->Get_DX8_Caps();
+
+	unsigned poweroftwowidth = 1;
+	while (poweroftwowidth < width)
+	{
+		poweroftwowidth <<= 1;
+	}
+
+	unsigned poweroftwoheight = 1;
+	while (poweroftwoheight < height)
+	{
+		poweroftwoheight <<= 1;
+	}
+
+	unsigned poweroftwodepth = 1;
+	while (poweroftwodepth< depth)
+	{
+		poweroftwodepth <<= 1;
+	}
+
+	if (poweroftwowidth>dx8caps.MaxTextureWidth)
+	{
+		poweroftwowidth=dx8caps.MaxTextureWidth;
+	}
+	if (poweroftwoheight>dx8caps.MaxTextureHeight)
+	{
+		poweroftwoheight=dx8caps.MaxTextureHeight;
+	}
+	if (poweroftwodepth>dx8caps.MaxVolumeExtent)
+	{
+		poweroftwodepth=dx8caps.MaxVolumeExtent;
+	}
+
+	if (poweroftwowidth>poweroftwoheight)
+	{
+		while (poweroftwowidth/poweroftwoheight>8)
+		{
+			poweroftwoheight*=2;
+		}
+	}
+	else
+	{
+		while (poweroftwoheight/poweroftwowidth>8)
+		{
+			poweroftwowidth*=2;
+		}
+	}
+
+	width=poweroftwowidth;
+	height=poweroftwoheight;
+	depth=poweroftwodepth;
+}
+
+IDirect3DTexture8* TextureLoader::Load_Thumbnail(const StringClass& filename, const Vector3& hsv_shift)//,WW3DFormat texture_format)
+{
+	WWASSERT(Is_DX8_Thread());
+
+	ThumbnailClass* thumb=NULL;
+	thumb=ThumbnailManagerClass::Peek_Thumbnail_Instance_From_Any_Manager(filename);
+
+	// If no thumb is found return a missing texture
+	if (!thumb) {
+		return MissingTexture::_Get_Missing_Texture();
+	}
+
+	WWASSERT(thumb->Get_Format()==WW3D_FORMAT_A4R4G4B4);
+	unsigned src_pitch=thumb->Get_Width()*2;	// Thumbs are always 16 bits
+	WW3DFormat dest_format;
+	WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN;
+	if (texture_format==WW3D_FORMAT_UNKNOWN) {
+		dest_format=Get_Valid_Texture_Format(WW3D_FORMAT_A4R4G4B4,false); // no compressed formats please
+	}
+	else {
+		dest_format=Get_Valid_Texture_Format(texture_format,false);	// no compressed formats please
+		WWASSERT(dest_format==texture_format);
+	}
+
+	IDirect3DTexture8* sysmem_texture = DX8Wrapper::_Create_DX8_Texture(
+		thumb->Get_Width(),
+		thumb->Get_Height(),
+		dest_format,
+		MIP_LEVELS_ALL,
+#ifdef USE_MANAGED_TEXTURES
+		D3DPOOL_MANAGED);
+#else
+		D3DPOOL_SYSTEMMEM);
+#endif
+
+	unsigned level=0;
+	D3DLOCKED_RECT locked_rects[12]={0};
+	WWASSERT(sysmem_texture->GetLevelCount()<=12);
+
+	// Lock all surfaces
+	for (level=0;level<sysmem_texture->GetLevelCount();++level) {
+		DX8_ErrorCode(
+			sysmem_texture->LockRect(
+				level,
+				&locked_rects[level],
+				NULL,
+				0));
+	}
+
+	unsigned char* src_surface=thumb->Peek_Bitmap();
+	WW3DFormat src_format=thumb->Get_Format();
+	unsigned width=thumb->Get_Width();
+	unsigned height=thumb->Get_Height();
+
+	Vector3 hsv=hsv_shift;
+	for (level=0;level<sysmem_texture->GetLevelCount()-1;++level) {
+		BitmapHandlerClass::Copy_Image_Generate_Mipmap(
+			width,
+			height,
+			(unsigned char*)locked_rects[level].pBits,
+			locked_rects[level].Pitch,
+			dest_format,
+			src_surface,
+			src_pitch,
+			src_format,
+			(unsigned char*)locked_rects[level+1].pBits,	// mipmap
+			locked_rects[level+1].Pitch,
+			hsv);
+		hsv=Vector3(0.0f,0.0f,0.0f);	// Only do the shift for the first level, as the mipmaps are based on it.
+
+		src_format=dest_format;
+		src_surface=(unsigned char*)locked_rects[level].pBits;
+		src_pitch=locked_rects[level].Pitch;
+		width>>=1;
+		height>>=1;
+	}
+
+	// Unlock all surfaces
+	for (level=0;level<sysmem_texture->GetLevelCount();++level) {
+		DX8_ErrorCode(sysmem_texture->UnlockRect(level));
+	}
+#ifdef USE_MANAGED_TEXTURES
+	return sysmem_texture;
+#else
+	IDirect3DTexture8* d3d_texture = DX8Wrapper::_Create_DX8_Texture(
+		thumb->Get_Width(),
+		thumb->Get_Height(),
+		dest_format,
+		TextureBaseClass::MIP_LEVELS_ALL,
+		D3DPOOL_DEFAULT);
+	DX8CALL(UpdateTexture(sysmem_texture,d3d_texture));
+	sysmem_texture->Release();
+
+	WWDEBUG_SAY(("Created non-managed texture (%s)",filename));
+	return d3d_texture;
+#endif
+}
+
+
+// ----------------------------------------------------------------------------
+//
+// Load image to a surface. The function tries to create texture that matches
+// targa format. If suitable format is not available, it selects closest matching
+// format and performs color space conversion.
+//
+// ----------------------------------------------------------------------------
+IDirect3DSurface8* TextureLoader::Load_Surface_Immediate(
+	const StringClass& filename,
+	WW3DFormat texture_format,
+	bool allow_compression)
+{
+	WWASSERT(Is_DX8_Thread());
+
+	bool compressed=Is_Format_Compressed(texture_format,allow_compression);
+
+	if (compressed) {
+		IDirect3DTexture8* comp_tex=Load_Compressed_Texture(filename,0,MIP_LEVELS_1,WW3D_FORMAT_UNKNOWN);
+		if (comp_tex) {
+			IDirect3DSurface8* d3d_surface=NULL;
+			DX8_ErrorCode(comp_tex->GetSurfaceLevel(0,&d3d_surface));
+			comp_tex->Release();
+			return d3d_surface;
+		}
+	}
+
+	// Make sure the file can be opened. If not, return missing texture.
+	Targa targa;
+	if (TARGA_ERROR_HANDLER(targa.Open(filename, TGA_READMODE),filename)) return MissingTexture::_Create_Missing_Surface();
+
+	// DX8 uses image upside down compared to TGA
+	targa.Header.ImageDescriptor ^= TGAIDF_YORIGIN;
+
+	WW3DFormat src_format,dest_format;
+	unsigned src_bpp=0;
+	Get_WW3D_Format(dest_format,src_format,src_bpp,targa);
+
+	if (texture_format!=WW3D_FORMAT_UNKNOWN) {
+		dest_format=texture_format;
+	}
+
+	// Destination size will be the next power of two square from the larger width and height...
+	unsigned width, height;
+	width=targa.Header.Width;
+	height=targa.Header.Height;
+	unsigned src_width=targa.Header.Width;
+	unsigned src_height=targa.Header.Height;
+
+	// NOTE: We load the palette but we do not yet support paletted textures!
+	char palette[256*4];
+	targa.SetPalette(palette);
+	if (TARGA_ERROR_HANDLER(targa.Load(filename, TGAF_IMAGE, false),filename)) return MissingTexture::_Create_Missing_Surface();
+
+	unsigned char* src_surface=(unsigned char*)targa.GetImage();
+
+	// No paletted destination format allowed
+	unsigned char* converted_surface=NULL;
+	if (src_format==WW3D_FORMAT_A1R5G5B5 || src_format==WW3D_FORMAT_R5G6B5 || src_format==WW3D_FORMAT_A4R4G4B4 ||
+		src_format==WW3D_FORMAT_P8 || src_format==WW3D_FORMAT_L8 || src_width!=width || src_height!=height) {
+		converted_surface=W3DNEWARRAY unsigned char[width*height*4];
+		dest_format=Get_Valid_Texture_Format(WW3D_FORMAT_A8R8G8B8,false);
+		BitmapHandlerClass::Copy_Image(
+			converted_surface,
+			width,
+			height,
+			width*4,
+			WW3D_FORMAT_A8R8G8B8,//dest_format,
+			src_surface,
+			src_width,
+			src_height,
+			src_width*src_bpp,
+			src_format,
+			(unsigned char*)targa.GetPalette(),
+			targa.Header.CMapDepth>>3,
+			false);
+		src_surface=converted_surface;
+		src_format=WW3D_FORMAT_A8R8G8B8;//dest_format;
+		src_width=width;
+		src_height=height;
+		src_bpp=Get_Bytes_Per_Pixel(src_format);
+	}
+
+	unsigned src_pitch=src_width*src_bpp;
+
+	IDirect3DSurface8* d3d_surface = DX8Wrapper::_Create_DX8_Surface(width,height,dest_format);
+	WWASSERT(d3d_surface);
+	D3DLOCKED_RECT locked_rect;
+	DX8_ErrorCode(
+		d3d_surface->LockRect(
+			&locked_rect,
+			NULL,
+			0));
+
+	BitmapHandlerClass::Copy_Image(
+		(unsigned char*)locked_rect.pBits,
+		width,
+		height,
+		locked_rect.Pitch,
+		dest_format,
+		src_surface,
+		src_width,
+		src_height,
+		src_pitch,
+		src_format,
+		(unsigned char*)targa.GetPalette(),
+		targa.Header.CMapDepth>>3,
+		false);	// No mipmap
+
+	DX8_ErrorCode(d3d_surface->UnlockRect());
+
+	delete[] converted_surface;
+
+	return d3d_surface;
+}
+
+
+void TextureLoader::Request_Thumbnail(TextureBaseClass *tc)
+{
+	// Grab the foreground lock. This prevents the foreground thread
+	// from retiring any tasks related to this texture. It also
+	// serializes calls to Request_Thumbnail from multiple threads.
+	FastCriticalSectionClass::LockClass lock(_ForegroundCriticalSection);
+
+	// Has a Direct3D texture already been loaded?
+	if (tc->Peek_D3D_Base_Texture()) {
+		return;
+	}
+
+	TextureLoadTaskClass *task = tc->ThumbnailLoadTask;
+
+	if (Is_DX8_Thread()) {
+		// load the thumbnail immediately
+		TextureLoader::Load_Thumbnail(tc);
+
+		// clear any pending thumbnail load
+		if (task) {
+			_ForegroundQueue.Remove(task);
+			task->Destroy();
+		}
+
+	} else {
+		TextureLoadTaskClass *load_task = tc->TextureLoadTask;
+
+		// if texture is not already loading a thumbnail and there is no
+		// background load near completion. (a background load waiting
+		// to be applied will be ready at the same time as a queued thumbnail.
+		// Why do the extra work?)
+		if (!task && (!load_task || load_task->Get_State() < TextureLoadTaskClass::STATE_LOAD_MIPMAP)) {
+
+			// create a thumbnail load task and add to foreground queue.
+			task = TextureLoadTaskClass::Create(tc, TextureLoadTaskClass::TASK_THUMBNAIL, TextureLoadTaskClass::PRIORITY_LOW);
+			_ForegroundQueue.Push_Back(task);
+		}
+	}
+}
+
+
+void TextureLoader::Request_Background_Loading(TextureBaseClass *tc)
+{
+	WWPROFILE(("TextureLoader::Request_Background_Loading()"));
+	// Grab the foreground lock. This prevents the foreground thread
+	// from retiring any tasks related to this texture. It also
+	// serializes calls to Request_Background_Loading from other
+	// threads.
+	FastCriticalSectionClass::LockClass foreground_lock(_ForegroundCriticalSection);
+
+	// Has the texture already been loaded?
+	if (tc->Is_Initialized()) {
+		return;
+	}
+
+	TextureLoadTaskClass *task = tc->TextureLoadTask;
+
+	// if texture already has a load task, we don't need to create another one.
+	if (task) {
+		return;
+	}
+
+	task = TextureLoadTaskClass::Create(tc, TextureLoadTaskClass::TASK_LOAD, TextureLoadTaskClass::PRIORITY_LOW);
+
+	if (Is_DX8_Thread()) {
+		Begin_Load_And_Queue(task);
+	} else {
+		_ForegroundQueue.Push_Back(task);
+	}
+}
+
+
+void TextureLoader::Request_Foreground_Loading(TextureBaseClass *tc)
+{
+	WWPROFILE(("TextureLoader::Request_Foreground_Loading()"));
+	// Grab the foreground lock. This prevents the foreground thread
+	// from retiring the load tasks for this texture. It also
+	// serializes calls to Request_Foreground_Loading from other
+	// threads.
+	FastCriticalSectionClass::LockClass foreground_lock(_ForegroundCriticalSection);
+
+	// Has the texture already been loaded?
+	if (tc->Is_Initialized()) {
+		return;
+	}
+
+	TextureLoadTaskClass *task			= tc->TextureLoadTask;
+	TextureLoadTaskClass *task_thumb = tc->ThumbnailLoadTask;
+
+	if (Is_DX8_Thread()) {
+
+		// since we're in the DX8 thread, we can load the entire
+		// texture right now.
+
+		// if we have a thumbnail task waiting, kill it.
+		if (task_thumb) {
+			_ForegroundQueue.Remove(task_thumb);
+			task_thumb->Destroy();
+		}
+
+		if (task) {
+			// we need to remove the task from any queue, since we're going
+			// to finish it up right now.
+
+			// halt background thread. After we're holding this lock,
+			// we know the background thread cannot begin loading
+			// mipmap levels for this texture.
+			FastCriticalSectionClass::LockClass background_lock(_BackgroundCriticalSection);
+			_ForegroundQueue.Remove(task);
+			_BackgroundQueue.Remove(task);
+		} else {
+			// Since the task manages all the state associated with loading
+			// a texture, we temporarily create one.
+			task = TextureLoadTaskClass::Create(tc, TextureLoadTaskClass::TASK_LOAD, TextureLoadTaskClass::PRIORITY_HIGH);
+		}
+
+		// finish loading the task and destroy it.
+		task->Finish_Load();
+		task->Destroy();
+
+	} else {
+		// we are not in the DX8 thread. We need to add a high-priority loading
+		// task to the foreground queue.
+
+		// Grab the background lock. After we're holding this lock, we
+		// know the background thread cannot begin loading mipmap levels
+		// for this texture.
+		FastCriticalSectionClass::LockClass background_lock(_BackgroundCriticalSection);
+
+		// if we have a thumbnail task, we should cancel it. Since we are not
+		// the foreground thread, we are not allowed to call Destroy(). Instead,
+		// leave it queued in the completed state so it will be destroyed by Update().
+		if (task_thumb) {
+			task_thumb->Set_State(TextureLoadTaskClass::STATE_COMPLETE);
+		}
+
+		if (task) {
+			// if a load task is waiting on the background queue, we need to
+			// move it to the foreground queue.
+			if (task->Get_List() == &_BackgroundQueue) {
+
+				// remove task from list
+				_BackgroundQueue.Remove(task);
+
+				// add to foreground queue.
+				_ForegroundQueue.Push_Back(task);
+			}
+
+			// upgrade the task priority
+			task->Set_Priority(TextureLoadTaskClass::PRIORITY_HIGH);
+
+		} else {
+			// allocate high priority load task
+			task = TextureLoadTaskClass::Create(tc, TextureLoadTaskClass::TASK_LOAD, TextureLoadTaskClass::PRIORITY_HIGH);
+
+			// add to back of foreground queue.
+			_ForegroundQueue.Push_Back(task);
+		}
+	}
+}
+
+
+void TextureLoader::Flush_Pending_Load_Tasks(void)
+{
+	// This function can only be called from the main thread.
+	// (Only the main thread can make the DX8 calls necessary
+	// to complete texture loading. If we wanted to flush
+	// the pending tasks from another thread, we'd probably
+	// want to set a bool that is checked by Update().
+	WWASSERT(Is_DX8_Thread());
+
+	for (;;) {
+		bool done = false;
+
+		{
+			// we have no pending load tasks when both queues are empty
+			// and the background thread is not processing a texture.
+
+			// Grab the background lock. Once we're holding it, we
+			// know that the background thread is not processing any
+			// textures.
+
+			// NOTE: It's important that we do only hold on to the background
+			// lock while we check for completion. Otherwise, we will either
+			// violate the lock order when we call Update() (which grabs
+			// the foreground lock) or never give the background thread
+			// a chance to empty its queue.
+			FastCriticalSectionClass::LockClass background_lock(_BackgroundCriticalSection);
+			done = _BackgroundQueue.Is_Empty() && _ForegroundQueue.Is_Empty();
+		}
+
+		// exit loop if no entries in list
+		if (done) {
+			break;
+		}
+
+		Update();
+		ThreadClass::Switch_Thread();
+	}
+}
+
+
+// Nework update macro for texture loader.
+#pragma warning(disable:4201) // warning C4201: nonstandard extension used : nameless struct/union
+#include <mmsystem.h>
+#define UPDATE_NETWORK 											\
+	if (network_callback) {                            \
+		unsigned long time2 = timeGetTime();            \
+		if (time2 - time > 20) {                        \
+			network_callback();                          \
+			time = time2;                                \
+		}                                               \
+	}                                                  \
+
+
+void TextureLoader::Update(void (*network_callback)(void))
+{
+	WWASSERT_PRINT(Is_DX8_Thread(), "TextureLoader::Update must be called from the main thread!");
+
+	if (TextureLoadSuspended) {
+		return;
+	}
+
+	// grab foreground lock to prevent any other thread from
+	// modifying texture tasks.
+	FastCriticalSectionClass::LockClass lock(_ForegroundCriticalSection);
+
+	unsigned long time = timeGetTime();
+
+	// while we have tasks on the foreground queue
+	while (TextureLoadTaskClass *task = _ForegroundQueue.Pop_Front()) {
+		UPDATE_NETWORK;
+		// dispatch to proper task handler
+		switch (task->Get_Type()) {
+			case TextureLoadTaskClass::TASK_THUMBNAIL:
+				Process_Foreground_Thumbnail(task);
+				break;
+
+			case TextureLoadTaskClass::TASK_LOAD:
+				Process_Foreground_Load(task);
+				break;
+		}
+	}
+
+	TextureBaseClass::Invalidate_Old_Unused_Textures(TextureInactiveOverrideTime);
+}
+
+void TextureLoader::Suspend_Texture_Load()
+{
+	WWASSERT_PRINT(Is_DX8_Thread(),"TextureLoader::Suspend_Texture_Load must be called from the main thread!");
+	TextureLoadSuspended=true;
+}
+
+void TextureLoader::Continue_Texture_Load()
+{
+	WWASSERT_PRINT(Is_DX8_Thread(),"TextureLoader::Continue_Texture_Load must be called from the main thread!");
+	TextureLoadSuspended=false;
+}
+
+void TextureLoader::Process_Foreground_Thumbnail(TextureLoadTaskClass *task)
+{
+	switch (task->Get_State()) {
+		case TextureLoadTaskClass::STATE_NONE:
+			Load_Thumbnail(task->Peek_Texture());
+			FALLTHROUGH; // NOTE: fall-through is intentional
+
+		case TextureLoadTaskClass::STATE_COMPLETE:
+			task->Destroy();
+			break;
+	}
+}
+
+
+void TextureLoader::Process_Foreground_Load(TextureLoadTaskClass *task)
+{
+	// Is high-priority task?
+	if (task->Get_Priority() == TextureLoadTaskClass::PRIORITY_HIGH) {
+		task->Finish_Load();
+		task->Destroy();
+		return;
+	}
+
+	// otherwise, must be a low-priority task.
+
+	switch (task->Get_State()) {
+		case TextureLoadTaskClass::STATE_NONE:
+			Begin_Load_And_Queue(task);
+			break;
+
+		case TextureLoadTaskClass::STATE_LOAD_MIPMAP:
+			task->End_Load();
+			task->Destroy();
+			break;
+	}
+}
+
+
+void TextureLoader::Begin_Load_And_Queue(TextureLoadTaskClass *task)
+{
+	// should only be called from the DX8 thread.
+	WWASSERT(Is_DX8_Thread());
+
+	if (task->Begin_Load()) {
+		// add to front of background queue. This means the
+		// background load thread will service tasks in LIFO
+		// (last in, first out) order.
+
+		// NOTE: this was how the old code did it, with a
+		// comment that mentioned good reasons for doing so,
+		// without actually listing the reasons. I suspect
+		// it has something to do with visually important textures,
+		// like those in the foreground, starting their load last.
+		_BackgroundQueue.Push_Front(task);
+	} else {
+		// unable to load.
+		task->Apply_Missing_Texture();
+		task->Destroy();
+	}
+}
+
+
+void TextureLoader::Load_Thumbnail(TextureBaseClass *tc)
+{
+	// All D3D operations must run from main thread
+	WWASSERT(Is_DX8_Thread());
+
+	// load thumbnail texture
+	IDirect3DTexture8 *d3d_texture = Load_Thumbnail(tc->Get_Full_Path(),tc->Get_HSV_Shift());
+
+	// apply thumbnail to texture
+	if (tc->Get_Asset_Type()==TextureBaseClass::TEX_REGULAR)
+	{
+		tc->Apply_New_Surface(d3d_texture, false);
+	}
+
+	// release our reference to thumbnail texture
+	d3d_texture->Release();
+	d3d_texture = 0;
+}
+
+
+void LoaderThreadClass::Thread_Function(void)
+{
+	while (running) {
+		// if there are no tasks on the background queue, no need to grab background lock.
+		if (!_BackgroundQueue.Is_Empty()) {
+			// Grab background load so other threads know we could be
+			// loading a texture.
+			FastCriticalSectionClass::LockClass lock(_BackgroundCriticalSection);
+
+			// try to remove a task from the background queue. This could fail
+			// if another thread modified the queue between our test above and
+			// grabbing the lock.
+			TextureLoadTaskClass* task = _BackgroundQueue.Pop_Front();
+			if (task) {
+				// verify task is in proper state for background processing.
+				WWASSERT(task->Get_Type() == TextureLoadTaskClass::TASK_LOAD);
+				WWASSERT(task->Get_State() == TextureLoadTaskClass::STATE_LOAD_BEGUN);
+
+				// load mip map levels and return to foreground queue for final step.
+				task->Load();
+				_ForegroundQueue.Push_Back(task);
+			}
+		}
+
+		Switch_Thread();
+	}
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// TextureLoaderTaskClass implementation
+//
+////////////////////////////////////////////////////////////////////////////////
+
+TextureLoadTaskClass::TextureLoadTaskClass()
+:	Texture			(0),
+	D3DTexture		(0),
+	Format			(WW3D_FORMAT_UNKNOWN),
+	Width				(0),
+	Height			(0),
+	MipLevelCount	(0),
+	Reduction		(0),
+	Type				(TASK_NONE),
+	Priority			(PRIORITY_LOW),
+	State				(STATE_NONE),
+	HSVShift			(0.0f,0.0f,0.0f)
+{
+	// because texture load tasks are pooled, the constructor and destructor
+	// don't need to do much. The work of attaching a task to a texture is
+	// is done by Init() and Deinit().
+
+	for (int i = 0; i < MIP_LEVELS_MAX; ++i) {
+		LockedSurfacePtr[i]		= NULL;
+		LockedSurfacePitch[i]	= 0;
+	}
+}
+
+
+TextureLoadTaskClass::~TextureLoadTaskClass(void)
+{
+	Deinit();
+}
+
+
+TextureLoadTaskClass *TextureLoadTaskClass::Create(TextureBaseClass *tc, TaskType type, PriorityType priority)
+{
+	// recycle or create a new texture load task with the given type
+	// and priority, then associate the texture with the task.
+
+	// pull a load task from front of free list
+	TextureLoadTaskClass *task = NULL;
+	switch (tc->Get_Asset_Type())
+	{
+		case TextureBaseClass::TEX_REGULAR : task=_TexLoadFreeList.Pop_Front(); break;
+		case TextureBaseClass::TEX_CUBEMAP : task=_CubeTexLoadFreeList.Pop_Front(); break;
+		case TextureBaseClass::TEX_VOLUME : task=_VolTexLoadFreeList.Pop_Front(); break;
+		default : WWASSERT(0);
+	};
+
+	// if no tasks on free list, allocate a new task
+	if (!task)
+	{
+		switch (tc->Get_Asset_Type())
+		{
+		case TextureBaseClass::TEX_REGULAR : task=new TextureLoadTaskClass; break;
+		case TextureBaseClass::TEX_CUBEMAP : task=new CubeTextureLoadTaskClass; break;
+		case TextureBaseClass::TEX_VOLUME : task=new VolumeTextureLoadTaskClass; break;
+		default : WWASSERT(0);
+		}
+	}
+	task->Init(tc, type, priority);
+	return task;
+}
+
+
+void TextureLoadTaskClass::Destroy(void)
+{
+	// detach the task from its texture, and return to free pool.
+	Deinit();
+	_TexLoadFreeList.Push_Front(this);
+}
+
+
+void TextureLoadTaskClass::Delete_Free_Pool(void)
+{
+	// (gth) We should probably just MEMPool these task objects...
+	while (TextureLoadTaskClass *task = _TexLoadFreeList.Pop_Front()) {
+		delete task;
+	}
+	while (TextureLoadTaskClass *task = _CubeTexLoadFreeList.Pop_Front()) {
+		delete task;
+	}
+	while (TextureLoadTaskClass *task = _VolTexLoadFreeList.Pop_Front()) {
+		delete task;
+	}
+}
+
+
+void TextureLoadTaskClass::Init(TextureBaseClass* tc, TaskType type, PriorityType priority)
+{
+	WWASSERT(tc);
+
+	// NOTE: we must be in the main thread to avoid corrupting the texture's refcount.
+	WWASSERT(TextureLoader::Is_DX8_Thread());
+	REF_PTR_SET(Texture, tc);
+
+	// Make sure texture has a filename.
+	WWASSERT(!Texture->Get_Full_Path().Is_Empty());
+
+	Type				= type;
+	Priority			= priority;
+	State				= STATE_NONE;
+
+	D3DTexture		= 0;
+
+	TextureClass* tex=Texture->As_TextureClass();
+
+	if (tex)
+	{
+		Format			= tex->Get_Texture_Format(); // don't assume format yet KM
+	}
+	else
+	{
+		Format			= WW3D_FORMAT_UNKNOWN;
+	}
+
+	Width				= 0;
+	Height			= 0;
+	MipLevelCount	= Texture->MipLevelCount;
+	Reduction		= Texture->Get_Reduction();
+	HSVShift			= Texture->Get_HSV_Shift();
+
+
+	for (int i = 0; i < MIP_LEVELS_MAX; ++i)
+	{
+		LockedSurfacePtr[i]		= NULL;
+		LockedSurfacePitch[i]	= 0;
+	}
+
+	switch (Type)
+	{
+		case TASK_THUMBNAIL:
+			WWASSERT(Texture->ThumbnailLoadTask == NULL);
+			Texture->ThumbnailLoadTask = this;
+			break;
+
+		case TASK_LOAD:
+			WWASSERT(Texture->TextureLoadTask == NULL);
+			Texture->TextureLoadTask = this;
+			break;
+	}
+}
+
+
+void TextureLoadTaskClass::Deinit()
+{
+	// task should not be on any list when it is being detached from texture.
+	WWASSERT(Next == NULL);
+	WWASSERT(Prev == NULL);
+
+	WWASSERT(D3DTexture == NULL);
+
+	for (int i = 0; i < MIP_LEVELS_MAX; ++i) {
+		WWASSERT(LockedSurfacePtr[i] == NULL);
+	}
+
+	if (Texture) {
+		switch (Type) {
+			case TASK_THUMBNAIL:
+				WWASSERT(Texture->ThumbnailLoadTask == this);
+				Texture->ThumbnailLoadTask = NULL;
+				break;
+
+			case TASK_LOAD:
+				WWASSERT(Texture->TextureLoadTask == this);
+				Texture->TextureLoadTask = NULL;
+				break;
+		}
+
+		// NOTE: we must be in main thread to avoid corrupting Texture's refcount.
+		WWASSERT(TextureLoader::Is_DX8_Thread());
+		REF_PTR_RELEASE(Texture);
+	}
+}
+
+
+bool TextureLoadTaskClass::Begin_Load(void)
+{
+	WWASSERT(TextureLoader::Is_DX8_Thread());
+
+	bool loaded = false;
+
+	// if allowed, begin a compressed load
+	if (Texture->Is_Compression_Allowed()) {
+		loaded = Begin_Compressed_Load();
+	}
+
+	// otherwise, begin an uncompressed load
+	if (!loaded) {
+		loaded = Begin_Uncompressed_Load();
+	}
+
+	// if not loaded, abort.
+	if (!loaded) {
+		return false;
+	}
+
+	// lock surfaces in preparation for copy
+	Lock_Surfaces();
+
+	State = STATE_LOAD_BEGUN;
+
+	return true;
+}
+
+
+// ----------------------------------------------------------------------------
+//
+// Load mipmap levels to a pre-generated and locked texture object based on
+// information in load task object. Try loading from a DDS file first and if
+// that fails try a TGA.
+//
+// ----------------------------------------------------------------------------
+bool TextureLoadTaskClass::Load(void)
+{
+	WWMEMLOG(MEM_TEXTURE);
+	WWASSERT(Peek_D3D_Texture());
+
+	bool loaded = false;
+
+	// if allowed, try to load compressed mipmaps
+	if (Texture->Is_Compression_Allowed()) {
+		loaded = Load_Compressed_Mipmap();
+	}
+
+	// otherwise, load uncompressed mipmaps
+	if (!loaded) {
+		loaded = Load_Uncompressed_Mipmap();
+	}
+
+	State = STATE_LOAD_MIPMAP;
+
+	return loaded;
+}
+
+
+void TextureLoadTaskClass::End_Load(void)
+{
+	WWASSERT(TextureLoader::Is_DX8_Thread());
+
+	Unlock_Surfaces();
+	Apply(true);
+
+	State = STATE_LOAD_COMPLETE;
+}
+
+
+void TextureLoadTaskClass::Finish_Load(void)
+{
+	switch (State) {
+		// NOTE: fall-through below is intentional.
+
+		case STATE_NONE:
+			if (!Begin_Load()) {
+				Apply_Missing_Texture();
+				break;
+			}
+			FALLTHROUGH;
+
+		case STATE_LOAD_BEGUN:
+			Load();
+			FALLTHROUGH;
+
+		case STATE_LOAD_MIPMAP:
+			End_Load();
+			FALLTHROUGH;
+
+		default:
+			break;
+	}
+}
+
+
+void TextureLoadTaskClass::Apply_Missing_Texture(void)
+{
+	WWASSERT(TextureLoader::Is_DX8_Thread());
+	WWASSERT(!D3DTexture);
+
+	D3DTexture = MissingTexture::_Get_Missing_Texture();
+	Apply(true);
+}
+
+
+void TextureLoadTaskClass::Apply(bool initialize)
+{
+	WWASSERT(D3DTexture);
+
+	// Verify that none of the mip levels are locked
+	for (unsigned i=0;i<MipLevelCount;++i) {
+		WWASSERT(LockedSurfacePtr[i]==NULL);
+	}
+
+	Texture->Apply_New_Surface(D3DTexture, initialize);
+
+	D3DTexture->Release();
+	D3DTexture = NULL;
+}
+
+static bool	Get_Texture_Information
+(
+	const char* filename,
+	unsigned& reduction,
+	unsigned& w,
+	unsigned& h,
+	unsigned& d,
+	WW3DFormat& format,
+	unsigned& mip_count,
+	bool compressed
+)
+{
+	ThumbnailClass* thumb=ThumbnailManagerClass::Peek_Thumbnail_Instance_From_Any_Manager(filename);
+
+	if (!thumb)
+	{
+		if (compressed)
+		{
+			DDSFileClass dds_file(filename, 0);
+			if (!dds_file.Is_Available()) return false;
+
+			// Destination size will be the next power of two square from the larger width and height...
+			w = dds_file.Get_Width(0);
+			h = dds_file.Get_Height(0);
+			d = dds_file.Get_Depth(0);
+			format = dds_file.Get_Format();
+			mip_count = dds_file.Get_Mip_Level_Count();
+			//Figure out correct reduction
+			int reqReduction=WW3D::Get_Texture_Reduction();	//requested reduction
+
+			if (reqReduction >= mip_count)
+				reqReduction=mip_count-1;	//leave only the lowest level
+
+			//Clamp reduction
+			int curReduction=0;
+			int curWidth=w;
+			int curHeight=h;
+			int minDim=WW3D::Get_Texture_Min_Dimension();
+
+			while (curReduction < reqReduction && curWidth > minDim && curHeight > minDim)
+			{	curWidth >>=1;	//keep dividing
+				curHeight >>=1;
+				curReduction++;
+			}
+			reduction=curReduction;
+			return true;
+		}
+
+		Targa targa;
+		if (TARGA_ERROR_HANDLER(targa.Open(filename, TGA_READMODE), filename))
+		{
+			return false;
+		}
+
+		unsigned int bpp;
+		WW3DFormat dest_format;
+		Get_WW3D_Format(dest_format,format,bpp,targa);
+
+		mip_count = 0;
+
+		//Figure out how many mip levels this texture will occupy
+		for (int i=targa.Header.Width, j=targa.Header.Height; i > 0 && j > 0; i>>=1, j>>=1)
+				mip_count++;
+
+		//Figure out correct reduction
+		int reqReduction=WW3D::Get_Texture_Reduction();	//requested reduction
+
+		if (reqReduction >= mip_count)
+			reqReduction=mip_count-1;	//leave only the lowest level
+
+		//Clamp reduction
+		int curReduction=0;
+		int curWidth=targa.Header.Width;
+		int curHeight=targa.Header.Height;
+		int minDim=WW3D::Get_Texture_Min_Dimension();
+
+		while (curReduction < reqReduction && curWidth > minDim && curHeight > minDim)
+		{	curWidth >>=1;	//keep dividing
+			curHeight >>=1;
+			curReduction++;
+		}
+		reduction=curReduction;
+
+		// Destination size will be the next power of two square from the larger width and height...
+		w = targa.Header.Width;
+		h = targa.Header.Height;
+		d = 1;
+		return true;
+	}
+
+	if (compressed &&
+		thumb->Get_Original_Texture_Format()!=WW3D_FORMAT_DXT1 &&
+		thumb->Get_Original_Texture_Format()!=WW3D_FORMAT_DXT2 &&
+		thumb->Get_Original_Texture_Format()!=WW3D_FORMAT_DXT3 &&
+		thumb->Get_Original_Texture_Format()!=WW3D_FORMAT_DXT4 &&
+		thumb->Get_Original_Texture_Format()!=WW3D_FORMAT_DXT5) {
+		return false;
+	}
+
+	w=thumb->Get_Original_Texture_Width() >> reduction;
+	h=thumb->Get_Original_Texture_Height() >> reduction;
+	//d=thumb->Get_Original_Texture_Depth() >> reduction; // need to a volume texture support to thumbnails...maybe
+	mip_count=thumb->Get_Original_Texture_Mip_Level_Count();
+	format=thumb->Get_Original_Texture_Format();
+	return true;
+}
+
+
+bool TextureLoadTaskClass::Begin_Compressed_Load(void)
+{
+	unsigned orig_w,orig_h,orig_d,orig_mip_count,reduction;
+	WW3DFormat orig_format;
+	if (!Get_Texture_Information
+		  (
+				Texture->Get_Full_Path(),
+				reduction,
+				orig_w,
+				orig_h,
+				orig_d,
+				orig_format,
+				orig_mip_count,
+				true
+			)
+		)
+	{
+		return false;
+	}
+
+	// Destination size will be the next power of two square from the larger width and height...
+	unsigned int width	= orig_w;
+	unsigned int height	= orig_h;
+	TextureLoader::Validate_Texture_Size(width, height,orig_d);
+
+	// If the size doesn't match, try and see if texture reduction would help... (mainly for
+	// cases where loaded texture is larger than hardware limit)
+	if (width != orig_w || height != orig_h)
+	{
+		for (unsigned int i = 1; i < orig_mip_count; ++i)
+		{
+			unsigned w=orig_w>>i;
+			if (w<4) w=4;
+			unsigned h=orig_h>>i;
+			if (h<4) h=4;
+			unsigned tmp_w=w;
+			unsigned tmp_h=h;
+
+			TextureLoader::Validate_Texture_Size(w,h,orig_d);
+
+			if (w == tmp_w && h == tmp_h)
+			{
+				Reduction	+= i;
+				width			=	w;
+				height		=	h;
+				break;
+			}
+		}
+	}
+
+	Width		= width;
+	Height	= height;
+	Format	= Get_Valid_Texture_Format(orig_format, Texture->Is_Compression_Allowed());
+	Reduction = reduction;
+
+
+	if (!Texture->Is_Reducible() || Texture->MipLevelCount == MIP_LEVELS_1)
+		Reduction = 0;	//app doesn't want this texture to ever be reduced.
+	else
+	//Make sure we don't reduce below the level requested by the app
+	if (Texture->MipLevelCount != MIP_LEVELS_ALL && (Texture->MipLevelCount - Reduction) < 1)
+		Reduction = Texture->MipLevelCount - 1;
+
+	//Another sanity check
+	if (Reduction >= orig_mip_count)
+		Reduction = 0;	//should not be possible to get here, but check just in case.
+
+	unsigned int mip_level_count = Get_Mip_Level_Count();
+	int reducedWidth=Width;
+	int reducedHeight=Height;
+
+	// If texture wants all mip levels, take as many as the file contains (not necessarily all)
+	// Otherwise take as many mip levels as the texture wants, not to exceed the count in file...
+	if (!mip_level_count)
+	{
+		reducedWidth >>= Reduction;
+		reducedHeight >>= Reduction;
+		mip_level_count = orig_mip_count-Reduction;//dds_file.Get_Mip_Level_Count();
+		if (mip_level_count < 1)
+			mip_level_count = 1;	//sanity check to make sure something gets loaded.
+	}
+	else
+	{
+		if (mip_level_count > orig_mip_count)
+		{	//dds_file.Get_Mip_Level_Count()) {
+			mip_level_count = orig_mip_count;//dds_file.Get_Mip_Level_Count();
+		}
+
+		if (Reduction)
+		{	reducedWidth >>= Reduction;
+			reducedHeight >>= Reduction;
+			mip_level_count -= Reduction;	//reduced requested number by those removed.
+		}
+	}
+
+	// Once more, verify that the mip level count is correct (in case it was changed here it might not
+	// match the size...well actually it doesn't have to match but it can't be bigger than the size)
+	unsigned int max_mip_level_count = 1;
+	unsigned int w = 4;
+	unsigned int h = 4;
+
+	while (w < Width && h < Height)
+	{
+		w += w;
+		h += h;
+		max_mip_level_count++;
+	}
+
+	if (mip_level_count > max_mip_level_count)
+	{
+		mip_level_count = max_mip_level_count;
+	}
+
+	D3DTexture	= DX8Wrapper::_Create_DX8_Texture
+	(
+		reducedWidth,
+		reducedHeight,
+		Format,
+		(MipCountType)mip_level_count,
+#ifdef USE_MANAGED_TEXTURES
+		D3DPOOL_MANAGED
+#else
+		D3DPOOL_SYSTEMMEM
+#endif
+	);
+
+	MipLevelCount = mip_level_count;
+
+	return true;
+}
+
+bool TextureLoadTaskClass::Begin_Uncompressed_Load(void)
+{
+	unsigned width,height,depth,orig_mip_count,reduction;
+	WW3DFormat orig_format;
+	if (!Get_Texture_Information
+		  (
+				Texture->Get_Full_Path(),
+				reduction,
+				width,
+				height,
+				depth,
+				orig_format,
+				orig_mip_count,
+				false
+			)
+		)
+	{
+		return false;
+	}
+
+	WW3DFormat src_format=orig_format;
+	WW3DFormat dest_format=src_format;
+	dest_format=Get_Valid_Texture_Format(dest_format,false);	// No compressed destination format if reading from targa...
+
+   if (	src_format != WW3D_FORMAT_A8R8G8B8
+   	&&	src_format != WW3D_FORMAT_R8G8B8
+  		&&	src_format != WW3D_FORMAT_X8R8G8B8 )
+	{
+		WWDEBUG_SAY(("Invalid TGA format used in %s - only 24 and 32 bit formats should be used!", Texture->Get_Full_Path().str()));
+	}
+
+	// Destination size will be the next power of two square from the larger width and height...
+	unsigned ow = width;
+	unsigned oh = height;
+	TextureLoader::Validate_Texture_Size(width, height,depth);
+	if (width != ow || height != oh)
+	{
+		WWDEBUG_SAY(("Invalid texture size, scaling required. Texture: %s, size: %d x %d -> %d x %d", Texture->Get_Full_Path().str(), ow, oh, width, height));
+	}
+
+	Width		= width;
+	Height	= height;
+	Reduction = reduction;
+
+	if (!Texture->Is_Reducible() || Texture->MipLevelCount == MIP_LEVELS_1)
+		Reduction = 0;	//app doesn't want this texture to ever be reduced.
+	else
+	//Make sure we don't reduce below the level requested by the app
+	if (Texture->MipLevelCount != MIP_LEVELS_ALL && (Texture->MipLevelCount - Reduction) < 1)
+		Reduction = Texture->MipLevelCount - 1;
+
+	//Another sanity check
+	if (Reduction >= orig_mip_count)
+		Reduction = 0;	//should not be possible to get here, but check just in case.
+
+	if (Format == WW3D_FORMAT_UNKNOWN)
+	{
+		Format=dest_format;
+	//	Format = Get_Valid_Texture_Format(dest_format, false); validated above
+	}
+	else
+	{
+		Format = Get_Valid_Texture_Format(Format, false);
+	}
+
+	int reducedWidth=Width;
+	int reducedHeight=Height;
+	int reducedMipCount=Texture->MipLevelCount;
+
+	if (Reduction)
+	{	//we don't care about specific levels so reduce them if needed.
+		reducedWidth >>= Reduction;
+		reducedHeight >>= Reduction;
+		if (reducedMipCount != MIP_LEVELS_ALL)
+			reducedMipCount -= Reduction;
+	}
+
+	D3DTexture = DX8Wrapper::_Create_DX8_Texture
+	(
+		reducedWidth,
+		reducedHeight,
+		Format,
+		(MipCountType)reducedMipCount,
+#ifdef USE_MANAGED_TEXTURES
+		D3DPOOL_MANAGED
+#else
+		D3DPOOL_SYSTEMMEM
+#endif
+	);
+
+	return true;
+}
+
+/*
+bool TextureLoadTaskClass::Begin_Compressed_Load(void)
+{
+	DDSFileClass dds_file(Texture->Get_Full_Path(), Get_Reduction());
+	if (!dds_file.Is_Available()) {
+		return false;
+	}
+
+	// Destination size will be the next power of two square from the larger width and height...
+	unsigned int width	= dds_file.Get_Width(0);
+	unsigned int height	= dds_file.Get_Height(0);
+	TextureLoader::Validate_Texture_Size(width, height);
+
+	// If the size doesn't match, try and see if texture reduction would help... (mainly for
+	// cases where loaded texture is larger than hardware limit)
+	if (width != dds_file.Get_Width(0) || height != dds_file.Get_Height(0)) {
+		for (unsigned int i = 1; i < dds_file.Get_Mip_Level_Count(); ++i) {
+			unsigned int w = dds_file.Get_Width(i);
+			unsigned int h = dds_file.Get_Height(i);
+			TextureLoader::Validate_Texture_Size(w,h);
+
+			if (w == dds_file.Get_Width(i) && h == dds_file.Get_Height(i)) {
+				Reduction	+= i;
+				width			=	w;
+				height		=	h;
+				break;
+			}
+		}
+	}
+
+	Width		= width;
+	Height	= height;
+	Format	= Get_Valid_Texture_Format(dds_file.Get_Format(), Texture->Is_Compression_Allowed());
+
+	unsigned int mip_level_count = Get_Mip_Level_Count();
+
+	// If texture wants all mip levels, take as many as the file contains (not necessarily all)
+	// Otherwise take as many mip levels as the texture wants, not to exceed the count in file...
+	if (!mip_level_count) {
+		mip_level_count = dds_file.Get_Mip_Level_Count();
+	} else if (mip_level_count > dds_file.Get_Mip_Level_Count()) {
+		mip_level_count = dds_file.Get_Mip_Level_Count();
+	}
+
+	// Once more, verify that the mip level count is correct (in case it was changed here it might not
+	// match the size...well actually it doesn't have to match but it can't be bigger than the size)
+	unsigned int max_mip_level_count = 1;
+	unsigned int w = 4;
+	unsigned int h = 4;
+
+	while (w < Width && h < Height) {
+		w += w;
+		h += h;
+		max_mip_level_count++;
+	}
+
+	if (mip_level_count > max_mip_level_count) {
+		mip_level_count = max_mip_level_count;
+	}
+
+	D3DTexture	= DX8Wrapper::_Create_DX8_Texture(
+		Width,
+		Height,
+		Format,
+		(TextureBaseClass::MipCountType)mip_level_count,
+#ifdef USE_MANAGED_TEXTURES
+		D3DPOOL_MANAGED);
+#else
+		D3DPOOL_SYSTEMMEM);
+#endif
+	MipLevelCount = mip_level_count;
+	return true;
+}
+
+
+bool TextureLoadTaskClass::Begin_Uncompressed_Load(void)
+{
+	Targa targa;
+	if (TARGA_ERROR_HANDLER(targa.Open(Texture->Get_Full_Path(), TGA_READMODE), Texture->Get_Full_Path())) {
+		return false;
+	}
+
+	unsigned int bpp;
+	WW3DFormat src_format, dest_format;
+	Get_WW3D_Format(dest_format,src_format,bpp,targa);
+
+	if (	src_format != WW3D_FORMAT_A8R8G8B8
+		&&	src_format != WW3D_FORMAT_R8G8B8
+		&&	src_format != WW3D_FORMAT_X8R8G8B8) {
+		WWDEBUG_SAY(("Invalid TGA format used in %s - only 24 and 32 bit formats should be used!", Texture->Get_Full_Path()));
+	}
+
+	// Destination size will be the next power of two square from the larger width and height...
+	unsigned width=targa.Header.Width, height=targa.Header.Height;
+	int ReductionFactor=Get_Reduction();
+	int MipLevels=0;
+
+	//Figure out how many mip levels this texture will occupy
+	for (int i=width, j=height; i > 0 && j > 0; i>>=1, j>>=1)
+		MipLevels++;
+
+	//Adjust the reduction factor to keep textures above some minimum dimensions
+	if (MipLevels <= WW3D::Get_Texture_Min_Mip_Levels())
+		ReductionFactor=0;
+	else
+	{	int mipToDrop=MipLevels-WW3D::Get_Texture_Min_Mip_Levels();
+		if (ReductionFactor >= mipToDrop)
+		ReductionFactor=mipToDrop;
+	}
+
+	width=targa.Header.Width>>ReductionFactor;
+	height=targa.Header.Height>>ReductionFactor;
+	unsigned ow = width;
+	unsigned oh = height;
+	TextureLoader::Validate_Texture_Size(width, height);
+	if (width != ow || height != oh) {
+		WWDEBUG_SAY(("Invalid texture size, scaling required. Texture: %s, size: %d x %d -> %d x %d", Texture->Get_Full_Path(), ow, oh, width, height));
+	}
+
+	Width		= width;
+	Height	= height;
+
+	// changed because format was being read from previous loading task?! KJM
+	Format=dest_format;
+	//if (Format == WW3D_FORMAT_UNKNOWN) {
+	//	Format = Get_Valid_Texture_Format(dest_format, false);
+	//} else {
+	//	Format = Get_Valid_Texture_Format(Format, false);
+	//}
+
+	D3DTexture = DX8Wrapper::_Create_DX8_Texture
+	(
+		Width,
+		Height,
+		Format,
+		Texture->MipLevelCount,
+#ifdef USE_MANAGED_TEXTURES
+		D3DPOOL_MANAGED);
+#else
+		D3DPOOL_SYSTEMMEM);
+#endif
+	return true;
+}
+*/
+
+void TextureLoadTaskClass::Lock_Surfaces(void)
+{
+	MipLevelCount = D3DTexture->GetLevelCount();
+
+	for (unsigned int i = 0; i < MipLevelCount; ++i)
+	{
+		D3DLOCKED_RECT locked_rect;
+		DX8_ErrorCode
+		(
+			Peek_D3D_Texture()->LockRect
+			(
+				i,
+				&locked_rect,
+				NULL,
+				0
+			)
+		);
+		LockedSurfacePtr[i]		= (unsigned char *)locked_rect.pBits;
+		LockedSurfacePitch[i]	= locked_rect.Pitch;
+	}
+}
+
+
+void TextureLoadTaskClass::Unlock_Surfaces(void)
+{
+	for (unsigned int i = 0; i < MipLevelCount; ++i)
+	{
+		if (LockedSurfacePtr[i])
+		{
+			WWASSERT(ThreadClass::_Get_Current_Thread_ID() == DX8Wrapper::_Get_Main_Thread_ID());
+			DX8_ErrorCode(Peek_D3D_Texture()->UnlockRect(i));
+		}
+		LockedSurfacePtr[i] = NULL;
+	}
+
+#ifndef USE_MANAGED_TEXTURES
+	IDirect3DTexture8* tex = DX8Wrapper::_Create_DX8_Texture(Width, Height, Format, Texture->MipLevelCount,D3DPOOL_DEFAULT);
+	DX8CALL(UpdateTexture(Peek_D3D_Texture(),tex));
+	Peek_D3D_Texture()->Release();
+	D3DTexture=tex;
+	WWDEBUG_SAY(("Created non-managed texture (%s)",Texture->Get_Full_Path()));
+#endif
+
+}
+
+
+bool TextureLoadTaskClass::Load_Compressed_Mipmap(void)
+{
+	DDSFileClass dds_file(Texture->Get_Full_Path(), Get_Reduction());
+
+	// if we can't load from file, indicate rror.
+	if (!dds_file.Is_Available() || !dds_file.Load())
+	{
+		return false;
+	}
+
+	// regular 2d texture
+	unsigned int width	= Get_Width();
+	unsigned int height	= Get_Height();
+
+	if (Reduction)
+	{	for (unsigned int level = 0; level < Reduction; ++level) {
+			width		>>= 1;
+			height		>>= 1;
+		}
+	}
+
+	for (unsigned int level = 0; level < Get_Mip_Level_Count(); ++level)
+	{
+		WWASSERT(width && height);
+		dds_file.Copy_Level_To_Surface
+		(
+			level,
+			Get_Format(),
+			width,
+			height,
+			Get_Locked_Surface_Ptr(level),
+			Get_Locked_Surface_Pitch(level),
+			HSVShift
+		);
+
+		width		>>= 1;
+		height	>>= 1;
+	}
+
+	return true;
+}
+
+
+bool TextureLoadTaskClass::Load_Uncompressed_Mipmap(void)
+{
+	if (!Get_Mip_Level_Count())
+	{
+		return false;
+	}
+
+	Targa targa;
+	if (TARGA_ERROR_HANDLER(targa.Open(Texture->Get_Full_Path(), TGA_READMODE), Texture->Get_Full_Path())) {
+		return false;
+	}
+
+	// DX8 uses image upside down compared to TGA
+	targa.Header.ImageDescriptor ^= TGAIDF_YORIGIN;
+
+	WW3DFormat src_format;
+	WW3DFormat dest_format;
+	unsigned int src_bpp = 0;
+	Get_WW3D_Format(dest_format,src_format,src_bpp,targa);
+	if (src_format==WW3D_FORMAT_UNKNOWN) return false;
+
+	dest_format = Get_Format();	// Texture can be requested in different format than the most obvious from the TGA
+
+	char palette[256*4];
+	targa.SetPalette(palette);
+
+	unsigned int src_width	= targa.Header.Width;
+	unsigned int src_height	= targa.Header.Height;
+	unsigned int width		= Get_Width();
+	unsigned int height		= Get_Height();
+
+	// NOTE: We load the palette but we do not yet support paletted textures!
+	if (TARGA_ERROR_HANDLER(targa.Load(Texture->Get_Full_Path(), TGAF_IMAGE, false), Texture->Get_Full_Path())) {
+		return false;
+	}
+
+	unsigned char * src_surface			= (unsigned char*)targa.GetImage();
+	unsigned char * converted_surface	= NULL;
+
+	// No paletted format allowed when generating mipmaps
+	Vector3 hsv_shift=HSVShift;
+	if (	src_format	== WW3D_FORMAT_A1R5G5B5
+		|| src_format	== WW3D_FORMAT_R5G6B5
+		|| src_format	== WW3D_FORMAT_A4R4G4B4
+		||	src_format	== WW3D_FORMAT_P8
+		|| src_format	== WW3D_FORMAT_L8
+		|| src_width	!= width
+		|| src_height	!= height) {
+
+		converted_surface = new unsigned char[width*height*4];
+		dest_format = Get_Valid_Texture_Format(WW3D_FORMAT_A8R8G8B8, false);
+
+		BitmapHandlerClass::Copy_Image(
+			converted_surface,
+			width,
+			height,
+			width*4,
+			WW3D_FORMAT_A8R8G8B8,	//dest_format,
+			src_surface,
+			src_width,
+			src_height,
+			src_width*src_bpp,
+			src_format,
+			(unsigned char*)targa.GetPalette(),
+			targa.Header.CMapDepth>>3,
+			false,
+			hsv_shift);
+		hsv_shift=Vector3(0.0f,0.0f,0.0f);
+
+		src_surface	= converted_surface;
+		src_format	= WW3D_FORMAT_A8R8G8B8;	//dest_format;
+		src_width	= width;
+		src_height	= height;
+		src_bpp		= Get_Bytes_Per_Pixel(src_format);
+	}
+
+	unsigned src_pitch = src_width * src_bpp;
+
+	if (Reduction)
+	{	//texture needs to be reduced so allocate storage for full-sized version.
+		unsigned char * destination_surface	= new unsigned char[width*height*4];
+		//generate upper mip-levels that will be dropped in final texture
+		for (unsigned int level = 0; level < Reduction; ++level) {
+		BitmapHandlerClass::Copy_Image(
+			(unsigned char *)destination_surface,
+			width,
+			height,
+			src_pitch,
+			Get_Format(),
+			src_surface,
+			src_width,
+			src_height,
+			src_pitch,
+			src_format,
+			NULL,
+			0,
+			true,
+			hsv_shift);
+
+			width			>>= 1;
+			height		>>= 1;
+			src_width	>>= 1;
+			src_height	>>= 1;
+		}
+		delete [] destination_surface;
+	}
+
+	for (unsigned int level = 0; level < Get_Mip_Level_Count(); ++level) {
+		WWASSERT(Get_Locked_Surface_Ptr(level));
+		BitmapHandlerClass::Copy_Image(
+			Get_Locked_Surface_Ptr(level),
+			width,
+			height,
+			Get_Locked_Surface_Pitch(level),
+			Get_Format(),
+			src_surface,
+			src_width,
+			src_height,
+			src_pitch,
+			src_format,
+			NULL,
+			0,
+			true,
+			hsv_shift);
+		hsv_shift=Vector3(0.0f,0.0f,0.0f);
+
+		width			>>= 1;
+		height		>>= 1;
+		src_width	>>= 1;
+		src_height	>>= 1;
+
+		if (!width || !height || !src_width || !src_height) {
+			break;
+		}
+	}
+
+	delete[] converted_surface;
+
+	return true;
+}
+
+
+unsigned char * TextureLoadTaskClass::Get_Locked_Surface_Ptr(unsigned int level)
+{
+	WWASSERT(level<MipLevelCount);
+	WWASSERT(LockedSurfacePtr[level]);
+	return LockedSurfacePtr[level];
+}
+
+// ----------------------------------------------------------------------------
+//
+// Return locked surface pitch (in bytes) at a specific level. The call will
+// assert if level is greater or equal to the number of mip levels or if the
+// requested level has not been locked.
+//
+// ----------------------------------------------------------------------------
+
+unsigned int TextureLoadTaskClass::Get_Locked_Surface_Pitch(unsigned int level) const
+{
+	WWASSERT(level<MipLevelCount);
+	WWASSERT(LockedSurfacePtr[level]);
+	return LockedSurfacePitch[level];
+}
+
+
+
+
+
+// CubeTextureLoadTaskClass
+CubeTextureLoadTaskClass::CubeTextureLoadTaskClass()
+:	TextureLoadTaskClass()
+{
+	// because texture load tasks are pooled, the constructor and destructor
+	// don't need to do much. The work of attaching a task to a texture is
+	// is done by Init() and Deinit().
+
+	for (int f=0;f<6;f++)
+	{
+		for (int i = 0; i < MIP_LEVELS_MAX; ++i)
+		{
+			LockedCubeSurfacePtr[f][i]		= NULL;
+			LockedCubeSurfacePitch[f][i]	= 0;
+		}
+	}
+}
+
+void CubeTextureLoadTaskClass::Destroy(void)
+{
+	// detach the task from its texture, and return to free pool.
+	Deinit();
+	_CubeTexLoadFreeList.Push_Front(this);
+}
+
+
+void CubeTextureLoadTaskClass::Init(TextureBaseClass* tc, TaskType type, PriorityType priority)
+{
+	WWASSERT(tc);
+
+	// NOTE: we must be in the main thread to avoid corrupting the texture's refcount.
+	WWASSERT(TextureLoader::Is_DX8_Thread());
+	REF_PTR_SET(Texture, tc);
+
+	// Make sure texture has a filename.
+	WWASSERT(!Texture->Get_Full_Path().Is_Empty());
+
+	Type				= type;
+	Priority			= priority;
+	State				= STATE_NONE;
+
+	D3DTexture		= 0;
+
+	CubeTextureClass* tex=Texture->As_CubeTextureClass();
+
+	if (tex)
+	{
+		Format			= tex->Get_Texture_Format(); // don't assume format yet KM
+	}
+	else
+	{
+		Format			= WW3D_FORMAT_UNKNOWN;
+	}
+
+	Width				= 0;
+	Height			= 0;
+	MipLevelCount	= Texture->MipLevelCount;
+	Reduction		= Texture->Get_Reduction();
+	HSVShift			= Texture->Get_HSV_Shift();
+
+
+	for (int f=0; f<6; f++)
+	{
+		for (int i = 0; i < MIP_LEVELS_MAX; ++i)
+		{
+			LockedCubeSurfacePtr[f][i]		= NULL;
+			LockedCubeSurfacePitch[f][i]	= 0;
+		}
+	}
+
+	switch (Type)
+	{
+	case TASK_THUMBNAIL:
+		WWASSERT(Texture->ThumbnailLoadTask == NULL);
+		Texture->ThumbnailLoadTask = this;
+		break;
+
+	case TASK_LOAD:
+		WWASSERT(Texture->TextureLoadTask == NULL);
+		Texture->TextureLoadTask = this;
+		break;
+	}
+}
+
+
+void CubeTextureLoadTaskClass::Deinit()
+{
+	// task should not be on any list when it is being detached from texture.
+	WWASSERT(Next == NULL);
+	WWASSERT(Prev == NULL);
+
+	WWASSERT(D3DTexture == NULL);
+
+	for (int f=0; f<6; f++)
+	{
+		for (int i = 0; i < MIP_LEVELS_MAX; ++i)
+		{
+			WWASSERT(LockedCubeSurfacePtr[f][i] == NULL);
+		}
+	}
+
+	if (Texture)
+	{
+		switch (Type)
+		{
+			case TASK_THUMBNAIL:
+				WWASSERT(Texture->ThumbnailLoadTask == this);
+				Texture->ThumbnailLoadTask = NULL;
+				break;
+
+			case TASK_LOAD:
+				WWASSERT(Texture->TextureLoadTask == this);
+				Texture->TextureLoadTask = NULL;
+				break;
+		}
+
+		// NOTE: we must be in main thread to avoid corrupting Texture's refcount.
+		WWASSERT(TextureLoader::Is_DX8_Thread());
+		REF_PTR_RELEASE(Texture);
+	}
+}
+
+void CubeTextureLoadTaskClass::Lock_Surfaces(void)
+{
+	for (unsigned int f=0; f<6; f++)
+	{
+		for (unsigned int i=0; i<MipLevelCount; i++)
+		{
+			D3DLOCKED_RECT locked_rect;
+			DX8_ErrorCode
+			(
+				Peek_D3D_Cube_Texture()->LockRect
+				(
+					(D3DCUBEMAP_FACES)f,
+					i,
+					&locked_rect,
+					NULL,
+					0
+				)
+			);
+			LockedCubeSurfacePtr[f][i]	 = (unsigned char *)locked_rect.pBits;
+			LockedCubeSurfacePitch[f][i]= locked_rect.Pitch;
+		}
+	}
+}
+
+void CubeTextureLoadTaskClass::Unlock_Surfaces(void)
+{
+	for (unsigned int f=0; f<6; f++)
+	{
+		for (unsigned int i = 0; i < MipLevelCount; ++i)
+		{
+			if (LockedCubeSurfacePtr[f][i])
+			{
+				WWASSERT(ThreadClass::_Get_Current_Thread_ID() == DX8Wrapper::_Get_Main_Thread_ID());
+				DX8_ErrorCode
+				(
+					Peek_D3D_Cube_Texture()->UnlockRect((D3DCUBEMAP_FACES)f,i)
+				);
+			}
+			LockedCubeSurfacePtr[f][i] = NULL;
+		}
+	}
+
+#ifndef USE_MANAGED_TEXTURES
+	IDirect3DCubeTexture8* tex = DX8Wrapper::_Create_DX8_Cube_Texture
+	(
+		Width,
+		Height,
+		Format,
+		Texture->MipLevelCount,
+		D3DPOOL_DEFAULT
+	);
+	DX8CALL(UpdateTexture(Peek_D3D_Volume_Texture(),tex));
+	Peek_D3D_Volume_Texture()->Release();
+	D3DTexture=tex;
+	WWDEBUG_SAY(("Created non-managed texture (%s)",Texture->Get_Full_Path()));
+#endif
+
+}
+
+
+
+bool CubeTextureLoadTaskClass::Begin_Compressed_Load()
+{
+	unsigned orig_w,orig_h,orig_d,orig_mip_count,reduction;
+	WW3DFormat orig_format;
+	if (!Get_Texture_Information
+		  (
+				Texture->Get_Full_Path(),
+				reduction,
+				orig_w,
+				orig_h,
+				orig_d,
+				orig_format,
+				orig_mip_count,
+				true
+		  )
+		)
+	{
+		return false;
+	}
+
+	// Destination size will be the next power of two square from the larger width and height...
+	unsigned int width	= orig_w;
+	unsigned int height	= orig_h;
+	TextureLoader::Validate_Texture_Size(width, height,orig_d);
+
+	// If the size doesn't match, try and see if texture reduction would help... (mainly for
+	// cases where loaded texture is larger than hardware limit)
+	if (width != orig_w || height != orig_h)
+	{
+		for (unsigned int i = 1; i < orig_mip_count; ++i)
+		{
+			unsigned w=orig_w>>i;
+			if (w<4) w=4;
+			unsigned h=orig_h>>i;
+			if (h<4) h=4;
+			unsigned tmp_w=w;
+			unsigned tmp_h=h;
+
+			TextureLoader::Validate_Texture_Size(w,h,orig_d);
+
+			if (w == tmp_w && h == tmp_h)
+			{
+				Reduction	+= i;
+				width			=	w;
+				height		=	h;
+				break;
+			}
+		}
+	}
+
+	Width		= width;
+	Height	= height;
+	Format	= Get_Valid_Texture_Format(orig_format, Texture->Is_Compression_Allowed());
+
+	unsigned int mip_level_count = Get_Mip_Level_Count();
+
+	// If texture wants all mip levels, take as many as the file contains (not necessarily all)
+	// Otherwise take as many mip levels as the texture wants, not to exceed the count in file...
+	if (!mip_level_count)
+	{
+		mip_level_count = orig_mip_count;//dds_file.Get_Mip_Level_Count();
+	}
+	else if (mip_level_count > orig_mip_count)
+	{//dds_file.Get_Mip_Level_Count()) {
+		mip_level_count = orig_mip_count;//dds_file.Get_Mip_Level_Count();
+	}
+
+	// Once more, verify that the mip level count is correct (in case it was changed here it might not
+	// match the size...well actually it doesn't have to match but it can't be bigger than the size)
+	unsigned int max_mip_level_count = 1;
+	unsigned int w = 4;
+	unsigned int h = 4;
+
+	while (w < Width && h < Height)
+	{
+		w += w;
+		h += h;
+		max_mip_level_count++;
+	}
+
+	if (mip_level_count > max_mip_level_count)
+	{
+		mip_level_count = max_mip_level_count;
+	}
+
+	D3DTexture	= DX8Wrapper::_Create_DX8_Cube_Texture
+	(
+		Width,
+		Height,
+		Format,
+		(MipCountType)mip_level_count,
+#ifdef USE_MANAGED_TEXTURES
+		D3DPOOL_MANAGED
+#else
+		D3DPOOL_SYSTEMMEM
+#endif
+	);
+
+	MipLevelCount = mip_level_count;
+	return true;
+}
+
+bool CubeTextureLoadTaskClass::Begin_Uncompressed_Load(void)
+{
+	unsigned width,height,depth,orig_mip_count,reduction;
+	WW3DFormat orig_format;
+	if (!Get_Texture_Information
+		  (
+				Texture->Get_Full_Path(),
+				reduction,
+				width,
+				height,
+				depth,
+				orig_format,
+				orig_mip_count,
+				false
+			)
+		)
+	{
+		return false;
+	}
+
+	WW3DFormat src_format=orig_format;
+	WW3DFormat dest_format=src_format;
+	dest_format=Get_Valid_Texture_Format(dest_format,false);	// No compressed destination format if reading from targa...
+
+   if (		src_format != WW3D_FORMAT_A8R8G8B8
+   		&&	src_format != WW3D_FORMAT_R8G8B8
+  			&&	src_format != WW3D_FORMAT_X8R8G8B8 )
+	{
+		WWDEBUG_SAY(("Invalid TGA format used in %s - only 24 and 32 bit formats should be used!", Texture->Get_Full_Path().str()));
+	}
+
+	// Destination size will be the next power of two square from the larger width and height...
+	unsigned ow = width;
+	unsigned oh = height;
+	TextureLoader::Validate_Texture_Size(width, height,depth);
+	if (width != ow || height != oh)
+	{
+		WWDEBUG_SAY(("Invalid texture size, scaling required. Texture: %s, size: %d x %d -> %d x %d", Texture->Get_Full_Path().str(), ow, oh, width, height));
+	}
+
+	Width		= width;
+	Height	= height;
+
+	if (Format == WW3D_FORMAT_UNKNOWN)
+	{
+		Format=dest_format;
+	}
+	else
+	{
+		Format = Get_Valid_Texture_Format(Format, false);
+	}
+
+	D3DTexture = DX8Wrapper::_Create_DX8_Cube_Texture
+	(
+		Width,
+		Height,
+		Format,
+		Texture->MipLevelCount,
+#ifdef USE_MANAGED_TEXTURES
+		D3DPOOL_MANAGED
+#else
+		D3DPOOL_SYSTEMMEM
+#endif
+	);
+
+	return true;
+}
+
+bool CubeTextureLoadTaskClass::Load_Compressed_Mipmap(void)
+{
+	DDSFileClass dds_file(Texture->Get_Full_Path(), Get_Reduction());
+
+	// if we can't load from file, indicate rror.
+	if (!dds_file.Is_Available() || !dds_file.Load())
+	{
+		return false;
+	}
+
+	// load cube map faces
+	for (unsigned int face=0; face<6; face++)
+	{
+		unsigned int width = Get_Width();
+		unsigned int height = Get_Height();
+
+		for (unsigned int level=0; level<Get_Mip_Level_Count(); level++)
+		{
+			WWASSERT(width && height);
+
+			// get cube map surface
+			dds_file.Copy_CubeMap_Level_To_Surface
+			(
+				face,
+				level,
+				Get_Format(),
+				width,
+				height,
+				Get_Locked_CubeMap_Surface_Pointer(face,level),
+				Get_Locked_CubeMap_Surface_Pitch(face,level),
+				HSVShift
+			);
+
+			width>>=1;
+			height>>=1;
+		}
+	}
+
+	return true;
+}
+
+unsigned char*	CubeTextureLoadTaskClass::Get_Locked_CubeMap_Surface_Pointer(unsigned int face, unsigned int level)
+{
+	WWASSERT(face<6 && level<MipLevelCount);
+	WWASSERT(LockedCubeSurfacePtr[face][level]);
+	return LockedCubeSurfacePtr[face][level];
+}
+
+unsigned int CubeTextureLoadTaskClass::Get_Locked_CubeMap_Surface_Pitch(unsigned int face, unsigned int level) const
+{
+	WWASSERT(face<6 && level<MipLevelCount);
+	WWASSERT(LockedCubeSurfacePitch[face][level]);
+	return LockedCubeSurfacePitch[face][level];
+}
+
+
+
+
+
+
+
+// VolumeTextureLoadTaskClass
+VolumeTextureLoadTaskClass::VolumeTextureLoadTaskClass()
+:	TextureLoadTaskClass()
+{
+	// because texture load tasks are pooled, the constructor and destructor
+	// don't need to do much. The work of attaching a task to a texture is
+	// is done by Init() and Deinit().
+
+	for (int i = 0; i < MIP_LEVELS_MAX; ++i)
+	{
+		LockedSurfacePtr[i]			= NULL;
+		LockedSurfacePitch[i]		= 0;
+		LockedSurfaceSlicePitch[i]	= 0;
+	}
+}
+
+void VolumeTextureLoadTaskClass::Destroy(void)
+{
+	// detach the task from its texture, and return to free pool.
+	Deinit();
+	_VolTexLoadFreeList.Push_Front(this);
+}
+
+void VolumeTextureLoadTaskClass::Init(TextureBaseClass* tc, TaskType type, PriorityType priority)
+{
+	WWASSERT(tc);
+
+	// NOTE: we must be in the main thread to avoid corrupting the texture's refcount.
+	WWASSERT(TextureLoader::Is_DX8_Thread());
+	REF_PTR_SET(Texture, tc);
+
+	// Make sure texture has a filename.
+	WWASSERT(!Texture->Get_Full_Path().Is_Empty());
+
+	Type				= type;
+	Priority			= priority;
+	State				= STATE_NONE;
+
+	D3DTexture		= 0;
+
+	VolumeTextureClass* tex=Texture->As_VolumeTextureClass();
+
+	if (tex)
+	{
+		Format			= tex->Get_Texture_Format(); // don't assume format yet KM
+	}
+	else
+	{
+		Format			= WW3D_FORMAT_UNKNOWN;
+	}
+
+	Width				= 0;
+	Height			= 0;
+	Depth				= 0;
+	MipLevelCount	= Texture->MipLevelCount;
+	Reduction		= Texture->Get_Reduction();
+	HSVShift			= Texture->Get_HSV_Shift();
+
+
+	for (int i = 0; i < MIP_LEVELS_MAX; ++i)
+	{
+		LockedSurfacePtr[i]			= NULL;
+		LockedSurfacePitch[i]		= 0;
+		LockedSurfaceSlicePitch[i]	= 0;
+	}
+
+	switch (Type)
+	{
+	case TASK_THUMBNAIL:
+		WWASSERT(Texture->ThumbnailLoadTask == NULL);
+		Texture->ThumbnailLoadTask = this;
+		break;
+
+	case TASK_LOAD:
+		WWASSERT(Texture->TextureLoadTask == NULL);
+		Texture->TextureLoadTask = this;
+		break;
+	}
+}
+
+void VolumeTextureLoadTaskClass::Lock_Surfaces()
+{
+	for (unsigned int i=0; i<MipLevelCount; i++)
+	{
+		D3DLOCKED_BOX locked_box;
+		DX8_ErrorCode
+		(
+			Peek_D3D_Volume_Texture()->LockBox
+			(
+				i,
+				&locked_box,
+				NULL,
+				0
+			)
+		);
+		LockedSurfacePtr[i]			= (unsigned char *)locked_box.pBits;
+		LockedSurfacePitch[i]		= locked_box.RowPitch;
+		LockedSurfaceSlicePitch[i]	= locked_box.SlicePitch;
+	}
+}
+
+
+void VolumeTextureLoadTaskClass::Unlock_Surfaces()
+{
+	for (unsigned int i = 0; i < MipLevelCount; ++i)
+	{
+		if (LockedSurfacePtr[i])
+		{
+			WWASSERT(ThreadClass::_Get_Current_Thread_ID() == DX8Wrapper::_Get_Main_Thread_ID());
+			DX8_ErrorCode
+			(
+				Peek_D3D_Volume_Texture()->UnlockBox(i)
+			);
+		}
+		LockedSurfacePtr[i] = NULL;
+	}
+
+#ifndef USE_MANAGED_TEXTURES
+	IDirect3DTexture8* tex = DX8Wrapper::_Create_DX8_Volume_Texture(Width, Height, Depth, Format, Texture->MipLevelCount,D3DPOOL_DEFAULT);
+	DX8CALL(UpdateTexture(Peek_D3D_Volume_Texture(),tex));
+	Peek_D3D_Volume_Texture()->Release();
+	D3DTexture=tex;
+	WWDEBUG_SAY(("Created non-managed texture (%s)",Texture->Get_Full_Path()));
+#endif
+
+}
+
+
+
+bool VolumeTextureLoadTaskClass::Begin_Compressed_Load()
+{
+	unsigned orig_w,orig_h,orig_d,orig_mip_count,reduction;
+	WW3DFormat orig_format;
+	if (!Get_Texture_Information
+		  (
+				Texture->Get_Full_Path(),
+				reduction,
+				orig_w,
+				orig_h,
+				orig_d,
+				orig_format,
+				orig_mip_count,
+				true
+		  )
+		)
+	{
+		return false;
+	}
+
+	// Destination size will be the next power of two square from the larger width and height...
+	unsigned int width	= orig_w;
+	unsigned int height	= orig_h;
+	unsigned int depth	= orig_d;
+	TextureLoader::Validate_Texture_Size(width, height, depth);
+
+	// If the size doesn't match, try and see if texture reduction would help... (mainly for
+	// cases where loaded texture is larger than hardware limit)
+	if (width != orig_w || height != orig_h || depth != orig_d)
+	{
+		for (unsigned int i = 1; i < orig_mip_count; ++i)
+		{
+			unsigned w=orig_w>>i;
+			if (w<4) w=4;
+			unsigned h=orig_h>>i;
+			if (h<4) h=4;
+			unsigned d=orig_d>>i;
+			if (d<1) d=1;
+			unsigned tmp_w=w;
+			unsigned tmp_h=h;
+			unsigned tmp_d=d;
+
+			TextureLoader::Validate_Texture_Size(w,h,d);
+
+			if (w == tmp_w && h == tmp_h && d== tmp_d)
+			{
+				Reduction	+= i;
+				width			=	w;
+				height		=	h;
+				depth			=  d;
+				break;
+			}
+		}
+	}
+
+	Width		= width;
+	Height	= height;
+	Depth		= depth;
+	Format	= Get_Valid_Texture_Format(orig_format, Texture->Is_Compression_Allowed());
+
+	unsigned int mip_level_count = Get_Mip_Level_Count();
+
+	// If texture wants all mip levels, take as many as the file contains (not necessarily all)
+	// Otherwise take as many mip levels as the texture wants, not to exceed the count in file...
+	if (!mip_level_count)
+	{
+		mip_level_count = orig_mip_count;//dds_file.Get_Mip_Level_Count();
+	}
+	else if (mip_level_count > orig_mip_count)
+	{//dds_file.Get_Mip_Level_Count()) {
+		mip_level_count = orig_mip_count;//dds_file.Get_Mip_Level_Count();
+	}
+
+	// Once more, verify that the mip level count is correct (in case it was changed here it might not
+	// match the size...well actually it doesn't have to match but it can't be bigger than the size)
+	unsigned int max_mip_level_count = 1;
+	unsigned int w = 4;
+	unsigned int h = 4;
+
+	while (w < Width && h < Height)
+	{
+		w += w;
+		h += h;
+		max_mip_level_count++;
+	}
+	if (mip_level_count > max_mip_level_count)
+	{
+		mip_level_count = max_mip_level_count;
+	}
+
+	D3DTexture	= DX8Wrapper::_Create_DX8_Volume_Texture
+	(
+		Width,
+		Height,
+		Depth,
+		Format,
+		(MipCountType)mip_level_count,
+#ifdef USE_MANAGED_TEXTURES
+		D3DPOOL_MANAGED
+#else
+		D3DPOOL_SYSTEMMEM
+#endif
+	);
+
+	MipLevelCount = mip_level_count;
+	return true;
+}
+
+bool VolumeTextureLoadTaskClass::Begin_Uncompressed_Load(void)
+{
+	unsigned width,height,depth,orig_mip_count,reduction;
+	WW3DFormat orig_format;
+	if (!Get_Texture_Information
+		  (
+				Texture->Get_Full_Path(),
+				reduction,
+				width,
+				height,
+				depth,
+				orig_format,
+				orig_mip_count,
+				false
+			)
+		)
+	{
+		return false;
+	}
+
+	WW3DFormat src_format=orig_format;
+	WW3DFormat dest_format=src_format;
+	dest_format=Get_Valid_Texture_Format(dest_format,false);	// No compressed destination format if reading from targa...
+
+   if (		src_format != WW3D_FORMAT_A8R8G8B8
+   		&&	src_format != WW3D_FORMAT_R8G8B8
+  			&&	src_format != WW3D_FORMAT_X8R8G8B8 )
+	{
+		WWDEBUG_SAY(("Invalid TGA format used in %s - only 24 and 32 bit formats should be used!", Texture->Get_Full_Path().str()));
+	}
+
+	// Destination size will be the next power of two square from the larger width and height...
+	unsigned ow = width;
+	unsigned oh = height;
+	unsigned od = depth;
+	TextureLoader::Validate_Texture_Size(width, height, depth);
+	if (width != ow || height != oh || depth != od)
+	{
+		WWDEBUG_SAY(("Invalid texture size, scaling required. Texture: %s, size: %d x %d -> %d x %d", Texture->Get_Full_Path().str(), ow, oh, width, height));
+	}
+
+	Width		= width;
+	Height	= height;
+	Depth		= depth;
+
+	if (Format == WW3D_FORMAT_UNKNOWN)
+	{
+		Format=dest_format;
+	}
+	else
+	{
+		Format = Get_Valid_Texture_Format(Format, false);
+	}
+
+	D3DTexture = DX8Wrapper::_Create_DX8_Volume_Texture
+	(
+		Width,
+		Height,
+		Depth,
+		Format,
+		Texture->MipLevelCount,
+#ifdef USE_MANAGED_TEXTURES
+		D3DPOOL_MANAGED
+#else
+		D3DPOOL_SYSTEMMEM
+#endif
+	);
+
+	return true;
+}
+
+bool VolumeTextureLoadTaskClass::Load_Compressed_Mipmap(void)
+{
+	DDSFileClass dds_file(Texture->Get_Full_Path(), Get_Reduction());
+
+	// if we can't load from file, indicate rror.
+	if (!dds_file.Is_Available() || !dds_file.Load())
+	{
+		return false;
+	}
+
+	// load volume
+	unsigned int depth=dds_file.Get_Depth(0);
+	unsigned int width=Get_Width();
+	unsigned int height=Get_Height();
+
+	WWASSERT(width && height && depth);
+
+	for (unsigned int level=0; level<Get_Mip_Level_Count(); level++)
+	{
+		if (width<1) width=1;
+		if (height<1) height=1;
+		if (depth<1) depth=1;
+
+		// get volume
+		dds_file.Copy_Volume_Level_To_Surface
+		(
+			level,
+			depth,
+			Get_Format(),
+			width,
+			height,
+			Get_Locked_Volume_Pointer(level),
+			Get_Locked_Volume_Row_Pitch(level),
+			Get_Locked_Volume_Slice_Pitch(level),
+			HSVShift
+		);
+
+		width>>=1;
+		height>>=1;
+		depth>>=1;
+	}
+
+	return true;
+}
+
+unsigned char* VolumeTextureLoadTaskClass::Get_Locked_Volume_Pointer(unsigned int level)
+{
+	WWASSERT(level<MipLevelCount);
+	WWASSERT(LockedSurfacePtr[level]);
+	return LockedSurfacePtr[level];
+}
+
+unsigned int VolumeTextureLoadTaskClass::Get_Locked_Volume_Row_Pitch(unsigned int level)
+{
+	WWASSERT(level<MipLevelCount);
+	WWASSERT(LockedSurfacePtr[level]);
+	return LockedSurfacePitch[level];
+}
+
+unsigned int VolumeTextureLoadTaskClass::Get_Locked_Volume_Slice_Pitch(unsigned int level)
+{
+	WWASSERT(level<MipLevelCount);
+	WWASSERT(LockedSurfacePtr[level]);
+	return LockedSurfaceSlicePitch[level];
+}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h
new file mode 100644
index 00000000000..38104d6495a
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h
@@ -0,0 +1,326 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : DX8 Texture Manager                                          *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/textureloader.h                            $*
+ *                                                                                             *
+ *              Original Author:: vss_sync                                                   *
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *                     $Modtime:: 06/27/02 1:27p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ * 06/27/02 KM Texture class abstraction																			*
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "always.h"
+#include "texture.h"
+
+class StringClass;
+struct IDirect3DTexture8;
+class TextureLoadTaskClass;
+
+class TextureLoader
+{
+public:
+	static void Init(void);
+	static void Deinit(void);
+
+	// Modify given texture size to nearest valid size on current hardware.
+	static void Validate_Texture_Size(unsigned& width, unsigned& height, unsigned& depth);
+
+	static IDirect3DTexture8 * Load_Thumbnail(
+		const StringClass& filename,const Vector3& hsv_shift);
+//		WW3DFormat texture_format);	// Pass WW3D_FORMAT_UNKNOWN if you don't care
+
+	static IDirect3DSurface8 *		Load_Surface_Immediate(
+		const StringClass& filename,
+		WW3DFormat surface_format,		// Pass WW3D_FORMAT_UNKNOWN if you don't care
+		bool allow_compression);
+
+	static void	Request_Thumbnail(TextureBaseClass* tc);
+
+	// Adds a loading task to the system. The task if processed in a separate
+	// thread as soon as possible. The task will appear in finished tasks list
+	// when it's been completed. The texture will be refreshed on the next
+	// update call after appearing to the finished tasks list.
+	static void Request_Background_Loading(TextureBaseClass* tc);
+
+	// Textures can only be created and locked by the main thread so this function sends a request to the texture
+	// handling system to load the texture immediatelly next time it enters the main thread. If this function
+	// is called from the main thread the texture is loaded immediatelly.
+	static void Request_Foreground_Loading(TextureBaseClass* tc);
+
+	static void	Flush_Pending_Load_Tasks(void);
+	static void Update(void(*network_callback)(void) = NULL);
+
+	// returns true if current thread of execution is allowed to make DX8 calls.
+	static bool Is_DX8_Thread(void);
+
+	static void Suspend_Texture_Load();
+	static void Continue_Texture_Load();
+
+	static void Set_Texture_Inactive_Override_Time(int time_ms) {TextureInactiveOverrideTime = time_ms;}
+
+private:
+	static void Process_Foreground_Load			(TextureLoadTaskClass *task);
+	static void Process_Foreground_Thumbnail	(TextureLoadTaskClass *task);
+
+	static void Begin_Load_And_Queue				(TextureLoadTaskClass *task);
+	static void Load_Thumbnail						(TextureBaseClass *tc);
+
+	static bool TextureLoadSuspended;
+
+	// The time in ms before a texture is thrown out.
+	// The default is zero.  The scripted movies set this to reduce texture stalls in movies.
+	static int	TextureInactiveOverrideTime;
+};
+
+class TextureLoadTaskListNodeClass
+{
+	friend class TextureLoadTaskListClass;
+
+	public:
+		TextureLoadTaskListNodeClass(void) : Next(0), Prev(0) { }
+
+		TextureLoadTaskListClass *Get_List(void)		{ return List; }
+
+		TextureLoadTaskListNodeClass *Next;
+		TextureLoadTaskListNodeClass *Prev;
+		TextureLoadTaskListClass *		List;
+};
+
+
+class TextureLoadTaskListClass
+{
+	// This class implements an unsynchronized, double-linked list of TextureLoadTaskClass
+	// objects, using an embedded list node.
+
+	public:
+		TextureLoadTaskListClass(void);
+
+		// Returns true if list is empty, false otherwise.
+		bool									Is_Empty		(void) const		{ return (Root.Next == &Root); }
+
+		// Add a task to beginning of list
+		void									Push_Front	(TextureLoadTaskClass *task);
+
+		// Add a task to end of list
+		void									Push_Back	(TextureLoadTaskClass *task);
+
+		// Remove and return a task from beginning of list, or NULL if list is empty.
+		TextureLoadTaskClass *			Pop_Front	(void);
+
+		// Remove and return a task from end of list, or NULL if list is empty
+		TextureLoadTaskClass *			Pop_Back		(void);
+
+		// Remove specified task from list, if present
+		void									Remove		(TextureLoadTaskClass *task);
+
+	private:
+		// This list is implemented using a sentinel node.
+		TextureLoadTaskListNodeClass	Root;
+};
+
+
+class SynchronizedTextureLoadTaskListClass : public TextureLoadTaskListClass
+{
+	// This class added thread-safety to the basic TextureLoadTaskListClass.
+
+	public:
+		SynchronizedTextureLoadTaskListClass(void);
+
+		// See comments above for description of member functions.
+		void									Push_Front	(TextureLoadTaskClass *task);
+		void									Push_Back	(TextureLoadTaskClass *task);
+		TextureLoadTaskClass *			Pop_Front	(void);
+		TextureLoadTaskClass *			Pop_Back		(void);
+		void									Remove		(TextureLoadTaskClass *task);
+
+	private:
+		FastCriticalSectionClass		CriticalSection;
+};
+
+/*
+** (gth) The allocation system we're using for TextureLoadTaskClass has gotten a little
+** complicated since Kenny added the new task types for Cube and Volume textures.  The
+** ::Destroy member is used to return a task to the pool now and must be over-ridden in
+** each derived class to put the task back into the correct free list.
+*/
+
+
+class TextureLoadTaskClass : public TextureLoadTaskListNodeClass
+{
+	public:
+		enum TaskType {
+			TASK_NONE,
+			TASK_THUMBNAIL,
+			TASK_LOAD,
+		};
+
+		enum PriorityType {
+			PRIORITY_LOW,
+			PRIORITY_HIGH,
+		};
+
+		enum StateType {
+			STATE_NONE,
+
+			STATE_LOAD_BEGUN,
+			STATE_LOAD_MIPMAP,
+			STATE_LOAD_COMPLETE,
+
+			STATE_COMPLETE,
+		};
+
+
+		TextureLoadTaskClass(void);
+		~TextureLoadTaskClass(void);
+
+		static TextureLoadTaskClass *	Create			(TextureBaseClass *tc, TaskType type, PriorityType priority);
+		static void				Delete_Free_Pool			(void);
+
+		virtual void			Destroy						(void);
+		virtual void			Init							(TextureBaseClass *tc, TaskType type, PriorityType priority);
+		virtual void			Deinit						(void);
+
+		TaskType					Get_Type						(void) const		{ return Type;				}
+		PriorityType			Get_Priority				(void) const		{ return Priority;		}
+		StateType				Get_State					(void) const		{ return State;			}
+
+		WW3DFormat				Get_Format					(void) const		{ return Format;			}
+		unsigned int			Get_Width					(void) const		{ return Width;			}
+		unsigned int			Get_Height					(void) const		{ return Height;			}
+		unsigned int			Get_Mip_Level_Count		(void) const		{ return MipLevelCount; }
+		unsigned int			Get_Reduction				(void) const		{ return Reduction;		}
+
+		unsigned char *		Get_Locked_Surface_Ptr	(unsigned int level);
+		unsigned int			Get_Locked_Surface_Pitch(unsigned int level) const;
+
+		TextureBaseClass *	Peek_Texture				(void)				{ return Texture;			}
+		IDirect3DTexture8	*	Peek_D3D_Texture			(void)				{ return (IDirect3DTexture8*)D3DTexture;		}
+
+		void						Set_Type						(TaskType t)		{ Type		= t;			}
+		void						Set_Priority				(PriorityType p)	{ Priority	= p;			}
+		void						Set_State					(StateType s)		{ State		= s;			}
+
+		bool						Begin_Load					(void);
+		bool						Load							(void);
+		void						End_Load						(void);
+		void						Finish_Load					(void);
+		void						Apply_Missing_Texture	(void);
+
+	protected:
+		virtual bool			Begin_Compressed_Load	(void);
+		virtual bool			Begin_Uncompressed_Load	(void);
+
+		virtual bool			Load_Compressed_Mipmap	(void);
+		virtual bool			Load_Uncompressed_Mipmap(void);
+
+		virtual void			Lock_Surfaces				(void);
+		virtual void			Unlock_Surfaces			(void);
+
+		void						Apply							(bool initialize);
+
+		TextureBaseClass*		Texture;
+		IDirect3DBaseTexture8*	D3DTexture;
+		WW3DFormat				Format;
+
+		unsigned int			Width;
+		unsigned	int			Height;
+		unsigned	int			MipLevelCount;
+		unsigned	int			Reduction;
+		Vector3					HSVShift;
+
+		unsigned char *		LockedSurfacePtr[MIP_LEVELS_MAX];
+		unsigned	int			LockedSurfacePitch[MIP_LEVELS_MAX];
+
+		TaskType					Type;
+		PriorityType			Priority;
+		StateType				State;
+};
+
+class CubeTextureLoadTaskClass : public TextureLoadTaskClass
+{
+public:
+	CubeTextureLoadTaskClass();
+
+	virtual void			Destroy						(void);
+	virtual void			Init							(TextureBaseClass *tc, TaskType type, PriorityType priority);
+	virtual void			Deinit						(void);
+
+protected:
+	virtual bool			Begin_Compressed_Load	(void);
+	virtual bool			Begin_Uncompressed_Load	(void);
+
+	virtual bool			Load_Compressed_Mipmap	(void);
+//	virtual bool			Load_Uncompressed_Mipmap(void);
+
+	virtual void			Lock_Surfaces				(void);
+	virtual void			Unlock_Surfaces			(void);
+
+private:
+	unsigned char*			Get_Locked_CubeMap_Surface_Pointer(unsigned int face, unsigned int level);
+	unsigned int			Get_Locked_CubeMap_Surface_Pitch(unsigned int face, unsigned int level) const;
+
+	IDirect3DCubeTexture8*	Peek_D3D_Cube_Texture(void)				{ return (IDirect3DCubeTexture8*)D3DTexture;		}
+
+	unsigned char*			LockedCubeSurfacePtr[6][MIP_LEVELS_MAX];
+	unsigned int			LockedCubeSurfacePitch[6][MIP_LEVELS_MAX];
+};
+
+class VolumeTextureLoadTaskClass : public TextureLoadTaskClass
+{
+public:
+	VolumeTextureLoadTaskClass();
+
+	virtual void			Destroy						(void);
+	virtual void			Init							(TextureBaseClass *tc, TaskType type, PriorityType priority);
+
+protected:
+	virtual bool			Begin_Compressed_Load	(void);
+	virtual bool			Begin_Uncompressed_Load	(void);
+
+	virtual bool			Load_Compressed_Mipmap	(void);
+//	virtual bool			Load_Uncompressed_Mipmap(void);
+
+	virtual void			Lock_Surfaces				(void);
+	virtual void			Unlock_Surfaces			(void);
+
+private:
+	unsigned char*			Get_Locked_Volume_Pointer(unsigned int level);
+	unsigned int			Get_Locked_Volume_Row_Pitch(unsigned int level);
+	unsigned int			Get_Locked_Volume_Slice_Pitch(unsigned int level);
+
+	IDirect3DVolumeTexture8*	Peek_D3D_Volume_Texture(void)				{ return (IDirect3DVolumeTexture8*)D3DTexture;		}
+
+	unsigned	int			LockedSurfaceSlicePitch[MIP_LEVELS_MAX];
+
+	unsigned int		Depth;
+};
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
new file mode 100644
index 00000000000..03c803491af
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
@@ -0,0 +1,410 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "texturethumbnail.h"
+#include "hashtemplate.h"
+#include "missingtexture.h"
+#include "TARGA.h"
+#include "ww3dformat.h"
+#include "ddsfile.h"
+#include "textureloader.h"
+#include "bitmaphandler.h"
+#include "ffactory.h"
+#include "RAWFILE.h"
+#include "wwprofile.h"
+#include <windows.h>
+
+static DLListClass<ThumbnailManagerClass> ThumbnailManagerList;
+static ThumbnailManagerClass* GlobalThumbnailManager;
+bool ThumbnailManagerClass::CreateThumbnailIfNotFound=false;
+
+static void Create_Hash_Name(StringClass& name, const StringClass& thumb_name)
+{
+	name=thumb_name;
+	int len=name.Get_Length();
+	WWASSERT(stricmp(&name[len-4],".tga") == 0 || stricmp(&name[len-4],".dds") == 0);
+	name[len-4]='\0';
+	_strlwr(name.Peek_Buffer());
+}
+
+	/*	file_auto_ptr my_tga_file(_TheFileFactory,filename);
+	if (my_tga_file->Is_Available()) {
+		my_tga_file->Open();
+		unsigned size=my_tga_file->Size();
+		char* tga_memory=new char[size];
+		my_tga_file->Read(tga_memory,size);
+		my_tga_file->Close();
+
+		StringClass pth("data\\");
+		pth+=filename;
+		RawFileClass tmp_tga_file(pth);
+		tmp_tga_file.Create();
+		tmp_tga_file.Write(tga_memory,size);
+		tmp_tga_file.Close();
+		delete[] tga_memory;
+
+	}
+*/
+
+
+ThumbnailClass::ThumbnailClass(
+	ThumbnailManagerClass* manager,
+	const char* name,
+	unsigned char* bitmap,
+	unsigned w,
+	unsigned h,
+	unsigned original_w,
+	unsigned original_h,
+	unsigned original_mip_level_count,
+	WW3DFormat original_format,
+	bool allocated,
+	unsigned long date_time)
+	:
+	Manager(manager),
+	Name(name),
+	Bitmap(bitmap),
+	Allocated(allocated),
+	Width(w),
+	Height(h),
+	OriginalTextureWidth(original_w),
+	OriginalTextureHeight(original_h),
+	OriginalTextureMipLevelCount(original_mip_level_count),
+	OriginalTextureFormat(original_format),
+	DateTime(date_time)
+{
+	Manager->Insert_To_Hash(this);
+}
+
+// ----------------------------------------------------------------------------
+//
+// Load texture and generate mipmap levels if requested. The function tries
+// to create texture that matches targa format. If suitable format is not
+// available, it selects closest matching format and performs color space
+// conversion.
+//
+// ----------------------------------------------------------------------------
+
+ThumbnailClass::ThumbnailClass(ThumbnailManagerClass* manager, const StringClass& filename)
+	:
+	Manager(manager),
+	Bitmap(0),
+	Name(filename),
+	Allocated(false),
+	Width(0),
+	Height(0),
+	OriginalTextureWidth(0),
+	OriginalTextureHeight(0),
+	OriginalTextureMipLevelCount(0),
+	OriginalTextureFormat(WW3D_FORMAT_UNKNOWN),
+	DateTime(0)
+{
+	WWPROFILE(("ThumbnailClass::ThumbnailClass"));
+	unsigned reduction_factor=3;
+
+	// First, try loading image from a DDS file
+	DDSFileClass dds_file(filename,reduction_factor);
+	if (dds_file.Is_Available() && dds_file.Load()) {
+		DateTime=dds_file.Get_Date_Time();
+
+		int len=Name.Get_Length();
+		WWASSERT(len>4);
+		Name[len-3]='d';
+		Name[len-2]='d';
+		Name[len-1]='s';
+
+		unsigned level=0;
+		while (dds_file.Get_Width(level)>32 || dds_file.Get_Height(level)>32) {
+			if (level>=dds_file.Get_Mip_Level_Count()) break;
+			level++;
+		}
+
+		OriginalTextureWidth=dds_file.Get_Full_Width();
+		OriginalTextureHeight=dds_file.Get_Full_Height();
+		OriginalTextureFormat=dds_file.Get_Format();
+		OriginalTextureMipLevelCount=dds_file.Get_Mip_Level_Count();
+		Width=dds_file.Get_Width(0);
+		Height=dds_file.Get_Height(0);
+		Bitmap=W3DNEWARRAY unsigned char[Width*Height*2];
+		Allocated=true;
+		dds_file.Copy_Level_To_Surface(
+			0,			// Level
+			WW3D_FORMAT_A4R4G4B4,
+			Width,
+			Height,
+			Bitmap,
+			Width*2,
+			Vector3(0.0f,0.0f,0.0f));// We don't want to HSV-shift here
+	}
+	// If DDS file can't be used try loading from TGA
+	else {
+		// Make sure the file can be opened. If not, return missing texture.
+		Targa targa;
+		if (TARGA_ERROR_HANDLER(targa.Open(filename,TGA_READMODE),filename)) return;
+
+		// DX8 uses image upside down compared to TGA
+		targa.Header.ImageDescriptor ^= TGAIDF_YORIGIN;
+
+		WW3DFormat src_format,dest_format;
+		unsigned src_bpp=0;
+		Get_WW3D_Format(src_format,src_bpp,targa);
+		if (src_format==WW3D_FORMAT_UNKNOWN) {
+			WWDEBUG_SAY(("Unknown texture format for %s",filename.str()));
+			return;
+		}
+
+		// Destination size will be the next power of two square from the larger width and height...
+		OriginalTextureWidth=targa.Header.Width;
+		OriginalTextureHeight=targa.Header.Height;
+		OriginalTextureFormat=src_format;
+		Width=targa.Header.Width>>reduction_factor;
+		Height=targa.Header.Height>>reduction_factor;
+		OriginalTextureMipLevelCount=1;
+		unsigned iw=1;
+		unsigned ih=1;
+		while (iw<OriginalTextureWidth && ih<OriginalTextureHeight) {
+			iw+=iw;
+			ih+=ih;
+			OriginalTextureMipLevelCount++;
+		}
+
+		while (Width>32 || Height>32) {
+			reduction_factor++;
+			Width>>=2;
+			Height>>=2;
+		}
+
+		unsigned poweroftwowidth = 1;
+		while (poweroftwowidth < Width) {
+			poweroftwowidth <<= 1;
+		}
+
+		unsigned poweroftwoheight = 1;
+		while (poweroftwoheight < Height) {
+			poweroftwoheight <<= 1;
+		}
+
+		Width=poweroftwowidth;
+		Height=poweroftwoheight;
+
+		unsigned src_width=targa.Header.Width;
+		unsigned src_height=targa.Header.Height;
+
+		// NOTE: We load the palette but we do not yet support paletted textures!
+		char palette[256*4];
+		targa.SetPalette(palette);
+		if (TARGA_ERROR_HANDLER(targa.Load(filename, TGAF_IMAGE, false),filename)) return;
+
+		// Get time stamp from the tga file
+		{
+			file_auto_ptr my_tga_file(_TheFileFactory,filename);
+			WWASSERT(my_tga_file->Is_Available());
+			my_tga_file->Open();
+			DateTime=my_tga_file->Get_Date_Time();
+			my_tga_file->Close();
+		}
+
+		unsigned char* src_surface=(unsigned char*)targa.GetImage();
+
+		int len=Name.Get_Length();
+		WWASSERT(len>4);
+		Name[len-3]='t';
+		Name[len-2]='g';
+		Name[len-1]='a';
+
+		Bitmap=W3DNEWARRAY unsigned char[Width*Height*2];
+		Allocated=true;
+
+		dest_format=WW3D_FORMAT_A8R8G8B8;
+		BitmapHandlerClass::Copy_Image(
+			Bitmap,
+			Width,
+			Height,
+			Width*2,
+			WW3D_FORMAT_A4R4G4B4,
+			src_surface,
+			src_width,
+			src_height,
+			src_width*src_bpp,
+			src_format,
+			(unsigned char*)targa.GetPalette(),
+			targa.Header.CMapDepth>>3,
+			false);
+	}
+
+	Manager->Insert_To_Hash(this);
+}
+
+ThumbnailClass::~ThumbnailClass()
+{
+	if (Allocated) delete[] Bitmap;
+	Manager->Remove_From_Hash(this);
+}
+
+
+// ----------------------------------------------------------------------------
+ThumbnailManagerClass::ThumbnailManagerClass(const char* thumbnail_filename)
+	:
+	ThumbnailMemory(NULL),
+	ThumbnailFileName(thumbnail_filename),
+	PerTextureTimeStampUsed(false),
+	Changed(false),
+	DateTime(0)
+{
+}
+
+// ----------------------------------------------------------------------------
+ThumbnailManagerClass::~ThumbnailManagerClass()
+{
+	HashTemplateIterator<StringClass,ThumbnailClass*> ite(ThumbnailHash);
+	ite.First();
+	while (!ite.Is_Done()) {
+		ThumbnailClass* thumb=ite.Peek_Value();
+		delete thumb;
+		ite.First();
+	}
+
+	delete[] ThumbnailMemory;
+	ThumbnailMemory=NULL;
+}
+
+// ----------------------------------------------------------------------------
+ThumbnailManagerClass* ThumbnailManagerClass::Peek_Thumbnail_Manager(const char* thumbnail_filename)
+{
+	ThumbnailManagerClass* man=ThumbnailManagerList.Head();
+	while (man) {
+		if (man->ThumbnailFileName==thumbnail_filename) return man;
+		man=man->Succ();
+	}
+	if (GlobalThumbnailManager &&
+		GlobalThumbnailManager->ThumbnailFileName==thumbnail_filename) return GlobalThumbnailManager;
+	return NULL;
+}
+
+// ----------------------------------------------------------------------------
+void ThumbnailManagerClass::Add_Thumbnail_Manager(const char* thumbnail_filename)
+{
+	// First loop over all thumbnail managers to see if we already have this one created. This isn't
+	// supposed to be called often at all and there are usually just couple managers alive,
+	// so we'll do pure string compares here...
+
+	// Must NOT add global manager with this function
+	WWASSERT(stricmp(thumbnail_filename,GLOBAL_THUMBNAIL_MANAGER_FILENAME));
+
+	ThumbnailManagerClass* man=Peek_Thumbnail_Manager(thumbnail_filename);
+	if (man) return;
+
+	// Not found, create and add to the list.
+	man=new ThumbnailManagerClass(thumbnail_filename);
+	ThumbnailManagerList.Add_Tail(man);
+}
+// ----------------------------------------------------------------------------
+void ThumbnailManagerClass::Remove_Thumbnail_Manager(const char* thumbnail_filename)
+{
+	ThumbnailManagerClass* man=ThumbnailManagerList.Head();
+	while (man) {
+		if (man->ThumbnailFileName==thumbnail_filename) {
+			delete man;
+			return;
+		}
+		man=man->Succ();
+	}
+	if (GlobalThumbnailManager &&
+		GlobalThumbnailManager->ThumbnailFileName==thumbnail_filename) {
+		delete GlobalThumbnailManager;
+		GlobalThumbnailManager=NULL;
+	}
+}
+// ----------------------------------------------------------------------------
+ThumbnailClass* ThumbnailManagerClass::Peek_Thumbnail_Instance(const StringClass& name)
+{
+
+	return Get_From_Hash(name);
+}
+
+ThumbnailClass* ThumbnailManagerClass::Peek_Thumbnail_Instance_From_Any_Manager(const StringClass& filename)
+{
+	WWPROFILE(("Peek_Thumbnail_Instance_From_Any_Manager"));
+	ThumbnailManagerClass* thumb_man=ThumbnailManagerList.Head();
+	while (thumb_man) {
+		ThumbnailClass* thumb=thumb_man->Peek_Thumbnail_Instance(filename);
+		if (thumb) return thumb;
+		thumb_man=thumb_man->Succ();
+	}
+
+	if (GlobalThumbnailManager) {
+		ThumbnailClass* thumb=GlobalThumbnailManager->Peek_Thumbnail_Instance(filename);
+		if (thumb) return thumb;
+	}
+
+// If thumbnail is not found, see if we can find a texture. It is possible that the texture is outside of
+// a mix file and didn't get included in any thumbnail database based on a mixfile. If so, we'll add it to
+// our global thumbnail database.
+	if (Is_Thumbnail_Created_If_Not_Found()) {
+		if (GlobalThumbnailManager) {
+			ThumbnailClass* thumb=new ThumbnailClass(GlobalThumbnailManager,filename);
+			if (!thumb->Peek_Bitmap()) {
+				delete thumb;
+				thumb=NULL;
+			}
+			return thumb;
+		}
+	}
+
+	return NULL;
+}
+
+
+void ThumbnailManagerClass::Insert_To_Hash(ThumbnailClass* thumb)
+{
+	Changed=true;
+	StringClass hash_name(0,true);
+	Create_Hash_Name(hash_name,thumb->Get_Name());
+	ThumbnailHash.Insert(hash_name,thumb);
+}
+
+ThumbnailClass* ThumbnailManagerClass::Get_From_Hash(const StringClass& name)
+{
+	StringClass hash_name(0,true);
+	Create_Hash_Name(hash_name,name);
+	return ThumbnailHash.Get(hash_name);
+}
+
+void ThumbnailManagerClass::Remove_From_Hash(ThumbnailClass* thumb)
+{
+	Changed=true;
+	StringClass hash_name(0,true);
+	Create_Hash_Name(hash_name,thumb->Get_Name());
+	ThumbnailHash.Remove(hash_name);
+}
+
+void ThumbnailManagerClass::Init()
+{
+	WWASSERT(GlobalThumbnailManager == NULL);
+	GlobalThumbnailManager=new ThumbnailManagerClass(GLOBAL_THUMBNAIL_MANAGER_FILENAME);
+	GlobalThumbnailManager->Enable_Per_Texture_Time_Stamp(true);
+}
+
+void ThumbnailManagerClass::Deinit()
+{
+	while (ThumbnailManagerClass* man=ThumbnailManagerList.Head()) {
+		delete man;
+	}
+
+	delete GlobalThumbnailManager;
+	GlobalThumbnailManager=NULL;
+}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h
new file mode 100644
index 00000000000..465bcc367eb
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h
@@ -0,0 +1,124 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// 08/07/02 KM Texture class redesign (revisited)
+
+#pragma once
+
+#include "always.h"
+#include "wwstring.h"
+#include "hashtemplate.h"
+#include "dllist.h"
+#include "ww3dformat.h"
+
+#define GLOBAL_THUMBNAIL_MANAGER_FILENAME "global.th6"
+
+class ThumbnailManagerClass;
+
+// ----------------------------------------------------------------------------
+
+class ThumbnailClass
+{
+	friend ThumbnailManagerClass;
+
+	StringClass Name;
+	unsigned char* Bitmap;
+	unsigned Width;
+	unsigned Height;
+	unsigned OriginalTextureWidth;
+	unsigned OriginalTextureHeight;
+	unsigned OriginalTextureMipLevelCount;
+	WW3DFormat OriginalTextureFormat;
+	unsigned long DateTime;
+	bool Allocated;	// if true, destructor will free the memory
+	ThumbnailManagerClass* Manager;
+
+	ThumbnailClass(
+		ThumbnailManagerClass* manager,
+		const char* name,
+		unsigned char* bitmap,
+		unsigned w,
+		unsigned h,
+		unsigned original_w,
+		unsigned original_h,
+		unsigned original_mip_level_count,
+		WW3DFormat original_format,
+		bool allocated,
+		unsigned long date_time);
+	ThumbnailClass(
+		ThumbnailManagerClass* manager,
+		const StringClass& filename);
+	~ThumbnailClass();
+public:
+
+	unsigned char* Peek_Bitmap() { return Bitmap; }
+	WW3DFormat Get_Format() { return WW3D_FORMAT_A4R4G4B4; }
+	unsigned Get_Width() const { return Width; }
+	unsigned Get_Height() const { return Height; }
+	unsigned Get_Original_Texture_Width() const { return OriginalTextureWidth; }
+	unsigned Get_Original_Texture_Height() const { return OriginalTextureHeight; }
+	unsigned Get_Original_Texture_Mip_Level_Count() const { return OriginalTextureMipLevelCount; }
+	WW3DFormat Get_Original_Texture_Format() const { return OriginalTextureFormat; }
+	unsigned long Get_Date_Time() const { return DateTime; }
+	const StringClass& Get_Name() const { return Name; }
+
+};
+
+// ----------------------------------------------------------------------------
+
+class ThumbnailManagerClass : public DLNodeClass<ThumbnailManagerClass>
+{
+	W3DMPO_GLUE(ThumbnailManagerClass);
+
+	friend ThumbnailClass;
+
+	static bool CreateThumbnailIfNotFound;
+	bool PerTextureTimeStampUsed;
+	StringClass ThumbnailFileName;
+	HashTemplateClass<StringClass,ThumbnailClass*> ThumbnailHash;
+	unsigned char* ThumbnailMemory;
+	bool Changed;
+	unsigned long DateTime;
+
+	ThumbnailManagerClass(const char* thumbnail_filename);
+	~ThumbnailManagerClass();
+
+	void Remove_From_Hash(ThumbnailClass* thumb);
+	void Insert_To_Hash(ThumbnailClass* thumb);
+	ThumbnailClass* Get_From_Hash(const StringClass& name);
+
+public:
+	ThumbnailClass* Peek_Thumbnail_Instance(const StringClass& name);
+
+	static void Add_Thumbnail_Manager(const char* thumbnail_filename);
+	static void Remove_Thumbnail_Manager(const char* thumbnail_filename);
+	static ThumbnailManagerClass* Peek_Thumbnail_Manager(const char* thumbnail_filename);
+
+	static ThumbnailClass* Peek_Thumbnail_Instance_From_Any_Manager(const StringClass& name);
+
+	static bool Is_Thumbnail_Created_If_Not_Found() { return CreateThumbnailIfNotFound; }
+	static void Create_Thumbnail_If_Not_Found(bool create) { CreateThumbnailIfNotFound=create; }
+
+	bool Is_Per_Texture_Time_Stamp_Used() const { return PerTextureTimeStampUsed; }
+	void Enable_Per_Texture_Time_Stamp(bool enable) { PerTextureTimeStampUsed=enable; }
+
+	static void Init();
+	static void Deinit();
+};
+
+// ----------------------------------------------------------------------------
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp
index df066a69be6..5c4bf51f9e9 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp
@@ -84,18 +84,18 @@ void VisPolyClass::Clip(const PlaneClass & plane,VisPolyClass & dest) const
 
 	// perform clipping
 	prev_point_in_front = !plane.In_Front(Verts[iprev]);		// Note, plane normal is outward so we invert this test
-	for (int j=0; j<vcount; j++) { 
-		
+	for (int j=0; j<vcount; j++) {
+
 		cur_point_in_front = !plane.In_Front(Verts[i]);			// Note, plane nomral is out so we invert this test
 		if (prev_point_in_front) {
 
 			if (cur_point_in_front) {
-			
+
 				// Previous vertex was in front of plane and this vertex is in
 				// front of the plane so we emit this vertex.
 				dest.Add_Vertex(Verts[i]);
 
-			} else { 
+			} else {
 
 				// Previous vert was in front, this vert is behind, compute
 				// the intersection and emit the point.
@@ -116,13 +116,13 @@ void VisPolyClass::Clip(const PlaneClass & plane,VisPolyClass & dest) const
 				Vector3::Lerp(Verts[iprev],Verts[i],alpha,&int_point);
 				dest.Add_Vertex(int_point);
 				dest.Add_Vertex(Verts[i]);
-			
-			} 
-		} 
+
+			}
+		}
 
 		prev_point_in_front = cur_point_in_front;
 		iprev = i;
-		
+
 		//i = (i+1)%(Verts.Count());
 		i++;
 		if (i>=vcount) {
@@ -181,7 +181,7 @@ CameraClass * VisRasterizerClass::Get_Camera(void)
 {
 	if (Camera != NULL) {
 		Camera->Add_Ref();
-	} 
+	}
 	return Camera;
 }
 
@@ -197,7 +197,7 @@ void VisRasterizerClass::Update_MV_Transform(void)
 	if (Camera) {
 		Camera->Get_View_Matrix(&view_tm);
 	}
-	
+
 #ifdef ALLOW_TEMPORARIES
 	MVTransform = view_tm * ModelTransform;
 #else
@@ -223,8 +223,8 @@ bool VisRasterizerClass::Render_Triangles
 (
 	const Vector3 * verts,
 	int vcount,
-	const TriIndex * tris, 
-	int tcount,const 
+	const TriIndex * tris,
+	int tcount,const
 	AABoxClass & bounds
 )
 {
@@ -232,7 +232,7 @@ bool VisRasterizerClass::Render_Triangles
 	WWASSERT(tris != NULL);
 	WWASSERT(vcount > 0);
 	WWASSERT(tcount > 0);
-	
+
 	/*
 	** if the user supplied bounds, check if we need to clip
 	*/
@@ -248,7 +248,7 @@ bool VisRasterizerClass::Render_Triangles_No_Clip
 (
 	const Vector3 * verts,
 	int vcount,
-	const TriIndex * tris, 
+	const TriIndex * tris,
 	int tcount
 )
 {
@@ -270,7 +270,7 @@ bool VisRasterizerClass::Render_Triangles_No_Clip
 	** 2. Pass triangles on to the ID buffer for scan conversion
 	*/
 	for (int tri_index=0; tri_index<tcount; tri_index++) {
-		
+
 		const TriIndex & tri = tris[tri_index];
 		pixel_passed |= IDBuffer.Render_Triangle(tverts[tri.I],tverts[tri.J],tverts[tri.K]);
 		if (pixel_passed && (IDBuffer.Get_Render_Mode() == IDBufferClass::NON_OCCLUDER_MODE)) {
@@ -285,7 +285,7 @@ bool VisRasterizerClass::Render_Triangles_Clip
 (
 	const Vector3 * verts,
 	int vcount,
-	const TriIndex * tris, 
+	const TriIndex * tris,
 	int tcount
 )
 {
@@ -308,7 +308,7 @@ bool VisRasterizerClass::Render_Triangles_Clip
 	** 3. Clip triangles to the view volume and pass on to the ID buffer for scan conversion
 	*/
 	for (int tri_index=0; tri_index<tcount; tri_index++) {
-		
+
 		/*
 		** Copy triangle data into the vis clipping structure
 		*/
@@ -333,14 +333,14 @@ bool VisRasterizerClass::Render_Triangles_Clip
 		int final_vcount = _VisPoly0.Verts.Count();
 
 		if (final_vcount >= 3) {
-	
+
 			Vector3 * final_verts = &(_VisPoly0.Verts[0]);
 
 			int i;
 			for (i=0; i<final_vcount; i++) {
 				Camera->Project_Camera_Space_Point(final_verts[i],final_verts[i]);
 			}
-		
+
 			/*
 			** Pass the resulting triangle fan to the IDBuffer
 			*/
@@ -405,14 +405,12 @@ void IDBufferClass::Get_Resolution(int * get_w,int * get_h)
 
 void IDBufferClass::Reset(void)
 {
-	if (IDBuffer!=NULL) {
-		delete[] IDBuffer;
-		IDBuffer = NULL;
-	}
-	if (ZBuffer != NULL) {
-		delete[] ZBuffer;
-		ZBuffer = NULL;
-	}
+	delete[] IDBuffer;
+	IDBuffer = NULL;
+
+	delete[] ZBuffer;
+	ZBuffer = NULL;
+
 	PixelCounter = 0;
 }
 
@@ -457,7 +455,7 @@ struct GradientsStruct
 			OOZ[i] = 1/verts[i].Z;
 		}
 
-		DOOZ_DX = oodx * ( ((OOZ[1] - OOZ[2]) * (verts[0].Y - verts[2].Y)) -	
+		DOOZ_DX = oodx * ( ((OOZ[1] - OOZ[2]) * (verts[0].Y - verts[2].Y)) -
 								 ((OOZ[0] - OOZ[2]) * (verts[1].Y - verts[2].Y)));
 
 		DOOZ_DY = oody * ( ((OOZ[1] - OOZ[2]) * (verts[0].X - verts[2].X)) -
@@ -480,7 +478,7 @@ struct EdgeStruct
 	{
 		Y = WWMath::Ceil(verts[top].Y);
 		Height = WWMath::Ceil(verts[bottom].Y) - Y;
-		
+
 		float y_prestep = Y - verts[top].Y;
 		float real_height = verts[bottom].Y - verts[top].Y;
 		float real_width  = verts[bottom].X - verts[top].X;
@@ -492,8 +490,8 @@ struct EdgeStruct
 		OOZ = grad.OOZ[top] + y_prestep * grad.DOOZ_DY + x_prestep * grad.DOOZ_DX;
 		OOZStep = XStep * grad.DOOZ_DX + grad.DOOZ_DY;
 	}
-	
-	inline int Step(void)
+
+	int Step(void)
 	{
 		X+=XStep;
 		Y++;
@@ -594,7 +592,7 @@ bool IDBufferClass::Render_Triangle(const Vector3 & p0,const Vector3 & p1,const
 	EdgeStruct top_to_bottom_edge(grads,points,top,bottom);
 	EdgeStruct top_to_middle_edge(grads,points,top,middle);
 	EdgeStruct middle_to_bottom_edge(grads,points,middle,bottom);
-	
+
 	EdgeStruct * left_edge = NULL;
 	EdgeStruct * right_edge = NULL;
 
@@ -666,7 +664,7 @@ int IDBufferClass::Render_Occluder_Scanline(GradientsStruct & grads,EdgeStruct *
 	int address = Pixel_Coords_To_Address(xstart,left->Y);
 	float ooz = left->OOZ + xprestep * grads.DOOZ_DX;
 	int pixel_counter = 0;
-	
+
 	/*
 	** Two separate loops, backfaces only render when LESS THAN
 	*/
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h
index e49b20c3783..193358f1522 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h
@@ -36,12 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VISRASTERIZER_H
-#define VISRASTERIZER_H
 
 #include "always.h"
 #include "matrix3d.h"
@@ -75,7 +70,7 @@ class IDBufferClass
 	*/
 	void						Set_Resolution(int w,int h);
 	void						Get_Resolution(int * get_w,int * get_h);
-	
+
 	void						Set_Backface_ID(uint32 id)		{ BackfaceID = id; }
 	void						Set_Frontface_ID(uint32 id)	{ FrontfaceID = id; }
 	uint32					Get_Backface_ID(void)			{ return BackfaceID; }
@@ -150,7 +145,7 @@ inline bool IDBufferClass::Is_Backfacing(const Vector3 & p0,const Vector3 & p1,c
 ** it is a floating point z-buffer and an id buffer which is used by the visiblity precalculation system.
 ** The VisRasterizer will transform and clip triangles into homogeneous view space; then the clipped
 ** triangles will be passed on to the IDBufferClass which will scan convert them.
-*/ 
+*/
 class VisRasterizerClass
 {
 public:
@@ -193,21 +188,18 @@ class VisRasterizerClass
 	const uint32 *		Get_Pixel_Row(int y,int min_x,int max_x) { return IDBuffer.Get_Pixel_Row(y,min_x,max_x); }
 
 protected:
-	
+
 	void					Update_MV_Transform(void);
 	const Matrix3D &	Get_MV_Transform(void);
 	Vector3 *			Get_Temp_Vertex_Buffer(int count);
 	bool					Render_Triangles_Clip(const Vector3 * verts,int vcount,const TriIndex * tris, int tcount);
 	bool					Render_Triangles_No_Clip(const Vector3 * verts,int vcount,const TriIndex * tris, int tcount);
-	
+
 	Matrix3D				ModelTransform;			// AKA "World Transform"
 	CameraClass *		Camera;
 	Matrix3D				MVTransform;
 
-	IDBufferClass		IDBuffer;	
+	IDBufferClass		IDBuffer;
 
 	SimpleVecClass<Vector3>	TempVertexBuffer;
 };
-
-#endif //VISRASTERIZER_H
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp
index 49279e03cec..415b9fb8c53 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp
@@ -83,7 +83,7 @@ static void Scan_Emitter (ChunkLoadClass &cload, StringList &files, const char *
 static void Scan_Aggregate (ChunkLoadClass &cload, StringList &files, const char *w3d_name);
 static void Scan_HLOD (ChunkLoadClass &cload, StringList &files, const char *w3d_name);
 
-static void Get_W3D_Name (const char *filename, char *w3d_name);
+static void Get_W3D_Name (const char *filename, char *w3d_name, size_t w3d_name_size);
 static const char * Make_W3D_Filename (const char *w3d_name);
 
 
@@ -118,7 +118,7 @@ bool Get_W3D_Dependencies (const char *w3d_filename, StringList &files)
 
 	// Get the W3D name from the filename.
 	char w3d_name[W3D_NAME_LEN];
-	Get_W3D_Name(w3d_filename, w3d_name);
+	Get_W3D_Name(w3d_filename, w3d_name, ARRAY_SIZE(w3d_name));
 
 	// Create a chunk loader for this file, and scan the file.
 	ChunkLoadClass cload(file);
@@ -511,7 +511,7 @@ static void Scan_HLOD (ChunkLoadClass &cload, StringList &files, const char *w3d
  * HISTORY:                                                                                    *
  *   4/3/00     AJA : Created.                                                                 *
  *=============================================================================================*/
-static void Get_W3D_Name (const char *filename, char *w3d_name)
+static void Get_W3D_Name(const char* filename, char* w3d_name, size_t w3d_name_size)
 {
 	assert(filename);
 	assert(w3d_name);
@@ -532,9 +532,9 @@ static void Get_W3D_Name (const char *filename, char *w3d_name)
 
 	// Copy all characters from start to end (excluding 'end')
 	// into the w3d_name buffer. Then capitalize the string.
-	memset(w3d_name, 0, W3D_NAME_LEN);	// blank out the buffer
-	int num_chars = end - start;
-	strncpy(w3d_name, start, num_chars < W3D_NAME_LEN ? num_chars : W3D_NAME_LEN-1);
+	size_t num_chars = end - start;
+	WWASSERT(num_chars < w3d_name_size);
+	strlcpy(w3d_name, start, min(w3d_name_size, num_chars));
 	strupr(w3d_name);
 }
 
@@ -554,7 +554,6 @@ static void Get_W3D_Name (const char *filename, char *w3d_name)
 static const char * Make_W3D_Filename (const char *w3d_name)
 {
 	assert(w3d_name);
-	assert(strlen(w3d_name) < W3D_NAME_LEN);
 
 	// Copy the w3d name into a static buffer, turn it into lowercase
 	// letters, and append a ".w3d" file extension. That's the filename.
@@ -565,11 +564,12 @@ static const char * Make_W3D_Filename (const char *w3d_name)
 		buffer[0] = 0;
 		return buffer;
 	}
-	strcpy(buffer, w3d_name);
+	const size_t bufferLen = strlcpy(buffer, w3d_name, ARRAY_SIZE(buffer));
+	(void)bufferLen; WWASSERT(bufferLen < W3D_NAME_LEN);
 	char *dot = strchr(buffer, '.');
 	if (dot)
 		*dot = 0;
 	strlwr(buffer);
-	strcat(buffer, ".w3d");
+	strlcat(buffer, ".w3d", ARRAY_SIZE(buffer));
 	return buffer;
 }
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h
index 3e02cae30da..363883df049 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h
@@ -34,8 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef W3D_DEP_H
-#define W3D_DEP_H
+#pragma once
 
 #pragma warning (push, 3)
 #pragma warning (disable: 4018 4284 4786 4788)
@@ -50,5 +49,3 @@
 
 typedef std::list<std::string>	StringList;
 bool Get_W3D_Dependencies (const char *w3d_filename, StringList &files);
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h
index 7e3de48cce3..eb9a537f99d 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h
@@ -34,38 +34,31 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef W3D_OBSOLETE_H
-#define W3D_OBSOLETE_H
-
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 // Obsolete chunk id's
 // At one point in time I was using the 'O' prefix to mean obsolete.  Now we just move stuff
 // into this file...
 /////////////////////////////////////////////////////////////////////////////////////////////
-enum 
+enum
 {
 		W3D_CHUNK_MESH_HEADER					=0x00000001,	// header for a mesh
 		W3D_CHUNK_SURRENDER_NORMALS			=0x00000004,	// array of surrender normals (one per vertex as req. by surrender)
 		W3D_CHUNK_TEXCOORDS						=0x00000005,	// array of texture coordinates
 		O_W3D_CHUNK_MATERIALS					=0x00000006,	// array of materials
-		O_W3D_CHUNK_TRIANGLES					=0x00000007,	// array of triangles 
-		O_W3D_CHUNK_QUADRANGLES					=0x00000008,	// array of quads 
-		O_W3D_CHUNK_SURRENDER_TRIANGLES		=0x00000009,	// array of surrender format tris	
-		O_W3D_CHUNK_POV_TRIANGLES				=0x0000000A,	// POV format triangles 
-		O_W3D_CHUNK_POV_QUADRANGLES			=0x0000000B,	// POV format quads 
+		O_W3D_CHUNK_TRIANGLES					=0x00000007,	// array of triangles
+		O_W3D_CHUNK_QUADRANGLES					=0x00000008,	// array of quads
+		O_W3D_CHUNK_SURRENDER_TRIANGLES		=0x00000009,	// array of surrender format tris
+		O_W3D_CHUNK_POV_TRIANGLES				=0x0000000A,	// POV format triangles
+		O_W3D_CHUNK_POV_QUADRANGLES			=0x0000000B,	// POV format quads
 		W3D_CHUNK_VERTEX_COLORS					=0x0000000D,	// Pre-set vertex coloring
-		W3D_CHUNK_DAMAGE							=0x0000000F,	// Mesh damage, new set of materials, vertex positions, vertex colors	
+		W3D_CHUNK_DAMAGE							=0x0000000F,	// Mesh damage, new set of materials, vertex positions, vertex colors
 			W3D_CHUNK_DAMAGE_HEADER				=0x00000010,	// Header for the damage data, tells what is coming
 			W3D_CHUNK_DAMAGE_VERTICES			=0x00000011,	// Array of modified vertices (W3dMeshDamageVertexStruct's)
 			W3D_CHUNK_DAMAGE_COLORS				=0x00000012,	// Array of modified vert colors (W3dMeshDamageColorStruct's)
-			W3D_CHUNK_DAMAGE_MATERIALS			=0x00000013,	
-			
+			W3D_CHUNK_DAMAGE_MATERIALS			=0x00000013,
+
 		O_W3D_CHUNK_MATERIALS2					=0x00000014,	// array of version 2 materials (with animation frame counts)
 
 		W3D_CHUNK_MATERIALS3						=0x00000015,	// array of version 3 materials (all new surrender features supported)
@@ -108,7 +101,7 @@ struct W3dMaterial2Struct
 	uint8	 		Red;									// Rgb colors
 	uint8	 		Green;
 	uint8	 		Blue;
-	uint8			Alpha;								
+	uint8			Alpha;
 
 	uint16		PrimaryNumFrames;					// number of animated frames (if 1, not animated)
 	uint16		SecondaryNumFrames;				// number of animated frames (if 1, not animated)
@@ -149,7 +142,7 @@ struct W3dMaterial2Struct
 #define		W3DMAPPING_ENVIRONMENT									1
 
 /////////////////////////////////////////////////////////////////////////////////////////////
-// Version 3.0 Material, A W3D_CHUNK_MATERIALS3 chunk will wrap a bunch of 
+// Version 3.0 Material, A W3D_CHUNK_MATERIALS3 chunk will wrap a bunch of
 // W3D_CHUNK_MATERIAL3 chunks.  Inside each chunk will be a name chunk, an 'info' chunk which
 // contains the following struct, and one or more map chunks. a mesh with 2 materials might
 // look like:
@@ -161,19 +154,19 @@ struct W3dMaterial2Struct
 //			W3D_CHUNK_MATERIAL3_DC_MAP		<-- a map, W3dMap3Struct
 //				W3D_CHUNK_STRING				<-- filename of the map
 //				W3D_CHUNK_MAP_INFO			<-- map parameters
-//			W3D_CHUNK_MATERIAL3_SC_MAP        
+//			W3D_CHUNK_MATERIAL3_SC_MAP
 //				W3D_CHUNK_STRING				<-- filename of the map
 //				W3D_CHUNK_MAP_INFO
 //		W3D_CHUNK_MATERIAL3
 //			W3D_CHUNK_MATERIAL3_NAME
 //			W3D_CHUNK_MATERIAL3_INFO
 //			W3D_CHUNK_MATERIAL3_SI_MAP
-//		
+//
 /////////////////////////////////////////////////////////////////////////////////////////////
 struct W3dMaterial3Struct
 {
 	uint32					Attributes;					// flags,hints,etc.
-	
+
 	W3dRGBStruct			DiffuseColor;				// diffuse color
 	W3dRGBStruct			SpecularColor;				// specular color
 
@@ -221,7 +214,7 @@ struct W3dMeshHeaderStruct
 	uint32					Version;							// Currently version 0x100
 	char						MeshName[W3D_NAME_LEN];		// name of the mesh (Null terminated)
 	uint32					Attributes;
-	
+
 	//
 	// Counts, these can be regarded as an inventory of what is to come in the file.
 	//
@@ -231,7 +224,7 @@ struct W3dMeshHeaderStruct
 
 	uint32					NumPovTris;			// (NOT USED)
 	uint32					NumPovQuads;		// (NOT USED)
-	
+
 	uint32					NumVertices;		// number of unique vertices
 	uint32					NumNormals;			// number of unique normals (OBSOLETE!)
 	uint32					NumSrNormals;		// number of surrender normals (MUST EQUAL NumVertices or 0)
@@ -258,13 +251,13 @@ struct W3dMeshHeaderStruct
 	W3dVectorStruct		SphCenter;			// Center of bounding sphere
 	float32					SphRadius;			// Bounding sphere radius
 
-	// 
+	//
 	// Default transformation
 	//
 	W3dVectorStruct		Translation;
 	float32					Rotation[9];
 
-	// 
+	//
 	// Physics Properties
 	//
 	W3dVectorStruct		MassCenter;			// Center of mass in object space
@@ -291,7 +284,7 @@ struct W3dMeshDamageStruct
 	uint32					NumDamageVerts;		// number of vertices to replace
 	uint32					NumDamageColors;		// number of vertex colors to replace
 	uint32					DamageIndex;			// what index is this damage chunk assigned to
-	uint32					FutureUse[4];	
+	uint32					FutureUse[4];
 };
 
 struct W3dMeshDamageVertexStruct
@@ -326,8 +319,5 @@ struct W3dHModelAuxDataStruct
 
 	float32					LODMin;
 	float32					LODMax;
-	uint32					FutureUse[32];	
+	uint32					FutureUse[32];
 };
-
-
-#endif // W3D_OBSOLETE_H
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp
index 849febe346e..d44420978a1 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp
@@ -65,7 +65,7 @@ void	W3dUtilityClass::Convert_Quaternion(const W3dQuaternionStruct & q,Quaternio
 }
 
 void W3dUtilityClass::Convert_Quaternion(const Quaternion & q,W3dQuaternionStruct * set)
-{	
+{
 	set->Q[0] = q.X;
 	set->Q[1] = q.Y;
 	set->Q[2] = q.Z;
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h
index 3a723498162..90b3da3e16f 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef W3D_UTIL_H
-#define W3D_UTIL_H
 
 #include "always.h"
 #include "w3d_file.h"
@@ -69,12 +63,8 @@ class W3dUtilityClass
 
 	static void	Convert_Color(const W3dRGBAStruct & rgb,Vector4 * set);
 	static void	Convert_Color(const Vector4 & v,W3dRGBAStruct * set);
-	
+
 	static void Convert_Shader(const W3dShaderStruct & shader,ShaderClass * set);
 	static void Convert_Shader(const ShaderClass & shader,W3dShaderStruct * set);
 
 };
-
-#endif
-
-
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h b/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h
index 4411dd2fe41..c600f8ca708 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef W3DERR_H
-#define W3DERR_H
 
 #include "always.h"
 
@@ -56,5 +50,3 @@ enum WW3DErrorType
 	WW3D_ERROR_WINDOW_NOT_OPEN,
 	WW3D_ERROR_INITIALIZATION_FAILED,
 };
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.cpp b/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.cpp
index c152e733e79..800158e9456 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/w3dexclusionlist.cpp 1     12/12/02 3:36p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/w3dexclusionlist.cpp                   $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 12/12/02 10:04a                                             $* 
- *                                                                                             * 
- *                    $Revision:: 1                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/w3dexclusionlist.cpp                   $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 12/12/02 10:04a                                             $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -42,16 +42,16 @@
 #include "hanim.h"
 
 
-W3DExclusionListClass::W3DExclusionListClass(const DynamicVectorClass<StringClass> & names) : 
-	Names(names) 
+W3DExclusionListClass::W3DExclusionListClass(const DynamicVectorClass<StringClass> & names) :
+	Names(names)
 {
 	for (int i=0; i<Names.Count(); i++) {
 		NameHash.Insert(Names[i],i);
 	}
 }
 
-W3DExclusionListClass::~W3DExclusionListClass(void) 
-{ 
+W3DExclusionListClass::~W3DExclusionListClass(void)
+{
 	NameHash.Remove_All();
 }
 
@@ -59,7 +59,7 @@ bool	W3DExclusionListClass::Is_Excluded(PrototypeClass * proto) const
 {
 	StringClass copy = proto->Get_Name();
 	char * root_name = copy.Peek_Buffer();
-	
+
 	// don't preserve munged prototypes
 	if (strchr(root_name,'#') != NULL) {
 		return false;
@@ -70,7 +70,7 @@ bool	W3DExclusionListClass::Is_Excluded(PrototypeClass * proto) const
 	if (tmp != NULL) {
 		*tmp = 0;
 	}
-	
+
 	return Is_Excluded(root_name);
 }
 
@@ -91,7 +91,7 @@ bool	W3DExclusionListClass::Is_Excluded(HAnimClass * hanim) const
 	const char * tmp = strchr(root_name,'.');
 	if (tmp) {
 		return Is_Excluded(tmp + 1);
-	} else { 
+	} else {
 		return false;  // should never happen...
 	}
 }
@@ -99,7 +99,7 @@ bool	W3DExclusionListClass::Is_Excluded(HAnimClass * hanim) const
 
 bool W3DExclusionListClass::Is_Excluded(const char * root_name) const
 {
-	return NameHash.Exists(StringClass(root_name));	
+	return NameHash.Exists(StringClass(root_name));
 }
 
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h b/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h
index 5c980a6bc48..de01b0a939c 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h
@@ -17,33 +17,28 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/w3dexclusionlist.h 1     12/12/02 3:36p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/w3dexclusionlist.h                     $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 12/12/02 10:04a                                             $* 
- *                                                                                             * 
- *                    $Revision:: 1                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/w3dexclusionlist.h                     $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 12/12/02 10:04a                                             $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef W3DEXCLUSIONLIST_H
-#define W3DEXCLUSIONLIST_H
 
 #include "always.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "wwstring.h"
 #include "hashtemplate.h"
 
@@ -55,7 +50,7 @@ class HAnimClass;
 /**
 ** W3DExclusionListClass
 ** This class ecapsulates an "exclusion list" which the asset manager and related classes use
-** to filter what resources get released.  This is useful between level loads for example.  
+** to filter what resources get released.  This is useful between level loads for example.
 ** The Is_Excluded function uses w3d naming convention assumptions to determine whether the given
 ** asset name is in the list or is a child of something in the list.
 */
@@ -65,11 +60,11 @@ class W3DExclusionListClass
 public:
 	W3DExclusionListClass(const DynamicVectorClass<StringClass> & names);
 	~W3DExclusionListClass(void);
-	
+
 	bool	Is_Excluded(PrototypeClass * proto) const;
 	bool	Is_Excluded(HTreeClass * htree) const;
 	bool	Is_Excluded(HAnimClass * hanim) const;
-	
+
 	bool	Is_Excluded(const char * root_name) const;
 
 protected:
@@ -78,7 +73,3 @@ class W3DExclusionListClass
 	const DynamicVectorClass<StringClass> &	Names;
 	HashTemplateClass<StringClass,int>			NameHash;
 };
-
-
-
-#endif //EXCLUSIONLIST_H
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.cpp b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.cpp
index 101d8ea41f4..b5d6de1a736 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Hector Yee                                                   *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 14                                                          $*
@@ -40,7 +40,7 @@
 #include "ww3dformat.h"
 #include "vector4.h"
 #include "wwdebug.h"
-#include "TARGA.H"
+#include "TARGA.h"
 #include "dx8wrapper.h"
 #include "dx8caps.h"
 #include <d3d8.h>
@@ -104,17 +104,17 @@ void Get_WW3D_Format_Name(WW3DFormat format, StringClass& name)
 */
 void Get_WW3D_ZFormat_Name(WW3DZFormat format, StringClass& name)
 {
-	switch (format) 
+	switch (format)
 	{
 	default:
 	case WW3D_FORMAT_UNKNOWN		: name="Unknown"; break;
-	case WW3D_ZFORMAT_D16_LOCKABLE: name="D16Lockable"; break; // 16-bit z-buffer bit depth. This is an application-lockable surface format. 
-	case WW3D_ZFORMAT_D32			: name="D32"; break; // 32-bit z-buffer bit depth. 
-	case WW3D_ZFORMAT_D15S1			: name="D15S1"; break; // 16-bit z-buffer bit depth where 15 bits are reserved for the depth channel and 1 bit is reserved for the stencil channel. 
-	case WW3D_ZFORMAT_D24S8			: name="D24S8"; break; // 32-bit z-buffer bit depth using 24 bits for the depth channel and 8 bits for the stencil channel. 
-	case WW3D_ZFORMAT_D16			: name="D16"; break; // 16-bit z-buffer bit depth. 
-	case WW3D_ZFORMAT_D24X8			: name="D24X8"; break; // 32-bit z-buffer bit depth using 24 bits for the depth channel. 
-	case WW3D_ZFORMAT_D24X4S4		: name="D24X4S4"; break; // 32-bit z-buffer bit depth using 24 bits for the depth channel and 4 bits for the stencil channel. 
+	case WW3D_ZFORMAT_D16_LOCKABLE: name="D16Lockable"; break; // 16-bit z-buffer bit depth. This is an application-lockable surface format.
+	case WW3D_ZFORMAT_D32			: name="D32"; break; // 32-bit z-buffer bit depth.
+	case WW3D_ZFORMAT_D15S1			: name="D15S1"; break; // 16-bit z-buffer bit depth where 15 bits are reserved for the depth channel and 1 bit is reserved for the stencil channel.
+	case WW3D_ZFORMAT_D24S8			: name="D24S8"; break; // 32-bit z-buffer bit depth using 24 bits for the depth channel and 8 bits for the stencil channel.
+	case WW3D_ZFORMAT_D16			: name="D16"; break; // 16-bit z-buffer bit depth.
+	case WW3D_ZFORMAT_D24X8			: name="D24X8"; break; // 32-bit z-buffer bit depth using 24 bits for the depth channel.
+	case WW3D_ZFORMAT_D24X4S4		: name="D24X4S4"; break; // 32-bit z-buffer bit depth using 24 bits for the depth channel and 4 bits for the stencil channel.
 #ifdef _XBOX
 	case WW3D_ZFORMAT_LIN_D24S8	: name="D24S8LIN"; break;
 	case WW3D_ZFORMAT_LIN_F24S8	: name="F24S8LIN"; break;
@@ -140,7 +140,7 @@ void Vector4_to_Color(unsigned int *outc,const Vector4 &inc,const WW3DFormat for
 
 	switch (format)
 	{
-	case WW3D_FORMAT_R8G8B8:		
+	case WW3D_FORMAT_R8G8B8:
 	case WW3D_FORMAT_A8R8G8B8:
 	case WW3D_FORMAT_X8R8G8B8:
 		*outc=color;
@@ -184,12 +184,12 @@ void Vector4_to_Color(unsigned int *outc,const Vector4 &inc,const WW3DFormat for
 		*outc=lum;
 		break;
 	case WW3D_FORMAT_A8L8:
-		a=argb[0];		
+		a=argb[0];
 		lum=RGB_to_CIEY(inc);
 		*outc=(a<<8) | lum;
 		break;
 	case WW3D_FORMAT_A4L4:
-		a=argb[0] >> 4;		
+		a=argb[0] >> 4;
 		lum=RGB_to_CIEY(inc);
 		lum=lum>>4;
 		*outc=(a<<4) | lum;
@@ -235,7 +235,7 @@ void Color_to_Vector4(Vector4* outc,const unsigned int inc,const WW3DFormat form
 		g=argb[2]<<4;
 		b=argb[3]<<4;
 		break;
-	case WW3D_FORMAT_R3G3B2:		
+	case WW3D_FORMAT_R3G3B2:
 		r=argb[1]<<5;
 		g=argb[2]<<5;
 		b=argb[3]<<6;
@@ -296,7 +296,7 @@ void Get_WW3D_Format(WW3DFormat& src_format,unsigned& src_bpp,const Targa& targa
 			else src_format = WW3D_FORMAT_A8;
 			break;
 		default:
-			WWDEBUG_SAY(("TextureClass: Targa has unsupported bitdepth(%i)\n",targa.Header.PixelDepth));
+			WWDEBUG_SAY(("TextureClass: Targa has unsupported bitdepth(%i)",targa.Header.PixelDepth));
 //			WWASSERT(0);
 			break;
 	}
@@ -313,7 +313,7 @@ WW3DFormat Get_Valid_Texture_Format(WW3DFormat format, bool is_compression_allow
 	int w,h,bits;
 	bool windowed;
 
-	if (!DX8Wrapper::Get_Current_Caps()->Support_DXTC() || 
+	if (!DX8Wrapper::Get_Current_Caps()->Support_DXTC() ||
 		!is_compression_allowed) {
 		switch (format) {
 		case WW3D_FORMAT_DXT1: format=WW3D_FORMAT_R8G8B8; break;
@@ -328,7 +328,7 @@ WW3DFormat Get_Valid_Texture_Format(WW3DFormat format, bool is_compression_allow
 		switch (format) {
 		case WW3D_FORMAT_DXT1:
 			// NVidia hack - switch to DXT2 is there is no DXT1 support (which is disabled on NVidia cards)
-			if (!DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(WW3D_FORMAT_DXT1) && 
+			if (!DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(WW3D_FORMAT_DXT1) &&
 				DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(WW3D_FORMAT_DXT2)) {
 				format=WW3D_FORMAT_DXT2;
 			}
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h
index 200c50772f3..e9f9d898742 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Nathaniel Hoffman                                            *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 12                                                          $*
@@ -39,12 +39,7 @@
  * Color_to_Vector4 - converts a color in the format described in format to a Vector4          *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef WW3DFORMAT_H
-#define WW3DFORMAT_H
 
 #include "always.h"
 #include "wwstring.h"
@@ -105,13 +100,13 @@ enum WW3DFormat {
 enum WW3DZFormat
 {
 	WW3D_ZFORMAT_UNKNOWN=0,
-	WW3D_ZFORMAT_D16_LOCKABLE, // 16-bit z-buffer bit depth. This is an application-lockable surface format. 
-	WW3D_ZFORMAT_D32, // 32-bit z-buffer bit depth. 
-	WW3D_ZFORMAT_D15S1, // 16-bit z-buffer bit depth where 15 bits are reserved for the depth channel and 1 bit is reserved for the stencil channel. 
-	WW3D_ZFORMAT_D24S8, // 32-bit z-buffer bit depth using 24 bits for the depth channel and 8 bits for the stencil channel. 
-	WW3D_ZFORMAT_D16, // 16-bit z-buffer bit depth. 
-	WW3D_ZFORMAT_D24X8, // 32-bit z-buffer bit depth using 24 bits for the depth channel. 
-	WW3D_ZFORMAT_D24X4S4, // 32-bit z-buffer bit depth using 24 bits for the depth channel and 4 bits for the stencil channel. 
+	WW3D_ZFORMAT_D16_LOCKABLE, // 16-bit z-buffer bit depth. This is an application-lockable surface format.
+	WW3D_ZFORMAT_D32, // 32-bit z-buffer bit depth.
+	WW3D_ZFORMAT_D15S1, // 16-bit z-buffer bit depth where 15 bits are reserved for the depth channel and 1 bit is reserved for the stencil channel.
+	WW3D_ZFORMAT_D24S8, // 32-bit z-buffer bit depth using 24 bits for the depth channel and 8 bits for the stencil channel.
+	WW3D_ZFORMAT_D16, // 16-bit z-buffer bit depth.
+	WW3D_ZFORMAT_D24X8, // 32-bit z-buffer bit depth using 24 bits for the depth channel.
+	WW3D_ZFORMAT_D24X4S4, // 32-bit z-buffer bit depth using 24 bits for the depth channel and 4 bits for the stencil channel.
 #ifdef _XBOX
 	WW3D_ZFORMAT_LIN_D24S8,
 	WW3D_ZFORMAT_LIN_F24S8,
@@ -205,5 +200,3 @@ void Get_WW3D_ZFormat_Name(WW3DZFormat format, StringClass& name);
 
 unsigned Get_Num_Depth_Bits(WW3DZFormat zformat);
 unsigned Get_Num_Stencil_Bits(WW3DZFormat zformat);
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h b/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h
index 4947c7c4968..d308fcab62b 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h
@@ -34,14 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-#ifndef WW3DIDS_H
-#define WW3DIDS_H
 
 #include "saveloadids.h"
 
@@ -73,5 +66,3 @@ enum
 	WW3D_PERSIST_CHUNKID_LIGHT,
 	WW3D_PERSIST_CHUNKID_DAZZLE,
 };
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h b/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h
index 30049147fa2..2720d320ca2 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h
@@ -34,28 +34,19 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef WW3DTRIG_H
-#define WW3DTRIG_H
-
 
 /*
 ** The WW3D Library will check for debugging triggers using the following ID's
 ** Your application may install a trigger handler into the WWDebug library and then
-** watch for these ID's coming through.  Then if you wish to "trigger" one, then 
+** watch for these ID's coming through.  Then if you wish to "trigger" one, then
 ** assign a key or something to the trigger and when your trigger handler is called,
 ** check if the key is down.  The trigger can be enabled in any way you want but
 ** in practice, most things will probably be tied to keys.
 */
-enum 
+enum
 {
 	WW3D_TRIGGER_RENDER_STATS =			0x100,		// display render stats in the debug window
 	WW3D_TRIGGER_SURFACE_CACHE_STATS =	0x101,		// display surface cache info in the debug window
 	WW3D_TRIGGER_PROCESS_STATS =			0x102			// render stats for last frame only
 };
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h b/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h
index 1e37e6c11f1..e5e41826521 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __AABTREESOUNDCULLCLASS_H
-#define __AABTREESOUNDCULLCLASS_H
 
 #include "aabtreecull.h"
 
@@ -78,6 +72,3 @@ class AABTreeSoundCullClass : public AABTreeCullClass
 		virtual void	Save_Node_Contents (AABTreeNodeClass * node,ChunkSaveClass & csave)	{ };
 
 };
-
-#endif //__AABTREESOUNDCULLCLASS_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.cpp b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.cpp
index 4230983f665..19f416d4903 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.cpp
@@ -160,7 +160,7 @@ AudibleSoundClass::AudibleSoundClass (void)
 		m_LogicalSound (NULL),
 		m_StartOffset (0),
 		m_PitchFactor (1.0F)
-{	
+{
 	return ;
 }
 
@@ -233,7 +233,7 @@ AudibleSoundClass::~AudibleSoundClass (void)
 const AudibleSoundClass &
 AudibleSoundClass::operator= (const AudibleSoundClass &src)
 {
-	m_Timestamp			= src.m_Timestamp;	
+	m_Timestamp			= src.m_Timestamp;
 	m_Type				= src.m_Type;
 	m_LoopCount			= src.m_LoopCount;
 	m_LoopsLeft			= src.m_LoopsLeft;
@@ -274,7 +274,7 @@ AudibleSoundClass::Set_Buffer (SoundBufferClass *buffer)
 		m_Buffer = NULL;
 	}
 	REF_PTR_SET (m_Buffer, buffer);
-	
+
 	// Stop playing if necessary
 	bool resume = false;
 	if (m_State == STATE_PLAYING) {
@@ -346,7 +346,7 @@ AudibleSoundClass::Play (bool alloc_handle)
 		WWAudioClass::Get_Instance ()->Add_To_Playlist (this);
 		m_State				= STATE_PLAYING;
 		m_Timestamp			= ::GetTickCount ();
-		m_LoopsLeft			= m_LoopCount;		
+		m_LoopsLeft			= m_LoopCount;
 
 		// If we have a valid handle, then start playing the sample
 		if (m_SoundHandle != NULL) {
@@ -368,7 +368,7 @@ AudibleSoundClass::Play (bool alloc_handle)
 		if (m_LogicalSound == NULL && m_Definition != NULL) {
 			m_LogicalSound = m_Definition->Create_Logical ();
 		}
-		
+
 		//
 		//	Add this logical sound to the scene
 		//
@@ -509,7 +509,7 @@ AudibleSoundClass::Seek (unsigned long milliseconds)
 	MMSLockClass lock;
 
 	if ((milliseconds >= 0) && (milliseconds < m_Length)) {
-		
+
 		// Record our new position and recalculate the 'starting' timestamp
 		// from this information
 		m_CurrentPosition = milliseconds;
@@ -544,7 +544,7 @@ AudibleSoundClass::Set_Miles_Handle (MILES_HANDLE handle)
 	//	Is our data valid?
 	//
 	if (handle != INVALID_MILES_HANDLE && m_Buffer != NULL) {
-		
+
 		//
 		//	Determine which type of sound handle to create, streaming or standard 2D
 		//
@@ -588,7 +588,7 @@ AudibleSoundClass::Initialize_Miles_Handle (void)
 
 	// Do we have a valid sample handle from miles?
 	if (m_SoundHandle != NULL) {
-		
+
 		//
 		//	Initialize the handle
 		//
@@ -625,7 +625,7 @@ AudibleSoundClass::Initialize_Miles_Handle (void)
 		// Seek to the position of the sound where we last left off.
 		// For example, this sound could have gotten bumped due to a low priority,
 		// but is now back and ready to resume at the position it would have been
-		// at if it was never bumped.			
+		// at if it was never bumped.
 		Seek (m_CurrentPosition);
 
 		//
@@ -637,9 +637,9 @@ AudibleSoundClass::Initialize_Miles_Handle (void)
 		//
 		// Associate this object instance with the handle
 		//
-		m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, (S32)this);
+		m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, (void *)this);
 	}
-		
+
 	return ;
 }
 
@@ -662,19 +662,19 @@ AudibleSoundClass::Free_Miles_Handle (void)
 		//
 		m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, NULL);
 		m_SoundHandle->End_Sample ();
-		
+
 		//
 		// Remove the association between file handle and AudibleSoundClass object
 		//
 		//m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, NULL);
-		
+
 		//
 		//	Free the sound handle object
 		//
 		delete m_SoundHandle;
 		m_SoundHandle = NULL;
 	}
-		
+
 	return ;
 }
 
@@ -695,7 +695,7 @@ AudibleSoundClass::Get_Pan (void)
 	if (m_SoundHandle != NULL) {
 		m_Pan = ((float)m_SoundHandle->Get_Sample_Pan ()) / 127.0F;
 	}
-		
+
 	return m_Pan;
 }
 
@@ -722,7 +722,7 @@ AudibleSoundClass::Set_Pan (float pan)
 	if (m_SoundHandle != NULL) {
 		m_SoundHandle->Set_Sample_Pan (int(m_Pan * 127.0F));
 	}
-		
+
 	return ;
 }
 
@@ -742,10 +742,10 @@ AudibleSoundClass::Set_Pitch_Factor (float factor)
 	//
 	// Do we have a valid sample handle from miles?
 	//
-	if (m_SoundHandle != NULL) {		
-		
+	if (m_SoundHandle != NULL) {
+
 		if (m_Buffer != NULL) {
-			
+
 			//
 			//	Get the base rate of the sound and scale our playback rate
 			// based on the factor
@@ -755,7 +755,7 @@ AudibleSoundClass::Set_Pitch_Factor (float factor)
 			m_SoundHandle->Set_Sample_Playback_Rate (new_rate);
 		}
 	}
-		
+
 	return ;
 }
 
@@ -775,7 +775,7 @@ AudibleSoundClass::Get_Playback_Rate (void)
 	if (m_SoundHandle != NULL) {
 		retval = m_SoundHandle->Get_Sample_Playback_Rate ();
 	}
-		
+
 	return retval;
 }
 
@@ -794,7 +794,7 @@ AudibleSoundClass::Set_Playback_Rate (int rate_in_hz)
 	if (m_SoundHandle != NULL) {
 		m_SoundHandle->Set_Sample_Playback_Rate (rate_in_hz);
 	}
-		
+
 	return ;
 }
 
@@ -813,7 +813,7 @@ AudibleSoundClass::Get_Volume (void)
 	if (m_SoundHandle != NULL) {
 		m_Volume = ((float)m_SoundHandle->Get_Sample_Volume ()) / 127.0F;
 	}
-		
+
 	// Return the current pan value
 	return m_Volume;
 }
@@ -841,7 +841,7 @@ AudibleSoundClass::Set_Volume (float volume)
 		float real_volume = Determine_Real_Volume ();
 		m_SoundHandle->Set_Sample_Volume (int(real_volume * 127.0F));
 	}
-		
+
 	return ;
 }
 
@@ -875,7 +875,7 @@ AudibleSoundClass::Set_Loop_Count (int count)
 	if (m_SoundHandle != NULL) {
 		m_SoundHandle->Set_Sample_Loop_Count (m_LoopCount);
 	}
-		
+
 	return ;
 }
 
@@ -1021,9 +1021,9 @@ AudibleSoundClass::Determine_Real_Volume (void) const
 
 	// Is this a piece of music or is it a sound effect?
 	if (m_Type == TYPE_MUSIC) {
-		volume = volume * WWAudioClass::Get_Instance ()->Get_Music_Volume ();	
+		volume = volume * WWAudioClass::Get_Instance ()->Get_Music_Volume ();
 	} else if (m_Type == TYPE_SOUND_EFFECT) {
-		volume = volume * WWAudioClass::Get_Instance ()->Get_Sound_Effects_Volume ();	
+		volume = volume * WWAudioClass::Get_Instance ()->Get_Sound_Effects_Volume ();
 	}
 
 	// Return the 'real' volume
@@ -1085,7 +1085,7 @@ AudibleSoundClass::Cull_Sound (bool culled)
 ////////////////////////////////////////////////////////////////////////////////////////////////
 void
 AudibleSoundClass::Set_Transform (const Matrix3D &transform)
-{	
+{
 	// Update our internal transform
 	m_PrevTransform	= m_Transform;
 	m_Transform			= transform;
@@ -1119,7 +1119,7 @@ AudibleSoundClass::Add_To_Scene (bool start_playing)
 {
 	SoundSceneClass *scene = WWAudioClass::Get_Instance ()->Get_Sound_Scene ();
 	if ((scene != NULL) && (m_Scene == NULL)) {
-		
+
 		//
 		//	Add this sound to the static culling system
 		//
@@ -1185,12 +1185,12 @@ AudibleSoundClass::Re_Sync (AudibleSoundClass &src)
 	m_bDirty				= src.m_bDirty;
 	m_DropOffRadius	= src.m_DropOffRadius;
 	m_PrevTransform	= src.m_PrevTransform;
-	
+
 	Cull_Sound (src.m_IsCulled);
 	Set_Volume (src.m_Volume);
 	Set_Pan (src.m_Pan);
 	Set_Priority (src.m_Priority);
-	Set_Transform (src.m_Transform);	
+	Set_Transform (src.m_Transform);
 	Set_Listener_Transform (src.m_ListenerTransform);
 
 	if (m_State != STATE_PLAYING) {
@@ -1234,7 +1234,7 @@ void
 AudibleSoundClass::Convert_To_Filtered (void)
 {
 	if (m_pConvertedFormat == NULL) {
-		
+
 		//
 		//	Make a copy of the sound in its new format
 		//
@@ -1256,7 +1256,7 @@ AudibleSoundClass::Convert_To_Filtered (void)
 			default:
 				(*m_pConvertedFormat) = (*this);
 				break;
-		}		
+		}
 
 		Free_Miles_Handle ();
 	}
@@ -1288,7 +1288,7 @@ AudibleSoundClass::As_Converted_Format (void)
 ////////////////////////////////////////////////////////////////////////////////////////////////
 const PersistFactoryClass &
 AudibleSoundClass::Get_Factory (void) const
-{	
+{
 	return _AudibleSoundPersistFactory;
 }
 
@@ -1326,7 +1326,7 @@ AudibleSoundDefinitionClass::AudibleSoundDefinitionClass (void)
 	//
 	NAMED_EDITABLE_PARAM (AudibleSoundDefinitionClass, ParameterClass::TYPE_SOUND_FILENAME, m_Filename, "Filename");
 	NAMED_EDITABLE_PARAM (AudibleSoundDefinitionClass, ParameterClass::TYPE_FLOAT, m_DropOffRadius, "Drop-off Radius");
-	NAMED_EDITABLE_PARAM (AudibleSoundDefinitionClass, ParameterClass::TYPE_FLOAT, m_MaxVolRadius, "Max-Vol Radius");	
+	NAMED_EDITABLE_PARAM (AudibleSoundDefinitionClass, ParameterClass::TYPE_FLOAT, m_MaxVolRadius, "Max-Vol Radius");
 	NAMED_EDITABLE_PARAM (AudibleSoundDefinitionClass, ParameterClass::TYPE_BOOL, m_Is3D, "Is 3D Sound");
 	INT_EDITABLE_PARAM   (AudibleSoundDefinitionClass, m_LoopCount, 0, 1000000);
 	FLOAT_EDITABLE_PARAM (AudibleSoundDefinitionClass, m_Volume, 0, 1.0F);
@@ -1341,24 +1341,24 @@ AudibleSoundDefinitionClass::AudibleSoundDefinitionClass (void)
 	//	Logical sound params
 	//
 	NAMED_EDITABLE_PARAM (AudibleSoundDefinitionClass, ParameterClass::TYPE_BOOL, m_CreateLogical, "Create Logical Sound");
-	NAMED_EDITABLE_PARAM (AudibleSoundDefinitionClass, ParameterClass::TYPE_FLOAT, m_LogicalDropOffRadius, "Logical Drop-off Radius");	
-	NAMED_EDITABLE_PARAM (AudibleSoundDefinitionClass, ParameterClass::TYPE_FLOAT, m_LogicalNotifyDelay, "Logical Notif Delay");		
+	NAMED_EDITABLE_PARAM (AudibleSoundDefinitionClass, ParameterClass::TYPE_FLOAT, m_LogicalDropOffRadius, "Logical Drop-off Radius");
+	NAMED_EDITABLE_PARAM (AudibleSoundDefinitionClass, ParameterClass::TYPE_FLOAT, m_LogicalNotifyDelay, "Logical Notif Delay");
 
 #ifdef	PARAM_EDITING_ON
 	//
 	//	Configure the logical type mask enumeration
-	//	
+	//
 	EnumParameterClass *param = W3DNEW EnumParameterClass (&m_LogicalTypeMask);
 	param->Set_Name ("Logical Type");
 	int count = WWAudioClass::Get_Instance ()->Get_Logical_Type_Count ();
-	for (int index = 0; index < count; index ++) {					
+	for (int index = 0; index < count; index ++) {
 		StringClass display_name(0,true);
 		int id = WWAudioClass::Get_Instance ()->Get_Logical_Type (index, display_name);
 		param->Add_Value (display_name, id);
 	}
 	GENERIC_EDITABLE_PARAM(AudibleSoundDefinitionClass, param);
 #endif
-	
+
 	NAMED_EDITABLE_PARAM (AudibleSoundDefinitionClass, ParameterClass::TYPE_COLOR, m_AttenuationSphereColor, "Sphere Color");
 
 	return ;
@@ -1367,7 +1367,7 @@ AudibleSoundDefinitionClass::AudibleSoundDefinitionClass (void)
 // SKB: Put here because of conficts with CLASSID_???? with other projects.
 uint32 AudibleSoundDefinitionClass::Get_Class_ID (void) const
 {
-	return CLASSID_SOUND; 
+	return CLASSID_SOUND;
 }
 
 
@@ -1400,7 +1400,7 @@ AudibleSoundDefinitionClass::Initialize_From_Sound (AudibleSoundClass *sound)
 		//	Copy the values that we can from the sound object
 		//
 		m_Filename			= sound->Get_Filename ();
-		m_DropOffRadius	= sound->Get_DropOff_Radius ();		
+		m_DropOffRadius	= sound->Get_DropOff_Radius ();
 		m_Priority			= sound->Peek_Priority ();
 		m_Is3D				= (sound_3d != NULL);
 		m_Type				= sound->Get_Type ();
@@ -1425,7 +1425,7 @@ AudibleSoundDefinitionClass::Initialize_From_Sound (AudibleSoundClass *sound)
 ////////////////////////////////////////////////////////////////////////////////////////////////
 const PersistFactoryClass &
 AudibleSoundDefinitionClass::Get_Factory (void) const
-{	
+{
 	return _AudibleSoundDefPersistFactory;
 }
 
@@ -1466,7 +1466,7 @@ AudibleSoundDefinitionClass::Load (ChunkLoadClass &cload)
 
 	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
-			
+
 			case CHUNKID_VARIABLES:
 				retval &= Load_Variables (cload);
 				break;
@@ -1507,7 +1507,7 @@ AudibleSoundDefinitionClass::Save_Variables (ChunkSaveClass &csave)
 	WRITE_MICRO_CHUNK_WWSTRING (csave, VARID_FILENAME,			m_Filename)
 	WRITE_MICRO_CHUNK_WWSTRING (csave, VARID_DISPLAY_TEXT,	m_DisplayText)
 	WRITE_MICRO_CHUNK (csave, VARID_START_OFFSET,				m_StartOffset);
-	WRITE_MICRO_CHUNK (csave, VARID_PITCH_FACTOR,				m_PitchFactor);	
+	WRITE_MICRO_CHUNK (csave, VARID_PITCH_FACTOR,				m_PitchFactor);
 
 	//
 	//	Save the logical variables
@@ -1536,7 +1536,7 @@ AudibleSoundDefinitionClass::Load_Variables (ChunkLoadClass &cload)
 	//
 	while (cload.Open_Micro_Chunk ()) {
 		switch (cload.Cur_Micro_Chunk_ID ()) {
-			
+
 			READ_MICRO_CHUNK (cload, VARID_PRIORITY,					m_Priority)
 			READ_MICRO_CHUNK (cload, VARID_VOLUME,						m_Volume)
 			READ_MICRO_CHUNK (cload, VARID_PAN,							m_Pan)
@@ -1545,12 +1545,12 @@ AudibleSoundDefinitionClass::Load_Variables (ChunkLoadClass &cload)
 			READ_MICRO_CHUNK (cload, VARID_MAX_VOL,					m_MaxVolRadius)
 			READ_MICRO_CHUNK (cload, VARID_TYPE,						m_Type)
 			READ_MICRO_CHUNK (cload, VARID_IS3D,						m_Is3D)
-			READ_MICRO_CHUNK_WWSTRING (cload, VARID_FILENAME,		m_Filename)			
+			READ_MICRO_CHUNK_WWSTRING (cload, VARID_FILENAME,		m_Filename)
 			READ_MICRO_CHUNK_WWSTRING (cload, VARID_DISPLAY_TEXT,	m_DisplayText)
 			READ_MICRO_CHUNK (cload, VARID_LOGICAL_MASK,				m_LogicalTypeMask)
 			READ_MICRO_CHUNK (cload, VARID_LOGICAL_DELAY,			m_LogicalNotifyDelay)
 			READ_MICRO_CHUNK (cload, VARID_CREATE_LOGICAL,			m_CreateLogical)
-			READ_MICRO_CHUNK (cload, VARID_LOGICAL_DROP_OFF,		m_LogicalDropOffRadius)	
+			READ_MICRO_CHUNK (cload, VARID_LOGICAL_DROP_OFF,		m_LogicalDropOffRadius)
 			READ_MICRO_CHUNK (cload, VARID_SPHERE_COLOR,				m_AttenuationSphereColor)
 			READ_MICRO_CHUNK (cload, VARID_START_OFFSET,				m_StartOffset);
 			READ_MICRO_CHUNK (cload, VARID_PITCH_FACTOR,				m_PitchFactor);
@@ -1607,7 +1607,7 @@ AudibleSoundDefinitionClass::Create_Sound (int classid_hint) const
 	//	Did we successfully create the sound?
 	//
 	if (new_sound != NULL) {
-		
+
 		//
 		//	Configure the sound
 		//
@@ -1618,7 +1618,7 @@ AudibleSoundDefinitionClass::Create_Sound (int classid_hint) const
 		new_sound->Set_DropOff_Radius (m_DropOffRadius);
 		new_sound->Set_Definition ((AudibleSoundDefinitionClass *)this);
 		new_sound->Set_Start_Offset (m_StartOffset);
-		new_sound->Set_Pitch_Factor (m_PitchFactor);		
+		new_sound->Set_Pitch_Factor (m_PitchFactor);
 
 		if (m_Is3D) {
 			((Sound3DClass *)new_sound)->Set_Max_Vol_Radius (m_MaxVolRadius);
@@ -1640,13 +1640,13 @@ AudibleSoundDefinitionClass::Create_Logical (void)
 	LogicalSoundClass *logical_sound = NULL;
 
 	if (m_CreateLogical) {
-		
+
 		//
 		//	Create and configure the logical sound
 		//
 		logical_sound = W3DNEW LogicalSoundClass;
 		logical_sound->Set_Type_Mask (m_LogicalTypeMask);
-		logical_sound->Set_Notify_Delay (m_LogicalNotifyDelay);		
+		logical_sound->Set_Notify_Delay (m_LogicalNotifyDelay);
 		logical_sound->Set_Single_Shot (m_LoopCount != 0);
 
 		//
@@ -1656,7 +1656,7 @@ AudibleSoundDefinitionClass::Create_Logical (void)
 		if (m_LogicalDropOffRadius < 0) {
 			logical_sound->Set_DropOff_Radius (m_DropOffRadius);
 		} else {
-			logical_sound->Set_DropOff_Radius (m_LogicalDropOffRadius);			
+			logical_sound->Set_DropOff_Radius (m_LogicalDropOffRadius);
 		}
 	}
 
@@ -1693,12 +1693,12 @@ AudibleSoundClass::Save (ChunkSaveClass &csave)
 		WRITE_MICRO_CHUNK (csave, VARID_TRANSFORM, m_Transform);
 		WRITE_MICRO_CHUNK (csave, VARID_PREV_TRANSFORM, m_PrevTransform);
 		WRITE_MICRO_CHUNK (csave, VARID_IS_CULLED, m_IsCulled);
-		WRITE_MICRO_CHUNK (csave, VARID_IS_DIRTY, m_bDirty);			
+		WRITE_MICRO_CHUNK (csave, VARID_IS_DIRTY, m_bDirty);
 		WRITE_MICRO_CHUNK (csave, VARID_DROP_OFF, m_DropOffRadius);
 		WRITE_MICRO_CHUNK (csave, VARID_START_OFFSET, m_StartOffset);
 		WRITE_MICRO_CHUNK (csave, VARID_PITCH_FACTOR, m_PitchFactor);
 		WRITE_MICRO_CHUNK (csave, VARID_LISTENER_TRANSFORM, m_ListenerTransform);
-		
+
 		if (m_Buffer != NULL) {
 			WRITE_MICRO_CHUNK_STRING (csave, VARID_FILENAME, m_Buffer->Get_Filename ());
 		}
@@ -1723,7 +1723,7 @@ AudibleSoundClass::Load (ChunkLoadClass &cload)
 	using namespace AUDIBLE_SOUND_SAVELOAD;
 
 	StringClass filename(0,true);
-	while (cload.Open_Chunk ()) {		
+	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
 
 			case CHUNKID_BASE_CLASS:
@@ -1751,14 +1751,14 @@ AudibleSoundClass::Load (ChunkLoadClass &cload)
 						READ_MICRO_CHUNK (cload, VARID_TRANSFORM, m_Transform);
 						READ_MICRO_CHUNK (cload, VARID_PREV_TRANSFORM, m_PrevTransform);
 						READ_MICRO_CHUNK (cload, VARID_IS_CULLED, m_IsCulled);
-						READ_MICRO_CHUNK (cload, VARID_IS_DIRTY, m_bDirty);			
+						READ_MICRO_CHUNK (cload, VARID_IS_DIRTY, m_bDirty);
 						READ_MICRO_CHUNK (cload, VARID_DROP_OFF, m_DropOffRadius);
 						READ_MICRO_CHUNK (cload, VARID_START_OFFSET, m_StartOffset);
 						READ_MICRO_CHUNK (cload, VARID_PITCH_FACTOR, m_PitchFactor);
 						READ_MICRO_CHUNK (cload, VARID_LISTENER_TRANSFORM, m_ListenerTransform);
-						
+
 						READ_MICRO_CHUNK_WWSTRING (cload, VARID_FILENAME, filename);
-						
+
 						case VARID_THIS_PTR:
 						{
 							AudibleSoundClass *old_ptr = NULL;
@@ -1780,7 +1780,7 @@ AudibleSoundClass::Load (ChunkLoadClass &cload)
 	//
 	//	Reconstruct the sound buffer we had before we saved
 	//
-	if (filename.Get_Length () > 0) {
+	if (!filename.Is_Empty()) {
 		bool is_3d = (As_Sound3DClass () != NULL);
 		SoundBufferClass *buffer = WWAudioClass::Get_Instance ()->Get_Sound_Buffer (filename, is_3d);
 		Set_Buffer (buffer);
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h
index 3ccad11658a..bec8f15b5a3 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h
@@ -34,24 +34,19 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SOUNDOBJ_H
-#define __SOUNDOBJ_H
 
 #pragma warning (push, 3)
 #include "mss.h"
 #pragma warning (pop)
 
 //#include <malloc.h>
+#include "always.h"
 #include "vector3.h"
 #include "matrix3d.h"
-#include "refcount.h"
-#include "RAWFILE.H"
+#include "RAWFILE.h"
 #include "SoundSceneObj.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "wwstring.h"
 #include "definition.h"
 
@@ -216,7 +211,7 @@ class AudibleSoundClass : public SoundSceneObjClass
 		//////////////////////////////////////////////////////////////////////
 		virtual int					Get_Playback_Rate (void);
 		virtual void				Set_Playback_Rate (int rate_in_hz);
-		
+
 		virtual float				Get_Pitch_Factor (void)						{ return m_PitchFactor; }
 		virtual void				Set_Pitch_Factor (float factor);
 
@@ -416,13 +411,13 @@ class AudibleSoundDefinitionClass : public DefinitionClass
 	virtual const Vector3 &					Get_Sphere_Color (void) const		{ return m_AttenuationSphereColor; }
 	virtual float								Get_Volume (void) const				{ return m_Volume; }
 	virtual float								Get_Start_Offset (void) const		{ return m_StartOffset; }
-	virtual float								Get_Pitch_Factor (void) const		{ return m_PitchFactor; }	
+	virtual float								Get_Pitch_Factor (void) const		{ return m_PitchFactor; }
 
 	virtual void								Set_Volume (float volume)			{ m_Volume = volume; }
 	virtual void								Set_Max_Vol_Radius (float radius){ m_MaxVolRadius = radius; }
 	virtual void								Set_DropOff_Radius (float radius){ m_DropOffRadius = radius; }
 	virtual void								Set_Start_Offset (float offset)	{ m_StartOffset = offset; }
-	virtual void								Set_Pitch_Factor (float factor)	{ m_PitchFactor = factor; }	
+	virtual void								Set_Pitch_Factor (float factor)	{ m_PitchFactor = factor; }
 
 	// Logical sound creation
 	virtual LogicalSoundClass *			Create_Logical (void);
@@ -459,6 +454,3 @@ class AudibleSoundDefinitionClass : public DefinitionClass
 	// Misc UI info
 	Vector3				m_AttenuationSphereColor;
 };
-
-
-#endif //__SOUNDOBJ_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h
index c208e783549..0a268f93f4a 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __AUDIO_EVENTS_H
-#define __AUDIO_EVENTS_H
 
 #include "simplevec.h"
 #include "bittype.h"
@@ -131,11 +126,11 @@ template <class T>
 struct AUDIO_CALLBACK_STRUCT
 {
 	T					callback_ptr;
-	uint32			user_data;		
+	uint32			user_data;
 
 	AUDIO_CALLBACK_STRUCT (void)
 		:	callback_ptr (NULL), user_data (0)	{}
-	
+
 	AUDIO_CALLBACK_STRUCT (T _ptr, uint32 _data)
 		:	callback_ptr (_ptr), user_data (_data) {}
 
@@ -209,7 +204,3 @@ AudioCallbackListClass<T>::Remove_Callback (T pointer)
 
 	return ;
 }
-
-
-#endif //__AUDIO_EVENTS_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.cpp b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.cpp
index 47ba2457b56..3915556f3c0 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.cpp
@@ -203,12 +203,12 @@ DynamicAudioSaveLoadClass::Save (ChunkSaveClass &csave)
 	//
 	SoundSceneClass *scene = WWAudioClass::Get_Instance ()->Get_Sound_Scene ();
 	if (scene != NULL) {
-		
+
 		csave.Begin_Chunk (CHUNKID_DYNAMIC_VARIABLES);
 			float global_scale = LogicalListenerClass::Get_Global_Scale ();
 			WRITE_MICRO_CHUNK (csave, VARID_LOGICAL_LISTENER_GLOBAL_SCALE, global_scale);
 		csave.End_Chunk ();
-		
+
 		csave.Begin_Chunk (CHUNKID_DYNAMIC_SCENE);
 			scene->Save_Dynamic (csave);
 		csave.End_Chunk ();
@@ -237,7 +237,7 @@ DynamicAudioSaveLoadClass::Load (ChunkLoadClass &cload)
 				//
 				while (cload.Open_Micro_Chunk ()) {
 					switch (cload.Cur_Micro_Chunk_ID ()) {
-						
+
 						//
 						//	Load the global scale for logical listeners
 						//
@@ -247,7 +247,7 @@ DynamicAudioSaveLoadClass::Load (ChunkLoadClass &cload)
 							LOAD_MICRO_CHUNK (cload, global_scale);
 							LogicalListenerClass::Set_Global_Scale (global_scale);
 							break;
-						}						
+						}
 					}
 
 					cload.Close_Micro_Chunk ();
@@ -272,4 +272,4 @@ DynamicAudioSaveLoadClass::Load (ChunkLoadClass &cload)
 	}
 
 	return retval;
-}
\ No newline at end of file
+}
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h
index f33b6af44a7..bccf64bc296 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h
@@ -34,16 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __AUDIO_SAVE_LOAD_H
-#define __AUDIO_SAVE_LOAD_H
 
 #include "saveloadsubsystem.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "bittype.h"
 
 
@@ -60,7 +54,7 @@ extern class DynamicAudioSaveLoadClass _DynamicAudioSaveLoadSubsystem;
 class StaticAudioSaveLoadClass : public SaveLoadSubSystemClass
 {
 public:
-	
+
 	//////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
 	//////////////////////////////////////////////////////////////
@@ -70,10 +64,10 @@ class StaticAudioSaveLoadClass : public SaveLoadSubSystemClass
 	//////////////////////////////////////////////////////////////
 	//	Public methods
 	//////////////////////////////////////////////////////////////
-	
+
 	// From SaveLoadSubSystemClass
 	virtual uint32				Chunk_ID (void) const;
-	
+
 protected:
 
 	//////////////////////////////////////////////////////////////
@@ -94,7 +88,7 @@ class StaticAudioSaveLoadClass : public SaveLoadSubSystemClass
 class DynamicAudioSaveLoadClass : public SaveLoadSubSystemClass
 {
 public:
-	
+
 	//////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
 	//////////////////////////////////////////////////////////////
@@ -104,10 +98,10 @@ class DynamicAudioSaveLoadClass : public SaveLoadSubSystemClass
 	//////////////////////////////////////////////////////////////
 	//	Public methods
 	//////////////////////////////////////////////////////////////
-	
+
 	// From SaveLoadSubSystemClass
 	virtual uint32				Chunk_ID (void) const;
-	
+
 protected:
 
 	//////////////////////////////////////////////////////////////
@@ -121,8 +115,3 @@ class DynamicAudioSaveLoadClass : public SaveLoadSubSystemClass
 	//bool							Save_Micro_Chunks (ChunkSaveClass &csave);
 	//bool							Load_Micro_Chunks (ChunkLoadClass &cload);
 };
-
-
-#endif //__AUDIO_SAVE_LOAD_H
-
-
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.cpp b/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.cpp
index 0379e906cf6..4228bb65b09 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.cpp
@@ -57,8 +57,8 @@ SimplePersistFactoryClass<FilteredSoundClass, CHUNKID_FILTERED_SOUND> _FilteredS
 //
 /////////////////////////////////////////////////////////////////////////////////
 FilteredSoundClass::FilteredSoundClass (void)
-	:	m_hFilter (INVALID_MILES_HANDLE)
-{	
+	:	m_hFilter ((HPROVIDER)INVALID_MILES_HANDLE)
+{
 	return ;
 }
 
@@ -69,7 +69,7 @@ FilteredSoundClass::FilteredSoundClass (void)
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////
 FilteredSoundClass::FilteredSoundClass (const FilteredSoundClass &src)
-	:	m_hFilter (INVALID_MILES_HANDLE),
+	:	m_hFilter ((HPROVIDER)INVALID_MILES_HANDLE),
 		SoundPseudo3DClass (src)
 {
 	(*this) = src;
@@ -83,7 +83,7 @@ FilteredSoundClass::FilteredSoundClass (const FilteredSoundClass &src)
 //
 /////////////////////////////////////////////////////////////////////////////////
 FilteredSoundClass::~FilteredSoundClass (void)
-{	
+{
 	return ;
 }
 
@@ -113,8 +113,8 @@ FilteredSoundClass::Initialize_Miles_Handle (void)
 	SoundPseudo3DClass::Initialize_Miles_Handle ();
 	m_hFilter = WWAudioClass::Get_Instance ()->Get_Reverb_Filter ();
 	if ((m_SoundHandle != NULL) &&
-		 (m_hFilter != INVALID_MILES_HANDLE)) {
-		
+		 (m_hFilter != (HPROVIDER)INVALID_MILES_HANDLE)) {
+
 		//
 		//	Pass the filter onto the sample
 		//
@@ -138,7 +138,7 @@ FilteredSoundClass::Initialize_Miles_Handle (void)
 														"Reverb decay time",
 														&reverb_decay);
 	}
-	
+
 	Update_Volume ();
 	return ;
 }
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h b/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h
index 585ebd3c3af..c200a290f5d 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __FILTERED_SOUND_H
-#define __FILTERED_SOUND_H
-
 
 #include "SoundPseudo3D.h"
 
@@ -75,7 +69,7 @@ class FilteredSoundClass : public SoundPseudo3DClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Conversion methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual FilteredSoundClass *	As_FilteredSoundClass (void) { return this; }
 
 		//////////////////////////////////////////////////////////////////////
@@ -90,7 +84,7 @@ class FilteredSoundClass : public SoundPseudo3DClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Handle information
-		//////////////////////////////////////////////////////////////////////				
+		//////////////////////////////////////////////////////////////////////
 		virtual void				Initialize_Miles_Handle (void);
 
 	private:
@@ -100,7 +94,3 @@ class FilteredSoundClass : public SoundPseudo3DClass
 		//////////////////////////////////////////////////////////////////////
 		HPROVIDER    m_hFilter;
 };
-
-
-#endif //__FILTERED_SOUND_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Listener.cpp b/Core/Libraries/Source/WWVegas/WWAudio/Listener.cpp
index 9366cc076df..9797e5e8989 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/Listener.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/Listener.cpp
@@ -76,7 +76,7 @@ Listener3DClass::Initialize_Miles_Handle (void)
 
 	// Do we have a valid sample handle from miles?
 	if (m_SoundHandle != NULL) {
-		
+
 		::AIL_set_3D_position (m_SoundHandle->Get_H3DSAMPLE (), 0.0F, 0.0F, 0.0F);
 		::AIL_set_3D_orientation (m_SoundHandle->Get_H3DSAMPLE (),
 				0.0F, 0.0F, 1.0F,
@@ -84,9 +84,9 @@ Listener3DClass::Initialize_Miles_Handle (void)
 
 
 		// Associate this object instance with the handle
-		m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, (S32)this);
+		m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, (void *)this);
 	}
-		
+
 	return ;
 }
 
@@ -123,7 +123,7 @@ Listener3DClass::Free_Miles_Handle (void)
 void
 Listener3DClass::On_Added_To_Scene (void)
 {
-	Allocate_Miles_Handle ();		
+	Allocate_Miles_Handle ();
 	return ;
 }
 
@@ -136,7 +136,7 @@ Listener3DClass::On_Added_To_Scene (void)
 void
 Listener3DClass::On_Removed_From_Scene (void)
 {
-	Free_Miles_Handle ();		
+	Free_Miles_Handle ();
 	return ;
 }
 
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Listener.h b/Core/Libraries/Source/WWVegas/WWAudio/Listener.h
index bdb52f286f0..8ecfdac993c 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/Listener.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/Listener.h
@@ -34,14 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __LISTENER_H
-#define __LISTENER_H
-
 
 #include "Sound3D.h"
 
@@ -75,12 +68,12 @@ class Listener3DClass : public Sound3DClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Conversion methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual Listener3DClass *	As_Listener3DClass (void) 	{ return this; }
 
 		//////////////////////////////////////////////////////////////////////
 		//	Initialization methods
-		//////////////////////////////////////////////////////////////////////				
+		//////////////////////////////////////////////////////////////////////
 		virtual void			On_Added_To_Scene (void);
 		virtual void			On_Removed_From_Scene (void);
 
@@ -105,7 +98,7 @@ class Listener3DClass : public Sound3DClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Velocity methods
-		//////////////////////////////////////////////////////////////////////				
+		//////////////////////////////////////////////////////////////////////
 		virtual void			Set_Velocity (const Vector3 &velocity) { }
 
 
@@ -131,7 +124,7 @@ class Listener3DClass : public Sound3DClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Handle information
-		//////////////////////////////////////////////////////////////////////				
+		//////////////////////////////////////////////////////////////////////
 		virtual void			Initialize_Miles_Handle (void);
 		virtual void			Allocate_Miles_Handle (void);
 		virtual void			Free_Miles_Handle (void);
@@ -142,6 +135,3 @@ class Listener3DClass : public Sound3DClass
 		//	Private member data
 		//////////////////////////////////////////////////////////////////////
 };
-
-
-#endif //__LISTENER_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.cpp b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.cpp
index 5ee4612da16..d9227a7578b 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.cpp
@@ -108,12 +108,12 @@ LogicalListenerClass::Add_To_Scene (bool /*start_playing*/)
 {
 	SoundSceneClass *scene = WWAudioClass::Get_Instance ()->Get_Sound_Scene ();
 	if ((scene != NULL) && (m_Scene == NULL)) {
-		
+
 		//
 		//	Add this listener to the culling system
 		//
 		m_Scene = scene;
-		scene->Add_Logical_Listener (this);		
+		scene->Add_Logical_Listener (this);
 	}
 
 	return ;
@@ -166,7 +166,7 @@ LogicalListenerClass::Save (ChunkSaveClass &csave)
 		SoundSceneObjClass::Save (csave);
 	csave.End_Chunk ();
 
-	csave.Begin_Chunk (CHUNKID_VARIABLES);		
+	csave.Begin_Chunk (CHUNKID_VARIABLES);
 
 		WRITE_MICRO_CHUNK (csave, VARID_SCALE, m_Scale);
 		WRITE_MICRO_CHUNK (csave, VARID_TYPE_MASK, m_TypeMask);
@@ -185,7 +185,7 @@ LogicalListenerClass::Save (ChunkSaveClass &csave)
 bool
 LogicalListenerClass::Load (ChunkLoadClass &cload)
 {
-	while (cload.Open_Chunk ()) {		
+	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
 
 			case CHUNKID_BASE_CLASS:
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h
index 44da18bcb39..780e40816d9 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h
@@ -30,12 +30,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __LOGICAL_LISTENER_H
-#define __LOGICAL_LISTENER_H
 
 #include "SoundSceneObj.h"
 #include "bittype.h"
@@ -66,13 +61,13 @@ class LogicalListenerClass : public SoundSceneObjClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	LogicalSoundClass specific
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual void			Set_Type_Mask (uint32 mask = 0)	{ m_TypeMask = mask; }
 		virtual uint32			Get_Type_Mask (void) const			{ return m_TypeMask; }
 
 		//////////////////////////////////////////////////////////////////////
 		//	Position/direction methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual void			Set_Position (const Vector3 &position)		{ m_Position = position; }
 		virtual Vector3			Get_Position (void) const						{ return m_Position; }
 
@@ -110,7 +105,7 @@ class LogicalListenerClass : public SoundSceneObjClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	From PersistClass
-		//////////////////////////////////////////////////////////////////////				
+		//////////////////////////////////////////////////////////////////////
 		bool									Save (ChunkSaveClass &csave);
 		bool									Load (ChunkLoadClass &cload);
 		const PersistFactoryClass &	Get_Factory (void) const;
@@ -118,7 +113,7 @@ class LogicalListenerClass : public SoundSceneObjClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Timestamp
-		//////////////////////////////////////////////////////////////////////				
+		//////////////////////////////////////////////////////////////////////
 		uint32					Get_Timestamp (void) const		{ return m_Timestamp; }
 		void					Set_Timestamp (int timestamp)	{ m_Timestamp = timestamp; }
 
@@ -147,7 +142,3 @@ class LogicalListenerClass : public SoundSceneObjClass
 		static uint32			m_OldestTimestamp;
 		static uint32			m_NewestTimestamp;
 };
-
-
-#endif //__LOGICAL_LISTENER_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp
index aaab64d9bbd..593e407de80 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp
@@ -105,12 +105,12 @@ LogicalSoundClass::Add_To_Scene (bool /*start_playing*/)
 {
 	SoundSceneClass *scene = WWAudioClass::Get_Instance ()->Get_Sound_Scene ();
 	if ((scene != NULL) && (m_Scene == NULL)) {
-		
+
 		//
 		//	Add this sound to the culling system
 		//
 		m_Scene = scene;
-		scene->Add_Logical_Sound (this, m_IsSingleShot);		
+		scene->Add_Logical_Sound (this, m_IsSingleShot);
 	}
 
 	return ;
@@ -170,8 +170,8 @@ LogicalSoundClass::On_Frame_Update (unsigned int milliseconds)
 	//
 	// Update the sound's position if its linked to a render object
 	//
-	Apply_Auto_Position ();	
-	return SoundSceneObjClass::On_Frame_Update (milliseconds);;
+	Apply_Auto_Position ();
+	return SoundSceneObjClass::On_Frame_Update (milliseconds);
 }
 
 
@@ -199,7 +199,7 @@ LogicalSoundClass::Save (ChunkSaveClass &csave)
 		SoundSceneObjClass::Save (csave);
 	csave.End_Chunk ();
 
-	csave.Begin_Chunk (CHUNKID_VARIABLES);		
+	csave.Begin_Chunk (CHUNKID_VARIABLES);
 
 		WRITE_MICRO_CHUNK (csave, VARID_DROP_OFF_RADIUS, m_DropOffRadius);
 		WRITE_MICRO_CHUNK (csave, VARID_IS_SINGLE_SHOT, m_IsSingleShot);
@@ -222,7 +222,7 @@ LogicalSoundClass::Save (ChunkSaveClass &csave)
 bool
 LogicalSoundClass::Load (ChunkLoadClass &cload)
 {
-	while (cload.Open_Chunk ()) {		
+	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
 
 			case CHUNKID_BASE_CLASS:
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h
index 6341cff5f8c..fc25c02062e 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h
@@ -30,12 +30,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __LOGICAL_SOUND_H
-#define __LOGICAL_SOUND_H
 
 #include "SoundSceneObj.h"
 #include "bittype.h"
@@ -70,7 +65,7 @@ class LogicalSoundClass : public SoundSceneObjClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	LogicalSoundClass specific
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual bool			Is_Single_Shot (void) const			{ return m_IsSingleShot; }
 		virtual void			Set_Single_Shot (bool single_shot)	{ m_IsSingleShot = single_shot; }
 
@@ -91,7 +86,7 @@ class LogicalSoundClass : public SoundSceneObjClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Position/direction methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual void			Set_Position (const Vector3 &position)		{ m_Position = position; }
 		virtual Vector3		Get_Position (void) const						{ return m_Position; }
 
@@ -122,7 +117,7 @@ class LogicalSoundClass : public SoundSceneObjClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	From PersistClass
-		//////////////////////////////////////////////////////////////////////				
+		//////////////////////////////////////////////////////////////////////
 		bool									Save (ChunkSaveClass &csave);
 		bool									Load (ChunkLoadClass &cload);
 		const PersistFactoryClass &	Get_Factory (void) const;
@@ -147,7 +142,3 @@ class LogicalSoundClass : public SoundSceneObjClass
 		uint32					m_NotifyDelayInMS;
 		uint32					m_LastNotification;
 };
-
-
-#endif //__LOGICAL_SOUND_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h b/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h
index a09da0c9c24..a7e4fa54e39 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h
@@ -30,14 +30,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef __PRIORITY_VECTOR_H
-#define __PRIORITY_VECTOR_H
-
-#include "Vector.H"
+#include "Vector.h"
 
 ////////////////////////////////////////////////////////////////////
 //
@@ -71,9 +66,9 @@ class PriorityVectorClass : public DynamicVectorClass<T>
 template <class T>
 __inline bool PriorityVectorClass<T>::Process_Head (T &object)
 {
-	bool retval = false;	
+	bool retval = false;
 	if (Vector != NULL) {
-		
+
 		// Pass the object back to the caller
 		object = Vector[0];
 
@@ -95,7 +90,7 @@ __inline bool PriorityVectorClass<T>::Process_Head (T &object)
 
 ////////////////////////////////////////////////////////////////////
 //
-//	Add_Low 
+//	Add_Low
 //
 ////////////////////////////////////////////////////////////////////
 template <class T>
@@ -115,6 +110,3 @@ __inline bool PriorityVectorClass<T>::Add_High (T const &object)
 {
 	return DynamicVectorClass<T>::Add_Head (object);
 }
-
-#endif //__PRIORITY_VECTOR_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.cpp b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.cpp
index cc5a9aeeb1e..d8870718086 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.cpp
@@ -66,7 +66,7 @@ enum
 	VARID_CURR_VEL,
 	VARID_XXX1,
 	VARID_XXX2,
-	VARID_MAX_VOL_RADIUS,	
+	VARID_MAX_VOL_RADIUS,
 	VARID_IS_STATIC,
 };
 
@@ -78,7 +78,7 @@ enum
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////
 Sound3DClass::Sound3DClass (void)
-	: m_bAutoCalcVel (true),	  
+	: m_bAutoCalcVel (true),
 	  m_CurrentVelocity (0, 0, 0),
 	  m_MaxVolRadius (0),
 	  m_LastUpdate (0),
@@ -95,7 +95,7 @@ Sound3DClass::Sound3DClass (void)
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////
 Sound3DClass::Sound3DClass (const Sound3DClass &src)
-	: m_bAutoCalcVel (true),	  
+	: m_bAutoCalcVel (true),
 	  m_CurrentVelocity (0, 0, 0),
 	  m_MaxVolRadius (0),
 	  m_LastUpdate (0),
@@ -114,7 +114,7 @@ Sound3DClass::Sound3DClass (const Sound3DClass &src)
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////
 Sound3DClass::~Sound3DClass (void)
-{	
+{
  	Free_Miles_Handle ();
 	return ;
 }
@@ -152,7 +152,7 @@ Sound3DClass::Play (bool alloc_handle)
 	if (m_State != STATE_PLAYING) {
 		m_LastUpdate = ::GetTickCount ();
 	}
-	
+
 	// Allow the base class to process this call
 	return AudibleSoundClass::Play (m_IsCulled == false);
 }
@@ -172,7 +172,7 @@ Sound3DClass::On_Frame_Update (unsigned int milliseconds)
 		m_Scene->Update_Sound (m_PhysWrapper);
 		m_bDirty = false;
 	}
-	
+
 	//
 	// Update the sound's position if its linked to a render object
 	//
@@ -198,7 +198,7 @@ Sound3DClass::On_Frame_Update (unsigned int milliseconds)
 		//
 		if (last_pos != curr_pos) {
 			Vector3 curr_vel;
-			
+
 			//
 			//	Extrapolate our current velocity given the last time slice and the distance
 			// we moved.
@@ -302,7 +302,7 @@ Sound3DClass::Update_Miles_Transform (void)
 		Matrix3D listener_space_tm;
 		listener_space_tm.mul(world_to_listener_tm, m_Transform);
 #endif
-		
+
 		//
 		// Pass the sound's position onto miles
 		//
@@ -314,7 +314,7 @@ Sound3DClass::Update_Miles_Transform (void)
 		//
 		Vector3 facing	= listener_space_tm.Get_X_Vector ();
 		Vector3 up		= listener_space_tm.Get_Z_Vector ();
-		
+
 		::AIL_set_3D_orientation (m_SoundHandle->Get_H3DSAMPLE (),
 										  -facing.Y,
 										  facing.Z,
@@ -344,7 +344,7 @@ Sound3DClass::Set_Position (const Vector3 &position)
 		//
 		// SKB: 4/13/01 - Confirmed to be OK by Pat Smith.
 		//  Took Set_Transform() outside of condition because even if sound is
-		//  not playing I need to be able to change it's position.  
+		//  not playing I need to be able to change it's position.
 		//  I had a problem that sounds would never be added to the scene because
 		//  their positions stayed at 0,0,0 even after this Set_Postion() call.
 		m_PrevTransform = m_Transform;
@@ -355,16 +355,16 @@ Sound3DClass::Set_Position (const Vector3 &position)
 			m_PrevTransform = m_Transform;
 			m_IsTransformInitted = true;
 		}
-	
+
 		if (m_SoundHandle != NULL) {
-			
+
 			//
 			//	Transform the sound's position into 'listener-space'
 			//
 			Vector3 sound_pos	= position;
 			Vector3 listener_space_pos;
 			Matrix3D::Inverse_Transform_Vector (m_ListenerTransform, sound_pos, &listener_space_pos);
-			
+
 			//
 			//	Update the object's position inside of Miles
 			//
@@ -372,7 +372,7 @@ Sound3DClass::Set_Position (const Vector3 &position)
 					listener_space_pos.Z, listener_space_pos.X);
 		}
 	}
-	
+
 	return ;
 }
 
@@ -393,9 +393,9 @@ Sound3DClass::Set_Velocity (const Vector3 &velocity)
 	//
 	// Pass the sound's velocity onto miles
 	//
-	if (m_SoundHandle != NULL) {		
-		
-		//WWDEBUG_SAY (("Current Velocity: %.2f %.2f %.2f\n", m_CurrentVelocity.X, m_CurrentVelocity.Y, m_CurrentVelocity.Z));
+	if (m_SoundHandle != NULL) {
+
+		//WWDEBUG_SAY (("Current Velocity: %.2f %.2f %.2f", m_CurrentVelocity.X, m_CurrentVelocity.Y, m_CurrentVelocity.Z));
 		::AIL_set_3D_velocity_vector (m_SoundHandle->Get_H3DSAMPLE (),
 												-m_CurrentVelocity.Y,
 												m_CurrentVelocity.Z,
@@ -460,7 +460,7 @@ Sound3DClass::Set_Max_Vol_Radius (float radius)
 void
 Sound3DClass::Initialize_Miles_Handle (void)
 {
-	MMSLockClass lock;	
+	MMSLockClass lock;
 
 	// If this sound is already playing, then update its
 	// playing position to make sure we really should
@@ -497,7 +497,7 @@ Sound3DClass::Initialize_Miles_Handle (void)
 													m_DropOffRadius,
 													(m_MaxVolRadius > 1.0F) ? m_MaxVolRadius : 1.0F);
 
-		
+
 		//
 		//	Assign the 3D effects level accordingly (for reverb, etc)
 		//
@@ -532,9 +532,9 @@ Sound3DClass::Initialize_Miles_Handle (void)
 		Seek (m_CurrentPosition);
 
 		// Associate this object instance with the handle
-		m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, (S32)this);
+		m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, (void *)this);
 	}
-		
+
 	return ;
 }
 
@@ -570,8 +570,8 @@ Sound3DClass::Add_To_Scene (bool start_playing)
 {
 	SoundSceneClass *scene = WWAudioClass::Get_Instance ()->Get_Sound_Scene ();
 	if ((scene != NULL) && (m_Scene == NULL)) {
-		
-		// Determine what culling system this sound belongs to		
+
+		// Determine what culling system this sound belongs to
 		if (m_IsStatic) {
 			scene->Add_Static_Sound (this, start_playing);
 		} else {
@@ -593,7 +593,7 @@ void
 Sound3DClass::Remove_From_Scene (void)
 {
 	if (m_Scene != NULL) {
-		
+
 		// Determine what culling system this sound belongs to
 		if (m_IsStatic) {
 			m_Scene->Remove_Static_Sound (this);
@@ -647,13 +647,13 @@ Sound3DClass::Save (ChunkSaveClass &csave)
 	csave.End_Chunk ();
 
 	csave.Begin_Chunk (CHUNKID_VARIABLES);
-		
+
 		WRITE_MICRO_CHUNK (csave, VARID_AUTO_CALC_VEL, m_bAutoCalcVel);
 		WRITE_MICRO_CHUNK (csave, VARID_CURR_VEL, m_CurrentVelocity);
 
 		WRITE_MICRO_CHUNK (csave, VARID_MAX_VOL_RADIUS, m_MaxVolRadius);
 		WRITE_MICRO_CHUNK (csave, VARID_IS_STATIC, m_IsStatic);
-		
+
 	csave.End_Chunk ();
 
 	return true;
@@ -668,7 +668,7 @@ Sound3DClass::Save (ChunkSaveClass &csave)
 bool
 Sound3DClass::Load (ChunkLoadClass &cload)
 {
-	while (cload.Open_Chunk ()) {		
+	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
 
 			case CHUNKID_BASE_CLASS:
@@ -686,7 +686,7 @@ Sound3DClass::Load (ChunkLoadClass &cload)
 						READ_MICRO_CHUNK (cload, VARID_AUTO_CALC_VEL, m_bAutoCalcVel);
 						READ_MICRO_CHUNK (cload, VARID_CURR_VEL, m_CurrentVelocity);
 						READ_MICRO_CHUNK (cload, VARID_MAX_VOL_RADIUS, m_MaxVolRadius);
-						READ_MICRO_CHUNK (cload, VARID_IS_STATIC, m_IsStatic);							
+						READ_MICRO_CHUNK (cload, VARID_IS_STATIC, m_IsStatic);
 					}
 
 					cload.Close_Micro_Chunk ();
@@ -719,7 +719,7 @@ Sound3DClass::Set_Miles_Handle (MILES_HANDLE handle)
 	//	Is our data valid?
 	//
 	if (handle != INVALID_MILES_HANDLE && m_Buffer != NULL) {
-		
+
 		//
 		//	Configure the sound handle
 		//
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h
index 492de6ad9a1..f3c036f5fc4 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SOUND3DOBJ_H
-#define __SOUND3DOBJ_H
 
 #include "AudibleSound.h"
 #include "mempool.h"
@@ -88,7 +83,7 @@ class Sound3DClass : public AudibleSoundClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Conversion methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual Sound3DClass *	As_Sound3DClass (void) { return this; }
 
 		//////////////////////////////////////////////////////////////////////
@@ -105,11 +100,11 @@ class Sound3DClass : public AudibleSoundClass
 		//	Scene integration
 		//////////////////////////////////////////////////////////////////////
 		virtual void			Add_To_Scene (bool start_playing = true);
-		virtual void			Remove_From_Scene (void);		
+		virtual void			Remove_From_Scene (void);
 
 		//////////////////////////////////////////////////////////////////////
 		//	Position/direction methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual void			Set_Position (const Vector3 &position);
 		virtual Vector3		Get_Position (void) const							{ return m_Transform.Get_Translation (); }
 
@@ -120,8 +115,8 @@ class Sound3DClass : public AudibleSoundClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Velocity methods
-		//////////////////////////////////////////////////////////////////////		
-		
+		//////////////////////////////////////////////////////////////////////
+
 		//
 		// The velocity settings are in meters per millisecond.
 		//
@@ -135,7 +130,7 @@ class Sound3DClass : public AudibleSoundClass
 		//////////////////////////////////////////////////////////////////////
 		//	Attenuation settings
 		//////////////////////////////////////////////////////////////////////
-		
+
 		//
 		// The maximum-volume radius is the distance from the sound-emitter where
 		//	it seems as loud as it is going to get.  Volume does not increase after this
@@ -165,25 +160,25 @@ class Sound3DClass : public AudibleSoundClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Handle information
-		//////////////////////////////////////////////////////////////////////				
+		//////////////////////////////////////////////////////////////////////
 		virtual SoundCullObjClass *	Peek_Cullable_Wrapper (void) const	{ return m_PhysWrapper; }
 		virtual void						Set_Cullable_Wrapper (SoundCullObjClass *obj) { m_PhysWrapper = obj; }
 
 		//////////////////////////////////////////////////////////////////////
 		//	Update methods
 		//////////////////////////////////////////////////////////////////////
-		virtual bool					On_Frame_Update (unsigned int milliseconds);		
+		virtual bool					On_Frame_Update (unsigned int milliseconds);
 
 		//////////////////////////////////////////////////////////////////////
 		//	Handle information
-		//////////////////////////////////////////////////////////////////////				
+		//////////////////////////////////////////////////////////////////////
 		virtual void			Set_Miles_Handle (MILES_HANDLE handle);
 		virtual void			Initialize_Miles_Handle (void);
-		virtual void			Allocate_Miles_Handle (void);		
+		virtual void			Allocate_Miles_Handle (void);
 
 		//////////////////////////////////////////////////////////////////////
 		//	Event handling
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual void			On_Loop_End (void);
 
 		//////////////////////////////////////////////////////////////////////
@@ -191,11 +186,8 @@ class Sound3DClass : public AudibleSoundClass
 		//////////////////////////////////////////////////////////////////////
 		bool						m_IsTransformInitted;
 		bool						m_bAutoCalcVel;
-		Vector3					m_CurrentVelocity;		
-		float						m_MaxVolRadius;		
+		Vector3					m_CurrentVelocity;
+		float						m_MaxVolRadius;
 		bool						m_IsStatic;
 		unsigned int			m_LastUpdate;
 };
-
-
-#endif //__SOUND3DOBJ_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.cpp b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.cpp
index b77f3e3461b..3896d68c5a4 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.cpp
@@ -36,7 +36,7 @@
 
 
 #include "SoundBuffer.h"
-#include "RAWFILE.H"
+#include "RAWFILE.h"
 #include "wwdebug.h"
 #include "Utils.h"
 #include "ffactory.h"
@@ -52,7 +52,7 @@ class FileMappingClass
 public:
 	StringClass			Filename;
 	HANDLE				FileMapping;
-	int					RefCount;	
+	int					RefCount;
 
 	bool operator== (const FileMappingClass &src)	{ return false; }
 	bool operator!= (const FileMappingClass &src)	{ return false; }
@@ -100,10 +100,8 @@ void
 SoundBufferClass::Free_Buffer (void)
 {
 	// Free the buffer's memory
-	if (m_Buffer != NULL) {
-		delete [] m_Buffer;
-		m_Buffer = NULL;
-	}
+	delete [] m_Buffer;
+	m_Buffer = NULL;
 
 	// Make sure we reset the length
 	m_Length = 0L;
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h
index e7e6d41251d..45c48ad00f2 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h
@@ -34,19 +34,13 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SOUNDBUFFER_H
-#define __SOUNDBUFFER_H
 
 #pragma warning (push, 3)
 #include "mss.h"
 #pragma warning (pop)
 
-#include "refcount.h"
+#include "always.h"
 
 
 // Forward declarations
@@ -88,7 +82,7 @@ class SoundBufferClass : public RefCountClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Buffer access
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual unsigned char *	Get_Raw_Buffer (void) const	{ return m_Buffer; }
 		virtual unsigned long	Get_Raw_Length (void) const	{ return m_Length; }
 
@@ -118,7 +112,7 @@ class SoundBufferClass : public RefCountClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Protected member data
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		unsigned char *		m_Buffer;
 		unsigned long			m_Length;
 		char *					m_Filename;
@@ -173,8 +167,5 @@ class StreamSoundBufferClass : public SoundBufferClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Protected member data
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 };
-
-
-#endif //__SOUNDBUFFER_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h
index 98e54ab7ab7..1d215304146 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SOUND_CHUNK_IDS_H
-#define __SOUND_CHUNK_IDS_H
 
 #include "saveloadids.h"
 #include "definitionclassids.h"
@@ -77,6 +71,3 @@ enum
 {
 	CLASSID_SOUND_DEF			= CLASSID_SOUND,
 };
-
-
-#endif //__SOUND_CHUNK_IDS_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h
index ab53a473a49..299a37aac94 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h
@@ -34,17 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SOUNDCULLOBJ_H
-#define __SOUNDCULLOBJ_H
 
+#include "always.h"
 #include "SoundSceneObj.h"
 #include "cullsys.h"
-#include "refcount.h"
 #include "mempool.h"
 #include "multilist.h"
 
@@ -92,10 +86,10 @@ class SoundCullObjClass : public MultiListObjectClass, public CullableClass
 		virtual SoundSceneObjClass *	Peek_Sound_Obj (void) const					{ return m_SoundObj; }
 
 	protected:
-		
+
 		//////////////////////////////////////////////////////////////////////
 		//	Protected methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 
 	private:
 
@@ -154,7 +148,7 @@ SoundCullObjClass::Set_Sound_Obj (SoundSceneObjClass *sound_obj)
 __inline const AABoxClass &
 SoundCullObjClass::Get_Bounding_Box (void) const
 {
-	// Get the 'real' values from the 
+	// Get the 'real' values from the
 	if (m_SoundObj != NULL) {
 		m_Transform = m_SoundObj->Get_Transform ();
 		m_AABox.Extent.X = m_SoundObj->Get_DropOff_Radius ();
@@ -169,5 +163,3 @@ SoundCullObjClass::Get_Bounding_Box (void) const
 	m_AABox.Center = m_Transform.Get_Translation ();
 	return m_AABox;
 }
-
-#endif //__SOUNDCULLOBJ_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.cpp b/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.cpp
index 780cb36b4cb..bbb8385f585 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.cpp
@@ -135,13 +135,13 @@ SoundPseudo3DClass::Initialize_Miles_Handle (void)
 void
 SoundPseudo3DClass::Update_Pseudo_Volume (float distance)
 {
-	MMSLockClass lock;	
+	MMSLockClass lock;
 
 	//
 	// Only do this if the sound is really playing
 	//
 	if (m_SoundHandle != NULL) {
-		
+
 		float volume_mod = Determine_Real_Volume ();
 		float max_distance = Get_DropOff_Radius ();
 		float min_distance = Get_Max_Vol_Radius ();
@@ -152,7 +152,7 @@ SoundPseudo3DClass::Update_Pseudo_Volume (float distance)
 		if (distance > min_distance) {
 			volume = 1.0F - ((distance - min_distance) / delta);
 			volume = min (volume, 1.0F);
-			volume = max (volume, 0.0F);			
+			volume = max (volume, 0.0F);
 		}
 
 		// Multiply the 'max' volume with the calculated volume
@@ -176,14 +176,14 @@ SoundPseudo3DClass::Update_Pseudo_Volume (float distance)
 void
 SoundPseudo3DClass::Update_Pseudo_Volume (void)
 {
-	MMSLockClass lock;	
+	MMSLockClass lock;
 
 	// Only do this if the sound is really playing
 	if (m_SoundHandle != NULL) {
-		
+
 		//
 		// Find the difference in the sound position and its listener's position
-		//		
+		//
 		Vector3 sound_pos = m_ListenerTransform.Get_Translation () - m_Transform.Get_Translation ();
 		float distance = sound_pos.Quick_Length ();
 
@@ -205,13 +205,13 @@ SoundPseudo3DClass::Update_Pseudo_Volume (void)
 void
 SoundPseudo3DClass::Update_Pseudo_Pan (void)
 {
-	MMSLockClass lock;	
+	MMSLockClass lock;
 
 	//
 	// Only do this if the sound is really playing
 	//
 	if (m_SoundHandle != NULL) {
-		
+
 		//
 		//	Transform the sound's position into 'listener-space'
 		//
@@ -269,7 +269,7 @@ SoundPseudo3DClass::Free_Miles_Handle (void)
 ////////////////////////////////////////////////////////////////////////////////////////////////
 bool
 SoundPseudo3DClass::On_Frame_Update (unsigned int milliseconds)
-{	
+{
 	// If necessary, update the volume based on the distance
 	// from the listener
 	if (m_SoundHandle != NULL) {
@@ -289,6 +289,6 @@ SoundPseudo3DClass::On_Frame_Update (unsigned int milliseconds)
 ////////////////////////////////////////////////////////////////////////////////////////////////
 const PersistFactoryClass &
 SoundPseudo3DClass::Get_Factory (void) const
-{	
+{
 	return _PseudoSound3DPersistFactory;
 }
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.h
index 35734a0418c..cd9e78e4039 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SOUND_PSEUDO_3DOBJ_H
-#define __SOUND_PSEUDO_3DOBJ_H
-
 
 #include "Sound3D.h"
 
@@ -77,7 +71,7 @@ class SoundPseudo3DClass : public Sound3DClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Conversion methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual SoundPseudo3DClass *	As_SoundPseudo3DClass (void) { return this; }
 
 		//////////////////////////////////////////////////////////////////////
@@ -87,15 +81,15 @@ class SoundPseudo3DClass : public Sound3DClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Position/direction methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual void			Set_Listener_Transform (const Matrix3D &tm)	{ m_ListenerTransform = tm; }
 		virtual void			Set_Position (const Vector3 &position)			{ Set_Dirty (); m_Transform.Set_Translation (position); }
 		virtual void			Set_Transform (const Matrix3D &transform)		{ Set_Dirty (); m_Transform = transform; }
 
 		//////////////////////////////////////////////////////////////////////
 		//	Velocity methods
-		//////////////////////////////////////////////////////////////////////		
-		
+		//////////////////////////////////////////////////////////////////////
+
 		//
 		// The velocity settings are in meters per millisecond.
 		//
@@ -104,7 +98,7 @@ class SoundPseudo3DClass : public Sound3DClass
 		//////////////////////////////////////////////////////////////////////
 		//	Attenuation settings
 		//////////////////////////////////////////////////////////////////////
-		
+
 		//
 		// The maximum-volume radius is the distance from the sound-emitter where
 		//	it seems as loud as it is going to get.  Volume does not increase after this
@@ -144,7 +138,7 @@ class SoundPseudo3DClass : public Sound3DClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Handle information
-		//////////////////////////////////////////////////////////////////////				
+		//////////////////////////////////////////////////////////////////////
 		virtual void			Set_Miles_Handle (MILES_HANDLE handle);
 		virtual void			Initialize_Miles_Handle (void);
 		virtual void			Allocate_Miles_Handle (void);
@@ -158,6 +152,3 @@ class SoundPseudo3DClass : public Sound3DClass
 		//	Private member data
 		//////////////////////////////////////////////////////////////////////
 };
-
-
-#endif //__SOUND_PSEUDO_3DOBJ_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.cpp b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.cpp
index 53fcffa8363..9a8796b29d7 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.cpp
@@ -83,10 +83,10 @@ SoundSceneClass::SoundSceneClass (void)
 		m_MinExtents (-500, -500, -500),
 		m_MaxExtents (500, 500, 500),
 		m_IsBatchMode (false)
-{	
+{
 	WWMEMLOG(MEM_SOUND);
 	m_Listener = W3DNEW Listener3DClass;
-	m_DynamicCullingSystem.Re_Partition (m_MinExtents, m_MaxExtents, 100.00F);	
+	m_DynamicCullingSystem.Re_Partition (m_MinExtents, m_MaxExtents, 100.00F);
 	m_LogicalCullingSystem.Re_Partition (m_MinExtents, m_MaxExtents, 100.00F);
 	m_ListenerCullingSystem.Re_Partition (m_MinExtents, m_MaxExtents, 40.00F);
 	m_StaticCullingSystem.Re_Partition ();
@@ -153,7 +153,7 @@ SoundSceneClass::Collect_Logical_Sounds (unsigned int milliseconds, int listener
 
 	PriorityMultiListIterator<LogicalListenerClass> priority_queue (&m_LogicalListeners);
 	LogicalListenerClass *listener = NULL;
-	
+
 	//
 	//	Loop over as many of the listeners as we want to process this
 	// frame.
@@ -165,7 +165,7 @@ SoundSceneClass::Collect_Logical_Sounds (unsigned int milliseconds, int listener
 		LogicalListenerClass::Set_Oldest_Timestamp (listener->Get_Timestamp ());
 		listener->Set_Timestamp (LogicalListenerClass::Get_New_Timestamp ());
 		listener->On_Frame_Update (milliseconds);
-	
+
 		//
 		// Collect a list of the sounds this listener can hear.
 		//
@@ -197,7 +197,7 @@ SoundSceneClass::Collect_Logical_Sounds (unsigned int milliseconds, int listener
 			float scale						= listener->Get_Effective_Scale ();
 			float test_radius2			= (dropoff_radius * scale) * (dropoff_radius * scale);
 			if ((listener_pos - sound_pos).Length2 () <= test_radius2) {
-				
+
 				//
 				//	Is the sound ready to notify?
 				//
@@ -262,7 +262,7 @@ SoundSceneClass::Collect_Audible_Sounds
 	// they are 'really' audible.  The culling systems just check bounding boxes
 	// but we need to be able to check attenuation spheres.
 	//
-	SoundCullObjClass * cull_obj = NULL;	
+	SoundCullObjClass * cull_obj = NULL;
 	for (	cull_obj = m_DynamicCullingSystem.Get_First_Collected_Object();
 			cull_obj != NULL;
 			cull_obj = m_DynamicCullingSystem.Get_Next_Collected_Object(cull_obj))
@@ -277,12 +277,12 @@ SoundSceneClass::Collect_Audible_Sounds
 		float radius2 = radius * radius;
 		float length2 = (pos - listener_pos).Length2 ();
 		if (length2 <= radius2) {
-			
+
 			AudibleInfoClass *audible_info = new AudibleInfoClass (sound_obj, length2);
 			list.Add (audible_info);
-			
+
 			//
-			// Update this sound's runtime priority based on its distance			
+			// Update this sound's runtime priority based on its distance
 			// from the sound emitter.
 			//
 			float length	= (pos - listener_pos).Quick_Length ();
@@ -295,13 +295,13 @@ SoundSceneClass::Collect_Audible_Sounds
 	// Loop through all the static sounds that are currently audible and make sure
 	// they are 'really' audible.  The culling systems just check bounding boxes
 	// but we need to be able to check attenuation spheres.
-	//	
+	//
 	for (	cull_obj = m_StaticCullingSystem.Get_First_Collected_Object();
 			cull_obj != NULL;
 			cull_obj = m_StaticCullingSystem.Get_Next_Collected_Object(cull_obj))
 	{
 		AudibleSoundClass *sound_obj = (AudibleSoundClass *)cull_obj->Peek_Sound_Obj ();
-		
+
 		// Perform a quick sphere-cull check to make sure this
 		// sound should really be audible
 		Vector3 pos = sound_obj->Get_Position ();
@@ -309,7 +309,7 @@ SoundSceneClass::Collect_Audible_Sounds
 		float radius2 = radius * radius;
 		float length2 = (pos - listener_pos).Length2 ();
 		if (length2 <= radius2) {
-			
+
 			AudibleInfoClass *audible_info = new AudibleInfoClass (sound_obj, length2);
 			list.Add (audible_info);
 
@@ -356,10 +356,10 @@ SoundSceneClass::On_Frame_Update (unsigned int milliseconds)
 	// Update the listener's position/velocity, etc
 	//
 	m_Listener->On_Frame_Update (milliseconds);
-	
+
 	//
 	//	Collect the primary sounds that are audible
-	//	
+	//
 	Collect_Audible_Sounds (m_Listener, primary_sounds);
 
 	//
@@ -372,13 +372,13 @@ SoundSceneClass::On_Frame_Update (unsigned int milliseconds)
 
 	for (aux_iterator.First (); !aux_iterator.Is_Done (); aux_iterator.Next ()) {
 		AudibleInfoClass *aux_info = aux_iterator.Peek_Obj ();
-		
+
 		//
 		//	Loop through all the primary sounds and remove any
 		// that are 'overpowered' by the same sound in the
 		// other listener.
 		//
-		bool found = false;		
+		bool found = false;
 		for (pri_iterator.First (); !pri_iterator.Is_Done () && !found; pri_iterator.Next ()) {
 			AudibleInfoClass *pri_info = pri_iterator.Peek_Obj ();
 
@@ -400,7 +400,7 @@ SoundSceneClass::On_Frame_Update (unsigned int milliseconds)
 
 	//
 	//	Add the primary audible sounds into the master list
-	//		
+	//
 	for (pri_iterator.First (); !pri_iterator.Is_Done (); pri_iterator.Next ()) {
 		AudibleInfoClass *pri_info = pri_iterator.Peek_Obj ();
 		audible_sounds.Add (pri_info->sound_obj);
@@ -409,11 +409,11 @@ SoundSceneClass::On_Frame_Update (unsigned int milliseconds)
 		//	Let the sound know what it's listener's position is
 		//
 		pri_info->sound_obj->Set_Listener_Transform (m_Listener->Get_Transform ());
-		
+
 		//
 		//	Free the audible info object
 		//
-		pri_iterator.Remove_Current_Object ();	
+		pri_iterator.Remove_Current_Object ();
 		pri_iterator.Prev ();
 		delete pri_info;
 	}
@@ -429,7 +429,7 @@ SoundSceneClass::On_Frame_Update (unsigned int milliseconds)
 		//	Let the sound know what it's listener's position is
 		//
 		aux_info->sound_obj->Set_Listener_Transform (m_2ndListener->Get_Transform ());
-		
+
 		//
 		//	Convert the sound to a Pseudo-3D sound that has
 		// a 'tinny' filter applied to it.
@@ -439,11 +439,11 @@ SoundSceneClass::On_Frame_Update (unsigned int milliseconds)
 		if (tinny_sound != NULL) {
 			audible_sounds.Add (tinny_sound);
 		}*/
-		
+
 		//
 		//	Free the audible info object
 		//
-		aux_iterator.Remove_Current_Object ();	
+		aux_iterator.Remove_Current_Object ();
 		aux_iterator.Prev ();
 		delete aux_info;
 	}
@@ -460,14 +460,14 @@ SoundSceneClass::On_Frame_Update (unsigned int milliseconds)
 		// Is this sound still audible?
 		//
 		if (audible_sounds.Is_In_List (sound_obj)) {
-			
+
 			//
 			//	Make sure the sound is playing, then remove it from
 			// the newly-audible list so we don't process it again
 			//
 			sound_obj->Cull_Sound (false);
 			audible_sounds.Remove (sound_obj);
-		
+
 		} else {
 
 			//
@@ -476,7 +476,7 @@ SoundSceneClass::On_Frame_Update (unsigned int milliseconds)
 			//
 			audible_iterator.Remove_Current_Object ();
 			audible_iterator.Prev ();
-			
+
 			//
 			//	Make sure we cull the sound
 			//
@@ -493,7 +493,7 @@ SoundSceneClass::On_Frame_Update (unsigned int milliseconds)
 	MultiListIterator<AudibleSoundClass> newly_audible_it (&audible_sounds);
 	for (newly_audible_it.First (); !newly_audible_it.Is_Done (); newly_audible_it.Next ()) {
 		AudibleSoundClass *sound_obj = newly_audible_it.Peek_Obj ();
-		
+
 		//
 		//	Make sure the sound has a valid Miles handle (so it can make noise)
 		//
@@ -534,7 +534,7 @@ SoundSceneClass::Add_Sound
 
 		// Create a wrapper object for the sound that we can use
 		// with the different culling systems.
-		SoundCullObjClass *cullable_sound = W3DNEW SoundCullObjClass;		
+		SoundCullObjClass *cullable_sound = W3DNEW SoundCullObjClass;
 		cullable_sound->Set_Sound_Obj (sound_obj);
 		sound_obj->Set_Cullable_Wrapper (cullable_sound);
 
@@ -614,7 +614,7 @@ SoundSceneClass::Remove_Sound
 	//
 	SoundCullObjClass *cull_obj = sound_obj->Peek_Cullable_Wrapper ();
 	if (cull_obj != NULL && m_DynamicSounds.Is_In_List (cull_obj)) {
-				
+
 		//
 		//	Stop playing the sound if necessary
 		//
@@ -754,7 +754,7 @@ SoundSceneClass::Remove_Static_Sound
 	//
 	SoundCullObjClass *cull_obj = sound_obj->Peek_Cullable_Wrapper ();
 	if (cull_obj != NULL && m_StaticSounds.Is_In_List (cull_obj)) {
-				
+
 		//
 		//	Stop playing the sound if necessary
 		//
@@ -805,7 +805,7 @@ SoundSceneClass::Add_Logical_Sound
 		//
 		if (Is_Logical_Sound_In_Scene (sound_obj, single_shot) == false) {
 			sound_obj->Set_Listener_Timestamp (LogicalListenerClass::Get_Newest_Timestamp ());
-			
+
 			//
 			// Create a wrapper object for the sound that we can use
 			// with the different culling systems.
@@ -818,13 +818,13 @@ SoundSceneClass::Add_Logical_Sound
 			// Add this object to the logical culling system
 			//
 			m_LogicalCullingSystem.Add_Object (cullable_sound);
-			
+
 			//
 			//	Add this sound to our current sounds list
 			//
 			if (single_shot) {
 				m_SingleShotLogicalSounds.Add (sound_obj);
-			} else {				
+			} else {
 				m_LogicalSounds.Add (sound_obj);
 			}
 
@@ -882,14 +882,14 @@ SoundSceneClass::Remove_Logical_Sound
 			// Remove this sound from the culling system
 			//
 			SoundCullObjClass *cull_obj = sound_obj->Peek_Cullable_Wrapper ();
-			m_LogicalCullingSystem.Remove_Object (cull_obj);	
+			m_LogicalCullingSystem.Remove_Object (cull_obj);
 
 			//
 			// Remove this sound obj's wrapper
 			//
 			sound_obj->Set_Cullable_Wrapper (NULL);
 			WWAudioThreadsClass::Add_Delayed_Release_Object (cull_obj);
-			
+
 			//
 			//	Release our reference on this object
 			//
@@ -914,7 +914,7 @@ SoundSceneClass::Remove_Logical_Sound
 			// Remove this sound from the culling system
 			//
 			SoundCullObjClass *cull_obj = sound_obj->Peek_Cullable_Wrapper ();
-			m_LogicalCullingSystem.Remove_Object (cull_obj);	
+			m_LogicalCullingSystem.Remove_Object (cull_obj);
 
 			//
 			// Remove this sound obj's wrapper
@@ -926,7 +926,7 @@ SoundSceneClass::Remove_Logical_Sound
 			//	Release our reference on this object
 			//
 			REF_PTR_RELEASE (sound_obj);
-		}		
+		}
 	}
 
 	return ;
@@ -1050,9 +1050,9 @@ SoundSceneClass::Is_Logical_Sound_In_Scene
 	LogicalSoundClass *	sound_obj,
 	bool						single_shot
 )
-{	
+{
 	bool retval = false;
-	
+
 	//
 	//	Check to see if this sound is in either the continuous list or the single shot list.
 	//
@@ -1061,7 +1061,7 @@ SoundSceneClass::Is_Logical_Sound_In_Scene
 	} else {
 		retval = m_SingleShotLogicalSounds.Is_In_List (sound_obj);
 	}
-	
+
 	return retval;
 }
 
@@ -1073,19 +1073,19 @@ SoundSceneClass::Is_Logical_Sound_In_Scene
 ////////////////////////////////////////////////////////////////////////////////////////////////
 bool
 SoundSceneClass::Save_Static (ChunkSaveClass &csave)
-{	
+{
 	csave.Begin_Chunk (CHUNKID_VARIABLES);
 		WRITE_MICRO_CHUNK (csave, VARID_MIN_DIM, m_MinExtents);
 		WRITE_MICRO_CHUNK (csave, VARID_MAX_DIM, m_MaxExtents);
-	csave.End_Chunk ();	
-		
+	csave.End_Chunk ();
+
 	//
 	//	Save the list of static sounds that are currently in the scene
 	//
 	csave.Begin_Chunk (CHUNKID_STATIC_SOUNDS);
 		Save_Static_Sounds (csave);
 	csave.End_Chunk ();
-	
+
 	return true;
 }
 
@@ -1166,7 +1166,7 @@ SoundSceneClass::Load_Static (ChunkLoadClass &cload)
 {
 	m_IsBatchMode = true;
 
-	while (cload.Open_Chunk ()) {		
+	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
 
 			case CHUNKID_STATIC_SOUNDS:
@@ -1181,7 +1181,7 @@ SoundSceneClass::Load_Static (ChunkLoadClass &cload)
 				while (cload.Open_Micro_Chunk ()) {
 					switch (cload.Cur_Micro_Chunk_ID ()) {
 						READ_MICRO_CHUNK (cload, VARID_MIN_DIM, m_MinExtents);
-						READ_MICRO_CHUNK (cload, VARID_MAX_DIM, m_MaxExtents);			
+						READ_MICRO_CHUNK (cload, VARID_MAX_DIM, m_MaxExtents);
 					}
 
 					cload.Close_Micro_Chunk ();
@@ -1192,7 +1192,7 @@ SoundSceneClass::Load_Static (ChunkLoadClass &cload)
 
 		cload.Close_Chunk ();
 	}
-	
+
 	Re_Partition (m_MinExtents, m_MaxExtents);
 	On_Frame_Update (0);
 	m_IsBatchMode = false;
@@ -1207,7 +1207,7 @@ SoundSceneClass::Load_Static (ChunkLoadClass &cload)
 ////////////////////////////////////////////////////////////////////////////////////////////////
 bool
 SoundSceneClass::Save_Dynamic (ChunkSaveClass &csave)
-{	
+{
 	return true;
 }
 
@@ -1256,7 +1256,7 @@ SoundSceneClass::Flush_Scene (void)
 	RefMultiListIterator<SoundCullObjClass> temp_static_it (&temp_static);
 	for (temp_static_it.First (); !temp_static_it.Is_Done (); temp_static_it.Next ()) {
 		SoundCullObjClass *cull_obj = temp_static_it.Peek_Obj ();
-		
+
 		AudibleSoundClass *sound_obj	= (AudibleSoundClass *)cull_obj->Peek_Sound_Obj ();
 		if (sound_obj != NULL) {
 			Remove_Static_Sound (sound_obj);
@@ -1269,7 +1269,7 @@ SoundSceneClass::Flush_Scene (void)
 	RefMultiListIterator<SoundCullObjClass> temp_dynamic_it (&temp_dynamic);
 	for (temp_dynamic_it.First (); !temp_dynamic_it.Is_Done (); temp_dynamic_it.Next ()) {
 		SoundCullObjClass *cull_obj = temp_dynamic_it.Peek_Obj ();
-		
+
 		AudibleSoundClass *sound_obj	= (AudibleSoundClass *)cull_obj->Peek_Sound_Obj ();
 		if (sound_obj != NULL) {
 			Remove_Sound (sound_obj);
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h
index 35d14ee256d..ef2620e4da7 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h
@@ -34,18 +34,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SOUNDSCENE_H
-#define __SOUNDSCENE_H
 
 #include "aabtreecull.h"
 #include "gridcull.h"
 #include "Listener.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "PriorityVector.h"
 #include "SoundCullObj.h"
 #include "LogicalListener.h"
@@ -100,7 +94,7 @@ class SoundSceneClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Logical sound methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual void			Collect_Logical_Sounds (unsigned int milliseconds, int listener_count = -1);
 
 		//////////////////////////////////////////////////////////////////////
@@ -119,7 +113,7 @@ class SoundSceneClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Sound insertion
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual void			Flush_Scene (void);
 		virtual void			Update_Sound (SoundCullObjClass *sound_obj);
 
@@ -143,26 +137,26 @@ class SoundSceneClass
 		virtual void			Remove_Logical_Sound (LogicalSoundClass *sound_obj, bool single_shot = false, bool remove_from_list = true);
 
 		virtual void			Add_Logical_Listener (LogicalListenerClass *listener_obj);
-		virtual void			Remove_Logical_Listener (LogicalListenerClass *listener_obj);		
+		virtual void			Remove_Logical_Listener (LogicalListenerClass *listener_obj);
 
 		//////////////////////////////////////////////////////////////////////
 		//	Save/Load
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		bool						Save_Static (ChunkSaveClass &csave);
 		bool						Load_Static (ChunkLoadClass &cload);
 		bool						Save_Dynamic (ChunkSaveClass &csave);
 		bool						Load_Dynamic (ChunkLoadClass &cload);
-		
+
 		bool						Is_Batch_Mode (void) const			{ return m_IsBatchMode; }
 		void						Set_Batch_Mode (bool batch_mode)	{ m_IsBatchMode = batch_mode; }
 
 		//////////////////////////////////////////////////////////////////////
 		//	Debugging
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		bool						Is_Sound_In_Scene (AudibleSoundClass *sound_obj, bool all = true);
 
 	protected:
-		
+
 		//////////////////////////////////////////////////////////////////////
 		//	Protected methods
 		//////////////////////////////////////////////////////////////////////
@@ -177,7 +171,7 @@ class SoundSceneClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Collection methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 	public:
 		class AudibleInfoClass : public MultiListObjectClass, public AutoPoolClass<AudibleInfoClass, 64>
 		{
@@ -205,7 +199,7 @@ class SoundSceneClass
 		//	Private member data
 		//////////////////////////////////////////////////////////////////////
 		Listener3DClass *				m_Listener;
-		Listener3DClass *				m_2ndListener;		
+		Listener3DClass *				m_2ndListener;
 		AUDIBLE_SOUND_LIST			m_LastSoundsAudible;
 		SOUND_LIST						m_DynamicSounds;
 		SOUND_LIST						m_StaticSounds;
@@ -224,6 +218,3 @@ class SoundSceneClass
 
 		bool								m_IsBatchMode;
 };
-
-
-#endif //__SOUNDSCENE_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.cpp b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.cpp
index 93447e9cfa0..e9aceda67e5 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.cpp
@@ -44,7 +44,7 @@
 //////////////////////////////////////////////////////////////////////////////////
 //	Save/Load constants
 //////////////////////////////////////////////////////////////////////////////////
-enum 
+enum
 {
 	CHUNKID_VARIABLES			= 0x03270459,
 	CHUNKID_BASE_CLASS
@@ -155,7 +155,7 @@ SoundSceneObjClass::operator= (const SoundSceneObjClass &src)
 	m_RegisteredEvents	= src.m_RegisteredEvents;
 
 	Attach_To_Object (src.m_AttachedObject, src.m_AttachedBone);
-	
+
 	PersistClass::operator= ((const PersistClass &)src);
 	return (*this);
 }
@@ -198,7 +198,7 @@ SoundSceneObjClass::Attach_To_Object
 )
 {
 	if (m_AttachedObject != render_obj || m_AttachedBone != bone_index) {
-		
+
 		//
 		//	Record the attachment
 		//
@@ -226,18 +226,18 @@ SoundSceneObjClass::Apply_Auto_Position (void)
 	// If the sound is attached to an object, then update its transform
 	// based on this link.
 	if (m_AttachedObject != NULL) {
-		
+
 		// Determine which transform to use
-		Matrix3D transform (1);		
+		Matrix3D transform (1);
 		if (m_AttachedBone >= 0) {
 			transform = m_AttachedObject->Get_Bone_Transform (m_AttachedBone);
 		} else {
 			transform = m_AttachedObject->Get_Transform ();
-		
+
 			//
 			//	Convert the camera's transform to an object transform
 			//
-			if (m_AttachedObject->Class_ID () == RenderObjClass::CLASSID_CAMERA) {				
+			if (m_AttachedObject->Class_ID () == RenderObjClass::CLASSID_CAMERA) {
 				Matrix3D cam_to_world (Vector3 (0, 0, -1), Vector3 (-1, 0, 0), Vector3 (0, 1, 0), Vector3 (0, 0, 0));
 #ifdef ALLOW_TEMPORARIES
 				transform = transform * cam_to_world;
@@ -267,12 +267,12 @@ SoundSceneObjClass::Save (ChunkSaveClass &csave)
 		PersistClass::Save (csave);
 	csave.End_Chunk ();
 
-	csave.Begin_Chunk (CHUNKID_VARIABLES);		
+	csave.Begin_Chunk (CHUNKID_VARIABLES);
 		WRITE_MICRO_CHUNK (csave, VARID_ATTACHED_OBJ, m_AttachedObject);
-		WRITE_MICRO_CHUNK (csave, VARID_ATTACHED_BONE, m_AttachedBone);		
+		WRITE_MICRO_CHUNK (csave, VARID_ATTACHED_BONE, m_AttachedBone);
 		WRITE_MICRO_CHUNK (csave, VARID_USER_DATA, m_UserData);
 		WRITE_MICRO_CHUNK (csave, VARID_USER_OBJ, m_UserObj);
-		WRITE_MICRO_CHUNK (csave, VARID_ID, m_ID);		
+		WRITE_MICRO_CHUNK (csave, VARID_ID, m_ID);
 	csave.End_Chunk ();
 	return true;
 }
@@ -288,7 +288,7 @@ SoundSceneObjClass::Load (ChunkLoadClass &cload)
 {
 	uint32 id = SOUND_OBJ_DEFAULT_ID;
 
-	while (cload.Open_Chunk ()) {		
+	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
 
 			case CHUNKID_BASE_CLASS:
@@ -339,7 +339,7 @@ SoundSceneObjClass::Load (ChunkLoadClass &cload)
 	if (m_AttachedObject != NULL) {
 		SaveLoadSystemClass::Request_Ref_Counted_Pointer_Remap ((RefCountClass **)&m_AttachedObject);
 	}
-	
+
 	return true;
 }
 
@@ -377,7 +377,7 @@ SoundSceneObjClass::Set_ID (uint32 id)
 
 	//
 	//	Reinsert the sound object in our sorted list
-	//	
+	//
 	Register_Sound_Object (this);
 	return ;
 }
@@ -390,7 +390,7 @@ SoundSceneObjClass::Set_ID (uint32 id)
 //////////////////////////////////////////////////////////////////////////////////
 void
 SoundSceneObjClass::Register_Sound_Object (SoundSceneObjClass *sound_obj)
-{	
+{
 	int sound_id = sound_obj->Get_ID ();
 	CriticalSectionClass::LockClass lock(m_IDListMutex);
 
@@ -409,7 +409,7 @@ SoundSceneObjClass::Register_Sound_Object (SoundSceneObjClass *sound_obj)
 
 			//
 			//	Insert the object into the list
-			//			
+			//
 			m_GlobalSoundList.Insert (index, sound_obj);
 		}
 	}
@@ -433,7 +433,7 @@ SoundSceneObjClass::Unregister_Sound_Object (SoundSceneObjClass *sound_obj)
 	//
 	int index = 0;
 	if (Find_Sound_Object (sound_obj->Get_ID (), &index)) {
-	
+
 		//
 		//	Remove the object from the list
 		//
@@ -454,11 +454,11 @@ SoundSceneObjClass::Find_Sound_Object (uint32 id_to_find, int *index)
 {
 	CriticalSectionClass::LockClass lock(m_IDListMutex);
 
-	bool found		= false;	
+	bool found		= false;
 	(*index)			= 0;
 	int min_index	= 0;
-	int max_index	= m_GlobalSoundList.Count () - 1;		
-	
+	int max_index	= m_GlobalSoundList.Count () - 1;
+
 	//
 	//	Keep looping until we've closed the window of possiblity
 	//
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h
index 3086d0b0470..f0580edfb6a 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h
@@ -32,14 +32,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef __SOUND_SCENE_OBJ_H
-#define __SOUND_SCENE_OBJ_H
-
-#include "refcount.h"
+#include "always.h"
 #include "WWAudio.h"
 #include "bittype.h"
 #include "persist.h"
@@ -107,7 +102,7 @@ class SoundSceneObjClass : public MultiListObjectClass, public PersistClass, pub
 
 		//////////////////////////////////////////////////////////////////////
 		//	Conversion methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual Sound3DClass *			As_Sound3DClass (void) 			{ return NULL; }
 		virtual SoundPseudo3DClass *	As_SoundPseudo3DClass (void) 	{ return NULL; }
 		virtual FilteredSoundClass *	As_FilteredSoundClass (void) 	{ return NULL; }
@@ -127,13 +122,13 @@ class SoundSceneObjClass : public MultiListObjectClass, public PersistClass, pub
 
 		//////////////////////////////////////////////////////////////////////
 		//	Event handling
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual void			On_Event (AudioCallbackClass::EVENTS event, uint32 param1 = 0, uint32 param2 = 0);
 		virtual void			Register_Callback (AudioCallbackClass::EVENTS events, AudioCallbackClass *callback);
 
 		//////////////////////////////////////////////////////////////////////
 		//	Position/direction methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		virtual void			Set_Position (const Vector3 &position)	= 0;
 		virtual Vector3		Get_Position (void) const = 0;
 
@@ -182,7 +177,7 @@ class SoundSceneObjClass : public MultiListObjectClass, public PersistClass, pub
 
 		//////////////////////////////////////////////////////////////////////
 		//	From PersistClass
-		//////////////////////////////////////////////////////////////////////				
+		//////////////////////////////////////////////////////////////////////
 		bool						Save (ChunkSaveClass &csave);
 		bool						Load (ChunkLoadClass &cload);
 
@@ -190,7 +185,7 @@ class SoundSceneObjClass : public MultiListObjectClass, public PersistClass, pub
 
 		//////////////////////////////////////////////////////////////////////
 		//	Handle information
-		//////////////////////////////////////////////////////////////////////				
+		//////////////////////////////////////////////////////////////////////
 		virtual SoundCullObjClass *	Peek_Cullable_Wrapper (void) const					{ return m_PhysWrapper; }
 		virtual void						Set_Cullable_Wrapper (SoundCullObjClass *obj)	{ m_PhysWrapper = obj; }
 
@@ -198,7 +193,7 @@ class SoundSceneObjClass : public MultiListObjectClass, public PersistClass, pub
 		//	Sound object managment
 		//////////////////////////////////////////////////////////////////////
 		static void				Register_Sound_Object (SoundSceneObjClass *sound_obj);
-		static void				Unregister_Sound_Object (SoundSceneObjClass *sound_obj);		
+		static void				Unregister_Sound_Object (SoundSceneObjClass *sound_obj);
 		static bool				Find_Sound_Object (uint32 id_to_find, int *index);
 
 		//////////////////////////////////////////////////////////////////////
@@ -272,8 +267,3 @@ SoundSceneObjClass::Register_Callback
 	m_pCallback = callback;
 	return ;
 }
-
-
-
-#endif //__SOUND_SCENE_OBJ_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Threads.cpp b/Core/Libraries/Source/WWVegas/WWAudio/Threads.cpp
index 235073c84d6..65d62e83a84 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/Threads.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/Threads.cpp
@@ -30,12 +30,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
+#include "always.h"
 #include "Threads.h"
-#include "refcount.h"
 #include "Utils.h"
 #include <process.h>
-#include "wwdebug.h"
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -54,7 +52,7 @@ bool							WWAudioThreadsClass::m_IsShuttingDown			= false;
 //
 ///////////////////////////////////////////////////////////////////////////////////////////
 WWAudioThreadsClass::WWAudioThreadsClass (void)
-{	
+{
 	return ;
 }
 
@@ -65,7 +63,7 @@ WWAudioThreadsClass::WWAudioThreadsClass (void)
 //
 ///////////////////////////////////////////////////////////////////////////////////////////
 WWAudioThreadsClass::~WWAudioThreadsClass (void)
-{	
+{
 	return ;
 }
 
@@ -80,7 +78,7 @@ WWAudioThreadsClass::Create_Delayed_Release_Thread (LPVOID param)
 	//
 	//	If the thread isn't already running, then
 	//
-	if (m_hDelayedReleaseThread == (HANDLE)-1) {		
+	if (m_hDelayedReleaseThread == (HANDLE)-1) {
 		m_hDelayedReleaseEvent	= ::CreateEvent (NULL, FALSE, FALSE, NULL);
 		m_hDelayedReleaseThread = (HANDLE)::_beginthread (Delayed_Release_Thread_Proc, 0, param);
 	}
@@ -129,12 +127,12 @@ WWAudioThreadsClass::Add_Delayed_Release_Object
 	if (m_IsShuttingDown) {
 		REF_PTR_RELEASE (object);
 	} else {
-			  
+
 		//
 		//	Make sure we have a thread running that will handle
 		// the operation for us.
 		//
-		if (m_hDelayedReleaseThread == (HANDLE)-1) {		
+		if (m_hDelayedReleaseThread == (HANDLE)-1) {
 			Create_Delayed_Release_Thread ();
 		}
 
@@ -180,7 +178,7 @@ WWAudioThreadsClass::Flush_Delayed_Release_Objects (void)
 	DELAYED_RELEASE_INFO *next = NULL;
 	for (info = m_ReleaseListHead; info != NULL; info = next) {
 		next = info->next;
-		
+
 		//
 		//	Free the object
 		//
@@ -227,7 +225,7 @@ WWAudioThreadsClass::Delayed_Release_Thread_Proc (LPVOID /*param*/)
 				//	If the time has expired, free the object
 				//
 				if (current_time >= curr->time) {
-					
+
 					//
 					//	Unlink the object
 					//
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Threads.h b/Core/Libraries/Source/WWVegas/WWAudio/Threads.h
index 550d90033ed..17af4841b5e 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/Threads.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/Threads.h
@@ -30,15 +30,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __WWAUDIO_THREADS_H
-#define __WWAUDIO_THREADS_H
 
 #include "windows.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "mutex.h"
 
 // Forward declarations
@@ -66,7 +61,7 @@ class WWAudioThreadsClass
 		//////////////////////////////////////////////////////////////////////
 		//	Public methods
 		//////////////////////////////////////////////////////////////////////
-		
+
 		//
 		//	Delayed release mechanism
 		//
@@ -107,6 +102,3 @@ class WWAudioThreadsClass
 		static CriticalSectionClass	m_ListMutex;
 		static bool							m_IsShuttingDown;
 };
-
-#endif //__WWAUDIO_THREADS_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Utils.h b/Core/Libraries/Source/WWVegas/WWAudio/Utils.h
index 37b60b5a100..ffff71bff50 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/Utils.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/Utils.h
@@ -34,9 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef __UTILS_H
-#define __UTILS_H
+#pragma once
 
 #pragma warning (push, 3)
 #include "mss.h"
@@ -46,23 +44,11 @@
 //
 // Macros
 //
-#define SAFE_DELETE(pobject)					\
-			if (pobject) {							\
-				delete pobject;					\
-				pobject = NULL;					\
-			}											\
+#define SAFE_DELETE(pobject) { delete pobject; pobject = NULL; }
 
-#define SAFE_DELETE_ARRAY(pobject)			\
-			if (pobject) {							\
-				delete [] pobject;				\
-				pobject = NULL;					\
-			}											\
+#define SAFE_DELETE_ARRAY(pobject) { delete [] pobject; pobject = NULL; }
 
-#define SAFE_FREE(pobject)						\
-			if (pobject) {							\
-				::free (pobject);					\
-				pobject = NULL;					\
-			}											\
+#define SAFE_FREE(pobject) { ::free (pobject); pobject = NULL; }
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -100,6 +86,3 @@ Get_Filename_From_Path (LPCTSTR path)
 	// Return the filename part of the path
 	return filename;
 }
-
-
-#endif //__UTILS_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp
index 2a523ef0f47..34b88f28b62 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp
@@ -44,7 +44,7 @@
 #include "SoundBuffer.h"
 #include "AudibleSound.h"
 #include "Sound3D.h"
-#include "RAWFILE.H"
+#include "RAWFILE.h"
 #include "SoundScene.h"
 #include "SoundPseudo3D.h"
 #include "ffactory.h"
@@ -109,7 +109,7 @@ WWAudioClass::WWAudioClass (void)
 	  m_PlaybackRate (44100),
 	  m_PlaybackBits (16),
 	  m_PlaybackStereo (true),
-	  m_ReverbFilter (INVALID_MILES_HANDLE),
+	  m_ReverbFilter ((HPROVIDER)INVALID_MILES_HANDLE),
 	  m_UpdateTimer (-1),
 	  m_Driver3DPseudo (NULL),
 	  m_MusicVolume (DEF_MUSIC_VOL),
@@ -246,7 +246,7 @@ WWAudioClass::Open_2D_Device (LPWAVEFORMAT format)
 		 (m_Driver2D->emulated_ds == TRUE)) {
 		::AIL_waveOutClose (m_Driver2D);
 		success = 2;
-		WWDEBUG_SAY (("WWAudio: Detected 2D DirectSound emulation, switching to WaveOut.\r\n"));
+		WWDEBUG_SAY (("WWAudio: Detected 2D DirectSound emulation, switching to WaveOut."));
    }
 
 	// If we couldn't open the direct sound device, then use the
@@ -269,7 +269,7 @@ WWAudioClass::Open_2D_Device (LPWAVEFORMAT format)
 		ReAssign_2D_Handles ();
 	} else {
 		Close_2D_Device ();
-		WWDEBUG_SAY (("WWAudio: Error initializing 2D device.\r\n"));
+		WWDEBUG_SAY (("WWAudio: Error initializing 2D device."));
 	}
 
 	// Return the opened device type
@@ -372,8 +372,8 @@ WWAudioClass::Get_Sound_Buffer (const char *filename, bool is_3d)
 			buffer = Create_Sound_Buffer (*file, filename, is_3d);
 		} else {
 			static int count = 0;
-			if ( ++count < 10 ) {
-				WWDEBUG_SAY(( "Sound \"%s\" not found\r\n", filename ));
+			if ( count++ < 10 ) {
+				WWDEBUG_SAY(( "Sound \"%s\" not found", filename ));
 			}
 		}
 		Return_File (file);
@@ -687,7 +687,7 @@ WWAudioClass::Create_Sound_Effect (const char *filename)
 			if (file && file->Is_Available()) {
 				sound_obj = Create_Sound_Effect (*file, filename);
 			} else {
-				WWDEBUG_SAY(( "Sound %s not found\r\n", filename ));
+				WWDEBUG_SAY(( "Sound %s not found", filename ));
 			}
 			Return_File (file);
 
@@ -807,8 +807,8 @@ WWAudioClass::Create_3D_Sound
 				sound_obj->Set_Buffer (buffer);
 			} else {
 				static int count = 0;
-				if ( ++count < 10 ) {
-					WWDEBUG_SAY(( "Sound File not Found \"%s\"\r\n", filename ));
+				if ( count++ < 10 ) {
+					WWDEBUG_SAY(( "Sound File not Found \"%s\"", filename ));
 				}
 			}
 
@@ -975,7 +975,7 @@ WWAudioClass::Create_Continuous_Sound
 	if (sound != NULL) {
 
 		if (sound->Get_Loop_Count () != INFINITE_LOOPS) {
-			WWDEBUG_SAY (("Audio Error:  Creating a continuous sound with a finite loop count!\r\n"));
+			WWDEBUG_SAY (("Audio Error:  Creating a continuous sound with a finite loop count!"));
 		}
 	}
 
@@ -1007,7 +1007,7 @@ WWAudioClass::Create_Instant_Sound
 	if (sound != NULL) {
 
 		if (sound->Get_Loop_Count () == INFINITE_LOOPS) {
-			WWDEBUG_SAY (("Audio Error:  Creating an instant sound %s with an infinite loop count!\r\n",sound->Get_Definition()->Get_Name()));
+			WWDEBUG_SAY (("Audio Error:  Creating an instant sound %s with an infinite loop count!",sound->Get_Definition()->Get_Name()));
 		}
 
 		sound_id = sound->Get_ID ();
@@ -1041,7 +1041,7 @@ WWAudioClass::Create_Continuous_Sound
 	if (sound != NULL) {
 
 		if (sound->Get_Loop_Count () != INFINITE_LOOPS) {
-			WWDEBUG_SAY (("Audio Error:  Creating a continuous sound with a finite loop count!\r\n"));
+			WWDEBUG_SAY (("Audio Error:  Creating a continuous sound with a finite loop count!"));
 		}
 
 	}
@@ -1074,7 +1074,7 @@ WWAudioClass::Create_Instant_Sound
 	if (sound != NULL) {
 
 		if (sound->Get_Loop_Count () == INFINITE_LOOPS) {
-			WWDEBUG_SAY (("Audio Error:  Creating an instant sound %s with an infinite loop count!\r\n",sound->Get_Definition()->Get_Name()));
+			WWDEBUG_SAY (("Audio Error:  Creating an instant sound %s with an infinite loop count!",sound->Get_Definition()->Get_Name()));
 		}
 
 		sound_id = sound->Get_ID ();
@@ -1572,8 +1572,8 @@ WWAudioClass::Build_3D_Driver_List (void)
 			::AIL_close_3D_provider (provider);
 		} else {
 			char *error_info = ::AIL_last_error ();
-			WWDEBUG_SAY (("WWAudio: Unable to open %s.\r\n", name));
-			WWDEBUG_SAY (("WWAudio: Reason %s.\r\n", error_info));
+			WWDEBUG_SAY (("WWAudio: Unable to open %s.", name));
+			WWDEBUG_SAY (("WWAudio: Reason %s.", error_info));
 		}
 	}
 
@@ -1741,7 +1741,7 @@ WWAudioClass::Select_3D_Device (int index)
 	//
 	if ((index >= 0) && (index < m_Driver3DList.Count ())) {
 		Select_3D_Device (m_Driver3DList[index]->name, m_Driver3DList[index]->driver);
-		WWDEBUG_SAY (("WWAudio: Selecting 3D sound device: %s.\r\n", m_Driver3DList[index]->name));
+		WWDEBUG_SAY (("WWAudio: Selecting 3D sound device: %s.", m_Driver3DList[index]->name));
 		retval = true;
 	}
 
@@ -2072,7 +2072,7 @@ WWAudioClass::Is_Disabled (void) const
 		if (registry.Is_Valid ()) {
 			if (registry.Get_Int ("Disabled", 0) == 1) {
 				_disabled = true;
-				WWDEBUG_SAY (("WWAudio: Audio system disabled in registry.\r\n"));
+				WWDEBUG_SAY (("WWAudio: Audio system disabled in registry."));
 			}
 		}
 	}
@@ -2104,7 +2104,7 @@ WWAudioClass::Initialize (const char *registry_subkey_name)
 		HPROENUM next = HPROENUM_FIRST;
 		char *name = NULL;
 		if (::AIL_enumerate_filters (&next, &m_ReverbFilter, &name) == 0) {
-			m_ReverbFilter = INVALID_MILES_HANDLE;
+			m_ReverbFilter = (HPROVIDER)INVALID_MILES_HANDLE;
 		}
 	}
 
@@ -2143,7 +2143,7 @@ WWAudioClass::Initialize
 		HPROENUM next = HPROENUM_FIRST;
 		char *name = NULL;
 		if (::AIL_enumerate_filters (&next, &m_ReverbFilter, &name) == 0) {
-			m_ReverbFilter = INVALID_MILES_HANDLE;
+			m_ReverbFilter = (HPROVIDER)INVALID_MILES_HANDLE;
 		}
 	}
 
@@ -2267,7 +2267,7 @@ WWAudioClass::UnRegister_Text_Callback (LPFNTEXTCALLBACK callback)
 void
 WWAudioClass::Fire_Text_Callback (AudibleSoundClass *sound_obj, const StringClass &text)
 {
-	if (text.Get_Length () > 0) {
+	if (!text.Is_Empty()) {
 
 		//
 		//	Loop over all the text-callbacks that have been registered
@@ -2740,22 +2740,22 @@ WWAudioClass::Save_To_Registry
 //
 ////////////////////////////////////////////////////////////////////////////////////////////
 U32 AILCALLBACK
-WWAudioClass::File_Open_Callback (char const *filename, U32 *file_handle)
+WWAudioClass::File_Open_Callback (char const *filename, void **file_handle)
 {
 	U32 retval = false;
 
 	if (Get_Instance () != NULL) {
-		
+
 		//
 		//	Open the file
 		//
 		FileClass *file = Get_Instance ()->Get_File (filename);
 		if (file != NULL && file->Open ()) {
-			(*file_handle) = (U32)file;
+			(*file_handle) = (void *)file;
 			retval = true;
 		}
 	}
-	
+
 	return retval;
 }
 
@@ -2766,7 +2766,7 @@ WWAudioClass::File_Open_Callback (char const *filename, U32 *file_handle)
 //
 ////////////////////////////////////////////////////////////////////////////////////////////
 void AILCALLBACK
-WWAudioClass::File_Close_Callback (U32 file_handle)
+WWAudioClass::File_Close_Callback (void *file_handle)
 {
 	if (Get_Instance () != NULL) {
 
@@ -2789,7 +2789,7 @@ WWAudioClass::File_Close_Callback (U32 file_handle)
 //
 ////////////////////////////////////////////////////////////////////////////////////////////
 S32 AILCALLBACK
-WWAudioClass::File_Seek_Callback (U32 file_handle, S32 offset, U32 type)
+WWAudioClass::File_Seek_Callback (void *file_handle, S32 offset, U32 type)
 {
 	S32 retval = 0;
 
@@ -2802,7 +2802,7 @@ WWAudioClass::File_Seek_Callback (U32 file_handle, S32 offset, U32 type)
 		//
 		//	Convert the Miles seek type to one of our own
 		//
-		int seek_type = SEEK_CUR;		
+		int seek_type = SEEK_CUR;
 		switch (type)
 		{
 			case AIL_FILE_SEEK_BEGIN:
@@ -2834,7 +2834,7 @@ WWAudioClass::File_Seek_Callback (U32 file_handle, S32 offset, U32 type)
 //
 ////////////////////////////////////////////////////////////////////////////////////////////
 U32 AILCALLBACK
-WWAudioClass::File_Read_Callback (U32 file_handle, void *buffer, U32 bytes)
+WWAudioClass::File_Read_Callback (void *file_handle, void *buffer, U32 bytes)
 {
 	U32 retval = 0;
 
@@ -2843,7 +2843,7 @@ WWAudioClass::File_Read_Callback (U32 file_handle, void *buffer, U32 bytes)
 	//
 	FileClass *file = reinterpret_cast<FileClass *> (file_handle);
 	if (file != NULL) {
-		
+
 		//
 		//	Read the bytes from the file
 		//
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h
index e5b7c5775d8..cc2f6a0c9ec 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h
@@ -34,19 +34,14 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __WWAUDIO_H
-#define __WWAUDIO_H
 
 #include "always.h"
 #pragma warning (push, 3)
 #include "mss.h"
 #pragma warning (pop)
 
-#include "Vector.H"
+#include "Vector.h"
 #include "SoundBuffer.h"
 #include "AudioEvents.h"
 #include "wwstring.h"
@@ -258,7 +253,7 @@ class WWAudioClass
 	//
 	float					Get_Effects_Level (void)	{ return m_EffectsLevel; }
 
-	//	See ENVIRONMENT_ defines in MSS.H for a list of possible values.
+	//	See ENVIRONMENT_ defines in MSS.h for a list of possible values.
 	int					Get_Reverb_Room_Type (void)		{ return m_ReverbRoomType; }
 	void					Set_Reverb_Room_Type (int type);
 
@@ -485,10 +480,10 @@ class WWAudioClass
 	//////////////////////////////////////////////////////////////////////
 	//	Miles File Callbacks
 	//////////////////////////////////////////////////////////////////////
-	static U32 AILCALLBACK	File_Open_Callback (char const *filename, U32 *file_handle);
-	static void AILCALLBACK	File_Close_Callback (U32 file_handle);
-	static S32 AILCALLBACK	File_Seek_Callback (U32 file_handle, S32 offset, U32 type);
-	static U32 AILCALLBACK	File_Read_Callback (U32 file_handle, void *buffer, U32 bytes);
+	static U32 AILCALLBACK	File_Open_Callback (char const *filename, void **file_handle);
+	static void AILCALLBACK	File_Close_Callback (void *file_handle);
+	static S32 AILCALLBACK	File_Seek_Callback (void *file_handle, S32 offset, U32 type);
+	static U32 AILCALLBACK	File_Read_Callback (void *file_handle, void *buffer, U32 bytes);
 
 private:
 
@@ -569,7 +564,7 @@ class WWAudioClass
 	DynamicVectorClass<AudibleSoundClass *>	m_Playlist;
 	DynamicVectorClass<AudibleSoundClass *>	m_CompletedSounds;
 
-	// Buffer caching		
+	// Buffer caching
 	DynamicVectorClass<CACHE_ENTRY_STRUCT>		m_CachedBuffers[MAX_CACHE_HASH];
 	int													m_MaxCacheSize;
 	int													m_CurrentCacheSize;
@@ -581,6 +576,3 @@ class WWAudioClass
 	float													m_EffectsLevel;
 	int													m_ReverbRoomType;
 };
-
-
-#endif //__WWAUDIO_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h
index 95d1e39f9f2..1524b235f39 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __LISTENERHANDLE_H
-#define __LISTENERHANDLE_H
 
 #include "sound3dhandle.h"
 
@@ -86,17 +81,14 @@ class ListenerHandleClass : public Sound3DHandleClass
 	void							Get_Sample_MS_Position (S32 *len, S32 *pos)	{ }
 	S32							Get_Sample_Playback_Rate (void)					{ return 0; }
 	void							Set_Sample_Playback_Rate (S32 rate)				{ }
-	
+
 protected:
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Protected methods
 	///////////////////////////////////////////////////////////////////
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Protected member data
 	///////////////////////////////////////////////////////////////////
 };
-
-
-#endif //__LISTENERHANDLE_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.cpp b/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.cpp
index 3e1cd965c03..9ff5f7ecbb5 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.cpp
@@ -310,7 +310,7 @@ Sound2DHandleClass::Get_Sample_MS_Position (S32 *len, S32 *pos)
 //
 //////////////////////////////////////////////////////////////////////
 void
-Sound2DHandleClass::Set_Sample_User_Data (S32 i, U32 val)
+Sound2DHandleClass::Set_Sample_User_Data (S32 i, void *val)
 {
 	if (SampleHandle != (HSAMPLE)INVALID_MILES_HANDLE) {
 		::AIL_set_sample_user_data (SampleHandle, i, val);
@@ -325,10 +325,10 @@ Sound2DHandleClass::Set_Sample_User_Data (S32 i, U32 val)
 //	Get_Sample_User_Data
 //
 //////////////////////////////////////////////////////////////////////
-U32
+void *
 Sound2DHandleClass::Get_Sample_User_Data (S32 i)
 {
-	U32 retval = 0;
+	void *retval = NULL;
 
 	if (SampleHandle != (HSAMPLE)INVALID_MILES_HANDLE) {
 		retval = ::AIL_sample_user_data (SampleHandle, i);
@@ -345,7 +345,7 @@ Sound2DHandleClass::Get_Sample_User_Data (S32 i)
 //////////////////////////////////////////////////////////////////////
 S32
 Sound2DHandleClass::Get_Sample_Playback_Rate (void)
-{	
+{
 	S32 retval = 0;
 
 	if (SampleHandle != (HSAMPLE)INVALID_MILES_HANDLE) {
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h
index 55bbcaf0e44..f76b8100b92 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SOUND2DHANDLE_H
-#define __SOUND2DHANDLE_H
 
 #include "soundhandle.h"
 
@@ -90,18 +85,15 @@ class Sound2DHandleClass : public SoundHandleClass
 	U32							Get_Sample_Loop_Count (void);
 	void							Set_Sample_MS_Position (U32 ms);
 	void							Get_Sample_MS_Position (S32 *len, S32 *pos);
-	void							Set_Sample_User_Data (S32 i, U32 val);
-	U32							Get_Sample_User_Data (S32 i);
+	void							Set_Sample_User_Data (S32 i, void *val);
+	void *							Get_Sample_User_Data (S32 i);
 	S32							Get_Sample_Playback_Rate (void);
 	void							Set_Sample_Playback_Rate (S32 rate);
-	
+
 protected:
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Protected member data
 	///////////////////////////////////////////////////////////////////
 	HSAMPLE		SampleHandle;
 };
-
-
-#endif //__SOUND2DHANDLE_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.cpp b/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.cpp
index 64dd294cd93..2e281315239 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.cpp
@@ -81,13 +81,13 @@ Sound3DHandleClass::Initialize (SoundBufferClass *buffer)
 		S32 test1 = 0;
 		S32 test2 = 0;
 		Get_Sample_MS_Position (&test1, &test2);
-		
+
 		//
 		//	Check for success
 		//
 		WWASSERT (success != 0);
 		if (success == 0) {
-			WWDEBUG_SAY (("WWAudio: Couldn't set 3d sample file.  Reason %s\r\n", ::AIL_last_error ()));
+			WWDEBUG_SAY (("WWAudio: Couldn't set 3d sample file.  Reason %s", ::AIL_last_error ()));
 		}
 
 	}
@@ -307,7 +307,7 @@ Sound3DHandleClass::Get_Sample_MS_Position (S32 *len, S32 *pos)
 //
 //////////////////////////////////////////////////////////////////////
 void
-Sound3DHandleClass::Set_Sample_User_Data (S32 i, U32 val)
+Sound3DHandleClass::Set_Sample_User_Data (S32 i, void *val)
 {
 	if (SampleHandle != (H3DSAMPLE)INVALID_MILES_HANDLE) {
 		::AIL_set_3D_object_user_data (SampleHandle, i, val);
@@ -321,10 +321,10 @@ Sound3DHandleClass::Set_Sample_User_Data (S32 i, U32 val)
 //	Get_Sample_User_Data
 //
 //////////////////////////////////////////////////////////////////////
-U32
+void *
 Sound3DHandleClass::Get_Sample_User_Data (S32 i)
 {
-	U32 retval = 0;
+	void *retval = NULL;
 
 	if (SampleHandle != (H3DSAMPLE)INVALID_MILES_HANDLE) {
 		retval = AIL_3D_object_user_data (SampleHandle, i);
@@ -341,7 +341,7 @@ Sound3DHandleClass::Get_Sample_User_Data (S32 i)
 //////////////////////////////////////////////////////////////////////
 S32
 Sound3DHandleClass::Get_Sample_Playback_Rate (void)
-{	
+{
 	S32 retval = 0;
 
 	if (SampleHandle != (H3DSAMPLE)INVALID_MILES_HANDLE) {
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h
index 20f6f7f7351..2040057aa5f 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SOUND3DHANDLE_H
-#define __SOUND3DHANDLE_H
 
 #include "soundhandle.h"
 
@@ -91,22 +86,19 @@ class Sound3DHandleClass : public SoundHandleClass
 	U32							Get_Sample_Loop_Count (void);
 	void							Set_Sample_MS_Position (U32 ms);
 	void							Get_Sample_MS_Position (S32 *len, S32 *pos);
-	void							Set_Sample_User_Data (S32 i, U32 val);
-	U32							Get_Sample_User_Data (S32 i);
+	void							Set_Sample_User_Data (S32 i, void *val);
+	void *							Get_Sample_User_Data (S32 i);
 	S32							Get_Sample_Playback_Rate (void);
 	void							Set_Sample_Playback_Rate (S32 rate);
-	
+
 protected:
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Protected methods
 	///////////////////////////////////////////////////////////////////
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Protected member data
 	///////////////////////////////////////////////////////////////////
 	H3DSAMPLE	SampleHandle;
 };
-
-
-#endif //__SOUND3DHANDLE_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h
index 697f0e6d3d2..297a9ba2a38 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SOUNDHANDLE_H
-#define __SOUNDHANDLE_H
 
 #include "WWAudio.h"
 
@@ -89,13 +84,13 @@ class SoundHandleClass
 
 	//
 	//	Initialization
-	//	
+	//
 	virtual void	Set_Miles_Handle (uint32 handle) = 0;
 	virtual void	Initialize (SoundBufferClass *buffer);
 
 	//
 	//	Sample control
-	//	
+	//
 	virtual void	Start_Sample (void) = 0;
 	virtual void	Stop_Sample (void) = 0;
 	virtual void	Resume_Sample (void) = 0;
@@ -108,22 +103,19 @@ class SoundHandleClass
 	virtual U32		Get_Sample_Loop_Count (void) = 0;
 	virtual void	Set_Sample_MS_Position (U32 ms) = 0;
 	virtual void	Get_Sample_MS_Position (S32 *len, S32 *pos) = 0;
-	virtual void	Set_Sample_User_Data (S32 i, U32 val) = 0;
-	virtual U32		Get_Sample_User_Data (S32 i) = 0;
+	virtual void	Set_Sample_User_Data (S32 i, void *val) = 0;
+	virtual void *	Get_Sample_User_Data (S32 i) = 0;
 	virtual S32		Get_Sample_Playback_Rate (void) = 0;
 	virtual void	Set_Sample_Playback_Rate (S32 rate) = 0;
-	
+
 protected:
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Protected methods
 	///////////////////////////////////////////////////////////////////
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Protected member data
 	///////////////////////////////////////////////////////////////////
 	SoundBufferClass *	Buffer;
 };
-
-
-#endif //__SOUNDHANDLE_H
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/soundstreamhandle.cpp b/Core/Libraries/Source/WWVegas/WWAudio/soundstreamhandle.cpp
index 1a7a76a2998..5bc7ed4e862 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/soundstreamhandle.cpp
+++ b/Core/Libraries/Source/WWVegas/WWAudio/soundstreamhandle.cpp
@@ -305,7 +305,7 @@ SoundStreamHandleClass::Get_Sample_MS_Position (S32 *len, S32 *pos)
 //
 //////////////////////////////////////////////////////////////////////
 void
-SoundStreamHandleClass::Set_Sample_User_Data (S32 i, U32 val)
+SoundStreamHandleClass::Set_Sample_User_Data (S32 i, void *val)
 {
 	if (SampleHandle != (HSAMPLE)INVALID_MILES_HANDLE) {
 		::AIL_set_sample_user_data (SampleHandle, i, val);
@@ -320,10 +320,10 @@ SoundStreamHandleClass::Set_Sample_User_Data (S32 i, U32 val)
 //	Get_Sample_User_Data
 //
 //////////////////////////////////////////////////////////////////////
-U32
+void *
 SoundStreamHandleClass::Get_Sample_User_Data (S32 i)
 {
-	U32 retval = 0;
+	void *retval = NULL;
 
 	if (SampleHandle != (HSAMPLE)INVALID_MILES_HANDLE) {
 		retval = ::AIL_sample_user_data (SampleHandle, i);
@@ -340,9 +340,9 @@ SoundStreamHandleClass::Get_Sample_User_Data (S32 i)
 //////////////////////////////////////////////////////////////////////
 S32
 SoundStreamHandleClass::Get_Sample_Playback_Rate (void)
-{	
+{
 	S32 retval = 0;
-	
+
 	if (StreamHandle != (HSTREAM)INVALID_MILES_HANDLE) {
 		retval = ::AIL_stream_playback_rate (StreamHandle);
 	}
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/soundstreamhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/soundstreamhandle.h
index ea02e8d76c3..ee4699df02d 100644
--- a/Core/Libraries/Source/WWVegas/WWAudio/soundstreamhandle.h
+++ b/Core/Libraries/Source/WWVegas/WWAudio/soundstreamhandle.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SOUNDSTREAMHANDLE_H
-#define __SOUNDSTREAMHANDLE_H
-
 
 #include "soundhandle.h"
 
@@ -63,7 +57,7 @@ class SoundStreamHandleClass	: public SoundHandleClass
 	///////////////////////////////////////////////////////////////////
 	//	Public methods
 	///////////////////////////////////////////////////////////////////
-	
+
 	//
 	//	RTTI
 	//
@@ -92,23 +86,20 @@ class SoundStreamHandleClass	: public SoundHandleClass
 	U32							Get_Sample_Loop_Count (void);
 	void							Set_Sample_MS_Position (U32 ms);
 	void							Get_Sample_MS_Position (S32 *len, S32 *pos);
-	void							Set_Sample_User_Data (S32 i, U32 val);
-	U32							Get_Sample_User_Data (S32 i);
+	void							Set_Sample_User_Data (S32 i, void *val);
+	void *							Get_Sample_User_Data (S32 i);
 	S32							Get_Sample_Playback_Rate (void);
 	void							Set_Sample_Playback_Rate (S32 rate);
 
 protected:
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Protected methods
 	///////////////////////////////////////////////////////////////////
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Protected member data
 	///////////////////////////////////////////////////////////////////
 	HSAMPLE		SampleHandle;
 	HSTREAM		StreamHandle;
 };
-
-
-#endif //__SOUNDSTREAMHANDLE_H
diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp
index 8991b8fc754..e072d8a0115 100644
--- a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp
+++ b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp
@@ -46,9 +46,8 @@
 //#include "win.h" can use this if allowed to see wwlib
 #include <stdlib.h>
 #include <stdarg.h>
-#include <stdio.h>
+#include <Utility/stdio_adapter.h>
 #include <assert.h>
-#include <string.h>
 #include <signal.h>
 #include "Except.h"
 
diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h
index c5bff389ba5..2db3048d263 100644
--- a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h
+++ b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h
@@ -34,27 +34,24 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef WWDEBUG_H
-#define WWDEBUG_H
 
 // TheSuperHackers @todo Recover WWDEBUG?
 #ifdef WWDEBUG
 #include <Utility/intrin_compat.h>
 #endif
 
+#include "../../../../../Core/GameEngine/Include/Common/Debug.h"
+
 // The macro MESSAGE allows user to put:
 // #pragma MESSAGE("Hello world")
 // anywhere in a source file.  The message:
 // sourcefname.cpp (123) : Hello world
 // would be printed if put in sourcefname.cpp on line 123 in compile window like an error.
 // You can then use next/prev error	hot keys to see where comment is.  It is not an error and
-// will be printed everytime it is compiled.  Very useful to put comments in code that cannot
-// be forgoten.
-#define STRING_IT(a) #a																				  
+// will be printed every time it is compiled.  Very useful to put comments in code that cannot
+// be forgotten.
+#define STRING_IT(a) #a
 #define TOKEN_IT(a) STRING_IT(,##a)
 #define MESSAGE(a) message (__FILE__ "(" TOKEN_IT(__LINE__) ") : " a)
 
@@ -106,13 +103,10 @@ void					WWDebug_DBWin32_Message_Handler( const char * message);
 
 /*
 ** Use the following #define so that all of the debugging messages
-** and strings go away when the release version is built.  
-** WWDEBUG_SAY(("dir = %f\n",dir));
+** and strings go away when the release version is built.
+** WWDEBUG_SAY(("dir = %f",dir));
 */
 
-// TheSuperHackers @compile feliwir 12/04/2025 Both Debug headers are identical. Use ZH.
-#include "../../../../../GeneralsMD/Code/GameEngine/Include/Common/Debug.h"
-
 #ifdef DEBUG_LOGGING
 #define WWDEBUG_SAY(x)							DEBUG_LOG(x)
 #define WWDEBUG_WARNING(x)					DEBUG_LOG(x)
@@ -121,7 +115,7 @@ void					WWDebug_DBWin32_Message_Handler( const char * message);
 #define WWDEBUG_WARNING(x)
 #endif
 
-// WW3d is compiled at warning level 4, causes DEBUG_ASSERTCRASH to generate 
+// WW3d is compiled at warning level 4, causes DEBUG_ASSERTCRASH to generate
 // the 4127 warning (constant conditional expression)
 #pragma warning(disable:4127)
 #define WWRELEASE_SAY(x)						WWDebug_Printf x
@@ -138,7 +132,7 @@ void					WWDebug_DBWin32_Message_Handler( const char * message);
 #define WWDEBUG_ERROR(x)						DEBUG_CRASH(x)
 #else
 #define WWASSERT( expr )
-#define WWASSERT_PRINT( expr, string )	
+#define WWASSERT_PRINT( expr, string )
 #define W3D_DIE
 #define WWDEBUG_ERROR(x)
 #endif
@@ -154,7 +148,7 @@ void					WWDebug_DBWin32_Message_Handler( const char * message);
 #endif
 
 /*
-** The WWDEBUG_TRIGGER macro can be used to ask the application if 
+** The WWDEBUG_TRIGGER macro can be used to ask the application if
 ** a debug trigger is set.  We define a couple of generic triggers
 ** for casual use.
 */
@@ -164,7 +158,7 @@ void					WWDebug_DBWin32_Message_Handler( const char * message);
 #ifdef WWDEBUG
 #define WWDEBUG_TRIGGER(x)						WWDebug_Check_Trigger(x)
 #else
-#define WWDEBUG_TRIGGER(x)						(0)	
+#define WWDEBUG_TRIGGER(x)						(0)
 #endif
 
 
@@ -175,8 +169,6 @@ void					WWDebug_DBWin32_Message_Handler( const char * message);
 #define WWDEBUG_PROFILE_START(x)				WWDebug_Profile_Start(x)
 #define WWDEBUG_PROFILE_STOP(x) 				WWDebug_Profile_Stop(x)
 #else
-#define WWDEBUG_PROFILE_START(x)				
+#define WWDEBUG_PROFILE_START(x)
 #define WWDEBUG_PROFILE_STOP(x)
 #endif
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h b/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h
index ba8fca6a768..97d0b7e695b 100644
--- a/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h
+++ b/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h
@@ -34,17 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef WWHACK_H
-#define WWHACK_H
 
 /*
 ** FORCE_LINK is a hack to force a module in a lib to be linked into the EXE.
-*/				
+*/
 #define		FORCE_LINK(	module )				void _Force_Link_ ## module( void );	_Force_Link_ ## module()
 #define		DECLARE_FORCE_LINK(	module )	void _Force_Link_ ## module( void ) {}
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp
index e946a8188bb..31bd9b3cf5e 100644
--- a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp
+++ b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp
@@ -41,7 +41,7 @@
 #include "always.h"
 #include "wwmemlog.h"
 #include "wwdebug.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "FastAllocator.h"
 
 #define USE_FAST_ALLOCATOR
@@ -95,7 +95,7 @@ static unsigned FreeCount;
 ** Name for each memory category.  I'm padding the array with some "undefined" strings in case
 ** someone forgets to set the name when adding a new category.
 */
-static const char * _MemoryCategoryNames[] =
+static const char *const _MemoryCategoryNames[] =
 {
 	"UNKNOWN",
 	"Geometry",
@@ -159,7 +159,7 @@ class ActiveCategoryStackClass : public VectorClass<int>
 		ThreadID(-1),
 		Count(0)
 	{ }
-	
+
 																				// If object was created but not Init'd, ThreadID will be -1 and Count == 0
 																				// If object was created and Init'd, ThreadID will not be -1.  We expect Count to return to 1 after all Pop's
 	~ActiveCategoryStackClass(void)									{ WWASSERT((ThreadID == -1 && Count == 0) || (ThreadID != -1 && Count == 1)); }
@@ -531,6 +531,7 @@ void WWMemoryLogClass::Register_Memory_Released(int category,int size)
 static void _MemLogCleanup(void)
 {
 	delete _TheMemLog;
+	_TheMemLog = NULL;
 }
 
 
@@ -578,10 +579,9 @@ MemLogClass * WWMemoryLogClass::Get_Log(void)
 void WWMemoryLogClass::Release_Log(void)
 {
 	MemLogMutexLockClass lock;
-	if (_TheMemLog) {
-		delete _TheMemLog;
-		_TheMemLog = NULL;
-	}
+
+	delete _TheMemLog;
+	_TheMemLog = NULL;
 }
 
 
diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h
index 18f77b69f63..b994bbe16bc 100644
--- a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h
+++ b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h
@@ -36,13 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif
-
-#ifndef WWMEMLOG_H
-#define WWMEMLOG_H
 
 #define LOG_MEMORY	// Comment this out to disable memlog compiling in
 
@@ -182,10 +176,3 @@ class WWMemorySampleClass
 #else
 #define	WWMEMLOG( category )
 #endif
-
-
-
-
-
-
-#endif //WWMEMLOG_H
diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp
index b8c001d5d5b..d3a9e534781 100644
--- a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp
+++ b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.cpp
@@ -55,12 +55,11 @@
 #include "wwdebug.h"
 //#include "systimer.h"
 #include "systimer.h"
-#include "RAWFILE.H"
+#include "RAWFILE.h"
 #include "ffactory.h"
 #include "simplevec.h"
 #include "cpudetect.h"
 #include "hashtemplate.h"
-#include <stdio.h>
 #include <Utility/intrin_compat.h>
 
 static SimpleDynVecClass<WWProfileHierachyNodeClass*> ProfileCollectVector;
@@ -75,7 +74,7 @@ unsigned WWProfile_Get_System_Time()
 	return TIMEGETTIME();
 }
 
-WWINLINE double WWProfile_Get_Inv_Processor_Ticks_Per_Second(void) 
+WWINLINE double WWProfile_Get_Inv_Processor_Ticks_Per_Second(void)
 {
 #ifdef WIN32
 	return CPUDetectClass::Get_Inv_Processor_Ticks_Per_Second();
@@ -182,7 +181,7 @@ WWProfileHierachyNodeClass* WWProfileHierachyNodeClass::Clone_Hierarchy(WWProfil
 	node->TotalTime=TotalTime;
 	node->StartTime=StartTime;
 	node->RecursionCounter=RecursionCounter;
-	
+
 	if (Child) {
 		node->Child=Child->Clone_Hierarchy(this);
 	}
@@ -200,7 +199,7 @@ void WWProfileHierachyNodeClass::Write_To_File(FileClass* file,int recursion)
 		StringClass string;
 		StringClass work;
 		for (i=0;i<recursion;++i) { string+="\t"; }
-		work.Format("%s\t%d\t%f\r\n",Name,TotalCalls,TotalTime*1000.0f);
+		work.Format("%s\t%d\t%f\n",Name,TotalCalls,TotalTime*1000.0f);
 		string+=work;
 		file->Write(string.str(),string.Get_Length());
 	}
@@ -222,7 +221,7 @@ void WWProfileHierachyNodeClass::Add_To_String_Compact(StringClass& string,int r
 	if (Child) {
 		StringClass work;
 		Child->Add_To_String_Compact(work,recursion+1);
-		if (work.Get_Length()!=0) {
+		if (!work.Is_Empty()) {
 			string+="{";
 			string+=work;
 			string+="}";
@@ -564,7 +563,7 @@ void	WWProfileManager::End_Collecting(const char* filename)
 {
 	int i;
 	if (filename && ProfileCollectVector.Count()!=0) {
-		FileClass * file= _TheWritingFileFactory->Get_File(filename);	
+		FileClass * file= _TheWritingFileFactory->Get_File(filename);
 		if (file != NULL) {
 			//
 			//	Open or create the file
@@ -574,8 +573,8 @@ void	WWProfileManager::End_Collecting(const char* filename)
 			StringClass str;
 			float avg_frame_time=TotalFrameTimes/float(ProfileCollectVector.Count());
 			str.Format(
-				"Total frames: %d, average frame time: %fms\r\n"
-				"All frames taking more than twice the average frame time are marked with keyword SPIKE.\r\n\r\n",
+				"Total frames: %d, average frame time: %fms\n"
+				"All frames taking more than twice the average frame time are marked with keyword SPIKE.\n\n",
 				ProfileCollectVector.Count(),avg_frame_time*1000.0f);
 			file->Write(str.str(),str.Get_Length());
 
@@ -590,11 +589,11 @@ void	WWProfileManager::End_Collecting(const char* filename)
 					if (name[i]==',') name[i]='.';
 					if (name[i]==';') name[i]=':';
 				}
-				str.Format("ID: %d %s\r\n",ite.Peek_Value(),name);
+				str.Format("ID: %d %s\n",ite.Peek_Value(),name.str());
 				file->Write(str.str(),str.Get_Length());
 			}
 
-			str.Format("\r\n\r\n");
+			str.Format("\n\n");
 			file->Write(str.str(),str.Get_Length());
 
 			for (i=0;i<ProfileCollectVector.Count();++i) {
@@ -604,7 +603,7 @@ void	WWProfileManager::End_Collecting(const char* filename)
 				str+="\r\n";
 				file->Write(str.str(),str.Get_Length());
 			}
-		
+
 			//
 			//	Close the file
 			//
@@ -615,7 +614,6 @@ void	WWProfileManager::End_Collecting(const char* filename)
 
 	for (i=0;i<ProfileCollectVector.Count();++i) {
 		delete ProfileCollectVector[i];
-		ProfileCollectVector[i]=0;
 	}
 	ProfileCollectVector.Delete_All();
 	ProfileCollecting=false;
@@ -793,7 +791,7 @@ void WWProfileManager::Load_Profile_Log(const char* filename, WWProfileHierachyI
 	count=0;
 
 	unsigned i;
-	FileClass * file= _TheFileFactory->Get_File(filename);	
+	FileClass * file= _TheFileFactory->Get_File(filename);
 	if (file != NULL && file->Is_Available()) {
 		HashTemplateClass<StringClass, unsigned> string_hash;
 		HashTemplateClass<unsigned, StringClass> id_hash;
@@ -995,7 +993,7 @@ WWTimeItClass::~WWTimeItClass( void )
 	End -= Time;
 #ifdef WWDEBUG
 	float time = End * WWProfile_Get_Inv_Processor_Ticks_Per_Second();
-	WWDEBUG_SAY(( "*** WWTIMEIT *** %s took %1.9f\n", Name, time ));
+	WWDEBUG_SAY(( "*** WWTIMEIT *** %s took %1.9f", Name, time ));
 #endif
 }
 
@@ -1039,7 +1037,7 @@ WWMemoryAndTimeLog::WWMemoryAndTimeLog(const char* name)
 	IntermediateAllocSizeStart=AllocSizeStart;
 	StringClass tmp(0,true);
 	for (unsigned i=0;i<TabCount;++i) tmp+="\t";
-	WWRELEASE_SAY(("%s%s {\n",tmp,name));
+	WWRELEASE_SAY(("%s%s {",tmp.str(),name));
 	TabCount++;
 }
 
@@ -1048,17 +1046,17 @@ WWMemoryAndTimeLog::~WWMemoryAndTimeLog()
 	if (TabCount>0) TabCount--;
 	StringClass tmp(0,true);
 	for (unsigned i=0;i<TabCount;++i) tmp+="\t";
-	WWRELEASE_SAY(("%s} ",tmp));
+	WWRELEASE_SAY(("%s} ",tmp.str()));
 
 	unsigned current_time=WWProfile_Get_System_Time();
 	int current_alloc_count=FastAllocatorGeneral::Get_Allocator()->Get_Total_Allocation_Count();
 	int current_alloc_size=FastAllocatorGeneral::Get_Allocator()->Get_Total_Allocated_Size();
-	WWRELEASE_SAY(("IN TOTAL %s took %d.%3.3d s, did %d memory allocations of %d bytes\n",
-		Name,
+	WWRELEASE_SAY(("IN TOTAL %s took %d.%3.3d s, did %d memory allocations of %d bytes",
+		Name.str(),
 		(current_time - TimeStart)/1000, (current_time - TimeStart)%1000,
 		current_alloc_count - AllocCountStart,
 		current_alloc_size - AllocSizeStart));
-	WWRELEASE_SAY(("\n"));
+	WWRELEASE_SAY((""));
 
 }
 
@@ -1070,8 +1068,8 @@ void WWMemoryAndTimeLog::Log_Intermediate(const char* text)
 	int current_alloc_size=FastAllocatorGeneral::Get_Allocator()->Get_Total_Allocated_Size();
 	StringClass tmp(0,true);
 	for (unsigned i=0;i<TabCount;++i) tmp+="\t";
-	WWRELEASE_SAY(("%s%s took %d.%3.3d s, did %d memory allocations of %d bytes\n",
-		tmp,
+	WWRELEASE_SAY(("%s%s took %d.%3.3d s, did %d memory allocations of %d bytes",
+		tmp.str(),
 		text,
 		(current_time - IntermediateTimeStart)/1000, (current_time - IntermediateTimeStart)%1000,
 		current_alloc_count - IntermediateAllocCountStart,
diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h
index ee060a07e91..ba76edea986 100644
--- a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h
+++ b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h
@@ -34,15 +34,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 //#define ENABLE_TIME_AND_MEMORY_LOG
-
-#ifndef WWPROFILE_H
-#define WWPROFILE_H
-
 #include "wwstring.h"
 
 #ifdef _UNIX
@@ -52,12 +46,12 @@ typedef signed long long _int64;
 
 // enable profiling by default in debug mode.
 #ifdef WWDEBUG
-#define ENABLE_WWPROFILE	
+#define ENABLE_WWPROFILE
 #endif
 
 extern unsigned WWProfile_Get_System_Time();	// timeGetTime() wrapper
 class FileClass;
-			
+
 /*
 ** A node in the WWProfile Hierarchy Tree
 */
@@ -162,7 +156,7 @@ class WWProfileIterator
 	const char *	Get_Current_Parent_Name( void )			{ return CurrentParent->Get_Name(); }
 	int				Get_Current_Parent_Total_Calls( void )	{ return CurrentParent->Get_Total_Calls(); }
 	float				Get_Current_Parent_Total_Time( void )	{ return CurrentParent->Get_Total_Time(); }
-	
+
 protected:
 	WWProfileHierachyNodeClass *	CurrentParent;
 	WWProfileHierachyNodeClass *	CurrentChild;
@@ -247,18 +241,18 @@ class	WWProfileSampleClass {
 	bool Enabled;
 public:
 	WWProfileSampleClass( const char * name, bool is_root )		 : IsRoot(is_root), Enabled(WWProfileManager::Is_Profile_Enabled())
-	{ 
+	{
 		if (Enabled) {
-			if (IsRoot) WWProfileManager::Start_Root_Profile( name ); 
-			else WWProfileManager::Start_Profile( name ); 
+			if (IsRoot) WWProfileManager::Start_Root_Profile( name );
+			else WWProfileManager::Start_Profile( name );
 		}
 	}
-	
-	~WWProfileSampleClass( void )					
-	{ 
+
+	~WWProfileSampleClass( void )
+	{
 		if (Enabled) {
-			if (IsRoot) WWProfileManager::Stop_Root_Profile(); 
-			else WWProfileManager::Stop_Profile(); 
+			if (IsRoot) WWProfileManager::Stop_Root_Profile();
+			else WWProfileManager::Stop_Profile();
 		}
 	}
 };
@@ -293,7 +287,7 @@ class	WWTimeItClass {
 
 
 /*
-** WWMeasureItClass is like WWTimeItClass, but it pokes the result into the given float, 
+** WWMeasureItClass is like WWTimeItClass, but it pokes the result into the given float,
 ** and can be used in the release build.
 */
 class	WWMeasureItClass {
@@ -311,7 +305,7 @@ class	WWMeasureItClass {
 // Use the first macro to log time and memory usage within the stack segment.
 // Use the second macro to log intermediate values. The intermediate values are
 // calculated from the previous intermediate log, so you can log how much each
-// item takes by placing the macro after each of the 
+// item takes by placing the macro after each of the
 //
 // ----------------------------------------------------------------------------
 
@@ -338,5 +332,3 @@ struct WWMemoryAndTimeLog
 	~WWMemoryAndTimeLog();
 	void Log_Intermediate(const char* text);
 };
-
-#endif	// WWPROFILE_H
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
index 467d1febf5b..ee2966bc91c 100644
--- a/Core/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
+++ b/Core/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
@@ -3,7 +3,7 @@ set(WWDOWNLOAD_SRC
     Download.h
     DownloadDebug.h
     downloaddefs.h
-    FTP.CPP
+    FTP.cpp
     ftp.h
     ftpdefs.h
     registry.cpp
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/Download.cpp b/Core/Libraries/Source/WWVegas/WWDownload/Download.cpp
index 4cb2f215822..8f8ab20e218 100644
--- a/Core/Libraries/Source/WWVegas/WWDownload/Download.cpp
+++ b/Core/Libraries/Source/WWVegas/WWDownload/Download.cpp
@@ -19,11 +19,11 @@
 // Download.cpp : Implementation of CDownload
 #include "DownloadDebug.h"
 #include "Download.h"
+#include "stringex.h"
 #include <mmsystem.h>
 #include <assert.h>
 #include <direct.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <sys/stat.h>
 
 /////////////////////////////////////////////////////////////////////////////
@@ -47,7 +47,7 @@ HRESULT CDownload::DownloadFile(LPCSTR server, LPCSTR username, LPCSTR password,
 	// If we're still connected, make sure we're on the right server
 	if (m_Status == DOWNLOADSTATUS_FINDINGFILE)
 	{
-		if ((strcmp(m_Server, server)) || (strcmp(m_Login, username)))
+		if ((strcmp(m_Server, server) != 0) || (strcmp(m_Login, username) != 0))
 		{
 			// Damn, a server switch.  Close conn & fix state
 			m_Ftp->DisconnectFromServer();
@@ -69,15 +69,15 @@ HRESULT CDownload::DownloadFile(LPCSTR server, LPCSTR username, LPCSTR password,
 	_mkdir("download");
 
 	// Copy parameters to member variables.
-	strncpy( m_Server, server, sizeof( m_Server ) );
-	strncpy( m_Login, username, sizeof( m_Login ) );
-	strncpy( m_Password, password, sizeof( m_Password ) );
-	strncpy( m_File, file, sizeof( m_File ) );
-	strncpy( m_LocalFile, localfile, sizeof( m_LocalFile ) );
+	strlcpy( m_Server, server, sizeof( m_Server ) );
+	strlcpy( m_Login, username, sizeof( m_Login ) );
+	strlcpy( m_Password, password, sizeof( m_Password ) );
+	strlcpy( m_File, file, sizeof( m_File ) );
+	strlcpy( m_LocalFile, localfile, sizeof( m_LocalFile ) );
 
-	strncpy( m_LastLocalFile, localfile, sizeof( m_LastLocalFile ) );
+	strlcpy( m_LastLocalFile, localfile, sizeof( m_LastLocalFile ) );
 
-	strncpy( m_RegKey, regkey, sizeof( m_RegKey ) );
+	strlcpy( m_RegKey, regkey, sizeof( m_RegKey ) );
 	m_TryResume = tryresume;
 	m_StartPosition=0;
 
@@ -113,8 +113,7 @@ HRESULT CDownload::GetLastLocalFile(char *local_file, int maxlen) {
 	if (local_file==0)
 		return(E_FAIL);
 
-	strncpy(local_file, m_LastLocalFile, maxlen);
-	local_file[maxlen-1]=0;
+	strlcpy(local_file, m_LastLocalFile, maxlen);
 
 	return(S_OK);
 }
@@ -175,7 +174,7 @@ HRESULT CDownload::PumpMessages()
 
 	if( m_Status == DOWNLOADSTATUS_GO )
 	{
-		// Check to see whether the file already exists locally 
+		// Check to see whether the file already exists locally
 
 /***********
 		if (m_TryResume == false)
@@ -195,7 +194,7 @@ HRESULT CDownload::PumpMessages()
 		// Tell the client that we're starting to connect.
 
 		Listener->OnStatusUpdate( DOWNLOADSTATUS_CONNECTING );
-		
+
 		m_Status = DOWNLOADSTATUS_CONNECTING;
 	}
 
@@ -204,7 +203,7 @@ HRESULT CDownload::PumpMessages()
 	{
 		// Connect to the server
       //////////DBGMSG("Connect to Server");
-				
+
 		iResult = m_Ftp->ConnectToServer( m_Server );
       ////////////DBGMSG("out of FTP connect");
 
@@ -255,7 +254,7 @@ HRESULT CDownload::PumpMessages()
 
 	if(( m_Status == DOWNLOADSTATUS_FINDINGFILE ) && (strlen(m_File)))
 	{
-		
+
 		// Find the file on the server
       ///////////DBGMSG("Find File");
 
@@ -277,8 +276,8 @@ HRESULT CDownload::PumpMessages()
 			//
 			// We identify patches because they are written into the patches folder.
 			struct _stat statdata;
-			if (	(_stat(m_LocalFile, &statdata) == 0) && 
-					(statdata.st_size == m_FileSize) && 
+			if (	(_stat(m_LocalFile, &statdata) == 0) &&
+					(statdata.st_size == m_FileSize) &&
 					(_strnicmp(m_LocalFile, "patches\\", strlen("patches\\"))==0)) {
 				// OK, no need to download this again....
 
@@ -289,7 +288,7 @@ HRESULT CDownload::PumpMessages()
 				m_BytesRead			= 0;
 				m_File[ 0 ]			= '\0';
 				m_LocalFile[ 0 ]	= '\0';
-			
+
 				Listener->OnEnd();
 
 				reenter = 0;
@@ -373,9 +372,9 @@ HRESULT CDownload::PumpMessages()
 
 			DEBUG_LOG(("About to OnProgressUpdate() - m_FileSize=%d, m_BytesRead=%d, timetaken=%d, numerator=%d",
 				m_FileSize, m_BytesRead, timetaken, ( ( m_FileSize - m_BytesRead )  * timetaken )));
-			DEBUG_LOG((", m_startPosition=%d, denominator=%d, predictionTime=%d\n",
+			DEBUG_LOG((", m_startPosition=%d, denominator=%d, predictionTime=%d",
 				m_StartPosition, ( m_BytesRead - m_StartPosition ), predictionIndex));
-			DEBUG_LOG(("vals are %d %d %d %d %d %d %d %d\n",
+			DEBUG_LOG(("vals are %d %d %d %d %d %d %d %d",
 				m_predictionTimes[ 0 ], m_predictionTimes[ 1 ], m_predictionTimes[ 2 ], m_predictionTimes[ 3 ],
 				m_predictionTimes[ 4 ], m_predictionTimes[ 5 ], m_predictionTimes[ 6 ], m_predictionTimes[ 7 ]));
 
@@ -419,7 +418,7 @@ HRESULT CDownload::PumpMessages()
 		m_BytesRead			= 0;
 		m_File[ 0 ]			= '\0';
 		m_LocalFile[ 0 ]	= '\0';
-	
+
 		Listener->OnEnd();
 	}
 
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/Download.h b/Core/Libraries/Source/WWVegas/WWDownload/Download.h
index 389a4abe33f..bed1916507f 100644
--- a/Core/Libraries/Source/WWVegas/WWDownload/Download.h
+++ b/Core/Libraries/Source/WWVegas/WWDownload/Download.h
@@ -18,8 +18,7 @@
 
 // Download.h : Declaration of the CDownload
 
-#ifndef __DOWNLOAD_H_
-#define __DOWNLOAD_H_
+#pragma once
 
 //#include "../resource.h"       // main symbols
 #include "WWDownload/ftp.h"
@@ -95,5 +94,3 @@ class CDownload
 	Cftp			*m_Ftp;
 	IDownload	*Listener;
 };
-
-#endif //__DOWNLOAD_H_
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h b/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h
index 7a4d7872fa7..4948c19cc65 100644
--- a/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h
+++ b/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h
@@ -18,9 +18,6 @@
 
 // DownloadDebug.h
 
-#ifndef __DOWNLOADDEBUG_H_
-#define __DOWNLOADDEBUG_H_
+#pragma once
 
 #include "Common/Debug.h"
-
-#endif //__DOWNLOADDEBUG_H_
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/FTP.CPP b/Core/Libraries/Source/WWVegas/WWDownload/FTP.CPP
deleted file mode 100644
index 1a55571639d..00000000000
--- a/Core/Libraries/Source/WWVegas/WWDownload/FTP.CPP
+++ /dev/null
@@ -1,1847 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// ftp.cpp : Implementation of Cftp
-
-/*************************************************************************/
-/*_$                      Include Files                                  */
-/*************************************************************************/
-
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/timeb.h>
-#include <stdlib.h>
-#include <process.h>
-#include <sys/stat.h>
-#include <io.h>
-#include <time.h>
-#include "assert.h"
-#include "ftp.h"
-#include <time.h>
-#include <direct.h>
-#include <errno.h>
-//#include "wlib/wstring.h"
-
-#include "DownloadDebug.h"
-
-// umm... what?? BGC 3/27/03
-//#ifndef RTS_DEBUG
-//#define RTS_DEBUG
-//#endif
-
-/*************************************************************************/
-/*_$                      External References                            */
-/*************************************************************************/
-
-/*************************************************************************/
-/*_$                      Private Datatypes                              */
-/*************************************************************************/
-
-/*************************************************************************/
-/*_$                      Public Data                                    */
-/*************************************************************************/
-
-/*************************************************************************/
-/*_$                      Private Data                                   */
-/*************************************************************************/
-
-//static HOSTENT  gThreadHost;
-struct sockaddr_in  gThreadAddress;
-
-static int		 gThreadFlag;
-
-/*************************************************************************/
-/*_$                      Private Prototypes                             */
-/*************************************************************************/
-
-/*************************************************************************/
-/*_$                      Private Macros                                 */
-/*************************************************************************/
-
-
-/* Status flags */
-
-#define FTPSTAT_INIT				0
-#define FTPSTAT_CONNECTING			10
-#define FTPSTAT_WAITINGSERVEROK		15
-#define FTPSTAT_CONNECTED			20
-#define FTPSTAT_SENDINGUSER			30
-#define FTPSTAT_SENTUSER			40
-#define FTPSTAT_SENDINGPASS			50
-#define FTPSTAT_LOGGEDIN			60
-#define FTPSTAT_LOGGINGOFF			70
-#define FTPSTAT_SENDINGQUIT			80
-#define FTPSTAT_SENTQUIT			90
-#define FTPSTAT_FILEFOUND			100
-#define FTPSTAT_SENDINGCWD			110
-#define FTPSTAT_SENTCWD				120
-#define FTPSTAT_SENTPORT			130
-#define FTPSTAT_SENDINGLIST			140
-#define FTPSTAT_SENTLIST			150
-#define FTPSTAT_LISTDATAOPEN		160
-#define FTPSTAT_LISTDATARECVD		170
-#define FTPSTAT_FILEOPEN			180
-#define FTPSTAT_SENTFILEPORT		190
-#define FTPSTAT_SENDINGTYPE			200
-#define FTPSTAT_SENTTYPE			210
-#define FTPSTAT_SENDINGREST			220
-#define FTPSTAT_SENTREST			230
-#define FTPSTAT_SENDINGRETR			240
-#define FTPSTAT_SENTRETR			250
-#define FTPSTAT_FILEDATAOPEN		260
-#define FTPSTAT_FILEDATACLOSED		270
-#define FTPSTAT_TRANSFERREPLY		280
-
-
-// Utility functions
-bool Prepare_Directories(const char *rootdir, const char *filename);
-
-//
-// This is here as a hack...
-// Some firewalls break the TCP stack so non-blocking sockets don't work right...
-//
-static bool Use_Non_Blocking_Mode(void) 
-{
-	HKEY regKey;
-	LONG regRetval;
-	DWORD bufsiz=0;
-	DWORD type=0;
-	DWORD value=0;
-
-
-	// Try and open the named key
-	regRetval=RegOpenKeyEx(HKEY_LOCAL_MACHINE,"SOFTWARE\\Westwood\\Earth And Beyond Beta 2",0,KEY_READ,&regKey);
-	if (regRetval!=ERROR_SUCCESS)
-		return(TRUE);		// default TRUE
-
-	// Fetch the flag
-	bufsiz=sizeof(value);
-	type=REG_DWORD;
-	regRetval=RegQueryValueEx(regKey, "UseNonBlockingFTP", 0, &type, (BYTE*) &value, &bufsiz);
-
-	RegCloseKey(regKey);
-
-	if ((regRetval!=ERROR_SUCCESS) || (type != REG_DWORD))
-		return(TRUE);
-
-	return(bool(value));
-}
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Cftp
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	Cftp::Cftp()
-*
-* $_Description :
-*	Constructor for the ftp class - initialises more or less all data 
-*	members to zero.
-*
-* $_Parameters  :
-*	None.
-*
-* $_ReturnValue :
-*	None.
-*
-***************************************************************************/
-
-
-Cftp::Cftp()
-{
-  ZeroStuff();
-}
-
-
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	Cftp::Cftp()
-*
-* $_Description :
-*	Destructor for the ftp class - close sockets behind us as we leave.
-*
-* $_Parameters  :
-*	None.
-*
-* $_ReturnValue :
-*	None.
-*
-***************************************************************************/
-
-
-Cftp::~Cftp()
-{
-  CloseSockets();
-
-	if (m_pfLocalFile)
-	{
-		fclose(m_pfLocalFile);
-		m_pfLocalFile = NULL;
-	}
-}
-
-void Cftp::CloseSockets(void)
-{
-
-	if( m_iDataSocket )
-	{
-		closesocket( m_iDataSocket );
-		m_iDataSocket=0;
-	}
-
-	if( m_iCommandSocket )
-	{
-		closesocket( m_iCommandSocket );
-		m_iCommandSocket=0;
-	}
-
-}
-
-void Cftp::ZeroStuff(void)
-{
-	m_iBytesRead = 0;
-	m_iFileSize = 0;
-	m_szRemoteFilePath[ 0 ] = (char)0;
-	m_szRemoteFileName[ 0 ] = (char)0;
-	m_szLocalFilePath[ 0 ] = (char)0;
-	m_szLocalFileName[ 0 ] = (char)0;
-	m_szServerName[ 0 ] = (char)0;
-	m_szUserName[ 0 ] = (char)0;
-	m_szPassword[ 0 ] = (char)0;
-	m_iDataSocket = 0;
-	m_iCommandSocket = 0;
-	m_iFilePos = 0;
-	m_iStatus = FTPSTAT_INIT;
-	m_sendNewPortStatus = 0;
-	m_pfLocalFile = NULL;
-	m_findStart = 0;
-	memset(&m_CommandSockAddr, 0, sizeof(m_CommandSockAddr));
-	memset(&m_DataSockAddr, 0, sizeof(m_DataSockAddr));
-}
-
-
-DWORD WINAPI gethostbynameA( void * szName )
-{
-	HOSTENT *he = gethostbyname( (const char *)szName );
-   //////DBGMSG("Hostname copy start");
-
-	if (he)
-		memcpy((char *)&(gThreadAddress.sin_addr), he->h_addr, he->h_length );
-	else
-		memcpy((char *)&(gThreadAddress.sin_addr),"",strlen("")+1);
-   /////DBGMSG("Hostname copy complete");
-
-	gThreadFlag = 1;
-	return 0;
-}
-
-
-int Cftp::AsyncGetHostByName(char * szName, struct sockaddr_in &address )
-{
-	static int            stat = 0;
-	static unsigned long  threadid;
-
-	if( stat == 0 )
-	{
-		/* Kick off gethostname thread */
-		gThreadFlag = 0;
-      memset(&gThreadAddress,0,sizeof(gThreadAddress));
-
-		if( CreateThread( NULL, 0, gethostbynameA, szName, 0, &threadid ) == NULL )
-		{
-			return( FTP_FAILED );
-		}
-		stat = 1;
-	}
-	if( stat == 1 )
-	{
-		if( gThreadFlag )
-		{
-			/* Thread finished */
-         address = gThreadAddress;
-         address.sin_family=AF_INET;
-			stat = 0;
-			return( FTP_SUCCEEDED );
-		}
-	}
-
-	return( FTP_TRYING );
-}
-
-
-
-
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	HRESULT  Cftp::ConnectToServer(LPCSTR szServerName)
-*
-* $_Description :
-*	Overloaded funciton that makes a connection to a server.  Will probably
-*	fail on (at least) the first call, as it may take a while for the server
-*	to send it's "ready" reply.
-*
-* $_Parameters  :
-*	-> const char * szServerName 
-*	Optionally, the name of the server to connect to.  This must be specified
-*	in the first call to the function.
-*
-* $_ReturnValue :
-*	FTP_TRYING until the connection has succeeded, then FTP_SUCCEEDED.
-*	FTP_FAILED on error.
-*
-***************************************************************************/
-
-
-HRESULT  Cftp::ConnectToServer(LPCSTR szServerName)
-{
-	struct sockaddr_in  address;
-	unsigned long       uTemp;
-	unsigned long       serverIP;
-	char                buffer[ 256 ];
-	int                 iReply, error;
-
-	strncpy( m_szServerName, szServerName, 128 );
-
-	if( m_iStatus == FTPSTAT_INIT )
-	{
-		/* Find the IP address of the server */
-
-		serverIP = inet_addr( m_szServerName );
-
-		memset( &m_CommandSockAddr, 0, sizeof( m_CommandSockAddr ) );
-		m_CommandSockAddr.sin_family = AF_INET;
-
-		if( serverIP == INADDR_NONE )
-		{
-			/* It's an FQDN - hopefully. */
-         ////////DBGMSG("Async gethostbyname");
-			if( AsyncGetHostByName( m_szServerName, address ) == FTP_TRYING )
-			{
-				return( FTP_TRYING );
-			}
-         //////DBGMSG("Got hostbyname");
-
-			if( address.sin_addr.s_addr == 0 )
-			{
-            ///////DBGMSG("gethostbyname failed");
-				return( FTP_FAILED );
-			}
-
-         m_CommandSockAddr=address;
-
-			///////memcpy( (char *)&(m_CommandSockAddr.sin_addr), he.h_addr, he.h_length );
-
-			serverIP = m_CommandSockAddr.sin_addr.s_addr;
-         //////DBGMSG("ServerIP = "<<serverIP);
-
-         /////DBGMSG("Memcpy OK");
-		}
-		else
-		{
-			m_CommandSockAddr.sin_addr.s_addr = serverIP;
-		}
-
-
-		/* Set port number. */
-
-		m_CommandSockAddr.sin_port = htons( 21 );
-
-		/* Open a socket. */
-
-		m_iCommandSocket = socket( AF_INET, SOCK_STREAM, 0 );
-
-		if( m_iCommandSocket < 0 )
-		{
-			return( FTP_FAILED );
-		}
-
-      //////DBGMSG("Socket created");
-
-		/* Set socket to non-blocking */
-
-		uTemp = 1;
-
-		if (Use_Non_Blocking_Mode()) {
-			if( ioctlsocket( m_iCommandSocket, FIONBIO, &uTemp ) == SOCKET_ERROR )
-			{
-				return( FTP_FAILED );
-			}
-		}
-
-		// Go ahead and advance the state....
-		m_iStatus = FTPSTAT_CONNECTING;
-
-
-		// Start the connection process....
-		if( connect( m_iCommandSocket, (struct sockaddr *)&m_CommandSockAddr, sizeof( m_CommandSockAddr ) ) == -1 )
-		{
-			error = WSAGetLastError();
-			if( ( error == WSAEWOULDBLOCK ) || ( error == WSAEINVAL ) || ( error == WSAEALREADY ) )
-			{
-				return( FTP_TRYING );
-			}
-
-			if( error != WSAEISCONN )
-			{
-            ////////DBGMSG("Connect failed");
-				closesocket( m_iCommandSocket );
-				return( FTP_FAILED );
-			}
-		}
-	}
-
-	if( m_iStatus == FTPSTAT_CONNECTING )
-	{
-		// Check to see if we're connected
-		fd_set wset;
-		fd_set eset;
-		FD_ZERO(&wset);
-		FD_ZERO(&eset);
-		FD_SET(m_iCommandSocket,&wset);
-		FD_SET(m_iCommandSocket,&eset);
-		timeval tv;
-		tv.tv_sec=0;
-		tv.tv_usec=0;
-		int retval=select(m_iCommandSocket+1,0,&wset,&eset,&tv);
-		if (retval == 0)	// not ready yet....
-			return(FTP_TRYING);
-		if (FD_ISSET(m_iCommandSocket, &eset)) {
-			// OK, the exception flag is set, guess we couldn't connect....
-			closesocket( m_iCommandSocket );
-			return( FTP_FAILED );
-		}
-		if (FD_ISSET(m_iCommandSocket, &wset)) {
-			// OK, the write flag is set, we're good to go...
-			m_iStatus = FTPSTAT_WAITINGSERVEROK;
-		}
-	}
-
-	if( m_iStatus == FTPSTAT_WAITINGSERVEROK )
-	{
-		iReply=0;
-		if (RecvReply( buffer, 256, &iReply ) != FTP_SUCCEEDED) 
-			return(FTP_TRYING);
-
-		if (iReply != FTPREPLY_SERVEROK)
-			return(FTP_FAILED);
-
-		m_iStatus = FTPSTAT_CONNECTED;
-		return( FTP_SUCCEEDED );
-	}
-
-	return( FTP_FAILED );
-
-}
-
-
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	STDMETHOD Cftp::LoginToServer( LPCSTR szUserName, LPCSTR szPassword )
-*
-* $_Description :
-*	Logs into a server.  ConnectToServer() must have succeeded before this
-*	call is made.
-*
-* $_Parameters  :
-*	-> LPCSTR szUserName
-*	The username under which to log in.
-*
-*	-> LPCSTR szPassword
-*	The password to use.
-*
-* $_ReturnValue :
-*	FTP_TRYING until the login has succeeded, then FTP_SUCCEEDED.
-*	FTP_FAILED on error.
-*
-***************************************************************************/
-
-
-HRESULT  Cftp::LoginToServer( LPCSTR szUserName, LPCSTR szPassword )
-{
-	char command[ 256 ];
-	int iReply;
-
-	strncpy( m_szUserName, szUserName, 128 );
-	strncpy( m_szPassword, szPassword, 128 );
-
-	memset( command, 0, 256 );
-
-	if( m_iStatus == FTPSTAT_CONNECTED )
-	{
-		sprintf( command, "USER %s\r\n", m_szUserName );
-
-		if( SendCommand( command, 7 + strlen( m_szUserName ) ) < 0 )
-		{
-			return( FTP_TRYING );
-		}
-
-		m_iStatus = FTPSTAT_SENDINGUSER;
-	}
-
-	if( m_iStatus == FTPSTAT_SENDINGUSER )
-	{
-		if(RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED ) 
-			return( FTP_TRYING );
-
-		if (iReply != FTPREPLY_PASSWORD)
-			return( FTP_FAILED );
-
-		m_iStatus = FTPSTAT_SENTUSER;
-	}
-
-	if( m_iStatus == FTPSTAT_SENTUSER )
-	{
-		sprintf( command, "PASS %s\r\n", m_szPassword );
-
-		if( SendCommand( command, 7 + strlen( m_szPassword ) ) < 0 )
-		{
-			return( FTP_TRYING );
-		}
-
-		m_iStatus = FTPSTAT_SENDINGPASS;
-	}
-
-	if( m_iStatus == FTPSTAT_SENDINGPASS )
-	{
-		if( RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED )
-		{
-			return( FTP_TRYING );
-		}
-
-		if( iReply != FTPREPLY_LOGGEDIN )
-		{
-			if( iReply == FTPREPLY_CONTROLCLOSED )
-			{
-				return( FTP_FAILED );
-			}
-
-			return( FTP_TRYING );
-		}
-
-		m_iStatus = FTPSTAT_LOGGEDIN;
-
-		return( FTP_SUCCEEDED );
-	}
-
-	return( FTP_FAILED );
-}
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	STDMETHOD Cftp::LogoffFromServer( void )
-*
-* $_Description :
-*	Logs off from a server.  LoginToServer() must have succeeded before this
-*	call is made.
-*
-* $_Parameters  :
-*	None.
-*
-* $_ReturnValue :
-*	FTP_TRYING until the logoff has succeeded, then FTP_SUCCEEDED.
-*	FTP_FAILED on error.
-*
-***************************************************************************/
-
-
-HRESULT  Cftp::LogoffFromServer( void )
-{
-	char command[ 256 ];
-	int iReply, iRetCode;
-
-	memset( command, 0, 256 );
-
-	switch( m_iStatus )
-	{
-		case FTPSTAT_LOGGINGOFF:
-			if( SendCommand( "QUIT\r\n", 6 ) == FTP_SUCCEEDED )
-			{
-				m_iStatus = FTPSTAT_SENDINGQUIT;
-			}
-			else
-			{
-				return( FTP_FAILED );
-			}
-
-		case FTPSTAT_SENDINGQUIT:
-		{
-			char buf[ 50 ];
-
-			if( ( iReply = RecvReply( buf, 50, &iRetCode ) ) == FTP_SUCCEEDED )
-			{
-				if( iRetCode == 221 )
-				{
-					//m_iStatus = FTPSTAT_SENTQUIT;
-
-                    //m_iStatus = FTPSTAT_INIT;  // NAK
-
-					CloseSockets();
-					ZeroStuff();
-
-					return( FTP_SUCCEEDED );
-				}
-			}
-			else
-			{
-				if( iReply == FTP_FAILED )
-				{
-					return( FTP_FAILED );
-				}
-				return( FTP_TRYING );
-			}
-		}
-
-		default:
-			m_iStatus = FTPSTAT_LOGGINGOFF;
-			return( FTP_TRYING );
-
-	}
-
-}
-
-
-
-
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	HRESULT  Cftp::FindFile( LPCSTR szRemoteFileName, int * piSize )
-*
-* $_Description :
-*	Locates a file on the remote server.
-*
-* $_Parameters  :
-*	-> LPCSTR szRemoteFileName
-*	Full path and file name of the file to be downloaded.
-*
-*	<- int * piSize
-*	A pointer to an integer in which to return the size of the file, in bytes.
-*
-* $_ReturnValue :
-*	FTP_SUCCEEDED on success.  Otherwise FTP_TRYING, or FTP_FAILED on error.
-*
-* $_Warnings    :
-*	This function will continue to return FTP_TRYING if the file does not exist on 
-*	the server.
-*
-***************************************************************************/
-
-
-
-HRESULT  Cftp::FindFile( LPCSTR szRemoteFileName, int * piSize )
-{
-	char command[ 256 ];
-	static char listline[ 256 ];
-
-	int i, iReply;
-	char ext[ 10 ];
-
-	if (m_findStart==0)
-      m_findStart=time(NULL);
-
-	if((time(NULL)-m_findStart) > 30)  // try for 30 seconds
-	{
-        /////////DBGMSG("FindFile: Tried for too long");
-        m_findStart=0;
-		return( FTP_FAILED );
-	}
-
-	//strcpy(m_szRemoteFilePath, "/");  // start at home
-	_splitpath( szRemoteFileName, NULL, m_szRemoteFilePath+strlen(m_szRemoteFilePath), 
-		m_szRemoteFileName, ext );
-
-	strcat( m_szRemoteFileName, ext );
-
-	for( i = 0; i < (int)strlen( m_szRemoteFilePath ); i++ )
-	{
-		if( m_szRemoteFilePath[ i ] == '\\' )
-		{
-			m_szRemoteFilePath[ i ] = '/';
-		}
-	}
-
-	memset( command, 0, 256 );
-
-	/* Change directory */
-
-	if( ( m_iStatus == FTPSTAT_LOGGEDIN ) || ( m_iStatus == FTPSTAT_FILEFOUND ) )
-	{
-		sprintf( command, "CWD %s\r\n", m_szRemoteFilePath );
-
-		if( SendCommand( command, 6 + strlen( m_szRemoteFilePath ) ) < 0 )
-		{
-			return( FTP_TRYING );
-		}
-
-		m_iStatus = FTPSTAT_SENDINGCWD;
-	}
-
-
-	/* Get reply */
-
-	if( m_iStatus == FTPSTAT_SENDINGCWD )
-	{
-		HRESULT reply=RecvReply( command, 256, &iReply );
-
-		if ((reply == FTP_SUCCEEDED) && (iReply == 550)) {
-			m_findStart=0;
-			return(FTP_FAILED);
-		}
-
-		if( ( reply != FTP_SUCCEEDED ) ||
-			( iReply != FTPREPLY_CWDOK ) )
-		{
-			return( FTP_TRYING );
-		}
-
-		m_iStatus = FTPSTAT_SENTCWD;
-	}
-
-	/* Set up data connection port */
-
-	if( m_iStatus == FTPSTAT_SENTCWD )
-	{
-		i = 0;
-		while( SendNewPort() == FTP_TRYING )
-		{
-			i++;
-
-			if( i == 1000 )
-			{
-				return( FTP_TRYING );
-			}
-		}
-
-		m_iStatus = FTPSTAT_SENTPORT;
-	}
-
-	/* Get directory listing for file. */
-
-	if( m_iStatus == FTPSTAT_SENTPORT )
-	{
-		sprintf( command, "LIST %s\r\n", m_szRemoteFileName );
-
-		if( SendCommand( command, 7 + strlen( m_szRemoteFileName ) ) < 0 )
-		{
-			return( FTP_TRYING );
-		}
-
-		m_iStatus = FTPSTAT_SENDINGLIST;
-	}
-
-
-	/* Get reply */
-
-	if( m_iStatus == FTPSTAT_SENDINGLIST )
-	{
-		if( ( RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED ) ||
-			( iReply != FTPREPLY_OPENASCII ) )
-		{
-			return( FTP_TRYING );
-		}
-
-		m_iStatus = FTPSTAT_SENTLIST;
-	}
-
-	/* Open data connection */
-
-	if( m_iStatus == FTPSTAT_SENTLIST )
-	{
-		i = OpenDataConnection();
-		if( i != FTP_SUCCEEDED )
-		{
-            /////////DBGMSG("FindFile: OpenDataConnection failed: "<<i);
-            m_findStart=0;
-			return( i );
-		}
-		m_iStatus = FTPSTAT_LISTDATAOPEN;
-		memset( listline, 0, 256 );
-	}
-
-
-	/* Get data */
-
-	if( m_iStatus == FTPSTAT_LISTDATAOPEN )
-	{
-		RecvData( listline, 256 );
-
-		if( strlen( listline ) == 0 )
-		{
-			return( FTP_TRYING );
-		}
-		m_iStatus = FTPSTAT_LISTDATARECVD;
-	}
-
-	/* Wait for confirmation of end of data stream */
-
-	if( m_iStatus == FTPSTAT_LISTDATARECVD )
-	{
-		if( ( RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED ) ||
-			( iReply != FTPREPLY_COMPLETE ) )
-		{
-			return( FTP_TRYING );
-		}
-
-		m_iStatus = FTPSTAT_FILEFOUND;
-	}
-
-	CloseDataConnection();
-
-	m_findStart=0;
-
-	/* Is the file there? */
-
-	if( strncmp( listline, m_szRemoteFileName, sizeof( m_szRemoteFileName ) ) == 0 )
-	{
-		/* No */
-        ////////DBGMSG("FindFile: File not in list: "<<listline);
-		return( FTP_FAILED );
-	}
-
-	/* Yes - find out the size, in bytes */
-
-	if( sscanf( &listline[ 32 ], " %d ", &i ) == 1 )
-	{
-		if( piSize != NULL )
-		{
-			*piSize = i;
-			m_iFileSize = i;
-		}
-		return( FTP_SUCCEEDED );
-	}
-	
-    ////////DBGMSG("Default fail case: "<<listline);
-	return( FTP_FAILED );
-}
-
-
-
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	HRESULT  Cftp::SendCommand( LPCSTR pCommand, int iSize )
-*
-* $_Description :
-*	Sends a command to the server.  Commands are strings terminated with
-*	"\r\n"
-*
-* $_Parameters  :
-*	LPCSTR pCommand
-*	A pointer to a command
-*
-*	int iSize
-*	The size of the command in bytes.
-*	
-* $_ReturnValue :
-*	FTP_SUCCEEDED on success, or FTP_FAILED on error.
-*
-***************************************************************************/
-
-HRESULT  Cftp::SendCommand( LPCSTR pCommand, int iSize )
-{
-	int i;
-	
-	i = send( m_iCommandSocket, pCommand, iSize, 0 );
-
-	if( i > 0 )
-	{
-#ifdef RTS_DEBUG
-		OutputDebugString( "-->" );
-		OutputDebugString( pCommand );
-#endif
-		return( FTP_SUCCEEDED );
-	}
-	else
-	{
-		return( FTP_FAILED );
-	}
-}
-
-
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	HRESULT  Cftp::RecvReply( LPCSTR pReplyBuffer, int iSize, int * piRetCode )
-*
-* $_Description :
-*	Receives a reply from the server and extracts the numerical reply
-*	code.
-*
-* $_Parameters  :
-*	-> LPCSTR pReplyBuffer
-*	A buffer for the reply - must be specified and be at least 4 bytes in 
-*	length.
-*
-*	-> iSize
-*	The size of the reply buffer.
-*
-*	<- piRetCode
-*	A pointer to an integer to store the numeric return code for the message received.
-*
-* $_ReturnValue :
-*	FTP_SUCCEEDED on success, FTP_FAILED otherwise.
-*
-***************************************************************************/
-
-
-HRESULT  Cftp::RecvReply( LPCSTR pReplyBuffer, int iSize, int * piRetCode )
-{
-	int readval;
-	char * pc = (char *)pReplyBuffer;
-
-	while(1) {
-		// Preview whats on the socket so we can make the decision if there is enough
-		// there to use.
-		readval = recv(m_iCommandSocket, pc, iSize-1, MSG_PEEK);
-		pc[iSize-1]=0;
-		if (readval > 0)
-			pc[readval]=0;
-
-		// Did the endpoint close?
-		if (readval < 0) {
-			if ((WSAGetLastError() == WSAECONNRESET ) || ((WSAGetLastError() == WSAENOTCONN)))
-				readval=0;
-			else {
-				// nothing to read right now....
-				return(FTP_TRYING);
-			}
-		}
-
-		if (readval == 0) {
-			// endpoint closed
-			*piRetCode=FTPREPLY_CONTROLCLOSED;
-			return(FTP_SUCCEEDED);		// we succeeded in getting a reply
-		}
-
-		if (readval < 3)  // minimal response
-			return(FTP_TRYING);
-
-		// Verify that this is a complete line, if not we will keep trying til
-		// we have one.
-		char *end=strstr(pc, "\r\n");
-		if (end == 0)
-			return(FTP_TRYING);
-
-		// OK, we've got a line, pull it from the socket...
-		recv(m_iCommandSocket, pc, end-pc+strlen("\r\n"), 0);
-#ifdef RTS_DEBUG
-		OutputDebugString( "<--" );
-		OutputDebugString( pc );
-#endif
-
-		// Is this an unrecognized command?  It's probably in response to our BOGUSCOMMAND, ignore it.
-		// If we got this for some other reason then this FTP server doesn't support our required command set.
-		// If this were a general purpose FTP library we probably couldn't get away with this because it's pretty lame.
-		const char *BOGUS_RESPONSE="500";
-		if (_strnicmp(pc, BOGUS_RESPONSE, strlen(BOGUS_RESPONSE))==0)
-			continue;
-
-		// If the line starts with a non-digit then we ignore it...
-		if (isdigit(pc[0])==0)
-			continue;
-
-		if (piRetCode)
-			*piRetCode=atol(pc);
-
-		return( FTP_SUCCEEDED );
-	}
-}
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	unsigned long MyIPAddress( int sockfd )
-*
-* $_Description :
-*	Finds the IP address of the local host.
-*
-* $_Parameters  :
-*	-> int sockfd
-*	An optional socket descriptor - if this is given and the socket is connected
-*   then the answer will guaranteed to be on the same interface as the connected 
-*	socket.
-*
-* $_ReturnValue :
-*	A unsigned integer containing the IP address of the local host.
-*
-***************************************************************************/
-
-
-unsigned long MyIPAddress( int sockfd )
-{
-
-	int		 test = 99;
-	int i;
-	char pBuffer[ 256 ];
-	char * pAddr;
-	struct hostent * pHE;
-	unsigned long ip;
-	struct sockaddr_in sin;
-
-	if( sockfd != -1 )
-	{
-		i = sizeof( sin );
-		getsockname( sockfd, (struct sockaddr *)&sin, &i );
-
-		ip = sin.sin_addr.S_un.S_addr;
-	}
-	else
-	{
-		/* Get this machine's name. */
-
-		if( gethostname( pBuffer, 256 ) != 0 )
-		{
-			return( FTP_FAILED );
-		}
-
-		/* Look up the machine in "DNS" or whatever. */
-
-		pHE = gethostbyname( pBuffer );
-
-		if( pHE == NULL )
-		{
-			return( FTP_FAILED );
-		}
-
-		/* Find a good IP address. */
-
-		ip = 0;
-
-		i = 0;
-		
-		while( ( pAddr = pHE->h_addr_list[ i++ ] ) != NULL )
-		{
-
-			ip = *((unsigned long *)pAddr );
-
-			if( ( ip != 0 ) && ( ip != inet_addr( "127.0.0.1" ) ) )
-			{
-				break;
-			}
-			else
-			{
-				ip = 0;
-			}
-
-		}
-	}
-
-	if( ip == 0 )
-	{
-		return( FTP_FAILED );
-	}
-
-
-	return( ip );
-}
-
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	int Cftp::SendNewPort( void )
-*
-* $_Description :
-*	Sends a PORT command to the server specifying a new ephemeral port to 
-*	use for a data connection.  Opens the port in the process.
-*
-* $_Parameters  :
-*	bool reset
-*	Should be TRUE for the first attempt, FALSE subsequently.
-*
-* $_ReturnValue :
-*	FTP_SUCCEEDED on success, FTP_FAILED on error, FTP_TRYING while
-*	going through the stages.
-*
-***************************************************************************/
-
-
-int Cftp::SendNewPort( void )
-{
-	unsigned long uTemp;
-	char command[ 256 ];
-	int i, iReply;
-
-	/* Open a socket */
-
-	if( m_sendNewPortStatus == 0 )
-	{
-
-		m_iDataSocket = socket( AF_INET, SOCK_STREAM, 0 );
-
-		if( m_iDataSocket < 0 )
-		{
-			return( FTP_FAILED );
-		}
-
-		/* Set socket to non-blocking */
-
-		uTemp = 1;
-
-		if (Use_Non_Blocking_Mode()) {
-			if( ioctlsocket( m_iCommandSocket, FIONBIO, &uTemp ) == SOCKET_ERROR )
-			{
-				return( FTP_FAILED );
-			}
-		}
-
-		memset( &m_DataSockAddr, 0, sizeof( m_DataSockAddr ) );
-
-		m_DataSockAddr.sin_family		 = AF_INET;
-		m_DataSockAddr.sin_addr.s_addr = htonl( INADDR_ANY );
-		m_DataSockAddr.sin_port		 = 0; // Winsock fills in an ephemeral port during bind...
-
-		if( bind( m_iDataSocket, (struct sockaddr *)&m_DataSockAddr, sizeof( m_DataSockAddr ) ) < 0 )
-		{
-			return( FTP_FAILED );
-		}
-
-
-		i = sizeof( m_DataSockAddr);
-
-		getsockname( m_iDataSocket, (struct sockaddr *)&m_DataSockAddr, &i );
-
-		listen( m_iDataSocket, 5 );
-
-
-		// Set socket to non-blocking
-
-		uTemp = 1;
-
-
-		if (Use_Non_Blocking_Mode()) {
-			if( ioctlsocket( m_iDataSocket, FIONBIO, &uTemp ) == SOCKET_ERROR )
-			{
-				return( FTP_FAILED );
-			}
-		}
-
-
-		m_sendNewPortStatus = 1;
-	}
-
-	/* Send a port command. */
-
-	if( m_sendNewPortStatus == 1 )
-	{
-		memset( command, 0, 256 );
-
-		i = MyIPAddress( m_iCommandSocket );
-
-		if( i == FTP_FAILED )
-		{
-			return( FTP_FAILED );
-		}
-
-		sprintf( command, "PORT %d,%d,%d,%d,%d,%d\r\n", 
-				 i & 0xFF,
-				 ( i >> 8 ) & 0xFF, 
-				 ( i >> 16 ) & 0xFF, 
-				 ( i >> 24 ) & 0xFF, 
-				 m_DataSockAddr.sin_port & 0xFF,
-				 m_DataSockAddr.sin_port >> 8 );
-
-		if( SendCommand( command, strlen(command) ) < 0 )
-		{
-			return( FTP_TRYING );
-		}
-
-		m_sendNewPortStatus = 2;
-	}
-
-	/* Get reply */
-
-	if( m_sendNewPortStatus == 2 )
-	{
-		if( ( RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED ) ||
-			( iReply != FTPREPLY_PORTOK ) )
-		{
-			return( FTP_TRYING );
-		}
-
-		m_sendNewPortStatus = 0;
-	}
-
-	return( FTP_SUCCEEDED );
-}
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	int Cftp::OpenDataConnection()
-*
-* $_Description :
-*	Opens the data connection to the server.  Actually, the socket for the
-*	data connection should have been opened by a call to SendNewPort before
-*	this method is called - this just calls accept.
-*
-* $_Parameters  :
-*	None.
-*
-* $_ReturnValue :
-*	FTP_SUCCEEDED on success, FTP_FAILED otherwise.
-*
-* $_Warnings    :
-*	This call may block.
-*
-***************************************************************************/
-
-
-
-int Cftp::OpenDataConnection()
-{
-	int iNewSocket;
-
-	if( m_iDataSocket == 0 )
-	{
-		return( FTP_FAILED );
-	}
-
-	if( ( iNewSocket = accept( m_iDataSocket, NULL, 0 ) ) < 0 ) 
-	{
-		if( WSAGetLastError() != (WSAEWOULDBLOCK ) )
-		{
-			return( FTP_FAILED );
-		}
-		else
-		{
-			return( FTP_TRYING );
-		}
-	}
-
-	m_iDataSocket = iNewSocket;
-
-	return( FTP_SUCCEEDED );
-}
-
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	void Cftp::CloseDataConnection()
-*
-* $_Description :
-*	Closes the data connection.
-*
-* $_Parameters  :
-*	None.
-*
-* $_ReturnValue :
-*	None.
-*
-***************************************************************************/
-
-
-void Cftp::CloseDataConnection()
-{
-	closesocket( m_iDataSocket );
-	m_iDataSocket = 0;
-}
-
-/*$_Function****************************************************************
-* $_Name        :
-*	HRESULT  Cftp::DisconnectFromServer()
-*
-* $_Description :
-*	Disconnects from the server.
-*
-* $_Parameters  :
-*	None.
-*
-* $_ReturnValue :
-*	None.
-*
-***************************************************************************/
-
-HRESULT  Cftp::DisconnectFromServer()
-{
-	// Make the download file read-only so it's still there the next time
-	// we're run.
-
-	closesocket( m_iCommandSocket );
-	return( FTP_SUCCEEDED );
-}
-
-
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	int  Cftp::SendData( char * pData, int iSize )
-*
-* $_Description :
-*	Sends data to the server.
-*
-* $_Parameters  :
-*	-> char * pData
-*	A pointer to some data to be sent.
-*
-*	-> int iSize
-*	The size, in bytes, of the data.
-*
-* $_ReturnValue :
-*	The number of bytes sent, or -1 on error.
-*
-***************************************************************************/
-
-int  Cftp::SendData( char * pData, int iSize )
-{
-	return( send( m_iDataSocket, pData, iSize, 0 ) );
-}
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	int  Cftp::RecvData( char * pData, int iSize )
-*
-* $_Description :
-*	Receives data from the server.
-*
-* $_Parameters  :
-*	-> LPCSTR pData
-*	A pointer to a buffer for the data to be received.
-*
-*	-> int iSize
-*	The size, in bytes, of the data buffer.
-*
-* $_ReturnValue :
-*	The number of bytes received, or -1 on error.
-*
-***************************************************************************/
-
-int  Cftp::RecvData( char * pData, int iSize )
-{
-/***** testing...
-	int readval = recv(m_iDataSocket, pData, iSize, MSG_PEEK);
-	if (readval <= 0)		// If there's nothing to read, don't read now...
-		return(readval);
-******/
-
-	return( recv( m_iDataSocket, pData, iSize, 0 ) );
-}
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	HRESULT  Cftp::GetNextFileBlock( LPCSTR szLocalFileName, int * piTotalRead )
-*
-* $_Description :
-*	Retrieves the next block of data from the remote file and writes it into
-*	the local file.  Deals with opening the local file and restarting a 
-*	failed transfer if FileRecoveryPosition() returns non-zero.  To prevent
-*	a restart after FileRecoveryPosition() returns non-zero, call 
-*	Cftp::RestartFrom() with 0 as the offset parameter.
-*	
-*	The file is initally written to a temporary file and then copied to the local
-*	file name when the transfer is complete.  If the transfer is halted, the 
-*	temporary file will be used as the starting point for subsequent retries.
-*
-* $_Parameters  :
-*	-> LPCSTR szLocalFileName
-*	A pointer to a string containing the local file name for the transferred file.
-*
-*	<- int * piTotalRead
-*	A pointer to an integer in which to store the total number of bytes
-*	transferred so far.
-*
-* $_ReturnValue :
-*	FTP_TRYING while the transfer is in progress, FTP_SUCCEEDED on completion, 
-*	FTP_FAILED on error.
-*
-***************************************************************************/
-
-HRESULT  Cftp::GetNextFileBlock( LPCSTR szLocalFileName, int * piTotalRead )
-{
-	char command[ 256 ];
-	int read, totread = 0;
-
-	const int max_data_len=10240;
-
-	char data[ max_data_len ];
-	int res, iReply;
-
-	char downloadfilename[256];
-	GetDownloadFilename(szLocalFileName, downloadfilename);
-
-
-	//char str[ 256 ];
-
-	strncpy( m_szLocalFileName, szLocalFileName, 256 );
-
-	// Open local file
-
-	if( m_iStatus == FTPSTAT_FILEFOUND )
-	{
-		if( m_iFilePos == 0 )
-		{
-			if( ( m_pfLocalFile = fopen( downloadfilename, "wb" ) ) == NULL )
-			{
-				return( FTP_FAILED );
-			}
-		}
-		else
-		{
-			if( ( m_pfLocalFile = fopen( downloadfilename, "ab" ) ) == NULL )
-			{
-				return( FTP_FAILED );
-			}
-		}
-		m_iStatus = FTPSTAT_FILEOPEN;
-	}
-
-	// Send the PORT command
-
-	if( m_iStatus == FTPSTAT_FILEOPEN )
-	{
-		if( SendNewPort() == FTP_SUCCEEDED )
-		{
-			m_iStatus = FTPSTAT_SENTFILEPORT;
-		}
-		else
-		{
-			return( FTP_TRYING );
-		}
-	}
-
-	// Set type to BINARY
-
-	if( m_iStatus == FTPSTAT_SENTFILEPORT )
-	{
-		sprintf( command, "TYPE I\r\n");
-
-		if( SendCommand( command, strlen( command ) ) < 0 )
-		{
-			return( FTP_TRYING ); 
-		}
-
-		m_iStatus = FTPSTAT_SENDINGTYPE;
-	}
-
-	/* Get reply */
-
-	if( m_iStatus == FTPSTAT_SENDINGTYPE )
-	{
-		if( ( RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED ) ||
-			( iReply != FTPREPLY_TYPEOK ) )
-		{
-			return( FTP_TRYING );
-		}
-
-		m_iStatus = FTPSTAT_SENTTYPE;
-	}
-
-	// Send the RESTART command - if we are restarting a previous transfer.
-
-	if( m_iStatus == FTPSTAT_SENTTYPE )
-	{
-		if( m_iFilePos == 0 )
-		{
-			m_iStatus = FTPSTAT_SENTREST;
-		}
-		else
-		{
-			sprintf( command, "REST %d\r\n", m_iFilePos );
-
-			if( SendCommand( command, strlen( command ) ) < 0 )
-			{
-				return( FTP_TRYING ); 
-			}
-
-			m_iStatus = FTPSTAT_SENDINGREST;
-		}
-	}
-
-	/* Get reply */
-
-	if( m_iStatus == FTPSTAT_SENDINGREST )
-	{
-		HRESULT res=RecvReply( command, 256, &iReply );
-
-		if ((res == FTP_FAILED) || (iReply == 502))  // unsupported command
-		{
-			m_iFilePos=0;
-			fclose(m_pfLocalFile);
-			m_pfLocalFile = fopen( downloadfilename, "wb" );
-		}
-		else if( ( res != FTP_SUCCEEDED ) ||
-			( iReply != FTPREPLY_RESTARTOK ) )
-		{
-			return( FTP_TRYING );
-		}
-
-		m_iStatus = FTPSTAT_SENTREST;
-	}
-
-
-	// Send the RETR command
-
-	if( m_iStatus == FTPSTAT_SENTREST )
-	{
-		sprintf( command, "RETR %s\r\n", m_szRemoteFileName );
-
-		if( SendCommand( command, strlen( command ) ) < 0 )
-		{
-			return( FTP_TRYING ); 
-		}
-
-		m_iStatus = FTPSTAT_SENDINGRETR;
-	}
-
-	/* Get reply */
-
-	if( m_iStatus == FTPSTAT_SENDINGRETR )
-	{
-
-		if( ( RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED ) ||
-			( iReply != FTPREPLY_OPENBINARY ) )
-		{
-			return( FTP_TRYING );
-		}
-
-		m_iStatus = FTPSTAT_SENTRETR;
-	}
-
-	/* Open data connection */
-
-	if( m_iStatus == FTPSTAT_SENTRETR )
-	{
-		res = OpenDataConnection();
-		if( res != FTP_SUCCEEDED )
-		{
-			return( res );
-		}
-		m_iStatus = FTPSTAT_FILEDATAOPEN;
-	}
-
-
-	/* Get data */
-
-	if( m_iStatus == FTPSTAT_FILEDATAOPEN )
-	{
-		do
-		{
-			read = RecvData( data, max_data_len );
-			if( read > 0 )
-			{
-				fwrite( data, 1, read, m_pfLocalFile );
-				totread += read;
-			}
-		}
-		while( ( read > 0 ) && ( totread < (max_data_len * 20) ) );  // Don't read too much - 
-															// must not block for too long
-
-
-		m_iFilePos += totread;   // update read position
-
-		if( piTotalRead != NULL )
-			*piTotalRead = m_iFilePos;
-
-
-		// look for all notices about endpoint closed...
-		if (read < 0) {
-			int wsa_err=WSAGetLastError();
-
-			if ((wsa_err == WSAECONNRESET) || (wsa_err == WSAENOTCONN))
-				read = 0;		// just treat it as a close....
-		}
-
-
-		/* See if the download has finished */
-
-		if( read == 0 )
-		{
-			// Data connection reset 
-			if( m_iFilePos != m_iFileSize ) {
-				// Haven't got all the data
-				return( FTP_FAILED );
-			} else {
-				// got all the data and the connection is closed so mark it so
-				m_iStatus = FTPSTAT_FILEDATACLOSED;
-			}
-		} else {
-			return( FTP_TRYING );
-		}
-	}
-
-	// if we have gotten to here, we have all the data and the connection is 
-	// closed.  The case where the connection was closed but we didn't get
-	// everything is handled above.
-	if( m_iStatus == FTPSTAT_FILEDATACLOSED )	{
-		CloseDataConnection();
-		fclose( m_pfLocalFile );
-		m_pfLocalFile = NULL;
-
-		/*
-		 * Move the file from the temporary download location to its
-		 *  final resting place
-		 */
-
-		char downloadfilename[256];
-		GetDownloadFilename(m_szLocalFileName, downloadfilename);
-
-		// Make sure the path exists for the new file
-		char curdir[256];
-		_getcwd(curdir,256);
-		Prepare_Directories(curdir, m_szLocalFileName);
-		DEBUG_LOG(("CWD: %s\n", curdir));
-
-		if( rename( downloadfilename, m_szLocalFileName ) != 0 )	{
-			DEBUG_LOG(("First rename of %s to %s failed with errno of %d\n", downloadfilename, m_szLocalFileName, errno));
-			/* Error moving file - remove file that's already there and try again. */
-			_chmod( m_szLocalFileName, _S_IWRITE | _S_IREAD);	// make sure it's not readonly
-			DEBUG_LOG(("_chmod of %s failed with errno of %d\n", m_szLocalFileName, errno));
-			remove( m_szLocalFileName );
-			DEBUG_LOG(("remove of %s failed with errno of %d\n", m_szLocalFileName, errno));
-
-			if( rename( downloadfilename, m_szLocalFileName ) != 0 )	{
-				DEBUG_LOG(("Second rename of %s to %s failed with errno of %d\n", downloadfilename, m_szLocalFileName, errno));
-				return( FTP_FAILED );
-			}
-		}
-
-		// Send a bogus command.  If the firewall has closed our ftp command channel connection this 
-		// will allow us to detect it.  (Obviously the data channel is closed or we wouldn't be here)
-		// There are cases (firewall) where the connection will go away without having a close command
-		// but writing to it will allow us to detect this case.
-		// We will ignore the response because we don't know in which order the server will respond
-		SendCommand("BOGUSCOMMAND\r\n", strlen("BOGUSCOMMAND\r\n"));
-
-		OutputDebugString("File closed, waiting for response.\n");
-
-		m_iStatus = FTPSTAT_TRANSFERREPLY;
-	}
-
-
-	if( m_iStatus == FTPSTAT_TRANSFERREPLY ) {
-		iReply=0;
-
-		// Get the file complete reply
-		if (RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED )
-			return(FTP_TRYING);
-
-		if (iReply == FTPREPLY_CONTROLCLOSED) {
-			m_iStatus = FTPSTAT_INIT;
-			m_iFilePos=0;
-			CloseSockets();
-		} else {
-			m_iStatus = FTPSTAT_LOGGEDIN;
-			m_iFilePos=0;
-		}
-		return(FTP_SUCCEEDED);
-	}
-	return( FTP_FAILED );
-}
-
-
-
-/*$_Function****************************************************************
-* $_Name        :
-*	HRESULT  Cftp::FileRecoveryPosition( LPCSTR szLocalFileName )
-*
-* $_Description :
-*	Finds the size of the specified file.  This size can be used
-*
-* $_Parameters  :
-*	char & szLocalFileName
-*	The full path name of the local file.
-*
-* $_ReturnValue :
-*	The size of that file on the local disk.  0 if the file does not exist.
-*
-***************************************************************************/
-
-
-//
-// Do we have this file in the download directory?  If so then it's a partial download.
-//
-//
-HRESULT  Cftp::FileRecoveryPosition( LPCSTR szLocalFileName, LPCSTR szRegistryRoot )
-{
-	char downloadfilename[256];
-	GetDownloadFilename(szLocalFileName, downloadfilename);
-
-	FILE *testfp = fopen( downloadfilename, "rb" );
-	if( testfp == NULL )
-	{
-		m_iFilePos = 0;
-		return 0;
-	}
-
-	fseek( testfp, 0, SEEK_END );
-	m_iFilePos = ftell( testfp );
-	fclose( testfp );
-
-	return( m_iFilePos );
-}
-
-/*************8
-	FILE * testfp;
-	HKEY hkey;
-	unsigned char regfilename[ 256 ];
-	char regkey[ 512 ];
-	unsigned long t1, t2;
-
-	if( ( szRegistryRoot == NULL ) || ( szLocalFileName == NULL ) )
-	{
-		// Bail out
-		return( 0 );
-	}
-
-	// Concatenate the registry key together
-
-	strcpy( regkey, szRegistryRoot );
-	if( regkey[ strlen( regkey ) - 1 ] != '\\' )
-	{
-		strcat( regkey, "\\Download" );
-	}
-	else
-	{
-		strcat( regkey, "Download" );
-	}
-
-	if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, (LPCTSTR)regkey, 
-		0, KEY_ALL_ACCESS, &hkey ) != ERROR_SUCCESS )
-	{
-		// Key doesn't exist, create it
-		if( RegCreateKey( HKEY_LOCAL_MACHINE, (LPCTSTR)regkey, 
-			&hkey ) != ERROR_SUCCESS )
-		{
-			// Error, bail out
-			return( 0 );
-		}
-
-		RegSetValueEx( hkey, (LPCTSTR)"File", 0, REG_SZ, (const unsigned char *)szLocalFileName, strlen( szLocalFileName ) + 1 );
-		RegCloseKey(hkey);
-
-		return( 0 );
-	}
-
-	t2 = 256;
-
-	if( RegQueryValueEx( hkey, (LPCTSTR)"File", 0, &t1, regfilename, &t2 ) != ERROR_SUCCESS )
-	{
-		RegSetValueEx( hkey, (LPCTSTR)"File", 0, REG_SZ, (const unsigned char *)szLocalFileName, strlen( szLocalFileName ) + 1 );
-		RegCloseKey(hkey);
-		return( 0 );
-	}
-
-	if( strcmp( szLocalFileName, (const char *)regfilename ) == 0 )
-	{
-		// File previously downloaded
-		testfp = fopen( FTP_TEMPFILENAME, "rb" );
-
-		if( testfp == NULL )
-		{
-			m_iFilePos = 0;
-			RegCloseKey(hkey);
-			return 0;
-		}
-
-		fseek( testfp, 0, SEEK_END );
-
-		m_iFilePos = ftell( testfp );
-
-		fclose( testfp );
-
-		RegCloseKey(hkey);
-		return( m_iFilePos );
-	}
-
-	// Download file doesn't exist
-	RegSetValueEx( hkey, (LPCTSTR)"File", 0, REG_SZ, (const unsigned char *)szLocalFileName, strlen( szLocalFileName ) + 1 );
-	RegCloseKey(hkey);
-
-	// get rid of any temp downloads
-	_unlink(FTP_TEMPFILENAME);
-
-	return( 0 );
-}
-**************************************/
-
-
-
-//
-// convert a local name to a temp filename to use for downloading
-//
-void Cftp::GetDownloadFilename(const char *localname, char *downloadname)
-{
-	char *name = strdup(localname);
-	char *s = name;
-	while (*s)
-	{
-		if (*s == '\\' || *s == '.' || *s == ' ')
-			*s = '_';
-		++s;
-	}
-	sprintf(downloadname,"download\\%s_%d.tmp",name,m_iFileSize);
-	free(name);
-	/*
-	Wstring name;
-	name.set(localname);
-	name.replace("\\","_");
-	name.replace(".","_");
-	name.replace(" ","_");
-	sprintf(downloadname,"download\\%s_%d.tmp",name.get(),m_iFileSize);
-	*/
-	return;
-}
-
-
-
-
-//
-// Build all the subdirectories for a given filename
-//
-bool Prepare_Directories(const char *rootdir, const char *filename)
-{
-	char tempstr[256];
-	char newdir[256];
-
-	const char *cptr=filename;
-	while(cptr=strchr(cptr,'\\'))
-	{
-		memset(tempstr,0,256);
-		strncpy(tempstr,filename,cptr-filename);
-		sprintf(newdir,"%s\\%s",rootdir, tempstr);
-		if (!CreateDirectory(newdir, NULL))
-			return false;
-		//if ((_mkdir(newdir) == -1) && ((errno == ENOENT || errno==EACCES)))
-			//return(false);
-		cptr++;
-	}
-	return(true);
-}
-
-
-
-
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp b/Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp
new file mode 100644
index 00000000000..01e67957ea2
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp
@@ -0,0 +1,1846 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// ftp.cpp : Implementation of Cftp
+
+/*************************************************************************/
+/*_$                      Include Files                                  */
+/*************************************************************************/
+
+
+#include <sys/types.h>
+#include <sys/timeb.h>
+#include <stdlib.h>
+#include <process.h>
+#include <sys/stat.h>
+#include <io.h>
+#include <time.h>
+#include "assert.h"
+#include "ftp.h"
+#include <time.h>
+#include <direct.h>
+#include <errno.h>
+#include <WWCommon.h>
+//#include "wlib/wstring.h"
+
+#include "DownloadDebug.h"
+
+// umm... what?? BGC 3/27/03
+//#ifndef RTS_DEBUG
+//#define RTS_DEBUG
+//#endif
+
+/*************************************************************************/
+/*_$                      External References                            */
+/*************************************************************************/
+
+/*************************************************************************/
+/*_$                      Private Datatypes                              */
+/*************************************************************************/
+
+/*************************************************************************/
+/*_$                      Public Data                                    */
+/*************************************************************************/
+
+/*************************************************************************/
+/*_$                      Private Data                                   */
+/*************************************************************************/
+
+//static HOSTENT  gThreadHost;
+struct sockaddr_in  gThreadAddress;
+
+static int		 gThreadFlag;
+
+/*************************************************************************/
+/*_$                      Private Prototypes                             */
+/*************************************************************************/
+
+/*************************************************************************/
+/*_$                      Private Macros                                 */
+/*************************************************************************/
+
+
+/* Status flags */
+
+#define FTPSTAT_INIT				0
+#define FTPSTAT_CONNECTING			10
+#define FTPSTAT_WAITINGSERVEROK		15
+#define FTPSTAT_CONNECTED			20
+#define FTPSTAT_SENDINGUSER			30
+#define FTPSTAT_SENTUSER			40
+#define FTPSTAT_SENDINGPASS			50
+#define FTPSTAT_LOGGEDIN			60
+#define FTPSTAT_LOGGINGOFF			70
+#define FTPSTAT_SENDINGQUIT			80
+#define FTPSTAT_SENTQUIT			90
+#define FTPSTAT_FILEFOUND			100
+#define FTPSTAT_SENDINGCWD			110
+#define FTPSTAT_SENTCWD				120
+#define FTPSTAT_SENTPORT			130
+#define FTPSTAT_SENDINGLIST			140
+#define FTPSTAT_SENTLIST			150
+#define FTPSTAT_LISTDATAOPEN		160
+#define FTPSTAT_LISTDATARECVD		170
+#define FTPSTAT_FILEOPEN			180
+#define FTPSTAT_SENTFILEPORT		190
+#define FTPSTAT_SENDINGTYPE			200
+#define FTPSTAT_SENTTYPE			210
+#define FTPSTAT_SENDINGREST			220
+#define FTPSTAT_SENTREST			230
+#define FTPSTAT_SENDINGRETR			240
+#define FTPSTAT_SENTRETR			250
+#define FTPSTAT_FILEDATAOPEN		260
+#define FTPSTAT_FILEDATACLOSED		270
+#define FTPSTAT_TRANSFERREPLY		280
+
+
+// Utility functions
+bool Prepare_Directories(const char *rootdir, const char *filename);
+
+//
+// This is here as a hack...
+// Some firewalls break the TCP stack so non-blocking sockets don't work right...
+//
+static bool Use_Non_Blocking_Mode(void)
+{
+	HKEY regKey;
+	LONG regRetval;
+	DWORD bufsiz=0;
+	DWORD type=0;
+	DWORD value=0;
+
+
+	// Try and open the named key
+	regRetval=RegOpenKeyEx(HKEY_LOCAL_MACHINE,"SOFTWARE\\Westwood\\Earth And Beyond Beta 2",0,KEY_READ,&regKey);
+	if (regRetval!=ERROR_SUCCESS)
+		return(TRUE);		// default TRUE
+
+	// Fetch the flag
+	bufsiz=sizeof(value);
+	type=REG_DWORD;
+	regRetval=RegQueryValueEx(regKey, "UseNonBlockingFTP", 0, &type, (BYTE*) &value, &bufsiz);
+
+	RegCloseKey(regKey);
+
+	if ((regRetval!=ERROR_SUCCESS) || (type != REG_DWORD))
+		return(TRUE);
+
+	return bool(value);
+}
+
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Cftp
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	Cftp::Cftp()
+*
+* $_Description :
+*	Constructor for the ftp class - initialises more or less all data
+*	members to zero.
+*
+* $_Parameters  :
+*	None.
+*
+* $_ReturnValue :
+*	None.
+*
+***************************************************************************/
+
+
+Cftp::Cftp()
+{
+  ZeroStuff();
+}
+
+
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	Cftp::Cftp()
+*
+* $_Description :
+*	Destructor for the ftp class - close sockets behind us as we leave.
+*
+* $_Parameters  :
+*	None.
+*
+* $_ReturnValue :
+*	None.
+*
+***************************************************************************/
+
+
+Cftp::~Cftp()
+{
+  CloseSockets();
+
+	if (m_pfLocalFile)
+	{
+		fclose(m_pfLocalFile);
+		m_pfLocalFile = NULL;
+	}
+}
+
+void Cftp::CloseSockets(void)
+{
+
+	if( m_iDataSocket )
+	{
+		closesocket( m_iDataSocket );
+		m_iDataSocket=0;
+	}
+
+	if( m_iCommandSocket )
+	{
+		closesocket( m_iCommandSocket );
+		m_iCommandSocket=0;
+	}
+
+}
+
+void Cftp::ZeroStuff(void)
+{
+	m_iBytesRead = 0;
+	m_iFileSize = 0;
+	m_szRemoteFilePath[ 0 ] = (char)0;
+	m_szRemoteFileName[ 0 ] = (char)0;
+	m_szLocalFilePath[ 0 ] = (char)0;
+	m_szLocalFileName[ 0 ] = (char)0;
+	m_szServerName[ 0 ] = (char)0;
+	m_szUserName[ 0 ] = (char)0;
+	m_szPassword[ 0 ] = (char)0;
+	m_iDataSocket = 0;
+	m_iCommandSocket = 0;
+	m_iFilePos = 0;
+	m_iStatus = FTPSTAT_INIT;
+	m_sendNewPortStatus = 0;
+	m_pfLocalFile = NULL;
+	m_findStart = 0;
+	memset(&m_CommandSockAddr, 0, sizeof(m_CommandSockAddr));
+	memset(&m_DataSockAddr, 0, sizeof(m_DataSockAddr));
+}
+
+
+DWORD WINAPI gethostbynameA( void * szName )
+{
+	HOSTENT *he = gethostbyname( (const char *)szName );
+   //////DBGMSG("Hostname copy start");
+
+	if (he)
+		memcpy((char *)&(gThreadAddress.sin_addr), he->h_addr, he->h_length );
+	else
+		memcpy((char *)&(gThreadAddress.sin_addr),"",strlen("")+1);
+   /////DBGMSG("Hostname copy complete");
+
+	gThreadFlag = 1;
+	return 0;
+}
+
+
+int Cftp::AsyncGetHostByName(char * szName, struct sockaddr_in &address )
+{
+	static int            stat = 0;
+	static unsigned long  threadid;
+
+	if( stat == 0 )
+	{
+		/* Kick off gethostname thread */
+		gThreadFlag = 0;
+      memset(&gThreadAddress,0,sizeof(gThreadAddress));
+
+		if( CreateThread( NULL, 0, gethostbynameA, szName, 0, &threadid ) == NULL )
+		{
+			return( FTP_FAILED );
+		}
+		stat = 1;
+	}
+	if( stat == 1 )
+	{
+		if( gThreadFlag )
+		{
+			/* Thread finished */
+         address = gThreadAddress;
+         address.sin_family=AF_INET;
+			stat = 0;
+			return( FTP_SUCCEEDED );
+		}
+	}
+
+	return( FTP_TRYING );
+}
+
+
+
+
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	HRESULT  Cftp::ConnectToServer(LPCSTR szServerName)
+*
+* $_Description :
+*	Overloaded funciton that makes a connection to a server.  Will probably
+*	fail on (at least) the first call, as it may take a while for the server
+*	to send it's "ready" reply.
+*
+* $_Parameters  :
+*	-> const char * szServerName
+*	Optionally, the name of the server to connect to.  This must be specified
+*	in the first call to the function.
+*
+* $_ReturnValue :
+*	FTP_TRYING until the connection has succeeded, then FTP_SUCCEEDED.
+*	FTP_FAILED on error.
+*
+***************************************************************************/
+
+
+HRESULT  Cftp::ConnectToServer(LPCSTR szServerName)
+{
+	struct sockaddr_in  address;
+	unsigned long       uTemp;
+	unsigned long       serverIP;
+	char                buffer[ 256 ];
+	int                 iReply, error;
+
+	strlcpy( m_szServerName, szServerName, sizeof(m_szServerName));
+
+	if( m_iStatus == FTPSTAT_INIT )
+	{
+		/* Find the IP address of the server */
+
+		serverIP = inet_addr( m_szServerName );
+
+		memset( &m_CommandSockAddr, 0, sizeof( m_CommandSockAddr ) );
+		m_CommandSockAddr.sin_family = AF_INET;
+
+		if( serverIP == INADDR_NONE )
+		{
+			/* It's an FQDN - hopefully. */
+         ////////DBGMSG("Async gethostbyname");
+			if( AsyncGetHostByName( m_szServerName, address ) == FTP_TRYING )
+			{
+				return( FTP_TRYING );
+			}
+         //////DBGMSG("Got hostbyname");
+
+			if( address.sin_addr.s_addr == 0 )
+			{
+            ///////DBGMSG("gethostbyname failed");
+				return( FTP_FAILED );
+			}
+
+         m_CommandSockAddr=address;
+
+			///////memcpy( (char *)&(m_CommandSockAddr.sin_addr), he.h_addr, he.h_length );
+
+			serverIP = m_CommandSockAddr.sin_addr.s_addr;
+         //////DBGMSG("ServerIP = "<<serverIP);
+
+         /////DBGMSG("Memcpy OK");
+		}
+		else
+		{
+			m_CommandSockAddr.sin_addr.s_addr = serverIP;
+		}
+
+
+		/* Set port number. */
+
+		m_CommandSockAddr.sin_port = htons( 21 );
+
+		/* Open a socket. */
+
+		m_iCommandSocket = socket( AF_INET, SOCK_STREAM, 0 );
+
+		if( m_iCommandSocket < 0 )
+		{
+			return( FTP_FAILED );
+		}
+
+      //////DBGMSG("Socket created");
+
+		/* Set socket to non-blocking */
+
+		uTemp = 1;
+
+		if (Use_Non_Blocking_Mode()) {
+			if( ioctlsocket( m_iCommandSocket, FIONBIO, &uTemp ) == SOCKET_ERROR )
+			{
+				return( FTP_FAILED );
+			}
+		}
+
+		// Go ahead and advance the state....
+		m_iStatus = FTPSTAT_CONNECTING;
+
+
+		// Start the connection process....
+		if( connect( m_iCommandSocket, (struct sockaddr *)&m_CommandSockAddr, sizeof( m_CommandSockAddr ) ) == -1 )
+		{
+			error = WSAGetLastError();
+			if( ( error == WSAEWOULDBLOCK ) || ( error == WSAEINVAL ) || ( error == WSAEALREADY ) )
+			{
+				return( FTP_TRYING );
+			}
+
+			if( error != WSAEISCONN )
+			{
+            ////////DBGMSG("Connect failed");
+				closesocket( m_iCommandSocket );
+				return( FTP_FAILED );
+			}
+		}
+	}
+
+	if( m_iStatus == FTPSTAT_CONNECTING )
+	{
+		// Check to see if we're connected
+		fd_set wset;
+		fd_set eset;
+		FD_ZERO(&wset);
+		FD_ZERO(&eset);
+		FD_SET(m_iCommandSocket,&wset);
+		FD_SET(m_iCommandSocket,&eset);
+		timeval tv;
+		tv.tv_sec=0;
+		tv.tv_usec=0;
+		int retval=select(m_iCommandSocket+1,0,&wset,&eset,&tv);
+		if (retval == 0)	// not ready yet....
+			return(FTP_TRYING);
+		if (FD_ISSET(m_iCommandSocket, &eset)) {
+			// OK, the exception flag is set, guess we couldn't connect....
+			closesocket( m_iCommandSocket );
+			return( FTP_FAILED );
+		}
+		if (FD_ISSET(m_iCommandSocket, &wset)) {
+			// OK, the write flag is set, we're good to go...
+			m_iStatus = FTPSTAT_WAITINGSERVEROK;
+		}
+	}
+
+	if( m_iStatus == FTPSTAT_WAITINGSERVEROK )
+	{
+		iReply=0;
+		if (RecvReply( buffer, 256, &iReply ) != FTP_SUCCEEDED)
+			return(FTP_TRYING);
+
+		if (iReply != FTPREPLY_SERVEROK)
+			return(FTP_FAILED);
+
+		m_iStatus = FTPSTAT_CONNECTED;
+		return( FTP_SUCCEEDED );
+	}
+
+	return( FTP_FAILED );
+
+}
+
+
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	STDMETHOD Cftp::LoginToServer( LPCSTR szUserName, LPCSTR szPassword )
+*
+* $_Description :
+*	Logs into a server.  ConnectToServer() must have succeeded before this
+*	call is made.
+*
+* $_Parameters  :
+*	-> LPCSTR szUserName
+*	The username under which to log in.
+*
+*	-> LPCSTR szPassword
+*	The password to use.
+*
+* $_ReturnValue :
+*	FTP_TRYING until the login has succeeded, then FTP_SUCCEEDED.
+*	FTP_FAILED on error.
+*
+***************************************************************************/
+
+
+HRESULT  Cftp::LoginToServer( LPCSTR szUserName, LPCSTR szPassword )
+{
+	char command[ 256 ];
+	int iReply;
+
+	strlcpy( m_szUserName, szUserName, sizeof(m_szUserName));
+	strlcpy( m_szPassword, szPassword, sizeof(m_szPassword));
+
+	memset( command, 0, 256 );
+
+	if( m_iStatus == FTPSTAT_CONNECTED )
+	{
+		sprintf( command, "USER %s\r\n", m_szUserName );
+
+		if( SendCommand( command, 7 + strlen( m_szUserName ) ) < 0 )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_SENDINGUSER;
+	}
+
+	if( m_iStatus == FTPSTAT_SENDINGUSER )
+	{
+		if(RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED )
+			return( FTP_TRYING );
+
+		if (iReply != FTPREPLY_PASSWORD)
+			return( FTP_FAILED );
+
+		m_iStatus = FTPSTAT_SENTUSER;
+	}
+
+	if( m_iStatus == FTPSTAT_SENTUSER )
+	{
+		sprintf( command, "PASS %s\r\n", m_szPassword );
+
+		if( SendCommand( command, 7 + strlen( m_szPassword ) ) < 0 )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_SENDINGPASS;
+	}
+
+	if( m_iStatus == FTPSTAT_SENDINGPASS )
+	{
+		if( RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED )
+		{
+			return( FTP_TRYING );
+		}
+
+		if( iReply != FTPREPLY_LOGGEDIN )
+		{
+			if( iReply == FTPREPLY_CONTROLCLOSED )
+			{
+				return( FTP_FAILED );
+			}
+
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_LOGGEDIN;
+
+		return( FTP_SUCCEEDED );
+	}
+
+	return( FTP_FAILED );
+}
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	STDMETHOD Cftp::LogoffFromServer( void )
+*
+* $_Description :
+*	Logs off from a server.  LoginToServer() must have succeeded before this
+*	call is made.
+*
+* $_Parameters  :
+*	None.
+*
+* $_ReturnValue :
+*	FTP_TRYING until the logoff has succeeded, then FTP_SUCCEEDED.
+*	FTP_FAILED on error.
+*
+***************************************************************************/
+
+
+HRESULT  Cftp::LogoffFromServer( void )
+{
+	char command[ 256 ];
+	int iReply, iRetCode;
+
+	memset( command, 0, 256 );
+
+	switch( m_iStatus )
+	{
+		case FTPSTAT_LOGGINGOFF:
+			if( SendCommand( "QUIT\r\n", 6 ) == FTP_SUCCEEDED )
+			{
+				m_iStatus = FTPSTAT_SENDINGQUIT;
+			}
+			else
+			{
+				return( FTP_FAILED );
+			}
+
+		case FTPSTAT_SENDINGQUIT:
+		{
+			char buf[ 50 ];
+
+			if( ( iReply = RecvReply( buf, 50, &iRetCode ) ) == FTP_SUCCEEDED )
+			{
+				if( iRetCode == 221 )
+				{
+					//m_iStatus = FTPSTAT_SENTQUIT;
+
+                    //m_iStatus = FTPSTAT_INIT;  // NAK
+
+					CloseSockets();
+					ZeroStuff();
+
+					return( FTP_SUCCEEDED );
+				}
+			}
+			else
+			{
+				if( iReply == FTP_FAILED )
+				{
+					return( FTP_FAILED );
+				}
+				return( FTP_TRYING );
+			}
+		}
+
+		default:
+			m_iStatus = FTPSTAT_LOGGINGOFF;
+			return( FTP_TRYING );
+
+	}
+
+}
+
+
+
+
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	HRESULT  Cftp::FindFile( LPCSTR szRemoteFileName, int * piSize )
+*
+* $_Description :
+*	Locates a file on the remote server.
+*
+* $_Parameters  :
+*	-> LPCSTR szRemoteFileName
+*	Full path and file name of the file to be downloaded.
+*
+*	<- int * piSize
+*	A pointer to an integer in which to return the size of the file, in bytes.
+*
+* $_ReturnValue :
+*	FTP_SUCCEEDED on success.  Otherwise FTP_TRYING, or FTP_FAILED on error.
+*
+* $_Warnings    :
+*	This function will continue to return FTP_TRYING if the file does not exist on
+*	the server.
+*
+***************************************************************************/
+
+
+
+HRESULT  Cftp::FindFile( LPCSTR szRemoteFileName, int * piSize )
+{
+	char command[ 256 ];
+	static char listline[ 256 ] = {0};
+
+	int i, iReply;
+	char ext[ 10 ];
+
+	if (m_findStart==0)
+      m_findStart=time(NULL);
+
+	if((time(NULL)-m_findStart) > 30)  // try for 30 seconds
+	{
+        /////////DBGMSG("FindFile: Tried for too long");
+        m_findStart=0;
+		return( FTP_FAILED );
+	}
+
+	//strcpy(m_szRemoteFilePath, "/");  // start at home
+	_splitpath( szRemoteFileName, NULL, m_szRemoteFilePath+strlen(m_szRemoteFilePath),
+		m_szRemoteFileName, ext );
+
+	strlcat(m_szRemoteFileName, ext, ARRAY_SIZE(m_szRemoteFileName));
+
+	for( i = 0; i < (int)strlen( m_szRemoteFilePath ); i++ )
+	{
+		if( m_szRemoteFilePath[ i ] == '\\' )
+		{
+			m_szRemoteFilePath[ i ] = '/';
+		}
+	}
+
+	memset( command, 0, 256 );
+
+	/* Change directory */
+
+	if( ( m_iStatus == FTPSTAT_LOGGEDIN ) || ( m_iStatus == FTPSTAT_FILEFOUND ) )
+	{
+		sprintf( command, "CWD %s\r\n", m_szRemoteFilePath );
+
+		if( SendCommand( command, 6 + strlen( m_szRemoteFilePath ) ) < 0 )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_SENDINGCWD;
+	}
+
+
+	/* Get reply */
+
+	if( m_iStatus == FTPSTAT_SENDINGCWD )
+	{
+		HRESULT reply=RecvReply( command, 256, &iReply );
+
+		if ((reply == FTP_SUCCEEDED) && (iReply == 550)) {
+			m_findStart=0;
+			return(FTP_FAILED);
+		}
+
+		if( ( reply != FTP_SUCCEEDED ) ||
+			( iReply != FTPREPLY_CWDOK ) )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_SENTCWD;
+	}
+
+	/* Set up data connection port */
+
+	if( m_iStatus == FTPSTAT_SENTCWD )
+	{
+		i = 0;
+		while( SendNewPort() == FTP_TRYING )
+		{
+			i++;
+
+			if( i == 1000 )
+			{
+				return( FTP_TRYING );
+			}
+		}
+
+		m_iStatus = FTPSTAT_SENTPORT;
+	}
+
+	/* Get directory listing for file. */
+
+	if( m_iStatus == FTPSTAT_SENTPORT )
+	{
+		sprintf( command, "LIST %s\r\n", m_szRemoteFileName );
+
+		if( SendCommand( command, 7 + strlen( m_szRemoteFileName ) ) < 0 )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_SENDINGLIST;
+	}
+
+
+	/* Get reply */
+
+	if( m_iStatus == FTPSTAT_SENDINGLIST )
+	{
+		if( ( RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED ) ||
+			( iReply != FTPREPLY_OPENASCII ) )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_SENTLIST;
+	}
+
+	/* Open data connection */
+
+	if( m_iStatus == FTPSTAT_SENTLIST )
+	{
+		i = OpenDataConnection();
+		if( i != FTP_SUCCEEDED )
+		{
+            /////////DBGMSG("FindFile: OpenDataConnection failed: "<<i);
+            m_findStart=0;
+			return( i );
+		}
+		m_iStatus = FTPSTAT_LISTDATAOPEN;
+		memset( listline, 0, 256 );
+	}
+
+
+	/* Get data */
+
+	if( m_iStatus == FTPSTAT_LISTDATAOPEN )
+	{
+		RecvData( listline, 256 );
+
+		if( strlen( listline ) == 0 )
+		{
+			return( FTP_TRYING );
+		}
+		m_iStatus = FTPSTAT_LISTDATARECVD;
+	}
+
+	/* Wait for confirmation of end of data stream */
+
+	if( m_iStatus == FTPSTAT_LISTDATARECVD )
+	{
+		if( ( RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED ) ||
+			( iReply != FTPREPLY_COMPLETE ) )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_FILEFOUND;
+	}
+
+	CloseDataConnection();
+
+	m_findStart=0;
+
+	/* Is the file there? */
+
+	if( strncmp( listline, m_szRemoteFileName, sizeof( m_szRemoteFileName ) ) == 0 )
+	{
+		/* No */
+        ////////DBGMSG("FindFile: File not in list: "<<listline);
+		return( FTP_FAILED );
+	}
+
+	/* Yes - find out the size, in bytes */
+
+	if( sscanf( &listline[ 32 ], " %d ", &i ) == 1 )
+	{
+		if( piSize != NULL )
+		{
+			*piSize = i;
+			m_iFileSize = i;
+		}
+		return( FTP_SUCCEEDED );
+	}
+
+    ////////DBGMSG("Default fail case: "<<listline);
+	return( FTP_FAILED );
+}
+
+
+
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	HRESULT  Cftp::SendCommand( LPCSTR pCommand, int iSize )
+*
+* $_Description :
+*	Sends a command to the server.  Commands are strings terminated with
+*	"\r\n"
+*
+* $_Parameters  :
+*	LPCSTR pCommand
+*	A pointer to a command
+*
+*	int iSize
+*	The size of the command in bytes.
+*
+* $_ReturnValue :
+*	FTP_SUCCEEDED on success, or FTP_FAILED on error.
+*
+***************************************************************************/
+
+HRESULT  Cftp::SendCommand( LPCSTR pCommand, int iSize )
+{
+	int i;
+
+	i = send( m_iCommandSocket, pCommand, iSize, 0 );
+
+	if( i > 0 )
+	{
+#ifdef RTS_DEBUG
+		OutputDebugString( "-->" );
+		OutputDebugString( pCommand );
+#endif
+		return( FTP_SUCCEEDED );
+	}
+	else
+	{
+		return( FTP_FAILED );
+	}
+}
+
+
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	HRESULT  Cftp::RecvReply( LPCSTR pReplyBuffer, int iSize, int * piRetCode )
+*
+* $_Description :
+*	Receives a reply from the server and extracts the numerical reply
+*	code.
+*
+* $_Parameters  :
+*	-> LPCSTR pReplyBuffer
+*	A buffer for the reply - must be specified and be at least 4 bytes in
+*	length.
+*
+*	-> iSize
+*	The size of the reply buffer.
+*
+*	<- piRetCode
+*	A pointer to an integer to store the numeric return code for the message received.
+*
+* $_ReturnValue :
+*	FTP_SUCCEEDED on success, FTP_FAILED otherwise.
+*
+***************************************************************************/
+
+
+HRESULT  Cftp::RecvReply( LPCSTR pReplyBuffer, int iSize, int * piRetCode )
+{
+	int readval;
+	char * pc = (char *)pReplyBuffer;
+
+	while(1) {
+		// Preview whats on the socket so we can make the decision if there is enough
+		// there to use.
+		readval = recv(m_iCommandSocket, pc, iSize-1, MSG_PEEK);
+		pc[iSize-1]=0;
+		if (readval > 0)
+			pc[readval]=0;
+
+		// Did the endpoint close?
+		if (readval < 0) {
+			if ((WSAGetLastError() == WSAECONNRESET ) || ((WSAGetLastError() == WSAENOTCONN)))
+				readval=0;
+			else {
+				// nothing to read right now....
+				return(FTP_TRYING);
+			}
+		}
+
+		if (readval == 0) {
+			// endpoint closed
+			*piRetCode=FTPREPLY_CONTROLCLOSED;
+			return(FTP_SUCCEEDED);		// we succeeded in getting a reply
+		}
+
+		if (readval < 3)  // minimal response
+			return(FTP_TRYING);
+
+		// Verify that this is a complete line, if not we will keep trying til
+		// we have one.
+		char *end=strstr(pc, "\r\n");
+		if (end == 0)
+			return(FTP_TRYING);
+
+		// OK, we've got a line, pull it from the socket...
+		recv(m_iCommandSocket, pc, end-pc+strlen("\r\n"), 0);
+#ifdef RTS_DEBUG
+		OutputDebugString( "<--" );
+		OutputDebugString( pc );
+#endif
+
+		// Is this an unrecognized command?  It's probably in response to our BOGUSCOMMAND, ignore it.
+		// If we got this for some other reason then this FTP server doesn't support our required command set.
+		// If this were a general purpose FTP library we probably couldn't get away with this because it's pretty lame.
+		const char *BOGUS_RESPONSE="500";
+		if (_strnicmp(pc, BOGUS_RESPONSE, strlen(BOGUS_RESPONSE))==0)
+			continue;
+
+		// If the line starts with a non-digit then we ignore it...
+		if (isdigit(pc[0])==0)
+			continue;
+
+		if (piRetCode)
+			*piRetCode=atol(pc);
+
+		return( FTP_SUCCEEDED );
+	}
+}
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	unsigned long MyIPAddress( int sockfd )
+*
+* $_Description :
+*	Finds the IP address of the local host.
+*
+* $_Parameters  :
+*	-> int sockfd
+*	An optional socket descriptor - if this is given and the socket is connected
+*   then the answer will guaranteed to be on the same interface as the connected
+*	socket.
+*
+* $_ReturnValue :
+*	A unsigned integer containing the IP address of the local host.
+*
+***************************************************************************/
+
+
+unsigned long MyIPAddress( int sockfd )
+{
+
+	int		 test = 99;
+	int i;
+	char pBuffer[ 256 ];
+	char * pAddr;
+	struct hostent * pHE;
+	unsigned long ip;
+	struct sockaddr_in sin;
+
+	if( sockfd != -1 )
+	{
+		i = sizeof( sin );
+		getsockname( sockfd, (struct sockaddr *)&sin, &i );
+
+		ip = sin.sin_addr.S_un.S_addr;
+	}
+	else
+	{
+		/* Get this machine's name. */
+
+		if( gethostname( pBuffer, 256 ) != 0 )
+		{
+			return( FTP_FAILED );
+		}
+
+		/* Look up the machine in "DNS" or whatever. */
+
+		pHE = gethostbyname( pBuffer );
+
+		if( pHE == NULL )
+		{
+			return( FTP_FAILED );
+		}
+
+		/* Find a good IP address. */
+
+		ip = 0;
+
+		i = 0;
+
+		while( ( pAddr = pHE->h_addr_list[ i++ ] ) != NULL )
+		{
+
+			ip = *((unsigned long *)pAddr );
+
+			if( ( ip != 0 ) && ( ip != inet_addr( "127.0.0.1" ) ) )
+			{
+				break;
+			}
+			else
+			{
+				ip = 0;
+			}
+
+		}
+	}
+
+	if( ip == 0 )
+	{
+		return( FTP_FAILED );
+	}
+
+
+	return( ip );
+}
+
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	int Cftp::SendNewPort( void )
+*
+* $_Description :
+*	Sends a PORT command to the server specifying a new ephemeral port to
+*	use for a data connection.  Opens the port in the process.
+*
+* $_Parameters  :
+*	bool reset
+*	Should be TRUE for the first attempt, FALSE subsequently.
+*
+* $_ReturnValue :
+*	FTP_SUCCEEDED on success, FTP_FAILED on error, FTP_TRYING while
+*	going through the stages.
+*
+***************************************************************************/
+
+
+int Cftp::SendNewPort( void )
+{
+	unsigned long uTemp;
+	char command[ 256 ];
+	int i, iReply;
+
+	/* Open a socket */
+
+	if( m_sendNewPortStatus == 0 )
+	{
+
+		m_iDataSocket = socket( AF_INET, SOCK_STREAM, 0 );
+
+		if( m_iDataSocket < 0 )
+		{
+			return( FTP_FAILED );
+		}
+
+		/* Set socket to non-blocking */
+
+		uTemp = 1;
+
+		if (Use_Non_Blocking_Mode()) {
+			if( ioctlsocket( m_iCommandSocket, FIONBIO, &uTemp ) == SOCKET_ERROR )
+			{
+				return( FTP_FAILED );
+			}
+		}
+
+		memset( &m_DataSockAddr, 0, sizeof( m_DataSockAddr ) );
+
+		m_DataSockAddr.sin_family		 = AF_INET;
+		m_DataSockAddr.sin_addr.s_addr = htonl( INADDR_ANY );
+		m_DataSockAddr.sin_port		 = 0; // Winsock fills in an ephemeral port during bind...
+
+		if( bind( m_iDataSocket, (struct sockaddr *)&m_DataSockAddr, sizeof( m_DataSockAddr ) ) < 0 )
+		{
+			return( FTP_FAILED );
+		}
+
+
+		i = sizeof( m_DataSockAddr);
+
+		getsockname( m_iDataSocket, (struct sockaddr *)&m_DataSockAddr, &i );
+
+		listen( m_iDataSocket, 5 );
+
+
+		// Set socket to non-blocking
+
+		uTemp = 1;
+
+
+		if (Use_Non_Blocking_Mode()) {
+			if( ioctlsocket( m_iDataSocket, FIONBIO, &uTemp ) == SOCKET_ERROR )
+			{
+				return( FTP_FAILED );
+			}
+		}
+
+
+		m_sendNewPortStatus = 1;
+	}
+
+	/* Send a port command. */
+
+	if( m_sendNewPortStatus == 1 )
+	{
+		memset( command, 0, 256 );
+
+		i = MyIPAddress( m_iCommandSocket );
+
+		if( i == FTP_FAILED )
+		{
+			return( FTP_FAILED );
+		}
+
+		sprintf( command, "PORT %d,%d,%d,%d,%d,%d\r\n",
+				 i & 0xFF,
+				 ( i >> 8 ) & 0xFF,
+				 ( i >> 16 ) & 0xFF,
+				 ( i >> 24 ) & 0xFF,
+				 m_DataSockAddr.sin_port & 0xFF,
+				 m_DataSockAddr.sin_port >> 8 );
+
+		if( SendCommand( command, strlen(command) ) < 0 )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_sendNewPortStatus = 2;
+	}
+
+	/* Get reply */
+
+	if( m_sendNewPortStatus == 2 )
+	{
+		if( ( RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED ) ||
+			( iReply != FTPREPLY_PORTOK ) )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_sendNewPortStatus = 0;
+	}
+
+	return( FTP_SUCCEEDED );
+}
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	int Cftp::OpenDataConnection()
+*
+* $_Description :
+*	Opens the data connection to the server.  Actually, the socket for the
+*	data connection should have been opened by a call to SendNewPort before
+*	this method is called - this just calls accept.
+*
+* $_Parameters  :
+*	None.
+*
+* $_ReturnValue :
+*	FTP_SUCCEEDED on success, FTP_FAILED otherwise.
+*
+* $_Warnings    :
+*	This call may block.
+*
+***************************************************************************/
+
+
+
+int Cftp::OpenDataConnection()
+{
+	int iNewSocket;
+
+	if( m_iDataSocket == 0 )
+	{
+		return( FTP_FAILED );
+	}
+
+	if( ( iNewSocket = accept( m_iDataSocket, NULL, 0 ) ) < 0 )
+	{
+		if( WSAGetLastError() != (WSAEWOULDBLOCK ) )
+		{
+			return( FTP_FAILED );
+		}
+		else
+		{
+			return( FTP_TRYING );
+		}
+	}
+
+	m_iDataSocket = iNewSocket;
+
+	return( FTP_SUCCEEDED );
+}
+
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	void Cftp::CloseDataConnection()
+*
+* $_Description :
+*	Closes the data connection.
+*
+* $_Parameters  :
+*	None.
+*
+* $_ReturnValue :
+*	None.
+*
+***************************************************************************/
+
+
+void Cftp::CloseDataConnection()
+{
+	closesocket( m_iDataSocket );
+	m_iDataSocket = 0;
+}
+
+/*$_Function****************************************************************
+* $_Name        :
+*	HRESULT  Cftp::DisconnectFromServer()
+*
+* $_Description :
+*	Disconnects from the server.
+*
+* $_Parameters  :
+*	None.
+*
+* $_ReturnValue :
+*	None.
+*
+***************************************************************************/
+
+HRESULT  Cftp::DisconnectFromServer()
+{
+	// Make the download file read-only so it's still there the next time
+	// we're run.
+
+	closesocket( m_iCommandSocket );
+	return( FTP_SUCCEEDED );
+}
+
+
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	int  Cftp::SendData( char * pData, int iSize )
+*
+* $_Description :
+*	Sends data to the server.
+*
+* $_Parameters  :
+*	-> char * pData
+*	A pointer to some data to be sent.
+*
+*	-> int iSize
+*	The size, in bytes, of the data.
+*
+* $_ReturnValue :
+*	The number of bytes sent, or -1 on error.
+*
+***************************************************************************/
+
+int  Cftp::SendData( char * pData, int iSize )
+{
+	return( send( m_iDataSocket, pData, iSize, 0 ) );
+}
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	int  Cftp::RecvData( char * pData, int iSize )
+*
+* $_Description :
+*	Receives data from the server.
+*
+* $_Parameters  :
+*	-> LPCSTR pData
+*	A pointer to a buffer for the data to be received.
+*
+*	-> int iSize
+*	The size, in bytes, of the data buffer.
+*
+* $_ReturnValue :
+*	The number of bytes received, or -1 on error.
+*
+***************************************************************************/
+
+int  Cftp::RecvData( char * pData, int iSize )
+{
+/***** testing...
+	int readval = recv(m_iDataSocket, pData, iSize, MSG_PEEK);
+	if (readval <= 0)		// If there's nothing to read, don't read now...
+		return(readval);
+******/
+
+	return( recv( m_iDataSocket, pData, iSize, 0 ) );
+}
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	HRESULT  Cftp::GetNextFileBlock( LPCSTR szLocalFileName, int * piTotalRead )
+*
+* $_Description :
+*	Retrieves the next block of data from the remote file and writes it into
+*	the local file.  Deals with opening the local file and restarting a
+*	failed transfer if FileRecoveryPosition() returns non-zero.  To prevent
+*	a restart after FileRecoveryPosition() returns non-zero, call
+*	Cftp::RestartFrom() with 0 as the offset parameter.
+*
+*	The file is initally written to a temporary file and then copied to the local
+*	file name when the transfer is complete.  If the transfer is halted, the
+*	temporary file will be used as the starting point for subsequent retries.
+*
+* $_Parameters  :
+*	-> LPCSTR szLocalFileName
+*	A pointer to a string containing the local file name for the transferred file.
+*
+*	<- int * piTotalRead
+*	A pointer to an integer in which to store the total number of bytes
+*	transferred so far.
+*
+* $_ReturnValue :
+*	FTP_TRYING while the transfer is in progress, FTP_SUCCEEDED on completion,
+*	FTP_FAILED on error.
+*
+***************************************************************************/
+
+HRESULT  Cftp::GetNextFileBlock( LPCSTR szLocalFileName, int * piTotalRead )
+{
+	char command[ 256 ];
+	int read, totread = 0;
+
+	const int max_data_len=10240;
+
+	char data[ max_data_len ];
+	int res, iReply;
+
+	char downloadfilename[256];
+	GetDownloadFilename(szLocalFileName, downloadfilename);
+
+
+	//char str[ 256 ];
+
+	strlcpy( m_szLocalFileName, szLocalFileName, sizeof(m_szLocalFileName));
+
+	// Open local file
+
+	if( m_iStatus == FTPSTAT_FILEFOUND )
+	{
+		if( m_iFilePos == 0 )
+		{
+			if( ( m_pfLocalFile = fopen( downloadfilename, "wb" ) ) == NULL )
+			{
+				return( FTP_FAILED );
+			}
+		}
+		else
+		{
+			if( ( m_pfLocalFile = fopen( downloadfilename, "ab" ) ) == NULL )
+			{
+				return( FTP_FAILED );
+			}
+		}
+		m_iStatus = FTPSTAT_FILEOPEN;
+	}
+
+	// Send the PORT command
+
+	if( m_iStatus == FTPSTAT_FILEOPEN )
+	{
+		if( SendNewPort() == FTP_SUCCEEDED )
+		{
+			m_iStatus = FTPSTAT_SENTFILEPORT;
+		}
+		else
+		{
+			return( FTP_TRYING );
+		}
+	}
+
+	// Set type to BINARY
+
+	if( m_iStatus == FTPSTAT_SENTFILEPORT )
+	{
+		sprintf( command, "TYPE I\r\n");
+
+		if( SendCommand( command, strlen( command ) ) < 0 )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_SENDINGTYPE;
+	}
+
+	/* Get reply */
+
+	if( m_iStatus == FTPSTAT_SENDINGTYPE )
+	{
+		if( ( RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED ) ||
+			( iReply != FTPREPLY_TYPEOK ) )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_SENTTYPE;
+	}
+
+	// Send the RESTART command - if we are restarting a previous transfer.
+
+	if( m_iStatus == FTPSTAT_SENTTYPE )
+	{
+		if( m_iFilePos == 0 )
+		{
+			m_iStatus = FTPSTAT_SENTREST;
+		}
+		else
+		{
+			sprintf( command, "REST %d\r\n", m_iFilePos );
+
+			if( SendCommand( command, strlen( command ) ) < 0 )
+			{
+				return( FTP_TRYING );
+			}
+
+			m_iStatus = FTPSTAT_SENDINGREST;
+		}
+	}
+
+	/* Get reply */
+
+	if( m_iStatus == FTPSTAT_SENDINGREST )
+	{
+		HRESULT res=RecvReply( command, 256, &iReply );
+
+		if ((res == FTP_FAILED) || (iReply == 502))  // unsupported command
+		{
+			m_iFilePos=0;
+			fclose(m_pfLocalFile);
+			m_pfLocalFile = fopen( downloadfilename, "wb" );
+		}
+		else if( ( res != FTP_SUCCEEDED ) ||
+			( iReply != FTPREPLY_RESTARTOK ) )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_SENTREST;
+	}
+
+
+	// Send the RETR command
+
+	if( m_iStatus == FTPSTAT_SENTREST )
+	{
+		sprintf( command, "RETR %s\r\n", m_szRemoteFileName );
+
+		if( SendCommand( command, strlen( command ) ) < 0 )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_SENDINGRETR;
+	}
+
+	/* Get reply */
+
+	if( m_iStatus == FTPSTAT_SENDINGRETR )
+	{
+
+		if( ( RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED ) ||
+			( iReply != FTPREPLY_OPENBINARY ) )
+		{
+			return( FTP_TRYING );
+		}
+
+		m_iStatus = FTPSTAT_SENTRETR;
+	}
+
+	/* Open data connection */
+
+	if( m_iStatus == FTPSTAT_SENTRETR )
+	{
+		res = OpenDataConnection();
+		if( res != FTP_SUCCEEDED )
+		{
+			return( res );
+		}
+		m_iStatus = FTPSTAT_FILEDATAOPEN;
+	}
+
+
+	/* Get data */
+
+	if( m_iStatus == FTPSTAT_FILEDATAOPEN )
+	{
+		do
+		{
+			read = RecvData( data, max_data_len );
+			if( read > 0 )
+			{
+				fwrite( data, 1, read, m_pfLocalFile );
+				totread += read;
+			}
+		}
+		while( ( read > 0 ) && ( totread < (max_data_len * 20) ) );  // Don't read too much -
+															// must not block for too long
+
+
+		m_iFilePos += totread;   // update read position
+
+		if( piTotalRead != NULL )
+			*piTotalRead = m_iFilePos;
+
+
+		// look for all notices about endpoint closed...
+		if (read < 0) {
+			int wsa_err=WSAGetLastError();
+
+			if ((wsa_err == WSAECONNRESET) || (wsa_err == WSAENOTCONN))
+				read = 0;		// just treat it as a close....
+		}
+
+
+		/* See if the download has finished */
+
+		if( read == 0 )
+		{
+			// Data connection reset
+			if( m_iFilePos != m_iFileSize ) {
+				// Haven't got all the data
+				return( FTP_FAILED );
+			} else {
+				// got all the data and the connection is closed so mark it so
+				m_iStatus = FTPSTAT_FILEDATACLOSED;
+			}
+		} else {
+			return( FTP_TRYING );
+		}
+	}
+
+	// if we have gotten to here, we have all the data and the connection is
+	// closed.  The case where the connection was closed but we didn't get
+	// everything is handled above.
+	if( m_iStatus == FTPSTAT_FILEDATACLOSED )	{
+		CloseDataConnection();
+		fclose( m_pfLocalFile );
+		m_pfLocalFile = NULL;
+
+		/*
+		 * Move the file from the temporary download location to its
+		 *  final resting place
+		 */
+
+		char downloadfilename[256];
+		GetDownloadFilename(m_szLocalFileName, downloadfilename);
+
+		// Make sure the path exists for the new file
+		char curdir[256];
+		_getcwd(curdir,256);
+		Prepare_Directories(curdir, m_szLocalFileName);
+		DEBUG_LOG(("CWD: %s", curdir));
+
+		if( rename( downloadfilename, m_szLocalFileName ) != 0 )	{
+			DEBUG_LOG(("First rename of %s to %s failed with errno of %d", downloadfilename, m_szLocalFileName, errno));
+			/* Error moving file - remove file that's already there and try again. */
+			_chmod( m_szLocalFileName, _S_IWRITE | _S_IREAD);	// make sure it's not readonly
+			DEBUG_LOG(("_chmod of %s failed with errno of %d", m_szLocalFileName, errno));
+			remove( m_szLocalFileName );
+			DEBUG_LOG(("remove of %s failed with errno of %d", m_szLocalFileName, errno));
+
+			if( rename( downloadfilename, m_szLocalFileName ) != 0 )	{
+				DEBUG_LOG(("Second rename of %s to %s failed with errno of %d", downloadfilename, m_szLocalFileName, errno));
+				return( FTP_FAILED );
+			}
+		}
+
+		// Send a bogus command.  If the firewall has closed our ftp command channel connection this
+		// will allow us to detect it.  (Obviously the data channel is closed or we wouldn't be here)
+		// There are cases (firewall) where the connection will go away without having a close command
+		// but writing to it will allow us to detect this case.
+		// We will ignore the response because we don't know in which order the server will respond
+		SendCommand("BOGUSCOMMAND\r\n", strlen("BOGUSCOMMAND\r\n"));
+
+		OutputDebugString("File closed, waiting for response.\n");
+
+		m_iStatus = FTPSTAT_TRANSFERREPLY;
+	}
+
+
+	if( m_iStatus == FTPSTAT_TRANSFERREPLY ) {
+		iReply=0;
+
+		// Get the file complete reply
+		if (RecvReply( command, 256, &iReply ) != FTP_SUCCEEDED )
+			return(FTP_TRYING);
+
+		if (iReply == FTPREPLY_CONTROLCLOSED) {
+			m_iStatus = FTPSTAT_INIT;
+			m_iFilePos=0;
+			CloseSockets();
+		} else {
+			m_iStatus = FTPSTAT_LOGGEDIN;
+			m_iFilePos=0;
+		}
+		return(FTP_SUCCEEDED);
+	}
+	return( FTP_FAILED );
+}
+
+
+
+/*$_Function****************************************************************
+* $_Name        :
+*	HRESULT  Cftp::FileRecoveryPosition( LPCSTR szLocalFileName )
+*
+* $_Description :
+*	Finds the size of the specified file.  This size can be used
+*
+* $_Parameters  :
+*	char & szLocalFileName
+*	The full path name of the local file.
+*
+* $_ReturnValue :
+*	The size of that file on the local disk.  0 if the file does not exist.
+*
+***************************************************************************/
+
+
+//
+// Do we have this file in the download directory?  If so then it's a partial download.
+//
+//
+HRESULT  Cftp::FileRecoveryPosition( LPCSTR szLocalFileName, LPCSTR szRegistryRoot )
+{
+	char downloadfilename[256];
+	GetDownloadFilename(szLocalFileName, downloadfilename);
+
+	FILE *testfp = fopen( downloadfilename, "rb" );
+	if( testfp == NULL )
+	{
+		m_iFilePos = 0;
+		return 0;
+	}
+
+	fseek( testfp, 0, SEEK_END );
+	m_iFilePos = ftell( testfp );
+	fclose( testfp );
+
+	return( m_iFilePos );
+}
+
+/*************8
+	FILE * testfp;
+	HKEY hkey;
+	unsigned char regfilename[ 256 ];
+	char regkey[ 512 ];
+	unsigned long t1, t2;
+
+	if( ( szRegistryRoot == NULL ) || ( szLocalFileName == NULL ) )
+	{
+		// Bail out
+		return( 0 );
+	}
+
+	// Concatenate the registry key together
+
+	strlcpy(regkey, szRegistryRoot, ARRAY_SIZE(regkey));
+	if( regkey[ strlen( regkey ) - 1 ] != '\\' )
+	{
+		strlcat(regkey, "\\Download", ARRAY_SIZE(regkey));
+	}
+	else
+	{
+		strlcat(regkey, "Download", ARRAY_SIZE(regkey));
+	}
+
+	if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, (LPCTSTR)regkey,
+		0, KEY_ALL_ACCESS, &hkey ) != ERROR_SUCCESS )
+	{
+		// Key doesn't exist, create it
+		if( RegCreateKey( HKEY_LOCAL_MACHINE, (LPCTSTR)regkey,
+			&hkey ) != ERROR_SUCCESS )
+		{
+			// Error, bail out
+			return( 0 );
+		}
+
+		RegSetValueEx( hkey, (LPCTSTR)"File", 0, REG_SZ, (const unsigned char *)szLocalFileName, strlen( szLocalFileName ) + 1 );
+		RegCloseKey(hkey);
+
+		return( 0 );
+	}
+
+	t2 = 256;
+
+	if( RegQueryValueEx( hkey, (LPCTSTR)"File", 0, &t1, regfilename, &t2 ) != ERROR_SUCCESS )
+	{
+		RegSetValueEx( hkey, (LPCTSTR)"File", 0, REG_SZ, (const unsigned char *)szLocalFileName, strlen( szLocalFileName ) + 1 );
+		RegCloseKey(hkey);
+		return( 0 );
+	}
+
+	if( strcmp( szLocalFileName, (const char *)regfilename ) == 0 )
+	{
+		// File previously downloaded
+		testfp = fopen( FTP_TEMPFILENAME, "rb" );
+
+		if( testfp == NULL )
+		{
+			m_iFilePos = 0;
+			RegCloseKey(hkey);
+			return 0;
+		}
+
+		fseek( testfp, 0, SEEK_END );
+
+		m_iFilePos = ftell( testfp );
+
+		fclose( testfp );
+
+		RegCloseKey(hkey);
+		return( m_iFilePos );
+	}
+
+	// Download file doesn't exist
+	RegSetValueEx( hkey, (LPCTSTR)"File", 0, REG_SZ, (const unsigned char *)szLocalFileName, strlen( szLocalFileName ) + 1 );
+	RegCloseKey(hkey);
+
+	// get rid of any temp downloads
+	_unlink(FTP_TEMPFILENAME);
+
+	return( 0 );
+}
+**************************************/
+
+
+
+//
+// convert a local name to a temp filename to use for downloading
+//
+void Cftp::GetDownloadFilename(const char *localname, char *downloadname)
+{
+	char *name = strdup(localname);
+	char *s = name;
+	while (*s)
+	{
+		if (*s == '\\' || *s == '.' || *s == ' ')
+			*s = '_';
+		++s;
+	}
+	sprintf(downloadname,"download\\%s_%d.tmp",name,m_iFileSize);
+	free(name);
+	/*
+	Wstring name;
+	name.set(localname);
+	name.replace("\\","_");
+	name.replace(".","_");
+	name.replace(" ","_");
+	sprintf(downloadname,"download\\%s_%d.tmp",name.get(),m_iFileSize);
+	*/
+	return;
+}
+
+
+
+
+//
+// Build all the subdirectories for a given filename
+//
+bool Prepare_Directories(const char *rootdir, const char *filename)
+{
+	char tempstr[256];
+	char newdir[256];
+
+	const char *cptr=filename;
+	while(cptr=strchr(cptr,'\\'))
+	{
+		strlcpy(tempstr,filename,cptr-filename + 1);
+		sprintf(newdir,"%s\\%s",rootdir, tempstr);
+		if (!CreateDirectory(newdir, NULL))
+			return false;
+		//if ((_mkdir(newdir) == -1) && ((errno == ENOENT || errno==EACCES)))
+			//return(false);
+		cptr++;
+	}
+	return(true);
+}
+
+
+
+
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/Registry.h b/Core/Libraries/Source/WWVegas/WWDownload/Registry.h
index 846fad69121..527e9adfde1 100644
--- a/Core/Libraries/Source/WWVegas/WWDownload/Registry.h
+++ b/Core/Libraries/Source/WWVegas/WWDownload/Registry.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef __WWDOWNLOAD_REGISTRY_H__
-#define __WWDOWNLOAD_REGISTRY_H__
-
 #include <string>
 
 /**
@@ -46,5 +43,3 @@ bool SetStringInRegistry(std::string path, std::string key, std::string val);
 	* Store an unsigned int in the registry - returns true on success
 	*/
 bool SetUnsignedIntInRegistry(std::string path, std::string key, unsigned int val);
-
-#endif // __WWDOWNLOAD_REGISTRY_H__
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h b/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h
index b7fbb15daf0..d8d94d308a7 100644
--- a/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h
+++ b/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _DOWNLOADDEFS_H
-#define _DOWNLOADDEFS_H
+#pragma once
 
 // CDownload statuses
 
@@ -57,5 +56,3 @@
 #define DOWNLOADEVENT_LOCALFILEOPENFAILED	5
 #define DOWNLOADEVENT_TCPERROR				6
 #define DOWNLOADEVENT_DISCONNECTERROR		7
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h
index fcb76e53162..08c5918ab47 100644
--- a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h
+++ b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h
@@ -18,14 +18,12 @@
 
 // ftp.h : Declaration of the Cftp
 
-#ifndef __FTP_H_
-#define __FTP_H_
-
+#pragma once
 
 //#include "../resource.h"       // main symbols
 
 #include "winsock.h"
-#include "stdio.h"
+#include <Utility/stdio_adapter.h>
 
 #include "WWDownload/ftpdefs.h"
 
@@ -50,7 +48,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // Cftp
-class Cftp 
+class Cftp
 {
 private:
 	friend class CDownload;
@@ -64,7 +62,7 @@ class Cftp
 	int		m_iFilePos;									// Byte offset into file
 	int		m_iBytesRead;								// Number of bytes downloaded
 	int		m_iFileSize;								// Total size of the file
-	char	m_szRemoteFilePath[128];				
+	char	m_szRemoteFilePath[128];
 	char	m_szRemoteFileName[128];
 	char	m_szLocalFilePath[128];
 	char	m_szLocalFileName[256];
@@ -73,7 +71,7 @@ class Cftp
 	char	m_szPassword[128];
 	FILE *	m_pfLocalFile;
 	int		m_iStatus;
-	
+
 	int		m_sendNewPortStatus;
 	int		m_findStart;
 
@@ -113,5 +111,3 @@ class Cftp
 	HRESULT SendCommand( LPCSTR pCommand, int iSize );
 
 };
-
-#endif //__FTP_H_
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h b/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h
index 31746f804e6..1306a38ecbf 100644
--- a/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h
+++ b/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h
@@ -16,15 +16,10 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __FTPDEFS_H_INCLUDED__
-#define __FTPDEFS_H_INCLUDED__
-
+#pragma once
 
 // CFtp return codes.
 
 #define FTP_SUCCEEDED		S_OK
 #define	FTP_FAILED			MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 1 )
 #define FTP_TRYING			MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 2 )
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h b/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h
index e802713f645..2d5ae532dd0 100644
--- a/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h
+++ b/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h
@@ -16,9 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _URLBUILDER_H_
-#define _URLBUILDER_H_
+#pragma once
+
 void FormatURLFromRegistry( std::string& gamePatchURL, std::string& mapPatchURL,
 													 std::string& configURL, std::string& motdURL );
-
-#endif // _URLBUILDER_H_
diff --git a/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H b/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H
deleted file mode 100644
index 2d85369a17c..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef BSEARCH_H
-#define BSEARCH_H
-
-
-/*
-**	Binary searching template. It can be faster than the built in C library
-**	version since the comparison function can be inlined. If the comparison
-**	process is significantly more time consuming than the overhead of
-**	a function call, then using the C library version would be appropriate.
-*/
-template<class T>
-T * Binary_Search(T * A, int n, T const & target)
-{
-   const T * pointer = A;
-   int stride = n;
-
-	/*
-	**	Keep binary searching until a match has been found
-	**	or the search has resulted in no match.
-	*/
-   while (0 < stride) {
-      int const pivot = stride / 2;
-      T const * const tryptr = pointer + pivot;
-
-		/*
-		**	Binary stride forward or backward depending on if the candidate
-		**	element is smaller or larger than the target element. If
-		**	smaller, then merely adjusting the stride is required. If larger,
-		**	then the base pointer must be adjusted and the stride must be
-		**	moved backward.
-		*/
-      if (target < *tryptr) {
-			stride = pivot;
-		} else {
-
-			/*
-			**	An exact match results in the pointer being found
-			**	and returned to the caller. This check is performed
-			**	here since 50% of the time, the first compare will
-			**	be true and thus the equality comparison would be
-			**	called less often -- should be faster as a result.
-			*/
-			if (*tryptr == target) {
-				return ((T *) tryptr);
-			}
-
-	      pointer = tryptr + 1;
-		   stride -= pivot + 1;
-		}
-   }
-   return (NULL);
-}
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.h b/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.h
new file mode 100644
index 00000000000..aed9a03a444
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.h
@@ -0,0 +1,68 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/*
+**	Binary searching template. It can be faster than the built in C library
+**	version since the comparison function can be inlined. If the comparison
+**	process is significantly more time consuming than the overhead of
+**	a function call, then using the C library version would be appropriate.
+*/
+template<class T>
+T * Binary_Search(T * A, int n, T const & target)
+{
+   const T * pointer = A;
+   int stride = n;
+
+	/*
+	**	Keep binary searching until a match has been found
+	**	or the search has resulted in no match.
+	*/
+   while (0 < stride) {
+      int const pivot = stride / 2;
+      T const * const tryptr = pointer + pivot;
+
+		/*
+		**	Binary stride forward or backward depending on if the candidate
+		**	element is smaller or larger than the target element. If
+		**	smaller, then merely adjusting the stride is required. If larger,
+		**	then the base pointer must be adjusted and the stride must be
+		**	moved backward.
+		*/
+      if (target < *tryptr) {
+			stride = pivot;
+		} else {
+
+			/*
+			**	An exact match results in the pointer being found
+			**	and returned to the caller. This check is performed
+			**	here since 50% of the time, the first compare will
+			**	be true and thus the equality comparison would be
+			**	called less often -- should be faster as a result.
+			*/
+			if (*tryptr == target) {
+				return ((T *) tryptr);
+			}
+
+	      pointer = tryptr + 1;
+		   stride -= pivot + 1;
+		}
+   }
+   return (NULL);
+}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/BUFF.H b/Core/Libraries/Source/WWVegas/WWLib/BUFF.H
deleted file mode 100644
index 59ac28a2606..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/BUFF.H
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/BUFF.H                                             $* 
- *                                                                                             * 
- *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
- *                     $Modtime:: 4/02/99 11:59a                                              $*
- *                                                                                             * 
- *                    $Revision:: 2                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef CCBUFF_H
-#define CCBUFF_H
-
-
-/*
-**	The "bool" integral type was defined by the C++ committee in
-**	November of '94. Until the compiler supports this, use the following
-**	definition.
-*/
-//#include	"bool.h"
-
-
-/*
-**	A general purpose buffer pointer handler object. It holds not only the pointer to the
-**	buffer, but its size as well. By using this class instead of separate pointer and size
-**	values, function interfaces and algorithms become simpler to manage and understand.
-*/
-class Buffer {
-	public:
-		Buffer(char * ptr, long size=0);
-		Buffer(void * ptr=0, long size=0);
-		Buffer(void const * ptr, long size=0);
-		Buffer(long size);
-		Buffer(Buffer const & buffer);
-		~Buffer(void);
-
-		Buffer & operator = (Buffer const & buffer);
-		operator void * (void) const {return(BufferPtr);}
-		operator char * (void) const {return((char *)BufferPtr);}
-
-		void Reset(void);
-		void * Get_Buffer(void) const {return(BufferPtr);}
-		long Get_Size(void) const {return(Size);}
-		bool Is_Valid(void) const {return(BufferPtr != 0);}
-
-	protected:
-
-		/*
-		**	Pointer to the buffer memory.
-		*/
-		void * BufferPtr;
-
-		/*
-		**	The size of the buffer memory.
-		*/
-		long Size;
-
-		/*
-		**	Was the buffer allocated by this class? If so, then this class
-		**	will be responsible for freeing the buffer.
-		*/
-		bool IsAllocated;
-};
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/BUFF.h b/Core/Libraries/Source/WWVegas/WWLib/BUFF.h
new file mode 100644
index 00000000000..ad8bb6c5ec1
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/BUFF.h
@@ -0,0 +1,87 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/BUFF.h                                             $*
+ *                                                                                             *
+ *                      $Author:: Eric_c                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 4/02/99 11:59a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+/*
+**	The "bool" integral type was defined by the C++ committee in
+**	November of '94. Until the compiler supports this, use the following
+**	definition.
+*/
+//#include	"bool.h"
+
+
+/*
+**	A general purpose buffer pointer handler object. It holds not only the pointer to the
+**	buffer, but its size as well. By using this class instead of separate pointer and size
+**	values, function interfaces and algorithms become simpler to manage and understand.
+*/
+class Buffer {
+	public:
+		Buffer(char * ptr, long size=0);
+		Buffer(void * ptr=0, long size=0);
+		Buffer(void const * ptr, long size=0);
+		Buffer(long size);
+		Buffer(Buffer const & buffer);
+		~Buffer(void);
+
+		Buffer & operator = (Buffer const & buffer);
+		operator void * (void) const {return(BufferPtr);}
+		operator char * (void) const {return((char *)BufferPtr);}
+
+		void Reset(void);
+		void * Get_Buffer(void) const {return(BufferPtr);}
+		long Get_Size(void) const {return(Size);}
+		bool Is_Valid(void) const {return(BufferPtr != 0);}
+
+	protected:
+
+		/*
+		**	Pointer to the buffer memory.
+		*/
+		void * BufferPtr;
+
+		/*
+		**	The size of the buffer memory.
+		*/
+		long Size;
+
+		/*
+		**	Was the buffer allocated by this class? If so, then this class
+		**	will be responsible for freeing the buffer.
+		*/
+		bool IsAllocated;
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt
index 88a0c0b3ab0..997a6c02420 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt
+++ b/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt
@@ -13,9 +13,9 @@ set(WWLIB_SRC
     binheap.h
     bittype.h
     bound.h
-    BSEARCH.H
+    BSEARCH.h
     buff.cpp
-    BUFF.H
+    BUFF.h
     bufffile.cpp
     bufffile.h
     CallbackHook.h
@@ -25,13 +25,18 @@ set(WWLIB_SRC
     cpudetect.h
     #crandom.h
     crc.cpp
-    CRC.H
+    CRC.h
     #crcpipe.cpp
     #crcpipe.h
     #crcstraw.cpp
     #crcstraw.h
     cstraw.cpp
     cstraw.h
+    DbgHelpGuard.cpp
+    DbgHelpGuard.h
+    DbgHelpLoader.cpp
+    DbgHelpLoader.h
+    DbgHelpLoader_minidump.h
     Except.cpp
     Except.h
     FastAllocator.cpp
@@ -44,17 +49,17 @@ set(WWLIB_SRC
     hash.cpp
     hash.h
     hashcalc.h
-    HASHLIST.H
+    HASHLIST.h
     #hashtab.h
     hashtemplate.h
     #incdec.h
-    INDEX.H
+    INDEX.h
     ini.cpp
-    INI.H
+    INI.h
     inisup.h
     iostruct.h
     jshell.cpp
-    LISTNODE.H
+    LISTNODE.h
     #lzo.cpp
     #lzo.h
     #lzo1x.h
@@ -80,14 +85,14 @@ set(WWLIB_SRC
     nstrdup.h
     ntree.h
     pipe.cpp
-    PIPE.H
+    PIPE.h
     Point.h
     ramfile.cpp
-    RAMFILE.H
+    RAMFILE.h
     random.cpp
-    RANDOM.H
+    RANDOM.h
     rawfile.cpp
-    RAWFILE.H
+    RAWFILE.h
     readline.cpp
     readline.h
     realcrc.cpp
@@ -101,20 +106,23 @@ set(WWLIB_SRC
     sharebuf.h
     Signaler.h
     simplevec.h
-    SLIST.H
+    SLIST.h
     slnode.cpp
-    SLNODE.H
+    SLNODE.h
     stimer.cpp
     stimer.h
+    STLUtils.h
     straw.cpp
-    STRAW.H
+    STRAW.h
+    stringex.h
     strtok_r.cpp
     strtok_r.h
     #swap.h
+    SystemAllocator.h
     systimer.cpp
     systimer.h
-    TARGA.CPP
-    TARGA.H
+    TARGA.cpp
+    TARGA.h
     textfile.cpp
     textfile.h
     tgatodxt.cpp
@@ -126,25 +134,27 @@ set(WWLIB_SRC
     trim.h
     uarray.h
     vector.cpp
-    Vector.H
+    Vector.h
     visualc.h
     widestring.cpp
     widestring.h
     win.h
+    WWCommon.h
+    WWDefines.h
     wwfile.cpp
-    WWFILE.H
+    WWFILE.h
     wwstring.cpp
     wwstring.h
     xpipe.cpp
-    XPIPE.H
+    XPIPE.h
     xstraw.cpp
-    XSTRAW.H
+    XSTRAW.h
 )
 
 if(WIN32)
     list(APPEND WWLIB_SRC
         mpu.cpp
-        MPU.H
+        MPU.h
         rcfile.cpp
         rcfile.h
         registry.cpp
@@ -165,6 +175,15 @@ target_include_directories(core_wwlib PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+target_precompile_headers(core_wwlib PRIVATE
+    always.h
+    STLUtils.h
+    win.h
+    WWCommon.h
+    wwstring.h
+    <windows.h>
+)
+
 target_link_libraries(core_wwlib PRIVATE
     core_wwcommon
     corei_always
diff --git a/Core/Libraries/Source/WWVegas/WWLib/CRC.H b/Core/Libraries/Source/WWVegas/WWLib/CRC.H
deleted file mode 100644
index dcc57906805..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/CRC.H
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/crc.h                                              $* 
- *                                                                                             * 
- *                      $Author:: Neal_k                                                      $*
- *                                                                                             * 
- *                     $Modtime:: 10/04/99 10:25a                                             $*
- *                                                                                             * 
- *                    $Revision:: 4                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef CRC_H
-#define CRC_H
-
-#include	<stdlib.h>
-
-// TheSuperHackers @compile feliwir 17/04/2025 include _ltrotl macros
-#include <Utility/intrin_compat.h>
-
-/*
-**	This is a CRC engine class. It will process submitted data and generate a CRC from it.
-**	Well, actually, the value returned is not a true CRC. However, it shares the same strength
-**	characteristic and is faster to generate than the traditional CRC. This object is treated like
-**	a method class. If it is called as a function (using the function operator), it will return
-**	the CRC value. There are other function operators to submit data for processing.
-*/
-class CRCEngine {
-	public:
-
-		// Constructor for CRC engine (it can have an override initial CRC value).
-		CRCEngine(long initial=0) : CRC(initial), Index(0) {
-			StagingBuffer.Composite = 0;
-		};
-
-		// Fetches CRC value.
-		long operator() (void) const {return(Value());};
-
-		// Submits one byte sized datum to the CRC accumulator.
-		void operator() (char datum);
-
-		// Submits an arbitrary buffer to the CRC accumulator.
-		long operator() (void const * buffer, int length);
-
-		// Implicit conversion operator so this object appears like a 'long integer'.
-		operator long(void) const {return(Value());};
-
-	protected:
-
-		bool Buffer_Needs_Data(void) const {
-			return(Index != 0);
-		};
-
-		long Value(void) const {
-			if (Buffer_Needs_Data()) {
-				return(_lrotl(CRC, 1) + StagingBuffer.Composite);
-			}
-			return(CRC);
-		};
-
-		/*
-		**	Current accumulator of the CRC value. This value doesn't take into
-		**	consideration any pending data in the staging buffer.
-		*/
-		long CRC;
-
-		/*
-		**	This is the sub index into the staging buffer used to keep track of
-		**	partial data blocks as they are submitted to the CRC engine.
-		*/
-		int Index;
-
-		/*
-		**	This is the buffer that holds the incoming partial data. When the buffer
-		**	is filled, the value is transformed into the CRC and the buffer is flushed
-		**	in preparation for additional data.
-		*/
-		union {
-			long Composite;
-			char Buffer[sizeof(long)];
-		} StagingBuffer;
-};
-
-// the CRC class defines a few static functions for dealing with CRCs a little differently than
-// the CRCEngine. This class uses a algorithm that produces CRC values that have a high probability
-// of being unique under most circumstances.
-// Note: this code was provided by Byon Garrabrant
-//
-// 12/09/97 EHC - converted from c to c++ static class and added to crc.h and crc.cpp
-//
-#define CRC32(c,crc) (CRC::_Table[((unsigned long)(crc) ^ (c)) & 0xFFL] ^ (((crc) >> 8) & 0x00FFFFFFL))
-class CRC {
-
-	// CRC for poly 0x04C11DB7
-	static unsigned long _Table[256];
-
-public:
-
-	// get the CRC of a block of memory
-	static unsigned long	Memory( unsigned char *data, unsigned long length, unsigned long crc = 0 );
-
-	// get the CRC of a null-terminated string
-	static unsigned long	String( const char *string, unsigned long crc = 0 );
-};
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/CRC.h b/Core/Libraries/Source/WWVegas/WWLib/CRC.h
new file mode 100644
index 00000000000..e042b3d1e9d
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/CRC.h
@@ -0,0 +1,127 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/crc.h                                              $*
+ *                                                                                             *
+ *                      $Author:: Neal_k                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/04/99 10:25a                                             $*
+ *                                                                                             *
+ *                    $Revision:: 4                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include	<stdlib.h>
+
+// TheSuperHackers @build feliwir 17/04/2025 include _ltrotl macros
+#include <Utility/intrin_compat.h>
+
+/*
+**	This is a CRC engine class. It will process submitted data and generate a CRC from it.
+**	Well, actually, the value returned is not a true CRC. However, it shares the same strength
+**	characteristic and is faster to generate than the traditional CRC. This object is treated like
+**	a method class. If it is called as a function (using the function operator), it will return
+**	the CRC value. There are other function operators to submit data for processing.
+*/
+class CRCEngine {
+	public:
+
+		// Constructor for CRC engine (it can have an override initial CRC value).
+		CRCEngine(long initial=0) : CRC(initial), Index(0) {
+			StagingBuffer.Composite = 0;
+		};
+
+		// Fetches CRC value.
+		long operator() (void) const {return(Value());};
+
+		// Submits one byte sized datum to the CRC accumulator.
+		void operator() (char datum);
+
+		// Submits an arbitrary buffer to the CRC accumulator.
+		long operator() (void const * buffer, int length);
+
+		// Implicit conversion operator so this object appears like a 'long integer'.
+		operator long(void) const {return(Value());};
+
+	protected:
+
+		bool Buffer_Needs_Data(void) const {
+			return(Index != 0);
+		};
+
+		long Value(void) const {
+			if (Buffer_Needs_Data()) {
+				return(_lrotl(CRC, 1) + StagingBuffer.Composite);
+			}
+			return(CRC);
+		};
+
+		/*
+		**	Current accumulator of the CRC value. This value doesn't take into
+		**	consideration any pending data in the staging buffer.
+		*/
+		long CRC;
+
+		/*
+		**	This is the sub index into the staging buffer used to keep track of
+		**	partial data blocks as they are submitted to the CRC engine.
+		*/
+		int Index;
+
+		/*
+		**	This is the buffer that holds the incoming partial data. When the buffer
+		**	is filled, the value is transformed into the CRC and the buffer is flushed
+		**	in preparation for additional data.
+		*/
+		union {
+			long Composite;
+			char Buffer[sizeof(long)];
+		} StagingBuffer;
+};
+
+// the CRC class defines a few static functions for dealing with CRCs a little differently than
+// the CRCEngine. This class uses a algorithm that produces CRC values that have a high probability
+// of being unique under most circumstances.
+// Note: this code was provided by Byon Garrabrant
+//
+// 12/09/97 EHC - converted from c to c++ static class and added to crc.h and crc.cpp
+//
+#define CRC32(c,crc) (CRC::_Table[((unsigned long)(crc) ^ (c)) & 0xFFL] ^ (((crc) >> 8) & 0x00FFFFFFL))
+class CRC {
+
+	// CRC for poly 0x04C11DB7
+	static unsigned long _Table[256];
+
+public:
+
+	// get the CRC of a block of memory
+	static unsigned long	Memory( unsigned char *data, unsigned long length, unsigned long crc = 0 );
+
+	// get the CRC of a null-terminated string
+	static unsigned long	String( const char *string, unsigned long crc = 0 );
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h b/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h
index 60fb42f09b8..23a26db6625 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h
@@ -33,8 +33,7 @@
 *
 ******************************************************************************/
 
-#ifndef __CALLBACKHOOK_H__
-#define __CALLBACKHOOK_H__
+#pragma once
 
 class CallbackHook
 	{
@@ -44,7 +43,7 @@ class CallbackHook
 
 		virtual ~CallbackHook()
 			{}
-		
+
 		virtual bool DoCallback(void) const
 			{return false;}
 
@@ -80,5 +79,3 @@ template<class T> class Callback :
 		bool (*mCallback)(T);
 		T mUserData;
 	};
-
-#endif // __CALLBACKHOOK_H__
diff --git a/Core/Libraries/Source/WWVegas/WWLib/DbgHelpGuard.cpp b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpGuard.cpp
new file mode 100644
index 00000000000..2742a5cf5ff
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpGuard.cpp
@@ -0,0 +1,49 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "DbgHelpGuard.h"
+
+#include "DbgHelpLoader.h"
+
+
+DbgHelpGuard::DbgHelpGuard()
+	: m_needsUnload(false)
+{
+	activate();
+}
+
+DbgHelpGuard::~DbgHelpGuard()
+{
+	deactivate();
+}
+
+void DbgHelpGuard::activate()
+{
+	// Front load the DLL now to prevent other code from loading the potentially wrong DLL.
+	DbgHelpLoader::load();
+	m_needsUnload = true;
+}
+
+void DbgHelpGuard::deactivate()
+{
+	if (m_needsUnload)
+	{
+		DbgHelpLoader::unload();
+		m_needsUnload = false;
+	}
+}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/DbgHelpGuard.h b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpGuard.h
new file mode 100644
index 00000000000..c4ff06b2803
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpGuard.h
@@ -0,0 +1,44 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "always.h"
+
+
+// This class temporarily loads and unloads dbghelp.dll from the desired location to prevent
+// other code from potentially loading it from an undesired location.
+// This helps avoid crashing on boot using recent AMD/ATI drivers, which attempt to load and use
+// dbghelp.dll from the game install directory but are unable to do so without crashing because
+// the dbghelp.dll that ships with the game is very old and the AMD/ATI code does not handle
+// that correctly.
+
+class DbgHelpGuard
+{
+public:
+
+	DbgHelpGuard();
+	~DbgHelpGuard();
+
+	void activate();
+	void deactivate();
+
+private:
+
+	bool m_needsUnload;
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.cpp b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.cpp
new file mode 100644
index 00000000000..368bcd03ca7
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.cpp
@@ -0,0 +1,362 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "DbgHelpLoader.h"
+
+
+DbgHelpLoader* DbgHelpLoader::Inst = NULL;
+CriticalSectionClass DbgHelpLoader::CriticalSection;
+
+DbgHelpLoader::DbgHelpLoader()
+	: m_symInitialize(NULL)
+	, m_symCleanup(NULL)
+	, m_symLoadModule(NULL)
+	, m_symUnloadModule(NULL)
+	, m_symGetModuleBase(NULL)
+	, m_symGetSymFromAddr(NULL)
+	, m_symGetLineFromAddr(NULL)
+	, m_symSetOptions(NULL)
+	, m_symFunctionTableAccess(NULL)
+	, m_stackWalk(NULL)
+#ifdef RTS_ENABLE_CRASHDUMP
+	, m_miniDumpWriteDump(NULL)
+#endif
+	, m_dllModule(HMODULE(0))
+	, m_referenceCount(0)
+	, m_failed(false)
+	, m_loadedFromSystem(false)
+{
+}
+
+DbgHelpLoader::~DbgHelpLoader()
+{
+}
+
+bool DbgHelpLoader::isLoaded()
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	return Inst != NULL && Inst->m_dllModule != HMODULE(0);
+}
+
+bool DbgHelpLoader::isLoadedFromSystem()
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	return isLoaded() && Inst->m_loadedFromSystem;
+}
+
+bool DbgHelpLoader::isFailed()
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	return Inst != NULL && Inst->m_failed;
+}
+
+bool DbgHelpLoader::load()
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst == NULL)
+	{
+		// Cannot use new/delete here when this is loaded during game memory initialization.
+		void* p = GlobalAlloc(GMEM_FIXED, sizeof(DbgHelpLoader));
+		Inst = new (p) DbgHelpLoader();
+	}
+
+	// Always increment the reference count.
+	++Inst->m_referenceCount;
+
+	// Optimization: return early if it failed before.
+	if (Inst->m_failed)
+		return false;
+
+	// Return early if someone else already loaded it.
+	if (Inst->m_referenceCount > 1)
+		return true;
+
+	// Try load dbghelp.dll from the system directory first.
+	char dllFilename[MAX_PATH];
+	::GetSystemDirectoryA(dllFilename, ARRAY_SIZE(dllFilename));
+	strlcat(dllFilename, "\\dbghelp.dll", ARRAY_SIZE(dllFilename));
+
+	Inst->m_dllModule = ::LoadLibraryA(dllFilename);
+	if (Inst->m_dllModule == HMODULE(0))
+	{
+		// Not found. Try load dbghelp.dll from the work directory.
+		Inst->m_dllModule = ::LoadLibraryA("dbghelp.dll");
+		if (Inst->m_dllModule == HMODULE(0))
+		{
+			Inst->m_failed = true;
+			return false;
+		}
+	}
+	else
+	{
+		Inst->m_loadedFromSystem = true;
+	}
+
+	Inst->m_symInitialize = reinterpret_cast<SymInitialize_t>(::GetProcAddress(Inst->m_dllModule, "SymInitialize"));
+	Inst->m_symCleanup = reinterpret_cast<SymCleanup_t>(::GetProcAddress(Inst->m_dllModule, "SymCleanup"));
+	Inst->m_symLoadModule = reinterpret_cast<SymLoadModule_t>(::GetProcAddress(Inst->m_dllModule, "SymLoadModule"));
+	Inst->m_symUnloadModule = reinterpret_cast<SymUnloadModule_t>(::GetProcAddress(Inst->m_dllModule, "SymUnloadModule"));
+	Inst->m_symGetModuleBase = reinterpret_cast<SymGetModuleBase_t>(::GetProcAddress(Inst->m_dllModule, "SymGetModuleBase"));
+	Inst->m_symGetSymFromAddr = reinterpret_cast<SymGetSymFromAddr_t>(::GetProcAddress(Inst->m_dllModule, "SymGetSymFromAddr"));
+	Inst->m_symGetLineFromAddr = reinterpret_cast<SymGetLineFromAddr_t>(::GetProcAddress(Inst->m_dllModule, "SymGetLineFromAddr"));
+	Inst->m_symSetOptions = reinterpret_cast<SymSetOptions_t>(::GetProcAddress(Inst->m_dllModule, "SymSetOptions"));
+	Inst->m_symFunctionTableAccess = reinterpret_cast<SymFunctionTableAccess_t>(::GetProcAddress(Inst->m_dllModule, "SymFunctionTableAccess"));
+	Inst->m_stackWalk = reinterpret_cast<StackWalk_t>(::GetProcAddress(Inst->m_dllModule, "StackWalk"));
+#ifdef RTS_ENABLE_CRASHDUMP
+	Inst->m_miniDumpWriteDump = reinterpret_cast<MiniDumpWriteDump_t>(::GetProcAddress(Inst->m_dllModule, "MiniDumpWriteDump"));
+#endif
+
+	if (Inst->m_symInitialize == NULL || Inst->m_symCleanup == NULL)
+	{
+		freeResources();
+		Inst->m_failed = true;
+		return false;
+	}
+
+	return true;
+}
+
+void DbgHelpLoader::unload()
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst == NULL)
+		return;
+
+	if (--Inst->m_referenceCount != 0)
+		return;
+
+	freeResources();
+
+	Inst->~DbgHelpLoader();
+	GlobalFree(Inst);
+	Inst = NULL;
+}
+
+void DbgHelpLoader::freeResources()
+{
+	// Is private. Needs no locking.
+
+	while (!Inst->m_initializedProcesses.empty())
+	{
+		symCleanup(*Inst->m_initializedProcesses.begin());
+	}
+
+	if (Inst->m_dllModule != HMODULE(0))
+	{
+		::FreeLibrary(Inst->m_dllModule);
+		Inst->m_dllModule = HMODULE(0);
+	}
+
+	Inst->m_symInitialize = NULL;
+	Inst->m_symCleanup = NULL;
+	Inst->m_symLoadModule = NULL;
+	Inst->m_symUnloadModule = NULL;
+	Inst->m_symGetModuleBase = NULL;
+	Inst->m_symGetSymFromAddr = NULL;
+	Inst->m_symGetLineFromAddr = NULL;
+	Inst->m_symSetOptions = NULL;
+	Inst->m_symFunctionTableAccess = NULL;
+	Inst->m_stackWalk = NULL;
+#ifdef RTS_ENABLE_CRASHDUMP
+	Inst->m_miniDumpWriteDump = NULL;
+#endif
+
+	Inst->m_loadedFromSystem = false;
+}
+
+BOOL DbgHelpLoader::symInitialize(
+	HANDLE hProcess,
+	LPSTR UserSearchPath,
+	BOOL fInvadeProcess)
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst == NULL)
+		return FALSE;
+
+	if (Inst->m_initializedProcesses.find(hProcess) != Inst->m_initializedProcesses.end())
+	{
+		// Was already initialized.
+		return TRUE;
+	}
+
+	if (Inst->m_symInitialize)
+	{
+		if (Inst->m_symInitialize(hProcess, UserSearchPath, fInvadeProcess) != FALSE)
+		{
+			// Is now initialized.
+			Inst->m_initializedProcesses.insert(hProcess);
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+BOOL DbgHelpLoader::symCleanup(
+	HANDLE hProcess)
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst == NULL)
+		return FALSE;
+
+	if (stl::find_and_erase(Inst->m_initializedProcesses, hProcess))
+	{
+		if (Inst->m_symCleanup)
+		{
+			return Inst->m_symCleanup(hProcess);
+		}
+	}
+
+	return FALSE;
+}
+
+BOOL DbgHelpLoader::symLoadModule(
+	HANDLE hProcess,
+	HANDLE hFile,
+	LPSTR ImageName,
+	LPSTR ModuleName,
+	DWORD BaseOfDll,
+	DWORD SizeOfDll)
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst != NULL && Inst->m_symLoadModule)
+		return Inst->m_symLoadModule(hProcess, hFile, ImageName, ModuleName, BaseOfDll, SizeOfDll);
+
+	return FALSE;
+}
+
+DWORD DbgHelpLoader::symGetModuleBase(
+	HANDLE hProcess,
+	DWORD dwAddr)
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst != NULL && Inst->m_symGetModuleBase)
+		return Inst->m_symGetModuleBase(hProcess, dwAddr);
+
+	return 0u;
+}
+
+BOOL DbgHelpLoader::symUnloadModule(
+	HANDLE hProcess,
+	DWORD BaseOfDll)
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst != NULL && Inst->m_symUnloadModule)
+		return Inst->m_symUnloadModule(hProcess, BaseOfDll);
+
+	return FALSE;
+}
+
+BOOL DbgHelpLoader::symGetSymFromAddr(
+	HANDLE hProcess,
+	DWORD Address,
+	LPDWORD Displacement,
+	PIMAGEHLP_SYMBOL Symbol)
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst != NULL && Inst->m_symGetSymFromAddr)
+		return Inst->m_symGetSymFromAddr(hProcess, Address, Displacement, Symbol);
+
+	return FALSE;
+}
+
+BOOL DbgHelpLoader::symGetLineFromAddr(
+	HANDLE hProcess,
+	DWORD dwAddr,
+	PDWORD pdwDisplacement,
+	PIMAGEHLP_LINE Line)
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst != NULL && Inst->m_symGetLineFromAddr)
+		return Inst->m_symGetLineFromAddr(hProcess, dwAddr, pdwDisplacement, Line);
+
+	return FALSE;
+}
+
+DWORD DbgHelpLoader::symSetOptions(
+	DWORD SymOptions)
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst != NULL && Inst->m_symSetOptions)
+		return Inst->m_symSetOptions(SymOptions);
+
+	return 0u;
+}
+
+LPVOID DbgHelpLoader::symFunctionTableAccess(
+	HANDLE hProcess,
+	DWORD AddrBase)
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst != NULL && Inst->m_symFunctionTableAccess)
+		return Inst->m_symFunctionTableAccess(hProcess, AddrBase);
+
+	return NULL;
+}
+
+BOOL DbgHelpLoader::stackWalk(
+	DWORD MachineType,
+	HANDLE hProcess,
+	HANDLE hThread,
+	LPSTACKFRAME StackFrame,
+	LPVOID ContextRecord,
+	PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine,
+	PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine,
+	PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine,
+	PTRANSLATE_ADDRESS_ROUTINE TranslateAddress)
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst != NULL && Inst->m_stackWalk)
+		return Inst->m_stackWalk(MachineType, hProcess, hThread, StackFrame, ContextRecord, ReadMemoryRoutine, FunctionTableAccessRoutine, GetModuleBaseRoutine, TranslateAddress);
+
+	return FALSE;
+}
+
+#ifdef RTS_ENABLE_CRASHDUMP
+BOOL DbgHelpLoader::miniDumpWriteDump(
+	HANDLE hProcess,
+	DWORD ProcessId,
+	HANDLE hFile,
+	MINIDUMP_TYPE DumpType,
+	PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+	PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
+	PMINIDUMP_CALLBACK_INFORMATION CallbackParam)
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst != NULL && Inst->m_miniDumpWriteDump)
+		return Inst->m_miniDumpWriteDump(hProcess, ProcessId, hFile, DumpType, ExceptionParam, UserStreamParam, CallbackParam);
+
+	return FALSE;
+}
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h
new file mode 100644
index 00000000000..3dda58f2068
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h
@@ -0,0 +1,216 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "always.h"
+
+#include <win.h>
+#include <imagehlp.h> // Must be included after Windows.h
+#include <set>
+#ifdef RTS_ENABLE_CRASHDUMP
+#include <DbgHelpLoader_minidump.h>
+#endif
+
+#include "mutex.h"
+#include "SystemAllocator.h"
+
+// This static class can load, unload and use dbghelp.dll. Is thread-safe.
+// Internally it must not use new and delete because it can be created during game memory initialization.
+
+class DbgHelpLoader
+{
+private:
+
+	static DbgHelpLoader* Inst; // Is singleton class
+	static CriticalSectionClass CriticalSection; // Required because dbg help is not thread safe for the most part
+
+	DbgHelpLoader();
+	~DbgHelpLoader();
+
+public:
+
+	// Returns whether dbghelp.dll is loaded
+	static bool isLoaded();
+
+	// Returns whether dbghelp.dll is loaded from the system directory
+	static bool isLoadedFromSystem();
+
+	// Returns whether dbghelp.dll was attempted to be loaded but failed
+	static bool isFailed();
+
+	// Every call to load needs a paired call to unload, no matter if the load was successful
+	static bool load();
+	static void unload();
+
+	static BOOL WINAPI symInitialize(
+		HANDLE hProcess,
+		LPSTR UserSearchPath,
+		BOOL fInvadeProcess);
+
+	static BOOL WINAPI symCleanup(
+		HANDLE hProcess);
+
+	static BOOL WINAPI symLoadModule(
+		HANDLE hProcess,
+		HANDLE hFile,
+		LPSTR ImageName,
+		LPSTR ModuleName,
+		DWORD BaseOfDll,
+		DWORD SizeOfDll);
+
+	static DWORD WINAPI symGetModuleBase(
+		HANDLE hProcess,
+		DWORD dwAddr);
+
+	static BOOL WINAPI symUnloadModule(
+		HANDLE hProcess,
+		DWORD BaseOfDll);
+
+	static BOOL WINAPI symGetSymFromAddr(
+		HANDLE hProcess,
+		DWORD Address,
+		LPDWORD Displacement,
+		PIMAGEHLP_SYMBOL Symbol);
+
+	static BOOL WINAPI symGetLineFromAddr(
+		HANDLE hProcess,
+		DWORD dwAddr,
+		PDWORD pdwDisplacement,
+		PIMAGEHLP_LINE Line);
+
+	static DWORD WINAPI symSetOptions(
+		DWORD SymOptions);
+
+	static LPVOID WINAPI symFunctionTableAccess(
+		HANDLE hProcess,
+		DWORD AddrBase);
+
+	static BOOL WINAPI stackWalk(
+		DWORD MachineType,
+		HANDLE hProcess,
+		HANDLE hThread,
+		LPSTACKFRAME StackFrame,
+		LPVOID ContextRecord,
+		PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine,
+		PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine,
+		PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine,
+		PTRANSLATE_ADDRESS_ROUTINE TranslateAddress);
+
+#ifdef RTS_ENABLE_CRASHDUMP
+	static BOOL WINAPI miniDumpWriteDump(
+		HANDLE hProcess,
+		DWORD ProcessId,
+		HANDLE hFile,
+		MINIDUMP_TYPE DumpType,
+		PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+		PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
+		PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
+#endif
+
+private:
+
+	static void freeResources();
+
+	typedef BOOL (WINAPI *SymInitialize_t) (
+		HANDLE hProcess,
+		LPSTR UserSearchPath,
+		BOOL fInvadeProcess);
+
+	typedef BOOL (WINAPI *SymCleanup_t) (
+		HANDLE hProcess);
+
+	typedef BOOL (WINAPI *SymLoadModule_t) (
+		HANDLE hProcess,
+		HANDLE hFile,
+		LPSTR ImageName,
+		LPSTR ModuleName,
+		DWORD BaseOfDll,
+		DWORD SizeOfDll);
+
+	typedef DWORD (WINAPI *SymGetModuleBase_t) (
+		HANDLE hProcess,
+		DWORD dwAddr);
+
+	typedef BOOL (WINAPI *SymUnloadModule_t) (
+		HANDLE hProcess,
+		DWORD BaseOfDll);
+
+	typedef BOOL (WINAPI *SymGetSymFromAddr_t) (
+		HANDLE hProcess,
+		DWORD Address,
+		LPDWORD Displacement,
+		PIMAGEHLP_SYMBOL Symbol);
+
+	typedef BOOL (WINAPI* SymGetLineFromAddr_t) (
+		HANDLE hProcess,
+		DWORD dwAddr,
+		PDWORD pdwDisplacement,
+		PIMAGEHLP_LINE Line);
+
+	typedef DWORD (WINAPI *SymSetOptions_t) (
+		DWORD SymOptions);
+
+	typedef LPVOID (WINAPI *SymFunctionTableAccess_t) (
+		HANDLE hProcess,
+		DWORD AddrBase);
+
+	typedef BOOL (WINAPI *StackWalk_t) (
+		DWORD MachineType,
+		HANDLE hProcess,
+		HANDLE hThread,
+		LPSTACKFRAME StackFrame,
+		LPVOID ContextRecord,
+		PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine,
+		PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine,
+		PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine,
+		PTRANSLATE_ADDRESS_ROUTINE TranslateAddress);
+
+#ifdef RTS_ENABLE_CRASHDUMP
+	typedef BOOL(WINAPI* MiniDumpWriteDump_t)(
+		HANDLE hProcess,
+		DWORD ProcessId,
+		HANDLE hFile,
+		MINIDUMP_TYPE DumpType,
+		PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+		PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
+		PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
+#endif
+
+	SymInitialize_t m_symInitialize;
+	SymCleanup_t m_symCleanup;
+	SymLoadModule_t m_symLoadModule;
+	SymUnloadModule_t m_symUnloadModule;
+	SymGetModuleBase_t m_symGetModuleBase;
+	SymGetSymFromAddr_t m_symGetSymFromAddr;
+	SymGetLineFromAddr_t m_symGetLineFromAddr;
+	SymSetOptions_t m_symSetOptions;
+	SymFunctionTableAccess_t m_symFunctionTableAccess;
+	StackWalk_t m_stackWalk;
+#ifdef RTS_ENABLE_CRASHDUMP
+	MiniDumpWriteDump_t m_miniDumpWriteDump;
+#endif
+
+	typedef std::set<HANDLE, std::less<HANDLE>, stl::system_allocator<HANDLE> > Processes;
+
+	Processes m_initializedProcesses;
+	HMODULE m_dllModule;
+	int m_referenceCount;
+	bool m_failed;
+	bool m_loadedFromSystem;
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader_minidump.h b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader_minidump.h
new file mode 100644
index 00000000000..272fa832f52
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader_minidump.h
@@ -0,0 +1,265 @@
+#pragma once
+
+#ifdef RTS_ENABLE_CRASHDUMP
+
+// Backported defines from minidumpapiset.h for VC6.
+// minidumpapiset.h is Copyright (C) Microsoft Corporation. All rights reserved.
+
+#if defined(_MSC_VER) && _MSC_VER < 1300
+#include <pshpack4.h>
+
+typedef enum _MINIDUMP_CALLBACK_TYPE {
+	ModuleCallback,
+	ThreadCallback,
+	ThreadExCallback,
+	IncludeThreadCallback,
+	IncludeModuleCallback,
+	MemoryCallback,
+	CancelCallback,
+	WriteKernelMinidumpCallback,
+	KernelMinidumpStatusCallback,
+	RemoveMemoryCallback,
+	IncludeVmRegionCallback,
+	IoStartCallback,
+	IoWriteAllCallback,
+	IoFinishCallback,
+	ReadMemoryFailureCallback,
+	SecondaryFlagsCallback,
+	IsProcessSnapshotCallback,
+	VmStartCallback,
+	VmQueryCallback,
+	VmPreReadCallback,
+	VmPostReadCallback
+} MINIDUMP_CALLBACK_TYPE;
+
+typedef struct _MINIDUMP_THREAD_CALLBACK {
+	ULONG ThreadId;
+	HANDLE ThreadHandle;
+#if defined(_ARM64_)
+	ULONG Pad;
+#endif
+	CONTEXT Context;
+	ULONG SizeOfContext;
+	ULONG64 StackBase;
+	ULONG64 StackEnd;
+} MINIDUMP_THREAD_CALLBACK, * PMINIDUMP_THREAD_CALLBACK;
+
+typedef struct _MINIDUMP_THREAD_EX_CALLBACK {
+	ULONG ThreadId;
+	HANDLE ThreadHandle;
+#if defined(_ARM64_)
+	ULONG Pad;
+#endif
+	CONTEXT Context;
+	ULONG SizeOfContext;
+	ULONG64 StackBase;
+	ULONG64 StackEnd;
+	ULONG64 BackingStoreBase;
+	ULONG64 BackingStoreEnd;
+} MINIDUMP_THREAD_EX_CALLBACK, * PMINIDUMP_THREAD_EX_CALLBACK;
+
+typedef struct _MINIDUMP_MODULE_CALLBACK {
+	PWCHAR FullPath;
+	ULONG64 BaseOfImage;
+	ULONG SizeOfImage;
+	ULONG CheckSum;
+	ULONG TimeDateStamp;
+	VS_FIXEDFILEINFO VersionInfo;
+	PVOID CvRecord;
+	ULONG SizeOfCvRecord;
+	PVOID MiscRecord;
+	ULONG SizeOfMiscRecord;
+} MINIDUMP_MODULE_CALLBACK, * PMINIDUMP_MODULE_CALLBACK;
+
+typedef struct _MINIDUMP_INCLUDE_THREAD_CALLBACK {
+	ULONG ThreadId;
+} MINIDUMP_INCLUDE_THREAD_CALLBACK, * PMINIDUMP_INCLUDE_THREAD_CALLBACK;
+
+typedef enum _THREAD_WRITE_FLAGS {
+	ThreadWriteThread = 0x0001,
+	ThreadWriteStack = 0x0002,
+	ThreadWriteContext = 0x0004,
+	ThreadWriteBackingStore = 0x0008,
+	ThreadWriteInstructionWindow = 0x0010,
+	ThreadWriteThreadData = 0x0020,
+	ThreadWriteThreadInfo = 0x0040,
+} THREAD_WRITE_FLAGS;
+
+typedef struct _MINIDUMP_INCLUDE_MODULE_CALLBACK {
+	ULONG64 BaseOfImage;
+} MINIDUMP_INCLUDE_MODULE_CALLBACK, * PMINIDUMP_INCLUDE_MODULE_CALLBACK;
+
+typedef struct _MINIDUMP_IO_CALLBACK {
+	HANDLE Handle;
+	ULONG64 Offset;
+	PVOID Buffer;
+	ULONG BufferBytes;
+} MINIDUMP_IO_CALLBACK, * PMINIDUMP_IO_CALLBACK;
+
+typedef struct _MINIDUMP_READ_MEMORY_FAILURE_CALLBACK
+{
+	ULONG64 Offset;
+	ULONG Bytes;
+	HRESULT FailureStatus;
+} MINIDUMP_READ_MEMORY_FAILURE_CALLBACK,
+* PMINIDUMP_READ_MEMORY_FAILURE_CALLBACK;
+
+typedef struct _MINIDUMP_VM_QUERY_CALLBACK
+{
+	ULONG64 Offset;
+} MINIDUMP_VM_QUERY_CALLBACK, * PMINIDUMP_VM_QUERY_CALLBACK;
+
+typedef struct _MINIDUMP_VM_PRE_READ_CALLBACK
+{
+	ULONG64 Offset;
+	PVOID Buffer;
+	ULONG Size;
+} MINIDUMP_VM_PRE_READ_CALLBACK, * PMINIDUMP_VM_PRE_READ_CALLBACK;
+
+typedef struct _MINIDUMP_VM_POST_READ_CALLBACK
+{
+	ULONG64 Offset;
+	PVOID Buffer;
+	ULONG Size;
+	ULONG Completed;
+	HRESULT Status;
+} MINIDUMP_VM_POST_READ_CALLBACK, * PMINIDUMP_VM_POST_READ_CALLBACK;
+
+typedef struct _MINIDUMP_MEMORY_INFO {
+	ULONG64 BaseAddress;
+	ULONG64 AllocationBase;
+	ULONG32 AllocationProtect;
+	ULONG32 __alignment1;
+	ULONG64 RegionSize;
+	ULONG32 State;
+	ULONG32 Protect;
+	ULONG32 Type;
+	ULONG32 __alignment2;
+} MINIDUMP_MEMORY_INFO, * PMINIDUMP_MEMORY_INFO;
+
+typedef struct _MINIDUMP_CALLBACK_INPUT {
+	ULONG ProcessId;
+	HANDLE ProcessHandle;
+	ULONG CallbackType;
+	union {
+		HRESULT Status;
+		MINIDUMP_THREAD_CALLBACK Thread;
+		MINIDUMP_THREAD_EX_CALLBACK ThreadEx;
+		MINIDUMP_MODULE_CALLBACK Module;
+		MINIDUMP_INCLUDE_THREAD_CALLBACK IncludeThread;
+		MINIDUMP_INCLUDE_MODULE_CALLBACK IncludeModule;
+		MINIDUMP_IO_CALLBACK Io;
+		MINIDUMP_READ_MEMORY_FAILURE_CALLBACK ReadMemoryFailure;
+		ULONG SecondaryFlags;
+		MINIDUMP_VM_QUERY_CALLBACK VmQuery;
+		MINIDUMP_VM_PRE_READ_CALLBACK VmPreRead;
+		MINIDUMP_VM_POST_READ_CALLBACK VmPostRead;
+	};
+} MINIDUMP_CALLBACK_INPUT, * PMINIDUMP_CALLBACK_INPUT;
+
+typedef struct _MINIDUMP_CALLBACK_OUTPUT {
+	union {
+		ULONG ModuleWriteFlags;
+		ULONG ThreadWriteFlags;
+		ULONG SecondaryFlags;
+		struct {
+			ULONG64 MemoryBase;
+			ULONG MemorySize;
+		};
+		struct {
+			BOOL CheckCancel;
+			BOOL Cancel;
+		};
+		HANDLE Handle;
+		struct {
+			MINIDUMP_MEMORY_INFO VmRegion;
+			BOOL Continue;
+		};
+		struct {
+			HRESULT VmQueryStatus;
+			MINIDUMP_MEMORY_INFO VmQueryResult;
+		};
+		struct {
+			HRESULT VmReadStatus;
+			ULONG VmReadBytesCompleted;
+		};
+		HRESULT Status;
+	};
+} MINIDUMP_CALLBACK_OUTPUT, * PMINIDUMP_CALLBACK_OUTPUT;
+
+typedef struct _MINIDUMP_EXCEPTION_INFORMATION {
+	DWORD ThreadId;
+	PEXCEPTION_POINTERS ExceptionPointers;
+	BOOL ClientPointers;
+} MINIDUMP_EXCEPTION_INFORMATION, * PMINIDUMP_EXCEPTION_INFORMATION;
+
+typedef struct _MINIDUMP_USER_STREAM {
+	ULONG32 Type;
+	ULONG BufferSize;
+	PVOID Buffer;
+
+} MINIDUMP_USER_STREAM, * PMINIDUMP_USER_STREAM;
+
+typedef struct _MINIDUMP_USER_STREAM_INFORMATION {
+	ULONG UserStreamCount;
+	PMINIDUMP_USER_STREAM UserStreamArray;
+} MINIDUMP_USER_STREAM_INFORMATION, * PMINIDUMP_USER_STREAM_INFORMATION;
+
+typedef
+BOOL
+(WINAPI* MINIDUMP_CALLBACK_ROUTINE) (
+	PVOID CallbackParam,
+	PMINIDUMP_CALLBACK_INPUT CallbackInput,
+	PMINIDUMP_CALLBACK_OUTPUT CallbackOutput
+	);
+
+typedef struct _MINIDUMP_CALLBACK_INFORMATION {
+	MINIDUMP_CALLBACK_ROUTINE CallbackRoutine;
+	PVOID CallbackParam;
+} MINIDUMP_CALLBACK_INFORMATION, * PMINIDUMP_CALLBACK_INFORMATION;
+
+typedef enum _MINIDUMP_TYPE {
+	MiniDumpNormal = 0x00000000,
+	MiniDumpWithDataSegs = 0x00000001,
+	MiniDumpWithFullMemory = 0x00000002,
+	MiniDumpWithHandleData = 0x00000004,
+	MiniDumpFilterMemory = 0x00000008,
+	MiniDumpScanMemory = 0x00000010,
+	MiniDumpWithUnloadedModules = 0x00000020,
+	MiniDumpWithIndirectlyReferencedMemory = 0x00000040,
+	MiniDumpFilterModulePaths = 0x00000080,
+	MiniDumpWithProcessThreadData = 0x00000100,
+	MiniDumpWithPrivateReadWriteMemory = 0x00000200,
+	MiniDumpWithoutOptionalData = 0x00000400,
+	MiniDumpWithFullMemoryInfo = 0x00000800,
+	MiniDumpWithThreadInfo = 0x00001000,
+	MiniDumpWithCodeSegs = 0x00002000,
+	MiniDumpWithoutAuxiliaryState = 0x00004000,
+	MiniDumpWithFullAuxiliaryState = 0x00008000,
+	MiniDumpWithPrivateWriteCopyMemory = 0x00010000,
+	MiniDumpIgnoreInaccessibleMemory = 0x00020000,
+	MiniDumpWithTokenInformation = 0x00040000,
+	MiniDumpWithModuleHeaders = 0x00080000,
+	MiniDumpFilterTriage = 0x00100000,
+	MiniDumpWithAvxXStateContext = 0x00200000,
+	MiniDumpWithIptTrace = 0x00400000,
+	MiniDumpScanInaccessiblePartialPages = 0x00800000,
+	MiniDumpFilterWriteCombinedMemory = 0x01000000,
+	MiniDumpValidTypeFlags = 0x01ffffff,
+	MiniDumpNoIgnoreInaccessibleMemory = 0x02000000,
+	MiniDumpValidTypeFlagsEx = 0x03ffffff,
+} MINIDUMP_TYPE;
+
+typedef enum _MODULE_WRITE_FLAGS {
+	ModuleWriteModule = 0x0001,
+	ModuleWriteDataSeg = 0x0002,
+	ModuleWriteMiscRecord = 0x0004,
+	ModuleWriteCvRecord = 0x0008,
+	ModuleReferencedByMemory = 0x0010,
+	ModuleWriteTlsData = 0x0020,
+	ModuleWriteCodeSegs = 0x0040,
+} MODULE_WRITE_FLAGS;
+
+#include <poppack.h>
+#endif
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/Except.cpp b/Core/Libraries/Source/WWVegas/WWLib/Except.cpp
index be4e7ca3bb8..e49d6ffb0eb 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/Except.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/Except.cpp
@@ -55,7 +55,7 @@
 #include "cpudetect.h"
 #include	"Except.h"
 //#include "debug.h"
-#include "MPU.H"
+#include "MPU.h"
 //#include "commando\nat.h"
 #include "thread.h"
 #include "wwdebug.h"
@@ -64,7 +64,6 @@
 #include	<conio.h>
 #include	<imagehlp.h>
 #include <crtdbg.h>
-#include	<stdio.h>
 
 #ifdef WWDEBUG
 #define DebugString 	WWDebug_Printf
@@ -138,7 +137,7 @@ static StackWalkType								_StackWalk = NULL;
 static SymFunctionTableAccessType	_SymFunctionTableAccess = NULL;
 static SymGetModuleBaseType				_SymGetModuleBase = NULL;
 
-static char const *ImagehelpFunctionNames[] =
+static char const *const ImagehelpFunctionNames[] =
 {
 	"SymCleanup",
 	"SymGetSymFromAddr",
@@ -176,7 +175,7 @@ int __cdecl _purecall(void)
 	/*
 	** Use int3 to cause an exception.
 	*/
-	WWDEBUG_SAY(("Pure Virtual Function call. Oh No!\n"));
+	WWDEBUG_SAY(("Pure Virtual Function call. Oh No!"));
 	WWDEBUG_BREAK
 #endif	//_DEBUG_ASSERT
 
@@ -224,7 +223,7 @@ char const * Last_Error_Text(void)
  *=============================================================================================*/
 static void Add_Txt (char const *txt)
 {
-	if (strlen(ExceptionText) + strlen(txt) < 65535) {
+	if (strlen(ExceptionText) + strlen(txt) < ARRAY_SIZE(ExceptionText) - 1) {
 		strcat(ExceptionText, txt);
 	}
 #if (0)
@@ -653,15 +652,15 @@ void Dump_Exception_Info(EXCEPTION_POINTERS *e_info)
 
 	for (int c = 0 ; c < 32 ; c++) {
 		if (IsBadReadPtr(eip_ptr, 1)) {
-			strcat(scrap, "?? ");
+			strlcat(scrap, "?? ", ARRAY_SIZE(scrap));
 		} else {
 			sprintf(bytestr, "%02X ", *eip_ptr);
-			strcat(scrap, bytestr);
+			strlcat(scrap, bytestr, ARRAY_SIZE(scrap));
 		}
 		eip_ptr++;
 	}
 
-	strcat(scrap, "\r\n\r\n");
+	strlcat(scrap, "\r\n\r\n", ARRAY_SIZE(scrap));
 	Add_Txt(scrap);
 
 	/*
@@ -677,14 +676,14 @@ void Dump_Exception_Info(EXCEPTION_POINTERS *e_info)
 			** The stack contents cannot be read so just print up question marks.
 			*/
 			sprintf(scrap, "%p: ", static_cast<void*>(stackptr));
-			strcat(scrap, "????????\r\n");
+			strlcat(scrap, "????????\r\n", ARRAY_SIZE(scrap));
 		} else {
 			/*
 			** If this stack address is in our memory space then try to match it with a code symbol.
 			*/
 			if (IsBadCodePtr((FARPROC)*stackptr)) {
 				sprintf(scrap, "%p: %08lX ", static_cast<void*>(stackptr), *stackptr);
-				strcat(scrap, "DATA_PTR\r\n");
+				strlcat(scrap, "DATA_PTR\r\n", ARRAY_SIZE(scrap));
 			} else {
 				sprintf(scrap, "%p: %08lX", static_cast<void*>(stackptr), *stackptr);
 
@@ -697,12 +696,12 @@ void Dump_Exception_Info(EXCEPTION_POINTERS *e_info)
 					if (_SymGetSymFromAddr != NULL && _SymGetSymFromAddr (GetCurrentProcess(), *stackptr, &displacement, symptr)) {
 						char symbuf[256];
 						sprintf(symbuf, " - %s + %08X", symptr->Name, displacement);
-						strcat(scrap, symbuf);
+						strlcat(scrap, symbuf, ARRAY_SIZE(scrap));
 					}
 				} else {
-					strcat (scrap, " *");
+					strlcat(scrap, " *", ARRAY_SIZE(scrap));
 				}
-				strcat (scrap, "\r\n");
+				strlcat(scrap, "\r\n", ARRAY_SIZE(scrap));
 			}
 		}
 		Add_Txt(scrap);
@@ -904,7 +903,7 @@ void Register_Thread_ID(unsigned long thread_id, char *thread_name, bool main_th
 
 		ThreadInfoType *thread = new ThreadInfoType;
 		thread->ThreadID = thread_id;
-		strcpy(thread->ThreadName, thread_name);
+		strlcpy(thread->ThreadName, thread_name, ARRAY_SIZE(thread->ThreadName));
 		thread->Main = main_thread;
 		thread->ThreadHandle = INVALID_HANDLE_VALUE;
 		ThreadList.Add(thread);
diff --git a/Core/Libraries/Source/WWVegas/WWLib/Except.h b/Core/Libraries/Source/WWVegas/WWLib/Except.h
index bef410f65b2..e67a4b1f64e 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/Except.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/Except.h
@@ -36,9 +36,6 @@
 
 #pragma once
 
-#ifndef EXCEPT_H
-#define EXCEPT_H
-
 #ifdef _MSC_VER
 
 #include "win.h"
@@ -84,5 +81,3 @@ typedef struct tThreadInfoType {
 
 
 #endif	//_MSC_VER
-
-#endif	//EXCEPT_H
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/FastAllocator.h b/Core/Libraries/Source/WWVegas/WWLib/FastAllocator.h
index e8e8a8cbeec..bf45cf9bc51 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/FastAllocator.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/FastAllocator.h
@@ -19,7 +19,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // FastAllocator.h
 //
-// Implements simple and fast memory allocators. Includes sample code for 
+// Implements simple and fast memory allocators. Includes sample code for
 // STL and overriding of specific or global new/delete.
 //
 // Allocators are very fast and prevent memory fragmentation. They use up
@@ -27,13 +27,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-
-#ifndef FASTALLOCATOR_H
-#define FASTALLOCATOR_H
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
 //#define MEMORY_OVERWRITE_TEST
 
@@ -47,7 +41,6 @@
 #include "mutex.h"
 #include <malloc.h>
 #include <stddef.h> //size_t & ptrdiff_t definition
-#include <string.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 // Forward Declarations
@@ -69,8 +62,8 @@ class FastAllocatorGeneral;  //Allocates and deletes items of any size. Can use
 //    objects (especially smaller objects). If you have a class whose size is
 //    40K, you aren't going to be able to put even one of them on the stack.
 //    If you don't need an array but instead just need a single object, then you
-//    can simply create your object on the stack and be done with it. However, 
-//    there are some times when you need a temporary array of objects (or just 
+//    can simply create your object on the stack and be done with it. However,
+//    there are some times when you need a temporary array of objects (or just
 //    an array of chars or pointers) but don't know the size beforehand. That's
 //    where this class is useful.
 //
@@ -79,10 +72,10 @@ class FastAllocatorGeneral;  //Allocates and deletes items of any size. Can use
 //      T           -- The type of object being allocated. Examples include char,
 //                     cRZString, int*, cRZRect*.
 //      nStackCount -- How many items to allocate on the stack before switching
-//                     to a heap allocation. Note that if you want to write 
+//                     to a heap allocation. Note that if you want to write
 //                     portable code, you need to use no more than about 2K
 //                     of stack space. So make sure nStackCount*sizeof(T) < 2048.
-//      bConstruct  -- This is normally 1, but setting it to 0 is a hint to the 
+//      bConstruct  -- This is normally 1, but setting it to 0 is a hint to the
 //                     compiler that you are constructing a type that has no
 //                     constructor. Testing showed that the VC++ compiler wasn't
 //                     completely able to optimize on its own. In particular, it
@@ -90,14 +83,14 @@ class FastAllocatorGeneral;  //Allocates and deletes items of any size. Can use
 //                     enough to remore the pTArrayEnd assignment.
 //
 // Benchmarks:
-//    Testing one one machine showed that allocating and freeing a block of 
+//    Testing one one machine showed that allocating and freeing a block of
 //    2048 bytes via malloc/free took 8700 and 8400 clock ticks respectively.
 //    Using this stack allocator to do the same thing tooko 450 and 375 clock
-//    ticks respectively. 
+//    ticks respectively.
 //
 // Usage and examples:
-//    Since we are using a local allocator and not overloading global or class 
-//    operator new, you have to directory call StackAllocator::New instead  
+//    Since we are using a local allocator and not overloading global or class
+//    operator new, you have to directory call StackAllocator::New instead
 //    of operator new. So instead of saying:
 //       SomeStruct* pStructArray = new SomeStruct[13];
 //    you say:
@@ -163,14 +156,20 @@ class StackAllocator{
                T* pTArray = (T*)mTArray;
                const T* const pTArrayEnd = pTArray + nCount;
                while(pTArray < pTArrayEnd){
-                  new(pTArray)T; //Use the placement operator new. This simply calls the constructor 
-                  ++pTArray;     //of T with 'this' set to the input address. Note that we don't put
-               }                 //a '()' after the T this is because () causes trivial types like int
-            }                    //and class* to be assigned zero/NULL. We don't want that.
+                  //Use the placement operator new. This simply calls the constructor
+                  //of T with 'this' set to the input address. Note that we don't put
+                  //a '()' after the T this is because () causes trivial types like int
+                  //and class* to be assigned zero/NULL. We don't want that.
+                  new(pTArray)T;
+                  ++pTArray;
+               }
+            }
             return (T*)mTArray;
-         } //Else the request is too big. So let's use (the slower) operator new.
+         }
+         //Else the request is too big. So let's use (the slower) operator new.
          return (mpTHeap = new T[nCount]); //The compiler will call the constructors here.
-      } //Else we are being used. Let's be nice and allocate something anyway.
+      }
+      //Else we are being used. Let's be nice and allocate something anyway.
       return new T[nCount];
    }
 
@@ -331,7 +330,7 @@ WWINLINE void FastFixedAllocator::grow()
    n->next  = chunks;
    chunks   = n;
 	TotalHeapSize+=sizeof(Chunk);
-   
+
    const int nelem = Chunk::size/esize;
    char* start = n->mem;
    char* last = &start[(nelem-1)*esize];
@@ -427,10 +426,10 @@ WWINLINE void* FastAllocatorGeneral::Alloc(unsigned int n)
 	static int re_entrancy=0;
 	re_entrancy++;
 
-   //We actually allocate n+4 bytes. We store the # allocated 
+   //We actually allocate n+4 bytes. We store the # allocated
    //in the first 4 bytes, and return the ptr to the rest back
    //to the user.
-   n += sizeof(unsigned int); 
+   n += sizeof(unsigned int);
 #ifdef MEMORY_OVERWRITE_TEST
 	n+=sizeof(unsigned int);
 #endif
@@ -529,7 +528,7 @@ WWINLINE void* FastAllocatorGeneral::Realloc(void* pAlloc, unsigned int n){
 // system whereby it maintains buckets for integral sizes.
 //
 
-#ifdef _MSC_VER 
+#ifdef _MSC_VER
    //VC++ continues to be the one compiler that lacks the ability to compile
    //standard C++. So we define a version of the STL allocator specifically
    //for VC++, and let other compilers use a standard allocator template.
@@ -543,7 +542,7 @@ WWINLINE void* FastAllocatorGeneral::Realloc(void* pAlloc, unsigned int n){
       typedef const T&  const_reference;
       typedef T         value_type;
 
-      T*            address(T& t)       const             { return (&t); } //These two are slightly strange but 
+      T*            address(T& t)       const             { return (&t); } //These two are slightly strange but
       const  T*     address(const T& t) const             { return (&t); } //required functions. Just do it.
       static T*     allocate(size_t n, const void* =NULL) { return (T*)FastAllocatorGeneral::Get_Allocator()->Alloc(n*sizeof(T)); }
       static void   construct(T* ptr, const T& value)     { new(ptr) T(value); }
@@ -553,15 +552,15 @@ WWINLINE void* FastAllocatorGeneral::Realloc(void* pAlloc, unsigned int n){
 
       //This _Charalloc is required by VC++5 since it VC++5 predates
       //the language standardization. Allocator behaviour is one of the
-      //last things to have been hammered out. Important note: If you 
+      //last things to have been hammered out. Important note: If you
       //decide to write your own fast allocator, containers will allocate
-      //random objects through this function but delete them through 
+      //random objects through this function but delete them through
       //the above delallocate() function. So your version of deallocate
       //should *not* assume that it will only be given T objects to delete.
       char* _Charalloc(size_t n){ return (char*)FastAllocatorGeneral::Get_Allocator()->Alloc(n*sizeof(char)); }
    };
 #else
-   //This is a C++ language standard allocator. Most C++ compilers after 1999 
+   //This is a C++ language standard allocator. Most C++ compilers after 1999
    //other than Microsoft C++ compile this fine. Otherwise. you might be able
    //to use the same allocator as VC++ uses above.
    template <class T>
@@ -654,7 +653,7 @@ typedef basic_string<char, char_traits<char>, FastSTLAllocator<char> > CharStrin
 ///////////////////////////////////////////////////////////////////////////////
 
 
-void main(){   
+void main(){
    IntArray intArray;
    intArray.push_back(3);
    intArray.pop_back();
@@ -666,7 +665,7 @@ void main(){
    IntDequeue intDequeue;
    intDequeue.push_back(3);
    intDequeue.pop_back();
-   
+
    IntQueue intQueue;
    intQueue.push(3);
    intQueue.pop();
@@ -720,16 +719,3 @@ void main(){
    getchar();
 }
 */
-
-
-
-#endif //sentry
-
-
-
-
-
-
-
-
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H b/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H
deleted file mode 100644
index 7e372599d69..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H
+++ /dev/null
@@ -1,652 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* $Header: /Commando/Code/wwlib/hashlist.h 13    4/30/01 3:05p Joe_b $ */
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : G                                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/hashlist.h                             $* 
- *                                                                                             * 
- *                      Creator::Scott K. Bowen - 5/4/99                                      *
- *                                                                                             * 
- *                      $Author:: Joe_b                                                       $* 
- *                                                                                             * 
- *                     $Modtime:: 4/30/01 2:41p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 13                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   HashListClass::Find -- Find record in hash table.                                         * 
- *   HashListClass::Remove -- Remove record from hash table.                                   * 
- *   HashListClass::Add -- Add record to hash list.                                            * 
- *   HashListClass::Add -- Add record to list, list creates node for user.                     * 
- *   HashListClass::Move_To -- Move nodes from one list to another.                           * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef HASHLIST_H
-#define HASHLIST_H  
-
-#pragma warning (push)
-#pragma warning (disable: 4786)
-																  
-#include "LISTNODE.H"
-#include <memory.h>
-
-#ifndef NULL
-#define NULL (0L)
-#endif											
-
-#define A_LARGE_PRIME_NUMBER	257	 
-
-// HashListClass<> and HashNodeClass<>:  
-// 	The purpose of these templates is to allow a user to insert records into 
-// a hash table that also contains a double linked list that includes every
-// record in the hash table.  The functionality of the hash list mirrors 
-// very closely that of the DataNode<> and List<> templates.  The differences
-// between them are:
-// 	-User calls Add(?) to add to list instead of Add_Head() or others.
-// 	-A key must be set to hash off of.
-//
-// Additional features of the HashList<> over List<> are:
-//		-Quick searching as long as key's are well hashed..
-//		-Node can inherit user class so additional data can be put in node.
-//		 For example a timestamp to be set by user. Default is 
-//		 HashDefaluatUserClass that has no data.
-//		-If class T is actually a class (not a pointer), user may get a ptr
-//		 to class with Get_Ptr() instead of Get() that returns an INSTANCE
-//		 of the class.
-//		-Flags to tell user if record was just created or record was just put
-//		 into a list (user must clear flags if desired.) 
-//		-HashListClass<> can create and destroy nodes so that the nodes do not
-//		 need to be put as members in classes.  This allows an object to be
-//		 put into an infinite (subject to memory constraints) lists.
-//		-User may specify number of hash node slots (default is A_LARGE_PRIME_NUMBER).
-
-// You can typedef these templates with the the following:
-// 	typedef HashListClass<TestHashClass *> HashTableClass;
-// 	typedef HashNodeClass<TestHashClass *> HashTableNodeClass;
-// or if using a UserClass
-// 	typedef HashListClass<TestHashClass *, 4, UserClass> HashTableClass;
-// 	typedef HashNodeClass<TestHashClass *, UserClass> HashTableNodeClass;
-
-
-template<class T, class U> class HashNodeClass;
-template<class T, class U> class HashNodeFriendClass;
-template<class T, class U, int NumHashValues> class HashListClass;
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////
-// This is a default class that is stored in HashNodeClass.  It's purpose is 
-// to allow the user to override it with his/her own class so that additional 
-// data may be stored in the node about the object.  
-// Since the object might be in various lists, this data is specific to 
-// the list that it in.  
-class HashDefaultUserClass  {};
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////
-						  
-template<class T, class U = class HashDefaultUserClass>
-class HashNodeClass : public DataNode<HashNodeClass<T,U> *>, public U
-{ 
-	public:
-		// Creation when key and record are known.
-		HashNodeClass(T record, unsigned key) : 
-			Flags(0), 
-			Record(record), 
-			Key(key) 
-		{
-			DataNode<HashNodeClass<T,U> *>::Set(this);
-			Flag.NewRecord = true;
-			Flag.KeySet = true;
-		}					
-		
-		// Creation when key and record are to be set later.
-		// node may not be put into list until the key is set.
-		HashNodeClass() :
-			Flags(0), 
-			Key(-1) 		   
-		{
-			DataNode<HashNodeClass<T,U> *>::Set(this);
-			Flag.NewRecord = true;
-		}
-
-		virtual ~HashNodeClass() {
-			// Assert is raised when user tries to delete HashNodeClass still in a list
-			// NOTE: This might be raised because user expected node to clean
-			// 		itself up when deleted.  Currently, this feature is not available
-			//			because it would require an additional pointer  to the HashListClass
-			//			that the node is a member of.  
-			assert(!Flag.InList);
-		}
-						
-		// Get next and prev record given a node.  
-		// A node may be retrieved from: HashListClass::Find();
-		HashNodeClass<T,U> *Next()  {
-			return((HashNodeClass<T,U> *) DataNode<HashNodeClass<T,U> *>::Next());
-		}
-		HashNodeClass<T,U> *Prev()  {
-			return((HashNodeClass<T,U> *) DataNode<HashNodeClass<T,U> *>::Prev());
-		}	
-		
-		// User may use these if he desires not to have to check for valid.
-		HashNodeClass<T,U> *Next_Valid()  {
-			HashNodeClass<T,U> *next = Next();
-			if (next && next->Is_Valid()) {
-				return(next);
-			}				
-			return(NULL);
-		}
-		HashNodeClass<T,U> *Prev_Valid()  {
-			HashNodeClass<T,U> *prev = Prev();
-			if (prev && prev->Is_Valid()) {
-				return(prev);
-			}				  
-			return(NULL);
-		}
-										 
-		// Get record that is in hash table.
-		T Get_Record() {return(Record);}																			 
-		T Get_Record_Ptr() {return(&Record);}																			 
-
-		// Overload DataNode::Get() to get the record we are pointing to so 
-		// that it behaves how people expect List to operate.  
-		// To Get HashNodeClass - it is this.
-		T Get() {return(Record);}			
-						 
-		// Get a pointer to Record to avoid a copy construction of Record if 
-		// it is an instance of a class that does not want to be copied all 
-		// over the place.
-		T *Get_Ptr() {return(&Record);}			
-
-		// To mirror usage of DataNode().					
-		void Set(T record) {Record = record;}
-		
-		void Set_Key(unsigned key) {
-			// Can't change key once in a list, we would never find it.
-			assert(!Flag.InList);
-			Flag.KeySet = true;
-			Key = key;
-		}
-		
-		// Get key of record for has table.
-		unsigned Get_Key() {
-			assert(Flag.KeySet);
-			return (Key);
-		}
-														
-		// Enable user to know if a record has just been added to the list.
-		// It stays set until user clears it - not required.
-		int Is_New_Record()		{return(Flag.NewRecord);}		 
-		void Clear_New_Record() {Flag.NewRecord = false;}
-
-		// Each time object gets put into a list NewInList is set.
-		// Stays set until user clears - not required.
-		int Is_New_In_List()		{return(Flag.NewInList);}		 
-		void Clear_New_In_List() {Flag.NewInList = false;}
-		
-		bool Is_In_List()  		{return(Flag.InList);}
-		bool Is_Key_Set()  		{return(Flag.KeySet);}
-
-
-	protected:
-		// Record that we are keeping in hash table.  
-		// This is commonly a pointer to the actual record.
-		T							Record;
-					  
-		// Key that user gives to identify record.
-		// WARNING: Duplicate keys are undefined behavior.
-		unsigned						Key;
-			
-		// Unioned flags so Flags can be initialized to 0.
-		union {
-			struct {								 
-				// When record collides in hash list, these ?InTable 
-				// tell when to stop looking for object in hash entry.
-				unsigned					FirstInTable:1;
-				unsigned					LastInTable:1;
-				
-				// This is set when record is first created.  It is up to user
-				// to clear if he uses flag.
-				unsigned					NewRecord:1;
-				
-				// This is set when record is first put in list.  It is up to user
-				// to clear if he uses flag.
-				unsigned					NewInList:1;
-						  
-				// Certain functions may not happen if node is InList (in hash table)
-				// These include delete, Set_Key(), and possibly others.
-				unsigned					InList:1;
-																 
-				// This is set so HashListClass knows if it should delete the 
-				// node when removed from it's list.
-				unsigned					ListCreated:1;
-														
-				// Make sure someone does not insert a node into a list 
-				// without setting it's key.
-				unsigned					KeySet:1;
-			} Flag;
-			unsigned Flags;
-		};			
-
-	private:										 
-		// Not something the casual user can call.
-		void Unlink(void) {
-			DataNode<HashNodeClass<T,U> *>::Unlink();
-		}
-				 
-		friend class HashNodeFriendClass<T,U>;
-};
-	 
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////
-// This class is created so that HashListClass can access HashNodeClass.
-// HashListClass cannot access directly because it is impossible 
-// (I could not figure out how) to tell HashNodeClass to be a friend 
-// to all creations of HashListClass<T,N> since HashNodeClass
-// does not need the NumHashValues parameter.
-#pragma warning(push)
-#pragma warning(disable : 4786) // identifier was truncated to 255 chars in debug information.
- 
-template<class T, class U>
-class HashNodeFriendClass
-{		  
-	protected:
-		void Set_In_List(HashNodeClass<T,U> *ptr)  	{ptr->Flag.InList = true; ptr->Flag.NewInList = true;}
-		void Clear_In_List(HashNodeClass<T,U> *ptr)  {ptr->Flag.InList = false; ptr->Flag.NewInList = false;}
-		
-		bool Is_First(HashNodeClass<T,U> *ptr)		{return(ptr->Flag.FirstInTable);}
-		bool Is_Last(HashNodeClass<T,U> *ptr)		{return(ptr->Flag.LastInTable); }
-
-		void Set_First(HashNodeClass<T,U> *ptr)	{ptr->Flag.FirstInTable = true; }
-		void Set_Last(HashNodeClass<T,U> *ptr)		{ptr->Flag.LastInTable = true;  }
-
-		void Clear_First(HashNodeClass<T,U> *ptr)	{ptr->Flag.FirstInTable = false;}
-		void Clear_Last(HashNodeClass<T,U> *ptr)	{ptr->Flag.LastInTable = false; }
-		
-		void Set_List_Created(HashNodeClass<T,U> *ptr)	{ptr->Flag.ListCreated = true; }
-		void Clear_List_Created(HashNodeClass<T,U> *ptr)	{ptr->Flag.ListCreated = false; }
-		bool Is_List_Created(HashNodeClass<T,U> *ptr)	{return(ptr->Flag.ListCreated);}
-		
-		void Unlink(HashNodeClass<T,U> *ptr)  {ptr->Unlink();}
-};
-
-#pragma warning(pop)
-
-// The sole purpose of using NumHashValues as a template is to make it easier to
-// view in a debugger.  If it were an allocated array of pointers, the debugger does
-// not easily show each element in the array.
-template<class T, class U = class HashDefaultUserClass, int NumHashValues = A_LARGE_PRIME_NUMBER>
-class HashListClass : protected HashNodeFriendClass<T,U>
-{
-	public:
-		// Creation and destruction.
-		HashListClass() : 
-			List(),NumRecords(0), UsedValues(0)
-		{
-			memset(HashTable, 0, sizeof(HashTable));
-		}
-		~HashListClass() {Delete();}
-									 
-		// Get first node in list so user can itterate through it.
-		// CAUTION: Do not destroy pointer returned or itterated though - 
-		//				you must call the Remove function on it.	 
-		//				An assert() will come up if you try.
-		HashNodeClass<T,U> *First()  {
-			return((HashNodeClass<T,U> *)List.First());
-		}						  
-		HashNodeClass<T,U> *First_Valid()  {
-			return((HashNodeClass<T,U> *)List.First_Valid());
-		}
-		HashNodeClass<T,U> *Last()  {
-			return((HashNodeClass<T,U> *)List.Last());
-		}						  
-		HashNodeClass<T,U> *Last_Valid()  {
-			return((HashNodeClass<T,U> *)List.Last_Valid());
-		}
-
-
-		// Add a record to hash creating new HashNodeClass.					  			
-		HashNodeClass<T,U> *Add(T record, unsigned key);								
-		
-		// Add an existing node not in a list to this list.
-		// This allows closer behavior to List class.
-		HashNodeClass<T,U> *Add(HashNodeClass<T,U> *node);
-						 
-		// Search for record based off key in hash table.
-		HashNodeClass<T,U> *Find(unsigned key);
-		
-		// Use this remove if you know the node * already. It is quicker.
-		void Remove(HashNodeClass<T,U> *node);
-		
-		// Use this remove if you need to do a find to get the node.
-		// OK if key does not exist in table.
-		bool Remove(unsigned key);
-		
-		// Removes all nodes in list.
-		void Delete(void) {while (First()->Is_Valid()) Remove(First());}
-														  
-		// Move contents of one list to another (this becomes empty).
-		void Move_To(HashListClass<T,U> *newlist);
-																			 
-		// So we always do it the same way.
-		unsigned Hash_Value(unsigned key)  {
-			return(unsigned)(key % NumHashValues);
-		}
-								  
-		// Total number of records in hash table.
-		int Num_Records()  {
-			return(NumRecords);
-		}						  							  
-		// how many hash values are used.  
-		// The closer this number is to NumRecords, the
-		// better hashing going on.
-		int Num_Used_Values()  {
-			return(UsedValues);
-		}
-									
-	protected:
-		// This list can be walked from start to end of all objects in the list.
-		// User can use Get_First() to get first (valid) record in linked list.
-		List<DataNode<T> *>		List;
-
-		// Points to first record in List that has the right 'value'. 
-		// Must check LaastInTable to see if end of records in has list.
-		HashNodeClass<T,U>		*HashTable[NumHashValues];
-														  
-		// Number of records we have in class.
-		int							NumRecords;
-		int							UsedValues;
-																		  
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*********************************************************************************************** 
- * HashListClass::Add -- Add record to hash list.                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/26/1999 SKB : Created.                                                                 * 
- *=============================================================================================*/
-template <class T, class U, int NumHashValues>
-HashNodeClass<T,U> *HashListClass<T, U, NumHashValues>::Add(HashNodeClass<T,U> *node) 
-{									  
-	// Get our index into the hash table.
-	int hashidx = Hash_Value(node->Get_Key());
-	assert(hashidx < NumHashValues);
-
-	// Tell system we are being put in the list (and make sure we weren't already in one).
-	assert(!node->Is_In_List());
-	Set_In_List(node);
-													 
-	// Get first hit in table.
-	HashNodeClass<T,U> *first = HashTable[hashidx];
-	if (first) {	  
-		// This will add the new node right after the first node in the list.
-		first->Link(node);
-														 
-		// If we are the first one to collide, then we will be at end of list.
-		// otherwise, we are at the end.
-		if (Is_Last(first)) {
-			Clear_Last(first);
-			Set_Last(node);
-		} 
-	} else {	
-		// We are first hit at hash index.  Put ourselves at start of 
-		List.Add_Head(node);
-		Set_First(node);
-		Set_Last(node);
-		HashTable[hashidx] = node;			 
-		UsedValues++;
-	}			 
-	NumRecords++;
-	return (node);
-}		  
-
-	
-/*********************************************************************************************** 
- * HashListClass::Add -- Add record to list, list creates node for user.                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/03/1999 SKB : Created.                                                                 * 
- *=============================================================================================*/
-template <class T, class U, int NumHashValues>
-HashNodeClass<T,U> *HashListClass<T, U, NumHashValues>::Add(T record, unsigned key) 
-{	
-	// Create new node so we can add our record.
-	HashNodeClass<T,U> *node = W3DNEW HashNodeClass<T,U>(record, key);
-	Set_List_Created(node);
-	 	 		  
-	// Now let the other add do all the work.
-	Add(node);
-	return (node);
-}	
-
-/*********************************************************************************************** 
- * HashListClass::Find -- Find record in hash table.                                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/26/1999 SKB : Created.                                                                 * 
- *=============================================================================================*/
-template <class T, class U, int NumHashValues>
-HashNodeClass<T,U> *HashListClass<T, U, NumHashValues>::Find(unsigned key) 
-{
-	int hashidx = Hash_Value(key);
-	assert(hashidx < NumHashValues);
-	
-	HashNodeClass<T,U> *cur = HashTable[hashidx];
-	if (cur) for(;;) {  
-		// Have we found our match?
-		if (cur->Get_Key() == key) {
-			return(cur);
-		}
-						
-		// We have to find record before the end of the list.
-		if (Is_Last(cur))  {
-			break;
-		}
-									 
-		// Continue on because we appear to have some collisions.
-		cur = cur->Next();
-		
-		// The end of a list should always be marked with Is_Last().
-		assert(cur);
-		assert(cur->Is_Valid());
-	}				
-	return(NULL);
-	
-}	
-
-/*********************************************************************************************** 
- * HashListClass::Remove_Node -- Remove node from hash table.                                  * 
- *                               Protected function for usage by Remove() routines.            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *   HashNodeClass<T,U> *node - node to remove.                                                *
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1999 SKB : Created.                                                                 * 
- *   01/19/2000 SKB : Remove the node with Unlink.                                             * 
- *=============================================================================================*/
-template <class T, class U, int NumHashValues>
-void HashListClass<T, U, NumHashValues>::Remove(HashNodeClass<T,U> *node) 
-{		 
-	assert(node);					 
-	assert(node->Is_In_List());
-		
-	// See if entry is first in list for hash value.
-	if (Is_First(node)) {		  					
-								
-		int hashidx = Hash_Value(node->Get_Key());
-		assert(HashTable[hashidx]);
-
-		// SKB: 2/20/01 - clear incase inserted in new list later.
-		Clear_First(node);
-
-		// is it only one in hash index?
-		if (Is_Last(node)) {
-			// SKB: 2/20/01 - clear incase inserted in new list later.
-			Clear_Last(node);
-			HashTable[hashidx] = NULL;
-			UsedValues--;
-		} else {			
-			HashTable[hashidx] = node->Next_Valid();
-			Set_First(HashTable[hashidx]);
-		}
-
-	} else if (Is_Last(node)) {
-		// SKB: 2/20/01 - clear incase inserted in new list later.
-		Clear_Last(node);
-
-		// There is one before us because it failed above.
-		Set_Last(node->Prev());
-	}
-					
-			
-	// All done with you.  Set flag to avoid assert.
-	Clear_In_List(node);
-		
-	// Delete node if it was created by the this class instead of by the user.
-	if (Is_List_Created(node)) {
-		delete node;					  
-	} else {
-		// Remove it from the link list at least so it can be put in another.
-		Unlink(node);				 
-	}
-	NumRecords--;
-}
-
-/*********************************************************************************************** 
- * HashListClass::Remove -- Remove record from hash table.                                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *   	unsigned key - key to find node by.                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/26/1999 SKB : Created.                                                                 * 
- *=============================================================================================*/
-template <class T, class U, int NumHashValues>
-bool HashListClass<T, U, NumHashValues>::Remove(unsigned key) 
-{
-	int hashidx = Hash_Value(key);
-	assert(hashidx < NumHashValues);
-	
-	HashNodeClass<T,U> *node = Find(key);
-	if (node) {
-		Remove(node);
-		return(true);
-	}
-	return(false);
-}					  
-						  
-/*********************************************************************************************** 
- * HashListClass::Move_To -- Move nodes from one list to another.                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/04/1999 SKB : Created.                                                                 * 
- *=============================================================================================*/
-template <class T, class U, int NumHashValues>
-void HashListClass<T, U, NumHashValues>::Move_To(HashListClass<T,U> *newlist) 
-{								  
-	HashNodeClass<T,U> *node = First_Valid();
-	while (node) {
-		HashNodeClass<T,U> *next = node->Next_Valid();
-		
-		// If list created node, clear that fact for a moment so it
-		// will not get deleted in the remove.	 
-		if (Is_List_Created(node)) {
-			Clear_List_Created(node);
-			Remove(node);
-			newlist->Add(node);	
-			Set_List_Created(node);
-		} else {
-			Remove(node);
-			newlist->Add(node);	
-		}
-		node = next;
-	}
-}	
-
-#pragma warning (pop)
-
-#endif // HASHLIST_H
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.h b/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.h
new file mode 100644
index 00000000000..f0758d72277
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.h
@@ -0,0 +1,627 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* $Header: /Commando/Code/wwlib/hashlist.h 13    4/30/01 3:05p Joe_b $ */
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : G                                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/hashlist.h                             $*
+ *                                                                                             *
+ *                      Creator::Scott K. Bowen - 5/4/99                                      *
+ *                                                                                             *
+ *                      $Author:: Joe_b                                                       $*
+ *                                                                                             *
+ *                     $Modtime:: 4/30/01 2:41p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 13                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   HashListClass::Find -- Find record in hash table.                                         *
+ *   HashListClass::Remove -- Remove record from hash table.                                   *
+ *   HashListClass::Add -- Add record to hash list.                                            *
+ *   HashListClass::Add -- Add record to list, list creates node for user.                     *
+ *   HashListClass::Move_To -- Move nodes from one list to another.                           *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#pragma warning (push)
+#pragma warning (disable: 4786)
+
+#include "LISTNODE.h"
+#include <memory.h>
+
+#ifndef NULL
+#define NULL (0L)
+#endif
+
+#define A_LARGE_PRIME_NUMBER	257
+
+// HashListClass<> and HashNodeClass<>:
+// 	The purpose of these templates is to allow a user to insert records into
+// a hash table that also contains a double linked list that includes every
+// record in the hash table.  The functionality of the hash list mirrors
+// very closely that of the DataNode<> and List<> templates.  The differences
+// between them are:
+// 	-User calls Add(?) to add to list instead of Add_Head() or others.
+// 	-A key must be set to hash off of.
+//
+// Additional features of the HashList<> over List<> are:
+//		-Quick searching as long as key's are well hashed..
+//		-Node can inherit user class so additional data can be put in node.
+//		 For example a timestamp to be set by user. Default is
+//		 HashDefaluatUserClass that has no data.
+//		-If class T is actually a class (not a pointer), user may get a ptr
+//		 to class with Get_Ptr() instead of Get() that returns an INSTANCE
+//		 of the class.
+//		-Flags to tell user if record was just created or record was just put
+//		 into a list (user must clear flags if desired.)
+//		-HashListClass<> can create and destroy nodes so that the nodes do not
+//		 need to be put as members in classes.  This allows an object to be
+//		 put into an infinite (subject to memory constraints) lists.
+//		-User may specify number of hash node slots (default is A_LARGE_PRIME_NUMBER).
+
+// You can typedef these templates with the the following:
+// 	typedef HashListClass<TestHashClass *> HashTableClass;
+// 	typedef HashNodeClass<TestHashClass *> HashTableNodeClass;
+// or if using a UserClass
+// 	typedef HashListClass<TestHashClass *, 4, UserClass> HashTableClass;
+// 	typedef HashNodeClass<TestHashClass *, UserClass> HashTableNodeClass;
+
+
+template<class T, class U> class HashNodeClass;
+template<class T, class U> class HashNodeFriendClass;
+template<class T, class U, int NumHashValues> class HashListClass;
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////
+// This is a default class that is stored in HashNodeClass.  It's purpose is
+// to allow the user to override it with his/her own class so that additional
+// data may be stored in the node about the object.
+// Since the object might be in various lists, this data is specific to
+// the list that it in.
+class HashDefaultUserClass  {};
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+template<class T, class U = class HashDefaultUserClass>
+class HashNodeClass : public DataNode<HashNodeClass<T,U> *>, public U
+{
+	public:
+		// Creation when key and record are known.
+		HashNodeClass(T record, unsigned key) :
+			Flags(0),
+			Record(record),
+			Key(key)
+		{
+			DataNode<HashNodeClass<T,U> *>::Set(this);
+			Flag.NewRecord = true;
+			Flag.KeySet = true;
+		}
+
+		// Creation when key and record are to be set later.
+		// node may not be put into list until the key is set.
+		HashNodeClass() :
+			Flags(0),
+			Key(-1)
+		{
+			DataNode<HashNodeClass<T,U> *>::Set(this);
+			Flag.NewRecord = true;
+		}
+
+		virtual ~HashNodeClass() {
+			// Assert is raised when user tries to delete HashNodeClass still in a list
+			// NOTE: This might be raised because user expected node to clean
+			// 		itself up when deleted.  Currently, this feature is not available
+			//			because it would require an additional pointer  to the HashListClass
+			//			that the node is a member of.
+			assert(!Flag.InList);
+		}
+
+		// Get next and prev record given a node.
+		// A node may be retrieved from: HashListClass::Find();
+		HashNodeClass<T,U> *Next()  {
+			return((HashNodeClass<T,U> *) DataNode<HashNodeClass<T,U> *>::Next());
+		}
+		HashNodeClass<T,U> *Prev()  {
+			return((HashNodeClass<T,U> *) DataNode<HashNodeClass<T,U> *>::Prev());
+		}
+
+		// User may use these if he desires not to have to check for valid.
+		HashNodeClass<T,U> *Next_Valid()  {
+			HashNodeClass<T,U> *next = Next();
+			if (next && next->Is_Valid()) {
+				return(next);
+			}
+			return(NULL);
+		}
+		HashNodeClass<T,U> *Prev_Valid()  {
+			HashNodeClass<T,U> *prev = Prev();
+			if (prev && prev->Is_Valid()) {
+				return(prev);
+			}
+			return(NULL);
+		}
+
+		// Get record that is in hash table.
+		T Get_Record() {return(Record);}
+		T Get_Record_Ptr() {return(&Record);}
+
+		// Overload DataNode::Get() to get the record we are pointing to so
+		// that it behaves how people expect List to operate.
+		// To Get HashNodeClass - it is this.
+		T Get() {return(Record);}
+
+		// Get a pointer to Record to avoid a copy construction of Record if
+		// it is an instance of a class that does not want to be copied all
+		// over the place.
+		T *Get_Ptr() {return(&Record);}
+
+		// To mirror usage of DataNode().
+		void Set(T record) {Record = record;}
+
+		void Set_Key(unsigned key) {
+			// Can't change key once in a list, we would never find it.
+			assert(!Flag.InList);
+			Flag.KeySet = true;
+			Key = key;
+		}
+
+		// Get key of record for has table.
+		unsigned Get_Key() {
+			assert(Flag.KeySet);
+			return (Key);
+		}
+
+		// Enable user to know if a record has just been added to the list.
+		// It stays set until user clears it - not required.
+		int Is_New_Record()		{return(Flag.NewRecord);}
+		void Clear_New_Record() {Flag.NewRecord = false;}
+
+		// Each time object gets put into a list NewInList is set.
+		// Stays set until user clears - not required.
+		int Is_New_In_List()		{return(Flag.NewInList);}
+		void Clear_New_In_List() {Flag.NewInList = false;}
+
+		bool Is_In_List()  		{return(Flag.InList);}
+		bool Is_Key_Set()  		{return(Flag.KeySet);}
+
+
+	protected:
+		// Record that we are keeping in hash table.
+		// This is commonly a pointer to the actual record.
+		T							Record;
+
+		// Key that user gives to identify record.
+		// WARNING: Duplicate keys are undefined behavior.
+		unsigned						Key;
+
+		// Unioned flags so Flags can be initialized to 0.
+		union {
+			struct {
+				// When record collides in hash list, these ?InTable
+				// tell when to stop looking for object in hash entry.
+				unsigned					FirstInTable:1;
+				unsigned					LastInTable:1;
+
+				// This is set when record is first created.  It is up to user
+				// to clear if he uses flag.
+				unsigned					NewRecord:1;
+
+				// This is set when record is first put in list.  It is up to user
+				// to clear if he uses flag.
+				unsigned					NewInList:1;
+
+				// Certain functions may not happen if node is InList (in hash table)
+				// These include delete, Set_Key(), and possibly others.
+				unsigned					InList:1;
+
+				// This is set so HashListClass knows if it should delete the
+				// node when removed from it's list.
+				unsigned					ListCreated:1;
+
+				// Make sure someone does not insert a node into a list
+				// without setting it's key.
+				unsigned					KeySet:1;
+			} Flag;
+			unsigned Flags;
+		};
+
+	private:
+		// Not something the casual user can call.
+		void Unlink(void) {
+			DataNode<HashNodeClass<T,U> *>::Unlink();
+		}
+
+		friend class HashNodeFriendClass<T,U>;
+};
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////
+// This class is created so that HashListClass can access HashNodeClass.
+// HashListClass cannot access directly because it is impossible
+// (I could not figure out how) to tell HashNodeClass to be a friend
+// to all creations of HashListClass<T,N> since HashNodeClass
+// does not need the NumHashValues parameter.
+#pragma warning(push)
+#pragma warning(disable : 4786) // identifier was truncated to 255 chars in debug information.
+
+template<class T, class U>
+class HashNodeFriendClass
+{
+	protected:
+		void Set_In_List(HashNodeClass<T,U> *ptr)  	{ptr->Flag.InList = true; ptr->Flag.NewInList = true;}
+		void Clear_In_List(HashNodeClass<T,U> *ptr)  {ptr->Flag.InList = false; ptr->Flag.NewInList = false;}
+
+		bool Is_First(HashNodeClass<T,U> *ptr)		{return(ptr->Flag.FirstInTable);}
+		bool Is_Last(HashNodeClass<T,U> *ptr)		{return(ptr->Flag.LastInTable); }
+
+		void Set_First(HashNodeClass<T,U> *ptr)	{ptr->Flag.FirstInTable = true; }
+		void Set_Last(HashNodeClass<T,U> *ptr)		{ptr->Flag.LastInTable = true;  }
+
+		void Clear_First(HashNodeClass<T,U> *ptr)	{ptr->Flag.FirstInTable = false;}
+		void Clear_Last(HashNodeClass<T,U> *ptr)	{ptr->Flag.LastInTable = false; }
+
+		void Set_List_Created(HashNodeClass<T,U> *ptr)	{ptr->Flag.ListCreated = true; }
+		void Clear_List_Created(HashNodeClass<T,U> *ptr)	{ptr->Flag.ListCreated = false; }
+		bool Is_List_Created(HashNodeClass<T,U> *ptr)	{return(ptr->Flag.ListCreated);}
+
+		void Unlink(HashNodeClass<T,U> *ptr)  {ptr->Unlink();}
+};
+
+#pragma warning(pop)
+
+// The sole purpose of using NumHashValues as a template is to make it easier to
+// view in a debugger.  If it were an allocated array of pointers, the debugger does
+// not easily show each element in the array.
+template<class T, class U = class HashDefaultUserClass, int NumHashValues = A_LARGE_PRIME_NUMBER>
+class HashListClass : protected HashNodeFriendClass<T,U>
+{
+	public:
+		// Creation and destruction.
+		HashListClass() :
+			List(),NumRecords(0), UsedValues(0)
+		{
+			memset(HashTable, 0, sizeof(HashTable));
+		}
+		~HashListClass() {Delete();}
+
+		// Get first node in list so user can itterate through it.
+		// CAUTION: Do not destroy pointer returned or itterated though -
+		//				you must call the Remove function on it.
+		//				An assert() will come up if you try.
+		HashNodeClass<T,U> *First()  {
+			return((HashNodeClass<T,U> *)List.First());
+		}
+		HashNodeClass<T,U> *First_Valid()  {
+			return((HashNodeClass<T,U> *)List.First_Valid());
+		}
+		HashNodeClass<T,U> *Last()  {
+			return((HashNodeClass<T,U> *)List.Last());
+		}
+		HashNodeClass<T,U> *Last_Valid()  {
+			return((HashNodeClass<T,U> *)List.Last_Valid());
+		}
+
+
+		// Add a record to hash creating new HashNodeClass.
+		HashNodeClass<T,U> *Add(T record, unsigned key);
+
+		// Add an existing node not in a list to this list.
+		// This allows closer behavior to List class.
+		HashNodeClass<T,U> *Add(HashNodeClass<T,U> *node);
+
+		// Search for record based off key in hash table.
+		HashNodeClass<T,U> *Find(unsigned key);
+
+		// Use this remove if you know the node * already. It is quicker.
+		void Remove(HashNodeClass<T,U> *node);
+
+		// Use this remove if you need to do a find to get the node.
+		// OK if key does not exist in table.
+		bool Remove(unsigned key);
+
+		// Removes all nodes in list.
+		void Delete(void) {while (First()->Is_Valid()) Remove(First());}
+
+		// Move contents of one list to another (this becomes empty).
+		void Move_To(HashListClass<T,U> *newlist);
+
+		// So we always do it the same way.
+		unsigned Hash_Value(unsigned key)  {
+			return(unsigned)(key % NumHashValues);
+		}
+
+		// Total number of records in hash table.
+		int Num_Records()  {
+			return(NumRecords);
+		}
+		// how many hash values are used.
+		// The closer this number is to NumRecords, the
+		// better hashing going on.
+		int Num_Used_Values()  {
+			return(UsedValues);
+		}
+
+	protected:
+		// This list can be walked from start to end of all objects in the list.
+		// User can use Get_First() to get first (valid) record in linked list.
+		List<DataNode<T> *>		List;
+
+		// Points to first record in List that has the right 'value'.
+		// Must check LaastInTable to see if end of records in has list.
+		HashNodeClass<T,U>		*HashTable[NumHashValues];
+
+		// Number of records we have in class.
+		int							NumRecords;
+		int							UsedValues;
+
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+/***********************************************************************************************
+ * HashListClass::Add -- Add record to hash list.                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/26/1999 SKB : Created.                                                                 *
+ *=============================================================================================*/
+template <class T, class U, int NumHashValues>
+HashNodeClass<T,U> *HashListClass<T, U, NumHashValues>::Add(HashNodeClass<T,U> *node)
+{
+	// Get our index into the hash table.
+	int hashidx = Hash_Value(node->Get_Key());
+	assert(hashidx < NumHashValues);
+
+	// Tell system we are being put in the list (and make sure we weren't already in one).
+	assert(!node->Is_In_List());
+	Set_In_List(node);
+
+	// Get first hit in table.
+	HashNodeClass<T,U> *first = HashTable[hashidx];
+	if (first) {
+		// This will add the new node right after the first node in the list.
+		first->Link(node);
+
+		// If we are the first one to collide, then we will be at end of list.
+		// otherwise, we are at the end.
+		if (Is_Last(first)) {
+			Clear_Last(first);
+			Set_Last(node);
+		}
+	} else {
+		// We are first hit at hash index.  Put ourselves at start of
+		List.Add_Head(node);
+		Set_First(node);
+		Set_Last(node);
+		HashTable[hashidx] = node;
+		UsedValues++;
+	}
+	NumRecords++;
+	return (node);
+}
+
+
+/***********************************************************************************************
+ * HashListClass::Add -- Add record to list, list creates node for user.                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/03/1999 SKB : Created.                                                                 *
+ *=============================================================================================*/
+template <class T, class U, int NumHashValues>
+HashNodeClass<T,U> *HashListClass<T, U, NumHashValues>::Add(T record, unsigned key)
+{
+	// Create new node so we can add our record.
+	HashNodeClass<T,U> *node = W3DNEW HashNodeClass<T,U>(record, key);
+	Set_List_Created(node);
+
+	// Now let the other add do all the work.
+	Add(node);
+	return (node);
+}
+
+/***********************************************************************************************
+ * HashListClass::Find -- Find record in hash table.                                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/26/1999 SKB : Created.                                                                 *
+ *=============================================================================================*/
+template <class T, class U, int NumHashValues>
+HashNodeClass<T,U> *HashListClass<T, U, NumHashValues>::Find(unsigned key)
+{
+	int hashidx = Hash_Value(key);
+	assert(hashidx < NumHashValues);
+
+	HashNodeClass<T,U> *cur = HashTable[hashidx];
+	if (cur) for(;;) {
+		// Have we found our match?
+		if (cur->Get_Key() == key) {
+			return(cur);
+		}
+
+		// We have to find record before the end of the list.
+		if (Is_Last(cur))  {
+			break;
+		}
+
+		// Continue on because we appear to have some collisions.
+		cur = cur->Next();
+
+		// The end of a list should always be marked with Is_Last().
+		assert(cur);
+		assert(cur->Is_Valid());
+	}
+	return(NULL);
+
+}
+
+/***********************************************************************************************
+ * HashListClass::Remove_Node -- Remove node from hash table.                                  *
+ *                               Protected function for usage by Remove() routines.            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *   HashNodeClass<T,U> *node - node to remove.                                                *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1999 SKB : Created.                                                                 *
+ *   01/19/2000 SKB : Remove the node with Unlink.                                             *
+ *=============================================================================================*/
+template <class T, class U, int NumHashValues>
+void HashListClass<T, U, NumHashValues>::Remove(HashNodeClass<T,U> *node)
+{
+	assert(node);
+	assert(node->Is_In_List());
+
+	// See if entry is first in list for hash value.
+	if (Is_First(node)) {
+
+		int hashidx = Hash_Value(node->Get_Key());
+		assert(HashTable[hashidx]);
+
+		// SKB: 2/20/01 - clear incase inserted in new list later.
+		Clear_First(node);
+
+		// is it only one in hash index?
+		if (Is_Last(node)) {
+			// SKB: 2/20/01 - clear incase inserted in new list later.
+			Clear_Last(node);
+			HashTable[hashidx] = NULL;
+			UsedValues--;
+		} else {
+			HashTable[hashidx] = node->Next_Valid();
+			Set_First(HashTable[hashidx]);
+		}
+
+	} else if (Is_Last(node)) {
+		// SKB: 2/20/01 - clear incase inserted in new list later.
+		Clear_Last(node);
+
+		// There is one before us because it failed above.
+		Set_Last(node->Prev());
+	}
+
+
+	// All done with you.  Set flag to avoid assert.
+	Clear_In_List(node);
+
+	// Delete node if it was created by the this class instead of by the user.
+	if (Is_List_Created(node)) {
+		delete node;
+	} else {
+		// Remove it from the link list at least so it can be put in another.
+		Unlink(node);
+	}
+	NumRecords--;
+}
+
+/***********************************************************************************************
+ * HashListClass::Remove -- Remove record from hash table.                                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *   	unsigned key - key to find node by.                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/26/1999 SKB : Created.                                                                 *
+ *=============================================================================================*/
+template <class T, class U, int NumHashValues>
+bool HashListClass<T, U, NumHashValues>::Remove(unsigned key)
+{
+	int hashidx = Hash_Value(key);
+	assert(hashidx < NumHashValues);
+
+	HashNodeClass<T,U> *node = Find(key);
+	if (node) {
+		Remove(node);
+		return(true);
+	}
+	return(false);
+}
+
+/***********************************************************************************************
+ * HashListClass::Move_To -- Move nodes from one list to another.                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/04/1999 SKB : Created.                                                                 *
+ *=============================================================================================*/
+template <class T, class U, int NumHashValues>
+void HashListClass<T, U, NumHashValues>::Move_To(HashListClass<T,U> *newlist)
+{
+	HashNodeClass<T,U> *node = First_Valid();
+	while (node) {
+		HashNodeClass<T,U> *next = node->Next_Valid();
+
+		// If list created node, clear that fact for a moment so it
+		// will not get deleted in the remove.
+		if (Is_List_Created(node)) {
+			Clear_List_Created(node);
+			Remove(node);
+			newlist->Add(node);
+			Set_List_Created(node);
+		} else {
+			Remove(node);
+			newlist->Add(node);
+		}
+		node = next;
+	}
+}
+
+#pragma warning (pop)
diff --git a/Core/Libraries/Source/WWVegas/WWLib/INDEX.H b/Core/Libraries/Source/WWVegas/WWLib/INDEX.H
deleted file mode 100644
index fc9e4923e5e..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/INDEX.H
+++ /dev/null
@@ -1,730 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /G/wwlib/INDEX.H                                            $*
- *                                                                                             *
- *                      $Author:: Eric_c                                                      $*
- *                                                                                             *
- *                     $Modtime:: 4/02/99 11:59a                                              $*
- *                                                                                             *
- *                    $Revision:: 4                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *   IndexClass<T>::Add_Index -- Add element to index tracking system.                         *
- *   IndexClass<T>::Clear -- Clear index handler to empty state.                               *
- *   IndexClass<T>::Count -- Fetch the number of index entries recorded.                       *
- *   IndexClass<T>::Fetch_Index -- Fetch data from specified index.                            *
- *   IndexClass<T>::Increase_Table_Size -- Increase the internal index table capacity.         *
- *   IndexClass<T>::IndexClass -- Constructor for index handler.                               *
- *   IndexClass<T>::Invalidate_Archive -- Invalidate the archive pointer.                      *
- *   IndexClass<T>::Is_Archive_Same -- Checks to see if archive pointer is same as index.      *
- *   IndexClass<T>::Is_Present -- Checks for presense of index entry.                          *
- *   IndexClass<T>::Remove_Index -- Find matching index and remove it from system.             *
- *   IndexClass<T>::Search_For_Node -- Perform a search for the specified node ID              *
- *   IndexClass<T>::Set_Archive -- Records the node pointer into the archive.                  *
- *   IndexClass<T>::Sort_Nodes -- Sorts nodes in preparation for a binary search.              *
- *   IndexClass<T>::~IndexClass -- Destructor for index handler object.                        *
- *   compfunc -- Support function for bsearch and bsort.                                       *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef INDEX_H
-#define INDEX_H
-
-#include	"BSEARCH.H"
-
-#if !defined(__BORLANDC__) || !defined(_USERENTRY)
-#define	_USERENTRY
-#endif
-
-/*
-**	This class is used to create and maintain an index. It does this by assigning a unique
-**	identifier number to the type objects that it is indexing. The regular binary sort and search
-**	function are used for speedy index retrieval. Typical use of this would be to index pointers to
-**	normal data objects, but it can be used to hold the data objects themselves. Keep in mind that
-**	the data object "T" is copied around by this routine in the internal tables so not only must
-**	it have a valid copy constructor, it must also be efficient. The internal algorithm will
-**	create an arbitrary number of default constructed objects of type "T". Make sure it has a
-**	default constructor that is efficient and trivial. The constructor need not perform any actual
-**	initialization since this class has prior knowledge about the legality of these temporary
-**	objects and doesn't use them until after the copy constructor is used to initialize them.
-**	This means that the default constructed object of type "T" can be technically in an unusable
-**	state since it won't ever be used by this routine and won't ever be returned by any of
-**	this template's methods.
-**
-**	This should properly be called a "map container class" since it is a container with a
-**	mapping of an identifier.
-*/
-
-template<class INDEX, class T>
-class IndexClass
-{
-	public:
-		IndexClass(void);
-		~IndexClass(void);
-
-		/*
-		**	Add element to index table.
-		*/
-		bool Add_Index(INDEX const & id, T const & data);
-
-		/*
-		**	Removes an index entry from the index table.
-		*/
-		bool Remove_Index(INDEX const & id);
-
-		/*
-		**	Check to see if index is present.
-		*/
-		bool Is_Present(INDEX const & id) const;
-
-		/*
-		**	Fetch number of index entries in the table.
-		*/
-		int Count(void) const;
-
-		/*
-		**	Actually a fetch an index data element from the table.
-		*/
-		T const & operator [] (INDEX const & id) const;
-
-		/*
-		**	Fetch a data element by position reference.
-		*/
-		T const & Fetch_By_Position(int id) const;
-		INDEX const Fetch_ID_By_Position(int pos) const {return(IndexTable[pos].ID);}
-
-		/*
-		**	Clear out the index table to null (empty) state.
-		*/
-		void Clear(void);
-
-	private:
-		/*
-		**	This node object is used to keep track of the connection between the data
-		**	object and the index identifier number.
-		*/
-		struct NodeElement {
-			NodeElement(void) {}		// Default constructor does nothing (by design).
-			NodeElement(INDEX const & id, T & data) : ID(id), Data(data) {}
-
-			INDEX ID;		// ID number (must be first element in this structure).
-			T Data;			// Data element assigned to this ID number.
-
-			bool operator == (NodeElement const & rvalue) const {return(ID == rvalue.ID);}
-			bool operator < (NodeElement const & rvalue) const {return(ID < rvalue.ID);}
-		};
-
-		/*
-		**	This is the pointer to the allocated index table. It contains all valid nodes in
-		**	a sorted order.
-		*/
-		NodeElement * IndexTable;
-
-		/*
-		**	This records the number of valid nodes within the index table.
-		*/
-		int IndexCount;
-
-		/*
-		**	The total size (in nodes) of the index table is recorded here. If adding a node
-		**	would cause the index count to exceed this value, the index table must be resized
-		**	to make room.
-		*/
-		int IndexSize;
-
-		/*
-		**	If the index table is sorted and ready for searching, this flag will be true. Sorting
-		**	of the table only occurs when absolutely necessary.
-		*/
-		mutable bool IsSorted;
-
-		/*
-		**	This records a pointer to the last element found by the Is_Present() function. Using
-		**	this last recorded value can allow quick fetches of data whenever possible.
-		*/
-		mutable NodeElement const * Archive;
-
-		/*
-		**	Increase size of internal index table by amount specified.
-		*/
-		bool Increase_Table_Size(int amount);
-
-		/*
-		**	Check if archive pointer is the same as that requested.
-		*/
-		bool Is_Archive_Same(INDEX const & id) const;
-
-		/*
-		**	Invalidate the archive pointer.
-		*/
-		void Invalidate_Archive(void) const;
-
-		/*
-		**	Set archive to specified value.
-		*/
-		void Set_Archive(NodeElement const * node) const;
-
-		/*
-		**	Search for the node in the index table.
-		*/
-		NodeElement const * Search_For_Node(INDEX const & id) const;
-
-		static int _USERENTRY search_compfunc(void const * ptr, void const * ptr2);
-};
-
-
-/***********************************************************************************************
- * IndexClass<T>::IndexClass -- Constructor for index handler.                                 *
- *                                                                                             *
- *    This constructs an empty index handler.                                                  *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-IndexClass<INDEX, T>::IndexClass(void) :
-	IndexTable(0),
-	IndexCount(0),
-	IndexSize(0),
-	IsSorted(false),
-	Archive(0)
-{
-	Invalidate_Archive();
-}
-
-
-/***********************************************************************************************
- * IndexClass<T>::~IndexClass -- Destructor for index handler object.                          *
- *                                                                                             *
- *    This will destruct and free any resources managed by this index handler.                 *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-IndexClass<INDEX, T>::~IndexClass(void)
-{
-	Clear();
-}
-
-
-/***********************************************************************************************
- * IndexClass<T>::Clear -- Clear index handler to empty state.                                 *
- *                                                                                             *
- *    This routine will free all internal resources and bring the index handler into a         *
- *    known empty state. After this routine, the index handler is free to be reused.           *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-void IndexClass<INDEX, T>::Clear(void)
-{
-	delete [] IndexTable;
-	IndexTable = 0;
-	IndexCount = 0;
-	IndexSize = 0;
-	IsSorted = false;
-	Invalidate_Archive();
-}
-
-
-/***********************************************************************************************
- * IndexClass<T>::Increase_Table_Size -- Increase the internal index table capacity.           *
- *                                                                                             *
- *    This helper function will increase the capacity of the internal index table without      *
- *    performing any alterations to the index data. Use this routine prior to adding a new     *
- *    element if the existing capacity is insufficient.                                        *
- *                                                                                             *
- * INPUT:   amount   -- The number of index element spaces to add to its capacity.             *
- *                                                                                             *
- * OUTPUT:  bool; Was the internal capacity increased without error?                           *
- *                                                                                             *
- * WARNINGS:   If there is insufficient RAM, then this routine will fail.                      *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-bool IndexClass<INDEX, T>::Increase_Table_Size(int amount)
-{
-	/*
-	**	Check size increase parameter for legality.
-	*/
-	if (amount < 0) return(false);
-
-	NodeElement * table = W3DNEWARRAY NodeElement[IndexSize + amount];
-	if (table != NULL) {
-
-		/*
-		**	Copy all valid nodes into the new table.
-		*/
-		for (int index = 0; index < IndexCount; index++) {
-			table[index] = IndexTable[index];
-		}
-
-		/*
-		**	Make the new table the current one (and delete the old one).
-		*/
-		delete [] IndexTable;
-		IndexTable = table;
-		IndexSize += amount;
-		Invalidate_Archive();
-
-		/*
-		**	Return with success flag.
-		*/
-		return(true);
-	}
-
-	/*
-	**	Failure to allocate the memory results in a failure to increase
-	**	the size of the index table.
-	*/
-	return(false);
-}
-
-
-/***********************************************************************************************
- * IndexClass<T>::Count -- Fetch the number of index entries recorded.                         *
- *                                                                                             *
- *    This will return the quantity of index entries that have been recored by this index      *
- *    handler.                                                                                 *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  Returns with number of recored indecies present.                                   *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-int IndexClass<INDEX, T>::Count(void) const
-{
-	return(IndexCount);
-}
-
-
-/***********************************************************************************************
- * IndexClass<T>::Is_Present -- Checks for presense of index entry.                            *
- *                                                                                             *
- *    This routine will scan for the specified index entry. If it was found, then 'true' is    *
- *    returned.                                                                                *
- *                                                                                             *
- * INPUT:   id -- The index ID to search for.                                                  *
- *                                                                                             *
- * OUTPUT:  bool; Was the index entry found in this index handler object?                      *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-bool IndexClass<INDEX, T>::Is_Present(INDEX const & id) const
-{
-	/*
-	**	If there are no data elements in the index table, then it can
-	**	never find the specified index. Check for and return failure
-	**	in this case.
-	*/
-	if (IndexCount == 0) {
-		return(false);
-	}
-
-	/*
-	**	Check to see if this same index element was previously searched for. If
-	**	so and it was previously found, then there is no need to search for it
-	**	again -- just return true.
-	*/
-	if (Is_Archive_Same(id)) {
-		return(true);
-	}
-
-	/*
-	**	Perform a binary search on the index nodes in order to look for a
-	**	matching index value.
-	*/
-	NodeElement const * nodeptr = Search_For_Node(id);
-
-	/*
-	**	If a matching index was found, then record it for future reference and return success.
-	*/
-	if (nodeptr != 0) {
-		Set_Archive(nodeptr);
-		return(true);
-	}
-
-	/*
-	**	Could not find element so return failure condition.
-	*/
-	return(false);
-}
-
-
-/***********************************************************************************************
- * IndexClass<T>::Fetch_By_Index -- Fetch data from specified index.                           *
- *                                                                                             *
- *    This routine will find the specified index and return the data value associated with it. *
- *                                                                                             *
- * INPUT:   id -- The index ID to search for.                                                  *
- *                                                                                             *
- * OUTPUT:  Returns with the data value associated with the index value.                       *
- *                                                                                             *
- * WARNINGS:   This routine presumes that the index exists. If it doesn't exist, then the      *
- *             default constructed object "T" is returned instead. To avoid this problem,      *
- *             always verfiy the existance of the index by calling Is_Present() first.         *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-#ifdef __BORLANDC__
-#pragma warn -def
-#endif
-template<class INDEX, class T>
-T const & IndexClass<INDEX, T>::operator [] (INDEX const & id) const
-{
-	if (Is_Present(id)) {
-
-		/*
-		**	Count on the fact that the archive pointer is always valid after a call to Is_Present
-		**	that returns "true".
-		*/
-		return(Archive->Data);
-	}
-	static T x;
-	return(x);
-}
-#ifdef __BORLANDC__
-#pragma warn .def
-#endif
-
-
-
-template<class INDEX, class T>
-T const & IndexClass<INDEX, T>::Fetch_By_Position(int pos) const
-{
-	assert(pos < IndexCount);
-	return(IndexTable[pos].Data);
-}
-
-
-/***********************************************************************************************
- * IndexClass<T>::Is_Archive_Same -- Checks to see if archive pointer is same as index.        *
- *                                                                                             *
- *    This routine compares the specified index ID with the previously recorded index archive  *
- *    pointer in order to determine if they match.                                             *
- *                                                                                             *
- * INPUT:   id -- The index ID to compare to the archive index object pointer.                 *
- *                                                                                             *
- * OUTPUT:  bool; Does the specified index match the archive pointer?                          *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-bool IndexClass<INDEX, T>::Is_Archive_Same(INDEX const & id) const
-{
-	if (Archive != 0 && Archive->ID == id) {
-		return(true);
-	}
-	return(false);
-}
-
-
-/***********************************************************************************************
- * IndexClass<T>::Invalidate_Archive -- Invalidate the archive pointer.                        *
- *                                                                                             *
- *    This routine will set the archive pointer to an invalid state. This must be performed    *
- *    if ever the archive pointer would become illegal (such as when the element it refers to  *
- *    is deleted).                                                                             *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-void IndexClass<INDEX, T>::Invalidate_Archive(void) const
-{
-	Archive = 0;
-}
-
-
-/***********************************************************************************************
- * IndexClass<T>::Set_Archive -- Records the node pointer into the archive.                    *
- *                                                                                             *
- *    This routine records the specified node pointer. Use this routine when there is a        *
- *    good chance that the specified node will be requested in the immediate future.           *
- *                                                                                             *
- * INPUT:   node  -- Pointer to the node to assign to the archive.                             *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-void IndexClass<INDEX, T>::Set_Archive(NodeElement const * node) const
-{
-	Archive = node;
-}
-
-
-/***********************************************************************************************
- * IndexClass<T>::Add_Index -- Add element to index tracking system.                           *
- *                                                                                             *
- *    This routine will record the index information into this index manager object. It        *
- *    associates the index number with the data specified. The data is copied to an internal   *
- *    storage location.                                                                        *
- *                                                                                             *
- * INPUT:   id    -- The ID number to associate with the data.                                 *
- *                                                                                             *
- *          data  -- The data to store.                                                        *
- *                                                                                             *
- * OUTPUT:  bool; Was the element added without error? Failure indicates that RAM has been     *
- *                exhausted.                                                                   *
- *                                                                                             *
- * WARNINGS:   The data is COPIED to internal storage. This means that the data object must    *
- *             have a functional and efficient copy constructor and assignment operator.       *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-bool IndexClass<INDEX, T>::Add_Index(INDEX const & id, T const & data)
-{
-#ifdef RTS_DEBUG
-	/*
-	**	Ensure that two elements with the same index are not added to the 
-	**	array.
-	*/
-	for (int index = 0; index < IndexCount; index++) {
-		assert(IndexTable[index].ID != id);
-	}
-#endif
-
-	/*
-	**	Ensure that there is enough room to add this index. If not, then increase the
-	**	capacity of the internal index table.
-	*/
-	if (IndexCount + 1 > IndexSize) {
-		if (!Increase_Table_Size(IndexSize == 0 ? 10 : IndexSize)) {
-
-			/*
-			**	Failure to increase the size of the index table means failure to add
-			**	the index element.
-			*/
-			return(false);
-		}
-	}
-
-	/*
-	**	Add the data to the end of the index data and then sort the index table.
-	*/
-	IndexTable[IndexCount].ID = id;
-	IndexTable[IndexCount].Data = data;
-	IndexCount++;
-	IsSorted = false;
-
-	return(true);
-}
-
-
-/***********************************************************************************************
- * IndexClass<T>::Remove_Index -- Find matching index and remove it from system.               *
- *                                                                                             *
- *    This will scan through the previously added index elements and if a match was found, it  *
- *    will be removed.                                                                         *
- *                                                                                             *
- * INPUT:   id -- The index ID to search for and remove.                                       *
- *                                                                                             *
- * OUTPUT:  bool; Was the index element found and removed?                                     *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-bool IndexClass<INDEX, T>::Remove_Index(INDEX const & id)
-{
-	/*
-	**	Find the array index into the table that matches the specified id value.
-	*/
-	int found_index = -1;
-	for (int index = 0; index < IndexCount; index++) {
-		if (IndexTable[index].ID == id) {
-			found_index = index;
-			break;
-		}
-	}
-
-	/*
-	**	Trying to remove something that isn't there could be an
-	**	error in the calling routine?
-	*/
-//	assert(found_index);
-
-	/*
-	**	If the array index was found, then copy all higher index entries
-	**	downward to fill the vacated location. We cannot use memcpy here because the type
-	**	object may not support raw copies. C++ defines the assignment operator to deal
-	**	with this, so that is what we use.
-	*/
-	if (found_index != -1) {
-
-		for (int index = found_index+1; index < IndexCount; index++) {
-			IndexTable[index-1] = IndexTable[index];
-		}
-		IndexCount--;
-
-		NodeElement fake;
-		fake.ID = 0;
-		fake.Data = T();
-		IndexTable[IndexCount] = fake;		// zap last (now unused) element
-
-		Invalidate_Archive();
-		return(true);
-	}
-
-	return(false);
-}
-
-
-/***********************************************************************************************
- * compfunc -- Support function for bsearch and bsort.                                         *
- *                                                                                             *
- *    This compare function presumes that its parameters are pointing to NodeElements and that *
- *    the first "int" in the node is the index ID number to be used for comparison.            *
- *                                                                                             *
- * INPUT:   ptr1  -- Pointer to first node.                                                    *
- *                                                                                             *
- *          ptr2  -- Pointer to second node.                                                   *
- *                                                                                             *
- * OUTPUT:  Returns with the comparision value between the two nodes.                          *
- *                                                                                             *
- * WARNINGS:   This is highly dependant upon the layout of the NodeElement structure.          *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-int _USERENTRY IndexClass<INDEX, T>::search_compfunc(void const * ptr1, void const * ptr2)
-{
-	if (*(int const *)ptr1 == *(int const *)ptr2) {
-		return(0);
-	}
-	if (*(int const *)ptr1 < *(int const *)ptr2) {
-		return(-1);
-	}
-	return(1);
-}
-
-
-/***********************************************************************************************
- * IndexClass<T>::Search_For_Node -- Perform a search for the specified node ID                *
- *                                                                                             *
- *    This routine will perform a binary search on the previously recorded index values and    *
- *    if a match was found, it will return a pointer to the NodeElement.                       *
- *                                                                                             *
- * INPUT:   id -- The index ID to search for.                                                  *
- *                                                                                             *
- * OUTPUT:  Returns with a pointer to the NodeElement that matches the index ID specified. If  *
- *          no matching index could be found, then NULL is returned.                           *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   11/02/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class INDEX, class T>
-#ifdef __BORLANDC__
-NodeElement const * IndexClass<INDEX, T>::Search_For_Node(INDEX const & id) const
-#else
-typename IndexClass<INDEX, T>::NodeElement const * IndexClass<INDEX, T>::Search_For_Node(INDEX const & id) const
-#endif
-{
-	/*
-	**	If there are no elements in the list, then it certainly can't find any matches.
-	*/
-	if (IndexCount == 0) {
-		return(0);
-	}
-
-	/*
-	**	If the list has not yet been sorted, then do so now. Binary searching requires
-	**	the list to be sorted.
-	*/
-	if (!IsSorted) {
-		qsort(&IndexTable[0], IndexCount, sizeof(IndexTable[0]), search_compfunc);
-		Invalidate_Archive();
-		IsSorted = true;
-	}
-
-	/*
-	**	This list is sorted and ready to perform a binary search upon it.
-	*/
-	NodeElement node;
-	node.ID = id;
-	return(Binary_Search(IndexTable, IndexCount, node));
-//	return((NodeElement const *)bsearch(&node, &IndexTable[0], IndexCount, sizeof(IndexTable[0]), search_compfunc));
-}
-
-
-#endif
-
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/INDEX.h b/Core/Libraries/Source/WWVegas/WWLib/INDEX.h
new file mode 100644
index 00000000000..8356c1762b5
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/INDEX.h
@@ -0,0 +1,721 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/INDEX.h                                            $*
+ *                                                                                             *
+ *                      $Author:: Eric_c                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 4/02/99 11:59a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 4                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   IndexClass<T>::Add_Index -- Add element to index tracking system.                         *
+ *   IndexClass<T>::Clear -- Clear index handler to empty state.                               *
+ *   IndexClass<T>::Count -- Fetch the number of index entries recorded.                       *
+ *   IndexClass<T>::Fetch_Index -- Fetch data from specified index.                            *
+ *   IndexClass<T>::Increase_Table_Size -- Increase the internal index table capacity.         *
+ *   IndexClass<T>::IndexClass -- Constructor for index handler.                               *
+ *   IndexClass<T>::Invalidate_Archive -- Invalidate the archive pointer.                      *
+ *   IndexClass<T>::Is_Archive_Same -- Checks to see if archive pointer is same as index.      *
+ *   IndexClass<T>::Is_Present -- Checks for presense of index entry.                          *
+ *   IndexClass<T>::Remove_Index -- Find matching index and remove it from system.             *
+ *   IndexClass<T>::Search_For_Node -- Perform a search for the specified node ID              *
+ *   IndexClass<T>::Set_Archive -- Records the node pointer into the archive.                  *
+ *   IndexClass<T>::Sort_Nodes -- Sorts nodes in preparation for a binary search.              *
+ *   IndexClass<T>::~IndexClass -- Destructor for index handler object.                        *
+ *   compfunc -- Support function for bsearch and bsort.                                       *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include	"BSEARCH.h"
+
+#if !defined(__BORLANDC__) || !defined(_USERENTRY)
+#define	_USERENTRY
+#endif
+
+/*
+**	This class is used to create and maintain an index. It does this by assigning a unique
+**	identifier number to the type objects that it is indexing. The regular binary sort and search
+**	function are used for speedy index retrieval. Typical use of this would be to index pointers to
+**	normal data objects, but it can be used to hold the data objects themselves. Keep in mind that
+**	the data object "T" is copied around by this routine in the internal tables so not only must
+**	it have a valid copy constructor, it must also be efficient. The internal algorithm will
+**	create an arbitrary number of default constructed objects of type "T". Make sure it has a
+**	default constructor that is efficient and trivial. The constructor need not perform any actual
+**	initialization since this class has prior knowledge about the legality of these temporary
+**	objects and doesn't use them until after the copy constructor is used to initialize them.
+**	This means that the default constructed object of type "T" can be technically in an unusable
+**	state since it won't ever be used by this routine and won't ever be returned by any of
+**	this template's methods.
+**
+**	This should properly be called a "map container class" since it is a container with a
+**	mapping of an identifier.
+*/
+
+template<class INDEX, class T>
+class IndexClass
+{
+	public:
+		IndexClass(void);
+		~IndexClass(void);
+
+		/*
+		**	Add element to index table.
+		*/
+		bool Add_Index(INDEX const & id, T const & data);
+
+		/*
+		**	Removes an index entry from the index table.
+		*/
+		bool Remove_Index(INDEX const & id);
+
+		/*
+		**	Check to see if index is present.
+		*/
+		bool Is_Present(INDEX const & id) const;
+
+		/*
+		**	Fetch number of index entries in the table.
+		*/
+		int Count(void) const;
+
+		/*
+		**	Actually a fetch an index data element from the table.
+		*/
+		T const & operator [] (INDEX const & id) const;
+
+		/*
+		**	Fetch a data element by position reference.
+		*/
+		T const & Fetch_By_Position(int id) const;
+		INDEX const Fetch_ID_By_Position(int pos) const {return(IndexTable[pos].ID);}
+
+		/*
+		**	Clear out the index table to null (empty) state.
+		*/
+		void Clear(void);
+
+	private:
+		/*
+		**	This node object is used to keep track of the connection between the data
+		**	object and the index identifier number.
+		*/
+		struct NodeElement {
+			NodeElement(void) {}		// Default constructor does nothing (by design).
+			NodeElement(INDEX const & id, T & data) : ID(id), Data(data) {}
+
+			INDEX ID;		// ID number (must be first element in this structure).
+			T Data;			// Data element assigned to this ID number.
+
+			bool operator == (NodeElement const & rvalue) const {return(ID == rvalue.ID);}
+			bool operator < (NodeElement const & rvalue) const {return(ID < rvalue.ID);}
+		};
+
+		/*
+		**	This is the pointer to the allocated index table. It contains all valid nodes in
+		**	a sorted order.
+		*/
+		NodeElement * IndexTable;
+
+		/*
+		**	This records the number of valid nodes within the index table.
+		*/
+		int IndexCount;
+
+		/*
+		**	The total size (in nodes) of the index table is recorded here. If adding a node
+		**	would cause the index count to exceed this value, the index table must be resized
+		**	to make room.
+		*/
+		int IndexSize;
+
+		/*
+		**	If the index table is sorted and ready for searching, this flag will be true. Sorting
+		**	of the table only occurs when absolutely necessary.
+		*/
+		mutable bool IsSorted;
+
+		/*
+		**	This records a pointer to the last element found by the Is_Present() function. Using
+		**	this last recorded value can allow quick fetches of data whenever possible.
+		*/
+		mutable NodeElement const * Archive;
+
+		/*
+		**	Increase size of internal index table by amount specified.
+		*/
+		bool Increase_Table_Size(int amount);
+
+		/*
+		**	Check if archive pointer is the same as that requested.
+		*/
+		bool Is_Archive_Same(INDEX const & id) const;
+
+		/*
+		**	Invalidate the archive pointer.
+		*/
+		void Invalidate_Archive(void) const;
+
+		/*
+		**	Set archive to specified value.
+		*/
+		void Set_Archive(NodeElement const * node) const;
+
+		/*
+		**	Search for the node in the index table.
+		*/
+		NodeElement const * Search_For_Node(INDEX const & id) const;
+
+		static int _USERENTRY search_compfunc(void const * ptr, void const * ptr2);
+};
+
+
+/***********************************************************************************************
+ * IndexClass<T>::IndexClass -- Constructor for index handler.                                 *
+ *                                                                                             *
+ *    This constructs an empty index handler.                                                  *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+IndexClass<INDEX, T>::IndexClass(void) :
+	IndexTable(0),
+	IndexCount(0),
+	IndexSize(0),
+	IsSorted(false),
+	Archive(0)
+{
+	Invalidate_Archive();
+}
+
+
+/***********************************************************************************************
+ * IndexClass<T>::~IndexClass -- Destructor for index handler object.                          *
+ *                                                                                             *
+ *    This will destruct and free any resources managed by this index handler.                 *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+IndexClass<INDEX, T>::~IndexClass(void)
+{
+	Clear();
+}
+
+
+/***********************************************************************************************
+ * IndexClass<T>::Clear -- Clear index handler to empty state.                                 *
+ *                                                                                             *
+ *    This routine will free all internal resources and bring the index handler into a         *
+ *    known empty state. After this routine, the index handler is free to be reused.           *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+void IndexClass<INDEX, T>::Clear(void)
+{
+	delete [] IndexTable;
+	IndexTable = 0;
+	IndexCount = 0;
+	IndexSize = 0;
+	IsSorted = false;
+	Invalidate_Archive();
+}
+
+
+/***********************************************************************************************
+ * IndexClass<T>::Increase_Table_Size -- Increase the internal index table capacity.           *
+ *                                                                                             *
+ *    This helper function will increase the capacity of the internal index table without      *
+ *    performing any alterations to the index data. Use this routine prior to adding a new     *
+ *    element if the existing capacity is insufficient.                                        *
+ *                                                                                             *
+ * INPUT:   amount   -- The number of index element spaces to add to its capacity.             *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the internal capacity increased without error?                           *
+ *                                                                                             *
+ * WARNINGS:   If there is insufficient RAM, then this routine will fail.                      *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+bool IndexClass<INDEX, T>::Increase_Table_Size(int amount)
+{
+	/*
+	**	Check size increase parameter for legality.
+	*/
+	if (amount < 0) return(false);
+
+	NodeElement * table = W3DNEWARRAY NodeElement[IndexSize + amount];
+	if (table != NULL) {
+
+		/*
+		**	Copy all valid nodes into the new table.
+		*/
+		for (int index = 0; index < IndexCount; index++) {
+			table[index] = IndexTable[index];
+		}
+
+		/*
+		**	Make the new table the current one (and delete the old one).
+		*/
+		delete [] IndexTable;
+		IndexTable = table;
+		IndexSize += amount;
+		Invalidate_Archive();
+
+		/*
+		**	Return with success flag.
+		*/
+		return(true);
+	}
+
+	/*
+	**	Failure to allocate the memory results in a failure to increase
+	**	the size of the index table.
+	*/
+	return(false);
+}
+
+
+/***********************************************************************************************
+ * IndexClass<T>::Count -- Fetch the number of index entries recorded.                         *
+ *                                                                                             *
+ *    This will return the quantity of index entries that have been recored by this index      *
+ *    handler.                                                                                 *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  Returns with number of recored indecies present.                                   *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+int IndexClass<INDEX, T>::Count(void) const
+{
+	return(IndexCount);
+}
+
+
+/***********************************************************************************************
+ * IndexClass<T>::Is_Present -- Checks for presense of index entry.                            *
+ *                                                                                             *
+ *    This routine will scan for the specified index entry. If it was found, then 'true' is    *
+ *    returned.                                                                                *
+ *                                                                                             *
+ * INPUT:   id -- The index ID to search for.                                                  *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the index entry found in this index handler object?                      *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+bool IndexClass<INDEX, T>::Is_Present(INDEX const & id) const
+{
+	/*
+	**	If there are no data elements in the index table, then it can
+	**	never find the specified index. Check for and return failure
+	**	in this case.
+	*/
+	if (IndexCount == 0) {
+		return(false);
+	}
+
+	/*
+	**	Check to see if this same index element was previously searched for. If
+	**	so and it was previously found, then there is no need to search for it
+	**	again -- just return true.
+	*/
+	if (Is_Archive_Same(id)) {
+		return(true);
+	}
+
+	/*
+	**	Perform a binary search on the index nodes in order to look for a
+	**	matching index value.
+	*/
+	NodeElement const * nodeptr = Search_For_Node(id);
+
+	/*
+	**	If a matching index was found, then record it for future reference and return success.
+	*/
+	if (nodeptr != 0) {
+		Set_Archive(nodeptr);
+		return(true);
+	}
+
+	/*
+	**	Could not find element so return failure condition.
+	*/
+	return(false);
+}
+
+
+/***********************************************************************************************
+ * IndexClass<T>::Fetch_By_Index -- Fetch data from specified index.                           *
+ *                                                                                             *
+ *    This routine will find the specified index and return the data value associated with it. *
+ *                                                                                             *
+ * INPUT:   id -- The index ID to search for.                                                  *
+ *                                                                                             *
+ * OUTPUT:  Returns with the data value associated with the index value.                       *
+ *                                                                                             *
+ * WARNINGS:   This routine presumes that the index exists. If it doesn't exist, then the      *
+ *             default constructed object "T" is returned instead. To avoid this problem,      *
+ *             always verfiy the existance of the index by calling Is_Present() first.         *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+#ifdef __BORLANDC__
+#pragma warn -def
+#endif
+template<class INDEX, class T>
+T const & IndexClass<INDEX, T>::operator [] (INDEX const & id) const
+{
+	if (Is_Present(id)) {
+
+		/*
+		**	Count on the fact that the archive pointer is always valid after a call to Is_Present
+		**	that returns "true".
+		*/
+		return(Archive->Data);
+	}
+	static T x;
+	return(x);
+}
+#ifdef __BORLANDC__
+#pragma warn .def
+#endif
+
+
+
+template<class INDEX, class T>
+T const & IndexClass<INDEX, T>::Fetch_By_Position(int pos) const
+{
+	assert(pos < IndexCount);
+	return(IndexTable[pos].Data);
+}
+
+
+/***********************************************************************************************
+ * IndexClass<T>::Is_Archive_Same -- Checks to see if archive pointer is same as index.        *
+ *                                                                                             *
+ *    This routine compares the specified index ID with the previously recorded index archive  *
+ *    pointer in order to determine if they match.                                             *
+ *                                                                                             *
+ * INPUT:   id -- The index ID to compare to the archive index object pointer.                 *
+ *                                                                                             *
+ * OUTPUT:  bool; Does the specified index match the archive pointer?                          *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+bool IndexClass<INDEX, T>::Is_Archive_Same(INDEX const & id) const
+{
+	if (Archive != 0 && Archive->ID == id) {
+		return(true);
+	}
+	return(false);
+}
+
+
+/***********************************************************************************************
+ * IndexClass<T>::Invalidate_Archive -- Invalidate the archive pointer.                        *
+ *                                                                                             *
+ *    This routine will set the archive pointer to an invalid state. This must be performed    *
+ *    if ever the archive pointer would become illegal (such as when the element it refers to  *
+ *    is deleted).                                                                             *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+void IndexClass<INDEX, T>::Invalidate_Archive(void) const
+{
+	Archive = 0;
+}
+
+
+/***********************************************************************************************
+ * IndexClass<T>::Set_Archive -- Records the node pointer into the archive.                    *
+ *                                                                                             *
+ *    This routine records the specified node pointer. Use this routine when there is a        *
+ *    good chance that the specified node will be requested in the immediate future.           *
+ *                                                                                             *
+ * INPUT:   node  -- Pointer to the node to assign to the archive.                             *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+void IndexClass<INDEX, T>::Set_Archive(NodeElement const * node) const
+{
+	Archive = node;
+}
+
+
+/***********************************************************************************************
+ * IndexClass<T>::Add_Index -- Add element to index tracking system.                           *
+ *                                                                                             *
+ *    This routine will record the index information into this index manager object. It        *
+ *    associates the index number with the data specified. The data is copied to an internal   *
+ *    storage location.                                                                        *
+ *                                                                                             *
+ * INPUT:   id    -- The ID number to associate with the data.                                 *
+ *                                                                                             *
+ *          data  -- The data to store.                                                        *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the element added without error? Failure indicates that RAM has been     *
+ *                exhausted.                                                                   *
+ *                                                                                             *
+ * WARNINGS:   The data is COPIED to internal storage. This means that the data object must    *
+ *             have a functional and efficient copy constructor and assignment operator.       *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+bool IndexClass<INDEX, T>::Add_Index(INDEX const & id, T const & data)
+{
+#ifdef RTS_DEBUG
+	/*
+	**	Ensure that two elements with the same index are not added to the
+	**	array.
+	*/
+	for (int index = 0; index < IndexCount; index++) {
+		assert(IndexTable[index].ID != id);
+	}
+#endif
+
+	/*
+	**	Ensure that there is enough room to add this index. If not, then increase the
+	**	capacity of the internal index table.
+	*/
+	if (IndexCount + 1 > IndexSize) {
+		if (!Increase_Table_Size(IndexSize == 0 ? 10 : IndexSize)) {
+
+			/*
+			**	Failure to increase the size of the index table means failure to add
+			**	the index element.
+			*/
+			return(false);
+		}
+	}
+
+	/*
+	**	Add the data to the end of the index data and then sort the index table.
+	*/
+	IndexTable[IndexCount].ID = id;
+	IndexTable[IndexCount].Data = data;
+	IndexCount++;
+	IsSorted = false;
+
+	return(true);
+}
+
+
+/***********************************************************************************************
+ * IndexClass<T>::Remove_Index -- Find matching index and remove it from system.               *
+ *                                                                                             *
+ *    This will scan through the previously added index elements and if a match was found, it  *
+ *    will be removed.                                                                         *
+ *                                                                                             *
+ * INPUT:   id -- The index ID to search for and remove.                                       *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the index element found and removed?                                     *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+bool IndexClass<INDEX, T>::Remove_Index(INDEX const & id)
+{
+	/*
+	**	Find the array index into the table that matches the specified id value.
+	*/
+	int found_index = -1;
+	for (int index = 0; index < IndexCount; index++) {
+		if (IndexTable[index].ID == id) {
+			found_index = index;
+			break;
+		}
+	}
+
+	/*
+	**	Trying to remove something that isn't there could be an
+	**	error in the calling routine?
+	*/
+//	assert(found_index);
+
+	/*
+	**	If the array index was found, then copy all higher index entries
+	**	downward to fill the vacated location. We cannot use memcpy here because the type
+	**	object may not support raw copies. C++ defines the assignment operator to deal
+	**	with this, so that is what we use.
+	*/
+	if (found_index != -1) {
+
+		for (int index = found_index+1; index < IndexCount; index++) {
+			IndexTable[index-1] = IndexTable[index];
+		}
+		IndexCount--;
+
+		NodeElement fake;
+		fake.ID = 0;
+		fake.Data = T();
+		IndexTable[IndexCount] = fake;		// zap last (now unused) element
+
+		Invalidate_Archive();
+		return(true);
+	}
+
+	return(false);
+}
+
+
+/***********************************************************************************************
+ * compfunc -- Support function for bsearch and bsort.                                         *
+ *                                                                                             *
+ *    This compare function presumes that its parameters are pointing to NodeElements and that *
+ *    the first "int" in the node is the index ID number to be used for comparison.            *
+ *                                                                                             *
+ * INPUT:   ptr1  -- Pointer to first node.                                                    *
+ *                                                                                             *
+ *          ptr2  -- Pointer to second node.                                                   *
+ *                                                                                             *
+ * OUTPUT:  Returns with the comparision value between the two nodes.                          *
+ *                                                                                             *
+ * WARNINGS:   This is highly dependant upon the layout of the NodeElement structure.          *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+int _USERENTRY IndexClass<INDEX, T>::search_compfunc(void const * ptr1, void const * ptr2)
+{
+	if (*(int const *)ptr1 == *(int const *)ptr2) {
+		return(0);
+	}
+	if (*(int const *)ptr1 < *(int const *)ptr2) {
+		return(-1);
+	}
+	return(1);
+}
+
+
+/***********************************************************************************************
+ * IndexClass<T>::Search_For_Node -- Perform a search for the specified node ID                *
+ *                                                                                             *
+ *    This routine will perform a binary search on the previously recorded index values and    *
+ *    if a match was found, it will return a pointer to the NodeElement.                       *
+ *                                                                                             *
+ * INPUT:   id -- The index ID to search for.                                                  *
+ *                                                                                             *
+ * OUTPUT:  Returns with a pointer to the NodeElement that matches the index ID specified. If  *
+ *          no matching index could be found, then NULL is returned.                           *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/02/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class INDEX, class T>
+#ifdef __BORLANDC__
+NodeElement const * IndexClass<INDEX, T>::Search_For_Node(INDEX const & id) const
+#else
+typename IndexClass<INDEX, T>::NodeElement const * IndexClass<INDEX, T>::Search_For_Node(INDEX const & id) const
+#endif
+{
+	/*
+	**	If there are no elements in the list, then it certainly can't find any matches.
+	*/
+	if (IndexCount == 0) {
+		return(0);
+	}
+
+	/*
+	**	If the list has not yet been sorted, then do so now. Binary searching requires
+	**	the list to be sorted.
+	*/
+	if (!IsSorted) {
+		qsort(&IndexTable[0], IndexCount, sizeof(IndexTable[0]), search_compfunc);
+		Invalidate_Archive();
+		IsSorted = true;
+	}
+
+	/*
+	**	This list is sorted and ready to perform a binary search upon it.
+	*/
+	NodeElement node;
+	node.ID = id;
+	return(Binary_Search(IndexTable, IndexCount, node));
+//	return((NodeElement const *)bsearch(&node, &IndexTable[0], IndexCount, sizeof(IndexTable[0]), search_compfunc));
+}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/INI.H b/Core/Libraries/Source/WWVegas/WWLib/INI.H
deleted file mode 100644
index a59f1d32a16..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/INI.H
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/wwlib/ini.h                                  $*
- *                                                                                             *
- *                      $Author:: Steve_t                                                     $*
- *                                                                                             *
- *                     $Modtime:: 11/14/01 1:32a                                              $*
- *                                                                                             *
- *                    $Revision:: 16                                                          $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef INI_H
-#define INI_H
-
-#include <wchar.h>
-
-//#include	"listnode.h"
-//#include	"trect.h"
-//#include	"index.h"
-
-//#include	"pipe.h"
-//#include	"pk.h"
-//#include	"straw.h"
-//#include	"wwfile.h"
-
-class FileClass;
-class Straw;
-class Pipe;
-class StringClass;
-class WideStringClass;
-class FileFactoryClass;
-
-struct INISection;
-struct INIEntry;
-
-template<class T> class TPoint3D;
-template<class T> class TPoint2D;
-template<class T> class TRect;
-template<class T> class List;
-template<class T, class U> class IndexClass;
-
-#ifndef NULL
-#define NULL 0L
-#endif
-
-/*
-**	This is an INI database handler class. It handles a database with a disk format identical
-**	to the INI files commonly used by Windows.
-*/
-class INIClass {
-	public:
-		INIClass(void);
-		INIClass(FileClass & file);
-		INIClass(const char *filename);
-
-		virtual ~INIClass(void);
-
-		/*
-		** This setting allows you to control the behavior of loading blank entries.
-		** If you set this to true, a blank entry (ie. "foo=") will be loaded with
-		** a value of " ". If set to false, blank entries will be ignored.
-		** The default behavior is to ignore blank entries.
-		** This is a static method, because in general this is an application-level
-		** decision as opposed to a per-ini file decision.
-		*/
-		static void Keep_Blank_Entries(bool keep_blanks);
-
-		/*
-		**	Fetch and store INI data.
-		*/
-		int Load(FileClass & file);
-		int Load(Straw & file);
-		int Load(const char *filename);
-		int Save(FileClass & file) const;
-		int Save(Pipe & file) const;
-		int Save(const char *filename) const;
-
-		/*
-		** Fetch the name of the INI file (if it wasn't created from a Straw).
-		*/
-		const char * Get_Filename(void) const;
-
-		/*
-		**	Erase all data within this INI file manager.
-		*/
-		bool Clear(char const * section = NULL, char const * entry = NULL);
-
-//		int Line_Count(char const * section) const;
-		bool Is_Loaded(void) const;
-		int Size(void) const;
-		bool Is_Present(char const * section, char const * entry = NULL) const {if (entry == 0) return(Find_Section(section) != 0);return(Find_Entry(section, entry) != 0);}
-
-		/*
-		**	Fetch the number of sections in the INI file or verify if a specific
-		**	section is present.
-		*/
-		int Section_Count(void) const;
-		bool Section_Present(char const * section) const {return(Find_Section(section) != NULL);}
-
-		/*
-		**	Fetch the number of entries in a section or get a particular entry in a section.
-		*/
-		int Entry_Count(char const * section) const;
-		char const * Get_Entry(char const * section, int index) const;
-
-		/*
-		**	Cound how many entries with the indicated prefix followed by a number exist in the section.
-		*/
-		unsigned Enumerate_Entries(const char * section, const char * entry_prefix, unsigned startnumber = 0, unsigned endnumber = (unsigned) -1);
-
-		/*
-		**	Get the various data types from the section and entry specified.
-		*/
-		bool Get_Bool(char const * section, char const * entry, bool defvalue=false) const;
-		float Get_Float(char const * section, char const * entry, float defvalue=0.0f) const;
-		double Get_Double(char const * section, char const * entry, double defvalue=0.0) const;
-		int Get_Hex(char const * section, char const * entry, int defvalue=0) const;
-		int Get_Int(char const * section, char const * entry, int defvalue=0) const;
-		int Get_String(char const * section, char const * entry, char const * defvalue, char * buffer, int size) const;
-		const StringClass& Get_String(StringClass& new_string, char const * section, char const * entry, char const * defvalue="") const;
-		const WideStringClass& Get_Wide_String(WideStringClass& new_string, char const * section, char const * entry, wchar_t const * defvalue=L"") const;
-		int Get_List_Index(char const * section, char const * entry, int const defvalue, char *list[]);
-		int *	Get_Alloc_Int_Array(char const * section, char const * entry, int listend);
-		int Get_Int_Bitfield(char const * section, char const * entry, int defvalue, char *list[]);
-		char *Get_Alloc_String(char const * section, char const * entry, char const * defvalue) const;
-		int Get_TextBlock(char const * section, char * buffer, int len) const;
-		int Get_UUBlock(char const * section, void * buffer, int len) const;
-		int Get_UUBlock(char const * section, char const *entry, void * block, int len) const;
-		TRect<int> const Get_Rect(char const * section, char const * entry, TRect<int> const & defvalue) const;
-		TPoint3D<int> const Get_Point(char const * section, char const * entry, TPoint3D<int> const & defvalue) const;
-		TPoint2D<int> const Get_Point(char const * section, char const * entry, TPoint2D<int> const & defvalue) const;
-		TPoint3D<float> const Get_Point(char const * section, char const * entry, TPoint3D<float> const & defvalue) const;
-		TPoint2D<float> const Get_Point(char const * section, char const * entry, TPoint2D<float> const & defvalue) const;
-
-
-
-		/*
-		**	Put a data type to the section and entry specified.
-		*/
-		bool Put_Bool(char const * section, char const * entry, bool value);
-		bool Put_Float(char const * section, char const * entry, float number);
-		bool Put_Double(char const * section, char const * entry, double number);
-		bool Put_Hex(char const * section, char const * entry, int number);
-		bool Put_Int(char const * section, char const * entry, int number, int format=0);
-		bool Put_String(char const * section, char const * entry, char const * string);
-		bool Put_TextBlock(char const * section, char const * text);
-		bool Put_UUBlock(char const * section, void const * block, int len);
-		bool Put_UUBlock(char const * section, char const *entry, void const * block, int len);
-		bool Put_Rect(char const * section, char const * entry, TRect<int> const & value);
-		bool Put_Point(char const * section, char const * entry, TPoint3D<int> const & value);
-		bool Put_Point(char const * section, char const * entry, TPoint3D<float> const & value);
-		bool Put_Point(char const * section, char const * entry, TPoint2D<int> const & value);
-		bool Put_Wide_String(char const * section, char const * entry, wchar_t const * string);
-
-//	protected:
-
-		// Declared here, but assigned a value in ini.cpp. This is done so that we
-		// can change this value in the future without needed to rebuild the entire world.
-		static const int MAX_LINE_LENGTH;
-
-		/*
-		**	Access to the list of all sections within this INI file.
-		*/
-		List<INISection *> & Get_Section_List() { return * SectionList; }
-
-		IndexClass<int, INISection *> & Get_Section_Index() { return * SectionIndex; }
-
-
-		/*
-		**	Utility routines to help find the appropriate section and entry objects.
-		*/
-		INISection * Find_Section(char const * section) const;
-		INIEntry * Find_Entry(char const * section, char const * entry) const;
-		static void Strip_Comments(char * buffer);
-
-		// the CRC function is used to produce hopefully unique values for
-		// each of the entries in a section. Debug messages will be produced
-		// if redundant CRCs are generated for a particular INI file.
-		static int CRC(const char *string);
-
-		// the DuplicateCRCError function is used by Put_String and Load in the case
-		// that an entry's CRC matches one already in the database.
-		void DuplicateCRCError(const char *message, const char *section, const char *entry);
-
-	private:
-
-		/*
-		**	These functions are used to allocate and free the section list and section index
-		*/
-		void Initialize(void);
-		void Shutdown(void);
-
-		/*
-		**	This is the list of all sections within this INI file.
-		*/
-		List<INISection *> * SectionList;
-
-		IndexClass<int, INISection *> * SectionIndex;
-
-		/*
-		**	Ensure that the copy constructor and assignment operator never exist.
-		*/
-		INIClass(INIClass const & rvalue);
-		INIClass operator = (INIClass const & rvalue);
-
-		/*
-		** The name of the file we were loaded from (if applicable).
-		*/
-		mutable char * Filename;
-
-		/*
-		** The flag used to control the blank entry loading behavior.
-		*/
-		static bool KeepBlankEntries;
-};
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/INI.h b/Core/Libraries/Source/WWVegas/WWLib/INI.h
new file mode 100644
index 00000000000..dcfa6a631ce
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/INI.h
@@ -0,0 +1,239 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/ini.h                                  $*
+ *                                                                                             *
+ *                      $Author:: Steve_t                                                     $*
+ *                                                                                             *
+ *                     $Modtime:: 11/14/01 1:32a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 16                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include <wchar.h>
+
+//#include	"listnode.h"
+//#include	"trect.h"
+//#include	"index.h"
+
+//#include	"pipe.h"
+//#include	"pk.h"
+//#include	"straw.h"
+//#include	"wwfile.h"
+
+class FileClass;
+class Straw;
+class Pipe;
+class StringClass;
+class WideStringClass;
+class FileFactoryClass;
+
+struct INISection;
+struct INIEntry;
+
+template<class T> class TPoint3D;
+template<class T> class TPoint2D;
+template<class T> class TRect;
+template<class T> class List;
+template<class T, class U> class IndexClass;
+
+#ifndef NULL
+#define NULL 0L
+#endif
+
+/*
+**	This is an INI database handler class. It handles a database with a disk format identical
+**	to the INI files commonly used by Windows.
+*/
+class INIClass {
+	public:
+		INIClass(void);
+		INIClass(FileClass & file);
+		INIClass(const char *filename);
+
+		virtual ~INIClass(void);
+
+		/*
+		** This setting allows you to control the behavior of loading blank entries.
+		** If you set this to true, a blank entry (ie. "foo=") will be loaded with
+		** a value of " ". If set to false, blank entries will be ignored.
+		** The default behavior is to ignore blank entries.
+		** This is a static method, because in general this is an application-level
+		** decision as opposed to a per-ini file decision.
+		*/
+		static void Keep_Blank_Entries(bool keep_blanks);
+
+		/*
+		**	Fetch and store INI data.
+		*/
+		int Load(FileClass & file);
+		int Load(Straw & file);
+		int Load(const char *filename);
+		int Save(FileClass & file) const;
+		int Save(Pipe & file) const;
+		int Save(const char *filename) const;
+
+		/*
+		** Fetch the name of the INI file (if it wasn't created from a Straw).
+		*/
+		const char * Get_Filename(void) const;
+
+		/*
+		**	Erase all data within this INI file manager.
+		*/
+		bool Clear(char const * section = NULL, char const * entry = NULL);
+
+//		int Line_Count(char const * section) const;
+		bool Is_Loaded(void) const;
+		int Size(void) const;
+		bool Is_Present(char const * section, char const * entry = NULL) const {if (entry == 0) return(Find_Section(section) != 0);return(Find_Entry(section, entry) != 0);}
+
+		/*
+		**	Fetch the number of sections in the INI file or verify if a specific
+		**	section is present.
+		*/
+		int Section_Count(void) const;
+		bool Section_Present(char const * section) const {return(Find_Section(section) != NULL);}
+
+		/*
+		**	Fetch the number of entries in a section or get a particular entry in a section.
+		*/
+		int Entry_Count(char const * section) const;
+		char const * Get_Entry(char const * section, int index) const;
+
+		/*
+		**	Cound how many entries with the indicated prefix followed by a number exist in the section.
+		*/
+		unsigned Enumerate_Entries(const char * section, const char * entry_prefix, unsigned startnumber = 0, unsigned endnumber = (unsigned) -1);
+
+		/*
+		**	Get the various data types from the section and entry specified.
+		*/
+		bool Get_Bool(char const * section, char const * entry, bool defvalue=false) const;
+		float Get_Float(char const * section, char const * entry, float defvalue=0.0f) const;
+		double Get_Double(char const * section, char const * entry, double defvalue=0.0) const;
+		int Get_Hex(char const * section, char const * entry, int defvalue=0) const;
+		int Get_Int(char const * section, char const * entry, int defvalue=0) const;
+		int Get_String(char const * section, char const * entry, char const * defvalue, char * buffer, int size) const;
+		const StringClass& Get_String(StringClass& new_string, char const * section, char const * entry, char const * defvalue="") const;
+		const WideStringClass& Get_Wide_String(WideStringClass& new_string, char const * section, char const * entry, wchar_t const * defvalue=L"") const;
+		int Get_List_Index(char const * section, char const * entry, int const defvalue, char *list[]);
+		int *	Get_Alloc_Int_Array(char const * section, char const * entry, int listend);
+		int Get_Int_Bitfield(char const * section, char const * entry, int defvalue, char *list[]);
+		char *Get_Alloc_String(char const * section, char const * entry, char const * defvalue) const;
+		int Get_TextBlock(char const * section, char * buffer, int len) const;
+		int Get_UUBlock(char const * section, void * buffer, int len) const;
+		int Get_UUBlock(char const * section, char const *entry, void * block, int len) const;
+		TRect<int> const Get_Rect(char const * section, char const * entry, TRect<int> const & defvalue) const;
+		TPoint3D<int> const Get_Point(char const * section, char const * entry, TPoint3D<int> const & defvalue) const;
+		TPoint2D<int> const Get_Point(char const * section, char const * entry, TPoint2D<int> const & defvalue) const;
+		TPoint3D<float> const Get_Point(char const * section, char const * entry, TPoint3D<float> const & defvalue) const;
+		TPoint2D<float> const Get_Point(char const * section, char const * entry, TPoint2D<float> const & defvalue) const;
+
+
+
+		/*
+		**	Put a data type to the section and entry specified.
+		*/
+		bool Put_Bool(char const * section, char const * entry, bool value);
+		bool Put_Float(char const * section, char const * entry, float number);
+		bool Put_Double(char const * section, char const * entry, double number);
+		bool Put_Hex(char const * section, char const * entry, int number);
+		bool Put_Int(char const * section, char const * entry, int number, int format=0);
+		bool Put_String(char const * section, char const * entry, char const * string);
+		bool Put_TextBlock(char const * section, char const * text);
+		bool Put_UUBlock(char const * section, void const * block, int len);
+		bool Put_UUBlock(char const * section, char const *entry, void const * block, int len);
+		bool Put_Rect(char const * section, char const * entry, TRect<int> const & value);
+		bool Put_Point(char const * section, char const * entry, TPoint3D<int> const & value);
+		bool Put_Point(char const * section, char const * entry, TPoint3D<float> const & value);
+		bool Put_Point(char const * section, char const * entry, TPoint2D<int> const & value);
+		bool Put_Wide_String(char const * section, char const * entry, wchar_t const * string);
+
+//	protected:
+
+		// Declared here, but assigned a value in ini.cpp. This is done so that we
+		// can change this value in the future without needed to rebuild the entire world.
+		static const int MAX_LINE_LENGTH;
+
+		/*
+		**	Access to the list of all sections within this INI file.
+		*/
+		List<INISection *> & Get_Section_List() { return * SectionList; }
+
+		IndexClass<int, INISection *> & Get_Section_Index() { return * SectionIndex; }
+
+
+		/*
+		**	Utility routines to help find the appropriate section and entry objects.
+		*/
+		INISection * Find_Section(char const * section) const;
+		INIEntry * Find_Entry(char const * section, char const * entry) const;
+		static void Strip_Comments(char * buffer);
+
+		// the CRC function is used to produce hopefully unique values for
+		// each of the entries in a section. Debug messages will be produced
+		// if redundant CRCs are generated for a particular INI file.
+		static int CRC(const char *string);
+
+		// the DuplicateCRCError function is used by Put_String and Load in the case
+		// that an entry's CRC matches one already in the database.
+		void DuplicateCRCError(const char *message, const char *section, const char *entry);
+
+	private:
+
+		/*
+		**	These functions are used to allocate and free the section list and section index
+		*/
+		void Initialize(void);
+		void Shutdown(void);
+
+		/*
+		**	This is the list of all sections within this INI file.
+		*/
+		List<INISection *> * SectionList;
+
+		IndexClass<int, INISection *> * SectionIndex;
+
+		/*
+		**	Ensure that the copy constructor and assignment operator never exist.
+		*/
+		INIClass(INIClass const & rvalue);
+		INIClass operator = (INIClass const & rvalue);
+
+		/*
+		** The name of the file we were loaded from (if applicable).
+		*/
+		mutable char * Filename;
+
+		/*
+		** The flag used to control the blank entry loading behavior.
+		*/
+		static bool KeepBlankEntries;
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H b/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H
deleted file mode 100644
index b455defb136..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/wwlib/listnode.h                             $*
- *                                                                                             *
- *                      $Author:: Ian_l                                                       $*
- *                                                                                             *
- *                     $Modtime:: 9/20/01 9:46p                                               $*
- *                                                                                             *
- *                    $Revision:: 4                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef LISTNODE_H
-#define LISTNODE_H
-
-
-/*
-** Includes
-*/
-#include	"assert.h"
-
-
-#ifdef __BORLANDC__
-#pragma warn -inl
-#endif
-
-
-/*
-**	This is a doubly linked list node. Typical use of this node is to derive
-**	objects from this node. The interface class for this node can be used for
-**	added convenience.
-*/
-class GenericList;
-class GenericNode {
-	public:
-		GenericNode(void) : NextNode(0), PrevNode(0) {}
-		virtual ~GenericNode(void) {Unlink();}
-		GenericNode(GenericNode & node) {node.Link(this);}
-		GenericNode & operator = (GenericNode & node) {
-			if (&node != this) {
-				node.Link(this);
-			}
-			return(*this);
-		}
-
-		void Unlink(void) {
-			// note that this means that the special generic node at the head
-			// and tail of the list can not be unlinked.  This is done because
-			// the user should never unlink them -- it will destroy the list in
-			// an evil way.  
-			if (Is_Valid()) {
-				PrevNode->NextNode = NextNode;
-				NextNode->PrevNode = PrevNode;
-				PrevNode = 0;
-				NextNode = 0;
-			}
-		}
-
-		GenericList * Main_List(void) const {
-			GenericNode const * node = this;
-			while (node->PrevNode) {
-				node = PrevNode;
-			}
-			return((GenericList *)this);
-		}
-		void Link(GenericNode * node) {
-			assert(node != (GenericNode *)0);
-			node->Unlink();
-			node->NextNode = NextNode;
-			node->PrevNode = this;
-			if (NextNode) NextNode->PrevNode = node;
-			NextNode = node;
-		}
-
-		GenericNode * Next(void) const {return(NextNode);}
-		GenericNode * Next_Valid(void) const {
-			return ((NextNode && NextNode->NextNode) ? NextNode : (GenericNode *)0);
-		}
-		GenericNode * Prev(void) const {return(PrevNode);}
-		GenericNode * Prev_Valid(void) const {
-			return ((PrevNode && PrevNode->PrevNode) ? PrevNode : (GenericNode *)0);
-		}
-		bool Is_Valid(void) const {return(this != (GenericNode *)0 && NextNode != (GenericNode *)0 && PrevNode != (GenericNode *)0);}
-
-	protected:
-		GenericNode * NextNode;
-		GenericNode * PrevNode;
-};
-
-
-/*
-**	This is a generic list handler. It manages N generic nodes. Use the interface class
-**	to the generic list for added convenience.
-*/											  
-class GenericList {
-	public:
-		GenericList(void) {
-			FirstNode.Link(&LastNode);
-		}
-
-	
-		virtual ~GenericList(void) {
-			while (FirstNode.Next()->Is_Valid()) {
-				FirstNode.Next()->Unlink();
-			}
-		}
-
-		GenericNode * First(void) const {return(FirstNode.Next());}
-		GenericNode * First_Valid(void) const 
-		{
-			GenericNode *node = FirstNode.Next();
-			return (node->Next() ? node : (GenericNode *)0);
-		}
-
-		GenericNode * Last(void) const {return(LastNode.Prev());}
-		GenericNode * Last_Valid(void) const
-		{
-			GenericNode *node = LastNode.Prev();
-			return (node->Prev() ? node : (GenericNode *)0);
-		}
-
-		bool Is_Empty(void) const {return(!FirstNode.Next()->Is_Valid());}
-		void Add_Head(GenericNode * node) {FirstNode.Link(node);}
-		void Add_Tail(GenericNode * node) {LastNode.Prev()->Link(node);}
-//		void Delete(void) {while (FirstNode.Next()->Is_Valid()) delete FirstNode.Next();}
-
-		int Get_Valid_Count(void) const 
-		{
-			GenericNode * node = First_Valid();
-			int counter = 0;
-			while(node) {
-				counter++;
-				node = node->Next_Valid();
-			}
-			return counter;
-		}
-
-	protected:
-		GenericNode FirstNode;
-		GenericNode LastNode;
-
-	private:
-		GenericList(GenericList & list);
-		GenericList & operator = (GenericList const &);
-};
-
-
-
-/*
-**	This node class serves only as an "interface class" for the normal node
-**	object. In order to use this interface class you absolutely must be sure
-**	that the node is the root base object of the "class T". If it is true that the
-**	address of the node is the same as the address of the "class T", then this
-**	interface class will work. You can usually ensure this by deriving the
-**	class T object from this node.
-*/
-template<class T> class List;
-template<class T>
-class Node : public GenericNode {
-	public:
-		List<T> * Main_List(void) const {return((List<T> *)GenericNode::Main_List());}
-		T Next(void) const {return((T)GenericNode::Next());}
-		T Next_Valid(void) const {return((T)GenericNode::Next_Valid());}
-		T Prev(void) const {return((T)GenericNode::Prev());}
-		T Prev_Valid(void) const {return((T)GenericNode::Prev_Valid());}
-		bool Is_Valid(void) const {return(GenericNode::Is_Valid());}
-};
-
-
-/*
-**	This is an "interface class" for a list of nodes. The rules for the class T object
-**	are the same as the requirements required of the node class.
-*/
-template<class T>
-class List : public GenericList {
-	public:
-		List(void) {};
-
-		T First(void) const {return((T)GenericList::First());}
-		T First_Valid(void) const {return((T)GenericList::First_Valid());}
-		T Last(void) const {return((T)GenericList::Last());}
-		T Last_Valid(void) const {return((T)GenericList::Last_Valid());}
-		void Delete(void) {while (First()->Is_Valid()) delete First();}
-
-	private:
-		List(List<T> const & rvalue);
-		List<T> operator = (List<T> const & rvalue);
-};
-
-
-/*
-
-  The DataNode template class allows you to have a node with a peice of data associated with it.
-  Commonly used to maintain a list of objects which are not derived from GenericNode.
-		- EHC
-*/
-
-template<class T>
-class DataNode : public GenericNode {
-	T Value;
-public:
-	DataNode() {};
-	DataNode(T value) { Set(value); };
-	void Set(T value) { Value = value; };
-	T Get() const { return Value; };
-
-	DataNode<T> * Next(void) const { return (DataNode<T> *)GenericNode::Next(); }
-	DataNode<T> * Next_Valid(void) const { return (DataNode<T> *)GenericNode::Next_Valid(); }
-	DataNode<T> * Prev(void) const { return (DataNode<T> *)GenericNode::Prev(); }
-	DataNode<T> * Prev_Valid(void) const { return (DataNode<T> *)GenericNode::Prev_Valid(); }
-};
-
-
-
-/*
-
-	The ContextDataNode template class is an extension of the DataNode class and has an additional
-	data value associated with it. Commonly used for tracking the owner of a DataNode.
-		- EHC
-*/
-template<class C, class D>
-class ContextDataNode : public DataNode<D> {
-	C Context;
-public:
-	ContextDataNode() {};
-	ContextDataNode(C context, D data) { Set_Context(context); Set(data); }
-	void Set_Context(C context) { Context = context; };
-	C Get_Context() { return Context; };
-};
-
-
-/*
-**	A SafeContextDataNode requires the user to supply context and
-** Data values to the constructor. This eliminates the problem of
-** uninitialized ContextDataNodes. -DRM
-*/
-template<class C, class D>
-class SafeContextDataNode : public ContextDataNode<C,D>
-{
-public:
-	SafeContextDataNode(C context, D data) : ContextDataNode<C,D>(context, data) { }
-private:
-	// if the compiler complains that it can't access this constructor,
-	// you are trying to construct a SafeContextDataNode without providing
-	// context and data values. Perhaps you've included a SafeContextDataNode
-	// as a member variable, but forgotten to add it to the initializer list
-	// in your class constructor. 
-	// DO NOT change the void constructor to public. That would defeat
-	// the purpose of the SafeContextDataNode. -DRM
-	SafeContextDataNode();
-};
-
-
-/*
-	The DoubleNode class has double everything a DataNode has!
-	Each DataNode's data member points to the DoubleNode object
-	that owns it. This type of object can therefore be in two distinct
-	lists, and when it is destroyed it is removed from both of them
-	automatically.
-
-	usage example:
-
-	typedef a symbol for the usage of the DoubleNode class as such:
-
-		typedef DoubleNode<int, bool> DOUBLENODE;
-
-	declare the head of the list as a DataNode with type DOUBLENODE
-
-		List<DOUBLENODE *> PrimaryList; // member of object1
-		List<DOUBLENODE *> SecondaryList; // member of object2
-
-	Iterate through the list starting at PrimaryList or SecondaryList.
-	These two lists are intended to be located in different
-	objects, such as an Active list and an Association list as used in G
-	Planet mode.
-*/
-template<class PRIMARY, class SECONDARY>
-class DoubleNode {
-	void Initialize() { Primary.Set(this); Secondary.Set(this); };
-	PRIMARY PrimaryValue;
-	SECONDARY SecondaryValue;
-
-public:
-	typedef DoubleNode<PRIMARY, SECONDARY> Type;
-
-	DataNode<Type *> Primary;
-	DataNode<Type *> Secondary;
-
-	DoubleNode() { Initialize(); };
-	DoubleNode(PRIMARY primary, SECONDARY secondary) { Initialize(); Set_Primary(primary); Set_Secondary(secondary); };
-	void Set_Primary(PRIMARY value) { PrimaryValue = value; };
-	void Set_Secondary(SECONDARY value) { SecondaryValue = value; };
-	PRIMARY Get_Primary() { return PrimaryValue; };
-	SECONDARY Get_Secondary() { return SecondaryValue; };
-	void Unlink() { Primary.Unlink(); Secondary.Unlink(); };
-};
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.h b/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.h
new file mode 100644
index 00000000000..159552c1e1a
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.h
@@ -0,0 +1,318 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/listnode.h                             $*
+ *                                                                                             *
+ *                      $Author:: Ian_l                                                       $*
+ *                                                                                             *
+ *                     $Modtime:: 9/20/01 9:46p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 4                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+/*
+** Includes
+*/
+#include	"assert.h"
+
+
+#ifdef __BORLANDC__
+#pragma warn -inl
+#endif
+
+
+/*
+**	This is a doubly linked list node. Typical use of this node is to derive
+**	objects from this node. The interface class for this node can be used for
+**	added convenience.
+*/
+class GenericList;
+class GenericNode {
+	public:
+		GenericNode(void) : NextNode(0), PrevNode(0) {}
+		virtual ~GenericNode(void) {Unlink();}
+		GenericNode(GenericNode & node) {node.Link(this);}
+		GenericNode & operator = (GenericNode & node) {
+			if (&node != this) {
+				node.Link(this);
+			}
+			return(*this);
+		}
+
+		void Unlink(void) {
+			// note that this means that the special generic node at the head
+			// and tail of the list can not be unlinked.  This is done because
+			// the user should never unlink them -- it will destroy the list in
+			// an evil way.
+			if (Is_Valid()) {
+				PrevNode->NextNode = NextNode;
+				NextNode->PrevNode = PrevNode;
+				PrevNode = 0;
+				NextNode = 0;
+			}
+		}
+
+		GenericList * Main_List(void) const {
+			GenericNode const * node = this;
+			while (node->PrevNode) {
+				node = PrevNode;
+			}
+			return((GenericList *)this);
+		}
+		void Link(GenericNode * node) {
+			assert(node != (GenericNode *)0);
+			node->Unlink();
+			node->NextNode = NextNode;
+			node->PrevNode = this;
+			if (NextNode) NextNode->PrevNode = node;
+			NextNode = node;
+		}
+
+		GenericNode * Next(void) const {return(NextNode);}
+		GenericNode * Next_Valid(void) const {
+			return ((NextNode && NextNode->NextNode) ? NextNode : (GenericNode *)0);
+		}
+		GenericNode * Prev(void) const {return(PrevNode);}
+		GenericNode * Prev_Valid(void) const {
+			return ((PrevNode && PrevNode->PrevNode) ? PrevNode : (GenericNode *)0);
+		}
+		bool Is_Valid(void) const {return(this != (GenericNode *)0 && NextNode != (GenericNode *)0 && PrevNode != (GenericNode *)0);}
+
+	protected:
+		GenericNode * NextNode;
+		GenericNode * PrevNode;
+};
+
+
+/*
+**	This is a generic list handler. It manages N generic nodes. Use the interface class
+**	to the generic list for added convenience.
+*/
+class GenericList {
+	public:
+		GenericList(void) {
+			FirstNode.Link(&LastNode);
+		}
+
+
+		virtual ~GenericList(void) {
+			while (FirstNode.Next()->Is_Valid()) {
+				FirstNode.Next()->Unlink();
+			}
+		}
+
+		GenericNode * First(void) const {return(FirstNode.Next());}
+		GenericNode * First_Valid(void) const
+		{
+			GenericNode *node = FirstNode.Next();
+			return (node->Next() ? node : (GenericNode *)0);
+		}
+
+		GenericNode * Last(void) const {return(LastNode.Prev());}
+		GenericNode * Last_Valid(void) const
+		{
+			GenericNode *node = LastNode.Prev();
+			return (node->Prev() ? node : (GenericNode *)0);
+		}
+
+		bool Is_Empty(void) const {return(!FirstNode.Next()->Is_Valid());}
+		void Add_Head(GenericNode * node) {FirstNode.Link(node);}
+		void Add_Tail(GenericNode * node) {LastNode.Prev()->Link(node);}
+//		void Delete(void) {while (FirstNode.Next()->Is_Valid()) delete FirstNode.Next();}
+
+		int Get_Valid_Count(void) const
+		{
+			GenericNode * node = First_Valid();
+			int counter = 0;
+			while(node) {
+				counter++;
+				node = node->Next_Valid();
+			}
+			return counter;
+		}
+
+	protected:
+		GenericNode FirstNode;
+		GenericNode LastNode;
+
+	private:
+		GenericList(GenericList & list);
+		GenericList & operator = (GenericList const &);
+};
+
+
+
+/*
+**	This node class serves only as an "interface class" for the normal node
+**	object. In order to use this interface class you absolutely must be sure
+**	that the node is the root base object of the "class T". If it is true that the
+**	address of the node is the same as the address of the "class T", then this
+**	interface class will work. You can usually ensure this by deriving the
+**	class T object from this node.
+*/
+template<class T> class List;
+template<class T>
+class Node : public GenericNode {
+	public:
+		List<T> * Main_List(void) const {return((List<T> *)GenericNode::Main_List());}
+		T Next(void) const {return((T)GenericNode::Next());}
+		T Next_Valid(void) const {return((T)GenericNode::Next_Valid());}
+		T Prev(void) const {return((T)GenericNode::Prev());}
+		T Prev_Valid(void) const {return((T)GenericNode::Prev_Valid());}
+		bool Is_Valid(void) const {return(GenericNode::Is_Valid());}
+};
+
+
+/*
+**	This is an "interface class" for a list of nodes. The rules for the class T object
+**	are the same as the requirements required of the node class.
+*/
+template<class T>
+class List : public GenericList {
+	public:
+		List(void) {};
+
+		T First(void) const {return((T)GenericList::First());}
+		T First_Valid(void) const {return((T)GenericList::First_Valid());}
+		T Last(void) const {return((T)GenericList::Last());}
+		T Last_Valid(void) const {return((T)GenericList::Last_Valid());}
+		void Delete(void) {while (First()->Is_Valid()) delete First();}
+
+	private:
+		List(List<T> const & rvalue);
+		List<T> operator = (List<T> const & rvalue);
+};
+
+
+/*
+
+  The DataNode template class allows you to have a node with a peice of data associated with it.
+  Commonly used to maintain a list of objects which are not derived from GenericNode.
+		- EHC
+*/
+
+template<class T>
+class DataNode : public GenericNode {
+	T Value;
+public:
+	DataNode() {};
+	DataNode(T value) { Set(value); };
+	void Set(T value) { Value = value; };
+	T Get() const { return Value; };
+
+	DataNode<T> * Next(void) const { return (DataNode<T> *)GenericNode::Next(); }
+	DataNode<T> * Next_Valid(void) const { return (DataNode<T> *)GenericNode::Next_Valid(); }
+	DataNode<T> * Prev(void) const { return (DataNode<T> *)GenericNode::Prev(); }
+	DataNode<T> * Prev_Valid(void) const { return (DataNode<T> *)GenericNode::Prev_Valid(); }
+};
+
+
+
+/*
+
+	The ContextDataNode template class is an extension of the DataNode class and has an additional
+	data value associated with it. Commonly used for tracking the owner of a DataNode.
+		- EHC
+*/
+template<class C, class D>
+class ContextDataNode : public DataNode<D> {
+	C Context;
+public:
+	ContextDataNode() {};
+	ContextDataNode(C context, D data) { Set_Context(context); Set(data); }
+	void Set_Context(C context) { Context = context; };
+	C Get_Context() { return Context; };
+};
+
+
+/*
+**	A SafeContextDataNode requires the user to supply context and
+** Data values to the constructor. This eliminates the problem of
+** uninitialized ContextDataNodes. -DRM
+*/
+template<class C, class D>
+class SafeContextDataNode : public ContextDataNode<C,D>
+{
+public:
+	SafeContextDataNode(C context, D data) : ContextDataNode<C,D>(context, data) { }
+private:
+	// if the compiler complains that it can't access this constructor,
+	// you are trying to construct a SafeContextDataNode without providing
+	// context and data values. Perhaps you've included a SafeContextDataNode
+	// as a member variable, but forgotten to add it to the initializer list
+	// in your class constructor.
+	// DO NOT change the void constructor to public. That would defeat
+	// the purpose of the SafeContextDataNode. -DRM
+	SafeContextDataNode();
+};
+
+
+/*
+	The DoubleNode class has double everything a DataNode has!
+	Each DataNode's data member points to the DoubleNode object
+	that owns it. This type of object can therefore be in two distinct
+	lists, and when it is destroyed it is removed from both of them
+	automatically.
+
+	usage example:
+
+	typedef a symbol for the usage of the DoubleNode class as such:
+
+		typedef DoubleNode<int, bool> DOUBLENODE;
+
+	declare the head of the list as a DataNode with type DOUBLENODE
+
+		List<DOUBLENODE *> PrimaryList; // member of object1
+		List<DOUBLENODE *> SecondaryList; // member of object2
+
+	Iterate through the list starting at PrimaryList or SecondaryList.
+	These two lists are intended to be located in different
+	objects, such as an Active list and an Association list as used in G
+	Planet mode.
+*/
+template<class PRIMARY, class SECONDARY>
+class DoubleNode {
+	void Initialize() { Primary.Set(this); Secondary.Set(this); };
+	PRIMARY PrimaryValue;
+	SECONDARY SecondaryValue;
+
+public:
+	typedef DoubleNode<PRIMARY, SECONDARY> Type;
+
+	DataNode<Type *> Primary;
+	DataNode<Type *> Secondary;
+
+	DoubleNode() { Initialize(); };
+	DoubleNode(PRIMARY primary, SECONDARY secondary) { Initialize(); Set_Primary(primary); Set_Secondary(secondary); };
+	void Set_Primary(PRIMARY value) { PrimaryValue = value; };
+	void Set_Secondary(SECONDARY value) { SecondaryValue = value; };
+	PRIMARY Get_Primary() { return PrimaryValue; };
+	SECONDARY Get_Secondary() { return SecondaryValue; };
+	void Unlink() { Primary.Unlink(); Secondary.Unlink(); };
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/MPU.H b/Core/Libraries/Source/WWVegas/WWLib/MPU.H
deleted file mode 100644
index 70ffd0bb8bc..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/MPU.H
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/wwlib/mpu.h                                  $*
- *                                                                                             *
- *                      $Author:: Denzil_l                                                    $*
- *                                                                                             *
- *                     $Modtime:: 8/17/01 6:11p                                               $*
- *                                                                                             *
- *                    $Revision:: 3                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#pragma once
-
-#ifndef MPU_H
-#define MPU_H
-
-unsigned long Get_CPU_Clock(unsigned long & high);
-unsigned long Get_CPU_Rate(unsigned long & high);
-
-int Get_RDTSC_CPU_Speed(void);
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/MPU.h b/Core/Libraries/Source/WWVegas/WWLib/MPU.h
new file mode 100644
index 00000000000..2321fdcff45
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/MPU.h
@@ -0,0 +1,42 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/mpu.h                                  $*
+ *                                                                                             *
+ *                      $Author:: Denzil_l                                                    $*
+ *                                                                                             *
+ *                     $Modtime:: 8/17/01 6:11p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+unsigned long Get_CPU_Clock(unsigned long & high);
+unsigned long Get_CPU_Rate(unsigned long & high);
+
+int Get_RDTSC_CPU_Speed(void);
diff --git a/Core/Libraries/Source/WWVegas/WWLib/PIPE.H b/Core/Libraries/Source/WWVegas/WWLib/PIPE.H
deleted file mode 100644
index a424ca93209..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/PIPE.H
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/PIPE.H                                             $* 
- *                                                                                             * 
- *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
- *                     $Modtime:: 4/02/99 12:00p                                              $*
- *                                                                                             * 
- *                    $Revision:: 3                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef PIPE_H
-#define PIPE_H
-
-/*
-**	A "push through" pipe interface abstract class used for such purposes as compression
-**	and translation of data. In STL terms, this is functionally similar to an output
-**	iterator but with a few enhancements. A pipe class object that is not derived into
-**	another useful class serves only as a pseudo null-pipe. It will accept data but
-**	just throw it away but pretend that it sent it somewhere.
-*/
-class Pipe
-{
-	public:
-		Pipe(void) : ChainTo(0), ChainFrom(0) {}
-		virtual ~Pipe(void);
-
-		virtual int Flush(void);
-		virtual int End(void) {return(Flush());}
-		virtual void Put_To(Pipe * pipe);
-		void Put_To(Pipe & pipe) {Put_To(&pipe);}
-		virtual int Put(void const * source, int slen);
-
-		/*
-		**	Pointer to the next pipe segment in the chain.
-		*/
-		Pipe * ChainTo;
-		Pipe * ChainFrom;
-
-	private:
-
-		/*
-		**	Disable the copy constructor and assignment operator.
-		*/
-		Pipe(Pipe & rvalue);
-		Pipe & operator = (Pipe const & pipe);
-};
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/PIPE.h b/Core/Libraries/Source/WWVegas/WWLib/PIPE.h
new file mode 100644
index 00000000000..afa979b48a0
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/PIPE.h
@@ -0,0 +1,71 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/PIPE.h                                             $*
+ *                                                                                             *
+ *                      $Author:: Eric_c                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 4/02/99 12:00p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+/*
+**	A "push through" pipe interface abstract class used for such purposes as compression
+**	and translation of data. In STL terms, this is functionally similar to an output
+**	iterator but with a few enhancements. A pipe class object that is not derived into
+**	another useful class serves only as a pseudo null-pipe. It will accept data but
+**	just throw it away but pretend that it sent it somewhere.
+*/
+class Pipe
+{
+	public:
+		Pipe(void) : ChainTo(0), ChainFrom(0) {}
+		virtual ~Pipe(void);
+
+		virtual int Flush(void);
+		virtual int End(void) {return(Flush());}
+		virtual void Put_To(Pipe * pipe);
+		void Put_To(Pipe & pipe) {Put_To(&pipe);}
+		virtual int Put(void const * source, int slen);
+
+		/*
+		**	Pointer to the next pipe segment in the chain.
+		*/
+		Pipe * ChainTo;
+		Pipe * ChainFrom;
+
+	private:
+
+		/*
+		**	Disable the copy constructor and assignment operator.
+		*/
+		Pipe(Pipe & rvalue);
+		Pipe & operator = (Pipe const & pipe);
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/Point.h b/Core/Libraries/Source/WWVegas/WWLib/Point.h
index a6577f56248..888f15fdefb 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/Point.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/Point.h
@@ -16,36 +16,32 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/Point.h                                            $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/Point.h                                            $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/07/99 5:24p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 5                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef POINT_H
-#define POINT_H
+#pragma once
 
 template<class T> class TRect;
 
 /*
 **	This class describes a point in 2 dimensional space using arbitrary
 **	components. The interpretation of which is outside the scope
-**	of this class. This class is the successor to the old style COORDINATE 
+**	of this class. This class is the successor to the old style COORDINATE
 **	and CELL types but also serves anywhere an X and Y value are treated
 **	as a logical object (e.g., pixel location).
 */
@@ -102,7 +98,7 @@ class TPoint2D {
 };
 
 template<class T>
-TPoint2D<T> const operator * (T lvalue, TPoint2D<T> const & rvalue) 
+TPoint2D<T> const operator * (T lvalue, TPoint2D<T> const & rvalue)
 {
 	return(rvalue * lvalue);
 }
@@ -137,7 +133,7 @@ class TPoint3D : public TPoint2D<T> {
 		TPoint3D(void) {}		// Default constructor does nothing by design.
 		TPoint3D(T x, T y, T z) : TPoint2D<T>(x, y), Z(z) {}
 		TPoint3D(BASECLASS const & rvalue) : TPoint2D<T>(rvalue), Z(0) {}
-		
+
 		// Equality comparison operators.
 		bool operator == (TPoint3D<T> const & rvalue) const {return(X==rvalue.X && Y==rvalue.Y && Z==rvalue.Z);}
 		bool operator != (TPoint3D<T> const & rvalue) const {return(X!=rvalue.X || Y!=rvalue.Y || Z!=rvalue.Z);}
@@ -190,7 +186,7 @@ class TPoint3D : public TPoint2D<T> {
 };
 
 template<class T>
-TPoint3D<T> const operator * (T lvalue, TPoint3D<T> const & rvalue) 
+TPoint3D<T> const operator * (T lvalue, TPoint3D<T> const & rvalue)
 {
 	return(rvalue * lvalue);
 }
@@ -201,6 +197,3 @@ TPoint3D<T> const operator * (T lvalue, TPoint3D<T> const & rvalue)
 **	integer 3D points.
 */
 typedef TPoint3D<int> Point3D;
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H
deleted file mode 100644
index 9163f9fcd93..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/ramfile.h                              $* 
- *                                                                                             * 
- *                      $Author:: Ian_l                                                       $*
- *                                                                                             * 
- *                     $Modtime:: 10/31/01 2:02p                                              $*
- *                                                                                             * 
- *                    $Revision:: 2                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#ifndef RAMFILE_H
-#define RAMFILE_H
-
-#include	"WWFILE.H"
-
-
-class RAMFileClass : public FileClass
-{
-	public:
-		RAMFileClass(void * buffer, int len);
-		virtual ~RAMFileClass(void);
-
-		virtual char const * File_Name(void) const {return("UNKNOWN");}
-		virtual char const * Set_Name(char const * ) {return(File_Name());}
-		virtual int Create(void);
-		virtual int Delete(void);
-		virtual bool Is_Available(int forced=false);
-		virtual bool Is_Open(void) const;
-		virtual int Open(char const * filename, int access=READ);
-		virtual int Open(int access=READ);
-		virtual int Read(void * buffer, int size);
-		virtual int Seek(int pos, int dir=SEEK_CUR);
-		virtual int Size(void);
-		virtual int Write(void const * buffer, int size);
-		virtual void Close(void);
-		virtual unsigned long Get_Date_Time(void) {return(0);}
-		virtual bool Set_Date_Time(unsigned long ) {return(true);}
-		virtual void Error(int , int = false, char const * =NULL) {}
-		virtual void Bias(int start, int length=-1);
-
-		operator char const * () {return File_Name();}
-
-	private:
-
-		/*
-		**	Pointer to the buffer that the "file" will reside in.
-		*/
-		char * Buffer;
-
-		/*
-		**	The maximum size of the buffer. The file occupying the buffer
-		**	may be smaller than this size.
-		*/
-		int MaxLength;
-
-		/*
-		**	The number of bytes in the sub-file occupying the buffer.
-		*/
-		int Length;
-
-		/*
-		**	The current file position offset within the buffer.
-		*/
-		int Offset;
-
-		/*
-		**	The file was opened with this access mode.
-		*/
-		int Access;
-
-		/*
-		**	Is the file currently open?
-		*/
-		bool IsOpen;
-
-		/*
-		**	Was the file buffer allocated during construction of this object?
-		*/
-		bool IsAllocated;
-};
-
-
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.h b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.h
new file mode 100644
index 00000000000..969c5c7bfe5
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.h
@@ -0,0 +1,105 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/ramfile.h                              $*
+ *                                                                                             *
+ *                      $Author:: Ian_l                                                       $*
+ *                                                                                             *
+ *                     $Modtime:: 10/31/01 2:02p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "WWFILE.h"
+
+
+class RAMFileClass : public FileClass
+{
+	public:
+		RAMFileClass(void * buffer, int len);
+		virtual ~RAMFileClass(void);
+
+		virtual char const * File_Name(void) const {return("UNKNOWN");}
+		virtual char const * Set_Name(char const * ) {return(File_Name());}
+		virtual int Create(void);
+		virtual int Delete(void);
+		virtual bool Is_Available(int forced=false);
+		virtual bool Is_Open(void) const;
+		virtual int Open(char const * filename, int access=READ);
+		virtual int Open(int access=READ);
+		virtual int Read(void * buffer, int size);
+		virtual int Seek(int pos, int dir=SEEK_CUR);
+		virtual int Size(void);
+		virtual int Write(void const * buffer, int size);
+		virtual void Close(void);
+		virtual unsigned long Get_Date_Time(void) {return(0);}
+		virtual bool Set_Date_Time(unsigned long ) {return(true);}
+		virtual void Error(int , int = false, char const * =NULL) {}
+		virtual void Bias(int start, int length=-1);
+
+		operator char const * () {return File_Name();}
+
+	private:
+
+		/*
+		**	Pointer to the buffer that the "file" will reside in.
+		*/
+		char * Buffer;
+
+		/*
+		**	The maximum size of the buffer. The file occupying the buffer
+		**	may be smaller than this size.
+		*/
+		int MaxLength;
+
+		/*
+		**	The number of bytes in the sub-file occupying the buffer.
+		*/
+		int Length;
+
+		/*
+		**	The current file position offset within the buffer.
+		*/
+		int Offset;
+
+		/*
+		**	The file was opened with this access mode.
+		*/
+		int Access;
+
+		/*
+		**	Is the file currently open?
+		*/
+		bool IsOpen;
+
+		/*
+		**	Was the file buffer allocated during construction of this object?
+		*/
+		bool IsAllocated;
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H b/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H
deleted file mode 100644
index c1a9dd89329..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /VSS_Sync/wwlib/random.h                                    $* 
- *                                                                                             * 
- *                      $Author:: Vss_sync                                                    $*
- *                                                                                             * 
- *                     $Modtime:: 8/29/01 10:24p                                              $*
- *                                                                                             * 
- *                    $Revision:: 3                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Pick_Random_Number -- Picks a random number between two values (inclusive).               * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef RANDOM_H
-#define RANDOM_H
-
-// "unreferenced inline function has been removed" Yea, so what?
-#pragma warning(disable : 4514)
-
-/*
-**	This class functions like a 'magic' int value that returns a random number
-**	every time it is read. To set the "random seed" for this, just assign a number
-**	to the object (just as you would if it were a true 'int' value). Take note that although
-**	this class will return an 'int', the actual significance of the random number is
-**	limited to 15 bits (0..32767).
-*/
-class RandomClass {
-	public:
-		RandomClass(unsigned seed=0);
-
-		operator int(void) {return(operator()());};
-		int operator() (void);
-		int operator() (int minval, int maxval);
-
-		enum {
-			SIGNIFICANT_BITS=15				// Random number bit significance.
-		};
-
-	protected:
-		unsigned long Seed;
-
-		/*
-		**	Internal working constants that are used to generate the next
-		**	random number.
-		*/
-		enum {
-			MULT_CONSTANT=0x41C64E6D,		// K multiplier value.
-			ADD_CONSTANT=0x00003039,		// K additive value.
-			THROW_AWAY_BITS=10				// Low bits to throw away.
-		};
-};
-
-
-/*
-**	This class functions like a 'magic' number where it returns a different value every
-**	time it is read. It is nearly identical in function to the RandomClass, but has the
-**	following improvements.
-**
-**	1> It generates random numbers very quickly. No multiplies are
-**		used in the algorithm.
-**
-**	2> The return value is a full 32 bits rather than 15 bits of
-**		the RandomClass.
-**
-**	3>	The bit pattern won't ever repeat. (actually it will repeat
-**		in about 10 to the 50th power times).
-*/
-// WARNING!!!!
-// This random number generator starts breaking down in 64 dimensions
-// behaving very badly in that domain
-// HY 6/14/01
-class Random2Class {
-	public:
-		Random2Class(unsigned seed=0);
-
-		operator int(void) {return(operator()());};
-		int operator() (void);
-		int operator() (int minval, int maxval);
-
-		enum {
-			SIGNIFICANT_BITS=32				// Random number bit significance.
-		};
-
-	protected:
-		int Index1;
-		int Index2;
-		int Table[250];
-};
-
-
-/*
-**	This class functions like a 'magic' number where it returns a different value every
-**	time it is read. It is nearly identical in function to the RandomClass and Random2Class,
-**	but has the following improvements.
-**
-**	1> The random number returned is very strongly random. Approaching cryptographic
-**		quality.
-**
-**	2> The return value is a full 32 bits rather than 15 bits of
-**		the RandomClass.
-**
-**	3> The bit pattern won't repeat until 2^32 times.
-*/
-// WARNING!!!!
-// This random number generator starts breaking down in 3 dimensions
-// exhibiting a strange bias
-// HY 6/14/01
-class Random3Class {
-	public:
-		Random3Class(unsigned seed1=0, unsigned seed2=0);
-
-		operator int(void) {return(operator()());};
-		int operator() (void);
-		int operator() (int minval, int maxval);
-
-		enum {
-			SIGNIFICANT_BITS=32				// Random number bit significance.
-		};
-
-	protected:
-		static int Mix1[20];
-		static int Mix2[20];
-		int Seed;
-		int Index;
-};
-
-/*
-**	This class functions like a 'magic' number where it returns a different value every
-**	time it is read. It is based on the paper "Mersenne Twister: A 623-Dimensionally
-** Equidistributed Uniform Pseudo-Random Number Generator
-** by Makoto Matsumoto and Takuji Nishimura, ACM Transactions on Modeling and
-** Computer Simulation, Vol 8, No 1, January 1998, Pages 3-30
-** Hector Yee
-**
-**	1> The random number returned is very strongly random
-**
-**	2> The return value is a full 32 bits rather than 15 bits of
-**		the RandomClass.
-**
-**	3> The bit pattern won't repeat until 2^19937 -1 times
-**
-*/
-// WARNING!!!!
-// Do not use for cryptography. This random number generator is good for numerical
-// simulation. Optimized, it's 4 times faster than rand()
-// http://www.math.keio.ac.jp/~matumoto/emt.html
-// HY 6/14/01
-class Random4Class {
-	public:
-		Random4Class(unsigned int seed=4357);
-
-		operator int(void) {return(operator()());};
-		int operator() (void);
-		int operator() (int minval, int maxval);
-		float Get_Float();
-
-		enum {
-			SIGNIFICANT_BITS=32				// Random number bit significance.
-		};
-		
-	protected:
-		unsigned int mt[624]; // state vector
-		int mti;			 // index
-};
-
-
-/*********************************************************************************************** 
- * Pick_Random_Number -- Picks a random number between two values (inclusive).                 * 
- *                                                                                             * 
- *    This is a utility template that works with one of the random number classes. Given a     * 
- *    random number generator, this routine will return with a value that lies between the     * 
- *    minimum and maximum values specified (subject to the bit precision limitations of the    * 
- *    random number generator itself).                                                         * 
- *                                                                                             * 
- * INPUT:   generator   -- Reference to the random number generator to use for the pick        * 
- *                         process.                                                            * 
- *                                                                                             * 
- *          minval      -- The minimum legal return value (inclusive).                         * 
- *                                                                                             * 
- *          maxval      -- The maximum legal return value (inclusive).                         * 
- *                                                                                             * 
- * OUTPUT:  Returns with a random number between the minval and maxval (inclusive).            * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/23/1997 JLB : Created.                                                                 * 
- *=============================================================================================*/
-template<class T>
-int Pick_Random_Number(T & generator, int minval, int maxval)
-{
-	/*
-	**	Test for shortcut case where the range is null and thus
-	**	the number to return is actually implicit from the
-	**	parameters.
-	*/
-	if (minval == maxval) return(minval);
-
-	/*
-	**	Ensure that the min and max range values are in proper order.
-	*/
-	if (minval > maxval) {
-		int temp = minval;
-		minval = maxval;
-		maxval = temp;
-	}
-
-	/*
-	**	Find the highest bit that fits within the magnitude of the
-	**	range of random numbers desired. Notice that the scan is
-	**	limited to the range of significant bits returned by the
-	**	random number algorithm.
-	*/
-	int magnitude = maxval - minval;
-	int highbit = T::SIGNIFICANT_BITS-1;
-	while ((magnitude & (1 << highbit)) == 0 && highbit > 0) {
-		highbit--;
-	}
-
-	/*
-	**	Create a full bit mask pattern that has all bits set that just
-	**	barely covers the magnitude of the number range desired.
-	*/
-	int mask = ~( (~0L) << (highbit+1));
-
-	/*
-	**	Keep picking random numbers until it fits within the magnitude desired. With a 
-	**	good random number generator, it will have to perform this loop an average
-	**	of one and a half times.
-	*/
-	int pick = magnitude+1;
-	while (pick > magnitude) {
-		pick = generator() & mask;
-	}
-
-	/*
-	**	Finally, bias the random number pick to the start of the range
-	**	requested.
-	*/
-	return(pick + minval);
-}
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/RANDOM.h b/Core/Libraries/Source/WWVegas/WWLib/RANDOM.h
new file mode 100644
index 00000000000..2f677888bfd
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/RANDOM.h
@@ -0,0 +1,264 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /VSS_Sync/wwlib/random.h                                    $*
+ *                                                                                             *
+ *                      $Author:: Vss_sync                                                    $*
+ *                                                                                             *
+ *                     $Modtime:: 8/29/01 10:24p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Pick_Random_Number -- Picks a random number between two values (inclusive).               *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+// "unreferenced inline function has been removed" Yea, so what?
+#pragma warning(disable : 4514)
+
+/*
+**	This class functions like a 'magic' int value that returns a random number
+**	every time it is read. To set the "random seed" for this, just assign a number
+**	to the object (just as you would if it were a true 'int' value). Take note that although
+**	this class will return an 'int', the actual significance of the random number is
+**	limited to 15 bits (0..32767).
+*/
+class RandomClass {
+	public:
+		RandomClass(unsigned seed=0);
+
+		operator int(void) {return(operator()());};
+		int operator() (void);
+		int operator() (int minval, int maxval);
+
+		enum {
+			SIGNIFICANT_BITS=15				// Random number bit significance.
+		};
+
+	protected:
+		unsigned long Seed;
+
+		/*
+		**	Internal working constants that are used to generate the next
+		**	random number.
+		*/
+		enum {
+			MULT_CONSTANT=0x41C64E6D,		// K multiplier value.
+			ADD_CONSTANT=0x00003039,		// K additive value.
+			THROW_AWAY_BITS=10				// Low bits to throw away.
+		};
+};
+
+
+/*
+**	This class functions like a 'magic' number where it returns a different value every
+**	time it is read. It is nearly identical in function to the RandomClass, but has the
+**	following improvements.
+**
+**	1> It generates random numbers very quickly. No multiplies are
+**		used in the algorithm.
+**
+**	2> The return value is a full 32 bits rather than 15 bits of
+**		the RandomClass.
+**
+**	3>	The bit pattern won't ever repeat. (actually it will repeat
+**		in about 10 to the 50th power times).
+*/
+// WARNING!!!!
+// This random number generator starts breaking down in 64 dimensions
+// behaving very badly in that domain
+// HY 6/14/01
+class Random2Class {
+	public:
+		Random2Class(unsigned seed=0);
+
+		operator int(void) {return(operator()());};
+		int operator() (void);
+		int operator() (int minval, int maxval);
+
+		enum {
+			SIGNIFICANT_BITS=32				// Random number bit significance.
+		};
+
+	protected:
+		int Index1;
+		int Index2;
+		int Table[250];
+};
+
+
+/*
+**	This class functions like a 'magic' number where it returns a different value every
+**	time it is read. It is nearly identical in function to the RandomClass and Random2Class,
+**	but has the following improvements.
+**
+**	1> The random number returned is very strongly random. Approaching cryptographic
+**		quality.
+**
+**	2> The return value is a full 32 bits rather than 15 bits of
+**		the RandomClass.
+**
+**	3> The bit pattern won't repeat until 2^32 times.
+*/
+// WARNING!!!!
+// This random number generator starts breaking down in 3 dimensions
+// exhibiting a strange bias
+// HY 6/14/01
+class Random3Class {
+	public:
+		Random3Class(unsigned seed1=0, unsigned seed2=0);
+
+		operator int(void) {return(operator()());};
+		int operator() (void);
+		int operator() (int minval, int maxval);
+
+		enum {
+			SIGNIFICANT_BITS=32				// Random number bit significance.
+		};
+
+	protected:
+		static int Mix1[20];
+		static int Mix2[20];
+		int Seed;
+		int Index;
+};
+
+/*
+**	This class functions like a 'magic' number where it returns a different value every
+**	time it is read. It is based on the paper "Mersenne Twister: A 623-Dimensionally
+** Equidistributed Uniform Pseudo-Random Number Generator
+** by Makoto Matsumoto and Takuji Nishimura, ACM Transactions on Modeling and
+** Computer Simulation, Vol 8, No 1, January 1998, Pages 3-30
+** Hector Yee
+**
+**	1> The random number returned is very strongly random
+**
+**	2> The return value is a full 32 bits rather than 15 bits of
+**		the RandomClass.
+**
+**	3> The bit pattern won't repeat until 2^19937 -1 times
+**
+*/
+// WARNING!!!!
+// Do not use for cryptography. This random number generator is good for numerical
+// simulation. Optimized, it's 4 times faster than rand()
+// http://www.math.keio.ac.jp/~matumoto/emt.html
+// HY 6/14/01
+class Random4Class {
+	public:
+		Random4Class(unsigned int seed=4357);
+
+		operator int(void) {return(operator()());};
+		int operator() (void);
+		int operator() (int minval, int maxval);
+		float Get_Float();
+
+		enum {
+			SIGNIFICANT_BITS=32				// Random number bit significance.
+		};
+
+	protected:
+		unsigned int mt[624]; // state vector
+		int mti;			 // index
+};
+
+
+/***********************************************************************************************
+ * Pick_Random_Number -- Picks a random number between two values (inclusive).                 *
+ *                                                                                             *
+ *    This is a utility template that works with one of the random number classes. Given a     *
+ *    random number generator, this routine will return with a value that lies between the     *
+ *    minimum and maximum values specified (subject to the bit precision limitations of the    *
+ *    random number generator itself).                                                         *
+ *                                                                                             *
+ * INPUT:   generator   -- Reference to the random number generator to use for the pick        *
+ *                         process.                                                            *
+ *                                                                                             *
+ *          minval      -- The minimum legal return value (inclusive).                         *
+ *                                                                                             *
+ *          maxval      -- The maximum legal return value (inclusive).                         *
+ *                                                                                             *
+ * OUTPUT:  Returns with a random number between the minval and maxval (inclusive).            *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/23/1997 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+int Pick_Random_Number(T & generator, int minval, int maxval)
+{
+	/*
+	**	Test for shortcut case where the range is null and thus
+	**	the number to return is actually implicit from the
+	**	parameters.
+	*/
+	if (minval == maxval) return(minval);
+
+	/*
+	**	Ensure that the min and max range values are in proper order.
+	*/
+	if (minval > maxval) {
+		int temp = minval;
+		minval = maxval;
+		maxval = temp;
+	}
+
+	/*
+	**	Find the highest bit that fits within the magnitude of the
+	**	range of random numbers desired. Notice that the scan is
+	**	limited to the range of significant bits returned by the
+	**	random number algorithm.
+	*/
+	int magnitude = maxval - minval;
+	int highbit = T::SIGNIFICANT_BITS-1;
+	while ((magnitude & (1 << highbit)) == 0 && highbit > 0) {
+		highbit--;
+	}
+
+	/*
+	**	Create a full bit mask pattern that has all bits set that just
+	**	barely covers the magnitude of the number range desired.
+	*/
+	int mask = ~( (~0L) << (highbit+1));
+
+	/*
+	**	Keep picking random numbers until it fits within the magnitude desired. With a
+	**	good random number generator, it will have to perform this loop an average
+	**	of one and a half times.
+	*/
+	int pick = magnitude+1;
+	while (pick > magnitude) {
+		pick = generator() & mask;
+	}
+
+	/*
+	**	Finally, bias the random number pick to the start of the range
+	**	requested.
+	*/
+	return(pick + minval);
+}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H
deleted file mode 100644
index abcee2c5f72..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/rawfile.h                              $* 
- *                                                                                             * 
- *                      $Author:: Jani_p                                                      $*
- *                                                                                             * 
- *                     $Modtime:: 11/25/01 11:52a                                             $*
- *                                                                                             * 
- *                    $Revision:: 10                                                          $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   RawFileClass::File_Name -- Returns with the filename associate with the file object.      *
- *   RawFileClass::RawFileClass -- Default constructor for a file object.                      *
- *   RawFileClass::~RawFileClass -- Default deconstructor for a file object.                   *
- *   RawFileClass::Is_Open -- Checks to see if the file is open or not.                        *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef RAWFILE_Hx
-#define RAWFILE_Hx
-
-//#include	<errno.h>
-
-// #include	"win.h"
-
-#include <stdio.h>
-#define	NULL_HANDLE	 	NULL	
-#define	HANDLE_TYPE		FILE*	
-#include "WWFILE.H"
-#include "wwstring.h"
-
-
-#ifndef WWERROR
-#define WWERROR	-1
-#endif
-
-/*
-**	This is the definition of the raw file class. It is derived from the abstract base FileClass
-**	and handles the interface to the low level DOS routines. This is the first class in the
-**	chain of derived file classes that actually performs a useful function. With this class,
-**	I/O is possible. More sophisticated features, such as packed files, CD-ROM support,
-**	file caching, and XMS/EMS memory support, are handled by derived classes.
-**
-**	Of particular importance is the need to override the error routine if more sophisticated
-**	error handling is required. This is more than likely if greater functionality is derived
-**	from this base class.
-*/
-class RawFileClass : public FileClass
-{
-		typedef FileClass BASECLASS;
-
-	public:
-
-		/*
-		**	This is a record of the access rights used to open the file. These rights are
-		**	used if the file object is duplicated.
-		*/
-		int Rights;
-
-		RawFileClass(char const *filename);
-		RawFileClass(void);
-		RawFileClass (RawFileClass const & f);
-		RawFileClass & operator = (RawFileClass const & f);
-		virtual ~RawFileClass(void);
-
-		virtual char const * File_Name(void) const;
-		virtual char const * Set_Name(char const *filename);
-		virtual int Create(void);
-		virtual int Delete(void);
-		virtual bool Is_Available(int forced=false);
-		virtual bool Is_Open(void) const;
-		virtual int Open(char const *filename, int rights=READ);
-		virtual int Open(int rights=READ);
-		virtual int Read(void *buffer, int size);
-		virtual int Seek(int pos, int dir=SEEK_CUR);
-		virtual int Size(void);
-		virtual int Write(void const *buffer, int size);
-		virtual void Close(void);
-		virtual unsigned long Get_Date_Time(void);
-		virtual bool Set_Date_Time(unsigned long datetime);
-		virtual void Error(int error, int canretry = false, char const * filename=NULL);
-		virtual void Bias(int start, int length=-1);
-		virtual void * Get_File_Handle(void) { return Handle; } 
-
-		virtual void	Attach (void *handle, int rights=READ);
-		virtual void	Detach (void);		
-
-		/*
-		**	These bias values enable a sub-portion of a file to appear as if it
-		**	were the whole file. This comes in very handy for multi-part files such as
-		**	mixfiles.
-		*/
-		int BiasStart;
-		int BiasLength;
-
-	protected:
-
-		/*
-		**	This function returns the largest size a low level DOS read or write may
-		**	perform. Larger file transfers are performed in chunks of this size or less.
-		*/
-		int Transfer_Block_Size(void);
-
-		int Raw_Seek(int pos, int dir=SEEK_CUR);
-		void Reset(void);
-
-	private:
-
-		/*
-		**	This is the low level DOS handle. A -1 indicates an empty condition.
-		*/
-		FILE*  Handle;
-
-		StringClass Filename;
-
-		//
-		// file date and time are in the following formats:
-		//
-		//      date   bits 0-4   day (0-31)
-		//             bits 5-8   month (1-12)
-		//             bits 9-15  year (0-119 representing 1980-2099)
-		//
-		//      time   bits 0-4   second/2 (0-29)
-		//             bits 5-10  minutes (0-59)
-		//             bits 11-15 hours (0-23)
-		//
-		unsigned short Date;
-		unsigned short Time;
-};
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.h b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.h
new file mode 100644
index 00000000000..a770ca7ceed
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.h
@@ -0,0 +1,149 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/rawfile.h                              $*
+ *                                                                                             *
+ *                      $Author:: Jani_p                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 11/25/01 11:52a                                             $*
+ *                                                                                             *
+ *                    $Revision:: 10                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   RawFileClass::File_Name -- Returns with the filename associate with the file object.      *
+ *   RawFileClass::RawFileClass -- Default constructor for a file object.                      *
+ *   RawFileClass::~RawFileClass -- Default deconstructor for a file object.                   *
+ *   RawFileClass::Is_Open -- Checks to see if the file is open or not.                        *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+//#include	<errno.h>
+
+// #include	"win.h"
+
+#define	NULL_HANDLE	 	NULL
+#define	HANDLE_TYPE		FILE*
+#include "WWFILE.h"
+#include "wwstring.h"
+
+
+#ifndef WWERROR
+#define WWERROR	-1
+#endif
+
+/*
+**	This is the definition of the raw file class. It is derived from the abstract base FileClass
+**	and handles the interface to the low level DOS routines. This is the first class in the
+**	chain of derived file classes that actually performs a useful function. With this class,
+**	I/O is possible. More sophisticated features, such as packed files, CD-ROM support,
+**	file caching, and XMS/EMS memory support, are handled by derived classes.
+**
+**	Of particular importance is the need to override the error routine if more sophisticated
+**	error handling is required. This is more than likely if greater functionality is derived
+**	from this base class.
+*/
+class RawFileClass : public FileClass
+{
+		typedef FileClass BASECLASS;
+
+	public:
+
+		/*
+		**	This is a record of the access rights used to open the file. These rights are
+		**	used if the file object is duplicated.
+		*/
+		int Rights;
+
+		RawFileClass(char const *filename);
+		RawFileClass(void);
+		RawFileClass (RawFileClass const & f);
+		RawFileClass & operator = (RawFileClass const & f);
+		virtual ~RawFileClass(void);
+
+		virtual char const * File_Name(void) const;
+		virtual char const * Set_Name(char const *filename);
+		virtual int Create(void);
+		virtual int Delete(void);
+		virtual bool Is_Available(int forced=false);
+		virtual bool Is_Open(void) const;
+		virtual int Open(char const *filename, int rights=READ);
+		virtual int Open(int rights=READ);
+		virtual int Read(void *buffer, int size);
+		virtual int Seek(int pos, int dir=SEEK_CUR);
+		virtual int Size(void);
+		virtual int Write(void const *buffer, int size);
+		virtual void Close(void);
+		virtual unsigned long Get_Date_Time(void);
+		virtual bool Set_Date_Time(unsigned long datetime);
+		virtual void Error(int error, int canretry = false, char const * filename=NULL);
+		virtual void Bias(int start, int length=-1);
+		virtual void * Get_File_Handle(void) { return Handle; }
+
+		virtual void	Attach (void *handle, int rights=READ);
+		virtual void	Detach (void);
+
+		/*
+		**	These bias values enable a sub-portion of a file to appear as if it
+		**	were the whole file. This comes in very handy for multi-part files such as
+		**	mixfiles.
+		*/
+		int BiasStart;
+		int BiasLength;
+
+	protected:
+
+		/*
+		**	This function returns the largest size a low level DOS read or write may
+		**	perform. Larger file transfers are performed in chunks of this size or less.
+		*/
+		int Transfer_Block_Size(void);
+
+		int Raw_Seek(int pos, int dir=SEEK_CUR);
+		void Reset(void);
+
+	private:
+
+		/*
+		**	This is the low level DOS handle. A -1 indicates an empty condition.
+		*/
+		FILE*  Handle;
+
+		StringClass Filename;
+
+		//
+		// file date and time are in the following formats:
+		//
+		//      date   bits 0-4   day (0-31)
+		//             bits 5-8   month (1-12)
+		//             bits 9-15  year (0-119 representing 1980-2099)
+		//
+		//      time   bits 0-4   second/2 (0-29)
+		//             bits 5-10  minutes (0-59)
+		//             bits 11-15 hours (0-23)
+		//
+		unsigned short Date;
+		unsigned short Time;
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/SLIST.H b/Core/Libraries/Source/WWVegas/WWLib/SLIST.H
deleted file mode 100644
index 745694a9f74..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/SLIST.H
+++ /dev/null
@@ -1,545 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                    File Name : SLIST.H                                  * 
- *                                                                         * 
- *                   Programmer : Philip W. Gorrow                         * 
- *                                                                         * 
- *                   Start Date : 03/11/97                                 * 
- *                                                                         * 
- *                  Last Update : March 11, 1997 [PWG]                     * 
- *                                                                         * 
- *  The Single List Class is responsible for all management functions that *
- *  can be performed on a singular linked list.  It uses the SLNode class  *
- *  to track the links and maintain a pointer to the object being tracked. *
- *                                                                         *
- *  The singlely linked list class is non destructive.  That is only       * 
- *  pointers to the actual data being stored in the nodes are kept.  The   *
- *  users is responsible for creating the objects to be added and deleting *
- *  the objects once they are removed from the list if they need to be.    *
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- *   *SList<T>::Remove_Head -- Removes the head of the list                * 
- *   *SList<T>::Remove_Tail -- Removes the tail element from the list      * 
- *   SList<T>::Get_Count -- Returns a count of the entries in the list     * 
- *   *SList<T>::Head -- Returns the head node of the list                  * 
- *   *SList<T>::Tail -- Returns the tail node of the list                  * 
- *   SList<T>::Is_Empty -- Returns true if the list is empty               * 
- *   SList<T>::Add_Head -- Adds a node to the head of the list             * 
- *   SList<T>::Add_Head -- Adds a list to to the head of the list          * 
- *   SList<T>::Add_Tail -- Adds a node to the tail of the list             * 
- *   SList<T>::Add_Tail -- Adds a list to the tail of the list             * 
- *   *SList<T>::Find_Node -- returns first node in list matching the input * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef __SLIST_H__
-#define __SLIST_H__
-
-#include "SLNODE.H"
-
-#ifndef NULL
-#define NULL 0L
-#endif
-
-template <class T>
-class SList {
-  private:
-		SLNode<T> *HeadNode;    // Note: Constructor not called for pointer.
-		SLNode<T> *TailNode;
-
-	public:
-		//                                  
-		// This constructor is inlined because G++ will not create the
-		// constructor correctly if it is not defined within the class
-		// definition.
-		//
-		SList(void)
-		{
-			HeadNode = NULL;
-			TailNode = NULL;
-		};
-
-		virtual ~SList(void) { Remove_All(); };
-
-		//
-		// Returns the current head of the list.  Used to walk the list.
-		//
-		SLNode<T> *Head(void) const;
-		SLNode<T> *Tail(void) const;
-
-		SLNode<T> *Find_Node(T * data) const;
-
-		virtual bool Add_Head(T *data);           // Add   object to head of list
-		virtual bool Add_Head(SList<T>& list);    // Add a list  to head of list
-		virtual bool Add_Tail(T *data);           // Add   object to tail of list
-		virtual bool Add_Tail(SList<T>& list);    // Add a list  to tail of list
-
-		virtual T *Remove_Head(void);             // Remove head node  from list
-		virtual T *Remove_Tail(void);             // Remove tail node  from list
-		virtual bool Remove(T *element);          // remove an individual element
-		virtual void Remove_All(void);            // Remove all  nodes from list
-
-		// Insert before oldnode, if oldnode is NULL then before head node
-		virtual bool Insert_Before(T *newnode, T *oldnode =   NULL);
-
-		// Could possibly implement an InsertBefore that operates on a whole list
-
-		// Insert after oldnode, if oldnode is NULL then insert at head
-		virtual bool Insert_After(T   *newnode, T *oldnode = NULL);
-
-		// Could possibly implement an InsertAfter that operates on a whole list
-		virtual bool Is_Empty(void)   const;      // True if list is empty
-		virtual long Get_Count(void) const;    // Returns number of nodes in list
-};
-
-
-/************************************************************************** 
- * SList<T>::Insert_Before -- Inserts entry prior to specified entry      * 
- *                                                                        * 
- * Inserts an entry prior to the specified entry in the  list.  If the    *   
- * specified   entry is null, it will add it prior to the head of the     *
- * list.  Returns true if sucessfully added, false otherwise.             *
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-bool SList<T>::Insert_Before(T *newnode, T   *oldnode)
-{
-	// if not adding anything then just skip the add.
-	if (newnode == NULL)
-		return false;
-
-	// if there is no head to the list then add it to head
-	if (oldnode == NULL || HeadNode == NULL || HeadNode->Data() == oldnode) {
-		return(Add_Head(newnode));
-	}
-
-	// now we need to walk the list in an attempt to add the 
-	//   node.  since we are a singlely linked list we need 
-	//   to stop one prior to the entry.
-	SLNode<T> *cur;
-	for (cur=HeadNode; cur->Next() && cur->Next()->Data() != oldnode; cur=cur->Next()) {}
-
-	// Verify that we found the entry as it might not have been in the list.
-	// Note: Cur will be valid because it wont be assigned unless Next is
-	//  valid.
-	if (cur->Next() != NULL && cur->Next()->Data() == oldnode) {  
-		SLNode<T> *temp	= new SLNode<T> (newnode);
-		temp->Set_Next(cur->Next());
-		cur->Set_Next(temp);
-		return(true);
-	}
-	return(false);
-}
-
-
-/************************************************************************** 
- * SList<T>::Insert_After -- Inserts an entry after specified entry       * 
- *                                                                        * 
- * Inserts an entry after to the specified entry in the list.  If the     *
- * specified entry is null, it will add it prior to the head of the list. * 
- * Returns true if sucessfully added, false otherwise.                    *
- *                                                                        *
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-bool SList<T>::Insert_After(T *newnode, T *oldnode)
-{
-	if (newnode == NULL)
-		return false;
-
-	if (oldnode == NULL || HeadNode == NULL)  {
-		return(Add_Head(newnode));
-	}
-
-	// Search for oldnode in list
-	SLNode<T> *cur;
-	for (cur = HeadNode; cur && cur->Data() != oldnode; cur = cur->Next()) {}
-
-	// Did we find the data we want to insert after?
-	if (cur != NULL  && cur->Data() == oldnode) {   
-		if (cur == TailNode) {        // Inserting after tail
-			return(Add_Tail(newnode));
-		}
-
-		SLNode<T> *temp		= new SLNode<T>(newnode);
-		temp->Set_Next(cur->Next());
-		cur->Set_Next(temp);
-		return true;
-	} 
-	return false;
-}
-/************************************************************************** 
- * SList<T>::Remove_All -- Removes all of the entries in the current list * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-void SList<T>::Remove_All(void)
-{
-	SLNode<T> *next;
-	for (SLNode<T> *cur = HeadNode; cur; cur = next) {
-		next = cur->Next();
-		delete cur;
-	}
-	HeadNode = TailNode = NULL;
-}
-
-/************************************************************************** 
- * SList<T>::Remove -- Removes an element in the list.                    * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:  true if element could be removed, false if it could not be    *
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-bool SList<T>::Remove(T *element)
-{
-	// if not adding anything then just skip the add.
-	if (element == NULL || HeadNode == NULL)
-		return false;
-
-	// if the head is the element in question remove it
-	if (HeadNode->Data() == element) {
-		return(Remove_Head() != NULL ? true : false);
-	}
-
-	// now we need to walk the list in an attempt to add the 
-	//   node.  since we are a singlely linked list we need 
-	//   to stop one prior to the entry.
-	SLNode<T> *cur;
-	for (cur = HeadNode; cur->Next() && cur->Next()->Data() != element; cur=cur->Next()) { }
-
-	// Verify that we found the entry as it might not have been in the list.
-	// Note: Cur will be valid because it wont be assigned unless Next is
-	//  valid.
-	if (cur->Next() != NULL && cur->Next()->Data() == element) {  
-		SLNode<T> *temp	= cur->Next();
-		cur->Set_Next(temp->Next());
-		if (temp == TailNode) TailNode = cur;
-		delete temp;
-		return true;
-	}
-	return(false);
-}  
-
-/************************************************************************** 
- * *SList<T>::Remove_Head -- Removes the head of the list                 * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-T *SList<T>::Remove_Head(void)
-{
-	if (HeadNode == NULL)      // Should make an assertion here instead!
-		return ((T* )NULL);
-  
-	SLNode<T> *temp = HeadNode;
-	HeadNode = HeadNode->Next();
-
-	if (HeadNode == NULL)     // Do we have empty list now?
-		TailNode = NULL;
-
-	T *data = temp->Data();
-	delete temp;    
-	return data;
-}
-
-//
-// Removes the tail of the list and returns a data pointer to the
-// element removed.  Warning!  On a singlely linked list it is 
-// slow as hell to remove a tail!  If you need to frequently remove
-// tails, then you should consider a doubly linked list.
-//
-
-/************************************************************************** 
- * *SList<T>::Remove_Tail -- Removes the tail element from the list       * 
- *                                                                        * 
- * INPUT:		none																		  *
- *                                                                        * 
- * OUTPUT:		returns a pointer to the element removed						  *
- *                                                                        * 
- * WARNINGS:	On a singlely linked list it is slow as hell to remove a   *
- *					tail!  If you need to frequently remove tails, then you 	  *
- *					should consider a doubly linked list.                      * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-T *SList<T>::Remove_Tail(void)
-{
-	if (HeadNode == NULL)     // Should make an assertion here instead!
-		return ((T *)NULL);
-
-	T* data = TailNode->Data();
-	return (Remove(data) ? data : (T*)NULL);
-}
-
-
-/************************************************************************** 
- * SList<T>::Get_Count -- Returns a count of the entries in the list      * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-inline long SList<T>::Get_Count(void) const
-{
-	long count = 0;
-	for (SLNode<T> *cur = HeadNode; cur; cur = cur->Next())
-		count++;
-	return count;
-}
-
-
-/************************************************************************** 
- * *SList<T>::Head -- Returns the head node of the list                   * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-inline SLNode<T> *SList<T>::Head(void) const
-{
-	return(HeadNode);
-}
-
-/************************************************************************** 
- * *SList<T>::Tail -- Returns the tail node of the list                   * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-inline SLNode<T> *SList<T>::Tail(void) const
-{
-	return(TailNode);
-}
-
-/************************************************************************** 
- * SList<T>::Is_Empty -- Returns true if the list is empty                * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-inline bool SList<T>::Is_Empty(void) const
-{
-	return( HeadNode == NULL ? true : false);
-}
-
-
-/************************************************************************** 
- * SList<T>::Add_Head -- Adds a node to the head of the list              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-bool SList<T>::Add_Head(T *data)
-{
-	// we don't deal with lists that point to nothing
-	if (!data) return false;
-
-	SLNode<T> *temp			= new SLNode<T>(data);
-	temp->Set_Next(HeadNode);
-	HeadNode						= temp;
-	if (!TailNode) TailNode	= temp;
-	return true;
-}
-
-
-/************************************************************************** 
- * SList<T>::Add_Head -- Adds a list to to the head of the list           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-bool SList<T>::Add_Head(SList<T>& list)
-{
-	if (list.HeadNode == NULL) return false;
-
-	// Save point for initial add of element.
-	SLNode<T> *addpoint = NULL;
-
-	// We traverse list backwards so nodes are added in right order.
-	for (SLNode<T> *cur = list.HeadNode; cur; cur = cur->Next()) 
-	if (addpoint) {
-		SLNode<T> *temp   = new SLNode<T>(cur->Data());
-		temp->Set_Next(addpoint->Next());
-		addpoint->Set_Next(temp);
-		addpoint = temp;
-	} else {
-		Add_Head(cur->Data());
-		addpoint = HeadNode;
-	}
-	return true;
-}
-
-/************************************************************************** 
- * SList<T>::Add_Tail -- Adds a node to the tail of the list              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-bool SList<T>::Add_Tail(T *data)
-{
-	if (data == NULL) return false;
-
-	SLNode<T> *temp = new SLNode<T> (data);
-
-	if (HeadNode == NULL) {				// empty list
-		HeadNode = TailNode	= temp;
-	} else {									// non-empty list
-		TailNode->Set_Next(temp);
-		TailNode					= temp;
-	}
-	return true;
-}
-
-/************************************************************************** 
- * SList<T>::Add_Tail -- Adds a list to the tail of the list              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   03/11/1997 PWG : Created.                                            * 
- *========================================================================*/
-template<class T>
-bool SList<T>::Add_Tail(SList<T>& list)
-{
-	if (list.HeadNode == NULL) return false;
-
-	for (SLNode<T> *cur = list.HeadNode; cur; cur = cur->Next()) 
-		Add_Tail(cur->Data());
-	return true;
-}
- 
-
-/************************************************************************** 
- * *SList<T>::Find_Node -- returns first node in list matching the input  * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   08/22/1997 GH  : Created.                                            * 
- *========================================================================*/
-template<class T>
-inline SLNode<T> *SList<T>::Find_Node(T * data) const
-{
-	SLNode<T> * cur;
-
-	for (cur = HeadNode; cur && cur->Data() != data; cur = cur->Next());
-	
-	return cur;
-}
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/SLIST.h b/Core/Libraries/Source/WWVegas/WWLib/SLIST.h
new file mode 100644
index 00000000000..f93695811a4
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/SLIST.h
@@ -0,0 +1,539 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                    File Name : SLIST.h                                  *
+ *                                                                         *
+ *                   Programmer : Philip W. Gorrow                         *
+ *                                                                         *
+ *                   Start Date : 03/11/97                                 *
+ *                                                                         *
+ *                  Last Update : March 11, 1997 [PWG]                     *
+ *                                                                         *
+ *  The Single List Class is responsible for all management functions that *
+ *  can be performed on a singular linked list.  It uses the SLNode class  *
+ *  to track the links and maintain a pointer to the object being tracked. *
+ *                                                                         *
+ *  The singlely linked list class is non destructive.  That is only       *
+ *  pointers to the actual data being stored in the nodes are kept.  The   *
+ *  users is responsible for creating the objects to be added and deleting *
+ *  the objects once they are removed from the list if they need to be.    *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ *   *SList<T>::Remove_Head -- Removes the head of the list                *
+ *   *SList<T>::Remove_Tail -- Removes the tail element from the list      *
+ *   SList<T>::Get_Count -- Returns a count of the entries in the list     *
+ *   *SList<T>::Head -- Returns the head node of the list                  *
+ *   *SList<T>::Tail -- Returns the tail node of the list                  *
+ *   SList<T>::Is_Empty -- Returns true if the list is empty               *
+ *   SList<T>::Add_Head -- Adds a node to the head of the list             *
+ *   SList<T>::Add_Head -- Adds a list to to the head of the list          *
+ *   SList<T>::Add_Tail -- Adds a node to the tail of the list             *
+ *   SList<T>::Add_Tail -- Adds a list to the tail of the list             *
+ *   *SList<T>::Find_Node -- returns first node in list matching the input *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "SLNODE.h"
+
+#ifndef NULL
+#define NULL 0L
+#endif
+
+template <class T>
+class SList {
+  private:
+		SLNode<T> *HeadNode;    // Note: Constructor not called for pointer.
+		SLNode<T> *TailNode;
+
+	public:
+		//
+		// This constructor is inlined because G++ will not create the
+		// constructor correctly if it is not defined within the class
+		// definition.
+		//
+		SList(void)
+		{
+			HeadNode = NULL;
+			TailNode = NULL;
+		};
+
+		virtual ~SList(void) { Remove_All(); };
+
+		//
+		// Returns the current head of the list.  Used to walk the list.
+		//
+		SLNode<T> *Head(void) const;
+		SLNode<T> *Tail(void) const;
+
+		SLNode<T> *Find_Node(T * data) const;
+
+		virtual bool Add_Head(T *data);           // Add   object to head of list
+		virtual bool Add_Head(SList<T>& list);    // Add a list  to head of list
+		virtual bool Add_Tail(T *data);           // Add   object to tail of list
+		virtual bool Add_Tail(SList<T>& list);    // Add a list  to tail of list
+
+		virtual T *Remove_Head(void);             // Remove head node  from list
+		virtual T *Remove_Tail(void);             // Remove tail node  from list
+		virtual bool Remove(T *element);          // remove an individual element
+		virtual void Remove_All(void);            // Remove all  nodes from list
+
+		// Insert before oldnode, if oldnode is NULL then before head node
+		virtual bool Insert_Before(T *newnode, T *oldnode =   NULL);
+
+		// Could possibly implement an InsertBefore that operates on a whole list
+
+		// Insert after oldnode, if oldnode is NULL then insert at head
+		virtual bool Insert_After(T   *newnode, T *oldnode = NULL);
+
+		// Could possibly implement an InsertAfter that operates on a whole list
+		virtual bool Is_Empty(void)   const;      // True if list is empty
+		virtual long Get_Count(void) const;    // Returns number of nodes in list
+};
+
+
+/**************************************************************************
+ * SList<T>::Insert_Before -- Inserts entry prior to specified entry      *
+ *                                                                        *
+ * Inserts an entry prior to the specified entry in the  list.  If the    *
+ * specified   entry is null, it will add it prior to the head of the     *
+ * list.  Returns true if sucessfully added, false otherwise.             *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+bool SList<T>::Insert_Before(T *newnode, T   *oldnode)
+{
+	// if not adding anything then just skip the add.
+	if (newnode == NULL)
+		return false;
+
+	// if there is no head to the list then add it to head
+	if (oldnode == NULL || HeadNode == NULL || HeadNode->Data() == oldnode) {
+		return(Add_Head(newnode));
+	}
+
+	// now we need to walk the list in an attempt to add the
+	//   node.  since we are a singlely linked list we need
+	//   to stop one prior to the entry.
+	SLNode<T> *cur;
+	for (cur=HeadNode; cur->Next() && cur->Next()->Data() != oldnode; cur=cur->Next()) {}
+
+	// Verify that we found the entry as it might not have been in the list.
+	// Note: Cur will be valid because it wont be assigned unless Next is
+	//  valid.
+	if (cur->Next() != NULL && cur->Next()->Data() == oldnode) {
+		SLNode<T> *temp	= new SLNode<T> (newnode);
+		temp->Set_Next(cur->Next());
+		cur->Set_Next(temp);
+		return(true);
+	}
+	return(false);
+}
+
+
+/**************************************************************************
+ * SList<T>::Insert_After -- Inserts an entry after specified entry       *
+ *                                                                        *
+ * Inserts an entry after to the specified entry in the list.  If the     *
+ * specified entry is null, it will add it prior to the head of the list. *
+ * Returns true if sucessfully added, false otherwise.                    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+bool SList<T>::Insert_After(T *newnode, T *oldnode)
+{
+	if (newnode == NULL)
+		return false;
+
+	if (oldnode == NULL || HeadNode == NULL)  {
+		return(Add_Head(newnode));
+	}
+
+	// Search for oldnode in list
+	SLNode<T> *cur;
+	for (cur = HeadNode; cur && cur->Data() != oldnode; cur = cur->Next()) {}
+
+	// Did we find the data we want to insert after?
+	if (cur != NULL  && cur->Data() == oldnode) {
+		if (cur == TailNode) {        // Inserting after tail
+			return(Add_Tail(newnode));
+		}
+
+		SLNode<T> *temp		= new SLNode<T>(newnode);
+		temp->Set_Next(cur->Next());
+		cur->Set_Next(temp);
+		return true;
+	}
+	return false;
+}
+/**************************************************************************
+ * SList<T>::Remove_All -- Removes all of the entries in the current list *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+void SList<T>::Remove_All(void)
+{
+	SLNode<T> *next;
+	for (SLNode<T> *cur = HeadNode; cur; cur = next) {
+		next = cur->Next();
+		delete cur;
+	}
+	HeadNode = TailNode = NULL;
+}
+
+/**************************************************************************
+ * SList<T>::Remove -- Removes an element in the list.                    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:  true if element could be removed, false if it could not be    *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+bool SList<T>::Remove(T *element)
+{
+	// if not adding anything then just skip the add.
+	if (element == NULL || HeadNode == NULL)
+		return false;
+
+	// if the head is the element in question remove it
+	if (HeadNode->Data() == element) {
+		return(Remove_Head() != NULL ? true : false);
+	}
+
+	// now we need to walk the list in an attempt to add the
+	//   node.  since we are a singlely linked list we need
+	//   to stop one prior to the entry.
+	SLNode<T> *cur;
+	for (cur = HeadNode; cur->Next() && cur->Next()->Data() != element; cur=cur->Next()) { }
+
+	// Verify that we found the entry as it might not have been in the list.
+	// Note: Cur will be valid because it wont be assigned unless Next is
+	//  valid.
+	if (cur->Next() != NULL && cur->Next()->Data() == element) {
+		SLNode<T> *temp	= cur->Next();
+		cur->Set_Next(temp->Next());
+		if (temp == TailNode) TailNode = cur;
+		delete temp;
+		return true;
+	}
+	return(false);
+}
+
+/**************************************************************************
+ * *SList<T>::Remove_Head -- Removes the head of the list                 *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+T *SList<T>::Remove_Head(void)
+{
+	if (HeadNode == NULL)      // Should make an assertion here instead!
+		return ((T* )NULL);
+
+	SLNode<T> *temp = HeadNode;
+	HeadNode = HeadNode->Next();
+
+	if (HeadNode == NULL)     // Do we have empty list now?
+		TailNode = NULL;
+
+	T *data = temp->Data();
+	delete temp;
+	return data;
+}
+
+//
+// Removes the tail of the list and returns a data pointer to the
+// element removed.  Warning!  On a singlely linked list it is
+// slow as hell to remove a tail!  If you need to frequently remove
+// tails, then you should consider a doubly linked list.
+//
+
+/**************************************************************************
+ * *SList<T>::Remove_Tail -- Removes the tail element from the list       *
+ *                                                                        *
+ * INPUT:		none																		  *
+ *                                                                        *
+ * OUTPUT:		returns a pointer to the element removed						  *
+ *                                                                        *
+ * WARNINGS:	On a singlely linked list it is slow as hell to remove a   *
+ *					tail!  If you need to frequently remove tails, then you 	  *
+ *					should consider a doubly linked list.                      *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+T *SList<T>::Remove_Tail(void)
+{
+	if (HeadNode == NULL)     // Should make an assertion here instead!
+		return ((T *)NULL);
+
+	T* data = TailNode->Data();
+	return (Remove(data) ? data : (T*)NULL);
+}
+
+
+/**************************************************************************
+ * SList<T>::Get_Count -- Returns a count of the entries in the list      *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+inline long SList<T>::Get_Count(void) const
+{
+	long count = 0;
+	for (SLNode<T> *cur = HeadNode; cur; cur = cur->Next())
+		count++;
+	return count;
+}
+
+
+/**************************************************************************
+ * *SList<T>::Head -- Returns the head node of the list                   *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+inline SLNode<T> *SList<T>::Head(void) const
+{
+	return(HeadNode);
+}
+
+/**************************************************************************
+ * *SList<T>::Tail -- Returns the tail node of the list                   *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+inline SLNode<T> *SList<T>::Tail(void) const
+{
+	return(TailNode);
+}
+
+/**************************************************************************
+ * SList<T>::Is_Empty -- Returns true if the list is empty                *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+inline bool SList<T>::Is_Empty(void) const
+{
+	return( HeadNode == NULL ? true : false);
+}
+
+
+/**************************************************************************
+ * SList<T>::Add_Head -- Adds a node to the head of the list              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+bool SList<T>::Add_Head(T *data)
+{
+	// we don't deal with lists that point to nothing
+	if (!data) return false;
+
+	SLNode<T> *temp			= new SLNode<T>(data);
+	temp->Set_Next(HeadNode);
+	HeadNode						= temp;
+	if (!TailNode) TailNode	= temp;
+	return true;
+}
+
+
+/**************************************************************************
+ * SList<T>::Add_Head -- Adds a list to to the head of the list           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+bool SList<T>::Add_Head(SList<T>& list)
+{
+	if (list.HeadNode == NULL) return false;
+
+	// Save point for initial add of element.
+	SLNode<T> *addpoint = NULL;
+
+	// We traverse list backwards so nodes are added in right order.
+	for (SLNode<T> *cur = list.HeadNode; cur; cur = cur->Next())
+	if (addpoint) {
+		SLNode<T> *temp   = new SLNode<T>(cur->Data());
+		temp->Set_Next(addpoint->Next());
+		addpoint->Set_Next(temp);
+		addpoint = temp;
+	} else {
+		Add_Head(cur->Data());
+		addpoint = HeadNode;
+	}
+	return true;
+}
+
+/**************************************************************************
+ * SList<T>::Add_Tail -- Adds a node to the tail of the list              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+bool SList<T>::Add_Tail(T *data)
+{
+	if (data == NULL) return false;
+
+	SLNode<T> *temp = new SLNode<T> (data);
+
+	if (HeadNode == NULL) {				// empty list
+		HeadNode = TailNode	= temp;
+	} else {									// non-empty list
+		TailNode->Set_Next(temp);
+		TailNode					= temp;
+	}
+	return true;
+}
+
+/**************************************************************************
+ * SList<T>::Add_Tail -- Adds a list to the tail of the list              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   03/11/1997 PWG : Created.                                            *
+ *========================================================================*/
+template<class T>
+bool SList<T>::Add_Tail(SList<T>& list)
+{
+	if (list.HeadNode == NULL) return false;
+
+	for (SLNode<T> *cur = list.HeadNode; cur; cur = cur->Next())
+		Add_Tail(cur->Data());
+	return true;
+}
+
+
+/**************************************************************************
+ * *SList<T>::Find_Node -- returns first node in list matching the input  *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   08/22/1997 GH  : Created.                                            *
+ *========================================================================*/
+template<class T>
+inline SLNode<T> *SList<T>::Find_Node(T * data) const
+{
+	SLNode<T> * cur;
+
+	for (cur = HeadNode; cur && cur->Data() != data; cur = cur->Next());
+
+	return cur;
+}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H b/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H
deleted file mode 100644
index d89caf9879c..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*************************************************************************** 
- *																									* 
- *						 Project	Name : G														* 
- *																									* 
- *							 File	Name : SLNODE.H									 		* 
- *																									* 
- *							Programmer : Philip W. Gorrow									* 
- *																									* 
- *							Start	Date : 03/11/97											* 
- *																									* 
- *						  Last Update : March 11, 1997 [PWG]							* 
- *																									* 
- *-------------------------------------------------------------------------* 
- *	Functions:																					* 
- *	- - -	- - -	- - -	- - -	- - -	- - -	- - -	- - -	- - -	- - -	- - -	- - -	*/
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef __SLNODE_H__
-#define __SLNODE_H__
-
-#ifndef ALWAYS_H
-#include "always.h"
-#endif
-
-#include "mempool.h"
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-//	Forward references for friend	classes
-template	<class T> class SList;
-
-//
-//	The node	class	is	responsible	for maintaining the links between
-//	data in a linked list.	It	works	with the	Single List	Class	to
-//	manage a	singularly linked	list of objects.	
-//
-
-class	GenericSLNode : public AutoPoolClass<GenericSLNode, 256>
-{
-	protected:
-		void* Internal_Get_Next(void) { return NodeNext; };
-		void Internal_Set_Next(void* n) { NodeNext=n; };
-		void *Internal_Get_Data(void) { return NodeData; };
-		void Internal_Get_Data(void* d) { NodeData=d; };
-
-		//
-		//	Note that their is only one constructor for this class and it
-		//	requires you to provide an object.  Furthermore it can be
-		// created from anything but a friend or parent class.
-		//
-		GenericSLNode(void *obj)
-			{NodeData = obj; NodeNext = 0; };
-
-		//
-		//	You cannot declare a node class without giving it a data object.
-		//	Defining this type of constructor as private to the class insures
-		//	that it cannot be used.
-		//
-	private:
-		GenericSLNode(void) {};
-
-		void		*NodeNext;			//	Next Node in the list chain
-		void		*NodeData;			//	Current Node in the list chain
-};
-
-
-template	<class T>
-class	SLNode : public GenericSLNode
-{
-	public:
-		//
-		//	Since	the list	class	manages the	Node Class it must be able	to
-		//	access its private data.
-		//
-		friend class SList<T>;
-
-		SLNode<T>* Next(void) { return reinterpret_cast<SLNode<T>*>(Internal_Get_Next()); }
-		T *Data(void) { return reinterpret_cast<T*>(Internal_Get_Data()); }
-
-		void Set_Next(SLNode<T>* n) { Internal_Set_Next(reinterpret_cast<void*>(n)); }
-
-	protected:
-		//
-		//	Note that their is only one constructor for this class and it
-		//	requires you to provide an object.  Furthermore it can be
-		// created from anything but a friend or parent class.
-		//
-		SLNode(T *obj) : GenericSLNode(obj) {}
-
-		//
-		//	You cannot declare a node class without giving it a data object.
-		//	Defining this type of constructor as private to the class insures
-		//	that it cannot be used.
-		//
-	private:
-		SLNode(void) {};
-};
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/SLNODE.h b/Core/Libraries/Source/WWVegas/WWLib/SLNODE.h
new file mode 100644
index 00000000000..c49ce72101c
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/SLNODE.h
@@ -0,0 +1,112 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***************************************************************************
+ *																									*
+ *						 Project	Name : G														*
+ *																									*
+ *							 File	Name : SLNODE.h									 		*
+ *																									*
+ *							Programmer : Philip W. Gorrow									*
+ *																									*
+ *							Start	Date : 03/11/97											*
+ *																									*
+ *						  Last Update : March 11, 1997 [PWG]							*
+ *																									*
+ *-------------------------------------------------------------------------*
+ *	Functions:																					*
+ *	- - -	- - -	- - -	- - -	- - -	- - -	- - -	- - -	- - -	- - -	- - -	- - -	*/
+
+#pragma once
+
+#include "always.h"
+#include "mempool.h"
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+//	Forward references for friend	classes
+template	<class T> class SList;
+
+//
+//	The node	class	is	responsible	for maintaining the links between
+//	data in a linked list.	It	works	with the	Single List	Class	to
+//	manage a	singularly linked	list of objects.
+//
+
+class	GenericSLNode : public AutoPoolClass<GenericSLNode, 256>
+{
+	protected:
+		void* Internal_Get_Next(void) { return NodeNext; };
+		void Internal_Set_Next(void* n) { NodeNext=n; };
+		void *Internal_Get_Data(void) { return NodeData; };
+		void Internal_Get_Data(void* d) { NodeData=d; };
+
+		//
+		//	Note that their is only one constructor for this class and it
+		//	requires you to provide an object.  Furthermore it can be
+		// created from anything but a friend or parent class.
+		//
+		GenericSLNode(void *obj)
+			{NodeData = obj; NodeNext = 0; };
+
+		//
+		//	You cannot declare a node class without giving it a data object.
+		//	Defining this type of constructor as private to the class insures
+		//	that it cannot be used.
+		//
+	private:
+		GenericSLNode(void) {};
+
+		void		*NodeNext;			//	Next Node in the list chain
+		void		*NodeData;			//	Current Node in the list chain
+};
+
+
+template	<class T>
+class	SLNode : public GenericSLNode
+{
+	public:
+		//
+		//	Since	the list	class	manages the	Node Class it must be able	to
+		//	access its private data.
+		//
+		friend class SList<T>;
+
+		SLNode<T>* Next(void) { return reinterpret_cast<SLNode<T>*>(Internal_Get_Next()); }
+		T *Data(void) { return reinterpret_cast<T*>(Internal_Get_Data()); }
+
+		void Set_Next(SLNode<T>* n) { Internal_Set_Next(reinterpret_cast<void*>(n)); }
+
+	protected:
+		//
+		//	Note that their is only one constructor for this class and it
+		//	requires you to provide an object.  Furthermore it can be
+		// created from anything but a friend or parent class.
+		//
+		SLNode(T *obj) : GenericSLNode(obj) {}
+
+		//
+		//	You cannot declare a node class without giving it a data object.
+		//	Defining this type of constructor as private to the class insures
+		//	that it cannot be used.
+		//
+	private:
+		SLNode(void) {};
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/STLUtils.h b/Core/Libraries/Source/WWVegas/WWLib/STLUtils.h
new file mode 100644
index 00000000000..ca92bf76c67
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/STLUtils.h
@@ -0,0 +1,145 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <algorithm>
+#include <cstddef>
+#include <map>
+#include <utility>
+#include <Utility/CppMacros.h>
+
+namespace stl
+{
+
+// Convenience struct to avoid the std::pair<iterator, iterator>
+template <typename Container>
+struct range
+{
+	typedef typename Container::iterator iterator;
+
+	range(iterator b, iterator e) : begin(b), end(e) {}
+
+	iterator get() const { return begin; }
+	bool valid() const { return begin != end; }
+	ptrdiff_t distance() const { return std::distance(begin, end); }
+
+	iterator begin;
+	iterator end;
+};
+
+template <typename Container>
+struct const_range
+{
+	typedef typename Container::const_iterator iterator;
+
+	const_range(iterator b, iterator e) : begin(b), end(e) {}
+	const_range(const range<Container>& other) : begin(other.begin), end(other.end) {}
+
+	iterator get() const { return begin; }
+	bool valid() const { return begin != end; }
+	ptrdiff_t distance() const { return std::distance(begin, end); }
+
+	iterator begin;
+	iterator end;
+};
+
+
+// Finds first matching element in vector-like container and erases it.
+template <typename Container>
+bool find_and_erase(Container& container, const typename Container::value_type& value)
+{
+	typename Container::const_iterator it = container.begin();
+	for (; it != container.end(); ++it)
+	{
+		if (*it == value)
+		{
+			container.erase(it);
+			return true;
+		}
+	}
+	return false;
+}
+
+// Finds first matching element in vector-like container and removes it by swapping it with the last element.
+// This is generally faster than erasing from a vector, but will change the element sorting.
+template <typename Container>
+bool find_and_erase_unordered(Container& container, const typename Container::value_type& value)
+{
+	typename Container::iterator it = container.begin();
+	for (; it != container.end(); ++it)
+	{
+		if (*it == value)
+		{
+			*it = CPP_11(std::move)(container.back());
+			container.pop_back();
+			return true;
+		}
+	}
+	return false;
+}
+
+// Push back value into vector-like container if it does not yet contain that value.
+template <typename Container>
+bool push_back_unique(Container& container, const typename Container::value_type& value)
+{
+	typename Container::iterator it = std::find(container.begin(), container.end(), value);
+	if (it == container.end())
+	{
+		container.push_back(value);
+		return true;
+	}
+
+	return false;
+}
+
+
+template <typename Iter>
+Iter advance_in_range(Iter first, Iter last, ptrdiff_t n)
+{
+	if (n <= 0)
+		return first;
+
+	const ptrdiff_t count = std::distance(first, last);
+
+	if (n >= count)
+		return last;
+
+	std::advance(first, n);
+	return first;
+}
+
+template <typename Key, typename Val>
+range<std::multimap<Key, Val> > get_range(std::multimap<Key, Val>& mm, const Key& key, ptrdiff_t n = 0)
+{
+	typedef typename std::multimap<Key, Val>::iterator Iter;
+	const std::pair<Iter, Iter> pair = mm.equal_range(key);
+	const Iter it = advance_in_range(pair.first, pair.second, n);
+	return range<std::multimap<Key, Val> >(it, pair.second);
+}
+
+template <typename Key, typename Val>
+const_range<std::multimap<Key, Val> > get_range(const std::multimap<Key, Val>& mm, const Key& key, ptrdiff_t n = 0)
+{
+	typedef typename std::multimap<Key, Val>::const_iterator Iter;
+	const std::pair<Iter, Iter> pair = mm.equal_range(key);
+	const Iter it = advance_in_range(pair.first, pair.second, n);
+	return const_range<std::multimap<Key, Val> >(it, pair.second);
+}
+
+} // namespace stl
diff --git a/Core/Libraries/Source/WWVegas/WWLib/STRAW.H b/Core/Libraries/Source/WWVegas/WWLib/STRAW.H
deleted file mode 100644
index d344e4e73c5..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/STRAW.H
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/STRAW.H                                            $* 
- *                                                                                             * 
- *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
- *                     $Modtime:: 4/02/99 12:00p                                              $*
- *                                                                                             * 
- *                    $Revision:: 3                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef STRAW_H
-#define STRAW_H
-
-/*
-**	This is a demand driven data carrier. It will retrieve the byte request by passing
-**	the request down the chain (possibly processing on the way) in order to fulfill the
-**	data request. Without being derived, this class merely passes the data through. Derived
-**	versions are presumed to modify the data in some useful way or monitor the data
-**	flow.
-*/
-class Straw
-{
-	public:
-		Straw(void) : ChainTo(0), ChainFrom(0) {}
-		virtual ~Straw(void);
-
-		virtual void Get_From(Straw * pipe);
-		void Get_From(Straw & pipe) {Get_From(&pipe);}
-		virtual int Get(void * buffer, int slen);
-
-		/*
-		**	Pointer to the next pipe segment in the chain.
-		*/
-		Straw * ChainTo;
-		Straw * ChainFrom;
-
-	private:
-
-		/*
-		**	Disable the copy constructor and assignment operator.
-		*/
-		Straw(Straw & rvalue);
-		Straw & operator = (Straw const & pipe);
-};
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/STRAW.h b/Core/Libraries/Source/WWVegas/WWLib/STRAW.h
new file mode 100644
index 00000000000..c099486577e
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/STRAW.h
@@ -0,0 +1,69 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/STRAW.h                                            $*
+ *                                                                                             *
+ *                      $Author:: Eric_c                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 4/02/99 12:00p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+/*
+**	This is a demand driven data carrier. It will retrieve the byte request by passing
+**	the request down the chain (possibly processing on the way) in order to fulfill the
+**	data request. Without being derived, this class merely passes the data through. Derived
+**	versions are presumed to modify the data in some useful way or monitor the data
+**	flow.
+*/
+class Straw
+{
+	public:
+		Straw(void) : ChainTo(0), ChainFrom(0) {}
+		virtual ~Straw(void);
+
+		virtual void Get_From(Straw * pipe);
+		void Get_From(Straw & pipe) {Get_From(&pipe);}
+		virtual int Get(void * buffer, int slen);
+
+		/*
+		**	Pointer to the next pipe segment in the chain.
+		*/
+		Straw * ChainTo;
+		Straw * ChainFrom;
+
+	private:
+
+		/*
+		**	Disable the copy constructor and assignment operator.
+		*/
+		Straw(Straw & rvalue);
+		Straw & operator = (Straw const & pipe);
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/Signaler.h b/Core/Libraries/Source/WWVegas/WWLib/Signaler.h
index 22c225f579b..073d032498e 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/Signaler.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/Signaler.h
@@ -37,8 +37,7 @@
 *
 ******************************************************************************/
 
-#ifndef __SIGNALER_H__
-#define __SIGNALER_H__
+#pragma once
 
 template<typename T> class Signaler
 	{
@@ -62,7 +61,7 @@ template<typename T> class Signaler
 		Signaler() :
 				mConnection(NULL)
 			{}
-	
+
 		virtual ~Signaler()
 			{Disconnect();}
 
@@ -79,7 +78,3 @@ template<typename T> class Signaler
 	private:
 		Signaler<T>* mConnection;
 	};
-
-#endif // __SIGNALER_H__
-
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/SystemAllocator.h b/Core/Libraries/Source/WWVegas/WWLib/SystemAllocator.h
new file mode 100644
index 00000000000..00f65a79123
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/SystemAllocator.h
@@ -0,0 +1,128 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <cstddef> // std::size_t, std::ptrdiff_t
+#include <new> // std::bad_alloc
+
+
+namespace stl
+{
+
+// STL allocator that uses the Operating System allocator functions. Useful if allocations are meant to bypass new and delete, malloc and free.
+
+template <typename T>
+class system_allocator
+{
+public:
+
+	typedef T value_type;
+	typedef T* pointer;
+	typedef const T* const_pointer;
+	typedef T& reference;
+	typedef const T& const_reference;
+	typedef std::size_t size_type;
+	typedef std::ptrdiff_t difference_type;
+
+	template <typename U>
+	struct rebind
+	{
+		typedef system_allocator<U> other;
+	};
+
+	system_allocator() throw() {}
+
+#if !(defined(_MSC_VER) && _MSC_VER < 1300)
+	system_allocator(const system_allocator&) throw() {}
+#endif
+
+	template <typename U>
+	system_allocator(const system_allocator<U>&) throw() {}
+
+	~system_allocator() throw() {}
+
+	pointer address(reference x) const { return &x; }
+	const_pointer address(const_reference x) const { return &x; }
+
+	pointer allocate(size_type n, const void* = 0)
+	{
+		if (n > max_size())
+			throw std::bad_alloc();
+
+		void* p = GlobalAlloc(GMEM_FIXED, n * sizeof(T));
+		if (!p)
+			throw std::bad_alloc();
+		return static_cast<pointer>(p);
+	}
+
+	void deallocate(pointer p, size_type)
+	{
+		GlobalFree(p);
+	}
+
+	void construct(pointer p, const T& val)
+	{
+		new (static_cast<void*>(p)) T(val);
+	}
+
+	void destroy(pointer p)
+	{
+		p->~T();
+	}
+
+	size_type max_size() const throw()
+	{
+		return ~size_type(0) / sizeof(T);
+	}
+};
+
+// Allocators of same type are always equal
+template <typename T1, typename T2>
+bool operator==(const system_allocator<T1>&, const system_allocator<T2>&) throw() {
+	return true;
+}
+
+template <typename T1, typename T2>
+bool operator!=(const system_allocator<T1>&, const system_allocator<T2>&) throw() {
+	return false;
+}
+
+} // namespace stl
+
+
+#if defined(USING_STLPORT)
+
+// This tells STLport how to rebind system_allocator
+namespace std
+{
+	template <class _Tp1, class _Tp2>
+	struct __stl_alloc_rebind_helper;
+
+	template <class Tp1, class Tp2>
+	inline stl::system_allocator<Tp2>& __stl_alloc_rebind(stl::system_allocator<Tp1>& a, const Tp2*) {
+		return *reinterpret_cast<stl::system_allocator<Tp2>*>(&a);
+	}
+
+	template <class Tp1, class Tp2>
+	inline const stl::system_allocator<Tp2>& __stl_alloc_rebind(const stl::system_allocator<Tp1>& a, const Tp2*) {
+		return *reinterpret_cast<const stl::system_allocator<Tp2>*>(&a);
+	}
+}
+
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/TARGA.CPP b/Core/Libraries/Source/WWVegas/WWLib/TARGA.CPP
deleted file mode 100644
index 2a6808c6519..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/TARGA.CPP
+++ /dev/null
@@ -1,1454 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/****************************************************************************
-*
-*        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S
-*
-*----------------------------------------------------------------------------
-*
-* FILE
-*     targa.cpp
-* 
-* DESCRIPTION
-*     Targa image file class.
-*
-* PROGRAMMER
-*     Denzil E. Long, Jr.
-*
-* DATE
-*     August 8, 1995
-*
-*----------------------------------------------------------------------------
-*
-* PUBLIC
-*     Open - Open Targa image file.
-*     Close - Close Targa image file.
-*     Load - Load Targa image file.
-*     Save - Save a Targa Image File.
-*     XFlip - X flip the image.
-*     YFlip - Y flip the image.
-*     SetImage - Set the image buffer.
-*     GetImage - Get the current image buffer address.
-*     SetPalette - Set the palette buffer.
-*     GetPalette - Retrieve the current palette buffer address.
-*     GetExtension - Get Extension data. (Targa 2.0 files only)
-*
-* PRIVATE
-*     DecodeImage - Decompress Targa image data.
-*     EncodeImage - Compress the image using targa RLE.
-*     InvertImage - Invert TrueColor image data.
-*
-* MODIFICATIONS:
-*     Converted to work with FileClass, FileFactory (changes are inside
-*     ifdefs, so can be easily reversed). Naty Hoffman, January 25, 2001
-*
-****************************************************************************/
-
-#include "TARGA.H"
-#ifndef TGA_USES_WWLIB_FILE_CLASSES
-#include <stdio.h>
-#endif
-#include <malloc.h>
-#include <memory.h>
-#include <string.h>
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-#include "WWFILE.H"
-#include "ffactory.h"
-#else
-#include <io.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#endif
-
-#include <algorithm>
-#include <utility>
-
-/****************************************************************************
-*
-* NAME
-*     Targa::Targa - Initialize a Targa instance.
-*
-* SYNOPSIS
-*     Targa()
-*
-*     void Targa(void);
-*
-* FUNCTION
-*     Initialize the targa class instance.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-Targa::Targa(void)
-	{
-	mImage = NULL;
-	mPalette = NULL;
-	Clear_File();
-	mAccess = TGA_READMODE;
-	mFlags = 0;
-	memset(&Header, 0, sizeof(TGAHeader));
-	memset(&mExtension, 0, sizeof(TGA2Extension));
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::~Targa - Targa class destructor.
-*
-* SYNOPSIS
-*     ~Targa()
-*
-*     void ~Targa(void);
-*
-* FUNCTION
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-Targa::~Targa(void)
-{
-	/* Close the file if has been left open. */
-	Close();
-
-	/* Free the palette buffer if we allocated it. */
-	if ((mPalette != NULL) && (mFlags & TGAF_PAL))
-		free(mPalette);
-
-	/* Free the image buffer if we allocated it. */
-	if ((mImage != NULL) && (mFlags & TGAF_IMAGE))
-		free(mImage);
-}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::Open - Open Targa image file.
-*
-* SYNOPSIS
-*     Error = Open(Name, Mode)
-*
-*     long Open(char *, long);
-*
-* FUNCTION
-*     Open a Targa image file and read in its header. The file stream will
-*     positioned after the ID field (if there is one).
-*
-* INPUTS
-*     Name - Pointer to name of Targa file.
-*     Mode - Access mode.
-*
-* RESULT
-*     Error - Error code, 0 if okay.
-*
-****************************************************************************/
-
-long Targa::Open(const char* name, long mode)
-{
-	TGA2Footer	footer;
-	long			size;
-	long			error = 0;
-	memset(&footer, 0, sizeof(footer));
-
-	/* File already open? */
-	if (Is_File_Open() && (mAccess == mode)) {
-		return (0);
-	}
-
-	Close();
-
-	/* Initialize the access mode. */
-	mAccess = mode;
-	mFlags &= ~TGAF_TGA2;
-
-	switch (mode) {
-
-		/* Open targa file for read. */
-		case TGA_READMODE:
-			if (File_Open_Read(name)) {
-
-				/* Check for 2.0 targa file by loading the footer */
-				if (File_Seek(-26, SEEK_END) == -1) {
-					error = TGAERR_READ;
-				}
-
-				if (!error) {
-					if (File_Read(&footer, sizeof(TGA2Footer)) != sizeof(TGA2Footer)) {
-						error = TGAERR_READ;
-					} else {
-						/* If this a 2.0 file with an extension? */
-						if (strncmp(footer.Signature, TGA2_SIGNATURE, 16) == 0) {
-							if (footer.Extension != 0) {
-								mFlags |= TGAF_TGA2;
-							}
-						}
-					}
-				}
-
-				/* Read in Extension data */
-				if (!error && (mFlags & TGAF_TGA2)) {
-
-					if (File_Seek(footer.Extension, SEEK_SET) == -1) {
-						error = TGAERR_READ;
-					}
-
-					if (!error) {
-						if (File_Read(&mExtension, sizeof(TGA2Extension)) != sizeof(TGA2Extension)) {
-							error = TGAERR_READ;
-						}
-					}
-				}
-
-				/* Read in header. */
-				if (!error && (File_Seek(0, SEEK_SET) == -1)) {
-					error = TGAERR_READ;
-				} else {
-
-					size = File_Read(&Header, sizeof(TGAHeader));
-					if (size != sizeof(TGAHeader)) {
-						error = TGAERR_READ;
-					}
-				}
-
-				/* Skip the ID field */
-				if (!error && (Header.IDLength != 0)) {
-					if (File_Seek(Header.IDLength, SEEK_CUR) == -1) {
-						error = TGAERR_READ;
-					}
-				}
-
-			} else {
-				error = TGAERR_OPEN;
-			}
-			break;
-
-		/* Open targa file for write. */
-		case TGA_WRITEMODE:
-			if (!File_Open_Write(name)) {
-				error = TGAERR_OPEN;
-			} else {
-//				printf("\r");
-			}
-			break;
-
-		/* Open targa file for read/write.*/
-		case TGA_RDWRMODE:
-			if (File_Open_ReadWrite(name)) {
-
-				/* Read in header. */
-				size = File_Read(&Header, sizeof(TGAHeader));
-
-				if (size != sizeof(TGAHeader)) {
-					error = TGAERR_READ;
-				}
-				/* Skip the ID field */
-				if (!error && (Header.IDLength != 0)) {
-					if (File_Seek(Header.IDLength, SEEK_CUR) == -1) {
-						error = TGAERR_READ;
-					}
-				}
-
-			} else {
-				error = TGAERR_OPEN;
-			}
-			break;
-	}
- 
-	/* Close on any error! */
-	if (error) {
-		Close();
-	}
-
-	return (error);
-}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::Close - Close Targa image file.
-*
-* SYNOPSIS
-*     Close()
-*
-*     void Close(void);
-*
-* FUNCTION
-*     Close the Targa image file and free its handle.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-void Targa::Close(void)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	if (TGAFile) {
-		TGAFile->Close();
-		_TheFileFactory->Return_File(TGAFile);
-		TGAFile = NULL;
-	}
-#else
-	/* Close the file if it is open. */
-	if (mFH != -1) {
-		close(mFH);
-		mFH = -1;
-	}
-#endif
-}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::Load - Load Targa Image File into specified buffers.
-*
-* SYNOPSIS
-*     Error = Load(Name, Palette, ImageBuffer)
-*
-*     long Load(char *, char *, char *);
-*
-* FUNCTION
-*     Open and load the Targa into the specified buffers. If either buffer
-*     pointer is NULL then that field will not be processed.
-*
-* INPUTS
-*     Name        - Name of Targa image file to load.
-*     Palette     - Pointer to buffer to load the palette into.
-*     ImageBuffer - Pointer to buffer to load the image data into.
-*
-* RESULT
-*     Error - 0 if successful, or TGAERR_??? error code.
-*
-****************************************************************************/
-
-long Targa::Load(const char* name, char* palette, char* image,bool invert_image)
-{
-	long size;
-	long depth;
-	long error = 0;
-
-	/* Open the Targa */
-	if (Open(name, TGA_READMODE) == NULL) {
-
-		/* Process ColorMap (palette) */
-		if (Header.ColorMapType == 1) {
-
-			depth = (Header.CMapDepth >> 3);
-			size = (Header.CMapLength * depth);
-
-			/* Load the palette from the TGA if a palette buffer is provided
-			 * otherwise we will skip it.
-			 */
-			if ((palette != NULL) && (Header.CMapLength > 0)) {
-
-				/* Adjust palette to the starting color entry. */
-				palette += (Header.CMapStart * depth);
-
-				/* Read in the palette. */
-				if (File_Read(palette, size) != size) {
-					error = TGAERR_READ;
-				}
-
-			} else {
-				if (File_Seek(size, SEEK_CUR) == -1) {
-					error = TGAERR_READ;
-				}
-			}
-		}
-
-		/* Load the image data from the TGA if an image buffer is provided
-		 * otherwise we are done.
-		 */
-		if (!error && (image != NULL)) {
-
-			depth = TGA_BytesPerPixel(Header.PixelDepth);
-			size = ((Header.Width * Header.Height) * depth);
-
-			switch (Header.ImageType) {
-				case TGA_CMAPPED:
-					if (File_Read(image, size) != size) {
-						error = TGAERR_READ;
-					}
-					break;
-
-				case TGA_TRUECOLOR:
-					if (File_Read(image, size) == size) {
-						if (invert_image) InvertImage();
-					} else {
-						error = TGAERR_READ;
-					}
-					break;
-
-				case TGA_MONO:
-					if (File_Read(image, size) != size) {
-						error = TGAERR_READ;
-					}
-					break;
-
-				case TGA_CMAPPED_ENCODED:
-					error = DecodeImage();
-					break;
-
-				case TGA_TRUECOLOR_ENCODED:
-					if ((error = DecodeImage()) == NULL) {
-						if (invert_image) InvertImage();
-					}
-					break;
-
-				default:
-					error = TGAERR_NOTSUPPORTED;
-					break;
-			}
-
-			/* Arrange the image so that the origin position (coordinate 0,0)
-			 * is the upperleft hand corner of the image.
-			 */
-			if (!error) {
-				if ( Header.ImageDescriptor & TGAIDF_XORIGIN ) {
-					XFlip();
-					Header.ImageDescriptor &= ~TGAIDF_XORIGIN;
-				}
-				
-				// Mod (IML) : Locate the origin at the bottom-left corner instead. This
-				// will make ot consistent with .TGA's that have been generated with our
-				// existing software.
-				//	if (( Header.ImageDescriptor & TGAIDF_YORIGIN ) == 0){
-				if ( Header.ImageDescriptor & TGAIDF_YORIGIN ) {
-					YFlip();
-					//	Bug fix (IML) : Clear this flag to indicate to the targa reader
-					// that the Y-origin is at the bottom of the image. 
-					Header.ImageDescriptor &= ~TGAIDF_YORIGIN;
-				}
-			}
-		}
-
-		/* Close the Targa */
-		Close();
-
-	} else {
-		error = TGAERR_OPEN;
-	}
-
-	return (error);
-}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::Load - Load Targa Image File. (Auto buffer allocation).
-*
-* SYNOPSIS
-*     Error = Load(Name, Flags)
-*
-*     long Load(char, long);
-*
-* FUNCTION
-*     Open and load the Targa into buffers allocated by this function.
-*
-* INPUTS
-*     Name  - Name of Targa image file to load.
-*     Flags -
-*
-* RESULT
-*     Error - 0 if successful, or TGAERR_??? error code.
-*
-****************************************************************************/
-
-long Targa::Load(const char* name, long flags, bool invert_image)
-{
-	long size;
-	long error = 0;
-
-	/* Open the file to get the header. */
-	if (Open(name, TGA_READMODE) == 0) {
-
-		/* Allocate palette memory if requested to and the targa has one. */
-		if ((flags & TGAF_PAL) && (Header.ColorMapType == 1)) {
-
-			/* Dispose of any previous palette. */
-			if ((mPalette != NULL) && (mFlags & TGAF_PAL)) {
-				free(mPalette);
-				mPalette = NULL;
-				mFlags &= ~TGAF_PAL;
-			}
-
-			/* Only allocate a palette if the client hasn't assigned one. */
-			if ((mPalette == NULL) && !(mFlags & TGAF_PAL)) {
-
-				/* Compute the size of the palette from the targa header. */
-				size = (Header.CMapLength * (Header.CMapDepth >> 3));
-
-				if (size != 0) {
-					/* Allocate memory for the palette. */
-					if ((mPalette = (char *)malloc(size)) != NULL) {
-						mFlags |= TGAF_PAL; /* We allocated the palette. */
-					} else {
-						error = TGAERR_NOMEM;
-					}
-				}
-			}
-		}
-
-		/* Allocate image memory if requested to. */
-		if (!error && (flags & TGAF_IMAGE)) {
-
-			/* Dispose of any previous image. */
-			if ((mImage != NULL) && (mFlags & TGAF_IMAGE)) {
-				free(mImage);
-				mImage = NULL;
-				mFlags &= ~TGAF_IMAGE;
-			}
-
-			/* Only allocate an image if the client hasn't assigned one. */
-			if ((mImage == NULL) && !(mFlags & TGAF_IMAGE)) {
-
-				/* Compute the size of the image data from the targa header. */
-				size = ((Header.Width * Header.Height) * TGA_BytesPerPixel(Header.PixelDepth));
-				if (size != 0) {
-					/* Allocate memory for the image. */
-					if ((mImage = (char *)malloc(size)) != NULL) {
-						mFlags |= TGAF_IMAGE; /* We allocated the image. */
-					} else {
-						error = TGAERR_NOMEM;
-					}
-				}
-			}
-		}
-
-		/* Read in the file contents. */
-		if (!error) {
-			error = Load(name, mPalette, mImage, invert_image);
-		}
-
-		/* Close the file. */
-		Close();
-
-	} else {
-		error = TGAERR_OPEN;
-	}
-
-	return (error);
-}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::Save - Save a Targa Image File.
-*
-* SYNOPSIS
-*     Error = Save(Name, Flags)
-*
-*     long Save(char *, long);
-*
-* FUNCTION
-*
-* INPUTS
-*     Name  - Pointer to name of file to save.
-*     Flags -
-*
-* RESULT
-*     Error - 0 if successful, or TGAERR_??? error code.
-*
-****************************************************************************/
-
-long Targa::Save(const char* name, long flags, bool addextension)
-	{
-	long size;
-	long depth;
-	char *palette;
-	char *temppal;
-	char *ptr;
-	//long i,n;
-	//char c;
-	long error = 0;
-	TGA2Footer footer;
-
-	/* Open the Targa for write. */
-	if (Open(name, TGA_WRITEMODE) == NULL)
-		{
-		Header.IDLength = 0;
-
-		/* Set the ImageType for compression. */
-		if (flags & TGAF_COMPRESS)
-			{
-			switch (Header.ImageType)
-				{
-				case TGA_CMAPPED:
-				case TGA_TRUECOLOR:
-				case TGA_MONO:
-					Header.ImageType += 8;
-				break;
-
-				case TGA_CMAPPED_ENCODED:
-				case TGA_TRUECOLOR_ENCODED:
-				case TGA_MONO_ENCODED:
-				break;
-
-				/* Turn off compression for unknown types. */
-				default:
-					flags &= ~TGAF_COMPRESS;
-				break;
-				}
-			}
-
-		/*-----------------------------------------------------------------------
-		 * WRITE THE HEADER DATA SECTION
-		 *---------------------------------------------------------------------*/
-		if (File_Write(&Header, sizeof(TGAHeader)) != sizeof(TGAHeader))
-			error = TGAERR_WRITE;
-
-		/*-----------------------------------------------------------------------
-		 * WRITE THE COLORMAP (PALETTE) DATA SECTION
-		 *---------------------------------------------------------------------*/
-		if (!error && (flags & TGAF_PAL) && (mPalette != NULL)
-				&& (Header.CMapLength > 0))
-			{
-			/* Adjust palette to the starting color entry. */
-			depth = (Header.CMapDepth >> 3);
-			palette = mPalette + (Header.CMapStart * depth);
-			size = (Header.CMapLength * depth);
-
-			/* Allocate temporary buffer for palette manipulation. */
-			if ((temppal = (char *)malloc(size)) != NULL)
-				{
-				memcpy(temppal, palette, size);
-				ptr = temppal;
-
-				#if(0)
-				/* Swap the byte ordering of the palette entries. */
-				for (i = 0; i < Header.CMapLength; i++)
-					{
-					c = *ptr;
-					*ptr = *(ptr + (depth - 1));
-					*(ptr + (depth - 1)) = c;
-
-					/* Next entry */
-					palette += depth;
-					}
-				#endif
-				
-				/* Write the palette. */
-				if (File_Write(temppal, size) != size)
-					error = TGAERR_WRITE;
-
-				/* Free temporary palette buffer. */
-				free(temppal);
-				}
-			else
-				error = TGAERR_NOMEM;
-			}
-
-		/*-----------------------------------------------------------------------
-		 * WRITE THE IMAGE DATA SECTION
-		 *---------------------------------------------------------------------*/
-		if (!error && (flags & TGAF_IMAGE) && (mImage != NULL))
-			{
-			
-			bool imageinverted;
-
-			/* Invert truecolor data. */
-			if ((Header.ImageType == TGA_TRUECOLOR) || (Header.ImageType == TGA_TRUECOLOR_ENCODED)) {
-				InvertImage();
-				imageinverted = true;
-			} else {
-				imageinverted = false;
-			}
-
-			/* Write the image. */
-			if (flags & TGAF_COMPRESS)
-				EncodeImage();
-			else
-				{
-				depth = TGA_BytesPerPixel(Header.PixelDepth);
-				size = (((Header.Width * Header.Height)) * depth);
-
-				if (File_Write(mImage, size) != size)
-					error = TGAERR_WRITE;
-				}
-
-			// Bug fix (IML) : If the image was inverted, invert it again to restore it to its prior state.
-			if (imageinverted) InvertImage();
-			}
-
-		/*-----------------------------------------------------------------------
-		 * WRITE THE EXTENSION DATA SECTION
-		 *---------------------------------------------------------------------*/
-
-		// Mod (IML) Optionally add an extension to the file.
-		if (addextension) {
-			if (!error) {
-
-				mExtension.ExtSize = 495;
-				strncpy(mExtension.SoftID, "Denzil's Targa Code", 41);
-				mExtension.SoftVer.Number = (1 * 100);
-				mExtension.SoftVer.Letter = 0;
-
-				/* Save position of extension area. */
-				if ((footer.Extension = File_Seek(0, SEEK_CUR)) == -1)
-					error = TGAERR_WRITE;
-
-				if (!error && (File_Write(&mExtension, sizeof(TGA2Extension))
-						!= sizeof(TGA2Extension)))
-					error = TGAERR_WRITE;
-			}
-		} else {
-			footer.Extension = 0;
-		}
-			
-		/*-----------------------------------------------------------------------
-		 * WRITE THE FOOTER DATA SECTION
-		 *---------------------------------------------------------------------*/
-		if (!error)
-			{
-			footer.Developer = 0;
-			strncpy(footer.Signature, TGA2_SIGNATURE, 16);
-			footer.RsvdChar = '.';
-			footer.BZST = 0;
-
-			if (File_Write(&footer, sizeof(TGA2Footer)) != sizeof(TGA2Footer))
-				error = TGAERR_WRITE;
-			}
-
-		/* Close targa file. */
-		Close();
-		}
-	else
-		error = TGAERR_OPEN;
-
-	return (error);
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::XFlip - X flip the image.
-*
-* SYNOPSIS
-*     XFlip()
-*
-*     void XFlip();
-*
-* FUNCTION
-*     Flip the image in memory on its X axis. (left to right)
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-void Targa::XFlip(void)
-	{
-	char *ptr,*ptr1;
-	long  x,y,d;
-	char  v,v1;
-	char  depth;
-
-	/* Pixel depth in bytes. */
-	depth = TGA_BytesPerPixel(Header.PixelDepth);
-
-	for (y = 0; y < Header.Height; y++)
-		{
-		ptr = (mImage + ((Header.Width * depth) * y));
-		ptr1 = (ptr + ((Header.Width * depth) - depth));
-
-		for (x = 0; x < (Header.Width / 2); x++)
-			{
-			for (d = 0; d < depth; d++)
-				{
-				v = *(ptr + d);
-				v1 = *(ptr1 + d);
-				*(ptr + d) = v1;
-				*(ptr1 + d) = v;
-				}
-
-			ptr += depth;
-			ptr1 -= depth;
-			}
-		}
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::YFlip - Y flip the image.
-*
-* SYNOPSIS
-*     YFlip()
-*
-*     void YFlip();
-*
-* FUNCTION
-*     Flip the image in memory on its Y axis. (top to bottom)
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-static __forceinline void _swapBytes(char *p1, char *p2, unsigned count)
-{
-#if defined(_MSC_VER) && _MSC_VER < 1300
-  _asm
-  {
-    mov esi,[p1]
-    mov edi,[p2]
-    mov ebx,[count]
-    mov ecx,ebx
-    shr ecx,4
-    jz  lessThan16
-  lp:
-    mov eax,dword ptr [esi]
-    mov edx,dword ptr [esi+4]
-    xchg eax,dword ptr [edi]
-    xchg edx,dword ptr [edi+4]
-    mov dword ptr [esi],eax
-    mov dword ptr [esi+4],edx
-    mov eax,dword ptr [esi+8]
-    mov edx,dword ptr [esi+12]
-    xchg eax,dword ptr [edi+8]
-    xchg edx,dword ptr [edi+12]
-    mov dword ptr [esi+8],eax
-    mov dword ptr [esi+12],edx
-    add esi,16
-    add edi,16
-    dec ecx
-    jnz lp
-  lessThan16:
-    and ebx,15
-  lpLessThan16:
-    jz done
-    mov al,byte ptr [esi]
-    xchg al,byte ptr [edi]
-    mov byte ptr [edi],al
-    inc esi
-    inc edi
-    dec ebx
-    jmp lpLessThan16
-  done:
-  }
-#else
-	std::swap_ranges(p1, p1 + count, p2);
-#endif
-}
-
-void Targa::YFlip(void)
-{
-  /* old code left in for reference...
-	char *ptr,*ptr1;
-	long  x,y;
-	char  v,v1;
-	char  depth;
-
-	/ * Pixel depth in bytes. * /
-	depth = TGA_BytesPerPixel(Header.PixelDepth);
-
-	for (y = 0; y < (Header.Height >> 1); y++)
-	{
-		/ * Compute address of lines to exchange. * /
-		ptr = (mImage + ((Header.Width * y) * depth));
-		ptr1 = (mImage + ((Header.Width * (Header.Height - 1)) * depth));
-		ptr1 -= ((Header.Width * y) * depth);
-
-		/ * Exchange all the pixels on this scan line. * /
-    
-		for (x = 0; x < (Header.Width * depth); x++)
-		{
-			v = *ptr;
-			v1 = *ptr1;
-			*ptr = v1;
-			*ptr1 = v;
-			ptr++;
-			ptr1++;
-		}
-	} 
-  */
-
-  unsigned stride=Header.Width*TGA_BytesPerPixel(Header.PixelDepth);
-  char *ptrTop=mImage,
-       *ptrBottom=mImage+stride*(Header.Height-1);
-  for (unsigned y=Header.Height/2;y;--y,ptrTop+=stride,ptrBottom-=stride)
-    _swapBytes(ptrTop,ptrBottom,stride);
-} 
-
-/****************************************************************************
-*
-* NAME
-*     Targa::SetImage - Set the image buffer.
-*
-* SYNOPSIS
-*     OldImage = SetImage(Image)
-*
-*     char *SetImage(char *);
-*
-* FUNCTION
-*     Set the image buffer to one provided by the caller.
-*
-* INPUTS
-*     Image - Pointer to buffer to use for the image buffer.
-*
-* RESULT
-*     OldImage - Previous caller assigned image buffer.
-*
-****************************************************************************/
-
-char *Targa::SetImage(char *buffer)
-{
-	char *oldbuffer = NULL;
-
-	/* Free any image buffer before assigning another. */
-	if ((mImage != NULL) && (mFlags & TGAF_IMAGE))
-	{
-		free(mImage);
-		mImage = NULL;
-		mFlags &= ~TGAF_IMAGE;
-	}
-
-	/* Get the old user buffer. */
-	if (mImage != NULL)
-		oldbuffer = mImage;
-
-	/* Assign the new image buffer. */
-	mImage = buffer;
-
-	return (oldbuffer);
-}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::SetPalette - Set the palette buffer.
-*
-* SYNOPSIS
-*     OldPal = SetPalette(Pal)
-*
-*     char *SetPalette(char *);
-*
-* FUNCTION
-*
-* INPUTS
-*     Pal - Pointer to buffer to use for palette.
-*
-* RESULT
-*     OldPal - Pointer to previous user palette.
-*
-****************************************************************************/
-
-char *Targa::SetPalette(char *buffer)
-{
-	char *oldbuffer = NULL;
-
-	/* Free any image buffer before assigning another. */
-	if ((mPalette != NULL) && (mFlags & TGAF_PAL))
-	{
-		free(mPalette);
-		mPalette = NULL;
-		mFlags &= ~TGAF_PAL;
-	}
-
-	/* Get the old user buffer. */
-	if (mPalette != NULL)
-		oldbuffer = mPalette;
-
-	/* Assign the new image buffer. */
-	mPalette = buffer;
-
-	return (oldbuffer);
-}
-
-
-bool Targa::IsCompressed(void)
-	{
-	if (Header.ImageType > 8)
-		return true;
-
-	return false;
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::GetExtension - Get Extension data. (Targa 2.0 files only)
-*
-* SYNOPSIS
-*     Ext = GetExtension()
-*
-*     TGA2Extension *GetExtension(void);
-*
-* FUNCTION
-*     Retrieve a pointer to the Targa 2.0 extension data area. If the file
-*     version is 1.0 OR there is no extensio area then a NULL will be returned.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     Ext - Pointer to Extension data, NULL if not available.
-*
-****************************************************************************/
-
-TGA2Extension *Targa::GetExtension(void)
-	{
-	if (mFlags & TGAF_TGA2)
-		return (&mExtension);
-
-	return (NULL);
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::DecodeImage - Decompress Targa image data.
-*
-* SYNOPSIS
-*     Error = DecodeImage()
-*
-*     long DecodeImage();
-*
-* FUNCTION
-*     Decode the RLE compressed image data into the specified buffer from
-*     the file I/O stream.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     Error - 0 if successful, or TGAERR_??? error code.
-*
-****************************************************************************/
-
-long Targa::DecodeImage()
-	{
-	char          *image;
-	char          *color;
-	unsigned char count;
-	unsigned char depth;
-	unsigned long pixel_count;
-	unsigned long size;
-	unsigned long c,i;
-	long          error = 0;
-
-	/* Initialize */
-	image = mImage;
-
-	/* Compute pixel depth in bytes. */
-	depth = TGA_BytesPerPixel(Header.PixelDepth);
-
-	/* Total number of pixels compressed in this image. */
-	pixel_count = (Header.Width * Header.Height);
-
-	while ((pixel_count > 0) && !error)
-		{
- 		/* Read count. */
-		if (File_Read(&count, 1) == 1)
-			{
-			/* If bit 8 of the count is set then we have a run of pixels,
-			 * otherwise the data is raw pixels.
-			 */
-			if (count & 0x80)
-				{
-				count &= 0x7F;
-				count++;
-
-				/* Read in run pixel. */
-				if (File_Read(image, depth) == depth)
-					{
-					color = image;
-					image += depth;
-
-					/* Repeat the pixel for the run count in the image buffer. */
-					for (c = 1; c < count; c++)
-						for (i = 0; i < depth; i++)
-							*image++ = *(color + i);
-					}
-				else
-					error = TGAERR_READ;
-				}
-			else
-				{
-				count++;
-				size = (count * depth);
-
-				/* Read in raw pixels. */
-				if ((unsigned)File_Read(image, size) == size)
-					image += size;
-				else
-					error = TGAERR_READ;
-				}
-
-			/* Adjust the pixel count. */
-			pixel_count -= count;
-			}
-		else
-			error = TGAERR_READ;
-		}
-
-	return (error);
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::EncodeImage - Compress the image using targa RLE.
-*
-* SYNOPSIS
-*     EncodeImage()
-*
-*     void EncodeImage(void);
-*
-* FUNCTION
-*     Encode the image data using the RLE algorithm outlined in the TARGA
-*     file specification.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-long Targa::EncodeImage()
-	{
-	char *packet;
-	long packet_index;
-	char *start;
-	char *end;
-	long depth;
-	long pixels;
-	long count;
-	long match;
-	long i;
-	long error = 0;
-
-	/* Initialize variables. */
-	depth = TGA_BytesPerPixel(Header.PixelDepth);
-
-	/* Allocate packet buffer to hold maximum encoded data run. */
-	if ((packet = (char *)malloc(128 * depth)) != NULL)
-		{
-		pixels = Header.Width * Header.Height;
-		start = mImage;
-		end = start;
-		count = 0;
-		packet[0] = 0;
-		packet_index = 1;
-
-		while ((pixels != 0) && !error)
-			{
-			match = 1;
-
-			/* Advance to the next pixel */
-			end += depth;
-			pixels--;
-
-			/* Compare pixels. */
-			for (i = 0; i < depth; i++)
-				{
-				if (start[i] != end[i])
-					{
-					match = 0;
-					break;
-					}
-				}
-
-			/* Run of pixels */
- 			if (match == 1)
-				{
-				count++;
-
-				/* Continue counting until the maximum has been reached. */
-				if (count < 128)
-					{
-					if (packet[0] == 0)
-						continue;
-					}
-				else
-					count--;
-				}
-
-			/* If there is a count then write out the run. Otherwise, write
-			 * the raw pixel to the packet.
-			 */
-			if ((count != 0) && (packet[0] == 0))
-				{
-				/* Run count */
-				packet[0] = (count | 0x80);
-
-				/* Run pixel */
-				for (i = 0; i < depth; i++)
-					packet[i + 1] = start[i];
-
-				/* Write the run packet. */
-				if (File_Write(packet, (depth + 1)) != (depth + 1))
-					error = TGAERR_WRITE;
-
-				/* Reposition start and reset. */
-				start = end;
-				count = 0;
-				packet[0] = 0;
-				}
-			else
-				{
-				if (count == 0)
-					{
-					/* Copy the raw pixel to the packet. */
-					for (i = 0; i < depth; i++)
-						packet[packet_index + i] = start[i];
-
-					/* Increment the raw packet count. */
-					packet[0]++;
-
-					/* Reposition start */
-					start = end;
-					packet_index += depth;
-					}
-
-				/* Write the raw packet if the packet is full or a run has started
-				 * or all the pixels have been processed.
-				 */
-				if ((packet[0] == 127) || (count != 0) || (pixels == 0))
-					{
-					i = packet[0];
-					packet[0]--;
-
-					if (File_Write(packet, ((i * depth) + 1)) != ((i * depth) + 1))
-						error = TGAERR_WRITE;
-
-					packet_index = 1;
-					packet[0] = 0;
-					}
-				}
-			}
-
-		/* Free the packet buffer. */
-		free(packet);
-		}
-	else
-		error = TGAERR_NOMEM;
-
-	return (error);
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::InvertImage - Invert TrueColor image data.
-*
-* SYNOPSIS
-*     InvertImage()
-*
-*     void InvertImage(void);
-*
-* FUNCTION
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-void Targa::InvertImage(void)
-	{
-	char *buffer;
-	long depth;
-	long pixel_count;
-	long i;
-	char c;
-
-	/* Initialize */
-	buffer = mImage;
-
-	/* Compute the pixel depth in bytes. */
-	depth = TGA_BytesPerPixel(Header.PixelDepth);
-
-	/* Total number of pixels in this image. */
-	pixel_count = (Header.Width * Header.Height);
-
-	/* 16-bit pixel layout is different that 24-bit and 32-bit. */
-	if (depth > 2)
-		{
-		while (pixel_count > 0)
-			{
-			for (i = 0; i < (depth / 2); i++)
-				{
-				c = *(buffer + i);
-				*(buffer + i) = *(buffer + ((depth - 1) - i));
-				*(buffer + ((depth - 1) - i)) = c;
-				}
-
-			/* Next pixel */
-			pixel_count--;
-			buffer += depth;
-			}
-		}
-	}
-
-
-/*
-** These functions are just for ease of ifdef'ing between standard io calls and FileClass.
-*/
-void Targa::Clear_File(void)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	TGAFile = NULL;
-#else
-	mFH = -1;
-#endif
-}
-bool Targa::Is_File_Open(void)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	return (TGAFile != NULL);
-#else
-	return (mFH != -1);
-#endif
-}
-bool Targa::File_Open_Read(const char* name)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	TGAFile = _TheFileFactory->Get_File(name);
-	if (TGAFile && TGAFile->Is_Available()) {
-		return (TGAFile->Open(FileClass::READ) != 0);
-	} else {
-		return false;
-	}
-#else
-	mFH = open(name, (O_RDONLY|O_BINARY));
-	return (mFH != -1);
-#endif
-}
-bool Targa::File_Open_Write(const char* name)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	TGAFile = _TheWritingFileFactory->Get_File(name);
-	if (TGAFile) {
-		return (TGAFile->Open(FileClass::WRITE) != 0);
-	} else {
-		return false;
-	}
-#else
-	mFH = open(name, (O_CREAT|O_TRUNC|O_WRONLY|O_BINARY), (S_IREAD|S_IWRITE));
-	return (mFH != -1);
-#endif
-}
-bool Targa::File_Open_ReadWrite(const char* name)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	TGAFile = _TheWritingFileFactory->Get_File(name);
-	if (TGAFile && TGAFile->Is_Available()) {
-		return (TGAFile->Open(FileClass::READ|FileClass::WRITE) != 0);
-	} else {
-		return false;
-	}
-#else
-	mFH = open(name, (O_RDWR|O_BINARY), (S_IREAD|S_IWRITE));
-	return (mFH != -1);
-#endif
-}
-int Targa::File_Seek(int pos, int dir)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	return TGAFile->Seek(pos, dir);
-#else
-	return lseek(mFH, pos, dir);
-#endif
-}
-int Targa::File_Read(void *buffer, int size)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	return TGAFile->Read(buffer, size);
-#else
-	return read(mFH, buffer, size);
-#endif
-}
-int Targa::File_Write(void *buffer, int size)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	return TGAFile->Write(buffer, size);
-#else
-	return write(mFH, buffer, size);
-#endif
-}
-
-// ----------------------------------------------------------------------------
-//
-// Output targa load error message.
-//
-// ----------------------------------------------------------------------------
-
-long Targa_Error_Handler(long load_err,const char* filename)
-{
-	switch (load_err) {
-	case 0:
-		return 0;
-	case TGAERR_OPEN:
-		WWDEBUG_SAY(("Targa: Failed to open file \"%s\"\n", filename));
-		break;
-
-	case TGAERR_READ:
-		WWDEBUG_SAY(("Targa: Failed to read file \"%s\"\n", filename));
-		break;
-
-	case TGAERR_NOTSUPPORTED:
-		WWDEBUG_SAY(("Targa: File \"%s\" is an unsupported Targa type\n", filename));
-		break;
-
-	case TGAERR_NOMEM:
-		WWDEBUG_SAY(("Targa: Failed to allocate memory for file \"%s\"\n", filename));
-		break;
-
-	default:
-		WWDEBUG_SAY(("Targa: Unknown error when loading file \"%s\"\n", filename));
-		break;
-	}
-	return load_err;
-}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/TARGA.H b/Core/Libraries/Source/WWVegas/WWLib/TARGA.H
deleted file mode 100644
index 37588d90021..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/TARGA.H
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _TARGA_H_
-#define _TARGA_H_
-/****************************************************************************
-*
-*         C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S
-*
-*----------------------------------------------------------------------------
-*
-* FILE
-*     Targa.h
-* 
-* DESCRIPTION
-*     Targa image file class definitions.
-*
-* PROGRAMMER
-*     Denzil E. Long, Jr.
-*
-* DATE
-*     July 15, 1998
-*
-****************************************************************************/
-
-#pragma pack(push, 1)
-
-// If you wish to display loading error messages call targa functions inside of
-// the following macro - for example TARGA_ERROR_HANDLER(targa.Open(filename, TGA_READMODE));
-// The error code is returned back from the handler so it can be used in an expression.
-long Targa_Error_Handler(long error_code,const char* filename);
-#define TARGA_ERROR_HANDLER(call,filename) Targa_Error_Handler(call,filename)
-
-/*---------------------------------------------------------------------------
- * STRUCTURES AND RELATED DEFINITIONS
- *-------------------------------------------------------------------------*/
-
-/* TGAHeader - Targa Image File header.
- *
- * IDLength        - Size of Image ID field
- * ColorMapType    - Color map type.
- * ImageType       - Image type code.
- * CMapStart       - Color map origin.
- * CMapLength      - Color map length.
- * CMapDepth       - Depth of color map entries.
- * XOffset         - X origin of image.
- * YOffset         - Y origin of image.
- * Width           - Width of image.
- * Height          - Height of image.
- * PixelDepth      - Image pixel size
- * ImageDescriptor - Image descriptor byte.
- */
-typedef struct _TGAHeader
-	{
-	char  IDLength;
-	char  ColorMapType;
-	char  ImageType;
-	short CMapStart;
-	short CMapLength;
-	char  CMapDepth;
-	short XOffset;
-	short YOffset;
-	short Width;
-	short Height;
-	char  PixelDepth;
-	char  ImageDescriptor;
-	} TGAHeader;
-
-/* ImageType definiton */
-#define TGA_NOIMAGE           0  /* No image data included in file */
-#define TGA_CMAPPED           1  /* Color-mapped image data */
-#define TGA_TRUECOLOR         2  /* Truecolor image data */
-#define TGA_MONO              3  /* Monochrome image data */
-#define TGA_CMAPPED_ENCODED   9  /* Color-mapped image data (Encoded) */
-#define TGA_TRUECOLOR_ENCODED 10 /* Truecolor image data (Encoded) */
-#define TGA_MONO_ENCODED      11 /* Monochrome image data (Encoded) */
-
-/* ImageDescriptor definition */
-#define TGAIDF_ATTRIB_BITS (0x0F<<0) /* Number of attribute bits per pixel */
-#define TGAIDF_XORIGIN     (1<<4)
-#define TGAIDF_YORIGIN     (1<<5)
-
-/* Access modes. */
-#define TGA_READMODE  0
-#define TGA_WRITEMODE 1
-#define TGA_RDWRMODE  2
-
-/* Error codes */
-#define TGAERR_OPEN         -1
-#define TGAERR_READ         -2
-#define TGAERR_WRITE        -3
-#define TGAERR_SYNTAX       -4
-#define TGAERR_NOMEM        -5
-#define TGAERR_NOTSUPPORTED -6
-
-/* Flags definitions */
-#define TGAF_IMAGE    (1<<0)
-#define TGAF_PAL      (1<<1)
-#define TGAF_COMPRESS (1<<2)
-#define TGAF_TGA2     (1<<3)
-
-/* Macro definitions */
-#define TGA_BytesPerPixel(a) ((a+7) >> 3)
-
-/*---------------------------------------------------------------------------
- * TARGA 2.0 DEFINITIONS
- *-------------------------------------------------------------------------*/
-
-#define TGA2_SIGNATURE "TRUEVISION-XFILE"
-
-/* TGA2Footer - Targa 2.0 footer
- *
- * Extension - Offset to the Extension area from start of file.
- * Developer - Offset to the Developer area from start of file.
- * Signature - 16 byte Targa 2.0 signature "TRUEVISION-XFILE"
- * RsvdChar  - Reserved character, must be ASCII "." (period)
- * BZST      - Binary Zero String Terminator.
- */
-typedef struct _TGA2Footer
-	{
-	long Extension;
-	long Developer;
-	char Signature[16];
-	char RsvdChar;
-	char BZST;
-	_TGA2Footer() {}
-	} TGA2Footer;
-
-/* TGA2DateStamp - A series of 3 WORD values which define the integer value
- *                 for the date the image was saved.
- *
- * Month - Month number (1 - 12)
- * Day   - Day number (1 - 31)
- * Year  - Year number (4 digit, ie. 1989)
- */
-typedef struct _TGA2DateStamp
-	{
-	short Month;
-	short Day;
-	short Year;
-	} TGA2DateStamp;
-
-/* TGA2TimeStamp - A series of 3 WORD values which define the integer value
- *                 for the time the image was saved.
- *
- * Hour   - Hour number, military time (0 - 23)
- * Minute - Minute number (0 - 59)
- * Second - Second number (0 - 59)
- */
-typedef struct _TGA2TimeStamp
-	{
-	short Hour;
-	short Minute;
-	short Second;
-	} TGA2TimeStamp;
-
-/* TGA2SoftVer - Define the version of the software used to generate file.
- *
- * Number - Version number * 100
- * Letter - Version letter
- */
-typedef struct _TGA2SoftVer
-	{
-	short Number;
-	char  Letter;
-	} TGA2SoftVer;
-
-/* TGA2Ratio - Numerator and denominator which when taken together specify
- *             a ratio.
- *
- * Numer - Numerator
- * Denom - Denominator (a value of zero indicates no ratio specified)
- */
-typedef struct _TGA2Ratio
-	{
-	short Numer;
-	short Denom;
-	} TGA2Ratio;
-
-/* TGA2Extension - Extension area, provided for additional file information.
- *                 This data is pointed to by the Extension offset in the
- *                 TGA2Footer.
- *
- * ExtSize     - Extension area size. (495 bytes for 2.0)
- * AuthName    - Name of the person who created image (NULL terminated ASCII)
- * AuthComment - Comments of the author (NULL terminated ASCII)
- * DateStamp   - Date the file was created. (See TGA2DateStamp)
- * TimeStamp   - Time the file was created. (See TGA2TimeStamp)
- * JobName     - Name of job image belongs to (NULL terminated ASCII)
- * JobTime     - Elapsed time of the job.
- * SoftID      - ID of software used to create image (NULL terminated ASCII)
- * SoftVer     - Version number of software used.
- * KeyColor    - Tranparent color value.
- * Aspect      - Pixel aspect ratio.
- * Gamma       - Fractional gamma value.
- * ColorCor    - Color correction table offset.
- * PostStamp   - Postage stamp image offset.
- * ScanLine    - Scan line table offset.
- * Attributes  - Alpha channel attributes. (Set defines below)
- */
-typedef struct _TGA2Extension
-	{
-	short         ExtSize;
-	char          AuthName[41];
-	char          AuthComment[324];
-	TGA2DateStamp Date;
-	TGA2TimeStamp Time;
-	char          JobName[41];
-	TGA2TimeStamp JobTime;
-	char          SoftID[41];
-	TGA2SoftVer   SoftVer;
-	long          KeyColor;
-	TGA2Ratio     Aspect;
-	TGA2Ratio     Gamma;
-	long          ColorCor;
-	long          PostStamp;
-	long          ScanLine;
-	char          Attributes;
-	} TGA2Extension;
-
-/* Alpha channel attributes (Extension Area) */
-#define EXTA_NOALPHA 0  /* No alpha data included */
-#define EXTA_IGNORE  1  /* Undefined alpha data, can ignore */
-#define EXTA_RETAIN  2  /* Undefined alpha data, should retain */
-#define EXTA_USEFUL  3  /* Useful alpha channel */
-#define EXTA_PREMULT 4  /* Pre-Multiplied alpha data */
-
-#pragma pack(pop)
-
-/*
-** This define changes this code from code that works with standard IO calls,
-** to code that uses FileClass and FileFactoryClass.
-*/
-#define TGA_USES_WWLIB_FILE_CLASSES
-
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-class FileClass;
-#endif
-
-/*---------------------------------------------------------------------------
- * CLASS DEFINITION
- *-------------------------------------------------------------------------*/
-
-class Targa
-	{
-	public:
-		/* Constructor/destructor */
-		Targa(void);
-		~Targa();
-
-		/* Function prototypes. */
-		long Open(const char* name, long mode);
-		void Close(void);
-
-		long Load(const char* name, char* palette, char* image,bool invert_image=true);
-		long Load(const char* name, long flags, bool invert_image=true);
-		long Save(const char* name, long flags, bool addextension = false);
-		
-		void XFlip(void);
-		void YFlip(void);
-
-		char* SetImage(char* buffer);
-		char* GetImage(void) const {return (mImage);}
-		
-		char* SetPalette(char* buffer);
-		char* GetPalette(void) const {return (mPalette);}
-		
-		bool IsCompressed(void);
-
-		TGA2Extension* GetExtension(void);
-
-		TGAHeader Header;
-
-	protected:
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-		FileClass *TGAFile;
-#else
-		long mFH;
-#endif
-		long mAccess;
-		long mFlags;
-		char* mImage;
-		char* mPalette;
-		TGA2Extension mExtension;
-
-	private:
-		// Utility functions
-		long DecodeImage(void);
-		long EncodeImage(void);
-		void InvertImage(void);
-
-		// These functions are for ease of ifdef'ing between standard io calls
-		// and FileClass.
-		void Clear_File(void);
-		bool Is_File_Open(void);
-		bool File_Open_Read(const char* name);
-		bool File_Open_Write(const char* name);
-		bool File_Open_ReadWrite(const char* name);
-		int File_Seek(int pos, int dir);
-		int File_Read(void *buffer, int size);
-		int File_Write(void *buffer, int size);
-	};
-
-#endif /* _TARGA_H_ */
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/TARGA.cpp b/Core/Libraries/Source/WWVegas/WWLib/TARGA.cpp
new file mode 100644
index 00000000000..de3d8773d1b
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/TARGA.cpp
@@ -0,0 +1,1454 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/****************************************************************************
+*
+*        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S
+*
+*----------------------------------------------------------------------------
+*
+* FILE
+*     targa.cpp
+*
+* DESCRIPTION
+*     Targa image file class.
+*
+* PROGRAMMER
+*     Denzil E. Long, Jr.
+*
+* DATE
+*     August 8, 1995
+*
+*----------------------------------------------------------------------------
+*
+* PUBLIC
+*     Open - Open Targa image file.
+*     Close - Close Targa image file.
+*     Load - Load Targa image file.
+*     Save - Save a Targa Image File.
+*     XFlip - X flip the image.
+*     YFlip - Y flip the image.
+*     SetImage - Set the image buffer.
+*     GetImage - Get the current image buffer address.
+*     SetPalette - Set the palette buffer.
+*     GetPalette - Retrieve the current palette buffer address.
+*     GetExtension - Get Extension data. (Targa 2.0 files only)
+*
+* PRIVATE
+*     DecodeImage - Decompress Targa image data.
+*     EncodeImage - Compress the image using targa RLE.
+*     InvertImage - Invert TrueColor image data.
+*
+* MODIFICATIONS:
+*     Converted to work with FileClass, FileFactory (changes are inside
+*     ifdefs, so can be easily reversed). Naty Hoffman, January 25, 2001
+*
+****************************************************************************/
+
+#include "TARGA.h"
+#ifndef TGA_USES_WWLIB_FILE_CLASSES
+#include "WWDebug/wwdebug.h"
+#endif
+#include <malloc.h>
+#include <memory.h>
+#include "stringex.h"
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+#include "WWFILE.h"
+#include "ffactory.h"
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#endif
+
+#include <algorithm>
+#include <utility>
+
+/****************************************************************************
+*
+* NAME
+*     Targa::Targa - Initialize a Targa instance.
+*
+* SYNOPSIS
+*     Targa()
+*
+*     void Targa(void);
+*
+* FUNCTION
+*     Initialize the targa class instance.
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+Targa::Targa(void)
+	{
+	mImage = NULL;
+	mPalette = NULL;
+	Clear_File();
+	mAccess = TGA_READMODE;
+	mFlags = 0;
+	memset(&Header, 0, sizeof(TGAHeader));
+	memset(&mExtension, 0, sizeof(TGA2Extension));
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::~Targa - Targa class destructor.
+*
+* SYNOPSIS
+*     ~Targa()
+*
+*     void ~Targa(void);
+*
+* FUNCTION
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+Targa::~Targa(void)
+{
+	/* Close the file if has been left open. */
+	Close();
+
+	/* Free the palette buffer if we allocated it. */
+	if ((mPalette != NULL) && (mFlags & TGAF_PAL))
+		free(mPalette);
+
+	/* Free the image buffer if we allocated it. */
+	if ((mImage != NULL) && (mFlags & TGAF_IMAGE))
+		free(mImage);
+}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::Open - Open Targa image file.
+*
+* SYNOPSIS
+*     Error = Open(Name, Mode)
+*
+*     long Open(char *, long);
+*
+* FUNCTION
+*     Open a Targa image file and read in its header. The file stream will
+*     positioned after the ID field (if there is one).
+*
+* INPUTS
+*     Name - Pointer to name of Targa file.
+*     Mode - Access mode.
+*
+* RESULT
+*     Error - Error code, 0 if okay.
+*
+****************************************************************************/
+
+long Targa::Open(const char* name, long mode)
+{
+	TGA2Footer	footer;
+	long			size;
+	long			error = 0;
+	memset(&footer, 0, sizeof(footer));
+
+	/* File already open? */
+	if (Is_File_Open() && (mAccess == mode)) {
+		return (0);
+	}
+
+	Close();
+
+	/* Initialize the access mode. */
+	mAccess = mode;
+	mFlags &= ~TGAF_TGA2;
+
+	switch (mode) {
+
+		/* Open targa file for read. */
+		case TGA_READMODE:
+			if (File_Open_Read(name)) {
+
+				/* Check for 2.0 targa file by loading the footer */
+				if (File_Seek(-26, SEEK_END) == -1) {
+					error = TGAERR_READ;
+				}
+
+				if (!error) {
+					if (File_Read(&footer, sizeof(TGA2Footer)) != sizeof(TGA2Footer)) {
+						error = TGAERR_READ;
+					} else {
+						/* If this a 2.0 file with an extension? */
+						if (strncmp(footer.Signature, TGA2_SIGNATURE, 16) == 0) {
+							if (footer.Extension != 0) {
+								mFlags |= TGAF_TGA2;
+							}
+						}
+					}
+				}
+
+				/* Read in Extension data */
+				if (!error && (mFlags & TGAF_TGA2)) {
+
+					if (File_Seek(footer.Extension, SEEK_SET) == -1) {
+						error = TGAERR_READ;
+					}
+
+					if (!error) {
+						if (File_Read(&mExtension, sizeof(TGA2Extension)) != sizeof(TGA2Extension)) {
+							error = TGAERR_READ;
+						}
+					}
+				}
+
+				/* Read in header. */
+				if (!error && (File_Seek(0, SEEK_SET) == -1)) {
+					error = TGAERR_READ;
+				} else {
+
+					size = File_Read(&Header, sizeof(TGAHeader));
+					if (size != sizeof(TGAHeader)) {
+						error = TGAERR_READ;
+					}
+				}
+
+				/* Skip the ID field */
+				if (!error && (Header.IDLength != 0)) {
+					if (File_Seek(Header.IDLength, SEEK_CUR) == -1) {
+						error = TGAERR_READ;
+					}
+				}
+
+			} else {
+				error = TGAERR_OPEN;
+			}
+			break;
+
+		/* Open targa file for write. */
+		case TGA_WRITEMODE:
+			if (!File_Open_Write(name)) {
+				error = TGAERR_OPEN;
+			} else {
+//				printf("\r");
+			}
+			break;
+
+		/* Open targa file for read/write.*/
+		case TGA_RDWRMODE:
+			if (File_Open_ReadWrite(name)) {
+
+				/* Read in header. */
+				size = File_Read(&Header, sizeof(TGAHeader));
+
+				if (size != sizeof(TGAHeader)) {
+					error = TGAERR_READ;
+				}
+				/* Skip the ID field */
+				if (!error && (Header.IDLength != 0)) {
+					if (File_Seek(Header.IDLength, SEEK_CUR) == -1) {
+						error = TGAERR_READ;
+					}
+				}
+
+			} else {
+				error = TGAERR_OPEN;
+			}
+			break;
+	}
+
+	/* Close on any error! */
+	if (error) {
+		Close();
+	}
+
+	return (error);
+}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::Close - Close Targa image file.
+*
+* SYNOPSIS
+*     Close()
+*
+*     void Close(void);
+*
+* FUNCTION
+*     Close the Targa image file and free its handle.
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+void Targa::Close(void)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	if (TGAFile) {
+		TGAFile->Close();
+		_TheFileFactory->Return_File(TGAFile);
+		TGAFile = NULL;
+	}
+#else
+	/* Close the file if it is open. */
+	if (mFH != -1) {
+		close(mFH);
+		mFH = -1;
+	}
+#endif
+}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::Load - Load Targa Image File into specified buffers.
+*
+* SYNOPSIS
+*     Error = Load(Name, Palette, ImageBuffer)
+*
+*     long Load(char *, char *, char *);
+*
+* FUNCTION
+*     Open and load the Targa into the specified buffers. If either buffer
+*     pointer is NULL then that field will not be processed.
+*
+* INPUTS
+*     Name        - Name of Targa image file to load.
+*     Palette     - Pointer to buffer to load the palette into.
+*     ImageBuffer - Pointer to buffer to load the image data into.
+*
+* RESULT
+*     Error - 0 if successful, or TGAERR_??? error code.
+*
+****************************************************************************/
+
+long Targa::Load(const char* name, char* palette, char* image,bool invert_image)
+{
+	long size;
+	long depth;
+	long error = 0;
+
+	/* Open the Targa */
+	if (Open(name, TGA_READMODE) == NULL) {
+
+		/* Process ColorMap (palette) */
+		if (Header.ColorMapType == 1) {
+
+			depth = (Header.CMapDepth >> 3);
+			size = (Header.CMapLength * depth);
+
+			/* Load the palette from the TGA if a palette buffer is provided
+			 * otherwise we will skip it.
+			 */
+			if ((palette != NULL) && (Header.CMapLength > 0)) {
+
+				/* Adjust palette to the starting color entry. */
+				palette += (Header.CMapStart * depth);
+
+				/* Read in the palette. */
+				if (File_Read(palette, size) != size) {
+					error = TGAERR_READ;
+				}
+
+			} else {
+				if (File_Seek(size, SEEK_CUR) == -1) {
+					error = TGAERR_READ;
+				}
+			}
+		}
+
+		/* Load the image data from the TGA if an image buffer is provided
+		 * otherwise we are done.
+		 */
+		if (!error && (image != NULL)) {
+
+			depth = TGA_BytesPerPixel(Header.PixelDepth);
+			size = ((Header.Width * Header.Height) * depth);
+
+			switch (Header.ImageType) {
+				case TGA_CMAPPED:
+					if (File_Read(image, size) != size) {
+						error = TGAERR_READ;
+					}
+					break;
+
+				case TGA_TRUECOLOR:
+					if (File_Read(image, size) == size) {
+						if (invert_image) InvertImage();
+					} else {
+						error = TGAERR_READ;
+					}
+					break;
+
+				case TGA_MONO:
+					if (File_Read(image, size) != size) {
+						error = TGAERR_READ;
+					}
+					break;
+
+				case TGA_CMAPPED_ENCODED:
+					error = DecodeImage();
+					break;
+
+				case TGA_TRUECOLOR_ENCODED:
+					if ((error = DecodeImage()) == NULL) {
+						if (invert_image) InvertImage();
+					}
+					break;
+
+				default:
+					error = TGAERR_NOTSUPPORTED;
+					break;
+			}
+
+			/* Arrange the image so that the origin position (coordinate 0,0)
+			 * is the upperleft hand corner of the image.
+			 */
+			if (!error) {
+				if ( Header.ImageDescriptor & TGAIDF_XORIGIN ) {
+					XFlip();
+					Header.ImageDescriptor &= ~TGAIDF_XORIGIN;
+				}
+
+				// Mod (IML) : Locate the origin at the bottom-left corner instead. This
+				// will make ot consistent with .TGA's that have been generated with our
+				// existing software.
+				//	if (( Header.ImageDescriptor & TGAIDF_YORIGIN ) == 0){
+				if ( Header.ImageDescriptor & TGAIDF_YORIGIN ) {
+					YFlip();
+					//	Bug fix (IML) : Clear this flag to indicate to the targa reader
+					// that the Y-origin is at the bottom of the image.
+					Header.ImageDescriptor &= ~TGAIDF_YORIGIN;
+				}
+			}
+		}
+
+		/* Close the Targa */
+		Close();
+
+	} else {
+		error = TGAERR_OPEN;
+	}
+
+	return (error);
+}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::Load - Load Targa Image File. (Auto buffer allocation).
+*
+* SYNOPSIS
+*     Error = Load(Name, Flags)
+*
+*     long Load(char, long);
+*
+* FUNCTION
+*     Open and load the Targa into buffers allocated by this function.
+*
+* INPUTS
+*     Name  - Name of Targa image file to load.
+*     Flags -
+*
+* RESULT
+*     Error - 0 if successful, or TGAERR_??? error code.
+*
+****************************************************************************/
+
+long Targa::Load(const char* name, long flags, bool invert_image)
+{
+	long size;
+	long error = 0;
+
+	/* Open the file to get the header. */
+	if (Open(name, TGA_READMODE) == 0) {
+
+		/* Allocate palette memory if requested to and the targa has one. */
+		if ((flags & TGAF_PAL) && (Header.ColorMapType == 1)) {
+
+			/* Dispose of any previous palette. */
+			if ((mPalette != NULL) && (mFlags & TGAF_PAL)) {
+				free(mPalette);
+				mPalette = NULL;
+				mFlags &= ~TGAF_PAL;
+			}
+
+			/* Only allocate a palette if the client hasn't assigned one. */
+			if ((mPalette == NULL) && !(mFlags & TGAF_PAL)) {
+
+				/* Compute the size of the palette from the targa header. */
+				size = (Header.CMapLength * (Header.CMapDepth >> 3));
+
+				if (size != 0) {
+					/* Allocate memory for the palette. */
+					if ((mPalette = (char *)malloc(size)) != NULL) {
+						mFlags |= TGAF_PAL; /* We allocated the palette. */
+					} else {
+						error = TGAERR_NOMEM;
+					}
+				}
+			}
+		}
+
+		/* Allocate image memory if requested to. */
+		if (!error && (flags & TGAF_IMAGE)) {
+
+			/* Dispose of any previous image. */
+			if ((mImage != NULL) && (mFlags & TGAF_IMAGE)) {
+				free(mImage);
+				mImage = NULL;
+				mFlags &= ~TGAF_IMAGE;
+			}
+
+			/* Only allocate an image if the client hasn't assigned one. */
+			if ((mImage == NULL) && !(mFlags & TGAF_IMAGE)) {
+
+				/* Compute the size of the image data from the targa header. */
+				size = ((Header.Width * Header.Height) * TGA_BytesPerPixel(Header.PixelDepth));
+				if (size != 0) {
+					/* Allocate memory for the image. */
+					if ((mImage = (char *)malloc(size)) != NULL) {
+						mFlags |= TGAF_IMAGE; /* We allocated the image. */
+					} else {
+						error = TGAERR_NOMEM;
+					}
+				}
+			}
+		}
+
+		/* Read in the file contents. */
+		if (!error) {
+			error = Load(name, mPalette, mImage, invert_image);
+		}
+
+		/* Close the file. */
+		Close();
+
+	} else {
+		error = TGAERR_OPEN;
+	}
+
+	return (error);
+}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::Save - Save a Targa Image File.
+*
+* SYNOPSIS
+*     Error = Save(Name, Flags)
+*
+*     long Save(char *, long);
+*
+* FUNCTION
+*
+* INPUTS
+*     Name  - Pointer to name of file to save.
+*     Flags -
+*
+* RESULT
+*     Error - 0 if successful, or TGAERR_??? error code.
+*
+****************************************************************************/
+
+long Targa::Save(const char* name, long flags, bool addextension)
+	{
+	long size;
+	long depth;
+	char *palette;
+	char *temppal;
+	char *ptr;
+	//long i,n;
+	//char c;
+	long error = 0;
+	TGA2Footer footer;
+
+	/* Open the Targa for write. */
+	if (Open(name, TGA_WRITEMODE) == NULL)
+		{
+		Header.IDLength = 0;
+
+		/* Set the ImageType for compression. */
+		if (flags & TGAF_COMPRESS)
+			{
+			switch (Header.ImageType)
+				{
+				case TGA_CMAPPED:
+				case TGA_TRUECOLOR:
+				case TGA_MONO:
+					Header.ImageType += 8;
+				break;
+
+				case TGA_CMAPPED_ENCODED:
+				case TGA_TRUECOLOR_ENCODED:
+				case TGA_MONO_ENCODED:
+				break;
+
+				/* Turn off compression for unknown types. */
+				default:
+					flags &= ~TGAF_COMPRESS;
+				break;
+				}
+			}
+
+		/*-----------------------------------------------------------------------
+		 * WRITE THE HEADER DATA SECTION
+		 *---------------------------------------------------------------------*/
+		if (File_Write(&Header, sizeof(TGAHeader)) != sizeof(TGAHeader))
+			error = TGAERR_WRITE;
+
+		/*-----------------------------------------------------------------------
+		 * WRITE THE COLORMAP (PALETTE) DATA SECTION
+		 *---------------------------------------------------------------------*/
+		if (!error && (flags & TGAF_PAL) && (mPalette != NULL)
+				&& (Header.CMapLength > 0))
+			{
+			/* Adjust palette to the starting color entry. */
+			depth = (Header.CMapDepth >> 3);
+			palette = mPalette + (Header.CMapStart * depth);
+			size = (Header.CMapLength * depth);
+
+			/* Allocate temporary buffer for palette manipulation. */
+			if ((temppal = (char *)malloc(size)) != NULL)
+				{
+				memcpy(temppal, palette, size);
+				ptr = temppal;
+
+				#if(0)
+				/* Swap the byte ordering of the palette entries. */
+				for (i = 0; i < Header.CMapLength; i++)
+					{
+					c = *ptr;
+					*ptr = *(ptr + (depth - 1));
+					*(ptr + (depth - 1)) = c;
+
+					/* Next entry */
+					palette += depth;
+					}
+				#endif
+
+				/* Write the palette. */
+				if (File_Write(temppal, size) != size)
+					error = TGAERR_WRITE;
+
+				/* Free temporary palette buffer. */
+				free(temppal);
+				}
+			else
+				error = TGAERR_NOMEM;
+			}
+
+		/*-----------------------------------------------------------------------
+		 * WRITE THE IMAGE DATA SECTION
+		 *---------------------------------------------------------------------*/
+		if (!error && (flags & TGAF_IMAGE) && (mImage != NULL))
+			{
+
+			bool imageinverted;
+
+			/* Invert truecolor data. */
+			if ((Header.ImageType == TGA_TRUECOLOR) || (Header.ImageType == TGA_TRUECOLOR_ENCODED)) {
+				InvertImage();
+				imageinverted = true;
+			} else {
+				imageinverted = false;
+			}
+
+			/* Write the image. */
+			if (flags & TGAF_COMPRESS)
+				EncodeImage();
+			else
+				{
+				depth = TGA_BytesPerPixel(Header.PixelDepth);
+				size = (((Header.Width * Header.Height)) * depth);
+
+				if (File_Write(mImage, size) != size)
+					error = TGAERR_WRITE;
+				}
+
+			// Bug fix (IML) : If the image was inverted, invert it again to restore it to its prior state.
+			if (imageinverted) InvertImage();
+			}
+
+		/*-----------------------------------------------------------------------
+		 * WRITE THE EXTENSION DATA SECTION
+		 *---------------------------------------------------------------------*/
+
+		// Mod (IML) Optionally add an extension to the file.
+		if (addextension) {
+			if (!error) {
+
+				mExtension.ExtSize = 495;
+				strcpy(mExtension.SoftID, "Denzil's Targa Code");
+				mExtension.SoftVer.Number = (1 * 100);
+				mExtension.SoftVer.Letter = 0;
+
+				/* Save position of extension area. */
+				if ((footer.Extension = File_Seek(0, SEEK_CUR)) == -1)
+					error = TGAERR_WRITE;
+
+				if (!error && (File_Write(&mExtension, sizeof(TGA2Extension))
+						!= sizeof(TGA2Extension)))
+					error = TGAERR_WRITE;
+			}
+		} else {
+			footer.Extension = 0;
+		}
+
+		/*-----------------------------------------------------------------------
+		 * WRITE THE FOOTER DATA SECTION
+		 *---------------------------------------------------------------------*/
+		if (!error)
+			{
+			footer.Developer = 0;
+			strlcpy(footer.Signature, TGA2_SIGNATURE, sizeof(footer.Signature));
+			footer.RsvdChar = '.';
+			footer.BZST = 0;
+
+			if (File_Write(&footer, sizeof(TGA2Footer)) != sizeof(TGA2Footer))
+				error = TGAERR_WRITE;
+			}
+
+		/* Close targa file. */
+		Close();
+		}
+	else
+		error = TGAERR_OPEN;
+
+	return (error);
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::XFlip - X flip the image.
+*
+* SYNOPSIS
+*     XFlip()
+*
+*     void XFlip();
+*
+* FUNCTION
+*     Flip the image in memory on its X axis. (left to right)
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+void Targa::XFlip(void)
+	{
+	char *ptr,*ptr1;
+	long  x,y,d;
+	char  v,v1;
+	char  depth;
+
+	/* Pixel depth in bytes. */
+	depth = TGA_BytesPerPixel(Header.PixelDepth);
+
+	for (y = 0; y < Header.Height; y++)
+		{
+		ptr = (mImage + ((Header.Width * depth) * y));
+		ptr1 = (ptr + ((Header.Width * depth) - depth));
+
+		for (x = 0; x < (Header.Width / 2); x++)
+			{
+			for (d = 0; d < depth; d++)
+				{
+				v = *(ptr + d);
+				v1 = *(ptr1 + d);
+				*(ptr + d) = v1;
+				*(ptr1 + d) = v;
+				}
+
+			ptr += depth;
+			ptr1 -= depth;
+			}
+		}
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::YFlip - Y flip the image.
+*
+* SYNOPSIS
+*     YFlip()
+*
+*     void YFlip();
+*
+* FUNCTION
+*     Flip the image in memory on its Y axis. (top to bottom)
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+static __forceinline void _swapBytes(char *p1, char *p2, unsigned count)
+{
+#if defined(_MSC_VER) && _MSC_VER < 1300
+  _asm
+  {
+    mov esi,[p1]
+    mov edi,[p2]
+    mov ebx,[count]
+    mov ecx,ebx
+    shr ecx,4
+    jz  lessThan16
+  lp:
+    mov eax,dword ptr [esi]
+    mov edx,dword ptr [esi+4]
+    xchg eax,dword ptr [edi]
+    xchg edx,dword ptr [edi+4]
+    mov dword ptr [esi],eax
+    mov dword ptr [esi+4],edx
+    mov eax,dword ptr [esi+8]
+    mov edx,dword ptr [esi+12]
+    xchg eax,dword ptr [edi+8]
+    xchg edx,dword ptr [edi+12]
+    mov dword ptr [esi+8],eax
+    mov dword ptr [esi+12],edx
+    add esi,16
+    add edi,16
+    dec ecx
+    jnz lp
+  lessThan16:
+    and ebx,15
+  lpLessThan16:
+    jz done
+    mov al,byte ptr [esi]
+    xchg al,byte ptr [edi]
+    mov byte ptr [edi],al
+    inc esi
+    inc edi
+    dec ebx
+    jmp lpLessThan16
+  done:
+  }
+#else
+	std::swap_ranges(p1, p1 + count, p2);
+#endif
+}
+
+void Targa::YFlip(void)
+{
+  /* old code left in for reference...
+	char *ptr,*ptr1;
+	long  x,y;
+	char  v,v1;
+	char  depth;
+
+	/ * Pixel depth in bytes. * /
+	depth = TGA_BytesPerPixel(Header.PixelDepth);
+
+	for (y = 0; y < (Header.Height >> 1); y++)
+	{
+		/ * Compute address of lines to exchange. * /
+		ptr = (mImage + ((Header.Width * y) * depth));
+		ptr1 = (mImage + ((Header.Width * (Header.Height - 1)) * depth));
+		ptr1 -= ((Header.Width * y) * depth);
+
+		/ * Exchange all the pixels on this scan line. * /
+
+		for (x = 0; x < (Header.Width * depth); x++)
+		{
+			v = *ptr;
+			v1 = *ptr1;
+			*ptr = v1;
+			*ptr1 = v;
+			ptr++;
+			ptr1++;
+		}
+	}
+  */
+
+  unsigned stride=Header.Width*TGA_BytesPerPixel(Header.PixelDepth);
+  char *ptrTop=mImage,
+       *ptrBottom=mImage+stride*(Header.Height-1);
+  for (unsigned y=Header.Height/2;y;--y,ptrTop+=stride,ptrBottom-=stride)
+    _swapBytes(ptrTop,ptrBottom,stride);
+}
+
+/****************************************************************************
+*
+* NAME
+*     Targa::SetImage - Set the image buffer.
+*
+* SYNOPSIS
+*     OldImage = SetImage(Image)
+*
+*     char *SetImage(char *);
+*
+* FUNCTION
+*     Set the image buffer to one provided by the caller.
+*
+* INPUTS
+*     Image - Pointer to buffer to use for the image buffer.
+*
+* RESULT
+*     OldImage - Previous caller assigned image buffer.
+*
+****************************************************************************/
+
+char *Targa::SetImage(char *buffer)
+{
+	char *oldbuffer = NULL;
+
+	/* Free any image buffer before assigning another. */
+	if ((mImage != NULL) && (mFlags & TGAF_IMAGE))
+	{
+		free(mImage);
+		mImage = NULL;
+		mFlags &= ~TGAF_IMAGE;
+	}
+
+	/* Get the old user buffer. */
+	if (mImage != NULL)
+		oldbuffer = mImage;
+
+	/* Assign the new image buffer. */
+	mImage = buffer;
+
+	return (oldbuffer);
+}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::SetPalette - Set the palette buffer.
+*
+* SYNOPSIS
+*     OldPal = SetPalette(Pal)
+*
+*     char *SetPalette(char *);
+*
+* FUNCTION
+*
+* INPUTS
+*     Pal - Pointer to buffer to use for palette.
+*
+* RESULT
+*     OldPal - Pointer to previous user palette.
+*
+****************************************************************************/
+
+char *Targa::SetPalette(char *buffer)
+{
+	char *oldbuffer = NULL;
+
+	/* Free any image buffer before assigning another. */
+	if ((mPalette != NULL) && (mFlags & TGAF_PAL))
+	{
+		free(mPalette);
+		mPalette = NULL;
+		mFlags &= ~TGAF_PAL;
+	}
+
+	/* Get the old user buffer. */
+	if (mPalette != NULL)
+		oldbuffer = mPalette;
+
+	/* Assign the new image buffer. */
+	mPalette = buffer;
+
+	return (oldbuffer);
+}
+
+
+bool Targa::IsCompressed(void)
+	{
+	if (Header.ImageType > 8)
+		return true;
+
+	return false;
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::GetExtension - Get Extension data. (Targa 2.0 files only)
+*
+* SYNOPSIS
+*     Ext = GetExtension()
+*
+*     TGA2Extension *GetExtension(void);
+*
+* FUNCTION
+*     Retrieve a pointer to the Targa 2.0 extension data area. If the file
+*     version is 1.0 OR there is no extensio area then a NULL will be returned.
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     Ext - Pointer to Extension data, NULL if not available.
+*
+****************************************************************************/
+
+TGA2Extension *Targa::GetExtension(void)
+	{
+	if (mFlags & TGAF_TGA2)
+		return (&mExtension);
+
+	return (NULL);
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::DecodeImage - Decompress Targa image data.
+*
+* SYNOPSIS
+*     Error = DecodeImage()
+*
+*     long DecodeImage();
+*
+* FUNCTION
+*     Decode the RLE compressed image data into the specified buffer from
+*     the file I/O stream.
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     Error - 0 if successful, or TGAERR_??? error code.
+*
+****************************************************************************/
+
+long Targa::DecodeImage()
+	{
+	char          *image;
+	char          *color;
+	unsigned char count;
+	unsigned char depth;
+	unsigned long pixel_count;
+	unsigned long size;
+	unsigned long c,i;
+	long          error = 0;
+
+	/* Initialize */
+	image = mImage;
+
+	/* Compute pixel depth in bytes. */
+	depth = TGA_BytesPerPixel(Header.PixelDepth);
+
+	/* Total number of pixels compressed in this image. */
+	pixel_count = (Header.Width * Header.Height);
+
+	while ((pixel_count > 0) && !error)
+		{
+ 		/* Read count. */
+		if (File_Read(&count, 1) == 1)
+			{
+			/* If bit 8 of the count is set then we have a run of pixels,
+			 * otherwise the data is raw pixels.
+			 */
+			if (count & 0x80)
+				{
+				count &= 0x7F;
+				count++;
+
+				/* Read in run pixel. */
+				if (File_Read(image, depth) == depth)
+					{
+					color = image;
+					image += depth;
+
+					/* Repeat the pixel for the run count in the image buffer. */
+					for (c = 1; c < count; c++)
+						for (i = 0; i < depth; i++)
+							*image++ = *(color + i);
+					}
+				else
+					error = TGAERR_READ;
+				}
+			else
+				{
+				count++;
+				size = (count * depth);
+
+				/* Read in raw pixels. */
+				if ((unsigned)File_Read(image, size) == size)
+					image += size;
+				else
+					error = TGAERR_READ;
+				}
+
+			/* Adjust the pixel count. */
+			pixel_count -= count;
+			}
+		else
+			error = TGAERR_READ;
+		}
+
+	return (error);
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::EncodeImage - Compress the image using targa RLE.
+*
+* SYNOPSIS
+*     EncodeImage()
+*
+*     void EncodeImage(void);
+*
+* FUNCTION
+*     Encode the image data using the RLE algorithm outlined in the TARGA
+*     file specification.
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+long Targa::EncodeImage()
+	{
+	char *packet;
+	long packet_index;
+	char *start;
+	char *end;
+	long depth;
+	long pixels;
+	long count;
+	long match;
+	long i;
+	long error = 0;
+
+	/* Initialize variables. */
+	depth = TGA_BytesPerPixel(Header.PixelDepth);
+
+	/* Allocate packet buffer to hold maximum encoded data run. */
+	if ((packet = (char *)malloc(128 * depth)) != NULL)
+		{
+		pixels = Header.Width * Header.Height;
+		start = mImage;
+		end = start;
+		count = 0;
+		packet[0] = 0;
+		packet_index = 1;
+
+		while ((pixels != 0) && !error)
+			{
+			match = 1;
+
+			/* Advance to the next pixel */
+			end += depth;
+			pixels--;
+
+			/* Compare pixels. */
+			for (i = 0; i < depth; i++)
+				{
+				if (start[i] != end[i])
+					{
+					match = 0;
+					break;
+					}
+				}
+
+			/* Run of pixels */
+ 			if (match == 1)
+				{
+				count++;
+
+				/* Continue counting until the maximum has been reached. */
+				if (count < 128)
+					{
+					if (packet[0] == 0)
+						continue;
+					}
+				else
+					count--;
+				}
+
+			/* If there is a count then write out the run. Otherwise, write
+			 * the raw pixel to the packet.
+			 */
+			if ((count != 0) && (packet[0] == 0))
+				{
+				/* Run count */
+				packet[0] = (count | 0x80);
+
+				/* Run pixel */
+				for (i = 0; i < depth; i++)
+					packet[i + 1] = start[i];
+
+				/* Write the run packet. */
+				if (File_Write(packet, (depth + 1)) != (depth + 1))
+					error = TGAERR_WRITE;
+
+				/* Reposition start and reset. */
+				start = end;
+				count = 0;
+				packet[0] = 0;
+				}
+			else
+				{
+				if (count == 0)
+					{
+					/* Copy the raw pixel to the packet. */
+					for (i = 0; i < depth; i++)
+						packet[packet_index + i] = start[i];
+
+					/* Increment the raw packet count. */
+					packet[0]++;
+
+					/* Reposition start */
+					start = end;
+					packet_index += depth;
+					}
+
+				/* Write the raw packet if the packet is full or a run has started
+				 * or all the pixels have been processed.
+				 */
+				if ((packet[0] == 127) || (count != 0) || (pixels == 0))
+					{
+					i = packet[0];
+					packet[0]--;
+
+					if (File_Write(packet, ((i * depth) + 1)) != ((i * depth) + 1))
+						error = TGAERR_WRITE;
+
+					packet_index = 1;
+					packet[0] = 0;
+					}
+				}
+			}
+
+		/* Free the packet buffer. */
+		free(packet);
+		}
+	else
+		error = TGAERR_NOMEM;
+
+	return (error);
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::InvertImage - Invert TrueColor image data.
+*
+* SYNOPSIS
+*     InvertImage()
+*
+*     void InvertImage(void);
+*
+* FUNCTION
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+void Targa::InvertImage(void)
+	{
+	char *buffer;
+	long depth;
+	long pixel_count;
+	long i;
+	char c;
+
+	/* Initialize */
+	buffer = mImage;
+
+	/* Compute the pixel depth in bytes. */
+	depth = TGA_BytesPerPixel(Header.PixelDepth);
+
+	/* Total number of pixels in this image. */
+	pixel_count = (Header.Width * Header.Height);
+
+	/* 16-bit pixel layout is different that 24-bit and 32-bit. */
+	if (depth > 2)
+		{
+		while (pixel_count > 0)
+			{
+			for (i = 0; i < (depth / 2); i++)
+				{
+				c = *(buffer + i);
+				*(buffer + i) = *(buffer + ((depth - 1) - i));
+				*(buffer + ((depth - 1) - i)) = c;
+				}
+
+			/* Next pixel */
+			pixel_count--;
+			buffer += depth;
+			}
+		}
+	}
+
+
+/*
+** These functions are just for ease of ifdef'ing between standard io calls and FileClass.
+*/
+void Targa::Clear_File(void)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	TGAFile = NULL;
+#else
+	mFH = -1;
+#endif
+}
+bool Targa::Is_File_Open(void)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	return (TGAFile != NULL);
+#else
+	return (mFH != -1);
+#endif
+}
+bool Targa::File_Open_Read(const char* name)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	TGAFile = _TheFileFactory->Get_File(name);
+	if (TGAFile && TGAFile->Is_Available()) {
+		return (TGAFile->Open(FileClass::READ) != 0);
+	} else {
+		return false;
+	}
+#else
+	mFH = open(name, (O_RDONLY|O_BINARY));
+	return (mFH != -1);
+#endif
+}
+bool Targa::File_Open_Write(const char* name)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	TGAFile = _TheWritingFileFactory->Get_File(name);
+	if (TGAFile) {
+		return (TGAFile->Open(FileClass::WRITE) != 0);
+	} else {
+		return false;
+	}
+#else
+	mFH = open(name, (O_CREAT|O_TRUNC|O_WRONLY|O_BINARY), (S_IREAD|S_IWRITE));
+	return (mFH != -1);
+#endif
+}
+bool Targa::File_Open_ReadWrite(const char* name)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	TGAFile = _TheWritingFileFactory->Get_File(name);
+	if (TGAFile && TGAFile->Is_Available()) {
+		return (TGAFile->Open(FileClass::READ|FileClass::WRITE) != 0);
+	} else {
+		return false;
+	}
+#else
+	mFH = open(name, (O_RDWR|O_BINARY), (S_IREAD|S_IWRITE));
+	return (mFH != -1);
+#endif
+}
+int Targa::File_Seek(int pos, int dir)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	return TGAFile->Seek(pos, dir);
+#else
+	return lseek(mFH, pos, dir);
+#endif
+}
+int Targa::File_Read(void *buffer, int size)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	return TGAFile->Read(buffer, size);
+#else
+	return read(mFH, buffer, size);
+#endif
+}
+int Targa::File_Write(void *buffer, int size)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	return TGAFile->Write(buffer, size);
+#else
+	return write(mFH, buffer, size);
+#endif
+}
+
+// ----------------------------------------------------------------------------
+//
+// Output targa load error message.
+//
+// ----------------------------------------------------------------------------
+
+long Targa_Error_Handler(long load_err,const char* filename)
+{
+	switch (load_err) {
+	case 0:
+		return 0;
+	case TGAERR_OPEN:
+		WWDEBUG_SAY(("Targa: Failed to open file \"%s\"", filename));
+		break;
+
+	case TGAERR_READ:
+		WWDEBUG_SAY(("Targa: Failed to read file \"%s\"", filename));
+		break;
+
+	case TGAERR_NOTSUPPORTED:
+		WWDEBUG_SAY(("Targa: File \"%s\" is an unsupported Targa type", filename));
+		break;
+
+	case TGAERR_NOMEM:
+		WWDEBUG_SAY(("Targa: Failed to allocate memory for file \"%s\"", filename));
+		break;
+
+	default:
+		WWDEBUG_SAY(("Targa: Unknown error when loading file \"%s\"", filename));
+		break;
+	}
+	return load_err;
+}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/TARGA.h b/Core/Libraries/Source/WWVegas/WWLib/TARGA.h
new file mode 100644
index 00000000000..f0e082a3f28
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/TARGA.h
@@ -0,0 +1,317 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/****************************************************************************
+*
+*         C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S
+*
+*----------------------------------------------------------------------------
+*
+* FILE
+*     Targa.h
+*
+* DESCRIPTION
+*     Targa image file class definitions.
+*
+* PROGRAMMER
+*     Denzil E. Long, Jr.
+*
+* DATE
+*     July 15, 1998
+*
+****************************************************************************/
+
+#pragma pack(push, 1)
+
+// If you wish to display loading error messages call targa functions inside of
+// the following macro - for example TARGA_ERROR_HANDLER(targa.Open(filename, TGA_READMODE));
+// The error code is returned back from the handler so it can be used in an expression.
+long Targa_Error_Handler(long error_code,const char* filename);
+#define TARGA_ERROR_HANDLER(call,filename) Targa_Error_Handler(call,filename)
+
+/*---------------------------------------------------------------------------
+ * STRUCTURES AND RELATED DEFINITIONS
+ *-------------------------------------------------------------------------*/
+
+/* TGAHeader - Targa Image File header.
+ *
+ * IDLength        - Size of Image ID field
+ * ColorMapType    - Color map type.
+ * ImageType       - Image type code.
+ * CMapStart       - Color map origin.
+ * CMapLength      - Color map length.
+ * CMapDepth       - Depth of color map entries.
+ * XOffset         - X origin of image.
+ * YOffset         - Y origin of image.
+ * Width           - Width of image.
+ * Height          - Height of image.
+ * PixelDepth      - Image pixel size
+ * ImageDescriptor - Image descriptor byte.
+ */
+typedef struct _TGAHeader
+	{
+	char  IDLength;
+	char  ColorMapType;
+	char  ImageType;
+	short CMapStart;
+	short CMapLength;
+	char  CMapDepth;
+	short XOffset;
+	short YOffset;
+	short Width;
+	short Height;
+	char  PixelDepth;
+	char  ImageDescriptor;
+	} TGAHeader;
+
+/* ImageType definiton */
+#define TGA_NOIMAGE           0  /* No image data included in file */
+#define TGA_CMAPPED           1  /* Color-mapped image data */
+#define TGA_TRUECOLOR         2  /* Truecolor image data */
+#define TGA_MONO              3  /* Monochrome image data */
+#define TGA_CMAPPED_ENCODED   9  /* Color-mapped image data (Encoded) */
+#define TGA_TRUECOLOR_ENCODED 10 /* Truecolor image data (Encoded) */
+#define TGA_MONO_ENCODED      11 /* Monochrome image data (Encoded) */
+
+/* ImageDescriptor definition */
+#define TGAIDF_ATTRIB_BITS (0x0F<<0) /* Number of attribute bits per pixel */
+#define TGAIDF_XORIGIN     (1<<4)
+#define TGAIDF_YORIGIN     (1<<5)
+
+/* Access modes. */
+#define TGA_READMODE  0
+#define TGA_WRITEMODE 1
+#define TGA_RDWRMODE  2
+
+/* Error codes */
+#define TGAERR_OPEN         -1
+#define TGAERR_READ         -2
+#define TGAERR_WRITE        -3
+#define TGAERR_SYNTAX       -4
+#define TGAERR_NOMEM        -5
+#define TGAERR_NOTSUPPORTED -6
+
+/* Flags definitions */
+#define TGAF_IMAGE    (1<<0)
+#define TGAF_PAL      (1<<1)
+#define TGAF_COMPRESS (1<<2)
+#define TGAF_TGA2     (1<<3)
+
+/* Macro definitions */
+#define TGA_BytesPerPixel(a) ((a+7) >> 3)
+
+/*---------------------------------------------------------------------------
+ * TARGA 2.0 DEFINITIONS
+ *-------------------------------------------------------------------------*/
+
+#define TGA2_SIGNATURE "TRUEVISION-XFILE"
+
+/* TGA2Footer - Targa 2.0 footer
+ *
+ * Extension - Offset to the Extension area from start of file.
+ * Developer - Offset to the Developer area from start of file.
+ * Signature - 16 byte Targa 2.0 signature "TRUEVISION-XFILE"
+ * RsvdChar  - Reserved character, must be ASCII "." (period)
+ * BZST      - Binary Zero String Terminator.
+ */
+typedef struct _TGA2Footer
+	{
+	long Extension;
+	long Developer;
+	char Signature[16];
+	char RsvdChar;
+	char BZST;
+	_TGA2Footer() {}
+	} TGA2Footer;
+
+/* TGA2DateStamp - A series of 3 WORD values which define the integer value
+ *                 for the date the image was saved.
+ *
+ * Month - Month number (1 - 12)
+ * Day   - Day number (1 - 31)
+ * Year  - Year number (4 digit, ie. 1989)
+ */
+typedef struct _TGA2DateStamp
+	{
+	short Month;
+	short Day;
+	short Year;
+	} TGA2DateStamp;
+
+/* TGA2TimeStamp - A series of 3 WORD values which define the integer value
+ *                 for the time the image was saved.
+ *
+ * Hour   - Hour number, military time (0 - 23)
+ * Minute - Minute number (0 - 59)
+ * Second - Second number (0 - 59)
+ */
+typedef struct _TGA2TimeStamp
+	{
+	short Hour;
+	short Minute;
+	short Second;
+	} TGA2TimeStamp;
+
+/* TGA2SoftVer - Define the version of the software used to generate file.
+ *
+ * Number - Version number * 100
+ * Letter - Version letter
+ */
+typedef struct _TGA2SoftVer
+	{
+	short Number;
+	char  Letter;
+	} TGA2SoftVer;
+
+/* TGA2Ratio - Numerator and denominator which when taken together specify
+ *             a ratio.
+ *
+ * Numer - Numerator
+ * Denom - Denominator (a value of zero indicates no ratio specified)
+ */
+typedef struct _TGA2Ratio
+	{
+	short Numer;
+	short Denom;
+	} TGA2Ratio;
+
+/* TGA2Extension - Extension area, provided for additional file information.
+ *                 This data is pointed to by the Extension offset in the
+ *                 TGA2Footer.
+ *
+ * ExtSize     - Extension area size. (495 bytes for 2.0)
+ * AuthName    - Name of the person who created image (NULL terminated ASCII)
+ * AuthComment - Comments of the author (NULL terminated ASCII)
+ * DateStamp   - Date the file was created. (See TGA2DateStamp)
+ * TimeStamp   - Time the file was created. (See TGA2TimeStamp)
+ * JobName     - Name of job image belongs to (NULL terminated ASCII)
+ * JobTime     - Elapsed time of the job.
+ * SoftID      - ID of software used to create image (NULL terminated ASCII)
+ * SoftVer     - Version number of software used.
+ * KeyColor    - Tranparent color value.
+ * Aspect      - Pixel aspect ratio.
+ * Gamma       - Fractional gamma value.
+ * ColorCor    - Color correction table offset.
+ * PostStamp   - Postage stamp image offset.
+ * ScanLine    - Scan line table offset.
+ * Attributes  - Alpha channel attributes. (Set defines below)
+ */
+typedef struct _TGA2Extension
+	{
+	short         ExtSize;
+	char          AuthName[41];
+	char          AuthComment[324];
+	TGA2DateStamp Date;
+	TGA2TimeStamp Time;
+	char          JobName[41];
+	TGA2TimeStamp JobTime;
+	char          SoftID[41];
+	TGA2SoftVer   SoftVer;
+	long          KeyColor;
+	TGA2Ratio     Aspect;
+	TGA2Ratio     Gamma;
+	long          ColorCor;
+	long          PostStamp;
+	long          ScanLine;
+	char          Attributes;
+	} TGA2Extension;
+
+/* Alpha channel attributes (Extension Area) */
+#define EXTA_NOALPHA 0  /* No alpha data included */
+#define EXTA_IGNORE  1  /* Undefined alpha data, can ignore */
+#define EXTA_RETAIN  2  /* Undefined alpha data, should retain */
+#define EXTA_USEFUL  3  /* Useful alpha channel */
+#define EXTA_PREMULT 4  /* Pre-Multiplied alpha data */
+
+#pragma pack(pop)
+
+/*
+** This define changes this code from code that works with standard IO calls,
+** to code that uses FileClass and FileFactoryClass.
+*/
+#define TGA_USES_WWLIB_FILE_CLASSES
+
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+class FileClass;
+#endif
+
+/*---------------------------------------------------------------------------
+ * CLASS DEFINITION
+ *-------------------------------------------------------------------------*/
+
+class Targa
+	{
+	public:
+		/* Constructor/destructor */
+		Targa(void);
+		~Targa();
+
+		/* Function prototypes. */
+		long Open(const char* name, long mode);
+		void Close(void);
+
+		long Load(const char* name, char* palette, char* image,bool invert_image=true);
+		long Load(const char* name, long flags, bool invert_image=true);
+		long Save(const char* name, long flags, bool addextension = false);
+
+		void XFlip(void);
+		void YFlip(void);
+
+		char* SetImage(char* buffer);
+		char* GetImage(void) const {return (mImage);}
+
+		char* SetPalette(char* buffer);
+		char* GetPalette(void) const {return (mPalette);}
+
+		bool IsCompressed(void);
+
+		TGA2Extension* GetExtension(void);
+
+		TGAHeader Header;
+
+	protected:
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+		FileClass *TGAFile;
+#else
+		long mFH;
+#endif
+		long mAccess;
+		long mFlags;
+		char* mImage;
+		char* mPalette;
+		TGA2Extension mExtension;
+
+	private:
+		// Utility functions
+		long DecodeImage(void);
+		long EncodeImage(void);
+		void InvertImage(void);
+
+		// These functions are for ease of ifdef'ing between standard io calls
+		// and FileClass.
+		void Clear_File(void);
+		bool Is_File_Open(void);
+		bool File_Open_Read(const char* name);
+		bool File_Open_Write(const char* name);
+		bool File_Open_ReadWrite(const char* name);
+		int File_Seek(int pos, int dir);
+		int File_Read(void *buffer, int size);
+		int File_Write(void *buffer, int size);
+	};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/Vector.H b/Core/Libraries/Source/WWVegas/WWLib/Vector.H
deleted file mode 100644
index f5eb7066f81..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/Vector.H
+++ /dev/null
@@ -1,1124 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/wwlib/vector.h                               $*
- *                                                                                             *
- *                      $Author:: Jani_p                                                      $*
- *                                                                                             *
- *                     $Modtime:: 1/16/02 11:40a                                              $*
- *                                                                                             *
- *                    $Revision:: 49                                                          $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *   VectorClass<T>::VectorClass -- Constructor for vector class.                              *
- *   VectorClass<T>::~VectorClass -- Default destructor for vector class.                      *
- *   VectorClass<T>::VectorClass -- Copy constructor for vector object.                        *
- *   VectorClass<T>::operator = -- The assignment operator.                                    *
- *   VectorClass<T>::operator == -- Equality operator for vector objects.                      *
- *   VectorClass<T>::Clear -- Frees and clears the vector.                                     *
- *   VectorClass<T>::Resize -- Changes the size of the vector.                                 *
- *   DynamicVectorClass<T>::DynamicVectorClass -- Constructor for dynamic vector.              *
- *   DynamicVectorClass<T>::Resize -- Changes the size of a dynamic vector.                    *
- *   DynamicVectorClass<T>::Add -- Add an element to the vector.                               *
- *   DynamicVectorClass<T>::Delete -- Remove the specified object from the vector.             *
- *   DynamicVectorClass<T>::Delete -- Deletes the specified index from the vector.             *
- *   VectorClass<T>::ID -- Pointer based conversion to index number.                           *
- *   VectorClass<T>::ID -- Finds object ID based on value.                                     *
- *   DynamicVectorClass<T>::ID -- Find matching value in the dynamic vector.                   *
- *   DynamicVectorClass<T>::Uninitialized_Add -- Add an empty place to the vector.             *
- *   DynamicVectorClass<T>::Insert -- insert an object at the desired index                    *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef VECTOR_H
-#define VECTOR_H
-
-#include "always.h"
-#include	<assert.h>
-#include	<stdlib.h>
-#include <string.h>
-#include <new>
-
-#ifdef _MSC_VER
-#pragma warning (disable : 4702) // unreachable code, happens with some uses of these templates
-#endif
-
-class	NoInitClass;
-
-/**************************************************************************
-**	This is a general purpose vector class. A vector is defined by this
-**	class, as an array of arbitrary objects where the array can be dynamically
-**	sized. Because is deals with arbitrary object types, it can handle everything.
-**	As a result of this, it is not terribly efficient for integral objects (such
-**	as char or int). It will function correctly, but the copy constructor and
-**	equality operator could be highly optimized if the integral type were known.
-**	This efficiency can be implemented by deriving an integral vector template
-**	from this one in order to supply more efficient routines.
-*/
-
-// Why, oh why does Visual C need this!!! It's bugged. <sigh>
-#pragma warning(disable : 4505)
-
-
-template<class T>
-class VectorClass
-{
-	public:
-		WWINLINE VectorClass(NoInitClass const &) {};
-		VectorClass(int size=0, T const * array=0);
-		VectorClass(VectorClass<T> const &);		// Copy constructor.
-		virtual ~VectorClass(void);
-
-		WWINLINE T & operator[](int index) {  assert(unsigned(index) < unsigned(VectorMax));return(Vector[index]); } 
-		WWINLINE T const & operator[](int index) const { assert(unsigned(index) < unsigned(VectorMax));return(Vector[index]);  }
-	
-		VectorClass<T> & operator = (VectorClass<T> const &); // Assignment operator.
-
-		virtual bool operator == (VectorClass<T> const &) const;	// Equality operator.
-
-		virtual bool Resize(int newsize, T const * array=0);
-		virtual void Clear(void);
-		WWINLINE int Length(void) const {return VectorMax;};
-		virtual int ID(T const * ptr);	// Pointer based identification.
-		virtual int ID(T const & ptr);	// Value based identification.
-
-	protected:
-
-		/*
-		**	This is a pointer to the allocated vector array of elements.
-		*/
-		T * Vector;
-
-		/*
-		**	This is the maximum number of elements allowed in this vector.
-		*/
-		int VectorMax;
-
-		/*
-		**	This indicates if the vector is in a valid (even if empty) state.
-		*/
-		bool IsValid;
-
-		/*
-		**	Does the vector data pointer refer to memory that this class has manually
-		**	allocated? If so, then this class is responsible for deleting it.
-		*/
-		bool IsAllocated;
-
-		/*
-		** Padding to align the class.
-		*/
-		bool VectorClassPad[2];
-};
-
-
-/***********************************************************************************************
- * VectorClass<T>::VectorClass -- Constructor for vector class.                                *
- *                                                                                             *
- *    This constructor for the vector class is passed the initial size of the vector and an    *
- *    optional pointer to a preallocated block of memory that the vector will be placed in.    *
- *    If this optional pointer is NULL (or not provided), then the vector is allocated out     *
- *    of free store (with the "new" operator).                                                 *
- *                                                                                             *
- * INPUT:   size  -- The number of elements to initialize this vector to.                      *
- *                                                                                             *
- *          array -- Optional pointer to a previously allocated memory block to hold the       *
- *                   vector.                                                                   *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-VectorClass<T>::VectorClass(int size, T const * array) :
-	Vector(0),
-	VectorMax(size),
-	IsValid(true),
-	IsAllocated(false)
-{
-	/*
-	**	Allocate the vector. The default constructor will be called for every
-	**	object in this vector.
-	*/
-	if (size) {
-		if (array) {
-			Vector = new((void*)array) T[size];
-		} else {
-			Vector = W3DNEWARRAY T[size];
-			IsAllocated = true;
-		}
-	}
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::~VectorClass -- Default destructor for vector class.                        *
- *                                                                                             *
- *    This is the default destructor for the vector class. It will deallocate any memory       *
- *    that it may have allocated.                                                              *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-VectorClass<T>::~VectorClass(void)
-{
-	VectorClass<T>::Clear();
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::VectorClass -- Copy constructor for vector object.                          *
- *                                                                                             *
- *    This is the copy constructor for the vector class. It will duplicate the provided        *
- *    vector into the new vector being created.                                                *
- *                                                                                             *
- * INPUT:   vector   -- Reference to the vector to use as a copy.                              *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-VectorClass<T>::VectorClass(VectorClass<T> const & vec) :
-	Vector(0),
-	VectorMax(0),
-	IsValid(true),
-	IsAllocated(false)
-{
-	*this = vec;
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::operator = -- The assignment operator.                                      *
- *                                                                                             *
- *    This the the assignment operator for vector objects. It will alter the existing lvalue   *
- *    vector to duplicate the rvalue one.                                                      *
- *                                                                                             *
- * INPUT:   vec   -- The rvalue vector to copy into the lvalue one.                            *
- *                                                                                             *
- * OUTPUT:  Returns with reference to the newly copied vector.                                 *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-VectorClass<T> & VectorClass<T>::operator =(VectorClass<T> const & vec)
-{
-	if (this != &vec) {
-		Clear();
-		VectorMax = vec.Length();
-		if (VectorMax) {
-			Vector = W3DNEWARRAY T[VectorMax];
-			if (Vector) {
-				IsAllocated = true;
-				for (int index = 0; index < VectorMax; index++) {
-					Vector[index] = vec[index];
-				}
-			}
-		} else {
-			Vector = 0;
-			IsAllocated = false;
-		}
-	}
-	return(*this);
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::operator == -- Equality operator for vector objects.                        *
- *                                                                                             *
- *    This operator compares two vectors for equality. It does this by performing an object    *
- *    by object comparison between the two vectors.                                            *
- *                                                                                             *
- * INPUT:   vector   -- The right vector expression.                                           *
- *                                                                                             *
- * OUTPUT:  bool; Are the two vectors essentially equal? (do they contain comparable elements  *
- *                in the same order?)                                                          *
- *                                                                                             *
- * WARNINGS:   The equality operator must exist for the objects that this vector contains.     *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool VectorClass<T>::operator == (VectorClass<T> const & vec) const
-{
-	if (VectorMax == vec.Length()) {
-		for (int index = 0; index < VectorMax; index++) {
-			if (Vector[index] != vec[index]) {
-				return(false);
-			}
-		}
-		return(true);
-	}
-	return(false);
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::ID -- Pointer based conversion to index number.                             *
- *                                                                                             *
- *    Use this routine to convert a pointer to an element in the vector back into the index    *
- *    number of that object. This routine ONLY works with actual pointers to object within     *
- *    the vector. For "equivalent" object index number (such as with similar integral values)  *
- *    then use the "by value" index number ID function.                                        *
- *                                                                                             *
- * INPUT:   pointer  -- Pointer to an actual object in the vector.                             *
- *                                                                                             *
- * OUTPUT:  Returns with the index number for the object pointed to by the parameter.          *
- *                                                                                             *
- * WARNINGS:   This routine is only valid for actual pointers to object that exist within      *
- *             the vector. All other object pointers will yield undefined results.             *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/13/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-inline int VectorClass<T>::ID(T const * ptr)
-{
-	if (!IsValid) return(0);
-	return(((uintptr_t)ptr - (uintptr_t)&(*this)[0]) / sizeof(T));
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::ID -- Finds object ID based on value.                                       *
- *                                                                                             *
- *    Use this routine to find the index value of an object with equivalent value in the       *
- *    vector. Typical use of this would be for integral types.                                 *
- *                                                                                             *
- * INPUT:   object   -- Reference to the object that is to be looked up in the vector.         *
- *                                                                                             *
- * OUTPUT:  Returns with the index number of the object that is equivalent to the one          *
- *          specified. If no matching value could be found then -1 is returned.                *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/13/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-int VectorClass<T>::ID(T const & object)
-{
-	if (!IsValid) return(0);
-
-	for (int index = 0; index < VectorMax; index++) {
-		if ((*this)[index] == object) {
-			return(index);
-		}
-	}
-	return(-1);
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::Clear -- Frees and clears the vector.                                       *
- *                                                                                             *
- *    Use this routine to reset the vector to an empty (non-allocated) state. A vector will    *
- *    free all allocated memory when this routine is called. In order for the vector to be     *
- *    useful after this point, the Resize function must be called to give it element space.    *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-void VectorClass<T>::Clear(void)
-{
-	if (Vector && IsAllocated) {
-		delete[] Vector;
-		Vector = 0;
-	}
-	IsAllocated = false;
-	VectorMax = 0;
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::Resize -- Changes the size of the vector.                                   *
- *                                                                                             *
- *    This routine is used to change the size (usually to increase) the size of a vector. This *
- *    is the only way to increase the vector's working room (number of elements).              *
- *                                                                                             *
- * INPUT:   newsize  -- The desired size of the vector.                                        *
- *                                                                                             *
- *          array    -- Optional pointer to a previously allocated memory block that the       *
- *                      array will be located in. If this parameter is not supplied, then      *
- *                      the array will be allocated from free store.                           *
- *                                                                                             *
- * OUTPUT:  bool; Was the array resized successfully?                                          *
- *                                                                                             *
- * WARNINGS:   Failure to succeed could be the result of running out of memory.                *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool VectorClass<T>::Resize(int newsize, T const * array)
-{
-	if (newsize) {
-
-		/*
-		**	Allocate a new vector of the size specified. The default constructor
-		**	will be called for every object in this vector.
-		*/
-		T * newptr;
-
-		/*
-		**	Either create a new memory block for the object array or initialize
-		**	an existing block as indicated by the array parameter. When creating a new
-		**	memory block, flag that the vector object is currently in an invalid
-		**	state. This is necessary because the default constructor for the object
-		**	elements may look to the vector to fetch their ID number.
-		*/
-		IsValid = false;
-		if (!array) {
-			newptr = W3DNEWARRAY T[newsize];
-		} else {
-			newptr = new((void*)array) T[newsize];
-		}
-		IsValid = true;
-		if (!newptr) {
-			return(false);
-		}
-
-		/*
-		**	If there is an old vector, then it must be copied (as much as is feasible)
-		**	to the new vector.
-		*/
-		if (Vector != NULL) {
-
-			/*
-			**	Copy as much of the old vector into the new vector as possible. This
-			**	presumes that there is a functional assignment operator for each
-			**	of the objects in the vector.
-			*/
-			int copycount = (newsize < VectorMax) ? newsize : VectorMax;
-			for (int index = 0; index < copycount; index++) {
-				newptr[index] = Vector[index];
-			}
-
-			/*
-			**	Delete the old vector. This might cause the destructors to be called
-			**	for all of the old elements. This makes the implementation of suitable
-			**	assignment operator very important. The default assignment operator will
-			**	only work for the simplest of objects.
-			*/
-			if (IsAllocated) {
-				delete[] Vector;
-				Vector = 0;
-			}
-		}
-
-		/*
-		**	Assign the new vector data to this class.
-		*/
-		Vector = newptr;
-		VectorMax = newsize;
-		IsAllocated = (Vector && !array);
-
-	} else {
-
-		/*
-		**	Resizing to zero is the same as clearing the vector.
-		*/
-		Clear();
-	}
-	return(true);
-}
-
-
-
-/**************************************************************************
-**	This derivative vector class adds the concept of adding and deleting
-**	objects. The objects are packed to the beginning of the vector array.
-**	If this is instantiated for a class object, then the assignment operator
-**	and the equality operator must be supported. If the vector allocates its
-**	own memory, then the vector can grow if it runs out of room adding items.
-**	The growth rate is controlled by setting the growth step rate. A growth
-**	step rate of zero disallows growing.
-*/
-template<class T>
-class DynamicVectorClass : public VectorClass<T>
-{
-	protected:
-		using VectorClass<T>::IsAllocated;
-		using VectorClass<T>::Vector;
-		using VectorClass<T>::VectorMax;
-	public:
-		using VectorClass<T>::Length;
-
-	public:
-		DynamicVectorClass(unsigned size=0, T const * array=0);
-
-		// Stubbed equality operators so you can have dynamic vectors of dynamic vectors
-		bool operator== (const DynamicVectorClass &src)	{ return false; }
-		bool operator!= (const DynamicVectorClass &src)	{ return true; }
-
-		// Change maximum size of vector.
-		virtual bool Resize(int newsize, T const * array=0);
-
-		// Resets and frees the vector array.
-		virtual void Clear(void) {ActiveCount = 0;VectorClass<T>::Clear();};
-
-		// retains the memory but zeros the active count
-		void Reset_Active(void) { ActiveCount = 0; }
-		void Set_Active(int count)	{ ActiveCount = count; }
-
-		// Fetch number of "allocated" vector objects.
-		int Count(void) const {return(ActiveCount);};
-
-		// Add object to vector (growing as necessary).
-		bool Add(T const & object);
-		bool Add_Head(T const & object);
-		bool Insert(int index,T const & object);
-
-		// Delete object just like this from vector.
-		bool Delete(T const & object);
-
-		// Delete object at this vector index.
-		bool Delete(int index);
-		bool Delete_Index(int index);		// Added to explictly call delete by index
-
-		// Deletes all objects in the vector.
-		void Delete_All(void);
-
-		// Set amount that vector grows by.
-		int Set_Growth_Step(int step) {return(GrowthStep = step);};
-
-		// Fetch current growth step rate.
-		int Growth_Step(void) {return GrowthStep;};
-
-		virtual int ID(T const * ptr) {return(VectorClass<T>::ID(ptr));};
-		virtual int ID(T const & ptr);
-
-		DynamicVectorClass<T> & operator =(DynamicVectorClass<T> const & rvalue) {
-			VectorClass<T>::operator = (rvalue);
-			ActiveCount = rvalue.ActiveCount;
-			GrowthStep = rvalue.GrowthStep;
-			return(*this);
-		}
-
-      // Uninitialized Add - does everything an Add does, except copying an
-      // object into the 'new' spot in the array. It returns a pointer to
-      // the 'new' spot. (NULL if the Add failed). NOTE - you must then fill
-      // this memory area with a valid object (e.g. by using placement new),
-      // or chaos will result!
-      T * Uninitialized_Add(void);
-
-	protected:
-
-		/*
-		**	This is a count of the number of active objects in this
-		**	vector. The memory array often times is bigger than this
-		**	value.
-		*/
-		int ActiveCount;
-
-		/*
-		**	If there is insufficient room in the vector array for a new
-		**	object to be added, then the vector will grow by the number
-		**	of objects specified by this value. This is controlled by
-		**	the Set_Growth_Step() function.
-		*/
-		int GrowthStep;
-};
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::DynamicVectorClass -- Constructor for dynamic vector.                *
- *                                                                                             *
- *    This is the normal constructor for the dynamic vector class. It is similar to the normal *
- *    vector class constructor. The vector is initialized to contain the number of elements    *
- *    specified in the "size" parameter. The memory is allocated from free store unless the    *
- *    optional array parameter is provided. In this case it will place the vector at the       *
- *    memory location specified.                                                               *
- *                                                                                             *
- * INPUT:   size  -- The maximum number of objects allowed in this vector.                     *
- *                                                                                             *
- *          array -- Optional pointer to the memory area to place the vector at.               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-DynamicVectorClass<T>::DynamicVectorClass(unsigned size, T const * array)
-	: VectorClass<T>(size, array)
-{
-	GrowthStep = 10;
-	ActiveCount = 0;
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Resize -- Changes the size of a dynamic vector.                      *
- *                                                                                             *
- *    Use this routine to change the size of the vector. The size changed is the maximum       *
- *    number of allocated objects within this vector. If a memory buffer is provided, then     *
- *    the vector will be located there. Otherwise, the memory will be allocated out of free    *
- *    store.                                                                                   *
- *                                                                                             *
- * INPUT:   newsize  -- The desired maximum size of this vector.                               *
- *                                                                                             *
- *          array    -- Optional pointer to a previously allocated memory array.               *
- *                                                                                             *
- * OUTPUT:  bool; Was vector successfully resized according to specifications?                 *
- *                                                                                             *
- * WARNINGS:   Failure to resize the vector could be the result of lack of free store.         *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool DynamicVectorClass<T>::Resize(int newsize, T const * array)
-{
-	if (VectorClass<T>::Resize(newsize, array)) {
-		if (Length() < ActiveCount) ActiveCount = Length();
-		return(true);
-	}
-	return(false);
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::ID -- Find matching value in the dynamic vector.                     *
- *                                                                                             *
- *    Use this routine to find a matching object (by value) in the vector. Unlike the base     *
- *    class ID function of similar name, this one restricts the scan to the current number     *
- *    of valid objects.                                                                        *
- *                                                                                             *
- * INPUT:   object   -- A reference to the object that a match is to be found in the           *
- *                      vector.                                                                *
- *                                                                                             *
- * OUTPUT:  Returns with the index number of the object that is equivalent to the one          *
- *          specified. If no equivalent object could be found then -1 is returned.             *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/13/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-int DynamicVectorClass<T>::ID(T const & object)
-{
-	for (int index = 0; index < Count(); index++) {
-		if ((*this)[index] == object) return(index);
-	}
-	return(-1);
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Add -- Add an element to the vector.                                 *
- *                                                                                             *
- *    Use this routine to add an element to the vector. The vector will automatically be       *
- *    resized to accomodate the new element IF the vector was allocated previously and the     *
- *    growth rate is not zero.                                                                 *
- *                                                                                             *
- * INPUT:   object   -- Reference to the object that will be added to the vector.              *
- *                                                                                             *
- * OUTPUT:  bool; Was the object added successfully? If so, the object is added to the end     *
- *                of the vector.                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool DynamicVectorClass<T>::Add(T const & object)
-{
-	if (ActiveCount >= Length()) {
-		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
-			if (!Resize(Length() + GrowthStep)) {
-
-				/*
-				**	Failure to increase the size of the vector is an error condition.
-				**	Return with the error flag.
-				*/
-				return(false);
-			}
-		} else {
-
-			/*
-			**	Increasing the size of this vector is not allowed! Bail this
-			**	routine with the error code.
-			*/
-			return(false);
-		}
-	}
-
-	/*
-	**	There is room for the new object now. Add it to the end of the object vector.
-	*/
-	(*this)[ActiveCount++] = object;
-	return(true);
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Add_Head -- Adds element to head of the list.                        *
- *                                                                                             *
- *    This routine will add the specified element to the head of the vector. If necessary,     *
- *    the vector will be expanded accordingly.                                                 *
- *                                                                                             *
- * INPUT:   object   -- Reference to the object to add to the head of this vector.             *
- *                                                                                             *
- * OUTPUT:  bool; Was the object added without error?                                          *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   09/21/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool DynamicVectorClass<T>::Add_Head(T const & object)
-{
-	if (ActiveCount >= Length()) {
-		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
-			if (!Resize(Length() + GrowthStep)) {
-
-				/*
-				**	Failure to increase the size of the vector is an error condition.
-				**	Return with the error flag.
-				*/
-				return(false);
-			}
-		} else {
-
-			/*
-			**	Increasing the size of this vector is not allowed! Bail this
-			**	routine with the error code.
-			*/
-			return(false);
-		}
-	}
-
-	/*
-	**	There is room for the new object now. Add it to the end of the object vector.
-	*/
-	if (ActiveCount) {
-		memmove(&(*this)[1], &(*this)[0], ActiveCount * sizeof(T));
-	}
-	(*this)[0] = object;
-	ActiveCount++;
-//	(*this)[ActiveCount++] = object;
-	return(true);
-}
-
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Insert -- insert an object at the desired index                      *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/27/99    GTH : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool DynamicVectorClass<T>::Insert(int index,T const & object)
-{
-	if (index < 0) return false;
-	if (index > ActiveCount) return false;
-
-	if (ActiveCount >= Length()) {
-		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
-			if (!Resize(Length() + GrowthStep)) {
-
-				/*
-				**	Failure to increase the size of the vector is an error condition.
-				**	Return with the error flag.
-				*/
-				return(false);
-			}
-		} else {
-
-			/*
-			**	Increasing the size of this vector is not allowed! Bail this
-			**	routine with the error code.
-			*/
-			return(false);
-		}
-	}
-
-	/*
-	**	There is room for the new object now. Add it at the desired position.
-	*/
-	if (index < ActiveCount) {
-		memmove(&(*this)[index+1], &(*this)[index], (ActiveCount-index) * sizeof(T));
-	}
-	(*this)[index] = object;
-	ActiveCount++;
-	return(true);
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Delete -- Remove the specified object from the vector.               *
- *                                                                                             *
- *    This routine will delete the object referenced from the vector. All objects in the       *
- *    vector that follow the one deleted will be moved "down" to fill the hole.                *
- *                                                                                             *
- * INPUT:   object   -- Reference to the object in this vector that is to be deleted.          *
- *                                                                                             *
- * OUTPUT:  bool; Was the object deleted successfully? This should always be true.             *
- *                                                                                             *
- * WARNINGS:   Do no pass a reference to an object that is NOT part of this vector. The        *
- *             results of this are undefined and probably catastrophic.                        *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool DynamicVectorClass<T>::Delete(T const & object)
-{
-	int id = ID(object);
-	if (id != -1) {
-		return(Delete(id));
-	}
-	return(false);
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Delete -- Deletes the specified index from the vector.               *
- *                                                                                             *
- *    Use this routine to delete the object at the specified index from the objects in the     *
- *    vector. This routine will move all the remaining objects "down" in order to fill the     *
- *    hole.                                                                                    *
- *                                                                                             *
- * INPUT:   index -- The index number of the object in the vector that is to be deleted.       *
- *                                                                                             *
- * OUTPUT:  bool; Was the object index deleted successfully? Failure might mean that the index *
- *                specified was out of bounds.                                                 *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool DynamicVectorClass<T>::Delete(int index)
-{
-	if (index < ActiveCount) {
-		ActiveCount--;
-
-		/*
-		**	If there are any objects past the index that was deleted, copy those
-		**	objects down in order to fill the hole. A simple memory copy is
-		**	not sufficient since the vector could contain class objects that
-		**	need to use the assignment operator for movement.
-		*/
-//		(&(*this)[index])->~ T ();
-		for (int i = index; i < ActiveCount; i++) {
-			(*this)[i] = (*this)[i+1];
-		}
-		return(true);
-	}
-	return(false);
-}
-
-
-template<class T>
-bool DynamicVectorClass<T>::Delete_Index(int index)
-{
-	if (index < ActiveCount) {
-		ActiveCount--;
-
-		/*
-		**	If there are any objects past the index that was deleted, copy those
-		**	objects down in order to fill the hole. A simple memory copy is
-		**	not sufficient since the vector could contain class objects that
-		**	need to use the assignment operator for movement.
-		*/
-//		(&(*this)[index])->~ T ();
-		for (int i = index; i < ActiveCount; i++) {
-			(*this)[i] = (*this)[i+1];
-		}
-		return(true);
-	}
-	return(false);
-}
-
-
-template<class T>
-void DynamicVectorClass<T>::Delete_All(void) 
-{
-	int len = VectorMax;
-	Clear();		// Forces destructor call on each object.
-	Resize(len);
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Uninitialized_Add -- Add an empty place to the vector.               *
- *                                                                                             *
- *    To avoid copying when creating an object and adding it to the vector, use this and       *
- *    immediately fill the area that the return value points to with a valid object (by hand   *
- *    for a struct or by using placement new for a class object).                              *
- *    This function does everything Add does except copying an object into the new space,      *
- *    thus leaving an uninitialized area of memory.                                            *
- *                                                                                             *
- * INPUT:   none.                                                                              *
- *                                                                                             *
- * OUTPUT:  T *; Points to the empty space where the new object is to be created. (If the      *
- *               space was not added successfully, returns NULL).                              *
- *                                                                                             *
- * WARNINGS:   If memory area is left uninitialized, Very Bad Things will happen.              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/04/1998 NH : Created.                                                                  *
- *=============================================================================================*/
-template<class T>
-T * DynamicVectorClass<T>::Uninitialized_Add(void)
-{
-	if (ActiveCount >= Length()) {
-//		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
-		if (GrowthStep > 0) {
-			if (!Resize(Length() + GrowthStep)) {
-
-				/*
-				**	Failure to increase the size of the vector is an error condition.
-				**	Return with the error value.
-				*/
-				return(NULL);
-			}
-		} else {
-
-			/*
-			**	Increasing the size of this vector is not allowed! Bail this
-			**	routine with the error value.
-			*/
-			return(NULL);
-		}
-	}
-
-	/*
-	**	There is room for the new space now. Add it to the end of the object
-   ** vector. and return a pointer to it.
-	*/
-   return &((*this)[ActiveCount++]);
-}
-
-
-void Set_Bit(void * array, int bit, int value);
-int Get_Bit(void const * array, int bit);
-int First_True_Bit(void const * array);
-int First_False_Bit(void const * array);
-
-
-/**************************************************************************
-**	This is a derivative of a vector class that supports boolean flags. Since
-**	a boolean flag can be represented by a single bit, this class packs the
-**	array of boolean flags into an array of bytes containing 8 boolean values
-**	each. For large boolean arrays, this results in an 87.5% savings. Although
-**	the indexing "[]" operator is supported, DO NOT pass pointers to sub elements
-**	of this bit vector class. A pointer derived from the indexing operator is
-**	only valid until the next call. Because of this, only simple
-**	direct use of the "[]" operator is allowed.
-*/
-class BooleanVectorClass
-{
-	public:
-		BooleanVectorClass(unsigned size=0, unsigned char * array=0);
-		BooleanVectorClass(BooleanVectorClass const & vector);
-
-		// Assignment operator.
-		BooleanVectorClass & operator =(BooleanVectorClass const & vector);
-
-		// Equivalency operator.
-		bool operator == (BooleanVectorClass const & vector) const;
-
-		// Initialization
-		void Init(unsigned size, unsigned char * array);
-		void Init(unsigned size);
-
-		// Fetch number of boolean objects in vector.
-		int Length(void) {return BitCount;};
-
-		// Set all boolean values to false;
-		void Reset(void);
-
-		// Set all boolean values to true.
-		void Set(void);
-
-		// Resets vector to zero length (frees memory).
-		void Clear(void);
-
-		// Change size of this boolean vector.
-		int Resize(unsigned size);
-
-		// Fetch reference to specified index.
-		bool const & operator[](int index) const {
-			if (LastIndex != index) Fixup(index);
-			return(Copy);
-		};
-		bool & operator[](int index) {
-			if (LastIndex != index) Fixup(index);
-			return(Copy);
-		};
-
-		// Quick check on boolean state.
-		bool Is_True(int index) const {
-			if (index == LastIndex) return(Copy);
-			return(Get_Bit(&BitArray[0], index) != 0);
-		};
-
-		// Find first index that is false.
-		int First_False(void) const {
-			if (LastIndex != -1) Fixup(-1);
-
-			int retval = First_False_Bit(&BitArray[0]);
-			if (retval < BitCount) return(retval);
-
-			/*
-			**	Failure to find a false boolean value in the vector. Return this
-			**	fact in the form of an invalid index number.
-			*/
-			return(-1);
-		}
-
-		// Find first index that is true.
-		int First_True(void) const {
-			if (LastIndex != -1) Fixup(-1);
-
-			int retval = First_True_Bit(&BitArray[0]);
-			if (retval < BitCount) return(retval);
-
-			/*
-			**	Failure to find a true boolean value in the vector. Return this
-			**	fact in the form of an invalid index number.
-			*/
-			return(-1);
-		}
-
-		// Accessors (usefull for saving the bit vector)
-		const VectorClass<unsigned char> &	Get_Bit_Array(void)	{ return BitArray; }
-
-	protected:
-
-		void Fixup(int index=-1) const;
-
-		/*
-		**	This is the number of boolean values in the vector. This value is
-		**	not necessarily a multiple of 8, even though the underlying character
-		**	vector contains a multiple of 8 bits.
-		*/
-		int BitCount;
-
-		/*
-		**	This is a referential copy of an element in the bit vector. The
-		**	purpose of this copy is to allow normal reference access to this
-		**	object (for speed reasons). This hides the bit packing scheme from
-		**	the user of this class.
-		*/
-		bool Copy;
-
-		/*
-		**	This records the index of the value last fetched into the reference
-		**	boolean variable. This index is used to properly restore the value
-		**	when the reference copy needs updating.
-		*/
-		int LastIndex;
-
-		/*
-		**	This points to the allocated bitfield array.
-		*/
-		VectorClass<unsigned char> BitArray;
-};
-
-
-template<class T>
-int Pointer_Vector_Add(T * ptr, VectorClass<T *> & vec)
-{
-	int id = 0;
-	bool foundspot = false;
-	for (int index = 0; index < vec.Length(); index++) {
-		if (vec[index] == NULL) {
-			id = index;
-			foundspot = true;
-			break;
-		}
-	}
-	if (!foundspot) {
-		id = vec.Length();
-		vec.Resize((vec.Length()+1) * 2);
-		for (int index = id; index < vec.Length(); index++) {
-			vec[index] = NULL;
-		}
-	}
-	vec[id] = ptr;
-	return(id);
-}
-
-
-template<class T>
-bool Pointer_Vector_Remove(T const * ptr, VectorClass<T *> & vec)
-{
-	int id = vec.ID((T *)ptr);
-	if (id != -1) {
-		vec[id] = NULL;
-		return(true);
-	}
-	return(false);
-}
-
-#ifdef _MSC_VER
-#pragma warning (default : 4702) // unreachable code, happens with some uses of these templates
-#endif
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/Vector.h b/Core/Libraries/Source/WWVegas/WWLib/Vector.h
new file mode 100644
index 00000000000..09c4b8b1c35
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/Vector.h
@@ -0,0 +1,1117 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/vector.h                               $*
+ *                                                                                             *
+ *                      $Author:: Jani_p                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 1/16/02 11:40a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 49                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   VectorClass<T>::VectorClass -- Constructor for vector class.                              *
+ *   VectorClass<T>::~VectorClass -- Default destructor for vector class.                      *
+ *   VectorClass<T>::VectorClass -- Copy constructor for vector object.                        *
+ *   VectorClass<T>::operator = -- The assignment operator.                                    *
+ *   VectorClass<T>::operator == -- Equality operator for vector objects.                      *
+ *   VectorClass<T>::Clear -- Frees and clears the vector.                                     *
+ *   VectorClass<T>::Resize -- Changes the size of the vector.                                 *
+ *   DynamicVectorClass<T>::DynamicVectorClass -- Constructor for dynamic vector.              *
+ *   DynamicVectorClass<T>::Resize -- Changes the size of a dynamic vector.                    *
+ *   DynamicVectorClass<T>::Add -- Add an element to the vector.                               *
+ *   DynamicVectorClass<T>::Delete -- Remove the specified object from the vector.             *
+ *   DynamicVectorClass<T>::Delete -- Deletes the specified index from the vector.             *
+ *   VectorClass<T>::ID -- Pointer based conversion to index number.                           *
+ *   VectorClass<T>::ID -- Finds object ID based on value.                                     *
+ *   DynamicVectorClass<T>::ID -- Find matching value in the dynamic vector.                   *
+ *   DynamicVectorClass<T>::Uninitialized_Add -- Add an empty place to the vector.             *
+ *   DynamicVectorClass<T>::Insert -- insert an object at the desired index                    *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "always.h"
+#include	<assert.h>
+#include	<stdlib.h>
+#include <new>
+
+#ifdef _MSC_VER
+#pragma warning (disable : 4702) // unreachable code, happens with some uses of these templates
+#endif
+
+class	NoInitClass;
+
+/**************************************************************************
+**	This is a general purpose vector class. A vector is defined by this
+**	class, as an array of arbitrary objects where the array can be dynamically
+**	sized. Because is deals with arbitrary object types, it can handle everything.
+**	As a result of this, it is not terribly efficient for integral objects (such
+**	as char or int). It will function correctly, but the copy constructor and
+**	equality operator could be highly optimized if the integral type were known.
+**	This efficiency can be implemented by deriving an integral vector template
+**	from this one in order to supply more efficient routines.
+*/
+
+// Why, oh why does Visual C need this!!! It's bugged. <sigh>
+#pragma warning(disable : 4505)
+
+
+template<class T>
+class VectorClass
+{
+	public:
+		WWINLINE VectorClass(NoInitClass const &) {};
+		VectorClass(int size=0, T const * array=0);
+		VectorClass(VectorClass<T> const &);		// Copy constructor.
+		virtual ~VectorClass(void);
+
+		WWINLINE T & operator[](int index) {  assert(unsigned(index) < unsigned(VectorMax));return(Vector[index]); }
+		WWINLINE T const & operator[](int index) const { assert(unsigned(index) < unsigned(VectorMax));return(Vector[index]);  }
+
+		VectorClass<T> & operator = (VectorClass<T> const &); // Assignment operator.
+
+		virtual bool operator == (VectorClass<T> const &) const;	// Equality operator.
+
+		virtual bool Resize(int newsize, T const * array=0);
+		virtual void Clear(void);
+		WWINLINE int Length(void) const {return VectorMax;};
+		virtual int ID(T const * ptr);	// Pointer based identification.
+		virtual int ID(T const & ptr);	// Value based identification.
+
+	protected:
+
+		/*
+		**	This is a pointer to the allocated vector array of elements.
+		*/
+		T * Vector;
+
+		/*
+		**	This is the maximum number of elements allowed in this vector.
+		*/
+		int VectorMax;
+
+		/*
+		**	This indicates if the vector is in a valid (even if empty) state.
+		*/
+		bool IsValid;
+
+		/*
+		**	Does the vector data pointer refer to memory that this class has manually
+		**	allocated? If so, then this class is responsible for deleting it.
+		*/
+		bool IsAllocated;
+
+		/*
+		** Padding to align the class.
+		*/
+		bool VectorClassPad[2];
+};
+
+
+/***********************************************************************************************
+ * VectorClass<T>::VectorClass -- Constructor for vector class.                                *
+ *                                                                                             *
+ *    This constructor for the vector class is passed the initial size of the vector and an    *
+ *    optional pointer to a preallocated block of memory that the vector will be placed in.    *
+ *    If this optional pointer is NULL (or not provided), then the vector is allocated out     *
+ *    of free store (with the "new" operator).                                                 *
+ *                                                                                             *
+ * INPUT:   size  -- The number of elements to initialize this vector to.                      *
+ *                                                                                             *
+ *          array -- Optional pointer to a previously allocated memory block to hold the       *
+ *                   vector.                                                                   *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+VectorClass<T>::VectorClass(int size, T const * array) :
+	Vector(0),
+	VectorMax(size),
+	IsValid(true),
+	IsAllocated(false)
+{
+	/*
+	**	Allocate the vector. The default constructor will be called for every
+	**	object in this vector.
+	*/
+	if (size) {
+		if (array) {
+			Vector = new((void*)array) T[size];
+		} else {
+			Vector = W3DNEWARRAY T[size];
+			IsAllocated = true;
+		}
+	}
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::~VectorClass -- Default destructor for vector class.                        *
+ *                                                                                             *
+ *    This is the default destructor for the vector class. It will deallocate any memory       *
+ *    that it may have allocated.                                                              *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+VectorClass<T>::~VectorClass(void)
+{
+	VectorClass<T>::Clear();
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::VectorClass -- Copy constructor for vector object.                          *
+ *                                                                                             *
+ *    This is the copy constructor for the vector class. It will duplicate the provided        *
+ *    vector into the new vector being created.                                                *
+ *                                                                                             *
+ * INPUT:   vector   -- Reference to the vector to use as a copy.                              *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+VectorClass<T>::VectorClass(VectorClass<T> const & vec) :
+	Vector(0),
+	VectorMax(0),
+	IsValid(true),
+	IsAllocated(false)
+{
+	*this = vec;
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::operator = -- The assignment operator.                                      *
+ *                                                                                             *
+ *    This the the assignment operator for vector objects. It will alter the existing lvalue   *
+ *    vector to duplicate the rvalue one.                                                      *
+ *                                                                                             *
+ * INPUT:   vec   -- The rvalue vector to copy into the lvalue one.                            *
+ *                                                                                             *
+ * OUTPUT:  Returns with reference to the newly copied vector.                                 *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+VectorClass<T> & VectorClass<T>::operator =(VectorClass<T> const & vec)
+{
+	if (this != &vec) {
+		Clear();
+		VectorMax = vec.Length();
+		if (VectorMax) {
+			Vector = W3DNEWARRAY T[VectorMax];
+			if (Vector) {
+				IsAllocated = true;
+				for (int index = 0; index < VectorMax; index++) {
+					Vector[index] = vec[index];
+				}
+			}
+		} else {
+			Vector = 0;
+			IsAllocated = false;
+		}
+	}
+	return(*this);
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::operator == -- Equality operator for vector objects.                        *
+ *                                                                                             *
+ *    This operator compares two vectors for equality. It does this by performing an object    *
+ *    by object comparison between the two vectors.                                            *
+ *                                                                                             *
+ * INPUT:   vector   -- The right vector expression.                                           *
+ *                                                                                             *
+ * OUTPUT:  bool; Are the two vectors essentially equal? (do they contain comparable elements  *
+ *                in the same order?)                                                          *
+ *                                                                                             *
+ * WARNINGS:   The equality operator must exist for the objects that this vector contains.     *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool VectorClass<T>::operator == (VectorClass<T> const & vec) const
+{
+	if (VectorMax == vec.Length()) {
+		for (int index = 0; index < VectorMax; index++) {
+			if (Vector[index] != vec[index]) {
+				return(false);
+			}
+		}
+		return(true);
+	}
+	return(false);
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::ID -- Pointer based conversion to index number.                             *
+ *                                                                                             *
+ *    Use this routine to convert a pointer to an element in the vector back into the index    *
+ *    number of that object. This routine ONLY works with actual pointers to object within     *
+ *    the vector. For "equivalent" object index number (such as with similar integral values)  *
+ *    then use the "by value" index number ID function.                                        *
+ *                                                                                             *
+ * INPUT:   pointer  -- Pointer to an actual object in the vector.                             *
+ *                                                                                             *
+ * OUTPUT:  Returns with the index number for the object pointed to by the parameter.          *
+ *                                                                                             *
+ * WARNINGS:   This routine is only valid for actual pointers to object that exist within      *
+ *             the vector. All other object pointers will yield undefined results.             *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/13/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+inline int VectorClass<T>::ID(T const * ptr)
+{
+	if (!IsValid) return(0);
+	return(((uintptr_t)ptr - (uintptr_t)&(*this)[0]) / sizeof(T));
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::ID -- Finds object ID based on value.                                       *
+ *                                                                                             *
+ *    Use this routine to find the index value of an object with equivalent value in the       *
+ *    vector. Typical use of this would be for integral types.                                 *
+ *                                                                                             *
+ * INPUT:   object   -- Reference to the object that is to be looked up in the vector.         *
+ *                                                                                             *
+ * OUTPUT:  Returns with the index number of the object that is equivalent to the one          *
+ *          specified. If no matching value could be found then -1 is returned.                *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/13/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+int VectorClass<T>::ID(T const & object)
+{
+	if (!IsValid) return(0);
+
+	for (int index = 0; index < VectorMax; index++) {
+		if ((*this)[index] == object) {
+			return(index);
+		}
+	}
+	return(-1);
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::Clear -- Frees and clears the vector.                                       *
+ *                                                                                             *
+ *    Use this routine to reset the vector to an empty (non-allocated) state. A vector will    *
+ *    free all allocated memory when this routine is called. In order for the vector to be     *
+ *    useful after this point, the Resize function must be called to give it element space.    *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+void VectorClass<T>::Clear(void)
+{
+	if (IsAllocated) {
+		delete[] Vector;
+		Vector = 0;
+	}
+	IsAllocated = false;
+	VectorMax = 0;
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::Resize -- Changes the size of the vector.                                   *
+ *                                                                                             *
+ *    This routine is used to change the size (usually to increase) the size of a vector. This *
+ *    is the only way to increase the vector's working room (number of elements).              *
+ *                                                                                             *
+ * INPUT:   newsize  -- The desired size of the vector.                                        *
+ *                                                                                             *
+ *          array    -- Optional pointer to a previously allocated memory block that the       *
+ *                      array will be located in. If this parameter is not supplied, then      *
+ *                      the array will be allocated from free store.                           *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the array resized successfully?                                          *
+ *                                                                                             *
+ * WARNINGS:   Failure to succeed could be the result of running out of memory.                *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool VectorClass<T>::Resize(int newsize, T const * array)
+{
+	if (newsize) {
+
+		/*
+		**	Allocate a new vector of the size specified. The default constructor
+		**	will be called for every object in this vector.
+		*/
+		T * newptr;
+
+		/*
+		**	Either create a new memory block for the object array or initialize
+		**	an existing block as indicated by the array parameter. When creating a new
+		**	memory block, flag that the vector object is currently in an invalid
+		**	state. This is necessary because the default constructor for the object
+		**	elements may look to the vector to fetch their ID number.
+		*/
+		IsValid = false;
+		if (!array) {
+			newptr = W3DNEWARRAY T[newsize];
+		} else {
+			newptr = new((void*)array) T[newsize];
+		}
+		IsValid = true;
+		if (!newptr) {
+			return(false);
+		}
+
+		/*
+		**	If there is an old vector, then it must be copied (as much as is feasible)
+		**	to the new vector.
+		*/
+		if (Vector != NULL) {
+
+			/*
+			**	Copy as much of the old vector into the new vector as possible. This
+			**	presumes that there is a functional assignment operator for each
+			**	of the objects in the vector.
+			*/
+			int copycount = (newsize < VectorMax) ? newsize : VectorMax;
+			for (int index = 0; index < copycount; index++) {
+				newptr[index] = Vector[index];
+			}
+
+			/*
+			**	Delete the old vector. This might cause the destructors to be called
+			**	for all of the old elements. This makes the implementation of suitable
+			**	assignment operator very important. The default assignment operator will
+			**	only work for the simplest of objects.
+			*/
+			if (IsAllocated) {
+				delete[] Vector;
+				Vector = 0;
+			}
+		}
+
+		/*
+		**	Assign the new vector data to this class.
+		*/
+		Vector = newptr;
+		VectorMax = newsize;
+		IsAllocated = (Vector && !array);
+
+	} else {
+
+		/*
+		**	Resizing to zero is the same as clearing the vector.
+		*/
+		Clear();
+	}
+	return(true);
+}
+
+
+
+/**************************************************************************
+**	This derivative vector class adds the concept of adding and deleting
+**	objects. The objects are packed to the beginning of the vector array.
+**	If this is instantiated for a class object, then the assignment operator
+**	and the equality operator must be supported. If the vector allocates its
+**	own memory, then the vector can grow if it runs out of room adding items.
+**	The growth rate is controlled by setting the growth step rate. A growth
+**	step rate of zero disallows growing.
+*/
+template<class T>
+class DynamicVectorClass : public VectorClass<T>
+{
+	protected:
+		using VectorClass<T>::IsAllocated;
+		using VectorClass<T>::Vector;
+		using VectorClass<T>::VectorMax;
+	public:
+		using VectorClass<T>::Length;
+
+	public:
+		DynamicVectorClass(unsigned size=0, T const * array=0);
+
+		// Stubbed equality operators so you can have dynamic vectors of dynamic vectors
+		bool operator== (const DynamicVectorClass &src)	{ return false; }
+		bool operator!= (const DynamicVectorClass &src)	{ return true; }
+
+		// Change maximum size of vector.
+		virtual bool Resize(int newsize, T const * array=0);
+
+		// Resets and frees the vector array.
+		virtual void Clear(void) {ActiveCount = 0;VectorClass<T>::Clear();};
+
+		// retains the memory but zeros the active count
+		void Reset_Active(void) { ActiveCount = 0; }
+		void Set_Active(int count)	{ ActiveCount = count; }
+
+		// Fetch number of "allocated" vector objects.
+		int Count(void) const {return(ActiveCount);};
+
+		// Add object to vector (growing as necessary).
+		bool Add(T const & object);
+		bool Add_Head(T const & object);
+		bool Insert(int index,T const & object);
+
+		// Delete object just like this from vector.
+		bool Delete(T const & object);
+
+		// Delete object at this vector index.
+		bool Delete(int index);
+		bool Delete_Index(int index);		// Added to explictly call delete by index
+
+		// Deletes all objects in the vector.
+		void Delete_All(void);
+
+		// Set amount that vector grows by.
+		int Set_Growth_Step(int step) {return(GrowthStep = step);};
+
+		// Fetch current growth step rate.
+		int Growth_Step(void) {return GrowthStep;};
+
+		virtual int ID(T const * ptr) {return(VectorClass<T>::ID(ptr));};
+		virtual int ID(T const & ptr);
+
+		DynamicVectorClass<T> & operator =(DynamicVectorClass<T> const & rvalue) {
+			VectorClass<T>::operator = (rvalue);
+			ActiveCount = rvalue.ActiveCount;
+			GrowthStep = rvalue.GrowthStep;
+			return(*this);
+		}
+
+      // Uninitialized Add - does everything an Add does, except copying an
+      // object into the 'new' spot in the array. It returns a pointer to
+      // the 'new' spot. (NULL if the Add failed). NOTE - you must then fill
+      // this memory area with a valid object (e.g. by using placement new),
+      // or chaos will result!
+      T * Uninitialized_Add(void);
+
+	protected:
+
+		/*
+		**	This is a count of the number of active objects in this
+		**	vector. The memory array often times is bigger than this
+		**	value.
+		*/
+		int ActiveCount;
+
+		/*
+		**	If there is insufficient room in the vector array for a new
+		**	object to be added, then the vector will grow by the number
+		**	of objects specified by this value. This is controlled by
+		**	the Set_Growth_Step() function.
+		*/
+		int GrowthStep;
+};
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::DynamicVectorClass -- Constructor for dynamic vector.                *
+ *                                                                                             *
+ *    This is the normal constructor for the dynamic vector class. It is similar to the normal *
+ *    vector class constructor. The vector is initialized to contain the number of elements    *
+ *    specified in the "size" parameter. The memory is allocated from free store unless the    *
+ *    optional array parameter is provided. In this case it will place the vector at the       *
+ *    memory location specified.                                                               *
+ *                                                                                             *
+ * INPUT:   size  -- The maximum number of objects allowed in this vector.                     *
+ *                                                                                             *
+ *          array -- Optional pointer to the memory area to place the vector at.               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+DynamicVectorClass<T>::DynamicVectorClass(unsigned size, T const * array)
+	: VectorClass<T>(size, array)
+{
+	GrowthStep = 10;
+	ActiveCount = 0;
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Resize -- Changes the size of a dynamic vector.                      *
+ *                                                                                             *
+ *    Use this routine to change the size of the vector. The size changed is the maximum       *
+ *    number of allocated objects within this vector. If a memory buffer is provided, then     *
+ *    the vector will be located there. Otherwise, the memory will be allocated out of free    *
+ *    store.                                                                                   *
+ *                                                                                             *
+ * INPUT:   newsize  -- The desired maximum size of this vector.                               *
+ *                                                                                             *
+ *          array    -- Optional pointer to a previously allocated memory array.               *
+ *                                                                                             *
+ * OUTPUT:  bool; Was vector successfully resized according to specifications?                 *
+ *                                                                                             *
+ * WARNINGS:   Failure to resize the vector could be the result of lack of free store.         *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool DynamicVectorClass<T>::Resize(int newsize, T const * array)
+{
+	if (VectorClass<T>::Resize(newsize, array)) {
+		if (Length() < ActiveCount) ActiveCount = Length();
+		return(true);
+	}
+	return(false);
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::ID -- Find matching value in the dynamic vector.                     *
+ *                                                                                             *
+ *    Use this routine to find a matching object (by value) in the vector. Unlike the base     *
+ *    class ID function of similar name, this one restricts the scan to the current number     *
+ *    of valid objects.                                                                        *
+ *                                                                                             *
+ * INPUT:   object   -- A reference to the object that a match is to be found in the           *
+ *                      vector.                                                                *
+ *                                                                                             *
+ * OUTPUT:  Returns with the index number of the object that is equivalent to the one          *
+ *          specified. If no equivalent object could be found then -1 is returned.             *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/13/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+int DynamicVectorClass<T>::ID(T const & object)
+{
+	for (int index = 0; index < Count(); index++) {
+		if ((*this)[index] == object) return(index);
+	}
+	return(-1);
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Add -- Add an element to the vector.                                 *
+ *                                                                                             *
+ *    Use this routine to add an element to the vector. The vector will automatically be       *
+ *    resized to accomodate the new element IF the vector was allocated previously and the     *
+ *    growth rate is not zero.                                                                 *
+ *                                                                                             *
+ * INPUT:   object   -- Reference to the object that will be added to the vector.              *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the object added successfully? If so, the object is added to the end     *
+ *                of the vector.                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool DynamicVectorClass<T>::Add(T const & object)
+{
+	if (ActiveCount >= Length()) {
+		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
+			if (!Resize(Length() + GrowthStep)) {
+
+				/*
+				**	Failure to increase the size of the vector is an error condition.
+				**	Return with the error flag.
+				*/
+				return(false);
+			}
+		} else {
+
+			/*
+			**	Increasing the size of this vector is not allowed! Bail this
+			**	routine with the error code.
+			*/
+			return(false);
+		}
+	}
+
+	/*
+	**	There is room for the new object now. Add it to the end of the object vector.
+	*/
+	(*this)[ActiveCount++] = object;
+	return(true);
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Add_Head -- Adds element to head of the list.                        *
+ *                                                                                             *
+ *    This routine will add the specified element to the head of the vector. If necessary,     *
+ *    the vector will be expanded accordingly.                                                 *
+ *                                                                                             *
+ * INPUT:   object   -- Reference to the object to add to the head of this vector.             *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the object added without error?                                          *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   09/21/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool DynamicVectorClass<T>::Add_Head(T const & object)
+{
+	if (ActiveCount >= Length()) {
+		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
+			if (!Resize(Length() + GrowthStep)) {
+
+				/*
+				**	Failure to increase the size of the vector is an error condition.
+				**	Return with the error flag.
+				*/
+				return(false);
+			}
+		} else {
+
+			/*
+			**	Increasing the size of this vector is not allowed! Bail this
+			**	routine with the error code.
+			*/
+			return(false);
+		}
+	}
+
+	/*
+	**	There is room for the new object now. Add it to the end of the object vector.
+	*/
+	if (ActiveCount) {
+		memmove(&(*this)[1], &(*this)[0], ActiveCount * sizeof(T));
+	}
+	(*this)[0] = object;
+	ActiveCount++;
+//	(*this)[ActiveCount++] = object;
+	return(true);
+}
+
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Insert -- insert an object at the desired index                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   4/27/99    GTH : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool DynamicVectorClass<T>::Insert(int index,T const & object)
+{
+	if (index < 0) return false;
+	if (index > ActiveCount) return false;
+
+	if (ActiveCount >= Length()) {
+		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
+			if (!Resize(Length() + GrowthStep)) {
+
+				/*
+				**	Failure to increase the size of the vector is an error condition.
+				**	Return with the error flag.
+				*/
+				return(false);
+			}
+		} else {
+
+			/*
+			**	Increasing the size of this vector is not allowed! Bail this
+			**	routine with the error code.
+			*/
+			return(false);
+		}
+	}
+
+	/*
+	**	There is room for the new object now. Add it at the desired position.
+	*/
+	if (index < ActiveCount) {
+		memmove(&(*this)[index+1], &(*this)[index], (ActiveCount-index) * sizeof(T));
+	}
+	(*this)[index] = object;
+	ActiveCount++;
+	return(true);
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Delete -- Remove the specified object from the vector.               *
+ *                                                                                             *
+ *    This routine will delete the object referenced from the vector. All objects in the       *
+ *    vector that follow the one deleted will be moved "down" to fill the hole.                *
+ *                                                                                             *
+ * INPUT:   object   -- Reference to the object in this vector that is to be deleted.          *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the object deleted successfully? This should always be true.             *
+ *                                                                                             *
+ * WARNINGS:   Do no pass a reference to an object that is NOT part of this vector. The        *
+ *             results of this are undefined and probably catastrophic.                        *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool DynamicVectorClass<T>::Delete(T const & object)
+{
+	int id = ID(object);
+	if (id != -1) {
+		return(Delete(id));
+	}
+	return(false);
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Delete -- Deletes the specified index from the vector.               *
+ *                                                                                             *
+ *    Use this routine to delete the object at the specified index from the objects in the     *
+ *    vector. This routine will move all the remaining objects "down" in order to fill the     *
+ *    hole.                                                                                    *
+ *                                                                                             *
+ * INPUT:   index -- The index number of the object in the vector that is to be deleted.       *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the object index deleted successfully? Failure might mean that the index *
+ *                specified was out of bounds.                                                 *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool DynamicVectorClass<T>::Delete(int index)
+{
+	if (index < ActiveCount) {
+		ActiveCount--;
+
+		/*
+		**	If there are any objects past the index that was deleted, copy those
+		**	objects down in order to fill the hole. A simple memory copy is
+		**	not sufficient since the vector could contain class objects that
+		**	need to use the assignment operator for movement.
+		*/
+//		(&(*this)[index])->~ T ();
+		for (int i = index; i < ActiveCount; i++) {
+			(*this)[i] = (*this)[i+1];
+		}
+		return(true);
+	}
+	return(false);
+}
+
+
+template<class T>
+bool DynamicVectorClass<T>::Delete_Index(int index)
+{
+	if (index < ActiveCount) {
+		ActiveCount--;
+
+		/*
+		**	If there are any objects past the index that was deleted, copy those
+		**	objects down in order to fill the hole. A simple memory copy is
+		**	not sufficient since the vector could contain class objects that
+		**	need to use the assignment operator for movement.
+		*/
+//		(&(*this)[index])->~ T ();
+		for (int i = index; i < ActiveCount; i++) {
+			(*this)[i] = (*this)[i+1];
+		}
+		return(true);
+	}
+	return(false);
+}
+
+
+template<class T>
+void DynamicVectorClass<T>::Delete_All(void)
+{
+	int len = VectorMax;
+	Clear();		// Forces destructor call on each object.
+	Resize(len);
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Uninitialized_Add -- Add an empty place to the vector.               *
+ *                                                                                             *
+ *    To avoid copying when creating an object and adding it to the vector, use this and       *
+ *    immediately fill the area that the return value points to with a valid object (by hand   *
+ *    for a struct or by using placement new for a class object).                              *
+ *    This function does everything Add does except copying an object into the new space,      *
+ *    thus leaving an uninitialized area of memory.                                            *
+ *                                                                                             *
+ * INPUT:   none.                                                                              *
+ *                                                                                             *
+ * OUTPUT:  T *; Points to the empty space where the new object is to be created. (If the      *
+ *               space was not added successfully, returns NULL).                              *
+ *                                                                                             *
+ * WARNINGS:   If memory area is left uninitialized, Very Bad Things will happen.              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/04/1998 NH : Created.                                                                  *
+ *=============================================================================================*/
+template<class T>
+T * DynamicVectorClass<T>::Uninitialized_Add(void)
+{
+	if (ActiveCount >= Length()) {
+//		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
+		if (GrowthStep > 0) {
+			if (!Resize(Length() + GrowthStep)) {
+
+				/*
+				**	Failure to increase the size of the vector is an error condition.
+				**	Return with the error value.
+				*/
+				return(NULL);
+			}
+		} else {
+
+			/*
+			**	Increasing the size of this vector is not allowed! Bail this
+			**	routine with the error value.
+			*/
+			return(NULL);
+		}
+	}
+
+	/*
+	**	There is room for the new space now. Add it to the end of the object
+   ** vector. and return a pointer to it.
+	*/
+   return &((*this)[ActiveCount++]);
+}
+
+
+void Set_Bit(void * array, int bit, int value);
+int Get_Bit(void const * array, int bit);
+int First_True_Bit(void const * array);
+int First_False_Bit(void const * array);
+
+
+/**************************************************************************
+**	This is a derivative of a vector class that supports boolean flags. Since
+**	a boolean flag can be represented by a single bit, this class packs the
+**	array of boolean flags into an array of bytes containing 8 boolean values
+**	each. For large boolean arrays, this results in an 87.5% savings. Although
+**	the indexing "[]" operator is supported, DO NOT pass pointers to sub elements
+**	of this bit vector class. A pointer derived from the indexing operator is
+**	only valid until the next call. Because of this, only simple
+**	direct use of the "[]" operator is allowed.
+*/
+class BooleanVectorClass
+{
+	public:
+		BooleanVectorClass(unsigned size=0, unsigned char * array=0);
+		BooleanVectorClass(BooleanVectorClass const & vector);
+
+		// Assignment operator.
+		BooleanVectorClass & operator =(BooleanVectorClass const & vector);
+
+		// Equivalency operator.
+		bool operator == (BooleanVectorClass const & vector) const;
+
+		// Initialization
+		void Init(unsigned size, unsigned char * array);
+		void Init(unsigned size);
+
+		// Fetch number of boolean objects in vector.
+		int Length(void) {return BitCount;};
+
+		// Set all boolean values to false;
+		void Reset(void);
+
+		// Set all boolean values to true.
+		void Set(void);
+
+		// Resets vector to zero length (frees memory).
+		void Clear(void);
+
+		// Change size of this boolean vector.
+		int Resize(unsigned size);
+
+		// Fetch reference to specified index.
+		bool const & operator[](int index) const {
+			if (LastIndex != index) Fixup(index);
+			return(Copy);
+		};
+		bool & operator[](int index) {
+			if (LastIndex != index) Fixup(index);
+			return(Copy);
+		};
+
+		// Quick check on boolean state.
+		bool Is_True(int index) const {
+			if (index == LastIndex) return(Copy);
+			return(Get_Bit(&BitArray[0], index) != 0);
+		};
+
+		// Find first index that is false.
+		int First_False(void) const {
+			if (LastIndex != -1) Fixup(-1);
+
+			int retval = First_False_Bit(&BitArray[0]);
+			if (retval < BitCount) return(retval);
+
+			/*
+			**	Failure to find a false boolean value in the vector. Return this
+			**	fact in the form of an invalid index number.
+			*/
+			return(-1);
+		}
+
+		// Find first index that is true.
+		int First_True(void) const {
+			if (LastIndex != -1) Fixup(-1);
+
+			int retval = First_True_Bit(&BitArray[0]);
+			if (retval < BitCount) return(retval);
+
+			/*
+			**	Failure to find a true boolean value in the vector. Return this
+			**	fact in the form of an invalid index number.
+			*/
+			return(-1);
+		}
+
+		// Accessors (usefull for saving the bit vector)
+		const VectorClass<unsigned char> &	Get_Bit_Array(void)	{ return BitArray; }
+
+	protected:
+
+		void Fixup(int index=-1) const;
+
+		/*
+		**	This is the number of boolean values in the vector. This value is
+		**	not necessarily a multiple of 8, even though the underlying character
+		**	vector contains a multiple of 8 bits.
+		*/
+		int BitCount;
+
+		/*
+		**	This is a referential copy of an element in the bit vector. The
+		**	purpose of this copy is to allow normal reference access to this
+		**	object (for speed reasons). This hides the bit packing scheme from
+		**	the user of this class.
+		*/
+		bool Copy;
+
+		/*
+		**	This records the index of the value last fetched into the reference
+		**	boolean variable. This index is used to properly restore the value
+		**	when the reference copy needs updating.
+		*/
+		int LastIndex;
+
+		/*
+		**	This points to the allocated bitfield array.
+		*/
+		VectorClass<unsigned char> BitArray;
+};
+
+
+template<class T>
+int Pointer_Vector_Add(T * ptr, VectorClass<T *> & vec)
+{
+	int id = 0;
+	bool foundspot = false;
+	for (int index = 0; index < vec.Length(); index++) {
+		if (vec[index] == NULL) {
+			id = index;
+			foundspot = true;
+			break;
+		}
+	}
+	if (!foundspot) {
+		id = vec.Length();
+		vec.Resize((vec.Length()+1) * 2);
+		for (int index = id; index < vec.Length(); index++) {
+			vec[index] = NULL;
+		}
+	}
+	vec[id] = ptr;
+	return(id);
+}
+
+
+template<class T>
+bool Pointer_Vector_Remove(T const * ptr, VectorClass<T *> & vec)
+{
+	int id = vec.ID((T *)ptr);
+	if (id != -1) {
+		vec[id] = NULL;
+		return(true);
+	}
+	return(false);
+}
+
+#ifdef _MSC_VER
+#pragma warning (default : 4702) // unreachable code, happens with some uses of these templates
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h b/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h
index af4019e05c0..079d3a40f34 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h
@@ -34,8 +34,7 @@
 *
 ******************************************************************************/
 
-#ifndef __WWCOMUTIL_H__
-#define __WWCOMUTIL_H__
+#pragma once
 
 #include <oaidl.h>
 
@@ -56,5 +55,3 @@ bool RegisterCOMServer(const char* dllName);
 
 //! Unregister COM in-process DLL server
 bool UnregisterCOMServer(const char* dllName);
-
-#endif // __WWCOMUTIL_H__
diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h b/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h
new file mode 100644
index 00000000000..d36f6df963d
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/WWCommon.h
@@ -0,0 +1,51 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "refcount.h"
+#include "STLUtils.h"
+#include "stringex.h"
+#include <Utility/stdio_adapter.h>
+
+
+// This macro serves as a general way to determine the number of elements within an array.
+#ifndef ARRAY_SIZE
+#if defined(_MSC_VER) && _MSC_VER < 1300
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
+#else
+template <typename Type, size_t Size> char (*ArraySizeHelper(Type(&)[Size]))[Size];
+#define ARRAY_SIZE(arr) sizeof(*ArraySizeHelper(arr))
+#endif
+#endif // ARRAY_SIZE
+
+enum
+{
+	// TheSuperHackers @info The original WWSync was 33 ms, ~30 fps, integer.
+	// Changing this will require tweaking all Drawable code that concerns the ww3d time step, including locomotion physics.
+	WWSyncPerSecond = 30,
+	WWSyncMilliseconds = 1000 / WWSyncPerSecond,
+};
+
+#if defined(_MSC_VER) && _MSC_VER < 1300
+typedef unsigned MemValueType;
+typedef long Interlocked32; // To use with Interlocked functions
+#else
+typedef unsigned long long MemValueType;
+typedef volatile long Interlocked32; // To use with Interlocked functions
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWDefines.h b/Core/Libraries/Source/WWVegas/WWLib/WWDefines.h
new file mode 100644
index 00000000000..eb25d597db8
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/WWDefines.h
@@ -0,0 +1,28 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// Enable translation and rotation interpolation for raw animation (HRawAnimClass) updates.
+// This was intentionally disabled in the retail version, but likely not fully thought through.
+// Interpolation is certainly desired for animations that move and rotate meshes, but may not be
+// desired for animations that teleport meshes from one location to another, such as blinking lights.
+// @todo Implement a new flag per animation file to opt-out of interpolation.
+#ifndef WW3D_ENABLE_RAW_ANIM_INTERPOLATION
+#define WW3D_ENABLE_RAW_ANIM_INTERPOLATION (1)
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H b/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H
deleted file mode 100644
index 3d4fd1cceed..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/wwfile.h                               $* 
- *                                                                                             * 
- *                      $Author:: Ian_l                                                       $*
- *                                                                                             * 
- *                     $Modtime:: 10/31/01 2:00p                                              $*
- *                                                                                             * 
- *                    $Revision:: 9                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef WWFILE_Hx
-#define WWFILE_Hx
-
-#define YEAR(dt)	(((dt & 0xFE000000) >> (9 + 16)) + 1980)
-#define MONTH(dt)	 ((dt & 0x01E00000) >> (5 + 16))
-#define DAY(dt)	 ((dt & 0x001F0000) >> (0 + 16))
-#define HOUR(dt)	 ((dt & 0x0000F800) >> 11)
-#define MINUTE(dt) ((dt & 0x000007E0) >> 5)
-#define SECOND(dt) ((dt & 0x0000001F) << 1)
-
-#ifndef SEEK_SET
-#define SEEK_SET					0	// Seek from start of file.
-#define SEEK_CUR					1	// Seek relative from current location.
-#define SEEK_END					2	// Seek from end of file.
-#endif
-
-#ifndef NULL
-	#define	NULL	0
-#endif
-
-
-class FileClass
-{
-	public:
-
-		enum 
-		{
-			READ = 1,
-			WRITE = 2,
-			PRINTF_BUFFER_SIZE = 1024
-		};
-		
-		virtual ~FileClass(void) {};
-		virtual char const * File_Name(void) const = 0;
-		virtual char const * Set_Name(char const *filename) = 0;
-		virtual int Create(void) = 0;
-		virtual int Delete(void) = 0;
-		virtual bool Is_Available(int forced=false) = 0;
-		virtual bool Is_Open(void) const = 0;
-		virtual int Open(char const *filename, int rights=READ) = 0;
-		virtual int Open(int rights=READ) = 0;
-		virtual int Read(void *buffer, int size) = 0;
-		virtual int Seek(int pos, int dir=SEEK_CUR) = 0;
-		virtual int Tell(void) { return Seek(0); }
-		virtual int Size(void) = 0;
-		virtual int Write(void const *buffer, int size) = 0;
-		virtual void Close(void) = 0;
-		virtual unsigned long Get_Date_Time(void) {return(0);}
-		virtual bool Set_Date_Time(unsigned long ) {return(false);}
-//		virtual void Error(int error, int canretry = false, char const * filename=NULL) = 0;
-		virtual void * Get_File_Handle(void) { return reinterpret_cast<void *>(-1); } 
-//		virtual void Bias(int start, int length=-1) = 0;
-
-		operator char const * ()
-		{
-			return File_Name();
-		}
-
-		// this form uses a stack buffer of PRINTF_BUFFER_SIZE
-		int Printf(char *str, ...);
-
-		// this form uses the supplied buffer if PRINTF_BUFFER_SIZE is expected to be too small.
-		int Printf(char *buffer, int bufferSize, char *str, ...);
-
-		// this form uses the stack buffer but will prepend any output with the indicated number of tab characters '\t'
-		int Printf_Indented(unsigned depth, char *str, ...);
-
-};
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWFILE.h b/Core/Libraries/Source/WWVegas/WWLib/WWFILE.h
new file mode 100644
index 00000000000..16b1bbfa0ac
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/WWFILE.h
@@ -0,0 +1,103 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/wwfile.h                               $*
+ *                                                                                             *
+ *                      $Author:: Ian_l                                                       $*
+ *                                                                                             *
+ *                     $Modtime:: 10/31/01 2:00p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 9                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#define YEAR(dt)	(((dt & 0xFE000000) >> (9 + 16)) + 1980)
+#define MONTH(dt)	 ((dt & 0x01E00000) >> (5 + 16))
+#define DAY(dt)	 ((dt & 0x001F0000) >> (0 + 16))
+#define HOUR(dt)	 ((dt & 0x0000F800) >> 11)
+#define MINUTE(dt) ((dt & 0x000007E0) >> 5)
+#define SECOND(dt) ((dt & 0x0000001F) << 1)
+
+#ifndef SEEK_SET
+#define SEEK_SET					0	// Seek from start of file.
+#define SEEK_CUR					1	// Seek relative from current location.
+#define SEEK_END					2	// Seek from end of file.
+#endif
+
+#ifndef NULL
+	#define	NULL	0
+#endif
+
+
+class FileClass
+{
+	public:
+
+		enum
+		{
+			READ = 1,
+			WRITE = 2,
+			PRINTF_BUFFER_SIZE = 1024
+		};
+
+		virtual ~FileClass(void) {};
+		virtual char const * File_Name(void) const = 0;
+		virtual char const * Set_Name(char const *filename) = 0;
+		virtual int Create(void) = 0;
+		virtual int Delete(void) = 0;
+		virtual bool Is_Available(int forced=false) = 0;
+		virtual bool Is_Open(void) const = 0;
+		virtual int Open(char const *filename, int rights=READ) = 0;
+		virtual int Open(int rights=READ) = 0;
+		virtual int Read(void *buffer, int size) = 0;
+		virtual int Seek(int pos, int dir=SEEK_CUR) = 0;
+		virtual int Tell(void) { return Seek(0); }
+		virtual int Size(void) = 0;
+		virtual int Write(void const *buffer, int size) = 0;
+		virtual void Close(void) = 0;
+		virtual unsigned long Get_Date_Time(void) {return(0);}
+		virtual bool Set_Date_Time(unsigned long ) {return(false);}
+//		virtual void Error(int error, int canretry = false, char const * filename=NULL) = 0;
+		virtual void * Get_File_Handle(void) { return reinterpret_cast<void *>(-1); }
+//		virtual void Bias(int start, int length=-1) = 0;
+
+		operator char const * ()
+		{
+			return File_Name();
+		}
+
+		// this form uses a stack buffer of PRINTF_BUFFER_SIZE
+		int Printf(char *str, ...);
+
+		// this form uses the supplied buffer if PRINTF_BUFFER_SIZE is expected to be too small.
+		int Printf(char *buffer, int bufferSize, char *str, ...);
+
+		// this form uses the stack buffer but will prepend any output with the indicated number of tab characters '\t'
+		int Printf_Indented(unsigned depth, char *str, ...);
+
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H b/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H
deleted file mode 100644
index 1ade8686072..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/XPIPE.H                                            $* 
- *                                                                                             * 
- *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
- *                     $Modtime:: 4/02/99 12:01p                                              $*
- *                                                                                             * 
- *                    $Revision:: 2                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef XPIPE_H
-#define XPIPE_H
-
-#include	"BUFF.H"
-#include	"PIPE.H"
-#include	"WWFILE.H"
-
-/*
-**	This is a simple store-into-buffer pipe terminator. Use it as the final link in a pipe process
-**	that needs to store the data into a memory buffer. This can only serve as the final
-**	link in the chain of pipe segments.
-*/
-class BufferPipe : public Pipe
-{
-	public:
-		BufferPipe(Buffer const & buffer) : BufferPtr(buffer), Index(0) {}
-		BufferPipe(void * buffer, int length) : BufferPtr(buffer, length), Index(0) {}
-		virtual int Put(void const * source, int slen);
-
-	private:
-		Buffer BufferPtr;
-		int Index;
-
-		bool Is_Valid(void) {return(BufferPtr.Is_Valid());}
-		BufferPipe(BufferPipe & rvalue);
-		BufferPipe & operator = (BufferPipe const & pipe);
-};
-
-
-/*
-**	This is a store-to-file pipe terminator. Use it as the final link in a pipe process that
-**	needs to store the data to a file. This can only serve as the last link in the chain
-**	of pipe segments.
-*/
-class FilePipe : public Pipe
-{
-	public:
-		FilePipe(FileClass * file) : File(file), HasOpened(false) {}
-		FilePipe(FileClass & file) : File(&file), HasOpened(false) {}
-		virtual ~FilePipe(void);
-
-		virtual int Put(void const * source, int slen);
-		virtual int End(void);
-
-	private:
-		FileClass * File;
-		bool HasOpened;
-
-		bool Valid_File(void) {return(File != NULL);}
-		FilePipe(FilePipe & rvalue);
-		FilePipe & operator = (FilePipe const & pipe);
-
-};
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/XPIPE.h b/Core/Libraries/Source/WWVegas/WWLib/XPIPE.h
new file mode 100644
index 00000000000..2e68e3c044f
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/XPIPE.h
@@ -0,0 +1,88 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/XPIPE.h                                            $*
+ *                                                                                             *
+ *                      $Author:: Eric_c                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 4/02/99 12:01p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "BUFF.h"
+#include "PIPE.h"
+#include "WWFILE.h"
+
+/*
+**	This is a simple store-into-buffer pipe terminator. Use it as the final link in a pipe process
+**	that needs to store the data into a memory buffer. This can only serve as the final
+**	link in the chain of pipe segments.
+*/
+class BufferPipe : public Pipe
+{
+	public:
+		BufferPipe(Buffer const & buffer) : BufferPtr(buffer), Index(0) {}
+		BufferPipe(void * buffer, int length) : BufferPtr(buffer, length), Index(0) {}
+		virtual int Put(void const * source, int slen);
+
+	private:
+		Buffer BufferPtr;
+		int Index;
+
+		bool Is_Valid(void) {return(BufferPtr.Is_Valid());}
+		BufferPipe(BufferPipe & rvalue);
+		BufferPipe & operator = (BufferPipe const & pipe);
+};
+
+
+/*
+**	This is a store-to-file pipe terminator. Use it as the final link in a pipe process that
+**	needs to store the data to a file. This can only serve as the last link in the chain
+**	of pipe segments.
+*/
+class FilePipe : public Pipe
+{
+	public:
+		FilePipe(FileClass * file) : File(file), HasOpened(false) {}
+		FilePipe(FileClass & file) : File(&file), HasOpened(false) {}
+		virtual ~FilePipe(void);
+
+		virtual int Put(void const * source, int slen);
+		virtual int End(void);
+
+	private:
+		FileClass * File;
+		bool HasOpened;
+
+		bool Valid_File(void) {return(File != NULL);}
+		FilePipe(FilePipe & rvalue);
+		FilePipe & operator = (FilePipe const & pipe);
+
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H b/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H
deleted file mode 100644
index 86d1c51e5d4..00000000000
--- a/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/XSTRAW.H                                           $* 
- *                                                                                             * 
- *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
- *                     $Modtime:: 4/02/99 12:01p                                              $*
- *                                                                                             * 
- *                    $Revision:: 2                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef XSTRAW_H
-#define XSTRAW_H
-
-#include	"BUFF.H"
-#include	"STRAW.H"
-#include	"WWFILE.H"
-#include	<stddef.h>
-
-/*
-**	This class is used to manage a buffer as a data source. Data requests will draw from the
-**	buffer supplied until the buffer is exhausted.
-*/
-class BufferStraw : public Straw
-{
-	public:
-		BufferStraw(Buffer const & buffer) : BufferPtr(buffer), Index(0) {}
-		BufferStraw(void const * buffer, int length) : BufferPtr((void*)buffer, length), Index(0) {}
-		virtual int Get(void * source, int slen);
-
-	private:
-		Buffer BufferPtr;
-		int Index;
-//		void const * BufferPtr;
-//		int Length;
-
-		bool Is_Valid(void) {return(BufferPtr.Is_Valid());}
-		BufferStraw(BufferStraw & rvalue);
-		BufferStraw & operator = (BufferStraw const & pipe);
-};
-
-/*
-**	This class is used to manage a file as a data source. Data requests will draw from the
-**	file until the file has been completely read.
-*/
-class FileStraw : public Straw
-{
-	public:
-		FileStraw(FileClass * file) : File(file), HasOpened(false) {}
-		FileStraw(FileClass & file) : File(&file), HasOpened(false) {}
-		virtual ~FileStraw(void);
-		virtual int Get(void * source, int slen);
-
-	private:
-		FileClass * File;
-		bool HasOpened;
-
-		bool Valid_File(void) {return(File != NULL);}
-		FileStraw(FileStraw & rvalue);
-		FileStraw & operator = (FileStraw const & pipe);
-};
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.h b/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.h
new file mode 100644
index 00000000000..f21e78f275b
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.h
@@ -0,0 +1,85 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/XSTRAW.h                                           $*
+ *                                                                                             *
+ *                      $Author:: Eric_c                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 4/02/99 12:01p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "BUFF.h"
+#include "STRAW.h"
+#include "WWFILE.h"
+#include	<stddef.h>
+
+/*
+**	This class is used to manage a buffer as a data source. Data requests will draw from the
+**	buffer supplied until the buffer is exhausted.
+*/
+class BufferStraw : public Straw
+{
+	public:
+		BufferStraw(Buffer const & buffer) : BufferPtr(buffer), Index(0) {}
+		BufferStraw(void const * buffer, int length) : BufferPtr((void*)buffer, length), Index(0) {}
+		virtual int Get(void * source, int slen);
+
+	private:
+		Buffer BufferPtr;
+		int Index;
+//		void const * BufferPtr;
+//		int Length;
+
+		bool Is_Valid(void) {return(BufferPtr.Is_Valid());}
+		BufferStraw(BufferStraw & rvalue);
+		BufferStraw & operator = (BufferStraw const & pipe);
+};
+
+/*
+**	This class is used to manage a file as a data source. Data requests will draw from the
+**	file until the file has been completely read.
+*/
+class FileStraw : public Straw
+{
+	public:
+		FileStraw(FileClass * file) : File(file), HasOpened(false) {}
+		FileStraw(FileClass & file) : File(&file), HasOpened(false) {}
+		virtual ~FileStraw(void);
+		virtual int Get(void * source, int slen);
+
+	private:
+		FileClass * File;
+		bool HasOpened;
+
+		bool Valid_File(void) {return(File != NULL);}
+		FileStraw(FileStraw & rvalue);
+		FileStraw & operator = (FileStraw const & pipe);
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/always.h b/Core/Libraries/Source/WWVegas/WWLib/always.h
index 7439bc9e628..c58e6dd8e48 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/always.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/always.h
@@ -33,22 +33,19 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
+
 #pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef ALWAYS_H
-#define ALWAYS_H
+#include "WWCommon.h"
+#include "WWDefines.h"
 
 #include <assert.h>
 #include <new>
 
-// TheSuperHackers @compile feliwir 17/04/2025 include utility macros for cross-platform compatibility
+// TheSuperHackers @build feliwir 17/04/2025 include utility macros for cross-platform compatibility
 #include <Utility/compat.h>
 #include <Utility/stdint_adapter.h>
 
-#include <Utility/CppMacros.h>
-
 // Disable warning about exception handling not being enabled. It's used as part of STL - in a part of STL we don't use.
 #pragma warning(disable : 4530)
 
@@ -107,18 +104,25 @@
 
 #endif
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) 
+#if defined(RTS_DEBUG)
 	#define MSGW3DNEW(MSG)					new( MSG, 0 )
 	#define MSGW3DNEWARRAY(MSG)			new( MSG, 0 )
 	#define W3DNEW									new("W3D_" __FILE__, 0)
 	#define W3DNEWARRAY							new("W3A_" __FILE__, 0)
+
+	#define NEW_REF( C, P )					( (C*)RefCountClass::Set_Ref_Owner( W3DNEW C P, __FILE__, __LINE__ ) )
+	#define SET_REF_OWNER( P )			( RefCountClass::Set_Ref_Owner( P, __FILE__, __LINE__ ) )
 #else
 	#define MSGW3DNEW(MSG)					new
 	#define MSGW3DNEWARRAY(MSG)			new
 	#define W3DNEW									new
 	#define W3DNEWARRAY							new
+
+	#define NEW_REF( C, P )					( W3DNEW C P )
+	#define SET_REF_OWNER( P )			P
 #endif
 
+
 // ----------------------------------------------------------------------------
 extern void* createW3DMemPool(const char *poolName, int allocationSize);
 extern void* allocateFromW3DMemPool(void* p, int allocationSize);
@@ -140,7 +144,7 @@ private: \
 		return The##ARGCLASS##Pool; \
 	} \
 protected: \
-	virtual int glueEnforcer() const { return sizeof(this); } \
+	virtual void glueEnforcer() const { } \
 public: \
 	inline void* operator new(size_t s) { return allocateFromW3DMemPool(getClassMemoryPool(), s); } \
 	inline void operator delete(void *p) { freeFromW3DMemPool(getClassMemoryPool(), p); } \
@@ -158,7 +162,7 @@ class W3DMPO
 	}
 protected:
 	// we never call this; it is present to cause compile errors in descendent classes
-	virtual int glueEnforcer() const = 0;
+	virtual void glueEnforcer() const = 0;
 public:
 	virtual ~W3DMPO() { /* nothing */ }
 };
@@ -171,6 +175,9 @@ class W3DMPO
 	#define W3DNEW									new
 	#define W3DNEWARRAY							new
 
+	#define NEW_REF( C, P )					( W3DNEW C P )
+	#define SET_REF_OWNER( P )			P
+
 	#define W3DMPO_GLUE(ARGCLASS)
 
 	class W3DMPO { };
@@ -190,7 +197,7 @@ class W3DMPO
 ** Define the MIN and MAX macros.
 ** NOTE: Joe used to #include <minmax.h> in the various compiler header files.  This
 ** header defines 'min' and 'max' macros which conflict with the surrender code so
-** I'm relpacing all occurances of 'min' and 'max with 'MIN' and 'MAX'.  For code which
+** I'm replacing all occurrences of 'min' and 'max with 'MIN' and 'MAX'.  For code which
 ** is out of our domain (e.g. Max sdk) I'm declaring template functions for 'min' and 'max'
 */
 #define NOMINMAX
@@ -244,7 +251,7 @@ template <class T> T max(T a,T b)
 #endif
 
 #if defined(__WATCOMC__)
-#include	"WATCOM.H"
+#include	"watcom.h"
 #endif
 
 
@@ -252,17 +259,7 @@ template <class T> T max(T a,T b)
 	#define	NULL		0
 #endif
 
-/**********************************************************************
-**	This macro serves as a general way to determine the number of elements
-**	within an array.
-*/
-#ifndef ARRAY_SIZE
-#define	ARRAY_SIZE(x)		int(sizeof(x)/sizeof(x[0]))
-#endif
 
 #ifndef size_of
 #define size_of(typ,id) sizeof(((typ*)0)->id)
 #endif
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/argv.cpp b/Core/Libraries/Source/WWVegas/WWLib/argv.cpp
index fbb5d27f96b..28958b3fbb8 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/argv.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/argv.cpp
@@ -17,53 +17,51 @@
 */
 
 /* $Header: /VSS_Sync/wwlib/argv.cpp 11    8/29/01 10:25p Vss_sync $ */
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Library                                                      * 
- *                                                                                             * 
- *                     $Archive:: /VSS_Sync/wwlib/argv.cpp                                    $* 
- *                                                                                             * 
- *                      $Author:: Vss_sync                                                    $* 
- *                                                                                             * 
- *                     $Modtime:: 8/29/01 10:24p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 11                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   CurrentPos -- Create an instance to parse argv with.                                      * 
- *   ArgvClass::Free -- Release data allocated.                                                * 
- *   ArgvClass::Load_File -- Load args from a file.                                            * 
- *   *ArgvClass::Find_Value -- Find value of argument given prefix.                            * 
- *   *ArgvClass::Get_Cur_Value -- Get value of current argugment.                              * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Library                                                      *
+ *                                                                                             *
+ *                     $Archive:: /VSS_Sync/wwlib/argv.cpp                                    $*
+ *                                                                                             *
+ *                      $Author:: Vss_sync                                                    $*
+ *                                                                                             *
+ *                     $Modtime:: 8/29/01 10:24p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 11                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   CurrentPos -- Create an instance to parse argv with.                                      *
+ *   ArgvClass::Free -- Release data allocated.                                                *
+ *   ArgvClass::Load_File -- Load args from a file.                                            *
+ *   *ArgvClass::Find_Value -- Find value of argument given prefix.                            *
+ *   *ArgvClass::Get_Cur_Value -- Get value of current argugment.                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 #include "argv.h"
 
 #include <assert.h>
 #include <ctype.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include "ffactory.h"
-#include "RAWFILE.H"
+#include "RAWFILE.h"
 int   	 ArgvClass::Argc = 0;
 char 		*ArgvClass::Argv[MAX_ARGC];
 
-/*********************************************************************************************** 
- * CurrentPos -- Create an instance to parse argv with.                                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
+/***********************************************************************************************
+ * CurrentPos -- Create an instance to parse argv with.                                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
  *    	bool case_sensitive - Do you want to perform a case sensitive search (stricmp)?		  *
  *			bool exact_size     - Do you want string of same lenght (strncmp) ?						  *
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/18/1999 SKB : Created.                                                                 * 
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/18/1999 SKB : Created.                                                                 *
  *=============================================================================================*/
 ArgvClass::ArgvClass(bool case_sensitive, bool exact_size):
 	Flags(0),
@@ -74,22 +72,22 @@ ArgvClass::ArgvClass(bool case_sensitive, bool exact_size):
 	Exact_Size(exact_size);
 }
 
-/*********************************************************************************************** 
- * *ArgvClass::Find_Again -- Search for a string given the flags.                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *      const char *arg - String to search for. If NULL, LastArg will be used.                 * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *      const char *string found (null if not found)														  *	
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/17/1999 SKB : Created.                                                                 * 
+/***********************************************************************************************
+ * *ArgvClass::Find_Again -- Search for a string given the flags.                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *      const char *arg - String to search for. If NULL, LastArg will be used.                 *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *      const char *string found (null if not found)														  *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/17/1999 SKB : Created.                                                                 *
  *=============================================================================================*/
 const char *ArgvClass::Find_Again(const char *arg)
-{						
+{
 	if (arg) {
 		LastArg = arg;
 	} else {
@@ -99,21 +97,21 @@ const char *ArgvClass::Find_Again(const char *arg)
 	// Make sure user has given us something to work with here.
 	assert(LastArg);
 
-	CurrentPos++;							  
+	CurrentPos++;
 	if (CurrentPos < Argc) {
 		if (Is_Case_Sensitive()) {
 			if (Is_Exact_Size()) {
 				// Case Sensitive, Exact Size.
 				for (; CurrentPos < Argc; CurrentPos++) {
-					if (!strcmp(arg, Argv[CurrentPos])) {
+					if (strcmp(arg, Argv[CurrentPos]) == 0) {
 						return Argv[CurrentPos];
 					}
 				}
 			} else {
 				// Case Sensitive, Match first strlen(arg).
-				int len = strlen(arg);			   
+				int len = strlen(arg);
 				for (; CurrentPos < Argc; CurrentPos++) {
-					if (!strncmp(arg, Argv[CurrentPos], len)) {
+					if (strncmp(arg, Argv[CurrentPos], len) == 0) {
 						return Argv[CurrentPos];
 					}
 				}
@@ -122,7 +120,7 @@ const char *ArgvClass::Find_Again(const char *arg)
 			if (Is_Exact_Size()) {
 				// Note case sensitive, Exact Size.
 				for (; CurrentPos < Argc; CurrentPos++) {
-					if (!stricmp(arg, Argv[CurrentPos])) {
+					if (stricmp(arg, Argv[CurrentPos]) == 0) {
 						return Argv[CurrentPos];
 					}
 				}
@@ -130,7 +128,7 @@ const char *ArgvClass::Find_Again(const char *arg)
 				// Note case sensitive, Match first strlen(arg).
 				int len = strlen(arg);
 				for (; CurrentPos < Argc; CurrentPos++) {
-					if (!strnicmp(arg, Argv[CurrentPos], len)) {
+					if (strnicmp(arg, Argv[CurrentPos], len) == 0) {
 						return Argv[CurrentPos];
 					}
 				}
@@ -140,29 +138,29 @@ const char *ArgvClass::Find_Again(const char *arg)
 	return NULL;
 }
 
-/*********************************************************************************************** 
- * ArgvClass::Init -- Setup the command line.                                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
+/***********************************************************************************************
+ * ArgvClass::Init -- Setup the command line.                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
  *			LPSTR lpCmdLine - A string of white space seperated strings.  Quotes force spaces to  *
- *                         be ignored.                                                         * 
+ *                         be ignored.                                                         *
  *			char *fileprefix - A prefix on an arguement telling system to load postfix file name  *
- *                          as command line params.                                            * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *      This may be called multible times with different strings.                              * 
- *      Once Argc reaches MAX_ARGC, no more will be added.                                     * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/17/1999 SKB : Created.                                                                 * 
- *   07/15/2001 SKB : Put file arguements in the correct order they were included.             * 
+ *                          as command line params.                                            *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *      This may be called multible times with different strings.                              *
+ *      Once Argc reaches MAX_ARGC, no more will be added.                                     *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/17/1999 SKB : Created.                                                                 *
+ *   07/15/2001 SKB : Put file arguements in the correct order they were included.             *
  *=============================================================================================*/
 int ArgvClass::Init(char *lpCmdLine, const char *fileprefix)
 {
 	// Get pointer to command line.
-   char	*ptr = lpCmdLine; 
+   char	*ptr = lpCmdLine;
 	if (!ptr || !*ptr) {
 		return 0;
 	}
@@ -172,7 +170,7 @@ int ArgvClass::Init(char *lpCmdLine, const char *fileprefix)
 	// Save original Argc for return.
 	int origargc = Argc;
 
-	while (*ptr) {	
+	while (*ptr) {
 		char  *eos;
 		char  save;
 
@@ -203,7 +201,7 @@ int ArgvClass::Init(char *lpCmdLine, const char *fileprefix)
 		bool was_file = false;
 
 		// See if we are to load a file with parameters in it.
-		if (fp_cmp_len && !strncmp(fileprefix, ptr, fp_cmp_len)) {
+		if (fp_cmp_len && strncmp(fileprefix, ptr, fp_cmp_len) == 0) {
 			ptr += fp_cmp_len;
 			if (*ptr) {
 				was_file = Load_File(ptr);
@@ -229,24 +227,24 @@ int ArgvClass::Init(char *lpCmdLine, const char *fileprefix)
 	return(Argc - origargc);
 }
 
-/*********************************************************************************************** 
- * ArgvClass::Load_File -- Load args from a file.                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *     	const char *fname - file to load.                                                     * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/18/1999 SKB : Created.                                                                 * 
+/***********************************************************************************************
+ * ArgvClass::Load_File -- Load args from a file.                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *     	const char *fname - file to load.                                                     *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/18/1999 SKB : Created.                                                                 *
  *=============================================================================================*/
 bool ArgvClass::Load_File(const char *fname)
 {
 	FILE *fp = fopen(fname, "r");
 
-	if (fp)  {							
+	if (fp)  {
 		while (Argc < MAX_ARGC) {
 			const int maxstrlen = 255;
 			char string[maxstrlen + 1];
@@ -281,21 +279,21 @@ bool ArgvClass::Load_File(const char *fname)
 		}
 		fclose(fp);
 		return(true);
-	}				  
+	}
 	return(false);
-}	
-
-/*********************************************************************************************** 
- * ArgvClass::Free -- Release data allocated.                                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/18/1999 SKB : Created.                                                                 * 
+}
+
+/***********************************************************************************************
+ * ArgvClass::Free -- Release data allocated.                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/18/1999 SKB : Created.                                                                 *
  *=============================================================================================*/
 void ArgvClass::Free()
 {
@@ -305,62 +303,62 @@ void ArgvClass::Free()
 	}
 	Argc = -1;
 }
-				  
-
-/*********************************************************************************************** 
- * *ArgvClass::Find_Value -- Find value of argument given prefix.                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/23/1999 SKB : Created.                                                                 * 
+
+
+/***********************************************************************************************
+ * *ArgvClass::Find_Value -- Find value of argument given prefix.                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/23/1999 SKB : Created.                                                                 *
  *=============================================================================================*/
 const char *ArgvClass::Find_Value(const char *arg)
-{			
+{
 	if (arg && *arg) {
 		const char *ptr = Find(arg);
 		if (ptr) {
 			return(Get_Cur_Value(strlen(arg)));
-		}		  
+		}
 	}
 	return(NULL);
-}	
-		
-/*********************************************************************************************** 
- * *ArgvClass::Get_Cur_Value -- Get value of current argugment.                                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/23/1999 SKB : Created.                                                                 * 
- *   06/25/2001 SKB : add flag user can check to see if value was extracted from next location.* 
+}
+
+/***********************************************************************************************
+ * *ArgvClass::Get_Cur_Value -- Get value of current argugment.                                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/23/1999 SKB : Created.                                                                 *
+ *   06/25/2001 SKB : add flag user can check to see if value was extracted from next location.*
  *=============================================================================================*/
 const char *ArgvClass::Get_Cur_Value(unsigned prefixlen, bool * val_in_next)
-{	 
+{
 	if (val_in_next) *val_in_next = false;
 	if (CurrentPos < 0) {
 		return NULL;
 	}
 	char *ptr = Argv[CurrentPos];
-	
+
 	if (strlen(ptr) < prefixlen) {
 		return(NULL);
-	}					  
+	}
 
 	ptr += prefixlen;
 
 	// Look for non white space (or eol).
 	while (*ptr && !isgraph(*ptr)) {
 		ptr++;
-	}					
+	}
 	if (*ptr) {
 		return ptr;
 	}
@@ -377,26 +375,26 @@ const char *ArgvClass::Get_Cur_Value(unsigned prefixlen, bool * val_in_next)
 			return ptr;
 		}
 		ptr++;
-	}			  
+	}
 	return (NULL);
-}	
+}
 
 
 
 
-/*********************************************************************************************** 
- * void ArgvClass::Update_Value -- Add/Replace a value                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
+/***********************************************************************************************
+ * void ArgvClass::Update_Value -- Add/Replace a value                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
  *			attrib = cmd line attrib to add/replace                                               *
  *			value = new value for attrib                                                          *
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:    Not Tested!                                                                    * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   12/13/1999 NAK : Created.                                                                 * 
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:    Not Tested!                                                                    *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/13/1999 NAK : Created.                                                                 *
  *=============================================================================================*/
 void ArgvClass::Update_Value(const char *attrib, const char *value)
 {
@@ -420,19 +418,19 @@ void ArgvClass::Update_Value(const char *attrib, const char *value)
 }
 
 
-/*********************************************************************************************** 
- * void ArgvClass::Add_Value -- Add a value                                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
+/***********************************************************************************************
+ * void ArgvClass::Add_Value -- Add a value                                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
  *			attrib = thing to add                                                                 *
  *			value = new optional value                                                            *
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   12/13/1999 NAK : Created.                                                                 * 
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/13/1999 NAK : Created.                                                                 *
  *=============================================================================================*/
 void ArgvClass::Add_Value(const char *attrib, const char *value)
 {
@@ -450,23 +448,23 @@ void ArgvClass::Add_Value(const char *attrib, const char *value)
 }
 
 
-/*********************************************************************************************** 
- * bool ArgvClass::Remove_Value -- Remove a value                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
+/***********************************************************************************************
+ * bool ArgvClass::Remove_Value -- Remove a value                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
  *			attrib = thing to remove                                                              *
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
  *       THIS CONTAINS A POTENTIAL BUG - I don't want to fix it because it might be a desired  *
  *			behavior.  Given:																							  *
  *				Argv[0] = "-i test" "*.txt" as values in Argv, 															  *
  *       calling Remove_Value("-i") will remove *.txt	as well.											  *
  *																															  *
- * HISTORY:                                                                                    * 
- *   12/13/1999 NAK : Created.                                                                 * 
- *   06/25/2001 SKB : WARNINGS message                                                         * 
+ * HISTORY:                                                                                    *
+ *   12/13/1999 NAK : Created.                                                                 *
+ *   06/25/2001 SKB : WARNINGS message                                                         *
  *=============================================================================================*/
 bool ArgvClass::Remove_Value(const char *attrib)
 {
diff --git a/Core/Libraries/Source/WWVegas/WWLib/argv.h b/Core/Libraries/Source/WWVegas/WWLib/argv.h
index 8e8ccb77769..a512b618619 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/argv.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/argv.h
@@ -17,39 +17,31 @@
 */
 
 /* $Header: /VSS_Sync/wwlib/argv.h 7     8/29/01 10:25p Vss_sync $ */
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Library                                                      * 
- *                                                                                             * 
- *                     $Archive:: /VSS_Sync/wwlib/argv.h                                      $* 
- *                                                                                             * 
- *                      $Author:: Vss_sync                                                    $* 
- *                                                                                             * 
- *                     $Modtime:: 8/29/01 10:24p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 7                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Library                                                      *
+ *                                                                                             *
+ *                     $Archive:: /VSS_Sync/wwlib/argv.h                                      $*
+ *                                                                                             *
+ *                      $Author:: Vss_sync                                                    $*
+ *                                                                                             *
+ *                     $Modtime:: 8/29/01 10:24p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 7                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-					
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
 
-#ifndef ARGV_H	
-#define ARGV_H	 
+#pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
 
-// Used to parse command line that is passed into WinMain.  
+// Used to parse command line that is passed into WinMain.
 // It also has the ability to load a file with values to append to the command line.
-// Normally in WinMain() there would be a call Argv::Init(lpCmdLine, fileprefix).  
+// Normally in WinMain() there would be a call Argv::Init(lpCmdLine, fileprefix).
 // Once this is done, user can create an ArgvClass object (say argv) then argv.Find() can be called.
 // If there is a arguement <fileprefix><fname> (for example @file.arg) then the fname is loaded up,
 // parsed, and put into the command line.  The format of the parameter file is as follows:
@@ -58,8 +50,8 @@
 //	In typical Argv implementation, the first argument is the name of the application.  This
 // is not the case with this.
 class ArgvClass
-{				 
-	public:			 
+{
+	public:
 		// As passed into WinMain.
 		// Should be called before any objects are created.
 		// This can be called multible times.
@@ -70,7 +62,7 @@ class ArgvClass
 		// Create an object that can search the args.
 		ArgvClass(bool case_sensitive = false, bool exact_size = false);
 		~ArgvClass() {}
-		
+
 		// Functions to find a value.
 		const char *Find(const char *arg)  {
 			CurrentPos = -1;
@@ -78,16 +70,16 @@ class ArgvClass
 		}
 		// If NULL passed, original string will be used.
 		const char *Find_Again(const char *arg = 0L);
-										
+
 		// Return pointer to data after 'arg'.
 		// White space is skipped.
 		// So give a line '-Pdata' or '-P data' and arg==-P, 'data' would be returned in
 		// both cases.
 		const char *Find_Value(const char *arg);
-		
+
 		// Similar to Find_Value, only gets value of current arg.  User needs to pass
 		// in the strlen of the prefix (2 for -P example above) to skip.
-		// Val_in_next is set if the value was extracted from the next Argv, 
+		// Val_in_next is set if the value was extracted from the next Argv,
 		// this way the programmer can know if he needs to call an extra Next().
 		const char *Get_Cur_Value(unsigned prefixlen, bool * val_in_next = 0);
 
@@ -100,7 +92,7 @@ class ArgvClass
 		// Remove an option (and its value)
 		bool Remove_Value(const char *attrib);
 
-		
+
 		// First parameter.
 		const char *First()  {
 			CurrentPos = 0;
@@ -109,17 +101,17 @@ class ArgvClass
 
 		// Next works after a Find() call also.
 		const char *Next()  {
-			CurrentPos++;	  
+			CurrentPos++;
 			if (CurrentPos < Argc) {
 				return(Argv[CurrentPos]);
 			}
 			return(0L);
-		}		  				
+		}
 		// Can be called so Next() will return First()...
 		void Reset()  {
 			CurrentPos = -1;
 		}
-		
+
 		const char *Cur()  {
 			if (CurrentPos < Argc) {
 				return(Argv[CurrentPos]);
@@ -134,11 +126,11 @@ class ArgvClass
 		// Allow user to change states.
 		void Exact_Size(bool on) {Flag.ExactSize = on;}
 		bool Is_Exact_Size() {return (Flag.ExactSize);}
-					 
-	protected:	 
+
+	protected:
 		// Current position to be used when Next or Find_Again are called.
 		int			CurrentPos;
-									 
+
 		// Last arg that we are searching for.
 		const char	*LastArg;
 
@@ -149,14 +141,11 @@ class ArgvClass
 				unsigned ExactSize:1;
 			} Flag;
 		};
-		
+
 		// Number of args.
-		static int   Argc;	
-		
+		static int   Argc;
+
 		// The actual data.
 		enum {MAX_ARGC = 256};
 		static char  *Argv[MAX_ARGC];
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.cpp b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.cpp
index 3c05292190a..fe6c313ec5e 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/B64PIPE.CPP                               $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/B64PIPE.cpp                               $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   Base64Pipe::Flush -- Flushes the final pending data through the pipe.                     *
  *   Base64Pipe::Put -- Processes a block of data through the pipe.                            *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
@@ -39,7 +39,6 @@
 #include	"always.h"
 #include	"b64pipe.h"
 #include	"base64.h"
-#include	<string.h>
 
 
 /***********************************************************************************************
diff --git a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h
index ce0cb409029..19a19951368 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h
@@ -16,31 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/b64pipe.h                                          $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/b64pipe.h                                          $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/02/99 11:58a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef B64PIPE_H
-#define B64PIPE_H
+#pragma once
 
-#include	"PIPE.H"
+#include "PIPE.h"
 
 /*
 **	This class performs Base64 encoding/decoding to the data that is piped through. Note that
@@ -89,5 +85,3 @@ class Base64Pipe : public Pipe
 		Base64Pipe(Base64Pipe & rvalue);
 		Base64Pipe & operator = (Base64Pipe const & pipe);
 };
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/b64straw.cpp b/Core/Libraries/Source/WWVegas/WWLib/b64straw.cpp
index f23163f1577..fde1aaadfff 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/b64straw.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/b64straw.cpp
@@ -16,29 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/B64STRAW.CPP                              $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/B64STRAW.cpp                              $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   Base64Straw::Get -- Fetch data and convert it to/from base 64 encoding.                   *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"always.h"
 #include	"b64straw.h"
 #include	"base64.h"
-#include	<string.h>
 
 
 /***********************************************************************************************
diff --git a/Core/Libraries/Source/WWVegas/WWLib/b64straw.h b/Core/Libraries/Source/WWVegas/WWLib/b64straw.h
index ce0a97bb1f9..fe24b323235 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/b64straw.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/b64straw.h
@@ -16,31 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/b64straw.h                                         $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/b64straw.h                                         $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/02/99 11:58a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef B64STRAW_H
-#define B64STRAW_H
+#pragma once
 
-#include	"STRAW.H"
+#include "STRAW.h"
 
 /*
 **	Performs Base 64 encoding/decoding on the data that is drawn through the straw. Note that
@@ -87,6 +83,3 @@ class Base64Straw : public Straw
 		Base64Straw(Base64Straw & rvalue);
 		Base64Straw & operator = (Base64Straw const & pipe);
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/base64.cpp b/Core/Libraries/Source/WWVegas/WWLib/base64.cpp
index 4b10b913c14..09fc0ce0212 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/base64.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/base64.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/base64.cpp                             $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/base64.cpp                             $*
+ *                                                                                             *
  *                      $Author:: Jani_p                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 5/04/01 8:08p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 3                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   Base64_Decode -- Decodes Base 64 data into its original data form.                        *
  *   Base64_Encode -- Encode data into Base 64 format.                                         *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
diff --git a/Core/Libraries/Source/WWVegas/WWLib/base64.h b/Core/Libraries/Source/WWVegas/WWLib/base64.h
index ae21181afc2..301249cd199 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/base64.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/base64.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/base64.h                                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/base64.h                                           $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/02/99 11:58a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
+
 #pragma once
-#endif // _MSC_VER >= 1000
 
 int Base64_Encode(void const * source, int slen, void * dest, int dlen);
 int Base64_Decode(void const * source, int slen, void * dest, int dlen);
diff --git a/Core/Libraries/Source/WWVegas/WWLib/bfiofile.cpp b/Core/Libraries/Source/WWVegas/WWLib/bfiofile.cpp
index 9a52b1e62ec..b6fef3951d7 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/bfiofile.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/bfiofile.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/BFIOFILE.CPP                              $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/BFIOFILE.cpp                              $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   BufferIOFileClass::BufferIOFileClass -- Filename based constructor for a file object.     *
  *   BufferIOFileClass::BufferIOFileClass -- default constructor for a file object.            *
  *   BufferIOFileClass::Cache -- Load part or all of a file data into RAM.                     *
diff --git a/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h b/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h
index 871a492144c..8b144568ea1 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h
@@ -16,28 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/BFIOFILE.H                                $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/BFIOFILE.h                                $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef BFIOFILE_H
-#define BFIOFILE_H
+#pragma once
 
-#include	"RAWFILE.H"
+#include "RAWFILE.h"
 
 /*
 **	This derivation of the raw file class handles buffering the input/output in order to
@@ -92,5 +91,3 @@ class BufferIOFileClass : public RawFileClass
 		long FilePos;
 		long TrueFileStart;
 };
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/binheap.h b/Core/Libraries/Source/WWVegas/WWLib/binheap.h
index fb92ab3ce4a..fa4aa9447ab 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/binheap.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/binheap.h
@@ -34,8 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef BINARY_HEAP_CLASS_H
-#define BINARY_HEAP_CLASS_H
+#pragma once
 
 /*=============================================================================================*/
 // Includes.
@@ -62,7 +61,7 @@ class HeapNodeClass
 
 		// This is pure virtual so that any type of key can be used as long as it uses the comparison operators.
 		virtual Key_Type	Heap_Key (void) const = 0;
-		
+
 };
 
 // WARNING!
@@ -107,19 +106,19 @@ class BinaryHeapClass
 			::memset (Elements, NULL, sizeof (HeapNodeClass<Key_Type> *) * Max_Number_Of_Elements);
 			Number_Of_Elements = 0;
 		}
-		
+
 		// Reallocate an array large enough to hold the elements
 		void Resize_Array (unsigned int new_size)
 		{
 			// Start fresh
 			Release_Array ();
-			
+
 			// Reallocate
 			Elements						= W3DNEWARRAY HeapNodeClass<Key_Type> *[new_size];
 			Max_Number_Of_Elements	= new_size;
 			Number_Of_Elements		= 0;
 			Own_Array					= true;
-			
+
 			// Initialize to NULL
 			::memset (Elements, NULL, sizeof (HeapNodeClass<Key_Type> *) * new_size);
 			return ;
@@ -177,8 +176,8 @@ class BinaryHeapClass
 			Elements[i] = node;
 			Elements[i]->Set_Heap_Location(i);
 		}
-		
-		// Move the element up in the tree if necessary.  Use this if the key value becomes smaller when it is 
+
+		// Move the element up in the tree if necessary.  Use this if the key value becomes smaller when it is
 		// already in the heap.
 		void Percolate_Up(unsigned int location)
 		{
@@ -239,7 +238,7 @@ class BinaryHeapClass
 					Elements[i] = Elements[child];
 					Elements[i]->Set_Heap_Location(i);
 				}
-				else 
+				else
 				{
 					break;
 				}
@@ -314,6 +313,3 @@ class BinaryHeapClass
 		// binary tree.
 		bool								Own_Array;
 };
-
-
-#endif //BINARY_HEAP_CLASS_H
diff --git a/Core/Libraries/Source/WWVegas/WWLib/bittype.h b/Core/Libraries/Source/WWVegas/WWLib/bittype.h
index 92a609f8b3d..7b40a59c2e4 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/bittype.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/bittype.h
@@ -17,29 +17,25 @@
 */
 
 /* $Header: /G/wwlib/bittype.h 4     4/02/99 1:37p Eric_c $ */
-/*************************************************************************** 
- ***                  Confidential - Westwood Studios                    *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Voxel Technology                         * 
- *                                                                         * 
- *                    File Name : BITTYPE.H                                * 
- *                                                                         * 
- *                   Programmer : Greg Hjelstrom                           * 
- *                                                                         * 
- *                   Start Date : 02/24/97                                 * 
- *                                                                         * 
- *                  Last Update : February 24, 1997 [GH]                   * 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***                  Confidential - Westwood Studios                    ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : Voxel Technology                         *
+ *                                                                         *
+ *                    File Name : BITTYPE.h                                *
+ *                                                                         *
+ *                   Programmer : Greg Hjelstrom                           *
+ *                                                                         *
+ *                   Start Date : 02/24/97                                 *
+ *                                                                         *
+ *                  Last Update : February 24, 1997 [GH]                   *
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef BITTYPE_H
-#define BITTYPE_H
+#pragma once
 
 typedef unsigned char	uint8;
 typedef unsigned short	uint16;
@@ -63,4 +59,9 @@ typedef const char *		LPCSTR;
 typedef unsigned int    UINT;
 typedef unsigned long   ULONG;
 
-#endif //BITTYPE_H
+#if defined(_MSC_VER) && _MSC_VER < 1300
+#ifndef _WCHAR_T_DEFINED
+typedef unsigned short wchar_t;
+#define _WCHAR_T_DEFINED
+#endif
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/bound.h b/Core/Libraries/Source/WWVegas/WWLib/bound.h
index ac62e78e759..8f526382a55 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/bound.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/bound.h
@@ -16,29 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/bound.h                                            $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/bound.h                                            $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/02/99 11:58a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef BOUND_H
-#define BOUND_H
+#pragma once
 
 template<class T> inline
 T Bound(T original, T minval, T maxval)
@@ -55,7 +51,3 @@ T Bound(T original, T minval, T maxval)
 //float Bound(float, float, float);
 //double Bound(double, double, double);
 #endif
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/buff.cpp b/Core/Libraries/Source/WWVegas/WWLib/buff.cpp
index 3f5103a99f4..ae14b73bc06 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/buff.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/buff.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/BUFF.CPP                                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/BUFF.cpp                                           $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/15/99 10:14a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   Buffer::Buffer -- Constructor for buffer object.                                          *
  *   Buffer::Buffer -- Copy constructor for buffer object.                                     *
  *   Buffer::Buffer -- Self-allocating constructor for buffer object.                          *
@@ -41,7 +41,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"always.h"
-#include	"BUFF.H"
+#include "BUFF.h"
 //#include	<stddef.h>
 
 
diff --git a/Core/Libraries/Source/WWVegas/WWLib/bufffile.cpp b/Core/Libraries/Source/WWVegas/WWLib/bufffile.cpp
index 8149e39ee3f..6c16b1d31ca 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/bufffile.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/bufffile.cpp
@@ -16,30 +16,29 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/bufffile.cpp                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/bufffile.cpp                           $*
+ *                                                                                             *
  *                      $Author:: Jani_p                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 9/13/01 7:15p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 4                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
+ *---------------------------------------------------------------------------------------------*
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
 #include	"always.h"
 #include	"bufffile.h"
 #include	"wwdebug.h"
-#include	<string.h>
 
-int		BufferedFileClass::_DesiredBufferSize	=	1024*16;	
+int		BufferedFileClass::_DesiredBufferSize	=	1024*16;
 
 /***********************************************************************************************
  * BufferedFileClass::BufferedFileClass -- Default constructor for a file object.              *
@@ -242,11 +241,9 @@ int BufferedFileClass::Seek(int pos, int dir)
 */
 void	BufferedFileClass::Reset_Buffer( void )
 {
-	if ( Buffer != NULL ) {
-		delete [] Buffer;
-		Buffer = NULL;
-		BufferSize = 0;
-		BufferAvailable = 0;
-		BufferOffset = 0;
-	}
+	delete [] Buffer;
+	Buffer = NULL;
+	BufferSize = 0;
+	BufferAvailable = 0;
+	BufferOffset = 0;
 }
diff --git a/Core/Libraries/Source/WWVegas/WWLib/bufffile.h b/Core/Libraries/Source/WWVegas/WWLib/bufffile.h
index 80d5e0115f2..8153794c761 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/bufffile.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/bufffile.h
@@ -16,40 +16,35 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/bufffile.h                             $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/bufffile.h                             $*
+ *                                                                                             *
  *                      $Author:: Ian_l                                                       $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 10/31/01 3:33p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 3                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   RawFileClass::File_Name -- Returns with the filename associate with the file object.      *
  *   RawFileClass::RawFileClass -- Default constructor for a file object.                      *
  *   RawFileClass::~RawFileClass -- Default deconstructor for a file object.                   *
  *   RawFileClass::Is_Open -- Checks to see if the file is open or not.                        *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef BUFFFILE_H
-#define BUFFFILE_H
 
-#include	"RAWFILE.H"
+#include "RAWFILE.h"
 
 
 /*
-**	This is the definition of a buffered read raw file class. 
+**	This is the definition of a buffered read raw file class.
 */
 class BufferedFileClass : public RawFileClass
 {
@@ -73,13 +68,11 @@ class BufferedFileClass : public RawFileClass
 		static	void		Set_Desired_Buffer_Size( int size ) { _DesiredBufferSize = size; }
 
 		void					Reset_Buffer( void );
-		
+
 	private:
-		unsigned char *	Buffer;				// The read buffer 
+		unsigned char *	Buffer;				// The read buffer
 		unsigned int		BufferSize;			// The allocated size of the read buffer
 		int					BufferAvailable;	// The amount of data in the read buffer
 		int					BufferOffset;		// The data already given out
 		static	int		_DesiredBufferSize;
 };
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/chunkio.cpp b/Core/Libraries/Source/WWVegas/WWLib/chunkio.cpp
index 2c6593b49aa..6c8bbbdbc8e 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/chunkio.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/chunkio.cpp
@@ -17,45 +17,45 @@
 */
 
 /* $Header: /Commando/Code/wwlib/chunkio.cpp 11    7/12/01 7:44p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Tiberian Sun / Commando / G Library                          * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/chunkio.cpp                            $* 
- *                                                                                             * 
- *                      $Author:: Jani_p                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 7/10/01 7:38p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 11                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   ChunkSaveClass::ChunkSaveClass -- Constructor                                             * 
- *   ChunkSaveClass::Begin_Chunk -- Begin a new chunk in the file                              * 
- *   ChunkSaveClass::End_Chunk -- Close a chunk, computes the size and adds to the header      * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Tiberian Sun / Commando / G Library                          *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/chunkio.cpp                            $*
+ *                                                                                             *
+ *                      $Author:: Jani_p                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 7/10/01 7:38p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 11                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   ChunkSaveClass::ChunkSaveClass -- Constructor                                             *
+ *   ChunkSaveClass::Begin_Chunk -- Begin a new chunk in the file                              *
+ *   ChunkSaveClass::End_Chunk -- Close a chunk, computes the size and adds to the header      *
  *   ChunkSaveClass::Begin_Micro_Chunk -- begins a new "micro-chunk"                           *
  *   ChunkSaveClass::End_Micro_Chunk -- close a micro-chunk                                    *
- *   ChunkSaveClass::Write -- Write data into the current chunk                                * 
+ *   ChunkSaveClass::Write -- Write data into the current chunk                                *
  *   ChunkSaveClass::Write -- write an IOVector2Struct                                         *
  *   ChunkSaveClass::Write -- write an IOVector3Struct                                         *
  *   ChunkSaveClass::Write -- write an IOVector4Struct                                         *
  *   ChunkSaveClass::Write -- write an IOQuaternionStruct                                      *
- *   ChunkSaveClass::Cur_Chunk_Depth -- returns the current chunk recursion depth (debugging)  * 
- *   ChunkLoadClass::ChunkLoadClass -- Constructor                                             * 
- *   ChunkLoadClass::Open_Chunk -- Open a chunk in the file, reads in the chunk header         * 
- *   ChunkLoadClass::Close_Chunk -- Close a chunk, seeks to the end if needed                  * 
- *   ChunkLoadClass::Cur_Chunk_ID -- Returns the ID of the current chunk                       * 
- *   ChunkLoadClass::Cur_Chunk_Length -- Returns the current length of the current chunk       * 
- *   ChunkLoadClass::Cur_Chunk_Depth -- returns the current chunk recursion depth              * 
+ *   ChunkSaveClass::Cur_Chunk_Depth -- returns the current chunk recursion depth (debugging)  *
+ *   ChunkLoadClass::ChunkLoadClass -- Constructor                                             *
+ *   ChunkLoadClass::Open_Chunk -- Open a chunk in the file, reads in the chunk header         *
+ *   ChunkLoadClass::Close_Chunk -- Close a chunk, seeks to the end if needed                  *
+ *   ChunkLoadClass::Cur_Chunk_ID -- Returns the ID of the current chunk                       *
+ *   ChunkLoadClass::Cur_Chunk_Length -- Returns the current length of the current chunk       *
+ *   ChunkLoadClass::Cur_Chunk_Depth -- returns the current chunk recursion depth              *
  *   ChunkLoadClass::Contains_Chunks -- Test whether the current chunk contains chunks (or dat *
  *   ChunkLoadClass::Open_Micro_Chunk -- reads in a micro-chunk header                         *
  *   ChunkLoadClass::Close_Micro_Chunk -- closes a micro-chunk                                 *
  *   ChunkLoadClass::Cur_Micro_Chunk_ID -- returns the ID of the current micro-chunk (asserts  *
  *   ChunkLoadClass::Cur_Micro_Chunk_Length -- returns the size of the current micro chunk     *
- *   ChunkLoadClass::Read -- Read data from the file                                           * 
+ *   ChunkLoadClass::Read -- Read data from the file                                           *
  *   ChunkLoadClass::Read -- read an IOVector2Struct                                           *
  *   ChunkLoadClass::Read -- read an IOVector3Struct                                           *
  *   ChunkLoadClass::Read -- read an IOVector4Struct                                           *
@@ -63,22 +63,21 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "chunkio.h"
-#include <string.h>
 #include <assert.h>
 
 
-/*********************************************************************************************** 
- * ChunkSaveClass::ChunkSaveClass -- Constructor                                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *  file - pointer to a FileClass object to write to														  * 
- * 																														  * 
- * OUTPUT:																												  * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkSaveClass::ChunkSaveClass -- Constructor                                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *  file - pointer to a FileClass object to write to														  *
+ * 																														  *
+ * OUTPUT:																												  *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 ChunkSaveClass::ChunkSaveClass(FileClass * file) :
 	File(file),
@@ -92,18 +91,18 @@ ChunkSaveClass::ChunkSaveClass(FileClass * file) :
 }
 
 
-/*********************************************************************************************** 
- * ChunkSaveClass::Begin_Chunk -- Begin a new chunk in the file                                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *  id - id of the chunk																							  * 
- * 																														  * 
- * OUTPUT:																												  * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkSaveClass::Begin_Chunk -- Begin a new chunk in the file                                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *  id - id of the chunk																							  *
+ * 																														  *
+ * OUTPUT:																												  *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool ChunkSaveClass::Begin_Chunk(uint32 id)
 {
@@ -114,17 +113,17 @@ bool ChunkSaveClass::Begin_Chunk(uint32 id)
 	if (StackIndex > 0) {
 		HeaderStack[StackIndex-1].Set_Sub_Chunk_Flag(true);
 	}
-	
+
 	// Save the current file position and chunk header
 	// for the call to End_Chunk.
 	chunkh.Set_Type(id);
 	chunkh.Set_Size(0);
-	filepos = File->Seek(0); 
-	
+	filepos = File->Seek(0);
+
 	PositionStack[StackIndex] = filepos;
-	HeaderStack[StackIndex] = chunkh;	
+	HeaderStack[StackIndex] = chunkh;
 	StackIndex++;
-	
+
 	// write a temporary chunk header (size = 0)
 	if (File->Write(&chunkh,sizeof(chunkh)) != sizeof(chunkh)) {
 		return false;
@@ -133,17 +132,17 @@ bool ChunkSaveClass::Begin_Chunk(uint32 id)
 }
 
 
-/*********************************************************************************************** 
- * ChunkSaveClass::End_Chunk -- Close a chunk, computes the size and adds to the header        * 
- *  																														  * 
- * INPUT:																												  * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkSaveClass::End_Chunk -- Close a chunk, computes the size and adds to the header        *
+ *  																														  *
+ * INPUT:																												  *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool ChunkSaveClass::End_Chunk(void)
 {
@@ -157,7 +156,7 @@ bool ChunkSaveClass::End_Chunk(void)
 	StackIndex--;
 	int chunkpos = PositionStack[StackIndex];
 	ChunkHeader chunkh = HeaderStack[StackIndex];
-	
+
 	// write the completed header
 	File->Seek(chunkpos,SEEK_SET);
 	if (File->Write(&chunkh,sizeof(chunkh)) != sizeof(chunkh)) {
@@ -168,7 +167,7 @@ bool ChunkSaveClass::End_Chunk(void)
 	if (StackIndex != 0) {
 		HeaderStack[StackIndex-1].Add_Size(chunkh.Get_Size() + sizeof(chunkh));
 	}
-	
+
 	// Go back to the end of the file
 	File->Seek(curpos,SEEK_SET);
 
@@ -198,14 +197,14 @@ bool ChunkSaveClass::Begin_Micro_Chunk(uint32 id)
 {
 	assert(id < 256);
 	assert(!InMicroChunk);
-	
+
 	// Save the current file position and chunk header
 	// for the call to End_Micro_Chunk.
 	MCHeader.Set_Type(id);
 	MCHeader.Set_Size(0);
-	MicroChunkPosition = File->Seek(0); 
-	
-	// Write a temporary chunk header 
+	MicroChunkPosition = File->Seek(0);
+
+	// Write a temporary chunk header
 	// NOTE: I'm calling the ChunkSaveClass::Write method so that the bytes for
 	// this header are tracked in the wrapping chunk.  This is because micro-chunks
 	// are simply data inside the normal chunks...
@@ -233,7 +232,7 @@ bool ChunkSaveClass::Begin_Micro_Chunk(uint32 id)
 bool ChunkSaveClass::End_Micro_Chunk(void)
 {
 	assert(InMicroChunk);
-	
+
 	// Save the current position
 	int curpos = File->Seek(0);
 
@@ -249,23 +248,23 @@ bool ChunkSaveClass::End_Micro_Chunk(void)
 	return true;
 }
 
-/*********************************************************************************************** 
- * ChunkSaveClass::Write -- Write data into the current chunk                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkSaveClass::Write -- Write data into the current chunk                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 uint32 ChunkSaveClass::Write(const void * buf, uint32 nbytes)
 {
 	// If this assert hits, you mixed data and chunks within the same chunk NO NO!
 	assert(HeaderStack[StackIndex-1].Get_Sub_Chunk_Flag() == 0);
-	
+
 	// If this assert hits, you didnt open any chunks yet
 	assert(StackIndex > 0);
 
@@ -274,7 +273,7 @@ uint32 ChunkSaveClass::Write(const void * buf, uint32 nbytes)
 
 	// track them in the wrapping chunk
 	HeaderStack[StackIndex-1].Add_Size(nbytes);
-	
+
 	// track them if you are using a micro-chunk too.
 	if (InMicroChunk) {
 		assert(MCHeader.Get_Size() < 255 - nbytes);	// micro chunks can only be 255 bytes
@@ -316,7 +315,7 @@ uint32 ChunkSaveClass::Write(const IOVector2Struct & v)
  *   1/4/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 uint32 ChunkSaveClass::Write(const IOVector3Struct & v)
-{	
+{
 	return Write(&v,sizeof(v));
 }
 
@@ -337,7 +336,7 @@ uint32 ChunkSaveClass::Write(const IOVector4Struct & v)
 {
 	return Write(&v,sizeof(v));
 }
-	
+
 /***********************************************************************************************
  * ChunkSaveClass::Write -- write an IOQuaternionStruct                                        *
  *                                                                                             *
@@ -355,17 +354,17 @@ uint32 ChunkSaveClass::Write(const IOQuaternionStruct & q)
 	return Write(&q,sizeof(q));
 }
 
-/*********************************************************************************************** 
- * ChunkSaveClass::Cur_Chunk_Depth -- returns the current chunk recursion depth (debugging)    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkSaveClass::Cur_Chunk_Depth -- returns the current chunk recursion depth (debugging)    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int ChunkSaveClass::Cur_Chunk_Depth(void)
 {
@@ -373,17 +372,17 @@ int ChunkSaveClass::Cur_Chunk_Depth(void)
 }
 
 
-/*********************************************************************************************** 
- * ChunkLoadClass::ChunkLoadClass -- Constructor                                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::ChunkLoadClass -- Constructor                                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 ChunkLoadClass::ChunkLoadClass(FileClass * file) :
 	File(file),
@@ -397,23 +396,23 @@ ChunkLoadClass::ChunkLoadClass(FileClass * file) :
 }
 
 
-/*********************************************************************************************** 
- * ChunkLoadClass::Open_Chunk -- Open a chunk in the file, reads in the chunk header           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::Open_Chunk -- Open a chunk in the file, reads in the chunk header           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool ChunkLoadClass::Open_Chunk()
 {
 	// if user didn't close any micro chunks that he opened, bad things could happen
-	assert(InMicroChunk == false);							
-	
+	assert(InMicroChunk == false);
+
 	// check for stack overflow
 	assert(StackIndex < MAX_STACK_DEPTH-1);
 
@@ -433,29 +432,29 @@ bool ChunkLoadClass::Open_Chunk()
 }
 
 
-/*********************************************************************************************** 
- * ChunkLoadClass::Close_Chunk -- Close a chunk, seeks to the end if needed                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::Close_Chunk -- Close a chunk, seeks to the end if needed                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool ChunkLoadClass::Close_Chunk()
 {
 	// if user didn't close any micro chunks that he opened, bad things could happen
-	assert(InMicroChunk == false);							
+	assert(InMicroChunk == false);
 
 	// check for stack overflow
 	assert(StackIndex > 0);
-	
+
 	int csize = HeaderStack[StackIndex-1].Get_Size();
 	int pos = PositionStack[StackIndex-1];
-	
+
 	if (pos < csize) {
 		File->Seek(csize - pos,SEEK_CUR);
 	}
@@ -469,17 +468,17 @@ bool ChunkLoadClass::Close_Chunk()
 }
 
 
-/*********************************************************************************************** 
- * ChunkLoadClass::Cur_Chunk_ID -- Returns the ID of the current chunk                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::Cur_Chunk_ID -- Returns the ID of the current chunk                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 uint32 ChunkLoadClass::Cur_Chunk_ID()
 {
@@ -488,17 +487,17 @@ uint32 ChunkLoadClass::Cur_Chunk_ID()
 }
 
 
-/*********************************************************************************************** 
- * ChunkLoadClass::Cur_Chunk_Length -- Returns the current length of the current chunk         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::Cur_Chunk_Length -- Returns the current length of the current chunk         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 uint32 ChunkLoadClass::Cur_Chunk_Length()
 {
@@ -507,17 +506,17 @@ uint32 ChunkLoadClass::Cur_Chunk_Length()
 }
 
 
-/*********************************************************************************************** 
- * ChunkLoadClass::Cur_Chunk_Depth -- returns the current chunk recursion depth                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::Cur_Chunk_Depth -- returns the current chunk recursion depth                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int ChunkLoadClass::Cur_Chunk_Depth()
 {
@@ -557,13 +556,13 @@ int ChunkLoadClass::Contains_Chunks()
 bool ChunkLoadClass::Open_Micro_Chunk()
 {
 	assert(!InMicroChunk);
-	
+
 	// read the chunk header
 	// calling the ChunkLoadClass::Read fn so that if we exhaust the chunk, the read will fail
 	if (Read(&MCHeader,sizeof(MCHeader)) != sizeof(MCHeader)) {
 		return false;
 	}
-	
+
 	InMicroChunk = true;
 	MicroChunkPosition = 0;
 	return true;
@@ -589,12 +588,12 @@ bool ChunkLoadClass::Close_Micro_Chunk()
 
 	int csize = MCHeader.Get_Size();
 	int pos = MicroChunkPosition;
-	
-	// seek the file past this micro chunk 
+
+	// seek the file past this micro chunk
 	if (pos < csize) {
 
 		File->Seek(csize - pos,SEEK_CUR);
-		
+
 		// update the tracking variables for where we are in the normal chunk.
 		if (StackIndex > 0) {
 			PositionStack[StackIndex-1] += csize - pos;
@@ -660,7 +659,7 @@ uint32 ChunkLoadClass::Seek(uint32 nbytes)
 	if (InMicroChunk && MicroChunkPosition + nbytes > MCHeader.Get_Size()) {
 		return 0;
 	}
-	
+
 	uint32 curpos=File->Tell();
 	if (File->Seek(nbytes,SEEK_CUR)-curpos != (int)nbytes) {
 		return 0;
@@ -677,17 +676,17 @@ uint32 ChunkLoadClass::Seek(uint32 nbytes)
 	return nbytes;
 }
 
-/*********************************************************************************************** 
- * ChunkLoadClass::Read -- Read data from the file                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::Read -- Read data from the file                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 uint32 ChunkLoadClass::Read(void * buf,uint32 nbytes)
 {
@@ -702,7 +701,7 @@ uint32 ChunkLoadClass::Read(void * buf,uint32 nbytes)
 	if (InMicroChunk && MicroChunkPosition + nbytes > MCHeader.Get_Size()) {
 		return 0;
 	}
-	
+
 	if (File->Read(buf,nbytes) != (int)nbytes) {
 		return 0;
 	}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/chunkio.h b/Core/Libraries/Source/WWVegas/WWLib/chunkio.h
index 029da1faf50..59b0d4c10e9 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/chunkio.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/chunkio.h
@@ -34,29 +34,13 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef CHUNKIO_H
-#define CHUNKIO_H
+#pragma once
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
-#ifndef BITTYPE_H
 #include "bittype.h"
-#endif
-
-#ifndef WWFILE_H
-#include "WWFILE.H"
-#endif
-
-#ifndef IOSTRUCT_H
+#include "WWFILE.h"
 #include "iostruct.h"
-#endif
-
 
 /************************************************************************************
 
@@ -374,7 +358,3 @@ class ChunkLoadClass
 */
 #define OBSOLETE_MICRO_CHUNK(id) \
 	case (id): break;
-
-
-
-#endif // CHUNKIO_H
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/cpudetect.cpp b/Core/Libraries/Source/WWVegas/WWLib/cpudetect.cpp
index b79644ef6b0..622753fa1a5 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/cpudetect.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/cpudetect.cpp
@@ -78,12 +78,21 @@ unsigned CPUDetectClass::L1InstructionCacheSetAssociative;
 unsigned CPUDetectClass::L1InstructionTraceCacheSize;
 unsigned CPUDetectClass::L1InstructionTraceCacheSetAssociative;
 
+#if defined(_MSC_VER) && _MSC_VER < 1300
 unsigned CPUDetectClass::TotalPhysicalMemory;
 unsigned CPUDetectClass::AvailablePhysicalMemory;
 unsigned CPUDetectClass::TotalPageMemory;
 unsigned CPUDetectClass::AvailablePageMemory;
 unsigned CPUDetectClass::TotalVirtualMemory;
 unsigned CPUDetectClass::AvailableVirtualMemory;
+#else
+unsigned long long CPUDetectClass::TotalPhysicalMemory;
+unsigned long long CPUDetectClass::AvailablePhysicalMemory;
+unsigned long long CPUDetectClass::TotalPageMemory;
+unsigned long long CPUDetectClass::AvailablePageMemory;
+unsigned long long CPUDetectClass::TotalVirtualMemory;
+unsigned long long CPUDetectClass::AvailableVirtualMemory;
+#endif
 
 unsigned CPUDetectClass::OSVersionNumberMajor;
 unsigned CPUDetectClass::OSVersionNumberMinor;
@@ -111,7 +120,7 @@ char CPUDetectClass::ProcessorString[48];
 
 const char* CPUDetectClass::Get_Processor_Manufacturer_Name()
 {
-	static const char* ManufacturerNames[] = {
+	static const char* const ManufacturerNames[] = {
 		"<Unknown>",
 		"Intel",
 		"UMC",
@@ -122,6 +131,7 @@ const char* CPUDetectClass::Get_Processor_Manufacturer_Name()
 		"Rise",
 		"Transmeta"
 	};
+	static_assert(ARRAY_SIZE(ManufacturerNames) == MANUFACTURER_COUNT, "Incorrect array size");
 
 	return ManufacturerNames[ProcessorManufacturer];
 }
@@ -792,7 +802,7 @@ void CPUDetectClass::Init_Processor_String()
 			case INTEL_PROCESSOR_PENTIUM4:						str+="Pentium4"; break;
 			}
 		}
-		strncpy(ProcessorString,str.str(),sizeof(ProcessorString));
+		strlcpy(ProcessorString,str.str(),sizeof(ProcessorString));
 	}
 
 }
@@ -885,6 +895,7 @@ void CPUDetectClass::Init_Memory()
 {
 #ifdef WIN32
 
+#if defined(_MSC_VER) && _MSC_VER < 1300
 	MEMORYSTATUS mem;
    GlobalMemoryStatus(&mem);
 
@@ -894,14 +905,32 @@ void CPUDetectClass::Init_Memory()
    AvailablePageMemory     = mem.dwAvailPageFile;
    TotalVirtualMemory      = mem.dwTotalVirtual;
    AvailableVirtualMemory  = mem.dwAvailVirtual;
-#elif defined(_UNIX)
+#else
+	MEMORYSTATUSEX mem;
+	mem.dwLength = sizeof(mem);
+   GlobalMemoryStatusEx(&mem);
+
+   TotalPhysicalMemory     = mem.ullTotalPhys;
+   AvailablePhysicalMemory = mem.ullAvailPhys;
+   TotalPageMemory         = mem.ullTotalPageFile;
+   AvailablePageMemory     = mem.ullAvailPageFile;
+   TotalVirtualMemory      = mem.ullTotalVirtual;
+   AvailableVirtualMemory  = mem.ullAvailVirtual;
+#endif // defined(_MSC_VER) && _MSC_VER < 1300
+
+#else
 #warning FIX Init_Memory()
-#endif
+#endif // WIN32
 }
 
 void CPUDetectClass::Init_OS()
 {
 #ifdef WIN32
+
+// TheSuperHackers @fix OmniBlade 30/07/2025
+// GetVersionEx only returns the version of Windows it was manifested for since Windows 8.
+// RtlGetVersion returns the correct information at least at the time of writing.
+#if defined(_MSC_VER) && _MSC_VER < 1300
 	OSVERSIONINFO os;
    os.dwOSVersionInfoSize = sizeof(os);
 	GetVersionEx(&os);
@@ -911,7 +940,33 @@ void CPUDetectClass::Init_OS()
    OSVersionBuildNumber = os.dwBuildNumber;
    OSVersionPlatformId  = os.dwPlatformId;
    OSVersionExtraInfo   = os.szCSDVersion;
-#elif defined(_UNIX)
+#else
+	typedef LONG(WINAPI * RtlGetVersionPtr)(PRTL_OSVERSIONINFOW);
+    HMODULE ntdll = LoadLibraryExA("ntdll", NULL, 0);
+    if (ntdll != nullptr) {
+        RtlGetVersionPtr RtlGetVersion = (RtlGetVersionPtr)::GetProcAddress(ntdll, "RtlGetVersion");
+
+        if (RtlGetVersion != nullptr) {
+            RTL_OSVERSIONINFOW os = {0};
+            os.dwOSVersionInfoSize = sizeof(os);
+            RtlGetVersion(&os);
+            OSVersionNumberMajor = os.dwMajorVersion;
+            OSVersionNumberMinor = os.dwMinorVersion;
+            OSVersionBuildNumber = os.dwBuildNumber;
+            OSVersionPlatformId = os.dwPlatformId;
+            OSVersionExtraInfo = os.szCSDVersion;
+            return;
+        }
+    }
+
+	// GetVersionEx will return this info if no manifest is present so seems a safe fallback.
+    OSVersionNumberMajor = 6;
+    OSVersionNumberMinor = 2;
+    OSVersionBuildNumber = 0;
+    OSVersionPlatformId = 2;
+    OSVersionExtraInfo = "";
+#endif // defined(_MSC_VER) && _MSC_VER < 1300
+#else
 #warning FIX Init_OS()
 #endif
 }
@@ -956,11 +1011,7 @@ void CPUDetectClass::Init_Processor_Log()
 		(OSVersionBuildNumber&0xff000000)>>24,
 		(OSVersionBuildNumber&0xff0000)>>16,
 		(OSVersionBuildNumber&0xffff)));
-#ifdef WIN32
-   SYSLOG(("OS-Info: %s\r\n", OSVersionExtraInfo));
-#elif defined(_UNIX)
-   SYSLOG(("OS-Info: %s\r\n", OSVersionExtraInfo.str()));
-#endif
+	SYSLOG(("OS-Info: %s\r\n", OSVersionExtraInfo.str()));
 
 	SYSLOG(("Processor: %s\r\n",CPUDetectClass::Get_Processor_String()));
 	SYSLOG(("Clock speed: ~%dMHz\r\n",CPUDetectClass::Get_Processor_Speed()));
@@ -971,11 +1022,7 @@ void CPUDetectClass::Init_Processor_Log()
 	case 2: cpu_type="Dual"; break;
 	case 3: cpu_type="*Intel Reserved*"; break;
 	}
-#ifdef WIN32
-   SYSLOG(("Processor type: %s\r\n", cpu_type));
-#elif defined(_UNIX)
-   SYSLOG(("Processor type: %s\r\n", cpu_type.str()));
-#endif
+	SYSLOG(("Processor type: %s\r\n", cpu_type.str()));
 
 	SYSLOG(("\r\n"));
 
@@ -1066,7 +1113,7 @@ void CPUDetectClass::Init_Compact_Log()
 	Get_OS_Info(os_info,OSVersionPlatformId,OSVersionNumberMajor,OSVersionNumberMinor,OSVersionBuildNumber);
 	COMPACTLOG(("%s\t",os_info.Code));
 
-	if (!stricmp(os_info.SubCode,"UNKNOWN")) {
+	if (stricmp(os_info.SubCode,"UNKNOWN") == 0) {
 		COMPACTLOG(("%d\t",OSVersionBuildNumber&0xffff));
 	}
 	else {
@@ -1312,4 +1359,4 @@ void Get_OS_Info(
 		os_info.Code="WINXX";
 #endif
 	}
-}
\ No newline at end of file
+}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h b/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h
index b1a7d87e497..4cba11de117 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h
@@ -36,12 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef WWLIB_CPU_DETECT_H__
-#define WWLIB_CPU_DETECT_H__
 
 #include "always.h"
 #include "wwstring.h"
@@ -67,7 +62,9 @@ class CPUDetectClass
 		MANUFACTURER_NEXTGEN,
 		MANUFACTURER_VIA,
 		MANUFACTURER_RISE,
-		MANUFACTURER_TRANSMETA
+		MANUFACTURER_TRANSMETA,
+
+		MANUFACTURER_COUNT
 	} ProcessorManufacturerType;
 
 	typedef enum
@@ -146,30 +143,30 @@ class CPUDetectClass
 		RISE_PROCESSOR_DRAGON2_018
 	} RiseProcessorType;
 
-	inline static ProcessorManufacturerType Get_Processor_Manufacturer() {return ProcessorManufacturer;}
+	static ProcessorManufacturerType Get_Processor_Manufacturer() {return ProcessorManufacturer;}
 	static const char* Get_Processor_Manufacturer_Name();
 
-	inline static bool Has_CPUID_Instruction() { return HasCPUIDInstruction; }
-	inline static bool Has_RDTSC_Instruction() { return HasRDTSCInstruction; }
-	inline static bool Has_CMOV_Instruction() { return HasCMOVSupport; }
-	inline static bool Has_MMX_Instruction_Set() { return HasMMXSupport; }
-	inline static bool Has_SSE_Instruction_Set() { return HasSSESupport; }
-	inline static bool Has_SSE2_Instruction_Set() { return HasSSE2Support; }
-	inline static bool Has_3DNow_Instruction_Set() { return Has3DNowSupport; }
-	inline static bool Has_Extended_3DNow_Instruction_Set() { return HasExtended3DNowSupport; }
+	static bool Has_CPUID_Instruction() { return HasCPUIDInstruction; }
+	static bool Has_RDTSC_Instruction() { return HasRDTSCInstruction; }
+	static bool Has_CMOV_Instruction() { return HasCMOVSupport; }
+	static bool Has_MMX_Instruction_Set() { return HasMMXSupport; }
+	static bool Has_SSE_Instruction_Set() { return HasSSESupport; }
+	static bool Has_SSE2_Instruction_Set() { return HasSSE2Support; }
+	static bool Has_3DNow_Instruction_Set() { return Has3DNowSupport; }
+	static bool Has_Extended_3DNow_Instruction_Set() { return HasExtended3DNowSupport; }
 
 	// Call these functions after determining the manufacturer to find out which of the manufacturers processors
 	// the system has.
-	inline static IntelProcessorType Get_Intel_Processor() { return IntelProcessor; }
-	inline static AMDProcessorType Get_AMD_Processor() { return AMDProcessor; }
-	inline static VIAProcessorType Get_VIA_Processor() { return VIAProcessor; }
-	inline static RiseProcessorType Get_Rise_Processor() { return RiseProcessor; }
+	static IntelProcessorType Get_Intel_Processor() { return IntelProcessor; }
+	static AMDProcessorType Get_AMD_Processor() { return AMDProcessor; }
+	static VIAProcessorType Get_VIA_Processor() { return VIAProcessor; }
+	static RiseProcessorType Get_Rise_Processor() { return RiseProcessor; }
 
 	// Note that processor speed is only calculated at start and could change during execution, so
 	// this number is not to be relied on!
-	inline static int Get_Processor_Speed() { return ProcessorSpeed; }
-	inline static sint64 Get_Processor_Ticks_Per_Second() { return ProcessorTicksPerSecond; }	// Ticks per second
-	inline static double Get_Inv_Processor_Ticks_Per_Second() { return InvProcessorTicksPerSecond; }	// 1.0 / Ticks per second
+	static int Get_Processor_Speed() { return ProcessorSpeed; }
+	static sint64 Get_Processor_Ticks_Per_Second() { return ProcessorTicksPerSecond; }	// Ticks per second
+	static double Get_Inv_Processor_Ticks_Per_Second() { return InvProcessorTicksPerSecond; }	// 1.0 / Ticks per second
 
 	static unsigned Get_Feature_Bits() { return FeatureBits; }
 	static unsigned Get_Extended_Feature_Bits() { return ExtendedFeatureBits; }
@@ -194,18 +191,18 @@ class CPUDetectClass
 	static unsigned Get_L1_Instruction_Trace_Cache_Set_Associative() { return L1InstructionTraceCacheSetAssociative; }
 
 	// System memory
-	static unsigned Get_Total_Physical_Memory() { return TotalPhysicalMemory; }
-	static unsigned Get_Available_Physical_Memory() { return AvailablePhysicalMemory; }
-	static unsigned Get_Total_Page_File_Size() { return TotalPageMemory; }
-	static unsigned Get_Available_Page_File_Size() { return AvailablePageMemory; }
-	static unsigned Get_Total_Virtual_Memory() { return TotalVirtualMemory; }
-	static unsigned Get_Available_Virtual_Memory() { return AvailableVirtualMemory; }
+	static MemValueType Get_Total_Physical_Memory() { return TotalPhysicalMemory; }
+	static MemValueType Get_Available_Physical_Memory() { return AvailablePhysicalMemory; }
+	static MemValueType Get_Total_Page_File_Size() { return TotalPageMemory; }
+	static MemValueType Get_Available_Page_File_Size() { return AvailablePageMemory; }
+	static MemValueType Get_Total_Virtual_Memory() { return TotalVirtualMemory; }
+	static MemValueType Get_Available_Virtual_Memory() { return AvailableVirtualMemory; }
 
 	static unsigned Get_Processor_Type() { return ProcessorType; }
 
-	inline static const char* Get_Processor_String() { return ProcessorString; }
-	inline static const StringClass& Get_Processor_Log() { return ProcessorLog; }
-	inline static const StringClass& Get_Compact_Log() { return CompactLog; }
+	static const char* Get_Processor_String() { return ProcessorString; }
+	static const StringClass& Get_Processor_Log() { return ProcessorLog; }
+	static const StringClass& Get_Compact_Log() { return CompactLog; }
 
 	static bool CPUID(
 		unsigned& u_eax_,
@@ -279,12 +276,12 @@ class CPUDetectClass
 	static unsigned L1InstructionTraceCacheSize;
 	static unsigned L1InstructionTraceCacheSetAssociative;
 
-	static unsigned TotalPhysicalMemory;
-	static unsigned AvailablePhysicalMemory;
-	static unsigned TotalPageMemory;
-	static unsigned AvailablePageMemory;
-	static unsigned TotalVirtualMemory;
-	static unsigned AvailableVirtualMemory;
+	static MemValueType TotalPhysicalMemory;
+	static MemValueType AvailablePhysicalMemory;
+	static MemValueType TotalPageMemory;
+	static MemValueType AvailablePageMemory;
+	static MemValueType TotalVirtualMemory;
+	static MemValueType AvailableVirtualMemory;
 
 	static unsigned OSVersionNumberMajor;
 	static unsigned OSVersionNumberMinor;
@@ -320,6 +317,3 @@ struct CPUIDStruct
 		CPUDetectClass::CPUID(Eax,Ebx,Ecx,Edx,cpuid_type);
 	}
 };
-
-
-#endif // WWLIB_CPU_DETECT_H__
diff --git a/Core/Libraries/Source/WWVegas/WWLib/crandom.h b/Core/Libraries/Source/WWVegas/WWLib/crandom.h
index ca7f033396f..29a8616a063 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/crandom.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/crandom.h
@@ -16,33 +16,32 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando                                                     * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Combat/crandom.h            $* 
- *                                                                                             * 
- *                      $Author:: Byon_g                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 5/09/01 3:48p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 2                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando                                                     *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Combat/crandom.h            $*
+ *                                                                                             *
+ *                      $Author:: Byon_g                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 5/09/01 3:48p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef	CRANDOM_H
-#define	CRANDOM_H
+#pragma once
 
 #ifndef	ALWAYS_H
 	#include "always.h"
 #endif
 
 #ifndef	RANDOM_H
-	#include "RANDOM.H"
+	#include "RANDOM.h"
 #endif
 
 #ifndef	WWDEBUG_H
@@ -119,5 +118,3 @@ inline float CRandom::Get_Float( float min, float max )
 ** be synced between other computers.  Good for simple visual and sound effects.
 */
 extern	CRandom	FreeRandom;
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/crc.cpp b/Core/Libraries/Source/WWVegas/WWLib/crc.cpp
index d032a7582db..455af0d0833 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/crc.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/crc.cpp
@@ -16,28 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/CRC.CPP                                $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/CRC.cpp                                $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 10/22/98 2:46p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   CRCEngine::operator() -- Submits one byte of data to the CRC engine.                      *
  *   CRCEngine::operator() -- Submits an arbitrary data block to the CRC engine.               *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"always.h"
-#include	"CRC.H"
+#include "CRC.h"
 
 
 /***********************************************************************************************
@@ -134,10 +134,10 @@ long CRCEngine::operator() (void const * buffer, int length)
 	*/
 	return(Value());
 }
-//    CRC for poly 0x04C11DB7   
+//    CRC for poly 0x04C11DB7
 unsigned long  CRC::_Table[ 256 ] =
 {
-	0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL, 
+	0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL,
 	0x076DC419L, 0x706AF48FL, 0xE963A535L, 0x9E6495A3L,
 	0x0EDB8832L, 0x79DCB8A4L, 0xE0D5E91EL, 0x97D2D988L,
 	0x09B64C2BL, 0x7EB17CBDL, 0xE7B82D07L, 0x90BF1D91L,
diff --git a/Core/Libraries/Source/WWVegas/WWLib/crcpipe.cpp b/Core/Libraries/Source/WWVegas/WWLib/crcpipe.cpp
index a0704c88d3f..c7397dd04ff 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/crcpipe.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/crcpipe.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/CRCPIPE.CPP                               $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/CRCPIPE.cpp                               $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   CRCPipe::Result -- Fetches the current CRC of the data.                                   *
  *   CRCPipe::Put -- Retrieves the data bytes specified and calculates CRC on it.              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
diff --git a/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h b/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h
index 77e900b2ca9..5a6f3af7c09 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h
@@ -16,29 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/crcpipe.h                                 $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/crcpipe.h                                 $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef CRCPIPE_H
-#define CRCPIPE_H
+#pragma once
 
-#include	"CRC.H"
-#include	"PIPE.H"
+#include "CRC.h"
+#include "PIPE.h"
 
 /*
 **	This class doesn't modify the data being piped through, but it does examine it and build
@@ -60,5 +59,3 @@ class CRCPipe : public Pipe
 		CRCPipe(CRCPipe & rvalue);
 		CRCPipe & operator = (CRCPipe const & pipe);
 };
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/crcstraw.cpp b/Core/Libraries/Source/WWVegas/WWLib/crcstraw.cpp
index 4714f9abfea..ba173de5f59 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/crcstraw.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/crcstraw.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/CRCSTRAW.CPP                              $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/CRCSTRAW.cpp                              $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   CRCStraw::Get -- Fetch the data requested and calculate CRC on it.                        *
  *   CRCStraw::Result -- Returns with the CRC of all data passed through the straw.            *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
diff --git a/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h b/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h
index db903463e19..3d72841bbc9 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h
@@ -16,29 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/crcstraw.h                                $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/crcstraw.h                                $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef CRCSTRAW_H
-#define CRCSTRAW_H
+#pragma once
 
-#include	"CRC.H"
-#include	"STRAW.H"
+#include	"CRC.h"
+#include	"STRAW.h"
 
 /*
 **	This class will build a CRC value from the data stream that is drawn through this class.
@@ -60,6 +59,3 @@ class CRCStraw : public Straw
 		CRCStraw(CRCStraw & rvalue);
 		CRCStraw & operator = (CRCStraw const & pipe);
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/cstraw.cpp b/Core/Libraries/Source/WWVegas/WWLib/cstraw.cpp
index a88697ffb70..c65cd46c269 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/cstraw.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/cstraw.cpp
@@ -16,28 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/CSTRAW.CPP                                $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/CSTRAW.cpp                                $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   CacheStraw::Get -- Fetch data from the data source.                                       *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"always.h"
 #include	"cstraw.h"
-#include	<string.h>
 
 
 /***********************************************************************************************
diff --git a/Core/Libraries/Source/WWVegas/WWLib/cstraw.h b/Core/Libraries/Source/WWVegas/WWLib/cstraw.h
index 41332bc3765..ffdfab40dfc 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/cstraw.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/cstraw.h
@@ -16,32 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/cstraw.h                                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/cstraw.h                                           $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/02/99 11:59a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef CSTRAW_H
-#define CSTRAW_H
+#pragma once
 
-#include	"BUFF.H"
-#include	"STRAW.H"
+#include "BUFF.h"
+#include "STRAW.h"
 
 /*
 **	This class handles transfer of data by perform regulated requests for data from the next
@@ -65,8 +61,3 @@ class CacheStraw : public Straw
 		CacheStraw(CacheStraw & rvalue);
 		CacheStraw & operator = (CacheStraw const & pipe);
 };
-
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/ffactory.cpp b/Core/Libraries/Source/WWVegas/WWLib/ffactory.cpp
index f61987fe777..02ea652aea7 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/ffactory.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/ffactory.cpp
@@ -16,31 +16,29 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/ffactory.cpp                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/ffactory.cpp                           $*
+ *                                                                                             *
  *                      $Author:: Jani_p                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 8/24/01 11:50a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 17                                                          $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
+ *---------------------------------------------------------------------------------------------*
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"ffactory.h"
-#include	"RAWFILE.H"
+#include "RAWFILE.h"
 #include "bufffile.h"
 #include "realcrc.h"
-#include	<stdio.h>
 #include <stdlib.h>
 #include	<assert.h>
-#include <string.h>
 
 /*
 ** Statics
@@ -106,7 +104,7 @@ void SimpleFileFactoryClass::Get_Sub_Directory( StringClass& new_dir ) const
 
 	// We cannot return a const char * here because the StringClass
 	// may reallocate its buffer during a call to Set_Sub_Directory.
-	// I opted to return a StringClass instead of a reference to 
+	// I opted to return a StringClass instead of a reference to
 	// StringClass because it seems like that would behave more
 	// reasonably. (no sudden changes from or to empty string in
 	// the middle of a calling function.) (DRM, 04/19/01)
@@ -148,7 +146,7 @@ void SimpleFileFactoryClass::Prepend_Sub_Directory( const char * sub_directory )
 
 	// Ensure sub_directory ends with a slash, and append a semicolon
 	char temp_sub_dir[1024];
-	strcpy(temp_sub_dir, sub_directory);
+	strlcpy(temp_sub_dir, sub_directory, ARRAY_SIZE(temp_sub_dir));
 	if (temp_sub_dir[sub_len - 1] != '\\') {
 		temp_sub_dir[sub_len] = '\\';
 		temp_sub_dir[sub_len + 1] = 0;
@@ -183,7 +181,7 @@ void SimpleFileFactoryClass::Append_Sub_Directory( const char * sub_directory )
 
 	// Ensure sub_directory ends with a slash
 	char temp_sub_dir[1024];
-	strcpy(temp_sub_dir, sub_directory);
+	strlcpy(temp_sub_dir, sub_directory, ARRAY_SIZE(temp_sub_dir));
 	if (temp_sub_dir[sub_len - 1] != '\\') {
 		temp_sub_dir[sub_len] = '\\';
 		temp_sub_dir[sub_len + 1] = 0;
@@ -218,7 +216,7 @@ Is_Full_Path (const char *path)
 	bool retval = false;
 
 	if (path != NULL && path[0] != 0) {
-		
+
 		// Check for drive designation
 		retval = bool(path[1] == ':');
 
@@ -293,13 +291,13 @@ FileClass * SimpleFileFactoryClass::Get_File( char const *filename )
 					}
 				}
 			} else {
-				new_name.Format("%s%s",SubDirectory,stripped_name);
+				new_name.Format("%s%s",SubDirectory.str(),stripped_name.str());
 			}
 		}
 
 		// END SERIALIZATION
 	}
-	
+
 	file->Set_Name( new_name );	// Call Set_Name to force an allocated name
 	return file;
 }
diff --git a/Core/Libraries/Source/WWVegas/WWLib/ffactory.h b/Core/Libraries/Source/WWVegas/WWLib/ffactory.h
index 2baaf36f1ed..cb7acc11c16 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/ffactory.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/ffactory.h
@@ -34,25 +34,17 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef FFACTORY_H
-#define FFACTORY_H
-
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
 #include "mutex.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "wwstring.h"
 
 /*
 **
 */
-#include	"RAWFILE.H"
+#include "RAWFILE.h"
 class	FileClass;
 
 /*
@@ -159,5 +151,3 @@ extern RawFileFactoryClass	*	_TheWritingFileFactory;
 // No simple file factory.  jba.
 // (gth) re-enabling this because w3d view uses it
 extern SimpleFileFactoryClass	*	_TheSimpleFileFactory;
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h b/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h
index 5c1349ffc29..e5ce3b02254 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h
@@ -33,12 +33,8 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef GCD_LCM_H
-#define GCD_LCM_H
+#pragma once
 
 #include "always.h"
 
@@ -49,5 +45,3 @@ unsigned int Greatest_Common_Divisor(unsigned int a, unsigned int b);
 // The least common multiple (LCM) is the least integer of which given
 // positive integers are divisors.
 unsigned int Least_Common_Multiple(unsigned int a, unsigned int b);
-
-#endif // GCD_LCM_H
diff --git a/Core/Libraries/Source/WWVegas/WWLib/global.h b/Core/Libraries/Source/WWVegas/WWLib/global.h
index 84529fa8e85..47109607d8c 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/global.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/global.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* GLOBAL.H - RSAREF types and constants
+/* GLOBAL.h - RSAREF types and constants
  */
 
 /* PROTOTYPES should be set to one if and only if the compiler supports
@@ -46,4 +46,4 @@ If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
 #define PROTO_LIST(list) list
 #else
 #define PROTO_LIST(list) ()
-#endif
\ No newline at end of file
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/hash.cpp b/Core/Libraries/Source/WWVegas/WWLib/hash.cpp
index 66dcebdb757..441fe6bfe72 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/hash.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/hash.cpp
@@ -17,30 +17,28 @@
 */
 
 /* $Header: /VSS_Sync/wwlib/hash.cpp 3     10/17/00 4:48p Vss_sync $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /VSS_Sync/wwlib/hash.cpp                                    $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 10/16/00 11:42a                                             $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /VSS_Sync/wwlib/hash.cpp                                    $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 10/16/00 11:42a                                             $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "hash.h"
 #include "wwdebug.h"
 #include "realcrc.h"
 
-#include <string.h>
-
 /*
 ** HashTableClass
 */
@@ -58,10 +56,8 @@ HashTableClass::HashTableClass( int size ) :
 HashTableClass::~HashTableClass( void )
 {
 	// If we need to, free the hash table
-	if ( HashTable != NULL) {
-		delete [] HashTable;
-		HashTable = NULL;
-	}
+	delete [] HashTable;
+	HashTable = NULL;
 }
 
 void	HashTableClass::Reset( void )
diff --git a/Core/Libraries/Source/WWVegas/WWLib/hash.h b/Core/Libraries/Source/WWVegas/WWLib/hash.h
index 54b67af642e..c91e48c5116 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/hash.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/hash.h
@@ -17,31 +17,25 @@
 */
 
 /* $Header: /Commando/Code/wwlib/hash.h 2     6/15/00 10:53a Byon_g $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/hash.h                                 $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 6/15/00 9:43a                                               $* 
- *                                                                                             * 
- *                    $Revision:: 2                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/hash.h                                 $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 6/15/00 9:43a                                               $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HASH_H
-#define HASH_H
 
 #include "always.h"
 
@@ -115,6 +109,3 @@ class HashTableIteratorClass
 
 	void					Advance_Next( void );
 };
-
-
-#endif	// HASH_H
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h b/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h
index 8039e026efe..a01fbf08ffe 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h
@@ -33,31 +33,25 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-
-#ifndef HASHCALC_H
-#define HASHCALC_H
 
+#pragma once
 
 /*
 ** HashCalculatorClass
-** The hash calculator is used to abstract the process of computing a hash 
+** The hash calculator is used to abstract the process of computing a hash
 ** value for an object.  Also, when dealing with floating point values, you
 ** may need to have a fudge factor and therefore have several valid hash
 ** values for a particular object (generated by adding and subtracting an
 ** epsilon to the number(s)).  This class lets you define any number
-** of hash values.  This class is used by the UniqueArrayClass and the HashTableClass 
-** templates.  Basically, you give one of these to the UniqueArrayClass at 
-** construction time.  It will call the Num_Hash_Bits function in order to 
-** properly allocate its hash table.  Then, for each object you pass into the 
-** Add function, it  will call Compute_Hash, then it will loop through 
-** Num_Hash_Values, calling Get_Hash_Value for each index and see if the object 
-** is found in the indicated slot.  Also, when it is checking to see if it has 
-** the object you "Added", the Items_Match function is called.  This again 
-** allows you to do epsilon tests.  Make sense?  
+** of hash values.  This class is used by the UniqueArrayClass and the HashTableClass
+** templates.  Basically, you give one of these to the UniqueArrayClass at
+** construction time.  It will call the Num_Hash_Bits function in order to
+** properly allocate its hash table.  Then, for each object you pass into the
+** Add function, it  will call Compute_Hash, then it will loop through
+** Num_Hash_Values, calling Get_Hash_Value for each index and see if the object
+** is found in the indicated slot.  Also, when it is checking to see if it has
+** the object you "Added", the Items_Match function is called.  This again
+** allows you to do epsilon tests.  Make sense?
 */
 template <class T> class HashCalculatorClass
 {
@@ -68,7 +62,3 @@ template <class T> class HashCalculatorClass
 	virtual int		Num_Hash_Values(void) = 0;
 	virtual int		Get_Hash_Value(int index = 0) = 0;
 };
-
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/hashtab.h b/Core/Libraries/Source/WWVegas/WWLib/hashtab.h
index 1fdc96f58e7..7a66ce6bbc8 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/hashtab.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/hashtab.h
@@ -34,8 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef HASHTAB_H
-#define HASHTAB_H
+#pragma once
 
 #if 0
 
@@ -51,7 +50,7 @@ template <class Object,class Key> class NamedObjectHashTableClass
 	void				Remove(Object * item,Key * key);
 
 	int				Count(void) const								{ return Items.Count(); }
-	Object *			Find(const Key & key) const						
+	Object *			Find(const Key & key) const
 
 private:
 
@@ -66,7 +65,7 @@ template <class Object,class Key> class NamedObjectHashTableClass
 		bool operator == (const HashItem & that) { return ((Item == that.Item) && (NextHashIndex == that.NextHashIndex)); }
 		bool operator != (const HashItem & that) { return !(*this == that); }
 	};
-		
+
 	// Dynamic Vector of the unique items:
 	DynamicVectorClass<HashItem>		Items;
 
@@ -121,7 +120,3 @@ Object *	HashTableClass<Object,Key>::Find(Key * key) const
 }
 
 #endif
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h b/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h
index fb3a6613cd8..79de6a2cad0 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h
@@ -16,31 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando					                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/hashtemplate.h                         $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 11/19/01 12:16p                                             $* 
- *                                                                                             * 
- *                    $Revision:: 7                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando					                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/hashtemplate.h                         $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 11/19/01 12:16p                                             $*
+ *                                                                                             *
+ *                    $Revision:: 7                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HASH_TEMPLATE_H
-#define HASH_TEMPLATE_H
 
 #include "always.h"
 #include "wwstring.h"
@@ -55,7 +49,7 @@ template <class Key> class HashTemplateKeyClass
 
 // Default hash function for data types that can be cast into an unsigned int
 template <class Key> inline unsigned int HashTemplateKeyClass<Key>::Get_Hash_Value (const Key& k)
-{ 
+{
 	unsigned int hval = *((const unsigned int*)(&k));
 	hval = hval + (hval>>5) + (hval>>10) + (hval >> 20);
 	return hval;
@@ -70,13 +64,13 @@ template <> inline unsigned int HashTemplateKeyClass<float>::Get_Hash_Value (con
 }
 
 // Hash class
-template <class KeyType, class ValueType> 
+template <class KeyType, class ValueType>
 class HashTemplateClass
 {
 	struct Entry;
 public:
 
-	enum 
+	enum
 	{
 		NIL = -1								// internal enumeration for representing a NULL link
 	};
@@ -389,7 +383,7 @@ template <class KeyType, class ValueType> inline void HashTemplateClass<KeyType,
 template <class KeyType, class ValueType> inline int HashTemplateClass<KeyType,ValueType>::Alloc_Entry()
 {
 	if (First == NIL)					// need to re-alloc and re-hash tables
-		Re_Hash();						
+		Re_Hash();
 	int h	= First;
 	First	= Table[First].Next;
 	return h;
@@ -402,10 +396,8 @@ template <class KeyType, class ValueType> inline HashTemplateClass<KeyType,Value
 
 template <class KeyType, class ValueType> inline HashTemplateClass<KeyType,ValueType>::~HashTemplateClass()
 {
-	if (Hash)
-		delete[] Hash;
-	if (Table)
-		delete[] Table;
+	delete[] Hash;
+	delete[] Table;
 }
 
 // Get_Hash_Value specialization for StringClass. This is intended to be used
@@ -427,7 +419,3 @@ template <> inline unsigned int HashTemplateKeyClass<StringClass>::Get_Hash_Valu
 	hval = hval + (hval>>5) + (hval>>10) + (hval >> 20);
 	return hval;
 }
-
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/incdec.h b/Core/Libraries/Source/WWVegas/WWLib/incdec.h
index 437834a9880..e8e8ae76ed8 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/incdec.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/incdec.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/incdec.h                                  $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/incdec.h                                  $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef INCDEC_H
-#define INCDEC_H
+#pragma once
 
 /*
 **	These templates allow enumeration types to have simple bitwise
@@ -64,5 +63,3 @@ template<class T> inline T operator --(T & a, int)
 	a = (T)((int)a - (int)1);
 	return(aa);
 }
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/ini.cpp b/Core/Libraries/Source/WWVegas/WWLib/ini.cpp
index 82b0f0b5495..9a1f3c09feb 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/ini.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/ini.cpp
@@ -88,25 +88,24 @@
 #include	"b64pipe.h"
 #include	"b64straw.h"
 #include	"cstraw.h"
-#include	"INI.H"
+#include "INI.h"
 #include	"readline.h"
 #include	"trim.h"
 #include	"win.h"
-#include	"XPIPE.H"
-#include	"XSTRAW.H"
-#include	<Utility/stdio_adapter.h>
+#include "XPIPE.h"
+#include "XSTRAW.h"
 #include <malloc.h>
 #ifdef _UNIX
 #include <ctype.h>
 #endif
-#include "RAWFILE.H"
+#include "RAWFILE.h"
 #include "ffactory.h"
 
 // recently transferred from ini.h
 #include "inisup.h"
 #include	"trect.h"
-#include	"WWFILE.H"
-#include	"PIPE.H"
+#include "WWFILE.h"
+#include "PIPE.h"
 #include	"wwstring.h"
 #include "widestring.h"
 #include "nstrdup.h"
@@ -431,7 +430,7 @@ int INIClass::Load(Straw & ffile)
 			if (ptr != NULL) *ptr = '\0';
 			strtrim(buffer);
 			char section[64];
-			strcpy(section, buffer);
+			strlcpy(section, buffer, ARRAY_SIZE(section));
 
 			/*
 			**	Read in the entries of this section.
@@ -1150,8 +1149,7 @@ bool INIClass::Put_TextBlock(char const * section, char const * text)
 
 		char buffer[128];
 
-		strncpy(buffer, text, 75);
-		buffer[75] = '\0';
+		strlcpy(buffer, text, 76);
 
 		char b[32];
 		sprintf(b, "%d", index);
@@ -1639,7 +1637,7 @@ bool INIClass::Put_String(char const * section, char const * entry, char const *
 	*/
 	INIEntry * entryptr = secptr->Find_Entry(entry);
 	if (entryptr != NULL) {
-      if (strcmp(entryptr->Entry, entry)) {
+      if (strcmp(entryptr->Entry, entry) != 0) {
          DuplicateCRCError("INIClass::Put_String", section, entry);
       } else {
 #if 0
@@ -1724,8 +1722,7 @@ int INIClass::Get_String(char const * section, char const * entry, char const *
 		buffer[0] = '\0';
 		return(0);
 	} else {
-		strncpy(buffer, defvalue, size);
-		buffer[size-1] = '\0';
+		strlcpy(buffer, defvalue, size);
 		strtrim(buffer);
 		return(strlen(buffer));
 	}
@@ -2287,8 +2284,8 @@ void INIClass::DuplicateCRCError(const char *message, const char *section, const
 	OutputDebugString(buffer);
 	assert(0);
 
-#ifdef NDEBUG
-#ifdef _WINDOWS
+#ifdef RTS_RELEASE
+#ifdef _WIN32
 	MessageBox(0, buffer, "Duplicate CRC in INI file.", MB_ICONSTOP | MB_OK);
 #endif
 #endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/inisup.h b/Core/Libraries/Source/WWVegas/WWLib/inisup.h
index 18b5821e10c..1ed5b8477dc 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/inisup.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/inisup.h
@@ -33,10 +33,8 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
+#pragma once
 
 /*
 **	This header defines generally unused member structures used by the INI class.
@@ -44,9 +42,9 @@
 **	to help reduce header dependancies. -ehc
 */
 
-#include	"LISTNODE.H"
-#include	"INDEX.H"
-#include "CRC.H"
+#include "LISTNODE.h"
+#include "INDEX.h"
+#include "CRC.h"
 
 
 /*
@@ -74,7 +72,7 @@ struct INISection : public Node<INISection *> {
 //		~INISection(void) {free(Section);Section = 0;EntryList.Delete();}
 		INIEntry * Find_Entry(char const * entry) const;
 //		int Index_ID(void) const {return(CRCEngine()(Section, strlen(Section)));};
-		int Index_ID(void) const { return CRC::String(Section); }; 
+		int Index_ID(void) const { return CRC::String(Section); };
 
 		char * Section;
 		List<INIEntry *> EntryList;
diff --git a/Core/Libraries/Source/WWVegas/WWLib/iostruct.h b/Core/Libraries/Source/WWVegas/WWLib/iostruct.h
index 3d6a00594b2..ada2fc3395b 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/iostruct.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/iostruct.h
@@ -33,21 +33,10 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef IOSTRUCT_H
-#define IOSTRUCT_H
-
-#ifndef BITTYPE_H
 #include "bittype.h"
-#endif
 
 /*
 ** Some useful structures for writing/writing (safe from changes).
@@ -78,8 +67,3 @@ struct IOQuaternionStruct
 {
 	float32		Q[4];
 };
-
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/jshell.cpp b/Core/Libraries/Source/WWVegas/WWLib/jshell.cpp
index e025788b025..ac997c6193c 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/jshell.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/jshell.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/pluglib/jshell.cpp                     $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/pluglib/jshell.cpp                     $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 11/07/00 2:32p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 28                                                          $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   Fatal -- General purpose fatal error handler.                                             *
  *   Set_Bit -- Set bit in a bit array.                                                        *
  *   Get_Bit -- Fetch the bit value from a bit array.                                          *
diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzo.h b/Core/Libraries/Source/WWVegas/WWLib/lzo.h
index c835efd60b9..afecc227910 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/lzo.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/lzo.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/lzo.h                                  $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/lzo.h                                  $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/19/99 3:35p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 3                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef _LZO_H
-#define _LZO_H
+#pragma once
 
 #include	"lzoconf.h"
 #include "lzo1x.h"
@@ -46,11 +45,11 @@
 // of UNcompressed chunk. NOTE: LZO needs an additional 16 bytes per uncompressed K.
 // Note: SKB took this from lzo.h in lol3 code.
 //
-// (gth) The buffer that you compress to should be the size define by 
+// (gth) The buffer that you compress to should be the size define by
 // LZO_BUFFER_SIZE(uncompressed_size).  Also, the work buffer should be of
 // size: LZO1X_MEM_COMPRESS which is defined in lzo1x.h.
 
-#define LZO_BUFFER_SIZE(s) ((s) + ((((s) / 0x400) + 1) * 16))	
+#define LZO_BUFFER_SIZE(s) ((s) + ((((s) / 0x400) + 1) * 16))
 
 
 int lzo1x_1_compress ( 	const lzo_byte *in,
@@ -70,7 +69,7 @@ int lzo1x_decompress	(  const lzo_byte *in,
 
 //
 // LZOCompressor
-// Simply wraps the 'C' style lzo compression and decompression functions and 
+// Simply wraps the 'C' style lzo compression and decompression functions and
 // hides the work buffer.  So you dont have to worry about the work buffer but
 // you do have to manage the compression buffer being large enough to hold the
 // worst case compression: LZO_BUFFER_SIZE(uncompressed_size).
@@ -100,7 +99,3 @@ class LZOCompressor
 	static lzo_byte WorkBuffer[LZO1X_MEM_COMPRESS + 1];
 	static lzo_byte * EOWorkBuffer;
 };
-
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h b/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h
index 0313d7e0e91..cae5f0e368d 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/lzo1x.h                                   $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/lzo1x.h                                   $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 /* lzo1x.h -- public interface of the LZO1X compression algorithm
@@ -59,9 +59,7 @@
    markus.oberhumer@jk.uni-linz.ac.at
  */
 
-
-#ifndef __LZO1X_H
-#define __LZO1X_H
+#pragma once
 
 #include	"lzoconf.h"
 
@@ -121,8 +119,6 @@ lzo1x_999_compress      ( const lzo_byte *src, lzo_uint  src_len,
 //} /* extern "C" */
 //#endif
 
-#endif /* already included */
-
 /*
 vi:ts=4
 */
diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzo1x_c.cpp b/Core/Libraries/Source/WWVegas/WWLib/lzo1x_c.cpp
index aeb67f66f42..eee7ebdc1cf 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/lzo1x_c.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/lzo1x_c.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/lzo1x_c.cpp                            $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/lzo1x_c.cpp                            $*
+ *                                                                                             *
  *                      $Author:: Jani_p                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 6/28/00 10:13a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 /* $Header: /Commando/Code/wwlib/lzo1x_c.cpp 2     7/05/00 6:26p Jani_p $ */
diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzo1x_d.cpp b/Core/Libraries/Source/WWVegas/WWLib/lzo1x_d.cpp
index 1c614a27b85..40a3d374a9b 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/lzo1x_d.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/lzo1x_d.cpp
@@ -16,25 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/LZO1X_D.CPP                               $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/LZO1X_D.cpp                               $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-/* $Header: /Commando/Library/LZO1X_D.CPP 1     7/22/97 12:00p Greg_h $ */
+/* $Header: /Commando/Library/LZO1X_D.cpp 1     7/22/97 12:00p Greg_h $ */
 /* lzo1x_d.c -- standalone LZO1X decompressor
 
    This file is part of the LZO real-time data compression library.
diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h b/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h
index 93d5913dbb3..d1e3e2b84fa 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/lzo_conf.h                                $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/lzo_conf.h                                $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 /* lzo_conf.h -- main internal configuration file for the the LZO library
@@ -65,9 +65,7 @@
    to change.
  */
 
-
-#ifndef __LZO_CONF_H
-#define __LZO_CONF_H
+#pragma once
 
 #ifndef __LZOCONF_H
 #  include "lzoconf.h"
@@ -202,7 +200,7 @@
 /* Help the optimizer with register allocation.
  * Don't activate this macro for a fair comparision with other algorithms.
  */
-#if 1 && defined(NDEBUG) && !defined(__BOUNDS_CHECKING_ON)
+#if 1 && defined(RTS_RELEASE) && !defined(__BOUNDS_CHECKING_ON)
 #  if defined(__GNUC__) && defined(__i386__)
 #    if !defined(LZO_OPTIMIZE_GNUC_i386_IS_BUGGY)
 #      define LZO_OPTIMIZE_GNUC_i386
@@ -296,9 +294,6 @@
 
 
 
-#endif /* already included */
-
 /*
 vi:ts=4
 */
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h b/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h
index bda29a7c112..b3bf5e85e97 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/lzoconf.h                                 $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/lzoconf.h                                 $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 /* lzoconf.h -- configuration for the LZO real-time data compression library
@@ -59,9 +59,7 @@
    markus.oberhumer@jk.uni-linz.ac.at
  */
 
-
-#ifndef __LZOCONF_H
-#define __LZOCONF_H
+#pragma once
 
 #define LZO_VERSION             0x0200
 #define LZO_VERSION_STRING      "0.20"
@@ -228,8 +226,6 @@ LZO_EXTERN(int) _lzo_config_check(void);
 //} /* extern "C" */
 //#endif
 
-#endif /* already included */
-
 /*
 vi:ts=4
 */
diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzopipe.cpp b/Core/Libraries/Source/WWVegas/WWLib/lzopipe.cpp
index 65f30ed0ab3..543aa56e257 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/lzopipe.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/lzopipe.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/LZOPIPE.CPP                               $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/LZOPIPE.cpp                               $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   LZWPipe::Flush -- Flushes any partially accumulated block.                                *
  *   LZWPipe::LZWPipe -- Constructor for the LZO processor pipe.                               *
  *   LZWPipe::Put -- Send some data through the LZO processor pipe.                            *
@@ -40,7 +40,7 @@
 
 
 #include	"always.h"
-#include	"BUFF.H"
+#include "BUFF.h"
 #include	"lzo.h"
 #include	"lzopipe.h"
 #include	<assert.h>
diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h b/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h
index 1dbda8b64d0..6faabfe1a94 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h
@@ -16,28 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/lzopipe.h                                 $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/lzopipe.h                                 $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef LZOPIPE_H
-#define LZOPIPE_H
+#pragma once
 
-#include	"PIPE.H"
+#include "PIPE.h"
 
 
 /*
@@ -97,6 +96,3 @@ class LZOPipe : public Pipe
 		LZOPipe(LZOPipe & rvalue);
 		LZOPipe & operator = (LZOPipe const & pipe);
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzostraw.cpp b/Core/Libraries/Source/WWVegas/WWLib/lzostraw.cpp
index 5563accf54a..f6184547498 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/lzostraw.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/lzostraw.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/LZOSTRAW.CPP                              $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/LZOSTRAW.cpp                              $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   LZOStraw::Get -- Fetch data through the LZO processor.                                    *
  *   LZOStraw::LZOStraw -- Constructor for LZO straw object.                                   *
  *   LZOStraw::~LZOStraw -- Destructor for the LZO straw.                                      *
diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h b/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h
index 795a6dbe47d..862cf4d73e5 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h
@@ -16,29 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/lzostraw.h                                $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/lzostraw.h                                $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef LZOSTRAW_H
-#define LZOSTRAW_H
-
+#pragma once
 
-#include	"STRAW.H"
+#include "STRAW.h"
 
 /*
 **	This class handles LZO compression/decompression to the data stream that is drawn through
@@ -98,6 +96,3 @@ class LZOStraw : public Straw
 		LZOStraw(LZOStraw & rvalue);
 		LZOStraw & operator = (LZOStraw const & pipe);
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/md5.h b/Core/Libraries/Source/WWVegas/WWLib/md5.h
index 2a7572b012b..7f41840f428 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/md5.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/md5.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* MD5.H - header file for MD5C.C
+/* MD5.h - header file for MD5C.C
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
@@ -63,4 +63,4 @@ typedef struct {
 void MD5Init PROTO_LIST ((MD5_CTX *));
 void MD5Update PROTO_LIST
   ((MD5_CTX *, unsigned char *, unsigned int));
-void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *));
\ No newline at end of file
+void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *));
diff --git a/Core/Libraries/Source/WWVegas/WWLib/mempool.h b/Core/Libraries/Source/WWVegas/WWLib/mempool.h
index e1712b813f2..3eae0cf003a 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/mempool.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/mempool.h
@@ -42,13 +42,7 @@
  *   AutoPoolClass::operator delete -- overriden delete which calls the internal ObjectPool    *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MEMPOOL_H
-#define MEMPOOL_H
 
 #include "bittype.h"
 #include "wwdebug.h"
@@ -74,7 +68,7 @@
 ** NodePool.Free_Object(node);
 **
 **********************************************************************************************/
-template<class T,int BLOCK_SIZE = 64> 
+template<class T,int BLOCK_SIZE = 64>
 class ObjectPoolClass
 {
 public:
@@ -90,8 +84,8 @@ class ObjectPoolClass
 
 protected:
 
-	T	*		FreeListHead;			
-	uint32 *	BlockListHead;			
+	T	*		FreeListHead;
+	uint32 *	BlockListHead;
 	int		FreeObjectCount;
 	int		TotalObjectCount;
 	FastCriticalSectionClass ObjectPoolCS;
@@ -111,7 +105,7 @@ class ObjectPoolClass
 ** Notes:
 ** - The array forms of new and delete are not supported
 ** - You must define the instance of the static object pool (Allocator)
-** - You can't derive a class from a class that is derived from AutoPoolClass 
+** - You can't derive a class from a class that is derived from AutoPoolClass
 **   because its size won't match but it will try to use the same pool...
 **
 ** Example Usage:
@@ -125,7 +119,7 @@ class ObjectPoolClass
 ** };
 **
 ** ListNode.cpp:
-** DEFINE_AUTO_POOL(ListNodeClass);	
+** DEFINE_AUTO_POOL(ListNodeClass);
 **
 ** function do_stuff(void) {
 **		ListNodeClass * node = new ListNodeClass;
@@ -133,8 +127,8 @@ class ObjectPoolClass
 ** }
 **
 **********************************************************************************************/
-template<class T, int BLOCK_SIZE = 64> 
-class AutoPoolClass 
+template<class T, int BLOCK_SIZE = 64>
+class AutoPoolClass
 {
 public:
 
@@ -180,15 +174,15 @@ ObjectPoolClass<T,BLOCKSIZE> AutoPoolClass<T,BLOCKSIZE>::Allocator = {}
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-template<class T,int BLOCK_SIZE> 
-ObjectPoolClass<T,BLOCK_SIZE>::ObjectPoolClass(void) : 
+template<class T,int BLOCK_SIZE>
+ObjectPoolClass<T,BLOCK_SIZE>::ObjectPoolClass(void) :
 	FreeListHead(NULL),
 	BlockListHead(NULL),
 	FreeObjectCount(0),
-	TotalObjectCount(0) 
-{ 
+	TotalObjectCount(0)
+{
 }
-	
+
 /***********************************************************************************************
  * ObjectPoolClass::~ObjectPoolClass -- destructor for ObjectPoolClass                         *
  *                                                                                             *
@@ -202,7 +196,7 @@ ObjectPoolClass<T,BLOCK_SIZE>::ObjectPoolClass(void) :
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-template<class T,int BLOCK_SIZE> 
+template<class T,int BLOCK_SIZE>
 ObjectPoolClass<T,BLOCK_SIZE>::~ObjectPoolClass(void)
 {
 	// assert that the user gave back all of the memory he was using
@@ -235,12 +229,12 @@ ObjectPoolClass<T,BLOCK_SIZE>::~ObjectPoolClass(void)
  * HISTORY:                                                                                    *
  *   7/29/99    GTH : Created.                                                                 *
  *=============================================================================================*/
-template<class T,int BLOCK_SIZE> 
+template<class T,int BLOCK_SIZE>
 T * ObjectPoolClass<T,BLOCK_SIZE>::Allocate_Object(void)
 {
 	// allocate memory for the object
 	T * obj = Allocate_Object_Memory();
-	
+
 	// construct the object in-place
 	return new (obj) T;
 }
@@ -257,7 +251,7 @@ T * ObjectPoolClass<T,BLOCK_SIZE>::Allocate_Object(void)
  * HISTORY:                                                                                    *
  *   7/29/99    GTH : Created.                                                                 *
  *=============================================================================================*/
-template<class T,int BLOCK_SIZE> 
+template<class T,int BLOCK_SIZE>
 void ObjectPoolClass<T,BLOCK_SIZE>::Free_Object(T * obj)
 {
 	// destruct the object
@@ -279,12 +273,12 @@ void ObjectPoolClass<T,BLOCK_SIZE>::Free_Object(T * obj)
  * HISTORY:                                                                                    *
  *   7/29/99    GTH : Created.                                                                 *
  *=============================================================================================*/
-template<class T,int BLOCK_SIZE> 
+template<class T,int BLOCK_SIZE>
 T * ObjectPoolClass<T,BLOCK_SIZE>::Allocate_Object_Memory(void)
 {
 	FastCriticalSectionClass::LockClass lock(ObjectPoolCS);
 
-	if ( FreeListHead == 0 ) {  
+	if ( FreeListHead == 0 ) {
 
 		// No free objects, allocate another block
 		uint32 * tmp_block_head = BlockListHead;
@@ -294,7 +288,7 @@ T * ObjectPoolClass<T,BLOCK_SIZE>::Allocate_Object_Memory(void)
 
 		// Link the objects in the block into the free object list
 		FreeListHead = (T*)(BlockListHead + 1);
-		for ( int i = 0; i < BLOCK_SIZE; i++ ) {	
+		for ( int i = 0; i < BLOCK_SIZE; i++ ) {
 			*(T**)(&(FreeListHead[i])) = &(FreeListHead[i+1]);	// link up the elements
 		}
 		*(T**)(&(FreeListHead[BLOCK_SIZE-1])) = 0;				// Mark the end
@@ -307,7 +301,7 @@ T * ObjectPoolClass<T,BLOCK_SIZE>::Allocate_Object_Memory(void)
 	FreeListHead = *(T**)(FreeListHead);	// Bump the Head
 	FreeObjectCount--;
 
-	return obj;										
+	return obj;
 }
 
 
@@ -323,7 +317,7 @@ T * ObjectPoolClass<T,BLOCK_SIZE>::Allocate_Object_Memory(void)
  * HISTORY:                                                                                    *
  *   7/29/99    GTH : Created.                                                                 *
  *=============================================================================================*/
-template<class T,int BLOCK_SIZE> 
+template<class T,int BLOCK_SIZE>
 void ObjectPoolClass<T,BLOCK_SIZE>::Free_Object_Memory(T * obj)
 {
 	FastCriticalSectionClass::LockClass lock(ObjectPoolCS);
@@ -348,7 +342,7 @@ void ObjectPoolClass<T,BLOCK_SIZE>::Free_Object_Memory(T * obj)
  *   7/29/99    GTH : Created.                                                                 *
  *=============================================================================================*/
 template<class T, int BLOCK_SIZE>
-void * AutoPoolClass<T,BLOCK_SIZE>::operator new( size_t size ) 
+void * AutoPoolClass<T,BLOCK_SIZE>::operator new( size_t size )
 {
 	WWASSERT(size == sizeof(T));
 	return (void *)(Allocator.Allocate_Object_Memory());
@@ -368,12 +362,8 @@ void * AutoPoolClass<T,BLOCK_SIZE>::operator new( size_t size )
  *   7/29/99    GTH : Created.                                                                 *
  *=============================================================================================*/
 template<class T, int BLOCK_SIZE>
-void AutoPoolClass<T,BLOCK_SIZE>::operator delete( void * memory ) 
+void AutoPoolClass<T,BLOCK_SIZE>::operator delete( void * memory )
 {
 	if ( memory == 0 ) return;
 	Allocator.Free_Object_Memory((T*)memory);
 }
- 
-
-
-#endif // MEMPOOL_H
diff --git a/Core/Libraries/Source/WWVegas/WWLib/mmsys.h b/Core/Libraries/Source/WWVegas/WWLib/mmsys.h
index 64b7c0c4bc9..caf5335dc0c 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/mmsys.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/mmsys.h
@@ -16,29 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/mmsys.h                                $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/mmsys.h                                $*
+ *                                                                                             *
  *                      $Author:: Tom_s                                                       $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 6/12/00 2:36p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef MMSYS_H
-#define MMSYS_H
+#pragma once
 
 /*
 ** This header just includes mmsystem.h with warning 4201 disabled
@@ -47,5 +43,3 @@
 #pragma warning(disable:4201)
 #include <mmsystem.h>
 #pragma warning(default:4201)
-
-#endif // MMSYS_H
diff --git a/Core/Libraries/Source/WWVegas/WWLib/mpu.cpp b/Core/Libraries/Source/WWVegas/WWLib/mpu.cpp
index 5bbc1ac50d8..f6da2de667e 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/mpu.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/mpu.cpp
@@ -37,7 +37,7 @@
 
 #include	"always.h"
 #include	"win.h"
-#include	"MPU.H"
+#include "MPU.h"
 #include "math.h"
 #include <assert.h>
 #include <Utility/intrin_compat.h>
diff --git a/Core/Libraries/Source/WWVegas/WWLib/multilist.cpp b/Core/Libraries/Source/WWVegas/WWLib/multilist.cpp
index 32cbb4529d8..8689e5bbca6 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/multilist.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/multilist.cpp
@@ -47,7 +47,7 @@ DEFINE_AUTO_POOL(MultiListNodeClass, 256);
 
 /***********************************************************************************************
 
-  MultiListObjectClass Implementation.  
+  MultiListObjectClass Implementation.
 
 ***********************************************************************************************/
 
@@ -61,12 +61,12 @@ MultiListObjectClass::~MultiListObjectClass(void)
 
 /***********************************************************************************************
 
-  GenericMultiListClass Implementation. 
+  GenericMultiListClass Implementation.
   This class has all of the real implementation.  Templates are provided in the header file
   which create typed lists by simply type-casting the void pointers that GenericMultiList uses.
 
 ***********************************************************************************************/
-  
+
 GenericMultiListClass::~GenericMultiListClass(void)
 {
 	assert(Is_Empty());
@@ -167,7 +167,7 @@ bool GenericMultiListClass::Internal_Add_After(MultiListObjectClass * obj,const
 	while ((existing_node->List != this) && (existing_node)) {
 		existing_node = existing_node->NextList;
 	}
-	
+
 	if (existing_node == NULL) {
 		return false;	// he's not in this list!
 	}
@@ -175,7 +175,7 @@ bool GenericMultiListClass::Internal_Add_After(MultiListObjectClass * obj,const
 	// allocate a node
 	MultiListNodeClass * node = new MultiListNodeClass;
 	node->Object = obj;
-	
+
 	// link the node into the list of list nodes for the object
 	node->NextList = obj->Get_List_Node();
 	obj->Set_List_Node(node);
@@ -205,14 +205,14 @@ bool GenericMultiListClass::Internal_Remove(MultiListObjectClass *obj)
 		return false;
 	}
 
-	// now we've found the node which corresponds to this list, 
+	// now we've found the node which corresponds to this list,
 	// unlink from the list of objects
 	lnode->Prev->Next = lnode->Next;
 	lnode->Next->Prev = lnode->Prev;
 
 	// unlink from the list of list nodes
 	if (prevlnode) {
-		prevlnode->NextList = lnode->NextList;	
+		prevlnode->NextList = lnode->NextList;
 	} else {
 		assert(obj->Get_List_Node() == lnode);	// must be first list obj is in...
 		obj->Set_List_Node(lnode->NextList);
@@ -235,7 +235,7 @@ MultiListObjectClass * GenericMultiListClass::Internal_Remove_List_Head(void)
 
 	// remove the object from our list
 	Internal_Remove(obj);
-	
+
 	// here you go.
 	return obj;
 }
diff --git a/Core/Libraries/Source/WWVegas/WWLib/multilist.h b/Core/Libraries/Source/WWVegas/WWLib/multilist.h
index f0e3aebaa9e..f99c5613e5b 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/multilist.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/multilist.h
@@ -36,13 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MULTILIST_H
-#define MULTILIST_H
 
 #include "always.h"
 #include "mempool.h"
@@ -53,7 +47,7 @@ class GenericMultiListClass;
 
 
 /******************************************************************************
-	
+
 	MultiLists
 
 	MultiLists solve the problem of needing to have objects that can be placed
@@ -70,11 +64,11 @@ class GenericMultiListClass;
 ** MultiListObjectClass
 ** This is an object that can be linked into a MultiList.  The only overhead
 ** for this is a single pointer to a MultiListNode.
-** Objects that are linked into MulitLists must derive from this class.  
+** Objects that are linked into MulitLists must derive from this class.
 ** If you delete an instance of one of these objects while it is in one or more
 ** Multi-Lists, it will automatically remove itself from the lists.
 */
-class MultiListObjectClass 
+class MultiListObjectClass
 {
 public:
 
@@ -92,7 +86,7 @@ class MultiListObjectClass
 /**
 ** MultiListNodeClass
 ** These nodes allow objects to be linked in multiple lists.  It is
-** like a 2-D linked list where one dimension is the list of objects in a 
+** like a 2-D linked list where one dimension is the list of objects in a
 ** given list and the other dimension is the list of lists that a given object
 ** is in.
 */
@@ -117,20 +111,20 @@ class MultiListNodeClass : public AutoPoolClass<MultiListNodeClass, 256>
 ** This simply contains the head node for a list.  This is a doubly circularly linked list where
 ** our head node is a sentry.  To easily iterate the list use the iterator defined below.
 */
-class GenericMultiListClass 
+class GenericMultiListClass
 {
 public:
 
 	GenericMultiListClass(void)	{ Head.Next = Head.Prev = &Head; Head.Object = 0; Head.NextList = 0; }
 	virtual ~GenericMultiListClass(void);
-	
+
 	bool							Is_In_List(MultiListObjectClass *obj);
 	bool							Contains(MultiListObjectClass * obj);
 	bool							Is_Empty(void);
 	int							Count(void);
 
 protected:
-	
+
 	bool							Internal_Add(MultiListObjectClass *obj,bool onlyonce = true);
 	bool							Internal_Add_Tail(MultiListObjectClass * obj,bool onlyonce = true);
 	bool							Internal_Add_After(MultiListObjectClass * obj,const MultiListObjectClass * existing_list_member,bool onlyonce = true);
@@ -171,7 +165,7 @@ inline MultiListObjectClass * GenericMultiListClass::Internal_Get_List_Head(void
 /**
 ** GenericMultiListIterator
 ** This is the internal implementation of an iterator for a MultiList.  The user should
-** use the templated MultiListIterator which will do typecasting and proper reference 
+** use the templated MultiListIterator which will do typecasting and proper reference
 ** counting rather than this class.
 */
 class GenericMultiListIterator
@@ -187,9 +181,9 @@ class GenericMultiListIterator
 	void				Next(void)										{ CurNode = CurNode->Next; }
 	void				Prev(void)										{ CurNode = CurNode->Prev; }
 	bool				Is_Done(void)									{ return (CurNode == &(List->Head)); }
-	
+
 protected:
-	
+
 	MultiListObjectClass	*		Current_Object(void)			{ return CurNode->Object; }
 
 	GenericMultiListClass *		List;				// list we're working in
@@ -223,7 +217,7 @@ class MultiListClass : public GenericMultiListClass
 public:
 
 	MultiListClass(void) { }
-			
+
 	virtual ~MultiListClass(void)
 	{
 		while (!Is_Empty()) {
@@ -234,7 +228,7 @@ class MultiListClass : public GenericMultiListClass
 	bool				Add(ObjectType * obj,bool onlyonce = true)
 	{
 		return Internal_Add(obj,onlyonce);
-	}	
+	}
 
 	bool				Add_Tail(ObjectType * obj,bool onlyonce = true)
 	{
@@ -278,7 +272,7 @@ class MultiListClass : public GenericMultiListClass
 	// not implemented
 	MultiListClass(const MultiListClass & that);
 	MultiListClass & operator = (const MultiListClass & that);
-	
+
 };
 
 /**
@@ -340,7 +334,7 @@ class MultiListIterator : public GenericMultiListIterator
 ** RefMultiListClass
 ** This is a template derived from GenericMultiListClass which handles ref-counted
 ** objects.  It assumes that 'ObjectType' is derived from MultiListObjectClass and
-** RefCountClass.   It adds type-checking and reference counting to 
+** RefCountClass.   It adds type-checking and reference counting to
 ** GenericMultiListClass.
 */
 template <class ObjectType>
@@ -363,7 +357,7 @@ class RefMultiListClass : public GenericMultiListClass
 			obj->Add_Ref();
 		}
 		return result;
-	}	
+	}
 
 	bool				Add_Tail(ObjectType * obj,bool onlyonce = true)
 	{
@@ -525,12 +519,8 @@ class PriorityMultiListIterator : public MultiListIterator<ObjectType>
 
 		return retval;
 	}
-	
+
 protected:
-	
+
 	MultiListNodeClass *		OriginalHead;
 };
-
-
-#endif //LIST_CLASS_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/mutex.h b/Core/Libraries/Source/WWVegas/WWLib/mutex.h
index e95e56fde6b..cce5055f478 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/mutex.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/mutex.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MUTEX_H
-#define MUTEX_H
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
 #include "always.h"
 #include "thread.h"
@@ -148,7 +143,7 @@ class FastCriticalSectionClass
 		{
 			unlock();
 		}
-    
+
 	private:
 
     void lock() {
@@ -164,7 +159,7 @@ class FastCriticalSectionClass
       // Had to remove the emits back to normal
       // ASM statements because sometimes the jump
       // would be 1 byte off....
-      
+
 		  __asm mov ebx, [nFlag]
 		  __asm ts_lock
 		  __asm bts dword ptr [ebx], 0
@@ -184,7 +179,7 @@ class FastCriticalSectionClass
       BitSet:
         ;
 #else
-        while (cs.Flag.test_and_set(std::memory_order_acquire)) {
+        while (cs.Flag.test_and_set(std::memory_order_acq_rel)) {
             cs.Flag.wait(true, std::memory_order_relaxed);
         }
 #endif
@@ -205,5 +200,3 @@ class FastCriticalSectionClass
 
   friend class LockClass;
 };
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/noinit.h b/Core/Libraries/Source/WWVegas/WWLib/noinit.h
index 040ae8b249f..dfbe3b15733 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/noinit.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/noinit.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/noinit.h                                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/noinit.h                                           $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 3/23/99 5:20p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef NOINIT_H
-#define NOINIT_H
+#pragma once
 
 /**********************************************************************
 **	This class is solely used as a parameter to a constructor that does
@@ -52,6 +51,3 @@ class NoInitClass {
 		void operator () (void) const {};
 };
 #endif
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/notifier.h b/Core/Libraries/Source/WWVegas/WWLib/notifier.h
index c12abf63201..97aaca08316 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/notifier.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/notifier.h
@@ -35,8 +35,7 @@
 * 06/28/02 KM Notify name change to avoid MAX conflicts                                       *
 ******************************************************************************/
 
-#ifndef __NOTIFY_H__
-#define __NOTIFY_H__
+#pragma once
 
 // Reduce warning level for STL
 #if defined(_MSC_VER)
@@ -89,7 +88,7 @@ template<typename Event> class Observer
 		//! Stop observing event
 		void StopObserving()
 			{
-			while (mNotifiers.size() > 0)
+			while (!mNotifiers.empty())
 				{
 				Notifier<Event>* notifier = mNotifiers.back();
 				assert(notifier && "ERROR: NULL pointer in collection.");
@@ -178,7 +177,7 @@ template<typename Event> class Notifier
 	virtual void AddObserver(Observer<Event>& observer) \
 		{Notifier<Event>::AddObserver(observer);} \
 	virtual void RemoveObserver(Observer<Event>& observer) \
-		{Notifier<Event>::RemoveObserver(observer);} 
+		{Notifier<Event>::RemoveObserver(observer);}
 
 
 /*-----------------------------------------------------------------------------
@@ -187,7 +186,7 @@ template<typename Event> class Notifier
  *---------------------------------------------------------------------------*/
 
 /* TypedEvent<T. V>
- * 
+ *
  * The first type (T) must be a class or other unique type. This need not
  * be a "real" class. It could be a forward declared class, which is enough
  * to make the template class unique.
@@ -272,5 +271,3 @@ class TypedEventPair
 		A mItemA;
 		B mItemB;
 	};
-
-#endif // __NOTIFY_H__
diff --git a/Core/Libraries/Source/WWVegas/WWLib/nstrdup.cpp b/Core/Libraries/Source/WWVegas/WWLib/nstrdup.cpp
index 1dfba22b318..82aee8ade4d 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/nstrdup.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/nstrdup.cpp
@@ -16,42 +16,41 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
- /*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /G/wwlib/nstrdup.cpp                    $* 
- *                                                                         * 
- *                      $Author:: Neal_k                                  $* 
- *                                                                         * 
- *                     $Modtime:: 9/20/99 11:56a                          $* 
- *                                                                         * 
- *                    $Revision:: 6                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- *   nstrdup -- duplicates a string using new[]                            * 
+ /***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /G/wwlib/nstrdup.cpp                    $*
+ *                                                                         *
+ *                      $Author:: Neal_k                                  $*
+ *                                                                         *
+ *                     $Modtime:: 9/20/99 11:56a                          $*
+ *                                                                         *
+ *                    $Revision:: 6                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ *   nstrdup -- duplicates a string using new[]                            *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
 #include "always.h"
-#include "string.h"
 #include "nstrdup.h"
 //#include "../app/main/gnew.h"
 
-/************************************************************************** 
- * nstrdup -- duplicates a string using new[]                             * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/03/1998 PWG : Created.                                            * 
+/**************************************************************************
+ * nstrdup -- duplicates a string using new[]                             *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/03/1998 PWG : Created.                                            *
  *========================================================================*/
 char * nstrdup(const char *str)
 {
diff --git a/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h b/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h
index b425b968a4d..5419dc21776 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h
@@ -16,34 +16,24 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /G/wwlib/nstrdup.h                      $* 
- *                                                                         * 
- *                      $Author:: Eric_c                                  $* 
- *                                                                         * 
- *                     $Modtime:: 4/02/99 12:00p                          $* 
- *                                                                         * 
- *                    $Revision:: 2                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /G/wwlib/nstrdup.h                      $*
+ *                                                                         *
+ *                      $Author:: Eric_c                                  $*
+ *                                                                         *
+ *                     $Modtime:: 4/02/99 12:00p                          $*
+ *                                                                         *
+ *                    $Revision:: 2                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __NSTRDUP_H__
-#define __NSTRDUP_H__
 
 char * nstrdup(const char *str);
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/ntree.h b/Core/Libraries/Source/WWVegas/WWLib/ntree.h
index 47fd55ff2a1..075bfd9e0b8 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/ntree.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/ntree.h
@@ -34,16 +34,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __NTREE_H
-#define __NTREE_H
-
 
-#include "refcount.h"
+#include "always.h"
 #include "wwstring.h"
 
 
@@ -70,7 +63,7 @@ class NTreeClass
 	NTreeClass (void)
 		:	m_Root (NULL)			{ }
 	virtual ~NTreeClass (void)	{ Reset (); }
-	
+
 	//////////////////////////////////////////////////////////////
 	//	Public methods
 	//////////////////////////////////////////////////////////////
@@ -102,14 +95,14 @@ NTreeLeafClass<T> *NTreeClass<T>::Add (const T &value)
 	NTreeLeafClass<T> *retval = NULL;
 
 	if (m_Root == NULL) {
-		
+
 		//
 		//	Allocate a new root node
 		//
 		m_Root = Allocate_Leaf ();
 		m_Root->Set_Value (value);
 		retval = m_Root;
-		
+
 	} else {
 
 		//
@@ -137,7 +130,7 @@ void NTreeClass<T>::Reset (void)
 		while (end_leaf->Peek_Next () != NULL) {
 			end_leaf = end_leaf->Peek_Next ();
 		}
-		
+
 		//
 		//	Remove all the top-level leaves from the tree.
 		// Note: We work backwards from last root-leaf so each
@@ -147,7 +140,7 @@ void NTreeClass<T>::Reset (void)
 		for (NTreeLeafClass<T> *leaf = end_leaf; leaf != NULL; ) {
 			NTreeLeafClass<T> *curr_leaf = leaf;
 			leaf = leaf->Peek_Prev ();
-			
+
 			//
 			//	Remove this leaf
 			//
@@ -176,7 +169,7 @@ class SortedNTreeClass : public NTreeClass<T>
 	//////////////////////////////////////////////////////////////
 	SortedNTreeClass (void)				{ }
 	virtual ~SortedNTreeClass (void)	{ }
-	
+
 	//////////////////////////////////////////////////////////////
 	//	Public methods
 	//////////////////////////////////////////////////////////////
@@ -199,16 +192,16 @@ SortedNTreeLeafClass<T> *SortedNTreeClass<T>::Add_Sorted (const T &value, const
 	SortedNTreeLeafClass<T> *retval = NULL;
 
 	if (m_Root == NULL) {
-		
+
 		//
 		//	Allocate a new root node
 		//
 		m_Root = Allocate_Leaf ();
-		
+
 		retval = (SortedNTreeLeafClass<T> *)m_Root;
 		retval->Set_Value (value);
-		retval->Set_Name (name);		
-		
+		retval->Set_Name (name);
+
 	} else {
 
 		//
@@ -220,7 +213,7 @@ SortedNTreeLeafClass<T> *SortedNTreeClass<T>::Add_Sorted (const T &value, const
 		//	Make sure our 'root' pointer is the first one in the list
 		//
 		NTreeLeafClass<T> *prev = m_Root->Peek_Prev ();
-		if (prev != NULL) {			
+		if (prev != NULL) {
 			REF_PTR_SET (m_Root, prev);
 		}
 	}
@@ -249,11 +242,11 @@ class NTreeLeafClass : public RefCountClass
 			m_NextSibling (NULL)			{ }
 
 	virtual ~NTreeLeafClass (void);
-	
+
 	//////////////////////////////////////////////////////////////
 	//	Public methods
 	//////////////////////////////////////////////////////////////
-	
+
 	//
 	//	Tree management
 	//
@@ -266,7 +259,7 @@ class NTreeLeafClass : public RefCountClass
 	//
 	virtual const T &			Get_Value (void) const		{ return m_Data; }
 	virtual void				Set_Value (const T &data)	{ m_Data = data; }
-	
+
 	//
 	//	Tree traversal methods
 	//
@@ -283,7 +276,7 @@ class NTreeLeafClass : public RefCountClass
 	void						Set_Parent (NTreeLeafClass<T> *parent)	{ REF_PTR_SET (m_Parent, parent); }
 	void						Set_Child (NTreeLeafClass<T> *child)	{ REF_PTR_SET (m_Child, child); }
 	void						Set_Prev (NTreeLeafClass<T> *prev)		{ REF_PTR_SET (m_PrevSibling, prev); }
-	void						Set_Next (NTreeLeafClass<T> *next)		{ REF_PTR_SET (m_NextSibling, next); }	
+	void						Set_Next (NTreeLeafClass<T> *next)		{ REF_PTR_SET (m_NextSibling, next); }
 
 	//////////////////////////////////////////////////////////////
 	//	Protected member data
@@ -307,7 +300,7 @@ NTreeLeafClass<T>::~NTreeLeafClass (void)
 	REF_PTR_RELEASE (m_Child);
 	REF_PTR_RELEASE (m_NextSibling);
 	REF_PTR_RELEASE (m_PrevSibling);
-	return; 
+	return;
 }
 
 /////////////////////////////////////////////////////////
@@ -322,7 +315,7 @@ NTreeLeafClass<T> *NTreeLeafClass<T>::Add_Child (const T &value)
 	NTreeLeafClass<T> *new_child = W3DNEW NTreeLeafClass<T>;
 	new_child->Set_Value (value);
 	new_child->Set_Parent (this);
-	
+
 	//
 	//	Link this new leaf into the hierarchy
 	//
@@ -420,7 +413,7 @@ class SortedNTreeLeafClass : public NTreeLeafClass<T>
 	//////////////////////////////////////////////////////////////
 	SortedNTreeLeafClass (void)		{ }
 	~SortedNTreeLeafClass (void)		{ }
-	
+
 	//////////////////////////////////////////////////////////////
 	//	Public methods
 	//////////////////////////////////////////////////////////////
@@ -504,10 +497,10 @@ SortedNTreeLeafClass<T> *SortedNTreeLeafClass<T>::Add_Child_Sorted (const T &val
 		//	Make sure our 'child' pointer is the first one in the list
 		//
 		NTreeLeafClass<T> *prev = m_Child->Peek_Prev ();
-		if (prev != NULL) {			
+		if (prev != NULL) {
 			REF_PTR_SET (m_Child, prev);
 		}
-		
+
 		//
 		//	Release our hold on the object pointer
 		//
@@ -536,7 +529,7 @@ void SortedNTreeLeafClass<T>::Insertion_Sort (SortedNTreeLeafClass<T> *start, So
 		//
 		//	Does the new sibling come before the current leaf?
 		//
-		if (::stricmp (name, leaf->Get_Name ()) < 0) {				
+		if (::stricmp (name, leaf->Get_Name ()) < 0) {
 
 			//
 			//	Insert this sibling before the leaf
@@ -550,7 +543,7 @@ void SortedNTreeLeafClass<T>::Insertion_Sort (SortedNTreeLeafClass<T> *start, So
 			}
 
 			inserted = true;
-			
+
 		} else if (leaf->Peek_Next () == NULL) {
 
 			//
@@ -564,5 +557,3 @@ void SortedNTreeLeafClass<T>::Insertion_Sort (SortedNTreeLeafClass<T> *start, So
 
 	return ;
 }
-
-#endif //__NTREE_H
diff --git a/Core/Libraries/Source/WWVegas/WWLib/pipe.cpp b/Core/Libraries/Source/WWVegas/WWLib/pipe.cpp
index f95f918677a..cbd752ee096 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/pipe.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/pipe.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/PIPE.CPP                                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/PIPE.cpp                                           $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/15/99 10:15a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   Pipe::Put_To -- Connect a pipe to flow data into from this pipe.                          *
  *   Pipe::Flush -- Flush all pending data out the pipe.                                       *
  *   Pipe::Put -- Feed some data through the pipe.                                             *
@@ -40,9 +40,8 @@
 
 
 #include	"always.h"
-#include	"PIPE.H"
+#include "PIPE.h"
 #include	<stddef.h>
-//#include	<string.h>
 
 
 /***********************************************************************************************
diff --git a/Core/Libraries/Source/WWVegas/WWLib/ramfile.cpp b/Core/Libraries/Source/WWVegas/WWLib/ramfile.cpp
index 6641cd7ab49..98de513cf4d 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/ramfile.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/ramfile.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/ramfile.cpp                            $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/ramfile.cpp                            $*
+ *                                                                                             *
  *                      $Author:: Ian_l                                                       $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 10/31/01 2:36p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   RAMFileClass::Close -- This will 'close' the ram file.                                    *
  *   RAMFileClass::Create -- Effectively clears the buffer of data.                            *
  *   RAMFileClass::Delete -- Effectively clears the buffer of data.                            *
@@ -48,8 +48,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"always.h"
-#include	"RAMFILE.H"
-#include	<string.h>
+#include "RAMFILE.h"
 
 
 /***********************************************************************************************
@@ -475,7 +474,7 @@ void RAMFileClass::Close(void)
 
 
 /***********************************************************************************************
- * RAMFileClass::Bias --																							  *	
+ * RAMFileClass::Bias --																							  *
  *                                                                                             *
  *                                                                                             *
  * INPUT:   none                                                                               *
diff --git a/Core/Libraries/Source/WWVegas/WWLib/random.cpp b/Core/Libraries/Source/WWVegas/WWLib/random.cpp
index 0251cb8cd55..3ebbd227e83 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/random.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/random.cpp
@@ -16,35 +16,35 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /VSS_Sync/wwlib/random.cpp                                  $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /VSS_Sync/wwlib/random.cpp                                  $*
+ *                                                                                             *
  *                      $Author:: Vss_sync                                                    $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 8/29/01 10:24p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   RandomClass::RandomClass -- Constructor for the random number class.                      *
  *   RandomClass::operator() -- Fetches the next random number in the sequence.                *
  *   RandomClass::operator() -- Ranged random number generator.                                *
- *   Random2Class::Random2Class -- Constructor for the random class.                           * 
- *   Random2Class::operator -- Generates a random number between two values.                   * 
- *   Random2Class::operator -- Randomizer function that returns value.                         * 
- *   Random3Class::Random3Class -- Initializer for the random number generator.                * 
- *   Random3Class::operator -- Generates a random number between two values.                   * 
- *   Random3Class::operator -- Random number generator function.                               * 
+ *   Random2Class::Random2Class -- Constructor for the random class.                           *
+ *   Random2Class::operator -- Generates a random number between two values.                   *
+ *   Random2Class::operator -- Randomizer function that returns value.                         *
+ *   Random3Class::Random3Class -- Initializer for the random number generator.                *
+ *   Random3Class::operator -- Generates a random number between two values.                   *
+ *   Random3Class::operator -- Random number generator function.                               *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"always.h"
-#include	"RANDOM.H"
+#include "RANDOM.h"
 
 // Timing tests for random these random number generators in seconds for
 // 10000000 iterations. Testing done by Hector Yee, 6/20/01
@@ -149,23 +149,23 @@ int RandomClass::operator() (int minval, int maxval)
 }
 
 
-/*********************************************************************************************** 
- * Random2Class::Random2Class -- Constructor for the random class.                             * 
- *                                                                                             * 
- *    This will initialize the random class object with the seed value specified.              * 
- *                                                                                             * 
- * INPUT:   seed  -- The seed value used to scramble the random number generator.              * 
- *                                                                                             * 
- * OUTPUT:  none                                                                               * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/14/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * Random2Class::Random2Class -- Constructor for the random class.                             *
+ *                                                                                             *
+ *    This will initialize the random class object with the seed value specified.              *
+ *                                                                                             *
+ * INPUT:   seed  -- The seed value used to scramble the random number generator.              *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/14/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
-Random2Class::Random2Class(unsigned seed) : 
-	Index1(0), 
-	Index2(103) 
+Random2Class::Random2Class(unsigned seed) :
+	Index1(0),
+	Index2(103)
 {
 	Random3Class random(seed);
 
@@ -175,22 +175,22 @@ Random2Class::Random2Class(unsigned seed) :
 }
 
 
-/*********************************************************************************************** 
- * Random2Class::operator -- Randomizer function that returns value.                           * 
- *                                                                                             * 
- *    This is the random number generator function. It will generate a random number and       * 
- *    return the value.                                                                        * 
- *                                                                                             * 
- * INPUT:   none                                                                               * 
- *                                                                                             * 
- * OUTPUT:  Returns with a random number.                                                      * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/20/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * Random2Class::operator -- Randomizer function that returns value.                           *
+ *                                                                                             *
+ *    This is the random number generator function. It will generate a random number and       *
+ *    return the value.                                                                        *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  Returns with a random number.                                                      *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/20/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
-int Random2Class::operator() (void) 
+int Random2Class::operator() (void)
 {
 	Table[Index1] ^= Table[Index2];
 	int val = Table[Index1];
@@ -205,22 +205,22 @@ int Random2Class::operator() (void)
 }
 
 
-/*********************************************************************************************** 
- * Random2Class::operator -- Generates a random number between two values.                     * 
- *                                                                                             * 
- *    This routine will generate a random number between the two values specified. It uses     * 
- *    a method that will not bias the values in any way.                                       * 
- *                                                                                             * 
- * INPUT:   minval   -- The minium return value (inclusive).                                   * 
- *                                                                                             * 
- *          maxval   -- The maximum return value (inclusive).                                  * 
- *                                                                                             * 
- * OUTPUT:  Returns with a random number that falls between the two values (inclusive).        * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/20/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * Random2Class::operator -- Generates a random number between two values.                     *
+ *                                                                                             *
+ *    This routine will generate a random number between the two values specified. It uses     *
+ *    a method that will not bias the values in any way.                                       *
+ *                                                                                             *
+ * INPUT:   minval   -- The minium return value (inclusive).                                   *
+ *                                                                                             *
+ *          maxval   -- The maximum return value (inclusive).                                  *
+ *                                                                                             *
+ * OUTPUT:  Returns with a random number that falls between the two values (inclusive).        *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/20/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 int Random2Class::operator() (int minval, int maxval)
 {
@@ -250,51 +250,51 @@ int Random3Class::Mix2[20] = {
 };
 
 
-/*********************************************************************************************** 
- * Random3Class::Random3Class -- Initializer for the random number generator.                  * 
- *                                                                                             * 
- *    This initializes the random number generator with the seed values specified. Due to a    * 
- *    peculiarity of the random number design, the second seed value can be used to find the   * 
- *    Nth random number generated by this algorithm. The second seed is used as the Nth index  * 
- *    value.                                                                                   * 
- *                                                                                             * 
- * INPUT:   seed1 -- The seed value to inialize the generator with. It is suggest that some    * 
- *                   random value based on user input seed this value.                         * 
- *                                                                                             * 
- *          seed2 -- The auxiliary seed value. This adds randomness and thus allows this       * 
- *                   algorithm to use a 64 bit seed. This second seed also serves as an index  * 
- *                   into the algorithm such that the value passed as 'seed2' is will prime    * 
- *                   the generator to return that Nth random number when it is called.         * 
- *                                                                                             * 
- * OUTPUT:  none                                                                               * 
- *                                                                                             * 
- * WARNINGS:   As with all random number generators. Randomness is only as strong as the       * 
- *             initial seed value.                                                             * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/20/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * Random3Class::Random3Class -- Initializer for the random number generator.                  *
+ *                                                                                             *
+ *    This initializes the random number generator with the seed values specified. Due to a    *
+ *    peculiarity of the random number design, the second seed value can be used to find the   *
+ *    Nth random number generated by this algorithm. The second seed is used as the Nth index  *
+ *    value.                                                                                   *
+ *                                                                                             *
+ * INPUT:   seed1 -- The seed value to inialize the generator with. It is suggest that some    *
+ *                   random value based on user input seed this value.                         *
+ *                                                                                             *
+ *          seed2 -- The auxiliary seed value. This adds randomness and thus allows this       *
+ *                   algorithm to use a 64 bit seed. This second seed also serves as an index  *
+ *                   into the algorithm such that the value passed as 'seed2' is will prime    *
+ *                   the generator to return that Nth random number when it is called.         *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   As with all random number generators. Randomness is only as strong as the       *
+ *             initial seed value.                                                             *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/20/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 Random3Class::Random3Class(unsigned seed1, unsigned seed2) :
 	Seed(seed1),
 	Index(seed2)
 {
-}	
-
-
-/*********************************************************************************************** 
- * Random3Class::operator -- Random number generator function.                                 * 
- *                                                                                             * 
- *    This routine generates a random number. The number returned is strongly random and is    * 
- *    nearly good enough for cryptography.                                                     * 
- *                                                                                             * 
- * INPUT:   none                                                                               * 
- *                                                                                             * 
- * OUTPUT:  Returns with a 32bit random number.                                                * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/20/1997 JLB : Created.                                                                 * 
+}
+
+
+/***********************************************************************************************
+ * Random3Class::operator -- Random number generator function.                                 *
+ *                                                                                             *
+ *    This routine generates a random number. The number returned is strongly random and is    *
+ *    nearly good enough for cryptography.                                                     *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  Returns with a 32bit random number.                                                *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/20/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 int Random3Class::operator() (void)
 {
@@ -311,25 +311,25 @@ int Random3Class::operator() (void)
 		loword  = hihold;
 	}
 	return(hiword);
-}	
-
-
-/*********************************************************************************************** 
- * Random3Class::operator -- Generates a random number between two values.                     * 
- *                                                                                             * 
- *    This routine will generate a random number between the two values specified. It uses     * 
- *    a method that will not bias the values in any way.                                       * 
- *                                                                                             * 
- * INPUT:   minval   -- The minium return value (inclusive).                                   * 
- *                                                                                             * 
- *          maxval   -- The maximum return value (inclusive).                                  * 
- *                                                                                             * 
- * OUTPUT:  Returns with a random number that falls between the two values (inclusive).        * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/20/1997 JLB : Created.                                                                 * 
+}
+
+
+/***********************************************************************************************
+ * Random3Class::operator -- Generates a random number between two values.                     *
+ *                                                                                             *
+ *    This routine will generate a random number between the two values specified. It uses     *
+ *    a method that will not bias the values in any way.                                       *
+ *                                                                                             *
+ * INPUT:   minval   -- The minium return value (inclusive).                                   *
+ *                                                                                             *
+ *          maxval   -- The maximum return value (inclusive).                                  *
+ *                                                                                             *
+ * OUTPUT:  Returns with a random number that falls between the two values (inclusive).        *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/20/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 int Random3Class::operator() (int minval, int maxval)
 {
@@ -339,14 +339,14 @@ int Random3Class::operator() (int minval, int maxval)
 // Random4
 // Hector Yee 6/11/01
 
-/* Period parameters */  
+/* Period parameters */
 #define N 624
 #define M 397
 #define MATRIX_A 0x9908b0df   /* constant vector a */
 #define UPPER_MASK 0x80000000 /* most significant w-r bits */
 #define LOWER_MASK 0x7fffffff /* least significant r bits */
 
-/* Tempering parameters */   
+/* Tempering parameters */
 #define TEMPERING_MASK_B 0x9d2c5680
 #define TEMPERING_MASK_C 0xefc60000
 #define TEMPERING_SHIFT_U(y)  (y >> 11)
@@ -364,7 +364,7 @@ Random4Class::Random4Class(unsigned int seed)
 
     mt[0]= seed & 0xffffffff;
     for (mti=1; mti<N; mti++)
-        mt[mti] = (69069 * mt[mti-1]) & 0xffffffff;	
+        mt[mti] = (69069 * mt[mti-1]) & 0xffffffff;
 	 // mti is N+1 after this
 }
 
@@ -375,7 +375,7 @@ int Random4Class::operator() (void)
     /* mag01[x] = x * MATRIX_A  for x=0,1 */
 
     if (mti >= N) { /* generate N words at one time */
-        int kk;		  
+        int kk;
 
         for (kk=0;kk<N-M;kk++) {
             y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
@@ -390,7 +390,7 @@ int Random4Class::operator() (void)
 
         mti = 0;
     }
-  
+
     y = mt[mti++];
     y ^= TEMPERING_SHIFT_U(y);
     y ^= TEMPERING_SHIFT_S(y) & TEMPERING_MASK_B;
@@ -413,4 +413,4 @@ float Random4Class::Get_Float()
 	unsigned int *y=(unsigned int *) &x;
 
 	return (*y)*2.3283064370807973754314699618685e-10f;
-}
\ No newline at end of file
+}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/rawfile.cpp b/Core/Libraries/Source/WWVegas/WWLib/rawfile.cpp
index 7147be6b63f..9ebd2d2d356 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/rawfile.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/rawfile.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/rawfile.cpp                            $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/rawfile.cpp                            $*
+ *                                                                                             *
  *                      $Author:: Jani_p                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 11/25/01 1:26p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 13                                                          $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   RawFileClass::Bias -- Bias a file with a specific starting position and length.           *
  *   RawFileClass::Close -- Perform a closure of the file.                                     *
  *   RawFileClass::Create -- Creates an empty file.                                            *
@@ -51,13 +51,11 @@
  *   RawFileClass::Write -- Writes the specified data to the buffer specified.                 *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-// TheSuperHackers @compile feliwir 11/04/2025 We removed Win32 API here and use plain C
+// TheSuperHackers @build feliwir 11/04/2025 We removed Win32 API here and use plain C
 #include	"always.h"
-#include	"RAWFILE.H"
+#include "RAWFILE.h"
 #include	<stddef.h>
-#include	<stdio.h>
 #include	<stdlib.h>
-#include	<string.h>
 #include	<limits.h>
 #include	<errno.h>
 #include <sys/types.h>
@@ -69,7 +67,7 @@
 	**	This is a duplicate of the error numbers. The error handler for the RawFileClass handles
 	**	these errors. If the error routine is overridden and additional errors are defined, then
 	**	use numbers starting with 100. Note that these errors here are listed in numerical order.
-	**	These errors are defined in the standard header file "ERRNO.H".
+	**	These errors are defined in the standard header file "ERRNO.h".
 	*/
 	EZERO,				// Non-error.
 	EINVFNC,				// Invalid function number.
@@ -179,7 +177,7 @@ bool RawFileClass::Is_Open(void) const
  *    Display an error message as indicated. If it is allowed to retry, then pressing a key    *
  *    will return from this function. Otherwise, it will exit the program with "exit()".       *
  *                                                                                             *
- * INPUT:   error    -- The error number (same as the DOSERR.H error numbers).                 *
+ * INPUT:   error    -- The error number (same as the DOSERR.h error numbers).                 *
  *                                                                                             *
  *          canretry -- Can this routine exit normally so that retrying can occur? If this is  *
  *                      false, then the program WILL exit in this routine.                     *
@@ -216,7 +214,7 @@ void RawFileClass::Error(int, int, char const * )
  * HISTORY:                                                                                    *
  *   10/18/1994 JLB : Created.                                                                 *
  *=============================================================================================*/
-int RawFileClass::Transfer_Block_Size(void) 
+int RawFileClass::Transfer_Block_Size(void)
 {
 	return (int)((unsigned)UINT_MAX)-16L;
 }
@@ -404,7 +402,7 @@ int RawFileClass::Open(int rights)
 	**	Verify that there is a filename associated with this file object. If not, then this is a
 	**	big error condition.
 	*/
-	if (Filename.Get_Length()==0) {
+	if (Filename.Is_Empty()) {
 		Error(ENOENT, false);
 	}
 
@@ -494,7 +492,7 @@ int RawFileClass::Open(int rights)
  *=============================================================================================*/
 bool RawFileClass::Is_Available(int forced)
 {
-	if (Filename.Get_Length()==0) return(false);
+	if (Filename.Is_Empty()) return(false);
 
 	/*
 	**	If the file is already open, then is must have already passed the availability check.
@@ -567,7 +565,7 @@ void RawFileClass::Close(void)
 		**	Try to close the file. If there was an error (who knows what that could be), then
 		**	call the error routine.
 		*/
-		int closeok=(fclose(Handle)==0)?true:false;	
+		int closeok=(fclose(Handle)==0)?true:false;
 
 		if (!closeok) {
 			Error(errno, false, Filename);
@@ -837,10 +835,10 @@ int RawFileClass::Size(void)
 	if (Is_Open()) {
 
 		size_t curpos;
-		curpos = ftell(Handle);	
+		curpos = ftell(Handle);
 
 		fseek(Handle,0,SEEK_END);
-		size = ftell(Handle);	
+		size = ftell(Handle);
 
 		fseek(Handle,curpos,SEEK_SET);
 
@@ -1142,7 +1140,7 @@ int RawFileClass::Raw_Seek(int pos, int dir)
 void RawFileClass::Attach (void *handle, int rights)
 {
 	Reset ();
-	
+
 	Rights = rights;
 	BiasStart = 0;
 	BiasLength = -1;
@@ -1171,6 +1169,6 @@ void RawFileClass::Detach (void)
 	BiasLength = -1;
 	Date = 0;
 	Time = 0;
-	Handle = NULL_HANDLE;	
+	Handle = NULL_HANDLE;
 }
 
diff --git a/Core/Libraries/Source/WWVegas/WWLib/rcfile.cpp b/Core/Libraries/Source/WWVegas/WWLib/rcfile.cpp
index 83e3d520ea0..5462b803980 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/rcfile.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/rcfile.cpp
@@ -49,7 +49,7 @@ ResourceFileClass::ResourceFileClass(HMODULE hmodule, char const *filename) :
 	EndOfFile(NULL)
 {
 	Set_Name(filename);
-	HRSRC hresource = FindResource(hmodule,ResourceName,RESOURCE_FILE_TYPE_NAME);	
+	HRSRC hresource = FindResource(hmodule,ResourceName,RESOURCE_FILE_TYPE_NAME);
 
 	if (hresource) {
 		HGLOBAL hglob = LoadResource(hmodule,hresource);
@@ -63,21 +63,19 @@ ResourceFileClass::ResourceFileClass(HMODULE hmodule, char const *filename) :
 	}
 }
 
-ResourceFileClass::~ResourceFileClass(void)									
-{ 
-	if (ResourceName) 
-		free(ResourceName); 
+ResourceFileClass::~ResourceFileClass(void)
+{
+	free(ResourceName);
 }
 
 char const * ResourceFileClass::Set_Name(char const *filename)
 {
-	if (ResourceName) {
-		free(ResourceName);
-		ResourceName = NULL;
-	}
+	free(ResourceName);
+	ResourceName = NULL;
+
 	if (filename) {
 		ResourceName = strdup(filename);
-	} 
+	}
 	return ResourceName;
 }
 
@@ -115,7 +113,7 @@ int ResourceFileClass::Seek(int pos, int dir)
 	if (FilePtr < FileBytes) {
 		FilePtr = FileBytes;
 	}
-	
+
 	return FilePtr - FileBytes;
 }
 
diff --git a/Core/Libraries/Source/WWVegas/WWLib/rcfile.h b/Core/Libraries/Source/WWVegas/WWLib/rcfile.h
index 510c455651c..6217f09062c 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/rcfile.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/rcfile.h
@@ -34,15 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef RCFILE_H
-#define RCFILE_H
 
 #include "always.h"
-#include "WWFILE.H"
+#include "WWFILE.h"
 #include "win.h"
 
 /*
@@ -59,14 +54,14 @@ class ResourceFileClass : public FileClass
 
 		ResourceFileClass(HMODULE hmodule, char const *filename);
 		virtual ~ResourceFileClass(void);
-		
+
 		virtual char const * File_Name(void) const					{ return ResourceName; }
 		virtual char const * Set_Name(char const *filename);
 		virtual int Create(void)											{ return false; }
 		virtual int Delete(void)											{ return false; }
 		virtual bool Is_Available(int /*forced=false*/)				{ return Is_Open (); }
-		virtual bool Is_Open(void) const									{ return (FileBytes != NULL); } 
-		
+		virtual bool Is_Open(void) const									{ return (FileBytes != NULL); }
+
 		virtual int Open(char const * /*fname*/, int /*rights=READ*/)	{ return Is_Open(); }
 		virtual int Open(int /*rights=READ*/)							{ return Is_Open(); }
 
@@ -85,12 +80,9 @@ class ResourceFileClass : public FileClass
 		char *				ResourceName;
 
 		HMODULE				hModule;
-		
+
 		unsigned char *	FileBytes;
 		unsigned char *	FilePtr;
 		unsigned char *	EndOfFile;
 
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/readline.cpp b/Core/Libraries/Source/WWVegas/WWLib/readline.cpp
index 6df45edf5b8..25112a4745c 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/readline.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/readline.cpp
@@ -16,34 +16,32 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/readline.cpp                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/readline.cpp                           $*
+ *                                                                                             *
  *                      $Author:: Jani_p                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 6/14/01 7:25p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 4                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   strtrim -- Trim leading and trailing white space off of string.                           * 
- *   Read_Line -- Read a text line from the file.                                              * 
- *   Read_Line -- Reads a text line from the straw object specified.                           * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   strtrim -- Trim leading and trailing white space off of string.                           *
+ *   Read_Line -- Read a text line from the file.                                              *
+ *   Read_Line -- Reads a text line from the straw object specified.                           *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"always.h"
 #include	"readline.h"
 #include	"trim.h"
-#include	"WWFILE.H"
-#include	"XSTRAW.H"
-//#include	<ctype.h>
-#include	<string.h>
+#include "WWFILE.h"
+#include "XSTRAW.h"
 
 
 #if !defined(__BORLANDC__) && !defined(_MSC_VER)
@@ -52,26 +50,26 @@
 #endif
 
 
-/*********************************************************************************************** 
- * Read_Line -- Read a text line from the file.                                                * 
- *                                                                                             * 
- *    This will read a line of text from the file specified.                                   * 
- *                                                                                             * 
- * INPUT:   file  -- Reference to the file to read the line from.                              * 
- *                                                                                             * 
- *          buffer   -- Pointer to the location to store the line of text.                     * 
- *                                                                                             * 
- *          len   -- The length of the buffer to store the line.                               * 
- *                                                                                             * 
- *          eof   -- Reference to the EOF flag that will be set to true if the source          * 
- *                   file has been exhausted.                                                  * 
- *                                                                                             * 
- * OUTPUT:  Returns with the number of characters stored into the buffer.                      * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/06/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * Read_Line -- Read a text line from the file.                                                *
+ *                                                                                             *
+ *    This will read a line of text from the file specified.                                   *
+ *                                                                                             *
+ * INPUT:   file  -- Reference to the file to read the line from.                              *
+ *                                                                                             *
+ *          buffer   -- Pointer to the location to store the line of text.                     *
+ *                                                                                             *
+ *          len   -- The length of the buffer to store the line.                               *
+ *                                                                                             *
+ *          eof   -- Reference to the EOF flag that will be set to true if the source          *
+ *                   file has been exhausted.                                                  *
+ *                                                                                             *
+ * OUTPUT:  Returns with the number of characters stored into the buffer.                      *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/06/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 int Read_Line(FileClass & file, char * buffer, int len, bool & eof)
 {
@@ -80,26 +78,26 @@ int Read_Line(FileClass & file, char * buffer, int len, bool & eof)
 }
 
 
-/*********************************************************************************************** 
- * Read_Line -- Reads a text line from the straw object specified.                             * 
- *                                                                                             * 
- *    This reads a line of text from the straw object.                                         * 
- *                                                                                             * 
- * INPUT:   file  -- Reference to the straw object to fetch the line of text from.             * 
- *                                                                                             * 
- *          buffer   -- Pointer to the buffer that will hold the line of text.                 * 
- *                                                                                             * 
- *          len   -- The size of the buffer.                                                   * 
- *                                                                                             * 
- *          eof   -- Reference to the EOF flag that will be set to true if the source          * 
- *                   straw data has been exhausted.                                            * 
- *                                                                                             * 
- * OUTPUT:  Returns with the number of characters stored into the buffer.                      * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/06/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * Read_Line -- Reads a text line from the straw object specified.                             *
+ *                                                                                             *
+ *    This reads a line of text from the straw object.                                         *
+ *                                                                                             *
+ * INPUT:   file  -- Reference to the straw object to fetch the line of text from.             *
+ *                                                                                             *
+ *          buffer   -- Pointer to the buffer that will hold the line of text.                 *
+ *                                                                                             *
+ *          len   -- The size of the buffer.                                                   *
+ *                                                                                             *
+ *          eof   -- Reference to the EOF flag that will be set to true if the source          *
+ *                   straw data has been exhausted.                                            *
+ *                                                                                             *
+ * OUTPUT:  Returns with the number of characters stored into the buffer.                      *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/06/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 int Read_Line(Straw & file, char * buffer, int len, bool & eof)
 {
diff --git a/Core/Libraries/Source/WWVegas/WWLib/readline.h b/Core/Libraries/Source/WWVegas/WWLib/readline.h
index 1efbb59354c..1a9f019cc56 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/readline.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/readline.h
@@ -16,36 +16,30 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/readline.h                             $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/readline.h                             $*
+ *                                                                                             *
  *                      $Author:: Jani_p                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 6/14/01 7:24p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 3                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef READLINE_H
-#define READLINE_H
+#pragma once
 
-#include	"STRAW.H"
-#include	"WWFILE.H"
+#include "STRAW.h"
+#include "WWFILE.h"
 #include <wchar.h>
 
 int Read_Line(FileClass & file, char * buffer, int len, bool & eof);
 int Read_Line(Straw & file, char * buffer, int len, bool & eof);
 int Read_Line(Straw & file, wchar_t * buffer, int len, bool & eof);
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/realcrc.cpp b/Core/Libraries/Source/WWVegas/WWLib/realcrc.cpp
index 0c8da51632a..9e7708c3860 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/realcrc.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/realcrc.cpp
@@ -40,10 +40,10 @@
 #include "realcrc.h"
 #include <ctype.h>
 
-//    CRC for poly 0x04C11DB7   
+//    CRC for poly 0x04C11DB7
 unsigned long  CRC32_Table[ 256 ] =
 {
-	0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL, 
+	0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL,
 	0x076DC419L, 0x706AF48FL, 0xE963A535L, 0x9E6495A3L,
 	0x0EDB8832L, 0x79DCB8A4L, 0xE0D5E91EL, 0x97D2D988L,
 	0x09B64C2BL, 0x7EB17CBDL, 0xE7B82D07L, 0x90BF1D91L,
diff --git a/Core/Libraries/Source/WWVegas/WWLib/realcrc.h b/Core/Libraries/Source/WWVegas/WWLib/realcrc.h
index 347d962c005..c858e5f5836 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/realcrc.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/realcrc.h
@@ -33,17 +33,9 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef REALCRC_H
-#define REALCRC_H
 
+#pragma once
 
 unsigned long	CRC_Memory( const unsigned char *data, unsigned long length, unsigned long crc = 0 );
 unsigned long	CRC_String( const char *string, unsigned long crc = 0 );
 unsigned long	CRC_Stringi( const char *string, unsigned long crc = 0 );
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h b/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h
index 0e66d434cd6..b7063138d0c 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h
@@ -34,23 +34,14 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef REF_PTR_H
-#define REF_PTR_H
-
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
 #include "wwdebug.h"
 
 /*
 	RefCountPtr<T> is a smart pointer for reference counted objects.
-	
+
 	  RefCountPtr<T> is designed to support objects derived from RefCountClass, although any class
 	  supporting the required interface may also be used.
 
@@ -74,7 +65,7 @@
 
   Using RefCountPtr<T>
 		Example of usage :
-				
+
 				class MyClass : public RefCountClass
 				{
 					public:
@@ -138,27 +129,27 @@
 		copying.
 
 		To create a RefCountPtr<T> from a raw pointer, use the global template functions
-		Create_NEW should be used when wrapping a pointer that has just been created with NEW
-		Create_Get should be used when wrapping a pointer that has been returned from a "Get" function
+		Create_NoAddRef should be used when wrapping a pointer that has just been created with NEW
+		Create_NoAddRef should be used when wrapping a pointer that has been returned from a "Get" function
 			(the function added a reference prior to returning the pointer)
-		Create_Peek should be used when wrapping a pointer that has been returned from a "Peek" function
+		Create_AddRef should be used when wrapping a pointer that has been returned from a "Peek" function
 			(the function did not add a reference prior to returning the pointer).
 
-		Create_Get and Create_Peek are provided to allow old code to migrate from manual reference count
+		Create_NoAddRef and Create_AddRef are provided to allow old code to migrate from manual reference count
 		management to RefCountPtr.  New code written with RefCountPtr should rarely if ever use
-		Create_Get and Create_Peek.
+		Create_NoAddRef and Create_AddRef.
 
 		If it is absolutely necessary to extract the raw pointer, use Peek.  Peek does not add a new
 		reference to the object.  Using a Peek'd object after its RefCountPtr has gone out of scope requires
 		care and typically requires the client to Add_Ref/Release_Ref the Peek'd object.
 
 		Rewrapping and Peeking reference counted objects is primarily useful when converting old code to
-		use RefCountPtr instead of manually managing the reference count.  These two functions are designed 
+		use RefCountPtr instead of manually managing the reference count.  These two functions are designed
 		for safety, NOT convenience.
 
-		Automatic construction of a RefCountPtr from a raw pointer is enabled if 
+		Automatic construction of a RefCountPtr from a raw pointer is enabled if
 		ALLOW_AUTOMATIC_REF_COUNT_PTR_CONSTRUCTION is defined.
-		This may be useful when migrating existing code to use RefCountPtr, but is completely safe,
+		This may be useful when migrating existing code to use RefCountPtr, but is not completely safe,
 		since it is not possible to determine if the pointer is being Get'd or Peek'd.
 		Please note that the constructor WILL add a reference to the object, which errs on the side
 		of leaking references rather than prematurely deleting objects.  Whenever possible, use the
@@ -205,7 +196,7 @@
 							// Get using an OUT parameter
 							void Get(RefCountPtr<T> & thing)
 							{
-								thing = MyThing;								
+								thing = MyThing;
 							}
 
 							// Get using a return value.  Preferable to above
@@ -216,7 +207,6 @@
 					};
 */
 
-#define ALLOW_AUTOMATIC_REF_COUNT_PTR_CONSTRUCTION
 
 class DummyPtrType;
 
@@ -224,22 +214,23 @@ template <class T>
 class RefCountPtr
 {
 	public:
-		friend RefCountPtr<T> Create_NEW(T *t) 
-		{
-		  return RefCountPtr<T>(t, RefCountPtr<T>::GET);
-		}
 
-		friend RefCountPtr<T> Create_Get(T *t)
+		// Creates a RefCountPtr<T> and does not increment the reference counter of the passed object.
+		// Is generally used for objects returned by operator new and "Get" functions.
+		static RefCountPtr<T> Create_NoAddRef(T *t)
 		{
+			WWASSERT(t == NULL || t->Num_Refs() >= 1);
 			return RefCountPtr<T>(t, RefCountPtr<T>::GET);
 		}
 
-		friend RefCountPtr<T> Create_Peek(T *t)
+		// Creates a RefCountPtr<T> and increments the reference counter of the passed object.
+		// Is generally used for objects returned by "Peek" functions.
+		static RefCountPtr<T> Create_AddRef(T *t)
 		{
 			return RefCountPtr<T>(t, RefCountPtr<T>::PEEK);
 		}
 
-		RefCountPtr(void) 
+		RefCountPtr(void)
 			: Referent(0)
 		{
 		}
@@ -373,20 +364,28 @@ class RefCountPtr
 
 		T & operator *(void) const
 		{
-			G_ASSERT(0 != Referent);
+			WWASSERT(0 != Referent);
 			return *Referent;
 		}
 
-		// Note : This should typiccally only be used when mixing code that uses RefCountPtr and 
+		// Note : This should typically only be used when mixing code that uses RefCountPtr and
 		//   manually managed ref counts on raw points.
-		// Code that consistently uses RefCountPtr should never get ahold of a raw T*
+		// Code that consistently uses RefCountPtr should never get a hold of a raw T*
 		T * Peek(void) const
 		{
 			return Referent;
 		}
 
+		// Releases the held pointer without changing its reference counter.
+		T * Release(void)
+		{
+			T * p = Referent;
+			Referent = 0;
+			return p;
+		}
+
 	private:
-		enum ReferenceHandling { GET, PEEK};
+		enum ReferenceHandling { GET, PEEK };
 
 		RefCountPtr(T * referent, ReferenceHandling reference_handling)
 			: Referent(referent)
@@ -436,13 +435,11 @@ bool operator !=(DummyPtrType * dummy, const RefCountPtr<RHS> & rhs)
 		return true;
 	}
 
-	return 0 != rhs.Peek();	
+	return 0 != rhs.Peek();
 }
 
 template <class Derived, class Base>
-RefCountPtr<Derived> Static_Cast(const RefCountPtr<Base> & base) 
+RefCountPtr<Derived> Static_Cast(const RefCountPtr<Base> & base)
 {
-	return Create_Peek((Derived *)base.Peek());
+	return RefCountPtr<Derived>::Create_AddRef((Derived *)base.Peek());
 }
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/refcount.cpp b/Core/Libraries/Source/WWVegas/WWLib/refcount.cpp
index 8b0fdecba37..01f16cc45c1 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/refcount.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/refcount.cpp
@@ -41,10 +41,10 @@
 
 #include "refcount.h"
 
-// TheSuperHackers @compile feliwir 17/04/2025 include __debugbreak macros
+// TheSuperHackers @build feliwir 17/04/2025 include __debugbreak macros
 #include <Utility/intrin_compat.h>
 
-#ifndef NDEBUG
+#ifdef RTS_DEBUG
 
 // #define PARANOID_REFCOUNTS
 
@@ -68,9 +68,9 @@ RefCountListClass			RefCountClass::ActiveRefList;
  * HISTORY:                                                                                    *
  *   3/16/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-RefCountClass *	RefCountClass::Add_Active_Ref(RefCountClass *obj) 
-{ 
-	ActiveRefList.Add_Head(&(obj->ActiveRefNode)); 
+RefCountClass *	RefCountClass::Add_Active_Ref(RefCountClass *obj)
+{
+	ActiveRefList.Add_Head(&(obj->ActiveRefNode));
 	obj->ActiveRefInfo.File = NULL;	// default to no debug information added.
 	obj->ActiveRefInfo.Line = 0;
 	return obj;
@@ -88,15 +88,15 @@ RefCountClass *	RefCountClass::Add_Active_Ref(RefCountClass *obj)
  * HISTORY:                                                                                    *
  *   3/16/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-RefCountClass *	RefCountClass::Set_Ref_Owner(RefCountClass *obj,const char * file,int line) 
-{ 
+RefCountClass *	RefCountClass::Set_Ref_Owner(RefCountClass *obj,const char * file,int line)
+{
 //	static RefCountClass *hunt = (RefCountClass *)0x06558890;
 	static RefCountClass *hunt = (RefCountClass *)0x0;
 	if (obj == hunt) {
 		assert(0);
 	}
-	obj->ActiveRefInfo.File = file; 
-	obj->ActiveRefInfo.Line = line; 
+	obj->ActiveRefInfo.File = file;
+	obj->ActiveRefInfo.Line = line;
 	return obj;
 }
 
@@ -113,12 +113,12 @@ RefCountClass *	RefCountClass::Set_Ref_Owner(RefCountClass *obj,const char * fil
  * HISTORY:                                                                                    *
  *   3/16/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-void RefCountClass::Remove_Active_Ref(RefCountClass * obj) 
-{ 
+void RefCountClass::Remove_Active_Ref(RefCountClass * obj)
+{
 #ifdef PARANOID_REFCOUNTS
 	assert(Validate_Active_Ref(obj));
 #endif
-	obj->ActiveRefNode.Unlink(); 
+	obj->ActiveRefNode.Unlink();
 }
 
 /***********************************************************************************************
@@ -161,17 +161,15 @@ void	RefCountClass::Inc_Total_Refs(const RefCountClass * obj)
 	assert(Validate_Active_Ref(obj));
 #endif
 	TotalRefs++;
-
 }
 
 // SKB 7/21/99 Set BreakOnRefernce to a pointer and it will break when called.
 //					This is used for debugging, please do not deleted.
 RefCountClass* BreakOnReference = 0;
 
-#ifndef NDEBUG
-void RefCountClass::Add_Ref(void) const								
-{ 
-	NumRefs++;  	  
+void RefCountClass::Add_Ref(void) const
+{
+	NumRefs++;
 
 	// See if programmer set break on for a specific address.
 	if (this == BreakOnReference) {
@@ -179,7 +177,6 @@ void RefCountClass::Add_Ref(void) const
 	}
 	Inc_Total_Refs(this);
 }
-#endif																		
 
 /***********************************************************************************************
  * RefCountClass::Validate_Active_Ref -- decrements the total reference count                   *
@@ -206,8 +203,4 @@ void	RefCountClass::Dec_Total_Refs(const RefCountClass * obj)
 	}
 }
 
-
-
-#endif
-
-
+#endif // RTS_DEBUG
diff --git a/Core/Libraries/Source/WWVegas/WWLib/refcount.h b/Core/Libraries/Source/WWVegas/WWLib/refcount.h
index 340f78b58de..9e39b9ba02f 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/refcount.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/refcount.h
@@ -33,25 +33,17 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
+
 #pragma once
-#endif // _MSC_VER >= 1000
- 
-#ifndef REFCOUNT_H
-#define REFCOUNT_H
 
-#ifndef ALWAYS_H
-#include "always.h"
-#endif
+#include "LISTNODE.h"
+#include "WWDebug/wwdebug.h"
 
-#ifndef LISTNODE_H
-#include "LISTNODE.H"
-#endif
 
 class RefCountClass;
 
 
-#ifndef NDEBUG
+#ifdef RTS_DEBUG
 
 struct ActiveRefStruct
 {
@@ -59,15 +51,7 @@ struct ActiveRefStruct
 	int						Line;
 };
 
-#define	NEW_REF( C, P )						( (C*)RefCountClass::Set_Ref_Owner( W3DNEW C P, __FILE__, __LINE__ ) )
-#define	SET_REF_OWNER( P )				(		RefCountClass::Set_Ref_Owner( P,       __FILE__, __LINE__ ) )
-
-#else
-
-#define	NEW_REF( C, P )					( W3DNEW C P )
-#define	SET_REF_OWNER( P )			P
-
-#endif
+#endif // RTS_DEBUG
 
 
 /*
@@ -77,7 +61,7 @@ struct ActiveRefStruct
 ** point it at the new object, and add-ref the new object (if its not null...)
 */
 #define REF_PTR_SET(dst,src)	{ if (src) (src)->Add_Ref(); if (dst) (dst)->Release_Ref(); (dst) = (src); }
-#define REF_PTR_RELEASE(x)		{ if (x) x->Release_Ref(); x = NULL; }
+#define REF_PTR_RELEASE(x)		{ if (x) x->Release_Ref(); x = nullptr; }
 
 
 /*
@@ -101,60 +85,71 @@ struct ActiveRefStruct
 typedef DataNode<RefCountClass *>	RefCountNodeClass;
 typedef List<RefCountNodeClass *>	RefCountListClass;
 
+/*
+** Note that Add_Ref and Release_Ref are always const, because copying, destroying and reference
+** counting const objects is meant to work.
+*/
 class RefCountClass
 {
 public:
-	
-	RefCountClass(void) :
-		NumRefs(1)
-		#ifndef NDEBUG
-		,ActiveRefNode(this)
-		#endif
+
+	RefCountClass(void)
+		: NumRefs(1)
+#ifdef RTS_DEBUG
+		, ActiveRefNode(this)
+#endif
 	{
-		#ifndef NDEBUG
+#ifdef RTS_DEBUG
 		Add_Active_Ref(this);
 		Inc_Total_Refs(this);
-		#endif
+#endif
 	}
 
-	RefCountClass(const RefCountClass & ) : 
-		NumRefs(1)		
-		#ifndef NDEBUG
-		,ActiveRefNode(this)
-		#endif
-	{ 		
-		#ifndef NDEBUG
+	/*
+	** The reference counter value cannot be copied.
+	*/
+	RefCountClass(const RefCountClass & )
+		: NumRefs(1)
+#ifdef RTS_DEBUG
+		, ActiveRefNode(this)
+#endif
+	{
+#ifdef RTS_DEBUG
 		Add_Active_Ref(this);
 		Inc_Total_Refs(this);
-		#endif
+#endif
 	}
 
+	RefCountClass& operator=(const RefCountClass&) { return *this; }
+
 	/*
 	** Add_Ref, call this function if you are going to keep a pointer
 	** to this object.
 	*/
-#ifdef NDEBUG
-	WWINLINE void Add_Ref(void) const							{ NumRefs++; }
-#else
+#ifdef RTS_DEBUG
 	void Add_Ref(void) const;
+#else
+	void Add_Ref(void) const							{ NumRefs++; }
 #endif
 
 	/*
 	** Release_Ref, call this function when you no longer need the pointer
 	** to this object.
 	*/
-	WWINLINE void		Release_Ref(void) const					{ 
-																				#ifndef NDEBUG
-																				Dec_Total_Refs(this);
-																				#endif
-																				NumRefs--; 
-																				assert(NumRefs >= 0); 
-																				if (NumRefs == 0) const_cast<RefCountClass*>(this)->Delete_This(); 
-																			}
+	void Release_Ref(void) const
+	{
+#ifdef RTS_DEBUG
+		Dec_Total_Refs(this);
+#endif
+		NumRefs--;
+		WWASSERT(NumRefs >= 0);
+		if (NumRefs == 0)
+			const_cast<RefCountClass*>(this)->Delete_This();
+	}
 
 
 	/*
-	** Check the number of references to this object.  
+	** Check the number of references to this object.
 	*/
 	int					Num_Refs(void) const						{ return NumRefs; }
 
@@ -168,7 +163,7 @@ class RefCountClass
 	/*
 	** Total_Refs - This static function can be used to get the total number
 	** of references that have been made.  Once you've released all of your
-	** objects, it should go to zero.  
+	** objects, it should go to zero.
 	*/
 	static int			Total_Refs(void)							{ return TotalRefs; }
 
@@ -179,10 +174,10 @@ class RefCountClass
 	*/
 	virtual ~RefCountClass(void)
 	{
-		#ifndef NDEBUG
-		Remove_Active_Ref(this);	
-		#endif
-		assert(NumRefs == 0);
+#ifdef RTS_DEBUG
+		Remove_Active_Ref(this);
+#endif
+		WWASSERT(NumRefs == 0);
 	}
 
 private:
@@ -202,31 +197,31 @@ class RefCountClass
 	** increments the total reference count
 	*/
 	static void			Inc_Total_Refs(const RefCountClass *);
-	
+
 	/*
 	** decrements the total reference count
 	*/
 	static void			Dec_Total_Refs(const RefCountClass *);
 
 public:
-	
-#ifndef NDEBUG // Debugging stuff
+
+#ifdef RTS_DEBUG // Debugging stuff
 
 	/*
 	** Node in the Active Refs List
 	*/
 	RefCountNodeClass					ActiveRefNode;
-	
+
 	/*
 	** Auxiliary Active Ref Data
 	*/
-	ActiveRefStruct					ActiveRefInfo;	
+	ActiveRefStruct					ActiveRefInfo;
 
 	/*
 	** List of the active referenced objects
 	*/
 	static RefCountListClass		ActiveRefList;
-	
+
 	/*
 	** Adds the ref obj pointer to the active ref list
 	*/
@@ -247,10 +242,74 @@ class RefCountClass
 	*/
 	static bool							Validate_Active_Ref(RefCountClass * obj);
 
-#endif
+#endif // RTS_DEBUG
 
 };
 
 
+/*
+** This template class is meant to be used as a class member for compact reference counter placements.
+** A 1 byte reference counter can be alright if the counter is not reaching the value limits.
+*
+** Note that Add_Ref and Release_Ref are always const, because copying, destroying and reference
+** counting const objects is meant to work.
+*/
+template <typename IntegerType>
+class RefCountValue
+{
+public:
+
+	RefCountValue(void)
+		: NumRefs(1)
+	{
+	}
 
-#endif
+	~RefCountValue(void)
+	{
+		WWASSERT(NumRefs == IntegerType(0));
+	}
+
+	/*
+	** The reference counter value cannot be copied.
+	*/
+	RefCountValue(const RefCountValue&) : NumRefs(1) {}
+	RefCountValue& operator=(const RefCountValue&) { return *this; }
+
+	/*
+	** Add_Ref, call this function if you are going to keep a pointer to this object.
+	*/
+	void Add_Ref(void) const
+	{
+		WWASSERT(NumRefs != ~IntegerType(0));
+		++NumRefs;
+	}
+
+	/*
+	** Release_Ref, call this function when you no longer need the pointer to this object.
+	** You can pass a static function of type void(*)(DeleteType*) or 'operator delete'.
+	**
+	** Note that this function takes a const ObjectType*, because this function is expected
+	** to be called from within a const function as well.
+	*/
+	template <typename DeleteFunction, typename ObjectType>
+	void Release_Ref(DeleteFunction deleteFunction, const ObjectType* objectToDelete) const
+	{
+		WWASSERT(NumRefs != IntegerType(0));
+		if (--NumRefs == IntegerType(0))
+		{
+			deleteFunction(const_cast<ObjectType*>(objectToDelete));
+		}
+	}
+
+	/*
+	** Check the number of references to this object.
+	*/
+	IntegerType Num_Refs(void) const
+	{
+		return NumRefs;
+	}
+
+private:
+
+	mutable IntegerType NumRefs;
+};
diff --git a/Core/Libraries/Source/WWVegas/WWLib/regexpr.h b/Core/Libraries/Source/WWVegas/WWLib/regexpr.h
index 85dba66f7b4..307ae03974b 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/regexpr.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/regexpr.h
@@ -18,13 +18,7 @@
 
 // regexpr.h
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef REGEXPR_H
-#define REGEXPR_H
-
 
 /*
 ** RegularExpressionClass - This class encapsulates regular expression
@@ -76,7 +70,3 @@ class RegularExpressionClass
 	struct DataStruct;
 	DataStruct	*Data;
 };
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/registry.cpp b/Core/Libraries/Source/WWVegas/WWLib/registry.cpp
index cabbd36243f..15ec71602fc 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/registry.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/registry.cpp
@@ -34,8 +34,8 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "registry.h"
-#include "RAWFILE.H"
-#include "INI.H"
+#include "RAWFILE.h"
+#include "INI.h"
 #include "inisup.h"
 #include <assert.h>
 #include <windows.h>
@@ -386,7 +386,7 @@ void RegistryClass::Save_Registry_Values(HKEY key, char *path, INIClass *ini)
 				*/
 				case REG_DWORD:
 					strcpy(save_name, "DWORD_");
-					strcat(save_name, value_name);
+					strlcat(save_name, value_name, ARRAY_SIZE(save_name));
 					ini->Put_Int(path, save_name, *((unsigned long*)data));
 					break;
 
@@ -395,7 +395,7 @@ void RegistryClass::Save_Registry_Values(HKEY key, char *path, INIClass *ini)
 				*/
 				case REG_SZ:
 					strcpy(save_name, "STRING_");
-					strcat(save_name, value_name);
+					strlcat(save_name, value_name, ARRAY_SIZE(save_name));
 					ini->Put_String(path, save_name, (char*)data);
 					break;
 
@@ -404,7 +404,7 @@ void RegistryClass::Save_Registry_Values(HKEY key, char *path, INIClass *ini)
 				*/
 				case REG_BINARY:
 					strcpy(save_name, "BIN_");
-					strcat(save_name, value_name);
+					strlcat(save_name, value_name, ARRAY_SIZE(save_name));
 					ini->Put_UUBlock(path, save_name, (char*)data, data_size);
 					break;
 
@@ -470,9 +470,9 @@ void RegistryClass::Save_Registry_Tree(char *path, INIClass *ini)
 				** See if there are sub keys.
 				*/
 				char new_key_path[512];
-				strcpy(new_key_path, path);
-				strcat(new_key_path, "\\");
-				strcat(new_key_path, name);
+				strlcpy(new_key_path, path, ARRAY_SIZE(new_key_path));
+				strlcat(new_key_path, "\\", ARRAY_SIZE(new_key_path));
+				strlcat(new_key_path, name, ARRAY_SIZE(new_key_path));
 
 				unsigned long num_subs = 0;
 				unsigned long num_values = 0;
@@ -564,10 +564,10 @@ void RegistryClass::Load_Registry(const char *filename, char *old_path, char *ne
 			** Build the new path to use in the registry.
 			*/
 			char *section_name = section->Section;
-			strcpy(path, new_path);
+			strlcpy(path, new_path, ARRAY_SIZE(path));
 			char *cut = strstr(section_name, old_path);
 			if (cut) {
-				strcat(path, cut + old_path_len);
+				strlcat(path, cut + old_path_len, ARRAY_SIZE(path));
 			}
 
 			/*
@@ -693,9 +693,9 @@ void RegistryClass::Delete_Registry_Tree(char *path)
 					** See if there are sub keys.
 					*/
 					char new_key_path[512];
-					strcpy(new_key_path, path);
-					strcat(new_key_path, "\\");
-					strcat(new_key_path, name);
+					strlcpy(new_key_path, path, ARRAY_SIZE(new_key_path));
+					strlcat(new_key_path, "\\", ARRAY_SIZE(new_key_path));
+					strlcat(new_key_path, name, ARRAY_SIZE(new_key_path));
 
 					unsigned long num_subs = 0;
 					unsigned long num_values = 0;
diff --git a/Core/Libraries/Source/WWVegas/WWLib/registry.h b/Core/Libraries/Source/WWVegas/WWLib/registry.h
index fe33f930849..0e83f40f89c 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/registry.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/registry.h
@@ -33,18 +33,10 @@
  *---------------------------------------------------------------------------------------------*
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef REGISTRY_H
-#define REGISTRY_H
-
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
-#include "Vector.H"
+#include "Vector.h"
 #include "wwstring.h"
 #include "widestring.h"
 
@@ -123,5 +115,3 @@ class	RegistryClass {
 	//
 	static bool IsLocked;
 };
-
-#endif // REGISTRY_H
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/search.h b/Core/Libraries/Source/WWVegas/WWLib/search.h
index f981a48d05c..35a7d9032e2 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/search.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/search.h
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/SEARCH.H                                  $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/SEARCH.h                                  $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   IndexClass<T>::Add_Index -- Add element to index tracking system.                         *
  *   IndexClass<T>::Clear -- Clear index handler to empty state.                               *
  *   IndexClass<T>::Count -- Fetch the number of index entries recorded.                       *
@@ -49,8 +49,7 @@
  *   compfunc -- Support function for bsearch and bsort.                                       *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef SEARCH_H
-#define SEARCH_H
+#pragma once
 
 /*
 **	The "bool" integral type was defined by the C++ comittee in
@@ -692,8 +691,3 @@ IndexClass<T>::NodeElement const * IndexClass<T>::Search_For_Node(int id) const
 	node.ID = id;
 	return((NodeElement const *)bsearch(&node, &IndexTable[0], IndexCount, sizeof(IndexTable[0]), search_compfunc));
 }
-
-
-#endif
-
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h
index 8a6fddf751c..05f75027b6c 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h
@@ -16,30 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/wwlib/sharebuf.h         $* 
- *                                                                         * 
- *                      $Author:: Greg_h                                  $* 
- *                                                                         * 
- *                     $Modtime:: 3/20/01 1:24p                           $* 
- *                                                                         * 
- *                    $Revision:: 8                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/wwlib/sharebuf.h         $*
+ *                                                                         *
+ *                      $Author:: Greg_h                                  $*
+ *                                                                         *
+ *                     $Modtime:: 3/20/01 1:24p                           $*
+ *                                                                         *
+ *                    $Revision:: 8                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
+
 #pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef SHAREBUF_H
-#define SHAREBUF_H
-#include "refcount.h"
+#include "always.h"
 
 
 /*
@@ -68,7 +65,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass
 		const T &	Get_Element(int index) const;
 		T &			Get_Element(int index);
 
-		// Clear the memory in this array.  
+		// Clear the memory in this array.
 		// CAUTION! Be careful calling this if 'T' is a class.  You could be wiping out
 		// virtual function table pointers.  Not a good idea to memset 0 over the top of
 		// an array of objects but useful if you are creating an array of some basic type
@@ -77,7 +74,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass
 
 	protected:
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) 
+#if defined(RTS_DEBUG)
 		const char* Msg;
 #endif
 		T *			Array;
@@ -90,7 +87,7 @@ class ShareBufferClass : public W3DMPO, public RefCountClass
 template <class T>
 ShareBufferClass<T>::ShareBufferClass(int count, const char* msg) :
 	Count(count)
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) 
+#if defined(RTS_DEBUG)
 	, Msg(msg)
 #endif
 {
@@ -98,12 +95,12 @@ ShareBufferClass<T>::ShareBufferClass(int count, const char* msg) :
 	Array = MSGW3DNEWARRAY(msg) T[Count];
 }
 
-template <class T> 
+template <class T>
 ShareBufferClass<T>::ShareBufferClass(const ShareBufferClass<T> & that) :
 	Count(that.Count)
 {
 	assert(Count > 0);
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) 
+#if defined(RTS_DEBUG)
 	Msg = that.Msg;
 #endif
 	Array = MSGW3DNEWARRAY(Msg) T[Count];
@@ -115,10 +112,8 @@ ShareBufferClass<T>::ShareBufferClass(const ShareBufferClass<T> & that) :
 template <class T>
 ShareBufferClass<T>::~ShareBufferClass(void)
 {
-	if (Array) {
-		delete[] Array;
-		Array = NULL;
-	}
+	delete[] Array;
+	Array = NULL;
 }
 
 template<class T>
@@ -130,7 +125,7 @@ void ShareBufferClass<T>::Set_Element(int index,const T & thing)
 }
 
 template<class T>
-const T& ShareBufferClass<T>::Get_Element(int index) const 
+const T& ShareBufferClass<T>::Get_Element(int index) const
 {
 	return Array[index];
 }
@@ -146,6 +141,3 @@ void ShareBufferClass<T>::Clear(void)
 {
 	memset(Array,0,Count * sizeof(T));
 }
-
-
-#endif // SHAREBUF_H
diff --git a/Core/Libraries/Source/WWVegas/WWLib/simplevec.h b/Core/Libraries/Source/WWVegas/WWLib/simplevec.h
index 064d84e7135..ae2c6bc5a75 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/simplevec.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/simplevec.h
@@ -44,19 +44,13 @@
  *   SimpleDynVecClass<T>::Add -- Add an item to the end of the array                          *
  *   SimpleDynVecClass<T>::Delete -- Delete an item from the array                             *
  *   SimpleDynVecClass<T>::Delete_Range -- delete several items from the array                 *
- *   SimpleDynVecClass<T>::Delete_All -- delete all items from the array                       * 
+ *   SimpleDynVecClass<T>::Delete_All -- delete all items from the array                       *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SIMPLEVEC_H
-#define SIMPLEVEC_H
 
 #include "always.h"
 #include <assert.h>
-#include <string.h>		// for memmove
 
 
 #if (_MSC_VER >= 1200)
@@ -64,10 +58,10 @@
 #pragma warning (disable:4702)	// disabling the "unreachable code" warning.
 #endif
 
-/** 
+/**
 ** SimpleVecClass
 ** This is a template similar to VectorClass (found in Vector.h) except that it is designed
-** specifically to work with data types that are "memcopy-able".  
+** specifically to work with data types that are "memcopy-able".
 ** DON'T USE THIS TEMPLATE IF YOUR CLASS REQUIRES A DESTRUCTOR!!!
 */
 template <class T> class SimpleVecClass
@@ -77,7 +71,7 @@ template <class T> class SimpleVecClass
 	SimpleVecClass(int size = 0);
 	virtual ~SimpleVecClass(void);
 
-	T & operator[](int index)					{ assert(index < VectorMax); return(Vector[index]); } 
+	T & operator[](int index)					{ assert(index < VectorMax); return(Vector[index]); }
 	T const & operator[](int index) const	{ assert(index < VectorMax); return(Vector[index]); }
 
 	int				Length(void) const		{ return VectorMax; }
@@ -86,7 +80,7 @@ template <class T> class SimpleVecClass
 	void				Zero_Memory(void)			{ if (Vector != NULL) { memset(Vector,0,VectorMax * sizeof(T)); } }
 
 protected:
-	
+
 	T *				Vector;
 	int				VectorMax;
 };
@@ -114,7 +108,7 @@ inline SimpleVecClass<T>::SimpleVecClass(int size) :
 		Resize(size);
 	}
 }
-	
+
 /***********************************************************************************************
  * SimpleVecClass<T>::~SimpleVecClass -- Destructor                                            *
  *                                                                                             *
@@ -130,11 +124,9 @@ inline SimpleVecClass<T>::SimpleVecClass(int size) :
 template<class T>
 inline SimpleVecClass<T>::~SimpleVecClass(void)
 {
-	if (Vector != NULL) {
-		delete[] Vector;
-		Vector = NULL;
-		VectorMax = 0;
-	}
+	delete[] Vector;
+	Vector = NULL;
+	VectorMax = 0;
 }
 
 /***********************************************************************************************
@@ -155,7 +147,7 @@ inline bool SimpleVecClass<T>::Resize(int newsize)
 	if (newsize == VectorMax) {
 		return true;
 	}
-	
+
 	if (newsize > 0) {
 
 		/*
@@ -194,11 +186,9 @@ inline bool SimpleVecClass<T>::Resize(int newsize)
 		/*
 		** Delete entire vector and reset counts
 		*/
+		delete[] Vector;
+		Vector = NULL;
 		VectorMax = 0;
-		if (Vector != NULL) {
-			delete[] Vector;
-			Vector = NULL;
-		}
 	}
 	return true;
 }
@@ -223,7 +213,7 @@ inline bool SimpleVecClass<T>::Uninitialised_Grow(int newsize)
 	if (newsize <= VectorMax) {
 		return true;
 	}
-	
+
 	if (newsize > 0) {
 
 		/*
@@ -266,7 +256,7 @@ template <class T> class SimpleDynVecClass : public SimpleVecClass<T>
 
 	// Array-like access (does not grow)
 	int				Count(void) const						{ return(ActiveCount); }
-	T &				operator[](int index)				{ assert(index < ActiveCount); return(Vector[index]); } 
+	T &				operator[](int index)				{ assert(index < ActiveCount); return(Vector[index]); }
 	T const &		operator[](int index) const		{ assert(index < ActiveCount); return(Vector[index]); }
 
 	// Change maximum size of vector
@@ -330,10 +320,8 @@ inline SimpleDynVecClass<T>::SimpleDynVecClass(int size) :
 template<class T>
 inline SimpleDynVecClass<T>::~SimpleDynVecClass(void)
 {
-	if (Vector != NULL) {
-		delete[] Vector;
-		Vector = NULL;
-	}
+	delete[] Vector;
+	Vector = NULL;
 }
 
 /***********************************************************************************************
@@ -376,7 +364,7 @@ template<class T>
 inline bool SimpleDynVecClass<T>::Add(T const & object,int new_size_hint)
 {
 	if (ActiveCount >= VectorMax) {
-		
+
 		/*
 		** We are out of space so tell the vector to grow
 		*/
@@ -412,7 +400,7 @@ inline T *  SimpleDynVecClass<T>::Add_Multiple( int number_to_add )
 	ActiveCount += number_to_add;
 
 	if (ActiveCount >= VectorMax) {
-		
+
 		/*
 		** We are out of space so tell the vector to grow
 		*/
@@ -530,7 +518,7 @@ inline bool SimpleDynVecClass<T>::Delete_Range(int start,int count,bool allow_sh
 	if (allow_shrink) {
 		Shrink();
 	}
-	
+
 	return true;
 }
 
@@ -584,7 +572,7 @@ inline bool SimpleDynVecClass<T>::Grow(int new_size_hint)
 	*/
 	int new_size = MAX(Length() + Length()/4,Length() + 4);
 	new_size = MAX(new_size,new_size_hint);
-	
+
 	return Resize(new_size);
 }
 
@@ -645,6 +633,3 @@ inline int SimpleDynVecClass<T>::Find_Index(T const & object)
 #if (_MSC_VER >= 1200)
 #pragma warning (pop)
 #endif
-
-#endif // SIMPLEVEC_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/slnode.cpp b/Core/Libraries/Source/WWVegas/WWLib/slnode.cpp
index 32ea009d521..51240412d13 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/slnode.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/slnode.cpp
@@ -34,7 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#include "SLNODE.H"
+#include "SLNODE.h"
 
 
 
diff --git a/Core/Libraries/Source/WWVegas/WWLib/stimer.cpp b/Core/Libraries/Source/WWVegas/WWLib/stimer.cpp
index 17bf2e8bf6e..4cbf2998b5f 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/stimer.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/stimer.cpp
@@ -58,4 +58,4 @@ long SystemTimerClass::operator () (void) const
 SystemTimerClass::operator long (void) const
 {
 	return TIMEGETTIME()/16;
-}
\ No newline at end of file
+}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/stimer.h b/Core/Libraries/Source/WWVegas/WWLib/stimer.h
index 8d62d2c861f..5fb4e28c513 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/stimer.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/stimer.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/STIMER.H                                  $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/STIMER.h                                  $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef STIMER_H
-#define STIMER_H
+#pragma once
 
 /****************************************************************************
 **	Timer constants. These are used when setting the countdown timer.
@@ -61,5 +60,3 @@ class SystemTimerClass
 		long operator () (void) const;
 		operator long (void) const;
 };
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/straw.cpp b/Core/Libraries/Source/WWVegas/WWLib/straw.cpp
index a22f64b43de..a18068ad8e1 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/straw.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/straw.cpp
@@ -16,31 +16,30 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/STRAW.CPP                                          $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/STRAW.cpp                                          $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/15/99 10:16a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   Straw::Get_From -- Connect one straw segment to another.                                  *
  *   Straw::Get -- Fetch some data from the straw chain.                                       *
  *   Straw::~Straw -- Destructor for a straw segment.                                          *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"always.h"
-#include	"STRAW.H"
+#include "STRAW.h"
 #include	<stddef.h>
-//#include	<string.h>
 
 
 /***********************************************************************************************
diff --git a/Core/Libraries/Source/WWVegas/WWLib/stringex.h b/Core/Libraries/Source/WWVegas/WWLib/stringex.h
new file mode 100644
index 00000000000..8e23b0227a5
--- /dev/null
+++ b/Core/Libraries/Source/WWVegas/WWLib/stringex.h
@@ -0,0 +1,302 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "bittype.h"
+#include <string.h>
+#include <ctype.h>
+
+
+// Declaration
+
+template<typename T> size_t strlen_t(const T *str);
+template<typename T> size_t strnlen_t(const T *str, size_t maxlen);
+
+#if defined(_MSC_VER) && _MSC_VER < 1300
+size_t strnlen(const char *str, size_t maxlen);
+size_t wcsnlen(const wchar_t *str, size_t maxlen);
+#endif
+
+template<typename T> size_t strlcpy_t(T *dst, const T *src, size_t dstsize);
+template<typename T> size_t strlcat_t(T *dst, const T *src, size_t dstsize);
+
+size_t strlcpy(char *dst, const char *src, size_t dstsize);
+size_t strlcat(char *dst, const char *src, size_t dstsize);
+size_t wcslcpy(wchar_t *dst, const wchar_t *src, size_t dstsize);
+size_t wcslcat(wchar_t *dst, const wchar_t *src, size_t dstsize);
+
+template<typename T> size_t strlmove_t(T *dst, const T *src, size_t dstsize);
+template<typename T> size_t strlmcat_t(T *dst, const T *src, size_t dstsize);
+
+size_t strlmove(char *dst, const char *src, size_t dstsize);
+size_t strlmcat(char *dst, const char *src, size_t dstsize);
+size_t wcslmove(wchar_t *dst, const wchar_t *src, size_t dstsize);
+size_t wcslmcat(wchar_t *dst, const wchar_t *src, size_t dstsize);
+
+#if !(defined(_MSC_VER) && _MSC_VER < 1300)
+template<size_t Size> size_t strlcpy_t(char (&dst)[Size], const char *src);
+template<size_t Size> size_t strlcat_t(char (&dst)[Size], const char *src);
+template<size_t Size> size_t strlmove_t(char (&dst)[Size], const char *src);
+template<size_t Size> size_t strlmcat_t(char (&dst)[Size], const char *src);
+#endif
+
+template<typename T> int strncmp_t(const T *str1, const T *str2, size_t maxcount);
+template<typename T> int strnicmp_t(const T* str1, const T* str2, size_t maxcount);
+
+template<typename T> bool startsWith(const T *str, const T *prefix);
+template<typename T> bool startsWithNoCase(const T *str, const T *prefix);
+template<typename T> bool endsWithNoCase(const T *str, const T *suffix);
+template<typename T> bool endsWithNoCase(const T *str, const T *suffix);
+
+
+// Implementation
+
+// Templated strlen.
+// Returns the number of characters until the first zero character.
+template<typename T> size_t strlen_t(const T *str)
+{
+	const T* begin = str;
+	while (*str)
+		++str;
+	return static_cast<size_t>(str - begin);
+}
+
+// Templated strlen.
+// Returns the number of characters until the first zero character or when maxlen is reached.
+template<typename T> size_t strnlen_t(const T *str, size_t maxlen)
+{
+	const T* begin = str;
+	const T* end = str + maxlen;
+	while (str < end && *str)
+		++str;
+	return static_cast<size_t>(str - begin);
+}
+
+#if defined(_MSC_VER) && _MSC_VER < 1300
+inline size_t strnlen(const char *str, size_t maxlen) { return strnlen_t(str, maxlen); }
+inline size_t wcsnlen(const wchar_t *str, size_t maxlen) { return strnlen_t(str, maxlen); }
+#endif
+
+// Templated strlcpy. Prefer using this over strncpy.
+// Copies src into dst until dstsize minus one. Always null terminates.
+// Returns the length of src, excluding the null terminator.
+template<typename T> size_t strlcpy_t(T *dst, const T *src, size_t dstsize)
+{
+	const size_t srclen = strlen_t(src);
+	if (dstsize != 0)
+	{
+		size_t copylen = (srclen >= dstsize) ? dstsize - 1 : srclen;
+		memcpy(dst, src, copylen * sizeof(T));
+		dst[copylen] = T(0);
+	}
+	return srclen; // length tried to create
+}
+
+// Templated strlcat. Prefer using this over strncpy.
+// Appends src into dst until dstsize minus one. Always null terminates.
+// Returns the length of dst + src, excluding the null terminator.
+template<typename T> size_t strlcat_t(T *dst, const T *src, size_t dstsize)
+{
+	const size_t dstlen = strnlen_t(dst, dstsize);
+	const size_t srclen = strlen_t(src);
+	if (dstlen == dstsize)
+	{
+		return dstsize + srclen; // no space to append
+	}
+	size_t copylen = dstsize - dstlen - 1;
+	if (copylen > srclen)
+	{
+		copylen = srclen;
+	}
+	if (copylen > 0)
+	{
+		memcpy(dst + dstlen, src, copylen * sizeof(T));
+		dst[dstlen + copylen] = T(0);
+	}
+	return dstlen + srclen; // length tried to create
+}
+
+#ifndef HAVE_STRLCPY
+inline size_t strlcpy(char *dst, const char *src, size_t dstsize) { return strlcpy_t(dst, src, dstsize); }
+#endif
+#ifndef HAVE_STRLCAT
+inline size_t strlcat(char *dst, const char *src, size_t dstsize) { return strlcat_t(dst, src, dstsize); }
+#endif
+inline size_t wcslcpy(wchar_t *dst, const wchar_t *src, size_t dstsize) { return strlcpy_t(dst, src, dstsize); }
+inline size_t wcslcat(wchar_t *dst, const wchar_t *src, size_t dstsize) { return strlcat_t(dst, src, dstsize); }
+
+// Templated strlmove. Prefer using this over strlcpy if dst and src overlap.
+// Moves src into dst until dstsize minus one. Always null terminates.
+// Returns the length of src, excluding the null terminator.
+template<typename T> size_t strlmove_t(T *dst, const T *src, size_t dstsize)
+{
+	const size_t srclen = strlen_t(src);
+	if (dstsize > 0)
+	{
+		size_t copylen = (srclen >= dstsize) ? dstsize - 1 : srclen;
+		memmove(dst, src, copylen * sizeof(T));
+		dst[copylen] = T(0);
+	}
+	return srclen; // length tried to create
+}
+
+// Templated strlmcat. Prefer using this over strlcat if dst and src overlap.
+// Appends src into dst until dstsize minus one. Always null terminates.
+// Returns the length of dst + src, excluding the null terminator.
+template<typename T> size_t strlmcat_t(T *dst, const T *src, size_t dstsize)
+{
+	const size_t dstlen = strnlen_t(dst, dstsize);
+	const size_t srclen = strlen_t(src);
+	if (dstlen == dstsize)
+	{
+		return dstsize + srclen; // no space to append
+	}
+	size_t copylen = dstsize - dstlen - 1;
+	if (copylen > srclen)
+	{
+		copylen = srclen;
+	}
+	if (copylen > 0)
+	{
+		memmove(dst + dstlen, src, copylen * sizeof(T));
+		dst[dstlen + copylen] = T(0);
+	}
+	return dstlen + srclen; // length tried to create
+}
+
+inline size_t strlmove(char *dst, const char *src, size_t dstsize) { return strlmove_t(dst, src, dstsize); }
+inline size_t strlmcat(char *dst, const char *src, size_t dstsize) { return strlmcat_t(dst, src, dstsize); }
+inline size_t wcslmove(wchar_t *dst, const wchar_t *src, size_t dstsize) { return strlmove_t(dst, src, dstsize); }
+inline size_t wcslmcat(wchar_t *dst, const wchar_t *src, size_t dstsize) { return strlmcat_t(dst, src, dstsize); }
+
+#if !(defined(_MSC_VER) && _MSC_VER < 1300)
+template<size_t Size> size_t strlcpy_t(char (&dst)[Size], const char *src) { return strlcpy_t(dst, src, Size); }
+template<size_t Size> size_t strlcat_t(char (&dst)[Size], const char *src) { return strlcat_t(dst, src, Size); }
+template<size_t Size> size_t strlmove_t(char (&dst)[Size], const char *src) { return strlmove_t(dst, src, Size); }
+template<size_t Size> size_t strlmcat_t(char (&dst)[Size], const char *src) { return strlmcat_t(dst, src, Size); }
+#endif
+
+// Templated strncmp.
+// Compares up to maxcount chars or a null byte is encountered, whichever comes first.
+// Returns < 0 if str1 is less than str2, 0 is str1 and str2 are equal and > 0 if str2 is greater than str1.
+template<typename T> int strncmp_t(const T *str1, const T *str2, const size_t maxcount)
+{
+	for (size_t i = 0; i < maxcount; ++i)
+	{
+		const T c1 = str1[i];
+		const T c2 = str2[i];
+		const int diff = (int)c1 - (int)c2;
+		if (diff != 0)
+		{
+			return diff;
+		}
+		if (c1 == T(0)) // both c1 and c2 are null terminators
+		{
+			return 0;
+		}
+	}
+	return 0;
+}
+
+// Lower case conversion helpers
+inline char tolower_t(char c)
+{
+	// cast to unsigned char for correct behavior of tolower()
+	return (char)tolower((unsigned char)c);
+}
+
+inline wchar_t tolower_t(wchar_t c)
+{
+	return (wchar_t)towlower(c);
+}
+
+// Templated strnicmp.
+// Case insensitively compares up to maxcount chars or a null byte is encountered, whichever comes first.
+// Returns < 0 if str1 is less than str2, 0 is str1 and str2 are equal and > 0 if str2 is greater than str1.
+template<typename T> int strnicmp_t(const T *str1, const T *str2, const size_t maxcount)
+{
+	for (size_t i = 0; i < maxcount; ++i)
+	{
+		const T c1 = tolower_t(str1[i]);
+		const T c2 = tolower_t(str2[i]);
+		const int diff = (int)c1 - (int)c2;
+		if (diff != 0)
+		{
+			return diff;
+		}
+		if (c1 == T(0)) // both c1 and c2 are null terminators
+		{
+			return 0;
+		}
+	}
+	return 0;
+}
+
+template<typename T> inline bool startsWith(const T *str, const T *prefix)
+{
+	if (*prefix == T(0))
+		return true;	// everything starts with the empty string
+
+	const size_t strlen = strlen_t(str);
+	const size_t prefixlen = strlen_t(prefix);
+	if (strlen < prefixlen)
+		return false;	// prefix must be as long or shorter than str
+
+	return strncmp_t(str, prefix, prefixlen) == 0;
+}
+
+template<typename T> inline bool startsWithNoCase(const T *str, const T *prefix)
+{
+	if (*prefix == T(0))
+		return true;	// everything starts with the empty string
+
+	const size_t strlen = strlen_t(str);
+	const size_t prefixlen = strlen_t(prefix);
+	if (strlen < prefixlen)
+		return false;	// prefix must be as long or shorter than str
+
+	return strnicmp_t(str, prefix, prefixlen) == 0;
+}
+
+template<typename T> inline bool endsWith(const T *str, const T *suffix)
+{
+	if (*suffix == T(0))
+		return true;	// everything ends with the empty string
+
+	const size_t strlen = strlen_t(str);
+	const size_t suffixlen = strlen_t(suffix);
+	if (strlen < suffixlen)
+		return false;	// suffix must be as long or shorter than str
+
+	return strncmp_t(str + strlen - suffixlen, suffix, suffixlen) == 0;
+}
+
+template<typename T> inline bool endsWithNoCase(const T *str, const T *suffix)
+{
+	if (*suffix == T(0))
+		return true;	// everything ends with the empty string
+
+	const size_t strlen = strlen_t(str);
+	const size_t suffixlen = strlen_t(suffix);
+	if (strlen < suffixlen)
+		return false;	// suffix must be as long or shorter than str
+
+	return strnicmp_t(str + strlen - suffixlen, suffix, suffixlen) == 0;
+}
+
diff --git a/Core/Libraries/Source/WWVegas/WWLib/strtok_r.cpp b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.cpp
index d7cb2d73a20..e9c9faec05a 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/strtok_r.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.cpp
@@ -16,28 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /G/wwlib/strtok_r.cpp                   $* 
- *                                                                         * 
- *                      $Author:: Neal_k                                  $* 
- *                                                                         * 
- *                     $Modtime:: 4/03/00 11:43a                          $* 
- *                                                                         * 
- *                    $Revision:: 1                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- *   strtok_r -- POSIX replacement for strtok (no internal static)         * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /G/wwlib/strtok_r.cpp                   $*
+ *                                                                         *
+ *                      $Author:: Neal_k                                  $*
+ *                                                                         *
+ *                     $Modtime:: 4/03/00 11:43a                          $*
+ *                                                                         *
+ *                    $Revision:: 1                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ *   strtok_r -- POSIX replacement for strtok (no internal static)         *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "strtok_r.h"
-#include <string.h>
-#include <stdio.h>
+#include "stringex.h"
 
 //
 // Replacement for strtok() that doesn't use a static to
@@ -84,4 +83,4 @@ char *strtok_r(char *strptr, const char *delimiters, char **lasts)
 	}
 	return(retval);
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h
index a509f98c612..0d0d22d691b 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h
@@ -16,36 +16,26 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /G/wwlib/strtok_r.h                     $* 
- *                                                                         * 
- *                      $Author:: Neal_k2                                 $* 
- *                                                                         * 
- *                     $Modtime:: 4/13/00 1:33p                           $* 
- *                                                                         * 
- *                    $Revision:: 2                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /G/wwlib/strtok_r.h                     $*
+ *                                                                         *
+ *                      $Author:: Neal_k2                                 $*
+ *                                                                         *
+ *                     $Modtime:: 4/13/00 1:33p                           $*
+ *                                                                         *
+ *                    $Revision:: 2                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __STRTOK_R_H__
-#define __STRTOK_R_H__
 
 #ifndef _UNIX
 char *strtok_r(char *strptr, const char *delimiters, char **lasts);
 #endif
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/swap.h b/Core/Libraries/Source/WWVegas/WWLib/swap.h
index 073b6afaff9..b0a61e46c93 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/swap.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/swap.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/swap.h                                    $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/swap.h                                    $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef SWAP_H
-#define SWAP_H
+#pragma once
 
 /**********************************************************************
 **	Swaps two objects.
@@ -48,5 +47,3 @@ void swap(T & left, T & right)
 	left = right;
 	right = temp;
 }
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/systimer.h b/Core/Libraries/Source/WWVegas/WWLib/systimer.h
index 4c8ea01624a..56db4c64b22 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/systimer.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/systimer.h
@@ -35,6 +35,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #pragma once
+
 #ifndef _SYSTIMER_H
 
 #include "always.h"
@@ -153,4 +154,4 @@ WWINLINE unsigned long SysTimeClass::Get(void)
 
 
 
-#endif //_SYSTIMER_H
\ No newline at end of file
+#endif //_SYSTIMER_H
diff --git a/Core/Libraries/Source/WWVegas/WWLib/textfile.cpp b/Core/Libraries/Source/WWVegas/WWLib/textfile.cpp
index 320ce9b39ae..bc36014894c 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/textfile.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/textfile.cpp
@@ -16,18 +16,18 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/textfile.cpp                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/textfile.cpp                           $*
+ *                                                                                             *
  *                      $Author:: Patrick                   $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/26/01 9:37p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 4                                                           $*
  *                                                                                             *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
@@ -93,21 +93,21 @@ TextFileClass::Read_Line (StringClass &string)
 		//
 		// Read a chunk of characters from the file
 		//
-		int size = Read (buffer, BUFFER_SIZE - 1);		
+		int size = Read (buffer, BUFFER_SIZE - 1);
 
 		//
-		// Keep going if we still have more data to 
+		// Keep going if we still have more data to
 		// read from the file
 		//
 		keep_going = (size == BUFFER_SIZE - 1);
-		if (size > 0) {			
-			
+		if (size > 0) {
+
 			//
 			// Try to find the linefeed character
 			//
 			for (int index = 0; index < size; index ++) {
 				if (buffer[index] == '\n') {
-					
+
 					//
 					// Terminate the buffer after the linefeed
 					//
@@ -122,7 +122,7 @@ TextFileClass::Read_Line (StringClass &string)
 					break;
 				}
 			}
-			
+
 			//
 			//	Concat this buffer to the end of the string
 			//
@@ -130,15 +130,15 @@ TextFileClass::Read_Line (StringClass &string)
 		}
 	}
 
-	bool retval = (string.Get_Length () > 0);
+	bool retval = (!string.Is_Empty());
 	if (retval) {
-		
+
 		int len				= string.Get_Length ();
 		const char *raw_string	= string.str();
-		
+
 		//
 		// Strip the CR\LF or LF from the string
-		//		
+		//
 		if (len > 1 && raw_string[len - 2] == '\r') {
 			string.Erase (len - 2, 2);
 			//raw_string[len - 2] = 0;
@@ -147,7 +147,7 @@ TextFileClass::Read_Line (StringClass &string)
 			//raw_string[len - 1] = 0;
 		}
 	}
-	
+
 	return retval;
 }
 
diff --git a/Core/Libraries/Source/WWVegas/WWLib/textfile.h b/Core/Libraries/Source/WWVegas/WWLib/textfile.h
index dbb9d44c4a2..3bb70766402 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/textfile.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/textfile.h
@@ -16,31 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/textfile.h                             $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/textfile.h                             $*
+ *                                                                                             *
  *                      $Author:: Patrick                   $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 5/31/00 9:22a                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef __TEXT_FILE_H
-#define __TEXT_FILE_H
-
-
-#include "RAWFILE.H"
+#include "RAWFILE.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 //	Forward declarations
@@ -64,7 +58,7 @@ class TextFileClass : public RawFileClass
 	//	Public constructors/destructors
 	/////////////////////////////////////////////////////////////////
 	TextFileClass (void);
-	TextFileClass (char const *filename);	
+	TextFileClass (char const *filename);
 	TextFileClass (const TextFileClass &src);
 	virtual ~TextFileClass (void);
 
@@ -79,7 +73,3 @@ class TextFileClass : public RawFileClass
 	bool			Read_Line (StringClass &string);
 	bool			Write_Line (const StringClass &string);
 };
-
-
-#endif //__TEXT_FILE_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.cpp b/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.cpp
index 5ed288e276b..d1db1743cf9 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.cpp
@@ -35,11 +35,11 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #pragma message ("(gth) disabling TGAtoDXTClass temporarily so I can test the WW libs merge...")
-#if 0 
+#if 0
 
 #include "always.h"
 #include "nvdxtlib.h"
-#include "TARGA.H"
+#include "TARGA.h"
 #include "tgatodxt.h"
 #include "wwdebug.h"
 #include <io.h>
@@ -101,14 +101,14 @@ TGAToDXTClass::ErrorCode TGAToDXTClass::Convert (const char *inputpathname, cons
 		// 1. Pixel depth must be 24 or 32 (compressor has no support for lower bit depths) or 8-bit not paletted
 		// 2. Dimensions >= 4 (DDS block size is 4x4).
 		// 3. Aspect ratio <= 1:8 (some H/W will not render textures above this ratio).
-		// 4. Dimensions must be power of 2 (see below).		
+		// 4. Dimensions must be power of 2 (see below).
 		validbitdepth = ((targa.Header.PixelDepth == 24) || (targa.Header.PixelDepth == 32)
 							|| ( (targa.Header.PixelDepth == 8) && (targa.Header.ColorMapType != 1) ) );
 		validsize	  = (targa.Header.Width >= 4) && (targa.Header.Height >= 4);
-		validaspect	  = ((float) MAX (targa.Header.Width, targa.Header.Height)) / ((float) MIN (targa.Header.Width, targa.Header.Height)) <= 8.0f; 
-		
+		validaspect	  = ((float) MAX (targa.Header.Width, targa.Header.Height)) / ((float) MIN (targa.Header.Width, targa.Header.Height)) <= 8.0f;
+
 		if (validbitdepth && validsize && validaspect) {
-			
+
 			unsigned char *byte;
 			HRESULT			errorcode;
 
@@ -116,7 +116,7 @@ TGAToDXTClass::ErrorCode TGAToDXTClass::Convert (const char *inputpathname, cons
 
 			// If TGA has an alpha channel...
 			if (targa.Header.PixelDepth == 32) {
-				
+
 				// Analyse the alpha channel and ignore it if it contains redundant data (ie. is either all black or all white).
 				if (!dontcheckalpha) {
 					byte = (unsigned char*) targa.GetImage();
@@ -143,7 +143,7 @@ TGAToDXTClass::ErrorCode TGAToDXTClass::Convert (const char *inputpathname, cons
 					// Remove the alpha channel and swizel the pixel data.
 					nonalphaimage = new unsigned char [3 * ((unsigned) targa.Header.Width) * ((unsigned) targa.Header.Height)];
 					nonalphabyte  = nonalphaimage;
-					
+
 					byte = (unsigned char*) targa.GetImage();
 					for (unsigned p = 0; p < ((unsigned) targa.Header.Width) * ((unsigned) targa.Header.Height); p++) {
 
@@ -164,7 +164,7 @@ TGAToDXTClass::ErrorCode TGAToDXTClass::Convert (const char *inputpathname, cons
 
 				// convert to 24-bit monochrome
 				image = new unsigned char [3 * ((unsigned) targa.Header.Width) * ((unsigned) targa.Header.Height)];
-				
+
 				byte = (unsigned char*) targa.GetImage();
 				for (unsigned p = 0; p < ((unsigned) targa.Header.Width) * ((unsigned) targa.Header.Height); p++) {
 					image[3*p]=image[3*p+1]=image[3*p+2]=byte[p];
@@ -191,7 +191,7 @@ TGAToDXTClass::ErrorCode TGAToDXTClass::Convert (const char *inputpathname, cons
 			if (!validsize) error_code = INVALID_SIZE;
 			if (!validaspect) error_code = INVALID_ASPECT_RATIO;
 		}
-	} // error == 0
+	}
 
 	return error_code;
 }
@@ -206,13 +206,13 @@ void TGAToDXTClass::Write (const char *outputpathname)
 {
 	HANDLE hfile;
 	DWORD  bytecountwritten;
-	
+
 	hfile = ::CreateFile (outputpathname, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0L, NULL);
 	if (hfile != INVALID_HANDLE_VALUE) {
-      LockFile (hfile, 0, 0, BufferCount, 0); 
+      LockFile (hfile, 0, 0, BufferCount, 0);
       WriteFile (hfile, Buffer, BufferCount, &bytecountwritten, NULL);
-      UnlockFile (hfile, 0, 0, BufferCount, 0); 
-		
+      UnlockFile (hfile, 0, 0, BufferCount, 0);
+
 		// Stamp the write time (if one has been supplied).
 		if (WriteTimePtr != NULL) {
 			SetFileTime (hfile, NULL, NULL, WriteTimePtr);
@@ -266,4 +266,4 @@ void WriteDTXnFile (DWORD datacount, void *data)
 }
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h b/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h
index 5747074becd..778b5934a31 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h
@@ -34,11 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef TGATODXT_H
-#define TGATODXT_H
+#pragma once
 
 #pragma message ("(gth) disabling TGAtoDXTClass temporarily so I can test the WW libs merge...")
-#if 0 
+#if 0
 
 // Includes.
 #include "always.h"
@@ -67,7 +66,7 @@ class TGAToDXTClass
 	protected:
 		void Write (const char *outputfilename);
 
-		FILETIME		  *WriteTimePtr;	// Time stamp of write time of DXT file.	
+		FILETIME		  *WriteTimePtr;	// Time stamp of write time of DXT file.
 		unsigned char *Buffer;			// Staging buffer.
 		unsigned			BufferSize;		// Size of buffer in bytes.
 		unsigned			BufferCount;	// No. of bytes written to buffer.
@@ -81,5 +80,3 @@ class TGAToDXTClass
 extern TGAToDXTClass _TGAToDXTConverter;
 
 #endif //0
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/thread.cpp b/Core/Libraries/Source/WWVegas/WWLib/thread.cpp
index 4c8b2f27ed4..aaad589d7f4 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/thread.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/thread.cpp
@@ -34,10 +34,10 @@
 ThreadClass::ThreadClass(const char *thread_name, ExceptionHandlerType exception_handler) : handle(0), running(false), thread_priority(0)
 {
 	if (thread_name) {
-		assert(strlen(thread_name) < sizeof(ThreadName) - 1);
-		strcpy(ThreadName, thread_name);
+		size_t nameLen = strlcpy(ThreadName, thread_name, ARRAY_SIZE(ThreadName));
+		(void)nameLen; assert(nameLen < ARRAY_SIZE(ThreadName));
 	} else {
-		strcpy(ThreadName, "No name");;
+		strcpy(ThreadName, "No name");
 	}
 
 	ExceptionHandler = exception_handler;
@@ -85,7 +85,7 @@ void ThreadClass::Execute()
 	#else
 		handle=_beginthread(&Internal_Thread_Function,0,this);
 		SetThreadPriority((HANDLE)handle,THREAD_PRIORITY_NORMAL+thread_priority);
-		WWDEBUG_SAY(("ThreadClass::Execute: Started thread %s, thread ID is %X\n", ThreadName, handle));
+		WWDEBUG_SAY(("ThreadClass::Execute: Started thread %s, thread ID is %X", ThreadName, handle));
 	#endif
 }
 
@@ -153,4 +153,4 @@ unsigned ThreadClass::_Get_Current_Thread_ID()
 bool ThreadClass::Is_Running()
 {
 	return !!handle;
-}
\ No newline at end of file
+}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/thread.h b/Core/Libraries/Source/WWVegas/WWLib/thread.h
index 4e57301646d..0f526274c68 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/thread.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/thread.h
@@ -16,15 +16,10 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef THREAD_H
-#define THREAD_H
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
 #include "always.h"
-#include "Vector.H"
+#include "Vector.h"
 
 struct _EXCEPTION_POINTERS;
 
@@ -99,5 +94,3 @@ class ThreadClass
 	volatile unsigned long handle;
 	int thread_priority;
 };
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWLib/trect.h b/Core/Libraries/Source/WWVegas/WWLib/trect.h
index 6f0fbeef3ef..b302888f5f6 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/trect.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/trect.h
@@ -16,29 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/trect.h                                $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/trect.h                                $*
+ *                                                                                             *
  *                      $Author:: Byon_g                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 11/28/00 2:37p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef TRECT_H
-#define TRECT_H
+#pragma once
 
 #include	"Point.h"
 
@@ -65,7 +61,7 @@ class TRect
 
 		TRect<T> const Intersect(TRect<T> const & rectangle, T * x=NULL, T * y=NULL) const;
 		TRect<T> const Union(TRect<T> const & rect2) const;
-		
+
 		/*
 		**	Bias this rectangle within another.
 		*/
@@ -208,7 +204,7 @@ TRect<T> const TRect<T>::Union(TRect<T> const & rect2) const
 
 
 template<class T>
-TPoint2D<T> const TPoint2D<T>::Bias_To(TRect<T> const & rect) const 
+TPoint2D<T> const TPoint2D<T>::Bias_To(TRect<T> const & rect) const
 {
 	return(TPoint2D<T>(X + rect.X, Y + rect.Y));
 }
@@ -219,7 +215,3 @@ TPoint2D<T> const TPoint2D<T>::Bias_To(TRect<T> const & rect) const
 **	is composed of integers.
 */
 typedef TRect<int> Rect;
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/trim.cpp b/Core/Libraries/Source/WWVegas/WWLib/trim.cpp
index da32c7fd4d2..36a39d02114 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/trim.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/trim.cpp
@@ -16,46 +16,45 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/trim.cpp                               $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/trim.cpp                               $*
+ *                                                                                             *
  *                      $Author:: Denzil_l                                                    $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 11/08/01 11:35a                                             $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 4                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"always.h"
 #include	"trim.h"
-#include	<string.h>
 
 #ifdef _UNIX
 #include	<wctype.h>
 #endif // _UNIX
 
-/*********************************************************************************************** 
- * strtrim -- Trim leading and trailing white space off of string.                             * 
- *                                                                                             * 
- *    This routine will remove the leading and trailing whitespace from the string specifed.   * 
- *    The string is modified in place.                                                         * 
- *                                                                                             * 
- * INPUT:   buffer   -- Pointer to the string to be trimmed.                                   * 
- *                                                                                             * 
- * OUTPUT:  none                                                                               * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/06/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * strtrim -- Trim leading and trailing white space off of string.                             *
+ *                                                                                             *
+ *    This routine will remove the leading and trailing whitespace from the string specifed.   *
+ *    The string is modified in place.                                                         *
+ *                                                                                             *
+ * INPUT:   buffer   -- Pointer to the string to be trimmed.                                   *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/06/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 char* strtrim(char* buffer)
 {
@@ -95,7 +94,7 @@ wchar_t* wcstrim(wchar_t* buffer)
 		while ((*source != 0) && ((unsigned int)*source <= 32)) {
 			++source;
 		}
-		
+
 		if (source != buffer) {
 			// TheSuperHackers @fix Mauller 04/04/2025 Replace wcscpy with safer memmove as memory regions can overlap when part of string is copied to itself
 			memmove(buffer, source, (wcslen(source) + 1) * sizeof(wchar_t));
diff --git a/Core/Libraries/Source/WWVegas/WWLib/trim.h b/Core/Libraries/Source/WWVegas/WWLib/trim.h
index 1e48ffdd809..cdb550eaa9a 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/trim.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/trim.h
@@ -16,33 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/trim.h                                 $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/trim.h                                 $*
+ *                                                                                             *
  *                      $Author:: Jani_p                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 6/14/01 7:25p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 3                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef TRIM_H
-#define TRIM_H
+#pragma once
 
 #include <wchar.h>
 
 char * strtrim(char * buffer);
 wchar_t * wcstrim(wchar_t * buffer);
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWLib/uarray.h b/Core/Libraries/Source/WWVegas/WWLib/uarray.h
index bea788f1c52..ba630938249 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/uarray.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/uarray.h
@@ -36,27 +36,17 @@
  *   UniqueArrayClass<T>::~UniqueArrayClass -- destructor                                      *
  *   UniqueArrayClass<T>::Add -- Add an item to the array                                      *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef UARRAY_H
-#define UARRAY_H
+#pragma once
 
-#ifndef HASHCALC_H
 #include "hashcalc.h"
-#endif
-
-#ifndef VECTOR_H
-#include "Vector.H"
-#endif
-
+#include "Vector.h"
 
 /*
 ** UniqueArrayClass
 ** This template class can be used to generate an array of unique objects
 ** amongst a huge list of objects which may or may not be unique.  However,
-** in order to use the UniqueArrayClass, you will need to implement a 
+** in order to use the UniqueArrayClass, you will need to implement a
 ** HashCalculatorClass for the type you are using.
 **
 ** Note that the UniqueArrayClass does *copies* of the objects you are
@@ -90,7 +80,7 @@ template <class T> class UniqueArrayClass
 		bool operator == (const HashItem & that) { return ((Item == that.Item) && (NextHashIndex == that.NextHashIndex)); }
 		bool operator != (const HashItem & that) { return !(*this == that); }
 	};
-		
+
 	// Dynamic Vector of the unique items:
 	DynamicVectorClass<HashItem>		UniqueItems;
 
@@ -126,7 +116,7 @@ UniqueArrayClass<T>::UniqueArrayClass(int initial_size,int growth_rate,HashCalcu
 {
 	// set the growth rate.
 	UniqueItems.Set_Growth_Step(growth_rate);
-		
+
 	// sizing and allocating the actual hash table
 	int bits = HashCalculator->Num_Hash_Bits();
 	assert(bits > 0);
@@ -155,10 +145,8 @@ UniqueArrayClass<T>::UniqueArrayClass(int initial_size,int growth_rate,HashCalcu
 template <class T>
 UniqueArrayClass<T>::~UniqueArrayClass(void)
 {
-	if (HashTable != NULL) {
-		delete[] HashTable;
-		HashTable = NULL;
-	}
+	delete[] HashTable;
+	HashTable = NULL;
 }
 
 
@@ -177,8 +165,8 @@ UniqueArrayClass<T>::~UniqueArrayClass(void)
  * HISTORY:                                                                                    *
  *   5/29/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-template <class T> 
-inline int UniqueArrayClass<T>::Add(const T & new_item) 
+template <class T>
+inline int UniqueArrayClass<T>::Add(const T & new_item)
 {
 	/*
 	** Use the hash table to quickly (hopefully :-) detect
@@ -187,14 +175,14 @@ inline int UniqueArrayClass<T>::Add(const T & new_item)
 	int num_hash_vals;
 	HashCalculator->Compute_Hash(new_item);
 	num_hash_vals = HashCalculator->Num_Hash_Values();
-	
+
 	unsigned int lasthash = 0xFFFFFFFF;
 	unsigned int hash;
-	
+
 	for (int hidx = 0; hidx < num_hash_vals; hidx++) {
 		hash = HashCalculator->Get_Hash_Value(hidx);
 		if (hash != lasthash) {
-			
+
 			int test_item_index = HashTable[hash];
 
 			while (test_item_index != 0xFFFFFFFF) {
@@ -217,12 +205,8 @@ inline int UniqueArrayClass<T>::Add(const T & new_item)
 	entry.Item = new_item;
 	entry.NextHashIndex = HashTable[hash_index];
 	HashTable[hash_index] = index;
-	
+
 	UniqueItems.Add(entry);
 
 	return index;
 }
-
-
-#endif // UARRAY_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/vector.cpp b/Core/Libraries/Source/WWVegas/WWLib/vector.cpp
index c5b4fba4b3a..f9333e06773 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/vector.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/vector.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/vector.cpp                             $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/vector.cpp                             $*
+ *                                                                                             *
  *                      $Author:: Jani_p                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 1/16/02 11:40a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 20                                                          $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   BooleanVectorClass::BooleanVectorClass -- Copy constructor for boolean array.             *
  *   BooleanVectorClass::BooleanVectorClass -- Explicit data buffer constructor.               *
  *   BooleanVectorClass::Clear -- Resets boolean vector to empty state.                        *
@@ -53,8 +53,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"always.h"
-#include	"Vector.H"
-#include	<string.h>
+#include "Vector.h"
 
 /*
 **	The following template function can be located here ONLY if all the instantiations are
diff --git a/Core/Libraries/Source/WWVegas/WWLib/verchk.cpp b/Core/Libraries/Source/WWVegas/WWLib/verchk.cpp
index b2cb109c732..6aa6cc4af80 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/verchk.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/verchk.cpp
@@ -38,7 +38,7 @@
 #include "verchk.h"
 #include <windows.h>
 #include <winnt.h>
-#include "RAWFILE.H"
+#include "RAWFILE.h"
 #include "ffactory.h"
 
 
@@ -149,19 +149,19 @@ Get_Image_File_Header (const char *filename, IMAGE_FILE_HEADER *file_header)
 	FileClass *file=_TheFileFactory->Get_File(filename);
 
 	if (file && file->Open ()) {
-		
+
 		//
 		//	Read the dos header (all PE exectuable files begin with this)
 		//
 		IMAGE_DOS_HEADER dos_header;
 		if (file->Read (&dos_header, sizeof (dos_header)) == sizeof (dos_header)) {
-			
+
 			//
 			//	Determine the index where the image header resides
 			//
 			int file_header_offset = dos_header.e_lfanew + sizeof (DWORD);
 			file->Seek (file_header_offset, SEEK_SET);
-			
+
 			//
 			//	Read the image header from the file
 			//
@@ -194,7 +194,7 @@ Get_Image_File_Header (HINSTANCE app_instance, IMAGE_FILE_HEADER *file_header)
 	//
 	IMAGE_DOS_HEADER *dos_header = (IMAGE_DOS_HEADER *)app_instance;
 	if (dos_header != NULL) {
-		
+
 		//
 		//	Determine the offset where the image header resides
 		//
@@ -205,10 +205,10 @@ Get_Image_File_Header (HINSTANCE app_instance, IMAGE_FILE_HEADER *file_header)
 		//
 		::memcpy (	file_header,
 						(((char *)dos_header) + image_header_offset),
-						sizeof (IMAGE_FILE_HEADER));		
+						sizeof (IMAGE_FILE_HEADER));
 		retval = true;
 	}
-	
+
 
 	return retval;
 }
@@ -235,8 +235,8 @@ Compare_EXE_Version (int app_instance, const char *filename)
 	//	Get the image header for both executables
 	//
 	IMAGE_FILE_HEADER header1 = { 0 };
-	IMAGE_FILE_HEADER header2 = { 0 };	
-	if	(	::Get_Image_File_Header ((HINSTANCE)app_instance, &header1) && 
+	IMAGE_FILE_HEADER header2 = { 0 };
+	if	(	::Get_Image_File_Header ((HINSTANCE)app_instance, &header1) &&
 			::Get_Image_File_Header (filename, &header2))
 	{
 		retval = int(header1.TimeDateStamp - header2.TimeDateStamp);
diff --git a/Core/Libraries/Source/WWVegas/WWLib/verchk.h b/Core/Libraries/Source/WWVegas/WWLib/verchk.h
index b5040cddff5..2dbebead96d 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/verchk.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/verchk.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __VERCHK_H
-#define __VERCHK_H
 
 #include <windows.h>
 
@@ -63,7 +57,3 @@ bool GetFileCreationTime(char* filename, FILETIME* createTime);
 //
 ////////////////////////////////////////////////////////////////////////
 int Compare_EXE_Version (int app_instance, const char *filename);
-
-
-#endif //__VERCHK_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/visualc.h b/Core/Libraries/Source/WWVegas/WWLib/visualc.h
index 81db127d706..a400314d917 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/visualc.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/visualc.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/visualc.h                              $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/visualc.h                              $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 5/16/01 4:11p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 9                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
+
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #if defined(_MSC_VER)
 
@@ -89,7 +88,7 @@
 // 'copy constructor could not be generated'
 #pragma warning(disable : 4511)
 
-// 'assignment operator could not be generated' 
+// 'assignment operator could not be generated'
 #pragma warning(disable : 4512)
 
 // 'unreferenced formal parameter'
diff --git a/Core/Libraries/Source/WWVegas/WWLib/widestring.cpp b/Core/Libraries/Source/WWVegas/WWLib/widestring.cpp
index fd6325cdc53..41cbb495eaa 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/widestring.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/widestring.cpp
@@ -38,7 +38,6 @@
 
 #include "widestring.h"
 #include "win.h"
-#include <Utility/stdio_adapter.h>
 
 
 ///////////////////////////////////////////////////////////////////
@@ -105,13 +104,13 @@ WideStringClass::Get_String (int length, bool is_temp)
 			//
 			for (int index = 0; index < MAX_TEMP_STRING; index ++) {
 				if (m_FreeTempPtr[index] != NULL) {
-					
+
 					//
 					//	Grab this unused buffer for our string
 					//
 					string					= m_FreeTempPtr[index];
 					m_ResTempPtr[index]	= m_FreeTempPtr[index];
-					m_FreeTempPtr[index]	= NULL;					
+					m_FreeTempPtr[index]	= NULL;
 					Set_Buffer_And_Allocated_Length (string, MAX_TEMP_LEN);
 
 					//
@@ -170,16 +169,16 @@ WideStringClass::Uninitialised_Grow (int new_len)
 {
 	int allocated_len = Get_Allocated_Length ();
 	if (new_len > allocated_len) {
-		
+
 		//
 		//	Switch to a newly allocated buffer
 		//
 		WCHAR *new_buffer = Allocate_Buffer (new_len);
-		Set_Buffer_And_Allocated_Length (new_buffer, new_len);	
+		Set_Buffer_And_Allocated_Length (new_buffer, new_len);
 	}
 
 	//
-	// Whenever this function is called, clear the cached length 
+	// Whenever this function is called, clear the cached length
 	//
 	Store_Length (0);
 	return ;
@@ -207,7 +206,7 @@ WideStringClass::Free_String (void)
 				// at the same time we are.
 				//
 				FastCriticalSectionClass::LockClass lock(m_TempMutex);
-				
+
 				//
 				//	Release our hold on this temporary buffer
 				//
@@ -259,10 +258,10 @@ WideStringClass::Format_Args (const WCHAR *format, va_list arg_list )
 	//	Format the string
 	//
 	int retval = vswprintf (temp_buffer, 512, format, arg_list);
-	
+
 	//
 	//	Copy the string into our buffer
-	//	
+	//
 	(*this) = temp_buffer;
 
 	return retval;
@@ -293,10 +292,10 @@ WideStringClass::Format (const WCHAR *format, ...)
 	//	Format the string
 	//
 	int retval = vswprintf (temp_buffer, 512, format, arg_list);
-	
+
 	//
 	//	Copy the string into our buffer
-	//	
+	//
 	(*this) = temp_buffer;
 
 	va_end (arg_list);
@@ -321,7 +320,7 @@ WideStringClass::Release_Resources (void)
 bool WideStringClass::Convert_From (const char *text)
 {
 	if (text != NULL) {
-		
+
 		int length;
 
 		length = MultiByteToWideChar (CP_ACP, 0, text, -1, NULL, 0);
diff --git a/Core/Libraries/Source/WWVegas/WWLib/widestring.h b/Core/Libraries/Source/WWVegas/WWLib/widestring.h
index ed3728483e9..3f08f9c3564 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/widestring.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/widestring.h
@@ -34,14 +34,8 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef __WIDESTRING_H
-#define __WIDESTRING_H
-
-#include <string.h>
 #include <stdarg.h>
 #include "always.h"
 #include "wwdebug.h"
@@ -74,7 +68,7 @@ class WideStringClass
 
 	////////////////////////////////////////////////////////////
 	//	Public operators
-	////////////////////////////////////////////////////////////	
+	////////////////////////////////////////////////////////////
 	bool operator== (const WCHAR *rvalue) const;
 	bool operator!= (const WCHAR *rvalue) const;
 
@@ -105,7 +99,7 @@ class WideStringClass
 	////////////////////////////////////////////////////////////
 	int			Compare (const WCHAR *string) const;
 	int			Compare_No_Case (const WCHAR *string) const;
-	
+
 	inline int	Get_Length (void) const;
 	bool			Is_Empty (void) const;
 
@@ -356,7 +350,7 @@ WideStringClass::operator!= (const WCHAR *rvalue) const
 ///////////////////////////////////////////////////////////////////
 inline const WideStringClass &
 WideStringClass::operator= (const WideStringClass &string)
-{	
+{
 	return operator= ((const WCHAR *)string);
 }
 
@@ -422,7 +416,7 @@ WideStringClass::Erase (int start_index, int char_count)
 	int len = Get_Length ();
 
 	if (start_index < len) {
-		
+
 		if (start_index + char_count > len) {
 			char_count = len - start_index;
 		}
@@ -459,7 +453,7 @@ WideStringClass::operator= (const WCHAR *string)
 		Uninitialised_Grow (len + 1);
 		Store_Length (len);
 
-		::memcpy (m_Buffer, string, (len + 1) * sizeof (WCHAR));		
+		::memcpy (m_Buffer, string, (len + 1) * sizeof (WCHAR));
 	}
 
 	return (*this);
@@ -527,7 +521,7 @@ WideStringClass::operator+= (WCHAR ch)
 
 	m_Buffer[cur_len]			= ch;
 	m_Buffer[cur_len + 1]	= m_NullChar;
-	
+
 	if (ch != m_NullChar) {
 		Store_Length (cur_len + 1);
 	}
@@ -575,7 +569,7 @@ WideStringClass::operator+= (const WideStringClass &string)
 		//
 		//	Copy the new string onto our the end of our existing buffer
 		//
-		::memcpy (&m_Buffer[cur_len], (const WCHAR *)string, (src_len + 1) * sizeof (WCHAR));				
+		::memcpy (&m_Buffer[cur_len], (const WCHAR *)string, (src_len + 1) * sizeof (WCHAR));
 	}
 
 	return (*this);
@@ -627,9 +621,9 @@ WideStringClass::Get_Allocated_Length (void) const
 	//
 	//	Read the allocated length from the header
 	//
-	if (m_Buffer != m_EmptyString) {		
+	if (m_Buffer != m_EmptyString) {
 		HEADER *header		= Get_Header ();
-		allocated_length	= header->allocated_length;		
+		allocated_length	= header->allocated_length;
 	}
 
 	return allocated_length;
@@ -649,13 +643,13 @@ WideStringClass::Get_Length (void) const
 	int length = 0;
 
 	if (m_Buffer != m_EmptyString) {
-		
+
 		//
 		//	Read the length from the header
 		//
 		HEADER *header	= Get_Header ();
 		length			= header->length;
-		
+
 		//
 		//	Hmmm, a zero length was stored in the header,
 		// we better manually get the string length.
@@ -686,7 +680,7 @@ WideStringClass::Set_Buffer_And_Allocated_Length (WCHAR *buffer, int length)
 	//
 	if (m_Buffer != m_EmptyString) {
 		Store_Allocated_Length (length);
-		Store_Length (0);		
+		Store_Length (0);
 	} else {
 		WWASSERT (length == 0);
 	}
@@ -705,7 +699,7 @@ WideStringClass::Allocate_Buffer (int length)
 	// bytes required to hold the header.
 	//
 	char *buffer = W3DNEWARRAY char[(sizeof (WCHAR) * length) + sizeof (WideStringClass::_HEADER)];
-	
+
 	//
 	//	Fill in the fields of the header
 	//
@@ -766,18 +760,15 @@ WideStringClass::Store_Length (int length)
 ///////////////////////////////////////////////////////////////////
 // Convert_To
 ///////////////////////////////////////////////////////////////////
-inline bool	
+inline bool
 WideStringClass::Convert_To (StringClass &string)
 {
 	return (string.Copy_Wide (m_Buffer));
 }
 
 
-inline bool	
+inline bool
 WideStringClass::Convert_To (StringClass &string) const
 {
 	return (string.Copy_Wide (m_Buffer));
 }
-
-#endif //__WIDESTRING_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/win.h b/Core/Libraries/Source/WWVegas/WWLib/win.h
index dbd62fb73f5..70ef32dc396 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/win.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/win.h
@@ -16,36 +16,32 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/win.h                                  $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/win.h                                  $*
+ *                                                                                             *
  *                      $Author:: Ian_l                                                       $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 10/16/01 2:42p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 11                                                          $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef WIN_H
-#define WIN_H
+#pragma once
 
 /*
 **	This header file includes the Windows headers. If there are any special pragmas that need
 **	to occur around this process, they are performed here. Typically, certain warnings will need
 **	to be disabled since the Windows headers are repleat with illegal and dangerous constructs.
 **
-**	Within the windows headers themselves, Microsoft has disabled the warnings 4290, 4514, 
+**	Within the windows headers themselves, Microsoft has disabled the warnings 4290, 4514,
 **	4069, 4200, 4237, 4103, 4001, 4035, 4164. Makes you wonder, eh?
 */
 
@@ -88,5 +84,3 @@ void __cdecl Print_Win32Error(unsigned long win32Error);
 #else // _WIN32
 //#include <unistd.h>	// file does not exist
 #endif // _WIN32
-
-#endif // WIN_H
diff --git a/Core/Libraries/Source/WWVegas/WWLib/wwfile.cpp b/Core/Libraries/Source/WWVegas/WWLib/wwfile.cpp
index 9dedca529e5..c59d2af1248 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/wwfile.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/wwfile.cpp
@@ -37,7 +37,7 @@
 #include <Utility/stdio_adapter.h>
 #include <stdarg.h>
 #include <memory.h>
-#include "WWFILE.H"
+#include "WWFILE.h"
 
 #pragma warning(disable : 4514)
 
@@ -66,13 +66,13 @@ int FileClass::Printf_Indented(unsigned depth, char *str, ...)
 	va_list args;
 	va_start(args, str);
 
-	if(depth > PRINTF_BUFFER_SIZE) 
+	if(depth > PRINTF_BUFFER_SIZE)
 		depth = PRINTF_BUFFER_SIZE;
 
 	memset(text, '\t', depth);
 
 	int length;
-	if(depth < PRINTF_BUFFER_SIZE) 
+	if(depth < PRINTF_BUFFER_SIZE)
 		length = vsnprintf(text + depth, PRINTF_BUFFER_SIZE - depth, str, args);
 	else
 		length = PRINTF_BUFFER_SIZE;
diff --git a/Core/Libraries/Source/WWVegas/WWLib/wwstring.cpp b/Core/Libraries/Source/WWVegas/WWLib/wwstring.cpp
index 7d71a5240a1..f4da1100c4a 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/wwstring.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/wwstring.cpp
@@ -37,7 +37,6 @@
 #include "wwstring.h"
 #include "wwmemlog.h"
 #include "mutex.h"
-#include <Utility/stdio_adapter.h>
 
 
 ///////////////////////////////////////////////////////////////////
@@ -97,7 +96,7 @@ StringClass::Get_String (int length, bool is_temp)
 			unsigned mask=1<<index;
 			if (!(ReservedMask&mask)) {
 				ReservedMask|=mask;
-				
+
 				//
 				//	Grab this unused buffer for our string
 				//
@@ -115,7 +114,7 @@ StringClass::Get_String (int length, bool is_temp)
 	}
 
 	if (string == NULL) {
-		
+
 		//
 		//	Allocate a new string as necessary
 		//
@@ -170,16 +169,16 @@ StringClass::Uninitialised_Grow (int new_len)
 
 	int allocated_len = Get_Allocated_Length ();
 	if (new_len > allocated_len) {
-		
+
 		//
 		//	Switch to a newly allocated buffer
 		//
 		TCHAR *new_buffer = Allocate_Buffer (new_len);
-		Set_Buffer_And_Allocated_Length (new_buffer, new_len);	
+		Set_Buffer_And_Allocated_Length (new_buffer, new_len);
 	}
-		
+
 	//
-	// Whenever this function is called, clear the cached length 
+	// Whenever this function is called, clear the cached length
 	//
 	Store_Length (0);
 	return ;
@@ -253,10 +252,10 @@ StringClass::Format_Args (const TCHAR *format, va_list arg_list )
 	#else
 		retval = vsnprintf (temp_buffer, 512, format, arg_list);
 	#endif
-	
+
 	//
 	//	Copy the string into our buffer
-	//	
+	//
 	(*this) = temp_buffer;
 
 	return retval;
@@ -288,10 +287,10 @@ StringClass::Format (const TCHAR *format, ...)
 	#else
 		retval = vsnprintf (temp_buffer, 512, format, arg_list);
 	#endif
-	
+
 	//
 	//	Copy the string into our buffer
-	//	
+	//
 	(*this) = temp_buffer;
 
 	va_end (arg_list);
@@ -321,7 +320,7 @@ bool StringClass::Copy_Wide (const WCHAR *source)
 
 		int  length;
 		int unmapped;
-			
+
 		length = WideCharToMultiByte (CP_ACP, 0 , source, -1, NULL, 0, NULL, &unmapped);
 		if (length > 0) {
 
@@ -338,4 +337,4 @@ bool StringClass::Copy_Wide (const WCHAR *source)
 
 	// Failure.
 	return (false);
-}
\ No newline at end of file
+}
diff --git a/Core/Libraries/Source/WWVegas/WWLib/wwstring.h b/Core/Libraries/Source/WWVegas/WWLib/wwstring.h
index c59524715d0..3a5745163bd 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/wwstring.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/wwstring.h
@@ -34,17 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __WWSTRING_H
-#define __WWSTRING_H
 
 #include "always.h"
 #include "mutex.h"
 #include "win.h"
-#include <string.h>
 #include <stdarg.h>
 #include "trim.h"
 #include "wwdebug.h"
@@ -84,7 +78,7 @@ class StringClass
 
 	////////////////////////////////////////////////////////////
 	//	Public operators
-	////////////////////////////////////////////////////////////	
+	////////////////////////////////////////////////////////////
 	bool operator== (const TCHAR *rvalue) const;
 	bool operator!= (const TCHAR *rvalue) const;
 
@@ -115,7 +109,7 @@ class StringClass
 	////////////////////////////////////////////////////////////
 	int			Compare (const TCHAR *string) const;
 	int			Compare_No_Case (const TCHAR *string) const;
-	
+
 	inline int	Get_Length (void) const;
 	bool			Is_Empty (void) const;
 
@@ -198,12 +192,12 @@ class StringClass
 ///////////////////////////////////////////////////////////////////
 inline const StringClass &
 StringClass::operator= (const StringClass &string)
-{	
+{
 	int len = string.Get_Length();
 	Uninitialised_Grow(len+1);
 	Store_Length(len);
 
-	::memcpy (m_Buffer, string.m_Buffer, (len+1) * sizeof (TCHAR));		
+	::memcpy (m_Buffer, string.m_Buffer, (len+1) * sizeof (TCHAR));
 	return (*this);
 
 }
@@ -220,7 +214,7 @@ StringClass::operator= (const TCHAR *string)
 		Uninitialised_Grow (len+1);
 		Store_Length (len);
 
-		::memcpy (m_Buffer, string, (len + 1) * sizeof (TCHAR));		
+		::memcpy (m_Buffer, string, (len + 1) * sizeof (TCHAR));
 	}
 
 	return (*this);
@@ -472,7 +466,7 @@ StringClass::Erase (int start_index, int char_count)
 	int len = Get_Length ();
 
 	if (start_index < len) {
-		
+
 		if (start_index + char_count > len) {
 			char_count = len - start_index;
 		}
@@ -533,7 +527,7 @@ StringClass::operator+= (TCHAR ch)
 
 	m_Buffer[cur_len]			= ch;
 	m_Buffer[cur_len + 1]	= m_NullChar;
-	
+
 	if (ch != m_NullChar) {
 		Store_Length (cur_len + 1);
 	}
@@ -590,7 +584,7 @@ StringClass::operator+= (const StringClass &string)
 		//
 		//	Copy the new string onto our the end of our existing buffer
 		//
-		::memcpy (&m_Buffer[cur_len], (const TCHAR *)string, (src_len + 1) * sizeof (TCHAR));				
+		::memcpy (&m_Buffer[cur_len], (const TCHAR *)string, (src_len + 1) * sizeof (TCHAR));
 	}
 
 	return (*this);
@@ -643,9 +637,9 @@ StringClass::Get_Allocated_Length (void) const
 	//
 	//	Read the allocated length from the header
 	//
-	if (m_Buffer != m_EmptyString) {		
+	if (m_Buffer != m_EmptyString) {
 		HEADER *header		= Get_Header ();
-		allocated_length	= header->allocated_length;		
+		allocated_length	= header->allocated_length;
 	}
 
 	return allocated_length;
@@ -665,13 +659,13 @@ StringClass::Get_Length (void) const
 	int length = 0;
 
 	if (m_Buffer != m_EmptyString) {
-		
+
 		//
 		//	Read the length from the header
 		//
 		HEADER *header	= Get_Header ();
 		length			= header->length;
-		
+
 		//
 		//	Hmmm, a zero length was stored in the header,
 		// we better manually get the string length.
@@ -702,7 +696,7 @@ StringClass::Set_Buffer_And_Allocated_Length (TCHAR *buffer, int length)
 	//
 	if (m_Buffer != m_EmptyString) {
 		Store_Allocated_Length (length);
-		Store_Length (0);		
+		Store_Length (0);
 	} else {
 		WWASSERT (length == 0);
 	}
@@ -721,7 +715,7 @@ StringClass::Allocate_Buffer (int length)
 	// bytes required to hold the header.
 	//
 	char *buffer = W3DNEWARRAY char[(sizeof (TCHAR) * length) + sizeof (StringClass::_HEADER)];
-	
+
 	//
 	//	Fill in the fields of the header
 	//
@@ -778,6 +772,3 @@ StringClass::Store_Length (int length)
 
 	return ;
 }
-
-#endif //__WWSTRING_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWLib/xpipe.cpp b/Core/Libraries/Source/WWVegas/WWLib/xpipe.cpp
index bd709a260a2..15e310c9e64 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/xpipe.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/xpipe.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Library/XPIPE.CPP                            $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Library/XPIPE.cpp                            $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 9/28/98 12:06p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   BufferPipe::Put -- Submit data to the buffered pipe segment.                              *
  *   FilePipe::Put -- Submit a block of data to the pipe.                                      *
  *   FilePipe::End -- End the file pipe handler.                                               *
@@ -39,9 +39,8 @@
 
 
 #include	"always.h"
-#include	"XPIPE.H"
+#include "XPIPE.h"
 #include	<stddef.h>
-#include	<string.h>
 
 
 //---------------------------------------------------------------------------------------------------------
diff --git a/Core/Libraries/Source/WWVegas/WWLib/xstraw.cpp b/Core/Libraries/Source/WWVegas/WWLib/xstraw.cpp
index ce9cd8b5f55..d567c0421ca 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/xstraw.cpp
+++ b/Core/Libraries/Source/WWVegas/WWLib/xstraw.cpp
@@ -16,31 +16,30 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Library/XSTRAW.CPP                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Library/XSTRAW.cpp                           $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 9/28/98 12:06p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   BufferStraw::Get -- Fetch data from the straw's buffer holding tank.                      *
  *   FileStraw::Get -- Fetch data from the file.                                               *
  *   FileStraw::~FileStraw -- The destructor for the file straw.                               *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"always.h"
-#include	"XSTRAW.H"
+#include "XSTRAW.h"
 #include	<stddef.h>
-#include	<string.h>
 
 //---------------------------------------------------------------------------------------------------------
 // BufferStraw
diff --git a/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h b/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h
index 0a20da56691..d91f87b6c49 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VECTOR3I_H
-#define VECTOR3I_H
 
 #include "always.h"
 
@@ -66,29 +60,29 @@ WWINLINE Vector3i::Vector3i(void)
 {
 }
 
-WWINLINE Vector3i::Vector3i(int i,int j,int k) 
-{ 
-	I = i; J = j; K = k; 
+WWINLINE Vector3i::Vector3i(int i,int j,int k)
+{
+	I = i; J = j; K = k;
 }
 
 WWINLINE bool Vector3i::operator == (const Vector3i & v) const
-{ 
-	return (I == v.I && J == v.J && K == v.K);	
+{
+	return (I == v.I && J == v.J && K == v.K);
 }
 
 WWINLINE bool Vector3i::operator !=	(const Vector3i& v) const
-{ 
-	return !(I == v.I && J == v.J && K == v.K);	
+{
+	return !(I == v.I && J == v.J && K == v.K);
 }
 
-WWINLINE const int& Vector3i::operator[] (int n) const				
-{ 
-	return ((int*)this)[n]; 
+WWINLINE const int& Vector3i::operator[] (int n) const
+{
+	return ((int*)this)[n];
 }
 
 WWINLINE int& Vector3i::operator[] (int n)
-{ 
-	return ((int*)this)[n]; 
+{
+	return ((int*)this)[n];
 }
 
 // ----------------------------------------------------------------------------
@@ -115,29 +109,27 @@ WWINLINE Vector3i16::Vector3i16(void)
 {
 }
 
-WWINLINE Vector3i16::Vector3i16(unsigned short i,unsigned short j,unsigned short k) 
-{ 
-	I = i; J = j; K = k; 
+WWINLINE Vector3i16::Vector3i16(unsigned short i,unsigned short j,unsigned short k)
+{
+	I = i; J = j; K = k;
 }
 
 WWINLINE bool Vector3i16::operator == (const Vector3i & v) const
-{ 
-	return (I == v.I && J == v.J && K == v.K);	
+{
+	return (I == v.I && J == v.J && K == v.K);
 }
 
 WWINLINE bool Vector3i16::operator !=	(const Vector3i& v) const
-{ 
-	return !(I == v.I && J == v.J && K == v.K);	
+{
+	return !(I == v.I && J == v.J && K == v.K);
 }
 
-WWINLINE const unsigned short & Vector3i16::operator[] (int n) const				
-{ 
-	return ((unsigned short *)this)[n]; 
+WWINLINE const unsigned short & Vector3i16::operator[] (int n) const
+{
+	return ((unsigned short *)this)[n];
 }
 
 WWINLINE unsigned short & Vector3i16::operator[] (int n)
-{ 
-	return ((unsigned short *)this)[n]; 
+{
+	return ((unsigned short *)this)[n];
 }
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWMath/aabox.cpp b/Core/Libraries/Source/WWVegas/WWMath/aabox.cpp
index 48273b0a3d3..66204fa4ef3 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/aabox.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/aabox.cpp
@@ -60,7 +60,7 @@ void AABoxClass::Init_Random(float min_center,float max_center,float min_extent,
 	Center.X = min_center + WWMath::Random_Float() * (max_center - min_center);
 	Center.Y = min_center + WWMath::Random_Float() * (max_center - min_center);
 	Center.Z = min_center + WWMath::Random_Float() * (max_center - min_center);
-	
+
 	Extent.X = min_extent + WWMath::Random_Float() * (max_extent - min_extent);
 	Extent.Y = min_extent + WWMath::Random_Float() * (max_extent - min_extent);
 	Extent.Z = min_extent + WWMath::Random_Float() * (max_extent - min_extent);
@@ -72,8 +72,8 @@ void AABoxClass::Transform(const Matrix3D & tm,const AABoxClass & in,AABoxClass
 	tm.Transform_Center_Extent_AABox(in.Center,in.Extent,&(out->Center),&(out->Extent));
 }
 
-void MinMaxAABoxClass::Init_Empty(void) 
-{ 
-	MinCorner.Set(FLT_MAX,FLT_MAX,FLT_MAX); 
-	MaxCorner.Set(-FLT_MAX,-FLT_MAX,-FLT_MAX); 
+void MinMaxAABoxClass::Init_Empty(void)
+{
+	MinCorner.Set(FLT_MAX,FLT_MAX,FLT_MAX);
+	MaxCorner.Set(-FLT_MAX,-FLT_MAX,-FLT_MAX);
 }
diff --git a/Core/Libraries/Source/WWVegas/WWMath/aabox.h b/Core/Libraries/Source/WWVegas/WWMath/aabox.h
index ab27810c83f..eb0b29669fa 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/aabox.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/aabox.h
@@ -52,12 +52,7 @@
  *   AABoxClass::Init -- Init from a line segment                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef AABOX_H
-#define AABOX_H
 
 #include "always.h"
 #include "matrix3d.h"
@@ -75,7 +70,7 @@ struct CastResultStruct;
 /*
 ** AABoxClass
 **
-** Axis-Aligned Boxes.  I've coded these similar to the OrientedBoxClass only 
+** Axis-Aligned Boxes.  I've coded these similar to the OrientedBoxClass only
 ** without a rotation matrix.  A similar algorithm is used to test the box
 ** for intersection.
 */
@@ -86,7 +81,7 @@ class AABoxClass
 
 	WWINLINE AABoxClass(void) { }
 
-	WWINLINE AABoxClass(const Vector3 & center,const Vector3 & extent) : 
+	WWINLINE AABoxClass(const Vector3 & center,const Vector3 & extent) :
 		Center(center),
 		Extent(extent)
 	{ }
@@ -142,7 +137,7 @@ class MinMaxAABoxClass
 		MaxCorner(max_corner)
 	{
 	}
-	
+
 	WWINLINE MinMaxAABoxClass(Vector3 * points,int num) { Init(points,num); }
 
 	WWINLINE MinMaxAABoxClass(const AABoxClass & that) { Init(that); }
@@ -150,7 +145,7 @@ class MinMaxAABoxClass
 	WWINLINE void		Init(Vector3 * points,int num);
 	WWINLINE void		Init(const AABoxClass & box);
 	void		Init_Empty(void);
-	
+
 	void		Add_Point(const Vector3 & point);
 	void		Add_Box(const MinMaxAABoxClass & box);
 	void		Add_Box(const AABoxClass & box);
@@ -260,7 +255,7 @@ WWINLINE void AABoxClass::Init(Vector3 * points,int num)
 {
 	Vector3 Min = points[0];
 	Vector3 Max = points[0];
-	
+
 	for (int i=1; i<num; i++) {
 		if (Min.X > points[i].X) Min.X = points[i].X;
 		if (Min.Y > points[i].Y) Min.Y = points[i].Y;
@@ -270,7 +265,7 @@ WWINLINE void AABoxClass::Init(Vector3 * points,int num)
 		if (Max.Y < points[i].Y) Max.Y = points[i].Y;
 		if (Max.Z < points[i].Z) Max.Z = points[i].Z;
 	}
-	
+
 	Center = (Max + Min) * 0.5f;
 	Extent = (Max - Min) * 0.5f;
 }
@@ -311,7 +306,7 @@ WWINLINE void AABoxClass::Init(const LineSegClass & line)
 {
 	Vector3 min_corner = line.Get_P0();
 	Vector3 max_corner = line.Get_P0();
-	
+
 	if (min_corner.X > line.Get_P1().X) min_corner.X = line.Get_P1().X;
 	if (min_corner.Y > line.Get_P1().Y) min_corner.Y = line.Get_P1().Y;
 	if (min_corner.Z > line.Get_P1().Z) min_corner.Z = line.Get_P1().Z;
@@ -674,6 +669,3 @@ WWINLINE void MinMaxAABoxClass::Translate(const Vector3 & pos)
 	MinCorner+=pos;
 	MaxCorner+=pos;
 }
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp
index 3692afa8227..d4f12ff5850 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.cpp
@@ -38,7 +38,6 @@
 #include "aabtreecull.h"
 #include "chunkio.h"
 #include "iostruct.h"
-#include <string.h>
 #include "sphere.h"
 #include "colmath.h"
 #include "colmathinlines.h"
@@ -61,7 +60,7 @@ const uint32 AABTREE_CURRENT_VERSION = 0x00010000;
 /*
 ** Chunk Id's used by the aabtree code to save itself into a file
 */
-enum 
+enum
 {
 	AABTREE_CHUNK_VERSION					= 0x00000001,	// version wrapper, contains 32bit version #
 	AABTREE_CHUNK_AABNODE					= 0x00000101,	// generic aab-node wrapper
@@ -98,7 +97,7 @@ struct IOAABNodeStruct
 *************************************************************************/
 static inline CullableClass * get_first_object(AABTreeNodeClass * node)
 {
-	return node->Object;		
+	return node->Object;
 }
 
 static inline CullableClass * get_next_object(CullableClass * obj)
@@ -133,10 +132,8 @@ AABTreeCullSystemClass::~AABTreeCullSystemClass(void)
 	delete RootNode;
 
 	// Delete indexed node pointer array
-	if (IndexedNodes) {
-		delete[] IndexedNodes;
-		IndexedNodes = NULL;
-	}
+	delete[] IndexedNodes;
+	IndexedNodes = NULL;
 }
 
 
@@ -178,7 +175,7 @@ void AABTreeCullSystemClass::Remove_Object_Internal(CullableClass * obj)
 	link->Set_Culling_System(NULL);
 	delete link;
 	obj->Set_Cull_Link(NULL);
-	
+
 	ObjectCount--;
 	WWASSERT(ObjectCount >= 0);
 	obj->Release_Ref();
@@ -265,7 +262,7 @@ void AABTreeCullSystemClass::Partition_Tree_Depth_Recursive(AABTreeNodeClass * n
 	}
 	if (node->Front) {
 		Partition_Tree_Depth_Recursive(node->Front,cur_depth,max_depth);
-	} 
+	}
 	if (node->Back) {
 		Partition_Tree_Depth_Recursive(node->Back,cur_depth,max_depth);
 	}
@@ -282,7 +279,7 @@ void AABTreeCullSystemClass::Add_Object_Recursive(AABTreeNodeClass * node,Cullab
 		big_child = small_child;
 		small_child = tmp;
 	}
-	
+
 	// Can we fit in the smaller child?
 	if (small_child && small_child->Box.Contains(obj->Get_Cull_Box())) {
 		Add_Object_Recursive(small_child,obj);
@@ -468,7 +465,7 @@ void AABTreeCullSystemClass::Collect_Objects_Recursive(AABTreeNodeClass * node,c
 	if (node->Box.Contains(point) == false) {
 		NODE_REJECTED();
 		return;
-	} 
+	}
 
 	NODE_ACCEPTED();
 
@@ -512,7 +509,7 @@ void AABTreeCullSystemClass::Collect_Objects_Recursive(AABTreeNodeClass * node,c
 		Collect_Objects_Recursive(node);
 		return;
 	}
-	
+
 	NODE_ACCEPTED();
 
 	/*
@@ -556,7 +553,7 @@ void AABTreeCullSystemClass::Collect_Objects_Recursive(AABTreeNodeClass * node,c
 		Collect_Objects_Recursive(node);
 		return;
 	}
-	
+
 	NODE_ACCEPTED();
 
 	/*
@@ -604,7 +601,7 @@ void AABTreeCullSystemClass::Collect_Objects_Recursive
 	}
 
 	NODE_ACCEPTED();
-	
+
 	/*
 	** Test any objects in this node
 	*/
@@ -634,7 +631,7 @@ void AABTreeCullSystemClass::Collect_Objects_Recursive(AABTreeNodeClass * node,c
 {
 	/*
 	** Is the point inside this volume?
-	*/	
+	*/
 	if (CollisionMath::Overlap_Test (node->Box, sphere) == CollisionMath::OUTSIDE) {
 		NODE_REJECTED();
 		return;
@@ -698,8 +695,8 @@ void AABTreeCullSystemClass::Update_Bounding_Boxes_Recursive(AABTreeNodeClass *
 
 void AABTreeCullSystemClass::Load(ChunkLoadClass & cload)
 {
-	WWASSERT_PRINT(Object_Count() == 0, "Remove all objects from AAB-Culling system before loading!\n"); 
-	
+	WWASSERT_PRINT(Object_Count() == 0, "Remove all objects from AAB-Culling system before loading!");
+
 	delete RootNode;
 	RootNode = new AABTreeNodeClass;
 
@@ -736,15 +733,15 @@ void AABTreeCullSystemClass::Load_Nodes(AABTreeNodeClass * node,ChunkLoadClass &
 	// Open the node description
 	cload.Open_Chunk();
 	WWASSERT(cload.Cur_Chunk_ID() == AABTREE_CHUNK_AABNODE);
-	
-	// Load the node description.  
+
+	// Load the node description.
 	// Older files will contain a chunk named AABTREE_CHUNK_AABNODE_INFO while newer
 	// files will contain AABTREE_CHUNK_AABNODE_VARIABLES which contains the IOAABNodeStruct
 	// in a micro-chunk.
 	IOAABNodeStruct node_desc;
 	memset(&node_desc,0,sizeof(IOAABNodeStruct));
-	
-	cload.Open_Chunk(); 
+
+	cload.Open_Chunk();
 	if (cload.Cur_Chunk_ID() == AABTREE_CHUNK_AABNODE_INFO) {
 
 		// Loading the legacy format...
@@ -752,14 +749,14 @@ void AABTreeCullSystemClass::Load_Nodes(AABTreeNodeClass * node,ChunkLoadClass &
 		cload.Read(&node_desc,sizeof(node_desc));
 
 	} else if (cload.Cur_Chunk_ID() == AABTREE_CHUNK_AABNODE_VARIABLES) {
-	
+
 		// Loading the new format, contains micro chunks...
 		while (cload.Open_Micro_Chunk()) {
 			switch(cload.Cur_Micro_Chunk_ID()) {
 				READ_MICRO_CHUNK(cload,AABTREE_VARIABLE_NODESTRUCT,node_desc);
 				READ_MICRO_CHUNK(cload,AABTREE_VARIABLE_USERDATA,node->UserData);
 			}
-			cload.Close_Micro_Chunk();	
+			cload.Close_Micro_Chunk();
 		}
 	}
 	cload.Close_Chunk();
@@ -780,7 +777,7 @@ void AABTreeCullSystemClass::Load_Nodes(AABTreeNodeClass * node,ChunkLoadClass &
 	cload.Close_Chunk();
 
 	// Close the node description
-	cload.Close_Chunk(); 
+	cload.Close_Chunk();
 
 	// if we are supposed to have a front child, load it
 	if (node_desc.Attributes & AABNODE_ATTRIBUTE_FRONT_CHILD) {
@@ -789,7 +786,7 @@ void AABTreeCullSystemClass::Load_Nodes(AABTreeNodeClass * node,ChunkLoadClass &
 		node->Front->Parent = node;
 		Load_Nodes(node->Front,cload);
 	}
-	
+
 	// if we have a back child, load it
 	if (node_desc.Attributes & AABNODE_ATTRIBUTE_BACK_CHILD) {
 		WWASSERT(node->Back == NULL);
@@ -833,7 +830,7 @@ void AABTreeCullSystemClass::Save_Nodes(AABTreeNodeClass * node,ChunkSaveClass &
 	if (node->Back) {
 		node_desc.Attributes |= AABNODE_ATTRIBUTE_BACK_CHILD;
 	}
-	
+
 	WRITE_MICRO_CHUNK(csave,AABTREE_VARIABLE_NODESTRUCT,node_desc);
 	WRITE_MICRO_CHUNK(csave,AABTREE_VARIABLE_USERDATA,node->UserData);
 	csave.End_Chunk();
@@ -884,14 +881,13 @@ void AABTreeCullSystemClass::Save_Object_Linkage(ChunkSaveClass & csave,Cullable
 
 void AABTreeCullSystemClass::Re_Index_Nodes(void)
 {
-	if (IndexedNodes != NULL) {
-		delete[] IndexedNodes;
-		IndexedNodes = NULL;
-	}
+	delete[] IndexedNodes;
+	IndexedNodes = NULL;
+
 	NodeCount = Partition_Node_Count();
 	WWASSERT(NodeCount > 0);
 	IndexedNodes = new AABTreeNodeClass *[NodeCount];
-	
+
 	int counter = 0;
 	Re_Index_Nodes_Recursive(RootNode,counter);
 	WWASSERT(counter == NodeCount);
@@ -920,7 +916,7 @@ void AABTreeCullSystemClass::Re_Index_Nodes_Recursive(AABTreeNodeClass * node,in
 **
 *************************************************************************/
 AABTreeNodeClass::AABTreeNodeClass(void) :
-	Index(0),	
+	Index(0),
 	Box(Vector3(0,0,0),Vector3(0,0,0)),
 	Parent(NULL),
 	Front(NULL),
@@ -934,16 +930,13 @@ AABTreeNodeClass::~AABTreeNodeClass(void)
 {
 	// objects should be removed before deleting the partition tree
 	WWASSERT(Object == NULL);
-	
+
 	// delete our children
-	if (Front) {
-		delete Front;
-		Front = NULL;
-	}
-	if (Back) {
-		delete Back;
-		Back = NULL;
-	}
+	delete Front;
+	Front = NULL;
+
+	delete Back;
+	Back = NULL;
 }
 
 void AABTreeNodeClass::Compute_Bounding_Box(void)
@@ -955,7 +948,7 @@ void AABTreeNodeClass::Compute_Bounding_Box(void)
 		Front->Compute_Bounding_Box();
 	}
 
-	if (Back) { 
+	if (Back) {
 		Back->Compute_Bounding_Box();
 	}
 
@@ -968,7 +961,7 @@ void AABTreeNodeClass::Compute_Local_Bounding_Box(void)
 	** Now make sure we bound our children
 	*/
 	MinMaxAABoxClass box(Vector3(FLT_MAX,FLT_MAX,FLT_MAX),Vector3(-FLT_MAX,-FLT_MAX,-FLT_MAX));
-	
+
 	if (Front) {
 		box.Add_Box(Front->Box);
 	}
@@ -999,13 +992,13 @@ void AABTreeNodeClass::Add_Object(CullableClass * obj,bool update_bounds)
 {
 	AABTreeLinkClass * link = (AABTreeLinkClass *)obj->Get_Cull_Link();
 	WWASSERT(link);
-	
+
 	link->Node = this;
 	link->NextObject = Object;
 	Object = obj;
 
 	if (update_bounds) {
-		// if this is the only object and we have no children, just copy 
+		// if this is the only object and we have no children, just copy
 		// the object's bounding box, otherwise, add it to what we have
 		if ((Object_Count() == 1) && (Front == NULL) && (Back == NULL)) {
 			Box = obj->Get_Cull_Box();
@@ -1022,7 +1015,7 @@ void AABTreeNodeClass::Remove_Object(CullableClass * obj)
 	// find the given object in our linked list
 	CullableClass * prevobj = NULL;
 	CullableClass * curobj = Object;
-	
+
 	while (curobj) {
 
 		AABTreeLinkClass * link = (AABTreeLinkClass *)curobj->Get_Cull_Link();
@@ -1060,7 +1053,7 @@ void AABTreeNodeClass::Transfer_Objects(AABTreeNodeClass * dummy_node)
 	if (Front) {
 		Front->Transfer_Objects(dummy_node);
 	}
-	
+
 	if (Back) {
 		Back->Transfer_Objects(dummy_node);
 	}
@@ -1086,7 +1079,7 @@ CullableClass * AABTreeNodeClass::Peek_Object(int index)
 	WWASSERT(obj != NULL);
 
 	while (obj && (count != index)) {
-		count++;				
+		count++;
 		obj = ((AABTreeLinkClass *)obj->Get_Cull_Link())->NextObject;
 	}
 	WWASSERT(count == index);
@@ -1115,7 +1108,7 @@ void AABTreeNodeClass::Partition(void)
 	SimpleDynVecClass<AABoxClass> boxes(obj_count);
 	CullableClass * obj = Object;
 	while (obj != NULL) {
-		boxes.Add(obj->Get_Cull_Box());		
+		boxes.Add(obj->Get_Cull_Box());
 		obj = get_next_object(obj);
 	}
 
@@ -1126,7 +1119,7 @@ void AABTreeNodeClass::Partition(void)
 	SplitChoiceStruct sc;
 	Select_Splitting_Plane(&sc,boxes);
 	boxes.Resize(0);
-	
+
 	/*
 	** If there was no good split, just leave all of
 	** the objects in this node
@@ -1136,7 +1129,7 @@ void AABTreeNodeClass::Partition(void)
 	}
 
 	/*
-	** Split the tiles 
+	** Split the tiles
 	*/
 	AABTreeNodeClass * front = new AABTreeNodeClass;
 	AABTreeNodeClass * back = new AABTreeNodeClass;
@@ -1153,9 +1146,9 @@ void AABTreeNodeClass::Partition(void)
 		delete front;
 		front = NULL;
 	}
-	
+
 	/*
-	** Build a back tree if necessary. 
+	** Build a back tree if necessary.
 	*/
 	if (back->Object_Count() > 0) {
 		Back = back;
@@ -1178,15 +1171,15 @@ void AABTreeNodeClass::Split_Objects(const AABTreeNodeClass::SplitChoiceStruct &
 
 	int fcount = 0;
 	int bcount = 0;
-	
+
 	// unlink all of our objects, relinking them to the appropriate node
 	while (Object) {
-		
+
 		// pull the object out of this node
 		CullableClass * obj = Object;
 		Remove_Object(Object);
-		
-		// decide which node to add the object to, 
+
+		// decide which node to add the object to,
 		// NOTE: we have to use the same convention as Compute_Score!
 		const AABoxClass & box = obj->Get_Cull_Box();
 
@@ -1209,7 +1202,7 @@ void AABTreeNodeClass::Split_Objects(const AABTreeNodeClass::SplitChoiceStruct &
 	back->Box = sc.BackBox;
 	back->Box.Extent += Vector3(WWMATH_EPSILON,WWMATH_EPSILON,WWMATH_EPSILON);
 
-	// when we are all done, the counts should match. 
+	// when we are all done, the counts should match.
 	WWASSERT(fcount == sc.FrontCount);
 	WWASSERT(bcount == sc.BackCount);
 }
@@ -1236,7 +1229,7 @@ void AABTreeNodeClass::Partition(const AABoxClass & bounds,SimpleDynVecClass<AAB
 	*/
 	SplitChoiceStruct sc;
 	Select_Splitting_Plane(&sc,boxes);
-	
+
 	/*
 	** If there was no good split, just leave all of
 	** the objects in this node
@@ -1264,9 +1257,9 @@ void AABTreeNodeClass::Partition(const AABoxClass & bounds,SimpleDynVecClass<AAB
 	} else {
 		Front = NULL;
 	}
-	
+
 	/*
-	** Build a back tree if necessary. 
+	** Build a back tree if necessary.
 	*/
 	if (backboxes.Count() > 0) {
 		Back = new AABTreeNodeClass;
@@ -1289,7 +1282,7 @@ void AABTreeNodeClass::Split_Boxes
 
 	// copy each box in the input array into the appropriate output array
 	for (int i=0; i<boxes.Count(); i++) {
-		
+
 		const AABoxClass & box = boxes[i];
 
 		if (CollisionMath::Overlap_Test(sc.Plane,box.Center) == CollisionMath::FRONT) {
@@ -1303,7 +1296,7 @@ void AABTreeNodeClass::Split_Boxes
 		}
 	}
 
-	// when we are all done, the counts should match. 
+	// when we are all done, the counts should match.
 	WWASSERT(frontboxes.Count() == sc.FrontCount);
 	WWASSERT(backboxes.Count() == sc.BackCount);
 }
@@ -1329,13 +1322,13 @@ void AABTreeNodeClass::Select_Splitting_Plane
 	/*
 	** Try putting axis-aligned planes through some random vertices
 	*/
-	int objcount = boxes.Count();	
+	int objcount = boxes.Count();
 	int trys = 0;
 	for (trys = 0; trys < MIN(NUM_TRYS,objcount); trys++) {
 
 		int obj_index;
 		SplitChoiceStruct test;
-		
+
 		/*
 		** Select a random object
 		*/
@@ -1379,18 +1372,18 @@ void AABTreeNodeClass::Select_Splitting_Plane_Brute_Force
 	AABTreeNodeClass::SplitChoiceStruct * sc,
 	SimpleDynVecClass<AABoxClass> & boxes
 )
-{ 
+{
 	/*
 	** Try putting axis-aligned planes along each face of each box
 	*/
-	int objcount = boxes.Count();	
+	int objcount = boxes.Count();
 	for (int obj_index = 0; obj_index < objcount; obj_index++) {
 
 		AAPlaneClass plane;
 		const AABoxClass & box = boxes[obj_index];
 
 		/*
-		** Try each face of this box 
+		** Try each face of this box
 		*/
 		for (int plane_index = 0; plane_index < 6; plane_index++) {
 			SplitChoiceStruct test;
@@ -1420,8 +1413,8 @@ void AABTreeNodeClass::Select_Splitting_Plane_Brute_Force
 	** Notify user that we couldn't split this node
 	*/
 #ifdef WWDEBUG
-	if (sc->Cost == FLT_MAX) {		
-		WWDEBUG_SAY(("Unable to split node!  objcount = %d. (%.2f,%.2f,%.2f)\r\n",objcount,Box.Center.X, Box.Center.Y, Box.Center.Z));
+	if (sc->Cost == FLT_MAX) {
+		WWDEBUG_SAY(("Unable to split node!  objcount = %d. (%.2f,%.2f,%.2f)",objcount,Box.Center.X, Box.Center.Y, Box.Center.Z));
 	}
 #endif
 }
@@ -1443,13 +1436,13 @@ void AABTreeNodeClass::Compute_Score
 
 		if (CollisionMath::Overlap_Test(sc->Plane,box.Center) == CollisionMath::FRONT) {
 
-			sc->FrontCount++;	
-			sc->FrontBox.Add_Box(box);	
+			sc->FrontCount++;
+			sc->FrontBox.Add_Box(box);
 
 		} else {
-			
-			sc->BackCount++;	
-			sc->BackBox.Add_Box(box);	
+
+			sc->BackCount++;
+			sc->BackBox.Add_Box(box);
 
 		}
 	}
@@ -1459,9 +1452,9 @@ void AABTreeNodeClass::Compute_Score
 	*/
 	float back_cost = sc->BackBox.Volume() * sc->BackCount;
 	float front_cost = sc->FrontBox.Volume() * sc->FrontCount;
-	
+
 	sc->Cost = front_cost + back_cost;
-	
+
 	if ((sc->FrontCount == 0) || (sc->BackCount == 0)) {
 		sc->Cost = FLT_MAX;
 	}
@@ -1482,13 +1475,13 @@ AABTreeIterator::AABTreeIterator(AABTreeCullSystemClass * tree) :
 {
 	WWASSERT(Tree != NULL);
 }
-	
+
 void AABTreeIterator::Reset(void)
 {
 	CurNodeIndex = 0;
 }
 
-bool AABTreeIterator::Enter_Parent(void)						
+bool AABTreeIterator::Enter_Parent(void)
 {
 	validate();
 	if (CurNodeIndex != 0) {
@@ -1503,7 +1496,7 @@ bool AABTreeIterator::Enter_Sibling(void)
 {
 	validate();
 	if (CurNodeIndex != 0) {
-		
+
 		/*
 		** find which child of our parent we are
 		*/
@@ -1575,7 +1568,7 @@ int AABTreeIterator::Get_Current_Node_Index(void)
 
 void AABTreeIterator::Get_Current_Box(AABoxClass * set_box)
 {
-	Tree->Get_Node_Bounds(CurNodeIndex,set_box);	
+	Tree->Get_Node_Bounds(CurNodeIndex,set_box);
 }
 
 void AABTreeIterator::validate(void)
@@ -1610,7 +1603,7 @@ void AABTreeIterator::validate(void)
 	uint16					BackIndex;
 	CullableClass *		Object;
 	uint32					UserData;
-	
+
 	Total Size:				28 bytes
 
-*/
\ No newline at end of file
+*/
diff --git a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h
index 573a5a8ccbb..7d0928bc5a0 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef AABTREECULL_H
-#define AABTREECULL_H
 
 #include "cullsys.h"
 #include "aaplane.h"
@@ -74,13 +68,13 @@ class AABTreeCullSystemClass : public CullSystemClass
 	*/
 	void					Re_Partition(void);
 	void					Re_Partition(const AABoxClass & bounds,SimpleDynVecClass<AABoxClass> & boxes);
-	
+
 	/*
 	** Update_Bounding_Boxes.  This function causes all bounding boxes in the tree to update themselves.
-	** If any box is found to not bound the objects it is supposed to contain, the box is updated 
-	** Note that this is normally not necessary, the reason this function existsis due to the fact 
-	** that the renegade level editor tries to do everything possible to not discard the precalculated 
-	** visibilty data for a level.  In some cases, we want to load geometry that has been edited back 
+	** If any box is found to not bound the objects it is supposed to contain, the box is updated
+	** Note that this is normally not necessary, the reason this function existsis due to the fact
+	** that the renegade level editor tries to do everything possible to not discard the precalculated
+	** visibilty data for a level.  In some cases, we want to load geometry that has been edited back
 	** into the same AABTree without re-partitioning.
 	*/
 	void					Update_Bounding_Boxes(void);
@@ -122,7 +116,7 @@ class AABTreeCullSystemClass : public CullSystemClass
 	** Bounding box of the entire tree
 	*/
 	const AABoxClass & Get_Bounding_Box(void);
-	void					Get_Node_Bounds(int node_id,AABoxClass * set_bounds);	
+	void					Get_Node_Bounds(int node_id,AABoxClass * set_bounds);
 
 	/*
 	** Statistics
@@ -182,10 +176,10 @@ class AABTreeCullSystemClass : public CullSystemClass
 
 	virtual void		Load_Node_Contents(AABTreeNodeClass * /*node*/,ChunkLoadClass & /*cload*/) { }
 	virtual void		Save_Node_Contents(AABTreeNodeClass * /*node*/,ChunkSaveClass & /*csave*/) { }
-	
+
 	AABTreeNodeClass *	RootNode;			// root of the AAB-Tree
 	int						ObjectCount;		// number of objects in the system
-	
+
 	int						NodeCount;			// number of nodes
 	AABTreeNodeClass **	IndexedNodes;		// index access to the nodes
 
@@ -204,7 +198,7 @@ class AABTreeIterator
 {
 public:
 	AABTreeIterator(AABTreeCullSystemClass * tree);
-	
+
 	void					Reset(void);
 	bool					Enter_Parent(void);
 	bool					Enter_Sibling(void);
@@ -226,14 +220,14 @@ class AABTreeIterator
 };
 
 
-/** 
+/**
 ** TypedAABTreeCullSystemClass
 ** This template adds type-safety to an AABTree.  It allows you to create trees
 ** containing a particular type of object (the class must be derived from CullableClass though)
 */
 template <class T> class TypedAABTreeCullSystemClass : public AABTreeCullSystemClass
 {
-public: 
+public:
 
 	virtual void		Add_Object(T * obj,int node_index=-1)	{ Add_Object_Internal(obj,node_index); }
 	virtual void		Remove_Object(T * obj)						{ Remove_Object_Internal(obj); }
@@ -261,7 +255,7 @@ class AABTreeNodeClass : public AutoPoolClass<AABTreeNodeClass,256>
 
 	AABTreeNodeClass(void);
 	~AABTreeNodeClass(void);
-	
+
 	void						Add_Object(CullableClass * obj,bool update_bounds = true);
 	void						Remove_Object(CullableClass * obj);
 	int						Object_Count(void);
@@ -278,9 +272,9 @@ class AABTreeNodeClass : public AutoPoolClass<AABTreeNodeClass,256>
 	/*
 	** Construction support:
 	*/
-	struct SplitChoiceStruct 
+	struct SplitChoiceStruct
 	{
-		SplitChoiceStruct(void) : Cost(FLT_MAX),FrontCount(0),BackCount(0),Plane(AAPlaneClass::XNORMAL,0.0f) 
+		SplitChoiceStruct(void) : Cost(FLT_MAX),FrontCount(0),BackCount(0),Plane(AAPlaneClass::XNORMAL,0.0f)
 		{
 			FrontBox.Init_Empty();
 			BackBox.Init_Empty();
@@ -327,7 +321,7 @@ class AABTreeNodeClass : public AutoPoolClass<AABTreeNodeClass,256>
 
 /*
 ** AABTreeLinkClass
-** This structure is used to link objects into an AAB-Tree culling system. 
+** This structure is used to link objects into an AAB-Tree culling system.
 */
 class AABTreeLinkClass : public CullLinkClass, public AutoPoolClass<AABTreeLinkClass,256>
 {
@@ -337,8 +331,3 @@ class AABTreeLinkClass : public CullLinkClass, public AutoPoolClass<AABTreeLinkC
 	AABTreeNodeClass *				Node;					// partition node containing this object
 	CullableClass *					NextObject;			// next object in the node
 };
-
-
-
-
-#endif // AABTREECULL_H
diff --git a/Core/Libraries/Source/WWVegas/WWMath/aaplane.h b/Core/Libraries/Source/WWVegas/WWMath/aaplane.h
index 06bac66db5a..0e7cb97e02d 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/aaplane.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/aaplane.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef AAPLANE_H
-#define AAPLANE_H
 
 #include "always.h"
 #include "vector3.h"
@@ -79,5 +74,3 @@ inline void AAPlaneClass::Get_Normal(Vector3 * normal) const
 	normal->Set(0,0,0);
 	(*normal)[Normal] = 1.0f;
 }
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp
index c0cd1c86674..89abef58058 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.cpp
@@ -53,14 +53,14 @@ DECLARE_FORCE_LINK(cardinalspline);
 SimplePersistFactoryClass<CardinalSpline3DClass,WWMATH_CHUNKID_CARDINALSPLINE3D>	_CardinalSpline3DFactory;
 SimplePersistFactoryClass<CardinalSpline1DClass,WWMATH_CHUNKID_CARDINALSPLINE1D>	_CardinalSpline1DFactory;
 
-enum 
+enum
 {
 	// ID's used by CardinalSpline3D
-	CARDINAL3D_CHUNK_HERMITE3D					= 0x02070957,	
-	CARDINAL3D_CHUNK_TIGHTNESSKEYS,			
+	CARDINAL3D_CHUNK_HERMITE3D					= 0x02070957,
+	CARDINAL3D_CHUNK_TIGHTNESSKEYS,
 
 	// ID's used by CardinalSpline1D
-	CARDINAL1D_CHUNK_HERMITE1D					= 0x02070959,	
+	CARDINAL1D_CHUNK_HERMITE1D					= 0x02070959,
 	CARDINAL1D_CHUNK_TIGHTNESSKEYS
 };
 
@@ -111,7 +111,7 @@ void CardinalSpline3DClass::Update_Tangents(void)
 		return;
 	}
 
-	// First and Last Key: 
+	// First and Last Key:
 	// Only need to compute the OutTangent for key[0] and the InTangent for key[end]
 	int end = Keys.Count() - 1;
 	Tangents[0].InTangent.Set(0,0,0);
@@ -120,20 +120,20 @@ void CardinalSpline3DClass::Update_Tangents(void)
 	if (IsLooping) {
 
 		// This really only works if the start and end points have the same position...
-		Tangents[0].OutTangent.X = (1.0f - Tightness[0])*(Keys[1].Point.X - Keys[end-1].Point.X); 			
-		Tangents[0].OutTangent.Y = (1.0f - Tightness[0])*(Keys[1].Point.Y - Keys[end-1].Point.Y); 			
-		Tangents[0].OutTangent.Z = (1.0f - Tightness[0])*(Keys[1].Point.Z - Keys[end-1].Point.Z); 			
+		Tangents[0].OutTangent.X = (1.0f - Tightness[0])*(Keys[1].Point.X - Keys[end-1].Point.X);
+		Tangents[0].OutTangent.Y = (1.0f - Tightness[0])*(Keys[1].Point.Y - Keys[end-1].Point.Y);
+		Tangents[0].OutTangent.Z = (1.0f - Tightness[0])*(Keys[1].Point.Z - Keys[end-1].Point.Z);
 		Tangents[end].InTangent = Tangents[0].OutTangent;
 
 	} else {
-		
-		Tangents[0].OutTangent.X = (1.0f - Tightness[0])*(Keys[1].Point.X - Keys[0].Point.X); 			
-		Tangents[0].OutTangent.Y = (1.0f - Tightness[0])*(Keys[1].Point.Y - Keys[0].Point.Y); 			
-		Tangents[0].OutTangent.Z = (1.0f - Tightness[0])*(Keys[1].Point.Z - Keys[0].Point.Z); 			
 
-		Tangents[end].InTangent.X = (1.0f - Tightness[0])*(Keys[end].Point.X - Keys[end-1].Point.X); 			
-		Tangents[end].InTangent.Y = (1.0f - Tightness[0])*(Keys[end].Point.Y - Keys[end-1].Point.Y); 			
-		Tangents[end].InTangent.Z = (1.0f - Tightness[0])*(Keys[end].Point.Z - Keys[end-1].Point.Z); 			
+		Tangents[0].OutTangent.X = (1.0f - Tightness[0])*(Keys[1].Point.X - Keys[0].Point.X);
+		Tangents[0].OutTangent.Y = (1.0f - Tightness[0])*(Keys[1].Point.Y - Keys[0].Point.Y);
+		Tangents[0].OutTangent.Z = (1.0f - Tightness[0])*(Keys[1].Point.Z - Keys[0].Point.Z);
+
+		Tangents[end].InTangent.X = (1.0f - Tightness[0])*(Keys[end].Point.X - Keys[end-1].Point.X);
+		Tangents[end].InTangent.Y = (1.0f - Tightness[0])*(Keys[end].Point.Y - Keys[end-1].Point.Y);
+		Tangents[end].InTangent.Z = (1.0f - Tightness[0])*(Keys[end].Point.Z - Keys[end-1].Point.Z);
 
 	}
 
@@ -153,7 +153,7 @@ void CardinalSpline3DClass::Update_Tangents(void)
 
 		float in_factor = 2.0f * (Keys[i].Time - Keys[i-1].Time) / (Keys[i+1].Time - Keys[i-1].Time);
 		float out_factor = 2.0f * (Keys[i+1].Time - Keys[i].Time) / (Keys[i+1].Time - Keys[i-1].Time);
-		
+
 		Tangents[i].InTangent *= in_factor;			// compensating for the un-even keys
 		Tangents[i].OutTangent *= out_factor;
 	}
@@ -170,7 +170,7 @@ bool CardinalSpline3DClass::Save(ChunkSaveClass &csave)
 	csave.Begin_Chunk(CARDINAL3D_CHUNK_HERMITE3D);
 	HermiteSpline3DClass::Save(csave);
 	csave.End_Chunk();
-	
+
 	csave.Begin_Chunk(CARDINAL3D_CHUNK_TIGHTNESSKEYS);
 	for (int i=0; i<Tightness.Count(); i++) {
 		float tightness = Tightness[i];
@@ -190,8 +190,8 @@ bool CardinalSpline3DClass::Load(ChunkLoadClass &cload)
 
 	// read in the chunks
 	while (cload.Open_Chunk()) {
-		
-		switch(cload.Cur_Chunk_ID()) 
+
+		switch(cload.Cur_Chunk_ID())
 		{
 			case CARDINAL3D_CHUNK_HERMITE3D:
 				HermiteSpline3DClass::Load(cload);
@@ -205,7 +205,7 @@ bool CardinalSpline3DClass::Load(ChunkLoadClass &cload)
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
@@ -260,7 +260,7 @@ void CardinalSpline1DClass::Update_Tangents(void)
 		}
 	}
 
-	// First and Last Key: 
+	// First and Last Key:
 	// Only need to compute the OutTangent for key[0] and the InTangent for key[end]
 	int end = Keys.Count() - 1;
 	Tangents[0].InTangent = 0;
@@ -269,13 +269,13 @@ void CardinalSpline1DClass::Update_Tangents(void)
 	if (IsLooping) {
 
 		// This really only works if the start and end points have the same position...
-		Tangents[0].OutTangent = (1.0f - Tightness[0])*(Keys[1].Point - Keys[end-1].Point); 			
+		Tangents[0].OutTangent = (1.0f - Tightness[0])*(Keys[1].Point - Keys[end-1].Point);
 		Tangents[end].InTangent = Tangents[0].OutTangent;
 
 	} else {
-		
-		Tangents[0].OutTangent = (1.0f - Tightness[0])*(Keys[1].Point - Keys[0].Point); 			
-		Tangents[end].InTangent = (1.0f - Tightness[0])*(Keys[end].Point - Keys[end-1].Point); 			
+
+		Tangents[0].OutTangent = (1.0f - Tightness[0])*(Keys[1].Point - Keys[0].Point);
+		Tangents[end].InTangent = (1.0f - Tightness[0])*(Keys[end].Point - Keys[end-1].Point);
 	}
 
 	float total_time = (Keys[1].Time - Keys[0].Time) + (Keys[end].Time - Keys[end-1].Time);
@@ -292,7 +292,7 @@ void CardinalSpline1DClass::Update_Tangents(void)
 
 		float in_factor = 2.0f * (Keys[i].Time - Keys[i-1].Time) / (Keys[i+1].Time - Keys[i-1].Time);
 		float out_factor = 2.0f * (Keys[i+1].Time - Keys[i].Time) / (Keys[i+1].Time - Keys[i-1].Time);
-		
+
 		Tangents[i].InTangent *= in_factor;			// compensating for the un-even keys
 		Tangents[i].OutTangent *= out_factor;
 	}
@@ -309,7 +309,7 @@ bool CardinalSpline1DClass::Save(ChunkSaveClass &csave)
 	csave.Begin_Chunk(CARDINAL1D_CHUNK_HERMITE1D);
 	HermiteSpline1DClass::Save(csave);
 	csave.End_Chunk();
-	
+
 	csave.Begin_Chunk(CARDINAL1D_CHUNK_TIGHTNESSKEYS);
 	for (int i=0; i<Tightness.Count(); i++) {
 		float tightness = Tightness[i];
@@ -329,8 +329,8 @@ bool CardinalSpline1DClass::Load(ChunkLoadClass &cload)
 
 	// read in the chunks
 	while (cload.Open_Chunk()) {
-		
-		switch(cload.Cur_Chunk_ID()) 
+
+		switch(cload.Cur_Chunk_ID())
 		{
 			case CARDINAL1D_CHUNK_HERMITE1D:
 				HermiteSpline1DClass::Load(cload);
@@ -344,7 +344,7 @@ bool CardinalSpline1DClass::Load(ChunkLoadClass &cload)
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
diff --git a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h
index b66ec333762..504429dc538 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef CARDINALSPLINE_H
-#define CARDINALSPLINE_H
 
 #include "hermitespline.h"
 
@@ -66,8 +60,8 @@ class CardinalSpline3DClass : public HermiteSpline3DClass
 	virtual bool								Save(ChunkSaveClass &csave);
 	virtual bool								Load(ChunkLoadClass &cload);
 
-protected:	
-	
+protected:
+
 	DynamicVectorClass<float>	Tightness;
 };
 
@@ -94,11 +88,7 @@ class CardinalSpline1DClass : public HermiteSpline1DClass
 	virtual bool								Save(ChunkSaveClass &csave);
 	virtual bool								Load(ChunkLoadClass &cload);
 
-protected:	
-	
+protected:
+
 	DynamicVectorClass<float>	Tightness;
 };
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/castres.h b/Core/Libraries/Source/WWVegas/WWMath/castres.h
index 2435e34e005..69a577df6fe 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/castres.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/castres.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef CASTRES_H
-#define CASTRES_H
 
 #include "always.h"
 #include "vector3.h"
@@ -49,10 +44,10 @@
 /**
 ** CastResultStruct
 ** Result of a volume or ray cast operation will be stored in the following structure
-** NOTE: If you can avoid it, do not enable ComputeContactPoint.  When casting rays, it is more 
-** efficient to use the resulting Fraction to compute the contact point outside of the 
+** NOTE: If you can avoid it, do not enable ComputeContactPoint.  When casting rays, it is more
+** efficient to use the resulting Fraction to compute the contact point outside of the
 ** collision detection code.  In the case of AABox sweeping for character collision detection,
-** you don't usually need the actual point of contact, etc etc.  
+** you don't usually need the actual point of contact, etc etc.
 **
 ** The default state of ComputeContactPoint is *false*
 */
@@ -60,7 +55,7 @@ struct CastResultStruct
 {
 	CastResultStruct(void)	{ Reset(); }
 	void		Reset(void)		{ StartBad = false; Fraction = 1.0f; Normal.Set(0,0,0); SurfaceType = 0; ComputeContactPoint = false; ContactPoint.Set(0,0,0); }
-	
+
 	bool		StartBad;		// was the inital configuration interpenetrating something?
 	float		Fraction;		// fraction of the move up until collision
 	Vector3	Normal;			// surface normal at the collision point
@@ -70,6 +65,3 @@ struct CastResultStruct
 	Vector3	ContactPoint;				// This will be set to the point of collision if ComputeContactPoint is true
 
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.cpp b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.cpp
index dea6e5251b6..ab024c858bb 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.cpp
@@ -46,26 +46,26 @@
 #include "catmullromspline.h"
 #include "persistfactory.h"
 #include "wwmathids.h"
-#include "wwhack.h" 
+#include "wwhack.h"
 
 /*
 ** Force-Link this module because the linker can't detect that we actually need it...
 */
 DECLARE_FORCE_LINK(catmullromspline);
- 
+
 /*
 ** Save-Load stuff
 */
 SimplePersistFactoryClass<CatmullRomSpline3DClass,WWMATH_CHUNKID_CATMULLROMSPLINE3D>	_CatmullRomSpline3DFactory;
 SimplePersistFactoryClass<CatmullRomSpline1DClass,WWMATH_CHUNKID_CATMULLROMSPLINE1D>	_CatmullRomSpline1DFactory;
 
-enum 
+enum
 {
 	// ID's used by CatmullRomSpline3D
-	CATMULLROM3D_CHUNK_HERMITE3D					= 0x00020727,	
+	CATMULLROM3D_CHUNK_HERMITE3D					= 0x00020727,
 
 	// ID's used by CatmullRomSpline1D
-	CATMULLROM1D_CHUNK_HERMITE1D					= 0x00020729,	
+	CATMULLROM1D_CHUNK_HERMITE1D					= 0x00020729,
 };
 
 
@@ -103,22 +103,22 @@ void CatmullRomSpline3DClass::Update_Tangents(void)
 	if (IsLooping) {
 
 		// This really only works if the start and end points have the same position...
-		Tangents[0].OutTangent.X = 0.5f*(Keys[1].Point.X - Keys[end-1].Point.X); 			
-		Tangents[0].OutTangent.Y = 0.5f*(Keys[1].Point.Y - Keys[end-1].Point.Y); 			
-		Tangents[0].OutTangent.Z = 0.5f*(Keys[1].Point.Z - Keys[end-1].Point.Z); 			
+		Tangents[0].OutTangent.X = 0.5f*(Keys[1].Point.X - Keys[end-1].Point.X);
+		Tangents[0].OutTangent.Y = 0.5f*(Keys[1].Point.Y - Keys[end-1].Point.Y);
+		Tangents[0].OutTangent.Z = 0.5f*(Keys[1].Point.Z - Keys[end-1].Point.Z);
 		Tangents[end].InTangent = Tangents[0].OutTangent;
-	
+
 	} else {
-		
+
 		// TODO: second derivative = 0... what is formula?  I'm making this up...
-		Tangents[0].OutTangent.X = 0.25f*(Keys[1].Point.X - Keys[0].Point.X); 			
-		Tangents[0].OutTangent.Y = 0.25f*(Keys[1].Point.Y - Keys[0].Point.Y); 			
-		Tangents[0].OutTangent.Z = 0.25f*(Keys[1].Point.Z - Keys[0].Point.Z); 			
-
-		Tangents[end].InTangent.X = 0.25f*(Keys[end].Point.X - Keys[end-1].Point.X); 			
-		Tangents[end].InTangent.Y = 0.25f*(Keys[end].Point.Y - Keys[end-1].Point.Y); 			
-		Tangents[end].InTangent.Z = 0.25f*(Keys[end].Point.Z - Keys[end-1].Point.Z); 			
-	
+		Tangents[0].OutTangent.X = 0.25f*(Keys[1].Point.X - Keys[0].Point.X);
+		Tangents[0].OutTangent.Y = 0.25f*(Keys[1].Point.Y - Keys[0].Point.Y);
+		Tangents[0].OutTangent.Z = 0.25f*(Keys[1].Point.Z - Keys[0].Point.Z);
+
+		Tangents[end].InTangent.X = 0.25f*(Keys[end].Point.X - Keys[end-1].Point.X);
+		Tangents[end].InTangent.Y = 0.25f*(Keys[end].Point.Y - Keys[end-1].Point.Y);
+		Tangents[end].InTangent.Z = 0.25f*(Keys[end].Point.Z - Keys[end-1].Point.Z);
+
 	}
 
 	float total_time = (Keys[1].Time - Keys[0].Time) + (Keys[end].Time - Keys[end-1].Time);
@@ -197,15 +197,15 @@ bool CatmullRomSpline3DClass::Save(ChunkSaveClass &csave)
 bool CatmullRomSpline3DClass::Load(ChunkLoadClass &cload)
 {
 	while (cload.Open_Chunk()) {
-		
-		switch(cload.Cur_Chunk_ID()) 
+
+		switch(cload.Cur_Chunk_ID())
 		{
 			case CATMULLROM3D_CHUNK_HERMITE3D:
 				HermiteSpline3DClass::Load(cload);
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
@@ -252,14 +252,14 @@ void CatmullRomSpline1DClass::Update_Tangents(void)
 		// This really only works if the start and end points have the same position...
 		Tangents[0].OutTangent = 0.5f*(Keys[1].Point - Keys[end-1].Point);
 		Tangents[end].InTangent = Tangents[0].OutTangent;
-	
+
 	} else {
-		
+
 		// TODO: second derivative = 0... what is formula?  I'm making this up...
 		Tangents[0].OutTangent = 0.25f*(Keys[1].Point - Keys[0].Point);
 
 		Tangents[end].InTangent = 0.25f*(Keys[end].Point - Keys[end-1].Point);
-	
+
 	}
 
 	float total_time = (Keys[1].Time - Keys[0].Time) + (Keys[end].Time - Keys[end-1].Time);
@@ -336,15 +336,15 @@ bool CatmullRomSpline1DClass::Save(ChunkSaveClass &csave)
 bool CatmullRomSpline1DClass::Load(ChunkLoadClass &cload)
 {
 	while (cload.Open_Chunk()) {
-		
-		switch(cload.Cur_Chunk_ID()) 
+
+		switch(cload.Cur_Chunk_ID())
 		{
 			case CATMULLROM1D_CHUNK_HERMITE1D:
 				HermiteSpline1DClass::Load(cload);
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
diff --git a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h
index bd2494fd965..e970ece445e 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef CATMULLROMSPLINE_H
-#define CATMULLROMSPLINE_H
 
 #include "hermitespline.h"
 
@@ -67,12 +61,10 @@ class CatmullRomSpline3DClass : public HermiteSpline3DClass
 class CatmullRomSpline1DClass : public HermiteSpline1DClass
 {
 public:
-	void					Update_Tangents(void); 
+	void					Update_Tangents(void);
 
 	// save-load support
 	virtual const PersistFactoryClass &	Get_Factory(void) const;
 	virtual bool								Save(ChunkSaveClass &csave);
 	virtual bool								Load(ChunkLoadClass &cload);
 };
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmath.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmath.cpp
index fa9deabb29f..74386f4962e 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmath.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmath.cpp
@@ -49,7 +49,7 @@ void CollisionMath::ColmathStatsStruct::Reset(void)
 {
 	TotalCollisionCount = 0;
 	TotalCollisionHitCount = 0;
-	
+
 	CollisionRayTriCount = 0;
 	CollisionRayTriHitCount = 0;
 
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmath.h b/Core/Libraries/Source/WWVegas/WWMath/colmath.h
index c947a049b6c..e1fb5968102 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmath.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmath.h
@@ -34,24 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef COLMATH_H
-#define COLMATH_H
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
-#ifndef VECTOR3_H
 #include "vector3.h"
-#endif
-
-#ifndef CASTRES_H
 #include "castres.h"
-#endif
 
 class AAPlaneClass;
 class PlaneClass;
@@ -84,9 +71,9 @@ class CollisionMath
 	// Intersect Functions.
 	// These functions simply return a bool indicating whether the two operands intersect.
 	////////////////////////////////////////////////////////////////////////////////////////
-	static bool		Intersection_Test(const AABoxClass & box,const TriClass & tri);	
+	static bool		Intersection_Test(const AABoxClass & box,const TriClass & tri);
 	static bool		Intersection_Test(const AABoxClass & box,const AABoxClass & box2);
-	static bool		Intersection_Test(const AABoxClass & box,const OBBoxClass & box2);	
+	static bool		Intersection_Test(const AABoxClass & box,const OBBoxClass & box2);
 	static bool		Intersection_Test(const OBBoxClass & box,const TriClass & tri);
 	static bool		Intersection_Test(const OBBoxClass & box,const AABoxClass & box2);
 	static bool		Intersection_Test(const OBBoxClass & box,const OBBoxClass & box2);
@@ -96,7 +83,7 @@ class CollisionMath
 	////////////////////////////////////////////////////////////////////////////////////////
 	// Overlap Functions.
 	// Classify the second operand with respect to the first operand.
-	// For example Overlap_Test(plane,point) tests whether 'point' is in front of or 
+	// For example Overlap_Test(plane,point) tests whether 'point' is in front of or
 	// behind 'plane'.
 	// OverlapType: This enumeration is the result of an overlap test.
 	// It indicates whether the the object is in the positive (front/outside) space
@@ -162,10 +149,10 @@ class CollisionMath
 	static OverlapType	Overlap_Test(const FrustumClass & frustum,const AABoxClass & box);
 	static OverlapType	Overlap_Test(const FrustumClass & frustum,const OBBoxClass & box);
 
-	// Frustum functions for hierachical culling systems.  
-	// At your root node, just pass in planes_passed = 0, then the variable will be modified to 
-	// indicate which planes that volume was inside.  You can then pass that value in for the 
-	// test of all child nodes and optimize away some of the tests.  See AABTreeCullSystemClass 
+	// Frustum functions for hierachical culling systems.
+	// At your root node, just pass in planes_passed = 0, then the variable will be modified to
+	// indicate which planes that volume was inside.  You can then pass that value in for the
+	// test of all child nodes and optimize away some of the tests.  See AABTreeCullSystemClass
 	// for an example usage.
 	static OverlapType	Overlap_Test(const FrustumClass & frustum,const AABoxClass & box,int & planes_passed);
 	static OverlapType	Overlap_Test(const FrustumClass & frustum,const OBBoxClass & box,int & planes_passed);
@@ -201,11 +188,11 @@ class CollisionMath
 	static bool		Collide(const OBBoxClass & box,const Vector3 & move,const OBBoxClass & box2,const Vector3 & move2,CastResultStruct * result);
 
 	////////////////////////////////////////////////////////////////////////////////////////
-	// Stats 
+	// Stats
 	// Note that these functions will only work if you have stat tracking enabled
 	////////////////////////////////////////////////////////////////////////////////////////
 	struct ColmathStatsStruct
-	{	
+	{
 		ColmathStatsStruct(void);
 		void Reset(void);
 
@@ -227,7 +214,7 @@ class CollisionMath
 		int CollisionOBBoxOBBoxCount;
 		int CollisionOBBoxOBBoxHitCount;
 	};
-	
+
 	static void									Reset_Stats(void)				{ Stats.Reset(); }
 	static const ColmathStatsStruct &	Get_Current_Stats(void)		{ return Stats; }
 
@@ -295,18 +282,16 @@ inline CollisionMath::OverlapType CollisionMath::eval_overlap_collision(const Ca
 #define TRACK_COLLISION_OBBOX_OBBOX			Stats.CollisionOBBoxOBBoxCount++; Stats.TotalCollisionCount++;
 #define TRACK_COLLISION_OBBOX_OBBOX_HIT	Stats.CollisionOBBoxOBBoxHitCount++; Stats.TotalCollisionHitCount++;
 #else
-#define TRACK_COLLISION_RAY_TRI				
-#define TRACK_COLLISION_RAY_TRI_HIT			
-#define TRACK_COLLISION_AABOX_TRI			
-#define TRACK_COLLISION_AABOX_TRI_HIT		
-#define TRACK_COLLISION_AABOX_AABOX			
-#define TRACK_COLLISION_AABOX_AABOX_HIT	
-#define TRACK_COLLISION_OBBOX_TRI			
-#define TRACK_COLLISION_OBBOX_TRI_HIT		
-#define TRACK_COLLISION_OBBOX_AABOX			
-#define TRACK_COLLISION_OBBOX_AABOX_HIT	
-#define TRACK_COLLISION_OBBOX_OBBOX			
-#define TRACK_COLLISION_OBBOX_OBBOX_HIT	
+#define TRACK_COLLISION_RAY_TRI
+#define TRACK_COLLISION_RAY_TRI_HIT
+#define TRACK_COLLISION_AABOX_TRI
+#define TRACK_COLLISION_AABOX_TRI_HIT
+#define TRACK_COLLISION_AABOX_AABOX
+#define TRACK_COLLISION_AABOX_AABOX_HIT
+#define TRACK_COLLISION_OBBOX_TRI
+#define TRACK_COLLISION_OBBOX_TRI_HIT
+#define TRACK_COLLISION_OBBOX_AABOX
+#define TRACK_COLLISION_OBBOX_AABOX_HIT
+#define TRACK_COLLISION_OBBOX_OBBOX
+#define TRACK_COLLISION_OBBOX_OBBOX_HIT
 #endif
-
-#endif // COLMATH_H
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.cpp
index b6ab81da9d2..03c23aaca5b 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.cpp
@@ -148,21 +148,21 @@ CollisionMath::OverlapType CollisionMath::Overlap_Test(const AABoxClass & box,co
 	int inside_point_count = 0;
 	if (CollisionMath::Overlap_Test(box,line.Get_P0()) == INSIDE) inside_point_count++;
 	if (CollisionMath::Overlap_Test(box,line.Get_P1()) == INSIDE) inside_point_count++;
-	
+
 	if (inside_point_count == 2) {
-	
+
 		return INSIDE;
-	
+
 	} else if (inside_point_count == 1) {
-	
+
 		return OVERLAPPED;
-	
+
 	} else {
 
 		// Here I'm using the separating axis theorem to test if the line-segment
 		// and the box can be separated by a plane.  Any two convex objects that are
-		// not intersecting can be separated by a plane defined by either a 
-		// face normal from one of the objects or the cross-product of an edge from 
+		// not intersecting can be separated by a plane defined by either a
+		// face normal from one of the objects or the cross-product of an edge from
 		// each object.  In the case of an axis-aligned box and a line-segment, we
 		// have to check the three coordinate axes and the cross product between
 		// each and the direction vector of the line segment.
@@ -218,7 +218,7 @@ CollisionMath::OverlapType CollisionMath::Overlap_Test(const AABoxClass & box,co
 		} else {
 			if (-p0_proj > box_proj + WWMath::Max(dp_proj,0.0f)) return OUTSIDE;
 		}
-	
+
 		// Project box and line onto (x cross line)
 		// I'm manually optimizing the cross-product and taking advantage of the fact
 		// that 'dp' will always project to zero for this axis.
@@ -252,25 +252,25 @@ CollisionMath::OverlapType CollisionMath::Overlap_Test(const AABoxClass & box,co
 	int inside_point_count = 0;
 	if (CollisionMath::Overlap_Test(box,line.Get_P0()) == INSIDE) inside_point_count++;
 	if (CollisionMath::Overlap_Test(box,line.Get_P1()) == INSIDE) inside_point_count++;
-	
+
 	if (inside_point_count == 2) {
-	
+
 		return INSIDE;
-	
+
 	} else if (inside_point_count == 1) {
-	
+
 		return OVERLAPPED;
-	
+
 	} else {
 
-		// Now we know that both points are outside of the box so we 
+		// Now we know that both points are outside of the box so we
 		// have to detect if the ray penetrates the box.
 		// I found this algorithm in one of the GEMS books...
 		Vector3 boxmin,boxmax;
 		Vector3::Subtract(box.Center,box.Extent,&boxmin);
 		Vector3::Add(box.Center,box.Extent,&boxmax);
 
-		float candidateplane[3];	// candidate intersection plane distance for each axis 
+		float candidateplane[3];	// candidate intersection plane distance for each axis
 		float maxt[3];					// t value along the ray for each axis
 		Vector3 coord;					// intersection point
 
@@ -312,7 +312,7 @@ CollisionMath::OverlapType CollisionMath::Overlap_Test(const AABoxClass & box,co
 		if (maxt[intersection_plane] < 0.0f) {
 			return OUTSIDE;
 		}
-		
+
 		// If the intersection is beyond the end of the ray, return
 		if (maxt[intersection_plane] > 1.0f) {
 			return OUTSIDE;
@@ -322,13 +322,13 @@ CollisionMath::OverlapType CollisionMath::Overlap_Test(const AABoxClass & box,co
 		// are not the intersection planes, the intersection point should
 		// be between the min and max of the box.
 		for (i=0; i<3; i++) {
-			
+
 			if (intersection_plane != i) {
-			
+
 				coord[i] = line.Get_P0()[i] + maxt[intersection_plane] * line.Get_DP()[i];
 				if ((coord[i] < boxmin[i]) || (coord[i] > boxmax[i])) {
 					return OUTSIDE;		// ray is outside the box
-				} 
+				}
 
 			} else {
 
@@ -442,7 +442,7 @@ struct AABCollisionStruct
 		StartBad(true),													// Startbad is true until one of the axes clears it
 		AxisId(-1),															// AxisId will be the axis that allowed the longest move
 		MaxFrac(0.0f),														// MaxFrac is the longest allowed move so far
-		Box0(box0),															
+		Box0(box0),
 		Box1(box1)
 	{
 		Vector3::Subtract(box1.Center,box0.Center,&C);			// vector from center of box0 to center of box1
@@ -456,7 +456,7 @@ struct AABCollisionStruct
 
 	Vector3					C;						// Vector from the center0 to center1
 	Vector3					M;						// Move vector relative to stationary box0
-	
+
 	const AABoxClass &	Box0;
 	const AABoxClass &	Box1;
 
@@ -501,15 +501,15 @@ static inline bool aab_separation_test
 	float tmp;
 	float rsum = ra+rb;
 
-	if ( u0 + WWMATH_EPSILON > rsum ) { 
-		context.StartBad = false; 
-		if ( u1 > rsum ) { 
-			context.MaxFrac = 1.0f; 
+	if ( u0 + WWMATH_EPSILON > rsum ) {
+		context.StartBad = false;
+		if ( u1 > rsum ) {
+			context.MaxFrac = 1.0f;
 			return true;
-		} else { 
+		} else {
 			tmp = (rsum-u0)/(u1-u0);
 			if ( tmp > context.MaxFrac ) {
-				context.MaxFrac = tmp; 
+				context.MaxFrac = tmp;
 				context.AxisId = axis;
 				context.Side = +1;
 			}
@@ -517,7 +517,7 @@ static inline bool aab_separation_test
 	} else if ( u0 - WWMATH_EPSILON < -rsum ) {
 		context.StartBad = false;
 		if ( u1 < -rsum ) {
-			context.MaxFrac = 1.0f; 
+			context.MaxFrac = 1.0f;
 			return true;
 		} else {
 			tmp = (-rsum-u0)/(u1-u0);
@@ -525,9 +525,9 @@ static inline bool aab_separation_test
 				context.MaxFrac = tmp;
 				context.AxisId = axis;
 				context.Side = -1;
-			} 
-		} 
-	} 
+			}
+		}
+	}
 	return false;
 }
 
@@ -566,7 +566,7 @@ bool CollisionMath::Collide(const AABoxClass & box,const Vector3 & move,const AA
 	if (aab_separation_test(context,1)) {
 		goto exit;
 	}
-	
+
 	if (aab_separation_test(context,2)) {
 		goto exit;
 	}
@@ -587,7 +587,7 @@ bool CollisionMath::Collide(const AABoxClass & box,const Vector3 & move,const AA
 
 		if (result->ComputeContactPoint) {
 			//WWASSERT(0); // TODO
-			WWDEBUG_SAY(("AABox-AABox collision does not currently support contact point computation\r\n"));
+			WWDEBUG_SAY(("AABox-AABox collision does not currently support contact point computation"));
 		}
 
 		return true;
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h b/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h
index 44deb7589a9..70b8c50c0bb 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h
@@ -38,12 +38,7 @@
  *   CollisionMath::Overlap_Test -- Tests overlap between two AABoxes                          *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef COLMATHAABOX_H
-#define COLMATHAABOX_H
 
 #include "always.h"
 #include "aabox.h"
@@ -105,6 +100,3 @@ WWINLINE CollisionMath::OverlapType CollisionMath::Overlap_Test(const AABoxClass
 
 	return BOTH;
 }
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathaabtri.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathaabtri.cpp
index a1b0768f129..66e63353cd9 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathaabtri.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathaabtri.cpp
@@ -49,26 +49,26 @@
 
 #include "colmath.h"
 #include "aabox.h"
-#include "tri.h" 
+#include "tri.h"
 #include "wwdebug.h"
 
 
 /*
-** Separating Axes have to be rejected if their length is smaller than some epsilon.  
-** Otherwise, erroneous results can be reported. 
+** Separating Axes have to be rejected if their length is smaller than some epsilon.
+** Otherwise, erroneous results can be reported.
 */
 #define AXISLEN_EPSILON2	WWMATH_EPSILON * WWMATH_EPSILON	// squared length of a separating axis must be larger than this
 
 
-/* 
-** Axes used in Box-Tri intersection tests 
+/*
+** Axes used in Box-Tri intersection tests
 ** The axes of the box are A0,A1,A2.  N is the normal of the triangle,
 ** E0,E1,E2 are direction vectors for the edges of the triangle.
 ** (the box axes are labeled A0,A1,A2 as a holdover from the obbox-obbox
 ** collision code which this was derived from where there are two boxes
 ** A and B)
 */
-enum 
+enum
 {
 	INTERSECTION = 0,
 	AXIS_N,					// normal of the triangle
@@ -89,23 +89,23 @@ enum
 
 
 /******************************************************************************************
-	
+
 	AABox->Triangle collision
 
    This code is basically a special-case optimization of the OBBox->Triangle collision
 	detection code.  There are many dot and cross products that can be simplified due
 	to the fact that we know the axes of the boxes are always the same and are aligned
-	with the world coordinate axes.  
+	with the world coordinate axes.
 
 	Each axis test will use the following logic:
 	Project D onto the axis being used, it is the separation distance.  If the
 	projection of the extent of the box + the projection of the extent of the
 	tri is greater than D*axis then the two intersect
 
-	March 13, 2000 - Modified these routines to all use a static instance of 
+	March 13, 2000 - Modified these routines to all use a static instance of
 	the BTCollisionStruct.  The compiler was generating lots of extra code for the
 	constructor of this object and testing determined that re-using the same static
-	struct was slightly faster anyway.  
+	struct was slightly faster anyway.
 	NOTE: this makes the code not Thread-Safe!!!!
 
 
@@ -114,7 +114,7 @@ enum
 /*
 ** BoxTriColStruct
 ** Scratchpad variables for the AABox-Triangle collision detection functions.  One instance
-** of this structure will be used for all of the local variables and its pointer will be 
+** of this structure will be used for all of the local variables and its pointer will be
 ** handed of to various inline functions for the axis tests.
 ** Note that much of the code needs the un-normalized triangle normal.  For this reason,
 ** I have to compute N rather than copying it from the triangle.  (commenting this to
@@ -131,19 +131,19 @@ struct BTCollisionStruct
 		AxisId = INTERSECTION;	// axis that allowed the longest move
 		Point = 0;					// index of triangle point that was closest to the box
 		Side = 0;					// side of the interval
-		Box = &box;															
+		Box = &box;
 		Tri = &tri;
 		BoxMove = &move;
 		TriMove = &trimove;
-	
+
 		Vector3::Subtract(*tri.V[0],box.Center,&D);				// vector from center of box to vertex 0
 		Vector3::Subtract(move,trimove,&Move);						// move vector relative to stationary triangle
 
-		Vector3::Subtract(*tri.V[1],*tri.V[0],&E[0]);			
-		Vector3::Subtract(*tri.V[2],*tri.V[0],&E[1]);			
+		Vector3::Subtract(*tri.V[1],*tri.V[0],&E[0]);
+		Vector3::Subtract(*tri.V[2],*tri.V[0],&E[1]);
 		Vector3::Subtract(E[1],E[0],&E[2]);
 
-		Vector3::Cross_Product(E[0],E[1],&N);	
+		Vector3::Cross_Product(E[0],E[1],&N);
 	}
 
 	bool						StartBad;			// Inital configuration is intersecting?
@@ -152,7 +152,7 @@ struct BTCollisionStruct
 	int						AxisId;				// Last separating axis
 	int						Side;					// which side of the interval
 	int						Point;				// Index of the "closest" triangle point (or one of them)
-	
+
 	int						TestAxisId;			// Axis 'id' we're working on
 	int						TestSide;			// Was the axis we're working on flipped
 	int						TestPoint;			// Index of the closest vertex
@@ -164,7 +164,7 @@ struct BTCollisionStruct
 	float						AN[3];				// Dot products of the Basis vectors and the normal
 	Vector3					AxE[3][3];			// Cross products of the Basis vectors and edges
 
-	Vector3					E[3];					// edge vectors for the triangle 
+	Vector3					E[3];					// edge vectors for the triangle
 	Vector3					N;						// normal (NOT normalized!!!)
 	Vector3					FinalD;				// Vector from center of box to v0 at end of move
 
@@ -174,7 +174,7 @@ struct BTCollisionStruct
 	const Vector3 *		TriMove;
 
 private:
-	
+
 	// not implemented
 	BTCollisionStruct(const BTCollisionStruct &);
 	BTCollisionStruct & operator = (const BTCollisionStruct &);
@@ -201,7 +201,7 @@ static BTCollisionStruct CollisionContext;
 static inline bool aabtri_separation_test
 (
 	float lp,float leb0,float leb1
-)	
+)
 {
 	/*
 	** - If (I'm no more than 'EPSILON' embedded in the wall)
@@ -212,7 +212,7 @@ static inline bool aabtri_separation_test
 	**       - accept entire move
 	**     - Else If (I can move more than I could have before; *negative always fails!)
 	**       - update fraction
-	**   - Else 
+	**   - Else
 	**     - Accept entire move since I'm not moving towards
 	*/
 	float eps = 0.0f;
@@ -223,26 +223,26 @@ static inline bool aabtri_separation_test
 	if (lp - leb0 > -eps) {
 		CollisionContext.StartBad = false;
 		if (leb1 - leb0 > 0.0f) {
-			float frac = (lp-leb0)/(leb1-leb0);	
+			float frac = (lp-leb0)/(leb1-leb0);
 			if (frac >= 1.0f) {
-				/* moving toward but not hitting triangle */ 
+				/* moving toward but not hitting triangle */
 				CollisionContext.AxisId = CollisionContext.TestAxisId;
-				CollisionContext.MaxFrac = 1.0f; 
-				return true;  
+				CollisionContext.MaxFrac = 1.0f;
+				return true;
 			} else {
 				/* moving toward, hitting triangle */
-				if (frac > CollisionContext.MaxFrac) { 
-					CollisionContext.MaxFrac = frac; 
-					CollisionContext.AxisId = CollisionContext.TestAxisId; 
+				if (frac > CollisionContext.MaxFrac) {
+					CollisionContext.MaxFrac = frac;
+					CollisionContext.AxisId = CollisionContext.TestAxisId;
 					CollisionContext.Side = CollisionContext.TestSide;
 					CollisionContext.Point = CollisionContext.TestPoint;
 				}
 			}
 		} else {
-			/* moving away or not moving */ 
+			/* moving away or not moving */
 			CollisionContext.AxisId = CollisionContext.TestAxisId;
-			CollisionContext.MaxFrac = 1.0f; 
-			return true;  
+			CollisionContext.MaxFrac = 1.0f;
+			return true;
 		}
 	}
 	return false;
@@ -278,7 +278,7 @@ static inline bool aabtri_check_axis(void)
 	axismove = Vector3::Dot_Product(CollisionContext.Move,CollisionContext.TestAxis);
 
 	// I want the axis centered at the box, pointing towards the triangle
-	if (dist < 0) {		
+	if (dist < 0) {
 		dist = -dist;
 		axismove = -axismove;
 		CollisionContext.TestAxis = -CollisionContext.TestAxis;
@@ -289,15 +289,15 @@ static inline bool aabtri_check_axis(void)
 
 	// compute coordinates of the leading edge of the box at t0 and t1
 	leb0 =	CollisionContext.Box->Extent.X * WWMath::Fabs(CollisionContext.TestAxis.X) +
-				CollisionContext.Box->Extent.Y * WWMath::Fabs(CollisionContext.TestAxis.Y) + 
+				CollisionContext.Box->Extent.Y * WWMath::Fabs(CollisionContext.TestAxis.Y) +
 				CollisionContext.Box->Extent.Z * WWMath::Fabs(CollisionContext.TestAxis.Z);
 	leb1 = leb0 + axismove;
-	
+
 	// compute coordinate of "leading edge of the triangle" relative to the box center.
 	lp = 0;
 	tmp = Vector3::Dot_Product(CollisionContext.E[0],CollisionContext.TestAxis); if (tmp < lp) lp = tmp;
 	tmp = Vector3::Dot_Product(CollisionContext.E[1],CollisionContext.TestAxis); if (tmp < lp) lp = tmp;
-	lp = dist + lp;	
+	lp = dist + lp;
 
 	return aabtri_separation_test(/*CollisionContext,*/lp,leb0,leb1);
 }
@@ -335,7 +335,7 @@ static inline bool aabtri_check_cross_axis
 	axismove = Vector3::Dot_Product(CollisionContext.Move,CollisionContext.TestAxis);
 
 	// I want the axis centered at the box, pointing towards the triangle
-	if (p0 < 0) {		
+	if (p0 < 0) {
 		p0 = -p0;
 		axismove = -axismove;
 		dp = -dp;
@@ -347,11 +347,11 @@ static inline bool aabtri_check_cross_axis
 
 	// compute coordinates of the leading edge of the box at t1
 	leb1 = leb0 + axismove;
-	
+
 	// compute coordinate of "leading edge of the triangle" relative to the box center.
 	lp = 0; CollisionContext.TestPoint = 0;
 	if (dp < 0) { lp = dp; CollisionContext.TestPoint = dpi; }
-	lp = p0 + lp;	
+	lp = p0 + lp;
 
 	return aabtri_separation_test(/*CollisionContext,*/lp,leb0,leb1);
 }
@@ -389,7 +389,7 @@ static inline bool aabtri_check_basis_axis
 	axismove = Vector3::Dot_Product(CollisionContext.Move,CollisionContext.TestAxis);
 
 	// we want the axis centered at the box, pointing towards the triangle
-	if (dist < 0) {		
+	if (dist < 0) {
 		dist = -dist;
 		axismove = -axismove;
 		dp1 = -dp1;
@@ -401,13 +401,13 @@ static inline bool aabtri_check_basis_axis
 	}
 
 	// this is the "optimization", leb0 = one of the extents
-	leb1 = leb0 + axismove;	
-	
+	leb1 = leb0 + axismove;
+
 	// compute coordinate of "leading edge of the polygon" relative to the box center.
 	lp = 0; CollisionContext.TestPoint = 0;
 	if (dp1 < lp) { lp = dp1; CollisionContext.TestPoint = 1; }
 	if (dp2 < lp) { lp = dp2; CollisionContext.TestPoint = 2; }
-	lp = dist + lp;	
+	lp = dist + lp;
 
 	return aabtri_separation_test(/*CollisionContext,*/lp,leb0,leb1);
 }
@@ -450,7 +450,7 @@ static inline bool aabtri_check_normal_axis(void)
 	}
 
 	leb0 =	CollisionContext.Box->Extent.X * WWMath::Fabs(CollisionContext.AN[0]) +
-				CollisionContext.Box->Extent.Y * WWMath::Fabs(CollisionContext.AN[1]) + 
+				CollisionContext.Box->Extent.Y * WWMath::Fabs(CollisionContext.AN[1]) +
 				CollisionContext.Box->Extent.Z * WWMath::Fabs(CollisionContext.AN[2]);
 	leb1 = leb0 + axismove;
 	CollisionContext.TestPoint = 0;
@@ -500,7 +500,7 @@ static inline void aabtri_compute_contact_normal
 )
 {
 #if 1
-	switch(CollisionContext.AxisId) 
+	switch(CollisionContext.AxisId)
 	{
 		case INTERSECTION:
 			set_norm = CollisionContext.N;
@@ -652,7 +652,7 @@ bool CollisionMath::Collide
 		dp = CollisionContext.AN[0];
 		leb0 = box.Extent[1]*WWMath::Fabs(CollisionContext.AE[2][0]) + box.Extent[2]*WWMath::Fabs(CollisionContext.AE[1][0]);
 		if (aabtri_check_cross_axis(dp,2,leb0)) goto exit;
-	} 
+	}
 
 	/*
 	** AXIS_A0xE1
@@ -749,7 +749,7 @@ bool CollisionMath::Collide
 		leb0 = box.Extent[0]*WWMath::Fabs(CollisionContext.AE[1][1]) + box.Extent[1]*WWMath::Fabs(CollisionContext.AE[0][1]);
 		if (aabtri_check_cross_axis(dp,1,leb0)) goto exit;
 	}
-	
+
 	/*
 	** AXIS_A2xE2
 	*/
@@ -772,7 +772,7 @@ bool CollisionMath::Collide
 
 		CollisionContext.TestAxis.Set(0,-CollisionContext.Move.Z,CollisionContext.Move.Y);						// A0 X Move
 		VERIFY_CROSS(Vector3(1,0,0),CollisionContext.Move,CollisionContext.TestAxis);
-		if (CollisionContext.TestAxis.Length2() > AXISLEN_EPSILON2) {					
+		if (CollisionContext.TestAxis.Length2() > AXISLEN_EPSILON2) {
 			if (aabtri_check_axis()) goto exit;
 		}
 		CollisionContext.TestAxis.Set(CollisionContext.Move.Z,0,-CollisionContext.Move.X);						// A1 X Move
@@ -798,7 +798,7 @@ bool CollisionMath::Collide
 	}
 
 	/*
-	** If the triangle and box are intersecting before the move, return that 
+	** If the triangle and box are intersecting before the move, return that
 	** result.
 	*/
 	if (CollisionContext.StartBad) {
@@ -810,14 +810,14 @@ bool CollisionMath::Collide
 	}
 
 	/*
-	** If the fraction allowed is basically equal to the fraction allowed by 
+	** If the fraction allowed is basically equal to the fraction allowed by
 	** another polygon, try to pick the polygon which is least "edge-on" to the
 	** move.
 	*/
 	if ((CollisionContext.MaxFrac <= result->Fraction) && (CollisionContext.MaxFrac < 1.0f)) {
 
 		/*
-		** Reflect the normal if it is pointing the same way as our move 
+		** Reflect the normal if it is pointing the same way as our move
 		** (probably hitting the back side of a polygon)
 		*/
 		Vector3 tmp_norm(0.0f,0.0f,0.0f);
@@ -830,19 +830,19 @@ bool CollisionMath::Collide
 		** If this polygon cuts off more of the move -OR- this polygon cuts
 		** of the same amount but has a "better" normal, then use this normal
 		*/
-		if (	(WWMath::Fabs(CollisionContext.MaxFrac - result->Fraction) > WWMATH_EPSILON) ||  
+		if (	(WWMath::Fabs(CollisionContext.MaxFrac - result->Fraction) > WWMATH_EPSILON) ||
 				(Vector3::Dot_Product(tmp_norm,move) < Vector3::Dot_Product(result->Normal,move)))
 		{
 			result->Normal = tmp_norm;
 			WWASSERT(WWMath::Fabs(result->Normal.Length() - 1.0f) < WWMATH_EPSILON);
 		}
-				
+
 		result->Fraction = CollisionContext.MaxFrac;
 
 		TRACK_COLLISION_AABOX_TRI_HIT;
 		return true;
 	}
-	
+
 	return false;
 }
 
@@ -851,7 +851,7 @@ bool CollisionMath::Collide
 /*
 ** AABTIntersectStruct
 ** Scratchpad variables for the AABox-Triangle intersection functions.  One instance
-** of this structure will be used for all of the local variables and its pointer will be 
+** of this structure will be used for all of the local variables and its pointer will be
 ** handed of to various inline functions for the axis tests.
 ** Note that much of the code needs the un-normalized triangle normal.  For this reason,
 ** I have to compute N rather than copying it from the triangle.  (commenting this to
@@ -860,21 +860,21 @@ bool CollisionMath::Collide
 struct AABTIntersectStruct
 {
 	AABTIntersectStruct(void) :
-		Box(NULL),															
+		Box(NULL),
 		Tri(NULL)
 	{
 	}
-	
-	void Init(const AABoxClass &box,const TriClass &tri) 
+
+	void Init(const AABoxClass &box,const TriClass &tri)
 	{
-		Box = &box;															
+		Box = &box;
 		Tri = &tri;
 		Vector3::Subtract(*tri.V[0],box.Center,&D);				// vector from center of box to vertex 0
-		Vector3::Subtract(*tri.V[1],*tri.V[0],&E[0]);			
-		Vector3::Subtract(*tri.V[2],*tri.V[0],&E[1]);			
+		Vector3::Subtract(*tri.V[1],*tri.V[0],&E[0]);
+		Vector3::Subtract(*tri.V[2],*tri.V[0],&E[1]);
 		Vector3::Subtract(E[1],E[0],&E[2]);
 
-		Vector3::Cross_Product(E[0],E[1],&N);	
+		Vector3::Cross_Product(E[0],E[1],&N);
 	}
 
 
@@ -883,14 +883,14 @@ struct AABTIntersectStruct
 	float						AN[3];				// Dot products of the Basis vectors and the normal
 	Vector3					AxE[3][3];			// Cross produts of the Basis vectors and edges
 
-	Vector3					E[3];					// edge vectors for the triangle 
+	Vector3					E[3];					// edge vectors for the triangle
 	Vector3					N;						// normal (NOT normalized!!!)
 
 	const AABoxClass *	Box;
 	const TriClass *		Tri;
 
 private:
-	
+
 	// not implemented
 	AABTIntersectStruct(const AABTIntersectStruct &);
 	AABTIntersectStruct & operator = (const AABTIntersectStruct &);
@@ -926,7 +926,7 @@ static inline bool aabtri_intersect_cross_axis
 	p0 = Vector3::Dot_Product(IntersectContext.D,axis);
 
 	// I want the axis centered at the box, pointing towards the triangle
-	if (p0 < 0) {		
+	if (p0 < 0) {
 		p0 = -p0;
 		axis = -axis;
 		dp = -dp;
@@ -935,7 +935,7 @@ static inline bool aabtri_intersect_cross_axis
 	// compute coordinate of "leading edge of the triangle" relative to the box center.
 	lp = 0;
 	if (dp < 0) { lp = dp; }
-	lp = p0 + lp;	
+	lp = p0 + lp;
 
 	return (lp - leb0 > -WWMATH_EPSILON);
 }
@@ -969,18 +969,18 @@ static inline bool aabtri_intersect_basis_axis
 	dist = Vector3::Dot_Product(IntersectContext.D,axis);
 
 	// we want the axis centered at the box, pointing towards the triangle
-	if (dist < 0) {		
+	if (dist < 0) {
 		dist = -dist;
 		axis = -axis;
 		dp1 = -dp1;
 		dp2 = -dp2;
-	} 
+	}
 
 	// compute coordinate of "leading edge of the polygon" relative to the box center.
 	lp = 0;
 	if (dp1 < lp) { lp = dp1; }
 	if (dp2 < lp) { lp = dp2; }
-	lp = dist + lp;	
+	lp = dist + lp;
 
 	return (lp - leb0 > -WWMATH_EPSILON);
 }
@@ -1018,7 +1018,7 @@ static inline bool aabtri_intersect_normal_axis
 	}
 
 	leb0 =	IntersectContext.Box->Extent.X * WWMath::Fabs(IntersectContext.AN[0]) +
-				IntersectContext.Box->Extent.Y * WWMath::Fabs(IntersectContext.AN[1]) + 
+				IntersectContext.Box->Extent.Y * WWMath::Fabs(IntersectContext.AN[1]) +
 				IntersectContext.Box->Extent.Z * WWMath::Fabs(IntersectContext.AN[2]);
 	lp = dist;	// this is the "optimization", don't have to find lp
 
@@ -1168,7 +1168,7 @@ bool CollisionMath::Intersection_Test(const AABoxClass & box,const TriClass & tr
 		leb0 = box.Extent[0]*WWMath::Fabs(IntersectContext.AE[1][1]) + box.Extent[1]*WWMath::Fabs(IntersectContext.AE[0][1]);
 		if (aabtri_intersect_cross_axis(axis,dp,leb0)) return false;
 	}
-	
+
 	/*
 	** AXIS_A2xE2
 	*/
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.cpp
index 97653d7e2b0..261abc558ab 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.cpp
@@ -57,7 +57,7 @@ CollisionMath::OverlapType
 CollisionMath::Overlap_Test(const FrustumClass & frustum,const Vector3 & point)
 {
 	int mask = 0;
-	
+
 	for (int i = 0; i < 6; i++) {
 		int result = CollisionMath::Overlap_Test(frustum.Planes[i],point);
 		if (result == OUTSIDE) {
@@ -76,7 +76,7 @@ CollisionMath::OverlapType
 CollisionMath::Overlap_Test(const FrustumClass & frustum,const TriClass & tri)
 {
 	int mask = 0;
-	
+
 	// TODO: doesn't catch all cases...
 	for (int i = 0; i < 6; i++) {
 		int result = CollisionMath::Overlap_Test(frustum.Planes[i],tri);
@@ -96,7 +96,7 @@ CollisionMath::OverlapType
 CollisionMath::Overlap_Test(const FrustumClass & frustum,const SphereClass & sphere)
 {
 	int mask = 0;
-	
+
 	// TODO: doesn't catch all cases...
 	for (int i = 0; i < 6; i++) {
 		int result = CollisionMath::Overlap_Test(frustum.Planes[i],sphere);
@@ -116,7 +116,7 @@ CollisionMath::OverlapType
 CollisionMath::Overlap_Test(const FrustumClass & frustum,const AABoxClass & box)
 {
 	int mask = 0;
-	
+
 	// TODO: doesn't catch all cases...
 	for (int i = 0; i < 6; i++) {
 		int result = CollisionMath::Overlap_Test(frustum.Planes[i],box);
@@ -137,7 +137,7 @@ CollisionMath::OverlapType
 CollisionMath::Overlap_Test(const FrustumClass & frustum,const OBBoxClass & box)
 {
 	int mask = 0;
-	
+
 	// TODO: doesn't catch all cases...
 	for (int i = 0; i < 6; i++) {
 		int result = CollisionMath::Overlap_Test(frustum.Planes[i],box);
@@ -154,19 +154,19 @@ CollisionMath::Overlap_Test(const FrustumClass & frustum,const OBBoxClass & box)
 }
 
 
-CollisionMath::OverlapType	
+CollisionMath::OverlapType
 CollisionMath::Overlap_Test(const FrustumClass & frustum,const OBBoxClass & box,int & planes_passed)
 {
 	int mask = 0;
-	
+
 	// TODO: doesn't catch all cases...
 	for (int i = 0; i < 6; i++) {
 
 		int plane_bit = (1<<i);
 
-		// only check this plane if we have to	
+		// only check this plane if we have to
 		if ((planes_passed & plane_bit) == 0) {
-			
+
 			int result = CollisionMath::Overlap_Test(frustum.Planes[i],box);
 			if (result == OUTSIDE) {
 				return OUTSIDE;
@@ -176,7 +176,7 @@ CollisionMath::Overlap_Test(const FrustumClass & frustum,const OBBoxClass & box,
 			mask |= result;
 
 		} else {
-		
+
 			mask |= INSIDE;
 
 		}
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h b/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h
index 26fff6ba7df..528ac9b688a 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h
@@ -37,12 +37,7 @@
  *   CollisionMath::Overlap_Test -- test a frustum and an AABox for overlap                    *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef COLMATHFRUSTUM_H
-#define COLMATHFRUSTUM_H
 
 #include "always.h"
 #include "aabox.h"
@@ -66,7 +61,7 @@
  * HISTORY:                                                                                    *
  *   3/29/2000  gth : Created.                                                                 *
  *=============================================================================================*/
-inline 
+inline
 CollisionMath::OverlapType
 CollisionMath::Overlap_Test(const FrustumClass & frustum,const AABoxClass & box,int & planes_passed)
 {
@@ -76,10 +71,10 @@ CollisionMath::Overlap_Test(const FrustumClass & frustum,const AABoxClass & box,
 	for (int i = 0; i < 6; i++) {
 
 		int plane_bit = (1<<i);
-	
-		// only check this plane if we have to	
+
+		// only check this plane if we have to
 		if ((planes_passed & plane_bit) == 0) {
-		
+
 			int result = CollisionMath::Overlap_Test(frustum.Planes[i],box);
 			if (result == OUTSIDE) {
 
@@ -88,11 +83,11 @@ CollisionMath::Overlap_Test(const FrustumClass & frustum,const AABoxClass & box,
 				planes_passed |= plane_bit;
 			}
 			mask |= result;
-		
+
 		} else {
-		
+
 			mask |= INSIDE;
-		
+
 		}
 	}
 
@@ -101,5 +96,3 @@ CollisionMath::Overlap_Test(const FrustumClass & frustum,const AABoxClass & box,
 	}
 	return OVERLAPPED;
 }
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h b/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h
index 15c80b52357..d06e715bea8 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h
@@ -36,18 +36,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef COLMATHINLINES_H
-#define COLMATHINLINES_H
 
 #include "colmathaabox.h"
 #include "colmathfrustum.h"
 #include "colmathline.h"
 #include "colmathplane.h"
-
-#endif
-
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathline.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathline.cpp
index 469455dbcfa..c7a0ec0bf3d 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathline.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathline.cpp
@@ -48,9 +48,9 @@
 
 /*
 ** Structure used in the line->box test.  There was a lot of common code between the axis-
-** aligned and oriented box tests so I package all of the truely relevant information into 
-** this struct and pass it into a function local to this module.  In the case of oriented 
-** boxes, the ray must be transformed into the box's coordinate system prior to the call 
+** aligned and oriented box tests so I package all of the truely relevant information into
+** this struct and pass it into a function local to this module.  In the case of oriented
+** boxes, the ray must be transformed into the box's coordinate system prior to the call
 ** and the normal is calculated slightly differently.
 */
 struct BoxTestStruct
@@ -81,7 +81,7 @@ enum BoxSideType {
 ** Table of normals for an axis aligned box.
 ** access like this:
 **
-** _box_normal[AXIS][SIDE] 
+** _box_normal[AXIS][SIDE]
 **
 ** <AXIS> is 0,1,2 meaning x,y,z
 ** <SIDE> is BOX_SIDE_NEGATIVE or BOX_SIDE_POSITIVE
@@ -201,7 +201,7 @@ bool CollisionMath::Collide(const LineSegClass & line,const TriClass & tri,CastR
 	float num,den,t;
 
 	den = Vector3::Dot_Product(plane.N,line.Get_DP());
-	
+
 	/*
 	** If the denominator is zero, the ray is parallel to the plane
 	*/
@@ -265,7 +265,7 @@ bool CollisionMath::Collide(const LineSegClass & line,const SphereClass & sphere
 			Vector3 p = line.Get_P0() + (clen - d)*line.Get_Dir();
 			Vector3 norm = p - sphere.Center;
 			norm /= sphere.Radius;
-			
+
 			res->Normal = norm;
 			if (res->ComputeContactPoint) {
 				res->ContactPoint = line.Get_P0() + res->Fraction * line.Get_DP();
@@ -292,8 +292,8 @@ bool CollisionMath::Collide(const LineSegClass & line,const AABoxClass & box,Cas
 
 	// if ray starts inside the box, note that fact and bail.
 	if (test.Inside) {
-		res->StartBad = true;	
-		return true;	
+		res->StartBad = true;
+		return true;
 	}
 
 	// Now, if this intersection is before any current intersection
@@ -327,7 +327,7 @@ bool CollisionMath::Collide(const LineSegClass & line,const OBBoxClass & box,Cas
 
 	// if ray starts inside the box, don't collide
 	if (test.Inside) {
-		result->StartBad = true;	
+		result->StartBad = true;
 		return true;
 	}
 
@@ -336,7 +336,7 @@ bool CollisionMath::Collide(const LineSegClass & line,const OBBoxClass & box,Cas
 	if (test.Fraction < result->Fraction) {
 		result->Fraction = test.Fraction;
 		assert(test.Side != BOX_SIDE_MIDDLE);
-		
+
 		switch (test.Axis) {
 			case 0:
 				result->Normal.Set(box.Basis[0][0],box.Basis[1][0],box.Basis[2][0]);
@@ -380,7 +380,7 @@ inline bool Test_Aligned_Box(BoxTestStruct * test)
 {
 	int i;
 
-	// candidate intersection plane distance for each axis 
+	// candidate intersection plane distance for each axis
 	float candidateplane[3];
 
 	// t value along the ray for each axis
@@ -406,7 +406,7 @@ inline bool Test_Aligned_Box(BoxTestStruct * test)
 			quadrant[i] = BOX_SIDE_MIDDLE;
 		}
 	}
-	
+
 	/*
 	** Ray started out inside the box...
 	*/
@@ -431,7 +431,7 @@ inline bool Test_Aligned_Box(BoxTestStruct * test)
 	** Get the largest of the maxt's for the final choice of intersection
 	*/
 	int intersection_plane = 0;
-	
+
 	for (i=1; i<3; i++) {
 		if (maxt[i] > maxt[intersection_plane]) {
 			intersection_plane = i;
@@ -451,16 +451,16 @@ inline bool Test_Aligned_Box(BoxTestStruct * test)
 	** be between the min and max of the box.
 	*/
 	for (i=0; i<3; i++) {
-		
+
 		if (intersection_plane != i) {
-		
+
 			coord[i] = test->P0[i] + maxt[intersection_plane] * test->DP[i];
-			
+
 			if ((coord[i] < test->Min[i]) || (coord[i] > test->Max[i])) {
 
 				return false;		// ray is outside the box
-			
-			} 
+
+			}
 
 		} else {
 
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathline.h b/Core/Libraries/Source/WWVegas/WWMath/colmathline.h
index d2a890de2b8..3dd52c2ebb3 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathline.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathline.h
@@ -36,8 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef COLMATHLINE_H
-#define COLMATHLINE_H
+#pragma once
 
 /*
 ** Inline collision functions dealing with line segments
@@ -55,10 +54,3 @@ inline CollisionMath::OverlapType	CollisionMath::Overlap_Test
 	box.Init_Min_Max(min,max);
 	return CollisionMath::Overlap_Test(box,line);
 }
-
-
-
-
-#endif
-
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathobbobb.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathobbobb.cpp
index eae39169c95..be254af2655 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathobbobb.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathobbobb.cpp
@@ -60,17 +60,17 @@
 
 
 /*
-** Separating Axes have to be rejected if their length is smaller than some epsilon.  
-** Otherwise, erroneous results can be reported. 
+** Separating Axes have to be rejected if their length is smaller than some epsilon.
+** Otherwise, erroneous results can be reported.
 */
 #define AXISLEN_EPSILON2	WWMATH_EPSILON * WWMATH_EPSILON	// squared length of a separating axis must be larger than this
 
 
-enum 
+enum
 {
 	/* Axes used in Box-Box intersection tests */
 	INTERSECTION = 0,
-	AXIS_A0,	
+	AXIS_A0,
 	AXIS_A1,
 	AXIS_A2,
 	AXIS_B0,
@@ -94,7 +94,7 @@ enum
 	OBBox-OBBox intersection detection
 
    As with most of the collision detection functions, this code is based on the theorem
-	that given any two non-intersecting convex polyhedra, a separating plane/axis 
+	that given any two non-intersecting convex polyhedra, a separating plane/axis
 	can be found that will be defined by one of the face normals of one of the polyhedra
 	or the cross product of an edge from each polyhedra.
 
@@ -102,14 +102,14 @@ enum
 	Each of the basis vectors from box A, each of the basis vectors from box B, and
 	the cross products of any combination of a basis vector from A and a basis vector
 	from B.  Some of these separating axis tests can be optimized.  For example, if
-	the axis being tested is a basis vector from the first box, then that box's 
+	the axis being tested is a basis vector from the first box, then that box's
 	extent does not need to be projected onto the axis...
 
-	The first batch of functions in this module implement a intersection test.  
-	A boolean is returned indicating whether the two boxes intersect each other 
+	The first batch of functions in this module implement a intersection test.
+	A boolean is returned indicating whether the two boxes intersect each other
 	in any way.
 
-   The OBB-ABB and ABB-OBB functions are also implemented in a way that	re-uses 
+   The OBB-ABB and ABB-OBB functions are also implemented in a way that	re-uses
 	the OBB-OBB code.
 
 ********************************************************************************/
@@ -123,7 +123,7 @@ enum
 struct ObbIntersectionStruct
 {
 	ObbIntersectionStruct(const OBBoxClass &box0,const OBBoxClass & box1) :
-		Box0(box0),															
+		Box0(box0),
 		Box1(box1)
 	{
 		Vector3::Subtract(box1.Center,box0.Center,&C);	// vector from center of box0 to center of box1
@@ -177,8 +177,8 @@ static bool obb_intersect_box0_basis
 	// ra = box0 projection onto the axis
 	// rb = box1 projection onto the axis
 	float ra =	context.Box0.Extent[axis_index];
-	float rb =	WWMath::Fabs(context.Box1.Extent[0]*context.AB[axis_index][0]) + 
-					WWMath::Fabs(context.Box1.Extent[1]*context.AB[axis_index][1]) + 
+	float rb =	WWMath::Fabs(context.Box1.Extent[0]*context.AB[axis_index][0]) +
+					WWMath::Fabs(context.Box1.Extent[1]*context.AB[axis_index][1]) +
 					WWMath::Fabs(context.Box1.Extent[2]*context.AB[axis_index][2]);
 	float rsum = ra+rb;
 
@@ -214,8 +214,8 @@ static bool obb_intersect_box1_basis
 {
 	// ra = box0 projection onto the axis
 	// rb = box1 projection onto the axis
-	float ra =	WWMath::Fabs(context.Box0.Extent[0]*context.AB[0][axis_index]) + 
-					WWMath::Fabs(context.Box0.Extent[1]*context.AB[1][axis_index]) + 
+	float ra =	WWMath::Fabs(context.Box0.Extent[0]*context.AB[0][axis_index]) +
+					WWMath::Fabs(context.Box0.Extent[1]*context.AB[1][axis_index]) +
 					WWMath::Fabs(context.Box0.Extent[2]*context.AB[2][axis_index]);
 	float rb =	context.Box1.Extent[axis_index];
 	float rsum = ra+rb;
@@ -287,7 +287,7 @@ bool intersect_obb_obb
 {
 	Vector3 axis;
 	float ra,rb;
-	
+
 	/////////////////////////////////////////////////////////////////////////
 	// Axis = A0
 	/////////////////////////////////////////////////////////////////////////
@@ -354,7 +354,7 @@ bool intersect_obb_obb
 		rb = WWMath::Fabs(context.Box1.Extent[0]*context.AB[0][2])+WWMath::Fabs(context.Box1.Extent[2]*context.AB[0][0]);
 		if (obb_intersect_axis(context,axis,ra,rb)) return false;
 	}
-	
+
 	/////////////////////////////////////////////////////////////////////////
 	// Axis = A0xB2
 	/////////////////////////////////////////////////////////////////////////
@@ -392,7 +392,7 @@ bool intersect_obb_obb
 	if (axis.Length2() > AXISLEN_EPSILON2) {
 		ra = WWMath::Fabs(context.Box0.Extent[0]*context.AB[2][2])+WWMath::Fabs(context.Box0.Extent[2]*context.AB[0][2]);
 		rb = WWMath::Fabs(context.Box1.Extent[0]*context.AB[1][1])+WWMath::Fabs(context.Box1.Extent[1]*context.AB[1][0]);
-		if (obb_intersect_axis(context,axis,ra,rb)) return false; 
+		if (obb_intersect_axis(context,axis,ra,rb)) return false;
 	}
 
 	/////////////////////////////////////////////////////////////////////////
@@ -497,11 +497,11 @@ bool CollisionMath::Intersection_Test(const AABoxClass & box0,const OBBoxClass &
 	This batch of functions implement collision detection for moving oriented
 	boxes.  Assuming that the two arbitrarily oriented boxes are moving at a constant
 	velocity along a path and not rotating, the time of collision can be found.
-	The OBB-ABB and ABB-OBB functions are also implemented in a way that	re-uses 
+	The OBB-ABB and ABB-OBB functions are also implemented in a way that	re-uses
 	the OBB-OBB code.
 
 	For the code which computes the point of collision and collision normal, you'll
-	have to refer to the paper by Dave Eberly on oriented bounding boxes.  The 
+	have to refer to the paper by Dave Eberly on oriented bounding boxes.  The
 	formulas for the collision point are the only part of this I was unable to
 	derive myself (they are pretty nasty...)
 
@@ -519,7 +519,7 @@ struct ObbCollisionStruct
 		StartBad(true),													// Startbad is true until one of the axes clears it
 		AxisId(INTERSECTION),											// AxisId will be the axis that allowed the longest move
 		MaxFrac(0.0f),														// MaxFrac is the longest allowed move so far
-		Box0(box0),															
+		Box0(box0),
 		Move0(move0),
 		Box1(box1),
 		Move1(move1)
@@ -546,7 +546,7 @@ struct ObbCollisionStruct
 
 	Vector3					C;						// Vector from the center0 to center1
 	Vector3					M;						// Move vector relative to stationary box0
-	
+
 	Vector3					A[3];					// basis vectors for box0
 	Vector3					B[3];					// basis vectors for box1
 	float						AB[3][3];			// dot products of the basis vectors
@@ -588,15 +588,15 @@ static inline bool obb_separation_test
 	float tmp;
 	float rsum = ra+rb;
 
-	if ( u0 + WWMATH_EPSILON > rsum ) { 
-		context.StartBad = false; 
-		if ( u1 > rsum ) { 
-			context.MaxFrac = 1.0f; 
+	if ( u0 + WWMATH_EPSILON > rsum ) {
+		context.StartBad = false;
+		if ( u1 > rsum ) {
+			context.MaxFrac = 1.0f;
 			return true;
 		} else if (WWMath::Fabs(u1-u0) > 0.0f) {
 			tmp = (rsum-u0)/(u1-u0);
 			if ( tmp > context.MaxFrac ) {
-				context.MaxFrac = tmp; 
+				context.MaxFrac = tmp;
 				context.AxisId = context.TestAxisId;
 				context.Side = +1;
 			}
@@ -604,7 +604,7 @@ static inline bool obb_separation_test
 	} else if ( u0 - WWMATH_EPSILON < -rsum ) {
 		context.StartBad = false;
 		if ( u1 < -rsum ) {
-			context.MaxFrac = 1.0f; 
+			context.MaxFrac = 1.0f;
 			return true;
 		} else if (WWMath::Fabs(u1-u0) > 0.0f) {
 			tmp = (-rsum-u0)/(u1-u0);
@@ -612,9 +612,9 @@ static inline bool obb_separation_test
 				context.MaxFrac = tmp;
 				context.AxisId = context.TestAxisId;
 				context.Side = -1;
-			} 
-		} 
-	} 
+			}
+		}
+	}
 	return false;
 }
 
@@ -640,8 +640,8 @@ static bool obb_check_box0_basis
 	// ra = box0 projection onto the axis
 	// rb = box1 projection onto the axis
 	float ra =	context.Box0.Extent[axis_index];
-	float rb =	WWMath::Fabs(context.Box1.Extent[0]*context.AB[axis_index][0]) + 
-					WWMath::Fabs(context.Box1.Extent[1]*context.AB[axis_index][1]) + 
+	float rb =	WWMath::Fabs(context.Box1.Extent[0]*context.AB[axis_index][0]) +
+					WWMath::Fabs(context.Box1.Extent[1]*context.AB[axis_index][1]) +
 					WWMath::Fabs(context.Box1.Extent[2]*context.AB[axis_index][2]);
 
 	// u0 = projected distance between the box centers at t0
@@ -673,8 +673,8 @@ static bool obb_check_box1_basis
 {
 	// ra = box0 projection onto the axis
 	// rb = box1 projection onto the axis
-	float ra =	WWMath::Fabs(context.Box0.Extent[0]*context.AB[0][axis_index]) + 
-					WWMath::Fabs(context.Box0.Extent[1]*context.AB[1][axis_index]) + 
+	float ra =	WWMath::Fabs(context.Box0.Extent[0]*context.AB[0][axis_index]) +
+					WWMath::Fabs(context.Box0.Extent[1]*context.AB[1][axis_index]) +
 					WWMath::Fabs(context.Box0.Extent[2]*context.AB[2][axis_index]);
 	float rb =	context.Box1.Extent[axis_index];
 
@@ -730,11 +730,11 @@ static inline void obb_compute_projections
 	float *								rb
 )
 {
-	*ra =	context.Box0.Extent.X * WWMath::Fabs(Vector3::Dot_Product(context.A[0],context.TestAxis)) + 
+	*ra =	context.Box0.Extent.X * WWMath::Fabs(Vector3::Dot_Product(context.A[0],context.TestAxis)) +
 			context.Box0.Extent.Y * WWMath::Fabs(Vector3::Dot_Product(context.A[1],context.TestAxis)) +
 			context.Box0.Extent.Z * WWMath::Fabs(Vector3::Dot_Product(context.A[2],context.TestAxis));
 
-	*rb =	context.Box1.Extent.X * WWMath::Fabs(Vector3::Dot_Product(context.B[0],context.TestAxis)) + 
+	*rb =	context.Box1.Extent.X * WWMath::Fabs(Vector3::Dot_Product(context.B[0],context.TestAxis)) +
 			context.Box1.Extent.Y * WWMath::Fabs(Vector3::Dot_Product(context.B[1],context.TestAxis)) +
 			context.Box1.Extent.Z * WWMath::Fabs(Vector3::Dot_Product(context.B[2],context.TestAxis));
 }
@@ -754,7 +754,7 @@ static inline void obb_compute_projections
  *=============================================================================================*/
 static inline void compute_contact_normal(ObbCollisionStruct & context,CastResultStruct * result)
 {
-	switch(context.AxisId) 
+	switch(context.AxisId)
 	{
 	case INTERSECTION:
 #pragma message("Fatal assert disabled for demo, obb-obb collision")
@@ -829,7 +829,7 @@ static inline void compute_contact_normal(ObbCollisionStruct & context,CastResul
 		Vector3::Cross_Product(context.A[2],context.B[2],&result->Normal);
 		result->Normal.Normalize();
 		break;
-	}	
+	}
 
 	result->Normal *= -context.Side;
 }
@@ -889,10 +889,10 @@ static inline void compute_contact_point(ObbCollisionStruct & context,CastResult
 		Vector3::Subtract(cnew1,cnew0,&dcnew);
 	}
 
-	//PROBLEMS: 
+	//PROBLEMS:
 	//in case of edge-face or face-face or perfectly aligned edge-edge this
-	//routine is only computing a single point.  
-	switch(context.AxisId) 
+	//routine is only computing a single point.
+	switch(context.AxisId)
 	{
 	case AXIS_A0:
 	case AXIS_A1:
@@ -921,7 +921,7 @@ static inline void compute_contact_point(ObbCollisionStruct & context,CastResult
 		x[2] = eval_side(context.AB[1][0],context.Side) * context.Box0.Extent[2];
 		y[1] = -eval_side(context.AB[0][2],context.Side) * context.Box1.Extent[1];
 		y[2] = eval_side(context.AB[0][1],context.Side) * context.Box1.Extent[2];
-		
+
 		den = (1.0f - context.AB[0][0] * context.AB[0][0]);
 		if (WWMath::Fabs(den) > 0.0f) {
 			x[0] = Vector3::Dot_Product(context.A[0],dcnew);
@@ -932,7 +932,7 @@ static inline void compute_contact_point(ObbCollisionStruct & context,CastResult
 			x[0] = 0.0f;
 		}
 		break;
-	
+
 	case AXIS_A0B1:
 		x[1] = -eval_side(context.AB[2][1],context.Side) * context.Box0.Extent[1];
 		x[2] = eval_side(context.AB[1][1],context.Side) * context.Box0.Extent[2];
@@ -944,12 +944,12 @@ static inline void compute_contact_point(ObbCollisionStruct & context,CastResult
 			x[0] = Vector3::Dot_Product(context.A[0],dcnew);
 			x[0] += context.AB[0][1] * (Vector3::Dot_Product(-context.B[1],dcnew) + context.AB[1][1]*x[1] + context.AB[2][1]*x[2]);
 			x[0] += context.AB[0][0] * y[0] + context.AB[0][2] * y[2];
-			x[0] /= den; 
+			x[0] /= den;
 		} else {
 			x[0] = 0.0f;
 		}
 		break;
-	
+
 	case AXIS_A0B2:
 		x[1] = -eval_side(context.AB[2][2],context.Side) * context.Box0.Extent[1];
 		x[2] = eval_side(context.AB[1][2],context.Side) * context.Box0.Extent[2];
@@ -978,7 +978,7 @@ static inline void compute_contact_point(ObbCollisionStruct & context,CastResult
 			x[1] = Vector3::Dot_Product(context.A[1],dcnew);
 			x[1] += context.AB[1][0] * (Vector3::Dot_Product(-context.B[0],dcnew) + context.AB[0][0]*x[0] + context.AB[2][0]*x[2]);
 			x[1] += context.AB[1][1] * y[1] + context.AB[1][2] * y[2];
-			x[1] /= den; 
+			x[1] /= den;
 		} else {
 			x[1] = 0.0f;
 		}
@@ -995,7 +995,7 @@ static inline void compute_contact_point(ObbCollisionStruct & context,CastResult
 			x[1] = Vector3::Dot_Product(context.A[1],dcnew);
 			x[1] += context.AB[1][1] * (Vector3::Dot_Product(-context.B[1],dcnew) + context.AB[0][1]*x[0] + context.AB[2][1]*x[2]);
 			x[1] += context.AB[1][0] * y[0] + context.AB[1][2] * y[2];
-			x[1] /= den; 
+			x[1] /= den;
 		} else {
 			x[1] = 0.0f;
 		}
@@ -1034,7 +1034,7 @@ static inline void compute_contact_point(ObbCollisionStruct & context,CastResult
 			x[2] = 0.0f;
 		}
 		break;
-	
+
 	case AXIS_A2B1:
 		x[0] = -eval_side(context.AB[1][1],context.Side) * context.Box0.Extent[0];
 		x[1] = eval_side(context.AB[0][1],context.Side) * context.Box0.Extent[1];
@@ -1051,14 +1051,14 @@ static inline void compute_contact_point(ObbCollisionStruct & context,CastResult
 			x[2] = 0.0f;
 		}
 		break;
-	
+
 	case AXIS_A2B2:
 		x[0] = -eval_side(context.AB[1][2],context.Side) * context.Box0.Extent[0];
 		x[1] = eval_side(context.AB[0][2],context.Side) * context.Box0.Extent[1];
 		y[0] = -eval_side(context.AB[2][1],context.Side) * context.Box1.Extent[0];
 		y[1] = eval_side(context.AB[2][0],context.Side) * context.Box1.Extent[1];
 
-		den = (1.0f - context.AB[2][2] * context.AB[2][2]); 
+		den = (1.0f - context.AB[2][2] * context.AB[2][2]);
 		if (WWMath::Fabs(den) > 0.0f) {
 			x[2] = Vector3::Dot_Product(context.A[2],dcnew);
 			x[2] += context.AB[2][2] * (Vector3::Dot_Product(-context.B[2],dcnew) + context.AB[0][2]*x[0] + context.AB[1][2]*x[1]);
@@ -1068,24 +1068,24 @@ static inline void compute_contact_point(ObbCollisionStruct & context,CastResult
 			x[2] = 0.0f;
 		}
 		break;
-	}	
+	}
 
 	// all but the first two cases fall through to here
-	result->ContactPoint.X =	context.Box0.Center.X + 
-										x[0]*context.A[0].X + 
-										x[1]*context.A[1].X + 
+	result->ContactPoint.X =	context.Box0.Center.X +
+										x[0]*context.A[0].X +
+										x[1]*context.A[1].X +
 										x[2]*context.A[2].X;
 
-	result->ContactPoint.Y =	context.Box0.Center.Y + 
-										x[0]*context.A[0].Y + 
-										x[1]*context.A[1].Y + 
+	result->ContactPoint.Y =	context.Box0.Center.Y +
+										x[0]*context.A[0].Y +
+										x[1]*context.A[1].Y +
 										x[2]*context.A[2].Y;
 
-	result->ContactPoint.Z =	context.Box0.Center.Z + 
-										x[0]*context.A[0].Z + 
-										x[1]*context.A[1].Z + 
+	result->ContactPoint.Z =	context.Box0.Center.Z +
+										x[0]*context.A[0].Z +
+										x[1]*context.A[1].Z +
 										x[2]*context.A[2].Z;
-	
+
 	Vector3::Add(result->ContactPoint,result->Fraction * context.Move0,&(result->ContactPoint));
 
 }
@@ -1172,7 +1172,7 @@ bool collide_obb_obb
 	//      = |ey*B0*(A1xA0)| + |ez*B0*(A2xA0)|						   A*(BxC)=B*(CxA)=C*(AxB)
 	//      = |-ey*A2*B0| +     |ez*A1*B0|									A0xA1=A2
 	//      = |ey*AB[2][0]| +   |ez*AB[1][0]|								already computed these dot products!
-	// 
+	//
 	/////////////////////////////////////////////////////////////////////////
 	Vector3::Cross_Product(context.A[0],context.B[0],&context.TestAxis);
 	context.TestAxisId = AXIS_A0B0;
@@ -1192,7 +1192,7 @@ bool collide_obb_obb
 		rb = WWMath::Fabs(context.Box1.Extent[0]*context.AB[0][2])+WWMath::Fabs(context.Box1.Extent[2]*context.AB[0][0]);
 		if (obb_check_axis(context,ra,rb)) goto exit;
 	}
-	
+
 	/////////////////////////////////////////////////////////////////////////
 	// Axis = A0xB2
 	/////////////////////////////////////////////////////////////////////////
@@ -1271,7 +1271,7 @@ bool collide_obb_obb
 	}
 
 	if (!result->StartBad) {
-	
+
 		context.TestAxisId = context.AxisId;
 
 		/////////////////////////////////////////////////////////////////////////
@@ -1283,7 +1283,7 @@ bool collide_obb_obb
 			obb_compute_projections(context,&ra,&rb);
 			if (obb_check_axis(context,ra,rb)) goto exit;
 		}
-		
+
 		/////////////////////////////////////////////////////////////////////////
 		// Axis = A1xMove
 		/////////////////////////////////////////////////////////////////////////
@@ -1302,7 +1302,7 @@ bool collide_obb_obb
 			if (obb_check_axis(context,ra,rb)) goto exit;
 		}
 	}
-	
+
 exit:
 
 	if (context.StartBad) {
@@ -1310,10 +1310,10 @@ bool collide_obb_obb
 		result->Fraction = 0.0f;
 		return true;
 	}
-	
+
 
 	/*
-	** If our fraction is smaller, override the previous 
+	** If our fraction is smaller, override the previous
 	** values because our collision occured first.
 	*/
 	if (context.MaxFrac < result->Fraction) {
@@ -1351,7 +1351,7 @@ bool CollisionMath::Collide
 )
 {
 	ObbCollisionStruct context(box0,move0,box1,move1);
-	return collide_obb_obb(context,result);	
+	return collide_obb_obb(context,result);
 }
 
 
@@ -1378,7 +1378,7 @@ bool CollisionMath::Collide
 {
 	OBBoxClass obbox1(box1.Center,box1.Extent);
 	ObbCollisionStruct context(box0,move0,obbox1,move1);
-	return collide_obb_obb(context,result);	
+	return collide_obb_obb(context,result);
 }
 
 
@@ -1405,5 +1405,5 @@ bool CollisionMath::Collide
 {
 	OBBoxClass obbox0(box0.Center,box0.Extent);
 	ObbCollisionStruct context(obbox0,move0,box1,move1);
-	return collide_obb_obb(context,result);	
+	return collide_obb_obb(context,result);
 }
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathobbox.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathobbox.cpp
index cf8eb04f0e4..8dd15f3ad16 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathobbox.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathobbox.cpp
@@ -26,7 +26,7 @@
  *                                                                                             *
  *                   Org Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
+ *                       Author : Kenny Mitchell                                               *
  *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
@@ -87,7 +87,7 @@ CollisionMath::Overlap_Test(const OBBoxClass & box,const TriClass & tri)
 	return eval_overlap_collision(res);
 }
 
-CollisionMath::OverlapType 
+CollisionMath::OverlapType
 CollisionMath::Overlap_Test(const AABoxClass & aabox,const OBBoxClass & obbox)
 {
 	if (CollisionMath::Intersection_Test(aabox,obbox)) {
@@ -97,7 +97,7 @@ CollisionMath::Overlap_Test(const AABoxClass & aabox,const OBBoxClass & obbox)
 	}
 }
 
-CollisionMath::OverlapType 
+CollisionMath::OverlapType
 CollisionMath::Overlap_Test(const OBBoxClass & obbox,const AABoxClass & aabox)
 {
 	if (CollisionMath::Intersection_Test(obbox,aabox)) {
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathobbtri.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathobbtri.cpp
index 5e5b54946f6..858c2aee20d 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathobbtri.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathobbtri.cpp
@@ -58,20 +58,20 @@
 
 
 /*
-** Separating Axes have to be rejected if their length is smaller than some epsilon.  
-** Otherwise, erroneous results can be reported. 
+** Separating Axes have to be rejected if their length is smaller than some epsilon.
+** Otherwise, erroneous results can be reported.
 */
 #define AXISLEN_EPSILON2	WWMATH_EPSILON * WWMATH_EPSILON	// squared length of a separating axis must be larger than this
 
-/* 
-** Axes used in Box-Tri intersection tests 
+/*
+** Axes used in Box-Tri intersection tests
 ** The axes of the box are A0,A1,A2.  N is the normal of the triangle,
 ** E0,E1,E2 are direction vectors for the edges of the triangle.
 ** (the box axes are labeled A0,A1,A2 as a holdover from the obbox-obbox
 ** collision code which this was derived from where there are two boxes
 ** A and B)
 */
-enum 
+enum
 {
 	INTERSECTION = 0,
 	AXIS_N,					// normal of the triangle
@@ -92,11 +92,11 @@ enum
 
 
 /******************************************************************************************
-	
+
 	OBBox->Triangle collision
 
    As with most of the collision detection functions, this code is based on the theorem
-	that given any two non-intersecting convex polyhedra, a separating plane/axis 
+	that given any two non-intersecting convex polyhedra, a separating plane/axis
 	can be found that will be defined by one of the face normals of one of the polyhedra
 	or the cross product of an edge from each polyhedra.  The key optimization for
 	boxes is that many of these axes are the same.  The normal to a face is the same
@@ -105,10 +105,10 @@ enum
 	This test must be done using the tri normal, the three basis vectors
 	for the box, and three vectors defined by the cross products of the basis
 	and edge vectors.  When testing the basis vectors, there will be two extents for
-	the tri (the other two vectors projected onto the axis being tested). 
+	the tri (the other two vectors projected onto the axis being tested).
 	The appropriate extent must be used in the test (largest value which is pointing
-	towards the direction of the box). In addition, I've found that I must test axes 
-	defined by the cross products of	the move vector and the box axes.  These tests 
+	towards the direction of the box). In addition, I've found that I must test axes
+	defined by the cross products of	the move vector and the box axes.  These tests
 	catch "false collisions" where the box passes very close to the triangle but does
 	not actually hit it.
 
@@ -122,7 +122,7 @@ enum
 /**
 ** BoxTriColStruct
 ** Scratchpad variables for the OBBox-Triangle collision detection functions.  One instance
-** of this structure will be used for all of the local variables and its pointer will be 
+** of this structure will be used for all of the local variables and its pointer will be
 ** handed of to various inline functions for the axis tests.
 ** Note that much of the code needs the un-normalized triangle normal.  For this reason,
 ** I have to compute N rather than copying it from the triangle.  (commenting this to
@@ -131,13 +131,13 @@ enum
 ** Note that the MaxFrac variable starts negative so that we can accept slightly negative
 ** fractions (interpenetrations).  But we clamp the returned result to 0.0 so that we never
 ** allow an object to get more embedded, just to possibly break itself free if it is within
-** the epsilon.  This is important because sometimes objects seem to intersect simply due to 
+** the epsilon.  This is important because sometimes objects seem to intersect simply due to
 ** floating point roundoff error...
 */
 struct BTCollisionStruct
 {
 	BTCollisionStruct(const OBBoxClass &box,const Vector3 &move,const TriClass &tri,const Vector3 &trimove) :
-		Box(box),															
+		Box(box),
 		Tri(tri),
 		BoxMove(move),
 		TriMove(trimove)
@@ -145,7 +145,7 @@ struct BTCollisionStruct
 		Reset();
 	}
 
-	void Reset(void) 
+	void Reset(void)
 	{
 		StartBad = true;				// true until an axis clears it
 		MaxFrac = -1.0f;				// maximum move allowed so far (accept slightly negative but clamp to zero at end)
@@ -156,15 +156,15 @@ struct BTCollisionStruct
 		Vector3::Subtract(*Tri.V[0],Box.Center,&D);				// vector from center of box to vertex 0
 		Vector3::Subtract(BoxMove,TriMove,&Move);						// move vector relative to stationary triangle
 
-		Vector3::Subtract(*Tri.V[1],*Tri.V[0],&E[0]);			
-		Vector3::Subtract(*Tri.V[2],*Tri.V[0],&E[1]);			
+		Vector3::Subtract(*Tri.V[1],*Tri.V[0],&E[0]);
+		Vector3::Subtract(*Tri.V[2],*Tri.V[0],&E[1]);
 		Vector3::Subtract(E[1],E[0],&E[2]);
 
 		A[0].Set(Box.Basis[0][0],Box.Basis[1][0],Box.Basis[2][0]);
 		A[1].Set(Box.Basis[0][1],Box.Basis[1][1],Box.Basis[2][1]);
 		A[2].Set(Box.Basis[0][2],Box.Basis[1][2],Box.Basis[2][2]);
-	
-		Vector3::Cross_Product(E[0],E[1],&N);	
+
+		Vector3::Cross_Product(E[0],E[1],&N);
 	}
 
 	bool						StartBad;			// Inital configuration is intersecting?
@@ -172,7 +172,7 @@ struct BTCollisionStruct
 	int						AxisId;				// Last separating axis
 	int						Point;				// Index of the "closest" triangle point (or one of them)
 	int						Side;					// which side of the interval
-	
+
 	int						TestSide;			// Was the axis we're working on flipped
 	int						TestAxisId;			// Axis 'id' we're working on
 	int						TestPoint;			// Index of the closest vertex
@@ -185,7 +185,7 @@ struct BTCollisionStruct
 	Vector3					AxE[3][3];			// Cross produts of the Basis vectors and edges
 
 	Vector3					A[3];					// basis vectors for the box
-	Vector3					E[3];					// edge vectors for the triangle 
+	Vector3					E[3];					// edge vectors for the triangle
 	Vector3					N;						// normal (NOT normalized!!!)
 	Vector3					FinalD;				// Vector from center of box to v0 at end of move
 
@@ -195,7 +195,7 @@ struct BTCollisionStruct
 	const Vector3 &		TriMove;
 
 private:
-	
+
 	// not implemented
 	BTCollisionStruct(const BTCollisionStruct &);
 	BTCollisionStruct & operator = (const BTCollisionStruct &);
@@ -225,7 +225,7 @@ static inline bool obbtri_collision_separation_test
 (
 	BTCollisionStruct & context,
 	float lp,float leb0,float leb1
-)	
+)
 {
 	/*
 	** - compute 'EPSILON' normalized to the length of the axis
@@ -237,7 +237,7 @@ static inline bool obbtri_collision_separation_test
 	**       - accept entire move
 	**     - Else If (I can move more than I could have before; *negative always fails!)
 	**       - update fraction
-	**   - Else 
+	**   - Else
 	**     - Accept entire move since I'm not moving towards the polygon
 	*/
 	float eps = 0.0f;
@@ -248,29 +248,29 @@ static inline bool obbtri_collision_separation_test
 	if (lp - leb0 > -eps) {
 		context.StartBad = false;
 		if (leb1 - leb0 > 0.0f) {
-			float frac = (lp-leb0)/(leb1-leb0);	
+			float frac = (lp-leb0)/(leb1-leb0);
 			if (frac >= 1.0f) {
-				/* moving toward but not hitting triangle */ 
+				/* moving toward but not hitting triangle */
 				context.AxisId = context.TestAxisId;
-				context.MaxFrac = 1.0f; 
-				return true;  
+				context.MaxFrac = 1.0f;
+				return true;
 			} else {
 				/* moving toward, hitting triangle */
-				if (frac > context.MaxFrac) { 
-					context.MaxFrac = frac; 
-					context.AxisId = context.TestAxisId; 
+				if (frac > context.MaxFrac) {
+					context.MaxFrac = frac;
+					context.AxisId = context.TestAxisId;
 					context.Side = context.TestSide;
 					context.Point = context.TestPoint;
 				}
 			}
 		} else {
-			/* moving away or not moving */ 
+			/* moving away or not moving */
 			context.AxisId = context.TestAxisId;
-			context.MaxFrac = 1.0f; 
-			return true;  
+			context.MaxFrac = 1.0f;
+			return true;
 		}
 	}
-	return false;	
+	return false;
 }
 
 
@@ -303,7 +303,7 @@ static inline bool obbtri_check_collision_axis(BTCollisionStruct & context)
 	axismove = Vector3::Dot_Product(context.Move,context.TestAxis);
 
 	// I want the axis centered at the box, pointing towards the triangle
-	if (dist < 0) {		
+	if (dist < 0) {
 		dist = -dist;
 		axismove = -axismove;
 		context.TestAxis = -context.TestAxis;
@@ -314,15 +314,15 @@ static inline bool obbtri_check_collision_axis(BTCollisionStruct & context)
 
 	// compute coordinates of the leading edge of the box at t0 and t1
 	leb0 =	context.Box.Extent.X * WWMath::Fabs(Vector3::Dot_Product(context.TestAxis,context.A[0])) +
-				context.Box.Extent.Y * WWMath::Fabs(Vector3::Dot_Product(context.TestAxis,context.A[1])) + 
+				context.Box.Extent.Y * WWMath::Fabs(Vector3::Dot_Product(context.TestAxis,context.A[1])) +
 				context.Box.Extent.Z * WWMath::Fabs(Vector3::Dot_Product(context.TestAxis,context.A[2]));
 	leb1 = leb0 + axismove;
-	
+
 	// compute coordinate of "leading edge of the triangle" relative to the box center.
 	lp = 0;
 	tmp = Vector3::Dot_Product(context.E[0],context.TestAxis); if (tmp < lp) lp = tmp;
 	tmp = Vector3::Dot_Product(context.E[1],context.TestAxis); if (tmp < lp) lp = tmp;
-	lp = dist + lp;	
+	lp = dist + lp;
 
 	return obbtri_collision_separation_test(context,lp,leb0,leb1);
 }
@@ -362,7 +362,7 @@ static inline bool obbtri_check_collision_cross_axis
 	axismove = Vector3::Dot_Product(context.Move,context.TestAxis);
 
 	// I want the axis centered at the box, pointing towards the triangle
-	if (p0 < 0) {		
+	if (p0 < 0) {
 		p0 = -p0;
 		axismove = -axismove;
 		dp = -dp;
@@ -374,11 +374,11 @@ static inline bool obbtri_check_collision_cross_axis
 
 	// compute coordinates of the leading edge of the box at t1
 	leb1 = leb0 + axismove;
-	
+
 	// compute coordinate of "leading edge of the triangle" relative to the box center.
 	lp = 0; context.TestPoint = 0;
 	if (dp < 0) { lp = dp; context.TestPoint = dpi; }
-	lp = p0 + lp;	
+	lp = p0 + lp;
 
 	return obbtri_collision_separation_test(context,lp,leb0,leb1);
 }
@@ -418,7 +418,7 @@ static inline bool obbtri_check_collision_basis_axis
 	axismove = Vector3::Dot_Product(context.Move,context.TestAxis);
 
 	// we want the axis centered at the box, pointing towards the triangle
-	if (dist < 0) {		
+	if (dist < 0) {
 		dist = -dist;
 		axismove = -axismove;
 		dp1 = -dp1;
@@ -430,13 +430,13 @@ static inline bool obbtri_check_collision_basis_axis
 	}
 
 	// this is the "optimization", leb0 = one of the extents
-	leb1 = leb0 + axismove;	
-	
+	leb1 = leb0 + axismove;
+
 	// compute coordinate of "leading edge of the polygon" relative to the box center.
 	lp = 0; context.TestPoint = 0;
 	if (dp1 < lp) { lp = dp1; context.TestPoint = 1; }
 	if (dp2 < lp) { lp = dp2; context.TestPoint = 2; }
-	lp = dist + lp;	
+	lp = dist + lp;
 
 	return obbtri_collision_separation_test(context,lp,leb0,leb1);
 }
@@ -480,7 +480,7 @@ static inline bool obbtri_check_collision_normal_axis(BTCollisionStruct & contex
 	}
 
 	leb0 =	context.Box.Extent.X * WWMath::Fabs(context.AN[0]) +
-				context.Box.Extent.Y * WWMath::Fabs(context.AN[1]) + 
+				context.Box.Extent.Y * WWMath::Fabs(context.AN[1]) +
 				context.Box.Extent.Z * WWMath::Fabs(context.AN[2]);
 	leb1 = leb0 + axismove;
 	context.TestPoint = 0;
@@ -530,7 +530,7 @@ static inline void obbtri_compute_contact_normal
 	Vector3 *						set_normal
 )
 {
-	switch(context.AxisId) 
+	switch(context.AxisId)
 	{
 		case INTERSECTION:
 //			WWASSERT(0);
@@ -604,7 +604,7 @@ static inline void eval_A0_point(const BTCollisionStruct & context,float * x,int
 {
 	float yval,den;
 	Vector3 DxE;
-	
+
 	x[1] = -eval_side(context.AE[2][edge],context.Side) * context.Box.Extent[1];
 	x[2] = eval_side(context.AE[1][edge],context.Side) * context.Box.Extent[2];
 	if (context.Point == 0) { yval = 0.0f; } else { yval = 1.0f; }
@@ -651,7 +651,7 @@ static inline void eval_A1_point(const BTCollisionStruct & context,float * x,int
 	x[0] = eval_side(context.AE[2][edge],context.Side) * context.Box.Extent[0];
 	x[2] = -eval_side(context.AE[0][edge],context.Side) * context.Box.Extent[2];
 	if (context.Point == 0) { yval = 0.0f; } else { yval = 1.0f; }
-	
+
 	den = Vector3::Dot_Product(context.N,context.AxE[1][edge]);
 	if (WWMath::Fabs(den) > 0.0f) {
 
@@ -665,11 +665,11 @@ static inline void eval_A1_point(const BTCollisionStruct & context,float * x,int
 		x[1] -= Vector3::Dot_Product(context.N,context.AxE[0][edge]) * x[0];
 		x[1] -= Vector3::Dot_Product(context.N,context.AxE[2][edge]) * x[2];
 		x[1] /= den;
-	
+
 	} else {
 
 		x[1] = 0.0f;
-	
+
 	}
 }
 
@@ -693,7 +693,7 @@ static inline void eval_A2_point(const BTCollisionStruct & context,float * x,int
 	x[0] = -eval_side(context.AE[1][edge],context.Side) * context.Box.Extent[0];
 	x[1] = eval_side(context.AE[0][edge],context.Side) * context.Box.Extent[1];
 	if (context.Point == 0) { yval = 0.0f; } else { yval = 1.0f; }
-	
+
 	den = Vector3::Dot_Product(context.N,context.AxE[2][edge]);
 	if (WWMath::Fabs(den) > 0.0f) {
 
@@ -707,11 +707,11 @@ static inline void eval_A2_point(const BTCollisionStruct & context,float * x,int
 		x[2] -= Vector3::Dot_Product(context.N,context.AxE[0][edge]) * x[0];
 		x[2] -= Vector3::Dot_Product(context.N,context.AxE[1][edge]) * x[1];
 		x[2] /= den;
-	
+
 	} else {
 
 		x[2] = 0.0f;
-	
+
 	}
 }
 
@@ -743,9 +743,9 @@ static inline void obbtri_compute_contact_point
 		context.FinalD = newv0 - newc;
 	}
 
-	switch (context.AxisId) 
+	switch (context.AxisId)
 	{
-	
+
 	case INTERSECTION:
 		WWASSERT(0);
 		return;
@@ -756,11 +756,11 @@ static inline void obbtri_compute_contact_point
 			x[i] = eval_side(context.AN[i],context.Side) * context.Box.Extent[i];
       }
 		break;
-	
+
 	case AXIS_A0:		// part of the triangle is touching a face of the box
 	case AXIS_A1:
 	case AXIS_A2:
-		
+
 		if (context.Point == 0) {
 			result->ContactPoint = *context.Tri.V[0];
 		} else if (context.Point == 1) {
@@ -771,11 +771,11 @@ static inline void obbtri_compute_contact_point
 		Vector3::Add(result->ContactPoint,result->Fraction * context.TriMove,&(result->ContactPoint));
 		return;
 
-	case AXIS_A0E0:	// one of the x-aligned edges of the box is contacting edge0 
+	case AXIS_A0E0:	// one of the x-aligned edges of the box is contacting edge0
 		eval_A0_point(context,x,0);
 		break;
-	
-	case AXIS_A0E1:	// one of the x-aligned edges of the box is contacting edge1 
+
+	case AXIS_A0E1:	// one of the x-aligned edges of the box is contacting edge1
 		eval_A0_point(context,x,1);
 		break;
 
@@ -802,7 +802,7 @@ static inline void obbtri_compute_contact_point
 	case AXIS_A2E1:	// one of the z-aligned edges of the box is contacting edge1
 		eval_A2_point(context,x,1);
 		break;
-	
+
 	case AXIS_A2E2:	// one of the z-aligned edges of the box is contacting edge3
 		eval_A2_point(context,x,2);
 		break;
@@ -810,20 +810,20 @@ static inline void obbtri_compute_contact_point
 	}
 
 	/*
-	** In certain circumstances, the x's computed above are outside the size of 
+	** In certain circumstances, the x's computed above are outside the size of
 	** the box.  I have tracked at least one of these cases to a situation where the
 	** separating axis is the triangle normal but one of the AxE axes also lines up
 	** with the normal.  In this case, the Normal was 0,0,25 and the A0xE0 axis
 	** was 0,0,5.  When the fraction was calculated for both of these, they were
 	** the same up to the six decimal places that MSVC will show me in the debugger.
 	** However, the fraction computed for the 0,0,5 axis was larger by some very small
-	** amount.  This causes it to be used as the "separating axis".  Looks like floating 
-	** point roundoff error to me.  The problem is that since the axis was perpendicular 
-	** to the triangle, the "nearest-point" logic chose V0 which resulted in the 
-	** calculation for x[0] being way off.  The equations for finding the contact point 
-	** in the AxE axis case assume that the axis is not normal to the triangle since 
+	** amount.  This causes it to be used as the "separating axis".  Looks like floating
+	** point roundoff error to me.  The problem is that since the axis was perpendicular
+	** to the triangle, the "nearest-point" logic chose V0 which resulted in the
+	** calculation for x[0] being way off.  The equations for finding the contact point
+	** in the AxE axis case assume that the axis is not normal to the triangle since
 	** that should be handled in the simpler routine for the N separating axis...
-	** Since I am at a loss for how to deal with this problem, I'm going to clamp all 
+	** Since I am at a loss for how to deal with this problem, I'm going to clamp all
 	** of the x's to be within the box here...
 	*/
 	if (x[0] > context.Box.Extent.X) {
@@ -837,7 +837,7 @@ static inline void obbtri_compute_contact_point
 	} else if (x[1] < -context.Box.Extent.Y) {
 		x[1] = -context.Box.Extent.Y;
 	}
-	
+
 	if (x[2] > context.Box.Extent.Z) {
 		x[2] = context.Box.Extent.Z;
 	} else if (x[2] < -context.Box.Extent.Z) {
@@ -847,21 +847,21 @@ static inline void obbtri_compute_contact_point
 	/*
 	** Now, compute the point
 	*/
-	result->ContactPoint.X =	context.Box.Center.X + 
-										x[0]*context.A[0].X + 
-										x[1]*context.A[1].X + 
+	result->ContactPoint.X =	context.Box.Center.X +
+										x[0]*context.A[0].X +
+										x[1]*context.A[1].X +
 										x[2]*context.A[2].X;
 
-	result->ContactPoint.Y =	context.Box.Center.Y + 
-										x[0]*context.A[0].Y + 
-										x[1]*context.A[1].Y + 
+	result->ContactPoint.Y =	context.Box.Center.Y +
+										x[0]*context.A[0].Y +
+										x[1]*context.A[1].Y +
 										x[2]*context.A[2].Y;
 
-	result->ContactPoint.Z =	context.Box.Center.Z + 
-										x[0]*context.A[0].Z + 
-										x[1]*context.A[1].Z + 
+	result->ContactPoint.Z =	context.Box.Center.Z +
+										x[0]*context.A[0].Z +
+										x[1]*context.A[1].Z +
 										x[2]*context.A[2].Z;
-	
+
 	Vector3::Add(result->ContactPoint,result->Fraction * context.BoxMove,&(result->ContactPoint));
 }
 
@@ -1027,7 +1027,7 @@ bool CollisionMath::Collide
 		leb0 = box.Extent[0]*WWMath::Fabs(context.AE[1][1]) + box.Extent[1]*WWMath::Fabs(context.AE[0][1]);
 		if (obbtri_check_collision_cross_axis(context,dp,1,leb0)) goto exit;
 	}
-	
+
 	/*
 	** AXIS_A2xE2
 	*/
@@ -1073,7 +1073,7 @@ bool CollisionMath::Collide
 #endif
 
 	/*
-	** If the triangle and box are intersecting before the move, return that 
+	** If the triangle and box are intersecting before the move, return that
 	** result.
 	*/
 	if (context.StartBad) {
@@ -1085,7 +1085,7 @@ bool CollisionMath::Collide
 	}
 
 	/*
-	** If the fraction allowed is basically equal to the fraction allowed by 
+	** If the fraction allowed is basically equal to the fraction allowed by
 	** another polygon, try to pick the polygon which is least "edge-on" to the
 	** move.
 	*/
@@ -1103,22 +1103,22 @@ bool CollisionMath::Collide
 		{
 			result->Normal = normal; //obbtri_compute_contact_normal(context,result);
 		}
-				
+
 		result->Fraction = context.MaxFrac;
 
 		if (result->ComputeContactPoint) {
-			obbtri_compute_contact_point(context,result);	
+			obbtri_compute_contact_point(context,result);
 		}
 		TRACK_COLLISION_OBBOX_TRI_HIT;
 		return true;
 	}
-	
+
 	return false;
 }
 
 
 /***********************************************************************************************
-	
+
 	OBBox-Triangle Intersection
 
 	The following code implements a simple boolean intersection check.  It uses the same
@@ -1130,7 +1130,7 @@ bool CollisionMath::Collide
 /**
 ** BTIntersectStruct
 ** Scratchpad variables for the OBBox-Triangle intersection functions.  One instance
-** of this structure will be used for all of the local variables and its pointer will be 
+** of this structure will be used for all of the local variables and its pointer will be
 ** handed of to various inline functions for the axis tests.
 ** Note that much of the code needs the un-normalized triangle normal.  For this reason,
 ** I have to compute N rather than copying it from the triangle.  (commenting this to
@@ -1139,19 +1139,19 @@ bool CollisionMath::Collide
 struct BTIntersectStruct
 {
 	BTIntersectStruct(const OBBoxClass &box,const TriClass &tri) :
-		Box(box),															
+		Box(box),
 		Tri(tri)
 	{
 		Vector3::Subtract(*tri.V[0],box.Center,&D);				// vector from center of box to vertex 0
-		Vector3::Subtract(*tri.V[1],*tri.V[0],&E[0]);			
-		Vector3::Subtract(*tri.V[2],*tri.V[0],&E[1]);			
+		Vector3::Subtract(*tri.V[1],*tri.V[0],&E[0]);
+		Vector3::Subtract(*tri.V[2],*tri.V[0],&E[1]);
 		Vector3::Subtract(E[1],E[0],&E[2]);
 
 		A[0].Set(box.Basis[0][0],box.Basis[1][0],box.Basis[2][0]);
 		A[1].Set(box.Basis[0][1],box.Basis[1][1],box.Basis[2][1]);
 		A[2].Set(box.Basis[0][2],box.Basis[1][2],box.Basis[2][2]);
-	
-		Vector3::Cross_Product(E[0],E[1],&N);	
+
+		Vector3::Cross_Product(E[0],E[1],&N);
 	}
 
 	Vector3					D;						// Vector from the center of the box to v0
@@ -1160,7 +1160,7 @@ struct BTIntersectStruct
 	Vector3					AxE[3][3];			// Cross produts of the Basis vectors and edges
 
 	Vector3					A[3];					// basis vectors for the box
-	Vector3					E[3];					// edge vectors for the triangle 
+	Vector3					E[3];					// edge vectors for the triangle
 	Vector3					N;						// normal (NOT normalized!!!)
 
 	Vector3					TestAxis;			// separating axis currently being tested
@@ -1169,7 +1169,7 @@ struct BTIntersectStruct
 	const TriClass &		Tri;
 
 private:
-	
+
 	// not implemented
 	BTIntersectStruct(const BTIntersectStruct &);
 	BTIntersectStruct & operator = (const BTIntersectStruct &);
@@ -1244,7 +1244,7 @@ static inline bool obbtri_check_intersection_cross_axis
 	p0 = Vector3::Dot_Product(context.D,context.TestAxis);
 
 	// I want the axis centered at the box, pointing towards the triangle
-	if (p0 < 0) {		
+	if (p0 < 0) {
 		context.TestAxis = -context.TestAxis;
 		p0 = -p0;
 		dp = -dp;
@@ -1253,7 +1253,7 @@ static inline bool obbtri_check_intersection_cross_axis
 	// compute coordinate of "leading edge of the triangle" relative to the box center.
 	lp = 0;
 	if (dp < 0) { lp = dp; }
-	lp = p0 + lp;	
+	lp = p0 + lp;
 
 	return obbtri_intersection_separation_test(context,lp,leb0);
 }
@@ -1288,18 +1288,18 @@ static inline bool obbtri_check_intersection_basis_axis
 	dist = Vector3::Dot_Product(context.D,context.TestAxis);
 
 	// we want the axis centered at the box, pointing towards the triangle
-	if (dist < 0) {		
+	if (dist < 0) {
 		context.TestAxis = -context.TestAxis;
 		dist = -dist;
 		dp1 = -dp1;
 		dp2 = -dp2;
-	} 
+	}
 
 	// compute coordinate of "leading edge of the polygon" relative to the box center.
 	lp = 0;
 	if (dp1 < lp) { lp = dp1; }
 	if (dp2 < lp) { lp = dp2; }
-	lp = dist + lp;	
+	lp = dist + lp;
 
 	return obbtri_intersection_separation_test(context,lp,leb0);
 }
@@ -1338,7 +1338,7 @@ static inline bool obbtri_check_intersection_normal_axis
 	}
 
 	leb0 =	context.Box.Extent.X * WWMath::Fabs(context.AN[0]) +
-				context.Box.Extent.Y * WWMath::Fabs(context.AN[1]) + 
+				context.Box.Extent.Y * WWMath::Fabs(context.AN[1]) +
 				context.Box.Extent.Z * WWMath::Fabs(context.AN[2]);
 	lp = dist;	// this is the "optimization", don't have to find lp
 
@@ -1491,7 +1491,7 @@ bool CollisionMath::Intersection_Test(const OBBoxClass & box,const TriClass & tr
 		leb0 = box.Extent[0]*WWMath::Fabs(context.AE[1][1]) + box.Extent[1]*WWMath::Fabs(context.AE[0][1]);
 		if (obbtri_check_intersection_cross_axis(context,dp,leb0)) return false;
 	}
-	
+
 	/*
 	** AXIS_A2xE2
 	*/
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathplane.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathplane.cpp
index 72d2d07493f..616e7263e07 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathplane.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathplane.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                    Org Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 10                                                           $*
@@ -57,7 +57,7 @@ CollisionMath::Overlap_Test(const AAPlaneClass & plane,const Vector3 & point)
 	float delta = point[plane.Normal] - plane.Dist;
 	if (delta > COINCIDENCE_EPSILON) {
 		return POS;
-	} 
+	}
 	if (delta < -COINCIDENCE_EPSILON) {
 		return NEG;
 	}
@@ -89,7 +89,7 @@ CollisionMath::Overlap_Test(const AAPlaneClass & plane,const SphereClass & spher
 	float delta = sphere.Center[plane.Normal] - plane.Dist;
 	if (delta > sphere.Radius) {
 		return POS;
-	} 
+	}
 	if (delta < sphere.Radius) {
 		return NEG;
 	}
@@ -111,7 +111,7 @@ CollisionMath::Overlap_Test(const AAPlaneClass & plane,const AABoxClass & box)
 	} else {
 		mask |= ON;
 	}
-	
+
 	// check the 'max' side of the box
 	delta = (box.Center[plane.Normal] + box.Extent[plane.Normal]) - plane.Dist;
 	if (delta > WWMATH_EPSILON) {
@@ -121,7 +121,7 @@ CollisionMath::Overlap_Test(const AAPlaneClass & plane,const AABoxClass & box)
 	} else {
 		mask |= ON;
 	}
-	
+
 	return eval_overlap_mask(mask);
 }
 
@@ -162,7 +162,7 @@ CollisionMath::Overlap_Test(const PlaneClass & plane,const SphereClass & sphere)
 	float dist = Vector3::Dot_Product(sphere.Center,plane.N) - plane.D;
 	if (dist > sphere.Radius) {
 		return POS;
-	} 
+	}
 	if (dist < -sphere.Radius) {
 		return NEG;
 	}
@@ -185,7 +185,7 @@ CollisionMath::Overlap_Test(const PlaneClass & plane,const OBBoxClass & box)
 	negfarpt = -posfarpt;
 	posfarpt += box.Center;
 	negfarpt += box.Center;
-	
+
 	// overlap test
 	if (Overlap_Test(plane,negfarpt) == POS) {
 		return POS;
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h b/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h
index c08420e45c4..930af321784 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h
@@ -39,9 +39,7 @@
  *   CollisionMath::Overlap_Test -- Tests overlap between a plane and an AABox                 *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef COLMATHPLANE_H
-#define COLMATHPLANE_H
+#pragma once
 
 #include "always.h"
 #include "plane.h"
@@ -49,7 +47,7 @@
 
 /*
 ** Inline collision functions dealing with planes
-** This module is meant to be included only in .CPP files after you include colmath.h
+** This module is meant to be included only in .cpp files after you include colmath.h
 ** It is not automatically included in order to reduce file dependencies...
 */
 
@@ -99,14 +97,14 @@ inline void get_far_extent(const Vector3 & normal,const Vector3 & extent,Vector3
  * HISTORY:                                                                                    *
  *   3/29/2000  gth : Created.                                                                 *
  *=============================================================================================*/
-inline 
+inline
 CollisionMath::OverlapType
 CollisionMath::Overlap_Test(const PlaneClass & plane,const Vector3 & point)
 {
 	float delta = Vector3::Dot_Product(point,plane.N) - plane.D;
 	if (delta > COINCIDENCE_EPSILON) {
 		return POS;
-	} 
+	}
 	if (delta < -COINCIDENCE_EPSILON) {
 		return NEG;
 	}
@@ -136,7 +134,7 @@ CollisionMath::Overlap_Test(const PlaneClass & plane,const AABoxClass & box)
 	Vector3 negfarpt;
 
 	get_far_extent(plane.N,box.Extent,&posfarpt);
-	
+
 	negfarpt = -posfarpt;
 	posfarpt += box.Center;
 	negfarpt += box.Center;
@@ -148,7 +146,3 @@ CollisionMath::Overlap_Test(const PlaneClass & plane,const AABoxClass & box)
 	}
 	return BOTH;
 }
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathsphere.cpp b/Core/Libraries/Source/WWVegas/WWMath/colmathsphere.cpp
index 088c54292f7..c951728306d 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/colmathsphere.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/colmathsphere.cpp
@@ -70,7 +70,7 @@
 bool CollisionMath::Intersection_Test(const SphereClass & sphere,const AABoxClass & box)
 {
 	/*
-	** Simple but slightly inaccurate test, expand the box by the sphere's radius, then 
+	** Simple but slightly inaccurate test, expand the box by the sphere's radius, then
 	** test whether the sphere is contained in that new box.  This is actually testing
 	** against a cube which encloses the sphere...
 	*/
@@ -196,7 +196,7 @@ CollisionMath::Overlap_Test(const SphereClass & sphere,const SphereClass & spher
 
 	float radius	= sphere.Radius + sphere2.Radius;
 	float dist2		= (sphere2.Center - sphere.Center).Length2();
-	
+
 	if (dist2 == 0 && sphere.Radius == sphere2.Radius) {
 		retval = OVERLAPPED;
 	} else if (dist2 <= radius * radius - COINCIDENCE_EPSILON) {
diff --git a/Core/Libraries/Source/WWVegas/WWMath/cullsys.cpp b/Core/Libraries/Source/WWVegas/WWMath/cullsys.cpp
index e2d6452e9b5..ad0a8354794 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/cullsys.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/cullsys.cpp
@@ -62,11 +62,11 @@ CullableClass::~CullableClass(void)
 void CullableClass::Set_Cull_Box(const AABoxClass & box,bool just_loaded)
 {
 	CullBox = box;
-	
+
 	WWPROFILE("Cullable::Set_Cull_Box");
 
 	// Just_loaded flag allows us to update the box without notifying the
-	// culling system.  Use this when you've saved and loaded the linkage 
+	// culling system.  Use this when you've saved and loaded the linkage
 	// so you know you're in the right node of the culling system...
 	if (!just_loaded) {
 		CullSystemClass * sys = Get_Culling_System();
@@ -95,7 +95,7 @@ CullSystemClass * CullableClass::Get_Culling_System(void) const
 /*************************************************************************
 **
 ** CullSystemClass Implementation
-** 
+**
 ** The base CullSystemClass mainly contains code for maintaining the
 ** current collection list and iterating through it.
 **
diff --git a/Core/Libraries/Source/WWVegas/WWMath/cullsys.h b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h
index a1f5ddee2a9..38a201d8ba4 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/cullsys.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h
@@ -34,17 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef CULLSYS_H
-#define CULLSYS_H
 
-#include "wwdebug.h"
+#include "always.h"
 #include "stdlib.h"
-#include "refcount.h"
 #include "aabox.h"
 
 class CullableClass;
@@ -63,8 +56,8 @@ class CullLinkClass
 public:
 	WWINLINE CullLinkClass(CullSystemClass * system)								{ System = system; WWASSERT(System); }
 	virtual ~CullLinkClass(void)												{ WWASSERT(System == NULL); }
-	
-	WWINLINE void					Set_Culling_System(CullSystemClass * sys)		{ System = sys; }	
+
+	WWINLINE void					Set_Culling_System(CullSystemClass * sys)		{ System = sys; }
 	WWINLINE CullSystemClass * Get_Culling_System(void)							{ return System; }
 
 protected:
@@ -81,10 +74,10 @@ class CullLinkClass
 class CullableClass : public RefCountClass
 {
 public:
-	
+
 	CullableClass(void);
 	virtual ~CullableClass(void);
-	
+
 	/*
 	** Access to the culling box for this object.  When you set the cull box, you are
 	** basically guaranteeing that the object is contained within the given box.  The
@@ -95,7 +88,7 @@ class CullableClass : public RefCountClass
 	void								Set_Cull_Box(const AABoxClass & box,bool just_loaded = false);
 
 	/*
-	** These functions are used by various culling systems to manage the linkage 
+	** These functions are used by various culling systems to manage the linkage
 	** pointers.  *The average user should NEVER call these*
 	*/
 	void								Set_Culling_System(CullSystemClass * sys);
@@ -112,7 +105,7 @@ class CullableClass : public RefCountClass
 	** Culling Data
 	** Each object can be linked into various types of culling systems.
 	** Each culling system can use its own linkage data structure (derived
-	** from CullLinkClass) to keep track of the object.  The CullData pointer 
+	** from CullLinkClass) to keep track of the object.  The CullData pointer
 	** will point to one of the culling link objects and NULL
 	** if its not in any system.
 	*/
@@ -128,8 +121,8 @@ class CullableClass : public RefCountClass
 
 	/*
 	** NextCollected
-	** This pointer is used by the culling system to keep a singly linked 
-	** list of cullable object that have been "collected". 
+	** This pointer is used by the culling system to keep a singly linked
+	** list of cullable object that have been "collected".
 	*/
 	CullableClass *				NextCollected;
 
@@ -157,10 +150,10 @@ class CullSystemClass
 
 	/*
 	** Collect_Objects.  Updates the internal collection list with the
-	** objects that overlap the given primitive. 
+	** objects that overlap the given primitive.
 	** WARNING: This builds an internal list that is only valid until
 	** another list is built, only one list can be valid at any time.
-	** WARNING: Always call Reset_Collection if you want to start a 
+	** WARNING: Always call Reset_Collection if you want to start a
 	** fresh collection!
 	*/
 	void					Reset_Collection(void);
@@ -196,6 +189,3 @@ class CullSystemClass
 
 	friend class CullableClass;
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWMath/culltype.h b/Core/Libraries/Source/WWVegas/WWMath/culltype.h
index a4631e2fcb1..83ebc08b3a6 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/culltype.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/culltype.h
@@ -34,18 +34,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef CULLTYPE_H
-#define CULLTYPE_H
 
 #include "always.h"
 
 /*
-** CullType is an enumeration of the possible results of a culling 
+** CullType is an enumeration of the possible results of a culling
 ** operation.  It is placed here so that all of the different cull functions
 ** (which are scattered throughout WWMath, WW3D, WWPhys, etc) can
 ** communicate the result in a consistent way
@@ -57,6 +51,3 @@ typedef enum CULLTYPE
 	CULL_INTERSECTING,		// the object intersects an edge of the culling volume
 	CULL_INSIDE					// the object is completely inside the culling volume
 };
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWMath/curve.cpp b/Core/Libraries/Source/WWVegas/WWMath/curve.cpp
index 8d3fd2c9640..353fa6d22fe 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/curve.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/curve.cpp
@@ -54,11 +54,11 @@ DECLARE_FORCE_LINK(curve);
 SimplePersistFactoryClass<LinearCurve3DClass,WWMATH_CHUNKID_LINEARCURVE3D>	_LinearCurve3DFactory;
 SimplePersistFactoryClass<LinearCurve1DClass,WWMATH_CHUNKID_LINEARCURVE1D>	_LinearCurve1DFactory;
 
-enum 
+enum
 {
 	// ID's used by Curve3D
-	CURVE3D_CHUNK_VARIABLES					= 0x00020651,			
-	CURVE3D_CHUNK_KEYS,			
+	CURVE3D_CHUNK_VARIABLES					= 0x00020651,
+	CURVE3D_CHUNK_KEYS,
 
 	CURVE3D_VARIABLE_ISLOOPING				= 0x00,
 	CURVE3D_VARIABLE_KEYCOUNT,
@@ -67,8 +67,8 @@ enum
 	LINEARCURVE3D_CHUNK_CURVE3D			= 0x00020653,
 
 	// ID's used by Curve1D
-	CURVE1D_CHUNK_VARIABLES					= 0x00020655,			
-	CURVE1D_CHUNK_KEYS,			
+	CURVE1D_CHUNK_VARIABLES					= 0x00020655,
+	CURVE1D_CHUNK_KEYS,
 
 	CURVE1D_VARIABLE_ISLOOPING				= 0x00,
 	CURVE1D_VARIABLE_KEYCOUNT,
@@ -155,7 +155,7 @@ void Curve3DClass::Set_Key(int i,const Vector3 & point)
 	assert(i >= 0);
 	assert(i < Keys.Count());
 	Keys[i].Point = point;
-}	
+}
 
 
 int Curve3DClass::Add_Key(const Vector3 & point,float t)
@@ -171,13 +171,13 @@ int Curve3DClass::Add_Key(const Vector3 & point,float t)
 
 	Keys.Insert(idx,newkey);
 	return idx;
-}	
+}
 
 void Curve3DClass::Remove_Key(int i)
 {
 	assert(i >= 0);
 	assert(i < Keys.Count());
-	Keys.Delete(i);	
+	Keys.Delete(i);
 }
 
 void Curve3DClass::Clear_Keys(void)
@@ -209,7 +209,7 @@ bool Curve3DClass::Save(ChunkSaveClass & csave)
 
 	// Saving the keys, Note that if the format of a key changes we'll
 	// need a new chunk. (I didn't wrap each variable in its own chunk)
-	csave.Begin_Chunk(CURVE3D_CHUNK_KEYS);			
+	csave.Begin_Chunk(CURVE3D_CHUNK_KEYS);
 	for (int i=0; i<keycount; i++) {
 		csave.Write(&(Keys[i].Point),sizeof(Keys[i].Point));
 		csave.Write(&(Keys[i].Time),sizeof(Keys[i].Time));
@@ -229,17 +229,17 @@ bool Curve3DClass::Load(ChunkLoadClass & cload)
 
 	// read in the chunks
 	while (cload.Open_Chunk()) {
-		
-		switch(cload.Cur_Chunk_ID()) 
+
+		switch(cload.Cur_Chunk_ID())
 		{
 			case CURVE3D_CHUNK_VARIABLES:
-			
+
 				while (cload.Open_Micro_Chunk()) {
 					switch(cload.Cur_Micro_Chunk_ID()) {
 						READ_MICRO_CHUNK(cload,CURVE3D_VARIABLE_ISLOOPING,IsLooping);
 						READ_MICRO_CHUNK(cload,CURVE3D_VARIABLE_KEYCOUNT,keycount);
 					}
-					cload.Close_Micro_Chunk();	
+					cload.Close_Micro_Chunk();
 				}
 				break;
 
@@ -252,7 +252,7 @@ bool Curve3DClass::Load(ChunkLoadClass & cload)
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
@@ -304,15 +304,15 @@ bool LinearCurve3DClass::Save(ChunkSaveClass & csave)
 bool LinearCurve3DClass::Load(ChunkLoadClass & cload)
 {
 	while (cload.Open_Chunk()) {
-		
-		switch(cload.Cur_Chunk_ID()) 
+
+		switch(cload.Cur_Chunk_ID())
 		{
 			case LINEARCURVE3D_CHUNK_CURVE3D:
 				Curve3DClass::Load(cload);
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
@@ -402,7 +402,7 @@ void Curve1DClass::Set_Key(int i,float point,unsigned int extra)
 	assert(i < Keys.Count());
 	Keys[i].Point = point;
 	Keys[i].Extra = extra;
-}	
+}
 
 
 int Curve1DClass::Add_Key(float point,float t,unsigned int extra)
@@ -419,13 +419,13 @@ int Curve1DClass::Add_Key(float point,float t,unsigned int extra)
 
 	Keys.Insert(idx,newkey);
 	return idx;
-}	
+}
 
 void Curve1DClass::Remove_Key(int i)
 {
 	assert(i >= 0);
 	assert(i < Keys.Count());
-	Keys.Delete(i);	
+	Keys.Delete(i);
 }
 
 void Curve1DClass::Clear_Keys(void)
@@ -496,17 +496,17 @@ bool Curve1DClass::Load(ChunkLoadClass & cload)
 
 	// read in the chunks
 	while (cload.Open_Chunk()) {
-		
-		switch(cload.Cur_Chunk_ID()) 
+
+		switch(cload.Cur_Chunk_ID())
 		{
 			case CURVE1D_CHUNK_VARIABLES:
-			
+
 				while (cload.Open_Micro_Chunk()) {
 					switch(cload.Cur_Micro_Chunk_ID()) {
 						READ_MICRO_CHUNK(cload,CURVE1D_VARIABLE_ISLOOPING,IsLooping);
 						READ_MICRO_CHUNK(cload,CURVE1D_VARIABLE_KEYCOUNT,keycount);
 					}
-					cload.Close_Micro_Chunk();	
+					cload.Close_Micro_Chunk();
 				}
 				break;
 
@@ -520,7 +520,7 @@ bool Curve1DClass::Load(ChunkLoadClass & cload)
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
@@ -571,15 +571,15 @@ bool LinearCurve1DClass::Save(ChunkSaveClass & csave)
 bool LinearCurve1DClass::Load(ChunkLoadClass & cload)
 {
 	while (cload.Open_Chunk()) {
-		
-		switch(cload.Cur_Chunk_ID()) 
+
+		switch(cload.Cur_Chunk_ID())
 		{
 			case LINEARCURVE1D_CHUNK_CURVE1D:
 				Curve1DClass::Load(cload);
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
diff --git a/Core/Libraries/Source/WWVegas/WWMath/curve.h b/Core/Libraries/Source/WWVegas/WWMath/curve.h
index 80cd3b3636c..6fdad67be3b 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/curve.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/curve.h
@@ -34,29 +34,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef CURVE_H
-#define CURVE_H
 
-#ifndef ALWAYS_H
 #include "always.h"
-#endif
-
-#ifndef VECTOR_H
-#include "Vector.H"
-#endif
-
-#ifndef VECTOR3_H
+#include "Vector.h"
 #include "vector3.h"
-#endif
-
-#ifndef PERSIST_H
 #include "persist.h"
-#endif
 
 class ChunkLoadClass;
 class ChunkSaveClass;
@@ -88,9 +71,9 @@ class Curve3DClass : public PersistClass
 	virtual bool		Load (ChunkLoadClass &cload);
 
 protected:
-	
+
 	void					Find_Interval(float time,int * i0,int * i1,float * t);
-	
+
 	class KeyClass
 	{
 	public:
@@ -99,7 +82,7 @@ class Curve3DClass : public PersistClass
 		bool operator == (const KeyClass & that) { return ((Point == that.Point) && (Time == that.Time)); }
 		bool operator != (const KeyClass & that) { return !KeyClass::operator==(that); }
 	};
-	
+
 	bool									IsLooping;
 	DynamicVectorClass<KeyClass>	Keys;
 };
@@ -146,9 +129,9 @@ class Curve1DClass : public PersistClass
 	virtual bool		Load (ChunkLoadClass &cload);
 
 protected:
-	
+
 	void				Find_Interval(float time,int * i0,int * i1,float * t);
-	
+
 	class KeyClass
 	{
 	public:
@@ -174,6 +157,3 @@ class LinearCurve1DClass : public Curve1DClass
 	virtual bool								Save(ChunkSaveClass &csave);
 	virtual bool								Load(ChunkLoadClass &cload);
 };
-
-
-#endif //CURVE_H
diff --git a/Core/Libraries/Source/WWVegas/WWMath/euler.cpp b/Core/Libraries/Source/WWVegas/WWMath/euler.cpp
index 37bca269b18..5cf23f242b4 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/euler.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/euler.cpp
@@ -17,30 +17,30 @@
 */
 
 /* $Header: /Commando/Code/wwmath/euler.cpp 5     4/27/01 11:51a Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G Math Library                                    * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwmath/euler.cpp                             $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 4/23/01 6:08p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 5                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   EulerAnglesClass::EulerAnglesClass -- constructor                                         * 
- *   EulerAnglesClass::Get_Angle -- returns angle 'i' of the euler angles                      * 
- *   EulerAnglesClass::From_Matrix -- computes the equivalent euler angles for the given matrix* 
- *   EulerAnglesClass::To_Matrix -- Builds a matrix from the given euler angles                * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G Math Library                                    *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwmath/euler.cpp                             $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 4/23/01 6:08p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 5                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   EulerAnglesClass::EulerAnglesClass -- constructor                                         *
+ *   EulerAnglesClass::Get_Angle -- returns angle 'i' of the euler angles                      *
+ *   EulerAnglesClass::From_Matrix -- computes the equivalent euler angles for the given matrix*
+ *   EulerAnglesClass::To_Matrix -- Builds a matrix from the given euler angles                *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "euler.h"	
+#include "euler.h"
 #include <float.h>
 
 
@@ -126,51 +126,51 @@ static int _euler_axis_k(int order);
 static int _euler_axis_h(int order);
 
 
-/*********************************************************************************************** 
- * EulerAnglesClass::EulerAnglesClass -- constructor                                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * EulerAnglesClass::EulerAnglesClass -- constructor                                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 EulerAnglesClass::EulerAnglesClass(const Matrix3D & M,int order)
 {
 	this->From_Matrix(M,order);
 }
 
-/*********************************************************************************************** 
- * EulerAnglesClass::Get_Angle -- returns angle 'i' of the euler angles                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * EulerAnglesClass::Get_Angle -- returns angle 'i' of the euler angles                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 double EulerAnglesClass::Get_Angle(int i)
 {
-	return Angle[i];		
+	return Angle[i];
 }
 
-/*********************************************************************************************** 
- * EulerAnglesClass::From_Matrix -- computes the equivalent euler angles for the given matrix  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * EulerAnglesClass::From_Matrix -- computes the equivalent euler angles for the given matrix  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void EulerAnglesClass::From_Matrix(const Matrix3D & M, int order)
 {
@@ -224,7 +224,7 @@ void EulerAnglesClass::From_Matrix(const Matrix3D & M, int order)
 		double x2 = PI + Angle[0];
 		double y2 = PI - Angle[1];
 		double z2 = PI + Angle[2];
-				
+
 		if (x2 > PI) {
 			x2 = x2 - 2*PI;
 		}
@@ -250,17 +250,17 @@ void EulerAnglesClass::From_Matrix(const Matrix3D & M, int order)
 
 
 
-/*********************************************************************************************** 
- * EulerAnglesClass::To_Matrix -- Builds a matrix from the given euler angles                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * EulerAnglesClass::To_Matrix -- Builds a matrix from the given euler angles                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void EulerAnglesClass::To_Matrix(Matrix3D & M)
 {
@@ -275,12 +275,12 @@ void EulerAnglesClass::To_Matrix(Matrix3D & M)
 	a2 = Angle[2];
 
 	_euler_unpack_order(Order,i,j,k,h,n,s,f);
-	if (f == EULER_FRAME_ROTATING) { 
-		double t = a0; a0 = a2; a2 = t; 
+	if (f == EULER_FRAME_ROTATING) {
+		double t = a0; a0 = a2; a2 = t;
 	}
-	
-	if (n == EULER_PARITY_ODD) { 
-		a0 = -a0; a1 = -a1; a2 = -a2; 
+
+	if (n == EULER_PARITY_ODD) {
+		a0 = -a0; a1 = -a1; a2 = -a2;
 	}
 
 	ti = a0;				tj = a1;				th = a2;
@@ -351,7 +351,7 @@ int _euler_axis_h(int order)
 
 void _euler_unpack_order(int order,int &i,int &j,int &k,int &h,int &n,int &s,int &f)
 {
-	
+
 	f = order & 1;
 	order >>= 1;
 
diff --git a/Core/Libraries/Source/WWVegas/WWMath/euler.h b/Core/Libraries/Source/WWVegas/WWMath/euler.h
index 4d495b33bf7..70dc0521cd4 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/euler.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/euler.h
@@ -17,31 +17,25 @@
 */
 
 /* $Header: /Commando/Code/wwmath/euler.h 5     5/05/01 5:48p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G Math Library                                    * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwmath/euler.h                               $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 5/04/01 8:37p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 5                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G Math Library                                    *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwmath/euler.h                               $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 5/04/01 8:37p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 5                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef EULER_H
-#define EULER_H
 
 #include "always.h"
 #include "matrix3d.h"
@@ -50,13 +44,13 @@
 
 /*********************************************************************
 
-	Euler Order Types 
+	Euler Order Types
 
 	When creating an EulerAngles object, use one of the below
 	constants to describe the axis convention.
 
 	XYZ - order of the axes
-	s/r - whether the rotations are applied to a static or 
+	s/r - whether the rotations are applied to a static or
 	      rotating frame.
 
 *********************************************************************/
@@ -92,7 +86,7 @@ extern int	EulerOrderZYZr;
 
 
 /*********************************************************************
-	
+
 	EulerAnglesClass
 
 	The purpose for this class is mainly for conversion.  You can
@@ -100,9 +94,9 @@ extern int	EulerOrderZYZr;
 	convert matrices into a set of euler angles.  You don't really
 	want to use this at run-time to convert matrices into angles.
 
-	The guts of this implementation is based on the article in Graphics 
+	The guts of this implementation is based on the article in Graphics
 	Gems IV by Ken Shoemake.  The original article is on page 222.
-	
+
 *********************************************************************/
 class EulerAnglesClass
 {
@@ -122,6 +116,3 @@ class EulerAnglesClass
 	int		Order;
 
 };
-
-
-#endif /*EULER_H*/
diff --git a/Core/Libraries/Source/WWVegas/WWMath/frustum.cpp b/Core/Libraries/Source/WWVegas/WWMath/frustum.cpp
index 317ac440a77..1f059c5bea5 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/frustum.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/frustum.cpp
@@ -60,7 +60,7 @@
  *   2/17/2000  gth : Created.                                                                 *
  *=============================================================================================*/
 void FrustumClass::Init
-( 
+(
 	const Matrix3D &		camera,
 	const Vector2 &		vpmin,
 	const Vector2 &		vpmax,
@@ -69,7 +69,7 @@ void FrustumClass::Init
 )
 {
 	int i;
-	
+
 	// Store the camera transform
 	CameraTransform = camera;
 
@@ -113,7 +113,7 @@ void FrustumClass::Init
 		Corners[2].Set(vpmax.X, vpmin.Y, 1.0);
 		Corners[6] = Corners[2];
 		Corners[2] *= znear;
-		Corners[6] *= zfar; 
+		Corners[6] *= zfar;
 	}
 	else
 	{	//normal camera
@@ -132,7 +132,7 @@ void FrustumClass::Init
 		Corners[3].Set(vpmax.X, vpmin.Y, 1.0);
 		Corners[7] = Corners[3];
 		Corners[3] *= znear;
-		Corners[7] *= zfar; 
+		Corners[7] *= zfar;
 	}
 
 
diff --git a/Core/Libraries/Source/WWVegas/WWMath/frustum.h b/Core/Libraries/Source/WWVegas/WWMath/frustum.h
index b2af8fa4751..0d46f6a692d 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/frustum.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/frustum.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef FRUSTUM_H
-#define FRUSTUM_H
 
 #include "vector3.h"
 #include "plane.h"
@@ -66,8 +60,3 @@ class FrustumClass
 	Vector3				BoundMin;
 	Vector3				BoundMax;
 };
-
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/gridcull.cpp b/Core/Libraries/Source/WWVegas/WWMath/gridcull.cpp
index 6ba6caed1dc..b4289656c6f 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/gridcull.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/gridcull.cpp
@@ -77,7 +77,7 @@ const uint32 GRID_CURRENT_VERSION = 0x00010000;
 /*
 ** Chunk Id's used by the aabtree code to save itself into a file
 */
-enum 
+enum
 {
 	GRID_CHUNK_VERSION					= 0x00000001,	// version wrapper, contains 32bit version #
 	GRID_CHUNK_PARAMETERS				= 0x00000100,	// parameters for the grid cull system
@@ -90,7 +90,7 @@ enum
 */
 struct IOGridParametersStruct
 {
-	IOVector3Struct	MinCellSize;	
+	IOVector3Struct	MinCellSize;
 	IOVector3Struct	Origin;
 	IOVector3Struct	CellDim;
 	uint32				CellCount[3];
@@ -178,10 +178,8 @@ GridCullSystemClass::GridCullSystemClass(void) :
  *=============================================================================================*/
 GridCullSystemClass::~GridCullSystemClass(void)
 {
-	if (Cells != NULL) {
-		delete Cells;
-		Cells = NULL;
-	}
+	delete Cells;
+	Cells = NULL;
 }
 
 
@@ -206,10 +204,10 @@ void GridCullSystemClass::Collect_Objects(const Vector3 & point)
 	init_volume(point,point,&vol);
 	if (!vol.Is_Empty()) {
 
-		int delta_x = vol.Max[0] - vol.Min[0];		
+		int delta_x = vol.Max[0] - vol.Min[0];
 		int i,j,k;
 		int address = map_indices_to_address(vol.Min[0],vol.Min[1],vol.Min[2]);
-		
+
 		for (k=vol.Min[2]; k<vol.Max[2]; k++) {
 			for (j=vol.Min[1]; j<vol.Max[1]; j++) {
 				for (i=vol.Min[0]; i<vol.Max[0]; i++) {
@@ -253,10 +251,10 @@ void GridCullSystemClass::Collect_Objects(const AABoxClass & box)
 
 	if (!vol.Is_Empty()) {
 
-		int delta_x = vol.Max[0] - vol.Min[0];		
+		int delta_x = vol.Max[0] - vol.Min[0];
 		int i,j,k;
 		int address = map_indices_to_address(vol.Min[0],vol.Min[1],vol.Min[2]);
-		
+
 		for (k=vol.Min[2]; k<vol.Max[2]; k++) {
 			for (j=vol.Min[1]; j<vol.Max[1]; j++) {
 				for (i=vol.Min[0]; i<vol.Max[0]; i++) {
@@ -270,7 +268,7 @@ void GridCullSystemClass::Collect_Objects(const AABoxClass & box)
 			address = map_indices_to_address(vol.Min[0],vol.Min[1],k+1);
 		}
 	}
-	
+
 	/*
 	** Collect the objects in the no-grid-list
 	*/
@@ -300,7 +298,7 @@ void GridCullSystemClass::Collect_Objects(const OBBoxClass & box)
 
 	if (!vol.Is_Empty()) {
 
-		int delta_x = vol.Max[0] - vol.Min[0];		
+		int delta_x = vol.Max[0] - vol.Min[0];
 		int i,j,k;
 		int address = map_indices_to_address(vol.Min[0],vol.Min[1],vol.Min[2]);
 
@@ -347,10 +345,10 @@ void GridCullSystemClass::Collect_Objects(const FrustumClass & frustum)
 
 	if (!vol.Is_Empty()) {
 
-		int delta_x = vol.Max[0] - vol.Min[0];		
+		int delta_x = vol.Max[0] - vol.Min[0];
 		int i,j,k;
 		int address = map_indices_to_address(vol.Min[0],vol.Min[1],vol.Min[2]);
-		
+
 		for (k=vol.Min[2]; k<vol.Max[2]; k++) {
 			for (j=vol.Min[1]; j<vol.Max[1]; j++) {
 				for (i=vol.Min[0]; i<vol.Max[0]; i++) {
@@ -364,7 +362,7 @@ void GridCullSystemClass::Collect_Objects(const FrustumClass & frustum)
 			address = map_indices_to_address(vol.Min[0],vol.Min[1],k+1);
 		}
 	}
-	
+
 	/*
 	** Collect the objects in the no-grid-list
 	*/
@@ -470,9 +468,7 @@ void GridCullSystemClass::Re_Partition(const Vector3 & input_min,const Vector3 &
 	OOCellDim.Y = 1.0f / CellDim.Y;
 	OOCellDim.Z = 1.0f / CellDim.Z;
 
-	if (Cells != NULL) {
-		delete[] Cells;
-	}
+	delete[] Cells;
 	Cells = W3DNEWARRAY CullableClass * [total_cell_count()];
 	memset(&(Cells[0]),0,total_cell_count() * sizeof(CullableClass *));
 
@@ -480,9 +476,9 @@ void GridCullSystemClass::Re_Partition(const Vector3 & input_min,const Vector3 &
 	** iterate the collection list and re-insert all objects into the grid
 	*/
 	CullableClass * obj;
-	for (	obj = Get_First_Collected_Object_Internal(); 
-			obj != NULL; 
-			obj = Get_Next_Collected_Object_Internal(obj)) 
+	for (	obj = Get_First_Collected_Object_Internal();
+			obj != NULL;
+			obj = Get_Next_Collected_Object_Internal(obj))
 	{
 		link_object(obj);
 	}
@@ -521,7 +517,7 @@ void GridCullSystemClass::Collect_And_Unlink_All(void)
 				CullableClass * obj = Cells[map_indices_to_address(i,j,k)];
 				while (obj) {
 					CullableClass * nextobj = get_next_object(obj);
-				
+
 					unlink_object(obj);
 					Add_To_Collection(obj);
 
@@ -538,7 +534,7 @@ void GridCullSystemClass::Collect_And_Unlink_All(void)
 	CullableClass * obj = NoGridList;
 	while (obj) {
 		CullableClass * nextobj = get_next_object(obj);
-	
+
 		unlink_object(obj);
 		Add_To_Collection(obj);
 
@@ -563,11 +559,11 @@ void GridCullSystemClass::Update_Culling(CullableClass * obj)
 {
 	WWASSERT(obj);
 	WWASSERT(obj->Get_Culling_System() == this);
-	
+
 	int address;
 	GridLinkClass * link = (GridLinkClass *)obj->Get_Cull_Link();
 	map_point_to_address(obj->Get_Cull_Box().Center,address);
-	
+
 	if (address != link->GridAddress) {
 		unlink_object(obj);
 		link_object(obj,address);
@@ -591,7 +587,7 @@ void GridCullSystemClass::Load(ChunkLoadClass & cload)
 {
 	/*
 	** read the version chunk
-	*/ 
+	*/
 	uint32 version;
 	cload.Open_Chunk();
 	WWASSERT(cload.Cur_Chunk_ID() == GRID_CHUNK_VERSION);
@@ -634,11 +630,7 @@ void GridCullSystemClass::Load(ChunkLoadClass & cload)
 	OOCellDim.Y = 1.0f / CellDim.Y;
 	OOCellDim.Z = 1.0f / CellDim.Z;
 
-	if (Cells != NULL) {
-		delete [] Cells;
-		Cells = NULL;
-	}
-
+	delete [] Cells;
 	Cells = W3DNEWARRAY CullableClass * [total_cell_count()];
 	memset(&(Cells[0]),0,total_cell_count() * sizeof(CullableClass *));
 
@@ -646,9 +638,9 @@ void GridCullSystemClass::Load(ChunkLoadClass & cload)
 	** re-link the objects in
 	*/
 	CullableClass * obj;
-	for (	obj = Get_First_Collected_Object_Internal(); 
-			obj != NULL; 
-			obj = Get_Next_Collected_Object_Internal(obj)) 
+	for (	obj = Get_First_Collected_Object_Internal();
+			obj != NULL;
+			obj = Get_Next_Collected_Object_Internal(obj))
 	{
 		link_object(obj);
 	}
@@ -668,7 +660,7 @@ void GridCullSystemClass::Load(ChunkLoadClass & cload)
  *   4/27/2000  gth : Created.                                                                 *
  *=============================================================================================*/
 void GridCullSystemClass::Save(ChunkSaveClass & csave)
-{	
+{
 	/*
 	** write the version chunk
 	*/
@@ -762,7 +754,7 @@ void GridCullSystemClass::Add_Object_Internal(CullableClass * obj)
 	GridLinkClass * link = new GridLinkClass(this);
 	obj->Set_Cull_Link(link);
 	link_object(obj);
-	
+
 	ObjCount++;
 	obj->Add_Ref();
 }
@@ -831,14 +823,14 @@ void GridCullSystemClass::link_object(CullableClass * obj,int address)
 	** otherwise, insert it into the cell
 	*/
 	const AABoxClass & box = obj->Get_Cull_Box();
-	if (	
-			(box.Extent.X > MaxObjExtent) || 
-			(box.Extent.Y > MaxObjExtent) || 
+	if (
+			(box.Extent.X > MaxObjExtent) ||
+			(box.Extent.Y > MaxObjExtent) ||
 			(box.Extent.Z > MaxObjExtent) ||
 			(address == UNGRIDDED_ADDRESS)
-		) 
+		)
 	{
-		link->GridAddress = UNGRIDDED_ADDRESS;	
+		link->GridAddress = UNGRIDDED_ADDRESS;
 		link_object_to_list(&NoGridList,obj);
 	} else {
 		link->GridAddress = address;
@@ -943,7 +935,7 @@ void GridCullSystemClass::unlink_object_from_list(CullableClass ** head,Cullable
 	if (obj == *head) {
 		*head = link->Next;
 	}
-	
+
 	/*
 	** Link the object previous to us to our next...
 	*/
diff --git a/Core/Libraries/Source/WWVegas/WWMath/gridcull.h b/Core/Libraries/Source/WWVegas/WWMath/gridcull.h
index c423b5fa282..18d9d9f8865 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/gridcull.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/gridcull.h
@@ -51,9 +51,7 @@
  *   GridCullSystemClass::VolumeStruct::Split -- split this volume                             *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
 #include "cullsys.h"
 #include "mempool.h"
@@ -61,7 +59,6 @@
 #include "aabox.h"
 #include "lineseg.h"
 #include "obbox.h"
-#include <string.h>
 
 class ChunkLoadClass;
 class ChunkSaveClass;
@@ -74,7 +71,7 @@ class ChunkSaveClass;
 ** compared to the above mentioned systems are that it must uniformly divide space.  The
 ** AABTree conforms to the geometry placed in it and can therefore cull things more
 ** efficiently.  In actual use, this system is like an AAB-tree which is uniformly subdivided,
-** its just that we can jump straight to the leaves of the tree for insertion...  
+** its just that we can jump straight to the leaves of the tree for insertion...
 **
 ** The bounding volume for each grid cell is considered to be the volume of the cell, expanded
 ** by the maximum object size.  Inserting an object into the grid is a matter of determining
@@ -89,12 +86,12 @@ class GridCullSystemClass : public CullSystemClass
 
 	GridCullSystemClass(void);
 	~GridCullSystemClass(void);
-	
+
 	virtual void		Collect_Objects(const Vector3 & point);
 	virtual void		Collect_Objects(const AABoxClass & box);
 	virtual void		Collect_Objects(const OBBoxClass & box);
 	virtual void		Collect_Objects(const FrustumClass & frustum);
-	
+
 	virtual void		Re_Partition(const Vector3 & min,const Vector3 & max,float objdim);
 	virtual void		Update_Culling(CullableClass * obj);
 
@@ -129,7 +126,7 @@ class GridCullSystemClass : public CullSystemClass
 	void					Add_Object_Internal(CullableClass * obj);
 	void					Remove_Object_Internal(CullableClass * obj);
 
-	enum 
+	enum
 	{
 		TERMINATION_CELL_COUNT	= 16384,			// algorithm terminates if we ever have more than this many cells.
 		UNGRIDDED_ADDRESS			= 0xFFFFFFFF	// address given to objs that didn't fit in grid
@@ -147,7 +144,7 @@ class GridCullSystemClass : public CullSystemClass
 	int					CellCount[3];
 
 	//	3D array of pointers to objects in each cell
-	CullableClass **	Cells;	
+	CullableClass **	Cells;
 
 	// list of objs that were outside or too big for the grid.
 	CullableClass *	NoGridList;
@@ -155,7 +152,7 @@ class GridCullSystemClass : public CullSystemClass
 	// number of objects in the system
 	int					ObjCount;
 
-	// statistics 
+	// statistics
 	StatsStruct				Stats;
 
 	// Structure used to define a volume in the grid.  The volume spans from the cell indexed
@@ -193,7 +190,7 @@ class GridCullSystemClass : public CullSystemClass
 	void					init_volume(const AABoxClass & box,VolumeStruct * set_volume);
 	void					init_volume(const OBBoxClass & box,VolumeStruct * set_volume);
 	void					init_volume(const FrustumClass & frustum,VolumeStruct * set_volume);
-	
+
 	void					collect_objects_in_leaf(const Vector3 & point,CullableClass * head);
 	void					collect_objects_in_leaf(const AABoxClass & aabox,CullableClass * head);
 	void					collect_objects_in_leaf(const OBBoxClass & obbox,CullableClass * head);
@@ -212,9 +209,9 @@ class GridCullSystemClass : public CullSystemClass
 
 #else
 
-#define GRIDCULL_NODE_ACCEPTED						
-#define GRIDCULL_NODE_TRIVIALLY_ACCEPTED		
-#define GRIDCULL_NODE_REJECTED						
+#define GRIDCULL_NODE_ACCEPTED
+#define GRIDCULL_NODE_TRIVIALLY_ACCEPTED
+#define GRIDCULL_NODE_REJECTED
 
 #endif
 
@@ -249,7 +246,7 @@ class GridLinkClass : public CullLinkClass, public AutoPoolClass<GridLinkClass,2
 public:
 	GridLinkClass(GridCullSystemClass * system);
 	virtual ~GridLinkClass(void);
-	
+
 	int									GridAddress;		// address in the grid.
 	CullableClass *					Prev;					// prev object in this cell
 	CullableClass *					Next;					// next object in this cell
@@ -329,8 +326,8 @@ WWINLINE bool GridCullSystemClass::map_point_to_cell(const Vector3 & pt,int & se
 	set_j = floor(dp.Y * OOCellDim.Y);
 	set_k = floor(dp.Z * OOCellDim.Z);
 
-	if (	(set_i >= 0) && (set_j >= 0) && (set_k >= 0) && 
-			(set_i < CellCount[0]) && (set_j < CellCount[1]) && (set_k < CellCount[2])	) 
+	if (	(set_i >= 0) && (set_j >= 0) && (set_k >= 0) &&
+			(set_i < CellCount[0]) && (set_j < CellCount[1]) && (set_k < CellCount[2])	)
 	{
 		return true;
 	}
@@ -354,7 +351,7 @@ WWINLINE bool GridCullSystemClass::map_point_to_address(const Vector3 & pt,int &
 {
 	int i,j,k;
 	bool res = map_point_to_cell(pt,i,j,k);
-	
+
 	if (res) {
 		set_address = map_indices_to_address(i,j,k);
 		return true;
@@ -430,7 +427,7 @@ WWINLINE void	GridCullSystemClass::compute_box(int i,int j,int k,AABoxClass * se
 	max.Z = min.Z + CellDim.Z + 2.0f*MaxObjExtent;
 
 	set_box->Init((min+max)*0.5f, (min-max)*0.5f);
-}	
+}
 
 
 /***********************************************************************************************
@@ -647,9 +644,9 @@ WWINLINE GridCullSystemClass::VolumeStruct::VolumeStruct(int i0,int j0,int k0,in
  * HISTORY:                                                                                    *
  *   3/30/2000  gth : Created.                                                                 *
  *=============================================================================================*/
-WWINLINE bool GridCullSystemClass::VolumeStruct::Is_Leaf(void) const 
-{ 
-	return ((Max[0]-Min[0] == 1) && (Max[1]-Min[1] == 1) && (Max[2]-Min[2] == 1)); 
+WWINLINE bool GridCullSystemClass::VolumeStruct::Is_Leaf(void) const
+{
+	return ((Max[0]-Min[0] == 1) && (Max[1]-Min[1] == 1) && (Max[2]-Min[2] == 1));
 }
 
 
@@ -684,7 +681,7 @@ WWINLINE bool GridCullSystemClass::VolumeStruct::Is_Empty(void) const
  *   3/30/2000  gth : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void GridCullSystemClass::VolumeStruct::Split(VolumeStruct & v0,VolumeStruct & v1) const
-{	
+{
 	// find the longest dimension
 	int split_axis = 0;
 	int delta[3];
diff --git a/Core/Libraries/Source/WWVegas/WWMath/hermitespline.cpp b/Core/Libraries/Source/WWVegas/WWMath/hermitespline.cpp
index c3ef9545ddd..02d722c311a 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/hermitespline.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/hermitespline.cpp
@@ -52,15 +52,15 @@ DECLARE_FORCE_LINK(hermitespline);
 SimplePersistFactoryClass<HermiteSpline3DClass,WWMATH_CHUNKID_HERMITESPLINE3D>	_HermiteSpline3DFactory;
 SimplePersistFactoryClass<HermiteSpline1DClass,WWMATH_CHUNKID_HERMITESPLINE1D>	_HermiteSpline1DFactory;
 
-enum 
+enum
 {
 	// ID's used by HermiteSpline3D
-	HERMITE3D_CHUNK_CURVE3D					= 0x00020727,	
-	HERMITE3D_CHUNK_TANGENTS,			
+	HERMITE3D_CHUNK_CURVE3D					= 0x00020727,
+	HERMITE3D_CHUNK_TANGENTS,
 
 	// ID's used by HermiteSpline1D
-	HERMITE1D_CHUNK_CURVE1D					= 0x00020729,	
-	HERMITE1D_CHUNK_TANGENTS,			
+	HERMITE1D_CHUNK_CURVE1D					= 0x00020729,
+	HERMITE1D_CHUNK_TANGENTS,
 };
 
 
@@ -90,7 +90,7 @@ void HermiteSpline3DClass::Set_Looping(bool onoff)
 void HermiteSpline3DClass::Evaluate(float time,Vector3 * set_val)
 {
 	// if we're outside the range, return the start or end...
-	if (time < Keys[0].Time) { 
+	if (time < Keys[0].Time) {
 		*set_val = Keys[0].Point;
 		return;
 	}
@@ -104,7 +104,7 @@ void HermiteSpline3DClass::Evaluate(float time,Vector3 * set_val)
 	if (TangentsDirty) {
 		Update_Tangents();
 	}
-	
+
 	// ok find the segment
 	int i0,i1;
 	float t;
@@ -119,13 +119,13 @@ void HermiteSpline3DClass::Evaluate(float time,Vector3 * set_val)
 	float h2 = t3 - 2*t2 + t;
 	float h3 = t3 - t2;
 
-	set_val->X =	h0*Keys[i0].Point.X + h1*Keys[i1].Point.X + 
+	set_val->X =	h0*Keys[i0].Point.X + h1*Keys[i1].Point.X +
 						h2*Tangents[i0].OutTangent.X + h3*Tangents[i1].InTangent.X;
 
-	set_val->Y =	h0*Keys[i0].Point.Y + h1*Keys[i1].Point.Y + 
+	set_val->Y =	h0*Keys[i0].Point.Y + h1*Keys[i1].Point.Y +
 						h2*Tangents[i0].OutTangent.Y + h3*Tangents[i1].InTangent.Y;
 
-	set_val->Z =	h0*Keys[i0].Point.Z + h1*Keys[i1].Point.Z + 
+	set_val->Z =	h0*Keys[i0].Point.Z + h1*Keys[i1].Point.Z +
 						h2*Tangents[i0].OutTangent.Z + h3*Tangents[i1].InTangent.Z;
 }
 
@@ -141,7 +141,7 @@ void HermiteSpline3DClass::Evaluate_Derivative(float time,Vector3 * set_val)
 	if (TangentsDirty) {
 		Update_Tangents();
 	}
-	
+
 	// ok find the segment
 	int i0,i1;
 	float t;
@@ -155,13 +155,13 @@ void HermiteSpline3DClass::Evaluate_Derivative(float time,Vector3 * set_val)
 	float dh2 = 3*t2 - 4*t + 1;
 	float dh3 = 3*t2 - 2*t;
 
-	set_val->X =	dh0*Keys[i0].Point.X + dh1*Keys[i1].Point.X + 
+	set_val->X =	dh0*Keys[i0].Point.X + dh1*Keys[i1].Point.X +
 						dh2*Tangents[i0].OutTangent.X + dh3*Tangents[i1].InTangent.X;
 
-	set_val->Y =	dh0*Keys[i0].Point.Y + dh1*Keys[i1].Point.Y + 
+	set_val->Y =	dh0*Keys[i0].Point.Y + dh1*Keys[i1].Point.Y +
 						dh2*Tangents[i0].OutTangent.Y + dh3*Tangents[i1].InTangent.Y;
 
-	set_val->Z =	dh0*Keys[i0].Point.Z + dh1*Keys[i1].Point.Z + 
+	set_val->Z =	dh0*Keys[i0].Point.Z + dh1*Keys[i1].Point.Z +
 						dh2*Tangents[i0].OutTangent.Z + dh3*Tangents[i1].InTangent.Z;
 }
 
@@ -222,7 +222,7 @@ bool HermiteSpline3DClass::Save(ChunkSaveClass &csave)
 	csave.Begin_Chunk(HERMITE3D_CHUNK_CURVE3D);
 	Curve3DClass::Save(csave);
 	csave.End_Chunk();
-	
+
 	csave.Begin_Chunk(HERMITE3D_CHUNK_TANGENTS);
 	for (int i=0; i<Tangents.Count(); i++) {
 		csave.Write(&(Tangents[i].InTangent),sizeof(Tangents[i].InTangent));
@@ -242,8 +242,8 @@ bool HermiteSpline3DClass::Load(ChunkLoadClass &cload)
 
 	// read in the chunks
 	while (cload.Open_Chunk()) {
-		
-		switch(cload.Cur_Chunk_ID()) 
+
+		switch(cload.Cur_Chunk_ID())
 		{
 			case HERMITE3D_CHUNK_CURVE3D:
 				Curve3DClass::Load(cload);
@@ -258,7 +258,7 @@ bool HermiteSpline3DClass::Load(ChunkLoadClass &cload)
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
@@ -293,7 +293,7 @@ void HermiteSpline1DClass::Evaluate(float time,float * set_val)
 	if (!IsLooping)
 	{
 		// if we're outside the range, return the start or end...
-		if (time < Keys[0].Time) { 
+		if (time < Keys[0].Time) {
 			*set_val = Keys[0].Point;
 			return;
 		}
@@ -308,7 +308,7 @@ void HermiteSpline1DClass::Evaluate(float time,float * set_val)
 	if (TangentsDirty) {
 		Update_Tangents();
 	}
-	
+
 	// ok find the segment
 	int i0,i1;
 	float t;
@@ -388,7 +388,7 @@ bool HermiteSpline1DClass::Save(ChunkSaveClass &csave)
 	csave.Begin_Chunk(HERMITE1D_CHUNK_CURVE1D);
 	Curve1DClass::Save(csave);
 	csave.End_Chunk();
-	
+
 	csave.Begin_Chunk(HERMITE1D_CHUNK_TANGENTS);
 	for (int i=0; i<Tangents.Count(); i++) {
 		csave.Write(&(Tangents[i].InTangent),sizeof(Tangents[i].InTangent));
@@ -408,8 +408,8 @@ bool HermiteSpline1DClass::Load(ChunkLoadClass &cload)
 
 	// read in the chunks
 	while (cload.Open_Chunk()) {
-		
-		switch(cload.Cur_Chunk_ID()) 
+
+		switch(cload.Cur_Chunk_ID())
 		{
 			case HERMITE1D_CHUNK_CURVE1D:
 				Curve1DClass::Load(cload);
@@ -425,7 +425,7 @@ bool HermiteSpline1DClass::Load(ChunkLoadClass &cload)
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
diff --git a/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h b/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h
index 93517ba8b1b..70d3f83bea0 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HERMITE_H
-#define HERMITE_H
 
 #include "curve.h"
 
@@ -59,11 +53,11 @@ class HermiteSpline3DClass : public Curve3DClass
 		: TangentsDirty (true) { (*this) = that; }
 
 	const HermiteSpline3DClass &operator= (const HermiteSpline3DClass &that);
-	
+
 	virtual void		Evaluate(float time,Vector3 * set_val);
 	virtual void		Evaluate_Derivative(float time,Vector3 * set_val);
 	virtual void		Set_Looping(bool onoff);
-	
+
 	virtual void		Set_Key(int i,const Vector3 & point);
 	virtual int			Add_Key(const Vector3 & point,float t);
 	virtual void		Remove_Key(int i);
@@ -88,7 +82,7 @@ class HermiteSpline3DClass : public Curve3DClass
 		Vector3			OutTangent;
 		bool				operator == (const TangentsClass & that) { return ((InTangent == that.InTangent) && (OutTangent == that.OutTangent)); }
 		bool				operator != (const TangentsClass & that) { return !TangentsClass::operator == (that); }
-	};	
+	};
 
 	bool											TangentsDirty;
 	DynamicVectorClass<TangentsClass>	Tangents;
@@ -105,10 +99,10 @@ class HermiteSpline1DClass : public Curve1DClass
 public:
 	HermiteSpline1DClass (void)
 		: TangentsDirty (true) { }
-	
+
 	virtual void		Evaluate(float time,float * set_val);
 	virtual void		Set_Looping(bool onoff);
-	
+
 	virtual void		Set_Key(int i,float point,unsigned int extra=0);
 	virtual int			Add_Key(float point,float t,unsigned int extra=0);
 	virtual void		Remove_Key(int i);
@@ -121,7 +115,7 @@ class HermiteSpline1DClass : public Curve1DClass
 	virtual const PersistFactoryClass &	Get_Factory(void) const;
 	virtual bool								Save(ChunkSaveClass &csave);
 	virtual bool								Load(ChunkLoadClass &cload);
-	
+
 protected:
 
 	class TangentsClass
@@ -138,6 +132,3 @@ class HermiteSpline1DClass : public Curve1DClass
 	bool											TangentsDirty;
 	DynamicVectorClass<TangentsClass>	Tangents;
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWMath/lineseg.cpp b/Core/Libraries/Source/WWVegas/WWMath/lineseg.cpp
index 19d8bd8d2cc..e5f4150d6ea 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/lineseg.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/lineseg.cpp
@@ -34,8 +34,8 @@
  * Functions:                                                                                  *
  *   LineSegClass::Set -- Initialize this 'lineseg' by transforming another 'lineseg'          *
  *   LineSegClass::Set_Random -- create a random linesegment within the given space            *
- *   LineSegClass::Find_Point_Closest_To -- Finds point on line closest to point supplied.     * 
- *   LineSegClass::Find_Intersection -- Finds the closest points on the two lines				  * 
+ *   LineSegClass::Find_Point_Closest_To -- Finds point on line closest to point supplied.     *
+ *   LineSegClass::Find_Intersection -- Finds the closest points on the two lines				  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "lineseg.h"
@@ -62,7 +62,7 @@ void LineSegClass::Set(const LineSegClass & that,const Matrix3D & tm)
 	*/
 	Matrix3D::Transform_Vector(tm,that.P0,&P0);
 	Matrix3D::Transform_Vector(tm,that.P1,&P1);
-	
+
 	/*
 	** Just calculate DP
 	*/
@@ -110,57 +110,57 @@ void LineSegClass::Set_Random(const Vector3 & min,const Vector3 & max)
 	P1.Z = min.Z + frac * (max.Z - min.Z);
 
 	DP = P1 - P0;
-	Dir = DP; 
-	Dir.Normalize(); 
-	Length = DP.Length(); 
+	Dir = DP;
+	Dir.Normalize();
+	Length = DP.Length();
 }
 
 
 
 
-/*********************************************************************************************** 
- * LineSegClass::Find_Point_Closest_To -- Finds point on line closest to point supplied.       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/26/1999 SKB : Created.                                                                 * 
+/***********************************************************************************************
+ * LineSegClass::Find_Point_Closest_To -- Finds point on line closest to point supplied.       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/26/1999 SKB : Created.                                                                 *
  *=============================================================================================*/
 Vector3 LineSegClass::Find_Point_Closest_To(const Vector3 &pos) const
 {
 	// Get a vector from one line endpoint to point in question.
 	Vector3 v_0_pos = (pos - P0);
 	float dotprod = Vector3::Dot_Product(Dir, v_0_pos);
-					
+
 	// Check to see if point is past either of the endpoints.
 	// (Unable to draw a perpendicular line from the point to the line segment.)
 	if (dotprod <= 0.0) {
 		return(P0);
 	} else if (dotprod >= Length) {
 		return(P1);
-	}				
+	}
 
 	// Find point on line seg that is closest to pos passed in.
 	Vector3 point = P0 + (dotprod * Dir);
 	return(point);
-}	
-
-
-/*********************************************************************************************** 
- * LineSegClass::Find_Intersection -- Finds the closest points on the two lines..				  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   03/03/2000 PDS : Created.                                                                 * 
+}
+
+
+/***********************************************************************************************
+ * LineSegClass::Find_Intersection -- Finds the closest points on the two lines..				  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/03/2000 PDS : Created.                                                                 *
  *=============================================================================================*/
 bool
 LineSegClass::Find_Intersection
@@ -197,11 +197,11 @@ LineSegClass::Find_Intersection
 	float top2		= Vector3::Dot_Product(cross4, cross3);
 	float bottom2	= Vector3::Dot_Product(cross3, cross3);
 #endif
-	
+
 	//
 	//	If either of the divisors are 0, then the lines are parallel
 	//
-	if (bottom1 != 0 && bottom2 != 0) {		
+	if (bottom1 != 0 && bottom2 != 0) {
 		float length1 = top1 / bottom1;
 		float length2 = top2 / bottom2;
 
@@ -222,7 +222,7 @@ LineSegClass::Find_Intersection
 		if (fraction2 != NULL) {
 			(*fraction2) = length2 / Length;
 		}
-		
+
 		retval = true;
 	}
 
diff --git a/Core/Libraries/Source/WWVegas/WWMath/lineseg.h b/Core/Libraries/Source/WWVegas/WWMath/lineseg.h
index c500218e3ff..3e0f90a0f13 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/lineseg.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/lineseg.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef LINESEG_H
-#define LINESEG_H
 
 #include "always.h"
 #include "vector3.h"
@@ -74,7 +68,7 @@ class LineSegClass
 	float					Get_Length() const { return Length; }	// length of the segment
 
 	void					Compute_Point(float t,Vector3 * set) const	{ Vector3::Add(P0,t*DP,set); }
-	
+
 	Vector3				Find_Point_Closest_To(const Vector3 &pos) const;
 	bool					Find_Intersection (const LineSegClass &other_line, Vector3 *p1, float *fraction1, Vector3 *p2, float *fraction2) const;
 
@@ -88,6 +82,3 @@ class LineSegClass
 	Vector3				Dir;		// normalized direction.
 	float					Length;	// length of the segment
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.cpp b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.cpp
index d686d0cc331..139c782cfd9 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.cpp
@@ -38,7 +38,7 @@
 
 #include "lookuptable.h"
 #include "curve.h"
-#include "WWFILE.H"
+#include "WWFILE.h"
 #include "ffactory.h"
 #include "chunkio.h"
 #include "persistfactory.h"
@@ -108,7 +108,7 @@ void LookupTableMgrClass::Init(void)
 	// create a default table that the user can use in an emergency
 	LookupTableClass * default_table = NEW_REF(LookupTableClass,(2));
 	LinearCurve1DClass * default_curve = W3DNEW LinearCurve1DClass;
-	
+
 	default_curve->Add_Key(0.5f,0.0f);
 	default_curve->Add_Key(0.5f,1.0f);
 	default_table->Init("DefaultTable",default_curve);
@@ -156,7 +156,7 @@ LookupTableClass * LookupTableMgrClass::Get_Table(const char * name,bool try_to_
 
 		FileClass * file = _TheFileFactory->Get_File(name);
 		if (file && file->Open()) {
-			
+
 			ChunkLoadClass cload(file);
 
 			Curve1DClass * curve = NULL;
@@ -170,7 +170,7 @@ LookupTableClass * LookupTableMgrClass::Get_Table(const char * name,bool try_to_
 		}
 		_TheFileFactory->Return_File(file);
 	}
-	
+
 	return new_table;  // constructor ref is returned to user.
 }
 
@@ -232,7 +232,7 @@ void LookupTableMgrClass::Load_Table_Desc
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
diff --git a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h
index 30110f465a3..c37923f4d7e 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h
@@ -36,14 +36,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef LOOKUPTABLE_H
-#define LOOKUPTABLE_H
+#pragma once
 
 #include "always.h"
 #include "simplevec.h"
 #include "wwstring.h"
-#include "refcount.h"
 #include "multilist.h"
 #include "wwmath.h"
 
@@ -56,7 +53,7 @@ class ChunkLoadClass;
 
 /**
 ** LookupTableClass
-** This class contains the tabulated values for a function. 
+** This class contains the tabulated values for a function.
 */
 class LookupTableClass : public RefCountClass, public MultiListObjectClass
 {
@@ -72,7 +69,7 @@ class LookupTableClass : public RefCountClass, public MultiListObjectClass
 protected:
 
 	StringClass						Name;				// name of this table, if it came from a file, this is also the filename
-	float								MinInputValue; 
+	float								MinInputValue;
 	float								MaxInputValue;
 	float								OOMaxMinusMin;
 	SimpleVecClass<float>		OutputSamples;
@@ -87,10 +84,10 @@ inline float LookupTableClass::Get_Value(float input)
 	if (input >= MaxInputValue) {
 		return OutputSamples[OutputSamples.Length()-1];
 	}
-	
+
 	float normalized_input = (float)(OutputSamples.Length()-1) * (input - MinInputValue) * OOMaxMinusMin;
 	float input0 = WWMath::Floor(normalized_input);
-	
+
 	int index0 = WWMath::Float_To_Long(input0);
 	int index1 = index0+1;
 	float lerp = normalized_input - input0;
@@ -106,7 +103,7 @@ inline float LookupTableClass::Get_Value_Quick(float input)
 	if (input >= MaxInputValue) {
 		return OutputSamples[OutputSamples.Length()-1];
 	}
-	
+
 	int index = (OutputSamples.Length()-1) * WWMath::Float_To_Long((input - MinInputValue) * OOMaxMinusMin);
 	return OutputSamples[index];
 }
@@ -115,7 +112,7 @@ inline float LookupTableClass::Get_Value_Quick(float input)
 /**
 ** LookupTableMgrClass
 ** This class tracks all of the LookupTableClass's that have been loaded or installed.
-** LookupTables can be created using the "SimpleGraph" tool.  It basically allows you 
+** LookupTables can be created using the "SimpleGraph" tool.  It basically allows you
 ** to edit a curve which will be used to generate the table.  These curves are stored
 ** in .TBL files.
 **
@@ -123,7 +120,7 @@ inline float LookupTableClass::Get_Value_Quick(float input)
 ** by filename and it will load the table for you (unless it is already loaded).
 **
 ** NOTE: I add a table called "DefaultTable" so that you can revert to that if
-** your table isn't found.  
+** your table isn't found.
 */
 class LookupTableMgrClass
 {
@@ -138,12 +135,12 @@ class LookupTableMgrClass
 	static bool					Add_Table(LookupTableClass * table);
 	static bool					Remove_Table(LookupTableClass * table);
 	static LookupTableClass *	Get_Table(const char * name,bool try_to_load = true);
-	
+
 	static void					Save_Table_Desc(		ChunkSaveClass &	csave,
 																Curve1DClass *		curve,
 																const Vector2 &	min,
 																const Vector2 &	max			);
-	
+
 	static void					Load_Table_Desc(		ChunkLoadClass &	cload,
 																Curve1DClass **	curve_ptr,
 																Vector2 *			set_min = NULL,
@@ -156,6 +153,3 @@ class LookupTableMgrClass
 	static RefMultiListClass<LookupTableClass>	Tables;
 
 };
-
-
-#endif // LOOKUPTABLE_H
diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix3.cpp b/Core/Libraries/Source/WWVegas/WWMath/matrix3.cpp
index 9b62d8fa89e..26de94bb921 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/matrix3.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/matrix3.cpp
@@ -26,7 +26,7 @@
  *                                                                                             *
  *                   Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
+ *                       Author : Kenny Mitchell                                               *
  *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
@@ -119,17 +119,17 @@ const Matrix3x3 Matrix3x3::RotateZ270
 
 
 
-/*********************************************************************************************** 
- * Matrix3x3::Matrix3x3 -- Convert a Matrix3D (fake 4x4) to a Matrix3x3                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::Matrix3x3 -- Convert a Matrix3D (fake 4x4) to a Matrix3x3                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Matrix3x3::Matrix3x3(const Matrix3D & m)
 {
@@ -180,7 +180,7 @@ Matrix3x3 & Matrix3x3::operator = (const Matrix3D & m)
 	Row[0].Set(m[0][0],m[0][1],m[0][2]);
 	Row[1].Set(m[1][0],m[1][1],m[1][2]);
 	Row[2].Set(m[2][0],m[2][1],m[2][2]);
-	return *this; 
+	return *this;
 }
 
 Matrix3x3 & Matrix3x3::operator = (const Matrix4x4 & m)
@@ -188,13 +188,13 @@ Matrix3x3 & Matrix3x3::operator = (const Matrix4x4 & m)
 	Row[0].Set(m[0][0],m[0][1],m[0][2]);
 	Row[1].Set(m[1][0],m[1][1],m[1][2]);
 	Row[2].Set(m[2][0],m[2][1],m[2][2]);
-	return *this; 
+	return *this;
 }
 
 void Matrix3x3::Multiply(const Matrix3D & a, const Matrix3x3 & b,Matrix3x3 * res)
 {
 	#define ROWCOL(i,j) a[i][0]*b[0][j] + a[i][1]*b[1][j] + a[i][2]*b[2][j]
-    
+
 	(*res)[0][0] = ROWCOL(0,0);
 	(*res)[0][1] = ROWCOL(0,1);
 	(*res)[0][2] = ROWCOL(0,2);
@@ -213,7 +213,7 @@ void Matrix3x3::Multiply(const Matrix3D & a, const Matrix3x3 & b,Matrix3x3 * res
 void Matrix3x3::Multiply(const Matrix3x3 & a, const Matrix3D & b,Matrix3x3 * res)
 {
 	#define ROWCOL(i,j) a[i][0]*b[0][j] + a[i][1]*b[1][j] + a[i][2]*b[2][j]
-    
+
 	(*res)[0][0] = ROWCOL(0,0);
 	(*res)[0][1] = ROWCOL(0,1);
 	(*res)[0][2] = ROWCOL(0,2);
@@ -232,26 +232,26 @@ void Matrix3x3::Multiply(const Matrix3x3 & a, const Matrix3D & b,Matrix3x3 * res
 Matrix3x3 operator * (const Matrix3D & a, const Matrix3x3 & b)
 {
 	#define ROWCOL(i,j) a[i][0]*b[0][j] + a[i][1]*b[1][j] + a[i][2]*b[2][j]
-    
+
 	return Matrix3x3(
 			Vector3(ROWCOL(0,0), ROWCOL(0,1), ROWCOL(0,2) ),
 			Vector3(ROWCOL(1,0), ROWCOL(1,1), ROWCOL(1,2) ),
 			Vector3(ROWCOL(2,0), ROWCOL(2,1), ROWCOL(2,2) )
 	);
-	
+
 	#undef ROWCOL
 }
 
 Matrix3x3 operator * (const Matrix3x3 & a, const Matrix3D & b)
 {
 	#define ROWCOL(i,j) a[i][0]*b[0][j] + a[i][1]*b[1][j] + a[i][2]*b[2][j]
-    
+
 	return Matrix3x3(
 			Vector3(ROWCOL(0,0), ROWCOL(0,1), ROWCOL(0,2) ),
 			Vector3(ROWCOL(1,0), ROWCOL(1,1), ROWCOL(1,2) ),
 			Vector3(ROWCOL(2,0), ROWCOL(2,1), ROWCOL(2,2) )
 	);
-	
+
 	#undef ROWCOL
 }
 
@@ -293,14 +293,14 @@ void Matrix3x3::Multiply(const Matrix3x3 & A,const Matrix3x3 & B,Matrix3x3 * set
 	Matrix3x3 * Aptr;
 	float tmp1,tmp2,tmp3;
 
-	// Check for aliased parameters, copy the 'A' matrix into a temporary if the 
-	// result is going into 'A'. (in this case, this function is no better than 
+	// Check for aliased parameters, copy the 'A' matrix into a temporary if the
+	// result is going into 'A'. (in this case, this function is no better than
 	// the overloaded C++ operator...)
 	if (set_res == &A) {
 		tmp = A;
 		Aptr = &tmp;
 	} else {
-		Aptr = (Matrix3x3 *)&A;	
+		Aptr = (Matrix3x3 *)&A;
 	}
 
 	tmp1 = B[0][0];
@@ -333,7 +333,7 @@ int Matrix3x3::Is_Orthogonal(void) const
 	Vector3 x(Row[0].X,Row[0].Y,Row[0].Z);
 	Vector3 y(Row[1].X,Row[1].Y,Row[1].Z);
 	Vector3 z(Row[2].X,Row[2].Y,Row[2].Z);
-	
+
 	if (Vector3::Dot_Product(x,y) > WWMATH_EPSILON) return 0;
 	if (Vector3::Dot_Product(y,z) > WWMATH_EPSILON) return 0;
 	if (Vector3::Dot_Product(z,x) > WWMATH_EPSILON) return 0;
@@ -385,7 +385,7 @@ void Matrix3x3::Re_Orthogonalize(void)
 	Row[1][0] = y.X;
 	Row[1][1] = y.Y;
 	Row[1][2] = y.Z;
-	
+
 	Row[2][0] = z.X;
 	Row[2][1] = z.Y;
 	Row[2][2] = z.Z;
diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix3.h b/Core/Libraries/Source/WWVegas/WWMath/matrix3.h
index 9ada2ac67b7..60c74139029 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/matrix3.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/matrix3.h
@@ -17,52 +17,46 @@
 */
 
 /* $Header: /Commando/Code/wwmath/matrix3.h 36    5/11/01 7:11p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : WW3D                                                         * 
- *                                                                                             * 
- *                    File Name : MATRIX3.H                                                    * 
- *                                                                                             * 
- *               Org Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                   Start Date : 06/02/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 6, 2002 [KM]                                            * 
- *                                                                                             * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3D                                                         *
+ *                                                                                             *
+ *                    File Name : MATRIX3.h                                                    *
+ *                                                                                             *
+ *               Org Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *                   Start Date : 06/02/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 6, 2002 [KM]                                            *
+ *                                                                                             *
  * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Matrix3x3::Matrix3x3 -- Constructor, optionally initialize to Identitiy matrix                * 
- *   Matrix3x3::Matrix3x3 -- Copy Constructor                                                      * 
- *   Matrix3x3::Matrix3x3 -- Convert a Matrix3D (fake 4x4) to a Matrix3x3                            * 
- *   Matrix3x3::Matrix3x3 -- Constructor                                                           * 
- *   Matrix3x3::Transpose -- Returns transpose of the matrix                                     * 
- *   Matrix3x3::Inverse -- returns the inverse of the matrix                                     * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Matrix3x3::Matrix3x3 -- Constructor, optionally initialize to Identitiy matrix                *
+ *   Matrix3x3::Matrix3x3 -- Copy Constructor                                                      *
+ *   Matrix3x3::Matrix3x3 -- Convert a Matrix3D (fake 4x4) to a Matrix3x3                            *
+ *   Matrix3x3::Matrix3x3 -- Constructor                                                           *
+ *   Matrix3x3::Transpose -- Returns transpose of the matrix                                     *
+ *   Matrix3x3::Inverse -- returns the inverse of the matrix                                     *
  *   Matrix3x3::Determinant -- returns the determinant of the matrix                             *
- *   Matrix3x3::operator = -- assignment operator                                                * 
- *   Matrix3x3::operator += -- "plus equals" operator                                            * 
- *   Matrix3x3::operator-= -- "minus equals" operator                                            * 
- *   Matrix3x3::operator *= -- "times equals" operator                                           * 
- *   Matrix3x3::operator /= -- "divide equals" operator                                          * 
- *   Create_X_Rotation_Matrix3 -- creates a matrix3 which is a rotation about X                * 
- *   Create_Y_Rotation_Matrix3 -- Creates a Matrix3x3 which is a rotation about Y                * 
- *   Create_Z_Rotation_Matrix3 -- Creates a matrix3 which is a rotation about Z                * 
- *   Matrix3x3::Rotate_X -- Post-mutiplies an x rotation onto the current matrix                 * 
- *   Matrix3x3::Rotate_Y -- Post-multiplies the matrix with a rotation about Y                   * 
- *   Matrix3x3::Rotate_Z -- Post-multiplies the matrix with a rotation about Z                   * 
+ *   Matrix3x3::operator = -- assignment operator                                                *
+ *   Matrix3x3::operator += -- "plus equals" operator                                            *
+ *   Matrix3x3::operator-= -- "minus equals" operator                                            *
+ *   Matrix3x3::operator *= -- "times equals" operator                                           *
+ *   Matrix3x3::operator /= -- "divide equals" operator                                          *
+ *   Create_X_Rotation_Matrix3 -- creates a matrix3 which is a rotation about X                *
+ *   Create_Y_Rotation_Matrix3 -- Creates a Matrix3x3 which is a rotation about Y                *
+ *   Create_Z_Rotation_Matrix3 -- Creates a matrix3 which is a rotation about Z                *
+ *   Matrix3x3::Rotate_X -- Post-mutiplies an x rotation onto the current matrix                 *
+ *   Matrix3x3::Rotate_Y -- Post-multiplies the matrix with a rotation about Y                   *
+ *   Matrix3x3::Rotate_Z -- Post-multiplies the matrix with a rotation about Z                   *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef Matrix3_H
-#define Matrix3_H
 
 #include "always.h"
 #include "vector3.h"
@@ -113,7 +107,7 @@ class Matrix3x3
 	WWINLINE void Set(const Vector3 & axis,float angle);
 	WWINLINE void Set(const Vector3 & axis,float s_angle,float c_angle);
 	void Set(const Quaternion & q);
-	
+
 	/*
 	** Access operators
 	*/
@@ -162,7 +156,7 @@ class Matrix3x3
 	float Get_X_Rotation(void) const;
 	float Get_Y_Rotation(void) const;
 	float Get_Z_Rotation(void) const;
-	
+
 	/*
 	** These functions return a vector representing the direction an
    ** axis is pointing.
@@ -173,12 +167,12 @@ class Matrix3x3
 	WWINLINE void Get_X_Vector(Vector3 * set_x) const;
 	WWINLINE void Get_Y_Vector(Vector3 * set_y) const;
 	WWINLINE void Get_Z_Vector(Vector3 * set_z) const;
-	
+
 	/*
 	** Negation
 	*/
 	WWINLINE friend Matrix3x3 operator - (const Matrix3x3& a);
-	
+
 	/*
 	** Scalar multiplication and division
 	*/
@@ -188,7 +182,7 @@ class Matrix3x3
 
 	/*
 	** matrix addition
-	*/ 
+	*/
 	WWINLINE friend Matrix3x3 operator + (const Matrix3x3& a, const Matrix3x3& b);
 	static WWINLINE void Add(const Matrix3x3 & a, const Matrix3x3 & b,Matrix3x3 * res);
 
@@ -230,7 +224,7 @@ class Matrix3x3
 	/*
 	** Check whether a matrix is orthogonal, make it orthogonal
 	*/
-	int	Is_Orthogonal(void) const; 
+	int	Is_Orthogonal(void) const;
 	void	Re_Orthogonalize(void);
 
 	/*
@@ -259,17 +253,17 @@ class Matrix3x3
 };
 
 
-/*********************************************************************************************** 
- * Matrix3x3::Matrix3x3 -- Constructor, optionally initialize to Identitiy matrix                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::Matrix3x3 -- Constructor, optionally initialize to Identitiy matrix                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3::Matrix3x3(bool identity)
 {
@@ -280,47 +274,47 @@ WWINLINE Matrix3x3::Matrix3x3(bool identity)
 	}
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::Matrix3x3 -- Copy Constructor                                                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::Matrix3x3 -- Copy Constructor                                                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3::Matrix3x3(const Matrix3x3 & m)
 {
 	Row[0] = m.Row[0]; Row[1] = m.Row[1]; Row[2] = m.Row[2];
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::Matrix3x3 -- Constructor                                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::Matrix3x3 -- Constructor                                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3::Matrix3x3(const Vector3 & r0, const Vector3 & r1, const Vector3 & r2)
-{ 
-	Row[0] = r0; 
-	Row[1] = r1; 
-	Row[2] = r2; 
+{
+	Row[0] = r0;
+	Row[1] = r1;
+	Row[2] = r2;
 }
 
 WWINLINE void Matrix3x3::Set(const Vector3 & r0, const Vector3 & r1, const Vector3 & r2)
-{ 
-	Row[0] = r0; 
-	Row[1] = r1; 
-	Row[2] = r2; 
+{
+	Row[0] = r0;
+	Row[1] = r1;
+	Row[2] = r2;
 }
 
 WWINLINE void Matrix3x3::Make_Identity(void)
@@ -355,14 +349,14 @@ WWINLINE void Matrix3x3::Set
 	Row[2].Set(m31,m32,m33);
 }
 
-WWINLINE Matrix3x3::Matrix3x3(const Vector3 & axis,float angle) 
-{ 
-	Set(axis,angle); 
+WWINLINE Matrix3x3::Matrix3x3(const Vector3 & axis,float angle)
+{
+	Set(axis,angle);
 }
 
-WWINLINE Matrix3x3::Matrix3x3(const Vector3 & axis,float s_angle,float c_angle) 
-{ 
-	Set(axis,s_angle,c_angle); 
+WWINLINE Matrix3x3::Matrix3x3(const Vector3 & axis,float s_angle,float c_angle)
+{
+	Set(axis,s_angle,c_angle);
 }
 
 WWINLINE void Matrix3x3::Set(const Vector3 & axis,float angle)
@@ -398,17 +392,17 @@ WWINLINE Matrix3x3::Matrix3x3(const Quaternion & q)
 	this->Set(q);
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::Transpose -- Returns transpose of the matrix                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::Transpose -- Returns transpose of the matrix                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3 Matrix3x3::Transpose() const
 {
@@ -419,17 +413,17 @@ WWINLINE Matrix3x3 Matrix3x3::Transpose() const
 	);
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::Inverse -- returns the inverse of the matrix                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::Inverse -- returns the inverse of the matrix                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3 Matrix3x3::Inverse() const    // Gauss-Jordan elimination with partial pivoting
 {
@@ -483,114 +477,114 @@ WWINLINE Matrix3x3 Matrix3x3::Inverse() const    // Gauss-Jordan elimination wit
  * HISTORY:                                                                                    *
  *   1/7/20     DRM : Created.                                                                 *
  *=============================================================================================*/
-WWINLINE float Matrix3x3::Determinant(void) const 
+WWINLINE float Matrix3x3::Determinant(void) const
 {
 	return   Row[0][0] * (Row[1][1] * Row[2][2] - Row[1][2] * Row[2][1])
 		    - Row[0][1] * (Row[1][0] * Row[2][2] - Row[1][2] * Row[2][0])
 			 - Row[0][2] * (Row[1][0] * Row[2][1] - Row[1][1] * Row[2][0]);
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::operator = -- assignment operator                                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::operator = -- assignment operator                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3 & Matrix3x3::operator = (const Matrix3x3 & m)
 {
 	Row[0] = m.Row[0]; Row[1] = m.Row[1]; Row[2] = m.Row[2];
-	return *this; 
+	return *this;
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::operator += -- "plus equals" operator                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::operator += -- "plus equals" operator                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3& Matrix3x3::operator += (const Matrix3x3 & m)
 {
-	Row[0] += m.Row[0]; Row[1] += m.Row[1]; Row[2] += m.Row[2]; 
-	return *this; 
+	Row[0] += m.Row[0]; Row[1] += m.Row[1]; Row[2] += m.Row[2];
+	return *this;
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::operator-= -- "minus equals" operator                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::operator-= -- "minus equals" operator                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3& Matrix3x3::operator -= (const Matrix3x3 & m)
 {
-	Row[0] -= m.Row[0]; Row[1] -= m.Row[1]; Row[2] -= m.Row[2]; 
-	return *this; 
+	Row[0] -= m.Row[0]; Row[1] -= m.Row[1]; Row[2] -= m.Row[2];
+	return *this;
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::operator *= -- "times equals" operator                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::operator *= -- "times equals" operator                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3& Matrix3x3::operator *= (float d)
 {
-	Row[0] *= d; Row[1] *= d; Row[2] *= d; 
-	return *this; 
+	Row[0] *= d; Row[1] *= d; Row[2] *= d;
+	return *this;
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::operator /= -- "divide equals" operator                                            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::operator /= -- "divide equals" operator                                            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3& Matrix3x3::operator /= (float d)
 {
-	Row[0] /= d; Row[1] /= d; Row[2] /= d; 
-	return *this; 
+	Row[0] /= d; Row[1] /= d; Row[2] /= d;
+	return *this;
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::Get_X_Rotation -- approximates the rotation about the X axis                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::Get_X_Rotation -- approximates the rotation about the X axis                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE float Matrix3x3::Get_X_Rotation(void) const
 {
@@ -598,35 +592,35 @@ WWINLINE float Matrix3x3::Get_X_Rotation(void) const
 	return WWMath::Atan2(v[2], v[1]);
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::Get_Y_Rotation -- approximates the rotation about the Y axis                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::Get_Y_Rotation -- approximates the rotation about the Y axis                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-WWINLINE float Matrix3x3::Get_Y_Rotation(void) const 
+WWINLINE float Matrix3x3::Get_Y_Rotation(void) const
 {
 	Vector3 v = (*this) * Vector3(0.0,0.0,1.0);
 	return WWMath::Atan2(v[0],v[2]);
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::Get_Z_Rotation -- approximates the rotation about the Z axis                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::Get_Z_Rotation -- approximates the rotation about the Z axis                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE float Matrix3x3::Get_Z_Rotation(void) const
 {
@@ -665,29 +659,29 @@ WWINLINE void Matrix3x3::Get_Z_Vector(Vector3 * set) const
 }
 
 WWINLINE Matrix3x3 operator - (const Matrix3x3 & a)
-{ 
-	return Matrix3x3(-a.Row[0], -a.Row[1], -a.Row[2]); 
+{
+	return Matrix3x3(-a.Row[0], -a.Row[1], -a.Row[2]);
 }
 
 WWINLINE Matrix3x3 operator * (const Matrix3x3 & a, float d)
-{ 
-	return Matrix3x3(a.Row[0] * d, a.Row[1] * d, a.Row[2] * d); 
+{
+	return Matrix3x3(a.Row[0] * d, a.Row[1] * d, a.Row[2] * d);
 }
 
 WWINLINE Matrix3x3 operator * (float d, const Matrix3x3 & a)
-{ 
-	return a*d; 
+{
+	return a*d;
 }
 
 WWINLINE Matrix3x3 operator / (const Matrix3x3 & a, float d)
-{ 
+{
 	float ood = 1.0f / d;
-	return Matrix3x3(a.Row[0] * ood, a.Row[1] * ood, a.Row[2] * ood); 
+	return Matrix3x3(a.Row[0] * ood, a.Row[1] * ood, a.Row[2] * ood);
 }
 
 /*
 ** matrix addition
-*/ 
+*/
 WWINLINE Matrix3x3 operator + (const Matrix3x3 & a, const Matrix3x3 & b)
 {
 	return Matrix3x3(
@@ -698,7 +692,7 @@ WWINLINE Matrix3x3 operator + (const Matrix3x3 & a, const Matrix3x3 & b)
 }
 
 WWINLINE void Matrix3x3::Add(const Matrix3x3 & a, const Matrix3x3 & b,Matrix3x3 * c)
-{ 
+{
 	WWASSERT(c);
 	Vector3::Add(a.Row[0],b.Row[0],&(c->Row[0]));
 	Vector3::Add(a.Row[1],b.Row[1],&(c->Row[1]));
@@ -731,13 +725,13 @@ WWINLINE void Matrix3x3::Subtract(const Matrix3x3 & a, const Matrix3x3 & b,Matri
 WWINLINE Matrix3x3 operator * (const Matrix3x3 & a, const Matrix3x3 & b)
 {
 	#define ROWCOL(i,j) a[i][0]*b[0][j] + a[i][1]*b[1][j] + a[i][2]*b[2][j]
-    
+
 	return Matrix3x3(
 			Vector3(ROWCOL(0,0), ROWCOL(0,1), ROWCOL(0,2) ),
 			Vector3(ROWCOL(1,0), ROWCOL(1,1), ROWCOL(1,2) ),
 			Vector3(ROWCOL(2,0), ROWCOL(2,1), ROWCOL(2,2) )
 	);
-	
+
 	#undef ROWCOL
 }
 
@@ -745,12 +739,12 @@ WWINLINE Matrix3x3 operator * (const Matrix3x3 & a, const Matrix3x3 & b)
 /*
 ** Multiply a Matrix3x3 by a Vector3. Yeilds a Vector3 result
 */
-WWINLINE Vector3 operator * (const Matrix3x3 & a, const Vector3 & v) 
+WWINLINE Vector3 operator * (const Matrix3x3 & a, const Vector3 & v)
 {
 	return Vector3(
 		a[0][0] * v[0] + a[0][1] * v[1] + a[0][2] * v[2],
 		a[1][0] * v[0] + a[1][1] * v[1] + a[1][2] * v[2],
-		a[2][0] * v[0] + a[2][1] * v[1] + a[2][2] * v[2] 
+		a[2][0] * v[0] + a[2][1] * v[1] + a[2][2] * v[2]
 	);
 }
 
@@ -767,17 +761,17 @@ WWINLINE int operator != (const Matrix3x3 & a, const Matrix3x3 & b)
 }
 
 
-/*********************************************************************************************** 
- * Matrix3x3::Rotate_X -- Post-mutiplies an x rotation onto the current matrix                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::Rotate_X -- Post-mutiplies an x rotation onto the current matrix                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3x3::Rotate_X(float theta)
 {
@@ -801,17 +795,17 @@ WWINLINE void Matrix3x3::Rotate_X(float s,float c)
 	Row[2][2] = (float)(-s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * Matrix3x3::Rotate_Y -- Post-multiplies the matrix with a rotation about Y                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::Rotate_Y -- Post-multiplies the matrix with a rotation about Y                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3x3::Rotate_Y(float theta)
 {
@@ -836,17 +830,17 @@ WWINLINE void Matrix3x3::Rotate_Y(float s,float c)
 }
 
 
-/*********************************************************************************************** 
- * Matrix3x3::Rotate_Z -- Post-multiplies the matrix with a rotation about Z                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3x3::Rotate_Z -- Post-multiplies the matrix with a rotation about Z                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3x3::Rotate_Z(float theta)
 {
@@ -871,17 +865,17 @@ WWINLINE void Matrix3x3::Rotate_Z(float s,float c)
 }
 
 
-/*********************************************************************************************** 
- * Create_X_Rotation_Matrix3 -- creates a matrix3 which is a rotation about X                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Create_X_Rotation_Matrix3 -- creates a matrix3 which is a rotation about X                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3 Create_X_Rotation_Matrix3(float s,float c)
 {
@@ -907,17 +901,17 @@ WWINLINE Matrix3x3 Create_X_Rotation_Matrix3(float rad)
 	return Create_X_Rotation_Matrix3(sinf(rad),cosf(rad));
 }
 
-/*********************************************************************************************** 
- * Create_Y_Rotation_Matrix3 -- Creates a Matrix3x3 which is a rotation about Y                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Create_Y_Rotation_Matrix3 -- Creates a Matrix3x3 which is a rotation about Y                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3 Create_Y_Rotation_Matrix3(float s,float c)
 {
@@ -943,17 +937,17 @@ WWINLINE Matrix3x3 Create_Y_Rotation_Matrix3(float rad)
 	return Create_Y_Rotation_Matrix3(sinf(rad),cosf(rad));
 }
 
-/*********************************************************************************************** 
- * Create_Z_Rotation_Matrix3 -- Creates a matrix3 which is a rotation about Z                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Create_Z_Rotation_Matrix3 -- Creates a matrix3 which is a rotation about Z                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3x3 Create_Z_Rotation_Matrix3(float s,float c)
 {
@@ -1028,5 +1022,3 @@ WWINLINE void Matrix3x3::Rotate_AABox_Extent(const Vector3 & extent,Vector3 * se
 		}
 	}
 }
-
-#endif /*Matrix3_H*/
diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.cpp b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.cpp
index 9d4e614c7bb..e3c3c46c105 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.cpp
@@ -17,41 +17,41 @@
 */
 
 /* $Header: /Commando/Code/wwmath/matrix3d.cpp 41    5/09/01 2:38p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Voxel Technology                                             * 
- *                                                                                             * 
- *                    File Name : MATRIX3D.CPP                                                 * 
- *                                                                                             * 
- *                Org Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Programmer : Kenny Mitchell                          * 
- *                                                                                             * 
- *                   Start Date : 02/24/97                                                     * 
- *                                                                         * 
- *                  Last Update : June 6, 2002 [KM]                                            * 
- *                                                                                             * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Voxel Technology                                             *
+ *                                                                                             *
+ *                    File Name : MATRIX3D.cpp                                                 *
+ *                                                                                             *
+ *                Org Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Programmer : Kenny Mitchell                          *
+ *                                                                                             *
+ *                   Start Date : 02/24/97                                                     *
+ *                                                                         *
+ *                  Last Update : June 6, 2002 [KM]                                            *
+ *                                                                                             *
  * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   Matrix3D::Set_Rotation -- Sets the rotation part of the matrix                            *
  *   Matrix3D::Set_Rotation -- Sets the rotation part of the matrix                            *
  *   Matrix3D::Set -- Init a matrix3D from a matrix3 and a position                            *
  *   Matrix3D::Set -- Init a matrix3D from a quaternion and a position                         *
- *   Matrix3D::Get_X_Rotation -- approximates the rotation about the X axis                    * 
- *   Matrix3D::Get_Y_Rotation -- approximates the rotation about the Y axis                    * 
- *   Matrix3D::Get_Z_Rotation -- approximates the rotation about the Z axis                    * 
+ *   Matrix3D::Get_X_Rotation -- approximates the rotation about the X axis                    *
+ *   Matrix3D::Get_Y_Rotation -- approximates the rotation about the Y axis                    *
+ *   Matrix3D::Get_Z_Rotation -- approximates the rotation about the Z axis                    *
  *   Matrix3D::Multiply -- matrix multiplication without temporaries.                          *
  *   Matrix3D::Inverse_Rotate_Vector -- rotates a vector by the inverse of the 3x3 sub-matrix  *
  *   Matrix3D::Transform_Min_Max_AABox -- compute transformed axis-aligned box                 *
  *   Matrix3D::Transform_Center_Extent_AABox -- compute transformed axis-aligned box           *
  *   Matrix3D::Get_Inverse -- calculate the inverse of this matrix                             *
- *   Matrix3D::Get_Orthogonal_Inverse -- Returns the inverse of the matrix                     *  
+ *   Matrix3D::Get_Orthogonal_Inverse -- Returns the inverse of the matrix                     *
  *   Matrix3D::Re_Orthogonalize -- makes this matrix orthogonal.                               *
  *   Matrix3D::Is_Orthogonal -- checks whether this matrix is orthogonal                       *
- *   Lerp - linearly interpolate matrices (orientation is slerped)                             * 
+ *   Lerp - linearly interpolate matrices (orientation is slerped)                             *
  *   Matrix3D::Solve_Linear_System -- 3x3 Gauss-Jordan elimination                             *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
@@ -60,7 +60,6 @@
 #include <math.h>
 #include <assert.h>
 #include <stdlib.h>
-//#include <stdio.h>
 #include "vector3.h"
 #include "matrix3.h"
 #include "matrix4.h"
@@ -193,7 +192,7 @@ void Matrix3D::Set_Rotation(const Matrix3x3 & m)
 	Row[0][0] = m[0][0];
 	Row[0][1] = m[0][1];
 	Row[0][2] = m[0][2];
-	
+
 	Row[1][0] = m[1][0];
 	Row[1][1] = m[1][1];
 	Row[1][2] = m[1][2];
@@ -232,17 +231,17 @@ void Matrix3D::Set_Rotation(const Quaternion & q)
 }
 
 
-/*********************************************************************************************** 
- * Matrix3D::Get_X_Rotation -- approximates the rotation about the X axis                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3D::Get_X_Rotation -- approximates the rotation about the X axis                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 float Matrix3D::Get_X_Rotation(void) const
 {
@@ -250,17 +249,17 @@ float Matrix3D::Get_X_Rotation(void) const
 }
 
 
-/*********************************************************************************************** 
- * Matrix3D::Get_Y_Rotation -- approximates the rotation about the Y axis                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3D::Get_Y_Rotation -- approximates the rotation about the Y axis                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 float Matrix3D::Get_Y_Rotation(void) const
 {
@@ -268,17 +267,17 @@ float Matrix3D::Get_Y_Rotation(void) const
 }
 
 
-/*********************************************************************************************** 
- * Matrix3D::Get_Z_Rotation -- approximates the rotation about the Z axis                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3D::Get_Z_Rotation -- approximates the rotation about the Z axis                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 float Matrix3D::Get_Z_Rotation(void) const
 {
@@ -286,16 +285,16 @@ float Matrix3D::Get_Z_Rotation(void) const
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_Vector -- Uses the 3x3 sub-matrix to rotate a vector                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
+/***********************************************************************************************
+ * M3DC::Rotate_Vector -- Uses the 3x3 sub-matrix to rotate a vector                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
  *=============================================================================================*/
 Vector3 Matrix3D::Rotate_Vector(const Vector3 &vect) const
 {
@@ -328,9 +327,9 @@ Vector3 Matrix3D::Inverse_Rotate_Vector(const Vector3 &vect) const
 	);
 }
 
-/*********************************************************************************************** 
- * M3DC::Look_At -- Creates a "look at" transformation.                                        * 
- *                                                                                             * 
+/***********************************************************************************************
+ * M3DC::Look_At -- Creates a "look at" transformation.                                        *
+ *                                                                                             *
  *	Builds a transformation matrix which positions the origin at p,                             *
  *	points the negative z-axis towards a target t, and rolls about the z-axis                   *
  *	by the angle specified by roll.  														                 *
@@ -338,18 +337,18 @@ Vector3 Matrix3D::Inverse_Rotate_Vector(const Vector3 &vect) const
  *	This can be useful for creating a camera matrix, just invert 							           *
  *	the matrix after initializing it with this function...									           *
  *																							                          *
- * INPUT:                                                                                      * 
- * p - position of the coordinate system                                                       * 
- * t - target of the coordinate system                                                         * 
- * roll - roll angle (in radians)                                                              * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- * This function is written assuming the convention that the "ground" is the X-Y plane and     * 
+ * INPUT:                                                                                      *
+ * p - position of the coordinate system                                                       *
+ * t - target of the coordinate system                                                         *
+ * roll - roll angle (in radians)                                                              *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ * This function is written assuming the convention that the "ground" is the X-Y plane and     *
  * Z is altitude.                                                                              *
- *                                                                                             * 
- * HISTORY:                                                                                    * 
+ *                                                                                             *
+ * HISTORY:                                                                                    *
  *=============================================================================================*/
 void Matrix3D::Look_At(const Vector3 &p,const Vector3 &t,float roll)
 {
@@ -395,7 +394,7 @@ void Matrix3D::Look_At(const Vector3 &p,const Vector3 &t,float roll)
 	Rotate_Y(siny,cosy);
 
 	// rotate about local x axis to pitch up to the targets position
-	Rotate_X(sinp,cosp); 
+	Rotate_X(sinp,cosp);
 
 	// roll about the local z axis (negate since we look down -z)
 	Rotate_Z(-roll);
@@ -413,30 +412,30 @@ void Matrix3D::buildTransformMatrix( const Vector3 &pos, const Vector3 &dir )
 	sinp = dir.Z;
 	cosp = len2;
 
-	if( len2 != 0.0f ) 
+	if( len2 != 0.0f )
 	{
 		siny = dir.Y / len2;
 		cosy = dir.X / len2;
-	} 
-	else 
+	}
+	else
 	{
 		siny = 0.0f;
 		cosy = 1.0f;
 	}
-	
+
 	Make_Identity();
 	Translate( pos );
-	
+
 	// Yaw rotation to projection of target in x-y plane
 	Rotate_Z( siny, cosy );
 
 	// Pitch rotation
-	Rotate_Y( -sinp, cosp ); 
+	Rotate_Y( -sinp, cosp );
 }
 
-/*********************************************************************************************** 
- * M3DC::Obj_Look_At -- Commando Object "look at" transformation.                              * 
- *                                                                                             * 
+/***********************************************************************************************
+ * M3DC::Obj_Look_At -- Commando Object "look at" transformation.                              *
+ *                                                                                             *
  *	Builds a transformation matrix which positions the origin at p,                             *
  *	points the positive X axis towards a target t, and rolls about the X axis                   *
  *	by the angle specified by roll.  														                 *
@@ -444,16 +443,16 @@ void Matrix3D::buildTransformMatrix( const Vector3 &pos, const Vector3 &dir )
  * The object convention used by Commando and G is Forward = +X, Left = +Y, Up = +Z.  The      *
  *	world is basically the x-y plane with z as altitude and +x is the default "forward".        *
  *																							                          *
- * INPUT:                                                                                      * 
- * p - position of the coordinate system                                                       * 
- * t - target of the coordinate system                                                         * 
- * roll - roll angle (in radians)                                                              * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
+ * INPUT:                                                                                      *
+ * p - position of the coordinate system                                                       *
+ * t - target of the coordinate system                                                         *
+ * roll - roll angle (in radians)                                                              *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
  *=============================================================================================*/
 void Matrix3D::Obj_Look_At(const Vector3 &p,const Vector3 &t,float roll)
 {
@@ -484,15 +483,15 @@ void Matrix3D::Obj_Look_At(const Vector3 &p,const Vector3 &t,float roll)
 		siny = 0.0f;
 		cosy = 1.0f;
 	}
-	
+
 	Make_Identity();
 	Translate(p);
-	
+
 	// Yaw rotation to projection of target in x-y plane
 	Rotate_Z(siny,cosy);
 
 	// Pitch rotation
-	Rotate_Y(-sinp,cosp); 
+	Rotate_Y(-sinp,cosp);
 
 	// Roll rotation
 	Rotate_X(roll);
@@ -538,9 +537,9 @@ void Matrix3D::Get_Inverse(Matrix3D & inv) const
 	inv.Row[2][3]=mat4Inv[2][3];
 }
 
-/*********************************************************************************************** 
- * Matrix3D::Get_Orthogonal_Inverse -- Returns the inverse of the matrix                       *  
- *                                                                                             * 
+/***********************************************************************************************
+ * Matrix3D::Get_Orthogonal_Inverse -- Returns the inverse of the matrix                       *
+ *                                                                                             *
  *	NOTE!!! This only works if the matrix is really ORTHOGONAL!!!						              *
  *																							                          *
  ***********************************************************************************************
@@ -559,13 +558,13 @@ void Matrix3D::Get_Inverse(Matrix3D & inv) const
  *  MINV is the inverse of M																						  *
  *																							                          *
  ***********************************************************************************************
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
  *=============================================================================================*/
 void Matrix3D::Get_Orthogonal_Inverse(Matrix3D & inv) const
 {
@@ -582,7 +581,7 @@ void Matrix3D::Get_Orthogonal_Inverse(Matrix3D & inv) const
 	inv.Row[2][1] = Row[1][2];
 	inv.Row[2][2] = Row[2][2];
 
-	// Now, calculate translation portion of matrix: 
+	// Now, calculate translation portion of matrix:
 	// T' = -R'T
 	Vector3 trans = Get_Translation();
 	trans = inv.Rotate_Vector(trans);
@@ -605,7 +604,7 @@ void Matrix3D::Get_Orthogonal_Inverse(Matrix3D & inv) const
  * HISTORY:                                                                                    *
  *   1/16/98    EHC : Created.                                                                 *
  *=============================================================================================*/
-void Matrix3D::Copy_3x3_Matrix(float matrix[3][3]) 
+void Matrix3D::Copy_3x3_Matrix(float matrix[3][3])
 {
 	Row[0][0] = matrix[0][0];
 	Row[0][1] = matrix[0][1];
@@ -644,14 +643,14 @@ void Matrix3D::Multiply(const Matrix3D & A,const Matrix3D & B,Matrix3D * set_res
 	Matrix3D tmp;
 	Matrix3D * Aptr;
 
-	// Check for aliased parameters, copy the 'A' matrix into a temporary if the 
-	// result is going into 'A'. (in this case, this function is no better than 
+	// Check for aliased parameters, copy the 'A' matrix into a temporary if the
+	// result is going into 'A'. (in this case, this function is no better than
 	// the overloaded C++ operator...)
 	if (set_res == &A) {
 		tmp = A;
 		Aptr = &tmp;
 	} else {
-		Aptr = (Matrix3D *)&A;	
+		Aptr = (Matrix3D *)&A;
 	}
 
 #ifdef ALLOW_TEMPORARIES
@@ -947,11 +946,11 @@ void Matrix3D::Multiply(const Matrix3D & A,const Matrix3D & B,Matrix3D * set_res
 
 	}
 /*
-	WWDEBUG_SAY(("{%2.2f, %2.2f, %2.2f, %2.2f}, {%2.2f, %2.2f, %2.2f, %2.2f}, {%2.2f, %2.2f, %2.2f, %2.2f}\n"
+	WWDEBUG_SAY(("{%2.2f, %2.2f, %2.2f, %2.2f}, {%2.2f, %2.2f, %2.2f, %2.2f}, {%2.2f, %2.2f, %2.2f, %2.2f}"
 		,res[0][0],res[0][1],res[0][2],res[0][3]
 		,res[1][0],res[1][1],res[1][2],res[1][3]
 		,res[2][0],res[2][1],res[2][2],res[2][3]));
-	WWDEBUG_SAY(("{%2.2f, %2.2f, %2.2f, %2.2f}, {%2.2f, %2.2f, %2.2f, %2.2f}, {%2.2f, %2.2f, %2.2f, %2.2f}\n"
+	WWDEBUG_SAY(("{%2.2f, %2.2f, %2.2f, %2.2f}, {%2.2f, %2.2f, %2.2f, %2.2f}, {%2.2f, %2.2f, %2.2f, %2.2f}"
 		,res2[0][0],res2[0][1],res2[0][2],res2[0][3]
 		,res2[1][0],res2[1][1],res2[1][2],res2[1][3]
 		,res2[2][0],res2[2][1],res2[2][2],res2[2][3]));
@@ -961,7 +960,7 @@ void Matrix3D::Multiply(const Matrix3D & A,const Matrix3D & B,Matrix3D * set_res
 /*	for (int y=0;y<3;++y) {
 		for (int x=0;x<4;++x) {
 			if (fabs(res2[y][x]-res[y][x])>0.001f) {
-				WWDEBUG_SAY(("x: %d, y: %d, %f != %f\n",x,y,res2[y][x],res[y][x]));
+				WWDEBUG_SAY(("x: %d, y: %d, %f != %f",x,y,res2[y][x],res[y][x]));
 				__asm nop
 			}
 		}
@@ -1007,7 +1006,7 @@ void Matrix3D::Transform_Min_Max_AABox
 	WWASSERT(set_max != &max);
 
 	float tmp0,tmp1;
-	
+
 	// init the min and max to the translation of the transform
 	set_min->X = set_max->X = Row[0][3];
 	set_min->Y = set_max->Y = Row[1][3];
@@ -1072,7 +1071,7 @@ void Matrix3D::Transform_Center_Extent_AABox
 
 			(*set_center)[i] += Row[i][j] * center[j];
 			(*set_extent)[i] += WWMath::Fabs(Row[i][j] * extent[j]);
-			
+
 		}
 	}
 }
@@ -1095,7 +1094,7 @@ int Matrix3D::Is_Orthogonal(void) const
 	Vector3 x(Row[0].X,Row[0].Y,Row[0].Z);
 	Vector3 y(Row[1].X,Row[1].Y,Row[1].Z);
 	Vector3 z(Row[2].X,Row[2].Y,Row[2].Z);
-	
+
 	if (Vector3::Dot_Product(x,y) > WWMATH_EPSILON) return 0;
 	if (Vector3::Dot_Product(y,z) > WWMATH_EPSILON) return 0;
 	if (Vector3::Dot_Product(z,x) > WWMATH_EPSILON) return 0;
@@ -1161,24 +1160,24 @@ void Matrix3D::Re_Orthogonalize(void)
 	Row[1][0] = y.X;
 	Row[1][1] = y.Y;
 	Row[1][2] = y.Z;
-	
+
 	Row[2][0] = z.X;
 	Row[2][1] = z.Y;
 	Row[2][2] = z.Z;
 }
 
 
-/*********************************************************************************************** 
- * Lerp - linearly interpolate matrices (orientation is slerped)                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/05/1998 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Lerp - linearly interpolate matrices (orientation is slerped)                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/05/1998 NH  : Created.                                                                 *
  *=============================================================================================*/
 void Matrix3D::Lerp(const Matrix3D &A, const Matrix3D &B, float factor, Matrix3D& result)
 {
@@ -1235,7 +1234,7 @@ bool Matrix3D::Solve_Linear_System(Matrix3D & system)
 
 	system[1] -= system[1][2] * system[2];			// (1,2) now equals 0.0, and we have another answer
 	system[0] -= system[0][2] * system[2];			// (0,2) now equals 0.0
-	
+
 	system[0] -= system[0][1] * system[1];			// (0,1) now equals 0.0, and we are done!
 
 	return true;
diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h
index bad191e5118..c849c8dab5c 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h
@@ -17,73 +17,68 @@
 */
 
 /* $Header: /Commando/Code/wwmath/matrix3d.h 55    5/11/01 7:11p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Voxel Technology                                             * 
- *                                                                                             * 
- *                    File Name : MATRIX3D.H                                                   * 
- *                                                                                             * 
- *                Org Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Programmer : Kenny Mitchell                          * 
- *                                                                                             * 
- *                   Start Date : 06/02/97                                                     * 
- *                                                                         * 
- *                  Last Update : June 6, 2002 [KM]                                            * 
- *                                                                                             * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Voxel Technology                                             *
+ *                                                                                             *
+ *                    File Name : MATRIX3D.h                                                   *
+ *                                                                                             *
+ *                Org Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Programmer : Kenny Mitchell                          *
+ *                                                                                             *
+ *                   Start Date : 06/02/97                                                     *
+ *                                                                         *
+ *                  Last Update : June 6, 2002 [KM]                                            *
+ *                                                                                             *
  * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Matrix3D::Matrix3D -- Constructors for Matrix3D                                           * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Matrix3D::Matrix3D -- Constructors for Matrix3D                                           *
  *   Matrix3D::Set -- init a Matrix3D from an arrray of 12 floats                              *
  *   Matrix3D::Set -- Init a Matrix3D from 12 individual floats                                *
  *   Matrix3D::Set -- Init a matrix from 3 axis vectors and a position                         *
  *   Matrix3D::Set -- init a matrix to be a rotation about the given axis                      *
  *   Matrix3D::Set -- init a matrix to be a rotation about the given axis                      *
  *   Matrix3D::Set -- Init a matrix to be a pure translation                                   *
- *   Matrix3D::Make_Identity -- Initializes the matrix to be the identity matrix               * 
- *   Matrix3D::Translate -- Post-Multiplies by a Translation Matrix                            * 
- *   Matrix3D::Translate -- Post-Multiplies the matrix by a translation matrix                 * 
- *   M3DC::Translate_X -- Post-Multiplies the matrix by a translation matrix with X only       * 
- *   M3DC::Translate_Y -- Post-Multiplies the matrix by a translation matrix with Y only       * 
- *   M3DC::Translate_Z -- Post-Multiplies the matrix by a translation matrix with Z only       * 
- *   Matrix3D::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis           * 
- *   Matrix3D::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis           * 
- *   Matrix3D::Rotate_Y -- Post-multiplies the matrix by a rotation about the Y axis           * 
- *   Matrix3D::Rotate_Y -- Post-Multiplies the matrix by a rotation about Y                    * 
- *   Matrix3D::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                    * 
- *   Matrix3D::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                    * 
- *   Matrix3D::Scale		-- Scales Matrix  !!! WARNING DO NOT USE, INV FUNCTION WILL FAIL       * 
- *   Matrix3D::Scale		-- Scales Matrix  !!! WARNING DO NOT USE, INV FUNCTION WILL FAIL       * 
- *   Matrix3D::Scale		-- Scales Matrix  !!! WARNING DO NOT USE, INV FUNCTION WILL FAIL       * 
- *   M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                     * 
- *   M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                     * 
- *   M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                     * 
- *   M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                     * 
- *   M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                     * 
- *   M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                     * 
- *   M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by rotation about X * 
- *   M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by rotation about Y * 
- *   M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by rotation about Z * 
- *   M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by rotation about X * 
- *   M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by rotation about Y * 
- *   M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by rotation about Z * 
- *   operator * -- Matrix multiplication                                                       * 
- *   operator * -- Matrix - vector multiplication                                              * 
- *   operator == -- Matrix equality operator                                                   * 
- *   operator != -- Matrix inequality operator                                                 * 
+ *   Matrix3D::Make_Identity -- Initializes the matrix to be the identity matrix               *
+ *   Matrix3D::Translate -- Post-Multiplies by a Translation Matrix                            *
+ *   Matrix3D::Translate -- Post-Multiplies the matrix by a translation matrix                 *
+ *   M3DC::Translate_X -- Post-Multiplies the matrix by a translation matrix with X only       *
+ *   M3DC::Translate_Y -- Post-Multiplies the matrix by a translation matrix with Y only       *
+ *   M3DC::Translate_Z -- Post-Multiplies the matrix by a translation matrix with Z only       *
+ *   Matrix3D::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis           *
+ *   Matrix3D::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis           *
+ *   Matrix3D::Rotate_Y -- Post-multiplies the matrix by a rotation about the Y axis           *
+ *   Matrix3D::Rotate_Y -- Post-Multiplies the matrix by a rotation about Y                    *
+ *   Matrix3D::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                    *
+ *   Matrix3D::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                    *
+ *   Matrix3D::Scale		-- Scales Matrix  !!! WARNING DO NOT USE, INV FUNCTION WILL FAIL       *
+ *   Matrix3D::Scale		-- Scales Matrix  !!! WARNING DO NOT USE, INV FUNCTION WILL FAIL       *
+ *   Matrix3D::Scale		-- Scales Matrix  !!! WARNING DO NOT USE, INV FUNCTION WILL FAIL       *
+ *   M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                     *
+ *   M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                     *
+ *   M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                     *
+ *   M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                     *
+ *   M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                     *
+ *   M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                     *
+ *   M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by rotation about X *
+ *   M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by rotation about Y *
+ *   M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by rotation about Z *
+ *   M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by rotation about X *
+ *   M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by rotation about Y *
+ *   M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by rotation about Z *
+ *   operator * -- Matrix multiplication                                                       *
+ *   operator * -- Matrix - vector multiplication                                              *
+ *   operator == -- Matrix equality operator                                                   *
+ *   operator != -- Matrix inequality operator                                                 *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #define NO_ALLOW_TEMPORARIES
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MATRIX3D_H
-#define MATRIX3D_H
 
 #ifdef _UNIX
 #include "osdep.h"
@@ -111,12 +106,12 @@ class Quaternion;
 	- I use *column-vectors*
 	- I use a *right-handed* coordinate system
 	- These matrices are *orthogonal*
-	  
-	3D Transformation matrices.  This class is really a 4x4 homogeneous 
+
+	3D Transformation matrices.  This class is really a 4x4 homogeneous
 	matrix where the last row is assumed to always be 0 0 0 1.  However,
 	since I don't store the last row, you cant do some things that you can
 	do with a real 4x4 homogeneous matrix.
-	
+
 	I use column-vectors so normally transformations are post-multiplied
 	and camera transformations should be pre-multiplied.  The methods of
 	this class called Translate, Rotate_X, etc. all perform post-multiplication
@@ -143,9 +138,9 @@ class Matrix3D
 	WWINLINE explicit Matrix3D(
 		float m11,float m12,float m13,float m14,
 		float m21,float m22,float m23,float m24,
-		float m31,float m32,float m33,float m34  
+		float m31,float m32,float m33,float m34
 	);
-	
+
 	WWINLINE explicit Matrix3D(
 		const Vector3	&x,		// x-axis unit vector
 		const Vector3	&y,		// y-axis unit vector
@@ -189,9 +184,9 @@ class Matrix3D
 	WWINLINE void Set(
 		float m11,float m12,float m13,float m14,
 		float m21,float m22,float m23,float m24,
-		float m31,float m32,float m33,float m34  
+		float m31,float m32,float m33,float m34
 	);
-	
+
 	WWINLINE void Set(
 		const Vector3	&x,		// x-axis unit vector
 		const Vector3	&y,		// y-axis unit vector
@@ -209,7 +204,7 @@ class Matrix3D
 
 	// Creates identity rotation w. given position.
 	WWINLINE void Set(const Vector3 & position);
-	
+
 	// access functions:
  	WWINLINE Vector4 & operator [] (int i) { return Row[i]; }
 	WWINLINE const Vector4 & operator [] (int i) const { return Row[i]; }
@@ -241,7 +236,7 @@ class Matrix3D
 	float Get_X_Rotation(void) const;
 	float Get_Y_Rotation(void) const;
 	float Get_Z_Rotation(void) const;
-	
+
 	// Each of the transformation methods performs an
 	// "optimized" post-multiplication with the current matrix.
 	// All angles are assumed to be radians.
@@ -288,7 +283,7 @@ class Matrix3D
 	// the "world" uses x-y as the ground and z as altitude.
 	// Used for pointing cameras at targets.
 	void	Look_At(const Vector3 &p,const Vector3 &t,float roll);
-	
+
 	// Previous look_at function follows the camera coordinate convention.
 	// This one follows the object convention used in Commando and G.  I
 	// special cased this convention since it is used so much by us rather
@@ -309,15 +304,15 @@ class Matrix3D
 	WWINLINE void Get_X_Vector(Vector3 * set_x) const { set_x->Set(Row[0][0], Row[1][0], Row[2][0]); }
 	WWINLINE void Get_Y_Vector(Vector3 * set_y) const { set_y->Set(Row[0][1], Row[1][1], Row[2][1]); }
 	WWINLINE void Get_Z_Vector(Vector3 * set_z) const { set_z->Set(Row[0][2], Row[1][2], Row[2][2]); }
-	
-	// Get the inverse of the matrix. 
+
+	// Get the inverse of the matrix.
 	// TODO: currently the "intended-to-be" general inverse function just calls
 	// the special case Orthogonal inverse functions.  Also, when we implement
 	// general case, check where we were using Get_Inverse since usually it should
 	// be changed to Get_Orthogonal_Inverse...
 	void Get_Inverse(Matrix3D & set_inverse) const;
 	void Get_Orthogonal_Inverse(Matrix3D & set_inverse) const;
-	
+
 	// used for importing SurRender matrices
 	void Copy_3x3_Matrix(float matrix[3][3]);
 
@@ -342,11 +337,11 @@ class Matrix3D
 	static bool Solve_Linear_System(Matrix3D & system);
 
 	// Check whether a matrix is orthogonal or FORCE it to be :-)
-	int	Is_Orthogonal(void) const; 
+	int	Is_Orthogonal(void) const;
 	void	Re_Orthogonalize(void);
 
 	static void Lerp(const Matrix3D &A, const Matrix3D &B, float factor, Matrix3D& result);
-	
+
 #ifdef ALLOW_TEMPORARIES
 	// nothing
 #else
@@ -406,17 +401,17 @@ bool operator == (const Matrix3D &A, const Matrix3D &B);
 bool operator != (const Matrix3D &A, const Matrix3D &B);
 
 
-/*********************************************************************************************** 
- * M3DC::Matrix3D -- Constructors for Matrix3D										                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Matrix3D -- Constructors for Matrix3D										                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3D::Matrix3D(float m[12])
 {
@@ -429,7 +424,7 @@ WWINLINE Matrix3D::Matrix3D
 (
 	float m11,float m12,float m13,float m14,
 	float m21,float m22,float m23,float m24,
-	float m31,float m32,float m33,float m34  
+	float m31,float m32,float m33,float m34
 )
 {
 	Row[0].Set(m11,m12,m13,m14);
@@ -487,7 +482,7 @@ WWINLINE Matrix3D & Matrix3D::operator = (const Matrix3D & m)
 	Row[0] = m.Row[0];
 	Row[1] = m.Row[1];
 	Row[2] = m.Row[2];
-	return *this; 
+	return *this;
 }
 
 
@@ -633,19 +628,19 @@ WWINLINE void Matrix3D::Set(const Vector3 & position)
 	Row[1].Set(0.0f,1.0f,0.0f,position[1]);
 	Row[2].Set(0.0f,0.0f,1.0f,position[2]);
 }
-	
-
-/*********************************************************************************************** 
- * M3DC::Make_Identity -- Initializes the matrix to be the identity matrix                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+
+
+/***********************************************************************************************
+ * M3DC::Make_Identity -- Initializes the matrix to be the identity matrix                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Make_Identity(void)
 {
@@ -655,17 +650,17 @@ WWINLINE void Matrix3D::Make_Identity(void)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Translate -- Post-Multiplies by a Translation Matrix                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Translate -- Post-Multiplies by a Translation Matrix                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Translate(float x,float y,float z)
 {
@@ -675,17 +670,17 @@ WWINLINE void Matrix3D::Translate(float x,float y,float z)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Translate -- Post-Multiplies the matrix by a translation matrix                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Translate -- Post-Multiplies the matrix by a translation matrix                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Translate(const Vector3 &t)
 {
@@ -695,17 +690,17 @@ WWINLINE void Matrix3D::Translate(const Vector3 &t)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Translate_X -- Post-Multiplies the matrix by a translation matrix with X only         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/06/1998 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Translate_X -- Post-Multiplies the matrix by a translation matrix with X only         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/06/1998 NH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Translate_X(float x)
 {
@@ -715,17 +710,17 @@ WWINLINE void Matrix3D::Translate_X(float x)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Translate_Y -- Post-Multiplies the matrix by a translation matrix with Y only         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/06/1998 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Translate_Y -- Post-Multiplies the matrix by a translation matrix with Y only         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/06/1998 NH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Translate_Y(float y)
 {
@@ -735,17 +730,17 @@ WWINLINE void Matrix3D::Translate_Y(float y)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Translate_Z -- Post-Multiplies the matrix by a translation matrix with Z only         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/06/1998 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Translate_Z -- Post-Multiplies the matrix by a translation matrix with Z only         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/06/1998 NH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Translate_Z(float z)
 {
@@ -755,17 +750,17 @@ WWINLINE void Matrix3D::Translate_Z(float z)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Rotate_X(float theta)
 {
@@ -790,19 +785,19 @@ WWINLINE void Matrix3D::Rotate_X(float theta)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle                                                                       * 
- * c - cosine of the angle                                                                     * 
- * 											                                                           * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle                                                                       *
+ * c - cosine of the angle                                                                     *
+ * 											                                                           *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Rotate_X(float s,float c)
 {
@@ -822,18 +817,18 @@ WWINLINE void Matrix3D::Rotate_X(float s,float c)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_Y -- Post-multiplies the matrix by a rotation about the Y axis                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Rotate_Y -- Post-multiplies the matrix by a rotation about the Y axis                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Rotate_Y(float theta)
 {
@@ -857,19 +852,19 @@ WWINLINE void Matrix3D::Rotate_Y(float theta)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_Y -- Post-Multiplies the matrix by a rotation about Y                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle                                                                       * 
- * c - cosine of the angle                                                                     * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Rotate_Y -- Post-Multiplies the matrix by a rotation about Y                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle                                                                       *
+ * c - cosine of the angle                                                                     *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Rotate_Y(float s,float c)
 {
@@ -889,18 +884,18 @@ WWINLINE void Matrix3D::Rotate_Y(float s,float c)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Rotate_Z(float theta)
 {
@@ -924,19 +919,19 @@ WWINLINE void Matrix3D::Rotate_Z(float theta)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Rotate_Z(float s,float c)
 {
@@ -955,17 +950,17 @@ WWINLINE void Matrix3D::Rotate_Z(float s,float c)
 	Row[2][1] = (float)(-s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * Matrix3D::Scale -- Scales each Axis											                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   03/07/2000 jga  : Created.                                                                * 
+/***********************************************************************************************
+ * Matrix3D::Scale -- Scales each Axis											                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/07/2000 jga  : Created.                                                                *
  *=============================================================================================*/
 // !!
 // !! Use Scale methods with Extreme Caution
@@ -987,17 +982,17 @@ WWINLINE void	Matrix3D::Scale(float scale)
 	Row[1][2] *= scale;
 	Row[2][2] *= scale;
 }
-/*********************************************************************************************** 
- * Matrix3D::Scale -- Scales each Axis											                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   03/07/2000 jga  : Created.                                                                * 
+/***********************************************************************************************
+ * Matrix3D::Scale -- Scales each Axis											                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/07/2000 jga  : Created.                                                                *
  *=============================================================================================*/
 // !!
 // !! Use Scale methods with Extreme Caution
@@ -1019,17 +1014,17 @@ WWINLINE void	Matrix3D::Scale(float x, float y, float z)
 	Row[1][2] *= z;
 	Row[2][2] *= z;
 }
-/*********************************************************************************************** 
- * Matrix3D::Scale -- Scales each Axis											                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   03/07/2000 jga  : Created.                                                                * 
+/***********************************************************************************************
+ * Matrix3D::Scale -- Scales each Axis											                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/07/2000 jga  : Created.                                                                *
  *=============================================================================================*/
 // !!
 // !! Use Scale methods with Extreme Caution
@@ -1041,18 +1036,18 @@ WWINLINE void	Matrix3D::Scale(Vector3 &scale)
 	Scale(scale.X, scale.Y, scale.Z);
 }
 
-/*********************************************************************************************** 
- * M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Pre_Rotate_X(float theta)
 {
@@ -1079,18 +1074,18 @@ WWINLINE void Matrix3D::Pre_Rotate_X(float theta)
 	Row[2][3] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Pre_Rotate_Y(float theta)
 {
@@ -1117,18 +1112,18 @@ WWINLINE void Matrix3D::Pre_Rotate_Y(float theta)
 	Row[2][3] = (float)(-s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Pre_Rotate_Z(float theta)
 {
@@ -1155,19 +1150,19 @@ WWINLINE void Matrix3D::Pre_Rotate_Z(float theta)
 	Row[1][3] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Pre_Rotate_X(float s,float c)
 {
@@ -1190,19 +1185,19 @@ WWINLINE void Matrix3D::Pre_Rotate_X(float s,float c)
 	Row[2][3] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Pre_Rotate_Y(float s,float c)
 {
@@ -1225,19 +1220,19 @@ WWINLINE void Matrix3D::Pre_Rotate_Y(float s,float c)
 	Row[2][3] = (float)(-s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 WWINLINE void Matrix3D::Pre_Rotate_Z(float s,float c)
 {
@@ -1260,18 +1255,18 @@ WWINLINE void Matrix3D::Pre_Rotate_Z(float s,float c)
 	Row[1][3] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by a rotation about X * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by a rotation about X *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 WWINLINE void Matrix3D::In_Place_Pre_Rotate_X(float theta)
 {
@@ -1294,18 +1289,18 @@ WWINLINE void Matrix3D::In_Place_Pre_Rotate_X(float theta)
 	Row[2][2] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by a rotation about Y * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by a rotation about Y *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 WWINLINE void Matrix3D::In_Place_Pre_Rotate_Y(float theta)
 {
@@ -1328,18 +1323,18 @@ WWINLINE void Matrix3D::In_Place_Pre_Rotate_Y(float theta)
 	Row[2][2] = (float)(-s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by a rotation about Z * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by a rotation about Z *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 WWINLINE void Matrix3D::In_Place_Pre_Rotate_Z(float theta)
 {
@@ -1362,19 +1357,19 @@ WWINLINE void Matrix3D::In_Place_Pre_Rotate_Z(float theta)
 	Row[1][2] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by a rotation about X * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by a rotation about X *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 WWINLINE void Matrix3D::In_Place_Pre_Rotate_X(float s,float c)
 {
@@ -1393,19 +1388,19 @@ WWINLINE void Matrix3D::In_Place_Pre_Rotate_X(float s,float c)
 	Row[2][2] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by a rotation about Y * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by a rotation about Y *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 WWINLINE void Matrix3D::In_Place_Pre_Rotate_Y(float s,float c)
 {
@@ -1424,19 +1419,19 @@ WWINLINE void Matrix3D::In_Place_Pre_Rotate_Y(float s,float c)
 	Row[2][2] = (float)(-s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by a rotation about Z * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by a rotation about Z *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 WWINLINE void Matrix3D::In_Place_Pre_Rotate_Z(float s,float c)
 {
@@ -1456,17 +1451,17 @@ WWINLINE void Matrix3D::In_Place_Pre_Rotate_Z(float s,float c)
 }
 
 #ifdef ALLOW_TEMPORARIES
-/*********************************************************************************************** 
- * operator * -- Matrix multiplication                                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * operator * -- Matrix multiplication                                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix3D operator * (const Matrix3D &A,const Matrix3D &B)
 {
@@ -1614,17 +1609,17 @@ WWINLINE void Matrix3D::mul(const Matrix3D& A, const Matrix3D& B)
 #endif
 
 #ifdef ALLOW_TEMPORARIES
-/*********************************************************************************************** 
- * operator * -- Matrix - vector multiplication                                                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * operator * -- Matrix - vector multiplication                                                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Vector3 operator * (const Matrix3D &A,const Vector3 &a)
 {
@@ -1666,7 +1661,7 @@ WWINLINE void Matrix3D::mulVector3Array(const Vector3* in, Vector3* out, int cou
 	{
 		out[i] = (*this) * in[i];
 	}
-#else	
+#else
 	while (count--)
 	{
 		// we know that in != out, so no temps needed
@@ -1686,7 +1681,7 @@ WWINLINE void Matrix3D::mulVector3Array(Vector3* inout, int count) const
 	{
 		inout[i] = (*this) * inout[i];
 	}
-#else	
+#else
 	while (count--)
 	{
 		float x = (Row[0].X * inout->X + Row[0].Y * inout->Y + Row[0].Z * inout->Z + Row[0].W);
@@ -1698,17 +1693,17 @@ WWINLINE void Matrix3D::mulVector3Array(Vector3* inout, int count) const
 #endif
 }
 
-/*********************************************************************************************** 
- * operator == -- Matrix equality operator                                                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   04/29/1998 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * operator == -- Matrix equality operator                                                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   04/29/1998 NH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE bool operator == (const Matrix3D &A, const Matrix3D &B)
 {
@@ -1721,17 +1716,17 @@ WWINLINE bool operator == (const Matrix3D &A, const Matrix3D &B)
 }
 
 
-/*********************************************************************************************** 
- * operator != -- Matrix inequality operator                                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   04/29/1998 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * operator != -- Matrix inequality operator                                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   04/29/1998 NH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE bool operator != (const Matrix3D &A, const Matrix3D &B)
 {
@@ -1815,4 +1810,3 @@ class DynamicMatrix3D : public W3DMPO
 public:
 	Matrix3D Mat;
 };
-#endif /* MATRIX3D_H */
diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix4.cpp b/Core/Libraries/Source/WWVegas/WWMath/matrix4.cpp
index 315a04cd699..69a0206e51b 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/matrix4.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/matrix4.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                   Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       Author : Kenny_m                                                      * 
- *                                                                                             * 
+ *                       Author : Kenny_m                                                      *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 6                                                           $*
@@ -145,7 +145,7 @@ void Matrix4x4::Multiply(const Matrix3D &a,const Matrix4x4 &b,Matrix4x4 * res)
 void Matrix4x4::Multiply(const Matrix4x4 & a,const Matrix3D & b,Matrix4x4 * res)
 {
 	assert(res != &a);
-	
+
 	// ROWCOL multiplies a row of 'a' by one of the first three columns of 'b' (4th entry in b is zero)
 	// ROWCOL4 multiplies a row of 'a' by the fourth column of 'b' (4th entry in b is one)
 
diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix4.h b/Core/Libraries/Source/WWVegas/WWMath/matrix4.h
index dc84ef2a506..81211850c79 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/matrix4.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/matrix4.h
@@ -17,29 +17,29 @@
 */
 
 /* $Header: /Commando/Code/wwmath/matrix4.h 20    10/04/01 10:33a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : WW3D                                                         * 
- *                                                                                             * 
- *                    File Name : MATRIX4.H                                                    * 
- *                                                                                             * 
- *               Org Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                   Start Date : 06/02/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 6, 2002 [KM]                                            * 
- *                                                                                             * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3D                                                         *
+ *                                                                                             *
+ *                    File Name : MATRIX4.h                                                    *
+ *                                                                                             *
+ *               Org Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *                   Start Date : 06/02/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 6, 2002 [KM]                                            *
+ *                                                                                             *
  * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Matrix4x4::Matrix4x4 -- Constructor, optionally initialize to Identitiy matrix                * 
- *   Matrix4x4::Matrix4x4 -- Copy Constructor                                                      * 
- *   Matrix4x4::Matrix4x4 -- Convert a Matrix3D (fake 4x4) to a Matrix4x4                            * 
- *   Matrix4x4::Matrix4x4 -- Constructor                                                           * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Matrix4x4::Matrix4x4 -- Constructor, optionally initialize to Identitiy matrix                *
+ *   Matrix4x4::Matrix4x4 -- Copy Constructor                                                      *
+ *   Matrix4x4::Matrix4x4 -- Convert a Matrix3D (fake 4x4) to a Matrix4x4                            *
+ *   Matrix4x4::Matrix4x4 -- Constructor                                                           *
  *   Matrix4x4::Make_Identity -- Initializes the matrix to Identity                              *
  *   Matrix4x4::Init -- Initializes from the contents of the give Matrix3D                       *
  *   Matrix4x4::Init -- Initializes the rows from the given Vector4s                             *
@@ -47,23 +47,16 @@
  *   Matrix4x4::Init_Ortho -- Initialize to an orthographic projection matrix                    *
  *   Matrix4x4::Init_Perspective -- Initialize to a perspective projection matrix                *
  *   Matrix4x4::Init_Perspective -- Initialize to a perspective projection matrix                *
- *   Matrix4x4::Transpose -- Returns transpose of the matrix                                     * 
- *   Matrix4x4::Inverse -- returns the inverse of the matrix                                     * 
- *   Matrix4x4::operator = -- assignment operator                                                * 
- *   Matrix4x4::operator += -- "plus equals" operator                                            * 
- *   Matrix4x4::operator -= -- "minus equals" operator                                            * 
- *   Matrix4x4::operator *= -- "times equals" operator                                           * 
- *   Matrix4x4::operator /= -- "divide equals" operator                                          * 
+ *   Matrix4x4::Transpose -- Returns transpose of the matrix                                     *
+ *   Matrix4x4::Inverse -- returns the inverse of the matrix                                     *
+ *   Matrix4x4::operator = -- assignment operator                                                *
+ *   Matrix4x4::operator += -- "plus equals" operator                                            *
+ *   Matrix4x4::operator -= -- "minus equals" operator                                            *
+ *   Matrix4x4::operator *= -- "times equals" operator                                           *
+ *   Matrix4x4::operator /= -- "divide equals" operator                                          *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-#ifndef MATRIX4_H
-#define MATRIX4_H
 
 #include "always.h"
 #include "vector4.h"
@@ -87,17 +80,17 @@ class Matrix4x4
 	WWINLINE explicit Matrix4x4(const Vector4 & v0, const Vector4 & v1, const Vector4 & v2, const Vector4 & v3);
 	WWINLINE explicit Matrix4x4(	float m11,float m12,float m13,float m14,
 										float m21,float m22,float m23,float m24,
-										float m31,float m32,float m33,float m34,  
-										float m41,float m42,float m43,float m44 ); 
-	
+										float m31,float m32,float m33,float m34,
+										float m41,float m42,float m43,float m44 );
+
 	WWINLINE void		Make_Identity(void);
 	WWINLINE void		Init(const Matrix3D & m);
 	WWINLINE void		Init(const Matrix3x3 & m);
 	WWINLINE void		Init(const Vector4 & v0, const Vector4 & v1, const Vector4 & v2, const Vector4 & v3);
 	WWINLINE void		Init(	float m11,float m12,float m13,float m14,
 									float m21,float m22,float m23,float m24,
-									float m31,float m32,float m33,float m34,  
-									float m41,float m42,float m43,float m44 ); 
+									float m31,float m32,float m33,float m34,
+									float m41,float m42,float m43,float m44 );
 
 	/*
 	** Projection matrices.  The znear and zfar parameters are positive values indicating the
@@ -132,7 +125,7 @@ class Matrix4x4
 	** Negation
 	*/
 	WWINLINE friend Matrix4x4 operator - (const Matrix4x4& a);
-	
+
 	/*
 	** Scalar multiplication and division
 	*/
@@ -142,7 +135,7 @@ class Matrix4x4
 
 	/*
 	** matrix addition
-	*/ 
+	*/
 	WWINLINE friend Matrix4x4 operator + (const Matrix4x4& a, const Matrix4x4& b);
 	WWINLINE friend Matrix4x4 Add(const Matrix4x4& a);
 
@@ -195,17 +188,17 @@ class Matrix4x4
 };
 
 
-/*********************************************************************************************** 
- * Matrix4x4::Matrix4x4 -- Constructor, optionally initialize to Identitiy matrix                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4x4::Matrix4x4 -- Constructor, optionally initialize to Identitiy matrix                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix4x4::Matrix4x4(bool identity)
 {
@@ -214,68 +207,68 @@ WWINLINE Matrix4x4::Matrix4x4(bool identity)
 	}
 }
 
-/*********************************************************************************************** 
- * Matrix4x4::Matrix4x4 -- Copy Constructor                                                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4x4::Matrix4x4 -- Copy Constructor                                                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix4x4::Matrix4x4(const Matrix4x4 & m)
 {
-	Row[0] = m.Row[0]; Row[1] = m.Row[1]; Row[2] = m.Row[2]; Row[3] = m.Row[3]; 
+	Row[0] = m.Row[0]; Row[1] = m.Row[1]; Row[2] = m.Row[2]; Row[3] = m.Row[3];
 }
 
-/*********************************************************************************************** 
- * Matrix4x4::Matrix4x4 -- Convert a Matrix3D (fake 4x4) to a Matrix4x4                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4x4::Matrix4x4 -- Convert a Matrix3D (fake 4x4) to a Matrix4x4                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix4x4::Matrix4x4(const Matrix3D & m)
 {
 	Init(m);
 }
 
-/*********************************************************************************************** 
- * Matrix4x4::Matrix4x4 -- Constructor                                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4x4::Matrix4x4 -- Constructor                                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix4x4::Matrix4x4(const Vector4 & r0, const Vector4 & r1, const Vector4 & r2, const Vector4 & r3)
-{ 
+{
 	Init(r0,r1,r2,r3);
 }
 
-/*********************************************************************************************** 
- * Matrix4x4::Matrix4x4 -- Constructor                                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   11/06/2001 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4x4::Matrix4x4 -- Constructor                                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/06/2001 NH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix4x4::Matrix4x4(float m11,float m12,float m13,float m14, float m21,float m22,float m23,float m24,
 	float m31,float m32,float m33,float m34, float m41,float m42,float m43,float m44 )
@@ -318,7 +311,7 @@ WWINLINE void Matrix4x4::Make_Identity(void)
  *=============================================================================================*/
 WWINLINE void Matrix4x4::Init(const Matrix3D & m)
 {
-	Row[0] = m[0]; Row[1] = m[1]; Row[2] = m[2]; Row[3] = Vector4(0.0,0.0,0.0,1.0); 
+	Row[0] = m[0]; Row[1] = m[1]; Row[2] = m[2]; Row[3] = Vector4(0.0,0.0,0.0,1.0);
 }
 
 
@@ -336,7 +329,7 @@ WWINLINE void Matrix4x4::Init(const Matrix3D & m)
  *=============================================================================================*/
 WWINLINE void Matrix4x4::Init(const Vector4 & r0, const Vector4 & r1, const Vector4 & r2, const Vector4 & r3)
 {
-	Row[0] = r0; Row[1] = r1; Row[2] = r2; Row[3] = r3; 
+	Row[0] = r0; Row[1] = r1; Row[2] = r2; Row[3] = r3;
 }
 
 
@@ -504,17 +497,17 @@ WWINLINE void Matrix4x4::Init_Perspective
 	Row[3][3] = 0.0f;
 }
 
-/*********************************************************************************************** 
- * Matrix4x4::Transpose -- Returns transpose of the matrix                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4x4::Transpose -- Returns transpose of the matrix                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix4x4 Matrix4x4::Transpose() const
 {
@@ -526,17 +519,17 @@ WWINLINE Matrix4x4 Matrix4x4::Transpose() const
 	);
 }
 
-/*********************************************************************************************** 
- * Matrix4x4::Inverse -- returns the inverse of the matrix                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4x4::Inverse -- returns the inverse of the matrix                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix4x4 Matrix4x4::Inverse() const    // Gauss-Jordan elimination with partial pivoting
 {
@@ -579,121 +572,121 @@ WWINLINE Matrix4x4 Matrix4x4::Inverse() const    // Gauss-Jordan elimination wit
 	return b;
 }
 
-/*********************************************************************************************** 
- * Matrix4x4::operator = -- assignment operator                                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4x4::operator = -- assignment operator                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix4x4 & Matrix4x4::operator = (const Matrix4x4 & m)
 {
 	Row[0] = m.Row[0]; Row[1] = m.Row[1]; Row[2] = m.Row[2]; Row[3] = m.Row[3];
-	return *this; 
-}
-
-/*********************************************************************************************** 
- * Matrix4x4::operator += -- "plus equals" operator                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+	return *this;
+}
+
+/***********************************************************************************************
+ * Matrix4x4::operator += -- "plus equals" operator                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix4x4& Matrix4x4::operator += (const Matrix4x4 & m)
 {
 	Row[0] += m.Row[0]; Row[1] += m.Row[1]; Row[2] += m.Row[2]; Row[3] += m.Row[3];
-	return *this; 
-}
-
-/*********************************************************************************************** 
- * Matrix4x4::operator-= -- "minus equals" operator                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+	return *this;
+}
+
+/***********************************************************************************************
+ * Matrix4x4::operator-= -- "minus equals" operator                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix4x4& Matrix4x4::operator -= (const Matrix4x4 & m)
 {
 	Row[0] -= m.Row[0]; Row[1] -= m.Row[1]; Row[2] -= m.Row[2]; Row[3] -= m.Row[3];
-	return *this; 
-}
-
-/*********************************************************************************************** 
- * Matrix4x4::operator *= -- "times equals" operator                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+	return *this;
+}
+
+/***********************************************************************************************
+ * Matrix4x4::operator *= -- "times equals" operator                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix4x4& Matrix4x4::operator *= (float d)
 {
 	Row[0] *= d; Row[1] *= d; Row[2] *= d; Row[3] *= d;
-	return *this; 
-}
-
-/*********************************************************************************************** 
- * Matrix4x4::operator /= -- "divide equals" operator                                            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+	return *this;
+}
+
+/***********************************************************************************************
+ * Matrix4x4::operator /= -- "divide equals" operator                                            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Matrix4x4& Matrix4x4::operator /= (float d)
 {
 	float ood = d;
 	Row[0] *= ood; Row[1] *= ood; Row[2] *= ood; Row[3] *= ood;
-	return *this; 
+	return *this;
 }
 
 WWINLINE Matrix4x4 operator - (const Matrix4x4 & a)
-{ 
-	return Matrix4x4(-a.Row[0], -a.Row[1], -a.Row[2], -a.Row[3]); 
+{
+	return Matrix4x4(-a.Row[0], -a.Row[1], -a.Row[2], -a.Row[3]);
 }
 
 WWINLINE Matrix4x4 operator * (const Matrix4x4 & a, float d)
-{ 
-	return Matrix4x4(a.Row[0] * d, a.Row[1] * d, a.Row[2] * d, a.Row[3] * d); 
+{
+	return Matrix4x4(a.Row[0] * d, a.Row[1] * d, a.Row[2] * d, a.Row[3] * d);
 }
 
 WWINLINE Matrix4x4 operator * (float d, const Matrix4x4 & a)
-{ 
-	return a*d; 
+{
+	return a*d;
 }
 
 WWINLINE Matrix4x4 operator / (const Matrix4x4 & a, float d)
-{ 
+{
 	float ood = 1.0f / d;
-	return Matrix4x4(a.Row[0] * ood, a.Row[1] * ood, a.Row[2] * ood, a.Row[3] * ood); 
+	return Matrix4x4(a.Row[0] * ood, a.Row[1] * ood, a.Row[2] * ood, a.Row[3] * ood);
 }
 
 /*
 ** matrix addition
-*/ 
+*/
 WWINLINE Matrix4x4 operator + (const Matrix4x4 & a, const Matrix4x4 & b)
 {
 	return Matrix4x4(
@@ -729,14 +722,14 @@ WWINLINE Matrix4x4 Subtract(const Matrix4x4 & a, const Matrix4x4 & b)
 WWINLINE Matrix4x4 operator * (const Matrix4x4 & a, const Matrix4x4 & b)
 {
 	#define ROWCOL(i, j) a[i][0]*b[0][j] + a[i][1]*b[1][j] + a[i][2]*b[2][j] + a[i][3]*b[3][j]
-    
+
 	return Matrix4x4(
 		Vector4(ROWCOL(0,0), ROWCOL(0,1), ROWCOL(0,2), ROWCOL(0,3)),
 		Vector4(ROWCOL(1,0), ROWCOL(1,1), ROWCOL(1,2), ROWCOL(1,3)),
 		Vector4(ROWCOL(2,0), ROWCOL(2,1), ROWCOL(2,2), ROWCOL(2,3)),
 		Vector4(ROWCOL(3,0), ROWCOL(3,1), ROWCOL(3,2), ROWCOL(3,3))
 	);
-	
+
 	#undef ROWCOL
 }
 
@@ -843,6 +836,3 @@ WWINLINE void	Matrix4x4::Transform_Vector(const Matrix4x4 & A,const Vector4 & in
 	out->Z = (A[2][0] * v->X + A[2][1] * v->Y + A[2][2] * v->Z + A[2][3] * v->W);
 	out->W = (A[3][0] * v->X + A[3][1] * v->Y + A[3][2] * v->Z + A[3][3] * v->W);
 }
-
-
-#endif /*MATRIX4_H*/
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWMath/normalcone.h b/Core/Libraries/Source/WWVegas/WWMath/normalcone.h
index 4d8aeab25d8..d4cd659e52d 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/normalcone.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/normalcone.h
@@ -35,16 +35,15 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 /*
-**	The NormalCone is a class used to represent a cone of unit length. It can be used to 
-** loosely represent a collection of other normals allowing backface culling to be 
+**	The NormalCone is a class used to represent a cone of unit length. It can be used to
+** loosely represent a collection of other normals allowing backface culling to be
 ** performed at a heirarchial level rather than at a triangle level.
 **
 **	The term 'NormalCone' is a bit of a misnomer; it is really a circular portion of a sphere.
 ** -ehc
 */
 
-#ifndef NORMALCONE_H
-#define NORMALCONE_H
+#pragma once
 
 #include "vector3.h"
 #include "matrix3.h"
@@ -78,7 +77,7 @@ class NormalCone : public Vector3
 		}
 
 		// find the two vectors on the edge of the cone residing on the same plane as the input vector.
-		// Note: these two Get_Coplanar functions return floats in an attempt to reduce float/int CPU state changes... 
+		// Note: these two Get_Coplanar functions return floats in an attempt to reduce float/int CPU state changes...
 		inline float Get_Coplanar_Normals(const Vector3 & Input, Vector3 & Output1, Vector3 & Output2) const;
 
 		// find the two vectors on the edge of the cone residing on the same plane as the input vector and their dot products with the input.
@@ -94,8 +93,8 @@ class NormalCone : public Vector3
 		// this function returns the dot product between the input vector and the nearest coplanar normal
 		// contained by the cone.
 		// If the input vector is also contained by the cone, the result is always 1.0f.
-		// Note that in the case of a complete sphere, the nearest coplanar normal will be pointing in 
-		// the opposite direction of the input vector. 
+		// Note that in the case of a complete sphere, the nearest coplanar normal will be pointing in
+		// the opposite direction of the input vector.
 		inline float Smallest_Dot_Product(const Vector3 & Input);
 
 		// this value is the dot product of the edge of the cone and the center of the cone.
@@ -115,9 +114,9 @@ inline float NormalCone::Get_Coplanar_Normals(const Vector3 & Input, Vector3 & O
 	Vector3::Cross_Product(Input, *this, & cross);
 
 	float length = cross.Length2();
-	if(length < WWMATH_EPSILON) 
+	if(length < WWMATH_EPSILON)
 		return 0.0f;
-	
+
 	length = sqrt(length);
 	cross /= length;
 
@@ -137,7 +136,7 @@ inline float NormalCone::Get_Coplanar_Normals_And_Dots(const Vector3 & Input, Ve
 {
 	float length = Get_Coplanar_Normals(Input, Output1, Output2);
 
-	if(length < WWMATH_EPSILON) 
+	if(length < WWMATH_EPSILON)
 		return 0.0f;
 
 	// get the dot products of the new normal with the two coplanar normals and the current average
@@ -151,7 +150,7 @@ inline float NormalCone::Get_Coplanar_Normals_And_Dots(const Vector3 & Input, Ve
 inline void NormalCone::Merge(const Vector3 & Input)
 {
 	// early exit if this normal cone has already turned into a complete sphere.
-	if(Complete_Sphere()) 
+	if(Complete_Sphere())
 		return;
 
 	// get the dot of the new vector with the current center vector
@@ -179,11 +178,11 @@ inline void NormalCone::Merge(const Vector3 & Input)
 
 	// the smaller of the dot values we have is going to indicate which of the two coplanar normals to use
 	// for averaging into the new center normal.
-	if(dot1 < dot2) 
+	if(dot1 < dot2)
 		Set(Input + normal1, dot1);
 	else
 		Set(Input + normal2, dot2);
-	
+
 	// if the angle is < 0, reverse the direction of the averaged normal since we have constructed
 	// something more like a sphere with a cone shape taken out of it (a negative cone).
 	if(Angle < WWMATH_EPSILON)
@@ -197,7 +196,7 @@ inline void NormalCone::Merge(const Vector3 & Input)
 inline void NormalCone::Merge(const NormalCone & Input)
 {
 	Vector3 n1, n2;
-	
+
 	if(Input.Get_Coplanar_Normals(*this, n1,n2) >= WWMATH_EPSILON)
 	{
 		Merge(n1);
@@ -208,8 +207,8 @@ inline void NormalCone::Merge(const NormalCone & Input)
 // this function returns the dot product between the input vector and the nearest coplanar normal
 // contained by the cone.
 // If the input vector is also contained by the cone, the result is always 1.0f.
-// Note that in the case of a complete sphere, the nearest coplanar normal will be pointing in 
-// the opposite direction of the input vector. 
+// Note that in the case of a complete sphere, the nearest coplanar normal will be pointing in
+// the opposite direction of the input vector.
 inline float NormalCone::Smallest_Dot_Product(const Vector3 & Input)
 {
 	if(Complete_Sphere())
@@ -239,5 +238,3 @@ inline float NormalCone::Smallest_Dot_Product(const Vector3 & Input)
 		return dot1;
 	return dot2;
 }
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWMath/obbox.cpp b/Core/Libraries/Source/WWVegas/WWMath/obbox.cpp
index e6549a49a01..e92787a274c 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/obbox.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/obbox.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                    Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 24                                                          $*
@@ -75,11 +75,11 @@ OBBoxClass::OBBoxClass(const Vector3 * /*points*/, int /*n*/)
 	// TODO: IMPLEMENT THIS!!!
 	assert(0);
 
-#if 0	
+#if 0
 	int i;
 
 	// compute mean and covariances of points
-	float xsum = 0.0f, ysum = 0.0f, zsum = 0.0f;;
+	float xsum = 0.0f, ysum = 0.0f, zsum = 0.0f;
 	float xxsum = 0.0f, xysum = 0.0f, xzsum = 0.0f;
 	float yysum = 0.0f, yzsum = 0.0f, zzsum = 0.0f;
 
@@ -207,7 +207,7 @@ void OBBoxClass::Init_From_Box_Points(Vector3 * points,int num)
 	** this assumption is not true!!!!
 	*/
 	assert(num == 8);
-	
+
 	/*
 	** Just pick the first point as the preliminary center.  Compute
 	** vectors from this point to each of the other points
@@ -218,7 +218,7 @@ void OBBoxClass::Init_From_Box_Points(Vector3 * points,int num)
 	}
 
 	/*
-	** Find the shortest two candidate axes.  Then the 
+	** Find the shortest two candidate axes.  Then the
 	** third axis will be the cross product of these two.
 	*/
 	for (i=1;i<num;i++) {
@@ -291,7 +291,7 @@ void OBBoxClass::Init_From_Box_Points(Vector3 * points,int num)
 void OBBoxClass::Init_Random(float min_extent,float max_extent)
 {
 	Center.Set(0,0,0);
-	
+
 	Extent.X = min_extent + WWMath::Random_Float() * (max_extent - min_extent);
 	Extent.Y = min_extent + WWMath::Random_Float() * (max_extent - min_extent);
 	Extent.Z = min_extent + WWMath::Random_Float() * (max_extent - min_extent);
@@ -419,7 +419,7 @@ bool Oriented_Boxes_Intersect
 
 	Vector3::Cross_Product(A[2],B[2],&axis);
 	if (!Oriented_Boxes_Intersect_On_Axis(box0,box1,axis)) return false;
-	
+
 	// None of the above tests separated the two boxes, so they are intersecting
 	return true;
 }
@@ -510,7 +510,7 @@ bool Oriented_Boxes_Collide
 
 	/////////////////////////////////////////////////////////////////////////
 	// L = A0
-	// 
+	//
 	// Projecting the two boxes onto Box0's X axis.  If their intervals
 	// on this line do not intersect, the boxes are not intersecting!
 	// Each of the tests in this function work in a similar way.
@@ -596,7 +596,7 @@ bool Oriented_Boxes_Collide
 	// L = A0xB1
 	/////////////////////////////////////////////////////////////////////////
 	Vector3::Cross_Product(A0,B1,&SepAxis);
-	
+
 	if (!Oriented_Boxes_Collide_On_Axis(box0,v0,box1,v1,SepAxis,dt)) {
 		intersect = false;
 		goto exit;
@@ -606,7 +606,7 @@ bool Oriented_Boxes_Collide
 	// L = A0xB2
 	/////////////////////////////////////////////////////////////////////////
 	Vector3::Cross_Product(A0,B2,&SepAxis);
-	
+
 	if (!Oriented_Boxes_Collide_On_Axis(box0,v0,box1,v1,SepAxis,dt)) {
 		intersect = false;
 		goto exit;
@@ -616,7 +616,7 @@ bool Oriented_Boxes_Collide
 	// L = A1xB0
 	/////////////////////////////////////////////////////////////////////////
 	Vector3::Cross_Product(A1,B0,&SepAxis);
-	
+
 	if (!Oriented_Boxes_Collide_On_Axis(box0,v0,box1,v1,SepAxis,dt)) {
 		intersect = false;
 		goto exit;
@@ -626,7 +626,7 @@ bool Oriented_Boxes_Collide
 	// L = A1xB1
 	/////////////////////////////////////////////////////////////////////////
 	Vector3::Cross_Product(A1,B1,&SepAxis);
-	
+
 	if (!Oriented_Boxes_Collide_On_Axis(box0,v0,box1,v1,SepAxis,dt)) {
 		intersect = false;
 		goto exit;
@@ -636,7 +636,7 @@ bool Oriented_Boxes_Collide
 	// L = A1xB2
 	/////////////////////////////////////////////////////////////////////////
 	Vector3::Cross_Product(A1,B2,&SepAxis);
-	
+
 	if (!Oriented_Boxes_Collide_On_Axis(box0,v0,box1,v1,SepAxis,dt)) {
 		intersect = false;
 		goto exit;
@@ -646,7 +646,7 @@ bool Oriented_Boxes_Collide
 	// L = A2xB0
 	/////////////////////////////////////////////////////////////////////////
 	Vector3::Cross_Product(A2,B0,&SepAxis);
-	
+
 	if (!Oriented_Boxes_Collide_On_Axis(box0,v0,box1,v1,SepAxis,dt)) {
 		intersect = false;
 		goto exit;
@@ -656,7 +656,7 @@ bool Oriented_Boxes_Collide
 	// L = A2xB1
 	/////////////////////////////////////////////////////////////////////////
 	Vector3::Cross_Product(A2,B1,&SepAxis);
-	
+
 	if (!Oriented_Boxes_Collide_On_Axis(box0,v0,box1,v1,SepAxis,dt)) {
 		intersect = false;
 		goto exit;
@@ -666,7 +666,7 @@ bool Oriented_Boxes_Collide
 	// L = A2xB2
 	/////////////////////////////////////////////////////////////////////////
 	Vector3::Cross_Product(A2,B2,&SepAxis);
-	
+
 	if (!Oriented_Boxes_Collide_On_Axis(box0,v0,box1,v1,SepAxis,dt)) {
 		intersect = false;
 		goto exit;
@@ -699,14 +699,14 @@ bool Oriented_Box_Intersects_Tri_On_Axis(const OBBoxClass & box,const TriClass &
 	float tmp;
 
 	if (axis.Length2() < WWMATH_EPSILON) return true;
-	
+
 	Vector3 D = *(tri.V[0]) - box.Center;
 	Vector3 r1 = *(tri.V[1]) - *(tri.V[0]);
 	Vector3 r2 = *(tri.V[2]) - *(tri.V[0]);
-	
+
 	// I want the axis to point from box.center to tri.v0
 	dist = Vector3::Dot_Product(D,axis);
-	if (dist < 0) {		
+	if (dist < 0) {
 		dist = -dist;
 		axis = -axis;
 	}
@@ -718,7 +718,7 @@ bool Oriented_Box_Intersects_Tri_On_Axis(const OBBoxClass & box,const TriClass &
 	lep = 0;
 	tmp = Vector3::Dot_Product(r1,axis); if (tmp < lep) lep = tmp;
 	tmp = Vector3::Dot_Product(r2,axis); if (tmp < lep) lep = tmp;
-	lep += dist;	
+	lep += dist;
 
 	if (lep >= leb) {
 		return false;
@@ -765,7 +765,7 @@ bool Oriented_Box_Intersects_Tri(const OBBoxClass & box,const TriClass & tri)
 
 	Vector3::Cross_Product(A[0],E[1],&axis);
 	if (!Oriented_Box_Intersects_Tri_On_Axis(box,tri,axis)) return false;
-		
+
 	Vector3::Cross_Product(A[0],E[2],&axis);
 	if (!Oriented_Box_Intersects_Tri_On_Axis(box,tri,axis)) return false;
 
@@ -774,7 +774,7 @@ bool Oriented_Box_Intersects_Tri(const OBBoxClass & box,const TriClass & tri)
 
 	Vector3::Cross_Product(A[1],E[1],&axis);
 	if (!Oriented_Box_Intersects_Tri_On_Axis(box,tri,axis)) return false;
-		
+
 	Vector3::Cross_Product(A[1],E[2],&axis);
 	if (!Oriented_Box_Intersects_Tri_On_Axis(box,tri,axis)) return false;
 
@@ -783,7 +783,7 @@ bool Oriented_Box_Intersects_Tri(const OBBoxClass & box,const TriClass & tri)
 
 	Vector3::Cross_Product(A[2],E[1],&axis);
 	if (!Oriented_Box_Intersects_Tri_On_Axis(box,tri,axis)) return false;
-		
+
 	Vector3::Cross_Product(A[2],E[2],&axis);
 	if (!Oriented_Box_Intersects_Tri_On_Axis(box,tri,axis)) return false;
 
diff --git a/Core/Libraries/Source/WWVegas/WWMath/obbox.h b/Core/Libraries/Source/WWVegas/WWMath/obbox.h
index 53880c2ebd4..4e3f7f141ce 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/obbox.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/obbox.h
@@ -26,7 +26,7 @@
  *                                                                                             *
  *                    Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
+ *                       Author : Kenny Mitchell                                               *
  *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
@@ -41,12 +41,7 @@
  *   OBBoxClass::Compute_Axis_Aligned_Extent -- computes extent of an AABox enclosing this box *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef OBBOX_H
-#define OBBOX_H
 
 #include "always.h"
 #include "vector3.h"
@@ -64,12 +59,12 @@ class PlaneClass;
 ** OBBoxClass
 **
 ** Oriented-Bounding-Box Class.
-** This is a collision box in world space.  
+** This is a collision box in world space.
 ** Center - position of the center of the box
 ** Extents - size of the box
 ** Basis - rotation matrix defining the orientation of the box
 **
-** To find the world space coordinates of the "+x,+y,+z" corner of 
+** To find the world space coordinates of the "+x,+y,+z" corner of
 ** the bounding box you could use this equation:
 ** Vector3 corner = Center + Basis * Extent;
 */
@@ -85,12 +80,12 @@ class OBBoxClass
 		Extent(that.Extent)
 	{ }
 
-	OBBoxClass(const Vector3 & center,const Vector3 & extent) : 
+	OBBoxClass(const Vector3 & center,const Vector3 & extent) :
 		Basis(1),
 		Center(center),
 		Extent(extent)
 	{ }
-	
+
 	OBBoxClass(const Vector3 & center,const Vector3 & extent,const Matrix3x3 & basis) :
 		Basis(basis),
 		Center(center),
@@ -220,15 +215,15 @@ inline void OBBoxClass::Compute_Axis_Aligned_Extent(Vector3 * set_extent) const
 
 	// x extent is the box projected onto the x axis
 	set_extent->X =	WWMath::Fabs(Extent[0] * Basis[0][0]) +
-							WWMath::Fabs(Extent[1] * Basis[0][1]) +	
+							WWMath::Fabs(Extent[1] * Basis[0][1]) +
 							WWMath::Fabs(Extent[2] * Basis[0][2]);
-	
+
 	set_extent->Y =	WWMath::Fabs(Extent[0] * Basis[1][0]) +
-							WWMath::Fabs(Extent[1] * Basis[1][1]) +	
+							WWMath::Fabs(Extent[1] * Basis[1][1]) +
 							WWMath::Fabs(Extent[2] * Basis[1][2]);
 
 	set_extent->Z =	WWMath::Fabs(Extent[0] * Basis[2][0]) +
-							WWMath::Fabs(Extent[1] * Basis[2][1]) +	
+							WWMath::Fabs(Extent[1] * Basis[2][1]) +
 							WWMath::Fabs(Extent[2] * Basis[2][2]);
 }
 
@@ -265,7 +260,5 @@ inline bool OBBoxClass::operator== (const OBBoxClass &src)
  *=============================================================================================*/
 inline bool OBBoxClass::operator!= (const OBBoxClass &src)
 {
-	return (Center != src.Center) || (Extent != src.Extent) && (Basis == src.Basis);
+	return (Center != src.Center) || (Extent != src.Extent) || (Basis != src.Basis);
 }
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWMath/ode.cpp b/Core/Libraries/Source/WWVegas/WWMath/ode.cpp
index a67fbe0ff0d..4889b11c554 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/ode.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/ode.cpp
@@ -16,27 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* $Header: /Commando/Code/wwmath/ODE.CPP 8     7/02/99 10:32a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando                                                     * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwmath/ODE.CPP                               $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 6/25/99 6:23p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 8                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Euler_Integrate -- uses Eulers method to integrate a system of ODE's                      * 
- *   Midpoint_Integrate -- midpoint method (Runge-Kutta 2) for integration                     * 
- *   Runge_Kutta_Integrate -- Runge Kutta 4 method                                             * 
- *   Runge_Kutta5_Integrate -- 5th order Runge-Kutta                                           * 
+/* $Header: /Commando/Code/wwmath/ODE.cpp 8     7/02/99 10:32a Greg_h $ */
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando                                                     *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwmath/ODE.cpp                               $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 6/25/99 6:23p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 8                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Euler_Integrate -- uses Eulers method to integrate a system of ODE's                      *
+ *   Midpoint_Integrate -- midpoint method (Runge-Kutta 2) for integration                     *
+ *   Runge_Kutta_Integrate -- Runge Kutta 4 method                                             *
+ *   Runge_Kutta5_Integrate -- 5th order Runge-Kutta                                           *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "ode.h"
@@ -53,20 +53,20 @@ static StateVectorClass		_WorkVector5;
 static StateVectorClass		_WorkVector6;
 static StateVectorClass		_WorkVector7;
 
-/*********************************************************************************************** 
- * Euler_Solve -- uses Eulers method to integrate a system of ODE's                            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * odesys - pointer to the ODE system to integrate                                             * 
- * dt - size of the timestep                                                                   * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- * state vector in odesys will be updated for the next timestep                                * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Euler_Solve -- uses Eulers method to integrate a system of ODE's                            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * odesys - pointer to the ODE system to integrate                                             *
+ * dt - size of the timestep                                                                   *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ * state vector in odesys will be updated for the next timestep                                *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *   6/25/99    GTH : Updated to the new integrator system                                     *
  *=============================================================================================*/
 void IntegrationSystem::Euler_Integrate(ODESystemClass * sys, float dt)
@@ -100,20 +100,20 @@ void IntegrationSystem::Euler_Integrate(ODESystemClass * sys, float dt)
 	sys->Set_State(Y1);
 }
 
-/*********************************************************************************************** 
- * Midpoint_Integrate -- midpoint method (Runge-Kutta 2)                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * sys - pointer to the ODE system to integrate                                                * 
- * dt - size of the timestep                                                                   * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- * state vector in odesys will be updated for the next timestep                                * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Midpoint_Integrate -- midpoint method (Runge-Kutta 2)                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * sys - pointer to the ODE system to integrate                                                *
+ * dt - size of the timestep                                                                   *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ * state vector in odesys will be updated for the next timestep                                *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *   6/25/99    GTH : Updated to the new integrator system                                     *
  *=============================================================================================*/
 void IntegrationSystem::Midpoint_Integrate(ODESystemClass * sys,float dt)
@@ -137,20 +137,20 @@ void IntegrationSystem::Midpoint_Integrate(ODESystemClass * sys,float dt)
 
 	/*
 	** MidPoint method, first evaluate the derivitives of the
-	** state vector just like the Euler method.  
+	** state vector just like the Euler method.
 	*/
 	sys->Compute_Derivatives(0.0f,NULL,&dydt);
 
 	/*
-	** Compute the midpoint between the Euler solution and 
+	** Compute the midpoint between the Euler solution and
 	** the input values.
 	*/
 	for (i=0; i<Y0.Count(); i++) {
 		ymid[i] = Y0[i] + dt * dydt[i] / 2.0f;
 	}
-	
+
 	/*
-	** Re-compute derivatives at this point.  
+	** Re-compute derivatives at this point.
 	*/
 	sys->Compute_Derivatives(dt/2.0f,&ymid,&dydt);
 
@@ -165,20 +165,20 @@ void IntegrationSystem::Midpoint_Integrate(ODESystemClass * sys,float dt)
 }
 
 
-/*********************************************************************************************** 
- * Runge_Kutta_Integrate -- Runge Kutta 4 method                                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * odesys - pointer to the ODE system to integrate                                             * 
- * dt - size of the timestep                                                                   * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- * state vector in odesys will be updated for the next timestep                                * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Runge_Kutta_Integrate -- Runge Kutta 4 method                                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * odesys - pointer to the ODE system to integrate                                             *
+ * dt - size of the timestep                                                                   *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ * state vector in odesys will be updated for the next timestep                                *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void IntegrationSystem::Runge_Kutta_Integrate(ODESystemClass * sys,float dt)
 {
@@ -212,7 +212,7 @@ void IntegrationSystem::Runge_Kutta_Integrate(ODESystemClass * sys,float dt)
 	for (i=0; i<Y0.Count(); i++) {
 		yt[i] = Y0[i] + dt2 * dydt[i];
 	}
-	
+
 	/*
 	** Second Step
 	*/
@@ -220,7 +220,7 @@ void IntegrationSystem::Runge_Kutta_Integrate(ODESystemClass * sys,float dt)
 	for (i=0; i<Y0.Count(); i++) {
 		yt[i] = Y0[i] + dt2 * dyt[i];
 	}
-	
+
 	/*
 	** Third Step
 	*/
@@ -241,20 +241,20 @@ void IntegrationSystem::Runge_Kutta_Integrate(ODESystemClass * sys,float dt)
 	sys->Set_State(Y1);
 }
 
-/*********************************************************************************************** 
- * Runge_Kutta5_Integrate -- 5th order Runge-Kutta                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * odesys - pointer to the ODE system to integrate                                             * 
- * dt - size of the timestep                                                                   * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- * state vector in odesys will be updated for the next timestep                                * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Runge_Kutta5_Integrate -- 5th order Runge-Kutta                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * odesys - pointer to the ODE system to integrate                                             *
+ * dt - size of the timestep                                                                   *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ * state vector in odesys will be updated for the next timestep                                *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *   6/25/99    GTH : Converted to the new Integrator system                                   *
  *=============================================================================================*/
 void IntegrationSystem::Runge_Kutta5_Integrate(ODESystemClass * odesys,float dt)
@@ -331,13 +331,13 @@ void IntegrationSystem::Runge_Kutta5_Integrate(ODESystemClass * odesys,float dt)
 	for (i=0; i<veclen; i++) {
 		ytmp[i] = Y0[i] + dt*(b31*dydt[i] + b32*ak2[i]);
 	}
-	
+
 	// Third step
 	odesys->Compute_Derivatives(a3*dt, &ytmp, &ak3);
 	for (i=0; i<veclen; i++) {
 		ytmp[i] = Y0[i] + dt*(b41*dydt[i] + b42*ak2[i] + b43*ak3[i]);
 	}
-	
+
 	// Fourth step
 	odesys->Compute_Derivatives(a4*dt, &ytmp, &ak4);
 	for (i=0; i<veclen; i++) {
@@ -356,7 +356,7 @@ void IntegrationSystem::Runge_Kutta5_Integrate(ODESystemClass * odesys,float dt)
 		Y1[i] = Y0[i] + dt*(c1*dydt[i] + c3*ak3[i] + c4*ak4[i] + c6*ak6[i]);
 	}
 
-	// Error approximation!  
+	// Error approximation!
 	// (maybe I should use this someday? nah not going to use this integrator anyway...)
 	for (i=0; i<veclen; i++) {
 		yerr[i] = dt*(dc1*dydt[i] + dc3*ak3[i] + dc4*ak4[i] + dc5*ak5[i] + dc6*ak6[i]);
diff --git a/Core/Libraries/Source/WWVegas/WWMath/ode.h b/Core/Libraries/Source/WWVegas/WWMath/ode.h
index 0388038add5..0d597136199 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/ode.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/ode.h
@@ -17,46 +17,40 @@
 */
 
 /* $Header: /G/wwmath/ode.h 9     9/21/99 5:54p Neal_k $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando                                                     * 
- *                                                                                             * 
- *                     $Archive:: /G/wwmath/ode.h                                             $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 9/21/99 5:54p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 9                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando                                                     *
+ *                                                                                             *
+ *                     $Archive:: /G/wwmath/ode.h                                             $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 9/21/99 5:54p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 9                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef ODE_H
-#define ODE_H
 
 #include "always.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "wwdebug.h"
 
 
 /*
 ** StateVectorClass
-** The state vector for a system of ordinary differential equations will be 
+** The state vector for a system of ordinary differential equations will be
 ** stored in this form.  It is a dynamically resizeable array so that we don't
 ** have to hard-code a maximum size.  If needed, in the final product, we could
 ** do a slight optimization which makes this a normal fixed size array that
 ** we've determined is "big enough".
 */
-class StateVectorClass : public DynamicVectorClass<float> 
+class StateVectorClass : public DynamicVectorClass<float>
 {
 public:
 	void Reset(void) { ActiveCount = 0; }
@@ -77,8 +71,8 @@ class ODESystemClass
 	/*
 	** Get_Current_State
 	** This function should fill the given state vector with the
-	** current state of this object.  Each state variable should be 
-	** inserted into the vector using its 'Add' interface.  
+	** current state of this object.  Each state variable should be
+	** inserted into the vector using its 'Add' interface.
 	*/
 	virtual void	Get_State(StateVectorClass & set_state) = 0;
 
@@ -92,9 +86,9 @@ class ODESystemClass
 
 	/*
 	** Compute_Derivatives
-	** The various ODE solvers will use this interface to ask the ODESystemClass to 
+	** The various ODE solvers will use this interface to ask the ODESystemClass to
 	** compute the derivatives of their state.  In some cases, the integrator will
-	** pass in a new state vector (test_state) to be used when computing the derivatives.  
+	** pass in a new state vector (test_state) to be used when computing the derivatives.
 	** NULL will be passed if they want the derivatives for the initial state.
 	** This function works similarly to the Set_State function in that it passes you
 	** the index to start reading from and you pass it back the index to continue from.
@@ -116,7 +110,7 @@ class ODESystemClass
 ** This is the fourth order Runge-Kutta method...
 **
 ** Runge_Kutta5_Solve is an implementation of fifth order Runge-
-** Kutta.  It requires six evaluations of the derivatives.  
+** Kutta.  It requires six evaluations of the derivatives.
 */
 
 class IntegrationSystem
@@ -129,6 +123,3 @@ class IntegrationSystem
 	static void Runge_Kutta5_Integrate(ODESystemClass * odesys,float dt);
 
 };
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/plane.h b/Core/Libraries/Source/WWVegas/WWMath/plane.h
index 0f6019d1446..c0cfbfe2813 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/plane.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/plane.h
@@ -17,30 +17,25 @@
 */
 
 /* $Header: /Commando/Code/wwmath/plane.h 16    5/05/01 5:48p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Voxel Technology                                             * 
- *                                                                                             * 
- *                    File Name : PLANE.H                                                      * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 03/17/97                                                     * 
- *                                                                                             * 
- *                  Last Update : March 17, 1997 [GH]                                          * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Voxel Technology                                             *
+ *                                                                                             *
+ *                    File Name : PLANE.h                                                      *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 03/17/97                                                     *
+ *                                                                                             *
+ *                  Last Update : March 17, 1997 [GH]                                          *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef PLANE_H
-#define PLANE_H
 
 #include "always.h"
 #include "vector3.h"
@@ -51,10 +46,10 @@
 **
 ** 3D-planes.  This class uses the Normal+Distance description of a plane.
 ** The relationship for all points (p) on the plane is given by:
-** 
+**
 **   N.X * p.X + N.Y * p.Y + N.Z * p.Z = D
 **
-** BEWARE, if you are used to the Ax + By + Cz + D = 0 description, the 
+** BEWARE, if you are used to the Ax + By + Cz + D = 0 description, the
 ** sign of the D value is inverted.
 */
 
@@ -94,12 +89,12 @@ class PlaneClass
 	static void Intersect_Planes(const PlaneClass & a, const PlaneClass & b, Vector3 *line_dir, Vector3 *line_point);
 };
 
-inline PlaneClass::PlaneClass(float nx,float ny,float nz,float dist) 
+inline PlaneClass::PlaneClass(float nx,float ny,float nz,float dist)
 {
 	Set(nx,ny,nz,dist);
 }
-	
-inline PlaneClass::PlaneClass(const Vector3 & normal,float dist) 
+
+inline PlaneClass::PlaneClass(const Vector3 & normal,float dist)
 {
 	Set(normal,dist);
 }
@@ -109,7 +104,7 @@ inline PlaneClass::PlaneClass(const Vector3 & normal,const Vector3 & point)
 	Set(normal,point);
 }
 
-inline PlaneClass::PlaneClass(const Vector3 & point1, const Vector3 & point2, const Vector3 & point3) 
+inline PlaneClass::PlaneClass(const Vector3 & point1, const Vector3 & point2, const Vector3 & point3)
 {
 	Set(point1,point2,point3);
 }
@@ -122,7 +117,7 @@ inline void PlaneClass::Set(float a,float b,float c,float d)
 	D = d;
 }
 
-inline void PlaneClass::Set(const Vector3 & normal,float dist) 
+inline void PlaneClass::Set(const Vector3 & normal,float dist)
 {
 	N = normal;
 	D = dist;
@@ -135,7 +130,7 @@ inline void PlaneClass::Set(const Vector3 & normal,const Vector3 & point)
 }
 
 
-inline void PlaneClass::Set(const Vector3 & point1, const Vector3 & point2, const Vector3 & point3) 
+inline void PlaneClass::Set(const Vector3 & point1, const Vector3 & point2, const Vector3 & point3)
 {
 #ifdef ALLOW_TEMPORARIES
 	N = Vector3::Cross_Product((point2 - point1), (point3 - point1));
@@ -246,5 +241,3 @@ inline void PlaneClass::Intersect_Planes(const PlaneClass & a, const PlaneClass
 	// find the point).
 	line_dir->Normalize();
 }
-
-#endif /*PLANE_H*/
diff --git a/Core/Libraries/Source/WWVegas/WWMath/pot.cpp b/Core/Libraries/Source/WWVegas/WWMath/pot.cpp
index 02154079545..8ea327efdf1 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/pot.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/pot.cpp
@@ -16,39 +16,39 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /G/ww3d/POT.CPP                         $* 
- *                                                                         * 
- *                      $Author:: Naty_h                                  $* 
- *                                                                         * 
- *                     $Modtime:: 12/23/98 7:58a                          $* 
- *                                                                         * 
- *                    $Revision:: 3                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- *   Find_POT -- finds closest inclusive power of 2 to a value             * 
- *   Find_POT_Log2 -- finds log2 of closest inclusive power of 2 to a value* 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /G/ww3d/POT.cpp                         $*
+ *                                                                         *
+ *                      $Author:: Naty_h                                  $*
+ *                                                                         *
+ *                     $Modtime:: 12/23/98 7:58a                          $*
+ *                                                                         *
+ *                    $Revision:: 3                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ *   Find_POT -- finds closest inclusive power of 2 to a value             *
+ *   Find_POT_Log2 -- finds log2 of closest inclusive power of 2 to a value*
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "pot.h"
 
-/************************************************************************** 
- * Find_POT -- finds closest inclusive power of 2 to a value              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   10/20/1997 PWG : Created.                                            * 
+/**************************************************************************
+ * Find_POT -- finds closest inclusive power of 2 to a value              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   10/20/1997 PWG : Created.                                            *
  *========================================================================*/
 int Find_POT(int val)
 {
@@ -77,17 +77,17 @@ int Find_POT(int val)
 }
 
 
-/************************************************************************** 
- * Find_POT_Log2 -- finds log2 of closest inclusive power of 2 to a value * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   12/23/1998 NH : Created.                                             * 
+/**************************************************************************
+ * Find_POT_Log2 -- finds log2 of closest inclusive power of 2 to a value *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   12/23/1998 NH : Created.                                             *
  *========================================================================*/
 unsigned int Find_POT_Log2(unsigned int val)
 {
diff --git a/Core/Libraries/Source/WWVegas/WWMath/pot.h b/Core/Libraries/Source/WWVegas/WWMath/pot.h
index c959b569bcc..3981fa3700a 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/pot.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/pot.h
@@ -16,30 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /G/ww3d/POT.H                           $* 
- *                                                                         * 
- *                      $Author:: Naty_h                                  $* 
- *                                                                         * 
- *                     $Modtime:: 12/23/98 7:51a                          $* 
- *                                                                         * 
- *                    $Revision:: 4                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /G/ww3d/POT.h                           $*
+ *                                                                         *
+ *                      $Author:: Naty_h                                  $*
+ *                                                                         *
+ *                     $Modtime:: 12/23/98 7:51a                          $*
+ *                                                                         *
+ *                    $Revision:: 4                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef __POT_H__
-#define __POT_H__
 int Find_POT(int val);
 unsigned int Find_POT_Log2(unsigned int val);
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWMath/quat.cpp b/Core/Libraries/Source/WWVegas/WWMath/quat.cpp
index dfb92679d39..b0bf14d9a9a 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/quat.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/quat.cpp
@@ -17,32 +17,32 @@
 */
 
 /* $Header: /Commando/Code/wwmath/quat.cpp 38    8/28/01 10:26a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Voxel Technology                                             * 
- *                                                                                             * 
- *                    File Name : QUAT.CPP                                                     * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 02/24/97                                                     * 
- *                                                                                             * 
- *                  Last Update : February 28, 1997 [GH]                                       * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Quaternion::Quaternion -- constructor                                                     * 
- *   Quaternion::Set -- Set the quaternion                                                     * 
- *   Quaternion::operator= -- Assignment operator                                              * 
- *   Quaternion::Make_Closest -- Use nearest representation to the given quaternion.           * 
- *   Trackball -- Computes a "trackball" quaternion given 2D mouse coordinates                 * 
- *   Axis_To_Quat -- Creates a quaternion given an axis and angle of rotation                  * 
- *   Slerp -- Spherical Linear interpolation!                                                  * 
- *   Build_Quaternion -- Creates a quaternion from a Matrix                                    * 
- *   Build_Matrix -- Creates a Matrix from a Quaternion                                        * 
- *   Normalize -- normalizes a quaternion                                                      * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Voxel Technology                                             *
+ *                                                                                             *
+ *                    File Name : QUAT.cpp                                                     *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 02/24/97                                                     *
+ *                                                                                             *
+ *                  Last Update : February 28, 1997 [GH]                                       *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Quaternion::Quaternion -- constructor                                                     *
+ *   Quaternion::Set -- Set the quaternion                                                     *
+ *   Quaternion::operator= -- Assignment operator                                              *
+ *   Quaternion::Make_Closest -- Use nearest representation to the given quaternion.           *
+ *   Trackball -- Computes a "trackball" quaternion given 2D mouse coordinates                 *
+ *   Axis_To_Quat -- Creates a quaternion given an axis and angle of rotation                  *
+ *   Slerp -- Spherical Linear interpolation!                                                  *
+ *   Build_Quaternion -- Creates a quaternion from a Matrix                                    *
+ *   Build_Matrix -- Creates a Matrix from a Quaternion                                        *
+ *   Normalize -- normalizes a quaternion                                                      *
  *   Quaternion::Quaternion -- constructor                                                     *
  *   Slerp_Setup -- Get ready to call "Cached_Slerp"                                           *
  *   Cached_Slerp -- Quaternion slerping, optimized with cached values                         *
@@ -54,7 +54,6 @@
 #include "matrix4.h"
 #include "wwmath.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <assert.h>
@@ -77,7 +76,7 @@ static float project_to_sphere(float,float,float);
  *                                                                                             *
  * INPUT:                                                                                      *
  * axis - axis of the rotation                                                                 *
- * angle - rotation angle                                                                      * 
+ * angle - rotation angle                                                                      *
  *                                                                                             *
  * OUTPUT:                                                                                     *
  *                                                                                             *
@@ -97,17 +96,17 @@ Quaternion::Quaternion(const Vector3 & axis,float angle)
 }
 
 
-/*********************************************************************************************** 
- * Quaternion::Normalize -- Normalize to a unit quaternion                                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Quaternion::Normalize -- Normalize to a unit quaternion                                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void Quaternion::Normalize()
 {
@@ -124,17 +123,17 @@ void Quaternion::Normalize()
 	}
 }
 
-/*********************************************************************************************** 
- * Q::Make_Closest -- Use nearest representation to the given quaternion.                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Q::Make_Closest -- Use nearest representation to the given quaternion.                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Quaternion & Quaternion::Make_Closest(const Quaternion & qto)
 {
@@ -147,31 +146,31 @@ Quaternion & Quaternion::Make_Closest(const Quaternion & qto)
 		Z = -Z;
 		W = -W;
 	}
-	
+
 	return *this;
 }
 
-/*********************************************************************************************** 
- * Trackball -- Computes a "trackball" quaternion given 2D mouse coordinates                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * x0,y0 - x1,y1 - "normalized" mouse coordinates for the mouse movement                       * 
- * sphsize - size of the trackball sphere                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- * a quaternion representing the rotation of a trackball                                       * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Trackball -- Computes a "trackball" quaternion given 2D mouse coordinates                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * x0,y0 - x1,y1 - "normalized" mouse coordinates for the mouse movement                       *
+ * sphsize - size of the trackball sphere                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ * a quaternion representing the rotation of a trackball                                       *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Quaternion Trackball(float x0, float y0, float x1, float y1, float sphsize)
 {
 	Vector3	a;
 	Vector3	p1;
 	Vector3	p2;
-	Vector3	d;	
+	Vector3	d;
 
 	float phi,t;
 
@@ -207,22 +206,22 @@ Quaternion Trackball(float x0, float y0, float x1, float y1, float sphsize)
 }
 
 
-/*********************************************************************************************** 
- * Axis_To_Quat -- Creates a quaternion given an axis and angle of rotation                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Axis_To_Quat -- Creates a quaternion given an axis and angle of rotation                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Quaternion Axis_To_Quat(const Vector3 &a, float phi)
 {
 	Quaternion q;
-	Vector3 tmp = a;  
+	Vector3 tmp = a;
 
 	tmp.Normalize();
 	q[0] = tmp[0];
@@ -235,20 +234,20 @@ Quaternion Axis_To_Quat(const Vector3 &a, float phi)
 	return q;
 }
 
-/*********************************************************************************************** 
- * Slerp -- Spherical Linear interpolation!                                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *  p - start quaternion                                                                       * 
- *  q - end quaternion                                                                         * 
- *  alpha - interpolating parameter                                                            * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Slerp -- Spherical Linear interpolation!                                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *  p - start quaternion                                                                       *
+ *  q - end quaternion                                                                         *
+ *  alpha - interpolating parameter                                                            *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 
 #if 0
@@ -439,13 +438,13 @@ void __cdecl Fast_Slerp(Quaternion& res, const Quaternion & p,const Quaternion &
 }
 #else
 void __cdecl Fast_Slerp(Quaternion& res, const Quaternion & p,const Quaternion & q,float alpha)
-{		
+{
 	float beta;			// complementary interploation parameter
 	float theta;		// angle between p and q
 	float cos_t; 		// sine, cosine of theta
 	float oo_sin_t;
 	int qflip;			// use flip of q?
-	
+
 	// cos theta = dot product of p and q
 	cos_t = p.X * q.X + p.Y * q.Y + p.Z * q.Z + p.W * q.W;
 
@@ -485,14 +484,14 @@ void __cdecl Fast_Slerp(Quaternion& res, const Quaternion & p,const Quaternion &
 #endif	// MSC_VER
 
 void Slerp(Quaternion& res, const Quaternion & p,const Quaternion & q,float alpha)
-{		
+{
 	float beta;				// complementary interploation parameter
 	float theta;				// angle between p and q
 	//float sin_t
 	float cos_t; 		// sine, cosine of theta
 	float oo_sin_t;
 	int qflip;					// use flip of q?
-	
+
 	// cos theta = dot product of p and q
 	cos_t = p.X * q.X + p.Y * q.Y + p.Z * q.Z + p.W * q.W;
 
@@ -545,7 +544,7 @@ void Slerp(Quaternion& res, const Quaternion & p,const Quaternion & q,float alph
 void Slerp_Setup(const Quaternion & p,const Quaternion & q,SlerpInfoStruct * slerpinfo)
 {
 	float cos_t;
-	
+
 	assert(slerpinfo != NULL);
 
 	// cos theta = dot product of p and q
@@ -570,7 +569,7 @@ void Slerp_Setup(const Quaternion & p,const Quaternion & q,SlerpInfoStruct * sle
 		slerpinfo->Linear = false;
 		slerpinfo->Theta = WWMath::Acos(cos_t);
 		slerpinfo->SinT = WWMath::Sin(slerpinfo->Theta);
-	
+
 	}
 }
 
@@ -647,18 +646,18 @@ void Cached_Slerp(const Quaternion & p,const Quaternion & q,float alpha,SlerpInf
 	set_q->W = beta*p.W + alpha*q.W;
 }
 
-/*********************************************************************************************** 
- * Build_Quaternion -- Creates a quaternion from a Matrix                                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
+/***********************************************************************************************
+ * Build_Quaternion -- Creates a quaternion from a Matrix                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
  *   Matrix MUST NOT have scaling!                                                             *
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/28/1997 GH  : Created.                                                                 * 
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Quaternion Build_Quaternion(const Matrix3D & mat)
 {
@@ -668,7 +667,7 @@ Quaternion Build_Quaternion(const Matrix3D & mat)
 
 	// sum the diagonal of the rotation matrix
 	tr = mat[0][0] + mat[1][1] + mat[2][2];
-	
+
 	if (tr > 0.0f) {
 
 		s = sqrt(tr + 1.0);
@@ -695,7 +694,7 @@ Quaternion Build_Quaternion(const Matrix3D & mat)
 		}
 
 		q[3] = 	( mat[k][j] - mat[j][k] ) * s;
-		q[j] =	( mat[j][i] + mat[i][j] ) * s;    
+		q[j] =	( mat[j][i] + mat[i][j] ) * s;
 		q[k] =	( mat[k][i] + mat[i][k] ) * s;
 
 	}
@@ -711,7 +710,7 @@ Quaternion Build_Quaternion(const Matrix3x3 & mat)
 
 	// sum the diagonal of the rotation matrix
 	tr = mat[0][0] + mat[1][1] + mat[2][2];
-	
+
 	if (tr > 0.0) {
 
 		s = sqrt(tr + 1.0);
@@ -721,7 +720,7 @@ Quaternion Build_Quaternion(const Matrix3x3 & mat)
 		q[0] = (mat[2][1] - mat[1][2]) * s;
 		q[1] = (mat[0][2] - mat[2][0]) * s;
 		q[2] = (mat[1][0] - mat[0][1]) * s;
-	
+
 	} else {
 
 		i = 0;
@@ -734,16 +733,16 @@ Quaternion Build_Quaternion(const Matrix3x3 & mat)
 		s = sqrt( (mat[i][i] - (mat[j][j]+mat[k][k])) + 1.0);
 
 		q[i] =	s * 0.5;
-		
+
 		if (s != 0.0) {
 			s = 0.5/s;
 		}
 
 		q[3] = 	( mat[k][j] - mat[j][k] ) * s;
-		q[j] =	( mat[j][i] + mat[i][j] ) * s;    
+		q[j] =	( mat[j][i] + mat[i][j] ) * s;
 		q[k] =	( mat[k][i] + mat[i][k] ) * s;
 	}
-	
+
 	return q;
 }
 
@@ -755,7 +754,7 @@ Quaternion Build_Quaternion(const Matrix4x4 & mat)
 
 	// sum the diagonal of the rotation matrix
 	tr = mat[0][0] + mat[1][1] + mat[2][2];
-	
+
 	if (tr > 0.0) {
 
 		s = sqrt(tr + 1.0);
@@ -765,10 +764,10 @@ Quaternion Build_Quaternion(const Matrix4x4 & mat)
 		q[0] = (mat[2][1] - mat[1][2]) * s;
 		q[1] = (mat[0][2] - mat[2][0]) * s;
 		q[2] = (mat[1][0] - mat[0][1]) * s;
-	
+
 	} else {
 
-		i = 0; 
+		i = 0;
 		if (mat[1][1] > mat[0][0]) i = 1;
 		if (mat[2][2] > mat[i][i]) i = 2;
 
@@ -782,25 +781,25 @@ Quaternion Build_Quaternion(const Matrix4x4 & mat)
 			s = 0.5/s;
 		}
 		q[3] = 	( mat[k][j] - mat[j][k] ) * s;
-		q[j] =	( mat[j][i] + mat[i][j] ) * s;    
+		q[j] =	( mat[j][i] + mat[i][j] ) * s;
 		q[k] =	( mat[k][i] + mat[i][k] ) * s;
 	}
-	
+
 	return q;
 }
 
 
-/*********************************************************************************************** 
- * Build_Matrix -- Creates a Matrix from a Quaternion                                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Build_Matrix -- Creates a Matrix from a Quaternion                                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Matrix3x3 Build_Matrix3(const Quaternion & q)
 {
@@ -846,22 +845,22 @@ Matrix4x4 Build_Matrix4(const Quaternion & q)
 	m[3][3] = 1.0f;
 	return m;
 }
-  
+
 void Quaternion::Rotate_X(float theta)
 {
-	// TODO: optimize this 
+	// TODO: optimize this
 	*this = (*this) * Quaternion(Vector3(1,0,0),theta);
 }
 
 void Quaternion::Rotate_Y(float theta)
 {
-	// TODO: optimize this 
+	// TODO: optimize this
 	*this = (*this) * Quaternion(Vector3(0,1,0),theta);
 }
 
 void Quaternion::Rotate_Z(float theta)
 {
-	// TODO: optimize this 
+	// TODO: optimize this
 	*this = (*this) * Quaternion(Vector3(0,0,1),theta);
 }
 
@@ -888,7 +887,7 @@ void Quaternion::Randomize(void)
 	Y = ((float) (rand() & 0xFFFF)) / 65536.0f;
 	Z = ((float) (rand() & 0xFFFF)) / 65536.0f;
 	W = ((float) (rand() & 0xFFFF)) / 65536.0f;
-	
+
 	Normalize();
 }
 
diff --git a/Core/Libraries/Source/WWVegas/WWMath/quat.h b/Core/Libraries/Source/WWVegas/WWMath/quat.h
index 68b6bb6a796..7a7f28e9d15 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/quat.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/quat.h
@@ -17,30 +17,25 @@
 */
 
 /* $Header: /Commando/Code/wwmath/quat.h 29    5/11/01 7:11p Jani_p $ */
-/*************************************************************************** 
- ***                  Confidential - Westwood Studios                    *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Voxel Technology                         * 
- *                                                                         * 
- *                    File Name : QUAT.H                                   * 
- *                                                                         * 
- *                   Programmer : Greg Hjelstrom                           * 
- *                                                                         * 
- *                   Start Date : 02/24/97                                 * 
- *                                                                         * 
- *                  Last Update : February 24, 1997 [GH]                   * 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***                  Confidential - Westwood Studios                    ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : Voxel Technology                         *
+ *                                                                         *
+ *                    File Name : QUAT.h                                   *
+ *                                                                         *
+ *                   Programmer : Greg Hjelstrom                           *
+ *                                                                         *
+ *                   Start Date : 02/24/97                                 *
+ *                                                                         *
+ *                  Last Update : February 24, 1997 [GH]                   *
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef QUAT_H
-#define QUAT_H
 
 #include "always.h"
 #include "wwmath.h"
@@ -75,13 +70,13 @@ class Quaternion
 	WWINLINE void		Scale(float s) { X = (float)(s*X); Y = (float)(s*Y); Z = (float)(s*Z); W = (float)(s*W); }
 
 	// Array access
-	WWINLINE float &	operator [](int i) { return (&X)[i]; }     
-	WWINLINE const float &  operator [](int i) const { return (&X)[i]; }  
+	WWINLINE float &	operator [](int i) { return (&X)[i]; }
+	WWINLINE const float &  operator [](int i) const { return (&X)[i]; }
 
-	// Unary operators.  
-	// Remember that q and -q represent the same 3D rotation.  
-	WWINLINE Quaternion operator-() const { return(Quaternion(-X,-Y,-Z,-W)); } 
-	WWINLINE Quaternion operator+() const { return *this; } 
+	// Unary operators.
+	// Remember that q and -q represent the same 3D rotation.
+	WWINLINE Quaternion operator-() const { return(Quaternion(-X,-Y,-Z,-W)); }
+	WWINLINE Quaternion operator+() const { return *this; }
 
 	// Every 3D rotation can be expressed by two different quaternions,  This
 	// function makes the current quaternion convert itself to the representation
@@ -261,7 +256,7 @@ WWINLINE Vector3 Quaternion::Rotate_Vector(const Vector3 & v) const
 WWINLINE void Quaternion::Rotate_Vector(const Vector3 & v,Vector3 * result) const
 {
 	assert(result != NULL);
-	
+
 	float x = W*v.X + (Y*v.Z - v.Y*Z);
 	float y = W*v.Y - (X*v.Z - v.X*Z);
 	float z = W*v.Z + (X*v.Y - v.X*Y);
@@ -274,31 +269,31 @@ WWINLINE void Quaternion::Rotate_Vector(const Vector3 & v,Vector3 * result) cons
 
 WWINLINE bool Quaternion::Is_Valid(void) const
 {
-	return (	WWMath::Is_Valid_Float(X) && 
-				WWMath::Is_Valid_Float(Y) && 
+	return (	WWMath::Is_Valid_Float(X) &&
+				WWMath::Is_Valid_Float(Y) &&
 				WWMath::Is_Valid_Float(Z) &&
 				WWMath::Is_Valid_Float(W) );
 }
 
 WWINLINE bool Equal_Within_Epsilon(const Quaternion &a, const Quaternion &b, float epsilon)
 {
-   return(	(WWMath::Fabs(a.X - b.X) < epsilon) && 
-				(WWMath::Fabs(a.Y - b.Y) < epsilon) && 
+   return(	(WWMath::Fabs(a.X - b.X) < epsilon) &&
+				(WWMath::Fabs(a.Y - b.Y) < epsilon) &&
 				(WWMath::Fabs(a.Z - b.Z) < epsilon)	&&
 				(WWMath::Fabs(a.W - b.W) < epsilon) );
 }
 
-/*********************************************************************************************** 
- * Quaternion::operator= -- Assignment operator                                                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Quaternion::operator= -- Assignment operator                                                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Quaternion & Quaternion::operator = (const Quaternion & source)
 {
@@ -309,9 +304,3 @@ WWINLINE Quaternion & Quaternion::operator = (const Quaternion & source)
 
   return *this;
 }
-
-
-#endif /* QUAT_H */
-
-
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/rect.h b/Core/Libraries/Source/WWVegas/WWMath/rect.h
index 43ac45ec3fc..b99fd42c8ac 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/rect.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/rect.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef RECT_H
-#define RECT_H
 
 #include "vector2.h"
 
@@ -59,7 +53,7 @@ class RectClass
 	RectClass( const Vector2 & top_left, const Vector2 & bottom_right )	{ Left = top_left.X; Top = top_left.Y; Right = bottom_right.X; Bottom = bottom_right.Y; }
 
 	// Assignment
-	RectClass & operator = (const RectClass & r) { Left = r.Left; Top = r.Top; Right = r.Right; Bottom = r.Bottom; return *this; }	
+	RectClass & operator = (const RectClass & r) { Left = r.Left; Top = r.Top; Right = r.Right; Bottom = r.Bottom; return *this; }
 	void	Set(float left, float top, float right, float bottom) { Left = left; Top = top; Right = right; Bottom = bottom; }
 	void	Set( const Vector2 & top_left, const Vector2 & bottom_right )	{ Left = top_left.X; Top = top_left.Y; Right = bottom_right.X; Bottom = bottom_right.Y; }
 	void	Set(const RectClass & r) { Left = r.Left; Top = r.Top; Right = r.Right; Bottom = r.Bottom; }
@@ -103,6 +97,3 @@ class RectClass
 	void	Snap_To_Units( const Vector2 & u ) { Left = (int)(Left / u.X + 0.5f) * u.X; Right = (int)(Right / u.X + 0.5f) * u.X; Top = (int)(Top / u.Y + 0.5f) * u.Y; Bottom = (int)(Bottom / u.Y + 0.5f) * u.Y; }
 
 };
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/sphere.h b/Core/Libraries/Source/WWVegas/WWMath/sphere.h
index b743259f2b3..de098d51454 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/sphere.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/sphere.h
@@ -48,13 +48,7 @@
  *   operator * -- Transform a sphere                                                          *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SPHERE_H
-#define SPHERE_H
 
 #include "always.h"
 #include "vector3.h"
@@ -71,9 +65,9 @@
 class SphereClass
 {
 public:
-	inline SphereClass(void) { };
-	inline SphereClass(const Vector3 & center,float radius) { Init(center,radius); }
-	inline SphereClass(const Matrix3D& mtx,const Vector3 & center,float radius) { Init(mtx,center,radius); }
+	SphereClass(void) { };
+	SphereClass(const Vector3 & center,float radius) { Init(center,radius); }
+	SphereClass(const Matrix3D& mtx,const Vector3 & center,float radius) { Init(mtx,center,radius); }
 	inline SphereClass(const Vector3 & center,const SphereClass & s0);
 	inline SphereClass(const Vector3 *Position, const int VertCount);
 
@@ -83,7 +77,7 @@ class SphereClass
 	inline void Add_Sphere(const SphereClass & s);
 	inline void Transform(const Matrix3D & tm);
 	inline float Volume(void) const;
-	
+
 	inline SphereClass & operator += (const SphereClass & s);
 	inline SphereClass & operator *= (const Matrix3D & m);
 
@@ -150,7 +144,7 @@ inline SphereClass::SphereClass(const Vector3 *Position,const int VertCount)
 			zmax.X = Position[i].X; zmax.Y = Position[i].Y; zmax.Z = Position[i].Z;
 		}
 	}
-	
+
 	// xspan = distance between the 2 points xmin and xmax squared.
 	// same goes for yspan and zspan.
 	dx = xmax.X - xmin.X;
@@ -186,7 +180,7 @@ inline SphereClass::SphereClass(const Vector3 *Position,const int VertCount)
 		dia2 = zmax;
 	}
 
-	
+
 	// Compute initial center and radius and radius squared
 	Vector3 center;
 	center.X = (dia1.X + dia2.X) / 2.0f;
@@ -200,7 +194,7 @@ inline SphereClass::SphereClass(const Vector3 *Position,const int VertCount)
 	double radsqr = dx*dx + dy*dy + dz*dz;
 	double radius = sqrt(radsqr);
 
-	
+
 	// SECOND PASS:
 	// Increment current sphere if any points fall outside of it.
 	for (i=0; i<VertCount; i++) {
@@ -208,15 +202,15 @@ inline SphereClass::SphereClass(const Vector3 *Position,const int VertCount)
 		dx = Position[i].X - center.X;
 		dy = Position[i].Y - center.Y;
 		dz = Position[i].Z - center.Z;
-		
+
 		double testrad2 = dx*dx + dy*dy + dz*dz;
 
 		if (testrad2 > radsqr) {
-			
+
 			// this point was outside the old sphere, compute a new
 			// center point and radius which contains this point
 			double testrad = sqrt(testrad2);
-			
+
 			// adjust center and radius
 			radius = (radius + testrad) / 2.0;
 			radsqr = radius * radius;
@@ -431,7 +425,7 @@ inline SphereClass & SphereClass::operator *= (const Matrix3D & m)
  * HISTORY:                                                                                    *
  *   8/12/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-inline bool Spheres_Intersect(const SphereClass & s0,const SphereClass & s1) 
+inline bool Spheres_Intersect(const SphereClass & s0,const SphereClass & s1)
 {
 	Vector3 delta = s0.Center - s1.Center;
 	float dist2 = Vector3::Dot_Product(delta, delta);
@@ -545,8 +539,3 @@ inline SphereClass operator * (const Matrix3D & m, const SphereClass & s)
 {
 	return Transform_Sphere(m,s);
 }
-
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/tcbspline.cpp b/Core/Libraries/Source/WWVegas/WWMath/tcbspline.cpp
index bfbb8f2b9b3..64965b5a29e 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/tcbspline.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/tcbspline.cpp
@@ -52,11 +52,11 @@ DECLARE_FORCE_LINK(tcbspline);
 */
 SimplePersistFactoryClass<TCBSpline3DClass,WWMATH_CHUNKID_TCBSPLINE3D>	_TCBSpline3DFactory;
 
-enum 
+enum
 {
 	// ID's used by TCBSpline3D
-	TCB3D_CHUNK_HERMITE3D					= 0x02071009,	
-	TCB3D_CHUNK_PARAMS,			
+	TCB3D_CHUNK_HERMITE3D					= 0x02071009,
+	TCB3D_CHUNK_PARAMS,
 };
 
 
@@ -115,7 +115,7 @@ void TCBSpline3DClass::Update_Tangents(void)
 		}
 	}
 
-	// First and Last Key: 
+	// First and Last Key:
 	// Only need to compute the OutTangent for key[0] and the InTangent for key[end]
 	int end = Keys.Count() - 1;
 	Tangents[0].InTangent.Set(0,0,0);
@@ -137,9 +137,9 @@ void TCBSpline3DClass::Update_Tangents(void)
 
 		Vector3::Add(k0*dp_in, k1*dp_out, &Tangents[end].InTangent);
 		Vector3::Add(k2*dp_out, k3*dp_in, &Tangents[0].OutTangent);
-		
+
 	} else {
-		
+
 		float k2 = 0.25f * ((1-Params[0].Tension) * (1+Params[0].Continuity) * (1-Params[0].Bias));
 		float k3 = 0.25f * ((1-Params[0].Tension) * (1-Params[0].Continuity) * (1+Params[0].Bias));
 
@@ -200,7 +200,7 @@ bool TCBSpline3DClass::Save(ChunkSaveClass &csave)
 	csave.Begin_Chunk(TCB3D_CHUNK_HERMITE3D);
 	HermiteSpline3DClass::Save(csave);
 	csave.End_Chunk();
-	
+
 	csave.Begin_Chunk(TCB3D_CHUNK_PARAMS);
 	for (int i=0; i<Params.Count(); i++) {
 		csave.Write(&(Params[i].Tension),sizeof(Params[i].Tension));
@@ -221,8 +221,8 @@ bool TCBSpline3DClass::Load(ChunkLoadClass &cload)
 
 	// read in the chunks
 	while (cload.Open_Chunk()) {
-		
-		switch(cload.Cur_Chunk_ID()) 
+
+		switch(cload.Cur_Chunk_ID())
 		{
 			case TCB3D_CHUNK_HERMITE3D:
 				HermiteSpline3DClass::Load(cload);
@@ -238,7 +238,7 @@ bool TCBSpline3DClass::Load(ChunkLoadClass &cload)
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
diff --git a/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h b/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h
index c7538709f90..23ec6b7e45e 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef TCBSPLINE_H
-#define TCBSPLINE_H
 
 #include "hermitespline.h"
 
@@ -66,7 +60,7 @@ class TCBSpline3DClass : public HermiteSpline3DClass
 	virtual bool								Save(ChunkSaveClass &csave);
 	virtual bool								Load(ChunkLoadClass &cload);
 
-protected:	
+protected:
 
 	class TCBClass
 	{
@@ -80,7 +74,3 @@ class TCBSpline3DClass : public HermiteSpline3DClass
 
 	DynamicVectorClass<TCBClass> Params;
 };
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/tri.cpp b/Core/Libraries/Source/WWVegas/WWMath/tri.cpp
index 3c264bd6f31..854991cf587 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/tri.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/tri.cpp
@@ -40,11 +40,11 @@
 #include "vector2.h"
 
 
-struct FDPRec 
-{ 
-	int axis1; 
-	int axis2; 
-	int axis3; 
+struct FDPRec
+{
+	int axis1;
+	int axis2;
+	int axis3;
 };
 
 static inline void find_dominant_plane_fast(const TriClass & tri, FDPRec& info)
@@ -66,13 +66,13 @@ static inline void find_dominant_plane_fast(const TriClass & tri, FDPRec& info)
 	float val = x;
 	int ni = 0;
 
-	if (y > val) 
+	if (y > val)
 	{
 		ni = 1;
 		val = y;
 	}
 
-	if (z > val) 
+	if (z > val)
 	{
 		ni = 2;
 	}
@@ -103,21 +103,21 @@ static inline void find_dominant_plane(const TriClass & tri, int * axis1,int * a
 	/*
 	** return the indices of the two axes perpendicular
 	*/
-	switch (ni) 
+	switch (ni)
 	{
-	case 0: 
+	case 0:
 		// Dominant is the X axis
 		*axis1 = 1;
 		*axis2 = 2;
 		*axis3 = 0;
 		break;
-	case 1: 
+	case 1:
 		// Dominant is the Y axis
 		*axis1 = 0;
 		*axis2 = 2;
 		*axis3 = 1;
 		break;
-	case 2: 
+	case 2:
 		// Dominant is the Z axis
 		*axis1 = 0;
 		*axis2 = 1;
@@ -163,19 +163,19 @@ void TriClass::Find_Dominant_Plane(int * axis1,int * axis2) const
 	/*
 	** return the indices of the two axes perpendicular
 	*/
-	switch (ni) 
+	switch (ni)
 	{
-	case 0: 
+	case 0:
 		// Dominant is the X axis
 		*axis1 = 1;
 		*axis2 = 2;
 		break;
-	case 1: 
+	case 1:
 		// Dominant is the Y axis
 		*axis1 = 0;
 		*axis2 = 2;
 		break;
-	case 2: 
+	case 2:
 		// Dominant is the Z axis
 		*axis1 = 0;
 		*axis2 = 1;
@@ -219,13 +219,13 @@ bool TriClass::Contains_Point(const Vector3 & ipoint) const
 	/*
 	** determine the 2d vectors on the dominant plane from the first vertex to the other two
 	*/
-	float u1 = (*V[1])[axis1] - (*V[0])[axis1]; 
+	float u1 = (*V[1])[axis1] - (*V[0])[axis1];
 	float v1 = (*V[1])[axis2] - (*V[0])[axis2];
-	float	u2 = (*V[2])[axis1] - (*V[0])[axis1]; 
+	float	u2 = (*V[2])[axis1] - (*V[0])[axis1];
 	float	v2 = (*V[2])[axis2] - (*V[0])[axis2];
 
 	float alpha, beta;
-	bool intersect = false; 
+	bool intersect = false;
 
 	// calculate alpha and beta as normalized (0..1) percentages across the 2d projected triangle
 	// and do bounds checking (sum <= 1)  to determine whether or not the triangle intersection occurs.
@@ -265,7 +265,7 @@ bool TriClass::Contains_Point(const Vector3 & ipoint) const
 		points[vi] = *(V[vi]);
 		points[vi][axis3] = 0.0f;
 	}
-	
+
 	bool side[3];
 	Vector3 edge;
 	Vector3 cross;
@@ -274,7 +274,7 @@ bool TriClass::Contains_Point(const Vector3 & ipoint) const
 	for (vi=0; vi<3; vi++) {
 		edge = points[(vi+1)%3] - points[vi];
 		dp = test_point - points[vi];
-	
+
 		Vector3::Cross_Product(dp,edge,&cross);
 		side[vi] = (cross[axis3] > 0.0f);
 	}
@@ -344,10 +344,10 @@ bool TriClass::Contains_Point(const Vector3 & ipoint) const
 	Vector2 dp;
 
 	for (vi=0; vi<3; vi++) {
-		
+
 		int va=vi;
 		int vb=(vi+1)%3;
-		
+
 		edge.Set((*V[vb])[axis1] - (*V[va])[axis1] , (*V[vb])[axis2] - (*V[va])[axis2]);
 		dp.Set(ipoint[axis1] - (*V[va])[axis1] , ipoint[axis2] - (*V[va])[axis2]);
 		float cross = edge.X * dp.Y - edge.Y * dp.X;
diff --git a/Core/Libraries/Source/WWVegas/WWMath/tri.h b/Core/Libraries/Source/WWVegas/WWMath/tri.h
index 5c83a29d291..77c9889e0bf 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/tri.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/tri.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef TRI_H
-#define TRI_H
 
 #include "always.h"
 #include "vector4.h"
@@ -53,8 +47,8 @@
 ** TriClass
 ** When the math library needs to deal with triangles, this will be the form used.
 ** The initial reason for this class is for Commando's collision detection code.  Initially
-** I wrote custom code inside the render object for the terrain to perform collision 
-** detection. Moving the low-level geometrical collision code into the math library makes it 
+** I wrote custom code inside the render object for the terrain to perform collision
+** detection. Moving the low-level geometrical collision code into the math library makes it
 ** more re-useable and independent from changes in the rendering code.
 */
 class TriClass
@@ -153,7 +147,7 @@ inline bool Point_In_Triangle_2D(const Vector3 &tri_point0, const Vector3 &tri_p
 
 		// The triangle is degenerate. This should be a rare case, so it does not matter much if it
 		// is a little slower than the non-colinear case.
-		
+
 		// Find the two outer points along the triangle's line ('start' and 'end' points)
 		float p0p1dist2 = p0p1.Length2();
 		float p1p2dist2 = p1p2.Length2();
@@ -296,11 +290,9 @@ inline bool Cast_Semi_Infinite_Axis_Aligned_Ray_To_Triangle(const Vector3 &tri_p
 						flags |= TRI_RAYCAST_FLAG_START_IN_TRI;
 					}
 				}
-			}	// if (result == 0.0f)
-		}	// else (result < 0.0f)
-	}	// if Point_In_Triangle_2D()
+			}
+		}
+	}
 
 	return retval;
 }
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h b/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h
index 07c12a2eb8b..defa05e7216 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h
@@ -33,16 +33,12 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if defined(_MSC_VER)
-#pragma once
-#endif
 
-#ifndef V3_RND_H
-#define V3_RND_H
+#pragma once
 
 #include "always.h"
 #include "vector3.h"
-#include "RANDOM.H"
+#include "RANDOM.h"
 #include <limits.h>
 
 /*
@@ -58,7 +54,7 @@ class Vector3Randomizer {
 
 	public:
 
-		enum 
+		enum
 		{
 			CLASSID_UNKNOWN		= 0xFFFFFFFF,
 			CLASSID_SOLIDBOX		= 0,
@@ -228,8 +224,3 @@ class Vector3SolidCylinderRandomizer : public Vector3Randomizer {
 		float	Extent;
 		float	Radius;
 };
-
-
-#endif
-
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/vector2.h b/Core/Libraries/Source/WWVegas/WWMath/vector2.h
index 71135b52968..9ba45fe4d4d 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/vector2.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/vector2.h
@@ -17,31 +17,31 @@
 */
 
 /* $Header: /Commando/Code/wwmath/vector2.h 24    7/06/01 9:43a Byon_g $ */
-/*********************************************************************************************** 
- ***                  Confidential - Westwood Studios                                        *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Westwood 3D                                                  * 
- *                                                                                             * 
- *                    File Name : VECTOR2.H                                                    * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 02/24/97                                                     *  
- *                                                                                             * 
- *                  Last Update : February 24, 1997 [GH]                                       * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Scalar Division Operator -- Divide a vector by a scalar                                   * 
- *   Scalar Multiply Operator -- Multiply a vector by a scalar                                 * 
- *   Vector Addition Operator -- Add two vectors                                               * 
- *   Vector Subtraction Operator -- Subract two vectors                                        * 
- *   Vector Inner Product Operator -- Compute the inner or dot product                         * 
- *   Vector Equality Operator -- Detemine if two vectors are identical                         * 
- *   Equal_Within_Epsilon -- Determine if two vectors are identical within                     * 
- *   Vector Inequality Operator -- Detemine if two vectors are identical                       * 
- *   Swap -- swap two Vector2's                                                                * 
+/***********************************************************************************************
+ ***                  Confidential - Westwood Studios                                        ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Westwood 3D                                                  *
+ *                                                                                             *
+ *                    File Name : VECTOR2.h                                                    *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 02/24/97                                                     *
+ *                                                                                             *
+ *                  Last Update : February 24, 1997 [GH]                                       *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Scalar Division Operator -- Divide a vector by a scalar                                   *
+ *   Scalar Multiply Operator -- Multiply a vector by a scalar                                 *
+ *   Vector Addition Operator -- Add two vectors                                               *
+ *   Vector Subtraction Operator -- Subract two vectors                                        *
+ *   Vector Inner Product Operator -- Compute the inner or dot product                         *
+ *   Vector Equality Operator -- Detemine if two vectors are identical                         *
+ *   Equal_Within_Epsilon -- Determine if two vectors are identical within                     *
+ *   Vector Inequality Operator -- Detemine if two vectors are identical                       *
+ *   Swap -- swap two Vector2's                                                                *
  *   Vector2::Is_Valid -- Verifies that all components are valid floats                        *
  *	  Vector2::Update_Min -- sets each component of the vector to the min of this and a.        *
  *	  Vector2::Update_Max -- sets each component of the vector to the max of this and a.        *
@@ -49,12 +49,7 @@
  *   Vector2::Lerp -- linearly interpolates two Vector2's                                      *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VECTOR2_H
-#define VECTOR2_H
 
 #include "always.h"
 #include "wwmath.h"
@@ -85,16 +80,16 @@ class Vector2
 	WWINLINE Vector2(const Vector2 & v) { X = v.X; Y = v.Y; }
 	WWINLINE Vector2(float x, float y) { X = x; Y = y; }
 	WWINLINE Vector2(const float vector[2]) { X = vector[0]; Y = vector[1]; }
-	
-	
+
+
 	// Assignment
-	WWINLINE Vector2 & operator = (const Vector2 & v) { X = v[0]; Y = v[1]; return *this; }	
+	WWINLINE Vector2 & operator = (const Vector2 & v) { X = v[0]; Y = v[1]; return *this; }
 	WWINLINE void	Set(float x, float y) { X = x; Y = y; }
 	WWINLINE void	Set(const Vector2 & v) { X = v.X; Y = v.Y; }
 
 	// Array access
-	WWINLINE float &	operator [](int i) { return (&X)[i]; }     
-	WWINLINE const float &  operator [](int i) const { return (&X)[i]; }  
+	WWINLINE float &	operator [](int i) { return (&X)[i]; }
+	WWINLINE const float &  operator [](int i) const { return (&X)[i]; }
 
 	// normalize, compute length
 	WWINLINE void	Normalize(void);
@@ -102,11 +97,11 @@ class Vector2
 	WWINLINE float Length2(void) const;
 
 	// unary operators
-	WWINLINE Vector2 operator-() const { return Vector2(-X,-Y); } 
-	WWINLINE Vector2 operator+() const { return *this; } 
+	WWINLINE Vector2 operator-() const { return Vector2(-X,-Y); }
+	WWINLINE Vector2 operator+() const { return *this; }
 
-	WWINLINE Vector2 & operator += (const Vector2 & v) { X += v.X; Y += v.Y; return *this; }	
-	WWINLINE Vector2 & operator -= (const Vector2 & v) { X -= v.X; Y -= v.Y; return *this; }		
+	WWINLINE Vector2 & operator += (const Vector2 & v) { X += v.X; Y += v.Y; return *this; }
+	WWINLINE Vector2 & operator -= (const Vector2 & v) { X -= v.X; Y -= v.Y; return *this; }
 	WWINLINE Vector2 & operator *= (float k) { X = (float)(X*k); Y=(float)(Y*k); return *this; }
 	WWINLINE Vector2 & operator /= (float k) { k=1.0f/k; X*=k; Y*=k; return *this; }
 
@@ -125,7 +120,7 @@ class Vector2
 
 	// dot product between a and perpendicular vector to b
 	static float Perp_Dot_Product(const Vector2 &a,const Vector2 &b);
-	
+
 	// Equality operators
 	friend bool operator == (const Vector2 &a,const Vector2 &b);
 	friend bool operator != (const Vector2 &a,const Vector2 &b);
@@ -154,17 +149,17 @@ class Vector2
 };
 
 
-/************************************************************************** 
- * Scalar Multiply Operator -- Multiply a vector by a scalar              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Scalar Multiply Operator -- Multiply a vector by a scalar              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 WWINLINE Vector2 operator * (const Vector2 &a,float k)
 {
@@ -180,16 +175,16 @@ WWINLINE Vector2 operator * (float k, const Vector2 &a)
 	return Vector2(a0k,a1k);
 }
 
-/************************************************************************** 
- * Scalar Division Operator -- Divide a vector by a scalar                * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Scalar Division Operator -- Divide a vector by a scalar                *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE Vector2 operator / (const Vector2 &a,float k)
 {
@@ -199,17 +194,17 @@ WWINLINE Vector2 operator / (const Vector2 &a,float k)
 	return Vector2(a0ook,a1ook);
 }
 
-/************************************************************************** 
- * Vector Addition Operator -- Add two vectors                            * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Vector Addition Operator -- Add two vectors                            *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 WWINLINE Vector2 operator + (const Vector2 &a,const Vector2 &b)
 {
@@ -219,17 +214,17 @@ WWINLINE Vector2 operator + (const Vector2 &a,const Vector2 &b)
 						);
 }
 
-/************************************************************************** 
- * Vector Subtraction Operator -- Subract two vectors                     * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Vector Subtraction Operator -- Subract two vectors                     *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 WWINLINE Vector2 operator - (const Vector2 &a,const Vector2 &b)
 {
@@ -239,16 +234,16 @@ WWINLINE Vector2 operator - (const Vector2 &a,const Vector2 &b)
 						);
 }
 
-/************************************************************************** 
- * Vector Inner Product -- Compute the inner or dot product of two vector * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Inner Product -- Compute the inner or dot product of two vector *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE float operator * (const Vector2 &a,const Vector2 &b)
 {
@@ -265,16 +260,16 @@ WWINLINE float Vector2::Perp_Dot_Product(const Vector2 &a,const Vector2 &b)
 	return a.X * -b.Y + a.Y * b.X;
 }
 
-/************************************************************************** 
- * Vector Equality Operator -- Detemine if two vectors are identical      * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Equality Operator -- Detemine if two vectors are identical      *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool operator == (const Vector2 &a,const Vector2 &b)
 {
@@ -283,16 +278,16 @@ WWINLINE bool operator == (const Vector2 &a,const Vector2 &b)
 	return ( a0b0 & a1b1);
 }
 
-/************************************************************************** 
- * Vector Inequality Operator -- Detemine if two vectors are identical    * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Inequality Operator -- Detemine if two vectors are identical    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool operator != (const Vector2 &a,const Vector2 &b)
 {
@@ -301,32 +296,32 @@ WWINLINE bool operator != (const Vector2 &a,const Vector2 &b)
 	return ( a0b0 | a1b1);
 }
 
-/************************************************************************** 
- * Equal_Within_Epsilon -- Determine if two vectors are identical within e* 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Equal_Within_Epsilon -- Determine if two vectors are identical within e*
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool Equal_Within_Epsilon(const Vector2 &a,const Vector2 &b,float epsilon)
 {
    return( (WWMath::Fabs(a.X - b.X) < epsilon) && (WWMath::Fabs(a.Y - b.Y) < epsilon) );
 }
 
-/************************************************************************** 
- * Vector2::Normalize -- Normalizes the vector.                           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector2::Normalize -- Normalizes the vector.                           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE void Vector2::Normalize()
 {
@@ -348,67 +343,67 @@ WWINLINE Vector2 Normalize(const Vector2 & vec)
 	return Vector2(0.0f,0.0f);
 }
 
-/************************************************************************** 
- * Vector2::Length -- Returns the length of the vector                    * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector2::Length -- Returns the length of the vector                    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE float Vector2::Length() const
 {
 	return (float)WWMath::Sqrt(Length2());
 }
 
-/************************************************************************** 
- * Vector2::Length -- Returns the square of the length of the vector      * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector2::Length -- Returns the square of the length of the vector      *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE float Vector2::Length2() const
 {
 	return (X*X + Y*Y);
 }
 
-/************************************************************************** 
- * Vector2::Rotate -- Rotate vector                                       * 
- *                                                                        * 
+/**************************************************************************
+ * Vector2::Rotate -- Rotate vector                                       *
+ *                                                                        *
  * INPUT:                                                                 *
- * float theta - angle to rotate                                          * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+ * float theta - angle to rotate                                          *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE void Vector2::Rotate(float theta)
 {
 	Rotate(WWMath::Sin(theta), WWMath::Cos(theta));
 }
 
-/************************************************************************** 
- * Vector2::Rotate -- Rotate vector                                       * 
- *                                                                        * 
- * INPUT:                                                                 * 
- * s - sine of the angle                                                  * 
- * c - cosine of the angle                                                * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector2::Rotate -- Rotate vector                                       *
+ *                                                                        *
+ * INPUT:                                                                 *
+ * s - sine of the angle                                                  *
+ * c - cosine of the angle                                                *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE void Vector2::Rotate(float s, float c)
 {
@@ -418,44 +413,44 @@ WWINLINE void Vector2::Rotate(float s, float c)
 	Y = new_y;
 }
 
-/************************************************************************** 
- * Vector2::Rotate -- Rotate towards given vector (stop on reaching it)   * 
- *                                                                        * 
+/**************************************************************************
+ * Vector2::Rotate -- Rotate towards given vector (stop on reaching it)   *
+ *                                                                        *
  * INPUT:                                                                 *
- * float theta - angle to rotate                                          * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- * bool - true if we have reached the desired vector                      * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- * This function assumes both vectors are normalized!                     * 
- *                                                                        * 
- * HISTORY:                                                               * 
+ * float theta - angle to rotate                                          *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ * bool - true if we have reached the desired vector                      *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ * This function assumes both vectors are normalized!                     *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool Vector2::Rotate_Towards_Vector(Vector2 &target, float max_theta, bool & positive_turn)
 {
 	return Rotate_Towards_Vector(target, WWMath::Sin(max_theta), WWMath::Cos(max_theta), positive_turn);
 }
 
-/************************************************************************** 
- * Vector2::Rotate -- Rotate towards given vector (stop on reaching it)   * 
- *                                                                        * 
+/**************************************************************************
+ * Vector2::Rotate -- Rotate towards given vector (stop on reaching it)   *
+ *                                                                        *
  * INPUT:                                                                 *
- * s - sine of the angle                                                  * 
- * c - cosine of the angle                                                * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- * bool - true if we have reached the desired vector                      * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- * This function assumes both vectors are normalized!                     * 
- *                                                                        * 
- * HISTORY:                                                               * 
+ * s - sine of the angle                                                  *
+ * c - cosine of the angle                                                *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ * bool - true if we have reached the desired vector                      *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ * This function assumes both vectors are normalized!                     *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool Vector2::Rotate_Towards_Vector(Vector2 &target, float max_s, float max_c, bool & positive_turn)
 {
 	bool return_value = false;
-	
+
 	positive_turn = Vector2::Perp_Dot_Product(target, *this) > 0.0f;
 
 	if (Vector2::Dot_Product(*this, target) >= max_c) {
@@ -473,17 +468,17 @@ WWINLINE bool Vector2::Rotate_Towards_Vector(Vector2 &target, float max_s, float
 	return return_value;
 }
 
-/*********************************************************************************************** 
- * Swap -- swap two Vector2's                                                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Swap -- swap two Vector2's                                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Swap(Vector2 & a,Vector2 & b)
 {
@@ -524,7 +519,7 @@ WWINLINE bool Vector2::Is_Valid(void) const
  *   06/12/00   IML : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Vector2::Update_Min (const Vector2 & a)
-{	
+{
 	if (a.X < X) X = a.X;
 	if (a.Y < Y) Y = a.Y;
 }
@@ -543,7 +538,7 @@ WWINLINE void Vector2::Update_Min (const Vector2 & a)
  *   06/12/00   IML : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Vector2::Update_Max (const Vector2 & a)
-{	
+{
 	if (a.X > X) X = a.X;
 	if (a.Y > Y) Y = a.Y;
 }
@@ -608,7 +603,7 @@ WWINLINE float Quick_Distance(float x1, float y1, float x2, float y2)
 	if (x_diff > y_diff)
 	{
 		return ((y_diff / 2) + x_diff);
-	} 
+	}
 	else
 	{
 		return ((x_diff / 2) + y_diff);
@@ -617,7 +612,7 @@ WWINLINE float Quick_Distance(float x1, float y1, float x2, float y2)
 
 WWINLINE float Vector2::Quick_Distance(const Vector2 &a, const Vector2 &b)
 {
-	return ::Quick_Distance(a.X, a.Y, b.X, b.Y);	
+	return ::Quick_Distance(a.X, a.Y, b.X, b.Y);
 }
 
 
@@ -642,7 +637,7 @@ WWINLINE float Distance(float x1, float y1, float x2, float y2)
 {
 	float x_diff = x1 - x2;
 	float y_diff = y1 - y2;
-	
+
 	return (WWMath::Sqrt((x_diff * x_diff) + (y_diff * y_diff)));
 }
 
@@ -665,7 +660,3 @@ WWINLINE void Vector2::Lerp(const Vector2 & a,const Vector2 & b,float t,Vector2
 	set_result->X = (a.X + (b.X - a.X)*t);
    set_result->Y = (a.Y + (b.Y - a.Y)*t);
 }
-
-
-#endif /* VECTOR2_H */
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/vector2i.h b/Core/Libraries/Source/WWVegas/WWMath/vector2i.h
index b424697d546..0645d090a07 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/vector2i.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/vector2i.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VECTOR2I_H
-#define VECTOR2I_H
 
 #include "always.h"
 
@@ -53,7 +47,7 @@ class Vector2i
 
 	WWINLINE Vector2i(void);
 	WWINLINE Vector2i(int i,int j);
-	
+
 	WWINLINE void Set(int i, int j);
 
 	WWINLINE void Swap(Vector2i & other);
@@ -69,29 +63,29 @@ WWINLINE Vector2i::Vector2i(void)
 {
 }
 
-WWINLINE Vector2i::Vector2i(int i,int j) 
-{ 
-	I = i; J = j; 
+WWINLINE Vector2i::Vector2i(int i,int j)
+{
+	I = i; J = j;
 }
 
 WWINLINE bool Vector2i::operator == (const Vector2i & v) const
-{ 
-	return (I == v.I && J == v.J );	
+{
+	return (I == v.I && J == v.J );
 }
 
 WWINLINE bool Vector2i::operator !=	(const Vector2i& v) const
-{ 
-	return !(I == v.I && J == v.J);	
+{
+	return !(I == v.I && J == v.J);
 }
 
-WWINLINE const int& Vector2i::operator[] (int n) const				
-{ 
-	return ((int*)this)[n]; 
+WWINLINE const int& Vector2i::operator[] (int n) const
+{
+	return ((int*)this)[n];
 }
 
 WWINLINE int& Vector2i::operator[] (int n)
-{ 
-	return ((int*)this)[n]; 
+{
+	return ((int*)this)[n];
 }
 
 WWINLINE void Vector2i::Set(int i, int j) { I = i; J = j; }
@@ -108,6 +102,3 @@ WWINLINE void Vector2i::Swap(Vector2i & other)
 	other.J ^= J;
 	J ^= other.J;
 }
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWMath/vector3.h b/Core/Libraries/Source/WWVegas/WWMath/vector3.h
index 1375add3ca5..efd75af2fd3 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/vector3.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/vector3.h
@@ -17,20 +17,20 @@
 */
 
 /* $Header: /Commando/Code/wwmath/vector3.h 40    5/11/01 7:11p Jani_p $ */
-/*********************************************************************************************** 
- ***                  Confidential - Westwood Studios                                        *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Westwood 3D                                                  * 
- *                                                                                             * 
- *                    File Name : VECTOR3.H                                                    *  
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             *  
- *                   Start Date : 02/24/97                                                     * 
- *                                                                                             * 
- *                  Last Update : February 24, 1997 [GH]                                       * 
- *                                                                                             * 
+/***********************************************************************************************
+ ***                  Confidential - Westwood Studios                                        ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Westwood 3D                                                  *
+ *                                                                                             *
+ *                    File Name : VECTOR3.h                                                    *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 02/24/97                                                     *
+ *                                                                                             *
+ *                  Last Update : February 24, 1997 [GH]                                       *
+ *                                                                                             *
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  *   Scalar Division Operator -- Divide a vector by a scalar                                   *
@@ -63,12 +63,7 @@
  *   Vector3::Is_Valid -- Verifies that each component of this vector is a valid float         *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VECTOR3_H
-#define VECTOR3_H
 
 #include "always.h"
 #include "wwmath.h"
@@ -97,15 +92,15 @@ class Vector3
 	WWINLINE Vector3(const Vector3 & v) { X = v.X; Y = v.Y; Z = v.Z; }
 	WWINLINE Vector3(float x, float y, float z) { X = x; Y = y; Z = z; }
 	WWINLINE Vector3(const float vector[3]) { X = vector[0]; Y = vector[1]; Z = vector[2]; }
-	
+
 	// Assignment
-	WWINLINE Vector3 & operator = (const Vector3 & v) { X = v.X; Y = v.Y; Z = v.Z; return *this; }	
+	WWINLINE Vector3 & operator = (const Vector3 & v) { X = v.X; Y = v.Y; Z = v.Z; return *this; }
 	WWINLINE void	Set(float x, float y, float z) { X = x; Y = y; Z = z; }
 	WWINLINE void	Set(const Vector3 & that) { X = that.X; Y = that.Y; Z = that.Z; }
 
 	// Array access
-	WWINLINE float &	operator [](int i) { return (&X)[i]; }     
-	WWINLINE const float &  operator [](int i) const { return (&X)[i]; }  
+	WWINLINE float &	operator [](int i) { return (&X)[i]; }
+	WWINLINE const float &  operator [](int i) const { return (&X)[i]; }
 
 	// normalize, compute length
 	void	Normalize(void);
@@ -123,11 +118,11 @@ class Vector3
 	WWINLINE void	Rotate_Z(float s_angle,float c_angle);
 
 	// unary operators
-	WWINLINE Vector3 operator-() const { return(Vector3(-X,-Y,-Z)); } 
-	WWINLINE Vector3 operator+() const { return *this; } 
+	WWINLINE Vector3 operator-() const { return(Vector3(-X,-Y,-Z)); }
+	WWINLINE Vector3 operator+() const { return *this; }
 
-	WWINLINE Vector3 & operator += (const Vector3 & v) { X += v.X; Y += v.Y; Z += v.Z; return *this; }	
-	WWINLINE Vector3 & operator -= (const Vector3 & v) { X -= v.X; Y -= v.Y; Z -= v.Z; return *this; }		
+	WWINLINE Vector3 & operator += (const Vector3 & v) { X += v.X; Y += v.Y; Z += v.Z; return *this; }
+	WWINLINE Vector3 & operator -= (const Vector3 & v) { X -= v.X; Y -= v.Y; Z -= v.Z; return *this; }
 	WWINLINE Vector3 & operator *= (float k) { X = X*k; Y=Y*k; Z=Z*k; return *this; }
 	WWINLINE Vector3 & operator /= (float k) { float ook=1.0f/k; X=X*ook; Y=Y*ook; Z=Z*ook; return *this; }
 
@@ -148,7 +143,7 @@ class Vector3
 	// dot product / inner product
 	WWINLINE friend float operator * (const Vector3 &a,const Vector3 &b);
 	static WWINLINE float Dot_Product(const Vector3 &a,const Vector3 &b);
-	
+
 	// cross product / outer product
 #ifdef ALLOW_TEMPORARIES
 	static WWINLINE Vector3 Cross_Product(const Vector3 &a,const Vector3 &b);
@@ -162,7 +157,7 @@ class Vector3
 	// add and subtract without return by value
 	static WWINLINE void Add(const Vector3 & a,const Vector3 & b,Vector3 * c);
 	static WWINLINE void Subtract(const Vector3 & a,const Vector3 & b,Vector3 * c);
-	
+
 	// Line intersection functions.
 	static WWINLINE float Find_X_At_Y(float y, const Vector3 &p1, const Vector3 &p2);
 	static WWINLINE float Find_X_At_Z(float z, const Vector3 &p1, const Vector3 &p2);
@@ -196,17 +191,17 @@ class Vector3
 };
 
 
-/************************************************************************** 
- * Scalar Multiply Operator -- Multiply a vector by a scalar              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Scalar Multiply Operator -- Multiply a vector by a scalar              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 WWINLINE Vector3 operator * (const Vector3 &a,float k)
 {
@@ -218,16 +213,16 @@ WWINLINE Vector3 operator * (float k, const Vector3 &a)
 	return Vector3((a.X * k),(a.Y * k),(a.Z * k));
 }
 
-/************************************************************************** 
- * Scalar Division Operator -- Divide a vector by a scalar                * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Scalar Division Operator -- Divide a vector by a scalar                *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE Vector3 operator / (const Vector3 &a,float k)
 {
@@ -235,17 +230,17 @@ WWINLINE Vector3 operator / (const Vector3 &a,float k)
 	return Vector3((a.X * ook),(a.Y * ook),(a.Z * ook));
 }
 
-/************************************************************************** 
- * Vector Addition Operator -- Add two vectors                            * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Vector Addition Operator -- Add two vectors                            *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 WWINLINE Vector3 operator + (const Vector3 &a,const Vector3 &b)
 {
@@ -256,17 +251,17 @@ WWINLINE Vector3 operator + (const Vector3 &a,const Vector3 &b)
 						);
 }
 
-/************************************************************************** 
- * Vector Subtraction Operator -- Subract two vectors                     * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Vector Subtraction Operator -- Subract two vectors                     *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 WWINLINE Vector3 operator - (const Vector3 &a,const Vector3 &b)
 {
@@ -277,93 +272,93 @@ WWINLINE Vector3 operator - (const Vector3 &a,const Vector3 &b)
 						);
 }
 
-/************************************************************************** 
- * Vector Inner Product -- Compute the inner or dot product of two vector * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Inner Product -- Compute the inner or dot product of two vector *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE float operator * (const Vector3 &a,const Vector3 &b)
 {
-	return	a.X*b.X + 
-				a.Y*b.Y + 
+	return	a.X*b.X +
+				a.Y*b.Y +
 				a.Z*b.Z;
 }
 
 WWINLINE float Vector3::Dot_Product(const Vector3 &a,const Vector3 &b)
 {
-	return a.X*b.X + 
-				a.Y*b.Y + 
+	return a.X*b.X +
+				a.Y*b.Y +
 				a.Z*b.Z;
 }
 
 
-/************************************************************************** 
- * Vector Equality Operator -- Determine if two vectors are identical     * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Equality Operator -- Determine if two vectors are identical     *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool operator == (const Vector3 &a,const Vector3 &b)
 {
 	return ( (a.X == b.X) && (a.Y == b.Y) && (a.Z == b.Z));
 }
 
-/************************************************************************** 
- * Vector Inequality Operator -- Determine if two vectors are identical   * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Inequality Operator -- Determine if two vectors are identical   *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool operator != (const Vector3 &a,const Vector3 &b)
 {
 	return ( (a.X != b.X) || (a.Y != b.Y) || (a.Z != b.Z));
 }
 
-/************************************************************************** 
- * Equal_Within_Epsilon -- Determine if two vectors are identical within e* 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Equal_Within_Epsilon -- Determine if two vectors are identical within e*
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool Equal_Within_Epsilon(const Vector3 &a,const Vector3 &b,float epsilon)
 {
-   return(	(WWMath::Fabs(a.X - b.X) < epsilon) && 
-				(WWMath::Fabs(a.Y - b.Y) < epsilon) && 
+   return(	(WWMath::Fabs(a.X - b.X) < epsilon) &&
+				(WWMath::Fabs(a.Y - b.Y) < epsilon) &&
 				(WWMath::Fabs(a.Z - b.Z) < epsilon)	);
 }
 
 
-/************************************************************************** 
- * Cross_Product -- compute the cross product of two vectors              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Cross_Product -- compute the cross product of two vectors              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 #ifdef ALLOW_TEMPORARIES
 WWINLINE Vector3 Vector3::Cross_Product(const Vector3 &a,const Vector3 &b)
@@ -408,21 +403,21 @@ WWINLINE float Vector3::Cross_Product_Z(const Vector3 &a,const Vector3 &b)
    return a.X * b.Y - a.Y * b.X;
 }
 
-/************************************************************************** 
- * Vector3::Normalize -- Normalizes the vector.                           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector3::Normalize -- Normalizes the vector.                           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE void Vector3::Normalize()
 {
 	float len2 = Length2();
-	if (len2 != 0.0f) 
+	if (len2 != 0.0f)
 	{
 		float oolen = WWMath::Inv_Sqrt(len2);
 		X *= oolen;
@@ -435,7 +430,7 @@ WWINLINE void Vector3::Normalize()
 WWINLINE Vector3 Normalize(const Vector3 & vec)
 {
 	float len2 = vec.Length2();
-	if (len2 != 0.0f) 
+	if (len2 != 0.0f)
 	{
 		float oolen = WWMath::Inv_Sqrt(len2);
 		return vec * oolen;
@@ -444,32 +439,32 @@ WWINLINE Vector3 Normalize(const Vector3 & vec)
 }
 #endif
 
-/************************************************************************** 
- * Vector3::Length -- Returns the length of the vector                    * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector3::Length -- Returns the length of the vector                    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE float Vector3::Length() const
 {
 	return WWMath::Sqrt(Length2());
 }
 
-/************************************************************************** 
- * Vector3::Length2 -- Returns the square of the length of the vector     * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector3::Length2 -- Returns the square of the length of the vector     *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE float Vector3::Length2() const
 {
@@ -506,17 +501,17 @@ WWINLINE float Vector3::Quick_Length(void) const
 }
 
 
-/*********************************************************************************************** 
- * Swap -- swap two Vector3's                                                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Swap -- swap two Vector3's                                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Swap(Vector3 & a,Vector3 & b)
 {
@@ -610,7 +605,7 @@ WWINLINE void Vector3::Subtract(const Vector3 &a,const Vector3 &b,Vector3 * set_
  *   10/18/99   gth : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Vector3::Update_Min(const Vector3 & a)
-{	
+{
 	if (a.X < X) X = a.X;
 	if (a.Y < Y) Y = a.Y;
 	if (a.Z < Z) Z = a.Z;
@@ -630,7 +625,7 @@ WWINLINE void Vector3::Update_Min(const Vector3 & a)
  *   10/18/99   gth : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Vector3::Update_Max(const Vector3 & a)
-{	
+{
 	if (a.X > X) X = a.X;
 	if (a.Y > Y) Y = a.Y;
 	if (a.Z > Z) Z = a.Z;
@@ -649,7 +644,7 @@ WWINLINE void Vector3::Update_Max(const Vector3 & a)
  *   11/29/99   wst : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Vector3::Cap_Absolute_To(const Vector3 & a)
-{	
+{
 	if (X > 0)
 	{
 		if (a.X < X) X = a.X;
@@ -836,27 +831,27 @@ WWINLINE bool Vector3::Is_Valid(void) const
 	return (WWMath::Is_Valid_Float(X) && WWMath::Is_Valid_Float(Y) && WWMath::Is_Valid_Float(Z));
 }
 
-WWINLINE float Vector3::Find_X_At_Y(float y, const Vector3 &p1, const Vector3 &p2) 
+WWINLINE float Vector3::Find_X_At_Y(float y, const Vector3 &p1, const Vector3 &p2)
 {
 	return(p1.X + ((y - p1.Y) * ((p2.X - p1.X) / (p2.Y - p1.Y))));
 }
-WWINLINE float Vector3::Find_X_At_Z(float z, const Vector3 &p1, const Vector3 &p2) 
+WWINLINE float Vector3::Find_X_At_Z(float z, const Vector3 &p1, const Vector3 &p2)
 {
 	return(p1.X + ((z - p1.Z) * ((p2.X - p1.X) / (p2.Z - p1.Z))));
 }
-WWINLINE float Vector3::Find_Y_At_X(float x, const Vector3 &p1, const Vector3 &p2)  
+WWINLINE float Vector3::Find_Y_At_X(float x, const Vector3 &p1, const Vector3 &p2)
 {
 	return(p1.Y + ((x - p1.X) * ((p2.Y - p1.Y) / (p2.X - p1.X))));
 }
-WWINLINE float Vector3::Find_Y_At_Z(float z, const Vector3 &p1, const Vector3 &p2)  
+WWINLINE float Vector3::Find_Y_At_Z(float z, const Vector3 &p1, const Vector3 &p2)
 {
 	return(p1.Y + ((z - p1.Z) * ((p2.Y - p1.Y) / (p2.Z - p1.Z))));
 }
-WWINLINE float Vector3::Find_Z_At_X(float x, const Vector3 &p1, const Vector3 &p2)  
+WWINLINE float Vector3::Find_Z_At_X(float x, const Vector3 &p1, const Vector3 &p2)
 {
 	return(p1.Z + ((x - p1.X) * ((p2.Z - p1.Z) / (p2.X - p1.X))));
 }
-WWINLINE float Vector3::Find_Z_At_Y(float y, const Vector3 &p1, const Vector3 &p2) 
+WWINLINE float Vector3::Find_Z_At_Y(float y, const Vector3 &p1, const Vector3 &p2)
 {
 	return(p1.Z + ((y - p1.Y) * ((p2.Z - p1.Z) / (p2.Y - p1.Y))));
 }
@@ -902,11 +897,11 @@ WWINLINE float Vector3::Quick_Distance(const Vector3 &p1, const Vector3 &p2)
  * HISTORY:                                                                                    *
  *   11/29/1999MLL: Created.                                                                   *
  *=============================================================================================*/
-WWINLINE unsigned long	Vector3::Convert_To_ABGR( void ) const 
+WWINLINE unsigned long	Vector3::Convert_To_ABGR( void ) const
 {
-	return (unsigned(255)<<24) | 
-			 (unsigned(Z*255.0f)<<16) | 
-			 (unsigned(Y*255.0f)<<8) | 
+	return (unsigned(255)<<24) |
+			 (unsigned(Z*255.0f)<<16) |
+			 (unsigned(Y*255.0f)<<8) |
 			 (unsigned(X*255.0f));
 }
 
@@ -919,11 +914,11 @@ WWINLINE unsigned long	Vector3::Convert_To_ABGR( void ) const
  * HISTORY:                                                                                    *
  *   11/29/1999MLL: Created.                                                                   *
  *=============================================================================================*/
-WWINLINE unsigned long	Vector3::Convert_To_ARGB( void ) const 
+WWINLINE unsigned long	Vector3::Convert_To_ARGB( void ) const
 {
-	return (unsigned(255)<<24) | 
-			 (unsigned(X*255.0f)<<16) | 
-			 (unsigned(Y*255.0f)<<8) | 
+	return (unsigned(255)<<24) |
+			 (unsigned(X*255.0f)<<16) |
+			 (unsigned(Y*255.0f)<<8) |
 			 (unsigned(Z*255.0f));
 }
 
@@ -934,6 +929,3 @@ WWINLINE unsigned long Vector3::Convert_To_ARGB( float alpha ) const
         (unsigned(Y*255.0f)<<8) |
         (unsigned(Z*255.0f));
 }
-
-#endif /* Vector3_H */
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/vector4.h b/Core/Libraries/Source/WWVegas/WWMath/vector4.h
index 20b02f33506..a512aaad300 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/vector4.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/vector4.h
@@ -17,39 +17,34 @@
 */
 
 /* $Header: /Commando/Code/wwmath/vector4.h 16    5/11/01 7:11p Jani_p $ */
-/*************************************************************************** 
- ***                  Confidential - Westwood Studios                    *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Westwood 3D                              * 
- *                                                                         * 
- *                    File Name : VECTOR4.H                                * 
- *                                                                         * 
- *                   Programmer : Greg Hjelstrom                           * 
- *                                                                         * 
- *                   Start Date : 02/24/97                                 * 
- *                                                                         * 
- *                  Last Update : June 2, 1997 [GH]                        * 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- *   Scalar Division Operator -- Divide a vector by a scalar               * 
- *   Scalar Multiply Operator -- Multiply a vector by a scalar             * 
- *   Vector Addition Operator -- Add two vectors                           * 
- *   Vector Subtraction Operator -- Subract two vectors                    * 
- *   Vector Inner Product Operator -- Compute the inner or dot product     * 
- *   Vector Equality Operator -- Detemine if two vectors are identical     * 
- *   Vector Inequality Operator -- Detemine if two vectors are identical   * 
- *   Swap -- swap two Vector4's                                            * 
+/***************************************************************************
+ ***                  Confidential - Westwood Studios                    ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : Westwood 3D                              *
+ *                                                                         *
+ *                    File Name : VECTOR4.h                                *
+ *                                                                         *
+ *                   Programmer : Greg Hjelstrom                           *
+ *                                                                         *
+ *                   Start Date : 02/24/97                                 *
+ *                                                                         *
+ *                  Last Update : June 2, 1997 [GH]                        *
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ *   Scalar Division Operator -- Divide a vector by a scalar               *
+ *   Scalar Multiply Operator -- Multiply a vector by a scalar             *
+ *   Vector Addition Operator -- Add two vectors                           *
+ *   Vector Subtraction Operator -- Subract two vectors                    *
+ *   Vector Inner Product Operator -- Compute the inner or dot product     *
+ *   Vector Equality Operator -- Detemine if two vectors are identical     *
+ *   Vector Inequality Operator -- Detemine if two vectors are identical   *
+ *   Swap -- swap two Vector4's                                            *
  *   Vector4::Is_Valid -- Vector4::Is_Valid                                *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VECTOR4_H
-#define VECTOR4_H
 
 #include "always.h"
 #include "wwmath.h"
@@ -74,14 +69,14 @@ class Vector4
 	WWINLINE Vector4(const Vector4 & v) { X = v.X; Y = v.Y; Z = v.Z; W = v.W; }
 	WWINLINE Vector4(float x, float y, float z, float w) { X = x; Y = y; Z = z; W = w; }
 	WWINLINE Vector4(const float vector[4]) { X = vector[0]; Y = vector[1]; Z = vector[2]; W = vector[3]; }
-	
+
 	// Assignment
-	WWINLINE Vector4 & operator = (const Vector4 & v) { X = v.X; Y = v.Y; Z = v.Z; W = v.W; return *this; }	
+	WWINLINE Vector4 & operator = (const Vector4 & v) { X = v.X; Y = v.Y; Z = v.Z; W = v.W; return *this; }
 	WWINLINE void	Set(float x, float y, float z, float w) { X = x; Y = y; Z = z; W = w; }
-	
+
 	// Array access
-	WWINLINE float &	operator [](int i) { return (&X)[i]; }     
-	WWINLINE const float &  operator [](int i) const { return (&X)[i]; }  
+	WWINLINE float &	operator [](int i) { return (&X)[i]; }
+	WWINLINE const float &  operator [](int i) const { return (&X)[i]; }
 
 	// normalize, compute length
 	void	Normalize(void);
@@ -89,11 +84,11 @@ class Vector4
 	WWINLINE float Length2(void) const;
 
 	// unary operators
-	WWINLINE Vector4 operator-() const { return(Vector4(-X,-Y,-Z,-W)); } 
-	WWINLINE Vector4 operator+() const { return *this; } 
+	WWINLINE Vector4 operator-() const { return(Vector4(-X,-Y,-Z,-W)); }
+	WWINLINE Vector4 operator+() const { return *this; }
 
-	WWINLINE Vector4 & operator += (const Vector4 & v) { X += v.X; Y += v.Y; Z += v.Z; W += v.W; return *this; }	
-	WWINLINE Vector4 & operator -= (const Vector4 & v) { X -= v.X; Y -= v.Y; Z -= v.Z; W += v.W; return *this; }		
+	WWINLINE Vector4 & operator += (const Vector4 & v) { X += v.X; Y += v.Y; Z += v.Z; W += v.W; return *this; }
+	WWINLINE Vector4 & operator -= (const Vector4 & v) { X -= v.X; Y -= v.Y; Z -= v.Z; W += v.W; return *this; }
 	WWINLINE Vector4 & operator *= (float k) { X = X*k; Y=Y*k; Z=Z*k; W=W*k; return *this; }
 	WWINLINE Vector4 & operator /= (float k) { k=1.0f/k; X = X*k; Y=Y*k; Z=Z*k; W=W*k; return *this; }
 
@@ -109,7 +104,7 @@ class Vector4
 	// dot product / inner product
 	WWINLINE friend float operator * (const Vector4 &a,const Vector4 &b);
 	static WWINLINE float Dot_Product(const Vector4 &a,const Vector4 &b);
-	
+
 	// Equality operators
 	friend bool operator == (const Vector4 &a,const Vector4 &b);
 	friend bool operator != (const Vector4 &a,const Vector4 &b);
@@ -122,17 +117,17 @@ class Vector4
 	WWINLINE bool Is_Valid(void) const;
 };
 
-/************************************************************************** 
- * Scalar Multiply Operator -- Multiply a vector by a scalar              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Scalar Multiply Operator -- Multiply a vector by a scalar              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 WWINLINE Vector4 operator * (const Vector4 &a,float k)
 {
@@ -144,16 +139,16 @@ WWINLINE Vector4 operator * (float k, const Vector4 &a)
 	return a*k;
 }
 
-/************************************************************************** 
- * Scalar Division Operator -- Divide a vector by a scalar                * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Scalar Division Operator -- Divide a vector by a scalar                *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE Vector4 operator / (const Vector4 &a,float k)
 {
@@ -161,17 +156,17 @@ WWINLINE Vector4 operator / (const Vector4 &a,float k)
 	return Vector4((a[0] * ook),(a[1] * ook),(a[2] * ook),(a[3] * ook));
 }
 
-/************************************************************************** 
- * Vector Addition Operator -- Add two vectors                            * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Vector Addition Operator -- Add two vectors                            *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 WWINLINE Vector4 operator + (const Vector4 &a,const Vector4 &b)
 {
@@ -183,17 +178,17 @@ WWINLINE Vector4 operator + (const Vector4 &a,const Vector4 &b)
 						);
 }
 
-/************************************************************************** 
- * Vector Subtraction Operator -- Subract two vectors                     * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Vector Subtraction Operator -- Subract two vectors                     *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 WWINLINE Vector4 operator - (const Vector4 &a,const Vector4 &b)
 {
@@ -205,22 +200,22 @@ WWINLINE Vector4 operator - (const Vector4 &a,const Vector4 &b)
 						);
 }
 
-/************************************************************************** 
- * Vector Inner Product -- Compute the inner or dot product of two vector * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Inner Product -- Compute the inner or dot product of two vector *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE float operator * (const Vector4 &a,const Vector4 &b)
 {
-	return	a[0]*b[0] + 
-				a[1]*b[1] + 
-				a[2]*b[2] + 
+	return	a[0]*b[0] +
+				a[1]*b[1] +
+				a[2]*b[2] +
 				a[3]*b[3];
 }
 
@@ -230,48 +225,48 @@ WWINLINE float Vector4::Dot_Product(const Vector4 &a,const Vector4 &b)
 }
 
 
-/************************************************************************** 
- * Vector Equality Operator -- Detemine if two vectors are identical      * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Equality Operator -- Detemine if two vectors are identical      *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool operator == (const Vector4 &a,const Vector4 &b)
 {
 	return ( (a[0] == b[0]) && (a[1] == b[1]) && (a[2] == b[2]) && (a[3] == b[3]));
 }
 
-/************************************************************************** 
- * Vector Inequality Operator -- Detemine if two vectors are identical    * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Inequality Operator -- Detemine if two vectors are identical    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool operator != (const Vector4 &a,const Vector4 &b)
 {
 	return ( (a[0] != b[0]) || (a[1] != b[1]) || (a[2] != b[2]) || (a[3] != b[3]));
 }
 
-/************************************************************************** 
- * Vector4::Normalize -- Normalizes the vector.                           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector4::Normalize -- Normalizes the vector.                           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE void Vector4::Normalize()
 {
@@ -295,32 +290,32 @@ WWINLINE Vector4 Normalize(const Vector4 & vec)
 	return Vector4(0.0f,0.0f,0.0f,0.0f);
 }
 
-/************************************************************************** 
- * Vector4::Length -- Returns the length of the vector                    * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector4::Length -- Returns the length of the vector                    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE float Vector4::Length() const
 {
 	return WWMath::Sqrt(Length2());
 }
 
-/************************************************************************** 
- * Vector4::Length -- Returns the square of the length of the vector      * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector4::Length -- Returns the square of the length of the vector      *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE float Vector4::Length2() const
 {
@@ -328,17 +323,17 @@ WWINLINE float Vector4::Length2() const
 }
 
 
-/*********************************************************************************************** 
- * Swap -- swap two Vector4's                                                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Swap -- swap two Vector4's                                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Swap(Vector4 & a,Vector4 & b)
 {
@@ -347,17 +342,17 @@ WWINLINE void Swap(Vector4 & a,Vector4 & b)
 	b = tmp;
 }
 
-/*********************************************************************************************** 
- * Lerp -- linearly interpolate two Vector4's by an interpolation factor.                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS: No checking is done to ensure that alpha is between 0 and 1.                      * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   01/14/1999 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Lerp -- linearly interpolate two Vector4's by an interpolation factor.                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS: No checking is done to ensure that alpha is between 0 and 1.                      *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   01/14/1999 NH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Vector4 Lerp(const Vector4 & a, const Vector4 & b, float alpha)
 {
@@ -406,7 +401,3 @@ WWINLINE bool Vector4::Is_Valid(void) const
 {
 	return (WWMath::Is_Valid_Float(X) && WWMath::Is_Valid_Float(Y) && WWMath::Is_Valid_Float(Z) && WWMath::Is_Valid_Float(W));
 }
-
-
-#endif /* VECTOR4_H */
-
diff --git a/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.cpp b/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.cpp
index b5366dddc64..8fdfe211c79 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.cpp
@@ -210,7 +210,7 @@ Find_Turn_Arc
 	//
 	arc_center->X = curr_pt.X + (radius * ::WWMath::Cos (avg_angle));
 	arc_center->Y = curr_pt.Y + (radius * ::WWMath::Sin (avg_angle));
-	arc_center->Z = curr_pt.Z;	
+	arc_center->Z = curr_pt.Z;
 
 	//
 	//	Will we be making a right turn or a left turn?
@@ -253,7 +253,7 @@ Find_Tangents
 	//
 	//	Find the angle where the current position lies on the turn arc
 	//
-	(*point_angle) = ::WWMath::Atan2 (curr_pt.X - arc_center.X, -(curr_pt.Y - arc_center.Y));	
+	(*point_angle) = ::WWMath::Atan2 (curr_pt.X - arc_center.X, -(curr_pt.Y - arc_center.Y));
 	(*point_angle) = WWMath::Wrap ((*point_angle), 0, DEG_TO_RADF (360));
 
 	//
@@ -288,7 +288,7 @@ VehicleCurveClass::Update_Arc_List (void)
 {
 	WWMEMLOG(MEM_PATHFIND);
 	m_ArcList.Delete_All ();
-	
+
 	//
 	//	Bail out if there is nothing to do
 	//
@@ -309,7 +309,7 @@ VehicleCurveClass::Update_Arc_List (void)
 	arc_start.angle_in_delta	= 0;
 	arc_start.angle_out_delta	= 0;
 	m_ArcList.Add (arc_start);
-	
+
 	//
 	//	Loop over each 'interior' point and generate arc information
 	// for each.
@@ -398,7 +398,7 @@ VehicleCurveClass::Update_Arc_List (void)
 			//
 			//	Record information about this arc
 			//
-			ArcInfoStruct arc_info;	
+			ArcInfoStruct arc_info;
 			arc_info.center				= curr_pt;
 			arc_info.point_angle			= 0;
 			arc_info.point_in				= curr_pt;
@@ -413,7 +413,7 @@ VehicleCurveClass::Update_Arc_List (void)
 			//
 			//	Record information about this arc
 			//
-			ArcInfoStruct arc_info;	
+			ArcInfoStruct arc_info;
 			arc_info.center				= arc_center;
 			arc_info.point_angle			= point_angle;
 			arc_info.point_in				= point_in;
@@ -508,7 +508,7 @@ VehicleCurveClass::Evaluate (float time, Vector3 *set_val)
 	//	Determine which part of the segment we are on
 	//
 	if (seg_time < time1) {
-		
+
 		//
 		//	We are on the initial curve of the segment, so calculate where
 		// on the curve we are...
@@ -532,7 +532,7 @@ VehicleCurveClass::Evaluate (float time, Vector3 *set_val)
 		//
 		//	We are on the line between the two curves, so calculate where on
 		// the line we are
-		//			
+		//
 		float percent = (seg_time - time1) / (time2 - time1);
 
 		if (percent == 0) {
@@ -540,7 +540,7 @@ VehicleCurveClass::Evaluate (float time, Vector3 *set_val)
 			set_val->Y = arc_info0.point_out.Y;
 		} else {
 			set_val->X = arc_info1.point_in.X;
-			set_val->Y = arc_info1.point_in.Y;			
+			set_val->Y = arc_info1.point_in.Y;
 		}
 
 		//set_val->X = arc_info0.point_out.X + (arc_info1.point_in.X - arc_info0.point_out.X) * percent;
@@ -548,9 +548,9 @@ VehicleCurveClass::Evaluate (float time, Vector3 *set_val)
 
 		m_Sharpness = WWMath::Clamp (WWMath::Fabs (arc_info1.angle_out_delta) / DEG_TO_RADF (15), 0, 1.0F);
 		m_SharpnessPos = arc_info1.point_in;
-		
+
 		m_LastTime = Keys[index0].Time + (Keys[index1].Time - Keys[index0].Time) * time2;
-		
+
 	} else {
 
 		//
@@ -559,14 +559,14 @@ VehicleCurveClass::Evaluate (float time, Vector3 *set_val)
 		//
 		/*float percent = 1.0F - ((seg_time - time2) / (1.0F - time2));
 		float angle = arc_info1.point_angle + (arc_info1.angle_in_delta * percent);
-		
+
 		set_val->X = arc_info1.center.X + (arc_info1.radius * ::WWMath::Sin (angle));
 		set_val->Y = arc_info1.center.Y + (arc_info1.radius * -::WWMath::Cos (angle));			*/
 
 		float angle = arc_info1.point_angle + (arc_info1.angle_out_delta);
 
 		set_val->X = arc_info1.center.X + (arc_info1.radius * ::WWMath::Sin (angle));
-		set_val->Y = arc_info1.center.Y + (arc_info1.radius * -::WWMath::Cos (angle));		
+		set_val->Y = arc_info1.center.Y + (arc_info1.radius * -::WWMath::Cos (angle));
 
 		m_Sharpness = WWMath::Clamp (WWMath::Fabs (arc_info1.angle_out_delta) / DEG_TO_RADF (15), 0, 1.0F);
 		m_SharpnessPos.X = set_val->X;
@@ -579,7 +579,7 @@ VehicleCurveClass::Evaluate (float time, Vector3 *set_val)
 	//
 	//	Our Z value is just a linear interpolation
 	//
-	set_val->Z = Keys[index0].Point.Z + (Keys[index1].Point.Z - Keys[index0].Point.Z) * seg_time;	
+	set_val->Z = Keys[index0].Point.Z + (Keys[index1].Point.Z - Keys[index0].Point.Z) * seg_time;
 	return ;
 }
 
@@ -608,7 +608,7 @@ VehicleCurveClass::Save (ChunkSaveClass &csave)
 		//
 		WRITE_MICRO_CHUNK (csave, VARID_IS_DIRTY,		m_IsDirty);
 		WRITE_MICRO_CHUNK (csave, VARID_RADIUS,		m_Radius);
-		
+
 	csave.End_Chunk ();
 
 	//
@@ -621,7 +621,7 @@ VehicleCurveClass::Save (ChunkSaveClass &csave)
 			csave.Write (&arc_info, sizeof (arc_info));
 		csave.End_Chunk ();
 	}
-	
+
 	return true;
 }
 
@@ -634,9 +634,9 @@ VehicleCurveClass::Save (ChunkSaveClass &csave)
 bool
 VehicleCurveClass::Load (ChunkLoadClass &cload)
 {
-	while (cload.Open_Chunk ()) {		
+	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
-			
+
 			case CHUNKID_PARENT:
 				Curve3DClass::Load (cload);
 				break;
diff --git a/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h b/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h
index f0611d0e0e3..46a97647053 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h
@@ -34,16 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __VEHICLE_CURVE_H
-#define __VEHICLE_CURVE_H
 
 #include "curve.h"
-#include "Vector.H"
+#include "Vector.h"
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////
@@ -87,12 +81,12 @@ class VehicleCurveClass : public Curve3DClass
 
 	//
 	//	Initialization
-	//	
+	//
 	void			Initialize_Arc (float radius);
-	
+
 	//
 	//	From Curve3DClass
-	//	
+	//
 	void			Evaluate (float time, Vector3 *set_val);
 	void			Set_Key (int i,const Vector3 & point);
 	int			Add_Key (const Vector3 & point,float t);
@@ -113,7 +107,7 @@ class VehicleCurveClass : public Curve3DClass
 	virtual bool								Load(ChunkLoadClass &cload);
 
 protected:
-	
+
 	///////////////////////////////////////////////////////////////////////////
 	//	Protected methods
 	///////////////////////////////////////////////////////////////////////////
@@ -155,7 +149,7 @@ class VehicleCurveClass : public Curve3DClass
 	///////////////////////////////////////////////////////////////////////////
 	bool			m_IsDirty;
 	float			m_Radius;
-	ARC_LIST		m_ArcList;	
+	ARC_LIST		m_ArcList;
 
 	float			m_LastTime;
 	float			m_Sharpness;
@@ -192,7 +186,7 @@ VehicleCurveClass::Remove_Key (int i)
 	m_IsDirty = true;
 	Curve3DClass::Remove_Key (i);
 	return ;
-}	
+}
 
 ///////////////////////////////////////////////////////////////////////////
 //	Clear_Keys
@@ -203,8 +197,4 @@ VehicleCurveClass::Clear_Keys (void)
 	m_IsDirty = true;
 	Curve3DClass::Clear_Keys ();
 	return ;
-}	
-
-
-#endif //__VEHICLE_CURVE_H
-
+}
diff --git a/Core/Libraries/Source/WWVegas/WWMath/vp.cpp b/Core/Libraries/Source/WWVegas/WWMath/vp.cpp
index ec96ce4bc13..16346e380b7 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/vp.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/vp.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                    Org Author:: Hector Yee                                                  *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 12                                                          $*
@@ -130,12 +130,12 @@ void VectorProcessorClass::Transform (Vector3* dst,const Vector3 *src, const Mat
 		_aligned:
 
 			mov		esi,1
-		
+
 			mov		ecx,edi
 			and		edi,3
 			and		ecx,~3
 			jz		_lp
-			
+
 			lea		ecx,[ecx+ecx*2]
 			shl		ecx,2
 			add		eax,ecx
@@ -296,7 +296,7 @@ void VectorProcessorClass::Transform (Vector3* dst,const Vector3 *src, const Mat
 				movss	xmm1,xmm0
 
 				movaps	[edx+ecx+32],xmm1
-				
+
 				add		ecx,48
 				js		_xlatelp
 
@@ -536,4 +536,4 @@ void VectorProcessorClass::Power(float *dst, float *src, const float pow, const
 {
 	for (int i=0; i<count; i++)
 		dst[i]=powf(src[i],pow);
-}
\ No newline at end of file
+}
diff --git a/Core/Libraries/Source/WWVegas/WWMath/vp.h b/Core/Libraries/Source/WWVegas/WWMath/vp.h
index 05cff1f5291..937188093ff 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/vp.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/vp.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                     Org Author:: Hector Yee                                                  *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 13                                                          $*
@@ -45,12 +45,7 @@
  *----------------------------------------------------------------------------------------------*
  */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VECTORPROCESSOR_H
-#define VECTORPROCESSOR_H
 
 class Vector2;
 class Vector3;
@@ -89,5 +84,3 @@ class VectorProcessorClass
 	static void ClampMin(float *dst, float *src, const float min, const int count);
 	static void Power(float *dst, float *src, const float pow, const int count);
 };
-
-#endif // VECTORPROCESSOR_H
diff --git a/Core/Libraries/Source/WWVegas/WWMath/wwmath.cpp b/Core/Libraries/Source/WWVegas/WWMath/wwmath.cpp
index 0b55a213494..0f82f0e6a87 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/wwmath.cpp
+++ b/Core/Libraries/Source/WWVegas/WWMath/wwmath.cpp
@@ -62,7 +62,7 @@ void		WWMath::Init(void)
 	for (a=0;a<SIN_TABLE_SIZE;++a) {
 		float cv= (float)a * 2.0f * WWMATH_PI / SIN_TABLE_SIZE; //float(a-SIN_TABLE_SIZE/2)*(1.0f/(SIN_TABLE_SIZE/2));
 		_FastSinTable[a]=sin(cv);
-		
+
 		if (a>0) {
 			_FastInvSinTable[a]=1.0f/_FastSinTable[a];
 		} else {
@@ -76,9 +76,9 @@ void		WWMath::Shutdown(void)
 	LookupTableMgrClass::Shutdown();
 }
 
-float		WWMath::Random_Float(void) 
-{ 
-	return ((float)(rand() & 0xFFF)) / (float)(0xFFF); 
+float		WWMath::Random_Float(void)
+{
+	return ((float)(rand() & 0xFFF)) / (float)(0xFFF);
 }
 
 
diff --git a/Core/Libraries/Source/WWVegas/WWMath/wwmath.h b/Core/Libraries/Source/WWVegas/WWMath/wwmath.h
index 831afdeb6ea..35372397a93 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/wwmath.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/wwmath.h
@@ -34,26 +34,20 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef WWMATH_H
-#define WWMATH_H
 
 #include "always.h"
 #include <math.h>
 #include <float.h>
 #include <assert.h>
-#include <float.h>
 
 /*
 ** Some global constants.
 */
 #define WWMATH_EPSILON		0.0001f
 #define WWMATH_EPSILON2		WWMATH_EPSILON * WWMATH_EPSILON
-#define WWMATH_PI				3.141592654f
+#define WWMATH_PI					3.141592654f
+#define WWMATH_TWO_PI			6.283185308f
 #define WWMATH_FLOAT_MAX	(FLT_MAX)
 #define WWMATH_FLOAT_MIN	(FLT_MIN)
 #define WWMATH_SQRT2			1.414213562f
@@ -61,14 +55,7 @@
 #define WWMATH_OOSQRT2		0.707106781f
 #define WWMATH_OOSQRT3		0.577350269f
 
-// (DRM 05/07/01) Temporarily eliminated _fastcall
-// on non-Microsoft compatible compilers. Jani
-// should be replacing this soon.
-#ifndef _MSC_VER
-#define __fastcall
-#endif // _MSC_VER
-
-/* 
+/*
 **	Macros to convert between degrees and radians
 */
 #ifndef RAD_TO_DEG
@@ -96,8 +83,8 @@ extern float _FastSinTable[SIN_TABLE_SIZE];
 extern float _FastInvSinTable[SIN_TABLE_SIZE];
 
 /*
-** Some simple math functions which work on the built-in types.  
-** Include the various other header files in the WWMATH library 
+** Some simple math functions which work on the built-in types.
+** Include the various other header files in the WWMATH library
 ** in order to get matrices, quaternions, etc.
 */
 class WWMath
@@ -124,14 +111,14 @@ static WWINLINE int Float_To_Int_Floor(const float& f);
 static WWINLINE float Cos(float val);
 static WWINLINE float Sin(float val);
 static WWINLINE float Sqrt(float val);
-static float __fastcall Inv_Sqrt(float a);	// Some 30% faster inverse square root than regular C++ compiled, from Intel's math library
+static WWINLINE float Inv_Sqrt(float a);	// Some 30% faster inverse square root than regular C++ compiled, from Intel's math library
 static WWINLINE long	 Float_To_Long(float f);
 #else
-static float Cos(float val);
-static float Sin(float val);
-static float Sqrt(float val);
-static float Inv_Sqrt(float a);
-static long	Float_To_Long(float f);
+static WWINLINE float Cos(float val);
+static WWINLINE float Sin(float val);
+static WWINLINE float Sqrt(float val);
+static WWINLINE float Inv_Sqrt(float a);
+static WWINLINE long	Float_To_Long(float f);
 #endif
 
 
@@ -146,48 +133,52 @@ static WWINLINE float Fast_Asin(float val);
 static WWINLINE float Asin(float val);
 
 
-static float		Atan(float x) { return static_cast<float>(atan(x)); }
-static float		Atan2(float y,float x) { return static_cast<float>(atan2(y,x)); }
-static float		Sign(float val);
-static float		Ceil(float val) { return ceilf(val); }
-static float		Floor(float val) { return floorf(val); }
-static bool			Fast_Is_Float_Positive(const float & val);
-static bool			Is_Power_Of_2(const unsigned int val);
+static WWINLINE float		Atan(float x) { return static_cast<float>(atan(x)); }
+static WWINLINE float		Atan2(float y,float x) { return static_cast<float>(atan2(y,x)); }
+static WWINLINE float		Sign(float val);
+static WWINLINE float		Ceil(float val) { return ceilf(val); }
+static WWINLINE float		Floor(float val) { return floorf(val); }
+static WWINLINE float		Round(float val) { return floorf(val + 0.5f); }
+static WWINLINE bool			Fast_Is_Float_Positive(const float & val);
+static WWINLINE bool			Is_Power_Of_2(const unsigned int val);
 
 static float		Random_Float(void);
-static float		Random_Float(float min,float max);
-static float		Clamp(float val, float min = 0.0f, float max = 1.0f);
-static double		Clamp(double val, double min = 0.0f, double max = 1.0f);
-static int			Clamp_Int(int val, int min_val, int max_val);
-static float		Wrap(float val, float min = 0.0f, float max = 1.0f);
-static double		Wrap(double val, double min = 0.0f, double max = 1.0f);
-static float		Min(float a, float b);
-static float		Max(float a, float b);
 
-static int			Float_As_Int(const float f) { return *((int*)&f); }
+static WWINLINE float		Random_Float(float min,float max);
+static WWINLINE float		Clamp(float val, float min = 0.0f, float max = 1.0f);
+static WWINLINE double		Clamp(double val, double min = 0.0f, double max = 1.0f);
+static WWINLINE int			Clamp_Int(int val, int min_val, int max_val);
+static WWINLINE float		Wrap(float val, float min = 0.0f, float max = 1.0f);
+static WWINLINE double		Wrap(double val, double min = 0.0f, double max = 1.0f);
+static WWINLINE float		Min(float a, float b);
+static WWINLINE float		Max(float a, float b);
 
-static float		Lerp(float a, float b, float lerp );
-static double		Lerp(double a, double b, float lerp );
+static WWINLINE int			Float_As_Int(const float f) { return *((int*)&f); }
 
-static long			Float_To_Long(double f);
+static WWINLINE float		Lerp(float a, float b, float lerp );
+static WWINLINE double		Lerp(double a, double b, float lerp );
 
-static unsigned char Unit_Float_To_Byte(float f) { return (unsigned char)(f*255.0f); }
-static float			Byte_To_Unit_Float(unsigned char byte) { return ((float)byte) / 255.0f; }
+static WWINLINE long			Float_To_Long(double f);
 
-static bool			Is_Valid_Float(float x);
-static bool			Is_Valid_Double(double x);
+static WWINLINE unsigned char Unit_Float_To_Byte(float f) { return (unsigned char)(f*255.0f); }
+static WWINLINE float			Byte_To_Unit_Float(unsigned char byte) { return ((float)byte) / 255.0f; }
+
+static WWINLINE bool			Is_Valid_Float(float x);
+static WWINLINE bool			Is_Valid_Double(double x);
+
+static WWINLINE float Normalize_Angle(float angle); // Normalizes the angle to the range -PI..PI
 
 };
 
-WWINLINE float WWMath::Sign(float val) 
-{ 
-	if (val > 0.0f) { 
-		return +1.0f; 
-	} 
-	if (val < 0.0f) { 
-		return -1.0f; 
-	} 
-	return 0.0f; 
+WWINLINE float WWMath::Sign(float val)
+{
+	if (val > 0.0f) {
+		return +1.0f;
+	}
+	if (val < 0.0f) {
+		return -1.0f;
+	}
+	return 0.0f;
 }
 
 WWINLINE bool WWMath::Fast_Is_Float_Positive(const float & val)
@@ -200,33 +191,33 @@ WWINLINE bool WWMath::Is_Power_Of_2(const unsigned int val)
 	return !((val)&val-1);
 }
 
-WWINLINE float WWMath::Random_Float(float min,float max) 
-{ 
-	return Random_Float() * (max-min) + min; 
+WWINLINE float WWMath::Random_Float(float min,float max)
+{
+	return Random_Float() * (max-min) + min;
 }
 
-WWINLINE float WWMath::Clamp(float val, float min /*= 0.0f*/, float max /*= 1.0f*/) 
+WWINLINE float WWMath::Clamp(float val, float min /*= 0.0f*/, float max /*= 1.0f*/)
 {
 	if(val < min) return min;
 	if(val > max) return max;
 	return val;
 }
 
-WWINLINE double WWMath::Clamp(double val, double min /*= 0.0f*/, double max /*= 1.0f*/) 
+WWINLINE double WWMath::Clamp(double val, double min /*= 0.0f*/, double max /*= 1.0f*/)
 {
 	if(val < min) return min;
 	if(val > max) return max;
 	return val;
 }
 
-WWINLINE int WWMath::Clamp_Int(int val, int min_val, int max_val) 
+WWINLINE int WWMath::Clamp_Int(int val, int min_val, int max_val)
 {
 	if(val < min_val) return min_val;
 	if(val > max_val) return max_val;
 	return val;
 }
 
-WWINLINE float WWMath::Wrap(float val, float min /*= 0.0f*/, float max /*= 1.0f*/) 
+WWINLINE float WWMath::Wrap(float val, float min /*= 0.0f*/, float max /*= 1.0f*/)
 {
 	// Implemented as an if rather than a while, to long loops
 	if ( val >= max )	val -= (max-min);
@@ -241,7 +232,7 @@ WWINLINE float WWMath::Wrap(float val, float min /*= 0.0f*/, float max /*= 1.0f*
 	return val;
 }
 
-WWINLINE double WWMath::Wrap(double val, double min /*= 0.0f*/, double max /*= 1.0f*/) 
+WWINLINE double WWMath::Wrap(double val, double min /*= 0.0f*/, double max /*= 1.0f*/)
 {
 	// Implemented as an if rather than a while, to long loops
 	if ( val >= max )	val -= (max-min);
@@ -283,7 +274,7 @@ WWINLINE bool WWMath::Is_Valid_Float(float x)
 	unsigned long * plong = (unsigned long *)(&x);
 	unsigned long exponent = ((*plong) & 0x7F800000) >> (32-9);
 
-	// if exponent is 0xFF, this is a NAN 
+	// if exponent is 0xFF, this is a NAN
 	if (exponent == 0xFF) {
 		return false;
 	}
@@ -295,7 +286,7 @@ WWINLINE bool WWMath::Is_Valid_Double(double x)
 	unsigned long * plong = (unsigned long *)(&x) + 1;
 	unsigned long exponent = ((*plong) & 0x7FF00000) >> (32-12);
 
-	// if exponent is 0x7FF, this is a NAN 
+	// if exponent is 0x7FF, this is a NAN
 	if (exponent == 0x7FF) {
 		return false;
 	}
@@ -318,21 +309,21 @@ WWINLINE long WWMath::Float_To_Long(float f)
 
 	return i;
 }
-#else 
+#else
 WWINLINE long WWMath::Float_To_Long(float f)
 {
 	return (long) f;
 }
 #endif
 
-WWINLINE long WWMath::Float_To_Long(double f)	
+WWINLINE long WWMath::Float_To_Long(double f)
 {
 #if defined(_MSC_VER) && defined(_M_IX86)
 	long retval;
 	__asm fld	qword ptr [f]
 	__asm fistp dword ptr [retval]
 	return retval;
-#else 
+#else
 	return (long) f;
 #endif
 }
@@ -395,7 +386,7 @@ WWINLINE float WWMath::Fast_Sin(float val)
 
 	idx0 = ((unsigned)idx0) & (SIN_TABLE_SIZE-1);
 	idx1 = ((unsigned)idx1) & (SIN_TABLE_SIZE-1);
-	
+
 	return (1.0f - frac) * _FastSinTable[idx0] + frac * _FastSinTable[idx1];
 }
 
@@ -405,7 +396,7 @@ WWINLINE float WWMath::Fast_Sin(float val)
 
 WWINLINE float WWMath::Fast_Inv_Sin(float val)
 {
-#if 0 // TODO: more testing, not reliable! 
+#if 0 // TODO: more testing, not reliable!
 	float index = val * float(SIN_TABLE_SIZE) / (2.0f * WWMATH_PI);
 
 	int idx0=Float_To_Int_Floor(index);
@@ -414,7 +405,7 @@ WWINLINE float WWMath::Fast_Inv_Sin(float val)
 
 	idx0 = ((unsigned)idx0) & (SIN_TABLE_SIZE-1);
 	idx1 = ((unsigned)idx1) & (SIN_TABLE_SIZE-1);
-	
+
 	// The table becomes inaccurate near 0 and 2pi so fall back to doing a divide.
 	const int BUFFER = 16;
 	if ((idx0 <= BUFFER) || (idx0 >= SIN_TABLE_SIZE-BUFFER-1)) {
@@ -443,7 +434,7 @@ WWINLINE float WWMath::Fast_Cos(float val)
 
 	idx0 = ((unsigned)idx0) & (SIN_TABLE_SIZE-1);
 	idx1 = ((unsigned)idx1) & (SIN_TABLE_SIZE-1);
-	
+
 	return (1.0f - frac) * _FastSinTable[idx0] + frac * _FastSinTable[idx1];
 }
 
@@ -463,7 +454,7 @@ WWINLINE float WWMath::Fast_Inv_Cos(float val)
 
 	idx0 = ((unsigned)idx0) & (SIN_TABLE_SIZE-1);
 	idx1 = ((unsigned)idx1) & (SIN_TABLE_SIZE-1);
-	
+
 	// The table becomes inaccurate near 0 and 2pi so fall back to doing a divide.
 	if ((idx0 <= 2) || (idx0 >= SIN_TABLE_SIZE-3)) {
 		return 1.0f / WWMath::Fast_Cos(val);
@@ -522,10 +513,10 @@ WWINLINE float WWMath::Fast_Asin(float val)
 	if (WWMath::Fabs(val) > 0.975f) {
 		return WWMath::Asin(val);
 	}
-	
+
 	val*=float(ARC_TABLE_SIZE/2);
 
-	int idx0=Float_To_Int_Floor(val); 
+	int idx0=Float_To_Int_Floor(val);
 	int idx1=idx0+1;
 	float frac=val-(float)idx0;
 
@@ -602,13 +593,15 @@ WWINLINE int WWMath::Float_To_Int_Floor (const float& f)
 // ----------------------------------------------------------------------------
 
 #if defined(_MSC_VER) && defined(_M_IX86)
-WWINLINE __declspec(naked) float __fastcall WWMath::Inv_Sqrt(float a)
+WWINLINE float WWMath::Inv_Sqrt(float a)
 {
+	float retval;
+
 	__asm {
 		mov		eax, 0be6eb508h
 		mov		DWORD PTR [esp-12],03fc00000h ;  1.5 on the stack
-		sub		eax, DWORD PTR [esp+4]; a
-		sub		DWORD PTR [esp+4], 800000h ; a/2 a=Y0
+		sub		eax, DWORD PTR [a]; a
+		sub		DWORD PTR [a], 800000h ; a/2 a=Y0
 		shr		eax, 1     ; firs approx in eax=R0
 		mov		DWORD PTR [esp-8], eax
 
@@ -616,7 +609,7 @@ WWINLINE __declspec(naked) float __fastcall WWMath::Inv_Sqrt(float a)
 		fmul	st, st            ;r*r
 		fld		DWORD PTR [esp-8] ;r
 		fxch	st(1)
-		fmul	DWORD PTR [esp+4];a ;r*r*y0
+		fmul	DWORD PTR [a];a ;r*r*y0
 		fld		DWORD PTR [esp-12];load 1.5
 		fld		st(0)
 		fsub	st,st(2)			   ;r1 = 1.5 - y1
@@ -644,8 +637,11 @@ WWINLINE __declspec(naked) float __fastcall WWMath::Inv_Sqrt(float a)
 		;x3 = st(1)
 		;r3 = st(0)
 		fmulp	st(1), st
-		ret 4
+
+		fstp retval
 	}
+
+	return retval;
 }
 #else
 WWINLINE float WWMath::Inv_Sqrt(float val)
@@ -654,5 +650,7 @@ WWINLINE float WWMath::Inv_Sqrt(float val)
 }
 #endif
 
-
-#endif
+WWINLINE float WWMath::Normalize_Angle(float angle)
+{
+	return angle - (WWMATH_TWO_PI * Floor((angle + WWMATH_PI) / WWMATH_TWO_PI));
+}
diff --git a/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h b/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h
index 741f7084815..786757d8438 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h
@@ -36,15 +36,14 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef WWMATHIDS_H
-#define WWMATHIDS_H
+#pragma once
 
 #include "saveloadids.h"
 
 /*
 ** Persist Factory ID's for WWMATH
 */
-enum 
+enum
 {
 	WWMATH_CHUNKID_LINEARCURVE1D	= CHUNKID_WWMATH_BEGIN,
 	WWMATH_CHUNKID_HERMITESPLINE1D,
@@ -59,8 +58,3 @@ enum
 	WWMATH_CHUNKID_TCBSPLINE3D,
 	WWMATH_CHUNKID_VEHICLECURVE
 };
-
-
-
-#endif //WWMATHIDS_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.cpp
index ce7009b1483..6e217dc7381 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.cpp
@@ -63,7 +63,7 @@ DefinitionClass::Save (ChunkSaveClass &csave)
 {
 	bool retval = true;
 
-	csave.Begin_Chunk (CHUNKID_VARIABLES);	
+	csave.Begin_Chunk (CHUNKID_VARIABLES);
 	retval &= Save_Variables (csave);
 	csave.End_Chunk ();
 
@@ -83,7 +83,7 @@ DefinitionClass::Load (ChunkLoadClass &cload)
 
 	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
-			
+
 			case CHUNKID_VARIABLES:
 				Load_Variables (cload);
 				break;
@@ -127,7 +127,7 @@ DefinitionClass::Load_Variables (ChunkLoadClass &cload)
 	//
 	while (cload.Open_Micro_Chunk ()) {
 		switch (cload.Cur_Micro_Chunk_ID ()) {
-			
+
 			READ_MICRO_CHUNK (cload, VARID_INSTANCEID, m_ID)
 			READ_MICRO_CHUNK_WWSTRING (cload, VARID_NAME, m_Name)
 		}
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h
index 82ae6048566..471c39ceac7 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h
@@ -34,15 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __DEFINITION_H
-#define __DEFINITION_H
 
 #include "always.h"
-// SKB Remove because of G conflicts with CLASSID_?? 
+// SKB Remove because of G conflicts with CLASSID_??
 #include "definitionclassids.h"
 #include "definitionmgr.h"
 #include "editable.h"
@@ -76,7 +71,7 @@ class DefinitionClass : public PersistClass, public EditableClass
 	/////////////////////////////////////////////////////////////////////
 	//	Public methods
 	/////////////////////////////////////////////////////////////////////
-	
+
 	// Type identification
 	virtual uint32						Get_Class_ID (void) const = 0;
 	virtual uint32						Get_ID (void) const;
@@ -85,7 +80,7 @@ class DefinitionClass : public PersistClass, public EditableClass
 
 	// Display name methods
 	virtual const char *				Get_Name (void) const;
-	virtual void						Set_Name (const char *new_name);	
+	virtual void						Set_Name (const char *new_name);
 
 	// Validation methods
 	virtual bool						Is_Valid_Config (StringClass &message);
@@ -103,7 +98,7 @@ class DefinitionClass : public PersistClass, public EditableClass
 	void									Enable_Save (bool onoff)		{ m_SaveEnabled = onoff; }
 
 protected:
-	
+
 	/////////////////////////////////////////////////////////////////////
 	//	Protected member data
 	/////////////////////////////////////////////////////////////////////
@@ -189,6 +184,3 @@ DefinitionClass::Is_Valid_Config (StringClass &message)
 {
 	return true;
 }
-
-
-#endif //__DEFINITION_H
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h
index ec96ffdff02..8d74a2d5a0a 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __DEFINITION_CLASS_ID_H
-#define __DEFINITION_CLASS_ID_H
 
 #include "always.h"
 #include "bittype.h"
@@ -59,9 +53,9 @@ const int	DEF_CLASSID_RANGE			= 0x00001000;
 //
 //	DefinitionClassID
 //
-//	Note:  The following enum should contain ALL of the class ids for 
+//	Note:  The following enum should contain ALL of the class ids for
 // definitions in the entire system (to guarantee they are unique).  Each
-// super-class is allocated a range of class ids.  Use the 
+// super-class is allocated a range of class ids.  Use the
 // SuperClassID_From_ClassID function to determine which super class
 //	a particular class id belongs to.
 //
@@ -102,7 +96,3 @@ SuperClassID_From_ClassID (uint32 class_id)
 
 	return DEF_CLASSID_START + (num_ranges * DEF_CLASSID_RANGE);
 }
-
-
-#endif //__DEFINITION_CLASS_ID_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h
index 162634117ba..a7230b95d47 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __DEFINITION_FACTORY_H
-#define __DEFINITION_FACTORY_H
 
 #include "always.h"
 #include "bittype.h"
@@ -50,7 +45,7 @@ class DefinitionClass;
 
 //////////////////////////////////////////////////////////////////////////////////
 //
-//	DefinitionFactoryClass 
+//	DefinitionFactoryClass
 //
 //	Definition factories act as virtual constructors for object definitions.  They
 //	are responsible for creating new definitions for a particular class of objects.
@@ -75,19 +70,16 @@ class DefinitionFactoryClass
 	virtual bool					Is_Displayed (void) const = 0;
 
 protected:
-	
+
 	//////////////////////////////////////////////////////////////
 	//	Protected member data
 	//////////////////////////////////////////////////////////////
 	DefinitionFactoryClass *	m_NextFactory;
 	DefinitionFactoryClass *	m_PrevFactory;
 
-	
+
 	//////////////////////////////////////////////////////////////
 	//	Friends
 	//////////////////////////////////////////////////////////////
 	friend class DefinitionFactoryMgrClass;
 };
-
-
-#endif //__DEFINITION_FACTORY_H
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.cpp
index d76c45258ae..bf883471fc5 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.cpp
@@ -37,7 +37,7 @@
 #include "definitionfactorymgr.h"
 #include "definitionfactory.h"
 #include "wwdebug.h"
-#include <string.h>
+
 #ifdef _UNIX
 #include "osdep.h"
 #endif
@@ -245,7 +245,7 @@ DefinitionFactoryMgrClass::Link_Factory (DefinitionFactoryClass *factory)
 
 	// Adding this factory in front of the current head of the list
 	factory->m_NextFactory = _FactoryListHead;
-	
+
 	// If the list wasn't empty, link the next factory back to this factory
 	if (factory->m_NextFactory != 0) {
 		factory->m_NextFactory->m_PrevFactory = factory;
@@ -273,7 +273,7 @@ DefinitionFactoryMgrClass::Unlink_Factory (DefinitionFactoryClass *factory)
 		// this factory is the head
 		WWASSERT (_FactoryListHead == factory);
 		_FactoryListHead = factory->m_NextFactory;
-	
+
 	} else {
 
 		// link it's prev with it's next
@@ -283,7 +283,7 @@ DefinitionFactoryMgrClass::Unlink_Factory (DefinitionFactoryClass *factory)
 
 	// Handle the factory's next pointer if its not at the end of the list:
 	if (factory->m_NextFactory != 0) {
-		
+
 		factory->m_NextFactory->m_PrevFactory = factory->m_PrevFactory;
 
 	}
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h
index 9bba98bbaa9..dd317f0759e 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __DEFINITION_FACTORY_MGR_H
-#define __DEFINITION_FACTORY_MGR_H
 
 #include "always.h"
 #include "bittype.h"
@@ -49,7 +44,7 @@ class DefinitionFactoryClass;
 
 //////////////////////////////////////////////////////////////////////////////////
 //
-//	DefinitionFactoryMgrClass 
+//	DefinitionFactoryMgrClass
 //
 //////////////////////////////////////////////////////////////////////////////////
 class DefinitionFactoryMgrClass
@@ -59,7 +54,7 @@ class DefinitionFactoryMgrClass
 	/////////////////////////////////////////////////////////////////////
 	//	Public methods
 	/////////////////////////////////////////////////////////////////////
-	static DefinitionFactoryClass *	Find_Factory (uint32 class_id);	
+	static DefinitionFactoryClass *	Find_Factory (uint32 class_id);
 	static DefinitionFactoryClass *	Find_Factory (const char *name);
 	static void								Register_Factory (DefinitionFactoryClass *factory);
 	static void								Unregister_Factory (DefinitionFactoryClass *factory);
@@ -71,7 +66,7 @@ class DefinitionFactoryMgrClass
 	// Factory enumeration
 	static DefinitionFactoryClass *	Get_First (void);
 	static DefinitionFactoryClass *	Get_Next (DefinitionFactoryClass *current);
-	
+
 private:
 
 	/////////////////////////////////////////////////////////////////////
@@ -85,6 +80,3 @@ class DefinitionFactoryMgrClass
 	/////////////////////////////////////////////////////////////////////
 	static DefinitionFactoryClass *	_FactoryListHead;
 };
-
-
-#endif //__DEFINITION_FACTORY_MGR_H
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.cpp
index f189f47f54f..056180c0031 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.cpp
@@ -44,7 +44,6 @@
 #include "wwdebug.h"
 #include "wwmemlog.h"
 #include "twiddler.h"
-#include <string.h>
 #include "wwprofile.h"
 
 
@@ -120,7 +119,7 @@ DefinitionMgrClass::Find_Definition (uint32 id, bool twiddle)
 	//	Binary search the list until we've found the definition
 	//
 	while (keep_going) {
-		
+
 		DefinitionClass *curr_def = _SortedDefinitionArray[index];
 		WWASSERT (curr_def != NULL);
 
@@ -130,7 +129,7 @@ DefinitionMgrClass::Find_Definition (uint32 id, bool twiddle)
 		if (curr_def->Get_ID () == id) {
 			definition	= _SortedDefinitionArray[index];
 			keep_going	= false;
-		} else if (upper_index <= lower_index + 1) {			
+		} else if (upper_index <= lower_index + 1) {
 
 			//
 			//	When the window get's too small, our divide by two won't catch
@@ -142,7 +141,7 @@ DefinitionMgrClass::Find_Definition (uint32 id, bool twiddle)
 			} else if (_SortedDefinitionArray[upper_index]->Get_ID () == id) {
 				definition = _SortedDefinitionArray[upper_index];
 			}
-			
+
 		} else {
 
 			//
@@ -153,7 +152,7 @@ DefinitionMgrClass::Find_Definition (uint32 id, bool twiddle)
 				index += (upper_index - index) / 2;
 			} else {
 				upper_index = index;
-				index -= (index - lower_index) / 2;				
+				index -= (index - lower_index) / 2;
 			}
 		}
 	}
@@ -189,7 +188,7 @@ DefinitionMgrClass::Find_Named_Definition (const char *name, bool twiddle)
 	//
 	for (int index = 0; index < _DefinitionCount; index ++) {
 		DefinitionClass *curr_def = _SortedDefinitionArray[index];
-		
+
 		//
 		//	Is this the definition we were looking for?
 		//
@@ -227,7 +226,7 @@ DefinitionMgrClass::Find_Typed_Definition (const char *name, uint32 class_id, bo
 	//	Sanity check
 	//
 	if (DefinitionHash == NULL) {
-		WWDEBUG_SAY (("DefinitionMgrClass::Find_Typed_Definition () failed due to a NULL DefinitionHash.\n"));
+		WWDEBUG_SAY (("DefinitionMgrClass::Find_Typed_Definition () failed due to a NULL DefinitionHash."));
 		return NULL;
 	}
 
@@ -291,7 +290,7 @@ DefinitionMgrClass::Find_Typed_Definition (const char *name, uint32 class_id, bo
 						break;
 					}
 				}
-			}				
+			}
 		}
 	}
 
@@ -321,11 +320,11 @@ DefinitionMgrClass::List_Available_Definitions (void)
 	//
 	//	Loop through all the definitions and print the definition name
 	//
-	WWDEBUG_SAY(("Available definitions:\n"));
+	WWDEBUG_SAY(("Available definitions:"));
 	for (int index = 0; index < _DefinitionCount; index ++) {
-		DefinitionClass *curr_def = _SortedDefinitionArray[index];		
+		DefinitionClass *curr_def = _SortedDefinitionArray[index];
 		if (curr_def != NULL) {
-			WWDEBUG_SAY(("  >%s<\n", curr_def->Get_Name ()));
+			WWDEBUG_SAY(("  >%s<", curr_def->Get_Name ()));
 		}
 	}
 
@@ -344,13 +343,13 @@ DefinitionMgrClass::List_Available_Definitions (int superclass_id)
 	//
 	//	Loop through all the definitions and print the definition name
 	//
-	WWDEBUG_SAY(("Available superclass definitions for 0x%8X:\n", superclass_id));
+	WWDEBUG_SAY(("Available superclass definitions for 0x%8X:", superclass_id));
 	DefinitionClass *definition = NULL;
 	for (	definition = Get_First (superclass_id, DefinitionMgrClass::ID_SUPERCLASS);
 			definition != NULL;
 			definition = Get_Next (definition, superclass_id, DefinitionMgrClass::ID_SUPERCLASS))
 	{
-		WWDEBUG_SAY(("  >%s<\n", definition->Get_Name ()));
+		WWDEBUG_SAY(("  >%s<", definition->Get_Name ()));
 	}
 
 	return ;
@@ -375,7 +374,7 @@ DefinitionMgrClass::Get_First (uint32 id, ID_TYPE type)
 			(definition == NULL) && (index < _DefinitionCount);
 			index ++)
 	{
-		DefinitionClass *curr_def = _SortedDefinitionArray[index];		
+		DefinitionClass *curr_def = _SortedDefinitionArray[index];
 		if (curr_def != NULL) {
 
 			//
@@ -417,7 +416,7 @@ DefinitionMgrClass::Get_Next
 	for (	int index = curr_def->m_DefinitionMgrLink + 1;
 			(definition == NULL) && (index < _DefinitionCount);
 			index ++)
-	{		
+	{
 		DefinitionClass *curr_def = _SortedDefinitionArray[index];
 		if (curr_def != NULL) {
 
@@ -479,27 +478,21 @@ DefinitionMgrClass::Free_Definitions (void)
 		DefinitionHash=NULL;
 	}
 
-	//
-	//	Free each of the definition objects
-	//	
-	for (int index = 0; index < _DefinitionCount; index ++) {
-		DefinitionClass *definition = _SortedDefinitionArray[index];
-		if (definition != NULL) {
-			delete definition;
-		}
-	}
-
 	//
 	//	Free the definition array
 	//
 	if (_SortedDefinitionArray != NULL) {
+		//
+		//	Free each of the definition objects
+		//
+		for (int index = 0; index < _DefinitionCount; index ++) {
+			delete _SortedDefinitionArray[index];
+		}
 		delete [] _SortedDefinitionArray;
+		_SortedDefinitionArray = NULL;
+		_MaxDefinitionCount = 0;
+		_DefinitionCount = 0;
 	}
-
-	_SortedDefinitionArray	= NULL;
-	_MaxDefinitionCount		= 0;
-	_DefinitionCount			= 0;
-	return ;
 }
 
 
@@ -527,11 +520,9 @@ DefinitionMgrClass::Prepare_Definition_Array (void)
 		//
 		//	Free the old array and start using the new array
 		//
-		if (_SortedDefinitionArray != NULL) {
-			delete [] _SortedDefinitionArray;
-		}
+		delete [] _SortedDefinitionArray;
 		_SortedDefinitionArray	= new_array;
-		_MaxDefinitionCount		= new_size;		
+		_MaxDefinitionCount		= new_size;
 	}
 	if (!DefinitionHash) DefinitionHash=W3DNEW HashTemplateClass<StringClass, DynamicVectorClass<DefinitionClass*>*>;
 
@@ -566,7 +557,7 @@ DefinitionMgrClass::Register_Definition (DefinitionClass *definition)
 		bool is_valid		= true;
 
 		while (keep_going) {
-			
+
 			DefinitionClass *curr_def = _SortedDefinitionArray[index];
 			WWASSERT (curr_def != NULL);
 
@@ -588,7 +579,7 @@ DefinitionMgrClass::Register_Definition (DefinitionClass *definition)
 					index += (upper_index - index) / 2;
 				} else {
 					upper_index = index;
-					index -= (index - lower_index) / 2;				
+					index -= (index - lower_index) / 2;
 				}
 
 				//
@@ -652,12 +643,12 @@ DefinitionMgrClass::Unregister_Definition (DefinitionClass *definition)
 			_SortedDefinitionArray[index] = _SortedDefinitionArray[index + 1];
 			_SortedDefinitionArray[index]->m_DefinitionMgrLink = index;
 		}
-		
+
 		_SortedDefinitionArray[_DefinitionCount - 1] = NULL;
 		definition->m_DefinitionMgrLink = -1;
 		_DefinitionCount --;
 	}
-	
+
 	return ;
 }
 
@@ -674,16 +665,16 @@ DefinitionMgrClass::Save
 )
 {
 	WWMEMLOG(MEM_GAMEDATA);
-	
+
 	bool retval = true;
 
 	//
 	//	Create a chunk to contain the class variables we need to serialize.
 	//
-	csave.Begin_Chunk (CHUNKID_VARIABLES);	
+	csave.Begin_Chunk (CHUNKID_VARIABLES);
 	Save_Variables (csave);
 	csave.End_Chunk ();
-	
+
 	//
 	//	Have the base class write the objects to their own chunk.
 	//
@@ -708,7 +699,7 @@ DefinitionMgrClass::Load (ChunkLoadClass &cload)
 
 	while (cload.Open_Chunk ()) {
 		switch (cload.Cur_Chunk_ID ()) {
-			
+
 			//
 			//	If this is the chunk that contains the class variables, then
 			// loop through and read each microchunk
@@ -799,15 +790,15 @@ DefinitionMgrClass::Load_Objects (ChunkLoadClass &cload)
 		//
 		PersistFactoryClass *factory = SaveLoadSystemClass::Find_Persist_Factory (cload.Cur_Chunk_ID ());
 		if (factory != NULL) {
-			
+
 			DefinitionClass *definition = (DefinitionClass *)factory->Load (cload);
 			if (definition != NULL) {
 
 				//
 				//	Add this definition to our array
-				//				
+				//
 				Prepare_Definition_Array ();
-				_SortedDefinitionArray[_DefinitionCount ++] = definition;				
+				_SortedDefinitionArray[_DefinitionCount ++] = definition;
 			}
 		}
 
@@ -847,7 +838,7 @@ DefinitionMgrClass::Load_Variables (ChunkLoadClass &cload)
 	//
 	while (cload.Open_Micro_Chunk ()) {
 		switch (cload.Cur_Micro_Chunk_ID ()) {
-			
+
 			case VARID_NEXTDEFID:
 				break;
 		}
@@ -888,7 +879,7 @@ DefinitionMgrClass::Get_New_ID (uint32 class_id)
 			//	Is this id in the range we are looking for?
 			//
 			if (curr_id >= idrange_start && curr_id < idrange_end) {
-				
+
 				bool is_ok = false;
 				if (index < _DefinitionCount - 1) {
 
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h
index de2673fbf32..ade932edbd9 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h
@@ -34,14 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-#ifndef __DEFINITION_MGR_H
-#define __DEFINITION_MGR_H
 
 #include "always.h"
 #include "saveload.h"
@@ -50,7 +43,7 @@
 #include "wwdebug.h"
 #include "wwstring.h"
 #include "hashtemplate.h"
-#include "Vector.H"
+#include "Vector.h"
 
 
 // Forward declarations
@@ -82,13 +75,13 @@ class DefinitionMgrClass : public SaveLoadSubSystemClass
 
 	// From SaveLoadSubSystemClass
 	virtual uint32					Chunk_ID (void) const;
-	
+
 	// Type identification
 	static DefinitionClass *	Find_Definition (uint32 id, bool twiddle = true);
 	static DefinitionClass *	Find_Named_Definition (const char *name, bool twiddle = true);
 	static DefinitionClass *	Find_Typed_Definition (const char *name, uint32 class_id, bool twiddle = true);
-   static void                List_Available_Definitions (void); 
-   static void                List_Available_Definitions (int superclass_id); 	
+   static void                List_Available_Definitions (void);
+   static void                List_Available_Definitions (int superclass_id);
 	static uint32					Get_New_ID (uint32 class_id);
 
 	// Definition registration
@@ -122,12 +115,12 @@ class DefinitionMgrClass : public SaveLoadSubSystemClass
 	virtual bool					Save (ChunkSaveClass &csave);
 	virtual bool					Load (ChunkLoadClass &cload);
 	virtual const char*			Name (void) const						{ return "DefinitionMgrClass"; }
-	
+
 	// Persistence methods
 	bool								Save_Objects (ChunkSaveClass &csave);
 	bool								Load_Objects (ChunkLoadClass &cload);
 	bool								Save_Variables (ChunkSaveClass &csave);
-	bool								Load_Variables (ChunkLoadClass &cload);	
+	bool								Load_Variables (ChunkLoadClass &cload);
 
 private:
 	static HashTemplateClass<StringClass, DynamicVectorClass<DefinitionClass*>*>* DefinitionHash;
@@ -140,14 +133,14 @@ class DefinitionMgrClass : public SaveLoadSubSystemClass
 
 	/////////////////////////////////////////////////////////////////////
 	//	Static member data
-	/////////////////////////////////////////////////////////////////////	
+	/////////////////////////////////////////////////////////////////////
 	static DefinitionClass **	_SortedDefinitionArray;
 	static int						_MaxDefinitionCount;
 	static int						_DefinitionCount;
 
 	/////////////////////////////////////////////////////////////////////
 	//	Friend classes
-	/////////////////////////////////////////////////////////////////////	
+	/////////////////////////////////////////////////////////////////////
 	friend class DefinitionClass;
 };
 
@@ -182,6 +175,3 @@ DefinitionMgrClass::Get_First (void)
 
 	return definition;
 }
-
-
-#endif //__DEFINITION_MGR_H
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h
index 1438e38b0e8..059b5dcf9ac 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h
@@ -41,15 +41,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-#ifndef __EDITABLE_H
-#define __EDITABLE_H
-
 
 #include "always.h"
 #include "persist.h"
@@ -162,7 +154,7 @@ EditableClass::Unlock_Parameter (int i)
 
 	#define EDITABLE_PARAM(_class, type, data)						plist_##_class.Add (&(data), #data, type);
 	#define NAMED_EDITABLE_PARAM(_class, type, data, name)		plist_##_class.Add (&(data), name, type);
-	
+
 	#define INT_EDITABLE_PARAM(_class, data, min, max) {						\
 		IntParameterClass *param = W3DNEW IntParameterClass( &data, #data);	\
 		param->Set_Range (min, max);													\
@@ -190,14 +182,14 @@ EditableClass::Unlock_Parameter (int i)
 		FloatParameterClass *param = W3DNEW FloatParameterClass( &data, #data);	\
 		param->Set_Range (min, max);														\
 		param->Set_Units_Name(unitsname);												\
-		plist_##_class.Add (param); }	
+		plist_##_class.Add (param); }
 
 	#define NAMED_FLOAT_UNITS_PARAM(_class, data, min, max, unitsname,name) {	\
 		FloatParameterClass *param = W3DNEW FloatParameterClass( &data, #data);		\
 		param->Set_Range (min, max);															\
 		param->Set_Units_Name(unitsname);													\
 		param->Set_Name(name);																	\
-		plist_##_class.Add (param); }	
+		plist_##_class.Add (param); }
 
 	#define ANGLE_EDITABLE_PARAM(_class, data, min, max) {						\
 		AngleParameterClass *param = W3DNEW AngleParameterClass( &data, #data);	\
@@ -306,34 +298,28 @@ EditableClass::Unlock_Parameter (int i)
 	#define DECLARE_EDITABLE(_class, _parent)
 	#define EDITABLE_PARAM(_class, type, data)
 	#define NAMED_EDITABLE_PARAM(_class, type, data, name)
-	#define INT_EDITABLE_PARAM(_class, data, min, max) 						
-	#define INT_UNITS_PARAM(_class, data, min, max, unitsname) 	   	
-	#define NAMED_INT_UNITS_PARAM(_class,data,min,max,unitsname,name) 	
-	#define FLOAT_EDITABLE_PARAM(_class, data, min, max) 						
-	#define FLOAT_UNITS_PARAM(_class, data, min, max, unitsname) 				
-	#define NAMED_FLOAT_UNITS_PARAM(_class, data, min, max, unitsname,name) 	
-	#define ANGLE_EDITABLE_PARAM(_class, data, min, max) 						
-	#define NAMED_ANGLE_EDITABLE_PARAM(_class, data, min, max, name) 		
-	#define GENERIC_EDITABLE_PARAM(_class, param)	
-	#define MODEL_DEF_PARAM(_class, data, name) 									
-	#define PHYS_DEF_PARAM(_class, data, name) 										
+	#define INT_EDITABLE_PARAM(_class, data, min, max)
+	#define INT_UNITS_PARAM(_class, data, min, max, unitsname)
+	#define NAMED_INT_UNITS_PARAM(_class,data,min,max,unitsname,name)
+	#define FLOAT_EDITABLE_PARAM(_class, data, min, max)
+	#define FLOAT_UNITS_PARAM(_class, data, min, max, unitsname)
+	#define NAMED_FLOAT_UNITS_PARAM(_class, data, min, max, unitsname,name)
+	#define ANGLE_EDITABLE_PARAM(_class, data, min, max)
+	#define NAMED_ANGLE_EDITABLE_PARAM(_class, data, min, max, name)
+	#define GENERIC_EDITABLE_PARAM(_class, param)
+	#define MODEL_DEF_PARAM(_class, data, name)
+	#define PHYS_DEF_PARAM(_class, data, name)
 	#define SCRIPT_PARAM(_class, name, params)
 	#define SCRIPTLIST_PARAM(_class, name, name_list, param_list)
-	#define ENUM_PARAM(_class, data, params) 							
-	#define FILENAME_PARAM(_class, data, desc, extension) 						
+	#define ENUM_PARAM(_class, data, params)
+	#define FILENAME_PARAM(_class, data, desc, extension)
 	#define NAMED_FILENAME_PARAM(_class, data, name, desc, extension)
 	#define TEXTURE_FILENAME_PARAM(_class, data, desc, extension)
 	#define NAMED_TEXTURE_FILENAME_PARAM(_class, data, name, desc, extension)
-	#define DEFIDLIST_PARAM(_class, data, root_class_id) 							
-	#define CLASSID_DEFIDLIST_PARAM(_class, data, root_class_id, class_id, name) 	
-	#define ZONE_PARAM(_class, data, name) 											
-	#define PARAM_SEPARATOR(_class, name) 											
-	#define GENERIC_DEFID_PARAM(_class, data, root_class_id) 						
+	#define DEFIDLIST_PARAM(_class, data, root_class_id)
+	#define CLASSID_DEFIDLIST_PARAM(_class, data, root_class_id, class_id, name)
+	#define ZONE_PARAM(_class, data, name)
+	#define PARAM_SEPARATOR(_class, name)
+	#define GENERIC_DEFID_PARAM(_class, data, root_class_id)
 
 #endif //PARAM_EDITING_ON
-
-
-#endif //__EDITABLE_H
-
-
-
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.cpp
index 1cf99dc10c7..534e0ada3bb 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.cpp
@@ -57,7 +57,7 @@ ParameterClass::Construct (Type type, void *data, const char *name)
 {
 	ParameterClass *new_param = NULL;
 	switch (type) {
-		
+
 		case TYPE_INT:
 			new_param = W3DNEW IntParameterClass (data, name);
 			break;
@@ -146,7 +146,7 @@ ParameterClass::Construct (Type type, void *data, const char *name)
 		case TYPE_EXPLOSIONDEFINITIONID:
 			new_param = W3DNEW ExplosionObjDefParameterClass ((int *)data);
 			new_param->Set_Name (name);
-			break;		
+			break;
 
 		case TYPE_SOUNDDEFINITIONID:
 			new_param = W3DNEW SoundDefParameterClass ((int *)data);
@@ -201,7 +201,7 @@ ParameterClass::Construct (Type type, void *data, const char *name)
 /////////////////////////////////////////////////////////////////////
 StringParameterClass::StringParameterClass (StringClass *string)
 	:	m_String (string)
-{	
+{
 	return ;
 }
 
@@ -333,7 +333,7 @@ StringParameterClass::Set_String (const char * string)
 /////////////////////////////////////////////////////////////////////
 FilenameParameterClass::FilenameParameterClass (StringClass *string)
 	:	StringParameterClass (string)
-{	
+{
 	return ;
 }
 
@@ -420,7 +420,7 @@ TextureFilenameParameterClass::TextureFilenameParameterClass (StringClass *strin
 :	FilenameParameterClass (string),
 	Show_Alpha(false),
 	Show_Texture(false)
-{	
+{
 }
 
 
@@ -443,7 +443,7 @@ TextureFilenameParameterClass::TextureFilenameParameterClass (const TextureFilen
 /////////////////////////////////////////////////////////////////////
 void TextureFilenameParameterClass::Copy_Value (const ParameterClass &src)
 {
-	if (src.Is_Type (ParameterClass::TYPE_TEXTURE_FILENAME)) 
+	if (src.Is_Type (ParameterClass::TYPE_TEXTURE_FILENAME))
 	{
 		Set_String (((FilenameParameterClass &)src).Get_String ());
 	}
@@ -467,7 +467,7 @@ void TextureFilenameParameterClass::Copy_Value (const ParameterClass &src)
 /////////////////////////////////////////////////////////////////////
 SoundFilenameParameterClass::SoundFilenameParameterClass (StringClass *string)
 	:	FilenameParameterClass (string)
-{	
+{
 	return ;
 }
 
@@ -525,7 +525,7 @@ SoundFilenameParameterClass::operator== (const SoundFilenameParameterClass &src)
 /////////////////////////////////////////////////////////////////////
 EnumParameterClass::EnumParameterClass (int *value)
 	:	m_Value (value)
-{	
+{
 	return ;
 }
 
@@ -633,7 +633,7 @@ EnumParameterClass::Add_Value (const char *display_name, int value)
 //	Add_Value
 //
 /////////////////////////////////////////////////////////////////////
-void __cdecl 
+void __cdecl
 EnumParameterClass::Add_Values (const char *first_name, int first_value, ...)
 {
 	m_List.Add (ENUM_VALUE(first_name, first_value));
@@ -645,7 +645,7 @@ EnumParameterClass::Add_Values (const char *first_name, int first_value, ...)
 	//	Add all the params on the stack (until we found
 	// the terminator)
 	//
-	bool more_params = true;	
+	bool more_params = true;
 	while (more_params) {
 
 		//
@@ -655,15 +655,15 @@ EnumParameterClass::Add_Values (const char *first_name, int first_value, ...)
 		if (name == NULL) {
 			more_params = false;
 		} else {
-			
+
 			//
 			//	Add the string/id pair to the enum list
 			//
 			int value = va_arg (arg_list, int);
 			m_List.Add (ENUM_VALUE(name, value));
-		}		
+		}
 	}
-	
+
 	va_end (arg_list);
 	return ;
 }
@@ -684,7 +684,7 @@ EnumParameterClass::Add_Values (const char *first_name, int first_value, ...)
 /////////////////////////////////////////////////////////////////////
 PhysDefParameterClass::PhysDefParameterClass (int *id)
 	:	m_Value (id)
-{	
+{
 	return ;
 }
 
@@ -782,7 +782,7 @@ PhysDefParameterClass::Copy_Value (const ParameterClass &/*src*/)
 /////////////////////////////////////////////////////////////////////
 ModelDefParameterClass::ModelDefParameterClass (int *id)
 	:	m_Value (id)
-{	
+{
 	return ;
 }
 
@@ -879,7 +879,7 @@ ModelDefParameterClass::Copy_Value (const ParameterClass &/*src*/)
 /////////////////////////////////////////////////////////////////////
 DefParameterClass::DefParameterClass (int *id)
 	:	m_Value (id)
-{	
+{
 	return ;
 }
 
@@ -982,7 +982,7 @@ DefParameterClass::Copy_Value (const ParameterClass &src)
 GenericDefParameterClass::GenericDefParameterClass (int *id)
 	:	m_ClassID (0),
 		DefParameterClass (id)
-{	
+{
 	return ;
 }
 
@@ -1083,7 +1083,7 @@ GenericDefParameterClass::Copy_Value (const ParameterClass &src)
 /////////////////////////////////////////////////////////////////////
 GameObjDefParameterClass::GameObjDefParameterClass (int *id)
 	:	DefParameterClass (id)
-{	
+{
 	return ;
 }
 
@@ -1183,7 +1183,7 @@ GameObjDefParameterClass::Copy_Value (const ParameterClass &src)
 /////////////////////////////////////////////////////////////////////
 WeaponObjDefParameterClass::WeaponObjDefParameterClass (int *id)
 	:	GameObjDefParameterClass (id)
-{	
+{
 	return ;
 }
 
@@ -1284,7 +1284,7 @@ WeaponObjDefParameterClass::Copy_Value (const ParameterClass &src)
 /////////////////////////////////////////////////////////////////////
 AmmoObjDefParameterClass::AmmoObjDefParameterClass (int *id)
 	:	GameObjDefParameterClass (id)
-{	
+{
 	return ;
 }
 
@@ -1385,7 +1385,7 @@ AmmoObjDefParameterClass::Copy_Value (const ParameterClass &src)
 /////////////////////////////////////////////////////////////////////
 ExplosionObjDefParameterClass::ExplosionObjDefParameterClass (int *id)
 	:	GameObjDefParameterClass (id)
-{	
+{
 	return ;
 }
 
@@ -1486,7 +1486,7 @@ ExplosionObjDefParameterClass::Copy_Value (const ParameterClass &src)
 /////////////////////////////////////////////////////////////////////
 SoundDefParameterClass::SoundDefParameterClass (int *id)
 	:	DefParameterClass (id)
-{	
+{
 	return ;
 }
 
@@ -1569,7 +1569,7 @@ SoundDefParameterClass::operator== (const ParameterClass &src)
 ScriptParameterClass::ScriptParameterClass (StringClass *name, StringClass *params)
 	:	m_ScriptName (name),
 		m_ScriptParams (params)
-{	
+{
 	return ;
 }
 
@@ -1618,7 +1618,7 @@ ScriptParameterClass::operator== (const ScriptParameterClass &src)
 	if (	(m_ScriptName != NULL) && (src.m_ScriptName != NULL) &&
 			(m_ScriptParams != NULL) && (src.m_ScriptParams != NULL))
 	{
-	
+
 		//
 		//	Simple string compares should workd
 		//
@@ -1685,7 +1685,7 @@ DefIDListParameterClass::DefIDListParameterClass (DynamicVectorClass<int> *list)
 	:	m_IDList (list),
 		m_ClassID (0),
 		m_SelectedClassID (NULL)
-{	
+{
 	return ;
 }
 
@@ -1789,8 +1789,8 @@ DefIDListParameterClass::Copy_Value (const ParameterClass &src)
 {
 	if (src.Is_Type (ParameterClass::TYPE_DEFINITIONIDLIST)) {
 		DefIDListParameterClass real_src = (DefIDListParameterClass &)src;
-		
-		m_ClassID				= real_src.m_ClassID;		
+
+		m_ClassID				= real_src.m_ClassID;
 		(*m_IDList)				= (*real_src.m_IDList);
 
 		if (m_SelectedClassID != NULL && real_src.m_SelectedClassID != NULL) {
@@ -1817,7 +1817,7 @@ DefIDListParameterClass::Copy_Value (const ParameterClass &src)
 /////////////////////////////////////////////////////////////////////
 ZoneParameterClass::ZoneParameterClass (OBBoxClass *box)
 	:	m_OBBox (box)
-{	
+{
 	return ;
 }
 
@@ -1899,7 +1899,7 @@ ZoneParameterClass::Copy_Value (const ParameterClass &src)
 {
 	if (src.Is_Type (ParameterClass::TYPE_ZONE)) {
 		ZoneParameterClass real_src = (ZoneParameterClass &)src;
-		
+
 		(*m_OBBox)	= (*real_src.m_OBBox);
 	}
 
@@ -1921,8 +1921,8 @@ ZoneParameterClass::Copy_Value (const ParameterClass &src)
 //
 /////////////////////////////////////////////////////////////////////
 FilenameListParameterClass::FilenameListParameterClass (DynamicVectorClass<StringClass> *list)
-	:	m_FilenameList (list)		
-{	
+	:	m_FilenameList (list)
+{
 	return ;
 }
 
@@ -2015,7 +2015,7 @@ void
 FilenameListParameterClass::Copy_Value (const ParameterClass &src)
 {
 	if (src.Is_Type (ParameterClass::TYPE_FILENAMELIST)) {
-		FilenameListParameterClass real_src = (FilenameListParameterClass &)src;		
+		FilenameListParameterClass real_src = (FilenameListParameterClass &)src;
 		(*m_FilenameList) = (*real_src.m_FilenameList);
 	}
 
@@ -2043,7 +2043,7 @@ ScriptListParameterClass::ScriptListParameterClass
 )
 	:	m_NameList (name_list),
 		m_ParamList (param_list)
-{	
+{
 	return ;
 }
 
@@ -2158,7 +2158,7 @@ void
 ScriptListParameterClass::Copy_Value (const ParameterClass &src)
 {
 	if (src.Is_Type (ParameterClass::TYPE_SCRIPTLIST)) {
-		ScriptListParameterClass &real_src = (ScriptListParameterClass &)src;		
+		ScriptListParameterClass &real_src = (ScriptListParameterClass &)src;
 		(*m_NameList)	= (*real_src.m_NameList);
 		(*m_ParamList)	= (*real_src.m_ParamList);
 	}
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h
index 13921e20d90..686bf88c292 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h
@@ -36,19 +36,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __PARAMETER_H
-#define __PARAMETER_H
 
 #include "always.h"
-#include <string.h>
 #include <stdlib.h>
 #include "parametertypes.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "wwstring.h"
 #include "bittype.h"
 #include "obbox.h"
@@ -127,11 +120,11 @@ class ParameterClass
 	// Type identification (see paramtypes.h in wwsaveload)
 	virtual Type				Get_Type (void) const = 0;
 	virtual bool				Is_Type (Type type) const { return false; }
-	
+
 	// Modification
 	virtual bool				Is_Modifed (void) const				{ return IsModified; }
 	virtual void				Set_Modified (bool onoff = true)	{ IsModified = onoff; }
-	
+
 	// Display name methods
 	virtual const char *		Get_Name (void) const;
 	virtual void				Set_Name (const char *new_name);
@@ -146,7 +139,7 @@ class ParameterClass
 	//////////////////////////////////////////////////////////////////////////////
 	//	Static methods
 	//////////////////////////////////////////////////////////////////////////////
-	
+
 	// Virtual constructor used to create a new instance of any parameter type
 	static ParameterClass *	Construct (ParameterClass::Type type, void *data, const char *param_name);
 
@@ -259,7 +252,7 @@ ParameterClass::Set_Units_Name (const char *new_name)
 //////////////////////////////////////////////////////////////////////////////////
 class StringParameterClass : public ParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -306,7 +299,7 @@ class StringParameterClass : public ParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class FilenameParameterClass : public StringParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -355,7 +348,7 @@ class FilenameParameterClass : public StringParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class TextureFilenameParameterClass : public FilenameParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -397,7 +390,7 @@ class TextureFilenameParameterClass : public FilenameParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class SoundFilenameParameterClass : public FilenameParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -428,7 +421,7 @@ class SoundFilenameParameterClass : public FilenameParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class EnumParameterClass : public ParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -458,7 +451,7 @@ class EnumParameterClass : public ParameterClass
 	virtual int					Get_Count (void) const					{ return m_List.Count (); }
 	virtual const char *		Get_Entry_Name (int index) const		{ return m_List[index].name; }
 	virtual int					Get_Entry_Value (int index) const	{ return m_List[index].value; }
-	
+
 	virtual void				Set_Selected_Value (int value)	{ (*m_Value) = value; Set_Modified (); }
 	virtual int					Get_Selected_Value (void) const	{ return (*m_Value); }
 
@@ -495,7 +488,7 @@ class EnumParameterClass : public ParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class PhysDefParameterClass : public ParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -545,7 +538,7 @@ class PhysDefParameterClass : public ParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class ModelDefParameterClass : public ParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -595,7 +588,7 @@ class ModelDefParameterClass : public ParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class DefParameterClass : public ParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -641,7 +634,7 @@ class DefParameterClass : public ParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class GenericDefParameterClass : public DefParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -688,7 +681,7 @@ class GenericDefParameterClass : public DefParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class GameObjDefParameterClass : public DefParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -735,7 +728,7 @@ class GameObjDefParameterClass : public DefParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class AmmoObjDefParameterClass : public GameObjDefParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -771,7 +764,7 @@ class AmmoObjDefParameterClass : public GameObjDefParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class WeaponObjDefParameterClass : public GameObjDefParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -807,7 +800,7 @@ class WeaponObjDefParameterClass : public GameObjDefParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class ExplosionObjDefParameterClass : public GameObjDefParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -844,7 +837,7 @@ class ExplosionObjDefParameterClass : public GameObjDefParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class SoundDefParameterClass : public DefParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -877,7 +870,7 @@ class SoundDefParameterClass : public DefParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class ScriptParameterClass : public ParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -927,7 +920,7 @@ class ScriptParameterClass : public ParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class DefIDListParameterClass : public ParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -980,7 +973,7 @@ class DefIDListParameterClass : public ParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class ZoneParameterClass : public ParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -1028,7 +1021,7 @@ class ZoneParameterClass : public ParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class FilenameListParameterClass : public ParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -1075,7 +1068,7 @@ class FilenameListParameterClass : public ParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class ScriptListParameterClass : public ParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -1128,7 +1121,7 @@ class ScriptListParameterClass : public ParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class SeparatorParameterClass : public ParameterClass
 {
-public:	
+public:
 
 	//////////////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
@@ -1155,7 +1148,3 @@ class SeparatorParameterClass : public ParameterClass
 	// Copy methods
 	virtual void				Copy_Value (const ParameterClass &src);
 };
-
-
-#endif //__PARAMETER_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h
index 5f0917c691f..80ba4a737fb 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h
@@ -34,19 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-
-
-#ifndef __PARAMETER_LIST_H
-#define __PARAMETER_LIST_H
 
 #include "always.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "parameter.h"
 #include "wwdebug.h"
 
@@ -60,7 +51,7 @@ class ParameterListClass : public DynamicVectorClass<ParameterClass *>
 	using DynamicVectorClass<ParameterClass *>::Vector;
 
 public:
-	
+
 	/////////////////////////////////////////////////////////////////////
 	// Public constructurs/destructors
 	/////////////////////////////////////////////////////////////////////
@@ -108,7 +99,7 @@ ParameterListClass::Add (void *data, const char *param_name, ParameterClass::Typ
 	//	Create a new parameter object
 	//
 	ParameterClass *new_param = ParameterClass::Construct (type, data, param_name);
-	
+
 	//
 	//	Add the new paramter object to our list
 	//
@@ -142,22 +133,16 @@ ParameterListClass::Add (ParameterClass *new_param)
 inline void
 ParameterListClass::Free_Parameters (void)
 {
-	for (int index = 0; index < Count (); index ++) {		
+	for (int index = 0; index < Count (); index ++) {
 		ParameterClass *param = Vector[index];
-		
+
 		//
 		//	Free the parameter object
 		//
-		if (param != NULL) {
-			delete param;
-		}
+		delete param;
 	}
 
 	Delete_All();
 //	m_Parameters.Delete_All ();
 	return ;
 }
-
-
-#endif //__PARAMETER_LIST_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h
index b8be2d3061b..8964521f6fc 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h
@@ -34,15 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-
-#ifndef __PARAMETER_TYPES_H
-#define __PARAMETER_TYPES_H
 
 #include "always.h"
 
@@ -63,7 +55,3 @@
 	TYPE_MODELFILENAME
 
 }	ParameterType;*/
-
-
-#endif //__PARAMETER_TYPES_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h
index 82865e875cc..ce46315ce98 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h
@@ -34,16 +34,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef PERSIST_H
-#define PERSIST_H
 
 #include "always.h"
-#include "refcount.h"
 #include "postloadable.h"
 
 class PersistFactoryClass;
@@ -56,9 +49,9 @@ class ChunkLoadClass;
 //	PersistClass
 //
 // PersistClass defines the interface for an object to the save load system.
-// Each concrete derived type of PersistClass must have an associated 
+// Each concrete derived type of PersistClass must have an associated
 // PersistFactoryClass that basically maps a chunk_id to a constructor,
-// a save function, a load function, and a on_post_load function (taken from 
+// a save function, a load function, and a on_post_load function (taken from
 // PostLoadableClass )
 //
 //////////////////////////////////////////////////////////////////////////////////
@@ -71,7 +64,3 @@ class PersistClass : public PostLoadableClass
 	virtual bool								Load (ChunkLoadClass &cload)		{ return true; }
 
 };
-
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.cpp
index 997b09cd6f8..ca81e905c5f 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.cpp
@@ -38,7 +38,7 @@
 #include "persistfactory.h"
 #include "saveload.h"
 
-PersistFactoryClass::PersistFactoryClass(void) : 
+PersistFactoryClass::PersistFactoryClass(void) :
 	NextFactory(NULL)
 {
 	SaveLoadSystemClass::Register_Persist_Factory(this);
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h
index 14a12d57d81..0599936a178 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h
@@ -34,16 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-
-
-#ifndef PERSISTFACTORY_H
-#define PERSISTFACTORY_H
 
 #include "always.h"
 #include "bittype.h"
@@ -97,7 +88,7 @@ template <class T,int CHUNKID> class SimplePersistFactoryClass : public PersistF
 	/*
 	** Internal chunk id's
 	*/
-	enum 
+	enum
 	{
 		SIMPLEFACTORY_CHUNKID_OBJPOINTER		=	 0x00100100,
 		SIMPLEFACTORY_CHUNKID_OBJDATA
@@ -105,8 +96,8 @@ template <class T,int CHUNKID> class SimplePersistFactoryClass : public PersistF
 };
 
 
-template<class T, int CHUNKID> PersistClass * 
-SimplePersistFactoryClass<T,CHUNKID>::Load(ChunkLoadClass & cload) const 
+template<class T, int CHUNKID> PersistClass *
+SimplePersistFactoryClass<T,CHUNKID>::Load(ChunkLoadClass & cload) const
 {
 	T * new_obj = W3DNEW T;
 	T * old_obj = NULL;
@@ -127,7 +118,7 @@ SimplePersistFactoryClass<T,CHUNKID>::Load(ChunkLoadClass & cload) const
 
 
 template<class T, int CHUNKID> void
-SimplePersistFactoryClass<T,CHUNKID>::Save(ChunkSaveClass & csave,PersistClass * obj) const 
+SimplePersistFactoryClass<T,CHUNKID>::Save(ChunkSaveClass & csave,PersistClass * obj) const
 {
 	uint32 objptr = (uint32)obj;
 	csave.Begin_Chunk(SIMPLEFACTORY_CHUNKID_OBJPOINTER);
@@ -138,6 +129,3 @@ SimplePersistFactoryClass<T,CHUNKID>::Save(ChunkSaveClass & csave,PersistClass *
 	obj->Save(csave);
 	csave.End_Chunk();
 }
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.cpp
index 5fc69176649..21dc60f1bf4 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.cpp
@@ -36,7 +36,6 @@
 
 
 #include "pointerremap.h"
-#include "refcount.h"
 #include "wwdebug.h"
 
 
@@ -94,11 +93,11 @@ void PointerRemapClass::Process_Request_Table(DynamicVectorClass<PtrRemapStruct>
 
 		// Find the pair which contains the pointer we are looking for as its "old" pointer
 		while (	(pair_index < PointerPairTable.Count()) &&
-					(PointerPairTable[pair_index].OldPointer < pointer_to_remap)  ) 
+					(PointerPairTable[pair_index].OldPointer < pointer_to_remap)  )
 		{
 			pair_index++;
 		}
-	
+
 		if ((pair_index < PointerPairTable.Count()) && (PointerPairTable[pair_index].OldPointer == pointer_to_remap)) {
 
 			// we found the match, plug in the new pointer and add a ref if needed.
@@ -110,16 +109,16 @@ void PointerRemapClass::Process_Request_Table(DynamicVectorClass<PtrRemapStruct>
 			}
 
 		} else {
-			
+
 			// Failed to re-map the pointer.
 			// warn the user, set pointer to NULL, reset index to the pre_search_index.
 			// If this happens, things could be going very wrong.  (find out why its happening!)
 			pair_index = pre_search_index;
 			*request_table[pointer_index].PointerToRemap = NULL;
-#ifdef WWDEBUG			
+#ifdef WWDEBUG
 			const char * file = request_table[pointer_index].File;
 			int line = request_table[pointer_index].Line;
-			WWDEBUG_SAY(("Warning! Failed to re-map pointer! old_ptr = 0x%X  file = %s  line = %d\r\n",(unsigned int)pointer_to_remap,file,line));
+			WWDEBUG_SAY(("Warning! Failed to re-map pointer! old_ptr = 0x%X  file = %s  line = %d",(unsigned int)pointer_to_remap,file,line));
 			WWASSERT( 0 );
 #endif
 		}
@@ -194,7 +193,7 @@ int __cdecl PointerRemapClass::ptr_request_compare_function(void const * ptr1, v
 {
 	PtrRemapStruct * remap1 = (PtrRemapStruct *)ptr1;
 	PtrRemapStruct * remap2 = (PtrRemapStruct *)ptr2;
-	
+
 	void * old1 = *(remap1->PointerToRemap);
 	void * old2 = *(remap2->PointerToRemap);
 
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h
index 4397cf6d317..5c545583553 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h
@@ -34,29 +34,22 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-#ifndef POINTERREMAP_H
-#define POINTERREMAP_H
 
 #ifdef _UNIX
 #include "osdep/osdep.h"
 #endif
 
 #include "always.h"
-#include "Vector.H"
+#include "Vector.h"
 
 class RefCountClass;
 
 
-class PointerRemapClass 
+class PointerRemapClass
 {
 	public:
-		
+
 		PointerRemapClass(void);
 		~PointerRemapClass(void);
 
@@ -79,19 +72,19 @@ class PointerRemapClass
 		{
 			PtrPairStruct(void) {}
 			PtrPairStruct(void * oldptr,void * newptr) : OldPointer(oldptr),NewPointer(newptr) {}
-			bool operator == (const PtrPairStruct & that) { return ((OldPointer == that.OldPointer) && (NewPointer == that.NewPointer)); } 
-			bool operator != (const PtrPairStruct & that) { return !(*this == that); } 
-			
+			bool operator == (const PtrPairStruct & that) { return ((OldPointer == that.OldPointer) && (NewPointer == that.NewPointer)); }
+			bool operator != (const PtrPairStruct & that) { return !(*this == that); }
+
 			void *		OldPointer;
 			void *		NewPointer;
 		};
-		
+
 		struct PtrRemapStruct
 		{
 			PtrRemapStruct(void) {}
-			bool operator == (const PtrRemapStruct & that) { return (PointerToRemap == that.PointerToRemap); } 
-			bool operator != (const PtrRemapStruct & that) { return !(*this == that); } 
-			
+			bool operator == (const PtrRemapStruct & that) { return (PointerToRemap == that.PointerToRemap); }
+			bool operator != (const PtrRemapStruct & that) { return !(*this == that); }
+
 			void **			PointerToRemap;
 #ifdef WWDEBUG
 			const char *	File;
@@ -110,6 +103,3 @@ class PointerRemapClass
 		DynamicVectorClass<PtrRemapStruct>	PointerRequestTable;
 		DynamicVectorClass<PtrRemapStruct>	RefCountRequestTable;
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h
index f574daef445..d6c0e555f2f 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h
@@ -36,9 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef POSTLOADABLE_H
-#define POSTLOADABLE_H
-
+#pragma once
 
 //////////////////////////////////////////////////////////////////////////////////
 //
@@ -64,8 +62,3 @@ class PostLoadableClass
 
 	bool									IsPostLoadRegistered;
 };
-
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.cpp
index 35cddf8fee4..004d09544cb 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.cpp
@@ -83,7 +83,7 @@ bool SaveLoadSystemClass::Load (ChunkLoadClass &cload,bool auto_post_load)
 		SaveLoadSubSystemClass *sys = Find_Sub_System(cload.Cur_Chunk_ID ());
 		WWLOG_INTERMEDIATE("Find_Sub_System");
 		if (sys != NULL) {
-//WWRELEASE_SAY(("			Name: %s\n",sys->Name()));
+//WWRELEASE_SAY(("			Name: %s",sys->Name()));
 			INIT_SUB_STATUS(sys->Name());
 			ok &= sys->Load(cload);
 			WWLOG_INTERMEDIATE(sys->Name());
@@ -304,4 +304,4 @@ void Force_Link_WWSaveLoad (void)
 {
 	FORCE_LINK( Twiddler );
 	return ;
-}
\ No newline at end of file
+}
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h
index 5aa4ea5b711..05ac8b6e08e 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h
@@ -34,19 +34,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-#ifndef SAVELOAD_H
-#define SAVELOAD_H
 
 #include "always.h"
 #include "pointerremap.h"
 #include "bittype.h"
-#include "SLIST.H"
+#include "SLIST.h"
 
 class RefCountClass;
 class SaveLoadSubSystemClass;
@@ -63,9 +56,9 @@ class ChunkLoadClass;
 //
 // The WWSaveLoad library is a framework for saving and loading.  The main
 // goals that we attempted to achieve in designing this system are:
-// 
+//
 // - Save things in a form that could adapt as our code evolves.  We want
-//   to be able to load files which were created with a previous version of the 
+//   to be able to load files which were created with a previous version of the
 //   application into the current version.
 // - Use the same framework throughout all of our libraries with as small an
 //   impact on them as possible
@@ -81,10 +74,10 @@ class ChunkLoadClass;
 //   active at any given time.  PersistClass is an abstract interface which will allow
 //   objects to be used with the save-load system.  It was also important to keep the
 //   overhead caused by inheriting this class to an absolute minimum.
-// 
-// - PersistFactories: We need an automatic "virtual-constructor" or "abstract-factory" 
-//   system for all objects that get saved.  This is the PersistFactoryClass and the 
-//   automated SimplePersistFactory template.  All objects that "persist" are derived from 
+//
+// - PersistFactories: We need an automatic "virtual-constructor" or "abstract-factory"
+//   system for all objects that get saved.  This is the PersistFactoryClass and the
+//   automated SimplePersistFactory template.  All objects that "persist" are derived from
 //   PersistClass and all concrete derived PersistClasses have an associated static
 //   instance of a PersistFactory which handles their saving and construction upon encountering
 //   them while loading.  In certain cases these PersistFactories can also serve as
@@ -93,18 +86,18 @@ class ChunkLoadClass;
 //   is used in WW3D sometimes; we just save a render object name and then ask the WW3D asset
 //   manager to recreate that model for us.
 //
-// - SaveLoadSubSystems: The overall file structure will be governed by many sub-systems 
-//   (derived from SaveLoadSubSystemClass).  The application in-effect creates file formats 
+// - SaveLoadSubSystems: The overall file structure will be governed by many sub-systems
+//   (derived from SaveLoadSubSystemClass).  The application in-effect creates file formats
 //   by simply having the sub-systems that it wants write into a file.  In this way you can
 //   achieve things like saving only static data into one file and dynamic into another, etc.
 //   All persistant objects that get saved will be told to save by some sub-system.  For
-//   example: in Commando, I have a PhysicsDynamicDataSubSystem which saves all of the 
+//   example: in Commando, I have a PhysicsDynamicDataSubSystem which saves all of the
 //   dynamic physics objects.  In saving those objects I use the built-in PersistFactories
 //   and am therefore completely safe from new object types being added to the system, it will just
 //   automatically work
 //
 // - Pointer re-mapping: A pointer remaping system is built into the save-load system.  There
-//   are several things that happen in this system.  Each object, as it is saved and loaded, 
+//   are several things that happen in this system.  Each object, as it is saved and loaded,
 //   registers with the system its old address and its new address.  (the old address is saved
 //   and the new address is available once the object is created).   This is automated by the
 //   SimplePersistFactory for all but classes that use multiple inheritance.  During the load
@@ -116,7 +109,7 @@ class ChunkLoadClass;
 //
 // - Chunks: The file format will be chunk based since that gives us the flexibility to
 //   add new data and remove obsolete data without necessarily losing the ability
-//   to read old files.  We will use a "high-granularity" of chunks.  In many cases, each 
+//   to read old files.  We will use a "high-granularity" of chunks.  In many cases, each
 //   member variable will be in its own chunk for maximum flexibility.  To help soften
 //   the memory usage for this approach, we developed the concept of "micro-chunks".
 //   Micro-chunks are just like chunks in that they have an id and a size but
@@ -124,12 +117,12 @@ class ChunkLoadClass;
 //
 // - ChunkID's: The chunk ID's used by Subsystems and PersistFactories must be unique
 //   but all others can be considered local to the object that is saving itself.  Unique
-//   ids for the subsystems and factories are achieved by saveloadids.h defining ranges 
-//   of ids for various libraries and then those libraries maintaining a single header 
-//   file internally which gives unique id's within that range to all of their sub-systems 
-//   and persist factories.  Never re-use an id or you will break compatibility with older 
+//   ids for the subsystems and factories are achieved by saveloadids.h defining ranges
+//   of ids for various libraries and then those libraries maintaining a single header
+//   file internally which gives unique id's within that range to all of their sub-systems
+//   and persist factories.  Never re-use an id or you will break compatibility with older
 //   versions of your files...
-// 
+//
 //////////////////////////////////////////////////////////////////////////////////
 
 
@@ -147,7 +140,7 @@ class SaveLoadSystemClass
 	** To load a file just open it and pass it to the load method.
 	*/
 	static bool		Save (ChunkSaveClass &csave, SaveLoadSubSystemClass & subsystem);
-	static bool		Load (ChunkLoadClass &cload,bool auto_post_load = true);	
+	static bool		Load (ChunkLoadClass &cload,bool auto_post_load = true);
 	static bool		Post_Load_Processing (void(*network_callback)(void));
 	/*
 	** Look up the persist factory for a given chunk id
@@ -161,7 +154,7 @@ class SaveLoadSystemClass
 	static void		Register_Post_Load_Callback(PostLoadableClass * obj);
 
 	/*
-	** Pointer Remapping interface.  NOTE: use the macros defined below to 
+	** Pointer Remapping interface.  NOTE: use the macros defined below to
 	** get debug info with your pointers when doing a debug build.
 	*/
 	static void		Register_Pointer (void *old_pointer, void *new_pointer);
@@ -207,7 +200,7 @@ class SaveLoadSystemClass
 
 
 /*
-** Use the following macros to automatically enable pointer-remap DEBUG code.  Remember that 
+** Use the following macros to automatically enable pointer-remap DEBUG code.  Remember that
 ** in all cases you submit a pointer to the pointer you want re-mapped.
 */
 #ifdef WWDEBUG
@@ -217,7 +210,3 @@ class SaveLoadSystemClass
 #define REQUEST_POINTER_REMAP(pp)					SaveLoadSystemClass::Request_Pointer_Remap(pp)
 #define REQUEST_REF_COUNTED_POINTER_REMAP(pp)	SaveLoadSystemClass::Request_Ref_Counted_Pointer_Remap(pp)
 #endif
-
-
-#endif //SAVELOAD_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h
index 4ba3217e882..ee8e111ce14 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h
@@ -34,24 +34,18 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SAVELOADIDS_H
-#define SAVELOADIDS_H
 
 //////////////////////////////////////////////////////////////////////////////////
 //
-//	Chunk ID Ranges.  
-// Here are the ranges to use for SubSystem and PersistFactory chunk id's 
-// and also the chunk id's used by the save-load system itself.  If you are 
-// creating a new library that is going to take advantage of this system, 
+//	Chunk ID Ranges.
+// Here are the ranges to use for SubSystem and PersistFactory chunk id's
+// and also the chunk id's used by the save-load system itself.  If you are
+// creating a new library that is going to take advantage of this system,
 // create a new range for it here.
 //
 //////////////////////////////////////////////////////////////////////////////////
-enum 
+enum
 {
 	CHUNKID_SAVELOAD_BEGIN				= 0x00000100,
 		CHUNKID_SAVELOAD_DEFMGR,
@@ -66,6 +60,3 @@ enum
 	CHUNKID_WWMATH_BEGIN					= 0x00080000,
 	CHUNKID_WWTRANSLATEDB_BEGIN		= 0x00090000
 };
-
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h
index cd414e7da9e..776dbae40f0 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef WWSAVELOADSTATUS_H
-#define WWSAVELOADSTATUS_H
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
 #include "always.h"
 #include "wwstring.h"
@@ -38,5 +33,3 @@ namespace SaveLoadStatus
 
 #define INIT_STATUS(t) SaveLoadStatus::Set_Status_Text(t,0)
 #define INIT_SUB_STATUS(t) SaveLoadStatus::Set_Status_Text(t,1)
-
-#endif
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h
index 50dfa5528f9..46c7d98da20 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h
@@ -34,15 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-#ifndef SAVELOADSUBSYSTEM_H
-#define SAVELOADSUBSYSTEM_H
-
 
 #include "always.h"
 #include "bittype.h"
@@ -56,10 +48,10 @@ class ChunkSaveClass;
 //
 //	SaveLoadSubSystemClass
 //
-// Each SaveLoadSubSystem will automatically be registered with the SaveLoadSystem 
-// at construction time.  The plan is to have a single static instance of each 
+// Each SaveLoadSubSystem will automatically be registered with the SaveLoadSystem
+// at construction time.  The plan is to have a single static instance of each
 // sub-system so that it automatically registers when the global constructors
-// are executed.  
+// are executed.
 //
 // When an application wants to create a file it does so by asking the
 // SaveLoadSystem to save the particular set of SaveLoadSubSystems that contain
@@ -69,7 +61,7 @@ class ChunkSaveClass;
 class SaveLoadSubSystemClass : public PostLoadableClass
 {
 public:
-	
+
 	SaveLoadSubSystemClass (void);
 	virtual ~SaveLoadSubSystemClass (void);
 
@@ -89,7 +81,3 @@ class SaveLoadSubSystemClass : public PostLoadableClass
 
 	friend class SaveLoadSystemClass;
 };
-
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h
index dfc3eaf9554..b90eb038f93 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h
@@ -16,16 +16,13 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-
-#ifndef __SIMPLE_DEFINITION_FACTORY_H
-#define __SIMPLE_DEFINITION_FACTORY_H
+#pragma once
 
 #include "definitionfactory.h"
 
 //////////////////////////////////////////////////////////////////////////////////
 //
-//	SimpleDefinitionFactoryClass 
+//	SimpleDefinitionFactoryClass
 //
 //	Template class to automate the creation of simple definition factories.
 //
@@ -80,7 +77,4 @@ SimpleDefinitionFactoryClass<T, class_id, name>::Get_Class_ID (void) const
 
 #define DECLARE_DEFINITION_FACTORY(_class, _id, _name)		\
 char _class ## Name[] = _name;										\
-SimpleDefinitionFactoryClass<_class, _id, _class ## Name>	\
-
-#endif //__SIMPLE_DEFINITION_FACTORY_H
-
+SimpleDefinitionFactoryClass<_class, _id, _class ## Name>
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h
index c69c128d716..af9f6dbd249 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h
@@ -34,16 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-
-
-#ifndef __SIMPLE_PARAMETER_H
-#define __SIMPLE_PARAMETER_H
 
 #include "always.h"
 #include "parameter.h"
@@ -63,7 +54,7 @@ template <class T, ParameterClass::Type type>
 class SimpleParameterClass : public ParameterClass
 {
 public:
-	
+
 	///////////////////////////////////////////////////////////////////////
 	//	Public constructors/destructors
 	///////////////////////////////////////////////////////////////////////
@@ -144,7 +135,7 @@ SimpleParameterClass<T, type>::Set_Value (const T &new_value)
 //////////////////////////////////////////////////////////////////////////////////
 template <class T, ParameterClass::Type type> inline ParameterClass::Type
 SimpleParameterClass<T, type>::Get_Type (void) const
-{	
+{
 	return type;
 }
 
@@ -178,7 +169,7 @@ typedef SimpleParameterClass<int,		ParameterClass::TYPE_STRINGSDB_ID>	StringsDBE
 
 //////////////////////////////////////////////////////////////////////////////////
 //
-//	RangedParameterClass 
+//	RangedParameterClass
 //
 //		Extends simple paramter types so they can have minimum/maximum values.
 //
@@ -211,7 +202,7 @@ class RangedParameterClass : public SimpleParameterClass<T, type>
 
 
 //////////////////////////////////////////////////////////////////////////////////
-//	IntParameterClass 
+//	IntParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class IntParameterClass : public RangedParameterClass<int, ParameterClass::TYPE_INT>
 {
@@ -222,7 +213,7 @@ class IntParameterClass : public RangedParameterClass<int, ParameterClass::TYPE_
 };
 
 //////////////////////////////////////////////////////////////////////////////////
-//	FloatParameterClass 
+//	FloatParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class FloatParameterClass  : public RangedParameterClass<float, ParameterClass::TYPE_FLOAT>
 {
@@ -233,7 +224,7 @@ class FloatParameterClass  : public RangedParameterClass<float, ParameterClass::
 };
 
 //////////////////////////////////////////////////////////////////////////////////
-//	AngleParameterClass 
+//	AngleParameterClass
 //////////////////////////////////////////////////////////////////////////////////
 class AngleParameterClass   : public RangedParameterClass<float, ParameterClass::TYPE_ANGLE>
 {
@@ -242,6 +233,3 @@ class AngleParameterClass   : public RangedParameterClass<float, ParameterClass:
 		:	RangedParameterClass<float, ParameterClass::TYPE_ANGLE> (data, name)
 			{ Set_Range (0.0F,  6.283185307F); }
 };
-
-#endif //__SIMPLE_PARAMETER_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.cpp b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.cpp
index 0418f8bfdca..8e782eb186a 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.cpp
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.cpp
@@ -36,7 +36,7 @@
 
 
 #include "twiddler.h"
-#include "RANDOM.H"
+#include "RANDOM.h"
 #include "saveloadids.h"
 #include "simpledefinitionfactory.h"
 #include "persistfactory.h"
@@ -277,4 +277,4 @@ TwiddlerClass::Load_Variables (ChunkLoadClass &cload)
 	}
 
 	return true;
-}
\ No newline at end of file
+}
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h
index 7fcdd6a57a5..7c45af94f60 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __TWIDDLER_H
-#define __TWIDDLER_H
 
 #include "definition.h"
 #include "definitionclassids.h"
@@ -68,7 +63,7 @@ class TwiddlerClass : public DefinitionClass
 	/////////////////////////////////////////////////////////////////////
 	//	Public methods
 	/////////////////////////////////////////////////////////////////////
-	
+
 	//
 	// Type identification
 	//
@@ -81,7 +76,7 @@ class TwiddlerClass : public DefinitionClass
 	bool									Save (ChunkSaveClass &csave);
 	bool									Load (ChunkLoadClass &cload);
 	const PersistFactoryClass &	Get_Factory (void) const;
-	
+
 	//
 	//	Twiddler specific
 	//
@@ -124,7 +119,3 @@ TwiddlerClass::Set_Indirect_Class_ID (uint32 class_id)
 	m_IndirectClassID = class_id;
 	return ;
 }
-
-
-#endif //__TWIDDLER_H
-
diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h
index 7a48106a902..8863266b1b6 100644
--- a/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h
+++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h
@@ -36,12 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef WWSAVELOAD_H
-#define WWSAVELOAD_H
 
 /**
 ** WWSaveLoad
@@ -54,7 +49,3 @@ class WWSaveLoad
 	static void		Init(void);
 	static void		Shutdown(void);
 };
-
-
-#endif
-
diff --git a/Core/Libraries/Source/WWVegas/WWStub/wwallocstub.cpp b/Core/Libraries/Source/WWVegas/WWStub/wwallocstub.cpp
index 55fc3f28b55..d250ae52f1e 100644
--- a/Core/Libraries/Source/WWVegas/WWStub/wwallocstub.cpp
+++ b/Core/Libraries/Source/WWVegas/WWStub/wwallocstub.cpp
@@ -1,6 +1,6 @@
 /*
 **	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 TheSuperHackers 
+**	Copyright 2025 TheSuperHackers
 **
 **	This program is free software: you can redistribute it and/or modify
 **	it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// TheSuperHackers @compile feliwir 15/04/2025 Simple allocator implementation useful for tools
+// TheSuperHackers @build feliwir 15/04/2025 Simple allocator implementation useful for tools
 #include "always.h"
 #include <stdlib.h>
 
@@ -31,7 +31,7 @@ void *operator new[](size_t size)
 {
 	return malloc(size);
 }
- 
+
 void operator delete(void *p)
 {
 	free(p);
diff --git a/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp b/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp
index a86eb93156d..3103aff21c3 100644
--- a/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp
+++ b/Core/Libraries/Source/WWVegas/WWStub/wwdebugstub.cpp
@@ -16,11 +16,11 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// TheSuperHackers @compile feliwir 15/04/2025 Simple debug implementation useful for tools
+// TheSuperHackers @build feliwir 15/04/2025 Simple debug implementation useful for tools
 #include "wwdebug.h"
 #include <stdarg.h>
 #include <stdlib.h>
-#include <stdio.h>
+#include <Utility/stdio_adapter.h>
 
 char* TheCurrentIgnoreCrashPtr = NULL;
 
@@ -35,6 +35,7 @@ void DebugLog(const char *format, ...)
 	va_start(arg, format);
 	vprintf(format, arg);
 	va_end(arg);
+	printf("\n");
 }
 
 #endif
@@ -49,6 +50,7 @@ void DebugCrash(const char *format, ...)
 	va_start(arg, format);
 	vprintf(format, arg);
 	va_end(arg);
+	printf("\n");
 
 	// No exit in this stub
 }
diff --git a/Core/Libraries/Source/debug/CMakeLists.txt b/Core/Libraries/Source/debug/CMakeLists.txt
index f81690ac1cb..24890749443 100644
--- a/Core/Libraries/Source/debug/CMakeLists.txt
+++ b/Core/Libraries/Source/debug/CMakeLists.txt
@@ -1,6 +1,4 @@
 set(DEBUG_SRC
-    "_pch.cpp"
-    "_pch.h"
     "debug_cmd.cpp"
     "debug_cmd.h"
     "debug_debug.cpp"
@@ -17,7 +15,6 @@ set(DEBUG_SRC
     "debug_macro.h"
     "debug_stack.cpp"
     "debug_stack.h"
-    "debug.cpp"
     "debug.h"
     "internal_except.h"
     "internal_io.h"
@@ -32,7 +29,16 @@ target_include_directories(core_debug INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+target_precompile_headers(core_debug PRIVATE
+    "debug.h"
+    "internal.h"
+    "internal_except.h"
+    "internal_io.h"
+    <windows.h>
+)
+
 target_link_libraries(core_debug PRIVATE
     core_config
+    core_wwcommon
     corei_always
 )
diff --git a/Core/Libraries/Source/debug/_pch.cpp b/Core/Libraries/Source/debug/_pch.cpp
deleted file mode 100644
index d2e00b00bd4..00000000000
--- a/Core/Libraries/Source/debug/_pch.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/////////////////////////////////////////////////////////////////////////EA-V1
-// $File: //depot/GeneralsMD/Staging/code/Libraries/Source/debug/_pch.cpp $
-// $Author: mhoffe $
-// $Revision: #1 $
-// $DateTime: 2003/07/03 11:55:26 $
-//
-// (c) 2003 Electronic Arts
-//
-// Precompiled header (module internal)
-//////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
diff --git a/Core/Libraries/Source/debug/_pch.h b/Core/Libraries/Source/debug/_pch.h
deleted file mode 100644
index 203e1464954..00000000000
--- a/Core/Libraries/Source/debug/_pch.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/////////////////////////////////////////////////////////////////////////EA-V1
-// $File: //depot/GeneralsMD/Staging/code/Libraries/Source/debug/_pch.h $
-// $Author: mhoffe $
-// $Revision: #1 $
-// $DateTime: 2003/07/03 11:55:26 $
-//
-// (c) 2003 Electronic Arts
-//
-// Precompiled header (module internal)
-//////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef _PCH_H // Include guard
-#define _PCH_H
-
-#include "debug.h"
-
-// we need windows.h at too many places...
-#define STRICT
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include "internal.h"
-#include "internal_io.h"
-#include "internal_except.h"
-
-#endif // _PCH_H
diff --git a/Core/Libraries/Source/debug/debug.cpp b/Core/Libraries/Source/debug/debug.cpp
deleted file mode 100644
index 16286fd7ae3..00000000000
--- a/Core/Libraries/Source/debug/debug.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/////////////////////////////////////////////////////////////////////////EA-V1
-// $File: //depot/GeneralsMD/Staging/code/Libraries/Source/debug/debug.cpp $
-// $Author: mhoffe $
-// $Revision: #1 $
-// $DateTime: 2003/07/03 11:55:26 $
-//
-// (c) 2003 Electronic Arts
-//
-// Debug module main code
-//////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
diff --git a/Core/Libraries/Source/debug/debug.h b/Core/Libraries/Source/debug/debug.h
index f353fe3e3be..11b75830a11 100644
--- a/Core/Libraries/Source/debug/debug.h
+++ b/Core/Libraries/Source/debug/debug.h
@@ -26,17 +26,13 @@
 //
 // Debugging module
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef DEBUG_H // Include guard
-#define DEBUG_H
 
-/** 
+#pragma once
+
+/**
   \page lib_var Library variants
 
-  Generally speaking there are four different library variants:
-  - Internal: all asserts/checks/logs, full optimizations (RTS_INTERNAL macro defined)
+  Generally speaking there are three different library variants:
   - %Debug: all asserts/checks/logs, no optimizations (RTS_DEBUG macro defined)
   - Profile: all asserts/checks/logs, full optimizations, profiling active (RTS_PROFILE macro defined)
   - Release: no asserts/checks/logs, full optimizations
@@ -84,12 +80,8 @@
   - Release: XXX.lib
 */
 
-#if defined(RTS_DEBUG) && defined(RTS_INTERNAL)
-	#error "Only either RTS_DEBUG or RTS_INTERNAL should ever be defined"
-#endif
-
-// Define which libraries to use. 
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) || defined(RTS_PROFILE)
+// Define which libraries to use.
+#if defined(RTS_DEBUG) || defined(RTS_PROFILE)
 #  define HAS_ASSERTS
 #  define HAS_LOGS
 #endif
@@ -109,5 +101,3 @@
 #include "debug_cmd.h"
 #include "debug_stack.h"
 #include "debug_debug.h"
-
-#endif // DEBUG_H
diff --git a/Core/Libraries/Source/debug/debug_cmd.cpp b/Core/Libraries/Source/debug/debug_cmd.cpp
index cef93a38552..019e2e3f7d4 100644
--- a/Core/Libraries/Source/debug/debug_cmd.cpp
+++ b/Core/Libraries/Source/debug/debug_cmd.cpp
@@ -26,28 +26,31 @@
 //
 // Debug command group 'debug'
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "debug.h"
+#include "debug_cmd.h"
+#include "internal.h"
+#include <windows.h>
 #include <process.h>
 
-bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd, 
-                                     CommandMode cmdmode, unsigned argn, 
+bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
+                                     CommandMode cmdmode, unsigned argn,
                                      const char * const * argv)
 {
   // just for convenience...
   bool normalMode=cmdmode==CommandMode::Normal;
 
-  if (!strcmp(cmd,"help"))
+  if (strcmp(cmd,"help") == 0)
   {
     if (!normalMode)
       return true;
-    
+
     if (!argn)
     {
       dbg << "debug group help:\n"
              "  list, io, alwaysflush, timestamp, exit, clear, add, view\n";
       return true;
     }
-    else if (!strcmp(argv[0],"list"))
+    else if (strcmp(argv[0],"list") == 0)
     {
       dbg << "list (g|l|d|a|c) [ <pattern> ]\n"
              "\n"
@@ -69,7 +72,7 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
              "e.g. debug.cpp(13).\n";
       return true;
     }
-    else if (!strcmp(argv[0],"io"))
+    else if (strcmp(argv[0],"io") == 0)
     {
       dbg << "io <I/O Class> <cmd> { <param> }]\n"
              "\n"
@@ -88,33 +91,33 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
              "a list of possible I/O classes.\n";
       return true;
     }
-    else if (!strcmp(argv[0],"alwaysflush"))
+    else if (strcmp(argv[0],"alwaysflush") == 0)
     {
       dbg << "alwaysflush [ (+|-) ]\n\n"
              "Enables/disables flushing after each new entry in\n"
              "the log file (default: off).\n";
       return true;
     }
-    else if (!strcmp(argv[0],"timestamp"))
+    else if (strcmp(argv[0],"timestamp") == 0)
     {
       dbg << "timestamp [ (+|-) ]\n\n"
              "Enables/disables timestamping each log entry\n"
              "(default: off).\n";
       return true;
     }
-    else if (!strcmp(argv[0],"exit"))
+    else if (strcmp(argv[0],"exit") == 0)
     {
       dbg << "exit\n\nExits program immediately.\n";
       return true;
     }
-    else if (!strcmp(argv[0],"clear"))
+    else if (strcmp(argv[0],"clear") == 0)
     {
       dbg << "clear (l|a|c)\n\n"
              "Clears the given inclusion/exclusion list\n"
              "(l=logs, a=asserts/crashes, c=checks).\n";
       return true;
     }
-    else if (!strcmp(argv[0],"add"))
+    else if (strcmp(argv[0],"add") == 0)
     {
       dbg << "add (l|a|c) (+|-) <pattern>\n"
              "\n"
@@ -129,7 +132,7 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
              "the last match.";
       return true;
     }
-    else if (!strcmp(argv[0],"view"))
+    else if (strcmp(argv[0],"view") == 0)
     {
       dbg << "view [ (l|a|c) ]\n\n"
              "Shows the active pattern for the given list\n"
@@ -138,7 +141,7 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
     }
     return false;
   }
-  if (!strcmp(cmd,"list"))
+  if (strcmp(cmd,"list") == 0)
   {
     const char *pattern=argn>=2?argv[1]:"*";
 
@@ -201,10 +204,10 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
 
     return true;
   }
-  if (!strcmp(cmd,"io"))
+  if (strcmp(cmd,"io") == 0)
   {
     // cmd: io
-    if (!argn||!strcmp(argv[0],"?"))
+    if (!argn||strcmp(argv[0],"?") == 0)
     {
       // show active/all I/O classes
       if (normalMode)
@@ -229,7 +232,7 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
       // find I/O class
       Debug::IOFactoryListEntry *cur=dbg.firstIOFactory;
       for (;cur;cur=cur->next)
-        if (!strcmp(argv[0],cur->ioID))
+        if (strcmp(argv[0],cur->ioID) == 0)
           break;
       if (!cur)
       {
@@ -240,7 +243,7 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
       if (argn>1)
       {
         // 'add' command?
-        if (!strcmp(argv[1],"add"))
+        if (strcmp(argv[1],"add") == 0)
         {
           if (cur->io)
           {
@@ -255,7 +258,7 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
           }
         }
         // 'remove' command?
-        if (!strcmp(argv[1],"remove"))
+        if (strcmp(argv[1],"remove") == 0)
         {
           if (cur->io)
           {
@@ -265,7 +268,7 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
           return true;
         }
       }
-      
+
       // now pass along I/O command
       if (!cur->io)
       {
@@ -277,7 +280,7 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
     }
     return true;
   }
-  if (!strcmp(cmd,"alwaysflush"))
+  if (strcmp(cmd,"alwaysflush") == 0)
   {
     if (argn)
     {
@@ -293,7 +296,7 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
 
     return true;
   }
-  if (!strcmp(cmd,"timestamp"))
+  if (strcmp(cmd,"timestamp") == 0)
   {
     if (argn)
     {
@@ -309,14 +312,14 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
 
     return true;
   }
-  if (!strcmp(cmd,"exit"))
+  if (strcmp(cmd,"exit") == 0)
   {
     exit(1);
     return true;
   }
-  if (!strcmp(cmd,"clear")||
-      !strcmp(cmd,"add")||
-      !strcmp(cmd,"view"))
+  if (strcmp(cmd,"clear") == 0||
+      strcmp(cmd,"add") == 0||
+      strcmp(cmd,"view") == 0)
   {
     unsigned mask=0;
     if (argn)
@@ -335,7 +338,7 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
       mask=0xffffffff;
 
     bool modified=false;
-    if (!strcmp(cmd,"clear"))
+    if (strcmp(cmd,"clear") == 0)
     {
       // remove some (or all) pattern
       const char *pattern=argn<2?"*":argv[1];
@@ -365,7 +368,7 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
       else
         dbg.lastPatternEntry=NULL;
     }
-    if (!strcmp(cmd,"add"))
+    if (strcmp(cmd,"add") == 0)
     {
       // add a pattern
       if (argn<3)
@@ -376,7 +379,7 @@ bool DebugCmdInterfaceDebug::Execute(class Debug& dbg, const char *cmd,
         modified=true;
       }
     }
-    if (!strcmp(cmd,"view"))
+    if (strcmp(cmd,"view") == 0)
     {
       // show list of defined patterns
       for (Debug::PatternListEntry *cur=dbg.firstPatternEntry;cur;cur=cur->next)
diff --git a/Core/Libraries/Source/debug/debug_cmd.h b/Core/Libraries/Source/debug/debug_cmd.h
index c2f540b6e09..3e7f0bc45c6 100644
--- a/Core/Libraries/Source/debug/debug_cmd.h
+++ b/Core/Libraries/Source/debug/debug_cmd.h
@@ -26,15 +26,12 @@
 //
 // Debug command interface
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef DEBUG_CMD_H // Include guard
-#define DEBUG_CMD_H
+
+#pragma once
 
 /**
   \interface DebugCmdInterface debug.h <rts/debug.h>
-  
+
   \brief Debug command group interface.
 
   A debug command group interface implementation defines a new
@@ -117,7 +114,7 @@ class DebugCmdInterface
                  (without quotes)
     \param type type name of class we're implementing
   */
-  #define DEBUG_CREATE_COMMAND_GROUP(groupname,type) 
+  #define DEBUG_CREATE_COMMAND_GROUP(groupname,type)
 
 #else
 
@@ -127,5 +124,3 @@ class DebugCmdInterface
 #endif
 
 ///@}
-
-#endif // DEBUG_CMD_H
diff --git a/Core/Libraries/Source/debug/debug_debug.cpp b/Core/Libraries/Source/debug/debug_debug.cpp
index 9423d0b754d..77049750322 100644
--- a/Core/Libraries/Source/debug/debug_debug.cpp
+++ b/Core/Libraries/Source/debug/debug_debug.cpp
@@ -26,10 +26,13 @@
 //
 // Debug class implementation
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "debug.h"
+#include "internal.h"
+#include "internal_except.h"
+#include "internal_io.h"
 #include <stdlib.h>
-#include <Utility/stdio_adapter.h>
-#include <string.h>
+#include <windows.h>
+#include <WWCommon.h>
 #include <new>      // needed for placement new prototype
 
 // a little dummy variable that makes the linker actually include
@@ -38,7 +41,7 @@ extern "C" bool __DebugIncludeInLink1;
 bool __DebugIncludeInLink1;
 
 // This part is a little tricky (and not portable to other compilers).
-// MSVC initializes all static C++ variables by calling a list of 
+// MSVC initializes all static C++ variables by calling a list of
 // function pointers contained in data segments called .CRT$XCA to
 // .CRT$XCZ. We jam in our own two functions at the very beginning
 // and end of this list (B and Y respectively since the A and Z segments
@@ -101,7 +104,7 @@ void Debug::PreStaticInit(void)
   Instance.timeStamp=false;
   Instance.m_radix=10;
   Instance.m_fillChar=' ';
-  
+
   /// install exception handler
   SetUnhandledExceptionFilter(DebugExceptionhandler::ExceptionFilter);
 }
@@ -270,7 +273,7 @@ bool Debug::SkipNext(void)
   // do not implement this function inline, we do need
   // a valid frame pointer here!
   unsigned help;
-  _asm 
+  _asm
   {
     mov eax,[ebp+4]   // return address
     mov help,eax
@@ -315,7 +318,7 @@ Debug& Debug::AssertBegin(const char *file, int line, const char *expr)
     const char *p=strstr(file,"\\code\\");
     p=p?p+6:file;
 
-    Instance << "\n" << RepeatChar('=',80) << "\nAssertion failed in " << p << ", line " << line 
+    Instance << "\n" << RepeatChar('=',80) << "\nAssertion failed in " << p << ", line " << line
              << ",\nexpression " << expr;
   }
 
@@ -346,8 +349,8 @@ bool Debug::AssertDone(void)
                         "time being (stops logging this assertion as well).";
     char *help=(char *)DebugAllocMemory(ioBuffer[curType].used+strlen(addInfo)+1);
     strcpy(help,ioBuffer[curType].buffer+82);
-    strcat(help,addInfo);
-    
+    strcat(help, addInfo);
+
     // First hit? Then do a stack trace
     if (curFrameEntry->hits==1)
     {
@@ -392,7 +395,7 @@ bool Debug::AssertDone(void)
           ((void)0);
       }
     }
-    else 
+    else
     {
       // we're running fullscreen
 
@@ -444,7 +447,7 @@ Debug& Debug::CheckBegin(const char *file, int line, const char *expr)
     const char *p=strstr(file,"\\code\\");
     p=p?p+6:file;
 
-    Instance << "\n" << RepeatChar('=',80) << "\nCheck failed in " << p << ", line " << line 
+    Instance << "\n" << RepeatChar('=',80) << "\nCheck failed in " << p << ", line " << line
              << ",\nexpression " << expr;
   }
 
@@ -523,7 +526,7 @@ Debug& Debug::LogBegin(const char *fileOrGroup)
     // we're doing all this extra work so that DLOGs can be spread across
     // multiple calls
     if (Instance.curType==DebugIOInterface::StringType::Log&&
-        strcmp(Instance.curSource,Instance.curFrameEntry->fileOrGroup))
+        strcmp(Instance.curSource,Instance.curFrameEntry->fileOrGroup) != 0)
       Instance.FlushOutput();
 
     if (Instance.curType!=DebugIOInterface::StringType::Log)
@@ -532,7 +535,7 @@ Debug& Debug::LogBegin(const char *fileOrGroup)
   }
   else if (Instance.curType!=DebugIOInterface::StringType::MAX)
     Instance.FlushOutput();
-  
+
   return Instance;
 }
 
@@ -571,7 +574,7 @@ Debug& Debug::CrashBegin(const char *file, int line)
       const char *p=strstr(file,"\\code\\");
       p=p?p+6:file;
 
-      Instance << "Crash in " << p << ", line " << line 
+      Instance << "Crash in " << p << ", line " << line
                << ", reason:\n";
     }
   }
@@ -610,8 +613,8 @@ bool Debug::CrashDone(bool die)
 #endif
     char *help=(char *)DebugAllocMemory(ioBuffer[curType].used+strlen(addInfo)+1);
     strcpy(help,ioBuffer[curType].buffer+82);
-    strcat(help,addInfo);
-    
+    strcat(help, addInfo);
+
     // First hit? Then do a stack trace
     if (curFrameEntry->hits==1)
     {
@@ -729,8 +732,7 @@ Debug& Debug::operator<<(const char *str)
 
 void Debug::SetPrefixAndRadix(const char *prefix, int radix)
 {
-  strncpy(m_prefix,prefix?prefix:"",sizeof(m_prefix)-1);
-  m_prefix[sizeof(m_prefix)-1]=0;
+  strlcpy(m_prefix,prefix?prefix:"",sizeof(m_prefix));
   m_radix=radix;
 }
 
@@ -1014,7 +1016,7 @@ bool Debug::AddIOFactory(const char *io_id, const char *descr, DebugIOInterface*
   // bail out if invalid parameters passed in
   if (!io_id||!func)
     return true;
-  
+
   // allocate & init new list entry
   IOFactoryListEntry *entry=(IOFactoryListEntry *)
                       DebugAllocMemory(sizeof(IOFactoryListEntry));
@@ -1048,7 +1050,7 @@ bool Debug::AddCommands(const char *cmdgroup, DebugCmdInterface *cmdif)
       return true;
     listptr=&((*listptr)->next);
   }
-  
+
   // allocate & init new list entry
   CmdInterfaceListEntry *entry=(CmdInterfaceListEntry *)
                       DebugAllocMemory(sizeof(CmdInterfaceListEntry));
@@ -1116,8 +1118,8 @@ void Debug::Update(void)
       cur->inputUsed+=numChars;
       cur->input[cur->inputUsed]=0;
       hadInput=true;
-    } 
-    
+    }
+
     if (!hadInput)
       // skip then
       continue;
@@ -1163,7 +1165,7 @@ Debug::FrameHashEntry* Debug::AddFrameEntry(unsigned addr, unsigned type,
   if (type&FrameTypeLog)
   {
     // must add to list of known logs,
-    // store translated name 
+    // store translated name
     e->fileOrGroup=AddLogGroup(fileOrGroup,NULL);
   }
   else
@@ -1186,8 +1188,8 @@ void Debug::UpdateFrameStatus(FrameHashEntry &entry)
       entry.frameType==FrameTypeCheck)
     wsprintf(help,"%s(%i)",entry.fileOrGroup,entry.line);
   else
-    strcpy(help,entry.fileOrGroup);
-  
+    strlcpy(help, entry.fileOrGroup, ARRAY_SIZE(help));
+
   // update frame status
   bool active=entry.frameType!=FrameTypeLog;
   for (PatternListEntry *cur=firstPatternEntry;cur;cur=cur->next)
@@ -1225,7 +1227,7 @@ const char *Debug::AddLogGroup(const char *fileOrGroup, const char *descr)
   KnownLogGroupList *cur=firstLogGroup;
   for (;cur;cur=cur->next)
   {
-    if (!strcmp(cur->nameGroup,fileOrGroup))
+    if (strcmp(cur->nameGroup,fileOrGroup) == 0)
     {
       // yes, return translated name
       return cur->nameGroup;
@@ -1408,7 +1410,7 @@ bool Debug::SimpleMatch(const char *str, const char *pattern)
           return true;
       return *str==*pattern;
     }
-    else 
+    else
     {
       if (*str++!=*pattern++)
         return false;
@@ -1423,11 +1425,11 @@ void Debug::SetBuildInfo(const char *version,
                          const char *buildDate)
 {
   if (version)
-    strncpy(Instance.m_version,version,sizeof(Instance.m_version)-1);
+    strlcpy(Instance.m_version,version,sizeof(Instance.m_version));
   if (internalVersion)
-    strncpy(Instance.m_intVersion,internalVersion,sizeof(Instance.m_intVersion)-1);
+    strlcpy(Instance.m_intVersion,internalVersion,sizeof(Instance.m_intVersion));
   if (buildDate)
-    strncpy(Instance.m_buildDate,buildDate,sizeof(Instance.m_buildDate)-1);
+    strlcpy(Instance.m_buildDate,buildDate,sizeof(Instance.m_buildDate));
 }
 
 void Debug::WriteBuildInfo(void)
@@ -1437,9 +1439,7 @@ void Debug::WriteBuildInfo(void)
     (*this) << " " << m_version;
   if (*m_intVersion)
     (*this) << " internal " << m_intVersion;
-  #if defined(RTS_INTERNAL)
-    operator<<(" internal");
-  #elif defined(RTS_DEBUG)
+  #if defined(RTS_DEBUG)
     operator<<(" debug");
   #elif defined(RTS_PROFILE)
     operator<<(" profile");
@@ -1540,14 +1540,14 @@ void Debug::ExecCommand(const char *cmdstart, const char *cmdend)
 
     if (mode!=DebugCmdInterface::CommandMode::Structured)
       AddOutput("> ",2);
-  
+
     // repeat current command first
     AddOutput(cmdstart,cmdend-cmdstart);
     AddOutput("\n",1);
 
     // command group known?
     for (CmdInterfaceListEntry *cur=firstCmdGroup;cur;cur=cur->next)
-      if (!strcmp(curCommandGroup,cur->group))
+      if (strcmp(curCommandGroup,cur->group) == 0)
         break;
     if (!cur)
     {
@@ -1563,18 +1563,18 @@ void Debug::ExecCommand(const char *cmdstart, const char *cmdend)
       // search for a matching command handler
       for (CmdInterfaceListEntry *cur=firstCmdGroup;cur;cur=cur->next)
       {
-        if (strcmp(curCommandGroup,cur->group))
+        if (strcmp(curCommandGroup,cur->group) != 0)
           continue;
 
         bool doneCommand=cur->cmdif->Execute(*this,p,mode,numParts-1,parts+1);
-        if (doneCommand&&(strcmp(p,"help")||numParts>1))
+        if (doneCommand&&(strcmp(p,"help") != 0||numParts>1))
           break;
       }
 
       // display error message if command not found, break away
       if (!cur&&mode==DebugCmdInterface::CommandMode::Normal)
       {
-        if (strcmp(p,"help"))
+        if (strcmp(p,"help") != 0)
           operator<<("Unknown command");
         else if (numParts>1)
           operator<<("Unknown command, help not available");
diff --git a/Core/Libraries/Source/debug/debug_debug.h b/Core/Libraries/Source/debug/debug_debug.h
index 4fcb53f8347..956fa6f2299 100644
--- a/Core/Libraries/Source/debug/debug_debug.h
+++ b/Core/Libraries/Source/debug/debug_debug.h
@@ -26,15 +26,12 @@
 //
 // main Debug object (singleton)
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef DEBUG_DEBUG_H // Include guard
-#define DEBUG_DEBUG_H
+
+#pragma once
 
 /**
   \class Debug debug.h <rts/debug.h>
-  
+
   \brief Debug module main class (singleton).
 */
 class Debug
@@ -54,7 +51,7 @@ class Debug
 
   /**
     \brief HRESULT translator callback function type.
-    
+
     See \ref Debug::AddHResultTranslator for more information.
 
     \param debug Debug instance where info can be written to
@@ -78,15 +75,15 @@ DLOG( "This is 16 bytes of memory:\n" << Debug::MemDump::Raw(&somePointer,16) );
   class MemDump
   {
     // necessary because Debug needs access to the following private members
-    friend Debug; 
-    
+    friend Debug;
+
     const unsigned char *m_startPtr;  ///< start dumping with this address
     unsigned m_numItems;              ///< dump the given number of items
     unsigned m_bytePerItem;           ///< determines the number of bytes per item (1. 2 or 4)
     bool m_absAddr;                   ///< show absolute addresses (true) or relative addresses (false)
     bool m_withChars;                 ///< show printable characters on right side of dump (true) or not (false)
-    
-    // constructor is private on purpose so that nobody can 
+
+    // constructor is private on purpose so that nobody can
     // create instances of this class except the static functions
     // provided herein
     MemDump(const void *ptr, unsigned num, unsigned bpi, bool absAddr, bool withChars):
@@ -160,10 +157,10 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   class HResult
   {
     // necessary because Debug needs access to the following private members
-    friend Debug; 
-    
+    friend Debug;
+
     long m_hresult;                   ///< HRESULT value
-    
+
   public:
 
     /**
@@ -175,7 +172,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   };
 
   /** \internal
-  
+
     \brief Helper class for adding log group descriptions.
 
   */
@@ -201,8 +198,8 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
     \brief Switches integer output to hexadecimal format.
   */
   class Hex {};
-  
-  /// \internal Performs actual switch to hexadecimal format. 
+
+  /// \internal Performs actual switch to hexadecimal format.
   Debug& operator<<(const Hex)
   {
     SetPrefixAndRadix("0x",16);
@@ -239,7 +236,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   class Width
   {
     // necessary because Debug needs access to the following private members
-    friend Debug; 
+    friend Debug;
 
     int m_width;  ///< output width
 
@@ -261,7 +258,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   class FillChar
   {
     // necessary because Debug needs access to the following private members
-    friend Debug; 
+    friend Debug;
 
     char m_fill;  ///< fill character
 
@@ -283,7 +280,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   class RepeatChar
   {
     // necessary because Debug needs access to the following private members
-    friend Debug; 
+    friend Debug;
 
     char m_char;  ///< character
     int m_count;  ///< repeat count
@@ -305,7 +302,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   class Format
   {
     // necessary because Debug needs access to the following private members
-    friend Debug; 
+    friend Debug;
 
     // no CC, AOp
     Format(const Format &);
@@ -324,13 +321,13 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
     operator<<(f.m_buffer);
     return *this;
   }
-  
+
   // this is necessary because LogDescription needs to call AddLogGroup
   friend class LogDescription;
-  
+
   /** \internal
-  
-    \brief Performs logical cleanup. 
+
+    \brief Performs logical cleanup.
   */
   ~Debug();
 
@@ -343,14 +340,14 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   static void InstallExceptionHandler(void);
 
   /** \internal
-  
+
     \brief Helper function for skipping over disabled asserts and logs.
 
     This function simply records the address it has been called from. If
     an assert or other function is disabled this function returns true,
     false otherwise.
-    
-    @todo_opt Change so that instead of returning true the call to this 
+
+    @todo_opt Change so that instead of returning true the call to this
               function is directly removed from the calling code
 
     \return true if next assert/log should be skipped, false otherwise
@@ -358,9 +355,9 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   static bool SkipNext(void);
 
   /** \internal
-  
-    \brief Helper function which gets called if an assertion fails. 
-    
+
+    \brief Helper function which gets called if an assertion fails.
+
     Starts building the assert string which will then be send to the active
     output destinations. SkipNext must be called before calling this function
     since this function also associates the most recent SkipNext call with
@@ -386,9 +383,9 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   bool AssertDone(void);
 
   /** \internal
-  
-    \brief Helper function which gets called if a check fails. 
-    
+
+    \brief Helper function which gets called if a check fails.
+
     Starts building the assert string which will then be send to the active
     output destinations. SkipNext must be called before calling this function
     since this function also associates the most recent SkipNext call with
@@ -412,9 +409,9 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   bool CheckDone(void);
 
   /** \internal
-  
+
     \brief Helper function which gets when writing data to the output log.
-    
+
     Starts building the log string which will then be send to the active
     output destinations. SkipNext must be called before calling this function
     since this function also associates the most recent SkipNext call with
@@ -436,9 +433,9 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   bool LogDone(void);
 
   /** \internal
-  
+
     \brief Helper function which gets called on crash.
-    
+
     Starts building the crash string which will then be send to the active
     output destinations.
 
@@ -457,7 +454,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
 
     This function is to be used as the final call in a debug message stream.
 
-    \param die true if module should exit after displaying message, false if 
+    \param die true if module should exit after displaying message, false if
                the user should have the choice
     \return false (always)
   */
@@ -642,7 +639,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
     If the translator/user pointer pair does not exist nothing is done.
 
     \param func translator address
-    \param user optional user pointer 
+    \param user optional user pointer
     \see AddHResultTranslator
   */
   static void RemoveHResultTranslator(HResultTranslator func, void *user=0);
@@ -659,7 +656,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
     \param func factory function
     \return true (so function can be used in static initializers)
   */
-  static bool AddIOFactory(const char *io_id, const char *descr, 
+  static bool AddIOFactory(const char *io_id, const char *descr,
                            DebugIOInterface* (*func)(void));
 
   /**
@@ -699,8 +696,8 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   static void Command(const char *cmd);
 
   /**
-    \brief Update method, must be called on a regular basis. 
-    
+    \brief Update method, must be called on a regular basis.
+
     Scans I/O classes for new command input and processes it.
   */
   static void Update(void);
@@ -715,7 +712,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   */
   static bool SimpleMatch(const char *str, const char *pattern);
 
-  /** 
+  /**
     \brief Tell debug module about build info.
 
     All these strings are free form and can be up to 63 chars long.
@@ -738,10 +735,10 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   Debug(const Debug&);
   Debug& operator=(const Debug&);
 
-  /** \internal 
-    
+  /** \internal
+
     Undocumented default constructor. Initializes debugging library.
-    We can make this private as well so nobody accidently tries to create 
+    We can make this private as well so nobody accidently tries to create
     a Debug instance. Actually this function does not do anything -
     initialization is rather performed by PreStaticInit() and
     PostStaticInit().
@@ -749,15 +746,15 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   Debug(void);
 
   /** \internal
-    
-    This function gets called before any static C++ symbols are 
+
+    This function gets called before any static C++ symbols are
     initialized. Code herein must be extremely careful because all
     global C++ instances are not initialized yet.
   */
   static void PreStaticInit(void);
 
   /** \internal
-     
+
     This function gets called after all static C++ symbols have
     been initialized.
   */
@@ -765,32 +762,32 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
 
   /** \internal
 
-    This function gets called if the program exists. Use this 
+    This function gets called if the program exists. Use this
     function for any cleanup purposes (not the destructor, it
     might get called too early).
   */
   static void StaticExit(void);
 
   /** \internal
-    
+
     The only debug instance. Actually not used for anything
     except as magic first parameter for overloaded stream operators.
   */
   static Debug Instance;
 
-  /** \internal 
-    
+  /** \internal
+
     Helper variable for putting PreStaticInit() into the MSVC
     startup list.
   */
-  static void *PreStatic;    
+  static void *PreStatic;
+
+  /** \internal
 
-  /** \internal 
-    
     Helper variable for putting PostStaticInit() into the MSVC
     startup list.
   */
-  static void *PostStatic;    
+  static void *PostStatic;
 
   /// \internal HResult translator vector entry
   struct HResultTranslatorEntry
@@ -840,7 +837,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   };
 
   /** \internal
-  
+
     First I/O factory list entry. A singly linked list is
     okay for this because looking up I/O IDs is not
     time critical.
@@ -860,8 +857,8 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
     DebugCmdInterface *cmdif;
   };
 
-  /** \internal 
-  
+  /** \internal
+
     First command interface list entry. A singly linked list is
     okay for this because looking up command groups is not
     time critical.
@@ -871,8 +868,8 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   /// \internal current stack frame (used by SkipNext)
   static unsigned curStackFrame;
 
-  /** \internal 
-  
+  /** \internal
+
     Bit mask for frame entry types. Implemented as a bit
     mask since it is also used for the inclusion/exclusion
     list where a single pattern can apply to more than
@@ -966,7 +963,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   }
 
   /** \internal
-    
+
     Add frame address entry (entry must not exist yet). If
     a log frame is added then a corresponding entry is added
     to the list of known log groups as well.
@@ -1012,8 +1009,8 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
 
   /** \internal
 
-    \brief List of known logs. 
-    
+    \brief List of known logs.
+
     A singly linked list is
     okay for this because looking up log groups happens only
     if a new stack frame entry is added (which happens only
@@ -1074,7 +1071,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   int disableAssertsEtc;
 
   /** \internal
-    
+
     Starts new output stream with the given type and source.
 
     \param type string type
@@ -1092,7 +1089,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   void AddOutput(const char *str, unsigned len);
 
   /** \internal
-    
+
     Flushes current I/O buffer to all output handlers.
 
     \param defaultLog if true and no I/O class is active then data
@@ -1122,7 +1119,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   /** \internal
 
     First pattern list list entry. A singly linked list is
-    okay for this because checking patterns is a costly 
+    okay for this because checking patterns is a costly
     operation anyway and is therefore cached.
   */
   PatternListEntry *firstPatternEntry;
@@ -1152,8 +1149,8 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
 
   /** \internal
 
-    \brief Checks if main program is running windowed or not. 
-    
+    \brief Checks if main program is running windowed or not.
+
     If the decisison can not be made an windowed program is assumed.
 
     \return true if windowed, false if full screen
@@ -1192,7 +1189,7 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
 
   /// \internal fill char
   char m_fillChar;
-  
+
   /// \internal <0 if fullscreen, >0 if windowed, ==0 if not checked yet
   char m_isWindowed;
 };
@@ -1203,11 +1200,11 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
   \brief Determines default commands to be executed at startup.
 
   This function returns a list of default commands which are executed on
-  startup if no .dbgcmd file is read. 
+  startup if no .dbgcmd file is read.
 
   Currently this function returns:
   \code
-"debug.io flat add" 
+"debug.io flat add"
   \endcode
 
   In order to provide a different set of commands simply put another
@@ -1222,11 +1219,9 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" );
 "debug.io flat add\nio flat copy q:\logfiles\n"
   \endcode
 
-  \return list of commands, separated by \\n    
+  \return list of commands, separated by \\n
   \note This function is executed after all static variables have been initialized.
 */
 const char *DebugGetDefaultCommands(void);
 
 ///@} end of debug_fn group
-
-#endif // DEBUG_DEBUG_H
diff --git a/Core/Libraries/Source/debug/debug_dlg/debug_dlg.cpp b/Core/Libraries/Source/debug/debug_dlg/debug_dlg.cpp
index 42a79097336..c1e7c164570 100644
--- a/Core/Libraries/Source/debug/debug_dlg/debug_dlg.cpp
+++ b/Core/Libraries/Source/debug/debug_dlg/debug_dlg.cpp
@@ -101,7 +101,7 @@ BOOL CALLBACK DialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
         item.iSubItem++;
         item.pszText="reallyreallyverylongfilename.cpp";
         ListView_SetItem(list,&item);
-        
+
         item.iSubItem++;
         item.pszText="5748+0xad38";
         ListView_SetItem(list,&item);
@@ -128,7 +128,7 @@ BOOL CALLBACK DialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
           item.iSubItem++;
           item.pszText="regularfilename.cpp";
           ListView_SetItem(list,&item);
-        
+
           item.iSubItem++;
           item.pszText="5748+0x38";
           ListView_SetItem(list,&item);
diff --git a/Core/Libraries/Source/debug/debug_dlg/resource.h b/Core/Libraries/Source/debug/debug_dlg/resource.h
index 1e5f83c0792..7d12ed8f3d7 100644
--- a/Core/Libraries/Source/debug/debug_dlg/resource.h
+++ b/Core/Libraries/Source/debug/debug_dlg/resource.h
@@ -24,7 +24,7 @@
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        102
diff --git a/Core/Libraries/Source/debug/debug_doc.h b/Core/Libraries/Source/debug/debug_doc.h
index 229dfe06ee0..364da4d85a0 100644
--- a/Core/Libraries/Source/debug/debug_doc.h
+++ b/Core/Libraries/Source/debug/debug_doc.h
@@ -26,14 +26,11 @@
 //
 // additional Doxygen module documentation
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef DEBUG_DOC_H // Include guard
-#define DEBUG_DOC_H
+
+#pragma once
 
 // This generates a small main page for Doxygen if a module only
-// documentation is built. 
+// documentation is built.
 #ifndef DOXYGEN_GLOBAL_DOC
 /**
   \mainpage %Debug module
@@ -51,11 +48,11 @@
 
 /**
   \page module_debug Debug module overview
-  
+
   \section overview Overview
 
   The Debug module contains all functions necessary to perform debugging related tasks,
-  e.g. checking assertions or logging. 
+  e.g. checking assertions or logging.
 
   \section logging Logging
 
@@ -71,7 +68,7 @@
   \section cmd Commands
 
   The debug module is controlled via extendable commands. Commands are
-  typically put into logical groups. A command can then be executed 
+  typically put into logical groups. A command can then be executed
   in a number of ways:
   - group.command \<param\> (explicitly specifies which group to use)
   - command \<param\> (assumes that the command resides in the same group
@@ -161,13 +158,13 @@ Help info debug group:
     <td valign=top>[ \<I/O Class\> \<cmd\> { \<param\> }] </td>
     <td>
       Issues a I/O class command. I/O class commands are used
-      for determining where all log output should be sent. 
+      for determining where all log output should be sent.
       Please check the list of \ref debug_ioclasses for a list
       of existing I/O classes.
 
       Each existing I/O class must accept at least the
       following two commands: 'add' and 'remove'. Parameters
-      for these commands and additional commands are defined 
+      for these commands and additional commands are defined
       on this page: \ref debug_ioclasses
 
       If the command is entered without any parameters a list
@@ -237,7 +234,7 @@ Timestamping: on
     <td valign=top>clear</td>
     <td valign=top>(l|a|c)</td>
     <td>
-      Clears the given inclusion/exclusion list 
+      Clears the given inclusion/exclusion list
       (l=logs, a=asserts/crashes, c=checks).
     </td>
 
@@ -247,13 +244,13 @@ Timestamping: on
     <td valign=top>add</td>
     <td valign=top>(l|a|c) (+|-) \<pattern\></td>
     <td>
-      Adds a pattern to the given list (l=logs, 
+      Adds a pattern to the given list (l=logs,
       a=asserts/crashes, c=checks). By default all
       asserts, crashes, and checks are active, all logs
-      inactive. Each item is then checked 
+      inactive. Each item is then checked
       against all pattern in the respective
       list. If a match is found the active/inactive
-      state is modified accordingly (+ for active, - 
+      state is modified accordingly (+ for active, -
       for inactive). The final state is always
       the last match.
 
@@ -299,7 +296,7 @@ Timestamping: on
   This is used e.g. for displaying custom messages in a failed DASSERT_MSG statement
   or for logging data.
 
-  There are a number of reasons why this module implements this in a stream-like 
+  There are a number of reasons why this module implements this in a stream-like
   fashion instead of the 'usual' printf method:
   - type safety: using a streams-like approach makes logging statements
     type safe. No more crashes in an ASSERT or log statement because the
@@ -312,7 +309,7 @@ Timestamping: on
   \code
 int n=1;
 float f=4;
-DLOG( "This is a static string and some other stuff: " 
+DLOG( "This is a static string and some other stuff: "
       << n << " " << f << "\n" );
   \endcode
 
@@ -377,7 +374,7 @@ void test(const Point2D &val)
       that name are overwritten.
 
       Instead of a real file name a 'magic' file name
-      can be used by starting the file name with a '*' 
+      can be used by starting the file name with a '*'
       followed by any number of special characters:
       - 'e': inserts EXE name
       - 'm': inserts machine name
@@ -424,7 +421,7 @@ void test(const Point2D &val)
       splits can be defined. They are written out
       to the first matching split file.
 
-      'types' defines one or more 
+      'types' defines one or more
       string types which should be split off:
       - a: asserts/crashes
       - c: checks
@@ -432,7 +429,7 @@ void test(const Point2D &val)
       - h: crash
       - x: exceptions
       - r: replies from commands
-      - o: other messages 
+      - o: other messages
 
       Next a filter is specified that determines
       which items are to be filtered (only for string
@@ -445,7 +442,7 @@ void test(const Point2D &val)
       then both will write to the same destination file.
 
       Note: If splits are used and the filename given
-      for 'add' is static then the split name is automatically 
+      for 'add' is static then the split name is automatically
       appended to the log file name (before the extension).
 
       If a size is specified then all data is internally written
@@ -583,7 +580,7 @@ void test(const Point2D &val)
 
   \section debug_structcmd_overview Overview
 
-  All commands are capable of returning replies in two differnt forms: A regular 
+  All commands are capable of returning replies in two differnt forms: A regular
   reply or a structured reply.
   A structured reply is basically like the regular reply but with three differences:
   - Structured reply string type \ref DebugIOInterface::StructuredCmdReply
@@ -705,5 +702,3 @@ void test(const Point2D &val)
 
   </tr></table>
 */
-
-#endif // DEBUG_DOC_H
diff --git a/Core/Libraries/Source/debug/debug_except.cpp b/Core/Libraries/Source/debug/debug_except.cpp
index 765ff6b6eb0..098e1b9bf81 100644
--- a/Core/Libraries/Source/debug/debug_except.cpp
+++ b/Core/Libraries/Source/debug/debug_except.cpp
@@ -26,7 +26,9 @@
 //
 // Unhandled exception handler
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "debug.h"
+#include "internal_except.h"
+#include <windows.h>
 #include <commctrl.h>
 
 DebugExceptionhandler::DebugExceptionhandler(void)
@@ -118,13 +120,13 @@ void DebugExceptionhandler::LogRegisters(Debug &dbg, struct _EXCEPTION_POINTERS
 
   dbg << Debug::FillChar('0')
       << Debug::Hex()
-      <<  "EAX:" << Debug::Width(8) << ctx.Eax 
+      <<  "EAX:" << Debug::Width(8) << ctx.Eax
       << " EBX:" << Debug::Width(8) << ctx.Ebx
       << " ECX:" << Debug::Width(8) << ctx.Ecx << "\n"
-      <<  "EDX:" << Debug::Width(8) << ctx.Edx 
+      <<  "EDX:" << Debug::Width(8) << ctx.Edx
       << " ESI:" << Debug::Width(8) << ctx.Esi
       << " EDI:" << Debug::Width(8) << ctx.Edi << "\n"
-      <<  "EIP:" << Debug::Width(8) << ctx.Eip 
+      <<  "EIP:" << Debug::Width(8) << ctx.Eip
       << " ESP:" << Debug::Width(8) << ctx.Esp
       << " EBP:" << Debug::Width(8) << ctx.Ebp << "\n"
       <<  "Flags:" << Debug::Bin() << Debug::Width(32) << ctx.EFlags << Debug::Hex() << "\n"
@@ -151,7 +153,7 @@ void DebugExceptionhandler::LogFPURegisters(Debug &dbg, struct _EXCEPTION_POINTE
       << "CW:" << Debug::Width(16) << (flt.ControlWord&0xffff) << "\n"
       << "SW:" << Debug::Width(16) << (flt.StatusWord&0xffff) << "\n"
       << "TW:" << Debug::Width(16) << (flt.TagWord&0xffff) << "\n"
-      << Debug::Hex() 
+      << Debug::Hex()
       << "ErrOfs:      " << Debug::Width(8) << flt.ErrorOffset
       << " ErrSel:  "    << Debug::Width(8) << flt.ErrorSelector << "\n"
       << "DataOfs:     " << Debug::Width(8) << flt.DataOffset
@@ -245,7 +247,7 @@ static BOOL CALLBACK ExceptionDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
   DebugStackwalk::Signature::GetSymbol(ctx.Eip,regInfo,sizeof(regInfo));
   SendDlgItemMessage(hWnd,102,WM_SETTEXT,0,(LPARAM)regInfo);
 
-  // stack 
+  // stack
   // (this code is a little messy because we're dealing with a raw list control)
   HWND list;
   list=GetDlgItem(hWnd,104);
@@ -309,7 +311,7 @@ static BOOL CALLBACK ExceptionDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
     for (unsigned k=0;k<sig.Size();k++)
     {
       DebugStackwalk::Signature::GetSymbol(sig.GetAddress(k),regInfo,sizeof(regInfo));
-      
+
       LVITEM item;
       item.iItem=k;
       item.iSubItem=0;
@@ -332,7 +334,7 @@ static BOOL CALLBACK ExceptionDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
       item.iSubItem++;
       item.pszText=strtok(NULL,":");
       ListView_SetItem(list,&item);
-      
+
       item.iSubItem++;
       item.pszText=strtok(NULL,"");
       ListView_SetItem(list,&item);
@@ -342,11 +344,9 @@ static BOOL CALLBACK ExceptionDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
   return TRUE;
 }
 
-#include <stdio.h>
-
 LONG __stdcall DebugExceptionhandler::ExceptionFilter(struct _EXCEPTION_POINTERS* pExPtrs)
 {
-  // we should not be calling ourselves! 
+  // we should not be calling ourselves!
   static bool inExceptionFilter;
   if (inExceptionFilter)
   {
@@ -378,7 +378,7 @@ LONG __stdcall DebugExceptionhandler::ExceptionFilter(struct _EXCEPTION_POINTERS
 
   // build info must be saved off for dialog...
   unsigned curOfs=dbg.ioBuffer[DebugIOInterface::Exception].used;
-  dbg.WriteBuildInfo(); 
+  dbg.WriteBuildInfo();
   unsigned len=dbg.ioBuffer[DebugIOInterface::Exception].used-curOfs;
   if (len>=sizeof(verInfo))
     len=sizeof(verInfo)-1;
diff --git a/Core/Libraries/Source/debug/debug_getdefaultcommands.cpp b/Core/Libraries/Source/debug/debug_getdefaultcommands.cpp
index 1705216d211..a77b9721bd6 100644
--- a/Core/Libraries/Source/debug/debug_getdefaultcommands.cpp
+++ b/Core/Libraries/Source/debug/debug_getdefaultcommands.cpp
@@ -26,7 +26,6 @@
 //
 // DebugGetDefaultCommands function
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
 
 // this function has its own file so that it can be 'overridden'
 // by another program using the Debug module
diff --git a/Core/Libraries/Source/debug/debug_internal.cpp b/Core/Libraries/Source/debug/debug_internal.cpp
index c9a91d979d7..0f610562327 100644
--- a/Core/Libraries/Source/debug/debug_internal.cpp
+++ b/Core/Libraries/Source/debug/debug_internal.cpp
@@ -26,7 +26,8 @@
 //
 // Implementation of internal code
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "debug.h"
+#include <windows.h>
 
 void DebugInternalAssert(const char *file, int line, const char *expr)
 {
@@ -36,7 +37,7 @@ void DebugInternalAssert(const char *file, int line, const char *expr)
   wsprintf(buf,"File %s, line %i:\n%s",file,line,expr);
   MessageBox(NULL,buf,"Internal assert failed",
                         MB_OK|MB_ICONSTOP|MB_TASKMODAL|MB_SETFOREGROUND);
-  
+
   // stop right now!
   TerminateProcess(GetCurrentProcess(),666);
 }
diff --git a/Core/Libraries/Source/debug/debug_io.h b/Core/Libraries/Source/debug/debug_io.h
index 834de59714d..f1d14a7ec5e 100644
--- a/Core/Libraries/Source/debug/debug_io.h
+++ b/Core/Libraries/Source/debug/debug_io.h
@@ -26,15 +26,12 @@
 //
 // Debug I/O interface
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef DEBUG_IO_H // Include guard
-#define DEBUG_IO_H
+
+#pragma once
 
 /**
   \interface DebugIOInterface debug.h <rts/debug.h>
-  
+
   \brief Debug I/O interface.
 
   A Debug I/O interface implementation must register itself
@@ -172,7 +169,7 @@ class DebugIOInterface
     \param type type name of class we're implementing
     \note This macro changes the access method to private.
   */
-  #define DEBUG_DECLARE_IO_INTERFACE(type) 
+  #define DEBUG_DECLARE_IO_INTERFACE(type)
 
   /**
     \brief Helper macro for registering I/O class factory with
@@ -183,7 +180,7 @@ class DebugIOInterface
     \param descr short I/O class description
     \param type type name of class we're implementing
   */
-  #define DEBUG_IMPLEMENT_IO_INTERFACE(io_id,descr,type) 
+  #define DEBUG_IMPLEMENT_IO_INTERFACE(io_id,descr,type)
 
 #else
 
@@ -198,5 +195,3 @@ class DebugIOInterface
 #endif
 
 ///@}
-
-#endif // DEBUG_IO_H
diff --git a/Core/Libraries/Source/debug/debug_io_con.cpp b/Core/Libraries/Source/debug/debug_io_con.cpp
index 411cbcf4444..0b9c2d605e7 100644
--- a/Core/Libraries/Source/debug/debug_io_con.cpp
+++ b/Core/Libraries/Source/debug/debug_io_con.cpp
@@ -26,7 +26,9 @@
 //
 // Debug I/O class con (console window)
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "debug.h"
+#include "internal.h"
+#include "internal_io.h"
 #include <stdlib.h>
 #include <new>      // needed for placement new prototype
 
@@ -159,7 +161,7 @@ int DebugIOCon::Read(char *buf, int maxchar)
   if (GetTickCount()&512)
     ci[m_inputUsed].Attributes=BACKGROUND_BLUE|BACKGROUND_GREEN
                               |BACKGROUND_RED|BACKGROUND_INTENSITY|FOREGROUND_GREEN;
-  
+
   COORD srcSize,srcCoord;
   srcSize.X=sizeof(m_input); srcSize.Y=1;
   srcCoord.X=srcCoord.Y=0;
@@ -192,13 +194,13 @@ void DebugIOCon::Write(StringType type, const char *src, const char *str)
 void DebugIOCon::Execute(class Debug& dbg, const char *cmd, bool structuredCmd,
                          unsigned argn, const char * const * argv)
 {
-  if (!cmd||!strcmp(cmd,"help"))
+  if (!cmd||strcmp(cmd,"help") == 0)
   {
     dbg << "con I/O help:\n"
            "  add [ <width> [ <height> ] ]\n"
            "    create con I/O (optionally specifying the window size)\n";
   }
-  else if (!strcmp(cmd,"add"))
+  else if (strcmp(cmd,"add") == 0)
   {
     if (argn>0&&m_allocatedConsole)
     {
diff --git a/Core/Libraries/Source/debug/debug_io_flat.cpp b/Core/Libraries/Source/debug/debug_io_flat.cpp
index bff310476ff..7e7d00ca63c 100644
--- a/Core/Libraries/Source/debug/debug_io_flat.cpp
+++ b/Core/Libraries/Source/debug/debug_io_flat.cpp
@@ -26,8 +26,13 @@
 //
 // Debug I/O class flat (flat or split log file)
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "debug.h"
+#include "debug_io.h"
+#include "internal.h"
+#include "internal_io.h"
 #include <stdlib.h>
+#include <windows.h>
+#include <WWCommon.h>
 #include <new>      // needed for placement new prototype
 
 DebugIOFlat::OutputStream::OutputStream(const char *filename, unsigned maxSize):
@@ -78,22 +83,20 @@ void DebugIOFlat::OutputStream::Delete(const char *path)
       char help[512];
       if (path[0]&&(path[1]==':'||(path[0]=='\\'&&path[1]=='\\')))
       {
-        strcpy(help,path);
-        strcpy(help+pathLen,fileNameOnly);
-        help[ext-fileNameOnly+pathLen]=0;
+        strlcpy(help, path, ARRAY_SIZE(help));
+        strlcat(help, fileNameOnly, ARRAY_SIZE(help));
       }
       else
       {
         // no, relative path given
-        strcpy(help,m_fileName);
-        strcpy(help+(fileNameOnly-m_fileName),path);
-        strcpy(help+(fileNameOnly-m_fileName)+pathLen,fileNameOnly);
-        help[ext-fileNameOnly+pathLen+(fileNameOnly-m_fileName)]=0;
+        strlcpy(help, m_fileName, ARRAY_SIZE(help));
+        strlcat(help, path, ARRAY_SIZE(help));
+        strlcat(help, fileNameOnly, ARRAY_SIZE(help));
       }
       if (++run)
         wsprintf(help+strlen(help),"(%i)%s",run,ext);
       else
-        strcat(help,ext);
+        strlcat(help, ext, ARRAY_SIZE(help));
       if (CopyFile(m_fileName,help,TRUE))
         break;
       if (GetLastError()!=ERROR_FILE_EXISTS)
@@ -263,7 +266,7 @@ void DebugIOFlat::ExpandMagic(const char *src, const char *splitName, char *buf)
       case 'n':
       case 'N':
         if (splitName&&strlen(splitName)<250)
-          strcpy(help,splitName);
+          strlcpy(help, splitName, ARRAY_SIZE(help));
         break;
       default:
         *dst++=src[-1];
@@ -272,7 +275,7 @@ void DebugIOFlat::ExpandMagic(const char *src, const char *splitName, char *buf)
     unsigned len=strlen(help);
     if (dst-buf+len>250)
       break;
-    strcpy(dst,help);
+    strcpy(dst, help);
     dst+=len;
   }
   strcpy(dst,".log");
@@ -329,14 +332,14 @@ void DebugIOFlat::EmergencyFlush(void)
 void DebugIOFlat::Execute(class Debug& dbg, const char *cmd, bool structuredCmd,
                           unsigned argn, const char * const * argv)
 {
-  if (!cmd||!strcmp(cmd,"help"))
+  if (!cmd||strcmp(cmd,"help") == 0)
   {
     if (!argn)
       dbg << "flat I/O help:\n"
              "The following I/O commands are defined:\n"
              "  add, copy, splitadd, splitview, splitremove\n"
              "Type in debug.io flat help <cmd> for a detailed command help.\n";
-    else if (!strcmp(argv[0],"add"))
+    else if (strcmp(argv[0],"add") == 0)
       dbg <<
         "add [ <filename> [ <size in kb> ] ]\n\n"
         "Create flat file I/O (optionally specifying file name and file size).\n"
@@ -360,13 +363,13 @@ void DebugIOFlat::Execute(class Debug& dbg, const char *cmd, bool structuredCmd,
         "size memory based ring buffer. This data is flushed out once the \n"
         "program exits. If no size is given then the size of the log file is not \n"
         "limited and any log data is written out immediately.\n";
-    else if (!strcmp(argv[0],"copy"))
+    else if (strcmp(argv[0],"copy") == 0)
       dbg <<
         "copy <directory>\n\n"
         "Copies generated log file(s) into the given directory if the program\n"
         "exists or crashes. If there is already a log file with the same\n"
         "name a unique number is appended to the current log files' name.\n";
-    else if (!strcmp(argv[0],"splitadd"))
+    else if (strcmp(argv[0],"splitadd") == 0)
       dbg <<
         "splitadd <types> <filter> <name> [ <size in kb> ]\n\n"
         "Splits off part of the log data. Multiple splits can be defined. They \n"
@@ -399,21 +402,21 @@ void DebugIOFlat::Execute(class Debug& dbg, const char *cmd, bool structuredCmd,
         "\n"
         "If no size is given then the size of the log file is not limited and \n"
         "any log data is written out immediately.\n";
-    else if (!strcmp(argv[0],"splitview"))
+    else if (strcmp(argv[0],"splitview") == 0)
       dbg << "splitview\n\n"
              "Shows all existing splits in the order they are evaluated.";
-    else if (!strcmp(argv[0],"splitremove"))
+    else if (strcmp(argv[0],"splitremove") == 0)
       dbg << "splitremove <namepattern>\n\n"
              "Removes all active splits matching the given name pattern.";
-    else 
+    else
       dbg << "Unknown flat I/O command";
   }
-  else if (!strcmp(cmd,"add"))
+  else if (strcmp(cmd,"add") == 0)
   {
     // add [ <filename> [ <size in kb> ] ]
     __ASSERT(m_firstStream==NULL);
 
-    strcpy(m_baseFilename,argn?argv[0]:"*eMN");
+    strlcpy(m_baseFilename, argn?argv[0]:"*eMN", ARRAY_SIZE(m_baseFilename));
 
     char fn[256];
     ExpandMagic(m_baseFilename,NULL,fn);
@@ -423,16 +426,15 @@ void DebugIOFlat::Execute(class Debug& dbg, const char *cmd, bool structuredCmd,
     m_firstStream->stream=OutputStream::Create(fn,argn>1?atoi(argv[1])*1024:0);
     m_lastStreamPtr=&m_firstStream->next;
   }
-  else if (!strcmp(cmd,"copy"))
+  else if (strcmp(cmd,"copy") == 0)
   {
     // copy <directory>
     if (argn)
     {
-      strncpy(m_copyDir,argv[0],sizeof(m_copyDir)-1);
-      m_copyDir[sizeof(m_copyDir)-1]=0;
+      strlcpy(m_copyDir,argv[0],sizeof(m_copyDir));
     }
   }
-  else if (!strcmp(cmd,"splitadd"))
+  else if (strcmp(cmd,"splitadd") == 0)
   {
     // splitadd <types> <filter> <name> [ <size in kb> ]
     if (argn>=3)
@@ -460,18 +462,15 @@ void DebugIOFlat::Execute(class Debug& dbg, const char *cmd, bool structuredCmd,
       if (!cur->stringTypes)
         cur->stringTypes=0xffffffff;
 
-      strncpy(cur->items,argv[1],sizeof(cur->items)-1);
-      cur->items[sizeof(cur->items)-1]=0;
-
-      strncpy(cur->name,argv[2],sizeof(cur->name)-1);
-      cur->name[sizeof(cur->name)-1]=0;
+      strlcpy(cur->items,argv[1],sizeof(cur->items));
+      strlcpy(cur->name,argv[2],sizeof(cur->name));
 
       // create our filename, search for stream with same filename
       char fn[256];
       ExpandMagic(m_baseFilename,cur->name,fn);
       StreamListEntry *stream=m_firstStream;
       for (;stream;stream=stream->next)
-        if (!strcmp(stream->stream->GetFilename(),fn))
+        if (strcmp(stream->stream->GetFilename(),fn) == 0)
           break;
       if (!stream)
       {
@@ -485,7 +484,7 @@ void DebugIOFlat::Execute(class Debug& dbg, const char *cmd, bool structuredCmd,
       cur->stream=stream->stream;
     }
   }
-  else if (!strcmp(cmd,"splitview"))
+  else if (strcmp(cmd,"splitview") == 0)
   {
     // splitview
     for (SplitListEntry *cur=m_firstSplit;cur;cur=cur->next)
@@ -508,7 +507,7 @@ void DebugIOFlat::Execute(class Debug& dbg, const char *cmd, bool structuredCmd,
       dbg << " " << cur->items << " " << cur->name << "\n";
     }
   }
-  else if (!strcmp(cmd,"splitremove"))
+  else if (strcmp(cmd,"splitremove") == 0)
   {
     // splitremove <namepattern>
     const char *pattern=argn<1?"*":argv[0];
@@ -524,7 +523,7 @@ void DebugIOFlat::Execute(class Debug& dbg, const char *cmd, bool structuredCmd,
       else
         entryPtr=&((*entryPtr)->next);
     }
-    
+
     // must fixup m_lastSplitPtr now
     if (m_firstSplit)
     {
diff --git a/Core/Libraries/Source/debug/debug_io_net.cpp b/Core/Libraries/Source/debug/debug_io_net.cpp
index 90f1d234d4c..52e31661021 100644
--- a/Core/Libraries/Source/debug/debug_io_net.cpp
+++ b/Core/Libraries/Source/debug/debug_io_net.cpp
@@ -26,7 +26,10 @@
 //
 // Debug I/O class net (Network destination via named pipe)
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "debug.h"
+#include "internal.h"
+#include "internal_io.h"
+#include <windows.h>
 #include <new>      // needed for placement new prototype
 
 DebugIONet::DebugIONet(void)
@@ -52,7 +55,7 @@ int DebugIONet::Read(char *buf, int maxchar)
     read=0;
   mode=PIPE_READMODE_MESSAGE|PIPE_WAIT;
   SetNamedPipeHandleState(m_pipe,&mode,NULL,NULL);
-  
+
   return read;
 }
 
@@ -64,7 +67,7 @@ void DebugIONet::Write(StringType type, const char *src, const char *str)
   DWORD dummy;
   WriteFile(m_pipe,&type,1,&dummy,NULL);
 
-  unsigned len; 
+  unsigned len;
   len=src?strlen(src):0;
   WriteFile(m_pipe,&len,4,&dummy,NULL);
   if (len)
@@ -83,19 +86,19 @@ void DebugIONet::EmergencyFlush(void)
 void DebugIONet::Execute(class Debug& dbg, const char *cmd, bool structuredCmd,
                          unsigned argn, const char * const * argv)
 {
-  if (!cmd||!strcmp(cmd,"help"))
+  if (!cmd||strcmp(cmd,"help") == 0)
   {
     dbg << "net I/O help:\n"
            "  add [ <machine> ]\n"
            "    create net I/O (optionally specifying the machine to connect to)\n";
   }
-  else if (!strcmp(cmd,"add"))
+  else if (strcmp(cmd,"add") == 0)
   {
     const char *machine=argn?argv[0]:".";
 
     char buf[256];
     wsprintf(buf,"\\\\%s\\pipe\\ea_debug_v1",machine);
-    m_pipe=CreateFile(buf,GENERIC_READ|GENERIC_WRITE, 
+    m_pipe=CreateFile(buf,GENERIC_READ|GENERIC_WRITE,
                       0,NULL,OPEN_EXISTING,0,NULL);
     if (m_pipe==INVALID_HANDLE_VALUE)
     {
diff --git a/Core/Libraries/Source/debug/debug_io_ods.cpp b/Core/Libraries/Source/debug/debug_io_ods.cpp
index 2d574142a40..4e5ac903640 100644
--- a/Core/Libraries/Source/debug/debug_io_ods.cpp
+++ b/Core/Libraries/Source/debug/debug_io_ods.cpp
@@ -26,7 +26,9 @@
 //
 // Debug I/O class ods (OutputDebugString, for use in debugger)
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "debug.h"
+#include "internal.h"
+#include "internal_io.h"
 #include <new>      // needed for placement new prototype
 
 void DebugIOOds::Write(StringType type, const char *src, const char *str)
diff --git a/Core/Libraries/Source/debug/debug_macro.h b/Core/Libraries/Source/debug/debug_macro.h
index aca31f80c8b..b4b0f074008 100644
--- a/Core/Libraries/Source/debug/debug_macro.h
+++ b/Core/Libraries/Source/debug/debug_macro.h
@@ -26,11 +26,8 @@
 //
 // Debugging macros
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef DEBUG_MACRO_H // Include guard
-#define DEBUG_MACRO_H
+
+#pragma once
 
 // I'm putting the documentation for the following macros
 // here because Doxygen otherwise includes the values of each macro
@@ -45,23 +42,23 @@
   This module defines a number of macros. Usually only these macros should be
   used to access any debug functionality.
 
-  All these macros are defined if either RTS_DEBUG or RTS_INTERNAL is defined. Otherwise
+  All these macros are defined if RTS_DEBUG is defined. Otherwise
   all of them (with the exception of DCHECK and DCHECK_MSG) will be removed.
 */
 ///@{
 
   /**
     \brief Regular assert macro.
-    
+
     This macro will generate an error message on screen if the evaluated expression
     returns false. The user will then have the choice of aborting the program,
     continuing once or continuing with completely ignoring that specific assertion.
 
-    Assertions are completely removed if neither RTS_DEBUG nor RTS_INTERNAL are defined.
+    Assertions are completely removed if RTS_DEBUG is not defined.
 
     \param expr expression, trigger assert window if false
   */
-  #define DASSERT(expr) 
+  #define DASSERT(expr)
 
   /**
     \brief Assert macro with custom message.
@@ -73,13 +70,13 @@
     \endcode
     For more information see the \ref debug_stream page.
 
-    Assertions are completely removed if neither RTS_DEBUG nor RTS_INTERNAL are defined.
+    Assertions are completely removed if RTS_DEBUG is not defined.
 
     \param expr expression, trigger assert window if false
     \param msg custom message stream, see \ref debug_stream
 
   */
-  #define DASSERT_MSG(expr,msg) 
+  #define DASSERT_MSG(expr,msg)
 
   /**
     \brief Compile time assertion.
@@ -116,7 +113,7 @@ debug.cpp(15) : error C2027: use of undefined type 'StaticAssertionFailed< ?? >'
 
     \param expr expression which will always be checked
   */
-  #define DCHECK(expr) 
+  #define DCHECK(expr)
 
   /**
     \brief Function macro, \ref DCHECK with additional message on failure.
@@ -129,12 +126,12 @@ debug.cpp(15) : error C2027: use of undefined type 'StaticAssertionFailed< ?? >'
     \param expr expression which will always be checked
     \param msg custom message stream, see \ref debug_stream
   */
-  #define DCHECK_MSG(expr,msg) 
+  #define DCHECK_MSG(expr,msg)
 
   /**
     \brief Macro for precondition-checks.
 
-    Internally expands to 
+    Internally expands to
     \code
 if (!DCHECK(!(cond)))
     \endcode
@@ -150,7 +147,7 @@ DFAIL_IF(!ptrval) return;
   /**
     \brief Convenience macro, \ref DFAIL_IF with additional message on failure.
 
-    Internally expands to 
+    Internally expands to
     \code
 if (!DCHECK_MSG(!(cond),msg))
     \endcode
@@ -175,7 +172,7 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return;
 
     \param what message, see \ref debug_stream
   */
-  #define DLOG(what) 
+  #define DLOG(what)
 
   /**
     \brief Adds a description for the current file if used for logging.
@@ -189,17 +186,17 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return;
     \brief Writes a message to the log file using a custom log group.
 
     Works just like \ref DLOG but instead of using the current file as a logging group
-    the logging group is explicitly specified. 
+    the logging group is explicitly specified.
 
     \note Specifiy the group directly without quotes, e.g.
       \code
-        DLOG_GROUP(my_log_group,"hello world") 
+        DLOG_GROUP(my_log_group,"hello world")
       \endcode
 
     \param group logging group, without quotes
     \param what message, see \ref debug_stream
   */
-  #define DLOG_GROUP(group,what) 
+  #define DLOG_GROUP(group,what)
 
   /**
     \brief Adds a description for a custom log group
@@ -217,7 +214,7 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return;
 
     \param msg custom message stream, see \ref debug_stream
   */
-  #define DCRASH(msg) 
+  #define DCRASH(msg)
 
   /**
     \brief Unconditional program exit that is active in release builds as well.
@@ -227,7 +224,7 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return;
 
     \param msg custom message stream, see \ref debug_stream
   */
-  #define DCRASH_RELEASE(msg) 
+  #define DCRASH_RELEASE(msg)
 
   /**
     \brief Unconditional assert.
@@ -249,7 +246,7 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return;
     \endcode
     Gets removed in release builds.
   */
-  #define DFAIL() 
+  #define DFAIL()
 
   /**
     \brief Function macro, determines if logging is active for current file or not.
@@ -267,22 +264,22 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return;
 
     \return true if logging is active, false if not
   */
-  #define D_ISLOG() 
+  #define D_ISLOG()
 
   /**
     \brief Function macro, determines if logging is active for the specified log group or not.
 
     Works just like \ref D_ISLOG but instead of using the current file as a logging group
-    the logging group is explicitly specified. 
+    the logging group is explicitly specified.
 
     \param group logging group, without quotes
     \return true if logging is active, false if not
   */
-  #define D_ISLOG_GROUP(group) 
+  #define D_ISLOG_GROUP(group)
 
 ///@}
 
-#elif defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#elif defined(RTS_DEBUG)
 
   #define DASSERT(expr) \
     ((void)( Debug::SkipNext() || \
@@ -297,12 +294,12 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return;
   #define DCHECK(expr) \
     ( (expr) || \
       Debug::SkipNext() || \
-      Debug::CheckBegin(__FILE__,__LINE__,#expr).CheckDone() ) 
+      Debug::CheckBegin(__FILE__,__LINE__,#expr).CheckDone() )
 
   #define DCHECK_MSG(expr,msg) \
     ( (expr) || \
       Debug::SkipNext() || \
-      ( Debug::CheckBegin(__FILE__,__LINE__,#expr) << ": " << msg ).CheckDone() ) 
+      ( Debug::CheckBegin(__FILE__,__LINE__,#expr) << ": " << msg ).CheckDone() )
 
   #define DFAIL_IF(cond) \
     if (!DCHECK(!(cond)))
@@ -334,7 +331,7 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return;
     Debug::AssertBegin(__FILE__,__LINE__,NULL).AssertDone()
 
   #define D_ISLOG() \
-    Debug::IsLogEnabled(__FILE__) 
+    Debug::IsLogEnabled(__FILE__)
 
   #define D_ISLOG_GROUP(group) \
     Debug::IsLogEnabled(#group)
@@ -345,7 +342,7 @@ DFAIL_IF_MSG(!ptrval,"pointer must not be NULL") return;
   #define DASSERT_MSG(expr,msg)   ((void)0)
   #define DCHECK(expr)            (expr)
   #define DCHECK_MSG(expr,msg)    (expr)
-  #define DFAIL_IF(cond)          if (cond) 
+  #define DFAIL_IF(cond)          if (cond)
   #define DFAIL_IF_MSG(cond,msg)  if (cond)
   #define DLOG(what)              ((void)0)
   #define DLOG_DESCR(descr)
@@ -372,7 +369,7 @@ namespace _Debug
 };
 
 // These are stolen from the WW3D Debug file. REALLY useful. :-)
-#define STRING_IT(a) #a																				  
+#define STRING_IT(a) #a
 #define TOKEN_IT(a) STRING_IT(,##a)
 
 /**
@@ -390,5 +387,3 @@ sourcefname.cpp (123) : Hello world
   be forgotten.
 */
 #define MESSAGE(a) message (__FILE__ "(" TOKEN_IT(__LINE__) ") : " a)
-
-#endif // DEBUG_MACRO_H
diff --git a/Core/Libraries/Source/debug/debug_stack.cpp b/Core/Libraries/Source/debug/debug_stack.cpp
index 92416b51f74..58645661339 100644
--- a/Core/Libraries/Source/debug/debug_stack.cpp
+++ b/Core/Libraries/Source/debug/debug_stack.cpp
@@ -26,7 +26,10 @@
 //
 // Stack walker
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "debug.h"
+#include "debug_stack.h"
+#include <windows.h>
+#include "stringex.h"
 #include <imagehlp.h>
 
 // Definitions to allow run-time linking to the dbghelp.dll functions.
@@ -36,9 +39,9 @@
 #undef DBGHELP
 
 #define DBGHELP(name,ret,par) name##Type _##name;
-static union 
+static union
 {
-  struct  
+  struct
   {
 #include "debug_stack.inl"
   };
@@ -47,7 +50,7 @@ static union
 #undef DBGHELP
 
 #define DBGHELP(name,ret,par) #name,
-static char const *DebughelpFunctionNames[] =
+static char const *const DebughelpFunctionNames[] =
 {
 #include "debug_stack.inl"
 	NULL
@@ -80,7 +83,7 @@ static void InitDbghelp(void)
 	if (!g_dbghelp)
 		// load any version we can
 		g_dbghelp=::LoadLibrary("DBGHELP.DLL");
-  
+
   if (!g_dbghelp)
     return;
 
@@ -137,7 +140,7 @@ unsigned DebugStackwalk::Signature::GetAddress(int n) const
   return m_addr[n];
 }
 
-void DebugStackwalk::Signature::GetSymbol(unsigned addr, char *buf, unsigned bufSize) 
+void DebugStackwalk::Signature::GetSymbol(unsigned addr, char *buf, unsigned bufSize)
 {
   DFAIL_IF(!buf) return;
   DFAIL_IF(bufSize<64||bufSize>=0x80000000) return;
@@ -213,7 +216,7 @@ void DebugStackwalk::Signature::GetSymbol(unsigned addr,
   if (relMod) *relMod=0;
   if (bufSym) *bufSym=0;
   if (relSym) *relSym=0;
-  
+
   if (bufFile) *bufFile=0;
   if (linePtr) *linePtr=0;
   if (relLine) *relLine=0;
@@ -250,8 +253,7 @@ void DebugStackwalk::Signature::GetSymbol(unsigned addr,
 
     char *p=strrchr(symbolBuffer,'\\'); // use filename only, strip off path
     p=p?p+1:symbolBuffer;
-    strncpy(bufMod,p,sizeMod);
-    bufMod[sizeMod-1]=0;
+    strlcpy(bufMod,p,sizeMod);
   }
   if (relMod)
     *relMod=addr-modBase;
@@ -266,12 +268,11 @@ void DebugStackwalk::Signature::GetSymbol(unsigned addr,
     DWORD displacement;
     if (gDbg._SymGetSymFromAddr((HANDLE)GetCurrentProcessId(),addr,&displacement,symPtr))
     {
-      strncpy(bufSym,symPtr->Name,sizeSym);
-      bufSym[sizeSym-1]=0;
+      strlcpy(bufSym,symPtr->Name,sizeSym);
       if (relSym)
         *relSym=displacement;
     }
-    else 
+    else
       strcpy(bufSym,"(unknown)");
   }
 
@@ -288,8 +289,7 @@ void DebugStackwalk::Signature::GetSymbol(unsigned addr,
     {
       char *p=strrchr(line.FileName,'\\'); // use filename only, strip off path
       p=p?p+1:line.FileName;
-      strncpy(bufFile,p,sizeFile);
-      bufFile[sizeFile-1]=0;
+      strlcpy(bufFile,p,sizeFile);
       if (linePtr)
         *linePtr=line.LineNumber;
       if (relLine)
@@ -353,7 +353,7 @@ int DebugStackwalk::StackWalk(Signature &sig, struct _CONTEXT *ctx)
 	stackFrame.AddrFrame.Mode = AddrModeFlat;
 
 	// Use the context struct if it was provided.
-	if (ctx) 
+	if (ctx)
   {
 		stackFrame.AddrPC.Offset = ctx->Eip;
 		stackFrame.AddrStack.Offset = ctx->Esp;
@@ -363,7 +363,7 @@ int DebugStackwalk::StackWalk(Signature &sig, struct _CONTEXT *ctx)
   {
     // walk stack back using current call chain
 	  unsigned long reg_eip, reg_ebp, reg_esp;
-	  __asm 
+	  __asm
     {
     here:
 		  lea	eax,here
diff --git a/Core/Libraries/Source/debug/debug_stack.h b/Core/Libraries/Source/debug/debug_stack.h
index 206d168614c..fdb6677f8ff 100644
--- a/Core/Libraries/Source/debug/debug_stack.h
+++ b/Core/Libraries/Source/debug/debug_stack.h
@@ -26,17 +26,14 @@
 //
 // Stack walker
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef DEBUG_STACK_H // Include guard
-#define DEBUG_STACK_H
+
+#pragma once
 
 /// \brief stack walker class (singleton)
 class DebugStackwalk
 {
   friend class Debug;
-  
+
   DebugStackwalk(const DebugStackwalk&);
   DebugStackwalk& operator=(DebugStackwalk&);
 
@@ -66,14 +63,14 @@ class DebugStackwalk
     Signature(const Signature &src);
     Signature& operator=(const Signature& src);
 
-    /** 
+    /**
       \brief Determine the number of addresses in this signature.
 
       \return number of addresses in this signature
     */
     unsigned Size(void) const { return m_numAddr; }
 
-    /** 
+    /**
       \brief Get a single address from the signature.
 
       The address at index 0 is always on top of the stack.
@@ -106,7 +103,7 @@ class DebugStackwalk
     /**
       \brief Determines symbol for given address.
 
-      The data is returned in the form 
+      The data is returned in the form
       \<addr\> \<module\>+NN, \<sym\>+NN, \<file\>:\<line\>+NN
 
       \param addr function address
@@ -114,7 +111,7 @@ class DebugStackwalk
       \param bufSize size of return buffer, minimum is 64 bytes (256 recommended)
     */
     static void GetSymbol(unsigned addr, char *buf, unsigned bufSize);
-    
+
     /**
       \brief Determines symbol for given address.
 
@@ -168,5 +165,3 @@ class DebugStackwalk
   \return debug instance
 */
 Debug& operator<<(Debug &dbg, const DebugStackwalk::Signature &sig);
-
-#endif // DEBUG_STACK_H
diff --git a/Core/Libraries/Source/debug/debug_stack.inl b/Core/Libraries/Source/debug/debug_stack.inl
index df412102439..41b0f8a9e3c 100644
--- a/Core/Libraries/Source/debug/debug_stack.inl
+++ b/Core/Libraries/Source/debug/debug_stack.inl
@@ -33,10 +33,10 @@ DBGHELP(SymSetOptions,
 
 DBGHELP(StackWalk,
         BOOL,
-        (DWORD MachineType, HANDLE hProcess, HANDLE hThread, LPSTACKFRAME StackFrame, 
-        LPVOID ContextRecord, PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine, 
-        PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine, 
-        PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine, 
+        (DWORD MachineType, HANDLE hProcess, HANDLE hThread, LPSTACKFRAME StackFrame,
+        LPVOID ContextRecord, PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine,
+        PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine,
+        PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine,
         PTRANSLATE_ADDRESS_ROUTINE TranslateAddress))
 
 DBGHELP(SymFunctionTableAccess,
@@ -49,15 +49,15 @@ DBGHELP(SymGetModuleBase,
 
 DBGHELP(SymGetSymFromAddr,
         BOOL,
-        (HANDLE hProcess, DWORD Address, LPDWORD Displacement, 
+        (HANDLE hProcess, DWORD Address, LPDWORD Displacement,
         PIMAGEHLP_SYMBOL Symbol))
 
 DBGHELP(SymGetLineFromAddr,
         BOOL,
-        (HANDLE hProcess, DWORD dwAddr, PDWORD pdwDisplacement, 
+        (HANDLE hProcess, DWORD dwAddr, PDWORD pdwDisplacement,
         PIMAGEHLP_LINE Line))
 
 // keep this always as last entry
 DBGHELP(SymCleanup,
         BOOL,
-        (HANDLE hProcess)) 
+        (HANDLE hProcess))
diff --git a/Core/Libraries/Source/debug/internal.h b/Core/Libraries/Source/debug/internal.h
index fa0b2cf880f..775bcc84453 100644
--- a/Core/Libraries/Source/debug/internal.h
+++ b/Core/Libraries/Source/debug/internal.h
@@ -26,13 +26,10 @@
 //
 // Internal header
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef INTERNAL_H // Include guard
-#define INTERNAL_H
 
-// make sure we're not omitting the frame pointer 
+#pragma once
+
+// make sure we're not omitting the frame pointer
 #pragma optimize("y",off)
 
 // We're doing our own little internal asserts for full debug
@@ -66,7 +63,7 @@ void *DebugAllocMemory(unsigned numBytes);
 /** \internal
 
   Allocates/reallocates the given memory block to the new
-  given size. 
+  given size.
   This function performs a controlled crash on failure.
 
   \param oldPtr pointer to old memory block, may be NULL
@@ -97,5 +94,3 @@ class DebugCmdInterfaceDebug: public DebugCmdInterface
     DebugFreeMemory(this);
   }
 };
-
-#endif // INTERNAL_H
diff --git a/Core/Libraries/Source/debug/internal_except.h b/Core/Libraries/Source/debug/internal_except.h
index 3e69c3d03b4..2e17cd0f03f 100644
--- a/Core/Libraries/Source/debug/internal_except.h
+++ b/Core/Libraries/Source/debug/internal_except.h
@@ -26,11 +26,8 @@
 //
 // Unhandled exception handler
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef INTERNAL_EXCEPT_H // Include guard
-#define INTERNAL_EXCEPT_H
+
+#pragma once
 
 /// \internal exception handler
 class DebugExceptionhandler
@@ -69,7 +66,7 @@ class DebugExceptionhandler
   static void LogFPURegisters(Debug &dbg, struct _EXCEPTION_POINTERS *exptr);
 
 public:
-  
+
   /** \internal
 
     \brief Determine exception type.
@@ -80,11 +77,9 @@ class DebugExceptionhandler
   */
   static const char *GetExceptionType(struct _EXCEPTION_POINTERS *exptr, char *explanation);
 
-  /** \internal 
-  
+  /** \internal
+
     \brief System exception filter
   */
   static long __stdcall ExceptionFilter(struct _EXCEPTION_POINTERS* pExPtrs);
 };
-
-#endif // INTERNAL_EXCEPT_H
diff --git a/Core/Libraries/Source/debug/internal_io.h b/Core/Libraries/Source/debug/internal_io.h
index 4bd187e4ac0..ddb0b186936 100644
--- a/Core/Libraries/Source/debug/internal_io.h
+++ b/Core/Libraries/Source/debug/internal_io.h
@@ -26,11 +26,10 @@
 //
 // Internal header: I/O classes
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef INTERNAL_IO_H // Include guard
-#define INTERNAL_IO_H
+
+#pragma once
+
+#include <windows.h>
 
 /// \internal \brief con debug I/O class
 class DebugIOCon: public DebugIOInterface
@@ -39,7 +38,7 @@ class DebugIOCon: public DebugIOInterface
     true if we allocated the console, false if there has already
     been a console
   */
-  bool m_allocatedConsole;    
+  bool m_allocatedConsole;
 
   /**
     internal input buffer
@@ -57,7 +56,7 @@ class DebugIOCon: public DebugIOInterface
     received.
   */
   unsigned m_inputRead;
-  
+
 public:
   explicit DebugIOCon(void);
   virtual ~DebugIOCon();
@@ -111,7 +110,7 @@ class DebugIOFlat: public DebugIOInterface
       \param len number of bytes to write
     */
     void InternalWrite(const char *src, unsigned len);
-    
+
   public:
 
     /**
@@ -167,7 +166,7 @@ class DebugIOFlat: public DebugIOInterface
 
     /// split name
     char name[256];
-    
+
     /// into which stream? (note: pointer not owned by this!)
     OutputStream *stream;
   };
@@ -205,7 +204,7 @@ class DebugIOFlat: public DebugIOInterface
 
     \param src magic filename or real filename
     \param splitName split name, NULL for default stream
-    \param buf output buffer, must have a size of at least 256 char's 
+    \param buf output buffer, must have a size of at least 256 char's
   */
   static void ExpandMagic(const char *src, const char *splitName, char *buf);
 
@@ -226,7 +225,7 @@ class DebugIONet: public DebugIOInterface
 {
   /// our pipe handle
   HANDLE m_pipe;
-  
+
 public:
   explicit DebugIONet(void);
   virtual ~DebugIONet();
@@ -252,5 +251,3 @@ class DebugIOOds: public DebugIOInterface
   static DebugIOInterface *Create(void);
   virtual void Delete(void);
 };
-
-#endif // INTERNAL_IO_H
diff --git a/Core/Libraries/Source/debug/netserv/netserv.cpp b/Core/Libraries/Source/debug/netserv/netserv.cpp
index c14a99f6cd2..45abd3717ce 100644
--- a/Core/Libraries/Source/debug/netserv/netserv.cpp
+++ b/Core/Libraries/Source/debug/netserv/netserv.cpp
@@ -40,7 +40,7 @@ static unsigned m_inputUsed;
 static void InitConsole(void)
 {
   AllocConsole();
-  
+
   HANDLE h=GetStdHandle(STD_INPUT_HANDLE);
   SetConsoleMode(h,0);
 
@@ -122,7 +122,7 @@ static char *InputConsole(void)
   if (GetTickCount()&512)
     ci[m_inputUsed].Attributes=BACKGROUND_BLUE|BACKGROUND_GREEN
                               |BACKGROUND_RED|BACKGROUND_INTENSITY|FOREGROUND_BLUE;
-  
+
   COORD srcSize,srcCoord;
   srcSize.X=sizeof(m_input); srcSize.Y=1;
   srcCoord.X=srcCoord.Y=0;
@@ -261,7 +261,7 @@ class Pipe
     if (GetLastError()==ERROR_BROKEN_PIPE)
     {
       DisconnectNamedPipe(m_pipe);
-      
+
       DWORD dwDummy;
       WriteFile(GetStdHandle(STD_OUTPUT_HANDLE),"\n<disconnect>\n",14,&dwDummy,NULL);
       m_connected=false;
@@ -281,7 +281,7 @@ int CALLBACK WinMain(HINSTANCE,HINSTANCE,LPSTR,int)
   WriteFile(GetStdHandle(STD_OUTPUT_HANDLE),buf2,
             wsprintf(buf2,"\n\nSimple debug.net Server ready. Enter 'quit' to exit.\n\nLocal machine: %s\n\n",buf1),
             &dwDummy,NULL);
-  
+
   Pipe p[10];
   for (int k=0;k<10;k++)
     if (!p[k].Create("\\\\.\\pipe\\ea_debug_v1"))
@@ -297,7 +297,7 @@ int CALLBACK WinMain(HINSTANCE,HINSTANCE,LPSTR,int)
     char *input=InputConsole();
     if (input)
     {
-      if (!strcmp(input,"quit"))
+      if (strcmp(input,"quit") == 0)
         break;
     }
 
diff --git a/Core/Libraries/Source/debug/test2/StdAfx.cpp b/Core/Libraries/Source/debug/test2/StdAfx.cpp
index 728477e7cab..3b7245248e8 100644
--- a/Core/Libraries/Source/debug/test2/StdAfx.cpp
+++ b/Core/Libraries/Source/debug/test2/StdAfx.cpp
@@ -22,5 +22,5 @@
 
 #include "StdAfx.h"
 
-// TODO: reference any additional headers you need in STDAFX.H
+// TODO: reference any additional headers you need in STDAFX.h
 // and not in this file
diff --git a/Core/Libraries/Source/debug/test2/StdAfx.h b/Core/Libraries/Source/debug/test2/StdAfx.h
index 89be871b3e3..a435c4af8d0 100644
--- a/Core/Libraries/Source/debug/test2/StdAfx.h
+++ b/Core/Libraries/Source/debug/test2/StdAfx.h
@@ -21,12 +21,7 @@
 //      are changed infrequently
 //
 
-#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
-#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 
@@ -46,5 +41,3 @@
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
diff --git a/Core/Libraries/Source/debug/test2/resource.h b/Core/Libraries/Source/debug/test2/resource.h
index a04c16aa6d8..5ff8f347094 100644
--- a/Core/Libraries/Source/debug/test2/resource.h
+++ b/Core/Libraries/Source/debug/test2/resource.h
@@ -33,7 +33,7 @@
 #define IDC_MYICON						2
 #define IDC_STATIC	                    -1
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 
diff --git a/Core/Libraries/Source/debug/test2/test2.cpp b/Core/Libraries/Source/debug/test2/test2.cpp
index 867f0787e16..0980746ec03 100644
--- a/Core/Libraries/Source/debug/test2/test2.cpp
+++ b/Core/Libraries/Source/debug/test2/test2.cpp
@@ -51,7 +51,7 @@ class TestCmdInterface: public DebugCmdInterface
   virtual bool Execute(class Debug& dbg, const char *cmd, CommandMode cmdmode,
                        unsigned argn, const char * const * argv)
   {
-    if (strcmp(cmd,"box"))
+    if (strcmp(cmd,"box") != 0)
       return false;
 
     MessageBox(NULL,"Hello world!","Command",MB_OK);
@@ -78,7 +78,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 	MyRegisterClass(hInstance);
 
 	// Perform application initialization:
-	if (!InitInstance (hInstance, nCmdShow)) 
+	if (!InitInstance (hInstance, nCmdShow))
 	{
 		return FALSE;
 	}
@@ -89,9 +89,9 @@ int APIENTRY WinMain(HINSTANCE hInstance,
   Debug::Command("debug.io ; send via EXE, try test.box!");
 
 	// Main message loop:
-	while (GetMessage(&msg, NULL, 0, 0)) 
+	while (GetMessage(&msg, NULL, 0, 0))
 	{
-		if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) 
+		if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg))
 		{
 			TranslateMessage(&msg);
 			DispatchMessage(&msg);
@@ -120,7 +120,7 @@ ATOM MyRegisterClass(HINSTANCE hInstance)
 {
 	WNDCLASSEX wcex;
 
-	wcex.cbSize = sizeof(WNDCLASSEX); 
+	wcex.cbSize = sizeof(WNDCLASSEX);
 
 	wcex.style			= CS_HREDRAW | CS_VREDRAW;
 	wcex.lpfnWndProc	= (WNDPROC)WndProc;
@@ -188,11 +188,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 	TCHAR szHello[MAX_LOADSTRING];
 	LoadString(hInst, IDS_HELLO, szHello, MAX_LOADSTRING);
 
-	switch (message) 
+	switch (message)
 	{
 		case WM_COMMAND:
-			wmId    = LOWORD(wParam); 
-			wmEvent = HIWORD(wParam); 
+			wmId    = LOWORD(wParam);
+			wmEvent = HIWORD(wParam);
 			// Parse the menu selections:
 			switch (wmId)
 			{
@@ -235,7 +235,7 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 				return TRUE;
 
 		case WM_COMMAND:
-			if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) 
+			if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
 			{
 				EndDialog(hDlg, LOWORD(wParam));
 				return TRUE;
diff --git a/Core/Libraries/Source/debug/test3/test3.cpp b/Core/Libraries/Source/debug/test3/test3.cpp
index 4298a6d8834..bd16f76ba54 100644
--- a/Core/Libraries/Source/debug/test3/test3.cpp
+++ b/Core/Libraries/Source/debug/test3/test3.cpp
@@ -26,7 +26,7 @@
 //
 // Debug module - Test 3 (Checking FLAT I/O, logging)
 //////////////////////////////////////////////////////////////////////////////
-#ifdef NDEBUG
+
 #include "../debug.h"
 
 unsigned divByNull;
diff --git a/Core/Libraries/Source/debug/test5/test5.cpp b/Core/Libraries/Source/debug/test5/test5.cpp
index 103c324214b..c4e6db8796b 100644
--- a/Core/Libraries/Source/debug/test5/test5.cpp
+++ b/Core/Libraries/Source/debug/test5/test5.cpp
@@ -39,5 +39,5 @@ void main(void)
   Debug::Command("add l + *");
 
   for (int k=0;k<16;k++)
-    DLOG("Testing: " << Debug::Format("0x%04x (%c)",k,'A'+k) << "\n");  
+    DLOG("Testing: " << Debug::Format("0x%04x (%c)",k,'A'+k) << "\n");
 }
diff --git a/Core/Libraries/Source/debug/test6/test6.cpp b/Core/Libraries/Source/debug/test6/test6.cpp
index 38d8ebd3874..ae896aea299 100644
--- a/Core/Libraries/Source/debug/test6/test6.cpp
+++ b/Core/Libraries/Source/debug/test6/test6.cpp
@@ -52,7 +52,7 @@ void main(void)
   {
     func3();
   }
-  catch (...) 
+  catch (...)
   {
     printf("This catch clause should not be executed.\n");
   }
diff --git a/Core/Libraries/Source/profile/CMakeLists.txt b/Core/Libraries/Source/profile/CMakeLists.txt
index bad4e7f94cb..e2457d80389 100644
--- a/Core/Libraries/Source/profile/CMakeLists.txt
+++ b/Core/Libraries/Source/profile/CMakeLists.txt
@@ -1,6 +1,4 @@
 set(PROFILE_SRC
-    "_pch.cpp"
-    "_pch.h"
     "internal_cmd.h"
     "internal_funclevel.h"
     "internal_highlevel.h"
@@ -26,7 +24,14 @@ target_include_directories(core_profile INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+target_precompile_headers(core_profile PRIVATE
+    "profile.h"
+    "internal.h"
+    <windows.h>
+)
+
 target_link_libraries(core_profile PRIVATE
     core_config
+    core_wwcommon
     corei_always
 )
diff --git a/Core/Libraries/Source/profile/_pch.cpp b/Core/Libraries/Source/profile/_pch.cpp
deleted file mode 100644
index b3ad7391e6a..00000000000
--- a/Core/Libraries/Source/profile/_pch.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/////////////////////////////////////////////////////////////////////////EA-V1
-// $File: //depot/GeneralsMD/Staging/code/Libraries/Source/profile/_pch.cpp $
-// $Author: mhoffe $
-// $Revision: #1 $
-// $DateTime: 2003/07/03 11:55:26 $
-//
-// (c) 2003 Electronic Arts
-//
-// Precompiled header (module internal)
-//////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
diff --git a/Core/Libraries/Source/profile/_pch.h b/Core/Libraries/Source/profile/_pch.h
deleted file mode 100644
index 13d2bfaa8ff..00000000000
--- a/Core/Libraries/Source/profile/_pch.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/////////////////////////////////////////////////////////////////////////EA-V1
-// $File: //depot/GeneralsMD/Staging/code/Libraries/Source/profile/_pch.h $
-// $Author: mhoffe $
-// $Revision: #1 $
-// $DateTime: 2003/07/03 11:55:26 $
-//
-// (c) 2003 Electronic Arts
-//
-// Precompiled header (module internal)
-//////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef _PCH_H // Include guard
-#define _PCH_H
-
-#define WIN32_LEAN_AND_MEAN
-#define STRICT
-#include <windows.h>
-
-#include "profile.h"
-#include "internal.h"
-
-#endif // _PCH_H
diff --git a/Core/Libraries/Source/profile/internal.h b/Core/Libraries/Source/profile/internal.h
index a71b22f7905..b80d223baae 100644
--- a/Core/Libraries/Source/profile/internal.h
+++ b/Core/Libraries/Source/profile/internal.h
@@ -26,11 +26,8 @@
 //
 // Internal header
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef INTERNAL_H // Include guard
-#define INTERNAL_H
+
+#pragma once
 
 #include "../debug/debug.h"
 #include "internal_funclevel.h"
@@ -38,6 +35,7 @@
 #include "internal_cmd.h"
 #include "internal_result.h"
 #include "Utility/CppMacros.h"
+#include <windows.h>
 
 #if !(defined(_MSC_VER) && _MSC_VER < 1300)
 #include <atomic>
@@ -48,7 +46,7 @@ class ProfileFastCS
 {
   ProfileFastCS(const ProfileFastCS&) CPP_11(= delete);
   ProfileFastCS& operator=(const ProfileFastCS&) CPP_11(= delete);
-  
+
 	static HANDLE testEvent;
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
@@ -84,7 +82,7 @@ class ProfileFastCS
 
 public:
 	ProfileFastCS(void):
-    m_Flag(0) 
+    m_Flag(0)
   {
   }
 #else
@@ -93,7 +91,7 @@ class ProfileFastCS
 
 	void ThreadSafeSetFlag()
 	{
-		while (Flag.test_and_set(std::memory_order_acquire)) {
+		while (Flag.test_and_set(std::memory_order_acq_rel)) {
 			Flag.wait(true, std::memory_order_relaxed);
 		}
 	}
@@ -117,7 +115,7 @@ class ProfileFastCS
 		ProfileFastCS& CriticalSection;
 
 	public:
-		Lock(ProfileFastCS& cs): 
+		Lock(ProfileFastCS& cs):
       CriticalSection(cs)
 		{
 			CriticalSection.ThreadSafeSetFlag();
@@ -154,5 +152,3 @@ __forceinline void ProfileGetTime(__int64 &t)
   t = static_cast<__int64>(_rdtsc());
 #endif
 }
-
-#endif // INTERNAL_H
diff --git a/Core/Libraries/Source/profile/internal_cmd.h b/Core/Libraries/Source/profile/internal_cmd.h
index f6e6f5bc2f5..b46cb1e17c6 100644
--- a/Core/Libraries/Source/profile/internal_cmd.h
+++ b/Core/Libraries/Source/profile/internal_cmd.h
@@ -26,11 +26,8 @@
 //
 // Profile module command interface
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef INTERNAL_CMD_H // Include guard
-#define INTERNAL_CMD_H
+
+#pragma once
 
 class ProfileCmdInterface: public DebugCmdInterface
 {
@@ -48,7 +45,7 @@ class ProfileCmdInterface: public DebugCmdInterface
 
 public:
   ProfileCmdInterface(void): numResFunc(0), resFunc(0) {}
-  
+
   static void AddResultFunction(ProfileResultInterface* (*func)(int, const char * const *),
                                 const char *name, const char *arg);
   void RunResultFunctions(void);
@@ -57,5 +54,3 @@ class ProfileCmdInterface: public DebugCmdInterface
                        unsigned argn, const char * const * argv);
   virtual void Delete(void) {}
 };
-
-#endif // INTERNAL_CMD_H
diff --git a/Core/Libraries/Source/profile/internal_funclevel.h b/Core/Libraries/Source/profile/internal_funclevel.h
index e9b6f2e3d7e..e9229dbf22c 100644
--- a/Core/Libraries/Source/profile/internal_funclevel.h
+++ b/Core/Libraries/Source/profile/internal_funclevel.h
@@ -26,16 +26,15 @@
 //
 // Function level profiling (internal header)
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef INTERNAL_FUNCLEVEL_H // Include guard
-#define INTERNAL_FUNCLEVEL_H
+
+#pragma once
+
+#include <windows.h>
 
 class ProfileFuncLevelTracer
 {
   friend class ProfileCmdInterface;
-  
+
   // can't copy this
   ProfileFuncLevelTracer(const ProfileFuncLevelTracer&);
   ProfileFuncLevelTracer& operator=(const ProfileFuncLevelTracer&);
@@ -150,7 +149,7 @@ class ProfileFuncLevelTracer
   {
     /// address of this function
     unsigned addr;
-    
+
     /// global profile
     Profile glob;
 
@@ -243,7 +242,7 @@ class ProfileFuncLevelTracer
   {
     return next;
   }
-  
+
   Function *FindFunction(unsigned addr)
   {
     return func.Find(addr);
@@ -258,7 +257,7 @@ class ProfileFuncLevelTracer
   /// single stack entry
   struct StackEntry
   {
-    /// function 
+    /// function
     Function *func;
 
     /// ESP value
@@ -358,5 +357,3 @@ inline ProfileFuncLevelTracer::Function *ProfileFuncLevelTracer::FunctionMap::Fi
       return e->funcPtr;
   return NULL;
 }
-
-#endif // INTERNAL_FUNCLEVEL_H
diff --git a/Core/Libraries/Source/profile/internal_highlevel.h b/Core/Libraries/Source/profile/internal_highlevel.h
index 48d202ec238..2d9c572755e 100644
--- a/Core/Libraries/Source/profile/internal_highlevel.h
+++ b/Core/Libraries/Source/profile/internal_highlevel.h
@@ -26,11 +26,8 @@
 //
 // High level profiling (internal header)
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef INTERNAL_HIGHLEVEL_H // Include guard
-#define INTERNAL_HIGHLEVEL_H
+
+#pragma once
 
 /// an internal high level profile ID
 class ProfileId
@@ -174,7 +171,7 @@ class ProfileId
     ProfileId's can't be destructed.
   */
   ~ProfileId() {}
-  
+
   enum
   {
     /// # of simultaneous frame recordings
@@ -243,5 +240,3 @@ class ProfileId
   /// next unused char in string buffer
   static unsigned stringBufUnused;
 };
-
-#endif // INTERNAL_HIGHLEVEL_H
diff --git a/Core/Libraries/Source/profile/internal_result.h b/Core/Libraries/Source/profile/internal_result.h
index 3e952fa0409..a62f082a394 100644
--- a/Core/Libraries/Source/profile/internal_result.h
+++ b/Core/Libraries/Source/profile/internal_result.h
@@ -26,11 +26,8 @@
 //
 // Internal result functions
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef INTERNAL_RESULT_H // Include guard
-#define INTERNAL_RESULT_H
+
+#pragma once
 
 /// \brief Simple CSV format flat file result function, for all threads.
 class ProfileResultFileCSV: public ProfileResultInterface
@@ -38,7 +35,7 @@ class ProfileResultFileCSV: public ProfileResultInterface
   ProfileResultFileCSV(void) {}
 
   void WriteThread(ProfileFuncLevel::Thread &thread);
-  
+
 public:
   static ProfileResultInterface *Create(int argn, const char * const *);
   virtual const char *GetName(void) const { return "file_csv"; }
@@ -49,10 +46,10 @@ class ProfileResultFileCSV: public ProfileResultInterface
 /**
   \brief Write out DOT file for calling hierarchy.
 
-  The frame name and the file name must be specified when creating an 
+  The frame name and the file name must be specified when creating an
   instance of this result function. The result function will always pick
   the thread with the highest function count (which is usually the
-  main thread). 
+  main thread).
 
   \note A DOT file is used with the DOT tool from the GraphViz package
   for generating directed graphs, e.g. by issuing dot -Tgif -ograph.gif profile.dot
@@ -76,7 +73,7 @@ class ProfileResultFileDOT: public ProfileResultInterface
     \return new instance
   */
   static ProfileResultInterface *Create(int argn, const char * const *);
-  
+
   virtual const char *GetName(void) const { return "file_dot"; }
   virtual void WriteResults(void);
   virtual void Delete(void);
@@ -98,5 +95,3 @@ class ProfileResultFileDOT: public ProfileResultInterface
   char *m_frameName;
   int m_foldThreshold;
 };
-
-#endif // INTERNAL_RESULT_H
diff --git a/Core/Libraries/Source/profile/profile.cpp b/Core/Libraries/Source/profile/profile.cpp
index 1e65d6b9269..66981103b79 100644
--- a/Core/Libraries/Source/profile/profile.cpp
+++ b/Core/Libraries/Source/profile/profile.cpp
@@ -26,13 +26,14 @@
 //
 // Profile module main code
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "profile.h"
+#include "internal.h"
 #include <new>
 #include "mmsystem.h"
 
 // yuk, I'm doing this so weird because the destructor
 // of cmd must never be called...
-static ProfileCmdInterface &cmd=*(ProfileCmdInterface *)new 
+static ProfileCmdInterface &cmd=*(ProfileCmdInterface *)new
                   (ProfileAllocMemory(sizeof(ProfileCmdInterface))) ProfileCmdInterface();
 
 // we have this here so that our command interface will always
@@ -94,9 +95,9 @@ static _int64 GetClockCyclesFast(void)
   Profile::AddResultFunction(ProfileResultFileCSV::Create,
                               "file_dot",
                               "[ file [ frame_name [ fold_threshold ] ] ]");
-  
+
   // this must not take a very huge CPU hit...
-  
+
   // measure clock cycles 3 times for 20 msec each
   // then take the 2 counts that are closest, average
   _int64 n[3];
@@ -165,7 +166,7 @@ void Profile::StartRange(const char *range)
   // known name?
   unsigned k=0;
   for (;k<m_names;++k)
-    if (!strcmp(range,m_frameNames[k].name))
+    if (strcmp(range,m_frameNames[k].name) == 0)
       break;
   if (k==m_names)
   {
@@ -220,7 +221,7 @@ void Profile::AppendRange(const char *range)
   // known name?
   unsigned k=0;
   for (;k<m_names;++k)
-    if (!strcmp(range,m_frameNames[k].name))
+    if (strcmp(range,m_frameNames[k].name) == 0)
       break;
   if (k==m_names)
   {
@@ -271,7 +272,7 @@ void Profile::StopRange(const char *range)
   // known name?
   unsigned k=0;
   for (;k<m_names;++k)
-    if (!strcmp(range,m_frameNames[k].name))
+    if (strcmp(range,m_frameNames[k].name) == 0)
       break;
   DFAIL_IF(k==m_names) return;
   DFAIL_IF(!m_frameNames[k].isRecording) return;
@@ -358,7 +359,7 @@ bool Profile::SimpleMatch(const char *str, const char *pattern)
           return true;
       return *str==*pattern;
     }
-    else 
+    else
     {
       if (*str++!=*pattern++)
         return false;
diff --git a/Core/Libraries/Source/profile/profile.h b/Core/Libraries/Source/profile/profile.h
index d1c6fccb17e..92dde861b86 100644
--- a/Core/Libraries/Source/profile/profile.h
+++ b/Core/Libraries/Source/profile/profile.h
@@ -26,15 +26,8 @@
 //
 // Profiling module
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef PROFILE_H // Include guard
-#define PROFILE_H
 
-#if defined(RTS_DEBUG) && defined(RTS_INTERNAL)
-	#error "Only either RTS_DEBUG or RTS_INTERNAL should ever be defined"
-#endif
+#pragma once
 
 // include all our public header files (use double quotes here)
 #include "profile_doc.h"
@@ -48,7 +41,7 @@
 class Profile
 {
   friend class ProfileCmdInterface;
-  
+
   // nobody can construct this class
   Profile();
 
@@ -68,7 +61,7 @@ class Profile
     \param range name of range to record, ==NULL for "frame"
   */
   static void AppendRange(const char *range=0);
-  
+
   /**
     \brief Stops range recording.
 
@@ -124,7 +117,7 @@ class Profile
     \return number of CPU clock cycles per second
   */
   static _int64 GetClockCyclesPerSecond(void);
-  
+
   /**
     \brief Add the given result function interface.
 
@@ -145,7 +138,7 @@ class Profile
     \return true if string matches pattern, false if not
   */
   static bool SimpleMatch(const char *str, const char *pattern);
-  
+
   /// known frame names
   struct FrameName
   {
@@ -187,7 +180,7 @@ class Profile
   /** \internal
 
     First pattern list list entry. A singly linked list is
-    okay for this because checking patterns is a costly 
+    okay for this because checking patterns is a costly
     operation anyway and is therefore cached.
   */
   static PatternListEntry *firstPatternEntry;
@@ -210,5 +203,3 @@ class Profile
   /// CPU clock cycles/second
   static _int64 m_clockCycles;
 };
-
-#endif // PROFILE_H
diff --git a/Core/Libraries/Source/profile/profile_cmd.cpp b/Core/Libraries/Source/profile/profile_cmd.cpp
index e138bab3f8c..5eb0ef643f4 100644
--- a/Core/Libraries/Source/profile/profile_cmd.cpp
+++ b/Core/Libraries/Source/profile/profile_cmd.cpp
@@ -26,7 +26,8 @@
 //
 // Profile module command interface
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "profile.h"
+#include "internal.h"
 
 unsigned ProfileCmdInterface::numResIf;
 ProfileCmdInterface::Factory *ProfileCmdInterface::resIf;
@@ -37,7 +38,7 @@ void ProfileCmdInterface::AddResultFunction(ProfileResultInterface* (*func)(int,
   DFAIL_IF(!func) return;
   DFAIL_IF(!name) return;
   for (unsigned k=0;k<numResIf;k++)
-    if (!strcmp(resIf[k].name,name))
+    if (strcmp(resIf[k].name,name) == 0)
       return;
   ++numResIf;
   resIf=(Factory *)ProfileReAllocMemory(resIf,numResIf*sizeof(Factory));
@@ -66,18 +67,18 @@ bool ProfileCmdInterface::Execute(class Debug& dbg, const char *cmd, CommandMode
   // just for convenience...
   bool normalMode=cmdmode==CommandMode::Normal;
 
-  if (!strcmp(cmd,"help"))
+  if (strcmp(cmd,"help") == 0)
   {
     if (!normalMode)
       return true;
-    
+
     if (!argn)
     {
       dbg << "profile group help:\n"
              "  result, caller, clear, add, view\n";
       return true;
     }
-    else if (!strcmp(argv[0],"result"))
+    else if (strcmp(argv[0],"result") == 0)
     {
       dbg << "result\n\n"
              "Shows the list of available result functions and their\n"
@@ -87,20 +88,20 @@ bool ProfileCmdInterface::Execute(class Debug& dbg, const char *cmd, CommandMode
              "Adds the given result function to be executed on program\n"
              "exit.\n";
     }
-    else if (!strcmp(argv[0],"caller"))
+    else if (strcmp(argv[0],"caller") == 0)
     {
       dbg << "caller [ (+|-) ]\n\n"
              "Enables/disables recording of caller information while\n"
              "performing function level profiling. Turned off by default\n"
              "since CPU hit is non-zero.\n";
     }
-    else if (!strcmp(argv[0],"clear"))
+    else if (strcmp(argv[0],"clear") == 0)
     {
       dbg << "clear\n\n"
              "Clears the profile inclusion/exclusion list.\n";
       return true;
     }
-    else if (!strcmp(argv[0],"add"))
+    else if (strcmp(argv[0],"add") == 0)
     {
       dbg << "add (+|-) <pattern>\n"
              "\n"
@@ -111,7 +112,7 @@ bool ProfileCmdInterface::Execute(class Debug& dbg, const char *cmd, CommandMode
              "- for inactive). The final state is always the last match.";
       return true;
     }
-    else if (!strcmp(argv[0],"view"))
+    else if (strcmp(argv[0],"view") == 0)
     {
       dbg << "view\n\n"
              "Shows the active pattern list.\n";
@@ -121,7 +122,7 @@ bool ProfileCmdInterface::Execute(class Debug& dbg, const char *cmd, CommandMode
   }
 
   // command: result
-  if (!strcmp(cmd,"result"))
+  if (strcmp(cmd,"result") == 0)
   {
     if (!argn)
     {
@@ -138,7 +139,7 @@ bool ProfileCmdInterface::Execute(class Debug& dbg, const char *cmd, CommandMode
     {
       unsigned k=0;
       for (;k<numResIf;k++)
-        if (!strcmp(argv[0],resIf[k].name))
+        if (strcmp(argv[0],resIf[k].name) == 0)
           break;
       if (k==numResIf)
       {
@@ -152,19 +153,19 @@ bool ProfileCmdInterface::Execute(class Debug& dbg, const char *cmd, CommandMode
         dbg << "Could not add result function\n";
         return true;
       }
-      
+
       ++numResFunc;
       resFunc=(ProfileResultInterface **)ProfileReAllocMemory(resFunc,numResFunc*sizeof(ProfileResultInterface *));
       resFunc[numResFunc-1]=newIf;
       if (normalMode)
         dbg << "Result function " << argv[0] << " added\n";
     }
-    
+
     return true;
   }
 
   // command: caller
-  if (!strcmp(cmd,"caller"))
+  if (strcmp(cmd,"caller") == 0)
   {
 #ifdef HAS_PROFILE
     if (argn)
@@ -184,7 +185,7 @@ bool ProfileCmdInterface::Execute(class Debug& dbg, const char *cmd, CommandMode
   }
 
   // command: clear
-  if (!strcmp(cmd,"clear"))
+  if (strcmp(cmd,"clear") == 0)
   {
     // remove some (or all) pattern
     const char *pattern=argn<1?"*":argv[0];
@@ -215,7 +216,7 @@ bool ProfileCmdInterface::Execute(class Debug& dbg, const char *cmd, CommandMode
   }
 
   // command: add
-  if (!strcmp(cmd,"add"))
+  if (strcmp(cmd,"add") == 0)
   {
     // add a pattern
     if (argn<2)
@@ -243,7 +244,7 @@ bool ProfileCmdInterface::Execute(class Debug& dbg, const char *cmd, CommandMode
   }
 
   // command: view
-  if (!strcmp(cmd,"view"))
+  if (strcmp(cmd,"view") == 0)
   {
     // show list of defined patterns
     for (Profile::PatternListEntry *cur=Profile::firstPatternEntry;cur;cur=cur->next)
diff --git a/Core/Libraries/Source/profile/profile_doc.h b/Core/Libraries/Source/profile/profile_doc.h
index 51942fe595d..7fb82b37ab8 100644
--- a/Core/Libraries/Source/profile/profile_doc.h
+++ b/Core/Libraries/Source/profile/profile_doc.h
@@ -26,14 +26,11 @@
 //
 // additional Doxygen module documentation
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef PROFILE_DOC_H // Include guard
-#define PROFILE_DOC_H
+
+#pragma once
 
 // This generates a small main page for Doxygen if a module only
-// documentation is built. 
+// documentation is built.
 #ifndef DOXYGEN_GLOBAL_DOC
 /**
   \mainpage %Profile module
@@ -49,7 +46,7 @@
 
 /**
   \page module_profile Profile module overview
-  
+
   \section overview Overview
 
   The profile module contains the following logical groups:
@@ -65,15 +62,15 @@
 
   High level profiling can be done both timer based and logical. An example
   for a logical profile would be the number of texture changes per frame
-  or the number of triangles rendered. 
-  
+  or the number of triangles rendered.
+
   The hierarchy is enforced by using a hierarchical naming scheme. For
-  timer based profiles this hierachy is build automatically, for 
+  timer based profiles this hierachy is build automatically, for
   logical profiles each profile must be named accordingly when being created.
 
   High level profiling is available in all build configurations. All
   high level profile functions are optimized for speed (at least while
-  profiling is disabled) so that there is an almost zero cost for 
+  profiling is disabled) so that there is an almost zero cost for
   having profiling in all configurations.
 
   \section funclevel Function Level Profiling
@@ -129,7 +126,7 @@
     <td valign=top>result</td>
     <td valign=top>[ \<res_func_name\> [ \<arg1\> .. \<argN\> ] ]</td>
     <td>
-       Without parameters this command shows the list of available 
+       Without parameters this command shows the list of available
        result functions and their optional parameters.
 
        If however a result function name is given then this result
@@ -192,5 +189,3 @@
   </tr></table>
 
 */
-
-#endif // PROFILE_DOC_H
diff --git a/Core/Libraries/Source/profile/profile_funclevel.cpp b/Core/Libraries/Source/profile/profile_funclevel.cpp
index 070de422a5d..3c7110ca2ff 100644
--- a/Core/Libraries/Source/profile/profile_funclevel.cpp
+++ b/Core/Libraries/Source/profile/profile_funclevel.cpp
@@ -26,7 +26,8 @@
 //
 // Function level profiling
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "profile.h"
+#include "internal.h"
 #include "../debug/debug.h"
 #include <new>
 
@@ -77,7 +78,7 @@ extern "C" void __declspec(naked) _cdecl _penter(void)
   unsigned callerFunc,ESPonReturn,callerRet;
   ProfileFuncLevelTracer *p;
 
-  _asm 
+  _asm
   {
     push ebp
     push eax
@@ -179,9 +180,9 @@ void ProfileFuncLevelTracer::Enter(unsigned addr, unsigned esp, unsigned ret)
   if (usedStack>=maxDepth)
     maxDepth=usedStack;
 
-  DLOG_GROUP(profile_stack,Debug::RepeatChar(' ',usedStack-1) 
-                          << Debug::Hex() << this 
-                          << " Enter " << Debug::Width(8) << addr 
+  DLOG_GROUP(profile_stack,Debug::RepeatChar(' ',usedStack-1)
+                          << Debug::Hex() << this
+                          << " Enter " << Debug::Width(8) << addr
                           << " ESP "   << Debug::Width(8) << esp
                           << " return "   << Debug::Width(8) << ret
                           << " level " << Debug::Dec() << usedStack
@@ -260,9 +261,9 @@ unsigned ProfileFuncLevelTracer::Leave(unsigned esp)
     DCRASH("ESP " << Debug::Hex() << esp << " does not match " << stack[usedStack].esp << Debug::Dec());
   }
 
-  DLOG_GROUP(profile_stack,Debug::RepeatChar(' ',usedStack-1) 
-                          << Debug::Hex() << this 
-                          << " Leave " << Debug::Width(8) << "" 
+  DLOG_GROUP(profile_stack,Debug::RepeatChar(' ',usedStack-1)
+                          << Debug::Hex() << this
+                          << " Leave " << Debug::Width(8) << ""
                           << " ESP "   << Debug::Width(8) << stack[usedStack].esp
                           << " return "   << Debug::Width(8) << stack[usedStack].retVal
                           << " level " << Debug::Dec() << usedStack
@@ -312,13 +313,13 @@ void ProfileFuncLevelTracer::FrameEnd(int which, int mixIndex)
 {
   DFAIL_IF(which<0||which>=MAX_FRAME_RECORDS)
     return;
-  DFAIL_IF(!(frameRecordMask&(1<<which))) 
+  DFAIL_IF(!(frameRecordMask&(1<<which)))
     return;
   DFAIL_IF(mixIndex>=curFrame)
     return;
 
   ProfileFastCS::Lock lock(cs);
-  
+
   frameRecordMask^=1<<which;
   if (mixIndex<0)
     curFrame++;
@@ -425,7 +426,7 @@ void ProfileFuncLevelTracer::UnsignedMap::Copy(const UnsignedMap &src)
 {
   Clear();
   if (src.e)
-  { 
+  {
     alloc=used=src.used;
     e=(Entry *)ProfileAllocMemory(alloc*sizeof(Entry));
     memcpy(e,src.e,alloc*sizeof(Entry));
@@ -575,7 +576,7 @@ const char *ProfileFuncLevel::Id::GetSource(void) const
                                          NULL,0,NULL,
                                          helpFunc,sizeof(helpFunc),&ofsFunc,
                                          helpFile,sizeof(helpFile),&func->funcLine,NULL);
-    
+
     char help[300];
     wsprintf(help,ofsFunc?"%s+0x%x":"%s",helpFunc,ofsFunc);
     func->funcSource=(char *)ProfileAllocMemory(strlen(helpFile)+1);
@@ -692,7 +693,7 @@ bool ProfileFuncLevel::Thread::EnumProfile(unsigned index, Id &id) const
 {
   if (!m_threadID)
     return false;
-  
+
   ProfileFastCS::Lock lock(cs);
 
   ProfileFuncLevelTracer::Function *f=m_threadID->EnumFunction(index);
diff --git a/Core/Libraries/Source/profile/profile_funclevel.h b/Core/Libraries/Source/profile/profile_funclevel.h
index 8736cf80375..afe2227b0f3 100644
--- a/Core/Libraries/Source/profile/profile_funclevel.h
+++ b/Core/Libraries/Source/profile/profile_funclevel.h
@@ -26,11 +26,8 @@
 //
 // Function level profiling
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef PROFILE_FUNCLEVEL_H // Include guard
-#define PROFILE_FUNCLEVEL_H
+
+#pragma once
 
 /**
   \brief The function level profiler.
@@ -77,7 +74,7 @@ class ProfileFuncLevel
     void *m_ptr;
   };
 
-  /// \brief A function level profile ID. 
+  /// \brief A function level profile ID.
   class Id
   {
     friend IdList;
@@ -85,7 +82,7 @@ class ProfileFuncLevel
 
   public:
     Id(void): m_funcPtr(0) {}
-    
+
     /// special 'frame' numbers
     enum
     {
@@ -119,7 +116,7 @@ class ProfileFuncLevel
 
       \return line number, 0 if unknown
     */
-    unsigned GetLine(void) const; 
+    unsigned GetLine(void) const;
 
     /**
       \brief Determine call counts.
@@ -206,18 +203,16 @@ class ProfileFuncLevel
 
 private:
 
-  /** \internal 
-    
+  /** \internal
+
     Undocumented default constructor. Initializes function level profiler.
-    We can make this private as well so nobody accidently tries to create 
-    another instance. 
+    We can make this private as well so nobody accidently tries to create
+    another instance.
   */
   ProfileFuncLevel(void);
 
-  /** 
-    \brief The only function level profiler instance. 
+  /**
+    \brief The only function level profiler instance.
   */
   static ProfileFuncLevel Instance;
 };
-
-#endif // PROFILE_FUNCLEVEL_H
diff --git a/Core/Libraries/Source/profile/profile_highlevel.cpp b/Core/Libraries/Source/profile/profile_highlevel.cpp
index bdd840e3841..fa55293e935 100644
--- a/Core/Libraries/Source/profile/profile_highlevel.cpp
+++ b/Core/Libraries/Source/profile/profile_highlevel.cpp
@@ -26,9 +26,10 @@
 //
 // High level profiling
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "profile.h"
+#include "internal.h"
 #include <new>
-#include <Utility/stdio_adapter.h>
+#include <WWCommon.h>
 
 // our own fast critical section
 static ProfileFastCS cs;
@@ -91,9 +92,8 @@ ProfileHighLevel::Block::Block(const char *name)
   m_idTime=AddProfile(name,NULL,"msec",6,-4);
 
   char help[256];
-  strncpy(help,name,sizeof(help));
-  help[sizeof(help)-1-2]=0;
-  strcat(help,".c");
+  strlcpy(help, name, sizeof(help) - 2);
+  strlcat(help, ".c", sizeof(help));
   AddProfile(help,NULL,"calls",6,0).Increment();
 
   ProfileGetTime(m_start);
@@ -172,9 +172,9 @@ void ProfileId::Maximum(double max)
     return;
 
   m_valueMode=ModeMaximum;
-  if (max>m_curVal) 
+  if (max>m_curVal)
     m_curVal=max;
-  if (max>m_totalVal) 
+  if (max>m_totalVal)
     m_totalVal=max;
   if (frameRecordMask)
   {
@@ -183,7 +183,7 @@ void ProfileId::Maximum(double max)
     {
       if (mask&1)
       {
-        if (max>m_frameVal[i]) 
+        if (max>m_frameVal[i])
           m_frameVal[i]=max;
       }
       if (!(mask>>=1))
@@ -196,7 +196,7 @@ const char *ProfileId::AsString(double v) const
 {
   char help1[10],help[40];
   wsprintf(help1,"%%%i.lf",m_precision);
-  
+
   double mul=1.0;
   int k;
   for (k=m_exp10;k<0;k++) mul*=10.0;
@@ -235,13 +235,13 @@ void ProfileId::FrameEnd(int which, int mixIndex)
 {
   DFAIL_IF(which<0||which>=MAX_FRAME_RECORDS)
     return;
-  DFAIL_IF(!(frameRecordMask&(1<<which))) 
+  DFAIL_IF(!(frameRecordMask&(1<<which)))
     return;
   DFAIL_IF(mixIndex>=curFrame)
     return;
 
   ProfileFastCS::Lock lock(cs);
-  
+
   frameRecordMask^=1<<which;
   if (mixIndex<0)
   {
@@ -274,7 +274,7 @@ void ProfileId::FrameEnd(int which, int mixIndex)
             val=p->m_frameVal[which];
           break;
         default:
-          DFAIL(); 
+          DFAIL();
       }
     }
   }
@@ -324,7 +324,7 @@ bool ProfileHighLevel::FindProfile(const char *name, Id &id)
 
   ProfileFastCS::Lock lock(cs);
   for (ProfileId *cur=ProfileId::GetFirst();cur;cur=cur->GetNext())
-    if (!strcmp(name,cur->GetName()))
+    if (strcmp(name,cur->GetName()) == 0)
     {
       id.m_idPtr=cur;
       return true;
diff --git a/Core/Libraries/Source/profile/profile_highlevel.h b/Core/Libraries/Source/profile/profile_highlevel.h
index 26e6da1c301..dea386181b5 100644
--- a/Core/Libraries/Source/profile/profile_highlevel.h
+++ b/Core/Libraries/Source/profile/profile_highlevel.h
@@ -26,11 +26,8 @@
 //
 // High level profiling
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef PROFILE_HIGHLEVEL_H // Include guard
-#define PROFILE_HIGHLEVEL_H
+
+#pragma once
 
 /// \internal internal Id representation
 class ProfileId;
@@ -48,14 +45,14 @@ class ProfileHighLevel
 
 public:
 
-  /// \brief A high level profile ID. 
+  /// \brief A high level profile ID.
   class Id
   {
     friend ProfileHighLevel;
 
   public:
     Id(void): m_idPtr(0) {}
-    
+
     /**
       \brief Increment the internal profile value.
 
@@ -213,7 +210,7 @@ class ProfileHighLevel
     \brief Searches for the given high level profile.
 
     \note Actually the ID returned belongs to the first profile
-    which has a name that is equal to or larger than the name 
+    which has a name that is equal to or larger than the name
     searched for.
 
     \param name profile name to search for
@@ -224,18 +221,16 @@ class ProfileHighLevel
 
 private:
 
-  /** \internal 
-    
+  /** \internal
+
     Undocumented default constructor. Initializes high level profiler.
-    We can make this private as well so nobody accidently tries to create 
-    another instance. 
+    We can make this private as well so nobody accidently tries to create
+    another instance.
   */
   ProfileHighLevel(void);
 
-  /** 
-    \brief The only high level profiler instance. 
+  /**
+    \brief The only high level profiler instance.
   */
   static ProfileHighLevel Instance;
 };
-
-#endif // PROFILE_HIGHLEVEL_H
diff --git a/Core/Libraries/Source/profile/profile_result.cpp b/Core/Libraries/Source/profile/profile_result.cpp
index 2cc08ba936e..13d55a679b9 100644
--- a/Core/Libraries/Source/profile/profile_result.cpp
+++ b/Core/Libraries/Source/profile/profile_result.cpp
@@ -26,10 +26,11 @@
 //
 // Result function interface and result functions
 //////////////////////////////////////////////////////////////////////////////
-#include "_pch.h"
+#include "profile.h"
+#include "internal.h"
 #include <new>
-#include <stdio.h>
 #include <stdlib.h>
+#include <Utility/stdio_adapter.h>
 
 //////////////////////////////////////////////////////////////////////////////
 // ProfileResultFileCSV
@@ -143,7 +144,7 @@ void ProfileResultFileCSV::Delete(void)
 
 ProfileResultInterface *ProfileResultFileDOT::Create(int argn, const char * const *argv)
 {
-  return new (ProfileAllocMemory(sizeof(ProfileResultFileDOT))) 
+  return new (ProfileAllocMemory(sizeof(ProfileResultFileDOT)))
     ProfileResultFileDOT(argn>0?argv[0]:NULL,
                          argn>1?argv[1]:NULL,
                          argn>2?atoi(argv[2]):NULL);
@@ -195,7 +196,7 @@ void ProfileResultFileDOT::WriteResults(void)
   if (m_frameName)
   {
     for (unsigned k=0;k<Profile::GetFrameCount();k++)
-      if (!strcmp(Profile::GetFrameName(k),m_frameName))
+      if (strcmp(Profile::GetFrameName(k),m_frameName) == 0)
       {
         frame=k;
         break;
@@ -231,7 +232,7 @@ void ProfileResultFileDOT::WriteResults(void)
       const char *source=id.GetSource();
       FoldHelper *cur=fold;
       for (;cur;cur=cur->next)
-        if (!strcmp(source,cur->source))
+        if (strcmp(source,cur->source) == 0)
         {
           if (cur->numId<MAX_FUNCTIONS_PER_FILE)
             cur->id[cur->numId++]=id;
@@ -254,7 +255,7 @@ void ProfileResultFileDOT::WriteResults(void)
       FoldHelper *cur2=fold;
       for (;cur2;cur2=cur2->next)
         cur2->mark=false;
-      
+
       for (k=0;k<cur->numId;k++)
       {
         ProfileFuncLevel::IdList idlist=id.GetCaller(frame);
@@ -263,7 +264,7 @@ void ProfileResultFileDOT::WriteResults(void)
         {
           const char *s=caller.GetSource();
           for (FoldHelper *cur2=fold;cur2;cur2=cur2->next)
-            if (!strcmp(cur2->source,s))
+            if (strcmp(cur2->source,s) == 0)
               break;
           if (!cur2||cur2->mark)
             continue;
diff --git a/Core/Libraries/Source/profile/profile_result.h b/Core/Libraries/Source/profile/profile_result.h
index afa920bfe6c..64a619ebfd1 100644
--- a/Core/Libraries/Source/profile/profile_result.h
+++ b/Core/Libraries/Source/profile/profile_result.h
@@ -26,17 +26,14 @@
 //
 // Result function interface and result functions
 //////////////////////////////////////////////////////////////////////////////
-#ifdef _MSC_VER
-#  pragma once
-#endif
-#ifndef PROFILE_RESULT_H // Include guard
-#define PROFILE_RESULT_H
+
+#pragma once
 
 /**
   \brief Result function class.
 
-  Factories for instances of this class are registered using 
-  \ref Profile::AddResultFunction. 
+  Factories for instances of this class are registered using
+  \ref Profile::AddResultFunction.
 */
 class ProfileResultInterface
 {
@@ -62,5 +59,3 @@ class ProfileResultInterface
 protected:
   ProfileResultInterface(void) {}
 };
-
-#endif // PROFILE_RESULT_H
diff --git a/Core/Libraries/Source/profile/test1/test1.cpp b/Core/Libraries/Source/profile/test1/test1.cpp
index 7a5fc24750e..db9b5b6c75a 100644
--- a/Core/Libraries/Source/profile/test1/test1.cpp
+++ b/Core/Libraries/Source/profile/test1/test1.cpp
@@ -87,7 +87,7 @@ void main(void)
       calcThis();
 
   recursionShell();
-  
+
   showResults();
 }
 
diff --git a/Core/Tools/Autorun/ARGS.CPP b/Core/Tools/Autorun/ARGS.CPP
deleted file mode 100644
index 897ad933f9b..00000000000
--- a/Core/Tools/Autorun/ARGS.CPP
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-//======================================================================================
-//
-// @@@@@  @@   @  @@@@   @@@@   @@@@  @@   @  @@@@   @@@@  @@@@@    @@@@@   @@@@  @@   @
-// @@   @ @@   @ @@   @ @@   @ @@  	@ @@@  @ @@	  @ @@	@ @@	 @	  @@   @ @@   @  @@ @
-// @@@@@  @@   @ @@	   @@	    @@@@@@ @@ @ @ @@@@   @@@@   @@@@@	  @@@@@  @@@@@@   @@
-// @@   @ @@   @ @@   @ @@   @ @@ 	@ @@  @@ @@	  @ @@	@ @@  @	  @@   @ @@   @   @@
-// @@@@@   @@@@	@@@@   @@@@  @@ 	@ @@   @  @@@@   @@@@  @@   @	  @@@@@  @@   @   @@
-//
-// Copyright (c) 1998, 1999 Westwood Studios -- CONFIDENTIAL
-//
-// ArgC_ArgV.cpp
-//
-//======================================================================================
-
-//-----------------------------------------------------------------------------
-// INCLUDES
-//-----------------------------------------------------------------------------
-#define  STRICT
-#include <windows.h>
-#include <windowsx.h>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "ARGS.H"
-
-//-----------------------------------------------------------------------------
-// GLOBALS
-//-----------------------------------------------------------------------------
-
-Command_Line_Arguments *Args = NULL;
-
-//*****************************************************************************
-// COMMAND_LINE_ARGUMENTS::COMMAND_LINE_ARGUMENTS -- Constructor.															
-//                                                                         
-// INPUT:     	HINSTANCE hInstance													
-//		  		LPSTR lpszCmdLine														
-//                                                                         
-// OUTPUT:    	none.                                                    	
-//                                                                         
-// WARNINGS:  	none.                                                    
-//                                                                         
-// HISTORY:                                                       
-//   09/01/1997  ML/MG : Created.                                            
-//=============================================================================
-
-Command_Line_Arguments::Command_Line_Arguments ( 
-	HINSTANCE current_instance_handle,
-	LPTSTR windows_command_line_string )
-{
-	//--------------------------------------------------------------------------
-	// debug checks...
-	//--------------------------------------------------------------------------
-	assert( windows_command_line_string != NULL );
-
-	//--------------------------------------------------------------------------
-	// reset all class data 
-	//--------------------------------------------------------------------------
-	memset( ArgV, 0, sizeof( ArgV ) );
-
-	//--------------------------------------------------------------------------
-	// Store the program name in ArgV[ 0 ].
-	//--------------------------------------------------------------------------
-	GetModuleFileName( current_instance_handle, ArgV[ 0 ], MAX_ARGUMENT_LENGTH	);
-
-	const char * ptr = windows_command_line_string;
-	bool potentially_forever = true;
-
-	ArgC = 1;
-
-	while( potentially_forever ) {
-
-		//-----------------------------------------------------------------------
-		// Find the next non-whitespace character in the string.
-		//-----------------------------------------------------------------------
-		while ( *ptr == ' ' ) {
-			++ ptr;
-		}
-
-		//-----------------------------------------------------------------------
-		// If we're at the end of the string, quit.
-		//-----------------------------------------------------------------------
-		if ( *ptr == '\0' ) {
-			break;
-		}
-
-		//-----------------------------------------------------------------------
-		// Store a command-line argument.
-		//-----------------------------------------------------------------------
-		int i = 0;
-
-		if ( *ptr == '"' ) {
-
-			//--------------------------------------------------------------------
-			// Skip the opening quotation mark.
-			//--------------------------------------------------------------------
-			++ ptr;
-
-			//--------------------------------------------------------------------
-			// Collect characters until another quotation mark is encountered.
-			//--------------------------------------------------------------------
-			while ( *ptr != '\0' && *ptr != '"' ) {
-				if ( i < MAX_ARGUMENT_LENGTH - 1 ) {
-					ArgV [ ArgC ][ i ] = *ptr;
-					++ i;
-				}
-				++ ptr;
-			}
-
-			//--------------------------------------------------------------------
-			// Skip the closing quotation mark.
-			//--------------------------------------------------------------------
-			if ( *ptr == '"' ) {
-				++ ptr;
-			}
-
-		} else {
-
-			//--------------------------------------------------------------------
-			// Collect characters until a whitespace character is encountered.
-			//--------------------------------------------------------------------
-			while ( *ptr != '\0' && *ptr != ' ' ) {
-				if ( i < MAX_ARGUMENT_LENGTH - 1 ) {
-					ArgV [ ArgC ][ i ] = *ptr;
-					++ i;
-				}
-				++ ptr;
-			}
-		}
-
-		ArgV [ ArgC ][ i ] = '\0';
-		++ ArgC;
-	}
-}
-
-//*****************************************************************************
-// COMMAND_LINE_ARGUMENTS::COMMAND_LINE_ARGUMENTS -- Constructor.															
-//                                                                         
-// INPUT:     	HINSTANCE hInstance													
-//                                                                         
-// OUTPUT:    	none.                                                    	
-//                                                                         
-// WARNINGS:  	none.                                                    
-//                                                                         
-// HISTORY:                                                       
-//   09/01/1997  ML/MG : Created.                                            
-//=============================================================================
-
-Command_Line_Arguments::Command_Line_Arguments ( HINSTANCE current_instance_handle )
-{
-
-	char * windows_command_line_string = GetCommandLine();
-
-	//--------------------------------------------------------------------------
-	// debug checks...
-	//--------------------------------------------------------------------------
-	assert( windows_command_line_string != NULL );
-
-	//--------------------------------------------------------------------------
-	// reset all class data 
-	//--------------------------------------------------------------------------
-	memset( ArgV, 0, sizeof( ArgV ) );
-
-	const char * ptr = windows_command_line_string;
-	bool potentially_forever = true;
-
-	ArgC = 1;
-
-	while( potentially_forever ) {
-
-		//-----------------------------------------------------------------------
-		// Find the next non-whitespace character in the string.
-		//-----------------------------------------------------------------------
-		while ( *ptr == ' ' ) {
-			++ ptr;
-		}
-
-		//-----------------------------------------------------------------------
-		// If we're at the end of the string, quit.
-		//-----------------------------------------------------------------------
-		if ( *ptr == '\0' ) {
-			break;
-		}
-
-		//-----------------------------------------------------------------------
-		// Store a command-line argument.
-		//-----------------------------------------------------------------------
-		int i = 0;
-
-		if ( *ptr == '"' ) {
-
-			//--------------------------------------------------------------------
-			// Skip the opening quotation mark.
-			//--------------------------------------------------------------------
-			++ ptr;
-
-			//--------------------------------------------------------------------
-			// Collect characters until another quotation mark is encountered.
-			//--------------------------------------------------------------------
-			while ( *ptr != '\0' && *ptr != '"' ) {
-				if ( i < MAX_ARGUMENT_LENGTH - 1 ) {
-					ArgV [ ArgC ][ i ] = *ptr;
-					++ i;
-				}
-				++ ptr;
-			}
-
-			//--------------------------------------------------------------------
-			// Skip the closing quotation mark.
-			//--------------------------------------------------------------------
-			if ( *ptr == '"' ) {
-				++ ptr;
-			}
-
-		} else {
-
-			//--------------------------------------------------------------------
-			// Collect characters until a whitespace character is encountered.
-			//--------------------------------------------------------------------
-			while ( *ptr != '\0' && *ptr != ' ' ) {
-				if ( i < MAX_ARGUMENT_LENGTH - 1 ) {
-					ArgV [ ArgC ][ i ] = *ptr;
-					++ i;
-				}
-				++ ptr;
-			}
-		}
-
-		ArgV [ ArgC ][ i ] = '\0';
-		++ ArgC;
-	}
-}
-
-//*****************************************************************************
-// COMMAND_LINE_ARGUMENTS::~COMMAND_LINE_ARGUMENTS -- Destructor.
-//                                                                         
-// INPUT:     	HINSTANCE hInstance													
-//			  		LPSTR lpszCmdLine														
-//                                                                         
-// OUTPUT:    	none.                                                    	
-//                                                                         
-// WARNINGS:  	none.                                                    
-//                                                                         
-// HISTORY:                                                       
-//   09/01/1997  ML/MG : Created.                                            
-//=============================================================================
-
-Command_Line_Arguments::~Command_Line_Arguments ( void )
-{
-	//--------------------------------------------------------------------------
-	// reset all data...
-	//--------------------------------------------------------------------------
-	ArgC = -1;
-	memset( ArgV, 0, sizeof( ArgV ) );
-}
-
-//*****************************************************************************
-// COMMAND_LINE_ARGUMENTS::GET_ARGC --	Return ArgC.															
-//                                                                         
-// INPUT:     	none.													
-//                                                                         
-// OUTPUT:    	int ArgC.                                                    	
-//                                                                         
-// WARNINGS:  	none.                                                    
-//                                                                         
-// HISTORY:                                                       
-//   09/01/1997  ML/MG : Created.                                            
-//=============================================================================
-
-int Command_Line_Arguments::Get_argc ( void )
-{
-	//--------------------------------------------------------------------------
-	// debug checks - make sure we at least have the application name
-	//--------------------------------------------------------------------------
-	assert( ArgC >= 1 );
-
-	//--------------------------------------------------------------------------
-	// return how many string parameters there are in the "argv" list
-	//--------------------------------------------------------------------------
-	return( ArgC );
-}
-
-//*****************************************************************************
-// COMMAND_LINE_ARGUMENTS::GET_ARGV --	Return ArgV.
-//                                                                         
-// INPUT:     	none.													
-//                                                                         
-// OUTPUT:    	int ArgV.
-//                                                                         
-// WARNINGS:  	none.                                                    
-//                                                                         
-// HISTORY:                                                       
-//   09/01/1997  ML/MG : Created.                                            
-//=============================================================================
-
-const char *Command_Line_Arguments::Get_argv ( int argument_index )
-{
-	//--------------------------------------------------------------------------
-	// debug checks - make sure we at least have the application name
-	//--------------------------------------------------------------------------
-	assert( argument_index >= 0 );
-	assert( argument_index < MAX_COMMAND_LINE_ARGUMENTS );
-	assert( argument_index < ArgC );
-	assert( ArgC >= 1 );
-
-	//--------------------------------------------------------------------------
-	// return
-	//--------------------------------------------------------------------------
-	return( ArgV[ argument_index ] );
-}
-
-void Command_Line_Arguments::Set_argv( int argument_index, char *arg )
-{
-	if( arg == NULL || *arg == '\0' ) {
-		return;
-	}
-
-	//--------------------------------------------------------------------------
-	// debug checks - make sure we at least have the application name
-	//--------------------------------------------------------------------------
-	assert( argument_index >= 0 );
-	assert( argument_index < MAX_COMMAND_LINE_ARGUMENTS );
-	assert( argument_index < ArgC );
-	assert( ArgC >= 1 );
-
-	if (( argument_index >= 0 ) && 
-		( argument_index < MAX_COMMAND_LINE_ARGUMENTS ) &&
-		( argument_index < ArgC )) {
-
-		strcpy( ArgV[ argument_index ], arg );
-	}
-}
-
-
diff --git a/Core/Tools/Autorun/ARGS.H b/Core/Tools/Autorun/ARGS.H
deleted file mode 100644
index 69d46b0a79c..00000000000
--- a/Core/Tools/Autorun/ARGS.H
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-//================================================================================================
-//
-// @@@@@  @@   @  @@@@   @@@@   @@@@  @@   @  @@@@   @@@@  @@@@@    @@@@@   @@@@  @@   @
-// @@   @ @@   @ @@   @ @@   @ @@  	@ @@@  @ @@	  @ @@	@ @@	 @	  @@   @ @@   @  @@ @
-// @@@@@  @@   @ @@	   @@	    @@@@@@ @@ @ @ @@@@   @@@@   @@@@@	  @@@@@  @@@@@@   @@
-// @@   @ @@   @ @@   @ @@   @ @@ 	@ @@  @@ @@	  @ @@	@ @@  @	  @@   @ @@   @   @@
-// @@@@@   @@@@	@@@@   @@@@  @@ 	@ @@   @  @@@@   @@@@  @@   @	  @@@@@  @@   @   @@
-//
-// Copyright (c) 1998, 1999 Westwood Studios -- CONFIDENTIAL
-//
-// ArgC_ArgV.h
-//
-//================================================================================================
-
-#ifndef ARGS_H
-#define ARGS_H
-
-//----------------------------------------------------------------------------
-// INCLUDES
-//----------------------------------------------------------------------------
-#include <windows.h>
-//#include "autorun.h"
-
-//----------------------------------------------------------------------------
-// DEFINES
-//----------------------------------------------------------------------------
-#define MAX_COMMAND_LINE_ARGUMENTS	10
-#define MAX_ARGUMENT_LENGTH			80
-
-//----------------------------------------------------------------------------
-// CLASS
-//----------------------------------------------------------------------------
-class Command_Line_Arguments
-{
-	public:
-		Command_Line_Arguments ( HINSTANCE, LPTSTR );
-		Command_Line_Arguments ( LPTSTR )    {};
-		Command_Line_Arguments ( HINSTANCE );
-		~Command_Line_Arguments( void );
-
-		const char *	Get_argv( int argument_index );
-		int		 		Get_argc();
-		void			Set_argv( int argument_index, char*arg );
-
-	private:
-		int		ArgC;
-		char	ArgV[ MAX_COMMAND_LINE_ARGUMENTS ][ MAX_ARGUMENT_LENGTH ];
-};
-
-extern Command_Line_Arguments *Args;
-
-#endif // ARGC_ARGV_H
\ No newline at end of file
diff --git a/Core/Tools/Autorun/ARGS.cpp b/Core/Tools/Autorun/ARGS.cpp
new file mode 100644
index 00000000000..ce3ec5c4ee9
--- /dev/null
+++ b/Core/Tools/Autorun/ARGS.cpp
@@ -0,0 +1,352 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+//======================================================================================
+//
+// @@@@@  @@   @  @@@@   @@@@   @@@@  @@   @  @@@@   @@@@  @@@@@    @@@@@   @@@@  @@   @
+// @@   @ @@   @ @@   @ @@   @ @@  	@ @@@  @ @@	  @ @@	@ @@	 @	  @@   @ @@   @  @@ @
+// @@@@@  @@   @ @@	   @@	    @@@@@@ @@ @ @ @@@@   @@@@   @@@@@	  @@@@@  @@@@@@   @@
+// @@   @ @@   @ @@   @ @@   @ @@ 	@ @@  @@ @@	  @ @@	@ @@  @	  @@   @ @@   @   @@
+// @@@@@   @@@@	@@@@   @@@@  @@ 	@ @@   @  @@@@   @@@@  @@   @	  @@@@@  @@   @   @@
+//
+// Copyright (c) 1998, 1999 Westwood Studios -- CONFIDENTIAL
+//
+// ArgC_ArgV.cpp
+//
+//======================================================================================
+
+//-----------------------------------------------------------------------------
+// INCLUDES
+//-----------------------------------------------------------------------------
+#define  STRICT
+#include <windows.h>
+#include <windowsx.h>
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "ARGS.h"
+
+//-----------------------------------------------------------------------------
+// GLOBALS
+//-----------------------------------------------------------------------------
+
+Command_Line_Arguments *Args = NULL;
+
+//*****************************************************************************
+// COMMAND_LINE_ARGUMENTS::COMMAND_LINE_ARGUMENTS -- Constructor.
+//
+// INPUT:     	HINSTANCE hInstance
+//		  		LPSTR lpszCmdLine
+//
+// OUTPUT:    	none.
+//
+// WARNINGS:  	none.
+//
+// HISTORY:
+//   09/01/1997  ML/MG : Created.
+//=============================================================================
+
+Command_Line_Arguments::Command_Line_Arguments (
+	HINSTANCE current_instance_handle,
+	LPTSTR windows_command_line_string )
+{
+	//--------------------------------------------------------------------------
+	// debug checks...
+	//--------------------------------------------------------------------------
+	assert( windows_command_line_string != NULL );
+
+	//--------------------------------------------------------------------------
+	// reset all class data
+	//--------------------------------------------------------------------------
+	memset( ArgV, 0, sizeof( ArgV ) );
+
+	//--------------------------------------------------------------------------
+	// Store the program name in ArgV[ 0 ].
+	//--------------------------------------------------------------------------
+	GetModuleFileName( current_instance_handle, ArgV[ 0 ], MAX_ARGUMENT_LENGTH	);
+
+	const char * ptr = windows_command_line_string;
+	bool potentially_forever = true;
+
+	ArgC = 1;
+
+	while( potentially_forever ) {
+
+		//-----------------------------------------------------------------------
+		// Find the next non-whitespace character in the string.
+		//-----------------------------------------------------------------------
+		while ( *ptr == ' ' ) {
+			++ ptr;
+		}
+
+		//-----------------------------------------------------------------------
+		// If we're at the end of the string, quit.
+		//-----------------------------------------------------------------------
+		if ( *ptr == '\0' ) {
+			break;
+		}
+
+		//-----------------------------------------------------------------------
+		// Store a command-line argument.
+		//-----------------------------------------------------------------------
+		int i = 0;
+
+		if ( *ptr == '"' ) {
+
+			//--------------------------------------------------------------------
+			// Skip the opening quotation mark.
+			//--------------------------------------------------------------------
+			++ ptr;
+
+			//--------------------------------------------------------------------
+			// Collect characters until another quotation mark is encountered.
+			//--------------------------------------------------------------------
+			while ( *ptr != '\0' && *ptr != '"' ) {
+				if ( i < MAX_ARGUMENT_LENGTH - 1 ) {
+					ArgV [ ArgC ][ i ] = *ptr;
+					++ i;
+				}
+				++ ptr;
+			}
+
+			//--------------------------------------------------------------------
+			// Skip the closing quotation mark.
+			//--------------------------------------------------------------------
+			if ( *ptr == '"' ) {
+				++ ptr;
+			}
+
+		} else {
+
+			//--------------------------------------------------------------------
+			// Collect characters until a whitespace character is encountered.
+			//--------------------------------------------------------------------
+			while ( *ptr != '\0' && *ptr != ' ' ) {
+				if ( i < MAX_ARGUMENT_LENGTH - 1 ) {
+					ArgV [ ArgC ][ i ] = *ptr;
+					++ i;
+				}
+				++ ptr;
+			}
+		}
+
+		ArgV [ ArgC ][ i ] = '\0';
+		++ ArgC;
+	}
+}
+
+//*****************************************************************************
+// COMMAND_LINE_ARGUMENTS::COMMAND_LINE_ARGUMENTS -- Constructor.
+//
+// INPUT:     	HINSTANCE hInstance
+//
+// OUTPUT:    	none.
+//
+// WARNINGS:  	none.
+//
+// HISTORY:
+//   09/01/1997  ML/MG : Created.
+//=============================================================================
+
+Command_Line_Arguments::Command_Line_Arguments ( HINSTANCE current_instance_handle )
+{
+
+	char * windows_command_line_string = GetCommandLine();
+
+	//--------------------------------------------------------------------------
+	// debug checks...
+	//--------------------------------------------------------------------------
+	assert( windows_command_line_string != NULL );
+
+	//--------------------------------------------------------------------------
+	// reset all class data
+	//--------------------------------------------------------------------------
+	memset( ArgV, 0, sizeof( ArgV ) );
+
+	const char * ptr = windows_command_line_string;
+	bool potentially_forever = true;
+
+	ArgC = 1;
+
+	while( potentially_forever ) {
+
+		//-----------------------------------------------------------------------
+		// Find the next non-whitespace character in the string.
+		//-----------------------------------------------------------------------
+		while ( *ptr == ' ' ) {
+			++ ptr;
+		}
+
+		//-----------------------------------------------------------------------
+		// If we're at the end of the string, quit.
+		//-----------------------------------------------------------------------
+		if ( *ptr == '\0' ) {
+			break;
+		}
+
+		//-----------------------------------------------------------------------
+		// Store a command-line argument.
+		//-----------------------------------------------------------------------
+		int i = 0;
+
+		if ( *ptr == '"' ) {
+
+			//--------------------------------------------------------------------
+			// Skip the opening quotation mark.
+			//--------------------------------------------------------------------
+			++ ptr;
+
+			//--------------------------------------------------------------------
+			// Collect characters until another quotation mark is encountered.
+			//--------------------------------------------------------------------
+			while ( *ptr != '\0' && *ptr != '"' ) {
+				if ( i < MAX_ARGUMENT_LENGTH - 1 ) {
+					ArgV [ ArgC ][ i ] = *ptr;
+					++ i;
+				}
+				++ ptr;
+			}
+
+			//--------------------------------------------------------------------
+			// Skip the closing quotation mark.
+			//--------------------------------------------------------------------
+			if ( *ptr == '"' ) {
+				++ ptr;
+			}
+
+		} else {
+
+			//--------------------------------------------------------------------
+			// Collect characters until a whitespace character is encountered.
+			//--------------------------------------------------------------------
+			while ( *ptr != '\0' && *ptr != ' ' ) {
+				if ( i < MAX_ARGUMENT_LENGTH - 1 ) {
+					ArgV [ ArgC ][ i ] = *ptr;
+					++ i;
+				}
+				++ ptr;
+			}
+		}
+
+		ArgV [ ArgC ][ i ] = '\0';
+		++ ArgC;
+	}
+}
+
+//*****************************************************************************
+// COMMAND_LINE_ARGUMENTS::~COMMAND_LINE_ARGUMENTS -- Destructor.
+//
+// INPUT:     	HINSTANCE hInstance
+//			  		LPSTR lpszCmdLine
+//
+// OUTPUT:    	none.
+//
+// WARNINGS:  	none.
+//
+// HISTORY:
+//   09/01/1997  ML/MG : Created.
+//=============================================================================
+
+Command_Line_Arguments::~Command_Line_Arguments ( void )
+{
+	//--------------------------------------------------------------------------
+	// reset all data...
+	//--------------------------------------------------------------------------
+	ArgC = -1;
+	memset( ArgV, 0, sizeof( ArgV ) );
+}
+
+//*****************************************************************************
+// COMMAND_LINE_ARGUMENTS::GET_ARGC --	Return ArgC.
+//
+// INPUT:     	none.
+//
+// OUTPUT:    	int ArgC.
+//
+// WARNINGS:  	none.
+//
+// HISTORY:
+//   09/01/1997  ML/MG : Created.
+//=============================================================================
+
+int Command_Line_Arguments::Get_argc ( void )
+{
+	//--------------------------------------------------------------------------
+	// debug checks - make sure we at least have the application name
+	//--------------------------------------------------------------------------
+	assert( ArgC >= 1 );
+
+	//--------------------------------------------------------------------------
+	// return how many string parameters there are in the "argv" list
+	//--------------------------------------------------------------------------
+	return( ArgC );
+}
+
+//*****************************************************************************
+// COMMAND_LINE_ARGUMENTS::GET_ARGV --	Return ArgV.
+//
+// INPUT:     	none.
+//
+// OUTPUT:    	int ArgV.
+//
+// WARNINGS:  	none.
+//
+// HISTORY:
+//   09/01/1997  ML/MG : Created.
+//=============================================================================
+
+const char *Command_Line_Arguments::Get_argv ( int argument_index )
+{
+	//--------------------------------------------------------------------------
+	// debug checks - make sure we at least have the application name
+	//--------------------------------------------------------------------------
+	assert( argument_index >= 0 );
+	assert( argument_index < MAX_COMMAND_LINE_ARGUMENTS );
+	assert( argument_index < ArgC );
+	assert( ArgC >= 1 );
+
+	//--------------------------------------------------------------------------
+	// return
+	//--------------------------------------------------------------------------
+	return( ArgV[ argument_index ] );
+}
+
+void Command_Line_Arguments::Set_argv( int argument_index, char *arg )
+{
+	if( arg == NULL || *arg == '\0' ) {
+		return;
+	}
+
+	//--------------------------------------------------------------------------
+	// debug checks - make sure we at least have the application name
+	//--------------------------------------------------------------------------
+	assert( argument_index >= 0 );
+	assert( argument_index < MAX_COMMAND_LINE_ARGUMENTS );
+	assert( argument_index < ArgC );
+	assert( ArgC >= 1 );
+
+	if (( argument_index >= 0 ) &&
+		( argument_index < MAX_COMMAND_LINE_ARGUMENTS ) &&
+		( argument_index < ArgC )) {
+
+		strcpy( ArgV[ argument_index ], arg );
+	}
+}
+
+
diff --git a/Core/Tools/Autorun/ARGS.h b/Core/Tools/Autorun/ARGS.h
new file mode 100644
index 00000000000..fad81dea364
--- /dev/null
+++ b/Core/Tools/Autorun/ARGS.h
@@ -0,0 +1,67 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+//================================================================================================
+//
+// @@@@@  @@   @  @@@@   @@@@   @@@@  @@   @  @@@@   @@@@  @@@@@    @@@@@   @@@@  @@   @
+// @@   @ @@   @ @@   @ @@   @ @@  	@ @@@  @ @@	  @ @@	@ @@	 @	  @@   @ @@   @  @@ @
+// @@@@@  @@   @ @@	   @@	    @@@@@@ @@ @ @ @@@@   @@@@   @@@@@	  @@@@@  @@@@@@   @@
+// @@   @ @@   @ @@   @ @@   @ @@ 	@ @@  @@ @@	  @ @@	@ @@  @	  @@   @ @@   @   @@
+// @@@@@   @@@@	@@@@   @@@@  @@ 	@ @@   @  @@@@   @@@@  @@   @	  @@@@@  @@   @   @@
+//
+// Copyright (c) 1998, 1999 Westwood Studios -- CONFIDENTIAL
+//
+// ArgC_ArgV.h
+//
+//================================================================================================
+
+#pragma once
+
+//----------------------------------------------------------------------------
+// INCLUDES
+//----------------------------------------------------------------------------
+#include <windows.h>
+//#include "autorun.h"
+
+//----------------------------------------------------------------------------
+// DEFINES
+//----------------------------------------------------------------------------
+#define MAX_COMMAND_LINE_ARGUMENTS	10
+#define MAX_ARGUMENT_LENGTH			80
+
+//----------------------------------------------------------------------------
+// CLASS
+//----------------------------------------------------------------------------
+class Command_Line_Arguments
+{
+	public:
+		Command_Line_Arguments ( HINSTANCE, LPTSTR );
+		Command_Line_Arguments ( LPTSTR )    {};
+		Command_Line_Arguments ( HINSTANCE );
+		~Command_Line_Arguments( void );
+
+		const char *	Get_argv( int argument_index );
+		int		 		Get_argc();
+		void			Set_argv( int argument_index, char*arg );
+
+	private:
+		int		ArgC;
+		char	ArgV[ MAX_COMMAND_LINE_ARGUMENTS ][ MAX_ARGUMENT_LENGTH ];
+};
+
+extern Command_Line_Arguments *Args;
diff --git a/Core/Tools/Autorun/CDCNTRL.CPP b/Core/Tools/Autorun/CDCNTRL.CPP
deleted file mode 100644
index 3124c2ffce2..00000000000
--- a/Core/Tools/Autorun/CDCNTRL.CPP
+++ /dev/null
@@ -1,1116 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /Renegade Setup/Autorun/CDCNTRL.CPP                         $*
- *                                                                                             *
- *                      $Author:: Maria_l                                                     $*
- *                                                                                             *
- *                     $Modtime:: 10/18/01 5:33p                                              $*
- *                                                                                             *
- *                    $Revision:: 5                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *                                                                                             *
- *  CDControlClass::Auto_Eject_Volume -- Eject the removable media                             *
- *  CDControlClass::Auto_Eject_Volume_95 -- Eject the specified CD drive                       *
- *  CDControlClass::CDControlClass -- Class constructor                                        *
- *  CDControlClass::Close_Removable_Volume -- Close the handle to a removable volume           *
- *  CDControlClass::Close_VWin32 -- Closes the handle opened by Open_VWin32.                   *
- *  CDControlClass::Dismount_Volume -- Dismount the given volume                               *
- *  CDControlClass::Eject_CD -- Force the CD drive to eject                                    *
- *  CDControlClass::Eject_CD_Win95 -- Eject the cd in the given drive                          *
- *  CDControlClass::Force_CD_Eject -- Ppen the CD tray on the given drive                      *
- *  CDControlClass::Lock_CD_Drive -- Lock the CD tray and prevent ejection                     *
- *  CDControlClass::Lock_CD_Drive_95 -- Prevent the user from ejecting the cd in the given driv*
- *  CDControlClass::Lock_CD_Tray -- Prevent CD ejection on the specified drive                 *
- *  CDControlClass::Lock_Logical_Volume -- Take a lock on a logical volume                     *
- *  CDControlClass::Lock_Volume -- Prevent access by other threads to a given volume           *
- *  CDControlClass::Lock_Volume_95 -- Locks removable media so that it can't be ejected        *
- *  CDControlClass::Open_Removable_Volume -- Fetch a handle to a removable drive               *
- *  CDControlClass::Open_VWin32 -- Opens a handle to VWIN32 to issue low-level disk I/O        *
- *  CDControlClass::Prevent_Removal_Of_Volume -- Disable the eject button on the given drive   *
- *  CDControlClass::Unlock_CD_Drive -- Unlock the CD tray and allow ejection                   *
- *  CDControlClass::Unlock_CD_Drive_95 -- Allow the user to eject the cd in the given drive    *
- *  CDControlClass::Unlock_CD_Tray -- Allow CD ejection on the specified drive                 *
- *  CDControlClass::Unlock_Logical_Volume -- Unlocks a logical volume                          *
- *  CDControlClass::Unlock_Volume -- Allow access by other threads to a given volume           *
- *  CDControlClass::Unlock_Volume_95 -- Unlocks removable media so that it can be ejected      *
- *  CDControlClass::~CDControlClass -- Class destructor                                        *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include	"assert.h"
-#include	"CDCNTRL.H"
-#include	"WinFix.H"
-#include	"Wnd_File.h"
-#pragma	warning(disable : 4201)
-#include	<winioctl.h>
-#include	<tchar.h>
-#include	<stdio.h>
-
-
-CDControlClass CDControl;
-
-
-void Last_Error_Text ( LPCTSTR szPrefix, HRESULT hr );
-
-
-/***********************************************************************************************
- * CDControlClass::CDControlClass -- Class constructor                                         *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 2:03AM ST : Created                                                               *
- *=============================================================================================*/
-CDControlClass::CDControlClass(void)
-{
-}
-
-
-/***********************************************************************************************
- * CDControlClass::~CDControlClass -- Class destructor                                         *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 2:03AM ST : Created                                                               *
- *=============================================================================================*/
-CDControlClass::~CDControlClass(void)
-{
-}
-
-/***********************************************************************************************
- * CDControlClass::Force_CD_Eject -- Ppen the CD tray on the given drive                       *
- *                                                                                             *
- * INPUT:    Drive number (0=a, 1=b etc)                                                       *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 1:17AM ST : Created                                                               *
- *=============================================================================================*/
-void CDControlClass::Force_CD_Eject(int drive)
-{
-	if ( WinVersion.Is_Win9x() ) {
-		Eject_CD_Win95(drive);
-	}else{
-		Eject_CD(drive);
-	}
-}
-
-/***********************************************************************************************
- * CDControlClass::Lock_CD_Tray -- Prevent CD ejection on the specified drive                  *
- *                                                                                             *
- * INPUT:    drive number (0=a: etc)                                                           *
- *                                                                                             *
- * OUTPUT:   true if locked                                                                    *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *               2/17/99 1:56AM ST : Created                                                   *
- *=============================================================================================*/
-bool CDControlClass::Lock_CD_Tray (int drive)
-{
-	if ( WinVersion.Is_Win9x() ) {
-		return (Lock_CD_Drive_95(drive));
-	}else{
-		return (Lock_CD_Drive(drive));
-	}
-}
-
-/***********************************************************************************************
- * CDControlClass::Unlock_CD_Tray -- Allow CD ejection on the specified drive                  *
- *                                                                                             *
- * INPUT:    drive number (0=a: etc)                                                           *
- *                                                                                             *
- * OUTPUT:   true if unlocked OK                                                               *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *         2/17/99 1:57AM ST : Created                                                         *
- *=============================================================================================*/
-bool CDControlClass::Unlock_CD_Tray (int drive)
-{
-	if ( WinVersion.Is_Win9x() ) {
-		return (Unlock_CD_Drive_95(drive));
-	}else{
-		return (Unlock_CD_Drive(drive));
-	}
-}
-
-/***********************************************************************************************
- * CDControlClass::Open_Removable_Volume -- Fetch a handle to a removable drive                *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/16/99 11:25PM ST : Created                                                              *
- *=============================================================================================*/
-HANDLE CDControlClass::Open_Removable_Volume( char drive )
-{
-	assert (WinVersion.Is_WinNT());
-
-	HANDLE		volume;
-	unsigned	drivetype;
-	char		volume_name[8];
-	char		rootname[5];
-	unsigned long	access_flags;
-
-	/*----------------------------------------------------------------------------------------
-	** Get the drive type to ensure that this is a removable volume.
-	*/
-	_stprintf (rootname, _TEXT( "%c:\\" ), drive + 'A');
-	drivetype = GetDriveType( rootname );
-
-	switch( drivetype ) {
-
-		case DRIVE_REMOVABLE:
-			access_flags = GENERIC_READ | GENERIC_WRITE;
-			break;
-
-		case DRIVE_CDROM:
-			access_flags = GENERIC_READ;
-			break;
-
-		default:
-//			DebugString ("Attempt to open non-removable volume for locking or ejection\n");
-			Msg( __LINE__, TEXT(__FILE__), TEXT("Attempt to open non-removable volume for locking or ejection" ));
-			return( INVALID_HANDLE_VALUE );
-	}
-
-	/*----------------------------------------------------------------------------------------
-	** Get a handle to the volume.
-	*/
-	_stprintf( volume_name, _TEXT( "\\\\.\\%c:" ), drive + 'A' );
-	volume = CreateFile( volume_name, access_flags, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL );
-
-//	assert (volume != INVALID_HANDLE_VALUE);
-
-	if ( volume == INVALID_HANDLE_VALUE ) {
-//		DebugString ("Unable to open drive %c: for ejection\n", drive + 'A');
-		Msg( __LINE__, TEXT(__FILE__), TEXT("Unable to open drive %c: for ejection"), drive + 'A' - 1 );
-	}
-	return( volume );
-}
-
-/***********************************************************************************************
- * CDControlClass::Close_Removable_Volume -- Close the handle to a removable volume             *
- *                                                                                             *
- * INPUT:    HANDLE of volume to close                                                         *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/16/99 11:27PM ST : Created                                                              *
- *=============================================================================================*/
-bool CDControlClass::Close_Removable_Volume(HANDLE volume)
-{
-	assert (WinVersion.Is_WinNT());
-	return ((CloseHandle(volume)) ? true : false);
-}
-
-/***********************************************************************************************
- * CDControlClass::Lock_Volume -- Prevent access by other threads to a given volume            *
- *                                                                                             *
- * INPUT:    HANDLE to volume                                                                  *
- *                                                                                             *
- * OUTPUT:   true if locked                                                                    *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/16/99 11:29PM ST : Created                                                              *
- *=============================================================================================*/
-bool CDControlClass::Lock_Volume( HANDLE volume )
-{
-	assert( WinVersion.Is_WinNT( ));
-
-	unsigned long bytes_returned	= 0;
-	unsigned long sleep_amount		= LOCK_TIMEOUT / LOCK_RETRIES;
-
-	/*
-	** Do this in a loop until a timeout period has expired
-	*/
-	for ( int trycount = 0; trycount < LOCK_RETRIES; trycount++ ) {
-
-		if ( DeviceIoControl( volume, FSCTL_LOCK_VOLUME, NULL, 0, NULL, 0, &bytes_returned, NULL )) {
-			return( true );
-		}
-//		Msg( __LINE__, TEXT(__FILE__), TEXT("DeviceIoControl failed to lock volume. Error %d - %s"), GetLastError(), Last_Error_Text());
-		Last_Error_Text( _TEXT( "DeviceIoControl failed to lock volume." ), GetLastError());
-//		Sleep( sleep_amount );
-		Sleep( LOCK_TIMEOUT );
-	}
-	return( false );
-}
-
-/***********************************************************************************************
- * CDControlClass::Unlock_Volume -- Allow access by other threads to a given volume            *
- *                                                                                             *
- * INPUT:    HANDLE to volume                                                                  *
- *                                                                                             *
- * OUTPUT:   true if unlocked                                                                  *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/16/99 11:29PM ST : Created                                                              *
- *=============================================================================================*/
-bool CDControlClass::Unlock_Volume(HANDLE volume)
-{
-	assert( WinVersion.Is_WinNT());
-
-	unsigned long bytes_returned;
-	unsigned long sleep_amount	= LOCK_TIMEOUT / LOCK_RETRIES;
-
-	/*
-	** Do this in a loop until a timeout period has expired
-	*/
-   for ( int trycount = 0; trycount < LOCK_RETRIES; trycount++ ) {
-
-		if ( DeviceIoControl( volume, FSCTL_UNLOCK_VOLUME, NULL, 0, NULL, 0, &bytes_returned, NULL )) return( true );
-//		DebugString ("DeviceIoControl failed to unlock volume. Error %d - %s\n", GetLastError(), Last_Error_Text());
-//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to unlock volume. Error %d - %s", GetLastError(), Last_Error_Text());
-		Last_Error_Text( _TEXT( "DeviceIoControl failed to unlock volume." ), GetLastError());
-//		Sleep( sleep_amount );
-		Sleep( LOCK_TIMEOUT );
-	}
-	return( false );
-}
-
-/***********************************************************************************************
- * CDControlClass::Dismount_Volume -- Dismount the given volume                                *
- *                                                                                             *
- * INPUT:    HANDLE of volume to dismount                                                      *
- *                                                                                             *
- * OUTPUT:   true if volume dismounted OK                                                      *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/16/99 11:31PM ST : Created                                                              *
- *=============================================================================================*/
-bool CDControlClass::Dismount_Volume(HANDLE volume)
-{
-	assert( WinVersion.Is_WinNT());
-
-	unsigned long bytes_returned;
-	bool result = ((DeviceIoControl( volume, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, 0, &bytes_returned, NULL)) ? true : false );
-
-	if (result == false) {
-//		DebugString ("DeviceIoControl failed to dismount volume. Error %d - %s\n", GetLastError(), Last_Error_Text());
-//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to dismount volume. Error %d - %s", GetLastError(), Last_Error_Text());
-		Last_Error_Text( _TEXT( "DeviceIoControl failed to dismount volume." ), GetLastError());
-	}
-	return( result );
-}
-
-/***********************************************************************************************
- * CDControlClass::Prevent_Removal_Of_Volume -- Disable the eject button on the given drive    *
- *                                                                                             *
- * INPUT:    HANDLE of volume to enable/disable                                                *
- *           true to prevent removal. false to allow it.                                       *
- *                                                                                             *
- * OUTPUT:   true if status changed OK                                                         *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/16/99 11:32PM ST : Created                                                              *
- *=============================================================================================*/
-bool CDControlClass::Prevent_Removal_Of_Volume( HANDLE volume, bool prevent )
-{
-	assert( WinVersion.Is_WinNT());
-
-	unsigned long bytes_returned;
-	PREVENT_MEDIA_REMOVAL pmrbuffer;
-		
-	pmrbuffer.PreventMediaRemoval = prevent;
-
-	bool result = ((DeviceIoControl( volume, IOCTL_STORAGE_MEDIA_REMOVAL, &pmrbuffer, sizeof(PREVENT_MEDIA_REMOVAL), NULL, 0, &bytes_returned, NULL)) ? true : false);
-
-	if (result == false) {
-//		DebugString ("DeviceIoControl failed to prevent media removal. Error %d - %s\n", GetLastError(), Last_Error_Text());
-//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to prevent media removal. Error %d - %s", GetLastError(), Last_Error_Text());
-		Last_Error_Text( _TEXT( "DeviceIoControl failed to prevent media removal." ), GetLastError());
-	}
-	return( result );
-}
-
-/***********************************************************************************************
- * CDControlClass::Auto_Eject_Volume -- Eject the removable media                              *
- *                                                                                             *
- * INPUT:    HANDLE of volume to eject                                                         *
- *                                                                                             *
- * OUTPUT:   true if ejection occured                                                          *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/16/99 11:34PM ST : Created                                                              *
- *=============================================================================================*/
-bool CDControlClass::Auto_Eject_Volume(HANDLE volume)
-{
-	assert (WinVersion.Is_WinNT());
-	unsigned long bytes_returned;
-	bool result = ((DeviceIoControl( volume, IOCTL_STORAGE_EJECT_MEDIA, NULL, 0, NULL, 0, &bytes_returned, NULL)) ? true : false);
-
-	if (result == false) {
-//		DebugString ("DeviceIoControl failed to eject media. Error %d - %s\n", GetLastError(), Last_Error_Text());
-//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to eject media. Error %d - %s", GetLastError(), Last_Error_Text());
-		Last_Error_Text( TEXT("DeviceIoControl failed to eject media."), GetLastError());
-	}
-	return (result);
-}
-
-/***********************************************************************************************
- * CDControlClass::Eject_CD -- Force the CD drive to eject                                     *
- *                                                                                             *
- * INPUT:    drive number                                                                      *
- *                                                                                             *
- * OUTPUT:   true if ejected                                                                   *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/16/99 11:35PM ST : Created                                                              *
- *=============================================================================================*/
-bool CDControlClass::Eject_CD(char drive)
-{
-	assert (WinVersion.Is_WinNT());
-	HANDLE volume;
-	bool ejected = false;
-
-	volume = Open_Removable_Volume(drive);
-
-	if (volume == INVALID_HANDLE_VALUE) return (false);
-
-	/*
-	** Lock and dismount the volume.
-	*/
-    if (Lock_Volume(volume) && Dismount_Volume(volume)) {
-
-		/*
-		** Set prevent removal to false and eject the volume.
-		*/
-       if (Prevent_Removal_Of_Volume(volume, false) && Auto_Eject_Volume(volume)) {
-			ejected = true;
-		}
-	}
-
-	/*
-	** Close the volume so other processes can use the drive.
-	*/
-	Close_Removable_Volume(volume);
-
-	return (ejected);
-}
-
-/***********************************************************************************************
- * CDControlClass::Lock_CD_Drive -- Lock the CD tray and prevent ejection                      *
- *                                                                                             *
- * INPUT:    drive number                                                                      *
- *                                                                                             *
- * OUTPUT:   true if locked                                                                    *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 0:11AM ST : Created                                                               *
- *=============================================================================================*/
-bool CDControlClass::Lock_CD_Drive(char drive)
-{
-	assert (WinVersion.Is_WinNT());
-	HANDLE volume;
-	bool retval = false;
-
-	volume = Open_Removable_Volume(drive);
-
-	if (volume == INVALID_HANDLE_VALUE) return (false);
-
-	/*
-	** Lock the volume.
-	*/
-    if (Lock_Volume(volume)) {
-
-		/*
-		** Set prevent removal to false
-		*/
-		if (Prevent_Removal_Of_Volume(volume, true)) {
-			retval = true;
-		}
-	}
-
-	/*
-	** Close the volume so other processes can use the drive.
-	*/
-	Unlock_Volume(volume);
-	Close_Removable_Volume(volume);
-
-	return (true);
-}
-
-/***********************************************************************************************
- * CDControlClass::Unlock_CD_Drive -- Unlock the CD tray and allow ejection                    *
- *                                                                                             *
- * INPUT:    drive number                                                                      *
- *                                                                                             *
- * OUTPUT:   true if unlocked                                                                  *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 0:11AM ST : Created                                                               *
- *=============================================================================================*/
-bool CDControlClass::Unlock_CD_Drive(char drive)
-{
-	assert (WinVersion.Is_WinNT());
-	HANDLE volume;
-	bool retval = false;
-
-	volume = Open_Removable_Volume(drive);
-
-	if (volume == INVALID_HANDLE_VALUE) return (false);
-
-	/*
-	** Lock the volume.
-	*/
-    if (Lock_Volume(volume)) {
-
-		/*
-		** Set prevent removal to false
-		*/
-		if (Prevent_Removal_Of_Volume(volume, false)) {
-			retval = true;
-		}
-	}
-
-	/*
-	** Close the volume so other processes can use the drive.
-	*/
-	Unlock_Volume(volume);
-	Close_Removable_Volume(volume);
-
-	return (true);
-}
-
-/***********************************************************************************************
- * CDControlClass::Eject_CD_Win95 -- Eject the cd in the given drive                           *
- *                                                                                             *
- * INPUT:    drive. 0=a etc.                                                                   *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 1:04AM ST : Created                                                               *
- *=============================================================================================*/
-void CDControlClass::Eject_CD_Win95 (char drive)
-{
-	assert (WinVersion.Is_Win9x());
-	HANDLE vwin32 = INVALID_HANDLE_VALUE;
-
-	drive++;
-	vwin32 = Open_VWin32 ();
-	assert (vwin32 != INVALID_HANDLE_VALUE);
-
-	/*
-	** Make sure no other applications are using the drive.
-	*/
-	bool drive_locked = Lock_Logical_Volume (vwin32, drive, 0, 0);
-//	assert (drive_locked);
-	if (!drive_locked) {
-//		DebugString("Unable to lock volume %c:\n", 'A' + drive - 1);
-		Msg( __LINE__, TEXT(__FILE__), TEXT("Unable to lock volume %c: "), 'A' + drive - 1 );
-		return;
-	}
-
-	/*
-	** Make sure there is no software lock keeping the media in the drive.
-	*/
-	if (!Unlock_Volume_95 (vwin32, drive)) {
-//		DebugString("Could not unlock media from drive %c:\n", 'A' + drive - 1);
-		Msg( __LINE__, TEXT(__FILE__), TEXT("Could not unlock media from drive %c: "), 'A' + drive - 1 );
-		Unlock_Logical_Volume (vwin32, drive);
-		return;
-	}
-
-	/*
-	** Eject!
-	*/
-	if (!Auto_Eject_Volume_95 (vwin32, drive)) {
-//		DebugString("Could not eject media from drive %c:\n", 'A' + drive - 1);
-		Msg( __LINE__, TEXT(__FILE__), TEXT("Could not eject media from drive %c: "), 'A' + drive - 1 );
-	}
-
-	Unlock_Logical_Volume (vwin32, drive);
-	Close_VWin32 (vwin32);
-}
-
-/***********************************************************************************************
- * CDControlClass::Lock_CD_Drive_95 -- Prevent the user from ejecting the cd in the given drive*
- *                                                                                             *
- * INPUT:    drive. 0=a etc.                                                                   *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 1:04AM ST : Created                                                               *
- *=============================================================================================*/
-bool CDControlClass::Lock_CD_Drive_95 (char drive)
-{
-//	DebugString ("CDControlClass::Lock_CD_Drive_95\n");
-	Msg( __LINE__, TEXT(__FILE__), TEXT("CDControlClass::Lock_CD_Drive_95." ));
-
-	bool retval = true;
-	assert (WinVersion.Is_Win9x());
-	HANDLE vwin32 = INVALID_HANDLE_VALUE;
-
-//	DebugString ("Preventing ejection on CD drive %c\n", drive + 'A');
-	Msg( __LINE__, TEXT(__FILE__), TEXT("Preventing ejection on CD drive %c: "), 'A' + drive -1 );
-
-	drive++;
-	vwin32 = Open_VWin32();
-	assert (vwin32 != INVALID_HANDLE_VALUE);
-
-	/*
-	** Make sure no other applications are using the drive.
-	*/
-//	DebugString ("About to lock logical volume to enable exclusive access\n");
-	Msg( __LINE__, TEXT(__FILE__), TEXT("About to lock logical volume to enable exclusive access." ));
-
-	bool drive_locked = Lock_Logical_Volume (vwin32, drive, 0, 0);
-//	assert (drive_locked);
-	if (!drive_locked) {
-//		DebugString("Unable to lock volume %c:\n", 'A' + drive - 1);
-		Msg( __LINE__, TEXT(__FILE__), TEXT("Unable to lock volume %c:"), 'A' + drive - 1 );
-		return(false);
-	}
-//	DebugString ("Volume locked OK\n");
-	Msg( __LINE__, TEXT(__FILE__), TEXT("Volume locked OK." ));
-
-	/*
-	** Lock the tray in the closed position.
-	*/
-//	DebugString ("About to prevent CD tray ejection\n");
-	Msg( __LINE__, TEXT(__FILE__), TEXT("About to prevent CD tray ejection." ));
-
-	if (!Lock_Volume_95 (vwin32, drive)) {
-//		DebugString("Could not lock CD tray in drive %c:\n", 'A' + drive - 1);
-		Msg( __LINE__, TEXT(__FILE__), TEXT("Could not lock CD tray in drive %c:"), 'A' + drive - 1 );
-		retval = false;
-	}else{
-//		DebugString ("CD tray ejection disabled OK\n");
-		Msg( __LINE__, TEXT(__FILE__), TEXT("CD tray ejection disabled OK." ));
-	}
-
-	Unlock_Logical_Volume (vwin32, drive);
-	Close_VWin32 (vwin32);
-
-//	DebugString ("CDControlClass::Lock_CD_Drive_95 returning %s\n", retval ? "true" : "false");
-	Msg( __LINE__, TEXT(__FILE__), TEXT("CDControlClass::Lock_CD_Drive_95 returning %s."), retval ? "true" : "false" );
-
-	return (retval);
-}
-
-/***********************************************************************************************
- * CDControlClass::Unlock_CD_Drive_95 -- Allow the user to eject the cd in the given drive     *
- *                                                                                             *
- * INPUT:    drive. 0=a etc.                                                                   *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 1:04AM ST : Created                                                               *
- *=============================================================================================*/
-bool CDControlClass::Unlock_CD_Drive_95 (char drive)
-{
-//	DebugString ("CDControlClass::Unlock_CD_Drive_95\n");
-	Msg( __LINE__, TEXT(__FILE__), TEXT("CDControlClass::Unlock_CD_Drive_95 returning %s." ));
-
-	bool retval = true;
-	assert (WinVersion.Is_Win9x());
-	HANDLE vwin32 = INVALID_HANDLE_VALUE;
-
-//	DebugString ("Allowing ejection on CD drive %c\n", drive + 'A');
-	Msg( __LINE__, TEXT(__FILE__), TEXT("Allowing ejection on CD drive %c."), drive + 'A' - 1 );
-
-	drive++;
-	vwin32 = Open_VWin32();
-	assert (vwin32 != INVALID_HANDLE_VALUE);
-
-	/*
-	** Make sure no other applications are using the drive.
-	*/
-//	DebugString ("About to lock logical volume to enable exclusive access\n");
-	Msg( __LINE__, TEXT(__FILE__), TEXT("About to lock logical volume to enable exclusive access." ));
-
-	bool drive_locked = Lock_Logical_Volume (vwin32, drive, 0, 0);
-//	assert (drive_locked);
-	if (!drive_locked) {
-//		DebugString("Unable to lock volume %c:\n", 'A' + drive - 1);
-		Msg( __LINE__, TEXT(__FILE__), TEXT("Unable to lock volume %c:."), 'A' + drive - 1 );
-		return(false);
-	}
-//	DebugString ("Volume locked OK\n");
-	Msg( __LINE__, TEXT(__FILE__), TEXT("Volume locked OK." ));
-
-	/*
-	** Unlock the tray to allow ejection.
-	*/
-//	DebugString ("About to allow CD tray ejection\n");
-	Msg( __LINE__, TEXT(__FILE__), TEXT("About to allow CD tray ejection." ));
-
-	if (!Unlock_Volume_95 (vwin32, drive)) {
-//		DebugString("Could not unlock CD tray in drive %c:\n", 'A' + drive - 1);
-		Msg( __LINE__, TEXT(__FILE__), TEXT("Could not unlock CD tray in drive %c:"), 'A' + drive - 1 );
-		retval = false;
-	}else{
-//		DebugString ("CD tray ejection enabled OK\n");
-		Msg( __LINE__, TEXT(__FILE__), TEXT("CD tray ejection enabled OK." ));
-	}
-
-	Unlock_Logical_Volume (vwin32, drive);
-	Close_VWin32 (vwin32);
-
-//	DebugString ("CDControlClass::Unlock_CD_Drive_95 returning %s\n", retval ? "true" : "false");
-	Msg( __LINE__, TEXT(__FILE__), TEXT("CDControlClass::Unlock_CD_Drive_95 returning %s."), retval ? "true" : "false" );
-	return (retval);
-}
-
-/***********************************************************************************************
- * CDControlClass::Unlock_Volume_95 -- Unlocks removable media so that it can be ejected       *
- *                                                                                             *
- * INPUT:    Handle to VWIN32                                                                  *
- *           drive to unlock (DOS format)                                                      *
- *                                                                                             *
- * OUTPUT:   true if unlocked                                                                  *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 0:19AM ST : Created                                                               *
- *=============================================================================================*/
-bool CDControlClass::Unlock_Volume_95 (HANDLE vwin32, char drive)
-{
-	assert (WinVersion.Is_Win9x());
-	DIOC_REGISTERS regs = {0};
-	PARAMBLOCK     unlock_params = {0};
-	bool  result;
-	unsigned long cb;
-
-	/*
-	** First, check the lock status. This way, we'll know the number of pending locks we must unlock.
-	*/
-	unlock_params.bOperation = 2;   // return lock/unlock status
-
-	regs.reg_EAX = 0x440D;
-	regs.reg_EBX = drive;
-	regs.reg_ECX = MAKEWORD(0x48, 0x08);
-	regs.reg_EDX = (unsigned long)&unlock_params;
-
-	result = (DeviceIoControl (vwin32, VWIN32_DIOC_DOS_IOCTL, &regs, sizeof(regs), &regs, sizeof(regs), &cb, 0)) ? true : false;
-
-	if (result) {
-
-		/*
-		** DeviceIoControl succeeded. Now see if the unlock succeeded. It
-		** succeeded if the carry flag is not set, or if the carry flag is
-		** set but EAX is 0x01 or 0xB0.
-		**
-		** It failed if the carry flag is set and EAX is not 0x01 or 0xB0.
-		**
-		** If the carry flag is clear, then unlock succeeded. However, you
-		** don't need to set fResult because it is already TRUE when you get
-		** in here.
-		*/
-		if (regs.reg_Flags & CARRY_FLAG) {
-			result = (regs.reg_EAX == 0xB0) || (regs.reg_EAX == 0x01);
-		}
-
-	} else {
-//		DebugString ("DeviceIoControl failed to perform DOS IO control function. Error %d - %s\n", GetLastError(), Last_Error_Text());
-//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to perform DOS IO control function. Error %d - %s.", GetLastError(), Last_Error_Text() );
-		Last_Error_Text( TEXT("DeviceIoControl failed to perform DOS IO control function.."), GetLastError());
-	}
-
-	if (!result) return (false);
-
-	/*
-	** Now we have to unlock the media for every time it was locked. This gets us a lock count of
-	** 0 and totally unlocked media.
-	*/
-	for (int i = 0; i < unlock_params.bNumLocks; ++i) {
-		unlock_params.bOperation = 1;   // unlock the media
-		regs.reg_EAX = 0x440D;
-		regs.reg_EBX = drive;
-		regs.reg_ECX = MAKEWORD(0x48, 0x08);  // LOCK/UNLOCK
-		regs.reg_EDX = (unsigned long)&unlock_params;
-
-		result = (DeviceIoControl (vwin32, VWIN32_DIOC_DOS_IOCTL, &regs, sizeof(regs), &regs, sizeof(regs), &cb, 0)) ? true : false;
-		if (result == false) {
-//			DebugString ("DeviceIoControl failed to perform DOS IO control function. Error %d - %s\n", GetLastError(), Last_Error_Text());
-//			Msg( __LINE__, __FILE__, "DeviceIoControl failed to perform DOS IO control function. Error %d - %s.", GetLastError(), Last_Error_Text() );
-			Last_Error_Text( TEXT("DeviceIoControl failed to perform DOS IO control function.."), GetLastError());
-		}
-
-		/*
-		** See if DeviceIoControl and the lock succeeded
-		*/
-		result = result && !(regs.reg_Flags & CARRY_FLAG);
-		if (!result) break;
-	}
-	return (result);
-}
-
-/***********************************************************************************************
- * CDControlClass::Lock_Volume_95 -- Locks removable media so that it can't be ejected         *
- *                                                                                             *
- * INPUT:    Handle to VWIN32                                                                  *
- *           drive to lock (DOS format)                                                        *
- *                                                                                             *
- * OUTPUT:   true if unlocked                                                                  *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 0:19AM ST : Created                                                               *
- *=============================================================================================*/
-bool CDControlClass::Lock_Volume_95 (HANDLE vwin32, char drive)
-{
-	assert (WinVersion.Is_Win9x());
-	DIOC_REGISTERS regs = {0};
-	PARAMBLOCK     unlock_params = {0};
-	bool  result;
-	unsigned long cb;
-
-	/*
-	** Bring the lock count down to 0.
-	*/
-	Unlock_Volume_95(vwin32, drive);
-
-	/*
-	** Increment the lock count.
-	*/
-    unlock_params.bOperation = 0;   // lock the media
-    regs.reg_EAX = 0x440D;
-    regs.reg_EBX = drive;
-    regs.reg_ECX = MAKEWORD(0x48, 0x08);  // LOCK/UNLOCK
-    regs.reg_EDX = (unsigned long)&unlock_params;
-
-    result = (DeviceIoControl (vwin32, VWIN32_DIOC_DOS_IOCTL, &regs, sizeof(regs), &regs, sizeof(regs), &cb, 0)) ? true : false;
-	if (result == false) {
-//		DebugString ("DeviceIoControl failed to perform DOS IO control function. Error %d - %s\n", GetLastError(), Last_Error_Text());
-//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to perform DOS IO control function. Error %d - %s.", GetLastError(), Last_Error_Text() );
-		Last_Error_Text( TEXT("DeviceIoControl failed to perform DOS IO control function."), GetLastError());
-	}
-
-	/*
-	** See if DeviceIoControl and the lock succeeded
-	*/
-    result = result && !(regs.reg_Flags & CARRY_FLAG);
-	return (result);
-}
-
-/***********************************************************************************************
- * CDControlClass::Auto_Eject_Volume_95 -- Eject the specified CD drive                        *
- *                                                                                             *
- * INPUT:    Handle to VWIN32                                                                  *
- *           Drive number (DOS format)                                                         *
- *                                                                                             *
- * OUTPUT:   True if ejected                                                                   *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 0:24AM ST : Created                                                               *
- *=============================================================================================*/
-bool CDControlClass::Auto_Eject_Volume_95 (HANDLE vwin32, char drive)
-{
-	assert (WinVersion.Is_Win9x());
-	DIOC_REGISTERS regs = {0};
-	bool  result;
-	unsigned long cb;
-
-	regs.reg_EAX = 0x440D;
-	regs.reg_EBX = drive;
-	regs.reg_ECX = MAKEWORD(0x49, 0x08);		//EJECT
-
-	result = (DeviceIoControl (vwin32, VWIN32_DIOC_DOS_IOCTL, &regs, sizeof(regs), &regs, sizeof(regs), &cb, 0)) ? true : false;
-	if (result == false) {
-//		DebugString ("DeviceIoControl failed to perform DOS IO control function. Error %d - %s\n", GetLastError(), Last_Error_Text());
-//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to perform DOS IO control function. Error %d - %s.", GetLastError(), Last_Error_Text() );
-		Last_Error_Text( TEXT("DeviceIoControl failed to perform DOS IO control function."), GetLastError());
-	}
-
-	/*
-	** See if we ejected OK
-	*/
-	result = result && !(regs.reg_Flags & CARRY_FLAG);
-
-	return (result);
-}
-
-/***********************************************************************************************
- * CDControlClass::Open_VWin32 -- Opens a handle to VWIN32 to issue low-level disk I/O         *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   HANDLE to VWin32                                                                  *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 0:26AM ST : Created                                                               *
- *=============================================================================================*/
-HANDLE WINAPI CDControlClass::Open_VWin32 (void)
-{
-	assert (WinVersion.Is_Win9x());
-	HANDLE result = CreateFile ( TEXT("\\\\.\\vwin32"), 0, 0, NULL, 0, FILE_FLAG_DELETE_ON_CLOSE, NULL);
-	assert (result != INVALID_HANDLE_VALUE);
-	return (result);
-}
-
-/***********************************************************************************************
- * CDControlClass::Close_VWin32 -- Closes the handle opened by Open_VWin32.                    *
- *                                                                                             *
- * INPUT:    Handle to VWin32                                                                  *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 0:26AM ST : Created                                                               *
- *=============================================================================================*/
-bool WINAPI CDControlClass::Close_VWin32 (HANDLE vwin32)
-{
-	assert (WinVersion.Is_Win9x());
-	return ((CloseHandle (vwin32)) ? true : false);
-}
-
-/***********************************************************************************************
- * CDControlClass::Lock_Logical_Volume -- Take a lock on a logical volume                      *
- *                                                                                             *
- * INPUT:    Handle to VWin32                                                                  *
- *           drive number (DOS format)                                                         *
- *           lock level                                                                        *
- *           permissions                                                                       *
- *                                                                                             *
- * OUTPUT:   true if locked                                                                    *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 0:33AM ST : Created                                                               *
- *=============================================================================================*/
-bool WINAPI CDControlClass::Lock_Logical_Volume (HANDLE vwin32, char drive, char lock_level, short permissions)
-{
-	assert (WinVersion.Is_Win9x());
-	bool           result;
-	DIOC_REGISTERS regs = {0};
-	char           device_cat;  // can be either 0x48 or 0x08
-	unsigned long  cb;
-
-	/*
-	** lock_level
-	**    Can be 0, 1, 2, or 3. Level 0 is an exclusive lock that can only
-	**    be taken when there are no open files on the specified drive.
-	**    Levels 1 through 3 form a hierarchy where 1 must be taken before
-	**    2, which must be taken before 3.
-	**
-	** permissions
-	**    Specifies how the lock will affect file operations when lock levels
-	**    1 through 3 are taken. Also specifies whether a formatting lock
-	**    should be taken after a level 0 lock.
-	*/
-
-	/*
-	** Try first with device category 0x48 for FAT32 volumes. If it
-	** doesn't work, try again with device category 0x08. If that
-	** doesn't work, then the lock failed.
-	*/
-	device_cat = 0;
-
-	do {
-		if (device_cat == 0) {
-			device_cat = 0x48;
-		}else{
-			device_cat = 0x08;
-		}
-
-		/*
-		** Set up the parameters for the call.
-		*/
-		regs.reg_EAX = 0x440D;
-		regs.reg_EBX = MAKEWORD(drive, lock_level);
-		regs.reg_ECX = MAKEWORD(0x4A, device_cat);
-		regs.reg_EDX = permissions;
-
-		result = (DeviceIoControl (vwin32, VWIN32_DIOC_DOS_IOCTL, &regs, sizeof(regs), &regs, sizeof(regs), &cb, 0)) ? true : false;
-		if (result == false) {
-//			DebugString ("DeviceIoControl failed to perform DOS IO control function. Error %d - %s\n", GetLastError(), Last_Error_Text());
-//			Msg( __LINE__, __FILE__, "DeviceIoControl failed to perform DOS IO control function. Error %d - %s.", GetLastError(), Last_Error_Text() );
-			Last_Error_Text( TEXT("DeviceIoControl failed to perform DOS IO control function."), GetLastError());
-		}
-		result = result && !(regs.reg_Flags & CARRY_FLAG);
-
-	} while (result == false && device_cat != 0x08);
-
-	return (result);
-}
-
-/***********************************************************************************************
- * CDControlClass::Unlock_Logical_Volume -- Unlocks a logical volume                           *
- *                                                                                             *
- * INPUT:    Handle to VWin32                                                                  *
- *           drive number (DOS format)                                                         *
- *                                                                                             *
- * OUTPUT:   true if unlocked                                                                  *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- *  Must be called the same number of times as LockLogicalVolume() to                          *
- *  completely unlock a volume.                                                                *
- *                                                                                             *
- *  Only the lock owner can unlock a volume.                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/17/99 0:39AM ST : Created                                                               *
- *=============================================================================================*/
-bool WINAPI CDControlClass::Unlock_Logical_Volume (HANDLE vwin32, char drive)
-{
-	assert (WinVersion.Is_Win9x());
-	bool           result;
-	DIOC_REGISTERS regs = {0};
-	char           device_cat;  // can be either 0x48 or 0x08
-	unsigned long  cb;
-
-	/*
-	** Try first with device category 0x48 for FAT32 volumes. If it
-	** doesn't work, try again with device category 0x08. If that
-	** doesn't work, then the unlock failed.
-	*/
-	device_cat = 0;
-
-	do {
-		if (device_cat == 0) {
-			device_cat = 0x48;
-		}else{
-			device_cat = 0x08;
-		}
-
-		/*
-		** Set up the parameters for the call.
-		*/
-		regs.reg_EAX = 0x440D;
-		regs.reg_EBX = drive;
-		regs.reg_ECX = MAKEWORD(0x6A, device_cat);
-
-		result = (DeviceIoControl (vwin32, VWIN32_DIOC_DOS_IOCTL, &regs, sizeof(regs), &regs, sizeof(regs), &cb, 0)) ? true : false;
-		if (result == false) {
-//			DebugString ("DeviceIoControl failed to perform DOS IO control function. Error %d - %s\n", GetLastError(), Last_Error_Text());
-//			Msg( __LINE__, __FILE__, "DeviceIoControl failed to perform DOS IO control function. Error %d - %s.", GetLastError(), Last_Error_Text());
-			Last_Error_Text( TEXT("DeviceIoControl failed to perform DOS IO control function."), GetLastError());
-		}
-		result = result && !(regs.reg_Flags & CARRY_FLAG);
-
-	} while (result == false && device_cat != 0x08);
-
-	return (result);
-}
-
-/************************************************************************************************
- * Last_Error_Text -- Display error messages based on FormatMessage() and GetLastError().		*
- *																								*
- * INPUT:    LPSTR - title.																		*
- *           HRESULT - last error message.														*
- *																								*
- * OUTPUT:   None																				*
- *																								*
- * WARNINGS: None																				*
- *																								*
- * HISTORY:																						*
- *   6/24/99 4:44PM MML : Created																*
- *==============================================================================================*/
-
-void Last_Error_Text ( LPCTSTR szPrefix, HRESULT hr )
-{
-	LPVOID		szMessage; 
-	char		szDisplay[1000];
-	
-	if ( hr == S_OK ) { 
-		_stprintf( szDisplay, TEXT("%s"), szPrefix ); 
-//		MessageBox( NULL, szDisplay, TEXT("Msg"),0 );
-		return;
-	} 
-
-	if ( HRESULT_FACILITY( hr ) == FACILITY_WIN32 ) {
-		hr = HRESULT_CODE( hr );
-	}
-	FormatMessage( 
-			FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, 
-			NULL,
-			hr, 
-			MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ),
-			(LPTSTR)&szMessage,
-			0,
-			NULL );
-
-	_stprintf( szDisplay, TEXT( "%s: %s(%lx)" ), szPrefix, szMessage, hr ); 
-
-	Msg( __LINE__, TEXT(__FILE__), TEXT("GetLastError: %s"), szDisplay );
-//	MessageBox( NULL, szDisplay, TEXT( "GetLastError" ), MB_OK );
-
-	LocalFree( szMessage );
-
-}
-
-
-
-
diff --git a/Core/Tools/Autorun/CDCNTRL.H b/Core/Tools/Autorun/CDCNTRL.H
deleted file mode 100644
index a63785e11bd..00000000000
--- a/Core/Tools/Autorun/CDCNTRL.H
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /Renegade Setup/Autorun/CDCNTRL.H                           $*
- *                                                                                             *
- *                      $Author:: Maria_l                                                     $*
- *                                                                                             *
- *                     $Modtime:: 4/20/01 2:07p                                               $*
- *                                                                                             *
- *                    $Revision:: 3                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#pragma once
-
-
-#ifndef _CDCNTRL
-#define _CDCNTRL
-
-
-//#include	"always.h"
-//#include	<winmin.h>
-#define  STRICT
-#include <windows.h>
-#include <windowsx.h>
-#include	<ctype.h>
-
-
-
-class CDControlClass {
-
-	public:
-		CDControlClass(void);
-		~CDControlClass(void);
-
-		/*
-		** Force the CD tray to open on the specified drive.
-		*/
-		void Force_CD_Eject(int drive);
-
-		/*
-		** Prevent the user from ejecting the CD in the specified drive.
-		*/
-		bool Lock_CD_Tray(int drive);
-
-		/*
-		** Allow the user to eject the CD in the specified drive.
-		*/
-		bool Unlock_CD_Tray(int drive);
-
-
-	private:
-		/*
-		** NT functions.
-		*/
-		bool Eject_CD(char drive);
-		HANDLE Open_Removable_Volume(char drive);
-		bool Lock_Volume(HANDLE volume);
-		bool Unlock_Volume(HANDLE volume);
-		bool Dismount_Volume(HANDLE volume);
-		bool Prevent_Removal_Of_Volume(HANDLE volume, bool prevent);
-		bool Auto_Eject_Volume(HANDLE volume);
-		bool Close_Removable_Volume(HANDLE volume);
-		bool Lock_CD_Drive(char drive);
-		bool Unlock_CD_Drive(char drive);
-
-		/*
-		** Win9x functions.
-		*/
-		HANDLE WINAPI Open_VWin32 (void);
-		bool WINAPI Close_VWin32 (HANDLE vwin32);
-		bool WINAPI Unlock_Logical_Volume (HANDLE vwin32, char drive);
-		bool WINAPI Lock_Logical_Volume (HANDLE vwin32, char drive, char lock_level, short permissions);
-		bool Lock_Volume_95 (HANDLE vwin32, char drive);
-		bool Unlock_Volume_95 (HANDLE vwin32, char drive);
-		bool Auto_Eject_Volume_95 (HANDLE vwin32, char drive);
-		void Eject_CD_Win95 (char drive);
-		bool Lock_CD_Drive_95(char drive);
-		bool Unlock_CD_Drive_95(char drive);
-
-};
-
-extern CDControlClass CDControl;
-
-
-#define LOCK_TIMEOUT        2000		// 2 Seconds
-#define LOCK_RETRIES        2			// 2 times
-
-/*
-** Low level structures for Win9x.
-**
-** DeviceIoControl infrastructure
-*/
-#if !defined (VWIN32_DIOC_DOS_IOCTL)
-#define VWIN32_DIOC_DOS_IOCTL      1
-
-typedef struct _DIOC_REGISTERS {
-    DWORD reg_EBX;
-    DWORD reg_EDX;
-    DWORD reg_ECX;
-    DWORD reg_EAX;
-    DWORD reg_EDI;
-    DWORD reg_ESI;
-    DWORD reg_Flags;
-} DIOC_REGISTERS, *PDIOC_REGISTERS;
-
-#endif
-
-/*
-** Intel x86 processor status flags
-*/
-#define CARRY_FLAG             0x0001
-
-/*
-** DOS IOCTL function support
-*/
-
-#pragma pack(1)
-
-/*
-** Parameters for locking/unlocking removable media
-*/
-typedef struct _PARAMBLOCK {
-   BYTE bOperation;
-   BYTE bNumLocks;
-} PARAMBLOCK, *PPARAMBLOCK;
-
-#pragma pack()
-
-
-
-#endif	//_CDCNTRL
-
diff --git a/Core/Tools/Autorun/CDCNTRL.cpp b/Core/Tools/Autorun/CDCNTRL.cpp
new file mode 100644
index 00000000000..7d9f981a97b
--- /dev/null
+++ b/Core/Tools/Autorun/CDCNTRL.cpp
@@ -0,0 +1,1116 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Renegade Setup/Autorun/CDCNTRL.cpp                         $*
+ *                                                                                             *
+ *                      $Author:: Maria_l                                                     $*
+ *                                                                                             *
+ *                     $Modtime:: 10/18/01 5:33p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 5                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *                                                                                             *
+ *  CDControlClass::Auto_Eject_Volume -- Eject the removable media                             *
+ *  CDControlClass::Auto_Eject_Volume_95 -- Eject the specified CD drive                       *
+ *  CDControlClass::CDControlClass -- Class constructor                                        *
+ *  CDControlClass::Close_Removable_Volume -- Close the handle to a removable volume           *
+ *  CDControlClass::Close_VWin32 -- Closes the handle opened by Open_VWin32.                   *
+ *  CDControlClass::Dismount_Volume -- Dismount the given volume                               *
+ *  CDControlClass::Eject_CD -- Force the CD drive to eject                                    *
+ *  CDControlClass::Eject_CD_Win95 -- Eject the cd in the given drive                          *
+ *  CDControlClass::Force_CD_Eject -- Ppen the CD tray on the given drive                      *
+ *  CDControlClass::Lock_CD_Drive -- Lock the CD tray and prevent ejection                     *
+ *  CDControlClass::Lock_CD_Drive_95 -- Prevent the user from ejecting the cd in the given driv*
+ *  CDControlClass::Lock_CD_Tray -- Prevent CD ejection on the specified drive                 *
+ *  CDControlClass::Lock_Logical_Volume -- Take a lock on a logical volume                     *
+ *  CDControlClass::Lock_Volume -- Prevent access by other threads to a given volume           *
+ *  CDControlClass::Lock_Volume_95 -- Locks removable media so that it can't be ejected        *
+ *  CDControlClass::Open_Removable_Volume -- Fetch a handle to a removable drive               *
+ *  CDControlClass::Open_VWin32 -- Opens a handle to VWIN32 to issue low-level disk I/O        *
+ *  CDControlClass::Prevent_Removal_Of_Volume -- Disable the eject button on the given drive   *
+ *  CDControlClass::Unlock_CD_Drive -- Unlock the CD tray and allow ejection                   *
+ *  CDControlClass::Unlock_CD_Drive_95 -- Allow the user to eject the cd in the given drive    *
+ *  CDControlClass::Unlock_CD_Tray -- Allow CD ejection on the specified drive                 *
+ *  CDControlClass::Unlock_Logical_Volume -- Unlocks a logical volume                          *
+ *  CDControlClass::Unlock_Volume -- Allow access by other threads to a given volume           *
+ *  CDControlClass::Unlock_Volume_95 -- Unlocks removable media so that it can be ejected      *
+ *  CDControlClass::~CDControlClass -- Class destructor                                        *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#include	"assert.h"
+#include	"CDCNTRL.h"
+#include	"WinFix.h"
+#include	"Wnd_File.h"
+#pragma	warning(disable : 4201)
+#include	<winioctl.h>
+#include	<tchar.h>
+#include	<stdio.h>
+
+
+CDControlClass CDControl;
+
+
+void Last_Error_Text ( LPCTSTR szPrefix, HRESULT hr );
+
+
+/***********************************************************************************************
+ * CDControlClass::CDControlClass -- Class constructor                                         *
+ *                                                                                             *
+ * INPUT:    Nothing                                                                           *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 2:03AM ST : Created                                                               *
+ *=============================================================================================*/
+CDControlClass::CDControlClass(void)
+{
+}
+
+
+/***********************************************************************************************
+ * CDControlClass::~CDControlClass -- Class destructor                                         *
+ *                                                                                             *
+ * INPUT:    Nothing                                                                           *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 2:03AM ST : Created                                                               *
+ *=============================================================================================*/
+CDControlClass::~CDControlClass(void)
+{
+}
+
+/***********************************************************************************************
+ * CDControlClass::Force_CD_Eject -- Ppen the CD tray on the given drive                       *
+ *                                                                                             *
+ * INPUT:    Drive number (0=a, 1=b etc)                                                       *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 1:17AM ST : Created                                                               *
+ *=============================================================================================*/
+void CDControlClass::Force_CD_Eject(int drive)
+{
+	if ( WinVersion.Is_Win9x() ) {
+		Eject_CD_Win95(drive);
+	}else{
+		Eject_CD(drive);
+	}
+}
+
+/***********************************************************************************************
+ * CDControlClass::Lock_CD_Tray -- Prevent CD ejection on the specified drive                  *
+ *                                                                                             *
+ * INPUT:    drive number (0=a: etc)                                                           *
+ *                                                                                             *
+ * OUTPUT:   true if locked                                                                    *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *               2/17/99 1:56AM ST : Created                                                   *
+ *=============================================================================================*/
+bool CDControlClass::Lock_CD_Tray (int drive)
+{
+	if ( WinVersion.Is_Win9x() ) {
+		return (Lock_CD_Drive_95(drive));
+	}else{
+		return (Lock_CD_Drive(drive));
+	}
+}
+
+/***********************************************************************************************
+ * CDControlClass::Unlock_CD_Tray -- Allow CD ejection on the specified drive                  *
+ *                                                                                             *
+ * INPUT:    drive number (0=a: etc)                                                           *
+ *                                                                                             *
+ * OUTPUT:   true if unlocked OK                                                               *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *         2/17/99 1:57AM ST : Created                                                         *
+ *=============================================================================================*/
+bool CDControlClass::Unlock_CD_Tray (int drive)
+{
+	if ( WinVersion.Is_Win9x() ) {
+		return (Unlock_CD_Drive_95(drive));
+	}else{
+		return (Unlock_CD_Drive(drive));
+	}
+}
+
+/***********************************************************************************************
+ * CDControlClass::Open_Removable_Volume -- Fetch a handle to a removable drive                *
+ *                                                                                             *
+ * INPUT:    Nothing                                                                           *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/16/99 11:25PM ST : Created                                                              *
+ *=============================================================================================*/
+HANDLE CDControlClass::Open_Removable_Volume( char drive )
+{
+	assert (WinVersion.Is_WinNT());
+
+	HANDLE		volume;
+	unsigned	drivetype;
+	char		volume_name[8];
+	char		rootname[5];
+	unsigned long	access_flags;
+
+	/*----------------------------------------------------------------------------------------
+	** Get the drive type to ensure that this is a removable volume.
+	*/
+	_stprintf (rootname, _TEXT( "%c:\\" ), drive + 'A');
+	drivetype = GetDriveType( rootname );
+
+	switch( drivetype ) {
+
+		case DRIVE_REMOVABLE:
+			access_flags = GENERIC_READ | GENERIC_WRITE;
+			break;
+
+		case DRIVE_CDROM:
+			access_flags = GENERIC_READ;
+			break;
+
+		default:
+//			DebugString ("Attempt to open non-removable volume for locking or ejection\n");
+			Msg( __LINE__, TEXT(__FILE__), TEXT("Attempt to open non-removable volume for locking or ejection" ));
+			return( INVALID_HANDLE_VALUE );
+	}
+
+	/*----------------------------------------------------------------------------------------
+	** Get a handle to the volume.
+	*/
+	_stprintf( volume_name, _TEXT( "\\\\.\\%c:" ), drive + 'A' );
+	volume = CreateFile( volume_name, access_flags, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL );
+
+//	assert (volume != INVALID_HANDLE_VALUE);
+
+	if ( volume == INVALID_HANDLE_VALUE ) {
+//		DebugString ("Unable to open drive %c: for ejection\n", drive + 'A');
+		Msg( __LINE__, TEXT(__FILE__), TEXT("Unable to open drive %c: for ejection"), drive + 'A' - 1 );
+	}
+	return( volume );
+}
+
+/***********************************************************************************************
+ * CDControlClass::Close_Removable_Volume -- Close the handle to a removable volume             *
+ *                                                                                             *
+ * INPUT:    HANDLE of volume to close                                                         *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/16/99 11:27PM ST : Created                                                              *
+ *=============================================================================================*/
+bool CDControlClass::Close_Removable_Volume(HANDLE volume)
+{
+	assert (WinVersion.Is_WinNT());
+	return ((CloseHandle(volume)) ? true : false);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Lock_Volume -- Prevent access by other threads to a given volume            *
+ *                                                                                             *
+ * INPUT:    HANDLE to volume                                                                  *
+ *                                                                                             *
+ * OUTPUT:   true if locked                                                                    *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/16/99 11:29PM ST : Created                                                              *
+ *=============================================================================================*/
+bool CDControlClass::Lock_Volume( HANDLE volume )
+{
+	assert( WinVersion.Is_WinNT( ));
+
+	unsigned long bytes_returned	= 0;
+	unsigned long sleep_amount		= LOCK_TIMEOUT / LOCK_RETRIES;
+
+	/*
+	** Do this in a loop until a timeout period has expired
+	*/
+	for ( int trycount = 0; trycount < LOCK_RETRIES; trycount++ ) {
+
+		if ( DeviceIoControl( volume, FSCTL_LOCK_VOLUME, NULL, 0, NULL, 0, &bytes_returned, NULL )) {
+			return( true );
+		}
+//		Msg( __LINE__, TEXT(__FILE__), TEXT("DeviceIoControl failed to lock volume. Error %d - %s"), GetLastError(), Last_Error_Text());
+		Last_Error_Text( _TEXT( "DeviceIoControl failed to lock volume." ), GetLastError());
+//		Sleep( sleep_amount );
+		Sleep( LOCK_TIMEOUT );
+	}
+	return( false );
+}
+
+/***********************************************************************************************
+ * CDControlClass::Unlock_Volume -- Allow access by other threads to a given volume            *
+ *                                                                                             *
+ * INPUT:    HANDLE to volume                                                                  *
+ *                                                                                             *
+ * OUTPUT:   true if unlocked                                                                  *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/16/99 11:29PM ST : Created                                                              *
+ *=============================================================================================*/
+bool CDControlClass::Unlock_Volume(HANDLE volume)
+{
+	assert( WinVersion.Is_WinNT());
+
+	unsigned long bytes_returned;
+	unsigned long sleep_amount	= LOCK_TIMEOUT / LOCK_RETRIES;
+
+	/*
+	** Do this in a loop until a timeout period has expired
+	*/
+   for ( int trycount = 0; trycount < LOCK_RETRIES; trycount++ ) {
+
+		if ( DeviceIoControl( volume, FSCTL_UNLOCK_VOLUME, NULL, 0, NULL, 0, &bytes_returned, NULL )) return( true );
+//		DebugString ("DeviceIoControl failed to unlock volume. Error %d - %s\n", GetLastError(), Last_Error_Text());
+//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to unlock volume. Error %d - %s", GetLastError(), Last_Error_Text());
+		Last_Error_Text( _TEXT( "DeviceIoControl failed to unlock volume." ), GetLastError());
+//		Sleep( sleep_amount );
+		Sleep( LOCK_TIMEOUT );
+	}
+	return( false );
+}
+
+/***********************************************************************************************
+ * CDControlClass::Dismount_Volume -- Dismount the given volume                                *
+ *                                                                                             *
+ * INPUT:    HANDLE of volume to dismount                                                      *
+ *                                                                                             *
+ * OUTPUT:   true if volume dismounted OK                                                      *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/16/99 11:31PM ST : Created                                                              *
+ *=============================================================================================*/
+bool CDControlClass::Dismount_Volume(HANDLE volume)
+{
+	assert( WinVersion.Is_WinNT());
+
+	unsigned long bytes_returned;
+	bool result = ((DeviceIoControl( volume, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, 0, &bytes_returned, NULL)) ? true : false );
+
+	if (result == false) {
+//		DebugString ("DeviceIoControl failed to dismount volume. Error %d - %s\n", GetLastError(), Last_Error_Text());
+//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to dismount volume. Error %d - %s", GetLastError(), Last_Error_Text());
+		Last_Error_Text( _TEXT( "DeviceIoControl failed to dismount volume." ), GetLastError());
+	}
+	return( result );
+}
+
+/***********************************************************************************************
+ * CDControlClass::Prevent_Removal_Of_Volume -- Disable the eject button on the given drive    *
+ *                                                                                             *
+ * INPUT:    HANDLE of volume to enable/disable                                                *
+ *           true to prevent removal. false to allow it.                                       *
+ *                                                                                             *
+ * OUTPUT:   true if status changed OK                                                         *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/16/99 11:32PM ST : Created                                                              *
+ *=============================================================================================*/
+bool CDControlClass::Prevent_Removal_Of_Volume( HANDLE volume, bool prevent )
+{
+	assert( WinVersion.Is_WinNT());
+
+	unsigned long bytes_returned;
+	PREVENT_MEDIA_REMOVAL pmrbuffer;
+
+	pmrbuffer.PreventMediaRemoval = prevent;
+
+	bool result = ((DeviceIoControl( volume, IOCTL_STORAGE_MEDIA_REMOVAL, &pmrbuffer, sizeof(PREVENT_MEDIA_REMOVAL), NULL, 0, &bytes_returned, NULL)) ? true : false);
+
+	if (result == false) {
+//		DebugString ("DeviceIoControl failed to prevent media removal. Error %d - %s\n", GetLastError(), Last_Error_Text());
+//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to prevent media removal. Error %d - %s", GetLastError(), Last_Error_Text());
+		Last_Error_Text( _TEXT( "DeviceIoControl failed to prevent media removal." ), GetLastError());
+	}
+	return( result );
+}
+
+/***********************************************************************************************
+ * CDControlClass::Auto_Eject_Volume -- Eject the removable media                              *
+ *                                                                                             *
+ * INPUT:    HANDLE of volume to eject                                                         *
+ *                                                                                             *
+ * OUTPUT:   true if ejection occured                                                          *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/16/99 11:34PM ST : Created                                                              *
+ *=============================================================================================*/
+bool CDControlClass::Auto_Eject_Volume(HANDLE volume)
+{
+	assert (WinVersion.Is_WinNT());
+	unsigned long bytes_returned;
+	bool result = ((DeviceIoControl( volume, IOCTL_STORAGE_EJECT_MEDIA, NULL, 0, NULL, 0, &bytes_returned, NULL)) ? true : false);
+
+	if (result == false) {
+//		DebugString ("DeviceIoControl failed to eject media. Error %d - %s\n", GetLastError(), Last_Error_Text());
+//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to eject media. Error %d - %s", GetLastError(), Last_Error_Text());
+		Last_Error_Text( TEXT("DeviceIoControl failed to eject media."), GetLastError());
+	}
+	return (result);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Eject_CD -- Force the CD drive to eject                                     *
+ *                                                                                             *
+ * INPUT:    drive number                                                                      *
+ *                                                                                             *
+ * OUTPUT:   true if ejected                                                                   *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/16/99 11:35PM ST : Created                                                              *
+ *=============================================================================================*/
+bool CDControlClass::Eject_CD(char drive)
+{
+	assert (WinVersion.Is_WinNT());
+	HANDLE volume;
+	bool ejected = false;
+
+	volume = Open_Removable_Volume(drive);
+
+	if (volume == INVALID_HANDLE_VALUE) return (false);
+
+	/*
+	** Lock and dismount the volume.
+	*/
+    if (Lock_Volume(volume) && Dismount_Volume(volume)) {
+
+		/*
+		** Set prevent removal to false and eject the volume.
+		*/
+       if (Prevent_Removal_Of_Volume(volume, false) && Auto_Eject_Volume(volume)) {
+			ejected = true;
+		}
+	}
+
+	/*
+	** Close the volume so other processes can use the drive.
+	*/
+	Close_Removable_Volume(volume);
+
+	return (ejected);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Lock_CD_Drive -- Lock the CD tray and prevent ejection                      *
+ *                                                                                             *
+ * INPUT:    drive number                                                                      *
+ *                                                                                             *
+ * OUTPUT:   true if locked                                                                    *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 0:11AM ST : Created                                                               *
+ *=============================================================================================*/
+bool CDControlClass::Lock_CD_Drive(char drive)
+{
+	assert (WinVersion.Is_WinNT());
+	HANDLE volume;
+	bool retval = false;
+
+	volume = Open_Removable_Volume(drive);
+
+	if (volume == INVALID_HANDLE_VALUE) return (false);
+
+	/*
+	** Lock the volume.
+	*/
+    if (Lock_Volume(volume)) {
+
+		/*
+		** Set prevent removal to false
+		*/
+		if (Prevent_Removal_Of_Volume(volume, true)) {
+			retval = true;
+		}
+	}
+
+	/*
+	** Close the volume so other processes can use the drive.
+	*/
+	Unlock_Volume(volume);
+	Close_Removable_Volume(volume);
+
+	return (true);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Unlock_CD_Drive -- Unlock the CD tray and allow ejection                    *
+ *                                                                                             *
+ * INPUT:    drive number                                                                      *
+ *                                                                                             *
+ * OUTPUT:   true if unlocked                                                                  *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 0:11AM ST : Created                                                               *
+ *=============================================================================================*/
+bool CDControlClass::Unlock_CD_Drive(char drive)
+{
+	assert (WinVersion.Is_WinNT());
+	HANDLE volume;
+	bool retval = false;
+
+	volume = Open_Removable_Volume(drive);
+
+	if (volume == INVALID_HANDLE_VALUE) return (false);
+
+	/*
+	** Lock the volume.
+	*/
+    if (Lock_Volume(volume)) {
+
+		/*
+		** Set prevent removal to false
+		*/
+		if (Prevent_Removal_Of_Volume(volume, false)) {
+			retval = true;
+		}
+	}
+
+	/*
+	** Close the volume so other processes can use the drive.
+	*/
+	Unlock_Volume(volume);
+	Close_Removable_Volume(volume);
+
+	return (true);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Eject_CD_Win95 -- Eject the cd in the given drive                           *
+ *                                                                                             *
+ * INPUT:    drive. 0=a etc.                                                                   *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 1:04AM ST : Created                                                               *
+ *=============================================================================================*/
+void CDControlClass::Eject_CD_Win95 (char drive)
+{
+	assert (WinVersion.Is_Win9x());
+	HANDLE vwin32 = INVALID_HANDLE_VALUE;
+
+	drive++;
+	vwin32 = Open_VWin32 ();
+	assert (vwin32 != INVALID_HANDLE_VALUE);
+
+	/*
+	** Make sure no other applications are using the drive.
+	*/
+	bool drive_locked = Lock_Logical_Volume (vwin32, drive, 0, 0);
+//	assert (drive_locked);
+	if (!drive_locked) {
+//		DebugString("Unable to lock volume %c:\n", 'A' + drive - 1);
+		Msg( __LINE__, TEXT(__FILE__), TEXT("Unable to lock volume %c: "), 'A' + drive - 1 );
+		return;
+	}
+
+	/*
+	** Make sure there is no software lock keeping the media in the drive.
+	*/
+	if (!Unlock_Volume_95 (vwin32, drive)) {
+//		DebugString("Could not unlock media from drive %c:\n", 'A' + drive - 1);
+		Msg( __LINE__, TEXT(__FILE__), TEXT("Could not unlock media from drive %c: "), 'A' + drive - 1 );
+		Unlock_Logical_Volume (vwin32, drive);
+		return;
+	}
+
+	/*
+	** Eject!
+	*/
+	if (!Auto_Eject_Volume_95 (vwin32, drive)) {
+//		DebugString("Could not eject media from drive %c:\n", 'A' + drive - 1);
+		Msg( __LINE__, TEXT(__FILE__), TEXT("Could not eject media from drive %c: "), 'A' + drive - 1 );
+	}
+
+	Unlock_Logical_Volume (vwin32, drive);
+	Close_VWin32 (vwin32);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Lock_CD_Drive_95 -- Prevent the user from ejecting the cd in the given drive*
+ *                                                                                             *
+ * INPUT:    drive. 0=a etc.                                                                   *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 1:04AM ST : Created                                                               *
+ *=============================================================================================*/
+bool CDControlClass::Lock_CD_Drive_95 (char drive)
+{
+//	DebugString ("CDControlClass::Lock_CD_Drive_95\n");
+	Msg( __LINE__, TEXT(__FILE__), TEXT("CDControlClass::Lock_CD_Drive_95." ));
+
+	bool retval = true;
+	assert (WinVersion.Is_Win9x());
+	HANDLE vwin32 = INVALID_HANDLE_VALUE;
+
+//	DebugString ("Preventing ejection on CD drive %c\n", drive + 'A');
+	Msg( __LINE__, TEXT(__FILE__), TEXT("Preventing ejection on CD drive %c: "), 'A' + drive -1 );
+
+	drive++;
+	vwin32 = Open_VWin32();
+	assert (vwin32 != INVALID_HANDLE_VALUE);
+
+	/*
+	** Make sure no other applications are using the drive.
+	*/
+//	DebugString ("About to lock logical volume to enable exclusive access\n");
+	Msg( __LINE__, TEXT(__FILE__), TEXT("About to lock logical volume to enable exclusive access." ));
+
+	bool drive_locked = Lock_Logical_Volume (vwin32, drive, 0, 0);
+//	assert (drive_locked);
+	if (!drive_locked) {
+//		DebugString("Unable to lock volume %c:\n", 'A' + drive - 1);
+		Msg( __LINE__, TEXT(__FILE__), TEXT("Unable to lock volume %c:"), 'A' + drive - 1 );
+		return(false);
+	}
+//	DebugString ("Volume locked OK\n");
+	Msg( __LINE__, TEXT(__FILE__), TEXT("Volume locked OK." ));
+
+	/*
+	** Lock the tray in the closed position.
+	*/
+//	DebugString ("About to prevent CD tray ejection\n");
+	Msg( __LINE__, TEXT(__FILE__), TEXT("About to prevent CD tray ejection." ));
+
+	if (!Lock_Volume_95 (vwin32, drive)) {
+//		DebugString("Could not lock CD tray in drive %c:\n", 'A' + drive - 1);
+		Msg( __LINE__, TEXT(__FILE__), TEXT("Could not lock CD tray in drive %c:"), 'A' + drive - 1 );
+		retval = false;
+	}else{
+//		DebugString ("CD tray ejection disabled OK\n");
+		Msg( __LINE__, TEXT(__FILE__), TEXT("CD tray ejection disabled OK." ));
+	}
+
+	Unlock_Logical_Volume (vwin32, drive);
+	Close_VWin32 (vwin32);
+
+//	DebugString ("CDControlClass::Lock_CD_Drive_95 returning %s\n", retval ? "true" : "false");
+	Msg( __LINE__, TEXT(__FILE__), TEXT("CDControlClass::Lock_CD_Drive_95 returning %s."), retval ? "true" : "false" );
+
+	return (retval);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Unlock_CD_Drive_95 -- Allow the user to eject the cd in the given drive     *
+ *                                                                                             *
+ * INPUT:    drive. 0=a etc.                                                                   *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 1:04AM ST : Created                                                               *
+ *=============================================================================================*/
+bool CDControlClass::Unlock_CD_Drive_95 (char drive)
+{
+//	DebugString ("CDControlClass::Unlock_CD_Drive_95\n");
+	Msg( __LINE__, TEXT(__FILE__), TEXT("CDControlClass::Unlock_CD_Drive_95 returning %s." ));
+
+	bool retval = true;
+	assert (WinVersion.Is_Win9x());
+	HANDLE vwin32 = INVALID_HANDLE_VALUE;
+
+//	DebugString ("Allowing ejection on CD drive %c\n", drive + 'A');
+	Msg( __LINE__, TEXT(__FILE__), TEXT("Allowing ejection on CD drive %c."), drive + 'A' - 1 );
+
+	drive++;
+	vwin32 = Open_VWin32();
+	assert (vwin32 != INVALID_HANDLE_VALUE);
+
+	/*
+	** Make sure no other applications are using the drive.
+	*/
+//	DebugString ("About to lock logical volume to enable exclusive access\n");
+	Msg( __LINE__, TEXT(__FILE__), TEXT("About to lock logical volume to enable exclusive access." ));
+
+	bool drive_locked = Lock_Logical_Volume (vwin32, drive, 0, 0);
+//	assert (drive_locked);
+	if (!drive_locked) {
+//		DebugString("Unable to lock volume %c:\n", 'A' + drive - 1);
+		Msg( __LINE__, TEXT(__FILE__), TEXT("Unable to lock volume %c:."), 'A' + drive - 1 );
+		return(false);
+	}
+//	DebugString ("Volume locked OK\n");
+	Msg( __LINE__, TEXT(__FILE__), TEXT("Volume locked OK." ));
+
+	/*
+	** Unlock the tray to allow ejection.
+	*/
+//	DebugString ("About to allow CD tray ejection\n");
+	Msg( __LINE__, TEXT(__FILE__), TEXT("About to allow CD tray ejection." ));
+
+	if (!Unlock_Volume_95 (vwin32, drive)) {
+//		DebugString("Could not unlock CD tray in drive %c:\n", 'A' + drive - 1);
+		Msg( __LINE__, TEXT(__FILE__), TEXT("Could not unlock CD tray in drive %c:"), 'A' + drive - 1 );
+		retval = false;
+	}else{
+//		DebugString ("CD tray ejection enabled OK\n");
+		Msg( __LINE__, TEXT(__FILE__), TEXT("CD tray ejection enabled OK." ));
+	}
+
+	Unlock_Logical_Volume (vwin32, drive);
+	Close_VWin32 (vwin32);
+
+//	DebugString ("CDControlClass::Unlock_CD_Drive_95 returning %s\n", retval ? "true" : "false");
+	Msg( __LINE__, TEXT(__FILE__), TEXT("CDControlClass::Unlock_CD_Drive_95 returning %s."), retval ? "true" : "false" );
+	return (retval);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Unlock_Volume_95 -- Unlocks removable media so that it can be ejected       *
+ *                                                                                             *
+ * INPUT:    Handle to VWIN32                                                                  *
+ *           drive to unlock (DOS format)                                                      *
+ *                                                                                             *
+ * OUTPUT:   true if unlocked                                                                  *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 0:19AM ST : Created                                                               *
+ *=============================================================================================*/
+bool CDControlClass::Unlock_Volume_95 (HANDLE vwin32, char drive)
+{
+	assert (WinVersion.Is_Win9x());
+	DIOC_REGISTERS regs = {0};
+	PARAMBLOCK     unlock_params = {0};
+	bool  result;
+	unsigned long cb;
+
+	/*
+	** First, check the lock status. This way, we'll know the number of pending locks we must unlock.
+	*/
+	unlock_params.bOperation = 2;   // return lock/unlock status
+
+	regs.reg_EAX = 0x440D;
+	regs.reg_EBX = drive;
+	regs.reg_ECX = MAKEWORD(0x48, 0x08);
+	regs.reg_EDX = (unsigned long)&unlock_params;
+
+	result = (DeviceIoControl (vwin32, VWIN32_DIOC_DOS_IOCTL, &regs, sizeof(regs), &regs, sizeof(regs), &cb, 0)) ? true : false;
+
+	if (result) {
+
+		/*
+		** DeviceIoControl succeeded. Now see if the unlock succeeded. It
+		** succeeded if the carry flag is not set, or if the carry flag is
+		** set but EAX is 0x01 or 0xB0.
+		**
+		** It failed if the carry flag is set and EAX is not 0x01 or 0xB0.
+		**
+		** If the carry flag is clear, then unlock succeeded. However, you
+		** don't need to set fResult because it is already TRUE when you get
+		** in here.
+		*/
+		if (regs.reg_Flags & CARRY_FLAG) {
+			result = (regs.reg_EAX == 0xB0) || (regs.reg_EAX == 0x01);
+		}
+
+	} else {
+//		DebugString ("DeviceIoControl failed to perform DOS IO control function. Error %d - %s\n", GetLastError(), Last_Error_Text());
+//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to perform DOS IO control function. Error %d - %s.", GetLastError(), Last_Error_Text() );
+		Last_Error_Text( TEXT("DeviceIoControl failed to perform DOS IO control function.."), GetLastError());
+	}
+
+	if (!result) return (false);
+
+	/*
+	** Now we have to unlock the media for every time it was locked. This gets us a lock count of
+	** 0 and totally unlocked media.
+	*/
+	for (int i = 0; i < unlock_params.bNumLocks; ++i) {
+		unlock_params.bOperation = 1;   // unlock the media
+		regs.reg_EAX = 0x440D;
+		regs.reg_EBX = drive;
+		regs.reg_ECX = MAKEWORD(0x48, 0x08);  // LOCK/UNLOCK
+		regs.reg_EDX = (unsigned long)&unlock_params;
+
+		result = (DeviceIoControl (vwin32, VWIN32_DIOC_DOS_IOCTL, &regs, sizeof(regs), &regs, sizeof(regs), &cb, 0)) ? true : false;
+		if (result == false) {
+//			DebugString ("DeviceIoControl failed to perform DOS IO control function. Error %d - %s\n", GetLastError(), Last_Error_Text());
+//			Msg( __LINE__, __FILE__, "DeviceIoControl failed to perform DOS IO control function. Error %d - %s.", GetLastError(), Last_Error_Text() );
+			Last_Error_Text( TEXT("DeviceIoControl failed to perform DOS IO control function.."), GetLastError());
+		}
+
+		/*
+		** See if DeviceIoControl and the lock succeeded
+		*/
+		result = result && !(regs.reg_Flags & CARRY_FLAG);
+		if (!result) break;
+	}
+	return (result);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Lock_Volume_95 -- Locks removable media so that it can't be ejected         *
+ *                                                                                             *
+ * INPUT:    Handle to VWIN32                                                                  *
+ *           drive to lock (DOS format)                                                        *
+ *                                                                                             *
+ * OUTPUT:   true if unlocked                                                                  *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 0:19AM ST : Created                                                               *
+ *=============================================================================================*/
+bool CDControlClass::Lock_Volume_95 (HANDLE vwin32, char drive)
+{
+	assert (WinVersion.Is_Win9x());
+	DIOC_REGISTERS regs = {0};
+	PARAMBLOCK     unlock_params = {0};
+	bool  result;
+	unsigned long cb;
+
+	/*
+	** Bring the lock count down to 0.
+	*/
+	Unlock_Volume_95(vwin32, drive);
+
+	/*
+	** Increment the lock count.
+	*/
+    unlock_params.bOperation = 0;   // lock the media
+    regs.reg_EAX = 0x440D;
+    regs.reg_EBX = drive;
+    regs.reg_ECX = MAKEWORD(0x48, 0x08);  // LOCK/UNLOCK
+    regs.reg_EDX = (unsigned long)&unlock_params;
+
+    result = (DeviceIoControl (vwin32, VWIN32_DIOC_DOS_IOCTL, &regs, sizeof(regs), &regs, sizeof(regs), &cb, 0)) ? true : false;
+	if (result == false) {
+//		DebugString ("DeviceIoControl failed to perform DOS IO control function. Error %d - %s\n", GetLastError(), Last_Error_Text());
+//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to perform DOS IO control function. Error %d - %s.", GetLastError(), Last_Error_Text() );
+		Last_Error_Text( TEXT("DeviceIoControl failed to perform DOS IO control function."), GetLastError());
+	}
+
+	/*
+	** See if DeviceIoControl and the lock succeeded
+	*/
+    result = result && !(regs.reg_Flags & CARRY_FLAG);
+	return (result);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Auto_Eject_Volume_95 -- Eject the specified CD drive                        *
+ *                                                                                             *
+ * INPUT:    Handle to VWIN32                                                                  *
+ *           Drive number (DOS format)                                                         *
+ *                                                                                             *
+ * OUTPUT:   True if ejected                                                                   *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 0:24AM ST : Created                                                               *
+ *=============================================================================================*/
+bool CDControlClass::Auto_Eject_Volume_95 (HANDLE vwin32, char drive)
+{
+	assert (WinVersion.Is_Win9x());
+	DIOC_REGISTERS regs = {0};
+	bool  result;
+	unsigned long cb;
+
+	regs.reg_EAX = 0x440D;
+	regs.reg_EBX = drive;
+	regs.reg_ECX = MAKEWORD(0x49, 0x08);		//EJECT
+
+	result = (DeviceIoControl (vwin32, VWIN32_DIOC_DOS_IOCTL, &regs, sizeof(regs), &regs, sizeof(regs), &cb, 0)) ? true : false;
+	if (result == false) {
+//		DebugString ("DeviceIoControl failed to perform DOS IO control function. Error %d - %s\n", GetLastError(), Last_Error_Text());
+//		Msg( __LINE__, __FILE__, "DeviceIoControl failed to perform DOS IO control function. Error %d - %s.", GetLastError(), Last_Error_Text() );
+		Last_Error_Text( TEXT("DeviceIoControl failed to perform DOS IO control function."), GetLastError());
+	}
+
+	/*
+	** See if we ejected OK
+	*/
+	result = result && !(regs.reg_Flags & CARRY_FLAG);
+
+	return (result);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Open_VWin32 -- Opens a handle to VWIN32 to issue low-level disk I/O         *
+ *                                                                                             *
+ * INPUT:    Nothing                                                                           *
+ *                                                                                             *
+ * OUTPUT:   HANDLE to VWin32                                                                  *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 0:26AM ST : Created                                                               *
+ *=============================================================================================*/
+HANDLE WINAPI CDControlClass::Open_VWin32 (void)
+{
+	assert (WinVersion.Is_Win9x());
+	HANDLE result = CreateFile ( TEXT("\\\\.\\vwin32"), 0, 0, NULL, 0, FILE_FLAG_DELETE_ON_CLOSE, NULL);
+	assert (result != INVALID_HANDLE_VALUE);
+	return (result);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Close_VWin32 -- Closes the handle opened by Open_VWin32.                    *
+ *                                                                                             *
+ * INPUT:    Handle to VWin32                                                                  *
+ *                                                                                             *
+ * OUTPUT:   Nothing                                                                           *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 0:26AM ST : Created                                                               *
+ *=============================================================================================*/
+bool WINAPI CDControlClass::Close_VWin32 (HANDLE vwin32)
+{
+	assert (WinVersion.Is_Win9x());
+	return ((CloseHandle (vwin32)) ? true : false);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Lock_Logical_Volume -- Take a lock on a logical volume                      *
+ *                                                                                             *
+ * INPUT:    Handle to VWin32                                                                  *
+ *           drive number (DOS format)                                                         *
+ *           lock level                                                                        *
+ *           permissions                                                                       *
+ *                                                                                             *
+ * OUTPUT:   true if locked                                                                    *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 0:33AM ST : Created                                                               *
+ *=============================================================================================*/
+bool WINAPI CDControlClass::Lock_Logical_Volume (HANDLE vwin32, char drive, char lock_level, short permissions)
+{
+	assert (WinVersion.Is_Win9x());
+	bool           result;
+	DIOC_REGISTERS regs = {0};
+	char           device_cat;  // can be either 0x48 or 0x08
+	unsigned long  cb;
+
+	/*
+	** lock_level
+	**    Can be 0, 1, 2, or 3. Level 0 is an exclusive lock that can only
+	**    be taken when there are no open files on the specified drive.
+	**    Levels 1 through 3 form a hierarchy where 1 must be taken before
+	**    2, which must be taken before 3.
+	**
+	** permissions
+	**    Specifies how the lock will affect file operations when lock levels
+	**    1 through 3 are taken. Also specifies whether a formatting lock
+	**    should be taken after a level 0 lock.
+	*/
+
+	/*
+	** Try first with device category 0x48 for FAT32 volumes. If it
+	** doesn't work, try again with device category 0x08. If that
+	** doesn't work, then the lock failed.
+	*/
+	device_cat = 0;
+
+	do {
+		if (device_cat == 0) {
+			device_cat = 0x48;
+		}else{
+			device_cat = 0x08;
+		}
+
+		/*
+		** Set up the parameters for the call.
+		*/
+		regs.reg_EAX = 0x440D;
+		regs.reg_EBX = MAKEWORD(drive, lock_level);
+		regs.reg_ECX = MAKEWORD(0x4A, device_cat);
+		regs.reg_EDX = permissions;
+
+		result = (DeviceIoControl (vwin32, VWIN32_DIOC_DOS_IOCTL, &regs, sizeof(regs), &regs, sizeof(regs), &cb, 0)) ? true : false;
+		if (result == false) {
+//			DebugString ("DeviceIoControl failed to perform DOS IO control function. Error %d - %s\n", GetLastError(), Last_Error_Text());
+//			Msg( __LINE__, __FILE__, "DeviceIoControl failed to perform DOS IO control function. Error %d - %s.", GetLastError(), Last_Error_Text() );
+			Last_Error_Text( TEXT("DeviceIoControl failed to perform DOS IO control function."), GetLastError());
+		}
+		result = result && !(regs.reg_Flags & CARRY_FLAG);
+
+	} while (result == false && device_cat != 0x08);
+
+	return (result);
+}
+
+/***********************************************************************************************
+ * CDControlClass::Unlock_Logical_Volume -- Unlocks a logical volume                           *
+ *                                                                                             *
+ * INPUT:    Handle to VWin32                                                                  *
+ *           drive number (DOS format)                                                         *
+ *                                                                                             *
+ * OUTPUT:   true if unlocked                                                                  *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ *  Must be called the same number of times as LockLogicalVolume() to                          *
+ *  completely unlock a volume.                                                                *
+ *                                                                                             *
+ *  Only the lock owner can unlock a volume.                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   2/17/99 0:39AM ST : Created                                                               *
+ *=============================================================================================*/
+bool WINAPI CDControlClass::Unlock_Logical_Volume (HANDLE vwin32, char drive)
+{
+	assert (WinVersion.Is_Win9x());
+	bool           result;
+	DIOC_REGISTERS regs = {0};
+	char           device_cat;  // can be either 0x48 or 0x08
+	unsigned long  cb;
+
+	/*
+	** Try first with device category 0x48 for FAT32 volumes. If it
+	** doesn't work, try again with device category 0x08. If that
+	** doesn't work, then the unlock failed.
+	*/
+	device_cat = 0;
+
+	do {
+		if (device_cat == 0) {
+			device_cat = 0x48;
+		}else{
+			device_cat = 0x08;
+		}
+
+		/*
+		** Set up the parameters for the call.
+		*/
+		regs.reg_EAX = 0x440D;
+		regs.reg_EBX = drive;
+		regs.reg_ECX = MAKEWORD(0x6A, device_cat);
+
+		result = (DeviceIoControl (vwin32, VWIN32_DIOC_DOS_IOCTL, &regs, sizeof(regs), &regs, sizeof(regs), &cb, 0)) ? true : false;
+		if (result == false) {
+//			DebugString ("DeviceIoControl failed to perform DOS IO control function. Error %d - %s\n", GetLastError(), Last_Error_Text());
+//			Msg( __LINE__, __FILE__, "DeviceIoControl failed to perform DOS IO control function. Error %d - %s.", GetLastError(), Last_Error_Text());
+			Last_Error_Text( TEXT("DeviceIoControl failed to perform DOS IO control function."), GetLastError());
+		}
+		result = result && !(regs.reg_Flags & CARRY_FLAG);
+
+	} while (result == false && device_cat != 0x08);
+
+	return (result);
+}
+
+/************************************************************************************************
+ * Last_Error_Text -- Display error messages based on FormatMessage() and GetLastError().		*
+ *																								*
+ * INPUT:    LPSTR - title.																		*
+ *           HRESULT - last error message.														*
+ *																								*
+ * OUTPUT:   None																				*
+ *																								*
+ * WARNINGS: None																				*
+ *																								*
+ * HISTORY:																						*
+ *   6/24/99 4:44PM MML : Created																*
+ *==============================================================================================*/
+
+void Last_Error_Text ( LPCTSTR szPrefix, HRESULT hr )
+{
+	LPVOID		szMessage;
+	char		szDisplay[1000];
+
+	if ( hr == S_OK ) {
+		_stprintf( szDisplay, TEXT("%s"), szPrefix );
+//		MessageBox( NULL, szDisplay, TEXT("Msg"),0 );
+		return;
+	}
+
+	if ( HRESULT_FACILITY( hr ) == FACILITY_WIN32 ) {
+		hr = HRESULT_CODE( hr );
+	}
+	FormatMessage(
+			FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+			NULL,
+			hr,
+			MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ),
+			(LPTSTR)&szMessage,
+			0,
+			NULL );
+
+	_stprintf( szDisplay, TEXT( "%s: %s(%lx)" ), szPrefix, szMessage, hr );
+
+	Msg( __LINE__, TEXT(__FILE__), TEXT("GetLastError: %s"), szDisplay );
+//	MessageBox( NULL, szDisplay, TEXT( "GetLastError" ), MB_OK );
+
+	LocalFree( szMessage );
+
+}
+
+
+
+
diff --git a/Core/Tools/Autorun/CDCNTRL.h b/Core/Tools/Autorun/CDCNTRL.h
new file mode 100644
index 00000000000..7759d49a2d0
--- /dev/null
+++ b/Core/Tools/Autorun/CDCNTRL.h
@@ -0,0 +1,146 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Renegade Setup/Autorun/CDCNTRL.h                           $*
+ *                                                                                             *
+ *                      $Author:: Maria_l                                                     $*
+ *                                                                                             *
+ *                     $Modtime:: 4/20/01 2:07p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+//#include	"always.h"
+//#include	<winmin.h>
+#define  STRICT
+#include <windows.h>
+#include <windowsx.h>
+#include	<ctype.h>
+
+
+
+class CDControlClass {
+
+	public:
+		CDControlClass(void);
+		~CDControlClass(void);
+
+		/*
+		** Force the CD tray to open on the specified drive.
+		*/
+		void Force_CD_Eject(int drive);
+
+		/*
+		** Prevent the user from ejecting the CD in the specified drive.
+		*/
+		bool Lock_CD_Tray(int drive);
+
+		/*
+		** Allow the user to eject the CD in the specified drive.
+		*/
+		bool Unlock_CD_Tray(int drive);
+
+
+	private:
+		/*
+		** NT functions.
+		*/
+		bool Eject_CD(char drive);
+		HANDLE Open_Removable_Volume(char drive);
+		bool Lock_Volume(HANDLE volume);
+		bool Unlock_Volume(HANDLE volume);
+		bool Dismount_Volume(HANDLE volume);
+		bool Prevent_Removal_Of_Volume(HANDLE volume, bool prevent);
+		bool Auto_Eject_Volume(HANDLE volume);
+		bool Close_Removable_Volume(HANDLE volume);
+		bool Lock_CD_Drive(char drive);
+		bool Unlock_CD_Drive(char drive);
+
+		/*
+		** Win9x functions.
+		*/
+		HANDLE WINAPI Open_VWin32 (void);
+		bool WINAPI Close_VWin32 (HANDLE vwin32);
+		bool WINAPI Unlock_Logical_Volume (HANDLE vwin32, char drive);
+		bool WINAPI Lock_Logical_Volume (HANDLE vwin32, char drive, char lock_level, short permissions);
+		bool Lock_Volume_95 (HANDLE vwin32, char drive);
+		bool Unlock_Volume_95 (HANDLE vwin32, char drive);
+		bool Auto_Eject_Volume_95 (HANDLE vwin32, char drive);
+		void Eject_CD_Win95 (char drive);
+		bool Lock_CD_Drive_95(char drive);
+		bool Unlock_CD_Drive_95(char drive);
+
+};
+
+extern CDControlClass CDControl;
+
+
+#define LOCK_TIMEOUT        2000		// 2 Seconds
+#define LOCK_RETRIES        2			// 2 times
+
+/*
+** Low level structures for Win9x.
+**
+** DeviceIoControl infrastructure
+*/
+#if !defined (VWIN32_DIOC_DOS_IOCTL)
+#define VWIN32_DIOC_DOS_IOCTL      1
+
+typedef struct _DIOC_REGISTERS {
+    DWORD reg_EBX;
+    DWORD reg_EDX;
+    DWORD reg_ECX;
+    DWORD reg_EAX;
+    DWORD reg_EDI;
+    DWORD reg_ESI;
+    DWORD reg_Flags;
+} DIOC_REGISTERS, *PDIOC_REGISTERS;
+
+#endif
+
+/*
+** Intel x86 processor status flags
+*/
+#define CARRY_FLAG             0x0001
+
+/*
+** DOS IOCTL function support
+*/
+
+#pragma pack(1)
+
+/*
+** Parameters for locking/unlocking removable media
+*/
+typedef struct _PARAMBLOCK {
+   BYTE bOperation;
+   BYTE bNumLocks;
+} PARAMBLOCK, *PPARAMBLOCK;
+
+#pragma pack()
diff --git a/Core/Tools/Autorun/CMakeLists.txt b/Core/Tools/Autorun/CMakeLists.txt
index bf3dddcfb09..ad06ebd5f99 100644
--- a/Core/Tools/Autorun/CMakeLists.txt
+++ b/Core/Tools/Autorun/CMakeLists.txt
@@ -1,23 +1,23 @@
 set(AUTORUN_SRC
-    "ARGS.CPP"
-    "ARGS.H"
+    "ARGS.cpp"
+    "ARGS.h"
     "autorun.cpp"
     "autorun.h"
     "CallbackHook.h"
-    "CDCNTRL.CPP"
-    "CDCNTRL.H"
+    "CDCNTRL.cpp"
+    "CDCNTRL.h"
     "DrawButton.cpp"
     "DrawButton.h"
     "EZGIMEX.cpp"
     "GameText.cpp"
     "GameText.h"
-    "GETCD.CPP"
+    "GETCD.cpp"
     "GetCD.h"
     "gimex.h"
     "IGR.cpp"
     "IGR.h"
     "Jsupport.cpp"
-    "JSUPPORT.H"
+    "JSUPPORT.h"
     "leanAndMeanAutorun.h"
     "Locale_API.cpp"
     "Locale_API.h"
@@ -32,8 +32,8 @@ set(AUTORUN_SRC
     "Utils.h"
     "ViewHTML.cpp"
     "ViewHTML.h"
-    "WinFix.CPP"
-    "WinFix.H"
+    "WinFix.cpp"
+    "WinFix.h"
     "Wnd_file.cpp"
     "Wnd_File.h"
     "WSYS_File.cpp"
diff --git a/Core/Tools/Autorun/CallbackHook.h b/Core/Tools/Autorun/CallbackHook.h
index 4d03710c603..1bbaac4a920 100644
--- a/Core/Tools/Autorun/CallbackHook.h
+++ b/Core/Tools/Autorun/CallbackHook.h
@@ -33,8 +33,7 @@
 *
 ******************************************************************************/
 
-#ifndef CALLBACKHOOK_H
-#define CALLBACKHOOK_H
+#pragma once
 
 class CallbackHook
 	{
@@ -44,7 +43,7 @@ class CallbackHook
 
 		virtual ~CallbackHook()
 			{}
-		
+
 		virtual bool DoCallback(void) const
 			{return false;}
 
@@ -81,5 +80,3 @@ template<class T> class Callback : public CallbackHook
 		bool (*mCallback)(T);
 		T mUserData;
 	};
-
-#endif // CALLBACKHOOK_H
diff --git a/Core/Tools/Autorun/DrawButton.cpp b/Core/Tools/Autorun/DrawButton.cpp
index c239192b6d6..edd7009682f 100644
--- a/Core/Tools/Autorun/DrawButton.cpp
+++ b/Core/Tools/Autorun/DrawButton.cpp
@@ -22,9 +22,9 @@
  *																			  *
  *                  Project Name : Autorun									  *
  *																			  *
- *                     File Name : AUTORUN.CPP								  *
+ *                     File Name : AUTORUN.cpp								  *
  *																			  *
- *                    Programmers: Maria del Mar McCready Legg				  * 
+ *                    Programmers: Maria del Mar McCready Legg				  *
  *																			  *
  *                    Start Date : September 5, 1997						  *
  *																			  *
@@ -55,7 +55,7 @@
 
 #ifndef LEAN_AND_MEAN
 ///////GAMEENGINE HEADERS////////////
-#include "Common/UnicodeString.h" 
+#include "Common/UnicodeString.h"
 #include "Common/SubsystemInterface.h"
 #include "GameClient/GameText.h"
 #endif
@@ -63,7 +63,7 @@
 
 //*****************************************************************************
 //  DrawButton::DrawButton -- Constructor for custom "Button" type.
-// 
+//
 // 	This custom button is drawn by the dialog, and uses the WM_MOUSEMOVE,
 //	WM_LBUTTONUP, and WM_LBUTTONDOWN to trigger actions.
 //
@@ -80,8 +80,8 @@
 //
 //  WARNINGS:	No keyboard/mouse/paint handling built in.  Do manually.
 //
-//  HISTORY:                                                                
-//      07/15/1996  MML : Created.                                            
+//  HISTORY:
+//      07/15/1996  MML : Created.
 //=============================================================================
 
 DrawButton::DrawButton ( int id, RECT button_rect, const char *normal, const char *focus, const char *pressed, const char * string, TTFontClass *fontptr )
@@ -105,7 +105,7 @@ DrawButton::DrawButton ( int id, RECT button_rect, const char *normal, const cha
 	TextRect.Y	 	= button_rect.top;
 	TextRect.Width	= rect.right  - rect.left;
 	TextRect.Height	= rect.bottom - rect.top;
-	
+
 	StretchedWidth 	= rect.right  - rect.left;
 	StretchedHeight	= rect.bottom - rect.top;
 
@@ -201,7 +201,7 @@ DrawButton::DrawButton ( int id, RECT button_rect, const char *normal, const cha
 	_tcscpy( NormalBitmap, normal );
 	_tcscpy( PressedBitmap, pressed );
 	_tcscpy( FocusBitmap, focus );
-	
+
 	if( NormalBitmap[0] != '\0' ) {
 		UseBitmaps = true;							// determines how to draw button.
 	}
@@ -217,15 +217,15 @@ DrawButton::DrawButton ( int id, RECT button_rect, const char *normal, const cha
 
 //*****************************************************************************
 // DrawButton::Draw_Text -- Check if mouse values are in button area.
-// 
+//
 // INPUT: 		HDC hDC -- DC to paint to.
 //
 //	OUTPUT:    	none.
 //
-// WARNINGS:	
+// WARNINGS:
 //
-// HISTORY:                                                                
-//   01/18/2002  MML : Created.                                            
+// HISTORY:
+//   01/18/2002  MML : Created.
 //=============================================================================
 
 void DrawButton::Draw_Text ( HDC hDC )
@@ -246,34 +246,34 @@ void DrawButton::Draw_Text ( HDC hDC )
 	*/
 //	SetTextColor( hDC, RGB( 0, 240, 0 ));
 //	DrawFocusRect(	hDC, &dst_rect );
-			
+
 	if ( Get_State() == DrawButton::PRESSED_STATE ) {
-		MyFontPtr->Print( 
-			hDC, 
-			String, 
-			rect, 
-			TEXT_PRESSED_COLOR, 
-			TEXT_PRESSED_SHADOW_COLOR, 
+		MyFontPtr->Print(
+			hDC,
+			String,
+			rect,
+			TEXT_PRESSED_COLOR,
+			TEXT_PRESSED_SHADOW_COLOR,
 			TPF_BUTTON,
 			TPF_SHADOW );
 
 	} else if ( Get_State() == DrawButton::FOCUS_STATE ) {
-		MyFontPtr->Print( 
-			hDC, 
-			String, 
-			rect, 
-			TEXT_FOCUSED_COLOR, 
-			TEXT_FOCUSED_SHADOW_COLOR, 
+		MyFontPtr->Print(
+			hDC,
+			String,
+			rect,
+			TEXT_FOCUSED_COLOR,
+			TEXT_FOCUSED_SHADOW_COLOR,
 			TPF_BUTTON,
 			TPF_SHADOW );
 
 	} else {
-		MyFontPtr->Print( 
-			hDC, 
-			String, 
-			rect, 
-			TEXT_NORMAL_COLOR,	
-			TEXT_NORMAL_SHADOW_COLOR, 
+		MyFontPtr->Print(
+			hDC,
+			String,
+			rect,
+			TEXT_NORMAL_COLOR,
+			TEXT_NORMAL_SHADOW_COLOR,
 			TPF_BUTTON,
 			TPF_SHADOW );
 	}
@@ -282,7 +282,7 @@ void DrawButton::Draw_Text ( HDC hDC )
 
 //*****************************************************************************
 // DrawButton::Is_Mouse_In_Region -- Check if mouse values are in button area.
-// 
+//
 // INPUT: 		int mouse_x  -- mouse x position
 //				int mouse_y  -- mouse y position
 //
@@ -291,8 +291,8 @@ void DrawButton::Draw_Text ( HDC hDC )
 // WARNINGS:	No keyboard/mouse/paint handling built in.  Do manually.
 //				Note: width is shortened below to accomodate actual bitmap area.
 //
-// HISTORY:                                                                
-//   07/15/1996  MML : Created.                                            
+// HISTORY:
+//   07/15/1996  MML : Created.
 //=============================================================================
 
 bool DrawButton::Is_Mouse_In_Region ( int mouse_x, int mouse_y )
@@ -301,9 +301,9 @@ bool DrawButton::Is_Mouse_In_Region ( int mouse_x, int mouse_y )
 		return( false );
 	}
 
-	if (( mouse_x >= rect.left )	&& 
+	if (( mouse_x >= rect.left )	&&
 		( mouse_y >= rect.top )		&&
-		( mouse_x <= rect.left + StretchedWidth ) && 
+		( mouse_x <= rect.left + StretchedWidth ) &&
 		( mouse_y <= rect.top  + StretchedHeight )) {
 		return ( TRUE );
 	}
@@ -311,18 +311,18 @@ bool DrawButton::Is_Mouse_In_Region ( int mouse_x, int mouse_y )
 }
 
 //*****************************************************************************
-// DrawButton::Return_Bitmap 
+// DrawButton::Return_Bitmap
 //
 //	    Return name of correct bitmap based on state of button.
-// 
+//
 // INPUT:  		none.
 //
 // OUTPUT: 		char *bitmap -- name of bitmap file.
 //
 // WARNINGS:	No keyboard/mouse/paint handling built in.  Do manually.
 //
-// HISTORY:                                                                
-//   07/15/1996  MML : Created.                                            
+// HISTORY:
+//   07/15/1996  MML : Created.
 //=============================================================================
 
 char *DrawButton::Return_Bitmap ( void )
@@ -338,15 +338,15 @@ char *DrawButton::Return_Bitmap ( void )
 
 //*****************************************************************************
 // DrawButton::Return_Area -- Return x, y and width and height of button.
-// 
+//
 // INPUT:  		RECT area -- holds the x,y,width,height information.
 //
 // OUTPUT: 		none.
 //
 // WARNINGS:	No keyboard/mouse/paint handling built in.  Do manually.
 //
-// HISTORY:                                                                
-//   07/15/1996  MML : Created.                                            
+// HISTORY:
+//   07/15/1996  MML : Created.
 //=============================================================================
 
 void DrawButton::Return_Area ( RECT *area )
@@ -376,14 +376,14 @@ void DrawButton::Return_Text_Area ( Rect *area )
 
 //*****************************************************************************
 // DrawButton::Set_Stretched_Width -- Set draw width of button.
-// 
+//
 // INPUT:  		int value -- destination width size.
 //
 //OUTPUT: 		none.
 //
 // WARNINGS:	none.
 //
-// HISTORY:    08/12/1996  MML : Created.                                            
+// HISTORY:    08/12/1996  MML : Created.
 //=============================================================================
 
 int DrawButton::Set_Stretched_Width	 ( int value )
@@ -396,14 +396,14 @@ int DrawButton::Set_Stretched_Width	 ( int value )
 
 //*****************************************************************************
 // DrawButton::Set_Stretched_Height -- Set draw height of button.
-// 
+//
 // INPUT:  		int value -- destination height size.
 //
 // OUTPUT: 		none.
 //
 // WARNINGS:	none.
 //
-// HISTORY:    08/12/1996  MML : Created.                                            
+// HISTORY:    08/12/1996  MML : Created.
 //=============================================================================
 
 int DrawButton::Set_Stretched_Height ( int value )
diff --git a/Core/Tools/Autorun/DrawButton.h b/Core/Tools/Autorun/DrawButton.h
index 3781963607e..582b4917a47 100644
--- a/Core/Tools/Autorun/DrawButton.h
+++ b/Core/Tools/Autorun/DrawButton.h
@@ -22,7 +22,7 @@
  *																		*
  *			Project Name : DrawButton                  					*
  *																		*
- *			   File Name : DRAWBUTTON.H									*
+ *			   File Name : DRAWBUTTON.h									*
  *																		*
  *            Programmer : Maria del Mar McCready Legg					*
  *																		*
@@ -31,8 +31,7 @@
  * 	         Last Update : October 5, 2000   [MML]            			*
  *----------------------------------------------------------------------*/
 
-#ifndef  DRAWBUTTONS_H
-#define  DRAWBUTTONS_H
+#pragma once
 
 #include <tchar.h>
 #include <stdlib.h>
@@ -45,7 +44,7 @@
 class DrawButton
 {
 	public:
-   
+
 		enum BUTTON_STATE {
    			NORMAL_STATE = 0,
 	      	PRESSED_STATE,
@@ -79,8 +78,8 @@ class DrawButton
 		TTFontClass		*Return_Font_Ptr		( void )						{ return( MyFontPtr ); };
 		wchar_t			*Return_Text			( void )						{ return( String ); };
 		void	 		Set_State				( BUTTON_STATE state )			{ ButtonState = state; };
-		int				Set_Stretched_Width		( int  );      
-		int				Set_Stretched_Height	( int  );      
+		int				Set_Stretched_Width		( int  );
+		int				Set_Stretched_Height	( int  );
 
 	protected:
 
@@ -99,10 +98,3 @@ class DrawButton
 		char		PressedBitmap[ _MAX_FNAME ];
 		char		FocusBitmap  [ _MAX_FNAME ];
 };
-
-
-
-
-
-
-#endif				
diff --git a/Core/Tools/Autorun/GETCD.CPP b/Core/Tools/Autorun/GETCD.CPP
deleted file mode 100644
index 71792aa3c97..00000000000
--- a/Core/Tools/Autorun/GETCD.CPP
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/****************************************************************************
- *****	C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S	*****
- ****************************************************************************
- *                 Project Name:: Command & Conquer							*
- *                     $Archive:: /Renegade Setup/Autorun/GETCD.CPP              $Author:: Steve_t									*
- *                     $Modtime:: 1/28/02 10:54a                  $Revision:: 20										*
- *--------------------------------------------------------------------------*
- * Functions:																*
- *		GetCDClass::GetCDClass	--	default constructor						*
- *		GetCDClass::~GetCDClass	--	destructor								*
- *		GetCDClass::GetCDDrive	--	returns the logical CD drive			*
- *		CD_Volume_Verification	--	Check label of the CDRom.				*
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
-
-#include	<windows.h>
-#include	<string.h>
-//#include	"always.h"
-#include	"GetCD.h"
-//#include	"timer.h"
-#include	"Wnd_File.h"
-//#include	"missiondisk.h"
-#include	"WinFix.H"
-
-#ifndef ROR_NOT_READY
-#define ROR_NOT_READY		21
-#endif
-
-/**********************************************************************
-**	This macro serves as a general way to determine the number of elements
-**	within an array.
-*/
-#define	ARRAY_SIZE(x)		int(sizeof(x)/sizeof(x[0]))
-#define	size_of(typ,id)		sizeof(((typ*)0)->id)
-
-//-----------------------------------------------------------------------------
-// Global Variables
-//-----------------------------------------------------------------------------
-#if ( MISSION_DISK )
-
-static const char * _CD_Volume_Label[] = {
-	"Renegade Mission",		// Yuri's Revenge (mission disk)
-};
-
-#else
-
-static const char * _CD_Volume_Label[] = {
-	"Renegade Game",		// Red Alert 2
-	"Renegade Data",		// Red Alert 2
-};
-
-#endif
-
-
-static int _Num_Volumes = ARRAY_SIZE( _CD_Volume_Label );
-
-GetCDClass	CDList;
-
-
-/****************************************************************************
- * GetCDClass -- default constructor										*
- *																			*
- * INPUT:																	*
- *			none 															*
- * OUTPUT:																	*
- *			none															*
- * WARNINGS:																*
- *																			*
- * HISTORY:																	*
- *   05/26/1994 SW	:	Created.											*
- *   12/04/1995 ST	:	fixed for Win95										*
- *==========================================================================*/
-GetCDClass::GetCDClass( void )
-{
-	char path[]={ "a:\\" };
-
-	CDCount = 0;
-	CDIndex = 0;
-
-	Msg( __LINE__, __FILE__, "GetCDClass constructor\n" );
-
-	/*--------------------------------------------------------------------------
-	** Set all CD drive placeholders to empty
-	*/
-	for( int j = 0; j < MAX_CD_DRIVES; j++ ) {
-		CDDrives[j] = NO_CD_DRIVE;
-	}
-
-	for( char i = 'c'; i <= 'z'; i++ ) {
-
-		path[0] = i;
-
-		if ( GetDriveType( path ) == DRIVE_CDROM ) {
-			CDDrives[ CDCount++ ] = (int)( i-'a' );
-			Msg( __LINE__, __FILE__, "CD drive found - %c:\n", i +'A'-'a' );
-		}
-	}
-
-	/*--------------------------------------------------------------------------
-	**	Catch the case when there are NO CD-ROM drives available
-	*/
-	if ( CDCount == 0 ) {
-		for ( char i = 'a'; i <= 'b'; i++ ) {
-			path[0] = i;
-			if ( GetDriveType( path ) == DRIVE_CDROM ) {
-				CDDrives[ CDCount++ ] = (int)( i-'a' );
-			}
-		}
-	}
-	if ( CDCount == 0 ) {
-		Msg( __LINE__, __FILE__, "No CD drives found\n");
-	}
-}
-
-/********************************************************************************
- * GetCDClass -- destructor														*
- *																				*
- * INPUT:		none															*
- *																				*
- * OUTPUT:		none															*
- *																				*
- * WARNINGS:																	*
- *																				*
- * HISTORY:																		*
- *   05/26/1994 SW: Created.													*
- *   12/4/95    ST: fixed for Win95												*
- *==============================================================================*/
-GetCDClass::~GetCDClass(void)
-{
-//	if(cdDrive_addrp.seg)
-//		DPMI_real_free(cdDrive_addrp);		// free up those conventional buffers
-}
-
-/********************************************************************************
- * GetCDClass -- Get_CD_Drive_For_This_Volume									*
- *																				*
- * INPUT:		char *volume_name												*
- *																				*
- * OUTPUT:		int																*
- *																				*
- * WARNINGS:																	*
- *																				*
- * HISTORY:																		*
- *   10/18/2000 MML: Created.													*
- *==============================================================================*/
-
-int	GetCDClass::Get_CD_Drive_For_This_Volume ( const char *volume_label )
-{
-	char		volume_name[128] = "";
-	int			count = 0;
-	char		buffer[128];
-	unsigned	misc_dword;
-	unsigned	filename_length;
-	int			cd_drive;
-
-	CDIndex = 0;
-
-	while( CDIndex < CDCount ) {
-
-		//---------------------------------------------------------------------
-		// NOTE: A=0, B=1, C=2, D=3, etc...
-		//---------------------------------------------------------------------
-		cd_drive = CDDrives[ CDIndex++ ];
-		wsprintf( buffer, "%c:\\", 'A' + cd_drive );
-
-		if ( GetVolumeInformation(
-				(char const *)buffer,
-				&volume_name[0],
-				(unsigned long)sizeof(volume_name)-1,
-				(unsigned long *)NULL,
-				(unsigned long *)&filename_length,
-				(unsigned long *)&misc_dword,
-				(char *)NULL,
-				(unsigned long)0 )) {
-
-			//---------------------------------------------------------------------
-			// Windows '95 appears to have a volume name limit of 11 characters. 
-			// I cannot find a Win32 call that will return the maximum volume name 
-			// length so the value '11' is hard-coded here and the assumption made 
-			// that all OS's have this length or better.
-			//---------------------------------------------------------------------
-			if( WinVersion.Is_Win95()) {
-				volume_name[11] = '\0';
-			}
-
-			if ( !_stricmp( volume_label, volume_name )) {
-				return( cd_drive );
-			}
-
-		} else {
-
-#if RTS_DEBUG
-			LPVOID lpMsgBuf;
-			FormatMessage( 
-				FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-				FORMAT_MESSAGE_FROM_SYSTEM | 
-				FORMAT_MESSAGE_IGNORE_INSERTS,
-				NULL,
-				GetLastError(),
-				MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-				(LPTSTR) &lpMsgBuf,
-				0,
-				NULL 
-			);
-			Msg( __LINE__, __FILE__, (LPTSTR)lpMsgBuf );
-			LocalFree( lpMsgBuf );
-#endif
-
-		}
-	}
-	return( Get_First_CD_Drive());
-}
-
-/********************************************************************************
- * GetCDClass -- Get_Volume_Label												*
- *																				*
- * INPUT:		int  index														*
- *																				*
- * OUTPUT:		char *															*
- *																				*
- * WARNINGS:																	*
- *																				*
- * HISTORY:																		*
- *   10/31/2000 MML: Created.	* Happy Halloween! *							*
- *==============================================================================*/
-
-const char * GetCDClass::Get_Volume_Label	( int index )
-{
-	if( index >= 0 && index < _Num_Volumes ) {
-		return( _CD_Volume_Label[ index ]);
-	}
-	return( _CD_Volume_Label[0]);
-}
-
-/********************************************************************************
- * GetCDClass -- Get_Volume_For_This_CD_Drive									*
- *																				*
- * INPUT:		char *volume_name												*
- *				char *path														*
- *																				*
- * OUTPUT:		int																*
- *																				*
- * WARNINGS:																	*
- *																				*
- * HISTORY:																		*
- *   10/31/2000 MML: Created.	* Happy Halloween! *							*
- *==============================================================================*/
-
-const char *GetCDClass::Get_Volume_For_This_CD_Drive ( const char *path, char *volume_name )
-{
-	char			buffer[128];
-	unsigned		misc_dword;
-	unsigned		filename_length;
-	static char		volume_label[ MAX_PATH ] = "";	// [OYO] add static
-
-	if ( path == NULL || volume_name == NULL ) {
-		return( NULL );
-	}
-
-	memset( volume_name, '\0', sizeof( volume_name ));
-	wsprintf( buffer, "%c:\\", path[0] );
-
-	if ( GetVolumeInformation(
-			(char const *)buffer,
-			&volume_label[0],
-			(unsigned long)sizeof(volume_label)-1,
-			(unsigned long *)NULL,
-			(unsigned long *)&filename_length,
-			(unsigned long *)&misc_dword,
-			(char *)NULL,
-			(unsigned long)0 )) {
-
-		strcpy( volume_name, volume_label );
-
-	} else {
-
-		LPVOID lpMsgBuf;
-		FormatMessage( 
-		    FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-		    FORMAT_MESSAGE_FROM_SYSTEM | 
-		    FORMAT_MESSAGE_IGNORE_INSERTS,
-		    NULL,
-		    GetLastError(),
-		    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-		    (LPTSTR) &lpMsgBuf,
-		    0,
-		    NULL 
-		);
-		Msg( __LINE__, __FILE__, (LPTSTR)lpMsgBuf );
-		LocalFree( lpMsgBuf );
-
-		strcpy( volume_name, _CD_Volume_Label[0] );
-	}
-
-	//-------------------------------------------------------------------------
-	// Windows '95 appears to have a volume name limit of 11 characters. 
-	// I cannot find a Win32 call that will return the maximum volume name 
-	// length so the value '11' is hard-coded here and the assumption made 
-	// that all OS's have this length or better.
-	//-------------------------------------------------------------------------
-	bool winversion = WinVersion.Is_Win95();
-
-	if( winversion ) {
-		volume_name[11] = '\0';
-	}
-
-	return( volume_name );
-}
-
-/********************************************************************************
- * CD_VOLUME_VERIFICATION -- Check volume label of the CD in the given drive.	*
- *																				*
- * INPUT:		int drive_number												*
- *	  			char *lable														*
- *																				*
- * OUTPUT:		TRUE/FALSE														*
- *																				*
- * WARNINGS:	None															*
- *																				*
- * HISTORY:																		*
- *    01/11/99 4:20PM MML : Created												*
- *==============================================================================*/
-
-bool CD_Volume_Verification ( int cd_drive, char *volume_label, char *volume_to_find )
-{
-	char		volume_name[128] = "";
-	int			count = 0;
-	char		buffer[128];
-	unsigned	misc_dword;
-	unsigned	filename_length;
-
-	/***************************************************************************
-	** Get the volume label. If we get a 'not ready' error then retry for the 
-	** timeout period.
-	*/
-	for (;;) {
-
-		//---------------------------------------------------------------------
-		// NOTE: A=0, B=1, C=2, D=3, etc...
-		//---------------------------------------------------------------------
-		wsprintf( buffer, "%c:\\", 'A' + cd_drive );
-
-		if ( GetVolumeInformation(
-				(char const *)buffer,
-				&volume_name[0],
-				(unsigned long)sizeof(volume_name)-1,
-				(unsigned long *)NULL,
-				(unsigned long *)&filename_length,
-				(unsigned long *)&misc_dword,
-				(char *)NULL,
-				(unsigned long)0 )) {
-
-			/******************************************************************
-			** Match the volume label to the list of known volume labels.
-			*/
-
-			//---------------------------------------------------------------------
-			// Windows '95 appears to have a volume name limit of 11 characters. 
-			// I cannot find a Win32 call that will return the maximum volume name 
-			// length so the value '11' is hard-coded here and the assumption made 
-			// that all OS's have this length or better.
-			//---------------------------------------------------------------------
-			if( WinVersion.Is_Win95()) {
-				volume_name[11] = '\0';
-			}
-
-			if ( volume_label != NULL ) {
-				strncpy( volume_label, volume_name, 128 );
-			}
-
-			if ( !_stricmp( volume_to_find, volume_name )) {
-				return TRUE;
-			}
-
-			if ( !count ) {
-				count++;
-			} else {
-				return FALSE;
-			} 
-
-		} else {
-
-			/*********************************************************************
-			** Failed to get the volume label on a known CD drive.  If this is a
-			** CD changer it may require time to swap the disks so don't return
-			** immediately if the error is ROR_NOT_READY
-			*/
-			return FALSE;
-		}
-	}
-}
-
-
-
-
-/* ==================================================================== */
-
diff --git a/Core/Tools/Autorun/GETCD.cpp b/Core/Tools/Autorun/GETCD.cpp
new file mode 100644
index 00000000000..fa8df05e26b
--- /dev/null
+++ b/Core/Tools/Autorun/GETCD.cpp
@@ -0,0 +1,414 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/****************************************************************************
+ *****	C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S	*****
+ ****************************************************************************
+ *                 Project Name:: Command & Conquer							*
+ *                     $Archive:: /Renegade Setup/Autorun/GETCD.cpp              $Author:: Steve_t									*
+ *                     $Modtime:: 1/28/02 10:54a                  $Revision:: 20										*
+ *--------------------------------------------------------------------------*
+ * Functions:																*
+ *		GetCDClass::GetCDClass	--	default constructor						*
+ *		GetCDClass::~GetCDClass	--	destructor								*
+ *		GetCDClass::GetCDDrive	--	returns the logical CD drive			*
+ *		CD_Volume_Verification	--	Check label of the CDRom.				*
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
+
+#include	<windows.h>
+#include	<string.h>
+//#include	"always.h"
+#include	"GetCD.h"
+//#include	"timer.h"
+#include	"Wnd_File.h"
+//#include	"missiondisk.h"
+#include	"WinFix.h"
+
+#ifndef ROR_NOT_READY
+#define ROR_NOT_READY		21
+#endif
+
+/**********************************************************************
+**	This macro serves as a general way to determine the number of elements
+**	within an array.
+*/
+#define	ARRAY_SIZE(x)		int(sizeof(x)/sizeof(x[0]))
+#define	size_of(typ,id)		sizeof(((typ*)0)->id)
+
+//-----------------------------------------------------------------------------
+// Global Variables
+//-----------------------------------------------------------------------------
+#if ( MISSION_DISK )
+
+static const char * _CD_Volume_Label[] = {
+	"Renegade Mission",		// Yuri's Revenge (mission disk)
+};
+
+#else
+
+static const char * _CD_Volume_Label[] = {
+	"Renegade Game",		// Red Alert 2
+	"Renegade Data",		// Red Alert 2
+};
+
+#endif
+
+
+static int _Num_Volumes = ARRAY_SIZE( _CD_Volume_Label );
+
+GetCDClass	CDList;
+
+
+/****************************************************************************
+ * GetCDClass -- default constructor										*
+ *																			*
+ * INPUT:																	*
+ *			none 															*
+ * OUTPUT:																	*
+ *			none															*
+ * WARNINGS:																*
+ *																			*
+ * HISTORY:																	*
+ *   05/26/1994 SW	:	Created.											*
+ *   12/04/1995 ST	:	fixed for Win95										*
+ *==========================================================================*/
+GetCDClass::GetCDClass( void )
+{
+	char path[]={ "a:\\" };
+
+	CDCount = 0;
+	CDIndex = 0;
+
+	Msg( __LINE__, __FILE__, "GetCDClass constructor\n" );
+
+	/*--------------------------------------------------------------------------
+	** Set all CD drive placeholders to empty
+	*/
+	for( int j = 0; j < MAX_CD_DRIVES; j++ ) {
+		CDDrives[j] = NO_CD_DRIVE;
+	}
+
+	for( char i = 'c'; i <= 'z'; i++ ) {
+
+		path[0] = i;
+
+		if ( GetDriveType( path ) == DRIVE_CDROM ) {
+			CDDrives[ CDCount++ ] = (int)( i-'a' );
+			Msg( __LINE__, __FILE__, "CD drive found - %c:\n", i +'A'-'a' );
+		}
+	}
+
+	/*--------------------------------------------------------------------------
+	**	Catch the case when there are NO CD-ROM drives available
+	*/
+	if ( CDCount == 0 ) {
+		for ( char i = 'a'; i <= 'b'; i++ ) {
+			path[0] = i;
+			if ( GetDriveType( path ) == DRIVE_CDROM ) {
+				CDDrives[ CDCount++ ] = (int)( i-'a' );
+			}
+		}
+	}
+	if ( CDCount == 0 ) {
+		Msg( __LINE__, __FILE__, "No CD drives found\n");
+	}
+}
+
+/********************************************************************************
+ * GetCDClass -- destructor														*
+ *																				*
+ * INPUT:		none															*
+ *																				*
+ * OUTPUT:		none															*
+ *																				*
+ * WARNINGS:																	*
+ *																				*
+ * HISTORY:																		*
+ *   05/26/1994 SW: Created.													*
+ *   12/4/95    ST: fixed for Win95												*
+ *==============================================================================*/
+GetCDClass::~GetCDClass(void)
+{
+//	if(cdDrive_addrp.seg)
+//		DPMI_real_free(cdDrive_addrp);		// free up those conventional buffers
+}
+
+/********************************************************************************
+ * GetCDClass -- Get_CD_Drive_For_This_Volume									*
+ *																				*
+ * INPUT:		char *volume_name												*
+ *																				*
+ * OUTPUT:		int																*
+ *																				*
+ * WARNINGS:																	*
+ *																				*
+ * HISTORY:																		*
+ *   10/18/2000 MML: Created.													*
+ *==============================================================================*/
+
+int	GetCDClass::Get_CD_Drive_For_This_Volume ( const char *volume_label )
+{
+	char		volume_name[128] = "";
+	int			count = 0;
+	char		buffer[128];
+	unsigned	misc_dword;
+	unsigned	filename_length;
+	int			cd_drive;
+
+	CDIndex = 0;
+
+	while( CDIndex < CDCount ) {
+
+		//---------------------------------------------------------------------
+		// NOTE: A=0, B=1, C=2, D=3, etc...
+		//---------------------------------------------------------------------
+		cd_drive = CDDrives[ CDIndex++ ];
+		wsprintf( buffer, "%c:\\", 'A' + cd_drive );
+
+		if ( GetVolumeInformation(
+				(char const *)buffer,
+				&volume_name[0],
+				(unsigned long)sizeof(volume_name)-1,
+				(unsigned long *)NULL,
+				(unsigned long *)&filename_length,
+				(unsigned long *)&misc_dword,
+				(char *)NULL,
+				(unsigned long)0 )) {
+
+			//---------------------------------------------------------------------
+			// Windows '95 appears to have a volume name limit of 11 characters.
+			// I cannot find a Win32 call that will return the maximum volume name
+			// length so the value '11' is hard-coded here and the assumption made
+			// that all OS's have this length or better.
+			//---------------------------------------------------------------------
+			if( WinVersion.Is_Win95()) {
+				volume_name[11] = '\0';
+			}
+
+			if ( _stricmp( volume_label, volume_name ) == 0) {
+				return( cd_drive );
+			}
+
+		} else {
+
+#if RTS_DEBUG
+			LPVOID lpMsgBuf;
+			FormatMessage(
+				FORMAT_MESSAGE_ALLOCATE_BUFFER |
+				FORMAT_MESSAGE_FROM_SYSTEM |
+				FORMAT_MESSAGE_IGNORE_INSERTS,
+				NULL,
+				GetLastError(),
+				MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+				(LPTSTR) &lpMsgBuf,
+				0,
+				NULL
+			);
+			Msg( __LINE__, __FILE__, (LPTSTR)lpMsgBuf );
+			LocalFree( lpMsgBuf );
+#endif
+
+		}
+	}
+	return( Get_First_CD_Drive());
+}
+
+/********************************************************************************
+ * GetCDClass -- Get_Volume_Label												*
+ *																				*
+ * INPUT:		int  index														*
+ *																				*
+ * OUTPUT:		char *															*
+ *																				*
+ * WARNINGS:																	*
+ *																				*
+ * HISTORY:																		*
+ *   10/31/2000 MML: Created.	* Happy Halloween! *							*
+ *==============================================================================*/
+
+const char * GetCDClass::Get_Volume_Label	( int index )
+{
+	if( index >= 0 && index < _Num_Volumes ) {
+		return( _CD_Volume_Label[ index ]);
+	}
+	return( _CD_Volume_Label[0]);
+}
+
+/********************************************************************************
+ * GetCDClass -- Get_Volume_For_This_CD_Drive									*
+ *																				*
+ * INPUT:		char *volume_name												*
+ *				char *path														*
+ *																				*
+ * OUTPUT:		int																*
+ *																				*
+ * WARNINGS:																	*
+ *																				*
+ * HISTORY:																		*
+ *   10/31/2000 MML: Created.	* Happy Halloween! *							*
+ *==============================================================================*/
+
+const char *GetCDClass::Get_Volume_For_This_CD_Drive ( const char *path, char *volume_name )
+{
+	char			buffer[128];
+	unsigned		misc_dword;
+	unsigned		filename_length;
+	static char		volume_label[ MAX_PATH ] = "";	// [OYO] add static
+
+	if ( path == NULL || volume_name == NULL ) {
+		return( NULL );
+	}
+
+	memset( volume_name, '\0', sizeof( volume_name ));
+	wsprintf( buffer, "%c:\\", path[0] );
+
+	if ( GetVolumeInformation(
+			(char const *)buffer,
+			&volume_label[0],
+			(unsigned long)sizeof(volume_label)-1,
+			(unsigned long *)NULL,
+			(unsigned long *)&filename_length,
+			(unsigned long *)&misc_dword,
+			(char *)NULL,
+			(unsigned long)0 )) {
+
+		strcpy( volume_name, volume_label );
+
+	} else {
+
+		LPVOID lpMsgBuf;
+		FormatMessage(
+		    FORMAT_MESSAGE_ALLOCATE_BUFFER |
+		    FORMAT_MESSAGE_FROM_SYSTEM |
+		    FORMAT_MESSAGE_IGNORE_INSERTS,
+		    NULL,
+		    GetLastError(),
+		    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+		    (LPTSTR) &lpMsgBuf,
+		    0,
+		    NULL
+		);
+		Msg( __LINE__, __FILE__, (LPTSTR)lpMsgBuf );
+		LocalFree( lpMsgBuf );
+
+		strcpy( volume_name, _CD_Volume_Label[0] );
+	}
+
+	//-------------------------------------------------------------------------
+	// Windows '95 appears to have a volume name limit of 11 characters.
+	// I cannot find a Win32 call that will return the maximum volume name
+	// length so the value '11' is hard-coded here and the assumption made
+	// that all OS's have this length or better.
+	//-------------------------------------------------------------------------
+	bool winversion = WinVersion.Is_Win95();
+
+	if( winversion ) {
+		volume_name[11] = '\0';
+	}
+
+	return( volume_name );
+}
+
+/********************************************************************************
+ * CD_VOLUME_VERIFICATION -- Check volume label of the CD in the given drive.	*
+ *																				*
+ * INPUT:		int drive_number												*
+ *	  			char *lable														*
+ *																				*
+ * OUTPUT:		TRUE/FALSE														*
+ *																				*
+ * WARNINGS:	None															*
+ *																				*
+ * HISTORY:																		*
+ *    01/11/99 4:20PM MML : Created												*
+ *==============================================================================*/
+
+bool CD_Volume_Verification ( int cd_drive, char *volume_label, char *volume_to_find )
+{
+	char		volume_name[128] = "";
+	int			count = 0;
+	char		buffer[128];
+	unsigned	misc_dword;
+	unsigned	filename_length;
+
+	/***************************************************************************
+	** Get the volume label. If we get a 'not ready' error then retry for the
+	** timeout period.
+	*/
+	for (;;) {
+
+		//---------------------------------------------------------------------
+		// NOTE: A=0, B=1, C=2, D=3, etc...
+		//---------------------------------------------------------------------
+		wsprintf( buffer, "%c:\\", 'A' + cd_drive );
+
+		if ( GetVolumeInformation(
+				(char const *)buffer,
+				&volume_name[0],
+				(unsigned long)sizeof(volume_name)-1,
+				(unsigned long *)NULL,
+				(unsigned long *)&filename_length,
+				(unsigned long *)&misc_dword,
+				(char *)NULL,
+				(unsigned long)0 )) {
+
+			/******************************************************************
+			** Match the volume label to the list of known volume labels.
+			*/
+
+			//---------------------------------------------------------------------
+			// Windows '95 appears to have a volume name limit of 11 characters.
+			// I cannot find a Win32 call that will return the maximum volume name
+			// length so the value '11' is hard-coded here and the assumption made
+			// that all OS's have this length or better.
+			//---------------------------------------------------------------------
+			if( WinVersion.Is_Win95()) {
+				volume_name[11] = '\0';
+			}
+
+			if ( volume_label != NULL ) {
+				strncpy( volume_label, volume_name, 128 );
+			}
+
+			if ( _stricmp( volume_to_find, volume_name ) == 0) {
+				return TRUE;
+			}
+
+			if ( !count ) {
+				count++;
+			} else {
+				return FALSE;
+			}
+
+		} else {
+
+			/*********************************************************************
+			** Failed to get the volume label on a known CD drive.  If this is a
+			** CD changer it may require time to swap the disks so don't return
+			** immediately if the error is ROR_NOT_READY
+			*/
+			return FALSE;
+		}
+	}
+}
+
+
+
+
+/* ==================================================================== */
+
diff --git a/Core/Tools/Autorun/GameText.cpp b/Core/Tools/Autorun/GameText.cpp
index 8ee7df7d8f4..c2f990fc4eb 100644
--- a/Core/Tools/Autorun/GameText.cpp
+++ b/Core/Tools/Autorun/GameText.cpp
@@ -17,12 +17,12 @@
 */
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -34,7 +34,7 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include <stdlib.h>
@@ -61,13 +61,13 @@
 
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 #define CSF_ID ( ('C'<<24) | ('S'<<16) | ('F'<<8) | (' ') )
@@ -80,11 +80,11 @@
 #define CSF_FILE 1
 #define MAX_UITEXT_LENGTH (10*1024)
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 //===============================
-// StringInfo 
+// StringInfo
 //===============================
 
 struct StringInfo
@@ -101,7 +101,7 @@ struct StringLookUp
 };
 
 //===============================
-// CSFHeader 
+// CSFHeader
 //===============================
 
 struct CSFHeader
@@ -116,7 +116,7 @@ struct CSFHeader
 };
 
 //===============================
-// struct NoString 
+// struct NoString
 //===============================
 
 struct NoString
@@ -127,7 +127,7 @@ struct NoString
 
 
 //===============================
-// GameTextManager 
+// GameTextManager
 //===============================
 
 class GameTextManager : public GameTextInterface
@@ -151,7 +151,7 @@ class GameTextManager : public GameTextInterface
 		Char						m_buffer2[MAX_UITEXT_LENGTH];
 		Char						m_buffer3[MAX_UITEXT_LENGTH];
 		WideChar				m_tbuffer[MAX_UITEXT_LENGTH*2];
-		
+
 		StringInfo			*m_stringInfo;
 		StringLookUp		*m_stringLUT;
 		Bool						m_initialized;
@@ -176,31 +176,31 @@ class GameTextManager : public GameTextInterface
 
 static int _cdecl			compareLUT ( const void *,  const void*);
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 GameTextInterface *TheGameText = NULL;
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 //============================================================================
@@ -227,7 +227,7 @@ GameTextManager::GameTextManager()
 	m_munkee(FALSE),
 	m_noStringList(NULL),
 	m_useStringFile(TRUE),
-	m_failed(L"***FATAL*** String Manager failed to initilaized properly")
+	m_failed(L"***FATAL*** String Manager failed to initialized properly")
 {
 }
 
@@ -238,7 +238,7 @@ GameTextManager::GameTextManager()
 GameTextManager::~GameTextManager()
 {
 	deinit();
-}							
+}
 
 //============================================================================
 // GameTextManager::init
@@ -340,32 +340,27 @@ void GameTextManager::init( void )
 
 void GameTextManager::deinit( void )
 {
+	delete [] m_stringInfo;
+	m_stringInfo = NULL;
 
-	if( m_stringInfo != NULL )
-	{
-		delete [] m_stringInfo;
-		m_stringInfo = NULL;
-	}
-
-	if( m_stringLUT != NULL )
-	{
-		delete [] m_stringLUT;
-		m_stringLUT = NULL;
-	}
+	delete [] m_stringLUT;
+	m_stringLUT = NULL;
 
 	m_textCount = 0;
 
 	NoString *noString = m_noStringList;
 
-	DEBUG_LOG(("\n*** Missing strings ***\n"));
+	DEBUG_LOG((""));
+	DEBUG_LOG(("*** Missing strings ***"));
 	while ( noString )
 	{
-		DEBUG_LOG(("*** %ls ***\n", noString->text.str()));
+		DEBUG_LOG(("*** %ls ***", noString->text.str()));
 		NoString *next = noString->next;
 		delete noString;
 		noString = next;
 	}
-	DEBUG_LOG(("*** End missing strings ***\n\n"));
+	DEBUG_LOG(("*** End missing strings ***"));
+	DEBUG_LOG((""));
 
 	m_noStringList = NULL;
 
@@ -382,7 +377,7 @@ void GameTextManager::reset( void )
 
 
 //============================================================================
-// GameTextManager::stripSpaces 
+// GameTextManager::stripSpaces
 //============================================================================
 
 void GameTextManager::stripSpaces ( WideChar *string )
@@ -429,7 +424,7 @@ void GameTextManager::stripSpaces ( WideChar *string )
 }
 
 //============================================================================
-// GameTextManager::removeLeadingAndTrailing 
+// GameTextManager::removeLeadingAndTrailing
 //============================================================================
 
 void GameTextManager::removeLeadingAndTrailing ( Char *buffer )
@@ -446,7 +441,7 @@ void GameTextManager::removeLeadingAndTrailing ( Char *buffer )
 
 	while ( (*ptr++ = *first++) != 0 );
 
-	ptr -= 2;;
+	ptr -= 2;
 
 	while ( (ptr > buffer) && (ch = *ptr) != 0 && iswspace ( ch ) )
 	{
@@ -588,7 +583,7 @@ void GameTextManager::readToEndOfQuote( File *file, Char *in, Char *out, Char *w
 
 
 //============================================================================
-// GameTextManager::reverseWord 
+// GameTextManager::reverseWord
 //============================================================================
 
 void GameTextManager::reverseWord ( Char *file, Char *lp )
@@ -764,7 +759,7 @@ Bool GameTextManager::getStringCount( char *filename )
 	m_textCount = 0;
 
 	RAMFile file;
-	
+
 	if ( !file.open( filename, File::READ | File::TEXT ))
 	{
 		return FALSE;
@@ -783,7 +778,7 @@ Bool GameTextManager::getStringCount( char *filename )
 				m_buffer[ len+1] = 0;
 			readToEndOfQuote( &file, &m_buffer[1], m_buffer2, m_buffer3, MAX_UITEXT_LENGTH );
 		}
-		else if( !stricmp( m_buffer, "END") )
+		else if( stricmp( m_buffer, "END") == 0 )
 		{
 			m_textCount++;
 		}
@@ -795,7 +790,7 @@ Bool GameTextManager::getStringCount( char *filename )
 }
 
 //============================================================================
-// GameTextManager::getCSFInfo 
+// GameTextManager::getCSFInfo
 //============================================================================
 
 Bool GameTextManager::getCSFInfo ( Char *filename )
@@ -896,19 +891,19 @@ Bool GameTextManager::parseCSF( Char *filename )
 			{
 				// only use the first string found
 				m_tbuffer[len] = 0;
-				
+
 				{
 					WideChar *ptr;
-				
+
 					ptr = m_tbuffer;
-				
+
 					while ( *ptr )
 					{
 						*ptr = ~*ptr;
 						ptr++;
 					}
 				}
-				
+
 				stripSpaces ( m_tbuffer );
 				m_stringInfo[listCount].text = m_tbuffer;
 			}
@@ -956,7 +951,7 @@ Bool GameTextManager::parseStringFile( char *filename )
 	Int ok = TRUE;
 
 	RAMFile file;
-	
+
 	if ( !file.open(  filename, File::READ | File::TEXT ) )
 	{
 		return FALSE;
@@ -979,7 +974,7 @@ Bool GameTextManager::parseStringFile( char *filename )
 
 		for ( Int i = 0; i < listCount; i++ )
 		{
-			if ( !stricmp ( m_stringInfo[i].label.c_str(), m_buffer ))
+			if ( stricmp ( m_stringInfo[i].label.c_str(), m_buffer ) == 0 )
 			{
 				DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' multiply defined!", m_buffer ));
 			}
@@ -1024,13 +1019,13 @@ Bool GameTextManager::parseStringFile( char *filename )
 					// Copy string into new home
 					translateCopy( m_tbuffer, m_buffer2 );
 					stripSpaces ( m_tbuffer );
-					
+
 					m_stringInfo[listCount].text = m_tbuffer ;
 					m_stringInfo[listCount].speech = m_buffer3;
 					readString = TRUE;
 				}
 			}
-			else if ( !stricmp ( m_buffer, "END" ))
+			else if ( stricmp ( m_buffer, "END" ) == 0 )
 			{
 				break;
 			}
@@ -1085,7 +1080,7 @@ const wchar_t * GameTextManager::fetch( const Char *label )
 			noString = noString->next;
 		}
 
-		//DEBUG_LOG(("*** MISSING:'%s' ***\n", label));
+		//DEBUG_LOG(("*** MISSING:'%s' ***", label));
 		// Remember file could have been altered at this point.
 		noString = new NoString;
 		noString->text = missingString;
@@ -1139,7 +1134,7 @@ Char	GameTextManager::readChar( File *file )
 }
 
 //============================================================================
-// GameTextManager::compareLUT 
+// GameTextManager::compareLUT
 //============================================================================
 
 static int __cdecl compareLUT ( const void *i1,  const void*i2)
diff --git a/Core/Tools/Autorun/GameText.h b/Core/Tools/Autorun/GameText.h
index 7e4ffdd351f..df51f3810a5 100644
--- a/Core/Tools/Autorun/GameText.h
+++ b/Core/Tools/Autorun/GameText.h
@@ -17,12 +17,12 @@
 */
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    RTS 3
@@ -35,12 +35,8 @@
 
 #pragma once
 
-#ifndef __GAMECLIENT_GAMETEXT_H_
-#define __GAMECLIENT_GAMETEXT_H_
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
@@ -52,7 +48,7 @@
 //----------------------------------------------------------------------------
 
 //===============================
-// GameTextInterface 
+// GameTextInterface
 //===============================
 /** Game text interface object for localised text.
 	*/
@@ -75,8 +71,5 @@ extern GameTextInterface *TheGameText;
 extern GameTextInterface* CreateGameTextInterface( void );
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-#endif // __GAMECLIENT_GAMETEXT_H_
diff --git a/Core/Tools/Autorun/GetCD.h b/Core/Tools/Autorun/GetCD.h
index 6c830b59421..8f33d0a54ea 100644
--- a/Core/Tools/Autorun/GetCD.h
+++ b/Core/Tools/Autorun/GetCD.h
@@ -31,10 +31,6 @@
 
 #pragma once
 
-#ifndef GETCD_H
-#define GETCD_H
-
-
 extern const char *	_CD_Volume_Label[];
 extern int		_Num_Volumes;
 
@@ -197,7 +193,7 @@ struct	StopType {
 #define MAX_CD_DRIVES	26
 #define NO_CD_DRIVE		-1
 
-class	GetCDClass 
+class	GetCDClass
 {
 	public:
 		GetCDClass	( void );							// This is the default constructor
@@ -277,7 +273,7 @@ inline int GetCDClass::Get_Next_CD_Drive(void)
  *==================================================================================*/
 
 #ifdef NOT_FOR_WIN95
-class RedBookClass : public GetCDClass 
+class RedBookClass : public GetCDClass
 {
 	public:
 
@@ -318,6 +314,3 @@ extern GetCDClass		CDList;
 // Functions
 //-----------------------------------------------------------------------------
 bool  CD_Volume_Verification ( int cd_drive, char *volume_label, char *volume_to_find );
-
-
-#endif // PLAYCD_H
diff --git a/Core/Tools/Autorun/IGR.cpp b/Core/Tools/Autorun/IGR.cpp
index 6c809c86ac9..7ea522b0541 100644
--- a/Core/Tools/Autorun/IGR.cpp
+++ b/Core/Tools/Autorun/IGR.cpp
@@ -66,7 +66,7 @@ bool IGROptionsClass::Init( void )
 		// If successful, get the options
 		IGROptionsType ReadOptions = 0;
 
-		returnValue = RegQueryValueEx(handle, WOLAPI_REG_KEY_OPTIONS, NULL, 
+		returnValue = RegQueryValueEx(handle, WOLAPI_REG_KEY_OPTIONS, NULL,
 			 (unsigned long *) &type, (unsigned char *) &ReadOptions, (unsigned long *)&size);
 
 		if (returnValue == ERROR_SUCCESS) {
@@ -75,7 +75,7 @@ bool IGROptionsClass::Init( void )
 			if (type == REG_DWORD) {
 				options = ReadOptions;
 				valid = true;
-			}	
+			}
 		}
 
 		// Clean up
@@ -153,7 +153,7 @@ bool IGROptionsClass::Set_Options( IGROptionsType options )
 	HKEY	handle;
 	int		disp;
 	char	key[ 128 ];
- 
+
 	// We don't care if it's valid, we'll MAKE it valid.
 	strcpy( key, WOLAPI_REG_KEY_BOTTOM );
 
@@ -161,12 +161,12 @@ bool IGROptionsClass::Set_Options( IGROptionsType options )
 	if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, key, 0, KEY_ALL_ACCESS, &handle ) != ERROR_SUCCESS ) {
 
 		// If not, make the WOLAPI key
-		if( RegCreateKeyEx( HKEY_LOCAL_MACHINE, key, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, 
+		if( RegCreateKeyEx( HKEY_LOCAL_MACHINE, key, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS,
 			NULL, &handle, (unsigned long *)&disp ) != ERROR_SUCCESS )
 			return false;
 	}
 
-	if( RegSetValueEx( handle, WOLAPI_REG_KEY_OPTIONS, 0, REG_DWORD, (unsigned char *)&options, sizeof(int)) 
+	if( RegSetValueEx( handle, WOLAPI_REG_KEY_OPTIONS, 0, REG_DWORD, (unsigned char *)&options, sizeof(int))
 		== ERROR_SUCCESS ) {
 		ReturnValue = true;
 	}
@@ -176,6 +176,6 @@ bool IGROptionsClass::Set_Options( IGROptionsType options )
 	Init();
 
 	assert( valid == TRUE );
- 
+
 	return ReturnValue;
 }
diff --git a/Core/Tools/Autorun/IGR.h b/Core/Tools/Autorun/IGR.h
index 31c19ed23a3..992c03bd814 100644
--- a/Core/Tools/Autorun/IGR.h
+++ b/Core/Tools/Autorun/IGR.h
@@ -27,7 +27,7 @@
 //
 #define WOLAPI_REG_KEY_TOP				"HKEY_LOCAL_MACHINE"
 #define WOLAPI_REG_KEY_WOLAPI			"SOFTWARE\\Westwood\\WOLAPI"
-#define WOLAPI_REG_KEY_BOTTOM			WOLAPI_REG_KEY_WOLAPI "\\" 
+#define WOLAPI_REG_KEY_BOTTOM			WOLAPI_REG_KEY_WOLAPI "\\"
 #define WOLAPI_REG_KEY_OPTIONS		"Options"
 #define WOLAPI_REG_KEY					WOLAPI_REG_KEY_TOP "\\" WOLAPI_REG_KEY_BOTTOM
 #define WOLAPI_KEY						"WOLAPI"
@@ -72,4 +72,4 @@ class IGROptionsClass
 		bool	valid;
 };
 
-extern IGROptionsClass *OnlineOptions;
\ No newline at end of file
+extern IGROptionsClass *OnlineOptions;
diff --git a/Core/Tools/Autorun/JSUPPORT.H b/Core/Tools/Autorun/JSUPPORT.H
deleted file mode 100644
index 3138a1fd1f2..00000000000
--- a/Core/Tools/Autorun/JSUPPORT.H
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// JSUPPORT.H
-// DBCS Support Header
-extern int nGetWord( char *,int );
diff --git a/Core/Tools/Autorun/JSUPPORT.h b/Core/Tools/Autorun/JSUPPORT.h
new file mode 100644
index 00000000000..a83751fb89d
--- /dev/null
+++ b/Core/Tools/Autorun/JSUPPORT.h
@@ -0,0 +1,21 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// JSUPPORT.h
+// DBCS Support Header
+extern int nGetWord( char *,int );
diff --git a/Core/Tools/Autorun/Jsupport.cpp b/Core/Tools/Autorun/Jsupport.cpp
index b160e8fbf2c..acfbeceef2a 100644
--- a/Core/Tools/Autorun/Jsupport.cpp
+++ b/Core/Tools/Autorun/Jsupport.cpp
@@ -16,11 +16,11 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// JSUPPORT.CPP
+// JSUPPORT.cpp
 // DBCS Support Codes
 
 #include <windows.h>
-#include "JSUPPORT.H"
+#include "JSUPPORT.h"
 
 // �O�u�֑�����
 // Can't set these characters on top of line
diff --git a/Core/Tools/Autorun/Locale_API.cpp b/Core/Tools/Autorun/Locale_API.cpp
index 873674f4c6c..73aa3aafbfd 100644
--- a/Core/Tools/Autorun/Locale_API.cpp
+++ b/Core/Tools/Autorun/Locale_API.cpp
@@ -81,7 +81,7 @@ const wchar_t *localeStringsMissing[ MISSING_STRING_HINTS_MAX ] =
 /****************************************************************************/
 
 //----------------------------------------------------------------------------
-// NOTE:	if USE_MULTI_FILE_FORMAT is "true", then a .lOC file must be in 
+// NOTE:	if USE_MULTI_FILE_FORMAT is "true", then a .lOC file must be in
 //			the same directory as this file.
 //----------------------------------------------------------------------------
 #define		USE_MULTI_FILE_FORMAT		FALSE
@@ -108,7 +108,7 @@ wchar_t *	Remove_Quotes_Around_String ( wchar_t *old_string );
 
 
 //=============================================================================
-// These are wrapper functions around the LOCALE_ functions.  I made these to 
+// These are wrapper functions around the LOCALE_ functions.  I made these to
 // make using the single vs. multi language files more transparent to the program.
 //=============================================================================
 
@@ -281,7 +281,7 @@ int Locale_Init	( int language, char *file )
 
 	#endif
 */
-	return result;	
+	return result;
 }
 
 /************************************************************************/
@@ -290,20 +290,15 @@ int Locale_Init	( int language, char *file )
 
 void Locale_Restore ( void )
 {
-	if (TheGameText)
-	{
-		delete TheGameText;
-		TheGameText = NULL;
-	}
+	delete TheGameText;
+	TheGameText = NULL;
 
 	#if( USE_MULTI_FILE_FORMAT )
 		LOCALE_freetable();
 		LOCALE_restore();
 	#else
-		if( LocaleFile ) {
-			free( LocaleFile );
-			LocaleFile = NULL;
-		}
+		free( LocaleFile );
+		LocaleFile = NULL;
 	#endif
 }
 
@@ -321,7 +316,7 @@ const char* Locale_GetString( int StringID, char *String )
 
 	#if( USE_MULTI_FILE_FORMAT )
 		wcscpy( wide_buffer, (wchar_t *)LOCALE_getstring( StringID ));
-	#else									  
+	#else
 		wcscpy( wide_buffer, (wchar_t *)LOCALE_getstr( LocaleFile, StringID ));
 	#endif
 
@@ -359,22 +354,22 @@ const wchar_t* Locale_GetString( int StringID, wchar_t *String )
 
 	#if( USE_MULTI_FILE_FORMAT )
 		wcscpy( wide_buffer, (wchar_t *)LOCALE_getstring( StringID ));
-	#else		
-		
+	#else
+
 		wchar_t *localeStr = NULL;
-		
+
 		if (TheGameText != NULL)
 			localeStr = (wchar_t *)TheGameText->fetch( s_stringLabels[StringID] );
-		
-		if (localeStr == NULL) 
+
+		if (localeStr == NULL)
 		{
 			return localeStringsMissing[ min( MISSING_STRING_HINTS_MAX - 1, StringID ) ];
-		} 
-		else 
+		}
+		else
 		{
 			wcscpy( wide_buffer, localeStr);
 		}
-	#endif 
+	#endif
 
 	Remove_Quotes_Around_String( wide_buffer );
 
diff --git a/Core/Tools/Autorun/Locale_API.h b/Core/Tools/Autorun/Locale_API.h
index 58a3b6c49e5..73cd605453e 100644
--- a/Core/Tools/Autorun/Locale_API.h
+++ b/Core/Tools/Autorun/Locale_API.h
@@ -36,9 +36,6 @@
 
 #pragma once
 
-#ifndef  LOCALE_API_H
-#define  LOCALE_API_H
-
 #include <stdlib.h>
 
 /****************************************************************************/
@@ -63,5 +60,3 @@ const wchar_t*	Locale_GetString				( int StringID, wchar_t *String=NULL );
 */
 bool			Locale_Use_Multi_Language_Files	( void );
 //int				Locale_Get_Language_ID 			( void )	{ return LanguageID; };
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/Autorun/POINT.h b/Core/Tools/Autorun/POINT.h
index ee35ddfa999..5c2df4f84b9 100644
--- a/Core/Tools/Autorun/POINT.h
+++ b/Core/Tools/Autorun/POINT.h
@@ -16,27 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name: Command & Conquer                                             * 
- *                                                                                             * 
- *                      Archive: /Sun/Point.h                                                  * 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name: Command & Conquer                                             *
+ *                                                                                             *
+ *                      Archive: /Sun/Point.h                                                  *
+ *                                                                                             *
  *                       Author: Joe_b                                                         *
- *                                                                                             * 
+ *                                                                                             *
  *                      Modtime: 2/02/98 10:09a                                                *
- *                                                                                             * 
+ *                                                                                             *
  *                     Revision: 24                                                            *
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#pragma once
 
-#ifndef POINT_H
-#define POINT_H
+#pragma once
 
 #include <math.h>
 //#include "always.h"
@@ -44,7 +42,7 @@
 
 //#ifdef __cplusplus
 //extern "C"{
-//#endif 
+//#endif
 
 //#pragma pack(1)
 
@@ -67,7 +65,7 @@ template<class T> class TRect;
 /***********************************************************************************************
 **	This class describes a point in 2 dimensional space using arbitrary
 **	components. The interpretation of which is outside the scope
-**	of this class. This class is the successor to the old style COORDINATE 
+**	of this class. This class is the successor to the old style COORDINATE
 **	and CELL types but also serves anywhere an X and Y value are treated
 **	as a logical object (e.g., pixel location).
 */
@@ -142,14 +140,14 @@ class Point2D : public TPoint2D<int>
 
 
 template<class T>
-T Distance(TPoint2D<T> const & point1, TPoint2D<T> const & point2) 
+T Distance(TPoint2D<T> const & point1, TPoint2D<T> const & point2)
 {
 	return((point1 - point2).Length());
 }
 
 
 template<class T>
-TPoint2D<T> const Cross_Product(TPoint2D<T> const & lvalue, TPoint2D<T> const & rvalue) 
+TPoint2D<T> const Cross_Product(TPoint2D<T> const & lvalue, TPoint2D<T> const & rvalue)
 {
 	return(lvalue.Cross_Product(rvalue));
 }
@@ -177,7 +175,7 @@ class TPoint3D : public TPoint2D<T> {
 		TPoint3D(void) {}		// Default constructor does nothing by design.
 		TPoint3D(T x, T y, T z) : BASECLASS(x, y), Z(z) {}
 		TPoint3D(BASECLASS const & rvalue, T z /*= 0*/) : BASECLASS(rvalue), Z(z) {}
-		
+
 		// Equality comparison operators.
 		bool operator == (TPoint3D<T> const & rvalue) const {return(X==rvalue.X && Y==rvalue.Y && Z==rvalue.Z);}
 		bool operator != (TPoint3D<T> const & rvalue) const {return(X!=rvalue.X || Y!=rvalue.Y || Z!=rvalue.Z);}
@@ -233,10 +231,7 @@ class TPoint3D : public TPoint2D<T> {
 typedef TPoint3D<int> Point3D;
 
 template<class T>
-TPoint3D<T> const Cross_Product(TPoint3D<T> const & lvalue, TPoint3D<T> const & rvalue) 
+TPoint3D<T> const Cross_Product(TPoint3D<T> const & lvalue, TPoint3D<T> const & rvalue)
 {
 	return(lvalue.Cross_Product(rvalue));
 }
-
-
-#endif
diff --git a/Core/Tools/Autorun/RECT.h b/Core/Tools/Autorun/RECT.h
index 61925de63fa..0bd028d7cb2 100644
--- a/Core/Tools/Autorun/RECT.h
+++ b/Core/Tools/Autorun/RECT.h
@@ -16,30 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                      Archive : /Sun/RECT.H                                                  * 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                      Archive : /Sun/RECT.h                                                  *
+ *                                                                                             *
  *                       Author : Joe_b                                                        *
- *                                                                                             * 
+ *                                                                                             *
  *                      Modtime : 11/21/97 4:40p                                               *
- *                                                                                             * 
+ *                                                                                             *
  *                     Revision : 20                                                           *
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Union -- Combines two rectangles into one larger one.                                     * 
- *   Intersect -- Find the intersection between two rectangles.                                * 
- *   Intersect -- Simple intersect between two rectangles.                                     * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Union -- Combines two rectangles into one larger one.                                     *
+ *   Intersect -- Find the intersection between two rectangles.                                *
+ *   Intersect -- Simple intersect between two rectangles.                                     *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#pragma once
 
-#ifndef RECT_H
-#define RECT_H
+#pragma once
 
 #include	<stddef.h>
 #include	"POINT.h"
@@ -101,10 +99,10 @@ class TRect
 
 		TPoint2D<T> Top_Right(void) const {return(TPoint2D<T>(T(X + Width - 1), Y));}
 		__declspec(property(get=Top_Right)) TPoint2D<T> TopRight;
-		
+
 		TPoint2D<T> Bottom_Left(void) const {return(TPoint2D<T>(X, T(Y + Height - 1)));}
 		__declspec(property(get=Bottom_Left)) TPoint2D<T> BottomLeft;
-		
+
 		TPoint2D<T> Bottom_Right(void) const {return(TPoint2D<T>(T(X + Width - 1), T(Y + Height - 1)));}
 		__declspec(property(get=Bottom_Right)) TPoint2D<T> BottomRight;
 
@@ -138,21 +136,21 @@ TPoint2D<T> const Bias_To(TPoint2D<T> const & point, TRect<T> const & rect)
 }
 
 
-/*********************************************************************************************** 
- * Union -- Combines two rectangles into one larger one.                                       * 
- *                                                                                             * 
- *    This routine will combine the two specified rectangles such that a larger one is         * 
- *    returned that encompasses both rectangles.                                               * 
- *                                                                                             * 
- * INPUT:   rect1 -- One rectangle to combine.                                                 * 
- *          rect2 -- The other rectangle to combine.                                           * 
- *                                                                                             * 
- * OUTPUT:  Returns with the smallest rectangle that encompasses both specified rectangles.    * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/04/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * Union -- Combines two rectangles into one larger one.                                       *
+ *                                                                                             *
+ *    This routine will combine the two specified rectangles such that a larger one is         *
+ *    returned that encompasses both rectangles.                                               *
+ *                                                                                             *
+ * INPUT:   rect1 -- One rectangle to combine.                                                 *
+ *          rect2 -- The other rectangle to combine.                                           *
+ *                                                                                             *
+ * OUTPUT:  Returns with the smallest rectangle that encompasses both specified rectangles.    *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/04/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 template<class T>
 TRect<T> const Union(TRect<T> const & rect1, TRect<T> const & rect2)
@@ -183,31 +181,31 @@ TRect<T> const Union(TRect<T> const & rect1, TRect<T> const & rect2)
 }
 
 
-/*********************************************************************************************** 
- * Intersect -- Find the intersection between two rectangles.                                  * 
- *                                                                                             * 
- *    This routine will take two rectangles and return the intersecting rectangle. It also     * 
- *    tracks how much on rectangle was clipped off of the top and left edges and returns       * 
- *    these values. It can be handy to use these returned clipping values for blit operations  * 
- *    between rectangles.                                                                      * 
- *                                                                                             * 
- * INPUT:   bounding_rect  -- The rectangle of the bounding box (clipping rectangle).          * 
- *                                                                                             * 
- *          draw_rect      -- The rectangle that will be clipped into the bounding rectangle.  * 
- *                                                                                             * 
- *          x,y            -- Place to store the clipping offset performed on the draw_rect.   * 
- *                            If this offset is applied to a subsiquent blit operation from    * 
- *                            the draw_rect source, it will appear to be properly clipped      * 
- *                            against the clipping rectangle rather than offset to the         * 
- *                            clipping rectangle.                                              * 
- *                                                                                             * 
- * OUTPUT:  Returns with the rectangle that is the intersection of the two rectangles.         * 
- *                                                                                             * 
- * WARNINGS:   The returned rectangle may be clipped into nothingness. Check for Is_Valid      * 
- *             to catch this case.                                                             * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/04/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * Intersect -- Find the intersection between two rectangles.                                  *
+ *                                                                                             *
+ *    This routine will take two rectangles and return the intersecting rectangle. It also     *
+ *    tracks how much on rectangle was clipped off of the top and left edges and returns       *
+ *    these values. It can be handy to use these returned clipping values for blit operations  *
+ *    between rectangles.                                                                      *
+ *                                                                                             *
+ * INPUT:   bounding_rect  -- The rectangle of the bounding box (clipping rectangle).          *
+ *                                                                                             *
+ *          draw_rect      -- The rectangle that will be clipped into the bounding rectangle.  *
+ *                                                                                             *
+ *          x,y            -- Place to store the clipping offset performed on the draw_rect.   *
+ *                            If this offset is applied to a subsiquent blit operation from    *
+ *                            the draw_rect source, it will appear to be properly clipped      *
+ *                            against the clipping rectangle rather than offset to the         *
+ *                            clipping rectangle.                                              *
+ *                                                                                             *
+ * OUTPUT:  Returns with the rectangle that is the intersection of the two rectangles.         *
+ *                                                                                             *
+ * WARNINGS:   The returned rectangle may be clipped into nothingness. Check for Is_Valid      *
+ *             to catch this case.                                                             *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/04/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 template<class T>
 TRect<T> const Intersect(TRect<T> const & bounding_rect, TRect<T> const & draw_rect, T * x, T * y)
@@ -270,24 +268,24 @@ TRect<T> const Intersect(TRect<T> const & bounding_rect, TRect<T> const & draw_r
 }
 
 
-/*********************************************************************************************** 
- * Intersect -- Simple intersect between two rectangles.                                       * 
- *                                                                                             * 
- *    This will return with the rectangle that represents the intersection of the two          * 
- *    rectangles specified.                                                                    * 
- *                                                                                             * 
- * INPUT:   rect1    -- The first rectangle.                                                   * 
- *                                                                                             * 
- *          rect2    -- The second rectangle.                                                  * 
- *                                                                                             * 
- * OUTPUT:  Returns with the intersecting rectangle between the two rectangles specified.      * 
- *                                                                                             * 
- * WARNINGS:   If there is no valid intersection between the two rectangles, then a rectangle  * 
- *             of illegal value is returned. Check for this case by using the Is_Valid()       * 
- *             function.                                                                       * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/04/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * Intersect -- Simple intersect between two rectangles.                                       *
+ *                                                                                             *
+ *    This will return with the rectangle that represents the intersection of the two          *
+ *    rectangles specified.                                                                    *
+ *                                                                                             *
+ * INPUT:   rect1    -- The first rectangle.                                                   *
+ *                                                                                             *
+ *          rect2    -- The second rectangle.                                                  *
+ *                                                                                             *
+ * OUTPUT:  Returns with the intersecting rectangle between the two rectangles specified.      *
+ *                                                                                             *
+ * WARNINGS:   If there is no valid intersection between the two rectangles, then a rectangle  *
+ *             of illegal value is returned. Check for this case by using the Is_Valid()       *
+ *             function.                                                                       *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/04/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 template<class T>
 TRect<T> const Intersect(TRect<T> const & rect1, TRect<T> const & rect2)
@@ -303,6 +301,3 @@ TRect<T> const Intersect(TRect<T> const & rect1, TRect<T> const & rect2)
 typedef TRect<int> Rect;
 
 const Rect RECT_NONE(0,0,0,0);
-
-#endif
-
diff --git a/Core/Tools/Autorun/TTFont.cpp b/Core/Tools/Autorun/TTFont.cpp
index 8729fa81dfc..0c3652ec9a4 100644
--- a/Core/Tools/Autorun/TTFont.cpp
+++ b/Core/Tools/Autorun/TTFont.cpp
@@ -16,35 +16,35 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/************************************************************************************************ 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S                *** 
- ************************************************************************************************ 
- *																								* 
- *                 Project Name: Setup                                            				* 
- *																								* 
- *                      Archive: TTFont.cpp                                             		* 
- *																								* 
+/************************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S                ***
+ ************************************************************************************************
+ *																								*
+ *                 Project Name: Setup                                            				*
+ *																								*
+ *                      Archive: TTFont.cpp                                             		*
+ *																								*
  *                       Author: Maria del Mar McCready Legg									*
- *																								* 
+ *																								*
  *                      Modtime: 8/24/99 3:44pm													*
- *																								* 
+ *																								*
  *                     Revision: 01																*
  *																								*
- *----------------------------------------------------------------------------------------------* 
- * Functions:																					* 
- *   TTFontClass::TTFontClass -- Constructor for a font class object.							* 
- *   TTFontClass::Char_Pixel_Width -- Fetch the pixel width of the character specified.			* 
+ *----------------------------------------------------------------------------------------------*
+ * Functions:																					*
+ *   TTFontClass::TTFontClass -- Constructor for a font class object.							*
+ *   TTFontClass::Char_Pixel_Width -- Fetch the pixel width of the character specified.			*
  *	 TTFontClass::Find_Text_VLength -- Finds length of text in pixels							*
- *   TTFontClass::Get_Height -- Fetch the normalized height of the nominal font character.		* 
- *   TTFontClass::Get_Width -- Get normalized width of the nominal font character.				* 
- *   TTFontClass::Print -- Print text to the surface specified.									* 
- *   TTFontClass::Raw_Height -- Fetch the height of the font.									* 
- *   TTFontClass::Raw_Width -- Fetch the raw width of a character.								* 
- *   TTFontClass::Set_XSpacing -- Set the X spacing override value.								* 
- *   TTFontClass::Set_YSpacing -- Set the vertical (Y) spacing override value.					* 
- *   TTFontClass::String_Pixel_Width -- Determines the width of the string in pixels.			* 
+ *   TTFontClass::Get_Height -- Fetch the normalized height of the nominal font character.		*
+ *   TTFontClass::Get_Width -- Get normalized width of the nominal font character.				*
+ *   TTFontClass::Print -- Print text to the surface specified.									*
+ *   TTFontClass::Raw_Height -- Fetch the height of the font.									*
+ *   TTFontClass::Raw_Width -- Fetch the raw width of a character.								*
+ *   TTFontClass::Set_XSpacing -- Set the X spacing override value.								*
+ *   TTFontClass::Set_YSpacing -- Set the vertical (Y) spacing override value.					*
+ *   TTFontClass::String_Pixel_Width -- Determines the width of the string in pixels.			*
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
- 
+
 
 #define  STRICT
 #include <windows.h>
@@ -52,12 +52,12 @@
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include "ARGS.H"
+#include "ARGS.h"
 #include "autorun.h"
 #include "RECT.h"
 #include "Wnd_File.h"
 #include "TTFont.h"
-#include "JSUPPORT.H"		// [OYO]
+#include "JSUPPORT.h"		// [OYO]
 #include "Locale_API.h"
 
 
@@ -74,7 +74,7 @@ TTFontClass *TTTextFontPtr			= NULL;
 TTFontClass	*TTTextFontPtr640		= NULL;
 TTFontClass	*TTTextFontPtr800		= NULL;
 TTFontClass	*TTLicenseFontPtr		= NULL;
-									
+
 FontManagerClass * FontManager		= NULL;
 
 //unsigned long TEXT_COLOR			  		= RGB( 247, 171,  11 );
@@ -82,57 +82,57 @@ FontManagerClass * FontManager		= NULL;
 unsigned long TEXT_COLOR			  		= RGB( 255, 204,  51 );
 unsigned long SHADOW_COLOR		  			= RGB(  40,   8,   8 );
 
-unsigned long TEXT_NORMAL_COLOR	  	   		= RGB( 255, 204,  51 );	 
-unsigned long TEXT_NORMAL_SHADOW_COLOR 		= RGB(  40,   8,   8 );	 
+unsigned long TEXT_NORMAL_COLOR	  	   		= RGB( 255, 204,  51 );
+unsigned long TEXT_NORMAL_SHADOW_COLOR 		= RGB(  40,   8,   8 );
 unsigned long TEXT_FOCUSED_COLOR		 	= RGB( 255, 204,  51 );
-unsigned long TEXT_FOCUSED_SHADOW_COLOR  	= RGB(  40,   8,   8 );	 
+unsigned long TEXT_FOCUSED_SHADOW_COLOR  	= RGB(  40,   8,   8 );
 unsigned long TEXT_PRESSED_COLOR		 	= RGB( 194,  79,  32 );
-unsigned long TEXT_PRESSED_SHADOW_COLOR  	= RGB(  70,  55,  49 );	 
+unsigned long TEXT_PRESSED_SHADOW_COLOR  	= RGB(  70,  55,  49 );
 
 
-unsigned long BLACK_COLOR					= RGB(   0,	  0,   0 );      
+unsigned long BLACK_COLOR					= RGB(   0,	  0,   0 );
 unsigned long WHITE_COLOR					= RGB( 255, 255, 255 );
-unsigned long RED_COLOR						= RGB( 255,   0,   0 );    
+unsigned long RED_COLOR						= RGB( 255,   0,   0 );
 unsigned long ORANGE_COLOR					= RGB( 199,  91,   0 );
 unsigned long YELLOW_COLOR					= RGB( 255, 247,   0 );
-unsigned long GREEN_COLOR					= RGB(   0, 255,   0 );    
+unsigned long GREEN_COLOR					= RGB(   0, 255,   0 );
 unsigned long BLUE_COLOR					= RGB(   0,   0, 255 );
 unsigned long INDIGO_COLOR		  			= RGB(  90,   2, 253 );
 unsigned long VIOLET_COLOR		  			= RGB( 128,   0, 255 );
 
 
 /************************************************************************************
- * TTFontClass::TTFontClass -- Constructor for a font class object.					* 
- *																					* 
- *	This constructs a font object as it is based upon the true type windows fonts.	* 
- *																					* 
+ * TTFontClass::TTFontClass -- Constructor for a font class object.					*
+ *																					*
+ *	This constructs a font object as it is based upon the true type windows fonts.	*
+ *																					*
  * INPUT:   char *filename -- True Type Windows font file to open.					*
  *			char *facename -- It's face name.										*
  *          int   height   -- The height requested.									*
- *																					* 
- * OUTPUT:		none																* 
- *																					* 
- * WARNINGS:	none																* 
- *                                                                                  * 
- * HISTORY:                                                                         * 
- *   08/24/1999 MML : Created.                                                      * 
+ *																					*
+ * OUTPUT:		none																*
+ *																					*
+ * WARNINGS:	none																*
+ *                                                                                  *
+ * HISTORY:                                                                         *
+ *   08/24/1999 MML : Created.                                                      *
  *==================================================================================*/
 TTFontClass::TTFontClass(
 	HDC		hdc,
-	char *filename, 
-	char *facename, 
-	int		height, 
-	int		weight, 
-	BYTE	charset, 
-	int		width, 
-	int		escapement, 
-	int		orientation, 
-	BYTE	italic, 
-	BYTE	underline, 
-	BYTE	strikeout, 
-	BYTE	outputPrecision, 
-	BYTE	clipPrecision, 
-	BYTE	quality, 
+	char *filename,
+	char *facename,
+	int		height,
+	int		weight,
+	BYTE	charset,
+	int		width,
+	int		escapement,
+	int		orientation,
+	BYTE	italic,
+	BYTE	underline,
+	BYTE	strikeout,
+	BYTE	outputPrecision,
+	BYTE	clipPrecision,
+	BYTE	quality,
 	BYTE	pitchAndFamily )
 {
 	HGDIOBJ		old_object;
@@ -164,27 +164,27 @@ TTFontClass::TTFontClass(
 	// Make sure the font file is "Registered".  Then create the font.
 	//--------------------------------------------------------------------------
 	AddFontResource( szFilename );
-	Font = CreateFont( 
-				height, 
-				width, 
-				escapement, 
-				orientation, 
-				weight, 
-				italic, 
-				underline, 
+	Font = CreateFont(
+				height,
+				width,
+				escapement,
+				orientation,
+				weight,
+				italic,
+				underline,
 				strikeout,
-				charset, 
-				outputPrecision, 
-				clipPrecision, 
-				quality, 
-				pitchAndFamily, 
+				charset,
+				outputPrecision,
+				clipPrecision,
+				quality,
+				pitchAndFamily,
 				szFacename );
 
 	if ( hdc && ( Font != NULL )) {
 
 		//----------------------------------------------------------------------
 		// The GetTextFace function lets a program determine the face name of
-		// THE font currently selected in the device context: 
+		// THE font currently selected in the device context:
 		//----------------------------------------------------------------------
 		old_object = SelectObject( hdc, Font );
 		GetTextFace( hdc, ( sizeof( real_facename ) / sizeof( TCHAR )), real_facename );
@@ -198,21 +198,21 @@ TTFontClass::TTFontClass(
 			DeleteObject( Font );
 			Font = NULL;
 
-			Font = CreateFont(				
-					height,				// height of font             
-					width, 				// average character width    
-					escapement, 		// angle of escapement        
+			Font = CreateFont(
+					height,				// height of font
+					width, 				// average character width
+					escapement, 		// angle of escapement
 					orientation, 		// base-line orientation angle
-					weight, 			// font weight                
-					italic, 			// italic attribute option    
-					underline, 			// underline attribute option 
-					strikeout,			// strikeout attribute option 
-					charset, 			// character set identifier   
-					outputPrecision, 	// output precision           
-					clipPrecision, 		// clipping precision         
-					quality, 			// output quality             
-					pitchAndFamily, 	// pitch and family           
-					szFacename );		// typeface name              
+					weight, 			// font weight
+					italic, 			// italic attribute option
+					underline, 			// underline attribute option
+					strikeout,			// strikeout attribute option
+					charset, 			// character set identifier
+					outputPrecision, 	// output precision
+					clipPrecision, 		// clipping precision
+					quality, 			// output quality
+					pitchAndFamily, 	// pitch and family
+					szFacename );		// typeface name
 
 			real_facename[0] = '\0';
 			old_object = SelectObject( hdc, Font );
@@ -221,7 +221,7 @@ TTFontClass::TTFontClass(
 	}
 
 	//--------------------------------------------------------------------------
-	// Save off the height. 
+	// Save off the height.
 	//--------------------------------------------------------------------------
 	Height = height;
 
@@ -261,28 +261,28 @@ TTFontClass::TTFontClass(
 		Overhang		= 0;
 		Italic			= 0;
 		Underlined		= 0;
-		StruckOut		= 0;    
+		StruckOut		= 0;
 		CharSet			= 0;								// [OYO]
 		FontXSpacing	= 0;
 	}
 }
 
 
-/*********************************************************************************************** 
- * TTFontClass::Char_Pixel_Width -- Fetch the pixel width of the character specified.          * 
- *                                                                                             * 
- *    This will return with the pixel width of the character specified.                        * 
- *                                                                                             * 
- * INPUT:   c  -- The character to determine the pixel width for.                              * 
- *                                                                                             * 
- * OUTPUT:  Returns with the pixel width of the character.                                     * 
- *                                                                                             * 
- * WARNINGS:   The return width is the screen real estate width which may differ from the      * 
- *             actual pixels of the character. This difference is controlled by the font       * 
- *             X spacing.                                                                      * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/26/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * TTFontClass::Char_Pixel_Width -- Fetch the pixel width of the character specified.          *
+ *                                                                                             *
+ *    This will return with the pixel width of the character specified.                        *
+ *                                                                                             *
+ * INPUT:   c  -- The character to determine the pixel width for.                              *
+ *                                                                                             *
+ * OUTPUT:  Returns with the pixel width of the character.                                     *
+ *                                                                                             *
+ * WARNINGS:   The return width is the screen real estate width which may differ from the      *
+ *             actual pixels of the character. This difference is controlled by the font       *
+ *             X spacing.                                                                      *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/26/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 
 int TTFontClass::Char_Pixel_Width( HDC hdc, UINT c ) const
@@ -302,26 +302,26 @@ int TTFontClass::Char_Pixel_Width( HDC hdc, UINT c ) const
 	return( abc.abcA + abc.abcB + abc.abcC );
 }
 
-/************************************************************************************************ 
- * TTFontClass::Char_Pixel_Width -- Fetch the pixel width of the character specified.		   
- *																							    
- *    This will return with the pixel width of the character specified.						   
- *																							    
- * INPUT:  		HDC hdc		  		-- must be passed in from calling function.				   
- *				char const * string	-- the pointer to the character in the string.			   
- *				int *num_bytes		-- return number of bytes this character has: 1 or 2.	   
- *																							    
- * OUTPUT:		Returns with the pixel width of the character.                                 
- *																							    
- * WARNINGS:	The return width is the screen real estate width which may differ from the	   
- *				actual pixels of the character. This difference is controlled by the font	   
- *				X spacing.																	   
- *																							    
- * NOTE:		This is function determines if the character is a double-byte or single-byte   
- *				character, then calls the standard Char_Pixel_Width.						   
- *																							    
- * HISTORY:																					   
- *   05/26/1997 JLB : Created.																   
+/************************************************************************************************
+ * TTFontClass::Char_Pixel_Width -- Fetch the pixel width of the character specified.
+ *
+ *    This will return with the pixel width of the character specified.
+ *
+ * INPUT:  		HDC hdc		  		-- must be passed in from calling function.
+ *				char const * string	-- the pointer to the character in the string.
+ *				int *num_bytes		-- return number of bytes this character has: 1 or 2.
+ *
+ * OUTPUT:		Returns with the pixel width of the character.
+ *
+ * WARNINGS:	The return width is the screen real estate width which may differ from the
+ *				actual pixels of the character. This difference is controlled by the font
+ *				X spacing.
+ *
+ * NOTE:		This is function determines if the character is a double-byte or single-byte
+ *				character, then calls the standard Char_Pixel_Width.
+ *
+ * HISTORY:
+ *   05/26/1997 JLB : Created.
  *==============================================================================================*/
 //
 // [OYO]	Supports DBCS ( multi-byte characters ).
@@ -350,7 +350,7 @@ int TTFontClass::Char_Pixel_Width ( HDC hdc, char const * string, int *num_bytes
 	// Get the pixel width of the character.  If it is a double-byte character,
 	// then num_bytes will come back as '2'.
 	//--------------------------------------------------------------------------
-	if( IsFontDBCS() && IsDBCSLeadByte( *letter )){		
+	if( IsFontDBCS() && IsDBCSLeadByte( *letter )){
 		c = Get_Double_Byte_Char( letter, num_bytes );
 		length += Char_Pixel_Width( hdc, c );									// pixel length of double-byte character.
 	} else {
@@ -360,25 +360,25 @@ int TTFontClass::Char_Pixel_Width ( HDC hdc, char const * string, int *num_bytes
 }
 
 
-/************************************************************************************************ 
- * TTFontClass::String_Pixel_Width -- Determines the width of the string in pixels.				* 
- *																								* 
- *    This routine is used to determine how many pixels wide the string will be if it were		* 
- *    printed.																					* 
- *																								* 
- * INPUT:		string   -- The string to convert into its pixel width.							* 
- *																								* 
- * OUTPUT:		Returns with the number of pixels the string would span if it were printed.		* 
- *																								* 
- * WARNINGS:	This routine does not take into account clipping.								* 
+/************************************************************************************************
+ * TTFontClass::String_Pixel_Width -- Determines the width of the string in pixels.				*
+ *																								*
+ *    This routine is used to determine how many pixels wide the string will be if it were		*
+ *    printed.																					*
+ *																								*
+ * INPUT:		string   -- The string to convert into its pixel width.							*
+ *																								*
+ * OUTPUT:		Returns with the number of pixels the string would span if it were printed.		*
+ *																								*
+ * WARNINGS:	This routine does not take into account clipping.								*
  *                                   															*
- * HISTORY:																						* 
- *   05/26/1997 JLB : Created.																	* 
+ * HISTORY:																						*
+ *   05/26/1997 JLB : Created.																	*
  *==============================================================================================*/
 
 int TTFontClass::String_Pixel_Width( HDC hdc, char const * string ) const
 {
-	if ( string == NULL ) { 
+	if ( string == NULL ) {
 		return(0);
 	}
 
@@ -484,17 +484,17 @@ void TTFontClass::String_Pixel_Bounds( HDC hdc, const char* string, Rect& bounds
 	bounds.Height	= height;
 }
 
-/*********************************************************************************************** 
- * TTFontClass::Get_Double_Byte_Char -- Get the first character even if DBSC.				  
- *                                                                                            
- * INPUT:   char * -- string to look at.                                                      
- *                                                                                            
- * OUTPUT:  Returns with the normalized width of the character in the font.					   
- *                                                                                            
- * WARNINGS:	I added this function based on code provided by Ikeda-san.					  
- *                                                                                            
- * HISTORY:                                                                                   
- *   06/05/2000 MML : Created.                                                                
+/***********************************************************************************************
+ * TTFontClass::Get_Double_Byte_Char -- Get the first character even if DBSC.
+ *
+ * INPUT:   char * -- string to look at.
+ *
+ * OUTPUT:  Returns with the normalized width of the character in the font.
+ *
+ * WARNINGS:	I added this function based on code provided by Ikeda-san.
+ *
+ * HISTORY:
+ *   06/05/2000 MML : Created.
  *=============================================================================================*/
 //
 // [OYO]	Supports DBCS ( multi-byte characters ).
@@ -513,28 +513,28 @@ UINT TTFontClass::Get_Double_Byte_Char	( const char *string, int *num_bytes ) co
 	}
 
 	//--------------------------------------------------------------------------
-	// The IsDBCSLeadByte function determines whether a character is a 
+	// The IsDBCSLeadByte function determines whether a character is a
 	// lead byte - that is, the first byte of a character in a double-byte
-	// character set (DBCS). 
+	// character set (DBCS).
 	//
 	//	BOOL IsDBCSLeadByte(  BYTE TestChar  /* character to test */ );
 	//
-	//	TestChar -- Specifies the character to be tested. 
+	//	TestChar -- Specifies the character to be tested.
 	//
 	// Return Values
 	//		If the character is a lead byte, the return value is nonzero.
-	//		If the character is not a lead byte, the return value is zero. 
-	//		To get extended error information, call GetLastError. 
+	//		If the character is not a lead byte, the return value is zero.
+	//		To get extended error information, call GetLastError.
 	//	Remarks
-	//		Lead bytes are unique to double-byte character sets. 
-	//		A lead byte introduces a double-byte character. Lead bytes 
-	//		occupy a specific range of byte values. The IsDBCSLeadByte 
-	//		function uses the ANSI code page to check lead-byte ranges. 
-	//		To specify a different code page, use the IsDBCSLeadByteEx function. 
+	//		Lead bytes are unique to double-byte character sets.
+	//		A lead byte introduces a double-byte character. Lead bytes
+	//		occupy a specific range of byte values. The IsDBCSLeadByte
+	//		function uses the ANSI code page to check lead-byte ranges.
+	//		To specify a different code page, use the IsDBCSLeadByteEx function.
 	//
 	//	Declared in winnls.h.
 	//--------------------------------------------------------------------------
-	if( IsDBCSLeadByte( c )&& *ptr ) {		// [OYO]	
+	if( IsDBCSLeadByte( c )&& *ptr ) {		// [OYO]
 		c = ( c << 8 ) | *(BYTE *)ptr++;
 		if ( num_bytes != NULL ) {
 			*num_bytes = 2;
@@ -544,61 +544,61 @@ UINT TTFontClass::Get_Double_Byte_Char	( const char *string, int *num_bytes ) co
 }
 
 
-/*********************************************************************************************** 
- * TTFontClass::Get_Width -- Get normalized width of the nominal font character.               * 
- *                                                                                             * 
- *    This routine is used to fetch the width of the widest character in the font but the      * 
- *    width has been biased according to any X spacing override present.                       * 
- *                                                                                             * 
- * INPUT:   none                                                                               * 
- *                                                                                             * 
- * OUTPUT:  Returns with the normalized width of the widest character in the font.             * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/26/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * TTFontClass::Get_Width -- Get normalized width of the nominal font character.               *
+ *                                                                                             *
+ *    This routine is used to fetch the width of the widest character in the font but the      *
+ *    width has been biased according to any X spacing override present.                       *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  Returns with the normalized width of the widest character in the font.             *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/26/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 int TTFontClass::Get_Width( void ) const
 {
 	return( MaxCharWidth - Overhang );
 }
 
-/*********************************************************************************************** 
- * TTFontClass::Get_Height -- Fetch the normalized height of the nominal font character.       * 
- *                                                                                             * 
- *    This will return the height of the font but the returned height will be adjusted by any  * 
- *    Y spacing override present.                                                              * 
- *                                                                                             * 
- * INPUT:   none                                                                               * 
- *                                                                                             * 
- * OUTPUT:  Returns with the height of the font normalized by any spacing overrides.           * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/26/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * TTFontClass::Get_Height -- Fetch the normalized height of the nominal font character.       *
+ *                                                                                             *
+ *    This will return the height of the font but the returned height will be adjusted by any  *
+ *    Y spacing override present.                                                              *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  Returns with the height of the font normalized by any spacing overrides.           *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/26/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 int TTFontClass::Get_Height( void ) const
 {
 	return( Height );
 }
 
-/*********************************************************************************************** 
- * TTFontClass::Set_XSpacing -- Set the X spacing override value.                              * 
- *                                                                                             * 
- *    Use this routine to control the horizontal spacing override for this font. If the value  * 
- *    is negative, the font becomes compressed. If the value is positive, then the font        * 
- *    becomes expanded.                                                                        * 
- *                                                                                             * 
- * INPUT:   x  -- The X spacing override to use for this font.                                 * 
- *                                                                                             * 
- * OUTPUT:  Returns with the old X spacing override value.                                     * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/26/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * TTFontClass::Set_XSpacing -- Set the X spacing override value.                              *
+ *                                                                                             *
+ *    Use this routine to control the horizontal spacing override for this font. If the value  *
+ *    is negative, the font becomes compressed. If the value is positive, then the font        *
+ *    becomes expanded.                                                                        *
+ *                                                                                             *
+ * INPUT:   x  -- The X spacing override to use for this font.                                 *
+ *                                                                                             *
+ * OUTPUT:  Returns with the old X spacing override value.                                     *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/26/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 int TTFontClass::Set_XSpacing( HDC hdc, int x )
 {
@@ -615,21 +615,21 @@ int TTFontClass::Set_XSpacing( HDC hdc, int x )
 }
 
 
-/*********************************************************************************************** 
- * TTFontClass::Set_YSpacing -- Set the vertical (Y) spacing override value.                   * 
- *                                                                                             * 
- *    Use this routine to control the "line spacing" of a font. If the Y spacing is negative   * 
- *    then the font becomes closer to the line above it. If value is positive, then more       * 
- *    space occurs between lines.                                                              * 
- *                                                                                             * 
- * INPUT:   y  -- The Y spacing override to use for this font.                                 * 
- *                                                                                             * 
- * OUTPUT:  Returns with the old Y spacing override value.                                     * 
- *                                                                                             * 
- * WARNINGS:   none                                                                            * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/26/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * TTFontClass::Set_YSpacing -- Set the vertical (Y) spacing override value.                   *
+ *                                                                                             *
+ *    Use this routine to control the "line spacing" of a font. If the Y spacing is negative   *
+ *    then the font becomes closer to the line above it. If value is positive, then more       *
+ *    space occurs between lines.                                                              *
+ *                                                                                             *
+ * INPUT:   y  -- The Y spacing override to use for this font.                                 *
+ *                                                                                             *
+ * OUTPUT:  Returns with the old Y spacing override value.                                     *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/26/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 int TTFontClass::Set_YSpacing( int y )
 {
@@ -638,36 +638,36 @@ int TTFontClass::Set_YSpacing( int y )
 }
 
 
-/*********************************************************************************************** 
- * TTFontClass::Print -- Print text to the surface specified.  WCHAR Version.		           * 
- *                                                                                             * 
- *    This displays text to the surface specified and with the attributes specified.           * 
- *                                                                                             * 
- * INPUT:   string   -- The string to display to the surface.                                  * 
- *          surface  -- The surface to display the text upon.                                  * 
- *          cliprect -- The clipping rectangle that both clips the text and biases the print   * 
- *                      location to.                                                           * 
- *          point    -- The draw position for the upper left corner of the first character.    * 
- *          convert  -- The pixel convert object that is used to draw the correct colors to    * 
- *                      the destination surface.                                               * 
- *          remap    -- Auxiliary remap table for font colors.                                 * 
- *                                                                                             * 
- * OUTPUT:  Returns with the point where the next print should begin if it is to smoothly      * 
- *          continue where this print operation left off.                                      * 
- *                                                                                             * 
- * WARNINGS: There are two separate drawing routines; one for old fonts and one for new fonts. * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/26/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * TTFontClass::Print -- Print text to the surface specified.  WCHAR Version.		           *
+ *                                                                                             *
+ *    This displays text to the surface specified and with the attributes specified.           *
+ *                                                                                             *
+ * INPUT:   string   -- The string to display to the surface.                                  *
+ *          surface  -- The surface to display the text upon.                                  *
+ *          cliprect -- The clipping rectangle that both clips the text and biases the print   *
+ *                      location to.                                                           *
+ *          point    -- The draw position for the upper left corner of the first character.    *
+ *          convert  -- The pixel convert object that is used to draw the correct colors to    *
+ *                      the destination surface.                                               *
+ *          remap    -- Auxiliary remap table for font colors.                                 *
+ *                                                                                             *
+ * OUTPUT:  Returns with the point where the next print should begin if it is to smoothly      *
+ *          continue where this print operation left off.                                      *
+ *                                                                                             *
+ * WARNINGS: There are two separate drawing routines; one for old fonts and one for new fonts. *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/26/1997 JLB : Created.                                                                 *
  *	  06/20/1887 BNA : Modified to handle new fonts.														  *
  *=============================================================================================*/
 
-#if(NDEBUG)
+#ifdef RTS_RELEASE
 
-Point2D TTFontClass::Print( 
-	HDC hdc, 
-	wchar_t const * string, 
-	Rect const & cliprect, 
+Point2D TTFontClass::Print(
+	HDC hdc,
+	wchar_t const * string,
+	Rect const & cliprect,
 	COLORREF forecolor,		/* = TEXT_COLOR,		*/
 	COLORREF backcolor,		/* = TEXT_SHADOW_COLOR,	*/
 	TextFormatType flag,  	/* = TPF_DEFAULT,		*/
@@ -684,10 +684,10 @@ Point2D TTFontClass::Print(
 
 #else
 
-Point2D TTFontClass::Print( 
-	HDC hdc, 
-	wchar_t const * string, 
-	Rect const & cliprect, 
+Point2D TTFontClass::Print(
+	HDC hdc,
+	wchar_t const * string,
+	Rect const & cliprect,
 	COLORREF forecolor,		/* = TEXT_COLOR,		*/
 	COLORREF backcolor,		/* = TEXT_SHADOW_COLOR,	*/
 	TextFormatType flag,  	/* = TPF_DEFAULT,		*/
@@ -757,14 +757,14 @@ Point2D TTFontClass::Print(
 // 			string,				// character string
 // 			length				// number of characters
 // 		);
- 
- 		result = DrawTextW( 
- 			hdc, 
- 			string, 
- 			length, 
- 			&rect, 
+
+ 		result = DrawTextW(
+ 			hdc,
+ 			string,
+ 			length,
+ 			&rect,
  			flag );
- 
+
 		GetTextExtentPointW( hdc, string, length, &size );
 		SelectObject( hdc, old_object );
 	}
@@ -772,36 +772,36 @@ Point2D TTFontClass::Print(
 	return( point );
 }
 
-#endif
-
-/*********************************************************************************************** 
- * TTFontClass::Print -- Print text to the surface specified.  CHAR version.                   * 
- *                                                                                             * 
- *    This displays text to the surface specified and with the attributes specified.           * 
- *                                                                                             * 
- * INPUT:   string   -- The string to display to the surface.                                  * 
- *          surface  -- The surface to display the text upon.                                  * 
- *          cliprect -- The clipping rectangle that both clips the text and biases the print   * 
- *                      location to.                                                           * 
- *          point    -- The draw position for the upper left corner of the first character.    * 
- *          convert  -- The pixel convert object that is used to draw the correct colors to    * 
- *                      the destination surface.                                               * 
- *          remap    -- Auxiliary remap table for font colors.                                 * 
- *                                                                                             * 
- * OUTPUT:  Returns with the point where the next print should begin if it is to smoothly      * 
- *          continue where this print operation left off.                                      * 
- *                                                                                             * 
- * WARNINGS: There are two separate drawing routines; one for old fonts and one for new fonts. * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/26/1997 JLB : Created.                                                                 * 
+#endif // RTS_RELEASE
+
+/***********************************************************************************************
+ * TTFontClass::Print -- Print text to the surface specified.  CHAR version.                   *
+ *                                                                                             *
+ *    This displays text to the surface specified and with the attributes specified.           *
+ *                                                                                             *
+ * INPUT:   string   -- The string to display to the surface.                                  *
+ *          surface  -- The surface to display the text upon.                                  *
+ *          cliprect -- The clipping rectangle that both clips the text and biases the print   *
+ *                      location to.                                                           *
+ *          point    -- The draw position for the upper left corner of the first character.    *
+ *          convert  -- The pixel convert object that is used to draw the correct colors to    *
+ *                      the destination surface.                                               *
+ *          remap    -- Auxiliary remap table for font colors.                                 *
+ *                                                                                             *
+ * OUTPUT:  Returns with the point where the next print should begin if it is to smoothly      *
+ *          continue where this print operation left off.                                      *
+ *                                                                                             *
+ * WARNINGS: There are two separate drawing routines; one for old fonts and one for new fonts. *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/26/1997 JLB : Created.                                                                 *
  *	  06/20/1887 BNA : Modified to handle new fonts.														  *
  *=============================================================================================*/
 
-Point2D TTFontClass::Print( 
-	HDC hdc, 
-	char const * string, 
-	Rect const & cliprect, 
+Point2D TTFontClass::Print(
+	HDC hdc,
+	char const * string,
+	Rect const & cliprect,
 	COLORREF forecolor,		/* = TEXT_COLOR,		*/
 	COLORREF backcolor,		/* = TEXT_SHADOW_COLOR,	*/
 	TextFormatType flag,  	/* = TPF_DEFAULT,		*/
@@ -1014,7 +1014,7 @@ Point2D TTFontClass::Print(
 		}
 
 		SetTextColor( hdc, forecolor );
-		result = DrawText( hdc, string, length,	&rect, flag  );		
+		result = DrawText( hdc, string, length,	&rect, flag  );
 		assert( result != 0 );
 
 		GetTextExtentPoint( hdc, string, length, &size );
@@ -1043,7 +1043,7 @@ int TTFontClass::Find_Text_VLength( HDC hdc, char *str, int width )
 	int	curlen	= 0;
 	int	lastlen	= 0;
 	int	lines		= Get_Height();
-	char *letter	= str; 
+	char *letter	= str;
 	bool	make_dc	= FALSE;
 	HDC	localDC	= hdc;
 
@@ -1070,7 +1070,7 @@ int TTFontClass::Find_Text_VLength( HDC hdc, char *str, int width )
 		lines = 0;
 
 		//-----------------------------------------------------------------------
-		// If the string in longer than the width given, calculate the number of 
+		// If the string in longer than the width given, calculate the number of
 		// lines needed in pixels (height of string in pixels ).
 		//-----------------------------------------------------------------------
 		if ( curlen > width ) {
@@ -1091,7 +1091,7 @@ int TTFontClass::Find_Text_VLength( HDC hdc, char *str, int width )
 		//-----------------------------------------------------------------------
 		// Check for any newlines.  Add one line per newline.
 		//-----------------------------------------------------------------------
-		letter = str; 
+		letter = str;
 		while ( *letter ) {
 			if ( *letter == '\n') {
 				lines += Get_Height();
@@ -1148,7 +1148,7 @@ int TTFontClass::Find_Text_VLength( HDC hdc, char *str, int width )
 					//--------------------------------------------------------------
 					wspc += Char_Pixel_Width( localDC, ' ' );
 				}
-			} // end-of-for
+			}
 
 			//--------------------------------------------------------------------
 			//
@@ -1159,7 +1159,7 @@ int TTFontClass::Find_Text_VLength( HDC hdc, char *str, int width )
 			}
 
 			//--------------------------------------------------------------------
-			// !!! If one block length bigger than available width, 
+			// !!! If one block length bigger than available width,
 			// next line will be overflow. but never endless loop. !!!
 			//--------------------------------------------------------------------
 			lastlen += curlen + wspc;
@@ -1173,7 +1173,7 @@ int TTFontClass::Find_Text_VLength( HDC hdc, char *str, int width )
 			}
 			letter += n;
 
-		} // end-of-while
+		}
 
 		//-----------------------------------------------------------------------
 		// Left over, add a line.
@@ -1192,17 +1192,17 @@ int TTFontClass::Find_Text_VLength( HDC hdc, char *str, int width )
 	return( lines );
 }
 
-/*********************************************************************************************** 
- * FontManagerClass::FontManagerClass -- Constructor for FontManager class.                    * 
- *                                                                                             * 
+/***********************************************************************************************
+ * FontManagerClass::FontManagerClass -- Constructor for FontManager class.                    *
+ *                                                                                             *
  * INPUT:		none.                                                                          *
- *                                                                                             * 
- * OUTPUT:  	none                                                                           * 
- *                                                                                             * 
- * WARNINGS:	none                                                                           * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   03/26/1998 MML : Created.                                                                 * 
+ *                                                                                             *
+ * OUTPUT:  	none                                                                           *
+ *                                                                                             *
+ * WARNINGS:	none                                                                           *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/26/1998 MML : Created.                                                                 *
  *=============================================================================================*/
 FontManagerClass::FontManagerClass ( HDC hdc )
 {
@@ -1244,23 +1244,23 @@ FontManagerClass::FontManagerClass ( HDC hdc )
 		//---------------------------------------------------------------------
 		// Create the True Type Fonts.
 		//
-		//	Value			Weight 
+		//	Value			Weight
 		//	____________________________
-		//	FW_DONTCARE		0 
-		//	FW_THIN			100 
-		//	FW_EXTRALIGHT	200 
-		//	FW_ULTRALIGHT	200 
-		//	FW_LIGHT		300 
-		//	FW_NORMAL		400 
-		//	FW_REGULAR		400 
-		//	FW_MEDIUM		500 
-		//	FW_SEMIBOLD		600 
-		//	FW_DEMIBOLD		600 
-		//	FW_BOLD			700 
-		//	FW_EXTRABOLD	800 
-		//	FW_ULTRABOLD	800 
-		//	FW_HEAVY		900 
-		//	FW_BLACK		900 
+		//	FW_DONTCARE		0
+		//	FW_THIN			100
+		//	FW_EXTRALIGHT	200
+		//	FW_ULTRALIGHT	200
+		//	FW_LIGHT		300
+		//	FW_NORMAL		400
+		//	FW_REGULAR		400
+		//	FW_MEDIUM		500
+		//	FW_SEMIBOLD		600
+		//	FW_DEMIBOLD		600
+		//	FW_BOLD			700
+		//	FW_EXTRABOLD	800
+		//	FW_ULTRABOLD	800
+		//	FW_HEAVY		900
+		//	FW_BLACK		900
 		//---------------------------------------------------------------------
 
 		switch( LanguageID ) { 	// [OYO] Add this line if you wish to support another languages
@@ -1282,7 +1282,7 @@ FontManagerClass::FontManagerClass ( HDC hdc )
 					TTTextFontPtr640	= new TTFontClass( hdc, szFile, szFacename, 14, FW_MEDIUM,	SHIFTJIS_CHARSET );
 					TTTextFontPtr800	= new TTFontClass( hdc, szFile, szFacename, 14, FW_MEDIUM,	SHIFTJIS_CHARSET );
 					TTLicenseFontPtr	= new TTFontClass( hdc, szFile, szFacename, 12, FW_NORMAL,	SHIFTJIS_CHARSET );
-				}																	
+				}
 				break;
 
 			//=================================================================
@@ -1302,7 +1302,7 @@ FontManagerClass::FontManagerClass ( HDC hdc )
 					TTTextFontPtr640	= new TTFontClass( hdc, szFile, szFacename, 14, FW_MEDIUM,	HANGEUL_CHARSET );
 					TTTextFontPtr800	= new TTFontClass( hdc, szFile, szFacename, 14, FW_MEDIUM,	HANGEUL_CHARSET );
 					TTLicenseFontPtr	= new TTFontClass( hdc, szFile, szFacename, 12, FW_NORMAL,	HANGEUL_CHARSET );
-				}																	
+				}
 				break;
 
 			//=================================================================
@@ -1384,50 +1384,47 @@ FontManagerClass::FontManagerClass ( HDC hdc )
 	assert( TTLicenseFontPtr		!= NULL );
 }
 
-/*********************************************************************************************** 
- * FontManagerClass::~FontManagerClass -- Destructor for FontManager class.                    * 
- *                                                                                             * 
+/***********************************************************************************************
+ * FontManagerClass::~FontManagerClass -- Destructor for FontManager class.                    *
+ *                                                                                             *
  * INPUT:		none.                                                                          *
- *                                                                                             * 
- * OUTPUT:  	none                                                                           * 
- *                                                                                             * 
- * WARNINGS:	none																		   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   03/26/1998 MML : Created.                                                                 * 
+ *                                                                                             *
+ * OUTPUT:  	none                                                                           *
+ *                                                                                             *
+ * WARNINGS:	none																		   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/26/1998 MML : Created.                                                                 *
  *=============================================================================================*/
 FontManagerClass::~FontManagerClass ( void )
 {
-	if ( TTButtonFontPtr != NULL ) {
-		delete TTButtonFontPtr;
-		TTButtonFontPtr = NULL;
-	}
-	if ( TTTextFontPtr != NULL ) {
-		delete TTTextFontPtr;
-		TTTextFontPtr = NULL;
-	}
+	delete TTButtonFontPtr;
+	TTButtonFontPtr = NULL;
+
+	delete TTTextFontPtr;
+	TTTextFontPtr = NULL;
 }
 
 
-/*********************************************************************************************** 
- * Font_From_TPF -- Convert flags into a font pointer.                                         * 
- *                                                                                             * 
- *    This routine will examine the specified flags and return with a pointer to the font      * 
- *    that the flags represent.                                                                * 
- *                                                                                             * 
- * INPUT:   flags -- The flags to convert into a font pointer.                                 * 
- *                                                                                             * 
- * OUTPUT:  Returns with a font pointer that matches the flags.                                * 
- *                                                                                             * 
- * WARNINGS:   If no match could be found, a default font pointer is returned.                 * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/26/1997 JLB : Created.                                                                 * 
+/***********************************************************************************************
+ * Font_From_TPF -- Convert flags into a font pointer.                                         *
+ *                                                                                             *
+ *    This routine will examine the specified flags and return with a pointer to the font      *
+ *    that the flags represent.                                                                *
+ *                                                                                             *
+ * INPUT:   flags -- The flags to convert into a font pointer.                                 *
+ *                                                                                             *
+ * OUTPUT:  Returns with a font pointer that matches the flags.                                *
+ *                                                                                             *
+ * WARNINGS:   If no match could be found, a default font pointer is returned.                 *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/26/1997 JLB : Created.                                                                 *
  *=============================================================================================*/
 TTFontClass * Font_From_TPF ( TextPrintType flags )
 {
 	TTFontClass *fontptr= NULL;
-   
+
 	switch (flags & 0x000F) {
 
 		case TPF_BUTTON_FONT:
@@ -1446,27 +1443,27 @@ TTFontClass * Font_From_TPF ( TextPrintType flags )
 }
 
 
-/************************************************************************************************ 
- * Is_True_Type_Font -- Convert flags into a font pointer.										* 
- *																								* 
- *    This routine will examine the specified flags and return with a pointer to the font		* 
- *    that the flags represent.																	* 
- *																								* 
- * INPUT:   flags -- The flags to convert into a font pointer.									* 
- *																								* 
- * OUTPUT:  Returns with a font pointer that matches the flags.									* 
- *																								* 
- * WARNINGS:   If no match could be found, a default font pointer is returned.					* 
- *																								* 
- * HISTORY:																						* 
- *   05/26/1997 JLB : Created.																	* 
+/************************************************************************************************
+ * Is_True_Type_Font -- Convert flags into a font pointer.										*
+ *																								*
+ *    This routine will examine the specified flags and return with a pointer to the font		*
+ *    that the flags represent.																	*
+ *																								*
+ * INPUT:   flags -- The flags to convert into a font pointer.									*
+ *																								*
+ * OUTPUT:  Returns with a font pointer that matches the flags.									*
+ *																								*
+ * WARNINGS:   If no match could be found, a default font pointer is returned.					*
+ *																								*
+ * HISTORY:																						*
+ *   05/26/1997 JLB : Created.																	*
  *==============================================================================================*/
 
 bool Is_True_Type_Font( TextPrintType flags )
 {
 	if (( flags == TPF_BUTTON_FONT ) || ( flags == TPF_TEXT_FONT )) {
 		return TRUE;
-	} else { 
+	} else {
 		return FALSE;
 	}
 }
diff --git a/Core/Tools/Autorun/TTFont.h b/Core/Tools/Autorun/TTFont.h
index cab48fd06b8..56138857bff 100644
--- a/Core/Tools/Autorun/TTFont.h
+++ b/Core/Tools/Autorun/TTFont.h
@@ -16,29 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/************************************************************************************************ 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S				  *** 
- ************************************************************************************************ 
- *																								* 
- *                 Project Name: Setup														  	* 
- *																								* 
- *                      Archive: ttfont.h														* 
- *																								* 
+/************************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S				  ***
+ ************************************************************************************************
+ *																								*
+ *                 Project Name: Setup														  	*
+ *																								*
+ *                      Archive: ttfont.h														*
+ *																								*
  *                       Author: Joe_b															*
- *																								* 
+ *																								*
  *                      Modtime: 6/23/97 3:14p													*
- *																								* 
+ *																								*
  *                      Updated: 08/01/2000 [MML]												*
  *																								*
  *                     Revision: 22																*
  *																								*
- *----------------------------------------------------------------------------------------------* 
- * Functions:																					* 
+ *----------------------------------------------------------------------------------------------*
+ * Functions:																					*
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
-#pragma once
 
-#ifndef TTFONT_H
-#define TTFONT_H
+#pragma once
 
 #include	<stddef.h>
 #include	"POINT.h"
@@ -56,7 +54,7 @@ typedef enum TextPrintType {
 	TPF_TT_14POINT		= 0x000A,	  		// True Type Font - 14 point
 	TPF_TT_16POINT		= 0x000B,	  		// True Type Font - 16 point
 	TPF_TT_18POINT		= 0x000C,	  		// True Type Font - 18 point
-	TPF_TT_20POINT		= 0x000D,	  		// True Type Font - 20 point 
+	TPF_TT_20POINT		= 0x000D,	  		// True Type Font - 20 point
 	TPF_TT_22POINT		= 0x000E,			// True Type Font - 22 point
 	TPF_TT_24POINT		= 0x000F,			// True Type Font - 24 point
 
@@ -80,14 +78,14 @@ typedef enum TextFormatType {
 
 	TPF_TOP					= DT_TOP,						// Use with DT_SINGLELINE.	Top-justifies text.
 	TPF_VCENTER				= DT_VCENTER,					// Use with DT_SINGLELINE.	Centers text vertically.
-	TPF_BOTTOM				= DT_BOTTOM,					// Use with DT_SINGLELINE.	Justifies test to the bottom of the rectangle. 
+	TPF_BOTTOM				= DT_BOTTOM,					// Use with DT_SINGLELINE.	Justifies test to the bottom of the rectangle.
 	TPF_LEFT				= DT_LEFT,						// Aligns text to the left.
 	TPF_CENTER				= DT_CENTER,					// Centers text horizontally in the rectangle.
 	TPF_RIGHT				= DT_RIGHT,						// Right justify text.
 	TPF_WORDBREAK			= DT_WORDBREAK,					// Lines are automatically broken between words.
 	TPF_SINGLE_LINE			= DT_SINGLELINE,				// All text on one line only.
-	TPF_NO_PREFIX			= DT_NOPREFIX,					// Turns off processing of prefix characters. 
-	TPF_PATH_ELLIPSIS		= DT_PATH_ELLIPSIS,				// For displayed text, replaces characters in the middle of the string with ellipses so that the result fits in the specified rectangle. 
+	TPF_NO_PREFIX			= DT_NOPREFIX,					// Turns off processing of prefix characters.
+	TPF_PATH_ELLIPSIS		= DT_PATH_ELLIPSIS,				// For displayed text, replaces characters in the middle of the string with ellipses so that the result fits in the specified rectangle.
 
 } TextFormatType;
 
@@ -106,11 +104,11 @@ typedef enum TextFormatType {
 #define TPF_CHECKBOX				(TextFormatType)( DT_LEFT	| DT_WORDBREAK	)
 #define TPF_OUTER_SCROLL			(TextFormatType)( DT_LEFT	| DT_WORDBREAK	)
 #define TPF_INNER_SCROLL			(TextFormatType)( DT_LEFT	| DT_SINGLELINE	)
-								
+
 #define TPF_LEFT_TEXT				(TextFormatType)( DT_LEFT	| DT_WORDBREAK )
 #define TPF_CENTER_TEXT				(TextFormatType)( DT_CENTER | DT_WORDBREAK )
 #define TPF_RIGHT_TEXT				(TextFormatType)( DT_RIGHT	| DT_WORDBREAK )
-								
+
 #define TPF_LEFT_TOP_ALIGNMENT	  	(TextFormatType)( DT_LEFT	| DT_TOP		| DT_SINGLELINE )
 #define TPF_LEFT_BOTTOM_ALIGNMENT	(TextFormatType)( DT_LEFT	| DT_BOTTOM		| DT_SINGLELINE )
 #define TPF_LEFT_JUSTIFY			(TextFormatType)( DT_LEFT	| DT_VCENTER	| DT_SINGLELINE )
@@ -145,7 +143,7 @@ extern	HDC BackBufferDC;
 ** Global Colors for use throughout program.
 */
 extern	unsigned long TEXT_COLOR;
-extern	unsigned long SHADOW_COLOR;		
+extern	unsigned long SHADOW_COLOR;
 extern	unsigned long TEXT_NORMAL_COLOR;
 extern	unsigned long TEXT_FOCUSED_COLOR;
 extern	unsigned long TEXT_PRESSED_COLOR;
@@ -167,9 +165,9 @@ extern	unsigned long VIOLET_COLOR;
 /******************************************************************************
 **	This is a True Type Font class object to create and use True Type fonts.
 ******************************************************************************/
-// Font Weight -	Specifies the weight of the font in the range 0 through 1000. 
-//					For example, 400 is normal and 700 is bold. 
-//					If this value is zero, a default weight is used. 
+// Font Weight -	Specifies the weight of the font in the range 0 through 1000.
+//					For example, 400 is normal and 700 is bold.
+//					If this value is zero, a default weight is used.
 //
 //	The following values are defined for convenience:
 //		FW_DONTCARE		0			FW_SEMIBOLD		600
@@ -179,33 +177,33 @@ extern	unsigned long VIOLET_COLOR;
 //		FW_LIGHT		300 		FW_ULTRABOLD	800
 //		FW_NORMAL		400 		FW_HEAVY 		900
 //		FW_REGULAR		400 		FW_BLACK 		900
-//		FW_MEDIUM		500 
+//		FW_MEDIUM		500
 //-----------------------------------------------------------------------------
 
-class TTFontClass 
+class TTFontClass
 {
 	public:
 
-		TTFontClass ( 
+		TTFontClass (
 			HDC		hdc,
-			char *	filename, 
-			char *	facename, 
-			int		height, 
-			int		weight				= FW_NORMAL, 
-			BYTE	charset				= ANSI_CHARSET, 
-			int		width				= 0, 
-			int		escapement			= 0, 
-			int		orientation			= 0, 
-			BYTE	italic				= FALSE, 
-			BYTE	underline			= FALSE, 
-			BYTE	strikeout			= FALSE, 
-			BYTE	outputPrecision		= OUT_TT_ONLY_PRECIS, 
-			BYTE	clipPrecision		= CLIP_DEFAULT_PRECIS, 
-			BYTE	quality				= PROOF_QUALITY, 
+			char *	filename,
+			char *	facename,
+			int		height,
+			int		weight				= FW_NORMAL,
+			BYTE	charset				= ANSI_CHARSET,
+			int		width				= 0,
+			int		escapement			= 0,
+			int		orientation			= 0,
+			BYTE	italic				= FALSE,
+			BYTE	underline			= FALSE,
+			BYTE	strikeout			= FALSE,
+			BYTE	outputPrecision		= OUT_TT_ONLY_PRECIS,
+			BYTE	clipPrecision		= CLIP_DEFAULT_PRECIS,
+			BYTE	quality				= PROOF_QUALITY,
 			BYTE	pitchAndFamily		= FF_DONTCARE );
 
-		virtual ~TTFontClass(void)				
-			{ 
+		virtual ~TTFontClass(void)
+			{
 				if ( Font != NULL ) {
 					DeleteObject( Font );
 					Font = NULL;
@@ -226,22 +224,22 @@ class TTFontClass
 		virtual int		IsFontDBCS				( void ) const	{ return ((CharSet==SHIFTJIS_CHARSET)||(CharSet==HANGEUL_CHARSET)||(CharSet==CHINESEBIG5_CHARSET)); };	// [OYO]
 		virtual UINT	Get_Double_Byte_Char	( const char *string, int *num_bytes=NULL ) const;
 
-		virtual Point2D	Print( 
-							HDC hdc, 
-							char const * string, 
-							Rect const & cliprect, 
+		virtual Point2D	Print(
+							HDC hdc,
+							char const * string,
+							Rect const & cliprect,
 							COLORREF forecolor		= TEXT_COLOR,
 							COLORREF backcolor		= TEXT_NORMAL_SHADOW_COLOR,
-							TextFormatType flag		= TPF_LEFT_TEXT, 
+							TextFormatType flag		= TPF_LEFT_TEXT,
 							TextShadowType shadow	= TPF_NOSHADOW );
 
-		virtual Point2D	Print( 
-							HDC hdc, 
-							wchar_t const * string, 
-							Rect const & cliprect, 
+		virtual Point2D	Print(
+							HDC hdc,
+							wchar_t const * string,
+							Rect const & cliprect,
 							COLORREF forecolor		= TEXT_COLOR,
 							COLORREF backcolor		= TEXT_NORMAL_SHADOW_COLOR,
-							TextFormatType flag		= TPF_LEFT_TEXT, 
+							TextFormatType flag		= TPF_LEFT_TEXT,
 							TextShadowType shadow	= TPF_NOSHADOW );
 
 	private:
@@ -276,7 +274,7 @@ bool			Is_True_Type_Font	( TextPrintType flags );	// True Type???
 // This class is a wrapper around all the fonts that we want to be available.
 // The constructer will make them, and the destructor will remove them for us.
 //-------------------------------------------------------------------------
-class FontManagerClass 
+class FontManagerClass
 {
 	public:
 		FontManagerClass		( HDC hdc );
@@ -299,6 +297,3 @@ extern TTFontClass 			*TTTextFontPtr;
 extern TTFontClass 			*TTTextFontPtr640;
 extern TTFontClass 			*TTTextFontPtr800;
 extern TTFontClass 			*TTLicenseFontPtr;
-
-
-#endif
diff --git a/Core/Tools/Autorun/Utils.cpp b/Core/Tools/Autorun/Utils.cpp
index 2a868bff118..e40fb229d74 100644
--- a/Core/Tools/Autorun/Utils.cpp
+++ b/Core/Tools/Autorun/Utils.cpp
@@ -49,7 +49,7 @@
  *	Fatal						--	General purpose fatal error handler.	*
  *	Get_Version					--	Retrieves a version string from a file. *
  *	Get_String 					--	Returns a pointer to the undipped text. *
- *	Is_File_Available 		  	--	Use both FindFirst to check that CD is	* 
+ *	Is_File_Available 		  	--	Use both FindFirst to check that CD is	*
  *									    in drive & if File_Exists() to 		*
  *										determine if file is really there.	*
  *	Pad_With_Zeros            	--	Adds zeros to the beginning of string.	*
@@ -68,13 +68,13 @@
  *	Remove_Spaces				--	Remove spaces from string passed in.    *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
 
-#include <io.h> 
-#include "ARGS.H"
+#include <io.h>
+#include "ARGS.h"
 #include "assert.h"
 #include "Locale_API.h"
 #include "resource.h"
 #include "Utils.h"
-#include "WinFix.H"
+#include "WinFix.h"
 #include "Wnd_File.h"
 #include <winver.h>
 #include <shlwapi.h>
@@ -114,11 +114,11 @@ void Fix_Single_Ampersands ( LPSTR pszString, bool upper_case )
 	while (*letter != '\0') {
 
 		if (*letter == '&') {
-      
+
 			pszTemp[i++] = '&';
 			pszTemp[i++] = '&';
 			letter++;
-         
+
 		} else {
 
 			if ( upper_case ) {
@@ -137,7 +137,7 @@ void Fix_Single_Ampersands ( wchar_t *pszString, bool upper_case )
 	wchar_t	pszOld[ MAX_PATH ];			// variable to hold the string passed
 	wchar_t *letter;
 	int		i = 0;
- 
+
 	wcscpy( pszOld, pszString );
 	letter = pszOld;
 	memset ( pszTemp, '\0', MAX_PATH );
@@ -148,11 +148,11 @@ void Fix_Single_Ampersands ( wchar_t *pszString, bool upper_case )
 	while (*letter != '\0') {
 
 		if (*letter == '&') {
-      
+
 			pszTemp[i++] = '&';
 			pszTemp[i++] = '&';
 			letter++;
-         
+
 		} else {
 
 			if ( upper_case ) {
@@ -220,9 +220,9 @@ void Fix_Double_Ampersands ( LPSTR pszString, bool upper_case )
 
 			pszTemp[i++] = '&';
 			letter = letter + 2;
-         
+
 		} else {
-      	
+
 			if ( upper_case ) {
 				pszTemp[i++] = (char) toupper( *( letter++ ));
 			} else {
@@ -377,17 +377,17 @@ wchar_t *Make_Current_Path_To ( const wchar_t *filename, wchar_t *path )
 }
 
 
-/****************************************************************************** 
- * Path_Add_Back_Slash -- Add a '\\' to the end of the path.				  
- *                                                                            
- * INPUT:		char * path -- Pointer to the string to be modified.           
- *                                                                            
- * OUTPUT:     char * path                                                    
- *                                                                            
- * WARNINGS:   none                                                           
- *                                                                            
- * HISTORY:                                                                   
- *   08/14/1998 MML : Created.                                                
+/******************************************************************************
+ * Path_Add_Back_Slash -- Add a '\\' to the end of the path.
+ *
+ * INPUT:		char * path -- Pointer to the string to be modified.
+ *
+ * OUTPUT:     char * path
+ *
+ * WARNINGS:   none
+ *
+ * HISTORY:
+ *   08/14/1998 MML : Created.
  *============================================================================*/
 
 char *Path_Add_Back_Slash ( char *path )
@@ -411,17 +411,17 @@ wchar_t *Path_Add_Back_Slash ( wchar_t *path )
 }
 
 
-/****************************************************************************** 
- * Path_Remove_Back_Slash -- Remove a '\\' from the end of the path.		 
- *                                                                            
- * INPUT:		char * path -- Pointer to the string to be modified.           
- *                                                                            
- * OUTPUT:     char * path                                                    
- *                                                                            
- * WARNINGS:   none                                                           
- *                                                                            
- * HISTORY:                                                                   
- *   08/14/1998 MML : Created.                                                
+/******************************************************************************
+ * Path_Remove_Back_Slash -- Remove a '\\' from the end of the path.
+ *
+ * INPUT:		char * path -- Pointer to the string to be modified.
+ *
+ * OUTPUT:     char * path
+ *
+ * WARNINGS:   none
+ *
+ * HISTORY:
+ *   08/14/1998 MML : Created.
  *============================================================================*/
 
 char *Path_Remove_Back_Slash ( char *path )
@@ -477,7 +477,7 @@ void PlugInProductName ( char *szString, char *szName )
 	temp 		= strstr( szTextBuf, "%s" );
 
 	//-------------------------------------------------------------
-	// Substitute each "%P" with "%s".  nStrReturn is the index 
+	// Substitute each "%P" with "%s".  nStrReturn is the index
 	// into the buffer where "%P" was found.
 	//-------------------------------------------------------------
 	while ( temp != NULL && nCount < 6) {
@@ -552,7 +552,7 @@ void PlugInProductName( char *szString, int nName )
 	temp 		= strstr( szTextBuf, "%s" );
 
 	//-------------------------------------------------------------
-	// Substitute each "%P" with "%s".  nStrReturn is the index 
+	// Substitute each "%P" with "%s".  nStrReturn is the index
 	// into the buffer where "%P" was found.
 	//-------------------------------------------------------------
 	while ( temp != NULL && nCount < 6) {
@@ -625,7 +625,7 @@ void PlugInProductName ( wchar_t *szString, const wchar_t *szName )
 	temp 		= wcsstr( szTextBuf, L"%s" );
 
 	//-------------------------------------------------------------
-	// Substitute each "%P" with "%s".  nStrReturn is the index 
+	// Substitute each "%P" with "%s".  nStrReturn is the index
 	// into the buffer where "%P" was found.
 	//-------------------------------------------------------------
 	while ( temp != NULL && nCount < 6) {
diff --git a/Core/Tools/Autorun/Utils.h b/Core/Tools/Autorun/Utils.h
index d40883693d3..894a7e43606 100644
--- a/Core/Tools/Autorun/Utils.h
+++ b/Core/Tools/Autorun/Utils.h
@@ -17,12 +17,12 @@
 */
 
 /***************************************************************************
- *** C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S 		 *** 
+ *** C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S 		 ***
  ***************************************************************************
  *                                                                         *
  *     	          Project Name : Setup                   				   *
  *                                                                         *
- *                    File Name : UTILS.H                                  *
+ *                    File Name : UTILS.h                                  *
  *                                                                         *
  *                   Programmers: Maria del Mar McCready Legg              *
  *                                                                         *
@@ -33,10 +33,8 @@
  *-------------------------------------------------------------------------*
  * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#pragma once
 
-#ifndef UTILS_H
-#define UTILS_H
+#pragma once
 
 #include <windows.h>
 
@@ -48,7 +46,7 @@ template<class T>
 void swap( T & left, T & right )
 {
 	T temp;
-   
+
 	temp  = left;
 	left  = right;
 	right = temp;
@@ -70,6 +68,3 @@ wchar_t *	Path_Remove_Back_Slash			( wchar_t *path );
 void		PlugInProductName				( char *szString, int nName );
 void		PlugInProductName				( char *szString, char *szName );
 void		PlugInProductName				( wchar_t *szString, const wchar_t *szName );
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/Autorun/ViewHTML.cpp b/Core/Tools/Autorun/ViewHTML.cpp
index 182eb9187e3..dd0bc246c54 100644
--- a/Core/Tools/Autorun/ViewHTML.cpp
+++ b/Core/Tools/Autorun/ViewHTML.cpp
@@ -85,9 +85,9 @@ bool ViewHTML(const char* url, bool wait, const CallbackHook& callback)
 	char tempPath[MAX_PATH];
 	char filename1[MAX_PATH];
 	char filename2[MAX_PATH];
-	
-	// Expand the TMP environment variable. 
-	{ 
+
+	// Expand the TMP environment variable.
+	{
 		DWORD dwResult;
 		dwResult = ExpandEnvironmentStrings( "%TEMP%", tempPath,  MAX_PATH);
 		if(dwResult == 0)
@@ -108,12 +108,12 @@ bool ViewHTML(const char* url, bool wait, const CallbackHook& callback)
 	// Create file
 	//--------------------------------------------------------------------------
 	HANDLE file = CreateFile(
-					filename2, 
-					GENERIC_WRITE, 
-					0, 
-					NULL, 
+					filename2,
+					GENERIC_WRITE,
+					0,
+					NULL,
 					CREATE_ALWAYS,
-					FILE_ATTRIBUTE_NORMAL, 
+					FILE_ATTRIBUTE_NORMAL,
 					NULL);
 
 	if (file == INVALID_HANDLE_VALUE)
@@ -151,19 +151,19 @@ bool ViewHTML(const char* url, bool wait, const CallbackHook& callback)
 	STARTUPINFO startupInfo;
 	memset(&startupInfo, 0, sizeof(startupInfo));
 	startupInfo.cb = sizeof(startupInfo);
-  
+
 	PROCESS_INFORMATION processInfo;
 
 	BOOL createSuccess = CreateProcess(
-			exeName, 
-			commandLine, 
-			NULL, 
-			NULL, 
+			exeName,
+			commandLine,
+			NULL,
+			NULL,
 			FALSE,
-			0, 
-			NULL, 
-			NULL, 
-			&startupInfo, 
+			0,
+			NULL,
+			NULL,
+			&startupInfo,
 			&processInfo);
 
 	if (createSuccess == FALSE)
@@ -185,7 +185,7 @@ bool ViewHTML(const char* url, bool wait, const CallbackHook& callback)
 				{
 				break;
 				}
-			
+
 			Sleep(100);
 
 			DWORD exitCode;
diff --git a/Core/Tools/Autorun/ViewHTML.h b/Core/Tools/Autorun/ViewHTML.h
index 4a81337f531..92794659378 100644
--- a/Core/Tools/Autorun/ViewHTML.h
+++ b/Core/Tools/Autorun/ViewHTML.h
@@ -32,11 +32,8 @@
 *
 ******************************************************************************/
 
-#ifndef VIEWHTML_H
-#define VIEWHTML_H
+#pragma once
 
 #include "CallbackHook.h"
 
 bool ViewHTML(const char* url, bool wait = false, const CallbackHook& callback = CallbackHook());
-
-#endif // VIEWHTML_H
diff --git a/Core/Tools/Autorun/WSYS_File.cpp b/Core/Tools/Autorun/WSYS_File.cpp
index 6779dabb4c7..4a0440280ce 100644
--- a/Core/Tools/Autorun/WSYS_File.cpp
+++ b/Core/Tools/Autorun/WSYS_File.cpp
@@ -17,12 +17,12 @@
 */
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   WSYS Library
@@ -36,7 +36,7 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include <assert.h>
@@ -49,43 +49,43 @@
 
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 //=================================================================
@@ -104,12 +104,12 @@ File::File()
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 
 //=================================================================
-// File::~File	
+// File::~File
 //=================================================================
 
 File::~File()
@@ -118,7 +118,7 @@ File::~File()
 }
 
 //=================================================================
-// File::open	
+// File::open
 //=================================================================
 /**
   * Any derived open() members must first call File::open. If File::open
@@ -163,7 +163,7 @@ Bool File::open( const Char *filename, Int access )
 }
 
 //=================================================================
-// File::close 	
+// File::close
 //=================================================================
 /**
   * Must call File::close() for each successful File::open() call.
@@ -184,7 +184,7 @@ void File::close( void )
 }
 
 //=================================================================
-// File::size 
+// File::size
 //=================================================================
 /**
   * Default implementation of File::size. Derived classes can optimize
@@ -212,7 +212,7 @@ Int File::position( void )
 }
 
 //=================================================================
-// File::setName 
+// File::setName
 //=================================================================
 
 void File::setName( const Char *name )
@@ -223,7 +223,7 @@ void File::setName( const Char *name )
 }
 
 //=================================================================
-// File::getName 
+// File::getName
 //=================================================================
 
 Bool File::getName( Char *buffer, Int max )
@@ -238,7 +238,7 @@ Bool File::getName( Char *buffer, Int max )
 }
 
 //============================================================================
-// File::printf 
+// File::printf
 //============================================================================
 
 Bool	File::printf ( const Char *format, ...)
diff --git a/Core/Tools/Autorun/WSYS_FileSystem.cpp b/Core/Tools/Autorun/WSYS_FileSystem.cpp
index 06100a16497..d98795e10db 100644
--- a/Core/Tools/Autorun/WSYS_FileSystem.cpp
+++ b/Core/Tools/Autorun/WSYS_FileSystem.cpp
@@ -17,12 +17,12 @@
 */
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   WSYS Library
@@ -36,7 +36,7 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include "WSYS_FileSystem.h"
@@ -44,43 +44,43 @@
 #include "WSYS_StdFileSystem.h"
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 //===============================
-// TheFileSystem 
+// TheFileSystem
 //===============================
 /**
-  *	This is the FileSystem's singleton class. All file access 
+  *	This is the FileSystem's singleton class. All file access
 	* should be through TheFileSystem, unless code needs to use an explicit
 	* File or FileSystem derivative.
 	*
 	* Using TheFileSystem->open and File exclusively for file access, particularly
-	* in library or modular code, allows applications to transparently implement 
+	* in library or modular code, allows applications to transparently implement
 	* file access as they see fit. This is particularly important for code that
 	* needs to be shared between applications, such as games and tools.
 	*/
@@ -89,18 +89,18 @@
 FileSystem	*TheFileSystem = NULL;
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 
diff --git a/Core/Tools/Autorun/WSYS_FileSystem.h b/Core/Tools/Autorun/WSYS_FileSystem.h
index c8ff4f162c1..7906b70da70 100644
--- a/Core/Tools/Autorun/WSYS_FileSystem.h
+++ b/Core/Tools/Autorun/WSYS_FileSystem.h
@@ -17,12 +17,12 @@
 */
 
 //----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    WSYS Library
@@ -31,19 +31,14 @@
 //
 // File name:  wsys/FileSystem.h
 //
-// Created:    
+// Created:
 //
 //----------------------------------------------------------------------------
 
 #pragma once
 
-#ifndef __WSYS_FILESYSTEM_H
-#define __WSYS_FILESYSTEM_H
-
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #ifndef __WSYS_FILE_H
@@ -65,8 +60,8 @@
 //===============================
 /**
   * FileSystem is an interface class for creating specific FileSystem objects.
-  * 
-	* A FileSystem object's implemenation decides what derivative of File object needs to be 
+  *
+	* A FileSystem object's implemenation decides what derivative of File object needs to be
 	* created when FileSystem::Open() gets called.
 	*/
 //===============================
@@ -88,9 +83,5 @@ extern FileSystem*	TheFileSystem;
 
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-
-#endif // __WSYS_FILESYSTEM_H
diff --git a/Core/Tools/Autorun/WSYS_RAMFile.cpp b/Core/Tools/Autorun/WSYS_RAMFile.cpp
index f0e7da9c8ac..804fafc41b5 100644
--- a/Core/Tools/Autorun/WSYS_RAMFile.cpp
+++ b/Core/Tools/Autorun/WSYS_RAMFile.cpp
@@ -17,12 +17,12 @@
 */
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   WSYS Library
@@ -36,7 +36,7 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include <stdio.h>
@@ -47,46 +47,46 @@
 
 #include "WSYS_FileSystem.h"
 #include "WSYS_RAMFile.h"
-									
+
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 //=================================================================
@@ -102,12 +102,12 @@ RAMFile::RAMFile()
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 
 //=================================================================
-// RAMFile::~RAMFile	
+// RAMFile::~RAMFile
 //=================================================================
 
 RAMFile::~RAMFile()
@@ -119,7 +119,7 @@ RAMFile::~RAMFile()
 }
 
 //=================================================================
-// RAMFile::open	
+// RAMFile::open
 //=================================================================
 /**
   *	This function opens a file using the standard C open() call. Access flags
@@ -135,7 +135,7 @@ Bool RAMFile::open( const Char *filename, Int access )
 	if ( file == NULL )
 	{
 		return FALSE;
-	}	
+	}
 
 	Bool result = open( file );
 
@@ -188,7 +188,7 @@ Bool RAMFile::open( File *file )
 }
 
 //=================================================================
-// RAMFile::close 	
+// RAMFile::close
 //=================================================================
 /**
 	* Closes the current file if it is open.
@@ -198,17 +198,14 @@ Bool RAMFile::open( File *file )
 
 void RAMFile::close( void )
 {
-	if ( m_data )
-	{
-		delete [] m_data;
-		m_data = NULL;
-	}
+	delete [] m_data;
+	m_data = NULL;
 
 	File::close();
 }
 
 //=================================================================
-// RAMFile::read 
+// RAMFile::read
 //=================================================================
 
 Int RAMFile::read( void *buffer, Int bytes )
@@ -240,7 +237,7 @@ Int RAMFile::read( void *buffer, Int bytes )
 }
 
 //=================================================================
-// RAMFile::write 
+// RAMFile::write
 //=================================================================
 
 Int RAMFile::write( void *buffer, Int bytes )
@@ -249,7 +246,7 @@ Int RAMFile::write( void *buffer, Int bytes )
 }
 
 //=================================================================
-// RAMFile::seek 
+// RAMFile::seek
 //=================================================================
 
 Int RAMFile::seek( Int pos, seekMode mode)
diff --git a/Core/Tools/Autorun/WSYS_RAMFile.h b/Core/Tools/Autorun/WSYS_RAMFile.h
index 2836c4585d2..f890ee7f439 100644
--- a/Core/Tools/Autorun/WSYS_RAMFile.h
+++ b/Core/Tools/Autorun/WSYS_RAMFile.h
@@ -17,12 +17,12 @@
 */
 
 //----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    WSYS Library
@@ -37,13 +37,8 @@
 
 #pragma once
 
-#ifndef __WSYS_RAMFILE_H
-#define __WSYS_RAMFILE_H
-
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "WSYS_file.h"
@@ -73,9 +68,9 @@ class RAMFile : public File
 		Char				*m_data;											///< File data in memory
 		Int					m_pos;												///< current read position
 		Int					m_size;												///< size of file in memory
-		
+
 	public:
-		
+
 		RAMFile();
 		virtual				~RAMFile();
 
@@ -93,8 +88,5 @@ class RAMFile : public File
 
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-#endif // __WSYS_RAMFILE_H
diff --git a/Core/Tools/Autorun/WSYS_StdFile.cpp b/Core/Tools/Autorun/WSYS_StdFile.cpp
index 338ce3a2e22..d371569aee1 100644
--- a/Core/Tools/Autorun/WSYS_StdFile.cpp
+++ b/Core/Tools/Autorun/WSYS_StdFile.cpp
@@ -17,12 +17,12 @@
 */
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   WSYS Library
@@ -36,7 +36,7 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include <stdio.h>
@@ -46,46 +46,46 @@
 #include <sys/stat.h>
 
 #include "WSYS_StdFile.h"
-									
+
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 //=================================================================
@@ -100,12 +100,12 @@ StdFile::StdFile()
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 
 //=================================================================
-// StdFile::~StdFile	
+// StdFile::~StdFile
 //=================================================================
 
 StdFile::~StdFile()
@@ -121,7 +121,7 @@ StdFile::~StdFile()
 }
 
 //=================================================================
-// StdFile::open	
+// StdFile::open
 //=================================================================
 /**
   *	This function opens a file using the standard C open() call. Access flags
@@ -183,7 +183,7 @@ Bool StdFile::open( const Char *filename, Int access )
 }
 
 //=================================================================
-// StdFile::close 	
+// StdFile::close
 //=================================================================
 /**
 	* Closes the current file if it is open.
@@ -197,7 +197,7 @@ void StdFile::close( void )
 }
 
 //=================================================================
-// StdFile::read 
+// StdFile::read
 //=================================================================
 
 Int StdFile::read( void *buffer, Int bytes )
@@ -211,7 +211,7 @@ Int StdFile::read( void *buffer, Int bytes )
 }
 
 //=================================================================
-// StdFile::write 
+// StdFile::write
 //=================================================================
 
 Int StdFile::write( void *buffer, Int bytes )
@@ -227,7 +227,7 @@ Int StdFile::write( void *buffer, Int bytes )
 }
 
 //=================================================================
-// StdFile::seek 
+// StdFile::seek
 //=================================================================
 
 Int StdFile::seek( Int pos, seekMode mode)
diff --git a/Core/Tools/Autorun/WSYS_StdFile.h b/Core/Tools/Autorun/WSYS_StdFile.h
index 4a9626afc08..867c71e5c38 100644
--- a/Core/Tools/Autorun/WSYS_StdFile.h
+++ b/Core/Tools/Autorun/WSYS_StdFile.h
@@ -17,12 +17,12 @@
 */
 
 //----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    WSYS Library
@@ -37,13 +37,8 @@
 
 #pragma once
 
-#ifndef __WSYS_STDFILE_H
-#define __WSYS_STDFILE_H
-
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "WSYS_file.h"
@@ -71,10 +66,10 @@ class StdFile : public File
 	protected:
 
 		int m_handle;											///< Std C file handle
-		
+
 	public:
-		
-		StdFile();										
+
+		StdFile();
 		virtual				~StdFile();
 
 
@@ -90,8 +85,5 @@ class StdFile : public File
 
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-#endif // __WSYS_STDFILE_H
diff --git a/Core/Tools/Autorun/WSYS_StdFileSystem.cpp b/Core/Tools/Autorun/WSYS_StdFileSystem.cpp
index 2878f3f3eee..15698cd1c07 100644
--- a/Core/Tools/Autorun/WSYS_StdFileSystem.cpp
+++ b/Core/Tools/Autorun/WSYS_StdFileSystem.cpp
@@ -17,12 +17,12 @@
 */
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   WSYS Library
@@ -36,59 +36,59 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include "WSYS_StdFileSystem.h"
 #include "WSYS_StdFile.h"
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 //=================================================================
-// StdFileSystem::~StdFileSystem 
+// StdFileSystem::~StdFileSystem
 //=================================================================
 
 StdFileSystem::~StdFileSystem()
@@ -97,7 +97,7 @@ StdFileSystem::~StdFileSystem()
 }
 
 //=================================================================
-// StdFileSystem::open 
+// StdFileSystem::open
 //=================================================================
 /**
   * This simply creates a StdFile object and calls its open function.
@@ -119,4 +119,4 @@ File* StdFileSystem::open( const Char *filename, Int access )
 	}
 
 	return (File*) file;
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/Autorun/WSYS_StdFileSystem.h b/Core/Tools/Autorun/WSYS_StdFileSystem.h
index 880e09f237c..62a0ab21e28 100644
--- a/Core/Tools/Autorun/WSYS_StdFileSystem.h
+++ b/Core/Tools/Autorun/WSYS_StdFileSystem.h
@@ -17,12 +17,12 @@
 */
 
 //----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    WSYS Library
@@ -31,19 +31,14 @@
 //
 // File name:  wsys/StdFileSystem.h
 //
-// Created:    
+// Created:
 //
 //----------------------------------------------------------------------------
 
 #pragma once
 
-#ifndef __WSYS_STDFILESYSTEM_H
-#define __WSYS_STDFILESYSTEM_H
-
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #ifndef __WSYS_FILE_H
@@ -84,9 +79,5 @@ class StdFileSystem	: public FileSystem
 };
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-
-#endif // __WSYS_STDFILESYSTEM_H
diff --git a/Core/Tools/Autorun/WSYS_file.h b/Core/Tools/Autorun/WSYS_file.h
index 6094214cbe6..34cd965d822 100644
--- a/Core/Tools/Autorun/WSYS_file.h
+++ b/Core/Tools/Autorun/WSYS_file.h
@@ -17,12 +17,12 @@
 */
 
 //----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    WSYS Library
@@ -37,13 +37,8 @@
 
 #pragma once
 
-#ifndef __WSYS_FILE_H
-#define __WSYS_FILE_H
-
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "Lib/BaseType.h"
@@ -76,10 +71,10 @@ class File
 	friend class FileSystem;
 
 	public:
-	
+
 		enum access
 		{
-			NONE			= 0x00000000,				
+			NONE			= 0x00000000,
 			READ			= 0x00000001,				///< Access file for reading
 			WRITE			= 0x00000002,				///< Access file for writing
 			APPEND		= 0x00000004,				///< Seek to end of file on open
@@ -104,23 +99,23 @@ class File
 		Bool		m_open;										///< Has the file been opened
 		Bool		m_deleteOnClose;					///< delete File object on close()
 		Int			m_access;									///< How the file was opened
-		
-		
+
+
 		File();											///< This class can only used as a base class
 		virtual				~File();
 
 	public:
-		
+
 
 
 		virtual Bool	open( const Char *filename, Int access = 0 );				///< Open a file for access
 		virtual void	close( void );																			///< Close the file !!! File object no longer valid after this call !!!
 
-		virtual Int		read( void *buffer, Int bytes ) = NULL ;						/**< Read the specified number of bytes from the file in to the 
+		virtual Int		read( void *buffer, Int bytes ) = NULL ;						/**< Read the specified number of bytes from the file in to the
 																																			  *  memory pointed at by buffer. Returns the number of bytes read.
 																																			  *  Returns -1 if an error occured.
 																																			  */
-		virtual Int		write( void *buffer, Int bytes ) = NULL ;						/**< Write the specified number of bytes from the    
+		virtual Int		write( void *buffer, Int bytes ) = NULL ;						/**< Write the specified number of bytes from the
 																																			  *	 memory pointed at by buffer to the file. Returns the number of bytes written.
 																																			  *	 Returns -1 if an error occured.
 																																			  */
@@ -151,7 +146,7 @@ class File
 
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
 
 inline Char* File::getName( void ) { return m_name;};
@@ -162,6 +157,3 @@ inline void File::deleteOnClose( void ) { m_deleteOnClose = TRUE;};
 
 // include FileSystem.h as it will be used alot with File.h
 //#include "wsys/FileSystem.h"
-
-
-#endif // __WSYS_FILE_H
diff --git a/Core/Tools/Autorun/WinFix.CPP b/Core/Tools/Autorun/WinFix.CPP
deleted file mode 100644
index c5a9d89b45e..00000000000
--- a/Core/Tools/Autorun/WinFix.CPP
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /Renegade Setup/Autorun/WinFix.CPP                          $*
- *                                                                                             *
- *                      $Author:: Maria_l                                                     $*
- *                                                                                             *
- *                     $Modtime:: 11/15/01 10:44a                                             $*
- *                                                                                             *
- *                    $Revision:: 6                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *   Make_Identifier -- Creates a temporary string identifer.                                  *
- *   WindowsVersionInfo::WindowsVersionInfo -- Windows Version Info constructor.               *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#define  STRICT
-#include <windows.h>
-#include <windowsx.h>
-#pragma   hdrstop
-
-//#include <commctrl.h>
-//#include <winuser.h>
-#include <assert.h>
-#include <stdio.h>
-#include "WinFix.H"
-#include "Wnd_File.h"
-
-/***************************************************************************
-** Windows Version Info global object.
-*/
-WindowsVersionInfo WinVersion;
-
-
-
-/***********************************************************************************************
- * WindowsVersionInfo::WindowsVersionInfo -- Windows Version Info constructor.                 *
- *                                                                                             *
- *    This routine will examine the system to determine the OS, version, and patch level of    *
- *    the current OS.                                                                          *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   Don't try and use this class until after WinMain, because it won't be           *
- *             initialized until all the global objects have been constructed.                 *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *  04/09/98 jdl : Created.                                                                    *
- *=============================================================================================*/
-WindowsVersionInfo::WindowsVersionInfo(void) :
-	WindowsVersion(0),
-	MajorVersionNumber(0),
-	MinorVersionNumber(0),
-	RunningOSR2(0),
-	BuildNumber(0),
-	IsWin9x(false),
-	IsWin95(false),
-	IsWin98(false),
-	IsWin2000(false),
-	IsWinNT(false),
-	IsWinXP(false)
-{
-	OSVERSIONINFO version_info;
-
-	VersionName[0] = '\0';
-	AdditionalInfo[0] = '\0';
-
-	//--------------------------------------------------------------------------
-	// Start recording messages.
-	//--------------------------------------------------------------------------
-	Delete_Msg_File();
-	Msg( __LINE__, __FILE__, "----------------------------------------------", NULL );
-	Msg( __LINE__, __FILE__, "------------------ Setup -----------------", NULL );
-	Msg( __LINE__, __FILE__, "----------------------------------------------", NULL );
-
-	//--------------------------------------------------------------------------
-	// Get the version info from the OS.
-	//
-	//	typedef struct _OSVERSIONINFO{ 
-	//		DWORD	dwOSVersionInfoSize; 
-	//		DWORD	dwMajorVersion; 
-	//		DWORD	dwMinorVersion; 
-	//		DWORD	dwBuildNumber; 
-	//		DWORD	dwPlatformId; 
-	//		TCHAR	szCSDVersion[ 128 ]; 
-	// } OSVERSIONINFO; 
-	//
-	//	typedef struct _OSVERSIONINFOEX {
-	//		DWORD	dwOSVersionInfoSize;
-	//		DWORD	dwMajorVersion;
-	//		DWORD	dwMinorVersion;
-	//		DWORD	dwBuildNumber;
-	//		DWORD	dwPlatformId;
-	//		TCHAR	szCSDVersion[ 128 ];
-	//		WORD	wServicePackMajor;
-	//		WORD	wServicePackMinor;
-	//		WORD	wSuiteMask;
-	//		BYTE	wProductType;
-	//		BYTE	wReserved;
-	//	} OSVERSIONINFOEX, *POSVERSIONINFOEX, *LPOSVERSIONINFOEX;
-	//--------------------------------------------------------------------------
-	ZeroMemory( &version_info, sizeof( version_info ));	
-	version_info.dwOSVersionInfoSize = sizeof( version_info );
-
-	int result = GetVersionEx( &version_info );
-	assert( result != 0 );
-
-	//--------------------------------------------------------------------------
-	// Save the major/minor version numbers
-	//--------------------------------------------------------------------------
-	MajorVersionNumber = (int)version_info.dwMajorVersion;
-	MinorVersionNumber = (int)version_info.dwMinorVersion;
-	WindowsVersion     = ( MajorVersionNumber * 100 ) + MinorVersionNumber;
-
-	//--------------------------------------------------------------------------
-	// Save the build number
-	//--------------------------------------------------------------------------
-	BuildNumber = (int)version_info.dwBuildNumber;
-
-	//--------------------------------------------------------------------------
-	// Check for Win9x
-	//--------------------------------------------------------------------------
-	if ( version_info.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) {
-
-		IsWin9x = true;
-
-		if ( MajorVersionNumber == 4 && MinorVersionNumber == 0 ) {
-			IsWin95 = true;
-		}
-		if (( MajorVersionNumber > 4 ) || (( MajorVersionNumber == 4 ) && ( MinorVersionNumber > 0 ))) {
-			IsWin98 = true;
-		}
-
-		if ( LOWORD( version_info.dwPlatformId ) > 1000 ) {
-			RunningOSR2 = TRUE;
-		}
-	}
-
-	//--------------------------------------------------------------------------
-	// Check for WinNT
-	//--------------------------------------------------------------------------
-	if ( version_info.dwPlatformId == VER_PLATFORM_WIN32_NT ) {
-
-		IsWinNT = true;
-		
-		if (( MajorVersionNumber >= 5 ) && ( MinorVersionNumber >= 1 )) {
-			IsWinXP = true;
-//			if ( version_info.wSuiteMask == VER_SUITE_PERSONAL ) {
-//			}
-		} else if (( MajorVersionNumber == 5 ) && ( MinorVersionNumber == 0 )) {
-			IsWin2000 = true;
-		}
-
-//         if( bOsVersionInfoEx )
-//         {
-//            if ( osvi.wProductType == VER_NT_WORKSTATION )
-//               printf ( "Professional " );
-//
-//            if ( osvi.wProductType == VER_NT_SERVER )
-//               printf ( "Server " );
-
-//         } else {
-
-		#if( RTS_DEBUG )
-            HKEY hKey;
-            char szProductType[80];
-            DWORD dwBufLen;
-
-            RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\ProductOptions", 0, KEY_QUERY_VALUE, &hKey );
-            RegQueryValueEx( hKey, "ProductType", NULL, NULL, (LPBYTE) szProductType, &dwBufLen);
-            RegCloseKey( hKey );
-
-            if ( lstrcmpi( "WINNT", szProductType) == 0 )
-				Msg( __LINE__, __FILE__, "WinNT Workstation." );
-            if ( lstrcmpi( "SERVERNT", szProductType) == 0 )
-				Msg( __LINE__, __FILE__, "WinNT Server." );
-		#endif
-//         }
-	}
-
-#ifdef DEV_VERSION
-
-	//--------------------------------------------------------------------------
-	// For developmental versions, just use the major & minor version #'s
-	//--------------------------------------------------------------------------
-	sprintf( VersionName, "%x.%x", MajorVersionNumber, MinorVersionNumber );
-
-#else
-
-	//--------------------------------------------------------------------------
-	// For final versions, trim 0's off the minor version
-	//--------------------------------------------------------------------------
-	unsigned short adjusted_minor;
-	int i;
-
-	adjusted_minor = MinorVersionNumber;
-	for (i = 0; i < 4; i++) {
-		if ((adjusted_minor & 0x000f) != 0) {
-			break;
-		}
-		adjusted_minor >>= 4;
-	}
-	sprintf( VersionName, "%x.%x", MajorVersionNumber, adjusted_minor );
-
-#endif
-
-	//--------------------------------------------------------------------------
-	// Save off the additional version information string
-	// (used to indicated additional info or patch level, i.e. for NT 4.0 SP3
-	// it would contain the string 'Service Pack 3')
-	//--------------------------------------------------------------------------
-	strncpy( AdditionalInfo, version_info.szCSDVersion, sizeof(AdditionalInfo) - 1 );
-	AdditionalInfo[sizeof(AdditionalInfo) - 1] = '\x0';
-
-	//--------------------------------------------------------------------------
-	// Send all info found to the debug output file.
-	//--------------------------------------------------------------------------
-#if ( RTS_DEBUG )
-	Msg( __LINE__, __FILE__, "MajorVersionNumber	= %d", MajorVersionNumber );
-	Msg( __LINE__, __FILE__, "MinorVersionNumber	= %d", MinorVersionNumber );
-	Msg( __LINE__, __FILE__, "WindowsVersion	= %d", WindowsVersion );
-	Msg( __LINE__, __FILE__, "BuildNumber	= %d", BuildNumber );
-	Msg( __LINE__, __FILE__, "IsWin9x		= %d", IsWin9x );
-	Msg( __LINE__, __FILE__, "IsWin95		= %d", IsWin95 );
-	Msg( __LINE__, __FILE__, "IsWin98		= %d", IsWin98 );
-	Msg( __LINE__, __FILE__, "IsWin2000		= %d", IsWin2000 );
-	Msg( __LINE__, __FILE__, "RunningOSR2	= %d", RunningOSR2 );
-	Msg( __LINE__, __FILE__, "IsWinNT		= %d", IsWinNT );
-	Msg( __LINE__, __FILE__, "AdditionalInfo	= %s", AdditionalInfo );
-	Msg( __LINE__, __FILE__, "VersionName	= %s", VersionName );
-#endif
-}
-
-/***********************************************************************************************
- * WindowsVersionInfo::Version_String -- Get the version number in human readable form         *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Ptr to string containing version info                                             *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/30/99 10:29PM ST : Created                                                              *
- *=============================================================================================*/
-char *WindowsVersionInfo::Version_String(void)
-{
-	static char _ver95[]   	= {"Windows 95 "};
-	static char _ver98[]   	= {"Windows 98 "};
-	static char _verNT4[]	= {"Windows NT 4 "};
-	static char _verNT5[]	= {"Windows 2000 "};
-	static char _verXP[]	= {"Windows XP "};
-	static char _unknown[]	= {"Unknown "};
-
-	static char version[256];
-
-	if (Is_Win95()) {
-		strcpy (version, _ver95);
-	}
-
-	if (Is_Win98()) {
-		strcpy (version, _ver98);
-	}
-
-	if (Is_WinNT()) {
-		strcpy (version, _verNT4);
-	}
-
-	if (Is_WinNT5() || Is_Win_2000()) {
-		strcpy (version, _verNT5);
-	}
-
-	if (Is_Win_XP()) {
-		strcpy (version, _verXP);
-	}
-
-	strcat (version, AdditionalInfo);
-
-	return (version);
-}
-
-/***************************************************************************
- * WindowsVersionClass::Version_Name -- returns version # as char string	*
- *																									*
- * INPUT:																						*
- *		none.																						*
- *																									*
- * OUTPUT:																						*
- *		ptr to name																				*
- *																									*
- * WARNINGS:																					*
- *		none.																						*
- *																									*
- * HISTORY:																						*
- *   10/30/1995 BRR : Created.															*
- *=========================================================================*/
-
-char * WindowsVersionInfo::Version_Name(void)
-{
-	return ( VersionName );
-}
-
-/****************************************************************************
- * WindowsVersionClass::Meets_Minimum_Version_Requirements					*
- *																			*
- * INPUT:																	*
- *		none.																*
- *																			*
- * OUTPUT:																	*
- *		ptr to name															*
- *																			*
- * WARNINGS:																*
- *		none.																*
- *																			*
- * HISTORY:																	*
- *   10/30/1995 BRR : Created.												*
- *==========================================================================*/
-
-bool WindowsVersionInfo::Meets_Minimum_Version_Requirements	( void )
-{
-//	return(( !IsWin95 && ( Version() >= 400 ))? true : false );
-	return(( Version() >= 400 )? true : false );
-}
-
-
-
diff --git a/Core/Tools/Autorun/WinFix.H b/Core/Tools/Autorun/WinFix.H
deleted file mode 100644
index 5f1b0addbeb..00000000000
--- a/Core/Tools/Autorun/WinFix.H
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /Renegade Setup/Autorun/WinFix.H                            $*
- *                                                                                             *
- *                      $Author:: Maria_l                                                     $*
- *                                                                                             *
- *                     $Modtime:: 11/07/01 5:57p                                              $*
- *                                                                                             *
- *                    $Revision:: 6                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *   WindowsVersionInfo::Major -- Get the major version of the OS							   *
- *   WindowsVersionInfo::Minor -- Get the minor version of the OS							   *
- *   WindowsVersionInfo::Build -- Get the build level of the OS								   *
- *   WindowsVersionInfo::Info -- Get additional system information							   *
- *   WindowsVersionInfo::Is_Win9x -- Determine if we are running on a non-NT system.		   *
- *   WindowsVersionInfo::Is_Win95 -- Determine if we are running on a Win95 system.			   *
- *   WindowsVersionInfo::Is_Win98 -- Determine if we are running on a Win98 system.			   *
- *   WindowsVersionInfo::Is_WinNT -- Determine if we are running on an NT system.			   *
- *   WindowsVersionInfo::Is_WinNT5 -- Determine if we are running on an NT 5 system.		   *
- *   WindowsVersionInfo::Version	--														   *
- *   WindowsVersionInfo::IsOSR2Release --													   *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#pragma once
-
-#ifndef WINFIX_H
-#define WINFIX_H
-
-
-/*-----------------------------------------------------------------------------
-** Windows Version Information class.  This is a global object that is used to 
-** store information about the specific OS that we are running under.  This can 
-** be used to make special allowances for differences between OS's, such as when 
-** using the registry, or trying to work around a limitaion of a particular OS 
-** (their APIs are slightly different...)
-**-----------------------------------------------------------------------------*/
-class WindowsVersionInfo
-{
-	public:
-		WindowsVersionInfo	(void);
-		~WindowsVersionInfo	(void) {}
-
-		int 	Major								( void ) const { return( MajorVersionNumber ); }
-		int 	Minor								( void ) const { return( MinorVersionNumber ); }
-		int 	Build								( void ) const { return( BuildNumber ); }
-		bool 	Is_Win9x							( void ) const { return( IsWin9x ); }									// Win 9x
-		bool 	Is_Win95							( void ) const { return( IsWin95 ); }									// Win 95
-		bool 	Is_Win98							( void ) const { return( IsWin98 ); }									// Win 98
-		bool 	Is_WinNT							( void ) const { return( IsWinNT ); }									// Win NT
-		bool 	Is_WinNT4							( void ) const { return( IsWinNT && MajorVersionNumber == 4 ); }		// Win NT
-		bool	Is_WinNT5							( void ) const { return( IsWinNT && MajorVersionNumber == 5 ); }		// Win NT
-		bool	Is_Win_2000							( void ) const { return( IsWin2000 ); }								// Win 2000
-		bool	Is_Win_XP							( void ) const { return( IsWinXP ); }									// Win XP
-		int		Version								( void ) const { return( WindowsVersion );	}
-		int		IsOSR2Release						( void ) const { return( RunningOSR2 );		}
-		const char * Info							( void ) const { return( &AdditionalInfo[0] ); }
-		char *	Version_String						( void );
-		char *	Version_Name						( void );
-		bool	Meets_Minimum_Version_Requirements	( void );
-
-	private:
-		/*-----------------------------------------------------------------------
-		** Major version number; i.e. for 4.10.1721 this would be '4'
-		*/
-		int MajorVersionNumber;
-
-		/*-----------------------------------------------------------------------
-		** Minor version number; i.e. for 4.10.1721 this would be '10'
-		*/
-		int MinorVersionNumber;
-
-		/*-----------------------------------------------------------------------
-		** Version number expressed as a DWORD; i.e. for 4.10 this would be '410'
-		*/
-		int WindowsVersion;
-
-		/*-----------------------------------------------------------------------
-		** Build number; i.e. for 4.10.1721 this would be '1721'
-		*/
-		int BuildNumber;
-
-		/*-----------------------------------------------------------------------
-		** Is the system running OSR 2 or later release of Windows95.
-		*/
-		int RunningOSR2;
-
-		/*-----------------------------------------------------------------------
-		** Additional Info; i.e. for NT 4.0 with SP3, this would be
-		** the string 'Service Pack 3'
-		*/
-		char AdditionalInfo[128];
-
-		/*-----------------------------------------------------------------------
-		** Windows 9x flag; true if running on non-NT system
-		*/
-		bool IsWin9x;
-		bool IsWin95;
-		bool IsWin98;
-
-		/*-----------------------------------------------------------------------
-		** Windows NT flag; true if running on Windows NT system
-		*/
-		bool IsWinNT;
-
-		/*-----------------------------------------------------------------------
-		** Windows 2000 (Formerly Windows NT 5.0) 
-		** As you've no doubt heard by now, Windows NT 5.0 has been officially 
-		** christened "Windows 2000." 
-		*/
-		bool IsWin2000;
-
-		/*-----------------------------------------------------------------------
-		** Windows XP flag; true if running on Windows NT system
-		*/
-		bool IsWinXP;
-
-		/*-----------------------------------------------------------------------
-		** This array is used for formatting the version # as a string
-		*/
-		char VersionName[30];
-};
-
-extern WindowsVersionInfo WinVersion;
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/Autorun/WinFix.cpp b/Core/Tools/Autorun/WinFix.cpp
new file mode 100644
index 00000000000..85e093aaa0f
--- /dev/null
+++ b/Core/Tools/Autorun/WinFix.cpp
@@ -0,0 +1,350 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Renegade Setup/Autorun/WinFix.cpp                          $*
+ *                                                                                             *
+ *                      $Author:: Maria_l                                                     $*
+ *                                                                                             *
+ *                     $Modtime:: 11/15/01 10:44a                                             $*
+ *                                                                                             *
+ *                    $Revision:: 6                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Make_Identifier -- Creates a temporary string identifer.                                  *
+ *   WindowsVersionInfo::WindowsVersionInfo -- Windows Version Info constructor.               *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#define  STRICT
+#include <windows.h>
+#include <windowsx.h>
+#pragma   hdrstop
+
+//#include <commctrl.h>
+//#include <winuser.h>
+#include <assert.h>
+#include <stdio.h>
+#include "WinFix.h"
+#include "Wnd_File.h"
+
+/***************************************************************************
+** Windows Version Info global object.
+*/
+WindowsVersionInfo WinVersion;
+
+
+
+/***********************************************************************************************
+ * WindowsVersionInfo::WindowsVersionInfo -- Windows Version Info constructor.                 *
+ *                                                                                             *
+ *    This routine will examine the system to determine the OS, version, and patch level of    *
+ *    the current OS.                                                                          *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   Don't try and use this class until after WinMain, because it won't be           *
+ *             initialized until all the global objects have been constructed.                 *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *  04/09/98 jdl : Created.                                                                    *
+ *=============================================================================================*/
+WindowsVersionInfo::WindowsVersionInfo(void) :
+	WindowsVersion(0),
+	MajorVersionNumber(0),
+	MinorVersionNumber(0),
+	RunningOSR2(0),
+	BuildNumber(0),
+	IsWin9x(false),
+	IsWin95(false),
+	IsWin98(false),
+	IsWin2000(false),
+	IsWinNT(false),
+	IsWinXP(false)
+{
+	OSVERSIONINFO version_info;
+
+	VersionName[0] = '\0';
+	AdditionalInfo[0] = '\0';
+
+	//--------------------------------------------------------------------------
+	// Start recording messages.
+	//--------------------------------------------------------------------------
+	Delete_Msg_File();
+	Msg( __LINE__, __FILE__, "----------------------------------------------", NULL );
+	Msg( __LINE__, __FILE__, "------------------ Setup -----------------", NULL );
+	Msg( __LINE__, __FILE__, "----------------------------------------------", NULL );
+
+	//--------------------------------------------------------------------------
+	// Get the version info from the OS.
+	//
+	//	typedef struct _OSVERSIONINFO{
+	//		DWORD	dwOSVersionInfoSize;
+	//		DWORD	dwMajorVersion;
+	//		DWORD	dwMinorVersion;
+	//		DWORD	dwBuildNumber;
+	//		DWORD	dwPlatformId;
+	//		TCHAR	szCSDVersion[ 128 ];
+	// } OSVERSIONINFO;
+	//
+	//	typedef struct _OSVERSIONINFOEX {
+	//		DWORD	dwOSVersionInfoSize;
+	//		DWORD	dwMajorVersion;
+	//		DWORD	dwMinorVersion;
+	//		DWORD	dwBuildNumber;
+	//		DWORD	dwPlatformId;
+	//		TCHAR	szCSDVersion[ 128 ];
+	//		WORD	wServicePackMajor;
+	//		WORD	wServicePackMinor;
+	//		WORD	wSuiteMask;
+	//		BYTE	wProductType;
+	//		BYTE	wReserved;
+	//	} OSVERSIONINFOEX, *POSVERSIONINFOEX, *LPOSVERSIONINFOEX;
+	//--------------------------------------------------------------------------
+	ZeroMemory( &version_info, sizeof( version_info ));
+	version_info.dwOSVersionInfoSize = sizeof( version_info );
+
+	int result = GetVersionEx( &version_info );
+	assert( result != 0 );
+
+	//--------------------------------------------------------------------------
+	// Save the major/minor version numbers
+	//--------------------------------------------------------------------------
+	MajorVersionNumber = (int)version_info.dwMajorVersion;
+	MinorVersionNumber = (int)version_info.dwMinorVersion;
+	WindowsVersion     = ( MajorVersionNumber * 100 ) + MinorVersionNumber;
+
+	//--------------------------------------------------------------------------
+	// Save the build number
+	//--------------------------------------------------------------------------
+	BuildNumber = (int)version_info.dwBuildNumber;
+
+	//--------------------------------------------------------------------------
+	// Check for Win9x
+	//--------------------------------------------------------------------------
+	if ( version_info.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) {
+
+		IsWin9x = true;
+
+		if ( MajorVersionNumber == 4 && MinorVersionNumber == 0 ) {
+			IsWin95 = true;
+		}
+		if (( MajorVersionNumber > 4 ) || (( MajorVersionNumber == 4 ) && ( MinorVersionNumber > 0 ))) {
+			IsWin98 = true;
+		}
+
+		if ( LOWORD( version_info.dwPlatformId ) > 1000 ) {
+			RunningOSR2 = TRUE;
+		}
+	}
+
+	//--------------------------------------------------------------------------
+	// Check for WinNT
+	//--------------------------------------------------------------------------
+	if ( version_info.dwPlatformId == VER_PLATFORM_WIN32_NT ) {
+
+		IsWinNT = true;
+
+		if (( MajorVersionNumber >= 5 ) && ( MinorVersionNumber >= 1 )) {
+			IsWinXP = true;
+//			if ( version_info.wSuiteMask == VER_SUITE_PERSONAL ) {
+//			}
+		} else if (( MajorVersionNumber == 5 ) && ( MinorVersionNumber == 0 )) {
+			IsWin2000 = true;
+		}
+
+//         if( bOsVersionInfoEx )
+//         {
+//            if ( osvi.wProductType == VER_NT_WORKSTATION )
+//               printf ( "Professional " );
+//
+//            if ( osvi.wProductType == VER_NT_SERVER )
+//               printf ( "Server " );
+
+//         } else {
+
+		#if( RTS_DEBUG )
+            HKEY hKey;
+            char szProductType[80];
+            DWORD dwBufLen;
+
+            RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\ProductOptions", 0, KEY_QUERY_VALUE, &hKey );
+            RegQueryValueEx( hKey, "ProductType", NULL, NULL, (LPBYTE) szProductType, &dwBufLen);
+            RegCloseKey( hKey );
+
+            if ( lstrcmpi( "WINNT", szProductType) == 0 )
+				Msg( __LINE__, __FILE__, "WinNT Workstation." );
+            if ( lstrcmpi( "SERVERNT", szProductType) == 0 )
+				Msg( __LINE__, __FILE__, "WinNT Server." );
+		#endif
+//         }
+	}
+
+#ifdef DEV_VERSION
+
+	//--------------------------------------------------------------------------
+	// For developmental versions, just use the major & minor version #'s
+	//--------------------------------------------------------------------------
+	sprintf( VersionName, "%x.%x", MajorVersionNumber, MinorVersionNumber );
+
+#else
+
+	//--------------------------------------------------------------------------
+	// For final versions, trim 0's off the minor version
+	//--------------------------------------------------------------------------
+	unsigned short adjusted_minor;
+	int i;
+
+	adjusted_minor = MinorVersionNumber;
+	for (i = 0; i < 4; i++) {
+		if ((adjusted_minor & 0x000f) != 0) {
+			break;
+		}
+		adjusted_minor >>= 4;
+	}
+	sprintf( VersionName, "%x.%x", MajorVersionNumber, adjusted_minor );
+
+#endif
+
+	//--------------------------------------------------------------------------
+	// Save off the additional version information string
+	// (used to indicated additional info or patch level, i.e. for NT 4.0 SP3
+	// it would contain the string 'Service Pack 3')
+	//--------------------------------------------------------------------------
+	strncpy( AdditionalInfo, version_info.szCSDVersion, sizeof(AdditionalInfo) - 1 );
+	AdditionalInfo[sizeof(AdditionalInfo) - 1] = '\x0';
+
+	//--------------------------------------------------------------------------
+	// Send all info found to the debug output file.
+	//--------------------------------------------------------------------------
+#if ( RTS_DEBUG )
+	Msg( __LINE__, __FILE__, "MajorVersionNumber	= %d", MajorVersionNumber );
+	Msg( __LINE__, __FILE__, "MinorVersionNumber	= %d", MinorVersionNumber );
+	Msg( __LINE__, __FILE__, "WindowsVersion	= %d", WindowsVersion );
+	Msg( __LINE__, __FILE__, "BuildNumber	= %d", BuildNumber );
+	Msg( __LINE__, __FILE__, "IsWin9x		= %d", IsWin9x );
+	Msg( __LINE__, __FILE__, "IsWin95		= %d", IsWin95 );
+	Msg( __LINE__, __FILE__, "IsWin98		= %d", IsWin98 );
+	Msg( __LINE__, __FILE__, "IsWin2000		= %d", IsWin2000 );
+	Msg( __LINE__, __FILE__, "RunningOSR2	= %d", RunningOSR2 );
+	Msg( __LINE__, __FILE__, "IsWinNT		= %d", IsWinNT );
+	Msg( __LINE__, __FILE__, "AdditionalInfo	= %s", AdditionalInfo );
+	Msg( __LINE__, __FILE__, "VersionName	= %s", VersionName );
+#endif
+}
+
+/***********************************************************************************************
+ * WindowsVersionInfo::Version_String -- Get the version number in human readable form         *
+ *                                                                                             *
+ * INPUT:    Nothing                                                                           *
+ *                                                                                             *
+ * OUTPUT:   Ptr to string containing version info                                             *
+ *                                                                                             *
+ * WARNINGS: None                                                                              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   3/30/99 10:29PM ST : Created                                                              *
+ *=============================================================================================*/
+char *WindowsVersionInfo::Version_String(void)
+{
+	static char _ver95[]   	= {"Windows 95 "};
+	static char _ver98[]   	= {"Windows 98 "};
+	static char _verNT4[]	= {"Windows NT 4 "};
+	static char _verNT5[]	= {"Windows 2000 "};
+	static char _verXP[]	= {"Windows XP "};
+	static char _unknown[]	= {"Unknown "};
+
+	static char version[256];
+
+	if (Is_Win95()) {
+		strcpy (version, _ver95);
+	}
+
+	if (Is_Win98()) {
+		strcpy (version, _ver98);
+	}
+
+	if (Is_WinNT()) {
+		strcpy (version, _verNT4);
+	}
+
+	if (Is_WinNT5() || Is_Win_2000()) {
+		strcpy (version, _verNT5);
+	}
+
+	if (Is_Win_XP()) {
+		strcpy (version, _verXP);
+	}
+
+	strcat (version, AdditionalInfo);
+
+	return (version);
+}
+
+/***************************************************************************
+ * WindowsVersionClass::Version_Name -- returns version # as char string	*
+ *																									*
+ * INPUT:																						*
+ *		none.																						*
+ *																									*
+ * OUTPUT:																						*
+ *		ptr to name																				*
+ *																									*
+ * WARNINGS:																					*
+ *		none.																						*
+ *																									*
+ * HISTORY:																						*
+ *   10/30/1995 BRR : Created.															*
+ *=========================================================================*/
+
+char * WindowsVersionInfo::Version_Name(void)
+{
+	return ( VersionName );
+}
+
+/****************************************************************************
+ * WindowsVersionClass::Meets_Minimum_Version_Requirements					*
+ *																			*
+ * INPUT:																	*
+ *		none.																*
+ *																			*
+ * OUTPUT:																	*
+ *		ptr to name															*
+ *																			*
+ * WARNINGS:																*
+ *		none.																*
+ *																			*
+ * HISTORY:																	*
+ *   10/30/1995 BRR : Created.												*
+ *==========================================================================*/
+
+bool WindowsVersionInfo::Meets_Minimum_Version_Requirements	( void )
+{
+//	return(( !IsWin95 && ( Version() >= 400 ))? true : false );
+	return(( Version() >= 400 )? true : false );
+}
+
+
+
diff --git a/Core/Tools/Autorun/WinFix.h b/Core/Tools/Autorun/WinFix.h
new file mode 100644
index 00000000000..7d38f1ee42f
--- /dev/null
+++ b/Core/Tools/Autorun/WinFix.h
@@ -0,0 +1,143 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Renegade Setup/Autorun/WinFix.h                            $*
+ *                                                                                             *
+ *                      $Author:: Maria_l                                                     $*
+ *                                                                                             *
+ *                     $Modtime:: 11/07/01 5:57p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 6                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   WindowsVersionInfo::Major -- Get the major version of the OS							   *
+ *   WindowsVersionInfo::Minor -- Get the minor version of the OS							   *
+ *   WindowsVersionInfo::Build -- Get the build level of the OS								   *
+ *   WindowsVersionInfo::Info -- Get additional system information							   *
+ *   WindowsVersionInfo::Is_Win9x -- Determine if we are running on a non-NT system.		   *
+ *   WindowsVersionInfo::Is_Win95 -- Determine if we are running on a Win95 system.			   *
+ *   WindowsVersionInfo::Is_Win98 -- Determine if we are running on a Win98 system.			   *
+ *   WindowsVersionInfo::Is_WinNT -- Determine if we are running on an NT system.			   *
+ *   WindowsVersionInfo::Is_WinNT5 -- Determine if we are running on an NT 5 system.		   *
+ *   WindowsVersionInfo::Version	--														   *
+ *   WindowsVersionInfo::IsOSR2Release --													   *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+/*-----------------------------------------------------------------------------
+** Windows Version Information class.  This is a global object that is used to
+** store information about the specific OS that we are running under.  This can
+** be used to make special allowances for differences between OS's, such as when
+** using the registry, or trying to work around a limitaion of a particular OS
+** (their APIs are slightly different...)
+**-----------------------------------------------------------------------------*/
+class WindowsVersionInfo
+{
+	public:
+		WindowsVersionInfo	(void);
+		~WindowsVersionInfo	(void) {}
+
+		int 	Major								( void ) const { return( MajorVersionNumber ); }
+		int 	Minor								( void ) const { return( MinorVersionNumber ); }
+		int 	Build								( void ) const { return( BuildNumber ); }
+		bool 	Is_Win9x							( void ) const { return( IsWin9x ); }									// Win 9x
+		bool 	Is_Win95							( void ) const { return( IsWin95 ); }									// Win 95
+		bool 	Is_Win98							( void ) const { return( IsWin98 ); }									// Win 98
+		bool 	Is_WinNT							( void ) const { return( IsWinNT ); }									// Win NT
+		bool 	Is_WinNT4							( void ) const { return( IsWinNT && MajorVersionNumber == 4 ); }		// Win NT
+		bool	Is_WinNT5							( void ) const { return( IsWinNT && MajorVersionNumber == 5 ); }		// Win NT
+		bool	Is_Win_2000							( void ) const { return( IsWin2000 ); }								// Win 2000
+		bool	Is_Win_XP							( void ) const { return( IsWinXP ); }									// Win XP
+		int		Version								( void ) const { return( WindowsVersion );	}
+		int		IsOSR2Release						( void ) const { return( RunningOSR2 );		}
+		const char * Info							( void ) const { return( &AdditionalInfo[0] ); }
+		char *	Version_String						( void );
+		char *	Version_Name						( void );
+		bool	Meets_Minimum_Version_Requirements	( void );
+
+	private:
+		/*-----------------------------------------------------------------------
+		** Major version number; i.e. for 4.10.1721 this would be '4'
+		*/
+		int MajorVersionNumber;
+
+		/*-----------------------------------------------------------------------
+		** Minor version number; i.e. for 4.10.1721 this would be '10'
+		*/
+		int MinorVersionNumber;
+
+		/*-----------------------------------------------------------------------
+		** Version number expressed as a DWORD; i.e. for 4.10 this would be '410'
+		*/
+		int WindowsVersion;
+
+		/*-----------------------------------------------------------------------
+		** Build number; i.e. for 4.10.1721 this would be '1721'
+		*/
+		int BuildNumber;
+
+		/*-----------------------------------------------------------------------
+		** Is the system running OSR 2 or later release of Windows95.
+		*/
+		int RunningOSR2;
+
+		/*-----------------------------------------------------------------------
+		** Additional Info; i.e. for NT 4.0 with SP3, this would be
+		** the string 'Service Pack 3'
+		*/
+		char AdditionalInfo[128];
+
+		/*-----------------------------------------------------------------------
+		** Windows 9x flag; true if running on non-NT system
+		*/
+		bool IsWin9x;
+		bool IsWin95;
+		bool IsWin98;
+
+		/*-----------------------------------------------------------------------
+		** Windows NT flag; true if running on Windows NT system
+		*/
+		bool IsWinNT;
+
+		/*-----------------------------------------------------------------------
+		** Windows 2000 (Formerly Windows NT 5.0)
+		** As you've no doubt heard by now, Windows NT 5.0 has been officially
+		** christened "Windows 2000."
+		*/
+		bool IsWin2000;
+
+		/*-----------------------------------------------------------------------
+		** Windows XP flag; true if running on Windows NT system
+		*/
+		bool IsWinXP;
+
+		/*-----------------------------------------------------------------------
+		** This array is used for formatting the version # as a string
+		*/
+		char VersionName[30];
+};
+
+extern WindowsVersionInfo WinVersion;
diff --git a/Core/Tools/Autorun/Wnd_File.h b/Core/Tools/Autorun/Wnd_File.h
index 90b5db308b2..27e343372aa 100644
--- a/Core/Tools/Autorun/Wnd_File.h
+++ b/Core/Tools/Autorun/Wnd_File.h
@@ -17,14 +17,14 @@
 */
 
 //****************************************************************************
-//       C O N F I D E N T I A L -- W E S T W O O D   S T U D I O S       
+//       C O N F I D E N T I A L -- W E S T W O O D   S T U D I O S
 //****************************************************************************
 //
 //	Project name:		Blade Runner CD-ROM Windows 95
 //
-// File name:			WND_FILE.H
+// File name:			WND_FILE.h
 //
-// Source code: 		WND_FILE.CPP
+// Source code: 		WND_FILE.cpp
 //
 // Compatibility:		Microsoft Visual C++ 4.0
 //							Borland C++ 5.0
@@ -38,10 +38,8 @@
 //							James McNeill
 //
 //****************************************************************************
-#pragma once
 
-#ifndef WND_FILE_H
-#define WND_FILE_H
+#pragma once
 
 //------------------------------------------------------------------------------
 // include files...
@@ -65,7 +63,7 @@
 
 //
 // it's one or the other!
-//								 	
+//
 #define SUPPORT_STREAMS				TRUE		// Normally this!
 #define SUPPORT_HANDLES				FALSE		// This is a test!
 
@@ -108,10 +106,10 @@ void 	Delete_Msg_File( void );
 // file class definition
 //------------------------------------------------------------------------------
 
-class StandardFileClass 
+class StandardFileClass
 {
 	public:
-   
+
 		//
 		// public class functions...
 		//
@@ -128,7 +126,7 @@ class StandardFileClass
 		char *	Query_Name_String	( void );
      	int		End_Of_File			( void );
 		int		Flush	  	 		( void );
-		
+
 		#if( SUPPORT_STREAMS )
 		FILE *Query_File_Stream_Pointer( void );
 		#endif
@@ -148,15 +146,15 @@ class StandardFileClass
 
 		#if( SUPPORT_STREAMS )
 			//--------------------------------------------------------------------
-			// The _stat structure, defined in SYS\STAT.H, includes these fields.
+			// The _stat structure, defined in SYS\STAT.h, includes these fields.
 			//		st_atime  	Time of last access of file ( time_t ).
 			//		st_ctime  	Time of creation of file ( time_t ).
 			//		st_dev		Drive number of the disk containing the file (same as st_rdev).
 			//		st_rdev		Drive number of the disk containing the file (same as st_dev).
-			//		st_mode		Bit mask for file-mode information. 
-			//				  		_S_IFDIR bit is set if path specifies a directory; 
-			//				  		_S_IFREG bit is set if path specifies an ordinary file or a device. 
-			//				  	User read/write bits are set according to the file's permission 
+			//		st_mode		Bit mask for file-mode information.
+			//				  		_S_IFDIR bit is set if path specifies a directory;
+			//				  		_S_IFREG bit is set if path specifies an ordinary file or a device.
+			//				  	User read/write bits are set according to the file's permission
 			//				  	mode; user execute bits are set according to the filename extension.
 			//		st_mtime  	Time of last modification of file.
 			//		st_nlink  	Always 1 on non-NTFS file systems.
@@ -177,14 +175,14 @@ class StandardFileClass
 #if( SUPPORT_HANDLES )
 	HANDLE 	Open_File( char const *file_name, int mode );
 	bool   	Close_File( HANDLE handle );
-	int    	Read_File( HANDLE handle, 
-		   			void *buffer, 
+	int    	Read_File( HANDLE handle,
+		   			void *buffer,
 		   			unsigned long int bytes_to_read );
-	int    	Write_File( HANDLE handle, 
-		   		 	 void const *buffer, 
+	int    	Write_File( HANDLE handle,
+		   		 	 void const *buffer,
 		   		 	 unsigned long int bytes_to_write );
-	bool   	Seek_File( HANDLE handle, 
-		   		 	 int distance, 
+	bool   	Seek_File( HANDLE handle,
+		   		 	 int distance,
 		   		 	 int seek_file_location );
 	int    	Tell_File( HANDLE handle );
 	int    	File_Size( HANDLE handle );
@@ -212,5 +210,3 @@ class StandardFileClass
 	bool CD_File_Exists( char const *file_name );
 	// bool Find_File( char const *file_name );
 #endif
-
-#endif // WND_FILE_H
diff --git a/Core/Tools/Autorun/Wnd_file.cpp b/Core/Tools/Autorun/Wnd_file.cpp
index a0b28974aa1..0db0ade1841 100644
--- a/Core/Tools/Autorun/Wnd_file.cpp
+++ b/Core/Tools/Autorun/Wnd_file.cpp
@@ -17,14 +17,14 @@
 */
 
 //*****************************************************************************
-//       C O N F I D E N T I A L -- W E S T W O O D   S T U D I O S       
+//       C O N F I D E N T I A L -- W E S T W O O D   S T U D I O S
 //*****************************************************************************
 //
 //	Project name:		Blade Runner CD-ROM Windows 95
 //
-// File name:			WND_FILE.CPP
+// File name:			WND_FILE.cpp
 //
-// Functions:			WND_FILE.H
+// Functions:			WND_FILE.h
 //
 // Compatibility:		Microsoft Visual C++ 4.0
 //					 	Borland C++ 5.0
@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include "Wnd_File.h"
-#include "WinFix.H"
+#include "WinFix.h"
 //#include "autorun.h"
 
 
@@ -115,7 +115,7 @@ void __cdecl Msg( int line, const char *filename, const char *fmt, ... )
 	va_list  va;
 	DWORD    nBytes;
 	StandardFileClass file;
-   
+
 	//----------------------------------------------------------------------
 	// Variable Arguments
 	//----------------------------------------------------------------------
@@ -144,7 +144,7 @@ void __cdecl Msg( int line, const char *filename, const char *fmt, ... )
 	memset( szBuffer2, '\0', MAX_PATH * 2 );
 	wvsprintf( szBuffer2, fmt, va );
 	wsprintf( szBuffer1, "%4d %14s %s\n",   line, szFile, szBuffer2 );
-   
+
 	//----------------------------------------------------------------------
 	// Open debug file and write to it.
 	//----------------------------------------------------------------------
@@ -162,7 +162,7 @@ void __cdecl Msg( int line, const char *filename, const char *fmt, ... )
 	// To the debugger unless we need to be quiet
 	//----------------------------------------------------------------------
 	OutputDebugString( szBuffer1 );
-   
+
 } /* Msg */
 
 
@@ -192,7 +192,7 @@ void __cdecl Msg( int line, const char *filename, const wchar_t *fmt, UINT codep
 	int			length;
 	DWORD		nBytes;
 	StandardFileClass file;
-   
+
 	//----------------------------------------------------------------------
 	// Variable Arguments
 	//----------------------------------------------------------------------
@@ -225,7 +225,7 @@ void __cdecl Msg( int line, const char *filename, const wchar_t *fmt, UINT codep
 	//----------------------------------------------------------------------
 	vswprintf( szBuffer2, fmt, va );
 	swprintf( szBuffer1, L"%4d %14s %s\n", line, szFile, szBuffer2 );
-   
+
 	//----------------------------------------------------------------------
 	// Open debug file and write to it.
 	//----------------------------------------------------------------------
@@ -234,11 +234,11 @@ void __cdecl Msg( int line, const char *filename, const wchar_t *fmt, UINT codep
 	if ( file.Query_Open( )) {
 
 		//---------------------------------------------------------------------
-		//	Identifier		Meaning 
-		//	932				Japan 
-		//	949				Korean 
-		//	950				Chinese (Taiwan; Hong Kong SAR, PRC)  
-		//	1252			Windows 3.1 Latin 1 (US, Western Europe) 
+		//	Identifier		Meaning
+		//	932				Japan
+		//	949				Korean
+		//	950				Chinese (Taiwan; Hong Kong SAR, PRC)
+		//	1252			Windows 3.1 Latin 1 (US, Western Europe)
 		//---------------------------------------------------------------------
 		WideCharToMultiByte( codepage, 0, szBuffer1, -1, szBuffer3, MAX_PATH*3, NULL, NULL );
 
@@ -253,7 +253,7 @@ void __cdecl Msg( int line, const char *filename, const wchar_t *fmt, UINT codep
 	// To the debugger unless we need to be quiet
 	//----------------------------------------------------------------------
 	OutputDebugString( szBuffer3 );
-   
+
 } /* Msg */
 
 
@@ -289,14 +289,14 @@ void Delete_Msg_File ( void )
 	GetWindowsDirectory( DebugFile, MAX_PATH );
 	if ( DebugFile[ strlen( DebugFile )-1 ] != '\\' ) {
 		strcat( DebugFile, "\\" );
-	}		
+	}
 	strcat( DebugFile, DEBUG_FILE );
 
 	//--------------------------------------------------------------------------
 	// Delete previous file.
 	//--------------------------------------------------------------------------
 	DeleteFile( DebugFile );
-	
+
 	//--------------------------------------------------------------------------
 	// Create/Open new file.
 	//--------------------------------------------------------------------------
@@ -375,7 +375,7 @@ bool StandardFileClass::Open( const char *no_path_file_name, int open_mode )
 	ASSERT( strlen( no_path_file_name ) < MAX_PATH );
 	ASSERT(	open_mode == MODE_READ_ONLY ||
 			open_mode == MODE_WRITE_ONLY ||
-			open_mode == MODE_READ_AND_WRITE || 
+			open_mode == MODE_READ_AND_WRITE ||
 			open_mode == MODE_WRITE_TRUNCATE ||
 			open_mode == MODE_WRITE_APPEND );
 
@@ -392,7 +392,7 @@ bool StandardFileClass::Open( const char *no_path_file_name, int open_mode )
 		strcpy( pathed_file_name, HD_Path );
 		strcat( pathed_file_name, no_path_file_name );
 		File_Handle = Open_File( pathed_file_name, open_mode );
-                            
+
 		//
 		// if not success with HD open, try CD
 		//
@@ -419,7 +419,7 @@ bool StandardFileClass::Open( const char *no_path_file_name, int open_mode )
 	#if( SUPPORT_STREAMS )
 
 		ASSERT( File_Stream_Ptr == NULL );
-      
+
 		//
 		// "r"  - open existing file for reading.
 		// "w"  - create new file, or truncate existing one, for output.
@@ -450,7 +450,7 @@ bool StandardFileClass::Open( const char *no_path_file_name, int open_mode )
 		}
 		else if ( open_mode == MODE_WRITE_UPDATE ) {
 			//
-			// Create a new file for update (reading and writing). If a file by 
+			// Create a new file for update (reading and writing). If a file by
 			// that name already exists, it will be overwritten.
 			//
 			attributes = "w+b";
@@ -484,7 +484,7 @@ bool StandardFileClass::Open( const char *no_path_file_name, int open_mode )
 			strcat( pathed_file_name, no_path_file_name );
 	   		File_Stream_Ptr = fopen( pathed_file_name, attributes );
 		}
-                            
+
 	//
    	// not successful?
    	//
@@ -499,7 +499,7 @@ bool StandardFileClass::Open( const char *no_path_file_name, int open_mode )
 	ASSERT( test == 0 );
 
    #endif
-   
+
 	//
 	// successful, set name and open status
 	//
@@ -519,7 +519,7 @@ bool StandardFileClass::Open( const char *no_path_file_name, int open_mode )
 bool StandardFileClass::Close( void )
 {
 	int status;
-	
+
 	#if( SUPPORT_HANDLES )
 	   bool success;
 	#endif
@@ -532,7 +532,7 @@ bool StandardFileClass::Close( void )
 	#if( SUPPORT_HANDLES )
 
 	ASSERT( File_Handle > INVALID_FILE_HANDLE );
-      
+
 	//
    	// error?
    	//
@@ -553,7 +553,7 @@ bool StandardFileClass::Close( void )
 
 	//
    	// reset file data
-   	//   		
+   	//
 	File_Handle = INVALID_FILE_HANDLE;
 	Currently_Open = FALSE;
 
@@ -564,13 +564,13 @@ bool StandardFileClass::Close( void )
    	// 		return( FALSE );
    	// }
 	return( success );
-      
+
 	#endif
-   
+
 	#if( SUPPORT_STREAMS )
 
 	ASSERT( File_Stream_Ptr != NULL );
-      
+
    	//
    	// error?
    	//
@@ -590,7 +590,7 @@ bool StandardFileClass::Close( void )
 
 	//
    	// reset file data
-   	//   		
+   	//
 	File_Stream_Ptr = NULL;
 	Currently_Open = FALSE;
 
@@ -624,7 +624,7 @@ int StandardFileClass::Read( void *buffer, unsigned long int bytes_to_read )
 	ASSERT( Currently_Open == TRUE );
 
 #if( SUPPORT_HANDLES )
-   
+
 	ASSERT( File_Handle != INVALID_FILE_HANDLE );
 	//
 	// error?
@@ -643,7 +643,7 @@ int StandardFileClass::Read( void *buffer, unsigned long int bytes_to_read )
 #endif
 
 #if( SUPPORT_STREAMS )
-   
+
 	ASSERT( File_Stream_Ptr != NULL );
 	//
 	// error?
@@ -669,12 +669,12 @@ int StandardFileClass::Read( void *buffer, unsigned long int bytes_to_read )
 	//
 	ASSERT( items_read == 1 );
 
-	bytes_read = items_read * bytes_to_read;                          
+	bytes_read = items_read * bytes_to_read;
 #endif
 
 	//
 	// return how many bytes we read
-	//   
+	//
 	return( bytes_read );
 }
 
@@ -702,7 +702,7 @@ int StandardFileClass::Write( void *buffer, unsigned long int bytes_to_write )
 	}
 
 	#if( SUPPORT_HANDLES )
-   
+
 	ASSERT( File_Handle != INVALID_FILE_HANDLE );
 
    	//
@@ -723,7 +723,7 @@ int StandardFileClass::Write( void *buffer, unsigned long int bytes_to_write )
 	#endif
 
 	#if( SUPPORT_STREAMS )
-   
+
 	ASSERT( File_Stream_Ptr != NULL );
    	//
    	// error?
@@ -745,7 +745,7 @@ int StandardFileClass::Write( void *buffer, unsigned long int bytes_to_write )
 
 	//
 	// return how many bytes we wrote
-	//   
+	//
 	return( bytes_written );
 }
 
@@ -780,10 +780,10 @@ bool StandardFileClass::Seek( int distance, int seek_file_position )
 
 	//
    	// do the seek!
-   	//   
+   	//
    	success = Seek_File( File_Handle, distance, seek_file_position );
 	ASSERT( success == TRUE );
-	return( success );                        
+	return( success );
 	#endif
 
 	#if( SUPPORT_STREAMS )
@@ -802,7 +802,7 @@ bool StandardFileClass::Seek( int distance, int seek_file_position )
 
 	//
    	// do the seek!
-   	//   
+   	//
    	int result = fseek( File_Stream_Ptr, distance, seek_file_position );
 
 	ASSERT( result == 0 );
@@ -843,11 +843,11 @@ int StandardFileClass::Tell( void )
 
 	//
    	// do the tell
-   	//   
+   	//
    	file_pos = Tell_File( File_Handle );
 
 	ASSERT( file_pos != -1 );
-	return( file_pos );                        
+	return( file_pos );
 
 	#endif
 
@@ -866,7 +866,7 @@ int StandardFileClass::Tell( void )
 
 	//
    	// do the tell!
-   	//   
+   	//
    	file_pos = ftell( File_Stream_Ptr );
 
 	ASSERT( file_pos != -1 );
@@ -920,8 +920,8 @@ int StandardFileClass::Query_Size( void )
 	size = File_Statistics.st_size;
    	ASSERT( size > -1 );
 	#endif
-   
-	return( size );   
+
+	return( size );
 }
 
 //------------------------------------------------------------------------------
@@ -1027,13 +1027,13 @@ HANDLE Open_File( char const *file_name, int mode )
 	DWORD creation;
 	DWORD share;
 	// int fh;
-	
+
 	//
 	// debug checks...
 	//
 	ASSERT( file_name != NULL );
 	// ASSERT( mode == READ || mode == WRITE );
-	ASSERT( mode == MODE_READ_ONLY	|| 
+	ASSERT( mode == MODE_READ_ONLY	||
 			mode == MODE_WRITE_ONLY	||
 			mode == MODE_READ_AND_WRITE );
 
@@ -1081,14 +1081,14 @@ HANDLE Open_File( char const *file_name, int mode )
 	//
 	windows_file_handle = CreateFile( file_name,
                                      access,
-                                     share,			
-                                     NULL,			
+                                     share,
+                                     NULL,
                                      creation,
                                      FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN,
-                                     NULL );		
+                                     NULL );
 	//
     // error?
-    // 
+    //
     // we don't want to assert because we may be looking for a file
     // to just see if it is there...
     //
@@ -1105,7 +1105,7 @@ HANDLE Open_File( char const *file_name, int mode )
 
 	//
 	// store the windows handle
-	// 
+	//
 	// Windows_File_Handles[ fh ] = windows_file_handle;
 	//
 	// return our internal file handle
@@ -1114,7 +1114,7 @@ HANDLE Open_File( char const *file_name, int mode )
 
 	//
 	// &&& this should be HANDLE, not int
-	//	
+	//
 	// return( windows_file_handle );
 	return( windows_file_handle );
 }
@@ -1153,12 +1153,12 @@ bool Close_File( HANDLE handle )
 
 	//
 	// return success or not
-	//   
+	//
 	// if ( success == TRUE ) {
 	// 		//
 	//		// return the invalid handle that closed
 	//		//
-	// 		return( handle );   	
+	// 		return( handle );
 	// }
 	// //
 	// // error
@@ -1185,7 +1185,7 @@ int Read_File( HANDLE handle, void *buffer, unsigned long int bytes_to_read )
 	// ASSERT( Windows_File_Handles[ handle ] != NULL );
 
 	// Debug_Printf( "Reading file %d\r\n", handle );
-   
+
 	// success = ReadFile( Windows_File_Handles[ handle ],
 	//                     (void *) buffer,
 	//                     (DWORD) bytes_to_read,
@@ -1202,13 +1202,13 @@ int Read_File( HANDLE handle, void *buffer, unsigned long int bytes_to_read )
                        NULL );
 
 	ASSERT( success == TRUE );
-   
+
 	if ( success == FALSE ) {
    		//
 		// no bytes read
 		//
    		return( 0 );
-	}                       
+	}
 
    return( bytes_actually_read );
 }
@@ -1231,7 +1231,7 @@ int Write_File( HANDLE handle, void const *buffer, unsigned long int bytes_to_wr
 	// ASSERT( Windows_File_Handles[ handle ] != NULL );
 
 	// Debug_Printf( "Writing file %d\r\n", handle );
-   
+
 	// success = WriteFile( Windows_File_Handles[ handle ],
 	//                      buffer,
 	//                      (DWORD) bytes_to_write,
@@ -1249,13 +1249,13 @@ int Write_File( HANDLE handle, void const *buffer, unsigned long int bytes_to_wr
 
 	ASSERT( success == TRUE );
 	ASSERT( bytes_actually_written == bytes_to_write );
-   
+
 	if ( success == FALSE ) {
    		//
 		// no bytes written
 		//
    		return( 0 );
-	}                       
+	}
 
 	return( bytes_actually_written );
 }
@@ -1274,8 +1274,8 @@ bool Seek_File( HANDLE handle, int distance, int seek_file_location )
 	//
 	ASSERT( handle != INVALID_FILE_HANDLE );
 	// ASSERT( distance >= 0 );
-	ASSERT( seek_file_location == SEEK_SET || 
-   			seek_file_location == SEEK_CUR || 
+	ASSERT( seek_file_location == SEEK_SET ||
+   			seek_file_location == SEEK_CUR ||
 			seek_file_location == SEEK_END );
 	// ASSERT( Windows_File_Handles[ handle ] != NULL );
 
@@ -1291,7 +1291,7 @@ bool Seek_File( HANDLE handle, int distance, int seek_file_location )
 	else if ( seek_file_location == SEEK_END ) {
 		move_method = FILE_END;
 	}
-   
+
 	// success = SetFilePointer( Windows_File_Handles[ handle ],
 	//                          distance,
 	//                          NULL,
@@ -1299,16 +1299,16 @@ bool Seek_File( HANDLE handle, int distance, int seek_file_location )
 
 	//
 	// make this a real handle
-	//                            
+	//
 	success = SetFilePointer( (HANDLE) handle,
                              distance,
                              NULL,
                              move_method );
-                            
+
 	if ( success == 0xFFFFFFFF ) {
    		return( FALSE );
-	}                            
-	return( TRUE );   	           
+	}
+	return( TRUE );
 }
 
 //------------------------------------------------------------------------------
@@ -1333,16 +1333,16 @@ int Tell_File( HANDLE handle )
 
 	//
 	// move nowhere
-	//   
+	//
 	pos = SetFilePointer( handle,
                          0, // distance to move
                          NULL,
                          move_method );
-                            
+
 	if ( pos == 0xFFFFFFFF ) {
    		return( -1 );
-	}                            
-	return( pos );   	           
+	}
+	return( pos );
 }
 
 //------------------------------------------------------------------------------
@@ -1360,7 +1360,7 @@ int File_Size( HANDLE handle )
 	// ASSERT( Windows_File_Handles[ handle ] != NULL );
 
 	file_size = GetFileSize( handle, NULL );
-	ASSERT( file_size != 0xFFFFFFFF );                            
+	ASSERT( file_size != 0xFFFFFFFF );
 
 	//
 	// error!
@@ -1371,7 +1371,7 @@ int File_Size( HANDLE handle )
 
 	//
 	// return size
-	//   	
+	//
 	return( (int) file_size );
 }
 
@@ -1400,7 +1400,7 @@ bool Full_Path_File_Exists( char const *file_name )
 
 	//
 	// close the file and return success if opened
-	//   
+	//
 	if ( fh != INVALID_FILE_HANDLE ) {
    		Close_File( fh );
 		return( TRUE );
@@ -1439,7 +1439,7 @@ bool HD_File_Exists( char const *file_name )
 
 	//
 	// close the file and return success if opened
-	//   
+	//
 	if ( fh != INVALID_FILE_HANDLE ) {
    		Close_File( fh );
 		return( TRUE );
@@ -1478,7 +1478,7 @@ bool CD_File_Exists( char const *file_name )
 
 	//
 	// close the file and return success if opened
-	//   
+	//
 	if ( fh != INVALID_FILE_HANDLE ) {
    		Close_File( fh );
 		return( TRUE );
@@ -1517,7 +1517,7 @@ int Get_Internal_File_Handle( void )
 	//
 	if ( ! _initialized ) {
    		for ( i = 0; i < MAX_FILES_OPEN_AT_A_TIME; i ++ ) {
-			Windows_File_Handles[ i ] = NULL;      	
+			Windows_File_Handles[ i ] = NULL;
 		}
 		_initialized = TRUE;
 	}
@@ -1533,7 +1533,7 @@ int Get_Internal_File_Handle( void )
 
 	//
 	// no free slot found
-	//   
+	//
 	ASSERT( FALSE );
 	return( INVALID_FILE_HANDLE );
 }
@@ -1611,7 +1611,7 @@ bool CD_File_Exists( char const *file_name )
 }
 
 
-#if( 0 )   
+#if( 0 )
 //------------------------------------------------------------------------------
 // bool Find_File
 //------------------------------------------------------------------------------
diff --git a/Core/Tools/Autorun/autorun.cpp b/Core/Tools/Autorun/autorun.cpp
index 460048100de..fefdd6ed6e4 100644
--- a/Core/Tools/Autorun/autorun.cpp
+++ b/Core/Tools/Autorun/autorun.cpp
@@ -22,7 +22,7 @@
  *																			*
  *                  Project Name : Autorun									*
  *																			*
- *                     File Name : AUTORUN.CPP								*
+ *                     File Name : AUTORUN.cpp								*
  *																			*
  *                    Programmers: Maria del Mar McCready Legg				*
  *																			*
@@ -90,14 +90,14 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <winuser.h>
-#include "ARGS.H"
+#include "ARGS.h"
 #include "autorun.h"
 #include "DrawButton.h"
 #include "resource.h"
-#include "Wnd_File.h" 
+#include "Wnd_File.h"
 //#include "visualc.h"
-#include "WinFix.H"
-#include "CDCNTRL.H"
+#include "WinFix.h"
+#include "CDCNTRL.h"
 #include "IGR.h"
 #include "ViewHTML.h"
 
@@ -141,7 +141,7 @@
 #define		NUM_FLICKER_FRAMES				1
 #define		NUM_FLICKER_POSITIONS			15
 
-#define		MOUSE_WAV						"MouseMove"  
+#define		MOUSE_WAV						"MouseMove"
 #define		SOUND_FILE1						"SPEECH_FILE1"
 #define		SOUND_FILE2						"SPEECH_FILE2"
 
@@ -164,15 +164,15 @@
 //-----------------------------------------------------------------------------
 // These defines need the Product name from Setup.ini to complete.
 //-----------------------------------------------------------------------------
-#define		SETUP_MAIN_WINDOW_NAME			"%s Setup" 
-#define		CLASS_NAME						"%s Autorun" 
-#define		GAME_MAIN_WINDOW_NAME			"%s Game Window" 
+#define		SETUP_MAIN_WINDOW_NAME			"%s Setup"
+#define		CLASS_NAME						"%s Autorun"
+#define		GAME_MAIN_WINDOW_NAME			"%s Game Window"
 
-//#define	GAME_WEBSITE					"http://www.westwood.com/" 
-#define		GAME_WEBSITE					"http://generals.ea.com" 
+//#define	GAME_WEBSITE					"http://www.westwood.com/"
+#define		GAME_WEBSITE					"http://generals.ea.com"
 
-#define		AUTORUN_MUTEX_OBJECT			"01AF9993-3492-11d3-8F6F-0060089C05B1" 
-//#define		GAME_MUTEX_OBJECT			"C6D925A3-7A9B-4ca3-866D-8B4D506C3665" 
+#define		AUTORUN_MUTEX_OBJECT			"01AF9993-3492-11d3-8F6F-0060089C05B1"
+//#define		GAME_MUTEX_OBJECT			"C6D925A3-7A9B-4ca3-866D-8B4D506C3665"
 #define		GAME_MUTEX_OBJECT				"685EAFF2-3216-4265-B047-251C5F4B82F3"
 #define		PRODUCT_VOLUME_CD1	 			"Generals1"
 #define		PRODUCT_VOLUME_CD2	 			"Generals2"
@@ -230,7 +230,7 @@ wchar_t		szFullProductName	[ _MAX_PATH ];
 
 /*
 enum
-{	
+{
 	IDS_INSTALL,
 	IDS_EXPLORE_CD,
 	IDS_PREVIEWS,
@@ -252,7 +252,7 @@ enum
 	IDS_MAIN_WINDOW,
 
 
-	IDS_COUNT // keep this last
+	IDS_COUNT
 };
 */
 
@@ -469,7 +469,7 @@ int PASCAL WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpszCmd
 		//---------------------------------------------------------------------
 		Make_Current_Path_To( SETUP_INI_FILE2, szIniPath );
 	}
-	FindClose( handle );	
+	FindClose( handle );
 
 	Msg( __LINE__, __FILE__, "Resource file = %s.", szPath );
 	Msg( __LINE__, __FILE__, "Setup.ini file = %s.", szIniPath );
@@ -487,7 +487,7 @@ int PASCAL WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpszCmd
 	Msg( __LINE__, __FILE__, "IsEnglish = %d.", IsEnglish );
 
 	//--------------------------------------------------------------------------
-	// Set language to use.  
+	// Set language to use.
 	//--------------------------------------------------------------------------
 	if( Locale_Use_Multi_Language_Files()) {
 
@@ -609,12 +609,12 @@ int PASCAL WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpszCmd
 	//	our app is already running.
 	//
 	//	Return Values:
-	//	If the function succeeds, the return value is a handle to the mutex object. 
-	//	If the named mutex object existed before the function call, the function returns 
-	//	a handle to the existing object and GetLastError returns ERROR_ALREADY_EXISTS. 
-	//	Otherwise, the caller created the mutex. 
-	//	If the function fails, the return value is NULL. To get extended error 
-	//	information, call GetLastError. 
+	//	If the function succeeds, the return value is a handle to the mutex object.
+	//	If the named mutex object existed before the function call, the function returns
+	//	a handle to the existing object and GetLastError returns ERROR_ALREADY_EXISTS.
+	//	Otherwise, the caller created the mutex.
+	//	If the function fails, the return value is NULL. To get extended error
+	//	information, call GetLastError.
 	//
 	// WARNING: DO NOT use this number for any other application except Autorun
 	//=========================================================================
@@ -654,13 +654,13 @@ int PASCAL WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpszCmd
 	}
 
 	//=========================================================================
-	//	Create a mutex with a unique name to Game/Setup in order to 
+	//	Create a mutex with a unique name to Game/Setup in order to
 	//	determine if our app is already running.
 	//
 	//	Return Values
 	//	If the function succeeds, the return value is a handle to the mutex object.
-	//	If the function fails, the return value is NULL. To get extended error 
-	//	information, call GetLastError. 
+	//	If the function fails, the return value is NULL. To get extended error
+	//	information, call GetLastError.
 	//
 	// WARNING: DO NOT use this number for any other application except Game/Setup.
 	//=========================================================================
@@ -678,9 +678,9 @@ int PASCAL WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpszCmd
 
 		HWND ccwindow = FindWindow( szGameWindow, NULL );
 		if ( ccwindow ) {
-	
+
 			Msg( __LINE__, TEXT(__FILE__), TEXT("Found Game Window."));
-			
+
 			if( IsIconic( ccwindow )){
 				ShowWindow( ccwindow, SW_RESTORE );
 			}
@@ -828,12 +828,12 @@ int PASCAL WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpszCmd
 	strcpy( FocusedButtonImages[9], BUTTON_SEL );
 
 	//=========================================================================
-	// A Windows class should be registered with Windows before any windows 
-	// of that type are created. Register here all Windows classes that 
+	// A Windows class should be registered with Windows before any windows
+	// of that type are created. Register here all Windows classes that
 	// will be used in the program.
 	//-------------------------------------------------------------------------
-	// Register the class only AFTER WinMain assigns appropriate values to 
-	// static members of Main and only if no previous instances of the program 
+	// Register the class only AFTER WinMain assigns appropriate values to
+	// static members of Main and only if no previous instances of the program
 	// exist (a previous instance would have already performed the registration).
 	//=========================================================================
 	if ( !Main::hPrevInstance ) {
@@ -1009,18 +1009,18 @@ void MainWindow::Register( void )
 	if ( !RegisterClassEx((const WNDCLASSEX *) &wndclass ) ) {
 
 	#if(RTS_DEBUG)
-		LPVOID szMessage; 
+		LPVOID szMessage;
 
-		FormatMessage( 
-			FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, 
+		FormatMessage(
+			FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
 			NULL,
-			GetLastError(), 
+			GetLastError(),
 			MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ),
 			(LPTSTR)&szMessage,
 			0,
 			NULL );
 
-		_stprintf( szBuffer, TEXT( "%s(%lx)" ), szMessage, GetLastError()); 
+		_stprintf( szBuffer, TEXT( "%s(%lx)" ), szMessage, GetLastError());
 		Msg( __LINE__, TEXT(__FILE__), TEXT("GetLastError: %s"), szBuffer );
 	#endif
 
@@ -1029,16 +1029,16 @@ void MainWindow::Register( void )
 }
 
 //*****************************************************************************
-// MainWindow::MainWindow -- Main Window Constructor function.					
-//                                                                         
-// INPUT:         none.																		
-//																									
-// OUTPUT:        none.                                                    
-//                                                                         
-// WARNINGS:      none.                                                    
-//                                                                         
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+// MainWindow::MainWindow -- Main Window Constructor function.
+//
+// INPUT:         none.
+//
+// OUTPUT:        none.
+//
+// WARNINGS:      none.
+//
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 MainWindow::MainWindow( void )
@@ -1056,7 +1056,7 @@ MainWindow::MainWindow( void )
 
 #endif
 
-	memset( szTitle, '\0', _MAX_PATH );	
+	memset( szTitle, '\0', _MAX_PATH );
 	sprintf( szTitle, CLASS_NAME, szBuffer );
 
 	//--------------------------------------------------------------------------
@@ -1065,16 +1065,16 @@ MainWindow::MainWindow( void )
 	//--------------------------------------------------------------------------
 	hWnd = CreateWindowEx(
    				0,
-		 		szClassName, 
+		 		szClassName,
 		 		szClassName,
 		 		WS_POPUPWINDOW | WS_MINIMIZE | !WS_VISIBLE,
-		 		0, 
+		 		0,
 		 		0,
 				640,
 				480,
-		 		NULL, 
-		 		NULL, 
-		 		Main::hInstance, 
+		 		NULL,
+		 		NULL,
+		 		Main::hInstance,
 		 		(LPTSTR) this );
 
 	if ( !hWnd ) {
@@ -1097,16 +1097,16 @@ MainWindow::MainWindow( void )
 }
 
 //*****************************************************************************
-// MainWindow::Window_Proc -- Main Window Procedure fnc to process msgs.	
-//                                                                         
-// INPUT:         none.																		
-//																									
-// OUTPUT:        none.                                                    
-//                                                                         
-// WARNINGS:      none.                                                    
-//                                                                         
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+// MainWindow::Window_Proc -- Main Window Procedure fnc to process msgs.
+//
+// INPUT:         none.
+//
+// OUTPUT:        none.
+//
+// WARNINGS:      none.
+//
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 LRESULT MainWindow::Window_Proc( HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam )
@@ -1138,10 +1138,9 @@ LRESULT MainWindow::Window_Proc( HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM
 
 			decision = DialogBox( Main::hInstance, _TEXT( "BitmapDialog" ), hWnd, Dialog_Box_Proc );
 
-			if ( Args ) {
-				delete( Args );
-				Args = NULL;
-			}
+			delete( Args );
+			Args = NULL;
+
 			Stop_Sound_Playing();
 
 			MoveWindow(	hWnd, 0, 0, 0, 0, TRUE );
@@ -1193,7 +1192,7 @@ LRESULT MainWindow::Window_Proc( HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM
 		// LOWORD( lParam )		Child Window handle
 		// HIWORD( lParam )		Notification Code: BN_CLICKED, BN_PAINT, etc...
 		//-----------------------------------------------------------------------
-		case WM_COMMAND:  
+		case WM_COMMAND:
 			break;
 
 		//-----------------------------------------------------------------------
@@ -1217,13 +1216,13 @@ LRESULT MainWindow::Window_Proc( HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM
 // MainWindow::Is_Product_Registered -- Check the Registration Table information.
 //
 // INPUT:  		none.
-//                                                                 
+//
 //	OUTPUT: 		BOOL - TRUE if product is already installed, FALSE if not.
-//                                                                 
+//
 // WARNINGS:	none.
-//                                                                 
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+//
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 BOOL MainWindow::Is_Product_Registered( void )
@@ -1281,7 +1280,7 @@ BOOL MainWindow::Is_Product_Registered( void )
 			handle = FindFirstFile( szGamePath, &FindFileData );
 			if ( handle != INVALID_HANDLE_VALUE ) {
 				InstallProduct = FALSE;
-				FindClose( handle );	
+				FindClose( handle );
 			}
 		}
 		Msg( __LINE__, TEXT(__FILE__), TEXT("GamePath =  %s."), szGamePath );
@@ -1303,7 +1302,7 @@ BOOL MainWindow::Is_Product_Registered( void )
 	if ( RegOpenKeyEx( HKEY_LOCAL_MACHINE, key, 0, KEY_ALL_ACCESS, &phKey ) == ERROR_SUCCESS ) {
 
 		Size = _MAX_PATH;
-		if ( RegQueryValueEx( phKey, UNINSTALL_STRING_SUBKEY, NULL, &Type, (unsigned char *)aName, &Size ) == ERROR_SUCCESS ) 
+		if ( RegQueryValueEx( phKey, UNINSTALL_STRING_SUBKEY, NULL, &Type, (unsigned char *)aName, &Size ) == ERROR_SUCCESS )
 		{
 			//------------------------------------------------------------------------------------------------------
 			// Look for the uninstall program.  If found, set flag.
@@ -1313,7 +1312,7 @@ BOOL MainWindow::Is_Product_Registered( void )
 			if(strstr(aName,UNINSTALL_EXECUTABLE) != NULL)
 			{
 				char	*sp;
-				
+
 				strcpy( szUninstallPath, aName );
 				sp = strchr(szUninstallPath,'/');
 				if(*sp != NULL)
@@ -1321,13 +1320,13 @@ BOOL MainWindow::Is_Product_Registered( void )
 					strcpy( szUninstallCommandLine, sp );
 					strcpy( szUninstallPath, aName );
 					*sp = '\0';
-				}		
+				}
 			}
-				
+
 			handle = FindFirstFile( szUninstallPath, &FindFileData );
 			if ( handle != INVALID_HANDLE_VALUE ) {
 				UninstallAvailable = TRUE;
-				FindClose( handle );	
+				FindClose( handle );
 			}
 		}
 		RegCloseKey( phKey );
@@ -1377,7 +1376,7 @@ BOOL MainWindow::Is_Product_Registered( void )
 				handle = FindFirstFile( szRegisterPath, &FindFileData );
 				if ( handle != INVALID_HANDLE_VALUE ) {
 					DisplayRegisterButton = TRUE;
-					FindClose( handle );	
+					FindClose( handle );
 				}
 			}
 			RegCloseKey( phKey );
@@ -1404,7 +1403,7 @@ BOOL MainWindow::Is_Product_Registered( void )
 			handle = FindFirstFile( szBuffer, &FindFileData );
 			if ( handle != INVALID_HANDLE_VALUE ) {
 				IsWolapiAvailable = TRUE;
-				FindClose( handle );	
+				FindClose( handle );
 			}
 		}
 		RegCloseKey( phKey );
@@ -1438,8 +1437,8 @@ BOOL MainWindow::Is_Product_Registered( void )
 //
 //	WARNINGS:	none.
 //
-//	HISTORY:                                                                
-//		06/04/1996  MML : Created.                                            
+//	HISTORY:
+//		06/04/1996  MML : Created.
 //=============================================================================
 
 BOOL MainWindow::Run_Explorer( const char *szString, HWND hWnd, RECT *rect )
@@ -1452,7 +1451,7 @@ BOOL MainWindow::Run_Explorer( const char *szString, HWND hWnd, RECT *rect )
 	char 	lpszComLine		[ 127 ];
 
 	BOOL result = FALSE;
-	PROCESS_INFORMATION processinfo; 
+	PROCESS_INFORMATION processinfo;
 	STARTUPINFO startupinfo;
 
 	//--------------------------------------------------------------------------
@@ -1482,7 +1481,7 @@ BOOL MainWindow::Run_Explorer( const char *szString, HWND hWnd, RECT *rect )
 	//--------------------------------------------------------------------------
 	// Next, start the process
 	//--------------------------------------------------------------------------
-	result = CreateProcess( 
+	result = CreateProcess(
 				szWindowsPath, 				// address of module name
 				lpszComLine,				// address of command line
 				NULL,						// address of process security attributes
@@ -1521,8 +1520,8 @@ BOOL MainWindow::Run_Explorer( const char *szString, HWND hWnd, RECT *rect )
 //
 // WARNINGS:	none.
 //
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 unsigned int MainWindow::Run_Game ( HWND hWnd, RECT *rect )
@@ -1560,7 +1559,7 @@ unsigned int MainWindow::Run_Game ( HWND hWnd, RECT *rect )
 		return FALSE;
 	}
 
-	FindClose( handle );	
+	FindClose( handle );
 
 	//-----------------------------------------------------------------------
 	// Stop Sound if sound was playing.
@@ -1581,8 +1580,8 @@ unsigned int MainWindow::Run_Game ( HWND hWnd, RECT *rect )
 //
 // WARNINGS:	none.
 //
-// HISTORY:                                                                
-//   12/02/2002  BGC : Created.                                            
+// HISTORY:
+//   12/02/2002  BGC : Created.
 //=============================================================================
 
 unsigned int MainWindow::Run_WorldBuilder( HWND hWnd, RECT *rect)
@@ -1598,7 +1597,7 @@ unsigned int MainWindow::Run_WorldBuilder( HWND hWnd, RECT *rect)
 		return FALSE;
 	}
 
-	FindClose( handle );	
+	FindClose( handle );
 
 	//-----------------------------------------------------------------------
 	// Stop Sound if sound was playing.
@@ -1619,8 +1618,8 @@ unsigned int MainWindow::Run_WorldBuilder( HWND hWnd, RECT *rect)
 //
 // WARNINGS:	none.
 //
-// HISTORY:                                                                
-//   12/02/2002  BGC : Created.                                            
+// HISTORY:
+//   12/02/2002  BGC : Created.
 //=============================================================================
 
 unsigned int MainWindow::Run_PatchGet( HWND hWnd, RECT *rect)
@@ -1636,7 +1635,7 @@ unsigned int MainWindow::Run_PatchGet( HWND hWnd, RECT *rect)
 		return FALSE;
 	}
 
-	FindClose( handle );	
+	FindClose( handle );
 
 	//-----------------------------------------------------------------------
 	// Stop Sound if sound was playing.
@@ -1657,8 +1656,8 @@ unsigned int MainWindow::Run_PatchGet( HWND hWnd, RECT *rect)
 //
 //	WARNINGS:	none.
 //
-//	HISTORY:                                                                
-//		01/08/2002  MML : Created.                                            
+//	HISTORY:
+//		01/08/2002  MML : Created.
 //=============================================================================
 
 unsigned int MainWindow::Run_Demo ( HWND hWnd, RECT *rect, int cd_drive )
@@ -1684,7 +1683,7 @@ unsigned int MainWindow::Run_Demo ( HWND hWnd, RECT *rect, int cd_drive )
 		return FALSE;
 	}
 
-	FindClose( handle );	
+	FindClose( handle );
 
 	//-----------------------------------------------------------------------
 	// Stop Sound if sound was playing.
@@ -1697,16 +1696,16 @@ unsigned int MainWindow::Run_Demo ( HWND hWnd, RECT *rect, int cd_drive )
 }
 
 //*****************************************************************************
-// MainWindow::Run_OpenFile -- Main Window function to perform Setup tasks.		
-//                                                                         
-// INPUT:         none.																		
-//																									
-// OUTPUT:        none.                                                    
-//                                                                         
-// WARNINGS:      none.                                                    
-//                                                                         
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+// MainWindow::Run_OpenFile -- Main Window function to perform Setup tasks.
+//
+// INPUT:         none.
+//
+// OUTPUT:        none.
+//
+// WARNINGS:      none.
+//
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 unsigned int MainWindow::Run_OpenFile(int cd_drive, const char *filename, bool wait /* = false */)
@@ -1760,7 +1759,7 @@ unsigned int MainWindow::Run_OpenFile(int cd_drive, const char *filename, bool w
 				TranslateMessage( &msg );
 				DispatchMessage( &msg );
 
-			}  // end while
+			}
 
 			DWORD exitCode;
 			GetExitCodeProcess(hProcess, &exitCode);
@@ -1775,16 +1774,16 @@ unsigned int MainWindow::Run_OpenFile(int cd_drive, const char *filename, bool w
 }
 
 //*****************************************************************************
-// MainWindow::Run_Setup -- Main Window function to perform Setup tasks.		
-//                                                                         
-// INPUT:         none.																		
-//																									
-// OUTPUT:        none.                                                    
-//                                                                         
-// WARNINGS:      none.                                                    
-//                                                                         
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+// MainWindow::Run_Setup -- Main Window function to perform Setup tasks.
+//
+// INPUT:         none.
+//
+// OUTPUT:        none.
+//
+// WARNINGS:      none.
+//
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 unsigned int MainWindow::Run_Setup( HWND hWnd, RECT *rect, int cd_drive )
@@ -1821,7 +1820,7 @@ unsigned int MainWindow::Run_Setup( HWND hWnd, RECT *rect, int cd_drive )
 		Cant_Find_MessageBox( Main::hInstance, filepath );
 		return FALSE;
 	}
-	FindClose( handle );	
+	FindClose( handle );
 
 	//--------------------------------------------------------------------------
 	//	Create parameters to pass in with the program we are calling.
@@ -1850,16 +1849,16 @@ unsigned int MainWindow::Run_Setup( HWND hWnd, RECT *rect, int cd_drive )
 
 
 //*****************************************************************************
-// MainWindow::Run_New_Account -- Create a new online account.		
-//                                                                         
-// INPUT:         none.																		
-//																									
-// OUTPUT:        none.                                                    
-//                                                                         
-// WARNINGS:      none.                                                    
-//                                                                         
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+// MainWindow::Run_New_Account -- Create a new online account.
+//
+// INPUT:         none.
+//
+// OUTPUT:        none.
+//
+// WARNINGS:      none.
+//
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 unsigned int MainWindow::Run_New_Account ( HWND hWnd, RECT *rect )
@@ -1891,7 +1890,7 @@ unsigned int MainWindow::Run_New_Account ( HWND hWnd, RECT *rect )
 		Cant_Find_MessageBox( Main::hInstance, SETUP_NAME );
 		return FALSE;
 	}
-	FindClose( handle );	
+	FindClose( handle );
 
 	//--------------------------------------------------------------------------
 	//	Create parameters to pass in with the program we are calling.
@@ -1922,18 +1921,18 @@ unsigned int MainWindow::Run_New_Account ( HWND hWnd, RECT *rect )
 
 
 //*****************************************************************************
-// MainWindow::Run_Register_Or_Auto_Update 
-//                                         
+// MainWindow::Run_Register_Or_Auto_Update
+//
 //		Either run Register.exe or Game Update Program from the user's harddrive.
-//                                
-// INPUT:         none.																		
-//																									
-// OUTPUT:        none.                                                    
-//                                                                         
-// WARNINGS:      none.                                                    
-//                                                                         
-// HISTORY:                                                                
-//   02/24/1999  MML : Created.                                            
+//
+// INPUT:         none.
+//
+// OUTPUT:        none.
+//
+// WARNINGS:      none.
+//
+// HISTORY:
+//   02/24/1999  MML : Created.
 //=============================================================================
 
 unsigned int MainWindow::Run_Register ( HWND hWnd, RECT *rect )
@@ -1949,7 +1948,7 @@ unsigned int MainWindow::Run_Register ( HWND hWnd, RECT *rect )
 	if ( DisplayRegisterButton ) {
 
 		//-----------------------------------------------------------------------
-		// Check again.  May have been changed ...										 
+		// Check again.  May have been changed ...
 		//-----------------------------------------------------------------------
 		handle = FindFirstFile( szRegisterPath, &FindFileData );
 		if ( handle == INVALID_HANDLE_VALUE ) {
@@ -1973,17 +1972,17 @@ unsigned int MainWindow::Run_Register ( HWND hWnd, RECT *rect )
 
 //*****************************************************************************
 // MainWindow::Run_Auto_Update
-//                                         
+//
 //		Either run Register.exe or Game Update Program from the user's harddrive.
-//                                
-// INPUT:         none.																		
-//																									
-// OUTPUT:        none.                                                    
-//                                                                         
-// WARNINGS:      none.                                                    
-//                                                                         
-// HISTORY:                                                                
-//   02/24/1999  MML : Created.                                            
+//
+// INPUT:         none.
+//
+// OUTPUT:        none.
+//
+// WARNINGS:      none.
+//
+// HISTORY:
+//   02/24/1999  MML : Created.
 //=============================================================================
 
 unsigned int MainWindow::Run_Auto_Update ( HWND hWnd, RECT *rect )
@@ -1999,7 +1998,7 @@ unsigned int MainWindow::Run_Auto_Update ( HWND hWnd, RECT *rect )
 	if ( !InstallProduct ) {
 
 		//-----------------------------------------------------------------------
-		// Check again.  May have been changed ...										 
+		// Check again.  May have been changed ...
 		//-----------------------------------------------------------------------
 		handle = FindFirstFile( szGamePath, &FindFileData );
 		if ( handle == INVALID_HANDLE_VALUE ) {
@@ -2019,16 +2018,16 @@ unsigned int MainWindow::Run_Auto_Update ( HWND hWnd, RECT *rect )
 
 
 //*****************************************************************************
-// MainWindow::Run_Uninstall -- Main Window function to perform Setup tasks.		
-//                                                                         
-// INPUT:         none.																		
-//																									
-// OUTPUT:        none.                                                    
-//                                                                         
-// WARNINGS:      none.                                                    
-//                                                                         
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+// MainWindow::Run_Uninstall -- Main Window function to perform Setup tasks.
+//
+// INPUT:         none.
+//
+// OUTPUT:        none.
+//
+// WARNINGS:      none.
+//
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 unsigned int MainWindow::Run_Uninstall( HWND hWnd, RECT *rect )
@@ -2058,7 +2057,7 @@ unsigned int MainWindow::Run_Uninstall( HWND hWnd, RECT *rect )
 		return( 0 );
 	}
 
-	FindClose( handle );	
+	FindClose( handle );
 
 	_splitpath( szUninstallPath, drive, dir, NULL, NULL );
 	_makepath ( szCurDir, drive, dir, NULL, NULL );
@@ -2069,7 +2068,7 @@ unsigned int MainWindow::Run_Uninstall( HWND hWnd, RECT *rect )
 	memset( &startupinfo, 0, sizeof( STARTUPINFO ));
 	startupinfo.cb = sizeof( STARTUPINFO );
 
-	result = CreateProcess( 
+	result = CreateProcess(
 					szUninstallPath,			// address of module name
 					szUninstallCommandLine,		// address of command line
 					NULL,						// address of process security attributes
@@ -2106,7 +2105,7 @@ unsigned int MainWindow::Run_Uninstall( HWND hWnd, RECT *rect )
 	//--------------------------------------------------------------------------
 	// Wait for App to shutdown
 	//--------------------------------------------------------------------------
-	while (dwRC == WAIT_TIMEOUT)  
+	while (dwRC == WAIT_TIMEOUT)
 	{
 
 		//-----------------------------------------------------------------------
@@ -2125,17 +2124,17 @@ unsigned int MainWindow::Run_Uninstall( HWND hWnd, RECT *rect )
 	}
 #endif
 	//--------------------------------------------------------------------------
-	// If the specified process has not terminated, the termination status 
-	// returned is STILL_ACTIVE.    
+	// If the specified process has not terminated, the termination status
+	// returned is STILL_ACTIVE.
 	//--------------------------------------------------------------------------
 	GetExitCodeProcess( processinfo.hProcess, &lpExitCode );
-	CloseHandle( processinfo.hProcess ); 
-	CloseHandle( processinfo.hThread  ); 
+	CloseHandle( processinfo.hProcess );
+	CloseHandle( processinfo.hThread  );
 
 #if(BACKGROUND_BITMAP)
 
 	//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	// MML 5/27/99:  This function is dropping through because we launch Uninstll.exe 
+	// MML 5/27/99:  This function is dropping through because we launch Uninstll.exe
 	// which in turn launches Uninst.exe thus ::Run_Install ends before Uninst.exe is done.
 	//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -2152,15 +2151,15 @@ unsigned int MainWindow::Run_Uninstall( HWND hWnd, RECT *rect )
 
 //*****************************************************************************
 // MainWindow::Create_Buttons -- Reset the Buttons.
-//                                                                         
-// INPUT:         none.																		
-//																									
-// OUTPUT:        none.                                                    
-//                                                                         
-// WARNINGS:      none.                                                    
-//                                                                         
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+//
+// INPUT:         none.
+//
+// OUTPUT:        none.
+//
+// WARNINGS:      none.
+//
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
@@ -2216,11 +2215,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 
 	for ( i = 0; i < NUM_BUTTONS; i++ ) {
 
-		if ( ButtonList[i] ) 
-		{
-			delete( ButtonList[i] );
-		}
-
+		delete( ButtonList[i] );
 		ButtonList[i]			= NULL;
 		ButtonSizes[i].left		= x_pos; 				// X position.
 		ButtonSizes[i].top 		= y_pos;				// Y position.
@@ -2228,7 +2223,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 		ButtonSizes[i].bottom	= height;				// Button's height.
 		y_pos += height + 4;
 
-		Msg( __LINE__, TEXT(__FILE__), TEXT("ButtonSizes[%d] = ( %d, %d, %d, %d )"), 
+		Msg( __LINE__, TEXT(__FILE__), TEXT("ButtonSizes[%d] = ( %d, %d, %d, %d )"),
 			i, ButtonSizes[i].left, ButtonSizes[i].top, ButtonSizes[i].right, ButtonSizes[i].bottom );
 	}
 
@@ -2272,16 +2267,16 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 		// (8) INSTALL button.
 		//---------------------------------------------------------------------
 		Msg( __LINE__, TEXT(__FILE__), TEXT("ButtonList[%d]: Id=%d, ButtonSizes=%d, String=%s."), i, IDD_OK, j, "Install" );
-		ButtonList[i++] = new DrawButton( 
-			IDD_OK, 
-			button_size[j++], 
-			BUTTON_REG, 
-			BUTTON_SEL, 
-			BUTTON_SEL, 
+		ButtonList[i++] = new DrawButton(
+			IDD_OK,
+			button_size[j++],
+			BUTTON_REG,
+			BUTTON_SEL,
+			BUTTON_SEL,
 #ifdef LEAN_AND_MEAN
-			Locale_GetString( "Autorun:Install" ), 
+			Locale_GetString( "Autorun:Install" ),
 #else
-			AsciiString("Autorun:Install"), 
+			"Autorun:Install",
 #endif
 			TTButtonFontPtr );
 
@@ -2291,16 +2286,16 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 		// (8) PLAY button.
 		//---------------------------------------------------------------------
 		Msg( __LINE__, TEXT(__FILE__), TEXT("ButtonList[%d]: Id=%d, ButtonSizes=%d, String=%s."), i, IDD_OK2, j, "Play" );
-		ButtonList[i++] = new DrawButton( 
-			IDD_OK2, 
-			button_size[j++], 
-			BUTTON_REG, 
-			BUTTON_SEL, 
-			BUTTON_SEL, 
+		ButtonList[i++] = new DrawButton(
+			IDD_OK2,
+			button_size[j++],
+			BUTTON_REG,
+			BUTTON_SEL,
+			BUTTON_SEL,
 #ifdef LEAN_AND_MEAN
 			Locale_GetString( "Autorun:Play" ),
 #else
-			AsciiString("Autorun:Play"), 
+			"Autorun:Play",
 #endif
 			TTButtonFontPtr );
 /*
@@ -2308,18 +2303,18 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 		// (8) WorldBuilder button.
 		//---------------------------------------------------------------------
 		Msg( __LINE__, TEXT(__FILE__), TEXT("ButtonList[%d]: Id=%d, ButtonSizes=%d, String=%s."), i, IDD_OK2, j, "WorldBuilder" );
-//		ButtonList[i--] = new DrawButton( 
-		ButtonList[i++] = new DrawButton( 
-			IDD_OK3, 
-//			button_size[j--], 
-			button_size[j++], 
-			BUTTON_REG, 
-			BUTTON_SEL, 
-			BUTTON_SEL, 
+//		ButtonList[i--] = new DrawButton(
+		ButtonList[i++] = new DrawButton(
+			IDD_OK3,
+//			button_size[j--],
+			button_size[j++],
+			BUTTON_REG,
+			BUTTON_SEL,
+			BUTTON_SEL,
 #ifdef LEAN_AND_MEAN
-			Locale_GetString( "Autorun:Worldbuilder" ), 
+			Locale_GetString( "Autorun:Worldbuilder" ),
 #else
-			AsciiString("Autorun:Worldbuilder"), 
+			"Autorun:Worldbuilder",
 #endif
 			TTButtonFontPtr );
 */
@@ -2327,18 +2322,18 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 		// (8) Check for updates button.
 		//---------------------------------------------------------------------
 		Msg( __LINE__, TEXT(__FILE__), TEXT("ButtonList[%d]: Id=%d, ButtonSizes=%d, String=%s."), i, IDD_OK2, j, "Check For Updates" );
-//		ButtonList[i--] = new DrawButton( 
-		ButtonList[i++] = new DrawButton( 
-			IDD_OK4, 
-//			button_size[j--], 
-			button_size[j++], 
-			BUTTON_REG, 
-			BUTTON_SEL, 
-			BUTTON_SEL, 
+//		ButtonList[i--] = new DrawButton(
+		ButtonList[i++] = new DrawButton(
+			IDD_OK4,
+//			button_size[j--],
+			button_size[j++],
+			BUTTON_REG,
+			BUTTON_SEL,
+			BUTTON_SEL,
 #ifdef LEAN_AND_MEAN
 			Locale_GetString( "Autorun:CheckForUpdates" ),
 #else
-			AsciiString("Autorun:CheckForUpdates"), 
+			"Autorun:CheckForUpdates",
 #endif
 			TTButtonFontPtr );
 	}
@@ -2356,7 +2351,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 #ifdef LEAN_AND_MEAN
 		Locale_GetString( "Autorun:ExploreCD" ),
 #else
-		AsciiString("Autorun:ExploreCD"),
+		"Autorun:ExploreCD",
 #endif
 		TTButtonFontPtr );
 //	strcpy( next_button_name, ButtonImages[button_index] );
@@ -2368,16 +2363,16 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 		// (3) WebSite button.
 		//-----------------------------------------------------------------------
 		Msg( __LINE__, TEXT(__FILE__), TEXT("ButtonList[%d]: Id=%d, ButtonSizes=%d, String=%s."), i, IDD_OK, j, "Install" );
-		ButtonList[i++] = new DrawButton( 
-			IDD_INTERNET, 
+		ButtonList[i++] = new DrawButton(
+			IDD_INTERNET,
 			button_size[j++],
-			BUTTON_REG, 
-			BUTTON_SEL, 
-			BUTTON_SEL, 
+			BUTTON_REG,
+			BUTTON_SEL,
+			BUTTON_SEL,
 #ifdef LEAN_AND_MEAN
 			Locale_GetString( "Autorun:Website" ),
 #else
-			AsciiString("Autorun:Website"), 
+			"Autorun:Website",
 #endif
 			TTButtonFontPtr );
 
@@ -2391,16 +2386,16 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 	//--------------------------------------------------------------------------
 	if ( UninstallAvailable && !InstallProduct ) {
 		Msg( __LINE__, TEXT(__FILE__), TEXT("ButtonList[%d]: Id=%d, ButtonSizes=%d, String=%s."), i, IDD_UNINSTALL, j, "Uninstall" );
-		ButtonList[i++] = new DrawButton( 
-			IDD_UNINSTALL, 
+		ButtonList[i++] = new DrawButton(
+			IDD_UNINSTALL,
 			button_size[j++],
-			BUTTON_REG, 
-			BUTTON_SEL, 
-			BUTTON_SEL, 
+			BUTTON_REG,
+			BUTTON_SEL,
+			BUTTON_SEL,
 #ifdef LEAN_AND_MEAN
 			Locale_GetString( "Autorun:Uninstall" ),
 #else
-			AsciiString("Autorun:Uninstall"), 
+			"Autorun:Uninstall",
 #endif
 			TTButtonFontPtr );
 
@@ -2422,7 +2417,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 #ifdef LEAN_AND_MEAN
     Locale_GetString( "Autorun:Previews" ),
 #else
-		AsciiString("Autorun:Previews"),
+		"Autorun:Previews",
 #endif
 		TTButtonFontPtr );
 
@@ -2439,7 +2434,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 #ifdef LEAN_AND_MEAN
     Locale_GetString( "Autorun:Help" ),
 #else
-		AsciiString("Autorun:Help"),
+		"Autorun:Help",
 #endif
 		TTButtonFontPtr );
 
@@ -2447,16 +2442,16 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 	// (1) CANCEL?
 	//--------------------------------------------------------------------------
 	Msg( __LINE__, TEXT(__FILE__), TEXT("ButtonList[%d]: Id=%d, ButtonSizes=%d, String=%s."), i, IDD_CANCEL, j, "Cancel" );
-	ButtonList[i++] = new DrawButton( 
-		IDD_CANCEL, 
-		button_size[j++], 
-		BUTTON_REG, 
-		BUTTON_SEL, 
-		BUTTON_SEL, 
+	ButtonList[i++] = new DrawButton(
+		IDD_CANCEL,
+		button_size[j++],
+		BUTTON_REG,
+		BUTTON_SEL,
+		BUTTON_SEL,
 #ifdef LEAN_AND_MEAN
 		Locale_GetString( "Autorun:Cancel" ),
 #else
-		AsciiString("Autorun:Cancel"), 
+		"Autorun:Cancel",
 #endif
 		TTButtonFontPtr );
 
@@ -2476,11 +2471,11 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 	Msg( __LINE__, TEXT(__FILE__), TEXT("----------------------------------------------------------------------------------"));
 	for( i=0; i<NUM_BUTTONS; i++ ) {
 		if ( ButtonList[i]) {
-			Msg( __LINE__, TEXT(__FILE__), TEXT("ButtonList[%d]: Id=%d, ButtonSizes=[%d,%d,%d,%d]."), 
-				i, 
+			Msg( __LINE__, TEXT(__FILE__), TEXT("ButtonList[%d]: Id=%d, ButtonSizes=[%d,%d,%d,%d]."),
+				i,
 				ButtonList[i]->Return_Id(),
 				ButtonList[i]->Return_X_Pos(),
-				ButtonList[i]->Return_Y_Pos(),				
+				ButtonList[i]->Return_Y_Pos(),
 				ButtonList[i]->Return_Width(),
 				ButtonList[i]->Return_Height());
 		}
@@ -2490,17 +2485,17 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect )
 
 
 //*****************************************************************************
-// WndProc -- Get Main Window's Stored Word.											
-//                                                                         
-// INPUT:         HWND hWnd.																
-//						Window *pWindow														
-//                                                                         
-// OUTPUT:        none.                                                		
-//                                                                         
-// WARNINGS:      none.                                                    
-//                                                                         
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+// WndProc -- Get Main Window's Stored Word.
+//
+// INPUT:         HWND hWnd.
+//						Window *pWindow
+//
+// OUTPUT:        none.
+//
+// WARNINGS:      none.
+//
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 LRESULT CALLBACK  Wnd_Proc ( HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam )
@@ -2534,16 +2529,16 @@ LRESULT CALLBACK  Wnd_Proc ( HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lPa
 }
 
 //*****************************************************************************
-// DIALOG_BOX_PROC -- Handles dlg messages                     
-//                                                                         
-// INPUT: standard windows dialog command parameters                       
-//                                                                         
-// OUTPUT: unused                                                          
-//                                                                         
-// WARNINGS: none                                                          
-//                                                                         
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+// DIALOG_BOX_PROC -- Handles dlg messages
+//
+// INPUT: standard windows dialog command parameters
+//
+// OUTPUT: unused
+//
+// WARNINGS: none
+//
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param, LPARAM l_param )
@@ -2592,7 +2587,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 	static HBITMAP		oldLicenseBitmap	= 0;
 	static HBITMAP		hButtonBitmap		= 0;
 	static HBITMAP		hFlicker[NUM_FLICKER_FRAMES];
-	static HBITMAP		hLicenseBitmap;	
+	static HBITMAP		hLicenseBitmap;
 
 	static POINT		point;
 	static HBRUSH		hStaticBrush		= 0;
@@ -2710,7 +2705,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 
 //				memset( szWSMsg1,		'\0', _MAX_PATH );
 				memset( szWSMsg2,		'\0', _MAX_PATH );
-				memset( szWholeWSMsg,	'\0', 1000 ); 
+				memset( szWholeWSMsg,	'\0', 1000 );
 
 //				Locale_GetString( WESTWOOD_COM_MSG, szWSMsg1 );
 //				wsMsg1 = TheGameText->fetch("Autorun:WestwoodComMsg");
@@ -2721,7 +2716,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 //				swprintf( szWholeWSMsg, L"%s", wsMsg1.str() );
 
 //				memset( szInstallWarningMsg, '\0', _MAX_PATH );
-				
+
 //				Locale_GetString( IDS_INSTALL_WARNING_MSG, szWideBuffer );
 //				wideBuffer = TheGameText->fetch("Autorun:InstallWarningMsg");
 
@@ -2835,29 +2830,29 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 				// Set the x, y, width, height of the Dialog and bitmaps dimensions.
 				//-----------------------------------------------------------------------
 				bitmap_rect.left  	= dlg_rect.left		= 0;
-				bitmap_rect.top		= dlg_rect.top		= 0; 
-				bitmap_rect.right 	= dlg_rect.right 	= bm.bmWidth;	
+				bitmap_rect.top		= dlg_rect.top		= 0;
+				bitmap_rect.right 	= dlg_rect.right 	= bm.bmWidth;
 				bitmap_rect.bottom	= dlg_rect.bottom 	= bm.bmHeight;
-  
+
 				//-----------------------------------------------------------------------
 				// Set the x, y, width, height of the Dialog and bitmaps dimensions.
 				//-----------------------------------------------------------------------
 				dlg_rect.left	= 0;
-				dlg_rect.top	= 0; 
+				dlg_rect.top	= 0;
 
 				if( b640X480 ) {
-					dlg_rect.right 		= rect.right;	
+					dlg_rect.right 		= rect.right;
 					dlg_rect.bottom 	= tray_rect.bottom;											// desktop smaller than image
 				} else if( b800X600 ) {
 					if(true){
-						dlg_rect.right 		= bm.bmWidth + 6;	
+						dlg_rect.right 		= bm.bmWidth + 6;
 						dlg_rect.bottom 	= bm.bmHeight + GetSystemMetrics( SM_CYCAPTION ) + 6;		// desktop larger than image
 					} else {
-						dlg_rect.right 		= 640;//bm.bmWidth + 6;	
+						dlg_rect.right 		= 640;//bm.bmWidth + 6;
 						dlg_rect.bottom 	= 480; //bm.bmHeight + GetSystemMetrics( SM_CYCAPTION ) + 6;		// desktop larger than image
 					}
 				} else {
-					dlg_rect.right 		= bm.bmWidth + 6;	
+					dlg_rect.right 		= bm.bmWidth + 6;
 					dlg_rect.bottom 	= bm.bmHeight + GetSystemMetrics( SM_CYCAPTION ) + 6;		// desktop larger than image
 				}
 
@@ -2888,18 +2883,18 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 
 				Msg( __LINE__, TEXT(__FILE__), TEXT("----------------------------- determining button area ---------------------------" ));
 
-				buttons_rect.left	= ButtonSizes[i].left;                                                 
-				buttons_rect.top  	= ButtonSizes[i].top;                                                  
-				buttons_rect.right	= ButtonSizes[i].left + ButtonSizes[i].right;                          
+				buttons_rect.left	= ButtonSizes[i].left;
+				buttons_rect.top  	= ButtonSizes[i].top;
+				buttons_rect.right	= ButtonSizes[i].left + ButtonSizes[i].right;
 				buttons_rect.bottom	= ButtonSizes[i].top  +  ButtonSizes[i].bottom;
 
 //				Msg( __LINE__, TEXT(__FILE__), TEXT("buttons_rect = [%d,%d,%d,%d]"), buttons_rect.left, buttons_rect.top, buttons_rect.right, buttons_rect.bottom );
 
 				for( j = 0; j < NUM_BUTTONS; j++ ) {
 					if ( ButtonList[j] != NULL ) {
-						buttons_rect.left	= __min( ButtonSizes[j].left							, buttons_rect.left	 ); 
+						buttons_rect.left	= __min( ButtonSizes[j].left							, buttons_rect.left	 );
 						buttons_rect.top  	= __min( ButtonSizes[j].top								, buttons_rect.top 	 );
-						buttons_rect.right	= __max( ButtonSizes[j].left + ButtonSizes[j].right		, buttons_rect.right  );                          
+						buttons_rect.right	= __max( ButtonSizes[j].left + ButtonSizes[j].right		, buttons_rect.right  );
 						buttons_rect.bottom	= __max( ButtonSizes[j].top  + ButtonSizes[j].bottom	, buttons_rect.bottom );
 					}
 				}
@@ -2914,12 +2909,12 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 					MoveWindow(	window_handle,
 						( rect.right  - dlg_rect.right  )/2,
 						( rect.bottom - dlg_rect.bottom )/2,
-						dlg_rect.right, 
+						dlg_rect.right,
 						dlg_rect.bottom, TRUE );
 				} else {
-					MoveWindow(	window_handle, 
+					MoveWindow(	window_handle,
 						0, 0,
-						dlg_rect.right, 
+						dlg_rect.right,
 						dlg_rect.bottom, TRUE );
 				}
 
@@ -2928,7 +2923,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 				//-----------------------------------------------------------------------
 				GetClientRect( window_handle, &dlg_rect );
 
-				
+
 				//=======================================================================================
 				// JFS: 8/26/03 -- This was not getting cleared so if the button cnt were reduced...
 				//=======================================================================================
@@ -3026,11 +3021,11 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 					Msg( __LINE__, TEXT(__FILE__), TEXT("b640X480		= [%d]"), b640X480 );
 					Msg( __LINE__, TEXT(__FILE__), TEXT("b800X600		= [%d]"), b800X600 );
 					Msg( __LINE__, TEXT(__FILE__), TEXT("ClientRect		= [%d,%d,%d,%d]"), dlg_rect.left, dlg_rect.top, dlg_rect.right, dlg_rect.bottom );
-					
+
 					for( index = 0; index < ( NUM_BUTTONS * 3 ) + 3; index++ ) {
 						Msg( __LINE__, TEXT(__FILE__), TEXT("BackgroundRect[%d]	= [%d,%d,%d,%d]"), index, BackgroundRect[index].top, BackgroundRect[index].bottom, BackgroundRect[index].left, BackgroundRect[index].right );
 					}
-					
+
 					Msg( __LINE__, TEXT(__FILE__), TEXT("BitmapRect	   	= [%d,%d,%d,%d]"), bitmap_rect.left, bitmap_rect.top, bitmap_rect.right, bitmap_rect.bottom );
 					Msg( __LINE__, TEXT(__FILE__), TEXT("FlickerRect		= [%d,%d,%d,%d]"), flicker_rect.left, flicker_rect.top, flicker_rect.right, flicker_rect.bottom );
 					Msg( __LINE__, TEXT(__FILE__), TEXT("ButtonsRect		= [%d,%d,%d,%d]"), buttons_rect.left, buttons_rect.top, buttons_rect.right, buttons_rect.bottom );
@@ -3058,7 +3053,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 		// Try and set a custom cursor.
 		//-------------------------------------------------------------------------------
 //		case WM_SETCURSOR:
-//			SetCursor(LoadCursor( Main::hInstance, MAKEINTRESOURCE(2))); 
+//			SetCursor(LoadCursor( Main::hInstance, MAKEINTRESOURCE(2)));
 //			break;
 
 		//-------------------------------------------------------------------------------
@@ -3074,7 +3069,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 
 		//-------------------------------------------------------------------------------
 		// Set and Realize our palette, then repaint if necessary.
-		// Note that SelectPalette here is passed a FALSE.  
+		// Note that SelectPalette here is passed a FALSE.
 		// This means reset palette as if we are in the foreground.
 		//-------------------------------------------------------------------------------
 		case WM_QUERYNEWPALETTE:
@@ -3166,7 +3161,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 
 //				Msg( __LINE__, TEXT(__FILE__), TEXT("---------------------- WM_PAINT ---------------------"), i );
 //				Msg( __LINE__, TEXT(__FILE__), TEXT("Rectangle to update  = [%d,%d,%d,%d]"), paint_rect.left, paint_rect.top, paint_rect.right, paint_rect.bottom );
-				
+
 				//-----------------------------------------------------------------------
 				// Get dialog's hDC.
 				//-----------------------------------------------------------------------
@@ -3202,10 +3197,10 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						RealizePalette( buttonDC );
 						SelectPalette( licenseDC, hpal, FALSE );
 						RealizePalette( licenseDC );
-						
+
 						//---------------------------------------------------------------
 						// If area to update is a button area, this will be drawn farther
-						// on. This is to prevent "flickering" by drawing the background 
+						// on. This is to prevent "flickering" by drawing the background
 						// then the button image.
 						//---------------------------------------------------------------
 						for ( i = 0; i < NUM_BUTTONS; i++ ) {
@@ -3214,11 +3209,11 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 
 								ButtonList[i]->Return_Area( &rect );
 
-								if ( paint_rect.left	== rect.left	&& 
-									 paint_rect.top		== rect.top		&& 
-									 paint_rect.right	== rect.right	&& 
+								if ( paint_rect.left	== rect.left	&&
+									 paint_rect.top		== rect.top		&&
+									 paint_rect.right	== rect.right	&&
 									 paint_rect.bottom	== rect.bottom ) {
-					
+
 									PaintBackground = FALSE;
 //									Msg( __LINE__, TEXT(__FILE__), TEXT("Rectangle matches a button to update = [%d,%d,%d,%d]"), rect.left, rect.top, rect.right, rect.bottom );
 									break;
@@ -3227,7 +3222,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						}
 
 						//===============================================================
-						// Paint the background. 
+						// Paint the background.
 						//===============================================================
 						if ( PaintBackground ) {
 
@@ -3242,19 +3237,19 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						#if(1)
 							for( int i=0; i < ( NUM_BUTTONS * 3 ) + 3; i++ ) {
 
-								if( BackgroundRect[i].left	!= 0 || BackgroundRect[i].top	 != 0 || 
+								if( BackgroundRect[i].left	!= 0 || BackgroundRect[i].top	 != 0 ||
 									BackgroundRect[i].right != 0 || BackgroundRect[i].bottom != 0 ) {
 
-									result = StretchBlt( hDC, 
-										BackgroundRect[i].left, 
-										BackgroundRect[i].top, 
-										BackgroundRect[i].right, 
+									result = StretchBlt( hDC,
+										BackgroundRect[i].left,
+										BackgroundRect[i].top,
+										BackgroundRect[i].right,
+										BackgroundRect[i].bottom,
+  										memDC,
+										BackgroundRect[i].left,
+										BackgroundRect[i].top,
+										BackgroundRect[i].right,
 										BackgroundRect[i].bottom,
-  										memDC, 
-										BackgroundRect[i].left, 
-										BackgroundRect[i].top, 
-										BackgroundRect[i].right, 
-										BackgroundRect[i].bottom, 
 										SRCCOPY );
 
 									if( result != 0 ) {
@@ -3265,12 +3260,12 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 									HPEN 	pen		= CreatePen( /*PS_DOT*/ PS_SOLID, 1, TEXT_COLOR );
 									HGDIOBJ	oldpen	= SelectObject( hDC, pen );
 									SetBkMode( hDC, TRANSPARENT );
-					
+
 									MoveToEx(	hDC, BackgroundRect[i].left+1,  BackgroundRect[i].top+1,	NULL );
-									LineTo(		hDC, BackgroundRect[i].right-1,	BackgroundRect[i].top+1 ); 
-									LineTo(		hDC, BackgroundRect[i].right-1,	BackgroundRect[i].bottom-1 ); 		
-									LineTo(		hDC, BackgroundRect[i].left+1,	BackgroundRect[i].bottom-1 ); 		
-									LineTo(		hDC, BackgroundRect[i].left+1,	BackgroundRect[i].top+1 );			
+									LineTo(		hDC, BackgroundRect[i].right-1,	BackgroundRect[i].top+1 );
+									LineTo(		hDC, BackgroundRect[i].right-1,	BackgroundRect[i].bottom-1 );
+									LineTo(		hDC, BackgroundRect[i].left+1,	BackgroundRect[i].bottom-1 );
+									LineTo(		hDC, BackgroundRect[i].left+1,	BackgroundRect[i].top+1 );
 
 									SelectObject( hDC, oldpen );
 									DeleteObject( pen );
@@ -3286,16 +3281,16 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 							//-----------------------------------------------------------
 							// Updates area around the button area.
 							//-----------------------------------------------------------
-							result = StretchBlt( hDC, 
-										license_rect.left, 
-										license_rect.top, 
-										license_rect.right, 
+							result = StretchBlt( hDC,
+										license_rect.left,
+										license_rect.top,
+										license_rect.right,
+										license_rect.bottom,
+  										licenseDC,
+										0,
+										0,
+										license_rect.right,
 										license_rect.bottom,
-  										licenseDC, 
-										0, 
-										0, 
-										license_rect.right, 
-										license_rect.bottom, 
 										SRCCOPY );
 */
 						#else
@@ -3324,29 +3319,29 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 //							oldBitmap = ( HBITMAP )SelectObject( memDC, hFlicker[FlickerIndex] );
 							oldBitmap = ( HBITMAP )SelectObject( memDC, hFlicker[0] );
 
-							StretchBlt( 
-								hDC, 
-								flicker_rect.left, 
-								flicker_rect.top, 
-								flicker_rect.right, 
+							StretchBlt(
+								hDC,
+								flicker_rect.left,
+								flicker_rect.top,
+								flicker_rect.right,
+								flicker_rect.bottom,
+								memDC,
+								0,
+								0,
+								flicker_rect.right,
 								flicker_rect.bottom,
-								memDC, 
-								0, 
-								0, 
-								flicker_rect.right, 
-								flicker_rect.bottom, 
 								SRCCOPY );
 
 							#if(0)
 								HPEN 	pen		= CreatePen( /*PS_DOT*/ PS_SOLID, 1, TEXT_COLOR );
 								HGDIOBJ	oldpen	= SelectObject( hDC, pen );
 								SetBkMode( hDC, TRANSPARENT );
-				
+
 								MoveToEx(	hDC, flicker_rect.left+1,	flicker_rect.top+1,	NULL );
-								LineTo(		hDC, flicker_rect.right-1,	flicker_rect.top+1 ); 
-								LineTo(		hDC, flicker_rect.right-1,	flicker_rect.bottom-1 ); 		
-								LineTo(		hDC, flicker_rect.left+1,	flicker_rect.bottom-1 ); 		
-								LineTo(		hDC, flicker_rect.left+1,	flicker_rect.top+1 );			
+								LineTo(		hDC, flicker_rect.right-1,	flicker_rect.top+1 );
+								LineTo(		hDC, flicker_rect.right-1,	flicker_rect.bottom-1 );
+								LineTo(		hDC, flicker_rect.left+1,	flicker_rect.bottom-1 );
+								LineTo(		hDC, flicker_rect.left+1,	flicker_rect.top+1 );
 
 								SelectObject( hDC, oldpen );
 								DeleteObject( pen );
@@ -3392,17 +3387,17 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 										// Draw the button's bitmap background.
 										//-----------------------------------------------
 										oldBitmap = ( HBITMAP ) SelectObject( buttonDC, hButtonBitmap );
-										StretchBlt( 
-													hDC, 
-													dst_rect.left,			
-													dst_rect.top,			
-													dst_rect.right,			
-													dst_rect.bottom,		
-													buttonDC, 
-													src_rect.left,			
-													src_rect.top,			
-													src_rect.right,			
-													src_rect.bottom,		
+										StretchBlt(
+													hDC,
+													dst_rect.left,
+													dst_rect.top,
+													dst_rect.right,
+													dst_rect.bottom,
+													buttonDC,
+													src_rect.left,
+													src_rect.top,
+													src_rect.right,
+													src_rect.bottom,
 													SRCCOPY );
 
 										SelectObject( buttonDC, oldBitmap );
@@ -3410,7 +3405,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 										hButtonBitmap = 0;
 									}
 
-								} // END OF DRAW BITMAPS
+								}
 
 #if(0)
 								TTFontClass *fontptr = ButtonList[i]->Return_Font_Ptr();
@@ -3427,64 +3422,64 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 									*/
 //									SetTextColor( hDC, RGB( 0, 240, 0 ));
 //									DrawFocusRect(	hDC, &dst_rect );
-											
+
 									if ( ButtonList[i]->Get_State() == DrawButton::PRESSED_STATE ) {
-										fontptr->Print( 
-											hDC, 
-											ButtonList[i]->Return_Text(), 
-											rect, 
-											TEXT_PRESSED_COLOR, 
-											TEXT_PRESSED_SHADOW_COLOR, 
+										fontptr->Print(
+											hDC,
+											ButtonList[i]->Return_Text(),
+											rect,
+											TEXT_PRESSED_COLOR,
+											TEXT_PRESSED_SHADOW_COLOR,
 											TPF_BUTTON,
 											TPF_SHADOW );
 
 									} else if ( ButtonList[i]->Get_State() == DrawButton::FOCUS_STATE ) {
-										fontptr->Print( 
-											hDC, 
-											ButtonList[i]->Return_Text(), 
-											rect, 
-											TEXT_FOCUSED_COLOR, 
-											TEXT_FOCUSED_SHADOW_COLOR, 
+										fontptr->Print(
+											hDC,
+											ButtonList[i]->Return_Text(),
+											rect,
+											TEXT_FOCUSED_COLOR,
+											TEXT_FOCUSED_SHADOW_COLOR,
 											TPF_BUTTON,
 											TPF_SHADOW );
 
 									} else {
-										fontptr->Print( 
-											hDC, 
-											ButtonList[i]->Return_Text(), 
-											rect, 
-											TEXT_NORMAL_COLOR,	
-											TEXT_NORMAL_SHADOW_COLOR, 
+										fontptr->Print(
+											hDC,
+											ButtonList[i]->Return_Text(),
+											rect,
+											TEXT_NORMAL_COLOR,
+											TEXT_NORMAL_SHADOW_COLOR,
 											TPF_BUTTON,
 											TPF_SHADOW );
 									}
-								
+
 								#if(0)
 									HPEN 	pen		= CreatePen( /*PS_DOT*/ PS_SOLID, 2, TEXT_COLOR );
 									HGDIOBJ	oldpen	= SelectObject( hDC, pen );
 									SetBkMode( hDC, TRANSPARENT );
-									
+
 									MoveToEx( hDC,					// handle to device context
 										outline_rect.left,			// x-coordinate of new current position
 										outline_rect.top,			// y-coordinate of new current position
 										NULL );						// pointer to old current position
-									
+
 									LineTo( hDC,					// device context handle
 										outline_rect.right,			// x-coordinate of line's ending point
 										outline_rect.top );			// y-coordinate of line's ending point
-									
+
 									LineTo( hDC,					// device context handle
 										outline_rect.right,			// x-coordinate of line's ending point
 										outline_rect.bottom ); 		// y-coordinate of line's ending point
-									
+
 									LineTo( hDC,					// device context handle
 										outline_rect.left, 			// x-coordinate of line's ending point
 										outline_rect.bottom ); 		// y-coordinate of line's ending point
-									
+
 									LineTo( hDC,					// device context handle
 										outline_rect.left, 			// x-coordinate of line's ending point
 										outline_rect.top );			// y-coordinate of line's ending point
-									
+
 									SelectObject( hDC, oldpen );
 									DeleteObject( pen );
 								#endif
@@ -3495,9 +3490,9 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 
 
 
-							} // end of if button
+							}
 
-						}	// For each button...
+						}
 
 						//---------------------------------------------------------------
 						// Used in debugging -- draw rect around where buttons are.
@@ -3512,20 +3507,20 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 
 											HGDIOBJ	oldpen = SelectObject(  hDC, hPen1 );
 
-											MoveToEx( hDC, 
-												ButtonList[i]->Return_X_Pos()-1, 
+											MoveToEx( hDC,
+												ButtonList[i]->Return_X_Pos()-1,
 												ButtonList[i]->Return_Y_Pos()-1, NULL );
-											LineTo( hDC,   
-												ButtonList[i]->Return_X_Pos() + ButtonList[i]->Return_Width() + 1, 
+											LineTo( hDC,
+												ButtonList[i]->Return_X_Pos() + ButtonList[i]->Return_Width() + 1,
 												ButtonList[i]->Return_Y_Pos()-1 );
-											LineTo( hDC,   
-												ButtonList[i]->Return_X_Pos() + ButtonList[i]->Return_Width()  + 1, 
+											LineTo( hDC,
+												ButtonList[i]->Return_X_Pos() + ButtonList[i]->Return_Width()  + 1,
 												ButtonList[i]->Return_Y_Pos() + ButtonList[i]->Return_Height() + 1);
-											LineTo( hDC,   
-												ButtonList[i]->Return_X_Pos()-1, 
+											LineTo( hDC,
+												ButtonList[i]->Return_X_Pos()-1,
 												ButtonList[i]->Return_Y_Pos() + ButtonList[i]->Return_Height() + 1);
-											LineTo( hDC,   
-												ButtonList[i]->Return_X_Pos() - 1, 
+											LineTo( hDC,
+												ButtonList[i]->Return_X_Pos() - 1,
 												ButtonList[i]->Return_Y_Pos() - 1);
 
 											SelectObject( hDC, oldpen );
@@ -3543,7 +3538,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						SetStretchBltMode( memDC, prevMemDCStretchMode );
 						SetStretchBltMode( buttonDC, prevButtonDCStretchMode );
 						SetStretchBltMode( licenseDC, prevLicenseDCStretchMode );
-						
+
 						SelectPalette( hDC,	hpalold, FALSE );
 						SelectPalette( memDC, hpalold, FALSE );
 						SelectPalette( buttonDC, hpalold, FALSE );
@@ -3553,7 +3548,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						DeleteDC( buttonDC );
 						DeleteDC( licenseDC );
 
-					} // end of bitmaps
+					}
 
 					//===================================================================
 					// Draw a solid colored background.
@@ -3605,12 +3600,12 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						// WESTWOOD_COM Message at the top.
 						//---------------------------------------------------------------
 /*
-						fontptr->Print( 
-							hDC, 
+						fontptr->Print(
+							hDC,
 							szWholeWSMsg,
-							text_rect, 
-							TEXT_COLOR, 
-							SHADOW_COLOR, 
+							text_rect,
+							TEXT_COLOR,
+							SHADOW_COLOR,
 							TPF_CENTER_TEXT,
 							TPF_SHADOW );
 */
@@ -3626,12 +3621,12 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						if ( b640X480 || b800X600 ) {
 							text_rect.X			= 220;
 							text_rect.Y			= 400;
-							text_rect.Width		= 300;		//460;						 
+							text_rect.Width		= 300;		//460;
 							text_rect.Height	=  48;		//26;
 						} else {
 							text_rect.X			= 250;
 							text_rect.Y			= 574;
-							text_rect.Width		= 420;		//460;						 
+							text_rect.Width		= 420;		//460;
 							text_rect.Height	=  60;		//26;
 						}
 
@@ -3647,12 +3642,12 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 //							DrawFocusRect( hDC, &one );
 						#endif
 
-						fontptr->Print( 
-							hDC, 
+						fontptr->Print(
+							hDC,
 							szWholeString,
-							text_rect, 
-							TEXT_COLOR, 
-							SHADOW_COLOR, 
+							text_rect,
+							TEXT_COLOR,
+							SHADOW_COLOR,
 							TPF_CENTER_TEXT,
 							TPF_SHADOW );
 					}
@@ -3677,7 +3672,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 				//-----------------------------------------------------------------------
 				// Play DISK.WAV sound on CD.
 				//-----------------------------------------------------------------------
-				if ( FirstTime ) { 
+				if ( FirstTime ) {
 					if( UseSounds ) {
 						PlaySound( szWavs[ SongNumber ], NULL, SND_ASYNC | SND_RESOURCE );
 					}
@@ -3754,7 +3749,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 					{
 						std::wstring wFileName;
 						wFileName = Locale_GetString(HELP_FILENAME);
-						
+
 						std::string fname;
 						const wchar_t *tmp = wFileName.c_str();
 						char hack[2] = "a";
@@ -3861,7 +3856,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 
 							Reformat_Volume_Name( PRODUCT_VOLUME_CD2, volume_to_match );
 //							result = Prompt_For_CD( window_handle, volume_to_match, IDS_INSERT_CDROM_WITH_VOLUME2, IDS_EXIT_MESSAGE2, &cd_drive );
-							result = Prompt_For_CD( window_handle, volume_to_match, AsciiString("Autorun:InsertCDROMWithVolume2"), AsciiString("Autorun:ExitMessage2"), &cd_drive );
+							result = Prompt_For_CD( window_handle, volume_to_match, "Autorun:InsertCDROMWithVolume2", "Autorun:ExitMessage2", &cd_drive );
 						}
 
 						if ( result ) {
@@ -3882,13 +3877,13 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 					//-------------------------------------------------------------------
 					case IDD_GAMESPY:
 						Msg( __LINE__, TEXT(__FILE__), TEXT("IDD_GAMESPY Selected." ));
-						if( ViewHTML( GAMESPY_WEBSITE )) 
+						if( ViewHTML( GAMESPY_WEBSITE ))
 						{
 							end_dialog = true;
-						} 
-						else 
+						}
+						else
 						{
-							Error_Message( Main::hInstance, AsciiString("Autorun:Generals"), AsciiString("Autorun:CantFindExplorer"), GAME_WEBSITE );
+							Error_Message( Main::hInstance, "Autorun:Generals", "Autorun:CantFindExplorer", GAME_WEBSITE );
 						}
 						break;
 				#endif
@@ -3922,8 +3917,8 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						Msg( __LINE__, TEXT(__FILE__), TEXT("IDD_INTERNET Selected." ));
 						if( ViewHTML( GAME_WEBSITE )) {
 							end_dialog = true;
-						} 
-						else 
+						}
+						else
 						{
 							Error_Message( Main::hInstance, "Autorun:Generals", "Autorun:CantFindExplorer", GAME_WEBSITE );
 						}
@@ -3957,8 +3952,8 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						result = GlobalMainWindow->Run_Uninstall( window_handle, &dlg_rect );
 
 						//---------------------------------------------------------------
-						// MML 5/27/99:  I am exiting here because the we launch 
-						// Uninstll.exe which in turn launches Uninst.exe thus 
+						// MML 5/27/99:  I am exiting here because the we launch
+						// Uninstll.exe which in turn launches Uninst.exe thus
 						// ::Run_Install ends before Uninst.exe is done.
 						//---------------------------------------------------------------
 						if ( result ) {
@@ -3976,10 +3971,8 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 				if( end_dialog ) {
 
 					for ( i = 0; i < NUM_BUTTONS; i++ ) {
-						if ( ButtonList[i] ) {
-							delete( ButtonList[i] );
-							ButtonList[i] = NULL;
-						}
+						delete( ButtonList[i] );
+						ButtonList[i] = NULL;
 					}
 					if ( hpal ) {
 						DeleteObject( hpal );
@@ -4018,10 +4011,8 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 				#if(BACKGROUND_BITMAP)
 
 					for ( i = 0; i < NUM_BUTTONS; i++ ) {
-						if ( ButtonList[i] ) {
-							delete( ButtonList[i] );
-							ButtonList[i] = NULL;
-						}
+						delete( ButtonList[i] );
+						ButtonList[i] = NULL;
 					}
 					if ( hpal ) {
 						DeleteObject( hpal );
@@ -4049,10 +4040,9 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 				//-----------------------------------------------------------------------
 				// Delete the arguments.
 				//-----------------------------------------------------------------------
-				if ( Args ) {
-					delete( Args );
-					Args = NULL;
-				}
+				delete( Args );
+				Args = NULL;
+
 				KillTimer( window_handle, timer_id );
 				EndDialog( window_handle, w_param );
 			}
@@ -4060,8 +4050,8 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 
 		//-------------------------------------------------------------------------------
 		// WM_SYSCOLORCHANGE Message.
-		// If your applications uses controls in Windows 95/NT, forward the 
-		// WM_SYSCOLORCHANGE message to the controls. 
+		// If your applications uses controls in Windows 95/NT, forward the
+		// WM_SYSCOLORCHANGE message to the controls.
 		//-------------------------------------------------------------------------------
 		#if( !BACKGROUND_BITMAP )
 		case WM_SYSCOLORCHANGE:
@@ -4083,7 +4073,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 		//	WM_CTLCOLORLISTBOX
 		//	WM_CTLCOLORBTN
 		//	WM_CTLCOLORDLG
-		//	WM_CTLCOLORSCROLLBAR 
+		//	WM_CTLCOLORSCROLLBAR
 		//	WM_CTLCOLORSTATIC
 		//	#define WM_CTLCOLOR								0x0019
 		//	#define GET_WM_CTLCOLOR_HDC (wp, lp, msg)		(HDC)(wp)
@@ -4138,13 +4128,13 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 							ButtonList[i]->Set_State( DrawButton::PRESSED_STATE );
 							InvalidateRect( window_handle, &rect, FALSE );
 
-							Msg( __LINE__, TEXT(__FILE__), TEXT("WM_LBUTTONDOWN -- %s. rect = [%d,%d,%d,%d]."), 
+							Msg( __LINE__, TEXT(__FILE__), TEXT("WM_LBUTTONDOWN -- %s. rect = [%d,%d,%d,%d]."),
 								ButtonList[i]->Return_Normal_Bitmap(), rect.left, rect.top, rect.right, rect.bottom );
 
 							UpdateWindow( window_handle );
 						}
 						break;
-					} 
+					}
 				}
 			}
 			break;
@@ -4180,7 +4170,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						//---------------------------------------------------------------
 						// Save index of button with focus.
 						//---------------------------------------------------------------
-						if(	ButtonList[i]->Get_State() == DrawButton::FOCUS_STATE || 
+						if(	ButtonList[i]->Get_State() == DrawButton::FOCUS_STATE ||
 						  	ButtonList[i]->Get_State() == DrawButton::PRESSED_STATE ) {
 							focus_index = i;
 						}
@@ -4197,13 +4187,13 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 				}
 
 				//-----------------------------------------------------------------------
-				// If new button is not found... 
+				// If new button is not found...
 				//-----------------------------------------------------------------------
 				if ( found_focus == -1 ) {
 
 					//-------------------------------------------------------------------
-					// Make sure previously focused/pressed button is now is a 
-					// focused state and no action is taken.  This occurs when 
+					// Make sure previously focused/pressed button is now is a
+					// focused state and no action is taken.  This occurs when
 					// mouse is clicked outside of any button areas.
 					//-------------------------------------------------------------------
 					if ( ButtonList[focus_index] && ( ButtonList[focus_index]->Get_State() != DrawButton::FOCUS_STATE )) {
@@ -4212,7 +4202,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						ButtonList[focus_index]->Return_Area ( &rect );
 						InvalidateRect( window_handle, &rect, FALSE );
 
-						Msg( __LINE__, TEXT(__FILE__), TEXT("WM_LBUTTONUP -- %s[FOCUS_STATE] = [x=%d, y=%d, w=%d, h=%d]."), 
+						Msg( __LINE__, TEXT(__FILE__), TEXT("WM_LBUTTONUP -- %s[FOCUS_STATE] = [x=%d, y=%d, w=%d, h=%d]."),
 							ButtonList[ focus_index ]->Return_Normal_Bitmap(),	rect.left, rect.top, rect.right, rect.bottom );
 
 						UpdateWindow( window_handle );
@@ -4229,7 +4219,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						ButtonList[ found_focus ]->Return_Area ( &rect );
 						InvalidateRect( window_handle, &rect, FALSE );
 
-						Msg( __LINE__, TEXT(__FILE__), TEXT("WM_LBUTTONUP -- %s[FOCUS_STATE] = [x=%d, y=%d, w=%d, h=%d]."), 
+						Msg( __LINE__, TEXT(__FILE__), TEXT("WM_LBUTTONUP -- %s[FOCUS_STATE] = [x=%d, y=%d, w=%d, h=%d]."),
 							ButtonList[ found_focus ]->Return_Normal_Bitmap(), rect.left, rect.top, rect.right, rect.bottom );
 
 						UpdateWindow( window_handle );
@@ -4240,15 +4230,15 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						// Make previously focused button, Normal...
 						//---------------------------------------------------------------
 						if ( ButtonList[ focus_index ] ) {
-					
+
 							ButtonList[ focus_index ]->Set_State( DrawButton::NORMAL_STATE );
 							ButtonList[ focus_index ]->Return_Area ( &rect );
 							InvalidateRect( window_handle, &rect, FALSE );
-		
-							Msg( __LINE__, TEXT(__FILE__), TEXT("WM_LBUTTONUP -- %s[NORMAL_STATE] = [x=%d, y=%d, w=%d, h=%d]."), 
+
+							Msg( __LINE__, TEXT(__FILE__), TEXT("WM_LBUTTONUP -- %s[NORMAL_STATE] = [x=%d, y=%d, w=%d, h=%d]."),
 								ButtonList[ focus_index ]->Return_Normal_Bitmap(),
 								rect.left, rect.top, rect.right, rect.bottom );
-						
+
 							UpdateWindow( window_handle );
 						}
 
@@ -4256,12 +4246,12 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 						// ...and the new button now has focus.
 						//---------------------------------------------------------------
 						if ( ButtonList[ found_focus ] ) {
-					
+
 							ButtonList[ found_focus ]->Set_State( DrawButton::FOCUS_STATE );
 							ButtonList[ found_focus ]->Return_Area ( &rect );
 							InvalidateRect( window_handle, &rect, FALSE );
 
-							Msg( __LINE__, TEXT(__FILE__), TEXT("WM_LBUTTONUP -- %s[FOCUS_STATE] = [x=%d, y=%d, w=%d, h=%d]."), 
+							Msg( __LINE__, TEXT(__FILE__), TEXT("WM_LBUTTONUP -- %s[FOCUS_STATE] = [x=%d, y=%d, w=%d, h=%d]."),
 								ButtonList[ found_focus ]->Return_Normal_Bitmap(), rect.left, rect.top, rect.right, rect.bottom );
 
 							UpdateWindow( window_handle );
@@ -4278,8 +4268,8 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 				// Do the focus button's action.
 				//-----------------------------------------------------------------------
 				if ( found_focus >= 0 ) {
-					if (( ButtonList[found_focus] ) && 
-						( ButtonList[found_focus]->Get_State() == DrawButton::FOCUS_STATE ) && 
+					if (( ButtonList[found_focus] ) &&
+						( ButtonList[found_focus]->Get_State() == DrawButton::FOCUS_STATE ) &&
 						( ButtonList[found_focus]->Is_Mouse_In_Region( mouse_x, mouse_y ))) {
 							SendMessage( window_handle, WM_COMMAND, ButtonList[found_focus]->Return_Id(), 0L );
 							break;
@@ -4308,24 +4298,24 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 
 			#if(USE_MOUSE_MOVES)
 				//-----------------------------------------------------------------------
-				// Reset most current button.									         
+				// Reset most current button.
 				//-----------------------------------------------------------------------
 				CurrentButton = 0;
 			#endif
 
 				//-----------------------------------------------------------------------
-				// For each button in the list...								         
+				// For each button in the list...
 				//-----------------------------------------------------------------------
 				i = 0;
 				while( i < NUM_BUTTONS && !done ) {
 
 					//-------------------------------------------------------------------
-					// For each button, check if mouse is in it's area.			        
+					// For each button, check if mouse is in it's area.
 					//-------------------------------------------------------------------
 					if ( ButtonList[i] && ButtonList[i]->Is_Mouse_In_Region( mouse_x, mouse_y )) {
 
 						//---------------------------------------------------------------
-						// This is now the current button.							       
+						// This is now the current button.
 						//---------------------------------------------------------------
 						CurrentButton = ButtonList[i]->Return_Id();
 
@@ -4352,15 +4342,15 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 								}
 
 							} else {
-		
+
 								//--------------------------------------------------------
-								// If this button is not already focused, give it the focus. 
+								// If this button is not already focused, give it the focus.
 								//--------------------------------------------------------
 								if ( ButtonList[i] && ButtonList[i]->Get_State() != DrawButton::FOCUS_STATE ) {
 									ButtonList[i]->Set_State( DrawButton::FOCUS_STATE );
 //									Msg( __LINE__, TEXT(__FILE__), TEXT("WM_MOUSEMOVE -- %s[FOCUS_STATE]."), ButtonList[i]->Return_Normal_Bitmap());
 								}
-							}	// end of if
+							}
 
 							//-----------------------------------------------------------
 							// Get the area of the button, and post it for updating.
@@ -4380,15 +4370,15 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 							done = 1;
 						}
 
-					}	// end of if
+					}
 					i++;
 
-				}	// end of for
+				}
 
 
 			#if( USE_MOUSE_MOVES )
 	        	//-----------------------------------------------------------------------
-				// If a MouseMove was found to be in one of the buttons, then 
+				// If a MouseMove was found to be in one of the buttons, then
 				// CurrentButton will have a value.
         		//-----------------------------------------------------------------------
 				if ( CurrentButton != 0 ) {
@@ -4418,14 +4408,14 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 		case WM_SETFOCUS:
 			InvalidateRect( window_handle, &dlg_rect, TRUE );
 //			nResult = UpdateWindow( window_handle );
-//			Msg( __LINE__, TEXT(__FILE__), TEXT("WM_LBUTTONDBLCLK -- dlg_rect = [x=%d, y=%d, w=%d, h=%d]."), 
+//			Msg( __LINE__, TEXT(__FILE__), TEXT("WM_LBUTTONDBLCLK -- dlg_rect = [x=%d, y=%d, w=%d, h=%d]."),
 //				dlg_rect.left, dlg_rect.top, dlg_rect.right, dlg_rect.bottom );
 			break;
 
 		#if(BACKGROUND_BITMAP)
 		//-------------------------------------------------------------------------------
-		// bit 30 of lParam - Specifies the previous key state. 
-		// The value is 1 if the key is down before the message is sent, 
+		// bit 30 of lParam - Specifies the previous key state.
+		// The value is 1 if the key is down before the message is sent,
 		// or it is 0 if the key is up.
 		//-------------------------------------------------------------------------------
 		case WM_KEYUP:
@@ -4459,7 +4449,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 					case VK_DOWN:
 						{
 							//-----------------------------------------------------------
-							// Find the button with focus and "tab" to the next button by finding 
+							// Find the button with focus and "tab" to the next button by finding
 							// the next valid index.  If past last button, circle back to the top.
 							//-----------------------------------------------------------
 							int focused_button = 0;
@@ -4518,7 +4508,7 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 					case VK_UP:
 						{
 							//-----------------------------------------------------------
-							// Find the button with focus and "tab" to the next button by finding 
+							// Find the button with focus and "tab" to the next button by finding
 							// the next valid index.  If past last button, circle back to the top.
 							//-----------------------------------------------------------
 							int focused_button = 0;
@@ -4587,15 +4577,15 @@ BOOL CALLBACK  Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param
 
 //*****************************************************************************
 // STOP_SOUND_PLAYING -- Stop the background sound.
-//                                                                 
+//
 // INPUT:		none.
-//                                                                 
+//
 // OUTPUT:		none.
-//                                                                 
+//
 // WARNINGS:	Will stop any sound started by PlaySound.
-//                                                                 
-// HISTORY:                                                                
-//   06/04/1999  MML : Created.                                            
+//
+// HISTORY:
+//   06/04/1999  MML : Created.
 //=============================================================================
 
 void Stop_Sound_Playing ( void )
@@ -4604,17 +4594,17 @@ void Stop_Sound_Playing ( void )
 }
 
 //*****************************************************************************
-// OPTIONS -- Find any user options and set the correct flags      
-//                                                                 
-// INPUT:   int argc      =  no. of arguments to check        		 
-//          BYTE *argv[]  =  ptr to actual command line parameters 
-//                                                                 
-// OUTPUT:                                                         
-//                                                                 
-// WARNINGS:                                                       
-//                                                                 
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+// OPTIONS -- Find any user options and set the correct flags
+//
+// INPUT:   int argc      =  no. of arguments to check
+//          BYTE *argv[]  =  ptr to actual command line parameters
+//
+// OUTPUT:
+//
+// WARNINGS:
+//
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 BOOL Options( Command_Line_Arguments *Orgs )
@@ -4684,7 +4674,7 @@ BOOL Options( Command_Line_Arguments *Orgs )
 							strcpy( szVolumeName, PRODUCT_VOLUME_CD1 );
 						} else {
 							strcpy( szVolumeName, PRODUCT_VOLUME_CD2 );
-							FindClose( handle );	
+							FindClose( handle );
 						}
 
 						strcpy( Arguments[ NumberArguments++ ], buffer );
@@ -4696,7 +4686,7 @@ BOOL Options( Command_Line_Arguments *Orgs )
 				case 'c':
 					if( buffer[2] == 'd' ) {
 						szCDDrive[0] = buffer[3];
-						szCDDrive[1] = ':';						
+						szCDDrive[1] = ':';
 						szCDDrive[2] = '\\';
 					}
 					break;
@@ -4707,11 +4697,11 @@ BOOL Options( Command_Line_Arguments *Orgs )
 				case 'l':
 					{
 						//-----------------------------------------------------
-						//	Identifier		Meaning 
-						//	932				Japan 
-						//	936				Chinese (PRC, Singapore) 
-						//	949				Korean 
-						//	1252			Windows 3.1 Latin 1 (US, Western Europe) 
+						//	Identifier		Meaning
+						//	932				Japan
+						//	936				Chinese (PRC, Singapore)
+						//	949				Korean
+						//	1252			Windows 3.1 Latin 1 (US, Western Europe)
 						//-----------------------------------------------------
 						char *temp = buffer+2;
 						int number = atoi( temp );
@@ -4789,7 +4779,7 @@ BOOL Options( Command_Line_Arguments *Orgs )
 }
 
 //*****************************************************************************
-// Valid_Environment -- Make sure this program is run from CD-ROM disc only 
+// Valid_Environment -- Make sure this program is run from CD-ROM disc only
 //					 	AND it is a Win95 system.
 //
 // INPUT:  		none.
@@ -4798,8 +4788,8 @@ BOOL Options( Command_Line_Arguments *Orgs )
 //
 // WARNINGS:	returns 0 if ok to continue.
 //
-// HISTORY:                                                                
-//   06/04/1996  MML : Created.                                            
+// HISTORY:
+//   06/04/1996  MML : Created.
 //=============================================================================
 
 BOOL Valid_Environment ( void )
@@ -4812,7 +4802,7 @@ BOOL Valid_Environment ( void )
 
 	int length = 0;
 	result = WinVersion.Meets_Minimum_Version_Requirements();
-  if ( !result ) 
+  if ( !result )
 	{
 		std::wstring wideBuffer = TheGameText->fetch("GUI:WindowsVersionText");
 		std::wstring wideBuffer2 = TheGameText->fetch("GUI:WindowsVersionTitle");
@@ -4828,17 +4818,17 @@ BOOL Valid_Environment ( void )
 
 //****************************************************************************
 // LOADRESOURCEBITMAP -- Find & Load the bitmap from the resource.
-//                                                                 
+//
 // INPUT:   HINSTANCE hInstance -- Program's hInstance.
 //          LPTSTR lpString -- name of bitmap to find.
 //          HPALETTE FAR *lphPalette -- we will return palette in this.
 //
 // OUTPUT:  HBITMAP -- handle to the bitmap if found.
-//                                                                 
+//
 // WARNINGS:
-//                                                                 
+//
 // HISTORY: Found this routine on MS Developmemt CD, July 1996.
-// 	09/26/1996  MML : Created.                                            
+// 	09/26/1996  MML : Created.
 //=============================================================================
 
 HBITMAP LoadResourceBitmap( HINSTANCE hInstance, LPCTSTR lpString, HPALETTE FAR *lphPalette, bool loading_a_button )
@@ -4878,7 +4868,7 @@ HBITMAP LoadResourceBitmap( HINSTANCE hInstance, LPCTSTR lpString, HPALETTE FAR
 		} else {
 
 			//--------------------------------------------------------------------
-			// Get the palette from the resource.  
+			// Get the palette from the resource.
 			//--------------------------------------------------------------------
 			*lphPalette = CreateDIBPalette((LPBITMAPINFO) lpbi, &iNumColors );
 		}
@@ -4892,19 +4882,19 @@ HBITMAP LoadResourceBitmap( HINSTANCE hInstance, LPCTSTR lpString, HPALETTE FAR
 
 	return( hBitmapFinal );
 }
- 
+
 //*****************************************************************************
 // CREATEDIBPALETTE -- Creates the palette from the Bitmap found above.
-//                                                                 
+//
 // INPUT:   LPBITMAPINFO lpbmi -- bitmap info from header.
 //          LPINT lpiNumColors -- number of colors.
 //
 // OUTPUT:  HPALETTE -- handle to the bitmap if found.
-//                                                                 
-// WARNINGS:                                                       
-//                                                                 
+//
+// WARNINGS:
+//
 // HISTORY: Found this routine on MS Developmemt CD, July 1996.
-// 	09/26/1996  MML : Created.                                            
+// 	09/26/1996  MML : Created.
 //=============================================================================
 HPALETTE CreateDIBPalette ( LPBITMAPINFO lpbmi, LPINT lpiNumColors )
 {
@@ -4963,22 +4953,22 @@ HPALETTE CreateDIBPalette ( LPBITMAPINFO lpbmi, LPINT lpiNumColors )
 #endif
 
 	}
-	return( hPal );	
+	return( hPal );
 }
 
 //*****************************************************************************
 // LOADRESOURCEBUTTON -- Find & Load the bitmap from the resource.
-//                                                                 
+//
 // INPUT:   HINSTANCE hInstance -- Program's hInstance.
 //          LPTSTR lpString -- name of bitmap to find.
 //          HPALETTE FAR *lphPalette -- we will return palette in this.
 //
 // OUTPUT:  HBITMAP -- handle to the bitmap if found.
-//                                                                 
+//
 // WARNINGS:
-//                                                                 
+//
 // HISTORY: Found this routine on MS Developmemt CD, July 1996.
-// 	09/26/1996  MML : Created.                                            
+// 	09/26/1996  MML : Created.
 //=============================================================================
 HBITMAP LoadResourceButton( HINSTANCE hInstance, LPCTSTR lpString, HPALETTE FAR lphPalette )
 {
@@ -5012,7 +5002,7 @@ HBITMAP LoadResourceButton( HINSTANCE hInstance, LPCTSTR lpString, HPALETTE FAR
 		}
 
 		//-----------------------------------------------------------------------
-		// Get the palette from the resource.  
+		// Get the palette from the resource.
 		// Select to the DC and realize it in the System palette.
 		//-----------------------------------------------------------------------
 //		*lphPalette = CreateDIBPalette((LPBITMAPINFO) lpbi, &iNumColors );
@@ -5024,8 +5014,8 @@ HBITMAP LoadResourceButton( HINSTANCE hInstance, LPCTSTR lpString, HPALETTE FAR
 		//-----------------------------------------------------------------------
 		// Now create the bitmap itself.
 		//-----------------------------------------------------------------------
-		hBitmapFinal = CreateDIBitmap( 
-						hdc, 
+		hBitmapFinal = CreateDIBitmap(
+						hdc,
 						(LPBITMAPINFOHEADER)lpbi,
 						(LONG)CBM_INIT,
 						(LPTSTR)lpbi + lpbi->biSize + iNumColors * sizeof( RGBQUAD ),
@@ -5035,7 +5025,7 @@ HBITMAP LoadResourceButton( HINSTANCE hInstance, LPCTSTR lpString, HPALETTE FAR
 		//-----------------------------------------------------------------------
 		// Free DS and memory used.
 		//-----------------------------------------------------------------------
-		ReleaseDC( NULL, hdc );                        
+		ReleaseDC( NULL, hdc );
 		UnlockResource( hGlobal );
 		FreeResource( hGlobal );
 	}
@@ -5044,18 +5034,18 @@ HBITMAP LoadResourceButton( HINSTANCE hInstance, LPCTSTR lpString, HPALETTE FAR
 
 //*****************************************************************************
 // Cant_Find_MessageBox -- Find & Load the bitmap from the resource.
-//                                                                 
+//
 // INPUT:   HINSTANCE hInstance -- Program's hInstance.
 //          LPTSTR lpString -- name of bitmap to find.
 //          HPALETTE FAR *lphPalette -- we will return palette in this.
 //
 // OUTPUT:  HBITMAP -- handle to the bitmap if found.
-//                                                                 
+//
 // WARNINGS:
-//                                                                 
+//
 // HISTORY: Found this routine on MS Developmemt CD, July 1996.
-// 	09/26/1996  MML : Created.  
-//  08/27/2003  JFS : Repaired!                                          
+// 	09/26/1996  MML : Created.
+//  08/27/2003  JFS : Repaired!
 //=============================================================================
 
 void Cant_Find_MessageBox ( HINSTANCE hInstance, const char *szPath )
@@ -5071,7 +5061,7 @@ void Cant_Find_MessageBox ( HINSTANCE hInstance, const char *szPath )
 
 		Locale_GetString( "Autorun:CantFind", szWideBuffer );
 		MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, szPath, _MAX_PATH, szWideBuffer0, _MAX_PATH );
-		swprintf( szWideBuffer2, szWideBuffer, szWideBuffer0 );	
+		swprintf( szWideBuffer2, szWideBuffer, szWideBuffer0 );
 
 		MessageBoxW( NULL,  szWideBuffer2, szWideBuffer3, MB_APPLMODAL | MB_OK );
 	}
@@ -5093,17 +5083,17 @@ void Cant_Find_MessageBox ( HINSTANCE hInstance, const char *szPath )
 	{
 		MessageBox( NULL, "The path specified in Cant_Find_MessageBox was blank", "Autorun", MB_APPLMODAL | MB_OK );
 		return;
-	}	
+	}
 	if ( strlen( szBuffer1 ) < 3 && strlen( szBuffer3 ) < 3 )
 	{
 		MessageBox( NULL, "***MISSING MESSAGES***... IDS_AUTORUN_TITLE and IDS_CANT_FIND", "Autorun", MB_APPLMODAL | MB_OK );
 		return;
-	}	
+	}
 	if ( strlen( szBuffer1 ) < 3 )
 	{
 		MessageBox( NULL, "***MISSING MESSAGE***... IDS_AUTORUN_TITLE", "Autorun", MB_APPLMODAL | MB_OK );
 		return;
-	}	
+	}
 	if ( strlen( szBuffer3 ) < 3 )
 	{
 		MessageBox( NULL, "***MISSING MESSAGE***... IDS_CANT_FIND", "Autorun", MB_APPLMODAL | MB_OK );
@@ -5119,17 +5109,17 @@ void Cant_Find_MessageBox ( HINSTANCE hInstance, const char *szPath )
 }
 
 
-/****************************************************************************** 
- * Error_Message -- 														  
- *                                                                            
- * INPUT:		 															  
- *                                                                            
- * OUTPUT:      
- *                                                                            
- * WARNINGS:   none                                                           
- *                                                                            
- * HISTORY:                                                                   
- *   08/14/1998 MML : Created.                                                
+/******************************************************************************
+ * Error_Message --
+ *
+ * INPUT:
+ *
+ * OUTPUT:
+ *
+ * WARNINGS:   none
+ *
+ * HISTORY:
+ *   08/14/1998 MML : Created.
  *============================================================================*/
 
 void Error_Message ( HINSTANCE hInstance, const char * title, const char * string, const char *path )
@@ -5140,11 +5130,11 @@ void Error_Message ( HINSTANCE hInstance, const char * title, const char * strin
 	wideBuffer2 = TheGameText->fetch(title);
 	wideBuffer3 = TheGameText->fetch(string);
 
-	if ( path && ( path[0] != '\0' )) 
+	if ( path && ( path[0] != '\0' ))
 	{
 		wideBuffer3.format( wideBuffer.str(), path );
-	} 
-	else 
+	}
+	else
 	{
 		wideBuffer3 = wideBuffer;					// insert not provided
 	}
@@ -5162,7 +5152,7 @@ void Error_Message ( HINSTANCE hInstance, const char * title, const char * strin
 }
 
 
-/****************************************************************************** 
+/******************************************************************************
 / Launch Class Object
 /******************************************************************************/
 
@@ -5204,7 +5194,7 @@ unsigned int LaunchObjectClass::Launch ( void )
 	char 	file		[_MAX_FNAME];
 	char 	lpszComLine [ 127 ];
 
-	PROCESS_INFORMATION processinfo; 
+	PROCESS_INFORMATION processinfo;
 	STARTUPINFO			startupinfo;
 	unsigned int		abc = 0;
 	unsigned int		result = 0;
@@ -5219,9 +5209,9 @@ unsigned int LaunchObjectClass::Launch ( void )
 	//--------------------------------------------------------------------------
 	// Change current path to the correct dir.
 	//
-	// The _chdrive function changes the current working drive to the drive 
-	// specified by drive. The drive parameter uses an integer to specify the 
-	// new working drive (1=A, 2=B, and so forth). This function changes only 
+	// The _chdrive function changes the current working drive to the drive
+	// specified by drive. The drive parameter uses an integer to specify the
+	// new working drive (1=A, 2=B, and so forth). This function changes only
 	// the working drive; _chdir changes the working directory.
 	//--------------------------------------------------------------------------
 	_makepath( filepath, drive, dir, NULL, NULL );
@@ -5257,7 +5247,7 @@ unsigned int LaunchObjectClass::Launch ( void )
 
 	Msg( __LINE__, TEXT(__FILE__), TEXT("About to launch %s." ), lpszComLine );
 
-	result = CreateProcess( 
+	result = CreateProcess(
 				szPath,												// address of module name
 				lpszComLine, 										// address of command line
 				NULL,												// address of process security attributes
@@ -5325,7 +5315,7 @@ void Debug_Date_And_Time_Stamp ( void )
     struct tm *	today;
 
     /*-------------------------------------------------------------------------
-	 *Convert to time structure and adjust for PM if necessary. 
+	 *Convert to time structure and adjust for PM if necessary.
 	 */
     time( &ltime );
     today = localtime( &ltime );
@@ -5337,19 +5327,19 @@ void Debug_Date_And_Time_Stamp ( void )
 		today->tm_hour = 12;
 	}
 
-	Msg( __LINE__, __FILE__, "%s, %s %d, %d		%d:%d:%d %s", 
+	Msg( __LINE__, __FILE__, "%s, %s %d, %d		%d:%d:%d %s",
 		Week_Day_Strings[ today->tm_wday ],
 		Month_Strings[ today->tm_mon ],
-		today->tm_mday,		
+		today->tm_mday,
 		today->tm_year + 1900,
-		today->tm_hour, 
-		today->tm_min, 
-		today->tm_sec, 
+		today->tm_hour,
+		today->tm_min,
+		today->tm_sec,
 		ampm );
 
     /*-------------------------------------------------------------------------
-	 * Note how pointer addition is used to skip the first 11 
-     * characters and printf is used to trim off terminating 
+	 * Note how pointer addition is used to skip the first 11
+     * characters and printf is used to trim off terminating
      * characters.
      */
 //	Msg( __LINE__, __FILE__, "%s %s\n", asctime( today ), ampm );
diff --git a/Core/Tools/Autorun/autorun.h b/Core/Tools/Autorun/autorun.h
index 888690b20a6..65a10e11240 100644
--- a/Core/Tools/Autorun/autorun.h
+++ b/Core/Tools/Autorun/autorun.h
@@ -34,9 +34,7 @@
 *
 *************************************************************************************************/
 
-
-#ifndef  AUTORUN_H
-#define  AUTORUN_H
+#pragma once
 
 #include <tchar.h>
 #include <string.h>
@@ -65,7 +63,7 @@ typedef enum {
 	LANG_SCA,	//8
 	LANG_KOR,	//9
 	LANG_CHI,	//10
-	LANG_NUM,	
+	LANG_NUM,
 } LanguageType;
 
 #define	IS_LANGUAGE_DBCS(l)	(((l)==LANG_CHI)||((l)==LANG_JAP)||((l)==LANG_KOR))		// [OYO]
@@ -95,7 +93,7 @@ typedef enum {
 #elif RTS_ZEROHOUR
 # define SHELL_UNINSTALL_KEY			"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\InstallShield_{F3E9C243-122E-4D6B-ACC1-E1FEC02F6CA1}"
 #endif
-#define SHELL_APP_PATHS_KEY			"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths" 
+#define SHELL_APP_PATHS_KEY			"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths"
 #define PROGRAMS_SUBKEY				"Programs"
 #define COMMON_PROGRAMS_SUBKEY		"Common Programs"
 #define SOFTWARE_SUBKEY				"Software"
@@ -126,12 +124,12 @@ typedef enum {
 #define VERSION_SUBKEY				"Version"
 #define LANGUAGE_SUBKEY				"Language"
 #define MAPPACKVERSION_SUBKEY		"MapPackVersion"
-											
+
 #define DDRAW  							"DDRAW.DLL"
 #define DSOUND 							"DSOUND.DLL"
 #define DDHELP 							"DDHELP.EXE"
 
-#define NORMAL							"Normal" 
+#define NORMAL							"Normal"
 #define FOCUSED							"Focused"
 #define PRESSED							"Pressed"
 /*
@@ -220,7 +218,7 @@ class Window
 class MainWindow : public Window
 {
 	protected:
-		
+
 		static char szClassName[ 100 ];
 
 	public:
@@ -232,7 +230,7 @@ class MainWindow : public Window
 			{
 				if ( string != NULL && string[0] != '\0' ) {
 					strcpy( szClassName, string );
-				}		
+				}
 			};
 
 		BOOL			Is_Product_Registered	( void );
@@ -250,7 +248,3 @@ class MainWindow : public Window
 		unsigned int	Run_OpenFile						(int cd_drive, const char *filename, bool wait = false);
 		LRESULT			Window_Proc		  		( HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam );
 };
-
-
-#endif
-
diff --git a/Core/Tools/Autorun/gimex.h b/Core/Tools/Autorun/gimex.h
index 291a495ae8b..b1dd321c79a 100644
--- a/Core/Tools/Autorun/gimex.h
+++ b/Core/Tools/Autorun/gimex.h
@@ -22,8 +22,7 @@
 gimex.h - Graphics IMport EXport (GIMEX) v2.26
 @ */
 
-#ifndef __GIMEX_H
-#define __GIMEX_H 1
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -299,9 +298,4 @@ unsigned long bswap(unsigned long val);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __GIMEX_H */
 /* END ABSTRACT */
-
-
-
diff --git a/Core/Tools/Autorun/leanAndMeanAutorun.h b/Core/Tools/Autorun/leanAndMeanAutorun.h
index 5fb484c46ea..5713622d7f0 100644
--- a/Core/Tools/Autorun/leanAndMeanAutorun.h
+++ b/Core/Tools/Autorun/leanAndMeanAutorun.h
@@ -20,12 +20,7 @@
 // Author: Mark Lorenzen, January 2003!
 // Description: Classes extracted from GameEngine for use in autorun without having to link the game to autorun
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma once
-
-#ifndef __LEANANDMEANAUTORUN_H_
-#define __LEANANDMEANAUTORUN_H_
 
+#pragma once
 
 #define LEAN_AND_MEAN
-
-#endif //__LEANANDMEANAUTORUN_H_
\ No newline at end of file
diff --git a/Core/Tools/Autorun/locale.cpp b/Core/Tools/Autorun/locale.cpp
index 04feb9a2f0d..1abc9cf1035 100644
--- a/Core/Tools/Autorun/locale.cpp
+++ b/Core/Tools/Autorun/locale.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <assert.h>
 #include "gimex.h"      /* for file and memory IO only */
-#include "locale.h" 
+#include "locale.h"
 #include "Wnd_File.h"
 
 /*************************************************************************/
@@ -121,7 +121,7 @@ int LOCALE_isinitialized( void )
 ;
 ; DESCRIPTION
 ;
-; Initilizes everything needed to use the locale API.  Can only be called 
+; Initilizes everything needed to use the locale API.  Can only be called
 ; once until LOCALE_restore is called.
 ;
 ; Returns non-zero if everything went ok.
@@ -531,10 +531,10 @@ static int readstrings( GSTREAM* g, int LanguageID )
 //	VERIFY(gread(g, &LanguageChunkSize, 4) == 4);
     if( !gseek( g, LanguageChunkPos + 4 )) {
 		return ok;
-	}   
+	}
 	if( gread( g, &LanguageChunkSize, 4 ) != 4 ) {
 		return ok;
-	}   
+	}
 
 	Msg( __LINE__, __FILE__, "readstrings::LanguageChunkOffsetPos = %d.", LanguageChunkOffsetPos );
 	Msg( __LINE__, __FILE__, "readstrings::LanguageChunkPos = %d.", LanguageChunkPos );
@@ -550,11 +550,11 @@ static int readstrings( GSTREAM* g, int LanguageID )
 //		VERIFY(gread(g, lx->pBank[lx->BankIndex], LanguageChunkSize) == LanguageChunkSize);
 		if( !gseek( g, LanguageChunkPos )) {
 			return ok;
-		}   
+		}
 		if( gread( g, lx->pBank[lx->BankIndex], LanguageChunkSize ) != LanguageChunkSize ) {
 			return ok;
-		}   
-        
+		}
+
 		ASSERT(lx->pBank[lx->BankIndex]->ChunkID == LOCALEFILE_LANGUAGECHUNKID);
         ok = 1;
     }
@@ -592,7 +592,7 @@ int LOCALE_loadtable(const char* PathName, int LanguageID)
 ;
 ; ABSTRACT
 ;
-; LOCALE_purgetable - OBSOLETE 
+; LOCALE_purgetable - OBSOLETE
 ;
 ; Make all references to LOCALE_freetable
 ;
@@ -679,7 +679,7 @@ void LOCALE_freetable(void)
 ; valid integer in the range 0..65535.  If no index was created
 ; with the .loc file StringID will be a zero based array index.
 ;
-; String is returned by const for a reason.  Bad things will happen 
+; String is returned by const for a reason.  Bad things will happen
 ; if you modify it.  You have been warned.
 ;
 ; SEE ALSO
@@ -792,9 +792,9 @@ const char* LOCALE_getstring( int StringID )
 ;
 ; DESCRIPTION
 ;
-; Returns the string identified by stringid from the specified 
-; .loc file.  Use the string ID specified in the header file created 
-; by Locomoto.  Note that the string pointer is a const pointer.  Do 
+; Returns the string identified by stringid from the specified
+; .loc file.  Use the string ID specified in the header file created
+; by Locomoto.  Note that the string pointer is a const pointer.  Do
 ; not modify the string or the Locale library may return invalid results.
 ;
 ; If your strings are Unicode strings, cast the result to a const USTR *.
@@ -803,7 +803,7 @@ const char* LOCALE_getstring( int StringID )
 ; valid integer in the range 0..65535.  If no index was created
 ; with the .loc file stringid will be a zero based array index.
 ;
-; String is returned by const for a reason.  Bad things will happen 
+; String is returned by const for a reason.  Bad things will happen
 ; if you modify it.  You have been warned.
 ;
 ; SEE ALSO
@@ -843,10 +843,10 @@ const char* LOCALE_getstr( const void* pLocFile, int StringID )
 
     /* get pointer to string bank */
     {
-        int offset = *((int*)(pLocFile) + 4 + LOCALElanguageid); 
+        int offset = *((int*)(pLocFile) + 4 + LOCALElanguageid);
         pBank = (BANK*)((unsigned char*)(pLocFile) + offset);
     }
-    
+
     if ((StringID >= 0) && (StringID < (int)(pBank->StringCount))) {
 
         unsigned int offset;
diff --git a/Core/Tools/Autorun/locale.h b/Core/Tools/Autorun/locale.h
index c45c469a77f..f4a5fb07edd 100644
--- a/Core/Tools/Autorun/locale.h
+++ b/Core/Tools/Autorun/locale.h
@@ -22,8 +22,7 @@
 locale.h - REAL fonts
 @ */
 
-#ifndef __LOCALE_H
-#define __LOCALE_H 1
+#pragma once
 
 //#ifdef __cplusplus
 //extern "C" {
@@ -47,8 +46,8 @@ const char *	LOCALE_getstr( const void *localefile, int stringid );
 /* initialization/restore */
 int				LOCALE_init( void );										/* call before calling any other LOCALE functions */
 void			LOCALE_restore( void );										/* free all memory/resources allocated by LOCALE */
-																			
-/* attributes */															
+
+/* attributes */
 void			LOCALE_setbank( int bankindex );							/* bankindex >= 0 && bankindex < LOCALE_BANK_COUNT */
 int				LOCALE_getbank( void );										/* returns current bank id */
 int				LOCALE_getbanklanguageid( void );							/* returns language id of the current bank */
@@ -66,7 +65,4 @@ const char *	LOCALE_getstring( int stringid );							/* use values in the .h fil
 //#ifdef __cplusplus
 //}
 //#endif
-
-#endif /* __LOCALE_H */
 /* END ABSTRACT */
-
diff --git a/Core/Tools/Autorun/resource.h b/Core/Tools/Autorun/resource.h
index 1acd64ba8c4..140f95f6129 100644
--- a/Core/Tools/Autorun/resource.h
+++ b/Core/Tools/Autorun/resource.h
@@ -39,7 +39,7 @@
 #define IDS_CANT_FIND_FILE              121
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        117
diff --git a/Core/Tools/Babylon/Babylon.cpp b/Core/Tools/Babylon/Babylon.cpp
index ef488daab03..7354eefcb9a 100644
--- a/Core/Tools/Babylon/Babylon.cpp
+++ b/Core/Tools/Babylon/Babylon.cpp
@@ -158,10 +158,10 @@ BOOL CBabylonApp::InitInstance()
 	return FALSE;
 }
 
-//DEL void CBabylonApp::OnDropFiles(HDROP hDropInfo) 
+//DEL void CBabylonApp::OnDropFiles(HDROP hDropInfo)
 //DEL {
 //DEL 	// TODO: Add your message handler code here and/or call default
-//DEL 	
+//DEL
 //DEL 	CWinApp::OnDropFiles(hDropInfo);
 //DEL }
 
@@ -172,11 +172,11 @@ static const char *szSearchTitle;
 static int AlreadyRunning( void )
 {
 	BOOL found = FALSE;
-	
+
 	szSearchTitle = AppName;
-	
+
 	EnumWindows((WNDENUMPROC) EnumAllWindowsProcExact, (LPARAM) &found);
-	
+
 	return found;
 }
 
@@ -185,11 +185,11 @@ static int AlreadyRunning( void )
 int ExcelRunning( void )
 {
 	BOOL found = FALSE;
-	
+
 	szSearchTitle = "Microsoft Excel";
-	
+
 	EnumWindows((WNDENUMPROC) EnumAllWindowsProc, (LPARAM) &found);
-	
+
 	return found;
 }
 
@@ -200,7 +200,7 @@ BOOL CALLBACK EnumAllWindowsProc(HWND hWnd, LPARAM lParam)
 	char szText[256];
 
 	GetWindowText(hWnd, szText, sizeof(szText));
-	
+
 	if ( strstr(szText, szSearchTitle))
 	{
 		* (BOOL *) lParam = TRUE;
@@ -219,8 +219,8 @@ BOOL CALLBACK EnumAllWindowsProcExact(HWND hWnd, LPARAM lParam)
 	char szText[256];
 
 	GetWindowText(hWnd, szText, sizeof(szText));
-	
-	if ( !strncmp (szText, szSearchTitle, strlen ( szSearchTitle)))
+
+	if ( strncmp (szText, szSearchTitle, strlen ( szSearchTitle)) == 0)
 	{
 		* (BOOL *) lParam = TRUE;
 		 FoundWindow = hWnd;
diff --git a/Core/Tools/Babylon/Babylon.h b/Core/Tools/Babylon/Babylon.h
index 559d4e0246a..22b30205738 100644
--- a/Core/Tools/Babylon/Babylon.h
+++ b/Core/Tools/Babylon/Babylon.h
@@ -19,12 +19,7 @@
 // Babylon.h : main header file for the BABYLON application
 //
 
-#if !defined(AFX_BABYLON_H__2BF3124B_3BA1_11D3_B9DA_006097B90D93__INCLUDED_)
-#define AFX_BABYLON_H__2BF3124B_3BA1_11D3_B9DA_006097B90D93__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #ifndef __AFXWIN_H__
 	#error include 'stdafx.h' before including this file for PCH
@@ -59,7 +54,7 @@ class CBabylonApp : public CWinApp
 
 int ExcelRunning( void );
 extern TransDB				*BabylonstrDB;
-extern TransDB				*MainDB; 
+extern TransDB				*MainDB;
 extern char						BabylonstrFilename[];
 extern char						MainXLSFilename[];
 extern char						RootPath[];
@@ -70,5 +65,3 @@ extern LangID					CurrentLanguage;
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BABYLON_H__2BF3124B_3BA1_11D3_B9DA_006097B90D93__INCLUDED_)
diff --git a/Core/Tools/Babylon/BabylonDlg.cpp b/Core/Tools/Babylon/BabylonDlg.cpp
index c89335b3e95..27706df01f2 100644
--- a/Core/Tools/Babylon/BabylonDlg.cpp
+++ b/Core/Tools/Babylon/BabylonDlg.cpp
@@ -83,7 +83,7 @@ static void cb_progress ( void )
 
 }
 
-typedef struct 
+typedef struct
 {
 	char comment[MAX_INFO_LEN+1];
 	char context[MAX_INFO_LEN+1];
@@ -129,11 +129,11 @@ static void removeLeadingAndTrailing ( char *buffer )
 	while ( (ch = *first) && iswspace ( ch ))
 	{
 			first++;
-	}	
+	}
 
 	while ( *ptr++ = *first++ );
 
-	ptr -= 2;;
+	ptr -= 2;
 
 	while ( (ptr > buffer) && (ch = *ptr) && iswspace ( ch ) )
 	{
@@ -146,7 +146,7 @@ static void removeLeadingAndTrailing ( char *buffer )
 
 /////////////////////////////////////////////////////////////////////////////
 // CAboutDlg dialog used for App About
-								
+
 class CAboutDlg : public CDialog
 {
 public:
@@ -281,7 +281,7 @@ BOOL CBabylonDlg::OnInitDialog()
 	//  when the application's main window is not a dialog
 	SetIcon(m_hIcon, TRUE);			// Set big icon
 	SetIcon(m_hIcon, FALSE);		// Set small icon
-	
+
 	// TODO: Add extra initialization here
 		progress = (CProgressCtrl *) GetDlgItem ( IDC_PROGRESS1 );
 		percent = (CStatic *) GetDlgItem ( IDC_PERCENT );
@@ -309,7 +309,7 @@ BOOL CBabylonDlg::OnInitDialog()
 		combo->InsertString ( index, info->name );
 		combo->SetItemDataPtr ( index, info );
 		index++;
-		lang_index++; 
+		lang_index++;
 	}
 	max_index = index;
 	combo->SetCurSel ( 0 );
@@ -330,10 +330,10 @@ BOOL CBabylonDlg::OnInitDialog()
 #endif
 
 
-	Ready();;
+	Ready();
 
 	PostMessage ( WM_COMMAND, MAKEWPARAM ( IDC_RELOAD, BN_CLICKED ));
-	
+
 	return TRUE;  // return TRUE  unless you set the focus to a control
 }
 
@@ -354,7 +354,7 @@ void CBabylonDlg::OnSysCommand(UINT nID, LPARAM lParam)
 //  to draw the icon.  For MFC applications using the document/view model,
 //  this is automatically done for you by the framework.
 
-void CBabylonDlg::OnPaint() 
+void CBabylonDlg::OnPaint()
 {
 	if (IsIconic())
 	{
@@ -392,7 +392,7 @@ HCURSOR CBabylonDlg::OnQueryDragIcon()
 //  then the UI is hidden but the dialog remains around if it
 //  is dismissed.
 
-void CBabylonDlg::OnClose() 
+void CBabylonDlg::OnClose()
 {
 	if (CanExit())
 	{
@@ -410,13 +410,13 @@ void CBabylonDlg::OnClose()
 
 }
 
-//DEL void CBabylonDlg::OnOK() 
+//DEL void CBabylonDlg::OnOK()
 //DEL {
 //DEL 	if (CanExit())
 //DEL 		CDialog::OnOK();
 //DEL }
 
-//DEL void CBabylonDlg::OnCancel() 
+//DEL void CBabylonDlg::OnCancel()
 //DEL {
 //DEL 	if (CanExit())
 //DEL 		CDialog::OnCancel();
@@ -436,10 +436,10 @@ BOOL CBabylonDlg::CanExit()
 	return TRUE;
 }
 
-//DEL void CBabylonDlg::OnBrowse() 
+//DEL void CBabylonDlg::OnBrowse()
 //DEL {
 //DEL   static char szFilter[] = "XL Files (*.XLS)\0*.xls\0\0\0";
-//DEL 
+//DEL
 //DEL 	// TODO: Add your control notification handler code here
 //DEL 	CFileDialog *dlg = new CFileDialog ( TRUE, "xls", "*.xls", OFN_FILEMUSTEXIST, szFilter, this );
 //DEL 	if ( dlg )
@@ -457,23 +457,23 @@ BOOL CBabylonDlg::CanExit()
 //DEL 	}
 //DEL }
 
-//DEL void CBabylonDlg::OnChangeXlFilename() 
+//DEL void CBabylonDlg::OnChangeXlFilename()
 //DEL {
 //DEL 	// TODO: If this is a RICHEDIT control, the control will not
 //DEL 	// send this notification unless you override the CDialog::OnInitDialog()
 //DEL 	// function and call CRichEditCtrl().SetEventMask()
 //DEL 	// with the ENM_CHANGE flag ORed into the mask.
-//DEL 	
+//DEL
 //DEL 	// TODO: Add your control notification handler code here
-//DEL 	
+//DEL
 //DEL }
 
-void CBabylonDlg::OnExport() 
+void CBabylonDlg::OnExport()
 {
 	if ( CanOperate ())
 	{
 		CExportDlg dlg;
-		
+
 		if ( dlg.DoModal () == IDOK )
 		{
 			ExportTranslations ( MainDB, dlg.Filename (), dlg.Language(), dlg.Options(), this );
@@ -481,10 +481,10 @@ void CBabylonDlg::OnExport()
 	}
 }
 
-BOOL CAboutDlg::OnInitDialog() 
+BOOL CAboutDlg::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	// TODO: Add extra initialization here
 
 	char string[200];
@@ -492,16 +492,16 @@ BOOL CAboutDlg::OnInitDialog()
 	sprintf ( string, "Built: %s, %s", __DATE__, __TIME__ );
 	SetDlgItemText ( IDC_BUILD, string );
 
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void CBabylonDlg::OnDropFiles(HDROP hDropInfo) 
+void CBabylonDlg::OnDropFiles(HDROP hDropInfo)
 {
 	// TODO: Add your message handler code here and/or call default
 //	char buffer[1024];
-//	
+//
 //	if ( DragQueryFile(hDropInfo, 0, buffer, sizeof ( buffer )-1))
 //	{
 //
@@ -522,22 +522,22 @@ void CBabylonDlg::OnDropFiles(HDROP hDropInfo)
 //DEL {
 //DEL 	char *p;
 //DEL 	CWnd *wnd = GetDlgItem ( IDC_EXPORT );
-//DEL 
+//DEL
 //DEL 	if ( buffer && (p = strchr ( buffer, '.' )) && !stricmp ( p, ".xls"))
 //DEL 	{
 //DEL 		SetDlgItemText ( IDC_XLFILE, buffer );
 //DEL 		SetDlgItemText ( IDC_STATUS, "File selected: Click 'convert' to start process");
-//DEL 		wnd->EnableWindow  ( TRUE ); 
+//DEL 		wnd->EnableWindow  ( TRUE );
 //DEL 		return TRUE;
 //DEL 	}
 //DEL 	if ( buffer )
 //DEL 	{
 //DEL 			AfxMessageBox ("Must be an Excel file");
 //DEL 	}
-//DEL 	wnd->EnableWindow  ( FALSE ); 
+//DEL 	wnd->EnableWindow  ( FALSE );
 //DEL 	SetDlgItemText ( IDC_STATUS, "Select excel file...");
 //DEL 	SetDlgItemText ( IDC_XLFILE, "Browse or drop excel file to be convertered" );
-//DEL 
+//DEL
 //DEL 	return FALSE;
 //DEL }
 
@@ -545,21 +545,21 @@ void CBabylonDlg::OnDropFiles(HDROP hDropInfo)
 //DEL {
 //DEL 	char *p;
 //DEL 	char filename[400];
-//DEL 
+//DEL
 //DEL 	if ( buffer && (p = strchr ( buffer, '.' )) && !stricmp ( p, ".str"))
 //DEL 	{
 //DEL 		ParseDB	db;
 //DEL 		SetDlgItemText ( IDC_XLFILE, buffer );
-//DEL 		EnableWindow  ( FALSE ); 
+//DEL 		EnableWindow  ( FALSE );
 //DEL 		SetDlgItemText ( IDC_STATUS, "Parsing .str file");
-//DEL 
+//DEL
 //DEL 		if ( db.ParseStrFile ( buffer, this ) )
 //DEL 		{
 //DEL 			SetDlgItemText ( IDC_STATUS, "Creating .xls file");
 //DEL 			strcpy ( filename, buffer );
 //DEL 			p = strchr ( filename, '.' );
 //DEL 			strcpy ( p, ".xls" );
-//DEL 
+//DEL
 //DEL 			if ( db.CreateXLFile ( filename, this ) )
 //DEL 			{
 //DEL 				SetDlgItemText ( IDC_STATUS, "Created .xls file");
@@ -568,15 +568,15 @@ void CBabylonDlg::OnDropFiles(HDROP hDropInfo)
 //DEL 			{
 //DEL 				SetDlgItemText ( IDC_STATUS, "Falied to create .xls file");
 //DEL 			}
-//DEL 
+//DEL
 //DEL 		}
 //DEL 		else
 //DEL 		{
 //DEL 		SetDlgItemText ( IDC_STATUS, "Failed to parse .str file");
-//DEL 
+//DEL
 //DEL 		}
-//DEL 
-//DEL 		EnableWindow  ( TRUE ); 
+//DEL
+//DEL 		EnableWindow  ( TRUE );
 //DEL 		return TRUE;
 //DEL 	}
 //DEL 	return FALSE;
@@ -689,7 +689,7 @@ int CBabylonDlg::SaveLog()
  	CRichEditCtrl *rec = (CRichEditCtrl *) GetDlgItem ( IDC_LOG );
 	int ok = FALSE;
 
- 
+
 	if ( ! (log = fopen ("babylon.log", "a+t" )))
 	{
 		goto error;
@@ -725,12 +725,12 @@ int CBabylonDlg::SaveLog()
 	{
 		fclose ( log );
 	}
-	
+
 
 	return ok;
 }
 
-void CBabylonDlg::OnViewdbs() 
+void CBabylonDlg::OnViewdbs()
 {
 	// TODO: Add your control notification handler code here
 	VIEWDBSII dlg;
@@ -739,7 +739,7 @@ void CBabylonDlg::OnViewdbs()
 
 	dlg.DoModal ();
 
-	
+
 }
 
 static int readToEndOfQuote( FILE *file, char *in, char *out, char *wavefile, int maxBufLen, int in_comment  )
@@ -980,27 +980,27 @@ static int parseComment ( FILE *file, char *buffer, INFO *info )
 		return new_lines;
 	}
 
-	if ( !stricmp ( token, "COMMENT" ) )
+	if ( stricmp ( token, "COMMENT" ) == 0 )
 	{
 		new_lines += getString ( file, buffer, info->comment );
 	}
-	else if ( !stricmp ( token, "CONTEXT" ) )
+	else if ( stricmp ( token, "CONTEXT" ) == 0 )
 	{
 		new_lines += getString ( file, buffer, info->context );
 	}
-	else if ( !stricmp ( token, "SPEAKER" ) )
+	else if ( stricmp ( token, "SPEAKER" ) == 0 )
 	{
 		new_lines += getString ( file, buffer, info->speaker );
 	}
-	else if ( !stricmp ( token, "LISTENER" ) )
+	else if ( stricmp ( token, "LISTENER" ) == 0 )
 	{
 		new_lines += getString ( file, buffer, info->listener );
 	}
-	else if ( !stricmp ( token, "MAXLEN" ) )
+	else if ( stricmp ( token, "MAXLEN" ) == 0 )
 	{
 		info->maxlen = atoi ( buffer );
 	}
-	else if ( !stricmp ( token, "WAVE" ) )
+	else if ( stricmp ( token, "WAVE" ) == 0 )
 	{
 		new_lines += getString ( file, buffer, info->wave );
 	}
@@ -1024,7 +1024,7 @@ static int getLabelCount( char *filename )
 		if( fscanf( fp, "%s", buffer ) == EOF )
 			break;
 
-		if ( !stricmp( buffer, "END" ) )
+		if ( stricmp( buffer, "END" ) == 0 )
 		{
 			count++;
 		}
@@ -1077,17 +1077,17 @@ int CBabylonDlg::LoadStrFile ( TransDB *db, const char *filename, void (*cb) ( v
 			if ( !fgets ( buffer, sizeof(buffer)-1, file ))
 			{
 				AfxMessageBox ( "Unexpected end of file" );
-				goto exit;				
+				goto exit;
 			}
 
 			line_number++;
 			removeLeadingAndTrailing ( buffer );
 
-			if ( !stricmp ( buffer, "END" )	)
+			if ( stricmp ( buffer, "END" ) == 0	)
 			{
 				break;
 			}
-	
+
 			if ( !buffer[0] || (buffer[0] == '/' && buffer[1] == '/') )
 			{
 				line_number += parseComment ( file, buffer, &local_info );
@@ -1138,10 +1138,7 @@ int CBabylonDlg::LoadStrFile ( TransDB *db, const char *filename, void (*cb) ( v
 
 	db->ClearChanges ();
 
-	if ( label )
-	{
-		delete label;
-	}
+	delete label;
 
 	if ( file )
 	{
@@ -1179,7 +1176,7 @@ int		CBabylonDlg::CanProceed ( void )
 			if ( result == IDNO )
 			{
 				goto retry;
-			}		
+			}
 		}
 	}
 
@@ -1223,7 +1220,7 @@ int		CBabylonDlg::CanOperate ( void )
 	return TRUE;
 }
 
-void CBabylonDlg::OnReload() 
+void CBabylonDlg::OnReload()
 {
 	int num_errors;
 	int num_warnings;
@@ -1313,7 +1310,7 @@ void CBabylonDlg::OnReload()
 	{
 		sprintf ( buffer, "Validating \"%s\"...", BabylonstrFilename );
 		Status ( buffer, FALSE );
-		
+
 		if ( (num_errors = BabylonstrDB->Errors ( )))
 		{
 			sprintf ( buffer, "Generals.str has %d error(s):\n\nClick \"Errors\" for a detailed list.\n\nAll errors must be fixed before \"Update\" will be enabled.", num_errors );
@@ -1323,7 +1320,7 @@ void CBabylonDlg::OnReload()
 			win = GetDlgItem ( IDC_ERRORS );
 			win->EnableWindow ( TRUE );
 		}
-		
+
 		if ( (num_warnings = BabylonstrDB->Warnings()))
 		{
 			win = GetDlgItem ( IDC_WARNINGS );
@@ -1411,7 +1408,7 @@ void CBabylonDlg::OnReload()
 			{
 				do_update = FALSE;
 				AfxMessageBox ( buffer );
-				
+
 			}
 			else
 			{
@@ -1474,12 +1471,12 @@ void CBabylonDlg::ProgressComplete()
 	percent->SetWindowText ( "100% ");
 }
 
-void CBabylonDlg::OnUpdate() 
+void CBabylonDlg::OnUpdate()
 {
 	// TODO: Add your control notification handler code here
 
 	UpdateDB ( BabylonstrDB, MainDB );
-	
+
 }
 
 #define MACRO_UPDATE(field,count)	{ if ( wcsicmp ( source->##field () , destination->##field ())) \
@@ -1492,8 +1489,8 @@ void CBabylonDlg::OnUpdate()
 																info.changes++;																							\
 																(count)++;																									\
 															}																															\
-														 }																															
-																																															
+														 }
+
 
 int CBabylonDlg::UpdateLabel( BabylonLabel *source, BabylonLabel *destination, UPDATEINFO &info, int update, int skip )
 {
@@ -1544,9 +1541,9 @@ int CBabylonDlg::UpdateLabel( BabylonLabel *source, BabylonLabel *destination, U
 	// ask the user to resolve remaing unmatched strings
 
 	{
-		
+
 		stext = source->FirstText ( sh );
-		
+
 		while ( stext )
 		{
 			if ( destination->AllMatched ())
@@ -1610,7 +1607,7 @@ int CBabylonDlg::UpdateLabel( BabylonLabel *source, BabylonLabel *destination, U
 		if ( (stext = (BabylonText *) dtext->Matched ()) )
 		{
 			// stext is the newer version;
-			if ( wcscmp ( dtext->Get (), stext->Get ()))
+			if ( wcscmp ( dtext->Get (), stext->Get ()) != 0)
 			{
 				if ( update )
 				{
@@ -1620,7 +1617,7 @@ int CBabylonDlg::UpdateLabel( BabylonLabel *source, BabylonLabel *destination, U
 				label_modified = TRUE;
 				info.changes ++;
 			}
-			if ( wcsicmp ( dtext->Wave (), stext->Wave ()))
+			if ( wcsicmp ( dtext->Wave (), stext->Wave ()) != 0)
 			{
 				if ( update )
 				{
@@ -1683,7 +1680,7 @@ int CBabylonDlg::UpdateLabel( BabylonLabel *source, BabylonLabel *destination, U
 			if ( update )
 			{
 				dtext = stext->Clone ();
-				destination->AddText ( dtext ); 
+				destination->AddText ( dtext );
 			}
 			info.new_strings++;
 			label_modified = TRUE;
@@ -1752,7 +1749,7 @@ int CBabylonDlg::UpdateDB(TransDB *source, TransDB *destination, int update )
 	{
 		Status ("Checking for changes...", FALSE );
 	}
-	
+
 	source->ClearProcessed ();
 	destination->ClearProcessed ();
 
@@ -1839,7 +1836,7 @@ int CBabylonDlg::UpdateDB(TransDB *source, TransDB *destination, int update )
 			while ( dtext )
 			{
 				BabylonText *next = dlabel->NextText ( sh_text );
-			
+
 				if ( update )
 				{
 					dtext->Remove ();
@@ -1848,7 +1845,7 @@ int CBabylonDlg::UpdateDB(TransDB *source, TransDB *destination, int update )
 
 				info.deleted_strings++;
 				info.changes ++;
-			
+
 				dtext = next;
 			}
 
@@ -1873,91 +1870,91 @@ int CBabylonDlg::UpdateDB(TransDB *source, TransDB *destination, int update )
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( info.deleted_labels )
 		{
 			sprintf ( buffer, "Deleted %d label%c", info.deleted_labels, info.deleted_labels==1?' ':'s' );
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( info.modified_labels )
 		{
 			sprintf ( buffer, "Modified %d label%c", info.modified_labels, info.modified_labels==1?' ':'s' );
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( info.new_strings )
 		{
 			sprintf ( buffer, "Added %d new string%c", info.new_strings, info.new_strings==1?' ':'s' );
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( info.deleted_strings )
 		{
 			sprintf ( buffer, "Deleted %d string%c", info.deleted_strings, info.deleted_strings==1?' ':'s' );
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( info.modified_strings )
 		{
 			sprintf ( buffer, "Modified %d string%c", info.modified_strings, info.modified_strings==1?' ':'s' );
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( info.skipped_labels )
 		{
 			sprintf ( buffer, "Skipped %d label%c", info.skipped_labels, info.skipped_labels==1?' ':'s' );
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( info.updated_comments )
 		{
 			sprintf ( buffer, "Updated %d comment%c", info.updated_comments, info.updated_comments==1?' ':'s' );
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( info.updated_contexts )
 		{
 			sprintf ( buffer, "Updated %d context%c", info.updated_contexts, info.updated_contexts==1?' ':'s' );
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( info.updated_speakers )
 		{
 			sprintf ( buffer, "Updated %d speaker%c", info.updated_speakers, info.updated_speakers==1?' ':'s' );
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( info.updated_listeners )
 		{
 			sprintf ( buffer, "Updated %d listener%c", info.updated_listeners, info.updated_listeners==1?' ':'s' );
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( info.updated_maxlen )
 		{
 			sprintf ( buffer, "Updated %d max length%c", info.updated_maxlen, info.updated_maxlen==1?' ':'s' );
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( info.updated_waves )
 		{
 			sprintf ( buffer, "Updated %d speech file%c", info.updated_waves, info.updated_waves==1?' ':'s' );
 			Log ( buffer );
 			changes = TRUE;
 		}
-		
+
 		if ( !changes  )
 		{
 			if ( !slabel && !info.skipped_labels)
@@ -1969,7 +1966,7 @@ int CBabylonDlg::UpdateDB(TransDB *source, TransDB *destination, int update )
 				Log ( "No changes made" );
 			}
 		}
-		
+
 		if ( result == IDCANCEL )
 		{
 			Log ("Update aborted by user!" );
@@ -1982,7 +1979,7 @@ int CBabylonDlg::UpdateDB(TransDB *source, TransDB *destination, int update )
 				source->ClearChanges ();
 			}
 		}
-	}	// update
+	}
 
 
 	Ready ();
@@ -1990,11 +1987,11 @@ int CBabylonDlg::UpdateDB(TransDB *source, TransDB *destination, int update )
 	return info.changes;
 }
 
-void CBabylonDlg::OnSave() 
+void CBabylonDlg::OnSave()
 {
 
 	if ( CanOperate ())
-	{	
+	{
 		SaveMainDB ( );
 	}
 }
@@ -2053,18 +2050,18 @@ int CBabylonDlg::SaveMainDB( )
 }
 
 
-void CBabylonDlg::OnWarnings() 
+void CBabylonDlg::OnWarnings()
 {
 	// TODO: Add your control notification handler code here
 	if ( BabylonstrDB )
 	{
 		BabylonstrDB->Warnings ( this );
 	}
-	
+
 }
 
 
-void CBabylonDlg::OnErrors() 
+void CBabylonDlg::OnErrors()
 {
 	// TODO: Add your control notification handler code here
 	if ( BabylonstrDB )
@@ -2113,7 +2110,7 @@ int CBabylonDlg::RetranslateText ( BabylonText *newtext, BabylonText *oldtext )
 	return result;
 
 }
-void CBabylonDlg::OnChanges() 
+void CBabylonDlg::OnChanges()
 {
 	// TODO: Add your control notification handler code here
 
@@ -2123,16 +2120,16 @@ void CBabylonDlg::OnChanges()
 
 	dlg.DoModal ();
 
-	
-	
+
+
 }
 
-void CBabylonDlg::OnImport() 
+void CBabylonDlg::OnImport()
 {
 	if ( CanOperate ())
 	{
 		CFileDialog fd ( TRUE , NULL, "*.xls",  OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR );
-		
+
 		if ( fd.DoModal () == IDOK )
 		{
 			if (ImportTranslations ( MainDB, (LPCSTR ) fd.GetPathName (), this ) == -1 )
@@ -2143,12 +2140,12 @@ void CBabylonDlg::OnImport()
 	}
 }
 
-void CBabylonDlg::OnGenerate() 
+void CBabylonDlg::OnGenerate()
 {
 	if ( CanOperate ())
 	{
 		CGenerateDlg dlg;
-		
+
 		if ( dlg.DoModal () == IDOK )
 		{
 			GenerateGameFiles ( MainDB, dlg.FilePrefix(), dlg.Options(), dlg.Langauges(), this );
@@ -2179,21 +2176,21 @@ int CBabylonDlg::ValidateStrFile( const char *filename)
 	sprintf ( buffer, "strcheck %s %s", filename, results );
 
 	if (!CreateProcess(
-			NULL,					
-			buffer,				
-			NULL,					
-			NULL,					
-			FALSE,					
-			0,						
-			NULL,					
-			NULL,					
-			&StartupInfo,			
-			&ProcessInfo))			
+			NULL,
+			buffer,
+			NULL,
+			NULL,
+			FALSE,
+			0,
+			NULL,
+			NULL,
+			&StartupInfo,
+			&ProcessInfo))
 	{
 		goto error;
 	}
 
-	
+
 	WaitForSingleObject(ProcessInfo.hProcess, INFINITE);
 
 	//this->SetForegroundWindow ();
@@ -2262,7 +2259,7 @@ int CBabylonDlg::ValidateStrFile( const char *filename)
 	goto done;
 }
 
-void CBabylonDlg::OnVerifyDialog() 
+void CBabylonDlg::OnVerifyDialog()
 {
 	if ( MainDB && CanOperate () )
 	{
@@ -2271,7 +2268,7 @@ void CBabylonDlg::OnVerifyDialog()
 
 }
 
-void CBabylonDlg::VerifyDialog( TransDB *db, LangID langid ) 
+void CBabylonDlg::VerifyDialog( TransDB *db, LangID langid )
 {
 	BabylonLabel *label;
 	ListSearch sh_label;
@@ -2302,9 +2299,9 @@ void CBabylonDlg::VerifyDialog( TransDB *db, LangID langid )
 		{
 			BabylonText *text;
 			ListSearch sh_text;
-		
+
 			text = label->FirstText ( sh_text );
-		
+
 			while ( text )
 			{
 				if ( text->IsDialog ())
@@ -2315,9 +2312,9 @@ void CBabylonDlg::VerifyDialog( TransDB *db, LangID langid )
 						{
 						 	VerifyDlg dlg(text, langid, DialogPath);
 						 	int result;
-								
+
 						 	result = dlg.DoModal ();
-								
+
 							if ( result == IDCANCEL )
 							{
 								goto done;
@@ -2326,16 +2323,16 @@ void CBabylonDlg::VerifyDialog( TransDB *db, LangID langid )
 							{
 								text->ValidateDialog ( DialogPath, langid );
 							}
-		
+
 							count++;
 							SetProgress ( count );
 						}
 					}
 				}
-		
+
 				text = label->NextText ( sh_text );
 			}
-		
+
 			label = db->NextLabel ( sh_label );
 		}
 	}
@@ -2365,36 +2362,36 @@ void CBabylonDlg::VerifyDialog( TransDB *db, LangID langid )
 			{
 				Log ( "FAILED", SAME_LINE );
 			}
-	
+
 			if ( info->errors )
 			{
 				sprintf ( buffer, "Errors           : %d", info->errors );
 				Log ( buffer );
 			}
-			
+
 			if ( info->missing )
 			{
 				sprintf ( buffer, "Missing dialog   : %d", info->missing );
 				Log ( buffer );
 			}
-			
+
 			if ( info->unresolved )
 			{
 				sprintf ( buffer, "Unverified dialog: %d", info->unresolved );
 				Log ( buffer );
 			}
-			
+
 			if ( info->resolved )
 			{
 				sprintf ( buffer, "Verified dialog  : %d", info->resolved );
 				Log ( buffer );
 			}
-	
+
 		}
 		else
 		{
 			Log ( "OK", SAME_LINE );
-	
+
 			if ( info->resolved )
 			{
 				sprintf ( buffer, "Verified dialog  : %d", info->resolved );
@@ -2413,7 +2410,7 @@ void CBabylonDlg::VerifyDialog( TransDB *db, LangID langid )
 
 }
 
-void CBabylonDlg::VerifyTranslations( TransDB *db, LangID langid ) 
+void CBabylonDlg::VerifyTranslations( TransDB *db, LangID langid )
 {
 	int count = 0;
 	TRNREPORT _info;
@@ -2438,19 +2435,19 @@ void CBabylonDlg::VerifyTranslations( TransDB *db, LangID langid )
 	{
 		if ( info->too_big || info->missing || info->retranslate || info->bad_format )
 		{
-	
+
 			if ( info->missing )
 			{
 				sprintf ( buffer, "Missing translations: %d", info->missing );
 				Log ( buffer );
 			}
-			
+
 			if ( info->too_big )
 			{
 				sprintf ( buffer, "Oversized strings   : %d", info->too_big );
 				Log ( buffer );
 			}
-			
+
 			if ( info->retranslate )
 			{
 				sprintf ( buffer, "Retranslations       : %d", info->retranslate);
@@ -2471,12 +2468,12 @@ void CBabylonDlg::VerifyTranslations( TransDB *db, LangID langid )
 			{
 				sprintf  ( buffer, "Recommemd exporting translations for update and re-import" );
 			}
-			Log ( buffer );		
+			Log ( buffer );
 		}
 		else
 		{
 			Log ( "OK", SAME_LINE );
-	
+
 		}
 	}
 	else
@@ -2487,18 +2484,18 @@ void CBabylonDlg::VerifyTranslations( TransDB *db, LangID langid )
 	Ready();
 }
 
-void CBabylonDlg::OnTranslations() 
+void CBabylonDlg::OnTranslations()
 {
 	if ( MainDB && CanOperate () )
 	{
-		
+
 		VerifyTranslations ( MainDB, CurrentLanguage );
 	}
 
-	
+
 }
 
-void CBabylonDlg::OnSelchangeCombolang() 
+void CBabylonDlg::OnSelchangeCombolang()
 {
 	LANGINFO *info = NULL;
 	int index;
@@ -2509,7 +2506,7 @@ void CBabylonDlg::OnSelchangeCombolang()
 	{
 		info = (LANGINFO *) combo->GetItemDataPtr ( index );
 	}
-	
+
 	if ( info )
 	{
 		CurrentLanguage = info->langid;
@@ -2518,33 +2515,33 @@ void CBabylonDlg::OnSelchangeCombolang()
 	{
 		CurrentLanguage = LANGID_UNKNOWN;
 	}
-	
+
 }
 
-void CBabylonDlg::OnReports() 
+void CBabylonDlg::OnReports()
 {
 	// TODO: Add your control notification handler code here
 	if ( CanOperate ())
 	{
 		CReport dlg;
-		
+
 		if ( dlg.DoModal () == IDOK )
 		{
 			GenerateReport ( MainDB, dlg.Filename(), dlg.Options(), dlg.Langauges(), this );
 		}
 	}
-	
+
 }
 
-void CBabylonDlg::OnDblclkCombolang() 
+void CBabylonDlg::OnDblclkCombolang()
 {
 	// TODO: Add your control notification handler code here
 }
 
-void CBabylonDlg::OnReset() 
+void CBabylonDlg::OnReset()
 {
 	// TODO: Add your control notification handler code here
-	
+
 	if ( CurrentLanguage != LANGID_UNKNOWN )
 	{
 		sprintf ( buffer, "Are you sure you want to invalidate all %s dialog?", GetLangName ( CurrentLanguage ));
@@ -2555,24 +2552,24 @@ void CBabylonDlg::OnReset()
 	}
 }
 
-void CBabylonDlg::OnSent() 
+void CBabylonDlg::OnSent()
 {
 	// TODO: Add your control notification handler code here
 	if ( CanOperate ())
 	{
 		CFileDialog fd ( TRUE , NULL, "*.xls",  OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR );
-		
+
 		if ( fd.DoModal () == IDOK )
 		{
 			UpdateSentTranslations ( MainDB, (LPCSTR ) fd.GetPathName (), this );
 		}
-	}	
+	}
 }
 
-void CAboutDlg::OnButton1() 
+void CAboutDlg::OnButton1()
 {
 	// TODO: Add your control notification handler code here
-	
+
 	CreateTranslationTable ( );
 }
 
diff --git a/Core/Tools/Babylon/BabylonDlg.h b/Core/Tools/Babylon/BabylonDlg.h
index ee57ffda4cf..677e782611b 100644
--- a/Core/Tools/Babylon/BabylonDlg.h
+++ b/Core/Tools/Babylon/BabylonDlg.h
@@ -19,18 +19,13 @@
 // BabylonDlg.h : header file
 //
 
-#if !defined(AFX_BABYLONDLG_H__2BF3124D_3BA1_11D3_B9DA_006097B90D93__INCLUDED_)
-#define AFX_BABYLONDLG_H__2BF3124D_3BA1_11D3_B9DA_006097B90D93__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "resource.h"
 #include "TransDB.h"
 
-typedef enum 
-{	
+typedef enum
+{
 	SAME_LINE,
 	NEW_LINE
 
@@ -152,5 +147,3 @@ extern CBabylonDlg *MainDLG;
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BABYLONDLG_H__2BF3124D_3BA1_11D3_B9DA_006097B90D93__INCLUDED_)
diff --git a/Core/Tools/Babylon/DlgProxy.cpp b/Core/Tools/Babylon/DlgProxy.cpp
index 8237a7e9bb9..6442aa5c774 100644
--- a/Core/Tools/Babylon/DlgProxy.cpp
+++ b/Core/Tools/Babylon/DlgProxy.cpp
@@ -38,8 +38,8 @@ IMPLEMENT_DYNCREATE(CBabylonDlgAutoProxy, CCmdTarget)
 CBabylonDlgAutoProxy::CBabylonDlgAutoProxy()
 {
 	EnableAutomation();
-	
-	// To keep the application running as long as an automation 
+
+	// To keep the application running as long as an automation
 	//	object is active, the constructor calls AfxOleLockApp.
 	AfxOleLockApp();
 
@@ -87,7 +87,7 @@ BEGIN_DISPATCH_MAP(CBabylonDlgAutoProxy, CCmdTarget)
 END_DISPATCH_MAP()
 
 // Note: we add support for IID_IBabylon to support typesafe binding
-//  from VBA.  This IID must match the GUID that is attached to the 
+//  from VBA.  This IID must match the GUID that is attached to the
 //  dispinterface in the .ODL file.
 
 // {2BF31248-3BA1-11D3-B9DA-006097B90D93}
diff --git a/Core/Tools/Babylon/DlgProxy.h b/Core/Tools/Babylon/DlgProxy.h
index 6d73d2fae67..2473539fb36 100644
--- a/Core/Tools/Babylon/DlgProxy.h
+++ b/Core/Tools/Babylon/DlgProxy.h
@@ -19,12 +19,7 @@
 // DlgProxy.h : header file
 //
 
-#if !defined(AFX_DLGPROXY_H__2BF3124F_3BA1_11D3_B9DA_006097B90D93__INCLUDED_)
-#define AFX_DLGPROXY_H__2BF3124F_3BA1_11D3_B9DA_006097B90D93__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 class CBabylonDlg;
 
@@ -75,5 +70,3 @@ class CBabylonDlgAutoProxy : public CCmdTarget
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_DLGPROXY_H__2BF3124F_3BA1_11D3_B9DA_006097B90D93__INCLUDED_)
diff --git a/Core/Tools/Babylon/ExportDlg.cpp b/Core/Tools/Babylon/ExportDlg.cpp
index 0715c7f86d4..991bc7a803f 100644
--- a/Core/Tools/Babylon/ExportDlg.cpp
+++ b/Core/Tools/Babylon/ExportDlg.cpp
@@ -64,7 +64,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CExportDlg message handlers
 
-void CExportDlg::OnOK() 
+void CExportDlg::OnOK()
 {
 	char buffer[100];
 	char *ptr;
@@ -79,7 +79,7 @@ void CExportDlg::OnOK()
 	CButton *missing = (CButton *) GetDlgItem ( IDC_RADIOMISSING );
 	CButton *unsent = (CButton *) GetDlgItem ( IDC_RADIOUNSENT );
 
-	edit->GetWindowText ( buffer, sizeof ( filename) -1 );	
+	edit->GetWindowText ( buffer, sizeof ( filename) -1 );
 	_getcwd ( filename, sizeof (filename ) -1 );
 	strcat ( filename, "\\" );
 	if ( ( ptr = strchr ( buffer, '.' )))
@@ -123,18 +123,18 @@ void CExportDlg::OnOK()
 	options.include_comments = FALSE;
 	button = (CButton *) GetDlgItem ( IDC_CHECKTRANS );
 	options.include_translations = button->GetCheck ();
-	
+
 	CDialog::OnOK();
 }
 
-void CExportDlg::OnCancel() 
+void CExportDlg::OnCancel()
 {
 	// TODO: Add extra cleanup here
 	langid = LANGID_UNKNOWN;
 	CDialog::OnCancel();
 }
 
-BOOL CExportDlg::OnInitDialog() 
+BOOL CExportDlg::OnInitDialog()
 {
 	int index;
 	int lang_index;
@@ -145,7 +145,7 @@ BOOL CExportDlg::OnInitDialog()
 
 
 	CDialog::OnInitDialog();
-	
+
 	// TODO: Add extra initialization here
 	combo = (CComboBox *) GetDlgItem ( IDC_COMBOLANG );
 
@@ -177,7 +177,7 @@ BOOL CExportDlg::OnInitDialog()
 			index++;
 		}
 
-		lang_index++; 
+		lang_index++;
 	}
 	max_index = index;
 
@@ -190,12 +190,12 @@ BOOL CExportDlg::OnInitDialog()
 
 	edit->SetLimitText ( 8 );
 	OnSelchangeCombolang ();
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void CExportDlg::OnSelchangeCombolang() 
+void CExportDlg::OnSelchangeCombolang()
 {
 	// TODO: Add your control notification handler code here
 	LANGINFO *info = NULL;
@@ -210,7 +210,7 @@ void CExportDlg::OnSelchangeCombolang()
 	{
 		info = (LANGINFO *) combo->GetItemDataPtr ( index );
 	}
-	
+
 	if ( info )
 	{
 		char buffer[10];
@@ -236,7 +236,7 @@ void CExportDlg::OnSelchangeCombolang()
 
 }
 
-void CExportDlg::OnSelendokCombolang() 
+void CExportDlg::OnSelendokCombolang()
 {
 	// TODO: Add your control notification handler code here
 	int i = 0;
diff --git a/Core/Tools/Babylon/ExportDlg.h b/Core/Tools/Babylon/ExportDlg.h
index c98f9cd652a..af799753f60 100644
--- a/Core/Tools/Babylon/ExportDlg.h
+++ b/Core/Tools/Babylon/ExportDlg.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EXPORTDLG_H__DDA81307_4F1A_11D3_B9DA_006097B90D93__INCLUDED_)
-#define AFX_EXPORTDLG_H__DDA81307_4F1A_11D3_B9DA_006097B90D93__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ExportDlg.h : header file
 //
 
@@ -77,5 +73,3 @@ class CExportDlg : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EXPORTDLG_H__DDA81307_4F1A_11D3_B9DA_006097B90D93__INCLUDED_)
diff --git a/Core/Tools/Babylon/GenerateDlg.cpp b/Core/Tools/Babylon/GenerateDlg.cpp
index ef8382f0a9a..aa7adfa2f4e 100644
--- a/Core/Tools/Babylon/GenerateDlg.cpp
+++ b/Core/Tools/Babylon/GenerateDlg.cpp
@@ -71,7 +71,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CGenerateDlg message handlers
 
-BOOL CGenerateDlg::OnInitDialog() 
+BOOL CGenerateDlg::OnInitDialog()
 {
 	int index;
 	LANGINFO	*info;
@@ -85,7 +85,7 @@ BOOL CGenerateDlg::OnInitDialog()
 	filetext = ( CStatic *) GetDlgItem ( IDC_FILENAME );
 
 	CDialog::OnInitDialog();
-	
+
 	// TODO: Add extra initialization here
 
 	unicode->SetCheck ( 1 );
@@ -105,22 +105,22 @@ BOOL CGenerateDlg::OnInitDialog()
 			list->SetSel ( index );
 		}
 
-		index++; 
+		index++;
 	}
 	num_langs = index;
 
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void CGenerateDlg::OnSelectall() 
+void CGenerateDlg::OnSelectall()
 {
 	// TODO: Add your control notification handler code here
 	 list->SelItemRange ( TRUE, 0, num_langs-1 );
 }
 
-void CGenerateDlg::OnInvert() 
+void CGenerateDlg::OnInvert()
 {
 	// TODO: Add your control notification handler code here
 	int index = 0;
@@ -135,7 +135,7 @@ void CGenerateDlg::OnInvert()
 
 }
 
-void CGenerateDlg::OnChangePrefix() 
+void CGenerateDlg::OnChangePrefix()
 {
 	char buffer[30];
 
@@ -151,43 +151,43 @@ void CGenerateDlg::OnChangePrefix()
 	}
 
 	filetext->SetWindowText ( buffer );
-	
+
 }
 
-void CGenerateDlg::OnBabylonstr() 
+void CGenerateDlg::OnBabylonstr()
 {
 	// TODO: Add your control notification handler code here
 	options.format = GN_BABYLONSTR;
 	OnChangePrefix ();
 	unicode->SetCheck ( 0 );
 
-	
+
 }
 
-void CGenerateDlg::OnUnicode() 
+void CGenerateDlg::OnUnicode()
 {
 	// TODO: Add your control notification handler code here
 	options.format = GN_UNICODE;
 	OnChangePrefix ();
 	strfile->SetCheck ( 0 );
-	
+
 }
 
-void CGenerateDlg::OnCancel() 
+void CGenerateDlg::OnCancel()
 {
 	// TODO: Add extra cleanup here
-	
+
 	CDialog::OnCancel();
 }
 
-void CGenerateDlg::OnOK() 
+void CGenerateDlg::OnOK()
 {
 	char buffer[30];
 	int count;
 	int i;
 	// TODO: Add extra validation here
 
-	edit->GetWindowText ( buffer, sizeof ( filename) -1 );	
+	edit->GetWindowText ( buffer, sizeof ( filename) -1 );
 	_getcwd ( filename, sizeof (filename ) -1 );
 	strcat ( filename, "\\" );
 	strcat ( filename, buffer );
@@ -213,18 +213,18 @@ void CGenerateDlg::OnOK()
 
 	langids[num_langs] = LANGID_UNKNOWN;
 
-	
+
 	CDialog::OnOK();
 }
 
-void CGenerateDlg::OnIds() 
+void CGenerateDlg::OnIds()
 {
 	options.untranslated = GN_USEIDS;
 	usetext->SetCheck ( 0 );
-	
+
 }
 
-void CGenerateDlg::OnOriginal() 
+void CGenerateDlg::OnOriginal()
 {
 	options.untranslated = GN_USEORIGINAL;
 	useids->SetCheck ( 0 );
diff --git a/Core/Tools/Babylon/GenerateDlg.h b/Core/Tools/Babylon/GenerateDlg.h
index 881ddd3f10e..1be84d2b50b 100644
--- a/Core/Tools/Babylon/GenerateDlg.h
+++ b/Core/Tools/Babylon/GenerateDlg.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_GENERATEDLG_H__959D0D41_50A5_11D3_B9DA_006097B90D93__INCLUDED_)
-#define AFX_GENERATEDLG_H__959D0D41_50A5_11D3_B9DA_006097B90D93__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // GenerateDlg.h : header file
 //
 
@@ -88,5 +84,3 @@ class CGenerateDlg : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_GENERATEDLG_H__959D0D41_50A5_11D3_B9DA_006097B90D93__INCLUDED_)
diff --git a/Core/Tools/Babylon/MatchDlg.cpp b/Core/Tools/Babylon/MatchDlg.cpp
index e0ca969937f..a01c513aeb0 100644
--- a/Core/Tools/Babylon/MatchDlg.cpp
+++ b/Core/Tools/Babylon/MatchDlg.cpp
@@ -70,22 +70,22 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CMatchDlg message handlers
 
-void CMatchDlg::OnCancel() 
+void CMatchDlg::OnCancel()
 {
 	// TODO: Add extra cleanup here
-	
-	MatchingBabylonText = NULL;	
+
+	MatchingBabylonText = NULL;
 	CDialog::OnCancel();
 }
 
-void CMatchDlg::OnNomatch() 
+void CMatchDlg::OnNomatch()
 {
 	// TODO: Add your control notification handler code here
-	MatchingBabylonText = NULL;	
+	MatchingBabylonText = NULL;
 	CDialog::OnOK ();
 }
 
-void CMatchDlg::OnMatch() 
+void CMatchDlg::OnMatch()
 {
 	// TODO: Add your control notification handler code here
 	if ( (MatchingBabylonText = current_match ) )
@@ -97,7 +97,7 @@ void CMatchDlg::OnMatch()
 	CDialog::OnOK ();
 }
 
-BOOL CMatchDlg::OnInitDialog() 
+BOOL CMatchDlg::OnInitDialog()
 {
 	BabylonText *text;
 	ListSearch sh;
@@ -107,7 +107,7 @@ BOOL CMatchDlg::OnInitDialog()
 	static char buffer[4*1024];
 
 
-	sprintf ( buffer, "Resolve umatched text from \"%s\" on line %d", MatchLabel->NameSB(), 
+	sprintf ( buffer, "Resolve umatched text from \"%s\" on line %d", MatchLabel->NameSB(),
 							MatchOriginalText->LineNumber() );
 	SetWindowText ( buffer );
 	CDialog::OnInitDialog();
@@ -141,23 +141,23 @@ BOOL CMatchDlg::OnInitDialog()
 			{
 				result = 0;
 			}
-			index++; 
+			index++;
 		}
-		
+
 		text = MatchLabel->NextText ( sh );
 	}
 
 	combo->SetCurSel ( 0 );
 	OnSelchangeMatchcombo();
-	MatchingBabylonText = NULL;	
+	MatchingBabylonText = NULL;
 	// TODO: Add extra initialization here
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
 
-void CMatchDlg::OnSelchangeMatchcombo() 
+void CMatchDlg::OnSelchangeMatchcombo()
 {
 	// TODO: Add your control notification handler code here
 	int index;
@@ -177,7 +177,7 @@ void CMatchDlg::OnSelchangeMatchcombo()
 	}
 }
 
-void CMatchDlg::OnSkip() 
+void CMatchDlg::OnSkip()
 {
 	// TODO: Add your control notification handler code here
 		 EndDialog ( IDSKIP );
diff --git a/Core/Tools/Babylon/MatchDlg.h b/Core/Tools/Babylon/MatchDlg.h
index 619051f5216..56fa8dacc05 100644
--- a/Core/Tools/Babylon/MatchDlg.h
+++ b/Core/Tools/Babylon/MatchDlg.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_MATCHDLG_H__FA868061_4EA7_11D3_B9DA_006097B90D93__INCLUDED_)
-#define AFX_MATCHDLG_H__FA868061_4EA7_11D3_B9DA_006097B90D93__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // MatchDlg.h : header file
 //
 
@@ -72,5 +68,3 @@ extern BabylonLabel *MatchLabel;
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MATCHDLG_H__FA868061_4EA7_11D3_B9DA_006097B90D93__INCLUDED_)
diff --git a/Core/Tools/Babylon/ProceedDlg.cpp b/Core/Tools/Babylon/ProceedDlg.cpp
index 52001f14523..46bf943fd74 100644
--- a/Core/Tools/Babylon/ProceedDlg.cpp
+++ b/Core/Tools/Babylon/ProceedDlg.cpp
@@ -65,41 +65,41 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ProceedDlg message handlers
 
-void ProceedDlg::OnYes() 
+void ProceedDlg::OnYes()
 {
 	// TODO: Add your control notification handler code here
 	EndDialog ( IDYES );
-	
-}								 
 
-void ProceedDlg::OnAlways() 
+}
+
+void ProceedDlg::OnAlways()
 {
 	// TODO: Add your control notification handler code here
 	EndDialog ( IDALWAYS );
-	
+
 }
 
-void ProceedDlg::OnNo() 
+void ProceedDlg::OnNo()
 {
 	// TODO: Add your control notification handler code here
 	EndDialog ( IDNO );
-	
+
 }
 
-void ProceedDlg::OnClose() 
+void ProceedDlg::OnClose()
 {
 	// TODO: Add your message handler code here and/or call default
-	
+
 	EndDialog ( IDNO );
 	CDialog::OnClose();
 }
 
-BOOL ProceedDlg::OnInitDialog() 
+BOOL ProceedDlg::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
-	SetDlgItemText ( IDC_MESSAGE, message );	
-	
+
+	SetDlgItemText ( IDC_MESSAGE, message );
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
diff --git a/Core/Tools/Babylon/ProceedDlg.h b/Core/Tools/Babylon/ProceedDlg.h
index e1c9f037384..ee42c7809be 100644
--- a/Core/Tools/Babylon/ProceedDlg.h
+++ b/Core/Tools/Babylon/ProceedDlg.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_PROCEEDDLG_H__35C33E24_5AD8_11D3_B9DA_006097B90D93__INCLUDED_)
-#define AFX_PROCEEDDLG_H__35C33E24_5AD8_11D3_B9DA_006097B90D93__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ProceedDlg.h : header file
 //
 #define IDALWAYS		101
@@ -66,5 +62,3 @@ class ProceedDlg : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROCEEDDLG_H__35C33E24_5AD8_11D3_B9DA_006097B90D93__INCLUDED_)
diff --git a/Core/Tools/Babylon/Report.cpp b/Core/Tools/Babylon/Report.cpp
index 1a14acd2857..5fe3a770479 100644
--- a/Core/Tools/Babylon/Report.cpp
+++ b/Core/Tools/Babylon/Report.cpp
@@ -37,7 +37,7 @@ static char THIS_FILE[] = __FILE__;
 CReport::CReport(CWnd* pParent /*=NULL*/)
 	: CDialog(CReport::IDD, pParent)
 {
-	
+
 	options.translations = TRUE;
 	options.dialog = TRUE;
 	options.limit = 0;
@@ -69,7 +69,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CReport message handlers
 
-BOOL CReport::OnInitDialog() 
+BOOL CReport::OnInitDialog()
 {
 	int index;
 	LANGINFO	*info;
@@ -83,7 +83,7 @@ BOOL CReport::OnInitDialog()
 	items = (CStatic *) GetDlgItem ( IDC_ITEMS );
 
 	CDialog::OnInitDialog();
-	
+
 	// TODO: Add extra initialization here
 
 	trans_status->SetCheck ( options.translations );
@@ -106,22 +106,22 @@ BOOL CReport::OnInitDialog()
 			list->SetSel ( index );
 		}
 
-		index++; 
+		index++;
 	}
 	num_langs = index;
 
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void CReport::OnSelectall() 
+void CReport::OnSelectall()
 {
 	// TODO: Add your control notification handler code here
 	 list->SelItemRange ( TRUE, 0, num_langs-1 );
 }
 
-void CReport::OnInvert() 
+void CReport::OnInvert()
 {
 	// TODO: Add your control notification handler code here
 	int index = 0;
@@ -138,7 +138,7 @@ void CReport::OnInvert()
 
 
 
-void CReport::OnShowDetails() 
+void CReport::OnShowDetails()
 {
 	// TODO: Add your control notification handler code here
 	if ( show_details->GetCheck () == 0 )
@@ -152,10 +152,10 @@ void CReport::OnShowDetails()
 		ifless->EnableWindow ( TRUE );
 		limit->EnableWindow ( TRUE );
 		items->EnableWindow ( TRUE );
-	}	
+	}
 }
 
-void CReport::OnOK() 
+void CReport::OnOK()
 {
 	int count;
 	int i;
@@ -171,7 +171,7 @@ void CReport::OnOK()
 
 // get the filename
 	CFileDialog fd ( FALSE , NULL, "*.txt",  OFN_OVERWRITEPROMPT | OFN_NOCHANGEDIR );
-		
+
 	if ( fd.DoModal () != IDOK )
 	{
 		return;
@@ -206,13 +206,13 @@ void CReport::OnOK()
 		options.limit = INT_MAX;
 	}
 
-	
+
 	CDialog::OnOK();
 }
 
-void CReport::OnCancel() 
+void CReport::OnCancel()
 {
 	// TODO: Add extra cleanup here
-	
+
 	CDialog::OnCancel();
 }
diff --git a/Core/Tools/Babylon/Report.h b/Core/Tools/Babylon/Report.h
index ef8145a7adc..93a66d12cd9 100644
--- a/Core/Tools/Babylon/Report.h
+++ b/Core/Tools/Babylon/Report.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_REPORT_H__47F98BA1_70E3_11D3_B9DA_006097B90D93__INCLUDED_)
-#define AFX_REPORT_H__47F98BA1_70E3_11D3_B9DA_006097B90D93__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // Report.h : header file
 //
 
@@ -85,5 +81,3 @@ class CReport : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_REPORT_H__47F98BA1_70E3_11D3_B9DA_006097B90D93__INCLUDED_)
diff --git a/Core/Tools/Babylon/RetranslateDlg.cpp b/Core/Tools/Babylon/RetranslateDlg.cpp
index 32c7945c06a..d586c668a83 100644
--- a/Core/Tools/Babylon/RetranslateDlg.cpp
+++ b/Core/Tools/Babylon/RetranslateDlg.cpp
@@ -64,7 +64,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // RetranslateDlg message handlers
 
-BOOL RetranslateDlg::OnInitDialog() 
+BOOL RetranslateDlg::OnInitDialog()
 {
 	// TODO: Add extra initialization here
 	CStatic *text;
@@ -83,41 +83,41 @@ BOOL RetranslateDlg::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void RetranslateDlg::OnCancelMode() 
+void RetranslateDlg::OnCancelMode()
 {
 	CDialog::OnCancelMode();
-	
+
 	// TODO: Add your message handler code here
-	
+
 }
 
-void RetranslateDlg::OnRetranslate() 
+void RetranslateDlg::OnRetranslate()
 {
 	// TODO: Add your control notification handler code here
 
-		
+
 	oldtext->SetRetranslate ( TRUE );
 	CDialog::OnOK ();
 }
 
-void RetranslateDlg::OnSkip() 
+void RetranslateDlg::OnSkip()
 {
 	// TODO: Add your control notification handler code here
-	
+
 		 EndDialog ( IDSKIP );
 }
 
-void RetranslateDlg::OnNoRetranslate() 
+void RetranslateDlg::OnNoRetranslate()
 {
 	// TODO: Add your control notification handler code here
-	
+
 	oldtext->SetRetranslate ( FALSE );
 	CDialog::OnOK ();
 }
 
-void RetranslateDlg::OnSkipAll() 
+void RetranslateDlg::OnSkipAll()
 {
 	// TODO: Add your control notification handler code here
-	
+
 	CDialog::OnCancel ();
 }
diff --git a/Core/Tools/Babylon/RetranslateDlg.h b/Core/Tools/Babylon/RetranslateDlg.h
index 86bbdcb4cc3..4c7354ff65e 100644
--- a/Core/Tools/Babylon/RetranslateDlg.h
+++ b/Core/Tools/Babylon/RetranslateDlg.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_RETRANSLATEDLG_H__19E25401_0ECB_11D4_B9DB_006097B90D93__INCLUDED_)
-#define AFX_RETRANSLATEDLG_H__19E25401_0ECB_11D4_B9DB_006097B90D93__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // RetranslateDlg.h : header file
 //
 
@@ -71,5 +67,3 @@ class RetranslateDlg : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_RETRANSLATEDLG_H__19E25401_0ECB_11D4_B9DB_006097B90D93__INCLUDED_)
diff --git a/Core/Tools/Babylon/StdAfx.h b/Core/Tools/Babylon/StdAfx.h
index fdce4982aca..14880ad8a46 100644
--- a/Core/Tools/Babylon/StdAfx.h
+++ b/Core/Tools/Babylon/StdAfx.h
@@ -21,16 +21,11 @@
 //      are changed infrequently
 //
 
-#if !defined(AFX_STDAFX_H__2BF31252_3BA1_11D3_B9DA_006097B90D93__INCLUDED_)
-#define AFX_STDAFX_H__2BF31252_3BA1_11D3_B9DA_006097B90D93__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
-// TheSuperHackers @compile xezon 24/03/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
+// TheSuperHackers @build xezon 24/03/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
 #define _d3d9TYPES_H_
 
 #include <afxwin.h>         // MFC core and standard components
@@ -60,4 +55,3 @@ extern char AppTitle[];
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-#endif // !defined(AFX_STDAFX_H__2BF31252_3BA1_11D3_B9DA_006097B90D93__INCLUDED_)
diff --git a/Core/Tools/Babylon/TransDB.cpp b/Core/Tools/Babylon/TransDB.cpp
index 83775b1ab9b..5ef14300b94 100644
--- a/Core/Tools/Babylon/TransDB.cpp
+++ b/Core/Tools/Babylon/TransDB.cpp
@@ -32,8 +32,8 @@ static char buffer[100*1024];
 
 static List	DataBases;
 
-static LANGINFO langinfo[] = 
-	{  
+static LANGINFO langinfo[] =
+	{
 		{	LANGID_US, "US", "us", "e"},
 		{ LANGID_UK, "UK", "uk", "e" },
 		{ LANGID_GERMAN, "German", "ge", "g" },
@@ -49,7 +49,7 @@ static LANGINFO langinfo[] =
 
 LANGINFO *GetLangInfo ( int index )
 {
-	
+
 	if ( (index >= 0) && (index < (sizeof ( langinfo ) / sizeof (LANGINFO )) -1) )
 	{
 		return &langinfo[index];
@@ -96,7 +96,7 @@ LANGINFO *GetLangInfo ( char *language )
 
 	while ( item->langid != LANGID_UNKNOWN )
 	{
-		if ( !stricmp ( language, item->name ) )
+		if ( stricmp ( language, item->name ) == 0 )
 		{
 			return item;
 		}
@@ -329,8 +329,8 @@ BabylonText*			TransDB::FindSubText		( OLECHAR *pattern, int item )
 
 		while ( text )
 		{
-			
-			if ( !wcsnicmp ( text->Get (), pattern, 15 ))
+
+			if ( wcsnicmp ( text->Get (), pattern, 15 ) == 0)
 			{
 				if ( !item )
 				{
@@ -410,7 +410,7 @@ int					TransDB::Clear				( void )
 	if ( next_string_id != -1 )
 	{
 			next_string_id = START_STRING_ID;
-	}	
+	}
 
 	if ( count )
 	{
@@ -479,7 +479,7 @@ void					TransDB::AddToTree		( CTreeCtrl *tc, HTREEITEM parent, int changes, voi
 	ListSearch	sh;
 	BabylonLabel		*label;
 	BabylonText			*txt;
-	
+
 	sprintf ( buffer, "%s%c  (%d/%d)",name, ChangedSymbol(), NumLabelsChanged(), NumLabels() );
 	item = tc->InsertItem ( buffer, parent );
 	ilabels = tc->InsertItem ( "Labels", item );
@@ -504,21 +504,21 @@ void					TransDB::AddToTree		( CTreeCtrl *tc, HTREEITEM parent, int changes, voi
 	if ( num_obsolete )
 	{
 		iobsolete = tc->InsertItem ( "Obsolete Strings", item );
-		
+
 		txt = FirstObsolete ( sh );
-		
+
 		while ( txt )
 		{
 			if ( !changes || txt->IsChanged ())
 			{
 				txt->AddToTree ( tc, iobsolete );
 			}
-		
+
 			if ( cb )
 			{
 				cb ( );
 			}
-		
+
 			txt = NextObsolete ( sh );
 		}
 	}
@@ -692,7 +692,7 @@ BabylonText*			BabylonLabel::FindText ( OLECHAR *find_text )
 
 	while ( txt )
 	{
-		if ( !wcscmp ( txt->Get(), find_text ))
+		if ( wcscmp ( txt->Get(), find_text ) == 0)
 		{
 			return txt;
 		}
@@ -716,7 +716,7 @@ void					BabylonLabel::SetDB				( TransDB *new_db )
 	while ( ntext )
 	{
 		ntext->SetDB ( new_db );
-		
+
 		ntext = NextText ( sh );
 	}
 
@@ -732,7 +732,7 @@ void					BabylonLabel::ClearChanges				( void )
 	while ( ntext )
 	{
 		ntext->ClearChanges();
-		
+
 		ntext = NextText ( sh );
 	}
 
@@ -750,7 +750,7 @@ void					BabylonLabel::ClearProcessed				( void )
 	while ( ntext )
 	{
 		ntext->ClearProcessed();
-		
+
 		ntext = NextText ( sh );
 	}
 
@@ -768,7 +768,7 @@ void					BabylonLabel::ClearMatched				( void )
 	while ( ntext )
 	{
 		ntext->ClearMatched();
-		
+
 		ntext = NextText ( sh );
 	}
 
@@ -789,7 +789,7 @@ int					BabylonLabel::AllMatched				( void )
 		{
 			return FALSE;
 		}
-		
+
 		ntext = NextText ( sh );
 	}
 
@@ -821,7 +821,7 @@ void					BabylonLabel::AddToTree		( CTreeCtrl *tc, HTREEITEM parent, int changes
 	BabylonText			*txt;
 
 	sprintf ( buffer, "%s%c", NameSB(), ChangedSymbol() );
-																							 
+
 	litem = tc->InsertItem ( buffer, parent );
 
 	txt = FirstText ( sh );
@@ -836,25 +836,25 @@ void					BabylonLabel::AddToTree		( CTreeCtrl *tc, HTREEITEM parent, int changes
 		txt = NextText ( sh );
 	}
 
-	if ( strcmp ( CommentSB(), "" ) )
+	if ( strcmp ( CommentSB(), "" ) != 0 )
 	{
 		sprintf ( buffer, "COMMENT : %s", CommentSB() );
 		tc->InsertItem ( buffer, litem );
 	}
 
-	if ( strcmp ( ContextSB(), "" ) )
+	if ( strcmp ( ContextSB(), "" ) != 0 )
 	{
 		sprintf ( buffer, "CONTEXT : %s", ContextSB() );
 		tc->InsertItem ( buffer, litem );
 	}
-		
-	if ( strcmp ( SpeakerSB(), "" ) )
+
+	if ( strcmp ( SpeakerSB(), "" ) != 0 )
 	{
 		sprintf ( buffer, "SPEAKER : %s", SpeakerSB() );
 		tc->InsertItem ( buffer, litem );
 	}
-		
-	if ( strcmp ( ListenerSB(), "" ) )
+
+	if ( strcmp ( ListenerSB(), "" ) != 0 )
 	{
 		sprintf ( buffer, "LISTENER: %s", ListenerSB() );
 		tc->InsertItem ( buffer, litem );
@@ -919,7 +919,7 @@ void					BabylonText::SetDB				( TransDB *new_db )
 	while ( trans )
 	{
 		trans->SetDB ( new_db );
-		
+
 		trans = NextTranslation ( sh );
 	}
 
@@ -971,7 +971,7 @@ int						BabylonText::DialogIsValid ( const char *path, LangID langid, int check
 	{
 		WIN32_FIND_DATA info;
 		HANDLE	handle;
-		
+
 		winfo->SetValid ( FALSE );
 		winfo->SetMissing ( TRUE );
 
@@ -1045,7 +1045,7 @@ int						BabylonText::ValidateDialog ( const char *path, LangID langid )
 
 int						BabylonText::DialogIsPresent ( const char *path, LangID langid )
 {
-			
+
 	WIN32_FIND_DATA info;
 	HANDLE	handle;
 	int present = FALSE;
@@ -1178,7 +1178,7 @@ void					BabylonText::ClearChanges				( void )
 	while ( trans )
 	{
 		trans->ClearChanges();
-		
+
 		trans = NextTranslation ( sh );
 	}
 
@@ -1196,7 +1196,7 @@ void					BabylonText::ClearProcessed				( void )
 	while ( trans )
 	{
 		trans->ClearProcessed();
-		
+
 		trans = NextTranslation ( sh );
 	}
 
@@ -1214,7 +1214,7 @@ void					BabylonText::ClearMatched				( void )
 	while ( trans )
 	{
 		trans->ClearMatched();
-		
+
 		trans = NextTranslation ( sh );
 	}
 
@@ -1269,32 +1269,32 @@ void					BabylonText::Set ( char *string )
 }
 
 void					BabylonText::InvalidateAllWaves			( void  )
-{ 
+{
 	Translation *trans;
 	ListSearch sh;
 
 	WaveInfo.SetValid ( FALSE );
 
 	trans = FirstTranslation ( sh );
-	
+
 	while ( trans )
 	{
 		trans->WaveInfo.SetValid ( FALSE );
-	
+
 		trans = NextTranslation ( sh );
 	}
 
 }
 
 void					BabylonText::InvalidateWave			( void )
-{ 
+{
 
 	WaveInfo.SetValid ( FALSE );
 
 }
 
 void					BabylonText::InvalidateWave			( LangID langid  )
-{ 
+{
 
 	WaveInfo.SetValid ( FALSE );
 
@@ -1305,7 +1305,7 @@ void					BabylonText::InvalidateWave			( LangID langid  )
 	else
 	{
 		Translation *trans = GetTranslation ( langid );
-		
+
 		if ( trans )
 		{
 			trans->WaveInfo.SetValid ( FALSE );
@@ -1341,7 +1341,7 @@ void					BabylonText::AddToTree		( CTreeCtrl *tc, HTREEITEM parent, int changes
 		tc->InsertItem ( buffer, item );
 	}
 
-	if ( strcmp ( WaveSB(), "" ) )
+	if ( strcmp ( WaveSB(), "" ) != 0 )
 	{
 		sprintf ( buffer, "WAVE   : %s", WaveSB() );
 		tc->InsertItem ( buffer, item );
@@ -1367,7 +1367,7 @@ Translation::Translation ( void )
 	comment = new OLEString (  );
 	revision = 0;
 	sent = FALSE;
-	
+
 }
 
 Translation::~Translation ( )
@@ -1411,7 +1411,7 @@ void					Translation::AddToTree		( CTreeCtrl *tc, HTREEITEM parent, int changes
 
 	item = tc->InsertItem ( buffer, parent );
 
-	if ( strcmp ( CommentSB(), "" ) )
+	if ( strcmp ( CommentSB(), "" ) != 0 )
 	{
 		sprintf ( buffer, "COMMENT: %s", CommentSB() );
 		tc->InsertItem ( buffer, item );
@@ -1471,7 +1471,7 @@ int TransDB::Warnings ( CBabylonDlg *dlg )
 			{
 				if ( dlg )
 				{
-					sprintf ( buffer, "Warning:: text at line %5d is NULL", 
+					sprintf ( buffer, "Warning:: text at line %5d is NULL",
 								text->LineNumber());
 					dlg->Log ( buffer );
 				}
@@ -1508,7 +1508,7 @@ int TransDB::Warnings ( CBabylonDlg *dlg )
 
 		while ( (dup = (DupNode*)dups.LastNode ()))
 		{
-			sprintf ( buffer, "Warning:: text at line %5d is a duplicate of text on line %5d", 
+			sprintf ( buffer, "Warning:: text at line %5d is a duplicate of text on line %5d",
 									dup->Duplicate()->LineNumber(), dup->Original()->LineNumber());
 			dlg->Log ( buffer );
 
@@ -1557,11 +1557,11 @@ int TransDB::Errors ( CBabylonDlg *dlg )
 			errors++;
 			if ( dlg )
 			{
-				sprintf ( buffer, "Error  : Label \"%s\" at line %d is has more than 1 string defined", 
+				sprintf ( buffer, "Error  : Label \"%s\" at line %d is has more than 1 string defined",
 							label->NameSB(), label->LineNumber());
 				dlg->Log ( buffer );
 			}
-	
+
 		}
 
 		if ( ( existing_label = FindLabel ( label->Name () )))
@@ -1569,7 +1569,7 @@ int TransDB::Errors ( CBabylonDlg *dlg )
 			errors++;
 			if ( dlg )
 			{
-				sprintf ( buffer, "Error  : Label \"%s\" at line %d is already defined on line %d", 
+				sprintf ( buffer, "Error  : Label \"%s\" at line %d is already defined on line %d",
 							label->NameSB(), label->LineNumber(), existing_label->LineNumber());
 				dlg->Log ( buffer );
 			}
@@ -1643,7 +1643,7 @@ CWaveInfo::CWaveInfo ( void )
 	missing = TRUE;
 }
 
-void TransDB::VerifyDialog( LangID langid, void (*cb) (void) ) 
+void TransDB::VerifyDialog( LangID langid, void (*cb) (void) )
 {
 	BabylonLabel *label;
 	ListSearch sh_label;
@@ -1681,7 +1681,7 @@ void TransDB::VerifyDialog( LangID langid, void (*cb) (void) )
 
 }
 
-void TransDB::InvalidateDialog( LangID langid ) 
+void TransDB::InvalidateDialog( LangID langid )
 {
 	BabylonLabel *label;
 	ListSearch sh_label;
@@ -1710,7 +1710,7 @@ void TransDB::InvalidateDialog( LangID langid )
 
 }
 
-int TransDB::ReportDialog( DLGREPORT *report, LangID langid, void (*print) ( const char *), PMASK pmask ) 
+int TransDB::ReportDialog( DLGREPORT *report, LangID langid, void (*print) ( const char *), PMASK pmask )
 {
 	BabylonLabel *label;
 	ListSearch sh_label;
@@ -1748,7 +1748,7 @@ int TransDB::ReportDialog( DLGREPORT *report, LangID langid, void (*print) ( con
 						if ( print && pmask & PMASK_UNRESOLVED )
 						{
 							sprintf ( buffer, "%d: audio file \"%s%s.wav\" not verified", text->ID(), text->WaveSB (), linfo->character);
-							
+
 							print ( buffer );
 						}
 						info->unresolved++;
@@ -1763,12 +1763,12 @@ int TransDB::ReportDialog( DLGREPORT *report, LangID langid, void (*print) ( con
 					if ( print && pmask & PMASK_MISSING )
 					{
 						sprintf ( buffer, "%d: audio file \"%s%s.wav\" missing", text->ID(), text->WaveSB (), linfo->character);
-						
+
 						print ( buffer );
 					}
 					info->missing++;
 				}
-				
+
 				info->numdialog++;
 			}
 
@@ -1781,7 +1781,7 @@ int TransDB::ReportDialog( DLGREPORT *report, LangID langid, void (*print) ( con
 	return info->missing + info->unresolved + info->errors ;
 }
 
-int TransDB::ReportTranslations( TRNREPORT *report, LangID langid, void (*print) ( const char *buffer), PMASK pmask ) 
+int TransDB::ReportTranslations( TRNREPORT *report, LangID langid, void (*print) ( const char *buffer), PMASK pmask )
 {
 	BabylonLabel *label;
 	ListSearch sh_label;
@@ -1825,18 +1825,18 @@ int TransDB::ReportTranslations( TRNREPORT *report, LangID langid, void (*print)
 							if ( print && pmask & PMASK_TOOLONG )
 							{
 								sprintf ( buffer, "%d: translation is too long by %d characters", text->ID (), trans->Len() - maxlen);
-							
+
 								print ( buffer );
 							}
 							too_big = TRUE;
 						}
-				
+
 						if ( text->Revision () > trans->Revision ())
 						{
 							if ( print && pmask & PMASK_RETRANSLATE )
 							{
 								sprintf ( buffer, "%d: needs re-translation", text->ID () );
-							
+
 								print ( buffer );
 							}
 							info->retranslate++;
@@ -1849,7 +1849,7 @@ int TransDB::ReportTranslations( TRNREPORT *report, LangID langid, void (*print)
 								if ( print && pmask & PMASK_BADFORMAT )
 								{
 									sprintf ( buffer, "%d: translation has differring formating to original", text->ID () );
-						
+
 									print ( buffer );
 								}
 								info->bad_format++;
@@ -1861,7 +1861,7 @@ int TransDB::ReportTranslations( TRNREPORT *report, LangID langid, void (*print)
 						if ( print && pmask & PMASK_MISSING )
 						{
 							sprintf ( buffer, "%d: not translated", text->ID ());
-						
+
 							print ( buffer );
 						}
 						info->missing++;
@@ -1877,14 +1877,14 @@ int TransDB::ReportTranslations( TRNREPORT *report, LangID langid, void (*print)
 							if ( print && pmask & PMASK_TOOLONG )
 							{
 								sprintf ( buffer, "%d: is too long by %d characters", text->ID (), text->Len() - maxlen);
-							
+
 								print ( buffer );
 							}
 							too_big = TRUE;
 						}
 					}
 				}
-				
+
 			}
 
 			if ( too_big )
diff --git a/Core/Tools/Babylon/TransDB.h b/Core/Tools/Babylon/TransDB.h
index 152d8a9f5c0..fd508f9e18c 100644
--- a/Core/Tools/Babylon/TransDB.h
+++ b/Core/Tools/Babylon/TransDB.h
@@ -21,8 +21,7 @@
 //
 //
 
-#ifndef __TRANSDB_H
-#define __TRANSDB_H
+#pragma once
 
 #include "olestring.h"
 #include "list.h"
@@ -30,7 +29,7 @@
 
 class CBabylonDlg;
 
-typedef struct 
+typedef struct
 {
 	int numdialog;
 	int missing;
@@ -40,7 +39,7 @@ typedef struct
 
 } DLGREPORT;
 
-typedef struct 
+typedef struct
 {
 	int numlabels;
 	int numstrings;
@@ -55,7 +54,7 @@ typedef struct
 
 typedef enum
 {
-	
+
 	PMASK_NONE				= 0,
 	PMASK_MISSING			=	0x00000001,
 	PMASK_UNRESOLVED	=	0x00000002,
@@ -80,14 +79,14 @@ typedef enum
 	LANGID_UNKNOWN
 } LangID;
 
-typedef struct 
-{ 
-	LangID langid; 
-	const char *name; 
+typedef struct
+{
+	LangID langid;
+	const char *name;
 	const char *initials ;	// two character identifier
 	const char *character;	// single character identifier
 
-} LANGINFO; 
+} LANGINFO;
 
 LANGINFO*	GetLangInfo ( LangID langid );
 const char*	GetLangName ( LangID langid );
@@ -235,8 +234,8 @@ class BabylonText : public DBAttribs
 	OLECHAR*			Get					( void )									{ return text->Get (); } ;
 	int						Len					( void )									{ return text->Len (); };
 	char*					GetSB				( void )									{ return text->GetSB (); } ;
-	void					SetWave			( OLECHAR *string )				{ wavefile->Set ( string ); Changed(); InvalidateAllWaves (); }; 
-	void					SetWave			( char *string )					{ wavefile->Set ( string ); Changed(); InvalidateAllWaves (); }; 
+	void					SetWave			( OLECHAR *string )				{ wavefile->Set ( string ); Changed(); InvalidateAllWaves (); };
+	void					SetWave			( char *string )					{ wavefile->Set ( string ); Changed(); InvalidateAllWaves (); };
 	void					SetLabel		( BabylonLabel *new_label )		{ label = new_label; };
 	void					SetRetranslate ( int flag = TRUE )		{ retranslate = flag;};
 	int						Retranslate ( void )									{ return retranslate; };
@@ -259,7 +258,7 @@ class BabylonText : public DBAttribs
 	void					InvalidateWave ( LangID langid );
 	int						IsSent ( void );
 	void						Sent ( int val );
-	
+
 };
 
 
@@ -267,7 +266,7 @@ class BabylonLabel : public DBAttribs
 {
 	TransDB				*db;
 
-												
+
 	OLEString			*name;
 	OLEString			*comment;
 	OLEString			*context;
@@ -409,9 +408,9 @@ class TransDB : public DBAttribs
 
 
 class DupNode : public ListNode
-{				 
-	BabylonText *original;																	
-	BabylonText *duplicate;																	
+{
+	BabylonText *original;
+	BabylonText *duplicate;
 
 	public:
 	DupNode ( BabylonText *dup, BabylonText *orig ) { original = orig; duplicate = dup, SetPriority ( orig->LineNumber ());};
@@ -424,7 +423,3 @@ class DupNode : public ListNode
 
 
 extern TransDB* FirstTransDB ( void );
-
-
-
-#endif // __TRANSDB_H
\ No newline at end of file
diff --git a/Core/Tools/Babylon/VIEWDBSII.h b/Core/Tools/Babylon/VIEWDBSII.h
index a2499d1e93d..a9ea386653b 100644
--- a/Core/Tools/Babylon/VIEWDBSII.h
+++ b/Core/Tools/Babylon/VIEWDBSII.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_VIEWDBSII_H__AC697EE4_6D37_4F29_ACC7_8B260A33DA2E__INCLUDED_)
-#define AFX_VIEWDBSII_H__AC697EE4_6D37_4F29_ACC7_8B260A33DA2E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // VIEWDBSII.h : header file
 //
 
@@ -66,5 +62,3 @@ class VIEWDBSII : public CDialog
 extern int ViewChanges;
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_VIEWDBSII_H__AC697EE4_6D37_4F29_ACC7_8B260A33DA2E__INCLUDED_)
diff --git a/Core/Tools/Babylon/VerifyDlg.cpp b/Core/Tools/Babylon/VerifyDlg.cpp
index d1d96c1cc50..b339d9ce5dd 100644
--- a/Core/Tools/Babylon/VerifyDlg.cpp
+++ b/Core/Tools/Babylon/VerifyDlg.cpp
@@ -71,12 +71,12 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // VerifyDlg message handlers
 
-BOOL VerifyDlg::OnInitDialog() 
+BOOL VerifyDlg::OnInitDialog()
 {
 	//long total;
 	CDialog::OnInitDialog();
 	RECT rect;
-	
+
 	// TODO: Add extra initialization here
 
 	this->GetWindowRect ( &rect );
@@ -118,7 +118,7 @@ BOOL VerifyDlg::OnInitDialog()
 		HDLSDEVICE dls;
 
 		AIL_quick_handles ( &dig, &mdi, &dls );
-		stream = AIL_open_stream ( dig, wavefile, 0 ); 
+		stream = AIL_open_stream ( dig, wavefile, 0 );
 		if ( stream )
 		{
 			timer = SetTimer( TIMERID, 300, NULL );
@@ -128,35 +128,35 @@ BOOL VerifyDlg::OnInitDialog()
 #endif
 
 	PostMessage ( WM_COMMAND, MAKEWPARAM ( IDC_PLAY, BN_CLICKED ));
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void VerifyDlg::OnNomatch() 
+void VerifyDlg::OnNomatch()
 {
 	// TODO: Add your control notification handler code here
 		CloseAudio ();
 		this->EndDialog ( IDSKIP );
 }
 
-void VerifyDlg::OnMatch() 
+void VerifyDlg::OnMatch()
 {
 	// TODO: Add your control notification handler code here
 	CloseAudio ();
 	CDialog::OnOK();
-	
+
 }
 
-void VerifyDlg::OnCancel() 
+void VerifyDlg::OnCancel()
 {
 	// TODO: Add extra cleanup here
-	
+
 	CloseAudio ();
 	CDialog::OnCancel();
 }
 
-void VerifyDlg::OnStop() 
+void VerifyDlg::OnStop()
 {
 	// TODO: Add your control notification handler code here
 	#if 0
@@ -168,7 +168,7 @@ void VerifyDlg::OnStop()
 		#endif
 }
 
-void VerifyDlg::OnPlay() 
+void VerifyDlg::OnPlay()
 {
 	// TODO: Add your control notification handler code here
 	#if 0
@@ -186,7 +186,7 @@ void VerifyDlg::OnPlay()
 	#endif
 }
 
-void VerifyDlg::OnPause() 
+void VerifyDlg::OnPause()
 {
 	// TODO: Add your control notification handler code here
 	#if 0
@@ -202,7 +202,7 @@ void VerifyDlg::OnPause()
 		}
 	}
 	#endif
-	
+
 }
 
 void VerifyDlg::CloseAudio ( void )
@@ -216,7 +216,7 @@ void VerifyDlg::CloseAudio ( void )
 	#endif
 }
 
-void VerifyDlg::OnTimer(UINT nIDEvent) 
+void VerifyDlg::OnTimer(UINT nIDEvent)
 {
 	// TODO: Add your message handler code here and/or call default
 	if ( nIDEvent == TIMERID )
diff --git a/Core/Tools/Babylon/VerifyDlg.h b/Core/Tools/Babylon/VerifyDlg.h
index 1b8151a9af0..04964b6f3f4 100644
--- a/Core/Tools/Babylon/VerifyDlg.h
+++ b/Core/Tools/Babylon/VerifyDlg.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_VERIFYDLG_H__88E9C121_599B_11D3_B9DA_006097B90D93__INCLUDED_)
-#define AFX_VERIFYDLG_H__88E9C121_599B_11D3_B9DA_006097B90D93__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // VerifyDlg.h : header file
 //
 
@@ -81,5 +77,3 @@ class VerifyDlg : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_VERIFYDLG_H__88E9C121_599B_11D3_B9DA_006097B90D93__INCLUDED_)
diff --git a/Core/Tools/Babylon/VerifyTextDlg.cpp b/Core/Tools/Babylon/VerifyTextDlg.cpp
index 3e7cae765c7..9725ad58ff1 100644
--- a/Core/Tools/Babylon/VerifyTextDlg.cpp
+++ b/Core/Tools/Babylon/VerifyTextDlg.cpp
@@ -64,28 +64,28 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CVerifyTextDlg message handlers
 
-void CVerifyTextDlg::OnNomatch() 
+void CVerifyTextDlg::OnNomatch()
 {
 
 	EndDialog ( IDNO );
-	
+
 }
 
-void CVerifyTextDlg::OnMatch() 
+void CVerifyTextDlg::OnMatch()
 {
 
 	EndDialog ( IDYES );
-	
+
 }
 
-BOOL CVerifyTextDlg::OnInitDialog() 
+BOOL CVerifyTextDlg::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
 	SetDlgItemText ( IDC_TRANS, m_trans );
 	SetDlgItemText ( IDC_ORIG, m_orig );
-		
-	
+
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
diff --git a/Core/Tools/Babylon/VerifyTextDlg.h b/Core/Tools/Babylon/VerifyTextDlg.h
index 15bbdca8e63..fca1dda0fd1 100644
--- a/Core/Tools/Babylon/VerifyTextDlg.h
+++ b/Core/Tools/Babylon/VerifyTextDlg.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_VERIFYTEXTDLG_H__39DB1C81_6B90_11D3_B9DA_006097B90D93__INCLUDED_)
-#define AFX_VERIFYTEXTDLG_H__39DB1C81_6B90_11D3_B9DA_006097B90D93__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // VerifyTextDlg.h : header file
 //
 
@@ -64,5 +60,3 @@ class CVerifyTextDlg : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_VERIFYTEXTDLG_H__39DB1C81_6B90_11D3_B9DA_006097B90D93__INCLUDED_)
diff --git a/Core/Tools/Babylon/ViewDBsDlg.cpp b/Core/Tools/Babylon/ViewDBsDlg.cpp
index 9eb3f3af5f2..2fd32722ccc 100644
--- a/Core/Tools/Babylon/ViewDBsDlg.cpp
+++ b/Core/Tools/Babylon/ViewDBsDlg.cpp
@@ -185,7 +185,7 @@ HTREEITEM VIEWDBSII::create_changes_view ( void )
 	return root;
 }
 
-BOOL VIEWDBSII::OnInitDialog() 
+BOOL VIEWDBSII::OnInitDialog()
 {
 	HTREEITEM root;
 	CDialog::OnInitDialog();
@@ -203,15 +203,15 @@ BOOL VIEWDBSII::OnInitDialog()
 
 
 	MainDLG->Ready();
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void VIEWDBSII::OnClose() 
+void VIEWDBSII::OnClose()
 {
 	// TODO: Add your message handler code here and/or call default
-	
+
 	CTreeCtrl *tc = ( CTreeCtrl *) GetDlgItem ( IDC_TREEVIEW );
 	HTREEITEM root = tc->GetRootItem ();
 	tc->Expand ( root, TVE_COLLAPSE );
diff --git a/Core/Tools/Babylon/XLStuff.cpp b/Core/Tools/Babylon/XLStuff.cpp
index 8cf3e95698c..59be38979c7 100644
--- a/Core/Tools/Babylon/XLStuff.cpp
+++ b/Core/Tools/Babylon/XLStuff.cpp
@@ -22,7 +22,7 @@
 //
 #include "StdAfx.h"
 #include "Babylon.h"
-#include "resource.h"				 
+#include "resource.h"
 #include <stdio.h>
 #include "XLStuff.h"
 #include <assert.h>
@@ -70,7 +70,7 @@ static VARIANT GetCell ( int row, int column )
 		goto error;
 	}
 
- 
+
 	range->AttachDispatch ( dispatch );
 	result = range->GetValue ();
 	range->ReleaseDispatch ( );
@@ -111,7 +111,7 @@ int PutCell ( int row, int column, const OLECHAR *string, int val )
 	}
 
 	range->AttachDispatch ( dispatch );
- 
+
 	if ( string )
 	{
 		V_VT ( &newValue ) = VT_BSTR;
@@ -223,15 +223,8 @@ int PutSeparator ( int row )
 
 	range->ReleaseDispatch ( );
 
-	if ( borders )
-	{
-		delete borders ;
-	}
-
-	if ( border )
-	{
-		delete border ;
-	}
+	delete borders;
+	delete border;
 
 	VariantClear ( &cell1 );
 	VariantClear ( &cell2 );
@@ -364,15 +357,8 @@ int PutSection ( int row, OLECHAR *title )
 
 	range->ReleaseDispatch ( );
 
-	if ( borders )
-	{
-		delete borders ;
-	}
-
-	if ( border )
-	{
-		delete border ;
-	}
+	delete borders;
+	delete border;
 
 	VariantClear ( &cell1 );
 	VariantClear ( &cell2 );
@@ -421,7 +407,7 @@ int OpenExcel ( void )
 	if ( !wbs )
 	{
 		return FALSE;
-	}							
+	}
 
 	if ( ! (ws = new _Worksheet ()))
 	{
@@ -475,17 +461,11 @@ void CloseExcel ( void )
 {
 	CloseWorkBook ();
 
-	if ( range )
-	{
-		delete range;
-		range = NULL;
-	}
+	delete range;
+	range = NULL;
 
-	if ( ws )
-	{
-		delete ws;
-		ws = NULL;
-	}
+	delete ws;
+	ws = NULL;
 
 	if ( wbs )
 	{
@@ -509,8 +489,8 @@ void CloseExcel ( void )
 int OpenWorkBook ( const char *filename )
 {
 	LPDISPATCH dispatch;
- 
-	dispatch = wbs->Open ((LPCTSTR) filename, dummy0, yes, dummy, nullstring, nullstring, yes, dummy, dummy, no, no, dummy, no ); 
+
+	dispatch = wbs->Open ((LPCTSTR) filename, dummy0, yes, dummy, nullstring, nullstring, yes, dummy, dummy, no, no, dummy, no );
 
 	if ( dispatch )
 	{
@@ -546,9 +526,9 @@ int NewWorkBook ( const char *path )
 		{
 			*p = 0;
 		}
-		
+
 		strcpy ( p, ".xlt" );
-		
+
 		if ( (handle = FindFirstFile ( tfile, &finfo)) != INVALID_HANDLE_VALUE )
 		{
 			if ( !(finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
@@ -557,7 +537,7 @@ int NewWorkBook ( const char *path )
 				V_VT ( &temp ) = VT_BSTR;
 				V_BSTR ( &temp ) = SysAllocString ( buffer );
 			}
-		
+
 			FindClose ( handle );
 		}
 	}
@@ -573,7 +553,7 @@ int NewWorkBook ( const char *path )
 
 	if ( !workbook )
 	{
-		return FALSE;					
+		return FALSE;
 	}
 	SelectActiveSheet ( );
 	return TRUE;
@@ -603,7 +583,7 @@ int SaveWorkBook ( const char *filename, int protect )
 		ws->Protect ( password, yes, yes, yes, no );
 		VariantClear ( &password );
 	}
-	workbook->SaveAs ( name, fileformat, nullstring, nullstring, no, no, 
+	workbook->SaveAs ( name, fileformat, nullstring, nullstring, no, no,
 					xlNoChange, rc, no, empty, empty );
 
 	VariantClear ( &name );
@@ -635,7 +615,7 @@ void SelectActiveSheet ( void )
 
 	ws->ReleaseDispatch ( );
 	ws->AttachDispatch ( dispatch );
-} 
+}
 
 int GetInt ( int row, int cell )
 {
diff --git a/Core/Tools/Babylon/XLStuff.h b/Core/Tools/Babylon/XLStuff.h
index 46b23a0cc46..90361bab44c 100644
--- a/Core/Tools/Babylon/XLStuff.h
+++ b/Core/Tools/Babylon/XLStuff.h
@@ -21,8 +21,7 @@
 //
 //
 
-#ifndef XLSTUFF_H
-#define XLSTUFF_H
+#pragma once
 
 #include "BabylonDlg.h"
 typedef enum {
@@ -256,7 +255,3 @@ int PutSection ( int row, const OLECHAR *title );
 void SelectActiveSheet ( void );
 int GetInt ( int row, int cell );
 int GetString ( int row, int cell, OLECHAR *buffer );
-
-
-
-#endif // XLSTUFF_H
\ No newline at end of file
diff --git a/Core/Tools/Babylon/bin.cpp b/Core/Tools/Babylon/bin.cpp
index 25c35e229e4..0116060b165 100644
--- a/Core/Tools/Babylon/bin.cpp
+++ b/Core/Tools/Babylon/bin.cpp
@@ -105,7 +105,7 @@ void				Bin::Add					( void *data, OLECHAR *text1, OLECHAR *text2 )
 
 BinItem*		Bin::GetBinItem		( OLECHAR *text1, OLECHAR *text2)
 {
-	
+
 	sh_size1 = sh_size2 = 0;
 	sh_text1 = text1;
 	sh_text2 = text2;
@@ -152,7 +152,7 @@ BinItem*		Bin::GetBinItem	( void *item )
 	BinItem *bitem = NULL;
 	int i;
 
-	
+
 	for ( i=0; i< num_buckets; i++)
 	{
 
@@ -164,7 +164,7 @@ BinItem*		Bin::GetBinItem	( void *item )
 	}
 
 	return bitem;
-								
+
 }
 
 void				Bin::Remove			( void *item )
@@ -323,7 +323,7 @@ void				BinID::Add					( void *data, int id )
 BinIDItem*		BinID::GetBinIDItem		( int id )
 {
 	BinIDItem *item;
-	
+
 
 	item = (BinIDItem *) bucket[id%num_buckets].Next();
 
@@ -345,7 +345,7 @@ BinIDItem*		BinID::GetBinIDItem	( void *item )
 	BinIDItem *bitem = NULL;
 	int i;
 
-	
+
 	for ( i=0; i< num_buckets; i++)
 	{
 
@@ -357,7 +357,7 @@ BinIDItem*		BinID::GetBinIDItem	( void *item )
 	}
 
 	return bitem;
-								
+
 }
 
 void				BinID::Remove			( void *item )
diff --git a/Core/Tools/Babylon/bin.h b/Core/Tools/Babylon/bin.h
index 619b193213e..f928b150337 100644
--- a/Core/Tools/Babylon/bin.h
+++ b/Core/Tools/Babylon/bin.h
@@ -20,9 +20,7 @@
 // Bin.h
 //
 
-
-#ifndef __BIN_H
-#define __BIN_H
+#pragma once
 
 #include "list.h"
 #include "olestring.h"
@@ -103,6 +101,3 @@ class BinID
 
 
 };
-
-
-#endif // __BIN_H
\ No newline at end of file
diff --git a/Core/Tools/Babylon/excel8.cpp b/Core/Tools/Babylon/excel8.cpp
index 4078199d0ab..18bb32cb760 100644
--- a/Core/Tools/Babylon/excel8.cpp
+++ b/Core/Tools/Babylon/excel8.cpp
@@ -94,7 +94,7 @@ LPUNKNOWN Workbooks::Get_NewEnum()
 	return result;
 }
 
-LPDISPATCH Workbooks::Open(LPCTSTR Filename, const VARIANT& UpdateLinks, const VARIANT& ReadOnly, const VARIANT& Format, const VARIANT& Password, const VARIANT& WriteResPassword, const VARIANT& IgnoreReadOnlyRecommended, const VARIANT& Origin, 
+LPDISPATCH Workbooks::Open(LPCTSTR Filename, const VARIANT& UpdateLinks, const VARIANT& ReadOnly, const VARIANT& Format, const VARIANT& Password, const VARIANT& WriteResPassword, const VARIANT& IgnoreReadOnlyRecommended, const VARIANT& Origin,
 		const VARIANT& Delimiter, const VARIANT& Editable, const VARIANT& Notify, const VARIANT& Converter, const VARIANT& AddToMru)
 {
 	LPDISPATCH result;
@@ -105,7 +105,7 @@ LPDISPATCH Workbooks::Open(LPCTSTR Filename, const VARIANT& UpdateLinks, const V
 	return result;
 }
 
-void Workbooks::OpenText(LPCTSTR Filename, const VARIANT& Origin, const VARIANT& StartRow, const VARIANT& DataType, long TextQualifier, const VARIANT& ConsecutiveDelimiter, const VARIANT& Tab, const VARIANT& Semicolon, const VARIANT& Comma, 
+void Workbooks::OpenText(LPCTSTR Filename, const VARIANT& Origin, const VARIANT& StartRow, const VARIANT& DataType, long TextQualifier, const VARIANT& ConsecutiveDelimiter, const VARIANT& Tab, const VARIANT& Semicolon, const VARIANT& Comma,
 		const VARIANT& Space, const VARIANT& Other, const VARIANT& OtherChar, const VARIANT& FieldInfo, const VARIANT& TextVisualLayout)
 {
 	static BYTE parms[] =
@@ -330,13 +330,13 @@ VARIANT _Application::ExecuteExcel4Macro(LPCTSTR String)
 	return result;
 }
 
-LPDISPATCH _Application::Intersect(LPDISPATCH Arg1, LPDISPATCH Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, const VARIANT& Arg10, 
-		const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, const VARIANT& Arg20, 
+LPDISPATCH _Application::Intersect(LPDISPATCH Arg1, LPDISPATCH Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, const VARIANT& Arg10,
+		const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, const VARIANT& Arg20,
 		const VARIANT& Arg21, const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29, const VARIANT& Arg30)
 {
 	LPDISPATCH result;
 	static BYTE parms[] =
-		VTS_DISPATCH VTS_DISPATCH VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT 
+		VTS_DISPATCH VTS_DISPATCH VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT
 		VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT;
 	InvokeHelper(0x2fe, DISPATCH_METHOD, VT_DISPATCH, (void*)&result, parms,
 		Arg1, Arg2, &Arg3, &Arg4, &Arg5, &Arg6, &Arg7, &Arg8, &Arg9, &Arg10, &Arg11, &Arg12, &Arg13, &Arg14, &Arg15, &Arg16, &Arg17, &Arg18, &Arg19, &Arg20, &Arg21, &Arg22, &Arg23, &Arg24, &Arg25, &Arg26, &Arg27, &Arg28, &Arg29, &Arg30);
@@ -367,28 +367,28 @@ LPDISPATCH _Application::GetRows()
 	return result;
 }
 
-VARIANT _Application::Run(const VARIANT& Macro, const VARIANT& Arg1, const VARIANT& Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, 
-		const VARIANT& Arg10, const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, 
-		const VARIANT& Arg20, const VARIANT& Arg21, const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29, 
+VARIANT _Application::Run(const VARIANT& Macro, const VARIANT& Arg1, const VARIANT& Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9,
+		const VARIANT& Arg10, const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19,
+		const VARIANT& Arg20, const VARIANT& Arg21, const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29,
 		const VARIANT& Arg30)
 {
 	VARIANT result;
 	static BYTE parms[] =
-		VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT 
+		VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT
 		VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT;
 	InvokeHelper(0x103, DISPATCH_METHOD, VT_VARIANT, (void*)&result, parms,
 		&Macro, &Arg1, &Arg2, &Arg3, &Arg4, &Arg5, &Arg6, &Arg7, &Arg8, &Arg9, &Arg10, &Arg11, &Arg12, &Arg13, &Arg14, &Arg15, &Arg16, &Arg17, &Arg18, &Arg19, &Arg20, &Arg21, &Arg22, &Arg23, &Arg24, &Arg25, &Arg26, &Arg27, &Arg28, &Arg29, &Arg30);
 	return result;
 }
 
-VARIANT _Application::_Run2(const VARIANT& Macro, const VARIANT& Arg1, const VARIANT& Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, 
-		const VARIANT& Arg10, const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, 
-		const VARIANT& Arg20, const VARIANT& Arg21, const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29, 
+VARIANT _Application::_Run2(const VARIANT& Macro, const VARIANT& Arg1, const VARIANT& Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9,
+		const VARIANT& Arg10, const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19,
+		const VARIANT& Arg20, const VARIANT& Arg21, const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29,
 		const VARIANT& Arg30)
 {
 	VARIANT result;
 	static BYTE parms[] =
-		VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT 
+		VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT
 		VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT;
 	InvokeHelper(0x326, DISPATCH_METHOD, VT_VARIANT, (void*)&result, parms,
 		&Macro, &Arg1, &Arg2, &Arg3, &Arg4, &Arg5, &Arg6, &Arg7, &Arg8, &Arg9, &Arg10, &Arg11, &Arg12, &Arg13, &Arg14, &Arg15, &Arg16, &Arg17, &Arg18, &Arg19, &Arg20, &Arg21, &Arg22, &Arg23, &Arg24, &Arg25, &Arg26, &Arg27, &Arg28, &Arg29, &Arg30);
@@ -424,13 +424,13 @@ LPDISPATCH _Application::GetThisWorkbook()
 	return result;
 }
 
-LPDISPATCH _Application::Union(LPDISPATCH Arg1, LPDISPATCH Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, const VARIANT& Arg10, const VARIANT& Arg11, 
-		const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, const VARIANT& Arg20, const VARIANT& Arg21, 
+LPDISPATCH _Application::Union(LPDISPATCH Arg1, LPDISPATCH Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, const VARIANT& Arg10, const VARIANT& Arg11,
+		const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, const VARIANT& Arg20, const VARIANT& Arg21,
 		const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29, const VARIANT& Arg30)
 {
 	LPDISPATCH result;
 	static BYTE parms[] =
-		VTS_DISPATCH VTS_DISPATCH VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT 
+		VTS_DISPATCH VTS_DISPATCH VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT
 		VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT;
 	InvokeHelper(0x30b, DISPATCH_METHOD, VT_DISPATCH, (void*)&result, parms,
 		Arg1, Arg2, &Arg3, &Arg4, &Arg5, &Arg6, &Arg7, &Arg8, &Arg9, &Arg10, &Arg11, &Arg12, &Arg13, &Arg14, &Arg15, &Arg16, &Arg17, &Arg18, &Arg19, &Arg20, &Arg21, &Arg22, &Arg23, &Arg24, &Arg25, &Arg26, &Arg27, &Arg28, &Arg29, &Arg30);
@@ -1285,7 +1285,7 @@ CString _Application::GetLibraryPath()
 	return result;
 }
 
-void _Application::MacroOptions(const VARIANT& Macro, const VARIANT& Description, const VARIANT& HasMenu, const VARIANT& MenuText, const VARIANT& HasShortcutKey, const VARIANT& ShortcutKey, const VARIANT& Category, const VARIANT& StatusBar, 
+void _Application::MacroOptions(const VARIANT& Macro, const VARIANT& Description, const VARIANT& HasMenu, const VARIANT& MenuText, const VARIANT& HasShortcutKey, const VARIANT& ShortcutKey, const VARIANT& Category, const VARIANT& StatusBar,
 		const VARIANT& HelpContextID, const VARIANT& HelpFile)
 {
 	static BYTE parms[] =
@@ -2683,7 +2683,7 @@ void _Workbook::Save()
 	InvokeHelper(0x11b, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
 }
 
-void _Workbook::SaveAs(const VARIANT& Filename, const VARIANT& FileFormat, const VARIANT& Password, const VARIANT& WriteResPassword, const VARIANT& ReadOnlyRecommended, const VARIANT& CreateBackup, long AccessMode, const VARIANT& ConflictResolution, 
+void _Workbook::SaveAs(const VARIANT& Filename, const VARIANT& FileFormat, const VARIANT& Password, const VARIANT& WriteResPassword, const VARIANT& ReadOnlyRecommended, const VARIANT& CreateBackup, long AccessMode, const VARIANT& ConflictResolution,
 		const VARIANT& AddToMru, const VARIANT& TextCodepage, const VARIANT& TextVisualLayout)
 {
 	static BYTE parms[] =
@@ -3178,7 +3178,7 @@ BOOL _Worksheet::GetProtectScenarios()
 	return result;
 }
 
-void _Worksheet::SaveAs(LPCTSTR Filename, const VARIANT& FileFormat, const VARIANT& Password, const VARIANT& WriteResPassword, const VARIANT& ReadOnlyRecommended, const VARIANT& CreateBackup, const VARIANT& AddToMru, const VARIANT& TextCodepage, 
+void _Worksheet::SaveAs(LPCTSTR Filename, const VARIANT& FileFormat, const VARIANT& Password, const VARIANT& WriteResPassword, const VARIANT& ReadOnlyRecommended, const VARIANT& CreateBackup, const VARIANT& AddToMru, const VARIANT& TextCodepage,
 		const VARIANT& TextVisualLayout)
 {
 	static BYTE parms[] =
@@ -3490,8 +3490,8 @@ LPDISPATCH _Worksheet::PivotTables(const VARIANT& Index)
 	return result;
 }
 
-LPDISPATCH _Worksheet::PivotTableWizard(const VARIANT& SourceType, const VARIANT& SourceData, const VARIANT& TableDestination, const VARIANT& TableName, const VARIANT& RowGrand, const VARIANT& ColumnGrand, const VARIANT& SaveData, 
-		const VARIANT& HasAutoFormat, const VARIANT& AutoPage, const VARIANT& Reserved, const VARIANT& BackgroundQuery, const VARIANT& OptimizeCache, const VARIANT& PageFieldOrder, const VARIANT& PageFieldWrapCount, const VARIANT& ReadData, 
+LPDISPATCH _Worksheet::PivotTableWizard(const VARIANT& SourceType, const VARIANT& SourceData, const VARIANT& TableDestination, const VARIANT& TableName, const VARIANT& RowGrand, const VARIANT& ColumnGrand, const VARIANT& SaveData,
+		const VARIANT& HasAutoFormat, const VARIANT& AutoPage, const VARIANT& Reserved, const VARIANT& BackgroundQuery, const VARIANT& OptimizeCache, const VARIANT& PageFieldOrder, const VARIANT& PageFieldWrapCount, const VARIANT& ReadData,
 		const VARIANT& Connection)
 {
 	LPDISPATCH result;
@@ -4116,7 +4116,7 @@ void Range::FillUp()
 	InvokeHelper(0xfb, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
 }
 
-LPDISPATCH Range::Find(const VARIANT& What, const VARIANT& After, const VARIANT& LookIn, const VARIANT& LookAt, const VARIANT& SearchOrder, long SearchDirection, const VARIANT& MatchCase, const VARIANT& MatchByte, 
+LPDISPATCH Range::Find(const VARIANT& What, const VARIANT& After, const VARIANT& LookIn, const VARIANT& LookAt, const VARIANT& SearchOrder, long SearchDirection, const VARIANT& MatchCase, const VARIANT& MatchByte,
 		const VARIANT& MatchControlCharacters, const VARIANT& MatchDiacritics, const VARIANT& MatchKashida, const VARIANT& MatchAlefHamza)
 {
 	LPDISPATCH result;
@@ -4700,7 +4700,7 @@ void Range::RemoveSubtotal()
 	InvokeHelper(0x373, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
 }
 
-BOOL Range::Replace(const VARIANT& What, const VARIANT& Replacement, const VARIANT& LookAt, const VARIANT& SearchOrder, const VARIANT& MatchCase, const VARIANT& MatchByte, const VARIANT& MatchControlCharacters, const VARIANT& MatchDiacritics, 
+BOOL Range::Replace(const VARIANT& What, const VARIANT& Replacement, const VARIANT& LookAt, const VARIANT& SearchOrder, const VARIANT& MatchCase, const VARIANT& MatchByte, const VARIANT& MatchControlCharacters, const VARIANT& MatchDiacritics,
 		const VARIANT& MatchKashida, const VARIANT& MatchAlefHamza)
 {
 	BOOL result;
@@ -4760,13 +4760,13 @@ LPDISPATCH Range::GetRows()
 	return result;
 }
 
-VARIANT Range::Run(const VARIANT& Arg1, const VARIANT& Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, const VARIANT& Arg10, 
-		const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, const VARIANT& Arg20, 
+VARIANT Range::Run(const VARIANT& Arg1, const VARIANT& Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, const VARIANT& Arg10,
+		const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, const VARIANT& Arg20,
 		const VARIANT& Arg21, const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29, const VARIANT& Arg30)
 {
 	VARIANT result;
 	static BYTE parms[] =
-		VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT 
+		VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT
 		VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT VTS_VARIANT;
 	InvokeHelper(0x103, DISPATCH_METHOD, VT_VARIANT, (void*)&result, parms,
 		&Arg1, &Arg2, &Arg3, &Arg4, &Arg5, &Arg6, &Arg7, &Arg8, &Arg9, &Arg10, &Arg11, &Arg12, &Arg13, &Arg14, &Arg15, &Arg16, &Arg17, &Arg18, &Arg19, &Arg20, &Arg21, &Arg22, &Arg23, &Arg24, &Arg25, &Arg26, &Arg27, &Arg28, &Arg29, &Arg30);
@@ -4834,7 +4834,7 @@ void Range::SetShrinkToFit(const VARIANT& newValue)
 		 &newValue);
 }
 
-void Range::Sort(const VARIANT& Key1, long Order1, const VARIANT& Key2, const VARIANT& Type, long Order2, const VARIANT& Key3, long Order3, long Header, const VARIANT& OrderCustom, const VARIANT& MatchCase, long Orientation, long SortMethod, 
+void Range::Sort(const VARIANT& Key1, long Order1, const VARIANT& Key2, const VARIANT& Type, long Order2, const VARIANT& Key3, long Order3, long Header, const VARIANT& OrderCustom, const VARIANT& MatchCase, long Orientation, long SortMethod,
 		const VARIANT& IgnoreControlCharacters, const VARIANT& IgnoreDiacritics, const VARIANT& IgnoreKashida)
 {
 	static BYTE parms[] =
@@ -4921,7 +4921,7 @@ VARIANT Range::GetText()
 	return result;
 }
 
-void Range::TextToColumns(const VARIANT& Destination, long DataType, long TextQualifier, const VARIANT& ConsecutiveDelimiter, const VARIANT& Tab, const VARIANT& Semicolon, const VARIANT& Comma, const VARIANT& Space, const VARIANT& Other, 
+void Range::TextToColumns(const VARIANT& Destination, long DataType, long TextQualifier, const VARIANT& ConsecutiveDelimiter, const VARIANT& Tab, const VARIANT& Semicolon, const VARIANT& Comma, const VARIANT& Space, const VARIANT& Other,
 		const VARIANT& OtherChar, const VARIANT& FieldInfo)
 {
 	static BYTE parms[] =
diff --git a/Core/Tools/Babylon/excel8.h b/Core/Tools/Babylon/excel8.h
index c6476dfbdb5..dc82a542b64 100644
--- a/Core/Tools/Babylon/excel8.h
+++ b/Core/Tools/Babylon/excel8.h
@@ -40,9 +40,9 @@ class Workbooks : public COleDispatchDriver
 	long GetCount();
 	LPDISPATCH GetItem(const VARIANT& Index);
 	LPUNKNOWN Get_NewEnum();
-	LPDISPATCH Open(LPCTSTR Filename, const VARIANT& UpdateLinks, const VARIANT& ReadOnly, const VARIANT& Format, const VARIANT& Password, const VARIANT& WriteResPassword, const VARIANT& IgnoreReadOnlyRecommended, const VARIANT& Origin, 
+	LPDISPATCH Open(LPCTSTR Filename, const VARIANT& UpdateLinks, const VARIANT& ReadOnly, const VARIANT& Format, const VARIANT& Password, const VARIANT& WriteResPassword, const VARIANT& IgnoreReadOnlyRecommended, const VARIANT& Origin,
 		const VARIANT& Delimiter, const VARIANT& Editable, const VARIANT& Notify, const VARIANT& Converter, const VARIANT& AddToMru);
-	void OpenText(LPCTSTR Filename, const VARIANT& Origin, const VARIANT& StartRow, const VARIANT& DataType, long TextQualifier, const VARIANT& ConsecutiveDelimiter, const VARIANT& Tab, const VARIANT& Semicolon, const VARIANT& Comma, 
+	void OpenText(LPCTSTR Filename, const VARIANT& Origin, const VARIANT& StartRow, const VARIANT& DataType, long TextQualifier, const VARIANT& ConsecutiveDelimiter, const VARIANT& Tab, const VARIANT& Semicolon, const VARIANT& Comma,
 		const VARIANT& Space, const VARIANT& Other, const VARIANT& OtherChar, const VARIANT& FieldInfo, const VARIANT& TextVisualLayout);
 	LPDISPATCH Get_Default(const VARIANT& Index);
 };
@@ -87,26 +87,26 @@ class _Application : public COleDispatchDriver
 	VARIANT Evaluate(const VARIANT& Name);
 	VARIANT _Evaluate(const VARIANT& Name);
 	VARIANT ExecuteExcel4Macro(LPCTSTR String);
-	LPDISPATCH Intersect(LPDISPATCH Arg1, LPDISPATCH Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, const VARIANT& Arg10, 
-		const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, const VARIANT& Arg20, 
+	LPDISPATCH Intersect(LPDISPATCH Arg1, LPDISPATCH Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, const VARIANT& Arg10,
+		const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, const VARIANT& Arg20,
 		const VARIANT& Arg21, const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29, const VARIANT& Arg30);
 	LPDISPATCH GetNames();
 	LPDISPATCH GetRange(const VARIANT& Cell1, const VARIANT& Cell2);
 	LPDISPATCH GetRows();
-	VARIANT Run(const VARIANT& Macro, const VARIANT& Arg1, const VARIANT& Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, 
-		const VARIANT& Arg10, const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, 
-		const VARIANT& Arg20, const VARIANT& Arg21, const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29, 
+	VARIANT Run(const VARIANT& Macro, const VARIANT& Arg1, const VARIANT& Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9,
+		const VARIANT& Arg10, const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19,
+		const VARIANT& Arg20, const VARIANT& Arg21, const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29,
 		const VARIANT& Arg30);
-	VARIANT _Run2(const VARIANT& Macro, const VARIANT& Arg1, const VARIANT& Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, 
-		const VARIANT& Arg10, const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, 
-		const VARIANT& Arg20, const VARIANT& Arg21, const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29, 
+	VARIANT _Run2(const VARIANT& Macro, const VARIANT& Arg1, const VARIANT& Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9,
+		const VARIANT& Arg10, const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19,
+		const VARIANT& Arg20, const VARIANT& Arg21, const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29,
 		const VARIANT& Arg30);
 	LPDISPATCH GetSelection();
 	void SendKeys(const VARIANT& Keys, const VARIANT& Wait);
 	LPDISPATCH GetSheets();
 	LPDISPATCH GetThisWorkbook();
-	LPDISPATCH Union(LPDISPATCH Arg1, LPDISPATCH Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, const VARIANT& Arg10, const VARIANT& Arg11, 
-		const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, const VARIANT& Arg20, const VARIANT& Arg21, 
+	LPDISPATCH Union(LPDISPATCH Arg1, LPDISPATCH Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, const VARIANT& Arg10, const VARIANT& Arg11,
+		const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, const VARIANT& Arg20, const VARIANT& Arg21,
 		const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29, const VARIANT& Arg30);
 	LPDISPATCH GetWindows();
 	LPDISPATCH GetWorkbooks();
@@ -218,7 +218,7 @@ class _Application : public COleDispatchDriver
 	double GetLeft();
 	void SetLeft(double newValue);
 	CString GetLibraryPath();
-	void MacroOptions(const VARIANT& Macro, const VARIANT& Description, const VARIANT& HasMenu, const VARIANT& MenuText, const VARIANT& HasShortcutKey, const VARIANT& ShortcutKey, const VARIANT& Category, const VARIANT& StatusBar, 
+	void MacroOptions(const VARIANT& Macro, const VARIANT& Description, const VARIANT& HasMenu, const VARIANT& MenuText, const VARIANT& HasShortcutKey, const VARIANT& ShortcutKey, const VARIANT& Category, const VARIANT& StatusBar,
 		const VARIANT& HelpContextID, const VARIANT& HelpFile);
 	void MailLogoff();
 	void MailLogon(const VARIANT& Name, const VARIANT& Password, const VARIANT& DownloadNewMail);
@@ -424,7 +424,7 @@ class _Workbook : public COleDispatchDriver
 	LPDISPATCH GetRoutingSlip();
 	void RunAutoMacros(long Which);
 	void Save();
-	void SaveAs(const VARIANT& Filename, const VARIANT& FileFormat, const VARIANT& Password, const VARIANT& WriteResPassword, const VARIANT& ReadOnlyRecommended, const VARIANT& CreateBackup, long AccessMode, const VARIANT& ConflictResolution, 
+	void SaveAs(const VARIANT& Filename, const VARIANT& FileFormat, const VARIANT& Password, const VARIANT& WriteResPassword, const VARIANT& ReadOnlyRecommended, const VARIANT& CreateBackup, long AccessMode, const VARIANT& ConflictResolution,
 		const VARIANT& AddToMru, const VARIANT& TextCodepage, const VARIANT& TextVisualLayout);
 	void SaveCopyAs(const VARIANT& Filename);
 	BOOL GetSaved();
@@ -508,7 +508,7 @@ class _Worksheet : public COleDispatchDriver
 	BOOL GetProtectDrawingObjects();
 	BOOL GetProtectionMode();
 	BOOL GetProtectScenarios();
-	void SaveAs(LPCTSTR Filename, const VARIANT& FileFormat, const VARIANT& Password, const VARIANT& WriteResPassword, const VARIANT& ReadOnlyRecommended, const VARIANT& CreateBackup, const VARIANT& AddToMru, const VARIANT& TextCodepage, 
+	void SaveAs(LPCTSTR Filename, const VARIANT& FileFormat, const VARIANT& Password, const VARIANT& WriteResPassword, const VARIANT& ReadOnlyRecommended, const VARIANT& CreateBackup, const VARIANT& AddToMru, const VARIANT& TextCodepage,
 		const VARIANT& TextVisualLayout);
 	void Select(const VARIANT& Replace);
 	void Unprotect(const VARIANT& Password);
@@ -550,8 +550,8 @@ class _Worksheet : public COleDispatchDriver
 	void Paste(const VARIANT& Destination, const VARIANT& Link);
 	void PasteSpecial(const VARIANT& Format, const VARIANT& Link, const VARIANT& DisplayAsIcon, const VARIANT& IconFileName, const VARIANT& IconIndex, const VARIANT& IconLabel);
 	LPDISPATCH PivotTables(const VARIANT& Index);
-	LPDISPATCH PivotTableWizard(const VARIANT& SourceType, const VARIANT& SourceData, const VARIANT& TableDestination, const VARIANT& TableName, const VARIANT& RowGrand, const VARIANT& ColumnGrand, const VARIANT& SaveData, 
-		const VARIANT& HasAutoFormat, const VARIANT& AutoPage, const VARIANT& Reserved, const VARIANT& BackgroundQuery, const VARIANT& OptimizeCache, const VARIANT& PageFieldOrder, const VARIANT& PageFieldWrapCount, const VARIANT& ReadData, 
+	LPDISPATCH PivotTableWizard(const VARIANT& SourceType, const VARIANT& SourceData, const VARIANT& TableDestination, const VARIANT& TableName, const VARIANT& RowGrand, const VARIANT& ColumnGrand, const VARIANT& SaveData,
+		const VARIANT& HasAutoFormat, const VARIANT& AutoPage, const VARIANT& Reserved, const VARIANT& BackgroundQuery, const VARIANT& OptimizeCache, const VARIANT& PageFieldOrder, const VARIANT& PageFieldWrapCount, const VARIANT& ReadData,
 		const VARIANT& Connection);
 	LPDISPATCH GetRange(const VARIANT& Cell1, const VARIANT& Cell2);
 	LPDISPATCH GetRows();
@@ -653,7 +653,7 @@ class Range : public COleDispatchDriver
 	void FillLeft();
 	void FillRight();
 	void FillUp();
-	LPDISPATCH Find(const VARIANT& What, const VARIANT& After, const VARIANT& LookIn, const VARIANT& LookAt, const VARIANT& SearchOrder, long SearchDirection, const VARIANT& MatchCase, const VARIANT& MatchByte, 
+	LPDISPATCH Find(const VARIANT& What, const VARIANT& After, const VARIANT& LookIn, const VARIANT& LookAt, const VARIANT& SearchOrder, long SearchDirection, const VARIANT& MatchCase, const VARIANT& MatchByte,
 		const VARIANT& MatchControlCharacters, const VARIANT& MatchDiacritics, const VARIANT& MatchKashida, const VARIANT& MatchAlefHamza);
 	LPDISPATCH FindNext(const VARIANT& After);
 	LPDISPATCH FindPrevious(const VARIANT& After);
@@ -731,7 +731,7 @@ class Range : public COleDispatchDriver
 	LPDISPATCH GetQueryTable();
 	LPDISPATCH GetRange(const VARIANT& Cell1, const VARIANT& Cell2);
 	void RemoveSubtotal();
-	BOOL Replace(const VARIANT& What, const VARIANT& Replacement, const VARIANT& LookAt, const VARIANT& SearchOrder, const VARIANT& MatchCase, const VARIANT& MatchByte, const VARIANT& MatchControlCharacters, const VARIANT& MatchDiacritics, 
+	BOOL Replace(const VARIANT& What, const VARIANT& Replacement, const VARIANT& LookAt, const VARIANT& SearchOrder, const VARIANT& MatchCase, const VARIANT& MatchByte, const VARIANT& MatchControlCharacters, const VARIANT& MatchDiacritics,
 		const VARIANT& MatchKashida, const VARIANT& MatchAlefHamza);
 	LPDISPATCH GetResize(const VARIANT& RowSize, const VARIANT& ColumnSize);
 	long GetRow();
@@ -739,8 +739,8 @@ class Range : public COleDispatchDriver
 	VARIANT GetRowHeight();
 	void SetRowHeight(const VARIANT& newValue);
 	LPDISPATCH GetRows();
-	VARIANT Run(const VARIANT& Arg1, const VARIANT& Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, const VARIANT& Arg10, 
-		const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, const VARIANT& Arg20, 
+	VARIANT Run(const VARIANT& Arg1, const VARIANT& Arg2, const VARIANT& Arg3, const VARIANT& Arg4, const VARIANT& Arg5, const VARIANT& Arg6, const VARIANT& Arg7, const VARIANT& Arg8, const VARIANT& Arg9, const VARIANT& Arg10,
+		const VARIANT& Arg11, const VARIANT& Arg12, const VARIANT& Arg13, const VARIANT& Arg14, const VARIANT& Arg15, const VARIANT& Arg16, const VARIANT& Arg17, const VARIANT& Arg18, const VARIANT& Arg19, const VARIANT& Arg20,
 		const VARIANT& Arg21, const VARIANT& Arg22, const VARIANT& Arg23, const VARIANT& Arg24, const VARIANT& Arg25, const VARIANT& Arg26, const VARIANT& Arg27, const VARIANT& Arg28, const VARIANT& Arg29, const VARIANT& Arg30);
 	void Select();
 	void Show();
@@ -751,7 +751,7 @@ class Range : public COleDispatchDriver
 	void ShowPrecedents(const VARIANT& Remove);
 	VARIANT GetShrinkToFit();
 	void SetShrinkToFit(const VARIANT& newValue);
-	void Sort(const VARIANT& Key1, long Order1, const VARIANT& Key2, const VARIANT& Type, long Order2, const VARIANT& Key3, long Order3, long Header, const VARIANT& OrderCustom, const VARIANT& MatchCase, long Orientation, long SortMethod, 
+	void Sort(const VARIANT& Key1, long Order1, const VARIANT& Key2, const VARIANT& Type, long Order2, const VARIANT& Key3, long Order3, long Header, const VARIANT& OrderCustom, const VARIANT& MatchCase, long Orientation, long SortMethod,
 		const VARIANT& IgnoreControlCharacters, const VARIANT& IgnoreDiacritics, const VARIANT& IgnoreKashida);
 	void SortSpecial(long SortMethod, const VARIANT& Key1, long Order1, const VARIANT& Type, const VARIANT& Key2, long Order2, const VARIANT& Key3, long Order3, long Header, const VARIANT& OrderCustom, const VARIANT& MatchCase, long Orientation);
 	LPDISPATCH GetSoundNote();
@@ -763,7 +763,7 @@ class Range : public COleDispatchDriver
 	VARIANT GetSummary();
 	void Table(const VARIANT& RowInput, const VARIANT& ColumnInput);
 	VARIANT GetText();
-	void TextToColumns(const VARIANT& Destination, long DataType, long TextQualifier, const VARIANT& ConsecutiveDelimiter, const VARIANT& Tab, const VARIANT& Semicolon, const VARIANT& Comma, const VARIANT& Space, const VARIANT& Other, 
+	void TextToColumns(const VARIANT& Destination, long DataType, long TextQualifier, const VARIANT& ConsecutiveDelimiter, const VARIANT& Tab, const VARIANT& Semicolon, const VARIANT& Comma, const VARIANT& Space, const VARIANT& Other,
 		const VARIANT& OtherChar, const VARIANT& FieldInfo);
 	VARIANT GetTop();
 	void Ungroup();
diff --git a/Core/Tools/Babylon/expimp.cpp b/Core/Tools/Babylon/expimp.cpp
index b5e03c534d6..1b933889d38 100644
--- a/Core/Tools/Babylon/expimp.cpp
+++ b/Core/Tools/Babylon/expimp.cpp
@@ -253,7 +253,7 @@ static int export_trans ( TransDB *db, LangID langid, TROPTIONS *options, void (
 	{
 		int label_written = FALSE;
 		text = label->FirstText ( sh_text );
-		
+
 		while ( text )
 		{
 			int do_export;
@@ -344,7 +344,7 @@ static int export_trans ( TransDB *db, LangID langid, TROPTIONS *options, void (
 
 						if ( langid == LANGID_JABBER || (trans && ( options->include_translations || too_long || bad_format )))
 						{
-						
+
 							if ( langid == LANGID_JABBER )
 							{
 								translateCopy ( olebuf, text->Get() );
@@ -571,7 +571,7 @@ static int import_trans ( TransDB *db, LangID langid, void (*cb) ( void ), CBaby
 		}
 
 		revision = GetInt ( row, CELL_REVISION );
-				
+
 		if ( text->Revision() > revision )
 		{
 			// old translation
@@ -589,7 +589,7 @@ static int import_trans ( TransDB *db, LangID langid, void (*cb) ( void ), CBaby
 			error_count++;
 			goto next;
 		}
-				
+
 		// first see if there is any translation there
 		GetString ( row, CELL_LOCALIZED, oletrans );
 		DecodeFormat ( oletrans );
@@ -603,13 +603,13 @@ static int import_trans ( TransDB *db, LangID langid, void (*cb) ( void ), CBaby
 		// verify that the translated engish is the same as the current english
 		GetString ( row, CELL_ENGLISH, olebuf );
 		DecodeFormat ( olebuf );
-		
+
 		if ( wcscmp ( text->Get(), olebuf ) )
 		{
 			// they are two possible reasons for the text to mismatch
 			// 1. text was modified but not re-translated
 			// 2. the IDs are wrong
-			// 
+			//
 			// to check for the first case we search for the label in the xl file
 			// and make sure it is the same. If not then we have problems
 
@@ -632,11 +632,11 @@ static int import_trans ( TransDB *db, LangID langid, void (*cb) ( void ), CBaby
 				sprintf ( buffer, "%S", olebuf );
 				CVerifyTextDlg dlg(buffer, text->GetSB());
 
-				// didnt find label or label doesn't match 
+				// didnt find label or label doesn't match
 				// It is possible that the xl was resorted so ask user to do a visual confirmation
 
 				bad_id = dlg.DoModal ()==IDNO;
-			} 
+			}
 			else if ( text->Label()->FindText( olebuf ))
 			{
 				// we did find the label but text other than the current ID sourced text matches with the import text
@@ -658,17 +658,17 @@ static int import_trans ( TransDB *db, LangID langid, void (*cb) ( void ), CBaby
 		// ok import the translation
 
 		Translation *trans;
-						
+
 		if ( ! (trans = text->GetTranslation ( langid )))
 		{
 				new_count++;
-		
+
 				trans = new Translation	 ();
 				trans->SetLangID ( langid );
 				text->AddTranslation ( trans );
 		}
-		
-		
+
+
 		if ( trans->Revision () == revision && !wcscmp ( trans->Get (), oletrans ))
 		{
 			// already up to date
@@ -679,11 +679,11 @@ static int import_trans ( TransDB *db, LangID langid, void (*cb) ( void ), CBaby
 		trans->WaveInfo.SetValid ( FALSE );
 		trans->SetRevision ( revision );
 		changes_count++;
-		
 
-		next:				
+
+		next:
 				count++;
-				
+
 				if ( cb )
 				{
 					cb ();
@@ -765,7 +765,7 @@ static int update_sent_trans ( TransDB *db, LangID langid, void (*cb) ( void ),
 		}
 
 		revision = GetInt ( row, CELL_REVISION );
-				
+
 		if ( text->Revision() > revision )
 		{
 			// old translation
@@ -784,17 +784,17 @@ static int update_sent_trans ( TransDB *db, LangID langid, void (*cb) ( void ),
 			goto next;
 		}
 
-				
+
 		// verify that the translated engish is the same as the current english
 		GetString ( row, CELL_ENGLISH, olebuf );
 		DecodeFormat ( olebuf );
-		
+
 		if ( wcscmp ( text->Get(), olebuf ) )
 		{
 			// they are two possible reasons for the text to mismatch
 			// 1. text was modified but not re-translated
 			// 2. the IDs are wrong
-			// 
+			//
 			// to check for the first case we search for the label in the xl file
 			// and make sure it is the same. If not then we have problems
 
@@ -817,11 +817,11 @@ static int update_sent_trans ( TransDB *db, LangID langid, void (*cb) ( void ),
 				sprintf ( buffer, "%S", olebuf );
 				CVerifyTextDlg dlg(buffer, text->GetSB());
 
-				// didnt find label or label doesn't match 
+				// didnt find label or label doesn't match
 				// It is possible that the xl was resorted so ask user to do a visual confirmation
 
 				bad_id = dlg.DoModal ()==IDNO;
-			} 
+			}
 			else if ( text->Label()->FindText( olebuf ))
 			{
 				// we did find the label but text other than the current ID sourced text matches with the import text
@@ -847,9 +847,9 @@ static int update_sent_trans ( TransDB *db, LangID langid, void (*cb) ( void ),
 
 		}
 
-		next:				
+		next:
 				count++;
-				
+
 				if ( cb )
 				{
 					cb ();
@@ -982,13 +982,13 @@ static int generate_Babylonstr ( TransDB *db, const char *filename, LangID langi
 		ListSearch sh_label, sh_text;
 
 		label = db->FirstLabel ( sh_label );
-	
+
 		while ( label )
 		{
 			text = label->FirstText ( sh_text );
-		
+
 			fprintf ( file, "\n\n%s\n", label->NameSB ());
-				
+
 			while ( text )
 			{
 				const char *string;
@@ -1034,7 +1034,7 @@ static int generate_Babylonstr ( TransDB *db, const char *filename, LangID langi
 				fprintf ( file, "\"%s\" %s\n", string, text->WaveSB() );
 				text = label->NextText ( sh_text );
 			}
-	
+
 			fprintf ( file, "END\n" );
 			label = db->NextLabel ( sh_label );
 		}
@@ -1095,7 +1095,7 @@ static int writeCSFString ( FILE *file, const OLECHAR *string, char *wave, LANGI
 	{
 		id = CSF_STRINGWITHWAVE;
 	}
-	
+
 	wcscpy ( olebuf, string );
 	StripSpaces ( olebuf );
 	ConvertMetaChars ( olebuf );
@@ -1135,7 +1135,7 @@ static int writeCSFString ( FILE *file, const OLECHAR *string, char *wave, LANGI
 		{
 			return FALSE;
 		}
-		
+
 		if ( fwrite ( wave, wlen-1, 1, file ) != 1 )
 		{
 			return FALSE;
@@ -1178,17 +1178,17 @@ static int generate_csf ( TransDB *db, const char *filename, LangID langid, GNOP
 		ListSearch sh_label, sh_text;
 
 		label = db->FirstLabel ( sh_label );
-	
+
 		while ( label )
 		{
 			text = label->FirstText ( sh_text );
-		
+
 			if ( !writeCSFLabel ( file, label ) )
 			{
 				goto error;
 			}
 			header.num_labels++;
-				
+
 			while ( text )
 			{
 				const OLECHAR *string;
@@ -1234,7 +1234,7 @@ static int generate_csf ( TransDB *db, const char *filename, LangID langid, GNOP
 
 				text = label->NextText ( sh_text );
 			}
-	
+
 			label = db->NextLabel ( sh_label );
 		}
 
@@ -1408,7 +1408,7 @@ void ProcessWaves ( TransDB *db, const char *filename, CBabylonDlg *dlg )
 		int last_row = 1;
 		int matches = 0;
 		int unmatched = 0;
-		FILE *file = NULL; 
+		FILE *file = NULL;
 		char *ptr;
 
 		strcpy ( buffer, filename );
@@ -1543,7 +1543,7 @@ int GenerateReport ( TransDB *db, const char *filename, RPOPTIONS *options, Lang
 			int count;
 
 			count = db->ReportTranslations ( &tr_report, langid );
-			
+
 			fprintf ( file, "\n\tText Summary: %s\n", info->name );
 			fprintf ( file,   "\t-------------\n\n");
 
@@ -1571,7 +1571,7 @@ int GenerateReport ( TransDB *db, const char *filename, RPOPTIONS *options, Lang
 			int count;
 
 			count = db->ReportDialog ( &dlg_report, langid );
-			
+
 			fprintf ( file, "\n\tDialog Summary: %s\n", info->name );
 			fprintf ( file,   "\t-------------\n\n");
 
diff --git a/Core/Tools/Babylon/expimp.h b/Core/Tools/Babylon/expimp.h
index 109ecb1b091..b15d0252dc9 100644
--- a/Core/Tools/Babylon/expimp.h
+++ b/Core/Tools/Babylon/expimp.h
@@ -20,8 +20,7 @@
 // expimp.h
 //
 
-#ifndef __EXPIMP_H
-#define __EXPIMP_H
+#pragma once
 
 #include "TransDB.h"
 #include "BabylonDlg.h"
@@ -38,7 +37,7 @@ typedef enum
 	TR_UNSENT
 } TrFilter;
 
-typedef struct 
+typedef struct
 {
 	TrFilter filter;
 	int include_comments;
@@ -58,14 +57,14 @@ typedef enum
 	GN_USEORIGINAL,
 } GnUntranslated;
 
-typedef struct 
+typedef struct
 {
 	GnFormat	format;								// what file format to generate
 	GnUntranslated untranslated;		// what to do with untranslated text
 
 } GNOPTIONS;
 
-typedef struct 
+typedef struct
 {
 	int translations;
 	int dialog;
@@ -86,7 +85,7 @@ typedef struct
 	int version;
 	int num_labels;
 	int num_strings;
-	int skip;	
+	int skip;
 
 } CSF_HEADER_V1;
 
@@ -96,7 +95,7 @@ typedef struct
 	int version;
 	int num_labels;
 	int num_strings;
-	int skip;	
+	int skip;
 	int langid;
 
 } CSF_HEADER;
@@ -107,4 +106,3 @@ int UpdateSentTranslations ( TransDB *db, const char *filename, CBabylonDlg *dlg
 int GenerateGameFiles ( TransDB *db, const char *filename, GNOPTIONS *option, LangID *languages, CBabylonDlg *dlg = NULL );
 int GenerateReport ( TransDB *db, const char *filename, RPOPTIONS *options, LangID *languages, CBabylonDlg *dlg = NULL );
 void ProcessWaves ( TransDB *db, const char *filename, CBabylonDlg *dlg );
-#endif
\ No newline at end of file
diff --git a/Core/Tools/Babylon/fileops.cpp b/Core/Tools/Babylon/fileops.cpp
index 50bd57ae1df..f4735995b18 100644
--- a/Core/Tools/Babylon/fileops.cpp
+++ b/Core/Tools/Babylon/fileops.cpp
@@ -69,7 +69,7 @@ static void make_bk_name ( char *bkname, const char *filename )
 	char *ext1;
 
 	strcpy ( bkname, filename );
-	
+
 	ext = strchr ( filename, '.' );
 	ext1 = strchr ( bkname, '.' );
 
@@ -88,7 +88,7 @@ static void make_bk_name ( char *bkname, const char *filename )
 void	MakeBackupFile ( const char *filename )
 {
 	char bkname[256];
-	
+
 	make_bk_name ( bkname, filename );
 
 	CopyFile ( filename, bkname, FALSE );
@@ -98,7 +98,7 @@ void	MakeBackupFile ( const char *filename )
 void	RestoreBackupFile ( const char *filename )
 {
 	char bkname[256];
-	
+
 	make_bk_name ( bkname, filename );
 
 	if ( FileExists ( bkname ))
@@ -106,4 +106,4 @@ void	RestoreBackupFile ( const char *filename )
 		CopyFile ( bkname, filename, FALSE );
 	}
 
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/Babylon/fileops.h b/Core/Tools/Babylon/fileops.h
index 44dd09ef6ab..11a6bc09470 100644
--- a/Core/Tools/Babylon/fileops.h
+++ b/Core/Tools/Babylon/fileops.h
@@ -20,8 +20,7 @@
 // File IO support
 //
 
-#ifndef __FILEOPS_H
-#define __FILEOPS_H
+#pragma once
 
 static const int FA_NOFILE = 0;
 static const int 	FA_READONLY = 0x00000001;
@@ -33,6 +32,3 @@ int							FileExists ( const char *filename );
 int					 		FileAttribs ( const char *filename );
 void						MakeBackupFile ( const char *filename );
 void						RestoreBackupFile ( const char *filename );
-
-
-#endif		// __FILEIO_H
\ No newline at end of file
diff --git a/Core/Tools/Babylon/iff.cpp b/Core/Tools/Babylon/iff.cpp
index 9acf0af6949..d8fc596717b 100644
--- a/Core/Tools/Babylon/iff.cpp
+++ b/Core/Tools/Babylon/iff.cpp
@@ -20,7 +20,7 @@
 #include "StdAfx.h"
 #include "sys/stat.h"
 #include "iff.h"
-#include <fcntl.h>      
+#include <fcntl.h>
 #include <io.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -459,7 +459,7 @@ int		IFF_Write ( IFF_FILE *iff, void *buff, int size )
 	int	val =0;
 
 	val = _write ( iff->fp, buff, size);
-								
+
 	if (val==-1)
 	{
 		val = 0;
diff --git a/Core/Tools/Babylon/iff.h b/Core/Tools/Babylon/iff.h
index c79d500fd19..7d1860032d2 100644
--- a/Core/Tools/Babylon/iff.h
+++ b/Core/Tools/Babylon/iff.h
@@ -16,9 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-#ifndef __IFF_H
-#define __IFF_H
+#pragma once
 
 #define	MakeID(a,b,c,d)		( (int) ( ( (int) (a) ) << 24 | ( (int) (b) ) << 16 |	\
 								( (int) (c) ) << 8 | ( (int) (d) ) ) )
@@ -122,6 +120,3 @@ int					IFF_CloseChunk ( IFF_FILE * );
 	#define	LtEn16(L)	(L)
 
 #endif
-
-
-#endif	/* __IFF_H */
diff --git a/Core/Tools/Babylon/list.cpp b/Core/Tools/Babylon/list.cpp
index 9dc7dc2c320..738a78f3d4f 100644
--- a/Core/Tools/Babylon/list.cpp
+++ b/Core/Tools/Babylon/list.cpp
@@ -222,11 +222,11 @@ void				List::Merge			( List *list )
 	{
 		return;
 	}
-	
+
 	node = Prev();
 	node->Link ( first );
 	last->Link ( this );
-	
+
 	list->Empty ();
 
 }
diff --git a/Core/Tools/Babylon/list.h b/Core/Tools/Babylon/list.h
index 697e288b4d9..944ae2b74b2 100644
--- a/Core/Tools/Babylon/list.h
+++ b/Core/Tools/Babylon/list.h
@@ -16,10 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-#ifndef	__LIST_H
-#define	__LIST_H
-
+#pragma once
 
 const int LOWEST_PRIORITY = (int ) 0x80000000;
 const	int HIGHEST_PRIORITY = (int) 0x7fffffff;
@@ -90,6 +87,3 @@ class ListSearch
 	ListNode*		LastNode ( List *new_head) { node = head = new_head; return Prev (); };
 
 };
-
-
-#endif	//	__LIST_H 
diff --git a/Core/Tools/Babylon/loadsave.cpp b/Core/Tools/Babylon/loadsave.cpp
index cc4ad94f183..e3a7c30ebbd 100644
--- a/Core/Tools/Babylon/loadsave.cpp
+++ b/Core/Tools/Babylon/loadsave.cpp
@@ -42,34 +42,34 @@
 #define MAX_BUFFER			(100*1024)
 
 static OLECHAR	buffer[MAX_BUFFER];
-typedef struct 
+typedef struct
 {
 	int num_labels;
 	int next_id;
 
 } DBINFO;
 
-typedef struct 
+typedef struct
 {
 	int max_len;
 
 } LBINFO;
 
-typedef struct 
+typedef struct
 {
 	int id;
 	int revision;
 
 } TXINFO;
 
-typedef struct 
+typedef struct
 {
 	LangID lang;
 	int revision;
 
 } TRINFO;
 
-typedef struct 
+typedef struct
 {
 	int valid;
 	DWORD lo;
@@ -121,17 +121,17 @@ static int writeTransForm ( IFF_FILE *iff, Translation *trans )
 			{
 				goto error;
 			}
-	
+
 			trinfo.lang = trans->GetLangID ();
 			trinfo.revision = trans->Revision ();
-	
+
 			if ( !IFF_NewChunk ( iff, CHUNK_INFO ))
 			{
 				goto error;
 			}
-			
+
 			IFF_Write ( iff, &trinfo, sizeof ( trinfo ));
-			
+
 			IFF_CloseChunk ( iff );
 
 			writeString ( iff, trans->Get (), CHUNK_TEXT );
@@ -141,14 +141,14 @@ static int writeTransForm ( IFF_FILE *iff, Translation *trans )
 			{
 				wvinfo.lo = trans->WaveInfo.Lo ();
 				wvinfo.hi = trans->WaveInfo.Hi ();
-				
+
 				if ( !IFF_NewChunk ( iff, CHUNK_WAVE_INFO ))
 				{
 					goto error;
 				}
-				
+
 				IFF_Write ( iff, &wvinfo, sizeof ( wvinfo ));
-				
+
 				IFF_CloseChunk ( iff );
 			}
 
@@ -170,17 +170,17 @@ static int writeTextForm ( IFF_FILE *iff, BabylonText *text )
 			{
 				goto error;
 			}
-	
+
 			txinfo.id = text->ID ();
 			txinfo.revision = text->Revision ();
-	
+
 			if ( !IFF_NewChunk ( iff, CHUNK_INFO ))
 			{
 				goto error;
 			}
-			
+
 			IFF_Write ( iff, &txinfo, sizeof ( txinfo ));
-			
+
 			IFF_CloseChunk ( iff );
 			writeString ( iff, text->Get (), CHUNK_TEXT );
 			writeString ( iff, text->Wave (), CHUNK_WAVE );
@@ -189,14 +189,14 @@ static int writeTextForm ( IFF_FILE *iff, BabylonText *text )
 			{
 				wvinfo.lo = text->WaveInfo.Lo ();
 				wvinfo.hi = text->WaveInfo.Hi ();
-				
+
 				if ( !IFF_NewChunk ( iff, CHUNK_WAVE_INFO ))
 				{
 					goto error;
 				}
-				
+
 				IFF_Write ( iff, &wvinfo, sizeof ( wvinfo ));
-				
+
 				IFF_CloseChunk ( iff );
 			}
 
@@ -221,7 +221,7 @@ int WriteMainDB(TransDB *db, const char *filename, CBabylonDlg *dlg )
 	int ok = FALSE;
 
 	if ( dlg )
-	{								 
+	{
 		dlg->InitProgress ( db->NumLabels ());
 	}
 
@@ -235,7 +235,7 @@ int WriteMainDB(TransDB *db, const char *filename, CBabylonDlg *dlg )
 	{
 		goto error;
 	}
-	
+
 	dbinfo.next_id = db->ID ();
 	dbinfo.num_labels = db->NumLabels ();
 
@@ -256,11 +256,11 @@ int WriteMainDB(TransDB *db, const char *filename, CBabylonDlg *dlg )
 		if ( !writeTextForm ( iff, text ) )
 		{
 				goto error;
-		}	
+		}
 		text = db->NextObsolete ( sh_text );
 	}
 
-	
+
 
 	label = db->FirstLabel ( sh_label );
 
@@ -279,9 +279,9 @@ int WriteMainDB(TransDB *db, const char *filename, CBabylonDlg *dlg )
 		{
 			goto error;
 		}
-		
+
 		IFF_Write ( iff, &lbinfo, sizeof ( lbinfo ));
-		
+
 		IFF_CloseChunk ( iff );
 
 		writeString ( iff, label->Name (), CHUNK_NAME );
@@ -301,7 +301,7 @@ int WriteMainDB(TransDB *db, const char *filename, CBabylonDlg *dlg )
 			{
 				goto error;
 			}
-			
+
 			trans = text->FirstTranslation ( sh_trans );
 
 			while ( trans )
@@ -327,7 +327,7 @@ int WriteMainDB(TransDB *db, const char *filename, CBabylonDlg *dlg )
 
 	ok = TRUE;
 	db->ClearChanges ();
-		
+
 error:
 	if ( iff )
 	{
@@ -580,23 +580,12 @@ int LoadMainDB(TransDB *db, const char *filename, void (*cb) (void) )
 	}
 
 	ok = TRUE;
-		
-error:
 
-	if ( label )
-	{
-		delete label;
-	}
-
-	if ( text )
-	{
-		delete text;
-	}
+error:
 
-	if ( trans )
-	{
-		delete trans;
-	}
+	delete label;
+	delete text;
+	delete trans;
 
 	if ( iff )
 	{
@@ -653,4 +642,4 @@ int	GetLabelCountDB ( char *filename )
 		IFF_Close ( iff );
 	}
 	return count;
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/Babylon/loadsave.h b/Core/Tools/Babylon/loadsave.h
index b5445cf768a..cde180af921 100644
--- a/Core/Tools/Babylon/loadsave.h
+++ b/Core/Tools/Babylon/loadsave.h
@@ -20,12 +20,8 @@
 // loadsave.h
 //
 
-#ifndef __LOADSAVE_H
-#define __LOADSAVE_H
+#pragma once
 
 int WriteMainDB(TransDB *db, const char *filename, CBabylonDlg *dlg );
 int LoadMainDB(TransDB *db, const char *filename, void (*cb) (void ) = NULL );
 int	GetLabelCountDB ( char *filename );
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/Babylon/olestring.cpp b/Core/Tools/Babylon/olestring.cpp
index f797bb04f80..1d5cd26a75c 100644
--- a/Core/Tools/Babylon/olestring.cpp
+++ b/Core/Tools/Babylon/olestring.cpp
@@ -90,7 +90,7 @@ void OLEString::Set ( OLECHAR *new_ole )
 		delete [] sb;
 		ole = NULL;
 		sb = NULL;
-		
+
 		len = wcslen ( new_ole );
 		{
 			ole = new OLECHAR[len+1];
@@ -111,9 +111,9 @@ void OLEString::Set ( const char *new_sb )
 		delete [] sb;
 		ole = NULL;
 		sb = NULL;
-		
+
 		len = strlen ( new_sb );
-		
+
 		{
 			ole = new OLECHAR[len+1];
 			swprintf ( ole, L"%S", new_sb );
@@ -236,7 +236,7 @@ template <typename text> void StripSpaces ( text *string )
 					str--;
 				}
 
-				skipall = TRUE;		// skip all spaces 
+				skipall = TRUE;		// skip all spaces
 				last = *str++ = ch;
 				continue;
 		}
@@ -287,7 +287,7 @@ template <typename text> void StripSpacesFromMetaString ( text *string )
 						str--;
 					}
 
-					skipall = TRUE;		// skip all spaces 
+					skipall = TRUE;		// skip all spaces
 					*str++ = '\\';
 					ptr++;
 					last = *str++ = esc;
@@ -403,11 +403,11 @@ template <typename text> int SameFormat ( text *string1, text *string2 )
 			{
 				return FALSE;
 			}
-		
+
 			string1++;
 			string2++;
 		}
-		
+
 	}
 	return TRUE;
 }
diff --git a/Core/Tools/Babylon/olestring.h b/Core/Tools/Babylon/olestring.h
index d9e5888bcb5..1e3dd2908dd 100644
--- a/Core/Tools/Babylon/olestring.h
+++ b/Core/Tools/Babylon/olestring.h
@@ -20,14 +20,13 @@
 // OLEString
 //
 
-#ifndef __OLESTRING_H
-#define __OLESTRING_H
+#pragma once
 
 const unsigned int OLESTRING_DEFAULT_SIZE = 256;
 
 class OLEString
 {
-	
+
 	OLECHAR								*ole;
 	char									*sb;
 	unsigned int					len;
@@ -55,7 +54,3 @@ template <typename text> int SameFormat ( text *string1, text *string2 );
 template <typename text> void EncodeFormat ( text *string );
 template <typename text> void DecodeFormat ( text *string );
 template <typename text> int IsFormatTypeChar(  text string1 );
-
-
-
-#endif // __OLESTRING_H
\ No newline at end of file
diff --git a/Core/Tools/Babylon/resource.h b/Core/Tools/Babylon/resource.h
index a0bb360bf1a..455e3c18b61 100644
--- a/Core/Tools/Babylon/resource.h
+++ b/Core/Tools/Babylon/resource.h
@@ -110,7 +110,7 @@
 #define IDC_OLDTEXT                     1070
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        151
diff --git a/Core/Tools/Babylon/transcs.cpp b/Core/Tools/Babylon/transcs.cpp
index 7bdbb222436..7ceac2359f0 100644
--- a/Core/Tools/Babylon/transcs.cpp
+++ b/Core/Tools/Babylon/transcs.cpp
@@ -30,7 +30,7 @@
 
 void CreateTranslationTable ( void )
 {
-	int i; 
+	int i;
 	FILE *out;
 	wchar_t wc;
 	wchar_t mb;
diff --git a/Core/Tools/Babylon/transcs.h b/Core/Tools/Babylon/transcs.h
index f0a6c5de3fc..559fa4f7eb0 100644
--- a/Core/Tools/Babylon/transcs.h
+++ b/Core/Tools/Babylon/transcs.h
@@ -20,10 +20,6 @@
 // transcs.h Translate char set
 //
 
-#ifndef _TRANSCS_H
-#define _TRANSCS_H
-
+#pragma once
 
 void CreateTranslationTable ( void );
-
-#endif // _TRANSCS_H
diff --git a/Core/Tools/CRCDiff/CRCDiff.cpp b/Core/Tools/CRCDiff/CRCDiff.cpp
index 8a569012be1..62d57e993cb 100644
--- a/Core/Tools/CRCDiff/CRCDiff.cpp
+++ b/Core/Tools/CRCDiff/CRCDiff.cpp
@@ -43,7 +43,7 @@ static void exitWait(void)
 static bool getNextLine(FILE *fp, char *line, int& frame, int& index) {
 	if (!fp)
 		return false;
-	
+
 	char buf[LINESIZE];
 	while (fgets(buf, LINESIZE-1, fp) != NULL)
 	{
@@ -56,7 +56,7 @@ static bool getNextLine(FILE *fp, char *line, int& frame, int& index) {
 			return true;
 		}
 	}
-	
+
 	fclose(fp);
 	return false;
 }
@@ -74,7 +74,7 @@ static std::string readInFile(const char *fname) {
 	{
 		ret.append(buf);
 	}
-	
+
 	fclose(fp);
 	return ret;
 }
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
 		inFname[1] = argv[5];
 		outFname = argv[6];
 	}
-	
+
 	ifp[0] = fopen(inFname[0], "rt");
 	if (!ifp[0])
 	{
@@ -226,9 +226,9 @@ int main(int argc, char *argv[])
 		cout << "could not open " << inFname[1] << endl;
 		return 1;
 	}
-	
+
 	ofp = fopen(outFname, "wt");
-	
+
 	char lastLine[2][LINESIZE];
 	int lastFrame[2] = {-1, -1};
 	int lastIndex[2] = {-1, -1};
@@ -252,7 +252,7 @@ int main(int argc, char *argv[])
 					lastFrame[i], lastIndex[i]);
 			}
 		}
-		
+
 		if (fileOk[0] && fileOk[1])
 		{
 			if (lastFrame[0] < lastFrame[1] ||
@@ -358,11 +358,11 @@ int main(int argc, char *argv[])
 	std::string out;
 	e.expand(footer, out);
 	outputLine(out.c_str());
-	
+
 	if (ofp)
 	{
 		fclose(ofp);
 	}
-	
+
 	return 0;
 }
diff --git a/Core/Tools/CRCDiff/KVPair.cpp b/Core/Tools/CRCDiff/KVPair.cpp
index 4aa7c4a968c..bd7b396195d 100644
--- a/Core/Tools/CRCDiff/KVPair.cpp
+++ b/Core/Tools/CRCDiff/KVPair.cpp
@@ -31,7 +31,7 @@
 
 std::string intToString(int val)
 {
-	std::string s = "";
+	std::string s;
 	bool neg = (val < 0);
 	if (val < 0)
 	{
@@ -134,7 +134,7 @@ void KVPairClass::readFromFile( const std::string& in, const std::string& delim
 	FILE *fp = fopen(in.c_str(), "rb");
 	if (fp)
 	{
-		std::string s = "";
+		std::string s;
 		fseek(fp, 0, SEEK_END);
 		int len = ftell(fp);
 		fseek(fp, 0, SEEK_SET);
diff --git a/Core/Tools/CRCDiff/KVPair.h b/Core/Tools/CRCDiff/KVPair.h
index a701b3a2a99..6ef7043b3a0 100644
--- a/Core/Tools/CRCDiff/KVPair.h
+++ b/Core/Tools/CRCDiff/KVPair.h
@@ -23,8 +23,7 @@
 // Description: Key/Value Pair class
 // ---------------------------------------------------------------------------
 
-#ifndef __KVPAIR_H__
-#define __KVPAIR_H__
+#pragma once
 
 #include <map>
 #include <string>
@@ -48,6 +47,3 @@ class KVPairClass
 protected:
 	KeyValueMap m_map;
 };
-
-#endif // __KVPAIR_H__
-
diff --git a/Core/Tools/CRCDiff/debug.cpp b/Core/Tools/CRCDiff/debug.cpp
index 397085a5c23..da3d2e3c96d 100644
--- a/Core/Tools/CRCDiff/debug.cpp
+++ b/Core/Tools/CRCDiff/debug.cpp
@@ -37,8 +37,9 @@ void DebugLog(const char *fmt, ...)
 	buffer[1023] = 0;
 	va_end( va );
 
-	printf( "%s", buffer );
+	printf( "%s\n", buffer );
 	OutputDebugString( buffer );
+	OutputDebugString( "\n" );
 }
 
 #endif // DEBUG
diff --git a/Core/Tools/CRCDiff/debug.h b/Core/Tools/CRCDiff/debug.h
index 8f1473ee9f9..1945b6ef99f 100644
--- a/Core/Tools/CRCDiff/debug.h
+++ b/Core/Tools/CRCDiff/debug.h
@@ -20,8 +20,7 @@
 // Minimal debug info
 // Author: Matthew D. Campbell, Sept 2002
 
-#ifndef __DEBUG_H__
-#define __DEBUG_H__
+#pragma once
 
 #ifdef DEBUG
 
@@ -35,6 +34,3 @@ void DebugLog( const char *fmt, ... );
 #define DEBUG_LOG(x) {}
 
 #endif // DEBUG
-
-#endif // __DEBUG_H__
-
diff --git a/Core/Tools/CRCDiff/expander.cpp b/Core/Tools/CRCDiff/expander.cpp
index 4063b949d46..f1d4d07c789 100644
--- a/Core/Tools/CRCDiff/expander.cpp
+++ b/Core/Tools/CRCDiff/expander.cpp
@@ -57,31 +57,31 @@ void Expander::expand( const std::string& input,
 			{
 				// first time
 				output.append(input.substr(0, pos));
-				//DEBUG_LOG(("First time, output='%s'\n", output.c_str()));
+				//DEBUG_LOG(("First time, output='%s'", output.c_str()));
 			}
 			else
 			{
 				// done this before
 				std::string sub = input.substr(lastpos, pos-lastpos);
-				//DEBUG_LOG(("*** lastpos = %d, pos=%d, sub='%s'\n", lastpos, pos, sub.c_str()));
+				//DEBUG_LOG(("*** lastpos = %d, pos=%d, sub='%s'", lastpos, pos, sub.c_str()));
 				output.append(sub);
-				//DEBUG_LOG(("output='%s'\n", output.c_str()));
+				//DEBUG_LOG(("output='%s'", output.c_str()));
 			}
 		}
 		else
 		{
-			//DEBUG_LOG(("pos == 0\n"));
+			//DEBUG_LOG(("pos == 0"));
 		}
 
 		// pos is the first position of a possible expansion
-		//DEBUG_LOG(("Looking for endpos via '%s' in '%s'\n", m_right.c_str(), input.substr(pos+m_left.length()).c_str()));
+		//DEBUG_LOG(("Looking for endpos via '%s' in '%s'", m_right.c_str(), input.substr(pos+m_left.length()).c_str()));
 		unsigned int endpos = input.find(m_right, pos+m_left.length());
-		//DEBUG_LOG(("substr is %d-%d of '%s'\n", pos, endpos, input.c_str()));
+		//DEBUG_LOG(("substr is %d-%d of '%s'", pos, endpos, input.c_str()));
 		if (endpos != input.npos)
 		{
 			// found a complete token - expand it
 			std::string sub = input.substr(pos+m_left.length(), endpos-pos-m_left.length());
-			//DEBUG_LOG(("found token: '%s'\n", sub.c_str()));
+			//DEBUG_LOG(("found token: '%s'", sub.c_str()));
 
 			ExpansionMap::iterator it = m_expansions.find(sub);
 			if (it == m_expansions.end())
@@ -99,10 +99,10 @@ void Expander::expand( const std::string& input,
 			else
 			{
 				std::string toExpand = it->second;
-				std::string expanded = "";
-				//DEBUG_LOG(("###### expanding '%s'\n", toExpand.c_str()));
+				std::string expanded;
+				//DEBUG_LOG(("###### expanding '%s'", toExpand.c_str()));
 				expand(toExpand, expanded, stripUnknown);
-				//DEBUG_LOG(("###### expanded '%s'\n", expanded.c_str()));
+				//DEBUG_LOG(("###### expanded '%s'", expanded.c_str()));
 				output.append(expanded);
 			}
 		}
diff --git a/Core/Tools/CRCDiff/expander.h b/Core/Tools/CRCDiff/expander.h
index 8dcbe5873b8..4373e872085 100644
--- a/Core/Tools/CRCDiff/expander.h
+++ b/Core/Tools/CRCDiff/expander.h
@@ -23,8 +23,7 @@
 // Description: Key/value pair template expansion class
 // ---------------------------------------------------------------------------
 
-#ifndef __EXPANDER_H__
-#define __EXPANDER_H__
+#pragma once
 
 #include <map>
 #include <Utility/hash_map_adapter.h>
@@ -49,6 +48,3 @@ class Expander
 		std::string m_left;
 		std::string m_right;
 };
-
-#endif // __EXPANDER_H__
-
diff --git a/Core/Tools/CRCDiff/misc.h b/Core/Tools/CRCDiff/misc.h
index 6f394ff3c5b..54bc699580d 100644
--- a/Core/Tools/CRCDiff/misc.h
+++ b/Core/Tools/CRCDiff/misc.h
@@ -23,12 +23,8 @@
 // Description: misc utils
 // ---------------------------------------------------------------------------
 
-#ifndef __MISC_H__
-#define __MISC_H__
+#pragma once
 
 #include <string>
 
 std::string intToString(int val);
-
-#endif // __MISC_H__
-
diff --git a/Core/Tools/Compress/Compress.cpp b/Core/Tools/Compress/Compress.cpp
index 84d626c70db..66466171ccc 100644
--- a/Core/Tools/Compress/Compress.cpp
+++ b/Core/Tools/Compress/Compress.cpp
@@ -17,41 +17,54 @@
 */
 
 #include <string>
-#include <cstdio>
+#include <Utility/stdio_adapter.h>
+#include <cstdarg>
 #include "Lib/BaseTypeCore.h"
 #include "Compression.h"
 
 
 // TheSuperHackers @todo Streamline and simplify the logging approach for tools
-#define DEBUG_LOG(x) printf x
+static void DebugLog(const char* format, ...)
+{
+	char buffer[1024];
+	buffer[0] = 0;
+	va_list args;
+	va_start(args, format);
+	vsnprintf(buffer, 1024, format, args);
+	va_end(args);
+	printf("%s\n", buffer);
+}
+#define DEBUG_LOG(x) DebugLog x
 
 
 void dumpHelp(const char *exe)
 {
-	DEBUG_LOG(("Usage:\n  To print the compression type of an existing file: %s -in infile\n", exe));
-	DEBUG_LOG(("  To compress a file: %s -in infile -out outfile <-type compressionmode>\n\n", exe));
-	DEBUG_LOG(("Compression modes:\n"));
+	DEBUG_LOG(("Usage:"));
+	DEBUG_LOG(("  To print the compression type of an existing file: %s -in infile", exe));
+	DEBUG_LOG(("  To compress a file: %s -in infile -out outfile <-type compressionmode>", exe));
+	DEBUG_LOG((""));
+	DEBUG_LOG(("Compression modes:"));
 	for (int i=COMPRESSION_MIN; i<=COMPRESSION_MAX; ++i)
 	{
-		DEBUG_LOG(("   %s\n", CompressionManager::getCompressionNameByType((CompressionType)i)));
+		DEBUG_LOG(("   %s", CompressionManager::getCompressionNameByType((CompressionType)i)));
 	}
 }
 
 int main(int argc, char **argv)
 {
-	std::string inFile = "";
-	std::string outFile = "";
+	std::string inFile;
+	std::string outFile;
 	CompressionType compressType = CompressionManager::getPreferredCompression();
 
 	for (int i=1; i<argc; ++i)
 	{
-		if ( !stricmp(argv[i], "-help") )
+		if ( stricmp(argv[i], "-help") == 0 )
 		{
 			dumpHelp(argv[0]);
 			return EXIT_SUCCESS;
 		}
 
-		if ( !strcmp(argv[i], "-in") )
+		if ( strcmp(argv[i], "-in") == 0 )
 		{
 			++i;
 			if (i<argc)
@@ -60,7 +73,7 @@ int main(int argc, char **argv)
 			}
 		}
 
-		if ( !strcmp(argv[i], "-out") )
+		if ( strcmp(argv[i], "-out") == 0 )
 		{
 			++i;
 			if (i<argc)
@@ -69,14 +82,14 @@ int main(int argc, char **argv)
 			}
 		}
 
-		if ( !strcmp(argv[i], "-type") )
+		if ( strcmp(argv[i], "-type") == 0 )
 		{
 			++i;
 			if (i<argc)
 			{
 				for (int j=COMPRESSION_MIN; j<=COMPRESSION_MAX; ++j)
 				{
-					if ( !stricmp(CompressionManager::getCompressionNameByType((CompressionType)j), argv[i]) )
+					if ( stricmp(CompressionManager::getCompressionNameByType((CompressionType)j), argv[i]) == 0 )
 					{
 						compressType = (CompressionType)j;
 						break;
@@ -92,7 +105,7 @@ int main(int argc, char **argv)
 		return EXIT_SUCCESS;
 	}
 
-	DEBUG_LOG(("IN:'%s' OUT:'%s' Compression:'%s'\n",
+	DEBUG_LOG(("IN:'%s' OUT:'%s' Compression:'%s'",
 		inFile.c_str(), outFile.c_str(), CompressionManager::getCompressionNameByType(compressType)));
 
 	// just check compression on the input file if we have no output specified
@@ -101,7 +114,7 @@ int main(int argc, char **argv)
 		FILE *fpIn = fopen(inFile.c_str(), "rb");
 		if (!fpIn)
 		{
-			DEBUG_LOG(("Cannot open '%s'\n", inFile.c_str()));
+			DEBUG_LOG(("Cannot open '%s'", inFile.c_str()));
 			return EXIT_FAILURE;
 		}
 		fseek(fpIn, 0, SEEK_END);
@@ -114,20 +127,20 @@ int main(int argc, char **argv)
 
 		if (numRead != 8)
 		{
-			DEBUG_LOG(("Cannot read header from '%s'\n", inFile.c_str()));
+			DEBUG_LOG(("Cannot read header from '%s'", inFile.c_str()));
 			return EXIT_FAILURE;
 		}
 
 		CompressionType usedType = CompressionManager::getCompressionType(data, 8);
 		if (usedType == COMPRESSION_NONE)
 		{
-			DEBUG_LOG(("No compression on '%s'\n", inFile.c_str()));
+			DEBUG_LOG(("No compression on '%s'", inFile.c_str()));
 			return EXIT_SUCCESS;
 		}
 
 		int uncompressedSize = CompressionManager::getUncompressedSize(data, 8);
 
-		DEBUG_LOG(("'%s' is compressed using %s, from %d to %d bytes, %g%% of its original size\n",
+		DEBUG_LOG(("'%s' is compressed using %s, from %d to %d bytes, %g%% of its original size",
 			inFile.c_str(), CompressionManager::getCompressionNameByType(usedType),
 			uncompressedSize, size, size/(double)(uncompressedSize+0.1)*100.0));
 
@@ -138,7 +151,7 @@ int main(int argc, char **argv)
 	FILE *fpIn = fopen(inFile.c_str(), "rb");
 	if (!fpIn)
 	{
-		DEBUG_LOG(("Cannot open input '%s'\n", inFile.c_str()));
+		DEBUG_LOG(("Cannot open input '%s'", inFile.c_str()));
 		return EXIT_FAILURE;
 	}
 
@@ -152,18 +165,18 @@ int main(int argc, char **argv)
 	fclose(fpIn);
 	if (numRead != inputSize)
 	{
-		DEBUG_LOG(("Cannot read input '%s'\n", inFile.c_str()));
+		DEBUG_LOG(("Cannot read input '%s'", inFile.c_str()));
 		delete[] inputData;
 		return EXIT_FAILURE;
 	}
 
-	DEBUG_LOG(("Read %d bytes from '%s'\n", numRead, inFile.c_str()));
+	DEBUG_LOG(("Read %d bytes from '%s'", numRead, inFile.c_str()));
 
 	// Open the output file
 	FILE *fpOut = fopen(outFile.c_str(), "wb");
 	if (!fpOut)
 	{
-		DEBUG_LOG(("Cannot open output '%s'\n", outFile.c_str()));
+		DEBUG_LOG(("Cannot open output '%s'", outFile.c_str()));
 		delete[] inputData;
 		return EXIT_FAILURE;
 	}
@@ -171,7 +184,7 @@ int main(int argc, char **argv)
 
 	if (compressType == COMPRESSION_NONE)
 	{
-		DEBUG_LOG(("No compression requested, writing uncompressed data\n"));
+		DEBUG_LOG(("No compression requested, writing uncompressed data"));
 		int outSize = CompressionManager::getUncompressedSize(inputData, inputSize);
 		char *outData = new char[outSize];
 		CompressionManager::decompressData(inputData, inputSize, outData, outSize);
@@ -179,9 +192,9 @@ int main(int argc, char **argv)
 		// Write the output file
 		fwrite(outData, 1, outSize, fpOut);
 	}
-	else 
+	else
 	{
-		DEBUG_LOG(("Compressing data using %s\n", CompressionManager::getCompressionNameByType(compressType)));
+		DEBUG_LOG(("Compressing data using %s", CompressionManager::getCompressionNameByType(compressType)));
 		// Allocate the output buffer
 		int outSize = CompressionManager::getMaxCompressedSize(inputSize, compressType);
 		char *outData = new char[outSize];
diff --git a/Core/Tools/DebugWindow/DebugWindow.cpp b/Core/Tools/DebugWindow/DebugWindow.cpp
index c0db3c69c38..bc15074c03e 100644
--- a/Core/Tools/DebugWindow/DebugWindow.cpp
+++ b/Core/Tools/DebugWindow/DebugWindow.cpp
@@ -47,7 +47,7 @@ static char THIS_FILE[] = __FILE__;
 //
 //		It is very important that this macro appear in each
 //		function, prior to any calls into MFC.  This means that
-//		it must appear as the first statement within the 
+//		it must appear as the first statement within the
 //		function, even before any object variable declarations
 //		as their constructors may generate calls into the MFC
 //		DLL.
@@ -108,21 +108,21 @@ void __declspec(dllexport) CreateDebugDialog(void)
 	if (tmpWnd->GetMainWndHWND()) {
 		SetFocus(tmpWnd->GetMainWndHWND());
 	}
-	
+
 	theApp.SetDialogWindow(tmpWnd);
 }
 
 void __declspec(dllexport) DestroyDebugDialog(void)
 {
 	AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-	DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-	
+	DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 	if (tmpWnd) {
 		tmpWnd->DestroyWindow();
 		delete tmpWnd;
 		theApp.SetDialogWindow(NULL);
 	}
-	
+
 }
 
 bool __declspec(dllexport) CanAppContinue(void)
@@ -134,7 +134,7 @@ bool __declspec(dllexport) CanAppContinue(void)
 	if (!pDbg) {
 		return true;
 	}
-	
+
 	return pDbg->CanProceed();
 }
 
@@ -147,7 +147,7 @@ void __declspec(dllexport) ForceAppContinue(void)
 	if (!pDbg) {
 		return;
 	}
-	
+
 	pDbg->ForceContinue();
 }
 
@@ -160,7 +160,7 @@ bool __declspec(dllexport) RunAppFast(void)
 	if (!pDbg) {
 		return true;
 	}
-	
+
 	return pDbg->RunAppFast();
 }
 
@@ -225,4 +225,4 @@ void __declspec(dllexport) AdjustVariableAndPause(const char* variable, const ch
 		pDbg->AdjustVariable(variable, value);
 		pDbg->ForcePause();
 	}
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/DebugWindow/DebugWindow.h b/Core/Tools/DebugWindow/DebugWindow.h
index 1099084cbb3..27d437e628a 100644
--- a/Core/Tools/DebugWindow/DebugWindow.h
+++ b/Core/Tools/DebugWindow/DebugWindow.h
@@ -19,12 +19,7 @@
 // DebugWindow.h : main header file for the DEBUGWINDOW DLL
 //
 
-#if !defined(AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_)
-#define AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #ifndef __AFXWIN_H__
 	#error include 'stdafx.h' before including this file for PCH
@@ -68,5 +63,3 @@ class CDebugWindowApp : public CWinApp
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_)
diff --git a/Core/Tools/DebugWindow/DebugWindowDialog.cpp b/Core/Tools/DebugWindow/DebugWindowDialog.cpp
index 2a37f6f614a..202f6e87584 100644
--- a/Core/Tools/DebugWindow/DebugWindowDialog.cpp
+++ b/Core/Tools/DebugWindow/DebugWindowDialog.cpp
@@ -19,7 +19,7 @@
 #include "StdAfx.h"
 #include "DebugWindowDialog.h"
 
-DebugWindowDialog::DebugWindowDialog(UINT nIDTemplate, CWnd* pParentWnd) : 
+DebugWindowDialog::DebugWindowDialog(UINT nIDTemplate, CWnd* pParentWnd) :
 	CDialog(nIDTemplate, pParentWnd)
 {
 	mStepping = false;
@@ -118,13 +118,13 @@ void DebugWindowDialog::AppendMessage(const std::string& messageToAppend)
 void DebugWindowDialog::AdjustVariable(const std::string& varName, const std::string& varValue)
 {
 	for (VecPairStringIt it = mVariables.begin(); it != mVariables.end(); it++) {
-		if (it->first == varName) { 
+		if (it->first == varName) {
 			it->second = varValue;
 			_RebuildVarsString();
 			return;
 		}
 	}
-	
+
 	PairString newPair;
 	newPair.first = varName;
 	newPair.second = varValue;
@@ -223,4 +223,4 @@ BEGIN_MESSAGE_MAP(DebugWindowDialog, CDialog)
 	ON_BN_CLICKED(IDC_ClearWindows, OnClearWindows)
 	ON_WM_CLOSE()
 	ON_WM_SIZE()
-END_MESSAGE_MAP()
\ No newline at end of file
+END_MESSAGE_MAP()
diff --git a/Core/Tools/DebugWindow/DebugWindowDialog.h b/Core/Tools/DebugWindow/DebugWindowDialog.h
index 87edd76fb75..5fb09d0c01d 100644
--- a/Core/Tools/DebugWindow/DebugWindowDialog.h
+++ b/Core/Tools/DebugWindow/DebugWindowDialog.h
@@ -35,7 +35,7 @@ class DebugWindowDialog : public CDialog
 	public:
 		enum {IDD = IDD_DebugWindow};
 		DebugWindowDialog(UINT nIDTemplate = DebugWindowDialog::IDD, CWnd* pParentWnd = NULL);
-		
+
 		bool CanProceed(void);
 		bool RunAppFast(void);
 		void AppendMessage(const std::string& messageToAppend);
@@ -77,6 +77,6 @@ class DebugWindowDialog : public CDialog
 		afx_msg void OnClose();
 		DECLARE_MESSAGE_MAP()
 
-	
 
-};
\ No newline at end of file
+
+};
diff --git a/Core/Tools/DebugWindow/DebugWindowExport.h b/Core/Tools/DebugWindow/DebugWindowExport.h
index 45e5abf42d1..0d9a0a12116 100644
--- a/Core/Tools/DebugWindow/DebugWindowExport.h
+++ b/Core/Tools/DebugWindow/DebugWindowExport.h
@@ -22,7 +22,7 @@
 extern "C" {
 	// Called to create the dialog
 	void __declspec(dllexport) CreateDebugDialog(void);
-	
+
 	// Called to (not surprisingly) destroy the dialog (and free the resources)
 	void __declspec(dllexport) DestroyDebugDialog(void);
 
@@ -44,9 +44,9 @@ extern "C" {
 	// Call this to add a message, and simulate pressing Pause immediately after
 	void __declspec(dllexport) AppendMessageAndPause(const char* messageToPass);
 
-	// Call this to add or update a variable value 
+	// Call this to add or update a variable value
 	void __declspec(dllexport) AdjustVariable(const char* variable, const char* value);
 
 	// Call this to add or update a variable value, and simulate pressing Pause immediately after
 	void __declspec(dllexport) AdjustVariableAndPause(const char* variable, const char* value);
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/DebugWindow/Resource.h b/Core/Tools/DebugWindow/Resource.h
index 285c106cb06..d77158d15fa 100644
--- a/Core/Tools/DebugWindow/Resource.h
+++ b/Core/Tools/DebugWindow/Resource.h
@@ -33,7 +33,7 @@
 #define IDC_FrameNumber                 1010
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        1001
diff --git a/Core/Tools/DebugWindow/StdAfx.h b/Core/Tools/DebugWindow/StdAfx.h
index ed493262c31..93949ef8247 100644
--- a/Core/Tools/DebugWindow/StdAfx.h
+++ b/Core/Tools/DebugWindow/StdAfx.h
@@ -21,16 +21,11 @@
 //      are changed infrequently
 //
 
-#if !defined(AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_)
-#define AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
-// TheSuperHackers @compile xezon 24/03/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
+// TheSuperHackers @build xezon 24/03/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
 #define _d3d9TYPES_H_
 
 #include <afxwin.h>         // MFC core and standard components
@@ -61,5 +56,3 @@
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_)
diff --git a/Core/Tools/ImagePacker/CMakeLists.txt b/Core/Tools/ImagePacker/CMakeLists.txt
index 3b30d71bb93..db8aaf2d157 100644
--- a/Core/Tools/ImagePacker/CMakeLists.txt
+++ b/Core/Tools/ImagePacker/CMakeLists.txt
@@ -26,11 +26,10 @@ target_include_directories(corei_imagepacker INTERFACE
 )
 
 target_link_libraries(corei_imagepacker INTERFACE
-    benchmark
     comctl32
     core_debug
     core_profile
-    dbghelplib
+    core_wwcommon
     imm32
     vfw32
     winmm
diff --git a/Core/Tools/ImagePacker/Include/ImageDirectory.h b/Core/Tools/ImagePacker/Include/ImageDirectory.h
index bfdf3a135f5..d2b64c33efe 100644
--- a/Core/Tools/ImagePacker/Include/ImageDirectory.h
+++ b/Core/Tools/ImagePacker/Include/ImageDirectory.h
@@ -18,12 +18,12 @@
 
 // FILE: ImageDirectory.h /////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -40,9 +40,6 @@
 
 #pragma once
 
-#ifndef __IMAGEDIRECTORY_H_
-#define __IMAGEDIRECTORY_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -73,15 +70,12 @@ class ImageDirectory
 // INLINING ///////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 inline ImageDirectory::~ImageDirectory( void ) { delete m_path; }
-inline ImageDirectory::ImageDirectory( void ) 
-{ 
-	m_path = NULL; 
-	m_next = NULL; 
-	m_prev = NULL; 
+inline ImageDirectory::ImageDirectory( void )
+{
+	m_path = NULL;
+	m_next = NULL;
+	m_prev = NULL;
 	m_imageCount = 0;
 }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __IMAGEDIRECTORY_H_
-
diff --git a/Core/Tools/ImagePacker/Include/ImageInfo.h b/Core/Tools/ImagePacker/Include/ImageInfo.h
index 119cc01a9d7..3dce43dfc0b 100644
--- a/Core/Tools/ImagePacker/Include/ImageInfo.h
+++ b/Core/Tools/ImagePacker/Include/ImageInfo.h
@@ -18,12 +18,12 @@
 
 // FILE: ImageInfo.h //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -39,9 +39,6 @@
 
 #pragma once
 
-#ifndef __IMAGEINFO_H_
-#define __IMAGEINFO_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -61,7 +58,7 @@ class ImageInfo
 {
 
 public:
-	
+
 	enum
 	{
 		UNPACKED					= 0x00000001,  ///< this image has not yet been packed
@@ -98,10 +95,10 @@ class ImageInfo
 	TexturePage *m_page;  ///< pointer to page this image is now packed on
 	ImageInfo *m_nextPageImage;  ///< next image on texture page
 	ImageInfo *m_prevPageImage;  ///< previous image on texture page
-	IRegion2D m_pagePos;  /** once placed on a texture page this has the 
+	IRegion2D m_pagePos;  /** once placed on a texture page this has the
 												coords of the image on the page, it does not include
 												any padding from stretching borders and gutters */
-	
+
 	UnsignedInt m_fitBits;  /**< bit flags of the region used to fit this image on
 													a page and therefore to create m_pagePos */
 	ICoord2D m_gutterUsed;  ///< the gutter size actually used in this image fit
@@ -111,6 +108,3 @@ class ImageInfo
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __IMAGEINFO_H_
-
diff --git a/Core/Tools/ImagePacker/Include/ImagePacker.h b/Core/Tools/ImagePacker/Include/ImagePacker.h
index 49f685a2e1f..c989a2fd9ff 100644
--- a/Core/Tools/ImagePacker/Include/ImagePacker.h
+++ b/Core/Tools/ImagePacker/Include/ImagePacker.h
@@ -18,12 +18,12 @@
 
 // FILE: ImagePacker.h ////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -39,15 +39,12 @@
 
 #pragma once
 
-#ifndef __IMAGEPACKER_H_
-#define __IMAGEPACKER_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
-#include "WWLib/TARGA.H"
+#include "WWLib/TARGA.h"
 #include "ImageDirectory.h"
 #include "ImageInfo.h"
 #include "TexturePage.h"
@@ -67,7 +64,7 @@ class ImagePacker
 {
 
 public:
-	
+
 	enum
 	{
 		GAP_METHOD_EXTEND_RGB	= 0x00000001,  ///< extend RGB (no alpha) of image on all sides
@@ -75,7 +72,7 @@ class ImagePacker
 	};
 
 public:
-	
+
 	ImagePacker( void );
 	virtual ~ImagePacker( void );
 
@@ -149,7 +146,7 @@ class ImagePacker
 	HWND m_hWnd;  ///< window handle for app
 	ICoord2D m_targetSize;  ///< the target size
 	Bool m_useSubFolders;  ///< use subfolders option
-	char m_outputFile[ MAX_OUTPUT_FILE_LEN ];  ///< output filename 
+	char m_outputFile[ MAX_OUTPUT_FILE_LEN ];  ///< output filename
 	char m_outputDirectory[ _MAX_PATH ];  ///< destination for texture files
 
 	ImageDirectory *m_dirList;  ///< the directory list
@@ -169,7 +166,7 @@ class ImagePacker
 	Int m_targetPreviewPage;  ///< preview page we're looking at
 	HWND m_hWndPreview;  ///< the preview window
 	Bool m_showTextureInPreview;  ///< show actual texture in preview window
-	
+
 	Targa *m_targa;  ///< targa for loading file headers
 	Bool m_compressTextures;  ///< compress the final textures
 
@@ -212,6 +209,3 @@ inline UnsignedInt ImagePacker::getGapMethod( void ) { return m_gapMethod; }
 // EXTERNALS //////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 extern ImagePacker *TheImagePacker;
-
-#endif // __IMAGEPACKER_H_
-
diff --git a/Core/Tools/ImagePacker/Include/TexturePage.h b/Core/Tools/ImagePacker/Include/TexturePage.h
index 152ef475f4a..ab0cd5142b5 100644
--- a/Core/Tools/ImagePacker/Include/TexturePage.h
+++ b/Core/Tools/ImagePacker/Include/TexturePage.h
@@ -18,12 +18,12 @@
 
 // FILE: TexturePage.h ////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -40,16 +40,13 @@
 
 #pragma once
 
-#ifndef __TEXTUREPAGE_H_
-#define __TEXTUREPAGE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 // USER INCLUDES //////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-#include "WWLib/TARGA.H"
+#include "WWLib/TARGA.h"
 #include "Lib/BaseType.h"
 #include "ImageInfo.h"
 
@@ -114,9 +111,9 @@ class TexturePage
 
 	/// build a region to try to fit given the position, size, and border options
 	UnsignedInt buildFitRegion( IRegion2D *region,
-															Int startX, Int startY, 
-															Int imageWidth, Int imageHeight, 
-															Int *xGutter, Int *yGutter, 
+															Int startX, Int startY,
+															Int imageWidth, Int imageHeight,
+															Int *xGutter, Int *yGutter,
 															Bool allSidesBorder );
 
 	void markRegionUsed( IRegion2D *region );  ///< mark this region as used
@@ -137,8 +134,8 @@ class TexturePage
 												 Bool extendAlpha );
 
 	/// if the pixel at abolve/below row is open, extend pixel at src to its location
-	void extendToRowIfOpen( char *src, 
-													Int buffWidth, 
+	void extendToRowIfOpen( char *src,
+													Int buffWidth,
 													Int buffBPP,
 													Bool extendAlpha,
 													Int imageHeight,
@@ -167,6 +164,3 @@ inline Int TexturePage::getWidth( void ) { return m_size.x; }
 inline Int TexturePage::getHeight( void ) { return m_size.y; }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __TEXTUREPAGE_H_
-
diff --git a/Core/Tools/ImagePacker/Include/WinMain.h b/Core/Tools/ImagePacker/Include/WinMain.h
index 6000ba60496..c5ebe3b4af0 100644
--- a/Core/Tools/ImagePacker/Include/WinMain.h
+++ b/Core/Tools/ImagePacker/Include/WinMain.h
@@ -18,12 +18,12 @@
 
 // FILE: WinMain.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -39,9 +39,6 @@
 
 #pragma once
 
-#ifndef __WINMAIN_H_
-#define __WINMAIN_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 
@@ -57,6 +54,3 @@
 // EXTERNALS //////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 extern HINSTANCE ApplicationHInstance;
-
-#endif // __WINMAIN_H_
-
diff --git a/Core/Tools/ImagePacker/Include/WindowProc.h b/Core/Tools/ImagePacker/Include/WindowProc.h
index a8dd3a4b851..57886fd6c35 100644
--- a/Core/Tools/ImagePacker/Include/WindowProc.h
+++ b/Core/Tools/ImagePacker/Include/WindowProc.h
@@ -18,12 +18,12 @@
 
 // FILE: WindowProc.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -39,9 +39,6 @@
 
 #pragma once
 
-#ifndef __WINDOWPROC_H_
-#define __WINDOWPROC_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -58,7 +55,7 @@ extern BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 
 extern HWND MakePreviewDisplay( void );
 extern void UpdatePreviewWindow( void );
-extern LRESULT CALLBACK PreviewProc( HWND hWnd, UINT message, 
+extern LRESULT CALLBACK PreviewProc( HWND hWnd, UINT message,
 																		 WPARAM wParam, LPARAM lParam );
 
 extern BOOL CALLBACK ImageErrorProc( HWND hWndDialog, UINT message,
@@ -69,6 +66,3 @@ extern BOOL CALLBACK PageErrorProc( HWND hWndDialog, UINT message,
 
 extern BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 																					WPARAM wParam, LPARAM lParam );
-
-#endif // __WINDOWPROC_H_
-
diff --git a/Core/Tools/ImagePacker/Resource/Resource.h b/Core/Tools/ImagePacker/Resource/Resource.h
index 5ab108449fc..77588c73b19 100644
--- a/Core/Tools/ImagePacker/Resource/Resource.h
+++ b/Core/Tools/ImagePacker/Resource/Resource.h
@@ -62,7 +62,7 @@
 #define STATIC_GAP_INFO                 1039
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        105
diff --git a/Core/Tools/ImagePacker/Source/ImageInfo.cpp b/Core/Tools/ImagePacker/Source/ImageInfo.cpp
index dbd318c4a5a..46d483ac0cc 100644
--- a/Core/Tools/ImagePacker/Source/ImageInfo.cpp
+++ b/Core/Tools/ImagePacker/Source/ImageInfo.cpp
@@ -18,12 +18,12 @@
 
 // FILE: ImageInfo.cpp ////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -86,22 +86,16 @@ ImageInfo::ImageInfo( void )
 	m_gutterUsed.x = 0;
 	m_gutterUsed.y = 0;
 
-}  // end ImageInfo
+}
 
 // ImageInfo::~ImageInfo ======================================================
 /** */
 //=============================================================================
 ImageInfo::~ImageInfo( void )
-{ 
-	
-	// delete path name
-	if( m_path )
-		delete [] m_path; 
-
-	if( m_filenameOnly )
-		delete [] m_filenameOnly;
+{
 
-	if( m_filenameOnlyNoExt )
-		delete [] m_filenameOnlyNoExt;
+	delete [] m_path;
+	delete [] m_filenameOnly;
+	delete [] m_filenameOnlyNoExt;
 
-}  // end ~ImageInfo
+}
diff --git a/Core/Tools/ImagePacker/Source/ImagePacker.cpp b/Core/Tools/ImagePacker/Source/ImagePacker.cpp
index 0e8c23c5b07..d0abc547ba8 100644
--- a/Core/Tools/ImagePacker/Source/ImagePacker.cpp
+++ b/Core/Tools/ImagePacker/Source/ImagePacker.cpp
@@ -18,12 +18,12 @@
 
 // FILE: ImagePacker.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -33,7 +33,7 @@
 // Created:    Colin Day, August 2001
 //
 // Desc:       Entry point for the image packer.  This program takes
-//						 separate image files and combines them into a single 
+//						 separate image files and combines them into a single
 //						 image as close as possible so that we can conserve texture
 //						 memory
 //
@@ -41,13 +41,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include <stdio.h>
 #include <io.h>
 #include <assert.h>
+#include <WWCommon.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
-#include "WWLib/TARGA.H"
+#include "WWLib/TARGA.h"
 #include "Resource.h"
 #include "ImagePacker.h"
 #include "WinMain.h"
@@ -83,10 +83,10 @@ TexturePage *ImagePacker::createNewTexturePage( void )
 	if( page == NULL )
 	{
 
-		DEBUG_ASSERTCRASH( page, ("Unable to allocate new texture page.\n") );
+		DEBUG_ASSERTCRASH( page, ("Unable to allocate new texture page.") );
 		return NULL;
 
-	}  // end if
+	}
 
 	// link page to list
 	page->m_prev = NULL;
@@ -107,7 +107,7 @@ TexturePage *ImagePacker::createNewTexturePage( void )
 
 	return page;
 
-}  // end createNewTexturePage
+}
 
 // ImagePacker::validateImages ================================================
 /** Check all the images in the image list, if any of them cannot be
@@ -140,7 +140,7 @@ Bool ImagePacker::validateImages( void )
 			DEBUG_ASSERTCRASH( image, ("Image in imagelist is NULL") );
 			continue;  // should never happen
 
-		}  // end if
+		}
 
 		//
 		// if this image is too big to fit in the target page size as a whole
@@ -154,22 +154,22 @@ Bool ImagePacker::validateImages( void )
 			BitSet( image->m_status, ImageInfo::TOOBIG );
 			BitSet( image->m_status, ImageInfo::CANTPROCESS );
 
-		}  // end if
+		}
 
 		//
-		// if this image is not the right format we can't process it, at 
+		// if this image is not the right format we can't process it, at
 		// present we only understand 32 and 24 bit images
 		//
 		if( image->m_colorDepth != 32 && image->m_colorDepth != 24 )
 		{
-		
+
 			errors = TRUE;
 			BitSet( image->m_status, ImageInfo::INVALIDCOLORDEPTH );
 			BitSet( image->m_status, ImageInfo::CANTPROCESS );
-			
-		}  // end if
 
-	}  // end for i
+		}
+
+	}
 
 	//
 	// if we have errors, build a list and show them to the user
@@ -177,16 +177,16 @@ Bool ImagePacker::validateImages( void )
 	if( errors == TRUE )
 	{
 
-		proceed = DialogBox( ApplicationHInstance, 
+		proceed = DialogBox( ApplicationHInstance,
 												 (LPCTSTR)IMAGE_ERRORS,
-												 TheImagePacker->getWindowHandle(), 
+												 getWindowHandle(),
 												 (DLGPROC)ImageErrorProc );
 
-	}  // end if
+	}
 
 	return proceed;
 
-}  // end validateImages
+}
 
 // ImagePacker::packImages ====================================================
 /** Pack all the images in the image list, starting from the top and
@@ -211,7 +211,7 @@ Bool ImagePacker::packImages( void )
 		statusMessage( "Build Cancelled By User." );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// loop through all images
 	for( i = 0; i < m_imageCount; i++ )
@@ -220,7 +220,7 @@ Bool ImagePacker::packImages( void )
 		// update status
 		sprintf( m_statusBuffer, "Fitting Image %d of %d.", i, m_imageCount );
 		statusMessage( m_statusBuffer );
-		 
+
 		// get this image out of the list
 		image = m_imageList[ i ];
 
@@ -235,7 +235,7 @@ Bool ImagePacker::packImages( void )
 			if( page->addImage( image ) == TRUE )
 				break;  // page added, stop trying to add into pages
 
-		}  // end for page
+		}
 
 		// if image was not able to go on any existing page create a new page for it
 		if( page == NULL )
@@ -255,15 +255,15 @@ Bool ImagePacker::packImages( void )
 				MessageBox( NULL, buffer, "Internal Error", MB_OK | MB_ICONERROR );
 				return FALSE;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	return TRUE;  // success
 
-}  // end packImages
+}
 
 // ImagePacker::writeFinalTextures ============================================
 /** Generate and write the final textures to the output directory
@@ -284,18 +284,18 @@ void ImagePacker::writeFinalTextures( void )
 	{
 
 		// update status message
-		sprintf( buffer, "Generating texture #%d of %d.", 
+		sprintf( buffer, "Generating texture #%d of %d.",
 						 page->getID(), m_pageCount );
 		statusMessage( buffer );
 
 		// generate the final texture for this page
 		if( page->generateTexture() == FALSE )
 		{
-			
+
 			errors = TRUE;
 			continue;  // could not generate this page, but try to continue
 
-		}  // end if
+		}
 
 		//
 		// write this page out to a file using the filename given by
@@ -307,27 +307,27 @@ void ImagePacker::writeFinalTextures( void )
 			errors = TRUE;
 			continue;  // could not write page, but try to go on
 
-		}  // end if
+		}
 
-	}  // end for page
+	}
 
 	// check for any errors and notify the user
 	if( errors == TRUE )
 	{
 
-		DialogBox( ApplicationHInstance, 
+		DialogBox( ApplicationHInstance,
 							 (LPCTSTR)PAGE_ERRORS,
-							 TheImagePacker->getWindowHandle(), 
+							 getWindowHandle(),
 							 (DLGPROC)PageErrorProc );
 
-	}  // end if
+	}
 
-}  // end writeFinalTextures
+}
 
 // sortImageCompare ===========================================================
 /** Compare function for qsort
-	* -1 item1 less than item2 
-	*	0 item1 identical to item2 
+	* -1 item1 less than item2
+	*	0 item1 identical to item2
 	*	1 item1 greater than item2
 	*/
 //=============================================================================
@@ -343,7 +343,7 @@ static Int sortImageCompare( const void *aa, const void *bb )
 	else
 		return 0;
 
-}  // end sortImageCompare
+}
 
 // ImagePacker::sortImageList =================================================
 /** Sort the image list */
@@ -354,7 +354,7 @@ void ImagePacker::sortImageList( void )
 	// sort all images so that largest area ones are first
 	qsort( (void *)m_imageList, m_imageCount, sizeof( ImageInfo *), sortImageCompare );
 
-}  // end sortImageList
+}
 
 // ImagePacker::addImagesInDirectory ==========================================
 /** Add all the images in the specified directory */
@@ -378,19 +378,19 @@ void ImagePacker::addImagesInDirectory( char *dir )
 	// change into the directory
 	SetCurrentDirectory( dir );
 
-	// go through each item in the output directory		
+	// go through each item in the output directory
 	hFile = FindFirstFile( "*", &item);
 	if( hFile != INVALID_HANDLE_VALUE )
-	{  
+	{
 
 		// if this is a file count it
 		if( !(item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-				strcmp( item.cFileName, "." ) && 
-				strcmp( item.cFileName, ".." ) )
+				strcmp( item.cFileName, "." ) != 0 &&
+				strcmp( item.cFileName, ".." ) != 0 )
 		{
 
 			len = strlen( item.cFileName );
-			if( len > 4 && 
+			if( len > 4 &&
 					item.cFileName[ len - 4 ] == '.' &&
 					(item.cFileName[ len - 3 ] == 't' || item.cFileName[ len - 3 ] == 'T') &&
 					(item.cFileName[ len - 2 ] == 'g' || item.cFileName[ len - 2 ] == 'G') &&
@@ -400,9 +400,9 @@ void ImagePacker::addImagesInDirectory( char *dir )
 				sprintf( filePath, "%s%s", dir, item.cFileName );
 				addImage( filePath );
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
 		// find the rest of the files
 		while( FindNextFile( hFile, &item ) != 0 )
@@ -410,12 +410,12 @@ void ImagePacker::addImagesInDirectory( char *dir )
 
 			// if this is a file count it
 			if( !(item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-					strcmp( item.cFileName, "." ) && 
-					strcmp( item.cFileName, ".." ) )
+					strcmp( item.cFileName, "." ) != 0 &&
+					strcmp( item.cFileName, ".." ) != 0 )
 			{
 
 				len = strlen( item.cFileName );
-				if( len > 4 && 
+				if( len > 4 &&
 						item.cFileName[ len - 4 ] == '.' &&
 						(item.cFileName[ len - 3 ] == 't' || item.cFileName[ len - 3 ] == 'T') &&
 						(item.cFileName[ len - 2 ] == 'g' || item.cFileName[ len - 2 ] == 'G') &&
@@ -425,21 +425,21 @@ void ImagePacker::addImagesInDirectory( char *dir )
 					sprintf( filePath, "%s%s", dir, item.cFileName );
 					addImage( filePath );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
-		}  // end while
+		}
 
 		// close search
 		FindClose( hFile );
 
-	}  //end if, items found
+	}
 
 	// restore our current directory
 	SetCurrentDirectory( currDir );
 
-}  // end addImagesInDirectory
+}
 
 // ImagePacker::checkOutputDirectory ==========================================
 /** Verify that there are no files in the output directory ... if there
@@ -456,7 +456,7 @@ Bool ImagePacker::checkOutputDirectory( void )
 	HANDLE hFile;  // handle for search resources
 	Int fileCount = 0;
 	char currDir[ _MAX_PATH ];
-	
+
 	// get the working directory
 	GetCurrentDirectory( _MAX_PATH, currDir );
 
@@ -466,15 +466,15 @@ Bool ImagePacker::checkOutputDirectory( void )
 	// change into the output directory
 	SetCurrentDirectory( m_outputDirectory );
 
-	// go through each item in the output directory		
+	// go through each item in the output directory
 	hFile = FindFirstFile( "*", &item);
 	if( hFile != INVALID_HANDLE_VALUE )
-	{  
+	{
 
 		// if this is a file count it
 		if( !(item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-				 strcmp( item.cFileName, "." ) && 
-				 strcmp( item.cFileName, ".." ) )
+				 strcmp( item.cFileName, "." ) != 0 &&
+				 strcmp( item.cFileName, ".." ) != 0 )
 			fileCount++;
 
 		// find the rest of the files
@@ -483,16 +483,16 @@ Bool ImagePacker::checkOutputDirectory( void )
 
 			// if this is a file count it
 			if( !(item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-					 strcmp( item.cFileName, "." ) && 
-					 strcmp( item.cFileName, ".." ) )
+					 strcmp( item.cFileName, "." ) != 0 &&
+					 strcmp( item.cFileName, ".." ) != 0 )
 				fileCount++;
 
-		}  // end while
+		}
 
 		// close search
 		FindClose( hFile );
 
-	}  //end if, items found
+	}
 
 	// switch back to the current directory
 	SetCurrentDirectory( currDir );
@@ -504,8 +504,8 @@ Bool ImagePacker::checkOutputDirectory( void )
 
 		sprintf( buffer, "The output directory (%s) must be empty before proceeding.  Delete '%d' files and continue with build process?",
 						 m_outputDirectory, fileCount );
-		response = MessageBox( NULL, buffer, 
-													 "Delete files to continue?", 
+		response = MessageBox( NULL, buffer,
+													 "Delete files to continue?",
 													 MB_YESNO | MB_ICONWARNING );
 
 		// if they said no, do not delete the files and abort the pack process
@@ -518,16 +518,16 @@ Bool ImagePacker::checkOutputDirectory( void )
 
 		// change into the output directory
 		SetCurrentDirectory( m_outputDirectory );
-		
-		// go through each item in the output directory		
+
+		// go through each item in the output directory
 		hFile = FindFirstFile( "*", &item);
 		if( hFile != INVALID_HANDLE_VALUE )
-		{  
+		{
 
 			// if this is a file count it
 			if( !(item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-					 strcmp( item.cFileName, "." ) && 
-					 strcmp( item.cFileName, ".." ) )
+					 strcmp( item.cFileName, "." ) != 0 &&
+					 strcmp( item.cFileName, ".." ) != 0 )
 				DeleteFile( item.cFileName );
 
 			// find the rest of the files
@@ -536,25 +536,25 @@ Bool ImagePacker::checkOutputDirectory( void )
 
 				// if this is a file count it
 				if( !(item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-						 strcmp( item.cFileName, "." ) && 
-						 strcmp( item.cFileName, ".." ) )
+						 strcmp( item.cFileName, "." ) != 0 &&
+						 strcmp( item.cFileName, ".." ) != 0 )
 					DeleteFile( item.cFileName );
 
-			}  // end while
+			}
 
 			// close search
 			FindClose( hFile );
 
-		}  //end if, items found
+		}
 
 		// switch back to the current directory
 		SetCurrentDirectory( currDir );
 
-	}  // end if
+	}
 
 	return TRUE;  // proceed
 
-}  // end checkOutputDirectory
+}
 
 // ImagePacker::resetPageList =================================================
 /** Clear the page list */
@@ -570,13 +570,13 @@ void ImagePacker::resetPageList( void )
 		delete m_pageList;
 		m_pageList = next;
 
-	}  // end while
+	}
 
 	m_pageTail = NULL;
 	m_pageCount = 0;
 	m_targetPreviewPage = 1;
 
-}  // end resetPageList
+}
 
 // ImagePacker::resetImageDirectoryList =======================================
 /** Clear the image directory list */
@@ -591,13 +591,13 @@ void ImagePacker::resetImageDirectoryList( void )
 		next = m_dirList->m_next;
 		delete m_dirList;
 		m_dirList = next;
-			
-	}  // end while
+
+	}
 
 	m_dirCount = 0;
 	m_imagesInDirs = 0;
 
-}  // end resetImageDirectoryList
+}
 
 // ImagePacker::resetImageList ================================================
 /** Clear the image list */
@@ -605,12 +605,11 @@ void ImagePacker::resetImageDirectoryList( void )
 void ImagePacker::resetImageList( void )
 {
 
-	if( m_imageList )
-		delete [] m_imageList;
+	delete [] m_imageList;
 	m_imageList = NULL;
 	m_imageCount = 0;
 
-}  // end resetImageList
+}
 
 // ImagePacker::addDirectory ==================================================
 /** Add the directory to the directory list, do not add it if it is already
@@ -646,12 +645,12 @@ void ImagePacker::addDirectory( char *path, Bool subDirs )
 	dir = new ImageDirectory;
 	if( dir == NULL )
 	{
-		
-		MessageBox( NULL, "Unable to allocate image directory", "Error", 
+
+		MessageBox( NULL, "Unable to allocate image directory", "Error",
 								MB_OK | MB_ICONERROR );
 		return;
 
-	}  // end if
+	}
 
 	// allocate space for the path
 	Int len = strlen( path );
@@ -665,7 +664,7 @@ void ImagePacker::addDirectory( char *path, Bool subDirs )
 		delete dir;
 		return;
 
-	}  // end if
+	}
 
 	// tie to list
 	dir->m_prev = NULL;
@@ -673,7 +672,7 @@ void ImagePacker::addDirectory( char *path, Bool subDirs )
 	if( m_dirList )
 		m_dirList->m_prev = dir;
 	m_dirList = dir;
-	
+
 	// increase our directory count
 	m_dirCount++;
 
@@ -684,23 +683,23 @@ void ImagePacker::addDirectory( char *path, Bool subDirs )
 	// count how many image files are in this directory
 	hFile = FindFirstFile( "*", &item);
 	if( hFile != INVALID_HANDLE_VALUE )
-	{  
+	{
 
 		// if this is a file count it
 		if( !(item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-				strcmp( item.cFileName, "." ) && 
-				strcmp( item.cFileName, ".." ) )
+				strcmp( item.cFileName, "." ) != 0 &&
+				strcmp( item.cFileName, ".." ) != 0 )
 		{
 
 			len = strlen( item.cFileName );
-			if( len > 4 && 
+			if( len > 4 &&
 					item.cFileName[ len - 4 ] == '.' &&
 					(item.cFileName[ len - 3 ] == 't' || item.cFileName[ len - 3 ] == 'T') &&
 					(item.cFileName[ len - 2 ] == 'g' || item.cFileName[ len - 2 ] == 'G') &&
 					(item.cFileName[ len - 1 ] == 'a' || item.cFileName[ len - 1 ] == 'A') )
 				dir->m_imageCount++;
 
-		}  // end if
+		}
 
 		// find the rest of the files
 		while( FindNextFile( hFile, &item ) != 0 )
@@ -708,26 +707,26 @@ void ImagePacker::addDirectory( char *path, Bool subDirs )
 
 			// if this is a file count it
 			if( !(item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-					strcmp( item.cFileName, "." ) && 
-					strcmp( item.cFileName, ".." ) )
+					strcmp( item.cFileName, "." ) != 0 &&
+					strcmp( item.cFileName, ".." ) != 0 )
 			{
 
 				len = strlen( item.cFileName );
-				if( len > 4 && 
+				if( len > 4 &&
 						item.cFileName[ len - 4 ] == '.' &&
 						(item.cFileName[ len - 3 ] == 't' || item.cFileName[ len - 3 ] == 'T') &&
 						(item.cFileName[ len - 2 ] == 'g' || item.cFileName[ len - 2 ] == 'G') &&
 						(item.cFileName[ len - 1 ] == 'a' || item.cFileName[ len - 1 ] == 'A') )
 					dir->m_imageCount++;
 
-			}  // end if
+			}
 
-		}  // end while
+		}
 
 		// close search
 		FindClose( hFile );
 
-	}  //end if, items found
+	}
 
 	// add the image count of this directory to the total image count
 	m_imagesInDirs += dir->m_imageCount;
@@ -737,21 +736,21 @@ void ImagePacker::addDirectory( char *path, Bool subDirs )
 	{
 		char subDir[ _MAX_PATH ];
 
-		// go through each item in the output directory		
+		// go through each item in the output directory
 		hFile = FindFirstFile( "*", &item);
 		if( hFile != INVALID_HANDLE_VALUE )
-		{  
+		{
 
 			// if this is a file count it
 			if( (item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-					strcmp( item.cFileName, "." ) && 
-					strcmp( item.cFileName, ".." ) )
+					strcmp( item.cFileName, "." ) != 0 &&
+					strcmp( item.cFileName, ".." ) != 0 )
 			{
 
 				sprintf( subDir, "%s%s\\", path, item.cFileName );
 				addDirectory( subDir, subDirs );
 
-			}  // end if
+			}
 
 			// find the rest of the files
 			while( FindNextFile( hFile, &item ) != 0 )
@@ -759,28 +758,28 @@ void ImagePacker::addDirectory( char *path, Bool subDirs )
 
 				// if this is a file count it
 				if( (item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-						strcmp( item.cFileName, "." ) && 
-						strcmp( item.cFileName, ".." ) )
+						strcmp( item.cFileName, "." ) != 0 &&
+						strcmp( item.cFileName, ".." ) != 0 )
 				{
 
 					sprintf( subDir, "%s%s\\", path, item.cFileName );
 					addDirectory( subDir, subDirs );
 
-				}  // end if
+				}
 
-			}  // end while
+			}
 
 			// close search
 			FindClose( hFile );
 
-		}  //end if, items found
+		}
 
-	}  // end if
+	}
 
 	// restore our current directory
 	SetCurrentDirectory( currDir );
 
-}  // end addDirectory
+}
 
 // ImagePacker::addImage ======================================================
 /** Add the image to the image list */
@@ -801,7 +800,7 @@ void ImagePacker::addImage( char *path )
 								MB_OK | MB_ICONERROR );
 		return;
 
-	}  // end if
+	}
 
 	// allocate space for the path
 	Int len = strlen( path );
@@ -815,7 +814,7 @@ void ImagePacker::addImage( char *path )
 		delete info;
 		return;
 
-	}  // end if
+	}
 
 	// load just the header information from the targa
 	m_targa->Load( info->m_path, 0, TRUE );
@@ -838,25 +837,24 @@ void ImagePacker::addImage( char *path )
 			break;
 		}
 
-	}  // end for i
+	}
 
 	Int nameLen = strlen( c );
 	info->m_filenameOnly = new char[ nameLen + 1 ];
 	strcpy( info->m_filenameOnly, c );
 
 	info->m_filenameOnlyNoExt = new char[ nameLen - 4 + 1 ];
-	strncpy( info->m_filenameOnlyNoExt, c, nameLen - 4 );
-	info->m_filenameOnlyNoExt[ nameLen - 4 ] = '\0';
+	strlcpy( info->m_filenameOnlyNoExt, c, nameLen - 4 + 1 );
 
 	// assign to array
 	m_imageList[ m_imageCount++ ] = info;
 
 	// update status
-	sprintf( m_statusBuffer, "Loading Image %d of %d.", 
+	sprintf( m_statusBuffer, "Loading Image %d of %d.",
 					 m_imageCount, m_imagesInDirs );
 	statusMessage( m_statusBuffer );
 
-}  // end addImage
+}
 
 // ImagePacker::generateINIFile ===============================================
 /** Generate the INI image file definition for the final packed images */
@@ -879,7 +877,7 @@ Bool ImagePacker::generateINIFile( void )
 		MessageBox( NULL, buffer, "Error Opening File", MB_OK | MB_ICONERROR );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// print header for file
 	fprintf( fp, "; ------------------------------------------------------------\n" );
@@ -889,7 +887,7 @@ Bool ImagePacker::generateINIFile( void )
 	//
 	// loop through all the pages so that we write image definitions that
 	// are on the same page close together in the file, note we're
-	// going backwards through the page list because page 1 is at the 
+	// going backwards through the page list because page 1 is at the
 	// tail and I want them to print out in number order, but it
 	// doesn't really matter
 	//
@@ -903,8 +901,8 @@ Bool ImagePacker::generateINIFile( void )
 			continue;
 
 		// go through each image on this page
-		for( image = page->getFirstImage(); 
-				 image; 
+		for( image = page->getFirstImage();
+				 image;
 				 image = image->m_nextPageImage )
 		{
 
@@ -921,21 +919,21 @@ Bool ImagePacker::generateINIFile( void )
 			fprintf( fp, "  Coords = Left:%d Top:%d Right:%d Bottom:%d\n",
 							 image->m_pagePos.lo.x, image->m_pagePos.lo.y,
 							 image->m_pagePos.hi.x + 1, image->m_pagePos.hi.y + 1 );
-			fprintf( fp, "  Status = %s\n", 
-							 BitIsSet( image->m_status, ImageInfo::ROTATED90C ) ? 
+			fprintf( fp, "  Status = %s\n",
+							 BitIsSet( image->m_status, ImageInfo::ROTATED90C ) ?
 												"ROTATED_90_CLOCKWISE" : "NONE" );
 			fprintf( fp, "End\n\n" );
 
-		}  // end for image
+		}
 
-	}  // end for page
+	}
 
 	// close the file
 	fclose( fp );
 
 	return TRUE;  // success
 
-}  // end generateINIFile
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -975,12 +973,12 @@ Bool ImagePacker::getSettingsFromDialog( HWND dialog )
 									"Must Be Power Of 2", MB_OK | MB_ICONERROR );
 			return FALSE;
 
-		}  // end if
+		}
 
 		// set the size for the image packer
 		setTargetSize( size, size );
 
-	}  // end if
+	}
 	else if( IsDlgButtonChecked( dialog, RADIO_128X128 ) )
 		setTargetSize( 128, 128 );
 	else if( IsDlgButtonChecked( dialog, RADIO_256X256 ) )
@@ -994,56 +992,56 @@ Bool ImagePacker::getSettingsFromDialog( HWND dialog )
 								"Error", MB_OK | MB_ICONERROR );
 		return FALSE;
 
-	}  // end else
-	
+	}
+
 	// get alpha option
 	Bool outputAlpha = FALSE;
 	if( IsDlgButtonChecked( dialog, CHECK_ALPHA ) == BST_CHECKED )
 		outputAlpha = TRUE;
-	TheImagePacker->setOutputAlpha( outputAlpha );
+	setOutputAlpha( outputAlpha );
 
 	// get create INI option
 	Bool createINI = FALSE;
 	if( IsDlgButtonChecked( dialog, CHECK_INI ) == BST_CHECKED )
 		createINI = TRUE;
-	TheImagePacker->setINICreate( createINI );
+	setINICreate( createINI );
 
 	// get preview with image option
 	Bool useBitmap = FALSE;
 	if( IsDlgButtonChecked( dialog, CHECK_BITMAP_PREVIEW ) == BST_CHECKED )
 		useBitmap = TRUE;
-	TheImagePacker->setUseTexturePreview( useBitmap );
+	setUseTexturePreview( useBitmap );
 
 	// get option to compress final textures
 	Bool compress = FALSE;
 	if( IsDlgButtonChecked( dialog, CHECK_COMPRESS ) == BST_CHECKED )
 		compress = TRUE;
-	TheImagePacker->setCompressTextures( compress );
+	setCompressTextures( compress );
 
 	// get options for the gap options
-	TheImagePacker->clearGapMethod( ImagePacker::GAP_METHOD_EXTEND_RGB );
+	clearGapMethod( ImagePacker::GAP_METHOD_EXTEND_RGB );
 	if( IsDlgButtonChecked( dialog, CHECK_GAP_EXTEND_RGB ) == BST_CHECKED )
-		TheImagePacker->setGapMethod( ImagePacker::GAP_METHOD_EXTEND_RGB );
-	TheImagePacker->clearGapMethod( ImagePacker::GAP_METHOD_GUTTER );
+		setGapMethod( ImagePacker::GAP_METHOD_EXTEND_RGB );
+	clearGapMethod( ImagePacker::GAP_METHOD_GUTTER );
 	if( IsDlgButtonChecked( dialog, CHECK_GAP_GUTTER ) == BST_CHECKED )
-		TheImagePacker->setGapMethod( ImagePacker::GAP_METHOD_GUTTER );
+		setGapMethod( ImagePacker::GAP_METHOD_GUTTER );
 
 	// get gutter size whether we are using that option or not
 	Int gutter = GetDlgItemInt( dialog, EDIT_GUTTER, NULL, FALSE );
 	if( gutter < 0 )
 		gutter = 0;
 	setGutter( gutter );
-						
+
 	// save the filename to output
 	GetDlgItemText( dialog, EDIT_FILENAME, m_outputFile, MAX_OUTPUT_FILE_LEN - 1 );
-	
+
 	// check for illegal characters in the output name
 	Int len = strlen( m_outputFile );
 	for( i = 0; i < len; i++ )
 	{
 		const char *illegal = "/\\:*?<>|";
 		Int illegalLen = strlen( illegal );
-		
+
 		for( Int j = 0; j < illegalLen; j++ )
 		{
 
@@ -1051,16 +1049,16 @@ Bool ImagePacker::getSettingsFromDialog( HWND dialog )
 			{
 				char buffer[ 256 ];
 
-				sprintf( buffer, "Output filename '%s' contains one or more of the following illegal characters:\n\n%s", 
+				sprintf( buffer, "Output filename '%s' contains one or more of the following illegal characters:\n\n%s",
 								 m_outputFile, illegal );
 				MessageBox( NULL, buffer, "Illegal Filename", MB_OK | MB_ICONERROR );
 				return FALSE;
 
-			}  // end if
+			}
 
-		}  // end for j
+		}
 
-	}  // end for i
+	}
 
 	// get the work on sub-folders option
 	m_useSubFolders = IsDlgButtonChecked( dialog, CHECK_USE_SUB_FOLDERS );
@@ -1078,18 +1076,18 @@ Bool ImagePacker::getSettingsFromDialog( HWND dialog )
 	{
 
 		// get text from the listbox
-		SendDlgItemMessage( dialog, LIST_FOLDERS,		
+		SendDlgItemMessage( dialog, LIST_FOLDERS,
 												LB_GETTEXT, i, (LPARAM)buffer );
 
 		// add the directory
 		addDirectory( buffer, m_useSubFolders );
 
-	}  // end for i
+	}
 
 	// all done
 	return TRUE;
 
-}  // end getSettingsFromDialog
+}
 
 // ImagePacker::ImagePacker ===================================================
 /** */
@@ -1124,7 +1122,7 @@ ImagePacker::ImagePacker( void )
 	m_targa = NULL;
 	m_compressTextures = FALSE;
 
-}  // end ImagePacker
+}
 
 // ImagePacker::~ImagePacker ==================================================
 /** */
@@ -1138,10 +1136,9 @@ ImagePacker::~ImagePacker( void )
 	resetPageList();
 
 	// delete our targa header loader
-	if( m_targa )
-		delete m_targa;
+	delete m_targa;
 
-}  // end ~ImagePacker
+}
 
 // ImagePacker::init ==========================================================
 /** Initialize the image packer system */
@@ -1153,17 +1150,17 @@ Bool ImagePacker::init( void )
 	m_targa = new Targa;
 	if( m_targa == NULL )
 	{
-		
-		DEBUG_ASSERTCRASH( m_targa, ("Unable to allocate targa header during init\n") );
+
+		DEBUG_ASSERTCRASH( m_targa, ("Unable to allocate targa header during init") );
 		MessageBox( NULL, "ImagePacker can't init, unable to create targa",
 								"Internal Error", MB_OK | MB_ICONERROR );
 		return FALSE;
 
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end init
+}
 
 // ImagePacker::statusMessage =================================================
 /** Status message for the program */
@@ -1173,7 +1170,7 @@ void ImagePacker::statusMessage( const char *message )
 
 	SetDlgItemText( getWindowHandle(), STATIC_STATUS, message );
 
-}  // end statusMessage
+}
 
 // ImagePacker::process =======================================================
 /** Run the packing process */
@@ -1188,8 +1185,8 @@ Bool ImagePacker::process( void )
 	CreateDirectory( m_outputDirectory, NULL );
 
 	// subdir of output directory based on output image name
-	strcat( m_outputDirectory, m_outputFile );
-	strcat( m_outputDirectory, "\\" );
+	strlcat(m_outputDirectory, m_outputFile, ARRAY_SIZE(m_outputDirectory));
+	strlcat(m_outputDirectory, "\\", ARRAY_SIZE(m_outputDirectory));
 
 	//
 	// check for existing images in the output directory ... if we have
@@ -1202,7 +1199,7 @@ Bool ImagePacker::process( void )
 		statusMessage( "Build Process Cancelled." );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// reset the contents of our image list and existing textures
 	resetImageList();
@@ -1241,9 +1238,9 @@ Bool ImagePacker::process( void )
 						 m_pageCount, m_imageCount, m_dirCount );
 		statusMessage( m_statusBuffer );
 
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end process
+}
 
diff --git a/Core/Tools/ImagePacker/Source/TexturePage.cpp b/Core/Tools/ImagePacker/Source/TexturePage.cpp
index ad0d5343a36..e463a558f4b 100644
--- a/Core/Tools/ImagePacker/Source/TexturePage.cpp
+++ b/Core/Tools/ImagePacker/Source/TexturePage.cpp
@@ -18,12 +18,12 @@
 
 // FILE: TexturePage.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -40,7 +40,7 @@
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
-#include <stdio.h>
+#include <Utility/stdio_adapter.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
@@ -62,15 +62,15 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // TexturePage::extendToRowIfOpen =============================================
-/** If the pixel at location 'row' is "open", then extend the pixel 
+/** If the pixel at location 'row' is "open", then extend the pixel
 	* at 'src' to that location
 	*
 	* NOTE this assumes 'src' and 'row' are pointers into the same
 	* buffer and the bits per pixel (buffBPP) are treated as the
 	* same for both */
 //=============================================================================
-void TexturePage::extendToRowIfOpen( char *src, 
-																		 Int buffWidth, 
+void TexturePage::extendToRowIfOpen( char *src,
+																		 Int buffWidth,
 																		 Int buffBPP,
 																		 Bool extendAlpha,
 																		 Int imageHeight,
@@ -100,16 +100,16 @@ void TexturePage::extendToRowIfOpen( char *src,
 		row = src + (buffWidth * buffBPP);
 
 
-	}  // end if
+	}
 	else if( srcY >= imageHeight / 2 &&
-					 (srcY != imageHeight - 1 || 
+					 (srcY != imageHeight - 1 ||
 						BitIsSet( fitBits, ImageInfo::FIT_YBORDER_BOTTOM )) )
 	{
 
 		// try to extend pixel "down" if that pixel is "open"
 		row = src - (buffWidth * buffBPP);
 
-	}  // end else
+	}
 
 	//
 	// if a 'row' is available, try to extend the current pixel
@@ -127,7 +127,7 @@ void TexturePage::extendToRowIfOpen( char *src,
 			otherColor[ 1 ] = row[ 2 ];
 			otherColor[ 2 ] = row[ 3 ];
 
-		}  // end if
+		}
 		else
 		{
 
@@ -135,7 +135,7 @@ void TexturePage::extendToRowIfOpen( char *src,
 			otherColor[ 1 ] = row[ 1 ];
 			otherColor[ 2 ] = row[ 2 ];
 
-		}  // end else
+		}
 
 		//
 		// see if this pixel is "open", again we prefer to check the
@@ -148,7 +148,7 @@ void TexturePage::extendToRowIfOpen( char *src,
 			if( otherAlpha == 0 )
 				otherOpen = TRUE;
 
-		}  // end if
+		}
 		else
 		{
 
@@ -157,7 +157,7 @@ void TexturePage::extendToRowIfOpen( char *src,
 					otherColor[ 2 ] == 0 )
 				otherOpen = TRUE;
 
-		}  // end else
+		}
 
 		// copy pixel data from 'src' to 'row' if 'row' is "open"
 		if( otherOpen == TRUE )
@@ -174,7 +174,7 @@ void TexturePage::extendToRowIfOpen( char *src,
 				color[ 1 ] = src[ 2 ];
 				color[ 2 ] = src[ 3 ];
 
-			}  // end if
+			}
 			else
 			{
 
@@ -182,7 +182,7 @@ void TexturePage::extendToRowIfOpen( char *src,
 				color[ 1 ] = src[ 1 ];
 				color[ 2 ] = src[ 2 ];
 
-			}  // end else
+			}
 
 			// copy the pixel to 'row'
 			if( buffBPP == 4 )
@@ -194,7 +194,7 @@ void TexturePage::extendToRowIfOpen( char *src,
 				row[ 2 ] = color[ 1 ];
 				row[ 3 ] = color[ 2 ];
 
-			}  // end if
+			}
 			else
 			{
 
@@ -202,13 +202,13 @@ void TexturePage::extendToRowIfOpen( char *src,
 				row[ 1 ] = color[ 1 ];
 				row[ 2 ] = color[ 2 ];
 
-			}  // end else
+			}
 
-		}  // end if, other spot is open, copy it
+		}
 
-	}  // end if, row
+	}
 
-}  // end extendToRowIfOpen
+}
 
 // TexturePage::extendImageEdges ==============================================
 /** We want to extend the image data in destBuffer at the location region
@@ -244,14 +244,14 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 		imageWidth = image->m_size.y;
 		imageHeight = image->m_size.x;
 
-	}  // end if
+	}
 	else
 	{
 
 		imageWidth = image->m_size.x;
 		imageHeight = image->m_size.y;
 
-	}  // end else
+	}
 
 	Int x, y;
 	char *ptr;
@@ -262,14 +262,14 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 	{
 
 		// compute beginning of destination row
-		ptr = destBuffer + 
-				  ((destHeight - 1 - (image->m_pagePos.lo.y + y)) * destWidth * destBPP ) + 
+		ptr = destBuffer +
+				  ((destHeight - 1 - (image->m_pagePos.lo.y + y)) * destWidth * destBPP ) +
 				  (image->m_pagePos.lo.x * destBPP);
 
 		prevPixel = FALSE;
 		for( x = 0; x < imageWidth; x++ )
 		{
-	
+
 			// read the pixel
 			if( destBPP == 4 )
 			{
@@ -279,7 +279,7 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 				color[ 1 ] = ptr[ 2 ];
 				color[ 2 ] = ptr[ 3 ];
 
-			}  // end if
+			}
 			else
 			{
 
@@ -287,7 +287,7 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 				color[ 1 ] = ptr[ 1 ];
 				color[ 2 ] = ptr[ 2 ];
 
-			}  // end else
+			}
 
 			//
 			// see wheter or not we have data at this pixel, if we have alpha
@@ -301,7 +301,7 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 				if( alpha != 0 )
 					currPixel = TRUE;
 
-			}  // end if
+			}
 			else
 			{
 
@@ -310,12 +310,12 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 						color[ 2 ] != 0 )
 					currPixel = TRUE;
 
-			}  // end else
+			}
 
 			//
-			// if we're at the right edge we will extend this pixel off the 
+			// if we're at the right edge we will extend this pixel off the
 			// image to the right border if present, we dont' have to worry about
-			// the top and bottom edges because they are attempted to be 
+			// the top and bottom edges because they are attempted to be
 			// extended into when we detect an edge change moving across x
 			//
 			if( currPixel == TRUE && x == imageWidth - 1 &&
@@ -335,7 +335,7 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 					*(ptr + 6) = color[ 1 ];
 					*(ptr + 7) = color[ 2 ];
 
-				}  // end if
+				}
 				else
 				{
 
@@ -343,16 +343,16 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 					*(ptr + 4) = color[ 1 ];
 					*(ptr + 5) = color[ 2 ];
 
-				}  // end else
+				}
 
-			}  // end if
+			}
 
 			//
 			// if we have a pixel here, attempt to extend it to the above
 			// or below row if that spot is empty
 			//
 			if( currPixel == TRUE )
-				extendToRowIfOpen( ptr, destWidth, destBPP, extendAlpha, 
+				extendToRowIfOpen( ptr, destWidth, destBPP, extendAlpha,
 													 imageHeight, image->m_fitBits, x, y );
 
 			//
@@ -377,9 +377,9 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 					*(ptr - 2) = color[ 1 ];
 					*(ptr - 1) = color[ 2 ];
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else if( prevPixel == TRUE && currPixel == FALSE )
 			{
 
@@ -389,7 +389,7 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 				//
 
 				//
-				// this assert should never happen because if x were 0, we are on the 
+				// this assert should never happen because if x were 0, we are on the
 				// first column in this image, and the prevPixel should be FALSE since
 				// previous would be "off" the image which is by definition "open"
 				//
@@ -405,7 +405,7 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 					ptr[ 2 ] = *(ptr - 2);
 					ptr[ 3 ] = *(ptr - 1);
 
-				}  // end if
+				}
 				else
 				{
 
@@ -413,9 +413,9 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 					ptr[ 1 ] = *(ptr - 2);
 					ptr[ 2 ] = *(ptr - 1);
 
-				}  // end else
+				}
 
-			}  // end else if
+			}
 
 			//
 			// one more time now for a special case in the corners of the extended
@@ -429,7 +429,7 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 				char *dst = NULL;
 
 				// top left corner
-				if( x == 0 && y == 0 && 
+				if( x == 0 && y == 0 &&
 						BitIsSet( image->m_fitBits, ImageInfo::FIT_XBORDER_LEFT ) &&
 						BitIsSet( image->m_fitBits, ImageInfo::FIT_YBORDER_TOP ) )
 					dst = (ptr + (destWidth * destBPP)) - destBPP;
@@ -465,7 +465,7 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 						dst[ 2 ] = color[ 1 ];
 						dst[ 3 ] = color[ 2 ];
 
-					}  // end if
+					}
 					else
 					{
 
@@ -473,11 +473,11 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 						dst[ 1 ] = color[ 1 ];
 						dst[ 2 ] = color[ 2 ];
 
-					}  // end else
+					}
 
-				}  // end if dst
+				}
 
-			}  // end if
+			}
 
 			// move to the next pixel
 			ptr += destBPP;
@@ -488,11 +488,11 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 			//
 			prevPixel = currPixel;
 
-		}  // end for x	
+		}
 
-	}  // end for y
+	}
 
-}  // end extendImageEdges
+}
 
 // TexturePage::addImageData ==================================================
 /** Add the actual image data from 'image' to the destination buffer
@@ -503,11 +503,11 @@ void TexturePage::extendImageEdges( Byte *destBuffer,
 	* assumption that we were packing images with an upper left
 	* corner at (0,0), but the targa files have the origin in the
 	* lower left corner ... thus the translation here to shift source
-	* images into the right positions 
+	* images into the right positions
 	*/
 //=============================================================================
 Bool TexturePage::addImageData( Byte *destBuffer,
-																Int destWidth, 
+																Int destWidth,
 																Int destHeight,
 																Int destBPP,
 																ImageInfo *image )
@@ -528,11 +528,11 @@ Bool TexturePage::addImageData( Byte *destBuffer,
 		MessageBox( NULL, buffer, "Cannot Load Source File", MB_OK | MB_ICONERROR );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// get the source image buffer
 	char *sourceBuffer = source.GetImage();
-	DEBUG_ASSERTCRASH( sourceBuffer, ("No Source buffer for source image\n") );
+	DEBUG_ASSERTCRASH( sourceBuffer, ("No Source buffer for source image") );
 
 	// get the source bytes per pixel
 	Int sourceBPP = TGA_BytesPerPixel( source.Header.PixelDepth );
@@ -561,8 +561,8 @@ Bool TexturePage::addImageData( Byte *destBuffer,
 			src = sourceBuffer + ( (image->m_size.y - 1 - y) * image->m_size.x * sourceBPP);
 
 			// compute destination location
-			dest = destBuffer + 
-						 ((destHeight - 1 - (image->m_pagePos.lo.y + y)) * destWidth * destBPP ) + 
+			dest = destBuffer +
+						 ((destHeight - 1 - (image->m_pagePos.lo.y + y)) * destWidth * destBPP ) +
 						 (image->m_pagePos.lo.x * destBPP);
 
 			// copy a row from source to destination
@@ -585,7 +585,7 @@ Bool TexturePage::addImageData( Byte *destBuffer,
 					else
 						dest[ 0 ] = (char)0xFF;  // solid alpha
 
-				}  // end if
+				}
 				else
 				{
 
@@ -594,17 +594,17 @@ Bool TexturePage::addImageData( Byte *destBuffer,
 					dest[ 1 ] = src[ 1 ];
 					dest[ 0 ] = src[ 2 ];
 
-				}  // end else
+				}
 
 				// skip past all these pixels
 				dest += destBPP;
 				src += sourceBPP;
-			
-			}  // end for x
 
-		}  // end for y
+			}
+
+		}
 
-	}  // end if, not rotated
+	}
 	else
 	{
 
@@ -624,7 +624,7 @@ Bool TexturePage::addImageData( Byte *destBuffer,
 			{
 
 				// compute destination location
-				dest = destBuffer + 
+				dest = destBuffer +
 							 ( ( (destHeight - 1) - (image->m_pagePos.lo.y + x) ) * destWidth * destBPP ) +
 							 ((image->m_pagePos.lo.x + (image->m_size.y - 1 - y)) * destBPP);
 
@@ -643,7 +643,7 @@ Bool TexturePage::addImageData( Byte *destBuffer,
 					else
 						dest[ 0 ] = (char)0xFF;  // solid alpha
 
-				}  // end if
+				}
 				else
 				{
 
@@ -652,24 +652,24 @@ Bool TexturePage::addImageData( Byte *destBuffer,
 					dest[ 1 ] = src[ 1 ];
 					dest[ 0 ] = src[ 2 ];
 
-				}  // end else
+				}
 
 				// skip past all these pixels
 				dest += destBPP;
 				src += sourceBPP;
 
-			}  // end for x
+			}
 
-		}  // end for y
+		}
 
-	}  // end else
+	}
 
 	//
 	// if we have the option to extend the RGB edges on we now need to process
 	// the image we just copied into the texture page and "bleed" the edges outward
 	// and if a border is present, into the border
 	//
-	if( BitIsSet( TheImagePacker->getGapMethod(), 
+	if( BitIsSet( TheImagePacker->getGapMethod(),
 							 ImagePacker::GAP_METHOD_EXTEND_RGB ) )
 		extendImageEdges( destBuffer,
 											destWidth,
@@ -677,10 +677,10 @@ Bool TexturePage::addImageData( Byte *destBuffer,
 											destBPP,
 											image,
 											FALSE );
-		
+
 	return TRUE;  // all done
 
-}  // end addImageData
+}
 
 // TexturePage::spotUsed ======================================================
 /** Is this spot in the texture page open? */
@@ -690,7 +690,7 @@ Bool TexturePage::spotUsed( Int x, Int y )
 
 	return m_canvas[ y * m_size.y + x ];
 
-}  // end spotUsed
+}
 
 // TexturePage::lineUsed ======================================================
 /** Is there ANY spot in the line specified that is used */
@@ -711,11 +711,11 @@ Bool TexturePage::lineUsed( Int sx, Int sy, Int ex, Int ey )
 			if( *ptr == USED )
 				return USED;
 
-	}  // end for y
+	}
 
 	return FALSE;  // it's open!
 
-}  // end lineUsed
+}
 
 // TexturePage::markRegionUsed ================================================
 /** Mark this region as used */
@@ -737,9 +737,9 @@ void TexturePage::markRegionUsed( IRegion2D *region )
 		count = (region->hi.x - region->lo.x) + 1;
 		memset( ptr, USED, count );
 
-	}  // end for
+	}
 
-}  // end markRegionUsed
+}
 
 // TexturePage::buildFitRegion ================================================
 /** Build an image region to try to fit into the page based on the location
@@ -747,23 +747,23 @@ void TexturePage::markRegionUsed( IRegion2D *region )
 	* size
 	*
 	* Note that x and y Gutter sizes can be changed as a result of this
-	* method 
+	* method
 	*
 	* Returns a set of "fit bits" that describe what the components
 	* have been included in the region constructed
 	*/
 //=============================================================================
 UnsignedInt TexturePage::buildFitRegion( IRegion2D *region,
-																				 Int startX, Int startY, 
-																				 Int imageWidth, Int imageHeight, 
-																				 Int *xGutter, Int *yGutter, 
+																				 Int startX, Int startY,
+																				 Int imageWidth, Int imageHeight,
+																				 Int *xGutter, Int *yGutter,
 																				 Bool allSidesBorder )
 {
 
 	// sanity
 	if( region == NULL || xGutter == NULL || yGutter == NULL )
 		return 0;
-	
+
 	//
 	// create border size, if we have an 'allSidesBorder' then we need to
 	// add two pixels to width and height
@@ -775,7 +775,7 @@ UnsignedInt TexturePage::buildFitRegion( IRegion2D *region,
 		xBorder = 2;
 		yBorder = 2;
 
-	}  // end if
+	}
 
 	//
 	// when the image size exactly matches the target size of the texture
@@ -788,14 +788,14 @@ UnsignedInt TexturePage::buildFitRegion( IRegion2D *region,
 		*xGutter = 0;
 		xBorder = 0;
 
-	}  // end if
+	}
 	if( imageHeight == m_size.y )
 	{
-		
+
 		*yGutter = 0;
 		yBorder = 0;
 
-	}  // end if
+	}
 
 	//
 	// when an image is 1 pixel smaller than the destination texture
@@ -819,7 +819,7 @@ UnsignedInt TexturePage::buildFitRegion( IRegion2D *region,
 	//
 	// build a set of region bit flags that tell what this region ACTUALLY
 	// used in its construction. Note that when we stripped off only ONE
-	// pixel off one dimension when talking about borders, we say that the 
+	// pixel off one dimension when talking about borders, we say that the
 	// border that we added was either on the right side of the image,
 	// or on the bottom of the image
 	//
@@ -839,7 +839,7 @@ UnsignedInt TexturePage::buildFitRegion( IRegion2D *region,
 
 	return fitBits;
 
-}  // end buildFitRegion
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -863,10 +863,10 @@ TexturePage::TexturePage( Int width, Int height )
 	// create a "canvas" to represent used and unused areas
 	canvasSize = m_size.x * m_size.y;
 	m_canvas = new UnsignedByte[ canvasSize ];
-	DEBUG_ASSERTCRASH( m_canvas, ("Cannot allocate canvas for texture page\n") );
+	DEBUG_ASSERTCRASH( m_canvas, ("Cannot allocate canvas for texture page") );
 	memset( m_canvas, FREE, sizeof( UnsignedByte ) * canvasSize );
 
-}  // end TexturePage
+}
 
 // TexturePage::~TexturePage ==================================================
 /**  */
@@ -875,18 +875,15 @@ TexturePage::~TexturePage( void )
 {
 
 	// delete the canvas
-	if( m_canvas )
-		delete [] m_canvas;
+	delete [] m_canvas;
 
 	// delete targa if present, this will NOT delete a user assigned image buffer
-	if( m_targa )
-		delete m_targa;
+	delete m_targa;
 
 	// delete the final image buffer if present
-	if( m_packedImage )
-		delete [] m_packedImage;
+	delete [] m_packedImage;
 
-}  // end ~TexturePage
+}
 
 // TexturePage::addImage ======================================================
 /** If this image will fit on this page, add it */
@@ -894,19 +891,19 @@ TexturePage::~TexturePage( void )
 Bool TexturePage::addImage( ImageInfo *image )
 {
 	IRegion2D region;
-	
+
 	// santiy
 	if( image == NULL )
 	{
 
-		DEBUG_ASSERTCRASH( image, ("TexturePage::addImage: NULL image!\n") );
+		DEBUG_ASSERTCRASH( image, ("TexturePage::addImage: NULL image!") );
 		return TRUE;  // say it was added
 
-	}  // end if
+	}
 
 	// get our options for fitting
 	Bool useGutter, useRGBExtend;
-	useGutter = BitIsSet( TheImagePacker->getGapMethod(), 
+	useGutter = BitIsSet( TheImagePacker->getGapMethod(),
 											 ImagePacker::GAP_METHOD_GUTTER );
 	useRGBExtend = BitIsSet( TheImagePacker->getGapMethod(),
 													ImagePacker::GAP_METHOD_EXTEND_RGB );
@@ -945,14 +942,14 @@ Bool TexturePage::addImage( ImageInfo *image )
 					xGutter = TheImagePacker->getGutter();
 					yGutter = TheImagePacker->getGutter();
 
-				}  // end if
+				}
 				else
 				{
 
 					xGutter = 0;
 					yGutter = 0;
 
-				}  // end else
+				}
 
 				//
 				// compute the region of the image at this location, the region that will
@@ -969,7 +966,7 @@ Bool TexturePage::addImage( ImageInfo *image )
 					imageWidth = image->m_size.x;
 					imageHeight = image->m_size.y;
 
-				}  // end if
+				}
 				else
 				{
 
@@ -994,11 +991,11 @@ Bool TexturePage::addImage( ImageInfo *image )
 					imageWidth = image->m_size.y;
 					imageHeight = image->m_size.x;
 
-				}  // end else
+				}
 
 				// build the region
-				fitBits = buildFitRegion( &region, x, y, 
-																	imageWidth, imageHeight, 
+				fitBits = buildFitRegion( &region, x, y,
+																	imageWidth, imageHeight,
 																	&xGutter, &yGutter,
 																	useRGBExtend );
 
@@ -1022,16 +1019,16 @@ Bool TexturePage::addImage( ImageInfo *image )
 						xGutter = m_size.x - imageWidth;
 
 					// rebuild region with new gutter size
-					fitBits = buildFitRegion( &region, x, y, 
-																		imageWidth, imageHeight, 
+					fitBits = buildFitRegion( &region, x, y,
+																		imageWidth, imageHeight,
 																		&xGutter, &yGutter,
 																		useRGBExtend );
 
 
-				}  // end if
+				}
 				if( region.hi.y >= m_size.y )
 				{
-		
+
 					//
 					// attempt to shrink y gutter if image can still fit with
 					// a smaller gutter below
@@ -1040,28 +1037,28 @@ Bool TexturePage::addImage( ImageInfo *image )
 						yGutter = m_size.y - imageHeight;
 
 					// rebuild region with new gutter size
-					fitBits = buildFitRegion( &region, x, y, 
-																		imageWidth, imageHeight, 
+					fitBits = buildFitRegion( &region, x, y,
+																		imageWidth, imageHeight,
 																		&xGutter, &yGutter,
 																		useRGBExtend );
 
-				}  // end if
+				}
 
 				// reject this location if the hi region goes off the texture page
 				if( region.hi.y >= m_size.y )
 				{
-					
+
 					y = m_size.y;  // skip to end, this isn't gonna work
 					continue;
 
-				}  // end if
+				}
 				if( region.hi.x >= m_size.x )
 				{
 
 					x = m_size.x;  // skip to end of row to try next row
 					continue;
 
-				}  // end if
+				}
 
 				//
 				// reject this location if any of the corners are in used spots,
@@ -1081,7 +1078,7 @@ Bool TexturePage::addImage( ImageInfo *image )
 					x = region.hi.x;  // next anchor spot will be to the right of here
 					continue;
 
-				}  // end if
+				}
 
 				// upper left and lower left
 				if( spotUsed( region.lo.x, region.lo.y ) ||  // upper left
@@ -1146,7 +1143,7 @@ Bool TexturePage::addImage( ImageInfo *image )
 					image->m_pagePos.hi.y--;
 				if( BitIsSet( fitBits, ImageInfo::FIT_XGUTTER ) )
 					image->m_pagePos.hi.x -= xGutter;
-				if( BitIsSet( fitBits, ImageInfo::FIT_YGUTTER ) )	
+				if( BitIsSet( fitBits, ImageInfo::FIT_YGUTTER ) )
 					image->m_pagePos.hi.y -= yGutter;
 
 				// link this image to the texture page
@@ -1158,16 +1155,16 @@ Bool TexturePage::addImage( ImageInfo *image )
 
 				return TRUE;  // success
 
-			}  // end for x
+			}
 
-		}  // end for y
+		}
 
-	}  // end while, triesLeft
+	}
 
 	// no space
 	return FALSE;
 
-}  // end addImage
+}
 
 // TexturePage::generateTexture ===============================================
 /** Generate the final packed texture given all the images that have
@@ -1181,8 +1178,8 @@ Bool TexturePage::generateTexture( void )
 		return FALSE;
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_packedImage == NULL, ("The packed image list must be NULL before generating texture\n") );
-	DEBUG_ASSERTCRASH( m_targa == NULL, ("The targa must be NULL before generating a new texture\n") );
+	DEBUG_ASSERTCRASH( m_packedImage == NULL, ("The packed image list must be NULL before generating texture") );
+	DEBUG_ASSERTCRASH( m_targa == NULL, ("The targa must be NULL before generating a new texture") );
 
 	// allocate targa to help us generate the final texture
 	m_targa = new Targa;
@@ -1195,7 +1192,7 @@ Bool TexturePage::generateTexture( void )
 		MessageBox( NULL, buffer, "Internal Error", MB_OK | MB_ICONERROR );
 		return FALSE;
 
-	}  // end if
+	}
 
 	Bool outputAlpha = TheImagePacker->getOutputAlpha();
 	Int depth, bpp;
@@ -1226,11 +1223,11 @@ Bool TexturePage::generateTexture( void )
 		BitSet( m_status, CANT_ALLOCATE_PACKED_IMAGE );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// zero the packed image to all zero
 	memset( m_packedImage, 0, sizeof( Byte ) * bufferSize );
-	
+
 	// setup the targa header
 	m_targa->Header.ImageType = TGA_TRUECOLOR;
 	m_targa->Header.Width = m_size.x;
@@ -1242,7 +1239,7 @@ Bool TexturePage::generateTexture( void )
 	for( image = m_imageList; image; image = image->m_nextPageImage )
 	{
 
-		if( addImageData( m_packedImage, m_size.x, m_size.y, 
+		if( addImageData( m_packedImage, m_size.x, m_size.y,
 											bpp, image ) == FALSE )
 		{
 
@@ -1250,16 +1247,16 @@ Bool TexturePage::generateTexture( void )
 			BitSet( m_status, CANT_ADD_IMAGE_DATA );
 			return FALSE;
 
-		}  // end if
+		}
 
-	}  // end for image
+	}
 
 	// set this data into the targa structure
 	m_targa->SetImage( m_packedImage );
 
 	return TRUE;  // success
 
-}  // end generateTexture
+}
 
 // TexturePage::writeFile =====================================================
 /** Write the texture data that has already been generated to a file
@@ -1277,11 +1274,11 @@ Bool TexturePage::writeFile( char *baseFilename )
 		BitSet( m_status, NO_TEXTURE_DATA );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// construct filename
 	char filePath[ _MAX_PATH ];
-	sprintf( filePath, "%s%s_%03d.tga", TheImagePacker->getOutputDirectory(), 
+	sprintf( filePath, "%s%s_%03d.tga", TheImagePacker->getOutputDirectory(),
 					 baseFilename, getID() );
 
 	// write the file
@@ -1298,12 +1295,12 @@ Bool TexturePage::writeFile( char *baseFilename )
 		BitSet( m_status, PAGE_ERROR );
 		BitSet( m_status, ERROR_DURING_SAVE );
 
-	}  // end if
+	}
 
 	// return success or not
 	return !error;
 
-}  // end writeFile
+}
 
 // TexturePage::getPixel ======================================================
 /** Get the RGB pixel stored at location (x,y) (where (0,0) is the upper
@@ -1336,7 +1333,7 @@ void TexturePage::getPixel( Int x, Int y, Byte *r, Byte *g, Byte *b, Byte *a )
 		*g = buf[ 2 ];
 		*b = buf[ 3 ];
 
-	}  // end if
+	}
 	else
 	{
 
@@ -1347,6 +1344,6 @@ void TexturePage::getPixel( Int x, Int y, Byte *r, Byte *g, Byte *b, Byte *a )
 		*g = buf[ 1 ];
 		*b = buf[ 2 ];
 
-	}  // end else
+	}
 
-}  // end getPixel
+}
diff --git a/Core/Tools/ImagePacker/Source/WinMain.cpp b/Core/Tools/ImagePacker/Source/WinMain.cpp
index 755978bd5ac..e31f28f4573 100644
--- a/Core/Tools/ImagePacker/Source/WinMain.cpp
+++ b/Core/Tools/ImagePacker/Source/WinMain.cpp
@@ -18,12 +18,12 @@
 
 // FILE: WinMain.cpp //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -84,8 +84,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
                       LPSTR lpCmdLine, Int nCmdShow )
 {
 
-	// start the log
-	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+	// initialize the memory manager early
 	initMemoryManager();
 
 	// save application instance
@@ -104,21 +103,19 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 		TheImagePacker = NULL;
 		return 0;
 
-	}  // end if
-		
+	}
+
 	// load the dialog box
-	DialogBox( hInstance, (LPCTSTR)IMAGE_PACKER_DIALOG, 
+	DialogBox( hInstance, (LPCTSTR)IMAGE_PACKER_DIALOG,
 						 NULL, (DLGPROC)ImagePackerProc );
 
 	// delete the image packer
 	delete TheImagePacker;
 	TheImagePacker = NULL;
 
-	// close the log
 	shutdownMemoryManager();
-	DEBUG_SHUTDOWN();
 
 	// all done
 	return 0;
 
-}  // end WinMain
+}
diff --git a/Core/Tools/ImagePacker/Source/WindowProcedures/DirectorySelect.cpp b/Core/Tools/ImagePacker/Source/WindowProcedures/DirectorySelect.cpp
index 9d7120123bd..190f3fd8a3e 100644
--- a/Core/Tools/ImagePacker/Source/WindowProcedures/DirectorySelect.cpp
+++ b/Core/Tools/ImagePacker/Source/WindowProcedures/DirectorySelect.cpp
@@ -18,12 +18,12 @@
 
 // FILE: DirectorySelect.cpp //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -39,7 +39,7 @@
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
-#include <stdio.h>
+#include <WWCommon.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "ImagePacker.h"
@@ -85,12 +85,12 @@ static void selectDrive( HWND dialog )
 
 	// select the string in the combo
 	Int index;
-	index = SendDlgItemMessage( dialog, COMBO_DRIVE, 
+	index = SendDlgItemMessage( dialog, COMBO_DRIVE,
 															CB_FINDSTRINGEXACT, -1, (LPARAM)string );
 	if( index != CB_ERR )
 		SendDlgItemMessage( dialog, COMBO_DRIVE, CB_SETCURSEL, index, 0 );
 
-}  // end selectDrive
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -115,19 +115,19 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 			GetCurrentDirectory( _MAX_PATH, startDir );
 
 			// set the extents for the horizontal scroll bar in the listbox
-			SendDlgItemMessage( hWndDialog, LIST_DIR, 
+			SendDlgItemMessage( hWndDialog, LIST_DIR,
 													LB_SETHORIZONTALEXTENT, 1280, 0 );
 
 			// load the listbox with directory items
 			SendDlgItemMessage( hWndDialog, LIST_DIR,
-													LB_DIR, 
-													DDL_DIRECTORY | DDL_EXCLUSIVE, 
+													LB_DIR,
+													DDL_DIRECTORY | DDL_EXCLUSIVE,
 													(LPARAM)"*.*" );
 
 			// set the current directory in the top label
 			GetCurrentDirectory( _MAX_PATH, buffer );
 			if( buffer[ strlen( buffer ) - 1 ] != '\\' )
-				strcat( buffer, "\\" );
+				strlcat(buffer, "\\", ARRAY_SIZE(buffer));
 			SetDlgItemText( hWndDialog, STATIC_CURRENT_DIR, buffer );
 
 			// load the drive box
@@ -141,7 +141,7 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 
 			return TRUE;
 
-		}  // end init
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_COMMAND:
@@ -172,7 +172,7 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 						{
 
 							// get the text
-							SendDlgItemMessage( hWndDialog, LIST_DIR, LB_GETTEXT, 
+							SendDlgItemMessage( hWndDialog, LIST_DIR, LB_GETTEXT,
 																	i, (LPARAM)text );
 
 							// remove the brackets on the text
@@ -203,22 +203,22 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 														MB_OK | MB_ICONINFORMATION );
 								continue;
 
-							}  // end if
+							}
 
 							// add path to the listbox
-							SendDlgItemMessage( TheImagePacker->getWindowHandle(), 
-																	LIST_FOLDERS, 
+							SendDlgItemMessage( TheImagePacker->getWindowHandle(),
+																	LIST_FOLDERS,
 																	LB_INSERTSTRING, -1, (LPARAM)toAdd );
 
-						}  // end if
+						}
 
-					}  // end if
+					}
 
 					SetCurrentDirectory( startDir );
 					EndDialog( hWndDialog, TRUE );
 					break;
 
-				}  // end proceed
+				}
 
 				// --------------------------------------------------------------------
 				case BUTTON_CANCEL:
@@ -228,7 +228,7 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 					EndDialog( hWndDialog, FALSE );
 					break;
 
-				}  // end cancel
+				}
 
 				// --------------------------------------------------------------------
 				case COMBO_DRIVE:
@@ -239,10 +239,10 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 						Int selected;
 
 						// get selected index
-						selected = SendDlgItemMessage( hWndDialog, COMBO_DRIVE, 
+						selected = SendDlgItemMessage( hWndDialog, COMBO_DRIVE,
 																					 CB_GETCURSEL, 0, 0 );
 						if( selected != CB_ERR )
-						{	
+						{
 							char string[ 32 ];
 
 							SendDlgItemMessage( hWndDialog, COMBO_DRIVE,
@@ -262,7 +262,7 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 							// construct new direcotry name and update status text
 							GetCurrentDirectory( _MAX_PATH, buffer );
 							if( buffer[ strlen( buffer ) - 1 ] != '\\' )
-								strcat( buffer, "\\" );
+								strlcat(buffer, "\\", ARRAY_SIZE(buffer));
 							SetDlgItemText( hWndDialog, STATIC_CURRENT_DIR, buffer );
 							EnableWindow( GetDlgItem( hWndDialog, BUTTON_ADD ), FALSE );
 
@@ -270,18 +270,18 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 							SendDlgItemMessage( hWndDialog, LIST_DIR,
 																	LB_RESETCONTENT, 0, 0 );
 							SendDlgItemMessage( hWndDialog, LIST_DIR,
-																	LB_DIR, 
-																	DDL_DIRECTORY | DDL_EXCLUSIVE, 
+																	LB_DIR,
+																	DDL_DIRECTORY | DDL_EXCLUSIVE,
 																	(LPARAM)"*.*" );
 
 
-						}  // end if
+						}
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end drive
+				}
 
 				// --------------------------------------------------------------------
 				case LIST_DIR:
@@ -293,9 +293,9 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 						Bool enable;
 
 						// get selected count
-						selCount = SendDlgItemMessage( hWndDialog, LIST_DIR, 
+						selCount = SendDlgItemMessage( hWndDialog, LIST_DIR,
 																					 LB_GETSELCOUNT, 0, 0 );
-	
+
 						// if we have selected items, enable the add button
 						if( selCount > 0 )
 						{
@@ -308,37 +308,37 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 							enable = TRUE;
 							Int index = 0;
 							if( selCount == 1 &&
-									SendDlgItemMessage( hWndDialog, LIST_DIR, 
+									SendDlgItemMessage( hWndDialog, LIST_DIR,
 																			LB_GETSEL, index, 0 ) > 0 )
 							{
 								char text[ _MAX_PATH ];
 
-								SendDlgItemMessage( hWndDialog, LIST_DIR, LB_GETTEXT, 
+								SendDlgItemMessage( hWndDialog, LIST_DIR, LB_GETTEXT,
 																		index, (LPARAM)text );
 								if( strcmp( text, "[..]" ) == 0 )
 									enable = FALSE;
 
-							}  // end if
+							}
 
-						}  // end if
+						}
 						else
 							enable = FALSE;
 
 						// do the enable
 						EnableWindow( GetDlgItem( hWndDialog, BUTTON_ADD ), enable );
 
-					}  // end if
+					}
 					if( notifyCode == LBN_DBLCLK )
 					{
 						Int selected;
 						char text[ _MAX_PATH ];
-										
+
 						// get currently selected item
-						selected = SendDlgItemMessage( hWndDialog, LIST_DIR, 
+						selected = SendDlgItemMessage( hWndDialog, LIST_DIR,
 																					 LB_GETCURSEL, 0, 0 );
 
 						// get text of selected item
-						SendDlgItemMessage( hWndDialog, LIST_DIR, LB_GETTEXT, 
+						SendDlgItemMessage( hWndDialog, LIST_DIR, LB_GETTEXT,
 																selected, (LPARAM)text );
 
 						// strip the backets off the directory listing
@@ -353,7 +353,7 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 						// construct new direcotry name and update status text
 						GetCurrentDirectory( _MAX_PATH, buffer );
 						if( buffer[ strlen( buffer ) - 1 ] != '\\' )
-							strcat( buffer, "\\" );
+							strlcat(buffer, "\\", ARRAY_SIZE(buffer));
 						SetDlgItemText( hWndDialog, STATIC_CURRENT_DIR, buffer );
 						EnableWindow( GetDlgItem( hWndDialog, BUTTON_ADD ), FALSE );
 
@@ -361,27 +361,27 @@ BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message,
 						SendDlgItemMessage( hWndDialog, LIST_DIR,
 																LB_RESETCONTENT, 0, 0 );
 						SendDlgItemMessage( hWndDialog, LIST_DIR,
-																LB_DIR, 
-																DDL_DIRECTORY | DDL_EXCLUSIVE, 
+																LB_DIR,
+																DDL_DIRECTORY | DDL_EXCLUSIVE,
 																(LPARAM)"*.*" );
-												
-					}  // end if
+
+					}
 
 					break;
 
-				}  // end list command
+				}
 
-			}  // end switch
+			}
 
 			break;
 
-		}  // end command
+		}
 
-	}  // end switch message
+	}
 
 	return 0;
 
-}  // end DirectorySelectProc
+}
 
 
 
diff --git a/Core/Tools/ImagePacker/Source/WindowProcedures/ImageErrorProc.cpp b/Core/Tools/ImagePacker/Source/WindowProcedures/ImageErrorProc.cpp
index dbb08c6053d..93b08ff2143 100644
--- a/Core/Tools/ImagePacker/Source/WindowProcedures/ImageErrorProc.cpp
+++ b/Core/Tools/ImagePacker/Source/WindowProcedures/ImageErrorProc.cpp
@@ -18,12 +18,12 @@
 
 // FILE: ImageErrorProc.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -41,7 +41,7 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 #include <windows.h>
-#include <stdio.h>
+#include <Utility/stdio_adapter.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "ImagePacker.h"
@@ -81,7 +81,7 @@ BOOL CALLBACK ImageErrorProc( HWND hWndDialog, UINT message,
 			// load the listbox with images that could not be processed
 			// and the reasons for it
 			//
-			
+
 			// sanity
 			if( TheImagePacker == NULL )
 				return TRUE;
@@ -101,13 +101,13 @@ BOOL CALLBACK ImageErrorProc( HWND hWndDialog, UINT message,
 				image = TheImagePacker->getImage( i );
 
 				// sanity
-				if( image == NULL )	
+				if( image == NULL )
 					continue;
 
 				// if image can't be processed find out why
 				if( BitIsSet( image->m_status, ImageInfo::CANTPROCESS ) )
 				{
-					
+
 					if( BitIsSet( image->m_status, ImageInfo::TOOBIG ) )
 						sprintf( reason, "Too Big" );
 					else if( BitIsSet( image->m_status, ImageInfo::INVALIDCOLORDEPTH ) )
@@ -121,16 +121,16 @@ BOOL CALLBACK ImageErrorProc( HWND hWndDialog, UINT message,
 
 					SendMessage( list, LB_INSERTSTRING, -1, (LPARAM)buffer );
 
-				}  // end if
+				}
 
-			}  // end for i
+			}
 
 			// set the extents for the horizontal scroll bar in the listbox
 			SendMessage( list, LB_SETHORIZONTALEXTENT, 1280, 0 );
 
 			return TRUE;
 
-		}  // end init
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_COMMAND:
@@ -149,7 +149,7 @@ BOOL CALLBACK ImageErrorProc( HWND hWndDialog, UINT message,
 					EndDialog( hWndDialog, TRUE );
 					break;
 
-				}  // end proceed
+				}
 
 				// --------------------------------------------------------------------
 				case BUTTON_CANCEL:
@@ -158,18 +158,18 @@ BOOL CALLBACK ImageErrorProc( HWND hWndDialog, UINT message,
 					EndDialog( hWndDialog, FALSE );
 					break;
 
-				}  // end cancel
+				}
 
-			}  // end switch
+			}
 
 			break;
 
-		}  // end command
+		}
 
-	}  // end switch message
+	}
 
 	return 0;
 
-}  // end ImageErrorProc
+}
 
 
diff --git a/Core/Tools/ImagePacker/Source/WindowProcedures/ImagePackerProc.cpp b/Core/Tools/ImagePacker/Source/WindowProcedures/ImagePackerProc.cpp
index d5d08e4a14e..333f4e11c30 100644
--- a/Core/Tools/ImagePacker/Source/WindowProcedures/ImagePackerProc.cpp
+++ b/Core/Tools/ImagePacker/Source/WindowProcedures/ImagePackerProc.cpp
@@ -18,12 +18,12 @@
 
 // FILE: ImagePackerProc.cpp //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -85,7 +85,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 										"Internal Error", MB_OK );
 				EndDialog( hWndDialog, FALSE );
 
-			}  // end if
+			}
 
 			// save our window handlw
 			TheImagePacker->setWindowHandle( hWndDialog );
@@ -103,7 +103,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 			size.y = rect.bottom - rect.top;
 
 			// center dialog on screen
-			MoveWindow( hWndDialog, 
+			MoveWindow( hWndDialog,
 									(x / 2) - (size.x / 2),
 									(y / 2) - (size.y / 2),
 									size.x,
@@ -115,7 +115,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 
 			// set gutter size
 			SetDlgItemInt( hWndDialog, EDIT_GUTTER, TheImagePacker->getGutter(), FALSE );
-									
+
 			// set alpha check
 			if( TheImagePacker->getOutputAlpha() )
 				CheckDlgButton( hWndDialog, CHECK_ALPHA, BST_CHECKED );
@@ -154,7 +154,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 
 			return TRUE;
 
-		}  // end init dialog
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_COMMAND:
@@ -176,14 +176,14 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 					{
 
 						page--;
-						TheImagePacker->setTargetPreviewPage( page );				
+						TheImagePacker->setTargetPreviewPage( page );
 						UpdatePreviewWindow();
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end previous
+				}
 
 				// --------------------------------------------------------------------
 				case BUTTON_NEXT:
@@ -194,14 +194,14 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 					{
 
 						page++;
-						TheImagePacker->setTargetPreviewPage( page );				
+						TheImagePacker->setTargetPreviewPage( page );
 						UpdatePreviewWindow();
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end next
+				}
 
 				// --------------------------------------------------------------------
 				case CHECK_BITMAP_PREVIEW:
@@ -218,7 +218,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end preview using image
+				}
 
 				// --------------------------------------------------------------------
 				case CHECK_GAP_GUTTER:
@@ -233,7 +233,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end transparent gutter
+				}
 
 				// --------------------------------------------------------------------
 				case BUTTON_PREVIEW:
@@ -248,7 +248,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 						TheImagePacker->setPreviewWindow( NULL );
 						SetDlgItemText( hWndDialog, BUTTON_PREVIEW, "Open Preview" );
 
-					}  // end if
+					}
 					else
 					{
 						HWND preview = MakePreviewDisplay();
@@ -260,13 +260,13 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 							UpdatePreviewWindow();
 							SetDlgItemText( hWndDialog, BUTTON_PREVIEW, "Close Preview" );
 
-						}  // end if
+						}
 
-					}  // end else
+					}
 
 					break;
 
-				}  // end test
+				}
 
 				// --------------------------------------------------------------------
 				case BUTTON_ADD_FOLDER:
@@ -275,11 +275,11 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 					// bring up the add directory dialog
 					DialogBox( ApplicationHInstance,
 										 (LPCTSTR)DIRECTORY_SELECT_DIALOG,
-										 TheImagePacker->getWindowHandle(), 
+										 TheImagePacker->getWindowHandle(),
 										 (DLGPROC)DirectorySelectProc );
 					break;
 
-				}  // end add folder
+				}
 
 				// --------------------------------------------------------------------
 				case BUTTON_REMOVE_FOLDER:
@@ -289,7 +289,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 					// get the directory listbox
 					folderList = GetDlgItem( hWndDialog, LIST_FOLDERS );
 					if( folderList == NULL )
-						break;;
+						break;
 
 					// get the selected item in the folder listbox
 					Int selCount;
@@ -301,7 +301,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 												"Select Folder First", MB_OK | MB_ICONINFORMATION );
 						break;
 
-					}  // end if
+					}
 
 					//
 					// start at the end of the listbox, delete any items that
@@ -314,7 +314,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end remove folder
+				}
 
 				// --------------------------------------------------------------------
 				case RADIO_128X128:
@@ -334,7 +334,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end target image size radio buttons
+				}
 
 				// --------------------------------------------------------------------
 				case EDIT_WIDTH:
@@ -357,14 +357,14 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 							SetDlgItemText( hWndDialog, EDIT_HEIGHT, buffer );
 
 							break;
-															
-						}  // end update
 
-					}  // end switch
+						}
+
+					}
 
 					break;
 
-				}  // end user defined width
+				}
 
 				// --------------------------------------------------------------------
 				case BUTTON_START:
@@ -380,7 +380,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end execute
+				}
 
 				// --------------------------------------------------------------------
 				case BUTTON_EXIT:
@@ -390,18 +390,18 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 					EndDialog( hWndDialog, TRUE );
 					break;
 
-				}  // end exit
+				}
 
-			}  // end switch
+			}
 
 			return 0;
 
-		}  // end command
+		}
 
-	}  // end switch
+	}
 
 	return 0;
 
-}  // end ImagePackerProc
+}
 
 
diff --git a/Core/Tools/ImagePacker/Source/WindowProcedures/PageErrorProc.cpp b/Core/Tools/ImagePacker/Source/WindowProcedures/PageErrorProc.cpp
index 0cd195bd72b..e96cd278ec9 100644
--- a/Core/Tools/ImagePacker/Source/WindowProcedures/PageErrorProc.cpp
+++ b/Core/Tools/ImagePacker/Source/WindowProcedures/PageErrorProc.cpp
@@ -18,12 +18,12 @@
 
 // FILE: PageErrorProc.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -41,7 +41,7 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 #include <windows.h>
-#include <stdio.h>
+#include <Utility/stdio_adapter.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "ImagePacker.h"
@@ -81,7 +81,7 @@ BOOL CALLBACK PageErrorProc( HWND hWndDialog, UINT message,
 			// load the listbox with pages that could not be processed
 			// and the reasons for it
 			//
-			
+
 			// sanity
 			if( TheImagePacker == NULL )
 				return TRUE;
@@ -100,7 +100,7 @@ BOOL CALLBACK PageErrorProc( HWND hWndDialog, UINT message,
 				// if image can't be processed find out why
 				if( BitIsSet( page->m_status, TexturePage::PAGE_ERROR ) )
 				{
-					
+
 					if( BitIsSet( page->m_status, TexturePage::CANT_ALLOCATE_PACKED_IMAGE ) )
 						sprintf( reason, "Can't allocate image memory" );
 					else if( BitIsSet( page->m_status, TexturePage::CANT_ADD_IMAGE_DATA ) )
@@ -118,16 +118,16 @@ BOOL CALLBACK PageErrorProc( HWND hWndDialog, UINT message,
 
 					SendMessage( list, LB_INSERTSTRING, -1, (LPARAM)buffer );
 
-				}  // end if
+				}
 
-			}  // end for i
+			}
 
 			// set the extents for the horizontal scroll bar in the listbox
 			SendMessage( list, LB_SETHORIZONTALEXTENT, 1280, 0 );
 
 			return TRUE;
 
-		}  // end init
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_COMMAND:
@@ -146,18 +146,18 @@ BOOL CALLBACK PageErrorProc( HWND hWndDialog, UINT message,
 					EndDialog( hWndDialog, TRUE );
 					break;
 
-				}  // end proceed
+				}
 
-			}  // end switch
+			}
 
 			break;
 
-		}  // end command
+		}
 
-	}  // end switch message
+	}
 
 	return 0;
 
-}  // end PageErrorProc
+}
 
 
diff --git a/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp b/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp
index 81da4ec69f5..24729b0f5e5 100644
--- a/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp
+++ b/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp
@@ -18,12 +18,12 @@
 
 // FILE: PreviewProc.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -39,7 +39,7 @@
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
-#include <stdio.h>
+#include <Utility/stdio_adapter.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "ImagePacker.h"
@@ -67,7 +67,7 @@
 // PreviewProc ================================================================
 /** */
 //=============================================================================
-LRESULT CALLBACK PreviewProc( HWND hWnd, UINT message, 
+LRESULT CALLBACK PreviewProc( HWND hWnd, UINT message,
 														  WPARAM wParam, LPARAM lParam )
 {
 
@@ -87,7 +87,7 @@ LRESULT CALLBACK PreviewProc( HWND hWnd, UINT message,
 			// find the target texture page
 			TexturePage *page;
 			for( page = TheImagePacker->getFirstTexturePage();
-					 page; 
+					 page;
 					 page = page->m_next )
 			{
 
@@ -112,26 +112,26 @@ LRESULT CALLBACK PreviewProc( HWND hWnd, UINT message,
 							page->getPixel( x, y, &r, &g, &b );
 
 							// create a new pen of the right color
-							pen = CreatePen( 1, 1, RGB( r, g, b, ) );
-							
+							pen = CreatePen( 1, 1, RGB( r, g, b ) );
+
 							// select pen into hdc
 							prevPen = (HPEN)SelectObject( hdc, pen );
-							
+
 							// draw ... what is the Win32 put pixel function???
 							MoveToEx( hdc, x, y, NULL );
 							LineTo( hdc, x + 1, y );
 
 							// put the old pen back
 							SelectObject( hdc, prevPen );
-							
+
 							// delete the created pen
 							DeleteObject( pen );
-									
-						}  // end for x
 
-					}  // end for y
+						}
 
-				}  // end if
+					}
+
+				}
 				else
 				{
 
@@ -149,22 +149,22 @@ LRESULT CALLBACK PreviewProc( HWND hWnd, UINT message,
 						rect.bottom = image->m_pagePos.hi.y + 1;  // FillRect not inclusive
 						FillRect( hdc, &rect, whiteBrush );
 
-					}  // end for image
-				
-				}  // end else
+					}
+
+				}
 
-			}  // end for page
+			}
 
 			EndPaint( hWnd, &ps );
 			break;
 
-		}  // end paint
+		}
 
-	}  // end switch
+	}
 
 	return DefWindowProc( hWnd, message, wParam, lParam );
 
-}  // end PreviewProc
+}
 
 // MakePreviewDisplay =========================================================
 /** */
@@ -175,7 +175,7 @@ HWND MakePreviewDisplay( void )
 	const char *className = "PreviewDisplay";
 	HWND hWnd;
 
-	wcex.cbSize = sizeof( WNDCLASSEX ); 
+	wcex.cbSize = sizeof( WNDCLASSEX );
 
 	wcex.style					= CS_HREDRAW | CS_VREDRAW;
 	wcex.lpfnWndProc		= (WNDPROC)PreviewProc;
@@ -213,7 +213,7 @@ HWND MakePreviewDisplay( void )
 
 	return hWnd;
 
-}  // end MakePreviewDisplay
+}
 
 // UpdatePreviewWindow ========================================================
 /** Update the preview window, if present */
@@ -237,8 +237,8 @@ void UpdatePreviewWindow( void )
 	char title[ 256 ];
 
 	// construct title
-	sprintf( title, "Page #%d of %d", 
-					 TheImagePacker->getTargetPreviewPage(), 
+	sprintf( title, "Page #%d of %d",
+					 TheImagePacker->getTargetPreviewPage(),
 					 TheImagePacker->getPageCount() );
 	SetWindowText( preview, title );
 
@@ -255,7 +255,7 @@ void UpdatePreviewWindow( void )
 	clientRect.bottom = clientRect.top + TheImagePacker->getTargetHeight();
 	AdjustWindowRect( &clientRect, PREVIEW_STYLE, FALSE );
 	MoveWindow( preview,
-							clientRect.left, 
+							clientRect.left,
 							clientRect.top,
 							clientRect.right - clientRect.left,
 							clientRect.bottom - clientRect.top,
@@ -264,4 +264,4 @@ void UpdatePreviewWindow( void )
 	// invalidate the client area for redraw
 	InvalidateRect( preview, NULL, TRUE );
 
-}  // end UpdatePreviewWindow
+}
diff --git a/Core/Tools/Launcher/BFISH.CPP b/Core/Tools/Launcher/BFISH.CPP
deleted file mode 100644
index a05a4feb068..00000000000
--- a/Core/Tools/Launcher/BFISH.CPP
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Blowfish Component                                           * 
- *                                                                                             * 
- *                     $Archive:: /Sun/Blowfish/bfish.cpp                                     $* 
- *                                                                                             * 
- *                      $Author:: Joe_b                                                       $*
- *                                                                                             * 
- *                     $Modtime:: 12/02/97 9:35p                                              $*
- *                                                                                             * 
- *                    $Revision:: 6                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   BlowfishEngine::Decrypt -- Decrypts data using blowfish algorithm.                        *
- *   BlowfishEngine::Encrypt -- Encrypt an arbitrary block of data.                            *
- *   BlowfishEngine::Process_Block -- Process a block of data using Blowfish algorithm.        *
- *   BlowfishEngine::Sub_Key_Encrypt -- Encrypts a block for use in S-Box processing.          *
- *   BlowfishEngine::Submit_Key -- Submit a key that will allow data processing.               *
- *   BlowfishEngine::~BlowfishEngine -- Destructor for the Blowfish engine.                    *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#pragma warning(disable : 4514)
-#include	"BFISH.H"
-#include	<string.h>
-#include	<assert.h>
-
-
-/*
-**	Byte order controlled long integer. This integer is constructed
-**	so that character 0 (C0) is the most significant byte of the
-**	integer. This is biased toward big endian architecture, but that
-**	just happens to be how the Blowfish algorithm was designed.
-*/
-typedef union {
-	unsigned long Long;
-	struct {
-		unsigned char C3;
-		unsigned char C2;
-		unsigned char C1;
-		unsigned char C0;
-	} Char;
-} Int;
-
-
-/***********************************************************************************************
- * BlowfishEngine::~BlowfishEngine -- Destructor for the Blowfish engine.                      *
- *                                                                                             *
- *    This destructor will clear out the s-box tables so that even if the memory for the       *
- *    class remains, it will contain no compromising data.                                     *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   07/08/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-BlowfishEngine::~BlowfishEngine(void)
-{
-	if (IsKeyed) {
-		Submit_Key(NULL, 0);
-	}
-}
-
-
-/***********************************************************************************************
- * BlowfishEngine::Submit_Key -- Submit a key that will allow data processing.                 *
- *                                                                                             *
- *    This routine must be called before any data can be encrypted or decrypted. This routine  *
- *    need only be called when the key is to be changed or set for the first time. Once the    *
- *    key has been set, the engine may be used to encrypt, decrypt, or both operations         *
- *    indefinitely. The key must be 56 bytes or less in length. This is necessary because      *
- *    any keys longer than that will not correctly affect the encryption process.              *
- *                                                                                             *
- *    If the key pointer is NULL, then the S-Box tables are reset to identity. This will       *
- *    mask the previous key setting. Use this method to clear the engine after processing in   *
- *    order to gain a measure of security.                                                     *
- *                                                                                             *
- * INPUT:   key      -- Pointer to the key data block.                                         *
- *                                                                                             *
- *          length   -- The length of the submitted key.                                       *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   This is a time consuming process.                                               *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   04/14/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-void BlowfishEngine::Submit_Key(void const * key, int length)
-{
-	assert(length <= MAX_KEY_LENGTH);
-
-	/*
-	**	Initialize the permutation and S-Box tables to a known
-	**	constant value.
-	*/
-	memcpy(P_Encrypt, P_Init, sizeof(P_Init));
-	memcpy(P_Decrypt, P_Init, sizeof(P_Init));
-	memcpy(bf_S, S_Init, sizeof(S_Init));
-
-	/*
-	**	Validate parameters.
-	*/
-	if (key == 0 || length == 0) {
-		IsKeyed = false;
-		return;
-	}
-
-	/*
-	**	Combine the key with the permutation table. Wrap the key
-	**	as many times as necessary to ensure that the entire
-	**	permutation table has been modified. The key is lifted
-	**	into a long by using endian independent means.
-	*/
-	int j = 0;
-	unsigned char const * key_ptr = (unsigned char const *)key;
-	unsigned long * p_ptr = &P_Encrypt[0];
-	for (int index = 0; index < ROUNDS+2; index++) {
-		unsigned long data = 0;
-
-		data = (data << CHAR_BIT) | key_ptr[j++ % length];
-		data = (data << CHAR_BIT) | key_ptr[j++ % length];
-		data = (data << CHAR_BIT) | key_ptr[j++ % length];
-		data = (data << CHAR_BIT) | key_ptr[j++ % length];
-
-		*p_ptr++ ^= data;
-	}
-
-	/*
-	**	The permutation table must be scrambled by means of the key. This
-	**	is how the key is factored into the encryption -- by merely altering
-	**	the permutation (and S-Box) tables. Because this transformation alters
-	**	the table data WHILE it is using the table data, the tables are
-	**	thoroughly obfuscated by this process.
-	*/
-	unsigned long left = 0x00000000L;
-	unsigned long right = 0x00000000L;
-	unsigned long * p_en = &P_Encrypt[0];			// Encryption table.
-	unsigned long * p_de = &P_Decrypt[ROUNDS+1];	// Decryption table.
-	for (int p_index = 0; p_index < ROUNDS+2; p_index += 2) {
-		Sub_Key_Encrypt(left, right);
-
-		*p_en++ = left;
-		*p_en++ = right;
-
-		*p_de-- = left;
-		*p_de-- = right;
-	}
-
-	/*
-	**	Perform a similar transmutation to the S-Box tables. Also notice that the
-	**	working 64 bit number is carried into this process from the previous
-	**	operation.
-	*/
-	for (int sbox_index = 0; sbox_index < 4; sbox_index++) {
-		for (int ss_index = 0; ss_index < UCHAR_MAX+1; ss_index += 2) {
-			Sub_Key_Encrypt(left, right);
-			bf_S[sbox_index][ss_index] = left;
-			bf_S[sbox_index][ss_index + 1] = right;
-		}
-	}
-
-	IsKeyed = true;
-}
-
-
-/***********************************************************************************************
- * BlowfishEngine::Encrypt -- Encrypt an arbitrary block of data.                              *
- *                                                                                             *
- *    Use this routine to encrypt an arbitrary block of data. The block must be an even        *
- *    multiple of 8 bytes. Any bytes left over will not be encrypted. The 8 byte requirement   *
- *    is necessary because the underlying algorithm processes blocks in 8 byte chunks.         *
- *    Partial blocks are unrecoverable and useless.                                            *
- *                                                                                             *
- * INPUT:   plaintext-- Pointer to the data block to be encrypted.                             *
- *                                                                                             *
- *          length   -- The length of the data block.                                          *
- *                                                                                             *
- *          cyphertext- Pointer to the output buffer that will hold the encrypted data.        *
- *                                                                                             *
- * OUTPUT:  Returns with the actual number of bytes encrypted.                                 *
- *                                                                                             *
- * WARNINGS:   You must submit the key before calling this routine. This will only encrypt     *
- *             the plaintext in 8 byte increments. Modulo bytes left over are not processed.   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   04/14/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-int BlowfishEngine::Encrypt(void const * plaintext, int length, void * cyphertext)
-{
-	if (plaintext == 0 || length == 0) {
-		return(0);
-	}
-	if (cyphertext == 0) cyphertext = (void *)plaintext;
-
-	if (IsKeyed) {
-
-		/*
-		**	Validate parameters.
-		*/
-		int blocks = length / BYTES_PER_BLOCK;
-
-		/*
-		**	Process the buffer in 64 bit chunks.
-		*/
-		for (int index = 0; index < blocks; index++) {
-			Process_Block(plaintext, cyphertext, P_Encrypt);
-			plaintext = ((char *)plaintext) + BYTES_PER_BLOCK;
-			cyphertext = ((char *)cyphertext) + BYTES_PER_BLOCK;
-		}
-		int encrypted = blocks * BYTES_PER_BLOCK;
-
-		/*
-		**	Copy over any trailing left over appendix bytes.
-		*/
-		if (encrypted < length) {
-			memmove(cyphertext, plaintext, length - encrypted);
-		}
-
-		return(encrypted);
-	}
-
-	/*
-	**	Non-keyed processing merely copies the data.
-	*/
-	if (plaintext != cyphertext) {
-		memmove(cyphertext, plaintext, length);
-	}
-	return(length);
-}
-
-
-/***********************************************************************************************
- * BlowfishEngine::Decrypt -- Decrypt an arbitrary block of data.                              *
- *                                                                                             *
- *    Use this routine to decrypt an arbitrary block of data. The block must be an even        *
- *    multiple of 8 bytes. Any bytes left over will not be decrypted. The 8 byte requirement   *
- *    is necessary because the underlying algorithm processes blocks in 8 byte chunks.         *
- *    Partial blocks are unrecoverable and useless.                                            *
- *                                                                                             *
- * INPUT:   cyphertext- Pointer to the data block to be decrypted.                             *
- *                                                                                             *
- *          length   -- The length of the data block.                                          *
- *                                                                                             *
- *          plaintext-- Pointer to the output buffer that will hold the decrypted data.        *
- *                                                                                             *
- * OUTPUT:  Returns with the actual number of bytes decrypted.                                 *
- *                                                                                             *
- * WARNINGS:   You must submit the key before calling this routine. This will only decrypt     *
- *             the cyphertext in 8 byte increments. Modulo bytes left over are not processed.  *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   04/14/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-int BlowfishEngine::Decrypt(void const * cyphertext, int length, void * plaintext)
-{
-	if (cyphertext == 0 || length == 0) {
-		return(0);
-	}
-	if (plaintext == 0) plaintext = (void *)cyphertext;
-
-	if (IsKeyed) {
-
-		/*
-		**	Validate parameters.
-		*/
-		int blocks = length / BYTES_PER_BLOCK;
-
-		/*
-		**	Process the buffer in 64 bit chunks.
-		*/
-		for (int index = 0; index < blocks; index++) {
-			Process_Block(cyphertext, plaintext, P_Decrypt);
-			cyphertext = ((char *)cyphertext) + BYTES_PER_BLOCK;
-			plaintext = ((char *)plaintext) + BYTES_PER_BLOCK;
-		}
-		int encrypted = blocks * BYTES_PER_BLOCK;
-
-		/*
-		**	Copy over any trailing left over appendix bytes.
-		*/
-		if (encrypted < length) {
-			memmove(plaintext, cyphertext, length - encrypted);
-		}
-
-		return(encrypted);
-	}
-
-	/*
-	**	Non-keyed processing merely copies the data.
-	*/
-	if (plaintext != cyphertext) {
-		memmove(plaintext, cyphertext, length);
-	}
-	return(length);
-}
-
-
-/***********************************************************************************************
- * BlowfishEngine::Process_Block -- Process a block of data using Blowfish algorithm.          *
- *                                                                                             *
- *    This is the main processing routine for encryption and decryption. The algorithm         *
- *    consists of a 16 round Feistal network and uses mathematics from different algebraic     *
- *    groups (strengthens against differential cryptanalysis). The large S-Boxes and the       *
- *    rounds strengthen it against linear cryptanalysis.                                       *
- *                                                                                             *
- * INPUT:   plaintext   -- Pointer to the source text (it actually might be a pointer to       *
- *                         the cyphertext if this is called as a decryption process).          *
- *                                                                                             *
- *          cyphertext  -- Pointer to the output buffer that will hold the processed block.    *
- *                                                                                             *
- *          ptable      -- Pointer to the permutation table. This algorithm will encrypt       *
- *                         and decrypt using the same S-Box tables. The encryption control     *
- *                         is handled by the permutation table.                                *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   The source and destination buffers must be 8 bytes long.                        *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   04/19/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-void BlowfishEngine::Process_Block(void const * plaintext, void * cyphertext, unsigned long const * ptable)
-{
-	/*
-	**	Input the left and right halves of the source block such that
-	**	the byte order is constant regardless of the endian
-	**	persuasion of the current processor. The blowfish algorithm is
-	**	biased toward "big endian" architecture and some optimizations
-	**	could be done for big endian processors in that case.
-	*/
-	unsigned char const * source = (unsigned char const *)plaintext;
-	Int left;
-	left.Char.C0 = *source++;
-	left.Char.C1 = *source++;
-	left.Char.C2 = *source++;
-	left.Char.C3 = *source++;
-
-	Int right;
-	right.Char.C0 = *source++;
-	right.Char.C1 = *source++;
-	right.Char.C2 = *source++;
-	right.Char.C3 = *source;
-
-	/*
-	**	Perform all Feistal rounds on the block. This is the encryption/decryption
-	**	process. Since there is an exchange that occurs after each round, two
-	**	rounds are combined in this loop to avoid unnecessary exchanging.
-	*/
-	for (int index = 0; index < ROUNDS/2; index++) {
-		left.Long ^= *ptable++;
-		right.Long ^= ((( bf_S[0][left.Char.C0] + bf_S[1][left.Char.C1]) ^ bf_S[2][left.Char.C2]) + bf_S[3][left.Char.C3]);
-		right.Long ^= *ptable++;
-		left.Long ^= ((( bf_S[0][right.Char.C0] + bf_S[1][right.Char.C1]) ^ bf_S[2][right.Char.C2]) + bf_S[3][right.Char.C3]);
-	}
-
-	/*
-	**	The final two longs in the permutation table are processed into the block.
-	**	The left and right halves are still reversed as a side effect of the last
-	**	round.
-	*/
-	left.Long ^= *ptable++;
-	right.Long ^= *ptable;
-
-	/*
-	**	The final block data is output in endian architecture
-	**	independent format. Notice that the blocks are output as
-	**	right first and left second. This is to counteract the final
-	**	superfluous exchange that occurs as a side effect of the
-	**	encryption rounds.
-	*/
-	unsigned char * out = (unsigned char *)cyphertext;
-	*out++ = right.Char.C0;
-	*out++ = right.Char.C1;
-	*out++ = right.Char.C2;
-	*out++ = right.Char.C3;
-
-	*out++ = left.Char.C0;
-	*out++ = left.Char.C1;
-	*out++ = left.Char.C2;
-	*out = left.Char.C3;
-}
-
-
-/***********************************************************************************************
- * BlowfishEngine::Sub_Key_Encrypt -- Encrypts a block for use in S-Box processing.            *
- *                                                                                             *
- *    This is the same as the normal process block function but it doesn't have the endian     *
- *    fixup logic. Since this routine is only called for S-Box table generation and it is      *
- *    known that the S-Box initial data is already in local machine endian format, the         *
- *    byte order fixups are not needed. This also has a tendency to speed up S-Box generation  *
- *    as well.                                                                                 *
- *                                                                                             *
- * INPUT:   left  -- The left half of the data block.                                          *
- *                                                                                             *
- *          right -- The right half of the data block.                                         *
- *                                                                                             *
- * OUTPUT:  none, but the processed block is stored back into the left and right half          *
- *          integers.                                                                          *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   04/19/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-void BlowfishEngine::Sub_Key_Encrypt(unsigned long & left, unsigned long & right)
-{
-	Int l;
-	l.Long = left;
-
-	Int r;
-	r.Long = right;
-
-	for (int index = 0; index < ROUNDS; index += 2) {
-		l.Long ^= P_Encrypt[index];
-		r.Long ^= ((( bf_S[0][l.Char.C0] + bf_S[1][l.Char.C1]) ^ bf_S[2][l.Char.C2]) + bf_S[3][l.Char.C3]);
-		r.Long ^= P_Encrypt[index+1];
-		l.Long ^= ((( bf_S[0][r.Char.C0] + bf_S[1][r.Char.C1]) ^ bf_S[2][r.Char.C2]) + bf_S[3][r.Char.C3]);
-	}
-	left = r.Long ^ P_Encrypt[ROUNDS+1];
-	right = l.Long ^ P_Encrypt[ROUNDS];
-}
-
-
-/*
-**	These tables have the bytes stored in machine endian format. Because of this,
-**	a special block cypher routine is needed when the sub-keys are generated.
-**	This is kludgier than it otherwise should be. However, storing these
-**	integers in machine independent format would be even more painful.
-*/
-
-unsigned long const BlowfishEngine::P_Init[BlowfishEngine::ROUNDS+2] = {
-	0x243F6A88U,0x85A308D3U,0x13198A2EU,0x03707344U,0xA4093822U,0x299F31D0U,0x082EFA98U,0xEC4E6C89U,
-	0x452821E6U,0x38D01377U,0xBE5466CFU,0x34E90C6CU,0xC0AC29B7U,0xC97C50DDU,0x3F84D5B5U,0xB5470917U,
-	0x9216D5D9U,0x8979FB1BU
-};
-
-unsigned long const BlowfishEngine::S_Init[4][UCHAR_MAX+1] = {
-	{
-		0xD1310BA6U,0x98DFB5ACU,0x2FFD72DBU,0xD01ADFB7U,0xB8E1AFEDU,0x6A267E96U,0xBA7C9045U,0xF12C7F99U,
-		0x24A19947U,0xB3916CF7U,0x0801F2E2U,0x858EFC16U,0x636920D8U,0x71574E69U,0xA458FEA3U,0xF4933D7EU,
-		0x0D95748FU,0x728EB658U,0x718BCD58U,0x82154AEEU,0x7B54A41DU,0xC25A59B5U,0x9C30D539U,0x2AF26013U,
-		0xC5D1B023U,0x286085F0U,0xCA417918U,0xB8DB38EFU,0x8E79DCB0U,0x603A180EU,0x6C9E0E8BU,0xB01E8A3EU,
-		0xD71577C1U,0xBD314B27U,0x78AF2FDAU,0x55605C60U,0xE65525F3U,0xAA55AB94U,0x57489862U,0x63E81440U,
-		0x55CA396AU,0x2AAB10B6U,0xB4CC5C34U,0x1141E8CEU,0xA15486AFU,0x7C72E993U,0xB3EE1411U,0x636FBC2AU,
-		0x2BA9C55DU,0x741831F6U,0xCE5C3E16U,0x9B87931EU,0xAFD6BA33U,0x6C24CF5CU,0x7A325381U,0x28958677U,
-		0x3B8F4898U,0x6B4BB9AFU,0xC4BFE81BU,0x66282193U,0x61D809CCU,0xFB21A991U,0x487CAC60U,0x5DEC8032U,
-		0xEF845D5DU,0xE98575B1U,0xDC262302U,0xEB651B88U,0x23893E81U,0xD396ACC5U,0x0F6D6FF3U,0x83F44239U,
-		0x2E0B4482U,0xA4842004U,0x69C8F04AU,0x9E1F9B5EU,0x21C66842U,0xF6E96C9AU,0x670C9C61U,0xABD388F0U,
-		0x6A51A0D2U,0xD8542F68U,0x960FA728U,0xAB5133A3U,0x6EEF0B6CU,0x137A3BE4U,0xBA3BF050U,0x7EFB2A98U,
-		0xA1F1651DU,0x39AF0176U,0x66CA593EU,0x82430E88U,0x8CEE8619U,0x456F9FB4U,0x7D84A5C3U,0x3B8B5EBEU,
-		0xE06F75D8U,0x85C12073U,0x401A449FU,0x56C16AA6U,0x4ED3AA62U,0x363F7706U,0x1BFEDF72U,0x429B023DU,
-		0x37D0D724U,0xD00A1248U,0xDB0FEAD3U,0x49F1C09BU,0x075372C9U,0x80991B7BU,0x25D479D8U,0xF6E8DEF7U,
-		0xE3FE501AU,0xB6794C3BU,0x976CE0BDU,0x04C006BAU,0xC1A94FB6U,0x409F60C4U,0x5E5C9EC2U,0x196A2463U,
-		0x68FB6FAFU,0x3E6C53B5U,0x1339B2EBU,0x3B52EC6FU,0x6DFC511FU,0x9B30952CU,0xCC814544U,0xAF5EBD09U,
-		0xBEE3D004U,0xDE334AFDU,0x660F2807U,0x192E4BB3U,0xC0CBA857U,0x45C8740FU,0xD20B5F39U,0xB9D3FBDBU,
-		0x5579C0BDU,0x1A60320AU,0xD6A100C6U,0x402C7279U,0x679F25FEU,0xFB1FA3CCU,0x8EA5E9F8U,0xDB3222F8U,
-		0x3C7516DFU,0xFD616B15U,0x2F501EC8U,0xAD0552ABU,0x323DB5FAU,0xFD238760U,0x53317B48U,0x3E00DF82U,
-		0x9E5C57BBU,0xCA6F8CA0U,0x1A87562EU,0xDF1769DBU,0xD542A8F6U,0x287EFFC3U,0xAC6732C6U,0x8C4F5573U,
-		0x695B27B0U,0xBBCA58C8U,0xE1FFA35DU,0xB8F011A0U,0x10FA3D98U,0xFD2183B8U,0x4AFCB56CU,0x2DD1D35BU,
-		0x9A53E479U,0xB6F84565U,0xD28E49BCU,0x4BFB9790U,0xE1DDF2DAU,0xA4CB7E33U,0x62FB1341U,0xCEE4C6E8U,
-		0xEF20CADAU,0x36774C01U,0xD07E9EFEU,0x2BF11FB4U,0x95DBDA4DU,0xAE909198U,0xEAAD8E71U,0x6B93D5A0U,
-		0xD08ED1D0U,0xAFC725E0U,0x8E3C5B2FU,0x8E7594B7U,0x8FF6E2FBU,0xF2122B64U,0x8888B812U,0x900DF01CU,
-		0x4FAD5EA0U,0x688FC31CU,0xD1CFF191U,0xB3A8C1ADU,0x2F2F2218U,0xBE0E1777U,0xEA752DFEU,0x8B021FA1U,
-		0xE5A0CC0FU,0xB56F74E8U,0x18ACF3D6U,0xCE89E299U,0xB4A84FE0U,0xFD13E0B7U,0x7CC43B81U,0xD2ADA8D9U,
-		0x165FA266U,0x80957705U,0x93CC7314U,0x211A1477U,0xE6AD2065U,0x77B5FA86U,0xC75442F5U,0xFB9D35CFU,
-		0xEBCDAF0CU,0x7B3E89A0U,0xD6411BD3U,0xAE1E7E49U,0x00250E2DU,0x2071B35EU,0x226800BBU,0x57B8E0AFU,
-		0x2464369BU,0xF009B91EU,0x5563911DU,0x59DFA6AAU,0x78C14389U,0xD95A537FU,0x207D5BA2U,0x02E5B9C5U,
-		0x83260376U,0x6295CFA9U,0x11C81968U,0x4E734A41U,0xB3472DCAU,0x7B14A94AU,0x1B510052U,0x9A532915U,
-		0xD60F573FU,0xBC9BC6E4U,0x2B60A476U,0x81E67400U,0x08BA6FB5U,0x571BE91FU,0xF296EC6BU,0x2A0DD915U,
-		0xB6636521U,0xE7B9F9B6U,0xFF34052EU,0xC5855664U,0x53B02D5DU,0xA99F8FA1U,0x08BA4799U,0x6E85076AU,
-	},{
-		0x4B7A70E9U,0xB5B32944U,0xDB75092EU,0xC4192623U,0xAD6EA6B0U,0x49A7DF7DU,0x9CEE60B8U,0x8FEDB266U,
-		0xECAA8C71U,0x699A17FFU,0x5664526CU,0xC2B19EE1U,0x193602A5U,0x75094C29U,0xA0591340U,0xE4183A3EU,
-		0x3F54989AU,0x5B429D65U,0x6B8FE4D6U,0x99F73FD6U,0xA1D29C07U,0xEFE830F5U,0x4D2D38E6U,0xF0255DC1U,
-		0x4CDD2086U,0x8470EB26U,0x6382E9C6U,0x021ECC5EU,0x09686B3FU,0x3EBAEFC9U,0x3C971814U,0x6B6A70A1U,
-		0x687F3584U,0x52A0E286U,0xB79C5305U,0xAA500737U,0x3E07841CU,0x7FDEAE5CU,0x8E7D44ECU,0x5716F2B8U,
-		0xB03ADA37U,0xF0500C0DU,0xF01C1F04U,0x0200B3FFU,0xAE0CF51AU,0x3CB574B2U,0x25837A58U,0xDC0921BDU,
-		0xD19113F9U,0x7CA92FF6U,0x94324773U,0x22F54701U,0x3AE5E581U,0x37C2DADCU,0xC8B57634U,0x9AF3DDA7U,
-		0xA9446146U,0x0FD0030EU,0xECC8C73EU,0xA4751E41U,0xE238CD99U,0x3BEA0E2FU,0x3280BBA1U,0x183EB331U,
-		0x4E548B38U,0x4F6DB908U,0x6F420D03U,0xF60A04BFU,0x2CB81290U,0x24977C79U,0x5679B072U,0xBCAF89AFU,
-		0xDE9A771FU,0xD9930810U,0xB38BAE12U,0xDCCF3F2EU,0x5512721FU,0x2E6B7124U,0x501ADDE6U,0x9F84CD87U,
-		0x7A584718U,0x7408DA17U,0xBC9F9ABCU,0xE94B7D8CU,0xEC7AEC3AU,0xDB851DFAU,0x63094366U,0xC464C3D2U,
-		0xEF1C1847U,0x3215D908U,0xDD433B37U,0x24C2BA16U,0x12A14D43U,0x2A65C451U,0x50940002U,0x133AE4DDU,
-		0x71DFF89EU,0x10314E55U,0x81AC77D6U,0x5F11199BU,0x043556F1U,0xD7A3C76BU,0x3C11183BU,0x5924A509U,
-		0xF28FE6EDU,0x97F1FBFAU,0x9EBABF2CU,0x1E153C6EU,0x86E34570U,0xEAE96FB1U,0x860E5E0AU,0x5A3E2AB3U,
-		0x771FE71CU,0x4E3D06FAU,0x2965DCB9U,0x99E71D0FU,0x803E89D6U,0x5266C825U,0x2E4CC978U,0x9C10B36AU,
-		0xC6150EBAU,0x94E2EA78U,0xA5FC3C53U,0x1E0A2DF4U,0xF2F74EA7U,0x361D2B3DU,0x1939260FU,0x19C27960U,
-		0x5223A708U,0xF71312B6U,0xEBADFE6EU,0xEAC31F66U,0xE3BC4595U,0xA67BC883U,0xB17F37D1U,0x018CFF28U,
-		0xC332DDEFU,0xBE6C5AA5U,0x65582185U,0x68AB9802U,0xEECEA50FU,0xDB2F953BU,0x2AEF7DADU,0x5B6E2F84U,
-		0x1521B628U,0x29076170U,0xECDD4775U,0x619F1510U,0x13CCA830U,0xEB61BD96U,0x0334FE1EU,0xAA0363CFU,
-		0xB5735C90U,0x4C70A239U,0xD59E9E0BU,0xCBAADE14U,0xEECC86BCU,0x60622CA7U,0x9CAB5CABU,0xB2F3846EU,
-		0x648B1EAFU,0x19BDF0CAU,0xA02369B9U,0x655ABB50U,0x40685A32U,0x3C2AB4B3U,0x319EE9D5U,0xC021B8F7U,
-		0x9B540B19U,0x875FA099U,0x95F7997EU,0x623D7DA8U,0xF837889AU,0x97E32D77U,0x11ED935FU,0x16681281U,
-		0x0E358829U,0xC7E61FD6U,0x96DEDFA1U,0x7858BA99U,0x57F584A5U,0x1B227263U,0x9B83C3FFU,0x1AC24696U,
-		0xCDB30AEBU,0x532E3054U,0x8FD948E4U,0x6DBC3128U,0x58EBF2EFU,0x34C6FFEAU,0xFE28ED61U,0xEE7C3C73U,
-		0x5D4A14D9U,0xE864B7E3U,0x42105D14U,0x203E13E0U,0x45EEE2B6U,0xA3AAABEAU,0xDB6C4F15U,0xFACB4FD0U,
-		0xC742F442U,0xEF6ABBB5U,0x654F3B1DU,0x41CD2105U,0xD81E799EU,0x86854DC7U,0xE44B476AU,0x3D816250U,
-		0xCF62A1F2U,0x5B8D2646U,0xFC8883A0U,0xC1C7B6A3U,0x7F1524C3U,0x69CB7492U,0x47848A0BU,0x5692B285U,
-		0x095BBF00U,0xAD19489DU,0x1462B174U,0x23820E00U,0x58428D2AU,0x0C55F5EAU,0x1DADF43EU,0x233F7061U,
-		0x3372F092U,0x8D937E41U,0xD65FECF1U,0x6C223BDBU,0x7CDE3759U,0xCBEE7460U,0x4085F2A7U,0xCE77326EU,
-		0xA6078084U,0x19F8509EU,0xE8EFD855U,0x61D99735U,0xA969A7AAU,0xC50C06C2U,0x5A04ABFCU,0x800BCADCU,
-		0x9E447A2EU,0xC3453484U,0xFDD56705U,0x0E1E9EC9U,0xDB73DBD3U,0x105588CDU,0x675FDA79U,0xE3674340U,
-		0xC5C43465U,0x713E38D8U,0x3D28F89EU,0xF16DFF20U,0x153E21E7U,0x8FB03D4AU,0xE6E39F2BU,0xDB83ADF7U,
-	},{
-		0xE93D5A68U,0x948140F7U,0xF64C261CU,0x94692934U,0x411520F7U,0x7602D4F7U,0xBCF46B2EU,0xD4A20068U,
-		0xD4082471U,0x3320F46AU,0x43B7D4B7U,0x500061AFU,0x1E39F62EU,0x97244546U,0x14214F74U,0xBF8B8840U,
-		0x4D95FC1DU,0x96B591AFU,0x70F4DDD3U,0x66A02F45U,0xBFBC09ECU,0x03BD9785U,0x7FAC6DD0U,0x31CB8504U,
-		0x96EB27B3U,0x55FD3941U,0xDA2547E6U,0xABCA0A9AU,0x28507825U,0x530429F4U,0x0A2C86DAU,0xE9B66DFBU,
-		0x68DC1462U,0xD7486900U,0x680EC0A4U,0x27A18DEEU,0x4F3FFEA2U,0xE887AD8CU,0xB58CE006U,0x7AF4D6B6U,
-		0xAACE1E7CU,0xD3375FECU,0xCE78A399U,0x406B2A42U,0x20FE9E35U,0xD9F385B9U,0xEE39D7ABU,0x3B124E8BU,
-		0x1DC9FAF7U,0x4B6D1856U,0x26A36631U,0xEAE397B2U,0x3A6EFA74U,0xDD5B4332U,0x6841E7F7U,0xCA7820FBU,
-		0xFB0AF54EU,0xD8FEB397U,0x454056ACU,0xBA489527U,0x55533A3AU,0x20838D87U,0xFE6BA9B7U,0xD096954BU,
-		0x55A867BCU,0xA1159A58U,0xCCA92963U,0x99E1DB33U,0xA62A4A56U,0x3F3125F9U,0x5EF47E1CU,0x9029317CU,
-		0xFDF8E802U,0x04272F70U,0x80BB155CU,0x05282CE3U,0x95C11548U,0xE4C66D22U,0x48C1133FU,0xC70F86DCU,
-		0x07F9C9EEU,0x41041F0FU,0x404779A4U,0x5D886E17U,0x325F51EBU,0xD59BC0D1U,0xF2BCC18FU,0x41113564U,
-		0x257B7834U,0x602A9C60U,0xDFF8E8A3U,0x1F636C1BU,0x0E12B4C2U,0x02E1329EU,0xAF664FD1U,0xCAD18115U,
-		0x6B2395E0U,0x333E92E1U,0x3B240B62U,0xEEBEB922U,0x85B2A20EU,0xE6BA0D99U,0xDE720C8CU,0x2DA2F728U,
-		0xD0127845U,0x95B794FDU,0x647D0862U,0xE7CCF5F0U,0x5449A36FU,0x877D48FAU,0xC39DFD27U,0xF33E8D1EU,
-		0x0A476341U,0x992EFF74U,0x3A6F6EABU,0xF4F8FD37U,0xA812DC60U,0xA1EBDDF8U,0x991BE14CU,0xDB6E6B0DU,
-		0xC67B5510U,0x6D672C37U,0x2765D43BU,0xDCD0E804U,0xF1290DC7U,0xCC00FFA3U,0xB5390F92U,0x690FED0BU,
-		0x667B9FFBU,0xCEDB7D9CU,0xA091CF0BU,0xD9155EA3U,0xBB132F88U,0x515BAD24U,0x7B9479BFU,0x763BD6EBU,
-		0x37392EB3U,0xCC115979U,0x8026E297U,0xF42E312DU,0x6842ADA7U,0xC66A2B3BU,0x12754CCCU,0x782EF11CU,
-		0x6A124237U,0xB79251E7U,0x06A1BBE6U,0x4BFB6350U,0x1A6B1018U,0x11CAEDFAU,0x3D25BDD8U,0xE2E1C3C9U,
-		0x44421659U,0x0A121386U,0xD90CEC6EU,0xD5ABEA2AU,0x64AF674EU,0xDA86A85FU,0xBEBFE988U,0x64E4C3FEU,
-		0x9DBC8057U,0xF0F7C086U,0x60787BF8U,0x6003604DU,0xD1FD8346U,0xF6381FB0U,0x7745AE04U,0xD736FCCCU,
-		0x83426B33U,0xF01EAB71U,0xB0804187U,0x3C005E5FU,0x77A057BEU,0xBDE8AE24U,0x55464299U,0xBF582E61U,
-		0x4E58F48FU,0xF2DDFDA2U,0xF474EF38U,0x8789BDC2U,0x5366F9C3U,0xC8B38E74U,0xB475F255U,0x46FCD9B9U,
-		0x7AEB2661U,0x8B1DDF84U,0x846A0E79U,0x915F95E2U,0x466E598EU,0x20B45770U,0x8CD55591U,0xC902DE4CU,
-		0xB90BACE1U,0xBB8205D0U,0x11A86248U,0x7574A99EU,0xB77F19B6U,0xE0A9DC09U,0x662D09A1U,0xC4324633U,
-		0xE85A1F02U,0x09F0BE8CU,0x4A99A025U,0x1D6EFE10U,0x1AB93D1DU,0x0BA5A4DFU,0xA186F20FU,0x2868F169U,
-		0xDCB7DA83U,0x573906FEU,0xA1E2CE9BU,0x4FCD7F52U,0x50115E01U,0xA70683FAU,0xA002B5C4U,0x0DE6D027U,
-		0x9AF88C27U,0x773F8641U,0xC3604C06U,0x61A806B5U,0xF0177A28U,0xC0F586E0U,0x006058AAU,0x30DC7D62U,
-		0x11E69ED7U,0x2338EA63U,0x53C2DD94U,0xC2C21634U,0xBBCBEE56U,0x90BCB6DEU,0xEBFC7DA1U,0xCE591D76U,
-		0x6F05E409U,0x4B7C0188U,0x39720A3DU,0x7C927C24U,0x86E3725FU,0x724D9DB9U,0x1AC15BB4U,0xD39EB8FCU,
-		0xED545578U,0x08FCA5B5U,0xD83D7CD3U,0x4DAD0FC4U,0x1E50EF5EU,0xB161E6F8U,0xA28514D9U,0x6C51133CU,
-		0x6FD5C7E7U,0x56E14EC4U,0x362ABFCEU,0xDDC6C837U,0xD79A3234U,0x92638212U,0x670EFA8EU,0x406000E0U,
-	},{
-		0x3A39CE37U,0xD3FAF5CFU,0xABC27737U,0x5AC52D1BU,0x5CB0679EU,0x4FA33742U,0xD3822740U,0x99BC9BBEU,
-		0xD5118E9DU,0xBF0F7315U,0xD62D1C7EU,0xC700C47BU,0xB78C1B6BU,0x21A19045U,0xB26EB1BEU,0x6A366EB4U,
-		0x5748AB2FU,0xBC946E79U,0xC6A376D2U,0x6549C2C8U,0x530FF8EEU,0x468DDE7DU,0xD5730A1DU,0x4CD04DC6U,
-		0x2939BBDBU,0xA9BA4650U,0xAC9526E8U,0xBE5EE304U,0xA1FAD5F0U,0x6A2D519AU,0x63EF8CE2U,0x9A86EE22U,
-		0xC089C2B8U,0x43242EF6U,0xA51E03AAU,0x9CF2D0A4U,0x83C061BAU,0x9BE96A4DU,0x8FE51550U,0xBA645BD6U,
-		0x2826A2F9U,0xA73A3AE1U,0x4BA99586U,0xEF5562E9U,0xC72FEFD3U,0xF752F7DAU,0x3F046F69U,0x77FA0A59U,
-		0x80E4A915U,0x87B08601U,0x9B09E6ADU,0x3B3EE593U,0xE990FD5AU,0x9E34D797U,0x2CF0B7D9U,0x022B8B51U,
-		0x96D5AC3AU,0x017DA67DU,0xD1CF3ED6U,0x7C7D2D28U,0x1F9F25CFU,0xADF2B89BU,0x5AD6B472U,0x5A88F54CU,
-		0xE029AC71U,0xE019A5E6U,0x47B0ACFDU,0xED93FA9BU,0xE8D3C48DU,0x283B57CCU,0xF8D56629U,0x79132E28U,
-		0x785F0191U,0xED756055U,0xF7960E44U,0xE3D35E8CU,0x15056DD4U,0x88F46DBAU,0x03A16125U,0x0564F0BDU,
-		0xC3EB9E15U,0x3C9057A2U,0x97271AECU,0xA93A072AU,0x1B3F6D9BU,0x1E6321F5U,0xF59C66FBU,0x26DCF319U,
-		0x7533D928U,0xB155FDF5U,0x03563482U,0x8ABA3CBBU,0x28517711U,0xC20AD9F8U,0xABCC5167U,0xCCAD925FU,
-		0x4DE81751U,0x3830DC8EU,0x379D5862U,0x9320F991U,0xEA7A90C2U,0xFB3E7BCEU,0x5121CE64U,0x774FBE32U,
-		0xA8B6E37EU,0xC3293D46U,0x48DE5369U,0x6413E680U,0xA2AE0810U,0xDD6DB224U,0x69852DFDU,0x09072166U,
-		0xB39A460AU,0x6445C0DDU,0x586CDECFU,0x1C20C8AEU,0x5BBEF7DDU,0x1B588D40U,0xCCD2017FU,0x6BB4E3BBU,
-		0xDDA26A7EU,0x3A59FF45U,0x3E350A44U,0xBCB4CDD5U,0x72EACEA8U,0xFA6484BBU,0x8D6612AEU,0xBF3C6F47U,
-		0xD29BE463U,0x542F5D9EU,0xAEC2771BU,0xF64E6370U,0x740E0D8DU,0xE75B1357U,0xF8721671U,0xAF537D5DU,
-		0x4040CB08U,0x4EB4E2CCU,0x34D2466AU,0x0115AF84U,0xE1B00428U,0x95983A1DU,0x06B89FB4U,0xCE6EA048U,
-		0x6F3F3B82U,0x3520AB82U,0x011A1D4BU,0x277227F8U,0x611560B1U,0xE7933FDCU,0xBB3A792BU,0x344525BDU,
-		0xA08839E1U,0x51CE794BU,0x2F32C9B7U,0xA01FBAC9U,0xE01CC87EU,0xBCC7D1F6U,0xCF0111C3U,0xA1E8AAC7U,
-		0x1A908749U,0xD44FBD9AU,0xD0DADECBU,0xD50ADA38U,0x0339C32AU,0xC6913667U,0x8DF9317CU,0xE0B12B4FU,
-		0xF79E59B7U,0x43F5BB3AU,0xF2D519FFU,0x27D9459CU,0xBF97222CU,0x15E6FC2AU,0x0F91FC71U,0x9B941525U,
-		0xFAE59361U,0xCEB69CEBU,0xC2A86459U,0x12BAA8D1U,0xB6C1075EU,0xE3056A0CU,0x10D25065U,0xCB03A442U,
-		0xE0EC6E0EU,0x1698DB3BU,0x4C98A0BEU,0x3278E964U,0x9F1F9532U,0xE0D392DFU,0xD3A0342BU,0x8971F21EU,
-		0x1B0A7441U,0x4BA3348CU,0xC5BE7120U,0xC37632D8U,0xDF359F8DU,0x9B992F2EU,0xE60B6F47U,0x0FE3F11DU,
-		0xE54CDA54U,0x1EDAD891U,0xCE6279CFU,0xCD3E7E6FU,0x1618B166U,0xFD2C1D05U,0x848FD2C5U,0xF6FB2299U,
-		0xF523F357U,0xA6327623U,0x93A83531U,0x56CCCD02U,0xACF08162U,0x5A75EBB5U,0x6E163697U,0x88D273CCU,
-		0xDE966292U,0x81B949D0U,0x4C50901BU,0x71C65614U,0xE6C6C7BDU,0x327A140AU,0x45E1D006U,0xC3F27B9AU,
-		0xC9AA53FDU,0x62A80F00U,0xBB25BFE2U,0x35BDD2F6U,0x71126905U,0xB2040222U,0xB6CBCF7CU,0xCD769C2BU,
-		0x53113EC0U,0x1640E3D3U,0x38ABBD60U,0x2547ADF0U,0xBA38209CU,0xF746CE76U,0x77AFA1C5U,0x20756060U,
-		0x85CBFE4EU,0x8AE88DD8U,0x7AAAF9B0U,0x4CF9AA7EU,0x1948C25CU,0x02FB8A8CU,0x01C36AE4U,0xD6EBE1F9U,
-		0x90D4F869U,0xA65CDEA0U,0x3F09252DU,0xC208E69FU,0xB74E6132U,0xCE77E25BU,0x578FDFE3U,0x3AC372E6U
-	}
-};
-
diff --git a/Core/Tools/Launcher/BFISH.H b/Core/Tools/Launcher/BFISH.H
deleted file mode 100644
index 7fb75f2d3b3..00000000000
--- a/Core/Tools/Launcher/BFISH.H
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Blowfish Component                                           * 
- *                                                                                             * 
- *                     $Archive:: /Sun/Blowfish/bfish.h                                       $* 
- *                                                                                             * 
- *                      $Author:: Joe_b                                                       $*
- *                                                                                             * 
- *                     $Modtime:: 12/02/97 9:35p                                              $*
- *                                                                                             * 
- *                    $Revision:: 6                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#ifndef BFISH_H
-#define BFISH_H
-
-#include	<limits.h>
-
-
-/*
-**	This engine will process data blocks by encryption and decryption.
-**	The "Blowfish" algorithm is in the public domain. It uses
-**	a Feistal network (similar to IDEA). It has no known
-**	weaknesses, but is still relatively new. Blowfish is particularly strong
-**	against brute force attacks. It is also quite strong against linear and
-**	differential cryptanalysis. Unlike public key encription, it is very
-**	fast at encryption, as far as cryptography goes. Its weakness is that 
-**	it takes a relatively long time to set up with a new key (1/100th of 
-**	a second on a P6-200). The time to set up a key is equivalent to 
-**	encrypting 4240 bytes.
-*/
-class BlowfishEngine {
-	public:
-		BlowfishEngine(void) : IsKeyed(false) {}
-		~BlowfishEngine(void);
-
-		void Submit_Key(void const * key, int length);
-
-		int Encrypt(void const * plaintext, int length, void * cyphertext);
-		int Decrypt(void const * cyphertext, int length, void * plaintext);
-
-		/*
-		**	This is the maximum key length supported.
-		*/
-		enum {MAX_KEY_LENGTH=56,
-				BYTES_PER_BLOCK=8		// The number of bytes in each cypher block (don't change).
-		};
-
-	private:
-		bool IsKeyed;
-
-		void Sub_Key_Encrypt(unsigned long & left, unsigned long & right);
-
-		void Process_Block(void const * plaintext, void * cyphertext, unsigned long const * ptable);
-		void Initialize_Tables(void);
-
-		enum {
-			ROUNDS = 16		// Feistal round count (16 is standard).
-		};
-
-		/*
-		**	Initialization data for sub keys. The initial values are constant and
-		**	filled with a number generated from pi. Thus they are not random but
-		**	they don't hold a weak pattern either.
-		*/
-		static unsigned long const P_Init[ROUNDS+2];
-		static unsigned long const S_Init[4][UCHAR_MAX+1];
-
-		/*
-		**	Permutation tables for encryption and decryption.
-		*/
- 		unsigned long P_Encrypt[ROUNDS+2];
- 		unsigned long P_Decrypt[ROUNDS+2];
-
-		/*
-		**	S-Box tables (four).
-		*/
-		unsigned long bf_S[4][UCHAR_MAX+1];
-};
-
-#endif
-
diff --git a/Core/Tools/Launcher/BFISH.cpp b/Core/Tools/Launcher/BFISH.cpp
new file mode 100644
index 00000000000..a1cea422770
--- /dev/null
+++ b/Core/Tools/Launcher/BFISH.cpp
@@ -0,0 +1,597 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Blowfish Component                                           *
+ *                                                                                             *
+ *                     $Archive:: /Sun/Blowfish/bfish.cpp                                     $*
+ *                                                                                             *
+ *                      $Author:: Joe_b                                                       $*
+ *                                                                                             *
+ *                     $Modtime:: 12/02/97 9:35p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 6                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   BlowfishEngine::Decrypt -- Decrypts data using blowfish algorithm.                        *
+ *   BlowfishEngine::Encrypt -- Encrypt an arbitrary block of data.                            *
+ *   BlowfishEngine::Process_Block -- Process a block of data using Blowfish algorithm.        *
+ *   BlowfishEngine::Sub_Key_Encrypt -- Encrypts a block for use in S-Box processing.          *
+ *   BlowfishEngine::Submit_Key -- Submit a key that will allow data processing.               *
+ *   BlowfishEngine::~BlowfishEngine -- Destructor for the Blowfish engine.                    *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma warning(disable : 4514)
+#include	"BFISH.h"
+#include	<string.h>
+#include	<assert.h>
+
+
+/*
+**	Byte order controlled long integer. This integer is constructed
+**	so that character 0 (C0) is the most significant byte of the
+**	integer. This is biased toward big endian architecture, but that
+**	just happens to be how the Blowfish algorithm was designed.
+*/
+typedef union {
+	unsigned long Long;
+	struct {
+		unsigned char C3;
+		unsigned char C2;
+		unsigned char C1;
+		unsigned char C0;
+	} Char;
+} Int;
+
+
+/***********************************************************************************************
+ * BlowfishEngine::~BlowfishEngine -- Destructor for the Blowfish engine.                      *
+ *                                                                                             *
+ *    This destructor will clear out the s-box tables so that even if the memory for the       *
+ *    class remains, it will contain no compromising data.                                     *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/08/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+BlowfishEngine::~BlowfishEngine(void)
+{
+	if (IsKeyed) {
+		Submit_Key(NULL, 0);
+	}
+}
+
+
+/***********************************************************************************************
+ * BlowfishEngine::Submit_Key -- Submit a key that will allow data processing.                 *
+ *                                                                                             *
+ *    This routine must be called before any data can be encrypted or decrypted. This routine  *
+ *    need only be called when the key is to be changed or set for the first time. Once the    *
+ *    key has been set, the engine may be used to encrypt, decrypt, or both operations         *
+ *    indefinitely. The key must be 56 bytes or less in length. This is necessary because      *
+ *    any keys longer than that will not correctly affect the encryption process.              *
+ *                                                                                             *
+ *    If the key pointer is NULL, then the S-Box tables are reset to identity. This will       *
+ *    mask the previous key setting. Use this method to clear the engine after processing in   *
+ *    order to gain a measure of security.                                                     *
+ *                                                                                             *
+ * INPUT:   key      -- Pointer to the key data block.                                         *
+ *                                                                                             *
+ *          length   -- The length of the submitted key.                                       *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   This is a time consuming process.                                               *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   04/14/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+void BlowfishEngine::Submit_Key(void const * key, int length)
+{
+	assert(length <= MAX_KEY_LENGTH);
+
+	/*
+	**	Initialize the permutation and S-Box tables to a known
+	**	constant value.
+	*/
+	memcpy(P_Encrypt, P_Init, sizeof(P_Init));
+	memcpy(P_Decrypt, P_Init, sizeof(P_Init));
+	memcpy(bf_S, S_Init, sizeof(S_Init));
+
+	/*
+	**	Validate parameters.
+	*/
+	if (key == 0 || length == 0) {
+		IsKeyed = false;
+		return;
+	}
+
+	/*
+	**	Combine the key with the permutation table. Wrap the key
+	**	as many times as necessary to ensure that the entire
+	**	permutation table has been modified. The key is lifted
+	**	into a long by using endian independent means.
+	*/
+	int j = 0;
+	unsigned char const * key_ptr = (unsigned char const *)key;
+	unsigned long * p_ptr = &P_Encrypt[0];
+	for (int index = 0; index < ROUNDS+2; index++) {
+		unsigned long data = 0;
+
+		data = (data << CHAR_BIT) | key_ptr[j++ % length];
+		data = (data << CHAR_BIT) | key_ptr[j++ % length];
+		data = (data << CHAR_BIT) | key_ptr[j++ % length];
+		data = (data << CHAR_BIT) | key_ptr[j++ % length];
+
+		*p_ptr++ ^= data;
+	}
+
+	/*
+	**	The permutation table must be scrambled by means of the key. This
+	**	is how the key is factored into the encryption -- by merely altering
+	**	the permutation (and S-Box) tables. Because this transformation alters
+	**	the table data WHILE it is using the table data, the tables are
+	**	thoroughly obfuscated by this process.
+	*/
+	unsigned long left = 0x00000000L;
+	unsigned long right = 0x00000000L;
+	unsigned long * p_en = &P_Encrypt[0];			// Encryption table.
+	unsigned long * p_de = &P_Decrypt[ROUNDS+1];	// Decryption table.
+	for (int p_index = 0; p_index < ROUNDS+2; p_index += 2) {
+		Sub_Key_Encrypt(left, right);
+
+		*p_en++ = left;
+		*p_en++ = right;
+
+		*p_de-- = left;
+		*p_de-- = right;
+	}
+
+	/*
+	**	Perform a similar transmutation to the S-Box tables. Also notice that the
+	**	working 64 bit number is carried into this process from the previous
+	**	operation.
+	*/
+	for (int sbox_index = 0; sbox_index < 4; sbox_index++) {
+		for (int ss_index = 0; ss_index < UCHAR_MAX+1; ss_index += 2) {
+			Sub_Key_Encrypt(left, right);
+			bf_S[sbox_index][ss_index] = left;
+			bf_S[sbox_index][ss_index + 1] = right;
+		}
+	}
+
+	IsKeyed = true;
+}
+
+
+/***********************************************************************************************
+ * BlowfishEngine::Encrypt -- Encrypt an arbitrary block of data.                              *
+ *                                                                                             *
+ *    Use this routine to encrypt an arbitrary block of data. The block must be an even        *
+ *    multiple of 8 bytes. Any bytes left over will not be encrypted. The 8 byte requirement   *
+ *    is necessary because the underlying algorithm processes blocks in 8 byte chunks.         *
+ *    Partial blocks are unrecoverable and useless.                                            *
+ *                                                                                             *
+ * INPUT:   plaintext-- Pointer to the data block to be encrypted.                             *
+ *                                                                                             *
+ *          length   -- The length of the data block.                                          *
+ *                                                                                             *
+ *          cyphertext- Pointer to the output buffer that will hold the encrypted data.        *
+ *                                                                                             *
+ * OUTPUT:  Returns with the actual number of bytes encrypted.                                 *
+ *                                                                                             *
+ * WARNINGS:   You must submit the key before calling this routine. This will only encrypt     *
+ *             the plaintext in 8 byte increments. Modulo bytes left over are not processed.   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   04/14/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+int BlowfishEngine::Encrypt(void const * plaintext, int length, void * cyphertext)
+{
+	if (plaintext == 0 || length == 0) {
+		return(0);
+	}
+	if (cyphertext == 0) cyphertext = (void *)plaintext;
+
+	if (IsKeyed) {
+
+		/*
+		**	Validate parameters.
+		*/
+		int blocks = length / BYTES_PER_BLOCK;
+
+		/*
+		**	Process the buffer in 64 bit chunks.
+		*/
+		for (int index = 0; index < blocks; index++) {
+			Process_Block(plaintext, cyphertext, P_Encrypt);
+			plaintext = ((char *)plaintext) + BYTES_PER_BLOCK;
+			cyphertext = ((char *)cyphertext) + BYTES_PER_BLOCK;
+		}
+		int encrypted = blocks * BYTES_PER_BLOCK;
+
+		/*
+		**	Copy over any trailing left over appendix bytes.
+		*/
+		if (encrypted < length) {
+			memmove(cyphertext, plaintext, length - encrypted);
+		}
+
+		return(encrypted);
+	}
+
+	/*
+	**	Non-keyed processing merely copies the data.
+	*/
+	if (plaintext != cyphertext) {
+		memmove(cyphertext, plaintext, length);
+	}
+	return(length);
+}
+
+
+/***********************************************************************************************
+ * BlowfishEngine::Decrypt -- Decrypt an arbitrary block of data.                              *
+ *                                                                                             *
+ *    Use this routine to decrypt an arbitrary block of data. The block must be an even        *
+ *    multiple of 8 bytes. Any bytes left over will not be decrypted. The 8 byte requirement   *
+ *    is necessary because the underlying algorithm processes blocks in 8 byte chunks.         *
+ *    Partial blocks are unrecoverable and useless.                                            *
+ *                                                                                             *
+ * INPUT:   cyphertext- Pointer to the data block to be decrypted.                             *
+ *                                                                                             *
+ *          length   -- The length of the data block.                                          *
+ *                                                                                             *
+ *          plaintext-- Pointer to the output buffer that will hold the decrypted data.        *
+ *                                                                                             *
+ * OUTPUT:  Returns with the actual number of bytes decrypted.                                 *
+ *                                                                                             *
+ * WARNINGS:   You must submit the key before calling this routine. This will only decrypt     *
+ *             the cyphertext in 8 byte increments. Modulo bytes left over are not processed.  *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   04/14/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+int BlowfishEngine::Decrypt(void const * cyphertext, int length, void * plaintext)
+{
+	if (cyphertext == 0 || length == 0) {
+		return(0);
+	}
+	if (plaintext == 0) plaintext = (void *)cyphertext;
+
+	if (IsKeyed) {
+
+		/*
+		**	Validate parameters.
+		*/
+		int blocks = length / BYTES_PER_BLOCK;
+
+		/*
+		**	Process the buffer in 64 bit chunks.
+		*/
+		for (int index = 0; index < blocks; index++) {
+			Process_Block(cyphertext, plaintext, P_Decrypt);
+			cyphertext = ((char *)cyphertext) + BYTES_PER_BLOCK;
+			plaintext = ((char *)plaintext) + BYTES_PER_BLOCK;
+		}
+		int encrypted = blocks * BYTES_PER_BLOCK;
+
+		/*
+		**	Copy over any trailing left over appendix bytes.
+		*/
+		if (encrypted < length) {
+			memmove(plaintext, cyphertext, length - encrypted);
+		}
+
+		return(encrypted);
+	}
+
+	/*
+	**	Non-keyed processing merely copies the data.
+	*/
+	if (plaintext != cyphertext) {
+		memmove(plaintext, cyphertext, length);
+	}
+	return(length);
+}
+
+
+/***********************************************************************************************
+ * BlowfishEngine::Process_Block -- Process a block of data using Blowfish algorithm.          *
+ *                                                                                             *
+ *    This is the main processing routine for encryption and decryption. The algorithm         *
+ *    consists of a 16 round Feistal network and uses mathematics from different algebraic     *
+ *    groups (strengthens against differential cryptanalysis). The large S-Boxes and the       *
+ *    rounds strengthen it against linear cryptanalysis.                                       *
+ *                                                                                             *
+ * INPUT:   plaintext   -- Pointer to the source text (it actually might be a pointer to       *
+ *                         the cyphertext if this is called as a decryption process).          *
+ *                                                                                             *
+ *          cyphertext  -- Pointer to the output buffer that will hold the processed block.    *
+ *                                                                                             *
+ *          ptable      -- Pointer to the permutation table. This algorithm will encrypt       *
+ *                         and decrypt using the same S-Box tables. The encryption control     *
+ *                         is handled by the permutation table.                                *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   The source and destination buffers must be 8 bytes long.                        *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   04/19/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+void BlowfishEngine::Process_Block(void const * plaintext, void * cyphertext, unsigned long const * ptable)
+{
+	/*
+	**	Input the left and right halves of the source block such that
+	**	the byte order is constant regardless of the endian
+	**	persuasion of the current processor. The blowfish algorithm is
+	**	biased toward "big endian" architecture and some optimizations
+	**	could be done for big endian processors in that case.
+	*/
+	unsigned char const * source = (unsigned char const *)plaintext;
+	Int left;
+	left.Char.C0 = *source++;
+	left.Char.C1 = *source++;
+	left.Char.C2 = *source++;
+	left.Char.C3 = *source++;
+
+	Int right;
+	right.Char.C0 = *source++;
+	right.Char.C1 = *source++;
+	right.Char.C2 = *source++;
+	right.Char.C3 = *source;
+
+	/*
+	**	Perform all Feistal rounds on the block. This is the encryption/decryption
+	**	process. Since there is an exchange that occurs after each round, two
+	**	rounds are combined in this loop to avoid unnecessary exchanging.
+	*/
+	for (int index = 0; index < ROUNDS/2; index++) {
+		left.Long ^= *ptable++;
+		right.Long ^= ((( bf_S[0][left.Char.C0] + bf_S[1][left.Char.C1]) ^ bf_S[2][left.Char.C2]) + bf_S[3][left.Char.C3]);
+		right.Long ^= *ptable++;
+		left.Long ^= ((( bf_S[0][right.Char.C0] + bf_S[1][right.Char.C1]) ^ bf_S[2][right.Char.C2]) + bf_S[3][right.Char.C3]);
+	}
+
+	/*
+	**	The final two longs in the permutation table are processed into the block.
+	**	The left and right halves are still reversed as a side effect of the last
+	**	round.
+	*/
+	left.Long ^= *ptable++;
+	right.Long ^= *ptable;
+
+	/*
+	**	The final block data is output in endian architecture
+	**	independent format. Notice that the blocks are output as
+	**	right first and left second. This is to counteract the final
+	**	superfluous exchange that occurs as a side effect of the
+	**	encryption rounds.
+	*/
+	unsigned char * out = (unsigned char *)cyphertext;
+	*out++ = right.Char.C0;
+	*out++ = right.Char.C1;
+	*out++ = right.Char.C2;
+	*out++ = right.Char.C3;
+
+	*out++ = left.Char.C0;
+	*out++ = left.Char.C1;
+	*out++ = left.Char.C2;
+	*out = left.Char.C3;
+}
+
+
+/***********************************************************************************************
+ * BlowfishEngine::Sub_Key_Encrypt -- Encrypts a block for use in S-Box processing.            *
+ *                                                                                             *
+ *    This is the same as the normal process block function but it doesn't have the endian     *
+ *    fixup logic. Since this routine is only called for S-Box table generation and it is      *
+ *    known that the S-Box initial data is already in local machine endian format, the         *
+ *    byte order fixups are not needed. This also has a tendency to speed up S-Box generation  *
+ *    as well.                                                                                 *
+ *                                                                                             *
+ * INPUT:   left  -- The left half of the data block.                                          *
+ *                                                                                             *
+ *          right -- The right half of the data block.                                         *
+ *                                                                                             *
+ * OUTPUT:  none, but the processed block is stored back into the left and right half          *
+ *          integers.                                                                          *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   04/19/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+void BlowfishEngine::Sub_Key_Encrypt(unsigned long & left, unsigned long & right)
+{
+	Int l;
+	l.Long = left;
+
+	Int r;
+	r.Long = right;
+
+	for (int index = 0; index < ROUNDS; index += 2) {
+		l.Long ^= P_Encrypt[index];
+		r.Long ^= ((( bf_S[0][l.Char.C0] + bf_S[1][l.Char.C1]) ^ bf_S[2][l.Char.C2]) + bf_S[3][l.Char.C3]);
+		r.Long ^= P_Encrypt[index+1];
+		l.Long ^= ((( bf_S[0][r.Char.C0] + bf_S[1][r.Char.C1]) ^ bf_S[2][r.Char.C2]) + bf_S[3][r.Char.C3]);
+	}
+	left = r.Long ^ P_Encrypt[ROUNDS+1];
+	right = l.Long ^ P_Encrypt[ROUNDS];
+}
+
+
+/*
+**	These tables have the bytes stored in machine endian format. Because of this,
+**	a special block cypher routine is needed when the sub-keys are generated.
+**	This is kludgier than it otherwise should be. However, storing these
+**	integers in machine independent format would be even more painful.
+*/
+
+unsigned long const BlowfishEngine::P_Init[BlowfishEngine::ROUNDS+2] = {
+	0x243F6A88U,0x85A308D3U,0x13198A2EU,0x03707344U,0xA4093822U,0x299F31D0U,0x082EFA98U,0xEC4E6C89U,
+	0x452821E6U,0x38D01377U,0xBE5466CFU,0x34E90C6CU,0xC0AC29B7U,0xC97C50DDU,0x3F84D5B5U,0xB5470917U,
+	0x9216D5D9U,0x8979FB1BU
+};
+
+unsigned long const BlowfishEngine::S_Init[4][UCHAR_MAX+1] = {
+	{
+		0xD1310BA6U,0x98DFB5ACU,0x2FFD72DBU,0xD01ADFB7U,0xB8E1AFEDU,0x6A267E96U,0xBA7C9045U,0xF12C7F99U,
+		0x24A19947U,0xB3916CF7U,0x0801F2E2U,0x858EFC16U,0x636920D8U,0x71574E69U,0xA458FEA3U,0xF4933D7EU,
+		0x0D95748FU,0x728EB658U,0x718BCD58U,0x82154AEEU,0x7B54A41DU,0xC25A59B5U,0x9C30D539U,0x2AF26013U,
+		0xC5D1B023U,0x286085F0U,0xCA417918U,0xB8DB38EFU,0x8E79DCB0U,0x603A180EU,0x6C9E0E8BU,0xB01E8A3EU,
+		0xD71577C1U,0xBD314B27U,0x78AF2FDAU,0x55605C60U,0xE65525F3U,0xAA55AB94U,0x57489862U,0x63E81440U,
+		0x55CA396AU,0x2AAB10B6U,0xB4CC5C34U,0x1141E8CEU,0xA15486AFU,0x7C72E993U,0xB3EE1411U,0x636FBC2AU,
+		0x2BA9C55DU,0x741831F6U,0xCE5C3E16U,0x9B87931EU,0xAFD6BA33U,0x6C24CF5CU,0x7A325381U,0x28958677U,
+		0x3B8F4898U,0x6B4BB9AFU,0xC4BFE81BU,0x66282193U,0x61D809CCU,0xFB21A991U,0x487CAC60U,0x5DEC8032U,
+		0xEF845D5DU,0xE98575B1U,0xDC262302U,0xEB651B88U,0x23893E81U,0xD396ACC5U,0x0F6D6FF3U,0x83F44239U,
+		0x2E0B4482U,0xA4842004U,0x69C8F04AU,0x9E1F9B5EU,0x21C66842U,0xF6E96C9AU,0x670C9C61U,0xABD388F0U,
+		0x6A51A0D2U,0xD8542F68U,0x960FA728U,0xAB5133A3U,0x6EEF0B6CU,0x137A3BE4U,0xBA3BF050U,0x7EFB2A98U,
+		0xA1F1651DU,0x39AF0176U,0x66CA593EU,0x82430E88U,0x8CEE8619U,0x456F9FB4U,0x7D84A5C3U,0x3B8B5EBEU,
+		0xE06F75D8U,0x85C12073U,0x401A449FU,0x56C16AA6U,0x4ED3AA62U,0x363F7706U,0x1BFEDF72U,0x429B023DU,
+		0x37D0D724U,0xD00A1248U,0xDB0FEAD3U,0x49F1C09BU,0x075372C9U,0x80991B7BU,0x25D479D8U,0xF6E8DEF7U,
+		0xE3FE501AU,0xB6794C3BU,0x976CE0BDU,0x04C006BAU,0xC1A94FB6U,0x409F60C4U,0x5E5C9EC2U,0x196A2463U,
+		0x68FB6FAFU,0x3E6C53B5U,0x1339B2EBU,0x3B52EC6FU,0x6DFC511FU,0x9B30952CU,0xCC814544U,0xAF5EBD09U,
+		0xBEE3D004U,0xDE334AFDU,0x660F2807U,0x192E4BB3U,0xC0CBA857U,0x45C8740FU,0xD20B5F39U,0xB9D3FBDBU,
+		0x5579C0BDU,0x1A60320AU,0xD6A100C6U,0x402C7279U,0x679F25FEU,0xFB1FA3CCU,0x8EA5E9F8U,0xDB3222F8U,
+		0x3C7516DFU,0xFD616B15U,0x2F501EC8U,0xAD0552ABU,0x323DB5FAU,0xFD238760U,0x53317B48U,0x3E00DF82U,
+		0x9E5C57BBU,0xCA6F8CA0U,0x1A87562EU,0xDF1769DBU,0xD542A8F6U,0x287EFFC3U,0xAC6732C6U,0x8C4F5573U,
+		0x695B27B0U,0xBBCA58C8U,0xE1FFA35DU,0xB8F011A0U,0x10FA3D98U,0xFD2183B8U,0x4AFCB56CU,0x2DD1D35BU,
+		0x9A53E479U,0xB6F84565U,0xD28E49BCU,0x4BFB9790U,0xE1DDF2DAU,0xA4CB7E33U,0x62FB1341U,0xCEE4C6E8U,
+		0xEF20CADAU,0x36774C01U,0xD07E9EFEU,0x2BF11FB4U,0x95DBDA4DU,0xAE909198U,0xEAAD8E71U,0x6B93D5A0U,
+		0xD08ED1D0U,0xAFC725E0U,0x8E3C5B2FU,0x8E7594B7U,0x8FF6E2FBU,0xF2122B64U,0x8888B812U,0x900DF01CU,
+		0x4FAD5EA0U,0x688FC31CU,0xD1CFF191U,0xB3A8C1ADU,0x2F2F2218U,0xBE0E1777U,0xEA752DFEU,0x8B021FA1U,
+		0xE5A0CC0FU,0xB56F74E8U,0x18ACF3D6U,0xCE89E299U,0xB4A84FE0U,0xFD13E0B7U,0x7CC43B81U,0xD2ADA8D9U,
+		0x165FA266U,0x80957705U,0x93CC7314U,0x211A1477U,0xE6AD2065U,0x77B5FA86U,0xC75442F5U,0xFB9D35CFU,
+		0xEBCDAF0CU,0x7B3E89A0U,0xD6411BD3U,0xAE1E7E49U,0x00250E2DU,0x2071B35EU,0x226800BBU,0x57B8E0AFU,
+		0x2464369BU,0xF009B91EU,0x5563911DU,0x59DFA6AAU,0x78C14389U,0xD95A537FU,0x207D5BA2U,0x02E5B9C5U,
+		0x83260376U,0x6295CFA9U,0x11C81968U,0x4E734A41U,0xB3472DCAU,0x7B14A94AU,0x1B510052U,0x9A532915U,
+		0xD60F573FU,0xBC9BC6E4U,0x2B60A476U,0x81E67400U,0x08BA6FB5U,0x571BE91FU,0xF296EC6BU,0x2A0DD915U,
+		0xB6636521U,0xE7B9F9B6U,0xFF34052EU,0xC5855664U,0x53B02D5DU,0xA99F8FA1U,0x08BA4799U,0x6E85076AU,
+	},{
+		0x4B7A70E9U,0xB5B32944U,0xDB75092EU,0xC4192623U,0xAD6EA6B0U,0x49A7DF7DU,0x9CEE60B8U,0x8FEDB266U,
+		0xECAA8C71U,0x699A17FFU,0x5664526CU,0xC2B19EE1U,0x193602A5U,0x75094C29U,0xA0591340U,0xE4183A3EU,
+		0x3F54989AU,0x5B429D65U,0x6B8FE4D6U,0x99F73FD6U,0xA1D29C07U,0xEFE830F5U,0x4D2D38E6U,0xF0255DC1U,
+		0x4CDD2086U,0x8470EB26U,0x6382E9C6U,0x021ECC5EU,0x09686B3FU,0x3EBAEFC9U,0x3C971814U,0x6B6A70A1U,
+		0x687F3584U,0x52A0E286U,0xB79C5305U,0xAA500737U,0x3E07841CU,0x7FDEAE5CU,0x8E7D44ECU,0x5716F2B8U,
+		0xB03ADA37U,0xF0500C0DU,0xF01C1F04U,0x0200B3FFU,0xAE0CF51AU,0x3CB574B2U,0x25837A58U,0xDC0921BDU,
+		0xD19113F9U,0x7CA92FF6U,0x94324773U,0x22F54701U,0x3AE5E581U,0x37C2DADCU,0xC8B57634U,0x9AF3DDA7U,
+		0xA9446146U,0x0FD0030EU,0xECC8C73EU,0xA4751E41U,0xE238CD99U,0x3BEA0E2FU,0x3280BBA1U,0x183EB331U,
+		0x4E548B38U,0x4F6DB908U,0x6F420D03U,0xF60A04BFU,0x2CB81290U,0x24977C79U,0x5679B072U,0xBCAF89AFU,
+		0xDE9A771FU,0xD9930810U,0xB38BAE12U,0xDCCF3F2EU,0x5512721FU,0x2E6B7124U,0x501ADDE6U,0x9F84CD87U,
+		0x7A584718U,0x7408DA17U,0xBC9F9ABCU,0xE94B7D8CU,0xEC7AEC3AU,0xDB851DFAU,0x63094366U,0xC464C3D2U,
+		0xEF1C1847U,0x3215D908U,0xDD433B37U,0x24C2BA16U,0x12A14D43U,0x2A65C451U,0x50940002U,0x133AE4DDU,
+		0x71DFF89EU,0x10314E55U,0x81AC77D6U,0x5F11199BU,0x043556F1U,0xD7A3C76BU,0x3C11183BU,0x5924A509U,
+		0xF28FE6EDU,0x97F1FBFAU,0x9EBABF2CU,0x1E153C6EU,0x86E34570U,0xEAE96FB1U,0x860E5E0AU,0x5A3E2AB3U,
+		0x771FE71CU,0x4E3D06FAU,0x2965DCB9U,0x99E71D0FU,0x803E89D6U,0x5266C825U,0x2E4CC978U,0x9C10B36AU,
+		0xC6150EBAU,0x94E2EA78U,0xA5FC3C53U,0x1E0A2DF4U,0xF2F74EA7U,0x361D2B3DU,0x1939260FU,0x19C27960U,
+		0x5223A708U,0xF71312B6U,0xEBADFE6EU,0xEAC31F66U,0xE3BC4595U,0xA67BC883U,0xB17F37D1U,0x018CFF28U,
+		0xC332DDEFU,0xBE6C5AA5U,0x65582185U,0x68AB9802U,0xEECEA50FU,0xDB2F953BU,0x2AEF7DADU,0x5B6E2F84U,
+		0x1521B628U,0x29076170U,0xECDD4775U,0x619F1510U,0x13CCA830U,0xEB61BD96U,0x0334FE1EU,0xAA0363CFU,
+		0xB5735C90U,0x4C70A239U,0xD59E9E0BU,0xCBAADE14U,0xEECC86BCU,0x60622CA7U,0x9CAB5CABU,0xB2F3846EU,
+		0x648B1EAFU,0x19BDF0CAU,0xA02369B9U,0x655ABB50U,0x40685A32U,0x3C2AB4B3U,0x319EE9D5U,0xC021B8F7U,
+		0x9B540B19U,0x875FA099U,0x95F7997EU,0x623D7DA8U,0xF837889AU,0x97E32D77U,0x11ED935FU,0x16681281U,
+		0x0E358829U,0xC7E61FD6U,0x96DEDFA1U,0x7858BA99U,0x57F584A5U,0x1B227263U,0x9B83C3FFU,0x1AC24696U,
+		0xCDB30AEBU,0x532E3054U,0x8FD948E4U,0x6DBC3128U,0x58EBF2EFU,0x34C6FFEAU,0xFE28ED61U,0xEE7C3C73U,
+		0x5D4A14D9U,0xE864B7E3U,0x42105D14U,0x203E13E0U,0x45EEE2B6U,0xA3AAABEAU,0xDB6C4F15U,0xFACB4FD0U,
+		0xC742F442U,0xEF6ABBB5U,0x654F3B1DU,0x41CD2105U,0xD81E799EU,0x86854DC7U,0xE44B476AU,0x3D816250U,
+		0xCF62A1F2U,0x5B8D2646U,0xFC8883A0U,0xC1C7B6A3U,0x7F1524C3U,0x69CB7492U,0x47848A0BU,0x5692B285U,
+		0x095BBF00U,0xAD19489DU,0x1462B174U,0x23820E00U,0x58428D2AU,0x0C55F5EAU,0x1DADF43EU,0x233F7061U,
+		0x3372F092U,0x8D937E41U,0xD65FECF1U,0x6C223BDBU,0x7CDE3759U,0xCBEE7460U,0x4085F2A7U,0xCE77326EU,
+		0xA6078084U,0x19F8509EU,0xE8EFD855U,0x61D99735U,0xA969A7AAU,0xC50C06C2U,0x5A04ABFCU,0x800BCADCU,
+		0x9E447A2EU,0xC3453484U,0xFDD56705U,0x0E1E9EC9U,0xDB73DBD3U,0x105588CDU,0x675FDA79U,0xE3674340U,
+		0xC5C43465U,0x713E38D8U,0x3D28F89EU,0xF16DFF20U,0x153E21E7U,0x8FB03D4AU,0xE6E39F2BU,0xDB83ADF7U,
+	},{
+		0xE93D5A68U,0x948140F7U,0xF64C261CU,0x94692934U,0x411520F7U,0x7602D4F7U,0xBCF46B2EU,0xD4A20068U,
+		0xD4082471U,0x3320F46AU,0x43B7D4B7U,0x500061AFU,0x1E39F62EU,0x97244546U,0x14214F74U,0xBF8B8840U,
+		0x4D95FC1DU,0x96B591AFU,0x70F4DDD3U,0x66A02F45U,0xBFBC09ECU,0x03BD9785U,0x7FAC6DD0U,0x31CB8504U,
+		0x96EB27B3U,0x55FD3941U,0xDA2547E6U,0xABCA0A9AU,0x28507825U,0x530429F4U,0x0A2C86DAU,0xE9B66DFBU,
+		0x68DC1462U,0xD7486900U,0x680EC0A4U,0x27A18DEEU,0x4F3FFEA2U,0xE887AD8CU,0xB58CE006U,0x7AF4D6B6U,
+		0xAACE1E7CU,0xD3375FECU,0xCE78A399U,0x406B2A42U,0x20FE9E35U,0xD9F385B9U,0xEE39D7ABU,0x3B124E8BU,
+		0x1DC9FAF7U,0x4B6D1856U,0x26A36631U,0xEAE397B2U,0x3A6EFA74U,0xDD5B4332U,0x6841E7F7U,0xCA7820FBU,
+		0xFB0AF54EU,0xD8FEB397U,0x454056ACU,0xBA489527U,0x55533A3AU,0x20838D87U,0xFE6BA9B7U,0xD096954BU,
+		0x55A867BCU,0xA1159A58U,0xCCA92963U,0x99E1DB33U,0xA62A4A56U,0x3F3125F9U,0x5EF47E1CU,0x9029317CU,
+		0xFDF8E802U,0x04272F70U,0x80BB155CU,0x05282CE3U,0x95C11548U,0xE4C66D22U,0x48C1133FU,0xC70F86DCU,
+		0x07F9C9EEU,0x41041F0FU,0x404779A4U,0x5D886E17U,0x325F51EBU,0xD59BC0D1U,0xF2BCC18FU,0x41113564U,
+		0x257B7834U,0x602A9C60U,0xDFF8E8A3U,0x1F636C1BU,0x0E12B4C2U,0x02E1329EU,0xAF664FD1U,0xCAD18115U,
+		0x6B2395E0U,0x333E92E1U,0x3B240B62U,0xEEBEB922U,0x85B2A20EU,0xE6BA0D99U,0xDE720C8CU,0x2DA2F728U,
+		0xD0127845U,0x95B794FDU,0x647D0862U,0xE7CCF5F0U,0x5449A36FU,0x877D48FAU,0xC39DFD27U,0xF33E8D1EU,
+		0x0A476341U,0x992EFF74U,0x3A6F6EABU,0xF4F8FD37U,0xA812DC60U,0xA1EBDDF8U,0x991BE14CU,0xDB6E6B0DU,
+		0xC67B5510U,0x6D672C37U,0x2765D43BU,0xDCD0E804U,0xF1290DC7U,0xCC00FFA3U,0xB5390F92U,0x690FED0BU,
+		0x667B9FFBU,0xCEDB7D9CU,0xA091CF0BU,0xD9155EA3U,0xBB132F88U,0x515BAD24U,0x7B9479BFU,0x763BD6EBU,
+		0x37392EB3U,0xCC115979U,0x8026E297U,0xF42E312DU,0x6842ADA7U,0xC66A2B3BU,0x12754CCCU,0x782EF11CU,
+		0x6A124237U,0xB79251E7U,0x06A1BBE6U,0x4BFB6350U,0x1A6B1018U,0x11CAEDFAU,0x3D25BDD8U,0xE2E1C3C9U,
+		0x44421659U,0x0A121386U,0xD90CEC6EU,0xD5ABEA2AU,0x64AF674EU,0xDA86A85FU,0xBEBFE988U,0x64E4C3FEU,
+		0x9DBC8057U,0xF0F7C086U,0x60787BF8U,0x6003604DU,0xD1FD8346U,0xF6381FB0U,0x7745AE04U,0xD736FCCCU,
+		0x83426B33U,0xF01EAB71U,0xB0804187U,0x3C005E5FU,0x77A057BEU,0xBDE8AE24U,0x55464299U,0xBF582E61U,
+		0x4E58F48FU,0xF2DDFDA2U,0xF474EF38U,0x8789BDC2U,0x5366F9C3U,0xC8B38E74U,0xB475F255U,0x46FCD9B9U,
+		0x7AEB2661U,0x8B1DDF84U,0x846A0E79U,0x915F95E2U,0x466E598EU,0x20B45770U,0x8CD55591U,0xC902DE4CU,
+		0xB90BACE1U,0xBB8205D0U,0x11A86248U,0x7574A99EU,0xB77F19B6U,0xE0A9DC09U,0x662D09A1U,0xC4324633U,
+		0xE85A1F02U,0x09F0BE8CU,0x4A99A025U,0x1D6EFE10U,0x1AB93D1DU,0x0BA5A4DFU,0xA186F20FU,0x2868F169U,
+		0xDCB7DA83U,0x573906FEU,0xA1E2CE9BU,0x4FCD7F52U,0x50115E01U,0xA70683FAU,0xA002B5C4U,0x0DE6D027U,
+		0x9AF88C27U,0x773F8641U,0xC3604C06U,0x61A806B5U,0xF0177A28U,0xC0F586E0U,0x006058AAU,0x30DC7D62U,
+		0x11E69ED7U,0x2338EA63U,0x53C2DD94U,0xC2C21634U,0xBBCBEE56U,0x90BCB6DEU,0xEBFC7DA1U,0xCE591D76U,
+		0x6F05E409U,0x4B7C0188U,0x39720A3DU,0x7C927C24U,0x86E3725FU,0x724D9DB9U,0x1AC15BB4U,0xD39EB8FCU,
+		0xED545578U,0x08FCA5B5U,0xD83D7CD3U,0x4DAD0FC4U,0x1E50EF5EU,0xB161E6F8U,0xA28514D9U,0x6C51133CU,
+		0x6FD5C7E7U,0x56E14EC4U,0x362ABFCEU,0xDDC6C837U,0xD79A3234U,0x92638212U,0x670EFA8EU,0x406000E0U,
+	},{
+		0x3A39CE37U,0xD3FAF5CFU,0xABC27737U,0x5AC52D1BU,0x5CB0679EU,0x4FA33742U,0xD3822740U,0x99BC9BBEU,
+		0xD5118E9DU,0xBF0F7315U,0xD62D1C7EU,0xC700C47BU,0xB78C1B6BU,0x21A19045U,0xB26EB1BEU,0x6A366EB4U,
+		0x5748AB2FU,0xBC946E79U,0xC6A376D2U,0x6549C2C8U,0x530FF8EEU,0x468DDE7DU,0xD5730A1DU,0x4CD04DC6U,
+		0x2939BBDBU,0xA9BA4650U,0xAC9526E8U,0xBE5EE304U,0xA1FAD5F0U,0x6A2D519AU,0x63EF8CE2U,0x9A86EE22U,
+		0xC089C2B8U,0x43242EF6U,0xA51E03AAU,0x9CF2D0A4U,0x83C061BAU,0x9BE96A4DU,0x8FE51550U,0xBA645BD6U,
+		0x2826A2F9U,0xA73A3AE1U,0x4BA99586U,0xEF5562E9U,0xC72FEFD3U,0xF752F7DAU,0x3F046F69U,0x77FA0A59U,
+		0x80E4A915U,0x87B08601U,0x9B09E6ADU,0x3B3EE593U,0xE990FD5AU,0x9E34D797U,0x2CF0B7D9U,0x022B8B51U,
+		0x96D5AC3AU,0x017DA67DU,0xD1CF3ED6U,0x7C7D2D28U,0x1F9F25CFU,0xADF2B89BU,0x5AD6B472U,0x5A88F54CU,
+		0xE029AC71U,0xE019A5E6U,0x47B0ACFDU,0xED93FA9BU,0xE8D3C48DU,0x283B57CCU,0xF8D56629U,0x79132E28U,
+		0x785F0191U,0xED756055U,0xF7960E44U,0xE3D35E8CU,0x15056DD4U,0x88F46DBAU,0x03A16125U,0x0564F0BDU,
+		0xC3EB9E15U,0x3C9057A2U,0x97271AECU,0xA93A072AU,0x1B3F6D9BU,0x1E6321F5U,0xF59C66FBU,0x26DCF319U,
+		0x7533D928U,0xB155FDF5U,0x03563482U,0x8ABA3CBBU,0x28517711U,0xC20AD9F8U,0xABCC5167U,0xCCAD925FU,
+		0x4DE81751U,0x3830DC8EU,0x379D5862U,0x9320F991U,0xEA7A90C2U,0xFB3E7BCEU,0x5121CE64U,0x774FBE32U,
+		0xA8B6E37EU,0xC3293D46U,0x48DE5369U,0x6413E680U,0xA2AE0810U,0xDD6DB224U,0x69852DFDU,0x09072166U,
+		0xB39A460AU,0x6445C0DDU,0x586CDECFU,0x1C20C8AEU,0x5BBEF7DDU,0x1B588D40U,0xCCD2017FU,0x6BB4E3BBU,
+		0xDDA26A7EU,0x3A59FF45U,0x3E350A44U,0xBCB4CDD5U,0x72EACEA8U,0xFA6484BBU,0x8D6612AEU,0xBF3C6F47U,
+		0xD29BE463U,0x542F5D9EU,0xAEC2771BU,0xF64E6370U,0x740E0D8DU,0xE75B1357U,0xF8721671U,0xAF537D5DU,
+		0x4040CB08U,0x4EB4E2CCU,0x34D2466AU,0x0115AF84U,0xE1B00428U,0x95983A1DU,0x06B89FB4U,0xCE6EA048U,
+		0x6F3F3B82U,0x3520AB82U,0x011A1D4BU,0x277227F8U,0x611560B1U,0xE7933FDCU,0xBB3A792BU,0x344525BDU,
+		0xA08839E1U,0x51CE794BU,0x2F32C9B7U,0xA01FBAC9U,0xE01CC87EU,0xBCC7D1F6U,0xCF0111C3U,0xA1E8AAC7U,
+		0x1A908749U,0xD44FBD9AU,0xD0DADECBU,0xD50ADA38U,0x0339C32AU,0xC6913667U,0x8DF9317CU,0xE0B12B4FU,
+		0xF79E59B7U,0x43F5BB3AU,0xF2D519FFU,0x27D9459CU,0xBF97222CU,0x15E6FC2AU,0x0F91FC71U,0x9B941525U,
+		0xFAE59361U,0xCEB69CEBU,0xC2A86459U,0x12BAA8D1U,0xB6C1075EU,0xE3056A0CU,0x10D25065U,0xCB03A442U,
+		0xE0EC6E0EU,0x1698DB3BU,0x4C98A0BEU,0x3278E964U,0x9F1F9532U,0xE0D392DFU,0xD3A0342BU,0x8971F21EU,
+		0x1B0A7441U,0x4BA3348CU,0xC5BE7120U,0xC37632D8U,0xDF359F8DU,0x9B992F2EU,0xE60B6F47U,0x0FE3F11DU,
+		0xE54CDA54U,0x1EDAD891U,0xCE6279CFU,0xCD3E7E6FU,0x1618B166U,0xFD2C1D05U,0x848FD2C5U,0xF6FB2299U,
+		0xF523F357U,0xA6327623U,0x93A83531U,0x56CCCD02U,0xACF08162U,0x5A75EBB5U,0x6E163697U,0x88D273CCU,
+		0xDE966292U,0x81B949D0U,0x4C50901BU,0x71C65614U,0xE6C6C7BDU,0x327A140AU,0x45E1D006U,0xC3F27B9AU,
+		0xC9AA53FDU,0x62A80F00U,0xBB25BFE2U,0x35BDD2F6U,0x71126905U,0xB2040222U,0xB6CBCF7CU,0xCD769C2BU,
+		0x53113EC0U,0x1640E3D3U,0x38ABBD60U,0x2547ADF0U,0xBA38209CU,0xF746CE76U,0x77AFA1C5U,0x20756060U,
+		0x85CBFE4EU,0x8AE88DD8U,0x7AAAF9B0U,0x4CF9AA7EU,0x1948C25CU,0x02FB8A8CU,0x01C36AE4U,0xD6EBE1F9U,
+		0x90D4F869U,0xA65CDEA0U,0x3F09252DU,0xC208E69FU,0xB74E6132U,0xCE77E25BU,0x578FDFE3U,0x3AC372E6U
+	}
+};
+
diff --git a/Core/Tools/Launcher/BFISH.h b/Core/Tools/Launcher/BFISH.h
new file mode 100644
index 00000000000..5290954ee74
--- /dev/null
+++ b/Core/Tools/Launcher/BFISH.h
@@ -0,0 +1,101 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Blowfish Component                                           *
+ *                                                                                             *
+ *                     $Archive:: /Sun/Blowfish/bfish.h                                       $*
+ *                                                                                             *
+ *                      $Author:: Joe_b                                                       $*
+ *                                                                                             *
+ *                     $Modtime:: 12/02/97 9:35p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 6                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include	<limits.h>
+
+
+/*
+**	This engine will process data blocks by encryption and decryption.
+**	The "Blowfish" algorithm is in the public domain. It uses
+**	a Feistal network (similar to IDEA). It has no known
+**	weaknesses, but is still relatively new. Blowfish is particularly strong
+**	against brute force attacks. It is also quite strong against linear and
+**	differential cryptanalysis. Unlike public key encription, it is very
+**	fast at encryption, as far as cryptography goes. Its weakness is that
+**	it takes a relatively long time to set up with a new key (1/100th of
+**	a second on a P6-200). The time to set up a key is equivalent to
+**	encrypting 4240 bytes.
+*/
+class BlowfishEngine {
+	public:
+		BlowfishEngine(void) : IsKeyed(false) {}
+		~BlowfishEngine(void);
+
+		void Submit_Key(void const * key, int length);
+
+		int Encrypt(void const * plaintext, int length, void * cyphertext);
+		int Decrypt(void const * cyphertext, int length, void * plaintext);
+
+		/*
+		**	This is the maximum key length supported.
+		*/
+		enum {MAX_KEY_LENGTH=56,
+				BYTES_PER_BLOCK=8		// The number of bytes in each cypher block (don't change).
+		};
+
+	private:
+		bool IsKeyed;
+
+		void Sub_Key_Encrypt(unsigned long & left, unsigned long & right);
+
+		void Process_Block(void const * plaintext, void * cyphertext, unsigned long const * ptable);
+		void Initialize_Tables(void);
+
+		enum {
+			ROUNDS = 16		// Feistal round count (16 is standard).
+		};
+
+		/*
+		**	Initialization data for sub keys. The initial values are constant and
+		**	filled with a number generated from pi. Thus they are not random but
+		**	they don't hold a weak pattern either.
+		*/
+		static unsigned long const P_Init[ROUNDS+2];
+		static unsigned long const S_Init[4][UCHAR_MAX+1];
+
+		/*
+		**	Permutation tables for encryption and decryption.
+		*/
+ 		unsigned long P_Encrypt[ROUNDS+2];
+ 		unsigned long P_Decrypt[ROUNDS+2];
+
+		/*
+		**	S-Box tables (four).
+		*/
+		unsigned long bf_S[4][UCHAR_MAX+1];
+};
diff --git a/Core/Tools/Launcher/CMakeLists.txt b/Core/Tools/Launcher/CMakeLists.txt
index 62670cbc226..09b938a60ea 100644
--- a/Core/Tools/Launcher/CMakeLists.txt
+++ b/Core/Tools/Launcher/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_subdirectory(DatGen)
 
 set(LAUNCHER_SRC
-    "BFISH.CPP"
-    "BFISH.H"
+    "BFISH.cpp"
+    "BFISH.h"
     "configfile.cpp"
     "configfile.h"
     "dialog.cpp"
diff --git a/Core/Tools/Launcher/DatGen/CMakeLists.txt b/Core/Tools/Launcher/DatGen/CMakeLists.txt
index 5ebfe95aaa9..4d38fbcfaf5 100644
--- a/Core/Tools/Launcher/DatGen/CMakeLists.txt
+++ b/Core/Tools/Launcher/DatGen/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(DATGEN_SRC
     "DatGen.cpp"
-    "../BFISH.CPP"
-    "../BFISH.H"
+    "../BFISH.cpp"
+    "../BFISH.h"
     "../Toolkit/Debug/DebugPrint.cpp"
     "../Toolkit/Debug/DebugPrint.h"
 )
diff --git a/Core/Tools/Launcher/DatGen/DatGen.cpp b/Core/Tools/Launcher/DatGen/DatGen.cpp
index e70bef7770d..f584e9468cc 100644
--- a/Core/Tools/Launcher/DatGen/DatGen.cpp
+++ b/Core/Tools/Launcher/DatGen/DatGen.cpp
@@ -23,7 +23,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "BFISH.H"
+#include "BFISH.h"
 #include <Debug/DebugPrint.h>
 
 void __cdecl doIt(void);
diff --git a/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.cpp b/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.cpp
index bb1289c10a9..ac0c17cd674 100644
--- a/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.cpp
+++ b/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.cpp
@@ -99,7 +99,7 @@ void __cdecl DebugPrint(const char* string, ...)
 			file = CreateFile(_filename, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS,
 				FILE_ATTRIBUTE_NORMAL, NULL);
 			}
-		
+
 		// Send string to debugger
 		OutputDebugString(_buffer);
 
@@ -135,7 +135,7 @@ void __cdecl DebugPrint(const char* string, ...)
 
 			DWORD written;
 			WriteFile(file, &_buffer[0], strlen(_buffer), &written, NULL);
-			
+
 			CloseHandle(file);
 			}
 		}
diff --git a/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h b/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h
index dd1f4723bfa..976219ce744 100644
--- a/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h
+++ b/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h
@@ -34,8 +34,7 @@
 *
 ******************************************************************************/
 
-#ifndef _DEBUGPRINT_H_
-#define _DEBUGPRINT_H_
+#pragma once
 
 #ifdef RTS_DEBUG
 
@@ -61,5 +60,3 @@ extern char debugLogName[];
 #define PrintWin32Error
 
 #endif // RTS_DEBUG
-
-#endif // _DEBUGPRINT_H_
diff --git a/Core/Tools/Launcher/Toolkit/Storage/File.cpp b/Core/Tools/Launcher/Toolkit/Storage/File.cpp
index 0b187952cfb..cc497bcc355 100644
--- a/Core/Tools/Launcher/Toolkit/Storage/File.cpp
+++ b/Core/Tools/Launcher/Toolkit/Storage/File.cpp
@@ -567,7 +567,7 @@ File::EFileError File::Load(void*& outBuffer, UInt32& outSize)
 	if (IsOpen() == false)
 		{
 		result = Open(GetRights());
-		
+
 		if (result != FileError_None)
 			{
 			return result;
@@ -615,7 +615,7 @@ File::EFileError File::Load(void*& outBuffer, UInt32& outSize)
 					}
 
 				size -= bytesRead;
-				
+
 				if (bytesRead == 0)
 					{
 					break;
@@ -729,7 +729,7 @@ File::EFileError File::Save(const void* buffer, UInt32 size)
 bool File::OnFileError(EFileError error, bool)
 	{
 	#ifdef RTS_DEBUG
-	const char* _errorNames[] = 
+	const char* _errorNames[] =
 		{
 		"FileError_None",
 		"FileError_FNF",
@@ -748,7 +748,7 @@ bool File::OnFileError(EFileError error, bool)
 	return false;
 	}
 
-	
+
 /******************************************************************************
 *
 * NAME
@@ -860,7 +860,7 @@ UInt32 File::GetMarker(void)
 *
 * INPUTS
 *     Offset - Offset to adjust marker by
-*     From   - 
+*     From   -
 *
 * RESULT
 *     NONE
@@ -1084,7 +1084,7 @@ UInt32 File::PeekBytes(void* ptr, UInt32 bytes)
 
 	// Get bytes
 	UInt32 bytesPeeked = GetBytes(ptr, bytes);
-	
+
 	// Restore previous position
 	SetMarker(pos, Stream::FromStart);
 
diff --git a/Core/Tools/Launcher/Toolkit/Storage/File.h b/Core/Tools/Launcher/Toolkit/Storage/File.h
index fb6dd55a73b..245c93f5a09 100644
--- a/Core/Tools/Launcher/Toolkit/Storage/File.h
+++ b/Core/Tools/Launcher/Toolkit/Storage/File.h
@@ -34,8 +34,7 @@
 *
 ****************************************************************************/
 
-#ifndef FILE_H
-#define FILE_H
+#pragma once
 
 #include <Support/UTypes.h>
 #include "Stream.h"
@@ -91,7 +90,7 @@ class File : public Stream
 		//! Open the file for access.
 		virtual EFileError Open(ERights rights);
 
-		//! Open the file with the associated name for access 
+		//! Open the file with the associated name for access
 		virtual EFileError Open(const UString& name, ERights rights);
 
 		//! Close the file
@@ -127,10 +126,10 @@ class File : public Stream
 
 		//! Set file position marker
 		virtual void SetMarker(Int32 offset, EStreamFrom from);
-		
+
 		//! End of file test
 		virtual bool AtEnd(void);
-		
+
 		//! Read bytes from the file
 		virtual UInt32 GetBytes(void* ptr, UInt32 bytes);
 
@@ -149,5 +148,3 @@ class File : public Stream
 		HANDLE mHandle;
 		static const HANDLE INVALID_HANDLE;
 	};
-
-#endif // FILE_H
diff --git a/Core/Tools/Launcher/Toolkit/Storage/Rights.h b/Core/Tools/Launcher/Toolkit/Storage/Rights.h
index 6be60c6aa00..5414573fd88 100644
--- a/Core/Tools/Launcher/Toolkit/Storage/Rights.h
+++ b/Core/Tools/Launcher/Toolkit/Storage/Rights.h
@@ -34,8 +34,7 @@
 *
 ****************************************************************************/
 
-#ifndef RIGHTS_H
-#define RIGHTS_H
+#pragma once
 
 // Access rights
 typedef enum
@@ -44,5 +43,3 @@ typedef enum
 	Rights_WriteOnly,
 	Rights_ReadWrite,
 	} ERights;
-
-#endif // RIGHTS_H
diff --git a/Core/Tools/Launcher/Toolkit/Storage/Stream.h b/Core/Tools/Launcher/Toolkit/Storage/Stream.h
index 6069ec6c0c4..1803bd64d8e 100644
--- a/Core/Tools/Launcher/Toolkit/Storage/Stream.h
+++ b/Core/Tools/Launcher/Toolkit/Storage/Stream.h
@@ -34,8 +34,7 @@
 *
 ****************************************************************************/
 
-#ifndef STREAM_H
-#define STREAM_H
+#pragma once
 
 #include <Support/UTypes.h>
 
@@ -64,18 +63,16 @@ class Stream
 
 		//! End of stream test
 		virtual bool AtEnd(void) = 0;
-		
+
 		//! Retrieve a sequence of bytes.
 		virtual UInt32 GetBytes(void* ptr, UInt32 bytes) = 0;
 
 		//! Write a sequence of bytes
 		virtual UInt32 PutBytes(const void* ptr, UInt32 bytes) = 0;
-		
+
 		//! Retrieve a sequence of bytes without advancing marker.
 		virtual UInt32 PeekBytes(void* ptr, UInt32 bytes) = 0;
 
 		//! Flush the stream
 		virtual void Flush(void) = 0;
 	};
-
-#endif // STREAM_H
diff --git a/Core/Tools/Launcher/Toolkit/Support/RefCounted.h b/Core/Tools/Launcher/Toolkit/Support/RefCounted.h
index b04986fa9ba..314c71003d3 100644
--- a/Core/Tools/Launcher/Toolkit/Support/RefCounted.h
+++ b/Core/Tools/Launcher/Toolkit/Support/RefCounted.h
@@ -37,8 +37,7 @@
 *
 ******************************************************************************/
 
-#ifndef REFCOUNTED_H
-#define REFCOUNTED_H
+#pragma once
 
 #include <assert.h>
 
@@ -82,5 +81,3 @@ class RefCounted
 
 		unsigned int mRefCount;
 	};
-
-#endif // REFCOUNTED_H
diff --git a/Core/Tools/Launcher/Toolkit/Support/RefPtr.h b/Core/Tools/Launcher/Toolkit/Support/RefPtr.h
index 2922526596d..0e4e5c255d5 100644
--- a/Core/Tools/Launcher/Toolkit/Support/RefPtr.h
+++ b/Core/Tools/Launcher/Toolkit/Support/RefPtr.h
@@ -35,7 +35,7 @@
 *     Const_Cast<X> replaces const_cast<X*> and const_cast<X&>
 *
 *     IsValid() replaces (x != NULL)
-*  
+*
 *     Member function Attach() or assigning RefPtr<X>() will NULL a pointer.
 *
 *     Generally, RefPtr<> and RefPtrConst<> behave like their raw pointer
@@ -65,8 +65,7 @@
 *
 ******************************************************************************/
 
-#ifndef REFPTR_H
-#define REFPTR_H
+#pragma once
 
 #include "Visualc.h"
 #include "RefCounted.h"
@@ -106,7 +105,7 @@ class RefPtrBase
 			: mRefObject(object)
 			{
 			assert((mRefObject == NULL) || (mRefObject->mRefCount == 0));
-		
+
 			if (IsValid())
 				{
 				mRefObject->AddReference();
@@ -117,7 +116,7 @@ class RefPtrBase
 			: mRefObject(object.mRefObject)
 			{
 			assert(false); // why is this being called?
-	
+
 			if (IsValid())
 				{
 				mRefObject->AddReference();
@@ -128,7 +127,7 @@ class RefPtrBase
 			{Detach();}
 
 		const RefPtrBase& operator=(const RefPtrBase&);
-	
+
 		inline RefCounted* const GetRefObject(void)
 			{return mRefObject;}
 
@@ -357,5 +356,3 @@ RefPtr<Type> Const_Cast(RefPtrConst<Type>& rhs)
 	object.Attach(rhs.ReferencedObject());
 	return object;
 	}
-
-#endif // RC_PTR_H
diff --git a/Core/Tools/Launcher/Toolkit/Support/StringConvert.cpp b/Core/Tools/Launcher/Toolkit/Support/StringConvert.cpp
index 009f44f023f..fecee38b55f 100644
--- a/Core/Tools/Launcher/Toolkit/Support/StringConvert.cpp
+++ b/Core/Tools/Launcher/Toolkit/Support/StringConvert.cpp
@@ -90,7 +90,7 @@ Char* UnicodeToANSI(const WChar* string, Char* buffer, UInt bufferLength)
 		}
 
 	#ifdef RTS_DEBUG
-	int result = 
+	int result =
 	#endif
 		WideCharToMultiByte(CP_ACP, 0, string, -1, buffer, bufferLength,
 			NULL, NULL);
diff --git a/Core/Tools/Launcher/Toolkit/Support/StringConvert.h b/Core/Tools/Launcher/Toolkit/Support/StringConvert.h
index 5eb3ab587cb..c7a1515f33d 100644
--- a/Core/Tools/Launcher/Toolkit/Support/StringConvert.h
+++ b/Core/Tools/Launcher/Toolkit/Support/StringConvert.h
@@ -34,8 +34,7 @@
 *
 ******************************************************************************/
 
-#ifndef STRINGCONVERT_H
-#define STRINGCONVERT_H
+#pragma once
 
 #include "UTypes.h"
 
@@ -43,5 +42,3 @@ class UString;
 
 Char* UStringToANSI(const UString& string, Char* buffer, UInt bufferLength);
 Char* UnicodeToANSI(const WChar* string, Char* buffer, UInt bufferLength);
-
-#endif // STRINGCONVERT_H
diff --git a/Core/Tools/Launcher/Toolkit/Support/UString.cpp b/Core/Tools/Launcher/Toolkit/Support/UString.cpp
index 0b8d5e97d9c..12ccb8237f3 100644
--- a/Core/Tools/Launcher/Toolkit/Support/UString.cpp
+++ b/Core/Tools/Launcher/Toolkit/Support/UString.cpp
@@ -266,10 +266,7 @@ UString::UString(const UString& s)
 
 UString::~UString()
 	{
-	if (mData != NULL)
-		{
-		delete mData;
-		}
+	delete mData;
 	}
 
 
@@ -662,7 +659,7 @@ Int UString::CompareNoCase(const Char* s) const
 		// Convert to lowercase for compare
 		WChar sc = (WChar)CharToLower<Char>(s[index]);
 		WChar wc = CharToLower<WChar>(ws[index]);
-		
+
 		// Difference between characters.
 		Int diff = (sc - wc);
 
@@ -853,7 +850,7 @@ Int UString::FindLast(WChar c) const
 *     SubString - Substring to search for.
 *
 * RESULT
-*     
+*
 *
 ******************************************************************************/
 
@@ -1323,11 +1320,7 @@ bool UString::AllocString(UInt size)
 
 	data[0] = 0;
 
-	if (mData != NULL)
-		{
-		delete mData;
-		}
-
+	delete mData;
 	mData = data;
 	mCapacity = size;
 
diff --git a/Core/Tools/Launcher/Toolkit/Support/UString.h b/Core/Tools/Launcher/Toolkit/Support/UString.h
index c3d83cee2a7..a9b23e20f87 100644
--- a/Core/Tools/Launcher/Toolkit/Support/UString.h
+++ b/Core/Tools/Launcher/Toolkit/Support/UString.h
@@ -34,8 +34,7 @@
 *
 ******************************************************************************/
 
-#ifndef USTRING_H
-#define USTRING_H
+#pragma once
 
 #include "UTypes.h"
 #include "RefCounted.h"
@@ -99,10 +98,10 @@ class UString
 
 		//! Convert string to uppercase
 		void ToUpper(void);
-		
+
 		//! Convert string to lowercase
 		void ToLower(void);
-		
+
 		//! Reverse characters of string
 		void Reverse(void);
 
@@ -145,7 +144,7 @@ class UString
 
 		UString operator=(const WChar* ws)
 			{Copy(ws); return *this;};
-		
+
 		UString operator=(const UString& s)
 			{Copy(s); return *this;};
 
@@ -183,7 +182,7 @@ class UString
 
 		bool operator!=(const WChar* ws)
 			{return (Compare(ws) != 0);}
-		
+
 		bool operator!=(const UString& s)
 			{return (Compare(s) != 0);}
 
@@ -235,5 +234,3 @@ class UString
 		WChar* mData;
 		UInt mCapacity;
 	};
-
-#endif // USTRING_H
diff --git a/Core/Tools/Launcher/Toolkit/Support/UTypes.h b/Core/Tools/Launcher/Toolkit/Support/UTypes.h
index d5219a50963..77e5eaa8bab 100644
--- a/Core/Tools/Launcher/Toolkit/Support/UTypes.h
+++ b/Core/Tools/Launcher/Toolkit/Support/UTypes.h
@@ -34,8 +34,7 @@
 *
 ******************************************************************************/
 
-#ifndef UTYPES_H
-#define UTYPES_H
+#pragma once
 
 //! Signed integer value
 typedef int Int;
@@ -90,5 +89,3 @@ typedef enum {OFF = false, ON = true, PENDING = -1} TriState;
 #ifndef NULL
 #define NULL (0L)
 #endif
-
-#endif // UTYPES_H
diff --git a/Core/Tools/Launcher/Toolkit/Support/Visualc.h b/Core/Tools/Launcher/Toolkit/Support/Visualc.h
index f18fe1613e6..e8bd635539b 100644
--- a/Core/Tools/Launcher/Toolkit/Support/Visualc.h
+++ b/Core/Tools/Launcher/Toolkit/Support/Visualc.h
@@ -33,10 +33,8 @@
 *     $Revision:  $
 *
 ******************************************************************************/
-#pragma once
 
-#ifndef _VISUALC_H_
-#define _VISUALC_H_
+#pragma once
 
 #if defined(_MSC_VER)
 
@@ -87,4 +85,3 @@
 #pragma warning(disable:4786)
 
 #endif // _MSC_VER
-#endif // _VISUALC_H_
diff --git a/Core/Tools/Launcher/configfile.cpp b/Core/Tools/Launcher/configfile.cpp
index 6e54b7d492c..7f2dc928e6c 100644
--- a/Core/Tools/Launcher/configfile.cpp
+++ b/Core/Tools/Launcher/configfile.cpp
@@ -23,7 +23,7 @@ Project Name: Carpenter  (The RedAlert ladder creator)
 File Name   : configfile.cpp
 Author      : Neal Kettler
 Start Date  : June 9, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 
 
 This class will read in a config file and store the key value pairs for
@@ -73,13 +73,13 @@ bit8 ConfigFile::readFile(FILE *in)
     key=cptr;
     key.truncate('=');
     key.removeSpaces();  // No spaces allowed in the key
-    key.toUpper();       // make key all caps 
+    key.toUpper();       // make key all caps
     cptr=Eat_Spaces(strchr(cptr,'=')+1); // Jump to after the '='
     value=cptr;
     value.truncate('\r');
     value.truncate('\n');
     dictionary.add(key,value);
-  } 
+  }
   return(TRUE);
 }
 
@@ -87,7 +87,7 @@ bit8 ConfigFile::readFile(FILE *in)
 bit8 ConfigFile::getString(Wstring &key,Wstring &value)
 {
   return(dictionary.getValue(key,value));
-} 
+}
 
 // Get a config entry as a string
 bit8 ConfigFile::getString(const char *key,Wstring &value)
@@ -95,7 +95,7 @@ bit8 ConfigFile::getString(const char *key,Wstring &value)
   Wstring sKey;
   sKey.set(key);
   return(getString(sKey,value));
-}   
+}
 
 // Get a config entry as an integer
 bit8 ConfigFile::getInt(Wstring &key,sint32 &value)
@@ -114,7 +114,7 @@ bit8 ConfigFile::getInt(const char *key,sint32 &value)
   Wstring sKey;
   sKey.set(key);
   return(getInt(sKey,value));
-}    
+}
 
 
 
@@ -128,7 +128,7 @@ bit8 ConfigFile::getInt(Wstring &key,sint16 &value)
   value=atoi(svalue.get());
   return(TRUE);
 }
- 
+
 // Get a config entry as an integer
 bit8 ConfigFile::getInt(const char *key,sint16 &value)
 {
@@ -154,7 +154,7 @@ static uint32 Wstring_Hash(Wstring &string)
     retval=(retval<<8)^(retval>>24);  // ROL 8
   }
   return(retval);
-}         
+}
 
 static char *Eat_Spaces(char *string)
 {
diff --git a/Core/Tools/Launcher/configfile.h b/Core/Tools/Launcher/configfile.h
index d7dfa5ea92b..19354c60096 100644
--- a/Core/Tools/Launcher/configfile.h
+++ b/Core/Tools/Launcher/configfile.h
@@ -20,14 +20,13 @@
 *        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S         *
 ******************************************************************************
 Project Name: Carpenter  (The RedAlert ladder creator)
-File Name   : configfile.h 
+File Name   : configfile.h
 Author      : Neal Kettler
 Start Date  : June 9, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 \***************************************************************************/
 
-#ifndef CONFIGFILE_HEADER
-#define CONFIGFILE_HEADER
+#pragma once
 
 #include "dictionary.h"
 #include "wstring.h"
@@ -51,5 +50,3 @@ class ConfigFile
   Dictionary<Wstring,Wstring> dictionary; // stores the mappings from keys
                                         //  to value strings
 };
-
-#endif
diff --git a/Core/Tools/Launcher/dialog.cpp b/Core/Tools/Launcher/dialog.cpp
index 6863cb147ca..7bd986abc3c 100644
--- a/Core/Tools/Launcher/dialog.cpp
+++ b/Core/Tools/Launcher/dialog.cpp
@@ -77,4 +77,4 @@ BOOL CALLBACK Patch_Window_Proc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lPar
     break;
   }
   return(FALSE);
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/Launcher/dialog.h b/Core/Tools/Launcher/dialog.h
index c293e315bf7..101db772c81 100644
--- a/Core/Tools/Launcher/dialog.h
+++ b/Core/Tools/Launcher/dialog.h
@@ -16,13 +16,10 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef DIALOG_HEADER
-#define DIALOG_HEADER
+#pragma once
 
 #include"winblows.h"
 #include<commctrl.h>
 HWND Create_Patch_Dialog(void);
 
 extern HWND PatchDialog;
-
-#endif
diff --git a/Core/Tools/Launcher/dictionary.h b/Core/Tools/Launcher/dictionary.h
index 018840a16b5..640190a5b52 100644
--- a/Core/Tools/Launcher/dictionary.h
+++ b/Core/Tools/Launcher/dictionary.h
@@ -35,8 +35,7 @@ is working well, this is much faster than a linked list, but only if
 your hashing function is good.
 \****************************************************************************/
 
-#ifndef DICTIONARY_HEADER
-#define DICTIONARY_HEADER    
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -55,7 +54,7 @@ class DNode
   K               key;
   V               value;
   DNode<K,V>     *hashNext;
-};        
+};
 
 template <class K,class V>
 class Dictionary
@@ -73,7 +72,7 @@ class Dictionary
   bit8             contains(IN K &key);
   bit8             updateValue(IN K &key,IN V &value);
   bit8             remove(IN K &key,OUT V &value);
-  bit8             remove(IN K &key); 
+  bit8             remove(IN K &key);
   bit8             removeAny(OUT K &key,OUT V &value);
   bit8             iterate(INOUT int &index,INOUT int &offset, OUT V &value) const;
 
@@ -97,7 +96,7 @@ class Dictionary
   // See initilizer list of constructor for values
   const double     SHRINK_THRESHOLD; // When table is this % full shrink it
   const double     EXPAND_THRESHOLD; // When table is this % full grow it
-  const int        MIN_TABLE_SIZE;   // must be a power of 2               
+  const int        MIN_TABLE_SIZE;   // must be a power of 2
 };
 
 
@@ -122,7 +121,7 @@ Dictionary<K,V>::Dictionary(uint32 (* hashFn)(K &key)) :
   table=(DNode<K,V> **)new DNode<K,V>* [size];
   assert(table!=NULL);
 
-  memset((void *)table,0,size*sizeof(void *));        
+  memset((void *)table,0,size*sizeof(void *));
   hashFunc=hashFn;
 }
 
@@ -156,7 +155,7 @@ void Dictionary<K,V>::clear()
 
   while ((getSize()>(uint32)MIN_TABLE_SIZE)&&(keepSize==FALSE))
     shrink();
-}            
+}
 
 template <class K,class V>
 uint32 Dictionary<K,V>::keyHash(IN K &key)
@@ -165,7 +164,7 @@ uint32 Dictionary<K,V>::keyHash(IN K &key)
   retval &= ((1<<tableBits)-1);
   assert(retval<getSize());
   return(retval);
-}   
+}
 
 
 template <class K,class V>
@@ -190,7 +189,7 @@ void Dictionary<K,V>::print(IN FILE *out) const
     fprintf(out,"\n");
   }
   fprintf(out,"--------------------\n");
-}            
+}
 
 
 //
@@ -237,14 +236,14 @@ bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
     offset++;
 
   return(TRUE);
-}            
+}
 
 
 
 // Return the current size of the hash table
 template <class K,class V>
 uint32 Dictionary<K,V>::getSize(void) const
-{ return(size); }    
+{ return(size); }
 
 
 // Return the current number of entries in the table
@@ -270,10 +269,10 @@ bit8 Dictionary<K,V>::contains(IN K &key)
   while(node!=NULL)
   {
     if ((node->key)==key)
-    { return(TRUE); }          
+    { return(TRUE); }
     node=node->hashNext;
   }
-  return(FALSE); 
+  return(FALSE);
 }
 
 
@@ -289,7 +288,7 @@ bit8 Dictionary<K,V>::updateValue(IN K &key,IN V &value)
 
   add(key,value);
   return(TRUE);
-}           
+}
 
 
 // Add to the dictionary (if key exists, value is updated with the new V)
@@ -321,7 +320,7 @@ bit8 Dictionary<K,V>::add(IN K &key,IN V &value)
   remove(key);
 
   offset=keyHash(key);
-    
+
   node=table[offset];
 
   if (node==NULL)
@@ -331,7 +330,7 @@ bit8 Dictionary<K,V>::add(IN K &key,IN V &value)
     temp=table[offset];
     table[offset]=item;
     item->hashNext=temp;
-  } 
+  }
 
   entries++;
   percent=(float)entries;
@@ -397,7 +396,7 @@ bit8 Dictionary<K,V>::remove(IN K &key,OUT V &value)
         memcpy(&value,&(node->value),sizeof(V));
       #else
         value=node->value;
-      #endif 
+      #endif
       last->hashNext=node->hashNext;
       entries--;
       delete(node);
@@ -442,7 +441,7 @@ bit8 Dictionary<K,V>::removeAny(OUT K &key,OUT V &value)
     {
       offset=i;
       break;
-    } 
+    }
 
   if (offset==-1)    // Nothing there
     return(FALSE);
@@ -456,7 +455,7 @@ bit8 Dictionary<K,V>::removeAny(OUT K &key,OUT V &value)
     key=node->key;
   #endif
   #ifdef VALUE_MEM_OPS
-    memcpy(&value,&(node->value),sizeof(V));     
+    memcpy(&value,&(node->value),sizeof(V));
   #else
     value=node->value;
   #endif
@@ -505,7 +504,7 @@ bit8 Dictionary<K,V>::getValue(IN K &key,OUT V &value)
 //only here to improve performance of the hash table by reducing
 //the length of the linked list at each table entry.
 
-// Shrink the hash table by a factor of 2 (and relocate entries)   
+// Shrink the hash table by a factor of 2 (and relocate entries)
 template <class K,class V>
 void Dictionary<K,V>::shrink(void)
 {
@@ -526,7 +525,7 @@ void Dictionary<K,V>::shrink(void)
 
   table=(DNode<K,V> **)new DNode<K,V>*[size];
   assert(table!=NULL);
-  memset((void *)table,0,size*sizeof(void *)); 
+  memset((void *)table,0,size*sizeof(void *));
 
   for (i=0; i<oldsize; i++)
   {
@@ -565,7 +564,7 @@ void Dictionary<K,V>::expand(void)
 
   table=(DNode<K,V> **)new DNode<K,V>* [size];
   assert(table!=NULL);
-  memset((void *)table,0,size*sizeof(void *));       
+  memset((void *)table,0,size*sizeof(void *));
 
   for (i=0; i<oldsize; i++)
   {
@@ -582,5 +581,3 @@ void Dictionary<K,V>::expand(void)
   }
   delete[](oldtable);
 }
-
-#endif
diff --git a/Core/Tools/Launcher/filed.h b/Core/Tools/Launcher/filed.h
index e28864f6cf0..f490b05d1c3 100644
--- a/Core/Tools/Launcher/filed.h
+++ b/Core/Tools/Launcher/filed.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef FILED_HEADER
-#define FILED_HEADER
+#pragma once
 
 #include "odevice.h"
 
@@ -25,7 +24,7 @@ class FileD : public OutputDevice
 {
  public:
    FileD(char *filename, bool outputDebug) : m_outputDebug(outputDebug)
-   { 
+   {
      out=fopen(filename,"w");
      if (out==NULL)
        out=fopen("FileDev.out","w");
@@ -52,5 +51,3 @@ class FileD : public OutputDevice
    FILE      *out;
 	 bool m_outputDebug;
 };
-
-#endif
diff --git a/Core/Tools/Launcher/findpatch.cpp b/Core/Tools/Launcher/findpatch.cpp
index 106c1b952f5..01715600afd 100644
--- a/Core/Tools/Launcher/findpatch.cpp
+++ b/Core/Tools/Launcher/findpatch.cpp
@@ -54,7 +54,7 @@ int Find_Patch(OUT char *filename,int maxlen, ConfigFile &config)
     ok=Get_App_Dir(gamePath,MAX_PATH,config,skuIndex);
     if (ok==FALSE)
       break;
-    
+
     i=0;
     while(extensions[i++])
     {
@@ -108,7 +108,7 @@ bit8 Get_App_Dir(OUT char *filename,int maxlen, ConfigFile &config,int index)
   if (config.getString(string,key)==FALSE)
     return(FALSE);
 
- 
+
   DBGMSG("KEY = "<<key.get());
   // Get the InstallPath from the specified registry key
   temp=0;
@@ -206,8 +206,8 @@ void Delete_Patches(ConfigFile &config)
           DBGMSG("UNLINK: "<<findData.cFileName);
         }
       }
-    }  // If there's at least one file
+    }
     FindClose(hFile);
-  }  // while there's apps in config
+  }
   return;
-} 
+}
diff --git a/Core/Tools/Launcher/findpatch.h b/Core/Tools/Launcher/findpatch.h
index 50c44316015..f21669014b7 100644
--- a/Core/Tools/Launcher/findpatch.h
+++ b/Core/Tools/Launcher/findpatch.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef FINDPATCH_HEADER
-#define FINDPATCH_HEADER
+#pragma once
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -29,5 +28,3 @@
 int Find_Patch(OUT char *file,int maxlen, ConfigFile &config);
 bit8 Get_App_Dir(OUT char *file,int maxlen, ConfigFile &config, int index);
 void Delete_Patches(ConfigFile &config);
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/Launcher/loadbmp.cpp b/Core/Tools/Launcher/loadbmp.cpp
index 445bebaf5a9..9432d35d902 100644
--- a/Core/Tools/Launcher/loadbmp.cpp
+++ b/Core/Tools/Launcher/loadbmp.cpp
@@ -55,54 +55,54 @@ bit8 LoadBmp::init(const char *filename,HWND hwnd)
   // Set the member for future reference
   WindowHandle_=hwnd;
 
-  // Retrieve a handle identifying the file. 
+  // Retrieve a handle identifying the file.
   hBitmapFile = CreateFile(
     filename,
-    GENERIC_READ, 
+    GENERIC_READ,
     FILE_SHARE_READ,
-    (LPSECURITY_ATTRIBUTES) NULL, 
+    (LPSECURITY_ATTRIBUTES) NULL,
     OPEN_EXISTING,
-    FILE_ATTRIBUTE_READONLY, 
-    (HANDLE) NULL); 
+    FILE_ATTRIBUTE_READONLY,
+    (HANDLE) NULL);
 
   if (hBitmapFile==NULL)
     return(FALSE);
 
-  // Retrieve the BITMAPFILEHEADER structure. 
-  ReadFile(hBitmapFile, &bitmapHeader, sizeof(BITMAPFILEHEADER), &dwRead, 
-    (LPOVERLAPPED)NULL); 
- 
-
-  // Retrieve the BITMAPFILEHEADER structure. 
-  ReadFile(hBitmapFile, &bitmapInfoHeader, sizeof(BITMAPINFOHEADER), 
-    &dwRead, (LPOVERLAPPED)NULL); 
-
- 
-  // Allocate memory for the BITMAPINFO structure. 
-  HGLOBAL infoHeaderMem = GlobalAlloc(GHND, sizeof(BITMAPINFOHEADER) + 
-    ((1<<bitmapInfoHeader.biBitCount) * sizeof(RGBQUAD))); 
- 
-  LPBITMAPINFO lpHeaderMem = (LPBITMAPINFO)GlobalLock(infoHeaderMem); 
- 
-  // Load BITMAPINFOHEADER into the BITMAPINFO structure. 
-  lpHeaderMem->bmiHeader.biSize          = bitmapInfoHeader.biSize; 
-  lpHeaderMem->bmiHeader.biWidth         = bitmapInfoHeader.biWidth; 
-  lpHeaderMem->bmiHeader.biHeight        = bitmapInfoHeader.biHeight; 
-  lpHeaderMem->bmiHeader.biPlanes        = bitmapInfoHeader.biPlanes; 
-  lpHeaderMem->bmiHeader.biBitCount      = bitmapInfoHeader.biBitCount; 
-  lpHeaderMem->bmiHeader.biCompression   = bitmapInfoHeader.biCompression; 
-  lpHeaderMem->bmiHeader.biSizeImage     = bitmapInfoHeader.biSizeImage; 
-  lpHeaderMem->bmiHeader.biXPelsPerMeter = bitmapInfoHeader.biXPelsPerMeter; 
-  lpHeaderMem->bmiHeader.biYPelsPerMeter = bitmapInfoHeader.biYPelsPerMeter; 
-  lpHeaderMem->bmiHeader.biClrUsed       = bitmapInfoHeader.biClrUsed; 
-  lpHeaderMem->bmiHeader.biClrImportant  = bitmapInfoHeader.biClrImportant; 
- 
-
-  // Retrieve the color table. 
-  // 1 << bitmapInfoHeader.biBitCount == 2 ^ bitmapInfoHeader.biBitCount 
-  ReadFile(hBitmapFile, lpHeaderMem->bmiColors, 
-    ((1<<bitmapInfoHeader.biBitCount) * sizeof(RGBQUAD)), 
-    &dwRead, (LPOVERLAPPED) NULL); 
+  // Retrieve the BITMAPFILEHEADER structure.
+  ReadFile(hBitmapFile, &bitmapHeader, sizeof(BITMAPFILEHEADER), &dwRead,
+    (LPOVERLAPPED)NULL);
+
+
+  // Retrieve the BITMAPFILEHEADER structure.
+  ReadFile(hBitmapFile, &bitmapInfoHeader, sizeof(BITMAPINFOHEADER),
+    &dwRead, (LPOVERLAPPED)NULL);
+
+
+  // Allocate memory for the BITMAPINFO structure.
+  HGLOBAL infoHeaderMem = GlobalAlloc(GHND, sizeof(BITMAPINFOHEADER) +
+    ((1<<bitmapInfoHeader.biBitCount) * sizeof(RGBQUAD)));
+
+  LPBITMAPINFO lpHeaderMem = (LPBITMAPINFO)GlobalLock(infoHeaderMem);
+
+  // Load BITMAPINFOHEADER into the BITMAPINFO structure.
+  lpHeaderMem->bmiHeader.biSize          = bitmapInfoHeader.biSize;
+  lpHeaderMem->bmiHeader.biWidth         = bitmapInfoHeader.biWidth;
+  lpHeaderMem->bmiHeader.biHeight        = bitmapInfoHeader.biHeight;
+  lpHeaderMem->bmiHeader.biPlanes        = bitmapInfoHeader.biPlanes;
+  lpHeaderMem->bmiHeader.biBitCount      = bitmapInfoHeader.biBitCount;
+  lpHeaderMem->bmiHeader.biCompression   = bitmapInfoHeader.biCompression;
+  lpHeaderMem->bmiHeader.biSizeImage     = bitmapInfoHeader.biSizeImage;
+  lpHeaderMem->bmiHeader.biXPelsPerMeter = bitmapInfoHeader.biXPelsPerMeter;
+  lpHeaderMem->bmiHeader.biYPelsPerMeter = bitmapInfoHeader.biYPelsPerMeter;
+  lpHeaderMem->bmiHeader.biClrUsed       = bitmapInfoHeader.biClrUsed;
+  lpHeaderMem->bmiHeader.biClrImportant  = bitmapInfoHeader.biClrImportant;
+
+
+  // Retrieve the color table.
+  // 1 << bitmapInfoHeader.biBitCount == 2 ^ bitmapInfoHeader.biBitCount
+  ReadFile(hBitmapFile, lpHeaderMem->bmiColors,
+    ((1<<bitmapInfoHeader.biBitCount) * sizeof(RGBQUAD)),
+    &dwRead, (LPOVERLAPPED) NULL);
 
 
   lpLogPalette=(LPLOGPALETTE)new char[(sizeof(LOGPALETTE)+
@@ -122,18 +122,18 @@ bit8 LoadBmp::init(const char *filename,HWND hwnd)
   PalHandle_=CreatePalette(lpLogPalette);
   delete(lpLogPalette);
 
- 
-  // Allocate memory for the required number of bytes. 
-  hmem2 = GlobalAlloc(GHND, (bitmapHeader.bfSize - bitmapHeader.bfOffBits)); 
- 
-  lpvBits = GlobalLock(hmem2); 
- 
-  // Retrieve the bitmap data. 
-  ReadFile(hBitmapFile, lpvBits, (bitmapHeader.bfSize - bitmapHeader.bfOffBits), 
-    &dwRead, (LPOVERLAPPED) NULL); 
- 
-
-  // Create a bitmap from the data stored in the .BMP file. 
+
+  // Allocate memory for the required number of bytes.
+  hmem2 = GlobalAlloc(GHND, (bitmapHeader.bfSize - bitmapHeader.bfOffBits));
+
+  lpvBits = GlobalLock(hmem2);
+
+  // Retrieve the bitmap data.
+  ReadFile(hBitmapFile, lpvBits, (bitmapHeader.bfSize - bitmapHeader.bfOffBits),
+    &dwRead, (LPOVERLAPPED) NULL);
+
+
+  // Create a bitmap from the data stored in the .BMP file.
   hdc=GetDC(hwnd);
   select=SelectPalette(hdc,PalHandle_,0);
   if (select==NULL)
@@ -141,25 +141,25 @@ bit8 LoadBmp::init(const char *filename,HWND hwnd)
   realize=RealizePalette(hdc);
   if (realize==GDI_ERROR)
     return(FALSE);
-  BitmapHandle_=CreateDIBitmap(hdc, &bitmapInfoHeader, CBM_INIT, lpvBits, lpHeaderMem, DIB_RGB_COLORS); 
+  BitmapHandle_=CreateDIBitmap(hdc, &bitmapInfoHeader, CBM_INIT, lpvBits, lpHeaderMem, DIB_RGB_COLORS);
   ReleaseDC(hwnd,hdc);
 
 
   if (BitmapHandle_==NULL)
     return(FALSE);
- 
-  // Unlock the global memory objects and close the .BMP file.  
-  GlobalUnlock(infoHeaderMem); 
-  GlobalUnlock(hmem2); 
-  CloseHandle(hBitmapFile); 
- 
-  if (BitmapHandle_==NULL) 
+
+  // Unlock the global memory objects and close the .BMP file.
+  GlobalUnlock(infoHeaderMem);
+  GlobalUnlock(hmem2);
+  CloseHandle(hBitmapFile);
+
+  if (BitmapHandle_==NULL)
     return(FALSE);
- 
+
   // Inform windows the window needs to be repainted
-  GetClientRect(hwnd, &rect); 
-  InvalidateRect(hwnd, &rect, TRUE); 
-  UpdateWindow(hwnd); 
+  GetClientRect(hwnd, &rect);
+  InvalidateRect(hwnd, &rect, TRUE);
+  UpdateWindow(hwnd);
 
   return(TRUE);
 }
@@ -167,8 +167,8 @@ bit8 LoadBmp::init(const char *filename,HWND hwnd)
 
 bit8 LoadBmp::drawBmp(void)
 {
-  // Paint the window (and draw the bitmap). 
- 
+  // Paint the window (and draw the bitmap).
+
   PAINTSTRUCT ps;
   HDC         hdc;
   char        string[128];
@@ -194,13 +194,13 @@ bit8 LoadBmp::drawBmp(void)
     MessageBox(NULL,string,"OK",MB_OK);
   }
 
-  HDC hdcMem = CreateCompatibleDC(ps.hdc); 
-  SelectObject(hdcMem, BitmapHandle_); 
+  HDC hdcMem = CreateCompatibleDC(ps.hdc);
+  SelectObject(hdcMem, BitmapHandle_);
   BITMAP bm;
   GetObject(BitmapHandle_, sizeof(BITMAP), (LPSTR) &bm);
-  
+
   /// for non-stretching version
-  ///////BitBlt(ps.hdc, 0, 0, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCCOPY); 
+  ///////BitBlt(ps.hdc, 0, 0, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCCOPY);
 
   RECT clientRect;
   GetClientRect(WindowHandle_,&clientRect);
@@ -209,7 +209,7 @@ bit8 LoadBmp::drawBmp(void)
     bm.bmHeight,SRCCOPY);
 
 
-  DeleteDC(hdcMem); 
+  DeleteDC(hdcMem);
   EndPaint(WindowHandle_,&ps);
   return(TRUE);
 }
diff --git a/Core/Tools/Launcher/loadbmp.h b/Core/Tools/Launcher/loadbmp.h
index fa4a55a919f..e2614fbe6c8 100644
--- a/Core/Tools/Launcher/loadbmp.h
+++ b/Core/Tools/Launcher/loadbmp.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef LOADBMP_HEADER
-#define LOADBMP_HEADER
+#pragma once
 
 #include<stdlib.h>
 #include<stdio.h>
@@ -41,6 +40,3 @@ class LoadBmp
    HPALETTE       PalHandle_;
    HWND           WindowHandle_;
 };
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/Launcher/main.cpp b/Core/Tools/Launcher/main.cpp
index ad2bf7628d3..f9c332f8b8e 100644
--- a/Core/Tools/Launcher/main.cpp
+++ b/Core/Tools/Launcher/main.cpp
@@ -80,29 +80,29 @@ void RunGame(char *thePath, ConfigFile &config, Process &proc)
 	while (true)
 	{
 		int skuIndex;
-		
+
 		while ((skuIndex = Find_Patch(patchFile, MAX_PATH, config)) != 0)
 		{
 			Apply_Patch(patchFile, config, skuIndex);
 			launchgame = true;
 		}
-		
+
 		// launch the game if first pass, or found a patch
 		if (launchgame)
 		{
 			// don't relaunch unless we find a patch (or checking for patches)
 			launchgame = false;
 			myChdir(thePath);
-			
+
 			Create_Process(proc);
 			DWORD exit_code;
 			Wait_Process(proc, &exit_code);
-			
+
 			if (exit_code == UPDATE_RETVAL)
 			{
 				// They just want to check for patches
 				launchgame = true;
-				
+
 				// Start patchgrabber
 				Process patchgrab;
 				strcpy(patchgrab.directory,proc.directory);  // same dir as game
@@ -111,7 +111,7 @@ void RunGame(char *thePath, ConfigFile &config, Process &proc)
 				Create_Process(patchgrab);
 				Wait_Process(patchgrab);  // wait for completion
 			}
-			
+
 		}
 		else
 		{
@@ -137,27 +137,27 @@ int main(int argc, char *argv[])
 
 	char cwd[MAX_PATH];  // save current directory before game start
 	_getcwd(cwd, MAX_PATH);
-	
+
 	// Goto the folder where launcher is installed
 	myChdir(argv[0]);
-	
+
 	// extract the program name from argv[0].  Change the extension to
 	//   .lcf (Launcher ConFig).  This is the name of our config file.
 	char configName[MAX_PATH + 3];
 	strcpy(configName, argv[0]);
 	char* extension = configName;
 	char* tempptr;
-	
+
 	while ((tempptr = strchr(extension + 1, '.')))
 	{
 		extension = tempptr;
 	}
-	
+
 	if (*extension == '.')
 	{
 		*extension = 0;
 	}
-	
+
 #ifdef DEBUG
 	///MonoD outputDevice;
 	char debugFile[MAX_PATH + 3];
@@ -175,50 +175,50 @@ int main(int argc, char *argv[])
 	InitCommonControls();
 
 	strcat(configName, ".lcf");
-	
+
 	DBGMSG("Config Name: "<<configName);
-	
+
 	ConfigFile config;
 	FILE* in = fopen(configName, "r");
-	
+
 	if (in == NULL)
 	{
 		MessageBox(NULL,"You must run the game from its install directory.",
 			"Launcher config file missing",MB_OK);
 		exit(-1);
 	}
-	
+
 	bit8 ok = config.readFile(in);
 	fclose(in);
-	
+
 	if (ok == FALSE)
 	{
 		MessageBox(NULL,"File 'launcher.cfg' is corrupt","Error",MB_OK);
 		exit(-1);
 	}
-	
+
 	// Load process info
 	Process proc;
 	Read_Process_Info(config,proc);
-	
+
 	// Possible 2nd EXE
 	Process proc2;
 	int hasSecondEXE = Read_Process_Info(config,proc2,"RUN2");
-	
+
 	DBGMSG("Read process info");
-	
+
 	for (int i = 1; i < argc; i++)
 	{
 		strcat(proc.args, " ");
 		strcat(proc.args, argv[i]);
-		
+
 		if (hasSecondEXE)
 		{
 			strcat(proc2.args, " ");
 			strcat(proc2.args, argv[i]);
 		}
 	}
-	
+
 	DBGMSG("ARGS: "<<proc.args);
 
 	// Just spawn the patchgrabber & apply any patches it downloads
@@ -229,26 +229,26 @@ int main(int argc, char *argv[])
 
 		// same dir as game
 		strcpy(patchgrab.directory, proc.directory);
-		
+
 		// the program that grabs game patches
 		strcpy(patchgrab.command, "patchget.dat");
 		strcpy(patchgrab.args, "");
-		
+
 		Create_Process(patchgrab);
 		Wait_Process(patchgrab);
-		
+
 		// Apply any patches I find
 		int skuIndex;
-		
+
 		while ((skuIndex = Find_Patch(patchFile, MAX_PATH, config)) != 0)
 		{
 			Apply_Patch(patchFile, config, skuIndex);
 		}
-		
+
 		myChdir(cwd);
 		return 0;
 	}
-	
+
 	// Look for patch file(s) to apply
 	bool launchgame = true;
 
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
 		{
 			cutoffTime = atoi(timeStr.get());
 		}
-		
+
 		if (cutoffTime == 0)
 		{
 			// We didn't have the FLAG parameter; somebody's been hacking.  No game for you!  Bad hacker!
@@ -289,7 +289,7 @@ int main(int argc, char *argv[])
 	}
 
 	myChdir(cwd);
-	
+
 	// Exit normally
 	return 0;
 }
@@ -302,9 +302,9 @@ void CreatePrimaryWin(const char *prefix)
 {
 	char name[256];
 	sprintf(name, "launcher_%s", prefix);
-	
+
 	DBGMSG("CreatePrimary: "<<name);
-	
+
 	/*
 	** set up and register window class
 	*/
@@ -320,14 +320,14 @@ void CreatePrimaryWin(const char *prefix)
 	wc.lpszMenuName = name;
 	wc.lpszClassName = name;
 	RegisterClass(&wc);
-	
+
 	/*
 	** create a window
 	*/
 	HWND hwnd = CreateWindowEx(WS_EX_TOPMOST, name, name, WS_POPUP, 0, 0,
 		GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
 		NULL, NULL, Global_instance, NULL);
-	
+
 	if(!hwnd)
 	{
 		DBGMSG("Couldn't make window!");
@@ -359,16 +359,16 @@ void myChdir(char *path)
 	char ext[64];
 	char filepath[513];
 	int  abc;
-	
+
 	_splitpath( path, drive, dir, file, ext );
 	_makepath ( filepath,   drive, dir, NULL, NULL );
-	
-	if ( filepath[ strlen( filepath ) - 1 ] == '\\' ) 
+
+	if ( filepath[ strlen( filepath ) - 1 ] == '\\' )
 	{
 		filepath[ strlen( filepath ) - 1 ] = '\0';
 	}
-	abc = (unsigned)( toupper( filepath[0] ) - 'A' + 1 ); 
-	if ( !_chdrive( abc )) 
+	abc = (unsigned)( toupper( filepath[0] ) - 'A' + 1 );
+	if ( !_chdrive( abc ))
 	{
 		abc = chdir( filepath );  // Will fail with ending '\\'
 	}
diff --git a/Core/Tools/Launcher/monod.cpp b/Core/Tools/Launcher/monod.cpp
index 8ab917064a0..8e05d8449d7 100644
--- a/Core/Tools/Launcher/monod.cpp
+++ b/Core/Tools/Launcher/monod.cpp
@@ -51,7 +51,7 @@ int MonoD::print(const char *str, int len)
     return(len);
   #else
     for (int i=0; i<len; i++)
-      fprintf(stderr,"%c",str[i]); 
+      fprintf(stderr,"%c",str[i]);
     return(len);
   #endif
 }
diff --git a/Core/Tools/Launcher/monod.h b/Core/Tools/Launcher/monod.h
index 494674c9749..4f94fd065e1 100644
--- a/Core/Tools/Launcher/monod.h
+++ b/Core/Tools/Launcher/monod.h
@@ -16,9 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MONOD_HEADER
-#define MONOD_HEADER
-
+#pragma once
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -70,5 +68,3 @@ class MonoD : public OutputDevice
      HANDLE handle;
    #endif
 };
-
-#endif
diff --git a/Core/Tools/Launcher/odevice.h b/Core/Tools/Launcher/odevice.h
index ccd45e01a89..8cb924ea42a 100644
--- a/Core/Tools/Launcher/odevice.h
+++ b/Core/Tools/Launcher/odevice.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef ODEVICE_HEADER
-#define ODEVICE_HEADER
+#pragma once
 
 // This virtual base class provides an interface for output devices
 //  that can be used for the debugging package.
@@ -28,5 +27,3 @@ class OutputDevice
     virtual     ~OutputDevice() {};
     virtual int print(const char *s,int len)=0;
 };
-
-#endif
diff --git a/Core/Tools/Launcher/patch.cpp b/Core/Tools/Launcher/patch.cpp
index a835ae278c8..63c746aafbe 100644
--- a/Core/Tools/Launcher/patch.cpp
+++ b/Core/Tools/Launcher/patch.cpp
@@ -21,7 +21,7 @@
 *******************************************************************************
  File:       patch.cpp
  Programmer: Neal Kettler
- 
+
  StartDate:  Feb  6, 1998
  LastUpdate: Feb 10, 1998
 -------------------------------------------------------------------------------
@@ -44,7 +44,7 @@ BOOL CALLBACK Update_Info_Proc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lPara
 
   static int unselectText=0;
 
-  switch(iMsg) 
+  switch(iMsg)
   {
     case WM_INITDIALOG:
     {
@@ -73,7 +73,7 @@ BOOL CALLBACK Update_Info_Proc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lPara
         }
         // ...and add back the gunk that windows likes
         strcat(line,"\r\r\n");
-        
+
 	     SendDlgItemMessage(hwnd, IDC_TEXT, EM_SETSEL, (WPARAM)lastsel, (LPARAM)lastsel );
 	     SendDlgItemMessage(hwnd, IDC_TEXT, EM_REPLACESEL, 0, (LPARAM)(line) );
 	     SendDlgItemMessage(hwnd, IDC_TEXT, EM_GETSEL, (WPARAM)NULL, (LPARAM)&lastsel );
@@ -253,7 +253,7 @@ void Apply_Patch(char *patchfile,ConfigFile &config,int skuIndex)
     if (cptr)
       version=atol(cptr);
     DBGMSG("VERSION TO = "<<version);
-    
+
 
     char      string[256];
     Wstring   key;
@@ -291,7 +291,7 @@ void Apply_Patch(char *patchfile,ConfigFile &config,int skuIndex)
 
 			// same dir as game
 			strcpy(notepad.directory, ".");
-			
+
 			// the program that grabs game patches
 			strcpy(notepad.command, "notepad");
 			strcpy(notepad.args, " launcher.txt");
@@ -351,34 +351,34 @@ void Apply_Patch(char *patchfile,ConfigFile &config,int skuIndex)
 
 void Shutdown_Computer_Now(void)
 {
-  HANDLE hToken; 
-  TOKEN_PRIVILEGES tkp; 
- 
-  // Get a token for this process. 
-  if (!OpenProcessToken(GetCurrentProcess(), 
-        TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) 
+  HANDLE hToken;
+  TOKEN_PRIVILEGES tkp;
+
+  // Get a token for this process.
+  if (!OpenProcessToken(GetCurrentProcess(),
+        TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken))
   {
-    //error("OpenProcessToken"); 
+    //error("OpenProcessToken");
   }
- 
-  // Get the LUID for the shutdown privilege. 
-  LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, 
-        &tkp.Privileges[0].Luid); 
- 
-  tkp.PrivilegeCount = 1;  // one privilege to set    
-  tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; 
- 
-  // Get the shutdown privilege for this process. 
-  AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, 
-        (PTOKEN_PRIVILEGES)NULL, 0); 
- 
-  // Cannot test the return value of AdjustTokenPrivileges. 
-  if (GetLastError() != ERROR_SUCCESS) 
+
+  // Get the LUID for the shutdown privilege.
+  LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME,
+        &tkp.Privileges[0].Luid);
+
+  tkp.PrivilegeCount = 1;  // one privilege to set
+  tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+
+  // Get the shutdown privilege for this process.
+  AdjustTokenPrivileges(hToken, FALSE, &tkp, 0,
+        (PTOKEN_PRIVILEGES)NULL, 0);
+
+  // Cannot test the return value of AdjustTokenPrivileges.
+  if (GetLastError() != ERROR_SUCCESS)
   {
-    //error("AdjustTokenPrivileges"); 
+    //error("AdjustTokenPrivileges");
   }
- 
-  // Shut down the system and force all applications to close. 
+
+  // Shut down the system and force all applications to close.
   if (!ExitWindowsEx(EWX_REBOOT, 0))
   {
     // Should never happen
diff --git a/Core/Tools/Launcher/patch.h b/Core/Tools/Launcher/patch.h
index fcb6db3745c..b724c59ff90 100644
--- a/Core/Tools/Launcher/patch.h
+++ b/Core/Tools/Launcher/patch.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef PATCH_HEADER
-#define PATCH_HEADER
+#pragma once
 
 #include "winblows.h"
 #include "dialog.h"
@@ -26,5 +25,3 @@
 #include "process.h"
 
 void Apply_Patch(char *patchfile,ConfigFile &config,int skuIndex);
-
-#endif
diff --git a/Core/Tools/Launcher/process.cpp b/Core/Tools/Launcher/process.cpp
index 28ea2bbf230..335dbb0f225 100644
--- a/Core/Tools/Launcher/process.cpp
+++ b/Core/Tools/Launcher/process.cpp
@@ -19,7 +19,7 @@
 #include "process.h"
 
 Process::Process()
-{ 
+{
   directory[0]=0;
   command[0]=0;
   args[0]=0;
@@ -118,7 +118,7 @@ bit8 Read_Process_Info(ConfigFile &config,OUT Process &info, IN const char *key)
  strcpy(info.directory,dir.get());
  strcpy(info.args,args.get());
  return(TRUE);
- 
+
 
 /*********************************************************
   FILE     *in;
diff --git a/Core/Tools/Launcher/process.h b/Core/Tools/Launcher/process.h
index 0e9fd686f00..d3f2625bee3 100644
--- a/Core/Tools/Launcher/process.h
+++ b/Core/Tools/Launcher/process.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef PROCESS_HEADER
-#define PROCESS_HEADER
+#pragma once
 
 #include <windows.h>
 #include "wstypes.h"
@@ -41,6 +40,3 @@ class Process
 bit8 Read_Process_Info(ConfigFile &config,OUT Process &info, IN const char *key = NULL);
 bit8 Create_Process(Process &process);
 bit8 Wait_Process(Process &process, DWORD *exit_code=NULL);
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/Launcher/resource.h b/Core/Tools/Launcher/resource.h
index 2fdf83ae9d9..2b4b1d1a64d 100644
--- a/Core/Tools/Launcher/resource.h
+++ b/Core/Tools/Launcher/resource.h
@@ -42,7 +42,7 @@
 #define IDC_TEXT                        1011
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        104
diff --git a/Core/Tools/Launcher/streamer.cpp b/Core/Tools/Launcher/streamer.cpp
index 4c0ed141d1b..061baad77db 100644
--- a/Core/Tools/Launcher/streamer.cpp
+++ b/Core/Tools/Launcher/streamer.cpp
@@ -37,14 +37,14 @@ Streamer::Streamer() : streambuf(), Output_Device(NULL), Buf(NULL)
   static_assert(STREAMER_UNBUFFERED==0, "std::streambuf is assumed to be buffered by default");
 #endif
 }
- 
+
 Streamer::~Streamer()
 {
   ///////// calling sync seems to cause crashes here on Win32
   //sync();
   /////////
-  if (Buf)
-    delete[] Buf;
+
+  delete[] Buf;
 }
 
 int Streamer::setOutputDevice(OutputDevice *device)
@@ -111,14 +111,14 @@ int Streamer::doallocate()
     setb(
        Buf,         // base pointer
        Buf+STREAMER_BUFSIZ,  // ebuf pointer (end of buffer);
-       0);          // 0 = manual deletion of buff 
+       0);          // 0 = manual deletion of buff
 #else
     pubsetbuf(Buf, 2*STREAMER_BUFSIZ);
 #endif
 
     // Get area
     setg(
-        Buf,   // eback 
+        Buf,   // eback
         Buf,   // gptr
         Buf);  // egptr
 
diff --git a/Core/Tools/Launcher/streamer.h b/Core/Tools/Launcher/streamer.h
index 41a83a30cc5..ec795620700 100644
--- a/Core/Tools/Launcher/streamer.h
+++ b/Core/Tools/Launcher/streamer.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef STREAMER_HEADER
-#define STREAMER_HEADER
+#pragma once
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -57,5 +56,3 @@ class Streamer : public streambuf
     OutputDevice  *Output_Device;
     char *Buf;
 };
-
-#endif
diff --git a/Core/Tools/Launcher/wdebug.cpp b/Core/Tools/Launcher/wdebug.cpp
index 54264048422..21891af9b53 100644
--- a/Core/Tools/Launcher/wdebug.cpp
+++ b/Core/Tools/Launcher/wdebug.cpp
@@ -37,7 +37,7 @@ static ostream           *warn_ostream=NULL;
 static Streamer           warn_streamer;
 
 static int                error_enabled=0;
-static ostream           *error_ostream=NULL;  
+static ostream           *error_ostream=NULL;
 static Streamer           error_streamer;
 
 
@@ -73,7 +73,7 @@ int MsgManager::setDebugStream(OutputDevice *device)
   if (device==NULL)
     return(1);
 
- 
+
   debug_streamer.setOutputDevice(device);
   delete(debug_ostream);
   debug_ostream=new ostream(&debug_streamer);
@@ -125,12 +125,12 @@ int MsgManager::setErrorStream(OutputDevice *device)
 ostream *MsgManager::debugStream(void)
 {
   return(debug_ostream);
-}   
+}
 
 ostream *MsgManager::infoStream(void)
 {
   return(info_ostream);
-}   
+}
 
 ostream *MsgManager::warnStream(void)
 {
@@ -140,4 +140,4 @@ ostream *MsgManager::warnStream(void)
 ostream *MsgManager::errorStream(void)
 {
   return(error_ostream);
-}   
+}
diff --git a/Core/Tools/Launcher/wdebug.h b/Core/Tools/Launcher/wdebug.h
index 6c521b4ecfc..72f732b6489 100644
--- a/Core/Tools/Launcher/wdebug.h
+++ b/Core/Tools/Launcher/wdebug.h
@@ -50,8 +50,7 @@ will you be ready to leave grasshopper.
 
 \*****************************************************************************/
 
-#ifndef WDEBUG_HEADER
-#define WDEBUG_HEADER
+#pragma once
 
 #include <Utility/iostream_adapter.h>
 #include "odevice.h"
@@ -99,21 +98,21 @@ will you be ready to leave grasshopper.
 {\
   if (MsgManager::infoStream()) \
     (*(MsgManager::infoStream())) << X;\
-}    
+}
 
 // Just get a stream to the warning device, no extra junk
 #define WRNSTREAM(X)\
 {\
   if (MsgManager::warnStream()) \
     (*(MsgManager::warnStream())) << X;\
-}    
+}
 
 // Just get a stream to the error device, no extra junk
 #define ERRSTREAM(X)\
 {\
   if (MsgManager::errorStream()) \
     (*(MsgManager::errorStream())) << X;\
-}    
+}
 
 #ifndef DEBUG
 
@@ -154,7 +153,7 @@ will you be ready to leave grasshopper.
 {\
   if (MsgManager::debugStream()) \
     (*(MsgManager::debugStream())) << X;\
-}    
+}
 
 // Verbosely execute a statement
 #define VERBOSE(X)\
@@ -189,5 +188,3 @@ class MsgManager
    static ostream            *warnStream(void);
    static ostream            *errorStream(void);
 };
-
-#endif
diff --git a/Core/Tools/Launcher/winblows.cpp b/Core/Tools/Launcher/winblows.cpp
index af12b932fbc..2bc7ea4aa17 100644
--- a/Core/Tools/Launcher/winblows.cpp
+++ b/Core/Tools/Launcher/winblows.cpp
@@ -53,12 +53,12 @@ int PASCAL WinMain( HINSTANCE instance, HINSTANCE, char *command_line, int comma
 
     int   command_scan=0;
     char  command_char;
-    do 
+    do
     {
       /*
       ** Scan for non-space character on command line
       */
-      do 
+      do
       {
         command_char = *( command_line+command_scan++ );
       } while ( command_char==' ' );
diff --git a/Core/Tools/Launcher/winblows.h b/Core/Tools/Launcher/winblows.h
index 3d43acc06af..9e6d14ef1fe 100644
--- a/Core/Tools/Launcher/winblows.h
+++ b/Core/Tools/Launcher/winblows.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef WINBLOWS_HEADER
-#define WINBLOWS_HEADER
+#pragma once
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -33,5 +32,3 @@
   extern int       main(int argc, char *argv[]);
 
   int              Print_WM(UINT wm,char *out);
-
-#endif
diff --git a/Core/Tools/Launcher/wstring.cpp b/Core/Tools/Launcher/wstring.cpp
index 7a4e8fcf3cd..cec002a6b64 100644
--- a/Core/Tools/Launcher/wstring.cpp
+++ b/Core/Tools/Launcher/wstring.cpp
@@ -23,7 +23,7 @@ Project Name: Carpenter  (The RedAlert ladder creator)
 File Name   : string.cpp
 Author      : Neal Kettler
 Start Date  : June 1, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 
 A fairly typical string class.  This string class always copies any input
 string to it's own memory (for assignment or construction).
@@ -151,9 +151,7 @@ bit8 Wstring::cat(const char *s)
 
   strcat(str, s);
 
-  // delete the old string.
-  if(oldStr)
-    delete[](oldStr);
+  delete[](oldStr);
 
   return(TRUE);
 }
@@ -188,9 +186,7 @@ bit8 Wstring::cat(uint32 size, const char *s)
 
   strncat(str, s, size);
 
-  // delete the old string.
-  if(oldStr)
-    delete[](oldStr);
+  delete[](oldStr);
 
   return(TRUE);
 }
@@ -296,7 +292,7 @@ bit8 Wstring::removeChar(char c)
     char *newStr=new char[strlen(str)+1];
     strcpy(newStr,str);
     delete[](str);
-    str=newStr; 
+    str=newStr;
   }
   return(removed);
 }
@@ -309,8 +305,7 @@ void Wstring::removeSpaces(void)
 
 void Wstring::clear(void)
 {
- if(str)
-   delete[](str);
+ delete[](str);
  str=NULL;
 }
 
@@ -319,7 +314,7 @@ void Wstring::setSize(sint32 size)
   clear();
   if (size<0)
     return;
-  str=new char[size]; 
+  str=new char[size];
   memset(str,0,size);
 }
 
@@ -359,7 +354,7 @@ uint32 Wstring::length(void) const
 bit8 Wstring::insert(const char *instring, uint32 pos)
 {
   if (str==NULL)
-    return(set(instring)); 
+    return(set(instring));
   if (pos>strlen(str))
     pos=strlen(str);
   char *newstr=new char[strlen(str)+strlen(instring)+1];
@@ -549,14 +544,14 @@ bit8 Wstring::truncate(uint32 len)
 bit8 Wstring::truncate(char c)
 {
   sint32  len;
- 
+
   if (str==NULL)
     return(FALSE);
 
   char   *cptr=strchr(str,c);
   if (cptr==NULL)
     return(FALSE);
-  len=(sint32)(cptr-str); 
+  len=(sint32)(cptr-str);
   truncate((uint32)len);
   return(TRUE);
 }
@@ -580,7 +575,7 @@ sint32 Wstring::getToken(int offset,const char *delim,Wstring &out)
     if(strchr(delim,str[i])!=NULL)
       break;
   }
-  stop=i-1; 
+  stop=i-1;
   out.set(str+start);
   out.truncate((uint32)stop-start+1);
   return(stop+1);
@@ -596,7 +591,7 @@ sint32 Wstring::getLine(int offset, Wstring &out)
   start=i=offset;
   if (start >= (int)length())
     return(-1);
- 
+
   for (; i<(int)length(); i++) {
     if(strchr("\r\n",str[i])!=NULL)
       break;
diff --git a/Core/Tools/Launcher/wstring.h b/Core/Tools/Launcher/wstring.h
index c79d9f267c0..00f39c2ffc8 100644
--- a/Core/Tools/Launcher/wstring.h
+++ b/Core/Tools/Launcher/wstring.h
@@ -23,11 +23,10 @@ Project Name: Carpenter  (The RedAlert ladder creator)
 File Name   : main.cpp
 Author      : Neal Kettler
 Start Date  : June 1, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 \****************************************************************************/
 
-#ifndef WSTRING_HEADER
-#define WSTRING_HEADER
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -35,7 +34,7 @@ Last Update : June 17, 1997
 
 class Wstring
 {
- public: 
+ public:
            Wstring();
            Wstring(const Wstring &other);
            Wstring(const char *string);
@@ -83,5 +82,3 @@ class Wstring
  private:
    char    *str;    // Pointer to allocated string.
 };
-
-#endif
diff --git a/Core/Tools/Launcher/wstypes.h b/Core/Tools/Launcher/wstypes.h
index d22eca483ca..d521a5872a0 100644
--- a/Core/Tools/Launcher/wstypes.h
+++ b/Core/Tools/Launcher/wstypes.h
@@ -23,13 +23,12 @@ Project Name:
 File Name   : wtypes.h
 Author      : Neal Kettler
 Start Date  : June 3, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 
 Standard type definitions for the sake of portability and readability.
 \***************************************************************************/
 
-#ifndef WTYPES_HEADER
-#define WTYPES_HEADER
+#pragma once
 
 #ifndef TRUE
 #define TRUE               1
@@ -72,11 +71,9 @@ typedef unsigned int       uint32;
 #define MAX_UINT8   0xFF
 #define MAX_SINT32  0x7FFFFFFF
 #define MAX_SINT16  0x7FFF
-#define MAX_SINT8   0x7F   
+#define MAX_SINT8   0x7F
 
 #ifdef _WIN32
 #define strncasecmp _strnicmp
 #define strcasecmp  _stricmp
-#endif  
-
 #endif
diff --git a/Core/Tools/MapCacheBuilder/CMakeLists.txt b/Core/Tools/MapCacheBuilder/CMakeLists.txt
index 5d390853a8f..bdb38951a54 100644
--- a/Core/Tools/MapCacheBuilder/CMakeLists.txt
+++ b/Core/Tools/MapCacheBuilder/CMakeLists.txt
@@ -17,7 +17,6 @@ target_link_libraries(corei_mapcachebuilder INTERFACE
     comctl32
     core_debug
     core_profile
-    dbghelplib
     imm32
     vfw32
     winmm
diff --git a/Core/Tools/MapCacheBuilder/Include/WinMain.h b/Core/Tools/MapCacheBuilder/Include/WinMain.h
index 6000ba60496..c5ebe3b4af0 100644
--- a/Core/Tools/MapCacheBuilder/Include/WinMain.h
+++ b/Core/Tools/MapCacheBuilder/Include/WinMain.h
@@ -18,12 +18,12 @@
 
 // FILE: WinMain.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    ImagePacker
@@ -39,9 +39,6 @@
 
 #pragma once
 
-#ifndef __WINMAIN_H_
-#define __WINMAIN_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 
@@ -57,6 +54,3 @@
 // EXTERNALS //////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 extern HINSTANCE ApplicationHInstance;
-
-#endif // __WINMAIN_H_
-
diff --git a/Core/Tools/MapCacheBuilder/Resource/Resource.h b/Core/Tools/MapCacheBuilder/Resource/Resource.h
index 3962609cdcf..94cbdae4a72 100644
--- a/Core/Tools/MapCacheBuilder/Resource/Resource.h
+++ b/Core/Tools/MapCacheBuilder/Resource/Resource.h
@@ -62,7 +62,7 @@
 #define STATIC_GAP_INFO                 1039
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        105
diff --git a/Core/Tools/MapCacheBuilder/Source/WinMain.cpp b/Core/Tools/MapCacheBuilder/Source/WinMain.cpp
index 3abf1f9e8ac..9a2d0adca3f 100644
--- a/Core/Tools/MapCacheBuilder/Source/WinMain.cpp
+++ b/Core/Tools/MapCacheBuilder/Source/WinMain.cpp
@@ -18,12 +18,12 @@
 
 // FILE: WinMain.cpp //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    MapCacheBuilder
@@ -40,7 +40,6 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 #include <stdlib.h>
-#include <string.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
@@ -110,21 +109,16 @@
 
 // PRIVATE TYPES //////////////////////////////////////////////////////////////
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////
 
 static SubsystemInterfaceList _TheSubsystemList;
 
 template<class SUBSYSTEM>
-void initSubsystem(SUBSYSTEM*& sysref, SUBSYSTEM* sys, const char* path1 = NULL, const char* path2 = NULL, const char* dirpath = NULL)
+void initSubsystem(SUBSYSTEM*& sysref, SUBSYSTEM* sys, const char* path1 = NULL, const char* path2 = NULL)
 {
 	sysref = sys;
-	_TheSubsystemList.initSubsystem(sys, path1, path2, dirpath, NULL);
+	_TheSubsystemList.initSubsystem(sys, path1, path2, NULL);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -217,8 +211,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
                       LPSTR lpCmdLine, Int nCmdShow )
 {
 
-	// start the log
-	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+	// initialize the memory manager early
 	initMemoryManager();
 
 	try
@@ -231,13 +224,8 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	// Set the current directory to the app directory.
 	char buf[_MAX_PATH];
 	GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	if (char *pEnd = strrchr(buf, '\\')) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);
 
@@ -250,8 +238,8 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	while (token != NULL) {
 		char * str = strtrim(token);
 		argvSet.push_back(str);
-		DEBUG_LOG(("Adding '%s'\n", str));
-		token = nextParam(NULL, "\" ");	   
+		DEBUG_LOG(("Adding '%s'", str));
+		token = nextParam(NULL, "\" ");
 	}
 
 	// not part of the subsystem list, because it should normally never be reset!
@@ -263,31 +251,31 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	initSubsystem(TheLocalFileSystem, (LocalFileSystem*)new Win32LocalFileSystem);
 	initSubsystem(TheArchiveFileSystem, (ArchiveFileSystem*)new Win32BIGFileSystem);
 	INI ini;
-	initSubsystem(TheWritableGlobalData, new GlobalData(), "Data\\INI\\Default\\GameData.ini", "Data\\INI\\GameData.ini");
+	initSubsystem(TheWritableGlobalData, new GlobalData(), "Data\\INI\\Default\\GameData", "Data\\INI\\GameData");
 	initSubsystem(TheGameText, CreateGameTextInterface());
-	initSubsystem(TheScienceStore, new ScienceStore(), "Data\\INI\\Default\\Science.ini", "Data\\INI\\Science.ini");
-	initSubsystem(TheMultiplayerSettings, new MultiplayerSettings(), "Data\\INI\\Default\\Multiplayer.ini", "Data\\INI\\Multiplayer.ini");
-	initSubsystem(TheTerrainTypes, new TerrainTypeCollection(), "Data\\INI\\Default\\Terrain.ini", "Data\\INI\\Terrain.ini");
-	initSubsystem(TheTerrainRoads, new TerrainRoadCollection(), "Data\\INI\\Default\\Roads.ini", "Data\\INI\\Roads.ini");
+	initSubsystem(TheScienceStore, new ScienceStore(), "Data\\INI\\Default\\Science", "Data\\INI\\Science");
+	initSubsystem(TheMultiplayerSettings, new MultiplayerSettings(), "Data\\INI\\Default\\Multiplayer", "Data\\INI\\Multiplayer");
+	initSubsystem(TheTerrainTypes, new TerrainTypeCollection(), "Data\\INI\\Default\\Terrain", "Data\\INI\\Terrain");
+	initSubsystem(TheTerrainRoads, new TerrainRoadCollection(), "Data\\INI\\Default\\Roads", "Data\\INI\\Roads");
 	initSubsystem(TheScriptEngine, (ScriptEngine*)(new ScriptEngine()));
 	initSubsystem(TheAudio, (AudioManager*)new MilesAudioManager());
 	initSubsystem(TheVideoPlayer, (VideoPlayerInterface*)(new VideoPlayer()));
 	initSubsystem(TheModuleFactory, (ModuleFactory*)(new W3DModuleFactory()));
 	initSubsystem(TheSidesList, new SidesList());
 	initSubsystem(TheCaveSystem, new CaveSystem());
-	initSubsystem(TheRankInfoStore, new RankInfoStore(), NULL, "Data\\INI\\Rank.ini");
-	initSubsystem(ThePlayerTemplateStore, new PlayerTemplateStore(), "Data\\INI\\Default\\PlayerTemplate.ini", "Data\\INI\\PlayerTemplate.ini");
-	initSubsystem(TheSpecialPowerStore, new SpecialPowerStore(), "Data\\INI\\Default\\SpecialPower.ini", "Data\\INI\\SpecialPower.ini" );
+	initSubsystem(TheRankInfoStore, new RankInfoStore(), NULL, "Data\\INI\\Rank");
+	initSubsystem(ThePlayerTemplateStore, new PlayerTemplateStore(), "Data\\INI\\Default\\PlayerTemplate", "Data\\INI\\PlayerTemplate");
+	initSubsystem(TheSpecialPowerStore, new SpecialPowerStore(), "Data\\INI\\Default\\SpecialPower", "Data\\INI\\SpecialPower" );
 	initSubsystem(TheParticleSystemManager, (ParticleSystemManager*)(new W3DParticleSystemManager()));
-	initSubsystem(TheFXListStore, new FXListStore(), "Data\\INI\\Default\\FXList.ini", "Data\\INI\\FXList.ini");
-	initSubsystem(TheWeaponStore, new WeaponStore(), NULL, "Data\\INI\\Weapon.ini");
-	initSubsystem(TheObjectCreationListStore, new ObjectCreationListStore(), "Data\\INI\\Default\\ObjectCreationList.ini", "Data\\INI\\ObjectCreationList.ini");
-	initSubsystem(TheLocomotorStore, new LocomotorStore(), NULL, "Data\\INI\\Locomotor.ini");
-	initSubsystem(TheDamageFXStore, new DamageFXStore(), NULL, "Data\\INI\\DamageFX.ini");
-	initSubsystem(TheArmorStore, new ArmorStore(), NULL, "Data\\INI\\Armor.ini");
-	initSubsystem(TheThingFactory, new ThingFactory(), "Data\\INI\\Default\\Object.ini", NULL, "Data\\INI\\Object");
-	initSubsystem(TheCrateSystem, new CrateSystem(), "Data\\INI\\Default\\Crate.ini", "Data\\INI\\Crate.ini");
-	initSubsystem(TheUpgradeCenter, new UpgradeCenter, "Data\\INI\\Default\\Upgrade.ini", "Data\\INI\\Upgrade.ini");
+	initSubsystem(TheFXListStore, new FXListStore(), "Data\\INI\\Default\\FXList", "Data\\INI\\FXList");
+	initSubsystem(TheWeaponStore, new WeaponStore(), NULL, "Data\\INI\\Weapon");
+	initSubsystem(TheObjectCreationListStore, new ObjectCreationListStore(), "Data\\INI\\Default\\ObjectCreationList", "Data\\INI\\ObjectCreationList");
+	initSubsystem(TheLocomotorStore, new LocomotorStore(), NULL, "Data\\INI\\Locomotor");
+	initSubsystem(TheDamageFXStore, new DamageFXStore(), NULL, "Data\\INI\\DamageFX");
+	initSubsystem(TheArmorStore, new ArmorStore(), NULL, "Data\\INI\\Armor");
+	initSubsystem(TheThingFactory, new ThingFactory(), "Data\\INI\\Default\\Object", "Data\\INI\\Object");
+	initSubsystem(TheCrateSystem, new CrateSystem(), "Data\\INI\\Default\\Crate", "Data\\INI\\Crate");
+	initSubsystem(TheUpgradeCenter, new UpgradeCenter, "Data\\INI\\Default\\Upgrade", "Data\\INI\\Upgrade");
 	initSubsystem(TheAnim2DCollection, new Anim2DCollection ); //Init's itself.
 
 	_TheSubsystemList.postProcessLoadAll();
@@ -299,7 +287,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	// add in allowed maps
 	for (std::list<std::string>::const_iterator cit = argvSet.begin(); cit != argvSet.end(); ++cit)
 	{
-		DEBUG_LOG(("Adding shipping map: '%s'\n", cit->c_str()));
+		DEBUG_LOG(("Adding shipping map: '%s'", cit->c_str()));
 		TheMapCache->addShippingMap((*cit).c_str());
 	}
 
@@ -309,7 +297,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	TheMapCache = NULL;
 
 	// load the dialog box
-	//DialogBox( hInstance, (LPCTSTR)IMAGE_PACKER_DIALOG, 
+	//DialogBox( hInstance, (LPCTSTR)IMAGE_PACKER_DIALOG,
 	//					 NULL, (DLGPROC)ImagePackerProc );
 
 	// delete TheGlobalData
@@ -330,11 +318,9 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 		DEBUG_CRASH(("Munkee munkee!"));
 	}
 
-	// close the log
 	shutdownMemoryManager();
-	DEBUG_SHUTDOWN();
 
 	// all done
 	return 0;
 
-}  // end WinMain
+}
diff --git a/Core/Tools/PATCHGET/CHATAPI.CPP b/Core/Tools/PATCHGET/CHATAPI.CPP
deleted file mode 100644
index e89fdc781fc..00000000000
--- a/Core/Tools/PATCHGET/CHATAPI.CPP
+++ /dev/null
@@ -1,1807 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-//
-// This module takes care of all the Chat API stuff
-//
-
-#include <list>
-#include "gamespy/ghttp/ghttp.h"
-#include "DownloadManager.h"
-
-#include "CHATAPI.H"
-
-//#include "api/wolapi_i.c"  // This should only be in one .cpp file
-#include <objbase.h>
-#include <windows.h>
-#include <initguid.h>
-#include <olectl.h>
-#if defined(_MSC_VER) && _MSC_VER < 1300
-#include <mapicode.h>
-#endif
-#include "RESOURCE.H"
-#include "WINBLOWS.H"
-#include <crtdbg.h>
-#include "process.h"
-#include "WWDownload/Registry.h"
-#include "WWDownload/urlBuilder.h"
-#include "debug.h"
-
-namespace patchget
-{
-
-enum EVENT_TYPES
-{
-  NOUPDATE_EVENT=0,    // don't need to update
-  ABORT_EVENT,
-  NUM_EVENTS       // keep last
-};
-
-#if RTS_GENERALS
-#define GAME_NAME	"Command and Conquer Generals"
-#elif RTS_ZEROHOUR
-#define GAME_NAME	"Command & Conquer"
-#endif
-
-HANDLE       Events[NUM_EVENTS];
-
-char         g_UpdateString[256];   // for the filename
-char         g_DLTimeRem[80];
-char         g_DLBytesLeft[80];
-char         g_DLBPS[80];
-
-int          g_Finished=0;
-
-
-HWND         g_DownloadWindow;
-HWND         g_ContactWindow;
-HWND         g_PrimaryWindow;
-
-static bool checkingForPatch = false;
-static int checksLeft = 0;
-static bool cantConnect = false;
-static std::list<QueuedDownload> queuedDownloads;
-
-BOOL CALLBACK downloadDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam,
-    LPARAM lParam );
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static void startOnline( void );
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-QueuedDownload TheDownload;
-
-class DownloadManagerMunkee : public DownloadManager
-{
-public:
-	DownloadManagerMunkee() { }
-	virtual HRESULT OnError( int error );
-	virtual HRESULT OnEnd();
-	virtual HRESULT OnProgressUpdate( int bytesread, int totalsize, int timetaken, int timeleft );
-	virtual HRESULT OnStatusUpdate( int status );
-	virtual HRESULT downloadFile( std::string server, std::string username, std::string password, std::string file, std::string localfile, std::string regkey, bool tryResume );
-};
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-HRESULT DownloadManagerMunkee::downloadFile( std::string server, std::string username, std::string password, std::string file, std::string localfile, std::string regkey, bool tryResume )
-{
-	/*
-	if (staticTextFile)
-	{
-		UnicodeString fileString;
-		fileString.translate(file);
-		GadgetStaticTextSetText(staticTextFile, fileString);
-	}
-	*/
-	return DownloadManager::downloadFile( server, username, password, file, localfile, regkey, tryResume );
-}
-HRESULT DownloadManagerMunkee::OnError( int error )
-{
-	HRESULT ret = DownloadManager::OnError( error );
-  g_Finished = -1;
-	return ret;
-}
-HRESULT DownloadManagerMunkee::OnEnd()
-{
-	HRESULT ret = DownloadManager::OnEnd();
-  g_Finished = 1;
-	return ret;
-}
-HRESULT DownloadManagerMunkee::OnProgressUpdate( int bytesread, int totalsize, int timetaken, int timeleft )
-{
-	HRESULT ret = DownloadManager::OnProgressUpdate( bytesread, totalsize, timetaken, timeleft );
-
-  SendDlgItemMessage( g_DownloadWindow, IDC_PROGRESS, PBM_SETPOS, (WPARAM)(bytesread * 100) / totalsize, 0 );
-  char temp[256];
-
-  if( timeleft > 0 )
-  {
-    //DBGMSG("Bytes read: "<<bytesread<<".    Time left: "<<timeleft<<" seconds");
- 	 LoadString(Global_instance, TXT_TIME_REMAIN, temp, sizeof(temp));
-    sprintf(g_DLTimeRem,temp,(timeleft/60),(timeleft%60));
-
-    LoadString(Global_instance, TXT_BPS, temp, sizeof(temp));
-    sprintf(g_DLBPS,temp,bytesread/timetaken);
-  }
-  LoadString(Global_instance, TXT_BYTES_READ, temp, sizeof(temp));
-  sprintf(g_DLBytesLeft,temp,bytesread,totalsize);
-	return ret;
-}
-HRESULT DownloadManagerMunkee::OnStatusUpdate( int status )
-{
-	HRESULT ret = DownloadManager::OnStatusUpdate( status );
-	SetWindowText(g_DownloadWindow, getStatusString().c_str());
-	return ret;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-BOOL CALLBACK simpleDialogProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
-{
-  switch( uMsg )
-  {
-    case WM_INITDIALOG:
-      return(TRUE);
-    break;
-    case WM_CLOSE:
-      DestroyWindow(hwnd);
-      PostQuitMessage(0);
-      exit(0);
-    break;
-  }
-  return(FALSE);
-}
-
-static void startOnline( void )
-{
-	checkingForPatch = false;
-
-  // Close that contacting window
-  DestroyWindow(g_ContactWindow);
-  g_ContactWindow=NULL;
-
-	if (cantConnect)
-	{
-		MessageBox(NULL, "Can't Connect", GAME_NAME, MB_OK);
-		exit(0);
-	}
-	else if (queuedDownloads.size())
-	{
-		if (MessageBox(NULL, "Patches Available.  Download?", GAME_NAME, MB_YESNO) == IDYES)
-		{
-			DEBUG_LOG(("Downloading patches\n"));
-			while (queuedDownloads.size())
-			{
-				TheDownload = queuedDownloads.front();
-				queuedDownloads.pop_front();
-				TheDownloadManager = new DownloadManagerMunkee;
-				/**/
-		    int retVal = DialogBox(Global_instance, MAKEINTRESOURCE(IDD_DOWNLOAD_DIALOG), g_PrimaryWindow, downloadDialogProc);
-				if (retVal)
-				{
-					DEBUG_LOG(("Error %d\n", GetLastError()));
-				}
-				/**/
-				/*
-				{
-					//char *res = MAKEINTRESOURCE(IDD_CONNECTING);
-					char *res = MAKEINTRESOURCE(IDD_DOWNLOAD_DIALOG1);
-					g_DownloadWindow=CreateDialog(Global_instance,res,g_PrimaryWindow,simpleDialogProc);
-					ShowWindow(g_DownloadWindow,SW_SHOWNORMAL);
-					SetForegroundWindow(g_DownloadWindow);
-				}
-				*/
-				delete TheDownloadManager;
-				TheDownloadManager = NULL;
-
-				if (g_Finished != 1)
-				{
-					// Download failed
-					//DBGMSG("Download failed: "<<retval);
-					SetEvent(Events[ABORT_EVENT]);
-					return;
-				}
-			}
-			exit(0);
-		}
-		else
-		{
-			exit(0);
-		}
-	}
-	else
-	{
-		MessageBox(NULL, "No Patches Available", GAME_NAME, MB_OK);
-		exit(0);
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static std::string trim(std::string s, const std::string& delim)
-{
-	unsigned int i;
-	i = s.find_first_not_of(delim);
-	if (i != s.npos)
-	{
-		s = s.substr(i);
-	}
-
-	i = s.find_last_not_of(delim);
-	if (i>=0 && i<s.npos)
-	{
-		s = s.substr(0, i+1);
-	}
-
-	return s;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static std::string getNextLine(std::string in, std::string& remainder)
-{
-	int lineEnd;
-	lineEnd = in.find_first_of("\n\r", 0);
-	if (lineEnd < 1)
-	{
-		remainder = "";
-		return in;
-	}
-
-	std::string out = in.substr(0, lineEnd);
-	remainder = in.substr(lineEnd+1);
-
-	remainder = trim(remainder, "\r\n\t ");
-	out = trim(out, "\r\t\n ");
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-//-----------------------------------------------------------------------------
-inline const char* skipSeps(const char* p, const char* seps)
-{
-	while (*p && strchr(seps, *p) != NULL)
-		++p;
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-inline const char* skipNonSeps(const char* p, const char* seps)
-{
-	while (*p && strchr(seps, *p) == NULL)
-		++p;
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-bool nextToken(std::string& base, std::string& tok, const char* seps = NULL)
-{
-	if (base.empty())
-		return false;
-
-	if (seps == NULL)
-		seps = " \n\r\t";
-
-	const char* start = skipSeps(base.c_str(), seps);
-	const char* end = skipNonSeps(start, seps);
-
-	if (end > start)
-	{
-		int len = end - start;
-		char* tmp = new char[len+1];
-		memcpy(tmp, start, len);
-		tmp[len] = 0;
-
-		tok = tmp;
-		delete[] tmp;
-
-		base = end;
-
-		return true;
-	}
-	else
-	{
-		base = tok = "";
-		return false;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static void queuePatch(bool mandatory, std::string downloadURL)
-{
-	// downloadURL is of the form "ftp://ftp.ea.com:user@pass/pub/munkee/bananna.rtp"
-	QueuedDownload q;
-	bool success = true;
-
-	std::string connectionType;
-	success = success && nextToken(downloadURL, connectionType, ":");
-
-	std::string server;
-	success = success && nextToken(downloadURL, server, ":/");
-
-	std::string user;
-	success = success && nextToken(downloadURL, user, ":@");
-
-	std::string pass;
-	success = success && nextToken(downloadURL, pass, "@/");
-
-	std::string filePath;
-	success = success && nextToken(downloadURL, filePath, "");
-
-	if (!success && !user.empty())
-	{
-		// no user/pass combo - move the file into it's proper place
-		filePath = user;
-		user = ""; // LFeenanEA - Credentials removed as per Security requirements
-		pass = "";
-		success = true;
-	}
-
-	std::string fileStr = filePath;
-	unsigned int slashPos = filePath.find_last_of('/');
-	std::string fileDir = "patches\\";
-	std::string fileName = "";
-	if (slashPos == filePath.npos)
-	{
-		fileName = filePath;
-	}
-	else
-	{
-		fileName = filePath.substr(slashPos+1);
-	}
-	fileDir.append(fileName);
-
-	DEBUG_LOG(("download URL split: %d [%s] [%s] [%s] [%s] [%s] [%s] [%s]\n",
-		success, connectionType.c_str(), server.c_str(), user.c_str(), pass.c_str(),
-		filePath.c_str(), fileName.c_str(), fileDir.c_str()));
-
-	if (!success)
-		return;
-
-	q.file = filePath;
-	q.localFile = fileDir;
-	q.password = pass;
-	q.regKey = "";
-	q.server = server;
-	q.tryResume = true;
-	q.userName = user;
-
-	std::list<QueuedDownload>::iterator it = queuedDownloads.begin();
-	while (it != queuedDownloads.end())
-	{
-		if (it->localFile == q.localFile)
-			return; // don't add it if it exists already (because we can check multiple times)
-		++it;
-	}
-
-	queuedDownloads.push_back(q);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool patchCheckCallback( GHTTPRequest request, GHTTPResult result, char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	--checksLeft;
-	DEBUG_ASSERTCRASH(checksLeft>=0, ("Too many callbacks"));
-
-	DEBUG_LOG(("Result=%d, buffer=[%s], len=%d\n", result, buffer, bufferLen));
-	if (result != GHTTPSuccess)
-	{
-		cantConnect = true;
-		if (!checksLeft)
-		{
-			startOnline();
-		}
-		return GHTTPTrue;
-	}
-
-	std::string message = buffer;
-	std::string line;
-	while (nextToken(message, line, "\r\n"))
-	{
-		std::string type, req, url;
-		bool ok = true;
-		ok = ok && nextToken(line, type, " ");
-		ok = ok && nextToken(line, req, " ");
-		ok = ok && nextToken(line, url, " ");
-		if (ok && type == "patch")
-		{
-			DEBUG_LOG(("Saw a patch: %d/[%s]\n", atoi(req.c_str()), url.c_str()));
-			queuePatch( atoi(req.c_str()), url );
-		}
-		else if (ok && type == "server")
-		{
-		}
-	}
-
-	if (!checksLeft)
-	{
-		startOnline();
-	}
-
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static void StartPatchCheck( void )
-{
-	checkingForPatch = true;
-	std::string gameURL, mapURL;
-	std::string configURL, motdURL;
-
-	FormatURLFromRegistry(gameURL, mapURL, configURL, motdURL);
-
-	std::string proxy;
-	if (GetStringFromRegistry("", "Proxy", proxy))
-	{
-		if (!proxy.empty())
-		{
-			ghttpSetProxy(proxy.c_str());
-		}
-	}
-
-	// check for a patch first
-	checksLeft = 2;
-	cantConnect = false;
-	ghttpGet(gameURL.c_str(), GHTTPFalse, patchCheckCallback, NULL);
-	ghttpGet(mapURL.c_str(), GHTTPFalse, patchCheckCallback, NULL);
-
-	DEBUG_LOG(("Started looking for patches at '%s' && '%s'\n", gameURL.c_str(), mapURL.c_str()));
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-
-BOOL CALLBACK downloadDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
-{
-	//   HRESULT res;
-	
-	int cmd = LOWORD(wParam);
-	switch( uMsg )
-	{
-		case WM_COMMAND:
-			if ( cmd == IDC_DLABORT )
-			{
-				
-				char abort[128];
-				char abortdload[256];
-				LoadString(Global_instance, TXT_ABORT_DOWNLOAD, abortdload, sizeof(abortdload));
-				LoadString(Global_instance, TXT_ABORT, abort, sizeof(abort));
-				
-				if (MessageBox(g_PrimaryWindow,abortdload,abort,MB_YESNO)==IDYES)
-				{
-					TheDownloadManager->reset();
-					
-					EndDialog( hwndDlg, g_Finished );
-					DestroyWindow(hwndDlg);
-				}
-			}
-			else
-			{
-				return FALSE;
-			}
-			break;
-			
-		case WM_INITDIALOG:
-			//SetupDownload();
-			
-			SendMessage(hwndDlg, WM_SETICON,(WPARAM)ICON_SMALL,
-				(LPARAM)LoadIcon(Global_instance, MAKEINTRESOURCE(IDI_ICON1)));
-			
-			g_DLTimeRem[0]=0;
-			g_DLBytesLeft[0]=0;
-			g_DLBPS[0]=0;
-			
-			//SetDlgItemText( hwndDlg, IDC_DOWNLOADTITLE, g_UpdateString);
-			//SetWindowText(hwndDlg, g_UpdateString);
-			
-			SetDlgItemText( hwndDlg, IDC_TIMEREM, g_DLTimeRem);
-			SetDlgItemText( hwndDlg, IDC_BYTESLEFT, g_DLBytesLeft);
-			// SetDlgItemText( hwndDlg, IDC_BPS, g_DLBPS );
-			
-			// Work out the full file name
-			//char    fullpath[_MAX_PATH];
-			//char    localfile[_MAX_PATH];
-			//sprintf( fullpath, "%s/%s", g_Update->patchpath,g_Update->patchfile);
-			//sprintf(localfile,"%s\\%s",g_Update->localpath,g_Update->patchfile);
-			
-			// Create the directory
-			//CreateDirectory((char *)g_Update->localpath, NULL );
-			
-			TheDownloadManager->downloadFile(TheDownload.server, TheDownload.userName, TheDownload.password,
-				TheDownload.file, TheDownload.localFile, TheDownload.regKey, TheDownload.tryResume);
-				/*
-				res=pDownload->DownloadFile((char *)g_Update->server, (char *)g_Update->login, (char *)g_Update->password,
-				fullpath, localfile, APP_REG_KEY);
-				
-			*/
-			g_DownloadWindow = hwndDlg;
-			g_Finished = 0;
-			SetTimer( hwndDlg, 1, 200, NULL );    // was 50
-			
-			break;
-			
-		case WM_TIMER:
-			DEBUG_LOG(("TIMER\n"));
-			if( g_Finished == 0 )
-			{
-				DEBUG_LOG(("Entering PumpMsgs\n"));
-				TheDownloadManager->update();
-				/*
-				pDownload->PumpMessages();
-				*/
-				DEBUG_LOG(("Done with PumpMsgs\n"));
-				if (strlen(g_DLTimeRem))
-					SetDlgItemText( hwndDlg, IDC_TIMEREM, g_DLTimeRem );
-				if (strlen(g_DLBytesLeft))
-					SetDlgItemText( hwndDlg, IDC_BYTESLEFT, g_DLBytesLeft );
-				//if (strlen(g_DLBPS))
-				//  SetDlgItemText( hwndDlg, IDC_BPS, g_DLBPS );
-			}
-			else
-			{
-				DEBUG_LOG(("TIMER: Finished\n"));
-				EndDialog( hwndDlg, g_Finished );
-				DestroyWindow( hwndDlg );
-			}
-			break;
-			
-		case WM_DESTROY:
-			KillTimer( hwndDlg, 1 );
-			//ClosedownDownload();
-			
-			//DBGMSG("WM_DESTROY");
-			break;
-			
-		case WM_SETFONT:
-			return TRUE;
-			
-		default:
-			return FALSE;
-	}
-	return TRUE;
-}
-
-
-
-DWORD        dwChatAdvise;
-DWORD        dwDownloadAdvise;
-
-//Update      *g_Update;
-
-uint32       g_AppVer=-1;
-
-
-BOOL CALLBACK Download_Dialog_Proc( HWND hwndDlg, UINT uMsg, WPARAM wParam,
-    LPARAM lParam );
-
-BOOL CALLBACK Simple_Dialog_Proc( HWND hwndDlg, UINT uMsg, WPARAM wParam,
-    LPARAM lParam );
-
-HWND CreatePrimaryWin(void);
-
-char const * Fetch_String(int id);
-
-
-//
-// Create a primary window
-//
-HWND CreatePrimaryWin(void)
-{
-  HWND                hwnd;
-  WNDCLASS            wc;
-  char                name[256];
-
-  sprintf(name,Fetch_String(TXT_TITLE));
-
-  //DBGMSG("CreatePrimary: "<<name);
-
-  /*
-  ** set up and register window class
-  */
-  wc.style = CS_HREDRAW | CS_VREDRAW;
-  wc.lpfnWndProc = DefWindowProc;
-  wc.cbClsExtra = 0;            // Don't need any extra class data
-  wc.cbWndExtra = 0;            // No extra win data
-  wc.hInstance = Global_instance;
-  wc.hIcon=LoadIcon(Global_instance, MAKEINTRESOURCE(IDI_ICON1));
-  wc.hCursor = NULL;  /////////LoadCursor( NULL, IDC_ARROW );
-  wc.hbrBackground = NULL;
-  wc.lpszMenuName = name;
-  wc.lpszClassName = name;
-  RegisterClass( &wc );
-    
-  /*
-  ** create a window
-  */
-  hwnd = CreateWindowEx(
-      WS_EX_APPWINDOW,
-      name,
-      name,
-      WS_POPUP,
-      0, 0,
-
-      //GetSystemMetrics( SM_CXSCREEN ),
-      //GetSystemMetrics( SM_CYSCREEN ),
-      0,0,
-
-      NULL,
-      NULL,
-      Global_instance,
-      NULL );
-
-  SendMessage(hwnd,WM_SETICON,(WPARAM)ICON_SMALL,
-      (LPARAM)LoadIcon(Global_instance, MAKEINTRESOURCE(IDI_ICON1)));
-
-  ShowWindow(hwnd,SW_SHOWNORMAL);
-
-  return(hwnd);
-}
-
-
-
-//
-// Dispatch pending windows events
-//
-void DispatchEvents(void)
-{
-  MSG msg;
-  int counter=0;
-  while(PeekMessage(&msg,NULL,0,0, PM_REMOVE))
-  {
-    TranslateMessage(&msg);
-    DispatchMessage(&msg);
-	 counter++;
-	 if (counter==256)  // just in case
-	   break;
-  }
-}
-
-//
-// Check for patches
-//
-int main(int argc, char *argv[])
-{
-	InitCommonControls();
-
-	/*
-  g_PrimaryWindow=CreatePrimaryWin();  // Create the main window
-  DispatchEvents();  // process some win messages 
-	*/
-
-/*
-  // Check if they've registered before, if not ask them if they want to
-  bool have_registered=false;
-  if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,REGISTER_REG_KEY,0,KEY_READ,&rKey)==ERROR_SUCCESS)
-  {
-    char username[64];
-    valuesize=sizeof(username);
-    if (RegQueryValueEx(rKey,"UserName",NULL,&type,(uint8 *)username,&valuesize)==ERROR_SUCCESS)
-      have_registered=true;
-    RegCloseKey(rKey);
-  }
-  if (!have_registered)
-  {
-    if (RegOpenKeyEx(HKEY_CLASSES_ROOT,NICK_REG_KEY,0,KEY_READ,&rKey)==ERROR_SUCCESS)
-    {
-      have_registered=true;
-      RegCloseKey(rKey);
-    }
-  }
-
-  if (!have_registered)
-  {
-    if (MessageBox(NULL,Fetch_String(TXT_REGNOW),Fetch_String(TXT_TITLE),MB_YESNO)==IDNO)
-      have_registered=true;  // pretend they've alredy registered
-  }
-
-  if (!have_registered)
-  {
-    // figure out where the registration app is installed & launch it, continue
-    //    after it exits.
-    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,REGISTER_REG_APP,0,KEY_READ,&rKey)==ERROR_SUCCESS)
-    {
-      char regapp[300];
-      valuesize=sizeof(regapp);
-      if ((RegQueryValueEx(rKey,"InstallPath",NULL,&type,(uint8 *)regapp,&valuesize)==ERROR_SUCCESS)&&
-             (strlen(regapp) > 8))
-      {
-        // Launch the process
-        SHELLEXECUTEINFO info;
-        memset(&info,0,sizeof(info));
-        info.cbSize=sizeof(info);
-        info.fMask=SEE_MASK_NOCLOSEPROCESS;
-        info.hwnd=g_PrimaryWindow;
-        info.lpVerb=NULL;
-        info.lpFile=regapp;
-        info.lpParameters=NULL;
-        info.lpDirectory=".";
-        info.nShow=SW_SHOW;
-        ShellExecuteEx(&info);
-
-        // Can't wait infinite or the other process will never create its window
-        //   Only Bill himself knows why this is happening
-        while(1)  // Wait for completion
-        {
-          DispatchEvents();
-          if (WaitForSingleObject(info.hProcess,500)!=WAIT_TIMEOUT)
-            break;
-        }
-      }
-      RegCloseKey(rKey);
-    }
-  }
-  // OK, done with that crap go on to the task at hand now....
-*/
-
-
-  // Find the game version
-  g_AppVer = -1;
-	if (!GetUnsignedIntFromRegistry("", "Version", g_AppVer))
-	{
-    MessageBox(g_PrimaryWindow,Fetch_String(TXT_INSTALL_PROBLEM),Fetch_String(TXT_ERROR),MB_OK);
-    exit(0);
-	}
-  // OK, have the current game version now
-
-  g_PrimaryWindow=CreatePrimaryWin();  // Create the main window
-  DispatchEvents();  // process some win messages 
-
-  // Popup the "contacting" window
-  g_ContactWindow=CreateDialog(Global_instance,MAKEINTRESOURCE(IDD_CONNECTING),g_PrimaryWindow,Simple_Dialog_Proc);
-  ShowWindow(g_ContactWindow,SW_SHOWNORMAL);
-  SetForegroundWindow(g_ContactWindow);
-  DispatchEvents();  // process some win messages
-
-
-  // Setup the Westwood Online stuff
-  Startup_Chat();
-
-  Update_If_Required();
-
-  Shutdown_Chat();
-
-  return(0);
-}
-
-
-typedef struct SRecord {
-	int ID;						// ID number of the string resource.
-	int TimeStamp;				// 'Time' that this string was last requested.
-	char String[2048];			// Copy of string resource.
-
-	SRecord(void) : ID(-1), TimeStamp(-1) {}
-} SRecord;
-
-
-/***********************************************************************************************
- * Fetch_String -- Fetches a string resource.                                                  *
- *                                                                                             *
- *    Fetches a string resource and returns a pointer to its text.                             *
- *                                                                                             *
- * INPUT:   id -- The ID number of the string resource to fetch.                               *
- *                                                                                             *
- * OUTPUT:  Returns with a pointer to the actual text of the string resource.                  *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/25/1996 JLB : Created.                                                                 *
- *=============================================================================================*/
-char const * Fetch_String(int id)
-{
-	static SRecord _buffers[64];
-	static int _time = 0;
-
-	/*
-	**	Determine if the string ID requested is valid. If not then return an empty string pointer.
-	*/
-	if (id == -1 || id == TXT_NONE) return("");
-
-	/*
-	**	Adjust the 'time stamp' tracking value. This is an artificial value used merely to track
-	**	the relative age of the strings requested.
-	*/
-	_time = _time+1;
-
-	/*
-	**	Check to see if the requested string has already been fetched into a buffer. If so, then
-	**	return a pointer to that string (update the time stamp as well).
-	*/
-	for (int index = 0; index < ARRAY_SIZE(_buffers); index++) {
-		if (_buffers[index].ID == id) {
-			_buffers[index].TimeStamp = _time;
-			return(_buffers[index].String);
-		}
-	}
-
-	/*
-	**	Find a suitable buffer to hold the string to be fetched. The buffer should either be
-	**	empty or have the oldest fetched string.
-	*/
-	int oldest = -1;
-	int oldtime = -1;
-	for (int text = 0; text < ARRAY_SIZE(_buffers); text++) {
-		if (oldest == -1 || oldtime > _buffers[text].TimeStamp) {
-			oldest = text;
-			oldtime = _buffers[text].TimeStamp;
-			if (oldtime == -1 || _buffers[text].ID == -1) break;
-		}
-	}
-
-	/*
-	**	A suitable buffer has been found so fetch the string resource and then return a pointer
-	**	to the string.
-	*/
-	char * stringptr = _buffers[oldest].String;
-	_buffers[oldest].ID = id;
-	_buffers[oldest].TimeStamp = _time;
-
-   
-	if (LoadString(Global_instance, id, stringptr, sizeof(_buffers[oldest].String)) == 0) {
-		return("");
-	}
-   
-   /******
-   char resname[32];
-   sprintf(resname,"#%d",id);
-   HMODULE hmod=GetModuleHandle(NULL);
-   HRSRC hrsrc=FindResourceEx(hmod, RT_STRING, MAKEINTRESOURCE(id), LANGID);
-   if (hrsrc==0)
-   {
-     char message_buffer[256];
-	  FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), &message_buffer[0], 256, NULL );
-     
-   }
-   HGLOBAL resdata=LoadResource(NULL,hrsrc);
-   LPVOID vdata=LockResource(resdata);
-   strcpy(stringptr,(char *)vdata);
-   *********/
-
-	stringptr[sizeof(_buffers[oldest].String)-1] = '\0';
-	return(stringptr);
-}
-
-
-
-
-void LogMsg(const char *msg)
-{
-#ifdef RTS_DEBUG
-  FILE *out=fopen("register.log","a");
-  fprintf(out,"%s\n",msg);
-  fflush(out);
-  fclose(out);
-#endif
-}
-
-
-
-
-void Startup_Chat(void)
-{
-	/*
-  //////CComObject<CChatEventSink>* g_pChatSink;
-  HRESULT          hRes;
-  g_pChatSink=NULL;
-
-  CoCreateInstance(CLSID_Chat, NULL, CLSCTX_INPROC_SERVER,
-      IID_IChat, (void**)&pChat);
-
-
-  if (pChat==NULL)
-  {
-    char error[128];
-    char apimissing[256];
-  	 LoadString(Global_instance, TXT_API_MISSING, apimissing, sizeof(apimissing));
-	 LoadString(Global_instance, TXT_ERROR, error, sizeof(error));
-    MessageBox(g_PrimaryWindow,apimissing,error,MB_OK);
-    exit(-5);
-  }
-
-  g_pChatSink=new CChatEventSink;
-
-  // Get a connection point from the chat class
-  IConnectionPoint           *pConnectionPoint=NULL;
-  IConnectionPointContainer  *pContainer=NULL;
-
-  dwChatAdvise=0;
-  hRes=pChat->QueryInterface(IID_IConnectionPointContainer,(void**)&pContainer);
-  _ASSERTE(SUCCEEDED(hRes));
-  hRes=pContainer->FindConnectionPoint(IID_IChatEvent,&pConnectionPoint);
-  _ASSERTE(SUCCEEDED(hRes));
-  hRes=pConnectionPoint->Advise((IChatEvent *)g_pChatSink,&dwChatAdvise);
-  _ASSERTE(SUCCEEDED(hRes));
-
-
-  pChat->SetAttributeValue("RegPath",APP_REG_KEY);
-
-  // ADD pConnectionPoint->Release();
-	*/
-}
-
-void Shutdown_Chat(void)
-{
-	/*
-    /////AtlUnadvise(pChat, IID_IChatEvent, dwChatAdvise);
-
-    IConnectionPoint           *pConnectionPoint=NULL;
-    IConnectionPointContainer  *pContainer=NULL;
-    HRESULT                     hRes;
-
-    hRes=pChat->QueryInterface(IID_IConnectionPointContainer,(void**)&pContainer);
-    _ASSERTE(SUCCEEDED(hRes));
-    hRes=pContainer->FindConnectionPoint(IID_IChatEvent,&pConnectionPoint);
-    _ASSERTE(SUCCEEDED(hRes));
-    pConnectionPoint->Unadvise(dwChatAdvise);
-
-    pChat->Release();
-
-    /////delete(g_pChatSink);   This appears to be bad....
-    // ADD g_pChatSink->Release();
-    // ADD pConnectionPoint->Release();
-    // ADD pContainer->Release();
-		*/
-}
-
-
-
-//
-// Download a patch for the registration client if required
-//   This uses the chat API for ver checking and FTP.
-//
-void Update_If_Required(void)
-{
-  int   retval;
-  int   i;
-  // Create the events
-  for (i=0; i<NUM_EVENTS; i++)
-    Events[i]=CreateEvent(NULL,FALSE,FALSE,NULL);
-
-	StartPatchCheck();
-
-	while (1)
-	{
-		ghttpThink();
-    MSG msg;
-    while(PeekMessage(&msg,NULL,0,0, PM_REMOVE))
-    {
-      TranslateMessage(&msg);
-      DispatchMessage(&msg);
-    }
-    retval=WaitForMultipleObjectsEx(NUM_EVENTS,Events,FALSE,50,FALSE);
-    if (retval==WAIT_TIMEOUT)
-      continue;
-    //DBGMSG("An event was set");
-    retval-=WAIT_OBJECT_0;
-    break;
-  }
-
-  //DBGMSG("Out of the loop")
-
-  if (retval==ABORT_EVENT)
-  {
-     exit(0);
-  }
-  else
-  {
-    //DBGMSG("NO update required");
-  }
-
-  //DBGMSG("Shutting down");
-
-  // close all the event objects
-  for (i=0; i<NUM_EVENTS; i++)
-    CloseHandle(Events[i]);
-
-	/*
-  Startup_Chat();
-  int   retval;
-  int   i;
-
-
-  // Create the events
-  for (i=0; i<NUM_EVENTS; i++)
-    Events[i]=CreateEvent(NULL,FALSE,FALSE,NULL);
-
-  /// For Testing....
-  ///pChat->RequestServerList(1000,262364,"register","regpas98",15);
-  ///pChat->RequestServerList(1000,300,"register","regpas98",15);
-
-  pChat->RequestServerList(g_AppSku,g_AppVer,"register","regpas98",40);
-
-  while(1)
-  {
-    pChat->PumpMessages();
-    MSG msg;
-    while(PeekMessage(&msg,NULL,0,0, PM_REMOVE))
-    {
-      TranslateMessage(&msg);
-      DispatchMessage(&msg);
-    }
-    retval=WaitForMultipleObjectsEx(NUM_EVENTS,Events,FALSE,50,FALSE);
-    if (retval==WAIT_TIMEOUT)
-      continue;
-    //DBGMSG("An event was set");
-    retval-=WAIT_OBJECT_0;
-    break;
-  }
-
-  //DBGMSG("Out of the loop")
-
-  if (retval==ABORT_EVENT)
-  {
-     exit(0);
-  }
-  else
-  {
-    //DBGMSG("NO update required");
-  }
-
-  //DBGMSG("Shutting down");
-
-  // close all the event objects
-  for (i=0; i<NUM_EVENTS; i++)
-    CloseHandle(Events[i]);
-
-  Shutdown_Chat();
-	*/
-}
-
-
-
-
-
-
-/*
-CChatEventSink::CChatEventSink()
-{
-  m_cRef=0;  // init the refrence count
-}
-
-
-///////////////////////////////////////////////////////////
-//
-//			Interface IUnknown Methods
-//
-///////////////////////////////////////////////////////////
-//
-// QueryInterface
-//
-HRESULT __stdcall
-CChatEventSink::QueryInterface(const IID& iid, void** ppv)
-{
-	if ((iid == IID_IUnknown) ||(iid == IID_IChatEvent))
-	{
-		*ppv = static_cast<IChatEvent*>(this) ;
-	}
-	else
-	{
-		*ppv = NULL;
-		return E_NOINTERFACE;
-	}
-	(reinterpret_cast<IUnknown*>(*ppv))->AddRef() ;
-	return S_OK ;
-}
-
-///////////////////////////////////////////////////////////
-//
-// AddRef
-//
-ULONG __stdcall
-CChatEventSink::AddRef()
-{
-	return InterlockedIncrement(&m_cRef) ;
-}
-
-///////////////////////////////////////////////////////////
-//
-// Release
-//
-ULONG __stdcall
-CChatEventSink::Release()
-{
-   if (InterlockedDecrement(&m_cRef) == 0)
-	{
-		delete this ;
-      return 0 ;
-	}
-	return m_cRef;
-}
-
-
-
-
-
-///// DOWNLOAD
-
-CDownloadEventSink::CDownloadEventSink()
-{
-  m_cRef=0;   // Ref counter
-}
-
-///////////////////////////////////////////////////////////
-//
-//			Interface IUnknown Methods
-//
-///////////////////////////////////////////////////////////
-//
-// QueryInterface
-//
-HRESULT __stdcall
-CDownloadEventSink::QueryInterface(const IID& iid, void** ppv)
-{
-	if ((iid == IID_IUnknown) ||(iid == IID_IDownloadEvent))
-	{
-		*ppv = static_cast<IDownloadEvent*>(this) ;
-	}
-	else
-	{
-		*ppv = NULL;
-		return E_NOINTERFACE;
-	}
-	(reinterpret_cast<IUnknown*>(*ppv))->AddRef() ;
-	return S_OK ;
-}
-
-///////////////////////////////////////////////////////////
-//
-// AddRef
-//
-ULONG __stdcall
-CDownloadEventSink::AddRef()
-{
-	return InterlockedIncrement(&m_cRef) ;
-}
-
-///////////////////////////////////////////////////////////
-//
-// Release
-//
-ULONG __stdcall
-CDownloadEventSink::Release()
-{
-   if (InterlockedDecrement(&m_cRef) == 0)
-	{
-		delete this ;
-      return 0 ;
-	}
-	return m_cRef;
-}
-
-*/
-
-
-
-
-
-
-//// FTP Download stuff
-
-
-void SetupDownload( void )
-{
-	/*
-  HRESULT              hRes;
-
-  g_pDownloadSink=NULL;
-
-  CoCreateInstance(CLSID_Download, NULL, CLSCTX_INPROC_SERVER,
-      IID_IDownload, (void**)&pDownload);
-  _ASSERTE(pDownload);
-  g_pDownloadSink=new CDownloadEventSink;
-
-  // Get a connection point from the chat class
-  IConnectionPoint           *pConnectionPoint=NULL;
-  IConnectionPointContainer  *pContainer=NULL;
-  dwDownloadAdvise = 0;
-
-  hRes=pDownload->QueryInterface(IID_IConnectionPointContainer,(void**)&pContainer);
-  _ASSERTE(SUCCEEDED(hRes));
-  hRes=pContainer->FindConnectionPoint(IID_IDownloadEvent,&pConnectionPoint);
-  _ASSERTE(SUCCEEDED(hRes));
-  hRes=pConnectionPoint->Advise((IDownloadEvent *)g_pDownloadSink,&dwDownloadAdvise);
-  _ASSERTE(SUCCEEDED(hRes));
-	*/
-}
-
-
-
-void ClosedownDownload( void )
-{
-/*
-  // AtlUnadvise(pDownload, IID_IDownloadEvent, dwDownloadAdvise);
-
-  IConnectionPoint           *pConnectionPoint=NULL;
-  IConnectionPointContainer  *pContainer=NULL;
-  HRESULT                     hRes;
-
-  hRes=pDownload->QueryInterface(IID_IConnectionPointContainer,(void**)&pContainer);
-  _ASSERTE(SUCCEEDED(hRes));
-  hRes=pContainer->FindConnectionPoint(IID_IDownloadEvent,&pConnectionPoint);
-  _ASSERTE(SUCCEEDED(hRes));
-  pConnectionPoint->Unadvise(dwDownloadAdvise);
-
-	pDownload->Release();
-
-   //////delete(g_pDownloadSink);  This appears to be bad....
-*/
-}
-
-
-
-BOOL CALLBACK Download_Dialog_Proc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
-{
-//	char    fullpath[ 256 ];
-//   char    localfile[ 256];
-//   HRESULT res;
-
-	switch( uMsg )
-	{
-		case WM_COMMAND:
-			switch( LOWORD( wParam ) )
-			{
-				case IDC_DLABORT:
-            {
-
-               char abort[128];
-               char abortdload[256];
-  	            LoadString(Global_instance, TXT_ABORT_DOWNLOAD, abortdload, sizeof(abortdload));
-               LoadString(Global_instance, TXT_ABORT, abort, sizeof(abort));
-
-               if (MessageBox(g_PrimaryWindow,abortdload,abort,MB_YESNO)==IDYES)
-               {
-/*
-					  pDownload->Abort();
-*/
-                 EndDialog( hwndDlg, g_Finished );
-					  DestroyWindow(hwndDlg);
-               }
-            }
-            break;
-
-				default:
-					return FALSE;
-			}
-			break;
-
-		case WM_INITDIALOG:
-			SetupDownload();
-
-         SendMessage(hwndDlg, WM_SETICON,(WPARAM)ICON_SMALL,
-           (LPARAM)LoadIcon(Global_instance, MAKEINTRESOURCE(IDI_ICON1)));
-
-         g_DLTimeRem[0]=0;
-         g_DLBytesLeft[0]=0;
-         g_DLBPS[0]=0;
-
-			//SetDlgItemText( hwndDlg, IDC_DOWNLOADTITLE, g_UpdateString);
-         //SetWindowText(hwndDlg, g_UpdateString);
-
-         SetDlgItemText( hwndDlg, IDC_TIMEREM, g_DLTimeRem);
-         SetDlgItemText( hwndDlg, IDC_BYTESLEFT, g_DLBytesLeft);
-         // SetDlgItemText( hwndDlg, IDC_BPS, g_DLBPS );
-
-/*
-         // Work out the full file name
-         sprintf( fullpath, "%s/%s", g_Update->patchpath,g_Update->patchfile);
-         sprintf(localfile,"%s\\%s",g_Update->localpath,g_Update->patchfile);
-
-         // Create the directory
-         CreateDirectory((char *)g_Update->localpath, NULL );
-
-         res=pDownload->DownloadFile((char *)g_Update->server, (char *)g_Update->login, (char *)g_Update->password,
-            fullpath, localfile, APP_REG_KEY);
-
-*/
-			g_DownloadWindow = hwndDlg;
-			g_Finished = 0;
-			SetTimer( hwndDlg, 1, 200, NULL );    // was 50
-
-			break;
-
-		case WM_TIMER:
-      LogMsg("TIMER");
-			if( g_Finished == 0 )
-			{
-            LogMsg("Entering PumpMsgs");
-/*
-				pDownload->PumpMessages();
-*/
-            LogMsg("Done with PumpMsgs");
-            if (strlen(g_DLTimeRem))
-              SetDlgItemText( hwndDlg, IDC_TIMEREM, g_DLTimeRem );
-            if (strlen(g_DLBytesLeft))
-              SetDlgItemText( hwndDlg, IDC_BYTESLEFT, g_DLBytesLeft );
-            //if (strlen(g_DLBPS))
-            //  SetDlgItemText( hwndDlg, IDC_BPS, g_DLBPS );
-			}
-			else
-			{
-            LogMsg("TIMER: Finished");
-            EndDialog( hwndDlg, g_Finished );
-				DestroyWindow( hwndDlg );
-			}
-			break;
-
-		case WM_DESTROY:
-			KillTimer( hwndDlg, 1 );
-			ClosedownDownload();
-
-         //DBGMSG("WM_DESTROY");
-			break;
-
-		case WM_SETFONT:
-			return TRUE;
-
-		default:
-			return FALSE;
-	}
-	return TRUE;
-}
-
-
-
-// Whoeee this is an exciting one...
-BOOL CALLBACK Simple_Dialog_Proc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
-{
-  switch( uMsg )
-  {
-    case WM_INITDIALOG:
-      return(TRUE);
-    break;
-    case WM_CLOSE:
-      DestroyWindow(hwnd);
-      PostQuitMessage(0);
-      exit(0);
-    break;
-  }
-  return(FALSE);
-}
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CDownloadEventSink
-//////////////////////////////////////////////////////////////////////////////
-
-/*
-
-STDMETHODIMP CDownloadEventSink::OnEnd(void)
-{
-  LogMsg("Finished!");
-  g_Finished = 1;
-  return(S_OK);
-}
-
-STDMETHODIMP CDownloadEventSink::OnError(int error)
-{
-  LogMsg("ERROR");
-  g_Finished = -1;
-  return(S_OK);
-}
-
-
-STDMETHODIMP CDownloadEventSink::OnProgressUpdate(int bytesread, int totalsize,
-  int timetaken, int timeleft)
-{
-  SendDlgItemMessage( g_DownloadWindow, IDC_PROGRESS, PBM_SETPOS, (WPARAM)(bytesread * 100) / totalsize, 0 );
-  char temp[256];
-
-  if( timeleft > 0 )
-  {
-    //DBGMSG("Bytes read: "<<bytesread<<".    Time left: "<<timeleft<<" seconds");
- 	 LoadString(Global_instance, TXT_TIME_REMAIN, temp, sizeof(temp));
-    sprintf(g_DLTimeRem,temp,(timeleft/60),(timeleft%60));
-
-    LoadString(Global_instance, TXT_BPS, temp, sizeof(temp));
-    sprintf(g_DLBPS,temp,bytesread/timetaken);
-  }
-  LoadString(Global_instance, TXT_BYTES_READ, temp, sizeof(temp));
-  sprintf(g_DLBytesLeft,temp,bytesread,totalsize);
-
-  return(S_OK);
-}
-
-
-STDMETHODIMP CDownloadEventSink::OnStatusUpdate(int status)
-{
-  switch( status )
-  {
-    case DOWNLOADSTATUS_CONNECTING:
-    {
-	  //LogMsg( "Connecting..." );
-     SetWindowText(g_DownloadWindow, Fetch_String(TXT_CONNECTING));
-    }
-    break;
-
-    case DOWNLOADSTATUS_FINDINGFILE:
-	  //LogMsg( "Finding patch..." );
-     SetWindowText(g_DownloadWindow, g_UpdateString);
-    break;
-
-    case DOWNLOADSTATUS_DOWNLOADING:
-	  //LogMsg( "Downloading patch..." );
-     SetWindowText(g_DownloadWindow, g_UpdateString);
-    break;
-
-    default:
-     //LogMsg("Unknown status update!");
-    break;
-  }
-  return(S_OK);
-}
-
-//
-// Just tell the FTP module to go ahead and resume
-//
-STDMETHODIMP CDownloadEventSink::OnQueryResume(void)
-{
-  return(DOWNLOADEVENT_RESUME);
-}
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CChatEventSink
-//////////////////////////////////////////////////////////////////////////////
-
-
-STDMETHODIMP CChatEventSink::OnServerList(HRESULT res, Server* servers)
-{
-  // If we get this, then we don't need to patch
-  // Close that contacting window
-  DestroyWindow(g_ContactWindow);
-  g_ContactWindow=NULL;
-
-  LogMsg("Server List");
-
-  MessageBox(g_PrimaryWindow,Fetch_String(TXT_NO_PATCHES),Fetch_String(TXT_AUTO_UPDATE),MB_OK);
-
-  SetEvent(Events[NOUPDATE_EVENT]);
-  return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnServerBannedYou(HRESULT, time_t)
-{
- return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnPageSend(HRESULT)
-{
-  return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnPaged(HRESULT, User *, LPCSTR)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnFind(HRESULT, Channel *)
-{
-  return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnLogout(HRESULT, User *)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnBusy(HRESULT)
-{
-  return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnIdle(HRESULT)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnConnection(HRESULT, LPCSTR)
-{
-  return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnUserFlags(HRESULT,LPCSTR,unsigned int, unsigned int)
-{
- return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnChannelCreate(HRESULT, Channel *)
-{
-  return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnChannelModify(HRESULT, Channel *)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnChannelJoin(HRESULT, Channel *, User *)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnChannelLeave(HRESULT, Channel *, User *)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnChannelTopic(HRESULT, Channel *, LPCSTR)
-{
-  return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnChannelBan(HRESULT,  LPCSTR, int)
-{
- return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnGroupList(HRESULT, Group *)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnPublicMessage(HRESULT, Channel *, User *, LPCSTR)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnPrivateMessage(HRESULT, User *,LPCSTR)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnSystemMessage(HRESULT, LPCSTR)
-{
-  return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnUserLocale(long, struct User *)
-{
-   return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnUserTeam(long, struct User *)
-{
-   return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnSetLocale(long, enum Locale)
-{
-   return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnSetTeam(long, int)
-{
-   return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnNetStatus(HRESULT hr)
-{
-  char string[60];
-  sprintf(string,"NetStatus %ld",hr);
-  LogMsg(string);
-
-  if ((hr==CHAT_E_CON_NETDOWN)||(hr==CHAT_E_CON_LOOKUP_FAILED)||
-    (hr==CHAT_E_CON_ERROR)||(hr==CHAT_E_TIMEOUT))
-  {
-    char error[128];
-    char cantconn[256];
-  	 LoadString(Global_instance, TXT_CANT_CONTACT, cantconn, sizeof(cantconn));
-	 LoadString(Global_instance, TXT_ERROR, error, sizeof(error));
-    MessageBox(g_PrimaryWindow,cantconn,error,MB_OK);
-    exit(-1);
-  }
-
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnChannelList(HRESULT, Channel*)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnUserList(HRESULT, Channel*, User*)
-{
-  return(S_OK);
-}
-
-
-
-//
-// We got a list of updates to apply
-//
-STDMETHODIMP CChatEventSink::OnUpdateList(HRESULT r, Update * updates)
-{
-  Update     *tmp;
-  int         numupdates=0;
-  int         i=0;
-  int         retval;
-
-  static int  alreadyGotOne=0;
-
-  LogMsg("Update list");
-
-  // Close that contacting window
-  DestroyWindow(g_ContactWindow);
-  g_ContactWindow=NULL;
-
-  if( FAILED(r) )
-  {
-    LogMsg("Failed");
-    SetEvent(Events[ABORT_EVENT]);   // An error occurred, bail out
-  }
-
-  if( updates == NULL )  // shouldn't happen
-	return S_OK;
-
-
-  if (alreadyGotOne)  // Should only get one update list
-    return(S_OK);
-  alreadyGotOne=1;
-
-
-  // Count the updates;
-  tmp = updates;
-  while( tmp != NULL )
-  {
-    tmp = tmp->next;
-    numupdates++;
-  }
-
-  // Got a list of updates - If an update is required, the user must either
-  //   patch or quit.
-
-  tmp = updates;
-
-  LogMsg("Found an update");
-
-  // We have a required update
-
-  char upreq[256];
-  char title[128];
-
-  LoadString(Global_instance, TXT_AN_UPGRADE_AVAILABLE, upreq, sizeof(upreq));
-  strcat(upreq,"\n");
-  LoadString(Global_instance, TXT_DOWNLOAD_NOW, upreq+strlen(upreq), sizeof(upreq));
-  LoadString(Global_instance, TXT_UPGRADE_AVAILABLE, title, sizeof(title));
-
-  if( MessageBox(g_PrimaryWindow,upreq,title, MB_YESNO ) == IDNO )
-  {
-    // If they don't want to patch now, just exit...
-    //DBGMSG("Must patch to continue, so exit");
-    exit(0);
-  }
-
-  // Do the downloads
-  while( tmp != NULL )
-  {
-    g_Update = tmp;
-
-    char dloading[256];
-  	 LoadString(Global_instance, TXT_DOWNLOADING_FILE, dloading, sizeof(dloading));
-    sprintf( g_UpdateString, dloading, ++i, numupdates );
-
-    LogMsg("Creating Download dialog box");
-    //if( (retval=DialogBox(Global_instance, MAKEINTRESOURCE(IDD_DOWNLOAD_DIALOG), g_PrimaryWindow,
-    //    (DLGPROC)Download_Dialog_Proc)) != 1 )
-
-    retval=DialogBox(Global_instance, MAKEINTRESOURCE(IDD_DOWNLOAD_DIALOG), g_PrimaryWindow,(DLGPROC)Download_Dialog_Proc);
-
-    if (g_Finished != 1)
-    {
-      // Download failed
-      //DBGMSG("Download failed: "<<retval);
-      SetEvent(Events[ABORT_EVENT]);
-      return(E_FAIL);
-    }
-    tmp = tmp->next;
-  }
-  // Quit so the launcher can apply the patches
-  exit(0);
-  return(S_OK);  // make silly compiler happy
-}
-
-
-
-
-
-
-STDMETHODIMP CChatEventSink::OnServerError(HRESULT, LPCSTR)
-{
-  LogMsg("Server Error");
-  return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnMessageOfTheDay(HRESULT, LPCSTR)
-{
-  return(S_OK);
-}
-
-
-
-STDMETHODIMP CChatEventSink::OnPrivateAction(HRESULT, User *,  LPCSTR)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnPublicAction(HRESULT, Channel *, User *,  LPCSTR)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnPrivateGameOptions(HRESULT, User *,  LPCSTR)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnPublicGameOptions(HRESULT, Channel *, User *,  LPCSTR)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnGameStart(HRESULT, Channel *, User *,  int)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnUserKick(HRESULT, Channel *, User *,  User *)
-{
-  return(S_OK);
-}
-
-
-STDMETHODIMP CChatEventSink::OnUserIP(HRESULT, User *)
-{
-  return(S_OK);
-}
-
-STDMETHODIMP CChatEventSink::OnSquadInfo(HRESULT, unsigned long, Squad *)
-{
-  return(S_OK);
-}
-
-*/
-
-} // namespace patchget
diff --git a/Core/Tools/PATCHGET/CHATAPI.H b/Core/Tools/PATCHGET/CHATAPI.H
deleted file mode 100644
index bcb549fe6c0..00000000000
--- a/Core/Tools/PATCHGET/CHATAPI.H
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CHATAPI_HEADER
-#define CHATAPI_HEADER
-
-#include "COMINIT.H"
-#include <stdio.h>
-#include <windows.h>
-#include <commctrl.h>
-#include <winerror.h>
-#include <ocidl.h>
-#include <olectl.h>
-
-/**********************************************************************
-**	This macro serves as a general way to determine the number of elements
-**	within an array.
-*/
-#define	ARRAY_SIZE(x)		int(sizeof(x)/sizeof(x[0]))
-#define size_of(typ,id) sizeof(((typ*)0)->id)
-
-namespace patchget
-{
-
-int main(int argc, char *argv[]);
-
-void Startup_Chat(void);
-void Shutdown_Chat(void);
-void Update_If_Required(void);
-
-char const * Fetch_String(int id);
-
-} // namespace patchget
-
-#endif
diff --git a/Core/Tools/PATCHGET/CHATAPI.cpp b/Core/Tools/PATCHGET/CHATAPI.cpp
new file mode 100644
index 00000000000..bba0c3902d3
--- /dev/null
+++ b/Core/Tools/PATCHGET/CHATAPI.cpp
@@ -0,0 +1,1808 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+//
+// This module takes care of all the Chat API stuff
+//
+
+#include <list>
+#include "gamespy/ghttp/ghttp.h"
+#include "DownloadManager.h"
+
+#include "CHATAPI.h"
+
+//#include "api/wolapi_i.c"  // This should only be in one .cpp file
+#include <objbase.h>
+#include <windows.h>
+#include <initguid.h>
+#include <olectl.h>
+#if defined(_MSC_VER) && _MSC_VER < 1300
+#include <mapicode.h>
+#endif
+#include "RESOURCE.h"
+#include "WINBLOWS.h"
+#include <crtdbg.h>
+#include "process.h"
+#include "WWDownload/Registry.h"
+#include "WWDownload/urlBuilder.h"
+#include "debug.h"
+
+namespace patchget
+{
+
+enum EVENT_TYPES
+{
+  NOUPDATE_EVENT=0,    // don't need to update
+  ABORT_EVENT,
+
+  NUM_EVENTS
+};
+
+#if RTS_GENERALS
+#define GAME_NAME	"Command and Conquer Generals"
+#elif RTS_ZEROHOUR
+#define GAME_NAME	"Command & Conquer"
+#endif
+
+HANDLE       Events[NUM_EVENTS];
+
+char         g_UpdateString[256];   // for the filename
+char         g_DLTimeRem[80];
+char         g_DLBytesLeft[80];
+char         g_DLBPS[80];
+
+int          g_Finished=0;
+
+
+HWND         g_DownloadWindow;
+HWND         g_ContactWindow;
+HWND         g_PrimaryWindow;
+
+static bool checkingForPatch = false;
+static int checksLeft = 0;
+static bool cantConnect = false;
+static std::list<QueuedDownload> queuedDownloads;
+
+BOOL CALLBACK downloadDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam,
+    LPARAM lParam );
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static void startOnline( void );
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+QueuedDownload TheDownload;
+
+class DownloadManagerMunkee : public DownloadManager
+{
+public:
+	DownloadManagerMunkee() { }
+	virtual HRESULT OnError( int error );
+	virtual HRESULT OnEnd();
+	virtual HRESULT OnProgressUpdate( int bytesread, int totalsize, int timetaken, int timeleft );
+	virtual HRESULT OnStatusUpdate( int status );
+	virtual HRESULT downloadFile( std::string server, std::string username, std::string password, std::string file, std::string localfile, std::string regkey, bool tryResume );
+};
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+HRESULT DownloadManagerMunkee::downloadFile( std::string server, std::string username, std::string password, std::string file, std::string localfile, std::string regkey, bool tryResume )
+{
+	/*
+	if (staticTextFile)
+	{
+		UnicodeString fileString;
+		fileString.translate(file);
+		GadgetStaticTextSetText(staticTextFile, fileString);
+	}
+	*/
+	return DownloadManager::downloadFile( server, username, password, file, localfile, regkey, tryResume );
+}
+HRESULT DownloadManagerMunkee::OnError( int error )
+{
+	HRESULT ret = DownloadManager::OnError( error );
+  g_Finished = -1;
+	return ret;
+}
+HRESULT DownloadManagerMunkee::OnEnd()
+{
+	HRESULT ret = DownloadManager::OnEnd();
+  g_Finished = 1;
+	return ret;
+}
+HRESULT DownloadManagerMunkee::OnProgressUpdate( int bytesread, int totalsize, int timetaken, int timeleft )
+{
+	HRESULT ret = DownloadManager::OnProgressUpdate( bytesread, totalsize, timetaken, timeleft );
+
+  SendDlgItemMessage( g_DownloadWindow, IDC_PROGRESS, PBM_SETPOS, (WPARAM)(bytesread * 100) / totalsize, 0 );
+  char temp[256];
+
+  if( timeleft > 0 )
+  {
+    //DBGMSG("Bytes read: "<<bytesread<<".    Time left: "<<timeleft<<" seconds");
+ 	 LoadString(Global_instance, TXT_TIME_REMAIN, temp, sizeof(temp));
+    sprintf(g_DLTimeRem,temp,(timeleft/60),(timeleft%60));
+
+    LoadString(Global_instance, TXT_BPS, temp, sizeof(temp));
+    sprintf(g_DLBPS,temp,bytesread/timetaken);
+  }
+  LoadString(Global_instance, TXT_BYTES_READ, temp, sizeof(temp));
+  sprintf(g_DLBytesLeft,temp,bytesread,totalsize);
+	return ret;
+}
+HRESULT DownloadManagerMunkee::OnStatusUpdate( int status )
+{
+	HRESULT ret = DownloadManager::OnStatusUpdate( status );
+	SetWindowText(g_DownloadWindow, getStatusString().c_str());
+	return ret;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+BOOL CALLBACK simpleDialogProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
+{
+  switch( uMsg )
+  {
+    case WM_INITDIALOG:
+      return(TRUE);
+    break;
+    case WM_CLOSE:
+      DestroyWindow(hwnd);
+      PostQuitMessage(0);
+      exit(0);
+    break;
+  }
+  return(FALSE);
+}
+
+static void startOnline( void )
+{
+	checkingForPatch = false;
+
+  // Close that contacting window
+  DestroyWindow(g_ContactWindow);
+  g_ContactWindow=NULL;
+
+	if (cantConnect)
+	{
+		MessageBox(NULL, "Can't Connect", GAME_NAME, MB_OK);
+		exit(0);
+	}
+	else if (queuedDownloads.size())
+	{
+		if (MessageBox(NULL, "Patches Available.  Download?", GAME_NAME, MB_YESNO) == IDYES)
+		{
+			DEBUG_LOG(("Downloading patches"));
+			while (queuedDownloads.size())
+			{
+				TheDownload = queuedDownloads.front();
+				queuedDownloads.pop_front();
+				TheDownloadManager = new DownloadManagerMunkee;
+				/**/
+		    int retVal = DialogBox(Global_instance, MAKEINTRESOURCE(IDD_DOWNLOAD_DIALOG), g_PrimaryWindow, downloadDialogProc);
+				if (retVal)
+				{
+					DEBUG_LOG(("Error %d", GetLastError()));
+				}
+				/**/
+				/*
+				{
+					//char *res = MAKEINTRESOURCE(IDD_CONNECTING);
+					char *res = MAKEINTRESOURCE(IDD_DOWNLOAD_DIALOG1);
+					g_DownloadWindow=CreateDialog(Global_instance,res,g_PrimaryWindow,simpleDialogProc);
+					ShowWindow(g_DownloadWindow,SW_SHOWNORMAL);
+					SetForegroundWindow(g_DownloadWindow);
+				}
+				*/
+				delete TheDownloadManager;
+				TheDownloadManager = NULL;
+
+				if (g_Finished != 1)
+				{
+					// Download failed
+					//DBGMSG("Download failed: "<<retval);
+					SetEvent(Events[ABORT_EVENT]);
+					return;
+				}
+			}
+			exit(0);
+		}
+		else
+		{
+			exit(0);
+		}
+	}
+	else
+	{
+		MessageBox(NULL, "No Patches Available", GAME_NAME, MB_OK);
+		exit(0);
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static std::string trim(std::string s, const std::string& delim)
+{
+	unsigned int i;
+	i = s.find_first_not_of(delim);
+	if (i != s.npos)
+	{
+		s = s.substr(i);
+	}
+
+	i = s.find_last_not_of(delim);
+	if (i>=0 && i<s.npos)
+	{
+		s = s.substr(0, i+1);
+	}
+
+	return s;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static std::string getNextLine(std::string in, std::string& remainder)
+{
+	int lineEnd;
+	lineEnd = in.find_first_of("\n\r", 0);
+	if (lineEnd < 1)
+	{
+		remainder = "";
+		return in;
+	}
+
+	std::string out = in.substr(0, lineEnd);
+	remainder = in.substr(lineEnd+1);
+
+	remainder = trim(remainder, "\r\n\t ");
+	out = trim(out, "\r\t\n ");
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+//-----------------------------------------------------------------------------
+inline const char* skipSeps(const char* p, const char* seps)
+{
+	while (*p && strchr(seps, *p) != NULL)
+		++p;
+	return p;
+}
+
+//-----------------------------------------------------------------------------
+inline const char* skipNonSeps(const char* p, const char* seps)
+{
+	while (*p && strchr(seps, *p) == NULL)
+		++p;
+	return p;
+}
+
+//-----------------------------------------------------------------------------
+bool nextToken(std::string& base, std::string& tok, const char* seps = NULL)
+{
+	if (base.empty())
+		return false;
+
+	if (seps == NULL)
+		seps = " \n\r\t";
+
+	const char* start = skipSeps(base.c_str(), seps);
+	const char* end = skipNonSeps(start, seps);
+
+	if (end > start)
+	{
+		int len = end - start;
+		char* tmp = new char[len+1];
+		memcpy(tmp, start, len);
+		tmp[len] = 0;
+
+		tok = tmp;
+		delete[] tmp;
+
+		base = end;
+
+		return true;
+	}
+	else
+	{
+		base = tok = "";
+		return false;
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static void queuePatch(bool mandatory, std::string downloadURL)
+{
+	// downloadURL is of the form "ftp://ftp.ea.com:user@pass/pub/munkee/bananna.rtp"
+	QueuedDownload q;
+	bool success = true;
+
+	std::string connectionType;
+	success = success && nextToken(downloadURL, connectionType, ":");
+
+	std::string server;
+	success = success && nextToken(downloadURL, server, ":/");
+
+	std::string user;
+	success = success && nextToken(downloadURL, user, ":@");
+
+	std::string pass;
+	success = success && nextToken(downloadURL, pass, "@/");
+
+	std::string filePath;
+	success = success && nextToken(downloadURL, filePath, "");
+
+	if (!success && !user.empty())
+	{
+		// no user/pass combo - move the file into it's proper place
+		filePath = user;
+		user = ""; // LFeenanEA - Credentials removed as per Security requirements
+		pass = "";
+		success = true;
+	}
+
+	std::string fileStr = filePath;
+	unsigned int slashPos = filePath.find_last_of('/');
+	std::string fileDir = "patches\\";
+	std::string fileName;
+	if (slashPos == filePath.npos)
+	{
+		fileName = filePath;
+	}
+	else
+	{
+		fileName = filePath.substr(slashPos+1);
+	}
+	fileDir.append(fileName);
+
+	DEBUG_LOG(("download URL split: %d [%s] [%s] [%s] [%s] [%s] [%s] [%s]",
+		success, connectionType.c_str(), server.c_str(), user.c_str(), pass.c_str(),
+		filePath.c_str(), fileName.c_str(), fileDir.c_str()));
+
+	if (!success)
+		return;
+
+	q.file = filePath;
+	q.localFile = fileDir;
+	q.password = pass;
+	q.regKey = "";
+	q.server = server;
+	q.tryResume = true;
+	q.userName = user;
+
+	std::list<QueuedDownload>::iterator it = queuedDownloads.begin();
+	while (it != queuedDownloads.end())
+	{
+		if (it->localFile == q.localFile)
+			return; // don't add it if it exists already (because we can check multiple times)
+		++it;
+	}
+
+	queuedDownloads.push_back(q);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static GHTTPBool patchCheckCallback( GHTTPRequest request, GHTTPResult result, char * buffer, GHTTPByteCount bufferLen, void * param )
+{
+	--checksLeft;
+	DEBUG_ASSERTCRASH(checksLeft>=0, ("Too many callbacks"));
+
+	DEBUG_LOG(("Result=%d, buffer=[%s], len=%d", result, buffer, bufferLen));
+	if (result != GHTTPSuccess)
+	{
+		cantConnect = true;
+		if (!checksLeft)
+		{
+			startOnline();
+		}
+		return GHTTPTrue;
+	}
+
+	std::string message = buffer;
+	std::string line;
+	while (nextToken(message, line, "\r\n"))
+	{
+		std::string type, req, url;
+		bool ok = true;
+		ok = ok && nextToken(line, type, " ");
+		ok = ok && nextToken(line, req, " ");
+		ok = ok && nextToken(line, url, " ");
+		if (ok && type == "patch")
+		{
+			DEBUG_LOG(("Saw a patch: %d/[%s]", atoi(req.c_str()), url.c_str()));
+			queuePatch( atoi(req.c_str()), url );
+		}
+		else if (ok && type == "server")
+		{
+		}
+	}
+
+	if (!checksLeft)
+	{
+		startOnline();
+	}
+
+	return GHTTPTrue;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+static void StartPatchCheck( void )
+{
+	checkingForPatch = true;
+	std::string gameURL, mapURL;
+	std::string configURL, motdURL;
+
+	FormatURLFromRegistry(gameURL, mapURL, configURL, motdURL);
+
+	std::string proxy;
+	if (GetStringFromRegistry("", "Proxy", proxy))
+	{
+		if (!proxy.empty())
+		{
+			ghttpSetProxy(proxy.c_str());
+		}
+	}
+
+	// check for a patch first
+	checksLeft = 2;
+	cantConnect = false;
+	ghttpGet(gameURL.c_str(), GHTTPFalse, patchCheckCallback, NULL);
+	ghttpGet(mapURL.c_str(), GHTTPFalse, patchCheckCallback, NULL);
+
+	DEBUG_LOG(("Started looking for patches at '%s' && '%s'", gameURL.c_str(), mapURL.c_str()));
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+
+BOOL CALLBACK downloadDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
+{
+	//   HRESULT res;
+
+	int cmd = LOWORD(wParam);
+	switch( uMsg )
+	{
+		case WM_COMMAND:
+			if ( cmd == IDC_DLABORT )
+			{
+
+				char abort[128];
+				char abortdload[256];
+				LoadString(Global_instance, TXT_ABORT_DOWNLOAD, abortdload, sizeof(abortdload));
+				LoadString(Global_instance, TXT_ABORT, abort, sizeof(abort));
+
+				if (MessageBox(g_PrimaryWindow,abortdload,abort,MB_YESNO)==IDYES)
+				{
+					TheDownloadManager->reset();
+
+					EndDialog( hwndDlg, g_Finished );
+					DestroyWindow(hwndDlg);
+				}
+			}
+			else
+			{
+				return FALSE;
+			}
+			break;
+
+		case WM_INITDIALOG:
+			//SetupDownload();
+
+			SendMessage(hwndDlg, WM_SETICON,(WPARAM)ICON_SMALL,
+				(LPARAM)LoadIcon(Global_instance, MAKEINTRESOURCE(IDI_ICON1)));
+
+			g_DLTimeRem[0]=0;
+			g_DLBytesLeft[0]=0;
+			g_DLBPS[0]=0;
+
+			//SetDlgItemText( hwndDlg, IDC_DOWNLOADTITLE, g_UpdateString);
+			//SetWindowText(hwndDlg, g_UpdateString);
+
+			SetDlgItemText( hwndDlg, IDC_TIMEREM, g_DLTimeRem);
+			SetDlgItemText( hwndDlg, IDC_BYTESLEFT, g_DLBytesLeft);
+			// SetDlgItemText( hwndDlg, IDC_BPS, g_DLBPS );
+
+			// Work out the full file name
+			//char    fullpath[_MAX_PATH];
+			//char    localfile[_MAX_PATH];
+			//sprintf( fullpath, "%s/%s", g_Update->patchpath,g_Update->patchfile);
+			//sprintf(localfile,"%s\\%s",g_Update->localpath,g_Update->patchfile);
+
+			// Create the directory
+			//CreateDirectory((char *)g_Update->localpath, NULL );
+
+			TheDownloadManager->downloadFile(TheDownload.server, TheDownload.userName, TheDownload.password,
+				TheDownload.file, TheDownload.localFile, TheDownload.regKey, TheDownload.tryResume);
+				/*
+				res=pDownload->DownloadFile((char *)g_Update->server, (char *)g_Update->login, (char *)g_Update->password,
+				fullpath, localfile, APP_REG_KEY);
+
+			*/
+			g_DownloadWindow = hwndDlg;
+			g_Finished = 0;
+			SetTimer( hwndDlg, 1, 200, NULL );    // was 50
+
+			break;
+
+		case WM_TIMER:
+			DEBUG_LOG(("TIMER"));
+			if( g_Finished == 0 )
+			{
+				DEBUG_LOG(("Entering PumpMsgs"));
+				TheDownloadManager->update();
+				/*
+				pDownload->PumpMessages();
+				*/
+				DEBUG_LOG(("Done with PumpMsgs"));
+				if (strlen(g_DLTimeRem))
+					SetDlgItemText( hwndDlg, IDC_TIMEREM, g_DLTimeRem );
+				if (strlen(g_DLBytesLeft))
+					SetDlgItemText( hwndDlg, IDC_BYTESLEFT, g_DLBytesLeft );
+				//if (strlen(g_DLBPS))
+				//  SetDlgItemText( hwndDlg, IDC_BPS, g_DLBPS );
+			}
+			else
+			{
+				DEBUG_LOG(("TIMER: Finished"));
+				EndDialog( hwndDlg, g_Finished );
+				DestroyWindow( hwndDlg );
+			}
+			break;
+
+		case WM_DESTROY:
+			KillTimer( hwndDlg, 1 );
+			//ClosedownDownload();
+
+			//DBGMSG("WM_DESTROY");
+			break;
+
+		case WM_SETFONT:
+			return TRUE;
+
+		default:
+			return FALSE;
+	}
+	return TRUE;
+}
+
+
+
+DWORD        dwChatAdvise;
+DWORD        dwDownloadAdvise;
+
+//Update      *g_Update;
+
+uint32       g_AppVer=-1;
+
+
+BOOL CALLBACK Download_Dialog_Proc( HWND hwndDlg, UINT uMsg, WPARAM wParam,
+    LPARAM lParam );
+
+BOOL CALLBACK Simple_Dialog_Proc( HWND hwndDlg, UINT uMsg, WPARAM wParam,
+    LPARAM lParam );
+
+HWND CreatePrimaryWin(void);
+
+char const * Fetch_String(int id);
+
+
+//
+// Create a primary window
+//
+HWND CreatePrimaryWin(void)
+{
+  HWND                hwnd;
+  WNDCLASS            wc;
+  char                name[256];
+
+  sprintf(name,Fetch_String(TXT_TITLE));
+
+  //DBGMSG("CreatePrimary: "<<name);
+
+  /*
+  ** set up and register window class
+  */
+  wc.style = CS_HREDRAW | CS_VREDRAW;
+  wc.lpfnWndProc = DefWindowProc;
+  wc.cbClsExtra = 0;            // Don't need any extra class data
+  wc.cbWndExtra = 0;            // No extra win data
+  wc.hInstance = Global_instance;
+  wc.hIcon=LoadIcon(Global_instance, MAKEINTRESOURCE(IDI_ICON1));
+  wc.hCursor = NULL;  /////////LoadCursor( NULL, IDC_ARROW );
+  wc.hbrBackground = NULL;
+  wc.lpszMenuName = name;
+  wc.lpszClassName = name;
+  RegisterClass( &wc );
+
+  /*
+  ** create a window
+  */
+  hwnd = CreateWindowEx(
+      WS_EX_APPWINDOW,
+      name,
+      name,
+      WS_POPUP,
+      0, 0,
+
+      //GetSystemMetrics( SM_CXSCREEN ),
+      //GetSystemMetrics( SM_CYSCREEN ),
+      0,0,
+
+      NULL,
+      NULL,
+      Global_instance,
+      NULL );
+
+  SendMessage(hwnd,WM_SETICON,(WPARAM)ICON_SMALL,
+      (LPARAM)LoadIcon(Global_instance, MAKEINTRESOURCE(IDI_ICON1)));
+
+  ShowWindow(hwnd,SW_SHOWNORMAL);
+
+  return(hwnd);
+}
+
+
+
+//
+// Dispatch pending windows events
+//
+void DispatchEvents(void)
+{
+  MSG msg;
+  int counter=0;
+  while(PeekMessage(&msg,NULL,0,0, PM_REMOVE))
+  {
+    TranslateMessage(&msg);
+    DispatchMessage(&msg);
+	 counter++;
+	 if (counter==256)  // just in case
+	   break;
+  }
+}
+
+//
+// Check for patches
+//
+int main(int argc, char *argv[])
+{
+	InitCommonControls();
+
+	/*
+  g_PrimaryWindow=CreatePrimaryWin();  // Create the main window
+  DispatchEvents();  // process some win messages
+	*/
+
+/*
+  // Check if they've registered before, if not ask them if they want to
+  bool have_registered=false;
+  if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,REGISTER_REG_KEY,0,KEY_READ,&rKey)==ERROR_SUCCESS)
+  {
+    char username[64];
+    valuesize=sizeof(username);
+    if (RegQueryValueEx(rKey,"UserName",NULL,&type,(uint8 *)username,&valuesize)==ERROR_SUCCESS)
+      have_registered=true;
+    RegCloseKey(rKey);
+  }
+  if (!have_registered)
+  {
+    if (RegOpenKeyEx(HKEY_CLASSES_ROOT,NICK_REG_KEY,0,KEY_READ,&rKey)==ERROR_SUCCESS)
+    {
+      have_registered=true;
+      RegCloseKey(rKey);
+    }
+  }
+
+  if (!have_registered)
+  {
+    if (MessageBox(NULL,Fetch_String(TXT_REGNOW),Fetch_String(TXT_TITLE),MB_YESNO)==IDNO)
+      have_registered=true;  // pretend they've alredy registered
+  }
+
+  if (!have_registered)
+  {
+    // figure out where the registration app is installed & launch it, continue
+    //    after it exits.
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,REGISTER_REG_APP,0,KEY_READ,&rKey)==ERROR_SUCCESS)
+    {
+      char regapp[300];
+      valuesize=sizeof(regapp);
+      if ((RegQueryValueEx(rKey,"InstallPath",NULL,&type,(uint8 *)regapp,&valuesize)==ERROR_SUCCESS)&&
+             (strlen(regapp) > 8))
+      {
+        // Launch the process
+        SHELLEXECUTEINFO info;
+        memset(&info,0,sizeof(info));
+        info.cbSize=sizeof(info);
+        info.fMask=SEE_MASK_NOCLOSEPROCESS;
+        info.hwnd=g_PrimaryWindow;
+        info.lpVerb=NULL;
+        info.lpFile=regapp;
+        info.lpParameters=NULL;
+        info.lpDirectory=".";
+        info.nShow=SW_SHOW;
+        ShellExecuteEx(&info);
+
+        // Can't wait infinite or the other process will never create its window
+        //   Only Bill himself knows why this is happening
+        while(1)  // Wait for completion
+        {
+          DispatchEvents();
+          if (WaitForSingleObject(info.hProcess,500)!=WAIT_TIMEOUT)
+            break;
+        }
+      }
+      RegCloseKey(rKey);
+    }
+  }
+  // OK, done with that crap go on to the task at hand now....
+*/
+
+
+  // Find the game version
+  g_AppVer = -1;
+	if (!GetUnsignedIntFromRegistry("", "Version", g_AppVer))
+	{
+    MessageBox(g_PrimaryWindow,Fetch_String(TXT_INSTALL_PROBLEM),Fetch_String(TXT_ERROR),MB_OK);
+    exit(0);
+	}
+  // OK, have the current game version now
+
+  g_PrimaryWindow=CreatePrimaryWin();  // Create the main window
+  DispatchEvents();  // process some win messages
+
+  // Popup the "contacting" window
+  g_ContactWindow=CreateDialog(Global_instance,MAKEINTRESOURCE(IDD_CONNECTING),g_PrimaryWindow,Simple_Dialog_Proc);
+  ShowWindow(g_ContactWindow,SW_SHOWNORMAL);
+  SetForegroundWindow(g_ContactWindow);
+  DispatchEvents();  // process some win messages
+
+
+  // Setup the Westwood Online stuff
+  Startup_Chat();
+
+  Update_If_Required();
+
+  Shutdown_Chat();
+
+  return(0);
+}
+
+
+typedef struct SRecord {
+	int ID;						// ID number of the string resource.
+	int TimeStamp;				// 'Time' that this string was last requested.
+	char String[2048];			// Copy of string resource.
+
+	SRecord(void) : ID(-1), TimeStamp(-1) {}
+} SRecord;
+
+
+/***********************************************************************************************
+ * Fetch_String -- Fetches a string resource.                                                  *
+ *                                                                                             *
+ *    Fetches a string resource and returns a pointer to its text.                             *
+ *                                                                                             *
+ * INPUT:   id -- The ID number of the string resource to fetch.                               *
+ *                                                                                             *
+ * OUTPUT:  Returns with a pointer to the actual text of the string resource.                  *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/25/1996 JLB : Created.                                                                 *
+ *=============================================================================================*/
+char const * Fetch_String(int id)
+{
+	static SRecord _buffers[64];
+	static int _time = 0;
+
+	/*
+	**	Determine if the string ID requested is valid. If not then return an empty string pointer.
+	*/
+	if (id == -1 || id == TXT_NONE) return "";
+
+	/*
+	**	Adjust the 'time stamp' tracking value. This is an artificial value used merely to track
+	**	the relative age of the strings requested.
+	*/
+	_time = _time+1;
+
+	/*
+	**	Check to see if the requested string has already been fetched into a buffer. If so, then
+	**	return a pointer to that string (update the time stamp as well).
+	*/
+	for (int index = 0; index < ARRAY_SIZE(_buffers); index++) {
+		if (_buffers[index].ID == id) {
+			_buffers[index].TimeStamp = _time;
+			return(_buffers[index].String);
+		}
+	}
+
+	/*
+	**	Find a suitable buffer to hold the string to be fetched. The buffer should either be
+	**	empty or have the oldest fetched string.
+	*/
+	int oldest = -1;
+	int oldtime = -1;
+	for (int text = 0; text < ARRAY_SIZE(_buffers); text++) {
+		if (oldest == -1 || oldtime > _buffers[text].TimeStamp) {
+			oldest = text;
+			oldtime = _buffers[text].TimeStamp;
+			if (oldtime == -1 || _buffers[text].ID == -1) break;
+		}
+	}
+
+	/*
+	**	A suitable buffer has been found so fetch the string resource and then return a pointer
+	**	to the string.
+	*/
+	char * stringptr = _buffers[oldest].String;
+	_buffers[oldest].ID = id;
+	_buffers[oldest].TimeStamp = _time;
+
+
+	if (LoadString(Global_instance, id, stringptr, sizeof(_buffers[oldest].String)) == 0) {
+		return "";
+	}
+
+   /******
+   char resname[32];
+   sprintf(resname,"#%d",id);
+   HMODULE hmod=GetModuleHandle(NULL);
+   HRSRC hrsrc=FindResourceEx(hmod, RT_STRING, MAKEINTRESOURCE(id), LANGID);
+   if (hrsrc==0)
+   {
+     char message_buffer[256];
+	  FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), &message_buffer[0], 256, NULL );
+
+   }
+   HGLOBAL resdata=LoadResource(NULL,hrsrc);
+   LPVOID vdata=LockResource(resdata);
+   strcpy(stringptr,(char *)vdata);
+   *********/
+
+	stringptr[sizeof(_buffers[oldest].String)-1] = '\0';
+	return(stringptr);
+}
+
+
+
+
+void LogMsg(const char *msg)
+{
+#ifdef RTS_DEBUG
+  FILE *out=fopen("register.log","a");
+  fprintf(out,"%s\n",msg);
+  fflush(out);
+  fclose(out);
+#endif
+}
+
+
+
+
+void Startup_Chat(void)
+{
+	/*
+  //////CComObject<CChatEventSink>* g_pChatSink;
+  HRESULT          hRes;
+  g_pChatSink=NULL;
+
+  CoCreateInstance(CLSID_Chat, NULL, CLSCTX_INPROC_SERVER,
+      IID_IChat, (void**)&pChat);
+
+
+  if (pChat==NULL)
+  {
+    char error[128];
+    char apimissing[256];
+  	 LoadString(Global_instance, TXT_API_MISSING, apimissing, sizeof(apimissing));
+	 LoadString(Global_instance, TXT_ERROR, error, sizeof(error));
+    MessageBox(g_PrimaryWindow,apimissing,error,MB_OK);
+    exit(-5);
+  }
+
+  g_pChatSink=new CChatEventSink;
+
+  // Get a connection point from the chat class
+  IConnectionPoint           *pConnectionPoint=NULL;
+  IConnectionPointContainer  *pContainer=NULL;
+
+  dwChatAdvise=0;
+  hRes=pChat->QueryInterface(IID_IConnectionPointContainer,(void**)&pContainer);
+  _ASSERTE(SUCCEEDED(hRes));
+  hRes=pContainer->FindConnectionPoint(IID_IChatEvent,&pConnectionPoint);
+  _ASSERTE(SUCCEEDED(hRes));
+  hRes=pConnectionPoint->Advise((IChatEvent *)g_pChatSink,&dwChatAdvise);
+  _ASSERTE(SUCCEEDED(hRes));
+
+
+  pChat->SetAttributeValue("RegPath",APP_REG_KEY);
+
+  // ADD pConnectionPoint->Release();
+	*/
+}
+
+void Shutdown_Chat(void)
+{
+	/*
+    /////AtlUnadvise(pChat, IID_IChatEvent, dwChatAdvise);
+
+    IConnectionPoint           *pConnectionPoint=NULL;
+    IConnectionPointContainer  *pContainer=NULL;
+    HRESULT                     hRes;
+
+    hRes=pChat->QueryInterface(IID_IConnectionPointContainer,(void**)&pContainer);
+    _ASSERTE(SUCCEEDED(hRes));
+    hRes=pContainer->FindConnectionPoint(IID_IChatEvent,&pConnectionPoint);
+    _ASSERTE(SUCCEEDED(hRes));
+    pConnectionPoint->Unadvise(dwChatAdvise);
+
+    pChat->Release();
+
+    /////delete(g_pChatSink);   This appears to be bad....
+    // ADD g_pChatSink->Release();
+    // ADD pConnectionPoint->Release();
+    // ADD pContainer->Release();
+		*/
+}
+
+
+
+//
+// Download a patch for the registration client if required
+//   This uses the chat API for ver checking and FTP.
+//
+void Update_If_Required(void)
+{
+  int   retval;
+  int   i;
+  // Create the events
+  for (i=0; i<NUM_EVENTS; i++)
+    Events[i]=CreateEvent(NULL,FALSE,FALSE,NULL);
+
+	StartPatchCheck();
+
+	while (1)
+	{
+		ghttpThink();
+    MSG msg;
+    while(PeekMessage(&msg,NULL,0,0, PM_REMOVE))
+    {
+      TranslateMessage(&msg);
+      DispatchMessage(&msg);
+    }
+    retval=WaitForMultipleObjectsEx(NUM_EVENTS,Events,FALSE,50,FALSE);
+    if (retval==WAIT_TIMEOUT)
+      continue;
+    //DBGMSG("An event was set");
+    retval-=WAIT_OBJECT_0;
+    break;
+  }
+
+  //DBGMSG("Out of the loop")
+
+  if (retval==ABORT_EVENT)
+  {
+     exit(0);
+  }
+  else
+  {
+    //DBGMSG("NO update required");
+  }
+
+  //DBGMSG("Shutting down");
+
+  // close all the event objects
+  for (i=0; i<NUM_EVENTS; i++)
+    CloseHandle(Events[i]);
+
+	/*
+  Startup_Chat();
+  int   retval;
+  int   i;
+
+
+  // Create the events
+  for (i=0; i<NUM_EVENTS; i++)
+    Events[i]=CreateEvent(NULL,FALSE,FALSE,NULL);
+
+  /// For Testing....
+  ///pChat->RequestServerList(1000,262364,"register","regpas98",15);
+  ///pChat->RequestServerList(1000,300,"register","regpas98",15);
+
+  pChat->RequestServerList(g_AppSku,g_AppVer,"register","regpas98",40);
+
+  while(1)
+  {
+    pChat->PumpMessages();
+    MSG msg;
+    while(PeekMessage(&msg,NULL,0,0, PM_REMOVE))
+    {
+      TranslateMessage(&msg);
+      DispatchMessage(&msg);
+    }
+    retval=WaitForMultipleObjectsEx(NUM_EVENTS,Events,FALSE,50,FALSE);
+    if (retval==WAIT_TIMEOUT)
+      continue;
+    //DBGMSG("An event was set");
+    retval-=WAIT_OBJECT_0;
+    break;
+  }
+
+  //DBGMSG("Out of the loop")
+
+  if (retval==ABORT_EVENT)
+  {
+     exit(0);
+  }
+  else
+  {
+    //DBGMSG("NO update required");
+  }
+
+  //DBGMSG("Shutting down");
+
+  // close all the event objects
+  for (i=0; i<NUM_EVENTS; i++)
+    CloseHandle(Events[i]);
+
+  Shutdown_Chat();
+	*/
+}
+
+
+
+
+
+
+/*
+CChatEventSink::CChatEventSink()
+{
+  m_cRef=0;  // init the refrence count
+}
+
+
+///////////////////////////////////////////////////////////
+//
+//			Interface IUnknown Methods
+//
+///////////////////////////////////////////////////////////
+//
+// QueryInterface
+//
+HRESULT __stdcall
+CChatEventSink::QueryInterface(const IID& iid, void** ppv)
+{
+	if ((iid == IID_IUnknown) ||(iid == IID_IChatEvent))
+	{
+		*ppv = static_cast<IChatEvent*>(this) ;
+	}
+	else
+	{
+		*ppv = NULL;
+		return E_NOINTERFACE;
+	}
+	(reinterpret_cast<IUnknown*>(*ppv))->AddRef() ;
+	return S_OK ;
+}
+
+///////////////////////////////////////////////////////////
+//
+// AddRef
+//
+ULONG __stdcall
+CChatEventSink::AddRef()
+{
+	return InterlockedIncrement(&m_cRef) ;
+}
+
+///////////////////////////////////////////////////////////
+//
+// Release
+//
+ULONG __stdcall
+CChatEventSink::Release()
+{
+   if (InterlockedDecrement(&m_cRef) == 0)
+	{
+		delete this ;
+      return 0 ;
+	}
+	return m_cRef;
+}
+
+
+
+
+
+///// DOWNLOAD
+
+CDownloadEventSink::CDownloadEventSink()
+{
+  m_cRef=0;   // Ref counter
+}
+
+///////////////////////////////////////////////////////////
+//
+//			Interface IUnknown Methods
+//
+///////////////////////////////////////////////////////////
+//
+// QueryInterface
+//
+HRESULT __stdcall
+CDownloadEventSink::QueryInterface(const IID& iid, void** ppv)
+{
+	if ((iid == IID_IUnknown) ||(iid == IID_IDownloadEvent))
+	{
+		*ppv = static_cast<IDownloadEvent*>(this) ;
+	}
+	else
+	{
+		*ppv = NULL;
+		return E_NOINTERFACE;
+	}
+	(reinterpret_cast<IUnknown*>(*ppv))->AddRef() ;
+	return S_OK ;
+}
+
+///////////////////////////////////////////////////////////
+//
+// AddRef
+//
+ULONG __stdcall
+CDownloadEventSink::AddRef()
+{
+	return InterlockedIncrement(&m_cRef) ;
+}
+
+///////////////////////////////////////////////////////////
+//
+// Release
+//
+ULONG __stdcall
+CDownloadEventSink::Release()
+{
+   if (InterlockedDecrement(&m_cRef) == 0)
+	{
+		delete this ;
+      return 0 ;
+	}
+	return m_cRef;
+}
+
+*/
+
+
+
+
+
+
+//// FTP Download stuff
+
+
+void SetupDownload( void )
+{
+	/*
+  HRESULT              hRes;
+
+  g_pDownloadSink=NULL;
+
+  CoCreateInstance(CLSID_Download, NULL, CLSCTX_INPROC_SERVER,
+      IID_IDownload, (void**)&pDownload);
+  _ASSERTE(pDownload);
+  g_pDownloadSink=new CDownloadEventSink;
+
+  // Get a connection point from the chat class
+  IConnectionPoint           *pConnectionPoint=NULL;
+  IConnectionPointContainer  *pContainer=NULL;
+  dwDownloadAdvise = 0;
+
+  hRes=pDownload->QueryInterface(IID_IConnectionPointContainer,(void**)&pContainer);
+  _ASSERTE(SUCCEEDED(hRes));
+  hRes=pContainer->FindConnectionPoint(IID_IDownloadEvent,&pConnectionPoint);
+  _ASSERTE(SUCCEEDED(hRes));
+  hRes=pConnectionPoint->Advise((IDownloadEvent *)g_pDownloadSink,&dwDownloadAdvise);
+  _ASSERTE(SUCCEEDED(hRes));
+	*/
+}
+
+
+
+void ClosedownDownload( void )
+{
+/*
+  // AtlUnadvise(pDownload, IID_IDownloadEvent, dwDownloadAdvise);
+
+  IConnectionPoint           *pConnectionPoint=NULL;
+  IConnectionPointContainer  *pContainer=NULL;
+  HRESULT                     hRes;
+
+  hRes=pDownload->QueryInterface(IID_IConnectionPointContainer,(void**)&pContainer);
+  _ASSERTE(SUCCEEDED(hRes));
+  hRes=pContainer->FindConnectionPoint(IID_IDownloadEvent,&pConnectionPoint);
+  _ASSERTE(SUCCEEDED(hRes));
+  pConnectionPoint->Unadvise(dwDownloadAdvise);
+
+	pDownload->Release();
+
+   //////delete(g_pDownloadSink);  This appears to be bad....
+*/
+}
+
+
+
+BOOL CALLBACK Download_Dialog_Proc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
+{
+//	char    fullpath[ 256 ];
+//   char    localfile[ 256];
+//   HRESULT res;
+
+	switch( uMsg )
+	{
+		case WM_COMMAND:
+			switch( LOWORD( wParam ) )
+			{
+				case IDC_DLABORT:
+            {
+
+               char abort[128];
+               char abortdload[256];
+  	            LoadString(Global_instance, TXT_ABORT_DOWNLOAD, abortdload, sizeof(abortdload));
+               LoadString(Global_instance, TXT_ABORT, abort, sizeof(abort));
+
+               if (MessageBox(g_PrimaryWindow,abortdload,abort,MB_YESNO)==IDYES)
+               {
+/*
+					  pDownload->Abort();
+*/
+                 EndDialog( hwndDlg, g_Finished );
+					  DestroyWindow(hwndDlg);
+               }
+            }
+            break;
+
+				default:
+					return FALSE;
+			}
+			break;
+
+		case WM_INITDIALOG:
+			SetupDownload();
+
+         SendMessage(hwndDlg, WM_SETICON,(WPARAM)ICON_SMALL,
+           (LPARAM)LoadIcon(Global_instance, MAKEINTRESOURCE(IDI_ICON1)));
+
+         g_DLTimeRem[0]=0;
+         g_DLBytesLeft[0]=0;
+         g_DLBPS[0]=0;
+
+			//SetDlgItemText( hwndDlg, IDC_DOWNLOADTITLE, g_UpdateString);
+         //SetWindowText(hwndDlg, g_UpdateString);
+
+         SetDlgItemText( hwndDlg, IDC_TIMEREM, g_DLTimeRem);
+         SetDlgItemText( hwndDlg, IDC_BYTESLEFT, g_DLBytesLeft);
+         // SetDlgItemText( hwndDlg, IDC_BPS, g_DLBPS );
+
+/*
+         // Work out the full file name
+         sprintf( fullpath, "%s/%s", g_Update->patchpath,g_Update->patchfile);
+         sprintf(localfile,"%s\\%s",g_Update->localpath,g_Update->patchfile);
+
+         // Create the directory
+         CreateDirectory((char *)g_Update->localpath, NULL );
+
+         res=pDownload->DownloadFile((char *)g_Update->server, (char *)g_Update->login, (char *)g_Update->password,
+            fullpath, localfile, APP_REG_KEY);
+
+*/
+			g_DownloadWindow = hwndDlg;
+			g_Finished = 0;
+			SetTimer( hwndDlg, 1, 200, NULL );    // was 50
+
+			break;
+
+		case WM_TIMER:
+      LogMsg("TIMER");
+			if( g_Finished == 0 )
+			{
+            LogMsg("Entering PumpMsgs");
+/*
+				pDownload->PumpMessages();
+*/
+            LogMsg("Done with PumpMsgs");
+            if (strlen(g_DLTimeRem))
+              SetDlgItemText( hwndDlg, IDC_TIMEREM, g_DLTimeRem );
+            if (strlen(g_DLBytesLeft))
+              SetDlgItemText( hwndDlg, IDC_BYTESLEFT, g_DLBytesLeft );
+            //if (strlen(g_DLBPS))
+            //  SetDlgItemText( hwndDlg, IDC_BPS, g_DLBPS );
+			}
+			else
+			{
+            LogMsg("TIMER: Finished");
+            EndDialog( hwndDlg, g_Finished );
+				DestroyWindow( hwndDlg );
+			}
+			break;
+
+		case WM_DESTROY:
+			KillTimer( hwndDlg, 1 );
+			ClosedownDownload();
+
+         //DBGMSG("WM_DESTROY");
+			break;
+
+		case WM_SETFONT:
+			return TRUE;
+
+		default:
+			return FALSE;
+	}
+	return TRUE;
+}
+
+
+
+// Whoeee this is an exciting one...
+BOOL CALLBACK Simple_Dialog_Proc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
+{
+  switch( uMsg )
+  {
+    case WM_INITDIALOG:
+      return(TRUE);
+    break;
+    case WM_CLOSE:
+      DestroyWindow(hwnd);
+      PostQuitMessage(0);
+      exit(0);
+    break;
+  }
+  return(FALSE);
+}
+
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CDownloadEventSink
+//////////////////////////////////////////////////////////////////////////////
+
+/*
+
+STDMETHODIMP CDownloadEventSink::OnEnd(void)
+{
+  LogMsg("Finished!");
+  g_Finished = 1;
+  return(S_OK);
+}
+
+STDMETHODIMP CDownloadEventSink::OnError(int error)
+{
+  LogMsg("ERROR");
+  g_Finished = -1;
+  return(S_OK);
+}
+
+
+STDMETHODIMP CDownloadEventSink::OnProgressUpdate(int bytesread, int totalsize,
+  int timetaken, int timeleft)
+{
+  SendDlgItemMessage( g_DownloadWindow, IDC_PROGRESS, PBM_SETPOS, (WPARAM)(bytesread * 100) / totalsize, 0 );
+  char temp[256];
+
+  if( timeleft > 0 )
+  {
+    //DBGMSG("Bytes read: "<<bytesread<<".    Time left: "<<timeleft<<" seconds");
+ 	 LoadString(Global_instance, TXT_TIME_REMAIN, temp, sizeof(temp));
+    sprintf(g_DLTimeRem,temp,(timeleft/60),(timeleft%60));
+
+    LoadString(Global_instance, TXT_BPS, temp, sizeof(temp));
+    sprintf(g_DLBPS,temp,bytesread/timetaken);
+  }
+  LoadString(Global_instance, TXT_BYTES_READ, temp, sizeof(temp));
+  sprintf(g_DLBytesLeft,temp,bytesread,totalsize);
+
+  return(S_OK);
+}
+
+
+STDMETHODIMP CDownloadEventSink::OnStatusUpdate(int status)
+{
+  switch( status )
+  {
+    case DOWNLOADSTATUS_CONNECTING:
+    {
+	  //LogMsg( "Connecting..." );
+     SetWindowText(g_DownloadWindow, Fetch_String(TXT_CONNECTING));
+    }
+    break;
+
+    case DOWNLOADSTATUS_FINDINGFILE:
+	  //LogMsg( "Finding patch..." );
+     SetWindowText(g_DownloadWindow, g_UpdateString);
+    break;
+
+    case DOWNLOADSTATUS_DOWNLOADING:
+	  //LogMsg( "Downloading patch..." );
+     SetWindowText(g_DownloadWindow, g_UpdateString);
+    break;
+
+    default:
+     //LogMsg("Unknown status update!");
+    break;
+  }
+  return(S_OK);
+}
+
+//
+// Just tell the FTP module to go ahead and resume
+//
+STDMETHODIMP CDownloadEventSink::OnQueryResume(void)
+{
+  return(DOWNLOADEVENT_RESUME);
+}
+
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CChatEventSink
+//////////////////////////////////////////////////////////////////////////////
+
+
+STDMETHODIMP CChatEventSink::OnServerList(HRESULT res, Server* servers)
+{
+  // If we get this, then we don't need to patch
+  // Close that contacting window
+  DestroyWindow(g_ContactWindow);
+  g_ContactWindow=NULL;
+
+  LogMsg("Server List");
+
+  MessageBox(g_PrimaryWindow,Fetch_String(TXT_NO_PATCHES),Fetch_String(TXT_AUTO_UPDATE),MB_OK);
+
+  SetEvent(Events[NOUPDATE_EVENT]);
+  return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnServerBannedYou(HRESULT, time_t)
+{
+ return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnPageSend(HRESULT)
+{
+  return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnPaged(HRESULT, User *, LPCSTR)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnFind(HRESULT, Channel *)
+{
+  return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnLogout(HRESULT, User *)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnBusy(HRESULT)
+{
+  return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnIdle(HRESULT)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnConnection(HRESULT, LPCSTR)
+{
+  return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnUserFlags(HRESULT,LPCSTR,unsigned int, unsigned int)
+{
+ return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnChannelCreate(HRESULT, Channel *)
+{
+  return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnChannelModify(HRESULT, Channel *)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnChannelJoin(HRESULT, Channel *, User *)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnChannelLeave(HRESULT, Channel *, User *)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnChannelTopic(HRESULT, Channel *, LPCSTR)
+{
+  return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnChannelBan(HRESULT,  LPCSTR, int)
+{
+ return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnGroupList(HRESULT, Group *)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnPublicMessage(HRESULT, Channel *, User *, LPCSTR)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnPrivateMessage(HRESULT, User *,LPCSTR)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnSystemMessage(HRESULT, LPCSTR)
+{
+  return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnUserLocale(long, struct User *)
+{
+   return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnUserTeam(long, struct User *)
+{
+   return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnSetLocale(long, enum Locale)
+{
+   return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnSetTeam(long, int)
+{
+   return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnNetStatus(HRESULT hr)
+{
+  char string[60];
+  sprintf(string,"NetStatus %ld",hr);
+  LogMsg(string);
+
+  if ((hr==CHAT_E_CON_NETDOWN)||(hr==CHAT_E_CON_LOOKUP_FAILED)||
+    (hr==CHAT_E_CON_ERROR)||(hr==CHAT_E_TIMEOUT))
+  {
+    char error[128];
+    char cantconn[256];
+  	 LoadString(Global_instance, TXT_CANT_CONTACT, cantconn, sizeof(cantconn));
+	 LoadString(Global_instance, TXT_ERROR, error, sizeof(error));
+    MessageBox(g_PrimaryWindow,cantconn,error,MB_OK);
+    exit(-1);
+  }
+
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnChannelList(HRESULT, Channel*)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnUserList(HRESULT, Channel*, User*)
+{
+  return(S_OK);
+}
+
+
+
+//
+// We got a list of updates to apply
+//
+STDMETHODIMP CChatEventSink::OnUpdateList(HRESULT r, Update * updates)
+{
+  Update     *tmp;
+  int         numupdates=0;
+  int         i=0;
+  int         retval;
+
+  static int  alreadyGotOne=0;
+
+  LogMsg("Update list");
+
+  // Close that contacting window
+  DestroyWindow(g_ContactWindow);
+  g_ContactWindow=NULL;
+
+  if( FAILED(r) )
+  {
+    LogMsg("Failed");
+    SetEvent(Events[ABORT_EVENT]);   // An error occurred, bail out
+  }
+
+  if( updates == NULL )  // shouldn't happen
+	return S_OK;
+
+
+  if (alreadyGotOne)  // Should only get one update list
+    return(S_OK);
+  alreadyGotOne=1;
+
+
+  // Count the updates;
+  tmp = updates;
+  while( tmp != NULL )
+  {
+    tmp = tmp->next;
+    numupdates++;
+  }
+
+  // Got a list of updates - If an update is required, the user must either
+  //   patch or quit.
+
+  tmp = updates;
+
+  LogMsg("Found an update");
+
+  // We have a required update
+
+  char upreq[256];
+  char title[128];
+
+  LoadString(Global_instance, TXT_AN_UPGRADE_AVAILABLE, upreq, sizeof(upreq));
+  strcat(upreq,"\n");
+  LoadString(Global_instance, TXT_DOWNLOAD_NOW, upreq+strlen(upreq), sizeof(upreq));
+  LoadString(Global_instance, TXT_UPGRADE_AVAILABLE, title, sizeof(title));
+
+  if( MessageBox(g_PrimaryWindow,upreq,title, MB_YESNO ) == IDNO )
+  {
+    // If they don't want to patch now, just exit...
+    //DBGMSG("Must patch to continue, so exit");
+    exit(0);
+  }
+
+  // Do the downloads
+  while( tmp != NULL )
+  {
+    g_Update = tmp;
+
+    char dloading[256];
+  	 LoadString(Global_instance, TXT_DOWNLOADING_FILE, dloading, sizeof(dloading));
+    sprintf( g_UpdateString, dloading, ++i, numupdates );
+
+    LogMsg("Creating Download dialog box");
+    //if( (retval=DialogBox(Global_instance, MAKEINTRESOURCE(IDD_DOWNLOAD_DIALOG), g_PrimaryWindow,
+    //    (DLGPROC)Download_Dialog_Proc)) != 1 )
+
+    retval=DialogBox(Global_instance, MAKEINTRESOURCE(IDD_DOWNLOAD_DIALOG), g_PrimaryWindow,(DLGPROC)Download_Dialog_Proc);
+
+    if (g_Finished != 1)
+    {
+      // Download failed
+      //DBGMSG("Download failed: "<<retval);
+      SetEvent(Events[ABORT_EVENT]);
+      return(E_FAIL);
+    }
+    tmp = tmp->next;
+  }
+  // Quit so the launcher can apply the patches
+  exit(0);
+  return(S_OK);  // make silly compiler happy
+}
+
+
+
+
+
+
+STDMETHODIMP CChatEventSink::OnServerError(HRESULT, LPCSTR)
+{
+  LogMsg("Server Error");
+  return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnMessageOfTheDay(HRESULT, LPCSTR)
+{
+  return(S_OK);
+}
+
+
+
+STDMETHODIMP CChatEventSink::OnPrivateAction(HRESULT, User *,  LPCSTR)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnPublicAction(HRESULT, Channel *, User *,  LPCSTR)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnPrivateGameOptions(HRESULT, User *,  LPCSTR)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnPublicGameOptions(HRESULT, Channel *, User *,  LPCSTR)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnGameStart(HRESULT, Channel *, User *,  int)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnUserKick(HRESULT, Channel *, User *,  User *)
+{
+  return(S_OK);
+}
+
+
+STDMETHODIMP CChatEventSink::OnUserIP(HRESULT, User *)
+{
+  return(S_OK);
+}
+
+STDMETHODIMP CChatEventSink::OnSquadInfo(HRESULT, unsigned long, Squad *)
+{
+  return(S_OK);
+}
+
+*/
+
+} // namespace patchget
diff --git a/Core/Tools/PATCHGET/CHATAPI.h b/Core/Tools/PATCHGET/CHATAPI.h
new file mode 100644
index 00000000000..7bc95bcc80d
--- /dev/null
+++ b/Core/Tools/PATCHGET/CHATAPI.h
@@ -0,0 +1,47 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "COMINIT.h"
+#include <stdio.h>
+#include <windows.h>
+#include <commctrl.h>
+#include <winerror.h>
+#include <ocidl.h>
+#include <olectl.h>
+
+/**********************************************************************
+**	This macro serves as a general way to determine the number of elements
+**	within an array.
+*/
+#define	ARRAY_SIZE(x)		int(sizeof(x)/sizeof(x[0]))
+#define size_of(typ,id) sizeof(((typ*)0)->id)
+
+namespace patchget
+{
+
+int main(int argc, char *argv[]);
+
+void Startup_Chat(void);
+void Shutdown_Chat(void);
+void Update_If_Required(void);
+
+char const * Fetch_String(int id);
+
+} // namespace patchget
diff --git a/Core/Tools/PATCHGET/CMakeLists.txt b/Core/Tools/PATCHGET/CMakeLists.txt
index 265a74c785b..bd271598c5f 100644
--- a/Core/Tools/PATCHGET/CMakeLists.txt
+++ b/Core/Tools/PATCHGET/CMakeLists.txt
@@ -1,20 +1,20 @@
 set(PATCHGET_SRC
-    "CHATAPI.CPP"
-    "CHATAPI.H"
-    "COMINIT.CPP"
-    "COMINIT.H"
+    "CHATAPI.cpp"
+    "CHATAPI.h"
+    "COMINIT.cpp"
+    "COMINIT.h"
     "debug.cpp"
     "debug.h"
     "DownloadManager.cpp"
     "DownloadManager.h"
-    "PROCESS.CPP"
-    "PROCESS.H"
+    "PROCESS.cpp"
+    "PROCESS.h"
     "registry.cpp"
     "Registry.h"
-    "RESOURCE.H"
-    "WINBLOWS.CPP"
-    "WINBLOWS.H"
-    "WSTYPES.H"
+    "RESOURCE.h"
+    "WINBLOWS.cpp"
+    "WINBLOWS.h"
+    "WSTYPES.h"
 )
 
 add_library(corei_patchgrabber INTERFACE)
@@ -25,7 +25,6 @@ target_link_libraries(corei_patchgrabber INTERFACE
     comctl32
     core_debug
     core_profile
-    dbghelplib
     gamespy::gamespy
     imm32
     vfw32
diff --git a/Core/Tools/PATCHGET/COMINIT.CPP b/Core/Tools/PATCHGET/COMINIT.CPP
deleted file mode 100644
index 27899ea6b63..00000000000
--- a/Core/Tools/PATCHGET/COMINIT.CPP
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-//
-// If you link with this it will automatically call the COM initialization stuff 
-//
-#include "COMINIT.H"
-#include <stdlib.h>
-#include <stdio.h>
-#include <windows.h>
-#include <objbase.h>
-
-namespace patchget
-{
-
-ComInit::ComInit()
-{
-  HRESULT hRes = CoInitialize(NULL);
-  if (SUCCEEDED(hRes)==FALSE)
-  {
-    MessageBox(NULL,"Can't initialize COM?!?!","Error:",MB_OK);
-    exit(0);
-  }
-}
-
-
-ComInit::~ComInit()
-{
-  CoUninitialize();
-}
-
-// Creating this instance will setup all COM stuff & do cleanup on program exit
-ComInit  Global_COM_Initializer;
-
-} // namespace patchget
diff --git a/Core/Tools/PATCHGET/COMINIT.H b/Core/Tools/PATCHGET/COMINIT.H
deleted file mode 100644
index 2836f791c31..00000000000
--- a/Core/Tools/PATCHGET/COMINIT.H
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef COMINIT_HEADER
-#define COMINIT_HEADER
-
-namespace patchget
-{
-
-//
-// Link with this to automatically initialize COM at startup
-//  - See cominit.cpp for more info
-//
-
-class ComInit
-{
- public:
-         ComInit();
-        ~ComInit();
-};
-
-} // namespace patchget
-
-#endif
diff --git a/Core/Tools/PATCHGET/COMINIT.cpp b/Core/Tools/PATCHGET/COMINIT.cpp
new file mode 100644
index 00000000000..73efff26d9c
--- /dev/null
+++ b/Core/Tools/PATCHGET/COMINIT.cpp
@@ -0,0 +1,50 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+//
+// If you link with this it will automatically call the COM initialization stuff
+//
+#include "COMINIT.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <windows.h>
+#include <objbase.h>
+
+namespace patchget
+{
+
+ComInit::ComInit()
+{
+  HRESULT hRes = CoInitialize(NULL);
+  if (SUCCEEDED(hRes)==FALSE)
+  {
+    MessageBox(NULL,"Can't initialize COM?!?!","Error:",MB_OK);
+    exit(0);
+  }
+}
+
+
+ComInit::~ComInit()
+{
+  CoUninitialize();
+}
+
+// Creating this instance will setup all COM stuff & do cleanup on program exit
+ComInit  Global_COM_Initializer;
+
+} // namespace patchget
diff --git a/Core/Tools/PATCHGET/COMINIT.h b/Core/Tools/PATCHGET/COMINIT.h
new file mode 100644
index 00000000000..c35f69a2de7
--- /dev/null
+++ b/Core/Tools/PATCHGET/COMINIT.h
@@ -0,0 +1,36 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+namespace patchget
+{
+
+//
+// Link with this to automatically initialize COM at startup
+//  - See cominit.cpp for more info
+//
+
+class ComInit
+{
+ public:
+         ComInit();
+        ~ComInit();
+};
+
+} // namespace patchget
diff --git a/Core/Tools/PATCHGET/DownloadManager.cpp b/Core/Tools/PATCHGET/DownloadManager.cpp
index 50d649ee3f5..c22268b6226 100644
--- a/Core/Tools/PATCHGET/DownloadManager.cpp
+++ b/Core/Tools/PATCHGET/DownloadManager.cpp
@@ -21,9 +21,9 @@
 // Author: Matthew D. Campbell, July 2002
 
 #include "debug.h"
-#include "CHATAPI.H"
+#include "CHATAPI.h"
 #include "DownloadManager.h"
-#include "RESOURCE.H"
+#include "RESOURCE.h"
 
 namespace patchget
 {
@@ -153,27 +153,27 @@ HRESULT DownloadManager::OnError( int error )
 			break;
 	}
 	m_errorString = s;
-	DEBUG_LOG(("DownloadManager::OnError(): %s(%d)\n", s.c_str(), error));
+	DEBUG_LOG(("DownloadManager::OnError(): %s(%d)", s.c_str(), error));
 	return S_OK;
 }
 
 HRESULT DownloadManager::OnEnd()
 {
 	m_sawEnd = true;
-	DEBUG_LOG(("DownloadManager::OnEnd()\n"));
+	DEBUG_LOG(("DownloadManager::OnEnd()"));
 	return S_OK;
 }
 
 HRESULT DownloadManager::OnQueryResume()
 {
-	DEBUG_LOG(("DownloadManager::OnQueryResume()\n"));
+	DEBUG_LOG(("DownloadManager::OnQueryResume()"));
 	//return DOWNLOADEVENT_DONOTRESUME;
 	return DOWNLOADEVENT_RESUME;
 }
 
 HRESULT DownloadManager::OnProgressUpdate( int bytesread, int totalsize, int timetaken, int timeleft )
 {
-	DEBUG_LOG(("DownloadManager::OnProgressUpdate(): %d/%d %d/%d\n", bytesread, totalsize, timetaken, timeleft));
+	DEBUG_LOG(("DownloadManager::OnProgressUpdate(): %d/%d %d/%d", bytesread, totalsize, timetaken, timeleft));
 	return S_OK;
 }
 
@@ -208,7 +208,7 @@ HRESULT DownloadManager::OnStatusUpdate( int status )
 			break;
 	}
 	m_statusString = s;
-	DEBUG_LOG(("DownloadManager::OnStatusUpdate(): %s(%d)\n", s.c_str(), status));
+	DEBUG_LOG(("DownloadManager::OnStatusUpdate(): %s(%d)", s.c_str(), status));
 	return S_OK;
 }
 
diff --git a/Core/Tools/PATCHGET/DownloadManager.h b/Core/Tools/PATCHGET/DownloadManager.h
index 9a5c66025e1..443156920ca 100644
--- a/Core/Tools/PATCHGET/DownloadManager.h
+++ b/Core/Tools/PATCHGET/DownloadManager.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef __DOWNLOADMANAGER_H__
-#define __DOWNLOADMANAGER_H__
-
 #include "WWDownload/downloaddefs.h"
 #include "WWDownload/Download.h"
 #include <string>
@@ -55,7 +52,7 @@ class DownloadManager : public IDownload
 public:
 	DownloadManager();
 	virtual ~DownloadManager();
-	
+
 public:
 	void init( void );
 	HRESULT update( void );
@@ -96,5 +93,3 @@ class DownloadManager : public IDownload
 extern DownloadManager *TheDownloadManager;
 
 } // namespace patchget
-
-#endif // __DOWNLOADMANAGER_H__
diff --git a/Core/Tools/PATCHGET/PROCESS.CPP b/Core/Tools/PATCHGET/PROCESS.CPP
deleted file mode 100644
index dc0a7fe2faf..00000000000
--- a/Core/Tools/PATCHGET/PROCESS.CPP
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "process.h"
-
-namespace patchget
-{
-
-Process::Process()
-{ 
-  directory[0]=0;
-  command[0]=0;
-  args[0]=0;
-  hProcess=NULL;
-  hThread=NULL;
-}
-
-// Create a process
-bit8 Create_Process(Process &process)
-{
-    int                      retval;
-    STARTUPINFO              si;
-    PROCESS_INFORMATION      piProcess;
-    ZeroMemory(&si,sizeof(si));
-    si.cb=sizeof(si);
- 
-    char cmdargs[513];
-    memset(cmdargs,0,513);
-    strcpy(cmdargs,process.command);
-    strcat(cmdargs,process.args);
-
-    retval=CreateProcess(NULL,cmdargs,NULL,NULL,FALSE, 0  ,NULL, NULL/*process.directory*/,&si,&piProcess);
-
-    process.hProcess=piProcess.hProcess;
-    process.hThread=piProcess.hThread;
-    return(TRUE);
-}
-
-//
-// Wait for a process to complete, and fill in the exit code
-//
-bit8 Wait_Process(Process &process, DWORD *exit_code)
-{
-  DWORD retval;
-  retval=WaitForSingleObject(process.hProcess,INFINITE);
-  if (exit_code != NULL)
-    *exit_code=-1;
-  if (retval==WAIT_OBJECT_0)  // process exited
-  {
-    if (exit_code != NULL)
-      GetExitCodeProcess(process.hProcess,exit_code);
-    return(TRUE);
-  }
-  else                        // can this happen?
-    return(FALSE);
-}
-
-/*******************
-//
-// Get the process to run from the config object
-//
-bit8 Read_Process_Info(ConfigFile &config,OUT Process &info)
-{
-
- Wstring procinfo;
- if (config.getString("RUN",procinfo)==FALSE)
- {
-   DBGMSG("Couldn't read the RUN line");
-   return(FALSE);
- }
- int          offset=0;
- Wstring      dir;
- Wstring      executable;
- Wstring      args;
- offset=procinfo.getToken(offset," ",dir);
- offset=procinfo.getToken(offset," ",executable);
- args=procinfo;
- args.remove(0,offset);
-
- ///
- ///
- DBGMSG("RUN: EXE = "<<executable.get()<<"  DIR = "<<dir.get()<<
-   "  ARGS = "<<args.get());
- strcpy(info.command,executable.get());
- strcpy(info.directory,dir.get());
- strcpy(info.args,args.get());
- return(TRUE);
-}
-*****************/
-
-} // namespace patchget
diff --git a/Core/Tools/PATCHGET/PROCESS.H b/Core/Tools/PATCHGET/PROCESS.H
deleted file mode 100644
index 02f55616127..00000000000
--- a/Core/Tools/PATCHGET/PROCESS.H
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PROCESS_HEADER
-#define PROCESS_HEADER
-
-#include <windows.h>
-#include "WSTYPES.H"
-
-namespace patchget
-{
-
-class Process
-{
- public:
-           Process();
-
-  char     directory[256];
-  char     command[256];
-  char     args[256];
-  HANDLE   hProcess;
-  HANDLE   hThread;
-};
-
-//bit8 Read_Process_Info(ConfigFile &config,OUT Process &info);
-bit8 Create_Process(Process &process);
-bit8 Wait_Process(Process &process, DWORD *exit_code=NULL);
-
-} // namespace patchget
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/PATCHGET/PROCESS.cpp b/Core/Tools/PATCHGET/PROCESS.cpp
new file mode 100644
index 00000000000..f59ad57a447
--- /dev/null
+++ b/Core/Tools/PATCHGET/PROCESS.cpp
@@ -0,0 +1,106 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "process.h"
+
+namespace patchget
+{
+
+Process::Process()
+{
+  directory[0]=0;
+  command[0]=0;
+  args[0]=0;
+  hProcess=NULL;
+  hThread=NULL;
+}
+
+// Create a process
+bit8 Create_Process(Process &process)
+{
+    int                      retval;
+    STARTUPINFO              si;
+    PROCESS_INFORMATION      piProcess;
+    ZeroMemory(&si,sizeof(si));
+    si.cb=sizeof(si);
+
+    char cmdargs[513];
+    memset(cmdargs,0,513);
+    strcpy(cmdargs,process.command);
+    strcat(cmdargs,process.args);
+
+    retval=CreateProcess(NULL,cmdargs,NULL,NULL,FALSE, 0  ,NULL, NULL/*process.directory*/,&si,&piProcess);
+
+    process.hProcess=piProcess.hProcess;
+    process.hThread=piProcess.hThread;
+    return(TRUE);
+}
+
+//
+// Wait for a process to complete, and fill in the exit code
+//
+bit8 Wait_Process(Process &process, DWORD *exit_code)
+{
+  DWORD retval;
+  retval=WaitForSingleObject(process.hProcess,INFINITE);
+  if (exit_code != NULL)
+    *exit_code=-1;
+  if (retval==WAIT_OBJECT_0)  // process exited
+  {
+    if (exit_code != NULL)
+      GetExitCodeProcess(process.hProcess,exit_code);
+    return(TRUE);
+  }
+  else                        // can this happen?
+    return(FALSE);
+}
+
+/*******************
+//
+// Get the process to run from the config object
+//
+bit8 Read_Process_Info(ConfigFile &config,OUT Process &info)
+{
+
+ Wstring procinfo;
+ if (config.getString("RUN",procinfo)==FALSE)
+ {
+   DBGMSG("Couldn't read the RUN line");
+   return(FALSE);
+ }
+ int          offset=0;
+ Wstring      dir;
+ Wstring      executable;
+ Wstring      args;
+ offset=procinfo.getToken(offset," ",dir);
+ offset=procinfo.getToken(offset," ",executable);
+ args=procinfo;
+ args.remove(0,offset);
+
+ ///
+ ///
+ DBGMSG("RUN: EXE = "<<executable.get()<<"  DIR = "<<dir.get()<<
+   "  ARGS = "<<args.get());
+ strcpy(info.command,executable.get());
+ strcpy(info.directory,dir.get());
+ strcpy(info.args,args.get());
+ return(TRUE);
+}
+*****************/
+
+} // namespace patchget
diff --git a/Core/Tools/PATCHGET/PROCESS.h b/Core/Tools/PATCHGET/PROCESS.h
new file mode 100644
index 00000000000..26ccf044c82
--- /dev/null
+++ b/Core/Tools/PATCHGET/PROCESS.h
@@ -0,0 +1,43 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <windows.h>
+#include "WSTYPES.h"
+
+namespace patchget
+{
+
+class Process
+{
+ public:
+           Process();
+
+  char     directory[256];
+  char     command[256];
+  char     args[256];
+  HANDLE   hProcess;
+  HANDLE   hThread;
+};
+
+//bit8 Read_Process_Info(ConfigFile &config,OUT Process &info);
+bit8 Create_Process(Process &process);
+bit8 Wait_Process(Process &process, DWORD *exit_code=NULL);
+
+} // namespace patchget
diff --git a/Core/Tools/PATCHGET/RESOURCE.H b/Core/Tools/PATCHGET/RESOURCE.H
deleted file mode 100644
index 235adafbc75..00000000000
--- a/Core/Tools/PATCHGET/RESOURCE.H
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by Script1.rc
-//
-#define TXT_ABORT_DOWNLOAD              1
-#define TXT_ABORT                       2
-#define TXT_TIME_REMAIN                 3
-#define TXT_BYTES_READ                  4
-#define TXT_BPS                         5
-#define TXT_CANT_CONTACT                6
-#define TXT_ERROR                       7
-#define TXT_AN_UPGRADE_AVAILABLE        8
-#define TXT_DOWNLOAD_NOW                9
-#define TXT_DOWNLOADING_FILE            10
-#define TXT_NONE                        11
-#define TXT_UPGRADE_AVAILABLE           12
-#define TXT_NO_PATCHES                  13
-#define TXT_AUTO_UPDATE                 14
-#define TXT_CONNECTING                  15
-#define TXT_INSTALL_PROBLEM             16
-#define TXT_API_MISSING                 17
-#define TXT_TITLE                       18
-#define TXT_REGNOW                      19
-#define FTP_StatusIdle                  20
-#define FTP_UnknownError                21
-#define FTP_NoSuchServer                22
-#define FTP_CouldNotConnect             23
-#define FTP_LoginFailed                 24
-#define FTP_NoSuchFile                  25
-#define FTP_LocalFileOpenFailed         26
-#define FTP_TCPError                    27
-#define FTP_DisconnectError             28
-#define FTP_StatusNone                  29
-#define FTP_StatusConnecting            30
-#define FTP_StatusLoggingIn             31
-#define FTP_StatusFindingFile           32
-#define FTP_StatusQueryingResume        33
-#define FTP_StatusDownloading           34
-#define FTP_StatusFinishing             35
-#define FTP_StatusDone                  36
-#define FTP_StatusDisconnecting         37
-#define IDD_CONNECTING                  101
-#define IDD_DOWNLOAD_DIALOG             102
-#define IDB_BITMAP1                     103
-#define IDB_BITMAP                      103
-#define IDI_ICON1                       104
-#define IDC_TIMEREM                     1001
-#define IDC_BYTESLEFT                   1002
-#define IDC_DLABORT                     1004
-#define IDC_PROGRESS                    1005
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        112
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1006
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/Core/Tools/PATCHGET/RESOURCE.h b/Core/Tools/PATCHGET/RESOURCE.h
new file mode 100644
index 00000000000..06865ee8b00
--- /dev/null
+++ b/Core/Tools/PATCHGET/RESOURCE.h
@@ -0,0 +1,79 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by Script1.rc
+//
+#define TXT_ABORT_DOWNLOAD              1
+#define TXT_ABORT                       2
+#define TXT_TIME_REMAIN                 3
+#define TXT_BYTES_READ                  4
+#define TXT_BPS                         5
+#define TXT_CANT_CONTACT                6
+#define TXT_ERROR                       7
+#define TXT_AN_UPGRADE_AVAILABLE        8
+#define TXT_DOWNLOAD_NOW                9
+#define TXT_DOWNLOADING_FILE            10
+#define TXT_NONE                        11
+#define TXT_UPGRADE_AVAILABLE           12
+#define TXT_NO_PATCHES                  13
+#define TXT_AUTO_UPDATE                 14
+#define TXT_CONNECTING                  15
+#define TXT_INSTALL_PROBLEM             16
+#define TXT_API_MISSING                 17
+#define TXT_TITLE                       18
+#define TXT_REGNOW                      19
+#define FTP_StatusIdle                  20
+#define FTP_UnknownError                21
+#define FTP_NoSuchServer                22
+#define FTP_CouldNotConnect             23
+#define FTP_LoginFailed                 24
+#define FTP_NoSuchFile                  25
+#define FTP_LocalFileOpenFailed         26
+#define FTP_TCPError                    27
+#define FTP_DisconnectError             28
+#define FTP_StatusNone                  29
+#define FTP_StatusConnecting            30
+#define FTP_StatusLoggingIn             31
+#define FTP_StatusFindingFile           32
+#define FTP_StatusQueryingResume        33
+#define FTP_StatusDownloading           34
+#define FTP_StatusFinishing             35
+#define FTP_StatusDone                  36
+#define FTP_StatusDisconnecting         37
+#define IDD_CONNECTING                  101
+#define IDD_DOWNLOAD_DIALOG             102
+#define IDB_BITMAP1                     103
+#define IDB_BITMAP                      103
+#define IDI_ICON1                       104
+#define IDC_TIMEREM                     1001
+#define IDC_BYTESLEFT                   1002
+#define IDC_DLABORT                     1004
+#define IDC_PROGRESS                    1005
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        112
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1006
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/Core/Tools/PATCHGET/Registry.h b/Core/Tools/PATCHGET/Registry.h
index 3600d0fefbc..644dbdcf2b7 100644
--- a/Core/Tools/PATCHGET/Registry.h
+++ b/Core/Tools/PATCHGET/Registry.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef __REGISTRY_H__
-#define __REGISTRY_H__
-
 #include <string>
 
 namespace patchget
@@ -51,5 +48,3 @@ bool SetStringInRegistry(std::string path, std::string key, std::string val);
 bool SetUnsignedIntInRegistry(std::string path, std::string key, unsigned int val);
 
 } // namespace patchget
-
-#endif // __REGISTRY_H__
diff --git a/Core/Tools/PATCHGET/WINBLOWS.CPP b/Core/Tools/PATCHGET/WINBLOWS.CPP
deleted file mode 100644
index 6fc895b2239..00000000000
--- a/Core/Tools/PATCHGET/WINBLOWS.CPP
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <windowsx.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "WINBLOWS.H"
-#include "CHATAPI.H"
-
-
-// TheSuperHackers @fix xezon 13/03/2025 Fix debug linker errors by
-// adding "patchget" namespaces and these globals here.
-// just to satisfy the game libraries we link to
-HINSTANCE ApplicationHInstance = NULL;  ///< our application instance
-HWND ApplicationHWnd = NULL;
-const char *g_strFile = "data\\Generals.str";
-const char *g_csfFile = "data\\%s\\Generals.csf";
-const char *gAppPrefix = "patchget_"; // prefix to the debug log.
-
-
-HINSTANCE Global_instance;
-LPSTR     Global_commandline;
-int       Global_commandshow;
-
-
-/*
- * WinMain - initialization, message loop
- */
-int PASCAL WinMain( HINSTANCE instance, HINSTANCE, char *command_line, int command_show)
-{
-    //////MSG         msg;
-
-    Global_instance = instance;
-    Global_commandline = command_line;
-    Global_commandshow = command_show;
-
-    int         argc;
-    char       *argv[64];
-
-    char        path_to_exe[512];
-    GetModuleFileName(instance,(char *)&path_to_exe,512);
-    argc=1;
-    argv[0]=path_to_exe;
-
-
-    int   command_scan=0;
-    char  command_char;
-    do 
-    {
-      /*
-      ** Scan for non-space character on command line
-      */
-      do 
-      {
-        command_char = *( command_line+command_scan++ );
-      } while ( command_char==' ' );
-
-      if ( command_char!=0 && command_char != 13 )
-      {
-        argv[argc++]=command_line+command_scan-1;
-
-        /*
-        ** Scan for space character on command line
-        */
-        do
-        {
-          command_char = *( command_line+command_scan++ );
-        } while ( command_char!=' ' && command_char != 0 && command_char!=13);
-                *( command_line+command_scan-1 ) = 0;
-      }
-
-    } while ( command_char != 0 && command_char != 13 && argc<20 );
-
-    return(patchget::main(argc,argv));
-
-} /* WinMain */
-
-
-int Print_WM(UINT message,char *out)
-{
-  switch(message)
-  {
-    case WM_NULL:
-      sprintf(out,"WM_NULL");
-      break;
-    case WM_CREATE:
-      sprintf(out,"WM_CREATE");
-      break;
-    case WM_DESTROY:
-      sprintf(out,"WM_DESTROY");
-      break;
-    case WM_CANCELMODE:
-      sprintf(out,"WM_CANCELMODE");
-      break;
-    case WM_ERASEBKGND:
-      sprintf(out,"WM_ERASEBKGND");
-      break;
-    case WM_GETTEXT:
-      sprintf(out,"WM_GETTEXT");
-      break;
-    case WM_QUERYOPEN:
-      sprintf(out,"WM_QUERYOPEN");
-      break;
-    case WM_MOVE:
-      sprintf(out,"WM_MOVE");
-      break;
-    case WM_SIZE:
-      sprintf(out,"WM_SIZE");
-      break;
-    case WM_ACTIVATE:
-      sprintf(out,"WM_ACTIVATE");
-      break;
-    case WM_SETFOCUS:
-      sprintf(out,"WM_SETFOCUS");
-      break;
-    case WM_KILLFOCUS:
-      sprintf(out,"WM_KILLFOCUS");
-      break;
-    case WM_ENABLE:
-      sprintf(out,"WM_ENABLE");
-      break;
-    case WM_SETREDRAW:
-      sprintf(out,"WM_REDRAW");
-      break;
-    case WM_PAINT:
-      sprintf(out,"WM_PAINT");
-      break;
-    case WM_CLOSE:
-      sprintf(out,"WM_CLOSE");
-      break;
-    case WM_QUIT:
-      sprintf(out,"WM_QUIT");
-      break;
-    case WM_ACTIVATEAPP:
-      sprintf(out,"WM_ACTIVATEAPP");
-      break;
-    case WM_SETCURSOR:
-      sprintf(out,"WM_SETCURSOR");
-      break;
-    case WM_KEYDOWN:
-      sprintf(out,"WM_KEYDOWN");
-      break;
-    case WM_MOUSEMOVE:
-      sprintf(out,"WM_MOUSEMOVE");
-      break;
-    case WM_WINDOWPOSCHANGING:
-      sprintf(out,"WM_WINDOWPOSCHANGING");
-      break;
-    case WM_WINDOWPOSCHANGED:
-      sprintf(out,"WM_WINDOWPOSCHANGED");
-      break;
-    case WM_DISPLAYCHANGE:
-      sprintf(out,"WM_DISPLAYCHANGE");
-      break;
-    case WM_NCPAINT:
-      sprintf(out,"WM_NCPAINT");
-      break;
-    case WM_PALETTEISCHANGING:
-      sprintf(out,"WM_PALETTEISCHANGING");
-      break;
-    case WM_PALETTECHANGED:
-      sprintf(out,"WM_PALETTECHANGED");
-      break;
-    case WM_NCACTIVATE:
-      sprintf(out,"WM_NCACTIVATE");
-      break;
-    case WM_NCCALCSIZE:
-      sprintf(out,"WM_NCCALCSIZE");
-      break;
-    case WM_SYSCOMMAND:
-      sprintf(out,"WM_SYSCOMMAND");
-      break;
-    default:
-      sprintf(out,"? UNKNOWN ?");
-      return(-1);
-  }
-  return(0);
-}
diff --git a/Core/Tools/PATCHGET/WINBLOWS.H b/Core/Tools/PATCHGET/WINBLOWS.H
deleted file mode 100644
index be4f13f0340..00000000000
--- a/Core/Tools/PATCHGET/WINBLOWS.H
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef WINBLOWS_HEADER
-#define WINBLOWS_HEADER
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <windowsx.h>
-#include <stdlib.h>
-
-#include"WSTYPES.H"
-
-  extern HINSTANCE Global_instance;
-  extern LPSTR     Global_commandline;
-  extern int       Global_commandshow;
-
-  extern int       main(int argc, char *argv[]);
-
-  int              Print_WM(UINT wm,char *out);
-
-#endif
diff --git a/Core/Tools/PATCHGET/WINBLOWS.cpp b/Core/Tools/PATCHGET/WINBLOWS.cpp
new file mode 100644
index 00000000000..0e79559180b
--- /dev/null
+++ b/Core/Tools/PATCHGET/WINBLOWS.cpp
@@ -0,0 +1,197 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <windowsx.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "WINBLOWS.h"
+#include "CHATAPI.h"
+
+
+// TheSuperHackers @fix xezon 13/03/2025 Fix debug linker errors by
+// adding "patchget" namespaces and these globals here.
+// just to satisfy the game libraries we link to
+HINSTANCE ApplicationHInstance = NULL;  ///< our application instance
+HWND ApplicationHWnd = NULL;
+const char *g_strFile = "data\\Generals.str";
+const char *g_csfFile = "data\\%s\\Generals.csf";
+const char *gAppPrefix = "patchget_"; // prefix to the debug log.
+
+
+HINSTANCE Global_instance;
+LPSTR     Global_commandline;
+int       Global_commandshow;
+
+
+/*
+ * WinMain - initialization, message loop
+ */
+int PASCAL WinMain( HINSTANCE instance, HINSTANCE, char *command_line, int command_show)
+{
+    //////MSG         msg;
+
+    Global_instance = instance;
+    Global_commandline = command_line;
+    Global_commandshow = command_show;
+
+    int         argc;
+    char       *argv[64];
+
+    char        path_to_exe[512];
+    GetModuleFileName(instance,(char *)&path_to_exe,512);
+    argc=1;
+    argv[0]=path_to_exe;
+
+
+    int   command_scan=0;
+    char  command_char;
+    do
+    {
+      /*
+      ** Scan for non-space character on command line
+      */
+      do
+      {
+        command_char = *( command_line+command_scan++ );
+      } while ( command_char==' ' );
+
+      if ( command_char!=0 && command_char != 13 )
+      {
+        argv[argc++]=command_line+command_scan-1;
+
+        /*
+        ** Scan for space character on command line
+        */
+        do
+        {
+          command_char = *( command_line+command_scan++ );
+        } while ( command_char!=' ' && command_char != 0 && command_char!=13);
+                *( command_line+command_scan-1 ) = 0;
+      }
+
+    } while ( command_char != 0 && command_char != 13 && argc<20 );
+
+    return(patchget::main(argc,argv));
+
+} /* WinMain */
+
+
+int Print_WM(UINT message,char *out)
+{
+  switch(message)
+  {
+    case WM_NULL:
+      sprintf(out,"WM_NULL");
+      break;
+    case WM_CREATE:
+      sprintf(out,"WM_CREATE");
+      break;
+    case WM_DESTROY:
+      sprintf(out,"WM_DESTROY");
+      break;
+    case WM_CANCELMODE:
+      sprintf(out,"WM_CANCELMODE");
+      break;
+    case WM_ERASEBKGND:
+      sprintf(out,"WM_ERASEBKGND");
+      break;
+    case WM_GETTEXT:
+      sprintf(out,"WM_GETTEXT");
+      break;
+    case WM_QUERYOPEN:
+      sprintf(out,"WM_QUERYOPEN");
+      break;
+    case WM_MOVE:
+      sprintf(out,"WM_MOVE");
+      break;
+    case WM_SIZE:
+      sprintf(out,"WM_SIZE");
+      break;
+    case WM_ACTIVATE:
+      sprintf(out,"WM_ACTIVATE");
+      break;
+    case WM_SETFOCUS:
+      sprintf(out,"WM_SETFOCUS");
+      break;
+    case WM_KILLFOCUS:
+      sprintf(out,"WM_KILLFOCUS");
+      break;
+    case WM_ENABLE:
+      sprintf(out,"WM_ENABLE");
+      break;
+    case WM_SETREDRAW:
+      sprintf(out,"WM_REDRAW");
+      break;
+    case WM_PAINT:
+      sprintf(out,"WM_PAINT");
+      break;
+    case WM_CLOSE:
+      sprintf(out,"WM_CLOSE");
+      break;
+    case WM_QUIT:
+      sprintf(out,"WM_QUIT");
+      break;
+    case WM_ACTIVATEAPP:
+      sprintf(out,"WM_ACTIVATEAPP");
+      break;
+    case WM_SETCURSOR:
+      sprintf(out,"WM_SETCURSOR");
+      break;
+    case WM_KEYDOWN:
+      sprintf(out,"WM_KEYDOWN");
+      break;
+    case WM_MOUSEMOVE:
+      sprintf(out,"WM_MOUSEMOVE");
+      break;
+    case WM_WINDOWPOSCHANGING:
+      sprintf(out,"WM_WINDOWPOSCHANGING");
+      break;
+    case WM_WINDOWPOSCHANGED:
+      sprintf(out,"WM_WINDOWPOSCHANGED");
+      break;
+    case WM_DISPLAYCHANGE:
+      sprintf(out,"WM_DISPLAYCHANGE");
+      break;
+    case WM_NCPAINT:
+      sprintf(out,"WM_NCPAINT");
+      break;
+    case WM_PALETTEISCHANGING:
+      sprintf(out,"WM_PALETTEISCHANGING");
+      break;
+    case WM_PALETTECHANGED:
+      sprintf(out,"WM_PALETTECHANGED");
+      break;
+    case WM_NCACTIVATE:
+      sprintf(out,"WM_NCACTIVATE");
+      break;
+    case WM_NCCALCSIZE:
+      sprintf(out,"WM_NCCALCSIZE");
+      break;
+    case WM_SYSCOMMAND:
+      sprintf(out,"WM_SYSCOMMAND");
+      break;
+    default:
+      sprintf(out,"? UNKNOWN ?");
+      return(-1);
+  }
+  return(0);
+}
diff --git a/Core/Tools/PATCHGET/WINBLOWS.h b/Core/Tools/PATCHGET/WINBLOWS.h
new file mode 100644
index 00000000000..9a70a828cee
--- /dev/null
+++ b/Core/Tools/PATCHGET/WINBLOWS.h
@@ -0,0 +1,34 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <windowsx.h>
+#include <stdlib.h>
+
+#include"WSTYPES.h"
+
+  extern HINSTANCE Global_instance;
+  extern LPSTR     Global_commandline;
+  extern int       Global_commandshow;
+
+  extern int       main(int argc, char *argv[]);
+
+  int              Print_WM(UINT wm,char *out);
diff --git a/Core/Tools/PATCHGET/WSTYPES.H b/Core/Tools/PATCHGET/WSTYPES.H
deleted file mode 100644
index 65200842de6..00000000000
--- a/Core/Tools/PATCHGET/WSTYPES.H
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/****************************************************************************\
-*        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S         *
-******************************************************************************
-Project Name:
-File Name   : wstypes.h
-Author      : Neal Kettler
-Start Date  : June 3, 1997
-Last Update : June 17, 1997  
-
-Standard type definitions for the sake of portability and readability.
-\***************************************************************************/
-
-#ifndef WTYPES_HEADER
-#define WTYPES_HEADER
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-
-//These are used for readability purposes mostly, when a method takes a
-//  pointer or reference these help specify what will happen to the data
-//  that is sent in.
-#define IN
-#define OUT
-#define INOUT
-
-typedef char               bit8;
-
-
-typedef char               sint8;
-typedef unsigned char      uint8;
-typedef signed short int   sint16;
-typedef unsigned short int uint16;
-typedef signed int         sint32;
-typedef unsigned int       uint32;
-
-
-#define MAX_BIT8    0x1
-#define MAX_UINT32  0xFFFFFFFF
-#define MAX_UINT16  0xFFFF
-#define MAX_UINT8   0xFF
-#define MAX_SINT32  0x7FFFFFFF
-#define MAX_SINT16  0x7FFF
-#define MAX_SINT8   0x7F   
-
-#ifdef _WIN32
-#define strncasecmp _strnicmp
-#define strcasecmp  _stricmp
-#endif  
-
-#endif
diff --git a/Core/Tools/PATCHGET/WSTYPES.h b/Core/Tools/PATCHGET/WSTYPES.h
new file mode 100644
index 00000000000..df4ee9b8946
--- /dev/null
+++ b/Core/Tools/PATCHGET/WSTYPES.h
@@ -0,0 +1,71 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/****************************************************************************\
+*        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S         *
+******************************************************************************
+Project Name:
+File Name   : wstypes.h
+Author      : Neal Kettler
+Start Date  : June 3, 1997
+Last Update : June 17, 1997
+
+Standard type definitions for the sake of portability and readability.
+\***************************************************************************/
+
+#pragma once
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+
+//These are used for readability purposes mostly, when a method takes a
+//  pointer or reference these help specify what will happen to the data
+//  that is sent in.
+#define IN
+#define OUT
+#define INOUT
+
+typedef char               bit8;
+
+
+typedef char               sint8;
+typedef unsigned char      uint8;
+typedef signed short int   sint16;
+typedef unsigned short int uint16;
+typedef signed int         sint32;
+typedef unsigned int       uint32;
+
+
+#define MAX_BIT8    0x1
+#define MAX_UINT32  0xFFFFFFFF
+#define MAX_UINT16  0xFFFF
+#define MAX_UINT8   0xFF
+#define MAX_SINT32  0x7FFFFFFF
+#define MAX_SINT16  0x7FFF
+#define MAX_SINT8   0x7F
+
+#ifdef _WIN32
+#define strncasecmp _strnicmp
+#define strcasecmp  _stricmp
+#endif
diff --git a/Core/Tools/PATCHGET/debug.cpp b/Core/Tools/PATCHGET/debug.cpp
index 64a24880ff5..d0809df4648 100644
--- a/Core/Tools/PATCHGET/debug.cpp
+++ b/Core/Tools/PATCHGET/debug.cpp
@@ -44,14 +44,14 @@ static int doCrashBox(const char *buffer, bool logResult)
 		case IDABORT:
 #ifdef DEBUG_LOGGING
 			if (logResult)
-				DebugLog("[Abort]\n");
+				DebugLog("[Abort]");
 #endif
 			_exit(1);
 			break;
 		case IDRETRY:
 #ifdef DEBUG_LOGGING
 			if (logResult)
-				DebugLog("[Retry]\n");
+				DebugLog("[Retry]");
 #endif
 			::DebugBreak();
 			break;
@@ -59,7 +59,7 @@ static int doCrashBox(const char *buffer, bool logResult)
 #ifdef DEBUG_LOGGING
 			// do nothing, just keep going
 			if (logResult)
-				DebugLog("[Ignore]\n");
+				DebugLog("[Ignore]");
 #endif
 			break;
 	}
@@ -77,7 +77,8 @@ void DebugLog(const char *fmt, ...)
 	va_end( va );
 
 	OutputDebugString(theBuffer);
-	printf( "%s", theBuffer );
+	OutputDebugString("\n");
+	printf( "%s\n", theBuffer );
 }
 
 #endif // defined(DEBUG) || defined(DEBUG_LOGGING)
@@ -98,13 +99,14 @@ void DebugCrash(const char *format, ...)
 		::MessageBox(NULL, "String too long for debug buffers", "", MB_OK|MB_APPLMODAL);
 
 	OutputDebugString(theBuffer);
-	printf( "%s", theBuffer );
+	OutputDebugString("\n");
+	printf( "%s\n", theBuffer );
 
-	strcat(theBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue\n");
+	strcat(theBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue");
 
 	int result = doCrashBox(theBuffer, true);
 
-	if (result == IDIGNORE && TheCurrentIgnoreCrashPtr != NULL) 
+	if (result == IDIGNORE && TheCurrentIgnoreCrashPtr != NULL)
 	{
 		int yn;
 		yn = ::MessageBox(NULL, "Ignore this crash from now on?", "", MB_YESNO|MB_APPLMODAL);
diff --git a/Core/Tools/PATCHGET/debug.h b/Core/Tools/PATCHGET/debug.h
index 44299abc5af..e61a99033aa 100644
--- a/Core/Tools/PATCHGET/debug.h
+++ b/Core/Tools/PATCHGET/debug.h
@@ -20,8 +20,7 @@
 // Minimal debug info
 // Author: Matthew D. Campbell, Sept 2002
 
-#ifndef __DEBUG_H__
-#define __DEBUG_H__
+#pragma once
 
 namespace patchget
 {
@@ -44,7 +43,7 @@ void DebugLog( const char *fmt, ... );
 
 	/*
 		Yeah, it's a sleazy global, since we can't reasonably add
-		any args to DebugCrash due to the varargs nature of it. 
+		any args to DebugCrash due to the varargs nature of it.
 		We'll just let it slide in this case...
 	*/
 	extern char* TheCurrentIgnoreCrashPtr;
@@ -71,6 +70,3 @@ void DebugLog( const char *fmt, ... );
 #endif
 
 } // namespace patchget
-
-#endif // __DEBUG_H__
-
diff --git a/Core/Tools/W3DView/AddToLineupDialog.cpp b/Core/Tools/W3DView/AddToLineupDialog.cpp
index c9c24e3c83a..94dc34e0414 100644
--- a/Core/Tools/W3DView/AddToLineupDialog.cpp
+++ b/Core/Tools/W3DView/AddToLineupDialog.cpp
@@ -19,8 +19,8 @@
 // AddToLineupDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "AddToLineupDialog.h"
 
 #include "ViewerScene.h"
@@ -66,10 +66,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CAddToLineupDialog message handlers
 
-BOOL CAddToLineupDialog::OnInitDialog() 
+BOOL CAddToLineupDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	if (m_pCScene)
 	{
 		// Get a pointer to the combo box control.
@@ -89,12 +89,12 @@ BOOL CAddToLineupDialog::OnInitDialog()
 		}
 		assets->Release_Render_Obj_Iterator(it);
 	}
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void CAddToLineupDialog::OnOK() 
+void CAddToLineupDialog::OnOK()
 {
 	// Make sure the user actually chose a name.
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_OBJECT);
@@ -106,6 +106,6 @@ void CAddToLineupDialog::OnOK()
 		::AfxMessageBox("Please select an object, or type in an object name.");
 		return;
 	}
-	
+
 	CDialog::OnOK();
 }
diff --git a/Core/Tools/W3DView/AddToLineupDialog.h b/Core/Tools/W3DView/AddToLineupDialog.h
index 67a7342d980..5c331479da1 100644
--- a/Core/Tools/W3DView/AddToLineupDialog.h
+++ b/Core/Tools/W3DView/AddToLineupDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ADDTOLINEUPDIALOG_H__AD8B92C5_25CB_11D4_8A1D_0090272E6F90__INCLUDED_)
-#define AFX_ADDTOLINEUPDIALOG_H__AD8B92C5_25CB_11D4_8A1D_0090272E6F90__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // AddToLineupDialog.h : header file
 //
 
@@ -65,5 +61,3 @@ class CAddToLineupDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ADDTOLINEUPDIALOG_H__AD8B92C5_25CB_11D4_8A1D_0090272E6F90__INCLUDED_)
diff --git a/Core/Tools/W3DView/AdvancedAnimSheet.cpp b/Core/Tools/W3DView/AdvancedAnimSheet.cpp
index f09526a2a43..4c57a38b2d4 100644
--- a/Core/Tools/W3DView/AdvancedAnimSheet.cpp
+++ b/Core/Tools/W3DView/AdvancedAnimSheet.cpp
@@ -19,14 +19,14 @@
 // AdvancedAnimSheet.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-#include "W3dViewDoc.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "W3DViewDoc.h"
 #include "AdvancedAnimSheet.h"
 
-#include "AssetMgr.h"
-#include "HAnim.h"
-#include "HTree.h"
+#include "assetmgr.h"
+#include "hanim.h"
+#include "htree.h"
 #include "Utils.h"
 
 
@@ -77,7 +77,7 @@ CAdvancedAnimSheet::~CAdvancedAnimSheet()
 	{
 		for (int i = 0; i < AnimCount; i++)
 		{
-			MEMBER_RELEASE(Anims[i]);
+			REF_PTR_RELEASE(Anims[i]);
 		}
 		AnimsValid = false;
 		AnimCount = 0;
@@ -162,7 +162,7 @@ void CAdvancedAnimSheet::LoadAnims (void)
 					// Add this Anims pointer to the array.
 					if (AnimCount < MAX_REPORT_ANIMS)
 					{
-						MEMBER_ADD(Anims[AnimCount], pHierarchyAnim);
+						REF_PTR_SET(Anims[AnimCount], pHierarchyAnim);
 						AnimCount++;
 					}
 					else
@@ -176,8 +176,8 @@ void CAdvancedAnimSheet::LoadAnims (void)
 				}
 
 				// Release our hold on this animation.
-				MEMBER_RELEASE(pHierarchyAnim);
-			}							
+				REF_PTR_RELEASE(pHierarchyAnim);
+			}
 		}
 
 		// Free the object
diff --git a/Core/Tools/W3DView/AdvancedAnimSheet.h b/Core/Tools/W3DView/AdvancedAnimSheet.h
index 44735a340af..691787da8d1 100644
--- a/Core/Tools/W3DView/AdvancedAnimSheet.h
+++ b/Core/Tools/W3DView/AdvancedAnimSheet.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ADVANCEDANIMSHEET_H__67C01724_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_)
-#define AFX_ADVANCEDANIMSHEET_H__67C01724_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // AdvancedAnimSheet.h : header file
 //
 
@@ -88,5 +84,3 @@ class CAdvancedAnimSheet : public CPropertySheet
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ADVANCEDANIMSHEET_H__67C01724_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_)
diff --git a/Core/Tools/W3DView/AggregateNameDialog.cpp b/Core/Tools/W3DView/AggregateNameDialog.cpp
index faacfe9af99..a8f1f1e8d4b 100644
--- a/Core/Tools/W3DView/AggregateNameDialog.cpp
+++ b/Core/Tools/W3DView/AggregateNameDialog.cpp
@@ -31,10 +31,10 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "StdAfx.H"
-#include "W3DView.H"
-#include "AggregateNameDialog.H"
-#include "W3D_File.H"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "AggregateNameDialog.h"
+#include "w3d_file.h"
 
 
 #ifdef RTS_DEBUG
diff --git a/Core/Tools/W3DView/AggregateNameDialog.h b/Core/Tools/W3DView/AggregateNameDialog.h
index d41dfebc760..2d71d778dc0 100644
--- a/Core/Tools/W3DView/AggregateNameDialog.h
+++ b/Core/Tools/W3DView/AggregateNameDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_AGGREGATENAMEDIALOG_H__3F618448_CDEA_11D2_9FFC_00104B791122__INCLUDED_)
-#define AFX_AGGREGATENAMEDIALOG_H__3F618448_CDEA_11D2_9FFC_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // AggregateNameDialog.h : header file
 //
 
@@ -60,7 +56,7 @@ class AggregateNameDialogClass : public CDialog
 	DECLARE_MESSAGE_MAP()
 
 	public:
-		
+
 		////////////////////////////////////////////////////////////////
 		//
 		//	Public methods
@@ -69,15 +65,13 @@ class AggregateNameDialogClass : public CDialog
 		void							Set_Name (const CString &name)	{ m_Name = name; }
 
 	private:
-		
+
 		////////////////////////////////////////////////////////////////
 		//
 		//	Private member data
-		//		
+		//
 		CString						m_Name;
 };
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_AGGREGATENAMEDIALOG_H__3F618448_CDEA_11D2_9FFC_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/AmbientLightDialog.cpp b/Core/Tools/W3DView/AmbientLightDialog.cpp
index f03ea32c09d..d5e1abc29dd 100644
--- a/Core/Tools/W3DView/AmbientLightDialog.cpp
+++ b/Core/Tools/W3DView/AmbientLightDialog.cpp
@@ -19,14 +19,14 @@
 // AmbientLightDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 
 #include "W3DView.h"
 #include "AmbientLightDialog.h"
-#include "MainFrm.H"
-#include "W3DViewDoc.H"
-#include "ViewerScene.H"
-#include "Utils.H"
+#include "MainFrm.h"
+#include "W3DViewDoc.h"
+#include "ViewerScene.h"
+#include "Utils.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -71,7 +71,7 @@ END_MESSAGE_MAP()
 //  OnInitDialog
 //
 BOOL
-CAmbientLightDialog::OnInitDialog (void) 
+CAmbientLightDialog::OnInitDialog (void)
 {
 	// Allow the base class to process this message
     CDialog::OnInitDialog ();
@@ -82,7 +82,7 @@ CAmbientLightDialog::OnInitDialog (void)
 
     m_redSlider.SetRange (0, 100);
     m_greenSlider.SetRange (0, 100);
-    m_blueSlider.SetRange (0, 100);    
+    m_blueSlider.SetRange (0, 100);
 
     // Get a pointer to the doc so we can get at the current scene
     // pointer.
@@ -159,7 +159,7 @@ CAmbientLightDialog::OnHScroll
         // Modify the ambient light for this scene
         pCDoc->GetScene ()->Set_Ambient_Light (lightSettings);
     }
-	
+
 	// Allow the base class to process this message
     CDialog::OnHScroll (nSBCode, nPos, pScrollBar);
     return ;
@@ -185,7 +185,7 @@ CAmbientLightDialog::OnCancel (void)
         // Modify the ambient light for this scene
         pCDoc->GetScene ()->Set_Ambient_Light (lightSettings);
     }
-	
+
 	// Allow the base class to process this message
     CDialog::OnCancel();
     return ;
@@ -201,7 +201,7 @@ CAmbientLightDialog::WindowProc
     UINT message,
     WPARAM wParam,
     LPARAM lParam
-) 
+)
 {
     if (message == WM_PAINT)
     {
@@ -210,7 +210,7 @@ CAmbientLightDialog::WindowProc
         ::Paint_Gradient (::GetDlgItem (m_hWnd, IDC_GREEN_GRADIENT), 0, 1, 0);
         ::Paint_Gradient (::GetDlgItem (m_hWnd, IDC_BLUE_GRADIENT), 0, 0, 1);
     }
-	
+
 	// Allow the base class to process this message
     return CDialog::WindowProc (message, wParam, lParam);
 }
diff --git a/Core/Tools/W3DView/AmbientLightDialog.h b/Core/Tools/W3DView/AmbientLightDialog.h
index a806e563093..1ffd5dca663 100644
--- a/Core/Tools/W3DView/AmbientLightDialog.h
+++ b/Core/Tools/W3DView/AmbientLightDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_AMBIENTLIGHTDIALOG_H__D60CC3CE_5F94_11D2_9FC7_00104B791122__INCLUDED_)
-#define AFX_AMBIENTLIGHTDIALOG_H__D60CC3CE_5F94_11D2_9FC7_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // AmbientLightDialog.h : header file
 //
 
@@ -71,5 +67,3 @@ class CAmbientLightDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_AMBIENTLIGHTDIALOG_H__D60CC3CE_5F94_11D2_9FC7_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/AnimMixingPage.cpp b/Core/Tools/W3DView/AnimMixingPage.cpp
index 357584764a7..34ed1675f53 100644
--- a/Core/Tools/W3DView/AnimMixingPage.cpp
+++ b/Core/Tools/W3DView/AnimMixingPage.cpp
@@ -19,17 +19,17 @@
 // AnimMixingPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-#include "W3dViewDoc.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "W3DViewDoc.h"
 #include "AdvancedAnimSheet.h"
 #include "AnimMixingPage.h"
 
-#include "RendObj.h"
-#include "HTree.h"
-#include "HAnim.h"
+#include "rendobj.h"
+#include "htree.h"
+#include "hanim.h"
 #include "Utils.h"
-#include "AssetMgr.h"
+#include "assetmgr.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -72,13 +72,13 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CAnimMixingPage message handlers
 
-BOOL CAnimMixingPage::OnInitDialog() 
+BOOL CAnimMixingPage::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
 
 	ASSERT(m_Sheet != NULL);
 	FillListCtrl();
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -105,7 +105,7 @@ void CAnimMixingPage::FillListCtrl (void)
 		m_AnimList.InsertItem(i, anim[i]->Get_Name());
 }
 
-void CAnimMixingPage::OnOK() 
+void CAnimMixingPage::OnOK()
 {
 	/*
 	** Create a new HAnimCombo class containing the animations selected by the user.
@@ -138,11 +138,11 @@ void CAnimMixingPage::OnOK()
 		::GetCurrentDocument()->PlayAnimation(robj, combo);
 		robj->Release_Ref();
 	}
-	
+
 	CPropertyPage::OnOK();
 }
 
-BOOL CAnimMixingPage::OnKillActive() 
+BOOL CAnimMixingPage::OnKillActive()
 {
 	/*
 	** Update the parent with info on the current selection.
@@ -164,6 +164,6 @@ BOOL CAnimMixingPage::OnKillActive()
 		}
 		i++;
 	}
-	
+
 	return CPropertyPage::OnKillActive();
 }
diff --git a/Core/Tools/W3DView/AnimMixingPage.h b/Core/Tools/W3DView/AnimMixingPage.h
index 393cb6ed9cb..50c6c369d0b 100644
--- a/Core/Tools/W3DView/AnimMixingPage.h
+++ b/Core/Tools/W3DView/AnimMixingPage.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ANIMMIXINGPAGE_H__67C01722_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_)
-#define AFX_ANIMMIXINGPAGE_H__67C01722_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // AnimMixingPage.h : header file
 //
 
@@ -73,5 +69,3 @@ class CAnimMixingPage : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ANIMMIXINGPAGE_H__67C01722_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_)
diff --git a/Core/Tools/W3DView/AnimReportPage.cpp b/Core/Tools/W3DView/AnimReportPage.cpp
index dab00897167..1b5af2f3ce8 100644
--- a/Core/Tools/W3DView/AnimReportPage.cpp
+++ b/Core/Tools/W3DView/AnimReportPage.cpp
@@ -19,15 +19,15 @@
 // AnimReportPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "W3DViewDoc.h"
 #include "AdvancedAnimSheet.h"
 #include "AnimReportPage.h"
 
 
-#include "HAnim.h"
-#include "HTree.h"
+#include "hanim.h"
+#include "htree.h"
 #include "Utils.h"
 
 
@@ -74,10 +74,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CAnimReportPage message handlers
 
-BOOL CAnimReportPage::OnInitDialog() 
+BOOL CAnimReportPage::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -187,7 +187,7 @@ int CAnimReportPage::FindItem (const char *item_name)
 	return m_AnimReport.FindItem(&lvfi);
 }
 
-void CAnimReportPage::MakeChannelStr (int bone_idx, HAnimClass *hanim, char *channels)
+void CAnimReportPage::MakeChannelStr (int bone_idx, HAnimClass *hanim, char channels[6])
 {
 	if (hanim->Has_X_Translation(bone_idx))
 		strcat(channels, "X");
@@ -201,7 +201,7 @@ void CAnimReportPage::MakeChannelStr (int bone_idx, HAnimClass *hanim, char *cha
 		strcat(channels, "V");
 }
 
-BOOL CAnimReportPage::OnSetActive() 
+BOOL CAnimReportPage::OnSetActive()
 {
 	// Delete all info in the report view.
 	m_AnimReport.DeleteAllItems();
@@ -211,6 +211,6 @@ BOOL CAnimReportPage::OnSetActive()
 	// a change in selection on the mixing page will have an
 	// effect on this page.
 	FillListControl();
-	
+
 	return CPropertyPage::OnSetActive();
 }
diff --git a/Core/Tools/W3DView/AnimReportPage.h b/Core/Tools/W3DView/AnimReportPage.h
index 74f9b96df33..8f5caac7406 100644
--- a/Core/Tools/W3DView/AnimReportPage.h
+++ b/Core/Tools/W3DView/AnimReportPage.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ANIMREPORTPAGE_H__67C01723_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_)
-#define AFX_ANIMREPORTPAGE_H__67C01723_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // AnimReportPage.h : header file
 //
 
@@ -60,7 +56,7 @@ class CAnimReportPage : public CPropertyPage
 protected:
 	void		FillListControl (void);
 	int		FindItem (const char *item_name);
-	void		MakeChannelStr (int bone_idx, HAnimClass *hanim, char *channels);
+	void		MakeChannelStr(int bone_idx, HAnimClass* hanim, char channels[6]);
 
 	CAdvancedAnimSheet *m_Sheet;
 
@@ -74,5 +70,3 @@ class CAnimReportPage : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ANIMREPORTPAGE_H__67C01723_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_)
diff --git a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.cpp b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.cpp
index 779c20f2d03..85584f00373 100644
--- a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.cpp
+++ b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.cpp
@@ -19,19 +19,19 @@
 // AnimatedSoundOptionsDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-#include "globals.h"
-#include "animatedsoundoptionsdialog.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "Globals.h"
+#include "AnimatedSoundOptionsDialog.h"
 #include "ffactory.h"
 #include "animatedsoundmgr.h"
 #include "wwsaveload.h"
 #include "definitionmgr.h"
-#include "wwfile.h"
+#include "WWFILE.h"
 #include "chunkio.h"
 #include "wwdebug.h"
-#include "restrictedfiledialog.h"
-#include "utils.h"
+#include "RestrictedFileDialog.h"
+#include "Utils.h"
 
 
 #ifdef RTS_DEBUG
@@ -103,7 +103,7 @@ AnimatedSoundOptionsDialogClass::OnSoundDefinitionLibraryBrowseButton (void)
 //
 /////////////////////////////////////////////////////////////////////////////
 void
-AnimatedSoundOptionsDialogClass::OnSoundIniBrowseButton (void) 
+AnimatedSoundOptionsDialogClass::OnSoundIniBrowseButton (void)
 {
 	CFileDialog dialog (	TRUE,
 								".ini",
@@ -174,7 +174,7 @@ AnimatedSoundOptionsDialogClass::OnInitDialog (void)
 	//
 	SetDlgItemText (IDC_SOUND_DEFINITION_LIBRARY_EDIT, sound_def_lib_path);
 	SetDlgItemText (IDC_SOUND_INI_EDIT, sound_ini_path);
-	SetDlgItemText (IDC_SOUND_FILE_PATH_EDIT, sound_data_path);	
+	SetDlgItemText (IDC_SOUND_FILE_PATH_EDIT, sound_data_path);
 
 	return TRUE;
 }
@@ -211,7 +211,7 @@ AnimatedSoundOptionsDialogClass::Load_Animated_Sound_Settings (void)
 		file->Close ();
 		_TheFileFactory->Return_File (file);
 	} else {
-		WWDEBUG_SAY (("Failed to load file %s\n", sound_def_lib_path.str ()));
+		WWDEBUG_SAY (("Failed to load file %s", sound_def_lib_path.str ()));
 	}
 
 	//
@@ -234,7 +234,7 @@ AnimatedSoundOptionsDialogClass::Load_Animated_Sound_Settings (void)
 //
 /////////////////////////////////////////////////////////////////////////////
 void
-AnimatedSoundOptionsDialogClass::OnSoundPathBrowseButton (void) 
+AnimatedSoundOptionsDialogClass::OnSoundPathBrowseButton (void)
 {
 	RestrictedFileDialogClass dialog (	TRUE,
 													".wav",
@@ -249,7 +249,7 @@ AnimatedSoundOptionsDialogClass::OnSoundPathBrowseButton (void)
 	//	Prompt the user
 	//
 	if (dialog.DoModal () == IDOK) {
-		
+
 		CString path = ::Strip_Filename_From_Path (dialog.GetPathName ());
 		SetDlgItemText (IDC_SOUND_FILE_PATH_EDIT, path);
 	}
diff --git a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h
index 87f63acbad2..9024d742c38 100644
--- a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h
+++ b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ANIMATEDSOUNDOPTIONSDIALOG_H__5FD0B3D4_3975_4315_B412_44586622684B__INCLUDED_)
-#define AFX_ANIMATEDSOUNDOPTIONSDIALOG_H__5FD0B3D4_3975_4315_B412_44586622684B__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // AnimatedSoundOptionsDialog.h : header file
 //
 
@@ -65,17 +61,15 @@ class AnimatedSoundOptionsDialogClass : public CDialog
 
 	///////////////////////////////////////////////////////////////////
 	//	Public methods
-	///////////////////////////////////////////////////////////////////	
+	///////////////////////////////////////////////////////////////////
 	static void			Load_Animated_Sound_Settings (void);
 
 private:
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Private methods
-	///////////////////////////////////////////////////////////////////	
+	///////////////////////////////////////////////////////////////////
 };
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ANIMATEDSOUNDOPTIONSDIALOG_H__5FD0B3D4_3975_4315_B412_44586622684B__INCLUDED_)
diff --git a/Core/Tools/W3DView/AnimationPropPage.cpp b/Core/Tools/W3DView/AnimationPropPage.cpp
index 303f6520052..23593e48a2d 100644
--- a/Core/Tools/W3DView/AnimationPropPage.cpp
+++ b/Core/Tools/W3DView/AnimationPropPage.cpp
@@ -19,14 +19,14 @@
 // AnimationPropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "AnimationPropPage.h"
-#include "RendObj.H"
-#include "AssetMgr.H"
-#include "Mesh.H"
-#include "W3DViewDoc.H"
-#include "Utils.H"
+#include "rendobj.h"
+#include "assetmgr.h"
+#include "mesh.h"
+#include "W3DViewDoc.h"
+#include "Utils.h"
 
 
 #ifdef RTS_DEBUG
@@ -89,7 +89,7 @@ END_MESSAGE_MAP()
 //  OnInitDialog
 //
 BOOL
-CAnimationPropPage::OnInitDialog (void) 
+CAnimationPropPage::OnInitDialog (void)
 {
 	// Allow the base class to process this message
     CPropertyPage::OnInitDialog ();
@@ -99,15 +99,15 @@ CAnimationPropPage::OnInitDialog (void)
     if (pCDoc && pCDoc->GetCurrentAnimation ())
     {
         HAnimClass *pCAnimation = pCDoc->GetCurrentAnimation ();
-        
+
         // Set the description text at the top of the dialog
         CString stringTemp;
         stringTemp.Format (IDS_ANI_PROP_DESC, pCAnimation->Get_Name ());
         SetDlgItemText (IDC_DESCRIPTION, stringTemp);
-        
+
         // Fill in the number of frames
         SetDlgItemInt (IDC_FRAME_COUNT, pCAnimation->Get_Num_Frames ());
-        
+
         // Fill in the frame rate of the animation
         stringTemp.Format ("%.2f fps", pCAnimation->Get_Frame_Rate ());
         SetDlgItemText (IDC_FRAME_RATE, stringTemp);
@@ -120,6 +120,6 @@ CAnimationPropPage::OnInitDialog (void)
         SetDlgItemText (IDC_HIERARCHY_NAME, pCAnimation->Get_HName ());
 
     }
-	
+
 	return TRUE;
 }
diff --git a/Core/Tools/W3DView/AnimationPropPage.h b/Core/Tools/W3DView/AnimationPropPage.h
index 0fc010c3e7e..0e035b0593d 100644
--- a/Core/Tools/W3DView/AnimationPropPage.h
+++ b/Core/Tools/W3DView/AnimationPropPage.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ANIMATIONPROPPAGE_H__9B07DA65_62B6_11D2_9FC7_00104B791122__INCLUDED_)
-#define AFX_ANIMATIONPROPPAGE_H__9B07DA65_62B6_11D2_9FC7_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // AnimationPropPage.h : header file
 //
 
@@ -64,5 +60,3 @@ class CAnimationPropPage : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ANIMATIONPROPPAGE_H__9B07DA65_62B6_11D2_9FC7_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/AnimationSpeed.cpp b/Core/Tools/W3DView/AnimationSpeed.cpp
index b0a86361c9f..ffc1caa4fe2 100644
--- a/Core/Tools/W3DView/AnimationSpeed.cpp
+++ b/Core/Tools/W3DView/AnimationSpeed.cpp
@@ -19,13 +19,13 @@
 // AnimationSpeed.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "W3DView.h"
 #include "AnimationSpeed.h"
-#include "MainFrm.H"
-#include "GraphicView.H"
-#include "Utils.H"
-#include "W3DViewDoc.H"
+#include "MainFrm.h"
+#include "GraphicView.h"
+#include "Utils.h"
+#include "W3DViewDoc.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -87,7 +87,7 @@ END_MESSAGE_MAP()
 //  OnInitDialog
 //
 BOOL
-CAnimationSpeed::OnInitDialog (void) 
+CAnimationSpeed::OnInitDialog (void)
 {
 	// Allow the base class to process this message
     CDialog::OnInitDialog ();
@@ -128,10 +128,10 @@ CAnimationSpeed::OnInitDialog (void)
             m_iInitialPercent = int(animationSpeed*100.00F);
         }
     }
-	
+
     // Set the range of the slider control
     m_speedSlider.SetRange (1, 200);
-    
+
     // Set the initial pos of the slider control
     m_speedSlider.SetPos (m_iInitialPercent);
     return TRUE;
@@ -163,7 +163,7 @@ CAnimationSpeed::OnHScroll
             pCGraphicView->SetAnimationSpeed (((float)m_iInitialPercent) / (100.00F));
         }
     }
-	
+
 	// Allow the base class to process this message
     CDialog::OnHScroll (nSBCode, nPos, pScrollBar);
     return ;
@@ -197,7 +197,7 @@ CAnimationSpeed::OnBlend (void)
         pCDoc->SetAnimationBlend (SendDlgItemMessage (IDC_BLEND, BM_GETCHECK));
     }
 
-    return ;	
+    return ;
 }
 
 void CAnimationSpeed::
@@ -227,7 +227,7 @@ OnCompressq(){
 
 void CAnimationSpeed::
 On16bit(){
-/*	
+/*
 CW3DViewDoc *pCDoc = ::GetCurrentDocument ();
 	pCDoc->SetChannelQnBytes(2);
 	QnBytes = 2;
diff --git a/Core/Tools/W3DView/AnimationSpeed.h b/Core/Tools/W3DView/AnimationSpeed.h
index f4bdff75041..0cd1c8894b0 100644
--- a/Core/Tools/W3DView/AnimationSpeed.h
+++ b/Core/Tools/W3DView/AnimationSpeed.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ANIMATIONSPEED_H__D60CC3CD_5F94_11D2_9FC7_00104B791122__INCLUDED_)
-#define AFX_ANIMATIONSPEED_H__D60CC3CD_5F94_11D2_9FC7_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // AnimationSpeed.h : header file
 //
 
@@ -69,5 +65,3 @@ class CAnimationSpeed : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ANIMATIONSPEED_H__D60CC3CD_5F94_11D2_9FC7_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/AssetInfo.cpp b/Core/Tools/W3DView/AssetInfo.cpp
index a2e35c449ee..3b7092dcc62 100644
--- a/Core/Tools/W3DView/AssetInfo.cpp
+++ b/Core/Tools/W3DView/AssetInfo.cpp
@@ -35,11 +35,11 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "StdAfx.H"
-#include "AssetInfo.H"
-//#include "HModel.H"
-#include "AssetMgr.H"
-#include "HTree.H"
+#include "StdAfx.h"
+#include "AssetInfo.h"
+//#include "HModel.h"
+#include "assetmgr.h"
+#include "htree.h"
 
 /////////////////////////////////////////////////////////////////
 //
@@ -53,7 +53,8 @@ AssetInfoClass::Initialize (void)
 
 		// Assume we are wrapping an instance as apposed to an asset 'name'.
 		RenderObjClass *prender_obj = m_pRenderObj;
-		SAFE_ADD_REF (prender_obj);
+		if (prender_obj)
+			prender_obj->Add_Ref();
 
 		// If we are wrapping an asset name, then create an instance of it.
 		if (prender_obj == NULL) {
@@ -72,7 +73,7 @@ AssetInfoClass::Initialize (void)
 		}
 
 		// Release our hold on the temporary object
-		MEMBER_RELEASE (prender_obj);
+		REF_PTR_RELEASE (prender_obj);
 	}
 
 	return ;
diff --git a/Core/Tools/W3DView/AssetInfo.h b/Core/Tools/W3DView/AssetInfo.h
index 27a0081de09..1ba0adf5e0c 100644
--- a/Core/Tools/W3DView/AssetInfo.h
+++ b/Core/Tools/W3DView/AssetInfo.h
@@ -34,18 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-#ifndef __ASSET_INFO_H
-#define __ASSET_INFO_H
 
-#include "RendObj.H"
-#include "Utils.H"
-#include "AssetTypes.H"
+#include "rendobj.h"
+#include "Utils.h"
+#include "AssetTypes.h"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -72,9 +65,9 @@ class AssetInfoClass
 			: m_Name (passet_name),
 			  m_AssetType (type),
 			  m_dwUserData (user_data),
-			  m_pRenderObj (NULL)			{ MEMBER_ADD (m_pRenderObj, prender_obj); Initialize (); }
-		
-		virtual ~AssetInfoClass (void)	{ MEMBER_RELEASE (m_pRenderObj); }
+			  m_pRenderObj (NULL)			{ REF_PTR_SET (m_pRenderObj, prender_obj); Initialize (); }
+
+		virtual ~AssetInfoClass (void)	{ REF_PTR_RELEASE (m_pRenderObj); }
 
 		//////////////////////////////////////////////////////////////
 		//
@@ -90,14 +83,14 @@ class AssetInfoClass
 		ASSET_TYPE			Get_Type (void) const						{ return m_AssetType; }
 		DWORD					Get_User_Number (void) const				{ return m_dwUserData; }
 		const CString &	Get_User_String (void) const				{ return m_UserString; }
-		RenderObjClass *	Get_Render_Obj (void) const				{ SAFE_ADD_REF (m_pRenderObj); return m_pRenderObj; }
+		RenderObjClass *	Get_Render_Obj (void) const				{ if (m_pRenderObj) m_pRenderObj->Add_Ref(); return m_pRenderObj; }
 		RenderObjClass *	Peek_Render_Obj (void) const				{ return m_pRenderObj; }
 		void					Set_Name (LPCTSTR pname)					{ m_Name = pname; }
 		void					Set_Hierarchy_Name (LPCTSTR pname)		{ m_HierarchyName = pname; }
 		void					Set_Type (ASSET_TYPE type)					{ m_AssetType = type; }
 		void					Set_User_Number (DWORD user_data)		{ m_dwUserData = user_data; }
 		void					Set_User_String (LPCTSTR string)			{ m_UserString = string; }
-		void					Set_Render_Obj (RenderObjClass *pobj)	{ MEMBER_ADD (m_pRenderObj, pobj); }
+		void					Set_Render_Obj (RenderObjClass *pobj)	{ REF_PTR_SET (m_pRenderObj, pobj); }
 
 		//
 		//	Information methods
@@ -105,14 +98,14 @@ class AssetInfoClass
 		bool					Can_Asset_Have_Animations (void) const	{ return bool(m_HierarchyName.GetLength () > 0); }
 
 	protected:
-		
+
 		//////////////////////////////////////////////////////////////
 		//
 		//  Protected methods
 		//
 		void					Initialize (void);
-		
-		
+
+
 	private:
 
 		//////////////////////////////////////////////////////////////
@@ -127,7 +120,3 @@ class AssetInfoClass
 		DWORD					m_dwUserData;
 		RenderObjClass *	m_pRenderObj;
 };
-
-
-
-#endif //__ASSET_INFO_H
\ No newline at end of file
diff --git a/Core/Tools/W3DView/AssetPropertySheet.cpp b/Core/Tools/W3DView/AssetPropertySheet.cpp
index 9c8d83b9872..e77312ea24e 100644
--- a/Core/Tools/W3DView/AssetPropertySheet.cpp
+++ b/Core/Tools/W3DView/AssetPropertySheet.cpp
@@ -19,7 +19,7 @@
 // AssetPropertySheet.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "W3DView.h"
 #include "AssetPropertySheet.h"
 
@@ -50,7 +50,7 @@ CAssetPropertySheet::CAssetPropertySheet
     ASSERT (m_pCPropertyPage);
 
     m_psh.dwFlags |= PSH_NOAPPLYNOW;
-    
+
     // Add this page to the property sheet
     AddPage (m_pCPropertyPage);
     return ;
diff --git a/Core/Tools/W3DView/AssetPropertySheet.h b/Core/Tools/W3DView/AssetPropertySheet.h
index 03dacf70d3f..cb9446b6d08 100644
--- a/Core/Tools/W3DView/AssetPropertySheet.h
+++ b/Core/Tools/W3DView/AssetPropertySheet.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ASSETPROPERTYSHEET_H__FB40246D_5DFB_11D2_9FC7_00104B791122__INCLUDED_)
-#define AFX_ASSETPROPERTYSHEET_H__FB40246D_5DFB_11D2_9FC7_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // AssetPropertySheet.h : header file
 //
 
@@ -70,5 +66,3 @@ class CAssetPropertySheet : public CPropertySheet
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ASSETPROPERTYSHEET_H__FB40246D_5DFB_11D2_9FC7_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/AssetTypes.h b/Core/Tools/W3DView/AssetTypes.h
index 67c9ab0de56..bb85e71c6d8 100644
--- a/Core/Tools/W3DView/AssetTypes.h
+++ b/Core/Tools/W3DView/AssetTypes.h
@@ -34,14 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __ASSET_TYPES_H
-#define __ASSET_TYPES_H
-
 
 typedef enum
 {
@@ -57,8 +50,5 @@ typedef enum
 	TypeCompressedAnimation,
 	TypePrimitives,
 	TypeSound
-    
-} ASSET_TYPE;
-
 
-#endif //__ASSET_TYPES_H
\ No newline at end of file
+} ASSET_TYPE;
diff --git a/Core/Tools/W3DView/BackgroundBMPDialog.cpp b/Core/Tools/W3DView/BackgroundBMPDialog.cpp
index 8bf69d3546f..6de5f2c192e 100644
--- a/Core/Tools/W3DView/BackgroundBMPDialog.cpp
+++ b/Core/Tools/W3DView/BackgroundBMPDialog.cpp
@@ -19,11 +19,11 @@
 // BackgroundBMPDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "BackgroundBMPDialog.h"
-#include "W3DViewDoc.H"
-#include "Utils.H"
+#include "W3DViewDoc.h"
+#include "Utils.h"
 
 
 #ifdef RTS_DEBUG
@@ -104,14 +104,14 @@ CBackgroundBMPDialog::OnInitDialog (void)
 //  OnOK
 //
 void
-CBackgroundBMPDialog::OnOK (void) 
+CBackgroundBMPDialog::OnOK (void)
 {
     // Gett a pointer to the current document
     CW3DViewDoc *pCDoc = ::GetCurrentDocument ();
     if (pCDoc)
     {
         CString stringBackgroundBMPName;
-        
+
         // Get the filename the user entered
         if (GetDlgItemText (IDC_FILENAME_EDIT, stringBackgroundBMPName) > 0)
         {
@@ -124,7 +124,7 @@ CBackgroundBMPDialog::OnOK (void)
             pCDoc->SetBackgroundBMP (NULL);
         }
     }
-	
+
 	// Allow the base class to process this message
     CDialog::OnOK ();
     return ;
diff --git a/Core/Tools/W3DView/BackgroundBMPDialog.h b/Core/Tools/W3DView/BackgroundBMPDialog.h
index 2df90afccae..71a86752a91 100644
--- a/Core/Tools/W3DView/BackgroundBMPDialog.h
+++ b/Core/Tools/W3DView/BackgroundBMPDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_BACKGROUNDBMPDIALOG_H__5D8C201B_6380_11D2_9FC7_00104B791122__INCLUDED_)
-#define AFX_BACKGROUNDBMPDIALOG_H__5D8C201B_6380_11D2_9FC7_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // BackgroundBMPDialog.h : header file
 //
 
@@ -62,5 +58,3 @@ class CBackgroundBMPDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BACKGROUNDBMPDIALOG_H__5D8C201B_6380_11D2_9FC7_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/BackgroundColorDialog.cpp b/Core/Tools/W3DView/BackgroundColorDialog.cpp
index b626786b4b8..45f066b5491 100644
--- a/Core/Tools/W3DView/BackgroundColorDialog.cpp
+++ b/Core/Tools/W3DView/BackgroundColorDialog.cpp
@@ -19,12 +19,12 @@
 // BackgroundColorDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "W3DView.h"
 #include "BackgroundColorDialog.h"
-#include "MainFrm.H"
-#include "W3DViewDoc.H"
-#include "Utils.H"
+#include "MainFrm.h"
+#include "W3DViewDoc.h"
+#include "Utils.h"
 
 
 #ifdef RTS_DEBUG
@@ -72,7 +72,7 @@ END_MESSAGE_MAP()
 //  OnInitDialog
 //
 BOOL
-CBackgroundColorDialog::OnInitDialog (void) 
+CBackgroundColorDialog::OnInitDialog (void)
 {
 	// Allow the base class to process this message
     CDialog::OnInitDialog ();
@@ -83,9 +83,9 @@ CBackgroundColorDialog::OnInitDialog (void)
 
     m_redSlider.SetRange (0, 100);
     m_greenSlider.SetRange (0, 100);
-    m_blueSlider.SetRange (0, 100);    
+    m_blueSlider.SetRange (0, 100);
 
-    // Get a pointer to the doc so we can get at the current 
+    // Get a pointer to the doc so we can get at the current
     // background color
     CW3DViewDoc *pCDoc = ::GetCurrentDocument ();
     if (pCDoc)
@@ -162,7 +162,7 @@ CBackgroundColorDialog::OnHScroll
         // Modify the ambient light for this scene
         pCDoc->SetBackgroundColor (colorSettings);
     }
-	
+
 	// Allow the base class to process this message
     CDialog::OnHScroll (nSBCode, nPos, pScrollBar);
     return ;
@@ -211,7 +211,7 @@ CBackgroundColorDialog::OnCancel (void)
     colorSettings.Y = float(m_initialGreen) / 100.00F;
     colorSettings.Z = float(m_initialBlue) / 100.00F;
 
-    // Get a pointer to the document so we can change the 
+    // Get a pointer to the document so we can change the
     // background color
     CW3DViewDoc *pCDoc = ::GetCurrentDocument ();
     if (pCDoc)
@@ -219,7 +219,7 @@ CBackgroundColorDialog::OnCancel (void)
         // Restore the current background color
         pCDoc->SetBackgroundColor (colorSettings);
     }
-	
+
 	// Allow the base class to process this message
     CDialog::OnCancel();
     return ;
@@ -235,7 +235,7 @@ CBackgroundColorDialog::WindowProc
     UINT message,
     WPARAM wParam,
     LPARAM lParam
-) 
+)
 {
     if (message == WM_PAINT)
     {
@@ -244,7 +244,7 @@ CBackgroundColorDialog::WindowProc
         ::Paint_Gradient (::GetDlgItem (m_hWnd, IDC_GREEN_GRADIENT), 0, 1, 0);
         ::Paint_Gradient (::GetDlgItem (m_hWnd, IDC_BLUE_GRADIENT), 0, 0, 1);
     }
-	
+
 	// Allow the base class to process this message
     return CDialog::WindowProc (message, wParam, lParam);
 }
diff --git a/Core/Tools/W3DView/BackgroundColorDialog.h b/Core/Tools/W3DView/BackgroundColorDialog.h
index 763f61ee99c..5999e968f07 100644
--- a/Core/Tools/W3DView/BackgroundColorDialog.h
+++ b/Core/Tools/W3DView/BackgroundColorDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_BACKGROUNDCOLORDIALOG_H__AF3CDE8C_61EC_11D2_9FC7_00104B791122__INCLUDED_)
-#define AFX_BACKGROUNDCOLORDIALOG_H__AF3CDE8C_61EC_11D2_9FC7_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // BackgroundColorDialog.h : header file
 //
 
@@ -71,5 +67,3 @@ class CBackgroundColorDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BACKGROUNDCOLORDIALOG_H__AF3CDE8C_61EC_11D2_9FC7_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/BackgroundObjectDialog.cpp b/Core/Tools/W3DView/BackgroundObjectDialog.cpp
index a860ee0b7f1..dc4c28a0a8c 100644
--- a/Core/Tools/W3DView/BackgroundObjectDialog.cpp
+++ b/Core/Tools/W3DView/BackgroundObjectDialog.cpp
@@ -19,12 +19,12 @@
 // BackgroundObjectDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "BackgroundObjectDialog.h"
-#include "AssetMgr.H"
-#include "Utils.H"
-#include "W3DViewDoc.H"
+#include "assetmgr.h"
+#include "Utils.h"
+#include "W3DViewDoc.h"
 
 
 #ifdef RTS_DEBUG
@@ -81,7 +81,7 @@ CBackgroundObjectDialog::OnInitDialog (void)
 {
     // Allow the base class to process this message
 	CDialog::OnInitDialog ();
-	
+
     // Center the dialog around the data tree view instead
     // of the direct center of the screen
     ::CenterDialogAroundTreeView (m_hWnd);
@@ -123,7 +123,7 @@ CBackgroundObjectDialog::OnInitDialog (void)
     {
         // Get the name of the current background object
         CString stringCurrObject = pCDoc->GetBackgroundObjectName ();
-        
+
         LV_FINDINFO findInfo = { 0 };
         findInfo.flags = LVFI_STRING;
         findInfo.psz = (LPCTSTR)stringCurrObject;
@@ -142,7 +142,7 @@ CBackgroundObjectDialog::OnInitDialog (void)
             m_heirarchyListCtrl.SetItemState (0, LVNI_SELECTED, LVNI_SELECTED);
             SetDlgItemText (IDC_CURR_OBJ, m_heirarchyListCtrl.GetItemText (0, 0));
         }
-    }    
+    }
 
     // Size the columns so they are large enough to display their contents
     m_heirarchyListCtrl.SetColumnWidth (0, LVSCW_AUTOSIZE);
@@ -216,7 +216,7 @@ CBackgroundObjectDialog::OnItemChangedHierarchyList
             SetDlgItemText (IDC_CURR_OBJ, m_heirarchyListCtrl.GetItemText (pNMListView->iItem, 0));
         }
     }
-	
+
 	*pResult = 0;
     return ;
 }
@@ -226,7 +226,7 @@ CBackgroundObjectDialog::OnItemChangedHierarchyList
 //  OnClear
 //
 void
-CBackgroundObjectDialog::OnClear (void) 
+CBackgroundObjectDialog::OnClear (void)
 {
     // Get the current selection (if any)
     int iIndex = m_heirarchyListCtrl.GetNextItem (-1, LVNI_ALL | LVNI_SELECTED);
diff --git a/Core/Tools/W3DView/BackgroundObjectDialog.h b/Core/Tools/W3DView/BackgroundObjectDialog.h
index a5dd237efad..0032e55126e 100644
--- a/Core/Tools/W3DView/BackgroundObjectDialog.h
+++ b/Core/Tools/W3DView/BackgroundObjectDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_BACKGROUNDOBJECTDIALOG_H__9B07DA63_62B6_11D2_9FC7_00104B791122__INCLUDED_)
-#define AFX_BACKGROUNDOBJECTDIALOG_H__9B07DA63_62B6_11D2_9FC7_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // BackgroundObjectDialog.h : header file
 //
 
@@ -63,5 +59,3 @@ class CBackgroundObjectDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BACKGROUNDOBJECTDIALOG_H__9B07DA63_62B6_11D2_9FC7_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/BoneMgrDialog.cpp b/Core/Tools/W3DView/BoneMgrDialog.cpp
index 7e5a5a4da7e..57ed30814e9 100644
--- a/Core/Tools/W3DView/BoneMgrDialog.cpp
+++ b/Core/Tools/W3DView/BoneMgrDialog.cpp
@@ -19,16 +19,16 @@
 // BoneMgrDialog.cpp : implementation file
 //
 
-#include "StdAfx.H"
-#include "W3DView.H"
-#include "BoneMgrDialog.H"
-#include "HTree.H"
-#include "AssetMgr.H"
-#include "Utils.H"
-#include "MainFrm.H"
-#include "W3DViewDoc.H"
-#include "DataTreeView.H"
-//#include "HModel.H"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "BoneMgrDialog.h"
+#include "htree.h"
+#include "assetmgr.h"
+#include "Utils.h"
+#include "MainFrm.h"
+#include "W3DViewDoc.h"
+#include "DataTreeView.h"
+//#include "HModel.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -125,12 +125,12 @@ BoneMgrDialogClass::OnInitDialog (void)
 	// Loop through all the bones in this model
 	int bone_count = m_pBaseModel->Get_Num_Bones ();
 	int index = 0;
-	for (; index < bone_count; index ++) {			
+	for (; index < bone_count; index ++) {
 		const char *pbone_name = m_pBaseModel->Get_Bone_Name (index);
 
 		// Add this bone to the tree control
 		HTREEITEM hbone_item = m_BoneTree.InsertItem (pbone_name, 0, 0);
-		Fill_Bone_Item (hbone_item, index);			
+		Fill_Bone_Item (hbone_item, index);
 
 		// Is this the first item we've added to the tree?
 		if (hfirst_item == NULL) {
@@ -145,7 +145,7 @@ BoneMgrDialogClass::OnInitDialog (void)
 
 	// Build a list of all the render objects currently loaded
 	CW3DViewDoc *pdoc = (CW3DViewDoc *)((CMainFrame *)::AfxGetMainWnd())->GetActiveDocument ();
-	CDataTreeView *pdata_tree = pdoc->GetDataTreeView ();	
+	CDataTreeView *pdata_tree = pdoc->GetDataTreeView ();
 	DynamicVectorClass <CString> asset_list;
 	pdata_tree->Build_Render_Object_List (asset_list);
 
@@ -156,7 +156,7 @@ BoneMgrDialogClass::OnInitDialog (void)
 
 	// Select the first entry in the combobox
 	m_ObjectCombo.SetCurSel (0);
-	OnSelchangeObjectCombo ();	
+	OnSelchangeObjectCombo ();
 
 	// Select the first item in the tree
 	m_BoneTree.SelectItem (hfirst_item);
@@ -206,15 +206,15 @@ BoneMgrDialogClass::Fill_Bone_Item
 	}
 
 	if (node_list.Count () > 0) {
-		
+
 		// Add the subobjects to the tree control
 		for (int node_index = 0; node_index < node_list.Count (); node_index ++) {
 			RenderObjClass *psubobject = node_list[node_index];
 			ASSERT (psubobject != NULL);
-			
+
 			// Is this subobject new?  (i.e. not in a 'vanilla' instance?)
 			if (psubobject != NULL &&
-				 (Is_Object_In_List (psubobject->Get_Name (), orig_node_list) == false)) {				
+				 (Is_Object_In_List (psubobject->Get_Name (), orig_node_list) == false)) {
 				m_BoneTree.InsertItem (psubobject->Get_Name (), 1, 1, hbone_item);
 			}
 		}
@@ -222,15 +222,15 @@ BoneMgrDialogClass::Fill_Bone_Item
 
 	// Free our hold on the render objs in the original node list
 	for (index = 0; index < orig_node_list.Count (); index ++) {
-		MEMBER_RELEASE (orig_node_list[index]);
+		REF_PTR_RELEASE (orig_node_list[index]);
 	}
 
 	// Free our hold on the render objs in the node list
 	for (index = 0; index < node_list.Count (); index ++) {
-		MEMBER_RELEASE (node_list[index]);
+		REF_PTR_RELEASE (node_list[index]);
 	}
-	
-	MEMBER_RELEASE (porig_model);
+
+	REF_PTR_RELEASE (porig_model);
 	return ;
 }
 
@@ -253,13 +253,13 @@ BoneMgrDialogClass::Is_Object_In_List
 	// were are looking for.
 	for (int node_index = 0; (node_index < node_list.Count ()) && (retval == false); node_index ++) {
 		RenderObjClass *prender_obj = node_list[node_index];
-		
+
 		// Is this the render object we were looking for?
 		if (prender_obj != NULL &&
 		    ::lstrcmpi (prender_obj->Get_Name (), passet_name) == 0) {
 			retval = true;
 		}
-	}	
+	}
 
 	// Return the true/false result code
 	return retval;
@@ -326,12 +326,12 @@ BoneMgrDialogClass::Is_Render_Obj_Already_Attached (const CString &name)
 	HTREEITEM hparent_item = m_BoneTree.GetParentItem (htree_item);
 	htree_item = (hparent_item != NULL) ? hparent_item : htree_item;
 	if (htree_item != NULL) {
-		
+
 		// Loop through all the children of this bone
 		for (HTREEITEM hchild_item = m_BoneTree.GetChildItem (htree_item);
 			  (hchild_item != NULL) && (retval == false);
 			  hchild_item = m_BoneTree.GetNextSiblingItem (hchild_item)) {
-			
+
 			// Is this the render object we were looking for?
 			CString child_name = m_BoneTree.GetItemText (hchild_item);
 			if (name.CompareNoCase (child_name) == 0) {
@@ -363,7 +363,7 @@ BoneMgrDialogClass::Update_Controls (HTREEITEM selected_item)
 
 		// Select this render object in the combobox
 		int index = m_ObjectCombo.FindStringExact (-1, name);
-		m_ObjectCombo.SetCurSel ((index != CB_ERR) ? index : 0);		
+		m_ObjectCombo.SetCurSel ((index != CB_ERR) ? index : 0);
 
 		// The bone name is the name of the parent item of the selected item.
 		m_BoneName = m_BoneTree.GetItemText (m_BoneTree.GetParentItem (selected_item));
@@ -373,7 +373,7 @@ BoneMgrDialogClass::Update_Controls (HTREEITEM selected_item)
 
 	// Change the text of the group box to reflect the bone name
 	CString text;
-	text.Format ("Bone: %s", m_BoneName);
+	text.Format ("Bone: %s", static_cast<const char*>(m_BoneName));
 	SetDlgItemText (IDC_BONE_GROUPBOX, text);
 	return ;
 }
@@ -385,12 +385,12 @@ BoneMgrDialogClass::Update_Controls (HTREEITEM selected_item)
 //
 void
 BoneMgrDialogClass::OnDestroy (void)
-{		
+{
 	// Free the state image list we associated with the control
 	CImageList *pimagelist = m_BoneTree.GetImageList (TVSIL_NORMAL);
 	m_BoneTree.SetImageList (NULL, TVSIL_NORMAL);
 	SAFE_DELETE (pimagelist);
-	
+
 	// Allow the base class to process this message
 	CDialog::OnDestroy ();
 	return ;
@@ -405,8 +405,8 @@ void
 BoneMgrDialogClass::OnOK (void)
 {
 	// Simply forget about the backup we made
-	MEMBER_RELEASE (m_pBackupModel);
-	
+	REF_PTR_RELEASE (m_pBackupModel);
+
 	// Update the hierarchy's cached information to reflect the new settings
 	CW3DViewDoc *pdoc = (CW3DViewDoc *)((CMainFrame *)::AfxGetMainWnd())->GetActiveDocument ();
 	pdoc->Update_Aggregate_Prototype (*m_pBaseModel);
@@ -441,7 +441,7 @@ BoneMgrDialogClass::OnCancel (void)
 //	OnAttachButton
 //
 void
-BoneMgrDialogClass::OnAttachButton (void) 
+BoneMgrDialogClass::OnAttachButton (void)
 {
 	// Get the name of the currently selected render object
 	CString name;
@@ -453,13 +453,13 @@ BoneMgrDialogClass::OnAttachButton (void)
 
 	// Should we attach or remove the render object?
 	if (m_bAttach) {
-		
+
 		// Create an instance of the render object and attach it to the bone
 		RenderObjClass *prender_obj = WW3DAssetManager::Get_Instance()->Create_Render_Obj (name);
 		if (prender_obj != NULL) {
 			m_pBaseModel->Add_Sub_Object_To_Bone (prender_obj, m_BoneName);
 			m_BoneTree.InsertItem (name, 1, 1, hbone_item);
-			MEMBER_RELEASE (prender_obj);
+			REF_PTR_RELEASE (prender_obj);
 		}
 
 	} else {
@@ -469,21 +469,21 @@ BoneMgrDialogClass::OnAttachButton (void)
 		int bone_index = m_pBaseModel->Get_Bone_Index (m_BoneName);
 		int count = m_pBaseModel->Get_Num_Sub_Objects_On_Bone (bone_index);
 		for (int index = 0; (index < count) && !found; index ++) {
-			
+
 			// Is this the subobject we were looking for?
 			RenderObjClass *psub_obj = m_pBaseModel->Get_Sub_Object_On_Bone (index, bone_index);
 			if ((psub_obj != NULL) &&
 				 (::lstrcmpi (psub_obj->Get_Name (), name) == 0)) {
-				
+
 				// Remove this subobject from the bone
 				m_pBaseModel->Remove_Sub_Object (psub_obj);
 				found = true;
 			}
 
 			// Release our hold on this pointer
-			MEMBER_RELEASE (psub_obj);
+			REF_PTR_RELEASE (psub_obj);
 		}
-		
+
 		// Remove the object from our UI
 		Remove_Object_From_Bone (hbone_item, name);
 	}
@@ -506,7 +506,7 @@ BoneMgrDialogClass::Get_Current_Bone_Item (void)
 	// Get the currently selected item and its parent
 	HTREEITEM htree_item = m_BoneTree.GetSelectedItem ();
 	HTREEITEM hparent_item = m_BoneTree.GetParentItem (htree_item);
-	
+
 	// Return the bone item
 	return (hparent_item != NULL) ? hparent_item : htree_item;
 }
@@ -527,15 +527,15 @@ BoneMgrDialogClass::Remove_Object_From_Bone
 	for (HTREEITEM hchild_item = m_BoneTree.GetChildItem (bone_item);
 		  (hchild_item != NULL);
 		  hchild_item = m_BoneTree.GetNextSiblingItem (hchild_item)) {
-		
+
 		// Is this the render object we were looking for?
 		CString child_name = m_BoneTree.GetItemText (hchild_item);
 		if (name.CompareNoCase (child_name) == 0) {
 			m_BoneTree.DeleteItem (hchild_item);
 			break ;
-		}		
+		}
 	}
-		
+
 	return ;
 }
 
diff --git a/Core/Tools/W3DView/BoneMgrDialog.h b/Core/Tools/W3DView/BoneMgrDialog.h
index f2b6a13f654..33da2141434 100644
--- a/Core/Tools/W3DView/BoneMgrDialog.h
+++ b/Core/Tools/W3DView/BoneMgrDialog.h
@@ -16,17 +16,13 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_BONEMGRDIALOG_H__66DA0E58_BFCA_11D2_9FFA_00104B791122__INCLUDED_)
-#define AFX_BONEMGRDIALOG_H__66DA0E58_BFCA_11D2_9FFA_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // BoneMgrDialog.h : header file
 //
 
-#include "Resource.H"
-#include "Vector.H"
+#include "resource.h"
+#include "Vector.h"
 
 // Forward declarations
 class HModelClass;
@@ -92,7 +88,7 @@ class BoneMgrDialogClass : public CDialog
 		void						Update_Controls (HTREEITEM selected_item);
 		HTREEITEM				Get_Current_Bone_Item (void);
 		void						Remove_Object_From_Bone (HTREEITEM bone_item, const CString &name);
-		
+
 	private:
 
 		///////////////////////////////////////////////////////////////////
@@ -107,5 +103,3 @@ class BoneMgrDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BONEMGRDIALOG_H__66DA0E58_BFCA_11D2_9FFA_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/CMakeLists.txt b/Core/Tools/W3DView/CMakeLists.txt
index a39051ac732..f8a8b9604c0 100644
--- a/Core/Tools/W3DView/CMakeLists.txt
+++ b/Core/Tools/W3DView/CMakeLists.txt
@@ -151,7 +151,7 @@ set(W3DVIEW_SRC
     "Utils.cpp"
     "Utils.h"
     "Vector3RndCombo.cpp"
-    "Vector3RndCombo.H"
+    "Vector3RndCombo.h"
     "ViewerAssetMgr.cpp"
     "ViewerAssetMgr.h"
     "ViewerScene.cpp"
@@ -170,6 +170,13 @@ add_library(corei_w3dview INTERFACE)
 
 target_sources(corei_w3dview INTERFACE ${W3DVIEW_SRC})
 
+target_precompile_headers(corei_w3dview INTERFACE
+    "StdAfx.h"
+    [["always.h"]]
+    [["STLUtils.h"]]
+    [["WWCommon.h"]]
+)
+
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
     target_sources(corei_w3dview INTERFACE W3DView.rc)
 endif()
diff --git a/Core/Tools/W3DView/CameraDistanceDialog.cpp b/Core/Tools/W3DView/CameraDistanceDialog.cpp
index 1ceeefb9b95..7064f0f35be 100644
--- a/Core/Tools/W3DView/CameraDistanceDialog.cpp
+++ b/Core/Tools/W3DView/CameraDistanceDialog.cpp
@@ -19,11 +19,11 @@
 // CameraDistanceDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-#include "cameradistancedialog.h"
-#include "utils.h"
-#include "graphicview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "CameraDistanceDialog.h"
+#include "Utils.h"
+#include "GraphicView.h"
 
 
 #ifdef RTS_DEBUG
@@ -76,7 +76,7 @@ END_MESSAGE_MAP()
 //
 /////////////////////////////////////////////////////////////////////////////
 BOOL
-CameraDistanceDialogClass::OnInitDialog (void) 
+CameraDistanceDialogClass::OnInitDialog (void)
 {
 	CDialog::OnInitDialog ();
 
@@ -116,17 +116,17 @@ CameraDistanceDialogClass::OnNotify
 	WPARAM wParam,
 	LPARAM lParam,
 	LRESULT *pResult
-) 
+)
 {
 	//
 	//	Update the spinner control if necessary
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 	}
-	
+
 	// Allow the base class to process this message
 	return CDialog::OnNotify (wParam, lParam, pResult);
 }
diff --git a/Core/Tools/W3DView/CameraDistanceDialog.h b/Core/Tools/W3DView/CameraDistanceDialog.h
index 6db4b2f6e6a..ffde9e0757a 100644
--- a/Core/Tools/W3DView/CameraDistanceDialog.h
+++ b/Core/Tools/W3DView/CameraDistanceDialog.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_CAMERADISTANCEDIALOG_H__548D3315_D582_4B97_8607_31B4659DF498__INCLUDED_)
-#define AFX_CAMERADISTANCEDIALOG_H__548D3315_D582_4B97_8607_31B4659DF498__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "resource.h"
 
@@ -64,5 +59,3 @@ class CameraDistanceDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_CAMERADISTANCEDIALOG_H__548D3315_D582_4B97_8607_31B4659DF498__INCLUDED_)
diff --git a/Core/Tools/W3DView/CameraSettingsDialog.cpp b/Core/Tools/W3DView/CameraSettingsDialog.cpp
index 44f58a6cc45..31c2a6b50a0 100644
--- a/Core/Tools/W3DView/CameraSettingsDialog.cpp
+++ b/Core/Tools/W3DView/CameraSettingsDialog.cpp
@@ -19,14 +19,14 @@
 // CameraSettingsDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-#include "w3dviewdoc.h"
-#include "graphicview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "W3DViewDoc.h"
+#include "GraphicView.h"
 #include "CameraSettingsDialog.h"
-#include "utils.h"
+#include "Utils.h"
 #include "camera.h"
-#include "viewerscene.h"
+#include "ViewerScene.h"
 
 
 #ifdef RTS_DEBUG
@@ -89,7 +89,7 @@ BOOL
 CameraSettingsDialogClass::OnInitDialog (void)
 {
 	CDialog::OnInitDialog ();
-	
+
 	CW3DViewDoc *doc				= ::GetCurrentDocument ();
 	CGraphicView *graphic_view = doc->GetGraphicView ();
 	CameraClass *camera			= graphic_view->GetCamera ();
@@ -102,10 +102,10 @@ CameraSettingsDialogClass::OnInitDialog (void)
 
 	float znear = 0;
 	float zfar = 0;
-	camera->Get_Clip_Planes (znear, zfar);		
+	camera->Get_Clip_Planes (znear, zfar);
 	::Initialize_Spinner (m_NearClipSpin, znear, 0.0F, 999999.0F);
-	::Initialize_Spinner (m_FarClipSpin, zfar, 1.0F, 999999.0F);	
-	
+	::Initialize_Spinner (m_FarClipSpin, zfar, 1.0F, 999999.0F);
+
 	//
 	//	Setup the FOV controls
 	//
@@ -174,7 +174,7 @@ CameraSettingsDialogClass::OnOK (void)
 	doc->GetScene()->Get_Fog_Range(&fog_near, &fog_far);
 	doc->GetScene()->Set_Fog_Range(znear, fog_far);
 	doc->GetScene()->Recalculate_Fog_Planes();
-	
+
 	//
 	//	Refresh the camera settings
 	//
@@ -194,7 +194,7 @@ CameraSettingsDialogClass::OnOK (void)
 //
 /////////////////////////////////////////////////////////////////////////////
 void
-CameraSettingsDialogClass::OnFovCheck (void) 
+CameraSettingsDialogClass::OnFovCheck (void)
 {
 	bool manual_fov = (SendDlgItemMessage (IDC_FOV_CHECK, BM_GETCHECK) == 1);
 	::EnableWindow (m_VFOVSpin, manual_fov);
@@ -213,7 +213,7 @@ CameraSettingsDialogClass::OnFovCheck (void)
 //
 /////////////////////////////////////////////////////////////////////////////
 void
-CameraSettingsDialogClass::OnClipPlaneCheck (void) 
+CameraSettingsDialogClass::OnClipPlaneCheck (void)
 {
 	bool manual_planes = (SendDlgItemMessage (IDC_CLIP_PLANE_CHECK, BM_GETCHECK) == 1);
 	::EnableWindow (m_NearClipSpin, manual_planes);
@@ -238,8 +238,8 @@ CameraSettingsDialogClass::OnReset (void)
 
 	doc->Set_Manual_FOV (false);
 	doc->Set_Manul_Clip_Planes (false);
-		
-	graphic_view->Reset_FOV ();	
+
+	graphic_view->Reset_FOV ();
 	RenderObjClass *render_obj = doc->GetDisplayedObject ();
 	if (render_obj != NULL) {
 		graphic_view->Reset_Camera_To_Display_Object (*render_obj);
@@ -261,7 +261,7 @@ CameraSettingsDialogClass::OnReset (void)
 	int vfov_deg = (int)RAD_TO_DEG (camera->Get_Vertical_FOV ());
 	::SetDlgItemFloat (m_hWnd, IDC_HFOV_EDIT, hfov_deg);
 	::SetDlgItemFloat (m_hWnd, IDC_VFOV_EDIT, vfov_deg);
-	
+
 	//
 	//	Setup the camera lens controls
 	//
@@ -283,14 +283,14 @@ CameraSettingsDialogClass::OnNotify
 	WPARAM wParam,
 	LPARAM lParam,
 	LRESULT *pResult
-) 
+)
 {
 	//
 	//	Update the spinner control if necessary
 	//
 	NMHDR *header = (NMHDR *)lParam;
 	if ((header != NULL) && (header->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN updown_info = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN updown_info = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (header->hwndFrom, updown_info->iDelta);
 
 		//
@@ -302,7 +302,7 @@ CameraSettingsDialogClass::OnNotify
 			Update_Camera_Lens ();
 		}
 	}
-	
+
 	// Allow the base class to process this message
 	return CDialog::OnNotify (wParam, lParam, pResult);
 }
@@ -327,7 +327,7 @@ CameraSettingsDialogClass::Update_Camera_Lens (void)
 	if (hfov > 0) {
 		const float constant	= (18.0F / 1000.0F);
 		float lens				= (constant / (::tan (DEG_TO_RAD (hfov) / 2))) * 1000.0F;
-		::SetDlgItemFloat (m_hWnd, IDC_LENS_EDIT, lens);	
+		::SetDlgItemFloat (m_hWnd, IDC_LENS_EDIT, lens);
 	}
 
 	return ;
@@ -375,7 +375,7 @@ CameraSettingsDialogClass::OnCommand
 (
 	WPARAM wParam,
 	LPARAM lParam
-) 
+)
 {
 	static bool updating = false;
 	if (updating == false) {
diff --git a/Core/Tools/W3DView/CameraSettingsDialog.h b/Core/Tools/W3DView/CameraSettingsDialog.h
index ddf192a7f0b..bd94ce278fc 100644
--- a/Core/Tools/W3DView/CameraSettingsDialog.h
+++ b/Core/Tools/W3DView/CameraSettingsDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_CAMERASETTINGSDIALOG_H__7E43F424_8191_11D3_A064_00104B791122__INCLUDED_)
-#define AFX_CAMERASETTINGSDIALOG_H__7E43F424_8191_11D3_A064_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // CameraSettingsDialog.h : header file
 //
 
@@ -68,7 +64,7 @@ class CameraSettingsDialogClass : public CDialog
 	DECLARE_MESSAGE_MAP()
 
 protected:
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Protected methods
 	///////////////////////////////////////////////////////////////////
@@ -78,5 +74,3 @@ class CameraSettingsDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_CAMERASETTINGSDIALOG_H__7E43F424_8191_11D3_A064_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/ColorBar.cpp b/Core/Tools/W3DView/ColorBar.cpp
index 5dbc76d3dc4..38ec40b1bd1 100644
--- a/Core/Tools/W3DView/ColorBar.cpp
+++ b/Core/Tools/W3DView/ColorBar.cpp
@@ -22,9 +22,9 @@
 //
 //
 
-#include "stdafx.h"
-#include "colorbar.h"
-#include "colorutils.h"
+#include "StdAfx.h"
+#include "ColorBar.h"
+#include "ColorUtils.h"
 #include "resource.h"
 #include <math.h>
 
@@ -128,7 +128,7 @@ ColorBarClass::~ColorBarClass (void)
 		::DeleteObject (m_hMemDC);
 		m_hMemDC = NULL;
 	}
-		
+
 	Free_Marker_Bitmap ();
 	Free_Bitmap ();
 	return ;
@@ -165,14 +165,14 @@ RegisterColorBar (HINSTANCE hinst)
 	// Has the class already been registered?
 	WNDCLASS wndclass = { 0 };
 	if (::GetClassInfo (hinst, "WWCOLORBAR", &wndclass) == FALSE) {
-		
+
 		wndclass.style = CS_GLOBALCLASS | CS_OWNDC | CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS;
 		wndclass.lpfnWndProc = fnColorBarProc;
 		wndclass.hInstance = hinst;
 		wndclass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
 		wndclass.hCursor = ::LoadCursor (NULL, IDC_ARROW);
 		wndclass.lpszClassName = "WWCOLORBAR";
-		
+
 		// Let the windows manager know about this global class
 		::RegisterClass (&wndclass);
 	}
@@ -214,7 +214,7 @@ fnColorBarProc
 
 				// Let the window know its being created
 				pwnd->OnCreate (pcreate_info);
-				
+
 				WNDPROC *pOldWndProc = pwnd->GetSuperWndProcAddr ();
 				if (pOldWndProc) {
 					WNDPROC pold_proc = (WNDPROC)::SetWindowLong (hwnd, GWL_WNDPROC, (DWORD)::AfxGetAfxWndProc ());
@@ -263,11 +263,11 @@ fnColorBarProc
 // OnCreate
 //
 int
-ColorBarClass::OnCreate (LPCREATESTRUCT lpCreateStruct) 
+ColorBarClass::OnCreate (LPCREATESTRUCT lpCreateStruct)
 {
 	if (CWnd::OnCreate (lpCreateStruct) == -1)
 		return -1;
-	
+
 	m_hMemDC = 	::CreateCompatibleDC (NULL);
 	Create_Bitmap ();
 	return 0;
@@ -329,7 +329,7 @@ ColorBarClass::Create_Bitmap (void)
 	m_ColorArea.top = 0;
 	m_ColorArea.right = m_iBMPWidth;
 	m_ColorArea.bottom = m_iBMPHeight;
-	
+
 	//
 	//	Deflate the rect to make room for any frame
 	//
@@ -340,7 +340,7 @@ ColorBarClass::Create_Bitmap (void)
 
 	//
 	//	Decrease the width or height if frame markers are shown
-	//	
+	//
 	if (style & CBRS_SHOW_FRAMES) {
 		Load_Key_Frame_BMP ();
 		if (style & CBRS_HORZ) {
@@ -359,7 +359,7 @@ ColorBarClass::Create_Bitmap (void)
 		} else {
 			m_ColorArea.top += 2;
 			m_ColorArea.bottom -= 2;
-		}		
+		}
 	}
 
 	// Set-up the fields of the BITMAPINFOHEADER
@@ -431,7 +431,7 @@ ColorBarClass::OnSize
 	UINT nType,
 	int cx,
 	int cy
-) 
+)
 {
 	// Allow the base class to process this message
 	CWnd::OnSize (nType, cx, cy);
@@ -459,7 +459,7 @@ ColorBarClass::Paint_Bar_Vert
 	// Loop through all the color switches
 	int row = y_pos;
 	for (int color_point = 0; color_point < m_iColorPoints; color_point ++) {
-		
+
 		// Get the starting red, green, and blue values for this color lerp
 		float red = m_ColorPoints[color_point].StartRed;
 		float green = m_ColorPoints[color_point].StartGreen;
@@ -518,8 +518,8 @@ ColorBarClass::Paint_Bar_Horz
 	if (style & CBRS_PAINT_GRAPH) {
 
 		// Loop through all the color switches
-		int col = x_pos;	
-		for (int color_point = 0; color_point < m_iColorPoints; color_point ++) {			
+		int col = x_pos;
+		for (int color_point = 0; color_point < m_iColorPoints; color_point ++) {
 			float graph_percent = m_ColorPoints[color_point].StartGraphPercent;
 
 			// Index into the bitmap's bits
@@ -529,12 +529,12 @@ ColorBarClass::Paint_Bar_Horz
 			int end_pos = m_ColorPoints[color_point].EndPos;
 			end_pos = (end_pos > (x_pos + width)) ? (x_pos + width) : end_pos;
 			for (; col < m_ColorPoints[color_point].EndPos; col ++) {
-				
+
 				// Paint a complete column of color data
 				int bitmap_offset = 0;
 				bool prev_was = true;
 				for (int row = y_pos; row < (y_pos + height); row ++) {
-					
+
 					float percent = 1 - graph_percent;
 					float height_percent = (((float)row) / ((float)height));
 					if (percent < height_percent) {
@@ -573,9 +573,9 @@ ColorBarClass::Paint_Bar_Horz
 	} else {
 
 		// Loop through all the color switches
-		int col = x_pos;	
+		int col = x_pos;
 		for (int color_point = 0; color_point < m_iColorPoints; color_point ++) {
-			
+
 			// Get the starting red, green, and blue values for this color lerp
 			float red = m_ColorPoints[color_point].StartRed;
 			float green = m_ColorPoints[color_point].StartGreen;
@@ -588,11 +588,11 @@ ColorBarClass::Paint_Bar_Horz
 			int end_pos = m_ColorPoints[color_point].EndPos;
 			end_pos = (end_pos > (x_pos + width)) ? (x_pos + width) : end_pos;
 			for (; col < m_ColorPoints[color_point].EndPos; col ++) {
-				
+
 				// Paint a complete column of color data
 				int bitmap_offset = 0;
 				for (int row = y_pos; row < (y_pos + height); row ++) {
-					
+
 					// Paint the pixel
 					pbits[bitmap_index + bitmap_offset]		= UCHAR(((int)blue) & 0xFF);
 					pbits[bitmap_index + bitmap_offset+1]	= UCHAR(((int)green) & 0xFF);
@@ -633,7 +633,7 @@ ColorBarClass::Paint_DIB (void)
 	CRect fill_rect (0, 0, m_iBMPWidth, m_iBMPHeight);
 	HBITMAP hold_bmp = (HBITMAP)::SelectObject (m_hMemDC, m_hBitmap);
 	::FillRect (m_hMemDC, &fill_rect, (HBRUSH)(COLOR_3DFACE + 1));
-	::SelectObject (m_hMemDC, hold_bmp);	
+	::SelectObject (m_hMemDC, hold_bmp);
 
 	//
 	//	Paint the border (if any)
@@ -667,8 +667,8 @@ ColorBarClass::Paint_DIB (void)
 
 	//
 	//	Do we need to paint the keyframe markers?
-	//	
-	if (style & CBRS_SHOW_FRAMES) {		
+	//
+	if (style & CBRS_SHOW_FRAMES) {
 
 		//
 		//	Setup the marker positions
@@ -700,10 +700,10 @@ ColorBarClass::Paint_DIB (void)
 		}
 
 	} else if (style & CBRS_HAS_SEL) {
-		
+
 		CRect frame;
 		Get_Selection_Rectangle (frame);
-		
+
 		//
 		//	Paint the selection rectangles
 		//
@@ -711,7 +711,7 @@ ColorBarClass::Paint_DIB (void)
 		frame.InflateRect (-1, -1);
 		::Frame_Rect (m_pBits, frame, RGB (255, 255, 255), m_iScanlineSize);
 	}
-	
+
 	return ;
 }
 
@@ -724,7 +724,7 @@ void
 ColorBarClass::OnPaint (void)
 {
 	CPaintDC dc (this);
-	Paint_Screen (dc);	
+	Paint_Screen (dc);
 	return ;
 }
 
@@ -737,7 +737,7 @@ void
 ColorBarClass::Paint_Screen (HDC hwnd_dc)
 {
 	if (m_hMemDC != NULL) {
-				
+
 		//
 		//	Blit the actual color bar to the screen
 		//
@@ -749,10 +749,10 @@ ColorBarClass::Paint_Screen (HDC hwnd_dc)
 		//	Do we have the focus?
 		//
 		if (::GetFocus () == m_hWnd) {
-						
+
 			LONG style = ::GetWindowLong (m_hWnd, GWL_STYLE);
 			if (style & CBRS_SHOW_FRAMES) {
-				
+
 				//
 				//	Calculate the current frame marker's current rectangle
 				//
@@ -766,20 +766,20 @@ ColorBarClass::Paint_Screen (HDC hwnd_dc)
 					focus_rect.top = m_ColorPoints[m_iCurrentKey].StartPos - (m_iMarkerHeight >> 1);
 				}
 				focus_rect.right = focus_rect.left + m_iMarkerWidth;
-				focus_rect.bottom = focus_rect.top + m_iMarkerHeight;	
+				focus_rect.bottom = focus_rect.top + m_iMarkerHeight;
 
 				//
 				//	Paint the focus rectangle
 				//
 				::DrawFocusRect (hwnd_dc, focus_rect);
 			} else if (style & CBRS_HAS_SEL) {
-				
+
 				//
 				//	Paint the focus rectangle
-				//				
+				//
 				CRect focus_rect;
 				Get_Selection_Rectangle (focus_rect);
-				::DrawFocusRect (hwnd_dc, focus_rect);				
+				::DrawFocusRect (hwnd_dc, focus_rect);
 			}
 		}
 	}
@@ -806,7 +806,7 @@ ColorBarClass::Get_Point
 	bool retval = false;
 
 	if ((index >= 0) && (index < m_iColorPoints)) {
-		
+
 		// Return the position to the caller if requested
 		if (position != NULL) {
 			(*position) = m_MinPos + (m_ColorPoints[index].PosPercent * (m_MaxPos - m_MinPos));
@@ -827,7 +827,7 @@ ColorBarClass::Get_Point
 			(*blue) = m_ColorPoints[index].StartBlue;
 		}
 	}
-	
+
 	// Return the true/false result code
 	return retval;
 }
@@ -850,7 +850,7 @@ ColorBarClass::Insert_Point (CPoint point, DWORD flags)
 
 	//
 	//	Determine what properties the new point should have
-	//	
+	//
 	LONG style = ::GetWindowLong (m_hWnd, GWL_STYLE);
 	if (style & CBRS_HORZ) {
 		position = point.x - m_ColorArea.left;
@@ -868,11 +868,11 @@ ColorBarClass::Insert_Point (CPoint point, DWORD flags)
 		blue	= m_pBits[bmp_index];
 		green = m_pBits[bmp_index+1];
 		red	= m_pBits[bmp_index+2];
-	}	
+	}
 
 	//
 	//	Find the index where this point should be inserted
-	//	
+	//
 	bool found = false;
 	float graph_percent = 0;
 	for (int index = 0; (index < m_iColorPoints) && !found; index ++) {
@@ -888,7 +888,7 @@ ColorBarClass::Insert_Point (CPoint point, DWORD flags)
 			float key_percent = (((float)position) - ((float)m_ColorPoints[index].StartPos)) / float(m_ColorPoints[index].EndPos - m_ColorPoints[index].StartPos);
 			float graph_start = m_ColorPoints[index].StartGraphPercent;
 			float graph_delta = (m_ColorPoints[index].EndPos - m_ColorPoints[index].StartPos) * m_ColorPoints[index].GraphPercentInc;
-			graph_percent = graph_start + (key_percent * graph_delta);			
+			graph_percent = graph_start + (key_percent * graph_delta);
 		}
 	}
 
@@ -908,7 +908,7 @@ ColorBarClass::Insert_Point (CPoint point, DWORD flags)
 
 		Set_Redraw (true);
 	}
-	
+
 	return retval;
 }
 
@@ -947,7 +947,7 @@ ColorBarClass::Insert_Point
 		// Now all we have to do is modify the contents of the new point
 		retval = Modify_Point (index, position, red, green, blue, flags);
 	}
-	
+
 	// Return the true/false result code
 	return retval;
 }
@@ -985,7 +985,7 @@ ColorBarClass::Delete_Point (int index)
 		Repaint ();
 		retval = true;
 	}
-	
+
 	// Return the true/false result code
 	return retval;
 }
@@ -1010,7 +1010,7 @@ ColorBarClass::Modify_Point
 	bool retval = false;
 
 	if ((index >= 0) && (index < m_iColorPoints)) {
-		
+
 		// Update the information about this color point
 		m_ColorPoints[index].PosPercent = ((position - m_MinPos) / (m_MaxPos - m_MinPos));
 		m_ColorPoints[index].StartRed = red;
@@ -1033,7 +1033,7 @@ ColorBarClass::Modify_Point
 		// If the user wants to tag on onto the end, then insert a new point...
 		retval = Insert_Point (m_iColorPoints, position, red, green, blue);
 	}
-	
+
 	// Return the true/false result code
 	return retval;
 }
@@ -1064,9 +1064,9 @@ ColorBarClass::Set_Range
 //
 void
 ColorBarClass::Update_Point_Info (void)
-{	
+{
 	int width = m_ColorArea.Width ();
-	int height = m_ColorArea.Height ();	
+	int height = m_ColorArea.Height ();
 
 	LONG style = GetWindowLong (m_hWnd, GWL_STYLE);
 	if (style & CBRS_HORZ) {
@@ -1079,9 +1079,9 @@ ColorBarClass::Update_Point_Info (void)
 			m_ColorPoints[index].StartPos = m_ColorArea.left + int(m_ColorPoints[index].PosPercent * width);
 
 			// Update the color information for the previous point
-			if (index > 0) {			
+			if (index > 0) {
 				m_ColorPoints[index-1].EndPos = m_ColorPoints[index].StartPos;
-				
+
 				//
 				// Assign color increments to the previous color point
 				//
@@ -1111,9 +1111,9 @@ ColorBarClass::Update_Point_Info (void)
 			m_ColorPoints[index].StartPos = m_ColorArea.top + int(m_ColorPoints[index].PosPercent * height);
 
 			// Update the color information for the previous point
-			if (index > 0) {			
+			if (index > 0) {
 				m_ColorPoints[index-1].EndPos = m_ColorPoints[index].StartPos;
-				
+
 				// Assign color increments to the previous color point
 				int height = m_ColorPoints[index-1].EndPos - m_ColorPoints[index-1].StartPos;
 				m_ColorPoints[index-1].RedInc = (m_ColorPoints[index].StartRed - m_ColorPoints[index-1].StartRed) / ((float)height);
@@ -1215,7 +1215,7 @@ ColorBarClass::Load_Key_Frame_BMP (void)
 
 	// Copy the marker from the BMP to the DIB section
 	::BitBlt (m_hMemDC, 0, 0, m_iMarkerWidth, m_iMarkerHeight, htemp_dc, 0, 0, SRCCOPY);
-	
+
 	//	Restore the DCs
 	::SelectObject (m_hMemDC, hold_bmp1);
 	::SelectObject (htemp_dc, hold_bmp2);
@@ -1239,19 +1239,19 @@ ColorBarClass::Paint_Key_Frame (int x_pos, int y_pos)
 	int marker_scanline = (m_iMarkerWidth * 3) + alignment_offset;
 	int width_in_bytes = m_iMarkerWidth * 3;
 
-	if ((m_pBits != NULL) && (m_pKeyFrameBits != NULL)) {		
+	if ((m_pBits != NULL) && (m_pKeyFrameBits != NULL)) {
 		int dest_index = (m_iScanlineSize * y_pos) + (x_pos * 3);
 		int src_index = 0;
 
 		//
 		//	'Blit' the image from the source buffer to the dest buffer
 		//
-		for (int scanline = 0; scanline < m_iMarkerHeight; scanline ++) {			
+		for (int scanline = 0; scanline < m_iMarkerHeight; scanline ++) {
 			for (int pixel = 0; pixel < m_iMarkerWidth; pixel ++) {
 				BYTE blue	= m_pKeyFrameBits[src_index ++];
 				BYTE green	= m_pKeyFrameBits[src_index ++];
 				BYTE red		= m_pKeyFrameBits[src_index ++];
-				
+
 				if (blue == 255 && green == 0 && red == 255) {
 					dest_index += 3;
 				} else {
@@ -1292,8 +1292,8 @@ ColorBarClass::Marker_From_Point (CPoint point)
 	} else {
 		position = point.y;// - m_ColorArea.top;
 		accept_dist = (m_iMarkerHeight + 1) >> 1;
-	}	
-	
+	}
+
 	//
 	//	Search through all the points, trying to find the closest
 	//
@@ -1339,7 +1339,7 @@ ColorBarClass::OnLButtonDown
 
 	LONG style = ::GetWindowLong (m_hWnd, GWL_STYLE);
 	if (style & CBRS_SHOW_FRAMES) {
-		
+
 		//
 		//	Find the key frame the user clicked on
 		//
@@ -1376,7 +1376,7 @@ ColorBarClass::OnLButtonDown
 			::ReleaseCapture ();
 		}
 	} else if (style & CBRS_HAS_SEL) {
-		
+
 		Move_Selection (point);
 //		CRect rect;
 		//Get_Selection_Rectangle (rect);
@@ -1448,7 +1448,7 @@ ColorBarClass::OnMouseMove
 			if (m_iCurrentKey < (m_iColorPoints - 1)) {
 				max_percent = m_ColorPoints[m_iCurrentKey + 1].PosPercent - 0.01F;
 			}
-			
+
 			//
 			//	Determine where the marker should be
 			//
@@ -1478,7 +1478,7 @@ ColorBarClass::OnMouseMove
 			HDC hwnd_dc = ::GetDC (m_hWnd);
 			Paint_Screen (hwnd_dc);
 			::ReleaseDC (m_hWnd, hwnd_dc);
-			
+
 			//
 			//	Notify the parent window that the user dragged
 			// one of the keyframes
@@ -1528,11 +1528,11 @@ ColorBarClass::Send_Notification (int code, int key)
 // OnKillFocus
 //
 void
-ColorBarClass::OnKillFocus (CWnd *pNewWnd) 
+ColorBarClass::OnKillFocus (CWnd *pNewWnd)
 {
 	// Force a repaint
 	Repaint ();
-	
+
 	CWnd::OnKillFocus (pNewWnd);
 	return ;
 }
@@ -1543,7 +1543,7 @@ ColorBarClass::OnKillFocus (CWnd *pNewWnd)
 // OnSetFocus
 //
 void
-ColorBarClass::OnSetFocus (CWnd *pOldWnd) 
+ColorBarClass::OnSetFocus (CWnd *pOldWnd)
 {
 	// Force a repaint
 	Repaint ();
@@ -1565,22 +1565,22 @@ ColorBarClass::OnKeyDown
 	UINT nFlags
 )
 {
-	if ((nChar == VK_DELETE) && (::GetFocus () == m_hWnd)) {		
+	if ((nChar == VK_DELETE) && (::GetFocus () == m_hWnd)) {
 
 		//
 		//	Notify the parent window that we are deleting a key
 		// and ask them if its OK to contiue
 		//
 		if (Send_Notification (CBRN_DEL_POINT, m_iCurrentKey) != STOP_EVENT) {
-			
+
 			// Go ahead and delete the point
-			Delete_Point (m_iCurrentKey);			
+			Delete_Point (m_iCurrentKey);
 			Send_Notification (CBRN_DELETED_POINT, m_iCurrentKey);
 		}
 	}/* else if (::GetFocus () == m_hWnd) {
-		if (nChar == VK_RIGHT) && 
+		if (nChar == VK_RIGHT) &&
 	}*/
-	
+
 	CWnd::OnKeyDown(nChar, nRepCnt, nFlags);
 	return ;
 }
@@ -1595,18 +1595,18 @@ ColorBarClass::OnLButtonDblClk
 (
 	UINT nFlags,
 	CPoint point
-) 
+)
 {
 	int marker_clicked = Marker_From_Point (point);
 	if (marker_clicked != -1) {
-		
+
 		//
 		//	Notify the parent window that the user double-clicked
 		// one of the keyframes
-		//		
+		//
 		Send_Notification (CBRN_DBLCLK_POINT, marker_clicked);
 	}
-	
+
 	CWnd::OnLButtonDblClk(nFlags, point);
 	return ;
 }
@@ -1643,7 +1643,7 @@ ColorBarClass::Get_Selection_Rectangle (CRect &rect)
 			rect.right ++;
 		}
 	}
-	
+
 	return ;
 }
 
@@ -1680,9 +1680,9 @@ ColorBarClass::Move_Selection (CPoint point, bool send_notify)
 	if (style & CBRS_HORZ) {
 		percent = (((float)(point.x - m_ColorArea.left)) / ((float)m_ColorArea.Width ()));
 	} else {
-		percent = (((float)(point.y - m_ColorArea.top)) / ((float)m_ColorArea.Height ()));				
+		percent = (((float)(point.y - m_ColorArea.top)) / ((float)m_ColorArea.Height ()));
 	}
-	float new_pos = m_MinPos + (percent * (m_MaxPos - m_MinPos));			
+	float new_pos = m_MinPos + (percent * (m_MaxPos - m_MinPos));
 	new_pos = max (new_pos, m_MinPos);
 	new_pos = min (new_pos, m_MaxPos);
 
@@ -1701,7 +1701,7 @@ ColorBarClass::Move_Selection (float new_pos, bool send_notify)
 {
 	if (new_pos != m_SelectionPos) {
 		m_SelectionPos = new_pos;
-		
+
 		//
 		//	Notify the parent window that the user changed the selection
 		//
@@ -1712,7 +1712,7 @@ ColorBarClass::Move_Selection (float new_pos, bool send_notify)
 			notify_hdr.hdr.idFrom = id;
 			notify_hdr.hdr.code = CBRN_SEL_CHANGED;
 			notify_hdr.position = m_SelectionPos;
-			
+
 			// Determine the color are this position
 			Get_Color (m_SelectionPos,
 							&notify_hdr.red,
@@ -1727,9 +1727,9 @@ ColorBarClass::Move_Selection (float new_pos, bool send_notify)
 								id,
 								(LPARAM)&notify_hdr);
 		}
-		
+
 		// Repaint the color bar with the new selection rectangle
-		Paint_DIB ();	
+		Paint_DIB ();
 
 		//
 		//	Repaint the screen
@@ -1776,11 +1776,11 @@ ColorBarClass::Get_Color
 		(*blue)	= m_pBits[bmp_index];
 		(*green) = m_pBits[bmp_index+1];
 		(*red)	= m_pBits[bmp_index+2];*/
-	}	
+	}
 
 	//
 	//	Find the index where this point should be inserted
-	//	
+	//
 	bool found = false;
 	int key_index = 0;
 	for (int index = 0; (index < m_iColorPoints) && !found; index ++) {
@@ -1838,7 +1838,7 @@ bool
 ColorBarClass::Set_User_Data (int index, DWORD data)
 {
 	bool retval = false;
-	if ((index >= 0) && (index < m_iColorPoints)) {		
+	if ((index >= 0) && (index < m_iColorPoints)) {
 		m_ColorPoints[index].user_data = data;
 		retval = true;
 	}
@@ -1855,7 +1855,7 @@ DWORD
 ColorBarClass::Get_User_Data (int index)
 {
 	DWORD data = 0;
-	if ((index >= 0) && (index < m_iColorPoints)) {		
+	if ((index >= 0) && (index < m_iColorPoints)) {
 		data = m_ColorPoints[index].user_data;
 	}
 
@@ -1927,7 +1927,7 @@ void
 ColorBarClass::Repaint (void)
 {
 	InvalidateRect (NULL, FALSE);
-	if (m_bRedraw) {		
+	if (m_bRedraw) {
 		UpdateWindow ();
 	}
 
diff --git a/Core/Tools/W3DView/ColorBar.h b/Core/Tools/W3DView/ColorBar.h
index e44114a94ed..a1efce422d8 100644
--- a/Core/Tools/W3DView/ColorBar.h
+++ b/Core/Tools/W3DView/ColorBar.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_COLORBAR_H__D1243F40_D4D2_11D2_8DDF_00104B6FD9E3__INCLUDED_)
-#define AFX_COLORBAR_H__D1243F40_D4D2_11D2_8DDF_00104B6FD9E3__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // ColorBar.h : header file
 //
 
@@ -133,7 +129,7 @@ class ColorBarClass : public CWnd
 	friend LRESULT WINAPI fnColorBarProc (HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
 
 	public:
-		
+
 		/////////////////////////////////////////////////////////////////////////
 		//
 		//	Public methods
@@ -175,7 +171,7 @@ class ColorBarClass : public CWnd
 		//
 		typedef struct
 		{
-			float	PosPercent;			
+			float	PosPercent;
 			int	StartPos;
 			int	EndPos;
 
@@ -184,7 +180,7 @@ class ColorBarClass : public CWnd
 
 			float StartRed;
 			float StartGreen;
-			float StartBlue;			
+			float StartBlue;
 
 			float	RedInc;
 			float	GreenInc;
@@ -248,5 +244,3 @@ class ColorBarClass : public CWnd
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_COLORBAR_H__D1243F40_D4D2_11D2_8DDF_00104B6FD9E3__INCLUDED_)
diff --git a/Core/Tools/W3DView/ColorPicker.cpp b/Core/Tools/W3DView/ColorPicker.cpp
index 40ca884c268..ca4e95f7006 100644
--- a/Core/Tools/W3DView/ColorPicker.cpp
+++ b/Core/Tools/W3DView/ColorPicker.cpp
@@ -22,11 +22,11 @@
 //
 //
 
-#include "stdafx.h"
-#include "colorpicker.h"
-#include "colorpickerdialogclass.h"
+#include "StdAfx.h"
+#include "ColorPicker.h"
+#include "ColorPickerDialogClass.h"
 #include <math.h>
-#include "utils.h"
+#include "Utils.h"
 
 
 #ifdef RTS_DEBUG
@@ -69,7 +69,7 @@ ColorPickerClass::~ColorPickerClass (void)
 		::DeleteObject (m_hMemDC);
 		m_hMemDC = NULL;
 	}
-		
+
 	Free_Bitmap ();
 	return ;
 }
@@ -98,7 +98,7 @@ ColorPickerClass::OnPaint (void)
 	CPaintDC dc (this);
 
 	if (m_hMemDC != NULL) {
-		
+
 		HBITMAP hold_bmp = (HBITMAP)::SelectObject (m_hMemDC, m_hBitmap);
 
 		CRect rect;
@@ -108,7 +108,7 @@ ColorPickerClass::OnPaint (void)
 		::SelectObject (m_hMemDC, hold_bmp);
 		Paint_Marker ();
 	}
-	
+
 	return ;
 }
 
@@ -127,14 +127,14 @@ RegisterColorPicker (HINSTANCE hinst)
 	// Has the class already been registered?
 	WNDCLASS wndclass = { 0 };
 	if (::GetClassInfo (hinst, "WWCOLORPICKER", &wndclass) == FALSE) {
-		
+
 		wndclass.style = CS_GLOBALCLASS | CS_OWNDC | CS_VREDRAW | CS_HREDRAW;
 		wndclass.lpfnWndProc = fnColorPickerProc;
 		wndclass.hInstance = hinst;
 		wndclass.hbrBackground = (HBRUSH)COLOR_3DFACE + 1;
 		wndclass.hCursor = ::LoadCursor (NULL, IDC_ARROW);
 		wndclass.lpszClassName = "WWCOLORPICKER";
-		
+
 		// Let the windows manager know about this global class
 		::RegisterClass (&wndclass);
 	}
@@ -194,7 +194,7 @@ fnColorPickerProc
 				::SetProp (hwnd, "CREATED", (HANDLE)created);
 			}
 		}
-		break;			
+		break;
 
 		case WM_DESTROY:
 		{
@@ -244,7 +244,7 @@ fnColorPickerProc
 //
 /////////////////////////////////////////////////////////////////////////////
 int
-ColorPickerClass::OnCreate (LPCREATESTRUCT lpCreateStruct) 
+ColorPickerClass::OnCreate (LPCREATESTRUCT lpCreateStruct)
 {
 	if (CWnd::OnCreate(lpCreateStruct) == -1)
 		return -1;
@@ -359,7 +359,7 @@ ColorPickerClass::Fill_Rect
 	UCHAR green = GetRValue (color);
 	UCHAR blue = GetRValue (color);
 
-	for (int irow = rect.top; irow < rect.bottom; irow ++) {				
+	for (int irow = rect.top; irow < rect.bottom; irow ++) {
 		int index = irow * scanline_size;
 		index += (rect.left * 3);
 
@@ -369,7 +369,7 @@ ColorPickerClass::Fill_Rect
 			pbits[index++] = red;
 		}
 	}
-	
+
 	return ;
 }
 
@@ -396,8 +396,8 @@ ColorPickerClass::Color_From_Point
 		// we take that into account.
 		int alignment_offset = (m_iWidth * 3) % 4;
 		alignment_offset = (alignment_offset != 0) ? (4 - alignment_offset) : 0;
-		int scanline_size = (m_iWidth * 3) + alignment_offset;	
-		
+		int scanline_size = (m_iWidth * 3) + alignment_offset;
+
 		// Read the color value straight from the BMP
 		int index = (scanline_size * y) + (x * 3);
 		int blue = m_pBits[index];
@@ -406,7 +406,7 @@ ColorPickerClass::Color_From_Point
 
 		// Turn the individual compenents into a color
 		color = RGB (red, green, blue);
-		
+
 		RECT rect;
 		Calc_Display_Rect (rect);
 		int width = rect.right-rect.left;
@@ -489,7 +489,7 @@ RGB_to_Hue (int red_val, int green_val, int blue_val, float &hue, float &value)
 	float hue_angle = 0;
 	float hue_radius = 0;
 	::Rect_To_Polar (result.x, result.y, hue_radius, hue_angle);
-	
+
 	hue = hue_angle / (3.14159265359F * 2.0F);
 	if (hue < 0) {
 		hue += 1;
@@ -514,7 +514,7 @@ ColorPickerClass::Point_From_Color (COLORREF color)
 	// we take that into account.
 	int alignment_offset = (m_iWidth * 3) % 4;
 	alignment_offset = (alignment_offset != 0) ? (4 - alignment_offset) : 0;
-	int scanline_size = (m_iWidth * 3) + alignment_offset;	
+	int scanline_size = (m_iWidth * 3) + alignment_offset;
 
 	int red = GetRValue (color);
 	int green = GetGValue (color);
@@ -529,7 +529,7 @@ ColorPickerClass::Point_From_Color (COLORREF color)
 	int width = rect.right-rect.left;
 	int height = rect.bottom-rect.top;
 
-	float whiteness = (float)min (min (red, green), blue);	
+	float whiteness = (float)min (min (red, green), blue);
 	float percent = whiteness / 255;
 	float darkness = 0;
 
@@ -568,12 +568,12 @@ ColorPickerClass::Paint_DIB
 	// we take that into account.
 	int alignment_offset = (width * 3) % 4;
 	alignment_offset = (alignment_offset != 0) ? (4 - alignment_offset) : 0;
-	int scanline_size = (width * 3) + alignment_offset;	
+	int scanline_size = (width * 3) + alignment_offset;
 
 	//
 	//	Paint the border (if any)
 	//
-	CRect rect (0, 0, width, height);	
+	CRect rect (0, 0, width, height);
 	LONG lstyle = ::GetWindowLong (m_hWnd, GWL_STYLE);
 	if (lstyle & CPS_SUNKEN) {
 		::Draw_Sunken_Rect (pbits, rect, scanline_size);
@@ -589,13 +589,13 @@ ColorPickerClass::Paint_DIB
 	// Recalc the width and height (it could of changed)
 	width = rect.Width ();
 	height = rect.Height ();
-	
+
 	// Build an array of column indicies where we will switch color
 	// components...
 	int col_remainder = (width % 6);
 	int channel_switch_cols[6];
 	for (int channel = 0; channel < 6; channel ++) {
-		
+
 		// Each column has at least X/6 pixels
 		channel_switch_cols[channel] = width / 6;
 
@@ -626,7 +626,7 @@ ColorPickerClass::Paint_DIB
 	//	Paint the image
 	//
 	for (int icol = rect.left; icol < rect.right; icol ++) {
-		
+
 		// Determine how much to 'darken' the current hue by for each row (goes to black)
 		float red_dec = -((float)(red) / (float)(height-1));
 		float green_dec = -((float)(green) / (float)(height-1));
@@ -636,15 +636,15 @@ ColorPickerClass::Paint_DIB
 		float curr_red = red;
 		float curr_green = green;
 		float curr_blue = blue;
-		
+
 		// Paint all pixels in this row
 		int bitmap_index = (icol * 3) + (rect.left * scanline_size);
 		for (int irow = rect.top; irow < rect.bottom; irow ++) {
-										
+
 			// Put these values into the bitmap
 			pbits[bitmap_index]		= UCHAR(((int)curr_blue) & 0xFF);
 			pbits[bitmap_index + 1] = UCHAR(((int)curr_green) & 0xFF);
-			pbits[bitmap_index + 2]	= UCHAR(((int)curr_red) & 0xFF);				
+			pbits[bitmap_index + 2]	= UCHAR(((int)curr_red) & 0xFF);
 
 			// Determine the current red, green, and blue values
 			curr_red = curr_red + red_dec;
@@ -657,7 +657,7 @@ ColorPickerClass::Paint_DIB
 
 		// Is it time to switch to a new color channel?
 		if ((icol - rect.left) == channel_switch_cols[curr_channel]) {
-			
+
 			// Recompute values for the new channel
 			curr_channel ++;
 			curr_inc = (255.0F / ((float)(channel_switch_cols[curr_channel] - channel_switch_cols[curr_channel-1])));
@@ -718,7 +718,7 @@ ColorPickerClass::OnSize
 	UINT nType,
 	int cx,
 	int cy
-) 
+)
 {
 	// Allow the base class to process this message
 	CWnd::OnSize (nType, cx, cy);
@@ -766,7 +766,7 @@ ColorPickerClass::OnLButtonDown
 	::ClipCursor (&rect);
 
 	Erase_Marker ();
-	
+
 	m_CurrentPoint = point;
 	m_CurrentColor = Color_From_Point (point.x, point.y);
 
@@ -811,7 +811,7 @@ ColorPickerClass::OnLButtonUp
 	if (m_bSelecting) {
 		::ClipCursor (NULL);
 		ReleaseCapture ();
-		m_bSelecting = false;		
+		m_bSelecting = false;
 	}
 
 	// Allow the base class to process this message
@@ -836,7 +836,7 @@ ColorPickerClass::OnMouseMove
 		Erase_Marker ();
 
 		m_CurrentPoint = point;
-		m_CurrentColor = Color_From_Point (point.x, point.y);		
+		m_CurrentColor = Color_From_Point (point.x, point.y);
 
 		//
 		//	Notify the parent window that the user double-clicked
@@ -915,7 +915,7 @@ ColorPickerClass::Erase_Marker (void)
 		::SelectObject (m_hMemDC, hold_bmp);
 	}
 
-	::ReleaseDC (m_hWnd, hdc);	
+	::ReleaseDC (m_hWnd, hdc);
 	return ;
 }
 
@@ -950,7 +950,7 @@ ColorPickerClass::Paint_Marker (void)
 		::DeleteObject (hmarker_bmp);
 	}
 
-	::ReleaseDC (m_hWnd, hdc);	
+	::ReleaseDC (m_hWnd, hdc);
 	return ;
 }
 
diff --git a/Core/Tools/W3DView/ColorPicker.h b/Core/Tools/W3DView/ColorPicker.h
index 774151cf4be..6d4941b0a1b 100644
--- a/Core/Tools/W3DView/ColorPicker.h
+++ b/Core/Tools/W3DView/ColorPicker.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_COLORPICKER_H__C943A7EC_CAA3_11D2_8DDF_00104B6FD9E3__INCLUDED_)
-#define AFX_COLORPICKER_H__C943A7EC_CAA3_11D2_8DDF_00104B6FD9E3__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // ColorPicker.h : header file
 //
 
@@ -115,7 +111,7 @@ class ColorPickerClass : public CWnd
 		//	Static members
 		//////////////////////////////////////////////////////////////////////////
 		static ColorPickerClass *Get_Color_Picker (HWND window_handle)	{  return (ColorPickerClass *)::GetProp (window_handle, "CLASSPOINTER"); }
-		
+
 	protected:
 
 		/////////////////////////////////////////////////////////////////////////
@@ -157,5 +153,3 @@ class ColorPickerClass : public CWnd
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_COLORPICKER_H__C943A7EC_CAA3_11D2_8DDF_00104B6FD9E3__INCLUDED_)
diff --git a/Core/Tools/W3DView/ColorPickerDialogClass.cpp b/Core/Tools/W3DView/ColorPickerDialogClass.cpp
index dc123313994..554595a4ad7 100644
--- a/Core/Tools/W3DView/ColorPickerDialogClass.cpp
+++ b/Core/Tools/W3DView/ColorPickerDialogClass.cpp
@@ -19,10 +19,10 @@
 // ColorPickerDialogClass.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "colorpickerdialogclass.h"
-#include "colorbar.h"
-#include "colorpicker.h"
+#include "StdAfx.h"
+#include "ColorPickerDialogClass.h"
+#include "ColorBar.h"
+#include "ColorPicker.h"
 
 
 #ifdef RTS_DEBUG
@@ -45,7 +45,7 @@ const DWORD	UPDATE_HUE_PICKER		= 0x00000004;
 /*class MyManageStateClass
 {
 	public:
-		MyManageStateClass (void)	
+		MyManageStateClass (void)
 		{
 			m_hResHandle = ::AfxGetResourceHandle ();
 			::AfxSetResourceHandle (_hinstance);
@@ -245,7 +245,7 @@ END_MESSAGE_MAP()
 //
 /////////////////////////////////////////////////////////////////////////////
 BOOL
-ColorPickerDialogClass::OnInitDialog (void) 
+ColorPickerDialogClass::OnInitDialog (void)
 {
 	CDialog::OnInitDialog ();
 
@@ -267,9 +267,9 @@ ColorPickerDialogClass::OnInitDialog (void)
 	m_RedColorBar			= ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_RED_BAR));
 	m_GreenColorBar		= ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_GREEN_BAR));
 	m_BlueColorBar			= ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_BLUE_BAR));
-	m_WhitenessColorBar	= ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_WHITENESS_BAR));	
-	m_HuePicker				= ColorPickerClass::Get_Color_Picker (::GetDlgItem (m_hWnd, IDC_HUE_PICKER));	
-	
+	m_WhitenessColorBar	= ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_WHITENESS_BAR));
+	m_HuePicker				= ColorPickerClass::Get_Color_Picker (::GetDlgItem (m_hWnd, IDC_HUE_PICKER));
+
 	// Setup the original color bar
 	m_OrigColorBar->Modify_Point (0, 0, m_OrigRed, m_OrigGreen, m_OrigBlue);
 	m_HuePicker->Select_Color ((int)m_OrigRed, (int)m_OrigGreen, (int)m_OrigBlue);
@@ -281,7 +281,7 @@ ColorPickerDialogClass::OnInitDialog (void)
 	m_WhitenessColorBar->Set_Range (0, 255);
 
 	m_WhitenessColorBar->Insert_Point (1, 255, 255, 255, 255);
-	
+
 	//
 	//	Setup the red/green/blue color bars
 	//
@@ -375,7 +375,7 @@ ColorPickerDialogClass::Update_Whiteness_Bar (void)
 	//
 	//	Given the current color, determine the 'whiteness' and update
 	//
-	float whiteness = min (m_CurrentRed, m_CurrentGreen);	
+	float whiteness = min (m_CurrentRed, m_CurrentGreen);
 	whiteness = min (whiteness, m_CurrentBlue);
 	float percent = whiteness / 255;
 	m_WhitenessColorBar->Set_Selection_Pos (whiteness);
@@ -386,7 +386,7 @@ ColorPickerDialogClass::Update_Whiteness_Bar (void)
 	/*if (percent == 1) {
 		m_WhitenessColorBar->Modify_Point (0, 0, 0, 0, 0);
 	} else {
-		
+
 		//
 		//	Extrapolate the starting color
 		//
@@ -472,7 +472,7 @@ ColorPickerDialogClass::OnNotify
 				green = green + ((255 - green) * whiteness);
 				blue = blue + ((255 - blue) * whiteness);
 				Update_Color (red, green, blue, UPDATE_COLOR_BARS | UPDATE_WHITENESS);
-			}			
+			}
 		}
 		break;
 
@@ -489,7 +489,7 @@ ColorPickerDialogClass::OnNotify
 		}
 		break;
 	}
-	
+
 	return CDialog::OnNotify (wParam, lParam, pResult);
 }
 
@@ -528,7 +528,7 @@ ColorPickerDialogClass::Update_Color
 	if (int_red != m_RedSpin.GetPos ()) {
 		m_RedSpin.SetPos (int_red);
 	}
-	
+
 	//	Hack to get the edit controls to update in a timely fashion
 	::UpdateWindow (::GetDlgItem (m_hWnd, IDC_RED_EDIT));
 	::UpdateWindow (::GetDlgItem (m_hWnd, IDC_GREEN_EDIT));
@@ -541,7 +541,7 @@ ColorPickerDialogClass::Update_Color
 		Update_Red_Bar ();
 		Update_Green_Bar ();
 		Update_Blue_Bar ();
-	}	
+	}
 
 	//
 	//	Update the hue picker
@@ -557,7 +557,7 @@ ColorPickerDialogClass::Update_Color
 		Update_Whiteness_Bar ();
 	}
 
-	Update_Current_Color_Bar ();	
+	Update_Current_Color_Bar ();
 
 	// If a callback is registered, call it.
 	if (m_UpdateCallback)
@@ -596,7 +596,7 @@ ColorPickerDialogClass::OnReset (void)
 	return ;
 }
 
-LRESULT ColorPickerDialogClass::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) 
+LRESULT ColorPickerDialogClass::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 {
 	return CDialog::WindowProc(message, wParam, lParam);
 }
@@ -629,7 +629,7 @@ ColorPickerDialogClass::OnCommand
 		}
 		break;
 	}
-	
+
 	return CDialog::OnCommand(wParam, lParam);
 }
 
@@ -641,7 +641,7 @@ ColorPickerDialogClass::OnCommand
 /////////////////////////////////////////////////////////////////////////////
 void
 ColorPickerDialogClass::PostNcDestroy (void)
-{	
+{
 	CDialog::PostNcDestroy();
 
 	if (m_bDeleteOnClose) {
diff --git a/Core/Tools/W3DView/ColorPickerDialogClass.h b/Core/Tools/W3DView/ColorPickerDialogClass.h
index 49036612674..64f6ea6e971 100644
--- a/Core/Tools/W3DView/ColorPickerDialogClass.h
+++ b/Core/Tools/W3DView/ColorPickerDialogClass.h
@@ -16,17 +16,13 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_COLORPICKERDIALOGCLASS_H__C943A7F1_CAA3_11D2_8DDF_00104B6FD9E3__INCLUDED_)
-#define AFX_COLORPICKERDIALOGCLASS_H__C943A7F1_CAA3_11D2_8DDF_00104B6FD9E3__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // ColorPickerDialogClass.h : header file
 //
 
 #include "resource.h"
-#include "colorutils.h"
+#include "ColorUtils.h"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -89,7 +85,7 @@ class ColorPickerDialogClass : public CDialog
 		void					Create_Form (CWnd *parent);
 		void					Set_Update_Callback (WWCTRL_COLORCALLBACK callme, void *arg)
 									{ m_UpdateCallback = callme; m_CallArg = arg; }
-		
+
 	protected:
 
 		/////////////////////////////////////////////////////////////
@@ -103,7 +99,7 @@ class ColorPickerDialogClass : public CDialog
 		void					Update_Color (float red, float green, float blue, DWORD flags = 0xFFFFFFFF);
 
 	private:
-		
+
 		/////////////////////////////////////////////////////////////
 		//	Private member data
 		/////////////////////////////////////////////////////////////
@@ -132,5 +128,3 @@ class ColorPickerDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_COLORPICKERDIALOGCLASS_H__C943A7F1_CAA3_11D2_8DDF_00104B6FD9E3__INCLUDED_)
diff --git a/Core/Tools/W3DView/ColorSelectionDialog.cpp b/Core/Tools/W3DView/ColorSelectionDialog.cpp
index 8690e8ce463..7c5c78d1369 100644
--- a/Core/Tools/W3DView/ColorSelectionDialog.cpp
+++ b/Core/Tools/W3DView/ColorSelectionDialog.cpp
@@ -19,10 +19,10 @@
 // ColorSelectionDialog.cpp : implementation file
 //
 
-#include "StdAfx.H"
-#include "W3DView.H"
-#include "ColorSelectionDialog.H"
-#include "Utils.H"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "ColorSelectionDialog.h"
+#include "Utils.h"
 
 
 #ifdef RTS_DEBUG
@@ -118,7 +118,7 @@ ColorSelectionDialogClass::OnInitDialog (void)
 	// Set the initial slider positions
 	m_RedSlider.SetPos (red_value);
 	m_GreenSlider.SetPos (green_value);
-	m_BlueSlider.SetPos (blue_value);	
+	m_BlueSlider.SetPos (blue_value);
 	m_RedSpin.SetPos (red_value);
 	m_GreenSpin.SetPos (green_value);
 	m_BlueSpin.SetPos (blue_value);
@@ -168,10 +168,10 @@ ColorSelectionDialogClass::OnHScroll
 //	OnPaint
 //
 void
-ColorSelectionDialogClass::OnPaint (void) 
+ColorSelectionDialogClass::OnPaint (void)
 {
 	CPaintDC dc (this);
-        
+
 	// Paint the gradients for each color
 	::Paint_Gradient (::GetDlgItem (m_hWnd, IDC_RED_GRADIENT), 1, 0, 0);
 	::Paint_Gradient (::GetDlgItem (m_hWnd, IDC_GREEN_GRADIENT), 0, 1, 0);
@@ -193,17 +193,17 @@ ColorSelectionDialogClass::Paint_Color_Window (void)
 	// Get the client coords of the 'color' window
 	CRect rect;
 	m_ColorWindow.GetClientRect (&rect);
-	
+
 	// Fill the window with the selected color
 	CDC *pdc = m_ColorWindow.GetDC ();
 	::FrameRect (*pdc, &rect, (HBRUSH)::GetStockObject (BLACK_BRUSH));
 	rect.DeflateRect (1, 1);
 	pdc->FillSolidRect (&rect, RGB (int(m_PaintColor.X * 255), int(m_PaintColor.Y * 255), int(m_PaintColor.Z * 255)));
 	m_ColorWindow.ReleaseDC (pdc);
-	
+
 	// Let the window know it doesn't need to be repainted
 	m_ColorWindow.ValidateRect (NULL);
-	return; 
+	return;
 }
 
 
@@ -216,7 +216,7 @@ ColorSelectionDialogClass::OnGrayscaleCheck (void)
 {
 	// Is the checkbox checked?
 	if (SendDlgItemMessage (IDC_GRAYSCALE_CHECK, BM_GETCHECK)) {
-		
+
 		// Make the green and blue sliders the same as red
 		m_GreenSlider.SetPos (m_RedSlider.GetPos ());
 		m_BlueSlider.SetPos (m_RedSlider.GetPos ());
@@ -226,7 +226,7 @@ ColorSelectionDialogClass::OnGrayscaleCheck (void)
 		m_PaintColor.Z = float(m_BlueSlider.GetPos ()) / 255.00F;
 
 		// Update the window that displays the color the user has selected
-		Paint_Color_Window ();		
+		Paint_Color_Window ();
 	}
 
 	return ;
@@ -238,7 +238,7 @@ ColorSelectionDialogClass::OnGrayscaleCheck (void)
 //	OnChangeBlueEdit
 //
 void
-ColorSelectionDialogClass::OnChangeBlueEdit (void) 
+ColorSelectionDialogClass::OnChangeBlueEdit (void)
 {
 	if (::IsWindow (m_BlueSlider)) {
 		int value = GetDlgItemInt (IDC_BLUE_EDIT);
@@ -309,7 +309,7 @@ ColorSelectionDialogClass::Update_Sliders (int slider_id)
 	// Are the sliders moving together?
 	if (SendDlgItemMessage (IDC_GRAYSCALE_CHECK, BM_GETCHECK)) {
 		int position = 0;
-		
+
 		// Determine which slider sent this message and
 		// use its current position
 		if (slider_id == IDC_SLIDER_RED) {
diff --git a/Core/Tools/W3DView/ColorSelectionDialog.h b/Core/Tools/W3DView/ColorSelectionDialog.h
index ebfcc3c67d3..3c42553ed3a 100644
--- a/Core/Tools/W3DView/ColorSelectionDialog.h
+++ b/Core/Tools/W3DView/ColorSelectionDialog.h
@@ -16,17 +16,13 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_OLORSELECTIONDIALOG_H__C0BCECAE_B6EA_11D2_9FF8_00104B791122__INCLUDED_)
-#define AFX_OLORSELECTIONDIALOG_H__C0BCECAE_B6EA_11D2_9FF8_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ColorSelectionDialog.h : header file
 //
 
-#include "Resource.H"
-#include "Vector3.H"
+#include "resource.h"
+#include "vector3.h"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -85,7 +81,7 @@ class ColorSelectionDialogClass : public CDialog
 		void						Set_Color (const Vector3 &color) { m_Color = color; }
 
 	protected:
-		
+
 		///////////////////////////////////////////////////////
 		//
 		//	Inline accessors
@@ -105,5 +101,3 @@ class ColorSelectionDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OLORSELECTIONDIALOG_H__C0BCECAE_B6EA_11D2_9FF8_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/ColorUtils.cpp b/Core/Tools/W3DView/ColorUtils.cpp
index c12c7395fd5..9a9b893ebda 100644
--- a/Core/Tools/W3DView/ColorUtils.cpp
+++ b/Core/Tools/W3DView/ColorUtils.cpp
@@ -22,8 +22,8 @@
 //
 //
 
-#include "StdAfx.H"
-#include "ColorUtils.H"
+#include "StdAfx.h"
+#include "ColorUtils.h"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -105,7 +105,7 @@ Frame_Rect
 		pbits[index++] = green;
 		pbits[index++] = red;
 	}
-	
+
 	index = (rect.top * scanline_size) + (rect.left * 3);
 	int row;
 	for (row = rect.top; row < rect.bottom; row ++) {
diff --git a/Core/Tools/W3DView/ColorUtils.h b/Core/Tools/W3DView/ColorUtils.h
index 3b103b32f12..2a440aafe3f 100644
--- a/Core/Tools/W3DView/ColorUtils.h
+++ b/Core/Tools/W3DView/ColorUtils.h
@@ -18,12 +18,11 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 //
-//	ColorUtils.H
+//	ColorUtils.h
 //
 //
 
-#ifndef __COLORUTILS_H
-#define __COLORUTILS_H
+#pragma once
 
 /////////////////////////////////////////////////////////////////////////////
 //	Callbacks
@@ -46,6 +45,3 @@ BOOL		Set_Form_Original_Color (HWND form_wnd, int red, int green, int blue);
 BOOL		Set_Update_Callback (HWND form_wnd, WWCTRL_COLORCALLBACK callback, void *arg=NULL);
 void		RegisterColorPicker (HINSTANCE hinst);
 void		RegisterColorBar (HINSTANCE hinst);
-
-
-#endif //__COLORUTILS_H
diff --git a/Core/Tools/W3DView/DataTreeView.cpp b/Core/Tools/W3DView/DataTreeView.cpp
index 9c4be294339..1b5a31d1634 100644
--- a/Core/Tools/W3DView/DataTreeView.cpp
+++ b/Core/Tools/W3DView/DataTreeView.cpp
@@ -35,24 +35,24 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "StdAfx.H"
-#include "W3DView.H"
-#include "DataTreeView.H"
-#include "RendObj.H"
-#include "ViewerAssetMgr.H"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "DataTreeView.h"
+#include "rendobj.h"
+#include "ViewerAssetMgr.h"
 #include "Globals.h"
-#include "W3DViewDoc.H"
-#include "MainFrm.H"
-#include "DistLod.H"
-#include "AnimObj.H"
-#include "HcAnim.H"
-#include "AssetInfo.H"
-#include "Utils.H"
-#include "Vector.H"
-#include "Part_Emt.H"
-#include "Agg_Def.H"
-#include "BMP2D.H"
-#include "HLod.H"
+#include "W3DViewDoc.h"
+#include "MainFrm.h"
+#include "distlod.h"
+#include "animobj.h"
+#include "hcanim.h"
+#include "AssetInfo.h"
+#include "Utils.h"
+#include "Vector.h"
+#include "part_emt.h"
+#include "agg_def.h"
+#include "bmp2d.h"
+#include "hlod.h"
 #include "ViewerScene.h"
 #include "texture.h"
 
@@ -81,7 +81,7 @@ IMPLEMENT_DYNCREATE(CDataTreeView, CTreeView)
 //
 ////////////////////////////////////////////////////////////////////////////
 CDataTreeView::CDataTreeView (void)
-        : m_hMaterialsRoot (NULL),          
+        : m_hMaterialsRoot (NULL),
 			 m_hMeshRoot  (NULL),
 			 m_hMeshCollectionRoot (NULL),
 			 m_hAggregateRoot (NULL),
@@ -160,7 +160,7 @@ void CDataTreeView::Dump(CDumpContext& dc) const
 //  PreCreateWindow
 //
 BOOL
-CDataTreeView::PreCreateWindow (CREATESTRUCT& cs) 
+CDataTreeView::PreCreateWindow (CREATESTRUCT& cs)
 {
     // Modify the style bits for the window so it will
     // have buttons and lines between nodes.
@@ -179,7 +179,7 @@ CDataTreeView::OnInitialUpdate (void)
 {
 	// Allow the base class to process this message
     CTreeView::OnInitialUpdate ();
-	
+
 	// TODO: Add your specialized code here and/or call the base class
 	return ;
 }
@@ -190,16 +190,16 @@ CDataTreeView::OnInitialUpdate (void)
 //  CreateRootNodes
 //
 void
-CDataTreeView::CreateRootNodes (void) 
+CDataTreeView::CreateRootNodes (void)
 {
 	// Insert all the root nodes
-	m_hMaterialsRoot		= GetTreeCtrl ().InsertItem ("Materials", m_iMaterialIcon, m_iMaterialIcon);	
+	m_hMaterialsRoot		= GetTreeCtrl ().InsertItem ("Materials", m_iMaterialIcon, m_iMaterialIcon);
 	m_hMeshRoot				= GetTreeCtrl ().InsertItem ("Mesh", m_iMeshIcon, m_iMeshIcon);
 	m_hHierarchyRoot		= GetTreeCtrl ().InsertItem ("Hierarchy", m_iHierarchyIcon, m_iHierarchyIcon);
 	m_hLODRoot				= GetTreeCtrl ().InsertItem ("H-LOD", m_iLODIcon, m_iLODIcon);
 	m_hMeshCollectionRoot = GetTreeCtrl ().InsertItem ("Mesh Collection", m_iMeshIcon, m_iMeshIcon);
-	m_hAggregateRoot		= GetTreeCtrl ().InsertItem ("Aggregate", m_iAggregateIcon, m_iAggregateIcon);    
-	m_hEmitterRoot			= GetTreeCtrl ().InsertItem ("Emitter", m_iEmitterIcon, m_iEmitterIcon);	
+	m_hAggregateRoot		= GetTreeCtrl ().InsertItem ("Aggregate", m_iAggregateIcon, m_iAggregateIcon);
+	m_hEmitterRoot			= GetTreeCtrl ().InsertItem ("Emitter", m_iEmitterIcon, m_iEmitterIcon);
 	m_hPrimitivesRoot		= GetTreeCtrl ().InsertItem ("Primitives", m_iPrimitivesIcon, m_iPrimitivesIcon);
 	m_hSoundRoot			= GetTreeCtrl ().InsertItem ("Sounds", m_iSoundIcon, m_iSoundIcon);
 	return ;
@@ -211,14 +211,14 @@ CDataTreeView::CreateRootNodes (void)
 //  OnCreate
 //
 int
-CDataTreeView::OnCreate (LPCREATESTRUCT lpCreateStruct) 
+CDataTreeView::OnCreate (LPCREATESTRUCT lpCreateStruct)
 {
 	if (CTreeView::OnCreate(lpCreateStruct) == -1)
 		return -1;
 
     CImageList imageList;
     imageList.Create (16, 18, ILC_COLOR | ILC_MASK, 5, 10);
-    
+
     // Add the icons to the imagelist
     m_iAnimationIcon		= imageList.Add (::LoadIcon (::AfxGetResourceHandle (), MAKEINTRESOURCE (IDI_ANIMATION)));
 	 m_iTCAnimationIcon	= imageList.Add (::LoadIcon (::AfxGetResourceHandle (), MAKEINTRESOURCE (IDI_ANIMATION_COMPRESSED)));
@@ -248,12 +248,12 @@ CDataTreeView::OnCreate (LPCREATESTRUCT lpCreateStruct)
 //  Load_Materials_Into_Tree
 //
 void
-CDataTreeView::Load_Materials_Into_Tree (void) 
+CDataTreeView::Load_Materials_Into_Tree (void)
 {
 	// Get an iterator from the asset manager that we can
 	// use to enumerate the currently loaded textures
 	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-		
+
 	// Loop through all the textures in the manager
 	for (ite.First ();
 		  !ite.Is_Done ();
@@ -286,7 +286,7 @@ CDataTreeView::Load_Materials_Into_Tree (void)
 //  LoadAssetsIntoTree
 //
 void
-CDataTreeView::LoadAssetsIntoTree (void) 
+CDataTreeView::LoadAssetsIntoTree (void)
 {
 	// Turn off repainting
 	GetTreeCtrl ().SetRedraw (FALSE);
@@ -307,7 +307,7 @@ CDataTreeView::LoadAssetsIntoTree (void)
 			// Does this render obj really exist?
 			LPCTSTR pszItemName = pObjEnum->Current_Item_Name ();
 			if (WW3DAssetManager::Get_Instance()->Render_Obj_Exists (pszItemName)) {
-				
+
 				BOOL bInsert = FALSE;
 				HTREEITEM hParentNode = NULL;
 				ASSET_TYPE assetType = TypeUnknown;
@@ -316,7 +316,7 @@ CDataTreeView::LoadAssetsIntoTree (void)
 				// What type of asset is this?
 				switch (pObjEnum->Current_Item_Class_ID ()) {
 
-					case RenderObjClass::CLASSID_COLLECTION:						
+					case RenderObjClass::CLASSID_COLLECTION:
 						// This is a 'mesh collection', we want to add this under the 'collection' node.
 						bInsert = TRUE;
 						hParentNode = m_hMeshCollectionRoot;
@@ -327,7 +327,7 @@ CDataTreeView::LoadAssetsIntoTree (void)
 					//
 					// This is a mesh render object, we want to add this under the mesh node.
 					//
-					case RenderObjClass::CLASSID_MESH:						
+					case RenderObjClass::CLASSID_MESH:
 						bInsert			= TRUE;
 						hParentNode		= m_hMeshRoot;
 						assetType		= TypeMesh;
@@ -336,12 +336,12 @@ CDataTreeView::LoadAssetsIntoTree (void)
 
 					//
 					// This is a sound render obj, we want to add this under the sound node.
-					//					
+					//
 					case RenderObjClass::CLASSID_SOUND:
 						bInsert			= TRUE;
 						hParentNode		= m_hSoundRoot;
 						assetType		= TypeSound;
-						iIconIndex		= m_iSoundIcon;						
+						iIconIndex		= m_iSoundIcon;
 						break;
 
 					case RenderObjClass::CLASSID_HMODEL:
@@ -349,7 +349,7 @@ CDataTreeView::LoadAssetsIntoTree (void)
 						ASSERT (0);
 						break;
 
-					case RenderObjClass::CLASSID_PARTICLEEMITTER:							
+					case RenderObjClass::CLASSID_PARTICLEEMITTER:
 						// This is an 'emitter', we want to add this under the 'emitter' node.
 						bInsert = TRUE;
 						hParentNode = m_hEmitterRoot;
@@ -459,7 +459,7 @@ CDataTreeView::LoadAnimationsIntoTree (void)
 
             // Get an instance of the animation object
             HAnimClass *pHierarchyAnim = WW3DAssetManager::Get_Instance()->Get_HAnim (pszAnimName);
-            
+
             ASSERT (pHierarchyAnim);
             if (pHierarchyAnim)
             {
@@ -478,7 +478,7 @@ CDataTreeView::LoadAnimationsIntoTree (void)
                         // Add this animation as a child of the hierarchy
                         hAnimationNode = GetTreeCtrl ().InsertItem (pszAnimName, m_iAnimationIcon, m_iAnimationIcon, hNode, TVI_SORT);
                         ASSERT (hAnimationNode != NULL);
-                                    
+
                         // Associate the items name with its entry
                         GetTreeCtrl ().SetItemData (hAnimationNode, (ULONG)new AssetInfoClass (pszAnimName, TypeAnimation));
                     }
@@ -496,7 +496,7 @@ CDataTreeView::LoadAnimationsIntoTree (void)
                         // Add this animation as a child of the hierarchy
                         hAnimationNode = GetTreeCtrl ().InsertItem (pszAnimName, m_iAnimationIcon, m_iAnimationIcon, hNode, TVI_SORT);
                         ASSERT (hAnimationNode != NULL);
-                                    
+
                         // Associate the items name with its entry
                         GetTreeCtrl ().SetItemData (hAnimationNode, (ULONG)new AssetInfoClass (pszAnimName, TypeAnimation));
                     }
@@ -514,22 +514,22 @@ CDataTreeView::LoadAnimationsIntoTree (void)
                         // Add this animation as a child of the hierarchy
                         hAnimationNode = GetTreeCtrl ().InsertItem (pszAnimName, m_iAnimationIcon, m_iAnimationIcon, hNode, TVI_SORT);
                         ASSERT (hAnimationNode != NULL);
-                                    
+
                         // Associate the items name with its entry
                         GetTreeCtrl ().SetItemData (hAnimationNode, (ULONG)new AssetInfoClass (pszAnimName, TypeAnimation));
                     }
                 }
 
                 // Release our hold on this animation...
-					 MEMBER_RELEASE (pHierarchyAnim);
-            }							
+					 REF_PTR_RELEASE (pHierarchyAnim);
+            }
         }
-        
+
         // Free the object
         delete pAnimEnum;
         pAnimEnum = NULL;
     }
-    
+
     return ;
 }
 
@@ -559,7 +559,7 @@ CDataTreeView::LoadAnimationsIntoTree (HTREEITEM hItem)
 
             // Get an instance of the animation object
             HAnimClass *pHierarchyAnim = WW3DAssetManager::Get_Instance()->Get_HAnim (pszAnimName);
-            
+
             ASSERT (pHierarchyAnim);
             if (pHierarchyAnim)
             {
@@ -576,25 +576,25 @@ CDataTreeView::LoadAnimationsIntoTree (HTREEITEM hItem)
                         // Add this animation as a child of the hierarchy
                         hAnimationNode = GetTreeCtrl ().InsertItem (pszAnimName, m_iAnimationIcon, m_iAnimationIcon, hItem, TVI_SORT);
                         ASSERT (hAnimationNode != NULL);
-                                    
+
                         // Associate the items name with its entry
                         GetTreeCtrl ().SetItemData (hAnimationNode, (ULONG)new AssetInfoClass (pszAnimName, TypeAnimation));
                     }
                 }
 
                 // Release our hold on the animation object
-                MEMBER_RELEASE (pHierarchyAnim);
-            }				
+                REF_PTR_RELEASE (pHierarchyAnim);
+            }
         }
-        
+
         // Free the object
         delete pAnimEnum;
         pAnimEnum = NULL;
     }
-    
+
     return ;
 }
-   
+
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -612,7 +612,7 @@ CDataTreeView::Determine_Tree_Location
 
 	// What class does this render object belong to?
 	switch (render_obj.Class_ID ()) {
-		
+
 		case RenderObjClass::CLASSID_COLLECTION:
 			hroot				= m_hMeshCollectionRoot;
 			type				= TypeMesh;
@@ -623,15 +623,15 @@ CDataTreeView::Determine_Tree_Location
 			hroot = m_hMeshRoot;
 			type = TypeMesh;
 			icon_index = m_iMeshIcon;
-			break;						  
-		
+			break;
+
 		case RenderObjClass::CLASSID_SOUND:
 			hroot				= m_hSoundRoot;
 			type				= TypeSound;
 			icon_index		= m_iSoundIcon;
-			break;						  		
+			break;
 
-		case RenderObjClass::CLASSID_HMODEL:			
+		case RenderObjClass::CLASSID_HMODEL:
 			// Shouldn't happen
 			ASSERT (0);
 			break;
@@ -648,7 +648,7 @@ CDataTreeView::Determine_Tree_Location
 			type				= TypePrimitives;
 			icon_index		= m_iPrimitivesIcon;
 			break;
-	
+
 		case RenderObjClass::CLASSID_DISTLOD:
 		case RenderObjClass::CLASSID_HLOD:
          hroot				= m_hHierarchyRoot;
@@ -758,7 +758,7 @@ CDataTreeView::Add_Asset_To_Tree
 
 		// Turn off repainting
 		GetTreeCtrl ().SetRedraw (FALSE);
-		
+
 		// Determime where this asset should go
 		HTREEITEM hparent = NULL;
 		int icon_index = 0;
@@ -774,7 +774,7 @@ CDataTreeView::Add_Asset_To_Tree
 																 icon_index,
 																 hparent,
 																 TVI_SORT);
-			
+
 			// Associate the render object with its entry in the tree
 			AssetInfoClass *asset_info = new AssetInfoClass (name, type);
 			GetTreeCtrl ().SetItemData (htree_item, (ULONG)asset_info);
@@ -905,7 +905,7 @@ CDataTreeView::FindSiblingItemBasedOnHierarchyName
             // This was the item we were looking for, return
             // its handle to the caller
             hSiblingItem = hTreeItem;
-        }        
+        }
     }
 
     // Return the sibling item handle
@@ -943,7 +943,7 @@ CDataTreeView::FindFirstChildItemBasedOnHierarchyName
             // This was the child item we were looking for, return
             // its handle to the caller
             hChildItem = hTreeItem;
-        }        
+        }
     }
 
     // Return the child item handle
@@ -984,7 +984,7 @@ CDataTreeView::Display_Asset (HTREEITEM htree_item)
 	//
 	// Get the object associated with this entry
 	//
-	AssetInfoClass *asset_info = NULL;	
+	AssetInfoClass *asset_info = NULL;
 	if (htree_item != NULL) {
 		asset_info = (AssetInfoClass *)GetTreeCtrl ().GetItemData (htree_item);
 	}
@@ -1006,10 +1006,10 @@ CDataTreeView::Display_Asset (HTREEITEM htree_item)
 					if (hParentItem != NULL) {
 
 						// Ask the document to start playing the animation for this object
-						RenderObjClass *prender_obj = Create_Render_Obj_To_Display (hParentItem);                         
+						RenderObjClass *prender_obj = Create_Render_Obj_To_Display (hParentItem);
 						pdoc->PlayAnimation (prender_obj,
 						asset_info->Get_Name ());
-						MEMBER_RELEASE (prender_obj);
+						REF_PTR_RELEASE (prender_obj);
 					}
 				}
 				break;
@@ -1019,7 +1019,7 @@ CDataTreeView::Display_Asset (HTREEITEM htree_item)
 					// Ask the document to display this object
 					ParticleEmitterClass *emitter = (ParticleEmitterClass *)Create_Render_Obj_To_Display (htree_item);
 					pdoc->Display_Emitter (emitter);
-					MEMBER_RELEASE (emitter);
+					REF_PTR_RELEASE (emitter);
 				}
 				break;
 
@@ -1035,7 +1035,7 @@ CDataTreeView::Display_Asset (HTREEITEM htree_item)
 					// Ask the document to display this object
 					RenderObjClass *prender_obj = Create_Render_Obj_To_Display (htree_item);
 					pdoc->DisplayObject (prender_obj);
-					MEMBER_RELEASE (prender_obj);
+					REF_PTR_RELEASE (prender_obj);
 				}
 				break;
 			}
@@ -1067,7 +1067,7 @@ CDataTreeView::Display_Asset (HTREEITEM htree_item)
 		ASSERT (pdoc != NULL);
 		if (pdoc != NULL) {
 			pdoc->DisplayObject ((RenderObjClass *)NULL);
-			
+
 			CMainFrame *main_wnd = (CMainFrame *)::AfxGetMainWnd ();
 			if (main_wnd != NULL) {
 				main_wnd->OnSelectionChanged (TypeUnknown);
@@ -1088,12 +1088,12 @@ CDataTreeView::OnDeleteItem
 (
 	NMHDR *pNMHDR,
 	LRESULT *pResult
-) 
+)
 {
 	// Get the information object for this asset
-	NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;	
+	NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
 	AssetInfoClass *asset_info = (AssetInfoClass *)pNMTreeView->itemOld.lParam;
-	
+
 	// If this is a texture, then free our hold on its interface
 	if (asset_info && (asset_info->Get_Type () == TypeMaterial)) {
 		TextureClass *ptexture = (TextureClass *)asset_info->Get_User_Number ();
@@ -1197,7 +1197,7 @@ CDataTreeView::GetCurrentSelectionType (void)
 	// Get the currently selected node from the tree control
 	HTREEITEM htree_item = GetTreeCtrl ().GetSelectedItem ();
 	if (htree_item != NULL) {
-		
+
 		// Get the associated asset information for this node.
 		AssetInfoClass *asset_info = (AssetInfoClass *)GetTreeCtrl ().GetItemData (htree_item);
 		if (asset_info != NULL) {
@@ -1247,7 +1247,7 @@ CDataTreeView::Build_Render_Object_List
 	// Loop through all the children of this node
 	for (HTREEITEM htree_item = GetTreeCtrl ().GetChildItem (hparent);
 		  (htree_item != NULL);
-		  htree_item = GetTreeCtrl ().GetNextSiblingItem (htree_item)) {		
+		  htree_item = GetTreeCtrl ().GetNextSiblingItem (htree_item)) {
 
 		// Determine if this is an asset type we want to add to the list
 		AssetInfoClass *asset_info = (AssetInfoClass *)GetTreeCtrl ().GetItemData (htree_item);
@@ -1264,7 +1264,7 @@ CDataTreeView::Build_Render_Object_List
 			Build_Render_Object_List (asset_list, htree_item);
 		}
 	}
-	
+
 	return ;
 }
 
@@ -1281,7 +1281,7 @@ CDataTreeView::Create_Render_Obj_To_Display (HTREEITEM htree_item)
 	RenderObjClass *render_obj = NULL;
 	AssetInfoClass *asset_info = (AssetInfoClass *)GetTreeCtrl ().GetItemData (htree_item);
 	if (asset_info != NULL) {
-		
+
 		// Use the asset's instance if there is one, otherwise attempt to create one
 		render_obj = asset_info->Get_Render_Obj ();
 		if (render_obj == NULL) {
@@ -1298,7 +1298,7 @@ CDataTreeView::Create_Render_Obj_To_Display (HTREEITEM htree_item)
 			// Finally, if we aren't successful, create a new instance based on its name
 			//
 			if (render_obj == NULL) {
-				render_obj = WW3DAssetManager::Get_Instance()->Create_Render_Obj (asset_info->Get_Name ());				
+				render_obj = WW3DAssetManager::Get_Instance()->Create_Render_Obj (asset_info->Get_Name ());
 			}
 		}
 	}
@@ -1311,7 +1311,7 @@ CDataTreeView::Create_Render_Obj_To_Display (HTREEITEM htree_item)
 	{
 		Set_Highest_LOD (render_obj);
 	}
-	
+
 	return render_obj;
 }
 
@@ -1333,7 +1333,7 @@ CDataTreeView::Refresh_Asset
 
 		// Turn off repainting
 		GetTreeCtrl ().SetRedraw (FALSE);
-		
+
 		// Determime where this asset should go
 		HTREEITEM hparent = NULL;
 		int icon_index = 0;
@@ -1350,7 +1350,7 @@ CDataTreeView::Refresh_Asset
 			AssetInfoClass *asset_info = (AssetInfoClass *)GetTreeCtrl ().GetItemData (htree_item);
 			if (asset_info != NULL) {
 				asset_info->Set_Name (new_name);
-			}		
+			}
 		} else {
 
 			// This asset wasn't already in the tree, so add it...
@@ -1362,7 +1362,7 @@ CDataTreeView::Refresh_Asset
 
 		// Force the window to be repainted
 		Invalidate (FALSE);
-		UpdateWindow ();	
+		UpdateWindow ();
 	}
 
 	return ;
@@ -1457,7 +1457,7 @@ CDataTreeView::Free_Child_Models (HTREEITEM parent_item)
 		AssetInfoClass *asset_info = (AssetInfoClass *)GetTreeCtrl ().GetItemData (tree_item);
 		if (asset_info  != NULL) {
 			WW3DAssetManager::Get_Instance ()->Remove_Prototype (asset_info->Get_Name ());
-		}        
+		}
 	}
 
 	return ;
@@ -1470,7 +1470,7 @@ CDataTreeView::Free_Child_Models (HTREEITEM parent_item)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-Set_Highest_LOD (RenderObjClass *render_obj) 
+Set_Highest_LOD (RenderObjClass *render_obj)
 {
 	if (render_obj != NULL) {
 		for (int index = 0; index < render_obj->Get_Num_Sub_Objects (); index ++) {
@@ -1478,7 +1478,7 @@ Set_Highest_LOD (RenderObjClass *render_obj)
 			if (sub_obj != NULL) {
 				Set_Highest_LOD (sub_obj);
 			}
-			MEMBER_RELEASE (sub_obj);
+			REF_PTR_RELEASE (sub_obj);
 		}
 
 		//
@@ -1503,7 +1503,7 @@ CDataTreeView::Restrict_Anims (bool onoff)
 {
 	if (m_RestrictAnims != onoff) {
 		m_RestrictAnims = onoff;
-		
+
 		//
 		//	Reload the tree
 		//
diff --git a/Core/Tools/W3DView/DataTreeView.h b/Core/Tools/W3DView/DataTreeView.h
index d8f8e72e1bd..2882cf719b4 100644
--- a/Core/Tools/W3DView/DataTreeView.h
+++ b/Core/Tools/W3DView/DataTreeView.h
@@ -16,18 +16,14 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_DATATREEVIEW_H__2BB39E40_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
-#define AFX_DATATREEVIEW_H__2BB39E40_5D3A_11D2_9FC6_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // DataTreeView.h : header file
 //
 
-#include "AfxCView.H"
-#include "AssetTypes.H"
-#include "Vector.H"
+#include "AfxCView.h"
+#include "AssetTypes.h"
+#include "Vector.h"
 
 // Forward declarations
 class RenderObjClass;
@@ -83,7 +79,7 @@ class CDataTreeView : public CTreeView
 		/////////////////////////////////////////////////////////////////////
 		//	Public methods
 		/////////////////////////////////////////////////////////////////////
-		
+
 		//
 		//	Asset insertion methods
 		//
@@ -117,7 +113,7 @@ class CDataTreeView : public CTreeView
 		// Information methods
 		//
 		RenderObjClass *	Get_Current_Render_Obj (void) const;
-		AssetInfoClass *	Get_Current_Asset_Info (void) const;		
+		AssetInfoClass *	Get_Current_Asset_Info (void) const;
 		LPCTSTR				GetCurrentSelectionName (void);
 		ASSET_TYPE			GetCurrentSelectionType (void);
 		HTREEITEM			FindChildItem (HTREEITEM hParentItem, LPCTSTR pszChildItemName);
@@ -125,25 +121,25 @@ class CDataTreeView : public CTreeView
 		HTREEITEM			FindFirstChildItemBasedOnHierarchyName (HTREEITEM hParentItem, LPCTSTR pszHierarchyName);
 		HTREEITEM			FindSiblingItemBasedOnHierarchyName (HTREEITEM hCurrentItem, LPCTSTR pszHierarchyName);
 		void					Build_Render_Object_List (DynamicVectorClass <CString> &asset_list, HTREEITEM hparent = TVI_ROOT);
-		
+
 		//
 		//	Initialization methods
 		//
 		void					CreateRootNodes (void);
 
 	protected:
-		
+
 		///////////////////////////////////////////////////////////////////////
 		//	Protected methods
 		///////////////////////////////////////////////////////////////////////
 		ASSET_TYPE			Determine_Tree_Location (RenderObjClass &render_obj, HTREEITEM &hroot, int &icon_index);
 		void					Determine_Tree_Location (ASSET_TYPE type, HTREEITEM &hroot, int &icon_index);
 		RenderObjClass *	Create_Render_Obj_To_Display (HTREEITEM htree_item);
-		void					Add_Emitters_To_Menu (HMENU hmenu, RenderObjClass &render_obj);		
+		void					Add_Emitters_To_Menu (HMENU hmenu, RenderObjClass &render_obj);
 		void					Free_Child_Models (HTREEITEM parent_item);
 
 	private:
-		
+
 		///////////////////////////////////////////////////////
 		//
 		//	Private member data
@@ -175,6 +171,3 @@ class CDataTreeView : public CTreeView
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_DATATREEVIEW_H__2BB39E40_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
-
diff --git a/Core/Tools/W3DView/DeviceSelectionDialog.cpp b/Core/Tools/W3DView/DeviceSelectionDialog.cpp
index 60237c74415..fb5d7dd5275 100644
--- a/Core/Tools/W3DView/DeviceSelectionDialog.cpp
+++ b/Core/Tools/W3DView/DeviceSelectionDialog.cpp
@@ -19,15 +19,14 @@
 // DeviceSelectionDialog.cpp : implementation file
 //
 
-#include "StdAfx.H"
+#include "StdAfx.h"
 
 #include "W3DView.h"
 #include "DeviceSelectionDialog.h"
-#include "WW3D.H"
-#include "Resource.H"
+#include "ww3d.h"
+#include "resource.h"
 #include "Globals.h"
-#include "W3DView.H"
-#include "Utils.H"
+#include "Utils.h"
 #include "rddesc.h"
 
 #ifdef RTS_DEBUG
@@ -93,21 +92,21 @@ BOOL
 CDeviceSelectionDialog::OnInitDialog (void)
 {
 	CDialog::OnInitDialog();
-	
+
 	//
 	// Loop through all the devices and add them to the combobox
 	//
-	int device_count = WW3D::Get_Render_Device_Count ();	
+	int device_count = WW3D::Get_Render_Device_Count ();
 	int selected_index = 0;
 	for (int index = 0; index < device_count; index ++) {
-		
+
 		//
 		// Add this device to the combobox
 		//
 		const char *name = WW3D::Get_Render_Device_Name(index);
 		int combo_index = m_deviceListComboBox.InsertString (index, name);
 		if (m_DriverName.CompareNoCase (name) == 0) {
-			selected_index = combo_index;			
+			selected_index = combo_index;
 		}
 
 		// Associate the index of this device with the item we just inserted
@@ -132,7 +131,7 @@ CDeviceSelectionDialog::OnInitDialog (void)
 //  OnSelchangeRenderDeviceCombo
 //
 void
-CDeviceSelectionDialog::OnSelchangeRenderDeviceCombo (void) 
+CDeviceSelectionDialog::OnSelchangeRenderDeviceCombo (void)
 {
 	int index = m_deviceListComboBox.GetCurSel ();
 	if (index != CB_ERR) {
@@ -157,7 +156,7 @@ CDeviceSelectionDialog::UpdateDeviceDescription (void)
 
 	//
 	// Reload the static text controls on the dialog
-	//	
+	//
 	SetDlgItemText (IDC_DRIVER_NAME, m_DriverName);
 	SetDlgItemText (IDC_DEVICE_NAME_STATIC, device_desc.Get_Device_Name());
 	SetDlgItemText (IDC_DEVICE_VENDOR_STATIC, device_desc.Get_Device_Vendor());
@@ -177,9 +176,9 @@ CDeviceSelectionDialog::UpdateDeviceDescription (void)
 //  OnOK
 //
 void
-CDeviceSelectionDialog::OnOK (void) 
+CDeviceSelectionDialog::OnOK (void)
 {
-	// Ask the combobox for its current selection 
+	// Ask the combobox for its current selection
 	m_iDeviceIndex = m_deviceListComboBox.GetItemData (m_deviceListComboBox.GetCurSel ());
 	m_iBitsPerPixel = (SendDlgItemMessage (IDC_COLORDEPTH_16, BM_GETCHECK) == TRUE) ? 16 : 24;
 
@@ -217,9 +216,9 @@ CDeviceSelectionDialog::DoModal (void)
 		//
 		// Loop through all the devices and see if we can find the right one
 		//
-		int device_count = WW3D::Get_Render_Device_Count ();	
+		int device_count = WW3D::Get_Render_Device_Count ();
 		for (int index = 0; (index < device_count) && !bFoundDevice; index ++) {
-			
+
 			//
 			// Is this the device we are looking for?
 			//
@@ -239,10 +238,10 @@ CDeviceSelectionDialog::DoModal (void)
 	}
 
 	// Show the dialog and allow the user to select the device
-	if (bFoundDevice == FALSE) {        
+	if (bFoundDevice == FALSE) {
 		iReturn = CDialog::DoModal ();
 	}
-	
+
 	// Return the integer return code
 	return iReturn;
 }
diff --git a/Core/Tools/W3DView/DeviceSelectionDialog.h b/Core/Tools/W3DView/DeviceSelectionDialog.h
index 68264be7462..18d67c60ca5 100644
--- a/Core/Tools/W3DView/DeviceSelectionDialog.h
+++ b/Core/Tools/W3DView/DeviceSelectionDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_DEVICESELECTIONDIALOG_H__49E2DFF9_5D3F_11D2_9FC6_00104B791122__INCLUDED_)
-#define AFX_DEVICESELECTIONDIALOG_H__49E2DFF9_5D3F_11D2_9FC6_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // DeviceSelectionDialog.h : header file
 //
 
@@ -62,7 +58,7 @@ class CDeviceSelectionDialog : public CDialog
 	DECLARE_MESSAGE_MAP()
 
     public:
-        
+
         // Return the selected device index
         int GetDeviceIndex () const
             { return m_iDeviceIndex; }
@@ -86,5 +82,3 @@ class CDeviceSelectionDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_DEVICESELECTIONDIALOG_H__49E2DFF9_5D3F_11D2_9FC6_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/DialogToolbar.cpp b/Core/Tools/W3DView/DialogToolbar.cpp
index 2f85a9e2d44..f3e94f28311 100644
--- a/Core/Tools/W3DView/DialogToolbar.cpp
+++ b/Core/Tools/W3DView/DialogToolbar.cpp
@@ -34,9 +34,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#include "StdAfx.H"
-#include "DialogToolbar.H"
-#include "AfxPriv.H"
+#include "StdAfx.h"
+#include "DialogToolbar.h"
+#include "AfxPriv.h"
 
 
 BEGIN_MESSAGE_MAP(DialogToolbarClass, CToolBar)
@@ -83,10 +83,10 @@ DialogToolbarClass::Enable_Button
 )
 {
 	// Get the button's style (we enable by using a style bit)
-	int index = CommandToIndex (id);	
+	int index = CommandToIndex (id);
 	UINT style = GetButtonStyle (index) & (~TBBS_DISABLED);
-	
-	// If we are disabling the button, set the 
+
+	// If we are disabling the button, set the
 	// disabled style bit.
 	if (benable == false) {
 		style |= TBBS_DISABLED;
@@ -137,7 +137,7 @@ DialogToolbarClass::OnNeedToolTipText
 )
 {
 	if (pTTTStruct->code == TTN_NEEDTEXTA) {
-		
+
 		TOOLTIPTEXTA *ptooltip_info = (TOOLTIPTEXTA*)pTTTStruct;
 		::lstrcpy (ptooltip_info->szText, "test");
 	}
diff --git a/Core/Tools/W3DView/DialogToolbar.h b/Core/Tools/W3DView/DialogToolbar.h
index 98b7efc2758..09b160b6ab8 100644
--- a/Core/Tools/W3DView/DialogToolbar.h
+++ b/Core/Tools/W3DView/DialogToolbar.h
@@ -34,16 +34,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-#ifndef __DIALOGTOOLBAR_H
-#define __DIALOGTOOLBAR_H
 
-#include "Resource.H"
+#include "resource.h"
 
 /////////////////////////////////////////////////////////////////
 //
@@ -73,7 +66,7 @@ class DialogToolbarClass : public CToolBar
 	//}}AFX_VIRTUAL
 
 // Implementation
-protected:	
+protected:
 #ifdef RTS_DEBUG
 	virtual void AssertValid() const;
 	virtual void Dump(CDumpContext& dc) const;
@@ -92,14 +85,10 @@ class DialogToolbarClass : public CToolBar
 
 
 	public:
-		
+
 		///////////////////////////////////////////////////////
 		//
 		//	Public methods
 		//
 		void						Enable_Button (int id, bool benable = true);
 };
-
-
-#endif //__DIALOGTOOLBAR_H
-
diff --git a/Core/Tools/W3DView/DirectoryDialog.cpp b/Core/Tools/W3DView/DirectoryDialog.cpp
index 8f3d6a01e35..efa0cf6c38b 100644
--- a/Core/Tools/W3DView/DirectoryDialog.cpp
+++ b/Core/Tools/W3DView/DirectoryDialog.cpp
@@ -35,9 +35,9 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "stdafx.h"
-#include "directorydialog.h"
-#include "utils.h"
+#include "StdAfx.h"
+#include "DirectoryDialog.h"
+#include "Utils.h"
 
 
 ////////////////////////////////////////////////////////////////////////////
@@ -98,7 +98,7 @@ Browse_For_Folder (HWND parent_wnd, LPCTSTR initial_path, CString &path)
 	if (::GetOpenFileName (&openfilename) == IDOK) {
 		path		= ::Strip_Filename_From_Path (filename);
 		retval	= true;
-	}	
+	}
 
 	return retval;
 }
diff --git a/Core/Tools/W3DView/DirectoryDialog.h b/Core/Tools/W3DView/DirectoryDialog.h
index 6e7cce1d54a..b0395a5151c 100644
--- a/Core/Tools/W3DView/DirectoryDialog.h
+++ b/Core/Tools/W3DView/DirectoryDialog.h
@@ -34,14 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __DIRECTORY_DIALOG_H
-#define __DIRECTORY_DIALOG_H
-
 
 /////////////////////////////////////////////////////////////////////////
 //
@@ -49,7 +42,3 @@
 //
 /////////////////////////////////////////////////////////////////////////
 bool Browse_For_Folder (HWND parent_wnd, LPCTSTR initial_path, CString &path);
-
-
-#endif //__DIRECTORY_DIALOG_H
-
diff --git a/Core/Tools/W3DView/EditLODDialog.cpp b/Core/Tools/W3DView/EditLODDialog.cpp
index cece7851bdb..f00c487d6fa 100644
--- a/Core/Tools/W3DView/EditLODDialog.cpp
+++ b/Core/Tools/W3DView/EditLODDialog.cpp
@@ -19,13 +19,13 @@
 // EditLODDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "W3DView.h"
 #include "EditLODDialog.h"
-#include "DistLod.H"
-#include "Utils.H"
-#include "RendObj.H"
-#include "W3DViewDoc.H"
+#include "distlod.h"
+#include "Utils.h"
+#include "rendobj.h"
+#include "W3DViewDoc.h"
 
 
 #ifdef RTS_DEBUG
@@ -91,7 +91,7 @@ END_MESSAGE_MAP()
 //  OnInitDialog
 //
 BOOL
-CEditLODDialog::OnInitDialog (void) 
+CEditLODDialog::OnInitDialog (void)
 {
 	// Allow the base class to process this message
     CDialog::OnInitDialog ();
@@ -119,9 +119,9 @@ CEditLODDialog::OnInitDialog (void)
             RenderObjClass *pfirst_subobj = pLOD->Get_Sub_Object (0);
 				if (pfirst_subobj != NULL) {
 					m_spinIncrement = pfirst_subobj->Get_Bounding_Sphere ().Radius / 5.0F;
-					MEMBER_RELEASE (pfirst_subobj);
+					REF_PTR_RELEASE (pfirst_subobj);
 				}
-            
+
             // Loop through all the subobjects
             for (int iObject = 0;
                  (iObject < iSubObjects);
@@ -142,13 +142,13 @@ CEditLODDialog::OnInitDialog (void)
                     m_hierarchyListCtrl.SetItemText (iIndex, COL_SWITCH_DN, stringTemp);
 
                     // Free this object
-						  MEMBER_RELEASE (pCSubObject);
+						  REF_PTR_RELEASE (pCSubObject);
                 }
             }
 
             m_switchUpSpin.SetRange (-20, UD_MAXVAL-20);
             m_switchDownSpin.SetRange (-20, UD_MAXVAL-20);
-            
+
             // Resize the columns so they are wide enough to display the largest string
             m_hierarchyListCtrl.SetColumnWidth (COL_NAME, LVSCW_AUTOSIZE);
             m_hierarchyListCtrl.SetColumnWidth (COL_SWITCH_UP, LVSCW_AUTOSIZE_USEHEADER);
@@ -158,7 +158,7 @@ CEditLODDialog::OnInitDialog (void)
             m_hierarchyListCtrl.SetItemState (0, LVIS_SELECTED, LVIS_SELECTED);
         }
     }
-	
+
 	return TRUE;
 }
 
@@ -167,7 +167,7 @@ CEditLODDialog::OnInitDialog (void)
 //  OnOK
 //
 void
-CEditLODDialog::OnOK (void) 
+CEditLODDialog::OnOK (void)
 {
 
     // Get a pointer to the doc
@@ -188,7 +188,7 @@ CEditLODDialog::OnOK (void)
             {
                 // Get the switch up distance from the list control
                 CString stringTemp = m_hierarchyListCtrl.GetItemText (iObject, COL_SWITCH_UP);
-                
+
                 // Convert the string to a float and pass this value
                 // onto the LOD manager
                 float switchDistance = ::atof (stringTemp);
@@ -196,14 +196,14 @@ CEditLODDialog::OnOK (void)
 
                 // Get the switch down distance from the list control
                 stringTemp = m_hierarchyListCtrl.GetItemText (iObject, COL_SWITCH_DN);
-                
+
                 // Convert the string to a float and pass this value
                 // onto the LOD manager
                 switchDistance = ::atof (stringTemp);
                 pLOD->Set_Switch_Down_Dist (iObject, switchDistance);
             }
         }
-    }    
+    }
 
 	// Allow the base class to process this message
     CDialog::OnOK ();
@@ -215,7 +215,7 @@ CEditLODDialog::OnOK (void)
 //  OnCancel
 //
 void
-CEditLODDialog::OnCancel (void) 
+CEditLODDialog::OnCancel (void)
 {
 	// Allow the base class to process this message
     CDialog::OnCancel ();
@@ -251,7 +251,7 @@ CEditLODDialog::OnDeltaposSwitchUpSpin
             m_hierarchyListCtrl.SetItemText (iIndex, COL_SWITCH_UP, stringTemp);
         }
     }
-	
+
 	*pResult = 0;
     return ;
 }
@@ -285,7 +285,7 @@ CEditLODDialog::OnDeltaposSwitchDnSpin
             m_hierarchyListCtrl.SetItemText (iIndex, COL_SWITCH_DN, stringTemp);
         }
     }
-	
+
 	*pResult = 0;
     return ;
 }
@@ -306,14 +306,14 @@ CEditLODDialog::OnItemChangedHierarchyList
     if (pNMListView &&
         (pNMListView->uChanged & LVIF_STATE) == LVIF_STATE)
     {
-               
+
         if ((pNMListView->uNewState & LVIS_SELECTED) != LVIS_SELECTED)
         {
             // Is there a selected item in the list control?
             if (m_hierarchyListCtrl.GetNextItem (-1, LVNI_ALL | LVNI_SELECTED) == -1)
             {
                 // Disabled the edit and spin controls
-                EnableControls (FALSE);                
+                EnableControls (FALSE);
             }
         }
         else
@@ -321,11 +321,11 @@ CEditLODDialog::OnItemChangedHierarchyList
             // Enable the edit and spin controls
             EnableControls (TRUE);
 
-            // Load the control with data for the selected item.            
-            ResetControls (pNMListView->iItem);            
+            // Load the control with data for the selected item.
+            ResetControls (pNMListView->iItem);
         }
     }
-	
+
 	*pResult = 0;
     return ;
 }
@@ -356,7 +356,7 @@ CEditLODDialog::ResetControls (int iIndex)
 
     // Set the text of the edit control to reflect the switching distance
     SetDlgItemText (IDC_SWITCH_UP_EDIT, stringTemp);
-    
+
     // Set the current position of the spin control
     float switchDistance = ::atof (stringTemp);
     m_switchUpSpin.SetPos (int(switchDistance * 10.00F));
@@ -383,14 +383,14 @@ CEditLODDialog::ResetControls (int iIndex)
 //
 void
 CEditLODDialog::EnableControls (BOOL bEnable)
-{    
+{
     // Enable or disable the windows
     ::EnableWindow (::GetDlgItem (m_hWnd, IDC_SETTINGS_GROUP), bEnable);
     ::EnableWindow (::GetDlgItem (m_hWnd, IDC_SWITCH_UP_SPIN), bEnable);
     ::EnableWindow (::GetDlgItem (m_hWnd, IDC_SWITCH_UP_EDIT), bEnable);
     ::EnableWindow (::GetDlgItem (m_hWnd, IDC_SWITCH_DN_SPIN), bEnable);
-    ::EnableWindow (::GetDlgItem (m_hWnd, IDC_SWITCH_DN_EDIT), bEnable);    
-    ::EnableWindow (::GetDlgItem (m_hWnd, IDC_RECALC), bEnable); 
+    ::EnableWindow (::GetDlgItem (m_hWnd, IDC_SWITCH_DN_EDIT), bEnable);
+    ::EnableWindow (::GetDlgItem (m_hWnd, IDC_RECALC), bEnable);
     return ;
 }
 
@@ -399,8 +399,8 @@ CEditLODDialog::EnableControls (BOOL bEnable)
 //  OnUpdateSwitchDnEdit
 //
 void
-CEditLODDialog::OnUpdateSwitchDnEdit (void) 
-{    
+CEditLODDialog::OnUpdateSwitchDnEdit (void)
+{
     // Get the switching distance from the edit control
     CString stringTemp;
     GetDlgItemText (IDC_SWITCH_DN_EDIT, stringTemp);
@@ -432,7 +432,7 @@ void CEditLODDialog::OnUpdateSwitchUpEdit (void)
     float newVal = ::atof (stringTemp);
 
     // Change the switching distance in the spin control
-    m_switchUpSpin.SetPos (int(newVal * 10.00F));    
+    m_switchUpSpin.SetPos (int(newVal * 10.00F));
 
     // Find the selected item in the list control
     int iIndex = m_hierarchyListCtrl.GetNextItem (-1, LVNI_ALL | LVNI_SELECTED);
diff --git a/Core/Tools/W3DView/EditLODDialog.h b/Core/Tools/W3DView/EditLODDialog.h
index addc9283ae7..94187d1ea46 100644
--- a/Core/Tools/W3DView/EditLODDialog.h
+++ b/Core/Tools/W3DView/EditLODDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EDITLODDIALOG_H__AF3CDE8E_61EC_11D2_9FC7_00104B791122__INCLUDED_)
-#define AFX_EDITLODDIALOG_H__AF3CDE8E_61EC_11D2_9FC7_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // EditLODDialog.h : header file
 //
 
@@ -78,5 +74,3 @@ class CEditLODDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EDITLODDIALOG_H__AF3CDE8E_61EC_11D2_9FC7_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/EmitterColorPropPage.cpp b/Core/Tools/W3DView/EmitterColorPropPage.cpp
index 68f8ebd88b2..e72c04317ab 100644
--- a/Core/Tools/W3DView/EmitterColorPropPage.cpp
+++ b/Core/Tools/W3DView/EmitterColorPropPage.cpp
@@ -19,14 +19,14 @@
 // EmitterColorPropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-#include "emittercolorproppage.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "EmitterColorPropPage.h"
 #include "part_emt.h"
-#include "utils.h"
-#include "opacitysettingsdialog.h"
-#include "colorutils.h"
-#include "emitterinstancelist.h"
+#include "Utils.h"
+#include "OpacitySettingsDialog.h"
+#include "ColorUtils.h"
+#include "EmitterInstanceList.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -78,7 +78,7 @@ EmitterColorPropPageClass::~EmitterColorPropPageClass (void)
 	SAFE_DELETE_ARRAY (m_OrigColors.Values);
 	SAFE_DELETE_ARRAY (m_OrigOpacities.KeyTimes);
 	SAFE_DELETE_ARRAY (m_OrigOpacities.Values);
-	
+
 	// Free the current setting arrays
 	SAFE_DELETE_ARRAY (m_CurrentColors.KeyTimes);
 	SAFE_DELETE_ARRAY (m_CurrentColors.Values);
@@ -143,7 +143,7 @@ EmitterColorPropPageClass::Initialize (void)
 		m_pEmitterList->Get_Color_Keyframes (m_OrigColors);
 		m_pEmitterList->Get_Color_Keyframes (m_CurrentColors);
 		m_pEmitterList->Get_Opacity_Keyframes (m_OrigOpacities);
-		m_pEmitterList->Get_Opacity_Keyframes (m_CurrentOpacities);				
+		m_pEmitterList->Get_Opacity_Keyframes (m_CurrentOpacities);
 	}
 
 	return ;
@@ -156,11 +156,11 @@ EmitterColorPropPageClass::Initialize (void)
 //
 /////////////////////////////////////////////////////////////
 BOOL
-EmitterColorPropPageClass::OnInitDialog (void) 
+EmitterColorPropPageClass::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CPropertyPage::OnInitDialog ();
-	
+
 	m_ColorBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_COLOR_BAR));
 	m_OpacityBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_OPACITY_BAR));
 
@@ -280,7 +280,7 @@ EmitterColorPropPageClass::OnNotify
 	WPARAM wParam,
 	LPARAM lParam,
 	LRESULT *pResult
-) 
+)
 {
 	CBR_NMHDR *color_bar_hdr = (CBR_NMHDR *)lParam;
 
@@ -291,8 +291,8 @@ EmitterColorPropPageClass::OnNotify
 	{
 		case IDC_OPACITY_BAR:
 		{
-			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {			
-				
+			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
+
 				//
 				//	Allow the user to edit the keyframe
 				//
@@ -307,26 +307,26 @@ EmitterColorPropPageClass::OnNotify
 					// Update the emitter
 					Update_Opacities ();
 					m_pEmitterList->Set_Opacity_Keyframes (m_CurrentOpacities);
-					SetModified ();					
+					SetModified ();
 				}
 			} else if ((color_bar_hdr->hdr.code == CBRN_MOVING_POINT) ||
 						  (color_bar_hdr->hdr.code == CBRN_DELETED_POINT)) {
-				
+
 				// Update the emitter
 				Update_Opacities ();
 				m_pEmitterList->Set_Opacity_Keyframes (m_CurrentOpacities);
-				SetModified ();					
+				SetModified ();
 			}
 		}
 		break;
 
 		case IDC_COLOR_BAR:
 		{
-			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {			
-				
+			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
+
 				//
 				//	Allow the user to edit the keyframe
-				//				
+				//
 				int red		= (int)color_bar_hdr->red;
 				int green	= (int)color_bar_hdr->green;
 				int blue		= (int)color_bar_hdr->blue;
@@ -405,7 +405,7 @@ EmitterColorPropPageClass::OnNotify
 		}
 		break;
 	}
-		
+
 	return CPropertyPage::OnNotify(wParam, lParam, pResult);
 }
 
@@ -465,7 +465,7 @@ EmitterColorPropPageClass::Update_Opacities (void)
 
 		//
 		//	Get all the opacity key frames and add them to our structure
-		//	
+		//
 		for (int index = 1; index < count; index ++) {
 			m_OpacityBar->Get_Point (index, &position, &red, &green, &blue);
 			m_CurrentOpacities.KeyTimes[index - 1] = position * m_Lifetime;
@@ -484,7 +484,7 @@ EmitterColorPropPageClass::Update_Opacities (void)
 /////////////////////////////////////////////////////////////
 void
 EmitterColorPropPageClass::Update_Colors (void)
-{		
+{
 	float position = 0;
 	float red = 0;
 	float green = 0;
@@ -515,7 +515,7 @@ EmitterColorPropPageClass::Update_Colors (void)
 
 		//
 		//	Get all the color points and add them to our structure
-		//	
+		//
 		for (int index = 1; index < count; index ++) {
 			m_ColorBar->Get_Point (index, &position, &red, &green, &blue);
 			m_CurrentColors.KeyTimes[index-1] = position * m_Lifetime;
@@ -544,7 +544,7 @@ EmitterColorPropPageClass::OnCommand
 	switch (LOWORD (wParam))
 	{
 		case IDC_RED_RANDOM_EDIT:
-		{			
+		{
 			if (HIWORD (wParam) == EN_CHANGE) {
 				SetModified ();
 			}
@@ -556,7 +556,7 @@ EmitterColorPropPageClass::OnCommand
 
 				m_CurrentColors.Rand.X = ((float)GetDlgItemInt (IDC_RED_RANDOM_EDIT)) / 255;
 				m_pEmitterList->Set_Color_Keyframes (m_CurrentColors);
-				SetModified ();				
+				SetModified ();
 			}
 		}
 		break;
@@ -591,7 +591,7 @@ EmitterColorPropPageClass::OnCommand
 				SendDlgItemMessage (LOWORD (wParam), EM_SETMODIFY, (WPARAM)0);
 
 				m_CurrentColors.Rand.Z = ((float)GetDlgItemInt (IDC_BLUE_RANDOM_EDIT)) / 255;
-				m_pEmitterList->Set_Color_Keyframes (m_CurrentColors);				
+				m_pEmitterList->Set_Color_Keyframes (m_CurrentColors);
 				SetModified ();
 			}
 		}
@@ -619,12 +619,12 @@ EmitterColorPropPageClass::OnCommand
 	return CPropertyPage::OnCommand (wParam, lParam);
 }
 
-void EmitterColorPropPageClass::OnDeltaposRedRandomSpin(NMHDR* pNMHDR, LRESULT* pResult) 
+void EmitterColorPropPageClass::OnDeltaposRedRandomSpin(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	NM_UPDOWN* pNMUpDown = (NM_UPDOWN*)pNMHDR;
 	// TODO: Add your control notification handler code here
 	int test = 0;
-	
+
 	*pResult = 0;
 	return ;
 }
@@ -648,7 +648,7 @@ EmitterColorPropPageClass::On_Lifetime_Changed (float lifetime)
 		for (index = 0; index < m_CurrentColors.NumKeyFrames; index ++) {
 			m_CurrentColors.KeyTimes[index] *= conversion;
 		}
-		
+
 		//
 		//	Rescale the opacities
 		//
@@ -659,8 +659,8 @@ EmitterColorPropPageClass::On_Lifetime_Changed (float lifetime)
 		//
 		//	Update the emitter
 		//
-		m_pEmitterList->Set_Color_Keyframes (m_CurrentColors);		
-		m_pEmitterList->Set_Opacity_Keyframes (m_CurrentOpacities);		
+		m_pEmitterList->Set_Color_Keyframes (m_CurrentColors);
+		m_pEmitterList->Set_Opacity_Keyframes (m_CurrentOpacities);
 		m_Lifetime = lifetime;
 		/*if (m_hWnd != NULL) {
 			Update_Colors ();
diff --git a/Core/Tools/W3DView/EmitterColorPropPage.h b/Core/Tools/W3DView/EmitterColorPropPage.h
index e92bf9891a3..4c33199bbb6 100644
--- a/Core/Tools/W3DView/EmitterColorPropPage.h
+++ b/Core/Tools/W3DView/EmitterColorPropPage.h
@@ -16,19 +16,15 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EMITTERCOLORPROPPAGE_H__83A8B83F_BA3B_11D2_9FFA_00104B791122__INCLUDED_)
-#define AFX_EMITTERCOLORPROPPAGE_H__83A8B83F_BA3B_11D2_9FFA_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EmitterColorPropPage.h : header file
 //
 
-#include "Resource.H"
-#include "Vector3.H"
-#include "ColorBar.H"
-#include "Part_Emt.H"
+#include "resource.h"
+#include "vector3.h"
+#include "ColorBar.h"
+#include "part_emt.h"
 
 // Forward declarations
 class EmitterInstanceListClass;
@@ -92,7 +88,7 @@ class EmitterColorPropPageClass : public CPropertyPage
 		bool								Is_Data_Valid (void) const { return m_bValid; }
 
 		void								Get_Color_Keyframes (ParticlePropertyStruct<Vector3> &colors)	{ colors = m_CurrentColors; }
-		void								Get_Opacity_Keyframes (ParticlePropertyStruct<float> &opacity)	{ opacity = m_CurrentOpacities; }		
+		void								Get_Opacity_Keyframes (ParticlePropertyStruct<float> &opacity)	{ opacity = m_CurrentOpacities; }
 		/*const Vector3 &				Get_Start_Color (void) const { return m_StartColor; }
 		const Vector3 &				Get_End_Color (void) const { return m_EndColor; }
 		float								Get_Start_Opacity (void) const { return m_StartOpacity; }
@@ -106,7 +102,7 @@ class EmitterColorPropPageClass : public CPropertyPage
 		/////////////////////////////////////////////////////////
 		//
 		//	Protected methods
-		//		
+		//
 		void				Initialize (void);
 		void				Update_Colors (void);
 		void				Update_Opacities (void);
@@ -116,7 +112,7 @@ class EmitterColorPropPageClass : public CPropertyPage
 		/////////////////////////////////////////////////////////
 		//
 		//	Private member data
-		//		
+		//
 		EmitterInstanceListClass *	m_pEmitterList;
 		bool								m_bValid;
 		ColorBarClass *				m_ColorBar;
@@ -130,5 +126,3 @@ class EmitterColorPropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EMITTERCOLORPROPPAGE_H__83A8B83F_BA3B_11D2_9FFA_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/EmitterFramePropPage.cpp b/Core/Tools/W3DView/EmitterFramePropPage.cpp
index 13e5291f932..865536ae368 100644
--- a/Core/Tools/W3DView/EmitterFramePropPage.cpp
+++ b/Core/Tools/W3DView/EmitterFramePropPage.cpp
@@ -19,12 +19,12 @@
 // EmitterFramePropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "EmitterFramePropPage.h"
-#include "Utils.H"
-#include "ParticleFrameKeyDialog.H"
-#include "EmitterInstanceList.H"
+#include "Utils.h"
+#include "ParticleFrameKeyDialog.h"
+#include "EmitterInstanceList.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -42,7 +42,7 @@ IMPLEMENT_DYNCREATE(EmitterFramePropPageClass, CPropertyPage)
 //  EmitterFramePropPageClass - constructor
 //
 /////////////////////////////////////////////////////////////
-EmitterFramePropPageClass::EmitterFramePropPageClass() : 
+EmitterFramePropPageClass::EmitterFramePropPageClass() :
 	CPropertyPage(EmitterFramePropPageClass::IDD),
 	m_pEmitterList(NULL),
 	m_bValid(true),
@@ -101,7 +101,7 @@ void
 EmitterFramePropPageClass::Initialize (void)
 {
 	SAFE_DELETE_ARRAY (m_Frames.KeyTimes);
-	SAFE_DELETE_ARRAY (m_Frames.Values);	
+	SAFE_DELETE_ARRAY (m_Frames.Values);
 
 	if (m_pEmitterList != NULL) {
 		m_Lifetime = m_pEmitterList->Get_Lifetime ();
@@ -133,12 +133,12 @@ EmitterFramePropPageClass::Initialize (void)
 //  OnInitDialog
 //
 /////////////////////////////////////////////////////////////
-BOOL 
-EmitterFramePropPageClass::OnInitDialog() 
+BOOL
+EmitterFramePropPageClass::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
 
-	// 
+	//
 	// Set the frame layout combo box
 	//
 	int mode = m_pEmitterList->Get_Frame_Mode();
@@ -148,8 +148,8 @@ EmitterFramePropPageClass::OnInitDialog()
 		case W3D_EMITTER_FRAME_MODE_4x4: m_FrameLayoutCombo.SetCurSel(2); break;
 		case W3D_EMITTER_FRAME_MODE_8x8: m_FrameLayoutCombo.SetCurSel(3); break;
 		case W3D_EMITTER_FRAME_MODE_16x16: m_FrameLayoutCombo.SetCurSel(4); break;
-		default: 
-			m_FrameLayoutCombo.SetCurSel(4); 
+		default:
+			m_FrameLayoutCombo.SetCurSel(4);
 			break;
 	}
 
@@ -157,7 +157,7 @@ EmitterFramePropPageClass::OnInitDialog()
 	// Create the keyframe control
 	//
 	m_FrameBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_FRAME_BAR));
-	
+
 	//
 	// Setup the spinners
 	//
@@ -193,7 +193,7 @@ EmitterFramePropPageClass::OnInitDialog()
 //  OnApply
 //
 /////////////////////////////////////////////////////////////
-BOOL EmitterFramePropPageClass::OnApply() 
+BOOL EmitterFramePropPageClass::OnApply()
 {
 	return CPropertyPage::OnApply();
 }
@@ -205,7 +205,7 @@ BOOL EmitterFramePropPageClass::OnApply()
 //  OnNotify
 //
 /////////////////////////////////////////////////////////////
-BOOL EmitterFramePropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL EmitterFramePropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	CBR_NMHDR *color_bar_hdr = (CBR_NMHDR *)lParam;
 
@@ -214,7 +214,7 @@ BOOL EmitterFramePropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT*
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 	}
 
@@ -225,8 +225,8 @@ BOOL EmitterFramePropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT*
 	{
 		case IDC_FRAME_BAR:
 		{
-			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {			
-				
+			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
+
 				//
 				//	Allow the user to edit the keyframe
 				//
@@ -239,7 +239,7 @@ BOOL EmitterFramePropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT*
 
 					m_FrameBar->Set_Redraw (false);
 					m_FrameBar->Set_Graph_Percent (color_bar_hdr->key_index, norm_val);
-					
+
 					//
 					//	Determine if the user changed the 'max' or 'min' frame
 					//
@@ -261,10 +261,10 @@ BOOL EmitterFramePropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT*
 					//	Renormalize the FrameBar key frame points if necessary
 					//
 					if ((new_max != m_MaxFrame) || (new_min != m_MinFrame)) {
-						
+
 						int count = m_FrameBar->Get_Point_Count ();
 						for (int index = 0; index < count; index ++) {
-							
+
 							float frame = Denormalize_Frame(m_FrameBar->Get_Graph_Percent (index));
 							float new_norm = Normalize_Frame(frame,new_min,new_max);
 
@@ -279,20 +279,20 @@ BOOL EmitterFramePropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT*
 
 					//
 					// Update the emitter
-					//					
+					//
 					Update_Frames ();
 					m_pEmitterList->Set_Frame_Keyframes (m_Frames);
 					SetModified ();
 				}
 			} else if ((color_bar_hdr->hdr.code == CBRN_MOVING_POINT) ||
-						  (color_bar_hdr->hdr.code == CBRN_DELETED_POINT)) {			
-				
+						  (color_bar_hdr->hdr.code == CBRN_DELETED_POINT)) {
+
 				//
 				// Update the emitter
 				//
 				Update_Frames ();
 				m_pEmitterList->Set_Frame_Keyframes (m_Frames);
-				SetModified ();					
+				SetModified ();
 			}
 		}
 		break;
@@ -344,9 +344,9 @@ EmitterFramePropPageClass::Update_Frames (void)
 
 		//
 		//	Get all the key frames and add them to our structure
-		//	
+		//
 		for (int index = 1; index < count; index ++) {
-			m_FrameBar->Get_Point (index, &position, &red, &green, &blue);			
+			m_FrameBar->Get_Point (index, &position, &red, &green, &blue);
 			m_Frames.KeyTimes[index - 1] = position * m_Lifetime;
 			m_Frames.Values[index - 1] = Denormalize_Frame(m_FrameBar->Get_Graph_Percent (index) );
 		}
@@ -360,8 +360,8 @@ EmitterFramePropPageClass::Update_Frames (void)
 //  OnCommand
 //
 /////////////////////////////////////////////////////////////
-BOOL 
-EmitterFramePropPageClass::OnCommand(WPARAM wParam, LPARAM lParam) 
+BOOL
+EmitterFramePropPageClass::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 	switch (LOWORD (wParam))
 	{
@@ -369,7 +369,7 @@ EmitterFramePropPageClass::OnCommand(WPARAM wParam, LPARAM lParam)
 		{
 			// Update the emitter
 			if ((HIWORD (wParam) == EN_KILLFOCUS) &&
-				SendDlgItemMessage (LOWORD (wParam), EM_GETMODIFY)) 
+				SendDlgItemMessage (LOWORD (wParam), EM_GETMODIFY))
 			{
 				SendDlgItemMessage (LOWORD (wParam), EM_SETMODIFY, (WPARAM)0);
 				m_Frames.Rand = ::GetDlgItemFloat (m_hWnd, IDC_FRAME_RANDOM_EDIT);
@@ -387,7 +387,7 @@ EmitterFramePropPageClass::OnCommand(WPARAM wParam, LPARAM lParam)
 			}
 		break;
 	}
-	
+
 	return CPropertyPage::OnCommand(wParam, lParam);
 }
 
diff --git a/Core/Tools/W3DView/EmitterFramePropPage.h b/Core/Tools/W3DView/EmitterFramePropPage.h
index a8a9e58df2f..7e7c7cbf648 100644
--- a/Core/Tools/W3DView/EmitterFramePropPage.h
+++ b/Core/Tools/W3DView/EmitterFramePropPage.h
@@ -16,17 +16,13 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EMITTERFRAMEPROPPAGE_H__6F068804_EAD5_4A19_BE03_C9C7B534E6E8__INCLUDED_)
-#define AFX_EMITTERFRAMEPROPPAGE_H__6F068804_EAD5_4A19_BE03_C9C7B534E6E8__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EmitterFramePropPage.h : header file
 //
 
-#include "ColorBar.H"
-#include "Part_Emt.H"
+#include "ColorBar.h"
+#include "part_emt.h"
 
 class EmitterInstanceListClass;
 
@@ -92,7 +88,7 @@ class EmitterFramePropPageClass : public CPropertyPage
 
 private:
 
-	
+
 	float								Normalize_Frame(float frame);
 	float								Normalize_Frame(float frame,float min,float max);
 	float								Denormalize_Frame(float normalized_val);
@@ -100,7 +96,7 @@ class EmitterFramePropPageClass : public CPropertyPage
 	/////////////////////////////////////////////////////////
 	//
 	//	Private member data
-	//		
+	//
 	EmitterInstanceListClass *			m_pEmitterList;
 	bool										m_bValid;
 
@@ -130,5 +126,3 @@ inline float EmitterFramePropPageClass::Denormalize_Frame(float normalized_val)
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EMITTERFRAMEPROPPAGE_H__6F068804_EAD5_4A19_BE03_C9C7B534E6E8__INCLUDED_)
diff --git a/Core/Tools/W3DView/EmitterGeneralPropPage.cpp b/Core/Tools/W3DView/EmitterGeneralPropPage.cpp
index c9189b741dd..20834f603de 100644
--- a/Core/Tools/W3DView/EmitterGeneralPropPage.cpp
+++ b/Core/Tools/W3DView/EmitterGeneralPropPage.cpp
@@ -19,15 +19,15 @@
 // EmitterGeneralPropPage.cpp : implementation file
 //
 
-#include "StdAfx.H"
-#include "W3DView.H"
-#include "EmitterGeneralPropPage.H"
-#include "EmitterPropertySheet.H"
-#include "Part_Emt.H"
-#include "Utils.H"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "EmitterGeneralPropPage.h"
+#include "EmitterPropertySheet.h"
+#include "part_emt.h"
+#include "Utils.h"
 #include "texture.h"
-#include "Shader.H"
-#include "EmitterInstanceList.H"
+#include "shader.h"
+#include "EmitterInstanceList.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -111,10 +111,10 @@ EmitterGeneralPropPageClass::Initialize (void)
 		// Get the emitter's texture
 		//
 		m_TextureFilename = m_pEmitterList->Get_Texture_Filename ();
-		
+
 		m_Lifetime		= m_pEmitterList->Get_Lifetime ();
 		m_EmitterName	= m_pEmitterList->Get_Name ();
-		m_pEmitterList->Get_Shader (m_Shader);		
+		m_pEmitterList->Get_Shader (m_Shader);
 	}
 
 	return ;
@@ -156,7 +156,7 @@ EmitterGeneralPropPageClass::Add_Shader_To_Combo
 //  OnInitDialog
 //
 BOOL
-EmitterGeneralPropPageClass::OnInitDialog (void) 
+EmitterGeneralPropPageClass::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CPropertyPage::OnInitDialog ();
@@ -173,7 +173,7 @@ EmitterGeneralPropPageClass::OnInitDialog (void)
 	Add_Shader_To_Combo (ShaderClass::_PresetOpaqueSpriteShader, "Opaque");
 
 	//
-	// Fill the edit controls with the default values	
+	// Fill the edit controls with the default values
 	//
 	SetDlgItemText (IDC_NAME_EDIT, m_EmitterName);
 	SetDlgItemText (IDC_FILENAME_EDIT, m_TextureFilename);
@@ -185,7 +185,7 @@ EmitterGeneralPropPageClass::OnInitDialog (void)
 	if (m_Lifetime > 100) {
 		m_Lifetime = 0;
 	}
-	::Initialize_Spinner (m_LifetimeSpin, m_Lifetime, 0, 1000);	
+	::Initialize_Spinner (m_LifetimeSpin, m_Lifetime, 0, 1000);
 
 	OnParticleLifetimeCheck ();
 
@@ -244,7 +244,7 @@ EmitterGeneralPropPageClass::OnApply (void)
 		retval = CPropertyPage::OnApply ();
 		m_bValid = true;
 	}
-	
+
 	// Return the TRUE/FALSE result code
 	return retval;
 }
@@ -255,7 +255,7 @@ EmitterGeneralPropPageClass::OnApply (void)
 //  OnBrowseButton
 //
 void
-EmitterGeneralPropPageClass::OnBrowseButton (void) 
+EmitterGeneralPropPageClass::OnBrowseButton (void)
 {
 	CFileDialog openFileDialog (TRUE,
 										 ".tga",
@@ -270,7 +270,7 @@ EmitterGeneralPropPageClass::OnBrowseButton (void)
 		SetModified ();
 	}
 
-	return ;	
+	return ;
 }
 
 
@@ -315,7 +315,7 @@ EmitterGeneralPropPageClass::OnNotify
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 	}
 
@@ -329,7 +329,7 @@ EmitterGeneralPropPageClass::OnNotify
 //  OnChangeParticleLifetimeEdit
 //
 void
-EmitterGeneralPropPageClass::OnChangeParticleLifetimeEdit (void) 
+EmitterGeneralPropPageClass::OnChangeParticleLifetimeEdit (void)
 {
 	SetModified ();
 	return ;
diff --git a/Core/Tools/W3DView/EmitterGeneralPropPage.h b/Core/Tools/W3DView/EmitterGeneralPropPage.h
index 7b305b240bc..bb81f4a261e 100644
--- a/Core/Tools/W3DView/EmitterGeneralPropPage.h
+++ b/Core/Tools/W3DView/EmitterGeneralPropPage.h
@@ -16,17 +16,13 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EMITTERGENERALPROPPAGE_H__83A8B83C_BA3B_11D2_9FFA_00104B791122__INCLUDED_)
-#define AFX_EMITTERGENERALPROPPAGE_H__83A8B83C_BA3B_11D2_9FFA_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EmitterGeneralPropPage.h : header file
 //
 
-#include "Resource.H"
-#include "Shader.H"
+#include "resource.h"
+#include "shader.h"
 
 // Forward delcarations
 class EmitterInstanceListClass;
@@ -90,7 +86,7 @@ class EmitterGeneralPropPageClass : public CPropertyPage
 		//
 		EmitterInstanceListClass *	Get_Emitter (void) const { return m_pEmitterList; }
 		void								Set_Emitter (EmitterInstanceListClass *pemitter_list) { m_pEmitterList = pemitter_list; Initialize (); }
-		
+
 		EmitterPropertySheetClass *Get_Parent (void) const { return m_Parent; }
 		void								Set_Parent (EmitterPropertySheetClass * parent) { m_Parent = parent; }
 
@@ -107,7 +103,7 @@ class EmitterGeneralPropPageClass : public CPropertyPage
 		/////////////////////////////////////////////////////////
 		//
 		//	Protected methods
-		//		
+		//
 		void								Initialize (void);
 		void								Add_Shader_To_Combo (ShaderClass &shader, LPCTSTR name);
 
@@ -116,7 +112,7 @@ class EmitterGeneralPropPageClass : public CPropertyPage
 		/////////////////////////////////////////////////////////
 		//
 		//	Private member data
-		//		
+		//
 		EmitterInstanceListClass *	m_pEmitterList;
 		EmitterPropertySheetClass *m_Parent;
 
@@ -130,5 +126,3 @@ class EmitterGeneralPropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EMITTERGENERALPROPPAGE_H__83A8B83C_BA3B_11D2_9FFA_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/EmitterInstanceList.cpp b/Core/Tools/W3DView/EmitterInstanceList.cpp
index fa92903a8c8..a4f66a0e971 100644
--- a/Core/Tools/W3DView/EmitterInstanceList.cpp
+++ b/Core/Tools/W3DView/EmitterInstanceList.cpp
@@ -31,9 +31,9 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "StdAfx.H"
-#include "EmitterInstanceList.H"
-#include "Utils.H"
+#include "StdAfx.h"
+#include "EmitterInstanceList.h"
+#include "Utils.h"
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -59,7 +59,7 @@ EmitterInstanceListClass::Free_List (void)
 	//	Release our hold on each of the emitter pointers
 	//
 	for (int index = 0; index < m_List.Count (); index ++) {
-		MEMBER_RELEASE (m_List[index]);
+		REF_PTR_RELEASE (m_List[index]);
 	}
 
 	m_List.Delete_All ();
@@ -89,11 +89,12 @@ EmitterInstanceListClass::Add_Emitter (ParticleEmitterClass *emitter)
 				SAFE_DELETE (def);
 			}
 		}
-		
+
 		//
 		//	Add this emitter to the list and put a hold on its reference
 		//
-		SAFE_ADD_REF (emitter);
+		if (emitter)
+			emitter->Add_Ref();
 		m_List.Add (emitter);
 	}
 
@@ -244,7 +245,7 @@ EmitterInstanceListClass::Set_Color_Keyframes (ParticlePropertyStruct<Vector3> &
 	if (	(keyframes.Rand.X != 0) ||
 			(keyframes.Rand.Y != 0) ||
 			(keyframes.Rand.Z != 0))
-	{		
+	{
 		for (UINT index = 0; index < keyframes.NumKeyFrames; index ++) {
 			if ((keyframes.Values[index].X <= 0.000001F) &&
 				 (keyframes.Values[index].Y <= 0.000001F) &&
@@ -253,11 +254,11 @@ EmitterInstanceListClass::Set_Color_Keyframes (ParticlePropertyStruct<Vector3> &
 				keyframes.Values[index].Y = -keyframes.Rand.Y;
 				keyframes.Values[index].Z = -keyframes.Rand.Z;
 			}
-		}		
+		}
 	}
 
 	ParticleEmitterDefClass::Set_Color_Keyframes (keyframes);
-	
+
 	//
 	//	Pass this setting onto the emitters immediately
 	//
@@ -282,16 +283,16 @@ EmitterInstanceListClass::Set_Opacity_Keyframes (ParticlePropertyStruct<float> &
 	//	does even if its got a randomizer.
 	//
 	if (keyframes.Rand != 0)
-	{		
+	{
 		for (UINT index = 0; index < keyframes.NumKeyFrames; index ++) {
 			if (keyframes.Values[index] <= 0.000001F) {
 				keyframes.Values[index] = -keyframes.Rand;
 			}
-		}		
+		}
 	}
 
 	ParticleEmitterDefClass::Set_Opacity_Keyframes (keyframes);
-	
+
 	//
 	//	Pass this setting onto the emitters immediately
 	//
@@ -316,16 +317,16 @@ EmitterInstanceListClass::Set_Size_Keyframes (ParticlePropertyStruct<float> &key
 	//	does even if its got a randomizer.
 	//
 	if (keyframes.Rand != 0)
-	{		
+	{
 		for (UINT index = 0; index < keyframes.NumKeyFrames; index ++) {
 			if (keyframes.Values[index] <= 0.000001F) {
 				keyframes.Values[index] = -keyframes.Rand;
 			}
-		}		
+		}
 	}
 
 	ParticleEmitterDefClass::Set_Size_Keyframes (keyframes);
-	
+
 	//
 	//	Pass this setting onto the emitters immediately
 	//
@@ -347,7 +348,7 @@ void
 EmitterInstanceListClass::Set_Rotation_Keyframes (ParticlePropertyStruct<float> &keyframes, float orient_rnd)
 {
 	ParticleEmitterDefClass::Set_Rotation_Keyframes (keyframes, orient_rnd);
-	
+
 	//
 	//	Pass this setting onto the emitters immediately
 	//
@@ -367,7 +368,7 @@ void
 EmitterInstanceListClass::Set_Frame_Keyframes (ParticlePropertyStruct<float> &keyframes)
 {
 	ParticleEmitterDefClass::Set_Frame_Keyframes (keyframes);
-	
+
 	//
 	//	Pass this setting onto the emitters immediately
 	//
@@ -387,7 +388,7 @@ void
 EmitterInstanceListClass::Set_Blur_Time_Keyframes (ParticlePropertyStruct<float> &keyframes)
 {
 	ParticleEmitterDefClass::Set_Blur_Time_Keyframes (keyframes);
-	
+
 	//
 	//	Pass this setting onto the emitters immediately
 	//
@@ -421,7 +422,7 @@ EmitterInstanceListClass::Get_Color_Keyframes (ParticlePropertyStruct<Vector3> &
 		if (keyframes.Values[index].Z <= 0.000001F) {
 			keyframes.Values[index].Z = 0;
 		}
-	}		
+	}
 
 	return ;
 }
@@ -443,7 +444,7 @@ EmitterInstanceListClass::Get_Opacity_Keyframes (ParticlePropertyStruct<float> &
 		if (keyframes.Values[index] <= 0.000001F) {
 			keyframes.Values[index] = 0;
 		}
-	}		
+	}
 	return ;
 }
 
@@ -464,7 +465,7 @@ EmitterInstanceListClass::Get_Size_Keyframes (ParticlePropertyStruct<float> &key
 		if (keyframes.Values[index] <= 0.000001F) {
 			keyframes.Values[index] = 0;
 		}
-	}		
+	}
 	return ;
 }
 
diff --git a/Core/Tools/W3DView/EmitterInstanceList.h b/Core/Tools/W3DView/EmitterInstanceList.h
index c5a721c4b39..88688ba59e5 100644
--- a/Core/Tools/W3DView/EmitterInstanceList.h
+++ b/Core/Tools/W3DView/EmitterInstanceList.h
@@ -30,16 +30,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef __EMITTER_INSTANCE_LIST_H
-#define __EMITTER_INSTANCE_LIST_H
-
-#include "Vector.H"
-#include "Part_Ldr.H"
-#include "Part_Emt.H"
+#include "Vector.h"
+#include "part_ldr.h"
+#include "part_emt.h"
 
 
 /////////////////////////////////////////////////////////////////////
@@ -50,7 +45,7 @@
 class EmitterInstanceListClass : public ParticleEmitterDefClass
 {
 	public:
-		
+
 		///////////////////////////////////////////////////////
 		// Public constructors/destructors
 		///////////////////////////////////////////////////////
@@ -62,14 +57,14 @@ class EmitterInstanceListClass : public ParticleEmitterDefClass
 
 		///////////////////////////////////////////////////////
 		// Public methods
-		///////////////////////////////////////////////////////		
+		///////////////////////////////////////////////////////
 		virtual void			Add_Emitter (ParticleEmitterClass *emitter);
 		virtual void			Free_List (void);
-		
+
 		///////////////////////////////////////////////////////
 		// Derived overrides
 		///////////////////////////////////////////////////////
-		
+
 		//
 		//	Note:  The following are settings that can be changed on
 		//		the fly.  All other settings are simply cached in the
@@ -81,7 +76,7 @@ class EmitterInstanceListClass : public ParticleEmitterDefClass
 		virtual void			Set_Burst_Size (unsigned int count);
 		virtual void			Set_Outward_Vel (float value);
 		virtual void			Set_Vel_Inherit (float value);
-		
+
 		//
 		//	Randomizer accessors
 		//
@@ -96,19 +91,17 @@ class EmitterInstanceListClass : public ParticleEmitterDefClass
 		virtual void			Set_Rotation_Keyframes (ParticlePropertyStruct<float> &keyframes, float orient_rnd);
 		virtual void			Set_Frame_Keyframes (ParticlePropertyStruct<float> &keyframes);
 		virtual void			Set_Blur_Time_Keyframes (ParticlePropertyStruct<float> &keyframes);
-	
+
 		virtual void			Get_Color_Keyframes (ParticlePropertyStruct<Vector3> &keyframes) const;
 		virtual void			Get_Opacity_Keyframes (ParticlePropertyStruct<float> &keyframes) const;
 		virtual void			Get_Size_Keyframes (ParticlePropertyStruct<float> &keyframes) const;
 
-			
+
 	private:
-		
+
 		///////////////////////////////////////////////////////
 		// Private member data
 		///////////////////////////////////////////////////////
 
 		DynamicVectorClass<ParticleEmitterClass *>	m_List;
 };
-
-#endif //__EMITTER_INSTANCE_LIST_H
diff --git a/Core/Tools/W3DView/EmitterLineGroupPropPage.cpp b/Core/Tools/W3DView/EmitterLineGroupPropPage.cpp
index 2b8b60c2a38..32a7faba177 100644
--- a/Core/Tools/W3DView/EmitterLineGroupPropPage.cpp
+++ b/Core/Tools/W3DView/EmitterLineGroupPropPage.cpp
@@ -19,14 +19,14 @@
 // EmitterLineGroupPropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "EmitterLineGroupPropPage.h"
 #include "w3d_file.h"
 #include "EmitterInstanceList.h"
 #include "Utils.h"
-#include "ColorBar.H"
-#include "ParticleBlurTimeKeyDialog.H"
+#include "ColorBar.h"
+#include "ParticleBlurTimeKeyDialog.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -87,7 +87,7 @@ void
 EmitterLineGroupPropPageClass::Initialize (void)
 {
 	SAFE_DELETE_ARRAY (m_BlurTimes.KeyTimes);
-	SAFE_DELETE_ARRAY (m_BlurTimes.Values);	
+	SAFE_DELETE_ARRAY (m_BlurTimes.Values);
 
 	if (m_pEmitterList != NULL) {
 		m_Lifetime = m_pEmitterList->Get_Lifetime ();
@@ -115,15 +115,15 @@ EmitterLineGroupPropPageClass::Initialize (void)
 /////////////////////////////////////////////////////////////////////////////
 // EmitterLineGroupPropPageClass message handlers
 
-BOOL EmitterLineGroupPropPageClass::OnInitDialog() 
+BOOL EmitterLineGroupPropPageClass::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
-	
+
 	//
 	// Create the keyframe control
 	//
 	m_BlurTimeBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_BLUR_TIME_BAR));
-	
+
 	//
 	// Setup the spinners
 	//
@@ -148,7 +148,7 @@ BOOL EmitterLineGroupPropPageClass::OnInitDialog()
 										0);
 		m_BlurTimeBar->Set_Graph_Percent (index + 1, Normalize_Blur_Time(m_BlurTimes.Values[index]));
 	}
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -188,9 +188,9 @@ EmitterLineGroupPropPageClass::Update_Blur_Times (void)
 
 		//
 		//	Get all the key frames and add them to our structure
-		//	
+		//
 		for (int index = 1; index < count; index ++) {
-			m_BlurTimeBar->Get_Point (index, &position, &red, &green, &blue);			
+			m_BlurTimeBar->Get_Point (index, &position, &red, &green, &blue);
 			m_BlurTimes.KeyTimes[index - 1] = position * m_Lifetime;
 			m_BlurTimes.Values[index - 1] = Denormalize_Blur_Time(m_BlurTimeBar->Get_Graph_Percent (index) );
 		}
@@ -227,7 +227,7 @@ EmitterLineGroupPropPageClass::On_Lifetime_Changed (float lifetime)
 	return ;
 }
 
-BOOL EmitterLineGroupPropPageClass::OnCommand(WPARAM wParam, LPARAM lParam) 
+BOOL EmitterLineGroupPropPageClass::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 	switch (LOWORD (wParam))
 	{
@@ -235,7 +235,7 @@ BOOL EmitterLineGroupPropPageClass::OnCommand(WPARAM wParam, LPARAM lParam)
 		{
 			// Update the emitter
 			if ((HIWORD (wParam) == EN_KILLFOCUS) &&
-				SendDlgItemMessage (LOWORD (wParam), EM_GETMODIFY)) 
+				SendDlgItemMessage (LOWORD (wParam), EM_GETMODIFY))
 			{
 				SendDlgItemMessage (LOWORD (wParam), EM_SETMODIFY, (WPARAM)0);
 				m_BlurTimes.Rand = ::GetDlgItemFloat (m_hWnd, IDC_BLUR_TIME_RANDOM_EDIT);
@@ -244,14 +244,14 @@ BOOL EmitterLineGroupPropPageClass::OnCommand(WPARAM wParam, LPARAM lParam)
 			} else if (HIWORD (wParam) == EN_CHANGE) {
 				SetModified ();
 			}
-		}		
+		}
 		break;
-	}	
-		
+	}
+
 	return CPropertyPage::OnCommand(wParam, lParam);
 }
 
-BOOL EmitterLineGroupPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL EmitterLineGroupPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	CBR_NMHDR *color_bar_hdr = (CBR_NMHDR *)lParam;
 
@@ -260,7 +260,7 @@ BOOL EmitterLineGroupPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESU
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 	}
 
@@ -271,8 +271,8 @@ BOOL EmitterLineGroupPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESU
 	{
 		case IDC_BLUR_TIME_BAR:
 		{
-			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {			
-				
+			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
+
 				//
 				//	Allow the user to edit the keyframe
 				//
@@ -285,7 +285,7 @@ BOOL EmitterLineGroupPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESU
 
 					m_BlurTimeBar->Set_Redraw (false);
 					m_BlurTimeBar->Set_Graph_Percent (color_bar_hdr->key_index, norm_val);
-					
+
 					//
 					//	Determine if the user changed the 'max' or 'min' frame
 					//
@@ -307,10 +307,10 @@ BOOL EmitterLineGroupPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESU
 					//	Renormalize the BlurTimeBar key frame points if necessary
 					//
 					if ((new_max != m_MaxBlurTime) || (new_min != m_MinBlurTime)) {
-						
+
 						int count = m_BlurTimeBar->Get_Point_Count ();
 						for (int index = 0; index < count; index ++) {
-							
+
 							float frame = Denormalize_Blur_Time(m_BlurTimeBar->Get_Graph_Percent (index));
 							float new_norm = Normalize_Blur_Time(frame,new_min,new_max);
 
@@ -325,20 +325,20 @@ BOOL EmitterLineGroupPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESU
 
 					//
 					// Update the emitter
-					//					
+					//
 					Update_Blur_Times ();
 					m_pEmitterList->Set_Blur_Time_Keyframes (m_BlurTimes);
 					SetModified ();
 				}
 			} else if ((color_bar_hdr->hdr.code == CBRN_MOVING_POINT) ||
-						  (color_bar_hdr->hdr.code == CBRN_DELETED_POINT)) {			
-				
+						  (color_bar_hdr->hdr.code == CBRN_DELETED_POINT)) {
+
 				//
 				// Update the emitter
 				//
 				Update_Blur_Times ();
 				m_pEmitterList->Set_Blur_Time_Keyframes (m_BlurTimes);
-				SetModified ();					
+				SetModified ();
 			}
 		}
 		break;
@@ -352,7 +352,7 @@ BOOL EmitterLineGroupPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESU
 		}
 		break;
 	}
-	
+
 	return CPropertyPage::OnNotify(wParam, lParam, pResult);
 }
 
diff --git a/Core/Tools/W3DView/EmitterLineGroupPropPage.h b/Core/Tools/W3DView/EmitterLineGroupPropPage.h
index 45c31193eae..2a575eff3e3 100644
--- a/Core/Tools/W3DView/EmitterLineGroupPropPage.h
+++ b/Core/Tools/W3DView/EmitterLineGroupPropPage.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EMITTERLINEGROUPPROPPAGE_H__51E7B2D1_1943_454E_B188_5F7D508D7203__INCLUDED_)
-#define AFX_EMITTERLINEGROUPPROPPAGE_H__51E7B2D1_1943_454E_B188_5F7D508D7203__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EmitterLineGroupPropPage.h : header file
 //
 
@@ -98,7 +94,7 @@ class EmitterLineGroupPropPageClass : public CPropertyPage
 	/////////////////////////////////////////////////////////
 	//
 	//	Private member data
-	//		
+	//
 	EmitterInstanceListClass *			m_pEmitterList;
 	bool										m_bValid;
 
@@ -112,5 +108,3 @@ class EmitterLineGroupPropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EMITTERLINEGROUPPROPPAGE_H__51E7B2D1_1943_454E_B188_5F7D508D7203__INCLUDED_)
diff --git a/Core/Tools/W3DView/EmitterLinePropPage.cpp b/Core/Tools/W3DView/EmitterLinePropPage.cpp
index 9247fbae949..91c1a5a5fff 100644
--- a/Core/Tools/W3DView/EmitterLinePropPage.cpp
+++ b/Core/Tools/W3DView/EmitterLinePropPage.cpp
@@ -19,8 +19,8 @@
 // EmitterLinePropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "EmitterLinePropPage.h"
 #include "w3d_file.h"
 #include "EmitterInstanceList.h"
@@ -37,7 +37,7 @@ static char THIS_FILE[] = __FILE__;
 
 IMPLEMENT_DYNCREATE(EmitterLinePropPageClass, CPropertyPage)
 
-EmitterLinePropPageClass::EmitterLinePropPageClass() : 
+EmitterLinePropPageClass::EmitterLinePropPageClass() :
 	CPropertyPage(EmitterLinePropPageClass::IDD),
 	m_pEmitterList(NULL),
 	m_bValid(true),
@@ -105,7 +105,7 @@ EmitterLinePropPageClass::Initialize (void)
 		m_NoiseAmplitude = m_pEmitterList->Get_Noise_Amplitude();
 		m_MergeAbortFactor = m_pEmitterList->Get_Merge_Abort_Factor();
 		m_TextureTileFactor = m_pEmitterList->Get_Texture_Tile_Factor();
-		
+
 		Vector2 uvrate = m_pEmitterList->Get_UV_Offset_Rate();
 		m_UPerSec = uvrate.X;
 		m_VPerSec = uvrate.Y;
@@ -114,10 +114,10 @@ EmitterLinePropPageClass::Initialize (void)
 	return ;
 }
 
-BOOL EmitterLinePropPageClass::OnInitDialog() 
+BOOL EmitterLinePropPageClass::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
-	
+
 	// Set up the spinner ranges
 	m_SubdivisionLevelSpin.SetRange(0,8);
 	m_SubdivisionLevelSpin.SetPos(m_SubdivisionLevel);
@@ -138,11 +138,11 @@ BOOL EmitterLinePropPageClass::OnInitDialog()
 
 	bool enable = (m_pEmitterList->Get_Render_Mode() == W3D_EMITTER_RENDER_MODE_LINE);
 	::Enable_Dialog_Controls(m_hWnd,enable);
-	
+
 	return TRUE;
 }
 
-BOOL EmitterLinePropPageClass::OnApply() 
+BOOL EmitterLinePropPageClass::OnApply()
 {
 	//
 	//	Get the data from the controls
@@ -153,7 +153,7 @@ BOOL EmitterLinePropPageClass::OnApply()
 	m_TextureTileFactor = ::GetDlgItemFloat (m_hWnd, IDC_UVTILING_EDIT);
 	m_UPerSec = ::GetDlgItemFloat (m_hWnd, IDC_UPERSEC_EDIT);
 	m_VPerSec = ::GetDlgItemFloat (m_hWnd, IDC_VPERSEC_EDIT);
-	
+
 	m_MappingMode = SendDlgItemMessage (IDC_MAPMODE_COMBO, CB_GETCURSEL);
 	m_MergeIntersections = !!SendDlgItemMessage (IDC_MERGE_INTERSECTIONS_CHECK, BM_GETCHECK);
 	m_EndCaps = !!SendDlgItemMessage (IDC_END_CAPS_CHECK, BM_GETCHECK);
@@ -179,11 +179,11 @@ BOOL EmitterLinePropPageClass::OnApply()
 }
 
 
-BOOL EmitterLinePropPageClass::OnCommand(WPARAM wParam, LPARAM lParam) 
+BOOL EmitterLinePropPageClass::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 	switch (LOWORD (wParam))
 	{
-		// Check if any of the edit boxes were modified, 
+		// Check if any of the edit boxes were modified,
 		case IDC_SUBDIVISION_LEVEL_EDIT:
 		case IDC_NOISE_AMPLITUDE_EDIT:
 		case IDC_MERGE_ABORT_FACTOR_EDIT:
@@ -208,20 +208,20 @@ BOOL EmitterLinePropPageClass::OnCommand(WPARAM wParam, LPARAM lParam)
 				SetModified ();
 			}
 			break;
-	
+
 	}
-	
+
 	return CPropertyPage::OnCommand(wParam, lParam);
 }
 
-BOOL EmitterLinePropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL EmitterLinePropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	//
 	//	Update the spinner control if necessary
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 		SetModified ();
 	}
diff --git a/Core/Tools/W3DView/EmitterLinePropPage.h b/Core/Tools/W3DView/EmitterLinePropPage.h
index 4b734641934..00f2c2feee2 100644
--- a/Core/Tools/W3DView/EmitterLinePropPage.h
+++ b/Core/Tools/W3DView/EmitterLinePropPage.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EMITTERLINEPROPPAGE_H__BBD9ED4C_E752_439A_81D5_A4FA9A6F6FC8__INCLUDED_)
-#define AFX_EMITTERLINEPROPPAGE_H__BBD9ED4C_E752_439A_81D5_A4FA9A6F6FC8__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EmitterLinePropPage.h : header file
 //
 
@@ -99,11 +95,11 @@ class EmitterLinePropPageClass : public CPropertyPage
 		float								Get_V_Per_Sed(void) const { return m_VPerSec; }
 
 	protected:
-			
+
 		/////////////////////////////////////////////////////////
 		//
 		//	Protected methods
-		//		
+		//
 		void								Initialize (void);
 
 	private:
@@ -111,7 +107,7 @@ class EmitterLinePropPageClass : public CPropertyPage
 		/////////////////////////////////////////////////////////
 		//
 		//	Private member data
-		//		
+		//
 		EmitterInstanceListClass *	m_pEmitterList;
 		bool								m_bValid;
 
@@ -131,5 +127,3 @@ class EmitterLinePropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EMITTERLINEPROPPAGE_H__BBD9ED4C_E752_439A_81D5_A4FA9A6F6FC8__INCLUDED_)
diff --git a/Core/Tools/W3DView/EmitterParticlePropPage.cpp b/Core/Tools/W3DView/EmitterParticlePropPage.cpp
index d3a26efcac2..cff67fb2418 100644
--- a/Core/Tools/W3DView/EmitterParticlePropPage.cpp
+++ b/Core/Tools/W3DView/EmitterParticlePropPage.cpp
@@ -19,14 +19,14 @@
 // EmitterParticlePropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "EmitterParticlePropPage.h"
-#include "Part_Emt.H"
-#include "Utils.H"
-#include "Vector3RndCombo.H"
-#include "VolumeRandomDialog.H"
-#include "EmitterInstanceList.H"
+#include "part_emt.h"
+#include "Utils.h"
+#include "Vector3RndCombo.h"
+#include "VolumeRandomDialog.h"
+#include "EmitterInstanceList.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -110,7 +110,7 @@ EmitterParticlePropPageClass::Initialize (void)
 		//
 		// Read the settings from the emitter
 		//
-		m_Rate			= m_pEmitterList->Get_Emission_Rate ();		
+		m_Rate			= m_pEmitterList->Get_Emission_Rate ();
 		m_BurstSize		= m_pEmitterList->Get_Burst_Size ();
 		m_MaxParticles	= m_pEmitterList->Get_Max_Emissions ();
 		m_Randomizer	= m_pEmitterList->Get_Creation_Volume ();
@@ -125,7 +125,7 @@ EmitterParticlePropPageClass::Initialize (void)
 //  OnInitDialog
 //
 BOOL
-EmitterParticlePropPageClass::OnInitDialog (void) 
+EmitterParticlePropPageClass::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CPropertyPage::OnInitDialog ();
@@ -136,7 +136,7 @@ EmitterParticlePropPageClass::OnInitDialog (void)
 	m_BurstSizeSpin.SetRange (0, 10000);
 	m_BurstSizeSpin.SetPos (m_BurstSize);
 	::Initialize_Spinner (m_EmitionRateSpin, m_Rate, -10000, 10000);
-	
+
 	//
 	//	Setup the max particles spin
 	//
@@ -161,7 +161,7 @@ EmitterParticlePropPageClass::OnApply (void)
 	//
 	m_Rate			= ::GetDlgItemFloat (m_hWnd, IDC_EMISSION_RATE_EDIT);
 	m_BurstSize		= GetDlgItemInt (IDC_BURST_SIZE_EDIT);
-	
+
 	//
 	//	Determine if we need to cap the particles or not
 	//
@@ -169,7 +169,7 @@ EmitterParticlePropPageClass::OnApply (void)
 	if (SendDlgItemMessage (IDC_MAX_PARTICLES_CHECK, BM_GETCHECK)) {
 		m_MaxParticles	= GetDlgItemInt (IDC_MAX_PARTICLES_EDIT);
 	}
-	
+
 	//
 	//	Apply the changes to the emitter
 	//
@@ -198,7 +198,7 @@ EmitterParticlePropPageClass::WindowProc
 	/*switch (message)
 	{
 	}*/
-	
+
 	// Allow the base class to process this message
 	return CPropertyPage::WindowProc(message, wParam, lParam);
 }
@@ -221,7 +221,7 @@ EmitterParticlePropPageClass::OnNotify
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 		SetModified ();
 	}
@@ -237,11 +237,11 @@ EmitterParticlePropPageClass::OnNotify
 //
 /////////////////////////////////////////////////////////////
 void
-EmitterParticlePropPageClass::OnSpecifyCreationVolume (void) 
+EmitterParticlePropPageClass::OnSpecifyCreationVolume (void)
 {
 	VolumeRandomDialogClass dialog (m_Randomizer, this);
 	if (dialog.DoModal () == IDOK) {
-		
+
 		//
 		//	Get the new randomizer from the dialog
 		//
@@ -276,7 +276,7 @@ EmitterParticlePropPageClass::OnCommand
 			}
 			break;
 	}
-	
+
 	return CPropertyPage::OnCommand(wParam, lParam);
 }
 
@@ -294,5 +294,5 @@ EmitterParticlePropPageClass::OnMaxParticlesCheck (void)
 	::EnableWindow (::GetDlgItem (m_hWnd, IDC_MAX_PARTICLES_SPIN), enable);
 
 	SetModified ();
-	return ;	
+	return ;
 }
diff --git a/Core/Tools/W3DView/EmitterParticlePropPage.h b/Core/Tools/W3DView/EmitterParticlePropPage.h
index c8595425997..ae3702d755b 100644
--- a/Core/Tools/W3DView/EmitterParticlePropPage.h
+++ b/Core/Tools/W3DView/EmitterParticlePropPage.h
@@ -16,18 +16,14 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EMITTERPARTICLEPROPPAGE_H__83A8B83D_BA3B_11D2_9FFA_00104B791122__INCLUDED_)
-#define AFX_EMITTERPARTICLEPROPPAGE_H__83A8B83D_BA3B_11D2_9FFA_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EmitterParticlePropPage.h : header file
 //
 
-#include "Resource.H"
-#include "Vector3.H"
-#include "V3_Rnd.H"
+#include "resource.h"
+#include "vector3.h"
+#include "v3_rnd.h"
 
 // Forward delcarations
 class EmitterInstanceListClass;
@@ -96,11 +92,11 @@ class EmitterParticlePropPageClass : public CPropertyPage
 		Vector3Randomizer *			Get_Creation_Volume (void) const	{ return m_Randomizer->Clone (); }
 
 	protected:
-		
+
 		/////////////////////////////////////////////////////////
 		//
 		//	Protected methods
-		//		
+		//
 		void								Initialize (void);
 
 	private:
@@ -108,7 +104,7 @@ class EmitterParticlePropPageClass : public CPropertyPage
 		/////////////////////////////////////////////////////////
 		//
 		//	Private member data
-		//		
+		//
 		EmitterInstanceListClass *	m_pEmitterList;
 		bool								m_bValid;
 		float								m_Rate;
@@ -119,6 +115,3 @@ class EmitterParticlePropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EMITTERPARTICLEPROPPAGE_H__83A8B83D_BA3B_11D2_9FFA_00104B791122__INCLUDED_)
-
diff --git a/Core/Tools/W3DView/EmitterPhysicsPropPage.cpp b/Core/Tools/W3DView/EmitterPhysicsPropPage.cpp
index 8b89c19c9e5..465b9e64b11 100644
--- a/Core/Tools/W3DView/EmitterPhysicsPropPage.cpp
+++ b/Core/Tools/W3DView/EmitterPhysicsPropPage.cpp
@@ -19,13 +19,13 @@
 // EmitterPhysicsPropPage.cpp : implementation file
 //
 
-#include "StdAfx.H"
-#include "W3DView.H"
-#include "EmitterPhysicsPropPage.H"
-#include "Utils.H"
-#include "Part_Emt.H"
-#include "VolumeRandomDialog.H"
-#include "EmitterInstanceList.H"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "EmitterPhysicsPropPage.h"
+#include "Utils.h"
+#include "part_emt.h"
+#include "VolumeRandomDialog.h"
+#include "EmitterInstanceList.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -113,7 +113,7 @@ EmitterPhysicsPropPageClass::Initialize (void)
 {
 	SAFE_DELETE (m_Randomizer);
 	if (m_pEmitterList != NULL) {
-	
+
 		//
 		// Get the emitter's settings
 		//
@@ -134,7 +134,7 @@ EmitterPhysicsPropPageClass::Initialize (void)
 //
 /////////////////////////////////////////////////////////////
 BOOL
-EmitterPhysicsPropPageClass::OnInitDialog (void) 
+EmitterPhysicsPropPageClass::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CPropertyPage::OnInitDialog ();
@@ -153,7 +153,7 @@ EmitterPhysicsPropPageClass::OnInitDialog (void)
 	//
 	::Initialize_Spinner (m_AccelXSpin, m_Acceleration.X, -10000, 10000);
 	::Initialize_Spinner (m_AccelYSpin, m_Acceleration.Y, -10000, 10000);
-	::Initialize_Spinner (m_AccelZSpin, m_Acceleration.Z, -10000, 10000);		
+	::Initialize_Spinner (m_AccelZSpin, m_Acceleration.Z, -10000, 10000);
 	return TRUE;
 }
 
@@ -205,7 +205,7 @@ EmitterPhysicsPropPageClass::OnNotify
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 		On_Setting_Changed (wParam);
 	}
@@ -225,7 +225,7 @@ EmitterPhysicsPropPageClass::OnSpecifyVelocityRandom (void)
 {
 	VolumeRandomDialogClass dialog (m_Randomizer, this);
 	if (dialog.DoModal () == IDOK) {
-		
+
 		//
 		//	Get the new randomizer from the dialog
 		//
diff --git a/Core/Tools/W3DView/EmitterPhysicsPropPage.h b/Core/Tools/W3DView/EmitterPhysicsPropPage.h
index 494d3a764a5..2b2c35cd60e 100644
--- a/Core/Tools/W3DView/EmitterPhysicsPropPage.h
+++ b/Core/Tools/W3DView/EmitterPhysicsPropPage.h
@@ -16,17 +16,13 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EMITTERPHYSICSPROPPAGE_H__83A8B83E_BA3B_11D2_9FFA_00104B791122__INCLUDED_)
-#define AFX_EMITTERPHYSICSPROPPAGE_H__83A8B83E_BA3B_11D2_9FFA_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EmitterPhysicsPropPage.h : header file
 //
 
-#include "Resource.H"
-#include "Vector3.H"
+#include "resource.h"
+#include "vector3.h"
 
 // Forward delcarations
 class EmitterInstanceListClass;
@@ -103,16 +99,16 @@ class EmitterPhysicsPropPageClass : public CPropertyPage
 		/////////////////////////////////////////////////////////
 		//
 		//	Protected methods
-		//		
+		//
 		void								Initialize (void);
 		void								On_Setting_Changed (UINT ctrl_id);
-	
+
 	private:
 
 		/////////////////////////////////////////////////////////
 		//
 		//	Private member data
-		//		
+		//
 		EmitterInstanceListClass *	m_pEmitterList;
 		bool								m_bValid;
 
@@ -125,5 +121,3 @@ class EmitterPhysicsPropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EMITTERPHYSICSPROPPAGE_H__83A8B83E_BA3B_11D2_9FFA_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/EmitterPropertySheet.cpp b/Core/Tools/W3DView/EmitterPropertySheet.cpp
index c6997ae9fb0..0b3eed55b27 100644
--- a/Core/Tools/W3DView/EmitterPropertySheet.cpp
+++ b/Core/Tools/W3DView/EmitterPropertySheet.cpp
@@ -30,18 +30,18 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#include "StdAfx.H"
-#include "W3DView.H"
-#include "EmitterPropertySheet.H"
-#include "Part_Emt.H"
-#include "Part_Ldr.H"
-#include "AssetMgr.H"
-#include "W3DViewDoc.H"
-#include "Utils.H"
-#include "DataTreeView.H"
-#include "AssetInfo.H"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "EmitterPropertySheet.h"
+#include "part_emt.h"
+#include "part_ldr.h"
+#include "assetmgr.h"
+#include "W3DViewDoc.h"
+#include "Utils.h"
+#include "DataTreeView.h"
+#include "AssetInfo.h"
 #include "texture.h"
-#include "EmitterInstanceList.H"
+#include "EmitterInstanceList.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -148,7 +148,7 @@ EmitterPropertySheetClass::WindowProc
 					}
 				}
 				case ID_APPLY_NOW:
-				{					
+				{
 					// Did the user click the button?
 					if (HIWORD (wParam) == BN_CLICKED) {
 						LRESULT lresult = CPropertySheet::WindowProc (message, wParam, lParam);
@@ -160,15 +160,15 @@ EmitterPropertySheetClass::WindowProc
 							 m_ColorPage.Is_Data_Valid () &&
 							 m_UserPage.Is_Data_Valid () &&
 							 m_SizePage.Is_Data_Valid () &&
-							 m_LinePage.Is_Data_Valid () && 
+							 m_LinePage.Is_Data_Valid () &&
 							 m_RotationPage.Is_Data_Valid () &&
 							 m_FramePage.Is_Data_Valid () &&
-							 m_LineGroupPage.Is_Data_Valid () ) 
+							 m_LineGroupPage.Is_Data_Valid () )
 						{
 							// Update the current emitter to match the data
 							Update_Emitter ();
 						}
-												
+
 						return lresult;
 					}
 				}
@@ -193,13 +193,13 @@ EmitterPropertySheetClass::Add_Emitter_To_Viewer (void)
 {
 	CW3DViewDoc *pdoc = ::GetCurrentDocument ();
 	if ((pdoc != NULL) && (m_pEmitterList != NULL)) {
-		
+
 		//
 		// Create a new prototype for this emitter and add it to the asset manager
 		//
 		ParticleEmitterDefClass *pdefinition		= new ParticleEmitterDefClass (*m_pEmitterList);
 		ParticleEmitterPrototypeClass *pprototype	= new ParticleEmitterPrototypeClass (pdefinition);
-		
+
 		//
 		// Update the asset manager with the new prototype
 		//
@@ -207,7 +207,7 @@ EmitterPropertySheetClass::Add_Emitter_To_Viewer (void)
 			WW3DAssetManager::Get_Instance()->Remove_Prototype (m_LastSavedName);
 		}
 		WW3DAssetManager::Get_Instance()->Add_Prototype (pprototype);
-		
+
 		//
 		// Add this emitter to the data tree
 		//
@@ -229,7 +229,7 @@ EmitterPropertySheetClass::Add_Emitter_To_Viewer (void)
 		// Regenerate the emitter pointer list
 		//
 		m_pEmitterList->Free_List ();
-		pdoc->Build_Emitter_List (m_pEmitterList, m_pEmitterList->Get_Name ());		
+		pdoc->Build_Emitter_List (m_pEmitterList, m_pEmitterList->Get_Name ());
 	}
 
 	return ;
@@ -262,10 +262,10 @@ EmitterPropertySheetClass::Update_Emitter (void)
 	/*ParticleEmitterClass *pemitter = Create_Emitter ();
 	Add_Emitter_To_Viewer (pemitter);
 
-	//	
+	//
 	// Use this emitter as the edited emitter from here on out
 	//
-	MEMBER_RELEASE (m_pEmitter);
+	REF_PTR_RELEASE (m_pEmitter);
 	m_pEmitter = pemitter;*/
 
 	// Pass the emitter along to the pages
@@ -287,7 +287,7 @@ void
 EmitterPropertySheetClass::Initialize (void)
 {
 	if (m_pEmitterList == NULL) {
-		Create_New_Emitter ();		
+		Create_New_Emitter ();
 	} else {
 		m_LastSavedName = m_pEmitterList->Get_Name ();
 	}
@@ -321,7 +321,7 @@ EmitterPropertySheetClass::Initialize (void)
 	AddPage (&m_PhysicsPage);
 	AddPage (&m_ColorPage);
 	AddPage (&m_SizePage);
-	AddPage (&m_UserPage);	
+	AddPage (&m_UserPage);
 	AddPage (&m_LinePage);
 	AddPage (&m_RotationPage);
 	AddPage (&m_FramePage);
@@ -346,7 +346,7 @@ EmitterPropertySheetClass::Create_Emitter (void)
 	float rate				= m_ParticlePage.Get_Rate ();
 	int burst				= m_ParticlePage.Get_Burst_Size ();
 	float max_particles	= m_ParticlePage.Get_Max_Particles ();
-	
+
 	//
 	//	Read the physics settings
 	//
@@ -372,7 +372,7 @@ EmitterPropertySheetClass::Create_Emitter (void)
 	m_ColorPage.Get_Color_Keyframes (colors);
 	m_ColorPage.Get_Opacity_Keyframes (opacity);
 	m_SizePage.Get_Size_Keyframes (size);
-	
+
 	//
 	//	Read the randomizers
 	//
@@ -406,7 +406,7 @@ EmitterPropertySheetClass::Create_Emitter (void)
 																					shader,
 																					max_particles);
 
-	
+
 	//
 	//	Pass the name onto the emitter
 	//
@@ -501,7 +501,7 @@ EmitterPropertySheetClass::Create_New_Emitter (void)
 	//	Display the new emitter
 	//
 	::GetCurrentDocument ()->Display_Emitter (emitter);
-	MEMBER_RELEASE (emitter);
+	REF_PTR_RELEASE (emitter);
 
 	/*SAFE_DELETE_ARRAY (color.Values);
 	SAFE_DELETE_ARRAY (color.KeyTimes);
diff --git a/Core/Tools/W3DView/EmitterPropertySheet.h b/Core/Tools/W3DView/EmitterPropertySheet.h
index 3296eb28c17..f0861029c8d 100644
--- a/Core/Tools/W3DView/EmitterPropertySheet.h
+++ b/Core/Tools/W3DView/EmitterPropertySheet.h
@@ -16,25 +16,21 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EMITTERPROPERTYSHEET_H__83A8B844_BA3B_11D2_9FFA_00104B791122__INCLUDED_)
-#define AFX_EMITTERPROPERTYSHEET_H__83A8B844_BA3B_11D2_9FFA_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EmitterPropertySheet.h : header file
 //
 
-#include "EmitterColorPropPage.H"
-#include "EmitterGeneralPropPage.H"
-#include "EmitterParticlePropPage.H"
-#include "EmitterPhysicsPropPage.H"
-#include "EmitterSizePropPage.H"
-#include "EmitterUserPropPage.H"
-#include "EmitterLinePropPage.H"
-#include "EmitterRotationPropPage.H"
-#include "EmitterFramePropPage.H"
-#include "EmitterLineGroupPropPage.H"
+#include "EmitterColorPropPage.h"
+#include "EmitterGeneralPropPage.h"
+#include "EmitterParticlePropPage.h"
+#include "EmitterPhysicsPropPage.h"
+#include "EmitterSizePropPage.h"
+#include "EmitterUserPropPage.h"
+#include "EmitterLinePropPage.h"
+#include "EmitterRotationPropPage.h"
+#include "EmitterFramePropPage.h"
+#include "EmitterLineGroupPropPage.h"
 
 // Forward declarations
 class ParticleEmitterClass;
@@ -88,7 +84,7 @@ class EmitterPropertySheetClass : public CPropertySheet
 		void							Notify_Render_Mode_Changed(int new_mode);
 
 	protected:
-		
+
 		//////////////////////////////////////////////////////////////////////
 		//
 		//	Protected methods
@@ -124,5 +120,3 @@ class EmitterPropertySheetClass : public CPropertySheet
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EMITTERPROPERTYSHEET_H__83A8B844_BA3B_11D2_9FFA_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/EmitterRotationPropPage.cpp b/Core/Tools/W3DView/EmitterRotationPropPage.cpp
index 994870c85e0..d3164102f8b 100644
--- a/Core/Tools/W3DView/EmitterRotationPropPage.cpp
+++ b/Core/Tools/W3DView/EmitterRotationPropPage.cpp
@@ -19,12 +19,12 @@
 // EmitterRotationPropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "EmitterRotationPropPage.h"
-#include "Utils.H"
-#include "ParticleRotationKeyDialog.H"
-#include "EmitterInstanceList.H"
+#include "Utils.h"
+#include "ParticleRotationKeyDialog.h"
+#include "EmitterInstanceList.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -43,7 +43,7 @@ IMPLEMENT_DYNCREATE(EmitterRotationPropPageClass, CPropertyPage)
 //  EmitterRotationPropPageClass - constructor
 //
 /////////////////////////////////////////////////////////////
-EmitterRotationPropPageClass::EmitterRotationPropPageClass() : 
+EmitterRotationPropPageClass::EmitterRotationPropPageClass() :
 	CPropertyPage(EmitterRotationPropPageClass::IDD),
 	m_pEmitterList(NULL),
 	m_bValid(true),
@@ -55,7 +55,7 @@ EmitterRotationPropPageClass::EmitterRotationPropPageClass() :
 
 {
 	::memset (&m_Rotations, 0, sizeof (m_Rotations));
-	
+
 	//{{AFX_DATA_INIT(EmitterRotationPropPageClass)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
@@ -108,7 +108,7 @@ END_MESSAGE_MAP()
 void EmitterRotationPropPageClass::Initialize (void)
 {
 	SAFE_DELETE_ARRAY (m_Rotations.KeyTimes);
-	SAFE_DELETE_ARRAY (m_Rotations.Values);	
+	SAFE_DELETE_ARRAY (m_Rotations.Values);
 
 	if (m_pEmitterList != NULL) {
 		m_Lifetime = m_pEmitterList->Get_Lifetime ();
@@ -137,11 +137,11 @@ void EmitterRotationPropPageClass::Initialize (void)
 //  OnInitDialog
 //
 /////////////////////////////////////////////////////////////
-BOOL 
-EmitterRotationPropPageClass::OnInitDialog() 
+BOOL
+EmitterRotationPropPageClass::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
-	
+
 	//
 	// Create the keyframe control
 	//
@@ -172,7 +172,7 @@ EmitterRotationPropPageClass::OnInitDialog()
 										0);
 		m_RotationBar->Set_Graph_Percent (index + 1, Normalize_Rotation(m_Rotations.Values[index]));
 	}
-	
+
 	return TRUE;
 }
 
@@ -182,7 +182,7 @@ EmitterRotationPropPageClass::OnInitDialog()
 //  OnNotify
 //
 /////////////////////////////////////////////////////////////
-BOOL EmitterRotationPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL EmitterRotationPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	CBR_NMHDR *color_bar_hdr = (CBR_NMHDR *)lParam;
 
@@ -191,7 +191,7 @@ BOOL EmitterRotationPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESUL
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 	}
 
@@ -202,8 +202,8 @@ BOOL EmitterRotationPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESUL
 	{
 		case IDC_ROTATION_BAR:
 		{
-			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {			
-				
+			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
+
 				//
 				//	Allow the user to edit the keyframe
 				//
@@ -216,7 +216,7 @@ BOOL EmitterRotationPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESUL
 
 					m_RotationBar->Set_Redraw (false);
 					m_RotationBar->Set_Graph_Percent (color_bar_hdr->key_index, norm_val);
-					
+
 					//
 					//	Determine if the user changed the 'max' or 'min' rotation
 					//
@@ -238,10 +238,10 @@ BOOL EmitterRotationPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESUL
 					//	Renormalize the RotationBar key frame points if necessary
 					//
 					if ((new_max != m_MaxRotation) || (new_min != m_MinRotation)) {
-						
+
 						int count = m_RotationBar->Get_Point_Count ();
 						for (int index = 0; index < count; index ++) {
-							
+
 							float rotation = Denormalize_Rotation(m_RotationBar->Get_Graph_Percent (index));
 							float new_norm = Normalize_Rotation(rotation,new_min,new_max);
 
@@ -256,20 +256,20 @@ BOOL EmitterRotationPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESUL
 
 					//
 					// Update the emitter
-					//					
+					//
 					Update_Rotations ();
 					m_pEmitterList->Set_Rotation_Keyframes (m_Rotations, m_InitialOrientationRandom);
 					SetModified ();
 				}
 			} else if ((color_bar_hdr->hdr.code == CBRN_MOVING_POINT) ||
-						  (color_bar_hdr->hdr.code == CBRN_DELETED_POINT)) {			
-				
+						  (color_bar_hdr->hdr.code == CBRN_DELETED_POINT)) {
+
 				//
 				// Update the emitter
 				//
 				Update_Rotations ();
 				m_pEmitterList->Set_Rotation_Keyframes (m_Rotations, m_InitialOrientationRandom);
-				SetModified ();					
+				SetModified ();
 			}
 		}
 		break;
@@ -293,7 +293,7 @@ BOOL EmitterRotationPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESUL
 		break;
 
 	}
-			
+
 	return CPropertyPage::OnNotify (wParam, lParam, pResult);
 }
 
@@ -332,9 +332,9 @@ EmitterRotationPropPageClass::Update_Rotations (void)
 
 		//
 		//	Get all the rotation key frames and add them to our structure
-		//	
+		//
 		for (int index = 1; index < count; index ++) {
-			m_RotationBar->Get_Point (index, &position, &red, &green, &blue);			
+			m_RotationBar->Get_Point (index, &position, &red, &green, &blue);
 			m_Rotations.KeyTimes[index - 1] = position * m_Lifetime;
 			m_Rotations.Values[index - 1] = Denormalize_Rotation(m_RotationBar->Get_Graph_Percent (index) );
 		}
@@ -348,8 +348,8 @@ EmitterRotationPropPageClass::Update_Rotations (void)
 //  OnCommand
 //
 /////////////////////////////////////////////////////////////
-BOOL 
-EmitterRotationPropPageClass::OnCommand(WPARAM wParam, LPARAM lParam) 
+BOOL
+EmitterRotationPropPageClass::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 	switch (LOWORD (wParam))
 	{
@@ -386,7 +386,7 @@ EmitterRotationPropPageClass::OnCommand(WPARAM wParam, LPARAM lParam)
 		break;
 
 	}
-	
+
 	return CPropertyPage::OnCommand(wParam, lParam);
 }
 
diff --git a/Core/Tools/W3DView/EmitterRotationPropPage.h b/Core/Tools/W3DView/EmitterRotationPropPage.h
index 3c3d53fdfc7..aba163b3c08 100644
--- a/Core/Tools/W3DView/EmitterRotationPropPage.h
+++ b/Core/Tools/W3DView/EmitterRotationPropPage.h
@@ -16,17 +16,13 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EMITTERROTATIONPROPPAGE_H__35F8A2F6_C91C_4750_BF06_100433C1ECBB__INCLUDED_)
-#define AFX_EMITTERROTATIONPROPPAGE_H__35F8A2F6_C91C_4750_BF06_100433C1ECBB__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EmitterRotationPropPage.h : header file
 //
 
-#include "ColorBar.H"
-#include "Part_Emt.H"
+#include "ColorBar.h"
+#include "part_emt.h"
 
 // Forward delcarations
 class EmitterInstanceListClass;
@@ -92,7 +88,7 @@ class EmitterRotationPropPageClass : public CPropertyPage
 	/////////////////////////////////////////////////////////
 	//
 	//	Protected methods
-	//		
+	//
 	void								Initialize (void);
 	void								Update_Rotations (void);
 
@@ -105,11 +101,11 @@ class EmitterRotationPropPageClass : public CPropertyPage
 	/////////////////////////////////////////////////////////
 	//
 	//	Private member data
-	//		
+	//
 	EmitterInstanceListClass *			m_pEmitterList;
 	bool										m_bValid;
 	ColorBarClass *						m_RotationBar;
-	
+
 	ParticlePropertyStruct<float>		m_Rotations;
 
 	float										m_Lifetime;
@@ -139,5 +135,3 @@ inline float EmitterRotationPropPageClass::Denormalize_Rotation(float normalized
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EMITTERROTATIONPROPPAGE_H__35F8A2F6_C91C_4750_BF06_100433C1ECBB__INCLUDED_)
diff --git a/Core/Tools/W3DView/EmitterSizePropPage.cpp b/Core/Tools/W3DView/EmitterSizePropPage.cpp
index 19eeb241157..11a6e7cce70 100644
--- a/Core/Tools/W3DView/EmitterSizePropPage.cpp
+++ b/Core/Tools/W3DView/EmitterSizePropPage.cpp
@@ -19,12 +19,12 @@
 // EmitterSizePropPage.cpp : implementation file
 //
 
-#include "Stdafx.H"
-#include "W3dview.H"
-#include "EmitterSizePropPage.H"
-#include "Utils.H"
-#include "ParticleSizeDialog.H"
-#include "EmitterInstanceList.H"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "EmitterSizePropPage.h"
+#include "Utils.h"
+#include "ParticleSizeDialog.h"
+#include "EmitterInstanceList.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -72,7 +72,7 @@ EmitterSizePropPageClass::~EmitterSizePropPageClass (void)
 	// Free the original setting arrays
 	SAFE_DELETE_ARRAY (m_OrigSizes.KeyTimes);
 	SAFE_DELETE_ARRAY (m_OrigSizes.Values);
-	
+
 	// Free the current setting arrays
 	SAFE_DELETE_ARRAY (m_CurrentSizes.KeyTimes);
 	SAFE_DELETE_ARRAY (m_CurrentSizes.Values);
@@ -110,7 +110,7 @@ void
 EmitterSizePropPageClass::Initialize (void)
 {
 	SAFE_DELETE_ARRAY (m_OrigSizes.KeyTimes);
-	SAFE_DELETE_ARRAY (m_OrigSizes.Values);	
+	SAFE_DELETE_ARRAY (m_OrigSizes.Values);
 	SAFE_DELETE_ARRAY (m_CurrentSizes.KeyTimes);
 	SAFE_DELETE_ARRAY (m_CurrentSizes.Values);
 
@@ -140,11 +140,11 @@ EmitterSizePropPageClass::Initialize (void)
 //
 /////////////////////////////////////////////////////////////
 BOOL
-EmitterSizePropPageClass::OnInitDialog (void) 
+EmitterSizePropPageClass::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CPropertyPage::OnInitDialog ();
-	
+
 	m_SizeBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_SIZE_BAR));
 	m_SizeBar->Set_Range (0, 1);
 
@@ -218,7 +218,7 @@ EmitterSizePropPageClass::OnNotify
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 	}
 
@@ -229,8 +229,8 @@ EmitterSizePropPageClass::OnNotify
 	{
 		case IDC_SIZE_BAR:
 		{
-			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {			
-				
+			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
+
 				//
 				//	Allow the user to edit the keyframe
 				//
@@ -241,7 +241,7 @@ EmitterSizePropPageClass::OnNotify
 
 					m_SizeBar->Set_Redraw (false);
 					m_SizeBar->Set_Graph_Percent (color_bar_hdr->key_index, size / m_MaxSize);
-					
+
 					//
 					//	Determine if the user changed the 'max' size
 					//
@@ -271,20 +271,20 @@ EmitterSizePropPageClass::OnNotify
 
 					//
 					// Update the emitter
-					//					
+					//
 					Update_Sizes ();
 					m_pEmitterList->Set_Size_Keyframes (m_CurrentSizes);
 					SetModified ();
 				}
 			} else if ((color_bar_hdr->hdr.code == CBRN_MOVING_POINT) ||
-						  (color_bar_hdr->hdr.code == CBRN_DELETED_POINT)) {			
-				
+						  (color_bar_hdr->hdr.code == CBRN_DELETED_POINT)) {
+
 				//
 				// Update the emitter
 				//
 				Update_Sizes ();
 				m_pEmitterList->Set_Size_Keyframes (m_CurrentSizes);
-				SetModified ();					
+				SetModified ();
 			}
 		}
 		break;
@@ -298,7 +298,7 @@ EmitterSizePropPageClass::OnNotify
 		}
 		break;
 	}
-			
+
 	return CPropertyPage::OnNotify (wParam, lParam, pResult);
 }
 
@@ -338,9 +338,9 @@ EmitterSizePropPageClass::Update_Sizes (void)
 
 		//
 		//	Get all the size key frames and add them to our structure
-		//	
+		//
 		for (int index = 1; index < count; index ++) {
-			m_SizeBar->Get_Point (index, &position, &red, &green, &blue);			
+			m_SizeBar->Get_Point (index, &position, &red, &green, &blue);
 			m_CurrentSizes.KeyTimes[index - 1] = position * m_Lifetime;
 			m_CurrentSizes.Values[index - 1] = m_SizeBar->Get_Graph_Percent (index) * m_MaxSize;
 		}
diff --git a/Core/Tools/W3DView/EmitterSizePropPage.h b/Core/Tools/W3DView/EmitterSizePropPage.h
index f8488667b21..14e4ca369b9 100644
--- a/Core/Tools/W3DView/EmitterSizePropPage.h
+++ b/Core/Tools/W3DView/EmitterSizePropPage.h
@@ -16,17 +16,13 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EMITTERSIZEPROPPAGE_H__0CD2CBA3_1219_11D3_A034_00104B791122__INCLUDED_)
-#define AFX_EMITTERSIZEPROPPAGE_H__0CD2CBA3_1219_11D3_A034_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EmitterSizePropPage.h : header file
 //
 
-#include "ColorBar.H"
-#include "Part_Emt.H"
+#include "ColorBar.h"
+#include "part_emt.h"
 
 // Forward delcarations
 class EmitterInstanceListClass;
@@ -94,7 +90,7 @@ class EmitterSizePropPageClass : public CPropertyPage
 		/////////////////////////////////////////////////////////
 		//
 		//	Protected methods
-		//		
+		//
 		void				Initialize (void);
 		void				Update_Sizes (void);
 
@@ -103,7 +99,7 @@ class EmitterSizePropPageClass : public CPropertyPage
 		/////////////////////////////////////////////////////////
 		//
 		//	Private member data
-		//		
+		//
 		EmitterInstanceListClass *	m_pEmitterList;
 		bool								m_bValid;
 		ColorBarClass *				m_SizeBar;
@@ -115,5 +111,3 @@ class EmitterSizePropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EMITTERSIZEPROPPAGE_H__0CD2CBA3_1219_11D3_A034_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/EmitterUserPropPage.cpp b/Core/Tools/W3DView/EmitterUserPropPage.cpp
index a6f0a7cac4a..92a6a7ad176 100644
--- a/Core/Tools/W3DView/EmitterUserPropPage.cpp
+++ b/Core/Tools/W3DView/EmitterUserPropPage.cpp
@@ -19,12 +19,12 @@
 // EmitterUserPropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "EmitterUserPropPage.h"
-#include "W3D_File.H"
-#include "Part_Emt.H"
-#include "EmitterInstanceList.H"
+#include "w3d_file.h"
+#include "part_emt.h"
+#include "EmitterInstanceList.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -97,7 +97,7 @@ void
 EmitterUserPropPageClass::Initialize (void)
 {
 	if (m_pEmitterList != NULL) {
-		
+
 		// Record the user information from the emitter (if it exists)
 		m_iType			= m_pEmitterList->Get_User_Type ();
 		m_UserString	= m_pEmitterList->Get_User_String ();
@@ -112,7 +112,7 @@ EmitterUserPropPageClass::Initialize (void)
 //  OnInitDialog
 //
 BOOL
-EmitterUserPropPageClass::OnInitDialog (void) 
+EmitterUserPropPageClass::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CPropertyPage::OnInitDialog ();
@@ -124,7 +124,7 @@ EmitterUserPropPageClass::OnInitDialog (void)
 
 	// Select the correct entry in the combobox
 	m_TypeCombo.SetCurSel (m_iType);
-		
+
 	// Fill in the user-box
 	SetDlgItemText (IDC_PROGRAMMER_SETTINGS_EDIT, m_UserString);
 	return TRUE;
diff --git a/Core/Tools/W3DView/EmitterUserPropPage.h b/Core/Tools/W3DView/EmitterUserPropPage.h
index a1f8c57b975..514c98ab920 100644
--- a/Core/Tools/W3DView/EmitterUserPropPage.h
+++ b/Core/Tools/W3DView/EmitterUserPropPage.h
@@ -16,16 +16,12 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EMITTERUSERPROPPAGE_H__83A8B840_BA3B_11D2_9FFA_00104B791122__INCLUDED_)
-#define AFX_EMITTERUSERPROPPAGE_H__83A8B840_BA3B_11D2_9FFA_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EmitterUserPropPage.h : header file
 //
 
-#include "Resource.H"
+#include "resource.h"
 
 // Forward delcarations
 class EmitterInstanceListClass;
@@ -81,7 +77,7 @@ class EmitterUserPropPageClass : public CPropertyPage
 		EmitterInstanceListClass *	Get_Emitter (void) const { return m_pEmitterList; }
 		void								Set_Emitter (EmitterInstanceListClass *pemitter_list) { m_pEmitterList = pemitter_list; Initialize (); }
 		bool								Is_Data_Valid (void) const { return m_bValid; }
-		
+
 		int								Get_Type (void) const			{ return m_iType; }
 		const CString &				Get_String (void) const			{ return m_UserString; }
 		void								Set_Type (int type)				{ m_iType = type; }
@@ -93,7 +89,7 @@ class EmitterUserPropPageClass : public CPropertyPage
 		/////////////////////////////////////////////////////////
 		//
 		//	Protected methods
-		//		
+		//
 		void								Initialize (void);
 
 	private:
@@ -101,7 +97,7 @@ class EmitterUserPropPageClass : public CPropertyPage
 		/////////////////////////////////////////////////////////
 		//
 		//	Private member data
-		//		
+		//
 		EmitterInstanceListClass *	m_pEmitterList;
 		bool								m_bValid;
 
@@ -111,5 +107,3 @@ class EmitterUserPropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EMITTERUSERPROPPAGE_H__83A8B840_BA3B_11D2_9FFA_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/GammaDialog.cpp b/Core/Tools/W3DView/GammaDialog.cpp
index 622a4affa45..13f1e3a4cff 100644
--- a/Core/Tools/W3DView/GammaDialog.cpp
+++ b/Core/Tools/W3DView/GammaDialog.cpp
@@ -19,8 +19,8 @@
 // GammaDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "GammaDialog.h"
 #include "dx8wrapper.h"
 
@@ -62,15 +62,15 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // GammaDialogClass message handlers
 
-BOOL GammaDialogClass::OnInitDialog() 
+BOOL GammaDialogClass::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
-	// TODO: Add extra initialization here	
+
+	// TODO: Add extra initialization here
 	m_gamma=AfxGetApp()->GetProfileInt("Config","Gamma",10);
 	if (m_gamma<10) m_gamma=10;
 	if (m_gamma>30) m_gamma=30;
-	m_gammaslider.SetRange(10,30);	
+	m_gammaslider.SetRange(10,30);
 	m_gammaslider.SetPos(m_gamma);
 	CString string;
 	string.Format("%3.2f",m_gamma/10.0f);
@@ -82,31 +82,31 @@ BOOL GammaDialogClass::OnInitDialog()
 	string+="D. Set the Gamma using the Slider below so the gray box on the left matches it's checkered surroundings\n";
 	string+="E. Press OK to save settings";
 	SetDlgItemText(IDC_INSTRUCTIONS,string);
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void GammaDialogClass::OnOK() 
+void GammaDialogClass::OnOK()
 {
 	// TODO: Add extra validation here
 	m_gamma=m_gammaslider.GetPos();
 	if (m_gamma<10) m_gamma=10;
-	if (m_gamma>30) m_gamma=30;	
+	if (m_gamma>30) m_gamma=30;
 	::AfxGetApp()->WriteProfileInt("Config","Gamma",m_gamma);
 	DX8Wrapper::Set_Gamma(m_gamma/10.0f,0.0f,1.0f);
-	
+
 	CDialog::OnOK();
 }
 
-void GammaDialogClass::OnReleasedcaptureGammaSlider(NMHDR* pNMHDR, LRESULT* pResult) 
+void GammaDialogClass::OnReleasedcaptureGammaSlider(NMHDR* pNMHDR, LRESULT* pResult)
 {
-	// TODO: Add your control notification handler code here	
+	// TODO: Add your control notification handler code here
 	m_gamma=m_gammaslider.GetPos();
 	DX8Wrapper::Set_Gamma(m_gamma/10.0f,0.0f,1.0f);
 	CString string;
 	string.Format("%3.2f",m_gamma/10.0f);
 	SetDlgItemText(IDC_GAMMA_DISPLAY,string);
-	
+
 	*pResult = 0;
 }
diff --git a/Core/Tools/W3DView/GammaDialog.h b/Core/Tools/W3DView/GammaDialog.h
index 9e378c5bf3d..43adf086f45 100644
--- a/Core/Tools/W3DView/GammaDialog.h
+++ b/Core/Tools/W3DView/GammaDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_GAMMADIALOG_H__DA25161A_E783_44DE_8398_B311C20C3BE9__INCLUDED_)
-#define AFX_GAMMADIALOG_H__DA25161A_E783_44DE_8398_B311C20C3BE9__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // GammaDialog.h : header file
 //
 
@@ -63,5 +59,3 @@ class GammaDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_GAMMADIALOG_H__DA25161A_E783_44DE_8398_B311C20C3BE9__INCLUDED_)
diff --git a/Core/Tools/W3DView/Globals.cpp b/Core/Tools/W3DView/Globals.cpp
index eb01cb97ecd..45dfd6d7a38 100644
--- a/Core/Tools/W3DView/Globals.cpp
+++ b/Core/Tools/W3DView/Globals.cpp
@@ -18,17 +18,17 @@
 
 /////////////////////////////////////////////////////////////////////
 //
-//	Globals.CPP
+//	Globals.cpp
 //
 //	Module containing global variable initialization.
 //
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 
-#include "globals.h"
+#include "Globals.h"
 #include "assetmgr.h"
-#include "viewerassetmgr.h"
+#include "ViewerAssetMgr.h"
 
 // Main asset manager for the application.
 ViewerAssetMgrClass *_TheAssetMgr = NULL;
diff --git a/Core/Tools/W3DView/Globals.h b/Core/Tools/W3DView/Globals.h
index 15205954b1e..b0da69bfdf6 100644
--- a/Core/Tools/W3DView/Globals.h
+++ b/Core/Tools/W3DView/Globals.h
@@ -18,16 +18,14 @@
 
 /////////////////////////////////////////////////////////////////////
 //
-//	Globals.H
+//	Globals.h
 //
 //	Module containing global variable definitions.
 //
 //
 /////////////////////////////////////////////////////////////////////
 
-#ifndef __GLOBALS_H
-#define __GLOBALS_H
-
+#pragma once
 
 //////////////////////////////////////////////////////
 //  Externs
@@ -45,6 +43,3 @@ extern int g_iHeight;
 //////////////////////////////////////////////////////
 const int DEFAULT_DEVICEINDEX       = 1;
 const int DEFAULT_BITSPERPIX        = 16;
-
-
-#endif //__GLOBALS_H
diff --git a/Core/Tools/W3DView/GraphicView.cpp b/Core/Tools/W3DView/GraphicView.cpp
index c2c9c7284a6..e32acee1289 100644
--- a/Core/Tools/W3DView/GraphicView.cpp
+++ b/Core/Tools/W3DView/GraphicView.cpp
@@ -19,31 +19,31 @@
 // GraphicView.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-#include "graphicview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "GraphicView.h"
 #include "ww3d.h"
-#include "globals.h"
-#include "w3dviewdoc.h"
+#include "Globals.h"
+#include "W3DViewDoc.h"
 #include <process.h>
 #include "quat.h"
-#include "mainfrm.h"
-#include "utils.h"
+#include "MainFrm.h"
+#include "Utils.h"
 #include "mmsystem.h"
 #include "light.h"
-#include "viewerassetmgr.h"
+#include "ViewerAssetMgr.h"
 #include "rcfile.h"
 #include "part_emt.h"
 #include "part_buf.h"
 #include "hlod.h"
-#include "viewerscene.h"
-#include "screencursor.h"
+#include "ViewerScene.h"
+#include "ScreenCursor.h"
 #include "mesh.h"
 #include "coltest.h"
-#include "mpu.h"
+#include "MPU.h"
 #include "dazzle.h"
-#include "soundscene.h"
-#include "wwaudio.h"
+#include "SoundScene.h"
+#include "WWAudio.h"
 #include "metalmap.h"
 #include "dx8wrapper.h"
 #include "matrix3.h"
@@ -70,7 +70,7 @@ IMPLEMENT_DYNCREATE(CGraphicView, CView)
 //
 ////////////////////////////////////////////////////////////////////////////
 CGraphicView::CGraphicView (void)
-    : m_bInitialized (FALSE),		
+    : m_bInitialized (FALSE),
       m_pCamera (NULL),
       m_TimerID (0),
       m_bMouseDown (FALSE),
@@ -89,10 +89,10 @@ CGraphicView::CGraphicView (void)
 		m_UpdateCounter (0),
       m_allowedCameraRotation (FreeRotation),
 		m_ObjectCenter (0.0f, 0.0f, 0.0f)
-{    
+{
     // Get the windowed mode from the registry
     CString string_windowed = theApp.GetProfileString ("Config", "Windowed", "1");
-	 m_iWindowed = ::atoi ((LPCTSTR)string_windowed);	 
+	 m_iWindowed = ::atoi ((LPCTSTR)string_windowed);
     return ;
 }
 
@@ -164,13 +164,13 @@ void CGraphicView::Dump(CDumpContext& dc) const
 //
 ////////////////////////////////////////////////////////////////////////////
 int
-CGraphicView::OnCreate (LPCREATESTRUCT lpCreateStruct) 
+CGraphicView::OnCreate (LPCREATESTRUCT lpCreateStruct)
 {
 	// Allow the base class to process this message
     if (CView::OnCreate(lpCreateStruct) == -1)
 		return -1;
 
-    m_dwLastFrameUpdate = timeGetTime ();//::GetTickCount ();	
+    m_dwLastFrameUpdate = timeGetTime ();//::GetTickCount ();
 	return 0;
 }
 
@@ -217,12 +217,12 @@ CGraphicView::InitializeGraphicView (void)
     {
         // Instantiate a new camera class
 	    m_pCamera = new CameraClass ();
-        bReturn = (m_pCamera != NULL); 
-        
+        bReturn = (m_pCamera != NULL);
+
         // Were we successful in creating a camera?
         ASSERT (m_pCamera);
         if (m_pCamera)
-        {	    
+        {
             // Create a transformation matrix
             Matrix3D transform (1);
 	        transform.Translate (Vector3 (0.0F, 0.0F, 35.0F));
@@ -295,7 +295,7 @@ CGraphicView::OnSize
 			cy = g_iHeight;
 		}
 
-		// Change the resolution of the rendering device to 
+		// Change the resolution of the rendering device to
 		// match that of the view's current dimensions
 		if (m_iWindowed == 1) {
 			WW3D::Set_Device_Resolution (cx, cy, g_iBitsPerPixel, m_iWindowed);
@@ -329,15 +329,15 @@ CGraphicView::OnDestroy (void)
 	//
 	// Free the camera object
 	//
-	MEMBER_RELEASE (m_pCamera);
-	MEMBER_RELEASE (m_pLightMesh);
+	REF_PTR_RELEASE (m_pCamera);
+	REF_PTR_RELEASE (m_pLightMesh);
 
 	// Is there an update thread running?
 	if (m_TimerID == 0) {
 
 		// Stop the timer
 		::timeKillEvent ((UINT)m_TimerID);
-		m_TimerID = 0;        
+		m_TimerID = 0;
 	}
 
 	// Cache this information in the registry
@@ -346,7 +346,7 @@ CGraphicView::OnDestroy (void)
 	theApp.WriteProfileString ("Config", "Windowed", temp_string);
 
 	// We are no longer initialized
-	m_bInitialized = FALSE;    
+	m_bInitialized = FALSE;
 	return ;
 }
 
@@ -357,7 +357,7 @@ CGraphicView::OnDestroy (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CGraphicView::OnInitialUpdate (void) 
+CGraphicView::OnInitialUpdate (void)
 {
 	// Allow the base class to process this message
     CView::OnInitialUpdate ();
@@ -380,7 +380,7 @@ CGraphicView::OnInitialUpdate (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-Set_Lowest_LOD (RenderObjClass *render_obj) 
+Set_Lowest_LOD (RenderObjClass *render_obj)
 {
 	if (render_obj != NULL) {
 		for (int index = 0; index < render_obj->Get_Num_Sub_Objects (); index ++) {
@@ -388,7 +388,7 @@ Set_Lowest_LOD (RenderObjClass *render_obj)
 			if (psub_obj != NULL) {
 				Set_Lowest_LOD (psub_obj);
 			}
-			MEMBER_RELEASE (psub_obj);
+			REF_PTR_RELEASE (psub_obj);
 		}
 
 		//
@@ -436,7 +436,8 @@ CGraphicView::RepaintView
 	//	Simple check to avoid re-entrance
 	//
 	static bool _already_painting = false;
-	if (_already_painting) return;
+	if (_already_painting)
+		return;
 	_already_painting = true;
 
 	 //
@@ -452,10 +453,15 @@ CGraphicView::RepaintView
 		m_dwLastFrameUpdate = cur_ticks;
 
 		// Update the W3D frame times according to our elapsed tick count
-		if (ticks_to_use == 0) {
-			WW3D::Sync (WW3D::Get_Sync_Time() + (ticks_elapsed * m_animationSpeed));
-		} else {
-			WW3D::Sync (WW3D::Get_Sync_Time() + ticks_to_use);
+		if (ticks_to_use == 0)
+		{
+			WW3D::Update_Logic_Frame_Time(ticks_elapsed * m_animationSpeed);
+			WW3D::Sync(WW3D::Get_Fractional_Sync_Milliseconds() >= WWSyncMilliseconds);
+		}
+		else
+		{
+			WW3D::Update_Logic_Frame_Time(ticks_to_use);
+			WW3D::Sync(true);
 		}
 
 		// Do we need to update the current animation?
@@ -496,7 +502,7 @@ CGraphicView::RepaintView
 		{
 			LightClass *pscene_light = doc->GetSceneLight();
 			Vector3 ambient,diffuse,l,v;
-			ambient=doc->GetScene()->Get_Ambient_Light();		
+			ambient=doc->GetScene()->Get_Ambient_Light();
 			pscene_light->Get_Diffuse(&diffuse);
 			l=pscene_light->Get_Position();
 			l.Normalize();
@@ -505,17 +511,17 @@ CGraphicView::RepaintView
 			metal->Update_Lighting(ambient,diffuse,l,v);
 			metal->Update_Textures();
 		}
-		
+
 		//
 		//	Render the background BMP
-		//		
+		//
 		WW3D::Begin_Render (TRUE, TRUE, doc->GetBackgroundColor ());
 		WW3D::Render (doc->Get2DScene (), doc->Get2DCamera (), FALSE, FALSE);
 
 		//
 		// Render the background scene
 		//
-		if (doc->GetBackgroundObjectName ().GetLength () > 0) {			
+		if (doc->GetBackgroundObjectName ().GetLength () > 0) {
 			WW3D::Render (doc->GetBackObjectScene (), doc->GetBackObjectCamera (), FALSE, FALSE);
 		}
 
@@ -528,7 +534,7 @@ CGraphicView::RepaintView
 		DWORD profile_time = ::Get_CPU_Clock (pt_high);
 
 		WW3D::Render (doc->GetScene (), m_pCamera, FALSE, FALSE);
-		
+
 		// Wait for all rendering to complete before stopping benchmark.
 		DWORD milliseconds = (::Get_CPU_Clock (pt_high) - profile_time) / 1000;
 
@@ -546,7 +552,7 @@ CGraphicView::RepaintView
 		//
 		//	Let the audio class think
 		//
-		WWAudioClass::Get_Instance ()->On_Frame_Update (WW3D::Get_Frame_Time());
+		WWAudioClass::Get_Instance ()->On_Frame_Update (WW3D::Get_Logic_Frame_Time_Milliseconds());
 
 		//
 		//	Update the count of particles and polys in the status bar
@@ -554,7 +560,7 @@ CGraphicView::RepaintView
 		if ((cur_ticks - m_ParticleCountUpdate > 250)) {
 			m_ParticleCountUpdate = cur_ticks;
 			doc->Update_Particle_Count ();
-			
+
 			int polys = (prender_obj != NULL) ? prender_obj->Get_Num_Polys () : 0;
 			((CMainFrame *)::AfxGetMainWnd ())->UpdatePolygonCount (polys);
 		}
@@ -563,7 +569,7 @@ CGraphicView::RepaintView
 		//	Update the frame time in the status bar
 		//
 		((CMainFrame *)::AfxGetMainWnd ())->Update_Frame_Time (milliseconds);
-	}        
+	}
 
 	_already_painting = false;
 	return ;
@@ -599,7 +605,7 @@ CGraphicView::UpdateDisplay (void)
         WW3D::Begin_Render (TRUE, TRUE, Vector3 (0.2,0.4,0.6));
 		WW3D::Render (doc->GetScene (), m_pCamera, FALSE, FALSE);
 		WW3D::End_Render ();
-    } */       
+    } */
 
     return ;
 }
@@ -620,7 +626,7 @@ CGraphicView::WindowProc
 {
 	// Is this the repaint message we are expecting?
 	if (message == WM_USER+101) {
-		
+
 		//
 		//	Force the repaint...
 		//
@@ -628,7 +634,7 @@ CGraphicView::WindowProc
 		RemoveProp (m_hWnd, "WaitingToProcess");
 
 	} else if (message == WM_PAINT) {
-		
+
 		// If we are in fullscreen mode, then erase the window background
 		if (m_iWindowed == 0) {
 
@@ -639,7 +645,7 @@ CGraphicView::WindowProc
 			// Get the window's DC
 			HDC hDC = ::GetDC (m_hWnd);
 			if (hDC) {
-				
+
 				// Erase the background
 				::FillRect (hDC, &rect, (HBRUSH)(COLOR_WINDOW + 1));
 				::ReleaseDC (m_hWnd, hDC);
@@ -655,7 +661,7 @@ CGraphicView::WindowProc
 		if ((wParam == VK_CONTROL) && (m_bLightMeshInScene == false)) {
 			CW3DViewDoc* doc = (CW3DViewDoc *)GetDocument();
 			m_pLightMesh->Add (doc->GetScene ());
-			m_bLightMeshInScene = true;			
+			m_bLightMeshInScene = true;
 		}
 
 	} else if (message == WM_KEYUP) {
@@ -663,7 +669,7 @@ CGraphicView::WindowProc
 		if ((wParam == VK_CONTROL) && (m_bLightMeshInScene == true)) {
 			CW3DViewDoc* doc = (CW3DViewDoc *)GetDocument();
 			m_pLightMesh->Remove ();
-			m_bLightMeshInScene = false;			
+			m_bLightMeshInScene = false;
 		}
 	}
 
@@ -756,7 +762,7 @@ CGraphicView::OnLButtonUp
     }
 
     // Mouse button is up
-    m_bMouseDown = FALSE;    
+    m_bMouseDown = FALSE;
 
     if (m_bRMouseDown == TRUE)
     {
@@ -789,7 +795,7 @@ CGraphicView::OnMouseMove
 (
     UINT nFlags,
     CPoint point
-) 
+)
 {
 	int iDeltaX = m_lastPoint.x-point.x;
 	int iDeltaY = m_lastPoint.y-point.y;
@@ -874,7 +880,7 @@ CGraphicView::OnMouseMove
 			Matrix3D::Inverse_Transform_Vector(matrix,sphereCenter,&to_center);
 
 			Matrix3D light_tm(light_orientation, sphereCenter);
-			light_tm.Translate(-to_center); 
+			light_tm.Translate(-to_center);
 
 			m_pLightMesh->Set_Transform(light_tm);
 			pSceneLight->Set_Transform(light_tm);
@@ -896,7 +902,7 @@ CGraphicView::OnMouseMove
 			GetClientRect (&rect);
 			float deltay = (float(iDeltaY))/(float(rect.bottom - rect.top));
 			float adjustment = deltay * (m_ViewedSphere.Radius * 3.0F);
-			
+
 			// Determine the light's new position based on this factor
 			Matrix3D transform = pscene_light->Get_Transform ();
 			transform.Translate (Vector3 (0, 0, adjustment));
@@ -1022,7 +1028,7 @@ CGraphicView::OnMouseMove
 				doc->GetBackObjectCamera ()->Set_Transform (transform);
 				doc->GetBackObjectCamera ()->Set_Position (Vector3 (0.00F, 0.00F, 0.00F));
 			}
-		}        
+		}
 
 		m_lastPoint = point;
 	}
@@ -1035,7 +1041,7 @@ CGraphicView::OnMouseMove
 
 		Vector3 distanceVectorZ = transform.Get_Z_Vector ();
 		if (iDeltaY != 0)
-		{        
+		{
 
 			// Get the bouding rectangle of the main view
 			CRect rect;
@@ -1078,7 +1084,7 @@ CGraphicView::OnMouseMove
 						// Ensure the status bar is updated with the correct poly count
 						pCMainWnd->UpdatePolygonCount (prender_obj->Get_Num_Polys ());
 					}
-					
+
 					// Ensure the status bar is updated with the correct camera distance
 					pCMainWnd->UpdateCameraDistance (m_CameraDistance);
 				}
@@ -1121,7 +1127,7 @@ CGraphicView::Reset_Camera_To_Display_Emitter (ParticleEmitterClass &emitter)
 	// Do we need to take into account acceleration?
 	Vector3 distance_maxima (0, 0, 0);
 	if ((acceleration.X != 0) || (acceleration.Y != 0) || (acceleration.Z != 0)) {
-		
+
 		// Determine at what time (for each x,y,z) a maxima will occur.
 		Vector3 time_max (0, 0, 0);
 		time_max.X = (acceleration.X != 0) ? ((-velocity.X) / acceleration.X) : 0.00F;
@@ -1207,7 +1213,7 @@ CGraphicView::Reset_Camera_To_Display_Sphere (SphereClass &sphere)
 
 	// Make the same adjustment for the scene light
 	CW3DViewDoc* doc = (CW3DViewDoc *)GetDocument();
-	LightClass *pSceneLight = doc->GetSceneLight ();	
+	LightClass *pSceneLight = doc->GetSceneLight ();
 	if ((m_pLightMesh != NULL) && (pSceneLight != NULL)) {
 
 		// Reposition the light and its 'mesh' as appropriate
@@ -1267,14 +1273,14 @@ CGraphicView::Reset_Camera_To_Display_Object (RenderObjClass &render_object)
 {
 	// Reset the camera to get a good look at this object's bounding sphere
 	SphereClass sp = render_object.Get_Bounding_Sphere ();
-	Reset_Camera_To_Display_Sphere (sp);		
+	Reset_Camera_To_Display_Sphere (sp);
 
 	// Should we update the camera's position as well?
 	int index = render_object.Get_Bone_Index ("CAMERA");
 	if (index > 0) {
 
 		// Convert the bone's transform into a camera transform
-		Matrix3D	transform = render_object.Get_Bone_Transform (index);												
+		Matrix3D	transform = render_object.Get_Bone_Transform (index);
 		if (m_CameraBonePosX) {
 			Matrix3D tmp = transform;
 			Matrix3D cam_transform (Vector3 (0, -1, 0), Vector3 (0, 0, 1), Vector3 (-1, 0, 0), Vector3 (0, 0, 0));
@@ -1321,7 +1327,7 @@ CGraphicView::Load_Default_Dat (void)
 	}
 
 	// Concat the default.dat filename onto the path
-	::strcat (filename, "\\default.dat");
+	strlcat(filename, "\\default.dat", ARRAY_SIZE(filename));
 
 	// Does the file exist in the directory?
 	if (::GetFileAttributes (filename) != 0xFFFFFFFF) {
@@ -1347,13 +1353,13 @@ CGraphicView::OnRButtonUp
 (
     UINT nFlags,
     CPoint point
-) 
+)
 {
 	// Mouse button is up
 	m_bRMouseDown = FALSE;
 
 	if (m_bMouseDown) {
-		((CW3DViewDoc *)GetDocument())->Set_Cursor ("orbit.tga");		
+		((CW3DViewDoc *)GetDocument())->Set_Cursor ("orbit.tga");
 	} else {
 		::SetCursor (::LoadCursor (NULL, MAKEINTRESOURCE (IDC_ARROW)));
 		((CW3DViewDoc *)GetDocument())->Set_Cursor ("cursor.tga");
@@ -1394,7 +1400,7 @@ CGraphicView::OnRButtonDown
         ::SetCursor (::LoadCursor (::AfxGetResourceHandle (), MAKEINTRESOURCE (IDC_CURSOR_ZOOM)));
 		  ((CW3DViewDoc *)GetDocument())->Set_Cursor ("zoom.tga");
     }
-    
+
 	// Allow the base class to process this message
     CView::OnRButtonDown(nFlags, point);
     return ;
@@ -1426,10 +1432,10 @@ CGraphicView::SetAnimationState (ANIMATION_STATE animationState)
                 if (pCRenderObj)
                 {
                     // Reset the animation to frame 0
-                    														 
+
                     if (doc->GetCurrentAnimation()) {
                     	pCRenderObj->Set_Animation (doc->GetCurrentAnimation (), 0);
-                    }	 
+                    }
                 }
 
                 // Reset the animation to frame 0
@@ -1473,12 +1479,12 @@ CGraphicView::SetCameraPos (CAMERA_POS cameraPos)
     if (pCRenderObj)
     {
         SphereClass sphere = m_ViewedSphere;
-    
+
         m_CameraDistance = sphere.Radius * 3.00F;
         m_CameraDistance = (m_CameraDistance < 1.0F) ? 1.0F : m_CameraDistance;
         m_CameraDistance = (m_CameraDistance > 400.0F) ? 400.0F : m_CameraDistance;
 
-        Matrix3D transform (1);        
+        Matrix3D transform (1);
 
         switch (cameraPos)
         {
@@ -1585,10 +1591,10 @@ CGraphicView::SetAllowedCameraRotation (CAMERA_ROTATION cameraRotation)
 ////////////////////////////////////////////////////////////////////////////
 void
 CGraphicView::ResetObject (void)
-{    
+{
     // Get the current document
     CW3DViewDoc *doc = ::GetCurrentDocument ();
-    
+
     ASSERT (doc);
     if (doc)
     {
@@ -1611,7 +1617,7 @@ CGraphicView::ResetObject (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CGraphicView::OnGetMinMaxInfo (MINMAXINFO FAR* lpMMI) 
+CGraphicView::OnGetMinMaxInfo (MINMAXINFO FAR* lpMMI)
 {
 	CView::OnGetMinMaxInfo (lpMMI);
 	return ;
@@ -1660,8 +1666,8 @@ CGraphicView::Rotate_Object (void)
 
 		// Set the new transform for the object
 		prender_obj->Set_Transform (transform);
-	}           
-	
+	}
+
 	return ;
 }
 
@@ -1680,7 +1686,7 @@ CGraphicView::Rotate_Light (void)
 	// Get the currently displayed object
 	LightClass *pscene_light = doc->GetSceneLight ();
 	RenderObjClass *prender_obj = doc->GetDisplayedObject ();
-	if ((pscene_light != NULL) && (prender_obj != NULL)) {		
+	if ((pscene_light != NULL) && (prender_obj != NULL)) {
 		Matrix3D rotation_matrix (1);
 
 		// Build a rotation matrix that contains the x,y,z
@@ -1712,7 +1718,7 @@ CGraphicView::Rotate_Light (void)
 		Matrix3D coord_system = prender_obj->Get_Transform ();
 		coord_system.Get_Orthogonal_Inverse (coord_inv);
 
-		Matrix3D transform = pscene_light->Get_Transform ();				
+		Matrix3D transform = pscene_light->Get_Transform ();
 		Matrix3D::Multiply (coord_inv, transform, &coord_to_obj);
 
 		Matrix3D::Multiply (coord_system, rotation_matrix, &transform);
@@ -1726,8 +1732,8 @@ CGraphicView::Rotate_Light (void)
 		// Pass the new transform onto the light
 		m_pLightMesh->Set_Transform (transform);
 		pscene_light->Set_Transform (transform);
-	}           
-	
+	}
+
 	return ;
 }
 
@@ -1803,9 +1809,9 @@ CGraphicView::Set_Camera_Distance (float dist)
 
 	//
 	//	Reposition the camera
-	//	
+	//
 	Matrix3D new_tm(1);
-	new_tm.Look_At (m_ViewedSphere.Center + Vector3 (m_CameraDistance, 0.00F, 0.00F), m_ViewedSphere.Center, 0);	
+	new_tm.Look_At (m_ViewedSphere.Center + Vector3 (m_CameraDistance, 0.00F, 0.00F), m_ViewedSphere.Center, 0);
 	m_pCamera->Set_Transform (new_tm);
 
 	//
@@ -1815,7 +1821,7 @@ CGraphicView::Set_Camera_Distance (float dist)
 	if (main_wnd != NULL) {
 		main_wnd->UpdateCameraDistance (m_CameraDistance);
 	}
-	
+
 	return ;
 }
 
diff --git a/Core/Tools/W3DView/GraphicView.h b/Core/Tools/W3DView/GraphicView.h
index 60798740b2a..8a6faa8b5da 100644
--- a/Core/Tools/W3DView/GraphicView.h
+++ b/Core/Tools/W3DView/GraphicView.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_GRAPHICVIEW_H__2BB39E41_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
-#define AFX_GRAPHICVIEW_H__2BB39E41_5D3A_11D2_9FC6_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // GraphicView.h : header file
 //
 
@@ -44,7 +40,7 @@ class ParticleEmitterClass;
 /////////////////////////////////////////////////////////////////////////////
 // CGraphicView view
 
-#include "Camera.H"
+#include "camera.h"
 
 class CGraphicView : public CView
 {
@@ -235,7 +231,7 @@ class CGraphicView : public CView
 		  RenderObjClass *	m_pLightMesh;
 		  bool					m_bLightMeshInScene;
 		  Vector3				m_ObjectCenter;
-		  SphereClass			m_ViewedSphere;		  
+		  SphereClass			m_ViewedSphere;
 
         BOOL					m_bMouseDown;
         BOOL					m_bRMouseDown;
@@ -245,7 +241,7 @@ class CGraphicView : public CView
 		  float					m_CameraDistance;
 		  DWORD					m_ParticleCountUpdate;
 		  BOOL					m_CameraBonePosX;
-        
+
         // Animation data
         DWORD					m_dwLastFrameUpdate;
         float					m_animationSpeed;
@@ -259,5 +255,3 @@ class CGraphicView : public CView
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_GRAPHICVIEW_H__2BB39E41_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/HierarchyPropPage.cpp b/Core/Tools/W3DView/HierarchyPropPage.cpp
index 9b7119eeed8..b52c698e0f6 100644
--- a/Core/Tools/W3DView/HierarchyPropPage.cpp
+++ b/Core/Tools/W3DView/HierarchyPropPage.cpp
@@ -19,13 +19,13 @@
 // HierarchyPropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "W3DView.h"
 #include "HierarchyPropPage.h"
-#include "AssetMgr.H"
-#include "RendObj.H"
-#include "AssetPropertySheet.H"
-#include "MeshPropPage.H"
+#include "assetmgr.h"
+#include "rendobj.h"
+#include "AssetPropertySheet.h"
+#include "MeshPropPage.h"
 
 
 #ifdef RTS_DEBUG
@@ -92,11 +92,11 @@ END_MESSAGE_MAP()
 //  OnInitDialog
 //
 BOOL
-CHierarchyPropPage::OnInitDialog (void) 
+CHierarchyPropPage::OnInitDialog (void)
 {
 	// Allow the base class to process this message
     CPropertyPage::OnInitDialog();
-	
+
     if (m_stringHierarchyName.GetLength () > 0)
     {
         // Get a pointer to the hierarchy object from the asset manager
@@ -106,7 +106,7 @@ CHierarchyPropPage::OnInitDialog (void)
         if (pCHierarchy)
         {
             CString stringDesc;
-            stringDesc.Format (IDS_HIERARCHY_PROP_DESC, m_stringHierarchyName);
+            stringDesc.Format (IDS_HIERARCHY_PROP_DESC, static_cast<const char*>(m_stringHierarchyName));
 
             // Put the description onto the dialog
             SetDlgItemText (IDC_DESCRIPTION, stringDesc);
@@ -120,7 +120,7 @@ CHierarchyPropPage::OnInitDialog (void)
 
             // Add the name column to the list control
             m_subObjectListCtrl.InsertColumn (0, "Name");
-            
+
             // Loop through all the subobjects and add them to the list control
             for (int iObject = 0;
                  iObject < iSubObjects;
@@ -145,11 +145,11 @@ CHierarchyPropPage::OnInitDialog (void)
             // Free the object
             pCHierarchy->Release_Ref ();
             pCHierarchy = NULL;
-        }        
+        }
 	}
 
     GetParent ()->GetDlgItem (IDOK)->ShowWindow (SW_HIDE);
-    GetParent ()->GetDlgItem (IDCANCEL)->SetWindowText ("Close");	
+    GetParent ()->GetDlgItem (IDCANCEL)->SetWindowText ("Close");
     return TRUE;
 }
 
@@ -163,11 +163,11 @@ CHierarchyPropPage::OnDblclkSubObjectList
     NMHDR* pNMHDR,
     LRESULT* pResult
 )
-{    
+{
     // Get the currently selected item
     int iIndex = m_subObjectListCtrl.GetNextItem (-1, LVNI_ALL | LVNI_SELECTED);
     if (iIndex != -1)
-    {    
+    {
         // Create a one-page property sheet that will display property information
         // for the mesh
         CMeshPropPage meshPropPage (m_subObjectListCtrl.GetItemText (iIndex, 0));
@@ -176,7 +176,7 @@ CHierarchyPropPage::OnDblclkSubObjectList
         // Show the property sheet
         propertySheet.DoModal ();
     }
-	
+
 	(*pResult) = 0;
     return ;
 }
diff --git a/Core/Tools/W3DView/HierarchyPropPage.h b/Core/Tools/W3DView/HierarchyPropPage.h
index 6b622f4f754..bd70b4f939e 100644
--- a/Core/Tools/W3DView/HierarchyPropPage.h
+++ b/Core/Tools/W3DView/HierarchyPropPage.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_HIERARCHYPROPPAGE_H__FB40246E_5DFB_11D2_9FC7_00104B791122__INCLUDED_)
-#define AFX_HIERARCHYPROPPAGE_H__FB40246E_5DFB_11D2_9FC7_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // HierarchyPropPage.h : header file
 //
 
@@ -70,5 +66,3 @@ class CHierarchyPropPage : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_HIERARCHYPROPPAGE_H__FB40246E_5DFB_11D2_9FC7_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/LODDefs.h b/Core/Tools/W3DView/LODDefs.h
index 89df220e26d..0d5602d5217 100644
--- a/Core/Tools/W3DView/LODDefs.h
+++ b/Core/Tools/W3DView/LODDefs.h
@@ -34,10 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef __LODDEFS_H
-#define __LODDEFS_H
-
+#pragma once
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -102,7 +99,3 @@ __inline bool Is_Model_Part_of_LOD (LPCTSTR name, LPCTSTR base, LOD_NAMING_TYPE
 	// Return the true/false result ccde
 	return retval;
 }
-
-
-#endif //__LODDEFS_H
-
diff --git a/Core/Tools/W3DView/MainFrm.cpp b/Core/Tools/W3DView/MainFrm.cpp
index 2629edc938b..e27917e65f3 100644
--- a/Core/Tools/W3DView/MainFrm.cpp
+++ b/Core/Tools/W3DView/MainFrm.cpp
@@ -19,62 +19,62 @@
 // MainFrm.cpp : implementation of the CMainFrame class
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-
-#include "mainfrm.h"
-#include "datatreeview.h"
-#include "graphicview.h"
-#include "deviceselectiondialog.h"
-#include "globals.h"
-#include "w3dviewdoc.h"
-#include "viewerassetmgr.h"
-#include "assetpropertysheet.h"
-#include "meshproppage.h"
-#include "animationproppage.h"
-#include "hierarchyproppage.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+
+#include "MainFrm.h"
+#include "DataTreeView.h"
+#include "GraphicView.h"
+#include "DeviceSelectionDialog.h"
+#include "Globals.h"
+#include "W3DViewDoc.h"
+#include "ViewerAssetMgr.h"
+#include "AssetPropertySheet.h"
+#include "MeshPropPage.h"
+#include "AnimationPropPage.h"
+#include "HierarchyPropPage.h"
 #include "resource.h"
 #include "distlod.h"
-#include "animationspeed.h"
-#include "ambientlightdialog.h"
-#include "scenelightdialog.h"
-#include "backgroundcolordialog.h"
-#include "savesettingsdialog.h"
-#include "editloddialog.h"
+#include "AnimationSpeed.h"
+#include "AmbientLightDialog.h"
+#include "SceneLightDialog.h"
+#include "BackgroundColorDialog.h"
+#include "SaveSettingsDialog.h"
+#include "EditLODDialog.h"
 #include "w3derr.h"
-#include "backgroundobjectdialog.h"
-#include "backgroundbmpdialog.h"
-#include "toolbar.h"
-#include "emitterpropertysheet.h"
+#include "BackgroundObjectDialog.h"
+#include "BackgroundBMPDialog.h"
+#include "Toolbar.h"
+#include "EmitterPropertySheet.h"
 #include "part_ldr.h"
 #include "agg_def.h"
-#include "bonemgrdialog.h"
-#include "utils.h"
+#include "BoneMgrDialog.h"
+#include "Utils.h"
 #include "light.h"
-#include "aggregatenamedialog.h"
-#include "loddefs.h"
+#include "AggregateNameDialog.h"
+#include "LODDefs.h"
 #include "part_emt.h"
-#include "restrictedfiledialog.h"
+#include "RestrictedFileDialog.h"
 #include "hlod.h"
-#include "viewerscene.h"
-#include "emitterinstancelist.h"
+#include "ViewerScene.h"
+#include "EmitterInstanceList.h"
 #include "mmsystem.h"
-#include "advancedanimsheet.h"
-#include "camerasettingsdialog.h"
-#include "directorydialog.h"
-#include "texturepathdialog.h"
-#include "resolutiondialog.h"
-#include "spherepropertysheet.h"
-#include "ringpropertysheet.h"
-#include "addtolineupdialog.h"
-#include "cameradistancedialog.h"
-#include "soundeditdialog.h"
-#include "wwaudio.h"
+#include "AdvancedAnimSheet.h"
+#include "CameraSettingsDialog.h"
+#include "DirectoryDialog.h"
+#include "TexturePathDialog.h"
+#include "ResolutionDialog.h"
+#include "SpherePropertySheet.h"
+#include "RingPropertySheet.h"
+#include "AddToLineupDialog.h"
+#include "CameraDistanceDialog.h"
+#include "SoundEditDialog.h"
+#include "WWAudio.h"
 #include "soundrobj.h"
 #include "rddesc.h"
-#include "scaledialog.h"
-#include "gammadialog.h"
-#include "animatedsoundoptionsdialog.h"
+#include "ScaleDialog.h"
+#include "GammaDialog.h"
+#include "AnimatedSoundOptionsDialog.h"
 
 
 //#undef STRICT
@@ -342,7 +342,7 @@ CMainFrame::CMainFrame (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 CMainFrame::~CMainFrame (void)
-{    
+{
     return ;
 }
 
@@ -413,7 +413,7 @@ CMainFrame::OnCreate (LPCREATESTRUCT lpCreateStruct)
 
 	// Float the animation bar, but don't show it
 	FloatControlBar (&m_animationToolbar, CPoint(rect.left + 210, rect.bottom-100), CBRS_ALIGN_LEFT);
-	ShowControlBar (&m_animationToolbar, FALSE, FALSE);    
+	ShowControlBar (&m_animationToolbar, FALSE, FALSE);
 
 	// Don't show anything in these panes for now
 	m_wndStatusBar.SetPaneText (PANE_POLYS, "");
@@ -430,7 +430,7 @@ CMainFrame::OnCreate (LPCREATESTRUCT lpCreateStruct)
 	_TheAssetMgr->Set_Activate_Fog_On_Load(true);
 
 	GetWindowRect (&m_OrigRect);
-	
+
 	m_hEmittersSubMenu = ::GetSubMenu (::GetMenu (m_hWnd), 3);
 	m_hEmittersSubMenu = ::GetSubMenu (m_hEmittersSubMenu, 3);
 
@@ -460,7 +460,7 @@ CMainFrame::Restore_Window_State (void)
 	rect.bottom	= theApp.GetProfileInt ("Window", "Bottom", -1);
 	bool is_max	= (theApp.GetProfileInt ("Window", "Maximized", -1) == 1);
 
-	if (rect.left != -1 && rect.right != -1 && rect.top != -1 && rect.bottom != -1) {		
+	if (rect.left != -1 && rect.right != -1 && rect.top != -1 && rect.bottom != -1) {
 		if (is_max) {
 			::ShowWindow (m_hWnd, SW_MAXIMIZE);
 		} else {
@@ -525,13 +525,13 @@ CMainFrame::OnCreateClient
 															RUNTIME_CLASS (CGraphicView),
 															CSize (120, 10),
 															pContext);
-                                             
+
 		ASSERT (bReturn);
 		if (bReturn) {
 
 			// Get a pointer to the 'graphic' pane's window
 			CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
-			BOOL bReturn = (pCGraphicView != NULL);                        
+			BOOL bReturn = (pCGraphicView != NULL);
 
 			// Were we successful in view's getting the pointer?
 			ASSERT (pCGraphicView);
@@ -555,7 +555,7 @@ CMainFrame::OnCreateClient
 				//	Initialize the device
 				//
 				g_iWidth		= theApp.GetProfileInt ("Config", "DeviceWidth", 640);
-				g_iHeight	= theApp.GetProfileInt ("Config", "DeviceHeight", 480);					 
+				g_iHeight	= theApp.GetProfileInt ("Config", "DeviceHeight", 480);
 				Select_Device (false);
 
 				//
@@ -582,7 +582,7 @@ CMainFrame::OnCreateClient
 				//
 				int munge_sort=::AfxGetApp()->GetProfileInt("Config", "MungeSortOnLoad",0);
 				WW3D::Enable_Munge_Sort_On_Load(munge_sort==1?true:false);
-				
+
 				int sort=::AfxGetApp()->GetProfileInt("Config", "EnableSorting",1);
 				WW3D::Enable_Sorting(sort==1?true:false);
 
@@ -595,7 +595,7 @@ CMainFrame::OnCreateClient
 					if (gamma>3.0) gamma=3.0;
 					DX8Wrapper::Set_Gamma(gamma,0.0f,1.0f);
 				}
-			}        
+			}
 		}
 	}
 
@@ -651,7 +651,7 @@ CMainFrame::WindowProc
 )
 {
 	if (message == WM_CLOSE) {
-		
+
 		// We're closing the application so cleanup resources
 		CW3DViewDoc *pdoc = (CW3DViewDoc *)GetActiveDocument ();
 		if (pdoc != NULL) {
@@ -661,7 +661,7 @@ CMainFrame::WindowProc
 		}
 
 	} else if (message == WM_COMMAND) {
-		
+
 		switch (LOWORD (wParam))
 		{
 			case IDM_SETTINGS1:
@@ -674,7 +674,7 @@ CMainFrame::WindowProc
 			case IDM_SETTINGS8:
 			case IDM_SETTINGS9:
 			{
-		
+
 				// Get the directory where this executable was run from
 				TCHAR filename[MAX_PATH];
 				::GetModuleFileName (NULL, filename, sizeof (filename));
@@ -684,12 +684,12 @@ CMainFrame::WindowProc
 				if (ppath != NULL) {
 					ppath[0] = 0;
 				}
-				
+
 				// Concat the default.dat filename onto the path
 				TCHAR full_path[MAX_PATH];
-				::strcat (filename, "\\settings");
+				strlcat (filename, "\\settings", ARRAY_SIZE(filename));
 				::wsprintf (full_path, "%s%d.dat", filename, (LOWORD(wParam) - IDM_SETTINGS1) + 1);
-				
+
 				// Does the file exist in the directory?
 				if (::GetFileAttributes (full_path) != 0xFFFFFFFF) {
 
@@ -718,7 +718,7 @@ void
 CMainFrame::OnObjectProperties (void)
 {
     // Dislay the properties for the currently selected object.
-    ShowObjectProperties ();    
+    ShowObjectProperties ();
     return ;
 }
 
@@ -733,7 +733,7 @@ CMainFrame::ShowObjectProperties (void)
 {
 	// Get a pointer to the 'graphic' pane's window
     CDataTreeView *pCDataTreeView = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);
-    BOOL bReturn = (pCDataTreeView != NULL);                        
+    BOOL bReturn = (pCDataTreeView != NULL);
 
     // Were we successful in getting the view's pointer?
     ASSERT (pCDataTreeView);
@@ -750,7 +750,7 @@ CMainFrame::ShowObjectProperties (void)
                 CAssetPropertySheet propertySheet (IDS_MESH_PROP_TITLE, &meshPropPage, this);
 
                 // Show the property sheet
-                propertySheet.DoModal ();                
+                propertySheet.DoModal ();
             }
             break;
 
@@ -802,11 +802,11 @@ CMainFrame::ShowObjectProperties (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateObjectProperties (CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateObjectProperties (CCmdUI* pCmdUI)
 {
 	// Get a pointer to the 'graphic' pane's window
     CDataTreeView *pCDataTreeView = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);
-    BOOL bReturn = (pCDataTreeView != NULL);                        
+    BOOL bReturn = (pCDataTreeView != NULL);
 
     // Were we successful in view's getting the pointer?
     ASSERT (pCDataTreeView);
@@ -815,7 +815,7 @@ CMainFrame::OnUpdateObjectProperties (CCmdUI* pCmdUI)
         // Get the name of the currently selected object
         pCmdUI->Enable (pCDataTreeView->GetCurrentSelectionName () != NULL);
     }
-    
+
     return ;
 }
 
@@ -827,7 +827,7 @@ CMainFrame::OnUpdateObjectProperties (CCmdUI* pCmdUI)
 ////////////////////////////////////////////////////////////////////////////
 void
 CMainFrame::OnSelectionChanged (ASSET_TYPE newAssetType)
-{    
+{
     if (m_currentAssetType != newAssetType)
     {
         // What was the old type?
@@ -867,7 +867,7 @@ CMainFrame::OnSelectionChanged (ASSET_TYPE newAssetType)
             {
                 CMenu *pMainMenu = GetMenu ();
                 if (pMainMenu)
-                {                    
+                {
                     // Load the menu from the resources
                     HMENU hSubMenu = ::LoadMenu (::AfxGetResourceHandle (), MAKEINTRESOURCE(IDR_ANI_MENU));
                     hSubMenu = ::GetSubMenu (hSubMenu, 0);
@@ -911,7 +911,7 @@ CMainFrame::OnSelectionChanged (ASSET_TYPE newAssetType)
 
                     // Redrew the menu
                     DrawMenuBar ();
-                }                
+                }
             }
             break;
 
@@ -934,7 +934,7 @@ CMainFrame::OnSelectionChanged (ASSET_TYPE newAssetType)
 
                     // Redrew the menu
                     DrawMenuBar ();
-                }                
+                }
             }
             break;
 
@@ -957,7 +957,7 @@ CMainFrame::OnSelectionChanged (ASSET_TYPE newAssetType)
 
                     // Redrew the menu
                     DrawMenuBar ();
-                }                
+                }
             }
             break;
         }
@@ -965,7 +965,7 @@ CMainFrame::OnSelectionChanged (ASSET_TYPE newAssetType)
         // Remember the new asset type for later
         m_currentAssetType = newAssetType;
     }
-    
+
     return ;
 }
 
@@ -976,7 +976,7 @@ CMainFrame::OnSelectionChanged (ASSET_TYPE newAssetType)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnLodGenerate (void) 
+CMainFrame::OnLodGenerate (void)
 {
 	// Get a pointer to the 'data' pane's window
 	CDataTreeView *ptree_view = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);
@@ -1016,7 +1016,7 @@ CMainFrame::OnLodGenerate (void)
 					WW3DAssetManager::Get_Instance ()->Add_Prototype (plod_prototype);
 
 					// Add this LOD to the tree view
-					ptree_view->Add_Asset_To_Tree (plod_prototype->Get_Name (), TypeLOD, true);					
+					ptree_view->Add_Asset_To_Tree (plod_prototype->Get_Name (), TypeLOD, true);
 				}
 			}
 		}
@@ -1036,7 +1036,7 @@ CMainFrame::OnActivateApp
 (
     BOOL bActive,
     HTASK_OR_DWORD hTask
-) 
+)
 {
 	// Get a pointer to the 'graphic' pane's window
     CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
@@ -1049,10 +1049,10 @@ CMainFrame::OnActivateApp
         // its display (animation, etc)
         pCGraphicView->SetActiveUpdate (bActive);
     }
-    
+
 	// Allow the base class to process this message
     CFrameWnd::OnActivateApp(bActive, hTask);
-    return ;	
+    return ;
 }
 
 
@@ -1073,7 +1073,7 @@ CMainFrame::Update_Frame_Time (DWORD clocks)
 
 	//if (frames >= 20) {
 	if ((::GetTickCount () - last_update) >= 1000) {
-		
+
 		//
 		//	Average the frame time
 		//
@@ -1090,7 +1090,7 @@ CMainFrame::Update_Frame_Time (DWORD clocks)
 		total_clocks = 0;
 		last_update = ::GetTickCount ();
 	}
-			
+
 	// Update the resolution display
 	CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
 	if (pCGraphicView != NULL) {
@@ -1183,7 +1183,7 @@ CMainFrame::UpdateCameraDistance (float cameraDistance)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnFileOpen (void) 
+CMainFrame::OnFileOpen (void)
 {
 	CW3DViewDoc *doc = (CW3DViewDoc *)GetActiveDocument ();
 	if (doc == NULL) {
@@ -1209,13 +1209,13 @@ CMainFrame::OnFileOpen (void)
         SetCursor (::LoadCursor (NULL, IDC_WAIT));
 
          // Loop through all the selected files
-         POSITION pPos = openFileDialog.GetStartPosition (); 
+         POSITION pPos = openFileDialog.GetStartPosition ();
          while (pPos != NULL)
          {
              // Ask the doc to load the assets from this file into memory
              CString stringFileName = openFileDialog.GetNextPathName (pPos);
              doc->LoadAssetsFromFile (stringFileName);
-             
+
              // Add this filename to the MRU
              ::AfxGetApp ()->AddToRecentFileList (stringFileName);
          }
@@ -1231,7 +1231,7 @@ CMainFrame::OnFileOpen (void)
         SetCursor (::LoadCursor (NULL, IDC_ARROW));
     }
 
-    return ;	
+    return ;
 }
 
 
@@ -1241,7 +1241,7 @@ CMainFrame::OnFileOpen (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnAniSpeed (void) 
+CMainFrame::OnAniSpeed (void)
 {
     CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
     if (pCGraphicView)
@@ -1255,7 +1255,7 @@ CMainFrame::OnAniSpeed (void)
         }
     }
 
-    return ;	
+    return ;
 }
 
 
@@ -1278,7 +1278,7 @@ CMainFrame::OnAniStop (void)
         m_animationToolbar.SetButtonState (IDM_ANI_START, CFancyToolbar::StateUp);
         m_animationToolbar.SetButtonState (IDM_ANI_PAUSE, CFancyToolbar::StateUp);
     }
-	
+
     return ;
 }
 
@@ -1434,12 +1434,12 @@ CMainFrame::OnCameraLeft (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnCameraReset (void) 
+CMainFrame::OnCameraReset (void)
 {
 	CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
     ASSERT (pCGraphicView);
     if (pCGraphicView)
-    {        
+    {
         // Get a pointer to the current document
         CW3DViewDoc *pCDoc = (CW3DViewDoc *)GetActiveDocument ();
         if (pCDoc && pCDoc->GetDisplayedObject ())
@@ -1450,7 +1450,7 @@ CMainFrame::OnCameraReset (void)
 					pCGraphicView->Reset_Camera_To_Display_Emitter (*((ParticleEmitterClass *)prender_obj));
 				} else {
 					pCGraphicView->Reset_Camera_To_Display_Object (*prender_obj);
-				}           
+				}
         }
     }
 
@@ -1527,7 +1527,7 @@ CMainFrame::OnObjectRotateZ (void)
             m_objectToolbar.SetButtonState (IDM_OBJECT_ROTATE_Z, CFancyToolbar::StateUp);
         }
     }
-	
+
     return ;
 }
 
@@ -1543,14 +1543,14 @@ CMainFrame::OnObjectRotateY (void)
 	CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
     ASSERT (pCGraphicView);
     if (pCGraphicView)
-    {   
+    {
         int iYRotation = (pCGraphicView->GetObjectRotation () ^ (CGraphicView::RotateY));
 		  iYRotation &= ~CGraphicView::RotateYBack;
-             
+
         // Start or stop the rotation around Y
         pCGraphicView->RotateObject ((CGraphicView::OBJECT_ROTATION)iYRotation);
     }
-	
+
     return ;
 }
 
@@ -1561,12 +1561,12 @@ CMainFrame::OnObjectRotateY (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnObjectRotateX (void) 
+CMainFrame::OnObjectRotateX (void)
 {
 	CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
     ASSERT (pCGraphicView);
     if (pCGraphicView)
-    
+
     {
         int iXRotation = (pCGraphicView->GetObjectRotation () ^ (CGraphicView::RotateX));
 		  iXRotation &= ~CGraphicView::RotateXBack;
@@ -1574,7 +1574,7 @@ CMainFrame::OnObjectRotateX (void)
         // Start or stop the rotation around X
         pCGraphicView->RotateObject ((CGraphicView::OBJECT_ROTATION)iXRotation);
     }
-	
+
     return ;
 }
 
@@ -1585,13 +1585,13 @@ CMainFrame::OnObjectRotateX (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnLightAmbient (void) 
+CMainFrame::OnLightAmbient (void)
 {
     // Show the ambient light dialog
     CAmbientLightDialog ambientLightDialog (this);
     ambientLightDialog.DoModal ();
     return ;
-	
+
 }
 
 
@@ -1601,7 +1601,7 @@ CMainFrame::OnLightAmbient (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnLightScene (void) 
+CMainFrame::OnLightScene (void)
 {
     // Show the scene light dialog
     CSceneLightDialog sceneLightDialog (this);
@@ -1620,8 +1620,8 @@ CMainFrame::OnBackgroundColor (void)
 {
     // Show the background color
     CBackgroundColorDialog backgroundColorDialog (this);
-    backgroundColorDialog.DoModal ();    
-    return ;	
+    backgroundColorDialog.DoModal ();
+    return ;
 }
 
 
@@ -1631,7 +1631,7 @@ CMainFrame::OnBackgroundColor (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateBackgroundFog (CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateBackgroundFog (CCmdUI* pCmdUI)
 {
 	CW3DViewDoc *pdoc = (CW3DViewDoc *)GetActiveDocument ();
 	if (pdoc) {
@@ -1646,7 +1646,7 @@ CMainFrame::OnUpdateBackgroundFog (CCmdUI* pCmdUI)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnBackgroundFog (void) 
+CMainFrame::OnBackgroundFog (void)
 {
 	CW3DViewDoc *pdoc = (CW3DViewDoc *)GetActiveDocument ();
 	if (pdoc) {
@@ -1668,7 +1668,7 @@ CMainFrame::OnBackgroundBMP (void)
     // Show the background BMP dialog
     CBackgroundBMPDialog backgroundBMPDialog (this);
     backgroundBMPDialog.DoModal ();
-    return ;	
+    return ;
 }
 
 
@@ -1678,7 +1678,7 @@ CMainFrame::OnBackgroundBMP (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnSaveSettings (void) 
+CMainFrame::OnSaveSettings (void)
 {
     // Show the save settings dialog
     CSaveSettingsDialog saveSettingsDialog (this);
@@ -1724,7 +1724,7 @@ CMainFrame::OnLoadSettings (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnLODSetSwitch (void) 
+CMainFrame::OnLODSetSwitch (void)
 {
     // Display the edit LOD dialog
     CEditLODDialog editLODDialog (this);
@@ -1739,7 +1739,7 @@ CMainFrame::OnLODSetSwitch (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnLODSave (void) 
+CMainFrame::OnLODSave (void)
 {
 	// Get the controlling doc object so we can have it save the
 	// LOD for us.
@@ -1786,7 +1786,7 @@ CMainFrame::OnBackgroundObject (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateViewAnimationBar (CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateViewAnimationBar (CCmdUI* pCmdUI)
 {
     // Are we currently displaying an animation?
     if ((m_currentAssetType != TypeAnimation) || (m_currentAssetType != TypeCompressedAnimation))
@@ -1812,7 +1812,7 @@ CMainFrame::OnUpdateViewAnimationBar (CCmdUI* pCmdUI)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateViewObjectBar (CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateViewObjectBar (CCmdUI* pCmdUI)
 {
     // Enable the option and set the correct state of the check
     pCmdUI->Enable (TRUE);
@@ -1887,7 +1887,7 @@ CMainFrame::OnAniStepFwd (void)
     {
         // Ask the doc to step the animation forward one frame
         pCDoc->StepAnimation (1);
-    }        
+    }
 
     return ;
 }
@@ -1919,7 +1919,7 @@ CMainFrame::OnAniStepBkwd (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnObjectReset (void) 
+CMainFrame::OnObjectReset (void)
 {
     // Get the graphic view
     CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
@@ -1928,8 +1928,8 @@ CMainFrame::OnObjectReset (void)
         // Ask the view to reset the rotation of the current object
         pCGraphicView->ResetObject ();
     }
-    
-    return ;	
+
+    return ;
 }
 
 
@@ -1977,7 +1977,7 @@ CMainFrame::OnCameraAllowRotateX (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnCameraAllowRotateY (void) 
+CMainFrame::OnCameraAllowRotateY (void)
 {
     // Get the graphic view
     CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
@@ -2053,7 +2053,7 @@ CMainFrame::OnCameraAllowRotateZ (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateCameraAllowRotateX (CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateCameraAllowRotateX (CCmdUI* pCmdUI)
 {
     // Get the graphic view
     CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
@@ -2062,7 +2062,7 @@ CMainFrame::OnUpdateCameraAllowRotateX (CCmdUI* pCmdUI)
         // Either turn the check on or off depending on the view's settings
         pCmdUI->SetCheck (pCGraphicView->GetAllowedCameraRotation () == CGraphicView::OnlyRotateX);
     }
-        
+
     return ;
 }
 
@@ -2073,7 +2073,7 @@ CMainFrame::OnUpdateCameraAllowRotateX (CCmdUI* pCmdUI)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateCameraAllowRotateY (CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateCameraAllowRotateY (CCmdUI* pCmdUI)
 {
     // Get the graphic view
     CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
@@ -2093,7 +2093,7 @@ CMainFrame::OnUpdateCameraAllowRotateY (CCmdUI* pCmdUI)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateCameraAllowRotateZ (CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateCameraAllowRotateZ (CCmdUI* pCmdUI)
 {
     // Get the graphic view
     CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
@@ -2113,11 +2113,11 @@ CMainFrame::OnUpdateCameraAllowRotateZ (CCmdUI* pCmdUI)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateObjectRotateX (CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateObjectRotateX (CCmdUI* pCmdUI)
 {
 	CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
     ASSERT (pCGraphicView);
-    if (pCGraphicView)    
+    if (pCGraphicView)
     {
         // Set the check if we are currently rotating around X
         pCmdUI->SetCheck ((pCGraphicView->GetObjectRotation () & (CGraphicView::RotateX)));
@@ -2133,11 +2133,11 @@ CMainFrame::OnUpdateObjectRotateX (CCmdUI* pCmdUI)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateObjectRotateY (CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateObjectRotateY (CCmdUI* pCmdUI)
 {
 	CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
     ASSERT (pCGraphicView);
-    if (pCGraphicView)    
+    if (pCGraphicView)
     {
         // Set the check if we are currently rotating around Y
         pCmdUI->SetCheck ((pCGraphicView->GetObjectRotation () & (CGraphicView::RotateY)));
@@ -2153,11 +2153,11 @@ CMainFrame::OnUpdateObjectRotateY (CCmdUI* pCmdUI)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateObjectRotateZ (CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateObjectRotateZ (CCmdUI* pCmdUI)
 {
 	CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
     ASSERT (pCGraphicView);
-    if (pCGraphicView)    
+    if (pCGraphicView)
     {
         // Set the check if we are currently rotating around Z
         pCmdUI->SetCheck ((pCGraphicView->GetObjectRotation () & (CGraphicView::RotateZ)));
@@ -2177,7 +2177,7 @@ CMainFrame::Select_Device (bool show_dlg)
 {
 	CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
     ASSERT (pCGraphicView);
-    if (pCGraphicView)    
+    if (pCGraphicView)
     {
         // Show a dialog to the user asking them which
         // device they would like to use.
@@ -2198,8 +2198,8 @@ CMainFrame::Select_Device (bool show_dlg)
 					//	Get information about the current device
 					//
 					const RenderDeviceDescClass &device_desc = WW3D::Get_Render_Device_Desc ();
-					CString driver_name = deviceSelDialog.GetDriverName ();					
-					CString chipset = device_desc.Get_Hardware_Chipset ();				
+					CString driver_name = deviceSelDialog.GetDriverName ();
+					CString chipset = device_desc.Get_Hardware_Chipset ();
 					CString string_version = device_desc.Get_Driver_Version ();
 					chipset.MakeUpper ();
 					driver_name.MakeLower ();
@@ -2208,13 +2208,13 @@ CMainFrame::Select_Device (bool show_dlg)
 					//	Check to ensure the drivers are valid if the user choose glide
 					//
 					if (::strstr (driver_name, "glide2") != NULL) {
-						
+
 						// Is this glide driver an acceptable version?
 						float driver_version = ::atof (string_version);
 						bool is_voodoo2 = (::strstr (chipset , "VOODOO2") != NULL);
 						if ((is_voodoo2 && (driver_version < 2.54F)) ||
 							 ((is_voodoo2 == false) && (driver_version < 2.46F))) {
-							
+
 							// Let the user know we can't use these drivers
 							CString message;
 							message.LoadString (IDS_UNACCEPTABLE_GLIDE_MSG);
@@ -2255,7 +2255,7 @@ CMainFrame::OnDeviceChange (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnViewFullscreen (void) 
+CMainFrame::OnViewFullscreen (void)
 {
 #ifdef WW3D_DX8
 	CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
@@ -2277,7 +2277,7 @@ CMainFrame::OnViewFullscreen (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateViewFullscreen (CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateViewFullscreen (CCmdUI* pCmdUI)
 {
 	CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
 	pCmdUI->SetCheck (pCGraphicView->Is_Fullscreen ());
@@ -2291,7 +2291,7 @@ CMainFrame::OnUpdateViewFullscreen (CCmdUI* pCmdUI)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnWindowPosChanging (WINDOWPOS FAR* lpwndpos) 
+CMainFrame::OnWindowPosChanging (WINDOWPOS FAR* lpwndpos)
 {
 	CFrameWnd::OnWindowPosChanging (lpwndpos);
 
@@ -2305,7 +2305,7 @@ CMainFrame::OnWindowPosChanging (WINDOWPOS FAR* lpwndpos)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnGetMinMaxInfo (MINMAXINFO FAR* lpMMI) 
+CMainFrame::OnGetMinMaxInfo (MINMAXINFO FAR* lpMMI)
 {
 	CFrameWnd::OnGetMinMaxInfo(lpMMI);
 	return ;
@@ -2353,9 +2353,9 @@ CMainFrame::OnEditEmitter (void)
 		ParticleEmitterClass *emitter = (ParticleEmitterClass *)pdoc->GetDisplayedObject ();
 		EmitterInstanceListClass *instance_list = new EmitterInstanceListClass;
 		instance_list->Add_Emitter (emitter);
-		
+
 		//
-		// Show the emitter property sheet		
+		// Show the emitter property sheet
 		//
 		EmitterPropertySheetClass prop_sheet (instance_list, IDS_EMITTER_PROP_TITLE, this);
 		prop_sheet.DoModal ();
@@ -2384,7 +2384,7 @@ CMainFrame::OnUpdateEditEmitter (CCmdUI *pCmdUI)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnScaleEmitter (void) 
+CMainFrame::OnScaleEmitter (void)
 {
 	// Get a pointer to the doc object
 	CW3DViewDoc *pdoc = (CW3DViewDoc *)GetActiveDocument ();
@@ -2427,7 +2427,7 @@ CMainFrame::OnScaleEmitter (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateScaleEmitter (CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateScaleEmitter (CCmdUI* pCmdUI)
 {
 	pCmdUI->Enable (m_currentAssetType == TypeEmitter);
 	return ;
@@ -2466,7 +2466,7 @@ CMainFrame::OnUpdateSaveEmitter (CCmdUI *pCmdUI)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnBoneAutoAssign (void) 
+CMainFrame::OnBoneAutoAssign (void)
 {
 	((CW3DViewDoc *)GetActiveDocument ())->Auto_Assign_Bones ();
 	return ;
@@ -2479,12 +2479,12 @@ CMainFrame::OnBoneAutoAssign (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnBoneManagement (void) 
+CMainFrame::OnBoneManagement (void)
 {
 	// Get the currently selected hierarchy model
 	RenderObjClass *prender_obj = ((CW3DViewDoc *)GetActiveDocument ())->GetDisplayedObject ();
 
-	// Show the bone manager dialog	
+	// Show the bone manager dialog
 	BoneMgrDialogClass dialog (prender_obj, this);
 	dialog.DoModal ();
 	Update_Emitters_List ();
@@ -2498,7 +2498,7 @@ CMainFrame::OnBoneManagement (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnSaveAggregate (void) 
+CMainFrame::OnSaveAggregate (void)
 {
 	((CW3DViewDoc *)GetActiveDocument ())->Save_Selected_Aggregate ();
 	return ;
@@ -2580,7 +2580,7 @@ CMainFrame::OnCameraResetOnLoad (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateCameraResetOnLoad (CCmdUI *pCmdUI) 
+CMainFrame::OnUpdateCameraResetOnLoad (CCmdUI *pCmdUI)
 {
 	CW3DViewDoc *pdoc = (CW3DViewDoc *)GetActiveDocument ();
 	pCmdUI->SetCheck (pdoc->Is_Camera_Auto_Reset_On ());
@@ -2598,8 +2598,8 @@ CMainFrame::OnObjectRotateYBack (void)
 {
 	CGraphicView *pgraphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
 	ASSERT (pgraphic_view != NULL);
-	if (pgraphic_view != NULL) {   
-		 
+	if (pgraphic_view != NULL) {
+
 		// Start or stop the rotation around Y
 		int rotation = (pgraphic_view->GetObjectRotation () ^ (CGraphicView::RotateYBack));
 		rotation &= ~CGraphicView::RotateY;
@@ -2620,8 +2620,8 @@ CMainFrame::OnObjectRotateZBack (void)
 {
 	CGraphicView *pgraphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
 	ASSERT (pgraphic_view != NULL);
-	if (pgraphic_view != NULL) {   
-		 
+	if (pgraphic_view != NULL) {
+
 		// Start or stop the rotation around Z
 		int rotation = (pgraphic_view->GetObjectRotation () ^ (CGraphicView::RotateZBack));
 		rotation &= ~CGraphicView::RotateZ;
@@ -2642,14 +2642,14 @@ CMainFrame::OnLightRotateY (void)
 {
 	CGraphicView *pgraphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
 	ASSERT (pgraphic_view != NULL);
-	if (pgraphic_view != NULL) {   
-		 
+	if (pgraphic_view != NULL) {
+
 		// Start or stop the rotation around Y
 		int rotation = (pgraphic_view->Get_Light_Rotation () ^ (CGraphicView::RotateY));
 		rotation &= ~CGraphicView::RotateYBack;
 		pgraphic_view->Rotate_Light ((CGraphicView::OBJECT_ROTATION)rotation);
 	}
-	
+
 	return ;
 }
 
@@ -2664,8 +2664,8 @@ CMainFrame::OnLightRotateYBack (void)
 {
 	CGraphicView *pgraphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
 	ASSERT (pgraphic_view != NULL);
-	if (pgraphic_view != NULL) {   
-		 
+	if (pgraphic_view != NULL) {
+
 		// Start or stop the rotation around Y
 		int rotation = (pgraphic_view->Get_Light_Rotation () ^ (CGraphicView::RotateYBack));
 		rotation &= ~CGraphicView::RotateY;
@@ -2686,8 +2686,8 @@ CMainFrame::OnLightRotateZ (void)
 {
 	CGraphicView *pgraphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
 	ASSERT (pgraphic_view != NULL);
-	if (pgraphic_view != NULL) {   
-		 
+	if (pgraphic_view != NULL) {
+
 		// Start or stop the rotation around Z
 		int rotation = (pgraphic_view->Get_Light_Rotation () ^ (CGraphicView::RotateZ));
 		rotation &= ~CGraphicView::RotateZBack;
@@ -2708,8 +2708,8 @@ CMainFrame::OnLightRotateZBack (void)
 {
 	CGraphicView *pgraphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
 	ASSERT (pgraphic_view != NULL);
-	if (pgraphic_view != NULL) {   
-		 
+	if (pgraphic_view != NULL) {
+
 		// Start or stop the rotation around Y
 		int rotation = (pgraphic_view->Get_Light_Rotation () ^ (CGraphicView::RotateZBack));
 		rotation &= ~CGraphicView::RotateZ;
@@ -2728,7 +2728,7 @@ CMainFrame::OnLightRotateZBack (void)
 void
 CMainFrame::OnDestroy (void)
 {
-	CRect rect;	
+	CRect rect;
 	WINDOWPLACEMENT wnd_info = { sizeof (WINDOWPLACEMENT), 0 };
 	::GetWindowPlacement (m_hWnd, &wnd_info);
 	::GetWindowRect (m_hWnd, &rect);
@@ -2793,7 +2793,7 @@ CMainFrame::OnDecLight (void)
 ////////////////////////////////////////////////////////////////////////////
 void
 CMainFrame::OnIncLight (void)
-{	
+{
 	CW3DViewDoc *pdoc = ::GetCurrentDocument ();
 	LightClass *plight = pdoc->GetSceneLight ();
 	if (plight != NULL) {
@@ -2860,13 +2860,13 @@ CMainFrame::OnIncAmbientLight (void)
 	return ;
 }
 
-void CMainFrame::OnLightingExpose() 
+void CMainFrame::OnLightingExpose()
 {
 	// Toggle.
 	WW3D::Expose_Prelit (!WW3D::Expose_Prelit());
 }
 
-void CMainFrame::OnUpdateLightingExpose (CCmdUI *pcmdui) 
+void CMainFrame::OnUpdateLightingExpose (CCmdUI *pcmdui)
 {
 	pcmdui->SetCheck (WW3D::Expose_Prelit());
 }
@@ -2883,8 +2883,8 @@ CMainFrame::OnMakeAggregate (void)
 	// Show the name dialog to the user
 	AggregateNameDialogClass dialog (this);
 	if (dialog.DoModal () == IDOK) {
-		
-		CDataTreeView *pdata_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);		
+
+		CDataTreeView *pdata_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);
 		RenderObjClass *prender_obj = ::GetCurrentDocument ()->GetDisplayedObject ();
 		if (prender_obj != NULL) {
 
@@ -2895,7 +2895,7 @@ CMainFrame::OnMakeAggregate (void)
 
 			// Add this prototype to the asset manager
 			WW3DAssetManager::Get_Instance ()->Remove_Prototype (dialog.Get_Name ());
-			WW3DAssetManager::Get_Instance ()->Add_Prototype (pprototype);			
+			WW3DAssetManager::Get_Instance ()->Add_Prototype (pprototype);
 
 			// Add an entry for this aggregate in the tree control
 			pdata_tree->Add_Asset_To_Tree (dialog.Get_Name (), TypeAggregate, true);
@@ -2916,7 +2916,7 @@ CMainFrame::OnRenameAggregate (void)
 {
 	// Get a pointer to the current aggregate
 	RenderObjClass *prender_obj = (::GetCurrentDocument ())->GetDisplayedObject ();
-	if (prender_obj != NULL) {			
+	if (prender_obj != NULL) {
 
 		// Show the rename dialog to the user
 		const char *old_name = prender_obj->Get_Name ();
@@ -2927,12 +2927,12 @@ CMainFrame::OnRenameAggregate (void)
 			::Rename_Aggregate_Prototype (old_name, dialog.Get_Name ());
 
 			// Refresh the UI
-			CDataTreeView *pdata_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);		
-			pdata_tree->Refresh_Asset (dialog.Get_Name (), old_name, TypeAggregate);			
+			CDataTreeView *pdata_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);
+			pdata_tree->Refresh_Asset (dialog.Get_Name (), old_name, TypeAggregate);
 
 			// Now let the actual displayed render object know its new name...
 			prender_obj->Set_Name (dialog.Get_Name ());
-		}			
+		}
 	}
 
 	return ;
@@ -2959,21 +2959,21 @@ CMainFrame::OnCommand
 		info.dwTypeData = emitter_name;
 		info.cch = sizeof (emitter_name);
 		if (::GetMenuItemInfo (m_hEmittersSubMenu, LOWORD (wParam), FALSE, &info)) {
-			
+
 			//
 			// Make a list of emitters with the given name
 			//
 			EmitterInstanceListClass *instance_list = new EmitterInstanceListClass;
 			::GetCurrentDocument ()->Build_Emitter_List (instance_list, emitter_name);
-			
+
 			//
 			// Show the emitter property sheet
 			//
 			EmitterPropertySheetClass prop_sheet (instance_list, IDS_EMITTER_PROP_TITLE, this);
-			prop_sheet.DoModal ();			
+			prop_sheet.DoModal ();
 		}
 	}
-	
+
 	// Allow the base class to process this message
 	return CFrameWnd::OnCommand (wParam, lParam);
 }
@@ -3001,7 +3001,7 @@ CMainFrame::OnCmdMsg
 			return TRUE;
 		}
 	}
-	
+
 	// Allow the base class to process this message
 	return CFrameWnd::OnCmdMsg (nID, nCode, pExtra, pHandlerInfo);
 }
@@ -3036,14 +3036,14 @@ CMainFrame::OnLODRecordScreenArea (void)
 		 (prender_obj->Class_ID () == RenderObjClass::CLASSID_HLOD)) {
 
 		CGraphicView *graphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
-		
+
 		//
 		//	TODO - Calculate the real screen size of the LOD and pass it onto
 		// the object.
 		//
 		CameraClass *pcamera = graphic_view->GetCamera ();
 		float screen_size = prender_obj->Get_Screen_Size (*pcamera);
-		
+
 		// Let the LOD know what its new clamp is.
 		int index = ((HLodClass *)prender_obj)->Get_LOD_Level ();
 		((HLodClass *)prender_obj)->Set_Max_Screen_Size (index, screen_size);
@@ -3063,12 +3063,12 @@ CMainFrame::OnLODRecordScreenArea (void)
 ////////////////////////////////////////////////////////////////////////////
 void
 CMainFrame::OnLODIncludeNull (void)
-{	
+{
 	// Make sure the current object is an LOD
 	RenderObjClass *prender_obj = ::GetCurrentDocument ()->GetDisplayedObject ();
 	if ((prender_obj != NULL) &&
 		 (prender_obj->Class_ID () == RenderObjClass::CLASSID_HLOD)) {
-		
+
 		// Toggle the NULL lod
 		bool include = ((HLodClass *)prender_obj)->Is_NULL_Lod_Included ();
 		((HLodClass *)prender_obj)->Include_NULL_Lod (!include);
@@ -3076,7 +3076,7 @@ CMainFrame::OnLODIncludeNull (void)
 		// Update the prototype for this lod to reflect the changes
 		::GetCurrentDocument ()->Update_LOD_Prototype (*((HLodClass *)prender_obj));
 	}
-	
+
 	return ;
 }
 
@@ -3093,12 +3093,12 @@ CMainFrame::OnUpdateLODIncludeNull (CCmdUI *pCmdUI)
 	RenderObjClass *prender_obj = (::GetCurrentDocument ())->GetDisplayedObject ();
 	if ((prender_obj != NULL) &&
 		 (prender_obj->Class_ID () == RenderObjClass::CLASSID_HLOD)) {
-		
+
 		// Check or uncheck the menu option depending on the state of the LOD
 		bool check = ((HLodClass *)prender_obj)->Is_NULL_Lod_Included ();
 		pCmdUI->SetCheck (check);
 	}
-	
+
 	return ;
 }
 
@@ -3110,7 +3110,7 @@ CMainFrame::OnUpdateLODIncludeNull (CCmdUI *pCmdUI)
 ////////////////////////////////////////////////////////////////////////////
 void
 CMainFrame::OnLodPrevLevel (void)
-{	
+{
 	::GetCurrentDocument ()->Switch_LOD (-1);
 	return ;
 }
@@ -3128,7 +3128,7 @@ CMainFrame::OnUpdateLodPrevLevel (CCmdUI *pCmdUI)
 	RenderObjClass *prender_obj = (::GetCurrentDocument ())->GetDisplayedObject ();
 	if ((prender_obj != NULL) &&
 		 (prender_obj->Class_ID () == RenderObjClass::CLASSID_HLOD)) {
-		
+
 		// Enable the menu option if there is a previous lod to display
 		int current_lod = ((HLodClass *)prender_obj)->Get_LOD_Level ();
 		pCmdUI->Enable (current_lod > 0);
@@ -3157,13 +3157,13 @@ CMainFrame::OnLodNextLevel (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateLodNextLevel (CCmdUI *pCmdUI) 
+CMainFrame::OnUpdateLodNextLevel (CCmdUI *pCmdUI)
 {
 	// Make sure the current object is an LOD
 	RenderObjClass *prender_obj = (::GetCurrentDocument ())->GetDisplayedObject ();
 	if ((prender_obj != NULL) &&
 		 (prender_obj->Class_ID () == RenderObjClass::CLASSID_HLOD)) {
-		
+
 		// Enable the menu option if there is another lod to display
 		int current_lod = ((HLodClass *)prender_obj)->Get_LOD_Level ();
 		int lod_count = ((HLodClass *)prender_obj)->Get_LOD_Count ();
@@ -3195,7 +3195,7 @@ CMainFrame::OnLodAutoswitch (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateLodAutoswitch (CCmdUI *pCmdUI) 
+CMainFrame::OnUpdateLodAutoswitch (CCmdUI *pCmdUI)
 {
 	ViewerSceneClass *pscene = ::GetCurrentDocument ()->GetScene ();
 	pCmdUI->SetCheck (pscene->Are_LODs_Switching ());
@@ -3216,9 +3216,9 @@ CMainFrame::OnUpdateMakeMovie (CCmdUI *pCmdUI)
 
 	int atype = pCDataTreeView->GetCurrentSelectionType();
 	bool enabled = ((atype == TypeAnimation) || (atype == TypeCompressedAnimation));
-	
+
 	pCmdUI->Enable ( enabled );
- 
+
 	return ;
 }
 
@@ -3245,7 +3245,7 @@ CMainFrame::OnMakeMovie (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnSaveScreenshot (void) 
+CMainFrame::OnSaveScreenshot (void)
 {
 	// Get the directory where this executable was run from
 	TCHAR filename[MAX_PATH];
@@ -3287,7 +3287,7 @@ void
 CMainFrame::Update_Emitters_List (void)
 {
 	::EnableMenuItem (::GetSubMenu (::GetMenu (m_hWnd), 3), 3, MF_BYPOSITION | MF_ENABLED);
-	HMENU hsub_menu = Get_Emitters_List_Menu ();					
+	HMENU hsub_menu = Get_Emitters_List_Menu ();
 	int index = 0;
 	while (::RemoveMenu (hsub_menu, 0, MF_BYPOSITION)) {
 		//index ++;
@@ -3318,13 +3318,13 @@ CMainFrame::Update_Emitters_List (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnSlideshowDown (void) 
+CMainFrame::OnSlideshowDown (void)
 {
-	CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);		
+	CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);
 	if (data_tree != NULL) {
 		data_tree->Select_Next ();
 	}
-	
+
 	return ;
 }
 
@@ -3335,9 +3335,9 @@ CMainFrame::OnSlideshowDown (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnSlideshowUp (void) 
+CMainFrame::OnSlideshowUp (void)
 {
-	CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);		
+	CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);
 	if (data_tree != NULL) {
 		data_tree->Select_Prev ();
 	}
@@ -3352,7 +3352,7 @@ CMainFrame::OnSlideshowUp (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnAdvancedAnim() 
+CMainFrame::OnAdvancedAnim()
 {
 	// Display the advanced animation control dialog and render the object
 	// with the mix of animations the user specified.
@@ -3367,7 +3367,7 @@ CMainFrame::OnAdvancedAnim()
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateAdvancedAnim(CCmdUI* pCmdUI) 
+CMainFrame::OnUpdateAdvancedAnim(CCmdUI* pCmdUI)
 {
 	// Enable the menu item if the selected hierarchy has at least one
 	// animation we can apply.
@@ -3404,7 +3404,7 @@ CMainFrame::OnCopyScreenSize (void)
 	CameraClass *camera			= graphic_view->GetCamera ();
 	RenderObjClass *render_obj	= ::GetCurrentDocument ()->GetDisplayedObject ();
 	float screen_size				= render_obj->Get_Screen_Size (*camera);
-	
+
 	//
 	//	Convert the float to a string
 	//
@@ -3456,7 +3456,7 @@ CMainFrame::OnListMissingTextures (void)
 	} else {
 		::MessageBox (::AfxGetMainWnd ()->m_hWnd, "No Missing Textures!", "Texture Info", MB_ICONEXCLAMATION | MB_OK);
 	}
-	
+
 	return ;
 }
 
@@ -3603,7 +3603,7 @@ CMainFrame::OnEditPrimitive (void)
 
 		if (render_obj != NULL) {
 			if (render_obj->Class_ID () == RenderObjClass::CLASSID_SPHERE) {
-				
+
 				//
 				// Display the sphere property sheet
 				//
@@ -3615,7 +3615,7 @@ CMainFrame::OnEditPrimitive (void)
 				// Display the ring property sheet
 				//
 				RingPropertySheetClass dialog ((RingRenderObjClass *)render_obj, IDS_RING_PROP_TITLE, this);
-				dialog.DoModal ();				
+				dialog.DoModal ();
 			}
 		}
 	}
@@ -3630,9 +3630,9 @@ CMainFrame::OnEditPrimitive (void)
 //
 ////////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdateEditPrimitive (CCmdUI *pCmdUI) 
+CMainFrame::OnUpdateEditPrimitive (CCmdUI *pCmdUI)
 {
-	CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);		
+	CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);
 	if (data_tree != NULL && data_tree->GetCurrentSelectionType () == TypePrimitives) {
 		pCmdUI->Enable (true);
 	} else {
@@ -3664,7 +3664,7 @@ CMainFrame::OnExportPrimitive (void)
 void
 CMainFrame::OnUpdateExportPrimitive (CCmdUI *pCmdUI)
 {
-	pCmdUI->Enable (m_currentAssetType == TypePrimitives);	
+	pCmdUI->Enable (m_currentAssetType == TypePrimitives);
 	return ;
 }
 
@@ -3674,7 +3674,7 @@ CMainFrame::OnUpdateExportPrimitive (CCmdUI *pCmdUI)
 //  OnKillSceneLight
 //
 ////////////////////////////////////////////////////////////////////////////
-void CMainFrame::OnKillSceneLight() 
+void CMainFrame::OnKillSceneLight()
 {
 	CW3DViewDoc *pdoc	  = ::GetCurrentDocument();
 	LightClass	*plight = pdoc->GetSceneLight ();
@@ -3698,16 +3698,16 @@ void
 CMainFrame::OnPrelitMultipass (void)
 {
 	if (WW3D::Get_Prelit_Mode () != WW3D::PRELIT_MODE_LIGHTMAP_MULTI_PASS) {
-		
+
 		//
 		//	Change the loading mode
 		//
 		WW3D::Set_Prelit_Mode (WW3D::PRELIT_MODE_LIGHTMAP_MULTI_PASS);
-		
+
 		//
 		//	Reload the lightmap models
 		//
-		CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);		
+		CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);
 		data_tree->Reload_Lightmap_Models ();
 		::GetCurrentDocument ()->Reload_Displayed_Object ();
 	}
@@ -3722,7 +3722,7 @@ CMainFrame::OnPrelitMultipass (void)
 //
 //////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdatePrelitMultipass (CCmdUI *pCmdUI) 
+CMainFrame::OnUpdatePrelitMultipass (CCmdUI *pCmdUI)
 {
 	bool enable = (WW3D::Get_Prelit_Mode () == WW3D::PRELIT_MODE_LIGHTMAP_MULTI_PASS);
 	pCmdUI->SetRadio (enable);
@@ -3736,7 +3736,7 @@ CMainFrame::OnUpdatePrelitMultipass (CCmdUI *pCmdUI)
 //
 //////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnPrelitMultitex (void) 
+CMainFrame::OnPrelitMultitex (void)
 {
 	if (WW3D::Get_Prelit_Mode () != WW3D::PRELIT_MODE_LIGHTMAP_MULTI_TEXTURE) {
 
@@ -3748,7 +3748,7 @@ CMainFrame::OnPrelitMultitex (void)
 		//
 		//	Reload the lightmap models
 		//
-		CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);		
+		CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);
 		data_tree->Reload_Lightmap_Models ();
 		::GetCurrentDocument ()->Reload_Displayed_Object ();
 	}
@@ -3763,7 +3763,7 @@ CMainFrame::OnPrelitMultitex (void)
 //
 //////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdatePrelitMultitex (CCmdUI *pCmdUI) 
+CMainFrame::OnUpdatePrelitMultitex (CCmdUI *pCmdUI)
 {
 	bool enable = (WW3D::Get_Prelit_Mode () == WW3D::PRELIT_MODE_LIGHTMAP_MULTI_TEXTURE);
 	pCmdUI->SetRadio (enable);
@@ -3790,7 +3790,7 @@ CMainFrame::OnPrelitVertex (void)
 		//
 		//	Reload the lightmap models
 		//
-		CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);		
+		CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0);
 		data_tree->Reload_Lightmap_Models ();
 		::GetCurrentDocument ()->Reload_Displayed_Object ();
 	}
@@ -3805,7 +3805,7 @@ CMainFrame::OnPrelitVertex (void)
 //
 //////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnUpdatePrelitVertex (CCmdUI *pCmdUI) 
+CMainFrame::OnUpdatePrelitVertex (CCmdUI *pCmdUI)
 {
 	bool enable = (WW3D::Get_Prelit_Mode () == WW3D::PRELIT_MODE_VERTEX);
 	pCmdUI->SetRadio (enable);
@@ -3820,7 +3820,7 @@ CMainFrame::OnUpdatePrelitVertex (CCmdUI *pCmdUI)
 //
 //////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnAddToLineup (void) 
+CMainFrame::OnAddToLineup (void)
 {
 	// Display a dialog that will let the user choose a render object
 	// to add to the current scene. The reason I call it a lineup is
@@ -3847,7 +3847,7 @@ CMainFrame::OnAddToLineup (void)
 		{
 			// Tell the user that the render object could not be created.
 			CString msg;
-			msg.Format("Unable to create render object '%s'!", dlg.m_Object);
+			msg.Format("Unable to create render object '%s'!", static_cast<const char*>(dlg.m_Object));
 			::AfxMessageBox(msg, MB_OK | MB_ICONINFORMATION);
 		}
 	}
@@ -3859,7 +3859,7 @@ CMainFrame::OnAddToLineup (void)
 //  OnUpdateAddToLineup
 //
 //////////////////////////////////////////////////////////////////////////
-void CMainFrame::OnUpdateAddToLineup(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateAddToLineup(CCmdUI* pCmdUI)
 {
 	bool enable = false;
 
@@ -3913,7 +3913,7 @@ CMainFrame::OnImportFacialAnims (void)
 		//
 		// Ask the user what files they want to import
 		//
-		if (dialog.DoModal () == IDOK) {       
+		if (dialog.DoModal () == IDOK) {
 			CWaitCursor wait_cursor;
 
 
@@ -3932,13 +3932,13 @@ CMainFrame::OnImportFacialAnims (void)
 			// Re-load the data list to include all new assets
 			//
 			CDataTreeView *data_tree = doc->GetDataTreeView ();
-			if (data_tree != NULL) {            
+			if (data_tree != NULL) {
 				data_tree->LoadAssetsIntoTree ();
 			}
 		}
 	}
 
-	return ;	
+	return ;
 }
 
 
@@ -3952,7 +3952,7 @@ CMainFrame::OnUpdateImportFacialAnims (CCmdUI *pCmdUI)
 {
 	CW3DViewDoc *doc = ::GetCurrentDocument ();
 	if (doc != NULL) {
-		
+
 		//
 		// Enable this command only if the user has an htree
 		// currently selected
@@ -3974,11 +3974,11 @@ void
 CMainFrame::OnRestrictAnims (void)
 {
 	CDataTreeView *data_tree = ::GetCurrentDocument ()->GetDataTreeView ();
-	if (data_tree != NULL) {            
+	if (data_tree != NULL) {
 		bool enabled = data_tree->Are_Anims_Restricted ();
 		data_tree->Restrict_Anims (!enabled);
 	}
-	
+
 	return ;
 }
 
@@ -3994,10 +3994,10 @@ CMainFrame::OnUpdateRestrictAnims (CCmdUI *pCmdUI)
 	bool check = true;
 
 	CDataTreeView *data_tree = ::GetCurrentDocument ()->GetDataTreeView ();
-	if (data_tree != NULL) {            
+	if (data_tree != NULL) {
 		check = data_tree->Are_Anims_Restricted ();
 	}
-	
+
 	pCmdUI->SetCheck (check);
 	return ;
 }
@@ -4013,7 +4013,7 @@ CMainFrame::OnBindSubobjectLod (void)
 {
 	CW3DViewDoc *doc = (CW3DViewDoc *)GetActiveDocument ();
 	if (doc != NULL && doc->GetDisplayedObject () != NULL) {
-		
+
 		//
 		//	Toggle the state of the currently displayed object
 		//
@@ -4022,7 +4022,7 @@ CMainFrame::OnBindSubobjectLod (void)
 		render_obj->Set_Sub_Objects_Match_LOD (!is_enabled);
 		doc->Update_Aggregate_Prototype (*render_obj);
 	}
-	
+
 	return ;
 }
 
@@ -4037,10 +4037,10 @@ CMainFrame::OnUpdateBindSubobjectLod (CCmdUI *pCmdUI)
 {
 	CW3DViewDoc *doc = (CW3DViewDoc *)GetActiveDocument ();
 	if (doc != NULL && doc->GetDisplayedObject () != NULL) {
-		
+
 		//
 		//	Set the check if we are currenly forcing sub object matching
-		//		
+		//
 		RenderObjClass *render_obj = doc->GetDisplayedObject ();
 		bool is_enabled = (render_obj->Is_Sub_Objects_Match_LOD_Enabled () != 0);
 		pCmdUI->SetCheck (is_enabled);
@@ -4059,7 +4059,7 @@ void
 CMainFrame::OnSetCameraDistance (void)
 {
 	CameraDistanceDialogClass dialog (this);
-	dialog.DoModal ();	
+	dialog.DoModal ();
 	return ;
 }
 
@@ -4070,7 +4070,7 @@ CMainFrame::OnSetCameraDistance (void)
 //
 //////////////////////////////////////////////////////////////////////////
 void
-CMainFrame::OnObjectAlternateMaterials (void) 
+CMainFrame::OnObjectAlternateMaterials (void)
 {
 	::GetCurrentDocument ()->Toggle_Alternate_Materials ();
 	return ;
@@ -4119,7 +4119,7 @@ CMainFrame::OnEditSoundObject (void)
 			dialog.DoModal ();
 		}
 	}
-	
+
 	return ;
 }
 
@@ -4173,7 +4173,7 @@ CMainFrame::OnWireframeMode (void)
 {
 	ViewerSceneClass *scene = ::GetCurrentDocument ()->GetScene ();
 
-	bool enable = (scene->Get_Polygon_Mode () != SceneClass::LINE);	
+	bool enable = (scene->Get_Polygon_Mode () != SceneClass::LINE);
 	scene->Set_Polygon_Mode (enable ? SceneClass::LINE : SceneClass::FILL);
 	return ;
 }
@@ -4198,8 +4198,8 @@ CMainFrame::OnUpdateWireframeMode (CCmdUI *pCmdUI)
 //  OnToggleSorting
 //
 //////////////////////////////////////////////////////////////////////////
-void 
-CMainFrame::OnToggleSorting() 
+void
+CMainFrame::OnToggleSorting()
 {
 	// Toggle the polygon sorting state.
 	bool sorting=!WW3D::Is_Sorting_Enabled();
@@ -4215,8 +4215,8 @@ CMainFrame::OnToggleSorting()
 //  OnUpdateToggleSorting
 //
 //////////////////////////////////////////////////////////////////////////
-void 
-CMainFrame::OnUpdateToggleSorting(CCmdUI* pCmdUI) 
+void
+CMainFrame::OnUpdateToggleSorting(CCmdUI* pCmdUI)
 {
 	// Check the menu item if sorting is enabled, clear it otherwise.
 	pCmdUI->SetCheck(WW3D::Is_Sorting_Enabled() ? 1 : 0);
@@ -4227,12 +4227,12 @@ CMainFrame::OnUpdateToggleSorting(CCmdUI* pCmdUI)
 //  OnCameraBonePosX
 //
 //////////////////////////////////////////////////////////////////////////
-void 
-CMainFrame::OnCameraBonePosX() 
+void
+CMainFrame::OnCameraBonePosX()
 {
    CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
 	if (pCGraphicView != NULL) {
-		pCGraphicView->Set_Camera_Bone_Pos_X(!pCGraphicView->Is_Camera_Bone_Pos_X());	
+		pCGraphicView->Set_Camera_Bone_Pos_X(!pCGraphicView->Is_Camera_Bone_Pos_X());
 	}
 }
 
@@ -4242,8 +4242,8 @@ CMainFrame::OnCameraBonePosX()
 //  OnUpdateCameraBonePosX
 //
 //////////////////////////////////////////////////////////////////////////
-void 
-CMainFrame::OnUpdateCameraBonePosX(CCmdUI* pCmdUI) 
+void
+CMainFrame::OnUpdateCameraBonePosX(CCmdUI* pCmdUI)
 {
    CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1);
 	if (pCGraphicView != NULL) {
@@ -4252,7 +4252,7 @@ CMainFrame::OnUpdateCameraBonePosX(CCmdUI* pCmdUI)
 }
 
 
-void CMainFrame::OnViewPatchGapFill() 
+void CMainFrame::OnViewPatchGapFill()
 {
 	// If gap-filling is on, turn it off. Otherwise turn it on.
 	if (WW3D::Get_NPatches_Gap_Filling_Mode() == WW3D::NPATCHES_GAP_FILLING_ENABLED)
@@ -4267,14 +4267,14 @@ void CMainFrame::OnViewPatchGapFill()
 	}
 }
 
-void CMainFrame::OnUpdateViewPatchGapFill(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewPatchGapFill(CCmdUI* pCmdUI)
 {
 	// Check the menu item if gap-filling is turned on.
 	bool enabled = (WW3D::Get_NPatches_Gap_Filling_Mode() == WW3D::NPATCHES_GAP_FILLING_ENABLED);
 	pCmdUI->SetCheck((int)enabled);
 }
 
-void CMainFrame::OnViewSubdivision1() 
+void CMainFrame::OnViewSubdivision1()
 {
 	// Set the N-Patches Subdivision Level to 1.
 	WW3D::Set_NPatches_Level(1);
@@ -4283,14 +4283,14 @@ void CMainFrame::OnViewSubdivision1()
 	::AfxGetApp()->WriteProfileInt("Config", "NPatchesSubdivision", 1);
 }
 
-void CMainFrame::OnUpdateViewSubdivision1(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewSubdivision1(CCmdUI* pCmdUI)
 {
 	// Check the menu item if the current N-Patch Subdivision Level is 1.
 	bool checked = (WW3D::Get_NPatches_Level() == 1);
 	pCmdUI->SetCheck((int)checked);
 }
 
-void CMainFrame::OnViewSubdivision2() 
+void CMainFrame::OnViewSubdivision2()
 {
 	// Set the N-Patches Subdivision Level to 2.
 	WW3D::Set_NPatches_Level(2);
@@ -4299,14 +4299,14 @@ void CMainFrame::OnViewSubdivision2()
 	::AfxGetApp()->WriteProfileInt("Config", "NPatchesSubdivision", 2);
 }
 
-void CMainFrame::OnUpdateViewSubdivision2(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewSubdivision2(CCmdUI* pCmdUI)
 {
 	// Check the menu item if the current N-Patch Subdivision Level is 2.
 	bool checked = (WW3D::Get_NPatches_Level() == 2);
 	pCmdUI->SetCheck((int)checked);
 }
 
-void CMainFrame::OnViewSubdivision3() 
+void CMainFrame::OnViewSubdivision3()
 {
 	// Set the N-Patches Subdivision Level to 3.
 	WW3D::Set_NPatches_Level(3);
@@ -4315,14 +4315,14 @@ void CMainFrame::OnViewSubdivision3()
 	::AfxGetApp()->WriteProfileInt("Config", "NPatchesSubdivision", 3);
 }
 
-void CMainFrame::OnUpdateViewSubdivision3(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewSubdivision3(CCmdUI* pCmdUI)
 {
 	// Check the menu item if the current N-Patch Subdivision Level is 3.
 	bool checked = (WW3D::Get_NPatches_Level() == 3);
 	pCmdUI->SetCheck((int)checked);
 }
 
-void CMainFrame::OnViewSubdivision4() 
+void CMainFrame::OnViewSubdivision4()
 {
 	// Set the N-Patches Subdivision Level to 4.
 	WW3D::Set_NPatches_Level(4);
@@ -4331,14 +4331,14 @@ void CMainFrame::OnViewSubdivision4()
 	::AfxGetApp()->WriteProfileInt("Config", "NPatchesSubdivision", 4);
 }
 
-void CMainFrame::OnUpdateViewSubdivision4(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewSubdivision4(CCmdUI* pCmdUI)
 {
 	// Check the menu item if the current N-Patch Subdivision Level is 4.
 	bool checked = (WW3D::Get_NPatches_Level() == 4);
 	pCmdUI->SetCheck((int)checked);
 }
 
-void CMainFrame::OnViewSubdivision5() 
+void CMainFrame::OnViewSubdivision5()
 {
 	// Set the N-Patches Subdivision Level to 5.
 	WW3D::Set_NPatches_Level(5);
@@ -4347,14 +4347,14 @@ void CMainFrame::OnViewSubdivision5()
 	::AfxGetApp()->WriteProfileInt("Config", "NPatchesSubdivision", 5);
 }
 
-void CMainFrame::OnUpdateViewSubdivision5(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewSubdivision5(CCmdUI* pCmdUI)
 {
 	// Check the menu item if the current N-Patch Subdivision Level is 5.
 	bool checked = (WW3D::Get_NPatches_Level() == 5);
 	pCmdUI->SetCheck((int)checked);
 }
 
-void CMainFrame::OnViewSubdivision6() 
+void CMainFrame::OnViewSubdivision6()
 {
 	// Set the N-Patches Subdivision Level to 6.
 	WW3D::Set_NPatches_Level(6);
@@ -4363,14 +4363,14 @@ void CMainFrame::OnViewSubdivision6()
 	::AfxGetApp()->WriteProfileInt("Config", "NPatchesSubdivision", 6);
 }
 
-void CMainFrame::OnUpdateViewSubdivision6(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewSubdivision6(CCmdUI* pCmdUI)
 {
 	// Check the menu item if the current N-Patch Subdivision Level is 6.
 	bool checked = (WW3D::Get_NPatches_Level() == 6);
 	pCmdUI->SetCheck((int)checked);
 }
 
-void CMainFrame::OnViewSubdivision7() 
+void CMainFrame::OnViewSubdivision7()
 {
 	// Set the N-Patches Subdivision Level to 7.
 	WW3D::Set_NPatches_Level(7);
@@ -4379,14 +4379,14 @@ void CMainFrame::OnViewSubdivision7()
 	::AfxGetApp()->WriteProfileInt("Config", "NPatchesSubdivision", 7);
 }
 
-void CMainFrame::OnUpdateViewSubdivision7(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewSubdivision7(CCmdUI* pCmdUI)
 {
 	// Check the menu item if the current N-Patch Subdivision Level is 7.
 	bool checked = (WW3D::Get_NPatches_Level() == 7);
 	pCmdUI->SetCheck((int)checked);
 }
 
-void CMainFrame::OnViewSubdivision8() 
+void CMainFrame::OnViewSubdivision8()
 {
 	// Set the N-Patches Subdivision Level to 8.
 	WW3D::Set_NPatches_Level(8);
@@ -4395,14 +4395,14 @@ void CMainFrame::OnViewSubdivision8()
 	::AfxGetApp()->WriteProfileInt("Config", "NPatchesSubdivision", 8);
 }
 
-void CMainFrame::OnUpdateViewSubdivision8(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewSubdivision8(CCmdUI* pCmdUI)
 {
 	// Check the menu item if the current N-Patch Subdivision Level is 8.
 	bool checked = (WW3D::Get_NPatches_Level() == 8);
 	pCmdUI->SetCheck((int)checked);
 }
 
-void CMainFrame::OnMungeSortOnLoad() 
+void CMainFrame::OnMungeSortOnLoad()
 {
 	bool setting=!WW3D::Is_Munge_Sort_On_Load_Enabled();
 	WW3D::Enable_Munge_Sort_On_Load(setting);
@@ -4410,12 +4410,12 @@ void CMainFrame::OnMungeSortOnLoad()
 	::AfxGetApp()->WriteProfileInt("Config", "MungeSortOnLoad", setting?1:0);
 }
 
-void CMainFrame::OnUpdateMungeSortOnLoad(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateMungeSortOnLoad(CCmdUI* pCmdUI)
 {
-	pCmdUI->SetCheck(WW3D::Is_Munge_Sort_On_Load_Enabled() ? 1 : 0);	
+	pCmdUI->SetCheck(WW3D::Is_Munge_Sort_On_Load_Enabled() ? 1 : 0);
 }
 
-void CMainFrame::OnEnableGammaCorrection() 
+void CMainFrame::OnEnableGammaCorrection()
 {
 	int setting=::AfxGetApp()->GetProfileInt("Config","EnableGamma",0);
 	bool enable_gamma=(setting?true:false);
@@ -4432,13 +4432,13 @@ void CMainFrame::OnEnableGammaCorrection()
 	}
 }
 
-void CMainFrame::OnUpdateEnableGammaCorrection(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateEnableGammaCorrection(CCmdUI* pCmdUI)
 {
 	int setting=::AfxGetApp()->GetProfileInt("Config","EnableGamma",0);
 	pCmdUI->SetCheck(setting);
 }
 
-void CMainFrame::OnSetGamma() 
+void CMainFrame::OnSetGamma()
 {
 	int setting=::AfxGetApp()->GetProfileInt("Config","EnableGamma",0);
 	if (setting) {
@@ -4459,6 +4459,6 @@ void
 CMainFrame::OnEditAnimatedSoundsOptions (void)
 {
 	AnimatedSoundOptionsDialogClass dialog (this);
-	dialog.DoModal ();	
+	dialog.DoModal ();
 	return ;
 }
diff --git a/Core/Tools/W3DView/MainFrm.h b/Core/Tools/W3DView/MainFrm.h
index 9549096bfb8..67652f0a100 100644
--- a/Core/Tools/W3DView/MainFrm.h
+++ b/Core/Tools/W3DView/MainFrm.h
@@ -20,15 +20,10 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_MAINFRM_H__2BB39E2F_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
-#define AFX_MAINFRM_H__2BB39E2F_5D3A_11D2_9FC6_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
-#include "DataTreeView.H"
-#include "Toolbar.H"
+#include "DataTreeView.h"
+#include "Toolbar.h"
 
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
@@ -249,7 +244,7 @@ class CMainFrame : public CFrameWnd
 	DECLARE_MESSAGE_MAP()
 
 public:
-	
+
 	//////////////////////////////////////////////////////////////////////
 	//	Public methods
 	//////////////////////////////////////////////////////////////////////
@@ -272,7 +267,7 @@ class CMainFrame : public CFrameWnd
 	void	Update_Emitters_List (void);
 
 protected:
-	
+
 	//////////////////////////////////////////////////////////////////////
 	//	Protected methods
 	//////////////////////////////////////////////////////////////////////
@@ -296,5 +291,3 @@ class CMainFrame : public CFrameWnd
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MAINFRM_H__2BB39E2F_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/MeshPropPage.cpp b/Core/Tools/W3DView/MeshPropPage.cpp
index a34741d966b..701ead89ed8 100644
--- a/Core/Tools/W3DView/MeshPropPage.cpp
+++ b/Core/Tools/W3DView/MeshPropPage.cpp
@@ -19,13 +19,13 @@
 // MeshPropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "W3DView.h"
 #include "MeshPropPage.h"
-#include "RendObj.H"
-#include "AssetMgr.H"
-#include "Mesh.H"
-#include "MeshMdl.H"
+#include "rendobj.h"
+#include "assetmgr.h"
+#include "mesh.h"
+#include "meshmdl.h"
 #include "w3d_file.h"
 
 #ifdef RTS_DEBUG
@@ -97,17 +97,17 @@ CMeshPropPage::OnInitDialog (void)
 {
 	// Allow the base class to process this message
     CPropertyPage::OnInitDialog();
-	
+
     if (m_stringMeshName.GetLength () > 0)
     {
         // Get a pointer to the mesh object from the asset manager
         MeshClass *pCMesh = (MeshClass *)WW3DAssetManager::Get_Instance()->Create_Render_Obj (m_stringMeshName);
-        
+
         ASSERT (pCMesh);
         if (pCMesh)
         {
             CString stringDesc;
-            stringDesc.Format (IDS_MESH_PROP_DESC, m_stringMeshName);
+            stringDesc.Format (IDS_MESH_PROP_DESC, static_cast<const char*>(m_stringMeshName));
 
             // Put the description onto the dialog
             SetDlgItemText (IDC_DESCRIPTION, stringDesc);
@@ -154,7 +154,7 @@ CMeshPropPage::OnInitDialog (void)
             {
                 SendDlgItemMessage (IDC_COLLISION_TYPE_PHYSICAL, BM_SETCHECK, (WPARAM)TRUE);
             }
-            
+
             // Is this collision type projectile?
             if ((dwCollisionFlags & W3D_MESH_FLAG_COLLISION_TYPE_PROJECTILE) == W3D_MESH_FLAG_COLLISION_TYPE_PROJECTILE)
             {
@@ -174,15 +174,15 @@ CMeshPropPage::OnInitDialog (void)
     }
 
     GetParent ()->GetDlgItem (IDOK)->ShowWindow (SW_HIDE);
-    GetParent ()->GetDlgItem (IDCANCEL)->SetWindowText ("Close");	
+    GetParent ()->GetDlgItem (IDCANCEL)->SetWindowText ("Close");
 	return TRUE;
 }
 
 
-void CMeshPropPage::OnClose() 
+void CMeshPropPage::OnClose()
 {
 	// TODO: Add your message handler code here and/or call default
-	
+
 	CPropertyPage::OnClose();
     return ;
 }
diff --git a/Core/Tools/W3DView/MeshPropPage.h b/Core/Tools/W3DView/MeshPropPage.h
index da080b8d6c8..4286b4ea337 100644
--- a/Core/Tools/W3DView/MeshPropPage.h
+++ b/Core/Tools/W3DView/MeshPropPage.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_MESHPROPPAGE_H__FB40246F_5DFB_11D2_9FC7_00104B791122__INCLUDED_)
-#define AFX_MESHPROPPAGE_H__FB40246F_5DFB_11D2_9FC7_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // MeshPropPage.h : header file
 //
 
@@ -33,7 +29,7 @@ class CMeshPropPage : public CPropertyPage
 	DECLARE_DYNCREATE(CMeshPropPage)
 
 // Construction
-public:	
+public:
     CMeshPropPage (const CString &stringMeshName);
 	~CMeshPropPage ();
 
@@ -70,5 +66,3 @@ class CMeshPropPage : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MESHPROPPAGE_H__FB40246F_5DFB_11D2_9FC7_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/OpacitySettingsDialog.cpp b/Core/Tools/W3DView/OpacitySettingsDialog.cpp
index 2f5716af5db..1651831971b 100644
--- a/Core/Tools/W3DView/OpacitySettingsDialog.cpp
+++ b/Core/Tools/W3DView/OpacitySettingsDialog.cpp
@@ -31,10 +31,10 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "OpacitySettingsDialog.h"
-#include "ColorBar.H"
+#include "ColorBar.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -91,7 +91,7 @@ BOOL
 OpacitySettingsDialogClass::OnInitDialog (void)
 {
 	CDialog::OnInitDialog();
-	
+
 	m_OpacityBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_OPACITY_BAR));
 	ASSERT (m_OpacityBar);
 
diff --git a/Core/Tools/W3DView/OpacitySettingsDialog.h b/Core/Tools/W3DView/OpacitySettingsDialog.h
index 8b3fda84ec1..f362a012e5b 100644
--- a/Core/Tools/W3DView/OpacitySettingsDialog.h
+++ b/Core/Tools/W3DView/OpacitySettingsDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_OPACITYSETTINGSDIALOG_H__52B0C804_0D48_11D3_A031_00104B791122__INCLUDED_)
-#define AFX_OPACITYSETTINGSDIALOG_H__52B0C804_0D48_11D3_A031_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // OpacitySettingsDialog.h : header file
 //
 
@@ -67,7 +63,7 @@ class OpacitySettingsDialogClass : public CDialog
 		//	Public methods
 		////////////////////////////////////////////////////////////////
 		float					Get_Opacity (void) const	{ return m_Opacity; }
-		
+
 	private:
 
 		////////////////////////////////////////////////////////////////
@@ -79,5 +75,3 @@ class OpacitySettingsDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OPACITYSETTINGSDIALOG_H__52B0C804_0D48_11D3_A031_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/OpacityVectorDialog.cpp b/Core/Tools/W3DView/OpacityVectorDialog.cpp
index 6773d4f4b0d..39401fe94c4 100644
--- a/Core/Tools/W3DView/OpacityVectorDialog.cpp
+++ b/Core/Tools/W3DView/OpacityVectorDialog.cpp
@@ -19,14 +19,14 @@
 // OpacityVectorDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "OpacityVectorDialog.h"
 #include "wwmath.h"
 #include "vector3.h"
 #include "sphereobj.h"
 #include "ringobj.h"
-#include "colorbar.h"
+#include "ColorBar.h"
 #include "euler.h"
 #include "matrix3.h"
 
@@ -89,7 +89,7 @@ BOOL
 OpacityVectorDialogClass::OnInitDialog (void)
 {
 	CDialog::OnInitDialog();
-	
+
 	m_OpacityBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_OPACITY_BAR));
 	ASSERT (m_OpacityBar);
 
@@ -99,7 +99,7 @@ OpacityVectorDialogClass::OnInitDialog (void)
 	m_OpacityBar->Set_Range (0, 10);
 	m_OpacityBar->Modify_Point (0, 0, 255, 255, 255);
 	m_OpacityBar->Insert_Point (1, 10, 0, 0, 0);
-	
+
 	float value =  ::atan (((m_Value.intensity / 10.0F) * 11.0F)) / DEG_TO_RAD (84.5) * 10.0F;
 	m_OpacityBar->Set_Selection_Pos (value);
 
@@ -150,7 +150,7 @@ OpacityVectorDialogClass::OnInitDialog (void)
 	y_rot = WWMath::Wrap (y_rot, 0, 360);
 	z_rot = WWMath::Wrap (z_rot, 0, 360);*/
 
-	
+
 #ifdef ALLOW_TEMPORARIES
 	Matrix3D rotation = Build_Matrix3D (m_Value.angle);
 #else
@@ -226,12 +226,12 @@ OpacityVectorDialogClass::Update_Value (void)
 	rot_mat.Rotate_Z (z_rot);
 
 	value.angle = ::Build_Quaternion (rot_mat);
-	
+
 	float percent = ::tan ((m_OpacityBar->Get_Selection_Pos () / 10.0F) * DEG_TO_RAD (84.5)) / 11.0F;
 	percent = min (1.0F, percent);
 	percent = max (0.0F, percent);
 
-	value.intensity = 10.0F * percent;	
+	value.intensity = 10.0F * percent;
 	return value;
 }
 
@@ -245,7 +245,7 @@ void
 OpacityVectorDialogClass::Update_Object (const AlphaVectorStruct &value)
 {
 	if (m_RenderObj != NULL) {
-		
+
 		//
 		//	Determine what type of object this is
 		//
@@ -256,7 +256,7 @@ OpacityVectorDialogClass::Update_Object (const AlphaVectorStruct &value)
 				//
 				//	Update the key with the new vector
 				//
-				
+
 				SphereVectorChannelClass &vector_channel = ((SphereRenderObjClass *)m_RenderObj)->Get_Vector_Channel ();
 				vector_channel.Set_Key_Value (m_KeyIndex, value);
 
@@ -298,13 +298,13 @@ OpacityVectorDialogClass::OnHScroll
 	UINT				nSBCode,
 	UINT				nPos,
 	CScrollBar *	pScrollBar
-) 
+)
 {
 	//
 	//	Update the object
 	//
 	Update_Object ();
-	
+
 	CDialog::OnHScroll(nSBCode, nPos, pScrollBar);
 	return ;
 }
@@ -321,7 +321,7 @@ OpacityVectorDialogClass::OnNotify
 	WPARAM wParam,
 	LPARAM lParam,
 	LRESULT *pResult
-) 
+)
 {
 	CBR_NMHDR *color_bar_hdr = (CBR_NMHDR *)lParam;
 
@@ -334,13 +334,13 @@ OpacityVectorDialogClass::OnNotify
 		{
 			//
 			// Update the object
-			//			
+			//
 			if (color_bar_hdr->hdr.code == CBRN_SEL_CHANGED) {
 				Update_Object ();
 			}
 		}
 		break;
 	}
-		
+
 	return CDialog::OnNotify (wParam, lParam, pResult);
 }
diff --git a/Core/Tools/W3DView/OpacityVectorDialog.h b/Core/Tools/W3DView/OpacityVectorDialog.h
index 36fdde50502..d2cc35fd877 100644
--- a/Core/Tools/W3DView/OpacityVectorDialog.h
+++ b/Core/Tools/W3DView/OpacityVectorDialog.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_OPACITYVECTORDIALOG_H__E86BBE8C_F527_11D3_A08F_00104B791122__INCLUDED_)
-#define AFX_OPACITYVECTORDIALOG_H__E86BBE8C_F527_11D3_A08F_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "resource.h"
 #include "sphereobj.h"
@@ -87,19 +82,17 @@ class OpacityVectorDialogClass : public CDialog
 	void						Update_Object (const AlphaVectorStruct &value);
 	void						Update_Object (void);
 	AlphaVectorStruct		Update_Value (void);
-	
+
 private:
 
 	////////////////////////////////////////////////////////////////
 	//	Private member data
 	////////////////////////////////////////////////////////////////
 	ColorBarClass *		m_OpacityBar;
-	RenderObjClass *		m_RenderObj;	
+	RenderObjClass *		m_RenderObj;
 	AlphaVectorStruct		m_Value;
 	int						m_KeyIndex;
 };
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OPACITYVECTORDIALOG_H__E86BBE8C_F527_11D3_A08F_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.cpp b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.cpp
index f57e8d29dbd..06aab5ef4e5 100644
--- a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.cpp
+++ b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.cpp
@@ -19,10 +19,10 @@
 // ParticleBlurTimeKeyDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "ParticleBlurTimeKeyDialog.h"
-#include "Utils.H"
+#include "Utils.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -62,32 +62,32 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ParticleBlurTimeKeyDialogClass message handlers
 
-BOOL ParticleBlurTimeKeyDialogClass::OnInitDialog() 
+BOOL ParticleBlurTimeKeyDialogClass::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	Initialize_Spinner (m_BlurTimeSpin, m_BlurTime, -1024, 1024);
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-BOOL ParticleBlurTimeKeyDialogClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL ParticleBlurTimeKeyDialogClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	//
 	//	Update the spinner control if necessary
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
-void ParticleBlurTimeKeyDialogClass::OnOk2() 
+void ParticleBlurTimeKeyDialogClass::OnOk2()
 {
 	m_BlurTime = GetDlgItemFloat(m_hWnd,IDC_BLUR_TIME_EDIT);
-	CDialog::OnOK();	
+	CDialog::OnOK();
 }
diff --git a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h
index fa67d02dec9..2339682a1e4 100644
--- a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h
+++ b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_PARTICLEBLURTIMEKEYDIALOG_H__FCCD7E5F_E09A_450E_A1A4_0E401CC00C3B__INCLUDED_)
-#define AFX_PARTICLEBLURTIMEKEYDIALOG_H__FCCD7E5F_E09A_450E_A1A4_0E401CC00C3B__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ParticleBlurTimeKeyDialog.h : header file
 //
 
@@ -60,7 +56,7 @@ class ParticleBlurTimeKeyDialogClass : public CDialog
 	DECLARE_MESSAGE_MAP()
 
 public:
-	
+
 	/////////////////////////////////////////////////////////////
 	//	Public methods
 	/////////////////////////////////////////////////////////////
@@ -76,5 +72,3 @@ class ParticleBlurTimeKeyDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PARTICLEBLURTIMEKEYDIALOG_H__FCCD7E5F_E09A_450E_A1A4_0E401CC00C3B__INCLUDED_)
diff --git a/Core/Tools/W3DView/ParticleFrameKeyDialog.cpp b/Core/Tools/W3DView/ParticleFrameKeyDialog.cpp
index cc52540d87f..9a0c7da7a4c 100644
--- a/Core/Tools/W3DView/ParticleFrameKeyDialog.cpp
+++ b/Core/Tools/W3DView/ParticleFrameKeyDialog.cpp
@@ -19,10 +19,10 @@
 // ParticleFrameKeyDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "ParticleFrameKeyDialog.h"
-#include "Utils.H"
+#include "Utils.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -34,7 +34,7 @@ static char THIS_FILE[] = __FILE__;
 // ParticleFrameKeyDialogClass dialog
 
 
-ParticleFrameKeyDialogClass::ParticleFrameKeyDialogClass(float frame,CWnd* pParent /*=NULL*/) : 
+ParticleFrameKeyDialogClass::ParticleFrameKeyDialogClass(float frame,CWnd* pParent /*=NULL*/) :
 	CDialog(ParticleFrameKeyDialogClass::IDD, pParent),
 	m_Frame(frame)
 {
@@ -62,31 +62,31 @@ END_MESSAGE_MAP()
 // ParticleFrameKeyDialogClass message handlers
 
 
-BOOL ParticleFrameKeyDialogClass::OnInitDialog() 
+BOOL ParticleFrameKeyDialogClass::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	Initialize_Spinner (m_FrameSpin, m_Frame, -1024, 1024);
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
 
-void ParticleFrameKeyDialogClass::OnOK() 
+void ParticleFrameKeyDialogClass::OnOK()
 {
 	m_Frame = GetDlgItemFloat(m_hWnd,IDC_FRAME_EDIT);
 	CDialog::OnOK();
 }
 
-BOOL ParticleFrameKeyDialogClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL ParticleFrameKeyDialogClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	//
 	//	Update the spinner control if necessary
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 	}
 
diff --git a/Core/Tools/W3DView/ParticleFrameKeyDialog.h b/Core/Tools/W3DView/ParticleFrameKeyDialog.h
index 7fa83f80cd3..03f045ec1ed 100644
--- a/Core/Tools/W3DView/ParticleFrameKeyDialog.h
+++ b/Core/Tools/W3DView/ParticleFrameKeyDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_PARTICLEFRAMEKEYDIALOG_H__43470F6A_86E2_44CF_8ED9_EE9B74D35908__INCLUDED_)
-#define AFX_PARTICLEFRAMEKEYDIALOG_H__43470F6A_86E2_44CF_8ED9_EE9B74D35908__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ParticleFrameKeyDialog.h : header file
 //
 
@@ -60,7 +56,7 @@ class ParticleFrameKeyDialogClass : public CDialog
 	DECLARE_MESSAGE_MAP()
 
 public:
-	
+
 	/////////////////////////////////////////////////////////////
 	//	Public methods
 	/////////////////////////////////////////////////////////////
@@ -77,5 +73,3 @@ class ParticleFrameKeyDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PARTICLEFRAMEKEYDIALOG_H__43470F6A_86E2_44CF_8ED9_EE9B74D35908__INCLUDED_)
diff --git a/Core/Tools/W3DView/ParticleRotationKeyDialog.cpp b/Core/Tools/W3DView/ParticleRotationKeyDialog.cpp
index 99caef21a4e..7607c77cec7 100644
--- a/Core/Tools/W3DView/ParticleRotationKeyDialog.cpp
+++ b/Core/Tools/W3DView/ParticleRotationKeyDialog.cpp
@@ -19,10 +19,10 @@
 // ParticleRotationKeyDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "ParticleRotationKeyDialog.h"
-#include "Utils.H"
+#include "Utils.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -35,7 +35,7 @@ static char THIS_FILE[] = __FILE__;
 // ParticleRotationKeyDialogClass constructor
 //
 /////////////////////////////////////////////////////////////////////////////
-ParticleRotationKeyDialogClass::ParticleRotationKeyDialogClass(float rotation,CWnd* pParent /*=NULL*/) : 
+ParticleRotationKeyDialogClass::ParticleRotationKeyDialogClass(float rotation,CWnd* pParent /*=NULL*/) :
 	CDialog(ParticleRotationKeyDialogClass::IDD, pParent),
 	m_Rotation(rotation)
 {
@@ -73,13 +73,13 @@ END_MESSAGE_MAP()
 // OnInitDialog
 //
 /////////////////////////////////////////////////////////////////////////////
-BOOL 
-ParticleRotationKeyDialogClass::OnInitDialog() 
+BOOL
+ParticleRotationKeyDialogClass::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	Initialize_Spinner (m_RotationSpin, m_Rotation, -10000, 10000);
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -89,8 +89,8 @@ ParticleRotationKeyDialogClass::OnInitDialog()
 // OnOk
 //
 /////////////////////////////////////////////////////////////////////////////
-void 
-ParticleRotationKeyDialogClass::OnOK() 
+void
+ParticleRotationKeyDialogClass::OnOK()
 {
 	m_Rotation = GetDlgItemFloat (m_hWnd, IDC_ROTATION_EDIT);
 	CDialog::OnOK();
@@ -102,14 +102,14 @@ ParticleRotationKeyDialogClass::OnOK()
 // OnNotify
 //
 /////////////////////////////////////////////////////////////////////////////
-BOOL ParticleRotationKeyDialogClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL ParticleRotationKeyDialogClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	//
 	//	Update the spinner control if necessary
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 	}
 
diff --git a/Core/Tools/W3DView/ParticleRotationKeyDialog.h b/Core/Tools/W3DView/ParticleRotationKeyDialog.h
index 9b02c1b6377..37df1e0f41e 100644
--- a/Core/Tools/W3DView/ParticleRotationKeyDialog.h
+++ b/Core/Tools/W3DView/ParticleRotationKeyDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_PARTICLEROTATIONKEYDIALOG_H__2B0B9CFD_19BC_4910_8AB2_813120740C69__INCLUDED_)
-#define AFX_PARTICLEROTATIONKEYDIALOG_H__2B0B9CFD_19BC_4910_8AB2_813120740C69__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ParticleRotationKeyDialog.h : header file
 //
 
@@ -60,7 +56,7 @@ class ParticleRotationKeyDialogClass : public CDialog
 	DECLARE_MESSAGE_MAP()
 
 public:
-	
+
 	/////////////////////////////////////////////////////////////
 	//	Public methods
 	/////////////////////////////////////////////////////////////
@@ -77,5 +73,3 @@ class ParticleRotationKeyDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PARTICLEROTATIONKEYDIALOG_H__2B0B9CFD_19BC_4910_8AB2_813120740C69__INCLUDED_)
diff --git a/Core/Tools/W3DView/ParticleSizeDialog.cpp b/Core/Tools/W3DView/ParticleSizeDialog.cpp
index 0cc186dd33b..c8a56a2be89 100644
--- a/Core/Tools/W3DView/ParticleSizeDialog.cpp
+++ b/Core/Tools/W3DView/ParticleSizeDialog.cpp
@@ -19,8 +19,8 @@
 // ParticleSizeDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "ParticleSizeDialog.h"
 #include "Utils.h"
 
@@ -108,18 +108,18 @@ ParticleSizeDialogClass::OnOK (void)
 /////////////////////////////////////////////////////////////////////////////
 BOOL
 ParticleSizeDialogClass::OnNotify
-(	
+(
 	WPARAM wParam,
 	LPARAM lParam,
 	LRESULT *pResult
-) 
+)
 {
 	//
 	//	Update the spinner control if necessary
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 	}
 
diff --git a/Core/Tools/W3DView/ParticleSizeDialog.h b/Core/Tools/W3DView/ParticleSizeDialog.h
index 74e9504cdb5..80bb2be66aa 100644
--- a/Core/Tools/W3DView/ParticleSizeDialog.h
+++ b/Core/Tools/W3DView/ParticleSizeDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_PARTICLESIZEDIALOG_H__0CD2CBA5_1219_11D3_A034_00104B791122__INCLUDED_)
-#define AFX_PARTICLESIZEDIALOG_H__0CD2CBA5_1219_11D3_A034_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ParticleSizeDialog.h : header file
 //
 
@@ -60,7 +56,7 @@ class ParticleSizeDialogClass : public CDialog
 	DECLARE_MESSAGE_MAP()
 
 	public:
-		
+
 		/////////////////////////////////////////////////////////////
 		//	Public methods
 		/////////////////////////////////////////////////////////////
@@ -76,5 +72,3 @@ class ParticleSizeDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PARTICLESIZEDIALOG_H__0CD2CBA5_1219_11D3_A034_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/PlaySoundDialog.cpp b/Core/Tools/W3DView/PlaySoundDialog.cpp
index 49ae62af18c..a15b28e23ac 100644
--- a/Core/Tools/W3DView/PlaySoundDialog.cpp
+++ b/Core/Tools/W3DView/PlaySoundDialog.cpp
@@ -19,10 +19,10 @@
 // PlaySoundDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "playsounddialog.h"
-#include "utils.h"
-#include "audiblesound.h"
+#include "StdAfx.h"
+#include "PlaySoundDialog.h"
+#include "Utils.h"
+#include "AudibleSound.h"
 
 
 #ifdef RTS_DEBUG
@@ -79,7 +79,7 @@ END_MESSAGE_MAP()
 //
 /////////////////////////////////////////////////////////////////////////////
 void
-PlaySoundDialogClass::OnPlaySoundEffect (void) 
+PlaySoundDialogClass::OnPlaySoundEffect (void)
 {
 	ASSERT (SoundObj != NULL);
 	if (SoundObj != NULL) {
@@ -97,10 +97,10 @@ PlaySoundDialogClass::OnPlaySoundEffect (void)
 //
 /////////////////////////////////////////////////////////////////////////////
 void
-PlaySoundDialogClass::OnCancel (void) 
+PlaySoundDialogClass::OnCancel (void)
 {
 	SoundObj->Stop ();
-	MEMBER_RELEASE (SoundObj);
+	REF_PTR_RELEASE (SoundObj);
 
 	CDialog::OnCancel ();
 	return ;
@@ -113,7 +113,7 @@ PlaySoundDialogClass::OnCancel (void)
 //
 /////////////////////////////////////////////////////////////////////////////
 BOOL
-PlaySoundDialogClass::OnInitDialog (void) 
+PlaySoundDialogClass::OnInitDialog (void)
 {
 	CDialog::OnInitDialog ();
 
@@ -134,7 +134,7 @@ PlaySoundDialogClass::OnInitDialog (void)
 	} else {
 		OnPlaySoundEffect ();
 	}
-	
+
 	return TRUE;
 }
 
@@ -151,7 +151,7 @@ PlaySoundDialogClass::OnStopSoundEffect (void)
 	if (SoundObj != NULL) {
 		SoundObj->Stop ();
 	}
-	
+
 	return ;
 }
 
diff --git a/Core/Tools/W3DView/PlaySoundDialog.h b/Core/Tools/W3DView/PlaySoundDialog.h
index 5bce6d48944..eed77d841bc 100644
--- a/Core/Tools/W3DView/PlaySoundDialog.h
+++ b/Core/Tools/W3DView/PlaySoundDialog.h
@@ -16,15 +16,10 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_PLAYSOUNDDIALOG_H__AD61372C_2DA3_11D3_A042_00104B791122__INCLUDED_)
-#define AFX_PLAYSOUNDDIALOG_H__AD61372C_2DA3_11D3_A042_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "resource.h"
-#include "wwaudio.h"
+#include "WWAudio.h"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -71,5 +66,3 @@ class PlaySoundDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PLAYSOUNDDIALOG_H__AD61372C_2DA3_11D3_A042_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/ResolutionDialog.cpp b/Core/Tools/W3DView/ResolutionDialog.cpp
index 63a2992c2df..1846b3dcb83 100644
--- a/Core/Tools/W3DView/ResolutionDialog.cpp
+++ b/Core/Tools/W3DView/ResolutionDialog.cpp
@@ -19,10 +19,10 @@
 // ResolutionDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "ResolutionDialog.h"
-#include "WW3D.H"
+#include "ww3d.h"
 #include "Globals.h"
 #include "GraphicView.h"
 #include "Utils.h"
@@ -126,7 +126,7 @@ ResolutionDialogClass::OnInitDialog (void)
 		int width	= res_list[index].Width;
 		int height	= res_list[index].Height;
 		int bpp		= res_list[index].BitDepth;
-		
+
 		//
 		//	Format description strings for this resolution
 		//
@@ -157,7 +157,7 @@ ResolutionDialogClass::OnInitDialog (void)
 			}
 		}
 	}
-	
+
 	//
 	//	Select the first entry by default (if necessary)
 	//
@@ -199,14 +199,14 @@ ResolutionDialogClass::OnOK (void)
 			g_iWidth				= res_list[index].Width;
 			g_iHeight			= res_list[index].Height;
 			g_iBitsPerPixel	= res_list[index].BitDepth;
-			
+
 			//
 			// Cache this information in the registry
 			//
 			theApp.WriteProfileInt ("Config", "DeviceWidth", g_iWidth);
 			theApp.WriteProfileInt ("Config", "DeviceHeight", g_iHeight);
 			theApp.WriteProfileInt ("Config", "DeviceBitsPerPix", g_iBitsPerPixel);
-					
+
 			//
 			//	Reset the display
 			//
diff --git a/Core/Tools/W3DView/ResolutionDialog.h b/Core/Tools/W3DView/ResolutionDialog.h
index e1d7806ec9c..b826814f73b 100644
--- a/Core/Tools/W3DView/ResolutionDialog.h
+++ b/Core/Tools/W3DView/ResolutionDialog.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_RESOLUTIONDIALOG_H__6DB2FE81_D8CD_11D3_A086_00104B791122__INCLUDED_)
-#define AFX_RESOLUTIONDIALOG_H__6DB2FE81_D8CD_11D3_A086_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "resource.h"
 
@@ -63,7 +58,7 @@ class ResolutionDialogClass : public CDialog
 	DECLARE_MESSAGE_MAP()
 
 /*public:
-	
+
 	///////////////////////////////////////////////////////////////////
 	//	Public methods
 	///////////////////////////////////////////////////////////////////
@@ -83,5 +78,3 @@ class ResolutionDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_RESOLUTIONDIALOG_H__6DB2FE81_D8CD_11D3_A086_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/RestrictedFileDialog.cpp b/Core/Tools/W3DView/RestrictedFileDialog.cpp
index 4b694f3e48e..7e66b7de446 100644
--- a/Core/Tools/W3DView/RestrictedFileDialog.cpp
+++ b/Core/Tools/W3DView/RestrictedFileDialog.cpp
@@ -19,10 +19,10 @@
 // RestrictedFileDialog.cpp : implementation file
 //
 
-#include "StdAfx.H"
-#include "W3DView.H"
-#include "RestrictedFileDialog.H"
-#include "Utils.H"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "RestrictedFileDialog.h"
+#include "Utils.h"
 
 
 #ifdef RTS_DEBUG
@@ -74,7 +74,7 @@ RestrictedFileDialogClass::OnFileNameOK (void)
 {
 	// Force the original filename into the filename control
 	CommDlg_OpenSave_SetControlText (::GetParent (m_hWnd), 0x480, (LPCTSTR)m_ExpectedFilename);
-		
+
 	// Fill the filename fields of the OPENFILESTRUCT structure with the
 	// original filename and the new path
 	CString path = ::Strip_Filename_From_Path (m_ofn.lpstrFile);
diff --git a/Core/Tools/W3DView/RestrictedFileDialog.h b/Core/Tools/W3DView/RestrictedFileDialog.h
index c83561c0c2d..2c4e7640e5a 100644
--- a/Core/Tools/W3DView/RestrictedFileDialog.h
+++ b/Core/Tools/W3DView/RestrictedFileDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_RESTRICTEDFILEDIALOG_H__C461432A_D7EE_11D2_A00A_00104B791122__INCLUDED_)
-#define AFX_RESTRICTEDFILEDIALOG_H__C461432A_D7EE_11D2_A00A_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // RestrictedFileDialog.h : header file
 //
 
@@ -56,5 +52,3 @@ class RestrictedFileDialogClass : public CFileDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_RESTRICTEDFILEDIALOG_H__C461432A_D7EE_11D2_A00A_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/RingColorPropPage.cpp b/Core/Tools/W3DView/RingColorPropPage.cpp
index bf567540909..383616d1aeb 100644
--- a/Core/Tools/W3DView/RingColorPropPage.cpp
+++ b/Core/Tools/W3DView/RingColorPropPage.cpp
@@ -19,12 +19,12 @@
 // RingColorPropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-#include "ringcolorproppage.h"
-#include "opacitysettingsdialog.h"
-#include "colorutils.h"
-#include "utils.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "RingColorPropPage.h"
+#include "OpacitySettingsDialog.h"
+#include "ColorUtils.h"
+#include "Utils.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -114,7 +114,7 @@ RingColorPropPageClass::Initialize (void)
 
 		if (m_ColorChannel.Get_Key_Count () == 0) {
 			m_ColorChannel.Add_Key (m_RenderObj->Get_Color (), 0);
-			m_OrigColorChannel.Add_Key (m_RenderObj->Get_Color (), 0);			
+			m_OrigColorChannel.Add_Key (m_RenderObj->Get_Color (), 0);
 		}
 
 		if (m_AlphaChannel.Get_Key_Count () == 0) {
@@ -137,7 +137,7 @@ RingColorPropPageClass::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CPropertyPage::OnInitDialog ();
-	
+
 	m_ColorBar		= ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_COLOR_BAR));
 	m_OpacityBar	= ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_OPACITY_BAR));
 
@@ -216,7 +216,7 @@ RingColorPropPageClass::OnNotify
 	WPARAM wParam,
 	LPARAM lParam,
 	LRESULT *pResult
-) 
+)
 {
 	CBR_NMHDR *color_bar_hdr = (CBR_NMHDR *)lParam;
 
@@ -227,8 +227,8 @@ RingColorPropPageClass::OnNotify
 	{
 		case IDC_OPACITY_BAR:
 		{
-			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {			
-				
+			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
+
 				//
 				//	Allow the user to edit the keyframe
 				//
@@ -243,28 +243,28 @@ RingColorPropPageClass::OnNotify
 					//
 					// Update the object
 					//
-					Update_Opacities ();					
-					SetModified ();					
+					Update_Opacities ();
+					SetModified ();
 				}
 			} else if ((color_bar_hdr->hdr.code == CBRN_MOVING_POINT) ||
 						  (color_bar_hdr->hdr.code == CBRN_DELETED_POINT))
-			{				
+			{
 				//
 				// Update the object
 				//
 				Update_Opacities ();
-				SetModified ();					
+				SetModified ();
 			}
 		}
 		break;
 
 		case IDC_COLOR_BAR:
 		{
-			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {			
-				
+			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
+
 				//
 				//	Allow the user to edit the keyframe
-				//				
+				//
 				int red		= (int)color_bar_hdr->red;
 				int green	= (int)color_bar_hdr->green;
 				int blue		= (int)color_bar_hdr->blue;
@@ -278,7 +278,7 @@ RingColorPropPageClass::OnNotify
 					//
 					// Update the object
 					//
-					Update_Colors ();					
+					Update_Colors ();
 					SetModified ();
 				}
 
@@ -294,7 +294,7 @@ RingColorPropPageClass::OnNotify
 		}
 		break;
 	}
-		
+
 	return CPropertyPage::OnNotify (wParam, lParam, pResult);
 }
 
@@ -332,10 +332,10 @@ RingColorPropPageClass::Update_Opacities (void)
 	float red		= 0;
 	float green		= 0;
 	float blue		= 0;
-	
+
 	//
 	//	Build the channel
-	//	
+	//
 	int count = m_OpacityBar->Get_Point_Count ();
 	for (int index = 0; index < count; index ++) {
 		m_OpacityBar->Get_Point (index, &position, &red, &green, &blue);
@@ -358,17 +358,17 @@ RingColorPropPageClass::Update_Opacities (void)
 /////////////////////////////////////////////////////////////
 void
 RingColorPropPageClass::Update_Colors (void)
-{		
+{
 	m_ColorChannel.Reset ();
 
 	float position	= 0;
 	float red		= 0;
 	float green		= 0;
-	float blue		= 0;	
-		
+	float blue		= 0;
+
 	//
 	//	Build the channel
-	//		
+	//
 	int count = m_ColorBar->Get_Point_Count ();
 	for (int index = 0; index < count; index ++) {
 		m_ColorBar->Get_Point (index, &position, &red, &green, &blue);
diff --git a/Core/Tools/W3DView/RingColorPropPage.h b/Core/Tools/W3DView/RingColorPropPage.h
index 787fac6db1d..63bd6d40a63 100644
--- a/Core/Tools/W3DView/RingColorPropPage.h
+++ b/Core/Tools/W3DView/RingColorPropPage.h
@@ -16,18 +16,14 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_RINGCOLORPROPPAGE_H__E86BBE86_F527_11D3_A08F_00104B791122__INCLUDED_)
-#define AFX_RINGCOLORPROPPAGE_H__E86BBE86_F527_11D3_A08F_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // RingColorPropPage.h : header file
 //
 
 #include "resource.h"
 #include "ringobj.h"
-#include "colorbar.h"
+#include "ColorBar.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -81,7 +77,7 @@ class RingColorPropPageClass : public CPropertyPage
 	//
 	//	Inline accessors
 	//
-	
+
 	RingRenderObjClass *		Get_Ring (void) const							{ return m_RenderObj; }
 	void							Set_Ring (RingRenderObjClass *ring)	{ m_RenderObj = ring; Initialize (); }
 	bool							Is_Data_Valid (void) const						{ return m_bValid; }
@@ -104,7 +100,7 @@ class RingColorPropPageClass : public CPropertyPage
 	bool							m_bValid;
 	ColorBarClass *			m_ColorBar;
 	ColorBarClass *			m_OpacityBar;
-	
+
 	RingColorChannelClass	m_ColorChannel;
 	RingColorChannelClass	m_OrigColorChannel;
 	RingAlphaChannelClass	m_AlphaChannel;
@@ -113,6 +109,3 @@ class RingColorPropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_RINGCOLORPROPPAGE_H__E86BBE86_F527_11D3_A08F_00104B791122__INCLUDED_)
-
diff --git a/Core/Tools/W3DView/RingGeneralPropPage.cpp b/Core/Tools/W3DView/RingGeneralPropPage.cpp
index 225c83ed458..25a931856aa 100644
--- a/Core/Tools/W3DView/RingGeneralPropPage.cpp
+++ b/Core/Tools/W3DView/RingGeneralPropPage.cpp
@@ -19,10 +19,10 @@
 // RingGeneralPropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "RingGeneralPropPage.h"
-#include "utils.h"
+#include "Utils.h"
 #include "assetmgr.h"
 #include "texture.h"
 
@@ -106,7 +106,7 @@ RingGeneralPropPageClass::Initialize (void)
 		if (texture != NULL) {
 			m_TextureFilename = texture->Get_Texture_Name ();
 		}
-		
+
 		//
 		//	Get the other misc data we care about
 		//
@@ -157,7 +157,7 @@ RingGeneralPropPageClass::Add_Shader_To_Combo
 //
 /////////////////////////////////////////////////////////////
 BOOL
-RingGeneralPropPageClass::OnInitDialog (void) 
+RingGeneralPropPageClass::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CPropertyPage::OnInitDialog ();
@@ -168,13 +168,13 @@ RingGeneralPropPageClass::OnInitDialog (void)
 	Add_Shader_To_Combo (ShaderClass::_PresetAdditiveShader, "Additive");
 	Add_Shader_To_Combo (ShaderClass::_PresetAlphaShader, "Alpha");
 	Add_Shader_To_Combo (ShaderClass::_PresetOpaqueShader, "Opaque");
-	Add_Shader_To_Combo (ShaderClass::_PresetMultiplicativeShader, "Multiplicative");	
-	
+	Add_Shader_To_Combo (ShaderClass::_PresetMultiplicativeShader, "Multiplicative");
+
 	CheckDlgButton (IDC_CAMERA_ALIGNED_CHECK, (m_RenderObj->Get_Flags () & RingRenderObjClass::USE_CAMERA_ALIGN) != 0);
 	CheckDlgButton (IDC_LOOPING_CHECK, (m_RenderObj->Get_Flags () & RingRenderObjClass::USE_ANIMATION_LOOP) != 0);
 
 	//
-	// Fill the edit controls with the default values	
+	// Fill the edit controls with the default values
 	//
 	SetDlgItemText (IDC_NAME_EDIT, m_Name);
 	SetDlgItemText (IDC_FILENAME_EDIT, m_TextureFilename);
@@ -227,7 +227,7 @@ RingGeneralPropPageClass::OnApply (void)
 		//
 		//	Create a texture and pass it onto the object
 		//
-		TextureClass *texture = NULL;		
+		TextureClass *texture = NULL;
 		if (m_TextureFilename.GetLength () > 0) {
 			texture = WW3DAssetManager::Get_Instance ()->Get_Texture (::Get_Filename_From_Path (m_TextureFilename));
 		}
@@ -243,12 +243,12 @@ RingGeneralPropPageClass::OnApply (void)
 		m_RenderObj->Set_Flag (RingRenderObjClass::USE_CAMERA_ALIGN, IsDlgButtonChecked (IDC_CAMERA_ALIGNED_CHECK) != 0);
 		m_RenderObj->Set_Flag (RingRenderObjClass::USE_ANIMATION_LOOP, IsDlgButtonChecked (IDC_LOOPING_CHECK) != 0);
 		m_RenderObj->Set_Texture_Tiling (m_TextureTileSpin.GetPos ());
-		
+
 		// Allow the base class to process this message
 		retval = CPropertyPage::OnApply ();
 		m_bValid = true;
 	}
-	
+
 	// Return the TRUE/FALSE result code
 	return retval;
 }
@@ -260,7 +260,7 @@ RingGeneralPropPageClass::OnApply (void)
 //
 /////////////////////////////////////////////////////////////
 void
-RingGeneralPropPageClass::OnBrowseButton (void) 
+RingGeneralPropPageClass::OnBrowseButton (void)
 {
 	CFileDialog dialog (	TRUE,
 								".tga",
@@ -275,7 +275,7 @@ RingGeneralPropPageClass::OnBrowseButton (void)
 		SetModified ();
 	}
 
-	return ;	
+	return ;
 }
 
 
@@ -323,7 +323,7 @@ RingGeneralPropPageClass::OnNotify
 	//
 	NMHDR *header = (NMHDR *)lParam;
 	if ((header != NULL) && (header->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN updown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN updown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (header->hwndFrom, updown->iDelta);
 	}
 
@@ -338,7 +338,7 @@ RingGeneralPropPageClass::OnNotify
 //
 /////////////////////////////////////////////////////////////
 void
-RingGeneralPropPageClass::OnChangeLifetimeEdit (void) 
+RingGeneralPropPageClass::OnChangeLifetimeEdit (void)
 {
 	SetModified ();
 	return ;
@@ -371,7 +371,7 @@ RingGeneralPropPageClass::OnCommand
 )
 {
 	switch (LOWORD (wParam))
-	{		
+	{
 		case IDC_FILENAME_EDIT:
 		case IDC_NAME_EDIT:
 		case IDC_LIFETIME_EDIT:
diff --git a/Core/Tools/W3DView/RingGeneralPropPage.h b/Core/Tools/W3DView/RingGeneralPropPage.h
index 12f1a814e17..c09517824a7 100644
--- a/Core/Tools/W3DView/RingGeneralPropPage.h
+++ b/Core/Tools/W3DView/RingGeneralPropPage.h
@@ -16,18 +16,14 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_RINGGENERALPROPPAGE_H__E86BBE83_F527_11D3_A08F_00104B791122__INCLUDED_)
-#define AFX_RINGGENERALPROPPAGE_H__E86BBE83_F527_11D3_A08F_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // RingGeneralPropPage.h : header file
 //
 
 #include "resource.h"
 #include "ringobj.h"
-#include "shader.H"
+#include "shader.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -118,5 +114,3 @@ class RingGeneralPropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_RINGGENERALPROPPAGE_H__E86BBE83_F527_11D3_A08F_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/RingPropertySheet.cpp b/Core/Tools/W3DView/RingPropertySheet.cpp
index 09c718d67e7..51ca2e8a787 100644
--- a/Core/Tools/W3DView/RingPropertySheet.cpp
+++ b/Core/Tools/W3DView/RingPropertySheet.cpp
@@ -19,13 +19,13 @@
 // RingPropertySheet.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "RingPropertySheet.h"
-#include "utils.h"
+#include "Utils.h"
 #include "W3DViewDoc.h"
 #include "assetmgr.h"
-#include "datatreeview.h"
+#include "DataTreeView.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -51,7 +51,7 @@ RingPropertySheetClass::RingPropertySheetClass
 	:	m_RenderObj (NULL),
 		CPropertySheet(nIDCaption, pParentWnd, iSelectPage)
 {
-	MEMBER_ADD (m_RenderObj, ring);
+	REF_PTR_SET (m_RenderObj, ring);
 	Initialize ();
 	return ;
 }
@@ -69,10 +69,10 @@ RingPropertySheetClass::RingPropertySheetClass
 	CWnd *						pParentWnd,
 	UINT							iSelectPage
 )
-	:	m_RenderObj (NULL),		
+	:	m_RenderObj (NULL),
 		CPropertySheet(pszCaption, pParentWnd, iSelectPage)
 {
-	MEMBER_ADD (m_RenderObj, ring);
+	REF_PTR_SET (m_RenderObj, ring);
 	Initialize ();
 	return ;
 }
@@ -85,7 +85,7 @@ RingPropertySheetClass::RingPropertySheetClass
 /////////////////////////////////////////////////////////////////////////////
 RingPropertySheetClass::~RingPropertySheetClass (void)
 {
-	MEMBER_RELEASE (m_RenderObj);
+	REF_PTR_RELEASE (m_RenderObj);
 	return ;
 }
 
@@ -140,7 +140,7 @@ RingPropertySheetClass::WindowProc
 
 				case IDOK:
 				case ID_APPLY_NOW:
-				{					
+				{
 					// Did the user click the button?
 					if (HIWORD (wParam) == BN_CLICKED) {
 						LRESULT lresult = CPropertySheet::WindowProc (message, wParam, lParam);
@@ -149,11 +149,11 @@ RingPropertySheetClass::WindowProc
 						if (	m_GeneralPage.Is_Data_Valid () &&
 								m_ColorPage.Is_Data_Valid () &&
 								m_ScalePage.Is_Data_Valid ())
-						{							
+						{
 							// Update the current emitter to match the data
 							Update_Object ();
 						}
-												
+
 						return lresult;
 					}
 				}
@@ -179,12 +179,12 @@ RingPropertySheetClass::Add_Object_To_Viewer (void)
 {
 	CW3DViewDoc *doc = ::GetCurrentDocument ();
 	if ((doc != NULL) && (m_RenderObj != NULL)) {
-		
+
 		//
 		// Create a new prototype for this object
 		//
 		RingPrototypeClass *prototype	= new RingPrototypeClass (m_RenderObj);
-		
+
 		//
 		// Update the asset manager with the new prototype
 		//
@@ -192,7 +192,7 @@ RingPropertySheetClass::Add_Object_To_Viewer (void)
 			WW3DAssetManager::Get_Instance()->Remove_Prototype (m_LastSavedName);
 		}
 		WW3DAssetManager::Get_Instance()->Add_Prototype (prototype);
-		
+
 		//
 		// Add this object to the data tree
 		//
@@ -204,7 +204,7 @@ RingPropertySheetClass::Add_Object_To_Viewer (void)
 		//
 		doc->Reload_Displayed_Object ();
 		m_LastSavedName = m_RenderObj->Get_Name ();
-		MEMBER_ADD (m_RenderObj, (RingRenderObjClass *)doc->GetDisplayedObject ());
+		REF_PTR_SET (m_RenderObj, (RingRenderObjClass *)doc->GetDisplayedObject ());
 
 		//
 		// Pass the object along to the pages
@@ -261,7 +261,7 @@ RingPropertySheetClass::Initialize (void)
 
 	//
 	//	Force the pages to be created up front
-	//	
+	//
 	m_GeneralPage.m_psp.dwFlags	|= PSP_PREMATURE;
 	m_ColorPage.m_psp.dwFlags		|= PSP_PREMATURE;
 	m_ScalePage.m_psp.dwFlags		|= PSP_PREMATURE;
diff --git a/Core/Tools/W3DView/RingPropertySheet.h b/Core/Tools/W3DView/RingPropertySheet.h
index 66303d5785e..d221010715d 100644
--- a/Core/Tools/W3DView/RingPropertySheet.h
+++ b/Core/Tools/W3DView/RingPropertySheet.h
@@ -34,17 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __RING_PROPERTY_SHEET_H
-#define __RING_PROPERTY_SHEET_H
 
-#include "RingColorPropPage.H"
-#include "RingGeneralPropPage.H"
-#include "RingSizePropPage.H"
+#include "RingColorPropPage.h"
+#include "RingGeneralPropPage.h"
+#include "RingSizePropPage.h"
 
 
 // Forward declarations
@@ -97,13 +91,13 @@ class RingPropertySheetClass : public CPropertySheet
 	//////////////////////////////////////////////////////////////////////
 
 protected:
-	
+
 	//////////////////////////////////////////////////////////////////////
 	//	Protected methods
 	//////////////////////////////////////////////////////////////////////
 	void						Initialize (void);
 	RingRenderObjClass *	Create_Object (void);
-	void						Update_Object (void);	
+	void						Update_Object (void);
 	void						Add_Object_To_Viewer (void);
 	void						Create_New_Object (void);
 
@@ -120,5 +114,3 @@ class RingPropertySheetClass : public CPropertySheet
 };
 
 /////////////////////////////////////////////////////////////////////////////
-
-#endif //__RING_PROPERTY_SHEET_H
diff --git a/Core/Tools/W3DView/RingSizePropPage.cpp b/Core/Tools/W3DView/RingSizePropPage.cpp
index daaf3476db3..bd2ce010146 100644
--- a/Core/Tools/W3DView/RingSizePropPage.cpp
+++ b/Core/Tools/W3DView/RingSizePropPage.cpp
@@ -19,12 +19,12 @@
 // RingSizePropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-#include "ringsizeproppage.h"
-#include "colorutils.h"
-#include "utils.h"
-#include "scaledialog.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "RingSizePropPage.h"
+#include "ColorUtils.h"
+#include "Utils.h"
+#include "ScaleDialog.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -61,7 +61,7 @@ RingSizePropPageClass::RingSizePropPageClass (RingRenderObjClass *ring)
 	//{{AFX_DATA_INIT(RingSizePropPageClass)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
-	
+
 	Initialize ();
 	return ;
 }
@@ -91,7 +91,7 @@ RingSizePropPageClass::DoDataExchange (CDataExchange* pDX)
 	DDX_Control(pDX, IDC_INNER_SIZE_X_SPIN, m_InnerSizeXSpin);
 	DDX_Control(pDX, IDC_INNER_SIZE_Y_SPIN, m_InnerSizeYSpin);
 	DDX_Control(pDX, IDC_OUTER_SIZE_X_SPIN, m_OuterSizeXSpin);
-	DDX_Control(pDX, IDC_OUTER_SIZE_Y_SPIN, m_OuterSizeYSpin);	
+	DDX_Control(pDX, IDC_OUTER_SIZE_Y_SPIN, m_OuterSizeYSpin);
 	//}}AFX_DATA_MAP
 	return ;
 }
@@ -152,7 +152,7 @@ RingSizePropPageClass::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CPropertyPage::OnInitDialog ();
-	
+
 	m_InnerScaleXBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_INNER_SCALE_BAR_X));
 	m_InnerScaleYBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_INNER_SCALE_BAR_Y));
 	m_OuterScaleXBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_OUTER_SCALE_BAR_X));
@@ -197,7 +197,7 @@ RingSizePropPageClass::OnInitDialog (void)
 	for (index = 1; index < m_OrigInnerScaleChannel.Get_Key_Count (); index ++) {
 		const LERPAnimationChannelClass<Vector2>::KeyClass &prev_value = m_OrigInnerScaleChannel.Get_Key (index - 1);
 		const LERPAnimationChannelClass<Vector2>::KeyClass &curr_value = m_OrigInnerScaleChannel.Get_Key (index);
-		
+
 		//
 		//	Find out which channels are unique (we toss the others)
 		//
@@ -257,7 +257,7 @@ RingSizePropPageClass::OnInitDialog (void)
 	for (index = 1; index < m_OrigOuterScaleChannel.Get_Key_Count (); index ++) {
 		const LERPAnimationChannelClass<Vector2>::KeyClass &prev_value = m_OrigOuterScaleChannel.Get_Key (index - 1);
 		const LERPAnimationChannelClass<Vector2>::KeyClass &curr_value = m_OrigOuterScaleChannel.Get_Key (index);
-		
+
 		//
 		//	Find out which channels are unique (we toss the others)
 		//
@@ -355,7 +355,7 @@ RingSizePropPageClass::OnNotify
 	WPARAM wParam,
 	LPARAM lParam,
 	LRESULT *pResult
-) 
+)
 {
 	CBR_NMHDR *color_bar_hdr = (CBR_NMHDR *)lParam;
 
@@ -368,7 +368,7 @@ RingSizePropPageClass::OnNotify
 		case IDC_INNER_SCALE_BAR_Y:
 		case IDC_OUTER_SCALE_BAR_X:
 		case IDC_OUTER_SCALE_BAR_Y:
-		{			
+		{
 			//
 			//	Determine the timeline bar which sent the notification
 			//
@@ -386,7 +386,7 @@ RingSizePropPageClass::OnNotify
 			bool update =	(color_bar_hdr->hdr.code == CBRN_MOVING_POINT) ||
 								(color_bar_hdr->hdr.code == CBRN_DELETED_POINT);
 
-			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {			
+			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
 
 				//
 				//	Allow the user to edit the keyframe
@@ -401,11 +401,11 @@ RingSizePropPageClass::OnNotify
 					timeline->Set_Graph_Percent (color_bar_hdr->key_index, dialog.Get_Scale ());
 					update = true;
 				}
-			} 
-			
+			}
+
 			//
 			//	Update the object
-			//			
+			//
 			if (update) {
 
 				if (	color_bar_hdr->hdr.idFrom == IDC_INNER_SCALE_BAR_X ||
@@ -445,7 +445,7 @@ RingSizePropPageClass::OnNotify
 		}
 		break;
 	}
-		
+
 	return CPropertyPage::OnNotify (wParam, lParam, pResult);
 }
 
@@ -541,7 +541,7 @@ RingSizePropPageClass::Update_Inner_Scale_Array (void)
 	float position	= 0;
 	float red		= 0;
 	float green		= 0;
-	float blue		= 0;	
+	float blue		= 0;
 
 	//
 	//	Allocate arrays we can store the 3 separate timelines in
@@ -550,21 +550,21 @@ RingSizePropPageClass::Update_Inner_Scale_Array (void)
 	int max_y = m_InnerScaleYBar->Get_Point_Count ();
 	LERPAnimationChannelClass<float> x_values;
 	LERPAnimationChannelClass<float> y_values;
-	
+
 	//
 	//	Build the X-axis timline
 	//
 	int index;
 	for (index = 0; index < max_x; index++) {
-		m_InnerScaleXBar->Get_Point (index, &position, &red, &green, &blue);		
+		m_InnerScaleXBar->Get_Point (index, &position, &red, &green, &blue);
 		x_values.Add_Key (m_InnerScaleXBar->Get_Graph_Percent (index), position);
 	}
 
 	//
 	//	Build the Y-axis timline
 	//
-	for (index = 0; index < max_y; index++) {		
-		m_InnerScaleYBar->Get_Point (index, &position, &red, &green, &blue);		
+	for (index = 0; index < max_y; index++) {
+		m_InnerScaleYBar->Get_Point (index, &position, &red, &green, &blue);
 		y_values.Add_Key (m_InnerScaleYBar->Get_Graph_Percent (index), position);
 	}
 
@@ -578,7 +578,7 @@ RingSizePropPageClass::Update_Inner_Scale_Array (void)
 	float y_val = y_values[0].Get_Value ();
 	while (	x_index < max_x ||
 				y_index < max_y)
-	{		
+	{
 		//
 		//	Find the smallest time
 		//
@@ -640,7 +640,7 @@ RingSizePropPageClass::Update_Outer_Scale_Array (void)
 	float position	= 0;
 	float red		= 0;
 	float green		= 0;
-	float blue		= 0;	
+	float blue		= 0;
 
 	//
 	//	Allocate arrays we can store the 3 separate timelines in
@@ -649,21 +649,21 @@ RingSizePropPageClass::Update_Outer_Scale_Array (void)
 	int max_y = m_OuterScaleYBar->Get_Point_Count ();
 	LERPAnimationChannelClass<float> x_values;
 	LERPAnimationChannelClass<float> y_values;
-	
+
 	//
 	//	Build the X-axis timline
 	//
 	int index;
 	for (index = 0; index < max_x; index++) {
-		m_OuterScaleXBar->Get_Point (index, &position, &red, &green, &blue);		
+		m_OuterScaleXBar->Get_Point (index, &position, &red, &green, &blue);
 		x_values.Add_Key (m_OuterScaleXBar->Get_Graph_Percent (index), position);
 	}
 
 	//
 	//	Build the Y-axis timline
 	//
-	for (index = 0; index < max_y; index++) {		
-		m_OuterScaleYBar->Get_Point (index, &position, &red, &green, &blue);		
+	for (index = 0; index < max_y; index++) {
+		m_OuterScaleYBar->Get_Point (index, &position, &red, &green, &blue);
 		y_values.Add_Key (m_OuterScaleYBar->Get_Graph_Percent (index), position);
 	}
 
@@ -677,7 +677,7 @@ RingSizePropPageClass::Update_Outer_Scale_Array (void)
 	float y_val = y_values[0].Get_Value ();
 	while (	x_index < max_x ||
 				y_index < max_y)
-	{		
+	{
 		//
 		//	Find the smallest time
 		//
diff --git a/Core/Tools/W3DView/RingSizePropPage.h b/Core/Tools/W3DView/RingSizePropPage.h
index 4c2ebdf0785..22def9c8f5a 100644
--- a/Core/Tools/W3DView/RingSizePropPage.h
+++ b/Core/Tools/W3DView/RingSizePropPage.h
@@ -16,18 +16,14 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_RINGSIZEPROPPAGE_H__E86BBE8A_F527_11D3_A08F_00104B791122__INCLUDED_)
-#define AFX_RINGSIZEPROPPAGE_H__E86BBE8A_F527_11D3_A08F_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // RingSizePropPage.h : header file
 //
 
 #include "resource.h"
 #include "ringobj.h"
-#include "colorbar.h"
+#include "ColorBar.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -49,7 +45,7 @@ class RingSizePropPageClass : public CPropertyPage
 	CSpinButtonCtrl	m_InnerSizeXSpin;
 	CSpinButtonCtrl	m_InnerSizeYSpin;
 	CSpinButtonCtrl	m_OuterSizeXSpin;
-	CSpinButtonCtrl	m_OuterSizeYSpin;	
+	CSpinButtonCtrl	m_OuterSizeYSpin;
 	//}}AFX_DATA
 
 
@@ -84,7 +80,7 @@ class RingSizePropPageClass : public CPropertyPage
 	//
 	//	Inline accessors
 	//
-	
+
 	RingRenderObjClass *		Get_Ring (void) const					{ return m_RenderObj; }
 	void							Set_Ring (RingRenderObjClass *ring)	{ m_RenderObj = ring; Initialize (); }
 	bool							Is_Data_Valid (void) const				{ return m_bValid; }
@@ -122,5 +118,3 @@ class RingSizePropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_RINGSIZEPROPPAGE_H__E86BBE8A_F527_11D3_A08F_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/SaveSettingsDialog.cpp b/Core/Tools/W3DView/SaveSettingsDialog.cpp
index e2b0cac9db4..8746417aa0d 100644
--- a/Core/Tools/W3DView/SaveSettingsDialog.cpp
+++ b/Core/Tools/W3DView/SaveSettingsDialog.cpp
@@ -19,11 +19,11 @@
 // SaveSettingsDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "W3DView.h"
 #include "SaveSettingsDialog.h"
-#include "W3DViewDoc.H"
-#include "Utils.H"
+#include "W3DViewDoc.h"
+#include "Utils.h"
 
 
 #ifdef RTS_DEBUG
@@ -86,7 +86,7 @@ CSaveSettingsDialog::OnInitDialog (void)
     SendDlgItemMessage (IDC_LIGHTING_CHECKBOX, BM_SETCHECK, (WPARAM)TRUE);
     SendDlgItemMessage (IDC_BACKGROUND_CHECKBOX, BM_SETCHECK, (WPARAM)TRUE);
     SendDlgItemMessage (IDC_CAMERA_CHECKBOX, BM_SETCHECK, (WPARAM)TRUE);
-	
+
 	// Put the default filename into the edit control
     SetDlgItemText (IDC_FILENAME_EDIT, "Default.dat");
     return TRUE;
@@ -97,7 +97,7 @@ CSaveSettingsDialog::OnInitDialog (void)
 //  OnBrowseButton
 //
 void
-CSaveSettingsDialog::OnBrowseButton (void) 
+CSaveSettingsDialog::OnBrowseButton (void)
 {
 	 TCHAR szFileName[MAX_PATH];
 	 ::GetModuleFileName (NULL, szFileName, sizeof (szFileName));
@@ -106,13 +106,13 @@ CSaveSettingsDialog::OnBrowseButton (void)
 	 {
 			::SetCurrentDirectory (pszPath);
 		  pszPath[0] = 0;
-	 }	 
+	 }
 
 
     // Get the current filename
     CString stringCurrentFile;
     GetDlgItemText (IDC_FILENAME_EDIT, stringCurrentFile);
-    
+
     CFileDialog saveFileDialog (FALSE,
                                 ".dat",
                                 stringCurrentFile,
@@ -126,7 +126,7 @@ CSaveSettingsDialog::OnBrowseButton (void)
         // Put the path into the filename edit control
         SetDlgItemText (IDC_FILENAME_EDIT, saveFileDialog.GetPathName ());
     }
-        
+
     return ;
 }
 
@@ -135,7 +135,7 @@ CSaveSettingsDialog::OnBrowseButton (void)
 //  OnUpdateFilenameEdit
 //
 void
-CSaveSettingsDialog::OnUpdateFilenameEdit (void) 
+CSaveSettingsDialog::OnUpdateFilenameEdit (void)
 {
     // Set the enabled state of the OK button
     // based on the values of the control
@@ -165,7 +165,7 @@ CSaveSettingsDialog::OnOK (void)
         {
             dwSettingsMask |= SAVE_SETTINGS_LIGHT;
         }
-        
+
         // Did the user want to save the background?
         if (SendDlgItemMessage (IDC_BACKGROUND_CHECKBOX, BM_GETCHECK))
         {
@@ -185,8 +185,8 @@ CSaveSettingsDialog::OnOK (void)
         // Save the settings to the selected file
         bAllowDefaultProcessing = pCDoc->SaveSettings (stringCurrentFile,
                                                        dwSettingsMask);
-    }        
-    
+    }
+
 	if (bAllowDefaultProcessing)
     {
         // Allow the base class to process this message
@@ -205,7 +205,7 @@ CSaveSettingsDialog::OnCommand
 (
     WPARAM wParam,
     LPARAM lParam
-) 
+)
 {
     // Did the user check/uncheck one of the checkboxes?
     if ((HIWORD (wParam) == BN_CLICKED) &&
@@ -247,7 +247,7 @@ CSaveSettingsDialog::FixOKEnableState (void)
         // Disable the OK button
         ::EnableWindow (::GetDlgItem (m_hWnd, IDOK), FALSE);
     }
-    
+
     return ;
 }
 
diff --git a/Core/Tools/W3DView/SaveSettingsDialog.h b/Core/Tools/W3DView/SaveSettingsDialog.h
index 3ac3d1dd5a3..859caeda99f 100644
--- a/Core/Tools/W3DView/SaveSettingsDialog.h
+++ b/Core/Tools/W3DView/SaveSettingsDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SAVESETTINGSDIALOG_H__AF3CDE8D_61EC_11D2_9FC7_00104B791122__INCLUDED_)
-#define AFX_SAVESETTINGSDIALOG_H__AF3CDE8D_61EC_11D2_9FC7_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // SaveSettingsDialog.h : header file
 //
 
@@ -67,5 +63,3 @@ class CSaveSettingsDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SAVESETTINGSDIALOG_H__AF3CDE8D_61EC_11D2_9FC7_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/ScaleDialog.cpp b/Core/Tools/W3DView/ScaleDialog.cpp
index 18b98f597bc..287f7da9001 100644
--- a/Core/Tools/W3DView/ScaleDialog.cpp
+++ b/Core/Tools/W3DView/ScaleDialog.cpp
@@ -19,8 +19,8 @@
 // ScaleDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "ScaleDialog.h"
 
 #ifdef RTS_DEBUG
@@ -103,7 +103,7 @@ ScaleDialogClass::OnOK (void)
 	int pos = m_ScaleSpin.GetPos();
 	if (pos & 0xffff0000) {
 		// Error condition. Most likely the value is out of range.
-		MessageBox("Invalid scale value. Please enter a number between 1 and 10,000", 
+		MessageBox("Invalid scale value. Please enter a number between 1 and 10,000",
 			"Invalid Scale", MB_OK | MB_ICONINFORMATION);
 		return;
 	}
@@ -128,18 +128,18 @@ ScaleDialogClass::OnOK (void)
 /////////////////////////////////////////////////////////////////////////////
 BOOL
 ScaleDialogClass::OnNotify
-(	
+(
 	WPARAM wParam,
 	LPARAM lParam,
 	LRESULT *pResult
-) 
+)
 {
 	//
 	//	Update the spinner control if necessary
 	//
 	NMHDR *header = (NMHDR *)lParam;
 	if ((header != NULL) && (header->code == UDN_DELTAPOS)) {
-		//LPNMUPDOWN updown = (LPNMUPDOWN)lParam;		
+		//LPNMUPDOWN updown = (LPNMUPDOWN)lParam;
 		//::Update_Spinner_Buddy (header->hwndFrom, updown->iDelta);
 	}
 
diff --git a/Core/Tools/W3DView/ScaleDialog.h b/Core/Tools/W3DView/ScaleDialog.h
index 7c790cf053a..f01746b3c53 100644
--- a/Core/Tools/W3DView/ScaleDialog.h
+++ b/Core/Tools/W3DView/ScaleDialog.h
@@ -16,13 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SCALEDIALOG_H__E86BBE8B_F527_11D3_A08F_00104B791122__INCLUDED_)
-#define AFX_SCALEDIALOG_H__E86BBE8B_F527_11D3_A08F_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
-
 
 #include "resource.h"
 
@@ -63,7 +57,7 @@ class ScaleDialogClass : public CDialog
 	DECLARE_MESSAGE_MAP()
 
 public:
-	
+
 	/////////////////////////////////////////////////////////////
 	//	Public methods
 	/////////////////////////////////////////////////////////////
@@ -81,5 +75,3 @@ class ScaleDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SCALEDIALOG_H__E86BBE8B_F527_11D3_A08F_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/SceneLightDialog.cpp b/Core/Tools/W3DView/SceneLightDialog.cpp
index b5905b70a6e..0a1ddd85d59 100644
--- a/Core/Tools/W3DView/SceneLightDialog.cpp
+++ b/Core/Tools/W3DView/SceneLightDialog.cpp
@@ -19,14 +19,14 @@
 // SceneLightDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "W3DView.h"
 #include "SceneLightDialog.h"
-#include "Utils.H"
-#include "MainFrm.H"
-#include "W3DViewDoc.H"
-#include "Scene.H"
-#include "Light.H"
+#include "Utils.h"
+#include "MainFrm.h"
+#include "W3DViewDoc.h"
+#include "scene.h"
+#include "light.h"
 
 
 #ifdef RTS_DEBUG
@@ -93,7 +93,7 @@ END_MESSAGE_MAP()
 //  OnInitDialog
 //
 BOOL
-CSceneLightDialog::OnInitDialog (void) 
+CSceneLightDialog::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CDialog::OnInitDialog ();
@@ -105,7 +105,7 @@ CSceneLightDialog::OnInitDialog (void)
 	// Set the initial ranges for the color sliders
 	m_redSlider.SetRange (0, 100);
 	m_greenSlider.SetRange (0, 100);
-	m_blueSlider.SetRange (0, 100);    
+	m_blueSlider.SetRange (0, 100);
 
 	// Get a pointer to the doc so we can get at the current scene
 	// pointer.
@@ -120,11 +120,11 @@ CSceneLightDialog::OnInitDialog (void)
 		// if the user cancels
 		m_InitialRedDiffuse = int(diffuse.X * 100.00F);
 		m_InitialGreenDiffuse = int(diffuse.Y * 100.00F);
-		m_InitialBlueDiffuse = int(diffuse.Z * 100.00F);        
+		m_InitialBlueDiffuse = int(diffuse.Z * 100.00F);
 		m_InitialRedSpecular = int(specular.X * 100.00F);
 		m_InitialGreenSpecular = int(specular.Y * 100.00F);
 		m_InitialBlueSpecular = int(specular.Z * 100.00F);
-		Set_Color_Control_State (diffuse);		
+		Set_Color_Control_State (diffuse);
 
 		// Get the light's attenuation
 		double start = 0;
@@ -134,12 +134,12 @@ CSceneLightDialog::OnInitDialog (void)
 		SendDlgItemMessage (IDC_ATTENUATION_CHECK, BM_SETCHECK, (WPARAM)atten_on);
 
 		// Get the light's intensity
-		float intensity = pCDoc->GetSceneLight ()->Get_Intensity ();			
+		float intensity = pCDoc->GetSceneLight ()->Get_Intensity ();
 
 		// Attempt to calculate the light's distance from the object
 		float distance = 0;
 		if (pCDoc->GetDisplayedObject () != NULL) {
-			
+
 			// Get the position of the light and the displayed object
 			Vector3 light_pos = pCDoc->GetSceneLight ()->Get_Position ();
 			Vector3 obj_pos = pCDoc->GetDisplayedObject ()->Get_Position ();
@@ -152,7 +152,7 @@ CSceneLightDialog::OnInitDialog (void)
 		::SetDlgItemFloat (m_hWnd, IDC_START_ATTENUATION_EDIT, start);
 		::SetDlgItemFloat (m_hWnd, IDC_END_ATTENUATION_EDIT, end);
 		::SetDlgItemFloat (m_hWnd, IDC_DISTANCE_EDIT, distance);
-		
+
 		// Set-up the spin controls
 		m_DistanceSpin.SetRange (0, 1000000L);
 		m_DistanceSpin.SetPos ((distance * 100));
@@ -194,7 +194,7 @@ CSceneLightDialog::OnHScroll
 {
 	// Did the intensity slider send this message or did the color sliders?
 	if (pScrollBar == GetDlgItem (IDC_INTENSITY_SLIDER)) {
-		
+
 		// Update the light's intensity settings
 		float intensity = ((float)m_IntensitySlider.GetPos ()) / 100.0F;
 		::GetCurrentDocument ()->GetSceneLight ()->Set_Intensity (intensity);
@@ -203,7 +203,7 @@ CSceneLightDialog::OnHScroll
 
 		// Are the 3 colors locked together?
 		if (SendDlgItemMessage (IDC_GRAYSCALE_CHECK, BM_GETCHECK)) {
-			
+
 			// Which color sent this message?
 			int iCurrentPos = 0;
 			if (pScrollBar == GetDlgItem (IDC_SLIDER_RED)) {
@@ -272,7 +272,7 @@ CSceneLightDialog::OnCancel (void)
 		pCDoc->GetSceneLight ()->Set_Intensity (m_InitialIntensity);
 		pCDoc->GetSceneLight ()->Set_Far_Attenuation_Range (m_InitialStartAtten, m_InitialEndAtten);
 		pCDoc->GetSceneLight ()->Set_Flag (LightClass::FAR_ATTENUATION, (m_InitialAttenOn == TRUE));
-		Update_Distance (m_InitialDistance);		
+		Update_Distance (m_InitialDistance);
 	}
 
 	// Allow the base class to process this message
@@ -291,7 +291,7 @@ CSceneLightDialog::WindowProc
     UINT message,
     WPARAM wParam,
     LPARAM lParam
-) 
+)
 {
 	switch (message)
 	{
@@ -301,7 +301,7 @@ CSceneLightDialog::WindowProc
 			NMHDR *pheader = (NMHDR *)lParam;
 			if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
 				LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
-				
+
 				// Get the buddy window associated with this spin control
 				HWND hbuddy_wnd = (HWND)SendDlgItemMessage ((int)wParam, UDM_GETBUDDY);
 				if (::IsWindow (hbuddy_wnd)) {
@@ -329,7 +329,7 @@ CSceneLightDialog::WindowProc
 						Update_Distance (::GetDlgItemFloat (m_hWnd, IDC_DISTANCE_EDIT));
 					}
 					break;
-					
+
 					case IDC_START_ATTENUATION_EDIT:
 					case IDC_END_ATTENUATION_EDIT:
 					{
@@ -350,7 +350,7 @@ CSceneLightDialog::WindowProc
 		}
 		break;
 	}
-	
+
 	// Allow the base class to process this message
 	return CDialog::WindowProc (message, wParam, lParam);
 }
@@ -364,7 +364,7 @@ void
 CSceneLightDialog::OnGrayscaleCheck (void)
 {
 	if (SendDlgItemMessage (IDC_GRAYSCALE_CHECK, BM_GETCHECK)) {
-		
+
 		// Make the green and blue sliders the same as red
 		m_greenSlider.SetPos (m_redSlider.GetPos ());
 		m_blueSlider.SetPos (m_redSlider.GetPos ());
@@ -462,7 +462,7 @@ CSceneLightDialog::Set_Color_Control_State (const Vector3 &color)
 	if ((color.X == color.Y) &&
 		 (color.X == color.Z)) {
 		SendDlgItemMessage (IDC_GRAYSCALE_CHECK, BM_SETCHECK, (WPARAM)TRUE);
-	} else {		
+	} else {
 		SendDlgItemMessage (IDC_GRAYSCALE_CHECK, BM_SETCHECK, (WPARAM)FALSE);
 	}
 
@@ -509,13 +509,13 @@ CSceneLightDialog::Update_Distance (float distance)
 	if (pCDoc && pCDoc->GetScene ()) {
 
 		// Get the position of the displayed object
-		Vector3 obj_pos (0,0,0);		
+		Vector3 obj_pos (0,0,0);
 		if (pCDoc->GetDisplayedObject ()) {
 			obj_pos = pCDoc->GetDisplayedObject ()->Get_Position ();
 		}
 
 		// Get the position of the light and the displayed object
-		Vector3 light_pos = pCDoc->GetSceneLight ()->Get_Position ();		
+		Vector3 light_pos = pCDoc->GetSceneLight ()->Get_Position ();
 		Vector3 new_pos = (light_pos - obj_pos);
 		new_pos.Normalize ();
 		new_pos = new_pos * distance;
@@ -550,9 +550,9 @@ CSceneLightDialog::Update_Attenuation_Controls (void)
 //  OnAttenuationCheck
 //
 void
-CSceneLightDialog::OnAttenuationCheck (void) 
+CSceneLightDialog::OnAttenuationCheck (void)
 {
-	// Update the scene light to reflect the new setting	
+	// Update the scene light to reflect the new setting
 	bool enable = (SendDlgItemMessage (IDC_ATTENUATION_CHECK, BM_GETCHECK) == 1);
 	CW3DViewDoc *pdoc = ::GetCurrentDocument ();
 	pdoc->GetSceneLight ()->Set_Flag (LightClass::FAR_ATTENUATION, enable);
diff --git a/Core/Tools/W3DView/SceneLightDialog.h b/Core/Tools/W3DView/SceneLightDialog.h
index ceecbb7cc95..0dc4c05a1d6 100644
--- a/Core/Tools/W3DView/SceneLightDialog.h
+++ b/Core/Tools/W3DView/SceneLightDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SCENELIGHTDIALOG_H__AF3CDE89_61EC_11D2_9FC7_00104B791122__INCLUDED_)
-#define AFX_SCENELIGHTDIALOG_H__AF3CDE89_61EC_11D2_9FC7_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // SceneLightDialog.h : header file
 //
 
@@ -122,5 +118,3 @@ class CSceneLightDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SCENELIGHTDIALOG_H__AF3CDE89_61EC_11D2_9FC7_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/ScreenCursor.cpp b/Core/Tools/W3DView/ScreenCursor.cpp
index b6d0020269e..28917a34f4f 100644
--- a/Core/Tools/W3DView/ScreenCursor.cpp
+++ b/Core/Tools/W3DView/ScreenCursor.cpp
@@ -31,9 +31,9 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "StdAfx.H"
-#include "ScreenCursor.H"
-#include "Utils.H"
+#include "StdAfx.h"
+#include "ScreenCursor.h"
+#include "Utils.h"
 #include "ww3d.h"
 #include "vertmaterial.h"
 #include "shader.h"
@@ -153,10 +153,10 @@ ScreenCursorClass::Initialize (void)
 void
 ScreenCursorClass::Set_Texture (TextureClass *texture)
 {
-	MEMBER_ADD (m_pTexture, texture);
+	REF_PTR_SET (m_pTexture, texture);
 
 	// Find the dimensions of the texture:
-	if (m_pTexture != NULL) {		
+	if (m_pTexture != NULL) {
 		m_Width	= m_pTexture->Get_Width();
 		m_Height	= m_pTexture->Get_Height();
 	}
@@ -177,10 +177,10 @@ ScreenCursorClass::On_Frame_Update (void)
 	//	Get the current cursor position in screen coords
 	//
 	POINT point = { 0 };
-	::GetCursorPos (&point);	
+	::GetCursorPos (&point);
 
 	if (m_hWnd != NULL) {
-		
+
 		//
 		//	Normalize the screen position
 		//
@@ -224,8 +224,8 @@ ScreenCursorClass::On_Frame_Update (void)
 	float y_max		= 1 - ((y_pos + normal_height) * 2);
 	x_pos				= (x_pos * 2) - 1;
 	y_pos				= 1 - (y_pos * 2);
-	z_pos				= 0;	
-	
+	z_pos				= 0;
+
 	//
 	//	Build the verticies from the position and extents
 	//
@@ -272,12 +272,12 @@ ScreenCursorClass::Render (RenderInfoClass &rinfo)
 			vb->x=m_Verticies[i].X;
 			vb->y=m_Verticies[i].Y;
 			vb->z=m_Verticies[i].Z;
-			
+
 			// Normals
 			vb->nx=m_Normals[i].X;
 			vb->ny=m_Normals[i].Y;
 			vb->nz=m_Normals[i].Z;
-			
+
 			// UV coordinates
 			vb->u1=m_UVs[i].X;
 			vb->v1=m_UVs[i].Y;
@@ -306,18 +306,18 @@ ScreenCursorClass::Render (RenderInfoClass &rinfo)
 	DX8Wrapper::Set_Material(m_pVertMaterial);
 	DX8Wrapper::Set_Shader(ShaderClass::_PresetATestBlend2DShader);
 	DX8Wrapper::Set_Texture(0,m_pTexture);
-	
+
 	DX8Wrapper::Set_Vertex_Buffer(vbaccess);
 	DX8Wrapper::Set_Index_Buffer(ibaccess,0);
-	
+
 	SphereClass sphere;
-	Get_Obj_Space_Bounding_Sphere(sphere); 
+	Get_Obj_Space_Bounding_Sphere(sphere);
 
 	SortingRendererClass::Insert_Triangles(
 		sphere,
 		0,
 		FACE_COUNT*3,
-		0, 
+		0,
 		VERTEX_COUNT*2);
 
 	return ;
@@ -329,10 +329,10 @@ ScreenCursorClass::Render (RenderInfoClass &rinfo)
 //	Get_Obj_Space_Bounding_Sphere
 //
 //////////////////////////////////////////////////////////////
-void 
+void
 ScreenCursorClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
 {
-	sphere.Center = Get_Transform().Get_Translation();	
+	sphere.Center = Get_Transform().Get_Translation();
 	sphere.Radius = max (m_Width, m_Height);
 }
 
@@ -342,7 +342,7 @@ ScreenCursorClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
 //	Get_Obj_Space_Bounding_Box
 //
 //////////////////////////////////////////////////////////////
-void 
+void
 ScreenCursorClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
 {
 	Matrix3D transform = Get_Transform ();
diff --git a/Core/Tools/W3DView/ScreenCursor.h b/Core/Tools/W3DView/ScreenCursor.h
index 77dda8298d2..3227d2ddd9a 100644
--- a/Core/Tools/W3DView/ScreenCursor.h
+++ b/Core/Tools/W3DView/ScreenCursor.h
@@ -30,18 +30,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-#ifndef __SCREENCURSOR_H
-#define __SCREENCURSOR_H
 
-#include "Resource.H"
+#include "resource.h"
 #include "rendobj.h"
-#include "vector3i.h"
+#include "Vector3i.h"
 
 // Forward declarations
 class VertexMaterialClass;
@@ -54,7 +47,7 @@ class VertexMaterialClass;
 class ScreenCursorClass : public RenderObjClass
 {
 	public:
-		
+
 		////////////////////////////////////////////////////////////////////////
 		//	Public constructors/destructors
 		////////////////////////////////////////////////////////////////////////
@@ -111,6 +104,3 @@ class ScreenCursorClass : public RenderObjClass
 		int 						m_Width;
 		int						m_Height;
 };
-
-
-#endif //__SCREENCURSOR_H
diff --git a/Core/Tools/W3DView/SoundEditDialog.cpp b/Core/Tools/W3DView/SoundEditDialog.cpp
index 67ec22e582d..b14bccb37e3 100644
--- a/Core/Tools/W3DView/SoundEditDialog.cpp
+++ b/Core/Tools/W3DView/SoundEditDialog.cpp
@@ -34,15 +34,15 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#include "stdafx.h"
-#include "soundeditdialog.h"
+#include "StdAfx.h"
+#include "SoundEditDialog.h"
 #include "soundrobj.h"
-#include "audiblesound.h"
-#include "utils.h"
-#include "sound3d.h"
-#include "playsounddialog.h"
-#include "w3dviewdoc.h"
-#include "datatreeview.h"
+#include "AudibleSound.h"
+#include "Utils.h"
+#include "Sound3D.h"
+#include "PlaySoundDialog.h"
+#include "W3DViewDoc.h"
+#include "DataTreeView.h"
 #include "assetmgr.h"
 
 
@@ -141,7 +141,7 @@ SoundEditDialogClass::OnInitDialog (void)
 	//
 	if (SoundRObj == NULL) {
 		SoundRObj = new SoundRenderObjClass;
-	}		
+	}
 
 	//
 	//	Choose default settings
@@ -155,7 +155,7 @@ SoundEditDialogClass::OnInitDialog (void)
 	bool is_3d					= true;
 	bool is_music				= false;
 	float loop_count			= 1;
-	float volume				= 1.0F;	
+	float volume				= 1.0F;
 
 	//
 	// Get the real settings from the sound object (if we have one)
@@ -165,12 +165,12 @@ SoundEditDialogClass::OnInitDialog (void)
 
 		Sound3DClass *sound_3d = sound->As_Sound3DClass ();
 		filename				= sound->Get_Filename ();
-		drop_off_radius	= sound->Get_DropOff_Radius ();		
+		drop_off_radius	= sound->Get_DropOff_Radius ();
 		priority				= sound->Peek_Priority ();
 		is_3d					= (sound_3d != NULL);
 		is_music				= (sound->Get_Type () == AudibleSoundClass::TYPE_MUSIC);
 		loop_count			= sound->Get_Loop_Count ();
-		volume				= sound->Get_Volume ();		
+		volume				= sound->Get_Volume ();
 
 		if (sound_3d != NULL) {
 			max_vol_radius	= sound_3d->Get_Max_Vol_Radius ();
@@ -207,7 +207,7 @@ SoundEditDialogClass::OnInitDialog (void)
 	//
 	::SetDlgItemFloat (m_hWnd, IDC_DROP_OFF_EDIT, drop_off_radius);
 	::SetDlgItemFloat (m_hWnd, IDC_MAX_VOL_EDIT, max_vol_radius);
-	::SetDlgItemFloat (m_hWnd, IDC_TRIGGER_RADIUS_EDIT, drop_off_radius);	
+	::SetDlgItemFloat (m_hWnd, IDC_TRIGGER_RADIUS_EDIT, drop_off_radius);
 
 	//
 	//	Make sure the appropriate controls are enabled/disabled
@@ -243,7 +243,7 @@ SoundEditDialogClass::OnOK (void)
 	AudibleSoundDefinitionClass definition;
 	definition.Initialize_From_Sound (sound);
 	REF_PTR_RELEASE (sound);
-	
+
 	//
 	//	Pass the sound definition onto the render object
 	//
@@ -257,7 +257,7 @@ SoundEditDialogClass::OnOK (void)
 	} else {
 		SoundRObj->Set_Flags (0);
 	}
-	
+
 	//
 	//	Name the render object
 	//
@@ -268,21 +268,21 @@ SoundEditDialogClass::OnOK (void)
 	//
 	CW3DViewDoc *doc = ::GetCurrentDocument ();
 	if (doc != NULL) {
-		
+
 		//
 		// Create a new prototype for this emitter and add it to the asset manager
 		//
 		SoundRenderObjDefClass *definition			= new SoundRenderObjDefClass (*SoundRObj);
 		SoundRenderObjPrototypeClass *prototype	= new SoundRenderObjPrototypeClass (definition);
-		
+
 		//
 		// Update the asset manager with the new prototype
 		//
-		if (OldName.Get_Length () > 0) {
+		if (!OldName.Is_Empty()) {
 			WW3DAssetManager::Get_Instance()->Remove_Prototype (OldName);
 		}
 		WW3DAssetManager::Get_Instance()->Add_Prototype (prototype);
-		
+
 		//
 		// Add the new object to the data tree
 		//
@@ -295,7 +295,7 @@ SoundEditDialogClass::OnOK (void)
 		doc->Reload_Displayed_Object ();
 		OldName = name;
 	}
-		
+
 	CDialog::OnOK ();
 	return ;
 }
@@ -343,8 +343,8 @@ SoundEditDialogClass::Create_Sound_Object (void)
 		//
 		int loop_count = SendDlgItemMessage (IDC_INFINITE_LOOPS_CHECK, BM_GETCHECK) ? 0 : 1;
 		sound->Set_Loop_Count (loop_count);
-		
-		bool is_music = bool (SendDlgItemMessage (IDC_MUSIC_RADIO, BM_GETCHECK) == 1);			
+
+		bool is_music = bool (SendDlgItemMessage (IDC_MUSIC_RADIO, BM_GETCHECK) == 1);
 		sound->Set_Type (is_music ? AudibleSoundClass::TYPE_MUSIC : AudibleSoundClass::TYPE_SOUND_EFFECT);
 
 		//
@@ -369,7 +369,7 @@ SoundEditDialogClass::Create_Sound_Object (void)
 			((Sound3DClass *)sound)->Set_Max_Vol_Radius (max_vol);
 		}
 	}
-	
+
 	return sound;
 }
 
@@ -413,7 +413,7 @@ SoundEditDialogClass::OnBrowse (void)
 		//
 		SetDlgItemText (IDC_FILENAME_EDIT, ::Get_Filename_From_Path (dialog.GetPathName ()));
 	}
-	
+
 	return ;
 }
 
@@ -453,7 +453,7 @@ void
 SoundEditDialogClass::Update_Enable_State (void)
 {
 	bool enable_3d = (SendDlgItemMessage (IDC_3D_RADIO, BM_GETCHECK) == 1);
-		
+
 	::EnableWindow (::GetDlgItem (m_hWnd, IDC_MAX_VOL_EDIT), enable_3d);
 	::EnableWindow (::GetDlgItem (m_hWnd, IDC_DROP_OFF_EDIT), enable_3d);
 	::EnableWindow (::GetDlgItem (m_hWnd, IDC_TRIGGER_RADIUS_EDIT), !enable_3d);
diff --git a/Core/Tools/W3DView/SoundEditDialog.h b/Core/Tools/W3DView/SoundEditDialog.h
index 8d4e63f28f6..6cf71c059f9 100644
--- a/Core/Tools/W3DView/SoundEditDialog.h
+++ b/Core/Tools/W3DView/SoundEditDialog.h
@@ -16,13 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SOUNDEDITDIALOG_H__376FEA4C_0A53_44FB_A6B5_DF0E96CF1DEF__INCLUDED_)
-#define AFX_SOUNDEDITDIALOG_H__376FEA4C_0A53_44FB_A6B5_DF0E96CF1DEF__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
-
 
 #include "wwstring.h"
 #include "resource.h"
@@ -67,7 +61,7 @@ class SoundEditDialogClass : public CDialog
 	//}}AFX_VIRTUAL
 
 // Implementation
-protected:	
+protected:
 #ifdef RTS_DEBUG
 	virtual void AssertValid() const;
 	virtual void Dump(CDumpContext& dc) const;
@@ -94,7 +88,7 @@ class SoundEditDialogClass : public CDialog
 	SoundRenderObjClass *	Get_Sound (void) const						{ if (SoundRObj != NULL) SoundRObj->Add_Ref (); return SoundRObj; }
 
 protected:
-	
+
 	///////////////////////////////////////////////////////
 	//	Protected methods
 	///////////////////////////////////////////////////////
@@ -113,5 +107,3 @@ class SoundEditDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SOUNDEDITDIALOG_H__376FEA4C_0A53_44FB_A6B5_DF0E96CF1DEF__INCLUDED_)
diff --git a/Core/Tools/W3DView/SphereColorPropPage.cpp b/Core/Tools/W3DView/SphereColorPropPage.cpp
index a4ecdff0205..51f2dc616f5 100644
--- a/Core/Tools/W3DView/SphereColorPropPage.cpp
+++ b/Core/Tools/W3DView/SphereColorPropPage.cpp
@@ -19,13 +19,13 @@
 // SphereColorPropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-#include "spherecolorproppage.h"
-#include "opacitysettingsdialog.h"
-#include "colorutils.h"
-#include "utils.h"
-#include "opacityvectordialog.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "SphereColorPropPage.h"
+#include "OpacitySettingsDialog.h"
+#include "ColorUtils.h"
+#include "Utils.h"
+#include "OpacityVectorDialog.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -108,7 +108,7 @@ SphereColorPropPageClass::Initialize (void)
 	m_AlphaChannel.Reset ();
 	m_OrigAlphaChannel.Reset ();
 	m_VectorChannel.Reset ();
-	m_OrigVectorChannel.Reset ();	
+	m_OrigVectorChannel.Reset ();
 
 	if (m_RenderObj != NULL) {
 
@@ -126,7 +126,7 @@ SphereColorPropPageClass::Initialize (void)
 
 		if (m_ColorChannel.Get_Key_Count () == 0) {
 			m_ColorChannel.Add_Key (m_RenderObj->Get_Color (), 0);
-			m_OrigColorChannel.Add_Key (m_RenderObj->Get_Color (), 0);			
+			m_OrigColorChannel.Add_Key (m_RenderObj->Get_Color (), 0);
 		}
 
 		if (m_AlphaChannel.Get_Key_Count () == 0) {
@@ -154,7 +154,7 @@ SphereColorPropPageClass::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CPropertyPage::OnInitDialog ();
-	
+
 	m_ColorBar		= ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_COLOR_BAR));
 	m_OpacityBar	= ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_OPACITY_BAR));
 	m_VectorBar		= ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_VECTOR_BAR));
@@ -198,7 +198,7 @@ SphereColorPropPageClass::OnInitDialog (void)
 											128,
 											128,
 											128);
-		
+
 		AlphaVectorStruct *data = new AlphaVectorStruct (m_OrigVectorChannel[index].Get_Value ());
 		m_VectorBar->Set_User_Data (index, (ULONG)data);
 	}
@@ -214,7 +214,7 @@ SphereColorPropPageClass::OnInitDialog (void)
 	//	Ensure the disabled status of the dialog controls is correct
 	//
 	CheckDlgButton (IDC_OPACITY_VECTOR_CHECK, (m_RenderObj->Get_Flags () & SphereRenderObjClass::USE_ALPHA_VECTOR) != 0);
-	CheckDlgButton (IDC_INVERT_VECTOR_CHECK, (m_RenderObj->Get_Flags () & SphereRenderObjClass::USE_INVERSE_ALPHA) != 0);	
+	CheckDlgButton (IDC_INVERT_VECTOR_CHECK, (m_RenderObj->Get_Flags () & SphereRenderObjClass::USE_INVERSE_ALPHA) != 0);
 	OnOpacityVectorCheck ();
 	return TRUE;
 }
@@ -252,7 +252,7 @@ SphereColorPropPageClass::OnDestroy (void)
 			m_VectorBar->Set_User_Data (index, 0L);
 		}
 	}
-	
+
 	CPropertyPage::OnDestroy();
 	return ;
 }
@@ -269,7 +269,7 @@ SphereColorPropPageClass::OnNotify
 	WPARAM wParam,
 	LPARAM lParam,
 	LRESULT *pResult
-) 
+)
 {
 	CBR_NMHDR *color_bar_hdr = (CBR_NMHDR *)lParam;
 
@@ -280,8 +280,8 @@ SphereColorPropPageClass::OnNotify
 	{
 		case IDC_OPACITY_BAR:
 		{
-			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {			
-				
+			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
+
 				//
 				//	Allow the user to edit the keyframe
 				//
@@ -296,28 +296,28 @@ SphereColorPropPageClass::OnNotify
 					//
 					// Update the object
 					//
-					Update_Opacities ();					
-					SetModified ();					
+					Update_Opacities ();
+					SetModified ();
 				}
 			} else if ((color_bar_hdr->hdr.code == CBRN_MOVING_POINT) ||
 						  (color_bar_hdr->hdr.code == CBRN_DELETED_POINT))
-			{				
+			{
 				//
 				// Update the object
 				//
 				Update_Opacities ();
-				SetModified ();					
+				SetModified ();
 			}
 		}
 		break;
 
 		case IDC_COLOR_BAR:
 		{
-			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {			
-				
+			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
+
 				//
 				//	Allow the user to edit the keyframe
-				//				
+				//
 				int red		= (int)color_bar_hdr->red;
 				int green	= (int)color_bar_hdr->green;
 				int blue		= (int)color_bar_hdr->blue;
@@ -331,7 +331,7 @@ SphereColorPropPageClass::OnNotify
 					//
 					// Update the object
 					//
-					Update_Colors ();					
+					Update_Colors ();
 					SetModified ();
 				}
 
@@ -352,10 +352,10 @@ SphereColorPropPageClass::OnNotify
 			bool update = false;
 
 			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
-				
+
 				AlphaVectorStruct *data = (AlphaVectorStruct *)m_VectorBar->Get_User_Data (color_bar_hdr->key_index);
 				if (data != NULL) {
-					
+
 					//
 					//	Set-up the dialog so the user can edit this keyframe
 					//
@@ -380,7 +380,7 @@ SphereColorPropPageClass::OnNotify
 				AlphaVectorStruct *data = (AlphaVectorStruct *)m_VectorBar->Get_User_Data (color_bar_hdr->key_index);
 				SAFE_DELETE (data);
 				m_VectorBar->Set_User_Data (color_bar_hdr->key_index, 0L);
-			} else if (color_bar_hdr->hdr.code == CBRN_INSERTED_POINT) {				
+			} else if (color_bar_hdr->hdr.code == CBRN_INSERTED_POINT) {
 				AlphaVectorStruct *prev_data	= (AlphaVectorStruct *)m_VectorBar->Get_User_Data (color_bar_hdr->key_index - 1);
 				AlphaVectorStruct *next_data	= (AlphaVectorStruct *)m_VectorBar->Get_User_Data (color_bar_hdr->key_index + 1);
 				AlphaVectorStruct *new_data	= new AlphaVectorStruct;
@@ -388,7 +388,7 @@ SphereColorPropPageClass::OnNotify
 				if (next_data == NULL) {
 					(*new_data) = (*prev_data);
 				} else {
-					
+
 					//
 					//	Determine what the new data should be based on its position between
 					// the prev and next keys.
@@ -419,13 +419,13 @@ SphereColorPropPageClass::OnNotify
 			// Update the object
 			//
 			if (update) {
-				Update_Vectors ();				
+				Update_Vectors ();
 				SetModified ();
 			}
 		}
 		break;
 	}
-		
+
 	return CPropertyPage::OnNotify (wParam, lParam, pResult);
 }
 
@@ -467,10 +467,10 @@ SphereColorPropPageClass::Update_Opacities (void)
 	float red		= 0;
 	float green		= 0;
 	float blue		= 0;
-	
+
 	//
 	//	Build the channel
-	//	
+	//
 	int count = m_OpacityBar->Get_Point_Count ();
 	for (int index = 0; index < count; index ++) {
 		m_OpacityBar->Get_Point (index, &position, &red, &green, &blue);
@@ -493,17 +493,17 @@ SphereColorPropPageClass::Update_Opacities (void)
 /////////////////////////////////////////////////////////////
 void
 SphereColorPropPageClass::Update_Colors (void)
-{		
+{
 	m_ColorChannel.Reset ();
 
 	float position	= 0;
 	float red		= 0;
 	float green		= 0;
-	float blue		= 0;	
-		
+	float blue		= 0;
+
 	//
 	//	Build the channel
-	//		
+	//
 	int count = m_ColorBar->Get_Point_Count ();
 	for (int index = 0; index < count; index ++) {
 		m_ColorBar->Get_Point (index, &position, &red, &green, &blue);
@@ -536,11 +536,11 @@ SphereColorPropPageClass::Update_Vectors (void)
 
 	//
 	//	Build the channel
-	//	
+	//
 	int count = m_VectorBar->Get_Point_Count ();
 	for (int index = 0; index < count; index ++) {
 		m_VectorBar->Get_Point (index, &position, &red, &green, &blue);
-			
+
 		AlphaVectorStruct *data = (AlphaVectorStruct *)m_VectorBar->Get_User_Data (index);
 		if (data != NULL) {
 			m_VectorChannel.Add_Key (*data, position);
@@ -598,7 +598,7 @@ SphereColorPropPageClass::OnInvertVectorCheck (void)
 	//
 	//	Update the render object
 	//
-	m_RenderObj->Set_Flag (SphereRenderObjClass::USE_INVERSE_ALPHA, is_checked);	
+	m_RenderObj->Set_Flag (SphereRenderObjClass::USE_INVERSE_ALPHA, is_checked);
 	SetModified ();
 	return ;
 }
diff --git a/Core/Tools/W3DView/SphereColorPropPage.h b/Core/Tools/W3DView/SphereColorPropPage.h
index 37c54572ac4..a461d862c78 100644
--- a/Core/Tools/W3DView/SphereColorPropPage.h
+++ b/Core/Tools/W3DView/SphereColorPropPage.h
@@ -16,18 +16,14 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SPHERECOLORPROPPAGE_H__E86BBE86_F527_11D3_A08F_00104B791122__INCLUDED_)
-#define AFX_SPHERECOLORPROPPAGE_H__E86BBE86_F527_11D3_A08F_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // SphereColorPropPage.h : header file
 //
 
 #include "resource.h"
 #include "sphereobj.h"
-#include "colorbar.h"
+#include "ColorBar.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -83,7 +79,7 @@ class SphereColorPropPageClass : public CPropertyPage
 	//
 	//	Inline accessors
 	//
-	
+
 	SphereRenderObjClass *		Get_Sphere (void) const							{ return m_RenderObj; }
 	void								Set_Sphere (SphereRenderObjClass *sphere)	{ m_RenderObj = sphere; Initialize (); }
 	bool								Is_Data_Valid (void) const						{ return m_bValid; }
@@ -111,17 +107,14 @@ class SphereColorPropPageClass : public CPropertyPage
 	ColorBarClass *				m_VectorBar;
 	bool								m_EnableOpactiyVector;
 	bool								m_InvertVector;
-	
+
 	SphereColorChannelClass		m_ColorChannel;
 	SphereColorChannelClass		m_OrigColorChannel;
 	SphereAlphaChannelClass		m_AlphaChannel;
 	SphereAlphaChannelClass		m_OrigAlphaChannel;
 	SphereVectorChannelClass	m_VectorChannel;
-	SphereVectorChannelClass	m_OrigVectorChannel;	
+	SphereVectorChannelClass	m_OrigVectorChannel;
 };
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SPHERECOLORPROPPAGE_H__E86BBE86_F527_11D3_A08F_00104B791122__INCLUDED_)
-
diff --git a/Core/Tools/W3DView/SphereGeneralPropPage.cpp b/Core/Tools/W3DView/SphereGeneralPropPage.cpp
index 310d15ea127..9e8b57fa5f7 100644
--- a/Core/Tools/W3DView/SphereGeneralPropPage.cpp
+++ b/Core/Tools/W3DView/SphereGeneralPropPage.cpp
@@ -19,10 +19,10 @@
 // SphereGeneralPropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "SphereGeneralPropPage.h"
-#include "utils.h"
+#include "Utils.h"
 #include "assetmgr.h"
 #include "texture.h"
 
@@ -104,7 +104,7 @@ SphereGeneralPropPageClass::Initialize (void)
 		if (texture != NULL) {
 			m_TextureFilename = texture->Get_Texture_Name();
 		}
-		
+
 		//
 		//	Get the other misc data we care about
 		//
@@ -155,7 +155,7 @@ SphereGeneralPropPageClass::Add_Shader_To_Combo
 //
 /////////////////////////////////////////////////////////////
 BOOL
-SphereGeneralPropPageClass::OnInitDialog (void) 
+SphereGeneralPropPageClass::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CPropertyPage::OnInitDialog ();
@@ -166,13 +166,13 @@ SphereGeneralPropPageClass::OnInitDialog (void)
 	Add_Shader_To_Combo (ShaderClass::_PresetAdditiveShader, "Additive");
 	Add_Shader_To_Combo (ShaderClass::_PresetAlphaShader, "Alpha");
 	Add_Shader_To_Combo (ShaderClass::_PresetOpaqueShader, "Opaque");
-	Add_Shader_To_Combo (ShaderClass::_PresetMultiplicativeShader, "Multiplicative");	
-	
+	Add_Shader_To_Combo (ShaderClass::_PresetMultiplicativeShader, "Multiplicative");
+
 	CheckDlgButton (IDC_CAMERA_ALIGNED_CHECK, (m_RenderObj->Get_Flags () & SphereRenderObjClass::USE_CAMERA_ALIGN) != 0);
-	CheckDlgButton (IDC_LOOPING_CHECK, (m_RenderObj->Get_Flags () & SphereRenderObjClass::USE_ANIMATION_LOOP) != 0);	
+	CheckDlgButton (IDC_LOOPING_CHECK, (m_RenderObj->Get_Flags () & SphereRenderObjClass::USE_ANIMATION_LOOP) != 0);
 
 	//
-	// Fill the edit controls with the default values	
+	// Fill the edit controls with the default values
 	//
 	SetDlgItemText (IDC_NAME_EDIT, m_Name);
 	SetDlgItemText (IDC_FILENAME_EDIT, m_TextureFilename);
@@ -219,7 +219,7 @@ SphereGeneralPropPageClass::OnApply (void)
 		//
 		//	Create a texture and pass it onto the object
 		//
-		TextureClass *texture = NULL;		
+		TextureClass *texture = NULL;
 		if (m_TextureFilename.GetLength () > 0) {
 			texture = WW3DAssetManager::Get_Instance ()->Get_Texture (::Get_Filename_From_Path (m_TextureFilename));
 		}
@@ -234,12 +234,12 @@ SphereGeneralPropPageClass::OnApply (void)
 		m_RenderObj->Set_Animation_Duration (m_Lifetime);
 		m_RenderObj->Set_Flag (SphereRenderObjClass::USE_CAMERA_ALIGN, IsDlgButtonChecked (IDC_CAMERA_ALIGNED_CHECK) != 0);
 		m_RenderObj->Set_Flag (SphereRenderObjClass::USE_ANIMATION_LOOP, IsDlgButtonChecked (IDC_LOOPING_CHECK) != 0);
-		
+
 		// Allow the base class to process this message
 		retval = CPropertyPage::OnApply ();
 		m_bValid = true;
 	}
-	
+
 	// Return the TRUE/FALSE result code
 	return retval;
 }
@@ -251,7 +251,7 @@ SphereGeneralPropPageClass::OnApply (void)
 //
 /////////////////////////////////////////////////////////////
 void
-SphereGeneralPropPageClass::OnBrowseButton (void) 
+SphereGeneralPropPageClass::OnBrowseButton (void)
 {
 	CFileDialog dialog (	TRUE,
 								".tga",
@@ -266,7 +266,7 @@ SphereGeneralPropPageClass::OnBrowseButton (void)
 		SetModified ();
 	}
 
-	return ;	
+	return ;
 }
 
 
@@ -314,7 +314,7 @@ SphereGeneralPropPageClass::OnNotify
 	//
 	NMHDR *header = (NMHDR *)lParam;
 	if ((header != NULL) && (header->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN updown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN updown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (header->hwndFrom, updown->iDelta);
 	}
 
@@ -329,7 +329,7 @@ SphereGeneralPropPageClass::OnNotify
 //
 /////////////////////////////////////////////////////////////
 void
-SphereGeneralPropPageClass::OnChangeLifetimeEdit (void) 
+SphereGeneralPropPageClass::OnChangeLifetimeEdit (void)
 {
 	SetModified ();
 	return ;
@@ -362,7 +362,7 @@ SphereGeneralPropPageClass::OnCommand
 )
 {
 	switch (LOWORD (wParam))
-	{		
+	{
 		case IDC_FILENAME_EDIT:
 		case IDC_NAME_EDIT:
 		case IDC_LIFETIME_EDIT:
diff --git a/Core/Tools/W3DView/SphereGeneralPropPage.h b/Core/Tools/W3DView/SphereGeneralPropPage.h
index 2c85daeb647..f3e3c919edb 100644
--- a/Core/Tools/W3DView/SphereGeneralPropPage.h
+++ b/Core/Tools/W3DView/SphereGeneralPropPage.h
@@ -16,18 +16,14 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SPHEREGENERALPROPPAGE_H__E86BBE83_F527_11D3_A08F_00104B791122__INCLUDED_)
-#define AFX_SPHEREGENERALPROPPAGE_H__E86BBE83_F527_11D3_A08F_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // SphereGeneralPropPage.h : header file
 //
 
 #include "resource.h"
 #include "sphereobj.h"
-#include "shader.H"
+#include "shader.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -116,5 +112,3 @@ class SphereGeneralPropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SPHEREGENERALPROPPAGE_H__E86BBE83_F527_11D3_A08F_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/SpherePropertySheet.cpp b/Core/Tools/W3DView/SpherePropertySheet.cpp
index 5e87fab5f88..400f73d6311 100644
--- a/Core/Tools/W3DView/SpherePropertySheet.cpp
+++ b/Core/Tools/W3DView/SpherePropertySheet.cpp
@@ -19,13 +19,13 @@
 // SpherePropertySheet.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
+#include "StdAfx.h"
+#include "W3DView.h"
 #include "SpherePropertySheet.h"
-#include "utils.h"
+#include "Utils.h"
 #include "W3DViewDoc.h"
 #include "assetmgr.h"
-#include "datatreeview.h"
+#include "DataTreeView.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -51,7 +51,7 @@ SpherePropertySheetClass::SpherePropertySheetClass
 	:	m_RenderObj (NULL),
 		CPropertySheet(nIDCaption, pParentWnd, iSelectPage)
 {
-	MEMBER_ADD (m_RenderObj, sphere);
+	REF_PTR_SET (m_RenderObj, sphere);
 	Initialize ();
 	return ;
 }
@@ -69,10 +69,10 @@ SpherePropertySheetClass::SpherePropertySheetClass
 	CWnd *							pParentWnd,
 	UINT								iSelectPage
 )
-	:	m_RenderObj (NULL),		
+	:	m_RenderObj (NULL),
 		CPropertySheet(pszCaption, pParentWnd, iSelectPage)
 {
-	MEMBER_ADD (m_RenderObj, sphere);
+	REF_PTR_SET (m_RenderObj, sphere);
 	Initialize ();
 	return ;
 }
@@ -85,7 +85,7 @@ SpherePropertySheetClass::SpherePropertySheetClass
 /////////////////////////////////////////////////////////////////////////////
 SpherePropertySheetClass::~SpherePropertySheetClass (void)
 {
-	MEMBER_RELEASE (m_RenderObj);
+	REF_PTR_RELEASE (m_RenderObj);
 	return ;
 }
 
@@ -140,7 +140,7 @@ SpherePropertySheetClass::WindowProc
 
 				case IDOK:
 				case ID_APPLY_NOW:
-				{					
+				{
 					// Did the user click the button?
 					if (HIWORD (wParam) == BN_CLICKED) {
 						LRESULT lresult = CPropertySheet::WindowProc (message, wParam, lParam);
@@ -149,11 +149,11 @@ SpherePropertySheetClass::WindowProc
 						if (	m_GeneralPage.Is_Data_Valid () &&
 								m_ColorPage.Is_Data_Valid () &&
 								m_ScalePage.Is_Data_Valid ())
-						{							
+						{
 							// Update the current emitter to match the data
 							Update_Object ();
 						}
-												
+
 						return lresult;
 					}
 				}
@@ -179,12 +179,12 @@ SpherePropertySheetClass::Add_Object_To_Viewer (void)
 {
 	CW3DViewDoc *doc = ::GetCurrentDocument ();
 	if ((doc != NULL) && (m_RenderObj != NULL)) {
-		
+
 		//
 		// Create a new prototype for this object
 		//
 		SpherePrototypeClass *prototype	= new SpherePrototypeClass (m_RenderObj);
-		
+
 		//
 		// Update the asset manager with the new prototype
 		//
@@ -192,7 +192,7 @@ SpherePropertySheetClass::Add_Object_To_Viewer (void)
 			WW3DAssetManager::Get_Instance()->Remove_Prototype (m_LastSavedName);
 		}
 		WW3DAssetManager::Get_Instance()->Add_Prototype (prototype);
-		
+
 		//
 		// Add this object to the data tree
 		//
@@ -204,7 +204,7 @@ SpherePropertySheetClass::Add_Object_To_Viewer (void)
 		//
 		doc->Reload_Displayed_Object ();
 		m_LastSavedName = m_RenderObj->Get_Name ();
-		MEMBER_ADD (m_RenderObj, (SphereRenderObjClass *)doc->GetDisplayedObject ());
+		REF_PTR_SET (m_RenderObj, (SphereRenderObjClass *)doc->GetDisplayedObject ());
 
 		//
 		// Pass the object along to the pages
@@ -261,7 +261,7 @@ SpherePropertySheetClass::Initialize (void)
 
 	//
 	//	Force the pages to be created up front
-	//	
+	//
 	m_GeneralPage.m_psp.dwFlags	|= PSP_PREMATURE;
 	m_ColorPage.m_psp.dwFlags		|= PSP_PREMATURE;
 	m_ScalePage.m_psp.dwFlags		|= PSP_PREMATURE;
diff --git a/Core/Tools/W3DView/SpherePropertySheet.h b/Core/Tools/W3DView/SpherePropertySheet.h
index 4597e9c8002..65b9a5777c0 100644
--- a/Core/Tools/W3DView/SpherePropertySheet.h
+++ b/Core/Tools/W3DView/SpherePropertySheet.h
@@ -34,17 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SPHERE_PROPERTY_SHEET_H
-#define __SPHERE_PROPERTY_SHEET_H
 
-#include "SphereColorPropPage.H"
-#include "SphereGeneralPropPage.H"
-#include "SphereSizePropPage.H"
+#include "SphereColorPropPage.h"
+#include "SphereGeneralPropPage.h"
+#include "SphereSizePropPage.h"
 
 
 // Forward declarations
@@ -97,13 +91,13 @@ class SpherePropertySheetClass : public CPropertySheet
 	//////////////////////////////////////////////////////////////////////
 
 protected:
-	
+
 	//////////////////////////////////////////////////////////////////////
 	//	Protected methods
 	//////////////////////////////////////////////////////////////////////
 	void							Initialize (void);
 	SphereRenderObjClass *	Create_Object (void);
-	void							Update_Object (void);	
+	void							Update_Object (void);
 	void							Add_Object_To_Viewer (void);
 	void							Create_New_Object (void);
 
@@ -120,5 +114,3 @@ class SpherePropertySheetClass : public CPropertySheet
 };
 
 /////////////////////////////////////////////////////////////////////////////
-
-#endif //__SPHERE_PROPERTY_SHEET_H
diff --git a/Core/Tools/W3DView/SphereSizePropPage.cpp b/Core/Tools/W3DView/SphereSizePropPage.cpp
index b9c30a31ad3..70cd13ac186 100644
--- a/Core/Tools/W3DView/SphereSizePropPage.cpp
+++ b/Core/Tools/W3DView/SphereSizePropPage.cpp
@@ -19,12 +19,12 @@
 // SphereSizePropPage.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-#include "spheresizeproppage.h"
-#include "colorutils.h"
-#include "utils.h"
-#include "scaledialog.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "SphereSizePropPage.h"
+#include "ColorUtils.h"
+#include "Utils.h"
+#include "ScaleDialog.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -53,13 +53,13 @@ SphereSizePropPageClass::SphereSizePropPageClass (SphereRenderObjClass *sphere)
 		m_ScaleXBar (NULL),
 		m_ScaleYBar (NULL),
 		m_ScaleZBar (NULL),
-		m_Size (0.5F, 0.5F, 0.5F),	
+		m_Size (0.5F, 0.5F, 0.5F),
 		CPropertyPage(SphereSizePropPageClass::IDD)
 {
 	//{{AFX_DATA_INIT(SphereSizePropPageClass)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
-	
+
 	Initialize ();
 	return ;
 }
@@ -137,7 +137,7 @@ SphereSizePropPageClass::OnInitDialog (void)
 {
 	// Allow the base class to process this message
 	CPropertyPage::OnInitDialog ();
-	
+
 	m_ScaleXBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_SCALE_BAR_X));
 	m_ScaleYBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_SCALE_BAR_Y));
 	m_ScaleZBar = ColorBarClass::Get_Color_Bar (::GetDlgItem (m_hWnd, IDC_SCALE_BAR_Z));
@@ -147,7 +147,7 @@ SphereSizePropPageClass::OnInitDialog (void)
 	//
 	::Initialize_Spinner (m_SizeXSpin, m_Size.X, 0, 10000);
 	::Initialize_Spinner (m_SizeYSpin, m_Size.Y, 0, 10000);
-	::Initialize_Spinner (m_SizeZSpin, m_Size.Z, 0, 10000);	
+	::Initialize_Spinner (m_SizeZSpin, m_Size.Z, 0, 10000);
 
 	//
 	// Setup the timelines
@@ -175,7 +175,7 @@ SphereSizePropPageClass::OnInitDialog (void)
 	for (int index = 1; index < m_OrigScaleChannel.Get_Key_Count (); index ++) {
 		const LERPAnimationChannelClass<Vector3>::KeyClass &prev_value = m_OrigScaleChannel.Get_Key (index - 1);
 		const LERPAnimationChannelClass<Vector3>::KeyClass &curr_value = m_OrigScaleChannel.Get_Key (index);
-		
+
 		//
 		//	Find out which channels are unique (we toss the others)
 		//
@@ -290,7 +290,7 @@ SphereSizePropPageClass::OnNotify
 	WPARAM wParam,
 	LPARAM lParam,
 	LRESULT *pResult
-) 
+)
 {
 	CBR_NMHDR *color_bar_hdr = (CBR_NMHDR *)lParam;
 
@@ -318,7 +318,7 @@ SphereSizePropPageClass::OnNotify
 			bool update =	(color_bar_hdr->hdr.code == CBRN_MOVING_POINT) ||
 								(color_bar_hdr->hdr.code == CBRN_DELETED_POINT);
 
-			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {			
+			if (color_bar_hdr->hdr.code == CBRN_DBLCLK_POINT) {
 
 				//
 				//	Allow the user to edit the keyframe
@@ -333,13 +333,13 @@ SphereSizePropPageClass::OnNotify
 					timeline->Set_Graph_Percent (color_bar_hdr->key_index, dialog.Get_Scale ());
 					update = true;
 				}
-			} 
-			
+			}
+
 			//
 			//	Update the object
-			//			
-			if (update) {				
-				Update_Scale_Array ();				
+			//
+			if (update) {
+				Update_Scale_Array ();
 				SetModified ();
 			}
 		}
@@ -358,7 +358,7 @@ SphereSizePropPageClass::OnNotify
 		}
 		break;
 	}
-		
+
 	return CPropertyPage::OnNotify (wParam, lParam, pResult);
 }
 
@@ -435,7 +435,7 @@ SphereSizePropPageClass::Update_Scale_Array (void)
 	float position	= 0;
 	float red		= 0;
 	float green		= 0;
-	float blue		= 0;	
+	float blue		= 0;
 
 	//
 	//	Allocate arrays we can store the 3 separate timelines in
@@ -446,29 +446,29 @@ SphereSizePropPageClass::Update_Scale_Array (void)
 	LERPAnimationChannelClass<float> x_values;
 	LERPAnimationChannelClass<float> y_values;
 	LERPAnimationChannelClass<float> z_values;
-	
+
 	//
 	//	Build the X-axis timline
 	//
 	int index;
 	for (index = 0; index < max_x; index++) {
-		m_ScaleXBar->Get_Point (index, &position, &red, &green, &blue);		
+		m_ScaleXBar->Get_Point (index, &position, &red, &green, &blue);
 		x_values.Add_Key (m_ScaleXBar->Get_Graph_Percent (index), position);
 	}
 
 	//
 	//	Build the Y-axis timline
 	//
-	for (index = 0; index < max_y; index++) {		
-		m_ScaleYBar->Get_Point (index, &position, &red, &green, &blue);		
+	for (index = 0; index < max_y; index++) {
+		m_ScaleYBar->Get_Point (index, &position, &red, &green, &blue);
 		y_values.Add_Key (m_ScaleYBar->Get_Graph_Percent (index), position);
 	}
 
 	//
 	//	Build the Z-axis timline
-	//	
-	for (index = 0; index < max_z; index++) {		
-		m_ScaleZBar->Get_Point (index, &position, &red, &green, &blue);		
+	//
+	for (index = 0; index < max_z; index++) {
+		m_ScaleZBar->Get_Point (index, &position, &red, &green, &blue);
 		z_values.Add_Key (m_ScaleZBar->Get_Graph_Percent (index), position);
 	}
 
@@ -485,7 +485,7 @@ SphereSizePropPageClass::Update_Scale_Array (void)
 	while (	x_index < max_x ||
 				y_index < max_y ||
 				z_index < max_z)
-	{		
+	{
 		//
 		//	Find the smallest time
 		//
diff --git a/Core/Tools/W3DView/SphereSizePropPage.h b/Core/Tools/W3DView/SphereSizePropPage.h
index c18531b10c9..ac6657054e6 100644
--- a/Core/Tools/W3DView/SphereSizePropPage.h
+++ b/Core/Tools/W3DView/SphereSizePropPage.h
@@ -16,18 +16,14 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SPHERESIZEPROPPAGE_H__E86BBE8A_F527_11D3_A08F_00104B791122__INCLUDED_)
-#define AFX_SPHERESIZEPROPPAGE_H__E86BBE8A_F527_11D3_A08F_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // SphereSizePropPage.h : header file
 //
 
 #include "resource.h"
 #include "sphereobj.h"
-#include "colorbar.h"
+#include "ColorBar.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -83,7 +79,7 @@ class SphereSizePropPageClass : public CPropertyPage
 	//
 	//	Inline accessors
 	//
-	
+
 	SphereRenderObjClass *		Get_Sphere (void) const							{ return m_RenderObj; }
 	void								Set_Sphere (SphereRenderObjClass *sphere)	{ m_RenderObj = sphere; Initialize (); }
 	bool								Is_Data_Valid (void) const						{ return m_bValid; }
@@ -114,5 +110,3 @@ class SphereSizePropPageClass : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SPHERESIZEPROPPAGE_H__E86BBE8A_F527_11D3_A08F_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/SphereUtils.cpp b/Core/Tools/W3DView/SphereUtils.cpp
index 29799b0fb03..6e055391724 100644
--- a/Core/Tools/W3DView/SphereUtils.cpp
+++ b/Core/Tools/W3DView/SphereUtils.cpp
@@ -57,7 +57,7 @@ SphereKeysClass::Resize (int max_keys)
 		//	Allocate the new array
 		//
 		W3dSphereKeyFrameStruct *key_array = new W3dSphereKeyFrameStruct[array_size];
-		
+
 		//
 		//	Copy the contents of the old array
 		//
diff --git a/Core/Tools/W3DView/SphereUtils.h b/Core/Tools/W3DView/SphereUtils.h
index 3f615b0f1bd..cb60d555450 100644
--- a/Core/Tools/W3DView/SphereUtils.h
+++ b/Core/Tools/W3DView/SphereUtils.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __SPHERE_UTILS
-#define __SPHERE_UTILS
 
 #include "sphereobj.h"
 
@@ -61,7 +56,7 @@ class SphereKeysClass
 			m_MaxKeys (0)		{ }
 
 	virtual ~SphereKeysClass (void)	{ Free_Keys (); }
-	
+
 	/////////////////////////////////////////////////////////////
 	//	Public methods
 	/////////////////////////////////////////////////////////////
@@ -91,7 +86,3 @@ class SphereKeysClass
 	int								m_KeyCount;
 	int								m_MaxKeys;
 };
-
-
-#endif //__SPHERE_UTILS
-
diff --git a/Core/Tools/W3DView/StdAfx.cpp b/Core/Tools/W3DView/StdAfx.cpp
index 121a0545d80..90ea71caad2 100644
--- a/Core/Tools/W3DView/StdAfx.cpp
+++ b/Core/Tools/W3DView/StdAfx.cpp
@@ -20,5 +20,5 @@
 //	W3DView.pch will be the pre-compiled header
 //	stdafx.obj will contain the pre-compiled type information
 
-#include "stdafx.h"
+#include "StdAfx.h"
 
diff --git a/Core/Tools/W3DView/StdAfx.h b/Core/Tools/W3DView/StdAfx.h
index 2c77198efb5..c95bcb3a634 100644
--- a/Core/Tools/W3DView/StdAfx.h
+++ b/Core/Tools/W3DView/StdAfx.h
@@ -21,18 +21,13 @@
 //      are changed infrequently
 //
 
-#if !defined(AFX_STDAFX_H__2BB39E2D_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
-#define AFX_STDAFX_H__2BB39E2D_5D3A_11D2_9FC6_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
-#include "Always.h"
+#include "always.h"
 
-// TheSuperHackers @compile jlallas384 05/04/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
+// TheSuperHackers @build jlallas384 05/04/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
 #define _d3d9TYPES_H_
 
 #include <afxwin.h>         // MFC core and standard components
@@ -43,5 +38,3 @@
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__2BB39E2D_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/TextureMgrDialog.cpp b/Core/Tools/W3DView/TextureMgrDialog.cpp
index b694c012b85..a639372773b 100644
--- a/Core/Tools/W3DView/TextureMgrDialog.cpp
+++ b/Core/Tools/W3DView/TextureMgrDialog.cpp
@@ -35,13 +35,13 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "StdAfx.H"
-#include "W3DView.H"
-#include "TextureMgrDialog.H"
-#include "Mesh.H"
-#include "MatInfo.H"
-#include "TextureSettingsDialog.H"
-#include "AssetMgr.H"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "TextureMgrDialog.h"
+#include "Mesh.h"
+#include "MatInfo.h"
+#include "TextureSettingsDialog.h"
+#include "AssetMgr.h"
 #include "texture.h"
 
 
@@ -131,8 +131,8 @@ TextureMgrDialogClass::Fill_List_Ctrl_With_Meshes (void)
 {
 	m_ListCtrl.DeleteAllItems ();
 	m_ListCtrl.SetImageList (m_pImageList, LVSIL_NORMAL);
-	m_ListCtrl.SetImageList (m_pImageListSmall, LVSIL_SMALL);	
-	m_ListCtrl.DeleteColumn (COL_TEXTURE_TYPE);	
+	m_ListCtrl.SetImageList (m_pImageListSmall, LVSIL_SMALL);
+	m_ListCtrl.DeleteColumn (COL_TEXTURE_TYPE);
 	m_ListCtrl.DeleteColumn (COL_DIMENSIONS);
 
 	// Add the textures column
@@ -142,12 +142,12 @@ TextureMgrDialogClass::Fill_List_Ctrl_With_Meshes (void)
 
 	// Loop through the list of mesh's and add them to the list control
 	for (int index = 0; index < m_NodeList.Count (); index ++) {
-		
+
 		// Add this mesh to the list control
 		TextureListNodeClass *pnode = m_NodeList[index];
 		int list_index = m_ListCtrl.InsertItem (0, pnode->Get_Name (), pnode->Get_Icon_Index ());
 		if (list_index != -1) {
-			
+
 			// Insert the texture count in the second column
 			CString texture_string;
 			texture_string.Format ("%d textures", pnode->Get_Subobj_List ().Count ());
@@ -174,7 +174,7 @@ TextureMgrDialogClass::Fill_List_Ctrl_With_Meshes (void)
 //
 void
 TextureMgrDialogClass::Fill_List_Ctrl_With_Textures (TextureListNodeClass &parent_node)
-{	
+{
 	m_ListCtrl.DeleteAllItems ();
 	m_ListCtrl.SetImageList (m_pTextureImageList, LVSIL_NORMAL);
 	m_ListCtrl.SetImageList (m_pTextureImageListSmall, LVSIL_SMALL);
@@ -184,12 +184,12 @@ TextureMgrDialogClass::Fill_List_Ctrl_With_Textures (TextureListNodeClass &paren
 	CRect rect;
 	m_ListCtrl.GetClientRect (&rect);
 	m_ListCtrl.InsertColumn (COL_DIMENSIONS, "Dimensions", LVCFMT_LEFT, (rect.Width () / 4) - 10);
-	m_ListCtrl.InsertColumn (COL_TEXTURE_TYPE, "Texture Type", LVCFMT_LEFT, (rect.Width () / 4) - 10);	
+	m_ListCtrl.InsertColumn (COL_TEXTURE_TYPE, "Texture Type", LVCFMT_LEFT, (rect.Width () / 4) - 10);
 
 	// Loop through the list of textures and add them to the list control
 	TEXTURE_NODE_LIST &node_list = parent_node.Get_Subobj_List ();
 	for (int index = 0; index < node_list.Count (); index ++) {
-		
+
 		// Add this mesh to the list control
 		TextureListNodeClass *pnode = node_list[index];
 		int list_index = m_ListCtrl.InsertItem (0, pnode->Get_Name (), pnode->Get_Icon_Index ());
@@ -210,7 +210,7 @@ TextureMgrDialogClass::Fill_List_Ctrl_With_Textures (TextureListNodeClass &paren
 BOOL
 TextureMgrDialogClass::OnInitDialog (void)
 {
-	CWaitCursor wait_cursor;	
+	CWaitCursor wait_cursor;
 
 	// Allow the base class to process this message
 	CDialog::OnInitDialog ();
@@ -254,11 +254,11 @@ TextureMgrDialogClass::OnInitDialog (void)
 															  16,
 															  16,
 															  LR_SHARED));
-	
+
 	// Add the name column to the list control
 	m_ListCtrl.GetClientRect (&rect);
 	m_ListCtrl.InsertColumn (COL_NAME, "Name", LVCFMT_LEFT, (rect.Width () / 2) - 20);
-	
+
 	// Build a list of mesh's and textures
 	Add_Subobjs_To_List (m_pBaseModel);
 	Fill_List_Ctrl_With_Meshes ();
@@ -276,20 +276,20 @@ TextureMgrDialogClass::Add_Subobjs_To_List (RenderObjClass *prender_obj)
 	// Loop through all the subobjs in this render object
 	int subobj_count = prender_obj->Get_Num_Sub_Objects ();
 	for (int index = 0; index < subobj_count; index ++) {
-		
+
 		// Get a pointer to this subobject
 		RenderObjClass *psubobj = prender_obj->Get_Sub_Object (index);
 		if (psubobj != NULL) {
-			
+
 			// Recursively add subobjs to the list
 			Add_Subobjs_To_List (psubobj);
-			MEMBER_RELEASE (psubobj);
+			REF_PTR_RELEASE (psubobj);
 		}
 	}
 
 	// If this is a mesh, then add it to the list
 	if (prender_obj->Class_ID () == RenderObjClass::CLASSID_MESH) {
-		
+
 		// Create a new node and add it to our list
 		TextureListNodeClass *pnode = new TextureListNodeClass (prender_obj->Get_Name ());
 		m_NodeList.Add (pnode);
@@ -315,7 +315,7 @@ TextureMgrDialogClass::Add_Textures_To_Node
 {
 	MaterialInfoClass *pmat_info = pmesh->Get_Material_Info ();
 	if (pmat_info != NULL) {
-		
+
 		// Loop through all the textures and add them as subobjs
 		for (int index = 0; index < pmat_info->Texture_Count (); index ++) {
 			TextureClass *ptexture = pmat_info->Get_Texture (index);
@@ -331,12 +331,12 @@ TextureMgrDialogClass::Add_Textures_To_Node
 				pnode->Set_Icon_Index (Get_Thumbnail (ptexture));
 
 				// Release our hold on this pointer
-				REF_PTR_RELEASE (ptexture);				
+				REF_PTR_RELEASE (ptexture);
 			}
 		}
-		
+
 		// Release our hold on this pointer
-		MEMBER_RELEASE (pmat_info);
+		REF_PTR_RELEASE (pmat_info);
 	}
 
 	return ;
@@ -383,7 +383,7 @@ TextureMgrDialogClass::OnOK (void)
 // OnCancel
 //
 void
-TextureMgrDialogClass::OnCancel (void) 
+TextureMgrDialogClass::OnCancel (void)
 {
 	// Allow the base class to process this message
 	CDialog::OnCancel ();
@@ -405,16 +405,16 @@ TextureMgrDialogClass::OnDblclkMeshTextureListCtrl
 	// Determine which item is selected
 	int index = m_ListCtrl.GetNextItem (-1, LVNI_ALL | LVNI_SELECTED);
 	if (index != -1) {
-		
+
 		// Get the node associated with this entry
 		TextureListNodeClass *pnode = (TextureListNodeClass *)m_ListCtrl.GetItemData (index);
 		if (pnode != NULL) {
-			
+
 			// Is this a mesh or a texture?
 			if (pnode->Get_Type () == TextureListNodeClass::TYPE_MESH) {
 				Fill_List_Ctrl_With_Textures (*pnode);
 			} else {
-				
+
 				// Is this a texture the user can modify?
 				TextureClass *ptexture = pnode->Peek_Texture ();
 				if (ptexture->getClassID () != ID_INDIRECT_TEXTURE_CLASS) {
@@ -427,21 +427,21 @@ TextureMgrDialogClass::OnDblclkMeshTextureListCtrl
 					RenderObjClass *prender_obj = WW3DAssetManager::Get_Instance ()->Create_Render_Obj (pmesh_node->Get_Name ());
 					TextureClass *poriginal_texture = NULL;
 					if (prender_obj != NULL) {
-						
+
 						// Get the material information for this render object
 						MaterialInfoClass *pmat_info = prender_obj->Get_Material_Info ();
 						if (pmat_info != NULL) {
-							
+
 							// Attempt to find the original texture
 							poriginal_texture = pmat_info->Get_Texture (pnode->Get_Texture_Index ());
 							if (poriginal_texture->getClassID () != ID_INDIRECT_TEXTURE_CLASS) {
 								SR_RELEASE (poriginal_texture);
 							}
 
-							MEMBER_RELEASE (pmat_info);
+							REF_PTR_RELEASE (pmat_info);
 						}
 					}
-					
+
 					// Show the user a dialog containing the texture's properties
 					TextureSettingsDialogClass dialog ((IndirectTextureClass *)ptexture,
 																  (IndirectTextureClass *)poriginal_texture,
@@ -450,11 +450,11 @@ TextureMgrDialogClass::OnDblclkMeshTextureListCtrl
 
 					// If the settings we modified, then update the list control information
 					if (dialog.Were_Settings_Modified ()) {
-						
+
 						// Recreate the thumbnail (if necessary)
 						pnode->Set_Icon_Index (Get_Thumbnail (ptexture));
 						pnode->Set_Name (::Get_Texture_Name (*ptexture));
-						
+
 						// Update the list control with the new settings
 						Insert_Texture_Details (pnode, index);
 						m_ListCtrl.Update (index);
@@ -486,13 +486,13 @@ TextureMgrDialogClass::OnKeydownMeshTextureListCtrl
 	// Did the user press the backspace key?
 	LV_KEYDOWN *pLVKeyDown = (LV_KEYDOWN *)pNMHDR;
 	if (pLVKeyDown && (pLVKeyDown->wVKey == VK_BACK)) {
-		
+
 		// Display the mesh list
 		if (m_bContainsMeshes == false) {
 			Fill_List_Ctrl_With_Meshes ();
 		}
 	}
-	
+
 	(*pResult) = 0;
 	return ;
 }
@@ -503,15 +503,15 @@ TextureMgrDialogClass::OnKeydownMeshTextureListCtrl
 // OnDestroy
 //
 void
-TextureMgrDialogClass::OnDestroy (void) 
+TextureMgrDialogClass::OnDestroy (void)
 {
 	// Free the state image list we associated with the control
 	m_ListCtrl.SetImageList (NULL, LVSIL_NORMAL);
 	m_ListCtrl.SetImageList (NULL, LVSIL_SMALL);
 	SAFE_DELETE (m_pImageList);
 	SAFE_DELETE (m_pImageListSmall);
-	SAFE_DELETE (m_pTextureImageList);	
-	SAFE_DELETE (m_pTextureImageListSmall);	
+	SAFE_DELETE (m_pTextureImageList);
+	SAFE_DELETE (m_pTextureImageListSmall);
 	m_TextureNames.Delete_All ();
 
 	// Loop through the list of nodes and free them
@@ -522,10 +522,10 @@ TextureMgrDialogClass::OnDestroy (void)
 
 	// Remove all the entries from the list
 	m_NodeList.Delete_All ();
-	
+
 	// Allow the base class to process this message
 	CDialog::OnDestroy ();
-	return ; 
+	return ;
 }
 
 
@@ -613,7 +613,7 @@ TextureMgrDialogClass::Get_Thumbnail (srTextureIFace *ptexture)
 		// Create a windows bitmap from this texture
 		HBITMAP hbmp = ::Make_Bitmap_From_Texture (*ptexture, TEXTURE_THUMB_X, TEXTURE_THUMB_Y);
 		if (hbmp != NULL) {
-			
+
 			// Insert this bitmap into our imagelist
 			CBitmap temp_obj;
 			temp_obj.Attach (hbmp);
@@ -627,11 +627,11 @@ TextureMgrDialogClass::Get_Thumbnail (srTextureIFace *ptexture)
 
 			// Add a name to our list to represent this texture
 			m_TextureNames.Add (::Get_Texture_Name (*ptexture));
-		}	
+		}
 	}
 
 	// Return the icon index
-	return icon_index;	
+	return icon_index;
 }
 
 
@@ -654,7 +654,7 @@ TextureMgrDialogClass::Insert_Texture_Details
 		if (ptexture->getClassID () == ID_INDIRECT_TEXTURE_CLASS) {
 			texture_name += " *";
 		}
-		
+
 		// Update the texture's icon and name in the list control
 		m_ListCtrl.SetItem (index,
 								  COL_NAME,
@@ -663,7 +663,7 @@ TextureMgrDialogClass::Insert_Texture_Details
 								  pnode->Get_Icon_Index (),
 								  0, 0, 0);
 
-		// Insert the texture dimensions in the second column		
+		// Insert the texture dimensions in the second column
 		SurfaceClass::SurfaceDescription surface_desc;
 		ptexture->Get_Level_Description(surface_desc);
 		CString dimension_string;
@@ -714,7 +714,7 @@ TextureMgrDialogClass::Insert_Texture_Details
 /////////////////////////////////////////////////////////////////////////////
 void
 TextureMgrDialogClass::OnPropagate (void)
-{	
+{
 	//
 	//	Determine the currently selected item
 	//
@@ -736,11 +736,11 @@ TextureMgrDialogClass::OnPropagate (void)
 	//
 	int counter = m_ListCtrl.GetItemCount ();
 	while (counter --) {
-		
+
 		//
 		//	Does this node have the same number of replaceable textures as the src node?
 		//
-		TextureListNodeClass *curr_node = (TextureListNodeClass *)m_ListCtrl.GetItemData (counter);		
+		TextureListNodeClass *curr_node = (TextureListNodeClass *)m_ListCtrl.GetItemData (counter);
 		if (	(curr_node != NULL) &&
 				(curr_node->Get_Subobj_List ().Count () == src_texture_count))
 		{
@@ -751,11 +751,11 @@ TextureMgrDialogClass::OnPropagate (void)
 			//
 			int texture_counter = src_texture_count;
 			while (texture_counter --) {
-				
+
 				TextureListNodeClass *curr_texture_node	= curr_texture_list[texture_counter];
 				TextureListNodeClass *src_texture_node		= src_texture_list[texture_counter];
 				if (curr_texture_node != NULL && src_texture_node != NULL) {
-					
+
 					TextureClass *curr_texture	= curr_texture_node->Peek_Texture ();
 					TextureClass *src_texture	= src_texture_node->Peek_Texture ();
 
@@ -767,7 +767,7 @@ TextureMgrDialogClass::OnPropagate (void)
 							src_texture->getClassID () == ID_INDIRECT_TEXTURE_CLASS)
 					{
 						TextureClass *real_texture = ((IndirectTextureClass *)src_texture)->Peek_Texture ();
-						((IndirectTextureClass *)curr_texture)->Set_Texture (real_texture);					
+						((IndirectTextureClass *)curr_texture)->Set_Texture (real_texture);
 					}
 				}
 			}
diff --git a/Core/Tools/W3DView/TextureMgrDialog.h b/Core/Tools/W3DView/TextureMgrDialog.h
index ab0d57d16da..1e109aa479b 100644
--- a/Core/Tools/W3DView/TextureMgrDialog.h
+++ b/Core/Tools/W3DView/TextureMgrDialog.h
@@ -34,18 +34,13 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if !defined(AFX_TEXTUREMGRDIALOG_H__3F61844D_CDEA_11D2_9FFC_00104B791122__INCLUDED_)
-#define AFX_TEXTUREMGRDIALOG_H__3F61844D_CDEA_11D2_9FFC_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
-#include "Vector.H"
-#include "RendObj.H"
-#include "Utils.H"
-#include "Resource.H"
-#include "DialogToolbar.H"
+#include "Vector.h"
+#include "RendObj.h"
+#include "Utils.h"
+#include "Resource.h"
+#include "DialogToolbar.h"
 #include "texture.h"
 
 // Forward declarations
@@ -76,7 +71,7 @@ class TextureListNodeClass
 			TYPE_MESH		= 0,
 			TYPE_TEXTURE,
 			TYPE_COUNT
-		} NODE_TYPE;	
+		} NODE_TYPE;
 
 		////////////////////////////////////////////////////////////
 		//
@@ -96,9 +91,9 @@ class TextureListNodeClass
 			  m_pParent (NULL),
 			  m_Name (name),
 			  m_TextureIndex (0),
-			  m_IconIndex (ICON_DEF_TEXTURE) { MEMBER_ADD (m_pTexture, ptexture); }
+			  m_IconIndex (ICON_DEF_TEXTURE) { REF_PTR_SET (m_pTexture, ptexture); }
 
-		~TextureListNodeClass (void) { MEMBER_RELEASE (m_pTexture); Free_Subobj_List (); }
+		~TextureListNodeClass (void) { REF_PTR_RELEASE (m_pTexture); Free_Subobj_List (); }
 
 
 		////////////////////////////////////////////////////////////
@@ -112,7 +107,7 @@ class TextureListNodeClass
 		void									Set_Type (NODE_TYPE type)	{ m_Type = type; }
 
 		TextureClass *						Peek_Texture (void) const	{ return m_pTexture; }
-		void									Set_Texture (TextureClass *ptex) { MEMBER_ADD (m_pTexture, ptex); }
+		void									Set_Texture (TextureClass *ptex) { REF_PTR_SET (m_pTexture, ptex); }
 
 		TEXTURE_NODE_LIST	&				Get_Subobj_List (void)		{ return m_SubObjectList; }
 
@@ -251,5 +246,3 @@ class TextureMgrDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TEXTUREMGRDIALOG_H__3F61844D_CDEA_11D2_9FFC_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/TexturePathDialog.cpp b/Core/Tools/W3DView/TexturePathDialog.cpp
index aac4ae0d32b..027e16792d4 100644
--- a/Core/Tools/W3DView/TexturePathDialog.cpp
+++ b/Core/Tools/W3DView/TexturePathDialog.cpp
@@ -19,12 +19,12 @@
 // TexturePathDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-#include "w3dviewdoc.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "W3DViewDoc.h"
 #include "TexturePathDialog.h"
-#include "utils.h"
-#include "directorydialog.h"
+#include "Utils.h"
+#include "DirectoryDialog.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -78,12 +78,12 @@ END_MESSAGE_MAP()
 //
 /////////////////////////////////////////////////////////////////////////////
 BOOL
-TexturePathDialogClass::OnInitDialog (void) 
+TexturePathDialogClass::OnInitDialog (void)
 {
 	CDialog::OnInitDialog ();
-	
+
 	CW3DViewDoc *doc = ::GetCurrentDocument ();
-		
+
 	SetDlgItemText (IDC_PATH1, doc->Get_Texture_Path1 ());
 	SetDlgItemText (IDC_PATH2, doc->Get_Texture_Path2 ());
 	return TRUE;
@@ -101,7 +101,7 @@ TexturePathDialogClass::OnOK (void)
 	CString path1;
 	CString path2;
 	GetDlgItemText (IDC_PATH1, path1);
-	GetDlgItemText (IDC_PATH2, path2);	
+	GetDlgItemText (IDC_PATH2, path2);
 
 	CW3DViewDoc *doc = ::GetCurrentDocument ();
 	doc->Set_Texture_Path1 (path1);
@@ -111,7 +111,7 @@ TexturePathDialogClass::OnOK (void)
 	return ;
 }
 
- 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // OnBrowse1
@@ -138,7 +138,7 @@ TexturePathDialogClass::OnBrowse1 (void)
 //
 /////////////////////////////////////////////////////////////////////////////
 void
-TexturePathDialogClass::OnBrowse2 (void) 
+TexturePathDialogClass::OnBrowse2 (void)
 {
 	CString initial_path;
 	GetDlgItemText (IDC_PATH2, initial_path);
diff --git a/Core/Tools/W3DView/TexturePathDialog.h b/Core/Tools/W3DView/TexturePathDialog.h
index b7a24d4a11b..0d83bfe3dfa 100644
--- a/Core/Tools/W3DView/TexturePathDialog.h
+++ b/Core/Tools/W3DView/TexturePathDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TEXTUREPATHDIALOG_H__FD455E37_D28C_11D3_A085_00104B791122__INCLUDED_)
-#define AFX_TEXTUREPATHDIALOG_H__FD455E37_D28C_11D3_A085_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // TexturePathDialog.h : header file
 //
 
@@ -63,5 +59,3 @@ class TexturePathDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TEXTUREPATHDIALOG_H__FD455E37_D28C_11D3_A085_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/TextureSettingsDialog.cpp b/Core/Tools/W3DView/TextureSettingsDialog.cpp
index e1a0bd852d4..6413def5885 100644
--- a/Core/Tools/W3DView/TextureSettingsDialog.cpp
+++ b/Core/Tools/W3DView/TextureSettingsDialog.cpp
@@ -31,12 +31,12 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "StdAfx.H"
-#include "Texture.H"
-#include "W3DView.H"
-#include "TextureSettingsDialog.H"
-#include "Utils.H"
-#include "AssetMgr.H"
+#include "StdAfx.h"
+#include "Texture.h"
+#include "W3DView.h"
+#include "TextureSettingsDialog.h"
+#include "Utils.h"
+#include "AssetMgr.h"
 
 /*#ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -53,7 +53,7 @@ typedef enum
 {
 	TYPE_LOOP			= 0,
 	TYPE_ONCE,
-	TYPE_PING_PONG,	
+	TYPE_PING_PONG,
 	TYPE_MANUAL,
 	TYPE_COUNT
 } ANIM_TYPES;
@@ -79,8 +79,8 @@ TextureSettingsDialogClass::TextureSettingsDialogClass
 {
 	//{{AFX_DATA_INIT(TextureSettingsDialogClass)
 	//}}AFX_DATA_INIT
-	MEMBER_ADD (m_pTexture, ptexture);
-	MEMBER_ADD (m_pOriginalTexture, poriginal_texture);
+	REF_PTR_SET (m_pTexture, ptexture);
+	REF_PTR_SET (m_pOriginalTexture, poriginal_texture);
 	return ;
 }
 
@@ -137,7 +137,7 @@ TextureSettingsDialogClass::OnInitDialog (void)
 	CDialog::OnInitDialog ();
 	ASSERT (m_pTexture != NULL);
 	ASSERT (m_pTexture->getClassID () == ID_INDIRECT_TEXTURE_CLASS);
-	
+
 	// Determine what the starting texture was so we can restore on cancel (if necessary)
 	m_pStartingTexture = m_pTexture->Get_Texture ();
 	//m_pStartingTexture->addReference ();
@@ -221,19 +221,19 @@ TextureSettingsDialogClass::Fill_Controls (TextureClass *ptexture)
 				FileListTextureClass *pfile_list = static_cast<FileListTextureClass *>(psource);
 				SetDlgItemText (IDC_FILENAME_EDIT, pfile_list->Get_Filename (0));
 			}
-			
+
 			break;
 
 		default:
 			ASSERT (0);
 			break;
 	}
-	
+
 	// Set the checkboxes
 	ASSERT (psource != NULL);
 	if (psource != NULL) {
 		SendDlgItemMessage (IDC_MIPMAP_OFF_CHECK, BM_SETCHECK, (WPARAM)(psource->getMipmap () == srTextureIFace::MIPMAP_NONE));
-		SendDlgItemMessage (IDC_ALPHA_CHECK, BM_SETCHECK, (WPARAM)(psource->isHintEnabled(srTextureIFace::HINT_ALPHA_BITMASK)));	
+		SendDlgItemMessage (IDC_ALPHA_CHECK, BM_SETCHECK, (WPARAM)(psource->isHintEnabled(srTextureIFace::HINT_ALPHA_BITMASK)));
 		SendDlgItemMessage (IDC_CLAMPU_CHECK, BM_SETCHECK, (WPARAM)(psource->Get_U_Addr_Mode() == TextureClass::TEXTURE_ADDRESS_CLAMP));
 		SendDlgItemMessage (IDC_CLAMPV_CHECK, BM_SETCHECK, (WPARAM)(psource->Get_V_Addr_Mode() == TextureClass::TEXTURE_ADDRESS_CLAMP));
 	}
@@ -266,7 +266,7 @@ TextureSettingsDialogClass::Fill_Animation_Controls (TextureClass *ptexture)
 			banimated = true;
 		}
 		break;
-		
+
 		case ID_TIME_ANIM_TEXTURE_INSTANCE_CLASS:
 		{
 			// What mode is this animated texture using
@@ -291,23 +291,23 @@ TextureSettingsDialogClass::Fill_Animation_Controls (TextureClass *ptexture)
 			frames_per_sec = anim_texture->Get_Frame_Rate ();
 			banimated = true;
 		}
-		break;		
+		break;
 	}
 
 	// Check or uncheck the animation box depending on if it was an animated texture
 	SendDlgItemMessage (IDC_ANIMATION_CHECK, BM_SETCHECK, (WPARAM)banimated);
-	
-	// Was this an animated texture?	
+
+	// Was this an animated texture?
 	if (banimated == true) {
-		
+
 		// Pass the frame count onto the control
 		frame_count = (frame_count > 0) ? frame_count : 1;
-		SetDlgItemInt (IDC_FRAME_COUNT_EDIT, frame_count);		
+		SetDlgItemInt (IDC_FRAME_COUNT_EDIT, frame_count);
 		m_FrameCountSpin.SetPos (frame_count);
-		
+
 		// Pass the frame rate onto the control
 		frames_per_sec = (frames_per_sec > 0) ? frames_per_sec : 1;
-		SetDlgItemInt (IDC_FPS_EDIT, (int)frames_per_sec);		
+		SetDlgItemInt (IDC_FPS_EDIT, (int)frames_per_sec);
 		m_FrameRateSpin.SetPos (frames_per_sec);
 
 		// Select the type in the combobox
@@ -326,7 +326,7 @@ TextureSettingsDialogClass::Fill_Animation_Controls (TextureClass *ptexture)
 //
 void
 TextureSettingsDialogClass::OnOK (void)
-{	
+{
 	// Force the new settings to take effect
 	OnApply ();
 
@@ -341,7 +341,7 @@ TextureSettingsDialogClass::OnOK (void)
 // OnCancel
 //
 void
-TextureSettingsDialogClass::OnCancel (void) 
+TextureSettingsDialogClass::OnCancel (void)
 {
 	// Reuse the starting texture
 	m_pTexture->Set_Texture (m_pStartingTexture);
@@ -386,7 +386,7 @@ TextureSettingsDialogClass::WindowProc
 	if (message == WM_PAINT) {
 		Paint_Thumbnail ();
 	} else if (message == WM_COMMAND) {
-		
+
 		// What control sent us this notification?
 		switch (LOWORD (wParam))
 		{
@@ -417,7 +417,7 @@ TextureSettingsDialogClass::WindowProc
 				break;
 		}
 	}
-	
+
 	// Allow the base class to process this message
 	return CDialog::WindowProc (message, wParam, lParam);
 }
@@ -446,7 +446,7 @@ TextureSettingsDialogClass::OnDestroy (void)
 // OnBrowseButton
 //
 void
-TextureSettingsDialogClass::OnBrowseButton (void) 
+TextureSettingsDialogClass::OnBrowseButton (void)
 {
 	// Get the current filename to display
 	CString filename;
@@ -471,7 +471,7 @@ TextureSettingsDialogClass::OnBrowseButton (void)
 		::EnableWindow (::GetDlgItem (m_hWnd, IDC_APPLY), TRUE);
 	}
 
-	return ;	
+	return ;
 }
 
 
@@ -480,11 +480,11 @@ TextureSettingsDialogClass::OnBrowseButton (void)
 // Paint_Thumbnail
 //
 void
-TextureSettingsDialogClass::Paint_Thumbnail (void) 
+TextureSettingsDialogClass::Paint_Thumbnail (void)
 {
 	// Paint the thumbnail
 	if (m_hThumbnail != NULL) {
-		
+
 		// Get the misc crap windows requries before we can
 		// paint to the screen
 		HWND hchild_wnd = ::GetDlgItem (m_hWnd, IDC_TEXTURE_THUMBNAIL);
@@ -528,7 +528,7 @@ TextureSettingsDialogClass::OnRestore (void)
 		// Get the original texture
 		TextureClass *pnew_texture = m_pOriginalTexture->Get_Texture ();
 		m_pTexture->Set_Texture (pnew_texture);
-		MEMBER_RELEASE (pnew_texture);
+		REF_PTR_RELEASE (pnew_texture);
 
 		// Reload the dialog control settings
 		Load_Texture_Settings ();
@@ -560,11 +560,11 @@ TextureSettingsDialogClass::OnApply (void)
 
 	// Does the user want this to be an animated texture?
 	if (SendDlgItemMessage (IDC_ANIMATION_CHECK, BM_GETCHECK) == 1) {
-		
+
 		// What type of animated texture is this?
 		switch ((ANIM_TYPES)m_TypeCombo.GetCurSel ())
 		{
-			case TYPE_LOOP:					
+			case TYPE_LOOP:
 				pnew_texture = new TimeAnimTextureInstanceClass (*(WW3DAssetManager::Get_Instance ()),
 																				 texture_name,
 																				 frame_count,
@@ -610,8 +610,8 @@ TextureSettingsDialogClass::OnApply (void)
 	}
 
 	ASSERT (pnew_texture != NULL);
-	if (pnew_texture != NULL) {			
-		
+	if (pnew_texture != NULL) {
+
 		// Turn mipmapping off if necessary
 		if (SendDlgItemMessage (IDC_MIPMAP_OFF_CHECK, BM_GETCHECK) == 1) {
 			::MipMapping_Off (pnew_texture);
@@ -621,12 +621,12 @@ TextureSettingsDialogClass::OnApply (void)
 		if (SendDlgItemMessage (IDC_ALPHA_CHECK, BM_GETCHECK) == 1) {
 			::Set_Alpha_Bitmap (pnew_texture);
 		}
-		
+
 		// Clamp the UVs if necessary
 		::Set_Clamping (pnew_texture,
 							 (SendDlgItemMessage (IDC_CLAMPU_CHECK, BM_GETCHECK) == 1),
 							 (SendDlgItemMessage (IDC_CLAMPV_CHECK, BM_GETCHECK) == 1));
-		
+
 
 		// Pass the new texture on, and free the old texture
 		m_pTexture->Set_Texture (pnew_texture);
diff --git a/Core/Tools/W3DView/TextureSettingsDialog.h b/Core/Tools/W3DView/TextureSettingsDialog.h
index 89e8cf5e65e..ba443b4b0c4 100644
--- a/Core/Tools/W3DView/TextureSettingsDialog.h
+++ b/Core/Tools/W3DView/TextureSettingsDialog.h
@@ -30,19 +30,14 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if !defined(AFX_TEXTURESETTINGSDIALOG_H__362C7398_D199_11D2_9FFD_00104B791122__INCLUDED_)
-#define AFX_TEXTURESETTINGSDIALOG_H__362C7398_D199_11D2_9FFD_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #ifdef WW3D_DX8
 
 // Forward delcarations
 class TextureClass;
 
-#include "Resource.H"
+#include "Resource.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -106,7 +101,7 @@ class TextureSettingsDialogClass : public CDialog
 		void					Fill_Animation_Controls (TextureClass *ptexture);
 		void					Load_Textures_Into_Combo (void);
 		void					Load_Texture_Settings (void);
-		void					Paint_Thumbnail (void);		
+		void					Paint_Thumbnail (void);
 
 	private:
 
@@ -125,5 +120,3 @@ class TextureSettingsDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TEXTURESETTINGSDIALOG_H__362C7398_D199_11D2_9FFD_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/Toolbar.cpp b/Core/Tools/W3DView/Toolbar.cpp
index 967dcd3fe1e..b252d74647d 100644
--- a/Core/Tools/W3DView/Toolbar.cpp
+++ b/Core/Tools/W3DView/Toolbar.cpp
@@ -18,13 +18,13 @@
 
 //////////////////////////////////////////////////////////////////////
 //
-//  Toolbar.CPP
+//  Toolbar.cpp
 //
 //  Implementation of a 'fancy' toolbar using hi-color buttons
 //
 
-#include "stdafx.h"
-#include "Toolbar.H"
+#include "StdAfx.h"
+#include "Toolbar.h"
 
 
 
@@ -73,7 +73,7 @@ CFancyToolbar::~CFancyToolbar (void)
             ::DeleteObject (m_pButtonArray[iButton].hBMPUp);
             m_pButtonArray[iButton].hBMPUp = NULL;
         }
-        
+
         if (m_pButtonArray[iButton].hBMPDn)
         {
             // Free the BMP for this button
@@ -204,7 +204,7 @@ CFancyToolbar::AddButton
     m_pButtonArray[iButton].hBMPUp = ::LoadBitmap (::AfxGetResourceHandle (), MAKEINTRESOURCE (iBMPUp));
     m_pButtonArray[iButton].hBMPDn = ::LoadBitmap (::AfxGetResourceHandle (), MAKEINTRESOURCE (iBMPDn));
     m_pButtonArray[iButton].iCommandID = iCommandID;
-    m_pButtonArray[iButton].buttonType = buttonType;    
+    m_pButtonArray[iButton].buttonType = buttonType;
     m_pButtonArray[iButton].currentState = StateUp;
     m_pButtonArray[iButton].bVisible = TRUE;
     return ;
@@ -254,7 +254,7 @@ CFancyToolbar::Paint (void)
                 iXPos += BUTTON_WIDTH;
             }
         }
-        
+
         // Free the windows DC
         ::ReleaseDC (m_hWnd, hDC);
     }
@@ -290,7 +290,7 @@ CFancyToolbar::ButtonFromPoint (const CPoint &point)
         // Increment the current position
         iXPos += BUTTON_WIDTH;
     }
-    
+
     // Return the zero based index of the button we're looking for
     return iIndex;
 }
@@ -337,7 +337,7 @@ CFancyToolbar::OnLButtonDown
             // Release the window's DC
             ::ReleaseDC (m_hWnd, hDC);
         }
-        
+
         // Is this a 'normal' or 2 state button?
         if (m_pButtonArray[iButton].buttonType == TypeNormal)
         {
@@ -356,7 +356,7 @@ CFancyToolbar::OnLButtonDown
                                              MAKELONG (m_pButtonArray[iButton].iCommandID, BN_CLICKED),
                                              (LPARAM)m_hWnd);
         }
-    }    
+    }
     else
     {
         CControlBar::OnLButtonDown (nFlags, point);
@@ -412,7 +412,7 @@ CFancyToolbar::OnLButtonUp
 
         // Let go of the mouse capture
         ::ReleaseCapture ();
-    }    
+    }
     else
     {
         CControlBar::OnLButtonUp (nFlags, point);
diff --git a/Core/Tools/W3DView/Toolbar.h b/Core/Tools/W3DView/Toolbar.h
index 3a7d20757c1..527c2a1537b 100644
--- a/Core/Tools/W3DView/Toolbar.h
+++ b/Core/Tools/W3DView/Toolbar.h
@@ -18,14 +18,12 @@
 
 //////////////////////////////////////////////////////////////////////
 //
-//  Toolbar.H
+//  Toolbar.h
 //
 //  Declaration of a 'fancy' toolbar using hi-color buttons
 //
 
-#ifndef __FANCYTOOLBAR_H
-#define __FANCYTOOLBAR_H
-
+#pragma once
 
 //////////////////////////////////////////////////////////////
 //
@@ -66,13 +64,13 @@ class CFancyToolbar : public CControlBar
         //
         //  Public Data Types
         //
-        typedef enum 
+        typedef enum
         {
             StateUp = 0,
             StateDn = 1
         } STATE_INFO;
 
-        typedef enum 
+        typedef enum
         {
             TypeNormal = 0,
             Type2State = 1
@@ -83,7 +81,7 @@ class CFancyToolbar : public CControlBar
         //
         //  Public Contructors
         //
-        CFancyToolbar ();        
+        CFancyToolbar ();
         virtual ~CFancyToolbar ();
 
 
@@ -97,7 +95,7 @@ class CFancyToolbar : public CControlBar
         //
         CSize CalcFixedLayout (BOOL, BOOL)
             { return CSize (m_iButtons*BUTTON_WIDTH + BORDER_LEFT + BORDER_RIGHT, BUTTON_HEIGHT + BORDER_TOP + BORDER_BOTTOM); }
-        
+
         CSize CalcDynamicLayout( int nLength, DWORD dwMode )
             { return CSize (m_iButtons*BUTTON_WIDTH + BORDER_LEFT + BORDER_RIGHT, BUTTON_HEIGHT + BORDER_TOP + BORDER_BOTTOM); }
 
@@ -107,7 +105,7 @@ class CFancyToolbar : public CControlBar
         //  Creation routines
         //
         void AddButton (UINT iBMPUp, UINT iBMPDn, int iCommandID, BUTTON_TYPE buttonType = TypeNormal);
-        BOOL Create (LPCTSTR pszWindowName, CWnd *pCParentWnd, UINT uiID);        
+        BOOL Create (LPCTSTR pszWindowName, CWnd *pCParentWnd, UINT uiID);
 
         //
         //  State management routines
@@ -140,7 +138,7 @@ class CFancyToolbar : public CControlBar
         static LRESULT CALLBACK fnMessageProc (HWND hWnd, UINT uiMessage, WPARAM wParam, LPARAM lParam);
 
     private:
-               
+
         ////////////////////////////////////////////////////////
         //
         //  Private Data Types
@@ -155,7 +153,7 @@ class CFancyToolbar : public CControlBar
             BOOL bVisible;
         } BUTTON_INFO;
 
-        
+
         ////////////////////////////////////////////////////////
         //
         //  Private Methods
@@ -164,5 +162,3 @@ class CFancyToolbar : public CControlBar
         int m_iButtons;
         int m_iCurrentButton;
 };
-
-#endif // __FANCYTOOLBAR_H
diff --git a/Core/Tools/W3DView/Utils.cpp b/Core/Tools/W3DView/Utils.cpp
index 732b3a0a3f0..95ed99ff0b8 100644
--- a/Core/Tools/W3DView/Utils.cpp
+++ b/Core/Tools/W3DView/Utils.cpp
@@ -18,23 +18,23 @@
 
 /////////////////////////////////////////////////////////////////////////////
 //
-//  Utils.CPP
+//  Utils.cpp
 //
 //  Module containing usefull misc. utility functions
 //
 
 
-#include "StdAfx.H"
-#include "W3DViewDoc.H"
-#include "MainFrm.H"
-#include "DataTreeView.H"
-#include "Utils.H"
-#include "Texture.H"
-#include "AssetMgr.H"
-#include "Agg_Def.H"
-#include "HLod.H"
-#include <VFW.H>
-#include "RCFile.H"
+#include "StdAfx.h"
+#include "W3DViewDoc.h"
+#include "MainFrm.h"
+#include "DataTreeView.h"
+#include "Utils.h"
+#include "texture.h"
+#include "assetmgr.h"
+#include "agg_def.h"
+#include "hlod.h"
+#include <VFW.h>
+#include "rcfile.h"
 
 
 ////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@ GetCurrentDocument (void)
 
     // Get a pointer to the main window
     CMainFrame *pCMainWnd = (CMainFrame *)::AfxGetMainWnd ();
-    
+
     ASSERT (pCMainWnd);
     if (pCMainWnd)
     {
@@ -58,8 +58,8 @@ GetCurrentDocument (void)
         // to the current doc.
         pCDoc = (CW3DViewDoc *)pCMainWnd->GetActiveDocument ();
         ASSERT (pCDoc);
-    }    
-    
+    }
+
     // Return the doc pointer
     return pCDoc;
 }
@@ -76,13 +76,13 @@ CenterDialogAroundTreeView (HWND hDlg)
     {
         // Get a pointer to the main window
         CMainFrame *pCMainWnd = (CMainFrame *)::AfxGetMainWnd ();
-    
+
         ASSERT (pCMainWnd);
         if (pCMainWnd)
         {
             // Get the tree view pane so we can get its rectangle
             CDataTreeView *pCDataTreeView = (CDataTreeView *)pCMainWnd->GetPane (0, 0);
-            
+
             ASSERT (pCDataTreeView);
             if (pCDataTreeView)
             {
@@ -150,9 +150,9 @@ Paint_Gradient
         // Increment the current position
         posX += widthPerShade;
     }
-    
+
     // Release the DC
-    cDC.Detach ();    
+    cDC.Detach ();
     ::ReleaseDC (hWnd, hDC);
 
     // Validate the contents of the window so the control won't paint itself
@@ -218,7 +218,7 @@ Initialize_Spinner
 {
 	//
 	//	Convert the floats to ints and pass the settings onto the controls
-	//	
+	//
 	ctrl.SetRange32 (int(min * 100), int(max * 100));
 	ctrl.SetPos (int(pos * 100));
 
@@ -262,7 +262,7 @@ Update_Spinner_Buddy (CSpinButtonCtrl &ctrl, int delta)
 			float float_max = ((float)int_max) / 100;
 			value = max (float_min, value);
 			value = min (float_max, value);
-			
+
 			// Pass the value onto the buddy window
 			::SetWindowFloat (*buddy, value);
 		}
@@ -298,7 +298,7 @@ Update_Spinner_Buddy (HWND hspinner, int delta)
 			SendMessage (hspinner, UDM_GETRANGE32, (WPARAM)&int_min, (LPARAM)&int_max);
 			float float_min = ((float)int_min) / 100;
 			float float_max = ((float)int_max) / 100;
-			value = max (float_min, value);			
+			value = max (float_min, value);
 			value = min (float_max, value);
 
 			// Pass the value onto the buddy window
@@ -378,10 +378,10 @@ Asset_Name_From_Filename (LPCTSTR filename)
 {
 	// Get the filename from this path
 	CString asset_name = ::Get_Filename_From_Path (filename);
-	
+
 	// Find the index of the extension (if exists)
-	int extension = asset_name.ReverseFind ('.');	
-	
+	int extension = asset_name.ReverseFind ('.');
+
 	// Strip off the extension
 	if (extension != -1) {
 		asset_name = asset_name.Left (extension);
@@ -542,7 +542,7 @@ Build_Emitter_List
 
 			// Is this sub-obj an emitter?
 			if (psub_obj->Class_ID () == RenderObjClass::CLASSID_PARTICLEEMITTER) {
-				
+
 				// Is this emitter already in the list?
 				bool found = false;
 				for (int list_index = 0; (list_index < list.Count ()) && !found; list_index++) {
@@ -559,8 +559,8 @@ Build_Emitter_List
 
 			// Recursivly add emitters to the list
 			Build_Emitter_List (*psub_obj, list);
-			MEMBER_RELEASE (psub_obj);
-		}		
+			REF_PTR_RELEASE (psub_obj);
+		}
 	}
 
 	return ;
@@ -586,8 +586,8 @@ Is_Aggregate (const char *asset_name)
 	}
 
 	// Free our hold on the temporary render object
-	MEMBER_RELEASE (prender_obj);
-	
+	REF_PTR_RELEASE (prender_obj);
+
 	// Return the true/false result code
 	return retval;
 }
@@ -623,7 +623,7 @@ Rename_Aggregate_Prototype
 			pnew_definition->Set_Name (new_name);
 			proto = new AggregatePrototypeClass (pnew_definition);
 			WW3DAssetManager::Get_Instance ()->Add_Prototype (proto);
-		}		
+		}
 	}
 
 	return ;
@@ -637,7 +637,7 @@ Rename_Aggregate_Prototype
 bool
 Is_Real_LOD (const char *asset_name)
 {
-	// Assume that the asset isn't a true LOD (HLOD w/ more than one 
+	// Assume that the asset isn't a true LOD (HLOD w/ more than one
 	bool retval = false;
 
 	// Check to see if this object is an aggregate
@@ -649,8 +649,8 @@ Is_Real_LOD (const char *asset_name)
 	}
 
 	// Free our hold on the temporary render object
-	MEMBER_RELEASE (prender_obj);
-	
+	REF_PTR_RELEASE (prender_obj);
+
 	// Return the true/false result code
 	return retval;
 }
@@ -680,7 +680,7 @@ Get_File_Time
 										  OPEN_EXISTING,
 										  0L,
 										  NULL);
-	
+
 	ASSERT (hfile != INVALID_HANDLE_VALUE);
 	if (hfile != INVALID_HANDLE_VALUE) {
 
@@ -689,8 +689,8 @@ Get_File_Time
 
 		// Close the file
 		SAFE_CLOSE (hfile);
-	}		
-	
+	}
+
 	// Return the true/false result code
 	return retval;
 }
@@ -709,7 +709,7 @@ Are_Glide_Drivers_Acceptable (void)
 	// Is this windows NT?
 	OSVERSIONINFO version = { sizeof (OSVERSIONINFO), 0 };
 	if (::GetVersionEx (&version) && (version.dwPlatformId == VER_PLATFORM_WIN32_NT)) {
-		
+
 		// Now assume failure
 		retval = false;
 
@@ -735,7 +735,7 @@ Are_Glide_Drivers_Acceptable (void)
 			retval = ((time_obj.GetYear () == 1998) && (time_obj.GetMonth () == 12)) || (time_obj.GetYear () > 1998);
 		}
 	}
-	
+
 	// Return the true/false result code
 	return retval;
 }
@@ -762,7 +762,7 @@ Load_RC_Texture (LPCTSTR resource_name)
 	//
 
 	// TheSuperHackers @info Not implemented
-	
+
 	// Reutrn a pointer to the new texture
 	return texture;
 }
@@ -835,7 +835,7 @@ Copy_File
 
 	// Make sure we aren't copying over ourselves
 	bool allow_copy = (::lstrcmpi (existing_filename, new_filename) != 0);
-	
+
 	// Strip the readonly bit off if necessary
 	DWORD attributes = ::GetFileAttributes (new_filename);
 	if (allow_copy &&
diff --git a/Core/Tools/W3DView/Utils.h b/Core/Tools/W3DView/Utils.h
index 26fc4dee5de..afd07056a7f 100644
--- a/Core/Tools/W3DView/Utils.h
+++ b/Core/Tools/W3DView/Utils.h
@@ -18,15 +18,14 @@
 
 /////////////////////////////////////////////////////////////////////////////
 //
-//  Utils.H
+//  Utils.h
 //
 //  Module containing usefull misc. utility functions
 //
 
-#ifndef __UTILS_H
-#define __UTILS_H
+#pragma once
 
-#include "Vector.H"
+#include "Vector.h"
 
 // Forward declarations
 class RenderObjClass;
@@ -36,38 +35,8 @@ class RenderObjClass;
 //
 // Macros
 //
-#define SAFE_DELETE(pobject)					\
-			if (pobject) {							\
-				delete pobject;					\
-				pobject = NULL;					\
-			}											\
-
-#define SAFE_DELETE_ARRAY(pobject)			\
-			if (pobject) {							\
-				delete [] pobject;				\
-				pobject = NULL;					\
-			}											\
-
-#define SAFE_ADD_REF(pobject)					\
-			if (pobject) {							\
-				pobject->Add_Ref ();				\
-			}											\
-
-#define SAFE_RELEASE_REF(pobject)			\
-			if (pobject) {							\
-				pobject->Release_Ref ();		\
-			}											\
-			
-#define MEMBER_RELEASE(pmember)				\
-			SAFE_RELEASE_REF(pmember);			\
-			pmember = NULL;						\
-
-
-#define MEMBER_ADD(pmember, pnew)			\
-			MEMBER_RELEASE (pmember);			\
-			pmember = pnew;						\
-			SAFE_ADD_REF (pmember);				\
-
+#define SAFE_DELETE(pobject) { delete pobject; pobject = NULL; }
+#define SAFE_DELETE_ARRAY(pobject) { delete [] pobject; pobject = NULL; }
 
 #define COM_RELEASE(pobject)					\
 			if (pobject) {							\
@@ -167,5 +136,3 @@ bool						Is_Real_LOD (const char *asset_name);
 
 // Prototype routines
 void						Rename_Aggregate_Prototype (const char *old_name, const char *new_name);
-
-#endif //__UTILS_H
diff --git a/Core/Tools/W3DView/Vector3RndCombo.H b/Core/Tools/W3DView/Vector3RndCombo.H
deleted file mode 100644
index 3952c9e9e62..00000000000
--- a/Core/Tools/W3DView/Vector3RndCombo.H
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-**	Command & Conquer Renegade(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3DView                                                     *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/Tools/W3DView/Vector3RndCombo.H                                                                                                                                                                                                                                                                                                                              $Modtime::                                                             $*
- *                                                                                             *
- *                    $Revision:: 2                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef __VECTOR3RND_COMBO_H
-#define __VECTOR3RND_COMBO_H
-
-// Forward declarations
-class Vector3Randomizer;
-class Vector3;
-
-////////////////////////////////////////////////////////////////////
-//
-//	Functions
-//
-////////////////////////////////////////////////////////////////////
-void						Fill_Vector3_Rnd_Combo (HWND hcombobox);
-Vector3Randomizer *	Vector3_Rnd_From_Combo_Index (int index, float value1, float value2 = 0, float value3 = 0);
-int						Combo_Index_From_Vector3_Rnd (Vector3Randomizer *randomizer);
-
-#endif //__VECTOR3RND_COMBO_H
\ No newline at end of file
diff --git a/Core/Tools/W3DView/Vector3RndCombo.cpp b/Core/Tools/W3DView/Vector3RndCombo.cpp
index 447e087e71f..5cc5ca992d1 100644
--- a/Core/Tools/W3DView/Vector3RndCombo.cpp
+++ b/Core/Tools/W3DView/Vector3RndCombo.cpp
@@ -31,11 +31,11 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "StdAfx.H"
-#include "Vector3RndCombo.H"
-#include "V3_Rnd.H"
+#include "StdAfx.h"
+#include "Vector3RndCombo.h"
+#include "v3_rnd.h"
 
-const char * const RANDOMIZER_NAMES[Vector3Randomizer::CLASSID_MAXKNOWN] = 
+const char * const RANDOMIZER_NAMES[Vector3Randomizer::CLASSID_MAXKNOWN] =
 {
 	"Solid Box",
 	"Solid Sphere",
@@ -74,7 +74,7 @@ int
 Combo_Index_From_Vector3_Rnd (Vector3Randomizer *randomizer)
 {
 	int index = 0;
-	if (randomizer != NULL) {		
+	if (randomizer != NULL) {
 		index = (int)randomizer->Class_ID ();
 	}
 
diff --git a/Core/Tools/W3DView/Vector3RndCombo.h b/Core/Tools/W3DView/Vector3RndCombo.h
new file mode 100644
index 00000000000..e2adc4bb634
--- /dev/null
+++ b/Core/Tools/W3DView/Vector3RndCombo.h
@@ -0,0 +1,46 @@
+/*
+**	Command & Conquer Renegade(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3DView                                                     *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/W3DView/Vector3RndCombo.h                                                                                                                                                                                                                                                                                                                              $Modtime::                                                             $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+// Forward declarations
+class Vector3Randomizer;
+class Vector3;
+
+////////////////////////////////////////////////////////////////////
+//
+//	Functions
+//
+////////////////////////////////////////////////////////////////////
+void						Fill_Vector3_Rnd_Combo (HWND hcombobox);
+Vector3Randomizer *	Vector3_Rnd_From_Combo_Index (int index, float value1, float value2 = 0, float value3 = 0);
+int						Combo_Index_From_Vector3_Rnd (Vector3Randomizer *randomizer);
diff --git a/Core/Tools/W3DView/ViewerAssetMgr.cpp b/Core/Tools/W3DView/ViewerAssetMgr.cpp
index 121c18d0ebc..b42bc73017e 100644
--- a/Core/Tools/W3DView/ViewerAssetMgr.cpp
+++ b/Core/Tools/W3DView/ViewerAssetMgr.cpp
@@ -37,10 +37,10 @@
 
 #include "StdAfx.h"
 
-#include "ViewerAssetMgr.H"
+#include "ViewerAssetMgr.h"
 #include "texture.h"
 #include "ww3d.h"
-#include "Utils.H"
+#include "Utils.h"
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ ViewerAssetMgrClass::Load_3D_Assets (FileClass &w3dfile)
 	//
 	bool retval = WW3DAssetManager::Load_3D_Assets (w3dfile);
 	if (retval) {
-		
+
 	}
 
 	return retval;
@@ -73,11 +73,11 @@ ViewerAssetMgrClass::Get_Texture (const char * tga_filename, MipCountType mip_le
 {
 	//
 	// See if the texture has already been loaded.
-	//	
+	//
 
 	StringClass lower_case_name(tga_filename,true);
 	_strlwr(lower_case_name.Peek_Buffer());
-	TextureClass* tex = TextureHash.Get(lower_case_name);	
+	TextureClass* tex = TextureHash.Get(lower_case_name);
 
 	//
 	//	Check to see if this texture is "missing"
diff --git a/Core/Tools/W3DView/ViewerAssetMgr.h b/Core/Tools/W3DView/ViewerAssetMgr.h
index ae8c811a7ff..3025ccbfbe8 100644
--- a/Core/Tools/W3DView/ViewerAssetMgr.h
+++ b/Core/Tools/W3DView/ViewerAssetMgr.h
@@ -34,14 +34,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef __VIEWER_ASSETMGR_H
-#define __VIEWER_ASSETMGR_H
-
-#include "AssetMgr.H"
+#include "assetmgr.h"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -58,7 +53,7 @@ class ViewerAssetMgrClass : public WW3DAssetManager
 	///////////////////////////////////////////////////
 	ViewerAssetMgrClass (void) {}
 	virtual ~ViewerAssetMgrClass (void) {}
-	
+
 	///////////////////////////////////////////////////
 	//	Public methods
 	///////////////////////////////////////////////////
@@ -89,6 +84,3 @@ class ViewerAssetMgrClass : public WW3DAssetManager
 	///////////////////////////////////////////////////
 	DynamicVectorClass<CString>	m_MissingTextureList;
 };
-
-
-#endif //__VIEWER_ASSETMGR_H
diff --git a/Core/Tools/W3DView/ViewerScene.cpp b/Core/Tools/W3DView/ViewerScene.cpp
index dd256980c4b..2383988dce9 100644
--- a/Core/Tools/W3DView/ViewerScene.cpp
+++ b/Core/Tools/W3DView/ViewerScene.cpp
@@ -35,20 +35,20 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "StdAfx.H"
-#include "ViewerScene.H"
-#include "Camera.H"
-#include "WW3D.H"
+#include "StdAfx.h"
+#include "ViewerScene.h"
+#include "camera.h"
+#include "ww3d.h"
 
-#include "RendObj.H"
-#include "AssetMgr.H"
+#include "rendobj.h"
+#include "assetmgr.h"
 #include "rinfo.h"
 #include "lightenvironment.h"
 
 /*
 ** ViewerSceneIterator
 ** This iterator is used by the ViewerSceneClass to allow
-** the user to iterate through its render objects. 
+** the user to iterate through its render objects.
 */
 class ViewerSceneIterator : public SceneIterator
 {
@@ -62,7 +62,7 @@ class ViewerSceneIterator : public SceneIterator
 
 	ViewerSceneIterator(RefRenderObjListClass * renderlist);
 
-	RefRenderObjListIterator	RobjIterator;	
+	RefRenderObjListIterator	RobjIterator;
 
 	friend class ViewerSceneClass;
 };
@@ -127,7 +127,7 @@ ViewerSceneClass::Visibility_Check (CameraClass *camera)
 		}
 
 		int lod_level = robj->Get_LOD_Level ();
-					
+
 		// Prepare visible objects for LOD:
 		if (robj->Is_Really_Visible()) {
 			robj->Prepare_LOD(*camera);
@@ -156,7 +156,7 @@ ViewerSceneClass::Add_To_Lineup (RenderObjClass *obj)
 	if (!Can_Line_Up(obj))
 		return;
 
-	
+
 	// We will add this object to the scene next to any
 	// existing objects. It will be placed at (0, Y, 0)
 	// where Y is a value to be calculated such that the
@@ -333,7 +333,7 @@ void	ViewerSceneClass::Customized_Render(RenderInfoClass & rinfo)
       // set the visibility bit in all render objects in all layers.
 	   Visibility_Check(&rinfo.Camera);
    }
-   Visibility_Checked = false;	
+   Visibility_Checked = false;
 
 	// Install the vertex processors.  Derived scenes may want to use some
 	// form of spatial subdivision to only insert the needed vps...
@@ -353,7 +353,7 @@ void	ViewerSceneClass::Customized_Render(RenderInfoClass & rinfo)
 
 	for (it.First(&LightList); !it.Is_Done(); it.Next()) {
 		lenv.Add_Light(*(LightClass*)it.Peek_Obj());
-	}	
+	}
 	lenv.Pre_Render_Update(rinfo.Camera.Get_Transform());
 
 	rinfo.light_environment=&lenv;
@@ -387,4 +387,4 @@ void	ViewerSceneClass::Customized_Render(RenderInfoClass & rinfo)
 #else
 	SimpleSceneClass::Customized_Render(rinfo);
 #endif //WW3D_DX8
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/W3DView/ViewerScene.h b/Core/Tools/W3DView/ViewerScene.h
index f091a23a600..aac90782013 100644
--- a/Core/Tools/W3DView/ViewerScene.h
+++ b/Core/Tools/W3DView/ViewerScene.h
@@ -34,18 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-
-#ifndef __VIEWER_SCENE_H
-#define __VIEWER_SCENE_H
 
-#include "Scene.H"
-#include "AABox.H"
-#include "Sphere.H"
+#include "scene.h"
+#include "aabox.h"
+#include "sphere.h"
 
 
 class RenderObjIterator;
@@ -67,7 +60,7 @@ class ViewerSceneClass : public SimpleSceneClass
 
 		virtual ~ViewerSceneClass (void)		{ }
 
-		
+
 		///////////////////////////////////////////////////////////////////
 		//
 		//	Public methods
@@ -77,7 +70,7 @@ class ViewerSceneClass : public SimpleSceneClass
 		//	Overrides from SimpleSceneClass
 		//
 		virtual void				Visibility_Check (CameraClass *pcamera);
-		virtual void				Add_Render_Object(RenderObjClass * obj);	
+		virtual void				Add_Render_Object(RenderObjClass * obj);
 		virtual void				Customized_Render(RenderInfoClass & rinfo);
 
 		//
@@ -113,6 +106,3 @@ class ViewerSceneClass : public SimpleSceneClass
 		RefRenderObjListClass	LineUpList;
 		RefRenderObjListClass	LightList;
 };
-
-
-#endif //__VIEWER_SCENE_H
\ No newline at end of file
diff --git a/Core/Tools/W3DView/VolumeRandomDialog.cpp b/Core/Tools/W3DView/VolumeRandomDialog.cpp
index 45b5f2ffd6f..74efda04352 100644
--- a/Core/Tools/W3DView/VolumeRandomDialog.cpp
+++ b/Core/Tools/W3DView/VolumeRandomDialog.cpp
@@ -31,11 +31,11 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "Stdafx.H"
-#include "W3DView.H"
-#include "VolumeRandomDialog.H"
-#include "V3_Rnd.H"
-#include "Utils.H"
+#include "StdAfx.h"
+#include "W3DView.h"
+#include "VolumeRandomDialog.h"
+#include "v3_rnd.h"
+#include "Utils.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -99,7 +99,7 @@ void
 VolumeRandomDialogClass::OnOK (void)
 {
 	if (SendDlgItemMessage (IDC_BOX_RADIO, BM_GETCHECK) == 1) {
-		
+
 		//
 		//	Create a box randomizer
 		//
@@ -109,7 +109,7 @@ VolumeRandomDialogClass::OnOK (void)
 		extents.Z = ::GetDlgItemFloat (m_hWnd, IDC_BOX_Z_EDIT);
 		m_Randomizer = new Vector3SolidBoxRandomizer (extents);
 	} else if (SendDlgItemMessage (IDC_SPHERE_RADIO, BM_GETCHECK) == 1) {
-		
+
 		//
 		//	What type of sphere is this, hollow or solid?
 		//
@@ -120,7 +120,7 @@ VolumeRandomDialogClass::OnOK (void)
 			m_Randomizer = new Vector3SolidSphereRandomizer (radius);
 		}
 	} else if (SendDlgItemMessage (IDC_CYLINDER_RADIO, BM_GETCHECK) == 1) {
-		
+
 		//
 		//	Create a cylinder randomizer
 		//
@@ -128,7 +128,7 @@ VolumeRandomDialogClass::OnOK (void)
 		float height = ::GetDlgItemFloat (m_hWnd, IDC_CYLINDER_HEIGHT_EDIT);
 		m_Randomizer = new Vector3SolidCylinderRandomizer (height, radius);
 	}
-	
+
 	CDialog::OnOK ();
 	return ;
 }
@@ -158,10 +158,10 @@ VolumeRandomDialogClass::OnInitDialog (void)
 	//	Initialize from the provided randomizer
 	//
 	if (m_Randomizer != NULL) {
-		
+
 		// What type of randomizer is this?
 		switch (m_Randomizer->Class_ID ())
-		{		
+		{
 			case Vector3Randomizer::CLASSID_SOLIDBOX:
 				initial_type = IDC_BOX_RADIO;
 				initial_box = ((Vector3SolidBoxRandomizer *)m_Randomizer)->Get_Extents ();
@@ -178,13 +178,13 @@ VolumeRandomDialogClass::OnInitDialog (void)
 				initial_sphere_radius = ((Vector3HollowSphereRandomizer *)m_Randomizer)->Get_Radius ();
 				initial_sphere_hollow = true;
 				break;
-			
+
 			case Vector3Randomizer::CLASSID_SOLIDCYLINDER:
 				initial_type = IDC_CYLINDER_RADIO;
 				initial_cylinder_radius = ((Vector3SolidCylinderRandomizer *)m_Randomizer)->Get_Radius ();
 				initial_cylinder_height = ((Vector3SolidCylinderRandomizer *)m_Randomizer)->Get_Height ();
 				break;
-			
+
 			default:
 				ASSERT (0);
 				break;
@@ -238,7 +238,7 @@ VolumeRandomDialogClass::OnBoxRadio (void)
 //
 ////////////////////////////////////////////////////////////////////
 void
-VolumeRandomDialogClass::OnCylinderRadio (void) 
+VolumeRandomDialogClass::OnCylinderRadio (void)
 {
 	Update_Enable_State ();
 	return ;
@@ -251,7 +251,7 @@ VolumeRandomDialogClass::OnCylinderRadio (void)
 //
 ////////////////////////////////////////////////////////////////////
 void
-VolumeRandomDialogClass::OnSphereRadio (void) 
+VolumeRandomDialogClass::OnSphereRadio (void)
 {
 	Update_Enable_State ();
 	return ;
@@ -264,7 +264,7 @@ VolumeRandomDialogClass::OnSphereRadio (void)
 //
 ////////////////////////////////////////////////////////////////////
 void
-VolumeRandomDialogClass::Update_Enable_State (void) 
+VolumeRandomDialogClass::Update_Enable_State (void)
 {
 	bool enable_box_ctrls = (SendDlgItemMessage (IDC_BOX_RADIO, BM_GETCHECK) == 1);
 	bool enable_sphere_ctrls = (SendDlgItemMessage (IDC_SPHERE_RADIO, BM_GETCHECK) == 1);
@@ -285,7 +285,7 @@ VolumeRandomDialogClass::Update_Enable_State (void)
 	//
 	::EnableWindow (::GetDlgItem (m_hWnd, IDC_SPHERE_RADIUS_EDIT), enable_sphere_ctrls);
 	::EnableWindow (::GetDlgItem (m_hWnd, IDC_SPHERE_RADIUS_SPIN), enable_sphere_ctrls);
-	::EnableWindow (::GetDlgItem (m_hWnd, IDC_SPHERE_HOLLOW_CHECK), enable_sphere_ctrls);	
+	::EnableWindow (::GetDlgItem (m_hWnd, IDC_SPHERE_HOLLOW_CHECK), enable_sphere_ctrls);
 
 	//
 	//	Update the cylinder controls
@@ -309,17 +309,17 @@ VolumeRandomDialogClass::OnNotify
 	WPARAM wParam,
 	LPARAM lParam,
 	LRESULT *pResult
-) 
+)
 {
 	//
 	//	Update the spinner control if necessary
 	//
 	NMHDR *pheader = (NMHDR *)lParam;
 	if ((pheader != NULL) && (pheader->code == UDN_DELTAPOS)) {
-		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;		
+		LPNMUPDOWN pupdown = (LPNMUPDOWN)lParam;
 		::Update_Spinner_Buddy (pheader->hwndFrom, pupdown->iDelta);
 	}
-	
+
 	// Allow the base class to process this message
 	return CDialog::OnNotify (wParam, lParam, pResult);
 }
diff --git a/Core/Tools/W3DView/VolumeRandomDialog.h b/Core/Tools/W3DView/VolumeRandomDialog.h
index 9eaa20bb42c..10956f3122f 100644
--- a/Core/Tools/W3DView/VolumeRandomDialog.h
+++ b/Core/Tools/W3DView/VolumeRandomDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_VOLUMERANDOMDIALOG_H__F22DB07B_0EFF_11D3_A034_00104B791122__INCLUDED_)
-#define AFX_VOLUMERANDOMDIALOG_H__F22DB07B_0EFF_11D3_A034_00104B791122__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // VolumeRandomDialog.h : header file
 //
 
@@ -96,5 +92,3 @@ class VolumeRandomDialogClass : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_VOLUMERANDOMDIALOG_H__F22DB07B_0EFF_11D3_A034_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/W3DView.cpp b/Core/Tools/W3DView/W3DView.cpp
index 3547ad4ff5a..89205622fd6 100644
--- a/Core/Tools/W3DView/W3DView.cpp
+++ b/Core/Tools/W3DView/W3DView.cpp
@@ -19,26 +19,26 @@
 // W3DView.cpp : Defines the class behaviors for the application.
 //
 
-#include "stdafx.h"
-#include "w3dview.h"
-
-#include "mainfrm.h"
-#include "w3dviewdoc.h"
-#include "w3dviewview.h"
-#include "utils.h"
-#include "colorutils.h"
+#include "StdAfx.h"
+#include "W3DView.h"
+
+#include "MainFrm.h"
+#include "W3DViewDoc.h"
+#include "W3DViewView.h"
+#include "Utils.h"
+#include "ColorUtils.h"
 #include "verchk.h"
 #include "wwmath.h"
-#include "wwaudio.h"
-#include "viewerassetmgr.h"
-#include "globals.h"
-#include "animatedsoundoptionsdialog.h"
+#include "WWAudio.h"
+#include "ViewerAssetMgr.h"
+#include "Globals.h"
+#include "AnimatedSoundOptionsDialog.h"
 #include "animatedsoundmgr.h"
 
 
 #undef STRICT
 #include "ww3d.h"
-#include "AssetMgr.H"
+#include "assetmgr.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -147,7 +147,7 @@ WinMain
 ////////////////////////////////////////////////////////////
 void
 Do_Version_Check (void)
-{	
+{
 	char curr_filename[MAX_PATH];
 	::GetModuleFileName (NULL, curr_filename, MAX_PATH);
 
@@ -197,7 +197,7 @@ BOOL CW3DViewApp::InitInstance (void)
 		// You should modify this string to be something appropriate
 		// such as the name of your company or organization.
 		SetRegistryKey(_T("Westwood Studios"));
-		
+
 		//
 		// Load standard INI file options (including MRU)
 		//
@@ -318,7 +318,7 @@ void CW3DViewApp::OnAppAbout()
 */
 void Debug_Refs(void)
 {
-#ifndef NDEBUG
+#ifdef RTS_DEBUG
 	TRACE("Detecting Active Refs...\r\n");
    //ODS("At time %s", cMiscUtil::Get_Text_Time());
 	RefCountNodeClass * first = RefCountClass::ActiveRefList.First();
@@ -344,7 +344,7 @@ void Debug_Refs(void)
 			ActiveRefStruct * search_ref = &(search_obj->ActiveRefInfo);
 
 			if ( ref->File && search_ref->File &&
-				  !strcmp(search_ref->File, ref->File) &&
+				  strcmp(search_ref->File, ref->File) == 0 &&
 				  (search_ref->Line == ref->Line) ) {
 				count++;
 			} else if ( (ref->File == NULL) &&  (search_ref->File == NULL) ) {
@@ -368,7 +368,7 @@ void Debug_Refs(void)
 	}
 	TRACE("Done.\r\n");
    //ODS("At time %s", cMiscUtil::Get_Text_Time());
-#endif
+#endif // RTS_DEBUG
 }
 
 
@@ -377,7 +377,7 @@ void Debug_Refs(void)
 // CW3DViewApp
 //
 int
-CW3DViewApp::ExitInstance() 
+CW3DViewApp::ExitInstance()
 {
 	//
 	// Free any resources the WW3D engine allocated
@@ -472,9 +472,9 @@ CAboutDlg::OnInitDialog (void)
 				version_minor = pversion_info->dwFileVersionLS;
 			}
 		}
-		SAFE_DELETE (pblock);
+		SAFE_DELETE_ARRAY(pblock);
 	}
-	
+
 	// Put the version string into the dialog
 	CString version_string;
 	version_string.Format (IDS_VERSION, (version_major >> 16), (version_major & 0xFFFF));
diff --git a/Core/Tools/W3DView/W3DView.h b/Core/Tools/W3DView/W3DView.h
index dce9ed92266..e7e3f1bde3c 100644
--- a/Core/Tools/W3DView/W3DView.h
+++ b/Core/Tools/W3DView/W3DView.h
@@ -19,12 +19,7 @@
 // W3DView.h : main header file for the W3DVIEW application
 //
 
-#if !defined(AFX_W3DVIEW_H__2BB39E2B_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
-#define AFX_W3DVIEW_H__2BB39E2B_5D3A_11D2_9FC6_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #ifndef __AFXWIN_H__
 	#error include 'stdafx.h' before including this file for PCH
@@ -68,5 +63,3 @@ class CW3DViewApp : public CWinApp
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_W3DVIEW_H__2BB39E2B_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/W3DViewDoc.cpp b/Core/Tools/W3DView/W3DViewDoc.cpp
index aa84f7e5699..1594b538590 100644
--- a/Core/Tools/W3DView/W3DViewDoc.cpp
+++ b/Core/Tools/W3DView/W3DViewDoc.cpp
@@ -19,40 +19,40 @@
 // W3DViewDoc.cpp : implementation of the CW3DViewDoc class
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 
-#include "w3dview.h"
-#include "w3dviewdoc.h"
+#include "W3DView.h"
+#include "W3DViewDoc.h"
 #include "ffactory.h"
-#include "globals.h"
-#include "viewerassetmgr.h"
-#include "globals.h"
+#include "Globals.h"
+#include "ViewerAssetMgr.h"
+#include "Globals.h"
 #include "rendobj.h"
-#include "graphicview.h"
-#include "datatreeview.h"
-#include "mainfrm.h"
+#include "GraphicView.h"
+#include "DataTreeView.h"
+#include "MainFrm.h"
 #include "distlod.h"
 #include "light.h"
 #include "camera.h"
 #include "w3d_file.h"
-#include "wwfile.h"
+#include "WWFILE.h"
 #include "bmp2d.h"
 #include "part_emt.h"
 #include "part_ldr.h"
-#include "utils.h"
+#include "Utils.h"
 #include "w3derr.h"
 #include "chunkio.h"
-#include "assetinfo.h"
+#include "AssetInfo.h"
 #include "meshmdl.h"
 #include "agg_def.h"
 #include "hlod.h"
-#include "restrictedfiledialog.h"
-#include "viewerscene.h"
-#include "ini.h"
+#include "RestrictedFileDialog.h"
+#include "ViewerScene.h"
+#include "INI.h"
 #include "ww3d.h"
-#include "emitterinstancelist.h"
+#include "EmitterInstanceList.h"
 #include "mesh.h"
-#include "screencursor.h"
+#include "ScreenCursor.h"
 #include "sphereobj.h"
 #include "ringobj.h"
 #include "textfile.h"
@@ -94,14 +94,14 @@ CW3DViewDoc::CW3DViewDoc (void)
 		m_pCursorScene (NULL),
       m_pCBackObjectScene (NULL),
 		m_pDazzleLayer (NULL),
-      m_pCBackObjectCamera (NULL),  
+      m_pCBackObjectCamera (NULL),
       m_pCBackgroundObject (NULL),
       m_pC2DCamera (NULL),
       m_pCSceneLight (NULL),
       m_pCRenderObj (NULL),
       m_pCAnimation (NULL),
 		m_pCAnimCombo (NULL),
-		m_pCBackgroundBMP (NULL),		
+		m_pCBackgroundBMP (NULL),
       m_CurrentFrame (0),
       m_bAnimBlend (TRUE),
 		m_bAnimateCamera (false),
@@ -130,7 +130,7 @@ CW3DViewDoc::CW3DViewDoc (void)
 CW3DViewDoc::~CW3DViewDoc (void)
 {
     CleanupResources ();
-	 MEMBER_RELEASE (m_pCursor);
+	 REF_PTR_RELEASE (m_pCursor);
     return ;
 }
 
@@ -170,9 +170,9 @@ CW3DViewDoc::CleanupResources (void)
     }
 
 	if (m_pCursor != NULL) {
-		m_pCursor->Remove ();		
+		m_pCursor->Remove ();
 	}
-	MEMBER_RELEASE (m_pCursorScene);
+	REF_PTR_RELEASE (m_pCursorScene);
 
     if (m_pCScene)
     {
@@ -197,10 +197,8 @@ CW3DViewDoc::CleanupResources (void)
     }
 
 	 // Was there a dazzle layer?
-	 if (m_pDazzleLayer) {
-		 delete m_pDazzleLayer;
-		 m_pDazzleLayer = NULL;
-	 }
+	 delete m_pDazzleLayer;
+	 m_pDazzleLayer = NULL;
 
     // Was there a valid scene object?
     if (m_pCBackObjectScene)
@@ -245,8 +243,8 @@ CW3DViewDoc::CleanupResources (void)
     {
         // Free the currently displayed object
 			SAFE_DELETE (m_pCAnimCombo);
-			MEMBER_RELEASE (m_pCAnimation);
-			MEMBER_RELEASE (m_pCRenderObj);
+			REF_PTR_RELEASE (m_pCAnimation);
+			REF_PTR_RELEASE (m_pCRenderObj);
     }
 
     return ;
@@ -262,7 +260,7 @@ CW3DViewDoc::OnNewDocument (void)
 {
 	if (!CDocument::OnNewDocument())
 		return FALSE;
-		
+
 	_TheAssetMgr->Start_Tracking_Textures ();
 	m_LoadList.Delete_All ();
 
@@ -286,8 +284,8 @@ CW3DViewDoc::OnNewDocument (void)
     {
 			// Free the currently displayed object
 			SAFE_DELETE (m_pCAnimCombo);
-			MEMBER_RELEASE (m_pCAnimation);
-			MEMBER_RELEASE (m_pCRenderObj);
+			REF_PTR_RELEASE (m_pCAnimation);
+			REF_PTR_RELEASE (m_pCRenderObj);
     }
 
     CDataTreeView *pCDataTreeView = GetDataTreeView ();
@@ -415,7 +413,7 @@ CW3DViewDoc::InitScene (void)
 			m_pCBackObjectScene->Set_Ambient_Light (Vector3 (0.5F, 0.5F, 0.5F));
 		}
 
-			
+
 		// Create a new instance of the camera class to use
 		// when rendering the background object
 		m_pCBackObjectCamera = new CameraClass ();
@@ -428,14 +426,14 @@ CW3DViewDoc::InitScene (void)
 			m_pCBackObjectCamera->Set_View_Plane (Vector2 (-1.00F, -1.00F), Vector2 (1.00F, 1.00F));
 			m_pCBackObjectCamera->Set_Position (Vector3 (0.00F, 0.00F, 0.00F));
 			m_pCBackObjectCamera->Set_Clip_Planes (0.1F, 10.0F);
-		}        
+		}
 
 		// Create a new instance of the camera class to use
 		// when rendering the background BMP
 		m_pC2DCamera = new CameraClass ();
 
 		// Were we successful in creating the new instance?
-		ASSERT (m_pC2DCamera);		
+		ASSERT (m_pC2DCamera);
 		if (m_pC2DCamera) {
 
 			// Set the default values for the new camera
@@ -450,9 +448,9 @@ CW3DViewDoc::InitScene (void)
 		CString path1 = theApp.GetProfileString ("Config", "TexturePath1", "");
 		CString path2 = theApp.GetProfileString ("Config", "TexturePath2", "");
 		Set_Texture_Path1 (path1);
-		Set_Texture_Path2 (path2);	
+		Set_Texture_Path2 (path2);
 
-		// Construct a dazzle layer object 
+		// Construct a dazzle layer object
 		m_pDazzleLayer  = new DazzleLayerClass();
 		DazzleRenderObjClass::Set_Current_Dazzle_Layer(m_pDazzleLayer);
 
@@ -474,7 +472,7 @@ CW3DViewDoc::InitScene (void)
 //
 ///////////////////////////////////////////////////////////////
 BOOL
-CW3DViewDoc::OnOpenDocument (LPCTSTR lpszPathName) 
+CW3DViewDoc::OnOpenDocument (LPCTSTR lpszPathName)
 {
 	if (!CDocument::OnOpenDocument(lpszPathName))
 		return FALSE;
@@ -496,7 +494,7 @@ CW3DViewDoc::OnOpenDocument (LPCTSTR lpszPathName)
 	// Re-load the data list to include all new assets
 	//
 	CDataTreeView *data_view = GetDataTreeView ();
-	if (data_view != NULL) {		
+	if (data_view != NULL) {
 		data_view->LoadAssetsIntoTree ();
 	}
 
@@ -517,7 +515,7 @@ CW3DViewDoc::OnOpenDocument (LPCTSTR lpszPathName)
 //
 ///////////////////////////////////////////////////////////////
 void
-CW3DViewDoc::LoadAssetsFromFile (LPCTSTR lpszPathName) 
+CW3DViewDoc::LoadAssetsFromFile (LPCTSTR lpszPathName)
 {
 	if (m_pCScene == NULL) {
 		InitScene ();
@@ -532,7 +530,7 @@ CW3DViewDoc::LoadAssetsFromFile (LPCTSTR lpszPathName)
 	//	Add this path to the load list
 	//
 	m_LoadList.Add (lpszPathName);
-	
+
 	//
 	//	Don't allow repaints while the load is going on
 	//
@@ -554,7 +552,7 @@ CW3DViewDoc::LoadAssetsFromFile (LPCTSTR lpszPathName)
 
 	LPCTSTR extension = ::strrchr (lpszPathName, '.');
 	if (::lstrcmpi (extension, ".tga") == 0 || ::lstrcmpi (extension, ".dds") == 0) {
-		
+
 		// Load the texture file into the asset manager
 		TextureClass *ptexture = WW3DAssetManager::Get_Instance()->Get_Texture (::Get_Filename_From_Path (lpszPathName));
 		if (ptexture != NULL) {
@@ -612,10 +610,10 @@ CW3DViewDoc::Display_Emitter
 
 		// Lose the animation
 		SAFE_DELETE (m_pCAnimCombo);
-		MEMBER_RELEASE (m_pCAnimation);
+		REF_PTR_RELEASE (m_pCAnimation);
 
 			if (m_pCRenderObj != NULL) {
-				
+
 				// Remove this object from the scene
 				Remove_Object_From_Scene (m_pCRenderObj);
 				m_pCRenderObj->Release_Ref ();
@@ -627,8 +625,8 @@ CW3DViewDoc::Display_Emitter
 		if (pemitter != NULL) {
 
 			// Add the emitter to the scene
-			pemitter->Set_Transform (Matrix3D (1));			
-			MEMBER_ADD (m_pCRenderObj, pemitter);
+			pemitter->Set_Transform (Matrix3D (1));
+			REF_PTR_SET (m_pCRenderObj, pemitter);
 			m_pCScene->Add_Render_Object (m_pCRenderObj);
 			pemitter->Start ();
 
@@ -645,7 +643,7 @@ CW3DViewDoc::Display_Emitter
 			}
 		}
 	}
-	
+
 	return ;
 }
 
@@ -671,7 +669,7 @@ CW3DViewDoc::DisplayObject
     {
         // Lose the animation
 		  SAFE_DELETE (m_pCAnimCombo);
-		  MEMBER_RELEASE (m_pCAnimation);
+		  REF_PTR_RELEASE (m_pCAnimation);
 
         // Do we have an old object to remove from the scene?
 		  if (add_ghost == false) {
@@ -773,7 +771,7 @@ void
 CW3DViewDoc::ResetAnimation (void)
 {
 	if (m_pCAnimation != NULL) {
-		
+
 		//
 		// Reset the frame counter
 		//
@@ -876,8 +874,8 @@ CW3DViewDoc::PlayAnimation
 
         // Get an instance of the animation object
 		  SAFE_DELETE (m_pCAnimCombo);
-		  MEMBER_RELEASE (m_pCAnimation);
-        m_pCAnimation = WW3DAssetManager::Get_Instance()->Get_HAnim (pszAnimationName);       
+		  REF_PTR_RELEASE (m_pCAnimation);
+        m_pCAnimation = WW3DAssetManager::Get_Instance()->Get_HAnim (pszAnimationName);
         ASSERT (m_pCAnimation);
 
         // Reset the frame counter
@@ -908,7 +906,7 @@ CW3DViewDoc::PlayAnimation
 		  Update_Camera ();
 		  Play_Animation_Sound ();
     }
-        
+
     return ;
 }
 
@@ -921,7 +919,7 @@ CW3DViewDoc::PlayAnimation
 void
 CW3DViewDoc::Play_Animation_Sound (void)
 {
-	if (m_pCAnimation != NULL) {	  
+	if (m_pCAnimation != NULL) {
 	  CString animation_name = m_pCAnimation->Get_Name ();
 
 	  //
@@ -968,7 +966,7 @@ CW3DViewDoc::PlayAnimation
 
         // Get an instance of the animation object
 		  SAFE_DELETE (m_pCAnimCombo);
-		  MEMBER_RELEASE (m_pCAnimation);
+		  REF_PTR_RELEASE (m_pCAnimation);
 		  m_pCAnimCombo = pCAnimCombo;
 		  m_pCAnimation = m_pCAnimCombo->Get_Motion(0);	// ref added by get_motion
         ASSERT (m_pCAnimation);
@@ -1007,7 +1005,7 @@ CW3DViewDoc::PlayAnimation
 		  Update_Camera ();
 		  Play_Animation_Sound ();
     }
-        
+
     return ;
 }
 
@@ -1018,7 +1016,7 @@ CW3DViewDoc::PlayAnimation
 //
 ////////////////////////////////////////////////////////////////////////////
 bool
-Get_Camera_Transform (RenderObjClass *render_obj, Matrix3D &tm) 
+Get_Camera_Transform (RenderObjClass *render_obj, Matrix3D &tm)
 {
 	bool retval = false;
 
@@ -1028,7 +1026,7 @@ Get_Camera_Transform (RenderObjClass *render_obj, Matrix3D &tm)
 			if (psub_obj != NULL) {
 				retval = Get_Camera_Transform (psub_obj, tm);
 			}
-			MEMBER_RELEASE (psub_obj);
+			REF_PTR_RELEASE (psub_obj);
 		}
 
 		if (!retval) {
@@ -1053,13 +1051,13 @@ void
 CW3DViewDoc::Update_Camera (void)
 {
 	// Should we update the camera's position as well?
-	if (m_bAnimateCamera && m_pCRenderObj != NULL) {			
+	if (m_bAnimateCamera && m_pCRenderObj != NULL) {
 
 		Matrix3D transform (1);
 		if (Get_Camera_Transform (m_pCRenderObj, transform)) {
 
 			// Convert the bone's transform into a camera transform
-			//Matrix3D	transform = m_pCRenderObj->Get_Bone_Transform (index);												
+			//Matrix3D	transform = m_pCRenderObj->Get_Bone_Transform (index);
 			Matrix3D cam_transform (Vector3 (0, -1, 0), Vector3 (0, 0, 1), Vector3 (-1, 0, 0), Vector3 (0, 0, 0));
 #ifdef ALLOW_TEMPORARIES
 			Matrix3D new_transform = transform * cam_transform;
@@ -1095,7 +1093,7 @@ CW3DViewDoc::UpdateFrame (float relativeTimeSlice)
 		//
 		// Update the total elapsed animation time
 		//
-		m_animTime += relativeTimeSlice;        		  
+		m_animTime += relativeTimeSlice;
 		if (m_animTime > loop_time) {
 			m_animTime -= loop_time;
 		}
@@ -1195,7 +1193,7 @@ CW3DViewDoc::GenerateLOD
 
 	// Get an iterator from the asset manager that we can
 	// use to enumerate the currently loaded assets
-	RenderObjIterator *pObjEnum = WW3DAssetManager::Get_Instance()->Create_Render_Obj_Iterator ();    
+	RenderObjIterator *pObjEnum = WW3DAssetManager::Get_Instance()->Create_Render_Obj_Iterator ();
 	ASSERT (pObjEnum);
 	if (pObjEnum)
 	{
@@ -1250,11 +1248,11 @@ CW3DViewDoc::GenerateLOD
 			HLodDefClass *pdefinition = new HLodDefClass (*pnew_lod);
 			plod_prototype = new HLodPrototypeClass (pdefinition);
 
-			MEMBER_RELEASE (pnew_lod);
+			REF_PTR_RELEASE (pnew_lod);
 
 			// Loop through all the LOD definitions and free their names
 			for (lod_index = 0; lod_index < lod_count; lod_index ++) {
-				MEMBER_RELEASE (plod_array[lod_index]);
+				REF_PTR_RELEASE (plod_array[lod_index]);
 			}
 
 			// Free the LOD definition array
@@ -1296,7 +1294,7 @@ CW3DViewDoc::SetBackgroundBMP (LPCTSTR pszBackgroundBMP)
         {
 				// Create a new instance of the BMP object to use
             m_pCBackgroundBMP = new Bitmap2DObjClass (pszBackgroundBMP, 0.5F, 0.5F, TRUE, FALSE);
-				        
+
             // Were we successful in creating the bitmap object?
             ASSERT (m_pCBackgroundBMP);
             if (m_pCBackgroundBMP)
@@ -1331,8 +1329,8 @@ CW3DViewDoc::LoadSettings (LPCTSTR filename)
 
 		// Open the INI file
 		FileClass * pini_file = _TheFileFactory->Get_File (filename);
-		INIClass ini_obj (*pini_file);			
-		
+		INIClass ini_obj (*pini_file);
+
 		CGraphicView *graphic_view = GetGraphicView ();
 		Vector3 color;
 
@@ -1342,7 +1340,7 @@ CW3DViewDoc::LoadSettings (LPCTSTR filename)
 		if (ini_obj.Is_Present ("Settings", "AmbientLightR") &&
 			 ini_obj.Is_Present ("Settings", "AmbientLightG") &&
 			 ini_obj.Is_Present ("Settings", "AmbientLightB")) {
-			
+
 			// Read the settings from,the INI file
 			color.X = ini_obj.Get_Float ("Settings", "AmbientLightR");
 			color.Y = ini_obj.Get_Float ("Settings", "AmbientLightG");
@@ -1358,7 +1356,7 @@ CW3DViewDoc::LoadSettings (LPCTSTR filename)
 		if (ini_obj.Is_Present ("Settings", "SceneLightR") &&
 			 ini_obj.Is_Present ("Settings", "SceneLightG") &&
 			 ini_obj.Is_Present ("Settings", "SceneLightB")) {
-			
+
 			// Read the settings from,the INI file
 			color.X = ini_obj.Get_Float ("Settings", "SceneLightR");
 			color.Y = ini_obj.Get_Float ("Settings", "SceneLightG");
@@ -1376,7 +1374,7 @@ CW3DViewDoc::LoadSettings (LPCTSTR filename)
 			 ini_obj.Is_Present ("Settings", "SceneLightY") &&
 			 ini_obj.Is_Present ("Settings", "SceneLightZ") &&
 			 ini_obj.Is_Present ("Settings", "SceneLightW")) {
-			
+
 			// Read the settings from,the INI file
 			Quaternion orientation;
 			orientation.X = ini_obj.Get_Float ("Settings", "SceneLightX");
@@ -1384,7 +1382,7 @@ CW3DViewDoc::LoadSettings (LPCTSTR filename)
 			orientation.Z = ini_obj.Get_Float ("Settings", "SceneLightZ");
 			orientation.W = ini_obj.Get_Float ("Settings", "SceneLightW");
 
-			// Get the light's transform and inverse transform			
+			// Get the light's transform and inverse transform
 			Vector3 obj_pos = graphic_view->Get_Object_Center ();
 			Vector3 light_pos = m_pCSceneLight->Get_Position ();
 			float distance = (light_pos - obj_pos).Length ();
@@ -1400,7 +1398,7 @@ CW3DViewDoc::LoadSettings (LPCTSTR filename)
 			Matrix3D::Multiply (light_tm, Build_Matrix3D (orientation, orientation_matrix), &light_tm);
 #endif
 			light_tm.Translate (Vector3 (0, 0, distance));
-			
+
 			// Pass the new transform onto the light
 			RenderObjClass *pLightMesh = graphic_view->Get_Light_Mesh ();
 			pLightMesh->Set_Transform (light_tm);
@@ -1422,7 +1420,7 @@ CW3DViewDoc::LoadSettings (LPCTSTR filename)
 			float start = ini_obj.Get_Float ("Settings", "SceneLightAttenStart");
 			float end = ini_obj.Get_Float ("Settings", "SceneLightAttenEnd");
 			int atten_on = ini_obj.Get_Int ("Settings", "SceneLightAttenOn");
-			
+
 			// Pass the intensity and attenuation settings onto the light
 			m_pCSceneLight->Set_Intensity (intensity);
 			m_pCSceneLight->Set_Far_Attenuation_Range (start, end);
@@ -1430,7 +1428,7 @@ CW3DViewDoc::LoadSettings (LPCTSTR filename)
 
 			// Get the position of the light and the displayed object
 			Vector3 obj_pos = graphic_view->Get_Object_Center ();
-			Vector3 light_pos = m_pCSceneLight->Get_Position ();			
+			Vector3 light_pos = m_pCSceneLight->Get_Position ();
 			Vector3 new_pos = (light_pos - obj_pos);
 			new_pos.Normalize ();
 			new_pos = new_pos * distance;
@@ -1438,7 +1436,7 @@ CW3DViewDoc::LoadSettings (LPCTSTR filename)
 			// Pass the new position onto the light
 			RenderObjClass *pLightMesh = graphic_view->Get_Light_Mesh ();
 			pLightMesh->Set_Position (new_pos);
-			m_pCSceneLight->Set_Position (new_pos);			
+			m_pCSceneLight->Set_Position (new_pos);
 		}
 
 		//
@@ -1447,7 +1445,7 @@ CW3DViewDoc::LoadSettings (LPCTSTR filename)
 		if (ini_obj.Is_Present ("Settings", "BackgroundR") &&
 			 ini_obj.Is_Present ("Settings", "BackgroundG") &&
 			 ini_obj.Is_Present ("Settings", "BackgroundB")) {
-			
+
 			// Read the settings from,the INI file
 			color.X = ini_obj.Get_Float ("Settings", "BackgroundR");
 			color.Y = ini_obj.Get_Float ("Settings", "BackgroundG");
@@ -1455,13 +1453,13 @@ CW3DViewDoc::LoadSettings (LPCTSTR filename)
 
 			// Record the background color for later use
 			SetBackgroundColor (color);
-		} 
+		}
 
 		//
 		// Background bitmap
 		//
 		if (ini_obj.Is_Present ("Settings", "BackgroundBMP")) {
-			
+
 			// Load this background BMP
 			TCHAR bmp_filename[MAX_PATH];
 			ini_obj.Get_String ("Settings", "BackgroundBMP", "", bmp_filename, sizeof (bmp_filename));
@@ -1501,7 +1499,7 @@ CW3DViewDoc::SaveSettings
     BOOL bReturn = FALSE;
     ASSERT (pszFilename);
     ASSERT (dwSettingsMask != 0L);
-    ASSERT (m_pCScene);    
+    ASSERT (m_pCScene);
 
     // Is the filename OK?
     HANDLE hFile = ::CreateFile (pszFilename,
@@ -1534,7 +1532,7 @@ CW3DViewDoc::SaveSettings
             if (szPath[::lstrlen (szPath)-1] != '\\')
             {
                 // Ensure the path is directory delimited
-                ::strcat (szPath, "\\");
+                strlcat(szPath, "\\", ARRAY_SIZE(szPath));
             }
 
             // Prepend the filename with its new path
@@ -1545,7 +1543,7 @@ CW3DViewDoc::SaveSettings
         if (dwSettingsMask & SAVE_SETTINGS_LIGHT)
         {
             Vector3 colorSettings = m_pCScene->Get_Ambient_Light ();
-        
+
             // Write the 'Red' component out to the file
             CString stringValue;
             stringValue.Format ("%f", colorSettings.X);
@@ -1569,7 +1567,7 @@ CW3DViewDoc::SaveSettings
                                          (LPCTSTR)stringCompleteFilename);
 
              m_pCSceneLight->Get_Diffuse (&colorSettings);
-        
+
             // Write the 'Red' component out to the file
             stringValue.Format ("%f", colorSettings.X);
             ::WritePrivateProfileString ("Settings",
@@ -1593,7 +1591,7 @@ CW3DViewDoc::SaveSettings
 
 				Matrix3D transform = m_pCSceneLight->Get_Transform ();
 				Quaternion orientation = ::Build_Quaternion (transform);
-        
+
             // Write the x-position out to the file
             stringValue.Format ("%f", orientation.X);
             ::WritePrivateProfileString ("Settings",
@@ -1627,7 +1625,7 @@ CW3DViewDoc::SaveSettings
 				Vector3 obj_pos = pCGraphicView->Get_Object_Center ();
 				Vector3 light_pos = m_pCSceneLight->Get_Position ();
 				float distance = (light_pos - obj_pos).Length ();
-        
+
             // Write the distance out to the file
             stringValue.Format ("%f", distance);
             ::WritePrivateProfileString ("Settings",
@@ -1715,7 +1713,7 @@ CW3DViewDoc::SaveSettings
         // Success!
         bReturn = TRUE;
     }
-    
+
     // Return the TRUE/FALSE result code
     return bReturn;
 }
@@ -1735,7 +1733,7 @@ CW3DViewDoc::Save_Selected_LOD (void)
 	// Is this an emitter?
 	if ((m_pCRenderObj != NULL) &&
 		 m_pCRenderObj->Class_ID () == RenderObjClass::CLASSID_HLOD) {
-		
+
 		// Build the default filename from the name of the LOD
 		CString default_filename = GetDataTreeView ()->GetCurrentSelectionName ();
 		default_filename += ".w3d";
@@ -1750,7 +1748,7 @@ CW3DViewDoc::Save_Selected_LOD (void)
 		// Ask the user what filename they wish to save as.
 		dialog.m_ofn.lpstrTitle = "Export LOD";
 		if (dialog.DoModal () == IDOK) {
-			
+
 			// Save the LOD to the requested file
 			retval = Save_Current_LOD (dialog.GetPathName ());
 		}
@@ -1829,23 +1827,23 @@ CW3DViewDoc::SetBackgroundObject (LPCTSTR pszBackgroundObjectName)
 
             // Free the object
             m_pCBackgroundObject->Release_Ref ();
-            m_pCBackgroundObject = NULL;            
+            m_pCBackgroundObject = NULL;
         }
 
         if (pszBackgroundObjectName)
-        {            
+        {
             // Create a new instance of the render object to use as the background
             m_pCBackgroundObject = WW3DAssetManager::Get_Instance()->Create_Render_Obj (pszBackgroundObjectName);
-            
+
             ASSERT (m_pCBackgroundObject);
             if (m_pCBackgroundObject)
             {
                 // Place the object at world center
                 m_pCBackgroundObject->Set_Position (Vector3 (0.00F, 0.00F, 0.00F));
-                
+
                 // Calculate the depth the camera should be at by the objects bouding sphere
                 float cameraDepth = m_pCBackgroundObject->Get_Bounding_Sphere ().Radius * 4.0F;
-                
+
                 CGraphicView *pCGraphicView = GetGraphicView ();
                 if (pCGraphicView)
                 {
@@ -1853,11 +1851,11 @@ CW3DViewDoc::SetBackgroundObject (LPCTSTR pszBackgroundObjectName)
                     m_pCBackObjectCamera->Set_Transform (pCGraphicView->GetCamera ()->Get_Transform ());
                 }
 
-                // Set the camera's position and depth                
+                // Set the camera's position and depth
                 m_pCBackObjectCamera->Set_Position (Vector3 (0.00F, 0.00F, 0.00F));
                 //m_pCBackObjectCamera->Set_Depth (cameraDepth);
                 m_pCBackObjectCamera->Set_Clip_Planes (1, cameraDepth);
-                
+
                 // Add the background object to the scene
 					 m_pCBackObjectScene->Add_Render_Object (m_pCBackgroundObject);
             }
@@ -1891,13 +1889,13 @@ CW3DViewDoc::Remove_Object_From_Scene (RenderObjClass *prender_obj)
 		if (psub_obj != NULL) {
 			Remove_Object_From_Scene (psub_obj);
 		}
-		MEMBER_RELEASE (psub_obj);
+		REF_PTR_RELEASE (psub_obj);
 	}
 
 	// If this is an emitter, then remove its buffer
 	if ((prender_obj != NULL) &&
 		 prender_obj->Class_ID () == RenderObjClass::CLASSID_PARTICLEEMITTER) {
-		
+
 		// Attempt to remove this emitter's buffer
 		((ParticleEmitterClass *)prender_obj)->Stop ();
 		((ParticleEmitterClass *)prender_obj)->Remove_Buffer_From_Scene ();
@@ -1928,7 +1926,7 @@ CW3DViewDoc::Save_Selected_Primitive (void)
 	if ((m_pCRenderObj != NULL) &&
 		 (m_pCRenderObj->Class_ID () == RenderObjClass::CLASSID_SPHERE ||
 		  m_pCRenderObj->Class_ID () == RenderObjClass::CLASSID_RING)) {
-		
+
 		// Build the default filename from the name of the emitter
 		CString default_filename = GetDataTreeView ()->GetCurrentSelectionName ();
 		default_filename += ".w3d";
@@ -1946,9 +1944,9 @@ CW3DViewDoc::Save_Selected_Primitive (void)
 			dialog.m_ofn.lpstrTitle = "Export Ring";
 		}
 
-		// Ask the user what filename they wish to save as.		
+		// Ask the user what filename they wish to save as.
 		if (dialog.DoModal () == IDOK) {
-			
+
 			// Save the emitter to the requested file
 			if (m_pCRenderObj->Class_ID () == RenderObjClass::CLASSID_SPHERE) {
 				retval = Save_Current_Sphere (dialog.GetPathName ());
@@ -2063,7 +2061,7 @@ CW3DViewDoc::Save_Selected_Emitter (void)
 	// Is this an emitter?
 	if ((m_pCRenderObj != NULL) &&
 		 m_pCRenderObj->Class_ID () == RenderObjClass::CLASSID_PARTICLEEMITTER) {
-		
+
 		// Build the default filename from the name of the emitter
 		CString default_filename = GetDataTreeView ()->GetCurrentSelectionName ();
 		default_filename += ".w3d";
@@ -2078,7 +2076,7 @@ CW3DViewDoc::Save_Selected_Emitter (void)
 		// Ask the user what filename they wish to save as.
 		dialog.m_ofn.lpstrTitle = "Export Emitter";
 		if (dialog.DoModal () == IDOK) {
-			
+
 			// Save the emitter to the requested file
 			retval = Save_Current_Emitter (dialog.GetPathName ());
 		}
@@ -2147,7 +2145,7 @@ CW3DViewDoc::Save_Selected_Sound_Object (void)
 	//
 	if ((m_pCRenderObj != NULL) &&
 		 m_pCRenderObj->Class_ID () == RenderObjClass::CLASSID_SOUND)
-	{		
+	{
 		//
 		// Build the default filename from the name of the emitter
 		//
@@ -2166,7 +2164,7 @@ CW3DViewDoc::Save_Selected_Sound_Object (void)
 		//
 		dialog.m_ofn.lpstrTitle = "Export Sound Object";
 		if (dialog.DoModal () == IDOK) {
-			
+
 			//
 			// Save the sound object to the requested file
 			//
@@ -2193,7 +2191,7 @@ CW3DViewDoc::Save_Current_Sound_Object (const CString &filename)
 	//
 	SoundRenderObjPrototypeClass *proto = NULL;
 	proto = (SoundRenderObjPrototypeClass *)WW3DAssetManager::Get_Instance ()->Find_Prototype (m_pCRenderObj->Get_Name ());
-	
+
 	ASSERT (proto != NULL);
 	if (proto != NULL) {
 
@@ -2249,14 +2247,14 @@ CW3DViewDoc::Auto_Assign_Bones (void)
 		int bone_count = m_pCRenderObj->Get_Num_Bones ();
 		for (int index = 0; index < bone_count; index ++) {
 			const char *pbone_name = m_pCRenderObj->Get_Bone_Name (index);
-			
+
 			// Attempt to find a render object with the same name as this bone
 			if (WW3DAssetManager::Get_Instance ()->Render_Obj_Exists (pbone_name)) {
-				
+
 				// Add this render object to the bone
 				RenderObjClass *prender_obj = WW3DAssetManager::Get_Instance ()->Create_Render_Obj (pbone_name);
 				m_pCRenderObj->Add_Sub_Object_To_Bone (prender_obj, index);
-				MEMBER_RELEASE (prender_obj);
+				REF_PTR_RELEASE (prender_obj);
 				bupdate_prototype = true;
 			}
 		}
@@ -2265,7 +2263,7 @@ CW3DViewDoc::Auto_Assign_Bones (void)
 			Update_Aggregate_Prototype (*m_pCRenderObj);
 		}
 	}
-		
+
 	return ;
 }
 
@@ -2298,7 +2296,7 @@ CW3DViewDoc::Save_Selected_Aggregate (void)
 		// Ask the user what filename they wish to save as.
 		dialog.m_ofn.lpstrTitle = "Export Aggregate";
 		if (dialog.DoModal () == IDOK) {
-			
+
 			// Save the aggregate to the requested file
 			retval = Save_Current_Aggregate (dialog.GetPathName ());
 		}
@@ -2399,12 +2397,12 @@ void
 CW3DViewDoc::Animate_Camera (bool banimate)
 {
 	m_bAnimateCamera = banimate;
-	
+
 	// Restore the camera if we are done animating it
 	if (m_bAnimateCamera == false) {
 		::AfxGetMainWnd ()->SendMessage (WM_COMMAND, MAKEWPARAM (IDM_CAMERA_RESET, 0));
 	}
-	
+
 	return ;
 }
 
@@ -2452,7 +2450,7 @@ CW3DViewDoc::Make_Movie (void)
 		WW3D::Pause_Movie (true);
 		WW3D::Start_Movie_Capture ("Grab", 30);
 		WW3D::Pause_Movie (true);
-		
+
 		float frames = m_pCAnimation->Get_Num_Frames ();
 		float frame_inc = m_pCAnimation->Get_Frame_Rate () / 30.0F;
 		DWORD ticks = 1000 / 30;
@@ -2473,9 +2471,9 @@ CW3DViewDoc::Make_Movie (void)
 			if (m_bAnimateCamera) {
 				int index = m_pCRenderObj->Get_Bone_Index ("CAMERA");
 				if (index != -1) {
-					
+
 					// Convert the bone's transform into a camera transform
-					Matrix3D	transform = m_pCRenderObj->Get_Bone_Transform (index);												
+					Matrix3D	transform = m_pCRenderObj->Get_Bone_Transform (index);
 					Matrix3D cam_transform (Vector3 (0, -1, 0), Vector3 (0, 0, 1), Vector3 (-1, 0, 0), Vector3 (0, 0, 0));
 #ifdef ALLOW_TEMPORARIES
 					Matrix3D new_transform = transform * cam_transform;
@@ -2488,8 +2486,8 @@ CW3DViewDoc::Make_Movie (void)
 					CameraClass *pcamera = GetGraphicView()->GetCamera ();
 					pcamera->Set_Transform (new_transform);
 				}
-			}	
-			
+			}
+
 			graphic_view->RepaintView (FALSE, ticks);
 			graphic_view->RepaintView (FALSE, 1);
 			WW3D::Update_Movie_Capture ();
@@ -2538,16 +2536,16 @@ CW3DViewDoc::Build_Emitter_List
 		if (psub_obj != NULL) {
 			Build_Emitter_List (emitter_list, emitter_name, psub_obj);
 		}
-		MEMBER_RELEASE (psub_obj);
+		REF_PTR_RELEASE (psub_obj);
 	}
-	
+
 	//
 	// Is this the emitter we are requesting?
 	//
 	if ((render_obj != NULL) &&
 		 (render_obj->Class_ID () == RenderObjClass::CLASSID_PARTICLEEMITTER) &&
 		 (::lstrcmpi (emitter_name, render_obj->Get_Name ()) == 0)) {
-		
+
 		emitter_list->Add_Emitter ((ParticleEmitterClass *)render_obj);
 	}
 
@@ -2591,7 +2589,7 @@ CW3DViewDoc::Is_Cursor_Shown (void) const
 ///////////////////////////////////////////////////////////////
 void
 CW3DViewDoc::Set_Cursor (LPCTSTR resource_name)
-{	
+{
 	m_pCursor->Set_Texture (::Load_RC_Texture (resource_name));
 	return ;
 }
@@ -2641,13 +2639,13 @@ CW3DViewDoc::Count_Particles (RenderObjClass *render_obj)
 			if (psub_obj != NULL) {
 				count += Count_Particles (psub_obj);
 			}
-			MEMBER_RELEASE (psub_obj);
+			REF_PTR_RELEASE (psub_obj);
 		}
 
 
 		// If this is an emitter, then remove its buffer
 		if (render_obj->Class_ID () == RenderObjClass::CLASSID_PARTICLEEMITTER) {
-			
+
 			//
 			//	Add the number of particles in the buffer to the total
 			//
@@ -2655,7 +2653,7 @@ CW3DViewDoc::Count_Particles (RenderObjClass *render_obj)
 			ParticleBufferClass *buffer = emitter->Peek_Buffer ();
 			if (buffer != NULL) {
 				count += buffer->Get_Particle_Count ();
-			}		
+			}
 		}
 	}
 
@@ -2701,7 +2699,7 @@ CW3DViewDoc::Switch_LOD (int increment, RenderObjClass *render_obj)
 			if (psub_obj != NULL) {
 				Switch_LOD (increment, psub_obj);
 			}
-			MEMBER_RELEASE (psub_obj);
+			REF_PTR_RELEASE (psub_obj);
 		}
 
 		//
@@ -2722,10 +2720,10 @@ CW3DViewDoc::Switch_LOD (int increment, RenderObjClass *render_obj)
 //  Toggle_Alternate_Materials
 //
 ///////////////////////////////////////////////////////////////
-void 
+void
 CW3DViewDoc::Toggle_Alternate_Materials(RenderObjClass * render_obj)
 {
-	// 
+	//
 	// If the render object is NULL, start from the current render object
 	//
 	if (render_obj == NULL) {
@@ -2734,7 +2732,7 @@ CW3DViewDoc::Toggle_Alternate_Materials(RenderObjClass * render_obj)
 
 	if (render_obj != NULL) {
 
-		// 
+		//
 		// If this is a mesh, toggle the materials
 		//
 		if (render_obj->Class_ID() == RenderObjClass::CLASSID_MESH) {
@@ -2742,7 +2740,7 @@ CW3DViewDoc::Toggle_Alternate_Materials(RenderObjClass * render_obj)
 			mdl->Enable_Alternate_Material_Description(!mdl->Is_Alternate_Material_Description_Enabled());
 		}
 
-		// 
+		//
 		// Recurse into any children
 		//
 		for (int index = 0; index < render_obj->Get_Num_Sub_Objects(); index++) {
@@ -2750,7 +2748,7 @@ CW3DViewDoc::Toggle_Alternate_Materials(RenderObjClass * render_obj)
 			Toggle_Alternate_Materials(sub_obj);
 		}
 	}
-		
+
 	return;
 }
 
@@ -2761,7 +2759,7 @@ CW3DViewDoc::Toggle_Alternate_Materials(RenderObjClass * render_obj)
 //
 ///////////////////////////////////////////////////////////////
 bool
-CW3DViewDoc::Lookup_Path (LPCTSTR asset_name, CString &path) 
+CW3DViewDoc::Lookup_Path (LPCTSTR asset_name, CString &path)
 {
 	bool retval = false;
 
@@ -2770,7 +2768,7 @@ CW3DViewDoc::Lookup_Path (LPCTSTR asset_name, CString &path)
 	//
 	int counter = m_LoadList.Count ();
 	while ((counter --) && !retval) {
-		
+
 		//
 		//	Does this path contain the W3D this asset came from?
 		//
@@ -2792,8 +2790,8 @@ CW3DViewDoc::Lookup_Path (LPCTSTR asset_name, CString &path)
 //
 ///////////////////////////////////////////////////////////////
 void
-CW3DViewDoc::Copy_Assets_To_Dir (LPCTSTR directory) 
-{	
+CW3DViewDoc::Copy_Assets_To_Dir (LPCTSTR directory)
+{
 	CDataTreeView *data_tree = GetDataTreeView ();
 	SANITY_CHECK ((m_pCRenderObj != NULL && data_tree != NULL)) {
 		return ;
@@ -2805,7 +2803,7 @@ CW3DViewDoc::Copy_Assets_To_Dir (LPCTSTR directory)
 	LPCTSTR asset_name = data_tree->GetCurrentSelectionName ();
 	CString filename;
 	if (Lookup_Path (asset_name, filename)) {
-		
+
 		CString src_path	= ::Strip_Filename_From_Path (filename);
 		CString dest_path	= directory;
 		::Delimit_Path (src_path);
@@ -2815,7 +2813,7 @@ CW3DViewDoc::Copy_Assets_To_Dir (LPCTSTR directory)
 		// Get a list of dependent files from the render object
 		//
 		DynamicVectorClass<StringClass> dependency_list;
-		m_pCRenderObj->Build_Dependency_List (dependency_list);		
+		m_pCRenderObj->Build_Dependency_List (dependency_list);
 
 		//
 		//	Loop over the list of dependent files and copy them
@@ -2876,7 +2874,7 @@ CW3DViewDoc::Copy_Assets_To_Dir (LPCTSTR directory)
 ///////////////////////////////////////////////////////////////
 void
 CW3DViewDoc::Set_Texture_Path1 (LPCTSTR path)
-{		
+{
 	if (m_TexturePath1.CompareNoCase (path) != 0) {
 
 		//
@@ -2901,9 +2899,9 @@ CW3DViewDoc::Set_Texture_Path1 (LPCTSTR path)
 ///////////////////////////////////////////////////////////////
 void
 CW3DViewDoc::Set_Texture_Path2 (LPCTSTR path)
-{	
+{
 	if (m_TexturePath2.CompareNoCase (path) != 0) {
-		
+
 		//
 		//	Pass the new search path onto Surrender
 		//
@@ -2937,7 +2935,7 @@ CW3DViewDoc::Import_Facial_Animation (const CString &heirarchy_name, const CStri
 		//
 		HMorphAnimClass *new_anim = new HMorphAnimClass;
 		new_anim->Import (heirarchy_name, *anim_desc_file);
-		
+
 		//
 		//	Give the new animation a name
 		//
@@ -2972,7 +2970,7 @@ CW3DViewDoc::Import_Facial_Animation (const CString &heirarchy_name, const CStri
 		// Cleanup
 		//
 		anim_desc_file->Close ();
-		MEMBER_RELEASE (new_anim);
+		REF_PTR_RELEASE (new_anim);
 		SAFE_DELETE (anim_desc_file);
 	}
 
@@ -3007,12 +3005,12 @@ void
 CW3DViewDoc::Save_Camera_Settings (void)
 {
 	theApp.WriteProfileInt ("Config", "UseManualFOV", m_ManualFOV);
-	theApp.WriteProfileInt ("Config", "UseManualClipPlanes", m_ManualClipPlanes);	
+	theApp.WriteProfileInt ("Config", "UseManualClipPlanes", m_ManualClipPlanes);
 
 	CGraphicView *graphic_view	= ::Get_Graphic_View ();
 	CameraClass *camera			= graphic_view->GetCamera ();
 	if (camera != NULL) {
-		
+
 		double hfov = camera->Get_Horizontal_FOV ();
 		double vfov = camera->Get_Vertical_FOV ();
 
@@ -3032,9 +3030,9 @@ CW3DViewDoc::Save_Camera_Settings (void)
 		theApp.WriteProfileString ("Config", "hfov", hfov_string);
 		theApp.WriteProfileString ("Config", "vfov", vfov_string);
 		theApp.WriteProfileString ("Config", "znear", znear_string);
-		theApp.WriteProfileString ("Config", "zfar", zfar_string);		
+		theApp.WriteProfileString ("Config", "zfar", zfar_string);
 	}
-	
+
 	return ;
 }
 
@@ -3065,7 +3063,7 @@ CW3DViewDoc::Load_Camera_Settings (void)
 
 				double hfov = ::atof (hfov_string);
 				double vfov = ::atof (vfov_string);
-				
+
 				camera->Set_View_Plane (hfov, vfov);
 			}
 
@@ -3081,7 +3079,7 @@ CW3DViewDoc::Load_Camera_Settings (void)
 				float zfar		= ::atof (zfar_string);
 
 				camera->Set_Clip_Planes (znear, zfar);
-				
+
 				if (m_pCScene != NULL) {
 					m_pCScene->Set_Fog_Range (znear, zfar);
 					m_pCScene->Recalculate_Fog_Planes();
diff --git a/Core/Tools/W3DView/W3DViewDoc.h b/Core/Tools/W3DView/W3DViewDoc.h
index fbdcbac949f..cab9ffd9b1a 100644
--- a/Core/Tools/W3DView/W3DViewDoc.h
+++ b/Core/Tools/W3DView/W3DViewDoc.h
@@ -20,20 +20,15 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_W3DVIEWDOC_H__2BB39E31_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
-#define AFX_W3DVIEWDOC_H__2BB39E31_5D3A_11D2_9FC6_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #include "scene.h"
-#include "Chunkio.h"
-#include "HAnim.H"
-#include "HCAnim.H"
+#include "chunkio.h"
+#include "hanim.h"
+#include "hcanim.h"
 #include "dynamesh.h"
 #include "rendobj.h"
-#include "LODDefs.H"
+#include "LODDefs.h"
 
 
 ///////////////////////////////////////////////////////////
@@ -116,12 +111,12 @@ class CW3DViewDoc : public CDocument
 	//
 	CameraClass *			Get2DCamera (void) const				{ return m_pC2DCamera; }
 	CameraClass *			GetBackObjectCamera (void) const		{ return m_pCBackObjectCamera; }
-	SceneClass *			Get2DScene (void) const					{ return m_pC2DScene; }        
+	SceneClass *			Get2DScene (void) const					{ return m_pC2DScene; }
 	SceneClass *			GetCursorScene (void) const			{ return m_pCursorScene; }
 	ViewerSceneClass *	GetScene (void) const					{ return m_pCScene; }
 	SceneClass *			GetBackObjectScene (void) const		{ return m_pCBackObjectScene; }
 	LightClass *			GetSceneLight (void) const				{ return m_pCSceneLight; }
-	RenderObjClass *		GetDisplayedObject (void) const		{ return m_pCRenderObj; }	
+	RenderObjClass *		GetDisplayedObject (void) const		{ return m_pCRenderObj; }
 	HAnimClass *			GetCurrentAnimation (void) const		{ return m_pCAnimation; }
 	const HTreeClass *	Get_Current_HTree (void) const;
 
@@ -216,7 +211,7 @@ class CW3DViewDoc : public CDocument
 	//
 	void					Auto_Assign_Bones (void);
 	bool					Save_Selected_Aggregate (void);
-	bool					Save_Current_Aggregate (const CString &filename);		  
+	bool					Save_Current_Aggregate (const CString &filename);
 
 	//
 	//	Sound object methods
@@ -232,7 +227,7 @@ class CW3DViewDoc : public CDocument
 	void					Switch_LOD (int increment = 1, RenderObjClass *render_obj = NULL);
 
 	//
-	// Alternate Material interface.  
+	// Alternate Material interface.
 	//
 	void					Toggle_Alternate_Materials(RenderObjClass * obj = NULL);
 
@@ -284,11 +279,11 @@ class CW3DViewDoc : public CDocument
 	void					Set_Texture_Path1 (LPCTSTR path);
 	void					Set_Texture_Path2 (LPCTSTR path);
 
-	// 
+	//
 	// Dazzle rendering support
 	//
 	void					Render_Dazzles(CameraClass * camera);
-		
+
 private:
 
 	//////////////////////////////////////////////////////////////////
@@ -303,7 +298,7 @@ class CW3DViewDoc : public CDocument
 	RenderObjClass *		m_pCBackgroundObject;
 	HAnimClass *			m_pCAnimation;
 	HAnimComboClass *		m_pCAnimCombo;
-	LightClass *			m_pCSceneLight;	  
+	LightClass *			m_pCSceneLight;
 	Bitmap2DObjClass *	m_pCBackgroundBMP;
 	CameraClass *			m_pC2DCamera;
 	CameraClass *			m_pCBackObjectCamera;
@@ -311,7 +306,7 @@ class CW3DViewDoc : public CDocument
 	Vector3					m_backgroundColor;
 	CString					m_stringBackgroundBMP;
 	CString					m_stringBackgroundObject;
-	
+
 	bool						m_bCompress_channel_Q;
 	int						m_nChannelQnBytes;
 	float						m_CurrentFrame;
@@ -337,7 +332,3 @@ class CW3DViewDoc : public CDocument
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_W3DVIEWDOC_H__2BB39E31_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
-
-
diff --git a/Core/Tools/W3DView/W3DViewView.cpp b/Core/Tools/W3DView/W3DViewView.cpp
index 6a0f4f63376..a4a725757b9 100644
--- a/Core/Tools/W3DView/W3DViewView.cpp
+++ b/Core/Tools/W3DView/W3DViewView.cpp
@@ -19,7 +19,7 @@
 // W3DViewView.cpp : implementation of the CW3DViewView class
 //
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "W3DView.h"
 
 #include "W3DViewDoc.h"
diff --git a/Core/Tools/W3DView/W3DViewView.h b/Core/Tools/W3DView/W3DViewView.h
index 4f8ab9210d5..024b2af2af4 100644
--- a/Core/Tools/W3DView/W3DViewView.h
+++ b/Core/Tools/W3DView/W3DViewView.h
@@ -20,12 +20,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_W3DVIEWVIEW_H__2BB39E33_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
-#define AFX_W3DVIEWVIEW_H__2BB39E33_5D3A_11D2_9FC6_00104B791122__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 class CW3DViewView : public CView
 {
@@ -75,5 +70,3 @@ inline CW3DViewDoc* CW3DViewView::GetDocument()
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_W3DVIEWVIEW_H__2BB39E33_5D3A_11D2_9FC6_00104B791122__INCLUDED_)
diff --git a/Core/Tools/W3DView/resource.h b/Core/Tools/W3DView/resource.h
index c99adfca159..f43e33eb37c 100644
--- a/Core/Tools/W3DView/resource.h
+++ b/Core/Tools/W3DView/resource.h
@@ -621,7 +621,7 @@
 #define IDS_RESOLUTION_PANE             61222
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
diff --git a/Core/Tools/WW3D/max2w3d/AlphaModifier.cpp b/Core/Tools/WW3D/max2w3d/AlphaModifier.cpp
index e32afdc5a17..dec1f6681a8 100644
--- a/Core/Tools/WW3D/max2w3d/AlphaModifier.cpp
+++ b/Core/Tools/WW3D/max2w3d/AlphaModifier.cpp
@@ -52,12 +52,12 @@ enum Dialog_Controls
 
 void AlphaModifierClass::ModifyObject(TimeValue t, ModContext &mc, ObjectState *os, INode *node)
 {
-	if (!os->obj->IsSubClassOf(triObjectClassID)) 
+	if (!os->obj->IsSubClassOf(triObjectClassID))
 	{
 		return;
 	}
 
-	
+
 	// Get a mesh from input object
 	TriObject *object = (TriObject*)os->obj;
 
@@ -70,13 +70,13 @@ void AlphaModifierClass::ModifyObject(TimeValue t, ModContext &mc, ObjectState *
 	float *vdata = NULL;
 
 	// Get parameters from pblock
-	float		sparam = 0.0f; 
+	float		sparam = 0.0f;
 	Interval	valid = LocalValidity(t);
 	int			pass = 1;
 
 	pblock->GetValue(DL_EDIT_VALUE, t, sparam, valid);
 
-	// If needed a control could be put into the dialog box to specify which 
+	// If needed a control could be put into the dialog box to specify which
 	// pass to apply the alpha values to.  At this time, it was decided to
 	// not implement this because of the complexity to the artist and the
 	// performance issues in game.
@@ -100,10 +100,10 @@ void AlphaModifierClass::ModifyObject(TimeValue t, ModContext &mc, ObjectState *
 
 		for (i = 0; i < numVert; i++)
 		{
-			if (mesh->VertSel()[i]) 
+			if (mesh->VertSel()[i])
 			{
 				vdata[i] = 0.0f;
-			} 
+			}
 		}
 
 	}
@@ -122,10 +122,10 @@ void AlphaModifierClass::ModifyObject(TimeValue t, ModContext &mc, ObjectState *
 		{
 			for (i = 0; i < numVert; i++)
 			{
-				if (SelectedVertices[i]) 
+				if (SelectedVertices[i])
 				{
 					vdata[i] = sparam;
-				} 
+				}
 			}
 		}
 	}
@@ -143,11 +143,11 @@ void AlphaModifierClass::ModifyObject(TimeValue t, ModContext &mc, ObjectState *
 		// Find the vertices that have the user entered value.
 		for (i = 0; i < numVert; i++)
 		{
-			if (vdata[i] == sparam) 
+			if (vdata[i] == sparam)
 			{
 				mesh->VertSel().Set(i);
 				SelectedVertices.Set(i);
-			} 
+			}
 			else
 			{
 				mesh->VertSel().Clear(i);
@@ -155,7 +155,7 @@ void AlphaModifierClass::ModifyObject(TimeValue t, ModContext &mc, ObjectState *
 			}
 
 		}
-	  
+
 	}
 
 	if (Message == AM_INITIALIZE)
@@ -166,13 +166,13 @@ void AlphaModifierClass::ModifyObject(TimeValue t, ModContext &mc, ObjectState *
 
 		for (i = 0; i < numVert; i++)
 		{
-			if (SelectedVertices[i]) 
+			if (SelectedVertices[i])
 			{
 				// Set the value in the dialog box to the value of the
 				// first selected vertex.
 				pblock->SetValue(DL_EDIT_VALUE, t, vdata[i]);
 				break;
-			} 
+			}
 		}
 
 	}
@@ -182,10 +182,10 @@ void AlphaModifierClass::ModifyObject(TimeValue t, ModContext &mc, ObjectState *
 	// This must be done because the mesh changes each time ModfiyObject is called.
 	for (i = 0; i < numVert; i++)
 	{
-		if (SelectedVertices[i]) 
+		if (SelectedVertices[i])
 		{
 			mesh->VertSel().Set(i);
-		} 
+		}
 		else
 		{
 			mesh->VertSel().Clear(i);
@@ -244,17 +244,17 @@ ClassDesc* Get_Alpha_Desc() {return &AlphaCD;}
 /*===========================================================================*\
  |	Paramblock2 Descriptor
 \*===========================================================================*/
-static ParamBlockDesc2 alpha_param_blk 
-(		
+static ParamBlockDesc2 alpha_param_blk
+(
 	//rollout
-		0, _T("AlphaModifierParams"),  0, &AlphaCD, P_AUTO_CONSTRUCT + P_AUTO_UI, 0, 
-		IDD_ALPHA_MODIFIER, IDS_PARAMETERS, 0, 0, NULL, 
+		0, _T("AlphaModifierParams"),  0, &AlphaCD, P_AUTO_CONSTRUCT + P_AUTO_UI, 0,
+		IDD_ALPHA_MODIFIER, IDS_PARAMETERS, 0, 0, NULL,
 
 	// params
-	   
+
 		DL_EDIT_VALUE,	_T("Custom Data Value"),	TYPE_FLOAT,	P_ANIMATABLE,	IDS_ALPHA_MODIFIER_CLASS,
 		p_default,		0.0f,
-		p_range, 		0.0f, 100.0f, 
+		p_range, 		0.0f, 100.0f,
 		p_ui,			TYPE_SPINNER, EDITTYPE_FLOAT, IDC_ALPHA_EDIT, IDC_ALPHA_SPIN, 1.0f,
 		end,
 
@@ -267,7 +267,7 @@ static ParamBlockDesc2 alpha_param_blk
 /*
 		DL_EDIT_PASS,	_T("2 Custom Data Value"),	TYPE_INT,	P_ANIMATABLE,	IDS_ALPHA_MODIFIER_CLASS,
 		p_default,		1,
-		p_range, 		1, 4, 
+		p_range, 		1, 4,
 		p_ui,			TYPE_SPINNER, EDITTYPE_INT, IDC_ALPHA_EDIT2, IDC_ALPHA_SPIN2, 1.0,
 		end,
 */
@@ -285,7 +285,7 @@ BOOL AlphaModDlgProc::DlgProc(TimeValue t, IParamMap2 *map, HWND hWnd, UINT msg,
 	int id = LOWORD(wParam);
 	int code = HIWORD(wParam);
 
-	switch (msg) 
+	switch (msg)
 	{
 		case WM_INITDIALOG:
 			AlphaModifier->Message = AM_INITIALIZE;
@@ -293,7 +293,7 @@ BOOL AlphaModDlgProc::DlgProc(TimeValue t, IParamMap2 *map, HWND hWnd, UINT msg,
 		case WM_DESTROY:
 			break;
 		case WM_COMMAND:
-			switch (code) 
+			switch (code)
 			{
 				case EN_UPDATE:
 				break;
@@ -366,7 +366,7 @@ void AlphaModifierClass::BeginEditParams( IObjParam *ip, ULONG flags,Animatable
 
 	alpha_param_blk.SetUserDlgProc(new AlphaModDlgProc(this));
 }
-		
+
 void AlphaModifierClass::EndEditParams( IObjParam *ip, ULONG flags,Animatable *next )
 {
 	AlphaCD.EndEditParams(ip, this, flags, next);
@@ -379,9 +379,9 @@ void AlphaModifierClass::EndEditParams( IObjParam *ip, ULONG flags,Animatable *n
 \*===========================================================================*/
 
 
-RefTargetHandle AlphaModifierClass::Clone(RemapDir& remap) 
-{	
-	AlphaModifierClass* newmod = new AlphaModifierClass();	
+RefTargetHandle AlphaModifierClass::Clone(RemapDir& remap)
+{
+	AlphaModifierClass* newmod = new AlphaModifierClass();
 	newmod->ReplaceReference(0,pblock->Clone(remap));
 	return(newmod);
 }
@@ -393,18 +393,18 @@ RefTargetHandle AlphaModifierClass::Clone(RemapDir& remap)
  |	Subanim & References support
 \*===========================================================================*/
 
-Animatable* AlphaModifierClass::SubAnim(int i) 	
+Animatable* AlphaModifierClass::SubAnim(int i)
 {
-	switch (i) 
+	switch (i)
 	{
 		case 0: return pblock;
 		default: return NULL;
 	}
 }
 
-TSTR AlphaModifierClass::SubAnimName(int i) 
+TSTR AlphaModifierClass::SubAnimName(int i)
 {
-	switch (i) 
+	switch (i)
 	{
 		case 0: return Get_String(IDS_PARAMETERS);
 		default: return _T("");
@@ -413,10 +413,10 @@ TSTR AlphaModifierClass::SubAnimName(int i)
 
 RefTargetHandle AlphaModifierClass::GetReference(int i)
 {
-	switch (i) 
+	switch (i)
 	{
 		case 0: return pblock;
-		default: 
+		default:
 			assert(TRUE);
 			return NULL;
 	}
@@ -424,7 +424,7 @@ RefTargetHandle AlphaModifierClass::GetReference(int i)
 
 void AlphaModifierClass::SetReference(int i, RefTargetHandle rtarg)
 {
-	switch (i) 
+	switch (i)
 	{
 		case 0: pblock = (IParamBlock2*)rtarg; break;
 		default:
@@ -435,13 +435,13 @@ void AlphaModifierClass::SetReference(int i, RefTargetHandle rtarg)
 
 RefResult AlphaModifierClass::NotifyRefChanged
 (
-		Interval changeInt, 
+		Interval changeInt,
 		RefTargetHandle hTarget,
-		PartID& partID,  
+		PartID& partID,
 		RefMessage message
-) 
+)
 {
-	switch (message) 
+	switch (message)
 	{
 		case REFMSG_CHANGE:
 		{
@@ -462,7 +462,7 @@ RefResult AlphaModifierClass::NotifyRefChanged
 
 Interval AlphaModifierClass::GetValidity(TimeValue t)
 {
-	float f;	
+	float f;
 	Interval valid = FOREVER;
 	pblock->GetValue(DL_EDIT_VALUE, t, f, valid);
 	return valid;
diff --git a/Core/Tools/WW3D/max2w3d/AlphaModifier.h b/Core/Tools/WW3D/max2w3d/AlphaModifier.h
index 4e13cbd02b7..e698b0e20e3 100644
--- a/Core/Tools/WW3D/max2w3d/AlphaModifier.h
+++ b/Core/Tools/WW3D/max2w3d/AlphaModifier.h
@@ -34,10 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef ALPHA_MODIFIER_H
-#define ALPHA_MODIFIER_H
-
+#pragma once
 
 #include <max.h>
 #include "iparamm2.h"
@@ -56,7 +53,7 @@ extern ClassDesc* Get_Alpha_Desc();
 
 #define ALPHA_VERTEX_CHANNEL 10
 
-class AlphaModifierClass : public Modifier 
+class AlphaModifierClass : public Modifier
 {
 	public:
 
@@ -71,13 +68,13 @@ class AlphaModifierClass : public Modifier
 
 
 		// Plugin identification
-		void GetClassName(TSTR& s) { s= TSTR(Get_String(IDS_ALPHA_MODIFIER_CLASS));}  
-		virtual Class_ID ClassID() { return ALPHA_MODIFIER_CLASSID;}		
+		void GetClassName(TSTR& s) { s= TSTR(Get_String(IDS_ALPHA_MODIFIER_CLASS));}
+		virtual Class_ID ClassID() { return ALPHA_MODIFIER_CLASSID;}
 		TCHAR *GetObjectName() { return Get_String(IDS_ALPHA_MODIFIER_CLASS);}
 
 
 		// Defines the behavior for this modifier
-		// This is currently setup to be basic geometry 
+		// This is currently setup to be basic geometry
 		// modification of deformable objects
 		ChannelMask ChannelsUsed()  {return PART_GEOM|PART_TOPO|PART_SELECT|PART_SUBSEL_TYPE;}
 		ChannelMask ChannelsChanged() {return PART_GEOM|PART_TOPO|PART_SELECT|PART_SUBSEL_TYPE;}
@@ -88,7 +85,7 @@ class AlphaModifierClass : public Modifier
 		// Calculate the local validity from the parameters
 		Interval LocalValidity(TimeValue t);
 		Interval GetValidity(TimeValue t);
-							
+
 
 		// Object modification and notification of change
 		void ModifyObject(TimeValue t, ModContext &mc, ObjectState *os, INode *node);
@@ -101,14 +98,14 @@ class AlphaModifierClass : public Modifier
 		void SetReference(int i, RefTargetHandle rtarg);
 		RefTargetHandle Clone(RemapDir& remap = NoRemap());
 		RefResult NotifyRefChanged( Interval changeInt,RefTargetHandle hTarget, PartID& partID, RefMessage message);
-		
+
 		// SubAnim support
 		int NumSubs() { return 0;}
 		Animatable* SubAnim(int i);
 		TSTR SubAnimName(int i);
 
 		// Direct paramblock access
-		int	NumParamBlocks() {return 1;}	
+		int	NumParamBlocks() {return 1;}
 		IParamBlock2* GetParamBlock(int i) { return pblock;}
 		IParamBlock2* GetParamBlockByID(BlockID id) {return (pblock->ID() == id) ? pblock : NULL;}
 		int GetParamBlockIndex(int id) {return id;}
@@ -133,7 +130,7 @@ class AlphaModifierClass : public Modifier
  |	Dialog Processor
 \*===========================================================================*/
 
-class AlphaModDlgProc : public ParamMap2UserDlgProc 
+class AlphaModDlgProc : public ParamMap2UserDlgProc
 {
 	public:
 		AlphaModifierClass *AlphaModifier;
@@ -146,9 +143,3 @@ class AlphaModDlgProc : public ParamMap2UserDlgProc
 
 		void SetThing(ReferenceTarget *m) {AlphaModifier = (AlphaModifierClass*)m;}
 };
-
-
-#endif //ALPHA_MODIFIER_H
-
-
-
diff --git a/Core/Tools/WW3D/max2w3d/AppData.cpp b/Core/Tools/WW3D/max2w3d/AppData.cpp
index 80bd7461aec..2290ed6d455 100644
--- a/Core/Tools/WW3D/max2w3d/AppData.cpp
+++ b/Core/Tools/WW3D/max2w3d/AppData.cpp
@@ -144,7 +144,7 @@ Value * copy_app_data_cf (Value **arg_list, int count)
 		dest_node->AddAppDataChunk(W3DUtilityClassID, UTILITY_CLASS_ID, W3D_DAZZLE_APPDATA,
 											sizeof(W3DDazzleAppDataStruct), copy_dazzle_data);
 	}
-	
+
 	return &ok;
 }
 
diff --git a/Core/Tools/WW3D/max2w3d/CMakeLists.txt b/Core/Tools/WW3D/max2w3d/CMakeLists.txt
index 433365eb591..07eb6dbf32b 100644
--- a/Core/Tools/WW3D/max2w3d/CMakeLists.txt
+++ b/Core/Tools/WW3D/max2w3d/CMakeLists.txt
@@ -117,8 +117,8 @@ set(MAX2W3D_SRC
     "skindata.h"
     "SnapPoints.cpp"
     "SnapPoints.h"
-    "TARGA.CPP"
-    "TARGA.H"
+    "TARGA.cpp"
+    "TARGA.h"
     "util.cpp"
     "util.h"
     "Utility.cpp"
diff --git a/Core/Tools/WW3D/max2w3d/ExportAll.cpp b/Core/Tools/WW3D/max2w3d/ExportAll.cpp
index 578845d9393..1da4f92ebff 100644
--- a/Core/Tools/WW3D/max2w3d/ExportAll.cpp
+++ b/Core/Tools/WW3D/max2w3d/ExportAll.cpp
@@ -113,4 +113,4 @@ Value * export_tree_settings_cf (Value **arg_list, int count)
 
 	// Return the new values.
 	return_value(vl.result);
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/WW3D/max2w3d/ExportAllDlg.cpp b/Core/Tools/WW3D/max2w3d/ExportAllDlg.cpp
index 82c6d6de65a..67ed5ccd8c3 100644
--- a/Core/Tools/WW3D/max2w3d/ExportAllDlg.cpp
+++ b/Core/Tools/WW3D/max2w3d/ExportAllDlg.cpp
@@ -165,7 +165,7 @@ void ExportAllDlg::OnInitDialog (void)
 	SetWindowText(edit, m_Directory);
 }
 
-void ExportAllDlg::OnBrowse() 
+void ExportAllDlg::OnBrowse()
 {
 	char			folder_name[MAX_PATH];
 	BROWSEINFO	bi;
diff --git a/Core/Tools/WW3D/max2w3d/ExportAllDlg.h b/Core/Tools/WW3D/max2w3d/ExportAllDlg.h
index fc85abd06fd..536e822a130 100644
--- a/Core/Tools/WW3D/max2w3d/ExportAllDlg.h
+++ b/Core/Tools/WW3D/max2w3d/ExportAllDlg.h
@@ -34,9 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef EXPORTALLDLG_H
-#define EXPORTALLDLG_H
+#pragma once
 
 #include "dllmain.h"
 #include "resource.h"
@@ -76,6 +74,3 @@ class ExportAllDlg
 	void OnBrowse (void);
 	BOOL OnOK (void);		// TRUE if ok to close dialog
 };
-
-
-#endif
diff --git a/Core/Tools/WW3D/max2w3d/FormClass.cpp b/Core/Tools/WW3D/max2w3d/FormClass.cpp
index ad485453870..28744373f69 100644
--- a/Core/Tools/WW3D/max2w3d/FormClass.cpp
+++ b/Core/Tools/WW3D/max2w3d/FormClass.cpp
@@ -42,7 +42,7 @@
 #include "FormClass.h"
 #include "dllmain.h"
 
-// hard-coded resource id which VC special cases for MFC... >:-) 
+// hard-coded resource id which VC special cases for MFC... >:-)
 #define RT_DLGINIT  MAKEINTRESOURCE(240)
 
 
@@ -66,7 +66,7 @@ FormClass::Create_Form
 )
 {
 	// call PreCreateWindow to get prefered extended style
-	CREATESTRUCT cs = { 0 };		
+	CREATESTRUCT cs = { 0 };
 	cs.style = WS_CHILD;
 
 	m_hWnd = ::CreateDialogParam(	AppInstance,
@@ -109,11 +109,11 @@ FormClass::fnFormProc
 	UINT message,
 	WPARAM wparam,
 	LPARAM lparam
-) 
+)
 {
 	FormClass *pform = (FormClass *)::GetProp (dlg_wnd, "FORMCLASS");
 
-	if (message == WM_INITDIALOG) {	
+	if (message == WM_INITDIALOG) {
 		pform = (FormClass *)lparam;
 		::SetProp (dlg_wnd, "FORMCLASS", (HANDLE)pform);
 	} else if (message == WM_DESTROY) {
diff --git a/Core/Tools/WW3D/max2w3d/FormClass.h b/Core/Tools/WW3D/max2w3d/FormClass.h
index 76a6c99f8c2..9f12c95df34 100644
--- a/Core/Tools/WW3D/max2w3d/FormClass.h
+++ b/Core/Tools/WW3D/max2w3d/FormClass.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __FORMCLASS_H
-#define __FORMCLASS_H
 
 #include <max.h>
 
@@ -48,7 +42,7 @@
 class FormClass : public ParamDlg
 {
 	public:
-		FormClass (void) 
+		FormClass (void)
 			: m_hWnd (NULL) {}
 		~FormClass (void) {}
 
@@ -59,7 +53,7 @@ class FormClass : public ParamDlg
 		virtual void			Invalidate(void) { InvalidateRect(m_hWnd,NULL,0); }
 
 	protected:
-		
+
 		BOOL						ExecuteDlgInit(LPVOID lpResource);
 		BOOL						ExecuteDlgInit(LPCTSTR lpszResourceName);
 
@@ -68,5 +62,3 @@ class FormClass : public ParamDlg
 		HWND						m_hWnd;
 		RECT						m_FormRect;
 };
-
-#endif //__FORMCLASS_H
diff --git a/Core/Tools/WW3D/max2w3d/GameMtl.cpp b/Core/Tools/WW3D/max2w3d/GameMtl.cpp
index 69c47d8478a..1010d91197f 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtl.cpp
+++ b/Core/Tools/WW3D/max2w3d/GameMtl.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/GameMtl.cpp 52    8/10/01 2:18p Ian_l $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : GAMEMTL.CPP                                                  * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/26/97                                                     * 
- *                                                                                             * 
- *                  Last Update : 10/26/1999997 [GH]                                           * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : GAMEMTL.cpp                                                  *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/26/97                                                     *
+ *                                                                                             *
+ *                  Last Update : 10/26/1999997 [GH]                                           *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   GameMtl::GameMtl -- constructor                                                           *
  *   GameMtl::~GameMtl -- destructor                                                           *
  *   GameMtl::ClassID -- returns the max ClassID of the material plugin                        *
@@ -102,11 +102,11 @@ ClassDesc * Get_Game_Material_Desc() { return &_GameMaterialCD;  }
 *  PostLoadCallback for GameMtl
 *
 ******************************************************************************/
-class GameMtlPostLoad : public PostLoadCallback 
+class GameMtlPostLoad : public PostLoadCallback
 {
 public:
 	GameMtl *m;
-	
+
 	GameMtlPostLoad(GameMtl *b)		{ m=b; IsOld = false;}
 	void proc(ILoad *iload);
 
@@ -114,7 +114,7 @@ class GameMtlPostLoad : public PostLoadCallback
 	** Data from the previous version of GameMtl
 	*/
 	bool					IsOld;
-	ULONG					Attributes;		
+	ULONG					Attributes;
 	Color					Diffuse;
 	Color					Specular;
 	Color					AmbientCoeff;
@@ -156,7 +156,7 @@ class GameMtlPostLoad : public PostLoadCallback
 /*
 ** Custom Chunk IDs
 */
-#define GAMEMTL_FLAGS_CHUNK					0x0000		 
+#define GAMEMTL_FLAGS_CHUNK					0x0000
 #define GAMEMTL_GAMEFLAGS_CHUNK				0x0001		// OBSOLETE!
 #define GAMEMTL_COLORS_CHUNK					0x0002		// OBSOLETE!
 
@@ -214,9 +214,9 @@ class GameMtlPostLoad : public PostLoadCallback
 /*
 ** Main Parameter Block Definition
 */
-static ParamBlockDescID MainParameterBlockDesc[] = 
+static ParamBlockDescID MainParameterBlockDesc[] =
 {
-	{ TYPE_INT,			NULL,	FALSE,	0 },		// Pass Count		
+	{ TYPE_INT,			NULL,	FALSE,	0 },		// Pass Count
 };
 
 
@@ -235,7 +235,7 @@ static ParamBlockDescID MainParameterBlockDesc[] =
 ** doing things.
 **
 ** (gth) Aug 6, 2000
-** IMPORTANT -PLEASE READ- 
+** IMPORTANT -PLEASE READ-
 ** The following enums are basically the index into the array of
 ** ParamBlockDescID's that we are using.  It is critical that this
 ** enumeration does not skip indexes and that the value for each
@@ -249,9 +249,9 @@ static ParamBlockDescID MainParameterBlockDesc[] =
 ** usually be able to be the same as its array index due to the
 ** evolution of this structure.  The id I'm referring to is the
 ** number in the 4th element of each of the ParamBlockDescIDs.
-** 
+**
 ** If you remove an entry from our array of ParamBlockDescIDs you
-** will need to update all of the PB_xxx enumeration below so that 
+** will need to update all of the PB_xxx enumeration below so that
 ** they match their position in the array again.
 */
 
@@ -334,8 +334,8 @@ enum
 */
 
 // Version 0 (old version)
-static ParamBlockDescID PassParameterBlockDescVer0[] = 
-{ 
+static ParamBlockDescID PassParameterBlockDescVer0[] =
+{
 	{ TYPE_POINT3,		NULL, TRUE,		0 },		// Ambient
 	{ TYPE_POINT3,		NULL, TRUE,		1 },		// Diffuse
 	{ TYPE_POINT3,		NULL, TRUE,		2 },		// Specular
@@ -343,7 +343,7 @@ static ParamBlockDescID PassParameterBlockDescVer0[] =
 	{ TYPE_FLOAT,		NULL, TRUE,		4 },		// Shininess
 	{ TYPE_FLOAT,		NULL, TRUE,		5 },		// Opacity
 	{ TYPE_FLOAT,		NULL, TRUE,		6 },		// Translucency
-	{ TYPE_INT,			NULL,	FALSE,	7 },		// Mapping Type		
+	{ TYPE_INT,			NULL,	FALSE,	7 },		// Mapping Type
 	{ TYPE_INT,			NULL, FALSE,	8 },		// PSX Translucency Type
 	{ TYPE_BOOL,		NULL,	FALSE,	9 },		// PSX Lighting Flag
 
@@ -366,7 +366,7 @@ static ParamBlockDescID PassParameterBlockDescVer0[] =
 	{ TYPE_FLOAT,		NULL,	FALSE,	25},		// Stage0 Frame Rate
 	{ TYPE_INT,			NULL,	FALSE,	26},		// Stage0 Frame Count
 	{ TYPE_INT,			NULL, FALSE,	27},		// Stage0 Animation Type
-		
+
 	{ TYPE_BOOL,		NULL,	FALSE,	28},		// Stage1 Texture Enable
 	{ TYPE_BOOL,		NULL,	FALSE,	29},		// Stage1 Texture Publish
 	{ TYPE_BOOL,		NULL,	FALSE,	30},		// Stage1 Texture Display (in viewport...)
@@ -376,9 +376,9 @@ static ParamBlockDescID PassParameterBlockDescVer0[] =
 
 };
 
-// Version 1 
-static ParamBlockDescID PassParameterBlockDescVer1[] = 
-{ 
+// Version 1
+static ParamBlockDescID PassParameterBlockDescVer1[] =
+{
 	{ TYPE_POINT3,		NULL, TRUE,		0 },		// Ambient
 	{ TYPE_POINT3,		NULL, TRUE,		1 },		// Diffuse
 	{ TYPE_POINT3,		NULL, TRUE,		2 },		// Specular
@@ -387,7 +387,7 @@ static ParamBlockDescID PassParameterBlockDescVer1[] =
 	{ TYPE_FLOAT,		NULL, TRUE,		5 },		// Opacity
 	{ TYPE_FLOAT,		NULL, TRUE,		6 },		// Translucency
 	{ TYPE_BOOL,		NULL,	FALSE,	34},		// Copy specular to diffuse (new to version 1)
-	{ TYPE_INT,			NULL,	FALSE,	7 },		// Mapping Type		
+	{ TYPE_INT,			NULL,	FALSE,	7 },		// Mapping Type
 	{ TYPE_INT,			NULL, FALSE,	8 },		// PSX Translucency Type
 	{ TYPE_BOOL,		NULL,	FALSE,	9 },		// PSX Lighting Flag
 
@@ -413,7 +413,7 @@ static ParamBlockDescID PassParameterBlockDescVer1[] =
 	{ TYPE_FLOAT,		NULL,	FALSE,	25},		// Stage0 Frame Rate
 	{ TYPE_INT,			NULL,	FALSE,	26},		// Stage0 Frame Count
 	{ TYPE_INT,			NULL, FALSE,	27},		// Stage0 Animation Type
-		
+
 	{ TYPE_BOOL,		NULL,	FALSE,	28},		// Stage1 Texture Enable
 	{ TYPE_BOOL,		NULL,	FALSE,	29},		// Stage1 Texture Publish
 	{ TYPE_BOOL,		NULL, FALSE,	40},		// Stage1 Texture Resize (new to version 1)
@@ -434,8 +434,8 @@ static ParamBlockDescID PassParameterBlockDescVer1[] =
 };
 
 // Version 2 (old version)
-static ParamBlockDescID PassParameterBlockDescVer2[] = 
-{ 
+static ParamBlockDescID PassParameterBlockDescVer2[] =
+{
 	{ TYPE_POINT3,		NULL, TRUE,		0 },		// Ambient
 	{ TYPE_POINT3,		NULL, TRUE,		1 },		// Diffuse
 	{ TYPE_POINT3,		NULL, TRUE,		2 },		// Specular
@@ -444,7 +444,7 @@ static ParamBlockDescID PassParameterBlockDescVer2[] =
 	{ TYPE_FLOAT,		NULL, TRUE,		5 },		// Opacity
 	{ TYPE_FLOAT,		NULL, TRUE,		6 },		// Translucency
 	{ TYPE_BOOL,		NULL,	FALSE,	34},		// Copy specular to diffuse (new to version 1)
-	{ TYPE_INT,			NULL,	FALSE,	7 },		// Mapping Type		
+	{ TYPE_INT,			NULL,	FALSE,	7 },		// Mapping Type
 	{ TYPE_INT,			NULL, FALSE,	8 },		// PSX Translucency Type
 	{ TYPE_BOOL,		NULL,	FALSE,	9 },		// PSX Lighting Flag
 
@@ -470,7 +470,7 @@ static ParamBlockDescID PassParameterBlockDescVer2[] =
 	{ TYPE_FLOAT,		NULL,	FALSE,	25},		// Stage0 Frame Rate
 	{ TYPE_INT,			NULL,	FALSE,	26},		// Stage0 Frame Count
 	{ TYPE_INT,			NULL, FALSE,	27},		// Stage0 Animation Type
-		
+
 	{ TYPE_BOOL,		NULL,	FALSE,	28},		// Stage1 Texture Enable
 	{ TYPE_BOOL,		NULL,	FALSE,	29},		// Stage1 Texture Publish
 	{ TYPE_BOOL,		NULL, FALSE,	40},		// Stage1 Texture Resize (new to version 1)
@@ -495,8 +495,8 @@ static ParamBlockDescID PassParameterBlockDescVer2[] =
 };
 
 // Version 3 (old version)
-static ParamBlockDescID PassParameterBlockDescVer3[] = 
-{ 
+static ParamBlockDescID PassParameterBlockDescVer3[] =
+{
 	{ TYPE_POINT3,		NULL, TRUE,		0 },		// Ambient
 	{ TYPE_POINT3,		NULL, TRUE,		1 },		// Diffuse
 	{ TYPE_POINT3,		NULL, TRUE,		2 },		// Specular
@@ -505,7 +505,7 @@ static ParamBlockDescID PassParameterBlockDescVer3[] =
 	{ TYPE_FLOAT,		NULL, TRUE,		5 },		// Opacity
 	{ TYPE_FLOAT,		NULL, TRUE,		6 },		// Translucency
 	{ TYPE_BOOL,		NULL,	FALSE,	34},		// Copy specular to diffuse (new to version 1)
-	{ TYPE_INT,			NULL,	FALSE,	7 },		// Mapping Type		
+	{ TYPE_INT,			NULL,	FALSE,	7 },		// Mapping Type
 	{ TYPE_INT,			NULL, FALSE,	8 },		// PSX Translucency Type
 	{ TYPE_BOOL,		NULL,	FALSE,	9 },		// PSX Lighting Flag
 
@@ -531,7 +531,7 @@ static ParamBlockDescID PassParameterBlockDescVer3[] =
 	{ TYPE_FLOAT,		NULL,	FALSE,	25},		// Stage0 Frame Rate
 	{ TYPE_INT,			NULL,	FALSE,	26},		// Stage0 Frame Count
 	{ TYPE_INT,			NULL, FALSE,	27},		// Stage0 Animation Type
-		
+
 	{ TYPE_BOOL,		NULL,	FALSE,	28},		// Stage1 Texture Enable
 	{ TYPE_BOOL,		NULL,	FALSE,	29},		// Stage1 Texture Publish
 	{ TYPE_BOOL,		NULL, FALSE,	40},		// Stage1 Texture Resize (new to version 1)
@@ -560,8 +560,8 @@ static ParamBlockDescID PassParameterBlockDescVer3[] =
 
 
 // Version 4 (old version)
-static ParamBlockDescID PassParameterBlockDescVer4[] = 
-{ 
+static ParamBlockDescID PassParameterBlockDescVer4[] =
+{
 	{ TYPE_POINT3,		NULL, TRUE,		0 },		// Ambient
 	{ TYPE_POINT3,		NULL, TRUE,		1 },		// Diffuse
 	{ TYPE_POINT3,		NULL, TRUE,		2 },		// Specular
@@ -570,7 +570,7 @@ static ParamBlockDescID PassParameterBlockDescVer4[] =
 	{ TYPE_FLOAT,		NULL, TRUE,		5 },		// Opacity
 	{ TYPE_FLOAT,		NULL, TRUE,		6 },		// Translucency
 	{ TYPE_BOOL,		NULL,	FALSE,	34},		// Copy specular to diffuse (new to version 1)
-	{ TYPE_INT,			NULL,	FALSE,	7 },		// Stage0 Mapping Type		
+	{ TYPE_INT,			NULL,	FALSE,	7 },		// Stage0 Mapping Type
 	{ TYPE_INT,			NULL, FALSE,	8 },		// PSX Translucency Type
 	{ TYPE_BOOL,		NULL,	FALSE,	9 },		// PSX Lighting Flag
 
@@ -596,7 +596,7 @@ static ParamBlockDescID PassParameterBlockDescVer4[] =
 	{ TYPE_FLOAT,		NULL,	FALSE,	25},		// Stage0 Frame Rate
 	{ TYPE_INT,			NULL,	FALSE,	26},		// Stage0 Frame Count
 	{ TYPE_INT,			NULL, FALSE,	27},		// Stage0 Animation Type
-		
+
 	{ TYPE_BOOL,		NULL,	FALSE,	28},		// Stage1 Texture Enable
 	{ TYPE_BOOL,		NULL,	FALSE,	29},		// Stage1 Texture Publish
 	{ TYPE_BOOL,		NULL, FALSE,	40},		// Stage1 Texture Resize (new to version 1)
@@ -630,8 +630,8 @@ static ParamBlockDescID PassParameterBlockDescVer4[] =
 
 
 // Version 5 (current version)
-static ParamBlockDescID PassParameterBlockDescVer5[] = 
-{ 
+static ParamBlockDescID PassParameterBlockDescVer5[] =
+{
 	{ TYPE_POINT3,		NULL, TRUE,		0 },		// Ambient
 	{ TYPE_POINT3,		NULL, TRUE,		1 },		// Diffuse
 	{ TYPE_POINT3,		NULL, TRUE,		2 },		// Specular
@@ -640,7 +640,7 @@ static ParamBlockDescID PassParameterBlockDescVer5[] =
 	{ TYPE_FLOAT,		NULL, TRUE,		5 },		// Opacity
 	{ TYPE_FLOAT,		NULL, TRUE,		6 },		// Translucency
 	{ TYPE_BOOL,		NULL,	FALSE,	34},		// Copy specular to diffuse (new to version 1)
-	{ TYPE_INT,			NULL,	FALSE,	7 },		// Stage0 Mapping Type		
+	{ TYPE_INT,			NULL,	FALSE,	7 },		// Stage0 Mapping Type
 	{ TYPE_INT,			NULL, FALSE,	8 },		// PSX Translucency Type
 	{ TYPE_BOOL,		NULL,	FALSE,	9 },		// PSX Lighting Flag
 
@@ -666,10 +666,10 @@ static ParamBlockDescID PassParameterBlockDescVer5[] =
 	{ TYPE_FLOAT,		NULL,	FALSE,	25},		// Stage0 Frame Rate
 	{ TYPE_INT,			NULL,	FALSE,	26},		// Stage0 Frame Count
 	{ TYPE_INT,			NULL, FALSE,	27},		// Stage0 Animation Type
-		
+
 	{ TYPE_BOOL,		NULL,	FALSE,	28},		// Stage1 Texture Enable
 	{ TYPE_BOOL,		NULL,	FALSE,	29},		// Stage1 Texture Publish
-	{ TYPE_BOOL,		NULL, FALSE,	40},		// Stage1 Texture Resize (new to version 1)	 OBSOLETE! 
+	{ TYPE_BOOL,		NULL, FALSE,	40},		// Stage1 Texture Resize (new to version 1)	 OBSOLETE!
 	{ TYPE_BOOL,		NULL, FALSE,	41},		// Stage1 Texture No Mipmap (new to version 1) OBSOLETE!
 	{ TYPE_BOOL,		NULL, FALSE,	42},		// Stage1 Texture Clamp U (new to version 1)
 	{ TYPE_BOOL,		NULL, FALSE,	43},		// Stage1 Texture Clamp V (new to version 1)
@@ -712,7 +712,7 @@ static ParamVersionDesc PassParameterBlockVersions[] = {
 // Current pass parameter block version
 const int CURRENT_VERSION = 5;
 static ParamVersionDesc CurrentPassParameterBlockVersion(
-							PassParameterBlockDescVer5, 
+							PassParameterBlockDescVer5,
 							sizeof(PassParameterBlockDescVer5) / sizeof(ParamBlockDescID),
 							CURRENT_VERSION);
 
@@ -736,7 +736,7 @@ Color scale(const Color& a, const Color& b)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-GameMtl::GameMtl(BOOL loading) 
+GameMtl::GameMtl(BOOL loading)
 {
 	MaterialDialog = NULL;
 	SurfaceType = SURFACE_TYPE_DEFAULT;
@@ -762,10 +762,10 @@ GameMtl::GameMtl(BOOL loading)
 		PassParameterBlock[pass] = NULL;
 		CurPage[pass] = 0;
 	}
-	
+
 	ShaderType = STE_PC_SHADER;
 	SubstituteMaterial = NULL;
-	
+
 	if (!loading) {
 		Reset();
 	}
@@ -809,12 +809,12 @@ GameMtl::~GameMtl(void)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-Class_ID GameMtl::ClassID() 
-{ 
+Class_ID GameMtl::ClassID()
+{
 	if (ShaderType == STE_PC_SHADER) {
-		return GameMaterialClassID; 
+		return GameMaterialClassID;
 	} else {
-		return PS2GameMaterialClassID; 
+		return PS2GameMaterialClassID;
 	}
 }
 
@@ -831,9 +831,9 @@ Class_ID GameMtl::ClassID()
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-SClass_ID GameMtl::SuperClassID() 
+SClass_ID GameMtl::SuperClassID()
 {
-	return MATERIAL_CLASS_ID; 
+	return MATERIAL_CLASS_ID;
 }
 
 
@@ -857,7 +857,7 @@ void GameMtl::GetClassName(TSTR& s)
 	else {
 		s = Get_String(IDS_PS2_GAMEMTL);
 	}
-}  
+}
 
 
 /***********************************************************************************************
@@ -890,10 +890,10 @@ int GameMtl::NumSubs()
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-TSTR GameMtl::SubAnimName(int i) 
-{ 
+TSTR GameMtl::SubAnimName(int i)
+{
 	return _T("");
-}		
+}
 
 
 /***********************************************************************************************
@@ -908,7 +908,7 @@ TSTR GameMtl::SubAnimName(int i)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-Animatable* GameMtl::SubAnim(int i) 
+Animatable* GameMtl::SubAnim(int i)
 {
 	return NULL;
 }
@@ -926,7 +926,7 @@ Animatable* GameMtl::SubAnim(int i)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-RefTargetHandle GameMtl::Clone(RemapDir &remap) 
+RefTargetHandle GameMtl::Clone(RemapDir &remap)
 {
 	DebugPrint("GameMtl::Clone\n");
 
@@ -942,7 +942,7 @@ RefTargetHandle GameMtl::Clone(RemapDir &remap)
 
 	// Maintain the shader type.
 	mnew->Set_Shader_Type(ShaderType);
-	
+
 	// replace each pass's parameter block and the textures
 	for (int pass=0; pass < W3dMaterialClass::MAX_PASSES; pass++) {
 
@@ -957,7 +957,7 @@ RefTargetHandle GameMtl::Clone(RemapDir &remap)
 			if (Texture[pass][stage]) {
 				mnew->ReplaceReference(texture_ref_index(pass,stage),Texture[pass][stage]->Clone());
 			} else {
-				mnew->ReplaceReference(texture_ref_index(pass,stage),NULL);			
+				mnew->ReplaceReference(texture_ref_index(pass,stage),NULL);
 			}
 
 			// Copy mapper arg strings and lengths
@@ -972,7 +972,7 @@ RefTargetHandle GameMtl::Clone(RemapDir &remap)
 
 	}
 
-	mnew->Ivalid = Ivalid;	
+	mnew->Ivalid = Ivalid;
 	return mnew;
 }
 
@@ -995,7 +995,7 @@ RefResult GameMtl::NotifyRefChanged
 	RefTargetHandle		hTarget,
 	PartID &					partID,
 	RefMessage				message
-) 
+)
 {
 	switch (message) {
 		case REFMSG_CHANGE:
@@ -1006,14 +1006,14 @@ RefResult GameMtl::NotifyRefChanged
 		 	}
 			break;
 		}
-		case REFMSG_GET_PARAM_DIM: 
+		case REFMSG_GET_PARAM_DIM:
 		{
 			GetParamDim *gpd = (GetParamDim*)partID;
-			gpd->dim = defaultDim; 
-			return REF_STOP; 
+			gpd->dim = defaultDim;
+			return REF_STOP;
 		}
 
-		case REFMSG_GET_PARAM_NAME: 
+		case REFMSG_GET_PARAM_NAME:
 		{
 			GetParamName *gpn = (GetParamName*)partID;
 			bool pass_parameter = false;
@@ -1022,7 +1022,7 @@ RefResult GameMtl::NotifyRefChanged
 			}
 
 			if (pass_parameter)	{
-				switch (gpn->index) 
+				switch (gpn->index)
 				{
 					case PB_AMBIENT:			gpn->name = _T("Ambient");			break;
 					case PB_DIFFUSE:			gpn->name = _T("Diffuse");			break;
@@ -1034,7 +1034,7 @@ RefResult GameMtl::NotifyRefChanged
 					default:						gpn->name = _T("");					break;
 				}
 			}
-			return REF_STOP; 
+			return REF_STOP;
 		}
 	}
 	return(REF_SUCCEED);
@@ -1053,7 +1053,7 @@ RefResult GameMtl::NotifyRefChanged
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-void GameMtl::SetReference(int i, RefTargetHandle rtarg) 
+void GameMtl::SetReference(int i, RefTargetHandle rtarg)
 {
 	assert(i < REF_COUNT);
 
@@ -1071,7 +1071,7 @@ void GameMtl::SetReference(int i, RefTargetHandle rtarg)
 		PassParameterBlock[i - REF_PASS_PARAMETERS] = (IParamBlock*)rtarg;
 		return;
 	}
-	
+
 	if ((i >= REF_TEXTURE) && (i < REF_TEXTURE + 9)) {
 		if (i == REF_TEXTURE + DISPLACEMENT_INDEX) {
 			DisplacementMap = (Texmap *)rtarg;
@@ -1098,7 +1098,7 @@ void GameMtl::SetReference(int i, RefTargetHandle rtarg)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-RefTargetHandle GameMtl::GetReference(int i) 
+RefTargetHandle GameMtl::GetReference(int i)
 {
 	if (i == REF_MAPS) {
 		return Maps;
@@ -1155,7 +1155,7 @@ int GameMtl::NumSubTexmaps(void)
  *   7/01/99   PDS : Created.                                                                 *
  *=============================================================================================*/
 int GameMtl::Get_Displacement_Map_Index(void) const
-{ 
+{
 	return DISPLACEMENT_INDEX;
 }
 
@@ -1173,7 +1173,7 @@ int GameMtl::Get_Displacement_Map_Index(void) const
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
 void GameMtl::SetSubTexmap(int i, Texmap * m)
-{ 
+{
 	ReplaceReference(REF_TEXTURE + i, m);
 
 	int pass,stage;
@@ -1201,8 +1201,8 @@ void GameMtl::SetSubTexmap(int i, Texmap * m)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-Texmap * GameMtl::GetSubTexmap(int i) 
-{ 
+Texmap * GameMtl::GetSubTexmap(int i)
+{
 	if (i == DISPLACEMENT_INDEX) {
 		return DisplacementMap;
 	}
@@ -1210,7 +1210,7 @@ Texmap * GameMtl::GetSubTexmap(int i)
 	int pass;
 	int stage;
 	texmap_index_to_pass_stage(i,&pass,&stage);
-	return Texture[pass][stage]; 
+	return Texture[pass][stage];
 }
 
 
@@ -1226,11 +1226,11 @@ Texmap * GameMtl::GetSubTexmap(int i)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-ParamDlg * GameMtl::CreateParamDlg(HWND hwnd_mtl_edit, IMtlParams *imp) 
+ParamDlg * GameMtl::CreateParamDlg(HWND hwnd_mtl_edit, IMtlParams *imp)
 {
 	GameMtlDlg *dlg = new GameMtlDlg(hwnd_mtl_edit, imp, this);
 	SetParamDlg(dlg);
-	return dlg;	
+	return dlg;
 }
 
 
@@ -1267,14 +1267,14 @@ void GameMtl::Notify_Changed(void)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-void GameMtl::Reset() 
+void GameMtl::Reset()
 {
 	DebugPrint("GameMtl::Reset()\n");
-	
+
 	ReplaceReference(REF_MAIN,CreateParameterBlock(MainParameterBlockDesc,1,CURRENT_VERSION));
 
 	for (int pass = 0; pass < W3dMaterialClass::MAX_PASSES; pass++) {
-		
+
 		// Install a parameter block for each pass
 		IParamBlock * pblock = CreateParameterBlock(	PassParameterBlockDescVer5,
 																	sizeof(PassParameterBlockDescVer5)/sizeof(ParamBlockDescID),
@@ -1308,7 +1308,7 @@ void GameMtl::Reset()
 		}
 
 		Set_Sort_Level(SORT_LEVEL_NONE);
-		
+
 		Set_Ambient(pass,0,(pass == 0 ? Color(1.0,1.0,1.0) : Color(0,0,0)));
 		Set_Diffuse(pass,0,(pass == 0 ? Color(1.0,1.0,1.0) : Color(0,0,0)));
 		Set_Specular(pass,0,Color(0,0,0));
@@ -1356,7 +1356,7 @@ void GameMtl::Reset()
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-void GameMtl::Update(TimeValue t, Interval &ivalid) 
+void GameMtl::Update(TimeValue t, Interval &ivalid)
 {
 	// This function is called by the system prior to rendering
 	// Its purpose is to let you pre-calculate anything you can to
@@ -1378,9 +1378,9 @@ void GameMtl::Update(TimeValue t, Interval &ivalid)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-Interval GameMtl::Validity(TimeValue t) 
+Interval GameMtl::Validity(TimeValue t)
 {
-	return FOREVER;	
+	return FOREVER;
 }
 
 
@@ -1396,10 +1396,10 @@ Interval GameMtl::Validity(TimeValue t)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-ULONG GameMtl::Requirements(int subMtlNum) 
+ULONG GameMtl::Requirements(int subMtlNum)
 {
 	ULONG req = 0;
-	
+
 	for (int pass = 0; pass < W3dMaterialClass::MAX_PASSES; pass++) {
 		for (int stage = 0; stage < W3dMaterialClass::MAX_STAGES; stage++) {
 			if (Texture[pass][stage]) {
@@ -1431,7 +1431,7 @@ ULONG GameMtl::Requirements(int subMtlNum)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-IOResult GameMtl::Load(ILoad *iload) 
+IOResult GameMtl::Load(ILoad *iload)
 {
 	ULONG nb;
 	int id;
@@ -1453,7 +1453,7 @@ IOResult GameMtl::Load(ILoad *iload)
 					&CurrentPassParameterBlockVersion, this, REF_PASS_PARAMETERS + i)
 		);
 	}
-		
+
 	while (IO_OK==(res=iload->OpenChunk())) {
 
 		switch (id = iload->CurChunkID())  {
@@ -1482,7 +1482,7 @@ IOResult GameMtl::Load(ILoad *iload)
 				res = iload->Read(&tmp8,sizeof(tmp8),&nb);
 				CurPage[id - GAMEMTL_PASS0_CUR_PAGE] = tmp8;
 				break;
-			
+
 			case GAMEMTL_PASS0_STAGE0_MAPPER_ARGS:
 			case GAMEMTL_PASS1_STAGE0_MAPPER_ARGS:
 			case GAMEMTL_PASS2_STAGE0_MAPPER_ARGS:
@@ -1502,7 +1502,7 @@ IOResult GameMtl::Load(ILoad *iload)
 				tmpstring = Get_Mapping_Arg_Buffer(passindex, 1, len);
 				res = iload->Read(tmpstring, len, &nb);
 				break;
-			
+
 			/*
 			** All chunks below here are for the obsolete material plugin...
 			*/
@@ -1542,13 +1542,13 @@ IOResult GameMtl::Load(ILoad *iload)
 				lc->DITFrameRate = tmpfloat;
 				lc->IsOld = true;
 				break;
-			
+
 			case GAMEMTL_SCT_FRAMES_CHUNK:
 				res = iload->Read(&tmp16,sizeof(unsigned short),&nb);
 				lc->SCTFrames = tmp16;
 				lc->IsOld = true;
 				break;
-			
+
 			case GAMEMTL_SCT_FRAME_RATE_CHUNK:
 				res = iload->Read(&tmpfloat,sizeof(float),&nb);
 				lc->SCTFrameRate = tmpfloat;
@@ -1560,7 +1560,7 @@ IOResult GameMtl::Load(ILoad *iload)
 				lc->SITFrames = tmp16;
 				lc->IsOld = true;
 				break;
-			
+
 			case GAMEMTL_SIT_FRAME_RATE_CHUNK:
 				res = iload->Read(&tmpfloat,sizeof(float),&nb);
 				lc->SITFrameRate = tmpfloat;
@@ -1620,7 +1620,7 @@ IOResult GameMtl::Load(ILoad *iload)
 				res = iload->Read(&lc->EmissiveCoeff,sizeof(lc->EmissiveCoeff),&nb);
 				lc->IsOld = true;
 				break;
-			
+
 			case GAMEMTL_OPACITY_CHUNK:
 				res = iload->Read(&lc->Opacity,sizeof(lc->Opacity),&nb);
 				lc->IsOld = true;
@@ -1646,11 +1646,11 @@ IOResult GameMtl::Load(ILoad *iload)
 		}
 
 		iload->CloseChunk();
-		if (res!=IO_OK) { 
+		if (res!=IO_OK) {
 			return res;
 		}
 	}
-	
+
 	return IO_OK;
 }
 
@@ -1667,7 +1667,7 @@ IOResult GameMtl::Load(ILoad *iload)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-IOResult GameMtl::Save(ISave *isave) 
+IOResult GameMtl::Save(ISave *isave)
 {
 	IOResult res;
 	ULONG nb;
@@ -1677,7 +1677,7 @@ IOResult GameMtl::Save(ISave *isave)
 	*/
 	isave->BeginChunk(MTL_HDR_CHUNK);
 	res = MtlBase::Save(isave);
-	if (res!=IO_OK) 
+	if (res!=IO_OK)
 		return res;
 	isave->EndChunk();
 
@@ -1685,7 +1685,7 @@ IOResult GameMtl::Save(ISave *isave)
 	** Save the flags
 	*/
 	isave->BeginChunk(GAMEMTL_FLAGS_CHUNK);
-	isave->Write(&Flags,sizeof(Flags),&nb);			
+	isave->Write(&Flags,sizeof(Flags),&nb);
 	isave->EndChunk();
 
 	/*
@@ -1699,7 +1699,7 @@ IOResult GameMtl::Save(ISave *isave)
 		isave->Write(&tmp8,sizeof(tmp8),&nb);
 		isave->EndChunk();
 	}
-	
+
 	/*
 	** Save any Mapper Args
 	*/
@@ -1722,7 +1722,7 @@ IOResult GameMtl::Save(ISave *isave)
 	** Save the surface type
 	*/
 	isave->BeginChunk(GAMEMTL_SURFACE_TYPE_CHUNK);
-	isave->Write(&SurfaceType,sizeof(SurfaceType),&nb);			
+	isave->Write(&SurfaceType,sizeof(SurfaceType),&nb);
 	isave->EndChunk();
 
 	/*
@@ -1731,7 +1731,7 @@ IOResult GameMtl::Save(ISave *isave)
 	isave->BeginChunk(GAMEMTL_SORT_LEVEL_CHUNK);
 	isave->Write(&SortLevel,sizeof(SortLevel),&nb);
 	isave->EndChunk();
-	
+
 	return IO_OK;
 }
 
@@ -1749,7 +1749,7 @@ IOResult GameMtl::Save(ISave *isave)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-void GameMtl::Shade(ShadeContext& sc) 
+void GameMtl::Shade(ShadeContext& sc)
 {
 	if (ShaderType == STE_PS2_SHADER) {
 		ps2_shade(sc);
@@ -1775,7 +1775,7 @@ void GameMtl::Shade(ShadeContext& sc)
 	Color dest;
 	Color src;
 	float alpha;
-	
+
 	sc.GetBGColor(back_c,back_t, FALSE);
 	dest = back_c;
 
@@ -1797,17 +1797,17 @@ void GameMtl::Shade(ShadeContext& sc)
 
 			LightDesc * light = sc.Light(light_index);
 			if(light->Illuminate(sc, sc.Normal(), light_color, light_dir, dot_nl, diffuse_coef)) {
-				
+
 				//ambient += light_color;
 				if (dot_nl > 0.0f) diffuse += dot_nl * light_color;
-				
+
 				float c = DotProd(light_dir, sc.ReflectVector());
 				if(c > 0.f) {
 					specular += (float)pow(c, Get_Shininess(pass, sc.CurTime())) * light_color;
 				}
 			}
 		}
-		
+
 		ambient = ambient * Get_Ambient(pass,sc.CurTime());
 		diffuse = diffuse * Get_Diffuse(pass,sc.CurTime());
 		specular = specular * Get_Specular(pass,sc.CurTime());
@@ -1818,7 +1818,7 @@ void GameMtl::Shade(ShadeContext& sc)
 		if (pri_gradient.b > 1.0f) pri_gradient.b = 1.0f;
 
 		Color sec_gradient = specular * Get_Specular(pass,sc.CurTime());
-	
+
 		/*
 		** Sampling the Texture(s)
 		*/
@@ -1831,14 +1831,14 @@ void GameMtl::Shade(ShadeContext& sc)
 
 		if (Get_Texture_Enable(pass,1) && Texture[pass][1]) {
 			AColor detail_texel = Texture[pass][1]->EvalColor(sc);
-			switch (Get_Detail_Color_Func(pass)) 
+			switch (Get_Detail_Color_Func(pass))
 			{
-				case W3DSHADER_DETAILCOLORFUNC_DISABLE:		
+				case W3DSHADER_DETAILCOLORFUNC_DISABLE:
 					break;
-				case W3DSHADER_DETAILCOLORFUNC_DETAIL:			
-					texel = detail_texel; 
+				case W3DSHADER_DETAILCOLORFUNC_DETAIL:
+					texel = detail_texel;
 					break;
-				case W3DSHADER_DETAILCOLORFUNC_SCALE:			
+				case W3DSHADER_DETAILCOLORFUNC_SCALE:
 					texel.r = detail_texel.r * texel.r;
 					texel.g = detail_texel.g * texel.g;
 					texel.b = detail_texel.b * texel.b;
@@ -1853,7 +1853,7 @@ void GameMtl::Shade(ShadeContext& sc)
 					texel.g = detail_texel.g + texel.g;
 					texel.b = detail_texel.b + texel.b;
 					break;
-				case W3DSHADER_DETAILCOLORFUNC_SUB:			
+				case W3DSHADER_DETAILCOLORFUNC_SUB:
 					texel.r = texel.r - detail_texel.r;
 					texel.g = texel.g - detail_texel.g;
 					texel.b = texel.b - detail_texel.b;
@@ -1874,9 +1874,9 @@ void GameMtl::Shade(ShadeContext& sc)
 					texel.b = (detail_texel.a * texel.b) + ((1.0f - detail_texel.a)*detail_texel.b);
 					break;
 			}
-			switch (Get_Detail_Alpha_Func(pass)) 
+			switch (Get_Detail_Alpha_Func(pass))
 			{
-				case W3DSHADER_DETAILALPHAFUNC_DISABLE:		
+				case W3DSHADER_DETAILALPHAFUNC_DISABLE:
 					break;
 				case W3DSHADER_DETAILALPHAFUNC_DETAIL:
 					texel.a = detail_texel.a;
@@ -1898,14 +1898,14 @@ void GameMtl::Shade(ShadeContext& sc)
 		src.b = texel.b;
 		alpha = texel.a * Get_Opacity(pass,sc.CurTime());
 
-		switch (Get_Pri_Gradient(pass)) 
+		switch (Get_Pri_Gradient(pass))
 		{
 			case W3DSHADER_PRIGRADIENT_DISABLE:		break;
 			case W3DSHADER_PRIGRADIENT_MODULATE:	src = src * pri_gradient; break;
 			case W3DSHADER_PRIGRADIENT_ADD:			src = src + pri_gradient; break;
 		}
 
-		switch (Get_Sec_Gradient(pass)) 
+		switch (Get_Sec_Gradient(pass))
 		{
 			case W3DSHADER_SECGRADIENT_DISABLE:		break;
 			case W3DSHADER_SECGRADIENT_ENABLE:		src = src + sec_gradient; break;
@@ -1930,7 +1930,7 @@ void GameMtl::Shade(ShadeContext& sc)
 			case W3DSHADER_DESTBLENDFUNC_ONE_MINUS_SRC_ALPHA:	dest_blend = Color(1.0f-alpha,1.0f-alpha,1.0f-alpha); break;
 			case W3DSHADER_DESTBLENDFUNC_SRC_COLOR_PREFOG:		dest_blend = src;	break;
 		}
-		
+
 		Color src_blend;
 		switch (Get_Src_Blend(pass))
 		{
@@ -1939,7 +1939,7 @@ void GameMtl::Shade(ShadeContext& sc)
 			case W3DSHADER_SRCBLENDFUNC_SRC_ALPHA:					src_blend = Color(alpha,alpha,alpha); break;
 			case W3DSHADER_SRCBLENDFUNC_ONE_MINUS_SRC_ALPHA:	src_blend = Color(1.0f-alpha,1.0f-alpha,1.0f-alpha); break;
 		}
-		
+
 		src = scale(src_blend,src) + scale(dest_blend,dest);
 
 		/*
@@ -1986,7 +1986,7 @@ void GameMtl::ps2_shade(ShadeContext& sc)
 
 	AColor dest;
 	AColor src(1,1,1,1);
-	
+
 	sc.GetBGColor(back_c, back_t, FALSE);
 
 	dest.r = back_c.r;
@@ -2012,16 +2012,16 @@ void GameMtl::ps2_shade(ShadeContext& sc)
 
 			assert(light);
 			if(light->Illuminate(sc, sc.Normal(), light_color, light_dir, dot_nl, diffuse_coef)) {
-				
+
 				if (dot_nl > 0.0f) diffuse += dot_nl * light_color;
-				
+
 				float c = DotProd(light_dir, sc.ReflectVector());
 				if (c > 0.f) {
 					specular += (float)pow(c, Get_Shininess(pass, sc.CurTime())) * light_color;
 				}
 			}
 		}
-		
+
 		ambient = ambient * Get_Ambient(pass,sc.CurTime());
 		diffuse = diffuse * Get_Diffuse(pass,sc.CurTime());
 		specular = specular * Get_Specular(pass,sc.CurTime());
@@ -2049,7 +2049,7 @@ void GameMtl::ps2_shade(ShadeContext& sc)
 		*/
 		src.a *= Get_Opacity(pass,sc.CurTime());
 
-		switch (Get_Pri_Gradient(pass)) 
+		switch (Get_Pri_Gradient(pass))
 		{
 			case PSS_PRIGRADIENT_MODULATE:
 				src = src * pri_gradient;
@@ -2161,7 +2161,7 @@ void GameMtl::ps2_shade(ShadeContext& sc)
 
 }
 
-// PS2 equation paramaters.  
+// PS2 equation paramaters.
 // They are set to primes to avoid multiple equation solutions.
 enum Shader_Translation {
 	ST_ZERO,
@@ -2187,9 +2187,9 @@ int GameMtl::Compute_PC_Shader_From_PS2_Shader(int pass)
 
 	// These match the PC equation paramaters.
 	static const int src_blend[4] = {
-		ST_ZERO, 
-		ST_ONE, 
-		ST_SRC_ALPHA, 
+		ST_ZERO,
+		ST_ONE,
+		ST_SRC_ALPHA,
 		1 - ST_SRC_ALPHA
 	};
 	static const int dest_blend[6] = {
@@ -2204,7 +2204,7 @@ int GameMtl::Compute_PC_Shader_From_PS2_Shader(int pass)
 	int i = 0;
 	int j = 0;
 	int equation_value = 0;
-	
+
 	// Get the PS2 shader values.
 	param_value[0] = Get_PS2_Shader_Param_A(pass);
 	param_value[1] = Get_PS2_Shader_Param_B(pass);
@@ -2213,7 +2213,7 @@ int GameMtl::Compute_PC_Shader_From_PS2_Shader(int pass)
 
 	// Convert them to the enumeration.
 	for (i = 0; i < 3; i++)	{
-		switch(param_value[i]) 
+		switch(param_value[i])
 		{
 			case PSS_SRC:
 				param_value[i] = ST_SRC;
@@ -2228,7 +2228,7 @@ int GameMtl::Compute_PC_Shader_From_PS2_Shader(int pass)
 	}
 
 	// The alpha paramater.
-	switch(param_value[3]) 
+	switch(param_value[3])
 	{
 			case PSS_SRC_ALPHA:
 				param_value[3] = ST_SRC_ALPHA;
@@ -2267,7 +2267,7 @@ int GameMtl::Compute_PC_Shader_From_PS2_Shader(int pass)
 	}
 
 	// Set the PC shader to an equivalant of the PS2 shader.
-	switch (dest_blend[j]) 
+	switch (dest_blend[j])
 	{
 		case ST_ZERO:
 			Set_Dest_Blend(pass, W3DSHADER_DESTBLENDFUNC_ZERO);
@@ -2289,18 +2289,18 @@ int GameMtl::Compute_PC_Shader_From_PS2_Shader(int pass)
 			break;
 	}
 
-	switch (src_blend[i]) 
+	switch (src_blend[i])
 	{
-		case ST_ZERO:						
+		case ST_ZERO:
 			Set_Src_Blend(pass, W3DSHADER_SRCBLENDFUNC_ZERO);
 			break;
-		case ST_ONE:						
+		case ST_ONE:
 			Set_Src_Blend(pass, W3DSHADER_SRCBLENDFUNC_ONE);
 			break;
-		case ST_SRC_ALPHA:						
+		case ST_SRC_ALPHA:
 			Set_Src_Blend(pass, W3DSHADER_SRCBLENDFUNC_SRC_ALPHA);
 			break;
-		case (1 - ST_SRC_ALPHA):						
+		case (1 - ST_SRC_ALPHA):
 			Set_Src_Blend(pass, W3DSHADER_SRCBLENDFUNC_ONE_MINUS_SRC_ALPHA);
 			break;
 	}
@@ -2321,24 +2321,24 @@ W3DSHADER_PRIGRADIENT_ *
  *=============================================================================================*/
 int GameMtl::Compute_PS2_Shader_From_PC_Shader(int pass)
 {
-  
+
 	// These match the PC equation paramaters.
 	static const int a_blend[3] = {
-		ST_ZERO, 
-		ST_SRC, 
-		ST_DEST, 
+		ST_ZERO,
+		ST_SRC,
+		ST_DEST,
 	};
 
 	static const int b_blend[3] = {
-		ST_ZERO, 
-		ST_SRC, 
-		ST_DEST, 
+		ST_ZERO,
+		ST_SRC,
+		ST_DEST,
 	};
 
 	static const int d_blend[3] = {
-		ST_ZERO, 
-		ST_SRC, 
-		ST_DEST, 
+		ST_ZERO,
+		ST_SRC,
+		ST_DEST,
 	};
 
 	static const int c_blend[6] = {
@@ -2353,14 +2353,14 @@ int GameMtl::Compute_PS2_Shader_From_PC_Shader(int pass)
 	int l = 0;
 	int equation_value = 0;
 	int param_value[2];
-	
+
 	// Get the PC shader values.
 	param_value[0] = Get_Src_Blend(pass);
 	param_value[1] = Get_Dest_Blend(pass);
 
-	switch (param_value[0]) 
+	switch (param_value[0])
 	{
-		case W3DSHADER_SRCBLENDFUNC_ZERO: 
+		case W3DSHADER_SRCBLENDFUNC_ZERO:
 			param_value[0] = ST_ZERO;
 			break;
 		case W3DSHADER_SRCBLENDFUNC_ONE:
@@ -2375,9 +2375,9 @@ int GameMtl::Compute_PS2_Shader_From_PC_Shader(int pass)
 	}
 
 	// Convert them to the enumeration.
-	switch (param_value[1]) 
+	switch (param_value[1])
 	{
-		case W3DSHADER_DESTBLENDFUNC_ZERO: 
+		case W3DSHADER_DESTBLENDFUNC_ZERO:
 			param_value[1] = ST_ZERO;
 			break;
 		case W3DSHADER_DESTBLENDFUNC_ONE:
@@ -2413,10 +2413,10 @@ int GameMtl::Compute_PS2_Shader_From_PC_Shader(int pass)
 		case W3DSHADER_DEPTHCOMPARE_PASS_NEVER:
 			Set_Depth_Compare(pass, PSS_DEPTHCOMPARE_PASS_NEVER);
 			break;
-		case W3DSHADER_DEPTHCOMPARE_PASS_LESS:			
+		case W3DSHADER_DEPTHCOMPARE_PASS_LESS:
 			Set_Depth_Compare(pass, PSS_DEPTHCOMPARE_PASS_LESS);
 			break;
-		case W3DSHADER_DEPTHCOMPARE_PASS_LEQUAL:				
+		case W3DSHADER_DEPTHCOMPARE_PASS_LEQUAL:
 			Set_Depth_Compare(pass, PSS_DEPTHCOMPARE_PASS_LEQUAL);
 			break;
 		case W3DSHADER_DEPTHCOMPARE_PASS_ALWAYS:
@@ -2463,7 +2463,7 @@ int GameMtl::Compute_PS2_Shader_From_PC_Shader(int pass)
 
 finished:
 	// Set the PS2 shader to an equivalant of the PC shader.
-	switch (a_blend[i]) 
+	switch (a_blend[i])
 	{
 		case ST_ZERO:
 			Set_PS2_Shader_Param_A(pass, PSS_ZERO);
@@ -2476,7 +2476,7 @@ int GameMtl::Compute_PS2_Shader_From_PC_Shader(int pass)
 			break;
 	}
 
-	switch (b_blend[j]) 
+	switch (b_blend[j])
 	{
 		case ST_ZERO:
 			Set_PS2_Shader_Param_B(pass, PSS_ZERO);
@@ -2490,7 +2490,7 @@ int GameMtl::Compute_PS2_Shader_From_PC_Shader(int pass)
 	}
 
 
-	switch (d_blend[l]) 
+	switch (d_blend[l])
 	{
 		case ST_ZERO:
 			Set_PS2_Shader_Param_D(pass, PSS_ZERO);
@@ -2503,7 +2503,7 @@ int GameMtl::Compute_PS2_Shader_From_PC_Shader(int pass)
 			break;
 	}
 
-	switch (c_blend[k]) 
+	switch (c_blend[k])
 	{
 		case ST_ONE:
 			Set_PS2_Shader_Param_C(pass, PSS_ONE);
@@ -2537,25 +2537,25 @@ int GameMtl::Get_Pass_Count(void)
 
 Color	GameMtl::Get_Ambient(int pass,TimeValue t)
 {
-	Color val;	
+	Color val;
 	PassParameterBlock[pass]->GetValue(PB_AMBIENT,t,val,FOREVER);
 	return val;
 }
 Color GameMtl::Get_Diffuse(int pass,TimeValue t)
 {
-	Color val;	
+	Color val;
 	PassParameterBlock[pass]->GetValue(PB_DIFFUSE,t,val,FOREVER);
 	return val;
 }
 Color GameMtl::Get_Specular(int pass,TimeValue t)
 {
-	Color val;	
+	Color val;
 	PassParameterBlock[pass]->GetValue(PB_SPECULAR,t,val,FOREVER);
 	return val;
 }
 Color GameMtl::Get_Emissive(int pass,TimeValue t)
 {
-	Color val;	
+	Color val;
 	PassParameterBlock[pass]->GetValue(PB_EMISSIVE,t,val,FOREVER);
 	return val;
 }
@@ -2789,8 +2789,8 @@ int GameMtl::Get_Texture_Anim_Type(int pass,int stage)
 	return val;
 }
 Texmap * GameMtl::Get_Texture(int pass,int stage)
-{ 
-	return GetSubTexmap(pass_stage_to_texmap_index(pass,stage)); 
+{
+	return GetSubTexmap(pass_stage_to_texmap_index(pass,stage));
 }
 
 int GameMtl::Get_PS2_Shader_Param_A(int pass)
@@ -3056,10 +3056,10 @@ void GameMtl::Set_Texture_Display(int pass,int stage,bool val)
 		PassParameterBlock[pi]->SetValue(PB_STAGE0_TEXTURE_DISPLAY, 0, false);
 		PassParameterBlock[pi]->SetValue(PB_STAGE1_TEXTURE_DISPLAY, 0, false);
 	}
-	
-	// set the one we want	
+
+	// set the one we want
 	if (val == true) {
-	
+
 		if (stage == 0) {
 			PassParameterBlock[pass]->SetValue(PB_STAGE0_TEXTURE_DISPLAY, 0, val);
 		} else {
@@ -3070,13 +3070,13 @@ void GameMtl::Set_Texture_Display(int pass,int stage,bool val)
 		NotifyDependents(FOREVER,PART_ALL,REFMSG_CHANGE);
 
 	} else {
-		
+
 		SetMtlFlag( MTL_TEX_DISPLAY_ENABLED, FALSE );
 		SetActiveTexmap(NULL);
 		NotifyDependents(FOREVER,PART_ALL,REFMSG_CHANGE);
-	
+
 	}
-	
+
 	// tell dialog to refresh...
 	if (MaterialDialog) {
 		MaterialDialog->ReloadDialog();
@@ -3134,8 +3134,8 @@ void GameMtl::Set_Texture_Anim_Type(int pass,int stage,int val)
 }
 
 void GameMtl::Set_Texture(int pass,int stage,Texmap * tex)
-{ 
-	SetSubTexmap(pass_stage_to_texmap_index(pass,stage),tex); 
+{
+	SetSubTexmap(pass_stage_to_texmap_index(pass,stage),tex);
 }
 
 void GameMtl::Set_PS2_Shader_Param_A(int pass,int val)
@@ -3182,7 +3182,7 @@ void GameMtl::Set_Map_Channel(int pass,int stage,int val)
 			uvgen->SetMapChannel(val);
 		}
 	}
-	 
+
 	NotifyDependents(FOREVER,PART_ALL,REFMSG_CHANGE);
 }
 
@@ -3242,7 +3242,7 @@ Interval GameMtl::DisplacementValidity(TimeValue t)
 }
 
 void GameMtlPostLoad::proc(ILoad *iload)
-{ 
+{
 	if (IsOld) {
 
 		m->Reset();
@@ -3255,24 +3255,24 @@ void GameMtlPostLoad::proc(ILoad *iload)
 		m->Set_Translucency(0,0,Translucency);
 		m->Set_Shininess(0,0,Shininess);
 		m->Set_Mapping_Type(0,0,DCTMappingType);
-		
+
 		Texmap * tex = (*(m->Maps))[ID_DI].Map;
-		
+
 		if ((tex) && (tex->ClassID() == Class_ID(BMTEX_CLASS_ID,0))) {
 			m->Set_Texture(0,0,tex);
 			m->Set_Texture_Enable(0,0,true);
 			m->Set_Texture_Frame_Rate(0,0,DCTFrameRate);
 			m->Set_Texture_Frame_Count(0,0,DCTFrames);
-		
+
 			if (m->TestMtlFlag(MTL_TEX_DISPLAY_ENABLED)) {
 				m->Set_Texture_Display(0,0,true);
 			}
 		}
-	
+
 		m->ReplaceReference(GameMtl::REF_MAPS,NULL);
 	}
 
-	// older material formats did not save the map channel and will default to zero, 
+	// older material formats did not save the map channel and will default to zero,
 	// we need to change the map channel to one in this case.
 	for (int pass = 0; pass < W3dMaterialClass::MAX_PASSES; pass++) {
 		for (int stage = 0; stage < W3dMaterialClass::MAX_STAGES; stage++) {
@@ -3285,7 +3285,7 @@ void GameMtlPostLoad::proc(ILoad *iload)
 	// Now that I've removed the UI for the RESIZE and NO_MIPMAP options in the texture
 	// pane, we initialize the No_LOD setting to the existing NO_MIPMAP setting
 	// NOTE: I created a new flag for gamemtl which gets set when this conversion takes
-	// place for the first time.  
+	// place for the first time.
 	if (m->Get_Flag(GAMEMTL_CONVERTED_TO_NOLOD) == false) {
 		for (int pass = 0; pass < W3dMaterialClass::MAX_PASSES; pass++) {
 			for (int stage = 0; stage < W3dMaterialClass::MAX_STAGES; stage++) {
@@ -3296,6 +3296,6 @@ void GameMtlPostLoad::proc(ILoad *iload)
 		m->Set_Flag(GAMEMTL_CONVERTED_TO_NOLOD,true);
 	}
 
-	delete this; 
-} 
+	delete this;
+}
 
diff --git a/Core/Tools/WW3D/max2w3d/GameMtlDlg.cpp b/Core/Tools/WW3D/max2w3d/GameMtlDlg.cpp
index 0caa3d816ef..67f066ab183 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtlDlg.cpp
+++ b/Core/Tools/WW3D/max2w3d/GameMtlDlg.cpp
@@ -51,7 +51,7 @@ static BOOL CALLBACK SurfaceTypePanelDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 static BOOL CALLBACK PassCountPanelDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara,LPARAM lParam);
 static BOOL CALLBACK PassCountDialogDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,LPARAM lParam);
 
-static int _Pass_Index_To_Flag[] = 
+static int _Pass_Index_To_Flag[] =
 {
 	GAMEMTL_PASS0_ROLLUP_OPEN,
 	GAMEMTL_PASS1_ROLLUP_OPEN,
@@ -59,22 +59,22 @@ static int _Pass_Index_To_Flag[] =
 	GAMEMTL_PASS3_ROLLUP_OPEN,
 };
 
-/*********************************************************************************************** 
- * GameMtlDlg::GameMtlDlg -- constructor                                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * 	hwMtlEdit - windows handle of the MAX material editor												  * 
- * 	imp - Interface object for MAX materials and textures												  * 
- * 	m - pointer to a GameMtl to be edited																	  * 
- * 																														  * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::GameMtlDlg -- constructor                                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * 	hwMtlEdit - windows handle of the MAX material editor												  *
+ * 	imp - Interface object for MAX materials and textures												  *
+ * 	m - pointer to a GameMtl to be edited																	  *
+ * 																														  *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-GameMtlDlg::GameMtlDlg(HWND hwMtlEdit, IMtlParams *imp, GameMtl *m) 
+GameMtlDlg::GameMtlDlg(HWND hwMtlEdit, IMtlParams *imp, GameMtl *m)
 {
 	HwndEdit = hwMtlEdit;
 	HwndPassCount = NULL;
@@ -86,34 +86,34 @@ GameMtlDlg::GameMtlDlg(HWND hwMtlEdit, IMtlParams *imp, GameMtl *m)
 		PassDialog[i] = NULL;
 	}
 
-	TheMtl = m; 
+	TheMtl = m;
 	IParams = imp;
 	IsActive = 0;
 
 	Build_Dialog();
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::~GameMtlDlg -- destructor!                                                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::~GameMtlDlg -- destructor!                                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-GameMtlDlg::~GameMtlDlg() 
+GameMtlDlg::~GameMtlDlg()
 {
-	
+
 	if (HwndPassCount) {
 		HDC hdc = GetDC(HwndPassCount);
 		GetGPort()->RestorePalette(hdc, HpalOld);
 		ReleaseDC(HwndPassCount,hdc);
 	}
-	
+
 	#ifdef WANT_DISPLACEMENT_MAPS
 		TheMtl->Set_Flag(GAMEMTL_DISPLACEMENT_ROLLUP_OPEN,IParams->IsRollupPanelOpen(HwndDisplacementMap));
 	#endif //WANT_DISPLACEMENT_MAPS
@@ -129,15 +129,15 @@ GameMtlDlg::~GameMtlDlg()
 	#ifdef WANT_DISPLACEMENT_MAPS
 		IParams->UnRegisterDlgWnd(HwndDisplacementMap);
 		IParams->DeleteRollupPage(HwndDisplacementMap);
-		HwndDisplacementMap = NULL;	
+		HwndDisplacementMap = NULL;
 	#endif //#ifdef WANT_DISPLACEMENT_MAPS
 
-	IParams->UnRegisterDlgWnd(HwndPassCount);		
+	IParams->UnRegisterDlgWnd(HwndPassCount);
 	IParams->DeleteRollupPage(HwndPassCount);
 	HwndPassCount = NULL;
 
 	for (int i=0; i<MAX_PASSES; i++) {
-		if (PassDialog[i]) { 
+		if (PassDialog[i]) {
 			delete PassDialog[i];
 		}
 	}
@@ -145,36 +145,36 @@ GameMtlDlg::~GameMtlDlg()
 }
 
 
-/*********************************************************************************************** 
- * GameMtlDlg::ClassID -- Returns the ClassID of GameMtl                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::ClassID -- Returns the ClassID of GameMtl                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-Class_ID GameMtlDlg::ClassID() 
+Class_ID GameMtlDlg::ClassID()
 {
-	return GameMaterialClassID;  
+	return GameMaterialClassID;
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::SetThing -- Sets the material to be edited                                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::SetThing -- Sets the material to be edited                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-void GameMtlDlg::SetThing(ReferenceTarget *m) 
+void GameMtlDlg::SetThing(ReferenceTarget *m)
 {
 	assert (m);
 	assert (m->SuperClassID()==MATERIAL_CLASS_ID);
@@ -203,19 +203,19 @@ void GameMtlDlg::SetThing(ReferenceTarget *m)
 	ReloadDialog();
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::SetTime -- Sets the time value, updates the material and the dialog             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::SetTime -- Sets the time value, updates the material and the dialog             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-void GameMtlDlg::SetTime(TimeValue t) 
+void GameMtlDlg::SetTime(TimeValue t)
 {
 	if (t!=CurTime) {
 		CurTime = t;
@@ -223,20 +223,20 @@ void GameMtlDlg::SetTime(TimeValue t)
 		ReloadDialog();
 	}
 }
-	
-/*********************************************************************************************** 
- * GameMtlDlg::ReloadDialog -- Updates the values in all of the dialog's controls              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+
+/***********************************************************************************************
+ * GameMtlDlg::ReloadDialog -- Updates the values in all of the dialog's controls              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-void GameMtlDlg::ReloadDialog() 
+void GameMtlDlg::ReloadDialog()
 {
 	/*
 	** Init the pass count panel
@@ -247,9 +247,9 @@ void GameMtlDlg::ReloadDialog()
 	** Init the surface count panel
 	*/
 	::SendMessage (HwndSurfaceType, WM_USER+101, 0, 0L);
-	
+
 	#ifdef WANT_DISPLACEMENT_MAPS
-		::SendMessage (HwndDisplacementMap, WM_USER+101, 0, 0L);	
+		::SendMessage (HwndDisplacementMap, WM_USER+101, 0, 0L);
 	#endif //WANT_DISPLACEMENT_MAPS
 
 	/*
@@ -257,7 +257,7 @@ void GameMtlDlg::ReloadDialog()
 	*/
 	char a[10];
 	sprintf(a, "%d", TheMtl->Get_Pass_Count());
-	SetWindowText(GetDlgItem(HwndPassCount, IDC_GAMEMTL_PASSCOUNT_STATIC), a);	
+	SetWindowText(GetDlgItem(HwndPassCount, IDC_GAMEMTL_PASSCOUNT_STATIC), a);
 
 	/*
 	** Init each pass panel
@@ -268,17 +268,17 @@ void GameMtlDlg::ReloadDialog()
 	}
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::ActivateDlg -- Activates and deactivates the dialog                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::ActivateDlg -- Activates and deactivates the dialog                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void GameMtlDlg::ActivateDlg(BOOL onoff)
 {
@@ -289,24 +289,24 @@ void GameMtlDlg::ActivateDlg(BOOL onoff)
 	}
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::Invalidate -- causes the dialog to be redrawn                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::Invalidate -- causes the dialog to be redrawn                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void GameMtlDlg::Invalidate()
-{	
+{
 	InvalidateRect(HwndSurfaceType,NULL,0);
 
 	#ifdef WANT_DISPLACEMENT_MAPS
-		InvalidateRect(HwndDisplacementMap,NULL,0);	
+		InvalidateRect(HwndDisplacementMap,NULL,0);
 	#endif //WANT_DISPLACEMENT_MAPS
 
 	InvalidateRect(HwndPassCount,NULL,0);
@@ -314,13 +314,13 @@ void GameMtlDlg::Invalidate()
 
 BOOL	GameMtlDlg::DisplacementMapProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-	switch (message) 
+	switch (message)
 	{
-		
+
 		case WM_INITDIALOG:
 			//SetupIntSpinner(hDlg, IDC_AMOUNT_SPIN, IDC_AMOUNT_EDIT, -999, 999, 0);
 			/* no break */
-		
+
 		case WM_USER + 101:
 		{
 			SetDlgItemInt (hDlg, IDC_AMOUNT_EDIT, TheMtl->Get_Displacement_Amount () * 100, TRUE);
@@ -333,7 +333,7 @@ BOOL	GameMtlDlg::DisplacementMapProc(HWND hDlg, UINT message, WPARAM wParam, LPA
 		}
 		break;
 
-		case CC_SPINNER_CHANGE:    
+		case CC_SPINNER_CHANGE:
 			{
 				ISpinnerControl *control = (ISpinnerControl *)lParam;
 				TheMtl->Set_Displacement_Amount (((float)control->GetIVal ()) / 100.0F);
@@ -345,7 +345,7 @@ BOOL	GameMtlDlg::DisplacementMapProc(HWND hDlg, UINT message, WPARAM wParam, LPA
 			{
 			case IDC_TEXTURE_BUTTON:
 				if(HIWORD(wParam) == BN_CLICKED)
-				{					
+				{
 					PostMessage(HwndEdit, WM_TEXMAP_BUTTON, TheMtl->Get_Displacement_Map_Index (), (LPARAM)TheMtl);
 				}
 			}
@@ -357,9 +357,9 @@ BOOL	GameMtlDlg::DisplacementMapProc(HWND hDlg, UINT message, WPARAM wParam, LPA
 
 BOOL	GameMtlDlg::SurfaceTypeProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-	switch (message) 
+	switch (message)
 	{
-		
+
 		case WM_INITDIALOG:
 		{
 			//
@@ -383,12 +383,12 @@ BOOL	GameMtlDlg::SurfaceTypeProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 			::SendDlgItemMessage(hDlg, IDC_ENABLE_SORT_LEVEL, BM_SETCHECK,
 				sort_level == SORT_LEVEL_NONE ? BST_UNCHECKED : BST_CHECKED, 0);
 		}
-		
+
 		case WM_USER + 101:
 		{
 			//
 			//	Select the current surface type
-			//			
+			//
 			::SendDlgItemMessage (	hDlg,
 											IDC_SURFACE_TYPE_COMBO,
 											CB_SETCURSEL,
@@ -468,8 +468,8 @@ BOOL	GameMtlDlg::SurfaceTypeProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 
 BOOL	GameMtlDlg::PassCountProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-	switch (message) 
-	{		
+	switch (message)
+	{
 		case WM_INITDIALOG:
 			break;
 
@@ -497,7 +497,7 @@ static BOOL CALLBACK DisplacementMapDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara
 		SetWindowLong(hwndDlg, GWL_USERDATA,lParam);
 	} else {
 		if ((theDlg = (GameMtlDlg *)GetWindowLong(hwndDlg, GWL_USERDATA) ) == NULL) {
-			return FALSE; 
+			return FALSE;
 		}
 	}
 
@@ -517,7 +517,7 @@ static BOOL CALLBACK SurfaceTypePanelDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 		SetWindowLong(hwndDlg, GWL_USERDATA,lParam);
 	} else {
 		if ((theDlg = (GameMtlDlg *)GetWindowLong(hwndDlg, GWL_USERDATA) ) == NULL) {
-			return FALSE; 
+			return FALSE;
 		}
 	}
 
@@ -537,7 +537,7 @@ static BOOL CALLBACK PassCountPanelDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 		SetWindowLong(hwndDlg, GWL_USERDATA,lParam);
 	} else {
 		if ((theDlg = (GameMtlDlg *)GetWindowLong(hwndDlg, GWL_USERDATA) ) == NULL) {
-			return FALSE; 
+			return FALSE;
 		}
 	}
 
@@ -557,7 +557,7 @@ void GameMtlDlg::Set_Pass_Count_Dialog(void)
 		PassCountDialogDlgProc,
 		(LPARAM)TheMtl->Get_Pass_Count());
 
-	if (res>=0) 
+	if (res>=0)
 	{
 		if (res<=0) res = 1;
 		if (res>4) res = 4;
@@ -579,7 +579,7 @@ void GameMtlDlg::Set_Pass_Count_Dialog(void)
 
 			for(i = 0; i < TheMtl->Get_Pass_Count(); i++)
 			{
-				PassDialog[i] = new GameMtlPassDlg(HwndEdit, IParams, TheMtl, i); 
+				PassDialog[i] = new GameMtlPassDlg(HwndEdit, IParams, TheMtl, i);
 			}
 
 			ReloadDialog();
@@ -589,9 +589,9 @@ void GameMtlDlg::Set_Pass_Count_Dialog(void)
 
 static BOOL CALLBACK PassCountDialogDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,LPARAM lParam)
 {
-	switch (msg) 
+	switch (msg)
 	{
-		case WM_INITDIALOG: 
+		case WM_INITDIALOG:
 		{
 			ISpinnerControl *spin =	SetupIntSpinner(
 					hwndDlg,IDC_PASSCOUNT_SPIN, IDC_PASSCOUNT_EDIT,
@@ -602,9 +602,9 @@ static BOOL CALLBACK PassCountDialogDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara
 		}
 
 		case WM_COMMAND:
-			switch (LOWORD(wParam)) 
+			switch (LOWORD(wParam))
 			{
-				case IDOK: 
+				case IDOK:
 				{
 					ISpinnerControl *spin = GetISpinner(GetDlgItem(hwndDlg,IDC_PASSCOUNT_SPIN));
 					EndDialog(hwndDlg,spin->GetIVal());
@@ -625,55 +625,55 @@ static BOOL CALLBACK PassCountDialogDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara
 }
 
 
-/*********************************************************************************************** 
- * GameMtlDlg::Build_Dialog -- Adds the dialog to the material editor                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::Build_Dialog -- Adds the dialog to the material editor                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-void GameMtlDlg::Build_Dialog() 
+void GameMtlDlg::Build_Dialog()
 {
-	if ((TheMtl->Flags&(GAMEMTL_ROLLUP_FLAGS))==0) { 
+	if ((TheMtl->Flags&(GAMEMTL_ROLLUP_FLAGS))==0) {
 		TheMtl->Set_Flag(GAMEMTL_PASS0_ROLLUP_OPEN,TRUE);
-	}	
+	}
 
-	HwndSurfaceType = IParams->AddRollupPage( 
-		AppInstance,	 
+	HwndSurfaceType = IParams->AddRollupPage(
+		AppInstance,
 		MAKEINTRESOURCE(IDD_GAMEMTL_SURFACE_TYPE),
-		SurfaceTypePanelDlgProc, 
-		Get_String(IDS_SURFACE_TYPE), 
+		SurfaceTypePanelDlgProc,
+		Get_String(IDS_SURFACE_TYPE),
 		(LPARAM)this,
 		TheMtl->Get_Flag(GAMEMTL_SURFACE_ROLLUP_OPEN) ? 0:APPENDROLL_CLOSED
-	);		
+	);
 
 	#ifdef WANT_DISPLACEMENT_MAPS
-		HwndDisplacementMap = IParams->AddRollupPage( 
-			AppInstance,	 
+		HwndDisplacementMap = IParams->AddRollupPage(
+			AppInstance,
 			MAKEINTRESOURCE(IDD_GAMEMTL_DISPLACEMENT_MAP),
-			DisplacementMapDlgProc, 
-			Get_String(IDS_DISPLACEMENT_MAP), 
+			DisplacementMapDlgProc,
+			Get_String(IDS_DISPLACEMENT_MAP),
 			(LPARAM)this,
 			TheMtl->Get_Flag(GAMEMTL_DISPLACEMENT_ROLLUP_OPEN) ? 0:APPENDROLL_CLOSED
-		);		
+		);
 	#endif //WANT_DISPLACEMENT_MAPS
 
-	HwndPassCount = IParams->AddRollupPage( 
-		AppInstance,	 
+	HwndPassCount = IParams->AddRollupPage(
+		AppInstance,
 		MAKEINTRESOURCE(IDD_GAMEMTL_PASS_COUNT),
-		PassCountPanelDlgProc, 
-		Get_String(IDS_PASS_COUNT), 
+		PassCountPanelDlgProc,
+		Get_String(IDS_PASS_COUNT),
 		(LPARAM)this,
 		TheMtl->Get_Flag(GAMEMTL_PASSCOUNT_ROLLUP_OPEN) ? 0:APPENDROLL_CLOSED
-	);		
+	);
 
 	for (int i=0; i<TheMtl->Get_Pass_Count(); i++) {
-		PassDialog[i] = new GameMtlPassDlg(HwndEdit, IParams, TheMtl, i); 
+		PassDialog[i] = new GameMtlPassDlg(HwndEdit, IParams, TheMtl, i);
 	}
 
 	IParams->SetRollupScrollPos(TheMtl->RollScroll);
diff --git a/Core/Tools/WW3D/max2w3d/GameMtlDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlDlg.h
index 8b885483858..e5fe6042b79 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtlDlg.h
+++ b/Core/Tools/WW3D/max2w3d/GameMtlDlg.h
@@ -34,13 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-
-
-#ifndef GAMEMTLDLG_H
-#define GAMEMTLDLG_H
+#pragma once
 
 class GameMtl;
+
 class GameMtlPassDlg;
 
 
@@ -52,22 +49,22 @@ class GameMtlPassDlg;
 // Max material's dialog.
 //
 ////////////////////////////////////////////////////////////////////////
-class GameMtlDlg: public ParamDlg 
+class GameMtlDlg: public ParamDlg
 {
 
 public:
-	
+
 	////////////////////////////////////////////////////////////////////////
 	// Methods
 	////////////////////////////////////////////////////////////////////////
-	GameMtlDlg(HWND hwMtlEdit, IMtlParams *imp, GameMtl *m); 
+	GameMtlDlg(HWND hwMtlEdit, IMtlParams *imp, GameMtl *m);
 	~GameMtlDlg();
 
 	// From ParamDlg:
 	Class_ID				ClassID(void);
 	void					SetThing(ReferenceTarget *m);
 	ReferenceTarget*	GetThing(void) { return (ReferenceTarget*)TheMtl; }
-	void					DeleteThis() { delete this;  }	
+	void					DeleteThis() { delete this;  }
 	void					SetTime(TimeValue t);
 	void					ReloadDialog(void);
 	void					ActivateDlg(BOOL onOff);
@@ -78,7 +75,7 @@ class GameMtlDlg: public ParamDlg
 protected:
 
 	void					Build_Dialog(void);
-	
+
 	BOOL					DisplacementMapProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 	BOOL					SurfaceTypeProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 	BOOL					PassCountProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
@@ -95,25 +92,22 @@ class GameMtlDlg: public ParamDlg
 	HWND					HwndDisplacementMap;
 	HPALETTE				HpalOld;
 
-	GameMtlPassDlg *	PassDialog[MAX_PASSES];	
+	GameMtlPassDlg *	PassDialog[MAX_PASSES];
 
 	////////////////////////////////////////////////////////////////////////
 	// Material dialog interface
 	////////////////////////////////////////////////////////////////////////
 	IMtlParams *		IParams;			// interface to the material editor
 	GameMtl *			TheMtl;			// current mtl being edited.
-	
+
 	////////////////////////////////////////////////////////////////////////
 	// Member variables
 	////////////////////////////////////////////////////////////////////////
 	TimeValue			CurTime;
 	int					IsActive;
-	
+
 	friend BOOL CALLBACK DisplacementMapDlgProc(HWND, UINT, WPARAM,LPARAM);
 	friend BOOL CALLBACK SurfaceTypePanelDlgProc(HWND, UINT, WPARAM,LPARAM);
 	friend BOOL CALLBACK PassCountPanelDlgProc(HWND, UINT, WPARAM,LPARAM);
 	friend class GameMtl;
 };
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/GameMtlForm.cpp b/Core/Tools/WW3D/max2w3d/GameMtlForm.cpp
index dd64ad525b4..bb487edf964 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtlForm.cpp
+++ b/Core/Tools/WW3D/max2w3d/GameMtlForm.cpp
@@ -59,7 +59,7 @@
  *=============================================================================================*/
 GameMtlFormClass::GameMtlFormClass
 (
-	IMtlParams *	imtl_params, 
+	IMtlParams *	imtl_params,
 	GameMtl *		mtl,
 	int				pass
 )
@@ -103,9 +103,9 @@ void GameMtlFormClass::SetThing(ReferenceTarget * target)
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-ReferenceTarget * GameMtlFormClass::GetThing(void) 
-{ 
-	return (ReferenceTarget*)TheMtl; 
+ReferenceTarget * GameMtlFormClass::GetThing(void)
+{
+	return (ReferenceTarget*)TheMtl;
 }
 
 
@@ -141,7 +141,7 @@ void GameMtlFormClass::DeleteThis(void)
  *=============================================================================================*/
 Class_ID	GameMtlFormClass::ClassID()
 {
-	return GameMaterialClassID;  
+	return GameMaterialClassID;
 }
 
 
diff --git a/Core/Tools/WW3D/max2w3d/GameMtlForm.h b/Core/Tools/WW3D/max2w3d/GameMtlForm.h
index cf4033947fd..6febb29d35a 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtlForm.h
+++ b/Core/Tools/WW3D/max2w3d/GameMtlForm.h
@@ -34,10 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-
-#ifndef GAMEMTLFORM_H
-#define GAMEMTLFORM_H
+#pragma once
 
 #include "FormClass.h"
 
@@ -60,5 +57,3 @@ class GameMtlFormClass : public FormClass
 	GameMtl *			TheMtl;			// current mtl being edited.
 	int					PassIndex;		// material pass that this form edits
 };
-
-#endif
diff --git a/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.cpp b/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.cpp
index 14eaa615ff2..46db41bc60b 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.cpp
+++ b/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.cpp
@@ -57,7 +57,7 @@
 #include "w3d_file.h"
 
 
-static int _Pass_Index_To_Flag[] = 
+static int _Pass_Index_To_Flag[] =
 {
 	GAMEMTL_PASS0_ROLLUP_OPEN,
 	GAMEMTL_PASS1_ROLLUP_OPEN,
@@ -78,7 +78,7 @@ static int _Pass_Index_To_Flag[] =
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-static BOOL CALLBACK PassDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) 
+static BOOL CALLBACK PassDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	GameMtlPassDlg *theDlg;
 
@@ -88,7 +88,7 @@ static BOOL CALLBACK PassDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		SetWindowLong(hwndDlg, GWL_USERDATA,lParam);
 	} else {
 		if ((theDlg = (GameMtlPassDlg *)GetWindowLong(hwndDlg, GWL_USERDATA) ) == NULL) {
-			return FALSE; 
+			return FALSE;
 		}
 	}
 
@@ -118,7 +118,7 @@ GameMtlPassDlg::GameMtlPassDlg(HWND hwMtlEdit, IMtlParams *imp, GameMtl *m,int p
 	char title[200];
 	sprintf(title, "Pass %d", pass + 1);
 
-	HwndPanel = IParams->AddRollupPage( 
+	HwndPanel = IParams->AddRollupPage(
 		AppInstance,
 		MAKEINTRESOURCE(IDD_GAMEMTL_PASS),
 		PassDlgProc,
@@ -184,7 +184,7 @@ BOOL GameMtlPassDlg::DialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
 			for (i=0; i<PAGE_COUNT; i++) {
 
 				HWND hwnd = Page[i]->Get_Hwnd();
-			
+
 				// set the tab names
 				char name[64];
 				::GetWindowText(hwnd,name,sizeof(name));
@@ -196,7 +196,7 @@ BOOL GameMtlPassDlg::DialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
 			RECT rect;
 			::GetWindowRect(GetDlgItem(HwndPanel,IDC_GAMEMTL_TAB),&rect);
 			TabCtrl_AdjustRect(GetDlgItem(HwndPanel,IDC_GAMEMTL_TAB),FALSE, &rect);
-  
+
 			// Convert the display rectangle from screen to client coords
 			ScreenToClient(HwndPanel,(POINT *)(&rect));
 			ScreenToClient(HwndPanel, ((LPPOINT)&rect) + 1);
@@ -206,22 +206,22 @@ BOOL GameMtlPassDlg::DialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
 				HWND hwnd = Page[i]->Get_Hwnd();
 
 				// Loop through all the tabs in the property sheet
-				// Get a pointer to this tab				
-				SetWindowPos(	hwnd, 
-									NULL, 
-									rect.left, rect.top, 
-									rect.right - rect.left, rect.bottom - rect.top, 
-									SWP_NOZORDER);				
+				// Get a pointer to this tab
+				SetWindowPos(	hwnd,
+									NULL,
+									rect.left, rect.top,
+									rect.right - rect.left, rect.bottom - rect.top,
+									SWP_NOZORDER);
 			}
-			
+
  			CurPage = 0;
-			TabCtrl_SetCurSel(GetDlgItem(HwndPanel,IDC_GAMEMTL_TAB),CurPage); 
+			TabCtrl_SetCurSel(GetDlgItem(HwndPanel,IDC_GAMEMTL_TAB),CurPage);
 			Page[CurPage]->Show();
 
 			break;
 		}
-	
-		case WM_PAINT: 
+
+		case WM_PAINT:
 		{
 			if (!Valid) {
 				Valid = TRUE;
@@ -229,20 +229,20 @@ BOOL GameMtlPassDlg::DialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
 			}
 			return FALSE;
 		}
-		
+
 		case WM_NOTIFY:
 		{
 			NMHDR * header = (NMHDR *)lParam;
-			
-			switch(header->code) { 
+
+			switch(header->code) {
 				case TCN_SELCHANGE:
 				{
-					int sel = TabCtrl_GetCurSel(GetDlgItem(HwndPanel,IDC_GAMEMTL_TAB)); 
+					int sel = TabCtrl_GetCurSel(GetDlgItem(HwndPanel,IDC_GAMEMTL_TAB));
 					Page[sel]->Show();
 
 					for (int i=0; i < PAGE_COUNT; i++) {
 						if (i != sel) Page[i]->Show(false);
-					} 
+					}
 					CurPage = sel;
 					TheMtl->Set_Current_Page(PassIndex,CurPage);
 				}
@@ -292,7 +292,7 @@ void GameMtlPassDlg::ReloadDialog()
 	DebugPrint("GameMtlPassDlg::ReloadDialog\n");
 	Interval v;
 	TheMtl->Update(IParams->GetTime(),v);
-	
+
 	for (i=0; i<PAGE_COUNT; i++) {
 		Page[i]->ReloadDialog();
 	}
@@ -302,7 +302,7 @@ void GameMtlPassDlg::ReloadDialog()
 	Page[CurPage]->Show();
 	for (i=0; i < PAGE_COUNT; i++) {
 		if (i != CurPage) Page[i]->Show(false);
-	} 
+	}
 }
 
 
@@ -320,7 +320,7 @@ void GameMtlPassDlg::ReloadDialog()
  *=============================================================================================*/
 Class_ID	GameMtlPassDlg::ClassID()
 {
-	return GameMaterialClassID;  
+	return GameMaterialClassID;
 }
 
 
@@ -343,7 +343,7 @@ void GameMtlPassDlg::SetThing(ReferenceTarget* target)
 	assert (target->ClassID()==GameMaterialClassID);
 
 	TheMtl = (GameMtl *)target;
-	
+
 	for (int i=0; i<PAGE_COUNT; i++) {
 		Page[i]->SetThing(target);
 	}
@@ -386,7 +386,7 @@ void GameMtlPassDlg::ActivateDlg(BOOL onoff)
  *=============================================================================================*/
 void GameMtlPassDlg::SetTime(TimeValue t)
 {
-	// parent dialog class keeps track of the validty and we 
+	// parent dialog class keeps track of the validty and we
 	// don't have to do anything in this function (it will never
 	// be called in fact)
 }
diff --git a/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h
index 018bf1f00d8..27a47f9172b 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h
+++ b/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h
@@ -34,11 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-
-
-#ifndef GAMEMTLPASSDLG_H
-#define GAMEMTLPASSDLG_H
+#pragma once
 
 #include <max.h>
 
@@ -50,23 +46,23 @@ class GameMtlFormClass;
 ** editing the VertexMaterial parameters, the Shader parameters and the
 ** Texture parameters.
 */
-class GameMtlPassDlg: public ParamDlg 
+class GameMtlPassDlg: public ParamDlg
 {
 public:
-	
-	GameMtlPassDlg(HWND hwMtlEdit, IMtlParams *imp, GameMtl *m,int pass); 
+
+	GameMtlPassDlg(HWND hwMtlEdit, IMtlParams *imp, GameMtl *m,int pass);
 	~GameMtlPassDlg();
 
 	BOOL					DialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
-	void					Invalidate();		
+	void					Invalidate();
 	void					UpdateMtlDisplay()						{ IParams->MtlChanged(); }
 
 	void					ReloadDialog();
 	Class_ID				ClassID();
 	void					SetThing(ReferenceTarget* target);
 	ReferenceTarget *	GetThing()									{ return (ReferenceTarget *)TheMtl; }
-	void					DeleteThis()								{ delete this;  }	
+	void					DeleteThis()								{ delete this;  }
 	void					SetTime(TimeValue t);
 	void					ActivateDlg(BOOL onOff);
 
@@ -93,5 +89,3 @@ class GameMtlPassDlg: public ParamDlg
 
 	GameMtlFormClass*	Page[PAGE_COUNT];
 };
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.cpp b/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.cpp
index 89a0b5a5084..3da514304e9 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.cpp
+++ b/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.cpp
@@ -56,7 +56,7 @@
 
 #define NUM_SHADER_BLEND_PRESETS 8
 
-static char * _ShaderBlendSettingPresetNames[NUM_SHADER_BLEND_PRESETS + 1] = 
+static char * _ShaderBlendSettingPresetNames[NUM_SHADER_BLEND_PRESETS + 1] =
 {
 	"Opaque",
 	"Add",
@@ -101,8 +101,8 @@ static const ShaderBlendSettingPreset ShaderBlendSettingPresets[NUM_SHADER_BLEND
  *=============================================================================================*/
 GameMtlShaderDlg::GameMtlShaderDlg
 (
-	HWND				parent, 
-	IMtlParams *	imp, 
+	HWND				parent,
+	IMtlParams *	imp,
 	GameMtl *		mtl,
 	int				pass
 ) :
@@ -140,14 +140,14 @@ GameMtlShaderDlg::~GameMtlShaderDlg()
  * HISTORY:                                                                                    *
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-BOOL GameMtlShaderDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam, LPARAM lparam) 
-{ 
+BOOL GameMtlShaderDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam, LPARAM lparam)
+{
 	int cursel;
 	int i;
 	int id = LOWORD(wparam);
 	int code = HIWORD(wparam);
 
-	switch (message) 
+	switch (message)
 	{
 
 		case WM_INITDIALOG:
@@ -168,8 +168,8 @@ BOOL GameMtlShaderDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam, L
 		case WM_COMMAND:
 			{
 				if (code == CBN_SELCHANGE) {
-					
-					switch (id) 
+
+					switch (id)
 					{
 						case IDC_DEPTHCOMPARE_COMBO:
 							cursel = SendDlgItemMessage(dlg_wnd,IDC_DEPTHCOMPARE_COMBO,CB_GETCURSEL,0,0);
@@ -214,9 +214,9 @@ BOOL GameMtlShaderDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam, L
 					}
 
 				} else {
-				
+
 					switch(id) {
-						
+
 						case IDC_DEPTHMASK_CHECK:
 							if (SendDlgItemMessage(dlg_wnd,IDC_DEPTHMASK_CHECK,BM_GETCHECK,0,0)) {
 								TheMtl->Set_Depth_Mask(PassIndex,W3DSHADER_DEPTHMASK_WRITE_ENABLE);
@@ -270,7 +270,7 @@ void GameMtlShaderDlg::ReloadDialog(void)
 	SendDlgItemMessage(m_hWnd, IDC_DETAILCOLOR_COMBO, CB_SETCURSEL, TheMtl->Get_Detail_Color_Func(PassIndex), 0 );
 	SendDlgItemMessage(m_hWnd, IDC_DETAILALPHA_COMBO, CB_SETCURSEL, TheMtl->Get_Detail_Alpha_Func(PassIndex), 0 );
 	Set_Preset();
-	
+
 	SetCheckBox(m_hWnd,IDC_DEPTHMASK_CHECK, TheMtl->Get_Depth_Mask(PassIndex));
 	SetCheckBox(m_hWnd,IDC_ALPHATEST_CHECK, TheMtl->Get_Alpha_Test(PassIndex));
 }
@@ -394,4 +394,4 @@ void GameMtlShaderDlg::Set_Advanced_Defaults(void)
 
 	TheMtl->Notify_Changed();
 	ReloadDialog();
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h
index 8c47c302910..298cf9bd35f 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h
+++ b/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h
@@ -34,10 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-
-#ifndef GAMEMTLSHADERDLG_H
-#define GAMEMTLSHADERDLG_H
+#pragma once
 
 #include <max.h>
 #include "GameMtlForm.h"
@@ -66,5 +63,3 @@ class GameMtlShaderDlg : public GameMtlFormClass
 	bool					CompareShaderToBlendPreset(const ShaderBlendSettingPreset &blend_preset);
 	void					Set_Advanced_Defaults(void);
 };
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.cpp b/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.cpp
index f05a44ef9f8..5137098f49d 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.cpp
+++ b/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.cpp
@@ -68,8 +68,8 @@
  *=============================================================================================*/
 GameMtlTextureDlg::GameMtlTextureDlg
 (
-	HWND				parent, 
-	IMtlParams *	imp, 
+	HWND				parent,
+	IMtlParams *	imp,
 	GameMtl *		mtl,
 	int				pass
 ) :
@@ -151,13 +151,13 @@ GameMtlTextureDlg::~GameMtlTextureDlg()
  *   11/23/98   GTH : Created.                                                                 *
  *   10/6/1999 MLL: Turned off the display button when the texture is turned off.              *
  *=============================================================================================*/
-BOOL GameMtlTextureDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam, LPARAM lparam) 
-{ 
+BOOL GameMtlTextureDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam, LPARAM lparam)
+{
 	int cursel;
 	int id = LOWORD(wparam);
 	int code = HIWORD(wparam);
 
-	switch (message) 
+	switch (message)
 	{
 		case WM_INITDIALOG:
 		{
@@ -166,20 +166,20 @@ BOOL GameMtlTextureDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam,
 															IDC_STAGE0_FRAMES_EDIT,
 															1,999,
 															TheMtl->Get_Texture_Frame_Count(PassIndex,0) );
-			
+
 			Stage0RateSpin = SetupFloatSpinner(	dlg_wnd,
 															IDC_STAGE0_RATE_SPIN,
 															IDC_STAGE0_RATE_EDIT,
 															0.0f,60.0f,
 															TheMtl->Get_Texture_Frame_Rate(PassIndex,0),
 															1.0f );
-			
+
 			Stage1FramesSpin = SetupIntSpinner(	dlg_wnd,
 															IDC_STAGE1_FRAMES_SPIN,
 															IDC_STAGE1_FRAMES_EDIT,
 															1,999,
 															TheMtl->Get_Texture_Frame_Count(PassIndex,1) );
-			
+
 			Stage1RateSpin = SetupFloatSpinner(	dlg_wnd,
 															IDC_STAGE1_RATE_SPIN,
 															IDC_STAGE1_RATE_EDIT,
@@ -190,61 +190,61 @@ BOOL GameMtlTextureDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam,
 			Stage0PublishButton = GetICustButton(GetDlgItem(dlg_wnd, IDC_STAGE0_PUBLISH_BUTTON));
 			Stage0PublishButton->SetType(CBT_CHECK);
 			Stage0PublishButton->SetHighlightColor(GREEN_WASH);
-			Stage0PublishButton->SetCheck(TheMtl->Get_Texture_Publish(PassIndex,0));				
+			Stage0PublishButton->SetCheck(TheMtl->Get_Texture_Publish(PassIndex,0));
 			Stage0PublishButton->SetText(Get_String(IDS_PUBLISH));
 
 			Stage1PublishButton = GetICustButton(GetDlgItem(dlg_wnd, IDC_STAGE1_PUBLISH_BUTTON));
 			Stage1PublishButton->SetType(CBT_CHECK);
 			Stage1PublishButton->SetHighlightColor(GREEN_WASH);
-			Stage1PublishButton->SetCheck(TheMtl->Get_Texture_Publish(PassIndex,1));				
+			Stage1PublishButton->SetCheck(TheMtl->Get_Texture_Publish(PassIndex,1));
 			Stage1PublishButton->SetText(Get_String(IDS_PUBLISH));
 
 			Stage0ClampUButton = GetICustButton(GetDlgItem(dlg_wnd, IDC_STAGE0_CLAMP_U_BUTTON));
 			Stage0ClampUButton->SetType(CBT_CHECK);
 			Stage0ClampUButton->SetHighlightColor(GREEN_WASH);
-			Stage0ClampUButton->SetCheck(TheMtl->Get_Texture_Clamp_U(PassIndex,0));				
+			Stage0ClampUButton->SetCheck(TheMtl->Get_Texture_Clamp_U(PassIndex,0));
 			Stage0ClampUButton->SetText(Get_String(IDS_CLAMP_U));
 
 			Stage1ClampUButton = GetICustButton(GetDlgItem(dlg_wnd, IDC_STAGE1_CLAMP_U_BUTTON));
 			Stage1ClampUButton->SetType(CBT_CHECK);
 			Stage1ClampUButton->SetHighlightColor(GREEN_WASH);
-			Stage1ClampUButton->SetCheck(TheMtl->Get_Texture_Clamp_U(PassIndex,1));				
+			Stage1ClampUButton->SetCheck(TheMtl->Get_Texture_Clamp_U(PassIndex,1));
 			Stage1ClampUButton->SetText(Get_String(IDS_CLAMP_U));
 
 			Stage0ClampVButton = GetICustButton(GetDlgItem(dlg_wnd, IDC_STAGE0_CLAMP_V_BUTTON));
 			Stage0ClampVButton->SetType(CBT_CHECK);
 			Stage0ClampVButton->SetHighlightColor(GREEN_WASH);
-			Stage0ClampVButton->SetCheck(TheMtl->Get_Texture_Clamp_V(PassIndex,0));				
+			Stage0ClampVButton->SetCheck(TheMtl->Get_Texture_Clamp_V(PassIndex,0));
 			Stage0ClampVButton->SetText(Get_String(IDS_CLAMP_V));
 
 			Stage1ClampVButton = GetICustButton(GetDlgItem(dlg_wnd, IDC_STAGE1_CLAMP_V_BUTTON));
 			Stage1ClampVButton->SetType(CBT_CHECK);
 			Stage1ClampVButton->SetHighlightColor(GREEN_WASH);
-			Stage1ClampVButton->SetCheck(TheMtl->Get_Texture_Clamp_V(PassIndex,1));				
+			Stage1ClampVButton->SetCheck(TheMtl->Get_Texture_Clamp_V(PassIndex,1));
 			Stage1ClampVButton->SetText(Get_String(IDS_CLAMP_V));
 
 			Stage0NoLODButton = GetICustButton(GetDlgItem(dlg_wnd, IDC_STAGE0_NOLOD_BUTTON));
 			Stage0NoLODButton->SetType(CBT_CHECK);
 			Stage0NoLODButton->SetHighlightColor(GREEN_WASH);
-			Stage0NoLODButton->SetCheck(TheMtl->Get_Texture_No_LOD(PassIndex,0));				
+			Stage0NoLODButton->SetCheck(TheMtl->Get_Texture_No_LOD(PassIndex,0));
 			Stage0NoLODButton->SetText(Get_String(IDS_NO_LOD));
 
 			Stage1NoLODButton = GetICustButton(GetDlgItem(dlg_wnd, IDC_STAGE1_NOLOD_BUTTON));
 			Stage1NoLODButton->SetType(CBT_CHECK);
 			Stage1NoLODButton->SetHighlightColor(GREEN_WASH);
-			Stage1NoLODButton->SetCheck(TheMtl->Get_Texture_No_LOD(PassIndex,0));				
+			Stage1NoLODButton->SetCheck(TheMtl->Get_Texture_No_LOD(PassIndex,0));
 			Stage1NoLODButton->SetText(Get_String(IDS_NO_LOD));
-			
+
 			Stage0AlphaBitmapButton = GetICustButton(GetDlgItem(dlg_wnd, IDC_STAGE0_ALPHA_BITMAP_BUTTON));
 			Stage0AlphaBitmapButton->SetType(CBT_CHECK);
 			Stage0AlphaBitmapButton->SetHighlightColor(GREEN_WASH);
-			Stage0AlphaBitmapButton->SetCheck(TheMtl->Get_Texture_Alpha_Bitmap(PassIndex,0));				
+			Stage0AlphaBitmapButton->SetCheck(TheMtl->Get_Texture_Alpha_Bitmap(PassIndex,0));
 			Stage0AlphaBitmapButton->SetText(Get_String(IDS_ALPHA_BITMAP));
 
 			Stage1AlphaBitmapButton = GetICustButton(GetDlgItem(dlg_wnd, IDC_STAGE1_ALPHA_BITMAP_BUTTON));
 			Stage1AlphaBitmapButton->SetType(CBT_CHECK);
 			Stage1AlphaBitmapButton->SetHighlightColor(GREEN_WASH);
-			Stage1AlphaBitmapButton->SetCheck(TheMtl->Get_Texture_Alpha_Bitmap(PassIndex,1));				
+			Stage1AlphaBitmapButton->SetCheck(TheMtl->Get_Texture_Alpha_Bitmap(PassIndex,1));
 			Stage1AlphaBitmapButton->SetText(Get_String(IDS_ALPHA_BITMAP));
 
 			Stage0DisplayButton = GetICustButton(GetDlgItem(dlg_wnd, IDC_STAGE0_DISPLAY_BUTTON));
@@ -269,11 +269,11 @@ BOOL GameMtlTextureDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam,
 			return FALSE;
 		}
 
-		case CC_SPINNER_CHANGE:    
+		case CC_SPINNER_CHANGE:
 		{
 			TheMtl->Set_Texture_Frame_Count(	PassIndex, 0,
 														Stage0FramesSpin->GetIVal());
-			
+
 			TheMtl->Set_Texture_Frame_Rate(	PassIndex, 0,
 														Stage0RateSpin->GetFVal());
 
@@ -285,15 +285,15 @@ BOOL GameMtlTextureDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam,
 			break;
 		}
 
-		case CC_SPINNER_BUTTONUP: 
+		case CC_SPINNER_BUTTONUP:
 		{
 			TheMtl->Notify_Changed();
 			break;
 		}
 
-		case WM_COMMAND: 
+		case WM_COMMAND:
 		{
-			switch (id) 
+			switch (id)
 			{
 				case IDC_STAGE0_BUTTON:
 				{
@@ -331,7 +331,7 @@ BOOL GameMtlTextureDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam,
 					if (TheManager->SelectFileInput(&bmi, m_hWnd)) {
 						texture = NewDefaultBitmapTex();
 						if (texture) {
-							
+
 							BOOL disp = TheMtl->Get_Texture_Display(PassIndex,1);
 							if (disp) {
 								TheMtl->Set_Texture_Display(PassIndex,1,FALSE);
@@ -342,7 +342,7 @@ BOOL GameMtlTextureDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam,
 							TheMtl->SetSubTexmap(texmap_index,texture);
 							Update_Texture_Buttons();
 							TheMtl->Notify_Changed();
-							
+
 							if (disp) {
 								TheMtl->Set_Texture_Display(PassIndex,1,TRUE);
 								TheMtl->Notify_Changed();
@@ -505,40 +505,40 @@ void GameMtlTextureDlg::ReloadDialog(void)
 	Stage1FramesSpin->SetValue(TheMtl->Get_Texture_Frame_Count(PassIndex,1),FALSE);
 	Stage0RateSpin->SetValue(TheMtl->Get_Texture_Frame_Rate(PassIndex,0),FALSE);
 	Stage1RateSpin->SetValue(TheMtl->Get_Texture_Frame_Rate(PassIndex,1),FALSE);
-	
-	SendDlgItemMessage(	m_hWnd, 
-								IDC_STAGE0_ANIM_COMBO, 
-								CB_SETCURSEL, 
+
+	SendDlgItemMessage(	m_hWnd,
+								IDC_STAGE0_ANIM_COMBO,
+								CB_SETCURSEL,
 								TheMtl->Get_Texture_Anim_Type(PassIndex,0), 0 );
 
-	SendDlgItemMessage(	m_hWnd, 
-								IDC_STAGE1_ANIM_COMBO, 
-								CB_SETCURSEL, 
+	SendDlgItemMessage(	m_hWnd,
+								IDC_STAGE1_ANIM_COMBO,
+								CB_SETCURSEL,
 								TheMtl->Get_Texture_Anim_Type(PassIndex,1), 0 );
 
-	SendDlgItemMessage(	m_hWnd, 
-								IDC_STAGE0_HINT_COMBO, 
-								CB_SETCURSEL, 
+	SendDlgItemMessage(	m_hWnd,
+								IDC_STAGE0_HINT_COMBO,
+								CB_SETCURSEL,
 								TheMtl->Get_Texture_Hint(PassIndex,0), 0 );
 
-	SendDlgItemMessage(	m_hWnd, 
-								IDC_STAGE1_HINT_COMBO, 
-								CB_SETCURSEL, 
+	SendDlgItemMessage(	m_hWnd,
+								IDC_STAGE1_HINT_COMBO,
+								CB_SETCURSEL,
 								TheMtl->Get_Texture_Hint(PassIndex,1), 0 );
 
 	SetCheckBox(m_hWnd,IDC_STAGE0_ENABLE, TheMtl->Get_Texture_Enable(PassIndex,0));
 	SetCheckBox(m_hWnd,IDC_STAGE1_ENABLE, TheMtl->Get_Texture_Enable(PassIndex,1));
 
-	Stage0PublishButton->SetCheck(TheMtl->Get_Texture_Publish(PassIndex,0));				
-	Stage1PublishButton->SetCheck(TheMtl->Get_Texture_Publish(PassIndex,1));				
-	Stage0ClampUButton->SetCheck(TheMtl->Get_Texture_Clamp_U(PassIndex,0));				
-	Stage1ClampUButton->SetCheck(TheMtl->Get_Texture_Clamp_U(PassIndex,1));				
-	Stage0ClampVButton->SetCheck(TheMtl->Get_Texture_Clamp_V(PassIndex,0));				
-	Stage1ClampVButton->SetCheck(TheMtl->Get_Texture_Clamp_V(PassIndex,1));				
-	Stage0NoLODButton->SetCheck(TheMtl->Get_Texture_No_LOD(PassIndex,0));				
-	Stage1NoLODButton->SetCheck(TheMtl->Get_Texture_No_LOD(PassIndex,1));				
-	Stage0AlphaBitmapButton->SetCheck(TheMtl->Get_Texture_Alpha_Bitmap(PassIndex,0));				
-	Stage1AlphaBitmapButton->SetCheck(TheMtl->Get_Texture_Alpha_Bitmap(PassIndex,1));				
+	Stage0PublishButton->SetCheck(TheMtl->Get_Texture_Publish(PassIndex,0));
+	Stage1PublishButton->SetCheck(TheMtl->Get_Texture_Publish(PassIndex,1));
+	Stage0ClampUButton->SetCheck(TheMtl->Get_Texture_Clamp_U(PassIndex,0));
+	Stage1ClampUButton->SetCheck(TheMtl->Get_Texture_Clamp_U(PassIndex,1));
+	Stage0ClampVButton->SetCheck(TheMtl->Get_Texture_Clamp_V(PassIndex,0));
+	Stage1ClampVButton->SetCheck(TheMtl->Get_Texture_Clamp_V(PassIndex,1));
+	Stage0NoLODButton->SetCheck(TheMtl->Get_Texture_No_LOD(PassIndex,0));
+	Stage1NoLODButton->SetCheck(TheMtl->Get_Texture_No_LOD(PassIndex,1));
+	Stage0AlphaBitmapButton->SetCheck(TheMtl->Get_Texture_Alpha_Bitmap(PassIndex,0));
+	Stage1AlphaBitmapButton->SetCheck(TheMtl->Get_Texture_Alpha_Bitmap(PassIndex,1));
 	Stage0DisplayButton->SetCheck(TheMtl->Get_Texture_Display(PassIndex,0));
 	Stage1DisplayButton->SetCheck(TheMtl->Get_Texture_Display(PassIndex,1));
 
@@ -583,9 +583,9 @@ void GameMtlTextureDlg::Enable_Stage(int stage,BOOL onoff)
 {
 	assert((stage >= 0) && (stage < W3dMaterialClass::MAX_STAGES));
 	TheMtl->Set_Texture_Enable(PassIndex,stage,(onoff == TRUE ? true : false));
-		
+
 	if (stage == 0) {
-		
+
 		EnableWindow(GetDlgItem(m_hWnd,IDC_STAGE0_BUTTON),onoff);
 
 		// Turn these off if it is a playstation 2 shader.
@@ -611,7 +611,7 @@ void GameMtlTextureDlg::Enable_Stage(int stage,BOOL onoff)
 		EnableWindow(GetDlgItem(m_hWnd,IDC_STAGE0_ALPHA_BITMAP_BUTTON),onoff);
 		EnableWindow(GetDlgItem(m_hWnd,IDC_STAGE0_DISPLAY_BUTTON),onoff);
 		EnableWindow(GetDlgItem(m_hWnd,IDC_STAGE0_HINT_COMBO),onoff);
-	  		
+
 	} else {
 
 		EnableWindow(GetDlgItem(m_hWnd,IDC_STAGE1_BUTTON),onoff);
diff --git a/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h
index 4870a2318cc..6c7bcebc141 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h
+++ b/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h
@@ -34,13 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-
-
-#ifndef GAMEMTLTEXTUREDLG_H
-#define GAMEMTLTEXTUREDLG_H
+#pragma once
 
 #include <max.h>
+
 #include "GameMtlForm.h"
 
 class GameMtl;
@@ -58,7 +55,7 @@ class GameMtlTextureDlg : public GameMtlFormClass
 	void					ReloadDialog(void);
 
 private:
-	
+
 	void					Enable_Stage(int stage,BOOL onoff);
 	void					Update_Texture_Buttons(void);
 
@@ -81,10 +78,3 @@ class GameMtlTextureDlg : public GameMtlFormClass
 	ICustButton *		Stage0DisplayButton;
 	ICustButton *		Stage1DisplayButton;
 };
-
-
-
-
-#endif
-
-
diff --git a/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.cpp b/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.cpp
index fc802db3204..2cf7923fad9 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.cpp
+++ b/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.cpp
@@ -60,8 +60,8 @@
  *=============================================================================================*/
 GameMtlVertexMaterialDlg::GameMtlVertexMaterialDlg
 (
-	HWND				parent, 
-	IMtlParams *	imp, 
+	HWND				parent,
+	IMtlParams *	imp,
 	GameMtl *		mtl,
 	int				pass
 ) :
@@ -140,12 +140,12 @@ GameMtlVertexMaterialDlg::~GameMtlVertexMaterialDlg()
  *   11/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
 BOOL GameMtlVertexMaterialDlg::Dialog_Proc(HWND dlg_wnd, UINT message, WPARAM wparam, LPARAM lparam)
-{ 
+{
 	int val;
 	int id = LOWORD(wparam);
 	int code = HIWORD(wparam);
 
-	switch (message) 
+	switch (message)
 	{
 		case WM_INITDIALOG:
 		{
@@ -161,7 +161,7 @@ BOOL GameMtlVertexMaterialDlg::Dialog_Proc(HWND dlg_wnd, UINT message, WPARAM wp
 			UVChannelSpin[1] = SetupIntSpinner(dlg_wnd,IDC_STAGE1UVCHAN_SPIN,IDC_STAGE1UVCHAN_EDIT,1,99,1);
 			break;
 		}
-		
+
 		case WM_LBUTTONDOWN:
 		case WM_LBUTTONUP:
 		case WM_MOUSEMOVE:
@@ -170,14 +170,14 @@ BOOL GameMtlVertexMaterialDlg::Dialog_Proc(HWND dlg_wnd, UINT message, WPARAM wp
 			return FALSE;
 		}
 
-		case WM_COMMAND: 
+		case WM_COMMAND:
 		{
-			switch (id) 
+			switch (id)
 			{
 				case IDC_COPY_SPECULAR_DIFFUSE:
 					TheMtl->Set_Copy_Specular_To_Diffuse(PassIndex,GetCheckBox(dlg_wnd, IDC_COPY_SPECULAR_DIFFUSE) == TRUE);
 					break;
-				
+
 				case IDC_MAPPING0_COMBO:
 					if (code == CBN_SELCHANGE) {
 						val = SendDlgItemMessage(dlg_wnd,IDC_MAPPING0_COMBO,CB_GETCURSEL,0,0);
@@ -231,11 +231,11 @@ BOOL GameMtlVertexMaterialDlg::Dialog_Proc(HWND dlg_wnd, UINT message, WPARAM wp
 				case IDC_100_TRANS:
 					TheMtl->Set_PSX_Translucency(PassIndex,GAMEMTL_PSX_TRANS_100);
 					break;
-				
+
 				case IDC_50_TRANS:
 					TheMtl->Set_PSX_Translucency(PassIndex,GAMEMTL_PSX_TRANS_50);
 					break;
-				
+
 				case IDC_25_TRANS:
 					TheMtl->Set_PSX_Translucency(PassIndex,GAMEMTL_PSX_TRANS_25);
 					break;
@@ -243,7 +243,7 @@ BOOL GameMtlVertexMaterialDlg::Dialog_Proc(HWND dlg_wnd, UINT message, WPARAM wp
 				case IDC_MINUS_100_TRANS:
 					TheMtl->Set_PSX_Translucency(PassIndex,GAMEMTL_PSX_TRANS_MINUS_100);
 					break;
-				
+
 				case IDC_NO_RT_LIGHTING:
 					TheMtl->Set_PSX_Lighting(PassIndex,!GetCheckBox(dlg_wnd, IDC_NO_RT_LIGHTING));
 					break;
@@ -252,7 +252,7 @@ BOOL GameMtlVertexMaterialDlg::Dialog_Proc(HWND dlg_wnd, UINT message, WPARAM wp
 		}
 
 		case CC_COLOR_CHANGE:
-		{			
+		{
 			// just update all of the colors
 			TheMtl->Set_Ambient(PassIndex,IParams->GetTime(),AmbientSwatch->GetColor());
 			TheMtl->Set_Diffuse(PassIndex,IParams->GetTime(),DiffuseSwatch->GetColor());
@@ -260,9 +260,9 @@ BOOL GameMtlVertexMaterialDlg::Dialog_Proc(HWND dlg_wnd, UINT message, WPARAM wp
 			TheMtl->Set_Emissive(PassIndex,IParams->GetTime(),EmissiveSwatch->GetColor());
 			TheMtl->Notify_Changed();
 			break;
-		}			
+		}
 
-		case CC_SPINNER_CHANGE:    
+		case CC_SPINNER_CHANGE:
 		{
 			TheMtl->Set_Shininess(PassIndex,IParams->GetTime(),ShininessSpin->GetFVal());
 			TheMtl->Set_Opacity(PassIndex,IParams->GetTime(),OpacitySpin->GetFVal());
@@ -273,12 +273,12 @@ BOOL GameMtlVertexMaterialDlg::Dialog_Proc(HWND dlg_wnd, UINT message, WPARAM wp
 			break;
 		}
 
-		case CC_SPINNER_BUTTONUP: 
+		case CC_SPINNER_BUTTONUP:
 		{
 			TheMtl->Notify_Changed();
 			break;
 		}
-	
+
 	}
 	return FALSE;
 }
@@ -307,7 +307,7 @@ void GameMtlVertexMaterialDlg::ReloadDialog(void)
 	DiffuseSwatch->InitColor(TheMtl->Get_Diffuse(PassIndex,IParams->GetTime()));
 	SpecularSwatch->InitColor(TheMtl->Get_Specular(PassIndex,IParams->GetTime()));
 	EmissiveSwatch->InitColor(TheMtl->Get_Emissive(PassIndex,IParams->GetTime()));
-	
+
 	ShininessSpin->SetValue(TheMtl->Get_Shininess(PassIndex,IParams->GetTime()),FALSE);
 	OpacitySpin->SetValue(TheMtl->Get_Opacity(PassIndex,IParams->GetTime()),FALSE);
 	TranslucencySpin->SetValue(TheMtl->Get_Translucency(PassIndex,IParams->GetTime()),FALSE);
@@ -317,16 +317,16 @@ void GameMtlVertexMaterialDlg::ReloadDialog(void)
 
 	SetCheckBox(m_hWnd,IDC_COPY_SPECULAR_DIFFUSE, TheMtl->Get_Copy_Specular_To_Diffuse(PassIndex));
 
-	SendDlgItemMessage(	m_hWnd, 
-								IDC_MAPPING0_COMBO, 
-								CB_SETCURSEL, 
-								TheMtl->Get_Mapping_Type(PassIndex, 0), 
+	SendDlgItemMessage(	m_hWnd,
+								IDC_MAPPING0_COMBO,
+								CB_SETCURSEL,
+								TheMtl->Get_Mapping_Type(PassIndex, 0),
 								0 );
 
-	SendDlgItemMessage(	m_hWnd, 
-								IDC_MAPPING1_COMBO, 
-								CB_SETCURSEL, 
-								TheMtl->Get_Mapping_Type(PassIndex, 1), 
+	SendDlgItemMessage(	m_hWnd,
+								IDC_MAPPING1_COMBO,
+								CB_SETCURSEL,
+								TheMtl->Get_Mapping_Type(PassIndex, 1),
 								0 );
 
 	// PSX Controls
diff --git a/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h
index 5f242794c3f..63b3caa9c74 100644
--- a/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h
+++ b/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h
@@ -34,10 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-
-#ifndef GAMEMTLVERTEXMATERIALDLG_H
-#define GAMEMTLVERTEXMATERIALDLG_H
+#pragma once
 
 #include <max.h>
 #include "GameMtlForm.h"
@@ -71,6 +68,3 @@ class GameMtlVertexMaterialDlg : public GameMtlFormClass
 	ISpinnerControl * ShininessSpin;
 	ISpinnerControl * UVChannelSpin[MAX_STAGES];
 };
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/InputDlg.h b/Core/Tools/WW3D/max2w3d/InputDlg.h
index 57a64208389..28beae3a676 100644
--- a/Core/Tools/WW3D/max2w3d/InputDlg.h
+++ b/Core/Tools/WW3D/max2w3d/InputDlg.h
@@ -34,10 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-
-#ifndef INPUTDLG_H
-#define INPUTDLG_H
+#pragma once
 
 #include "dllmain.h"
 #include "resource.h"
@@ -81,6 +78,3 @@ class InputDlg
 	LRESULT OnInitDialog (WPARAM wParam, LPARAM lParam);
 	BOOL OnOK (void);
 };
-
-
-#endif
diff --git a/Core/Tools/WW3D/max2w3d/LightGlareSave.cpp b/Core/Tools/WW3D/max2w3d/LightGlareSave.cpp
index ccbec2e77ef..dd9eb636113 100644
--- a/Core/Tools/WW3D/max2w3d/LightGlareSave.cpp
+++ b/Core/Tools/WW3D/max2w3d/LightGlareSave.cpp
@@ -62,7 +62,7 @@ LightGlareSaveClass::LightGlareSaveClass
 	// Get the position of the pivot point relative to the given
 	// export coordinate system.
 	//////////////////////////////////////////////////////////////////////
-	
+
 	// Transform the mesh into the desired coordinate system
 	Matrix3 node_matrix = inode->GetObjectTM(curtime);
 	Matrix3 offset_matrix = node_matrix * Inverse(exportspace);
diff --git a/Core/Tools/WW3D/max2w3d/LightGlareSave.h b/Core/Tools/WW3D/max2w3d/LightGlareSave.h
index 17223384f26..23c9f4e0369 100644
--- a/Core/Tools/WW3D/max2w3d/LightGlareSave.h
+++ b/Core/Tools/WW3D/max2w3d/LightGlareSave.h
@@ -36,23 +36,18 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef LIGHTGLARESAVE_H
-#define LIGHTGLARESAVE_H
 
 #include <max.h>
 #include "w3d_file.h"
 #include "chunkio.h"
-#include "PROGRESS.H"
+#include "PROGRESS.h"
 
 
 /*******************************************************************************************
 **
 ** LightGlareSaveClass - Create a Light Glare definition from a Max mesh.  In the initial
-** implementation, all I need to save is the point at the pivot of the mesh.  
+** implementation, all I need to save is the point at the pivot of the mesh.
 **
 *******************************************************************************************/
 class LightGlareSaveClass
@@ -64,7 +59,7 @@ class LightGlareSaveClass
 		EX_CANCEL = 1
 	};
 
-	LightGlareSaveClass(		char *						mesh_name,	
+	LightGlareSaveClass(		char *						mesh_name,
 									char *						container_name,
 									INode *						inode,
 									Matrix3 &					exportspace,
@@ -74,11 +69,7 @@ class LightGlareSaveClass
 	int Write_To_File(ChunkSaveClass & csave);
 
 private:
-	
-	W3dLightGlareStruct		GlareData;				
-	
-};
 
+	W3dLightGlareStruct		GlareData;
 
-
-#endif
\ No newline at end of file
+};
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeform.cpp b/Core/Tools/WW3D/max2w3d/MeshDeform.cpp
index 7ddbf327087..808ba5f3eb2 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeform.cpp
+++ b/Core/Tools/WW3D/max2w3d/MeshDeform.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/MeshDeform.cpp 7     5/01/01 8:56p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeform.cpp                                               * 
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 04/19/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeform.cpp                                               *
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 04/19/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -61,7 +61,7 @@ Class_ID _MeshDeformClassID(0x51981f5b, 0x1db2bf3);
 //	MeshDeformClassDesc
 //
 ///////////////////////////////////////////////////////////////////////////
-class MeshDeformClassDesc : public ClassDesc 
+class MeshDeformClassDesc : public ClassDesc
 {
 	public:
 	int 				IsPublic (void)			{ return 1; }
@@ -125,7 +125,7 @@ MeshDeformClass::ModifyObject
 )
 {
 	assert(object_state->obj->IsSubClassOf(triObjectClassID));
-	
+
 
 	MeshDeformModData *mod_data = NULL;
 	if (mod_context.localData == NULL) {
@@ -138,7 +138,7 @@ MeshDeformClass::ModifyObject
 	// Display the verts
 	TriObject *tri_obj = (TriObject *)object_state->obj;
 	tri_obj->mesh.SetDispFlag (DISP_SELVERTS | DISP_VERTTICKS);
-	
+
 	// Record the initial state of the mesh
 	bool lock_sets = false;
 	if (m_pPanel != NULL) {
@@ -148,7 +148,7 @@ MeshDeformClass::ModifyObject
 
 	tri_obj->PointsWereChanged();
 
-	// Kind of a waste when there's no animation...		
+	// Kind of a waste when there's no animation...
 	tri_obj->UpdateValidity (GEOM_CHAN_NUM, Interval (time, time + 1));
 	tri_obj->UpdateValidity (SELECT_CHAN_NUM, Interval (time, time + 1));
 	tri_obj->UpdateValidity (SUBSEL_TYPE_CHAN_NUM, Interval (time, time + 1));
@@ -215,7 +215,7 @@ MeshDeformClass::BeginEditParams
 	Update_Set_Count ();
 	Set_Max_Deform_Sets (m_MaxSets);
 
-	// Add our rollup to the command panel	
+	// Add our rollup to the command panel
 	m_hRollupWnd = m_MaxInterface->AddRollupPage (AppInstance,
 																MAKEINTRESOURCE (IDD_MESH_DEFORM_PANEL),
 																MeshDeformPanelClass::Message_Proc,
@@ -239,7 +239,7 @@ MeshDeformClass::BeginEditParams
 #if defined W3D_MAX4		//defined as in the project (.dsp)
  	max_interface->SetSubObjectLevel(1);
 #else
-	//---This call is obsolete from max4.   
+	//---This call is obsolete from max4.
 	max_interface->RegisterSubObjectTypes( ptype, 1);
 #endif
 
@@ -273,7 +273,7 @@ MeshDeformClass::EndEditParams
 	ULONG flags,
 	Animatable *next
 )
-{	
+{
 	// Remove our deform rollup
 	if (m_hRollupWnd != NULL) {
 		max_interface->DeleteRollupPage (m_hRollupWnd);
@@ -286,7 +286,7 @@ MeshDeformClass::EndEditParams
 	max_interface->DeleteMode (m_ModeMove);
 	max_interface->DeleteMode (m_ModeSelect);
 	max_interface->DeleteMode (m_ModeRotate);
-	max_interface->DeleteMode (m_ModeNUScale);	
+	max_interface->DeleteMode (m_ModeNUScale);
 	max_interface->DeleteMode (m_ModeUScale);
 	max_interface->DeleteMode (m_ModeSquash);
 	SAFE_DELETE (m_ModeMove);
@@ -294,8 +294,8 @@ MeshDeformClass::EndEditParams
 	SAFE_DELETE (m_ModeRotate);
 	SAFE_DELETE (m_ModeNUScale);
 	SAFE_DELETE (m_ModeUScale);
-	SAFE_DELETE (m_ModeSquash);	
-	
+	SAFE_DELETE (m_ModeSquash);
+
 	// Release our hold on the max interface pointer
 	m_MaxInterface = NULL;
 	m_pPanel = NULL;
@@ -324,7 +324,7 @@ MeshDeformClass::ActivateSubobjSel
 	}
 
 	/*
-	** Notify our dependents that the subselection type, 
+	** Notify our dependents that the subselection type,
 	** and the display have changed
 	*/
 	NotifyDependents(FOREVER, PART_SUBSEL_TYPE|PART_DISPLAY, REFMSG_CHANGE);
@@ -335,7 +335,7 @@ MeshDeformClass::ActivateSubobjSel
 	m_MaxInterface->PipeSelLevelChanged();
 
 	/*
-	** Notify our dependents that the selection channel, 
+	** Notify our dependents that the selection channel,
 	** display attributes, and subselection type channels have changed
 	*/
 	NotifyDependents(FOREVER, VERTCOLOR_CHANNEL|SELECT_CHANNEL|DISP_ATTRIB_CHANNEL|SUBSEL_TYPE_CHANNEL, REFMSG_CHANGE);
@@ -374,8 +374,8 @@ MeshDeformClass::HitTest
 	//
 	GraphicsWindow *graphics_wnd = viewport->getGW ();
 	graphics_wnd->setHitRegion (&hit_rgn);
-	graphics_wnd->setTransform (transform);	
-	
+	graphics_wnd->setTransform (transform);
+
 	int saved_limits = graphics_wnd->getRndLimits ();
 	graphics_wnd->setRndLimits ((saved_limits | GW_PICK) & ~(GW_ILLUM | GW_BACKCULL));
 	graphics_wnd->clearHitCode ();
@@ -390,8 +390,8 @@ MeshDeformClass::HitTest
 													 graphics_wnd->getMaterial (),
 													 &hit_rgn,
 													 flags | SUBHIT_VERTS,
-													 hitlist);	
-	
+													 hitlist);
+
 	//
 	// Record all of the hits
 	//
@@ -404,10 +404,10 @@ MeshDeformClass::HitTest
 	}
 
 	// Cleanup
-	graphics_wnd->setRndLimits (saved_limits);	
-	
+	graphics_wnd->setRndLimits (saved_limits);
+
 	// Return the integer result code
-	return result;	
+	return result;
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -429,7 +429,7 @@ MeshDeformClass::SelectSubComponent
 
 		// Peek at the vertex selection array for this hit record
 		MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (hit_record->modContext->localData);
-		Mesh *mesh = mod_data->Peek_Mesh ();		
+		Mesh *mesh = mod_data->Peek_Mesh ();
 		BitArray &array = (mesh->vertSel);
 
 		if (all & invert) {
@@ -446,7 +446,7 @@ MeshDeformClass::SelectSubComponent
 		} else {
 			array.Set (hit_record->hitInfo, selected);
 		}
-						
+
 		if (!all) break;
 	}
 
@@ -494,7 +494,7 @@ MeshDeformClass::GetSubObjectCenters
 	MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context->localData);
 	const Point3 *vertex_array = mod_data->Peek_Orig_Vertex_Array ();
 	Mesh *mesh = mod_data->Peek_Mesh ();
-			
+
 	BitArray sel_array = mesh->vertSel;
 	Matrix3 transform = node->GetObjectTM (time_val);
 	Box3 box;
@@ -528,12 +528,12 @@ MeshDeformClass::ClearSelection (int selLevel)
 	for (int i = 0; i < mod_context_list.Count (); i++) {
 
 		MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[i]->localData);
-		
-		if (mod_data != NULL) {	
+
+		if (mod_data != NULL) {
 			mod_data->Peek_Mesh ()->vertSel.ClearAll ();
 		}
 	}
-	
+
 	/*
 	** Get rid of the temporary copies of the INodes.
 	*/
@@ -570,22 +570,22 @@ MeshDeformClass::Move
 
 		INodeTab nodes;
 		ModContextList mod_context_list;
-		m_MaxInterface->GetModContexts (mod_context_list, nodes);	
+		m_MaxInterface->GetModContexts (mod_context_list, nodes);
 
 		// Loop through all the modifier contexts
 		for (int index = 0; index < mod_context_list.Count (); index ++) {
 
 			// Get the data we've cached for this modifier context
-			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);		
+			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);
 			if (mod_data != NULL) {
 				Mesh *mesh = mod_data->Peek_Mesh ();
 				const Point3 *vertex_array = mod_data->Peek_Orig_Vertex_Array ();
 				Point3 *opstart_array = mod_data->Peek_Vertex_OPStart_Array ();
-			
+
 				// Loop through all the selected verts
 				for (int vert = 0; vert < mesh->numVerts; vert ++) {
-					if (mesh->vertSel[vert]) {										
-						
+					if (mesh->vertSel[vert]) {
+
 						// Do the 'displacment' in axis-space
 						Point3 vert_ws = parent_tm * mesh->verts[vert];
 						Point3 vert_as = Inverse (tm_axis) * vert_ws;
@@ -596,7 +596,7 @@ MeshDeformClass::Move
 						mesh->verts[vert] = Inverse (parent_tm) * vert_ws;
 
 						// Record the delta
-						//delta_array[vert] = mesh->verts[vert] - vertex_array[vert];					
+						//delta_array[vert] = mesh->verts[vert] - vertex_array[vert];
 					}
 				}
 
@@ -604,7 +604,7 @@ MeshDeformClass::Move
 				//	Record these changes in the current set
 				//
 				mod_data->Update_Set (m_CurrentSet, VERT_POSITION);
-			}			
+			}
 		}
 
 		// Remember what our last displacement was because we
@@ -643,18 +643,18 @@ MeshDeformClass::Scale
 
 		INodeTab nodes;
 		ModContextList mod_context_list;
-		m_MaxInterface->GetModContexts (mod_context_list, nodes);	
+		m_MaxInterface->GetModContexts (mod_context_list, nodes);
 
 		// Loop through all the modifier contexts
 		for (int index = 0; index < mod_context_list.Count (); index ++) {
 
 			// Get the data we've cached for this modifier context
-			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);		
+			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);
 			if (mod_data != NULL) {
 				Mesh *mesh = mod_data->Peek_Mesh ();
 				const Point3 *vertex_array = mod_data->Peek_Orig_Vertex_Array ();
 				Point3 *opstart_array = mod_data->Peek_Vertex_OPStart_Array ();
-			
+
 				// Loop through all the selected verts
 				for (int vert = 0; vert < mesh->numVerts; vert ++) {
 					if (mesh->vertSel[vert]) {
@@ -669,7 +669,7 @@ MeshDeformClass::Scale
 						mesh->verts[vert] = Inverse (parent_tm) * vert_ws;
 
 						// Record the delta
-						//delta_array[vert] = mesh->verts[vert] - vertex_array[vert];						
+						//delta_array[vert] = mesh->verts[vert] - vertex_array[vert];
 					}
 				}
 
@@ -677,7 +677,7 @@ MeshDeformClass::Scale
 				//	Record these changes in the current set
 				//
 				mod_data->Update_Set (m_CurrentSet, VERT_POSITION);
-			}			
+			}
 		}
 
 		// Remember what our last displacement was because we
@@ -714,7 +714,7 @@ MeshDeformClass::Rotate
 	if (m_pPanel->Is_Edit_Mode ()) {
 		INodeTab nodes;
 		ModContextList mod_context_list;
-		m_MaxInterface->GetModContexts (mod_context_list, nodes);	
+		m_MaxInterface->GetModContexts (mod_context_list, nodes);
 
 		Matrix3 matrix_rot;
 		rotation.MakeMatrix (matrix_rot);
@@ -726,27 +726,27 @@ MeshDeformClass::Rotate
 		for (int index = 0; index < mod_context_list.Count (); index ++) {
 
 			// Get the data we've cached for this modifier context
-			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);		
+			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);
 			if (mod_data != NULL) {
 				Mesh *mesh = mod_data->Peek_Mesh ();
 				const Point3 *vertex_array = mod_data->Peek_Orig_Vertex_Array ();
 				Point3 *opstart_array = mod_data->Peek_Vertex_OPStart_Array ();
-			
+
 				// Loop through all the selected verts
 				for (int vert = 0; vert < mesh->numVerts; vert ++) {
-					if (mesh->vertSel[vert]) {										
-						
+					if (mesh->vertSel[vert]) {
+
 						// Do the 'displacment' in axis-space
 						Point3 vert_ws = parent_tm * mesh->verts[vert];
 						Point3 vert_as = Inverse (tm_axis) * vert_ws;
-						vert_as = (rel_rot * vert_as);					
+						vert_as = (rel_rot * vert_as);
 
 						// Convert back to obj-space
 						vert_ws = tm_axis * vert_as;
 						mesh->verts[vert] = Inverse (parent_tm) * vert_ws;
 
 						// Record the delta
-						//delta_array[vert] = mesh->verts[vert] - vertex_array[vert];					
+						//delta_array[vert] = mesh->verts[vert] - vertex_array[vert];
 					}
 				}
 
@@ -787,7 +787,7 @@ MeshDeformClass::TransformStart (TimeValue time_val)
 	if (m_MaxInterface != NULL) {
 		m_MaxInterface->LockAxisTripods (TRUE);
 	}
-	
+
 	// Reset our last-delta value
 	last_delta.x = 0;
 	last_delta.y = 0;
@@ -799,20 +799,20 @@ MeshDeformClass::TransformStart (TimeValue time_val)
 
 	INodeTab nodes;
 	ModContextList mod_context_list;
-	m_MaxInterface->GetModContexts (mod_context_list, nodes);	
+	m_MaxInterface->GetModContexts (mod_context_list, nodes);
 
 	// Begin the undo operation
-	theHold.Begin ();	
+	theHold.Begin ();
 
 	// Loop through all the modifier contexts
 	for (int index = 0; index < mod_context_list.Count (); index ++) {
 
 		// Get the data we've cached for this modifier context
-		MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);		
+		MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);
 		if (mod_data != NULL) {
 			Mesh *mesh = mod_data->Peek_Mesh ();
 			Point3 *opstart_array = mod_data->Peek_Vertex_OPStart_Array ();
-		
+
 			// Copy the current state of the mesh
 			for (int vert = 0; vert < mesh->numVerts; vert ++) {
 				opstart_array[vert] = mesh->verts[vert];
@@ -875,14 +875,14 @@ void
 MeshDeformClass::Set_Deform_State (float state)
 {
 	if ((m_MaxInterface != NULL) && (state != m_DeformState)) {
-		m_DeformState = state;	
+		m_DeformState = state;
 		NotifyDependents (FOREVER, PART_GEOM | PART_VERTCOLOR, REFMSG_CHANGE);
 		m_MaxInterface->RedrawViews (m_MaxInterface->GetTime ());
 		if (m_pPanel != NULL) {
 			m_pPanel->Update_Vertex_Color ();
 		}
 	}
-	
+
 	return ;
 }
 
@@ -896,10 +896,10 @@ void
 MeshDeformClass::Set_Vertex_Color (const Point3 &color, bool button_up)
 {
 	if (m_MaxInterface != NULL) {
-		
+
 		INodeTab nodes;
 		ModContextList mod_context_list;
-		m_MaxInterface->GetModContexts (mod_context_list, nodes);	
+		m_MaxInterface->GetModContexts (mod_context_list, nodes);
 
 		bool save_undo = false;
 		if ((button_up == false) && (m_VertColorChanging == false)) {
@@ -912,15 +912,15 @@ MeshDeformClass::Set_Vertex_Color (const Point3 &color, bool button_up)
 		for (int index = 0; index < mod_context_list.Count (); index ++) {
 
 			// Get the data we've cached for this modifier context
-			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);		
+			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);
 			if (mod_data != NULL) {
 				Mesh *mesh = mod_data->Peek_Mesh ();
 
 				//
 				//	Record the original color in the undo stack
-				//				
+				//
 				if (save_undo) {
-					theHold.Put (new VertexColorRestoreClass (mesh, this, mod_data));					
+					theHold.Put (new VertexColorRestoreClass (mesh, this, mod_data));
 				}
 
 				// Only do this if the mesh is using vertex coloring
@@ -931,7 +931,7 @@ MeshDeformClass::Set_Vertex_Color (const Point3 &color, bool button_up)
 					//
 					for (int face = 0; face < mesh->numFaces; face ++) {
 						for (int vert = 0; vert < 3; vert ++) {
-												
+
 							//
 							//	If the vertex is selected, then change its color
 							//
@@ -951,7 +951,7 @@ MeshDeformClass::Set_Vertex_Color (const Point3 &color, bool button_up)
 		}
 
 		if (button_up && m_VertColorChanging) {
-			theHold.Accept ("Vertex Color");			
+			theHold.Accept ("Vertex Color");
 		}
 
 		// Repaint the model
@@ -960,7 +960,7 @@ MeshDeformClass::Set_Vertex_Color (const Point3 &color, bool button_up)
 		m_MaxInterface->RedrawViews (m_MaxInterface->GetTime ());
 	}
 
-	m_VertColorChanging = !button_up;	
+	m_VertColorChanging = !button_up;
 	return ;
 }
 
@@ -979,10 +979,10 @@ MeshDeformClass::Get_Vertex_Color (Point3 &color)
 	color.z = 0;
 
 	if (m_MaxInterface != NULL) {
-		
+
 		INodeTab nodes;
 		ModContextList mod_context_list;
-		m_MaxInterface->GetModContexts (mod_context_list, nodes);	
+		m_MaxInterface->GetModContexts (mod_context_list, nodes);
 
 		//
 		// Loop through all the modifier contexts
@@ -993,7 +993,7 @@ MeshDeformClass::Get_Vertex_Color (Point3 &color)
 			//
 			// Get the data we've cached for this modifier context
 			//
-			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);		
+			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);
 			if (mod_data != NULL) {
 				Mesh *mesh = mod_data->Peek_Mesh ();
 
@@ -1030,7 +1030,7 @@ MeshDeformClass::Get_Vertex_Color (Point3 &color)
 
 		nodes.DisposeTemporary ();
 	}
-	
+
 	return ;
 }
 
@@ -1071,19 +1071,19 @@ void
 MeshDeformClass::Auto_Apply (bool auto_apply)
 {
 	if (m_MaxInterface != NULL) {
-		
+
 		// Get a list of contexts that we are part of.
 		INodeTab nodes;
 		ModContextList mod_context_list;
-		m_MaxInterface->GetModContexts (mod_context_list, nodes);	
+		m_MaxInterface->GetModContexts (mod_context_list, nodes);
 
-		// Loop through all the modifier contexts		
+		// Loop through all the modifier contexts
 		for (int index = 0; index < mod_context_list.Count (); index ++) {
 
 			//
 			//	Let the mod context know what it's auto apply state is
 			//
-			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);		
+			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);
 			if (mod_data != NULL) {
 				mod_data->Auto_Apply (auto_apply);
 			}
@@ -1104,7 +1104,7 @@ MeshDeformClass::Auto_Apply (bool auto_apply)
 ///////////////////////////////////////////////////////////////////////////
 void
 MeshDeformClass::Set_Max_Deform_Sets (int max)
-{	
+{
 	//
 	//	Make sure the current set doesn't exceed the total sets
 	//
@@ -1114,19 +1114,19 @@ MeshDeformClass::Set_Max_Deform_Sets (int max)
 
 	m_MaxSets = max;
 	if (m_MaxInterface != NULL) {
-		
+
 		// Get a list of contexts that we are part of.
 		INodeTab nodes;
 		ModContextList mod_context_list;
-		m_MaxInterface->GetModContexts (mod_context_list, nodes);	
+		m_MaxInterface->GetModContexts (mod_context_list, nodes);
 
-		// Loop through all the modifier contexts		
+		// Loop through all the modifier contexts
 		for (int index = 0; index < mod_context_list.Count (); index ++) {
 
 			//
 			//	Let the mod context know the max sets have changed
 			//
-			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);		
+			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);
 			if (mod_data != NULL) {
 				mod_data->Set_Max_Deform_Sets (max);
 			}
@@ -1149,22 +1149,22 @@ MeshDeformClass::Set_Max_Deform_Sets (int max)
 ///////////////////////////////////////////////////////////////////////////
 void
 MeshDeformClass::Update_Set_Count (void)
-{	
+{
 	m_MaxSets = 1;
-	if (m_MaxInterface != NULL) {		
-		
+	if (m_MaxInterface != NULL) {
+
 		// Get a list of contexts that we are part of.
 		INodeTab nodes;
 		ModContextList mod_context_list;
-		m_MaxInterface->GetModContexts (mod_context_list, nodes);	
+		m_MaxInterface->GetModContexts (mod_context_list, nodes);
 
-		// Loop through all the modifier contexts		
+		// Loop through all the modifier contexts
 		for (int index = 0; index < mod_context_list.Count (); index ++) {
 
 			//
 			//	Get the count of sets for this context
 			//
-			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);		
+			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);
 			if ((mod_data != NULL) && (mod_data->Get_Set_Count () > m_MaxSets)) {
 				m_MaxSets = mod_data->Get_Set_Count ();
 			}
@@ -1203,15 +1203,15 @@ MeshDeformClass::Set_Current_Set
 		// Get a list of contexts that we are part of.
 		INodeTab nodes;
 		ModContextList mod_context_list;
-		m_MaxInterface->GetModContexts (mod_context_list, nodes);	
+		m_MaxInterface->GetModContexts (mod_context_list, nodes);
 
-		// Loop through all the modifier contexts		
+		// Loop through all the modifier contexts
 		for (int index = 0; index < mod_context_list.Count (); index ++) {
 
 			//
 			//	Have the mod context select the verts in its set
 			//
-			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);		
+			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);
 			if (mod_data != NULL) {
 				mod_data->Set_Current_Set (m_CurrentSet);
 				if (update_selection) {
@@ -1229,9 +1229,9 @@ MeshDeformClass::Set_Current_Set
 		}
 
 		// Update the current 'vertex color' on the UI panel
-		m_pPanel->Update_Vertex_Color ();		
+		m_pPanel->Update_Vertex_Color ();
 	}
-	
+
 	return ;
 }
 
@@ -1249,7 +1249,7 @@ MeshDeformClass::Update_Current_Set (void)
 		// Get a list of contexts that we are part of.
 		INodeTab nodes;
 		ModContextList mod_context_list;
-		m_MaxInterface->GetModContexts (mod_context_list, nodes);	
+		m_MaxInterface->GetModContexts (mod_context_list, nodes);
 
 		// Loop through all the modifier contexts
 		for (int index = 0; index < mod_context_list.Count (); index ++) {
@@ -1258,7 +1258,7 @@ MeshDeformClass::Update_Current_Set (void)
 			//	Notify the mod context so it can update its list of verts
 			// in the current set.
 			//
-			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);		
+			MeshDeformModData *mod_data = static_cast <MeshDeformModData *> (mod_context_list[index]->localData);
 			if (mod_data != NULL) {
 				//mod_data->Update_Set (m_CurrentSet);
 			}
@@ -1268,7 +1268,7 @@ MeshDeformClass::Update_Current_Set (void)
 		nodes.DisposeTemporary ();
 		m_bSetDirty = false;
 	}
-	
+
 	return ;
 }
 
@@ -1314,17 +1314,17 @@ void SkinModifierClass::SelectAll(int selLevel)
 	ModContextList mclist;
 	INodeTab nodes;
 
-	if (!InterfacePtr) return;	
-	
+	if (!InterfacePtr) return;
+
 	InterfacePtr->GetModContexts(mclist,nodes);
 	InterfacePtr->ClearCurNamedSelSet();
 
 	for (int i = 0; i < mclist.Count(); i++) {
 
 		SkinDataClass * skindata = (SkinDataClass *)mclist[i]->localData;
-		
-		if (skindata==NULL) continue;		
-		
+
+		if (skindata==NULL) continue;
+
 		ObjectState os = nodes[i]->EvalWorldState(InterfacePtr->GetTime());
 		TriObject * tobj = Get_Tri_Object(InterfacePtr->GetTime(),os,valid,needsdel);
 
@@ -1334,7 +1334,7 @@ void SkinModifierClass::SelectAll(int selLevel)
 				assert(0);
 				return;
 
-			case VERTEX_SEL_LEVEL:	
+			case VERTEX_SEL_LEVEL:
 #if 0 // undo/redo
 				if (theHold.Holding()) {
 					theHold.Put(new VertexSelRestore(meshData,this));
@@ -1349,7 +1349,7 @@ void SkinModifierClass::SelectAll(int selLevel)
 			tobj->DeleteThis();
 		}
 	}
-	
+
 	/*
 	** Get rid of the temporary copies of the INodes.
 	*/
@@ -1368,17 +1368,17 @@ void SkinModifierClass::InvertSelection(int selLevel)
 	ModContextList mclist;
 	INodeTab nodes;
 
-	if (!InterfacePtr) return;	
-	
+	if (!InterfacePtr) return;
+
 	InterfacePtr->GetModContexts(mclist,nodes);
 	InterfacePtr->ClearCurNamedSelSet();
 
 	for (int i = 0; i < mclist.Count(); i++) {
 
 		SkinDataClass * skindata = (SkinDataClass *)mclist[i]->localData;
-		
-		if (skindata==NULL) continue;		
-		
+
+		if (skindata==NULL) continue;
+
 		ObjectState os = nodes[i]->EvalWorldState(InterfacePtr->GetTime());
 		TriObject * tobj = Get_Tri_Object(InterfacePtr->GetTime(),os,valid,needsdel);
 
@@ -1388,7 +1388,7 @@ void SkinModifierClass::InvertSelection(int selLevel)
 				assert(0);
 				return;
 
-			case VERTEX_SEL_LEVEL:	
+			case VERTEX_SEL_LEVEL:
 #if 0 // undo/redo
 				if (theHold.Holding()) {
 					theHold.Put(new VertexSelRestore(meshData,this));
@@ -1397,7 +1397,7 @@ void SkinModifierClass::InvertSelection(int selLevel)
 				for (int j=0; j<tobj->mesh.vertSel.GetSize(); j++) {
 					if (tobj->mesh.vertSel[j]) tobj->mesh.vertSel.Clear(j);
 					else tobj->mesh.vertSel.Set(j);
-				}				
+				}
 				skindata->VertSel = tobj->mesh.vertSel;
 				break;
 		}
@@ -1406,7 +1406,7 @@ void SkinModifierClass::InvertSelection(int selLevel)
 			tobj->DeleteThis();
 		}
 	}
-	
+
 	/*
 	** Get rid of the temporary copies of the INodes.
 	*/
@@ -1429,7 +1429,7 @@ int MeshDeformClass::NumSubObjTypes()
 	return 1;
 }
 ////////////////////////////////////////////////////////////////////////////////////////
-ISubObjType *MeshDeformClass::GetSubObjType(int i) 
+ISubObjType *MeshDeformClass::GetSubObjType(int i)
 {
 	static bool _initialized = false;
 	if(!_initialized){
@@ -1443,4 +1443,4 @@ ISubObjType *MeshDeformClass::GetSubObjType(int i)
 	}
 	return &_SubObjectTypeVertex;
 }
-#endif 
+#endif
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeform.h b/Core/Tools/WW3D/max2w3d/MeshDeform.h
index 7c609c7c958..45ea857f2cc 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeform.h
+++ b/Core/Tools/WW3D/max2w3d/MeshDeform.h
@@ -17,30 +17,28 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/MeshDeform.h 6     4/24/01 6:02p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeform.H                                                 * 
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 04/19/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeform.h                                                 *
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 04/19/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef __MESH_DEFORM_H
-#define __MESH_DEFORM_H
+#pragma once
 
 #include <max.h>
-#include "Vector.H"
+#include "Vector.h"
 
 // Forward declarations
 class MeshDeformPanelClass;
@@ -64,7 +62,7 @@ extern Class_ID _MeshDeformClassID;
 class MeshDeformClass : public OSModifier
 {
 	public:
-		
+
 		//////////////////////////////////////////////////////////////////////
 		//	Public constructors/destructors
 		//////////////////////////////////////////////////////////////////////
@@ -113,12 +111,12 @@ class MeshDeformClass : public OSModifier
 		void							DeleteThis (void) { delete this; }
 		void							GetClassName (TSTR& s) { s = TSTR(_T("WWDeform")); }
 		TCHAR *						GetObjectName (void) { return _T("WWDamage"); }
-		SClass_ID					SuperClassID (void) { return OSM_CLASS_ID; }		
+		SClass_ID					SuperClassID (void) { return OSM_CLASS_ID; }
 		Class_ID						ClassID (void) { return _MeshDeformClassID; }
 		//RefTargetHandle			Clone(RemapDir& remap = NoRemap());
 		void							BeginEditParams (IObjParam  *ip, ULONG flags,Animatable *prev);
 		void							EndEditParams (IObjParam *ip, ULONG flags,Animatable *next);
-		
+
 		//////////////////////////////////////////////////////////////////////
 		// From Modifier
 		//////////////////////////////////////////////////////////////////////
@@ -156,7 +154,7 @@ class MeshDeformClass : public OSModifier
 
 		void							TransformStart (TimeValue time_val);
 		void							TransformFinish (TimeValue time_val);
-		void							TransformCancel (TimeValue time_val);		
+		void							TransformCancel (TimeValue time_val);
 #if defined W3D_MAX4		//defined as in the project (.dsp)
 		ISubObjType *				GetSubObjType(int i) ;
 #endif
@@ -168,12 +166,12 @@ class MeshDeformClass : public OSModifier
 		//////////////////////////////////////////////////////////////////////
 		void							Update_Current_Set (void);
 		void							Update_Set_Count (void);
-		
+
 	private:
 
 		//////////////////////////////////////////////////////////////////////
 		//	Private member data
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		IObjParam *					m_MaxInterface;
 		HWND							m_hRollupWnd;
 		MeshDeformPanelClass *	m_pPanel;
@@ -196,6 +194,3 @@ class MeshDeformClass : public OSModifier
 		// Information
 		CStr							m_OperationName;
 };
-
-
-#endif //__MESH_DEFORM_H
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformData.cpp b/Core/Tools/WW3D/max2w3d/MeshDeformData.cpp
index e5900b2b702..bc216bff21f 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformData.cpp
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformData.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformData.cpp                                           * 
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 04/26/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformData.cpp                                           *
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 04/26/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -114,7 +114,7 @@ MeshDeformModData::Set_Max_Deform_Sets (int max)
 {
 	int current_max = m_SetsList.Count ();
 	if (max > current_max) {
-		
+
 		//
 		//	Add the new sets to the list
 		//
@@ -125,13 +125,13 @@ MeshDeformModData::Set_Max_Deform_Sets (int max)
 		}
 
 	} else if (max < current_max) {
-		
+
 		//
 		//	Remove the obsolete sets from the list
 		//
 		int sets_to_remove = current_max - max;
 		for (int index = 0; index < sets_to_remove; index ++) {
-			
+
 			// Restore the set before we delete it
 			Restore_Set (max);
 
@@ -159,12 +159,12 @@ MeshDeformModData::Restore_Set (int set_index)
 		// Restore ALL the set
 		for (int index = 0; index < m_SetsList.Count (); index ++) {
 			m_SetsList[index]->Restore_Members ();
-		}			
+		}
 
 	} else {
 		m_SetsList[set_index]->Restore_Members ();
 	}
-	
+
 	return ;
 }
 
@@ -186,7 +186,7 @@ MeshDeformModData::Save (ISave *save_obj)
 	DeformChunk info = { 0 };
 	info.SetCount = m_SetsList.Count ();
 	IOResult result = save_obj->Write (&info, sizeof (info), &bytes);
-	
+
 	save_obj->EndChunk ();
 
 	//
@@ -195,7 +195,7 @@ MeshDeformModData::Save (ISave *save_obj)
 	for (int index = 0; (index < m_SetsList.Count ()) && (result == IO_OK); index ++) {
 		result = m_SetsList[index]->Save (save_obj);
 	}
-	
+
 	// Return IO_OK on success IO_ERROR on failure
 	return result;
 }
@@ -222,7 +222,7 @@ MeshDeformModData::Load (ILoad *load_obj)
 		DeformChunk info = { 0 };
 		result = load_obj->Read (&info, sizeof (info), &bytes);
 		load_obj->CloseChunk ();
-		
+
 		//
 		//	Read the set information from the chunk
 		//
@@ -230,8 +230,8 @@ MeshDeformModData::Load (ILoad *load_obj)
 			MeshDeformSetClass *set = new MeshDeformSetClass;
 			m_SetsList.Add (set);
 			result = set->Load (load_obj);
-		}		
-	}	
+		}
+	}
 
 	// Return IO_OK on success IO_ERROR on failure
 	return result;
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformData.h b/Core/Tools/WW3D/max2w3d/MeshDeformData.h
index 83cb801c79d..7e7170fe537 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformData.h
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformData.h
@@ -16,29 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformData.h                                             * 
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 04/26/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformData.h                                             *
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 04/26/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef __MESH_DEFORM_DATA_H
-#define __MESH_DEFORM_DATA_H
+#pragma once
 
 #include <max.h>
-#include "Vector.H"
+#include "Vector.h"
 #include "MeshDeformSet.h"
 
 
@@ -69,10 +68,10 @@ class MeshDeformModData : public LocalModData
 
 		//////////////////////////////////////////////////////////////////////
 		//	Public methods
-		//////////////////////////////////////////////////////////////////////			
+		//////////////////////////////////////////////////////////////////////
 		virtual LocalModData *	Clone (void)	{ return new MeshDeformModData; }
 		void							Record_Mesh_State (TriObject &tri_obj, float state, bool update_all);
-		
+
 		//	Inline accessors
 		Mesh *					Peek_Mesh (void) const						{ return m_SetsList[m_CurrentSet]->Peek_Mesh (); }
 		const Point3 *			Peek_Orig_Vertex_Array (void) const		{ return m_SetsList[m_CurrentSet]->Peek_Orig_Vertex_Array (); }
@@ -106,7 +105,7 @@ class MeshDeformModData : public LocalModData
 
 		//////////////////////////////////////////////////////////////////////
 		//	Protected methods
-		//////////////////////////////////////////////////////////////////////			
+		//////////////////////////////////////////////////////////////////////
 		void						Resize_Vertex_Array (int count, int color_count);
 		void						Copy_Vertex_Array (Mesh &mesh);
 		void						Free_Sets_List (void);
@@ -116,13 +115,9 @@ class MeshDeformModData : public LocalModData
 
 		//////////////////////////////////////////////////////////////////////
 		//	Private member data
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 
 		// Set managment
 		int						m_CurrentSet;
 		SETS_LIST				m_SetsList;
 };
-
-
-#endif //__MESH_DEFORM_DATA_H
-
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h b/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h
index be339edda0f..51e130766f4 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h
@@ -16,29 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformDefs.h                                             * 
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 04/28/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformDefs.h                                             *
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 04/28/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef __MESH_DEFORM_DEFS_H
-#define __MESH_DEFORM_DEFS_H
+#pragma once
 
 #include <max.h>
-#include "Vector.H"
+#include "Vector.h"
 
 ///////////////////////////////////////////////////////////////////////////
 //
@@ -94,7 +93,3 @@ typedef struct _VERT_INFO
 //
 ///////////////////////////////////////////////////////////////////////////
 typedef DynamicVectorClass<VERT_INFO> DEFORM_LIST;
-
-
-#endif //__MESH_DEFORM_DEFS_H
-
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformPanel.cpp b/Core/Tools/WW3D/max2w3d/MeshDeformPanel.cpp
index 7e3f0d55f99..e4cb34b7bda 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformPanel.cpp
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformPanel.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformPanel.cpp                                          * 
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 04/22/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformPanel.cpp                                          *
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 04/22/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -63,7 +63,7 @@ MeshDeformPanelClass::Message_Proc
 )
 {
 	// Lookup the controlling object for this panel
-	MeshDeformPanelClass *panel_obj = MeshDeformPanelClass::Get_Object (hwnd);	
+	MeshDeformPanelClass *panel_obj = MeshDeformPanelClass::Get_Object (hwnd);
 	BOOL result = FALSE;
 
 	switch (message)
@@ -98,7 +98,7 @@ MeshDeformPanelClass::Message_Proc
 ///////////////////////////////////////////////////////////////////////////
 MeshDeformPanelClass *
 MeshDeformPanelClass::Get_Object (HWND hwnd)
-{	
+{
 	return (MeshDeformPanelClass *)::GetProp (hwnd, PANEL_OBJ_PROP);
 }
 
@@ -122,7 +122,7 @@ MeshDeformPanelClass::On_Message
 			m_pColorSwatch		= ::GetIColorSwatch (::GetDlgItem (m_hWnd, IDC_VERTEX_COLOR), RGB (0, 0, 0), "Vertex Color");
 			m_pMaxSetsEdit		= ::GetICustEdit (::GetDlgItem (m_hWnd, IDC_MAX_SETS_EDIT));
 			m_pMaxSetsSpin		= ::GetISpinner (::GetDlgItem (m_hWnd, IDC_MAX_SETS_SPIN));
-			m_pLockSetsButton = ::GetICustButton (::GetDlgItem (m_hWnd, IDC_LOCK_SETS));		
+			m_pLockSetsButton = ::GetICustButton (::GetDlgItem (m_hWnd, IDC_LOCK_SETS));
 
 			//
 			//	Setup the 'max-sets' controls
@@ -268,7 +268,7 @@ MeshDeformPanelClass::Set_Deformer (MeshDeformClass *obj)
 		// Set the slider position based on the current state of the deformer
 		float state = m_pMeshDeformer->Get_Deform_State ();
 		::SendDlgItemMessage (m_hWnd, IDC_STATE_SLIDER, TBM_SETPOS, (WPARAM)TRUE, LPARAM(state * 10.0F));
-		
+
 		// Now update the current vertex color
 		Update_Vertex_Color ();
 	}
@@ -310,17 +310,17 @@ MeshDeformPanelClass::Set_Max_Sets
 )
 {
 	// Update the UI
-	::SendDlgItemMessage (m_hWnd, IDC_CURRENT_SET_SLIDER, TBM_SETRANGE, (WPARAM)TRUE, MAKELONG (1, max));	
+	::SendDlgItemMessage (m_hWnd, IDC_CURRENT_SET_SLIDER, TBM_SETRANGE, (WPARAM)TRUE, MAKELONG (1, max));
 	::SetDlgItemInt (m_hWnd, IDC_CURRENT_SET_STATIC, max, TRUE);
 
 	if (notify == false) {
 		m_pMaxSetsSpin->SetValue (max, TRUE);
 	} else if (m_pMeshDeformer != NULL) {
-		
+
 		// Update the deformer
 		m_pMeshDeformer->Set_Max_Deform_Sets (max);
 	}
-		
+
 	return ;
 }
 
@@ -337,17 +337,17 @@ MeshDeformPanelClass::Set_Current_Set
 	bool notify
 )
 {
-	// Update the UI	
+	// Update the UI
 	::SetDlgItemInt (m_hWnd, IDC_CURRENT_SET_STATIC, set + 1, TRUE);
 
 	if (notify == false) {
 		::SendDlgItemMessage (m_hWnd, IDC_CURRENT_SET_SLIDER, TBM_SETPOS, (WPARAM)TRUE, set + 1);
 	} else if (m_pMeshDeformer != NULL) {
-		
+
 		// Update the deformer
 		m_pMeshDeformer->Set_Current_Set (set, true);
 	}
-	
+
 	return ;
 }
 
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h b/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h
index c7da37ec6dd..36322e413da 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h
@@ -16,27 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformPanel.H                                            * 
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 04/22/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformPanel.h                                            *
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 04/22/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef __MESH_DEFORM_PANEL_H
-#define __MESH_DEFORM_PANEL_H
+#pragma once
 
 #include <max.h>
 #include "resource.h"
@@ -52,7 +50,7 @@ class MeshDeformClass;
 class MeshDeformPanelClass
 {
 	public:
-		
+
 		//////////////////////////////////////////////////////////////////////
 		//	Public constructors/destructors
 		//////////////////////////////////////////////////////////////////////
@@ -67,7 +65,7 @@ class MeshDeformPanelClass
 
 		//////////////////////////////////////////////////////////////////////
 		// Public methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 
 		// Inline accessors
 		IColorSwatch *				Get_Color_Swatch (void) const			{ return m_pColorSwatch; }
@@ -96,10 +94,10 @@ class MeshDeformPanelClass
 
 		//////////////////////////////////////////////////////////////////////
 		// Protected methods
-		//////////////////////////////////////////////////////////////////////		
+		//////////////////////////////////////////////////////////////////////
 		BOOL							On_Message (UINT message, WPARAM wparam, LPARAM lparam);
 		void							On_Command (WPARAM wparam, LPARAM lparam);
-	
+
 	private:
 
 		//////////////////////////////////////////////////////////////////////
@@ -112,6 +110,3 @@ class MeshDeformPanelClass
 		ICustButton *				m_pLockSetsButton;
 		MeshDeformClass *			m_pMeshDeformer;
 };
-
-
-#endif //__MESH_DEFORM_PANEL_H
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSave.cpp b/Core/Tools/WW3D/max2w3d/MeshDeformSave.cpp
index eb531ee82b7..20746a95e9a 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformSave.cpp
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformSave.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/MeshDeformSave.cpp 6     11/12/99 11:12a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformSafe.CPP
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 05/28/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformSafe.cpp
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 05/28/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "MeshDeform.h"
@@ -53,7 +53,7 @@
 void
 MeshDeformSaveClass::Initialize
 (
-	MeshBuilderClass &builder, 
+	MeshBuilderClass &builder,
 	Object *				object,
 	Mesh &				mesh,
 	Matrix3 *			transform
@@ -69,7 +69,7 @@ MeshDeformSaveClass::Initialize
 	int test2 = GEN_DERIVOB_CLASS_ID;
 	if ((object != NULL) &&
 		 (object->SuperClassID () == GEN_DERIVOB_CLASS_ID)) {
-		
+
 		//
 		//	Loop through all the modifiers and see if we can find the
 		// Westwood Damage Mesh modifier.
@@ -78,19 +78,19 @@ MeshDeformSaveClass::Initialize
 		int modifier_count = derived_object->NumModifiers ();
 		bool found = false;
 		for (int index = 0; (index < modifier_count) && !found; index ++) {
-			
+
 			//
 			//	If this is the right modifier, then initialize using the
 			//	data it contains.
 			//
 			Modifier *modifier = derived_object->GetModifier (index);
 			if ((modifier != NULL) && (modifier->ClassID () == _MeshDeformClassID)) {
-				
+
 				//
 				//	Attempt to get at the modifier data for this context
 				//
 				ModContext *mod_context = derived_object->GetModContext (index);
-				if ((mod_context != NULL) && (mod_context->localData != NULL)) {					
+				if ((mod_context != NULL) && (mod_context->localData != NULL)) {
 					MeshDeformModData *mod_data = static_cast<MeshDeformModData *> (mod_context->localData);
 					Initialize (builder, mesh, *mod_data, transform);
 				}
@@ -123,7 +123,7 @@ MeshDeformSaveClass::Initialize
 	//	Loop through all the sets in the modifier
 	//
 	for (int index = 0; index < mod_data.Get_Set_Count (); index ++) {
-		
+
 		//
 		//	If this set isn't empty then add its data to our list
 		//
@@ -172,7 +172,7 @@ bool
 MeshDeformSaveClass::Export (ChunkSaveClass &chunk_save)
 {
 	bool retval = true;
-	
+
 	if (m_DeformSets.Count() > 0) {
 
 		retval = chunk_save.Begin_Chunk (W3D_CHUNK_DEFORM);
@@ -192,9 +192,9 @@ MeshDeformSaveClass::Export (ChunkSaveClass &chunk_save)
 				//
 				retval &= Export_Sets (chunk_save);
 			}
-			
+
 			retval &= chunk_save.End_Chunk ();
-		}				
+		}
 	}
 
 	// Return the true/false result code
@@ -211,14 +211,14 @@ bool
 MeshDeformSaveClass::Export_Sets (ChunkSaveClass &chunk_save)
 {
 	bool retval = true;
-		
+
 	//
 	//	Loop through all the sets and write them to the file
-	//	
+	//
 	for (int set_index = 0; (set_index < m_DeformSets.Count ()) && retval; set_index ++) {
 		retval &= chunk_save.Begin_Chunk (W3D_CHUNK_DEFORM_SET);
 		if (retval) {
-			
+
 			//
 			//	Write a chunk of information out for this set
 			//
@@ -228,7 +228,7 @@ MeshDeformSaveClass::Export_Sets (ChunkSaveClass &chunk_save)
 			set_info.flags = set_save->Get_Flags ();
 			retval &= (chunk_save.Write (&set_info, sizeof (set_info)) == sizeof (set_info));
 			if (retval) {
-				
+
 				//
 				//	Export all the keyframes for this chunk
 				//
@@ -257,12 +257,12 @@ MeshDeformSaveClass::Export_Keyframes
 )
 {
 	bool retval = true;
-		
+
 	//
 	//	Loop through all the keyframes in the set
 	//
 	int count = set_save.Get_Keyframe_Count ();
-	for (int keyframe_index = 0; (keyframe_index < count) && retval; keyframe_index ++) {					
+	for (int keyframe_index = 0; (keyframe_index < count) && retval; keyframe_index ++) {
 
 		//
 		//	Write a chunk of information out for this keyframe
@@ -272,17 +272,17 @@ MeshDeformSaveClass::Export_Keyframes
 			W3dDeformKeyframeInfo keyframe_info = { 0 };
 			keyframe_info.DeformPercent	= set_save.Get_Deform_State (keyframe_index);
 			keyframe_info.DataCount			= set_save.Get_Deform_Data_Count (keyframe_index);
-			
+
 			retval &= (chunk_save.Write (&keyframe_info, sizeof (keyframe_info)) == sizeof (keyframe_info));
 			if (retval) {
-				
+
 				//
 				//	Loop through all the verticies in this keyframe
 				//
 				int data_count = set_save.Get_Deform_Data_Count (keyframe_index);
 				for (int index = 0; (index < data_count) && retval; index ++) {
 					MeshDeformSaveSetClass::DEFORM_DATA &data = set_save.Get_Deform_Data (keyframe_index, index);
-					
+
 					//
 					//	Write a chunk of information out for this vertex
 					//
@@ -296,7 +296,7 @@ MeshDeformSaveClass::Export_Keyframes
 						data_struct.Color.R		= data.color.x * 255;
 						data_struct.Color.G		= data.color.y * 255;
 						data_struct.Color.B		= data.color.z * 255;
-						
+
 						// If we are using vertex alpha instead of vertex color, then convert
 						// the v-color into an alpha setting
 						data_struct.Color.A		= 255;
@@ -304,14 +304,14 @@ MeshDeformSaveClass::Export_Keyframes
 							data_struct.Color.A	= (data_struct.Color.R + data_struct.Color.G + data_struct.Color.B) / 3.0F;
 						}
 
-						retval &= (chunk_save.Write (&data_struct, sizeof (data_struct)) == sizeof (data_struct));						
+						retval &= (chunk_save.Write (&data_struct, sizeof (data_struct)) == sizeof (data_struct));
 						retval &= chunk_save.End_Chunk ();
 					}
 				}
 			}
 
 			retval &= chunk_save.End_Chunk ();
-		}		
+		}
 	}
 
 	// Return the true/false result code
@@ -349,7 +349,7 @@ MeshDeformSaveClass::Re_Index (MeshBuilderClass &builder)
 				//bool found = false;
 				for (int vert_index = 0; vert_index < builder.Get_Vertex_Count (); vert_index++) {
 					MeshBuilderClass::VertClass &vert = builder.Get_Vertex (vert_index);
-					
+
 					//
 					//	Reindex this vertex if its the one we are looking for.
 					//
@@ -383,20 +383,20 @@ MeshDeformSaveClass::Does_Deformer_Modify_DCG (void)
 
 	//
 	//	Loop through all the sets
-	//	
+	//
 	for (int set_index = 0; (set_index < m_DeformSets.Count ()) && !retval; set_index ++) {
 		MeshDeformSaveSetClass *set_save = m_DeformSets[set_index];
 		if (set_save) {
 
 			//
 			//	Loop through all the keyframes in this set
-			//	
+			//
 			int count = set_save->Get_Keyframe_Count ();
-			for (int keyframe_index = 0; (keyframe_index < count) && !retval; keyframe_index ++) {					
+			for (int keyframe_index = 0; (keyframe_index < count) && !retval; keyframe_index ++) {
 
 				//
 				//	Loop through all the entries in this keyframe
-				//	
+				//
 				int data_count = set_save->Get_Deform_Data_Count (keyframe_index);
 				for (int index = 0; (index < data_count) && !retval; index ++) {
 					MeshDeformSaveSetClass::DEFORM_DATA &data = set_save->Get_Deform_Data (keyframe_index, index);
@@ -411,7 +411,7 @@ MeshDeformSaveClass::Does_Deformer_Modify_DCG (void)
 						retval = true;
 					}
 				}
-			}	
+			}
 		}
 	}
 
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSave.h b/Core/Tools/WW3D/max2w3d/MeshDeformSave.h
index 13af5c7dc57..e27ff6e08ea 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformSave.h
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformSave.h
@@ -17,29 +17,28 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/MeshDeformSave.h 4     7/07/99 11:52a Patrick $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformSafe.H                                              
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 05/28/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformSafe.h
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 05/28/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef __MESH_DEFORM_SAVE_H
-#define __MESH_DEFORM_SAVE_H
+#pragma once
 
 #include <max.h>
-#include "Vector.H"
+#include "Vector.h"
 
 // Forward declarations
 class ChunkSaveClass;
@@ -65,7 +64,7 @@ typedef DynamicVectorClass<MeshDeformSaveSetClass *> DEFORM_SAVE_LIST;
 class MeshDeformSaveClass
 {
 	public:
-		
+
 		//////////////////////////////////////////////////////////////////////
 		//	Public constructors/destructors
 		//////////////////////////////////////////////////////////////////////
@@ -91,7 +90,7 @@ class MeshDeformSaveClass
 		void					Set_Alpha_Passes (unsigned int pass_mask)	{ m_AlphaPasses = pass_mask; }
 
 	protected:
-		
+
 		//////////////////////////////////////////////////////////////////////
 		//	Protected methods
 		//////////////////////////////////////////////////////////////////////
@@ -106,5 +105,3 @@ class MeshDeformSaveClass
 		DEFORM_SAVE_LIST	m_DeformSets;
 		unsigned int		m_AlphaPasses;
 };
-
-#endif //__MESH_DEFORM_SAVE_H
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h b/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h
index e7be1603c30..2202b6b66b5 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformData.cpp                                           * 
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 06/07/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformData.cpp                                           *
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 06/07/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef __MESH_DEFORM_SAVE_DEFS_H
-#define __MESH_DEFORM_SAVE_DEFS_H
+#pragma once
 
 #include <max.h>
 
@@ -64,7 +63,7 @@ typedef enum
 //
 // Deform information.  Each mesh can have sets of keyframes of
 //	deform info associated with it.
-// 
+//
 struct DeformChunk
 {
 	uint32					SetCount;
@@ -74,9 +73,9 @@ struct DeformChunk
 //
 // Deform set information.  Each set is made up of a series
 // of keyframes.
-// 
+//
 struct DeformChunkSetInfo
-{	
+{
 	uint32					KeyframeCount;
 	uint32					flags;
 	uint32					NumVerticies;
@@ -89,7 +88,7 @@ struct DeformChunkSetInfo
 //
 // Deform keyframe information.  Each keyframe is made up of
 // a set of per-vert deform data.
-// 
+//
 struct DeformChunkKeyframeInfo
 {
 	float32					DeformPercent;
@@ -101,7 +100,7 @@ struct DeformChunkKeyframeInfo
 //
 // Deform data.  Contains deform information about a vertex
 // in the mesh.
-// 
+//
 struct DeformDataChunk
 {
 	uint32					VertexIndex;
@@ -109,6 +108,3 @@ struct DeformDataChunk
 	Point3					Value;
 	uint32					reserved[2];
 };
-
-
-#endif //__MESH_DEFORM_SAVE_DEFS_H
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.cpp b/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.cpp
index 48ae822099f..54f747c9884 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.cpp
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/MeshDeformSaveSet.cpp 2     6/16/99 6:56p Patrick $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformSaveSet.CPP
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 05/28/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformSaveSet.cpp
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 05/28/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "MeshDeformSaveSet.h"
@@ -120,7 +120,7 @@ MeshDeformSaveSetClass::Add_Vert
 		data.vert_index	= vert_index;
 		data.position		= position;
 		data.color			= color;
-		
+
 		//
 		//	Add this vertex information to the keyframe list
 		//
@@ -145,7 +145,7 @@ MeshDeformSaveSetClass::Replace_Deform_Data
 {
 	KEYFRAME *key_frame = m_DeformData[keyframe_index];
 	if (key_frame != NULL) {
-		
+
 		//
 		//	Replace the vertex deformation list for the keyframe
 		//
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h b/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h
index d1b9146b44c..13642bc8a07 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h
@@ -17,29 +17,28 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/MeshDeformSaveSet.h 2     6/16/99 6:56p Patrick $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformSaveSet.H                                              
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 05/28/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformSaveSet.h
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 05/28/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef __MESH_DEFORM_SAVE_SET_H
-#define __MESH_DEFORM_SAVE_SET_H
+#pragma once
 
 #include <max.h>
-#include "Vector.H"
+#include "Vector.h"
 
 // Forward declarations
 class ChunkSaveClass;
@@ -101,11 +100,11 @@ class MeshDeformSaveSetClass
 		//////////////////////////////////////////////////////////////////////
 		//	Public methods
 		//////////////////////////////////////////////////////////////////////
-		
+
 		// Keyframe managment
 		void					Begin_Keyframe (float state);
 		void					End_Keyframe (void);
-		
+
 		// Vertex managment
 		void					Add_Vert (UINT vert_index, const Point3 &position, const VertColor &color);
 
@@ -134,5 +133,3 @@ class MeshDeformSaveSetClass
 		KEYFRAME *									m_CurrentKeyFrame;
 		unsigned int								m_Flags;
 };
-
-#endif //__MESH_DEFORM_SAVE_SET_H
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSet.cpp b/Core/Tools/WW3D/max2w3d/MeshDeformSet.cpp
index a9bfb3aa622..44dc3a5ea2d 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformSet.cpp
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformSet.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformSet.cpp                                            * 
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 04/26/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformSet.cpp                                            *
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 04/26/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "MeshDeformSet.h"
@@ -155,10 +155,10 @@ MeshDeformSetClass::Update_Set_Members (void)
 	//	Examine each keyframe
 	//
 	m_SetMembers.ClearAll ();
-	for (int index = 0; index < m_KeyFrames.Count (); index ++) {		
+	for (int index = 0; index < m_KeyFrames.Count (); index ++) {
 		BitArray &affected_verts	= m_KeyFrames[index]->affected_verts;
 		BitArray &affected_colors	= m_KeyFrames[index]->affected_colors;
-		
+
 		//
 		//	Mark the verts that are affected by this keyframe
 		//
@@ -191,7 +191,7 @@ MeshDeformSetClass::Collapse_Keyframe_Data (int keyframe)
 	//
 	for (int index = 0; index < verticies.Count (); index ++) {
 		VERT_INFO &info = verticies[index];
-		
+
 		//
 		//	If this vertex is unchanged, then remove it
 		// from the list.
@@ -204,14 +204,14 @@ MeshDeformSetClass::Collapse_Keyframe_Data (int keyframe)
 			m_SetMembers.Set (info.index, 1);
 		}
 	}
-	
+
 
 	//
 	//	Collapse the vertex color data
 	//
 	for (index = 0; index < colors.Count (); index ++) {
 		VERT_INFO &info = colors[index];
-		
+
 		//
 		//	If this vertex is unchanged, then remove it
 		// from the list.
@@ -304,7 +304,7 @@ MeshDeformSetClass::Update_Current_Data (void)
 	//	Record the vertex position data
 	//
 	for (int index = 0; index < m_VertexCount; index ++) {
-		
+
 		// Is this vertex's position different than the undeformed mesh?
 		Point3 orig		= m_pVertexArray[index];
 		Point3 current	= m_pMesh->verts[index];
@@ -314,7 +314,7 @@ MeshDeformSetClass::Update_Current_Data (void)
 		if (	(orig.x != current.x) ||
 				(orig.y != current.y) ||
 				(orig.z != current.z)) {
-			
+
 			//
 			//	Record this vertex's position in our lists
 			//
@@ -325,7 +325,7 @@ MeshDeformSetClass::Update_Current_Data (void)
 
 	// Only do this if the mesh is using vertex coloring
 	if (m_pMesh->numCVerts >= m_pMesh->numVerts) {
-		
+
 		//
 		//	Record the vertex color data
 		//
@@ -372,7 +372,7 @@ MeshDeformSetClass::Update_Current_Data (void)
 ///////////////////////////////////////////////////////////////////////////
 void
 MeshDeformSetClass::Update_Key_Frame (int key_frame)
-{	
+{
 	DEFORM_LIST &verticies		= m_KeyFrames[key_frame]->verticies;
 	DEFORM_LIST &colors			= m_KeyFrames[key_frame]->colors;
 	BitArray &affected_verts	= m_KeyFrames[key_frame]->affected_verts;
@@ -420,7 +420,7 @@ MeshDeformSetClass::Update_Key_Frame (int key_frame)
 			}
 		}
 	}
-	
+
 	return ;
 }
 
@@ -432,7 +432,7 @@ MeshDeformSetClass::Update_Key_Frame (int key_frame)
 ///////////////////////////////////////////////////////////////////////////
 void
 MeshDeformSetClass::Init_Key_Frames (void)
-{	
+{
 	//
 	// For now, add all the key frames upfront
 	//
@@ -452,7 +452,7 @@ MeshDeformSetClass::Init_Key_Frames (void)
 ///////////////////////////////////////////////////////////////////////////
 void
 MeshDeformSetClass::Free_Key_Frames (void)
-{	
+{
 	//
 	// Loop through and free all the key frames
 	//
@@ -503,16 +503,16 @@ void
 MeshDeformSetClass::Resize_Vertex_Array (int count, int color_count)
 {
 	if (count != m_VertexCount) {
-		
+
 		// Allocate a new array of verticies
 		Point3 *vertex_array = new Point3[count];
-		Point3 *opstart_array = new Point3[count];		
-		
+		Point3 *opstart_array = new Point3[count];
+
 		// Delete the old vertex array and remember the new one
 		SAFE_DELETE (m_pVertexArray);
-		SAFE_DELETE (m_pVertexOPStartArray);		
+		SAFE_DELETE (m_pVertexOPStartArray);
 		m_pVertexArray = vertex_array;
-		m_pVertexOPStartArray = opstart_array;		
+		m_pVertexOPStartArray = opstart_array;
 		m_VertexCount = count;
 
 		//
@@ -521,7 +521,7 @@ MeshDeformSetClass::Resize_Vertex_Array (int count, int color_count)
 		for (int index = 0; index < m_KeyFrames.Count (); index ++) {
 			m_KeyFrames[index]->affected_verts.SetSize (count);
 			m_KeyFrames[index]->affected_colors.SetSize (count);
-			m_KeyFrames[index]->affected_verts.ClearAll ();			
+			m_KeyFrames[index]->affected_verts.ClearAll ();
 			m_KeyFrames[index]->affected_colors.ClearAll ();
 
 		}
@@ -530,8 +530,8 @@ MeshDeformSetClass::Resize_Vertex_Array (int count, int color_count)
 		m_SetMembers.ClearAll ();
 	}
 
-	if (color_count != m_VertexColorCount) {		
-		
+	if (color_count != m_VertexColorCount) {
+
 		// Recreate the color deltas
 		Point3 *color_array = new VertColor[color_count];
 		for (int index = 0; index < color_count; index ++) {
@@ -589,7 +589,7 @@ MeshDeformSetClass::Determine_Interpolation_Indicies
 	//
 	for (int index = 0; index <= key_frame; index ++) {
 		if (position && m_KeyFrames[index]->verticies.Count () > 0) {
-			from = index;			
+			from = index;
 		} else if (!position && m_KeyFrames[index]->colors.Count () > 0) {
 			from = index;
 		}
@@ -671,7 +671,7 @@ MeshDeformSetClass::Apply_Position_Changes
 			state = ((value - ((float)from)) / (float)(to - from));
 		}
 	}
-	
+
 	if (from != -1) {
 
 		//
@@ -683,7 +683,7 @@ MeshDeformSetClass::Apply_Position_Changes
 			VERT_INFO &info = vert_from[index];
 			if (info.index == vert) {
 				Point3 new_pos = info.value;
-				
+
 				// Transform the new position if necessary
 				if (transform != NULL) {
 					new_pos = new_pos * (*transform);
@@ -691,7 +691,7 @@ MeshDeformSetClass::Apply_Position_Changes
 
 				position = new_pos;
 			}
-		}				
+		}
 	}
 
 	if (to != -1) {
@@ -706,7 +706,7 @@ MeshDeformSetClass::Apply_Position_Changes
 			if (info.index == vert) {
 
 				Point3 new_pos = info.value;
-				
+
 				// Transform the new position if necessary
 				if (transform != NULL) {
 					new_pos = new_pos * (*transform);
@@ -715,7 +715,7 @@ MeshDeformSetClass::Apply_Position_Changes
 				position += state * (new_pos - position);
 				//m_pMesh->verts[vert] = position;
 			}
-		}					
+		}
 	}
 
 	return ;
@@ -769,7 +769,7 @@ MeshDeformSetClass::Apply_Color_Changes
 			state = ((value - ((float)from)) / (float)(to - from));
 		}
 	}
-	
+
 	if (from != -1) {
 
 		//
@@ -784,7 +784,7 @@ MeshDeformSetClass::Apply_Color_Changes
 				mesh.vertCol[info.color_index] = info.value;
 				m_pMesh->vertCol[info.color_index] = info.value;
 			}
-		}				
+		}
 	}
 
 	if (to != -1) {
@@ -851,7 +851,7 @@ MeshDeformSetClass::Apply_Color_Changes
 			state = ((value - ((float)from)) / (float)(to - from));
 		}
 	}
-	
+
 	if (from != -1) {
 
 		//
@@ -865,7 +865,7 @@ MeshDeformSetClass::Apply_Color_Changes
 				color = info.value;
 				break;
 			}
-		}				
+		}
 	}
 
 	if (to != -1) {
@@ -916,14 +916,14 @@ MeshDeformSetClass::Update_Mesh (TriObject &tri_obj)
 
 			// Is this vertex affected by any keyframe in the set?
 			if (m_SetMembers[vert]) {
-				
+
 				// Interpolate any changes to this vert
 				Apply_Position_Changes (vert, m_CurrentKeyFrame, tri_obj.mesh.verts[vert]);
 				m_pMesh->verts[vert] = tri_obj.mesh.verts[vert];
 				Apply_Color_Changes (vert, m_CurrentKeyFrame, tri_obj.mesh);
 			}
 		}
-		
+
 		//
 		//	Copy the vertex colors from the triangle object
 		//
@@ -949,22 +949,22 @@ MeshDeformSetClass::Update_Mesh (TriObject &tri_obj)
 			Determine_Interpolation_Indicies (key_frame, true, from, to, state);
 			DEFORM_LIST &vert_to = m_KeyFrames[to]->verticies;
 
-			if (from <= m_CurrentKeyFrame) {				
-								
+			if (from <= m_CurrentKeyFrame) {
+
 				if (from >= 0) {
-					DEFORM_LIST &vert_from = m_KeyFrames[from]->verticies;	
+					DEFORM_LIST &vert_from = m_KeyFrames[from]->verticies;
 					for (int index = 0; index < vert_from.Count (); index ++) {
 						VERT_INFO &info = vert_from[index];
 						tri_obj.mesh.verts[info.index] = info.value;
 					}
 				} else {
-					
+
 					for (int index = 0; index < vert_to.Count (); index ++) {
 						VERT_INFO &info = vert_to[index];
 						tri_obj.mesh.verts[info.index] = m_pVertexArray[info.index];
 					}
 				}
-				
+
 				for (int index = 0; index < vert_to.Count (); index ++) {
 					VERT_INFO &info = vert_to[index];
 					tri_obj.mesh.verts[info.index] += state * (info.value - tri_obj.mesh.verts[info.index]);
@@ -975,11 +975,11 @@ MeshDeformSetClass::Update_Mesh (TriObject &tri_obj)
 			//
 			//	Update the vertex colors
 			//
-			Determine_Interpolation_Indicies (key_frame, false, from, to, state);	
+			Determine_Interpolation_Indicies (key_frame, false, from, to, state);
 			DEFORM_LIST &color_to = m_KeyFrames[to]->colors;
 
 			if (from <= m_CurrentKeyFrame) {
-				
+
 				if (from >= 0) {
 					DEFORM_LIST &color_from = m_KeyFrames[from]->colors;
 					for (int index = 0; index < color_from.Count (); index ++) {
@@ -991,9 +991,9 @@ MeshDeformSetClass::Update_Mesh (TriObject &tri_obj)
 					for (index = 0; index < color_to.Count (); index ++) {
 						VERT_INFO &info = color_to[index];
 						tri_obj.mesh.vertCol[info.index] = m_pMesh->vertCol[info.index];
-					}					
+					}
 				}
-				
+
 				for (index = 0; index < color_to.Count (); index ++) {
 					VERT_INFO &info = color_to[index];
 					tri_obj.mesh.vertCol[info.index] = m_pMesh->vertCol[info.index] + state * (info.value - m_pMesh->vertCol[info.index]);
@@ -1014,7 +1014,7 @@ MeshDeformSetClass::Update_Mesh (TriObject &tri_obj)
 			tri_obj.mesh.verts[vert] += (1.0F * m_pVertexDeltaArray[vert]);
 			m_pMesh->verts[vert] = tri_obj.mesh.verts[vert];
 		}
-		
+
 
 		//
 		// Transform the vertex colors based on the current deform state
@@ -1022,7 +1022,7 @@ MeshDeformSetClass::Update_Mesh (TriObject &tri_obj)
 		for (vert = 0; vert < m_VertexColorCount; vert ++) {
 			tri_obj.mesh.vertCol[vert] += (1.0F * m_pVertexColors[vert]);
 		}*/
-		
+
 		//
 		// Pass the new selection onto the mesh
 		//
@@ -1057,7 +1057,7 @@ MeshDeformSetClass::Update_Members (DEFORM_CHANNELS flags)
 	//
 	for (int vert = 0; vert < m_pMesh->numVerts; vert ++) {
 		if (m_pMesh->vertSel[vert]) {
-			
+
 			//
 			//	Should we add this vertex to the array of deformed verts
 			// the current keyframe?
@@ -1069,8 +1069,8 @@ MeshDeformSetClass::Update_Members (DEFORM_CHANNELS flags)
 			//
 			//	Should we add this vertex to the array of deformed vertex colors
 			// the current keyframe?
-			//			
-			if (flags & VERT_COLORS) {				
+			//
+			if (flags & VERT_COLORS) {
 
 				m_KeyFrames[m_CurrentKeyFrame]->affected_colors.Set (vert, 1);
 
@@ -1103,9 +1103,9 @@ MeshDeformSetClass::Update_Members (DEFORM_CHANNELS flags)
 			//	verticies affected by this set.
 			//
 			m_SetMembers.Set (vert, 1);
-		}		
-	}			
-	
+		}
+	}
+
 	//r (int index = m_CurrentKeyFrame; index < MAX_DEFORM_KEY_FRAMES; index ++) {
 		Update_Key_Frame (m_CurrentKeyFrame);
 	//
@@ -1127,8 +1127,8 @@ MeshDeformSetClass::Select_Members (void)
 	//
 	for (int vert = 0; vert < m_pMesh->numVerts; vert ++) {
 		m_pMesh->vertSel.Set (vert, m_SetMembers[vert]);
-	}			
-	
+	}
+
 	return ;
 }
 
@@ -1148,7 +1148,7 @@ MeshDeformSetClass::Restore_Members (void)
 	for (int vert = 0; vert < m_pMesh->numVerts; vert ++) {
 
 		if (m_SetMembers[vert]) {
-			
+
 			//
 			//	Restore the vertex positions
 			//
@@ -1241,13 +1241,13 @@ MeshDeformSetClass::Save
 	//
 	int key_frames = m_KeyFrames.Count ();
 	float state_inc = 1.0F / ((float)key_frames);
-	float old_state = m_State;	
+	float old_state = m_State;
 
 	//
 	//	Loop through all the keyframes
 	//
 	for (int key_frame = 0; key_frame < key_frames; key_frame ++) {
-				
+
 		//
 		//	Loop through all the verticies and see if this keyframe
 		//	modifies any of them
@@ -1270,7 +1270,7 @@ MeshDeformSetClass::Save
 			//	Save the absolute state of all the verts and colors
 			//	at this keyframe.
 			//
-			
+
 			for (int w3d_vert_index = 0; w3d_vert_index < builder.Get_Vertex_Count (); w3d_vert_index ++) {
 
 				const MeshBuilderClass::VertClass &w3d_vert = builder.Get_Vertex(w3d_vert_index);
@@ -1297,12 +1297,12 @@ MeshDeformSetClass::Save
 					//
 					//	Save this vertex's deformations
 					//
-					save_set.Add_Vert (w3d_vert_index, position, color);						
+					save_set.Add_Vert (w3d_vert_index, position, color);
 				}
-			}			
+			}
 
 			save_set.End_Keyframe ();
-		}		
+		}
 	}
 
 	m_State = old_state;
@@ -1397,7 +1397,7 @@ MeshDeformSetClass::Save (ISave *save_obj)
 			//save_obj->BeginChunk (DEFORM_CHUNK_COLOR_DATA);
 			result = save_obj->Write (&data, sizeof (data), &bytes);
 			//save_obj->EndChunk ();
-		}		
+		}
 
 		//
 		//	Write the list of affected vertex positions to a chunk
@@ -1419,7 +1419,7 @@ MeshDeformSetClass::Save (ISave *save_obj)
 	}
 
 	save_obj->EndChunk ();
-	
+
 	// Return IO_OK on success IO_ERROR on failure
 	return result;
 }
@@ -1445,21 +1445,21 @@ MeshDeformSetClass::Load (ILoad *load_obj)
 	IOResult result = load_obj->OpenChunk ();
 	if (	(result == IO_OK) &&
 			(load_obj->CurChunkID () == DEFORM_CHUNK_SET_INFO)) {
-				
+
 		//
 		//	Read information about this set from the chunk
 		//
 		DeformChunkSetInfo set_info = { 0 };
 		result = load_obj->Read (&set_info, sizeof (set_info), &bytes);
 		m_bAutoApply = !(set_info.flags & DEFORM_SET_MANUAL_DEFORM);
-		
+
 		//
 		//	Resize the internal data to fit the saved state
 		//
 		if (result == IO_OK) {
 			Resize_Vertex_Array (set_info.NumVerticies, set_info.NumVertexColors);
 		}
-		
+
 		//
 		//	Read keyframe information from the chunk
 		//
@@ -1468,7 +1468,7 @@ MeshDeformSetClass::Load (ILoad *load_obj)
 				index ++)
 		{
 			KEY_FRAME &key_frame = *(m_KeyFrames[index]);
-			
+
 			DeformChunkKeyframeInfo keyframe_info = { 0 };
 			result = load_obj->Read (&keyframe_info, sizeof (keyframe_info), &bytes);
 
@@ -1478,7 +1478,7 @@ MeshDeformSetClass::Load (ILoad *load_obj)
 			for (	unsigned int pos_index = 0;
 					(pos_index < keyframe_info.VertexCount) && (result == IO_OK);
 					pos_index ++)
-			{				
+			{
 				//
 				//	Read vertex position info from the chunk
 				//
@@ -1497,7 +1497,7 @@ MeshDeformSetClass::Load (ILoad *load_obj)
 			for (	unsigned int color_index = 0;
 					(color_index < keyframe_info.ColorCount) && (result == IO_OK);
 					color_index ++)
-			{				
+			{
 				//
 				//	Read vertex color info from the chunk
 				//
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSet.h b/Core/Tools/WW3D/max2w3d/MeshDeformSet.h
index e789157e0cf..4451fb290a7 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformSet.h
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformSet.h
@@ -16,30 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformSet.h                                              * 
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 04/26/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformSet.h                                              *
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 04/26/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef __MESH_DEFORM_SET_H
-#define __MESH_DEFORM_SET_H
+#pragma once
 
 #include <max.h>
-#include "Vector.H"
+#include "Vector.h"
 #include "MeshDeformDefs.h"
 
 
@@ -80,11 +78,11 @@ class MeshDeformSetClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Public methods
-		//////////////////////////////////////////////////////////////////////			
+		//////////////////////////////////////////////////////////////////////
 		//virtual LocalModData *	Clone (void)	{ return new MeshDeformSetClass; }
 		void					Update_Mesh (TriObject &tri_obj);
 		void					Set_State (float state);
-		
+
 		//	Inline accessors
 		Mesh *				Peek_Mesh (void) const						{ return m_pMesh; }
 		const Point3 *		Peek_Orig_Vertex_Array (void) const		{ return m_pVertexArray; }
@@ -100,7 +98,7 @@ class MeshDeformSetClass
 		void					Collapse_Keyframe_Data (int keyframe);
 		void					Reset_Key_Frame_Verts (int keyframe);
 		void					Reset_Key_Frame_Colors (int keyframe);
-		
+
 		// Data managment
 		void					Set_Vertex_Position (int index, const Point3 &value);
 		void					Set_Vertex_Color (int index, int color_index, const VertColor &value);
@@ -134,12 +132,12 @@ class MeshDeformSetClass
 		//////////////////////////////////////////////////////////////////////
 		void					Resize_Vertex_Array (int count, int color_count);
 		void					Copy_Vertex_Array (Mesh &mesh);
-		
+
 		// Keyframe methods
 		void					Init_Key_Frames (void);
 		void					Free_Key_Frames (void);
 		void					Determine_Interpolation_Indicies (int key_frame, bool position, int &from, int &to, float &state);
-		
+
 		// Deformation application methods
 		void					Apply_Position_Changes (UINT vert, int frame_to_check, Point3 &position, Matrix3 *transform = NULL);
 		void					Apply_Color_Changes (UINT vert, int frame_to_check, Mesh &mesh);
@@ -162,7 +160,7 @@ class MeshDeformSetClass
 
 		//////////////////////////////////////////////////////////////////////
 		//	Private member data
-		//////////////////////////////////////////////////////////////////////			
+		//////////////////////////////////////////////////////////////////////
 		Mesh *				m_pMesh;
 		Point3 *				m_pVertexArray;
 		Point3 *				m_pVertexOPStartArray;
@@ -179,7 +177,3 @@ class MeshDeformSetClass
 		// List of key frames
 		KEY_FRAME_LIST		m_KeyFrames;
 };
-
-
-#endif //__MESH_DEFORM_DATA_H
-
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformUndo.cpp b/Core/Tools/WW3D/max2w3d/MeshDeformUndo.cpp
index 7d88f90224b..839072fabd4 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformUndo.cpp
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformUndo.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformUndo.h                                             * 
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 06/08/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformUndo.h                                             *
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 06/08/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "MeshDeformUndo.h"
@@ -103,8 +103,8 @@ VertexRestoreClass::Restore (int is_undo)
 		// the undo operation was recorded
 		//
 		m_pModData->Set_Current_Set (m_SetIndex);
-		m_pModData->Peek_Set (m_SetIndex).Set_Current_Key_Frame (m_KeyframeIndex);		
-		
+		m_pModData->Peek_Set (m_SetIndex).Set_Current_Key_Frame (m_KeyframeIndex);
+
 		//
 		//	Apply the original vertex positions to the mesh
 		//
@@ -115,7 +115,7 @@ VertexRestoreClass::Restore (int is_undo)
 		//
 		m_pModifier->NotifyDependents (FOREVER, PART_GEOM | PART_VERTCOLOR, REFMSG_CHANGE);
 		m_pModifier->Update_UI (m_pModData);
-	}		
+	}
 
 	return ;
 }
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h b/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h
index 4fa7c155e97..330c34389a4 100644
--- a/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h
+++ b/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h
@@ -16,29 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MeshDeformUndo.h                                             * 
- *                                                                                             * 
- *                   Programmer : Patrick Smith                                                * 
- *                                                                                             * 
- *                   Start Date : 06/08/99                                                     * 
- *                                                                                             * 
- *                  Last Update : 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MeshDeformUndo.h                                             *
+ *                                                                                             *
+ *                   Programmer : Patrick Smith                                                *
+ *                                                                                             *
+ *                   Start Date : 06/08/99                                                     *
+ *                                                                                             *
+ *                  Last Update :
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef __MESH_DEFORM_UNDO_H
-#define __MESH_DEFORM_UNDO_H
+#pragma once
 
 #include <max.h>
-#include "Vector.H"
+#include "Vector.h"
 #include "MeshDeformDefs.h"
 
 // Forward declarations
@@ -61,7 +60,7 @@ class VertexRestoreClass : public RestoreObj
 		//////////////////////////////////////////////////////////////////
 		VertexRestoreClass (Mesh *mesh, MeshDeformClass *modifier, MeshDeformModData *mod_data);
 		virtual ~VertexRestoreClass (void)	{ Free_Vertex_Array (); };
-		
+
 		//////////////////////////////////////////////////////////////////
 		//	RestoreObj overrides
 		//////////////////////////////////////////////////////////////////
@@ -106,7 +105,7 @@ class VertexPositionRestoreClass : public VertexRestoreClass
 		//////////////////////////////////////////////////////////////////
 		VertexPositionRestoreClass (Mesh *mesh, MeshDeformClass *modifier, MeshDeformModData *mod_data);
 		virtual ~VertexPositionRestoreClass (void)	{ };
-		
+
 		//////////////////////////////////////////////////////////////////
 		//	RestoreObj overrides
 		//////////////////////////////////////////////////////////////////
@@ -136,7 +135,7 @@ class VertexColorRestoreClass : public VertexRestoreClass
 		//////////////////////////////////////////////////////////////////
 		VertexColorRestoreClass (Mesh *mesh, MeshDeformClass *modifier, MeshDeformModData *mod_data);
 		virtual ~VertexColorRestoreClass (void)	{ };
-		
+
 		//////////////////////////////////////////////////////////////////
 		//	RestoreObj overrides
 		//////////////////////////////////////////////////////////////////
@@ -150,6 +149,3 @@ class VertexColorRestoreClass : public VertexRestoreClass
 		virtual void	Copy_Vertex_State (DEFORM_LIST &list);
 		virtual void	Apply_Vertex_Data (DEFORM_LIST &list);
 };
-
-
-#endif //__MESH_DEFORM_UNDO_H
diff --git a/Core/Tools/WW3D/max2w3d/PCToPS2Material.cpp b/Core/Tools/WW3D/max2w3d/PCToPS2Material.cpp
index fc85ae08957..c8b225e3ac1 100644
--- a/Core/Tools/WW3D/max2w3d/PCToPS2Material.cpp
+++ b/Core/Tools/WW3D/max2w3d/PCToPS2Material.cpp
@@ -52,7 +52,7 @@ Class_ID PCToPS2MaterialClassID(0x40d11cee, 0x68881657);
 class PCToPS2MaterialClass : public UtilityObj {
 
 	public:
-		
+
 		void BeginEditParams(Interface *ip,IUtil *iu);
 		void EndEditParams(Interface *ip,IUtil *iu) {}
 		void DeleteThis() {delete this;}
@@ -69,9 +69,9 @@ class PCToPS2MaterialClass : public UtilityObj {
  * HISTORY:                                                                                    *
  *   10/27/1999MLL: Created.                                                                   *
  *=============================================================================================*/
-void PCToPS2MaterialClass::BeginEditParams(Interface *ip,IUtil *iu) 
+void PCToPS2MaterialClass::BeginEditParams(Interface *ip,IUtil *iu)
 {
-	// This function is called when the utility is chosen.  
+	// This function is called when the utility is chosen.
 	// Since we don't need any window gadgets, we'll just go through all the materials right away.
 	INode *root = ip->GetRootNode();
 
@@ -132,9 +132,9 @@ class PCToPS2MaterialClassDesc:public ClassDesc {
 
 public:
 	int				IsPublic()					{ return 1; }
-	void *			Create(BOOL loading)		
-	{ 
-		return ((void*)new PCToPS2MaterialClass); 
+	void *			Create(BOOL loading)
+	{
+		return ((void*)new PCToPS2MaterialClass);
 	}
 	const TCHAR *	ClassName()					{ return Get_String(IDS_PC_TO_PS2_MAT_CONVERTER); }
 	SClass_ID		SuperClassID()				{ return UTILITY_CLASS_ID; }
diff --git a/Core/Tools/WW3D/max2w3d/PS2GameMtl.cpp b/Core/Tools/WW3D/max2w3d/PS2GameMtl.cpp
index 751229d0e44..ba81d60da3c 100644
--- a/Core/Tools/WW3D/max2w3d/PS2GameMtl.cpp
+++ b/Core/Tools/WW3D/max2w3d/PS2GameMtl.cpp
@@ -56,11 +56,11 @@ class PS2GameMaterialClassDesc:public ClassDesc {
 
 public:
 	int				IsPublic()					{ return 1; }
-	void *			Create(BOOL loading)		
-	{ 
+	void *			Create(BOOL loading)
+	{
 		GameMtl *mtl = new GameMtl(loading);
 		mtl->Set_Shader_Type(GameMtl::STE_PS2_SHADER);
-		return ((void*)mtl); 
+		return ((void*)mtl);
 	}
 	const TCHAR *	ClassName()					{ return Get_String(IDS_PS2_GAMEMTL); }
 	SClass_ID		SuperClassID()				{ return MATERIAL_CLASS_ID; }
diff --git a/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.cpp b/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.cpp
index ee6e8b84adc..5c16e1b428d 100644
--- a/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.cpp
+++ b/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.cpp
@@ -30,7 +30,7 @@
  *                                                                                             *
  *                  Last update : 10/12/1999                                                   *
  *                                                                                             *
- *                  Taken from GTH's GameMtlShaderDlg.cpp												  *	                                                                           
+ *                  Taken from GTH's GameMtlShaderDlg.cpp												  *
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  *   PS2GameMtlShaderDlg -- Constructor.                                                       *
@@ -50,7 +50,7 @@
 
 #define NUM_PS2_SHADER_BLEND_PRESETS 7
 
-static char * _PS2ShaderBlendSettingPresetNames[NUM_PS2_SHADER_BLEND_PRESETS + 1] = 
+static char * _PS2ShaderBlendSettingPresetNames[NUM_PS2_SHADER_BLEND_PRESETS + 1] =
 {
 	"Opaque",
 	"Additive",
@@ -95,8 +95,8 @@ static const PS2ShaderBlendSettingPreset PS2ShaderBlendSettingPresets[NUM_PS2_SH
  *=============================================================================================*/
 PS2GameMtlShaderDlg::PS2GameMtlShaderDlg
 (
-	HWND				parent, 
-	IMtlParams *	imp, 
+	HWND				parent,
+	IMtlParams *	imp,
 	GameMtl *		mtl,
 	int				pass
 ) : GameMtlFormClass(imp,mtl,pass)
@@ -114,14 +114,14 @@ PS2GameMtlShaderDlg::PS2GameMtlShaderDlg
  * HISTORY:                                                                                    *
  *   10/12/1999MLL: Created.                                                                   *
  *=============================================================================================*/
-BOOL PS2GameMtlShaderDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam, LPARAM lparam) 
-{ 
+BOOL PS2GameMtlShaderDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam, LPARAM lparam)
+{
 	int cursel;
 	int i;
 	int id = LOWORD(wparam);
 	int code = HIWORD(wparam);
-	
-	switch (message) 
+
+	switch (message)
 	{
 
 		case WM_INITDIALOG:
@@ -142,8 +142,8 @@ BOOL PS2GameMtlShaderDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam
 		case WM_COMMAND:
 			{
 				if (code == CBN_SELCHANGE) {
-					
-					switch (id) 
+
+					switch (id)
 					{
 						// Shared by both shaders.
 						case IDC_DEPTHCOMPARE_COMBO:
@@ -203,9 +203,9 @@ BOOL PS2GameMtlShaderDlg::Dialog_Proc (HWND dlg_wnd, UINT message, WPARAM wparam
 					}
 
 				} else {
-				
+
 					switch(id) {
-						
+
 						case IDC_DEPTHMASK_CHECK:
 							if (SendDlgItemMessage(dlg_wnd,IDC_DEPTHMASK_CHECK,BM_GETCHECK,0,0)) {
 								TheMtl->Set_Depth_Mask(PassIndex,W3DSHADER_DEPTHMASK_WRITE_ENABLE);
@@ -258,7 +258,7 @@ void PS2GameMtlShaderDlg::ReloadDialog(void)
 	SendDlgItemMessage(m_hWnd, IDC_D_COMBO, CB_SETCURSEL, TheMtl->Get_PS2_Shader_Param_D(PassIndex), 0);
 
 	Set_Preset();
-	
+
 	SetCheckBox(m_hWnd,IDC_DEPTHMASK_CHECK, TheMtl->Get_Depth_Mask(PassIndex));
 	SetCheckBox(m_hWnd,IDC_ALPHATEST_CHECK, TheMtl->Get_Alpha_Test(PassIndex));
 }
@@ -368,4 +368,4 @@ void PS2GameMtlShaderDlg::Set_Advanced_Defaults(void)
 
 	TheMtl->Notify_Changed();
 	ReloadDialog();
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h b/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h
index 81f68593afc..5b0875507be 100644
--- a/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h
+++ b/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h
@@ -34,14 +34,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef PS2GAMEMTLSHADERDLG_H
-#define PS2GAMEMTLSHADERDLG_H
+#pragma once
 
 #include <max.h>
 #include "GameMtlForm.h"
 
-// This class was taken from GTH's GameMtlShaderDlg. 
+// This class was taken from GTH's GameMtlShaderDlg.
 
 class GameMtl;
 struct PS2ShaderBlendSettingPreset;
@@ -67,5 +65,3 @@ class PS2GameMtlShaderDlg : public GameMtlFormClass
 	bool					CompareShaderToBlendPreset(const PS2ShaderBlendSettingPreset &blend_preset);
 	void					Set_Advanced_Defaults(void);
 };
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/SceneSetupDlg.cpp b/Core/Tools/WW3D/max2w3d/SceneSetupDlg.cpp
index 39c892d53f4..89613c12c83 100644
--- a/Core/Tools/WW3D/max2w3d/SceneSetupDlg.cpp
+++ b/Core/Tools/WW3D/max2w3d/SceneSetupDlg.cpp
@@ -206,7 +206,7 @@ BOOL CALLBACK SceneSetupDlg::DialogProc (HWND hWnd, UINT uMsg, WPARAM wParam, LP
 /////////////////////////////////////////////////////////////////////////////
 // SceneSetupDlg message handlers
 
-void SceneSetupDlg::OnInitDialog() 
+void SceneSetupDlg::OnInitDialog()
 {
 	CenterWindow(m_hWnd, m_MaxInterface->GetMAXHWnd());
 	SetCursor(LoadCursor(NULL, IDC_ARROW));
@@ -244,7 +244,7 @@ void SceneSetupDlg::OnInitDialog()
 	SetEditFloat(IDC_DAMAGE_OFFSET, m_DamageOffset);
 }
 
-BOOL SceneSetupDlg::OnOK() 
+BOOL SceneSetupDlg::OnOK()
 {
 	if (!ValidateEditFloat(IDC_LOD_OFFSET))
 	{
diff --git a/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h b/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h
index efd55afcea1..ce1d5de5848 100644
--- a/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h
+++ b/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h
@@ -34,9 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef SCENESETUPDLG_H
-#define SCENESETUPDLG_H
+#pragma once
 
 // SceneSetupDlg.h : header file
 //
@@ -91,5 +89,3 @@ class SceneSetupDlg
 	// Protected Data
 	Interface	*m_MaxInterface;
 };
-
-#endif
diff --git a/Core/Tools/WW3D/max2w3d/SkinCopy.cpp b/Core/Tools/WW3D/max2w3d/SkinCopy.cpp
index 381cff11a10..71b95582948 100644
--- a/Core/Tools/WW3D/max2w3d/SkinCopy.cpp
+++ b/Core/Tools/WW3D/max2w3d/SkinCopy.cpp
@@ -523,4 +523,4 @@ ModContext *find_skin_mod_context (INode *node)
 
 	// We didn't find a WWSkin binding.
 	return NULL;
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/WW3D/max2w3d/SnapPoints.cpp b/Core/Tools/WW3D/max2w3d/SnapPoints.cpp
index 0b9a8b86cef..554cde3073d 100644
--- a/Core/Tools/WW3D/max2w3d/SnapPoints.cpp
+++ b/Core/Tools/WW3D/max2w3d/SnapPoints.cpp
@@ -56,17 +56,17 @@ class PointFilterClass : public INodeFilterClass
 		if (node == NULL) return FALSE;
 		Object * obj = node->EvalWorldState(time).obj;
 		if (obj == NULL) return FALSE;
-		
-		if 
+
+		if
 		(
 			obj->ClassID() == Class_ID(POINTHELP_CLASS_ID,0) &&
 			!node->IsHidden()
-		) 
+		)
 		{
 			return TRUE;
 		} else {
 			return FALSE;
-		} 
+		}
 	}
 };
 
@@ -74,7 +74,7 @@ class PointFilterClass : public INodeFilterClass
 void SnapPointsClass::Export_Points(INode * scene_root,TimeValue time,ChunkSaveClass & csave)
 {
 	if (scene_root == NULL) return;
-	
+
 	PointFilterClass pointfilter;
 	INodeListClass pointlist(scene_root,time,&pointfilter);
 
diff --git a/Core/Tools/WW3D/max2w3d/SnapPoints.h b/Core/Tools/WW3D/max2w3d/SnapPoints.h
index def14b00314..3ef1a76789d 100644
--- a/Core/Tools/WW3D/max2w3d/SnapPoints.h
+++ b/Core/Tools/WW3D/max2w3d/SnapPoints.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SNAPPOINTS_H
-#define SNAPPOINTS_H
 
 #include "max.h"
 
@@ -57,5 +51,3 @@ class SnapPointsClass
 public:
 	static void Export_Points(INode * scene_root,TimeValue time,ChunkSaveClass & csave);
 };
-
-#endif 
diff --git a/Core/Tools/WW3D/max2w3d/TARGA.CPP b/Core/Tools/WW3D/max2w3d/TARGA.CPP
deleted file mode 100644
index 17fcfb44cb1..00000000000
--- a/Core/Tools/WW3D/max2w3d/TARGA.CPP
+++ /dev/null
@@ -1,1397 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/****************************************************************************
-*
-*        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S
-*
-*----------------------------------------------------------------------------
-*
-* FILE
-*     targa.cpp
-* 
-* DESCRIPTION
-*     Targa image file class.
-*
-* PROGRAMMER
-*     Denzil E. Long, Jr.
-*
-* DATE
-*     August 8, 1995
-*
-*----------------------------------------------------------------------------
-*
-* PUBLIC
-*     Open - Open Targa image file.
-*     Close - Close Targa image file.
-*     Load - Load Targa image file.
-*     Save - Save a Targa Image File.
-*     XFlip - X flip the image.
-*     YFlip - Y flip the image.
-*     SetImage - Set the image buffer.
-*     GetImage - Get the current image buffer address.
-*     SetPalette - Set the palette buffer.
-*     GetPalette - Retrieve the current palette buffer address.
-*     GetExtension - Get Extension data. (Targa 2.0 files only)
-*
-* PRIVATE
-*     DecodeImage - Decompress Targa image data.
-*     EncodeImage - Compress the image using targa RLE.
-*     InvertImage - Invert TrueColor image data.
-*
-* MODIFICATIONS:
-*     Converted to work with FileClass, FileFactory (changes are inside
-*     ifdefs, so can be easily reversed). Naty Hoffman, January 25, 2001
-*
-****************************************************************************/
-
-#include "TARGA.H"
-#ifndef TGA_USES_WWLIB_FILE_CLASSES
-#include <stdio.h>
-#endif
-#include <malloc.h>
-#include <memory.h>
-#include <string.h>
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-#include "wwfile.h"
-#include "ffactory.h"
-#else
-#include <io.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#endif
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::Targa - Initialize a Targa instance.
-*
-* SYNOPSIS
-*     Targa()
-*
-*     void Targa(void);
-*
-* FUNCTION
-*     Initialize the targa class instance.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-Targa::Targa(void)
-	{
-	mImage = NULL;
-	mPalette = NULL;
-	Clear_File();
-	mAccess = TGA_READMODE;
-	mFlags = 0;
-	memset(&Header, 0, sizeof(TGAHeader));
-	memset(&mExtension, 0, sizeof(TGA2Extension));
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::~Targa - Targa class destructor.
-*
-* SYNOPSIS
-*     ~Targa()
-*
-*     void ~Targa(void);
-*
-* FUNCTION
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-Targa::~Targa(void)
-{
-	/* Close the file if has been left open. */
-	Close();
-
-	/* Free the palette buffer if we allocated it. */
-	if ((mPalette != NULL) && (mFlags & TGAF_PAL))
-		free(mPalette);
-
-	/* Free the image buffer if we allocated it. */
-	if ((mImage != NULL) && (mFlags & TGAF_IMAGE))
-		free(mImage);
-}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::Open - Open Targa image file.
-*
-* SYNOPSIS
-*     Error = Open(Name, Mode)
-*
-*     long Open(char *, long);
-*
-* FUNCTION
-*     Open a Targa image file and read in its header. The file stream will
-*     positioned after the ID field (if there is one).
-*
-* INPUTS
-*     Name - Pointer to name of Targa file.
-*     Mode - Access mode.
-*
-* RESULT
-*     Error - Error code, 0 if okay.
-*
-****************************************************************************/
-
-long Targa::Open(const char* name, long mode)
-{
-	TGA2Footer	footer;
-	long			size;
-	long			error = 0;
-
-	/* File already open? */
-	if (Is_File_Open() && (mAccess == mode)) {
-		return (0);
-	}
-
-	Close();
-
-	/* Initialize the access mode. */
-	mAccess = mode;
-	mFlags &= ~TGAF_TGA2;
-
-	switch (mode) {
-
-		/* Open targa file for read. */
-		case TGA_READMODE:
-			if (File_Open_Read(name)) {
-
-				/* Check for 2.0 targa file by loading the footer */
-				if (File_Seek(-26, SEEK_END) == -1) {
-					error = TGAERR_READ;
-				}
-
-				if (!error) {
-					if (File_Read(&footer, sizeof(TGA2Footer)) != sizeof(TGA2Footer)) {
-						error = TGAERR_READ;
-					} else {
-						/* If this a 2.0 file with an extension? */
-						if (strncmp(footer.Signature, TGA2_SIGNATURE, 16) == 0) {
-							if (footer.Extension != 0) {
-								mFlags |= TGAF_TGA2;
-							}
-						}
-					}
-				}
-
-				/* Read in Extension data */
-				if (!error && (mFlags & TGAF_TGA2)) {
-
-					if (File_Seek(footer.Extension, SEEK_SET) == -1) {
-						error = TGAERR_READ;
-					}
-
-					if (!error) {
-						if (File_Read(&mExtension, sizeof(TGA2Extension)) != sizeof(TGA2Extension)) {
-							error = TGAERR_READ;
-						}
-					}
-				}
-
-				/* Read in header. */
-				if (!error && (File_Seek(0, SEEK_SET) == -1)) {
-					error = TGAERR_READ;
-				} else {
-
-					size = File_Read(&Header, sizeof(TGAHeader));
-					if (size != sizeof(TGAHeader)) {
-						error = TGAERR_READ;
-					}
-				}
-
-				/* Skip the ID field */
-				if (!error && (Header.IDLength != 0)) {
-					if (File_Seek(Header.IDLength, SEEK_CUR) == -1) {
-						error = TGAERR_READ;
-					}
-				}
-
-			} else {
-				error = TGAERR_OPEN;
-			}
-			break;
-
-		/* Open targa file for write. */
-		case TGA_WRITEMODE:
-			if (!File_Open_Write(name)) {
-				error = TGAERR_OPEN;
-			} else {
-//				printf("\r");
-			}
-			break;
-
-		/* Open targa file for read/write.*/
-		case TGA_RDWRMODE:
-			if (File_Open_ReadWrite(name)) {
-
-				/* Read in header. */
-				size = File_Read(&Header, sizeof(TGAHeader));
-
-				if (size != sizeof(TGAHeader)) {
-					error = TGAERR_READ;
-				}
-				/* Skip the ID field */
-				if (!error && (Header.IDLength != 0)) {
-					if (File_Seek(Header.IDLength, SEEK_CUR) == -1) {
-						error = TGAERR_READ;
-					}
-				}
-
-			} else {
-				error = TGAERR_OPEN;
-			}
-			break;
-	}
- 
-	/* Close on any error! */
-	if (error) {
-		Close();
-	}
-
-	return (error);
-}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::Close - Close Targa image file.
-*
-* SYNOPSIS
-*     Close()
-*
-*     void Close(void);
-*
-* FUNCTION
-*     Close the Targa image file and free its handle.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-void Targa::Close(void)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	if (TGAFile) {
-		TGAFile->Close();
-		_TheFileFactory->Return_File(TGAFile);
-		TGAFile = NULL;
-	}
-#else
-	/* Close the file if it is open. */
-	if (mFH != -1) {
-		close(mFH);
-		mFH = -1;
-	}
-#endif
-}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::Load - Load Targa Image File into specified buffers.
-*
-* SYNOPSIS
-*     Error = Load(Name, Palette, ImageBuffer)
-*
-*     long Load(char *, char *, char *);
-*
-* FUNCTION
-*     Open and load the Targa into the specified buffers. If either buffer
-*     pointer is NULL then that field will not be processed.
-*
-* INPUTS
-*     Name        - Name of Targa image file to load.
-*     Palette     - Pointer to buffer to load the palette into.
-*     ImageBuffer - Pointer to buffer to load the image data into.
-*
-* RESULT
-*     Error - 0 if successful, or TGAERR_??? error code.
-*
-****************************************************************************/
-
-long Targa::Load(const char* name, char* palette, char* image,bool invert_image)
-{
-	long size;
-	long depth;
-	long error = 0;
-
-	/* Open the Targa */
-	if (Open(name, TGA_READMODE) == NULL) {
-
-		/* Process ColorMap (palette) */
-		if (Header.ColorMapType == 1) {
-
-			depth = (Header.CMapDepth >> 3);
-			size = (Header.CMapLength * depth);
-
-			/* Load the palette from the TGA if a palette buffer is provided
-			 * otherwise we will skip it.
-			 */
-			if ((palette != NULL) && (Header.CMapLength > 0)) {
-
-				/* Adjust palette to the starting color entry. */
-				palette += (Header.CMapStart * depth);
-
-				/* Read in the palette. */
-				if (File_Read(palette, size) != size) {
-					error = TGAERR_READ;
-				}
-
-			} else {
-				if (File_Seek(size, SEEK_CUR) == -1) {
-					error = TGAERR_READ;
-				}
-			}
-		}
-
-		/* Load the image data from the TGA if an image buffer is provided
-		 * otherwise we are done.
-		 */
-		if (!error && (image != NULL)) {
-
-			depth = TGA_BytesPerPixel(Header.PixelDepth);
-			size = ((Header.Width * Header.Height) * depth);
-
-			switch (Header.ImageType) {
-				case TGA_CMAPPED:
-					if (File_Read(image, size) != size) {
-						error = TGAERR_READ;
-					}
-					break;
-
-				case TGA_TRUECOLOR:
-					if (File_Read(image, size) == size) {
-						if (invert_image) InvertImage();
-					} else {
-						error = TGAERR_READ;
-					}
-					break;
-
-				case TGA_MONO:
-					if (File_Read(image, size) != size) {
-						error = TGAERR_READ;
-					}
-					break;
-
-				case TGA_CMAPPED_ENCODED:
-					error = DecodeImage();
-					break;
-
-				case TGA_TRUECOLOR_ENCODED:
-					if ((error = DecodeImage()) == NULL) {
-						if (invert_image) InvertImage();
-					}
-					break;
-
-				default:
-					error = TGAERR_NOTSUPPORTED;
-					break;
-			}
-
-			/* Arrange the image so that the origin position (coordinate 0,0)
-			 * is the upperleft hand corner of the image.
-			 */
-			if (!error) {
-				if ( Header.ImageDescriptor & TGAIDF_XORIGIN ) {
-					XFlip();
-					Header.ImageDescriptor &= ~TGAIDF_XORIGIN;
-				}
-				
-				// Mod (IML) : Locate the origin at the bottom-left corner instead. This
-				// will make ot consistent with .TGA's that have been generated with our
-				// existing software.
-				//	if (( Header.ImageDescriptor & TGAIDF_YORIGIN ) == 0){
-				if ( Header.ImageDescriptor & TGAIDF_YORIGIN ) {
-					YFlip();
-					//	Bug fix (IML) : Clear this flag to indicate to the targa reader
-					// that the Y-origin is at the bottom of the image. 
-					Header.ImageDescriptor &= ~TGAIDF_YORIGIN;
-				}
-			}
-		}
-
-		/* Close the Targa */
-		Close();
-
-	} else {
-		error = TGAERR_OPEN;
-	}
-
-	return (error);
-}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::Load - Load Targa Image File. (Auto buffer allocation).
-*
-* SYNOPSIS
-*     Error = Load(Name, Flags)
-*
-*     long Load(char, long);
-*
-* FUNCTION
-*     Open and load the Targa into buffers allocated by this function.
-*
-* INPUTS
-*     Name  - Name of Targa image file to load.
-*     Flags -
-*
-* RESULT
-*     Error - 0 if successful, or TGAERR_??? error code.
-*
-****************************************************************************/
-
-long Targa::Load(const char* name, long flags, bool invert_image)
-{
-	long size;
-	long error = 0;
-
-	/* Open the file to get the header. */
-	if (Open(name, TGA_READMODE) == 0) {
-
-		/* Allocate palette memory if requested to and the targa has one. */
-		if ((flags & TGAF_PAL) && (Header.ColorMapType == 1)) {
-
-			/* Dispose of any previous palette. */
-			if ((mPalette != NULL) && (mFlags & TGAF_PAL)) {
-				free(mPalette);
-				mPalette = NULL;
-				mFlags &= ~TGAF_PAL;
-			}
-
-			/* Only allocate a palette if the client hasn't assigned one. */
-			if ((mPalette == NULL) && !(mFlags & TGAF_PAL)) {
-
-				/* Compute the size of the palette from the targa header. */
-				size = (Header.CMapLength * (Header.CMapDepth >> 3));
-
-				if (size != 0) {
-					/* Allocate memory for the palette. */
-					if ((mPalette = (char *)malloc(size)) != NULL) {
-						mFlags |= TGAF_PAL; /* We allocated the palette. */
-					} else {
-						error = TGAERR_NOMEM;
-					}
-				}
-			}
-		}
-
-		/* Allocate image memory if requested to. */
-		if (!error && (flags & TGAF_IMAGE)) {
-
-			/* Dispose of any previous image. */
-			if ((mImage != NULL) && (mFlags & TGAF_IMAGE)) {
-				free(mImage);
-				mImage = NULL;
-				mFlags &= ~TGAF_IMAGE;
-			}
-
-			/* Only allocate an image if the client hasn't assigned one. */
-			if ((mImage == NULL) && !(mFlags & TGAF_IMAGE)) {
-
-				/* Compute the size of the image data from the targa header. */
-				size = ((Header.Width * Header.Height) * TGA_BytesPerPixel(Header.PixelDepth));
-				if (size != 0) {
-					/* Allocate memory for the image. */
-					if ((mImage = (char *)malloc(size)) != NULL) {
-						mFlags |= TGAF_IMAGE; /* We allocated the image. */
-					} else {
-						error = TGAERR_NOMEM;
-					}
-				}
-			}
-		}
-
-		/* Read in the file contents. */
-		if (!error) {
-			error = Load(name, mPalette, mImage, invert_image);
-		}
-
-		/* Close the file. */
-		Close();
-
-	} else {
-		error = TGAERR_OPEN;
-	}
-
-	return (error);
-}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::Save - Save a Targa Image File.
-*
-* SYNOPSIS
-*     Error = Save(Name, Flags)
-*
-*     long Save(char *, long);
-*
-* FUNCTION
-*
-* INPUTS
-*     Name  - Pointer to name of file to save.
-*     Flags -
-*
-* RESULT
-*     Error - 0 if successful, or TGAERR_??? error code.
-*
-****************************************************************************/
-
-long Targa::Save(const char* name, long flags, bool addextension)
-	{
-	long size;
-	long depth;
-	char *palette;
-	char *temppal;
-	char *ptr;
-	//long i,n;
-	//char c;
-	long error = 0;
-	TGA2Footer footer;
-
-	/* Open the Targa for write. */
-	if (Open(name, TGA_WRITEMODE) == NULL)
-		{
-		Header.IDLength = 0;
-
-		/* Set the ImageType for compression. */
-		if (flags & TGAF_COMPRESS)
-			{
-			switch (Header.ImageType)
-				{
-				case TGA_CMAPPED:
-				case TGA_TRUECOLOR:
-				case TGA_MONO:
-					Header.ImageType += 8;
-				break;
-
-				case TGA_CMAPPED_ENCODED:
-				case TGA_TRUECOLOR_ENCODED:
-				case TGA_MONO_ENCODED:
-				break;
-
-				/* Turn off compression for unknown types. */
-				default:
-					flags &= ~TGAF_COMPRESS;
-				break;
-				}
-			}
-
-		/*-----------------------------------------------------------------------
-		 * WRITE THE HEADER DATA SECTION
-		 *---------------------------------------------------------------------*/
-		if (File_Write(&Header, sizeof(TGAHeader)) != sizeof(TGAHeader))
-			error = TGAERR_WRITE;
-
-		/*-----------------------------------------------------------------------
-		 * WRITE THE COLORMAP (PALETTE) DATA SECTION
-		 *---------------------------------------------------------------------*/
-		if (!error && (flags & TGAF_PAL) && (mPalette != NULL)
-				&& (Header.CMapLength > 0))
-			{
-			/* Adjust palette to the starting color entry. */
-			depth = (Header.CMapDepth >> 3);
-			palette = mPalette + (Header.CMapStart * depth);
-			size = (Header.CMapLength * depth);
-
-			/* Allocate temporary buffer for palette manipulation. */
-			if ((temppal = (char *)malloc(size)) != NULL)
-				{
-				memcpy(temppal, palette, size);
-				ptr = temppal;
-
-				#if(0)
-				/* Swap the byte ordering of the palette entries. */
-				for (i = 0; i < Header.CMapLength; i++)
-					{
-					c = *ptr;
-					*ptr = *(ptr + (depth - 1));
-					*(ptr + (depth - 1)) = c;
-
-					/* Next entry */
-					palette += depth;
-					}
-				#endif
-				
-				/* Write the palette. */
-				if (File_Write(temppal, size) != size)
-					error = TGAERR_WRITE;
-
-				/* Free temporary palette buffer. */
-				free(temppal);
-				}
-			else
-				error = TGAERR_NOMEM;
-			}
-
-		/*-----------------------------------------------------------------------
-		 * WRITE THE IMAGE DATA SECTION
-		 *---------------------------------------------------------------------*/
-		if (!error && (flags & TGAF_IMAGE) && (mImage != NULL))
-			{
-			
-			bool imageinverted;
-
-			/* Invert truecolor data. */
-			if ((Header.ImageType == TGA_TRUECOLOR) || (Header.ImageType == TGA_TRUECOLOR_ENCODED)) {
-				InvertImage();
-				imageinverted = true;
-			} else {
-				imageinverted = false;
-			}
-
-			/* Write the image. */
-			if (flags & TGAF_COMPRESS)
-				EncodeImage();
-			else
-				{
-				depth = TGA_BytesPerPixel(Header.PixelDepth);
-				size = (((Header.Width * Header.Height)) * depth);
-
-				if (File_Write(mImage, size) != size)
-					error = TGAERR_WRITE;
-				}
-
-			// Bug fix (IML) : If the image was inverted, invert it again to restore it to its prior state.
-			if (imageinverted) InvertImage();
-			}
-
-		/*-----------------------------------------------------------------------
-		 * WRITE THE EXTENSION DATA SECTION
-		 *---------------------------------------------------------------------*/
-
-		// Mod (IML) Optionally add an extension to the file.
-		if (addextension) {
-			if (!error) {
-
-				mExtension.ExtSize = 495;
-				strncpy(mExtension.SoftID, "Denzil's Targa Code", 41);
-				mExtension.SoftVer.Number = (1 * 100);
-				mExtension.SoftVer.Letter = 0;
-
-				/* Save position of extension area. */
-				if ((footer.Extension = File_Seek(0, SEEK_CUR)) == -1)
-					error = TGAERR_WRITE;
-
-				if (!error && (File_Write(&mExtension, sizeof(TGA2Extension))
-						!= sizeof(TGA2Extension)))
-					error = TGAERR_WRITE;
-			}
-		} else {
-			footer.Extension = 0;
-		}
-			
-		/*-----------------------------------------------------------------------
-		 * WRITE THE FOOTER DATA SECTION
-		 *---------------------------------------------------------------------*/
-		if (!error)
-			{
-			footer.Developer = 0;
-			strncpy(footer.Signature, TGA2_SIGNATURE, 16);
-			footer.RsvdChar = '.';
-			footer.BZST = 0;
-
-			if (File_Write(&footer, sizeof(TGA2Footer)) != sizeof(TGA2Footer))
-				error = TGAERR_WRITE;
-			}
-
-		/* Close targa file. */
-		Close();
-		}
-	else
-		error = TGAERR_OPEN;
-
-	return (error);
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::XFlip - X flip the image.
-*
-* SYNOPSIS
-*     XFlip()
-*
-*     void XFlip();
-*
-* FUNCTION
-*     Flip the image in memory on its X axis. (left to right)
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-void Targa::XFlip(void)
-	{
-	char *ptr,*ptr1;
-	long  x,y,d;
-	char  v,v1;
-	char  depth;
-
-	/* Pixel depth in bytes. */
-	depth = TGA_BytesPerPixel(Header.PixelDepth);
-
-	for (y = 0; y < Header.Height; y++)
-		{
-		ptr = (mImage + ((Header.Width * depth) * y));
-		ptr1 = (ptr + ((Header.Width * depth) - depth));
-
-		for (x = 0; x < (Header.Width / 2); x++)
-			{
-			for (d = 0; d < depth; d++)
-				{
-				v = *(ptr + d);
-				v1 = *(ptr1 + d);
-				*(ptr + d) = v1;
-				*(ptr1 + d) = v;
-				}
-
-			ptr += depth;
-			ptr1 -= depth;
-			}
-		}
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::YFlip - Y flip the image.
-*
-* SYNOPSIS
-*     YFlip()
-*
-*     void YFlip();
-*
-* FUNCTION
-*     Flip the image in memory on its Y axis. (top to bottom)
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-void Targa::YFlip(void)
-	{
-	char *ptr,*ptr1;
-	long  x,y;
-	char  v,v1;
-	char  depth;
-
-	/* Pixel depth in bytes. */
-	depth = TGA_BytesPerPixel(Header.PixelDepth);
-
-	for (y = 0; y < (Header.Height >> 1); y++)
-		{
-		/* Compute address of lines to exchange. */
-		ptr = (mImage + ((Header.Width * y) * depth));
-		ptr1 = (mImage + ((Header.Width * (Header.Height - 1)) * depth));
-		ptr1 -= ((Header.Width * y) * depth);
-
-		/* Exchange all the pixels on this scan line. */
-		for (x = 0; x < (Header.Width * depth); x++)
-			{
-			v = *ptr;
-			v1 = *ptr1;
-			*ptr = v1;
-			*ptr1 = v;
-			ptr++;
-			ptr1++;
-			}
-		}
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::SetImage - Set the image buffer.
-*
-* SYNOPSIS
-*     OldImage = SetImage(Image)
-*
-*     char *SetImage(char *);
-*
-* FUNCTION
-*     Set the image buffer to one provided by the caller.
-*
-* INPUTS
-*     Image - Pointer to buffer to use for the image buffer.
-*
-* RESULT
-*     OldImage - Previous caller assigned image buffer.
-*
-****************************************************************************/
-
-char *Targa::SetImage(char *buffer)
-{
-	char *oldbuffer = NULL;
-
-	/* Free any image buffer before assigning another. */
-	if ((mImage != NULL) && (mFlags & TGAF_IMAGE))
-	{
-		free(mImage);
-		mImage = NULL;
-		mFlags &= ~TGAF_IMAGE;
-	}
-
-	/* Get the old user buffer. */
-	if (mImage != NULL)
-		oldbuffer = mImage;
-
-	/* Assign the new image buffer. */
-	mImage = buffer;
-
-	return (oldbuffer);
-}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::SetPalette - Set the palette buffer.
-*
-* SYNOPSIS
-*     OldPal = SetPalette(Pal)
-*
-*     char *SetPalette(char *);
-*
-* FUNCTION
-*
-* INPUTS
-*     Pal - Pointer to buffer to use for palette.
-*
-* RESULT
-*     OldPal - Pointer to previous user palette.
-*
-****************************************************************************/
-
-char *Targa::SetPalette(char *buffer)
-{
-	char *oldbuffer = NULL;
-
-	/* Free any image buffer before assigning another. */
-	if ((mPalette != NULL) && (mFlags & TGAF_PAL))
-	{
-		free(mPalette);
-		mPalette = NULL;
-		mFlags &= ~TGAF_PAL;
-	}
-
-	/* Get the old user buffer. */
-	if (mPalette != NULL)
-		oldbuffer = mPalette;
-
-	/* Assign the new image buffer. */
-	mPalette = buffer;
-
-	return (oldbuffer);
-}
-
-
-bool Targa::IsCompressed(void)
-	{
-	if (Header.ImageType > 8)
-		return true;
-
-	return false;
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::GetExtension - Get Extension data. (Targa 2.0 files only)
-*
-* SYNOPSIS
-*     Ext = GetExtension()
-*
-*     TGA2Extension *GetExtension(void);
-*
-* FUNCTION
-*     Retrieve a pointer to the Targa 2.0 extension data area. If the file
-*     version is 1.0 OR there is no extensio area then a NULL will be returned.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     Ext - Pointer to Extension data, NULL if not available.
-*
-****************************************************************************/
-
-TGA2Extension *Targa::GetExtension(void)
-	{
-	if (mFlags & TGAF_TGA2)
-		return (&mExtension);
-
-	return (NULL);
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::DecodeImage - Decompress Targa image data.
-*
-* SYNOPSIS
-*     Error = DecodeImage()
-*
-*     long DecodeImage();
-*
-* FUNCTION
-*     Decode the RLE compressed image data into the specified buffer from
-*     the file I/O stream.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     Error - 0 if successful, or TGAERR_??? error code.
-*
-****************************************************************************/
-
-long Targa::DecodeImage()
-	{
-	char          *image;
-	char          *color;
-	unsigned char count;
-	unsigned char depth;
-	unsigned long pixel_count;
-	unsigned long size;
-	unsigned long c,i;
-	long          error = 0;
-
-	/* Initialize */
-	image = mImage;
-
-	/* Compute pixel depth in bytes. */
-	depth = TGA_BytesPerPixel(Header.PixelDepth);
-
-	/* Total number of pixels compressed in this image. */
-	pixel_count = (Header.Width * Header.Height);
-
-	while ((pixel_count > 0) && !error)
-		{
- 		/* Read count. */
-		if (File_Read(&count, 1) == 1)
-			{
-			/* If bit 8 of the count is set then we have a run of pixels,
-			 * otherwise the data is raw pixels.
-			 */
-			if (count & 0x80)
-				{
-				count &= 0x7F;
-				count++;
-
-				/* Read in run pixel. */
-				if (File_Read(image, depth) == depth)
-					{
-					color = image;
-					image += depth;
-
-					/* Repeat the pixel for the run count in the image buffer. */
-					for (c = 1; c < count; c++)
-						for (i = 0; i < depth; i++)
-							*image++ = *(color + i);
-					}
-				else
-					error = TGAERR_READ;
-				}
-			else
-				{
-				count++;
-				size = (count * depth);
-
-				/* Read in raw pixels. */
-				if ((unsigned)File_Read(image, size) == size)
-					image += size;
-				else
-					error = TGAERR_READ;
-				}
-
-			/* Adjust the pixel count. */
-			pixel_count -= count;
-			}
-		else
-			error = TGAERR_READ;
-		}
-
-	return (error);
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::EncodeImage - Compress the image using targa RLE.
-*
-* SYNOPSIS
-*     EncodeImage()
-*
-*     void EncodeImage(void);
-*
-* FUNCTION
-*     Encode the image data using the RLE algorithm outlined in the TARGA
-*     file specification.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-long Targa::EncodeImage()
-	{
-	char *packet;
-	long packet_index;
-	char *start;
-	char *end;
-	long depth;
-	long pixels;
-	long count;
-	long match;
-	long i;
-	long error = 0;
-
-	/* Initialize variables. */
-	depth = TGA_BytesPerPixel(Header.PixelDepth);
-
-	/* Allocate packet buffer to hold maximum encoded data run. */
-	if ((packet = (char *)malloc(128 * depth)) != NULL)
-		{
-		pixels = Header.Width * Header.Height;
-		start = mImage;
-		end = start;
-		count = 0;
-		packet[0] = 0;
-		packet_index = 1;
-
-		while ((pixels != 0) && !error)
-			{
-			match = 1;
-
-			/* Advance to the next pixel */
-			end += depth;
-			pixels--;
-
-			/* Compare pixels. */
-			for (i = 0; i < depth; i++)
-				{
-				if (start[i] != end[i])
-					{
-					match = 0;
-					break;
-					}
-				}
-
-			/* Run of pixels */
- 			if (match == 1)
-				{
-				count++;
-
-				/* Continue counting until the maximum has been reached. */
-				if (count < 128)
-					{
-					if (packet[0] == 0)
-						continue;
-					}
-				else
-					count--;
-				}
-
-			/* If there is a count then write out the run. Otherwise, write
-			 * the raw pixel to the packet.
-			 */
-			if ((count != 0) && (packet[0] == 0))
-				{
-				/* Run count */
-				packet[0] = (count | 0x80);
-
-				/* Run pixel */
-				for (i = 0; i < depth; i++)
-					packet[i + 1] = start[i];
-
-				/* Write the run packet. */
-				if (File_Write(packet, (depth + 1)) != (depth + 1))
-					error = TGAERR_WRITE;
-
-				/* Reposition start and reset. */
-				start = end;
-				count = 0;
-				packet[0] = 0;
-				}
-			else
-				{
-				if (count == 0)
-					{
-					/* Copy the raw pixel to the packet. */
-					for (i = 0; i < depth; i++)
-						packet[packet_index + i] = start[i];
-
-					/* Increment the raw packet count. */
-					packet[0]++;
-
-					/* Reposition start */
-					start = end;
-					packet_index += depth;
-					}
-
-				/* Write the raw packet if the packet is full or a run has started
-				 * or all the pixels have been processed.
-				 */
-				if ((packet[0] == 127) || (count != 0) || (pixels == 0))
-					{
-					i = packet[0];
-					packet[0]--;
-
-					if (File_Write(packet, ((i * depth) + 1)) != ((i * depth) + 1))
-						error = TGAERR_WRITE;
-
-					packet_index = 1;
-					packet[0] = 0;
-					}
-				}
-			}
-
-		/* Free the packet buffer. */
-		free(packet);
-		}
-	else
-		error = TGAERR_NOMEM;
-
-	return (error);
-	}
-
-
-/****************************************************************************
-*
-* NAME
-*     Targa::InvertImage - Invert TrueColor image data.
-*
-* SYNOPSIS
-*     InvertImage()
-*
-*     void InvertImage(void);
-*
-* FUNCTION
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-****************************************************************************/
-
-void Targa::InvertImage(void)
-	{
-	char *buffer;
-	long depth;
-	long pixel_count;
-	long i;
-	char c;
-
-	/* Initialize */
-	buffer = mImage;
-
-	/* Compute the pixel depth in bytes. */
-	depth = TGA_BytesPerPixel(Header.PixelDepth);
-
-	/* Total number of pixels in this image. */
-	pixel_count = (Header.Width * Header.Height);
-
-	/* 16-bit pixel layout is different that 24-bit and 32-bit. */
-	if (depth > 2)
-		{
-		while (pixel_count > 0)
-			{
-			for (i = 0; i < (depth / 2); i++)
-				{
-				c = *(buffer + i);
-				*(buffer + i) = *(buffer + ((depth - 1) - i));
-				*(buffer + ((depth - 1) - i)) = c;
-				}
-
-			/* Next pixel */
-			pixel_count--;
-			buffer += depth;
-			}
-		}
-	}
-
-
-/*
-** These functions are just for ease of ifdef'ing between standard io calls and FileClass.
-*/
-void Targa::Clear_File(void)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	TGAFile = NULL;
-#else
-	mFH = -1;
-#endif
-}
-bool Targa::Is_File_Open(void)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	return (TGAFile != NULL);
-#else
-	return (mFH != -1);
-#endif
-}
-bool Targa::File_Open_Read(const char* name)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	TGAFile = _TheFileFactory->Get_File(name);
-	if (TGAFile && TGAFile->Is_Available()) {
-		return (TGAFile->Open(FileClass::READ) != 0);
-	} else {
-		return false;
-	}
-#else
-	mFH = open(name, (O_RDONLY|O_BINARY));
-	return (mFH != -1);
-#endif
-}
-bool Targa::File_Open_Write(const char* name)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	TGAFile = _TheWritingFileFactory->Get_File(name);
-	if (TGAFile) {
-		return (TGAFile->Open(FileClass::WRITE) != 0);
-	} else {
-		return false;
-	}
-#else
-	mFH = open(name, (O_CREAT|O_TRUNC|O_WRONLY|O_BINARY), (S_IREAD|S_IWRITE));
-	return (mFH != -1);
-#endif
-}
-bool Targa::File_Open_ReadWrite(const char* name)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	TGAFile = _TheWritingFileFactory->Get_File(name);
-	if (TGAFile && TGAFile->Is_Available()) {
-		return (TGAFile->Open(FileClass::READ|FileClass::WRITE) != 0);
-	} else {
-		return false;
-	}
-#else
-	mFH = open(name, (O_RDWR|O_BINARY), (S_IREAD|S_IWRITE));
-	return (mFH != -1);
-#endif
-}
-int Targa::File_Seek(int pos, int dir)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	return TGAFile->Seek(pos, dir);
-#else
-	return lseek(mFH, pos, dir);
-#endif
-}
-int Targa::File_Read(void *buffer, int size)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	return TGAFile->Read(buffer, size);
-#else
-	return read(mFH, buffer, size);
-#endif
-}
-int Targa::File_Write(void *buffer, int size)
-{
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-	return TGAFile->Write(buffer, size);
-#else
-	return write(mFH, buffer, size);
-#endif
-}
-
-// ----------------------------------------------------------------------------
-//
-// Output targa load error message.
-//
-// ----------------------------------------------------------------------------
-
-long Targa_Error_Handler(long load_err,const char* filename)
-{
-	switch (load_err) {
-	case 0:
-		return 0;
-	case TGAERR_OPEN:
-//		WWDEBUG_SAY(("Targa: Failed to open file \"%s\"\n", filename));
-		break;
-
-	case TGAERR_READ:
-//		WWDEBUG_SAY(("Targa: Failed to read file \"%s\"\n", filename));
-		break;
-
-	case TGAERR_NOTSUPPORTED:
-//		WWDEBUG_SAY(("Targa: File \"%s\" is an unsupported Targa type\n", filename));
-		break;
-
-	case TGAERR_NOMEM:
-//		WWDEBUG_SAY(("Targa: Failed to allocate memory for file \"%s\"\n", filename));
-		break;
-
-	default:
-//		WWDEBUG_SAY(("Targa: Unknown error when loading file \"%s\"\n", filename));
-		break;
-	}
-	return load_err;
-}
diff --git a/Core/Tools/WW3D/max2w3d/TARGA.H b/Core/Tools/WW3D/max2w3d/TARGA.H
deleted file mode 100644
index 414429c46b6..00000000000
--- a/Core/Tools/WW3D/max2w3d/TARGA.H
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _TARGA_H_
-#define _TARGA_H_
-/****************************************************************************
-*
-*         C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S
-*
-*----------------------------------------------------------------------------
-*
-* FILE
-*     Targa.h
-* 
-* DESCRIPTION
-*     Targa image file class definitions.
-*
-* PROGRAMMER
-*     Denzil E. Long, Jr.
-*
-* DATE
-*     July 15, 1998
-*
-****************************************************************************/
-
-#pragma pack(push, 1)
-
-// If you wish to display loading error messages call targa functions inside of
-// the following macro - for example TARGA_ERROR_HANDLER(targa.Open(filename, TGA_READMODE));
-// The error code is returned back from the handler so it can be used in an expression.
-long Targa_Error_Handler(long error_code,const char* filename);
-#define TARGA_ERROR_HANDLER(call,filename) Targa_Error_Handler(call,filename)
-
-/*---------------------------------------------------------------------------
- * STRUCTURES AND RELATED DEFINITIONS
- *-------------------------------------------------------------------------*/
-
-/* TGAHeader - Targa Image File header.
- *
- * IDLength        - Size of Image ID field
- * ColorMapType    - Color map type.
- * ImageType       - Image type code.
- * CMapStart       - Color map origin.
- * CMapLength      - Color map length.
- * CMapDepth       - Depth of color map entries.
- * XOffset         - X origin of image.
- * YOffset         - Y origin of image.
- * Width           - Width of image.
- * Height          - Height of image.
- * PixelDepth      - Image pixel size
- * ImageDescriptor - Image descriptor byte.
- */
-typedef struct _TGAHeader
-	{
-	char  IDLength;
-	char  ColorMapType;
-	char  ImageType;
-	short CMapStart;
-	short CMapLength;
-	char  CMapDepth;
-	short XOffset;
-	short YOffset;
-	short Width;
-	short Height;
-	char  PixelDepth;
-	char  ImageDescriptor;
-	} TGAHeader;
-
-/* ImageType definiton */
-#define TGA_NOIMAGE           0  /* No image data included in file */
-#define TGA_CMAPPED           1  /* Color-mapped image data */
-#define TGA_TRUECOLOR         2  /* Truecolor image data */
-#define TGA_MONO              3  /* Monochrome image data */
-#define TGA_CMAPPED_ENCODED   9  /* Color-mapped image data (Encoded) */
-#define TGA_TRUECOLOR_ENCODED 10 /* Truecolor image data (Encoded) */
-#define TGA_MONO_ENCODED      11 /* Monochrome image data (Encoded) */
-
-/* ImageDescriptor definition */
-#define TGAIDF_ATTRIB_BITS (0x0F<<0) /* Number of attribute bits per pixel */
-#define TGAIDF_XORIGIN     (1<<4)
-#define TGAIDF_YORIGIN     (1<<5)
-
-/* Access modes. */
-#define TGA_READMODE  0
-#define TGA_WRITEMODE 1
-#define TGA_RDWRMODE  2
-
-/* Error codes */
-#define TGAERR_OPEN         -1
-#define TGAERR_READ         -2
-#define TGAERR_WRITE        -3
-#define TGAERR_SYNTAX       -4
-#define TGAERR_NOMEM        -5
-#define TGAERR_NOTSUPPORTED -6
-
-/* Flags definitions */
-#define TGAF_IMAGE    (1<<0)
-#define TGAF_PAL      (1<<1)
-#define TGAF_COMPRESS (1<<2)
-#define TGAF_TGA2     (1<<3)
-
-/* Macro definitions */
-#define TGA_BytesPerPixel(a) ((a+7) >> 3)
-
-/*---------------------------------------------------------------------------
- * TARGA 2.0 DEFINITIONS
- *-------------------------------------------------------------------------*/
-
-#define TGA2_SIGNATURE "TRUEVISION-XFILE"
-
-/* TGA2Footer - Targa 2.0 footer
- *
- * Extension - Offset to the Extension area from start of file.
- * Developer - Offset to the Developer area from start of file.
- * Signature - 16 byte Targa 2.0 signature "TRUEVISION-XFILE"
- * RsvdChar  - Reserved character, must be ASCII "." (period)
- * BZST      - Binary Zero String Terminator.
- */
-typedef struct _TGA2Footer
-	{
-	long Extension;
-	long Developer;
-	char Signature[16];
-	char RsvdChar;
-	char BZST;
-	_TGA2Footer() {}
-	} TGA2Footer;
-
-/* TGA2DateStamp - A series of 3 WORD values which define the integer value
- *                 for the date the image was saved.
- *
- * Month - Month number (1 - 12)
- * Day   - Day number (1 - 31)
- * Year  - Year number (4 digit, ie. 1989)
- */
-typedef struct _TGA2DateStamp
-	{
-	short Month;
-	short Day;
-	short Year;
-	} TGA2DateStamp;
-
-/* TGA2TimeStamp - A series of 3 WORD values which define the integer value
- *                 for the time the image was saved.
- *
- * Hour   - Hour number, military time (0 - 23)
- * Minute - Minute number (0 - 59)
- * Second - Second number (0 - 59)
- */
-typedef struct _TGA2TimeStamp
-	{
-	short Hour;
-	short Minute;
-	short Second;
-	} TGA2TimeStamp;
-
-/* TGA2SoftVer - Define the version of the software used to generate file.
- *
- * Number - Version number * 100
- * Letter - Version letter
- */
-typedef struct _TGA2SoftVer
-	{
-	short Number;
-	char  Letter;
-	} TGA2SoftVer;
-
-/* TGA2Ratio - Numerator and denominator which when taken together specify
- *             a ratio.
- *
- * Numer - Numerator
- * Denom - Denominator (a value of zero indicates no ratio specified)
- */
-typedef struct _TGA2Ratio
-	{
-	short Numer;
-	short Denom;
-	} TGA2Ratio;
-
-/* TGA2Extension - Extension area, provided for additional file information.
- *                 This data is pointed to by the Extension offset in the
- *                 TGA2Footer.
- *
- * ExtSize     - Extension area size. (495 bytes for 2.0)
- * AuthName    - Name of the person who created image (NULL terminated ASCII)
- * AuthComment - Comments of the author (NULL terminated ASCII)
- * DateStamp   - Date the file was created. (See TGA2DateStamp)
- * TimeStamp   - Time the file was created. (See TGA2TimeStamp)
- * JobName     - Name of job image belongs to (NULL terminated ASCII)
- * JobTime     - Elapsed time of the job.
- * SoftID      - ID of software used to create image (NULL terminated ASCII)
- * SoftVer     - Version number of software used.
- * KeyColor    - Tranparent color value.
- * Aspect      - Pixel aspect ratio.
- * Gamma       - Fractional gamma value.
- * ColorCor    - Color correction table offset.
- * PostStamp   - Postage stamp image offset.
- * ScanLine    - Scan line table offset.
- * Attributes  - Alpha channel attributes. (Set defines below)
- */
-typedef struct _TGA2Extension
-	{
-	short         ExtSize;
-	char          AuthName[41];
-	char          AuthComment[324];
-	TGA2DateStamp Date;
-	TGA2TimeStamp Time;
-	char          JobName[41];
-	TGA2TimeStamp JobTime;
-	char          SoftID[41];
-	TGA2SoftVer   SoftVer;
-	long          KeyColor;
-	TGA2Ratio     Aspect;
-	TGA2Ratio     Gamma;
-	long          ColorCor;
-	long          PostStamp;
-	long          ScanLine;
-	char          Attributes;
-	} TGA2Extension;
-
-/* Alpha channel attributes (Extension Area) */
-#define EXTA_NOALPHA 0  /* No alpha data included */
-#define EXTA_IGNORE  1  /* Undefined alpha data, can ignore */
-#define EXTA_RETAIN  2  /* Undefined alpha data, should retain */
-#define EXTA_USEFUL  3  /* Useful alpha channel */
-#define EXTA_PREMULT 4  /* Pre-Multiplied alpha data */
-
-#pragma pack(pop)
-
-/*
-** This define changes this code from code that works with standard IO calls,
-** to code that uses FileClass and FileFactoryClass.
-*/
-//#define TGA_USES_WWLIB_FILE_CLASSES
-
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-class FileClass;
-#endif
-
-/*---------------------------------------------------------------------------
- * CLASS DEFINITION
- *-------------------------------------------------------------------------*/
-
-class Targa
-	{
-	public:
-		/* Constructor/destructor */
-		Targa(void);
-		~Targa();
-
-		/* Function prototypes. */
-		long Open(const char* name, long mode);
-		void Close(void);
-
-		long Load(const char* name, char* palette, char* image,bool invert_image=true);
-		long Load(const char* name, long flags, bool invert_image=true);
-		long Save(const char* name, long flags, bool addextension = false);
-		
-		void XFlip(void);
-		void YFlip(void);
-
-		char* SetImage(char* buffer);
-		char* GetImage(void) const {return (mImage);}
-		
-		char* SetPalette(char* buffer);
-		char* GetPalette(void) const {return (mPalette);}
-		
-		bool IsCompressed(void);
-
-		TGA2Extension* GetExtension(void);
-
-		TGAHeader Header;
-
-	protected:
-#ifdef TGA_USES_WWLIB_FILE_CLASSES
-		FileClass *TGAFile;
-#else
-		long mFH;
-#endif
-		long mAccess;
-		long mFlags;
-		char* mImage;
-		char* mPalette;
-		TGA2Extension mExtension;
-
-	private:
-		// Utility functions
-		long DecodeImage(void);
-		long EncodeImage(void);
-		void InvertImage(void);
-
-		// These functions are for ease of ifdef'ing between standard io calls
-		// and FileClass.
-		void Clear_File(void);
-		bool Is_File_Open(void);
-		bool File_Open_Read(const char* name);
-		bool File_Open_Write(const char* name);
-		bool File_Open_ReadWrite(const char* name);
-		int File_Seek(int pos, int dir);
-		int File_Read(void *buffer, int size);
-		int File_Write(void *buffer, int size);
-	};
-
-#endif /* _TARGA_H_ */
-
diff --git a/Core/Tools/WW3D/max2w3d/TARGA.cpp b/Core/Tools/WW3D/max2w3d/TARGA.cpp
new file mode 100644
index 00000000000..8b0ffd2e417
--- /dev/null
+++ b/Core/Tools/WW3D/max2w3d/TARGA.cpp
@@ -0,0 +1,1397 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/****************************************************************************
+*
+*        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S
+*
+*----------------------------------------------------------------------------
+*
+* FILE
+*     targa.cpp
+*
+* DESCRIPTION
+*     Targa image file class.
+*
+* PROGRAMMER
+*     Denzil E. Long, Jr.
+*
+* DATE
+*     August 8, 1995
+*
+*----------------------------------------------------------------------------
+*
+* PUBLIC
+*     Open - Open Targa image file.
+*     Close - Close Targa image file.
+*     Load - Load Targa image file.
+*     Save - Save a Targa Image File.
+*     XFlip - X flip the image.
+*     YFlip - Y flip the image.
+*     SetImage - Set the image buffer.
+*     GetImage - Get the current image buffer address.
+*     SetPalette - Set the palette buffer.
+*     GetPalette - Retrieve the current palette buffer address.
+*     GetExtension - Get Extension data. (Targa 2.0 files only)
+*
+* PRIVATE
+*     DecodeImage - Decompress Targa image data.
+*     EncodeImage - Compress the image using targa RLE.
+*     InvertImage - Invert TrueColor image data.
+*
+* MODIFICATIONS:
+*     Converted to work with FileClass, FileFactory (changes are inside
+*     ifdefs, so can be easily reversed). Naty Hoffman, January 25, 2001
+*
+****************************************************************************/
+
+#include "TARGA.h"
+#ifndef TGA_USES_WWLIB_FILE_CLASSES
+#include <stdio.h>
+#endif
+#include <malloc.h>
+#include <memory.h>
+#include <string.h>
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+#include "wwfile.h"
+#include "ffactory.h"
+#else
+#include <io.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#endif
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::Targa - Initialize a Targa instance.
+*
+* SYNOPSIS
+*     Targa()
+*
+*     void Targa(void);
+*
+* FUNCTION
+*     Initialize the targa class instance.
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+Targa::Targa(void)
+	{
+	mImage = NULL;
+	mPalette = NULL;
+	Clear_File();
+	mAccess = TGA_READMODE;
+	mFlags = 0;
+	memset(&Header, 0, sizeof(TGAHeader));
+	memset(&mExtension, 0, sizeof(TGA2Extension));
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::~Targa - Targa class destructor.
+*
+* SYNOPSIS
+*     ~Targa()
+*
+*     void ~Targa(void);
+*
+* FUNCTION
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+Targa::~Targa(void)
+{
+	/* Close the file if has been left open. */
+	Close();
+
+	/* Free the palette buffer if we allocated it. */
+	if ((mPalette != NULL) && (mFlags & TGAF_PAL))
+		free(mPalette);
+
+	/* Free the image buffer if we allocated it. */
+	if ((mImage != NULL) && (mFlags & TGAF_IMAGE))
+		free(mImage);
+}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::Open - Open Targa image file.
+*
+* SYNOPSIS
+*     Error = Open(Name, Mode)
+*
+*     long Open(char *, long);
+*
+* FUNCTION
+*     Open a Targa image file and read in its header. The file stream will
+*     positioned after the ID field (if there is one).
+*
+* INPUTS
+*     Name - Pointer to name of Targa file.
+*     Mode - Access mode.
+*
+* RESULT
+*     Error - Error code, 0 if okay.
+*
+****************************************************************************/
+
+long Targa::Open(const char* name, long mode)
+{
+	TGA2Footer	footer;
+	long			size;
+	long			error = 0;
+
+	/* File already open? */
+	if (Is_File_Open() && (mAccess == mode)) {
+		return (0);
+	}
+
+	Close();
+
+	/* Initialize the access mode. */
+	mAccess = mode;
+	mFlags &= ~TGAF_TGA2;
+
+	switch (mode) {
+
+		/* Open targa file for read. */
+		case TGA_READMODE:
+			if (File_Open_Read(name)) {
+
+				/* Check for 2.0 targa file by loading the footer */
+				if (File_Seek(-26, SEEK_END) == -1) {
+					error = TGAERR_READ;
+				}
+
+				if (!error) {
+					if (File_Read(&footer, sizeof(TGA2Footer)) != sizeof(TGA2Footer)) {
+						error = TGAERR_READ;
+					} else {
+						/* If this a 2.0 file with an extension? */
+						if (strncmp(footer.Signature, TGA2_SIGNATURE, 16) == 0) {
+							if (footer.Extension != 0) {
+								mFlags |= TGAF_TGA2;
+							}
+						}
+					}
+				}
+
+				/* Read in Extension data */
+				if (!error && (mFlags & TGAF_TGA2)) {
+
+					if (File_Seek(footer.Extension, SEEK_SET) == -1) {
+						error = TGAERR_READ;
+					}
+
+					if (!error) {
+						if (File_Read(&mExtension, sizeof(TGA2Extension)) != sizeof(TGA2Extension)) {
+							error = TGAERR_READ;
+						}
+					}
+				}
+
+				/* Read in header. */
+				if (!error && (File_Seek(0, SEEK_SET) == -1)) {
+					error = TGAERR_READ;
+				} else {
+
+					size = File_Read(&Header, sizeof(TGAHeader));
+					if (size != sizeof(TGAHeader)) {
+						error = TGAERR_READ;
+					}
+				}
+
+				/* Skip the ID field */
+				if (!error && (Header.IDLength != 0)) {
+					if (File_Seek(Header.IDLength, SEEK_CUR) == -1) {
+						error = TGAERR_READ;
+					}
+				}
+
+			} else {
+				error = TGAERR_OPEN;
+			}
+			break;
+
+		/* Open targa file for write. */
+		case TGA_WRITEMODE:
+			if (!File_Open_Write(name)) {
+				error = TGAERR_OPEN;
+			} else {
+//				printf("\r");
+			}
+			break;
+
+		/* Open targa file for read/write.*/
+		case TGA_RDWRMODE:
+			if (File_Open_ReadWrite(name)) {
+
+				/* Read in header. */
+				size = File_Read(&Header, sizeof(TGAHeader));
+
+				if (size != sizeof(TGAHeader)) {
+					error = TGAERR_READ;
+				}
+				/* Skip the ID field */
+				if (!error && (Header.IDLength != 0)) {
+					if (File_Seek(Header.IDLength, SEEK_CUR) == -1) {
+						error = TGAERR_READ;
+					}
+				}
+
+			} else {
+				error = TGAERR_OPEN;
+			}
+			break;
+	}
+
+	/* Close on any error! */
+	if (error) {
+		Close();
+	}
+
+	return (error);
+}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::Close - Close Targa image file.
+*
+* SYNOPSIS
+*     Close()
+*
+*     void Close(void);
+*
+* FUNCTION
+*     Close the Targa image file and free its handle.
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+void Targa::Close(void)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	if (TGAFile) {
+		TGAFile->Close();
+		_TheFileFactory->Return_File(TGAFile);
+		TGAFile = NULL;
+	}
+#else
+	/* Close the file if it is open. */
+	if (mFH != -1) {
+		close(mFH);
+		mFH = -1;
+	}
+#endif
+}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::Load - Load Targa Image File into specified buffers.
+*
+* SYNOPSIS
+*     Error = Load(Name, Palette, ImageBuffer)
+*
+*     long Load(char *, char *, char *);
+*
+* FUNCTION
+*     Open and load the Targa into the specified buffers. If either buffer
+*     pointer is NULL then that field will not be processed.
+*
+* INPUTS
+*     Name        - Name of Targa image file to load.
+*     Palette     - Pointer to buffer to load the palette into.
+*     ImageBuffer - Pointer to buffer to load the image data into.
+*
+* RESULT
+*     Error - 0 if successful, or TGAERR_??? error code.
+*
+****************************************************************************/
+
+long Targa::Load(const char* name, char* palette, char* image,bool invert_image)
+{
+	long size;
+	long depth;
+	long error = 0;
+
+	/* Open the Targa */
+	if (Open(name, TGA_READMODE) == NULL) {
+
+		/* Process ColorMap (palette) */
+		if (Header.ColorMapType == 1) {
+
+			depth = (Header.CMapDepth >> 3);
+			size = (Header.CMapLength * depth);
+
+			/* Load the palette from the TGA if a palette buffer is provided
+			 * otherwise we will skip it.
+			 */
+			if ((palette != NULL) && (Header.CMapLength > 0)) {
+
+				/* Adjust palette to the starting color entry. */
+				palette += (Header.CMapStart * depth);
+
+				/* Read in the palette. */
+				if (File_Read(palette, size) != size) {
+					error = TGAERR_READ;
+				}
+
+			} else {
+				if (File_Seek(size, SEEK_CUR) == -1) {
+					error = TGAERR_READ;
+				}
+			}
+		}
+
+		/* Load the image data from the TGA if an image buffer is provided
+		 * otherwise we are done.
+		 */
+		if (!error && (image != NULL)) {
+
+			depth = TGA_BytesPerPixel(Header.PixelDepth);
+			size = ((Header.Width * Header.Height) * depth);
+
+			switch (Header.ImageType) {
+				case TGA_CMAPPED:
+					if (File_Read(image, size) != size) {
+						error = TGAERR_READ;
+					}
+					break;
+
+				case TGA_TRUECOLOR:
+					if (File_Read(image, size) == size) {
+						if (invert_image) InvertImage();
+					} else {
+						error = TGAERR_READ;
+					}
+					break;
+
+				case TGA_MONO:
+					if (File_Read(image, size) != size) {
+						error = TGAERR_READ;
+					}
+					break;
+
+				case TGA_CMAPPED_ENCODED:
+					error = DecodeImage();
+					break;
+
+				case TGA_TRUECOLOR_ENCODED:
+					if ((error = DecodeImage()) == NULL) {
+						if (invert_image) InvertImage();
+					}
+					break;
+
+				default:
+					error = TGAERR_NOTSUPPORTED;
+					break;
+			}
+
+			/* Arrange the image so that the origin position (coordinate 0,0)
+			 * is the upperleft hand corner of the image.
+			 */
+			if (!error) {
+				if ( Header.ImageDescriptor & TGAIDF_XORIGIN ) {
+					XFlip();
+					Header.ImageDescriptor &= ~TGAIDF_XORIGIN;
+				}
+
+				// Mod (IML) : Locate the origin at the bottom-left corner instead. This
+				// will make ot consistent with .TGA's that have been generated with our
+				// existing software.
+				//	if (( Header.ImageDescriptor & TGAIDF_YORIGIN ) == 0){
+				if ( Header.ImageDescriptor & TGAIDF_YORIGIN ) {
+					YFlip();
+					//	Bug fix (IML) : Clear this flag to indicate to the targa reader
+					// that the Y-origin is at the bottom of the image.
+					Header.ImageDescriptor &= ~TGAIDF_YORIGIN;
+				}
+			}
+		}
+
+		/* Close the Targa */
+		Close();
+
+	} else {
+		error = TGAERR_OPEN;
+	}
+
+	return (error);
+}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::Load - Load Targa Image File. (Auto buffer allocation).
+*
+* SYNOPSIS
+*     Error = Load(Name, Flags)
+*
+*     long Load(char, long);
+*
+* FUNCTION
+*     Open and load the Targa into buffers allocated by this function.
+*
+* INPUTS
+*     Name  - Name of Targa image file to load.
+*     Flags -
+*
+* RESULT
+*     Error - 0 if successful, or TGAERR_??? error code.
+*
+****************************************************************************/
+
+long Targa::Load(const char* name, long flags, bool invert_image)
+{
+	long size;
+	long error = 0;
+
+	/* Open the file to get the header. */
+	if (Open(name, TGA_READMODE) == 0) {
+
+		/* Allocate palette memory if requested to and the targa has one. */
+		if ((flags & TGAF_PAL) && (Header.ColorMapType == 1)) {
+
+			/* Dispose of any previous palette. */
+			if ((mPalette != NULL) && (mFlags & TGAF_PAL)) {
+				free(mPalette);
+				mPalette = NULL;
+				mFlags &= ~TGAF_PAL;
+			}
+
+			/* Only allocate a palette if the client hasn't assigned one. */
+			if ((mPalette == NULL) && !(mFlags & TGAF_PAL)) {
+
+				/* Compute the size of the palette from the targa header. */
+				size = (Header.CMapLength * (Header.CMapDepth >> 3));
+
+				if (size != 0) {
+					/* Allocate memory for the palette. */
+					if ((mPalette = (char *)malloc(size)) != NULL) {
+						mFlags |= TGAF_PAL; /* We allocated the palette. */
+					} else {
+						error = TGAERR_NOMEM;
+					}
+				}
+			}
+		}
+
+		/* Allocate image memory if requested to. */
+		if (!error && (flags & TGAF_IMAGE)) {
+
+			/* Dispose of any previous image. */
+			if ((mImage != NULL) && (mFlags & TGAF_IMAGE)) {
+				free(mImage);
+				mImage = NULL;
+				mFlags &= ~TGAF_IMAGE;
+			}
+
+			/* Only allocate an image if the client hasn't assigned one. */
+			if ((mImage == NULL) && !(mFlags & TGAF_IMAGE)) {
+
+				/* Compute the size of the image data from the targa header. */
+				size = ((Header.Width * Header.Height) * TGA_BytesPerPixel(Header.PixelDepth));
+				if (size != 0) {
+					/* Allocate memory for the image. */
+					if ((mImage = (char *)malloc(size)) != NULL) {
+						mFlags |= TGAF_IMAGE; /* We allocated the image. */
+					} else {
+						error = TGAERR_NOMEM;
+					}
+				}
+			}
+		}
+
+		/* Read in the file contents. */
+		if (!error) {
+			error = Load(name, mPalette, mImage, invert_image);
+		}
+
+		/* Close the file. */
+		Close();
+
+	} else {
+		error = TGAERR_OPEN;
+	}
+
+	return (error);
+}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::Save - Save a Targa Image File.
+*
+* SYNOPSIS
+*     Error = Save(Name, Flags)
+*
+*     long Save(char *, long);
+*
+* FUNCTION
+*
+* INPUTS
+*     Name  - Pointer to name of file to save.
+*     Flags -
+*
+* RESULT
+*     Error - 0 if successful, or TGAERR_??? error code.
+*
+****************************************************************************/
+
+long Targa::Save(const char* name, long flags, bool addextension)
+	{
+	long size;
+	long depth;
+	char *palette;
+	char *temppal;
+	char *ptr;
+	//long i,n;
+	//char c;
+	long error = 0;
+	TGA2Footer footer;
+
+	/* Open the Targa for write. */
+	if (Open(name, TGA_WRITEMODE) == NULL)
+		{
+		Header.IDLength = 0;
+
+		/* Set the ImageType for compression. */
+		if (flags & TGAF_COMPRESS)
+			{
+			switch (Header.ImageType)
+				{
+				case TGA_CMAPPED:
+				case TGA_TRUECOLOR:
+				case TGA_MONO:
+					Header.ImageType += 8;
+				break;
+
+				case TGA_CMAPPED_ENCODED:
+				case TGA_TRUECOLOR_ENCODED:
+				case TGA_MONO_ENCODED:
+				break;
+
+				/* Turn off compression for unknown types. */
+				default:
+					flags &= ~TGAF_COMPRESS;
+				break;
+				}
+			}
+
+		/*-----------------------------------------------------------------------
+		 * WRITE THE HEADER DATA SECTION
+		 *---------------------------------------------------------------------*/
+		if (File_Write(&Header, sizeof(TGAHeader)) != sizeof(TGAHeader))
+			error = TGAERR_WRITE;
+
+		/*-----------------------------------------------------------------------
+		 * WRITE THE COLORMAP (PALETTE) DATA SECTION
+		 *---------------------------------------------------------------------*/
+		if (!error && (flags & TGAF_PAL) && (mPalette != NULL)
+				&& (Header.CMapLength > 0))
+			{
+			/* Adjust palette to the starting color entry. */
+			depth = (Header.CMapDepth >> 3);
+			palette = mPalette + (Header.CMapStart * depth);
+			size = (Header.CMapLength * depth);
+
+			/* Allocate temporary buffer for palette manipulation. */
+			if ((temppal = (char *)malloc(size)) != NULL)
+				{
+				memcpy(temppal, palette, size);
+				ptr = temppal;
+
+				#if(0)
+				/* Swap the byte ordering of the palette entries. */
+				for (i = 0; i < Header.CMapLength; i++)
+					{
+					c = *ptr;
+					*ptr = *(ptr + (depth - 1));
+					*(ptr + (depth - 1)) = c;
+
+					/* Next entry */
+					palette += depth;
+					}
+				#endif
+
+				/* Write the palette. */
+				if (File_Write(temppal, size) != size)
+					error = TGAERR_WRITE;
+
+				/* Free temporary palette buffer. */
+				free(temppal);
+				}
+			else
+				error = TGAERR_NOMEM;
+			}
+
+		/*-----------------------------------------------------------------------
+		 * WRITE THE IMAGE DATA SECTION
+		 *---------------------------------------------------------------------*/
+		if (!error && (flags & TGAF_IMAGE) && (mImage != NULL))
+			{
+
+			bool imageinverted;
+
+			/* Invert truecolor data. */
+			if ((Header.ImageType == TGA_TRUECOLOR) || (Header.ImageType == TGA_TRUECOLOR_ENCODED)) {
+				InvertImage();
+				imageinverted = true;
+			} else {
+				imageinverted = false;
+			}
+
+			/* Write the image. */
+			if (flags & TGAF_COMPRESS)
+				EncodeImage();
+			else
+				{
+				depth = TGA_BytesPerPixel(Header.PixelDepth);
+				size = (((Header.Width * Header.Height)) * depth);
+
+				if (File_Write(mImage, size) != size)
+					error = TGAERR_WRITE;
+				}
+
+			// Bug fix (IML) : If the image was inverted, invert it again to restore it to its prior state.
+			if (imageinverted) InvertImage();
+			}
+
+		/*-----------------------------------------------------------------------
+		 * WRITE THE EXTENSION DATA SECTION
+		 *---------------------------------------------------------------------*/
+
+		// Mod (IML) Optionally add an extension to the file.
+		if (addextension) {
+			if (!error) {
+
+				mExtension.ExtSize = 495;
+				strncpy(mExtension.SoftID, "Denzil's Targa Code", 41);
+				mExtension.SoftVer.Number = (1 * 100);
+				mExtension.SoftVer.Letter = 0;
+
+				/* Save position of extension area. */
+				if ((footer.Extension = File_Seek(0, SEEK_CUR)) == -1)
+					error = TGAERR_WRITE;
+
+				if (!error && (File_Write(&mExtension, sizeof(TGA2Extension))
+						!= sizeof(TGA2Extension)))
+					error = TGAERR_WRITE;
+			}
+		} else {
+			footer.Extension = 0;
+		}
+
+		/*-----------------------------------------------------------------------
+		 * WRITE THE FOOTER DATA SECTION
+		 *---------------------------------------------------------------------*/
+		if (!error)
+			{
+			footer.Developer = 0;
+			strncpy(footer.Signature, TGA2_SIGNATURE, 16);
+			footer.RsvdChar = '.';
+			footer.BZST = 0;
+
+			if (File_Write(&footer, sizeof(TGA2Footer)) != sizeof(TGA2Footer))
+				error = TGAERR_WRITE;
+			}
+
+		/* Close targa file. */
+		Close();
+		}
+	else
+		error = TGAERR_OPEN;
+
+	return (error);
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::XFlip - X flip the image.
+*
+* SYNOPSIS
+*     XFlip()
+*
+*     void XFlip();
+*
+* FUNCTION
+*     Flip the image in memory on its X axis. (left to right)
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+void Targa::XFlip(void)
+	{
+	char *ptr,*ptr1;
+	long  x,y,d;
+	char  v,v1;
+	char  depth;
+
+	/* Pixel depth in bytes. */
+	depth = TGA_BytesPerPixel(Header.PixelDepth);
+
+	for (y = 0; y < Header.Height; y++)
+		{
+		ptr = (mImage + ((Header.Width * depth) * y));
+		ptr1 = (ptr + ((Header.Width * depth) - depth));
+
+		for (x = 0; x < (Header.Width / 2); x++)
+			{
+			for (d = 0; d < depth; d++)
+				{
+				v = *(ptr + d);
+				v1 = *(ptr1 + d);
+				*(ptr + d) = v1;
+				*(ptr1 + d) = v;
+				}
+
+			ptr += depth;
+			ptr1 -= depth;
+			}
+		}
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::YFlip - Y flip the image.
+*
+* SYNOPSIS
+*     YFlip()
+*
+*     void YFlip();
+*
+* FUNCTION
+*     Flip the image in memory on its Y axis. (top to bottom)
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+void Targa::YFlip(void)
+	{
+	char *ptr,*ptr1;
+	long  x,y;
+	char  v,v1;
+	char  depth;
+
+	/* Pixel depth in bytes. */
+	depth = TGA_BytesPerPixel(Header.PixelDepth);
+
+	for (y = 0; y < (Header.Height >> 1); y++)
+		{
+		/* Compute address of lines to exchange. */
+		ptr = (mImage + ((Header.Width * y) * depth));
+		ptr1 = (mImage + ((Header.Width * (Header.Height - 1)) * depth));
+		ptr1 -= ((Header.Width * y) * depth);
+
+		/* Exchange all the pixels on this scan line. */
+		for (x = 0; x < (Header.Width * depth); x++)
+			{
+			v = *ptr;
+			v1 = *ptr1;
+			*ptr = v1;
+			*ptr1 = v;
+			ptr++;
+			ptr1++;
+			}
+		}
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::SetImage - Set the image buffer.
+*
+* SYNOPSIS
+*     OldImage = SetImage(Image)
+*
+*     char *SetImage(char *);
+*
+* FUNCTION
+*     Set the image buffer to one provided by the caller.
+*
+* INPUTS
+*     Image - Pointer to buffer to use for the image buffer.
+*
+* RESULT
+*     OldImage - Previous caller assigned image buffer.
+*
+****************************************************************************/
+
+char *Targa::SetImage(char *buffer)
+{
+	char *oldbuffer = NULL;
+
+	/* Free any image buffer before assigning another. */
+	if ((mImage != NULL) && (mFlags & TGAF_IMAGE))
+	{
+		free(mImage);
+		mImage = NULL;
+		mFlags &= ~TGAF_IMAGE;
+	}
+
+	/* Get the old user buffer. */
+	if (mImage != NULL)
+		oldbuffer = mImage;
+
+	/* Assign the new image buffer. */
+	mImage = buffer;
+
+	return (oldbuffer);
+}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::SetPalette - Set the palette buffer.
+*
+* SYNOPSIS
+*     OldPal = SetPalette(Pal)
+*
+*     char *SetPalette(char *);
+*
+* FUNCTION
+*
+* INPUTS
+*     Pal - Pointer to buffer to use for palette.
+*
+* RESULT
+*     OldPal - Pointer to previous user palette.
+*
+****************************************************************************/
+
+char *Targa::SetPalette(char *buffer)
+{
+	char *oldbuffer = NULL;
+
+	/* Free any image buffer before assigning another. */
+	if ((mPalette != NULL) && (mFlags & TGAF_PAL))
+	{
+		free(mPalette);
+		mPalette = NULL;
+		mFlags &= ~TGAF_PAL;
+	}
+
+	/* Get the old user buffer. */
+	if (mPalette != NULL)
+		oldbuffer = mPalette;
+
+	/* Assign the new image buffer. */
+	mPalette = buffer;
+
+	return (oldbuffer);
+}
+
+
+bool Targa::IsCompressed(void)
+	{
+	if (Header.ImageType > 8)
+		return true;
+
+	return false;
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::GetExtension - Get Extension data. (Targa 2.0 files only)
+*
+* SYNOPSIS
+*     Ext = GetExtension()
+*
+*     TGA2Extension *GetExtension(void);
+*
+* FUNCTION
+*     Retrieve a pointer to the Targa 2.0 extension data area. If the file
+*     version is 1.0 OR there is no extensio area then a NULL will be returned.
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     Ext - Pointer to Extension data, NULL if not available.
+*
+****************************************************************************/
+
+TGA2Extension *Targa::GetExtension(void)
+	{
+	if (mFlags & TGAF_TGA2)
+		return (&mExtension);
+
+	return (NULL);
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::DecodeImage - Decompress Targa image data.
+*
+* SYNOPSIS
+*     Error = DecodeImage()
+*
+*     long DecodeImage();
+*
+* FUNCTION
+*     Decode the RLE compressed image data into the specified buffer from
+*     the file I/O stream.
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     Error - 0 if successful, or TGAERR_??? error code.
+*
+****************************************************************************/
+
+long Targa::DecodeImage()
+	{
+	char          *image;
+	char          *color;
+	unsigned char count;
+	unsigned char depth;
+	unsigned long pixel_count;
+	unsigned long size;
+	unsigned long c,i;
+	long          error = 0;
+
+	/* Initialize */
+	image = mImage;
+
+	/* Compute pixel depth in bytes. */
+	depth = TGA_BytesPerPixel(Header.PixelDepth);
+
+	/* Total number of pixels compressed in this image. */
+	pixel_count = (Header.Width * Header.Height);
+
+	while ((pixel_count > 0) && !error)
+		{
+ 		/* Read count. */
+		if (File_Read(&count, 1) == 1)
+			{
+			/* If bit 8 of the count is set then we have a run of pixels,
+			 * otherwise the data is raw pixels.
+			 */
+			if (count & 0x80)
+				{
+				count &= 0x7F;
+				count++;
+
+				/* Read in run pixel. */
+				if (File_Read(image, depth) == depth)
+					{
+					color = image;
+					image += depth;
+
+					/* Repeat the pixel for the run count in the image buffer. */
+					for (c = 1; c < count; c++)
+						for (i = 0; i < depth; i++)
+							*image++ = *(color + i);
+					}
+				else
+					error = TGAERR_READ;
+				}
+			else
+				{
+				count++;
+				size = (count * depth);
+
+				/* Read in raw pixels. */
+				if ((unsigned)File_Read(image, size) == size)
+					image += size;
+				else
+					error = TGAERR_READ;
+				}
+
+			/* Adjust the pixel count. */
+			pixel_count -= count;
+			}
+		else
+			error = TGAERR_READ;
+		}
+
+	return (error);
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::EncodeImage - Compress the image using targa RLE.
+*
+* SYNOPSIS
+*     EncodeImage()
+*
+*     void EncodeImage(void);
+*
+* FUNCTION
+*     Encode the image data using the RLE algorithm outlined in the TARGA
+*     file specification.
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+long Targa::EncodeImage()
+	{
+	char *packet;
+	long packet_index;
+	char *start;
+	char *end;
+	long depth;
+	long pixels;
+	long count;
+	long match;
+	long i;
+	long error = 0;
+
+	/* Initialize variables. */
+	depth = TGA_BytesPerPixel(Header.PixelDepth);
+
+	/* Allocate packet buffer to hold maximum encoded data run. */
+	if ((packet = (char *)malloc(128 * depth)) != NULL)
+		{
+		pixels = Header.Width * Header.Height;
+		start = mImage;
+		end = start;
+		count = 0;
+		packet[0] = 0;
+		packet_index = 1;
+
+		while ((pixels != 0) && !error)
+			{
+			match = 1;
+
+			/* Advance to the next pixel */
+			end += depth;
+			pixels--;
+
+			/* Compare pixels. */
+			for (i = 0; i < depth; i++)
+				{
+				if (start[i] != end[i])
+					{
+					match = 0;
+					break;
+					}
+				}
+
+			/* Run of pixels */
+ 			if (match == 1)
+				{
+				count++;
+
+				/* Continue counting until the maximum has been reached. */
+				if (count < 128)
+					{
+					if (packet[0] == 0)
+						continue;
+					}
+				else
+					count--;
+				}
+
+			/* If there is a count then write out the run. Otherwise, write
+			 * the raw pixel to the packet.
+			 */
+			if ((count != 0) && (packet[0] == 0))
+				{
+				/* Run count */
+				packet[0] = (count | 0x80);
+
+				/* Run pixel */
+				for (i = 0; i < depth; i++)
+					packet[i + 1] = start[i];
+
+				/* Write the run packet. */
+				if (File_Write(packet, (depth + 1)) != (depth + 1))
+					error = TGAERR_WRITE;
+
+				/* Reposition start and reset. */
+				start = end;
+				count = 0;
+				packet[0] = 0;
+				}
+			else
+				{
+				if (count == 0)
+					{
+					/* Copy the raw pixel to the packet. */
+					for (i = 0; i < depth; i++)
+						packet[packet_index + i] = start[i];
+
+					/* Increment the raw packet count. */
+					packet[0]++;
+
+					/* Reposition start */
+					start = end;
+					packet_index += depth;
+					}
+
+				/* Write the raw packet if the packet is full or a run has started
+				 * or all the pixels have been processed.
+				 */
+				if ((packet[0] == 127) || (count != 0) || (pixels == 0))
+					{
+					i = packet[0];
+					packet[0]--;
+
+					if (File_Write(packet, ((i * depth) + 1)) != ((i * depth) + 1))
+						error = TGAERR_WRITE;
+
+					packet_index = 1;
+					packet[0] = 0;
+					}
+				}
+			}
+
+		/* Free the packet buffer. */
+		free(packet);
+		}
+	else
+		error = TGAERR_NOMEM;
+
+	return (error);
+	}
+
+
+/****************************************************************************
+*
+* NAME
+*     Targa::InvertImage - Invert TrueColor image data.
+*
+* SYNOPSIS
+*     InvertImage()
+*
+*     void InvertImage(void);
+*
+* FUNCTION
+*
+* INPUTS
+*     NONE
+*
+* RESULT
+*     NONE
+*
+****************************************************************************/
+
+void Targa::InvertImage(void)
+	{
+	char *buffer;
+	long depth;
+	long pixel_count;
+	long i;
+	char c;
+
+	/* Initialize */
+	buffer = mImage;
+
+	/* Compute the pixel depth in bytes. */
+	depth = TGA_BytesPerPixel(Header.PixelDepth);
+
+	/* Total number of pixels in this image. */
+	pixel_count = (Header.Width * Header.Height);
+
+	/* 16-bit pixel layout is different that 24-bit and 32-bit. */
+	if (depth > 2)
+		{
+		while (pixel_count > 0)
+			{
+			for (i = 0; i < (depth / 2); i++)
+				{
+				c = *(buffer + i);
+				*(buffer + i) = *(buffer + ((depth - 1) - i));
+				*(buffer + ((depth - 1) - i)) = c;
+				}
+
+			/* Next pixel */
+			pixel_count--;
+			buffer += depth;
+			}
+		}
+	}
+
+
+/*
+** These functions are just for ease of ifdef'ing between standard io calls and FileClass.
+*/
+void Targa::Clear_File(void)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	TGAFile = NULL;
+#else
+	mFH = -1;
+#endif
+}
+bool Targa::Is_File_Open(void)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	return (TGAFile != NULL);
+#else
+	return (mFH != -1);
+#endif
+}
+bool Targa::File_Open_Read(const char* name)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	TGAFile = _TheFileFactory->Get_File(name);
+	if (TGAFile && TGAFile->Is_Available()) {
+		return (TGAFile->Open(FileClass::READ) != 0);
+	} else {
+		return false;
+	}
+#else
+	mFH = open(name, (O_RDONLY|O_BINARY));
+	return (mFH != -1);
+#endif
+}
+bool Targa::File_Open_Write(const char* name)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	TGAFile = _TheWritingFileFactory->Get_File(name);
+	if (TGAFile) {
+		return (TGAFile->Open(FileClass::WRITE) != 0);
+	} else {
+		return false;
+	}
+#else
+	mFH = open(name, (O_CREAT|O_TRUNC|O_WRONLY|O_BINARY), (S_IREAD|S_IWRITE));
+	return (mFH != -1);
+#endif
+}
+bool Targa::File_Open_ReadWrite(const char* name)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	TGAFile = _TheWritingFileFactory->Get_File(name);
+	if (TGAFile && TGAFile->Is_Available()) {
+		return (TGAFile->Open(FileClass::READ|FileClass::WRITE) != 0);
+	} else {
+		return false;
+	}
+#else
+	mFH = open(name, (O_RDWR|O_BINARY), (S_IREAD|S_IWRITE));
+	return (mFH != -1);
+#endif
+}
+int Targa::File_Seek(int pos, int dir)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	return TGAFile->Seek(pos, dir);
+#else
+	return lseek(mFH, pos, dir);
+#endif
+}
+int Targa::File_Read(void *buffer, int size)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	return TGAFile->Read(buffer, size);
+#else
+	return read(mFH, buffer, size);
+#endif
+}
+int Targa::File_Write(void *buffer, int size)
+{
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+	return TGAFile->Write(buffer, size);
+#else
+	return write(mFH, buffer, size);
+#endif
+}
+
+// ----------------------------------------------------------------------------
+//
+// Output targa load error message.
+//
+// ----------------------------------------------------------------------------
+
+long Targa_Error_Handler(long load_err,const char* filename)
+{
+	switch (load_err) {
+	case 0:
+		return 0;
+	case TGAERR_OPEN:
+//		WWDEBUG_SAY(("Targa: Failed to open file \"%s\"", filename));
+		break;
+
+	case TGAERR_READ:
+//		WWDEBUG_SAY(("Targa: Failed to read file \"%s\"", filename));
+		break;
+
+	case TGAERR_NOTSUPPORTED:
+//		WWDEBUG_SAY(("Targa: File \"%s\" is an unsupported Targa type", filename));
+		break;
+
+	case TGAERR_NOMEM:
+//		WWDEBUG_SAY(("Targa: Failed to allocate memory for file \"%s\"", filename));
+		break;
+
+	default:
+//		WWDEBUG_SAY(("Targa: Unknown error when loading file \"%s\"", filename));
+		break;
+	}
+	return load_err;
+}
diff --git a/Core/Tools/WW3D/max2w3d/TARGA.h b/Core/Tools/WW3D/max2w3d/TARGA.h
new file mode 100644
index 00000000000..02cf38aee44
--- /dev/null
+++ b/Core/Tools/WW3D/max2w3d/TARGA.h
@@ -0,0 +1,317 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/****************************************************************************
+*
+*         C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S
+*
+*----------------------------------------------------------------------------
+*
+* FILE
+*     Targa.h
+*
+* DESCRIPTION
+*     Targa image file class definitions.
+*
+* PROGRAMMER
+*     Denzil E. Long, Jr.
+*
+* DATE
+*     July 15, 1998
+*
+****************************************************************************/
+
+#pragma pack(push, 1)
+
+// If you wish to display loading error messages call targa functions inside of
+// the following macro - for example TARGA_ERROR_HANDLER(targa.Open(filename, TGA_READMODE));
+// The error code is returned back from the handler so it can be used in an expression.
+long Targa_Error_Handler(long error_code,const char* filename);
+#define TARGA_ERROR_HANDLER(call,filename) Targa_Error_Handler(call,filename)
+
+/*---------------------------------------------------------------------------
+ * STRUCTURES AND RELATED DEFINITIONS
+ *-------------------------------------------------------------------------*/
+
+/* TGAHeader - Targa Image File header.
+ *
+ * IDLength        - Size of Image ID field
+ * ColorMapType    - Color map type.
+ * ImageType       - Image type code.
+ * CMapStart       - Color map origin.
+ * CMapLength      - Color map length.
+ * CMapDepth       - Depth of color map entries.
+ * XOffset         - X origin of image.
+ * YOffset         - Y origin of image.
+ * Width           - Width of image.
+ * Height          - Height of image.
+ * PixelDepth      - Image pixel size
+ * ImageDescriptor - Image descriptor byte.
+ */
+typedef struct _TGAHeader
+	{
+	char  IDLength;
+	char  ColorMapType;
+	char  ImageType;
+	short CMapStart;
+	short CMapLength;
+	char  CMapDepth;
+	short XOffset;
+	short YOffset;
+	short Width;
+	short Height;
+	char  PixelDepth;
+	char  ImageDescriptor;
+	} TGAHeader;
+
+/* ImageType definiton */
+#define TGA_NOIMAGE           0  /* No image data included in file */
+#define TGA_CMAPPED           1  /* Color-mapped image data */
+#define TGA_TRUECOLOR         2  /* Truecolor image data */
+#define TGA_MONO              3  /* Monochrome image data */
+#define TGA_CMAPPED_ENCODED   9  /* Color-mapped image data (Encoded) */
+#define TGA_TRUECOLOR_ENCODED 10 /* Truecolor image data (Encoded) */
+#define TGA_MONO_ENCODED      11 /* Monochrome image data (Encoded) */
+
+/* ImageDescriptor definition */
+#define TGAIDF_ATTRIB_BITS (0x0F<<0) /* Number of attribute bits per pixel */
+#define TGAIDF_XORIGIN     (1<<4)
+#define TGAIDF_YORIGIN     (1<<5)
+
+/* Access modes. */
+#define TGA_READMODE  0
+#define TGA_WRITEMODE 1
+#define TGA_RDWRMODE  2
+
+/* Error codes */
+#define TGAERR_OPEN         -1
+#define TGAERR_READ         -2
+#define TGAERR_WRITE        -3
+#define TGAERR_SYNTAX       -4
+#define TGAERR_NOMEM        -5
+#define TGAERR_NOTSUPPORTED -6
+
+/* Flags definitions */
+#define TGAF_IMAGE    (1<<0)
+#define TGAF_PAL      (1<<1)
+#define TGAF_COMPRESS (1<<2)
+#define TGAF_TGA2     (1<<3)
+
+/* Macro definitions */
+#define TGA_BytesPerPixel(a) ((a+7) >> 3)
+
+/*---------------------------------------------------------------------------
+ * TARGA 2.0 DEFINITIONS
+ *-------------------------------------------------------------------------*/
+
+#define TGA2_SIGNATURE "TRUEVISION-XFILE"
+
+/* TGA2Footer - Targa 2.0 footer
+ *
+ * Extension - Offset to the Extension area from start of file.
+ * Developer - Offset to the Developer area from start of file.
+ * Signature - 16 byte Targa 2.0 signature "TRUEVISION-XFILE"
+ * RsvdChar  - Reserved character, must be ASCII "." (period)
+ * BZST      - Binary Zero String Terminator.
+ */
+typedef struct _TGA2Footer
+	{
+	long Extension;
+	long Developer;
+	char Signature[16];
+	char RsvdChar;
+	char BZST;
+	_TGA2Footer() {}
+	} TGA2Footer;
+
+/* TGA2DateStamp - A series of 3 WORD values which define the integer value
+ *                 for the date the image was saved.
+ *
+ * Month - Month number (1 - 12)
+ * Day   - Day number (1 - 31)
+ * Year  - Year number (4 digit, ie. 1989)
+ */
+typedef struct _TGA2DateStamp
+	{
+	short Month;
+	short Day;
+	short Year;
+	} TGA2DateStamp;
+
+/* TGA2TimeStamp - A series of 3 WORD values which define the integer value
+ *                 for the time the image was saved.
+ *
+ * Hour   - Hour number, military time (0 - 23)
+ * Minute - Minute number (0 - 59)
+ * Second - Second number (0 - 59)
+ */
+typedef struct _TGA2TimeStamp
+	{
+	short Hour;
+	short Minute;
+	short Second;
+	} TGA2TimeStamp;
+
+/* TGA2SoftVer - Define the version of the software used to generate file.
+ *
+ * Number - Version number * 100
+ * Letter - Version letter
+ */
+typedef struct _TGA2SoftVer
+	{
+	short Number;
+	char  Letter;
+	} TGA2SoftVer;
+
+/* TGA2Ratio - Numerator and denominator which when taken together specify
+ *             a ratio.
+ *
+ * Numer - Numerator
+ * Denom - Denominator (a value of zero indicates no ratio specified)
+ */
+typedef struct _TGA2Ratio
+	{
+	short Numer;
+	short Denom;
+	} TGA2Ratio;
+
+/* TGA2Extension - Extension area, provided for additional file information.
+ *                 This data is pointed to by the Extension offset in the
+ *                 TGA2Footer.
+ *
+ * ExtSize     - Extension area size. (495 bytes for 2.0)
+ * AuthName    - Name of the person who created image (NULL terminated ASCII)
+ * AuthComment - Comments of the author (NULL terminated ASCII)
+ * DateStamp   - Date the file was created. (See TGA2DateStamp)
+ * TimeStamp   - Time the file was created. (See TGA2TimeStamp)
+ * JobName     - Name of job image belongs to (NULL terminated ASCII)
+ * JobTime     - Elapsed time of the job.
+ * SoftID      - ID of software used to create image (NULL terminated ASCII)
+ * SoftVer     - Version number of software used.
+ * KeyColor    - Tranparent color value.
+ * Aspect      - Pixel aspect ratio.
+ * Gamma       - Fractional gamma value.
+ * ColorCor    - Color correction table offset.
+ * PostStamp   - Postage stamp image offset.
+ * ScanLine    - Scan line table offset.
+ * Attributes  - Alpha channel attributes. (Set defines below)
+ */
+typedef struct _TGA2Extension
+	{
+	short         ExtSize;
+	char          AuthName[41];
+	char          AuthComment[324];
+	TGA2DateStamp Date;
+	TGA2TimeStamp Time;
+	char          JobName[41];
+	TGA2TimeStamp JobTime;
+	char          SoftID[41];
+	TGA2SoftVer   SoftVer;
+	long          KeyColor;
+	TGA2Ratio     Aspect;
+	TGA2Ratio     Gamma;
+	long          ColorCor;
+	long          PostStamp;
+	long          ScanLine;
+	char          Attributes;
+	} TGA2Extension;
+
+/* Alpha channel attributes (Extension Area) */
+#define EXTA_NOALPHA 0  /* No alpha data included */
+#define EXTA_IGNORE  1  /* Undefined alpha data, can ignore */
+#define EXTA_RETAIN  2  /* Undefined alpha data, should retain */
+#define EXTA_USEFUL  3  /* Useful alpha channel */
+#define EXTA_PREMULT 4  /* Pre-Multiplied alpha data */
+
+#pragma pack(pop)
+
+/*
+** This define changes this code from code that works with standard IO calls,
+** to code that uses FileClass and FileFactoryClass.
+*/
+//#define TGA_USES_WWLIB_FILE_CLASSES
+
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+class FileClass;
+#endif
+
+/*---------------------------------------------------------------------------
+ * CLASS DEFINITION
+ *-------------------------------------------------------------------------*/
+
+class Targa
+	{
+	public:
+		/* Constructor/destructor */
+		Targa(void);
+		~Targa();
+
+		/* Function prototypes. */
+		long Open(const char* name, long mode);
+		void Close(void);
+
+		long Load(const char* name, char* palette, char* image,bool invert_image=true);
+		long Load(const char* name, long flags, bool invert_image=true);
+		long Save(const char* name, long flags, bool addextension = false);
+
+		void XFlip(void);
+		void YFlip(void);
+
+		char* SetImage(char* buffer);
+		char* GetImage(void) const {return (mImage);}
+
+		char* SetPalette(char* buffer);
+		char* GetPalette(void) const {return (mPalette);}
+
+		bool IsCompressed(void);
+
+		TGA2Extension* GetExtension(void);
+
+		TGAHeader Header;
+
+	protected:
+#ifdef TGA_USES_WWLIB_FILE_CLASSES
+		FileClass *TGAFile;
+#else
+		long mFH;
+#endif
+		long mAccess;
+		long mFlags;
+		char* mImage;
+		char* mPalette;
+		TGA2Extension mExtension;
+
+	private:
+		// Utility functions
+		long DecodeImage(void);
+		long EncodeImage(void);
+		void InvertImage(void);
+
+		// These functions are for ease of ifdef'ing between standard io calls
+		// and FileClass.
+		void Clear_File(void);
+		bool Is_File_Open(void);
+		bool File_Open_Read(const char* name);
+		bool File_Open_Write(const char* name);
+		bool File_Open_ReadWrite(const char* name);
+		int File_Seek(int pos, int dir);
+		int File_Read(void *buffer, int size);
+		int File_Write(void *buffer, int size);
+	};
diff --git a/Core/Tools/WW3D/max2w3d/aabtreebuilder.cpp b/Core/Tools/WW3D/max2w3d/aabtreebuilder.cpp
index 31ca9a46825..5dce24bc68f 100644
--- a/Core/Tools/WW3D/max2w3d/aabtreebuilder.cpp
+++ b/Core/Tools/WW3D/max2w3d/aabtreebuilder.cpp
@@ -79,8 +79,8 @@ const float COINCIDENCE_EPSILON = 0.001f;
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-AABTreeBuilderClass::AABTreeBuilderClass(void) : 
-	Root(NULL), 
+AABTreeBuilderClass::AABTreeBuilderClass(void) :
+	Root(NULL),
 	CurPolyIndex(0),
 	PolyCount(0),
 	Polys(NULL),
@@ -102,8 +102,8 @@ AABTreeBuilderClass::AABTreeBuilderClass(void) :
  * HISTORY:                                                                                    *
  *   5/19/2000  gth : Created.                                                                 *
  *=============================================================================================*/
-AABTreeBuilderClass::~AABTreeBuilderClass(void) 
-{ 
+AABTreeBuilderClass::~AABTreeBuilderClass(void)
+{
 	Reset();
 }
 
@@ -122,9 +122,9 @@ AABTreeBuilderClass::~AABTreeBuilderClass(void)
  *=============================================================================================*/
 void AABTreeBuilderClass::Reset(void)
 {
-	if (Root) { 
-		delete Root; Root = NULL; 
-	} 
+	if (Root) {
+		delete Root; Root = NULL;
+	}
 
 	if (Verts != NULL) {
 		delete[] Verts;
@@ -231,7 +231,7 @@ void AABTreeBuilderClass::Build_Tree(CullNodeStruct * node,int polycount,int * p
 	SplitChoiceStruct sc;
 
 	sc = Select_Splitting_Plane(polycount,polyindices);
-	
+
 	/*
 	** If the algorithm could not separate any polys, just install the polys
 	** in this node and terminate.  TODO: explore how this happens.
@@ -276,7 +276,7 @@ void AABTreeBuilderClass::Build_Tree(CullNodeStruct * node,int polycount,int * p
 		Build_Tree(node->Front,arrays.FrontCount,arrays.FrontPolys);
 		arrays.FrontPolys = NULL;
 	}
-	
+
 	/*
 	** Build a back tree if necessary. Remember that the build function
 	** deletes the tile array.
@@ -304,7 +304,7 @@ void AABTreeBuilderClass::Build_Tree(CullNodeStruct * node,int polycount,int * p
  * HISTORY:                                                                                    *
  *   6/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-AABTreeBuilderClass::SplitChoiceStruct 
+AABTreeBuilderClass::SplitChoiceStruct
 AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices)
 {
 	WWASSERT(polyindices != NULL);
@@ -313,14 +313,14 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices)
 
 	SplitChoiceStruct best_plane_stats;
 	SplitChoiceStruct considered_plane_stats;
-	
+
 	/*
 	** Try putting axis-aligned planes through some random vertices
 	*/
 	for (int trys = 0; trys < MIN(NUM_TRYS,polycount); trys++) {
 
 		AAPlaneClass plane;
-		
+
 		/*
 		** Select a random poly and vertex index;
 		*/
@@ -328,7 +328,7 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices)
 		int vert_index = rand() % 3;
 		const Vector3i * polyverts = Polys + poly_index;
 		const Vector3 * vert = Verts + (*polyverts)[vert_index];
-		
+
 		/*
 		** Select a random plane
 		*/
@@ -364,7 +364,7 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices)
  * HISTORY:                                                                                    *
  *   6/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-AABTreeBuilderClass::SplitChoiceStruct 
+AABTreeBuilderClass::SplitChoiceStruct
 AABTreeBuilderClass::Compute_Plane_Score(int polycount,int * polyindices,const AAPlaneClass & plane)
 {
 	/*
@@ -379,16 +379,16 @@ AABTreeBuilderClass::Compute_Plane_Score(int polycount,int * polyindices,const A
 
 		switch(Which_Side(plane,polyindices[i])) {
 
-			case FRONT:	
+			case FRONT:
 			case ON:
 			case BOTH:
 				{
-					sc.FrontCount++;		
+					sc.FrontCount++;
 					Update_Min_Max(polyindices[i],sc.FMin,sc.FMax );
 					break;
 				}
 
-			case BACK:		
+			case BACK:
 				{
 					sc.BackCount++;
 					Update_Min_Max(polyindices[i],sc.BMin,sc.BMax );
@@ -396,21 +396,21 @@ AABTreeBuilderClass::Compute_Plane_Score(int polycount,int * polyindices,const A
 				}
 		}
 	}
-	
+
 	/*
 	** Inflate the box a tiny amount so that we never
 	** get volumes of zero!
 	*/
 	sc.BMin -= Vector3(WWMATH_EPSILON,WWMATH_EPSILON,WWMATH_EPSILON);
 	sc.BMax += Vector3(WWMATH_EPSILON,WWMATH_EPSILON,WWMATH_EPSILON);
-	
+
 	/*
 	** Compute the cost.
 	*/
 	float back_cost = (sc.BMax.X - sc.BMin.X) * (sc.BMax.Y - sc.BMin.Y) * (sc.BMax.Z - sc.BMin.Z) * sc.BackCount;
 	float front_cost = (sc.FMax.X - sc.FMin.X) * (sc.FMax.Y - sc.FMin.Y) * (sc.FMax.Z - sc.FMin.Z) * sc.FrontCount;
 	sc.Cost = front_cost + back_cost;
-	
+
 	if ((sc.FrontCount == 0) || (sc.BackCount == 0)) {
 		sc.Cost = FLT_MAX;
 	}
@@ -431,7 +431,7 @@ AABTreeBuilderClass::Compute_Plane_Score(int polycount,int * polyindices,const A
  * HISTORY:                                                                                    *
  *   6/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-AABTreeBuilderClass::OverlapType 
+AABTreeBuilderClass::OverlapType
 AABTreeBuilderClass::Which_Side(const AAPlaneClass & plane,int poly_index)
 {
 	/*
@@ -439,13 +439,13 @@ AABTreeBuilderClass::Which_Side(const AAPlaneClass & plane,int poly_index)
 	*/
 	int mask = 0;
 	for (int vi=0; vi<3; vi++) {
-		
+
 		const Vector3 & point = Verts[ Polys[poly_index][vi] ];
 		float delta = point[plane.Normal] - plane.Dist;
-		
+
 		if (delta > COINCIDENCE_EPSILON) {
 			mask |= POS;
-		} 
+		}
 		if (delta < -COINCIDENCE_EPSILON) {
 			mask |= NEG;
 		}
@@ -453,7 +453,7 @@ AABTreeBuilderClass::Which_Side(const AAPlaneClass & plane,int poly_index)
 	}
 
 	/*
-	** Now evaluate the status of all of the verts to determine whether the 
+	** Now evaluate the status of all of the verts to determine whether the
 	** triangle is in front, behind, on or overlapping the plane
 	*/
 
@@ -506,7 +506,7 @@ void AABTreeBuilderClass::Split_Polys
 )
 {
 	/*
-	** Note that this routine arrays of polygons. The caller is then responsible for keeping 
+	** Note that this routine arrays of polygons. The caller is then responsible for keeping
 	** track of the memory this routine allocates.
 	*/
 	if (sc.FrontCount > 0) {
@@ -524,7 +524,7 @@ void AABTreeBuilderClass::Split_Polys
 
 		switch(Which_Side(sc.Plane,polyindices[i])) {
 
-			case FRONT: 
+			case FRONT:
 			case ON:
 			case BOTH:
 				arrays->FrontPolys[arrays->FrontCount++] = polyindices[i];
@@ -537,7 +537,7 @@ void AABTreeBuilderClass::Split_Polys
 	}
 
 	/*
-	** when we are all done, the counts should match. 
+	** when we are all done, the counts should match.
 	*/
 	WWASSERT(arrays->FrontCount == sc.FrontCount);
 	WWASSERT(arrays->BackCount == sc.BackCount);
@@ -588,7 +588,7 @@ void AABTreeBuilderClass::Compute_Bounding_Box(CullNodeStruct * node)
 
 		if (node->Front->Min.Y < node->Min.Y) node->Min.Y = node->Front->Min.Y;
 		if (node->Front->Max.Y > node->Max.Y) node->Max.Y = node->Front->Max.Y;
-		
+
 		if (node->Front->Min.Z < node->Min.Z) node->Min.Z = node->Front->Min.Z;
 		if (node->Front->Max.Z > node->Max.Z) node->Max.Z = node->Front->Max.Z;
 	}
@@ -602,7 +602,7 @@ void AABTreeBuilderClass::Compute_Bounding_Box(CullNodeStruct * node)
 
 		if (node->Back->Min.Y < node->Min.Y) node->Min.Y = node->Back->Min.Y;
 		if (node->Back->Max.Y > node->Max.Y) node->Max.Y = node->Back->Max.Y;
-		
+
 		if (node->Back->Min.Z < node->Min.Z) node->Min.Z = node->Back->Min.Z;
 		if (node->Back->Max.Z > node->Max.Z) node->Max.Z = node->Back->Max.Z;
 	}
@@ -632,7 +632,7 @@ int AABTreeBuilderClass::Assign_Index(CullNodeStruct * node,int index)
 {
 	/*
 	** This function is used to assign a sequential index to
-	** each node in the tree.  The AABTree stores its nodes in 
+	** each node in the tree.  The AABTree stores its nodes in
 	** an array so this index is used to determine which slot
 	** in the array to put each node into.
 	*/
@@ -665,9 +665,9 @@ int AABTreeBuilderClass::Assign_Index(CullNodeStruct * node,int index)
  *   6/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 int AABTreeBuilderClass::Node_Count(void)
-{	
+{
 	if (Root) {
-		return Node_Count_Recursive(Root,0);	
+		return Node_Count_Recursive(Root,0);
 	} else {
 		return 0;
 	}
@@ -686,8 +686,8 @@ int AABTreeBuilderClass::Node_Count(void)
  * HISTORY:                                                                                    *
  *   10/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-int AABTreeBuilderClass::Poly_Count(void) 
-{ 
+int AABTreeBuilderClass::Poly_Count(void)
+{
 	return PolyCount;
 }
 
@@ -890,7 +890,7 @@ void AABTreeBuilderClass::Build_W3D_AABTree_Recursive
 	newnode->Max.X = node->Max.X;
 	newnode->Max.Y = node->Max.Y;
 	newnode->Max.Z = node->Max.Z;
-	
+
 	/*
 	** If this is a non-leaf node, set up the child indices, otherwise set up the polygon indices
 	*/
@@ -899,7 +899,7 @@ void AABTreeBuilderClass::Build_W3D_AABTree_Recursive
 		WWASSERT(node->Back != NULL);		// if we have one child, we better have both!
 		newnode->FrontOrPoly0 = node->Front->Index;
 		newnode->BackOrPolyCount = node->Back->Index;
-	
+
 	} else {
 
 		newnode->FrontOrPoly0 = cur_poly | 0x80000000;
diff --git a/Core/Tools/WW3D/max2w3d/aabtreebuilder.h b/Core/Tools/WW3D/max2w3d/aabtreebuilder.h
index 8eb71793f04..604d8130c16 100644
--- a/Core/Tools/WW3D/max2w3d/aabtreebuilder.h
+++ b/Core/Tools/WW3D/max2w3d/aabtreebuilder.h
@@ -36,19 +36,13 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef AABTREEBUILDER_H
-#define AABTREEBUILDER_H
 
 #include "always.h"
 #include "vector3.h"
 #include "vector3i.h"
 #include "aaplane.h"
-#include "BITTYPE.H"
+#include "BITTYPE.h"
 #include <float.h>
 
 class AABTreeClass;
@@ -64,18 +58,18 @@ struct W3dMeshAABTreeNode;
 class AABTreeBuilderClass
 {
 public:
-	
+
 	AABTreeBuilderClass(void);
 	~AABTreeBuilderClass(void);
 
 	void					Build_AABTree(int polycount,Vector3i * polys,int vertcount,Vector3 * verts);
 	void					Export(ChunkSaveClass & csave);
-	
+
 	int					Node_Count(void);
 	int					Poly_Count(void);
 
-	enum 
-	{ 
+	enum
+	{
 		MIN_POLYS_PER_NODE =		4,
 		SMALL_VERTEX =				-100000,
 		BIG_VERTEX =				100000
@@ -88,12 +82,12 @@ class AABTreeBuilderClass
 	** wasteful in terms of memory footprint and number of allocations than the
 	** streamlined version found in the actual AABTreeClass.
 	*/
-	struct CullNodeStruct 
+	struct CullNodeStruct
 	{
 		CullNodeStruct(void) : Index(0),Min(0,0,0),Max(0,0,0),Front(NULL),Back(NULL),PolyCount(0),PolyIndices(NULL) {}
-		~CullNodeStruct(void) 
+		~CullNodeStruct(void)
 		{
-			if (Front) { delete Front; } 
+			if (Front) { delete Front; }
 			if (Back) { delete Back; }
 			if (PolyIndices) { delete[] PolyIndices; }
 		}
@@ -112,7 +106,7 @@ class AABTreeBuilderClass
 	*/
 	struct SplitChoiceStruct
 	{
-		SplitChoiceStruct(void) : 
+		SplitChoiceStruct(void) :
 			Cost(FLT_MAX),
 			FrontCount(0),
 			BackCount(0),
@@ -120,10 +114,10 @@ class AABTreeBuilderClass
 			BMax(SMALL_VERTEX,SMALL_VERTEX,SMALL_VERTEX),
 			FMin(BIG_VERTEX,BIG_VERTEX,BIG_VERTEX),
 			FMax(SMALL_VERTEX,SMALL_VERTEX,SMALL_VERTEX),
-			Plane(AAPlaneClass::XNORMAL,0) 
+			Plane(AAPlaneClass::XNORMAL,0)
 		{
 		}
-		
+
 		float						Cost;				// try to minimize this!
 		int						FrontCount;		// number of polys in front of the plane
 		int						BackCount;		// number of polys behind the plane
@@ -136,7 +130,7 @@ class AABTreeBuilderClass
 
 	struct SplitArraysStruct
 	{
-		SplitArraysStruct(void) : 
+		SplitArraysStruct(void) :
 			FrontCount(0),
 			BackCount(0),
 			FrontPolys(NULL),
@@ -179,14 +173,14 @@ class AABTreeBuilderClass
 	void								Update_Min(int poly_index,Vector3 & set_min);
 	void								Update_Max(int poly_index,Vector3 & set_max);
 	void								Update_Min_Max(int poly_index, Vector3 & set_min, Vector3 & set_max);
-	
+
 	void								Build_W3D_AABTree_Recursive(CullNodeStruct *	node,
 											W3dMeshAABTreeNode * w3dnodes,
 											uint32 * poly_indices,
 											int & cur_node,
 											int &	cur_poly);
 	/*
-	** Tree 
+	** Tree
 	*/
 	CullNodeStruct *				Root;
 	int								CurPolyIndex;
@@ -201,9 +195,3 @@ class AABTreeBuilderClass
 
 	friend class AABTreeClass;
 };
-
-
-
-
-#endif //AABTREEBUILDER_H
-
diff --git a/Core/Tools/WW3D/max2w3d/animationcompressionsettings.cpp b/Core/Tools/WW3D/max2w3d/animationcompressionsettings.cpp
index cd0799b12bc..8fc42511cc7 100644
--- a/Core/Tools/WW3D/max2w3d/animationcompressionsettings.cpp
+++ b/Core/Tools/WW3D/max2w3d/animationcompressionsettings.cpp
@@ -162,7 +162,7 @@ AnimationCompressionSettingsDialogClass::Message_Proc
 									parent_rect.left + (width / 2) - ((rect.right - rect.left) / 2),
 									parent_rect.top + (height / 2) - ((rect.bottom - rect.top) / 2),
 									0, 0, SWP_NOZORDER | SWP_NOSIZE);
-			
+
 			//
 			//	Initialize the dialog controls
 			//
@@ -217,7 +217,7 @@ AnimationCompressionSettingsDialogClass::Initialize_Controls (void)
 	HWND flavor_combo = ::GetDlgItem (Wnd, IDC_COMPRESS_ANIMATION_FLAVOR_COMBO);
 	ComboBox_AddString (flavor_combo, "TimeCoded");
 	ComboBox_AddString (flavor_combo, "Adaptive Delta");
-	
+
 	//
 	//	Bounds check the parameters
 	//
diff --git a/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h b/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h
index 38b17f6b8e9..921ad26d049 100644
--- a/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h
+++ b/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h
@@ -36,9 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef __ANIMATION_COMPRESSION_SETTINGS_H
-#define __ANIMATION_COMPRESSION_SETTINGS_H
+#pragma once
 
 #include <windows.h>
 #include <max.h>
@@ -63,8 +61,8 @@ class AnimationCompressionSettingsDialogClass
 
 	//////////////////////////////////////////////////////////////////
 	//	Public methods
-	//////////////////////////////////////////////////////////////////		
-	
+	//////////////////////////////////////////////////////////////////
+
 	void			Set_Options (W3dExportOptionsStruct *options)	{ Options = options; }
 	int			Do_Modal (void);
 
@@ -74,7 +72,7 @@ class AnimationCompressionSettingsDialogClass
 	//	Static methods
 	//////////////////////////////////////////////////////////////////
 	static BOOL CALLBACK	Real_Message_Proc (HWND wnd, UINT message, WPARAM wparam, LPARAM lparam);
-	
+
 	//////////////////////////////////////////////////////////////////
 	//	Private methods
 	//////////////////////////////////////////////////////////////////
@@ -90,7 +88,3 @@ class AnimationCompressionSettingsDialogClass
 	HWND								Wnd;
 	HWND								ParentWnd;
 };
-
-
-#endif //__ANIMATION_COMPRESSION_SETTINGS_H
-
diff --git a/Core/Tools/WW3D/max2w3d/bchannel.cpp b/Core/Tools/WW3D/max2w3d/bchannel.cpp
index 059826455d5..335f5cca220 100644
--- a/Core/Tools/WW3D/max2w3d/bchannel.cpp
+++ b/Core/Tools/WW3D/max2w3d/bchannel.cpp
@@ -71,7 +71,7 @@ void BitChannelClass::Set_Bit(int frameidx,bool bit)
 	assert(frameidx >= 0);
 	assert(frameidx < MaxFrames);
 
-	Data[frameidx] = bit; 
+	Data[frameidx] = bit;
 
 	if (!is_default(bit)) {
 		IsEmpty = false;
@@ -98,54 +98,54 @@ bool BitChannelClass::Get_Bit(int frameidx)
 bool BitChannelClass::Save(ChunkSaveClass & csave, bool compress)
 {
 	if (IsEmpty) return true;
-	
+
   if (compress)  {
   	// Save the Channel Data Compressed
     // TIMECODED
 		if (!csave.Begin_Chunk(W3D_CHUNK_COMPRESSED_BIT_CHANNEL)) {
 			return false;
 		}
-				
+
     uint32	channelsize  = sizeof(W3dTimeCodedBitChannelStruct);
 		uint32  packetsize   = sizeof(uint32);
-    
+
     channelsize	+= packetsize * MaxFrames;
     channelsize -= sizeof(uint32);
-    
+
     W3dTimeCodedBitChannelStruct * chn = (W3dTimeCodedBitChannelStruct *)malloc(channelsize);
-    
+
     if (chn == NULL)  {
     	return false;
     }
-    
+
     chn->NumTimeCodes = MaxFrames;
     chn->Pivot        = ID;
     chn->Flags        = ChannelType;
     chn->DefaultVal   = DefaultVal;
-					 
+
     // copy data into the channel struct, in timecoded raw format
 
 		for (uint32 fcount=0; fcount < chn->NumTimeCodes; fcount++) {
-    	
+
 			if (Get_Bit(fcount)) {
       		chn->Data[fcount] = fcount | W3D_TIMECODED_BIT_MASK;
-			}	
+			}
 			else  {
       		chn->Data[fcount] = fcount;
 			}
-		}	
-    
+		}
+
     // Compress the new structure
-    
-    BitChannelClass::compress( chn );			
-    
+
+    BitChannelClass::compress( chn );
+
 	 float originalchannelsize = channelsize;
 
     // Update Channel Size
     channelsize  = sizeof(W3dTimeCodedBitChannelStruct);
     channelsize	+= packetsize * chn->NumTimeCodes;
     channelsize -= sizeof(uint32);
-    
+
 	 float percent = (((float) channelsize) / originalchannelsize) * 100.0f;
 
 	 ExportLog::printf("%.0f", percent);
@@ -156,7 +156,7 @@ bool BitChannelClass::Save(ChunkSaveClass & csave, bool compress)
 		if (csave.Write(chn,channelsize) != channelsize) {
 			return false;
 		}
-		
+
 		if (chn != NULL) {
 			free(chn);
 		}
@@ -164,8 +164,8 @@ bool BitChannelClass::Save(ChunkSaveClass & csave, bool compress)
 		if (!csave.End_Chunk()) {
 			return false;
 		}
-    
-  }							
+
+  }
   else  {
   	// Stock Raw Save
 		if (!csave.Begin_Chunk(W3D_CHUNK_BIT_CHANNEL)) {
@@ -182,11 +182,11 @@ bool BitChannelClass::Save(ChunkSaveClass & csave, bool compress)
 		channelsize += numbytes - 1; // one byte inside the W3dBitChannelStruct...
 
 		W3dBitChannelStruct * chn = (W3dBitChannelStruct *)malloc(channelsize);
-		
+
 		if (chn == NULL) {
 			return false;
 		}
-	  
+
 		chn->FirstFrame = Begin;
 		chn->LastFrame = End;
 		chn->Flags = ChannelType;
@@ -202,7 +202,7 @@ bool BitChannelClass::Save(ChunkSaveClass & csave, bool compress)
 		if (csave.Write(chn,channelsize) != channelsize) {
 			return false;
 		}
-		
+
 		if (chn != NULL) {
 			free(chn);
 		}
@@ -210,8 +210,8 @@ bool BitChannelClass::Save(ChunkSaveClass & csave, bool compress)
 		if (!csave.End_Chunk()) {
 			return false;
 		}
-    
-  }								
+
+  }
 
 	return true;
 }
@@ -233,87 +233,87 @@ void BitChannelClass::compute_range(void)
 	while ((End >= 0) && (is_default(Get_Bit(End)))) {
 		End--;
 	}
-}	 // compute_range
-									
-                  
+}
+
+
 //
 // find a packet that isn't needed, and return the index
 // if all packets are necessary, then return back PACKETS_ALL_USEFUL
 // a useless packet is defined, as a packet that can be recreated
-//      
+//
 #define PACKETS_ALL_USEFUL (0xFFFFFFFF)
 //
 uint32 BitChannelClass::find_useless_packet(W3dTimeCodedBitChannelStruct * c)
-{												
-	
+{
+
   assert( c );	// make sure pointer exists
   assert( c->NumTimeCodes );	// make sure some packets exist
-                       
+
   	if (c->NumTimeCodes > 2)  {
-  						 
+
       for(uint32 try_idx = 0; try_idx < (c->NumTimeCodes - 1); try_idx++)  {
-      				
+
         if ((c->Data[try_idx]   & W3D_TIMECODED_BIT_MASK) ==
             (c->Data[try_idx+1] & W3D_TIMECODED_BIT_MASK))  {
             	return(try_idx + 1);
-            }      						 
-               
-      }	// for 
-    }    
-	
+            }
+
+      }
+    }
+
 	return( PACKETS_ALL_USEFUL );
-	
-} // find_useless_packet	
-  				
+
+}
+
 
 //
 //  Remove a packet from a W3dTimeCodedBitChannelStruct
 //
 void BitChannelClass::remove_packet(W3dTimeCodedBitChannelStruct * c, uint32 packet_idx)
-{												
+{
 	assert( c );
   assert( c->NumTimeCodes > 1 );
-	
+
   uint32 packet_size = 1;
   uint32 packet_len  = packet_size * sizeof(uint32);
-  												 
+
   uint32 *src, *dst;
-  
+
   dst = (uint32 *) &c->Data[ packet_size * packet_idx ];
   src = (uint32 *) &c->Data[ packet_size * (packet_idx + 1) ];
-   									 
+
   uint32 copy_length = (c->NumTimeCodes - (packet_idx + 1)) * packet_len;
-  
+
   if (copy_length)  {
-  	
+
     memcpy(dst, src, copy_length);
-    
+
   }
-  
-  // Decrement Packet Count                  
-  c->NumTimeCodes--;			
-        
-} // remove_packet	 
-         
+
+  // Decrement Packet Count
+  c->NumTimeCodes--;
+
+}
+
 //
 //  Take a non-compressed TimeCoded Bit Channel
 //  and compress the packets
 //
 void BitChannelClass::compress(W3dTimeCodedBitChannelStruct * c)
-{			
+{
 	while(1) {
-		
+
 		uint32 idx = find_useless_packet( c );
-     
+
 		if (PACKETS_ALL_USEFUL == idx) break;
-    
+
 		remove_packet( c, idx );
-    	
-	}	
-  
-} // compress
-	
+
+	}
+
+}
+
+
 
 
-                    
 // EOF - bchannel.cpp
diff --git a/Core/Tools/WW3D/max2w3d/bchannel.h b/Core/Tools/WW3D/max2w3d/bchannel.h
index feeed5c19f8..67c3b716689 100644
--- a/Core/Tools/WW3D/max2w3d/bchannel.h
+++ b/Core/Tools/WW3D/max2w3d/bchannel.h
@@ -34,16 +34,14 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef BCHANNEL_H
-#define BCHANNEL_H
+#pragma once
 
 #ifndef ALWAYS_H
 #include "always.h"
 #endif
 
 #ifndef BITTYPE_H
-#include "BITTYPE.H"
+#include "BITTYPE.h"
 #endif
 
 #ifndef CHUNKIO_H
@@ -51,7 +49,7 @@
 #endif
 
 #ifndef VECTOR_H
-#include "Vector.H"
+#include "Vector.h"
 #endif
 
 #ifndef W3D_FILE_H
@@ -90,14 +88,11 @@ class BitChannelClass
 
 	// This function finds the start and end of the "non-default" data
 	void compute_range(void);
-  
+
   // compress functions
 	void remove_packet(W3dTimeCodedBitChannelStruct * c, uint32 packet_idx);
 	uint32 find_useless_packet(W3dTimeCodedBitChannelStruct * c);
 	void compress(W3dTimeCodedBitChannelStruct * c);
-  
-  
-};
 
 
-#endif
\ No newline at end of file
+};
diff --git a/Core/Tools/WW3D/max2w3d/boneicon.cpp b/Core/Tools/WW3D/max2w3d/boneicon.cpp
index 157a3425675..d5f32993ef9 100644
--- a/Core/Tools/WW3D/max2w3d/boneicon.cpp
+++ b/Core/Tools/WW3D/max2w3d/boneicon.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/boneicon.cpp 6     1/12/98 4:02p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - WWSkin                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/boneicon.cpp                   $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 1/09/98 3:09p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 6                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - WWSkin                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/boneicon.cpp                   $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 1/09/98 3:09p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 6                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -47,7 +47,7 @@ const int NumBoneIconFaces = 366;
 #pragma warning(disable:4305)
 
 VertexStruct BoneIconVerts[NumBoneIconVerts] = {
-	
+
 	{  0.07,    -0.37,     0.23 },
 	{  0.07,    -0.38,     0.22 },
 	{  0.07,    -0.37,     0.22 },
@@ -603,4 +603,4 @@ FaceStruct BoneIconFaces[NumBoneIconFaces] = {
 	{ 160, 156, 155 },
 	{ 156, 163, 157 },
 	{ 143, 157, 163 }
-};
\ No newline at end of file
+};
diff --git a/Core/Tools/WW3D/max2w3d/boneicon.h b/Core/Tools/WW3D/max2w3d/boneicon.h
index c0585a4e783..a9ecbd42073 100644
--- a/Core/Tools/WW3D/max2w3d/boneicon.h
+++ b/Core/Tools/WW3D/max2w3d/boneicon.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/boneicon.h 5     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - WWSkin                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/boneicon.h                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/21/97 2:06p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 5                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - WWSkin                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/boneicon.h                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/21/97 2:06p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 5                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef BONEICON_H
-#define BONEICON_H
+#pragma once
 
 struct VertexStruct
 {
@@ -53,5 +51,3 @@ extern const int NumBoneIconVerts;
 extern const int NumBoneIconFaces;
 extern VertexStruct BoneIconVerts[];
 extern FaceStruct BoneIconFaces[];
-
-#endif
diff --git a/Core/Tools/WW3D/max2w3d/bpick.cpp b/Core/Tools/WW3D/max2w3d/bpick.cpp
index 93d90b3b313..7cea41c89c8 100644
--- a/Core/Tools/WW3D/max2w3d/bpick.cpp
+++ b/Core/Tools/WW3D/max2w3d/bpick.cpp
@@ -17,25 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/bpick.cpp 7     1/04/01 11:12a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - WWSkin                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/bpick.cpp                      $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 1/04/01 11:12a                                              $* 
- *                                                                                             * 
- *                    $Revision:: 7                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   BonePickerClass::Filter -- determine whether the passed node is suitable                  * 
- *   BonePickerClass::HitTest -- MAX HitTest method                                            * 
- *   BonePickerClass::Pick -- MAX Pick method                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - WWSkin                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/bpick.cpp                      $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 1/04/01 11:12a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 7                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   BonePickerClass::Filter -- determine whether the passed node is suitable                  *
+ *   BonePickerClass::HitTest -- MAX HitTest method                                            *
+ *   BonePickerClass::Pick -- MAX Pick method                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -46,21 +46,21 @@
 
 /*
 ** Global instance of a bone picker :-)
-*/ 
+*/
 BonePickerClass TheBonePicker;
 
 
-/*********************************************************************************************** 
- * BonePickerClass::Filter -- determine whether the passed node is suitable                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * BonePickerClass::Filter -- determine whether the passed node is suitable                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 BOOL BonePickerClass::Filter(INode *node)
 {
@@ -79,17 +79,17 @@ BOOL BonePickerClass::Filter(INode *node)
 	return FALSE;
 }
 
-/*********************************************************************************************** 
- * BonePickerClass::HitTest -- MAX HitTest method                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * BonePickerClass::HitTest -- MAX HitTest method                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 BOOL BonePickerClass::HitTest(IObjParam *ip,HWND hwnd,ViewExp *vpt,IPoint2 m,int flags)
 {
@@ -100,22 +100,22 @@ BOOL BonePickerClass::HitTest(IObjParam *ip,HWND hwnd,ViewExp *vpt,IPoint2 m,int
 	}
 }
 
-/*********************************************************************************************** 
- * BonePickerClass::Pick -- MAX Pick method                                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * BonePickerClass::Pick -- MAX Pick method                                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 BOOL BonePickerClass::Pick(IObjParam *ip,ViewExp *vpt)
 {
 	INode *node = vpt->GetClosestHit();
-	
+
 	if (node) {
 
 		/*
@@ -139,17 +139,17 @@ BOOL BonePickerClass::filter(INode * inode)
 void BonePickerClass::proc(INodeTab & nodetab)
 {
 	assert(User != NULL);
-	User->User_Picked_Bones(nodetab);	
+	User->User_Picked_Bones(nodetab);
 	User = NULL;
 	BoneList = NULL;
 }
 
-TCHAR * BonePickerClass::dialogTitle(void) 
-{ 
-	return Get_String(IDS_PICK_BONE_DIALOG_TITLE); 
+TCHAR * BonePickerClass::dialogTitle(void)
+{
+	return Get_String(IDS_PICK_BONE_DIALOG_TITLE);
 }
 
-TCHAR * BonePickerClass::buttonText(void) 
-{ 
-	return Get_String(IDS_PICK_BONE_BUTTON_TEXT); 
+TCHAR * BonePickerClass::buttonText(void)
+{
+	return Get_String(IDS_PICK_BONE_BUTTON_TEXT);
 }
diff --git a/Core/Tools/WW3D/max2w3d/bpick.h b/Core/Tools/WW3D/max2w3d/bpick.h
index 47d13331dd0..bb212890210 100644
--- a/Core/Tools/WW3D/max2w3d/bpick.h
+++ b/Core/Tools/WW3D/max2w3d/bpick.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/bpick.h 6     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - WWSkin                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/bpick.h                        $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/21/97 2:05p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 6                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - WWSkin                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/bpick.h                        $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/21/97 2:05p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 6                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef BPICK_H
-#define BPICK_H
+#pragma once
 
 #include "max.h"
 //#include "dllmain.h"
@@ -46,7 +44,7 @@
 
 /*
 **	To use the Bone picking class, you should inherit from this class
-** and implement the User_Picked... functions.  
+** and implement the User_Picked... functions.
 */
 class BonePickerUserClass
 {
@@ -64,7 +62,7 @@ class BonePickerUserClass
 class BonePickerClass : public PickNodeCallback, public PickModeCallback, public HitByNameDlgCallback
 {
 public:
-	
+
 	BonePickerClass(void) : User(NULL), BoneList(NULL), SinglePick(FALSE) {}
 
 	/*
@@ -84,13 +82,13 @@ class BonePickerClass : public PickNodeCallback, public PickModeCallback, public
 	*/
 	BOOL HitTest(IObjParam *ip,HWND hWnd,ViewExp *vpt,IPoint2 m,int flags);
 	BOOL Pick(IObjParam *ip,ViewExp *vpt);
-		
+
 	void EnterMode(IObjParam *ip) { }
 	void ExitMode(IObjParam *ip) { }
 
 	PickNodeCallback * GetFilter() {return this;}
 	BOOL RightClick(IObjParam *ip,ViewExp *vpt) { return TRUE; }
-	
+
 	/*
 	** From HitByNameDlgCallback
 	*/
@@ -107,7 +105,7 @@ class BonePickerClass : public PickNodeCallback, public PickModeCallback, public
 
 	/*
 	** The bone picker will pass the bones on to the "user" of
-	** the class.  
+	** the class.
 	*/
 	BonePickerUserClass * User;
 
@@ -124,6 +122,3 @@ class BonePickerClass : public PickNodeCallback, public PickModeCallback, public
 };
 
 extern BonePickerClass TheBonePicker;
-
-
-#endif
diff --git a/Core/Tools/WW3D/max2w3d/colboxsave.cpp b/Core/Tools/WW3D/max2w3d/colboxsave.cpp
index 06fabba6244..5e97c9d638c 100644
--- a/Core/Tools/WW3D/max2w3d/colboxsave.cpp
+++ b/Core/Tools/WW3D/max2w3d/colboxsave.cpp
@@ -111,7 +111,7 @@ CollisionBoxSaveClass::CollisionBoxSaveClass
 	Matrix3 node_matrix = inode->GetObjectTM(curtime);
 	Matrix3 offset_matrix = node_matrix * Inverse(exportspace);
 	int ivert;
-	
+
 	for (ivert = 0; ivert < mesh.getNumVerts (); ++ivert) {
 		mesh.verts[ivert] = mesh.verts[ivert] * offset_matrix;
 	}
@@ -129,7 +129,7 @@ CollisionBoxSaveClass::CollisionBoxSaveClass
 		if (mesh.verts[ivert].y > max_point.y) max_point.y = mesh.verts[ivert].y;
 		if (mesh.verts[ivert].z > max_point.z) max_point.z = mesh.verts[ivert].z;
 	}
-		
+
 	Point3 center = (max_point + min_point) / 2.0f;
 	Point3 extent = (max_point - min_point) / 2.0f;
 
@@ -153,4 +153,4 @@ int CollisionBoxSaveClass::Write_To_File(ChunkSaveClass & csave)
 }
 
 
-	
\ No newline at end of file
+
diff --git a/Core/Tools/WW3D/max2w3d/colboxsave.h b/Core/Tools/WW3D/max2w3d/colboxsave.h
index 09a978237ae..76fa6a449e0 100644
--- a/Core/Tools/WW3D/max2w3d/colboxsave.h
+++ b/Core/Tools/WW3D/max2w3d/colboxsave.h
@@ -34,24 +34,18 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef COLBOXSAVE_H
-#define COLBOXSAVE_H
 
 #include <max.h>
 #include "w3d_file.h"
 #include "chunkio.h"
-#include "PROGRESS.H"
+#include "PROGRESS.h"
 
 
 /*******************************************************************************************
 **
 ** CollisionBoxSaveClass - Create an AABox or an OBBox from a Max mesh (typically the
-**	artist should use a 'box' to generate this. In any case, we're just using the bounding 
+**	artist should use a 'box' to generate this. In any case, we're just using the bounding
 ** box).
 **
 *******************************************************************************************/
@@ -64,7 +58,7 @@ class CollisionBoxSaveClass
 		EX_CANCEL = 1
 	};
 
-	CollisionBoxSaveClass(	char *						mesh_name,	
+	CollisionBoxSaveClass(	char *						mesh_name,
 									char *						container_name,
 									INode *						inode,
 									Matrix3 &					exportspace,
@@ -74,11 +68,7 @@ class CollisionBoxSaveClass
 	int Write_To_File(ChunkSaveClass & csave);
 
 private:
-	
-	W3dBoxStruct						BoxData;				// contains same information as the W3dOBBoxStruct
-	
-};
-
 
+	W3dBoxStruct						BoxData;				// contains same information as the W3dOBBoxStruct
 
-#endif //COLBOXSAVE_H
\ No newline at end of file
+};
diff --git a/Core/Tools/WW3D/max2w3d/dazzlesave.cpp b/Core/Tools/WW3D/max2w3d/dazzlesave.cpp
index 583d0c3c407..3f8ecc7b86d 100644
--- a/Core/Tools/WW3D/max2w3d/dazzlesave.cpp
+++ b/Core/Tools/WW3D/max2w3d/dazzlesave.cpp
@@ -52,7 +52,7 @@ DazzleSaveClass::DazzleSaveClass
 	Matrix3 & exportspace,
 	TimeValue curtime,
 	Progress_Meter_Class & meter
-) 
+)
 {
 	assert(mesh_name != NULL);
 	assert(container_name != NULL);
@@ -88,7 +88,7 @@ int DazzleSaveClass::Write_To_File(ChunkSaveClass & csave)
 	csave.Begin_Chunk(W3D_CHUNK_DAZZLE_TYPENAME);
 	csave.Write(DazzleType,strlen(DazzleType) + 1);
 	csave.End_Chunk();
-	
+
 	csave.End_Chunk();
 	return 0;
 }
diff --git a/Core/Tools/WW3D/max2w3d/dazzlesave.h b/Core/Tools/WW3D/max2w3d/dazzlesave.h
index bfcb3b6b9dc..bb2a4f1b583 100644
--- a/Core/Tools/WW3D/max2w3d/dazzlesave.h
+++ b/Core/Tools/WW3D/max2w3d/dazzlesave.h
@@ -36,17 +36,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DAZZLESAVE_H
-#define DAZZLESAVE_H
 
 #include <max.h>
 #include "w3d_file.h"
 #include "chunkio.h"
-#include "PROGRESS.H"
+#include "PROGRESS.h"
 
 
 /*******************************************************************************************
@@ -64,7 +59,7 @@ class DazzleSaveClass
 		EX_CANCEL = 1
 	};
 
-	DazzleSaveClass(		char *						mesh_name,	
+	DazzleSaveClass(		char *						mesh_name,
 								char *						container_name,
 								INode *						inode,
 								Matrix3 &					exportspace,
@@ -74,17 +69,8 @@ class DazzleSaveClass
 	int Write_To_File(ChunkSaveClass & csave);
 
 private:
-	
-	char						W3DName[128];
-	char						DazzleType[128];	
-	
-};
-
-
-
 
+	char						W3DName[128];
+	char						DazzleType[128];
 
-
-
-#endif //DAZZLESAVE_H
-
+};
diff --git a/Core/Tools/WW3D/max2w3d/dllmain.cpp b/Core/Tools/WW3D/max2w3d/dllmain.cpp
index 44117281977..ce3727e08e6 100644
--- a/Core/Tools/WW3D/max2w3d/dllmain.cpp
+++ b/Core/Tools/WW3D/max2w3d/dllmain.cpp
@@ -17,28 +17,28 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/dllmain.cpp 8     7/24/01 5:11p Moumine_ballo $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G                                                 * 
- *                                                                                             * 
- *                    File Name : DLLMAIN.CPP                                                  * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/09/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 9, 1997 [GH]                                            * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   DllMain -- Entry point for the dll                                                        * 
- *   LibDescription -- Returns description of this library                                     * 
- *   LibNumberClasses -- Returns number of classes in this library                             * 
- *   LibClassDesc -- Returns a ClassDesc for the specified class                               * 
- *   LibVersion -- Returns the version number of this library                                  * 
- *   GetString -- Gets a string out of the resources                                           * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G                                                 *
+ *                                                                                             *
+ *                    File Name : DLLMAIN.cpp                                                  *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/09/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 9, 1997 [GH]                                            *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   DllMain -- Entry point for the dll                                                        *
+ *   LibDescription -- Returns description of this library                                     *
+ *   LibNumberClasses -- Returns number of classes in this library                             *
+ *   LibClassDesc -- Returns a ClassDesc for the specified class                               *
+ *   LibVersion -- Returns the version number of this library                                  *
+ *   GetString -- Gets a string out of the resources                                           *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -70,17 +70,17 @@ static W3dClassDesc		W3d_Export_Class_Descriptor;
 
 
 
-/*********************************************************************************************** 
- * DllMain -- Entry point for the dll                                                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * DllMain -- Entry point for the dll                                                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 BOOL WINAPI DllMain(HINSTANCE	hinstDLL,ULONG /*fdwReason*/,LPVOID /*lpvReserved*/)
 {
@@ -97,34 +97,34 @@ BOOL WINAPI DllMain(HINSTANCE	hinstDLL,ULONG /*fdwReason*/,LPVOID /*lpvReserved*
 }
 
 
-/*********************************************************************************************** 
- * LibDescription -- Returns description of this library                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * LibDescription -- Returns description of this library                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 DLLEXPORT const TCHAR * LibDescription()
 {
 	return  Get_String(IDS_LIB_DESCRIPTION);
 }
 
-/*********************************************************************************************** 
- * LibNumberClasses -- Returns number of classes in this library                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * LibNumberClasses -- Returns number of classes in this library                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 DLLEXPORT int LibNumberClasses()
 {
@@ -132,17 +132,17 @@ DLLEXPORT int LibNumberClasses()
 }
 
 
-/*********************************************************************************************** 
- * LibClassDesc -- Returns a ClassDesc for the specified class                                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * LibClassDesc -- Returns a ClassDesc for the specified class                                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 DLLEXPORT ClassDesc * LibClassDesc(int i)
 {
@@ -165,17 +165,17 @@ DLLEXPORT ClassDesc * LibClassDesc(int i)
 }
 
 
-/*********************************************************************************************** 
- * LibVersion -- Returns the version number of this library                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * LibVersion -- Returns the version number of this library                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 DLLEXPORT ULONG LibVersion()
 {
@@ -183,17 +183,17 @@ DLLEXPORT ULONG LibVersion()
 }
 
 
-/*********************************************************************************************** 
- * Get_String -- Gets a string out of the resources                                            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Get_String -- Gets a string out of the resources                                            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 TCHAR * Get_String( int id )
 {
diff --git a/Core/Tools/WW3D/max2w3d/dllmain.h b/Core/Tools/WW3D/max2w3d/dllmain.h
index 933151aa710..fb921d7b5cb 100644
--- a/Core/Tools/WW3D/max2w3d/dllmain.h
+++ b/Core/Tools/WW3D/max2w3d/dllmain.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/dllmain.h 4     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G                                                 * 
- *                                                                                             * 
- *                    File Name : DLLMAIN.H                                                    * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/09/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 9, 1997 [GH]                                            * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G                                                 *
+ *                                                                                             *
+ *                    File Name : DLLMAIN.h                                                    *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/09/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 9, 1997 [GH]                                            *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef DLLMAIN_H
-#define DLLMAIN_H
+#pragma once
 
 #include <windows.h>
 
@@ -47,5 +45,3 @@ extern HINSTANCE AppInstance;
 #define MAX_PATH_LENGTH _MAX_PATH
 
 TCHAR * Get_String(int id);
-
-#endif /*DLLMAIN_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/exportlog.h b/Core/Tools/WW3D/max2w3d/exportlog.h
index f93ed2e18f5..d9b4e58f23c 100644
--- a/Core/Tools/WW3D/max2w3d/exportlog.h
+++ b/Core/Tools/WW3D/max2w3d/exportlog.h
@@ -36,15 +36,13 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef EXPORTLOG_H
-#define EXPORTLOG_H
+#pragma once
 
 #include <windows.h>
- 
+
 /**
 ** ExportLog
-** This is an interface to the export log dialog.  
+** This is an interface to the export log dialog.
 */
 class ExportLog
 {
@@ -56,7 +54,3 @@ class ExportLog
 	static void rprintf(const char *, ...);
 	static void	updatebar(float position, float total);
 };
-
-
-#endif //EXPORTLOG_H
-
diff --git a/Core/Tools/WW3D/max2w3d/floaterdialog.cpp b/Core/Tools/WW3D/max2w3d/floaterdialog.cpp
index cf88f1b0416..6079b238c7d 100644
--- a/Core/Tools/WW3D/max2w3d/floaterdialog.cpp
+++ b/Core/Tools/WW3D/max2w3d/floaterdialog.cpp
@@ -164,16 +164,16 @@ void FloaterDialogClass::Create(Interface * ip, int child_dlg_id, DLGPROC child_
 	/*
 	** Create the dialog box
 	*/
-	Hwnd = CreateDialogParam(	
+	Hwnd = CreateDialogParam(
 										AppInstance,
 										MAKEINTRESOURCE(IDD_W3DUTILITY_FLOATER_DIALOG),
 										::GetCOREInterface()->GetMAXHWnd(),
 										(DLGPROC) _floater_dialog_proc,
-										(LPARAM) this 
+										(LPARAM) this
 									);
-	::GetCOREInterface()->RegisterDlgWnd(Hwnd); 
+	::GetCOREInterface()->RegisterDlgWnd(Hwnd);
 }
-	
+
 
 
 /***********************************************************************************************
@@ -197,7 +197,7 @@ bool FloaterDialogClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM
 
 		case WM_INITDIALOG:
 			{
-				HWND childhwnd = CreateDialogParam(	
+				HWND childhwnd = CreateDialogParam(
 													AppInstance,
 													MAKEINTRESOURCE(ChildDialogTemplateID),
 													hWnd,
@@ -214,7 +214,7 @@ bool FloaterDialogClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM
 				}
 			}
 			return 1;
-		
+
 		case WM_COMMAND:
 			switch (LOWORD(wParam))
 			{
@@ -225,7 +225,7 @@ bool FloaterDialogClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM
 			return 1;
 
 		case WM_DESTROY:
-			::GetCOREInterface()->UnRegisterDlgWnd(Hwnd); 
+			::GetCOREInterface()->UnRegisterDlgWnd(Hwnd);
 			Hwnd = NULL;
 			break;
 	}
diff --git a/Core/Tools/WW3D/max2w3d/floaterdialog.h b/Core/Tools/WW3D/max2w3d/floaterdialog.h
index ee9ae0e68f7..de6d7f04278 100644
--- a/Core/Tools/WW3D/max2w3d/floaterdialog.h
+++ b/Core/Tools/WW3D/max2w3d/floaterdialog.h
@@ -36,9 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef FLOATERDIALOG_H
-#define FLOATERDIALOG_H
+#pragma once
 
 #include <windows.h>
 
@@ -56,7 +54,7 @@ class FloaterDialogClass
 
 	FloaterDialogClass(void);
 	~FloaterDialogClass();
-	
+
 	bool	Is_Created(void);
 	void	Create(Interface * ip, int child_dialog_id, DLGPROC child_dlg_proc);
 	bool	Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM);
@@ -68,8 +66,3 @@ class FloaterDialogClass
 	DLGPROC	ChildDialogProc;
 
 };
-
-
-
-#endif //FLOATERDIALOG_H
-
diff --git a/Core/Tools/WW3D/max2w3d/gamemaps.cpp b/Core/Tools/WW3D/max2w3d/gamemaps.cpp
index cf619521018..0be2207c5c5 100644
--- a/Core/Tools/WW3D/max2w3d/gamemaps.cpp
+++ b/Core/Tools/WW3D/max2w3d/gamemaps.cpp
@@ -17,28 +17,28 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/gamemaps.cpp 5     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : GAMEMAPS.CPP                                                 * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/26/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 26, 1997 [GH]                                           * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   GameMapsClass::ClassID -- Returns the ClassID for GameMapsClass                           * 
- *   GameMapsClass::AssignController -- Assigns a controller to one of the Sub-Anims           * 
- *   GameMapsClass::NotifyRefChanged -- Max is notifying GameMapsClass that a reference has cha* 
- *   GameMapsClass::Clone -- Create a clone of the GameMapsClass                               * 
- *   GameMapsClass::Save -- Saves the GameMapsClass data into a MAX file                       * 
- *   GameMapsClass::Load -- Loads GameMapsClass data from a MAX file                           * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : GAMEMAPS.cpp                                                 *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/26/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 26, 1997 [GH]                                           *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   GameMapsClass::ClassID -- Returns the ClassID for GameMapsClass                           *
+ *   GameMapsClass::AssignController -- Assigns a controller to one of the Sub-Anims           *
+ *   GameMapsClass::NotifyRefChanged -- Max is notifying GameMapsClass that a reference has cha*
+ *   GameMapsClass::Clone -- Create a clone of the GameMapsClass                               *
+ *   GameMapsClass::Save -- Saves the GameMapsClass data into a MAX file                       *
+ *   GameMapsClass::Load -- Loads GameMapsClass data from a MAX file                           *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -69,12 +69,12 @@
 *		A PostLoadCallback which does nothing...
 *
 *****************************************************************/
-class GameMapsPostLoad : public PostLoadCallback 
+class GameMapsPostLoad : public PostLoadCallback
 {
 public:
 	GameMapsClass *tm;
 	GameMapsPostLoad(GameMapsClass *b) {tm=b;}
-	void proc(ILoad *iload) { delete this; } 
+	void proc(ILoad *iload) { delete this; }
 };
 
 
@@ -85,7 +85,7 @@ class GameMapsPostLoad : public PostLoadCallback
 *****************************************************************/
 static Class_ID _GameMapsClassID(0x36d23f7b, 0x79ce63e1);
 
-class GameMapsClassDesc : public ClassDesc 
+class GameMapsClassDesc : public ClassDesc
 {
 	public:
 	int 				IsPublic()			  		{ return 0; }
@@ -101,34 +101,34 @@ static GameMapsClassDesc _GameMapsCD;
 ClassDesc * Get_Game_Maps_Desc() { return &_GameMapsCD; }
 
 
-/*********************************************************************************************** 
- * GameMapsClass::ClassID -- Returns the ClassID for GameMapsClass                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMapsClass::ClassID -- Returns the ClassID for GameMapsClass                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-Class_ID GameMapsClass::ClassID() 
+Class_ID GameMapsClass::ClassID()
 {
-	return _GameMapsClassID; 
+	return _GameMapsClassID;
 }
 
-/*********************************************************************************************** 
- * GameMapsClass::AssignController -- Assigns a controller to one of the Sub-Anims             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMapsClass::AssignController -- Assigns a controller to one of the Sub-Anims             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 BOOL GameMapsClass::AssignController(Animatable *control,int subAnim)
 {
@@ -136,25 +136,25 @@ BOOL GameMapsClass::AssignController(Animatable *control,int subAnim)
 	return TRUE;
 }
 
-/*********************************************************************************************** 
- * GameMapsClass::NotifyRefChanged -- Max is notifying GameMapsClass that a reference has chan * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMapsClass::NotifyRefChanged -- Max is notifying GameMapsClass that a reference has chan *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 RefResult GameMapsClass::NotifyRefChanged
 (
-	Interval				changeInt, 
+	Interval				changeInt,
 	RefTargetHandle	hTarget,
-	PartID &				partID, 
-	RefMessage			message 		
-) 
+	PartID &				partID,
+	RefMessage			message
+)
 {
 	switch (message) {
 		case REFMSG_GET_PARAM_DIM: {
@@ -163,25 +163,25 @@ RefResult GameMapsClass::NotifyRefChanged
 		}
 		case REFMSG_GET_PARAM_NAME: {
 			GetParamName *gpn = (GetParamName*)partID;
-			return REF_STOP; 
+			return REF_STOP;
 		}
 	}
 	return(REF_SUCCEED);
 }
 
-/*********************************************************************************************** 
- * GameMapsClass::Clone -- Create a clone of the GameMapsClass                                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMapsClass::Clone -- Create a clone of the GameMapsClass                                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-RefTargetHandle GameMapsClass::Clone(RemapDir &remap) 
+RefTargetHandle GameMapsClass::Clone(RemapDir &remap)
 {
 	GameMapsClass *tm = new GameMapsClass(NULL);
 
@@ -198,19 +198,19 @@ RefTargetHandle GameMapsClass::Clone(RemapDir &remap)
 }
 
 
-/*********************************************************************************************** 
- * GameMapsClass::Save -- Saves the GameMapsClass data into a MAX file                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMapsClass::Save -- Saves the GameMapsClass data into a MAX file                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-IOResult GameMapsClass::Save(ISave * isave) 
+IOResult GameMapsClass::Save(ISave * isave)
 {
 	ULONG nb,f=0;
 
@@ -218,7 +218,7 @@ IOResult GameMapsClass::Save(ISave * isave)
 	for (int i=0; i<NTEXMAPS; i++) {
 		if (TextureSlot[i].MapOn) f|= (1<<i);
 	}
-	isave->Write(&f,sizeof(f),&nb);			
+	isave->Write(&f,sizeof(f),&nb);
 	isave->EndChunk();
 
 	for (i=0; i<NTEXMAPS; i++) {
@@ -232,20 +232,20 @@ IOResult GameMapsClass::Save(ISave * isave)
 }
 
 
-/*********************************************************************************************** 
- * GameMapsClass::Load -- Loads GameMapsClass data from a MAX file                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMapsClass::Load -- Loads GameMapsClass data from a MAX file                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-IOResult GameMapsClass::Load(ILoad * iload) 
-{ 
+IOResult GameMapsClass::Load(ILoad * iload)
+{
 	ULONG nb;
 	int id;
 	IOResult res;
@@ -257,11 +257,11 @@ IOResult GameMapsClass::Load(ILoad * iload)
 				{
 					ULONG f;
 					res = iload->Read(&f,sizeof(f), &nb);
-					for (int i=0; i<NTEXMAPS; i++) 
+					for (int i=0; i<NTEXMAPS; i++)
 						 (*this)[i].MapOn = (f&(1<<i))?1:0;
 				}
 				break;
-			
+
 			case GAMEMAPS_AMT0_CHUNK:
 			case GAMEMAPS_AMT1_CHUNK:
 			case GAMEMAPS_AMT2_CHUNK:
diff --git a/Core/Tools/WW3D/max2w3d/gamemaps.h b/Core/Tools/WW3D/max2w3d/gamemaps.h
index 2cb70dd83dd..f94e728406d 100644
--- a/Core/Tools/WW3D/max2w3d/gamemaps.h
+++ b/Core/Tools/WW3D/max2w3d/gamemaps.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/gamemaps.h 7     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : GAMEMAPS.H                                                   * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/26/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 26, 1997 [GH]                                           * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : GAMEMAPS.h                                                   *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/26/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 26, 1997 [GH]                                           *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef GAMEMAPS_H
-#define GAMEMAPS_H
+#pragma once
 
 #include <max.h>
 #include "stdmat.h"
@@ -65,7 +63,7 @@ class TexmapSlotClass
 	float		EvalMono(ShadeContext& sc) 				{ return Map->EvalMono(sc); }
 	Point3	EvalNormalPerturb(ShadeContext &sc) 	{ return Map->EvalNormalPerturb(sc); }
 	BOOL		IsActive() 										{ return (Map && MapOn); }
-	void		Update(TimeValue t, Interval &ivalid)	{ if (IsActive()) Map->Update(t,ivalid); };				
+	void		Update(TimeValue t, Interval &ivalid)	{ if (IsActive()) Map->Update(t,ivalid); };
 	float		GetAmount(TimeValue t) 						{ return Amount; }
 };
 
@@ -73,15 +71,15 @@ class TexmapSlotClass
 ///////////////////////////////////////////////////////////////////////////
 //
 //		Texture Maps for In-Game material
-//		
+//
 //		This class can contain a collection of all of the maps which
 //		MAX uses but the GameMtl plugin will only give the user access
 //		to the ones we can actually use in the game.
 //
 ///////////////////////////////////////////////////////////////////////////
-class GameMapsClass: public ReferenceTarget 
+class GameMapsClass: public ReferenceTarget
 {
-public:  
+public:
 
 	MtlBase *			Client;
 	TexmapSlotClass	TextureSlot[NTEXMAPS];
@@ -91,7 +89,7 @@ class GameMapsClass: public ReferenceTarget
 
 	void					DeleteThis()											{ delete this;	}
 	void					SetClientPtr(MtlBase *mb)							{ Client = mb; }
-	TexmapSlotClass &	operator[](int i) 									{ return TextureSlot[i]; }	
+	TexmapSlotClass &	operator[](int i) 									{ return TextureSlot[i]; }
 	Class_ID				ClassID();
 	SClass_ID			SuperClassID() 										{ return REF_MAKER_CLASS_ID; }
 	int					NumSubs()												{ return NTEXMAPS; }
@@ -104,12 +102,9 @@ class GameMapsClass: public ReferenceTarget
 
 
 	BOOL					AssignController(Animatable *control,int subAnim);
-	RefTargetHandle	Clone(RemapDir &remap);	
+	RefTargetHandle	Clone(RemapDir &remap);
 	RefResult			NotifyRefChanged( Interval changeInt, RefTargetHandle hTarget, PartID& partID, RefMessage message);
 
 	IOResult				Save(ISave * isave);
 	IOResult				Load(ILoad * iload);
 };
-
-
-#endif /*GAMEMAPS_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/gamemtl.h b/Core/Tools/WW3D/max2w3d/gamemtl.h
index 316e379b605..1065b4464da 100644
--- a/Core/Tools/WW3D/max2w3d/gamemtl.h
+++ b/Core/Tools/WW3D/max2w3d/gamemtl.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/gamemtl.h 38    8/22/01 7:56a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : GAMEMTL.H                                                    * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/26/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 26, 1997 [GH]                                           * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : GAMEMTL.h                                                    *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/26/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 26, 1997 [GH]                                           *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef GAMEMTL_H
-#define GAMEMTL_H
+#pragma once
 
 #include <max.h>
 #include "w3dmtl.h"
@@ -62,7 +60,7 @@
 														GAMEMTL_PASS1_ROLLUP_OPEN | \
 														GAMEMTL_PASS2_ROLLUP_OPEN | \
 														GAMEMTL_PASS3_ROLLUP_OPEN )
-														
+
 #define GAMEMTL_ID_PARTA		0x29397211
 #define GAMEMTL_ID_PARTB		0x28c016c2
 
@@ -126,7 +124,7 @@ extern ClassDesc * Get_PS2_Material_Conversion();
 //		ability to have control over all parameters in our material.
 //
 ///////////////////////////////////////////////////////////////////////////
-class GameMtl: public Mtl 
+class GameMtl: public Mtl
 {
 
 public:
@@ -139,12 +137,12 @@ class GameMtl: public Mtl
 
 		GameMtl(BOOL loading = FALSE);
 		~GameMtl(void);
-		
+
 		Class_ID				ClassID();
 		SClass_ID			SuperClassID();
 
 		// From Animatable
-		void					GetClassName(TSTR& s);  
+		void					GetClassName(TSTR& s);
 		void					DeleteThis()													{ delete this; }
 		int					NumSubs();
 		Animatable *		SubAnim(int i);
@@ -154,14 +152,14 @@ class GameMtl: public Mtl
 		int					NumRefs()														{ return REF_COUNT; }
 		RefTargetHandle	Clone(RemapDir &remap = NoRemap());
 		RefResult			NotifyRefChanged(Interval changeInt, RefTargetHandle hTarget, PartID& partID, RefMessage message);
-		void					SetReference(int i, RefTargetHandle rtarg);	
+		void					SetReference(int i, RefTargetHandle rtarg);
 		RefTargetHandle	GetReference(int i);
 
 		// From MtlBase and Mtl
-		void					SetAmbient(Color c, TimeValue t)							{ Set_Ambient(0,t,c); }		
-		void					SetDiffuse(Color c, TimeValue t)							{ Set_Diffuse(0,t,c); }		
+		void					SetAmbient(Color c, TimeValue t)							{ Set_Ambient(0,t,c); }
+		void					SetDiffuse(Color c, TimeValue t)							{ Set_Diffuse(0,t,c); }
 		void					SetSpecular(Color c, TimeValue t)						{ Set_Specular(0,t,c); }
-		void					SetShininess(float v, TimeValue t)						{ Set_Shininess(0,t,v); }				
+		void					SetShininess(float v, TimeValue t)						{ Set_Shininess(0,t,v); }
 		Color					GetAmbient(int mtlNum=0, BOOL backFace=FALSE)		{ return Get_Ambient(0,0); }
 		Color					GetDiffuse(int mtlNum=0, BOOL backFace=FALSE)		{ return Get_Diffuse(0,0); }
 		Color					GetSpecular(int mtlNum=0, BOOL backFace=FALSE)		{ return Get_Specular(0,0); }
@@ -171,14 +169,14 @@ class GameMtl: public Mtl
 		void					Reset(void);
 		void					Update(TimeValue t, Interval& validr);
 		Interval				Validity(TimeValue t);
-		
+
 		int					NumSubTexmaps(void);
 		void					SetSubTexmap(int i, Texmap * m);
 		Texmap *				GetSubTexmap(int i);
 
 		float					EvalDisplacement(ShadeContext& sc);
 		Interval				DisplacementValidity(TimeValue t);
-		
+
 		// Rendering
 		void					Shade(ShadeContext& sc);
 		ULONG					Requirements(int subMtlNum);
@@ -201,10 +199,10 @@ class GameMtl: public Mtl
 
 		void					Set_Sort_Level(int level)									{ SortLevel = level; }
 		int					Get_Sort_Level(void) const									{ return SortLevel; }
-		
+
 		void					Set_Pass_Count(int passcount);
 		int					Get_Pass_Count(void);
-	
+
 		IParamBlock *		Get_Parameter_Block(int pass);
 		int					Get_Current_Page(int pass)									{ return CurPage[pass]; }
 		Color					Get_Ambient(int pass,TimeValue t);
@@ -218,7 +216,7 @@ class GameMtl: public Mtl
 		int					Get_Mapping_Type(int pass, int stage=0);
 		int					Get_PSX_Translucency(int pass);
 		int					Get_PSX_Lighting(int pass);
-									
+
 		int					Get_Depth_Compare(int pass);
 		int					Get_Depth_Mask(int pass);
 		int					Get_Alpha_Test(int pass);
@@ -232,7 +230,7 @@ class GameMtl: public Mtl
 		int					Get_PS2_Shader_Param_B(int pass);
 		int					Get_PS2_Shader_Param_C(int pass);
 		int					Get_PS2_Shader_Param_D(int pass);
-		
+
 		int					Get_Texture_Enable(int pass,int stage);
 		int					Get_Texture_Publish(int pass,int stage);
 		int					Get_Texture_Resize(int pass,int stage);		// NOTE: obsolete, replaced by Get_Texture_No_LOD
@@ -264,7 +262,7 @@ class GameMtl: public Mtl
 		void					Set_Mapping_Type(int pass,int stage,int val);
 		void					Set_PSX_Translucency(int pass,int val);
 		void					Set_PSX_Lighting(int pass,bool val);
-		
+
 		void					Set_Depth_Compare(int pass,int val);
 		void					Set_Depth_Mask(int pass,int val);
 		void					Set_Alpha_Test(int pass,int val);
@@ -278,7 +276,7 @@ class GameMtl: public Mtl
 		void					Set_PS2_Shader_Param_B(int pass,int val);
 		void					Set_PS2_Shader_Param_C(int pass,int val);
 		void					Set_PS2_Shader_Param_D(int pass,int val);
-		
+
 		void					Set_Texture_Enable(int pass,int stage,bool val);
 		void					Set_Texture_Publish(int pass,int stage,bool val);
 		void					Set_Texture_Resize(int pass,int stage,bool val);		// NOTE: obsolete: replaced by Set_Texture_No_LOD
@@ -323,7 +321,7 @@ class GameMtl: public Mtl
 
 		int					texture_ref_index(int pass,int stage)			{ return REF_TEXTURE + pass*W3dMaterialClass::MAX_STAGES + stage; }
 		int					pass_ref_index(int pass)							{ return REF_PASS_PARAMETERS + pass; }
-		
+
 		void					update_viewport_display();
 
 		// Do the shade functions specific to the Playstation 2.
@@ -333,24 +331,24 @@ class GameMtl: public Mtl
 		unsigned int		SurfaceType;
 		int					SortLevel;
 
-		Interval				Ivalid;				// Valid interval		
+		Interval				Ivalid;				// Valid interval
 		GameMtlDlg *		MaterialDialog;	// Dialog
-		ULONG					Flags;				// Flags		
+		ULONG					Flags;				// Flags
 		int					RollScroll;			// Rollup scroll position
 		int					CurPage[W3dMaterialClass::MAX_PASSES];		// which page was last open for each pass
-		
+
 		GameMapsClass *	Maps;					// ref 0 (obsolete...)
 		IParamBlock *		MainParameterBlock;
-		IParamBlock *		PassParameterBlock[W3dMaterialClass::MAX_PASSES];	
-		Texmap *				Texture[W3dMaterialClass::MAX_PASSES][W3dMaterialClass::MAX_STAGES];	
+		IParamBlock *		PassParameterBlock[W3dMaterialClass::MAX_PASSES];
+		Texmap *				Texture[W3dMaterialClass::MAX_PASSES][W3dMaterialClass::MAX_STAGES];
 		char *				MapperArg[W3dMaterialClass::MAX_PASSES][W3dMaterialClass::MAX_STAGES];
 		unsigned int		MapperArgLen[W3dMaterialClass::MAX_PASSES][W3dMaterialClass::MAX_STAGES];
 		Texmap *				DisplacementMap;
 		float					DisplacementAmt;
 
-		// MLL			
+		// MLL
 		int					ShaderType;
-		enum 
+		enum
 		{
 			REF_MAPS = 0,					// obsolete, gamemaps object
 			REF_MAIN	= 1,					// main parameter block is ref 1
@@ -366,8 +364,3 @@ class GameMtl: public Mtl
 };
 
 Mtl * CreateGameMtl();
-
-#endif
-
-
-
diff --git a/Core/Tools/WW3D/max2w3d/genlodextensiondialog.cpp b/Core/Tools/WW3D/max2w3d/genlodextensiondialog.cpp
index 8558e53b2b5..ffc8b5c36eb 100644
--- a/Core/Tools/WW3D/max2w3d/genlodextensiondialog.cpp
+++ b/Core/Tools/WW3D/max2w3d/genlodextensiondialog.cpp
@@ -153,7 +153,7 @@ bool GenLodExtensionDialogClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wPara
 				IDC_LOD_INDEX_EDIT,
 				MIN_LOD_INDEX,MAX_LOD_INDEX,INITIAL_LOD_INDEX
 			);
-			
+
 			return 1;
 
 		case WM_COMMAND:
diff --git a/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h b/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h
index 50f195a0752..c028e8a6fbb 100644
--- a/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h
+++ b/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h
@@ -36,8 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef GENLODEXTENSIONDIALOG_H
-#define GENLODEXTENSIONDIALOG_H
+#pragma once
 
 #include <windows.h>
 
@@ -55,23 +54,23 @@ class GenLodExtensionDialogClass
 
 	GenLodExtensionDialogClass(Interface * maxinterface);
 	~GenLodExtensionDialogClass();
-	
+
 	struct OptionsStruct
 	{
 		OptionsStruct(void) : LodIndex(0)
-		{ 
+		{
 		}
-		
+
 		// name options
 		int		LodIndex;
 	};
 
 	bool Get_Options(OptionsStruct * options);
 	bool Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM);
-		
+
 private:
 
-	enum 
+	enum
 	{
 		MIN_LOD_INDEX				= 0,
 		MAX_LOD_INDEX				= 99,
@@ -87,8 +86,3 @@ class GenLodExtensionDialogClass
 	friend BOOL CALLBACK			_gen_lod_ext_dialog_proc(HWND Hwnd,UINT message,WPARAM wParam,LPARAM lParam);
 
 };
-
-
-
-
-#endif //GENLODEXTENSIONDIALOG_H
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.cpp b/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.cpp
index 564da720f6a..1347ccce465 100644
--- a/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.cpp
+++ b/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.cpp
@@ -149,7 +149,7 @@ bool GenMtlNamesDialogClass::Ok_To_Exit(void)
 	// just check that the user entered a name
 	char buf[W3D_NAME_LEN];
 	GetWindowText(GetDlgItem(Hwnd,IDC_BASE_NAME_EDIT),buf,sizeof(buf));
-	
+
 	if (strlen(buf) == 0) {
 		MessageBox(Hwnd,"Please enter a root name to use.\n","Error",MB_OK);
 		return false;
@@ -186,7 +186,7 @@ bool GenMtlNamesDialogClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LP
 				IDC_NAME_INDEX_EDIT,
 				MIN_NAME_INDEX,MAX_NAME_INDEX,INITIAL_NAME_INDEX
 			);
-			
+
 			// limit the edit box characters
 			SendDlgItemMessage(Hwnd,IDC_BASE_NAME_EDIT,EM_LIMITTEXT,MAX_ROOT_NAME_LEN,0);
 
@@ -199,7 +199,7 @@ bool GenMtlNamesDialogClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LP
 			// init radio buttons
 			CheckDlgButton(Hwnd,IDC_AFFECT_ALL_RADIO,BST_UNCHECKED);
 			CheckDlgButton(Hwnd,IDC_AFFECT_SELECTED_RADIO,BST_CHECKED);
-		
+
 			return 1;
 
 		case WM_COMMAND:
@@ -210,11 +210,11 @@ bool GenMtlNamesDialogClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LP
 					if (Ok_To_Exit()) {
 						// general options
 						Options->OnlyAffectSelected = (IsDlgButtonChecked(Hwnd,IDC_AFFECT_SELECTED_RADIO) == BST_CHECKED);
-						
+
 						// naming options
 						Options->NameIndex = NameIndexSpin->GetIVal();
 						GetWindowText(GetDlgItem(Hwnd,IDC_BASE_NAME_EDIT),Options->RootName,sizeof(Options->RootName));
-						
+
 						EndDialog(Hwnd, 1);
 					}
 					break;
diff --git a/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h b/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h
index f1508c386ea..fcb8ef9614a 100644
--- a/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h
+++ b/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h
@@ -36,8 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef GENMTLNAMESDIALOG_H
-#define GENMTLNAMESDIALOG_H
+#pragma once
 
 #include <windows.h>
 
@@ -55,8 +54,8 @@ class GenMtlNamesDialogClass
 
 	GenMtlNamesDialogClass(Interface * maxinterface);
 	~GenMtlNamesDialogClass();
-	
-	enum 
+
+	enum
 	{
 		MAX_MATERIAL_NAME_LEN	= 32,
 		MIN_NAME_INDEX				= 0,
@@ -68,11 +67,11 @@ class GenMtlNamesDialogClass
 	struct OptionsStruct
 	{
 		OptionsStruct(void) : OnlyAffectSelected(true), NameIndex(0)
-		{ 
-			memset(RootName,0,sizeof(RootName)); 
+		{
+			memset(RootName,0,sizeof(RootName));
 		}
-		
-		// overall options		
+
+		// overall options
 		bool		OnlyAffectSelected;
 
 		// name options
@@ -83,7 +82,7 @@ class GenMtlNamesDialogClass
 	bool Get_Options(OptionsStruct * options);
 	bool Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM);
 	bool Ok_To_Exit(void);
-		
+
 private:
 
 	HWND								Hwnd;
@@ -95,8 +94,3 @@ class GenMtlNamesDialogClass
 	friend BOOL CALLBACK _gen_mtl_names_dialog_proc(HWND hwnd,UINT message,WPARAM wparam,LPARAM lparam);
 
 };
-
-
-#endif //GENMTLNAMESDIALOG_H
-
-
diff --git a/Core/Tools/WW3D/max2w3d/gennamesdialog.cpp b/Core/Tools/WW3D/max2w3d/gennamesdialog.cpp
index 992856d0902..c3328c7bce7 100644
--- a/Core/Tools/WW3D/max2w3d/gennamesdialog.cpp
+++ b/Core/Tools/WW3D/max2w3d/gennamesdialog.cpp
@@ -157,14 +157,14 @@ bool GenNamesDialogClass::Ok_To_Exit(void)
 		// just check that the user entered a name
 		char buf[W3D_NAME_LEN];
 		GetWindowText(GetDlgItem(Hwnd,IDC_BASE_NAME_EDIT),buf,sizeof(buf));
-		
+
 		if (strlen(buf) == 0) {
 			MessageBox(Hwnd,"Please enter a root name to use.\n","Error",MB_OK);
 			return false;
 		} else {
 			return true;
 		}
-	} 
+	}
 
 	return true;
 }
@@ -241,7 +241,7 @@ bool GenNamesDialogClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARA
 				IDC_NAME_INDEX_EDIT,
 				MIN_NAME_INDEX,MAX_NAME_INDEX,INITIAL_NAME_INDEX
 			);
-			
+
 			// limit the base name edit box to 10 characters
 			SendDlgItemMessage(Hwnd,IDC_BASE_NAME_EDIT,EM_LIMITTEXT,MAX_ROOT_NAME_LEN,0);
 
@@ -258,7 +258,7 @@ bool GenNamesDialogClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARA
 			// init radio buttons
 			CheckDlgButton(Hwnd,IDC_AFFECT_ALL_RADIO,BST_UNCHECKED);
 			CheckDlgButton(Hwnd,IDC_AFFECT_SELECTED_RADIO,BST_CHECKED);
-		
+
 			// init the check boxes
 			CheckDlgButton(Hwnd,IDC_ASSIGN_NAMES_CHECK,BST_CHECKED);
 			CheckDlgButton(Hwnd,IDC_ASSIGN_PREFIX_CHECK,BST_UNCHECKED);
@@ -283,13 +283,13 @@ bool GenNamesDialogClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARA
 						Options->AssignSuffix = (IsDlgButtonChecked(Hwnd,IDC_ASSIGN_SUFFIX_CHECK) == BST_CHECKED);
 						Options->AssignCollisionBits = (IsDlgButtonChecked(Hwnd,IDC_ASSIGN_COLLISION_BITS_CHECK) == BST_CHECKED);
 						Options->OnlyAffectSelected = (IsDlgButtonChecked(Hwnd,IDC_AFFECT_SELECTED_RADIO) == BST_CHECKED);
-						
+
 						// naming options
 						Options->NameIndex = NameIndexSpin->GetIVal();
 						GetWindowText(GetDlgItem(Hwnd,IDC_BASE_NAME_EDIT),Options->RootName,sizeof(Options->RootName));
 						GetWindowText(GetDlgItem(Hwnd,IDC_PREFIX_EDIT),Options->PrefixName,sizeof(Options->PrefixName));
 						GetWindowText(GetDlgItem(Hwnd,IDC_SUFFIX_EDIT),Options->SuffixName,sizeof(Options->SuffixName));
-						
+
 						// collision options
 						Options->PhysicalCollision = (IsDlgButtonChecked(Hwnd,IDC_COLLISION_PHYSICAL) == BST_CHECKED);
 						Options->ProjectileCollision = (IsDlgButtonChecked(Hwnd,IDC_COLLISION_PROJECTILE) == BST_CHECKED);
diff --git a/Core/Tools/WW3D/max2w3d/gennamesdialog.h b/Core/Tools/WW3D/max2w3d/gennamesdialog.h
index ffaf3484d8f..bcbc8c558b1 100644
--- a/Core/Tools/WW3D/max2w3d/gennamesdialog.h
+++ b/Core/Tools/WW3D/max2w3d/gennamesdialog.h
@@ -52,19 +52,19 @@ class GenNamesDialogClass
 
 	GenNamesDialogClass(Interface * maxinterface);
 	~GenNamesDialogClass();
-	
+
 	struct OptionsStruct
 	{
-		OptionsStruct(void) : OnlyAffectSelected(false), NameIndex(0), AssignCollisionBits(false) 
-		{ 
-			memset(RootName,0,sizeof(RootName)); 
+		OptionsStruct(void) : OnlyAffectSelected(false), NameIndex(0), AssignCollisionBits(false)
+		{
+			memset(RootName,0,sizeof(RootName));
 			memset(PrefixName,0,sizeof(PrefixName));
 			memset(SuffixName,0,sizeof(SuffixName));
 		}
-		
-		// overall options		
-		bool		AssignNames;				
-		bool		AssignPrefix;				
+
+		// overall options
+		bool		AssignNames;
+		bool		AssignPrefix;
 		bool		AssignSuffix;
 		bool		AssignCollisionBits;
 		bool		OnlyAffectSelected;
@@ -88,10 +88,10 @@ class GenNamesDialogClass
 	bool Ok_To_Exit(void);
 	void Toggle_Collision_Bits_Assignment(void);
 	void Toggle_Name_Assignment(void);
-		
+
 private:
 
-	enum 
+	enum
 	{
 		MIN_NAME_INDEX				= 0,
 		MAX_NAME_INDEX				= 999,
diff --git a/Core/Tools/WW3D/max2w3d/geometryexportcontext.h b/Core/Tools/WW3D/max2w3d/geometryexportcontext.h
index 83774c7f270..c1d83f18d8b 100644
--- a/Core/Tools/WW3D/max2w3d/geometryexportcontext.h
+++ b/Core/Tools/WW3D/max2w3d/geometryexportcontext.h
@@ -36,9 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef GEOMETRYEXPORTCONTEXT_H
-#define GEOMETRYEXPORTCONTEXT_H
+#pragma once
 
 #include <max.h>
 
@@ -49,11 +47,11 @@ class INodeListClass;
 class Progress_Meter_Class;
 struct W3dExportOptionsStruct;
 
- 
+
 /**
 ** ExportContextClass
 ** This class encapsulates a bunch of datastructures needed during the geometry export
-** process. 
+** process.
 ** NOTE: The user must plug in a valid ProgressMeter before each export operation.
 */
 class GeometryExportContextClass
@@ -86,7 +84,7 @@ class GeometryExportContextClass
 		ModelName = strdup(model_name);
 		OriginTransform = Origin->GetNodeTM(CurTime);
 	}
-	
+
 	~GeometryExportContextClass(void)
 	{
 		delete[] ModelName;
@@ -108,8 +106,3 @@ class GeometryExportContextClass
 	int								numHouseColors;		///MW: number of used house colors
 	char	*						materialColorTexture; //MW: texture to hold material colors
 };
-
-
-
-#endif //GEOMETRYEXPORTCONTEXT_H
-
diff --git a/Core/Tools/WW3D/max2w3d/geometryexporttask.cpp b/Core/Tools/WW3D/max2w3d/geometryexporttask.cpp
index 139f1f597c7..8a6a70a668c 100644
--- a/Core/Tools/WW3D/max2w3d/geometryexporttask.cpp
+++ b/Core/Tools/WW3D/max2w3d/geometryexporttask.cpp
@@ -62,14 +62,14 @@
 #include "colboxsave.h"
 #include "dazzlesave.h"
 #include <bitarray.h>
- 
+
 
 const int		OPTIMIZATION_FACECOUNT_LIMIT	= 256;			// TODO: what should this number be...
 const float		OPTIMIZATION_COMBINING_DISTANCE = 20.0f;		// TODO: need a smarter method for combining...
 
 
 /**
-** MeshGeometryExportTaskClass 
+** MeshGeometryExportTaskClass
 ** Export task for INodes which are to generate W3D meshes
 */
 class MeshGeometryExportTaskClass : public GeometryExportTaskClass
@@ -98,7 +98,7 @@ class MeshGeometryExportTaskClass : public GeometryExportTaskClass
 		*/
 		Update_Cached_Data();
 	}
-	
+
 	MeshGeometryExportTaskClass(const MeshGeometryExportTaskClass & that) :
 		GeometryExportTaskClass(that),
 		MeshData(that.MeshData),
@@ -149,13 +149,13 @@ class MeshGeometryExportTaskClass : public GeometryExportTaskClass
 	** to exporting.
 	*/
 	bool	Is_Name_Dirty(void)				{ return NameDirty; }
-	void	Set_Name_Dirty(bool onoff)		{ NameDirty = onoff; } 
+	void	Set_Name_Dirty(bool onoff)		{ NameDirty = onoff; }
 
 	/*
 	** Vertex Normal smoothing support!
 	*/
 	virtual Point3		Get_Shared_Vertex_Normal(const Point3 & pos,int smgroup);
-	
+
 	/*
 	** Optimization functions
 	*/
@@ -178,7 +178,7 @@ class MeshGeometryExportTaskClass : public GeometryExportTaskClass
 
 	// Cached Data about the Node/Mesh.  Updated by calling Update_Cached_Data whenever the mesh changes.
 	Mtl *					SingleMtl;			// Pointer to the single material (if the mesh uses only one, even in a multi-mtl)
-	Point3				BoxCenter;			// Center of the bounding box (in object space)			
+	Point3				BoxCenter;			// Center of the bounding box (in object space)
 	Point3				BoxExtent;			// Extent of the bounding box (in object space)
 	Box3					WorldBounds;		// World-space bounding box
 };
@@ -272,7 +272,7 @@ class DazzleGeometryExportTaskClass : public GeometryExportTaskClass
 /**
 ** NullGeometryExportTaskClass
 ** Export task for INodes which are to generate W3D NULL objects.  Note that this
-** does not do anything in the Export_Geometry call, these only create entries in 
+** does not do anything in the Export_Geometry call, these only create entries in
 ** any Hierarhcical model or collection object being exported.
 */
 class NullGeometryExportTaskClass : public GeometryExportTaskClass
@@ -290,7 +290,7 @@ class NullGeometryExportTaskClass : public GeometryExportTaskClass
 	{
 		context.ProgressMeter->Add_Increment();
 	};
-	
+
 protected:
 
 	virtual int	Get_Geometry_Type(void) { return NULLOBJ; }
@@ -303,7 +303,7 @@ class NullGeometryExportTaskClass : public GeometryExportTaskClass
 ** Export task for INodes which are to generate W3D Aggregates.  These are nodes
 ** that refer to some external W3D object.  This export task doesn't export any
 ** geometry (similer to the Null export task) and it clears its container name
-** because the object to be attached is not a sub-object of the model we are 
+** because the object to be attached is not a sub-object of the model we are
 ** currently exporting.
 */
 class AggregateGeometryExportTaskClass : public GeometryExportTaskClass
@@ -320,9 +320,9 @@ class AggregateGeometryExportTaskClass : public GeometryExportTaskClass
 		context.ProgressMeter->Add_Increment();
 	};
 
-	virtual bool Is_Aggregate(void)						
-	{ 
-		return true; 
+	virtual bool Is_Aggregate(void)
+	{
+		return true;
 	}
 
 protected:
@@ -400,7 +400,7 @@ GeometryExportTaskClass::GeometryExportTaskClass(INode * node,GeometryExportCont
 	ExportSpace(1),
 	CurTime(context.CurTime),
 	Node(node)
-{	
+{
 	/*
 	** Set up the names
 	*/
@@ -502,14 +502,14 @@ void GeometryExportTaskClass::Get_Full_Name(char * buffer,int size)
  * HISTORY:                                                                                    *
  *   10/20/2000 gth : Created.                                                                 *
  *=============================================================================================*/
-GeometryExportTaskClass * 
+GeometryExportTaskClass *
 GeometryExportTaskClass::Create_Task(INode * node,GeometryExportContextClass & context)
 {
 	if (!::Is_Geometry(node)) {
 		return NULL;
 	}
-	
-	// NOTE: we *have* to check Is_Proxy first because it is tied to a naming convention 
+
+	// NOTE: we *have* to check Is_Proxy first because it is tied to a naming convention
 	// rather than an explicit UI setting like the rest of the types.
 	if (::Is_Proxy(*node)) {
 		return new ProxyExportTaskClass(node,context);
@@ -526,13 +526,13 @@ GeometryExportTaskClass::Create_Task(INode * node,GeometryExportContextClass & c
 	if (::Is_Null_Object(node)) {
 		return new NullGeometryExportTaskClass(node,context);
 	}
-	
+
 	if (::Is_Dazzle(node)) {
 		return new DazzleGeometryExportTaskClass(node,context);
 	}
 
 	if (::Is_Aggregate(node)) {
-		return new AggregateGeometryExportTaskClass(node,context);		
+		return new AggregateGeometryExportTaskClass(node,context);
 	}
 
 	return NULL;
@@ -570,23 +570,23 @@ void GeometryExportTaskClass::Optimize_Geometry
 	*/
 	DynamicVectorClass<MeshGeometryExportTaskClass *> meshes;
 	while (i<tasks.Count()) {
-		if (	(tasks[i]->Get_Geometry_Type() == GeometryExportTaskClass::MESH) && 
-				(!Is_Skin(tasks[i]->Get_Object_Node())) ) 
+		if (	(tasks[i]->Get_Geometry_Type() == GeometryExportTaskClass::MESH) &&
+				(!Is_Skin(tasks[i]->Get_Object_Node())) )
 		{
 			/*
 			** Add to the mesh array, remove from the tasks array
-			*/			
+			*/
 			meshes.Add((MeshGeometryExportTaskClass *)(tasks[i]));
 			tasks.Delete(i);
 		} else {
 
 			/*
 			** Leave in the task array and move to the next one.
-			*/			
+			*/
 			i++;
-		} 
+		}
 	}
-	
+
 	/*
 	** Pass 2: Split all meshes which use more than one material
 	*/
@@ -619,15 +619,15 @@ void GeometryExportTaskClass::Optimize_Geometry
 	while (i < simple_meshes.Count()) {
 
 		if (simple_meshes[i]->Can_Combine()) {
-		
+
 			j=i+1;
 			while (j < simple_meshes.Count()) {
 				if (simple_meshes[i]->Can_Combine_With(simple_meshes[j])) {
-				
+
 					/*
 					** Add mesh 'j' into mesh 'i', delete its task.
 					*/
-					simple_meshes[i]->Combine_Mesh(simple_meshes[j]);				
+					simple_meshes[i]->Combine_Mesh(simple_meshes[j]);
 					delete simple_meshes[j];
 					simple_meshes.Delete(j);
 
@@ -648,7 +648,7 @@ void GeometryExportTaskClass::Optimize_Geometry
 			}
 		}
 		i++;
-	}	
+	}
 
 
 
@@ -689,10 +689,10 @@ void GeometryExportTaskClass::Optimize_Geometry
  *   10/23/2000 gth : Created.                                                                 *
  *=============================================================================================*/
 void GeometryExportTaskClass::Generate_Name(char * root,int index,GeometryExportContextClass & context)
-{	
+{
 	/*
 	** Check if the original had a Renegade "building prefix" in its name.  Building meshes
-	** are named with a 2-3 letter user specified prefix followed by either '^' or '#'.  We 
+	** are named with a 2-3 letter user specified prefix followed by either '^' or '#'.  We
 	** have to maintain this prefix on the optimized meshes...
 	*/
 	char prefix[5];
@@ -756,12 +756,12 @@ void	MeshGeometryExportTaskClass::Update_Cached_Data(void)
 		SingleMtl = nodemtl;
 
 	} else {
-		
+
 		int mat_index;
 		int face_index;
 		int sub_mtl_count = nodemtl->NumSubMtls();
 		bool * sub_mtl_flags = new bool[sub_mtl_count];
-		
+
 		/*
 		** Initialize each sub-material flag to false (indicates that the material is un-used)
 		*/
@@ -799,7 +799,7 @@ void	MeshGeometryExportTaskClass::Update_Cached_Data(void)
 	*/
 	Point3 boxmin(0,0,0);
 	Point3 boxmax(0,0,0);
-	
+
 	if (MeshData.numVerts > 0) {
 		boxmin = MeshData.verts[1];
 		boxmax = MeshData.verts[0];
@@ -807,7 +807,7 @@ void	MeshGeometryExportTaskClass::Update_Cached_Data(void)
 			boxmin.x = MIN(MeshData.verts[i].x,boxmin.x);
 			boxmin.y = MIN(MeshData.verts[i].y,boxmin.y);
 			boxmin.z = MIN(MeshData.verts[i].z,boxmin.z);
-			
+
 			boxmax.x = MAX(MeshData.verts[i].x,boxmax.x);
 			boxmax.y = MAX(MeshData.verts[i].y,boxmax.y);
 			boxmax.z = MAX(MeshData.verts[i].z,boxmax.z);
@@ -884,7 +884,7 @@ void MeshGeometryExportTaskClass::Split(DynamicVectorClass<MeshGeometryExportTas
 	int face_index;
 	int sub_mtl_count = nodemtl->NumSubMtls();
 	bool * sub_mtl_flags = new bool[sub_mtl_count];
-	
+
 	/*
 	** Initialize each sub-material flag to false (indicates that the material is un-used)
 	*/
@@ -911,7 +911,7 @@ void MeshGeometryExportTaskClass::Split(DynamicVectorClass<MeshGeometryExportTas
 			new_task->Reduce_To_Single_Material(mat_index);
 			new_task->Set_Name_Dirty(true);
 			simple_meshes.Add(new_task);
-		
+
 		}
 	}
 }
@@ -942,7 +942,7 @@ void MeshGeometryExportTaskClass::Reduce_To_Single_Material(int mat_id)
 
 	faces_to_delete.ClearAll();
 	verts_to_delete.ClearAll();
-	
+
 	for (int i=0; i<MeshData.getNumFaces(); i++) {
 		if ((MeshData.faces[i].getMatID() % sub_mtl_count) != mat_id) {
 			faces_to_delete.Set(i,true);
@@ -953,7 +953,7 @@ void MeshGeometryExportTaskClass::Reduce_To_Single_Material(int mat_id)
 	MeshData.DeleteVertSet(verts_to_delete);
 
 	Update_Cached_Data();
-}	
+}
 
 
 /***********************************************************************************************
@@ -1070,7 +1070,7 @@ void MeshGeometryExportTaskClass::Combine_Mesh(MeshGeometryExportTaskClass * oth
 	/*
 	** Compute the transform from other_mesh's coordinate system to ours so that
 	** its polygons can be combined with ours (by calling CombineMeshes)
-	*/ 
+	*/
 	Matrix3 our_tm = Node->GetObjectTM(CurTime);
 	Matrix3 his_tm = other_mesh->Node->GetObjectTM(CurTime);
 	Matrix3 tm = Inverse(our_tm) * his_tm;
@@ -1094,7 +1094,7 @@ void MeshGeometryExportTaskClass::Combine_Mesh(MeshGeometryExportTaskClass * oth
 	** Set all material ID's
 	*/
 	for (int i=0; i<MeshData.numFaces; i++) {
-		MeshData.faces[i].setMatID(matid); 		
+		MeshData.faces[i].setMatID(matid);
 	}
 }
 
@@ -1109,21 +1109,21 @@ Point3 MeshGeometryExportTaskClass::Get_Shared_Vertex_Normal(const Point3 & worl
 	*/
 	if (WorldBounds.Contains(world_pos) != 0) {
 
-		/* 
+		/*
 		** Transform the query point into object space
 		*/
 		Matrix3 tm = Node->GetObjectTM(CurTime);
 		Point3 obj_pos = world_pos * Inverse(tm);
-	
+
 		/*
 		**	Loop through all the faces in this mesh and find out which ones
 		** share the same smoothing group as the vertex we are looking for.
 		*/
-		for (int face_index = 0; face_index < MeshData.numFaces; face_index ++) {					
+		for (int face_index = 0; face_index < MeshData.numFaces; face_index ++) {
 			Face &maxface = MeshData.faces[face_index];
 			int face_smgroup = maxface.getSmGroup();
 			if ((face_smgroup & smgroup) || (face_smgroup == smgroup)) {
-				
+
 				/*
 				**	Find out if any of the verticies of this face share the
 				** same space as the vertex we are looking for.
@@ -1162,7 +1162,7 @@ Point3 MeshGeometryExportTaskClass::Get_Shared_Vertex_Normal(const Point3 & worl
 			}
 		}
 
-		/* 
+		/*
 		** Transform the "normal" to world space.  Note that this vector isn't
 		** normalized because we are basically summing the contributions of each
 		** face in each mesh which shares this normal.  The final normal
diff --git a/Core/Tools/WW3D/max2w3d/geometryexporttask.h b/Core/Tools/WW3D/max2w3d/geometryexporttask.h
index e41637a30ae..a3802a1cf5e 100644
--- a/Core/Tools/WW3D/max2w3d/geometryexporttask.h
+++ b/Core/Tools/WW3D/max2w3d/geometryexporttask.h
@@ -36,13 +36,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef GEOMETRYEXPORTTASK_H
-#define GEOMETRYEXPORTTASK_H
+#pragma once
 
 #include <string.h>
 #include <max.h>
 #include "w3d_file.h"
-#include "Vector.H"
+#include "Vector.h"
 
 
 class GeometryExportContextClass;
@@ -52,7 +51,7 @@ class GeometryExportContextClass;
 ** GeometryExportTaskClass
 ** This abstract base class defines the interface for a geometry export task.
 ** Derived classes will encapsulate the job of exporting meshes, collision
-** boxes, dazzles, etc.  The factory function Create_Task will create the 
+** boxes, dazzles, etc.  The factory function Create_Task will create the
 ** appropriate task for a given INode.
 */
 class GeometryExportTaskClass
@@ -95,13 +94,13 @@ class GeometryExportTaskClass
 
 	/*
 	** Aggregate Model Detection.  An "aggregate" is an external W3D model that we are requesting
-	** to be attached to a bone in the model being exported.  In order for our LOD system to work 
+	** to be attached to a bone in the model being exported.  In order for our LOD system to work
 	** properly, some special handling of aggregates is required (they must be added into the model
 	** as "additional models" rather than being placed in the normal LOD arrays).  This virtual
 	** can be used to detect "aggregate" models.
 	*/
 	virtual bool							Is_Aggregate(void)						{ return false; }
-	
+
 	/*
 	** Proxy Detection. A "proxy" is a reference (by name) to an external game object that should
 	** be instantiated at the specified transform.  Like the aggregates, these had to unfortunately
@@ -127,7 +126,7 @@ class GeometryExportTaskClass
 	/*
 	** Internal RTTI
 	*/
-	enum 
+	enum
 	{
 		MESH							= 0,
 		COLLISIONBOX,
@@ -137,19 +136,14 @@ class GeometryExportTaskClass
 		PROXY,
 	};
 	virtual int	Get_Geometry_Type(void) = 0;
-			
+
 protected:
-	
+
 	char					Name[W3D_NAME_LEN];
 	char					ContainerName[W3D_NAME_LEN];
 	int					BoneIndex;
-	
+
 	Matrix3				ExportSpace;
 	TimeValue			CurTime;
 	INode *				Node;
 };
-
-
-
-#endif //GEOMETRYEXPORTTASK_H
-
diff --git a/Core/Tools/WW3D/max2w3d/gmtldlg.cpp b/Core/Tools/WW3D/max2w3d/gmtldlg.cpp
index bd03a587898..f2ebcba44a1 100644
--- a/Core/Tools/WW3D/max2w3d/gmtldlg.cpp
+++ b/Core/Tools/WW3D/max2w3d/gmtldlg.cpp
@@ -17,38 +17,38 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/gmtldlg.cpp 18    5/27/98 8:34a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : GMTLDLG.CPP                                                  * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/26/97                                                     * 
- *                                                                                             * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : GMTLDLG.cpp                                                  *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/26/97                                                     *
+ *                                                                                             *
  *                  Last Update : June 26, 1997 [GH]                                           *
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   GameMtlDlg::GameMtlDlg -- constructor                                                     * 
- *   GameMtlDlg::~GameMtlDlg -- destructor!                                                    * 
- *   GameMtlDlg::ClassID -- Returns the ClassID of GameMtl                                     * 
- *   GameMtlDlg::Invalidate -- causes the dialog to be redrawn                                 * 
- *   GameMtlDlg::ReloadDialog -- Updates the values in all of the dialog's controls            * 
- *   GameMtlDlg::SetTime -- Sets the time value, updates the material and the dialog           * 
- *   GameMtlDlg::PanelProc -- Windows Message handler                                          * 
- *   PanelDlgProc -- Windows Proc which thunks into GameMtlDlg::PanelProc                      * 
- *   GameMtlDlg::LoadDialog -- Sets the state of all of the dialog's controls                  * 
- *   GameMtlDlg::UpdateMtlDisplay -- Informs MAX that the material parameters have changed     * 
- *   GameMtlDlg::ActivateDlg -- Activates and deactivates the dialog                           * 
- *   GameMtlDlg::SetThing -- Sets the material to be edited                                    * 
- *   GameMtlDlg::BuildDialog -- Adds the dialog to the material editor                         * 
- *   GameMtlDlg::UpdateTexmapDisplay -- Updates the texture map buttons                        * 
- *   NotesDlgProc -- Dialog Proc which thunks to GameMtlDlg::NotesProc                         * 
- *   GameMtlDlg::NotesProc -- Dialog Proc for the Notes panel                                  * 
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   GameMtlDlg::GameMtlDlg -- constructor                                                     *
+ *   GameMtlDlg::~GameMtlDlg -- destructor!                                                    *
+ *   GameMtlDlg::ClassID -- Returns the ClassID of GameMtl                                     *
+ *   GameMtlDlg::Invalidate -- causes the dialog to be redrawn                                 *
+ *   GameMtlDlg::ReloadDialog -- Updates the values in all of the dialog's controls            *
+ *   GameMtlDlg::SetTime -- Sets the time value, updates the material and the dialog           *
+ *   GameMtlDlg::PanelProc -- Windows Message handler                                          *
+ *   PanelDlgProc -- Windows Proc which thunks into GameMtlDlg::PanelProc                      *
+ *   GameMtlDlg::LoadDialog -- Sets the state of all of the dialog's controls                  *
+ *   GameMtlDlg::UpdateMtlDisplay -- Informs MAX that the material parameters have changed     *
+ *   GameMtlDlg::ActivateDlg -- Activates and deactivates the dialog                           *
+ *   GameMtlDlg::SetThing -- Sets the material to be edited                                    *
+ *   GameMtlDlg::BuildDialog -- Adds the dialog to the material editor                         *
+ *   GameMtlDlg::UpdateTexmapDisplay -- Updates the texture map buttons                        *
+ *   NotesDlgProc -- Dialog Proc which thunks to GameMtlDlg::NotesProc                         *
+ *   GameMtlDlg::NotesProc -- Dialog Proc for the Notes panel                                  *
  *   HintsDlgProc -- Dialog proc which thunks to GameMtlDlg::HintsProc                         *
  *   GameMtlDlg::HintsProc -- Dialog Proc for the hints panel                                  *
  *   GameMtlDlg::PsxProc -- Dialog proc for the PSX options panel                              *
@@ -69,34 +69,34 @@
 
 
 
-static inline float PcToFrac(int pc) 
+static inline float PcToFrac(int pc)
 {
-	return (float)pc/100.0f;	
+	return (float)pc/100.0f;
 }
 
-static inline int FracToPc(float f) 
+static inline int FracToPc(float f)
 {
 	if (f<0.0) return (int)(100.0f*f - .5f);
 	else return (int) (100.0f*f + .5f);
 }
 
 
-/*********************************************************************************************** 
- * GameMtlDlg::GameMtlDlg -- constructor                                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * 	hwMtlEdit - windows handle of the MAX material editor												  * 
- * 	imp - Interface object for MAX materials and textures												  * 
- * 	m - pointer to a GameMtl to be edited																	  * 
- * 																														  * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::GameMtlDlg -- constructor                                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * 	hwMtlEdit - windows handle of the MAX material editor												  *
+ * 	imp - Interface object for MAX materials and textures												  *
+ * 	m - pointer to a GameMtl to be edited																	  *
+ * 																														  *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-GameMtlDlg::GameMtlDlg(HWND hwMtlEdit, IMtlParams *imp, GameMtl *m) 
+GameMtlDlg::GameMtlDlg(HWND hwMtlEdit, IMtlParams *imp, GameMtl *m)
 {
 	HwndEdit = hwMtlEdit;
 	HwndPanel = NULL;
@@ -104,13 +104,13 @@ GameMtlDlg::GameMtlDlg(HWND hwMtlEdit, IMtlParams *imp, GameMtl *m)
 	HwndPsx = NULL;
 	HwndNotes = NULL;
 	HpalOld = NULL;
-	
-	TheMtl = m; 
+
+	TheMtl = m;
 	IParams = imp;
 	Valid = FALSE;
 	IsActive = 0;
 	InstCopy = FALSE;
-	
+
 	DiffuseSwatch = NULL;
 	SpecularSwatch = NULL;
 
@@ -135,19 +135,19 @@ GameMtlDlg::GameMtlDlg(HWND hwMtlEdit, IMtlParams *imp, GameMtl *m)
 	FogSpin = NULL;
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::~GameMtlDlg -- destructor!                                                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::~GameMtlDlg -- destructor!                                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-GameMtlDlg::~GameMtlDlg() 
+GameMtlDlg::~GameMtlDlg()
 {
 	if (DiffuseSwatch) {
 		ReleaseIColorSwatch(DiffuseSwatch);
@@ -158,12 +158,12 @@ GameMtlDlg::~GameMtlDlg()
 		ReleaseIColorSwatch(SpecularSwatch);
 		SpecularSwatch = NULL;
 	}
-	
+
 	if (AmbientCoeffSwatch) {
 		ReleaseIColorSwatch(AmbientCoeffSwatch);
 		AmbientCoeffSwatch = NULL;
 	}
-	
+
 	if (DiffuseCoeffSwatch) {
 		ReleaseIColorSwatch(DiffuseCoeffSwatch);
 		DiffuseCoeffSwatch = NULL;
@@ -173,7 +173,7 @@ GameMtlDlg::~GameMtlDlg()
 		ReleaseIColorSwatch(SpecularCoeffSwatch);
 		SpecularCoeffSwatch = NULL;
 	}
-	
+
 	if (EmissiveCoeffSwatch) {
 		ReleaseIColorSwatch(EmissiveCoeffSwatch);
 		EmissiveCoeffSwatch = NULL;
@@ -192,52 +192,52 @@ GameMtlDlg::~GameMtlDlg()
 	TheMtl->RollScroll = IParams->GetRollupScrollPos();
 	TheMtl->SetParamDlg(NULL);
 
-	IParams->UnRegisterDlgWnd(HwndPanel);		
+	IParams->UnRegisterDlgWnd(HwndPanel);
 	IParams->DeleteRollupPage(HwndPanel);
 	HwndPanel = NULL;
 
-	IParams->UnRegisterDlgWnd(HwndPsx);		
+	IParams->UnRegisterDlgWnd(HwndPsx);
 	IParams->DeleteRollupPage(HwndPsx);
 	HwndPsx = NULL;
 
-	IParams->UnRegisterDlgWnd(HwndHints);		
+	IParams->UnRegisterDlgWnd(HwndHints);
 	IParams->DeleteRollupPage(HwndHints);
 	HwndHints = NULL;
 
-	IParams->UnRegisterDlgWnd(HwndNotes);		
+	IParams->UnRegisterDlgWnd(HwndNotes);
 	IParams->DeleteRollupPage(HwndNotes);
 	HwndNotes = NULL;
 }
 
 
-/*********************************************************************************************** 
- * GameMtlDlg::ClassID -- Returns the ClassID of GameMtl                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::ClassID -- Returns the ClassID of GameMtl                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-Class_ID GameMtlDlg::ClassID() 
+Class_ID GameMtlDlg::ClassID()
 {
-	return GameMaterialClassID;  
+	return GameMaterialClassID;
 }
-	
-/*********************************************************************************************** 
- * GameMtlDlg::Invalidate -- causes the dialog to be redrawn                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+
+/***********************************************************************************************
+ * GameMtlDlg::Invalidate -- causes the dialog to be redrawn                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void GameMtlDlg::Invalidate()
 {
@@ -248,38 +248,38 @@ void GameMtlDlg::Invalidate()
 	InvalidateRect(HwndNotes,NULL,0);
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::ReloadDialog -- Updates the values in all of the dialog's controls              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::ReloadDialog -- Updates the values in all of the dialog's controls              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-void GameMtlDlg::ReloadDialog() 
+void GameMtlDlg::ReloadDialog()
 {
 	Interval v;
 	TheMtl->Update(IParams->GetTime(),v);
 	LoadDialog(FALSE);
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::SetTime -- Sets the time value, updates the material and the dialog             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::SetTime -- Sets the time value, updates the material and the dialog             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-void GameMtlDlg::SetTime(TimeValue t) 
+void GameMtlDlg::SetTime(TimeValue t)
 {
 	if (t!=CurTime) {
 		CurTime = t;
@@ -290,19 +290,19 @@ void GameMtlDlg::SetTime(TimeValue t)
 }
 
 
-/*********************************************************************************************** 
- * GameMtlDlg::PanelProc -- Windows Message handler                                            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::PanelProc -- Windows Message handler                                            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam ) 
+BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam )
 {
 	int id = LOWORD(wParam);
 	int code = HIWORD(wParam);
@@ -318,7 +318,7 @@ BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 
 				DiffuseSwatch = GetIColorSwatch(GetDlgItem(hwndDlg, IDC_DIFFUSE_COLOR),TheMtl->GetDiffuse(),Get_String(IDS_DIFFUSE_COLOR));
 				SpecularSwatch = GetIColorSwatch(GetDlgItem(hwndDlg, IDC_SPECULAR_COLOR),TheMtl->GetSpecular(),Get_String(IDS_SPECULAR_COLOR));
-				
+
 				AmbientCoeffSwatch = GetIColorSwatch(GetDlgItem(hwndDlg, IDC_AMBIENT_COEFF),TheMtl->GetAmbientCoeff(),Get_String(IDS_AMBIENT_COEFF));
 				DiffuseCoeffSwatch = GetIColorSwatch(GetDlgItem(hwndDlg, IDC_DIFFUSE_COEFF),TheMtl->GetDiffuseCoeff(),Get_String(IDS_DIFFUSE_COEFF));
 				SpecularCoeffSwatch = GetIColorSwatch(GetDlgItem(hwndDlg, IDC_SPECULAR_COEFF),TheMtl->GetSpecularCoeff(),Get_String(IDS_SPECULAR_COEFF));
@@ -333,7 +333,7 @@ BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 				DITRateSpin = SetupFloatSpinner(hwndDlg,IDC_DIT_RATE_SPIN,IDC_DIT_RATE_EDIT,0.0f,60.0f,TheMtl->DITFrameRate,5.0f);
 				SCTRateSpin = SetupFloatSpinner(hwndDlg,IDC_SCT_RATE_SPIN,IDC_SCT_RATE_EDIT,0.0f,60.0f,TheMtl->SCTFrameRate,5.0f);
 				SITRateSpin = SetupFloatSpinner(hwndDlg,IDC_SIT_RATE_SPIN,IDC_SIT_RATE_EDIT,0.0f,60.0f,TheMtl->SITFrameRate,5.0f);
-				
+
 				OpacitySpin = SetupFloatSpinner(hwndDlg,IDC_OPACITY_SPIN,IDC_OPACITY_EDIT,0.0f,1.0f,TheMtl->GetOpacity(),0.01f);
 				TranslucencySpin = SetupFloatSpinner(hwndDlg,IDC_TRANSLUCENCY_SPIN,IDC_TRANSULCENCY_EDIT,0.0f,1.0f,TheMtl->GetTranslucency(),0.01f);
 				ShininessSpin = SetupFloatSpinner(hwndDlg,IDC_SHININESS_SPIN,IDC_SHININESS_EDIT,1.0f,1000.0f,TheMtl->GetShininess(),1.0f);
@@ -344,10 +344,10 @@ BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 
 				SendDlgItemMessage( hwndDlg, IDC_DIT_MAPPING_COMBO, CB_ADDSTRING, 0, (LPARAM) (LPCTSTR) Get_String(IDS_UV_MAPPING));
 				SendDlgItemMessage( hwndDlg, IDC_DIT_MAPPING_COMBO, CB_ADDSTRING, 0, (LPARAM) (LPCTSTR) Get_String(IDS_ENVIRONMENT_MAPPING) );
-				
+
 				SendDlgItemMessage( hwndDlg, IDC_SCT_MAPPING_COMBO, CB_ADDSTRING, 0, (LPARAM) (LPCTSTR) Get_String(IDS_UV_MAPPING));
 				SendDlgItemMessage( hwndDlg, IDC_SCT_MAPPING_COMBO, CB_ADDSTRING, 0, (LPARAM) (LPCTSTR) Get_String(IDS_ENVIRONMENT_MAPPING) );
-				
+
 				SendDlgItemMessage( hwndDlg, IDC_SIT_MAPPING_COMBO, CB_ADDSTRING, 0, (LPARAM) (LPCTSTR) Get_String(IDS_UV_MAPPING));
 				SendDlgItemMessage( hwndDlg, IDC_SIT_MAPPING_COMBO, CB_ADDSTRING, 0, (LPARAM) (LPCTSTR) Get_String(IDS_ENVIRONMENT_MAPPING) );
 
@@ -362,7 +362,7 @@ BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 			}
 			break;
 
-		case WM_COMMAND: 
+		case WM_COMMAND:
 			{
 				switch (id) {
 
@@ -489,14 +489,14 @@ BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 					case IDC_VIEWPORT_DISPLAY_CHECK:
 						TheMtl->Set_Viewport_Display_Status(GetCheckBox(hwndDlg,IDC_VIEWPORT_DISPLAY_CHECK));
 						TheMtl->NotifyChanged();
-						UpdateMtlDisplay();				
+						UpdateMtlDisplay();
 						break;
 				}
 			}
 			break;
 
 		case CC_COLOR_CHANGE:
-			{			
+			{
 				// just update all of the colors
 				TheMtl->Diffuse = DiffuseSwatch->GetColor();
 				TheMtl->Specular = SpecularSwatch->GetColor();
@@ -506,8 +506,8 @@ BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 				TheMtl->EmissiveCoeff = EmissiveCoeffSwatch->GetColor();
 
 				TheMtl->NotifyChanged();
-				UpdateMtlDisplay();				
-			}			
+				UpdateMtlDisplay();
+			}
 			break;
 
 		case WM_LBUTTONDOWN:
@@ -518,13 +518,13 @@ BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 			}
 			return FALSE;
 
-		case CC_SPINNER_CHANGE:    
+		case CC_SPINNER_CHANGE:
 			{
 				TheMtl->DCTFrames = DCTFramesSpin->GetIVal();
 				TheMtl->DITFrames = DITFramesSpin->GetIVal();
 				TheMtl->SCTFrames = SCTFramesSpin->GetIVal();
 				TheMtl->SITFrames = SITFramesSpin->GetIVal();
-				
+
 				TheMtl->DCTFrameRate = DCTRateSpin->GetFVal();
 				TheMtl->DITFrameRate = DITRateSpin->GetFVal();
 				TheMtl->SCTFrameRate = SCTRateSpin->GetFVal();
@@ -536,11 +536,11 @@ BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 				TheMtl->FogCoeff = FogSpin->GetFVal();
 
 				TheMtl->NotifyChanged();
-				UpdateMtlDisplay();				
+				UpdateMtlDisplay();
 			}
 			break;
 
-		case CC_SPINNER_BUTTONUP: 
+		case CC_SPINNER_BUTTONUP:
 			{
 				#if 0
 				UpdateMtlDisplay();
@@ -548,7 +548,7 @@ BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 			}
 			break;
 
-		case WM_PAINT: 
+		case WM_PAINT:
 			{
 				if (!Valid) {
 					Valid = TRUE;
@@ -558,15 +558,15 @@ BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 			return FALSE;
 
 		case WM_CLOSE:
-			break;       
+			break;
 
-		case WM_DESTROY: 
+		case WM_DESTROY:
 
 			TheMtl->DCTFrames = DCTFramesSpin->GetIVal();
 			TheMtl->DITFrames = DITFramesSpin->GetIVal();
 			TheMtl->SCTFrames = SCTFramesSpin->GetIVal();
 			TheMtl->SITFrames = SITFramesSpin->GetIVal();
-	
+
 			TheMtl->DCTFrameRate = DCTRateSpin->GetFVal();
 			TheMtl->DITFrameRate = DITRateSpin->GetFVal();
 			TheMtl->SCTFrameRate = SCTRateSpin->GetFVal();
@@ -589,7 +589,7 @@ BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 			ReleaseISpinner(TranslucencySpin);
 			ReleaseISpinner(ShininessSpin);
 			ReleaseISpinner(FogSpin);
-	
+
 			DCTFramesSpin = DITFramesSpin = SCTFramesSpin = SITFramesSpin = NULL;
 			DCTRateSpin = DITRateSpin = SCTRateSpin = SITRateSpin = NULL;
 			OpacitySpin = TranslucencySpin = ShininessSpin = FogSpin = NULL;
@@ -602,19 +602,19 @@ BOOL GameMtlDlg::PanelProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 }
 
 
-/*********************************************************************************************** 
- * PanelDlgProc -- Windows Proc which thunks into GameMtlDlg::PanelProc                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * PanelDlgProc -- Windows Proc which thunks into GameMtlDlg::PanelProc                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-static BOOL CALLBACK PanelDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) 
+static BOOL CALLBACK PanelDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	GameMtlDlg *theDlg;
 
@@ -624,7 +624,7 @@ static BOOL CALLBACK PanelDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		SetWindowLong(hwndDlg, GWL_USERDATA,lParam);
 	} else {
 		if ((theDlg = (GameMtlDlg *)GetWindowLong(hwndDlg, GWL_USERDATA) ) == NULL) {
-			return FALSE; 
+			return FALSE;
 		}
 	}
 
@@ -635,19 +635,19 @@ static BOOL CALLBACK PanelDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 	return res;
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::NotesProc -- Dialog Proc for the Notes panel                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::NotesProc -- Dialog Proc for the Notes panel                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-BOOL GameMtlDlg::NotesProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) 
+BOOL GameMtlDlg::NotesProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	int id = LOWORD(wParam);
 	int code = HIWORD(wParam);
@@ -661,31 +661,31 @@ BOOL GameMtlDlg::NotesProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			IParams->RollupMouseMessage(hwndDlg,msg,wParam,lParam);
 			return FALSE;
 		}
-  	
-		case WM_COMMAND: 
+
+		case WM_COMMAND:
 		{
 			int i = lParam;
 		}
 		break;
-	
+
 	}
 	return FALSE;
 }
 
 
-/*********************************************************************************************** 
- * NotesDlgProc -- Dialog Proc which thunks to GameMtlDlg::NotesProc                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * NotesDlgProc -- Dialog Proc which thunks to GameMtlDlg::NotesProc                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-static BOOL CALLBACK NotesDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) 
+static BOOL CALLBACK NotesDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	GameMtlDlg *theDlg;
 
@@ -695,7 +695,7 @@ static BOOL CALLBACK NotesDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		SetWindowLong(hwndDlg, GWL_USERDATA,lParam);
 	} else {
 		if ((theDlg = (GameMtlDlg *)GetWindowLong(hwndDlg, GWL_USERDATA) ) == NULL) {
-			return FALSE; 
+			return FALSE;
 		}
 	}
 
@@ -719,7 +719,7 @@ static BOOL CALLBACK NotesDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
  * HISTORY:                                                                                    *
  *   3/30/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-BOOL GameMtlDlg::HintsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) 
+BOOL GameMtlDlg::HintsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	int id = LOWORD(wParam);
 	int code = HIWORD(wParam);
@@ -735,24 +735,24 @@ BOOL GameMtlDlg::HintsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			return FALSE;
 		}
 
-		case WM_COMMAND: 
+		case WM_COMMAND:
 		{
-			switch(id) 
+			switch(id)
 			{
 			case IDC_DIT_OVER_DCT_CHECK:
-				TheMtl->SetAttribute(GAMEMTL_DIT_OVER_DCT, GetCheckBox(hwndDlg, IDC_DIT_OVER_DCT_CHECK));			
+				TheMtl->SetAttribute(GAMEMTL_DIT_OVER_DCT, GetCheckBox(hwndDlg, IDC_DIT_OVER_DCT_CHECK));
 				break;
 
 			case IDC_SIT_OVER_SCT_CHECK:
-				TheMtl->SetAttribute(GAMEMTL_SIT_OVER_SCT, GetCheckBox(hwndDlg, IDC_SIT_OVER_SCT_CHECK));			
+				TheMtl->SetAttribute(GAMEMTL_SIT_OVER_SCT, GetCheckBox(hwndDlg, IDC_SIT_OVER_SCT_CHECK));
 				break;
-			
+
 			case IDC_DIT_OVER_DIG_CHECK:
-				TheMtl->SetAttribute(GAMEMTL_DIT_OVER_DIG, GetCheckBox(hwndDlg, IDC_DIT_OVER_DIG_CHECK));			
+				TheMtl->SetAttribute(GAMEMTL_DIT_OVER_DIG, GetCheckBox(hwndDlg, IDC_DIT_OVER_DIG_CHECK));
 				break;
-			
+
 			case IDC_SIT_OVER_SIG_CHECK:
-				TheMtl->SetAttribute(GAMEMTL_SIT_OVER_SIG, GetCheckBox(hwndDlg, IDC_SIT_OVER_SIG_CHECK));		
+				TheMtl->SetAttribute(GAMEMTL_SIT_OVER_SIG, GetCheckBox(hwndDlg, IDC_SIT_OVER_SIG_CHECK));
 				break;
 
 			case IDC_FAST_SPECULAR_AFTER_ALPHA_CHECK:
@@ -778,7 +778,7 @@ BOOL GameMtlDlg::HintsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
  * HISTORY:                                                                                    *
  *   3/30/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-static BOOL CALLBACK HintsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) 
+static BOOL CALLBACK HintsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	GameMtlDlg *theDlg;
 
@@ -788,7 +788,7 @@ static BOOL CALLBACK HintsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		SetWindowLong(hwndDlg, GWL_USERDATA,lParam);
 	} else {
 		if ((theDlg = (GameMtlDlg *)GetWindowLong(hwndDlg, GWL_USERDATA) ) == NULL) {
-			return FALSE; 
+			return FALSE;
 		}
 	}
 
@@ -812,7 +812,7 @@ static BOOL CALLBACK HintsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
  * HISTORY:                                                                                    *
  *   3/31/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-BOOL GameMtlDlg::PsxProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) 
+BOOL GameMtlDlg::PsxProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	int id = LOWORD(wParam);
 	int code = HIWORD(wParam);
@@ -827,9 +827,9 @@ BOOL GameMtlDlg::PsxProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			return FALSE;
 		}
 
-		case WM_COMMAND: 
+		case WM_COMMAND:
 		{
-			switch(id) 
+			switch(id)
 			{
 			case IDC_NO_TRANS:
 				TheMtl->SetMaskedAttribute(GAMEMTL_PSX_TRANS_MASK,0);
@@ -838,11 +838,11 @@ BOOL GameMtlDlg::PsxProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			case IDC_100_TRANS:
 				TheMtl->SetMaskedAttribute(GAMEMTL_PSX_TRANS_MASK,GAMEMTL_PSX_100_TRANS);
 				break;
-			
+
 			case IDC_50_TRANS:
 				TheMtl->SetMaskedAttribute(GAMEMTL_PSX_TRANS_MASK,GAMEMTL_PSX_50_TRANS);
 				break;
-			
+
 			case IDC_25_TRANS:
 				TheMtl->SetMaskedAttribute(GAMEMTL_PSX_TRANS_MASK,GAMEMTL_PSX_25_TRANS);
 				break;
@@ -850,7 +850,7 @@ BOOL GameMtlDlg::PsxProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			case IDC_MINUS_100_TRANS:
 				TheMtl->SetMaskedAttribute(GAMEMTL_PSX_TRANS_MASK,GAMEMTL_PSX_MINUS_100_TRANS);
 				break;
-			
+
 			case IDC_NO_RT_LIGHTING:
 				TheMtl->SetAttribute(GAMEMTL_PSX_NO_RT_LIGHTING, GetCheckBox(hwndDlg, IDC_NO_RT_LIGHTING));
 				break;
@@ -874,7 +874,7 @@ BOOL GameMtlDlg::PsxProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
  * HISTORY:                                                                                    *
  *   3/31/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-static BOOL CALLBACK PsxDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) 
+static BOOL CALLBACK PsxDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	GameMtlDlg *theDlg;
 
@@ -884,7 +884,7 @@ static BOOL CALLBACK PsxDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		SetWindowLong(hwndDlg, GWL_USERDATA,lParam);
 	} else {
 		if ((theDlg = (GameMtlDlg *)GetWindowLong(hwndDlg, GWL_USERDATA) ) == NULL) {
-			return FALSE; 
+			return FALSE;
 		}
 	}
 
@@ -896,29 +896,29 @@ static BOOL CALLBACK PsxDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 }
 
 
-/*********************************************************************************************** 
- * GameMtlDlg::LoadDialog -- Sets the state of all of the dialog's controls                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::LoadDialog -- Sets the state of all of the dialog's controls                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-void  GameMtlDlg::LoadDialog(BOOL draw) 
+void  GameMtlDlg::LoadDialog(BOOL draw)
 {
 
 	/*
 	** Set the state of the entire panel based on the current material.
 	*/
 	if (TheMtl && HwndPanel) {
-	
+
 		/*
 		** Init all of the color swatches
-		*/		
+		*/
 		if (DiffuseSwatch) {
 			DiffuseSwatch->InitColor(TheMtl->GetDiffuse());
 		}
@@ -949,7 +949,7 @@ void  GameMtlDlg::LoadDialog(BOOL draw)
 		** Texture maps enable checks.
 		*/
 		SetCheckBox(HwndPanel,IDC_MAPON_DCT, TheMtl->SubTexmapOn(ID_DI));
-		SetCheckBox(HwndPanel,IDC_MAPON_DIT, TheMtl->SubTexmapOn(ID_SI)); 
+		SetCheckBox(HwndPanel,IDC_MAPON_DIT, TheMtl->SubTexmapOn(ID_SI));
 		SetCheckBox(HwndPanel,IDC_MAPON_SCT, TheMtl->SubTexmapOn(ID_SP));
 		SetCheckBox(HwndPanel,IDC_MAPON_SIT, TheMtl->SubTexmapOn(ID_RL));
 
@@ -986,7 +986,7 @@ void  GameMtlDlg::LoadDialog(BOOL draw)
 		** Init the Psx flags state
 		*/
 		SetCheckBox(HwndPsx,IDC_NO_RT_LIGHTING, TheMtl->GetAttribute(GAMEMTL_PSX_NO_RT_LIGHTING));
-		
+
 		SetCheckBox(HwndPsx,IDC_NO_TRANS, false);
 		SetCheckBox(HwndPsx,IDC_100_TRANS, false);
 		SetCheckBox(HwndPsx,IDC_50_TRANS, false);
@@ -1030,35 +1030,35 @@ void  GameMtlDlg::LoadDialog(BOOL draw)
 	}
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::UpdateMtlDisplay -- Informs MAX that the material parameters have changed       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::UpdateMtlDisplay -- Informs MAX that the material parameters have changed       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-void GameMtlDlg::UpdateMtlDisplay() 
+void GameMtlDlg::UpdateMtlDisplay()
 {
 	IParams->MtlChanged();
 }
 
 
-/*********************************************************************************************** 
- * GameMtlDlg::ActivateDlg -- Activates and deactivates the dialog                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::ActivateDlg -- Activates and deactivates the dialog                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void GameMtlDlg::ActivateDlg(BOOL onOff)
 {
@@ -1082,19 +1082,19 @@ void GameMtlDlg::ActivateDlg(BOOL onOff)
 	}
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::SetThing -- Sets the material to be edited                                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::SetThing -- Sets the material to be edited                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-void GameMtlDlg::SetThing(ReferenceTarget *m) 
+void GameMtlDlg::SetThing(ReferenceTarget *m)
 {
 	assert (m->SuperClassID()==MATERIAL_CLASS_ID);
 	assert (m->ClassID()==GameMaterialClassID);
@@ -1104,7 +1104,7 @@ void GameMtlDlg::SetThing(ReferenceTarget *m)
 	}
 
 	TheMtl = (GameMtl *)m;
-	
+
 	if (TheMtl)	{
 		TheMtl->ParamPanel = this;
 	}
@@ -1131,38 +1131,38 @@ void GameMtlDlg::SetThing(ReferenceTarget *m)
 	}
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::BuildDialog -- Adds the dialog to the material editor                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::BuildDialog -- Adds the dialog to the material editor                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-void GameMtlDlg::BuildDialog() 
+void GameMtlDlg::BuildDialog()
 {
-	if ((TheMtl->Flags&(GAMEMTL_ROLLUP_FLAGS))==0) { 
+	if ((TheMtl->Flags&(GAMEMTL_ROLLUP_FLAGS))==0) {
 		TheMtl->SetFlag(GAMEMTL_ROLLUP1_OPEN,TRUE);
 	}
 
-	HwndPanel = IParams->AddRollupPage( 
-		AppInstance,	 
+	HwndPanel = IParams->AddRollupPage(
+		AppInstance,
 		MAKEINTRESOURCE(IDD_GAMEMTL_PANEL),
-		PanelDlgProc, 
-		Get_String(IDS_PARAMETERS), 
+		PanelDlgProc,
+		Get_String(IDS_PARAMETERS),
 		(LPARAM)this,
 		(TheMtl->GetFlag(GAMEMTL_ROLLUP1_OPEN) ? 0:APPENDROLL_CLOSED)
-	);		
+	);
 
 	HwndPsx = IParams->AddRollupPage(
 		AppInstance,
 		MAKEINTRESOURCE(IDD_GAMEMTL_PSX_PANEL),
-		PsxDlgProc, 
-		Get_String(IDS_PSX_OPTIONS), 
+		PsxDlgProc,
+		Get_String(IDS_PSX_OPTIONS),
 		(LPARAM)this,
 		(TheMtl->GetFlag(GAMEMTL_ROLLUP2_OPEN) ? 0:APPENDROLL_CLOSED)
 	);
@@ -1170,8 +1170,8 @@ void GameMtlDlg::BuildDialog()
 	HwndHints = IParams->AddRollupPage(
 		AppInstance,
 		MAKEINTRESOURCE(IDD_GAMEMTL_HINTS_PANEL),
-		HintsDlgProc, 
-		Get_String(IDS_MATERIAL_HINTS), 
+		HintsDlgProc,
+		Get_String(IDS_MATERIAL_HINTS),
 		(LPARAM)this,
 		(TheMtl->GetFlag(GAMEMTL_ROLLUP3_OPEN) ? 0:APPENDROLL_CLOSED)
 	);
@@ -1179,8 +1179,8 @@ void GameMtlDlg::BuildDialog()
 	HwndNotes = IParams->AddRollupPage(
 		AppInstance,
 		MAKEINTRESOURCE(IDD_MATERIAL_NOTES_PANEL),
-		NotesDlgProc, 
-		Get_String(IDS_NOTES), 
+		NotesDlgProc,
+		Get_String(IDS_NOTES),
 		(LPARAM)this,
 		(TheMtl->GetFlag(GAMEMTL_ROLLUP4_OPEN) ? 0:APPENDROLL_CLOSED)
 	);
@@ -1188,19 +1188,19 @@ void GameMtlDlg::BuildDialog()
 	IParams->SetRollupScrollPos(TheMtl->RollScroll);
 }
 
-/*********************************************************************************************** 
- * GameMtlDlg::UpdateTexmapDisplay -- Updates the texture map buttons                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * GameMtlDlg::UpdateTexmapDisplay -- Updates the texture map buttons                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-void GameMtlDlg::UpdateTexmapDisplay(int i) 
+void GameMtlDlg::UpdateTexmapDisplay(int i)
 {
 	TSTR nm = Get_String(IDS_NONE);
 	Texmap *texmap = (*TheMtl->Maps)[i].Map;
diff --git a/Core/Tools/WW3D/max2w3d/gridsnapmodifier.cpp b/Core/Tools/WW3D/max2w3d/gridsnapmodifier.cpp
index 020ba76883a..f9aaf8773c3 100644
--- a/Core/Tools/WW3D/max2w3d/gridsnapmodifier.cpp
+++ b/Core/Tools/WW3D/max2w3d/gridsnapmodifier.cpp
@@ -64,20 +64,20 @@
 
 /**
 ** GridSnapModifierClass
-** This modifier will snap all vertices in the geometry being modified to a grid.  Its motivation is to 
+** This modifier will snap all vertices in the geometry being modified to a grid.  Its motivation is to
 ** try to help solve the problem of cracks between adjacent meshes in Renegade levels.  This will work
 ** a lot better if the objects have reset-transforms prior to being processed by this modifier.
 */
-class GridSnapModifierClass : public SimpleMod2 
-{	
+class GridSnapModifierClass : public SimpleMod2
+{
 public:
 
 	GridSnapModifierClass();
 
 	// From Animatable
 	void DeleteThis()																			{ delete this; }
-	void GetClassName(TSTR& s)																{ s = Get_String(IDS_GRIDSNAPMODIFIER); }  
-	virtual Class_ID ClassID()																{ return GRIDSNAPMOD_CLASSID; }		
+	void GetClassName(TSTR& s)																{ s = Get_String(IDS_GRIDSNAPMODIFIER); }
+	virtual Class_ID ClassID()																{ return GRIDSNAPMOD_CLASSID; }
 	void BeginEditParams( IObjParam  *ip, ULONG flags,Animatable *prev);
 	void EndEditParams( IObjParam *ip,ULONG flags,Animatable *next);
 	RefTargetHandle Clone(RemapDir& remap = NoRemap());
@@ -85,12 +85,12 @@ class GridSnapModifierClass : public SimpleMod2
 	IOResult Load(ILoad *iload);
 
 	// Direct paramblock access
-	int	NumParamBlocks()																	{ return 1; }	
+	int	NumParamBlocks()																	{ return 1; }
 	IParamBlock2* GetParamBlock(int i)													{ return pblock2; }
 	IParamBlock2* GetParamBlockByID(BlockID id)										{ return (pblock2->ID() == id) ? pblock2 : NULL; }
 
 	// From simple mod
-	Deformer& GetDeformer(TimeValue t,ModContext &mc,Matrix3& mat,Matrix3& invmat);		
+	Deformer& GetDeformer(TimeValue t,ModContext &mc,Matrix3& mat,Matrix3& invmat);
 	Interval GetValidity(TimeValue t);
 
 	//RefTargetHandle GetReference(int i)
@@ -108,10 +108,10 @@ class GridSnapDeformerClass : public Deformer
 {
 public:
 	GridSnapDeformerClass(void) : GridDimension(0.001f) {}
-		
+
 	void		Set_Grid_Dimension(float grid_dim)		{ GridDimension = grid_dim; }
 	float		Get_Grid_Dimension(void)					{ return GridDimension; }
-	
+
 	void		Set_Matrices(const Matrix3 & tm,const Matrix3 & invtm)	{ Transform = tm; InvTransform = invtm; }
 
 	virtual Point3 Map(int i,Point3 p)
@@ -132,12 +132,12 @@ class GridSnapDeformerClass : public Deformer
 };
 
 
-/** 
+/**
 ** GridSnapModifier Class Descriptor
 ** This object "links" the plugin into Max's plugin system.  It links the Class-ID to a virtual construction
 ** method.  The function Get_Grid_Snap_Modifier_Desc is the only hook to external code.
 */
-class GridSnapModifierClassDesc:public ClassDesc2 
+class GridSnapModifierClassDesc:public ClassDesc2
 {
 public:
 	int 				IsPublic()											{ return 1; }
@@ -152,33 +152,33 @@ class GridSnapModifierClassDesc:public ClassDesc2
 
 static GridSnapModifierClassDesc _GridSnapModifierDesc;
 
-ClassDesc* Get_Grid_Snap_Modifier_Desc(void) 
-{	
-	return &_GridSnapModifierDesc; 
+ClassDesc* Get_Grid_Snap_Modifier_Desc(void)
+{
+	return &_GridSnapModifierDesc;
 }
 
 
 /*
 ** ParamBlock2 Setup
 */
-enum 
+enum
 {
 	GSM_PARAMS = 0,
 };
 
-enum 
+enum
 {
-	GSM_PARAM_GRIDDIMENSION = 0,	
+	GSM_PARAM_GRIDDIMENSION = 0,
 };
 
 static ParamBlockDesc2 _GridSnapParamBlockDesc
 (
 	// parameter block settings
 	GSM_PARAMS,_T("GridSnap Parameters"), 0, &_GridSnapModifierDesc, P_AUTO_CONSTRUCT + P_AUTO_UI, SIMPMOD_PBLOCKREF,
-	
+
 	// dialog box
 	IDD_GRIDSNAP_PARAMS, IDS_GRIDSNAP_TITLE, 0, 0, NULL,
-	
+
 	// parameters
 	GSM_PARAM_GRIDDIMENSION, _T("Grid Dimension"), TYPE_FLOAT, P_RESET_DEFAULT, IDS_GRID_DIMENSION,
 		p_default,		0.001f,
@@ -221,7 +221,7 @@ void GridSnapModifierClass::EndEditParams( IObjParam *ip,ULONG flags,Animatable
 
 RefTargetHandle GridSnapModifierClass::Clone(RemapDir& remap)
 {
-	GridSnapModifierClass * newmod = new GridSnapModifierClass();	
+	GridSnapModifierClass * newmod = new GridSnapModifierClass();
 	newmod->ReplaceReference(SIMPMOD_PBLOCKREF,pblock2->Clone(remap));
 	newmod->SimpleModClone(this);
 	return(newmod);
@@ -246,7 +246,7 @@ Deformer& GridSnapModifierClass::GetDeformer(TimeValue t,ModContext &mc,Matrix3&
 
 Interval GridSnapModifierClass::GetValidity(TimeValue t)
 {
-	float f;	
+	float f;
 	Interval valid = FOREVER;
 	pblock2->GetValue(GSM_PARAM_GRIDDIMENSION, t, f, valid);
 	return valid;
@@ -276,7 +276,7 @@ Animatable * SimpleMod2::SubAnim(int i)
 	switch (i) {
 		case 0: return posControl;
 		case 1: return tmControl;
-		case 2: return pblock2;		
+		case 2: return pblock2;
 		default: return NULL;
 	}
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h b/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h
index 5f430463017..b921e787df8 100644
--- a/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h
+++ b/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h
@@ -36,12 +36,8 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef GRIDSNAPMODIFIER_H
-#define GRIDSNAPMODIFIER_H
+#pragma once
 
 class ClassDesc;
 
 ClassDesc * Get_Grid_Snap_Modifier_Desc(void);
-
-
-#endif //GRIDSNAPMODIFIER_H
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/hiersave.cpp b/Core/Tools/WW3D/max2w3d/hiersave.cpp
index 4d07c1e1316..70066e54d31 100644
--- a/Core/Tools/WW3D/max2w3d/hiersave.cpp
+++ b/Core/Tools/WW3D/max2w3d/hiersave.cpp
@@ -17,52 +17,52 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/hiersave.cpp 56    10/30/00 6:58p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Engine                                       * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/hiersave.cpp                   $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/30/00 6:14p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 56                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   HierarchySaveClass::HierarchySaveClass -- constructor                                     * 
- *   HierarchySaveClass::HierarchySaveClass -- constructor                                     * 
- *   HierarchySaveClass::HierarchySaveClass -- constructor                                     * 
- *   HierarchySaveClass::~HierarchySaveClass -- destructor                                     * 
- *   HierarchySaveClass::Free -- releases all allocated memory                                 * 
- *   HierarchySaveClass::Get_Node_Transform -- returns the transformation matrix of specified n* 
- *   HierarchySaveClass::get_relative_transform -- retruns tm between this node and its parent * 
- *   HierarchySaveClass::Get_Name -- returns the name of this hierarchy                        * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Engine                                       *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/hiersave.cpp                   $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/30/00 6:14p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 56                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   HierarchySaveClass::HierarchySaveClass -- constructor                                     *
+ *   HierarchySaveClass::HierarchySaveClass -- constructor                                     *
+ *   HierarchySaveClass::HierarchySaveClass -- constructor                                     *
+ *   HierarchySaveClass::~HierarchySaveClass -- destructor                                     *
+ *   HierarchySaveClass::Free -- releases all allocated memory                                 *
+ *   HierarchySaveClass::Get_Node_Transform -- returns the transformation matrix of specified n*
+ *   HierarchySaveClass::get_relative_transform -- retruns tm between this node and its parent *
+ *   HierarchySaveClass::Get_Name -- returns the name of this hierarchy                        *
  *   HierarchySaveClass::Get_Node -- Get the Max INode                                         *
- *   HierarchySaveClass::Get_Node_Name -- returns name of this hierarchy node                  * 
- *   HierarchySaveClass::Find_Named_Node -- returns index of a named node                      * 
+ *   HierarchySaveClass::Get_Node_Name -- returns name of this hierarchy node                  *
+ *   HierarchySaveClass::Find_Named_Node -- returns index of a named node                      *
  *   HierarchySaveClass::Get_Export_Coordinate_System - find the bone and coordinate system    *
- *   HierarchySaveClass::Save -- write the hierarchy into a W3D file                           * 
- *   HierarchySaveClass::Load -- read the hierarchy from a W3D file                            * 
- *   HierarchySaveClass::add_tree -- adds a node and all of its children                       * 
- *   HierarchySaveClass::add_node -- adds a single node to the tree                            * 
- *   HierarchySaveClass::Get_Fixup_Transform -- gets the "fixup" transform for a node          * 
- *   HierarchySaveClass::fixup_matrix -- conditions a matrix                                   * 
- *   HierarchySaveClass::save_header -- writes the header into a W3D file                      * 
- *   HierarchySaveClass::save_pivots -- writes the pivots into a W3D file                      * 
- *   HierarchySaveClass::save_fixups -- writes the fixup transforms into a W3D file            * 
- *   HierarchySaveClass::load_header -- reads the header from a W3D file                       * 
- *   HierarchySaveClass::load_pivots -- reads the pivots from a W3D file                       * 
- *   HierarchySaveClass::load_fixups -- reads the fixup transforms from a W3D file             * 
+ *   HierarchySaveClass::Save -- write the hierarchy into a W3D file                           *
+ *   HierarchySaveClass::Load -- read the hierarchy from a W3D file                            *
+ *   HierarchySaveClass::add_tree -- adds a node and all of its children                       *
+ *   HierarchySaveClass::add_node -- adds a single node to the tree                            *
+ *   HierarchySaveClass::Get_Fixup_Transform -- gets the "fixup" transform for a node          *
+ *   HierarchySaveClass::fixup_matrix -- conditions a matrix                                   *
+ *   HierarchySaveClass::save_header -- writes the header into a W3D file                      *
+ *   HierarchySaveClass::save_pivots -- writes the pivots into a W3D file                      *
+ *   HierarchySaveClass::save_fixups -- writes the fixup transforms into a W3D file            *
+ *   HierarchySaveClass::load_header -- reads the header from a W3D file                       *
+ *   HierarchySaveClass::load_pivots -- reads the pivots from a W3D file                       *
+ *   HierarchySaveClass::load_fixups -- reads the fixup transforms from a W3D file             *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "hiersave.h"
 #include "w3d_file.h"
 #include "nodefilt.h"
-#include "EULER.H"
+#include "EULER.h"
 #include "util.h"
 #include "w3dappdata.h"
 #include "errclass.h"
@@ -72,23 +72,23 @@
 bool HierarchySaveClass::TerrainModeEnabled = false;
 
 
-/*********************************************************************************************** 
- * HierarchySaveClass::HierarchySaveClass -- constructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * root - root INode to construct the HTree from                                               * 
- * time - current time in Max, transforms at this time will be used                            * 
- * treemeter - progress meter                                                                  * 
- * hname - name for the hierarchy tree                                                         * 
- * fixup_type - can be used to force all transforms to be translation only                     * 
- * fixuptree - htree loaded from a previous export                                             * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::HierarchySaveClass -- constructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * root - root INode to construct the HTree from                                               *
+ * time - current time in Max, transforms at this time will be used                            *
+ * treemeter - progress meter                                                                  *
+ * hname - name for the hierarchy tree                                                         *
+ * fixup_type - can be used to force all transforms to be translation only                     *
+ * fixuptree - htree loaded from a previous export                                             *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HierarchySaveClass::HierarchySaveClass
 (
@@ -98,7 +98,7 @@ HierarchySaveClass::HierarchySaveClass
 	char * hname,
 	int fixuptype,
 	HierarchySaveClass * fixuptree
-) : 
+) :
 	Node(DEFAULT_NODE_ARRAY_SIZE),
 	CurNode(0),
 	FixupType(fixuptype),
@@ -108,11 +108,11 @@ HierarchySaveClass::HierarchySaveClass
 	CurTime = time;
 
 	/*
-	** This code-path is activated when the user has created a custom origin.  In this case, we 
+	** This code-path is activated when the user has created a custom origin.  In this case, we
 	** need to compute the transform which will make all bones relative to this origin.
 	*/
 	OriginOffsetTransform = Inverse(root->GetNodeTM(CurTime));
-	
+
 	/*
 	** Build our tree from the given tree of nodes
 	*/
@@ -128,25 +128,25 @@ HierarchySaveClass::HierarchySaveClass
 	HierarchyHeader.Center.Z = 0.0f;
 }
 
-/*********************************************************************************************** 
- * HierarchySaveClass::HierarchySaveClass -- constructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * rootlist - list of root nodes to add to the htree                                           * 
- * time - current time in Max, transforms at this time will be used                            * 
- * treemeter - progress meter                                                                  * 
- * hname - name for the hierarchy tree                                                         * 
- * fixup_type - can be used to force all transforms to be translation only                     * 
- * fixuptree - htree loaded from a previous export                                             * 
- * origin_offset - origin offset transform                                                     * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::HierarchySaveClass -- constructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * rootlist - list of root nodes to add to the htree                                           *
+ * time - current time in Max, transforms at this time will be used                            *
+ * treemeter - progress meter                                                                  *
+ * hname - name for the hierarchy tree                                                         *
+ * fixup_type - can be used to force all transforms to be translation only                     *
+ * fixuptree - htree loaded from a previous export                                             *
+ * origin_offset - origin offset transform                                                     *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HierarchySaveClass::HierarchySaveClass
 (
@@ -157,7 +157,7 @@ HierarchySaveClass::HierarchySaveClass
 	int fixuptype,
 	HierarchySaveClass * fixuptree,
 	const Matrix3 & origin_offset
-) : 
+) :
 	Node(DEFAULT_NODE_ARRAY_SIZE),
 	CurNode(0),
 	FixupType(fixuptype),
@@ -186,17 +186,17 @@ HierarchySaveClass::HierarchySaveClass
 
 }
 
-/*********************************************************************************************** 
- * HierarchySaveClass::HierarchySaveClass -- constructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::HierarchySaveClass -- constructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HierarchySaveClass::HierarchySaveClass():
 	Node(NULL),
@@ -205,34 +205,34 @@ HierarchySaveClass::HierarchySaveClass():
 {
 }
 
-/*********************************************************************************************** 
- * HierarchySaveClass::~HierarchySaveClass -- destructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::~HierarchySaveClass -- destructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HierarchySaveClass::~HierarchySaveClass(void)
 {
 	Free();
 }
 
-/*********************************************************************************************** 
- * HierarchySaveClass::Free -- releases all allocated memory                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::Free -- releases all allocated memory                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HierarchySaveClass::Free(void)
 {
@@ -240,17 +240,17 @@ void HierarchySaveClass::Free(void)
 }
 
 
-/*********************************************************************************************** 
- * HierarchySaveClass::Get_Node_Transform -- returns the transformation matrix of specified no * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::Get_Node_Transform -- returns the transformation matrix of specified no *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Matrix3 HierarchySaveClass::Get_Node_Transform(int nodeidx) const
 {
@@ -267,17 +267,17 @@ Matrix3 HierarchySaveClass::Get_Node_Transform(int nodeidx) const
 }
 
 
-/*********************************************************************************************** 
- * HierarchySaveClass::get_relative_transform -- retruns tm between this node and its parent   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::get_relative_transform -- retruns tm between this node and its parent   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Matrix3 HierarchySaveClass::get_relative_transform(int nodeidx) const
 {
@@ -309,17 +309,17 @@ Matrix3 HierarchySaveClass::get_relative_transform(int nodeidx) const
 }
 
 
-/*********************************************************************************************** 
- * HierarchySaveClass::Get_Name -- returns the name of this hierarchy                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::Get_Name -- returns the name of this hierarchy                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 const char * HierarchySaveClass::Get_Name(void) const
 {
@@ -344,20 +344,20 @@ INode * HierarchySaveClass::Get_Node(int node) const
 	assert(node >= 0);
 	assert(node < CurNode);
 
-	return Node[node].MaxNode;	
+	return Node[node].MaxNode;
 }
 
-/*********************************************************************************************** 
- * HierarchySaveClass::Get_Node_Name -- returns name of this hierarchy node                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::Get_Node_Name -- returns name of this hierarchy node                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 const char * HierarchySaveClass::Get_Node_Name(int node) const
 {
@@ -368,17 +368,17 @@ const char * HierarchySaveClass::Get_Node_Name(int node) const
 }
 
 
-/*********************************************************************************************** 
- * HierarchySaveClass::Find_Named_Node -- returns index of a named node                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::Find_Named_Node -- returns index of a named node                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HierarchySaveClass::Find_Named_Node(const char * name) const
 {
@@ -467,7 +467,7 @@ void HierarchySaveClass::Get_Export_Coordinate_System
 #endif
 		}
 	}
-	
+
 	if (set_bone_index != NULL) {
 		*set_bone_index = boneidx;
 	}
@@ -479,17 +479,17 @@ void HierarchySaveClass::Get_Export_Coordinate_System
 	}
 }
 
-/*********************************************************************************************** 
- * HierarchySaveClass::Save -- write the hierarchy into a W3D file                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::Save -- write the hierarchy into a W3D file                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool HierarchySaveClass::Save(ChunkSaveClass & csave)
 {
@@ -519,22 +519,22 @@ bool HierarchySaveClass::Save(ChunkSaveClass & csave)
 	if (!csave.End_Chunk()) {
 		return false;
 	}
-	
+
 	return true;
 }
 
 
-/*********************************************************************************************** 
- * HierarchySaveClass::Load -- read the hierarchy from a W3D file                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::Load -- read the hierarchy from a W3D file                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool HierarchySaveClass::Load(ChunkLoadClass & cload)
 {
@@ -547,7 +547,7 @@ bool HierarchySaveClass::Load(ChunkLoadClass & cload)
 				if (!load_header(cload)) error = true;
 				break;
 			case W3D_CHUNK_PIVOTS:
-				if (!load_pivots(cload)) error = true;				
+				if (!load_pivots(cload)) error = true;
 				break;
 			case W3D_CHUNK_PIVOT_FIXUPS:
 				if (!load_fixups(cload)) error = true;
@@ -567,17 +567,17 @@ bool HierarchySaveClass::Load(ChunkLoadClass & cload)
 }
 
 
-/*********************************************************************************************** 
- * HierarchySaveClass::add_tree -- adds a node and all of its children                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::add_tree -- adds a node and all of its children                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HierarchySaveClass::add_tree(INode * node,int pidx)
 {
@@ -586,7 +586,7 @@ void HierarchySaveClass::add_tree(INode * node,int pidx)
 	if (node->IsHidden ()) {
 
 		// if the node is hidden, do not add it but add its children to the current parent.
-		nextparent = pidx;			
+		nextparent = pidx;
 
 	} else if (TerrainModeEnabled && (Is_Normal_Mesh(node) || Is_Null_Object(node))) {
 
@@ -594,15 +594,15 @@ void HierarchySaveClass::add_tree(INode * node,int pidx)
 		nextparent = pidx;
 
 	} else if (!Is_Bone(node)) {
-	
+
 		// This node isn't a bone, don't add it
 		nextparent = pidx;
-	
+
 	} else {
 
-		// Add new pivot!	it will be parent of all below it.	
+		// Add new pivot!	it will be parent of all below it.
 		nextparent = add_node(node,pidx);
-	
+
 	}
 
 	// Add all of this nodes children
@@ -612,17 +612,17 @@ void HierarchySaveClass::add_tree(INode * node,int pidx)
 }
 
 
-/*********************************************************************************************** 
- * HierarchySaveClass::add_node -- adds a single node to the tree                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::add_node -- adds a single node to the tree                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HierarchySaveClass::add_node(INode * node,int pidx)
 {
@@ -643,7 +643,7 @@ int HierarchySaveClass::add_node(INode * node,int pidx)
 		Set_W3D_Name(Node[CurNode].Pivot.Name,node->GetName());
 	} else {
 		Set_W3D_Name(Node[CurNode].Pivot.Name,"RootTransform");
-	}		
+	}
 
 	/*
 	** Now, check if there is a bone with this W3D name already
@@ -675,8 +675,8 @@ int HierarchySaveClass::add_node(INode * node,int pidx)
 	** If this tree is being "fixed up" the first thing we do
 	** is to transform Max's nodeTM by the fixup transform.
 	** This is done when a base pose was created using our own
-	** types of transforms and we want to apply the same 
-	** changes to this tree.  
+	** types of transforms and we want to apply the same
+	** changes to this tree.
 	**
 	** Note that if FixupType is not "NONE", FixupTree must be NULL,
 	*/
@@ -716,7 +716,7 @@ int HierarchySaveClass::add_node(INode * node,int pidx)
 	** Break the matrix down into a rotation and translation.
 	*/
 	DecomposeMatrix(ournodeTM,trans,rot,scale);
-	
+
 	/*
 	** Save the "fixup" matrix
 	*/
@@ -753,17 +753,17 @@ int HierarchySaveClass::add_node(INode * node,int pidx)
 	return CurNode++;
 }
 
-/*********************************************************************************************** 
- * HierarchySaveClass::Get_Fixup_Transform -- gets the "fixup" transform for a node            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::Get_Fixup_Transform -- gets the "fixup" transform for a node            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Matrix3 HierarchySaveClass::Get_Fixup_Transform(int node) const
 {
@@ -771,25 +771,25 @@ Matrix3 HierarchySaveClass::Get_Fixup_Transform(int node) const
 	assert(node < CurNode);
 
 	Matrix3 m;
-	
+
 	for (int j=0;j<4;j++) {
 		m.SetRow(j,Point3(Node[node].Fixup.TM[j][0],Node[node].Fixup.TM[j][1],Node[node].Fixup.TM[j][2]));
 	}
-		
+
 	return m;
 }
 
-/*********************************************************************************************** 
- * HierarchySaveClass::fixup_matrix -- conditions a matrix                                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::fixup_matrix -- conditions a matrix                                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Matrix3 HierarchySaveClass::fixup_matrix(const Matrix3 & csrc) const
 {
@@ -821,17 +821,17 @@ Matrix3 HierarchySaveClass::fixup_matrix(const Matrix3 & csrc) const
 }
 
 
-/*********************************************************************************************** 
- * HierarchySaveClass::save_header -- writes the header into a W3D file                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::save_header -- writes the header into a W3D file                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool HierarchySaveClass::save_header(ChunkSaveClass & csave)
 {
@@ -851,17 +851,17 @@ bool HierarchySaveClass::save_header(ChunkSaveClass & csave)
 }
 
 
-/*********************************************************************************************** 
- * HierarchySaveClass::save_pivots -- writes the pivots into a W3D file                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::save_pivots -- writes the pivots into a W3D file                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool HierarchySaveClass::save_pivots(ChunkSaveClass & csave)
 {
@@ -882,17 +882,17 @@ bool HierarchySaveClass::save_pivots(ChunkSaveClass & csave)
 	return true;
 }
 
-/*********************************************************************************************** 
- * HierarchySaveClass::save_fixups -- writes the fixup transforms into a W3D file              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::save_fixups -- writes the fixup transforms into a W3D file              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool HierarchySaveClass::save_fixups(ChunkSaveClass & csave)
 {
@@ -914,17 +914,17 @@ bool HierarchySaveClass::save_fixups(ChunkSaveClass & csave)
 }
 
 
-/*********************************************************************************************** 
- * HierarchySaveClass::load_header -- reads the header from a W3D file                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::load_header -- reads the header from a W3D file                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool HierarchySaveClass::load_header(ChunkLoadClass & cload)
 {
@@ -956,22 +956,22 @@ bool HierarchySaveClass::load_header(ChunkLoadClass & cload)
 			Node[i].Fixup.TM[j][2] = row.z;
 		}
 	}
-	
+
 	return true;
 }
 
 
-/*********************************************************************************************** 
- * HierarchySaveClass::load_pivots -- reads the pivots from a W3D file                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::load_pivots -- reads the pivots from a W3D file                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool HierarchySaveClass::load_pivots(ChunkLoadClass & cload)
 {
@@ -979,29 +979,29 @@ bool HierarchySaveClass::load_pivots(ChunkLoadClass & cload)
 		Node[i].MaxNode = NULL;
 		if (cload.Read(&Node[i].Pivot,sizeof(W3dPivotStruct)) != sizeof(W3dPivotStruct)) {
 			return false;
-		}		
+		}
 	}
 	return true;
 }
 
-/*********************************************************************************************** 
- * HierarchySaveClass::load_fixups -- reads the fixup transforms from a W3D file               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HierarchySaveClass::load_fixups -- reads the fixup transforms from a W3D file               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool HierarchySaveClass::load_fixups(ChunkLoadClass & cload)
 {
 	for (uint32 i=0; i<HierarchyHeader.NumPivots; i++) {
 		if (cload.Read(&Node[i].Fixup,sizeof(W3dPivotFixupStruct)) != sizeof(W3dPivotFixupStruct)) {
 			return false;
-		}		
+		}
 	}
 	return true;
 }
diff --git a/Core/Tools/WW3D/max2w3d/hiersave.h b/Core/Tools/WW3D/max2w3d/hiersave.h
index 88fd0c88088..6771537f7c6 100644
--- a/Core/Tools/WW3D/max2w3d/hiersave.h
+++ b/Core/Tools/WW3D/max2w3d/hiersave.h
@@ -17,26 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/hiersave.h 29    10/26/00 5:59p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Engine                                       * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/hiersave.h                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/26/00 5:09p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 29                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Engine                                       *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/hiersave.h                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/26/00 5:09p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 29                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef HIERSAVE_H
-#define HIERSAVE_H
+#pragma once
 
 #include "always.h"
 
@@ -48,7 +47,7 @@
 #endif
 
 #ifndef PROGRESS_H
-#include "PROGRESS.H"
+#include "PROGRESS.h"
 #endif
 
 #ifndef CHUNKIO_H
@@ -60,7 +59,7 @@
 #endif
 
 #ifndef VECTOR_H
-#include "Vector.H"
+#include "Vector.h"
 #endif
 
 
@@ -88,7 +87,7 @@ class HierarchySaveClass
 	};
 
 	HierarchySaveClass();
-	
+
 	HierarchySaveClass(
 					INode *						root,
 					TimeValue					time,
@@ -113,7 +112,7 @@ class HierarchySaveClass
 	int				Num_Nodes(void) const { return CurNode; }
 	const char *	Get_Name(void) const;
 	const char *	Get_Node_Name(int node) const;
-	
+
 	// get ahold of the max inode
 	INode *			Get_Node(int node) const;
 
@@ -141,7 +140,7 @@ class HierarchySaveClass
 
 	enum { MAX_PIVOTS = 4096, DEFAULT_NODE_ARRAY_SIZE = 512, NODE_ARRAY_GROWTH_SIZE = 32 };
 
-	TimeValue				CurTime;									
+	TimeValue				CurTime;
 	W3dHierarchyStruct	HierarchyHeader;
 	DynamicVectorClass<HierarchyNodeStruct> Node;
 	int						CurNode;
@@ -166,5 +165,3 @@ class HierarchySaveClass
 	Matrix3	fixup_matrix(const Matrix3 & src) const;
 	void	 	Free(void);
 };
-
-#endif /*HIERSAVE_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/hlodsave.cpp b/Core/Tools/WW3D/max2w3d/hlodsave.cpp
index 9248a25c27e..4df94e3d6f2 100644
--- a/Core/Tools/WW3D/max2w3d/hlodsave.cpp
+++ b/Core/Tools/WW3D/max2w3d/hlodsave.cpp
@@ -121,9 +121,9 @@ HLodSaveClass::HLodSaveClass (MeshConnectionsClass **connections, int lod_count,
 	int i;
 	for (i = 0; i < lod_count; i++)
 	{
-	
+
 		ExportLog::printf(" Exporting LOD Array %d\n",i);
-		
+
 		INode *origin = connections[i]->Get_Origin();
 		int sub_obj_count = connections[i]->Get_Sub_Object_Count();
 		lod_array[i].Allocate_Sub_Objects(sub_obj_count);
@@ -162,7 +162,7 @@ HLodSaveClass::HLodSaveClass (MeshConnectionsClass **connections, int lod_count,
 	aggregate_array.Allocate_Sub_Objects(agg_count);
 	aggregate_array.header.ModelCount = agg_count;
 	aggregate_array.header.MaxScreenSize = 0.0f;
-	
+
 	ExportLog::printf(" Exporting Aggregates:\n");
 	ExportLog::printf(" aggregate count: %d\n",agg_count);
 
@@ -188,11 +188,11 @@ HLodSaveClass::HLodSaveClass (MeshConnectionsClass **connections, int lod_count,
 	proxy_array.Allocate_Sub_Objects(proxy_count);
 	proxy_array.header.ModelCount = proxy_count;
 	proxy_array.header.MaxScreenSize = 0.0f;
-	
+
 	ExportLog::printf(" Exporting Proxies\n");
 	ExportLog::printf(" proxy count: %d\n",proxy_count);
 	for (i=0; i<proxy_count; i++) {
-	
+
 		char	*mesh_name;
 		int	bone_index;
 		INode	*mesh_node;
@@ -260,7 +260,7 @@ bool HLodSaveClass::Save(ChunkSaveClass &csave)
 	if (!save_aggregate_array(csave))
 		return false;
 
-	if (!save_proxy_array(csave)) 
+	if (!save_proxy_array(csave))
 		return false;
 
 	if (!csave.End_Chunk())
@@ -401,7 +401,7 @@ bool HLodSaveClass::save_sub_object_array(ChunkSaveClass &csave, const HLodArray
 {
 	if (!csave.Begin_Chunk(W3D_CHUNK_HLOD_SUB_OBJECT_ARRAY_HEADER))
 		return false;
-	
+
 	if (csave.Write(&(array.header), sizeof(array.header)) != sizeof(array.header))
 		return false;
 
diff --git a/Core/Tools/WW3D/max2w3d/hlodsave.h b/Core/Tools/WW3D/max2w3d/hlodsave.h
index e24edb6df30..a0b91af6b9a 100644
--- a/Core/Tools/WW3D/max2w3d/hlodsave.h
+++ b/Core/Tools/WW3D/max2w3d/hlodsave.h
@@ -34,9 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef HLODSAVE_H
-#define HLODSAVE_H
+#pragma once
 
 #include "always.h"
 
@@ -44,7 +42,7 @@
 #include <stdio.h>
 
 #include "w3d_file.h"
-#include "PROGRESS.H"
+#include "PROGRESS.h"
 #include "chunkio.h"
 #include "meshcon.h"
 
@@ -123,7 +121,3 @@ class HLodSaveClass
 	HLodArrayEntry							aggregate_array;
 	HLodArrayEntry							proxy_array;
 };
-
-
-
-#endif
diff --git a/Core/Tools/WW3D/max2w3d/logdlg.cpp b/Core/Tools/WW3D/max2w3d/logdlg.cpp
index f3763d7ef90..aa693b8223f 100644
--- a/Core/Tools/WW3D/max2w3d/logdlg.cpp
+++ b/Core/Tools/WW3D/max2w3d/logdlg.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/logdlg.cpp 5     11/07/00 5:40p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/logdlg.cpp                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 11/07/00 4:24p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 5                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/logdlg.cpp                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 11/07/00 4:24p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 5                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "logdlg.h"
@@ -51,17 +51,17 @@ static BOOL CALLBACK		_logdata_dialog_proc(HWND Hwnd,UINT message,WPARAM wParam,
 static DWORD WINAPI		_logdata_thread_function(LPVOID log_obj_ptr);
 
 
-/*********************************************************************************************** 
- * LogDataDialogClass::LogDataDialogClass -- constructor for the options dialog object         *  
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/09/2000 JGA  : Created.                                                                * 
+/***********************************************************************************************
+ * LogDataDialogClass::LogDataDialogClass -- constructor for the options dialog object         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/09/2000 JGA  : Created.                                                                *
  *=============================================================================================*/
 LogDataDialogClass::LogDataDialogClass(HWND parent):
  Hwnd(NULL),
@@ -69,7 +69,7 @@ LogDataDialogClass::LogDataDialogClass(HWND parent):
  buffer_index(0),
  last_buffer_index(0),
  status(0)
-{	
+{
 	ThreadHandle = CreateThread(NULL, 0, _logdata_thread_function, (LPVOID)this, 0, &ThreadID);
 
 	if (ThreadHandle) {
@@ -80,7 +80,7 @@ LogDataDialogClass::LogDataDialogClass(HWND parent):
 }
 
 LogDataDialogClass::~LogDataDialogClass(void)
-{	
+{
 	status = 3;
 	if (::IsWindow(Hwnd)) {
 		SendMessage( Hwnd, WM_CLOSE, 0, 0 );
@@ -88,23 +88,23 @@ LogDataDialogClass::~LogDataDialogClass(void)
 }
 
 
-/*********************************************************************************************** 
- * LogDataDialogClass::printf -- handles doing printfs into the current log window             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/11/2000 JGA  : Created.                                                                 * 
+/***********************************************************************************************
+ * LogDataDialogClass::printf -- handles doing printfs into the current log window             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/11/2000 JGA  : Created.                                                                 *
  *=============================================================================================*/
 void LogDataDialogClass::printf(const char *text, ...)
 {
 	va_list arguments;
 	va_start(arguments, text);
-}	// printf
+}
 
 void LogDataDialogClass::printf(const char * text, va_list args)
 {
@@ -131,17 +131,17 @@ void LogDataDialogClass::printf(const char * text, va_list args)
 
 }
 
-/*********************************************************************************************** 
- * LogDataDialogClass::rprintf -- replace last printf, with this new printf                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/14/2000 JGA  : Created.                                                                 * 
+/***********************************************************************************************
+ * LogDataDialogClass::rprintf -- replace last printf, with this new printf                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/14/2000 JGA  : Created.                                                                 *
  *=============================================================================================*/
 void LogDataDialogClass::rprintf(const char *text, ...)
 {
@@ -169,20 +169,20 @@ void LogDataDialogClass::rprintf(const char *text, va_list args)
 
 	//SendMessage(GetDlgItem(Hwnd,IDC_ANIM_LOG_RICHEDIT), EM_SCROLLCARET, 0, 0);
 
-}	// rprintf
+}
 
 
-/*********************************************************************************************** 
- * LogDataDialogClass::updatebar - send message to progress meter                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/14/2000 JGA  : Created.                                                                 * 
+/***********************************************************************************************
+ * LogDataDialogClass::updatebar - send message to progress meter                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/14/2000 JGA  : Created.                                                                 *
  *=============================================================================================*/
 void	LogDataDialogClass::updatebar(float position, float total)
 {
@@ -194,20 +194,20 @@ void	LogDataDialogClass::updatebar(float position, float total)
 
 	SendMessage(ctrlHwnd, PBM_SETPOS, pos, 0 );
 
-}	// updatebar
+}
 
 
-/*********************************************************************************************** 
- * LogDataDialogClass::Wait_OK - Give user a chance to review log, then hit ok                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/14/2000 JGA  : Created.                                                                 * 
+/***********************************************************************************************
+ * LogDataDialogClass::Wait_OK - Give user a chance to review log, then hit ok                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/14/2000 JGA  : Created.                                                                 *
  *=============================================================================================*/
 void LogDataDialogClass::Wait_OK()
 {
@@ -218,28 +218,28 @@ void LogDataDialogClass::Wait_OK()
 		// wait for the OK
 	}
 
-} // Wait_OK
+}
 
 
 
-/*********************************************************************************************** 
- * LogDataDialogClass::Dialog_Proc -- Handles the windows message for the options dialog    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * LogDataDialogClass::Dialog_Proc -- Handles the windows message for the options dialog    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool LogDataDialogClass::Dialog_Proc
 (
 	HWND hwnd,
 	UINT message,
 	WPARAM wParam,
-	LPARAM 
+	LPARAM
 )
 {
 	int code = HIWORD(wParam);
@@ -289,14 +289,14 @@ bool LogDataDialogClass::Dialog_Proc
 				EndDialog(Hwnd, 1);
 				Hwnd = NULL;
 			}
-				
+
 			return TRUE;
 			break;
 
 	}
-	return FALSE; 
-   
-}	// Dialog_Proc
+	return FALSE;
+
+}
 
 void LogDataDialogClass::Dialog_Init()
 {
@@ -316,30 +316,30 @@ void LogDataDialogClass::Dialog_Init()
 
 	cx = (((desktop.right - desktop.left) - sx)/2) + desktop.left;
 	cy = (((desktop.bottom - desktop.top) - sy)/2) + desktop.top;
- 
+
 	//SetWindowPos(Hwnd, HWND_TOPMOST, cx, cy, 0, 0, SWP_NOSIZE);
 	SetWindowPos(Hwnd, HWND_TOP, cx, cy, 0, 0, SWP_NOSIZE);
- 
+
 	EnableWindow(GetDlgItem(Hwnd,IDOK),FALSE);
 
 	status = 1;	// signal init
 
- 
-}	// Dialog_Init
 
+}
 
 
-/*********************************************************************************************** 
- * _logdata_dialog_proc -- thunks into the logdata dialog class's windows message handler      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/09/2000 JGA  : Created.                                                                 * 
+
+/***********************************************************************************************
+ * _logdata_dialog_proc -- thunks into the logdata dialog class's windows message handler      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/09/2000 JGA  : Created.                                                                 *
  *=============================================================================================*/
 BOOL CALLBACK _logdata_dialog_proc
 (
@@ -367,7 +367,7 @@ BOOL CALLBACK _logdata_dialog_proc
 		return FALSE;
 	}
 
-} // _logdata_dialog_proc
+}
 
 
 DWORD WINAPI _logdata_thread_function(LPVOID log_obj_ptr)
@@ -378,7 +378,7 @@ DWORD WINAPI _logdata_thread_function(LPVOID log_obj_ptr)
 						 ((LogDataDialogClass*)log_obj_ptr)->ParentHwnd,
                    (DLGPROC) _logdata_dialog_proc,
                    (LPARAM) log_obj_ptr);
- 
+
 
 	// When this exits it should terminate the thread
 	return(0);
diff --git a/Core/Tools/WW3D/max2w3d/logdlg.h b/Core/Tools/WW3D/max2w3d/logdlg.h
index 3cefe692a5e..9be2b8c7e60 100644
--- a/Core/Tools/WW3D/max2w3d/logdlg.h
+++ b/Core/Tools/WW3D/max2w3d/logdlg.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/logdlg.h 4     11/07/00 5:40p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/logdlg.h                       $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 11/07/00 3:15p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 4                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/logdlg.h                       $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 11/07/00 3:15p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 4                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef LOGDLG_H
-#define LOGDLG_H
+#pragma once
 
 #include <windows.h>
 
@@ -48,16 +46,16 @@ class LogDataDialogClass
 
 	LogDataDialogClass(HWND parent);
 	~LogDataDialogClass();
-	
+
    void	Wait_OK();	// wait for user to hit OK
-   
+
    void	printf(const char *, ...);
 	void	printf(const char * text, va_list args);
 	void  rprintf(const char *, ...);
 	void	rprintf(const char *text, va_list args);
-	
+
 	void	updatebar(float position, float total);
-   
+
 	bool	Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM);
 
 public:
@@ -78,10 +76,8 @@ class LogDataDialogClass
 	int	buffer_index;
 
 volatile int status;
-  
-};
 
+};
 
-#endif
 
 // EOF - logdlg.h
diff --git a/Core/Tools/WW3D/max2w3d/maxworldinfo.cpp b/Core/Tools/WW3D/max2w3d/maxworldinfo.cpp
index c548abd82d4..095503f0980 100644
--- a/Core/Tools/WW3D/max2w3d/maxworldinfo.cpp
+++ b/Core/Tools/WW3D/max2w3d/maxworldinfo.cpp
@@ -56,7 +56,7 @@ Vector3 MaxWorldInfoClass::Get_Shared_Vertex_Normal (Vector3 pos, int smgroup)
 	for(unsigned int index = 0; index < MeshList.Count(); index ++) {
 		GeometryExportTaskClass * task = MeshList[index];
 		if (task != CurrentTask) {
-			normal += task->Get_Shared_Vertex_Normal(world_pos,smgroup);			
+			normal += task->Get_Shared_Vertex_Normal(world_pos,smgroup);
 		}
 	}
 
diff --git a/Core/Tools/WW3D/max2w3d/maxworldinfo.h b/Core/Tools/WW3D/max2w3d/maxworldinfo.h
index c5369b99a20..d690edb50aa 100644
--- a/Core/Tools/WW3D/max2w3d/maxworldinfo.h
+++ b/Core/Tools/WW3D/max2w3d/maxworldinfo.h
@@ -36,14 +36,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef MAXWORLDINFO_H
-#define MAXWORLDINFO_H
-
+#pragma once
 
 #include <max.h>
 #include "meshbuild.h"
 #include "nodelist.h"
-#include "Vector.H"
+#include "Vector.h"
 
 
 class GeometryExportTaskClass;
@@ -64,9 +62,9 @@ class MaxWorldInfoClass : public WorldInfoClass
 				CurrentTime(0)					{ }
 		virtual ~MaxWorldInfoClass(void)	{ }
 
-		// Public methods		
+		// Public methods
 		virtual Vector3	Get_Shared_Vertex_Normal(Vector3 pos, int smgroup);
-		
+
 		virtual GeometryExportTaskClass *	Get_Current_Task(void) const								{ return CurrentTask; }
 		virtual void								Set_Current_Task(GeometryExportTaskClass * task)	{ CurrentTask = task; }
 
@@ -78,7 +76,7 @@ class MaxWorldInfoClass : public WorldInfoClass
 
 		virtual void		Allow_Mesh_Smoothing (bool onoff)	{ SmoothBetweenMeshes = onoff; }
 		virtual bool		Are_Meshes_Smoothed (void) const		{ return SmoothBetweenMeshes; }
-		
+
 	private:
 
 		DynamicVectorClass<GeometryExportTaskClass *> &	MeshList;
@@ -87,7 +85,3 @@ class MaxWorldInfoClass : public WorldInfoClass
 		Matrix3				ExportTrans;
 		bool					SmoothBetweenMeshes;
 };
-
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/meshbuild.cpp b/Core/Tools/WW3D/max2w3d/meshbuild.cpp
index 061840f423a..524b14c4b24 100644
--- a/Core/Tools/WW3D/max2w3d/meshbuild.cpp
+++ b/Core/Tools/WW3D/max2w3d/meshbuild.cpp
@@ -83,7 +83,7 @@ static int vertex_compare(const void *elem1, const void *elem2);
 
 typedef int (*COMPARE_FUNC_TYPE)(const void * elem1,const void * elem2);
 
-COMPARE_FUNC_TYPE Texture_Compare_Funcs[MeshBuilderClass::MAX_PASSES][MeshBuilderClass::MAX_STAGES] = 
+COMPARE_FUNC_TYPE Texture_Compare_Funcs[MeshBuilderClass::MAX_PASSES][MeshBuilderClass::MAX_STAGES] =
 {
 	{ pass0_stage0_compare, pass0_stage1_compare },
 	{ pass1_stage0_compare, pass1_stage1_compare },
@@ -95,7 +95,7 @@ COMPARE_FUNC_TYPE Texture_Compare_Funcs[MeshBuilderClass::MAX_PASSES][MeshBuilde
 /************************************************************************************
 **
 ** FaceHasherClass, support class for the unique faces hash table.  The unique
-** faces table is going to detect exactly duplicated faces and discard them.  It 
+** faces table is going to detect exactly duplicated faces and discard them.  It
 ** appears that the artists occasionally accidentally duplicate a face which causes
 ** problems in the stripping algorithm...
 **
@@ -104,40 +104,40 @@ class FaceHasherClass : public HashCalculatorClass<MeshBuilderClass::FaceClass>
 {
 public:
 
-	virtual bool	Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) 
+	virtual bool	Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b)
 	{
 		// Note: if we want this to detect duplicates that are "rotated", must change
 		// both this function and the Compute_Hash function...
-		return 
+		return
 		(
-			(a.VertIdx[0] == b.VertIdx[0]) && 
-			(a.VertIdx[1] == b.VertIdx[1]) && 
+			(a.VertIdx[0] == b.VertIdx[0]) &&
+			(a.VertIdx[1] == b.VertIdx[1]) &&
 			(a.VertIdx[2] == b.VertIdx[2])
 		);
 	}
 
 	virtual void	Compute_Hash(const MeshBuilderClass::FaceClass & item)
 	{
-		HashVal = (int)(item.VertIdx[0]*12345.6f + item.VertIdx[1]*1714.38484f + item.VertIdx[2]*27561.3f)&1023; 
+		HashVal = (int)(item.VertIdx[0]*12345.6f + item.VertIdx[1]*1714.38484f + item.VertIdx[2]*27561.3f)&1023;
 	}
 
-	virtual int		Num_Hash_Bits(void) 
-	{ 
-		return 10;  
+	virtual int		Num_Hash_Bits(void)
+	{
+		return 10;
 	}
-	
+
 	virtual int		Num_Hash_Values(void)
 	{
-		return 1;	
+		return 1;
 	}
-	
+
 	virtual int		Get_Hash_Value(int /*index*/)
 	{
 		return HashVal;
 	}
 
 private:
-	
+
 	int HashVal;
 
 };
@@ -154,12 +154,12 @@ class VertexArrayClass
 {
 public:
 
-	enum 
-	{ 
+	enum
+	{
 		HASH_TABLE_SIZE = 4096,
 	};
 
-	VertexArrayClass(int maxsize,int match_normals = 0) 
+	VertexArrayClass(int maxsize,int match_normals = 0)
 	{
 		Verts = NULL;
 		assert(maxsize > 0);
@@ -217,9 +217,9 @@ class VertexArrayClass
 
 		for (x = xstart - EPSILON; x <= xstart + EPSILON + 0.0000001; x+= EPSILON) {
 			for (y = ystart - EPSILON; y <= ystart + EPSILON + 0.000001; y+= EPSILON) {
-				
+
 				hash = compute_hash((float)x,(float)y);
-		
+
 				if (hash != lasthash) {
 					MeshBuilderClass::VertClass * test_vert = HashTable[hash];
 					while (test_vert) {
@@ -227,13 +227,13 @@ class VertexArrayClass
 						if (Verts_Shading_Match(vert,*test_vert)) {
 							if (shadeindex == 0xFFFFFFFF) {
 								shadeindex = test_vert->UniqueIndex;
-							
+
 								// mask the "master" smoothed vertex's smoothing group with our
 								// face's smoothing group since we are going to be smoothed with it.
 								Verts[shadeindex].SharedSmGroup &= vert.SmGroup;
 							}
 						}
-							
+
 						if (Verts_Match(vert,*test_vert)) {
 							return test_vert->UniqueIndex;
 						}
@@ -263,10 +263,10 @@ class VertexArrayClass
 			Verts[newindex].ShadeIndex = shadeindex;
 
 		}
-		
+
 		// This is a new vertex, store the face's smoothing group with it
 		//Verts[newindex].SmoothingGroup = face_smooth_group;
-		
+
 		// And add to the hash table
 		x = (vert.Position.X - Center.X) / Extent.X;
 		y = (vert.Position.Y - Center.Y) / Extent.Y;
@@ -310,7 +310,7 @@ class VertexArrayClass
 				return 0;
 			if (v0.VertexMaterialIndex[pass] != v1.VertexMaterialIndex[pass])
 				return 0;
-			
+
 		}
 
 		// texcoords must match for all passes and stages
@@ -331,13 +331,13 @@ class VertexArrayClass
 	{
 		float dv = (v0.Position - v1.Position).Length();
 		int smgroup_match = ((v0.SmGroup & v1.SmGroup) || (v0.SmGroup == v1.SmGroup));
-	
-		if (	(dv < EPSILON) && 
+
+		if (	(dv < EPSILON) &&
 				(smgroup_match) &&
-				(v0.Id == v1.Id)) 
+				(v0.Id == v1.Id))
 		{
 			return 1;
-		} 
+		}
 		return 0;
 	}
 
@@ -360,7 +360,7 @@ class VertexArrayClass
 
 	MeshBuilderClass::VertClass * *	HashTable;
 	int										MatchNormals;
-	
+
 	Vector3									Center;
 	Vector3									Extent;
 
@@ -396,7 +396,7 @@ void MeshBuilderClass::VertClass::Reset(void)
 	MaxVertColIndex = 0;
 
 	for (int pass = 0; pass < MeshBuilderClass::MAX_PASSES; pass++) {
-		
+
 		DiffuseColor[pass].Set(1,1,1);
 		SpecularColor[pass].Set(1,1,1);
 		DiffuseIllumination[pass].Set(0,0,0);
@@ -497,8 +497,8 @@ bool MeshBuilderClass::FaceClass::Is_Degenerate(void)
 				return true;
 			}
 
-			if (	(Verts[v0].Position.X == Verts[v1].Position.X) && 
-					(Verts[v0].Position.Y == Verts[v1].Position.Y) && 
+			if (	(Verts[v0].Position.X == Verts[v1].Position.X) &&
+					(Verts[v0].Position.Y == Verts[v1].Position.Y) &&
 					(Verts[v0].Position.Z == Verts[v1].Position.Z) )
 			{
 				return true;
@@ -571,7 +571,7 @@ MeshBuilderClass::MeshBuilderClass(int pass_count,int face_count_guess,int face_
 	PolyOrderStage(0),
 	WorldInfo (NULL)
 {
-	Reset(pass_count,face_count_guess,face_count_growth_rate);		
+	Reset(pass_count,face_count_guess,face_count_growth_rate);
 }
 
 /***********************************************************************************************
@@ -639,7 +639,7 @@ void MeshBuilderClass::Free(void)
 void MeshBuilderClass::Reset(int passcount,int face_count_guess,int face_count_growth_rate)
 {
 	Free();
-	
+
 	State = STATE_ACCEPTING_INPUT;
 	PassCount = passcount;
 	AllocFaceCount = face_count_guess;
@@ -673,11 +673,11 @@ int MeshBuilderClass::Add_Face(const FaceClass & face)
 
 	// copy the face
 	Faces[CurFace] = face;
-	
+
 	// calculate the normal
 	Faces[CurFace].Compute_Plane();
 
-	// set the "add index" 
+	// set the "add index"
 	Faces[CurFace].AddIndex = CurFace;
 
 	// copy the smoothing group into each vert
@@ -820,7 +820,7 @@ void MeshBuilderClass::Compute_Vertex_Normals(void)
 			int shadeindex = Verts[vertindex].ShadeIndex;
 			Verts[shadeindex].Normal += Faces[faceidx].Normal;
 		}
-	}	
+	}
 
 	/*
 	** Smooth this mesh with neighboring meshes!
@@ -860,7 +860,7 @@ void MeshBuilderClass::Remove_Degenerate_Faces(void)
 	int faceidx;
 	FaceHasherClass facehasher;
 	UniqueArrayClass<MeshBuilderClass::FaceClass> uniquefaces(FaceCount,FaceCount/4,&facehasher);
-	
+
 	for (faceidx = 0; faceidx < FaceCount; faceidx++) {
 		if (!Faces[faceidx].Is_Degenerate()) {
 			uniquefaces.Add(Faces[faceidx]);
@@ -905,7 +905,7 @@ void MeshBuilderClass::Compute_Mesh_Stats(void)
 	int	vmat_index[MAX_PASSES];
 
 	Stats.Reset();
-	
+
 	for (pass = 0; pass<MAX_PASSES; pass++) {
 		for (stage = 0; stage < MAX_STAGES; stage++) {
 			tex_index[pass][stage] = Faces[0].TextureIndex[pass][stage];
@@ -915,7 +915,7 @@ void MeshBuilderClass::Compute_Mesh_Stats(void)
 	}
 
 	for (pass = 0; pass<MAX_PASSES; pass++) {
-		
+
 		for (stage = 0; stage<MAX_STAGES; stage++) {
 			for (face_index=0; face_index < FaceCount; face_index++) {
 				if (Faces[face_index].TextureIndex[pass][stage] != tex_index[pass][stage]) {
@@ -961,7 +961,7 @@ void MeshBuilderClass::Compute_Mesh_Stats(void)
 				break;
 			}
 		}
-	
+
 		for (vert_index=0; vert_index < VertCount; vert_index++) {
 			if (Verts[vert_index].DiffuseIllumination[pass] != Vector3(0,0,0)) {
 				Stats.HasDiffuseIllumination[pass] = true;
@@ -969,7 +969,7 @@ void MeshBuilderClass::Compute_Mesh_Stats(void)
 			}
 		}
 
-		
+
 		for (stage = 0; stage<MAX_STAGES; stage++) {
 			for (face_index=0; face_index < FaceCount; face_index++) {
 				if (Faces[face_index].TextureIndex[pass][stage] != -1) {
@@ -1087,7 +1087,7 @@ void MeshBuilderClass::Compute_Bounding_Sphere(Vector3 * set_center,float * set_
 			zmax.X = Verts[i].Position.X; zmax.Y = Verts[i].Position.Y; zmax.Z = Verts[i].Position.Z;
 		}
 	}
-	
+
 	// xspan = distance between the 2 points xmin and xmax squared.
 	// same goes for yspan and zspan.
 	dx = xmax.X - xmin.X;
@@ -1123,7 +1123,7 @@ void MeshBuilderClass::Compute_Bounding_Sphere(Vector3 * set_center,float * set_
 		dia2 = zmax;
 	}
 
-	
+
 	// Compute initial center and radius and radius squared
 	Vector3 center;
 	center.X = (dia1.X + dia2.X) / 2.0f;
@@ -1137,7 +1137,7 @@ void MeshBuilderClass::Compute_Bounding_Sphere(Vector3 * set_center,float * set_
 	double radsqr = dx*dx + dy*dy + dz*dz;
 	double radius = sqrt(radsqr);
 
-	
+
 	// SECOND PASS:
 	// Increment current sphere if any points fall outside of it.
 	for (i=0; i<VertCount; i++) {
@@ -1145,15 +1145,15 @@ void MeshBuilderClass::Compute_Bounding_Sphere(Vector3 * set_center,float * set_
 		dx = Verts[i].Position.X - center.X;
 		dy = Verts[i].Position.Y - center.Y;
 		dz = Verts[i].Position.Z - center.Z;
-		
+
 		double testrad2 = dx*dx + dy*dy + dz*dz;
 
 		if (testrad2 > radsqr) {
-			
+
 			// this point was outside the old sphere, compute a new
 			// center point and radius which contains this point
 			double testrad = sqrt(testrad2);
-			
+
 			// adjust center and radius
 			radius = (radius + testrad) / 2.0;
 			radsqr = radius * radius;
@@ -1196,7 +1196,7 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	}
 
 	VertexArrayClass unique_verts(FaceCount * 3,match_normals);
-	
+
 	/*
 	** Find the min and max of the array of vertices
 	*/
@@ -1205,7 +1205,7 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 
 	for (faceidx = 0; faceidx < FaceCount; faceidx++) {
 		for (facevertidx = 0; facevertidx < 3; facevertidx++) {
-			
+
 			minv.Update_Min(Faces[faceidx].Verts[facevertidx].Position);
 			maxv.Update_Max(Faces[faceidx].Verts[facevertidx].Position);
 		}
@@ -1221,9 +1221,9 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	*/
 	for (faceidx = 0; faceidx < FaceCount; faceidx++) {
 		for (facevertidx = 0; facevertidx < 3; facevertidx++) {
-			Faces[faceidx].VertIdx[facevertidx] = 
+			Faces[faceidx].VertIdx[facevertidx] =
 				unique_verts.Submit_Vertex(Faces[faceidx].Verts[facevertidx]);
-		}		
+		}
 	}
 
 	/*
@@ -1241,7 +1241,7 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	for (vertidx=0; vertidx<VertCount;vertidx++) {
 		Verts[vertidx] = unique_verts[vertidx];
 	}
-	
+
 	/*
 	** Build a new array of faces, removing degenerate faces
 	*/
@@ -1259,12 +1259,12 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 
 	/*
 	** An "Optimal" mesh will follow the following rules:
-	** 
+	**
 	** Triangle Ordering:
 	** - Triangles are in strip order
 	** - Triangles are sorted by textures and detail textures in all passes (!?)
 	** - Triangles are sorted by shader in all passes(!)
-	** 
+	**
 	** Vertex Ordering:
 	** - Skin matrix order if the mesh is being "skinned"
    ** - Few vertex material switches
@@ -1272,7 +1272,7 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	**
 	** All verts should use the same data fields in each pass (alpha, dcg, ect)
 	** All triangles must use same number of passes.
-	** 
+	**
 	** Here is how I will attempt to get as "close as possible" to this
 	** - find the pass and stage which has the "worst-case" number of textures
 	**   and sort all polys with respect to the textures in that pass and stage
@@ -1285,14 +1285,14 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	** We should throw up a warning flag in the asset manager whenever we encounter
 	** a mesh which uses more than one of these per pass...
 	*/
-	Compute_Mesh_Stats();	
+	Compute_Mesh_Stats();
 	Stats.UVSplitCount = unique_verts.UVSplits;
 
 	/*
 	** Sort the polys by texture
 	*/
 	qsort(Faces,FaceCount,sizeof(FaceClass),Texture_Compare_Funcs[PolyOrderPass][PolyOrderStage]);
-		
+
 	/*
 	** Sort the vertices by bone index and vertex material
 	*/
@@ -1325,21 +1325,21 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
  *=============================================================================================*/
 void MeshBuilderClass::Strip_Optimize_Mesh(void)
 {
-	WingedEdgeStruct *		edgehash[512];		
+	WingedEdgeStruct *		edgehash[512];
 	WingedEdgeStruct *		edgetab			= new WingedEdgeStruct[FaceCount*3];
 	WingedEdgePolyStruct *	pedges			= new WingedEdgePolyStruct[FaceCount];
-	
+
 	FaceClass *					newpolys			= new FaceClass[FaceCount];
 	int *							newmat			= new int[FaceCount];
 	int *							premap			= new int[FaceCount];
 	int *							vtimestamp		= new int[VertCount];
-	
+
 	int							vcount			= 0;
 	int							polysinserted	= 0;
 	int							lastmat			= 0;
 	int							edgecount		= 0;
 	int							i,j;
-	
+
 	// init the tables
 	memset(edgehash,0,sizeof(WingedEdgeStruct *) * 512);
 	memset(edgetab,0,sizeof(WingedEdgeStruct) * FaceCount * 3);
@@ -1349,12 +1349,12 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 	for (i=0; i<VertCount; i++) {
 		vtimestamp[i] = -1;
 	}
-	
+
 	// Build the edge table for the mesh
 	// Oct 20,1998: modifying so that every place we were looking at the
 	// material index, we now use TextureIndex[PolyOrderPass][PolyOrderStage]
 	for (i=0; i<FaceCount; i++) {
-		
+
 		int mat = Faces[i].TextureIndex[PolyOrderPass][PolyOrderStage];
 
 		for (j=0; j<3; j++) {
@@ -1368,7 +1368,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 
 			v0 = j;
 			if (v0 < 2) v1 = v0+1; else v1 = 0;
-			
+
 			v0 = Faces[i].VertIdx[v0];
 			v1 = Faces[i].VertIdx[v1];
 
@@ -1388,7 +1388,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 
 				// found the edge
 				edge->Poly[1] = i;
-			
+
 			} else {
 
 				// create new edge and link it to hash table
@@ -1400,7 +1400,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 				edge->Poly[0] = i;
 				edge->Poly[1] = -1;
 				edge->MaterialIdx  = mat;
-			}			
+			}
 
 			pedges[i].Edge[j] = edge;
 		}
@@ -1421,8 +1421,8 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 
 		// first attempt to minimize material switches by choosing a polygon with same material
 		// as the starting poly. Basically what we want is the poly with same material with
-		// least shared edges and most recent vertices (as we'd like to start the strip from 
-		// a 'corner polygon'). This pass is done only if mesh has multiple materials. 
+		// least shared edges and most recent vertices (as we'd like to start the strip from
+		// a 'corner polygon'). This pass is done only if mesh has multiple materials.
 		// The second pass scans through all polygons.
 
 		// this loop is O(N*N) -> might turn a bit nasty on larger meshes. Try
@@ -1432,18 +1432,18 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 		{
 			// loop through all polygons
 			for (i = 0; i < FaceCount; i++) {
-			
+
 				// if polygon not picked yet
 				if (premap[i]==-1) {
 
 					// if material mismatch, cannot choose poly (except in pass 1)
-					if (findpass == 0 && Faces[i].TextureIndex[PolyOrderPass][PolyOrderStage] != lastmat)		
+					if (findpass == 0 && Faces[i].TextureIndex[PolyOrderPass][PolyOrderStage] != lastmat)
 						continue;
 
 					// calculate number of shared edges
 					for (c = 0, j = 0; j < 3; j++) {
-						
-						// if edge j is shared by two tris, 
+
+						// if edge j is shared by two tris,
 						// use a weight factor of vCount for each edge
 						if (pedges[i].Edge[j]->Poly[1] >= 0) {
 							c += (vcount+1);
@@ -1486,7 +1486,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 		for (int edge_index = 0; (edge_index < 3) && !found_shared_edge; edge_index++) {
 
 			for (int side_index = 0; (side_index < 2) && !found_shared_edge; side_index++) {
-				
+
 				// if this polygon is not the startpoly and it is not "taken", then this edge is ok!
 				int poly = pedges[startpoly].Edge[edge_index]->Poly[side_index];
 				if ((poly != -1) && (poly != startpoly) && (premap[poly] == -1)) {
@@ -1496,7 +1496,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 					for (int vidx=0; vidx<3; vidx++) {
 						if (	(newpoly->VertIdx[vidx] != pedges[startpoly].Edge[edge_index]->Vertex[0]) &&
 								(newpoly->VertIdx[vidx] != pedges[startpoly].Edge[edge_index]->Vertex[1])) {
-						
+
 								first_vert = newpoly->VertIdx[vidx];
 								break;
 						}
@@ -1509,16 +1509,16 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 						newpoly->VertIdx[0] = newpoly->VertIdx[1];
 						newpoly->VertIdx[1] = newpoly->VertIdx[2];
 						newpoly->VertIdx[2] = tmp;
-					}	
+					}
 
-					// ok, we found a shareable edge and adjusted our poly so the strip 
+					// ok, we found a shareable edge and adjusted our poly so the strip
 					// will start with it.  Now break out of this loop...
 					found_shared_edge = true;
 					break;
 				}
 			}
 		}
-		
+
 		// if a shared edge wasn't found, just copy the poly
 		if (!found_shared_edge) {
 			newpolys[polysinserted] = Faces[startpoly];
@@ -1535,9 +1535,9 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 		}
 
 		// If we have no shared edges, this is a lone poly, start another strip
-		if (pedges[startpoly].Edge[0]->Poly[1] == -1 &&					
+		if (pedges[startpoly].Edge[0]->Poly[1] == -1 &&
 			pedges[startpoly].Edge[1]->Poly[1] == -1 &&
-			pedges[startpoly].Edge[2]->Poly[1] == -1) 
+			pedges[startpoly].Edge[2]->Poly[1] == -1)
 				continue;
 
 		// Build the strip starting from the polygon chosen in the previous loop
@@ -1554,16 +1554,16 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 			nextpoly		= -1;
 
 			for (i = 0; i < 3; i++) {
-				
+
 				// if edge 'i' of startpoly matches the vertices in the fifo
 				if	((pedges[startpoly].Edge[i]->Vertex[0] == vFIFO[0] && pedges[startpoly].Edge[i]->Vertex[1] == vFIFO[1]) ||
 					(pedges[startpoly].Edge[i]->Vertex[1] == vFIFO[0] && pedges[startpoly].Edge[i]->Vertex[0] == vFIFO[1]))
 				{
 
 					for (j = 0; j < 2; j++) {
-						
+
 						// if poly 'j' attached to this edge has not been used already, use it!
-						if (pedges[startpoly].Edge[i]->Poly[j] > -1 && 
+						if (pedges[startpoly].Edge[i]->Poly[j] > -1 &&
 							premap[pedges[startpoly].Edge[i]->Poly[j]] == -1)
 						{
 							nextpoly = pedges[startpoly].Edge[i]->Poly[j];
@@ -1577,7 +1577,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 			break;
 
 			found:;
-	
+
 			// now, find the new vertex (two verts are on the edge, find the third)
 			int nw = -1;
 			for (i = 0; i < 3; i++) {
@@ -1623,7 +1623,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 		}
 	}
 
-	// Use the premap array to get the rest of the info into the new face table, 
+	// Use the premap array to get the rest of the info into the new face table,
 	for (i=0; i<FaceCount; i++) {
 
 		int old_idx = i;
@@ -1690,7 +1690,7 @@ void MeshBuilderClass::Grow_Face_Array(void)
 	for (int i=0; i<oldcount; i++) {
 		Faces[i] = oldfaces[i];
 	}
-	
+
 	delete[] oldfaces;
 }
 
@@ -1749,7 +1749,7 @@ int face_material_compare(const void *elem1, const void *elem2 )
 {
 	MeshBuilderClass::FaceClass * f0 = (MeshBuilderClass::FaceClass *)elem1;
 	MeshBuilderClass::FaceClass * f1 = (MeshBuilderClass::FaceClass *)elem2;
-	
+
 	if (f0->TextureIndex[0][0] < f1->TextureIndex[0][0]) return -1;
 	if (f0->TextureIndex[0][0] > f1->TextureIndex[0][0]) return 1;
 	return 0;
diff --git a/Core/Tools/WW3D/max2w3d/meshbuild.h b/Core/Tools/WW3D/max2w3d/meshbuild.h
index bca5c9e08ec..bb48832aa63 100644
--- a/Core/Tools/WW3D/max2w3d/meshbuild.h
+++ b/Core/Tools/WW3D/max2w3d/meshbuild.h
@@ -34,17 +34,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MESHBUILD_H
-#define MESHBUILD_H
 
 #include	"always.h"
 #include "vector2.h"
 #include "vector3.h"
-#include "BITTYPE.H"
+#include "BITTYPE.h"
 
 #include <assert.h>
 
@@ -60,7 +55,7 @@ class WorldInfoClass
 		WorldInfoClass(void)				{ }
 		virtual ~WorldInfoClass(void)	{ }
 
-		// Public methods		
+		// Public methods
 		virtual Vector3	Get_Shared_Vertex_Normal (Vector3 pos, int smgroup) = 0;
 		virtual bool		Are_Meshes_Smoothed (void) const { return true; }
 };
@@ -82,7 +77,7 @@ class WorldInfoClass
 ** 2. Loop through the verts, looking at each one using Get_Vertex
 ** 3. Loop through the faces, looking at each one using Get_Face
 **
-** *NOTE*  This class is meant to be relatively self-sufficient.  It is used in a 
+** *NOTE*  This class is meant to be relatively self-sufficient.  It is used in a
 ** variety of different applications which are built on completely different
 ** code-bases.  Do not introduce dependencies into this module lightly! :-)
 */
@@ -94,7 +89,7 @@ class MeshBuilderClass
 	enum {
 		STATE_ACCEPTING_INPUT = 0,		// mesh builder is accepting input triangles
 		STATE_MESH_PROCESSED,			// mesh builder has processed the mesh
-	
+
 		MAX_PASSES = 4,					// maximum number of material passes supported
 		MAX_STAGES = 2,					// maximum number of texture stages supported in a single pass
 	};
@@ -106,12 +101,12 @@ class MeshBuilderClass
 	~MeshBuilderClass(void);
 
 	/*
-	** VertClass.  The MeshBuilder deals with vertices in this format.  
+	** VertClass.  The MeshBuilder deals with vertices in this format.
 	*/
 	class VertClass
 	{
 	public:
-		VertClass(void)		{ Reset(); } 
+		VertClass(void)		{ Reset(); }
 		void						Reset(void);
 
 	public:
@@ -123,8 +118,8 @@ class MeshBuilderClass
 		int						BoneIndex;			// bone influence if the mesh is a skin
 
 		int						MaxVertColIndex;	// Index into the Max mesh.vertCol array of this vertex.
-		
-		Vector2					TexCoord[MAX_PASSES][MAX_STAGES];				
+
+		Vector2					TexCoord[MAX_PASSES][MAX_STAGES];
 		Vector3					DiffuseColor[MAX_PASSES];			// diffuse color
 		Vector3					SpecularColor[MAX_PASSES];			// specular color
 		Vector3					DiffuseIllumination[MAX_PASSES];	// pre-calced diffuse illum
@@ -140,7 +135,7 @@ class MeshBuilderClass
 		int						UniqueIndex;		// used internally!
 		int						ShadeIndex;			// used internally!
 		VertClass *				NextHash;			// used internally!
-	
+
 	};
 
 	/*
@@ -153,7 +148,7 @@ class MeshBuilderClass
 	public:
 		FaceClass(void)		{ Reset(); }
 		void						Reset(void);									// reset this face
-		
+
 	public:
 		VertClass				Verts[3];										// array of 3 verts
 		int						SmGroup;											// smoothing group
@@ -167,7 +162,7 @@ class MeshBuilderClass
 		int						VertIdx[3];			// set by builder: "optimized" vertex indices
 		Vector3					Normal;		 		// set by builder: Face normal
 		float32					Dist;			 		// set by builder: Plane distance
-	
+
 		void						Compute_Plane(void);
 		bool						operator != (const FaceClass & that)		{ return !(*this == that); }
 		bool						operator == (const FaceClass & /*that*/)	{ return false; }
@@ -175,27 +170,27 @@ class MeshBuilderClass
 
 		friend class MeshBuilderClass;
 	};
-	
+
 	/*
 	** To "build" a mesh:
 	** 1. Reset the builder with the approximate number of polys you're going to sumbit, etc.
 	** 3. Submit each face in the form of a FaceClass, set only the fields you need (leave others at default)
 	** 4. Call Build_Mesh
-	*/ 
+	*/
 	void							Reset(int pass_count,int face_count_guess,int face_count_growth_rate);
 	int							Add_Face(const FaceClass & face);
 	void							Build_Mesh(bool compute_normals);
 
 	/*
-	** Optional controls: 
+	** Optional controls:
 	** If one of your passes has more textures than another, you may wish to do the
-	** stripping and sorting based on that channel.  By default, everything will 
+	** stripping and sorting based on that channel.  By default, everything will
 	** be stripped and sorted based on pass 0, stage 0
 	** Sort_Vertices can be used to order the vertices arbitrarily.  I use it to
 	** sort them according to the bone they are attached for skin meshes.
 	*/
 	void							Set_Polygon_Ordering_Channel(int pass,int texstage);
-	
+
 	/*
 	** To use the results:
 	** 1. Call Get_Vertex_Count and Get_Face_Count to get the counts
@@ -230,9 +225,9 @@ class MeshBuilderClass
 	*/
 	WorldInfoClass *			Peek_World_Info(void) const						{ return WorldInfo; }
 	void							Set_World_Info(WorldInfoClass *world_info)	{ WorldInfo = world_info; }
-	
+
 	/*
-	** Mesh Stats, mainly lots of flags for whether this mesh has various 
+	** Mesh Stats, mainly lots of flags for whether this mesh has various
 	** channels of information.
 	*/
 	struct MeshStatsStruct
@@ -244,7 +239,7 @@ class MeshBuilderClass
 		bool		HasVertexMaterial[MAX_PASSES];					// has at least one vert material in given pass
 
 		bool		HasPerPolyTexture[MAX_PASSES][MAX_STAGES];	// has 2+ textures in given pass/stage
-		bool		HasPerPolyShader[MAX_PASSES];						// has 2+ shaders in given pass 
+		bool		HasPerPolyShader[MAX_PASSES];						// has 2+ shaders in given pass
 		bool		HasPerVertexMaterial[MAX_PASSES];				// has 2+ vertex materials in given pass
 
 		bool		HasDiffuseColor[MAX_PASSES];						// has diffuse colors in given pass
@@ -343,7 +338,7 @@ inline const MeshBuilderClass::VertClass & MeshBuilderClass::Get_Vertex(int inde
 	assert(State == STATE_MESH_PROCESSED);
 	assert(index >= 0);
 	assert(index < VertCount);
-	return Verts[index];	
+	return Verts[index];
 }
 
 inline const MeshBuilderClass::FaceClass & MeshBuilderClass::Get_Face(int index) const
@@ -359,7 +354,7 @@ inline MeshBuilderClass::VertClass & MeshBuilderClass::Get_Vertex(int index)
 	assert(State == STATE_MESH_PROCESSED);
 	assert(index >= 0);
 	assert(index < VertCount);
-	return Verts[index];	
+	return Verts[index];
 }
 
 inline MeshBuilderClass::FaceClass & MeshBuilderClass::Get_Face(int index)
@@ -375,5 +370,3 @@ inline const MeshBuilderClass::MeshStatsStruct & MeshBuilderClass::Get_Mesh_Stat
 	assert(State == STATE_MESH_PROCESSED);
 	return Stats;
 }
-
-#endif
diff --git a/Core/Tools/WW3D/max2w3d/meshcon.cpp b/Core/Tools/WW3D/max2w3d/meshcon.cpp
index 22d47bcc7f7..11cdd3845f7 100644
--- a/Core/Tools/WW3D/max2w3d/meshcon.cpp
+++ b/Core/Tools/WW3D/max2w3d/meshcon.cpp
@@ -17,24 +17,24 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/meshcon.cpp 34    10/27/00 4:12p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G Math Library                                    * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/meshcon.cpp                    $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/27/00 10:39a                                             $* 
- *                                                                                             * 
- *                    $Revision:: 34                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   MeshConnectionsClass::MeshConnectionsClass -- Constructor                                 * 
- *   MeshConnectionsClass::~MeshConnectionsClass -- Destructor                                 * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G Math Library                                    *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/meshcon.cpp                    $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/27/00 10:39a                                             $*
+ *                                                                                             *
+ *                    $Revision:: 34                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   MeshConnectionsClass::MeshConnectionsClass -- Constructor                                 *
+ *   MeshConnectionsClass::~MeshConnectionsClass -- Destructor                                 *
  *   MeshConnectionsClass::Get_Aggregate_Data -- name and bone for the given aggregate         *
  *   MeshConnectionsClass::Get_Proxy_Data -- name and transform for the specified proxy object *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
@@ -48,22 +48,22 @@
 #include "geometryexportcontext.h"
 
 
-/*********************************************************************************************** 
- * MeshConnectionsClass::MeshConnectionsClass -- Constructor                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
+/***********************************************************************************************
+ * MeshConnectionsClass::MeshConnectionsClass -- Constructor                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
  *   10/19/2000 gth : New version which uses the GeometryExportTasks                           *
  *=============================================================================================*/
 MeshConnectionsClass::MeshConnectionsClass
-(	
+(
 	DynamicVectorClass<GeometryExportTaskClass *> sub_object_list,
-	GeometryExportContextClass & context 
+	GeometryExportContextClass & context
 ) :
 	CurTime(context.CurTime),
 	Origin(context.Origin)
@@ -75,7 +75,7 @@ MeshConnectionsClass::MeshConnectionsClass
 	** Set the name, count the sub-objects and aggregates
 	*/
 	Set_W3D_Name(Name,context.ModelName);
-	
+
 	/*
 	** For each sub-object, record the bone it is attached to and its name
 	*/
@@ -98,17 +98,17 @@ MeshConnectionsClass::MeshConnectionsClass
 }
 
 
-/*********************************************************************************************** 
- * MeshConnectionsClass::~MeshConnectionsClass -- Destructor                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshConnectionsClass::~MeshConnectionsClass -- Destructor                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 MeshConnectionsClass::~MeshConnectionsClass(void)
 {
diff --git a/Core/Tools/WW3D/max2w3d/meshcon.h b/Core/Tools/WW3D/max2w3d/meshcon.h
index 24d30150aec..cae17047f13 100644
--- a/Core/Tools/WW3D/max2w3d/meshcon.h
+++ b/Core/Tools/WW3D/max2w3d/meshcon.h
@@ -17,28 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/meshcon.h 26    10/27/00 4:11p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G Tools                                           * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/meshcon.h                      $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/27/00 10:31a                                             $* 
- *                                                                                             * 
- *                    $Revision:: 26                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G Tools                                           *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/meshcon.h                      $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/27/00 10:31a                                             $*
+ *                                                                                             *
+ *                    $Revision:: 26                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef MESHCON_H
-#define MESHCON_H
-
+#pragma once
 
 #ifndef ALWAYS_H
 #include "always.h"
@@ -61,7 +58,7 @@
 #endif
 
 #ifndef VECTOR_H
-#include "Vector.H"
+#include "Vector.h"
 #endif
 
 
@@ -69,11 +66,11 @@ class GeometryExportTaskClass;
 class GeometryExportContextClass;
 
 
-struct ConnectionStruct 
+struct ConnectionStruct
 {
 	ConnectionStruct(void) : BoneIndex(0),MeshINode(NULL)
-	{ 
-		memset(ObjectName,0,sizeof(ObjectName)); 
+	{
+		memset(ObjectName,0,sizeof(ObjectName));
 	}
 
 	int							BoneIndex;
@@ -101,7 +98,7 @@ class MeshConnectionsClass
 	~MeshConnectionsClass(void);
 
 	/*
-	** Get the name of the mesh connections object (will be 
+	** Get the name of the mesh connections object (will be
 	** the name of the runtime HierarchyModel that this
 	** object is describing.
 	*/
@@ -131,7 +128,7 @@ class MeshConnectionsClass
 	INode * Get_Origin (void) const				{ return Origin; }
 
 private:
-	
+
 	TimeValue							CurTime;
 	INode *								Origin;
 
@@ -144,6 +141,3 @@ class MeshConnectionsClass
 
 
 };
-
-
-#endif /*MESHCON_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/meshsave.cpp b/Core/Tools/WW3D/max2w3d/meshsave.cpp
index df646dac789..d1ff3513b1f 100644
--- a/Core/Tools/WW3D/max2w3d/meshsave.cpp
+++ b/Core/Tools/WW3D/max2w3d/meshsave.cpp
@@ -17,44 +17,44 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/meshsave.cpp 107   8/21/01 10:28a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G                                                 * 
- *                                                                                             * 
- *                    File Name : MESHSAVE.CPP                                                 * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/10/97                                                     * 
- *                                                                                             * 
- *                  Last Update : 10/20/1999997 [GH]                                           * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   MeshSaveClass::MeshSaveClass -- constructor, processes a Max mesh                         * 
- *   MeshSaveClass::~MeshSaveClass -- destructor, frees all allocated memory                   * 
- *   MeshSaveClass::write_verts -- write the vertex chunk into a wtm file                      * 
- *   MeshSaveClass::write_header -- write a mesh header chunk into a wtm file                  * 
- *   MeshSaveClass::Write_To_File -- Append the mesh to an open wtm file                       * 
- *   MeshSaveClass::write_normals -- writes the vertex normals chunk into a wtm file           * 
- *   MeshSaveClass::write_vert_normals -- Writes the surrender normal chunk into a wtm file    * 
- *   MeshSaveClass::write_triangles -- Write the triangles chunk into a wtm file.              * 
- *   MeshSaveClass::write_sr_triangles -- writes the triangles in surrender friendly format    * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G                                                 *
+ *                                                                                             *
+ *                    File Name : MESHSAVE.cpp                                                 *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/10/97                                                     *
+ *                                                                                             *
+ *                  Last Update : 10/20/1999997 [GH]                                           *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   MeshSaveClass::MeshSaveClass -- constructor, processes a Max mesh                         *
+ *   MeshSaveClass::~MeshSaveClass -- destructor, frees all allocated memory                   *
+ *   MeshSaveClass::write_verts -- write the vertex chunk into a wtm file                      *
+ *   MeshSaveClass::write_header -- write a mesh header chunk into a wtm file                  *
+ *   MeshSaveClass::Write_To_File -- Append the mesh to an open wtm file                       *
+ *   MeshSaveClass::write_normals -- writes the vertex normals chunk into a wtm file           *
+ *   MeshSaveClass::write_vert_normals -- Writes the surrender normal chunk into a wtm file    *
+ *   MeshSaveClass::write_triangles -- Write the triangles chunk into a wtm file.              *
+ *   MeshSaveClass::write_sr_triangles -- writes the triangles in surrender friendly format    *
  *   MeshSaveClass::write_triangles -- write the triangles chunk                               *
- *   MeshSaveClass::compute_surrender_vertex -- Compute the surrender vertex normals           * 
- *   MeshSaveClass::setup_material -- Gets the texture names and base colors for a material    * 
- *   MeshSaveClass::compute_bounding_volumes -- computes a bounding box and bounding sphere for* 
- *   MeshSaveClass::set_transform -- set the default transformation matrix for the mesh        * 
- *   MeshSaveClass::compute_physical_properties -- computes the volume and moment of inertia   * 
- *   MeshSaveClass::prep_mesh -- pre-transform the MAX mesh by a specified matrix              * 
- *   MeshSaveClass::write_user_text -- write the user text chunk                               * 
+ *   MeshSaveClass::compute_surrender_vertex -- Compute the surrender vertex normals           *
+ *   MeshSaveClass::setup_material -- Gets the texture names and base colors for a material    *
+ *   MeshSaveClass::compute_bounding_volumes -- computes a bounding box and bounding sphere for*
+ *   MeshSaveClass::set_transform -- set the default transformation matrix for the mesh        *
+ *   MeshSaveClass::compute_physical_properties -- computes the volume and moment of inertia   *
+ *   MeshSaveClass::prep_mesh -- pre-transform the MAX mesh by a specified matrix              *
+ *   MeshSaveClass::write_user_text -- write the user text chunk                               *
  *   MeshSaveClass::get_htree_bone_index_for_inode -- searches the htree for the given INode   *
  *   MeshSaveClass::get_skin_modifier_objects -- Searches for the WWSkin modifier for this mes *
- *   MeshSaveClass::inv_deform_mesh -- preprocess the mesh for skinning                        * 
- *   MeshSaveClass::create_materials -- create the materials for this mesh                     * 
- *   MeshSaveClass::write_ps2_shaders -- Write shaders specific to the PS2 in their own chunk. * 
+ *   MeshSaveClass::inv_deform_mesh -- preprocess the mesh for skinning                        *
+ *   MeshSaveClass::create_materials -- create the materials for this mesh                     *
+ *   MeshSaveClass::write_ps2_shaders -- Write shaders specific to the PS2 in their own chunk. *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -107,19 +107,19 @@ float Compute_3x3_Determinant(const Matrix3 & tm)
 ** compute vertex normals or store u-v's in that case (prevents vertex splitting)
 **
 ************************************************************************************/
-bool use_simple_rendering(int geo_type) 
+bool use_simple_rendering(int geo_type)
 {
 	geo_type &= W3D_MESH_FLAG_GEOMETRY_TYPE_MASK;
 
 	if (	(geo_type == OBSOLETE_W3D_MESH_FLAG_GEOMETRY_TYPE_SHADOW) ||
 			(geo_type == W3D_MESH_FLAG_GEOMETRY_TYPE_AABOX) ||
-			(geo_type == W3D_MESH_FLAG_GEOMETRY_TYPE_OBBOX) ) 
+			(geo_type == W3D_MESH_FLAG_GEOMETRY_TYPE_OBBOX) )
 	{
 		return true;
 	} else {
 		return false;
 	}
-}		
+}
 
 /************************************************************************************
 **
@@ -159,9 +159,9 @@ uint32 setup_mesh_attributes(INode * node)
 	*/
 	if (	attributes != W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN &&
 			attributes != W3D_MESH_FLAG_GEOMETRY_TYPE_CAMERA_ALIGNED &&
-			attributes != W3D_MESH_FLAG_GEOMETRY_TYPE_CAMERA_ORIENTED ) 
+			attributes != W3D_MESH_FLAG_GEOMETRY_TYPE_CAMERA_ORIENTED )
 	{
-	
+
 		if (Is_Physical_Collision(node)) {
 			attributes |= W3D_MESH_FLAG_COLLISION_TYPE_PHYSICAL;
 		}
@@ -177,7 +177,7 @@ uint32 setup_mesh_attributes(INode * node)
 		if (Is_Camera_Collision(node)) {
 			attributes |= W3D_MESH_FLAG_COLLISION_TYPE_CAMERA;
 		}
-	
+
 		if (Is_Vehicle_Collision(node)) {
 			attributes |= W3D_MESH_FLAG_COLLISION_TYPE_VEHICLE;
 		}
@@ -208,27 +208,27 @@ uint32 setup_mesh_attributes(INode * node)
 
 
 
-/*********************************************************************************************** 
- * MeshSaveClass::MeshSaveClass -- constructor, processes a Max mesh                           * 
- *                                                                                             * 
- * This class takes a MAX mesh and computes the information for a W3D mesh or skin.            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * inode - the max INode containing the mesh/skin to export                                    * 
- * exportspace - matrix defining the desired coordinate system for the mesh                    * 
- * htree - hierarchy tree that this mesh is being connected to                                 * 
- * curtime - current time in Max.                                                              * 
- * meter - progress meter                                                                      * 
- * mesh_name - name to use for the mesh                                                        * 
- * container_name - name of the container                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshSaveClass::MeshSaveClass -- constructor, processes a Max mesh                           *
+ *                                                                                             *
+ * This class takes a MAX mesh and computes the information for a W3D mesh or skin.            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * inode - the max INode containing the mesh/skin to export                                    *
+ * exportspace - matrix defining the desired coordinate system for the mesh                    *
+ * htree - hierarchy tree that this mesh is being connected to                                 *
+ * curtime - current time in Max.                                                              *
+ * meter - progress meter                                                                      *
+ * mesh_name - name to use for the mesh                                                        *
+ * container_name - name of the container                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 MeshSaveClass::MeshSaveClass
 (
@@ -275,11 +275,11 @@ MeshSaveClass::MeshSaveClass
 				}
 			}
 		}
-	} 
+	}
 
 	//////////////////////////////////////////////////////////////////////
 	// Check if the mesh is being inverted by its transform.  If this
-	// is the case, then we will need to reverse the winding of all 
+	// is the case, then we will need to reverse the winding of all
 	// polygons later.
 	//////////////////////////////////////////////////////////////////////
 	Matrix3 objtm = MaxINode->GetObjectTM(curtime);
@@ -306,10 +306,10 @@ MeshSaveClass::MeshSaveClass
 	Header.Version = W3D_CURRENT_MESH_VERSION;
 	Header.Attributes = setup_mesh_attributes(MaxINode);
 
-	meter.Finish_In_Steps(	
+	meter.Finish_In_Steps(
 			3*Header.NumTris +		// normals
 			Header.NumVertices +		// surrender normals
-			64								// voxelization			
+			64								// voxelization
 	);
 
 	ExportLog::printf("\nProcessing Mesh: %s\n",Header.MeshName);
@@ -331,7 +331,7 @@ MeshSaveClass::MeshSaveClass
 	DebugPrint("processing materials\n");
 	scan_used_materials(mesh,nodemtl);
 	create_materials(nodemtl,wirecolor,materialColorTexture);
-	
+
 	//////////////////////////////////////////////////////////////////////
 	// what face and vertex attributes are we going to export?
 	//////////////////////////////////////////////////////////////////////
@@ -340,12 +340,12 @@ MeshSaveClass::MeshSaveClass
 
 	if (!use_simple_rendering(Header.Attributes)) {
 		Header.VertexChannels |= W3D_VERTEX_CHANNEL_NORMAL;
-	} 
+	}
 
 	if (((Header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK) == W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN) && (HTree != NULL)) {
 		Header.VertexChannels |= W3D_VERTEX_CHANNEL_BONEID;
 	}
-	
+
 	//////////////////////////////////////////////////////////////////////
 	// Process the mesh
 	//////////////////////////////////////////////////////////////////////
@@ -366,7 +366,7 @@ MeshSaveClass::MeshSaveClass
 
 	//////////////////////////////////////////////////////////////////////
 	// Determine if the deformer should use alpha or v-color info
-	//////////////////////////////////////////////////////////////////////	
+	//////////////////////////////////////////////////////////////////////
 	if (ExportOptions.Is_Vertex_Alpha_Enabled()) {
 		unsigned int alpha_passes = 0;
 		for (int pass=0; pass < MaterialDesc.Pass_Count(); pass++) {
@@ -396,14 +396,14 @@ MeshSaveClass::MeshSaveClass
 	//////////////////////////////////////////////////////////////////////
 	Progress_Meter_Class voxelmeter(meter, 64.0f * meter.Increment);
 	compute_physical_constants(MaxINode,voxelmeter,false /*usevoxelizer*/);
-	
+
 	//////////////////////////////////////////////////////////////////////
 	// If this is a skin, pre-deform the mesh.
 	//////////////////////////////////////////////////////////////////////
 	if (((Header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK) == W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN) && (HTree != NULL)) {
 		inv_deform_mesh();
 	}
-	
+
 	//////////////////////////////////////////////////////////////////////
 	// Get the user text from MAX's properties window.
 	//////////////////////////////////////////////////////////////////////
@@ -418,17 +418,17 @@ MeshSaveClass::MeshSaveClass
 	}
 }
 
-/*********************************************************************************************** 
- * MeshSaveClass::~MeshSaveClass -- destructor, frees all allocated memory                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshSaveClass::~MeshSaveClass -- destructor, frees all allocated memory                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 MeshSaveClass::~MeshSaveClass(void)
 {
@@ -441,7 +441,7 @@ MeshSaveClass::~MeshSaveClass(void)
 		delete[] VertInfluences;
 		VertInfluences = NULL;
 	}
-	
+
 	if (MaterialRemapTable) {
 		delete[] MaterialRemapTable;
 		MaterialRemapTable = NULL;
@@ -509,12 +509,12 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 	bool								is_skin = false;
 	SkinDataClass *				skindata = NULL;
 	SkinWSMObjectClass *			skinobj = NULL;
-	
+
 	get_skin_modifier_objects(&skindata,&skinobj);
-	
-	if (	((Header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK) == W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN) && 
-			(HTree != NULL)	) 
-	{ 
+
+	if (	((Header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK) == W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN) &&
+			(HTree != NULL)	)
+	{
 		is_skin = ((skindata != NULL) && (skinobj != NULL));
 	}
 
@@ -529,8 +529,8 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 		int mat_index = 0;
 		if (Header.NumMaterials > 0) {
 			mat_index = MaterialRemapTable[(maxface.getMatID() % Header.NumMaterials)];
-		}		
-		assert(mat_index != -1); 
+		}
+		assert(mat_index != -1);
 
 		for (pass=0; pass<MaterialDesc.Pass_Count(); pass++) {
 			face.ShaderIndex[pass] = MaterialDesc.Get_Shader_Index(mat_index,pass);
@@ -538,7 +538,7 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 				face.TextureIndex[pass][stage] = MaterialDesc.Get_Texture_Index(mat_index,pass,stage);
 			}
 		}
-	
+
 		int geo_type = Header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK;
 
 		if ( use_simple_rendering(geo_type) ) {
@@ -559,8 +559,8 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 			mtl_to_use = node_mtl->GetSubMtl (maxface.getMatID() % node_mtl->NumSubMtls());
 		}
 
-		if ((mtl_to_use != NULL) && ((mtl_to_use->ClassID() == GameMaterialClassID) || 
-			 (mtl_to_use->ClassID() == PS2GameMaterialClassID))) {			
+		if ((mtl_to_use != NULL) && ((mtl_to_use->ClassID() == GameMaterialClassID) ||
+			 (mtl_to_use->ClassID() == PS2GameMaterialClassID))) {
 			face.SurfaceType = ((GameMtl *)mtl_to_use)->Get_Surface_Type ();
 		}
 
@@ -573,13 +573,13 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 			** reverse winding.
 			*/
 			int max_vert_counter;
-			
+
 			if (MeshInverted) {
 				max_vert_counter = 2 - vert_counter;
 			} else {
 				max_vert_counter = vert_counter;
 			}
-	
+
 			int max_vert_index = maxface.v[max_vert_counter];
 
 			/*
@@ -608,7 +608,7 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 
 			/*
 			** Texture coordinate.  Apply uv coords if the mesh has them and is not being
-			** instructed to ignore them.  
+			** instructed to ignore them.
 			** - check if the mesh needs them (uses_simple_rendering() == false)
 			** - for each pass and stage, look up what map channel this face's material is using
 			** - ask Max for the tfaces and tverts for that map channel
@@ -650,9 +650,9 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 					*/
 					else
 					if (!use_simple_rendering(Header.Attributes)) {
-					
+
 						int channel = MaterialDesc.Get_Map_Channel(mat_index,pass,stage);
-						
+
 						UVVert * uvarray = mesh.mapVerts(channel);
 						TVFace * tvfacearray = mesh.mapFaces(channel);
 
@@ -660,7 +660,7 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 						W3dMapClass *map3d=MaterialDesc.Get_Texture(mat_index,pass,stage);
 
 						if (map3d && (uvarray != NULL) && (tvfacearray != NULL)) {
-							
+
 							int tvert_index = tvfacearray[face_index].t[max_vert_counter];
 							tvert = uvarray[tvert_index];
 						}
@@ -679,16 +679,16 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 			** Vertex Color
 			*/
 			if (mesh.vcFace) {
-				
+
 				/*
 				** If the mesh is being mirrored, remap the index
 				*/
 				int max_cvert_index = mesh.vcFace[face_index].t[max_vert_counter];
-				
+
 				VertColor vc;
 				vc = mesh.vertCol[max_cvert_index];
-				
-				/*				
+
+				/*
 				** If Vertex Alpha is specified, the vertex color is converted
 				** to alpha.  If the (obsolete) Node-flag for vertex alpha is enabled,
 				** the alpha is put into each pass which has alpha enabled.  Otherwise,
@@ -697,7 +697,7 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 				** value into the first pass.
 				*/
 				if (ExportOptions.Is_Vertex_Alpha_Enabled()) {
-				
+
 					float	alpha = (vc.x + vc.y + vc.z) / 3.0f;
 					for (int pass=0; pass < MaterialDesc.Pass_Count(); pass++) {
 						if (MaterialDesc.Pass_Uses_Vertex_Alpha(pass)) {
@@ -709,7 +709,7 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 					face.Verts[vert_counter].DiffuseColor[0].Y = vc.y;
 					face.Verts[vert_counter].DiffuseColor[0].Z = vc.z;
 				}
-				
+
 				face.Verts[vert_counter].MaxVertColIndex = max_cvert_index;
 
 			} else {
@@ -737,19 +737,19 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 			*/
 			face.Verts[vert_counter].BoneIndex = 0;
 			if (is_skin) {
-				
+
 				int skin_bone_index = skindata->VertData[max_vert_index].BoneIdx[0];
-	
+
 				// If this is a valid bone, try to find the corresponding bone index in the HTree
-				if (	(skin_bone_index != -1) && 
+				if (	(skin_bone_index != -1) &&
 						(skin_bone_index < skinobj->Num_Bones()) &&
-						(skinobj->BoneTab[skin_bone_index] != NULL)	) 
+						(skinobj->BoneTab[skin_bone_index] != NULL)	)
 				{
 					face.Verts[vert_counter].BoneIndex = get_htree_bone_index_for_inode(skinobj->BoneTab[skin_bone_index]);
 				}
-			} 
+			}
 		}
-		
+
 		Builder.Add_Face(face);
 	}
 
@@ -762,7 +762,7 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
 	int vcount = Builder.Get_Vertex_Count();
 	int pcount = mesh.numFaces;
 	float vert_poly_ratio = (float)vcount / (float)pcount;
-	
+
 	ExportLog::printf(" triangle count: %d\n",pcount);
 	ExportLog::printf(" final vertex count: %d\n",vcount);
 	ExportLog::printf(" vertex/triangle ratio: %f\n",vert_poly_ratio);
@@ -784,7 +784,7 @@ void MeshSaveClass::Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materia
  * HISTORY:                                                                                    *
  *=============================================================================================*/
 void MeshSaveClass::get_skin_modifier_objects(SkinDataClass ** skin_data_ptr,SkinWSMObjectClass ** skin_obj_ptr)
-{	
+{
 	*skin_data_ptr = NULL;
 	*skin_obj_ptr = NULL;
 
@@ -792,7 +792,7 @@ void MeshSaveClass::get_skin_modifier_objects(SkinDataClass ** skin_data_ptr,Ski
 	for (int i = 0; i < MaxINode->NumRefs(); i++) {
 
 		ReferenceTarget *refTarg = MaxINode->GetReference(i);
-     
+
 		// if the reference is a WSM Derived Object.
 		if (refTarg != NULL && refTarg->ClassID() == Class_ID(WSM_DERIVOB_CLASS_ID,0)) {
 
@@ -805,7 +805,7 @@ void MeshSaveClass::get_skin_modifier_objects(SkinDataClass ** skin_data_ptr,Ski
 
 					// This is our modifier!  Get the data from it!
 					SkinModifierClass * skinmod = (SkinModifierClass *)mod;
-					ModContext * mc = wsm_der_obj->GetModContext(j);	
+					ModContext * mc = wsm_der_obj->GetModContext(j);
 					*skin_data_ptr = (SkinDataClass *)(mc->localData);
 					*skin_obj_ptr = (SkinWSMObjectClass *)skinmod->GetReference(SkinModifierClass::OBJ_REF);
 				}
@@ -843,17 +843,17 @@ int MeshSaveClass::get_htree_bone_index_for_inode(INode * node)
 	return bindex;
 }
 
-/*********************************************************************************************** 
- * MeshSaveClass::inv_deform_mesh -- preprocess the mesh for skinning                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshSaveClass::inv_deform_mesh -- preprocess the mesh for skinning                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *   5/1/2000   gth : Created.                                                                 *
  *=============================================================================================*/
 void MeshSaveClass::inv_deform_mesh()
@@ -865,38 +865,38 @@ void MeshSaveClass::inv_deform_mesh()
 	Header.VertexChannels |= W3D_VERTEX_CHANNEL_BONEID;
 
 	for (int vert_index = 0; vert_index < Builder.Get_Vertex_Count(); vert_index++) {
-				
+
 		MeshBuilderClass::VertClass & vert = Builder.Get_Vertex(vert_index);
 
 		if (vert.BoneIndex == 0) {
 
 			// set the influence to 0 (root node) and leave the vert and normal unchanged
-			// (gth) 07/11/2000: Note that in this case, the mesh coordinates have already been 
+			// (gth) 07/11/2000: Note that in this case, the mesh coordinates have already been
 			// transformed relative to the user or scene origin and do not need to be further modified.
 			VertInfluences[vert_index].BoneIdx = 0;
 
 		} else {
-		
+
 			// here we go! get the matrix from the hierarchy tree and transform
-			// the point into the bone's coordinate system. 
+			// the point into the bone's coordinate system.
 			// (gth) 07/11/2000: The origin_offset_tm is no longer needed because
 			// skin meshes are transformed into the origin coordinate system before
 			// we get to this code.
 			Matrix3 bonetm = HTree->Get_Node_Transform(vert.BoneIndex);
 			Matrix3 invbonetm = Inverse(bonetm);
 			Point3 pos;
-			
+
 			pos.x = vert.Position.X;
 			pos.y = vert.Position.Y;
 			pos.z = vert.Position.Z;
-			
+
 			pos = pos * invbonetm;
-			
+
 			vert.Position.X = pos.x;
 			vert.Position.Y = pos.y;
 			vert.Position.Z = pos.z;
 
-			// Now, transform the normal into the bone's coordinate system.  
+			// Now, transform the normal into the bone's coordinate system.
 			invbonetm.NoTrans();
 			Point3 norm;
 
@@ -916,21 +916,21 @@ void MeshSaveClass::inv_deform_mesh()
 }
 
 
-/*********************************************************************************************** 
- * MeshSaveClass::Write_To_File -- Append the mesh to an open wtm file                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *    csave - ChunkSaveClass object to handle writing the chunk-based file 						  * 
+/***********************************************************************************************
+ * MeshSaveClass::Write_To_File -- Append the mesh to an open wtm file                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *    csave - ChunkSaveClass object to handle writing the chunk-based file 						  *
  * 	export_aabtree - should we generate an aabtree for this mesh                             *
- * 																														  * 
- * OUTPUT:																												  * 
- *    0 if nothing went wrong, Non-Zero otherwise															  * 
- * 																														  * 
- * WARNINGS:																											  * 
- *                                                                                             * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+ * 																														  *
+ * OUTPUT:																												  *
+ *    0 if nothing went wrong, Non-Zero otherwise															  *
+ * 																														  *
+ * WARNINGS:																											  *
+ *                                                                                             *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int MeshSaveClass::Write_To_File(ChunkSaveClass & csave,bool export_aabtree)
 {
@@ -973,7 +973,7 @@ int MeshSaveClass::Write_To_File(ChunkSaveClass & csave,bool export_aabtree)
 	if (write_vertex_materials(csave) != 0) {
 		return 1;
 	}
-	
+
 	if (PS2Material == TRUE) {
 
 		// The ps2 shaders must be written out first.
@@ -986,7 +986,7 @@ int MeshSaveClass::Write_To_File(ChunkSaveClass & csave,bool export_aabtree)
 		return 1;
 	}
 
-	
+
 	if (write_textures(csave) != 0) {
 		return 1;
 	}
@@ -999,7 +999,7 @@ int MeshSaveClass::Write_To_File(ChunkSaveClass & csave,bool export_aabtree)
 
 	if (DeformSave.Export (csave) != true) {
 		return 1;
-	}	
+	}
 
 	if (export_aabtree == true) {
 		if (write_aabtree(csave) != 0) {
@@ -1014,30 +1014,30 @@ int MeshSaveClass::Write_To_File(ChunkSaveClass & csave,bool export_aabtree)
 	return 0;
 }
 
-/*********************************************************************************************** 
- * MeshSaveClass::write_header -- write a mesh header chunk into a wtm file                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *    csave - chunk save object                    														  * 
- * 																														  * 
- * OUTPUT:																												  * 
- *    0 if nothing went wrong, Non-Zero otherwise															  * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshSaveClass::write_header -- write a mesh header chunk into a wtm file                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *    csave - chunk save object                    														  *
+ * 																														  *
+ * OUTPUT:																												  *
+ *    0 if nothing went wrong, Non-Zero otherwise															  *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int MeshSaveClass::write_header(ChunkSaveClass & csave)
 {
 	if (!csave.Begin_Chunk(W3D_CHUNK_MESH_HEADER3)) {
 		return 1;
 	}
-	
+
 	if (csave.Write(&Header,sizeof(W3dMeshHeader3Struct)) != sizeof(W3dMeshHeader3Struct)) {
 		return 1;
 	}
-	
+
 	if (!csave.End_Chunk()) {
 		return 1;
 	}
@@ -1045,17 +1045,17 @@ int MeshSaveClass::write_header(ChunkSaveClass & csave)
 	return 0;
 }
 
-/*********************************************************************************************** 
- * MeshSaveClass::write_user_text -- write the user text chunk                                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/20/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshSaveClass::write_user_text -- write the user text chunk                                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/20/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int MeshSaveClass::write_user_text(ChunkSaveClass & csave)
 {
@@ -1067,11 +1067,11 @@ int MeshSaveClass::write_user_text(ChunkSaveClass & csave)
 	if (!csave.Begin_Chunk(W3D_CHUNK_MESH_USER_TEXT)) {
 		return 1;
 	}
-	
+
 	// write the user text buffer (writing one extra byte to include the NULL)
 	if (csave.Write(UserText,strlen(UserText) + 1) != strlen(UserText) + 1) {
 		return 1;
-	} 
+	}
 
 	if (!csave.End_Chunk()) {
 		return 1;
@@ -1080,26 +1080,26 @@ int MeshSaveClass::write_user_text(ChunkSaveClass & csave)
 	return 0;
 }
 
-/*********************************************************************************************** 
- * MeshSaveClass::write_verts -- write the vertex chunk into a wtm file                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *    csave - chunk save object                    														  * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *    0 if nothing went wrong, Non-Zero otherwise															  * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshSaveClass::write_verts -- write the vertex chunk into a wtm file                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *    csave - chunk save object                    														  *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *    0 if nothing went wrong, Non-Zero otherwise															  *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int MeshSaveClass::write_verts(ChunkSaveClass & csave)
 {
 	if (!csave.Begin_Chunk(W3D_CHUNK_VERTICES)) {
 		return 1;
 	}
-	
+
 	assert(Builder.Get_Vertex_Count() > 0);
 	assert(Builder.Get_Vertex_Count() == (int)Header.NumVertices);
 
@@ -1108,7 +1108,7 @@ int MeshSaveClass::write_verts(ChunkSaveClass & csave)
 		const MeshBuilderClass::VertClass & vert = Builder.Get_Vertex(i);
 
 		if ((Header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK) != W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN) {
-			
+
 			assert(vert.Position.X <= Header.Max.X);
 			assert(vert.Position.Y <= Header.Max.Y);
 			assert(vert.Position.Z <= Header.Max.Z);
@@ -1116,19 +1116,19 @@ int MeshSaveClass::write_verts(ChunkSaveClass & csave)
 			assert(vert.Position.X >= Header.Min.X);
 			assert(vert.Position.Y >= Header.Min.Y);
 			assert(vert.Position.Z >= Header.Min.Z);
-		
+
 		}
 
 		W3dVectorStruct w3dvert;
 		w3dvert.X = vert.Position.X;
 		w3dvert.Y = vert.Position.Y;
 		w3dvert.Z = vert.Position.Z;
-		
+
 		if (csave.Write(&(w3dvert),sizeof(W3dVectorStruct)) != sizeof(W3dVectorStruct)) {
 			return 1;
 		}
 	}
-	
+
 	if (!csave.End_Chunk()) {
 		return 1;
 	}
@@ -1136,28 +1136,28 @@ int MeshSaveClass::write_verts(ChunkSaveClass & csave)
 }
 
 
-/*********************************************************************************************** 
- * MeshSaveClass::write_vert_normals -- Writes the surrender normal chunk into a wtm file      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *    csave - chunk save object                    														  * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *    0 if nothing went wrong, Non-Zero otherwise															  * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshSaveClass::write_vert_normals -- Writes the surrender normal chunk into a wtm file      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *    csave - chunk save object                    														  *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *    0 if nothing went wrong, Non-Zero otherwise															  *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int MeshSaveClass::write_vert_normals(ChunkSaveClass & csave)
 {
 	if (!(Header.VertexChannels & W3D_VERTEX_CHANNEL_NORMAL)) return 0;
-	
+
 	if (!csave.Begin_Chunk(W3D_CHUNK_VERTEX_NORMALS)) {
 		return 1;
 	}
-	
+
 	for (int i=0; i < Builder.Get_Vertex_Count(); i++) {
 
 		const MeshBuilderClass::VertClass & vert = Builder.Get_Vertex(i);
@@ -1173,7 +1173,7 @@ int MeshSaveClass::write_vert_normals(ChunkSaveClass & csave)
 			norm.Y = vert.Normal.Y;
 			norm.Z = vert.Normal.Z;
 		}
-		
+
 		if (csave.Write(&(norm),sizeof(W3dVectorStruct)) != sizeof(W3dVectorStruct)) {
 			return 1;
 		}
@@ -1186,24 +1186,24 @@ int MeshSaveClass::write_vert_normals(ChunkSaveClass & csave)
 	return 0;
 }
 
-/*********************************************************************************************** 
- * MeshSaveClass::write_vert_influences -- skins will have this chunk that binds verts to bones* 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *    csave - chunk save object                 															  * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *    0 if nothing went wrong, Non-Zero otherwise															  * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshSaveClass::write_vert_influences -- skins will have this chunk that binds verts to bones*
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *    csave - chunk save object                 															  *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *    0 if nothing went wrong, Non-Zero otherwise															  *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int MeshSaveClass::write_vert_influences(ChunkSaveClass & csave)
 {
-	if (((Header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK) != W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN) || 
-		 !(Header.VertexChannels & W3D_VERTEX_CHANNEL_BONEID) || 
+	if (((Header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK) != W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN) ||
+		 !(Header.VertexChannels & W3D_VERTEX_CHANNEL_BONEID) ||
 		 (VertInfluences == NULL)) {
 		return 0;
 	}
@@ -1211,12 +1211,12 @@ int MeshSaveClass::write_vert_influences(ChunkSaveClass & csave)
 	if (!csave.Begin_Chunk(W3D_CHUNK_VERTEX_INFLUENCES)) {
 		return 1;
 	}
-	
+
 	int count = Builder.Get_Vertex_Count();
 	if (csave.Write(VertInfluences,count * sizeof(W3dVertInfStruct)) != count * sizeof(W3dVertInfStruct)) {
 		return 1;
 	}
-	
+
 	if (!csave.End_Chunk()) {
 		return 1;
 	}
@@ -1255,7 +1255,7 @@ int MeshSaveClass::write_triangles(ChunkSaveClass & csave)
 		tri.Vindex[0] =			face.VertIdx[0];
 		tri.Vindex[1] = 			face.VertIdx[1];
 		tri.Vindex[2] = 			face.VertIdx[2];
-		
+
 		tri.Attributes =			face.SurfaceType;
 		tri.Normal.X = 			face.Normal.X;
 		tri.Normal.Y = 			face.Normal.Y;
@@ -1265,7 +1265,7 @@ int MeshSaveClass::write_triangles(ChunkSaveClass & csave)
 		// write each triangle
 		if (csave.Write(&tri,sizeof(W3dTriStruct)) != sizeof(W3dTriStruct)) {
 			return 1;
-		} 
+		}
 	}
 
 	if (!csave.End_Chunk()) {
@@ -1278,17 +1278,17 @@ int MeshSaveClass::write_triangles(ChunkSaveClass & csave)
 int MeshSaveClass::write_vert_shade_indices(ChunkSaveClass & csave)
 {
 	if (!(Header.VertexChannels & W3D_VERTEX_CHANNEL_NORMAL)) return 0;
-	
+
 	if (!csave.Begin_Chunk(W3D_CHUNK_VERTEX_SHADE_INDICES)) {
 		return 1;
 	}
-	
+
 	for (int i=0; i < Builder.Get_Vertex_Count(); i++) {
 
 		const MeshBuilderClass::VertClass & vert = Builder.Get_Vertex(i);
 
 		uint32 shade_index = vert.ShadeIndex;
-		
+
 		if (csave.Write(&(shade_index),sizeof(shade_index)) != sizeof(shade_index)) {
 			return 1;
 		}
@@ -1333,9 +1333,9 @@ int MeshSaveClass::write_vertex_materials(ChunkSaveClass & csave)
 	}
 
 	for (int i=0; i<MaterialDesc.Vertex_Material_Count(); i++) {
-		
+
 		csave.Begin_Chunk(W3D_CHUNK_VERTEX_MATERIAL);
-		
+
 		// write the filename
 		const char * name = MaterialDesc.Get_Vertex_Material_Name(i);
 		if (name != NULL) {
@@ -1384,7 +1384,7 @@ int MeshSaveClass::write_vertex_materials(ChunkSaveClass & csave)
 int MeshSaveClass::write_shaders(ChunkSaveClass & csave)
 {
 	assert(MaterialDesc.Shader_Count() > 0);
-	
+
 	if (PS2Material == TRUE) {
 
 		// Make the PC shader as close to the PS2 shader as possible.
@@ -1443,13 +1443,13 @@ int MeshSaveClass::write_ps2_shaders(ChunkSaveClass & csave)
 		// Write out the PS2 native form.
 		switch (W3d_Shader_Get_Depth_Compare(shader))
 		{
-			case PSS_DEPTHCOMPARE_PASS_NEVER: 
+			case PSS_DEPTHCOMPARE_PASS_NEVER:
 				ps2shader.DepthCompare = 0;
 				break;
 			case PSS_DEPTHCOMPARE_PASS_LESS:
 				ps2shader.DepthCompare = 3;
 				break;
-			case PSS_DEPTHCOMPARE_PASS_ALWAYS:	
+			case PSS_DEPTHCOMPARE_PASS_ALWAYS:
 				ps2shader.DepthCompare = 1;
 				break;
 			case PSS_DEPTHCOMPARE_PASS_LEQUAL:
@@ -1507,10 +1507,10 @@ void MeshSaveClass::setup_PC_shaders_from_PS2_shaders()
 			case PSS_DEPTHCOMPARE_PASS_NEVER:
 				W3d_Shader_Set_Depth_Compare(shader, W3DSHADER_DEPTHCOMPARE_PASS_NEVER);
 				break;
-			case PSS_DEPTHCOMPARE_PASS_LESS:			
+			case PSS_DEPTHCOMPARE_PASS_LESS:
 				W3d_Shader_Set_Depth_Compare(shader, W3DSHADER_DEPTHCOMPARE_PASS_LESS);
 				break;
-			case PSS_DEPTHCOMPARE_PASS_LEQUAL:				
+			case PSS_DEPTHCOMPARE_PASS_LEQUAL:
 				W3d_Shader_Set_Depth_Compare(shader, W3DSHADER_DEPTHCOMPARE_PASS_LEQUAL);
 				break;
 			case PSS_DEPTHCOMPARE_PASS_ALWAYS:
@@ -1548,11 +1548,11 @@ int MeshSaveClass::write_textures(ChunkSaveClass & csave)
 	}
 
 	for (int i=0; i<MaterialDesc.Texture_Count(); i++) {
-		
+
 		W3dMapClass * map = MaterialDesc.Get_Texture(i);
-		
+
 		csave.Begin_Chunk(W3D_CHUNK_TEXTURE);
-		
+
 		// write the filename
 		csave.Begin_Chunk(W3D_CHUNK_TEXTURE_NAME);
 		if (csave.Write(map->Filename,strlen(map->Filename) + 1) != strlen(map->Filename) + 1) return 1;
@@ -1600,7 +1600,7 @@ int MeshSaveClass::write_pass(ChunkSaveClass & csave,int pass)
 	for (int stage = 0; stage < MeshBuilderClass::MAX_STAGES; stage++) {
 		write_texture_stage(csave,pass,stage);
 	}
-	
+
 	if (!csave.End_Chunk()) {
 		return 1;
 	}
@@ -1626,7 +1626,7 @@ int MeshSaveClass::write_vertex_material_ids(ChunkSaveClass & csave,int pass)
 		matid = Builder.Get_Vertex(0).VertexMaterialIndex[pass];
 		if (csave.Write(&matid,sizeof(uint32)) != sizeof(uint32)) return 1;
 	}
-		
+
 	if (!csave.End_Chunk()) {
 		return 1;
 	}
@@ -1651,7 +1651,7 @@ int MeshSaveClass::write_shader_ids(ChunkSaveClass & csave,int pass)
 		shaderid = Builder.Get_Face(0).ShaderIndex[pass];
 		if (csave.Write(&shaderid,sizeof(uint32)) != sizeof(uint32)) return 1;
 	}
-		
+
 	if (!csave.End_Chunk()) {
 		return 1;
 	}
@@ -1695,7 +1695,7 @@ int MeshSaveClass::write_texture_stage(ChunkSaveClass & csave,int pass,int stage
 	if (!csave.Begin_Chunk(W3D_CHUNK_TEXTURE_STAGE)) {
 		return 1;
 	}
-	
+
 	write_texture_ids(csave,pass,stage);
 	write_texture_coords(csave,pass,stage);
 
@@ -1724,7 +1724,7 @@ int MeshSaveClass::write_texture_ids(ChunkSaveClass & csave,int pass,int stage)
 		texid = Builder.Get_Face(0).TextureIndex[pass][stage];
 		if (csave.Write(&texid,sizeof(uint32)) != sizeof(uint32)) return 1;
 	}
-		
+
 	if (!csave.End_Chunk()) {
 		return 1;
 	}
@@ -1744,7 +1744,7 @@ int MeshSaveClass::write_texture_coords(ChunkSaveClass & csave,int pass,int stag
 		W3dTexCoordStruct tex;
 		tex.U = Builder.Get_Vertex(i).TexCoord[pass][stage].X;
 		tex.V = Builder.Get_Vertex(i).TexCoord[pass][stage].Y;
-		
+
 		if (csave.Write(&(tex),sizeof(W3dTexCoordStruct)) != sizeof(W3dTexCoordStruct)) {
 			return 1;
 		}
@@ -1761,9 +1761,9 @@ int MeshSaveClass::write_aabtree(ChunkSaveClass & csave)
 	/*
 	** Don't bother with an AABTree if this not a normal mesh or if it has very few polygons
 	*/
-	if (	(Builder.Get_Face_Count() >= MIN_AABTREE_POLYGONS) && 
+	if (	(Builder.Get_Face_Count() >= MIN_AABTREE_POLYGONS) &&
 			((Header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK)  == W3D_MESH_FLAG_GEOMETRY_TYPE_NORMAL)
-		) 
+		)
 	{
 
 		/*
@@ -1773,7 +1773,7 @@ int MeshSaveClass::write_aabtree(ChunkSaveClass & csave)
 		int polycount = Builder.Get_Face_Count();
 		Vector3 * verts = new Vector3[vertcount];
 		Vector3i * polys = new Vector3i[polycount];
-		
+
 		for (int vi=0; vi<vertcount; vi++) {
 			verts[vi] = Builder.Get_Vertex(vi).Position;
 		}
@@ -1790,14 +1790,14 @@ int MeshSaveClass::write_aabtree(ChunkSaveClass & csave)
 		AABTreeBuilderClass aabtree_builder;
 		aabtree_builder.Build_AABTree(polycount,polys,vertcount,verts);
 		aabtree_builder.Export(csave);
-			
+
 		/*
 		** Release the allocated resources
 		*/
 		delete[] verts;
 		delete[] polys;
 	}
-	
+
 	return 0;
 }
 
@@ -1813,10 +1813,10 @@ int MeshSaveClass::scan_used_materials(Mesh & mesh,Mtl * nodemtl)
 		return 1;
 
 	} else {
-		
+
 		int sub_mtl_count = nodemtl->NumSubMtls();
 		MaterialRemapTable = new int[sub_mtl_count];
-		
+
 		// Initialize each remap to -1 (indicates that the material is un-used)
 		for (mat_index=0; mat_index<sub_mtl_count; mat_index++) {
 			MaterialRemapTable[mat_index] = -1;
@@ -1837,7 +1837,7 @@ int MeshSaveClass::scan_used_materials(Mesh & mesh,Mtl * nodemtl)
 				matcount++;
 			}
 		}
-		
+
 		assert(matcount > 0);
 		return matcount;
 	}
@@ -1879,11 +1879,11 @@ int MeshSaveClass::getNumSolidMaterials(Mtl * nodemtl)
 		if (isTexturedMaterial(nodemtl))
 			return 00;
 		return 1;
-	} 
+	}
 	else
 	{
 		int sub_mtl_count = nodemtl->NumSubMtls();
-	
+
 		for (mat_index=0; mat_index<sub_mtl_count; mat_index++)
 		{
 			if (MaterialRemapTable[mat_index] != -1)
@@ -1932,23 +1932,23 @@ void MeshSaveClass::fix_diffuse_materials(bool isHouseColor)
 	}
 }
 
-/*********************************************************************************************** 
- * MeshSaveClass::create_materials -- create the materials for this mesh                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshSaveClass::create_materials -- create the materials for this mesh                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *   2/8/99     GTH : modified to use the MaterialRemapTable                                   *
  *=============================================================================================*/
 void MeshSaveClass::create_materials(Mtl * nodemtl,DWORD wirecolor, char *materialColorTexture)
 {
 	bool domaps = !use_simple_rendering(Header.Attributes);
-	
+
 	//////////////////////////////////////////////////////////////////////
 	// Create materials
 	// Four cases:
@@ -1958,8 +1958,8 @@ void MeshSaveClass::create_materials(Mtl * nodemtl,DWORD wirecolor, char *materi
 	// - The material is a multi-material: create n materials
 	//////////////////////////////////////////////////////////////////////
 	int geo_type = Header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK;
-	if ((geo_type == W3D_MESH_FLAG_GEOMETRY_TYPE_AABOX) || 
-			(geo_type == W3D_MESH_FLAG_GEOMETRY_TYPE_OBBOX)) 
+	if ((geo_type == W3D_MESH_FLAG_GEOMETRY_TYPE_AABOX) ||
+			(geo_type == W3D_MESH_FLAG_GEOMETRY_TYPE_OBBOX))
 	{
 		Header.NumMaterials = 1;
 
@@ -2000,7 +2000,7 @@ void MeshSaveClass::create_materials(Mtl * nodemtl,DWORD wirecolor, char *materi
 
 		// Create a single material using the wire color
 		Header.NumMaterials = 1;
-	
+
 		W3dVertexMaterialStruct vmat;
 		W3dShaderStruct shader;
 		W3dMaterialClass material;
@@ -2060,7 +2060,7 @@ void MeshSaveClass::create_materials(Mtl * nodemtl,DWORD wirecolor, char *materi
 
 				name = nodemtl->GetSubMtl(mi)->GetName();
 				err = MaterialDesc.Add_Material(mat,name);
-				
+
 				if (err == W3dMaterialDescClass::INCONSISTENT_PASSES) {
 					sprintf(_string1,"Exporting Materials for Mesh: %s\nMaterial %s has %d passes.\nThe other materials have %d passes.\nAll Materials must have the same number of passes.\n",
 							Header.MeshName,
@@ -2091,17 +2091,17 @@ void MeshSaveClass::create_materials(Mtl * nodemtl,DWORD wirecolor, char *materi
 	Header.SortLevel = MaterialDesc.Get_Sort_Level();
 }
 
-/*********************************************************************************************** 
- * MeshSaveClass::compute_bounding_volumes -- computes a bounding box and bounding sphere for  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/01/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshSaveClass::compute_bounding_volumes -- computes a bounding box and bounding sphere for  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/01/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void MeshSaveClass::compute_bounding_volumes(void)
 {
@@ -2125,17 +2125,17 @@ void MeshSaveClass::compute_bounding_volumes(void)
 }
 
 
-/*********************************************************************************************** 
- * MeshSaveClass::compute_physical_properties -- computes the volume and moment of inertia     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/01/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshSaveClass::compute_physical_properties -- computes the volume and moment of inertia     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/01/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void MeshSaveClass::compute_physical_constants
 (
@@ -2148,7 +2148,7 @@ void MeshSaveClass::compute_physical_constants
 #if 0 // IF we need this again, move the data to a physics chunk (header doesn't have it anymore)
 
 	if (voxelize) {
-	
+
 		// Create an INodeList object for this mesh
 		AnyINodeFilter nodefilt;
 		INodeListClass meshlist(CurTime,&nodefilt);
@@ -2168,7 +2168,7 @@ void MeshSaveClass::compute_physical_constants
 		VoxelDebugWindowClass dbgwin(voxel);
  		dbgwin.Display_Window();
 #endif
-		
+
 		double vol[1];
 		double cm[3];
 		double inertia[9];
@@ -2217,23 +2217,23 @@ void MeshSaveClass::compute_physical_constants
 }
 
 
-/*********************************************************************************************** 
- * MeshSaveClass::prep_mesh -- pre-transform the MAX mesh by a specified matrix                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/01/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshSaveClass::prep_mesh -- pre-transform the MAX mesh by a specified matrix                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/01/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void MeshSaveClass::prep_mesh(Mesh & mesh,Matrix3 & objoff)
 {
 	int vert_index;
 
-	// Transform the mesh's vertices so that they are relative to the coordinate 
+	// Transform the mesh's vertices so that they are relative to the coordinate
 	// system that we want to use with the mesh
 	for (vert_index = 0; vert_index < mesh.getNumVerts (); vert_index++) {
 		mesh.verts[vert_index] = mesh.verts[vert_index] * objoff;
diff --git a/Core/Tools/WW3D/max2w3d/meshsave.h b/Core/Tools/WW3D/max2w3d/meshsave.h
index 073e5d9b6c0..db46e5549da 100644
--- a/Core/Tools/WW3D/max2w3d/meshsave.h
+++ b/Core/Tools/WW3D/max2w3d/meshsave.h
@@ -17,37 +17,32 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/meshsave.h 44    10/30/00 1:12p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G                                                 * 
- *                                                                                             * 
- *                    File Name : MESHSAVE.H                                                   * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/10/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 10, 1997 [GH]                                           * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G                                                 *
+ *                                                                                             *
+ *                    File Name : MESHSAVE.h                                                   *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/10/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 10, 1997 [GH]                                           *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MESHSAVE_H
-#define MESHSAVE_H
 
 #include "rawfile.h"	// have to include this before Max.h
 #include <max.h>
-#include "BITTYPE.H"
+#include "BITTYPE.h"
 #include "w3d_file.h"
 #include "chunkio.h"
-#include "PROGRESS.H"
+#include "PROGRESS.h"
 #include "nodelist.h"
 #include "util.h"
 #include "w3dmtl.h"
@@ -109,7 +104,7 @@ class MeshSaveClass
 	};
 
 	MeshSaveClass(
-			char *						mesh_name,	
+			char *						mesh_name,
 			char *						container_name,
 			INode *						inode,
 			const Mesh *				input_mesh,
@@ -130,7 +125,7 @@ class MeshSaveClass
 	int Write_To_File(ChunkSaveClass & csave,bool export_aabtrees = false);
 
 private:
-	
+
 	INode *								MaxINode;
 	W3DAppData2Struct &				ExportOptions;
 
@@ -153,7 +148,7 @@ class MeshSaveClass
 	int									PS2Material;
 
 private:
-	
+
 	// Use a MeshBuilderClass to process the mesh
 	void Build_Mesh(Mesh & mesh, Mtl *node_mtl, unsigned int *materialColors, int &numMaterialColors, int &numHouseColors);
 
@@ -171,7 +166,7 @@ class MeshSaveClass
 
 	// creating damage stages
 	void add_damage_stage(MeshSaveClass * damage_mesh);
-	
+
 	// methods used in building the wtm file
 	int write_header(ChunkSaveClass & csave);
 	int write_user_text(ChunkSaveClass & csave);
@@ -179,10 +174,10 @@ class MeshSaveClass
 	int write_verts(ChunkSaveClass & csave);
 	int write_vert_normals(ChunkSaveClass & csave);
 	int write_vert_influences(ChunkSaveClass & csave);
-	int write_vert_shade_indices(ChunkSaveClass & csave);	
-	
+	int write_vert_shade_indices(ChunkSaveClass & csave);
+
 	int write_triangles(ChunkSaveClass & csave);
-	
+
 	int write_material_info(ChunkSaveClass & csave);
 	int write_shaders(ChunkSaveClass & csave);
 	int write_vertex_materials(ChunkSaveClass & csave);
@@ -192,7 +187,7 @@ class MeshSaveClass
 	int write_vertex_material_ids(ChunkSaveClass & csave,int pass);
 	int write_shader_ids(ChunkSaveClass & csave,int pass);
 	int write_dcg(ChunkSaveClass & csave,int pass);
-	
+
 	int write_texture_stage(ChunkSaveClass & csave,int pass,int stage);
 	int write_texture_ids(ChunkSaveClass & csave,int pass,int stage);
 	int write_texture_coords(ChunkSaveClass & csave,int pass,int stage);
@@ -218,9 +213,3 @@ class MeshSaveClass
 
 	friend class DamageClass;
 };
-
-
-
-
-
-#endif /*MESHSAVE_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/motion.cpp b/Core/Tools/WW3D/max2w3d/motion.cpp
index e1cd3ec3d1b..c6877721475 100644
--- a/Core/Tools/WW3D/max2w3d/motion.cpp
+++ b/Core/Tools/WW3D/max2w3d/motion.cpp
@@ -17,34 +17,34 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/motion.cpp 26    10/30/00 6:56p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/motion.cpp                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/30/00 5:25p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 26                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   MotionClass::MotionClass -- constructor                                                   * 
- *   MotionClass::MotionClass -- constructor                                                   * 
- *   MotionClass::init -- initialize                                                           * 
- *   MotionClass::~MotionClass -- destructor                                                   * 
- *   MotionClass::compute_frame_motion -- compute the motion for a specified frame             * 
- *   MotionClass::set_motion_matrix -- save a motin matrix                                     * 
- *   MotionClass::get_motion_matrix -- retrieve a motion matrix                                * 
- *   MotionClass::set_eulers -- store euler angles                                             * 
- *   MotionClass::get_eulers -- retrieve euler angles                                          * 
- *   MotionClass::Save -- save the motion to a W3D file                                        * 
- *   MotionClass::save_header -- save the header                                               * 
- *   MotionClass::save_channels -- save the motion channels                                    * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/motion.cpp                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/30/00 5:25p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 26                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   MotionClass::MotionClass -- constructor                                                   *
+ *   MotionClass::MotionClass -- constructor                                                   *
+ *   MotionClass::init -- initialize                                                           *
+ *   MotionClass::~MotionClass -- destructor                                                   *
+ *   MotionClass::compute_frame_motion -- compute the motion for a specified frame             *
+ *   MotionClass::set_motion_matrix -- save a motin matrix                                     *
+ *   MotionClass::get_motion_matrix -- retrieve a motion matrix                                *
+ *   MotionClass::set_eulers -- store euler angles                                             *
+ *   MotionClass::get_eulers -- retrieve euler angles                                          *
+ *   MotionClass::Save -- save the motion to a W3D file                                        *
+ *   MotionClass::save_header -- save the header                                               *
+ *   MotionClass::save_channels -- save the motion channels                                    *
  *   MotionClass::set_visibility -- store a visibility bit                                     *
  *   MotionClass::get_visibility -- retrieve the visibility bit for this node:frame            *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
@@ -53,7 +53,7 @@
 #include "w3d_file.h"
 #include "vchannel.h"
 #include "bchannel.h"
-#include "EULER.H"
+#include "EULER.h"
 #include "util.h"
 #include "errclass.h"
 #include "w3dutil.h"
@@ -61,17 +61,17 @@
 
 
 
-/*********************************************************************************************** 
- * MotionClass::MotionClass -- constructor                                                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionClass::MotionClass -- constructor                                                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 MotionClass::MotionClass
 (
@@ -100,26 +100,26 @@ MotionClass::MotionClass
 	FrameRate(framerate),
 	Meter(meter),
 	Offset(offset)
-{		
-	
+{
+
 	ExportLog::printf("Initializing Capture....\n");
-   
+
 	init();
 
 	Set_W3D_Name(Name,name);
 }
 
-/*********************************************************************************************** 
- * MotionClass::MotionClass -- constructor                                                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionClass::MotionClass -- constructor                                                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 MotionClass::MotionClass
 (
@@ -148,26 +148,26 @@ MotionClass::MotionClass
 	FrameRate(framerate),
 	Meter(meter),
 	Offset(offset)
-{						
-	
+{
+
 	ExportLog::printf("Initializing Capture....\n");
 
 	init();
-   										
+
 	Set_W3D_Name(Name,name);
 }
 
-/*********************************************************************************************** 
- * MotionClass::init -- initialize                                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionClass::init -- initialize                                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void MotionClass::init(void)
 {
@@ -191,13 +191,13 @@ void MotionClass::init(void)
 	if (EulerDelta == NULL) {
 		throw (ErrorClass("Out of Memory"));
 	}
-	
+
 	for (i=0; i<BasePose->Num_Nodes(); i++) {
 		MotionMatrix[i] = new Matrix3[NumFrames];
 		if (MotionMatrix[i] == NULL) {
 			throw (ErrorClass("Out of Memory"));
 		}
-		
+
 		/*
 		** Initialize all of the matrices to identity.
 		*/
@@ -228,7 +228,7 @@ void MotionClass::init(void)
 	for (i=0; i<BasePose->Num_Nodes(); i++) {
 		VisData[i].Resize(NumFrames);
 
-		/* 
+		/*
 		** initialize to always visible
 		*/
 		for (j=0; j<NumFrames; j++) {
@@ -244,7 +244,7 @@ void MotionClass::init(void)
 	for (i=0; i<BasePose->Num_Nodes(); i++) {
 		BinMoveData[i].Resize(NumFrames);
 
-		/* 
+		/*
 		** initialize to always interpolate
 		*/
 		for (j=0; j<NumFrames; j++) {
@@ -280,17 +280,17 @@ void MotionClass::init(void)
 
 
 
-/*********************************************************************************************** 
- * MotionClass::~MotionClass -- destructor                                                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionClass::~MotionClass -- destructor                                                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 MotionClass::~MotionClass(void)
 {
@@ -316,34 +316,34 @@ MotionClass::~MotionClass(void)
 
 	if (BinMoveData) {
 		delete[] BinMoveData;
-	}		
-   
+	}
+
  	ExportLog::printf("Destroy Log..%d,%d,%d,%d, %s..\n",1,2,3,4,"go");
 
 }
 
 
-/*********************************************************************************************** 
- * MotionClass::compute_frame_motion -- compute the motion for a specified frame               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionClass::compute_frame_motion -- compute the motion for a specified frame               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void MotionClass::compute_frame_motion(int frame)
 {
 	/*
-	** Compute MAX's time value for this frame 
+	** Compute MAX's time value for this frame
 	** NOTE: the frame index passed in is the offset from StartFrame
 	** to get the original MAX frame number, we add StartFrame.
 	*/
 	TimeValue frametime = (StartFrame + frame) * GetTicksPerFrame();
-	
+
 	/*
 	** Create a hierarchy tree object for the scene at this frame
 	*/
@@ -354,7 +354,7 @@ void MotionClass::compute_frame_motion(int frame)
 	} else {
 		tree = new HierarchySaveClass(RootList,frametime,*Meter,"NoName",false,BasePose,Offset);
 	}
-		
+
 	if (tree == NULL) {
 		throw (ErrorClass("Out of memory!"));
 	}
@@ -380,7 +380,7 @@ void MotionClass::compute_frame_motion(int frame)
 			**
 			** What are the "fixup" matrices?  These are the transforms which
 			** were applied to the base pose when the user wanted to force the
-			** base pose to use only matrices with certain properties.  For 
+			** base pose to use only matrices with certain properties.  For
 			** example, if we wanted the base pose to use translations only,
 			** the fixup transform for each node is a transform which when
 			** multiplied by the real node's world transform, yeilds a pure
@@ -391,7 +391,7 @@ void MotionClass::compute_frame_motion(int frame)
 			Matrix3 basetm = BasePose->Get_Node_Relative_Transform(bindex);
 			Matrix3 thistm = tree->Get_Node_Relative_Transform(tindex);
 			INode *tree_node = tree->Get_Node(tindex);
-			
+
 			Matrix3 motion = thistm * Inverse(basetm);
 
 			motion = Cleanup_Orthogonal_Matrix(motion);
@@ -406,7 +406,7 @@ void MotionClass::compute_frame_motion(int frame)
 			float ey = my_eulers.Get_Angle(1);
 			float ez = my_eulers.Get_Angle(2);
 
-			set_eulers(bindex,frame,ex,ey,ez);							
+			set_eulers(bindex,frame,ex,ey,ez);
 
 			/*
 			** Store the visibility bit for this node
@@ -424,9 +424,9 @@ void MotionClass::compute_frame_motion(int frame)
 			// Store out binary move or not
 			//
 			bool binary_move = false;
-			  
+
          if ((node)&&(vis))  {
-         	
+
 	         if (frame != 0) {
 					// sample previous frame, and an inbetween time
 					// to determine if there's a binary movement
@@ -435,54 +435,54 @@ void MotionClass::compute_frame_motion(int frame)
 					TimeValue frametime_mid	 = (frametime + frametime_prev) / 2;
 
 					// if data at frametime_prev == data at frametime_mid and != data at frametime
-					// then we have a binary movement! 
-						
+					// then we have a binary movement!
+
                Control *c;
-               
+
                c = node->GetTMController()->GetPositionController();
-				
+
 					if (c) {
 
             		Interval iValid;
-               
+
 						Matrix3 smat1;	// sample matrix 1
 						Matrix3 smat2;	// sample matrix 2
 						Matrix3 smat3; // sample matrix 3
-               
+
 						iValid = FOREVER;
 						smat1  = node->GetParentTM(frametime_prev);
 						c->GetValue(frametime_prev, &smat1, iValid, CTRL_RELATIVE);
-               
+
 						iValid = FOREVER;
 						smat2  = node->GetParentTM(frametime_mid);
 						c->GetValue(frametime_mid, &smat2, iValid, CTRL_RELATIVE);
-               
+
 						iValid = FOREVER;
 						smat3  = node->GetParentTM(frametime);
 						c->GetValue(frametime, &smat3, iValid, CTRL_RELATIVE);
-               
+
 						if ((smat1 == smat2) && (!(smat2 == smat3))) {
                		binary_move = true;
 							DebugPrint(_T("Binary Move on Translation\n"));
-						}	
-               
+						}
+
 						if (false == binary_move)  {
-							c = node->GetTMController()->GetRotationController();   
-							 
+							c = node->GetTMController()->GetRotationController();
+
 							if (c) {
 
 								iValid = FOREVER;
 								smat1  = node->GetParentTM(frametime_prev);
 								c->GetValue(frametime_prev, &smat1, iValid, CTRL_RELATIVE);
-								
+
 								iValid = FOREVER;
 								smat2  = node->GetParentTM(frametime_mid);
 								c->GetValue(frametime_mid, &smat2, iValid, CTRL_RELATIVE);
-								
+
 								iValid = FOREVER;
 								smat3  = node->GetParentTM(frametime);
 								c->GetValue(frametime, &smat3, iValid, CTRL_RELATIVE);
-                  
+
 								if ((smat1 == smat2) && (!(smat2 == smat3)))  {
                   			binary_move = true;
 									DebugPrint(_T("Binary Move on Rotation\n"));
@@ -491,12 +491,12 @@ void MotionClass::compute_frame_motion(int frame)
 						}
 					}
 	         }
-         }  
-         				  
-                       
+         }
+
+
 			set_binary_movement(bindex, frame, binary_move);
-         
-		} // if(bindex!=-1)
+
+		}
 	}
 
 	/*
@@ -506,17 +506,17 @@ void MotionClass::compute_frame_motion(int frame)
 }
 
 
-/*********************************************************************************************** 
- * MotionClass::set_motion_matrix -- store a motion matrix                                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionClass::set_motion_matrix -- store a motion matrix                                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void MotionClass::set_motion_matrix(int node,int frame,const Matrix3 & motion)
 {
@@ -530,17 +530,17 @@ void MotionClass::set_motion_matrix(int node,int frame,const Matrix3 & motion)
 }
 
 
-/*********************************************************************************************** 
- * MotionClass::get_motion_matrix -- retrieve a motion matrix                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionClass::get_motion_matrix -- retrieve a motion matrix                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Matrix3 MotionClass::get_motion_matrix(int node,int frame)
 {
@@ -553,17 +553,17 @@ Matrix3 MotionClass::get_motion_matrix(int node,int frame)
 }
 
 
-/*********************************************************************************************** 
- * MotionClass::set_eulers -- store euler angles                                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionClass::set_eulers -- store euler angles                                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void MotionClass::set_eulers(int node,int frame, float x, float y, float z)
 {
@@ -579,7 +579,7 @@ void MotionClass::set_eulers(int node,int frame, float x, float y, float z)
 		double x2 = PI + x;
 		double y2 = PI - y;
 		double z2 = PI + z;
-				
+
  		if (x2 > PI) {
  			x2 = x2 - 2*PI;
  		}
@@ -610,7 +610,7 @@ void MotionClass::set_eulers(int node,int frame, float x, float y, float z)
 			z = z2;
 		}
 	}
-	
+
 	EulerDelta[node][frame].x = x;
 	EulerDelta[node][frame].y = y;
 	EulerDelta[node][frame].z = z;
@@ -618,17 +618,17 @@ void MotionClass::set_eulers(int node,int frame, float x, float y, float z)
 }
 
 
-/*********************************************************************************************** 
- * MotionClass::get_eulers -- retrieve euler angles                                            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionClass::get_eulers -- retrieve euler angles                                            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Point3 MotionClass::get_eulers(int node,int frame)
 {
@@ -715,17 +715,17 @@ bool MotionClass::get_binary_movement(int node,int frame)
 
 
 
-/*********************************************************************************************** 
- * MotionClass::Save -- save the motion to a W3D file                                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionClass::Save -- save the motion to a W3D file                                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool MotionClass::Save(ChunkSaveClass & csave)
 {
@@ -752,22 +752,22 @@ bool MotionClass::Save(ChunkSaveClass & csave)
 	if (!csave.End_Chunk()) {
 		return false;
 	}
-	
+
 	return true;
 }
 
 
-/*********************************************************************************************** 
- * MotionClass::save_header -- save the header                                                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionClass::save_header -- save the header                                                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool MotionClass::save_header(ChunkSaveClass & csave)
 {
@@ -787,9 +787,9 @@ bool MotionClass::save_header(ChunkSaveClass & csave)
 		aheader.NumFrames = NumFrames;
 		aheader.FrameRate = FrameRate;
 		aheader.Flavor    = CompressAnimationFlavor;	// for future expansion
-		
+
 		switch (CompressAnimationFlavor) {
-			
+
 			case ANIM_FLAVOR_TIMECODED:
 				ExportLog::printf("TimeCoded\n");
 				break;
@@ -810,7 +810,7 @@ bool MotionClass::save_header(ChunkSaveClass & csave)
 		}
 	}
 	else {
-		
+
 		ExportLog::printf("Non-Compressed.\n");
 
 		// Classic Non-Compressed Style
@@ -824,7 +824,7 @@ bool MotionClass::save_header(ChunkSaveClass & csave)
 		Set_W3D_Name(aheader.HierarchyName,BasePose->Get_Name());
 		aheader.NumFrames = NumFrames;
 		aheader.FrameRate = FrameRate;
-		
+
 		if (csave.Write(&aheader,sizeof(aheader)) != sizeof(aheader)) {
 			return false;
 		}
@@ -834,21 +834,21 @@ bool MotionClass::save_header(ChunkSaveClass & csave)
 		}
 	}
 
-	
+
 	return true;
 }
 
-/*********************************************************************************************** 
- * MotionClass::save_channels -- save the motion channels                                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionClass::save_channels -- save the motion channels                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool MotionClass::save_channels(ChunkSaveClass & csave)
 {
@@ -865,7 +865,7 @@ bool MotionClass::save_channels(ChunkSaveClass & csave)
 		** Just ignore this node if it didn't appear in the max scene.
 		*/
 		if (NodeValidFlags[nodeidx]) {
-			
+
 			float identity[] = { 0.0f,0.0f,0.0f,1.0f };
 
 			VectorChannelClass	xchan (nodeidx, NumFrames, ANIM_CHANNEL_X,  1, identity);
@@ -899,7 +899,7 @@ bool MotionClass::save_channels(ChunkSaveClass & csave)
 
 				Point3 old_tran = tm.GetTrans();
 				Quat old_rot(tm);
-				
+
 				Point3	tran;
 				Point3	scale;
 				Quat		rot;
@@ -932,19 +932,19 @@ bool MotionClass::save_channels(ChunkSaveClass & csave)
 				vec[0] = tran.z;
 				zchan.Set_Vector(frameidx,vec);
 
-				/* 
+				/*
 				** Build the x rotation channel
 				*/
 				vec[0] = eulers.x;
 				xrchan.Set_Vector(frameidx,vec);
 
-				/* 
+				/*
 				** Build the y rotation channel
 				*/
 				vec[0] = eulers.y;
 				yrchan.Set_Vector(frameidx,vec);
 
-				/* 
+				/*
 				** Build the z rotation channel
 				*/
 				vec[0] = eulers.z;
@@ -969,7 +969,7 @@ bool MotionClass::save_channels(ChunkSaveClass & csave)
 				//
 				binmovechan.Set_Bit(frameidx, get_binary_movement(nodeidx, frameidx));
 			}
-			
+
 			// If objects arn't visible, then the channel data may as well be empty
 
 			if (!vischan.Is_Empty()) {
diff --git a/Core/Tools/WW3D/max2w3d/motion.h b/Core/Tools/WW3D/max2w3d/motion.h
index 524bc2f8c10..071298737e6 100644
--- a/Core/Tools/WW3D/max2w3d/motion.h
+++ b/Core/Tools/WW3D/max2w3d/motion.h
@@ -17,28 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/motion.h 13    10/30/00 6:56p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/motion.h                       $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/30/00 5:25p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 13                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/motion.h                       $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/30/00 5:25p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 13                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef MOTION_H
-#define MOTION_H
-
+#pragma once
 
 #ifndef ALWAYS_H
 #include "always.h"
@@ -51,7 +48,7 @@
 #endif
 
 #ifndef PROGRESS_H
-#include "PROGRESS.H"
+#include "PROGRESS.h"
 #endif
 
 #ifndef CHUNKIO_H
@@ -59,7 +56,7 @@
 #endif
 
 #ifndef VECTOR_H
-#include "Vector.H"
+#include "Vector.h"
 #endif
 
 #ifndef LOGDLG_H
@@ -73,7 +70,7 @@ class MotionClass
 {
 public:
 
-	MotionClass	(	
+	MotionClass	(
 						IScene * scene,
 						INode * rootnode,
 						HierarchySaveClass * basepose,
@@ -86,7 +83,7 @@ class MotionClass
 																	// base object space (for damage animations)
 					);
 
-	MotionClass	(	
+	MotionClass	(
 						IScene * scene,
 						INodeListClass * rootlist,
 						HierarchySaveClass * basepose,
@@ -121,23 +118,23 @@ class MotionClass
 	int							CompressAnimationFlavor;
 	float							CompressAnimationTranslationError;
 	float							CompressAnimationRotationError;
-	
+
 	Progress_Meter_Class *	Meter;
 	char							Name[W3D_NAME_LEN];
 	Matrix3						Offset;
 
 	// 2D array of matrices, one per node per frame
 	Matrix3 * *					MotionMatrix;
-	
+
 	// 2D array of euler angles, one per node per frame
 	Point3 * *					EulerDelta;
-	
+
 	// Visibility bits, one bit per node per frame
 	BooleanVectorClass *		VisData;
 
 	// Movement bits, one bit per node per frame, to designate a movement as interpolated, or not
 	BooleanVectorClass *		BinMoveData;
-	
+
 	// flag for each node in the base pose, indicating
 	// whether the node actually appeard in the max scene
 	// being exported.
@@ -159,6 +156,3 @@ class MotionClass
 	void			init(void);
 
 };
-
-
-#endif /*MOTION_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/namedsel.cpp b/Core/Tools/WW3D/max2w3d/namedsel.cpp
index 0ea65bf8295..b3a831a9820 100644
--- a/Core/Tools/WW3D/max2w3d/namedsel.cpp
+++ b/Core/Tools/WW3D/max2w3d/namedsel.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/namedsel.cpp 4     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - WWSkin                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/namedsel.cpp                   $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/26/97 1:29p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 4                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - WWSkin                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/namedsel.cpp                   $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/26/97 1:29p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 4                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -108,10 +108,10 @@ NamedSelSetList& NamedSelSetList::operator=(NamedSelSetList& from)
 
 
 int NamedSelSetList::Find_Set(TSTR &setname)
-{	
+{
 	for (int i=0; i<Names.Count(); i++) {
 		if (setname == *Names[i]) {
-			return i;			
+			return i;
 		}
 	}
 	return -1;
@@ -125,7 +125,7 @@ IOResult NamedSelSetList::Save(ISave *isave)
 	for (int i=0; i<Sets.Count(); i++) {
 
 		isave->BeginChunk(NAMED_SEL_SET_CHUNK);
-		
+
 			isave->BeginChunk(NAMED_SEL_NAME_CHUNK);
 			isave->WriteWString(*Names[i]);
 			isave->EndChunk();
@@ -144,7 +144,7 @@ IOResult NamedSelSetList::Save(ISave *isave)
 IOResult NamedSelSetList::Load(ILoad *iload)
 {
 	IOResult res;
-		
+
 	while (IO_OK==(res=iload->OpenChunk())) {
 
 		switch (iload->CurChunkID())  {
@@ -152,7 +152,7 @@ IOResult NamedSelSetList::Load(ILoad *iload)
 			case NAMED_SEL_SET_CHUNK:
 				res = Load_Set(iload);
 				break;
-			
+
 			default:
 				assert(0);
 				break;
@@ -174,12 +174,12 @@ IOResult NamedSelSetList::Load_Set(ILoad * iload)
 	BOOL gotname = FALSE;
 
 	res = iload->OpenChunk();
-		
+
 	while (IO_OK==(res=iload->OpenChunk())) {
 
 		switch (iload->CurChunkID())  {
 
-			case NAMED_SEL_BITS_CHUNK: 
+			case NAMED_SEL_BITS_CHUNK:
 			{
 				res = set.Load(iload);
 				gotset = TRUE;
@@ -199,6 +199,6 @@ IOResult NamedSelSetList::Load_Set(ILoad * iload)
 
 	assert(gotset && gotname);
 	Append_Set(set,TSTR(name));
-	
+
 	return IO_OK;
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/WW3D/max2w3d/namedsel.h b/Core/Tools/WW3D/max2w3d/namedsel.h
index e2e46c1fd34..28c7c71becc 100644
--- a/Core/Tools/WW3D/max2w3d/namedsel.h
+++ b/Core/Tools/WW3D/max2w3d/namedsel.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/namedsel.h 4     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - WWSkin                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/namedsel.h                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/21/97 2:05p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 4                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - WWSkin                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/namedsel.h                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/21/97 2:05p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 4                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef NAMEDSEL_H
-#define NAMEDSEL_H
-
+#pragma once
 
 #include "max.h"
 
@@ -48,27 +46,27 @@
 ** It is basically a dynamically sized array
 ** of bitarrays.
 */
-class NamedSelSetList 
+class NamedSelSetList
 {
 public:
 	Tab<BitArray*>			Sets;
 	Tab<TSTR*>				Names;
-	
+
 	~NamedSelSetList();
 
 	BitArray & operator[](int i) { return *Sets[i]; }
 	int Count() { return Sets.Count(); }
-	
+
 	int  Find_Set(TSTR & setname);
 	void Delete_Set(int i);
 	void Delete_Set(TSTR & setname);
 	void Reset(void);
 	void Append_Set(BitArray & nset,TSTR & setname);
-	
+
 	IOResult Load(ILoad * iload);
 	IOResult Save(ISave * isave);
 	IOResult Load_Set(ILoad * iload);
-	
+
 	void Set_Size(int size);
 	NamedSelSetList & operator=(NamedSelSetList & from);
 
@@ -78,6 +76,3 @@ class NamedSelSetList
 		NAMED_SEL_NAME_CHUNK =	0x0023
 	};
 };
-
-
-#endif /*NAMEDSEL_H*/
diff --git a/Core/Tools/WW3D/max2w3d/nullsave.h b/Core/Tools/WW3D/max2w3d/nullsave.h
index 0d4f6d984f1..8a433d98196 100644
--- a/Core/Tools/WW3D/max2w3d/nullsave.h
+++ b/Core/Tools/WW3D/max2w3d/nullsave.h
@@ -34,19 +34,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef NULLSAVE_H
-#define NULLSAVE_H
-
 
 #include <max.h>
 #include "w3d_file.h"
 #include "chunkio.h"
-#include "PROGRESS.H"
+#include "PROGRESS.h"
 
 
 /*******************************************************************************************
@@ -63,19 +56,14 @@ class NullSaveClass
 		EX_CANCEL = 1
 	};
 
-	NullSaveClass(				char *						mesh_name,	
+	NullSaveClass(				char *						mesh_name,
 									char *						container_name,
 									Progress_Meter_Class &	meter);
 
 	int Write_To_File(ChunkSaveClass & csave);
 
 private:
-	
-	W3dNullObjectStruct		NullData;				
-	
-};
 
+	W3dNullObjectStruct		NullData;
 
-
-
-#endif //NULLSAVE_H
+};
diff --git a/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.cpp b/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.cpp
index 4ec3ff0672a..1c420590cd7 100644
--- a/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.cpp
+++ b/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.cpp
@@ -204,9 +204,9 @@ PresetExportOptionsDialogClass::Pane_Message_Proc
 	switch (message)
 	{
 		case WM_CUSTEDIT_ENTER:
-			
+
 			switch (wparam)
-			{				
+			{
 				case IDC_RANGE_LOW_EDIT:
 				{
 					//
@@ -246,17 +246,17 @@ PresetExportOptionsDialogClass::Pane_Message_Proc
 
 						Update_Controls ();
 					}
-				}	
+				}
 				break;
 			}
-			
+
 			break;
 
 		case CC_SPINNER_BUTTONUP:
 		{
 			ISpinnerControl *spin_ctrl = (ISpinnerControl *)lparam;
 			if (spin_ctrl != NULL) {
-			
+
 				switch (LOWORD (wparam))
 				{
 					//
@@ -289,7 +289,7 @@ PresetExportOptionsDialogClass::Pane_Message_Proc
 
 						Update_Controls ();
 						break;
-				}				
+				}
 			}
 		}
 		break;
@@ -302,29 +302,29 @@ PresetExportOptionsDialogClass::Pane_Message_Proc
 			switch (LOWORD (wparam))
 			{
 				case IDC_EXPORT_MESH_SMOOTH_CHECK:
-					Options->SmoothBetweenMeshes = (SendMessage (control_wnd, BM_GETCHECK, 0, 0L) == 1); 
+					Options->SmoothBetweenMeshes = (SendMessage (control_wnd, BM_GETCHECK, 0, 0L) == 1);
 					break;
 
 				case IDC_EXPORT_MESH_AABTREES:
-					Options->DisableExportAABTrees = (SendMessage (control_wnd, BM_GETCHECK, 0, 0L) != 1); 
+					Options->DisableExportAABTrees = (SendMessage (control_wnd, BM_GETCHECK, 0, 0L) != 1);
 					break;
 
 #if 0
 				case IDC_EXPORT_MESH_OPTIMIZE:
-					Options->EnableOptimizeMeshData = (SendMessage (control_wnd, BM_GETCHECK, 0, 0L) == 1); 
+					Options->EnableOptimizeMeshData = (SendMessage (control_wnd, BM_GETCHECK, 0, 0L) == 1);
 					break;
 #endif
 
 				case IDC_USE_SKELETON_CHECK:
-					Options->LoadHierarchy = (SendMessage (control_wnd, BM_GETCHECK, 0, 0L) == 1); 
+					Options->LoadHierarchy = (SendMessage (control_wnd, BM_GETCHECK, 0, 0L) == 1);
 					break;
 
 				case IDC_COMPRESS_ANIMATION_CHECK:
-					Options->CompressAnimation = (SendMessage (control_wnd, BM_GETCHECK, 0, 0L) == 1); 
+					Options->CompressAnimation = (SendMessage (control_wnd, BM_GETCHECK, 0, 0L) == 1);
 					break;
 
 				case IDC_WHT_BROWSE_BUTTON:
-				{					
+				{
 					OPENFILENAME ofn		= { sizeof (OPENFILENAME), 0 };
 					ofn.lpstrFilter		= BROWSE_FILTER;
 					ofn.nMaxFile			= _MAX_PATH;
@@ -342,7 +342,7 @@ PresetExportOptionsDialogClass::Pane_Message_Proc
 						//
 						Create_Relative_Path (Options->RelativeHierarchyFilename,
 														W3dExportClass::CurrentExportPath,
-														ofn.lpstrFile);						
+														ofn.lpstrFile);
 					}
 				}
 				break;
@@ -359,7 +359,7 @@ PresetExportOptionsDialogClass::Pane_Message_Proc
 				break;
 
 				case IDC_EXPORT_MESH_MAT_TO_TEXTURE:
-					Options->EnableMaterialColorToTextureConversion = (SendMessage (control_wnd, BM_GETCHECK, 0, 0L) == 1); 
+					Options->EnableMaterialColorToTextureConversion = (SendMessage (control_wnd, BM_GETCHECK, 0, 0L) == 1);
 					break;
 
 				default:
@@ -491,7 +491,7 @@ void
 PresetExportOptionsDialogClass::Show_Settings_Pane (int pane_id)
 {
 	if (pane_id != CurrentPane) {
-		
+
 		//
 		//	Show the new pane and hide the old pane
 		//
@@ -532,7 +532,7 @@ PresetExportOptionsDialogClass::Create_Settings_Panes (void)
 	PaneWnds[PANE_MESH] = ::CreateDialogParam (AppInstance, MAKEINTRESOURCE (IDD_EXPORT_PANE_MESH),
 																Wnd, Settings_Pane_Message_Proc, (LPARAM)this);
 
-	
+
 	//
 	//	Get the position and size of the group box the settings panes will be
 	// displayed inside
@@ -552,7 +552,7 @@ PresetExportOptionsDialogClass::Create_Settings_Panes (void)
 
 		//
 		//	Get the size of this pane
-		//	
+		//
 		RECT rect = { 0 };
 		::GetWindowRect (pane_wnd, &rect);
 
@@ -584,7 +584,7 @@ PresetExportOptionsDialogClass::Destroy_Settings_Panes (void)
 		::DestroyWindow (PaneWnds[index]);
 		PaneWnds[index] = NULL;
 	}
-		
+
 	return ;
 }
 
@@ -613,7 +613,7 @@ PresetExportOptionsDialogClass::Determine_Preset_Type (void)
 	} else if (Options->ExportGeometry == false) {
 
 		if (Options->ExportAnimation == false) {
-			
+
 			//
 			//	Select the skeleton UI
 			//
@@ -627,7 +627,7 @@ PresetExportOptionsDialogClass::Determine_Preset_Type (void)
 			Show_Settings_Pane (PANE_ANIM);
 			SendDlgItemMessage (Wnd, IDC_ANIM_RADIO, BM_SETCHECK, (WPARAM)TRUE, 0L);
 		}
-	
+
 	} else if (Options->ExportHierarchy == false && Options->LoadHierarchy == false) {
 
 		//
@@ -650,7 +650,7 @@ PresetExportOptionsDialogClass::Determine_Preset_Type (void)
 		//	Select the HLOD anim UI
 		//
 		Show_Settings_Pane (PANE_ANIM_HLOD);
-		SendDlgItemMessage (Wnd, IDC_ANIM_HLOD_RADIO, BM_SETCHECK, (WPARAM)TRUE, 0L);	
+		SendDlgItemMessage (Wnd, IDC_ANIM_HLOD_RADIO, BM_SETCHECK, (WPARAM)TRUE, 0L);
 	}
 
 	return ;
@@ -677,7 +677,7 @@ PresetExportOptionsDialogClass::Initialize_Controls (void)
 	int startframe		= MaxInterface->GetAnimRange ().Start () / ticksperframe;
 	int endframe		= MaxInterface->GetAnimRange ().End () / ticksperframe;
 
-	// 
+	//
 	// Clamp the real options the same way the displayed values are clamped
 	//
 	if (startframe > Options->StartFrame) {
@@ -759,7 +759,7 @@ PresetExportOptionsDialogClass::Update_Controls (void)
 			//
 			// Honor the relative path if it is present
 			//
-			if (Options->RelativeHierarchyFilename[0] != 0) {			
+			if (Options->RelativeHierarchyFilename[0] != 0) {
 				SetWindowText (skeleten_browse_btn, Options->RelativeHierarchyFilename);
 				::Create_Full_Path (Options->HierarchyFilename,
 											W3dExportClass::CurrentExportPath,
@@ -817,7 +817,7 @@ PresetExportOptionsDialogClass::Save_Settings (void)
 	//	Force settings that certain preset types need
 	//
 	if (::IsDlgButtonChecked (Wnd, IDC_TERRAIN_RADIO)) {
-		
+
 		//
 		//	Force some settings for the "Renegade Terrain" preset
 		//
@@ -843,7 +843,7 @@ PresetExportOptionsDialogClass::Save_Settings (void)
 		Options->ReduceAnimation			= false;
 		Options->EnableTerrainMode			= false;
 		Options->EnableOptimizeMeshData	= false;
-		Options->DisableExportAABTrees	= true;		
+		Options->DisableExportAABTrees	= true;
 		Options->SmoothBetweenMeshes		= false;
 		Options->EnableTerrainMode			= false;
 		Options->EnableMaterialColorToTextureConversion = false;
@@ -892,7 +892,7 @@ PresetExportOptionsDialogClass::Save_Settings (void)
 		Options->ExportGeometry				= false;
 		Options->EnableTerrainMode			= false;
 		Options->EnableOptimizeMeshData	= false;
-		Options->DisableExportAABTrees	= true;		
+		Options->DisableExportAABTrees	= true;
 		Options->SmoothBetweenMeshes		= false;
 		Options->EnableMaterialColorToTextureConversion = false;
 	}
@@ -908,7 +908,7 @@ PresetExportOptionsDialogClass::Save_Settings (void)
 	if (::memcmp (Options, &OrigOptions, sizeof (OrigOptions)) != 0) {
 		SetSaveRequiredFlag (true);
 	}
-		
+
 	return ;
 }
 
diff --git a/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h b/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h
index 10136c8e4df..96fa0d295b6 100644
--- a/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h
+++ b/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h
@@ -36,9 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef __PRESET_EXPORT_OPTIONS_DIALOG_H
-#define __PRESET_EXPORT_OPTIONS_DIALOG_H
+#pragma once
 
 #include <windows.h>
 #include <max.h>
@@ -63,8 +61,8 @@ class PresetExportOptionsDialogClass
 
 	//////////////////////////////////////////////////////////////////
 	//	Public methods
-	//////////////////////////////////////////////////////////////////		
-	
+	//////////////////////////////////////////////////////////////////
+
 	void			Set_Options (W3dExportOptionsStruct *options)	{ Options = options; ::memcpy (&OrigOptions, Options, sizeof (OrigOptions)); }
 	int			Do_Modal (void);
 
@@ -73,7 +71,7 @@ class PresetExportOptionsDialogClass
 	//////////////////////////////////////////////////////////////////
 	//	Private data types
 	//////////////////////////////////////////////////////////////////
-	
+
 	enum
 	{
 		PANE_HLOD			= 0,
@@ -91,7 +89,7 @@ class PresetExportOptionsDialogClass
 	//////////////////////////////////////////////////////////////////
 	static BOOL CALLBACK	Real_Message_Proc (HWND wnd, UINT message, WPARAM wparam, LPARAM lparam);
 	static BOOL CALLBACK	Settings_Pane_Message_Proc (HWND wnd, UINT message, WPARAM wparam, LPARAM lparam);
-	
+
 	//////////////////////////////////////////////////////////////////
 	//	Private methods
 	//////////////////////////////////////////////////////////////////
@@ -118,7 +116,3 @@ class PresetExportOptionsDialogClass
 	HWND								PaneWnds[PANE_MAX];
 	int								CurrentPane;
 };
-
-
-#endif //__PRESET_EXPORT_OPTIONS_DIALOG_H
-
diff --git a/Core/Tools/WW3D/max2w3d/rcmenu.cpp b/Core/Tools/WW3D/max2w3d/rcmenu.cpp
index d58dd59852f..2c8223e5d00 100644
--- a/Core/Tools/WW3D/max2w3d/rcmenu.cpp
+++ b/Core/Tools/WW3D/max2w3d/rcmenu.cpp
@@ -17,26 +17,26 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/rcmenu.cpp 6     4/19/00 12:24p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/rcmenu.cpp                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 4/18/00 8:26p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 6                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   RCMenuClass::Init -- initialize the "right-click" menu                                    * 
- *   RCMenuClass::Selected -- menu selection callback                                          * 
- *   RCMenuClass::Toggle_Hierarchy -- toggle the "export hierarchy" option                     * 
- *   RCMenuClass::Toggle_Geometry -- toggle the "export geometry" option                       * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/rcmenu.cpp                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 4/18/00 8:26p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 6                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   RCMenuClass::Init -- initialize the "right-click" menu                                    *
+ *   RCMenuClass::Selected -- menu selection callback                                          *
+ *   RCMenuClass::Toggle_Hierarchy -- toggle the "export hierarchy" option                     *
+ *   RCMenuClass::Toggle_Geometry -- toggle the "export geometry" option                       *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -47,17 +47,17 @@
 
 RCMenuClass TheRCMenu;
 
-/*********************************************************************************************** 
- * RCMenuClass::Init -- initialize the "right-click" menu                                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * RCMenuClass::Init -- initialize the "right-click" menu                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void RCMenuClass::Init(RightClickMenuManager* manager, HWND hWnd, IPoint2 m)
 {
@@ -66,7 +66,7 @@ void RCMenuClass::Init(RightClickMenuManager* manager, HWND hWnd, IPoint2 m)
 	SelNode = InterfacePtr->PickNode(hWnd,m);
 
 	if (SelNode) {
-		
+
 		UINT menuflags;
 		W3DAppData2Struct * wdata = W3DAppData2Struct::Get_App_Data(SelNode);
 
@@ -92,17 +92,17 @@ void RCMenuClass::Init(RightClickMenuManager* manager, HWND hWnd, IPoint2 m)
 		** Add the hierarchy menu option
 		*/
 		if (wdata->Is_Bone()) {
-			menuflags = MF_STRING | MF_CHECKED;	
+			menuflags = MF_STRING | MF_CHECKED;
 		} else {
 			menuflags = MF_STRING;
 		}
 		manager->AddMenu(this, menuflags, MENU_TOGGLE_HIERARCHY, "W3D: Export Hierarchy");
-		
+
 		/*
 		** Add the geometry menu option
 		*/
 		if (wdata->Is_Geometry()) {
-			menuflags = MF_STRING | MF_CHECKED;	
+			menuflags = MF_STRING | MF_CHECKED;
 		} else {
 			menuflags = MF_STRING;
 		}
@@ -111,20 +111,20 @@ void RCMenuClass::Init(RightClickMenuManager* manager, HWND hWnd, IPoint2 m)
 	}
 }
 
-/*********************************************************************************************** 
- * RCMenuClass::Selected -- menu selection callback                                            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * RCMenuClass::Selected -- menu selection callback                                            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void RCMenuClass::Selected(UINT id)
-{	
+{
 	switch (id) {
 
 		case MENU_TOGGLE_HIERARCHY:
@@ -137,21 +137,21 @@ void RCMenuClass::Selected(UINT id)
 	}
 }
 
-/*********************************************************************************************** 
- * RCMenuClass::Toggle_Hierarchy -- toggle the "export hierarchy" option                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * RCMenuClass::Toggle_Hierarchy -- toggle the "export hierarchy" option                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void RCMenuClass::Toggle_Hierarchy(INode * node)
 {
-	
+
 	W3DAppData2Struct * wdata = W3DAppData2Struct::Get_App_Data(SelNode);
 	assert(wdata);
 
@@ -162,17 +162,17 @@ void RCMenuClass::Toggle_Hierarchy(INode * node)
 	}
 }
 
-/*********************************************************************************************** 
- * RCMenuClass::Toggle_Geometry -- toggle the "export geometry" option                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * RCMenuClass::Toggle_Geometry -- toggle the "export geometry" option                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void RCMenuClass::Toggle_Geometry(INode * node)
 {
diff --git a/Core/Tools/WW3D/max2w3d/rcmenu.h b/Core/Tools/WW3D/max2w3d/rcmenu.h
index 2468f0a5364..27a782c6d43 100644
--- a/Core/Tools/WW3D/max2w3d/rcmenu.h
+++ b/Core/Tools/WW3D/max2w3d/rcmenu.h
@@ -17,26 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/rcmenu.h 3     1/14/98 10:23a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/rcmenu.h                       $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 1/13/98 3:44p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/rcmenu.h                       $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 1/13/98 3:44p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef RCMENU_H
-#define RCMENU_H
+#pragma once
 
 #include "max.h"
 #include "dllmain.h"
@@ -72,9 +71,9 @@ class RCMenuClass : public RightClickMenu
 private:
 
 	Interface *				InterfacePtr;
-	W3DUtilityClass *		UtilityPtr; 
+	W3DUtilityClass *		UtilityPtr;
 	INode *					SelNode;
-	
+
 	enum {
 		MENU_SEPARATOR = 0,
 		MENU_TOGGLE_HIERARCHY,
@@ -85,5 +84,3 @@ class RCMenuClass : public RightClickMenu
 };
 
 extern RCMenuClass TheRCMenu;
-
-#endif
diff --git a/Core/Tools/WW3D/max2w3d/resource.h b/Core/Tools/WW3D/max2w3d/resource.h
index 5e6f6db367e..b277eb93ab6 100644
--- a/Core/Tools/WW3D/max2w3d/resource.h
+++ b/Core/Tools/WW3D/max2w3d/resource.h
@@ -429,7 +429,7 @@
 #define IDS_GRID_DIMENSION              60051
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        160
diff --git a/Core/Tools/WW3D/max2w3d/simpdib.cpp b/Core/Tools/WW3D/max2w3d/simpdib.cpp
index 65568b56463..1c06d62cfcc 100644
--- a/Core/Tools/WW3D/max2w3d/simpdib.cpp
+++ b/Core/Tools/WW3D/max2w3d/simpdib.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/simpdib.cpp                    $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/simpdib.cpp                    $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 10/14/97 3:07p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 3                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "simpdib.h"
@@ -75,7 +75,7 @@ SimpleDIBClass::SimpleDIBClass(HWND hwnd,int width,int height,PaletteClass & pal
 		Info->bmiColors[i].rgbRed =		(unsigned char)pal[i].Get_Red();
 		Info->bmiColors[i].rgbReserved =	0;
 	}
-	
+
 	// Create the DIB.
 	HDC hdc = GetDC(hwnd);
 	Handle = CreateDIBSection(hdc, Info, DIB_RGB_COLORS,(void**)&Pixels, NULL, 0);
@@ -96,13 +96,13 @@ SimpleDIBClass::SimpleDIBClass(HWND hwnd,int width,int height,PaletteClass & pal
 
 		// bottom-up DIB
         PixelBase = (Pixels + (Height - 1) * Width);
-        Pitch = -Pitch; 
+        Pitch = -Pitch;
 
     } else {
 
 		// top-down DIB
         PixelBase = Pixels;
-        Pitch = Pitch;    
+        Pitch = Pitch;
     }
 }
 
diff --git a/Core/Tools/WW3D/max2w3d/simpdib.h b/Core/Tools/WW3D/max2w3d/simpdib.h
index 107fd0e0d20..535446c851e 100644
--- a/Core/Tools/WW3D/max2w3d/simpdib.h
+++ b/Core/Tools/WW3D/max2w3d/simpdib.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/simpdib.h                      $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/simpdib.h                      $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 10/14/97 3:07p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 3                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef SIMPDIB_H
-#define SIMPDIB_H
+#pragma once
 
 #ifndef ALWAYS_H
 #include "always.h"
@@ -77,6 +76,3 @@ class SimpleDIBClass
 	int					Pitch;		// offset from DIBPixelBase to next row (can be negative for bottom-up DIBS)
 
 };
-
-
-#endif /*SIMPDIB_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/skin.cpp b/Core/Tools/WW3D/max2w3d/skin.cpp
index 9af2c07d978..044a219940b 100644
--- a/Core/Tools/WW3D/max2w3d/skin.cpp
+++ b/Core/Tools/WW3D/max2w3d/skin.cpp
@@ -77,7 +77,7 @@ ISpinnerControl *	SkinWSMObjectClass::BasePoseSpin = NULL;
 ** Class Descriptor for SkinWSMObjectClass
 **
 *******************************************************************************/
-class SkinWSMObjectClassDesc:public ClassDesc 
+class SkinWSMObjectClassDesc:public ClassDesc
 {
 public:
 
@@ -98,7 +98,7 @@ ClassDesc * Get_Skin_Obj_Desc() { return &_SkinWSMObjectDesc; }
 ** Class Descriptor for the SkinModifier
 **
 *******************************************************************************/
-class SkinModClassDesc:public ClassDesc 
+class SkinModClassDesc:public ClassDesc
 {
 public:
 
@@ -120,10 +120,10 @@ ClassDesc * Get_Skin_Mod_Desc() { return &_SkinModDesc; }
 **		SkinWSMObjectCreateCallback
 **		A class derived from CreateMouseCallBack to handle
 **		the user input during the creation phase of the SkinWSMObject.
-** 
+**
 *******************************************************************************/
-class SkinWSMObjectCreateCallBack : public CreateMouseCallBack 
-{	
+class SkinWSMObjectCreateCallBack : public CreateMouseCallBack
+{
 public:
 	int proc( ViewExp * vpt,int msg, int point, int flags, IPoint2 m, Matrix3 & mat)
 	{
@@ -131,7 +131,7 @@ class SkinWSMObjectCreateCallBack : public CreateMouseCallBack
 			Point3 pos = vpt->GetPointOnCP(m);
 			mat.IdentityMatrix();
 			mat.SetTrans(pos);
-			return CREATE_STOP;	
+			return CREATE_STOP;
 		}
 		return TRUE;
 	}
@@ -144,7 +144,7 @@ static SkinWSMObjectCreateCallBack _SkinCreateCB;
 **		SkinWSMObjectClass
 **
 *******************************************************************************/
-SkinWSMObjectClass::SkinWSMObjectClass() 
+SkinWSMObjectClass::SkinWSMObjectClass()
 {
 	/*
 	** Initialize class variables to default state!
@@ -157,20 +157,20 @@ SkinWSMObjectClass::SkinWSMObjectClass()
 	pblock = NULL;
 }
 
-SkinWSMObjectClass::~SkinWSMObjectClass(void) 
+SkinWSMObjectClass::~SkinWSMObjectClass(void)
 {
 	assert(!((InterfacePtr == NULL) && (SotHWND != NULL)));
 	if (SotHWND != NULL) {
-		InterfacePtr->UnRegisterDlgWnd(SotHWND);		
+		InterfacePtr->UnRegisterDlgWnd(SotHWND);
 		InterfacePtr->DeleteRollupPage(SotHWND);
-	  	SotHWND = NULL;				
+	  	SotHWND = NULL;
 	}
 
 	assert(!((InterfacePtr == NULL) && (SkeletonHWND != NULL)));
 	if (SkeletonHWND != NULL) {
-		InterfacePtr->UnRegisterDlgWnd(SkeletonHWND);		
+		InterfacePtr->UnRegisterDlgWnd(SkeletonHWND);
 		InterfacePtr->DeleteRollupPage(SkeletonHWND);
-	  	SkeletonHWND = NULL;				
+	  	SkeletonHWND = NULL;
 	}
 }
 
@@ -187,11 +187,11 @@ void SkinWSMObjectClass::BeginEditParams(IObjParam  *ip, ULONG flags,Animatable
 	** Install the "supports objects of type" rollup
 	*/
 	if (SotHWND == NULL) {
-		SotHWND = ip->AddRollupPage( 
-					AppInstance, 
+		SotHWND = ip->AddRollupPage(
+					AppInstance,
 					MAKEINTRESOURCE(IDD_SKIN_SOT),
 					_sot_dialog_proc,
-					Get_String(IDS_SOT), 
+					Get_String(IDS_SOT),
 					(LPARAM)InterfacePtr,
 					APPENDROLL_CLOSED);
 	} else {
@@ -202,11 +202,11 @@ void SkinWSMObjectClass::BeginEditParams(IObjParam  *ip, ULONG flags,Animatable
 	** Install the skeleton rollup
 	*/
 	if (SkeletonHWND == NULL) {
-		SkeletonHWND = InterfacePtr->AddRollupPage( 
-					AppInstance, 
+		SkeletonHWND = InterfacePtr->AddRollupPage(
+					AppInstance,
 					MAKEINTRESOURCE(IDD_SKELETON_PARAMETERS),
 					_skeleton_dialog_thunk,
-					Get_String(IDS_SKELETON_PARAMETERS), 
+					Get_String(IDS_SKELETON_PARAMETERS),
 					(LPARAM)this,
 					0);
 	} else {
@@ -225,18 +225,18 @@ void SkinWSMObjectClass::EndEditParams(IObjParam *ip, ULONG flags,Animatable *ne
 		** Remove the Sot rollup
 		*/
 		if (SotHWND != NULL) {
-			InterfacePtr->UnRegisterDlgWnd(SotHWND);		
+			InterfacePtr->UnRegisterDlgWnd(SotHWND);
 			InterfacePtr->DeleteRollupPage(SotHWND);
-	  		SotHWND = NULL;				
+	  		SotHWND = NULL;
 		}
-	
+
 		/*
 		** Remove the info rollup
 		*/
 		if (SkeletonHWND != NULL) {
-			InterfacePtr->UnRegisterDlgWnd(SkeletonHWND);		
+			InterfacePtr->UnRegisterDlgWnd(SkeletonHWND);
 			InterfacePtr->DeleteRollupPage(SkeletonHWND);
-	  		SkeletonHWND = NULL;				
+	  		SkeletonHWND = NULL;
 		}
 	}
 
@@ -251,7 +251,7 @@ RefTargetHandle SkinWSMObjectClass::Clone(RemapDir & remap)
 	/*
 	** create another SkinWSMObject and return it.
 	*/
-	SkinWSMObjectClass * sobj = new SkinWSMObjectClass();	
+	SkinWSMObjectClass * sobj = new SkinWSMObjectClass();
 	return(sobj);
 }
 
@@ -272,7 +272,7 @@ RefTargetHandle SkinWSMObjectClass::GetReference(int i)
 	return BoneTab[boneidx];
 }
 
-void SkinWSMObjectClass::SetReference(int i, RefTargetHandle rtarg) 
+void SkinWSMObjectClass::SetReference(int i, RefTargetHandle rtarg)
 {
 	if (i < SimpleWSMObject::NumRefs()) {
 		SimpleWSMObject::SetReference(i,rtarg);
@@ -282,7 +282,7 @@ void SkinWSMObjectClass::SetReference(int i, RefTargetHandle rtarg)
 		assert(boneidx < BoneTab.Count());
 		BoneTab[boneidx] = (INode *)rtarg;
 	}
-}		
+}
 
 RefResult SkinWSMObjectClass::NotifyRefChanged(Interval changeInt,RefTargetHandle hTarget,PartID& partID, RefMessage message)
 {
@@ -310,7 +310,7 @@ RefResult SkinWSMObjectClass::NotifyRefChanged(Interval changeInt,RefTargetHandl
 CreateMouseCallBack * SkinWSMObjectClass::GetCreateMouseCallBack(void)
 {
 	/*
-	** The "CreateMouseCallback" is used when creating the 
+	** The "CreateMouseCallback" is used when creating the
 	** object.  Since our object doesn't need an interactive
 	** creation phase, we return NULL.
 	*/
@@ -340,10 +340,10 @@ void SkinWSMObjectClass::BuildMesh(TimeValue t)
 	** we just use FOREVER.
 	*/
 	ivalid = FOREVER;
-	
+
 	/*
 	** Ok, this is the first time BuildMesh has been called.
-	** Create a mesh which will represent this space warp object in 
+	** Create a mesh which will represent this space warp object in
 	** in the max viewports.  Note that we are using the mesh
 	** member which is inherited from SimpleWSMObject.
 	*/
@@ -362,7 +362,7 @@ void SkinWSMObjectClass::BuildMesh(TimeValue t)
 	MeshBuilt = TRUE;
 }
 
-void SkinWSMObjectClass::Build_Tri(Face * f, int a,  int b, int c) 
+void SkinWSMObjectClass::Build_Tri(Face * f, int a,  int b, int c)
 {
 	f->setVerts(a, b, c);
 	f->setSmGroup(0);
@@ -384,7 +384,7 @@ void SkinWSMObjectClass::User_Picked_Bone(INode * node)
 		default:
 			assert(0);
 	}
-	
+
 	Set_Bone_Selection_Mode(BONE_SEL_MODE_NONE);
 	Update_Bone_List();
 }
@@ -413,7 +413,7 @@ void SkinWSMObjectClass::Set_Bone_Selection_Mode(int mode)
 {
 	assert(mode >= BONE_SEL_MODE_NONE);
 	assert(mode <= BONE_SEL_MODE_REMOVE_MANY);
-	
+
 	/*
 	** store the selection mode
 	*/
@@ -441,7 +441,7 @@ int SkinWSMObjectClass::Add_Bone(INode * node)
 
 	/*
 	** Otherwise, look for a NULL bone and we'll re-use
-	** its slot.  This happens when a user removes a bone or 
+	** its slot.  This happens when a user removes a bone or
 	** a bone in the scene is deleted.
 	*/
 	boneidx = Find_Bone(NULL);
@@ -450,12 +450,12 @@ int SkinWSMObjectClass::Add_Bone(INode * node)
 		MakeRefByID(FOREVER,refidx,node);
 		return boneidx;
 	}
-	
+
 	/*
-	** If we made it here, add the bone to the end of the 
+	** If we made it here, add the bone to the end of the
 	** reference array.
 	*/
-	BoneTab.Append(1,&node);		
+	BoneTab.Append(1,&node);
 	boneidx = BoneTab.Count() - 1;
 	refidx = To_Ref_Index(boneidx);
 	MakeRefByID(FOREVER,refidx,node);
@@ -575,7 +575,7 @@ int SkinWSMObjectClass::Find_Closest_Bone(const Point3 & vertex)
 	TimeValue basetime = Get_Base_Pose_Time();
 
 	for (int boneidx = 0; boneidx < BoneTab.Count(); boneidx++) {
-		
+
 		if (BoneTab[boneidx] == NULL) continue;
 
 		float bonedist = Bone_Distance(BoneTab[boneidx],basetime,vertex);
@@ -601,14 +601,14 @@ SkinModifierClass::SkinModifierClass(void)
 	Default_Init();
 }
 
-SkinModifierClass::SkinModifierClass(INode * node,SkinWSMObjectClass * skin_obj) 
+SkinModifierClass::SkinModifierClass(INode * node,SkinWSMObjectClass * skin_obj)
 {
 	Default_Init();
 
 	/*
 	** Make the reference to the space warp node.
 	*/
-	MakeRefByID(FOREVER,NODE_REF,node);	
+	MakeRefByID(FOREVER,NODE_REF,node);
 
 	/*
 	** Make reference to the WSMObject
@@ -621,7 +621,7 @@ void SkinModifierClass::Default_Init(void)
 {
 	SubObjSelLevel = VERTEX_SEL_LEVEL;
 	WSMObjectRef = NULL;
-	WSMNodeRef = NULL;	
+	WSMNodeRef = NULL;
 	InterfacePtr = NULL;
 
 	BoneInfluenceHWND = NULL;
@@ -649,7 +649,7 @@ void SkinModifierClass::BeginEditParams(IObjParam * ip, ULONG flags,Animatable *
 	** Grab a copy of the interface pointer
 	*/
 	InterfacePtr = ip;
-	
+
 	/*
 	** allocate the selection command mode for use in vertex selection
 	*/
@@ -662,7 +662,7 @@ void SkinModifierClass::BeginEditParams(IObjParam * ip, ULONG flags,Animatable *
 #if defined W3D_MAX4		//defined as in the project (.dsp)
 	InterfacePtr->SetSubObjectLevel(1);
 #else
-	//---This call is obsolete from version 4.   
+	//---This call is obsolete from version 4.
 	InterfacePtr->RegisterSubObjectTypes( ptype, 1);
 #endif
 	/*
@@ -691,13 +691,13 @@ void SkinModifierClass::EndEditParams(IObjParam *ip, ULONG flags,Animatable *nex
 	InterfacePtr->DeleteMode(SelectMode);
 	if (SelectMode ) delete SelectMode;
 	SelectMode = NULL;
-		
+
 	/*
 	** Remove the rollup window(s) if needed
 	*/
-	if (flags & END_EDIT_REMOVEUI) {		
+	if (flags & END_EDIT_REMOVEUI) {
 		Remove_Bone_Influence_Dialog();
-	} 
+	}
 
 	/*
 	** Make sure we don't hang onto an invalid interface
@@ -744,17 +744,17 @@ void SkinModifierClass::SetReference(int i, RefTargetHandle rtarg)
 	}
 }
 
-RefResult SkinModifierClass::NotifyRefChanged(Interval changeInt, RefTargetHandle hTarget, PartID& partID, RefMessage message) 
+RefResult SkinModifierClass::NotifyRefChanged(Interval changeInt, RefTargetHandle hTarget, PartID& partID, RefMessage message)
 {
 	switch (message) {
 
 		case REFMSG_TARGET_DELETED:
-	
+
 			/*
 			** This means the WSM node is being deleted. As a result,
-			** we must delete ourselves. 
+			** we must delete ourselves.
 			*/
-			DeleteMe();		// also deletes all refs and 
+			DeleteMe();		// also deletes all refs and
 								// sends REFMSG_TARGET_DELETED to all Dependents
 			return REF_STOP;
 	}
@@ -775,7 +775,7 @@ void SkinModifierClass::ModifyObject(TimeValue t, ModContext & mc, ObjectState *
 	** Get the skin data from the ModContext.
 	*/
 	SkinDataClass * skindata = (SkinDataClass *)mc.localData;
-	
+
 	/*
 	** If there is no skin data, allocate it
 	** Also, do an initial auto attach.
@@ -787,9 +787,9 @@ void SkinModifierClass::ModifyObject(TimeValue t, ModContext & mc, ObjectState *
 	if (!skindata->IsValid()) {
 		skindata->Validate(&triobj->mesh);
 	}
-	
+
 	/*
-	** If in vertex selection mode, tell the mesh to display the 
+	** If in vertex selection mode, tell the mesh to display the
 	** selected vertices and turn on vertex tick marks.  Otherwise
 	** make sure vertex tick marks are off.
 	*/
@@ -797,7 +797,7 @@ void SkinModifierClass::ModifyObject(TimeValue t, ModContext & mc, ObjectState *
 		triobj->mesh.vertSel = skindata->VertSel;
 		triobj->mesh.SetDispFlag(DISP_VERTTICKS|DISP_SELVERTS);
 
-		if (triobj->mesh.selLevel != MESH_VERTEX) {	
+		if (triobj->mesh.selLevel != MESH_VERTEX) {
 			triobj->mesh.selLevel = MESH_VERTEX;
 		}
 	} else {
@@ -815,7 +815,7 @@ void SkinModifierClass::ModifyObject(TimeValue t, ModContext & mc, ObjectState *
 		// issues - UI to set the weights, rebalance weights whenever
 		// a bone is deleted, should also then never get NULL bones
 		// and remove the need to check for NULL bones in this routine...
- 
+
 		/*
 		** Get a pointer to the bone that this vertex is attached to
 		*/
@@ -823,7 +823,7 @@ void SkinModifierClass::ModifyObject(TimeValue t, ModContext & mc, ObjectState *
 
 		int boneidx = inf->BoneIdx[0];
 		if ((boneidx != -1) && (boneidx < WSMObjectRef->Num_Bones())) {
-				
+
 			INode * bone = WSMObjectRef->Get_Bone(inf->BoneIdx[0]);
 
 			if (bone == NULL) {
@@ -832,9 +832,9 @@ void SkinModifierClass::ModifyObject(TimeValue t, ModContext & mc, ObjectState *
 				** clear this vert's bone influence index
 				*/
 				inf->BoneIdx[0] = -1;
-	
+
 			} else {
-					
+
 				/*
 				** Ok, got the bone, now transform the point and
 				** give it back to the mesh
@@ -843,7 +843,7 @@ void SkinModifierClass::ModifyObject(TimeValue t, ModContext & mc, ObjectState *
 				Matrix3 tm;
 
 				pnew = triobj->GetPoint(vidx);
-				
+
 				if (os->GetTM()) {
 					tm = *(os->GetTM());
 				} else {
@@ -851,12 +851,12 @@ void SkinModifierClass::ModifyObject(TimeValue t, ModContext & mc, ObjectState *
 				}
 
 				pnew = tm * pnew;
-								
+
 				TimeValue basetime = WSMObjectRef->Get_Base_Pose_Time();
 				Matrix3 basetm = bone->GetObjectTM(basetime);
 				Matrix3 curtm = bone->GetObjectTM(t);
 				pnew = (pnew * Inverse(basetm)) * curtm;
-				
+
 				pnew = Inverse(tm) * pnew;
 
 				triobj->SetPoint(vidx,pnew);
@@ -867,12 +867,12 @@ void SkinModifierClass::ModifyObject(TimeValue t, ModContext & mc, ObjectState *
 	/*
 	** Tell the object that points were changed
 	*/
-	triobj->PointsWereChanged();		
+	triobj->PointsWereChanged();
 
 	/*
 	** Set the validity of the updated geometry data
 	*/
-	triobj->UpdateValidity(GEOM_CHAN_NUM,Get_Validity(t));	
+	triobj->UpdateValidity(GEOM_CHAN_NUM,Get_Validity(t));
 }
 
 IOResult SkinModifierClass::Save(ISave * isave)
@@ -954,7 +954,7 @@ void SkinModifierClass::ActivateSubobjSel(int level, XFormModes & modes)
 	/*
 	** Set the appropriate command mode.  We only want selection.
 	*/
-	switch (SubObjSelLevel) 
+	switch (SubObjSelLevel)
 	{
 		case OBJECT_SEL_LEVEL:
 			Remove_Bone_Influence_Dialog();
@@ -970,9 +970,9 @@ void SkinModifierClass::ActivateSubobjSel(int level, XFormModes & modes)
 	** Put our named subobject selection sets into the drop down list
 	*/
 	Create_Named_Selection_Sets();
-	
+
 	/*
-	** Notify our dependents that the subselection type, 
+	** Notify our dependents that the subselection type,
 	** and the display have changed
 	*/
 	NotifyDependents(FOREVER, PART_SUBSEL_TYPE|PART_DISPLAY, REFMSG_CHANGE);
@@ -983,7 +983,7 @@ void SkinModifierClass::ActivateSubobjSel(int level, XFormModes & modes)
 	InterfacePtr->PipeSelLevelChanged();
 
 	/*
-	** Notify our dependents that the selection channel, 
+	** Notify our dependents that the selection channel,
 	** display attributes, and subselection type channels have changed
 	*/
 	NotifyDependents(FOREVER, SELECT_CHANNEL|DISP_ATTRIB_CHANNEL|SUBSEL_TYPE_CHANNEL, REFMSG_CHANGE);
@@ -991,13 +991,13 @@ void SkinModifierClass::ActivateSubobjSel(int level, XFormModes & modes)
 
 int SkinModifierClass::HitTest
 (
-	TimeValue		t, 
+	TimeValue		t,
 	INode *			inode,
-	int				type, 
-	int				crossing, 
-	int				flags, 
-	IPoint2 *		p, 
-	ViewExp *		vpt, 
+	int				type,
+	int				crossing,
+	int				flags,
+	IPoint2 *		p,
+	ViewExp *		vpt,
 	ModContext *	mc
 )
 {
@@ -1016,9 +1016,9 @@ int SkinModifierClass::HitTest
 	*/
 	GraphicsWindow *gw = vpt->getGW();
 	gw->setHitRegion(&hr);
-	gw->setTransform(mat);	
+	gw->setTransform(mat);
 	gw->setRndLimits(((savedLimits = gw->getRndLimits()) | GW_PICK) & ~GW_ILLUM);
-	
+
 	if (1 /*IgnoreBackfaces*/) {
 		gw->setRndLimits(gw->getRndLimits() |  GW_BACKCULL);
 	} else {
@@ -1031,17 +1031,17 @@ int SkinModifierClass::HitTest
 	** Do the hit test!
 	*/
 	SubObjHitList hitlist;
-	MeshSubHitRec * rec;	
-	
+	MeshSubHitRec * rec;
+
 	ObjectState os = inode->EvalWorldState(InterfacePtr->GetTime());
 	TriObject * tobj = Get_Tri_Object(InterfacePtr->GetTime(),os,valid,needsdel);
 	res = tobj->mesh.SubObjectHitTest(gw,gw->getMaterial(),&hr,flags | SUBHIT_VERTS,hitlist);
-	
+
 	/*
 	** Record all of the hits
 	*/
 	rec = hitlist.First();
-	while (rec) 
+	while (rec)
 	{
 		/*
 		** rec->index is the index of vertex which was hit!
@@ -1055,13 +1055,13 @@ int SkinModifierClass::HitTest
 	/*
 	** Cleanup
 	*/
-	gw->setRndLimits(savedLimits);	
-	
+	gw->setRndLimits(savedLimits);
+
 	if (needsdel) {
 		tobj->DeleteThis();
 	}
 
-	return res;	
+	return res;
 }
 
 void SkinModifierClass::SelectSubComponent(HitRecord *hitRec, BOOL selected, BOOL all, BOOL invert)
@@ -1070,12 +1070,12 @@ void SkinModifierClass::SelectSubComponent(HitRecord *hitRec, BOOL selected, BOO
 	int count = 0;
 
 	switch (SubObjSelLevel) {
-		
+
 		case VERTEX_SEL_LEVEL:
 
-			while (hitRec) {				
+			while (hitRec) {
 
-				skindata = (SkinDataClass *)hitRec->modContext->localData;				
+				skindata = (SkinDataClass *)hitRec->modContext->localData;
 
 				/*
 				** Undo/Redo functionality
@@ -1086,7 +1086,7 @@ void SkinModifierClass::SelectSubComponent(HitRecord *hitRec, BOOL selected, BOO
 				}
 				theHold.Accept(_T("Select Vertex"));
 #endif
-				
+
 				BitArray * array = &(skindata->VertSel);
 
 				if (all & invert) {
@@ -1103,7 +1103,7 @@ void SkinModifierClass::SelectSubComponent(HitRecord *hitRec, BOOL selected, BOO
 				} else {
 					array->Set(hitRec->hitInfo,selected);
 				}
-				
+
 				if (!all) break;
 				hitRec = hitRec->Next();
 			}
@@ -1120,17 +1120,17 @@ void SkinModifierClass::ClearSelection(int selLevel)
 	ModContextList mcList;
 	INodeTab nodes;
 
-	if (!InterfacePtr ) return;	
-	
+	if (!InterfacePtr ) return;
+
 	InterfacePtr->GetModContexts(mcList,nodes);
 	InterfacePtr->ClearCurNamedSelSet();
 
 	for (int i = 0; i < mcList.Count(); i++) {
 
 		SkinDataClass * skindata = (SkinDataClass *)mcList[i]->localData;
-		
-		if (skindata==NULL) continue;		
-		
+
+		if (skindata==NULL) continue;
+
 		ObjectState os = nodes[i]->EvalWorldState(InterfacePtr->GetTime());
 		TriObject * tobj = Get_Tri_Object(InterfacePtr->GetTime(),os,valid,needsdel);
 
@@ -1141,7 +1141,7 @@ void SkinModifierClass::ClearSelection(int selLevel)
 				return;
 #endif
 
-			case VERTEX_SEL_LEVEL:	
+			case VERTEX_SEL_LEVEL:
 #if 0 // undo/redo
 				if (theHold.Holding()) {
 					theHold.Put(new VertexSelRestore(meshData,this));
@@ -1156,7 +1156,7 @@ void SkinModifierClass::ClearSelection(int selLevel)
 			tobj->DeleteThis();
 		}
 	}
-	
+
 	/*
 	** Get rid of the temporary copies of the INodes.
 	*/
@@ -1176,17 +1176,17 @@ void SkinModifierClass::SelectAll(int selLevel)
 	ModContextList mclist;
 	INodeTab nodes;
 
-	if (!InterfacePtr) return;	
-	
+	if (!InterfacePtr) return;
+
 	InterfacePtr->GetModContexts(mclist,nodes);
 	InterfacePtr->ClearCurNamedSelSet();
 
 	for (int i = 0; i < mclist.Count(); i++) {
 
 		SkinDataClass * skindata = (SkinDataClass *)mclist[i]->localData;
-		
-		if (skindata==NULL) continue;		
-		
+
+		if (skindata==NULL) continue;
+
 		ObjectState os = nodes[i]->EvalWorldState(InterfacePtr->GetTime());
 		TriObject * tobj = Get_Tri_Object(InterfacePtr->GetTime(),os,valid,needsdel);
 
@@ -1196,7 +1196,7 @@ void SkinModifierClass::SelectAll(int selLevel)
 				assert(0);
 				return;
 
-			case VERTEX_SEL_LEVEL:	
+			case VERTEX_SEL_LEVEL:
 #if 0 // undo/redo
 				if (theHold.Holding()) {
 					theHold.Put(new VertexSelRestore(meshData,this));
@@ -1211,7 +1211,7 @@ void SkinModifierClass::SelectAll(int selLevel)
 			tobj->DeleteThis();
 		}
 	}
-	
+
 	/*
 	** Get rid of the temporary copies of the INodes.
 	*/
@@ -1230,17 +1230,17 @@ void SkinModifierClass::InvertSelection(int selLevel)
 	ModContextList mclist;
 	INodeTab nodes;
 
-	if (!InterfacePtr) return;	
-	
+	if (!InterfacePtr) return;
+
 	InterfacePtr->GetModContexts(mclist,nodes);
 	InterfacePtr->ClearCurNamedSelSet();
 
 	for (int i = 0; i < mclist.Count(); i++) {
 
 		SkinDataClass * skindata = (SkinDataClass *)mclist[i]->localData;
-		
-		if (skindata==NULL) continue;		
-		
+
+		if (skindata==NULL) continue;
+
 		ObjectState os = nodes[i]->EvalWorldState(InterfacePtr->GetTime());
 		TriObject * tobj = Get_Tri_Object(InterfacePtr->GetTime(),os,valid,needsdel);
 
@@ -1250,7 +1250,7 @@ void SkinModifierClass::InvertSelection(int selLevel)
 				assert(0);
 				return;
 
-			case VERTEX_SEL_LEVEL:	
+			case VERTEX_SEL_LEVEL:
 #if 0 // undo/redo
 				if (theHold.Holding()) {
 					theHold.Put(new VertexSelRestore(meshData,this));
@@ -1259,7 +1259,7 @@ void SkinModifierClass::InvertSelection(int selLevel)
 				for (int j=0; j<tobj->mesh.vertSel.GetSize(); j++) {
 					if (tobj->mesh.vertSel[j]) tobj->mesh.vertSel.Clear(j);
 					else tobj->mesh.vertSel.Set(j);
-				}				
+				}
 				skindata->VertSel = tobj->mesh.vertSel;
 				break;
 		}
@@ -1268,7 +1268,7 @@ void SkinModifierClass::InvertSelection(int selLevel)
 			tobj->DeleteThis();
 		}
 	}
-	
+
 	/*
 	** Get rid of the temporary copies of the INodes.
 	*/
@@ -1294,10 +1294,10 @@ void SkinModifierClass::User_Picked_Bone(INode * node)
 	INodeTab nodelist;
 
 	InterfacePtr->GetModContexts(mclist,nodelist);
-	
+
 	/*
 	** This seems wrong... But I always get only one ModContext and
-	** it is the one that I want so I'll just use it...  
+	** it is the one that I want so I'll just use it...
 	** I believe that OS Modifiers can get multiple ones but WS modifiers
 	** don't
 	*/
@@ -1323,12 +1323,12 @@ void SkinModifierClass::User_Picked_Bone(INode * node)
 	NotifyDependents(FOREVER, PART_ALL, REFMSG_CHANGE);
 	InterfacePtr->RedrawViews(InterfacePtr->GetTime());
 }
-	
+
 void SkinModifierClass::User_Picked_Bones(INodeTab & nodetab)
 {
 	/*
 	** One by one, add the selected bones to the influences of
-	** all selected vertices.  
+	** all selected vertices.
 	*/
 	for (int i=0; i<nodetab.Count() && i<2; i++) {
 		User_Picked_Bone(nodetab[i]);
@@ -1339,7 +1339,7 @@ void SkinModifierClass::ActivateSubSelSet(TSTR & setname)
 {
 	ModContextList mclist;
 	INodeTab nodes;
-	
+
 	if (InterfacePtr == NULL) return;
 
 	InterfacePtr->GetModContexts(mclist,nodes);
@@ -1347,8 +1347,8 @@ void SkinModifierClass::ActivateSubSelSet(TSTR & setname)
 	for (int i = 0; i < mclist.Count(); i++) {
 
 		SkinDataClass * skindata = (SkinDataClass *)mclist[i]->localData;
-		if (!skindata) continue;		
-	
+		if (!skindata) continue;
+
 		int index = skindata->VertSelSets.Find_Set(setname);
 		if (index < 0) continue;
 
@@ -1357,26 +1357,26 @@ void SkinModifierClass::ActivateSubSelSet(TSTR & setname)
 		ObjectState os = nodes[i]->EvalWorldState(InterfacePtr->GetTime());
 		TriObject * tobj = Get_Tri_Object(InterfacePtr->GetTime(),os,valid,needsdel);
 		Mesh * mesh = &(tobj->mesh);
-		
+
 		// TODO: undo redo
 #if 0
 		if (theHold.Holding()) {
 			theHold.Put(new VertexSelRestore(meshData,this));
 		}
 #endif
-				
+
 		if (skindata->VertSelSets[index].GetSize() != mesh->getNumVerts()) {
 			skindata->VertSelSets[index].SetSize(mesh->getNumVerts(),TRUE);
 		}
 		mesh->vertSel  = skindata->VertSelSets[index];
 		skindata->VertSel = mesh->vertSel;
-	
+
 		if (needsdel) {
 			tobj->DeleteThis();
 		}
 	}
-	
-	nodes.DisposeTemporary();	
+
+	nodes.DisposeTemporary();
 
 	NotifyDependents(FOREVER, PART_SELECT, REFMSG_CHANGE);
 	InterfacePtr->RedrawViews(InterfacePtr->GetTime());
@@ -1396,7 +1396,7 @@ void SkinModifierClass::Create_Named_Selection_Sets(void)
 {
 	/*
 	** This function creates a named selection set of vertices
-	** for each bone in the skeleton.  
+	** for each bone in the skeleton.
 	*/
 	if (InterfacePtr == NULL) return;
 
@@ -1422,7 +1422,7 @@ void SkinModifierClass::Create_Named_Selection_Sets(void)
 		if (skinobj->Get_Bone(boneidx) != NULL) {
 			BitArray boneverts;
 			boneverts.SetSize(skindata->VertData.Count());
-			
+
 			for (int vertidx = 0; vertidx < skindata->VertData.Count(); vertidx++) {
 				if (skindata->VertData[vertidx].BoneIdx[0] == boneidx) boneverts.Set(vertidx);
 				else boneverts.Clear(vertidx);
@@ -1436,7 +1436,7 @@ void SkinModifierClass::Create_Named_Selection_Sets(void)
 
 	Install_Named_Selection_Sets();
 
-	nodes.DisposeTemporary();	
+	nodes.DisposeTemporary();
 }
 
 void SkinModifierClass::Install_Named_Selection_Sets(void)
@@ -1452,14 +1452,14 @@ void SkinModifierClass::Install_Named_Selection_Sets(void)
 		InterfacePtr->GetModContexts(mclist,nodes);
 		SkinDataClass * skindata = (SkinDataClass *)mclist[0]->localData;
 		if (skindata == NULL) return;
-		
+
 		InterfacePtr->ClearSubObjectNamedSelSets();
 		for (int i=0; i < skindata->VertSelSets.Count(); i++) {
 			InterfacePtr->AppendSubObjectNamedSelSet(*skindata->VertSelSets.Names[i]);
 		}
 
 		nodes.DisposeTemporary();
-	}	
+	}
 }
 
 void SkinModifierClass::Auto_Attach_Verts(BOOL all)
@@ -1467,14 +1467,14 @@ void SkinModifierClass::Auto_Attach_Verts(BOOL all)
 	assert(InterfacePtr);
 
 	/*
-	** Get the skin data. 
+	** Get the skin data.
 	*/
 	ModContextList mclist;
 	INodeTab nodes;
 	InterfacePtr->GetModContexts(mclist,nodes);
 	SkinDataClass * skindata = (SkinDataClass *)mclist[0]->localData;
 	if (skindata == NULL) return;
-	
+
 	/*
 	** get the skin WSM object.
 	*/
@@ -1490,13 +1490,13 @@ void SkinModifierClass::Auto_Attach_Verts(BOOL all)
 	TimeValue basetime = WSMObjectRef->Get_Base_Pose_Time();
 	ObjectState os = nodes[0]->EvalWorldState(basetime);
 	TriObject * triobj = Get_Tri_Object(basetime,os,valid,needsdel);
-		
+
 	/*
 	** Attach each selected vertex (or all of them) to their closest bone.
 	*/
 	for (int vertidx = 0; vertidx < skindata->VertData.Count(); vertidx++){
 		if (skindata->VertSel[vertidx] || all) {
-			
+
 			Point3 vert = triobj->GetPoint(vertidx);
 			if (os.GetTM()) vert = vert * (*os.GetTM());
 			int boneidx = skinobj->Find_Closest_Bone(vert);
@@ -1519,7 +1519,7 @@ void SkinModifierClass::Auto_Attach_Verts(BOOL all)
 	** Cleanup...
 	*/
 	nodes.DisposeTemporary();
-	
+
 	if (needsdel) {
 		triobj->DeleteThis();
 	}
@@ -1530,14 +1530,14 @@ void SkinModifierClass::Unlink_Verts(void)
 	assert(InterfacePtr);
 
 	/*
-	** Get the skin data. 
+	** Get the skin data.
 	*/
 	ModContextList mclist;
 	INodeTab nodes;
 	InterfacePtr->GetModContexts(mclist,nodes);
 	SkinDataClass * skindata = (SkinDataClass *)mclist[0]->localData;
 	if (skindata == NULL) return;
-	
+
 	/*
 	** Unlink each selected vertex (give them bone index -1)
 	*/
@@ -1589,11 +1589,11 @@ void SkinModifierClass::Install_Bone_Influence_Dialog(void)
 	/*
 	** Put up the UI that is used to assign vertices to bones
 	*/
-	BoneInfluenceHWND = InterfacePtr->AddRollupPage( 
+	BoneInfluenceHWND = InterfacePtr->AddRollupPage(
 				AppInstance,
 				MAKEINTRESOURCE(IDD_BONE_INFLUENCE_PARAMS),
 				_bone_influence_dialog_thunk,
-				string, 
+				string,
 				(LPARAM)this,
 				0);
 }
@@ -1646,10 +1646,10 @@ static BOOL CALLBACK _skeleton_dialog_thunk(HWND hWnd,UINT message,WPARAM wParam
 {
 	SkinWSMObjectClass * skinobj = (SkinWSMObjectClass *)GetWindowLong(hWnd,GWL_USERDATA);
 	if (!skinobj && message != WM_INITDIALOG) return FALSE;
-	
+
 	if (message == WM_INITDIALOG) {
 		skinobj = (SkinWSMObjectClass *)lParam;
-		SetWindowLong(hWnd,GWL_USERDATA,(LONG)skinobj);			
+		SetWindowLong(hWnd,GWL_USERDATA,(LONG)skinobj);
 	}
 
 	return skinobj->Skeleton_Dialog_Proc(hWnd,message,wParam,lParam);
@@ -1668,7 +1668,7 @@ BOOL SkinWSMObjectClass::Skeleton_Dialog_Proc(HWND hWnd,UINT message,WPARAM wPar
 			*/
 			AddBonesButton = GetICustButton(GetDlgItem(hWnd, IDC_ADD_BONES_BUTTON));
 			RemoveBonesButton = GetICustButton(GetDlgItem(hWnd, IDC_REMOVE_BONES_BUTTON));
-			
+
 			AddBonesButton->SetType(CBT_CHECK);
 			AddBonesButton->SetHighlightColor(GREEN_WASH);
 			AddBonesButton->SetTooltip(TRUE, _T("Add bones by name"));
@@ -1676,7 +1676,7 @@ BOOL SkinWSMObjectClass::Skeleton_Dialog_Proc(HWND hWnd,UINT message,WPARAM wPar
 			RemoveBonesButton->SetType(CBT_CHECK);
 			RemoveBonesButton->SetHighlightColor(GREEN_WASH);
 			RemoveBonesButton->SetTooltip(TRUE, _T("Remove bones by name"));
-	
+
 			/*
 			** Initialize the "Base Pose Frame" spinner
 			*/
@@ -1691,19 +1691,19 @@ BOOL SkinWSMObjectClass::Skeleton_Dialog_Proc(HWND hWnd,UINT message,WPARAM wPar
 			ReleaseICustButton(AddBonesButton);
 			ReleaseICustButton(RemoveBonesButton);
 			ReleaseISpinner(BasePoseSpin);
-			
+
 			AddBonesButton = NULL;
 			RemoveBonesButton = NULL;
 			BasePoseSpin = NULL;
 			BoneListHWND = NULL;
-			
+
 			return FALSE;
-	
+
 		case CC_SPINNER_CHANGE:
-			switch (LOWORD(wParam)) 
+			switch (LOWORD(wParam))
 			{
 				case IDC_BASE_POSE_SPIN:
-					BasePoseFrame = BasePoseSpin->GetIVal();						
+					BasePoseFrame = BasePoseSpin->GetIVal();
 					break;
 			}
 			NotifyDependents(FOREVER, PART_ALL, REFMSG_CHANGE);
@@ -1715,7 +1715,7 @@ BOOL SkinWSMObjectClass::Skeleton_Dialog_Proc(HWND hWnd,UINT message,WPARAM wPar
 			InterfacePtr->RedrawViews(InterfacePtr->GetTime(),REDRAW_END);
 			return TRUE;
 
-		
+
 		case WM_LBUTTONDOWN:
 		case WM_LBUTTONUP:
 		case WM_MOUSEMOVE:
@@ -1723,7 +1723,7 @@ BOOL SkinWSMObjectClass::Skeleton_Dialog_Proc(HWND hWnd,UINT message,WPARAM wPar
 			return FALSE;
 
 		case WM_COMMAND:
-			switch (LOWORD(wParam)) 
+			switch (LOWORD(wParam))
 			{
 
 				case IDC_ADD_BONES_BUTTON:
@@ -1755,10 +1755,10 @@ static BOOL CALLBACK _bone_influence_dialog_thunk(HWND hWnd,UINT message,WPARAM
 {
 	SkinModifierClass * skinmod = (SkinModifierClass *)GetWindowLong(hWnd,GWL_USERDATA);
 	if (!skinmod && message != WM_INITDIALOG) return FALSE;
-	
+
 	if (message == WM_INITDIALOG) {
 			skinmod = (SkinModifierClass *)lParam;
-			SetWindowLong(hWnd,GWL_USERDATA,(LONG)skinmod);			
+			SetWindowLong(hWnd,GWL_USERDATA,(LONG)skinmod);
 	}
 
 	return skinmod->Bone_Influence_Dialog_Proc(hWnd,message,wParam,lParam);
@@ -1777,19 +1777,19 @@ BOOL SkinModifierClass::Bone_Influence_Dialog_Proc(HWND hWnd,UINT message,WPARAM
 			LinkByNameButton = GetICustButton(GetDlgItem(hWnd, IDC_LINK_BY_NAME_BUTTON));
 			AutoLinkButton = GetICustButton(GetDlgItem(hWnd, IDC_AUTO_LINK_BUTTON));
 			UnLinkButton = GetICustButton(GetDlgItem(hWnd, IDC_UNLINK_BUTTON));
-			
+
 			LinkButton->SetType(CBT_PUSH);
 			LinkButton->SetTooltip(TRUE, _T("Link Vertices to a bone by selecting the bone"));
 
 			LinkByNameButton->SetType(CBT_PUSH);
 			LinkByNameButton->SetTooltip(TRUE, _T("Link Vertices to a bone by name"));
-			
+
 			AutoLinkButton->SetType(CBT_PUSH);
 			AutoLinkButton->SetTooltip(TRUE, _T("Link Vertices to nearest bone"));
-			
+
 			UnLinkButton->SetType(CBT_PUSH);
 			UnLinkButton->SetTooltip(TRUE, _T("Unlink selected vertices"));
-			
+
 			return TRUE;
 
 		case WM_DESTROY:
@@ -1811,7 +1811,7 @@ BOOL SkinModifierClass::Bone_Influence_Dialog_Proc(HWND hWnd,UINT message,WPARAM
 			return FALSE;
 
 		case WM_COMMAND:
-			switch (LOWORD(wParam)) 
+			switch (LOWORD(wParam))
 			{
 				case IDC_LINK_BUTTON:
 				{
@@ -1821,7 +1821,7 @@ BOOL SkinModifierClass::Bone_Influence_Dialog_Proc(HWND hWnd,UINT message,WPARAM
 					assert(WSMObjectRef != NULL);
 					INodeTab * bonetab = &(WSMObjectRef->Get_Bone_List());
 					TheBonePicker.Set_User(this,TRUE,bonetab);
-					InterfacePtr->SetPickMode(&TheBonePicker); 
+					InterfacePtr->SetPickMode(&TheBonePicker);
 					break;
 				}
 
@@ -1839,10 +1839,10 @@ BOOL SkinModifierClass::Bone_Influence_Dialog_Proc(HWND hWnd,UINT message,WPARAM
 
 				case IDC_AUTO_LINK_BUTTON:
 				{
-					Auto_Attach_Verts();					
+					Auto_Attach_Verts();
 					break;
 				}
-				
+
 				case IDC_UNLINK_BUTTON:
 				{
 					Unlink_Verts();
@@ -1856,17 +1856,17 @@ BOOL SkinModifierClass::Bone_Influence_Dialog_Proc(HWND hWnd,UINT message,WPARAM
 }
 
 static TriObject * Get_Tri_Object(TimeValue t,ObjectState & os,Interval & valid,BOOL & needsdel)
-{	
+{
 	needsdel = FALSE;
 	valid &= os.Validity(t);
-	
+
 	if (os.obj->IsSubClassOf(triObjectClassID)) {
 		return (TriObject *)os.obj;
 	} else {
 		if (os.obj->CanConvertToType(triObjectClassID)) {
 			Object * oldObj = os.obj;
-			TriObject * tobj = (TriObject *)os.obj->ConvertToType(t,triObjectClassID);			
-			needsdel = (tobj != oldObj);			
+			TriObject * tobj = (TriObject *)os.obj->ConvertToType(t,triObjectClassID);
+			needsdel = (tobj != oldObj);
 			return tobj;
 		}
 	}
@@ -1898,7 +1898,7 @@ int SkinModifierClass::NumSubObjTypes()
 	return 1;
 }
 ////////////////////////////////////////////////////////////////////////////////////////
-ISubObjType *SkinModifierClass::GetSubObjType(int i) 
+ISubObjType *SkinModifierClass::GetSubObjType(int i)
 {
 
 	static bool _initialized = false;
diff --git a/Core/Tools/WW3D/max2w3d/skin.h b/Core/Tools/WW3D/max2w3d/skin.h
index dcc21f154b6..ff5f7baf2a6 100644
--- a/Core/Tools/WW3D/max2w3d/skin.h
+++ b/Core/Tools/WW3D/max2w3d/skin.h
@@ -34,9 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef SKIN_H
-#define SKIN_H
+#pragma once
 
 #include <max.h>
 #include "simpmod.h"
@@ -46,7 +44,7 @@
 #include "w3d_file.h"
 
 
-#define SKIN_OBJ_CLASS_ID		Class_ID(0x32b37e0c, 0x5a9612e4)		
+#define SKIN_OBJ_CLASS_ID		Class_ID(0x32b37e0c, 0x5a9612e4)
 #define SKIN_MOD_CLASS_ID 		Class_ID(0x6bad4898, 0x0d1d6ced)
 extern ClassDesc * Get_Skin_Obj_Desc();
 extern ClassDesc * Get_Skin_Mod_Desc();
@@ -54,11 +52,11 @@ extern ClassDesc * Get_Skin_Mod_Desc();
 
 /*
 
-	Writing a space warp plug-in involves creating instances of two key classes.  
+	Writing a space warp plug-in involves creating instances of two key classes.
 	One is derived from class WSMObject.  (WSMObject stands for Word Space Modifier Object,
 	just another name for Space Warp Object).  The other class is subclassed off Modifier.
-	These two classes work together.  The space warp object handles the display and management 
-	of its user interface parameters, the display of the space warp node in the scene, and 
+	These two classes work together.  The space warp object handles the display and management
+	of its user interface parameters, the display of the space warp node in the scene, and
 	provides a world space orientation.  The space warp modifier handles the actual deformation
 	of the geometry of nodes bound to the space warp.  Each node bound to the space warp
 	will have a ModContext which we will store data in.
@@ -67,21 +65,21 @@ extern ClassDesc * Get_Skin_Mod_Desc();
 
 */
 class SkinWSMObjectClass : public SimpleWSMObject, BonePickerUserClass
-{	
-public:		
+{
+public:
 
-	SkinWSMObjectClass();		
+	SkinWSMObjectClass();
 	virtual ~SkinWSMObjectClass();
 
 	/*
-	** From Animatable		
+	** From Animatable
 	*/
-	void DeleteThis() { delete this; }		
+	void DeleteThis() { delete this; }
 	void BeginEditParams(IObjParam  *ip, ULONG flags,Animatable *prev);
 	void EndEditParams(IObjParam *ip, ULONG flags,Animatable *next);
-	TCHAR * GetObjectName() { return _T("WWSkin"); }		
-	Class_ID ClassID() { return SKIN_OBJ_CLASS_ID; }		
-				
+	TCHAR * GetObjectName() { return _T("WWSkin"); }
+	Class_ID ClassID() { return SKIN_OBJ_CLASS_ID; }
+
 	/*
 	** From ReferenceTarget
 	*/
@@ -98,7 +96,7 @@ class SkinWSMObjectClass : public SimpleWSMObject, BonePickerUserClass
 	RefResult NotifyRefChanged(Interval changeInt,RefTargetHandle hTarget,PartID& partID, RefMessage message);
 
 	/*
-	** From Object		
+	** From Object
 	*/
 	int DoOwnSelectHilite() { return TRUE; }
 	CreateMouseCallBack * GetCreateMouseCallBack();
@@ -109,7 +107,7 @@ class SkinWSMObjectClass : public SimpleWSMObject, BonePickerUserClass
 	Modifier *CreateWSMMod(INode *node);
 
 	/*
-	** From SimpleWSMObject		
+	** From SimpleWSMObject
 	*/
 	void BuildMesh(TimeValue t);
 
@@ -117,19 +115,19 @@ class SkinWSMObjectClass : public SimpleWSMObject, BonePickerUserClass
 	** Setup a triangle
 	*/
 	void Build_Tri(Face * f, int a,  int b, int c);
-	
+
 	/*
 	** Dialog box message processing
 	*/
 	BOOL SkinWSMObjectClass::Skeleton_Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM lParam);
-	
+
 	/*
 	** Bone picking.
 	*/
 	virtual void User_Picked_Bone(INode * node);
 	virtual void User_Picked_Bones(INodeTab & nodetab);
 	void Set_Bone_Selection_Mode(int mode);
-	
+
 	int  Add_Bone(INode * node);
 	void Add_Bones(INodeTab & nodetab);
 	void Remove_Bone(INode * node);
@@ -139,11 +137,11 @@ class SkinWSMObjectClass : public SimpleWSMObject, BonePickerUserClass
 	/*
 	** Converting between bone indexes and reference indexes
 	** The bone references are a variable number of references which are
-	** added at the end of the reference array.  
+	** added at the end of the reference array.
 	*/
 	int To_Bone_Index(int refidx) { return refidx - SimpleWSMObject::NumRefs(); }
 	int To_Ref_Index(int boneidx) { return SimpleWSMObject::NumRefs() + boneidx; }
-	
+
 	/*
 	** External access to the bones
 	*/
@@ -177,7 +175,7 @@ class SkinWSMObjectClass : public SimpleWSMObject, BonePickerUserClass
 	/*
 	** flag for whether we need to build the bones mesh for this object
 	*/
-	BOOL				MeshBuilt;					
+	BOOL				MeshBuilt;
 
 	/*
 	** Bone Selection!
@@ -191,7 +189,7 @@ class SkinWSMObjectClass : public SimpleWSMObject, BonePickerUserClass
 	};
 
 	int					BoneSelectionMode;
-	INodeTab				BoneTab;	
+	INodeTab				BoneTab;
 
 	/*
 	** Dialog controls
@@ -204,7 +202,7 @@ class SkinWSMObjectClass : public SimpleWSMObject, BonePickerUserClass
 	enum {
 		NUM_BONES_CHUNK = 0x0001
 	};
-	
+
 	/*
 	** Friend functions
 	*/
@@ -217,7 +215,7 @@ class SkinWSMObjectClass : public SimpleWSMObject, BonePickerUserClass
 class SkinModifierClass : public Modifier, BonePickerUserClass
 {
 
-public:		
+public:
 
 	SkinModifierClass(void);
 	SkinModifierClass(INode * node,SkinWSMObjectClass * skin_obj);
@@ -233,8 +231,8 @@ class SkinModifierClass : public Modifier, BonePickerUserClass
 	void								DeleteThis() { delete this; }
 	void								GetClassName(TSTR& s) { s = TSTR(_T("WWSkin")); }
 	TCHAR *							GetObjectName() { return _T("WWSkin Binding"); }
-	SClass_ID						SuperClassID() { return WSM_CLASS_ID; }		
-	Class_ID							ClassID() { return SKIN_MOD_CLASS_ID; } 		
+	SClass_ID						SuperClassID() { return WSM_CLASS_ID; }
+	Class_ID							ClassID() { return SKIN_MOD_CLASS_ID; }
 	RefTargetHandle				Clone(RemapDir& remap = NoRemap());
 	RefResult						NotifyRefChanged(Interval changeInt, RefTargetHandle hTarget, PartID& partID, RefMessage message);
 	void								BeginEditParams(IObjParam  *ip, ULONG flags,Animatable *prev);
@@ -260,7 +258,7 @@ class SkinModifierClass : public Modifier, BonePickerUserClass
 	** MAX tells us whenever an input changed.  If we cache anything, we can use this
 	** function to dump the cached data and regenerate it.
 	*/
-	virtual void NotifyInputChanged(Interval changeInt, PartID partID, RefMessage message, ModContext *mc) {}               
+	virtual void NotifyInputChanged(Interval changeInt, PartID partID, RefMessage message, ModContext *mc) {}
 
 	/*
 	** This is where the modifier actually modifies the object!
@@ -286,7 +284,7 @@ class SkinModifierClass : public Modifier, BonePickerUserClass
 	IOResult Load(ILoad *iload);
 	virtual IOResult LoadLocalData(ILoad *iload, LocalModData **pld);
 	virtual IOResult SaveLocalData(ISave *isave, LocalModData *ld);
-	
+
 	/*
 	** For SkinModifierClass, we allow vertex sub-object selection.
 	** This function notifies an object being edited that the current sub object
@@ -308,7 +306,7 @@ class SkinModifierClass : public Modifier, BonePickerUserClass
 	** support named sub object selection sets. Methods in the the
 	** interface passed to objects allow them to add items to the
 	** sub-object selection set drop down.
-	** The following methods implement named sub-obj selection sets 
+	** The following methods implement named sub-obj selection sets
 	*/
 	virtual BOOL SupportsNamedSubSels() { return TRUE; }
 	virtual void ActivateSubSelSet(TSTR &setName);
@@ -319,7 +317,7 @@ class SkinModifierClass : public Modifier, BonePickerUserClass
 
 	WSMObject * Get_WSMObject(void) { return (WSMObject*)GetReference(OBJ_REF); }
 	Interval Get_Validity(TimeValue t);
-	
+
 	/*
 	** Bone picking
 	*/
@@ -329,23 +327,23 @@ class SkinModifierClass : public Modifier, BonePickerUserClass
 	/*
 	** Auto-Attach vertices to nearest bone
 	*/
-	void Auto_Attach_Verts(BOOL all = FALSE);					
-	
+	void Auto_Attach_Verts(BOOL all = FALSE);
+
 	/*
 	** Unlink selected verts (links them to the root or origin)
 	*/
 	void Unlink_Verts(void);
 
 private:
-	
+
 	/*
 	** Windows dialog management and communication functions
-	*/	
+	*/
 	void Install_Bone_Influence_Dialog(void);
 	void Remove_Bone_Influence_Dialog(void);
 
 	BOOL Bone_Influence_Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM lParam);
-	
+
 public:
 
 	/*
@@ -378,12 +376,12 @@ class SkinModifierClass : public Modifier, BonePickerUserClass
 	ICustButton *		LinkByNameButton;
 	ICustButton *		AutoLinkButton;
 	ICustButton *		UnLinkButton;
-	
+
 	/*
 	**  Cached pointers to some MAX objects
 	*/
 	IObjParam * InterfacePtr;
-	SelectModBoxCMode * SelectMode;		
+	SelectModBoxCMode * SelectMode;
 
 	/*
 	** Load/Save Chunk ID's
@@ -397,9 +395,3 @@ class SkinModifierClass : public Modifier, BonePickerUserClass
 	*/
 	friend BOOL CALLBACK _bone_influence_dialog_thunk(HWND hWnd,UINT message,WPARAM wParam,LPARAM lParam);
 };
-
-
-
-
-#endif
-
diff --git a/Core/Tools/WW3D/max2w3d/skindata.cpp b/Core/Tools/WW3D/max2w3d/skindata.cpp
index 57742bb6854..e4624a01141 100644
--- a/Core/Tools/WW3D/max2w3d/skindata.cpp
+++ b/Core/Tools/WW3D/max2w3d/skindata.cpp
@@ -17,41 +17,41 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/skindata.cpp 7     5/28/98 12:15p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - WWSkin                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/skindata.cpp                   $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 5/28/98 12:15p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 7                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   SkinDataClass::Save -- save the skindata in the MAX file                                  * 
- *   SkinDataClass::Load -- load the skindata from a MAX file                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - WWSkin                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/skindata.cpp                   $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 5/28/98 12:15p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 7                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   SkinDataClass::Save -- save the skindata in the MAX file                                  *
+ *   SkinDataClass::Load -- load the skindata from a MAX file                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
 #include "skindata.h"
 
 
-/*********************************************************************************************** 
- * SkinDataClass::Save -- save the skindata in the MAX file                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * SkinDataClass::Save -- save the skindata in the MAX file                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 IOResult SkinDataClass::Save(ISave *isave)
 {
@@ -78,11 +78,11 @@ IOResult SkinDataClass::Save(ISave *isave)
 	}
 
 	/*
-	** Save the named selection sets of vertices 
+	** Save the named selection sets of vertices
 	*/
 #if 0
 	if (VertSelSets.Count() > 0) {
-		isave->BeginChunk(INFLUENCE_DATA_CHUNK);	
+		isave->BeginChunk(INFLUENCE_DATA_CHUNK);
 		VertSelSets.Save(isave);
 		isave->EndChunk();
 	}
@@ -101,17 +101,17 @@ IOResult SkinDataClass::Save(ISave *isave)
 }
 
 
-/*********************************************************************************************** 
- * SkinDataClass::Load -- load the skindata from a MAX file                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * SkinDataClass::Load -- load the skindata from a MAX file                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 IOResult SkinDataClass::Load(ILoad *iload)
 {
@@ -124,16 +124,16 @@ IOResult SkinDataClass::Load(ILoad *iload)
 
 		switch (iload->CurChunkID())  {
 
-			case FLAGS_CHUNK: 
+			case FLAGS_CHUNK:
 				res = iload->Read(&flags,sizeof(flags),&nb);
 				Valid = (flags & 0x01);
 				Held = (flags & 0x02);
 				break;
-			
+
 			case VERT_SEL_CHUNK:
 				res = VertSel.Load(iload);
 				break;
-			
+
 			case NAMED_SEL_SETS_CHUNK:
 				res = VertSelSets.Load(iload);
 				break;
@@ -144,7 +144,7 @@ IOResult SkinDataClass::Load(ILoad *iload)
 				res = iload->Read(VertData.Addr(0),n*sizeof(InfluenceStruct),&nb);
 				break;
 		}
-		
+
 		iload->CloseChunk();
 
 		if (res != IO_OK) {
@@ -156,7 +156,7 @@ IOResult SkinDataClass::Load(ILoad *iload)
 	** ensure that the arrays are sized correctly
 	*/
 	Invalidate();
-	
+
 	return IO_OK;
 }
 
diff --git a/Core/Tools/WW3D/max2w3d/skindata.h b/Core/Tools/WW3D/max2w3d/skindata.h
index 370f7c85935..6726465dc87 100644
--- a/Core/Tools/WW3D/max2w3d/skindata.h
+++ b/Core/Tools/WW3D/max2w3d/skindata.h
@@ -17,33 +17,31 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/skindata.h 6     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - WWSkin                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/skindata.h                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/21/97 2:04p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 6                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - WWSkin                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/skindata.h                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/21/97 2:04p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 6                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef SKINDATA_H
-#define SKINDATA_H
+#pragma once
 
 #include "max.h"
 #include "namedsel.h"
 
 /*
-** InfluenceStruct - structure which stores the bone 
+** InfluenceStruct - structure which stores the bone
 ** influence information for a single vertex.
 */
 struct InfluenceStruct
@@ -55,7 +53,7 @@ struct InfluenceStruct
 	float		BoneWeight[2];
 
 	InfluenceStruct(void) { BoneIdx[0] = -1; BoneIdx[1] = -1; BoneWeight[0] = 1.0f; BoneWeight[1] = 0.0f; }
-	
+
 	void Set_Influence(int boneidx) {
 		// TODO: make this actually let you set two bones with
 		// weighting values.  Need UI to furnish this info...
@@ -66,7 +64,7 @@ struct InfluenceStruct
 
 /*
 ** SkinDataClass - a class which contains the bone influence data
-** for the modifier.  One of these will be hung off of the 
+** for the modifier.  One of these will be hung off of the
 ** ModContext...
 */
 class SkinDataClass : public LocalModData
@@ -103,15 +101,15 @@ class SkinDataClass : public LocalModData
 		}
 	}
 
-	virtual LocalModData * Clone(void) 
-	{ 
+	virtual LocalModData * Clone(void)
+	{
 		SkinDataClass * newdata = new SkinDataClass();
 		newdata->VertSel = VertSel;
 		newdata->VertData = VertData;
 		return newdata;
 	}
 
-	void Add_Influence(int boneidx) 
+	void Add_Influence(int boneidx)
 	{
 		/*
 		** Make this INode influence all currently selected vertices
@@ -130,12 +128,12 @@ class SkinDataClass : public LocalModData
 
 	BOOL							Valid;
 	BOOL							Held;
-	
+
 	/*
 	** Current selection
 	*/
 	BitArray						VertSel;
-	
+
 	/*
 	** Named selection sets
 	*/
@@ -151,12 +149,9 @@ class SkinDataClass : public LocalModData
 	*/
 	enum {
 		FLAGS_CHUNK = 				0x0000,
-		VERT_SEL_CHUNK = 			0x0010,	
+		VERT_SEL_CHUNK = 			0x0010,
 		NAMED_SEL_SETS_CHUNK =	0x0020,
 		INFLUENCE_DATA_CHUNK = 	0x0030
 	};
 
 };
-
-
-#endif
diff --git a/Core/Tools/WW3D/max2w3d/util.cpp b/Core/Tools/WW3D/max2w3d/util.cpp
index 54d0cfe571b..d5946a9ea43 100644
--- a/Core/Tools/WW3D/max2w3d/util.cpp
+++ b/Core/Tools/WW3D/max2w3d/util.cpp
@@ -17,25 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/util.cpp 28    10/27/00 4:12p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/util.cpp                       $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/27/00 1:13p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 28                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Cleanup_Orthogonal_Matrix -- removes very small numbers from the matrix                   * 
- *   Set_W3D_Name -- set a W3D name                                                            * 
- *   Split_Node_Name -- break a node name into the base and extension                          * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/util.cpp                       $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/27/00 1:13p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 28                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Cleanup_Orthogonal_Matrix -- removes very small numbers from the matrix                   *
+ *   Set_W3D_Name -- set a W3D name                                                            *
+ *   Split_Node_Name -- break a node name into the base and extension                          *
  *   Is_Max_Tri_Mesh -- Is this node a triangle mesh?                                          *
  *    -- checks if the node is the origin of a model                                           *
  *    -- Checks if the node is the origin for the base obect (non-LOD'd).                      *
@@ -64,17 +64,17 @@ static int get_geometry_type(INode * node)
 }
 
 
-/*********************************************************************************************** 
- * Cleanup_Orthogonal_Matrix -- removes very small numbers from the matrix                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Cleanup_Orthogonal_Matrix -- removes very small numbers from the matrix                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Matrix3	Cleanup_Orthogonal_Matrix(Matrix3 & mat)
 {
@@ -82,7 +82,7 @@ Matrix3	Cleanup_Orthogonal_Matrix(Matrix3 & mat)
 
 	for (int j=0; j<3; j++) {
 		Point3 row = newmat.GetRow(j);
-	
+
 		if (fabs(row.x) < EPSILON) row.x = 0.0f;
 		if (fabs(row.y) < EPSILON) row.y = 0.0f;
 		if (fabs(row.z) < EPSILON) row.z = 0.0f;
@@ -95,17 +95,17 @@ Matrix3	Cleanup_Orthogonal_Matrix(Matrix3 & mat)
 	return newmat;
 }
 
-/*********************************************************************************************** 
- * Set_W3D_Name -- set a W3D name                                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Set_W3D_Name -- set a W3D name                                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *   9/13/1999  AJA : Strip off the trailing ".digits" since this is a convention we've set in *
  *                    MAX to help artists manage LODs.                                         *
  *=============================================================================================*/
@@ -127,17 +127,17 @@ void Set_W3D_Name(char * set_name,const char * src)
 	strupr(set_name);
 }
 
-/*********************************************************************************************** 
- * Split_Node_Name -- break a node name into the base and extension                            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Split_Node_Name -- break a node name into the base and extension                            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void Split_Node_Name(const char * name,char * set_base,char * set_exten,int * set_exten_index)
 {
@@ -154,7 +154,7 @@ void Split_Node_Name(const char * name,char * set_base,char * set_exten,int * se
 	if (set_base != NULL) set_base[0] = 0;
 	if (set_exten != NULL) set_exten[0] = 0;
 	if (set_exten_index != NULL) *set_exten_index = 0;
-		
+
 	// Get the base name
 	strncpy(buf,name,MAX_NODE_NAME_LEN);
 	ptr = buf;
@@ -166,7 +166,7 @@ void Split_Node_Name(const char * name,char * set_base,char * set_exten,int * se
 
 		// copy what we have so far into set_base
 		*ptr = 0;
-		if (set_base != NULL) strncpy(set_base,buf,MAX_NODE_NAME_LEN);	
+		if (set_base != NULL) strncpy(set_base,buf,MAX_NODE_NAME_LEN);
 
 		// copy the rest back into the extension
 		ptr++;
@@ -438,12 +438,12 @@ bool Is_Full_Path(char * path)
  * HISTORY:                                                                                    *
  *   2/2/98     GTH : Created.                                                                 *
  *=============================================================================================*/
-bool Is_Max_Tri_Mesh(INode * node) 
+bool Is_Max_Tri_Mesh(INode * node)
 {
 	Object *obj = node->EvalWorldState(0).obj;
-	
+
 	if (obj && obj->CanConvertToType(Class_ID(TRIOBJ_CLASS_ID, 0))) {
-		return true;	
+		return true;
 	}
 	return false;
 }
diff --git a/Core/Tools/WW3D/max2w3d/util.h b/Core/Tools/WW3D/max2w3d/util.h
index d549636d933..96eb55e03ff 100644
--- a/Core/Tools/WW3D/max2w3d/util.h
+++ b/Core/Tools/WW3D/max2w3d/util.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/util.h 25    10/27/00 4:11p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/util.h                         $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/27/00 10:24a                                             $* 
- *                                                                                             * 
- *                    $Revision:: 25                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/util.h                         $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/27/00 10:24a                                             $*
+ *                                                                                             *
+ *                    $Revision:: 25                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef UTIL_H
-#define UTIL_H
+#pragma once
 
 #ifndef ALWAYS_H
 #include "always.h"
@@ -112,6 +110,3 @@ INode *Find_Named_Node (char *nodename, INode *root);
 				delete [] pobject;				\
 				pobject = NULL;					\
 			}											\
-
-
-#endif 
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/vchannel.cpp b/Core/Tools/WW3D/max2w3d/vchannel.cpp
index 9c82b507301..8392aaded4c 100644
--- a/Core/Tools/WW3D/max2w3d/vchannel.cpp
+++ b/Core/Tools/WW3D/max2w3d/vchannel.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/vchannel.cpp 10    10/30/00 6:56p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/vchannel.cpp                   $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/30/00 5:26p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 10                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/vchannel.cpp                   $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/30/00 5:26p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 10                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -69,7 +69,7 @@ static float filtertable[FILTER_TABLE_SIZE] = {
 	10000000.0f,
 
 };
-static bool table_valid = false; 
+static bool table_valid = false;
 
 
 VectorChannelClass::VectorChannelClass
@@ -109,8 +109,8 @@ VectorChannelClass::VectorChannelClass
 	// start "Begin" at the end of the array, whenever we set a value
 	// at an index less than "Begin", we push "Begin" back.
 	Begin = MaxFrames;
-	End = 0;	
-	
+	End = 0;
+
 	if (false == table_valid) {
 		// Create Filter Table, used in delta compression
 
@@ -118,7 +118,7 @@ VectorChannelClass::VectorChannelClass
 		{
 			float ratio = i;
 
-			//ratio = ((ratio + 1.0f) / 128.0f); 
+			//ratio = ((ratio + 1.0f) / 128.0f);
 			ratio/=((float) FILTER_TABLE_GEN_SIZE);
 
 			filtertable[i + FILTER_TABLE_GEN_START] = 1.0f - sin( DEG_TO_RAD(90.0f * ratio));
@@ -128,7 +128,7 @@ VectorChannelClass::VectorChannelClass
 
 	}
 
-  																											
+
 }
 
 VectorChannelClass::~VectorChannelClass(void)
@@ -138,7 +138,7 @@ VectorChannelClass::~VectorChannelClass(void)
 	}
 	if (IdentVect) {
 		delete[] IdentVect;
-	}							 
+	}
 }
 
 void VectorChannelClass::Set_Vector(int frameidx,float32 * vector)
@@ -162,7 +162,7 @@ float * VectorChannelClass::Get_Vector(int frameidx)
 
 	return &(Data[frameidx * VectorLen]);
 }
-	
+
 
 bool VectorChannelClass::SaveTimeCoded(ChunkSaveClass & csave, BitChannelClass *binmov)
 {
@@ -172,46 +172,46 @@ bool VectorChannelClass::SaveTimeCoded(ChunkSaveClass & csave, BitChannelClass *
 	channelsize			 -= sizeof(uint32);
 
 	W3dTimeCodedAnimChannelStruct * chn = (W3dTimeCodedAnimChannelStruct *)malloc(channelsize);
-	
+
 	if (chn == NULL) {
 		return false;
 	}
-  
+
 	chn->NumTimeCodes = MaxFrames;
 	chn->VectorLen = VectorLen;
 	chn->Pivot = ID;
 	chn->Flags = Flags;
-	
+
 	// Fetch Channel Data into new format
 	// tc [data] tc [data] tc [data] .. ...
 	uint32 fidx = 0;
 
 	for (int fcount=0; fcount < MaxFrames; fcount++, fidx += (VectorLen+1) ) {
-		
+
 		uint32	* pivec;
 		float32	* pfvec;
 
 		pivec = 	&chn->Data[ fidx ];
 		pfvec = 	(float32 *) (pivec + 1);
-		
+
 		*pivec = fcount;
-								
+
 		if (binmov) {
-			
+
 			bool binary_move = binmov->Get_Bit( fcount );
 
 			// check for false binary movement
 			if (fcount != Begin) {
 				if (binary_move)  {
    				*pivec |= W3D_TIMECODED_BINARY_MOVEMENT_FLAG;
-				}																		  
+				}
 			}
 			else {
 				//if (log) log->printf("\nFALSE Binary\n");
 			}
-		} 
-   
-		
+		}
+
+
 		// Copy Vector
 		for (int vidx=0; vidx < VectorLen; vidx++) {
 
@@ -239,7 +239,7 @@ bool VectorChannelClass::SaveTimeCoded(ChunkSaveClass & csave, BitChannelClass *
 	if (csave.Write(chn,channelsize) != channelsize) {
 		return false;
 	}
-	
+
 	if (chn != NULL) {
 		free(chn);
 	}
@@ -247,10 +247,10 @@ bool VectorChannelClass::SaveTimeCoded(ChunkSaveClass & csave, BitChannelClass *
 	if (!csave.End_Chunk()) {
 		return false;
 	}
-	
+
 	return true;
 
-} // SaveTimeCoded
+}
 
 
 /*
@@ -267,7 +267,7 @@ struct W3dAdaptiveDeltaAnimChannelStruct
 };
 */
 
-struct 
+struct
 {
 	unsigned	char	filter : 7;
 	unsigned char	flag   : 1;
@@ -289,7 +289,7 @@ struct
 	unsigned char  d15    : 4;
 
 } AdaptiveDeltaPacketStruct;
-							 	  
+
 //
 //	test compress Adaptive Delta packet
 //
@@ -300,25 +300,25 @@ struct
 //				float *outdata	// 16 decompressed values
 //
 // output: float error;		// aggregate error for packet
-//                          
+//
 float VectorChannelClass::test_compress(int filter_index, float scale, float value1, float *indata, float *outdata)
-{		
-	
-   float error = 0.0f;						
-                     
+{
+
+   float error = 0.0f;
+
    // compute filter
-   
+
    float filter = filtertable[filter_index] * scale;
-   			  
+
    assert(filter_index < FILTER_TABLE_SIZE);
-                          
-   float last_value = value1;	
-      
+
+   float last_value = value1;
+
    for(int data_idx=0; data_idx < 16; data_idx++)  {
-   		
+
       // NOTE: DETERMINE best factor via Brute Force
       // This helps under/over-flow problems
-      
+
       // brute
       int   best_factor = 100;
       float	least_error = 999999999.9f;
@@ -333,24 +333,24 @@ float VectorChannelClass::test_compress(int filter_index, float scale, float val
       }
       assert(best_factor <= 7);
       assert(best_factor >=-8);
-      																	 
+
       float dfactor = best_factor;
-                                                          
+
       outdata[data_idx] = (dfactor * filter) + last_value;
       // END BRUTE FORCE IT
-      
+
 		float delta = outdata[data_idx] - indata[data_idx];
 
 		//if (delta > error) error = delta;
-      error+= (delta * delta); 
+      error+= (delta * delta);
 
       last_value = outdata[data_idx];
-   }		
-   
+   }
+
    return( sqrt(error) );
-	
-} // test_compress	
-          
+
+}
+
 //
 //	compress Adaptive Delta packet
 //
@@ -361,24 +361,24 @@ float VectorChannelClass::test_compress(int filter_index, float scale, float val
 //				unsigned char *pPacket
 //
 // output: float error;		// aggregate error for packet
-//                          
+//
 float VectorChannelClass::compress(int filter_index, float scale, float value1, float *indata, unsigned char *pPacket, float *outdata)
-{			
-   float error = 0.0f;						
-                     
+{
+   float error = 0.0f;
+
    // compute filter
-   
+
    float filter = filtertable[filter_index] * scale;
-   			  
+
    assert(filter_index < FILTER_TABLE_SIZE);
-                          
+
    *pPacket = filter_index;
    pPacket++;
-   
-   float last_value = value1;	
-      
+
+   float last_value = value1;
+
    for(int data_idx=0; data_idx < 16; data_idx++)  {
-   		
+
       // NOTE: PLAN TO ADD A LOOP IN HERE, to DETERMINE best factor via Brute Force
       // This could help under/over-flow problems
       {
@@ -396,13 +396,13 @@ float VectorChannelClass::compress(int filter_index, float scale, float value1,
        	}
          assert(best_factor <= 7);
          assert(best_factor >=-8);
-         																	 
+
          float dfactor = best_factor;
-           
+
          outdata[data_idx] = (dfactor * filter) + last_value;
 
-         int pi = data_idx>>1;  
-         
+         int pi = data_idx>>1;
+
 			if (data_idx & 1) {
 				best_factor<<=4;
 				pPacket[pi]&=0x0f;
@@ -414,19 +414,19 @@ float VectorChannelClass::compress(int filter_index, float scale, float value1,
 				pPacket[pi]|=best_factor;
 			}
       }
-             
+
       // END BRUTE FORCE IT
-      
-      error+=fabs(outdata[data_idx] - indata[data_idx]); 
-      
+
+      error+=fabs(outdata[data_idx] - indata[data_idx]);
+
       last_value = outdata[data_idx];
-      	
-   }		
-   
+
+   }
+
    return( error );
-	
-} // compress	
-                      
+
+}
+
 
 bool VectorChannelClass::SaveAdaptiveDelta(ChunkSaveClass & csave, BitChannelClass *binmov)
 {
@@ -438,7 +438,7 @@ bool VectorChannelClass::SaveAdaptiveDelta(ChunkSaveClass & csave, BitChannelCla
 	channelsize     += VectorLen * sizeof(float);
 
 	W3dAdaptiveDeltaAnimChannelStruct * chn = (W3dAdaptiveDeltaAnimChannelStruct *)malloc(channelsize);
-	
+
 	if (chn == NULL) {
 		return false;
 	}
@@ -446,13 +446,13 @@ bool VectorChannelClass::SaveAdaptiveDelta(ChunkSaveClass & csave, BitChannelCla
 // Brute Force Compressor
 
 	// Initialize Chan Data
+	memset(chn, 0, channelsize);
 	chn->NumFrames = MaxFrames;
 	chn->Pivot = ID;
 	chn->VectorLen = VectorLen;
 	chn->Flags = Flags;
 	chn->Scale = 0.0f;
-	memset(&chn->Data[0], channelsize - (sizeof(W3dAdaptiveDeltaAnimChannelStruct) - sizeof(char)), 0x00);
-	
+
 	assert(VectorLen <= 4);	// otherwise temp vector won't have room
 
 	float	*initial = (float *)&chn->Data[0];
@@ -475,7 +475,7 @@ bool VectorChannelClass::SaveAdaptiveDelta(ChunkSaveClass & csave, BitChannelCla
 
 	for (int fidx=1; fidx < MaxFrames; fidx++) {
 		for (i=0; i<VectorLen; i++) {
-			
+
 			delta = fabs( get_value(fidx, i) - get_value(fidx - 1, i));
 
 			if (delta > scale) scale = delta;
@@ -484,7 +484,7 @@ bool VectorChannelClass::SaveAdaptiveDelta(ChunkSaveClass & csave, BitChannelCla
 
 	scale/=7.0f;	// range of the delta encode is +- 7 units, in which ever filter range
 						// the smaller the scale, the better our precision is going to be
-						
+
 	// End Compute Scale
 
 	for (i=0; i < numpackets; i++) {
@@ -494,7 +494,7 @@ bool VectorChannelClass::SaveAdaptiveDelta(ChunkSaveClass & csave, BitChannelCla
 			int temp_frame = frame;
 
 			for(int gi=0; gi<16; gi++) {
-				
+
 				if (temp_frame < MaxFrames) {
 					last_value = original_packet[gi] = get_value(temp_frame, vi);
 				}
@@ -504,29 +504,29 @@ bool VectorChannelClass::SaveAdaptiveDelta(ChunkSaveClass & csave, BitChannelCla
 
 				temp_frame++;
 
-			} // for gi
-			
-         // Brute Force Filter	
-         
+			}
+
+         // Brute Force Filter
+
          int   best_filter = 2 * FILTER_TABLE_SIZE;
-         float least_error = 999999999.9f;  		  
+         float least_error = 999999999.9f;
          last_value = work[vi];
-            
+
          for(int try_filter=0; try_filter < FILTER_TABLE_SIZE; try_filter++) {
-         
+
          	float temp_error = test_compress(try_filter, scale, last_value, original_packet, decompressed_packet);
-                      			 
+
             if (temp_error < least_error)  {
             	best_filter = try_filter;
                least_error = temp_error;
-            }                   
-                              
-         }	 
-         
+            }
+
+         }
+
          assert(best_filter < FILTER_TABLE_SIZE);
-			
-         //log->printf("\nvi= %d frames %d to %d : error = %f ",vi, frame, frame+15, least_error);		
-               
+
+         //log->printf("\nvi= %d frames %d to %d : error = %f ",vi, frame, frame+15, least_error);
+
 			// Encode current packet
 
 			unsigned char * pPacket;
@@ -535,15 +535,15 @@ bool VectorChannelClass::SaveAdaptiveDelta(ChunkSaveClass & csave, BitChannelCla
 			pPacket+= (VectorLen * sizeof(float));					// skip over initial values
 			pPacket+= (sizeof(AdaptiveDeltaPacketStruct) * VectorLen * ((frame-1)>>4));  // skip up to the appropriate packet
 			pPacket+=  sizeof(AdaptiveDeltaPacketStruct) * vi;	// skip up the appropriate vector index
-					  
+
          compress(best_filter, scale, last_value, original_packet, pPacket, decompressed_packet);
 
 			// update work[vi];
 			work[vi] = decompressed_packet[15];
 
-		}	// for vi
+		}
 		frame+=16;
-	}  // for numpackets
+	}
 
 
 	// print how big we are vs non-compressed
@@ -562,7 +562,7 @@ bool VectorChannelClass::SaveAdaptiveDelta(ChunkSaveClass & csave, BitChannelCla
 	if (csave.Write(chn,channelsize) != channelsize) {
 		return false;
 	}
-	
+
 	if (chn != NULL) {
 		free(chn);
 	}
@@ -570,16 +570,16 @@ bool VectorChannelClass::SaveAdaptiveDelta(ChunkSaveClass & csave, BitChannelCla
 	if (!csave.End_Chunk()) {
 		return false;
 	}
-	
+
 	return true;
 
-} // SaveAdaptiveDelta
+}
+
 
-			
 bool VectorChannelClass::Save(ChunkSaveClass & csave, BitChannelClass *binmov)
 {
 	if (IsEmpty) return true;
- 	
+
 	compute_range();
 	if (End<Begin) {
 		IsEmpty = true;
@@ -594,7 +594,7 @@ bool VectorChannelClass::Save(ChunkSaveClass & csave, BitChannelClass *binmov)
 			return false;
 		}
 
-		switch (CompressAnimationFlavor) 
+		switch (CompressAnimationFlavor)
 		{
 			case ANIM_FLAVOR_TIMECODED:
 				{
@@ -628,17 +628,17 @@ bool VectorChannelClass::Save(ChunkSaveClass & csave, BitChannelClass *binmov)
 		channelsize += VectorLen * sizeof(float32) * (MaxFrames) - sizeof(float32);
 
 		W3dAnimChannelStruct * chn = (W3dAnimChannelStruct *)malloc(channelsize);
-		
+
 		if (chn == NULL) {
 			return false;
 		}
-  
+
 		chn->FirstFrame = Begin;
 		chn->LastFrame = End;
 		chn->VectorLen = VectorLen;
 		chn->Pivot = ID;
 		chn->Flags = Flags;
-		
+
 		for (int fcount=0; fcount < End-Begin+1; fcount++) {
 			for (int vidx=0; vidx < VectorLen; vidx++) {
 
@@ -651,7 +651,7 @@ bool VectorChannelClass::Save(ChunkSaveClass & csave, BitChannelClass *binmov)
 		if (csave.Write(chn,channelsize) != channelsize) {
 			return false;
 		}
-		
+
 		if (chn != NULL) {
 			free(chn);
 		}
@@ -675,11 +675,11 @@ void VectorChannelClass::SetSaveOptions(bool compress, int flavor, float Terr, f
 	CompressAnimationTranslationError = Terr;
 	CompressAnimationRotationError = DEG_TO_RAD(Rerr);
 
-} // SetSaveOptions
+}
 
 //
 //  Set data in motion channel to identity vector
-//  R2 - set invisible data to repeat last known position, the previous algorthm caused problems with 
+//  R2 - set invisible data to repeat last known position, the previous algorthm caused problems with
 //  the current movie assets
 //
 void VectorChannelClass::ClearInvisibleData(BitChannelClass *vis)
@@ -706,7 +706,7 @@ void VectorChannelClass::ClearInvisibleData(BitChannelClass *vis)
 			Set_Vector( idx, tvec );
 		}
 	}
-} // ClearInvisibleData
+}
 
 
 void VectorChannelClass::set_value(int framenum,int vindex,float32 val)
@@ -757,45 +757,45 @@ void VectorChannelClass::compute_range(void)
 	while ((End >= 0) && (is_identity(Get_Vector(End)))) {
 		End--;
 	}
-}	// compute_range
+}
 
 
 //
 //  Remove a packet from a W3dTimeCodedAnimChanelStruct
 //
 void VectorChannelClass::remove_packet(W3dTimeCodedAnimChannelStruct * c, uint32 packet_idx)
-{												
+{
 	assert( c );
 	assert( c->NumTimeCodes > 1 );
-	
+
 	uint32 packet_size = c->VectorLen + 1;
 	uint32 packet_len  = packet_size * sizeof(uint32);
-  												 
+
 	uint32 *src, *dst;
-  
+
 	dst = (uint32 *) &c->Data[ packet_size * packet_idx ];
 	src = (uint32 *) &c->Data[ packet_size * (packet_idx + 1) ];
-   									 
+
 	uint32 copy_length = (c->NumTimeCodes - (packet_idx + 1)) * packet_len;
-  
+
 	if (copy_length)  {
-  	
+
 		memcpy(dst, src, copy_length);
-    
+
 	}
-  
-	// Decrement Packet Count                  
-	c->NumTimeCodes--;			
-        
-} // remove_packet	 
-         
+
+	// Decrement Packet Count
+	c->NumTimeCodes--;
+
+}
+
 //
 //  Take a non-compressed TimeCoded Motion Channel
 //  and compress the packets
 //
 void VectorChannelClass::compress(W3dTimeCodedAnimChannelStruct * c)
-{	
-	
+{
+
 	assert( c );
 
 
@@ -811,48 +811,48 @@ void VectorChannelClass::compress(W3dTimeCodedAnimChannelStruct * c)
 		case ANIM_CHANNEL_X:
 		case ANIM_CHANNEL_Y:
 		case ANIM_CHANNEL_Z: {
-			
+
 			while(1) {
-				
+
 				uint32 idx = find_useless_packet( c, Terr );
-     
+
 				if (PACKETS_ALL_USEFUL == idx) break;
-    
+
 				remove_packet( c, idx );
-    			
-			}	
+
+			}
 
 			break;
 		}
-									
+
 		case ANIM_CHANNEL_XR:
 		case ANIM_CHANNEL_YR:
 		case ANIM_CHANNEL_ZR: {
 
 			while(1) {
-				
+
 				uint32 idx = find_useless_packet( c, Rerr );
-     
+
 				if (PACKETS_ALL_USEFUL == idx) break;
-    
+
 				remove_packet( c, idx );
-    			
-			}	
+
+			}
 
 			break;
 		}
 
 		case ANIM_CHANNEL_Q: {
-			
+
 			while(1) {
-				
+
 				uint32 idx = find_useless_packetQ( c, Rerr );
-     
+
 				if (PACKETS_ALL_USEFUL == idx) break;
-    
+
 				remove_packet( c, idx );
-    			
-			}	
+
+			}
 
 			break;
 		}
@@ -892,29 +892,29 @@ void VectorChannelClass::compress(W3dTimeCodedAnimChannelStruct * c)
 			{
 				case ANIM_CHANNEL_X:
 				case ANIM_CHANNEL_Y:
-				case ANIM_CHANNEL_Z: 
+				case ANIM_CHANNEL_Z:
 				case ANIM_CHANNEL_XR:
 				case ANIM_CHANNEL_YR:
-				case ANIM_CHANNEL_ZR: { 
+				case ANIM_CHANNEL_ZR: {
 
 					while(maxFrames < c->NumTimeCodes) {
-						
+
 						uint32 idx = find_least_useful_packet( c );
 						if (PACKETS_ALL_USEFUL == idx) break;
 						remove_packet( c, idx );
-					}	
+					}
 
 					break;
 				}
 
 				case ANIM_CHANNEL_Q: {
-					
+
 					while(maxFrames < c->NumTimeCodes) {
-						
+
 						uint32 idx = find_least_useful_packetQ( c );
 						if (PACKETS_ALL_USEFUL == idx) break;
 						remove_packet( c, idx );
-					}	
+					}
 
 					break;
 				}
@@ -923,11 +923,11 @@ void VectorChannelClass::compress(W3dTimeCodedAnimChannelStruct * c)
 					assert(0);
 					break;
 			}
-		} // if ReducePercent
+		}
 
-	} // if Reduce
+	}
 
-} // compress
+}
 
 
 
@@ -936,129 +936,129 @@ void VectorChannelClass::compress(W3dTimeCodedAnimChannelStruct * c)
 // if all packets are necessary, then return back PACKETS_ALL_USEFUL
 // a useless packet is defined, as a packet that can be recreated
 // via interpolation
-// 
+//
 // Make Sure we NEVER get rid of binary movement packets
 // The rule is, you can't interpolate TOO a binary movement, but you can
 // interpolate FROM
 //#define W3D_TIMECODED_BINARY_MOVEMENT_FLAG  0x80000000
-//      
+//
 uint32 VectorChannelClass::find_useless_packet(W3dTimeCodedAnimChannelStruct * c, double tolerance)
-{												
+{
 #define MAX_VECTOR_SIZE 8
-static  float32 tempvec[MAX_VECTOR_SIZE];		
-	
+static  float32 tempvec[MAX_VECTOR_SIZE];
+
   assert( c );	// make sure pointer exists
   assert( c->NumTimeCodes );	// make sure some packets exist
   assert( c->VectorLen <= MAX_VECTOR_SIZE );
-  		 
+
   uint32 packet_size = c->VectorLen + 1;
-                       
+
   if (c->NumTimeCodes > 1) {
   	if (c->NumTimeCodes > 2)  {
-  						 
+
   		float32 *pVecSrc, *pVecDst, *pVecOriginal;
       uint32	*pTcSrc,  *pTcDst,  *pTcOriginal;
-              
+
       for(uint32 try_idx = 0; try_idx < (c->NumTimeCodes - 2); try_idx++)  {
-      	
+
         // Src Pointers
         pTcSrc  = (uint32 *) &c->Data[ try_idx * packet_size ];
         pVecSrc	= (float32 *) pTcSrc+1;
-        				 
-        // Original Vector we're trying to recreate         
+
+        // Original Vector we're trying to recreate
         pTcOriginal  = (uint32 *) &c->Data[ (try_idx + 1) * packet_size ];
         pVecOriginal = (float32 *) pTcOriginal+1;
-        
+
         // Dst Pointers
         pTcDst  = (uint32 *) &c->Data[ (try_idx + 2 ) * packet_size ];
-        pVecDst =	(float32 *) pTcDst+1;	 
-        
-        // Skip automagically, if binary movement involved		
+        pVecDst =	(float32 *) pTcDst+1;
+
+        // Skip automagically, if binary movement involved
         if (*pTcOriginal & W3D_TIMECODED_BINARY_MOVEMENT_FLAG) {
-				continue;	// can't get rid of this guy	
-        }			  
+				continue;	// can't get rid of this guy
+        }
         if (*pTcDst & W3D_TIMECODED_BINARY_MOVEMENT_FLAG)  {
         		continue;	// can't get rid of this guy either
         }
-            
+
         // Linear Interpolate between Src, and Dst, to recreate the
         // Original
-        
+
         float32 tStart    = ((*pTcSrc) & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG);				// upgrade to floats
         float32 tRecreate = *pTcOriginal;
-        float32 tEnd      = *pTcDst; 
+        float32 tEnd      = *pTcDst;
         float32 tRatio    = (tRecreate - tStart) / (tEnd - tStart);
-        																		
+
         uint32 idx=0;
         for (; idx < c->VectorLen; idx++)  {
-        
+
         	tempvec[ idx ] = WWMath::Lerp(pVecSrc[idx], pVecDst[idx], tRatio);
-          	
-        }                                    
-        
+
+        }
+
         // Compare Original to our re-creation
-        
+
         bool close_enough = true;
-        
+
         for (idx=0; idx < c->VectorLen; idx++)  {
-        	
+
           float32 delta;
-          
+
           delta = fabs(pVecOriginal[idx] - tempvec[idx]);
-          
+
           if (delta > tolerance)  {
           	close_enough = false;
             break;
           }
-          
-        }													 
-                                   
+
+        }
+
         // If our Recreation is very close to the original,
         // then discard the original
-        
+
         if (true == close_enough)  {
         		return (try_idx + 1);
         }
-        
+
         // else continue
-               
-      }	// for 
-        
-  	}	
+
+      }
+
+  	}
     else  {
     	// Special Case, when there are only 2 time codes
       // Check to see if they are equal, value
       // if so, then return the 2nd timecode as useless
-       	
+
       float32 *pVecSrc = (float32 *) &c->Data[ 1 ];
-      float32 *pVecDst = (float32 *) &c->Data[ packet_size + 1 ];  
-       	
-      bool identical = true;  
-        
+      float32 *pVecDst = (float32 *) &c->Data[ packet_size + 1 ];
+
+      bool identical = true;
+
       if ((c->Data[ packet_size ] & W3D_TIMECODED_BINARY_MOVEMENT_FLAG) == 0) {
-      	
+
 	      for(uint32 idx=0; idx < c->VectorLen; idx++) {
-	      
+
 	      	float32 delta;
-	        
+
 	        delta = fabs(pVecDst[idx] - pVecSrc[idx]);
-	        
+
 	        if (delta > tolerance)  {
 	       		identical = false;
-	          break;	
-	        }	
-	        
-	      }	 
-	      
+	          break;
+	        }
+
+	      }
+
 	      if (identical) return( 1 );
-         
+
       }
     }
   }
-	
+
 	return( PACKETS_ALL_USEFUL );
-	
-} // find_useless_packet	
+
+}
 
 
 //
@@ -1070,51 +1070,51 @@ static  float32 tempvec[MAX_VECTOR_SIZE];
 //#define W3D_TIMECODED_BINARY_MOVEMENT_FLAG  0x80000000
 //
 uint32 VectorChannelClass::find_useless_packetQ(W3dTimeCodedAnimChannelStruct * c, double tolerance)
-{												
-	
+{
+
   assert( c );	// make sure pointer exists
   assert( c->NumTimeCodes );	// make sure some packets exist
   assert( c->VectorLen == 4);
-  		 
+
   uint32 packet_size = c->VectorLen + 1;
-                       
+
   if (c->NumTimeCodes > 1) {
   	if (c->NumTimeCodes > 2)  {
-  						 
+
   		float32 *pVecSrc, *pVecDst, *pVecOrg;
       uint32	*pTcSrc,  *pTcDst,  *pTcOrg;
-              
+
 		for(uint32 try_idx = 0; try_idx < (c->NumTimeCodes - 2); try_idx++)  {
-      	
+
 			// Src Pointers
 			pTcSrc  = (uint32 *) &c->Data[ try_idx * packet_size ];
 			pVecSrc	= (float32 *) pTcSrc+1;
-        				 
-			// Original Vector we're trying to recreate         
+
+			// Original Vector we're trying to recreate
 			pTcOrg  = (uint32 *) &c->Data[ (try_idx + 1) * packet_size ];
 			pVecOrg = (float32 *) pTcOrg+1;
-        
+
 			// Dst Pointers
 			pTcDst  = (uint32 *) &c->Data[ (try_idx + 2 ) * packet_size ];
-			pVecDst = (float32 *) pTcDst+1;	 
-        
+			pVecDst = (float32 *) pTcDst+1;
+
 			// Sphereical Linear Interpolate between Src, and Dst, to recreate the
 			// Original
-         
-        	// Skip automagically, if binary movement involved		
+
+        	// Skip automagically, if binary movement involved
         	if (*pTcOrg & W3D_TIMECODED_BINARY_MOVEMENT_FLAG) {
-				continue;	// can't get rid of this guy	
-        	}			  
+				continue;	// can't get rid of this guy
+        	}
        	if (*pTcDst & W3D_TIMECODED_BINARY_MOVEMENT_FLAG)  {
         		continue;	// can't get rid of this guy either
         	}
-        
+
 			float32 tStart    = ((*pTcSrc) & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG); // upgrade to floats
 			float32 tRecreate = *pTcOrg;
-			float32 tEnd      = *pTcDst; 
+			float32 tEnd      = *pTcDst;
 			float32 tRatio    = (tRecreate - tStart) / (tEnd - tStart);
-        				  
-		  
+
+
 			Quaternion qSrc(1);
 			qSrc.Set(pVecSrc[0],pVecSrc[1],pVecSrc[2],pVecSrc[3]);
 
@@ -1127,31 +1127,31 @@ uint32 VectorChannelClass::find_useless_packetQ(W3dTimeCodedAnimChannelStruct *
 			Quaternion q = Slerp( qSrc, qDst, tRatio );
 
 			Quaternion Delta(1);
-			Delta =  Inverse(qOrg) * q; 
- 
+			Delta =  Inverse(qOrg) * q;
+
 			double angle = acosf( fabs( Delta.W ) ) * 2.0;
-				
+
 			if (angle <= tolerance ) {
 				return (try_idx + 1);
 			}
 
 			// else continue
-               
-		}	// for
-		
+
+		}
+
 	}
-        
-  	}	
+
+  	}
     else  {
     	// Special Case, when there are only 2 time codes
       // Check to see if they are equal, value
       // if so, then return the 2nd timecode as useless
-      
+
 		float32 *pVecSrc = (float32 *) &c->Data[ 1 ];
-      float32 *pVecDst = (float32 *) &c->Data[ packet_size + 1 ];  
-       
+      float32 *pVecDst = (float32 *) &c->Data[ packet_size + 1 ];
+
       if ((c->Data[ packet_size ] & W3D_TIMECODED_BINARY_MOVEMENT_FLAG) == 0)  {
-      	
+
 			Quaternion qSrc(1);
 			qSrc.Set(pVecSrc[0], pVecSrc[1], pVecSrc[2], pVecSrc[3]);
 
@@ -1162,22 +1162,22 @@ uint32 VectorChannelClass::find_useless_packetQ(W3dTimeCodedAnimChannelStruct *
 			Delta = Inverse(qSrc) * qDst;
 
 			double angle = acosf( fabs( Delta.W ) ) * 2.0;
-				
+
 			if (angle <= tolerance ) {
 				return (1);
 			}
       }
   }
-	
+
 	return( PACKETS_ALL_USEFUL );
-	
-} // find_useless_packetQ	
+
+}
 
 
 //
 //	Instead of using a fixed error threshold, find the packet
 // that generates the least amount of error, via removal
-// 
+//
 // Make Sure we NEVER get rid of binary movement packets
 // The rule is, you can't interpolate too a binary movement, but you can
 // interpolate FROM
@@ -1186,75 +1186,75 @@ uint32 VectorChannelClass::find_useless_packetQ(W3dTimeCodedAnimChannelStruct *
 uint32 VectorChannelClass::find_least_useful_packet(W3dTimeCodedAnimChannelStruct *c)
 {
 
-static  float32 tempvec[MAX_VECTOR_SIZE];		
-	
+static  float32 tempvec[MAX_VECTOR_SIZE];
+
   assert( c );	// make sure pointer exists
   assert( c->NumTimeCodes );	// make sure some packets exist
   assert( c->VectorLen <= MAX_VECTOR_SIZE );
-  		 
+
   uint32 packet_size = c->VectorLen + 1;
-  
+
   double leasterror = 9999999.0f;
   uint32 ret_idx = PACKETS_ALL_USEFUL;
-                       
+
 	if (c->NumTimeCodes > 1) {
 		if (c->NumTimeCodes > 2)  {
-  						 
+
   			float32 *pVecSrc, *pVecDst, *pVecOriginal;
 			uint32	*pTcSrc,  *pTcDst,  *pTcOriginal;
-              
+
 			for(uint32 try_idx = 0; try_idx < (c->NumTimeCodes - 2); try_idx++)  {
-      	
+
 				// Src Pointers
 				pTcSrc  = (uint32 *) &c->Data[ try_idx * packet_size ];
 				pVecSrc	= (float32 *) pTcSrc+1;
-        				 
-				// Original Vector we're trying to recreate         
+
+				// Original Vector we're trying to recreate
 				pTcOriginal  = (uint32 *) &c->Data[ (try_idx + 1) * packet_size ];
 				pVecOriginal = (float32 *) pTcOriginal+1;
-        
+
 				// Dst Pointers
 				pTcDst  = (uint32 *) &c->Data[ (try_idx + 2 ) * packet_size ];
-				pVecDst =	(float32 *) pTcDst+1;	 
-        		
-	        	// Skip automagically, if binary movement involved		
+				pVecDst =	(float32 *) pTcDst+1;
+
+	        	// Skip automagically, if binary movement involved
 	       	if (*pTcOriginal & W3D_TIMECODED_BINARY_MOVEMENT_FLAG) {
-					continue;	// can't get rid of this guy	
-	         }			  
+					continue;	// can't get rid of this guy
+	         }
 	         if (*pTcDst & W3D_TIMECODED_BINARY_MOVEMENT_FLAG)  {
 	        		continue;	// can't get rid of this guy either
 	         }
-                              
+
 				// Linear Interpolate between Src, and Dst, to recreate the
 				// Original
-        
+
 				float32 tStart    = ((*pTcSrc) & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG);				// upgrade to floats
 				float32 tRecreate = *pTcOriginal;
-				float32 tEnd      = *pTcDst; 
+				float32 tEnd      = *pTcDst;
 				float32 tRatio    = (tRecreate - tStart) / (tEnd - tStart);
-        		 																	
+
 				uint32 idx=0;
 				for (; idx < c->VectorLen; idx++)  {
-        
+
         		 tempvec[ idx ] = WWMath::Lerp(pVecSrc[idx], pVecDst[idx], tRatio);
-          	 	
-				}                                    
-        
+
+				}
+
 				// Compare Original to our re-creation
 
 				double delta = 0.0;
-				
-        
+
+
 				for (idx=0; idx < c->VectorLen; idx++)  {
-        		 
+
 					double tmp;
 
 					tmp = pVecOriginal[idx] - tempvec[idx];
 
 					delta += (tmp * tmp);
-          
-				}													 
-                   
+
+				}
+
 				delta = sqrtf( delta );
 
 				if (delta < leasterror)
@@ -1265,34 +1265,34 @@ static  float32 tempvec[MAX_VECTOR_SIZE];
 					leasterror = delta;
 					ret_idx =(try_idx + 1);
 				}
-        
+
 				// else continue
-               
-			}	// for 
+
+			}
 
 			return( ret_idx );
-        
-		}	
+
+		}
 		else  {
-         
+
       	if ((c->Data[ packet_size ] & W3D_TIMECODED_BINARY_MOVEMENT_FLAG) == 0) {
-				return( 1 );																				 
+				return( 1 );
          }
 		}
   }
-			
-  
+
+
   return( PACKETS_ALL_USEFUL );
-         
 
-}  // Find Least useful packet
+
+}
 
 
 //
 //	Instead of using a fixed error threshold, find the packet
 // that generates the least amount of error, via removal
 // special case for Quaternion channel
-// 
+//
 // Make Sure we NEVER get rid of binary movement packets
 // The rule is, you can't interpolate FROM a binary movement, but you can
 // interpolate TOO
@@ -1304,49 +1304,49 @@ uint32 VectorChannelClass::find_least_useful_packetQ(W3dTimeCodedAnimChannelStru
   assert( c );	// make sure pointer exists
   assert( c->NumTimeCodes );	// make sure some packets exist
   assert( c->VectorLen == 4);
-  		 
+
   uint32 packet_size = c->VectorLen + 1;
 
   double leasterror = 9999999.0f;
   uint32 ret_idx = PACKETS_ALL_USEFUL;
-  
+
   if (c->NumTimeCodes > 1) {
   	if (c->NumTimeCodes > 2)  {
-  						 
+
   		float32 *pVecSrc, *pVecDst, *pVecOrg;
       uint32	*pTcSrc,  *pTcDst,  *pTcOrg;
-              
+
 		for(uint32 try_idx = 0; try_idx < (c->NumTimeCodes - 2); try_idx++)  {
-      	
+
 			// Src Pointers
 			pTcSrc  = (uint32 *) &c->Data[ try_idx * packet_size ];
 			pVecSrc	= (float32 *) pTcSrc+1;
-        				 
-			// Original Vector we're trying to recreate         
+
+			// Original Vector we're trying to recreate
 			pTcOrg  = (uint32 *) &c->Data[ (try_idx + 1) * packet_size ];
 			pVecOrg = (float32 *) pTcOrg+1;
-        
+
 			// Dst Pointers
 			pTcDst  = (uint32 *) &c->Data[ (try_idx + 2 ) * packet_size ];
-			pVecDst = (float32 *) pTcDst+1;	 
-        	
-	      // Skip automagically, if binary movement involved		
+			pVecDst = (float32 *) pTcDst+1;
+
+	      // Skip automagically, if binary movement involved
 	      if (*pTcOrg & W3D_TIMECODED_BINARY_MOVEMENT_FLAG) {
-				continue;	// can't get rid of this guy	
-	      }			  
+				continue;	// can't get rid of this guy
+	      }
 	      if (*pTcDst & W3D_TIMECODED_BINARY_MOVEMENT_FLAG)  {
 	      	continue;	// can't get rid of this guy either
 	      }
-                         
+
 			// Spherical Linear Interpolate between Src, and Dst, to recreate the
 			// Original
-        
+
 			float32 tStart    = ((*pTcSrc) & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG);				// upgrade to floats
 			float32 tRecreate = *pTcOrg;
-			float32 tEnd      = *pTcDst; 
+			float32 tEnd      = *pTcDst;
 			float32 tRatio    = (tRecreate - tStart) / (tEnd - tStart);
-        				  
-		  
+
+
 			Quaternion qSrc(1);
 			qSrc.Set(pVecSrc[0],pVecSrc[1],pVecSrc[2],pVecSrc[3]);
 
@@ -1359,38 +1359,38 @@ uint32 VectorChannelClass::find_least_useful_packetQ(W3dTimeCodedAnimChannelStru
 			Quaternion q = Slerp( qSrc, qDst, tRatio );
 
 			Quaternion Delta(1);
-			Delta =  Inverse(qOrg) * q; 
- 
+			Delta =  Inverse(qOrg) * q;
+
 			double angle = acosf( fabs( Delta.W ) ) * 2;
-				
+
 			if (angle < leasterror ) {
 				leasterror = angle;
 				ret_idx = (try_idx + 1);
 			}
-        
+
 			// else continue
-               
-		}	// for
+
+		}
 
 		return( ret_idx );
-		
+
 	}
-        
-  	}	
+
+  	}
     else  {
     	// Special Case, when there are only 2 time codes
       // Check to see if they are equal, value
       // if so, then return the 2nd timecode as useless
-      
+
       	if ((c->Data[ packet_size ] & W3D_TIMECODED_BINARY_MOVEMENT_FLAG) == 0) {
-				return( 1 );																				 
+				return( 1 );
          }
   }
 
-	 
+
   return( PACKETS_ALL_USEFUL );
 
-} // find_least_useful_packetQ
+}
 
 
-// EOF - vchannel.cpp
\ No newline at end of file
+// EOF - vchannel.cpp
diff --git a/Core/Tools/WW3D/max2w3d/vchannel.h b/Core/Tools/WW3D/max2w3d/vchannel.h
index 051c4b376d1..e26d75c3ada 100644
--- a/Core/Tools/WW3D/max2w3d/vchannel.h
+++ b/Core/Tools/WW3D/max2w3d/vchannel.h
@@ -17,34 +17,32 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/vchannel.h 8     10/30/00 6:56p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/vchannel.h                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/30/00 5:25p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 8                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/vchannel.h                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/30/00 5:25p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 8                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef VCHANNEL_H
-#define VCHANNEL_H
+#pragma once
 
 #ifndef ALWAYS_H
 #include "always.h"
 #endif
 
 #ifndef BITTYPE_H
-#include "BITTYPE.H"
+#include "BITTYPE.h"
 #endif
 
 #ifndef CHUNKIO_H
@@ -134,7 +132,5 @@ class VectorChannelClass
 	void		remove_packet(W3dTimeCodedAnimChannelStruct * c, uint32 packet_idx);
 	bool		SaveTimeCoded(ChunkSaveClass & csave, BitChannelClass *binmov);
 	bool		SaveAdaptiveDelta(ChunkSaveClass & csave, BitChannelClass *binmov);
-  
-};
 
-#endif /*VCHANNEL_H*/
\ No newline at end of file
+};
diff --git a/Core/Tools/WW3D/max2w3d/vxl.cpp b/Core/Tools/WW3D/max2w3d/vxl.cpp
index f91d0d3d2f6..969095a7b2d 100644
--- a/Core/Tools/WW3D/max2w3d/vxl.cpp
+++ b/Core/Tools/WW3D/max2w3d/vxl.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/vxl.cpp 4     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G Math Library                                    * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/vxl.cpp                        $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/14/97 3:07p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 4                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G Math Library                                    *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/vxl.cpp                        $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/14/97 3:07p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 4                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "vxl.h"
@@ -42,7 +42,7 @@
 /*
 
 	This module will voxelize one or more meshes.  It is only used to compute
-	some things like Moment of Inertia and Center of Mass for the object. 
+	some things like Moment of Inertia and Center of Mass for the object.
 	Much of the code which was doing the shading and lighting computations
 	has been stripped out.
 
@@ -86,14 +86,14 @@ VoxelClass::VoxelClass
 	XDim = resolution + 1;
 	YDim = resolution + 1;
 	ZDim = resolution + 1;
-	
+
 	// assert that none of the dimensions
 	// were too big.  (if this happened, VoxelData is going
 	// to be a *HUMONGOUS* amount of memory...)
 	assert(XDim < 256);
 	assert(YDim < 256);
 	assert(ZDim < 256);
-	
+
 	// Allocate visibility flags array
 	VisData = new uint8[XDim * YDim * ZDim];
 	if (VisData == NULL) {
@@ -115,7 +115,7 @@ VoxelClass::VoxelClass
 	/*
 	** The voxelizer uses three values: offset, size,
 	** and scale:
-	**	
+	**
 	** offset - the position of the "most negative" corner
 	**	size - dimensions of the box
 	** scale - scale factor to apply to vertices after they've
@@ -136,7 +136,7 @@ VoxelClass::VoxelClass
 	BlockYDim = Size.y / Resolution;
 	BlockZDim = Size.z / Resolution;
 
-	
+
 	/*
 	** Voxelize the meshes!
 	*/
@@ -192,7 +192,7 @@ void VoxelClass::Quantize_Meshes
 	meter.Finish_In_Steps(2);
 	Progress_Meter_Class slabmeter(meter,meter.Increment);
 	slabmeter.Finish_In_Steps(ZDim);
-	
+
 	/*
 	** Generate the Voxel Layer for each slice of the model
 	*/
@@ -215,7 +215,7 @@ void VoxelClass::Quantize_Meshes
 			sliceh,
 			XDim,
 			YDim
-		);	 
+		);
 
 		Set_Layer(*vlayer,slicecount);
 
@@ -269,7 +269,7 @@ void VoxelClass::Set_Layer
 				raw_set_vis(i,j,z,VIS_UNKNOWN);
 			} else {
 				raw_set_vis(i,j,z,VIS_SOLID);
-			}				
+			}
 		}
 	}
 }
@@ -306,7 +306,7 @@ void VoxelClass::Compute_Bounding_Box
 	BoxCorner[0].x = offset.x + size.x;
 	BoxCorner[0].y = offset.y + size.y;
 	BoxCorner[0].z = offset.z;
-	
+
 	// +x -y -z
 	BoxCorner[1].x = offset.x + size.x;
 	BoxCorner[1].y = offset.y;
@@ -316,17 +316,17 @@ void VoxelClass::Compute_Bounding_Box
 	BoxCorner[2].x = offset.x;
 	BoxCorner[2].y = offset.y;
 	BoxCorner[2].z = offset.z;
-	
+
 	// -x +y -z
 	BoxCorner[3].x = offset.x;
 	BoxCorner[3].y = offset.y + size.y;
 	BoxCorner[3].z = offset.z;
-	
+
 	// +x +y +z
 	BoxCorner[4].x = offset.x + size.x;
 	BoxCorner[4].y = offset.y + size.y;
 	BoxCorner[4].z = offset.z + size.z;
-	
+
 	// +x -y +z
 	BoxCorner[5].x = offset.x + size.x;
 	BoxCorner[5].y = offset.y;
@@ -336,12 +336,12 @@ void VoxelClass::Compute_Bounding_Box
 	BoxCorner[6].x = offset.x;
 	BoxCorner[6].y = offset.y;
 	BoxCorner[6].z = offset.z + size.z;
-	
+
 	// -x +y +z
 	BoxCorner[7].x = offset.x;
 	BoxCorner[7].y = offset.y + size.y;
 	BoxCorner[7].z = offset.z + size.z;
-	
+
 	// Now, scale all of them into the voxel co-ordinate system
 	for (i=0; i<8; i++) {
 		BoxCorner[i].x *= Scale.x;
@@ -355,11 +355,11 @@ void VoxelClass::Compute_Bounding_Box
 * VoxelClass::Compute_Visibility
 *
 * Detects the outer shell of the voxel object.
-* "Tunnels" are drilled into the voxel space from all directions, all 
-* voxels that are encountered before hitting the outer shell are marked 
+* "Tunnels" are drilled into the voxel space from all directions, all
+* voxels that are encountered before hitting the outer shell are marked
 * as VIS_VISIBLE.  After doing all of the tunnels, all voxels which are
 * not now marked as VIS_VISIBLE are marked as VIS_SOLID.  This way we
-* can absorb all internal geometry into one big blob.  Next we will 
+* can absorb all internal geometry into one big blob.  Next we will
 * suck out the internals of that blob :-)
 *
 * INPUTS:
@@ -377,11 +377,11 @@ void VoxelClass::Compute_Visiblity
 	int x,y,z;
 
 	meter.Finish_In_Steps(ZDim + XDim + ZDim);
-	
+
 	/////////////////////////////////////////////////////////////
 	// First, I'm going to loop through the layers (X-Y planes)
-	// For each layer, I'll tunnel in the x and y direction 
-	// from each point along its edge.  This is identical to 
+	// For each layer, I'll tunnel in the x and y direction
+	// from each point along its edge.  This is identical to
 	// the way James does his 2d visibility
 	/////////////////////////////////////////////////////////////
 	for (z = 0; z < (int)ZDim; z++) {
@@ -416,9 +416,9 @@ void VoxelClass::Compute_Visiblity
 
 		meter.Add_Increment();
 		if (meter.Cancelled()) throw ErrorClass("Export Cancelled");
-	} // done with the X-Y layers
+	}
+
 
-	
 	/////////////////////////////////////////////////////////////
 	// Now I'm going to tunnel up and down through the object.
 	// To do this, I will loop across the width of the object
@@ -443,7 +443,7 @@ void VoxelClass::Compute_Visiblity
 
 		meter.Add_Increment();
 		if (meter.Cancelled()) throw ErrorClass("Export Cancelled");
-	} // done with the X-Z layers
+	}
 
 
 	///////////////////////////////////////////////////////////
@@ -529,7 +529,7 @@ void VoxelClass::raw_set_vis(
 
 
 void compute_dimensions
-(  
+(
 	INodeListClass &	meshlist,
 	const Matrix3 &	parenttm,
 	TimeValue			curtime,
@@ -547,7 +547,7 @@ void compute_dimensions
 
 	for ( unsigned i = 0; i < meshlist.Num_Nodes() ; ++ i )
 	{
-		
+
 		//	Get the relavent data from the INode
 		INode *        n   = meshlist[i];
 		Object *       obj = n->EvalWorldState(curtime).obj;
@@ -555,11 +555,11 @@ void compute_dimensions
 		Mesh *         mesh = &(tri->mesh);
 		Matrix3        tm   = n->GetObjTMAfterWSM(curtime);
 
-		
+
 		// Compute a matrix which takes vertices of this mesh into the
 		// specified parent space.
-		Matrix3			delta = tm * Inverse(parenttm);				
-		
+		Matrix3			delta = tm * Inverse(parenttm);
+
 		unsigned verts = mesh->getNumVerts();
 		unsigned faces = mesh->getNumFaces();
 
@@ -610,16 +610,16 @@ void compute_dimensions
 
 uint8	VoxelClass::Is_Solid(int i,int j,int k)
 {
-	return (raw_read_vis(i,j,k) == VIS_SOLID); 
+	return (raw_read_vis(i,j,k) == VIS_SOLID);
 }
 
 void VoxelClass::Compute_Physical_Properties(double Volume[1],double CM[3],double I[9])
 {
 	int i,j,k;
-	
+
 	// volume of a single voxel block:
 	double bvol = BlockXDim * BlockYDim * BlockZDim;
-	
+
 	// volume of object
 	double volume = 0.0;
 	Point3 cm(0.0,0.0,0.0);
@@ -635,7 +635,7 @@ void VoxelClass::Compute_Physical_Properties(double Volume[1],double CM[3],doubl
 
 					// Add this block's volume to the total
 					volume += bvol;
-	
+
 					// Add this block's position to the CM computation
 					cm += Voxel_Position(i,j,k);
 					numblocks++;
@@ -679,7 +679,7 @@ void VoxelClass::Compute_Physical_Properties(double Volume[1],double CM[3],doubl
 		for (j=0; j < YDim; j++) {
 			for (i=0; i < XDim; i++) {
 				if (Is_Solid(i,j,k)) {
-	
+
 					// position of block, relative to the CM
 					Point3 pos = Voxel_Position(i,j,k) - cm;
 
@@ -692,7 +692,7 @@ void VoxelClass::Compute_Physical_Properties(double Volume[1],double CM[3],doubl
 					double xy = pos.x * pos.y;
 					double xz = pos.x * pos.z;
 					double yz = pos.y * pos.z;
-					
+
 					// add to the running total!
 					I[0] += y2z2 * bvol;
 					I[1] += -xy * bvol;
@@ -719,4 +719,4 @@ Point3 VoxelClass::Voxel_Position(int i,int j,int k)
 		Offset.y + j * BlockYDim + BlockYDim / 2.0,
 		Offset.z + k * BlockZDim + BlockZDim / 2.0
 	);
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/WW3D/max2w3d/vxl.h b/Core/Tools/WW3D/max2w3d/vxl.h
index 868170bbf8e..0d3b688d2db 100644
--- a/Core/Tools/WW3D/max2w3d/vxl.h
+++ b/Core/Tools/WW3D/max2w3d/vxl.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/vxl.h 4     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/vxl.h                          $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/26/97 1:35p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 4                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/vxl.h                          $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/26/97 1:35p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 4                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef VXL_H
-#define VXL_H
+#pragma once
 
 #ifndef ALWAYS_H
 #include "always.h"
@@ -54,7 +52,7 @@
 #endif
 
 #ifndef PROGRESS_H
-#include "PROGRESS.H"
+#include "PROGRESS.h"
 #endif
 
 
@@ -89,8 +87,8 @@ class VoxelClass
 	uint8		Is_Solid(int i,int j,int k);
 
 	void		Compute_Physical_Properties(double Volume[1],double CM[3],double I[9]);
-	
-private:	
+
+private:
 
 	int		XDim;
 	int		YDim;
@@ -104,10 +102,10 @@ class VoxelClass
 
 	float				Resolution;			// resolution of the voxel grid
 	TimeValue		CurTime;
-	Point3			Offset;				
+	Point3			Offset;
 	Point3			Size;
 	Point3			Scale;				// three scale values to fit the meshes into the desired grid
-	
+
 	Point3			BoxCorner[8];		// World-Space corners of the bounding box of the voxel space
 	Matrix3			ParentTM;			// coordinate system of the parent of this object.
 
@@ -129,16 +127,13 @@ class VoxelClass
 		VoxelLayerClass &		layer,
 		uint32					z
 	);
-	
+
 	// compute the bounding box
 	void Compute_Bounding_Box(Point3 size,Point3 offset);
-	
+
 	// 3D visibility
 	void Compute_Visiblity(Progress_Meter_Class & meter);
 
 	// returns the position of the center of voxel(i,j,k)
 	Point3 Voxel_Position(int i,int j,int k);
 };
-
-
-#endif /*VXL_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/vxldbg.cpp b/Core/Tools/WW3D/max2w3d/vxldbg.cpp
index 2b269aa58b8..bbe844fa81d 100644
--- a/Core/Tools/WW3D/max2w3d/vxldbg.cpp
+++ b/Core/Tools/WW3D/max2w3d/vxldbg.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/vxldbg.cpp 3     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Engine                                       * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/vxldbg.cpp                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/14/97 3:07p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Engine                                       *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/vxldbg.cpp                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/14/97 3:07p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -64,7 +64,7 @@ VoxelDebugWindowClass::~VoxelDebugWindowClass(void)
 	ReleaseISpinner(LayerSpin);
 }
 
-void VoxelDebugWindowClass::Display_Window(void) 
+void VoxelDebugWindowClass::Display_Window(void)
 {
 	DialogBoxParam
 						(
@@ -82,7 +82,7 @@ bool VoxelDebugWindowClass::Dialog_Proc
 	HWND hWnd,
 	UINT message,
 	WPARAM wParam,
-	LPARAM 
+	LPARAM
 )
 {
 	RECT crect;
@@ -160,7 +160,7 @@ bool VoxelDebugWindowClass::Dialog_Proc
 					break;
 			}
 
-			
+
 		/*******************************************************************
 		* WM_PAINT
 		*
@@ -172,9 +172,9 @@ bool VoxelDebugWindowClass::Dialog_Proc
 
 			GetClientRect(ViewportHWND,&crect);
 			ValidateRect(ViewportHWND,&crect);
-			
+
 			break;
-			
+
 	}
 	return 0;
 }
@@ -183,7 +183,7 @@ bool VoxelDebugWindowClass::Dialog_Proc
 void VoxelDebugWindowClass::update_display(void)
 {
 	int i,j;
-	
+
 	/*
 	** Bail out if everything isn't right
 	*/
@@ -192,7 +192,7 @@ void VoxelDebugWindowClass::update_display(void)
 	}
 
 	/*
-	** Update the contents of the DIB based on 
+	** Update the contents of the DIB based on
 	** the contents of the current voxel layer.
 	*/
 
@@ -223,7 +223,7 @@ void VoxelDebugWindowClass::update_display(void)
 	int y1 = 2 * Bitmap->Get_Height(); //cy + Bitmap->Get_Height();
 
 //	BitBlt(hdcwindow,0,0,Bitmap->Get_Width(),Bitmap->Get_Height(),hdcdib,0,0,SRCCOPY);
-	StretchBlt(		hdcwindow, x0, y0, x1, y1, 
+	StretchBlt(		hdcwindow, x0, y0, x1, y1,
 						hdcdib, 0, 0, Bitmap->Get_Width(), Bitmap->Get_Height(), SRCCOPY);
 
 	SelectObject(hdcdib, holdbitmap);
diff --git a/Core/Tools/WW3D/max2w3d/vxldbg.h b/Core/Tools/WW3D/max2w3d/vxldbg.h
index a841905e92a..8a734b8a746 100644
--- a/Core/Tools/WW3D/max2w3d/vxldbg.h
+++ b/Core/Tools/WW3D/max2w3d/vxldbg.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/vxldbg.h 3     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Engine                                       * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/vxldbg.h                       $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/14/97 3:07p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Engine                                       *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/vxldbg.h                       $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/14/97 3:07p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef VXLDBG_H
-#define VXLDBG_H
+#pragma once
 
 #ifndef ALWAYS_H
 #include "always.h"
@@ -73,10 +71,6 @@ class VoxelDebugWindowClass
 	HWND						WindowHWND;
 	HWND						ViewportHWND;
 	ISpinnerControl *		LayerSpin;
- 
+
 	void update_display(void);
 };
-
-
-
-#endif
diff --git a/Core/Tools/WW3D/max2w3d/vxllayer.cpp b/Core/Tools/WW3D/max2w3d/vxllayer.cpp
index b010e15cdb7..3a23cfa19cb 100644
--- a/Core/Tools/WW3D/max2w3d/vxllayer.cpp
+++ b/Core/Tools/WW3D/max2w3d/vxllayer.cpp
@@ -17,34 +17,34 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/vxllayer.cpp 4     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G                                                 * 
- *                                                                                             * 
- *                    File Name : VXLLAYER.CPP                                                 * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/10/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 10, 1997 [GH]                                           * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   VoxelLayerClass::VoxelLayerClass -- Constructor for VoxelLayerClass                       * 
- *   VoxelLayerClass::Intersect_Triangle -- Intersect a triangle with the slab                 * 
- *   VoxelLayerClass::Draw_Line -- Draw a line of voxels into the slab                         * 
- *   VoxelLayerClass::Scan_Triangle -- Clip and scan-convert a triangle into the slab          * 
- *   clip_tri_to_slab -- Clips a triangle against a voxel slab                                 * 
- *   clip_poly -- clip a polygon against a single 3D plane                                     * 
- *   output -- Emit a vertex into a polygons vertex list                                       * 
- *   inside -- Test whether a point is in the front half-space of a plane                      * 
- *   intersect -- compute intersection between a line and a plane                              * 
- *   clear_scan_table -- clears the static scanline table                                      * 
- *   fixup_scan_table -- ensure all spans are left->right in order                             * 
- *   scan_edge -- Scan convert an edge                                                         * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G                                                 *
+ *                                                                                             *
+ *                    File Name : VXLLAYER.cpp                                                 *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/10/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 10, 1997 [GH]                                           *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   VoxelLayerClass::VoxelLayerClass -- Constructor for VoxelLayerClass                       *
+ *   VoxelLayerClass::Intersect_Triangle -- Intersect a triangle with the slab                 *
+ *   VoxelLayerClass::Draw_Line -- Draw a line of voxels into the slab                         *
+ *   VoxelLayerClass::Scan_Triangle -- Clip and scan-convert a triangle into the slab          *
+ *   clip_tri_to_slab -- Clips a triangle against a voxel slab                                 *
+ *   clip_poly -- clip a polygon against a single 3D plane                                     *
+ *   output -- Emit a vertex into a polygons vertex list                                       *
+ *   inside -- Test whether a point is in the front half-space of a plane                      *
+ *   intersect -- compute intersection between a line and a plane                              *
+ *   clear_scan_table -- clears the static scanline table                                      *
+ *   fixup_scan_table -- ensure all spans are left->right in order                             *
+ *   scan_edge -- Scan convert an edge                                                         *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -127,17 +127,17 @@ static void scan_edge(
 
 
 
-/*********************************************************************************************** 
- * VoxelLayerClass::VoxelLayerClass -- Constructor for VoxelLayerClass                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * VoxelLayerClass::VoxelLayerClass -- Constructor for VoxelLayerClass                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 VoxelLayerClass::VoxelLayerClass
 (
@@ -150,7 +150,7 @@ VoxelLayerClass::VoxelLayerClass
 	float					sliceh,
 	int					bmwidth,
 	int					bmheight
-) 
+)
 {
 	unsigned i;
 
@@ -177,13 +177,13 @@ VoxelLayerClass::VoxelLayerClass
 
 		// Compute a delta matrix which puts vertices into the parent space
 		Matrix3 delta = objtm * Inverse(parenttm);
-		
+
 		// Loop through each face, intersecting it with the slice.
 		unsigned faces = mesh->getNumFaces();
 		for ( unsigned face_index = 0; face_index < faces; ++ face_index )
 		{
 			Face & face = mesh->faces [ face_index ];
-			
+
 			// transform the vertices into the parent space
 			Point3 a = mesh->verts [ face.v[0] ] * delta;
 			Point3 b = mesh->verts [ face.v[1] ] * delta;
@@ -213,17 +213,17 @@ VoxelLayerClass::VoxelLayerClass
 
 
 
-/*********************************************************************************************** 
- * VoxelLayerClass::Intersect_Triangle -- Intersect a triangle with the slab                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * VoxelLayerClass::Intersect_Triangle -- Intersect a triangle with the slab                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void VoxelLayerClass::Intersect_Triangle
 (
@@ -292,17 +292,17 @@ void VoxelLayerClass::Intersect_Triangle
 }
 
 
-/*********************************************************************************************** 
- * VoxelLayerClass::Draw_Line -- Draw a line of voxels into the slab                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * VoxelLayerClass::Draw_Line -- Draw a line of voxels into the slab                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void VoxelLayerClass::Draw_Line
 (
@@ -380,17 +380,17 @@ void VoxelLayerClass::Draw_Line
 
 
 
-/*********************************************************************************************** 
- * VoxelLayerClass::Scan_Triangle -- Clip and scan-convert a triangle into the slab            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * VoxelLayerClass::Scan_Triangle -- Clip and scan-convert a triangle into the slab            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void VoxelLayerClass::Scan_Triangle
 (
@@ -400,7 +400,7 @@ void VoxelLayerClass::Scan_Triangle
 )
 {
 	int i;
-	
+
 	// check if the entire triangle is above or below the slab:
 	if (p0.z < SliceZ0 && p1.z < SliceZ0 && p2.z < SliceZ1) return;
 	if (p0.z > SliceZ1 && p1.z > SliceZ1 && p2.z > SliceZ1) return;
@@ -414,7 +414,7 @@ void VoxelLayerClass::Scan_Triangle
 
 	// clear the scanline table, get y-extents of polygon
 	clear_scan_table();
-	
+
 	float miny = polyvert[0].Pos.y;
 	float maxy = polyvert[0].Pos.y;
 
@@ -422,7 +422,7 @@ void VoxelLayerClass::Scan_Triangle
 		if (polyvert[i].Pos.y < miny) miny = polyvert[i].Pos.y;
 		if (polyvert[i].Pos.y > maxy) maxy = polyvert[i].Pos.y;
 	}
-	
+
 	// scanconvert the triangle
 	int start = numverts - 1;
 	for (i=0; i<numverts; i++) {
@@ -448,17 +448,17 @@ void VoxelLayerClass::Scan_Triangle
 }
 
 
-/*********************************************************************************************** 
- * clip_tri_to_slab -- Clips a triangle against a voxel slab                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * clip_tri_to_slab -- Clips a triangle against a voxel slab                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 static void clip_tri_to_slab
 (
@@ -486,36 +486,36 @@ static void clip_tri_to_slab
 
 	// clip from the out buffer to the tmp buffer against bottom of slab:
 	clip_poly(outverts,3,tmpverts,setnum,PlaneClass(Vector3(0.0f,0.0f,1.0f),-z0));
-	
+
 	// clip from the tmp buffer to the out buffer against top of slab:
 	clip_poly(tmpverts,*setnum,outverts,setnum,PlaneClass(Vector3(0.0f,0.0f,-1.0f),z1));
 }
 
 
-/*********************************************************************************************** 
- * clip_poly -- clip a polygon against a single 3D plane                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * clip_poly -- clip a polygon against a single 3D plane                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 static void clip_poly
 (
-	vertexstruct *			inverts, 
-	int						innum, 
-	vertexstruct *			outverts, 
+	vertexstruct *			inverts,
+	int						innum,
+	vertexstruct *			outverts,
 	int *						outnum,
 	const PlaneClass &	clipplane
 )
 {
 	vertexstruct p0,p1;	// start and end of current edge
 	vertexstruct pi;		// intersection point
-	int i;					
+	int i;
 
 	// start with zero vertices
 	*outnum = 0;
@@ -524,7 +524,7 @@ static void clip_poly
 	for (i=0; i<innum; i++) {
 		p1 = inverts[i];
 
-		if (inside(p1,clipplane)) { 
+		if (inside(p1,clipplane)) {
 			if (inside(p0,clipplane)) {
 				output(p1,outverts,outnum);			//both inside: output p1
 			} else {
@@ -543,17 +543,17 @@ static void clip_poly
 }
 
 
-/*********************************************************************************************** 
- * output -- Emit a vertex into a polygons vertex list                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * output -- Emit a vertex into a polygons vertex list                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 static void output
 (
@@ -567,17 +567,17 @@ static void output
 }
 
 
-/*********************************************************************************************** 
- * inside -- Test whether a point is in the front half-space of a plane                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * inside -- Test whether a point is in the front half-space of a plane                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 static int inside
 (
@@ -592,19 +592,19 @@ static int inside
 		return 0;
 	}
 }
-	
-
-/*********************************************************************************************** 
- * intersect -- compute intersection between a line and a plane                                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+
+
+/***********************************************************************************************
+ * intersect -- compute intersection between a line and a plane                                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 static vertexstruct intersect
 (
@@ -618,9 +618,9 @@ static vertexstruct intersect
 	Point3 delta = p1.Pos - p0.Pos;
 
 	float num = -( plane.N[0] * p0.Pos.x +
-					   plane.N[1] * p0.Pos.y + 
+					   plane.N[1] * p0.Pos.y +
 					   plane.N[2] * p0.Pos.z + plane.D );
-	
+
 	float den = plane.N[0] * delta.x +
 					plane.N[1] * delta.y +
 					plane.N[2] * delta.z;
@@ -638,17 +638,17 @@ static vertexstruct intersect
 }
 
 
-/*********************************************************************************************** 
- * clear_scan_table -- clears the static scanline table                                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * clear_scan_table -- clears the static scanline table                                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 static void clear_scan_table(void)
 {
@@ -659,17 +659,17 @@ static void clear_scan_table(void)
 	}
 }
 
-/*********************************************************************************************** 
- * fixup_scan_table -- ensure all spans are left->right in order                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * fixup_scan_table -- ensure all spans are left->right in order                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 static void fixup_scan_table(int y0,int y1)
 {
@@ -688,11 +688,11 @@ static void fixup_scan_table(int y0,int y1)
 	// Ensure that we leave no gaps.
 	for (i=y0; i<y1; i++) {
 		if (_scantab[i+1].P[RIGHT].Pos.x < _scantab[i].P[LEFT].Pos.x) {
-			
+
 			_scantab[i+1].P[RIGHT].Pos.x = _scantab[i].P[LEFT].Pos.x;
 
 		} else if (_scantab[i+1].P[LEFT].Pos.x > _scantab[i].P[RIGHT].Pos.x) {
-			
+
 			_scantab[i+1].P[LEFT].Pos.x = _scantab[i].P[RIGHT].Pos.x;
 
 		}
@@ -700,17 +700,17 @@ static void fixup_scan_table(int y0,int y1)
 }
 
 
-/*********************************************************************************************** 
- * scan_edge -- Scan convert an edge                                                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * scan_edge -- Scan convert an edge                                                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 static void scan_edge
 (
@@ -720,7 +720,7 @@ static void scan_edge
 {
 	// is this a perfectly horizontal edge:
 	if (floor(p0.Pos.y) == floor(p1.Pos.y)) {
-		
+
 		int si = (int)floor(p0.Pos.y);
 		const vertexstruct *left, *right;
 
@@ -736,12 +736,12 @@ static void scan_edge
 		if (_scantab[si].P[0].Pos.x != EMPTY_SPAN) {
 
 			// yes, expand this scanline's span to include this span
-			if (left->Pos.x < _scantab[si].P[LEFT].Pos.x) {	
-				_scantab[si].P[LEFT] =  *left;		
+			if (left->Pos.x < _scantab[si].P[LEFT].Pos.x) {
+				_scantab[si].P[LEFT] =  *left;
 			}
 
 			if (right->Pos.x > _scantab[si].P[RIGHT].Pos.x) {
-				_scantab[si].P[RIGHT] =  *right;		
+				_scantab[si].P[RIGHT] =  *right;
 			}
 
 		} else {
diff --git a/Core/Tools/WW3D/max2w3d/vxllayer.h b/Core/Tools/WW3D/max2w3d/vxllayer.h
index b6ead41fabd..d70dc849ba3 100644
--- a/Core/Tools/WW3D/max2w3d/vxllayer.h
+++ b/Core/Tools/WW3D/max2w3d/vxllayer.h
@@ -17,33 +17,31 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/vxllayer.h 3     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/vxllayer.h                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/26/97 1:35p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/vxllayer.h                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/26/97 1:35p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef VXLLAYER_H
-#define VXLLAYER_H
+#pragma once
 
 #include <max.h>
 
 
 #ifndef BITTYPE_H
-#include "BITTYPE.H"
+#include "BITTYPE.h"
 #endif
 
 #ifndef NODELIST_H
@@ -62,7 +60,7 @@ class VoxelLayerClass
 public:
 
 	VoxelLayerClass();
-	
+
 	VoxelLayerClass
 	(
 		INodeListClass		& objectlist,
@@ -97,7 +95,7 @@ class VoxelLayerClass
 			return FALSE;
 		}
 
-		if (Solid[x][y] == VOXEL_SOLID) { 
+		if (Solid[x][y] == VOXEL_SOLID) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -117,7 +115,7 @@ class VoxelLayerClass
 		}
 	}
 
-	void Add_Solid(int x,int y) 
+	void Add_Solid(int x,int y)
 	{
 		// check if the point is outside the bitmap:
 		if (x >= 0 && x < bitmap_width && y >= 0 && y < bitmap_height) {
@@ -144,6 +142,3 @@ class VoxelLayerClass
 	int		bitmap_width;
 	int		bitmap_height;
 };
-
-
-#endif /*VXLLAYER_H*/
diff --git a/Core/Tools/WW3D/max2w3d/w3d_file.h b/Core/Tools/WW3D/max2w3d/w3d_file.h
index 528d8dd4796..06e474e83af 100644
--- a/Core/Tools/WW3D/max2w3d/w3d_file.h
+++ b/Core/Tools/WW3D/max2w3d/w3d_file.h
@@ -17,34 +17,28 @@
 */
 
 /* $Header: /VSS_Sync/ww3d2/w3d_file.h 16    8/29/01 9:49p Vss_sync $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /VSS_Sync/ww3d2/w3d_file.h                                  $* 
- *                                                                                             * 
- *                      $Author:: Vss_sync                                                    $* 
- *                                                                                             * 
- *                     $Modtime:: 8/29/01 7:29p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 16                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /VSS_Sync/ww3d2/w3d_file.h                                  $*
+ *                                                                                             *
+ *                      $Author:: Vss_sync                                                    $*
+ *                                                                                             *
+ *                     $Modtime:: 8/29/01 7:29p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 16                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef W3D_FILE_H
-#define W3D_FILE_H
 
 #include "always.h"
-#include "BITTYPE.H"
+#include "BITTYPE.h"
 #include "iostruct.h"
 #include <limits.h>
 
@@ -80,50 +74,50 @@ Version 1.0:
 		W3D_CHUNK_TEXCOORDS,				// array of texture coordinates
 		W3D_CHUNK_MATERIALS,				// array of materials
 		W3D_CHUNK_TRIANGLES,				// array of triangles
-		W3D_CHUNK_SURRENDER_TRIANGLES,// array of surrender format tris	
+		W3D_CHUNK_SURRENDER_TRIANGLES,// array of surrender format tris
 		W3D_CHUNK_MESH_USER_TEXT,		// Name of owning hierarchy, text from the MAX comment field
-		
+
 	HIERARCHY TREES - contained the following chunks:
 		W3D_CHUNK_HIERARCHY_HEADER,
 		W3D_CHUNK_PIVOTS,
-		W3D_CHUNK_PIVOT_FIXUPS,		
+		W3D_CHUNK_PIVOT_FIXUPS,
 
-	HIERARCHY ANIMATIONS - contained the following chunks:  
+	HIERARCHY ANIMATIONS - contained the following chunks:
 		W3D_CHUNK_ANIMATION_HEADER,
 		W3D_CHUNK_ANIMATION_CHANNEL,
 
 	MESH CONNECTIONS - (blueprint for a hierarchical model) contained these chunks:
 
-	 
+
 Version 2.0:
 
-	MESHES: 
+	MESHES:
 
 	- Mesh header now contains the hierarchy model name.  The mesh name will be built
 	as <HModelName>.<MeshName> instead of the old convention: <HTreeName>.<Meshname>
 
-	- The material chunk is replaced with a new material structure which contains 
+	- The material chunk is replaced with a new material structure which contains
 	some information for animating materials.
-	
-	- Vertex Influences link vertices of a mesh to bones in a hierarchy, this is 
-	the information needed for skinning.  
-	
+
+	- Vertex Influences link vertices of a mesh to bones in a hierarchy, this is
+	the information needed for skinning.
+
 	- Damage chunks added.  A damage chunk contains	a new set of materials, a set
 	of vertex offsets, and a set of vertex colors.
-	
+
 	Added the following chunks:
 
-		W3D_CHUNK_VERTEX_COLORS,		
-		W3D_CHUNK_VERTEX_INFLUENCES,	
-		W3D_CHUNK_DAMAGE,					
+		W3D_CHUNK_VERTEX_COLORS,
+		W3D_CHUNK_VERTEX_INFLUENCES,
+		W3D_CHUNK_DAMAGE,
 		W3D_CHUNK_DAMAGE_HEADER,
 			W3D_CHUNK_DAMAGE_MATERIALS,
 			W3D_CHUNK_DAMAGE_VERTICES,
 			W3D_CHUNK_DAMAGE_COLORS,
-		W3D_CHUNK_MATERIALS2,		
+		W3D_CHUNK_MATERIALS2,
 
 	MESH CONNECTIONS: Hierarchy models can now contain skins and collision meshes
-	in addition to the normal meshes.  
+	in addition to the normal meshes.
 
 		W3D_CHUNK_COLLISION_CONNECTION,		// collision meshes connected to the hierarchy
 		W3D_CHUNK_SKIN_CONNECTION,				// skins connected to the hierarchy
@@ -143,14 +137,14 @@ Dec 12, 1997
 Feb 6, 1998
 
 	Added W3D_CHUNK_SECTMESH and its sub-chunks.  This will be the file
-	format for the terrain geometry exported from POV's Atlas tool.  
+	format for the terrain geometry exported from POV's Atlas tool.
 
 March 29, 1998 : Version 3.0
 
 	- New material chunk which supports the new features of the 3D engine
 	- Modified HTrees to always have a root transform to remove all of the
 	  special case -1 bone indexes.
-	- Added new mesh types, A mesh can now be categorized as: normal, 
+	- Added new mesh types, A mesh can now be categorized as: normal,
 	  aligned, skin, collision, or shadow.
 
 June 22, 1998
@@ -159,9 +153,9 @@ June 22, 1998
 
 	Adding a new type of object: The 'Tilemap'.  This simple-sounding object
 	is a binary partition tree of tiles where tiles are rectangular regions of
-	space.  In each leaf to the tree, a mesh is referenced.  The tile map is 
+	space.  In each leaf to the tree, a mesh is referenced.  The tile map is
 	made of several chunks:
-	
+
 	- W3D_CHUNK_TILEMAP
 		- W3D_CHUNK_TILEMAP_HEADER
 		- W3D_CHUNK_TILES
@@ -177,7 +171,7 @@ June 22, 1998
 			- W3D_CHUNK_TILE_INSTANCE
 
 October 19, 1998
-	
+
 	Created the w3d_obsolete.h header file and moved everything that I could into
 	it.  This header was getting so messy that even I couldn't understand it so
 	hopefully this helps a little...
@@ -188,10 +182,10 @@ October 19, 1998
 	- per pass vertex diffuse color arrays
 	- per pass vertex specular color arrays
 	- per pass vertex pre-calced diffuse illumination arrays
-	
+
 	In addition, the way you describe the materials for a mesh has *completely*
 	changed.  The new system separates the concepts of VertexMaterial, Texture
-	and Shader.  A VertexMaterial defines the parameters which control the 
+	and Shader.  A VertexMaterial defines the parameters which control the
 	gradient calculations for vertices.  Textures you know about.  Shaders
 	define how the gradients (diffuse and specular) are combined with the texture
 	and the frame buffer.  In addition, a mesh can have several passes; each
@@ -207,13 +201,13 @@ October 19, 1998
 	The culling system changed a bit requiring some re-working of the "Tilemap"
 	so I have removed the tilemap chunks.  At this point in time, all of the AABTree
 	building is being done at run-time.  Once we get the editor a little farther
-	along, we'll define some new chunks for this stuff.  
+	along, we'll define some new chunks for this stuff.
 
 	At this point in time, meshes look like the following.  I've placed an asterisk
 	next to the new chunk types.
 
 	W3D_CHUNK_MESH
-		W3D_CHUNK_MESH_HEADER3					
+		W3D_CHUNK_MESH_HEADER3
 		W3D_CHUNK_MESH_USER_TEXT
 		W3D_CHUNK_VERTICES
 		W3D_CHUNK_VERTEX_NORMALS
@@ -223,7 +217,7 @@ October 19, 1998
 
 *		W3D_CHUNK_MATERIAL_INFO					// how many passes, vertex mtls, shaders, and textures...
 *		W3D_CHUNK_SHADERS							// array of W3dShaderStruct's
-*		W3D_CHUNK_VERTEX_MATERIALS				
+*		W3D_CHUNK_VERTEX_MATERIALS
 *			W3D_CHUNK_VERTEX_MATERIAL
 *				W3D_CHUNK_VERTEX_MATERIAL_NAME
 *				W3D_CHUNK_VERTEX_MATERIAL_INFO
@@ -242,14 +236,14 @@ October 19, 1998
 *			W3D_CHUNK_DCG
 *			W3D_CHUNK_DIG
 *			W3D_CHUNK_SCG
-			
+
 *			W3D_CHUNK_TEXTURE_STAGE
 *				W3D_CHUNK_TEXTURE_IDS
 *				W3D_CHUNK_STAGE_TEXCOORDS
 
 
-	Added a Collection chunk type.  When we export a bunch of independent meshes 
-	(turning off the hierarchy and animation options) this chunk will be added 
+	Added a Collection chunk type.  When we export a bunch of independent meshes
+	(turning off the hierarchy and animation options) this chunk will be added
 	on to the end of the file.  It lists by name each render object that was
 	defined in the file.  Presumably the run-time asset manager will be able
 	to give you a "collection" render object which will be named the same as
@@ -260,8 +254,8 @@ October 19, 1998
 	Added the W3D_CHUNK_POINTS chunk.  This is used to implement "snap points"
 	for the level editor.  It is just an array of points that were found in
 	the max scene (helper object->point).  We make these points co-incide in
-	the level editor to snap objects together.  This chunk can occur inside a 
-	mesh, hmodel, or collection chunk.  When it does, the points should simply 
+	the level editor to snap objects together.  This chunk can occur inside a
+	mesh, hmodel, or collection chunk.  When it does, the points should simply
 	be associated with the model being defined.
 
 August 5, 1999
@@ -284,7 +278,7 @@ March 31, 2000
   different application. Now the information will indicate how a w3d asset with the
   same name as that in the node should pre-transform itself relative to the object
   that contains the transform node.
-  
+
 April 07, 2000
 
   Added W3D_CHUNK_LIGHTSCAPE, W3D_CHUNK_LIGHTSCAPE_LIGHT and W3D_CHUNK_LIGHT_TRANSFORM.
@@ -302,7 +296,7 @@ August 5, 2000
   Added W3D_CHUNK_LIGHT_GLARE and its sub-chunks.  Light glares are going to
   be a new 'geometry type' which simply define points where light glare effects
   should be placed.  The application will supply a callback to the WW3D code
-  which indicates the visibilty of any light glares in the view frustum.  
+  which indicates the visibilty of any light glares in the view frustum.
 
 June 5, 2001
 
@@ -331,14 +325,14 @@ June 5, 2001
 	W3d to prevent naming conflicts with in-game structures which
 	may be slightly different than the on-disk structures.
 
-	Oct 19,1998: Moved obsolete chunk id's to w3d_obsolete.h, added many 
+	Oct 19,1998: Moved obsolete chunk id's to w3d_obsolete.h, added many
 	new chunk types.
 
 ********************************************************************************/
 
 enum {
 
-	W3D_CHUNK_MESH											=0x00000000,	// Mesh definition 
+	W3D_CHUNK_MESH											=0x00000000,	// Mesh definition
 		W3D_CHUNK_VERTICES								=0x00000002,	// array of vertices (array of W3dVectorStruct's)
 		W3D_CHUNK_VERTEX_NORMALS						=0x00000003,	// array of normals (array of W3dVectorStruct's)
 		W3D_CHUNK_MESH_USER_TEXT						=0x0000000C,	// Text from the MAX comment field (Null terminated string)
@@ -346,7 +340,7 @@ enum {
 		W3D_CHUNK_MESH_HEADER3							=0x0000001F,	//	mesh header contains general info about the mesh. (W3dMeshHeader3Struct)
 		W3D_CHUNK_TRIANGLES								=0x00000020,	// New improved triangles chunk (array of W3dTriangleStruct's)
 		W3D_CHUNK_VERTEX_SHADE_INDICES				=0x00000022,	// shade indexes for each vertex (array of uint32's)
-		
+
 		W3D_CHUNK_PRELIT_UNLIT							=0x00000023,	// optional unlit material chunk wrapper
 		W3D_CHUNK_PRELIT_VERTEX							=0x00000024,	// optional vertex-lit material chunk wrapper
 		W3D_CHUNK_PRELIT_LIGHTMAP_MULTI_PASS		=0x00000025,	// optional lightmapped multi-pass material chunk wrapper
@@ -355,7 +349,7 @@ enum {
 			W3D_CHUNK_MATERIAL_INFO						=0x00000028,	// materials information, pass count, etc (contains W3dMaterialInfoStruct)
 
 			W3D_CHUNK_SHADERS								=0x00000029,	// shaders (array of W3dShaderStruct's)
-			
+
 			W3D_CHUNK_VERTEX_MATERIALS					=0x0000002A,	// wraps the vertex materials
 				W3D_CHUNK_VERTEX_MATERIAL				=0x0000002B,
 					W3D_CHUNK_VERTEX_MATERIAL_NAME	=0x0000002C,	// vertex material name (NULL-terminated string)
@@ -367,7 +361,7 @@ enum {
 				W3D_CHUNK_TEXTURE							=0x00000031,	// wraps a texture definition
 					W3D_CHUNK_TEXTURE_NAME				=0x00000032,	// texture filename (NULL-terminated string)
 					W3D_CHUNK_TEXTURE_INFO				=0x00000033,	// optional W3dTextureInfoStruct
-			
+
 			W3D_CHUNK_MATERIAL_PASS						=0x00000038,	// wraps the information for a single material pass
 				W3D_CHUNK_VERTEX_MATERIAL_IDS			=0x00000039,	// single or per-vertex array of uint32 vertex material indices (check chunk size)
 				W3D_CHUNK_SHADER_IDS						=0x0000003A,	// single or per-tri array of uint32 shader indices (check chunk size)
@@ -387,7 +381,7 @@ enum {
 					W3D_CHUNK_DEFORM_DATA				=0x0000005B,	// deform information about a single vertex
 
 		W3D_CHUNK_PS2_SHADERS							=0x00000080,	// Shader info specific to the Playstation 2.
-		
+
 		W3D_CHUNK_AABTREE									=0x00000090,	// Axis-Aligned Box Tree for hierarchical polygon culling
 			W3D_CHUNK_AABTREE_HEADER,										// catalog of the contents of the AABTree
 			W3D_CHUNK_AABTREE_POLYINDICES,								// array of uint32 polygon indices with count=mesh.PolyCount
@@ -397,7 +391,7 @@ enum {
 		W3D_CHUNK_HIERARCHY_HEADER,
 		W3D_CHUNK_PIVOTS,
 		W3D_CHUNK_PIVOT_FIXUPS,												// only needed by the exporter...
-	
+
 	W3D_CHUNK_ANIMATION									=0x00000200,	// hierarchy animation data
 		W3D_CHUNK_ANIMATION_HEADER,
 		W3D_CHUNK_ANIMATION_CHANNEL,										// channel of vectors
@@ -407,7 +401,7 @@ enum {
 		W3D_CHUNK_COMPRESSED_ANIMATION_HEADER,							// describes playback rate, number of frames, and type of compression
 		W3D_CHUNK_COMPRESSED_ANIMATION_CHANNEL,						// compressed channel, format dependent on type of compression
 		W3D_CHUNK_COMPRESSED_BIT_CHANNEL,								// compressed bit stream channel, format dependent on type of compression
-        
+
 	W3D_CHUNK_MORPH_ANIMATION							=0x000002C0,	// hierarchy morphing animation data (morphs between poses, for facial animation)
 		W3D_CHUNK_MORPHANIM_HEADER,										// W3dMorphAnimHeaderStruct describes playback rate, number of frames, and type of compression
 		W3D_CHUNK_MORPHANIM_CHANNEL,										// wrapper for a channel
@@ -474,7 +468,7 @@ enum {
 
 	W3D_CHUNK_NULL_OBJECT							=0x00000750,		// defines a NULL object (W3dNullObjectStruct)
 
-	W3D_CHUNK_LIGHTSCAPE								=0x00000800,		// wrapper for lights created with Lightscape.	
+	W3D_CHUNK_LIGHTSCAPE								=0x00000800,		// wrapper for lights created with Lightscape.
 		W3D_CHUNK_LIGHTSCAPE_LIGHT,										// definition of a light created with Lightscape.
 			W3D_CHUNK_LIGHT_TRANSFORM,										// position and orientation (defined as right-handed 4x3 matrix transform W3dLightTransformStruct).
 
@@ -484,7 +478,7 @@ enum {
 
 	W3D_CHUNK_SOUNDROBJ								=0x00000A00,		// description of a sound render object
 		W3D_CHUNK_SOUNDROBJ_HEADER,										// general information such as name and version
-		W3D_CHUNK_SOUNDROBJ_DEFINITION,									// chunk containing the definition of the sound that is to play	
+		W3D_CHUNK_SOUNDROBJ_DEFINITION,									// chunk containing the definition of the sound that is to play
 
 };
 
@@ -527,13 +521,13 @@ struct W3dTexCoordStruct
 /////////////////////////////////////////////////////////////////////////////////////////////
 struct W3dRGBStruct
 {
-	W3dRGBStruct () {} 
+	W3dRGBStruct () {}
 	W3dRGBStruct (uint8 r, uint8 g, uint8 b)
 	{
 		R = r;
 		G = g;
 		B = b;
-	} 
+	}
 
 	void Set (uint8 r, uint8 g, uint8 b)
 	{
@@ -558,7 +552,7 @@ struct W3dRGBStruct
 	{
 		return (!(*this == c));
 	}
-	
+
 	W3dRGBStruct operator += (W3dRGBStruct c)
 	{
 		R = MIN (((unsigned) R) + ((unsigned) c.R), (unsigned) UCHAR_MAX);
@@ -598,10 +592,10 @@ struct W3dRGBAStruct
 /////////////////////////////////////////////////////////////////////////////////////////////
 // MATERIALS
 //
-// Surrender 1.40 significantly changed the way that materials are described.  To 
-// accomodate this, the w3d file format has changed since there are new features and 
-// optimizations that we want to take advangage of.  
-// 
+// Surrender 1.40 significantly changed the way that materials are described.  To
+// accomodate this, the w3d file format has changed since there are new features and
+// optimizations that we want to take advangage of.
+//
 // The VertexMaterial defines parameters which control the calculation of the primary
 // and secondary gradients.  The shader defines how those gradients are combined with
 // the texel and the frame buffer contents.
@@ -692,7 +686,7 @@ struct W3dVertexMaterialStruct
 	{
 		return (!(*this == vm));
 	}
-	
+
 	uint32					Attributes;					// bitfield for the flags defined above
 	W3dRGBStruct			Ambient;
 	W3dRGBStruct			Diffuse;
@@ -703,8 +697,8 @@ struct W3dVertexMaterialStruct
 	float32					Translucency;				// how much light passes through the material. (default = 0)
 };
 
-inline void W3d_Vertex_Material_Reset(W3dVertexMaterialStruct * vmat) 
-{ 
+inline void W3d_Vertex_Material_Reset(W3dVertexMaterialStruct * vmat)
+{
 	vmat->Attributes = 0;
 	vmat->Ambient.R = vmat->Ambient.G = vmat->Ambient.B = 255;
 	vmat->Diffuse.R = vmat->Diffuse.G = vmat->Diffuse.B = 255;
@@ -724,13 +718,13 @@ enum
 	W3DSHADER_DEPTHCOMPARE_PASS_LESS,				// pass if incoming less than stored
 	W3DSHADER_DEPTHCOMPARE_PASS_EQUAL,				// pass if incoming equal to stored
 	W3DSHADER_DEPTHCOMPARE_PASS_LEQUAL,				// pass if incoming less than or equal to stored (default)
-	W3DSHADER_DEPTHCOMPARE_PASS_GREATER,			// pass if incoming greater than stored	
+	W3DSHADER_DEPTHCOMPARE_PASS_GREATER,			// pass if incoming greater than stored
 	W3DSHADER_DEPTHCOMPARE_PASS_NOTEQUAL,			// pass if incoming not equal to stored
 	W3DSHADER_DEPTHCOMPARE_PASS_GEQUAL,				// pass if incoming greater than or equal to stored
 	W3DSHADER_DEPTHCOMPARE_PASS_ALWAYS,				// pass always
 	W3DSHADER_DEPTHCOMPARE_PASS_MAX,					// end of enumeration
 
-	W3DSHADER_DEPTHMASK_WRITE_DISABLE = 0,			// disable depth buffer writes 
+	W3DSHADER_DEPTHMASK_WRITE_DISABLE = 0,			// disable depth buffer writes
 	W3DSHADER_DEPTHMASK_WRITE_ENABLE,				// enable depth buffer writes		(default)
 	W3DSHADER_DEPTHMASK_WRITE_MAX,					// end of enumeration
 
@@ -754,7 +748,7 @@ enum
 	W3DSHADER_PRIGRADIENT_MAX,							// end of enumeration
 
 	W3DSHADER_SECGRADIENT_DISABLE = 0,				// don't draw secondary gradient (default)
-	W3DSHADER_SECGRADIENT_ENABLE,						// add secondary gradient RGB to fragment RGB 
+	W3DSHADER_SECGRADIENT_ENABLE,						// add secondary gradient RGB to fragment RGB
 	W3DSHADER_SECGRADIENT_MAX,							// end of enumeration
 
   	W3DSHADER_SRCBLENDFUNC_ZERO = 0,					// fragment not added to color buffer
@@ -796,11 +790,11 @@ enum
 	W3DSHADER_DETAILALPHAFUNC_DEFAULT = W3DSHADER_DETAILALPHAFUNC_DISABLE,
 };
 
-enum PS2_SHADER_SETTINGS { 
+enum PS2_SHADER_SETTINGS {
 	PSS_SRC = 0,
 	PSS_DEST,
 	PSS_ZERO,
-	
+
 	PSS_SRC_ALPHA = 0,
 	PSS_DEST_ALPHA,
 	PSS_ONE,
@@ -818,10 +812,10 @@ enum PS2_SHADER_SETTINGS {
 	PSS_PS2_PRIGRADIENT_HIGHLIGHT2,
 
 
-	PSS_DEPTHCOMPARE_PASS_NEVER = 0,			
-	PSS_DEPTHCOMPARE_PASS_LESS,			
-	PSS_DEPTHCOMPARE_PASS_ALWAYS,	
-	PSS_DEPTHCOMPARE_PASS_LEQUAL,				
+	PSS_DEPTHCOMPARE_PASS_NEVER = 0,
+	PSS_DEPTHCOMPARE_PASS_LESS,
+	PSS_DEPTHCOMPARE_PASS_ALWAYS,
+	PSS_DEPTHCOMPARE_PASS_LEQUAL,
 };
 
 struct W3dShaderStruct
@@ -859,7 +853,7 @@ struct W3dPS2ShaderStruct
 	uint8						pad[3];
 };
 
-inline void W3d_Shader_Reset(W3dShaderStruct * s)									{	
+inline void W3d_Shader_Reset(W3dShaderStruct * s)									{
 																										s->DepthCompare = W3DSHADER_DEPTHCOMPARE_PASS_LEQUAL;
 																										s->DepthMask = W3DSHADER_DEPTHMASK_WRITE_ENABLE;
 																										s->ColorMask = 0;	// obsolete
@@ -911,18 +905,18 @@ inline int W3d_Shader_Get_PS2_Param_D(const W3dPS2ShaderStruct *s) {return (s->D
 
 inline int W3d_Shader_Get_Depth_Compare(const W3dPS2ShaderStruct * s)				 { return s->DepthCompare; }
 inline int W3d_Shader_Get_Depth_Mask(const W3dPS2ShaderStruct * s)					 { return s->DepthMask; }
-inline int W3d_Shader_Get_Pri_Gradient(const W3dPS2ShaderStruct * s)					 { return s->PriGradient; } 
-inline int W3d_Shader_Get_Texturing(const W3dPS2ShaderStruct * s)						 { return s->Texturing; } 
+inline int W3d_Shader_Get_Pri_Gradient(const W3dPS2ShaderStruct * s)					 { return s->PriGradient; }
+inline int W3d_Shader_Get_Texturing(const W3dPS2ShaderStruct * s)						 { return s->Texturing; }
 inline int W3d_Shader_Get_Alpha_Test(const W3dPS2ShaderStruct * s)					 { return s->AlphaTest; }
 
 
 inline int W3d_Shader_Get_Depth_Compare(const W3dShaderStruct * s)				 { return s->DepthCompare; }
 inline int W3d_Shader_Get_Depth_Mask(const W3dShaderStruct * s)					 { return s->DepthMask; }
 inline int W3d_Shader_Get_Dest_Blend_Func(const W3dShaderStruct * s)				 { return s->DestBlend; }
-inline int W3d_Shader_Get_Pri_Gradient(const W3dShaderStruct * s)					 { return s->PriGradient; } 
-inline int W3d_Shader_Get_Sec_Gradient(const W3dShaderStruct * s)					 { return s->SecGradient; } 
-inline int W3d_Shader_Get_Src_Blend_Func(const W3dShaderStruct * s)				 { return s->SrcBlend; } 
-inline int W3d_Shader_Get_Texturing(const W3dShaderStruct * s)						 { return s->Texturing; } 
+inline int W3d_Shader_Get_Pri_Gradient(const W3dShaderStruct * s)					 { return s->PriGradient; }
+inline int W3d_Shader_Get_Sec_Gradient(const W3dShaderStruct * s)					 { return s->SecGradient; }
+inline int W3d_Shader_Get_Src_Blend_Func(const W3dShaderStruct * s)				 { return s->SrcBlend; }
+inline int W3d_Shader_Get_Texturing(const W3dShaderStruct * s)						 { return s->Texturing; }
 inline int W3d_Shader_Get_Detail_Color_Func(const W3dShaderStruct * s)			 { return s->DetailColorFunc; }
 inline int W3d_Shader_Get_Detail_Alpha_Func(const W3dShaderStruct * s)			 { return s->DetailAlphaFunc; }
 inline int W3d_Shader_Get_Alpha_Test(const W3dShaderStruct * s)					 { return s->AlphaTest; }
@@ -959,7 +953,7 @@ inline int W3d_Shader_Get_Post_Detail_Alpha_Func(const W3dShaderStruct * s)	 { r
 #define W3DTEXTURE_HINT_ENVIRONMENT		0x0200		// environment/reflection map
 #define W3DTEXTURE_HINT_SHINY_MASK		0x0300		// shinyness mask map
 
-#define W3DTEXTURE_TYPE_MASK				0x1000	
+#define W3DTEXTURE_TYPE_MASK				0x1000
 #define W3DTEXTURE_TYPE_COLORMAP			0x0000		// Color map.
 #define W3DTEXTURE_TYPE_BUMPMAP			0x1000		// Grayscale heightmap (to be converted to bumpmap).
 
@@ -1063,7 +1057,7 @@ const char * const SURFACE_TYPE_STRINGS[SURFACE_TYPE_MAX] =
 /////////////////////////////////////////////////////////////////////////////////////////////
 #define W3D_MESH_FLAG_NONE										0x00000000		// plain ole normal mesh
 #define W3D_MESH_FLAG_COLLISION_BOX							0x00000001		// (obsolete as of 4.1) mesh is a collision box (should be 8 verts, should be hidden, etc)
-#define W3D_MESH_FLAG_SKIN										0x00000002		// (obsolete as of 4.1) skin mesh 
+#define W3D_MESH_FLAG_SKIN										0x00000002		// (obsolete as of 4.1) skin mesh
 #define W3D_MESH_FLAG_SHADOW									0x00000004		// (obsolete as of 4.1) intended to be projected as a shadow
 #define W3D_MESH_FLAG_ALIGNED									0x00000008		// (obsolete as of 4.1) always aligns with camera
 
@@ -1090,9 +1084,9 @@ const char * const SURFACE_TYPE_STRINGS[SURFACE_TYPE_MAX] =
 #define W3D_MESH_FLAG_GEOMETRY_TYPE_OBBOX					0x00050000		// (4.1+) obbox OBSOLETE!
 #define W3D_MESH_FLAG_GEOMETRY_TYPE_CAMERA_ORIENTED	0x00060000		// (4.1+) camera oriented mesh (points _towards_ camera)
 
-#define W3D_MESH_FLAG_PRELIT_MASK							0x0F000000		// (4.2+) 
+#define W3D_MESH_FLAG_PRELIT_MASK							0x0F000000		// (4.2+)
 #define W3D_MESH_FLAG_PRELIT_UNLIT							0x01000000		// mesh contains an unlit material chunk wrapper
-#define W3D_MESH_FLAG_PRELIT_VERTEX							0x02000000		// mesh contains a precalculated vertex-lit material chunk wrapper 
+#define W3D_MESH_FLAG_PRELIT_VERTEX							0x02000000		// mesh contains a precalculated vertex-lit material chunk wrapper
 #define W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_PASS		0x04000000		// mesh contains a precalculated multi-pass lightmapped material chunk wrapper
 #define W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_TEXTURE	0x08000000		// mesh contains a precalculated multi-texture lightmapped material chunk wrapper
 
@@ -1104,7 +1098,7 @@ const char * const SURFACE_TYPE_STRINGS[SURFACE_TYPE_MAX] =
 	Meshes
 
 	Version 3 Mesh Header, trimmed out some of the junk that was in the
-	previous versions.  
+	previous versions.
 
 ********************************************************************************/
 
@@ -1127,10 +1121,10 @@ const char * const SURFACE_TYPE_STRINGS[SURFACE_TYPE_MAX] =
 
 struct W3dMeshHeader3Struct
 {
-	uint32					Version;							
+	uint32					Version;
 	uint32					Attributes;
-	
-	char						MeshName[W3D_NAME_LEN];		
+
+	char						MeshName[W3D_NAME_LEN];
 	char						ContainerName[W3D_NAME_LEN];
 
 	//
@@ -1146,7 +1140,7 @@ struct W3dMeshHeader3Struct
 
 	uint32					VertexChannels;	// bits for presence of types of per-vertex info
 	uint32					FaceChannels;		// bits for presence of types of per-face info
-	
+
 	//
 	// Bounding volumes
 	//
@@ -1160,7 +1154,7 @@ struct W3dMeshHeader3Struct
 //
 // Vertex Influences.  For "skins" each vertex can be associated with a
 // different bone.
-// 
+//
 struct W3dVertInfStruct
 {
 	uint16					BoneIdx;
@@ -1170,7 +1164,7 @@ struct W3dVertInfStruct
 //
 // Deform information.  Each mesh can have sets of keyframes of
 //	deform info associated with it.
-// 
+//
 struct W3dMeshDeform
 {
 	uint32					SetCount;
@@ -1181,9 +1175,9 @@ struct W3dMeshDeform
 //
 // Deform set information.  Each set is made up of a series
 // of keyframes.
-// 
+//
 struct W3dDeformSetInfo
-{	
+{
 	uint32					KeyframeCount;
 	uint32					flags;
 	uint32					reserved[1];
@@ -1194,7 +1188,7 @@ struct W3dDeformSetInfo
 //
 // Deform keyframe information.  Each keyframe is made up of
 // a set of per-vert deform data.
-// 
+//
 struct W3dDeformKeyframeInfo
 {
 	float32					DeformPercent;
@@ -1205,7 +1199,7 @@ struct W3dDeformKeyframeInfo
 //
 // Deform data.  Contains deform information about a vertex
 // in the mesh.
-// 
+//
 struct W3dDeformData
 {
 	uint32					VertexIndex;
@@ -1214,9 +1208,9 @@ struct W3dDeformData
 	uint32					reserved[2];
 };
 
-// 
+//
 // AABTree header.  Each mesh can have an associated Axis-Aligned-Bounding-Box tree
-// which is used for collision detection and certain rendering algorithms (like 
+// which is used for collision detection and certain rendering algorithms (like
 // texture projection.
 //
 struct W3dMeshAABTreeHeader
@@ -1226,7 +1220,7 @@ struct W3dMeshAABTreeHeader
 	uint32					Padding[6];
 };
 
-// 
+//
 // AABTree Node.  This is a node in the AABTree.
 // If the MSB of FrontOrPoly0 is 1, then the node is a leaf and contains Poly0 and PolyCount
 // else, the node is not a leaf and contains indices to its front and back children.  This matches
@@ -1234,7 +1228,7 @@ struct W3dMeshAABTreeHeader
 //
 struct W3dMeshAABTreeNode
 {
-	W3dVectorStruct		Min;						// min corner of the box 
+	W3dVectorStruct		Min;						// min corner of the box
 	W3dVectorStruct		Max;						// max corner of the box
 	uint32					FrontOrPoly0;			// index of the front child or poly0 (if MSB is set, then leaf and poly0 is valid)
 	uint32					BackOrPolyCount;		// index of the back child or polycount
@@ -1246,12 +1240,12 @@ struct W3dMeshAABTreeNode
 	WHT ( Westwood Hierarchy Tree )
 
 	A hierarchy tree defines a set of coordinate systems which are connected
-	hierarchically.  The header defines the name, number of pivots, etc.  
+	hierarchically.  The header defines the name, number of pivots, etc.
 	The pivots chunk will contain a W3dPivotStructs for each node in the
-	tree.  
-	
+	tree.
+
 	The W3dPivotFixupStruct contains a transform for each MAX coordinate
-	system and our version of that same coordinate system (bone).  It is 
+	system and our version of that same coordinate system (bone).  It is
 	needed when the user exports the base pose using "Translation Only".
 	These are the matrices which go from the MAX rotated coordinate systems
 	to a system which is unrotated in the base pose.  These transformations
@@ -1262,7 +1256,7 @@ struct W3dMeshAABTreeNode
 
 	What are the "fixup" matrices?  These are the transforms which
 	were applied to the base pose when the user wanted to force the
-	base pose to use only matrices with certain properties.  For 
+	base pose to use only matrices with certain properties.  For
 	example, if we wanted the base pose to use translations only,
 	the fixup transform for each node is a transform which when
 	multiplied by the real node's world transform, yeilds a pure
@@ -1280,8 +1274,8 @@ struct W3dHierarchyStruct
 {
 	uint32					Version;
 	char						Name[W3D_NAME_LEN];	// Name of the hierarchy
-	uint32					NumPivots;				
-	W3dVectorStruct		Center;					
+	uint32					NumPivots;
+	W3dVectorStruct		Center;
 };
 
 struct W3dPivotStruct
@@ -1303,9 +1297,9 @@ struct W3dPivotFixupStruct
 
 	WHA (Westwood Hierarchy Animation)
 
-	A Hierarchy Animation is a set of data defining deltas from the base 
+	A Hierarchy Animation is a set of data defining deltas from the base
 	position of a hierarchy tree.  Translation and Rotation channels can be
-	attached to any node of the hierarchy tree which the animation is 
+	attached to any node of the hierarchy tree which the animation is
 	associated with.
 
 ********************************************************************************/
@@ -1317,7 +1311,7 @@ struct W3dPivotFixupStruct
 struct W3dAnimHeaderStruct
 {
 	uint32					Version;
-	char						Name[W3D_NAME_LEN];				
+	char						Name[W3D_NAME_LEN];
 	char						HierarchyName[W3D_NAME_LEN];
 	uint32					NumFrames;
 	uint32					FrameRate;
@@ -1327,7 +1321,7 @@ struct W3dAnimHeaderStruct
 struct W3dCompressedAnimHeaderStruct
 {
 	uint32					Version;
-	char						Name[W3D_NAME_LEN];				
+	char						Name[W3D_NAME_LEN];
 	char						HierarchyName[W3D_NAME_LEN];
 	uint32					NumFrames;
 	uint16					FrameRate;
@@ -1335,7 +1329,7 @@ struct W3dCompressedAnimHeaderStruct
 };
 
 
-enum 
+enum
 {
 	ANIM_CHANNEL_X = 0,
 	ANIM_CHANNEL_Y,
@@ -1371,8 +1365,8 @@ enum
 
 struct W3dAnimChannelStruct
 {
-	uint16					FirstFrame;			
-	uint16					LastFrame;			
+	uint16					FirstFrame;
+	uint16					LastFrame;
 	uint16					VectorLen;			// length of each vector in this channel
 	uint16					Flags;					// channel type.
 	uint16					Pivot;					// pivot affected by this channel
@@ -1380,7 +1374,7 @@ struct W3dAnimChannelStruct
 	float32					Data[1];				// will be (LastFrame - FirstFrame + 1) * VectorLen long
 };
 
-enum 
+enum
 {
 	BIT_CHANNEL_VIS = 0,							// turn meshes on and off depending on anim frame.
 	BIT_CHANNEL_TIMECODED_VIS,
@@ -1389,7 +1383,7 @@ enum
 struct W3dBitChannelStruct
 {
 	uint16					FirstFrame;			// all frames outside "First" and "Last" are assumed = DefaultVal
-	uint16					LastFrame;			
+	uint16					LastFrame;
 	uint16					Flags;					// channel type.
 	uint16					Pivot;					// pivot affected by this channel
 	uint8						DefaultVal;			// default state when outside valid range.
@@ -1411,14 +1405,14 @@ struct W3dTimeCodedAnimChannelStruct
 	uint8						VectorLen;			// length of each vector in this channel
 	uint8						Flags;				// channel type.
 	uint32					Data[1];				// will be (NumTimeCodes * ((VectorLen * sizeof(uint32)) + sizeof(uint32)))
-};								  
+};
 
 // The bit channel is encoded right into the MSB of each time code
 #define W3D_TIMECODED_BIT_MASK	0x80000000
 
 struct W3dTimeCodedBitChannelStruct
 {
-	uint32					NumTimeCodes;  		// number of time coded entries 
+	uint32					NumTimeCodes;  		// number of time coded entries
 	uint16					Pivot;					// pivot affected by this channel
 	uint8						Flags;					// channel type.
 	uint8						DefaultVal;				// default state when outside valid range.
@@ -1441,7 +1435,7 @@ struct W3dAdaptiveDeltaAnimChannelStruct
 // End AdaptiveDelta Structures
 
 /********************************************************************************
-	
+
 	HMorphAnimClass
 
 	This is an animation format which describes morphs between poses in another
@@ -1486,7 +1480,7 @@ struct W3dMorphAnimKeyStruct
 
 	HModel - Hiearchical Model
 
-	A Hierarchy Model is a set of render objects which should be attached to 
+	A Hierarchy Model is a set of render objects which should be attached to
 	bones in a hierarchy tree.  There can be multiple objects per node
 	in the tree.  Or there may be no objects attached to a particular bone.
 
@@ -1509,7 +1503,7 @@ struct W3dHModelHeaderStruct
 	uint32					Version;
 	char						Name[W3D_NAME_LEN];				// Name of this model
 	char						HierarchyName[W3D_NAME_LEN];	// Name of the hierarchy tree this model uses
-	uint16					NumConnections;				
+	uint16					NumConnections;
 };
 
 
@@ -1534,10 +1528,10 @@ struct W3dLODModelHeaderStruct
 {
 	uint32					Version;
 	char						Name[W3D_NAME_LEN];				// Name of this LOD Model
-	uint16					NumLODs;				
+	uint16					NumLODs;
 };
 
-struct W3dLODStruct 
+struct W3dLODStruct
 {
 	char						RenderObjName[2*W3D_NAME_LEN];
 	float32					LODMin;								// "artist" inspired switching distances
@@ -1554,12 +1548,12 @@ struct W3dLODStruct
 	contain a string chunk for the name of each render object in the collection.
 	A collection may also contain a "Snap Points" chunk.
 
-	W3D_CHUNK_COLLECTION								
+	W3D_CHUNK_COLLECTION
 		W3D_CHUNK_COLLECTION_HEADER
 		W3D_CHUNK_SNAP_POINTS
-		W3D_CHUNK_COLLECTION_OBJ_NAME			
-		W3D_CHUNK_COLLECTION_OBJ_NAME			
-		W3D_CHUNK_COLLECTION_OBJ_NAME			
+		W3D_CHUNK_COLLECTION_OBJ_NAME
+		W3D_CHUNK_COLLECTION_OBJ_NAME
+		W3D_CHUNK_COLLECTION_OBJ_NAME
 		...
 
 ********************************************************************************/
@@ -1593,7 +1587,7 @@ struct W3dPlaceholderStruct
 };
 
 
-/*							 
+/*
 ** Transform chunks.  These chunks refer to other W3D files which should be transformed by
 ** this file.  This feature is used to allow user to (for example) lightmap the interior
 ** of a building once and then just transform that into all of our levels that use it.
@@ -1657,7 +1651,7 @@ struct W3dLightTransformStruct
 {
 	float32 Transform [3][4];
 };
-	
+
 
 /********************************************************************************
 
@@ -1755,7 +1749,7 @@ struct W3dEmitterInfoStructV2
 };
 
 // W3D_CHUNK_EMITTER_PROPS
-// Contains a W3dEmitterPropertyStruct followed by a number of color keyframes, 
+// Contains a W3dEmitterPropertyStruct followed by a number of color keyframes,
 // opacity keyframes, and size keyframes
 
 struct W3dEmitterPropertyStruct
@@ -1788,9 +1782,9 @@ struct W3dEmitterSizeKeyframeStruct
 	float32				Size;
 };
 
-// W3D_CHUNK_EMITTER_ROTATION_KEYFRAMES 
+// W3D_CHUNK_EMITTER_ROTATION_KEYFRAMES
 // Contains a W3dEmitterRotationHeaderStruct followed by a number of
-// rotational velocity keyframes.  
+// rotational velocity keyframes.
 struct W3dEmitterRotationHeaderStruct
 {
 	uint32				KeyframeCount;
@@ -1842,7 +1836,7 @@ struct W3dEmitterFrameKeyframeStruct
 struct W3dEmitterLinePropertiesStruct
 {
 	uint32							Flags;
-	uint32							SubdivisionLevel;	
+	uint32							SubdivisionLevel;
 	float32							NoiseAmplitude;
 	float32							MergeAbortFactor;
 	float32							TextureTileFactor;
@@ -1933,14 +1927,14 @@ struct W3dAggregateMiscInfo
 			W3D_CHUNK_HLOD_SUB_OBJECT,										// an object in this level of detail array
 		W3D_CHUNK_HLOD_AGGREGATE_ARRAY,									// array of aggregates, contains W3D_CHUNK_SUB_OBJECT_ARRAY_HEADER and W3D_CHUNK_SUB_OBJECT_ARRAY
 		W3D_CHUNK_HLOD_PROXY_ARRAY,										// array of proxies, used for application-defined purposes
-	
+
 	An HLOD is the basic hierarchical model format used by W3D.  It references
 	an HTree for its hierarchical structure and animation data and several arrays
 	of sub-objects; one for each LOD in the model.  In addition, it can contain
 	an array of "aggregates" which are references to external W3D objects to
 	be automatically attached into it.  And it can have a list of "proxy" objects
 	which can be used for application purposes such as instantiating game objects
-	at the specified transform. 
+	at the specified transform.
 
 ********************************************************************************/
 
@@ -1974,9 +1968,9 @@ struct W3dHLodSubObjectStruct
 
 	Collision boxes are meant to be used for, you guessed it, collision detection.
 	For this reason, they only contain a minimal amount of rendering information
-	(a color).  
+	(a color).
 
-	Axis Aligned - This is a bounding box which is *always* aligned with the world 
+	Axis Aligned - This is a bounding box which is *always* aligned with the world
 	coordinate system.  So, the center point is to be transformed by whatever
 	transformation matrix is being used but the extents always point down the
 	world space x,y, and z axes.  (in effect, you are translating the center).
@@ -2035,8 +2029,8 @@ struct W3dNullObjectStruct
 
 	The only data needed to instantiate a dazzle object is the type-name of
 	the dazzle to use.  The dazzle is always assumed to be at the pivot point
-	of the bone it is attached to (you should enable Export_Transform) for 
-	dazzles.  If the dazzle-type (from dazzle.ini) is directional, then the 
+	of the bone it is attached to (you should enable Export_Transform) for
+	dazzles.  If the dazzle-type (from dazzle.ini) is directional, then the
 	coordinate-system of the bone will define the direction.
 
 ********************************************************************************/
@@ -2076,6 +2070,3 @@ struct W3dSoundRObjHeaderStruct
 ** Include the obsolete structures and chunk ID's
 */
 #include "w3d_obsolete.h"
-
-
-#endif // W3D_FILE_H
diff --git a/Core/Tools/WW3D/max2w3d/w3d_obsolete.h b/Core/Tools/WW3D/max2w3d/w3d_obsolete.h
index 4c2f471e848..6d36fd2ac2b 100644
--- a/Core/Tools/WW3D/max2w3d/w3d_obsolete.h
+++ b/Core/Tools/WW3D/max2w3d/w3d_obsolete.h
@@ -34,38 +34,31 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef W3D_OBSOLETE_H
-#define W3D_OBSOLETE_H
-
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 // Obsolete chunk id's
 // At one point in time I was using the 'O' prefix to mean obsolete.  Now we just move stuff
 // into this file...
 /////////////////////////////////////////////////////////////////////////////////////////////
-enum 
+enum
 {
 		W3D_CHUNK_MESH_HEADER					=0x00000001,	// header for a mesh
 		W3D_CHUNK_SURRENDER_NORMALS			=0x00000004,	// array of surrender normals (one per vertex as req. by surrender)
 		W3D_CHUNK_TEXCOORDS						=0x00000005,	// array of texture coordinates
 		O_W3D_CHUNK_MATERIALS					=0x00000006,	// array of materials
-		O_W3D_CHUNK_TRIANGLES					=0x00000007,	// array of triangles 
-		O_W3D_CHUNK_QUADRANGLES					=0x00000008,	// array of quads 
-		O_W3D_CHUNK_SURRENDER_TRIANGLES		=0x00000009,	// array of surrender format tris	
-		O_W3D_CHUNK_POV_TRIANGLES				=0x0000000A,	// POV format triangles 
-		O_W3D_CHUNK_POV_QUADRANGLES			=0x0000000B,	// POV format quads 
+		O_W3D_CHUNK_TRIANGLES					=0x00000007,	// array of triangles
+		O_W3D_CHUNK_QUADRANGLES					=0x00000008,	// array of quads
+		O_W3D_CHUNK_SURRENDER_TRIANGLES		=0x00000009,	// array of surrender format tris
+		O_W3D_CHUNK_POV_TRIANGLES				=0x0000000A,	// POV format triangles
+		O_W3D_CHUNK_POV_QUADRANGLES			=0x0000000B,	// POV format quads
 		W3D_CHUNK_VERTEX_COLORS					=0x0000000D,	// Pre-set vertex coloring
-		W3D_CHUNK_DAMAGE							=0x0000000F,	// Mesh damage, new set of materials, vertex positions, vertex colors	
+		W3D_CHUNK_DAMAGE							=0x0000000F,	// Mesh damage, new set of materials, vertex positions, vertex colors
 			W3D_CHUNK_DAMAGE_HEADER				=0x00000010,	// Header for the damage data, tells what is coming
 			W3D_CHUNK_DAMAGE_VERTICES			=0x00000011,	// Array of modified vertices (W3dMeshDamageVertexStruct's)
 			W3D_CHUNK_DAMAGE_COLORS				=0x00000012,	// Array of modified vert colors (W3dMeshDamageColorStruct's)
-			W3D_CHUNK_DAMAGE_MATERIALS			=0x00000013,	
-			
+			W3D_CHUNK_DAMAGE_MATERIALS			=0x00000013,
+
 		O_W3D_CHUNK_MATERIALS2					=0x00000014,	// array of version 2 materials (with animation frame counts)
 
 		W3D_CHUNK_MATERIALS3						=0x00000015,	// array of version 3 materials (all new surrender features supported)
@@ -108,7 +101,7 @@ struct W3dMaterial2Struct
 	uint8	 		Red;									// Rgb colors
 	uint8	 		Green;
 	uint8	 		Blue;
-	uint8			Alpha;								
+	uint8			Alpha;
 
 	uint16		PrimaryNumFrames;					// number of animated frames (if 1, not animated)
 	uint16		SecondaryNumFrames;				// number of animated frames (if 1, not animated)
@@ -149,7 +142,7 @@ struct W3dMaterial2Struct
 #define		W3DMAPPING_ENVIRONMENT									1
 
 /////////////////////////////////////////////////////////////////////////////////////////////
-// Version 3.0 Material, A W3D_CHUNK_MATERIALS3 chunk will wrap a bunch of 
+// Version 3.0 Material, A W3D_CHUNK_MATERIALS3 chunk will wrap a bunch of
 // W3D_CHUNK_MATERIAL3 chunks.  Inside each chunk will be a name chunk, an 'info' chunk which
 // contains the following struct, and one or more map chunks. a mesh with 2 materials might
 // look like:
@@ -161,19 +154,19 @@ struct W3dMaterial2Struct
 //			W3D_CHUNK_MATERIAL3_DC_MAP		<-- a map, W3dMap3Struct
 //				W3D_CHUNK_STRING				<-- filename of the map
 //				W3D_CHUNK_MAP_INFO			<-- map parameters
-//			W3D_CHUNK_MATERIAL3_SC_MAP        
+//			W3D_CHUNK_MATERIAL3_SC_MAP
 //				W3D_CHUNK_STRING				<-- filename of the map
 //				W3D_CHUNK_MAP_INFO
 //		W3D_CHUNK_MATERIAL3
 //			W3D_CHUNK_MATERIAL3_NAME
 //			W3D_CHUNK_MATERIAL3_INFO
 //			W3D_CHUNK_MATERIAL3_SI_MAP
-//		
+//
 /////////////////////////////////////////////////////////////////////////////////////////////
 struct W3dMaterial3Struct
 {
 	uint32					Attributes;					// flags,hints,etc.
-	
+
 	W3dRGBStruct			DiffuseColor;				// diffuse color
 	W3dRGBStruct			SpecularColor;				// specular color
 
@@ -221,7 +214,7 @@ struct W3dMeshHeaderStruct
 	uint32					Version;							// Currently version 0x100
 	char						MeshName[W3D_NAME_LEN];		// name of the mesh (Null terminated)
 	uint32					Attributes;
-	
+
 	//
 	// Counts, these can be regarded as an inventory of what is to come in the file.
 	//
@@ -231,7 +224,7 @@ struct W3dMeshHeaderStruct
 
 	uint32					NumPovTris;			// (NOT USED)
 	uint32					NumPovQuads;		// (NOT USED)
-	
+
 	uint32					NumVertices;		// number of unique vertices
 	uint32					NumNormals;			// number of unique normals (OBSOLETE!)
 	uint32					NumSrNormals;		// number of surrender normals (MUST EQUAL NumVertices or 0)
@@ -258,13 +251,13 @@ struct W3dMeshHeaderStruct
 	W3dVectorStruct		SphCenter;			// Center of bounding sphere
 	float32					SphRadius;			// Bounding sphere radius
 
-	// 
+	//
 	// Default transformation
 	//
 	W3dVectorStruct		Translation;
 	float32					Rotation[9];
 
-	// 
+	//
 	// Physics Properties
 	//
 	W3dVectorStruct		MassCenter;			// Center of mass in object space
@@ -291,7 +284,7 @@ struct W3dMeshDamageStruct
 	uint32					NumDamageVerts;		// number of vertices to replace
 	uint32					NumDamageColors;		// number of vertex colors to replace
 	uint32					DamageIndex;			// what index is this damage chunk assigned to
-	uint32					FutureUse[4];	
+	uint32					FutureUse[4];
 };
 
 struct W3dMeshDamageVertexStruct
@@ -326,8 +319,5 @@ struct W3dHModelAuxDataStruct
 
 	float32					LODMin;
 	float32					LODMax;
-	uint32					FutureUse[32];	
+	uint32					FutureUse[32];
 };
-
-
-#endif // W3D_OBSOLETE_H
diff --git a/Core/Tools/WW3D/max2w3d/w3dappdata.cpp b/Core/Tools/WW3D/max2w3d/w3dappdata.cpp
index 9e057d9012b..5800a967a90 100644
--- a/Core/Tools/WW3D/max2w3d/w3dappdata.cpp
+++ b/Core/Tools/WW3D/max2w3d/w3dappdata.cpp
@@ -34,17 +34,17 @@
  *                                                                                             *
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
- *   Is_Bone -- check if a node is a "bone"                                                    * 
+ *   Is_Bone -- check if a node is a "bone"                                                    *
  *   Is_Geometry -- Check if an INode is marked for "geometry" export                          *
- *   Is_Normal_Mesh -- check if a node is a mesh                                               * 
+ *   Is_Normal_Mesh -- check if a node is a mesh                                               *
  *   Is_Camera_Aligned_Mesh -- check if a node is to be a camera aligned mesh                  *
  *   Is_Camera_Oriented_Mesh -- check if a node is to be a camera oriented mesh                *
- *   Is_Collision_AABox -- check if a node is a collision box mesh                             * 
- *   Is_Collision_OBBox -- check if a node is a collision box mesh                             * 
- *   Is_Skin -- check if a node is a skin                                                      * 
- *   Is_Shadow -- check if a node marked to cast shadows                                       * 
- *   Is_Damage -- check if a node is a damage version of a mesh                                * 
- *   Is_Damage_For_Mesh -- check if a node is a damage version of a particular mesh            * 
+ *   Is_Collision_AABox -- check if a node is a collision box mesh                             *
+ *   Is_Collision_OBBox -- check if a node is a collision box mesh                             *
+ *   Is_Skin -- check if a node is a skin                                                      *
+ *   Is_Shadow -- check if a node marked to cast shadows                                       *
+ *   Is_Damage -- check if a node is a damage version of a mesh                                *
+ *   Is_Damage_For_Mesh -- check if a node is a damage version of a particular mesh            *
  *   Is_Physical_Collision -- Is node categorized as "physical collision geometry"             *
  *   Is_Projectile_Collision -- Is node categorized as "projectile collision geometry"?        *
  *   Is_Vis_Collision -- Is node categorized as "vis collision geometry"?                      *
@@ -84,9 +84,9 @@ W3DAppData2Struct::W3DAppData2Struct(void) :
 	GeometryType(0),
 	GeometryFlags(0),
 	CollisionFlags(0)
-{ 
+{
 	memset(UnUsed,0,sizeof(UnUsed));
-	Init_With_Other_Defaults(); 
+	Init_With_Other_Defaults();
 }
 
 W3DAppData2Struct::W3DAppData2Struct(W3DAppData0Struct & olddata)	:
@@ -94,16 +94,16 @@ W3DAppData2Struct::W3DAppData2Struct(W3DAppData0Struct & olddata)	:
 	GeometryType(0),
 	GeometryFlags(0),
 	CollisionFlags(0)
-{ 
+{
 	memset(UnUsed,0,sizeof(UnUsed));
-	Init_From_AppData0(olddata); 
-} 
+	Init_From_AppData0(olddata);
+}
 
 void W3DAppData2Struct::Init_With_Mesh_Defaults(void)
-{ 
-	ExportFlags = (EXPORT_TRANSFORM|EXPORT_GEOMETRY); 
-	GeometryType = GEO_TYPE_NORMAL_MESH; 
-	GeometryFlags = 0; 
+{
+	ExportFlags = (EXPORT_TRANSFORM|EXPORT_GEOMETRY);
+	GeometryType = GEO_TYPE_NORMAL_MESH;
+	GeometryFlags = 0;
 	CollisionFlags = 0;
 	memset(UnUsed,0,sizeof(UnUsed));
 
@@ -111,23 +111,23 @@ void W3DAppData2Struct::Init_With_Mesh_Defaults(void)
 }
 
 void	W3DAppData2Struct::Init_With_Other_Defaults(void)
-{ 
-	ExportFlags = 0; 
-	GeometryType = 0; 
-	GeometryFlags = 0; 
-	CollisionFlags = 0; 
+{
+	ExportFlags = 0;
+	GeometryType = 0;
+	GeometryFlags = 0;
+	CollisionFlags = 0;
 	memset(UnUsed,0,sizeof(UnUsed));
-	
+
 	Set_Version(W3DAPPDATA2_CURRENT_VERSION);
 }
 
 void	W3DAppData2Struct::Init_From_AppData0(W3DAppData0Struct & olddata)
 {
 	Init_With_Other_Defaults();
-	
+
 	Enable_Export_Transform(olddata.Is_Bone());
 	Enable_Export_Geometry(olddata.Is_Geometry());
-	
+
 	if (olddata.Is_Camera_Aligned_Mesh()) {
 		Set_Geometry_Type(GEO_TYPE_CAMERA_ALIGNED);
 	}
@@ -147,14 +147,14 @@ void	W3DAppData2Struct::Init_From_AppData0(W3DAppData0Struct & olddata)
 		Set_Geometry_Type(GEO_TYPE_NULL);
 	}
 
-	Enable_Hidden(olddata.Is_Hidden());						
+	Enable_Hidden(olddata.Is_Hidden());
 	Enable_Two_Sided(olddata.Is_Two_Sided());
-	Enable_Shadow(olddata.Is_Shadow());				
-	Enable_Vertex_Alpha(olddata.Is_Vertex_Alpha());			
-	Enable_ZNormals(olddata.Is_ZNormals());				
-	Enable_Physical_Collision(olddata.Is_Physical_Collision());		
-	Enable_Projectile_Collision(olddata.Is_Projectile_Collision());	
-	Enable_Vis_Collision(olddata.Is_Vis_Collision());				
+	Enable_Shadow(olddata.Is_Shadow());
+	Enable_Vertex_Alpha(olddata.Is_Vertex_Alpha());
+	Enable_ZNormals(olddata.Is_ZNormals());
+	Enable_Physical_Collision(olddata.Is_Physical_Collision());
+	Enable_Projectile_Collision(olddata.Is_Projectile_Collision());
+	Enable_Vis_Collision(olddata.Is_Vis_Collision());
 	Enable_Camera_Collision(olddata.Is_Physical_Collision());		// make camera setting match physical
 
 	Set_Version(W3DAPPDATA2_CURRENT_VERSION);
@@ -191,7 +191,7 @@ bool	W3DAppData2Struct::operator == (const W3DAppData2Struct & that)
 		if (GeometryFlags != that.GeometryFlags) return false;
 		if (CollisionFlags != that.CollisionFlags) return false;
 	}
-	
+
 	return true;
 }
 
@@ -215,13 +215,13 @@ W3DAppData2Struct * W3DAppData2Struct::Get_App_Data
 	*/
 	W3DAppData2Struct * wdata = NULL;
 	AppDataChunk * appdata = node->GetAppDataChunk(W3DUtilityClassID,UTILITY_CLASS_ID,W3D_APPDATA_2);
-	
+
 	/*
 	** If there wasn't one, look for an AppData0 chunk and convert that.
 	** If there was one, get the data from it
 	*/
 	if (appdata) {
-		
+
 		wdata = (W3DAppData2Struct *)(appdata->data);
 		wdata->Update_Version();
 
@@ -238,11 +238,11 @@ W3DAppData2Struct * W3DAppData2Struct::Get_App_Data
 		*/
 		AppDataChunk * oldappdata = node->GetAppDataChunk(W3DUtilityClassID,UTILITY_CLASS_ID,W3D_APPDATA_0);
 		if (oldappdata) {
-			
+
 			/*
 			** initializing from the old app data 0 chunk;
 			*/
-			wdata->Init_From_AppData0(*(W3DAppData0Struct*)(oldappdata->data));			
+			wdata->Init_From_AppData0(*(W3DAppData0Struct*)(oldappdata->data));
 
 			/*
 			** Destroy the old obsolete App Data 0 chunk
@@ -250,10 +250,10 @@ W3DAppData2Struct * W3DAppData2Struct::Get_App_Data
 			node->RemoveAppDataChunk(W3DUtilityClassID, UTILITY_CLASS_ID, W3D_APPDATA_0);
 
 		} else {
-		
+
 			/*
 			** If this object looks like it is going to be a mesh, then default
-			** it to have the mesh export flags (export its transform and the 
+			** it to have the mesh export flags (export its transform and the
 			** triangle mesh).  Otherwise use the default of completely ignoring it!
 			*/
 			if (Is_Max_Tri_Mesh(node)) {
@@ -261,12 +261,12 @@ W3DAppData2Struct * W3DAppData2Struct::Get_App_Data
 			} else {
 				wdata->Init_With_Other_Defaults();
 			}
-	
+
 		}
 		node->AddAppDataChunk(W3DUtilityClassID,UTILITY_CLASS_ID,2,sizeof(W3DAppData2Struct),wdata);
 		appdata = node->GetAppDataChunk(W3DUtilityClassID,UTILITY_CLASS_ID,2);
 		assert(appdata);
-		
+
 	}
 
 	return wdata;
@@ -278,14 +278,14 @@ W3DAppData2Struct * W3DAppData2Struct::Get_App_Data
 ** W3DDazzleAppDataStruct Implementation
 **
 ***********************************************************************************************/
-W3DDazzleAppDataStruct::W3DDazzleAppDataStruct(void) 
+W3DDazzleAppDataStruct::W3DDazzleAppDataStruct(void)
 {
 	UnUsed[0] = 0;
 	UnUsed[1] = 0;
 	UnUsed[2] = 0;
 	UnUsed[3] = 0;
-	memset(DazzleType,0,sizeof(DazzleType)); 
-	strcpy(DazzleType,"DEFAULT"); 
+	memset(DazzleType,0,sizeof(DazzleType));
+	strcpy(DazzleType,"DEFAULT");
 }
 
 
@@ -296,22 +296,22 @@ W3DDazzleAppDataStruct * W3DDazzleAppDataStruct::Get_App_Data(INode * node,bool
 	*/
 	W3DDazzleAppDataStruct * dazzledata = NULL;
 	AppDataChunk * appdata = node->GetAppDataChunk(W3DUtilityClassID,UTILITY_CLASS_ID,W3D_DAZZLE_APPDATA);
-	
+
 	if (appdata) {
-		
+
 		/*
 		** Found it, get the pointer to the dazzle data
 		*/
 		dazzledata = (W3DDazzleAppDataStruct *)(appdata->data);
-	
+
 	} else if (create_if_missing) {
-		
+
 		/*
 		** Create a new W3DDazzleAppDataStruct for this node
 		*/
 		dazzledata = new W3DDazzleAppDataStruct;
 		node->AddAppDataChunk(W3DUtilityClassID,UTILITY_CLASS_ID,W3D_DAZZLE_APPDATA,sizeof(W3DDazzleAppDataStruct),dazzledata);
-		
+
 		appdata = node->GetAppDataChunk(W3DUtilityClassID,UTILITY_CLASS_ID,W3D_DAZZLE_APPDATA);
 		assert(appdata);
 	}
@@ -334,17 +334,17 @@ static int get_geometry_type(INode * node)
 	return W3DAppData2Struct::Get_App_Data(node)->Get_Geometry_Type();
 }
 
-/*********************************************************************************************** 
- * Is_Bone -- check if a node is a "bone"                                                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Is_Bone -- check if a node is a "bone"                                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool Is_Bone(INode * node)
 {
@@ -374,17 +374,17 @@ bool Is_Geometry(INode * node)
 	return (W3DAppData2Struct::Get_App_Data(node)->Is_Geometry());
 }
 
-/*********************************************************************************************** 
- * Is_Mesh -- check if a node is a mesh                                                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Is_Mesh -- check if a node is a mesh                                                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool Is_Normal_Mesh(INode * node)
 {
@@ -431,17 +431,17 @@ bool Is_Camera_Oriented_Mesh(INode * node)
 	return (get_geometry_type(node) == W3DAppData2Struct::GEO_TYPE_CAMERA_ORIENTED);
 }
 
-/*********************************************************************************************** 
- * Is_Collision_AABox -- check if a node is a collision box                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Is_Collision_AABox -- check if a node is a collision box                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool Is_Collision_AABox(INode * node)
 {
@@ -450,17 +450,17 @@ bool Is_Collision_AABox(INode * node)
 }
 
 
-/*********************************************************************************************** 
- * Is_Collision_OBBox -- check if a node is a collision box                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   11/17/1998 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Is_Collision_OBBox -- check if a node is a collision box                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   11/17/1998 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool Is_Collision_OBBox(INode * node)
 {
@@ -468,17 +468,17 @@ bool Is_Collision_OBBox(INode * node)
 	return (get_geometry_type(node) == W3DAppData2Struct::GEO_TYPE_OBBOX);
 }
 
-/*********************************************************************************************** 
- * Is_Skin -- check if a node is a skin                                                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Is_Skin -- check if a node is a skin                                                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool Is_Skin(INode * node)
 {
@@ -488,7 +488,7 @@ bool Is_Skin(INode * node)
 	for (int i = 0; i < node->NumRefs(); i++) {
 
 		ReferenceTarget *refTarg = node->GetReference(i);
-     
+
 		if (refTarg != NULL && refTarg->ClassID() == Class_ID(WSM_DERIVOB_CLASS_ID,0)) {
 
 			IDerivedObject * wsm_der_obj = (IDerivedObject *)refTarg;
@@ -506,17 +506,17 @@ bool Is_Skin(INode * node)
 	return false;
 }
 
-/*********************************************************************************************** 
- * Is_Shadow -- check if a node marked to cast shadows                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Is_Shadow -- check if a node marked to cast shadows                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool Is_Shadow(INode * node)
 {
@@ -525,17 +525,17 @@ bool Is_Shadow(INode * node)
 	return (wdata->Is_Shadow_Enabled());
 }
 
-/*********************************************************************************************** 
- * Is_Null_Object -- check if a node is a null object                                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Is_Null_Object -- check if a node is a null object                                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool Is_Null_Object(INode * node)
 {
diff --git a/Core/Tools/WW3D/max2w3d/w3dappdata.h b/Core/Tools/WW3D/max2w3d/w3dappdata.h
index 3b8de7b726f..a79acf429ac 100644
--- a/Core/Tools/WW3D/max2w3d/w3dappdata.h
+++ b/Core/Tools/WW3D/max2w3d/w3dappdata.h
@@ -36,8 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef W3DAPPDATA_H
-#define W3DAPPDATA_H
+#pragma once
 
 #include <max.h>
 
@@ -61,7 +60,7 @@
 **  - There are bits stored in AppData for each node
 **  - These bits indicate wether something should be exported as hierarchy,
 **    geometry (and if so, what type of geometry: mesh, collision box, bitmap, etc)
-** 
+**
 ** When we say something is "Hierarchy" that means its transform should be put
 ** into any hierarchy tree or motion being created.  In some places I used
 ** the term "Bone" which means the same thing.
@@ -113,7 +112,7 @@ bool	Is_Shatterable(INode * node);
 bool	Is_NPatchable(INode * node);
 
 /*
-** Proxy support.  If a node has a name which contains a ~ it is considered a 
+** Proxy support.  If a node has a name which contains a ~ it is considered a
 ** proxy for an application defined named object.  This overrides all other
 ** settings (in the future, we shouldn't do things this way!)
 */
@@ -145,7 +144,7 @@ inline bool Is_Proxy(INode &node)
 
 
 /*
-** The W3DAppData0Struct contains a bitfield.  These #defines are 
+** The W3DAppData0Struct contains a bitfield.  These #defines are
 ** used to interpret the bits.
 ** (gth) NOTE: AppData0 is now OBSOLETE!!!  Use W3DAppData2Struct now.
 */
@@ -207,7 +206,7 @@ struct W3DAppData0Struct
 	bool	Is_Vertex_Alpha(void)				{ return (ExportFlags & EXPORT_VERTEX_ALPHA_FLAG) == EXPORT_VERTEX_ALPHA_FLAG; }
 	bool	Is_ZNormals(void)						{ return (ExportFlags & EXPORT_ZNORMALS_FLAG) == EXPORT_ZNORMALS_FLAG; }
 	bool	Is_Shadow(void)						{ return (ExportFlags & EXPORT_CAST_SHADOW_FLAG) == EXPORT_CAST_SHADOW_FLAG; }
-	
+
 	unsigned short ExportFlags;	// what was I thinking??? (gth)
 };
 
@@ -267,11 +266,11 @@ struct W3DAppData2Struct
 		GEO_TYPE_OBBOX =				0x00000003,
 		GEO_TYPE_AABOX =				0x00000004,
 		GEO_TYPE_CAMERA_ORIENTED =	0x00000005,
-		GEO_TYPE_NULL =				0x00000006,	
+		GEO_TYPE_NULL =				0x00000006,
 		GEO_TYPE_DAZZLE =				0x00000007,
 		GEO_TYPE_AGGREGATE =			0x00000008,
 	};
-	
+
 	/*
 	** Read Access
 	*/
@@ -345,11 +344,11 @@ struct W3DAppData2Struct
 	{
 		EXPORT_TRANSFORM =					0x00000001,		// Export flags bit-field
 		EXPORT_GEOMETRY =						0x00000002,
-		
+
 		VERSION_MASK =							0xFFFF0000,		// upper 16bits is version number.
 		VERSION_SHIFT =						16,
 	};
-	
+
 	enum GeometryFlagsEnum
 	{
 		GEOMETRY_FLAG_HIDDEN =				0x00000001,		// Geometry Flags bitfield
@@ -370,8 +369,8 @@ struct W3DAppData2Struct
 		COLLISION_FLAG_VEHICLE =			0x00000010,
 	};
 
-	unsigned int ExportFlags;				
-	unsigned int GeometryType;				
+	unsigned int ExportFlags;
+	unsigned int GeometryType;
 	unsigned int GeometryFlags;
 	unsigned int CollisionFlags;
 
@@ -384,7 +383,7 @@ struct W3DAppData2Struct
 /*
 ** W3D Utility Dazzle App Data
 ** ----------------------------------------------------
-** This app-data struct is used to contain parameters 
+** This app-data struct is used to contain parameters
 ** specific to dazzle render objects.  It currently only
 ** contains a type name which is limited to 128 characters
 ** and some padding variables for future use.
@@ -409,7 +408,3 @@ struct W3DDazzleAppDataStruct
 	unsigned int	UnUsed[4];
 	char				DazzleType[128];
 };
-
-
-#endif
-
diff --git a/Core/Tools/WW3D/max2w3d/w3ddesc.cpp b/Core/Tools/WW3D/max2w3d/w3ddesc.cpp
index 88474fda144..2f8672c0101 100644
--- a/Core/Tools/WW3D/max2w3d/w3ddesc.cpp
+++ b/Core/Tools/WW3D/max2w3d/w3ddesc.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/w3ddesc.cpp 3     3/04/99 1:58p Naty_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/w3ddesc.cpp                    $* 
- *                                                                                             * 
- *                      $Author:: Naty_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 3/03/99 11:29a                                              $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/w3ddesc.cpp                    $*
+ *                                                                                             *
+ *                      $Author:: Naty_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 3/03/99 11:29a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -41,116 +41,116 @@
 #include "w3dexp.h"
 #include "dllmain.h"
 
-/*********************************************************************************************** 
- * W3dClassDesc::Create -- Creates a W3dExportClass object                                     * 
- *                                                                                             * 
- * MAX calls this method when it needs a pointer to a new instance of the plug-in class.		  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dClassDesc::Create -- Creates a W3dExportClass object                                     *
+ *                                                                                             *
+ * MAX calls this method when it needs a pointer to a new instance of the plug-in class.		  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void * W3dClassDesc::Create(BOOL)
 {
-	return new W3dExportClass; 
+	return new W3dExportClass;
 }
 
-/*********************************************************************************************** 
- * W3dClassDesc::IsPublic -- Controls if the plug-in shows up in lists from the user to choose * 
- *                                                                                             * 
- * Controls if the plug-in shows up in lists from the user to choose from.							  * 
- * 																														  * 
- * INPUT: none																											  * 
- * 																														  * 
- * OUTPUT: true!																										  * 
- * 																														  * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dClassDesc::IsPublic -- Controls if the plug-in shows up in lists from the user to choose *
+ *                                                                                             *
+ * Controls if the plug-in shows up in lists from the user to choose from.							  *
+ * 																														  *
+ * INPUT: none																											  *
+ * 																														  *
+ * OUTPUT: true!																										  *
+ * 																														  *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int W3dClassDesc::IsPublic()
 {
-	return 1; 
+	return 1;
 }
 
-/*********************************************************************************************** 
- * W3dClassDesc::ClassName -- returns the name of the class                                    * 
- *                                                                                             * 
- * This method returns the name of the class.  This name appears in the button for the			  * 
- * plug-in in the MAX user interface.																			  * 
- *                                                                                             * 
- * INPUT: none																											  * 
- * 																														  * 
- * OUTPUT: Name of the class																						  * 
- * 																														  * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dClassDesc::ClassName -- returns the name of the class                                    *
+ *                                                                                             *
+ * This method returns the name of the class.  This name appears in the button for the			  *
+ * plug-in in the MAX user interface.																			  *
+ *                                                                                             *
+ * INPUT: none																											  *
+ * 																														  *
+ * OUTPUT: Name of the class																						  *
+ * 																														  *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 const TCHAR * W3dClassDesc::ClassName()
 {
 	return Get_String(IDS_W3D_SHORT_DESCRIPTION);
 }
 
-/*********************************************************************************************** 
- * W3dClassDesc::SuperClassID -- returns the SuperClassID of the plug-in.                      * 
- *                                                                                             * 
- * INPUT: none																											  * 
- * 																														  * 
- * OUTPUT: The SuperClassID of the plug-in.																	  * 
- * 																														  * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dClassDesc::SuperClassID -- returns the SuperClassID of the plug-in.                      *
+ *                                                                                             *
+ * INPUT: none																											  *
+ * 																														  *
+ * OUTPUT: The SuperClassID of the plug-in.																	  *
+ * 																														  *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 SClass_ID W3dClassDesc::SuperClassID()
 {
-	return SCENE_EXPORT_CLASS_ID;           
+	return SCENE_EXPORT_CLASS_ID;
 }
 
-/*********************************************************************************************** 
- * W3dClassDesc::ClassID -- Returns the class ID                                               * 
- *                                                                                             * 
- * This method must return the unique ID for the object.  If two ClassIDs conflict, the		  * 
- * system will only load the first one it finds.  The ClassID consists of two unsigned 32-bit  * 
- * quantities.																											  * 
- * 																														  * 
- * INPUT: none																											  * 
- * 																														  * 
- * OUTPUT: The unique ClassID of the plug-in.																  * 
- * 																														  * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dClassDesc::ClassID -- Returns the class ID                                               *
+ *                                                                                             *
+ * This method must return the unique ID for the object.  If two ClassIDs conflict, the		  *
+ * system will only load the first one it finds.  The ClassID consists of two unsigned 32-bit  *
+ * quantities.																											  *
+ * 																														  *
+ * INPUT: none																											  *
+ * 																														  *
+ * OUTPUT: The unique ClassID of the plug-in.																  *
+ * 																														  *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Class_ID	W3dClassDesc::ClassID()
 {
 	return W3D_EXPORTER_CLASS_ID;
 }
 
-/*********************************************************************************************** 
- * W3dClassDesc::Category -- returns a string describing the category a plug-in fits into      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dClassDesc::Category -- returns a string describing the category a plug-in fits into      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 const TCHAR * W3dClassDesc::Category()
 {
-	return Get_String(IDS_SCENE_EXPORT);     
+	return Get_String(IDS_SCENE_EXPORT);
 }
 
diff --git a/Core/Tools/WW3D/max2w3d/w3ddesc.h b/Core/Tools/WW3D/max2w3d/w3ddesc.h
index 8379ccb7d5f..2eb3ce2d8ad 100644
--- a/Core/Tools/WW3D/max2w3d/w3ddesc.h
+++ b/Core/Tools/WW3D/max2w3d/w3ddesc.h
@@ -17,34 +17,33 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/w3ddesc.h 3     3/04/99 1:57p Naty_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/w3ddesc.h                      $* 
- *                                                                                             * 
- *                      $Author:: Naty_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 3/03/99 11:28a                                              $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/w3ddesc.h                      $*
+ *                                                                                             *
+ *                      $Author:: Naty_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 3/03/99 11:28a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef W3DDESC_H
-#define W3DDESC_H
+#pragma once
 
 #include "always.h"
 #include <max.h>
 
 /*****************************************************************************
 *
-*  Class descriptors provide the system with information about the plug-in 
-*  classes in the DLL.  
+*  Class descriptors provide the system with information about the plug-in
+*  classes in the DLL.
 *
 *****************************************************************************/
 #define W3D_EXPORTER_CLASS_ID Class_ID(0x54d412df, 0x41466ae8)
@@ -55,10 +54,7 @@ class W3dClassDesc : public ClassDesc
 	void *			Create(BOOL);
 	int				IsPublic();
 	const TCHAR *	ClassName();
-	SClass_ID		SuperClassID(); 
+	SClass_ID		SuperClassID();
 	Class_ID			ClassID();
 	const TCHAR *	Category();
 };
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/w3ddlg.cpp b/Core/Tools/WW3D/max2w3d/w3ddlg.cpp
index eb9d8a2cbcf..081f736e44a 100644
--- a/Core/Tools/WW3D/max2w3d/w3ddlg.cpp
+++ b/Core/Tools/WW3D/max2w3d/w3ddlg.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/w3ddlg.cpp 24    11/07/00 5:40p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/w3ddlg.cpp                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 11/07/00 4:39p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 24                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/w3ddlg.cpp                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 11/07/00 4:39p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 24                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "w3ddlg.h"
@@ -61,17 +61,17 @@ static bool					_OfnInited = false;
 static OPENFILENAME 		_HierarchyFileOFN;
 
 
-/*********************************************************************************************** 
- * W3dOptionsDialogClass::W3dOptionsDialogClass -- constructor for the options dialog object   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dOptionsDialogClass::W3dOptionsDialogClass -- constructor for the options dialog object   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 W3dOptionsDialogClass::W3dOptionsDialogClass(Interface * maxinterface,ExpInterface * exportinterface)
 {
@@ -93,7 +93,7 @@ W3dOptionsDialogClass::~W3dOptionsDialogClass(void)
 }
 
 bool W3dOptionsDialogClass::Get_Export_Options(W3dExportOptionsStruct * options)
-{						
+{
 	Options = options;
 
 	// Put up the options dialog box.
@@ -119,24 +119,24 @@ bool W3dOptionsDialogClass::Get_Export_Options(W3dExportOptionsStruct * options)
 }
 
 
-/*********************************************************************************************** 
- * W3dOptionsDialogClass::Dialog_Proc -- Handles the windows message for the options dialog    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dOptionsDialogClass::Dialog_Proc -- Handles the windows message for the options dialog    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool W3dOptionsDialogClass::Dialog_Proc
 (
 	HWND hwnd,
 	UINT message,
 	WPARAM wParam,
-	LPARAM 
+	LPARAM
 )
 {
 	int code = HIWORD(wParam);
@@ -262,8 +262,8 @@ bool W3dOptionsDialogClass::Dialog_Proc
 						RangeLowSpin->SetValue(RangeHighSpin->GetIVal(),FALSE);
 					}
 					break;
-				
-	 		}	
+
+	 		}
 
 	}
 	return 0;
@@ -285,7 +285,7 @@ void W3dOptionsDialogClass::Dialog_Init()
 
 			// If the relative path is a full path, just erase both paths
 			// This case happens with files which were exported using a previous,
-			// bugged version of the exporter which did not handle files on 
+			// bugged version of the exporter which did not handle files on
 			// different drives correctly.
 			if (Is_Full_Path(Options->RelativeHierarchyFilename)) {
 				Options->RelativeHierarchyFilename[0] = 0;
@@ -309,7 +309,7 @@ void W3dOptionsDialogClass::Dialog_Init()
 				SetWindowText(butHwnd, Options->HierarchyFilename);
 				GotHierarchyFilename = true;
 
-			} 
+			}
 
 		} else {
 			CheckDlgButton(Hwnd,IDC_WHT_NO_EXPORT_RADIO,BST_CHECKED);
@@ -341,14 +341,14 @@ void W3dOptionsDialogClass::Dialog_Init()
 	SetCheckBox(Hwnd, IDC_VIEWLOG_CHECK, Options->ReviewLog);
 
 	char string[128];	// temp string buffer
-	
+
 	sprintf(string, "Current FPS:  %d", GetFrameRate());
-	
-	SetDlgItemText(Hwnd, IDC_ANIMATION_FPS_STATIC, string); 
 
-				
-  // initialize animation combo/list boxes         
-		 
+	SetDlgItemText(Hwnd, IDC_ANIMATION_FPS_STATIC, string);
+
+
+  // initialize animation combo/list boxes
+
 	HwndReduce = GetDlgItem(Hwnd, IDC_REDUCE_ANIMATION_COMBO);
 	HwndFlavor = GetDlgItem(Hwnd, IDC_COMPRESS_ANIMATION_FLAVOR_COMBO);
 
@@ -362,7 +362,7 @@ void W3dOptionsDialogClass::Dialog_Init()
 
 	ComboBox_AddString(HwndFlavor, "TimeCoded");
 	ComboBox_AddString(HwndFlavor, "Adaptive Delta");
-  	 
+
 
 	if ((Options->ReduceAnimationPercent < 1) || (Options->ReduceAnimationPercent > 99)) {
 		Options->ReduceAnimationPercent = 50;
@@ -375,7 +375,7 @@ void W3dOptionsDialogClass::Dialog_Init()
 
 	ComboBox_SetCurSel(HwndReduce, Options->ReduceAnimationPercent-1);
 	ComboBox_SetCurSel(HwndFlavor, Options->CompressAnimationFlavor);
-   
+
 
 	HwndTError = GetDlgItem(Hwnd, IDC_MAX_TRANS_ERROR_EDIT);
 	HwndRError = GetDlgItem(Hwnd, IDC_MAX_ROT_ERROR_EDIT);
@@ -385,13 +385,13 @@ void W3dOptionsDialogClass::Dialog_Init()
 
 	sprintf(string, "%f", Options->CompressAnimationRotationError);
 	Edit_SetText(HwndRError, string);
-	
+
 
 	// Make sure everything under animations is properly active/inactive
 
 	WHA_Compress_Animation_Check_Changed();
 
-	if (Options->ExportAnimation) { 
+	if (Options->ExportAnimation) {
 		CheckDlgButton(Hwnd,IDC_WHA_EXPORT_RADIO,BST_CHECKED);
 		Enable_WHA_Export();
 	} else {
@@ -459,15 +459,15 @@ BOOL W3dOptionsDialogClass::Dialog_Ok()
 	if (export_g) {
 		bool smooth_meshes = (IsDlgButtonChecked(Hwnd,IDC_EXPORT_MESH_SMOOTH_CHECK) == BST_CHECKED);
 		changed = changed || (Options->SmoothBetweenMeshes != smooth_meshes);
-		Options->SmoothBetweenMeshes = smooth_meshes;	
-	
+		Options->SmoothBetweenMeshes = smooth_meshes;
+
 		bool disable_export_aabs = (IsDlgButtonChecked(Hwnd,IDC_EXPORT_MESH_AABTREES) != BST_CHECKED);
 		changed = changed || (Options->DisableExportAABTrees != disable_export_aabs);
 		Options->DisableExportAABTrees = disable_export_aabs;
 
 		bool convert_materials = (IsDlgButtonChecked(Hwnd,IDC_EXPORT_MESH_MAT_TO_TEXTURE) == BST_CHECKED);
 		changed = changed || (Options->EnableMaterialColorToTextureConversion != convert_materials);
-		Options->EnableMaterialColorToTextureConversion = convert_materials;	
+		Options->EnableMaterialColorToTextureConversion = convert_materials;
 
 #if ENABLE_MESH_OPTIMIZING
 		bool optimize_mesh_data = (IsDlgButtonChecked(Hwnd,IDC_EXPORT_MESH_OPTIMIZE) == BST_CHECKED);
@@ -483,7 +483,7 @@ BOOL W3dOptionsDialogClass::Dialog_Ok()
 		Options->EnableOptimizeMeshData = false;
 		Options->EnableMaterialColorToTextureConversion = false;
 	}
-	
+
 	// Hierarchy Options:
 	bool xlation_only = (IsDlgButtonChecked(Hwnd,IDC_TRANSLATION_ONLY_CHECK) == BST_CHECKED);
 	changed = changed || (Options->TranslationOnly != xlation_only);
@@ -722,7 +722,7 @@ void W3dOptionsDialogClass::WHA_Compression_Flavor_Changed()
 			EnableWindow(GetDlgItem(Hwnd,IDC_MAX_TRANS_ERROR_EDIT), TRUE);
 			EnableWindow(GetDlgItem(Hwnd,IDC_MAX_ROT_ERROR_EDIT), TRUE);
 
-			break;									 
+			break;
 		}
 
 		case ANIM_FLAVOR_ADAPTIVE_DELTA: {
@@ -731,32 +731,32 @@ void W3dOptionsDialogClass::WHA_Compression_Flavor_Changed()
 			EnableWindow(GetDlgItem(Hwnd,IDC_REDUCE_ANIMATION_CHECK), FALSE);
 			EnableWindow(GetDlgItem(Hwnd,IDC_MAX_TRANS_ERROR_EDIT), FALSE);
 			EnableWindow(GetDlgItem(Hwnd,IDC_MAX_ROT_ERROR_EDIT), FALSE);
-			
+
 			break;
 		}
 
-	
-		default:		
+
+		default:
 			assert(0);  // invalid compressed flavor setting
 			break;
-	
+
 	}
 
 }
 
 
 
-/*********************************************************************************************** 
- * _options_dialog_proc -- thunks into the Options dialog class's windows message handler      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * _options_dialog_proc -- thunks into the Options dialog class's windows message handler      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 BOOL CALLBACK _options_dialog_proc
 (
@@ -781,17 +781,17 @@ BOOL CALLBACK _options_dialog_proc
 }
 
 
-/*********************************************************************************************** 
- * _init_ofn -- initialize the OpenFilename struct.                                            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * _init_ofn -- initialize the OpenFilename struct.                                            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void _init_ofn(void)
 {
@@ -819,4 +819,4 @@ void _init_ofn(void)
 	_HierarchyFileOFN.lpTemplateName = NULL;
 
 	_OfnInited = true;
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/WW3D/max2w3d/w3ddlg.h b/Core/Tools/WW3D/max2w3d/w3ddlg.h
index cdf2bd4f038..49801726ba3 100644
--- a/Core/Tools/WW3D/max2w3d/w3ddlg.h
+++ b/Core/Tools/WW3D/max2w3d/w3ddlg.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/w3ddlg.h 9     2/10/00 5:45p Jason_a $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/w3ddlg.h                       $* 
- *                                                                                             * 
- *                      $Author:: Jason_a                                                     $* 
- *                                                                                             * 
- *                     $Modtime:: 2/09/00 9:50a                                               $* 
- *                                                                                             * 
- *                    $Revision:: 9                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/w3ddlg.h                       $*
+ *                                                                                             *
+ *                      $Author:: Jason_a                                                     $*
+ *                                                                                             *
+ *                     $Modtime:: 2/09/00 9:50a                                               $*
+ *                                                                                             *
+ *                    $Revision:: 9                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef W3DDLG_H
-#define W3DDLG_H
+#pragma once
 
 #include "always.h"
 #include <max.h>
@@ -50,7 +48,7 @@ class W3dOptionsDialogClass
 
 	W3dOptionsDialogClass(Interface * maxinterface,ExpInterface * exportinterface);
 	~W3dOptionsDialogClass();
-	
+
 	bool Get_Export_Options(W3dExportOptionsStruct * options);
 	bool Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM);
 
@@ -69,12 +67,12 @@ class W3dOptionsDialogClass
 	void Disable_WHA_Export();
 	void Enable_WTM_Export();
 	void Disable_WTM_Export();
-	
+
 	void Enable_ReduceAnimationOptions_Export();
 	void Disable_ReduceAnimationOptions_Export();
 	void Enable_CompressAnimationOptions_Export();
 	void Disable_CompressAnimationOptions_Export();
-	
+
 	void WHT_Export_Radio_Changed();
 	void WHA_Export_Radio_Changed();
 	void WTM_Export_Radio_Changed();
@@ -93,15 +91,12 @@ class W3dOptionsDialogClass
 
 	ISpinnerControl *				RangeLowSpin;
 	ISpinnerControl *				RangeHighSpin;
-	
+
 	HWND								HwndReduce;
 	HWND								HwndFlavor;
 	HWND								HwndTError;
 	HWND								HwndRError;
-  
+
 	int								UnitsType;
 	float								UnitsScale;
 };
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/w3dexp.cpp b/Core/Tools/WW3D/max2w3d/w3dexp.cpp
index 6ba945b9581..b1ade39381f 100644
--- a/Core/Tools/WW3D/max2w3d/w3dexp.cpp
+++ b/Core/Tools/WW3D/max2w3d/w3dexp.cpp
@@ -17,39 +17,39 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/w3dexp.cpp 78    1/03/01 11:06a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/w3dexp.cpp                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 1/03/01 11:03a                                              $* 
- *                                                                                             * 
- *                    $Revision:: 78                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   W3dExportClass::W3dExportClass -- constructor                                             * 
- *   W3dExportClass::~W3dExportClass -- destructor                                             * 
- *   W3dExportClass::Export_Hierarchy -- Export the hierarchy tree                             * 
- *   W3dExportClass::Export_Animation -- Export animation data                                 * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/w3dexp.cpp                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 1/03/01 11:03a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 78                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   W3dExportClass::W3dExportClass -- constructor                                             *
+ *   W3dExportClass::~W3dExportClass -- destructor                                             *
+ *   W3dExportClass::Export_Hierarchy -- Export the hierarchy tree                             *
+ *   W3dExportClass::Export_Animation -- Export animation data                                 *
  *   W3dExportClass::Export_Damage_Animations -- Exports damage animations for the model       *
- *   W3dExportClass::Export_Geometry -- Export the geometry data                               * 
- *   W3dExportClass::get_hierarchy_tree -- get a pointer to the hierarchy tree                 * 
- *   W3dExportClass::get_export_options -- get the export options                              * 
- *   W3dExportClass::Start_Progress_Bar -- start the MAX progress meter                        * 
- *   W3dExportClass::End_Progress_Bar -- end the progress meter                                * 
+ *   W3dExportClass::Export_Geometry -- Export the geometry data                               *
+ *   W3dExportClass::get_hierarchy_tree -- get a pointer to the hierarchy tree                 *
+ *   W3dExportClass::get_export_options -- get the export options                              *
+ *   W3dExportClass::Start_Progress_Bar -- start the MAX progress meter                        *
+ *   W3dExportClass::End_Progress_Bar -- end the progress meter                                *
  *   W3dExportClass::get_damage_root_list -- gets the list of damage root nodes                *
  *   W3dExportClass::Export_HLod -- Export an HLOD description                                 *
  *   W3dExportClass::Export_Collection -- exports a collection chunk                           *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "rawfile.h"		
+#include "rawfile.h"
 #include "chunkio.h"
 #include "w3dexp.h"
 #include "w3dutil.h"
@@ -60,7 +60,7 @@
 #include "meshcon.h"
 #include "SnapPoints.h"
 #include "w3ddlg.h"
-#include "PROGRESS.H"
+#include "PROGRESS.h"
 #include "errclass.h"
 #include "motion.h"
 #include "util.h"
@@ -75,7 +75,7 @@
 #include "geometryexportcontext.h"
 
 #include <direct.h>
-#include "TARGA.H"
+#include "TARGA.h"
 
 // Used to communicate from the exporter to the dialog.
 char W3dExportClass::CurrentExportPath[_MAX_DRIVE + _MAX_DIR + 1] = { '\000' };
@@ -115,7 +115,7 @@ class GeometryFilterClass : public INodeFilterClass
 	{
 		Object * obj = node->EvalWorldState(time).obj;
 
-		if 
+		if
 		(
 			obj
 //			&& !Is_Proxy (*node)
@@ -195,31 +195,31 @@ class DamageRegionFilterClass : public INodeFilterClass
 
 	int RegionId;
 };
-  
-	 
-/*********************************************************************************************** 
- * W3dExportClass::DoExport -- This method is called for the plug-in to perform it's file expo * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *  	name - filename to use																						  * 
- * 	export - A pointer the plug-in may use to call methods to enumerate the scene 			  * 
- * 	max - An interface pointer the plug-in may use to call methods of MAX.						  * 
- * 																														  * 
- * OUTPUT:                                                                                     * 
- *   Nonzero on successful export; otherwise 0.																  * 
- * 																														  * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+
+
+/***********************************************************************************************
+ * W3dExportClass::DoExport -- This method is called for the plug-in to perform it's file expo *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *  	name - filename to use																						  *
+ * 	export - A pointer the plug-in may use to call methods to enumerate the scene 			  *
+ * 	max - An interface pointer the plug-in may use to call methods of MAX.						  *
+ * 																														  *
+ * OUTPUT:                                                                                     *
+ *   Nonzero on successful export; otherwise 0.																  *
+ * 																														  *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *   10/17/2000 gth : Removed the old export code-path, everything goes through an origin now  *
  *=============================================================================================*/
 int W3dExportClass::DoExport
 (
 	const TCHAR *filename,
 	ExpInterface *do_export,
-	Interface *max, 
-	BOOL suppressPrompts, 
+	Interface *max,
+	BOOL suppressPrompts,
 	DWORD options
 )
 {
@@ -272,16 +272,16 @@ int W3dExportClass::DoExport
 		** Initialize the logging system
 		*/
 		ExportLog::Init(NULL);
-	
+
 		/*
 		** Create a chunk saver to write the w3d file with
 		*/
 		RawFileClass stream(filename);
-			
+
 		if (!stream.Open(FileClass::WRITE)) {
 			MessageBox(NULL,"Unable to open file.","Error",MB_OK | MB_SETFOREGROUND);
 			return 1;
-		} 
+		}
 
 		ChunkSaveClass csave(&stream);
 
@@ -300,7 +300,7 @@ int W3dExportClass::DoExport
 		** Done!
 		*/
 		stream.Close();
-		
+
 		if (HierarchyTree != NULL) {
 			delete HierarchyTree;
 			HierarchyTree = NULL;
@@ -357,13 +357,13 @@ void W3dExportClass::DoOriginBasedExport(char *rootname,ChunkSaveClass &csave)
 	*/
 	Start_Progress_Bar();
 	Progress_Meter_Class meter(MaxInterface,0.0f,100.0f);
-	
+
 	int steps = 0;
 	steps++;										// Base Pose
 	steps+= OriginList->Num_Nodes();		// n Origins
 	steps++;										// Basic Anim OR Damage Anims
 	steps++;										// HLOD OR Collection
-	
+
 	meter.Finish_In_Steps(steps);
 
 	/*
@@ -448,14 +448,14 @@ void W3dExportClass::DoOriginBasedExport(char *rootname,ChunkSaveClass &csave)
 	*/
 	int idx = strlen(rootname);
 	rootname[idx+1] = '\0';
-	
+
 	/*
 	** If we're not exporting a hierarchical model, only export the "origin.00"
 	*/
 	if (!ExportOptions.LoadHierarchy && !ExportOptions.ExportHierarchy) {
 		count = 1;
 	}
-	
+
 	for (i = 0; i < count; i++)
 	{
 		/*
@@ -528,17 +528,17 @@ void W3dExportClass::DoOriginBasedExport(char *rootname,ChunkSaveClass &csave)
 }
 
 
-/*********************************************************************************************** 
- * W3dExportClass::Export_Hierarchy -- Export the hierarchy tree                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/16/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dExportClass::Export_Hierarchy -- Export the hierarchy tree                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/16/1997 GH  : Created.                                                                 *
  *   13/9/1999  AJA : Split into two calls, one that takes a node list and one that takes a    *
  *                    single root node.                                                        *
  *   10/17/2000 gth : Removed the old code-path, we always use an origin now                   *
@@ -563,17 +563,17 @@ bool W3dExportClass::Export_Hierarchy(char *name,ChunkSaveClass & csave,Progress
 	return true;
 }
 
-/*********************************************************************************************** 
- * W3dExportClass::Export_Animation -- Export animation data                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/16/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dExportClass::Export_Animation -- Export animation data                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/16/1997 GH  : Created.                                                                 *
  *   13/9/1999  AJA : Split into two calls, one that takes a node list and one that takes a    *
  *                    single root node.                                                        *
  *   10/17/2000 gth : Removed the old code-path, we always use an origin now                   *
@@ -607,7 +607,7 @@ bool W3dExportClass::Export_Animation(char * name,ChunkSaveClass & csave,Progres
 	motion->Save(csave);
 
 	delete motion;
-	
+
 	return true;
 }
 
@@ -667,10 +667,10 @@ bool W3dExportClass::Export_Damage_Animations(char *name, ChunkSaveClass &csave,
 		MotionClass *motion = NULL;
 		try
 		{
-			motion = new MotionClass(	ExportInterface->theScene, 
-												&bone_list, 
+			motion = new MotionClass(	ExportInterface->theScene,
+												&bone_list,
 												htree,
-												ExportOptions, 
+												ExportOptions,
 												FrameRate,
 												&meter,
 												MaxInterface->GetMAXHWnd(),
@@ -702,21 +702,21 @@ bool W3dExportClass::Export_Damage_Animations(char *name, ChunkSaveClass &csave,
 unsigned int houseColorScale[TEAM_COLOR_PALETTE_SIZE]=
 {255,239,223,211,195,174,167,151,135,123,107,91,79,63,47,35};
 
-/*********************************************************************************************** 
- * W3dExportClass::Export_Geometry -- Export the geometry data                                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/16/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dExportClass::Export_Geometry -- Export the geometry data                                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/16/1997 GH  : Created.                                                                 *
  *   13/9/1999  AJA : Added an optional "root" parameter to export geometry of the node's      *
  *                    descendants.                                                             *
  *   10/17/2000 gth : Made the "root" parameter a requirement, just pass in the scene root     *
- *                    if you want to export all geometry in the scene.                         * 
+ *                    if you want to export all geometry in the scene.                         *
  *   10/30/2000 gth : If exporting only geometry, only export the first mesh                   *
  *=============================================================================================*/
 bool W3dExportClass::Export_Geometry(char * name,ChunkSaveClass & csave,Progress_Meter_Class & meter,
@@ -740,7 +740,7 @@ bool W3dExportClass::Export_Geometry(char * name,ChunkSaveClass & csave,Progress
 
 	DynamicVectorClass<GeometryExportTaskClass *> export_tasks;
 	INodeListClass *geometry_list = NULL;
-	
+
 	/*
 	** Create the lists of nodes that we're going to work with
 	*/
@@ -759,7 +759,7 @@ bool W3dExportClass::Export_Geometry(char * name,ChunkSaveClass & csave,Progress
 	{	//preset the first 16 colors to predefined set of house colors
 		materialColors[i]=houseColorScale[i] << 16;
 	}
-	
+
 	/*
 	** Initialize the context object for exporting geometry
 	*/
@@ -812,7 +812,7 @@ bool W3dExportClass::Export_Geometry(char * name,ChunkSaveClass & csave,Progress
 		export_tasks[0]->Set_Name(name);
 		export_tasks[0]->Set_Container_Name("");
 	}
-	
+
 	/*
 	** Generate the mesh-connections object to return to the caller
 	*/
@@ -828,7 +828,7 @@ bool W3dExportClass::Export_Geometry(char * name,ChunkSaveClass & csave,Progress
 		*out_connection = meshcon;
 		meter.Add_Increment();
 	}
-	
+
 	/*
 	** Export each piece of geometry
 	*/
@@ -842,7 +842,7 @@ bool W3dExportClass::Export_Geometry(char * name,ChunkSaveClass & csave,Progress
 			MessageBox(MaxInterface->GetMAXHWnd(),err.error_message,"Error!",MB_OK | MB_SETFOREGROUND);
 			continue;
 		}
-		
+
 		meter.Add_Increment();
 	}
 
@@ -891,7 +891,7 @@ bool W3dExportClass::Export_Geometry(char * name,ChunkSaveClass & csave,Progress
 	for (i=0; i<export_tasks.Count(); i++) {
 		delete export_tasks[i];
 	}
-	
+
 	export_tasks.Delete_All();
 	delete geometry_list;
 
@@ -924,17 +924,17 @@ bool W3dExportClass::Export_HLod( char *name, const char *htree_name, ChunkSaveC
 }
 
 
-/*********************************************************************************************** 
- * W3dExportClass::get_hierarchy_tree -- get a pointer to the hierarchy tree                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/16/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dExportClass::get_hierarchy_tree -- get a pointer to the hierarchy tree                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/16/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HierarchySaveClass * W3dExportClass::get_hierarchy_tree(void)
 {
@@ -949,7 +949,7 @@ HierarchySaveClass * W3dExportClass::get_hierarchy_tree(void)
 	*/
 	if (!ExportOptions.ExportHierarchy) {
 		HierarchyTree = load_hierarchy_file(HierarchyFilename);
-		if (HierarchyTree) { 
+		if (HierarchyTree) {
 			return HierarchyTree;
 		} else {
 			char buf[256];
@@ -958,11 +958,11 @@ HierarchySaveClass * W3dExportClass::get_hierarchy_tree(void)
 			return NULL;
 		}
 	}
-	
+
 	/*
 	** Should never fall through to here...
 	** This would only happen if ExportHierarchy was true and the Export_Hierarchy
-	** function failed to create a hierarchy tree for us. 
+	** function failed to create a hierarchy tree for us.
 	*/
 	assert(0);
 	return NULL;
@@ -1030,17 +1030,17 @@ INodeListClass * W3dExportClass::get_origin_list(void)
 	return OriginList;
 }
 
-/*********************************************************************************************** 
- * W3dExportClass::get_export_options -- get the export options                                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/16/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dExportClass::get_export_options -- get the export options                                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/16/1997 GH  : Created.                                                                 *
  *   9/30/1999  AJA : Added support for the MAX suppress_prompts flag.                         *
  *=============================================================================================*/
 bool W3dExportClass::get_export_options(BOOL suppress_prompts)
@@ -1050,7 +1050,7 @@ bool W3dExportClass::get_export_options(BOOL suppress_prompts)
 	// Get the last export settings from the AppDataChunk attached to the
 	// scene pointer. If there is no such AppDataChunk create one and set it
 	// to default values.
-	
+
 	W3dExportOptionsStruct *options = NULL;
 
 	AppDataChunk * appdata = MaxInterface->GetScenePointer()->GetAppDataChunk(W3D_EXPORTER_CLASS_ID,SCENE_EXPORT_CLASS_ID,0);
@@ -1071,7 +1071,7 @@ bool W3dExportClass::get_export_options(BOOL suppress_prompts)
 
 		options->ReduceAnimation 	= false;
 		options->ReduceAnimationPercent = 50;
-		
+
 		options->CompressAnimation							= false;
 		options->CompressAnimationFlavor					= ANIM_FLAVOR_TIMECODED;
 		options->CompressAnimationTranslationError	= 0.001f;	//DEFAULT_LOSSY_ERROR_TOLERANCE;
@@ -1098,7 +1098,7 @@ bool W3dExportClass::get_export_options(BOOL suppress_prompts)
 			appdata_struct);
 
 	}
-	
+
 	// (gth) disabling the 'optimize mesh data' feature due to problems with external tools
 	options->EnableOptimizeMeshData = false;
 
@@ -1141,38 +1141,38 @@ bool W3dExportClass::get_export_options(BOOL suppress_prompts)
 
 
 
-/*********************************************************************************************** 
- * W3dExportClass::Start_Progress_Bar -- start the MAX progress meter                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/16/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dExportClass::Start_Progress_Bar -- start the MAX progress meter                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/16/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void W3dExportClass::Start_Progress_Bar(void)
 {
 	MaxInterface->ProgressStart(
-		"Processing Triangle Mesh", 
-		TRUE, 
-		progress_callback, 
+		"Processing Triangle Mesh",
+		TRUE,
+		progress_callback,
 		NULL);
 }
 
-/*********************************************************************************************** 
- * W3dExportClass::End_Progress_Bar -- end the progress meter                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/16/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * W3dExportClass::End_Progress_Bar -- end the progress meter                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/16/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void W3dExportClass::End_Progress_Bar(void)
 {
@@ -1183,7 +1183,7 @@ void W3dExportClass::End_Progress_Bar(void)
 static bool dupe_check(const INodeListClass & list)
 {
 	for (unsigned i=0; i<list.Num_Nodes(); i++) {
-		
+
 		/*
 		** Don't check aggregate objects, they are allowed to have the same name
 		*/
diff --git a/Core/Tools/WW3D/max2w3d/w3dexp.h b/Core/Tools/WW3D/max2w3d/w3dexp.h
index 1bef5c5b42c..df69186b380 100644
--- a/Core/Tools/WW3D/max2w3d/w3dexp.h
+++ b/Core/Tools/WW3D/max2w3d/w3dexp.h
@@ -17,26 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/w3dexp.h 22    10/23/00 5:34p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/w3dexp.h                       $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/23/00 5:24p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 22                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/w3dexp.h                       $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/23/00 5:24p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 22                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef W3DEXP_H
-#define W3DEXP_H
+#pragma once
 
 #include "always.h"
 #include <max.h>
@@ -57,17 +56,17 @@ class W3dExportClass : public SceneExport
 	W3dExportClass() {};
 	~W3dExportClass() {};
 
-	int				ExtCount()				{ return 1; };				
-	const TCHAR *	Ext(int n)				{ return Get_String(IDS_W3D_FILE_EXTEN); };				
-	const TCHAR *	LongDesc()				{ return Get_String(IDS_W3D_LONG_DESCRIPTION); };				
-	const TCHAR *	ShortDesc()				{ return Get_String(IDS_W3D_SHORT_DESCRIPTION); };			
-	const TCHAR *	AuthorName()			{ return Get_String(IDS_AUTHOR_NAME); };			
-	const TCHAR *	CopyrightMessage()	{ return Get_String(IDS_COPYRIGHT_NOTICE); };		
-	const TCHAR *	OtherMessage1()		{ return _T(""); };		
-	const TCHAR *	OtherMessage2()		{ return _T(""); };		
-	unsigned int	Version()				{ return 100; };				
-	
-	void				ShowAbout(HWND hWnd)	{};	
+	int				ExtCount()				{ return 1; };
+	const TCHAR *	Ext(int n)				{ return Get_String(IDS_W3D_FILE_EXTEN); };
+	const TCHAR *	LongDesc()				{ return Get_String(IDS_W3D_LONG_DESCRIPTION); };
+	const TCHAR *	ShortDesc()				{ return Get_String(IDS_W3D_SHORT_DESCRIPTION); };
+	const TCHAR *	AuthorName()			{ return Get_String(IDS_AUTHOR_NAME); };
+	const TCHAR *	CopyrightMessage()	{ return Get_String(IDS_COPYRIGHT_NOTICE); };
+	const TCHAR *	OtherMessage1()		{ return _T(""); };
+	const TCHAR *	OtherMessage2()		{ return _T(""); };
+	unsigned int	Version()				{ return 100; };
+
+	void				ShowAbout(HWND hWnd)	{};
 	int				DoExport(const TCHAR *name,ExpInterface *ei,Interface *i, BOOL suppressPrompts=FALSE, DWORD options=0);	// Export file
 
 protected:
@@ -98,12 +97,12 @@ class W3dExportClass : public SceneExport
 	INodeListClass *		DamageRootList;
 
 	HierarchySaveClass *	HierarchyTree;
-		
+
 	bool get_export_options(BOOL suppress_prompts = FALSE);
 	INodeListClass * get_origin_list(void);
 	INodeListClass * get_damage_root_list(void);
 	HierarchySaveClass * get_hierarchy_tree(void);
-	
+
 	bool get_base_object_tm(Matrix3 &tm);
 
 	bool Export_Hierarchy(char * name,ChunkSaveClass & csave,Progress_Meter_Class & meter,INode *root);
@@ -117,6 +116,3 @@ class W3dExportClass : public SceneExport
 	void End_Progress_Bar(void);
 
 };
-
-
-#endif 
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/w3dmtl.cpp b/Core/Tools/WW3D/max2w3d/w3dmtl.cpp
index a46dcac7c12..f86727e9d2d 100644
--- a/Core/Tools/WW3D/max2w3d/w3dmtl.cpp
+++ b/Core/Tools/WW3D/max2w3d/w3dmtl.cpp
@@ -67,7 +67,7 @@ W3dMapClass::W3dMapClass(const W3dMapClass & that)
 		Set_Anim_Info(that.AnimInfo);
 	}
 }
-	
+
 W3dMapClass & W3dMapClass::operator = (const W3dMapClass & that)
 {
 	if (this != &that) {
@@ -91,10 +91,10 @@ void W3dMapClass::Reset(void)
 	AnimInfo = NULL;
 }
 
-void W3dMapClass::Set_Filename(const char * fullpath) 
-{ 
+void W3dMapClass::Set_Filename(const char * fullpath)
+{
 	if (Filename) {
-		free(Filename); 
+		free(Filename);
 	}
 	if (fullpath) {
 		char name[_MAX_FNAME];
@@ -104,14 +104,14 @@ void W3dMapClass::Set_Filename(const char * fullpath)
 		_splitpath(fullpath,NULL,NULL,name,exten);
 		_makepath(fname,NULL,NULL,name,exten);
 		//strupr(fname);						(gth) need to preserve case since unix/PS2 is case sensitive...
-		Filename = strdup(fname); 
+		Filename = strdup(fname);
 	} else {
 		Filename = NULL;
 	}
 }
 
-void W3dMapClass::Set_Anim_Info(const W3dTextureInfoStruct * info) 
-{ 
+void W3dMapClass::Set_Anim_Info(const W3dTextureInfoStruct * info)
+{
 	if (info == NULL) {
 		if (AnimInfo) {
 			delete AnimInfo;
@@ -139,7 +139,7 @@ void W3dMapClass::Set_Anim_Info(int framecount,float framerate)
 
 
 /*
- 
+
 
 	Implementation of W3dMaterialClass
 
@@ -170,7 +170,7 @@ W3dMaterialClass::~W3dMaterialClass(void)
 void W3dMaterialClass::Free(void)
 {
 	for (int pass = 0; pass < MAX_PASSES; pass++) {
-		
+
 		if (Materials[pass]) {
 			delete Materials[pass];
 			Materials[pass] = NULL;
@@ -196,7 +196,7 @@ void W3dMaterialClass::Reset(void)
 	SortLevel = SORT_LEVEL_NONE;
 	for (int pass=0; pass < MAX_PASSES; pass++) {
 		W3d_Shader_Reset(&(Shaders[pass]));
-	
+
 		for (int stage=0; stage < MAX_STAGES; stage++) {
 			MapChannel[pass][stage] = 1;
 		}
@@ -255,7 +255,7 @@ void W3dMaterialClass::Set_Shader(const W3dShaderStruct & shader,int pass)
 	assert(pass >= 0);
 	assert(pass < PassCount);
 
-	Shaders[pass] = shader;	
+	Shaders[pass] = shader;
 }
 
 void W3dMaterialClass::Set_Texture(const W3dMapClass & map,int pass,int stage)
@@ -273,7 +273,7 @@ void W3dMaterialClass::Set_Map_Channel(int pass,int stage,int channel)
 {
 	assert(pass >= 0);
 	assert(pass < PassCount);
-	MapChannel[pass][stage] = channel;	
+	MapChannel[pass][stage] = channel;
 }
 
 unsigned int W3dMaterialClass::Get_Surface_Type(void) const
@@ -295,7 +295,7 @@ W3dVertexMaterialStruct * W3dMaterialClass::Get_Vertex_Material(int pass ) const
 {
 	assert(pass >= 0);
 	assert(pass < PassCount);
-	
+
 	return Materials[pass];
 }
 
@@ -305,7 +305,7 @@ const char * W3dMaterialClass::Get_Mapper_Args(int pass, int stage) const
 	assert(pass < PassCount);
 	assert(stage >= 0);
 	assert(stage < MAX_STAGES);
-	
+
 	return MapperArgs[pass][stage];
 }
 
@@ -313,7 +313,7 @@ W3dShaderStruct W3dMaterialClass::Get_Shader(int pass) const
 {
 	assert(pass >= 0);
 	assert(pass < PassCount);
-	return Shaders[pass];	
+	return Shaders[pass];
 }
 
 W3dMapClass * W3dMaterialClass::Get_Texture(int pass,int stage) const
@@ -322,7 +322,7 @@ W3dMapClass * W3dMaterialClass::Get_Texture(int pass,int stage) const
 	assert(pass < PassCount);
 	assert(stage >= 0);
 	assert(stage < MAX_STAGES);
-	
+
 	return Textures[pass][stage];
 }
 
@@ -370,16 +370,16 @@ void W3dMaterialClass::Init(Mtl * mtl, char *materialColorTexture)
 
 	mat.Attributes = 0;
 	mat.Emissive.R = mat.Emissive.G = mat.Emissive.B = 0; //(uint8)(255 .0f * mtl->GetSelfIllum());
-	
+
 	Color diffuse =			mtl->GetDiffuse();
 	mat.Diffuse.R =			(uint8)(diffuse.r * 255.0f);
-	mat.Diffuse.G =			(uint8)(diffuse.g * 255.0f);		
+	mat.Diffuse.G =			(uint8)(diffuse.g * 255.0f);
 	mat.Diffuse.B =			(uint8)(diffuse.b * 255.0f);
 	mat.Ambient =				mat.Diffuse;
 
 	Color specular =			mtl->GetSpecular();
 	mat.Specular.R =			(uint8)(specular.r * 255.0f);
-	mat.Specular.G =			(uint8)(specular.g * 255.0f);		
+	mat.Specular.G =			(uint8)(specular.g * 255.0f);
 	mat.Specular.B =			(uint8)(specular.b * 255.0f);
 
 	mat.Shininess =			mtl->GetShininess();
@@ -404,9 +404,9 @@ void W3dMaterialClass::Init(Mtl * mtl, char *materialColorTexture)
 		W3d_Shader_Set_Texturing(&shader,W3DSHADER_TEXTURING_ENABLE);
 		//This texture will hold solid pixels of material color, don't need any filtering.
 //		W3dTextureInfoStruct texinfo;
-//		memset(&texinfo,0,sizeof(texinfo));			
+//		memset(&texinfo,0,sizeof(texinfo));
 //		texinfo.Attributes = texinfo.Attributes | /*W3DTEXTURE_NO_LOD|*/W3DTEXTURE_CLAMP_U | W3DTEXTURE_CLAMP_V;
-//		tex.Set_Anim_Info(&texinfo);	
+//		tex.Set_Anim_Info(&texinfo);
 		Set_Texture(tex,0,0);
 	}
 
@@ -414,7 +414,7 @@ void W3dMaterialClass::Init(Mtl * mtl, char *materialColorTexture)
 		W3d_Shader_Set_Dest_Blend_Func(&shader,W3DSHADER_DESTBLENDFUNC_ONE_MINUS_SRC_ALPHA);
 		W3d_Shader_Set_Src_Blend_Func(&shader,W3DSHADER_SRCBLENDFUNC_SRC_ALPHA);
 	}
-	
+
 	Set_Vertex_Material(mat,0);
 	Set_Shader(shader,0);
 
@@ -428,7 +428,7 @@ void W3dMaterialClass::Init(Mtl * mtl, char *materialColorTexture)
 		if (ps2_mat)
 		{
 			W3d_Shader_Set_Pri_Gradient(&shader,PSS_PRIGRADIENT_MODULATE);
-		} 
+		}
 		else
 		{
 			W3d_Shader_Set_Pri_Gradient(&shader,W3DSHADER_PRIGRADIENT_MODULATE);
@@ -503,12 +503,12 @@ void W3dMaterialClass::Init(GameMtl * gamemtl, char *materialColorTexture)
 		*/
 		W3dVertexMaterialStruct mat;
 		mat.Attributes = 0;
-		
+
 		if (gamemtl->Get_Copy_Specular_To_Diffuse(pass)) {
 			mat.Attributes |= W3DVERTMAT_COPY_SPECULAR_TO_DIFFUSE;
 		}
 
-		// mapping type for stage 0		
+		// mapping type for stage 0
 		switch(gamemtl->Get_Mapping_Type(pass, 0))
 		{
 			case GAMEMTL_MAPPING_UV:					mat.Attributes |= W3DVERTMAT_STAGE0_MAPPING_UV;						break;
@@ -586,21 +586,21 @@ void W3dMaterialClass::Init(GameMtl * gamemtl, char *materialColorTexture)
 		BitmapTex * tex = NULL;
 
 		for (int stage=0; stage < MAX_STAGES; stage++) {
-				
+
 			if (gamemtl->Get_Texture_Enable(pass,stage) && gamemtl->Get_Texture(pass,stage)) {
-				
+
 				w3dmap.Reset();
-								
+
 				// get the filename for the w3dmap texture
 				tex = (BitmapTex *)gamemtl->Get_Texture(pass,stage);
 				assert(tex->GetMapName());
 				w3dmap.Set_Filename(tex->GetMapName());
-				
-				// get the animation and flags for the w3dmap texture 
+
+				// get the animation and flags for the w3dmap texture
 				W3dTextureInfoStruct texinfo;
-				memset(&texinfo,0,sizeof(texinfo));			
-				
-				texinfo.AnimType = gamemtl->Get_Texture_Anim_Type(pass,stage);	
+				memset(&texinfo,0,sizeof(texinfo));
+
+				texinfo.AnimType = gamemtl->Get_Texture_Anim_Type(pass,stage);
 
 				if (gamemtl->Get_Texture_Publish(pass,stage)) {
 					texinfo.Attributes = texinfo.Attributes | W3DTEXTURE_PUBLISH;
@@ -630,16 +630,16 @@ void W3dMaterialClass::Init(GameMtl * gamemtl, char *materialColorTexture)
 				texinfo.FrameRate = gamemtl->Get_Texture_Frame_Rate(pass,stage);
 
 				if ((texinfo.FrameCount > 1) || (texinfo.Attributes != 0)) {
-					w3dmap.Set_Anim_Info(&texinfo);	
+					w3dmap.Set_Anim_Info(&texinfo);
 				}
-				
+
 				// plug it in and turn on texturing in the shader
 				Set_Texture(w3dmap,pass,stage);
 				shader.Texturing = W3DSHADER_TEXTURING_ENABLE;
-							
+
 				// copy over the mapping channel
 				Set_Map_Channel(pass,stage,gamemtl->Get_Map_Channel(pass,stage));
-	
+
 				// copy over the mapper args
 				Set_Mapper_Args(gamemtl->Get_Mapping_Arg_Buffer(pass, stage), pass, stage);
 
@@ -648,7 +648,7 @@ void W3dMaterialClass::Init(GameMtl * gamemtl, char *materialColorTexture)
 						{	//no textures on material, substitute textures to improve rendering speed.
 							w3dmap.Reset();
 							w3dmap.Set_Filename(materialColorTexture);
-							
+
 							// plug it in and turn on texturing in the shader
 							Set_Texture(w3dmap,pass,stage);
 							shader.Texturing = W3DSHADER_TEXTURING_ENABLE;
@@ -670,14 +670,14 @@ bool W3dMaterialClass::Is_Multi_Pass_Transparent(void) const
 
 
 /*
- 
+
 
 	Implementation of W3dMaterialDescClass::VertClass
 
 
 */
-W3dMaterialDescClass::VertMatClass::VertMatClass(void) : 
-	PassIndex(-1), 
+W3dMaterialDescClass::VertMatClass::VertMatClass(void) :
+	PassIndex(-1),
 	Crc(0),
 	Name(NULL)
 {
@@ -686,19 +686,19 @@ W3dMaterialDescClass::VertMatClass::VertMatClass(void) :
 	}
 }
 
-W3dMaterialDescClass::VertMatClass::~VertMatClass(void) 
-{ 
+W3dMaterialDescClass::VertMatClass::~VertMatClass(void)
+{
 	if (Name) free(Name);
 
 	for (int stage=0; stage < W3dMaterialClass::MAX_STAGES; ++stage) {
 		if (MapperArgs[stage]) {
-			delete [] (MapperArgs[stage]); 
+			delete [] (MapperArgs[stage]);
 			MapperArgs[stage] = NULL;
 		}
 	}
 }
 
-W3dMaterialDescClass::VertMatClass & 
+W3dMaterialDescClass::VertMatClass &
 W3dMaterialDescClass::VertMatClass::operator = (const VertMatClass & that)
 {
 	if (this != &that) {
@@ -713,46 +713,46 @@ W3dMaterialDescClass::VertMatClass::operator = (const VertMatClass & that)
 	return *this;
 }
 
-bool W3dMaterialDescClass::VertMatClass::operator != (const VertMatClass & that)	
-{ 
-	return !(*this == that); 
+bool W3dMaterialDescClass::VertMatClass::operator != (const VertMatClass & that)
+{
+	return !(*this == that);
 }
 
-bool W3dMaterialDescClass::VertMatClass::operator == (const VertMatClass & that) 
-{ 
-	assert(0); return false; 
+bool W3dMaterialDescClass::VertMatClass::operator == (const VertMatClass & that)
+{
+	assert(0); return false;
 }
 
-void W3dMaterialDescClass::VertMatClass::Set_Name(const char * name) 
-{ 
-	if (Name) free(Name); 
-	
-	if (name) { 
-		Name = strdup(name); 
-	} else { 
-		Name = NULL; 
-	} 
+void W3dMaterialDescClass::VertMatClass::Set_Name(const char * name)
+{
+	if (Name) free(Name);
+
+	if (name) {
+		Name = strdup(name);
+	} else {
+		Name = NULL;
+	}
 }
 
-void W3dMaterialDescClass::VertMatClass::Set_Mapper_Args(const char * args, int stage) 
-{ 
+void W3dMaterialDescClass::VertMatClass::Set_Mapper_Args(const char * args, int stage)
+{
 	if (MapperArgs[stage]) {
-		delete [] (MapperArgs[stage]); 
+		delete [] (MapperArgs[stage]);
 		MapperArgs[stage] = NULL;
 	}
-	
+
 	if (args) {
 		int len = strlen(args);
 		MapperArgs[stage] = new char [len + 1];
 		strcpy(MapperArgs[stage], args);
-	} else { 
-		MapperArgs[stage] = NULL; 
-	} 
+	} else {
+		MapperArgs[stage] = NULL;
+	}
 }
 
 
 /*
- 
+
 
 	Implementation of W3dMaterialDescClass
 
@@ -778,12 +778,12 @@ bool W3dMaterialDescClass::MaterialRemapClass::operator != (const MaterialRemapC
 bool W3dMaterialDescClass::MaterialRemapClass::operator == (const MaterialRemapClass & that)
 {
 	for (int pass=0; pass<W3dMaterialClass::MAX_PASSES; pass++) {
-		
+
 		if (VertexMaterialIdx[pass] != that.VertexMaterialIdx[pass]) return false;
 		if (ShaderIdx[pass] != that.ShaderIdx[pass]) return false;
 
 		for (int stage=0; stage<W3dMaterialClass::MAX_STAGES; stage++) {
-		
+
 			if (TextureIdx[pass][stage] != that.TextureIdx[pass][stage]) return false;
 		}
 	}
@@ -802,7 +802,7 @@ W3dMaterialDescClass::~W3dMaterialDescClass(void)
 }
 
 void W3dMaterialDescClass::Reset(void)
-{	
+{
 	PassCount = -1;
 	SortLevel = -1;
 	MaterialRemaps.Clear();
@@ -851,7 +851,7 @@ W3dMaterialDescClass::ErrorType W3dMaterialDescClass::Add_Material(const W3dMate
 	if (mat.Get_Sort_Level() != SortLevel) {
 		return INCONSISTENT_SORT_LEVEL;
 	}
-	
+
 	/*
 	** Ok, lets re-index this material and store the unique parts
 	*/
@@ -863,12 +863,12 @@ W3dMaterialDescClass::ErrorType W3dMaterialDescClass::Add_Material(const W3dMate
 			mat.Get_Vertex_Material(pass),mat.Get_Mapper_Args(pass, 0),mat.Get_Mapper_Args(pass, 1),pass,name);
 
 		remap.ShaderIdx[pass] = Add_Shader(mat.Get_Shader(pass),pass);
-		
+
 		for (int stage=0; stage<W3dMaterialClass::MAX_STAGES; stage++) {
 
 			remap.TextureIdx[pass][stage] = Add_Texture(mat.Get_Texture(pass,stage),pass,stage);
 			remap.MapChannel[pass][stage] = mat.Get_Map_Channel(pass,stage);
-		
+
 		}
 	}
 
@@ -1030,7 +1030,7 @@ bool W3dMaterialDescClass::Stage_Needs_Texture_Coordinates(int pass,int stage)
 {
 	for (int mi=0; mi<MaterialRemaps.Count();mi++) {
 		W3dShaderStruct * shader = Get_Shader(mi,pass);
-		
+
 		if (shader) {
 			if (stage == 0) {
 				if (W3d_Shader_Get_Texturing(shader) == W3DSHADER_TEXTURING_ENABLE) return true;
@@ -1062,12 +1062,12 @@ bool W3dMaterialDescClass::Pass_Uses_Vertex_Alpha(int pass)
 }
 
 
-bool W3dMaterialDescClass::Pass_Uses_Alpha(int pass) 
+bool W3dMaterialDescClass::Pass_Uses_Alpha(int pass)
 {
 	for (int mi=0; mi<MaterialRemaps.Count(); mi++) {
 
 		W3dShaderStruct * shader = Get_Shader(mi,pass);
-		
+
 		int dst_blend = W3d_Shader_Get_Dest_Blend_Func(shader);
 		int src_blend = W3d_Shader_Get_Src_Blend_Func(shader);
 		int alpha_test = W3d_Shader_Get_Alpha_Test(shader);
@@ -1108,7 +1108,7 @@ int W3dMaterialDescClass::Add_Vertex_Material(W3dVertexMaterialStruct * vmat,
 		vm.Set_Mapper_Args(mapper_args1, 1);
 		VertexMaterials.Add(vm);
 	}
-	
+
 	return vi;
 }
 
@@ -1118,14 +1118,14 @@ int W3dMaterialDescClass::Add_Shader(const W3dShaderStruct & shader,int pass)
 	for (int si=0; si<Shaders.Count(); si++) {
 		if (crc == Shaders[si].Crc) break;
 	}
-	
+
 	if (si == Shaders.Count()) {
 		ShadeClass s;
 		s.Shader = shader;
 		s.Crc = crc;
 		Shaders.Add(s);
-	} 
-	
+	}
+
 	return si;
 }
 
diff --git a/Core/Tools/WW3D/max2w3d/w3dmtl.h b/Core/Tools/WW3D/max2w3d/w3dmtl.h
index aa0d710c13f..54fb2bd9a13 100644
--- a/Core/Tools/WW3D/max2w3d/w3dmtl.h
+++ b/Core/Tools/WW3D/max2w3d/w3dmtl.h
@@ -34,16 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef W3DMTL_H
-#define W3DMTL_H
 
 #include "always.h"
 #include "w3d_file.h"
-#include "Vector.H"
+#include "Vector.h"
 
 class GameMtl;
 class Mtl;
@@ -51,7 +46,7 @@ class ChunkSaveClass;
 
 
 /*
-** W3dMapClass.  
+** W3dMapClass.
 ** This class simply ties together the map info and the map filename
 */
 class W3dMapClass
@@ -60,7 +55,7 @@ class W3dMapClass
 	W3dMapClass(void) : Filename(NULL), AnimInfo(NULL) {};
 	W3dMapClass(const W3dMapClass & that);
 	~W3dMapClass(void);
-	
+
 	W3dMapClass & operator = (const W3dMapClass & that);
 
 	void Reset(void);
@@ -74,7 +69,7 @@ class W3dMapClass
 
 
 /*
-** W3dMaterialClass. 
+** W3dMaterialClass.
 ** This class ties together w3d structures for up to 'MAX_PASSES' material passes.
 ** It is typically plugged into the next class (W3dMaterialDescClass) so that
 ** duplicate members can detected and shared.
@@ -123,13 +118,13 @@ class W3dMaterialClass
 	bool								Is_Multi_Pass_Transparent(void) const;
 
 protected:
-	
-	void								Free(void);	
-	
+
+	void								Free(void);
+
 	unsigned int					SurfaceType;
 	int								SortLevel;
-	int								PassCount;	
-	
+	int								PassCount;
+
 	W3dShaderStruct				Shaders[MAX_PASSES];
 	W3dVertexMaterialStruct *	Materials[MAX_PASSES];
 	char *							MapperArgs[MAX_PASSES][MAX_STAGES];
@@ -159,17 +154,17 @@ class W3dMaterialDescClass
 
 	W3dMaterialDescClass(void);
 	~W3dMaterialDescClass(void);
-	
+
 	void								Reset(void);
 
 	/*
-	** Interface for adding a material description.  The material will be assigned 
-	** an index based on the order at which they are added.  Add your materials in 
-	** order, then use their indices to find the remapped vertex materials, textures, 
+	** Interface for adding a material description.  The material will be assigned
+	** an index based on the order at which they are added.  Add your materials in
+	** order, then use their indices to find the remapped vertex materials, textures,
 	** and shaders...
 	*/
 	ErrorType						Add_Material(const W3dMaterialClass & mat,const char * name = NULL);
-	
+
 	/*
 	** Global Information.  These methods give access to all of the unique vertex materials,
 	** shaders, and textures being used.
@@ -243,7 +238,7 @@ class W3dMaterialDescClass
 
 	/*
 	** VertMatClass
-	** This class encapsulates a vertex material structure and makes it extendable for 
+	** This class encapsulates a vertex material structure and makes it extendable for
 	** any purposes needed by the plugin code.  For example, the pass index is stored
 	** so that we can prevent "welding" of vertex materials in different passes (since
 	** this may not be desireable...)
@@ -282,7 +277,7 @@ class W3dMaterialDescClass
 		W3dShaderStruct				Shader;
 		int								Crc;
 	};
-	
+
 	/*
 	** TexClass
 	** Simply here to allow extra info to be stored with each texture, as needed by this
@@ -298,7 +293,7 @@ class W3dMaterialDescClass
 		W3dMapClass						Map;
 		int								Crc;
 	};
-	
+
 	int																PassCount;
 	int																SortLevel;
 	DynamicVectorClass < MaterialRemapClass >				MaterialRemaps;
@@ -307,7 +302,3 @@ class W3dMaterialDescClass
 	DynamicVectorClass < TexClass >							Textures;
 
 };
-
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/WW3D/max2w3d/w3dutil.cpp b/Core/Tools/WW3D/max2w3d/w3dutil.cpp
index a33ab16429d..7cf6ad3b1f8 100644
--- a/Core/Tools/WW3D/max2w3d/w3dutil.cpp
+++ b/Core/Tools/WW3D/max2w3d/w3dutil.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/w3dutil.cpp 45    8/21/01 10:28a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/w3dutil.cpp                    $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 8/21/01 9:41a                                               $* 
- *                                                                                             * 
- *                    $Revision:: 45                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/w3dutil.cpp                    $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 8/21/01 9:41a                                               $*
+ *                                                                                             *
+ *                    $Revision:: 45                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
@@ -101,7 +101,7 @@ void MaterialReferenceMaker::SetReference (int i, RefTargetHandle rtarg)
 
 RefResult MaterialReferenceMaker::NotifyRefChanged(Interval changeInt,RefTargetHandle hTarget,PartID& partID, RefMessage message)
 {
-	return (REF_SUCCEED); 
+	return (REF_SUCCEED);
 }
 
 int MaterialReferenceMaker::ReferenceCount;
@@ -147,7 +147,7 @@ class SettingsFormClass
 ** the W3D export options for the currently selected nodes
 **
 **********************************************************************************************/
-class W3DUtilityClass : public UtilityObj 
+class W3DUtilityClass : public UtilityObj
 {
 public:
 
@@ -165,9 +165,9 @@ class W3DUtilityClass : public UtilityObj
 	void Select_Physical(void);
 	void Select_Projectile(void);
 	void Select_Vis(void);
-	
+
 public:
-	
+
 	Interface *							InterfacePtr;
 	FloaterDialogClass				SettingsFloater;
 	HWND									SettingsPanelHWND;
@@ -177,7 +177,7 @@ class W3DUtilityClass : public UtilityObj
 	GenNamesDialogClass::OptionsStruct			NameOptions;
 	GenMtlNamesDialogClass::OptionsStruct		MtlNameOptions;
 	GenLodExtensionDialogClass::OptionsStruct	LodExtensionOptions;
-	
+
 	int											WorkingNameIndex;
 
 	enum {
@@ -285,7 +285,7 @@ class W3DUtilityClass : public UtilityObj
 	void		generate_material_names(Mtl * mtl);
 	void		generate_lod_extensions(void);
 	void		generate_lod_ext(INode * node);
-	
+
 	void		create_floater(void);
 
 	void		export_with_standard_materials();
@@ -306,7 +306,7 @@ static W3DUtilityClass TheW3DUtility;
 ** W3DUtilityClassDesc - Class Descriptor for the W3D Utility
 **
 **********************************************************************************************/
-class W3DUtilityClassDesc:public ClassDesc 
+class W3DUtilityClassDesc:public ClassDesc
 {
 public:
 
@@ -320,9 +320,9 @@ class W3DUtilityClassDesc:public ClassDesc
 
 static W3DUtilityClassDesc W3DUtilityDesc;
 
-ClassDesc * Get_W3D_Utility_Desc(void) 
-{ 
-	return &W3DUtilityDesc; 
+ClassDesc * Get_W3D_Utility_Desc(void)
+{
+	return &W3DUtilityDesc;
 }
 
 /**********************************************************************************************
@@ -332,7 +332,7 @@ ClassDesc * Get_W3D_Utility_Desc(void)
 **********************************************************************************************/
 W3DUtilityClass::W3DUtilityClass(void)
 {
-	InterfacePtr = NULL;	
+	InterfacePtr = NULL;
 	SettingsPanelHWND = NULL;
 	ToolsPanelHWND = NULL;
 	UpdateSpinnerValue = true;
@@ -342,10 +342,10 @@ W3DUtilityClass::~W3DUtilityClass(void)
 {
 }
 
-void W3DUtilityClass::BeginEditParams(Interface *ip,IUtil *iu) 
+void W3DUtilityClass::BeginEditParams(Interface *ip,IUtil *iu)
 {
 	InterfacePtr = ip;
-	
+
 	SettingsPanelHWND = InterfacePtr->AddRollupPage(
 		AppInstance,
 		MAKEINTRESOURCE(IDD_W3DUTILITY_SETTINGS_DIALOG),
@@ -363,20 +363,20 @@ void W3DUtilityClass::BeginEditParams(Interface *ip,IUtil *iu)
 
 //	TheRCMenu.Bind(TheW3DUtility.InterfacePtr,&TheW3DUtility);
 //	RightClickMenuManager *rcm = ip->GetRightClickMenuManager();
-//	if (TheRCMenu.Installed!=TRUE) { 
+//	if (TheRCMenu.Installed!=TRUE) {
 //		rcm->Register(&TheRCMenu);
 //	}
 
 	SettingsFormClass::Update_All_Instances();
 }
-	
-void W3DUtilityClass::EndEditParams(Interface *ip,IUtil *iu) 
+
+void W3DUtilityClass::EndEditParams(Interface *ip,IUtil *iu)
 {
 	InterfacePtr = NULL;
 
 	ip->DeleteRollupPage(SettingsPanelHWND);
 	ip->DeleteRollupPage(ToolsPanelHWND);
-	
+
 	SettingsPanelHWND = NULL;
 	ToolsPanelHWND = NULL;
 }
@@ -416,7 +416,7 @@ void W3DUtilityClass::eval_node_states(INodeListClass * list,NodeStatesStruct *
 	ns->CollisionVis = 0;
 	ns->CollisionCamera = 0;
 	ns->CollisionVehicle = 0;
-	
+
 	ns->GeometryCameraAligned = false;
 	ns->GeometryCameraOriented = false;
 	ns->GeometryNormal = false;
@@ -458,7 +458,7 @@ void W3DUtilityClass::eval_node_states(INodeListClass * list,NodeStatesStruct *
 	** evaluate each node
 	*/
 	for (unsigned int ni=0; ni<list->Num_Nodes(); ni++) {
-		
+
 		W3DAppData2Struct * wdata = get_app_data_2((*list)[ni]);
 		assert(wdata);
 
@@ -472,7 +472,7 @@ void W3DUtilityClass::eval_node_states(INodeListClass * list,NodeStatesStruct *
 		ns->GeometryShatterable += (wdata->Is_Shatterable_Enabled() ? 1 : 0);
 		ns->GeometryNPatch +=		(wdata->Is_NPatchable_Enabled() ? 1 : 0);
 		ns->CollisionPhysical +=	(wdata->Is_Physical_Collision_Enabled() ? 1 : 0);
-		ns->CollisionProjectile +=	(wdata->Is_Projectile_Collision_Enabled() ? 1 : 0);				
+		ns->CollisionProjectile +=	(wdata->Is_Projectile_Collision_Enabled() ? 1 : 0);
 		ns->CollisionVis +=			(wdata->Is_Vis_Collision_Enabled() ? 1 : 0);
 		ns->CollisionCamera +=		(wdata->Is_Camera_Collision_Enabled() ? 1 : 0);
 		ns->CollisionVehicle +=		(wdata->Is_Vehicle_Collision_Enabled() ? 1 : 0);
@@ -504,7 +504,7 @@ void W3DUtilityClass::eval_node_states(INodeListClass * list,NodeStatesStruct *
 		if (strcmp(ns->DazzleType,dazzledata->DazzleType) != 0) {
 			strcpy(ns->DazzleType,"DEFAULT");
 		}
-	}	
+	}
 
 	// If any of the counters are zero, that means none of the objects had that
 	// bit set.  If any of them are equal to the number of objects, then they
@@ -806,7 +806,7 @@ void W3DUtilityClass::export_with_standard_materials()
 
 	// Count the no. of references to game materials.
 	MaterialReferenceMaker::ReferenceCount = convert_materials (GAME_REFERENCE_COUNT, NULL);
-	
+
 	MaterialReferenceMaker *gamenodematerials = NULL;
 
 	if (MaterialReferenceMaker::ReferenceCount > 0) {
@@ -832,7 +832,7 @@ void W3DUtilityClass::export_with_standard_materials()
 int W3DUtilityClass::convert_materials (MaterialConversionEnum conversion, MaterialReferenceMaker *gamenodematerials)
 {
 	int gamenodematerialindex = 0;
-	
+
 	INode *rootnode = InterfacePtr->GetRootNode();
 	if (rootnode != NULL) {
 
@@ -845,10 +845,10 @@ int W3DUtilityClass::convert_materials (MaterialConversionEnum conversion, Mater
 
 				// Is this a non-null material?
 				if (nodemtl != NULL) {
-					
+
 					// Is this not a multi-material?
 					if (!nodemtl->IsMultiMtl()) {
-						
+
 						switch (conversion) {
 
 							case GAME_REFERENCE_COUNT:
@@ -858,9 +858,9 @@ int W3DUtilityClass::convert_materials (MaterialConversionEnum conversion, Mater
 								break;
 
 							case GAME_TO_STANDARD:
-   								
+
 								if (nodemtl->ClassID() == GameMaterialClassID) {
-									
+
 									// Make a reference to the game material to ensure that it is not deleted by the system.
 									gamenodematerials [gamenodematerialindex].MakeRefByID (FOREVER, gamenodematerialindex, nodemtl);
 
@@ -872,7 +872,7 @@ int W3DUtilityClass::convert_materials (MaterialConversionEnum conversion, Mater
 
 								} else {
 									gamenodematerials [gamenodematerialindex].MaterialPtr = NULL;
-								}	
+								}
 								break;
 
 							case STANDARD_TO_GAME:
@@ -893,12 +893,12 @@ int W3DUtilityClass::convert_materials (MaterialConversionEnum conversion, Mater
 						for (int materialindex = 0; materialindex < nodemtl->NumSubMtls(); materialindex++) {
 
 							Mtl *submaterial = nodemtl->GetSubMtl (materialindex);
-							
+
 							// Is this a non-null submaterial?
 							if (submaterial != NULL) {
-							
+
 								switch (conversion) {
-									
+
 									case GAME_REFERENCE_COUNT:
 										if (submaterial->ClassID() == GameMaterialClassID) {
 											assert (((GameMtl*) submaterial)->Substitute_Material() == NULL);
@@ -906,21 +906,21 @@ int W3DUtilityClass::convert_materials (MaterialConversionEnum conversion, Mater
 										break;
 
 									case GAME_TO_STANDARD:
-								
+
 										if (submaterial->ClassID() == GameMaterialClassID) {
-									
+
 											// Make a reference to the game material to ensure that it is not deleted by the system.
 											gamenodematerials [gamenodematerialindex].MakeRefByID (FOREVER, gamenodematerialindex, submaterial);
-										
+
 											// Does this material already have an equivalent standard material?
 											if (((GameMtl*) submaterial)->Substitute_Material() == NULL) {
  												((GameMtl*) submaterial)->Set_Substitute_Material (new_standard_material ((GameMtl*) submaterial));
 											}
 											nodemtl->SetSubMtl (materialindex, ((GameMtl*) submaterial)->Substitute_Material());
-										
+
 										} else {
 											gamenodematerials [gamenodematerialindex].MaterialPtr = NULL;
-										}	
+										}
 										break;
 
 									case STANDARD_TO_GAME:
@@ -971,7 +971,7 @@ StdMat *W3DUtilityClass::new_standard_material (GameMtl *gamemtl)
 	stdmtl->SetSelfIllum ((emissive.r + emissive.g + emissive.b) / 3.0f, 0);
 
 	return (stdmtl);
-}   
+}
 
 void W3DUtilityClass::Select_Hierarchy(void)
 {
@@ -1024,8 +1024,8 @@ void W3DUtilityClass::Select_Vis(void)
 void W3DUtilityClass::descend_tree(INode * node,int func)
 {
 	if (!node) return;
-	
-	switch (func) 
+
+	switch (func)
 	{
 	case HIDE:
 		hide_node(node);
@@ -1077,27 +1077,27 @@ void W3DUtilityClass::descend_tree(INode * node,int func)
 	}
 }
 
-void W3DUtilityClass::hide_node(INode * node) 
+void W3DUtilityClass::hide_node(INode * node)
 {
 	if (!node->IsHidden()) node->Hide(TRUE);
 	InterfacePtr->NodeInvalidateRect(node);
 }
 
-void W3DUtilityClass::select_geometry_node(INode * node) 
+void W3DUtilityClass::select_geometry_node(INode * node)
 {
 	if (Is_Geometry(node) && !node->IsHidden()) {
 		InterfacePtr->SelectNode(node,0);
 	}
 }
 
-void W3DUtilityClass::select_hierarchy_node(INode * node) 
+void W3DUtilityClass::select_hierarchy_node(INode * node)
 {
 	if (Is_Bone(node) && !node->IsHidden()) {
 		InterfacePtr->SelectNode(node,0);
 	}
 }
 
-void W3DUtilityClass::select_alpha_node(INode * node) 
+void W3DUtilityClass::select_alpha_node(INode * node)
 {
 	if (node->IsHidden() || !Is_Geometry(node)) {
 		return;
@@ -1111,21 +1111,21 @@ void W3DUtilityClass::select_alpha_node(INode * node)
 	}
 }
 
-void W3DUtilityClass::select_physical_node(INode * node) 
+void W3DUtilityClass::select_physical_node(INode * node)
 {
 	if (!node->IsHidden() && Is_Geometry(node) && Is_Physical_Collision(node)) {
 		InterfacePtr->SelectNode(node,0);
 	}
 }
 
-void W3DUtilityClass::select_projectile_node(INode * node) 
+void W3DUtilityClass::select_projectile_node(INode * node)
 {
 	if (!node->IsHidden() && Is_Geometry(node) && Is_Projectile_Collision(node)) {
 		InterfacePtr->SelectNode(node,0);
 	}
 }
 
-void W3DUtilityClass::select_vis_node(INode * node) 
+void W3DUtilityClass::select_vis_node(INode * node)
 {
 	if (!node->IsHidden() && Is_Geometry(node) && Is_Vis_Collision(node)) {
 		InterfacePtr->SelectNode(node,0);
@@ -1180,10 +1180,10 @@ bool W3DUtilityClass::is_alpha_mesh(INode * node,Mtl * nodemtl)
 			return is_alpha_material(nodemtl);
 
 		} else {
-			
+
 			int sub_mtl_count = nodemtl->NumSubMtls();
 			bool * sub_mtl_flags = new bool[sub_mtl_count];
-			
+
 			// Initialize each sub-material flag to false (indicates that the material is un-used)
 			for (mat_index=0; mat_index<sub_mtl_count; mat_index++) {
 				sub_mtl_flags[mat_index] = false;
@@ -1238,10 +1238,10 @@ void W3DUtilityClass::generate_node_name(INode * node)
 	}
 
 	if (NameOptions.AssignCollisionBits) {
-		
+
 		W3DAppData2Struct * wdata = W3DAppData2Struct::Get_App_Data(node);
 		assert(wdata);
-		
+
 		wdata->Enable_Physical_Collision(NameOptions.PhysicalCollision);
 		wdata->Enable_Projectile_Collision(NameOptions.ProjectileCollision);
 		wdata->Enable_Vis_Collision(NameOptions.VisCollision);
@@ -1293,8 +1293,8 @@ W3DAppData0Struct * W3DUtilityClass::get_app_data_0(INode * node)
 	*/
 	if (appdata) {
 		wdata = (W3DAppData0Struct *)(appdata->data);
-	} 
-	
+	}
+
 	return wdata;
 }
 
@@ -1344,11 +1344,11 @@ static BOOL CALLBACK _w3d_utility_tools_dlg_proc(HWND hWnd, UINT msg, WPARAM wPa
 		case WM_LBUTTONDOWN:
 		case WM_LBUTTONUP:
 		case WM_MOUSEMOVE:
-			TheW3DUtility.InterfacePtr->RollupMouseMessage(hWnd,msg,wParam,lParam); 
+			TheW3DUtility.InterfacePtr->RollupMouseMessage(hWnd,msg,wParam,lParam);
 			break;
 
 		case WM_COMMAND:
-		{				
+		{
 			switch (LOWORD(wParam))
 			{
 				/*
@@ -1416,7 +1416,7 @@ static BOOL CALLBACK _w3d_utility_tools_dlg_proc(HWND hWnd, UINT msg, WPARAM wPa
 **
 ** SettingsFormClass Implementation
 ** NOTE: When you use the _settings_form_dlg_proc, a SettingsFormClass will automatically
-** be allocated and attached to the dialog.  You can cause all of the active forms to 
+** be allocated and attached to the dialog.  You can cause all of the active forms to
 ** refresh their status by calling Update_All_Instances.  The forms will be destroyed when
 ** the window is destroyed.
 **
@@ -1472,10 +1472,10 @@ SettingsFormClass::~SettingsFormClass(void)
 	if (ActiveList == this) {
 		ActiveList = Next;
 	} else {
-		
+
 		SettingsFormClass * prev = ActiveList;
 		SettingsFormClass * cur = ActiveList->Next;
-	
+
 		while ((cur != this) && (cur != NULL)) {
 			cur = cur->Next;
 			prev = prev->Next;
@@ -1534,7 +1534,7 @@ void SettingsFormClass::Init(void)
 	strcpy(last_slash,DAZZLE_SETTINGS_FILENAME);
 
 	char * dazzle_types_buffer = new char[DAZZLE_SECTION_BUFFERSIZE];	// max size of a section for Win95
-	
+
 	::GetPrivateProfileSection( DAZZLE_TYPES_SECTION, dazzle_types_buffer, DAZZLE_SECTION_BUFFERSIZE, dllpath);
 
 	// Now we need to handle each string in the section buffer; skipping the 'key=' and adding
@@ -1591,18 +1591,18 @@ bool SettingsFormClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM
 			break;
 
 		case WM_COMMAND:
-		{				
+		{
 			/*
 			** handle the tri-state checkboxes.
 			** MAKE SURE YOU PUT ANY NEW CHECKBOX ID's IN HERE!!!
 			*/
 			int control_id = LOWORD(wParam);
-			if (	(control_id == IDC_HIERARCHY_CHECK) || 
+			if (	(control_id == IDC_HIERARCHY_CHECK) ||
 					(control_id == IDC_GEOMETRY_CHECK) ||
 					(control_id == IDC_GEOMETRY_HIDE) ||
 					(control_id == IDC_GEOMETRY_TWO_SIDED) ||
 					(control_id == IDC_GEOMETRY_ZNORMALS) ||
-					(control_id == IDC_GEOMETRY_VERTEX_ALPHA) || 
+					(control_id == IDC_GEOMETRY_VERTEX_ALPHA) ||
 					(control_id == IDC_GEOMETRY_CAST_SHADOW) ||
 					(control_id == IDC_GEOMETRY_SHATTERABLE) ||
 					(control_id == IDC_GEOMETRY_NPATCH) ||
@@ -1627,14 +1627,14 @@ bool SettingsFormClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM
 				** Tri-State Checkboxes, make sure that the ID of all checkboxes is present
 				** in the 'if' statement above!
 				*/
-				case IDC_HIERARCHY_CHECK: 
+				case IDC_HIERARCHY_CHECK:
 					W3DUtilityClass::set_hierarchy_in_all_selected(&node_list,check == BST_CHECKED);
 					break;
 
-				case IDC_GEOMETRY_CHECK: 
+				case IDC_GEOMETRY_CHECK:
 					W3DUtilityClass::set_geometry_in_all_selected(&node_list,check == BST_CHECKED);
 					break;
-				
+
 				case IDC_GEOMETRY_HIDE:
 					W3DUtilityClass::enable_hidden_in_all_selected(&node_list,check == BST_CHECKED);
 					break;
@@ -1642,7 +1642,7 @@ bool SettingsFormClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM
 				case IDC_GEOMETRY_TWO_SIDED:
 					W3DUtilityClass::enable_two_sided_in_all_selected(&node_list,check == BST_CHECKED);
 					break;
-				
+
 				case IDC_GEOMETRY_ZNORMALS:
 					W3DUtilityClass::enable_znormals_in_all_selected(&node_list,check == BST_CHECKED);
 					break;
@@ -1658,12 +1658,12 @@ bool SettingsFormClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM
 				case IDC_GEOMETRY_SHATTERABLE:
 					W3DUtilityClass::enable_shatterable_in_all_selected(&node_list,check == BST_CHECKED);
 					break;
-				
+
 				case IDC_GEOMETRY_NPATCH:
 					W3DUtilityClass::enable_npatches_in_all_selected(&node_list,check == BST_CHECKED);
 					break;
 
-				case IDC_COLLISION_PHYSICAL: 
+				case IDC_COLLISION_PHYSICAL:
 					W3DUtilityClass::enable_physical_collision_in_all_selected(&node_list,check == BST_CHECKED);
 					break;
 
@@ -1689,15 +1689,15 @@ bool SettingsFormClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM
 				case IDC_GEOMETRY_NORMAL:
 					W3DUtilityClass::set_geometry_type_in_all_selected(&node_list,W3DAppData2Struct::GEO_TYPE_NORMAL_MESH);
 					break;
-				
+
 				case IDC_GEOMETRY_CAMERA_ALIGNED:
 					W3DUtilityClass::set_geometry_type_in_all_selected(&node_list,W3DAppData2Struct::GEO_TYPE_CAMERA_ALIGNED);
 					break;
-				
+
 				case IDC_GEOMETRY_CAMERA_ORIENTED:
 					W3DUtilityClass::set_geometry_type_in_all_selected(&node_list,W3DAppData2Struct::GEO_TYPE_CAMERA_ORIENTED);
 					break;
-				
+
 				case IDC_GEOMETRY_NULL:
 					W3DUtilityClass::set_geometry_type_in_all_selected(&node_list,W3DAppData2Struct::GEO_TYPE_NULL);
 					break;
@@ -1727,7 +1727,7 @@ bool SettingsFormClass::Dialog_Proc(HWND hWnd,UINT message,WPARAM wParam,LPARAM
 
 						HWND dazzle_combo = GetDlgItem(hWnd,IDC_DAZZLE_COMBO);
 						if (dazzle_combo != NULL) {
-		
+
 							char dazzle_type[128];
 							int cursel = ::SendMessage(dazzle_combo,CB_GETCURSEL,0,0);
 							int len = ::SendMessage(dazzle_combo,CB_GETLBTEXTLEN,cursel,0);
@@ -1797,7 +1797,7 @@ void SettingsFormClass::Selection_Changed(void)
 void SettingsFormClass::Update_Controls(INodeListClass * node_list)
 {
 	/*
-	** Update name of currently selected object 
+	** Update name of currently selected object
 	** "Multiple" if more than one, "None" if no selected objs...
 	*/
 	ICustEdit * edit_ctrl = GetICustEdit(GetDlgItem(Hwnd,IDC_OBJ_NAME));
@@ -1928,8 +1928,8 @@ void SettingsFormClass::Update_Controls(INodeListClass * node_list)
 	EnableWindow(GetDlgItem(Hwnd,IDC_DAMREG_INDEX_SPIN),spinner_enable);
 
 	/*
-	** The dazzle combo box should only be enabled if 
-	** Export Geometry, and geometry type dazzle is set for all 
+	** The dazzle combo box should only be enabled if
+	** Export Geometry, and geometry type dazzle is set for all
 	** selected nodes.
 	*/
 	bool dazzle_combo_enable = false;
@@ -1969,7 +1969,7 @@ void SettingsFormClass::Disable_Controls(void)
 	EnableWindow(GetDlgItem(Hwnd,IDC_GEOMETRY_CHECK),FALSE);
 	EnableWindow(GetDlgItem(Hwnd,IDC_DAMREG_INDEX_EDIT),FALSE);
 	EnableWindow(GetDlgItem(Hwnd,IDC_DAMREG_INDEX_SPIN),FALSE);
-	
+
 	EnableWindow(GetDlgItem(Hwnd,IDC_GEOMETRY_NORMAL),FALSE);
 	EnableWindow(GetDlgItem(Hwnd,IDC_GEOMETRY_CAMERA_ALIGNED),FALSE);
 	EnableWindow(GetDlgItem(Hwnd,IDC_GEOMETRY_CAMERA_ORIENTED),FALSE);
@@ -1997,7 +1997,7 @@ void SettingsFormClass::Disable_Controls(void)
 
 	CheckDlgButton(Hwnd,IDC_HIERARCHY_CHECK,BST_UNCHECKED);
 	CheckDlgButton(Hwnd,IDC_GEOMETRY_CHECK,BST_UNCHECKED);
-	
+
 	CheckDlgButton(Hwnd,IDC_GEOMETRY_CAMERA_ALIGNED,BST_UNCHECKED);
 	CheckDlgButton(Hwnd,IDC_GEOMETRY_CAMERA_ORIENTED,BST_UNCHECKED);
 	CheckDlgButton(Hwnd,IDC_GEOMETRY_NORMAL,BST_UNCHECKED);
diff --git a/Core/Tools/WW3D/max2w3d/w3dutil.h b/Core/Tools/WW3D/max2w3d/w3dutil.h
index 8b360889da0..ad1e6a4e574 100644
--- a/Core/Tools/WW3D/max2w3d/w3dutil.h
+++ b/Core/Tools/WW3D/max2w3d/w3dutil.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/w3dutil.h 29    10/26/00 5:59p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/w3dutil.h                      $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/26/00 4:40p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 29                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/w3dutil.h                      $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/26/00 4:40p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 29                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef W3DUTIL_H
-#define W3DUTIL_H
+#pragma once
 
 #include <max.h>
 #include "utilapi.h"
@@ -66,7 +64,7 @@ struct W3dExportOptionsStruct
 	bool		ExportHierarchy;
 	bool		LoadHierarchy;
 	bool		ExportAnimation;
-	bool		ExportGeometry;	
+	bool		ExportGeometry;
 
 	// Hierarchy Export options:
 	bool		TranslationOnly;
@@ -76,7 +74,7 @@ struct W3dExportOptionsStruct
 	// Animation Export options:
 	int		StartFrame;
 	int		EndFrame;
-	
+
 	// Geometry Export options;
 	bool		UseVoxelizer;
 
@@ -126,5 +124,3 @@ W3DAppData0Struct *			GetW3DAppData0 (INode *node);
 W3DAppData1Struct *			GetW3DAppData1 (INode *node);
 W3DAppData2Struct *			GetW3DAppData2 (INode *node);
 W3DDazzleAppDataStruct *	GetW3DDazzleAppData(INode *node);
-
-#endif
diff --git a/Core/Tools/WW3D/pluglib/BITTYPE.H b/Core/Tools/WW3D/pluglib/BITTYPE.H
deleted file mode 100644
index d0e32326b04..00000000000
--- a/Core/Tools/WW3D/pluglib/BITTYPE.H
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*****************************************************************
-*
-*	Project:		3DTEST1 (3d Test Program)
-*
-*	File:			bittype.h
-*
-*	Start Date:		Dec 18, 1996
-*
-*	Programmer:		Greg Hjelstrom
-*
-*****************************************************************/
-
-#ifndef BITTYPE_H
-#define BITTYPE_H
-
-typedef unsigned char	uint8;
-typedef unsigned short	uint16;
-typedef unsigned long	uint32;
-
-typedef signed char		sint8;
-typedef signed short	sint16;
-typedef signed long		sint32;
-
-typedef float			float32;
-typedef double			float64;
-
-
-#endif //BITTYPE_H
\ No newline at end of file
diff --git a/Core/Tools/WW3D/pluglib/BITTYPE.h b/Core/Tools/WW3D/pluglib/BITTYPE.h
new file mode 100644
index 00000000000..803142c16f3
--- /dev/null
+++ b/Core/Tools/WW3D/pluglib/BITTYPE.h
@@ -0,0 +1,42 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*****************************************************************
+*
+*	Project:		3DTEST1 (3d Test Program)
+*
+*	File:			bittype.h
+*
+*	Start Date:		Dec 18, 1996
+*
+*	Programmer:		Greg Hjelstrom
+*
+*****************************************************************/
+
+#pragma once
+
+typedef unsigned char	uint8;
+typedef unsigned short	uint16;
+typedef unsigned long	uint32;
+
+typedef signed char		sint8;
+typedef signed short	sint16;
+typedef signed long		sint32;
+
+typedef float			float32;
+typedef double			float64;
diff --git a/Core/Tools/WW3D/pluglib/CMakeLists.txt b/Core/Tools/WW3D/pluglib/CMakeLists.txt
index de04ff9e637..e329dd35b99 100644
--- a/Core/Tools/WW3D/pluglib/CMakeLists.txt
+++ b/Core/Tools/WW3D/pluglib/CMakeLists.txt
@@ -1,14 +1,14 @@
 set(PLUGLIB_SRC
     "aaplane.h"
     "always.h"
-    "BITTYPE.H"
+    "BITTYPE.h"
     "bool.h"
     "borlandc.h"
     "chunkio.cpp"
     "chunkio.h"
     "errclass.h"
-    "EULER.CPP"
-    "EULER.H"
+    "EULER.cpp"
+    "EULER.h"
     "hashcalc.h"
     "hsv.cpp"
     "hsv.h"
@@ -26,7 +26,7 @@ set(PLUGLIB_SRC
     "palette.cpp"
     "palette.h"
     "plane.h"
-    "PROGRESS.H"
+    "PROGRESS.h"
     "rawfile.cpp"
     "rawfile.h"
     "realcrc.cpp"
@@ -34,8 +34,8 @@ set(PLUGLIB_SRC
     "rgb.cpp"
     "rgb.h"
     "uarray.h"
-    "Vector.CPP"
-    "Vector.H"
+    "Vector.cpp"
+    "Vector.h"
     "vector2.h"
     "vector3.h"
     "vector3i.h"
diff --git a/Core/Tools/WW3D/pluglib/EULER.CPP b/Core/Tools/WW3D/pluglib/EULER.CPP
deleted file mode 100644
index 52787b942a8..00000000000
--- a/Core/Tools/WW3D/pluglib/EULER.CPP
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* $Header: /Commando/Code/Tools/max2w3d/EULER.CPP 5     12/02/97 10:14p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Engine                                       * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/EULER.CPP                      $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 11/13/97 7:16p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 5                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-#include "EULER.H"	
-#include <float.h>
-
-
-/*********************************************************************
-
-	There are 24 possible conventions for Euler angles.  They can
-	be designated by:
-
-		EulerAxis		= Axis used initially
-		EulerParity		= parity of axis permutation (even = x,y,z)
-		EulerRepeat		= is last axis a repeat of the initial axis?
-		EulerFrame		= frame from which axes are taken (rotating or static)
-
-*********************************************************************/
-
-#define EULER_FRAME_STATIC			0x00000000
-#define EULER_FRAME_ROTATING		0x00000001
-#define EULER_FRAME(order)			((unsigned)(order) & 1)
-
-#define EULER_REPEAT_NO				0x00000000
-#define EULER_REPEAT_YES			0x00000001
-#define EULER_REPEAT(order)		(((unsigned)(order) >> 1) & 1)
-
-#define EULER_PARITY_EVEN			0x00000000
-#define EULER_PARITY_ODD			0x00000001
-#define EULER_PARITY(order)		(((unsigned)(order) >> 2) & 1)
-
-#define EULER_BUILD_ORDER(i,p,r,f) (((((((i) << 1) + (p)) << 1) + (r)) << 1) + (f))
-
-
-/* static axes */
-int	EulerOrderXYZs = EULER_BUILD_ORDER(0, EULER_PARITY_EVEN, EULER_REPEAT_NO,  EULER_FRAME_STATIC);
-int	EulerOrderXYXs = EULER_BUILD_ORDER(0, EULER_PARITY_EVEN, EULER_REPEAT_YES, EULER_FRAME_STATIC);
-int	EulerOrderXZYs = EULER_BUILD_ORDER(0, EULER_PARITY_ODD,  EULER_REPEAT_NO,  EULER_FRAME_STATIC);
-int	EulerOrderXZXs = EULER_BUILD_ORDER(0, EULER_PARITY_ODD,  EULER_REPEAT_YES, EULER_FRAME_STATIC);
-int	EulerOrderYZXs = EULER_BUILD_ORDER(1, EULER_PARITY_EVEN, EULER_REPEAT_NO,  EULER_FRAME_STATIC);
-int	EulerOrderYZYs = EULER_BUILD_ORDER(1, EULER_PARITY_EVEN, EULER_REPEAT_YES, EULER_FRAME_STATIC);
-int	EulerOrderYXZs = EULER_BUILD_ORDER(1, EULER_PARITY_ODD,  EULER_REPEAT_NO,  EULER_FRAME_STATIC);
-int	EulerOrderYXYs = EULER_BUILD_ORDER(1, EULER_PARITY_ODD,  EULER_REPEAT_YES, EULER_FRAME_STATIC);
-int	EulerOrderZXYs = EULER_BUILD_ORDER(2, EULER_PARITY_EVEN, EULER_REPEAT_NO,  EULER_FRAME_STATIC);
-int	EulerOrderZXZs = EULER_BUILD_ORDER(2, EULER_PARITY_EVEN, EULER_REPEAT_YES, EULER_FRAME_STATIC);
-int	EulerOrderZYXs = EULER_BUILD_ORDER(2, EULER_PARITY_ODD,  EULER_REPEAT_NO,  EULER_FRAME_STATIC);
-int	EulerOrderZYZs = EULER_BUILD_ORDER(2, EULER_PARITY_ODD,  EULER_REPEAT_YES, EULER_FRAME_STATIC);
-
-/* rotating axes */
-int	EulerOrderZYXr = EULER_BUILD_ORDER(0, EULER_PARITY_EVEN, EULER_REPEAT_NO,  EULER_FRAME_ROTATING);
-int	EulerOrderXYXr = EULER_BUILD_ORDER(0, EULER_PARITY_EVEN, EULER_REPEAT_YES, EULER_FRAME_ROTATING);
-int	EulerOrderYZXr = EULER_BUILD_ORDER(0, EULER_PARITY_ODD,  EULER_REPEAT_NO,  EULER_FRAME_ROTATING);
-int	EulerOrderXZXr = EULER_BUILD_ORDER(0, EULER_PARITY_ODD,  EULER_REPEAT_YES, EULER_FRAME_ROTATING);
-int	EulerOrderXZYr = EULER_BUILD_ORDER(1, EULER_PARITY_EVEN, EULER_REPEAT_NO,  EULER_FRAME_ROTATING);
-int	EulerOrderYZYr = EULER_BUILD_ORDER(1, EULER_PARITY_EVEN, EULER_REPEAT_YES, EULER_FRAME_ROTATING);
-int	EulerOrderZXYr = EULER_BUILD_ORDER(1, EULER_PARITY_ODD,  EULER_REPEAT_NO,  EULER_FRAME_ROTATING);
-int	EulerOrderYXYr = EULER_BUILD_ORDER(1, EULER_PARITY_ODD,  EULER_REPEAT_YES, EULER_FRAME_ROTATING);
-int	EulerOrderYXZr = EULER_BUILD_ORDER(2, EULER_PARITY_EVEN, EULER_REPEAT_NO,  EULER_FRAME_ROTATING);
-int	EulerOrderZXZr = EULER_BUILD_ORDER(2, EULER_PARITY_EVEN, EULER_REPEAT_YES, EULER_FRAME_ROTATING);
-int	EulerOrderXYZr = EULER_BUILD_ORDER(2, EULER_PARITY_ODD,  EULER_REPEAT_NO,  EULER_FRAME_ROTATING);
-int	EulerOrderZYZr = EULER_BUILD_ORDER(2, EULER_PARITY_ODD,  EULER_REPEAT_YES, EULER_FRAME_ROTATING);
-
-/* local functions */
-static void _euler_unpack_order(int order,int &i,int &j,int &k,int &h,int &n,int &s,int &f);
-static int _euler_axis_i(int order);
-static int _euler_axis_j(int order);
-static int _euler_axis_k(int order);
-static int _euler_axis_h(int order);
-static void _mat_to_array(const Matrix3 & tm, float M[3][4]);
-static void _array_to_mat(float M[3][4], Matrix3 & tm);
-
-
-
-EulerAnglesClass::EulerAnglesClass(const Matrix3 & M,int order)
-{
-	this->From_Matrix(M,order);
-}
-
-double EulerAnglesClass::Get_Angle(int i)
-{
-	return Angle[i];		
-}
-
-void EulerAnglesClass::From_Matrix(const Matrix3 & tm, int order)
-{
-	float M[3][4];
-	_mat_to_array(tm,M);
-
-	int i,j,k,h,n,s,f;
-
-	Order = order;
-	_euler_unpack_order(order,i,j,k,h,n,s,f);
-
-	if (s == EULER_REPEAT_YES) {
-		double sy = sqrt(M[i][j]*M[i][j] + M[i][k]*M[i][k]);
-
-		if (sy > 16*FLT_EPSILON) {
-
-			Angle[0] = atan2(M[i][j],M[i][k]);
-			Angle[1] = atan2(sy,M[i][i]);
-			Angle[2] = atan2(M[j][i],-M[k][i]);
-
-		} else {
-
-			Angle[0] = atan2(-M[j][k],M[j][j]);
-			Angle[1] = atan2(sy,M[i][i]);
-			Angle[2] = 0.0;
-		}
-
-	} else {
-
-		double cy = sqrt(M[i][i]*M[i][i] + M[j][i]*M[j][i]);
-
-		if (cy > 16*FLT_EPSILON) {
-
-			Angle[0] = atan2(M[k][j],M[k][k]);
-			Angle[1] = atan2(-M[k][i],cy);
-			Angle[2] = atan2(M[j][i],M[i][i]);
-
-		} else {
-
-			Angle[0] = atan2(-M[j][k],M[j][j]);
-			Angle[1] = atan2(-M[k][i],cy);
-			Angle[2] = 0;
-		}
-	}
-
-	if (n==EULER_PARITY_ODD) { Angle[0] = -Angle[0]; Angle[1] = -Angle[1]; Angle[2] = -Angle[2]; }
-	if (f==EULER_FRAME_ROTATING) { double t = Angle[0]; Angle[0] = Angle[2]; Angle[2] = t; }
-
-	// Trying to "clean" up the eulers, special cased for XYZr
-	if (order == EulerOrderXYZr) {
-
-		double x2 = PI + Angle[0];
-		double y2 = PI - Angle[1];
-		double z2 = PI + Angle[2];
-				
-		if (x2 > PI) {
-			x2 = x2 - 2*PI;
-		}
-
-		if (y2 > PI) {
-			y2 = y2 - 2*PI;
-		}
-
-		if (z2 > PI) {
-			z2 = z2 - 2*PI;
-		}
-
-		double mag0 = Angle[0]*Angle[0] + Angle[1]*Angle[1] + Angle[2]*Angle[2];
-		double mag1 = x2*x2 + y2*y2 + z2*z2;
-
-		if (mag1 < mag0) {
-			Angle[0] = x2;
-			Angle[1] = y2;
-			Angle[2] = z2;
-		}
-	}
-}
-
-
-
-void EulerAnglesClass::To_Matrix(Matrix3 & tm)
-{
-	float M[3][4] = {
-		{ 1.0f, 0.0f, 0.0f, 0.0f },
-		{ 0.0f, 1.0f, 0.0f, 0.0f },
-		{ 0.0f, 0.0f, 1.0f, 0.0f }
-	};
-
-	double a0,a1,a2;
-	double ti,tj,th,ci,cj,ch,si,sj,sh,cc,cs,sc,ss;
-	int i,j,k,h,n,s,f;
-
-	a0 = Angle[0];
-	a1 = Angle[1];
-	a2 = Angle[2];
-
-	_euler_unpack_order(Order,i,j,k,h,n,s,f);
-	if (f == EULER_FRAME_ROTATING) { 
-		double t = a0; a0 = a2; a2 = t; 
-	}
-	
-	if (n == EULER_PARITY_ODD) { 
-		a0 = -a0; a1 = -a1; a2 = -a2; 
-	}
-
-	ti = a0;				tj = a1;				th = a2;
-	ci = cos(ti);		cj = cos(tj);		ch = cos(th);
-	si = sin(ti);		sj = sin(tj);		sh = sin(th);
-
-	cc = ci*ch;
-	cs = ci*sh;
-	sc = si*ch;
-	ss = si*sh;
-
-	if (s == EULER_REPEAT_YES) {
-
-		M[i][i] = (float)(cj);			M[i][j] = (float)(sj*si);			M[i][k] = (float)(sj*ci);
-		M[j][i] = (float)(sj*sh);		M[j][j] = (float)(-cj*ss+cc);		M[j][k] = (float)(-cj*cs-sc);
-		M[k][i] = (float)(-sj*ch);		M[k][j] = (float)(cj*sc+cs);		M[k][k] = (float)(cj*cc-ss);
-
-	} else {
-
-		M[i][i] = (float)(cj*ch);		M[i][j] = (float)(sj*sc-cs);		M[i][k] = (float)(sj*cc+ss);
-		M[j][i] = (float)(cj*sh);		M[j][j] = (float)(sj*ss+cc);		M[j][k] = (float)(sj*cs-sc);
-		M[k][i] = (float)(-sj);			M[k][j] = (float)(cj*si);			M[k][k] = (float)(cj*ci);
-
-	}
-	_array_to_mat(M,tm);
-}
-
-
-static int _euler_safe[] = { 0,1,2,0 };
-static int _euler_next[] = { 1,2,0,1 };
-
-int _euler_axis_i(int order)
-{
-	return _euler_safe[ (order>>3) & 3 ];
-}
-
-int _euler_axis_j(int order)
-{
-	int index = _euler_axis_i(order);
-	if (EULER_PARITY(order) == 1) {
-		index++;
-	}
-
-	return _euler_next[ index ];
-}
-
-int _euler_axis_k(int order)
-{
-	int index = _euler_axis_i(order);
-	if (EULER_PARITY(order) != 1) {
-		index++;
-	}
-
-	return _euler_next[ index ];
-}
-
-int _euler_axis_h(int order)
-{
-	if (EULER_REPEAT(order) == 1) {
-		return _euler_axis_k(order);
-	} else {
-		return _euler_axis_i(order);
-	}
-}
-
-void _euler_unpack_order(int order,int &i,int &j,int &k,int &h,int &n,int &s,int &f)
-{
-	
-	f = order & 1;
-	order >>= 1;
-
-	s = order & 1;
-	order >>= 1;
-
-	n = order & 1;
-	order >>= 1;
-
-	i = _euler_safe[order & 3];
-	j = _euler_next[i+n];
-	k = _euler_next[i+1-n];
-	h = (s ? k : i);
-}
-
-void _mat_to_array(const Matrix3 & tm, float M[3][4])
-{
-	// Translation vector
-	Point3 trans = tm.GetRow(3);
-	M[0][3] = trans.x;
-	M[1][3] = trans.y;
-	M[2][3] = trans.z;
-
-	// Rotation matrix
-	for (int k=0; k<3; k++) {
-		Point3 v = tm.GetRow(k);
-		M[0][k] = v.x;
-		M[1][k] = v.y;
-		M[2][k] = v.z;
-	}
-}
-
-void _array_to_mat(float M[3][4], Matrix3 & tm)
-{
-	// translation
-	Point3 row(M[3][0],M[3][1],M[3][2]);
-	tm.SetRow(3, row);
-	
-	// rotation
-	for (int k=0; k<3; k++) {
-		row = Point3(M[0][k],M[1][k],M[2][k]);
-		tm.SetRow(k, row);
-	}		
-}
-
-
diff --git a/Core/Tools/WW3D/pluglib/EULER.H b/Core/Tools/WW3D/pluglib/EULER.H
deleted file mode 100644
index 03681d04fda..00000000000
--- a/Core/Tools/WW3D/pluglib/EULER.H
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* $Header: /Commando/Code/Tools/max2w3d/EULER.H 3     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Engine                                       * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/EULER.H                        $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 10/14/97 3:08p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-#ifndef EULER_H
-#define EULER_H
-
-#include <max.h>
-
-
-/*********************************************************************
-
-	Euler Order Types 
-
-	When creating an EulerAngles object, use one of the below
-	constants to describe the axis convention.
-
-	XYZ - order of the axes
-	s/r - whether the rotations are applied to the static or 
-	      rotating frame.
-
-*********************************************************************/
-
-/* static axes */
-extern int	EulerOrderXYZs;
-extern int	EulerOrderXYXs;
-extern int	EulerOrderXZYs;
-extern int	EulerOrderXZXs;
-extern int	EulerOrderYZXs;
-extern int	EulerOrderYZYs;
-extern int	EulerOrderYXZs;
-extern int	EulerOrderYXYs;
-extern int	EulerOrderZXYs;
-extern int	EulerOrderZXZs;
-extern int	EulerOrderZYXs;
-extern int	EulerOrderZYZs;
-
-/* rotating axes */
-extern int	EulerOrderXYZr;
-extern int	EulerOrderXYXr;
-extern int	EulerOrderXZYr;
-extern int	EulerOrderXZXr;
-extern int	EulerOrderYZXr;
-extern int	EulerOrderYZYr;
-extern int	EulerOrderYXZr;
-extern int	EulerOrderYXYr;
-extern int	EulerOrderZXYr;
-extern int	EulerOrderZXZr;
-extern int	EulerOrderZYXr;
-extern int	EulerOrderZYZr;
-
-
-/*********************************************************************
-	
-	EulerAnglesClass
-
-	The purpose for this class is mainly for conversion.  You can
-	choose a convention for the order of your rotations and then
-	convert matrices into a set of euler angles.
-
-	This implementation is based on the code in Graphics Gems IV
-	by Ken Shoemake.  The original article is on page 222.
-	
-*********************************************************************/
-class EulerAnglesClass
-{
-
-public:
-
-	EulerAnglesClass(void) : Order(0) { Angle[0] = 0.0; Angle[1] = 0.0; Angle[2] = 0.0; };
-	EulerAnglesClass(const Matrix3 & from,int order);
-	void		From_Matrix(const Matrix3 & from,int order);
-	void		To_Matrix(Matrix3 & M);
-
-	double	Get_Angle(int i);
-
-private:
-
-	double	Angle[3];
-	int		Order;
-
-};
-
-
-#endif /*EULER_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/pluglib/EULER.cpp b/Core/Tools/WW3D/pluglib/EULER.cpp
new file mode 100644
index 00000000000..517e51ab07a
--- /dev/null
+++ b/Core/Tools/WW3D/pluglib/EULER.cpp
@@ -0,0 +1,334 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* $Header: /Commando/Code/Tools/max2w3d/EULER.cpp 5     12/02/97 10:14p Greg_h $ */
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Engine                                       *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/EULER.cpp                      $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 11/13/97 7:16p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 5                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+
+#include "EULER.h"
+#include <float.h>
+
+
+/*********************************************************************
+
+	There are 24 possible conventions for Euler angles.  They can
+	be designated by:
+
+		EulerAxis		= Axis used initially
+		EulerParity		= parity of axis permutation (even = x,y,z)
+		EulerRepeat		= is last axis a repeat of the initial axis?
+		EulerFrame		= frame from which axes are taken (rotating or static)
+
+*********************************************************************/
+
+#define EULER_FRAME_STATIC			0x00000000
+#define EULER_FRAME_ROTATING		0x00000001
+#define EULER_FRAME(order)			((unsigned)(order) & 1)
+
+#define EULER_REPEAT_NO				0x00000000
+#define EULER_REPEAT_YES			0x00000001
+#define EULER_REPEAT(order)		(((unsigned)(order) >> 1) & 1)
+
+#define EULER_PARITY_EVEN			0x00000000
+#define EULER_PARITY_ODD			0x00000001
+#define EULER_PARITY(order)		(((unsigned)(order) >> 2) & 1)
+
+#define EULER_BUILD_ORDER(i,p,r,f) (((((((i) << 1) + (p)) << 1) + (r)) << 1) + (f))
+
+
+/* static axes */
+int	EulerOrderXYZs = EULER_BUILD_ORDER(0, EULER_PARITY_EVEN, EULER_REPEAT_NO,  EULER_FRAME_STATIC);
+int	EulerOrderXYXs = EULER_BUILD_ORDER(0, EULER_PARITY_EVEN, EULER_REPEAT_YES, EULER_FRAME_STATIC);
+int	EulerOrderXZYs = EULER_BUILD_ORDER(0, EULER_PARITY_ODD,  EULER_REPEAT_NO,  EULER_FRAME_STATIC);
+int	EulerOrderXZXs = EULER_BUILD_ORDER(0, EULER_PARITY_ODD,  EULER_REPEAT_YES, EULER_FRAME_STATIC);
+int	EulerOrderYZXs = EULER_BUILD_ORDER(1, EULER_PARITY_EVEN, EULER_REPEAT_NO,  EULER_FRAME_STATIC);
+int	EulerOrderYZYs = EULER_BUILD_ORDER(1, EULER_PARITY_EVEN, EULER_REPEAT_YES, EULER_FRAME_STATIC);
+int	EulerOrderYXZs = EULER_BUILD_ORDER(1, EULER_PARITY_ODD,  EULER_REPEAT_NO,  EULER_FRAME_STATIC);
+int	EulerOrderYXYs = EULER_BUILD_ORDER(1, EULER_PARITY_ODD,  EULER_REPEAT_YES, EULER_FRAME_STATIC);
+int	EulerOrderZXYs = EULER_BUILD_ORDER(2, EULER_PARITY_EVEN, EULER_REPEAT_NO,  EULER_FRAME_STATIC);
+int	EulerOrderZXZs = EULER_BUILD_ORDER(2, EULER_PARITY_EVEN, EULER_REPEAT_YES, EULER_FRAME_STATIC);
+int	EulerOrderZYXs = EULER_BUILD_ORDER(2, EULER_PARITY_ODD,  EULER_REPEAT_NO,  EULER_FRAME_STATIC);
+int	EulerOrderZYZs = EULER_BUILD_ORDER(2, EULER_PARITY_ODD,  EULER_REPEAT_YES, EULER_FRAME_STATIC);
+
+/* rotating axes */
+int	EulerOrderZYXr = EULER_BUILD_ORDER(0, EULER_PARITY_EVEN, EULER_REPEAT_NO,  EULER_FRAME_ROTATING);
+int	EulerOrderXYXr = EULER_BUILD_ORDER(0, EULER_PARITY_EVEN, EULER_REPEAT_YES, EULER_FRAME_ROTATING);
+int	EulerOrderYZXr = EULER_BUILD_ORDER(0, EULER_PARITY_ODD,  EULER_REPEAT_NO,  EULER_FRAME_ROTATING);
+int	EulerOrderXZXr = EULER_BUILD_ORDER(0, EULER_PARITY_ODD,  EULER_REPEAT_YES, EULER_FRAME_ROTATING);
+int	EulerOrderXZYr = EULER_BUILD_ORDER(1, EULER_PARITY_EVEN, EULER_REPEAT_NO,  EULER_FRAME_ROTATING);
+int	EulerOrderYZYr = EULER_BUILD_ORDER(1, EULER_PARITY_EVEN, EULER_REPEAT_YES, EULER_FRAME_ROTATING);
+int	EulerOrderZXYr = EULER_BUILD_ORDER(1, EULER_PARITY_ODD,  EULER_REPEAT_NO,  EULER_FRAME_ROTATING);
+int	EulerOrderYXYr = EULER_BUILD_ORDER(1, EULER_PARITY_ODD,  EULER_REPEAT_YES, EULER_FRAME_ROTATING);
+int	EulerOrderYXZr = EULER_BUILD_ORDER(2, EULER_PARITY_EVEN, EULER_REPEAT_NO,  EULER_FRAME_ROTATING);
+int	EulerOrderZXZr = EULER_BUILD_ORDER(2, EULER_PARITY_EVEN, EULER_REPEAT_YES, EULER_FRAME_ROTATING);
+int	EulerOrderXYZr = EULER_BUILD_ORDER(2, EULER_PARITY_ODD,  EULER_REPEAT_NO,  EULER_FRAME_ROTATING);
+int	EulerOrderZYZr = EULER_BUILD_ORDER(2, EULER_PARITY_ODD,  EULER_REPEAT_YES, EULER_FRAME_ROTATING);
+
+/* local functions */
+static void _euler_unpack_order(int order,int &i,int &j,int &k,int &h,int &n,int &s,int &f);
+static int _euler_axis_i(int order);
+static int _euler_axis_j(int order);
+static int _euler_axis_k(int order);
+static int _euler_axis_h(int order);
+static void _mat_to_array(const Matrix3 & tm, float M[3][4]);
+static void _array_to_mat(float M[3][4], Matrix3 & tm);
+
+
+
+EulerAnglesClass::EulerAnglesClass(const Matrix3 & M,int order)
+{
+	this->From_Matrix(M,order);
+}
+
+double EulerAnglesClass::Get_Angle(int i)
+{
+	return Angle[i];
+}
+
+void EulerAnglesClass::From_Matrix(const Matrix3 & tm, int order)
+{
+	float M[3][4];
+	_mat_to_array(tm,M);
+
+	int i,j,k,h,n,s,f;
+
+	Order = order;
+	_euler_unpack_order(order,i,j,k,h,n,s,f);
+
+	if (s == EULER_REPEAT_YES) {
+		double sy = sqrt(M[i][j]*M[i][j] + M[i][k]*M[i][k]);
+
+		if (sy > 16*FLT_EPSILON) {
+
+			Angle[0] = atan2(M[i][j],M[i][k]);
+			Angle[1] = atan2(sy,M[i][i]);
+			Angle[2] = atan2(M[j][i],-M[k][i]);
+
+		} else {
+
+			Angle[0] = atan2(-M[j][k],M[j][j]);
+			Angle[1] = atan2(sy,M[i][i]);
+			Angle[2] = 0.0;
+		}
+
+	} else {
+
+		double cy = sqrt(M[i][i]*M[i][i] + M[j][i]*M[j][i]);
+
+		if (cy > 16*FLT_EPSILON) {
+
+			Angle[0] = atan2(M[k][j],M[k][k]);
+			Angle[1] = atan2(-M[k][i],cy);
+			Angle[2] = atan2(M[j][i],M[i][i]);
+
+		} else {
+
+			Angle[0] = atan2(-M[j][k],M[j][j]);
+			Angle[1] = atan2(-M[k][i],cy);
+			Angle[2] = 0;
+		}
+	}
+
+	if (n==EULER_PARITY_ODD) { Angle[0] = -Angle[0]; Angle[1] = -Angle[1]; Angle[2] = -Angle[2]; }
+	if (f==EULER_FRAME_ROTATING) { double t = Angle[0]; Angle[0] = Angle[2]; Angle[2] = t; }
+
+	// Trying to "clean" up the eulers, special cased for XYZr
+	if (order == EulerOrderXYZr) {
+
+		double x2 = PI + Angle[0];
+		double y2 = PI - Angle[1];
+		double z2 = PI + Angle[2];
+
+		if (x2 > PI) {
+			x2 = x2 - 2*PI;
+		}
+
+		if (y2 > PI) {
+			y2 = y2 - 2*PI;
+		}
+
+		if (z2 > PI) {
+			z2 = z2 - 2*PI;
+		}
+
+		double mag0 = Angle[0]*Angle[0] + Angle[1]*Angle[1] + Angle[2]*Angle[2];
+		double mag1 = x2*x2 + y2*y2 + z2*z2;
+
+		if (mag1 < mag0) {
+			Angle[0] = x2;
+			Angle[1] = y2;
+			Angle[2] = z2;
+		}
+	}
+}
+
+
+
+void EulerAnglesClass::To_Matrix(Matrix3 & tm)
+{
+	float M[3][4] = {
+		{ 1.0f, 0.0f, 0.0f, 0.0f },
+		{ 0.0f, 1.0f, 0.0f, 0.0f },
+		{ 0.0f, 0.0f, 1.0f, 0.0f }
+	};
+
+	double a0,a1,a2;
+	double ti,tj,th,ci,cj,ch,si,sj,sh,cc,cs,sc,ss;
+	int i,j,k,h,n,s,f;
+
+	a0 = Angle[0];
+	a1 = Angle[1];
+	a2 = Angle[2];
+
+	_euler_unpack_order(Order,i,j,k,h,n,s,f);
+	if (f == EULER_FRAME_ROTATING) {
+		double t = a0; a0 = a2; a2 = t;
+	}
+
+	if (n == EULER_PARITY_ODD) {
+		a0 = -a0; a1 = -a1; a2 = -a2;
+	}
+
+	ti = a0;				tj = a1;				th = a2;
+	ci = cos(ti);		cj = cos(tj);		ch = cos(th);
+	si = sin(ti);		sj = sin(tj);		sh = sin(th);
+
+	cc = ci*ch;
+	cs = ci*sh;
+	sc = si*ch;
+	ss = si*sh;
+
+	if (s == EULER_REPEAT_YES) {
+
+		M[i][i] = (float)(cj);			M[i][j] = (float)(sj*si);			M[i][k] = (float)(sj*ci);
+		M[j][i] = (float)(sj*sh);		M[j][j] = (float)(-cj*ss+cc);		M[j][k] = (float)(-cj*cs-sc);
+		M[k][i] = (float)(-sj*ch);		M[k][j] = (float)(cj*sc+cs);		M[k][k] = (float)(cj*cc-ss);
+
+	} else {
+
+		M[i][i] = (float)(cj*ch);		M[i][j] = (float)(sj*sc-cs);		M[i][k] = (float)(sj*cc+ss);
+		M[j][i] = (float)(cj*sh);		M[j][j] = (float)(sj*ss+cc);		M[j][k] = (float)(sj*cs-sc);
+		M[k][i] = (float)(-sj);			M[k][j] = (float)(cj*si);			M[k][k] = (float)(cj*ci);
+
+	}
+	_array_to_mat(M,tm);
+}
+
+
+static int _euler_safe[] = { 0,1,2,0 };
+static int _euler_next[] = { 1,2,0,1 };
+
+int _euler_axis_i(int order)
+{
+	return _euler_safe[ (order>>3) & 3 ];
+}
+
+int _euler_axis_j(int order)
+{
+	int index = _euler_axis_i(order);
+	if (EULER_PARITY(order) == 1) {
+		index++;
+	}
+
+	return _euler_next[ index ];
+}
+
+int _euler_axis_k(int order)
+{
+	int index = _euler_axis_i(order);
+	if (EULER_PARITY(order) != 1) {
+		index++;
+	}
+
+	return _euler_next[ index ];
+}
+
+int _euler_axis_h(int order)
+{
+	if (EULER_REPEAT(order) == 1) {
+		return _euler_axis_k(order);
+	} else {
+		return _euler_axis_i(order);
+	}
+}
+
+void _euler_unpack_order(int order,int &i,int &j,int &k,int &h,int &n,int &s,int &f)
+{
+
+	f = order & 1;
+	order >>= 1;
+
+	s = order & 1;
+	order >>= 1;
+
+	n = order & 1;
+	order >>= 1;
+
+	i = _euler_safe[order & 3];
+	j = _euler_next[i+n];
+	k = _euler_next[i+1-n];
+	h = (s ? k : i);
+}
+
+void _mat_to_array(const Matrix3 & tm, float M[3][4])
+{
+	// Translation vector
+	Point3 trans = tm.GetRow(3);
+	M[0][3] = trans.x;
+	M[1][3] = trans.y;
+	M[2][3] = trans.z;
+
+	// Rotation matrix
+	for (int k=0; k<3; k++) {
+		Point3 v = tm.GetRow(k);
+		M[0][k] = v.x;
+		M[1][k] = v.y;
+		M[2][k] = v.z;
+	}
+}
+
+void _array_to_mat(float M[3][4], Matrix3 & tm)
+{
+	// translation
+	Point3 row(M[3][0],M[3][1],M[3][2]);
+	tm.SetRow(3, row);
+
+	// rotation
+	for (int k=0; k<3; k++) {
+		row = Point3(M[0][k],M[1][k],M[2][k]);
+		tm.SetRow(k, row);
+	}
+}
+
+
diff --git a/Core/Tools/WW3D/pluglib/EULER.h b/Core/Tools/WW3D/pluglib/EULER.h
new file mode 100644
index 00000000000..189c82dd551
--- /dev/null
+++ b/Core/Tools/WW3D/pluglib/EULER.h
@@ -0,0 +1,114 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* $Header: /Commando/Code/Tools/max2w3d/EULER.h 3     10/28/97 6:08p Greg_h $ */
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Engine                                       *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/EULER.h                        $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 10/14/97 3:08p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include <max.h>
+
+
+/*********************************************************************
+
+	Euler Order Types
+
+	When creating an EulerAngles object, use one of the below
+	constants to describe the axis convention.
+
+	XYZ - order of the axes
+	s/r - whether the rotations are applied to the static or
+	      rotating frame.
+
+*********************************************************************/
+
+/* static axes */
+extern int	EulerOrderXYZs;
+extern int	EulerOrderXYXs;
+extern int	EulerOrderXZYs;
+extern int	EulerOrderXZXs;
+extern int	EulerOrderYZXs;
+extern int	EulerOrderYZYs;
+extern int	EulerOrderYXZs;
+extern int	EulerOrderYXYs;
+extern int	EulerOrderZXYs;
+extern int	EulerOrderZXZs;
+extern int	EulerOrderZYXs;
+extern int	EulerOrderZYZs;
+
+/* rotating axes */
+extern int	EulerOrderXYZr;
+extern int	EulerOrderXYXr;
+extern int	EulerOrderXZYr;
+extern int	EulerOrderXZXr;
+extern int	EulerOrderYZXr;
+extern int	EulerOrderYZYr;
+extern int	EulerOrderYXZr;
+extern int	EulerOrderYXYr;
+extern int	EulerOrderZXYr;
+extern int	EulerOrderZXZr;
+extern int	EulerOrderZYXr;
+extern int	EulerOrderZYZr;
+
+
+/*********************************************************************
+
+	EulerAnglesClass
+
+	The purpose for this class is mainly for conversion.  You can
+	choose a convention for the order of your rotations and then
+	convert matrices into a set of euler angles.
+
+	This implementation is based on the code in Graphics Gems IV
+	by Ken Shoemake.  The original article is on page 222.
+
+*********************************************************************/
+class EulerAnglesClass
+{
+
+public:
+
+	EulerAnglesClass(void) : Order(0) { Angle[0] = 0.0; Angle[1] = 0.0; Angle[2] = 0.0; };
+	EulerAnglesClass(const Matrix3 & from,int order);
+	void		From_Matrix(const Matrix3 & from,int order);
+	void		To_Matrix(Matrix3 & M);
+
+	double	Get_Angle(int i);
+
+private:
+
+	double	Angle[3];
+	int		Order;
+
+};
diff --git a/Core/Tools/WW3D/pluglib/PROGRESS.H b/Core/Tools/WW3D/pluglib/PROGRESS.H
deleted file mode 100644
index 4be417de5f0..00000000000
--- a/Core/Tools/WW3D/pluglib/PROGRESS.H
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* $Header: /Commando/Code/Tools/max2w3d/PROGRESS.H 5     10/28/97 6:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : PROGRESS.H                                                   * 
- *                                                                                             * 
- *                   Programmer : James McNeil                                                 * 
- *                                                                                             * 
- *                   Start Date : 06/19/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 19, 1997 [GH]                                           * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#ifndef PROGRESS_H
-#define PROGRESS_H
-
-#include "always.h"
-
-class Progress_Meter_Class
-{
-public:
-
-	Progress_Meter_Class
-	(
-		Interface * gi,
-		float base,
-		float range
-	):
-		Max ( gi ),
-		Base ( base ),
-		Range ( range ),
-		Amount_Done ( 0.0f ),
-		Increment ( 0.0f ),
-		Accum( 0.0f ),
-		Cancel_Requested ( FALSE )
-	{
-	}
-
-	Progress_Meter_Class ( Progress_Meter_Class & other, float sub_amount ):
-		Max ( other.Max ),
-		Base ( other.Base + other.Amount_Done * other.Range ),
-		Range ( other.Range * sub_amount ),
-		Amount_Done ( 0.0f ),
-		Increment ( 0.0f ),
-		Accum ( other.Accum ),
-		Cancel_Requested ( other.Cancel_Requested )
-	{
-	}
-
-	void Finish_In_Steps ( int number_of_steps )
-	{
-		Increment = (1.0f - Amount_Done) / number_of_steps;
-	}
-
-	void Add_Increment ()
-	{
-		Set_Amount_Done ( Amount_Done + Increment );
-	}
-
-	void Set_Amount_Done ( float percentage )
-	{
-		Accum += percentage;
-		Amount_Done = percentage;
-		if (Accum > 0.01f) {
-			Max->ProgressUpdate ( (int) (Amount_Done * Range + Base) );
-			Accum = 0.0f;
-		}
-
-		if (Max->GetCancel())
-		{
-			int choice = MessageBox
-			(
-				Max->GetMAXHWnd(),
-				_T("Do you really want to cancel the export?"),
-				_T("Cancel Export?"), MB_ICONQUESTION | MB_YESNO
-			);
-
-			if ( choice == IDYES )
-				Cancel_Requested = TRUE;
-			else
-				Max->SetCancel ( FALSE );
-		}
-	}
-
-	BOOL Cancelled () { return Cancel_Requested; }
-
-	float Increment;
-
-private:
-
-	Interface * Max;
-
-	float Base;
-	float Range;
-	float Amount_Done;
-	float Accum;
-
-	BOOL Cancel_Requested;
-};
-
-#endif /* PROGRESS_H */
diff --git a/Core/Tools/WW3D/pluglib/PROGRESS.h b/Core/Tools/WW3D/pluglib/PROGRESS.h
new file mode 100644
index 00000000000..4b7dfc888df
--- /dev/null
+++ b/Core/Tools/WW3D/pluglib/PROGRESS.h
@@ -0,0 +1,122 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* $Header: /Commando/Code/Tools/max2w3d/PROGRESS.h 5     10/28/97 6:08p Greg_h $ */
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : PROGRESS.h                                                   *
+ *                                                                                             *
+ *                   Programmer : James McNeil                                                 *
+ *                                                                                             *
+ *                   Start Date : 06/19/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 19, 1997 [GH]                                           *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include "always.h"
+
+class Progress_Meter_Class
+{
+public:
+
+	Progress_Meter_Class
+	(
+		Interface * gi,
+		float base,
+		float range
+	):
+		Max ( gi ),
+		Base ( base ),
+		Range ( range ),
+		Amount_Done ( 0.0f ),
+		Increment ( 0.0f ),
+		Accum( 0.0f ),
+		Cancel_Requested ( FALSE )
+	{
+	}
+
+	Progress_Meter_Class ( Progress_Meter_Class & other, float sub_amount ):
+		Max ( other.Max ),
+		Base ( other.Base + other.Amount_Done * other.Range ),
+		Range ( other.Range * sub_amount ),
+		Amount_Done ( 0.0f ),
+		Increment ( 0.0f ),
+		Accum ( other.Accum ),
+		Cancel_Requested ( other.Cancel_Requested )
+	{
+	}
+
+	void Finish_In_Steps ( int number_of_steps )
+	{
+		Increment = (1.0f - Amount_Done) / number_of_steps;
+	}
+
+	void Add_Increment ()
+	{
+		Set_Amount_Done ( Amount_Done + Increment );
+	}
+
+	void Set_Amount_Done ( float percentage )
+	{
+		Accum += percentage;
+		Amount_Done = percentage;
+		if (Accum > 0.01f) {
+			Max->ProgressUpdate ( (int) (Amount_Done * Range + Base) );
+			Accum = 0.0f;
+		}
+
+		if (Max->GetCancel())
+		{
+			int choice = MessageBox
+			(
+				Max->GetMAXHWnd(),
+				_T("Do you really want to cancel the export?"),
+				_T("Cancel Export?"), MB_ICONQUESTION | MB_YESNO
+			);
+
+			if ( choice == IDYES )
+				Cancel_Requested = TRUE;
+			else
+				Max->SetCancel ( FALSE );
+		}
+	}
+
+	BOOL Cancelled () { return Cancel_Requested; }
+
+	float Increment;
+
+private:
+
+	Interface * Max;
+
+	float Base;
+	float Range;
+	float Amount_Done;
+	float Accum;
+
+	BOOL Cancel_Requested;
+};
diff --git a/Core/Tools/WW3D/pluglib/Vector.CPP b/Core/Tools/WW3D/pluglib/Vector.CPP
deleted file mode 100644
index 954ccd45deb..00000000000
--- a/Core/Tools/WW3D/pluglib/Vector.CPP
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/pluglib/Vector.CPP                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
- *                     $Modtime:: 3/29/98 10:42a                                              $*
- *                                                                                             * 
- *                    $Revision:: 2                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   BooleanVectorClass::BooleanVectorClass -- Copy constructor for boolean array.             *
- *   BooleanVectorClass::BooleanVectorClass -- Explicit data buffer constructor.               *
- *   BooleanVectorClass::Clear -- Resets boolean vector to empty state.                        *
- *   BooleanVectorClass::Fixup -- Updates the boolean vector to a known state.                 *
- *   BooleanVectorClass::Reset -- Clear all boolean values in array.                           *
- *   BooleanVectorClass::Resize -- Resizes a boolean vector object.                            *
- *   BooleanVectorClass::Set -- Forces all boolean elements to true.                           *
- *   BooleanVectorClass::operator = -- Assignment operator.                                    *
- *   BooleanVectorClass::operator == -- Comparison operator for boolean vector.                *
- *   VectorClass<T>::Clear -- Frees and clears the vector.                                     *
- *   VectorClass<T>::ID -- Finds object ID based on value.                                     *
- *   VectorClass<T>::ID -- Pointer based conversion to index number.                           *
- *   VectorClass<T>::Resize -- Changes the size of the vector.                                 *
- *   VectorClass<T>::VectorClass -- Constructor for vector class.                              *
- *   VectorClass<T>::VectorClass -- Copy constructor for vector object.                        *
- *   VectorClass<T>::operator = -- The assignment operator.                                    *
- *   VectorClass<T>::operator == -- Equality operator for vector objects.                      *
- *   VectorClass<T>::~VectorClass -- Default destructor for vector class.                      *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include	"always.h"
-#include	"Vector.H"
-#include	<string.h>
-
-/*
-**	The following template function can be located here ONLY if all the instantiations are
-**	declared in a header file this module includes. By placing the template functions here,
-**	it speeds up compiler operation and reduces object module size.
-*/
-
-//----------------------------------------------------------------------------------------------
-
-/***********************************************************************************************
- * BooleanVectorClass::BooleanVectorClass -- Explicit data buffer constructor.                 *
- *                                                                                             *
- *    This is the constructor for a boolean array. This constructor takes the memory pointer   *
- *    provided as assigns that as the array data pointer.                                      *
- *                                                                                             *
- * INPUT:   size  -- The size of the array (in bits).                                          *
- *                                                                                             *
- *          array -- Pointer to the memory that the array is to use.                           *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   You must make sure that the memory specified is large enough to contain the     *
- *             bits specified.                                                                 *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   07/18/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-BooleanVectorClass::BooleanVectorClass(unsigned size, unsigned char * array) :
-	BitCount(size),
-	Copy(false),
-	LastIndex(-1),
-	BitArray(0, 0)
-{
-	BitArray.Resize(((size + (8-1)) / 8), array);
-//	LastIndex = -1;
-//	BitCount = size;
-}
-
-
-/***********************************************************************************************
- * BooleanVectorClass::BooleanVectorClass -- Copy constructor of boolean array.                *
- *                                                                                             *
- *    This is the copy constructor for a boolean array. It is used to make a duplicate of the  *
- *    boolean array.                                                                           *
- *                                                                                             *
- * INPUT:   vector   -- Reference to the vector to be duplicated.                              *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   07/18/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-BooleanVectorClass::BooleanVectorClass(BooleanVectorClass const & vector)
-{
-	LastIndex = -1;
-	*this = vector;
-}
-
-
-/***********************************************************************************************
- * BooleanVectorClass::operator = -- Assignment operator.                                      *
- *                                                                                             *
- *    This routine will make a copy of the specified boolean vector array. The vector is       *
- *    copied into an already constructed existing vector. The values from the existing vector  *
- *    are destroyed by this copy.                                                              *
- *                                                                                             *
- * INPUT:   vector   -- Reference to the vector to make a copy of.                             *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   07/18/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-BooleanVectorClass & BooleanVectorClass::operator =(BooleanVectorClass const & vector)
-{
-	Fixup();
-	Copy = vector.Copy;
-	LastIndex = vector.LastIndex;
-	BitArray = vector.BitArray;
-	BitCount = vector.BitCount;
-	return(*this);
-}
-
-
-/***********************************************************************************************
- * BooleanVectorClass::operator == -- Comparison operator for boolean vector.                  *
- *                                                                                             *
- *    This is the comparison operator for a boolean vector class. Boolean vectors are equal    *
- *    if the bit count and bit values are identical.                                           *
- *                                                                                             *
- * INPUT:   vector   -- Reference to the vector to compare to.                                 *
- *                                                                                             *
- * OUTPUT:  Are the boolean vectors identical?                                                 *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   07/18/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-bool BooleanVectorClass::operator == (const BooleanVectorClass & vector)
-{
-	Fixup(LastIndex);
-	return(BitCount == vector.BitCount && BitArray == vector.BitArray);
-}
-
-
-/***********************************************************************************************
- * BooleanVectorClass::Resize -- Resizes a boolean vector object.                              *
- *                                                                                             *
- *    This routine will resize the boolean vector object. An index value used with a boolean   *
- *    vector must be less than the value specified in as the new size.                         *
- *                                                                                             *
- * INPUT:   size  -- The new maximum size of this boolean vector.                              *
- *                                                                                             *
- * OUTPUT:  Was the boolean vector sized successfully?                                         *
- *                                                                                             *
- * WARNINGS:   The boolean array might be reallocated or even deleted by this routine.         *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   07/18/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-int BooleanVectorClass::Resize(unsigned size)
-{
-	Fixup();
-
-	if (size > 0) {
-
-		/*
-		**	Record the previous bit count of the boolean vector. This is used
-		**	to determine if the array has grown in size and thus clearing is
-		**	necessary.
-		*/
-		unsigned oldsize = BitCount;
-
-		/*
-		**	Actually resize the bit array. Since this is a bit packed array,
-		**	there are 8 elements per byte (rounded up).
-		*/
-		int success = BitArray.Resize(((size + (8-1)) / 8));
-
-		/*
-		**	Since there is no default constructor for bit packed integers, a manual
-		**	clearing of the bits is required.
-		*/
-		BitCount = size;
-		if (success && oldsize < size) {
-			for (unsigned index = oldsize; index < size; index++) {
-				(*this)[index] = 0;
-			}
-		}
-
-		return(success);
-	}
-
-	/*
-	**	Resizing to zero is the same as clearing and deallocating the array.
-	**	This is always successful.
-	*/
-	Clear();
-	return(true);
-}
-
-
-/***********************************************************************************************
- * BooleanVectorClass::Clear -- Resets boolean vector to empty state.                          *
- *                                                                                             *
- *    This routine will clear out the boolean array. This will free any allocated memory and   *
- *    result in the boolean vector being unusable until the Resize function is subsequently    *
- *    called.                                                                                  *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   The boolean vector cannot be used until it is resized to a non null condition.  *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   07/18/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-void BooleanVectorClass::Clear(void)
-{
-	Fixup();
-	BitCount = 0;
-	BitArray.Clear();
-}
-
-
-/***********************************************************************************************
- * BooleanVectorClass::Reset -- Clear all boolean values in array.                             *
- *                                                                                             *
- *    This is the preferred (and quick) method to clear the boolean array to a false condition.*
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   07/18/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-void BooleanVectorClass::Reset(void)
-{
-	LastIndex = -1;
-	if (BitArray.Length() > 0) {
-		memset(&BitArray[0], '\0', BitArray.Length());
-	}
-}
-
-
-/***********************************************************************************************
- * BooleanVectorClass::Set -- Forces all boolean elements to true.                             *
- *                                                                                             *
- *    This is the preferred (and fast) way to set all boolean elements to true.                *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   07/18/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-void BooleanVectorClass::Set(void)
-{
-	LastIndex = -1;
-	if (BitArray.Length() > 0) {
-		memset(&BitArray[0], '\xFF', BitArray.Length());
-	}
-}
-
-
-/***********************************************************************************************
- * BooleanVectorClass::Fixup -- Updates the boolean vector to a known state.                   *
- *                                                                                             *
- *    Use this routine to set the boolean value copy to match the appropriate bit in the       *
- *    boolean array. The boolean array will be updated with any changes from the last time     *
- *    a value was fetched from the boolean vector. By using this update method, the boolean    *
- *    array can be treated as a normal array even though the elements are composed of          *
- *    otherwise inaccessible bits.                                                             *
- *                                                                                             *
- * INPUT:   index -- The index to set the new copy value to. If the index is -1, then the      *
- *                   previous value will be updated into the vector array, but no new value    *
- *                   will be fetched from it.                                                  *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   Always call this routine with "-1" if any direct manipulation of the bit        *
- *             array is to occur. This ensures that the bit array is accurate.                 *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   07/18/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-void BooleanVectorClass::Fixup(int index) const
-{
-	/*
-	**	If the requested index value is illegal, then force the index
-	**	to be -1. This is the default non-index value.
-	*/
-	if ((unsigned)index >= (unsigned)BitCount) {
-		index = -1;
-	}
-
-	/*
-	**	If the new index is different than the previous index, there might
-	**	be some fixing up required.
-	*/
-	if (index != LastIndex) {
-
-		/*
-		**	If the previously fetched boolean value was changed, then update
-		**	the boolean array accordingly.
-		*/
-		if (LastIndex != -1) {
-			assert(unsigned(LastIndex) < unsigned(BitCount));
-			Set_Bit((void*)&BitArray[0], LastIndex, Copy);
-		}
-
-		/*
-		**	If this new current index is valid, then fill in the reference boolean
-		**	value with the appropriate data from the bit array.
-		*/
-		if (index != -1) {
-			assert(unsigned(index) < unsigned(BitCount));
-			((unsigned char &)Copy) = (unsigned char)Get_Bit((void*)&BitArray[0], index);
-//			((unsigned char&)Copy) = Get_Bit((void*)&BitArray[0], index);
-		}
-
-		((BooleanVectorClass *)this)->LastIndex = index;
-	}
-}
-
-
diff --git a/Core/Tools/WW3D/pluglib/Vector.H b/Core/Tools/WW3D/pluglib/Vector.H
deleted file mode 100644
index d216c010f85..00000000000
--- a/Core/Tools/WW3D/pluglib/Vector.H
+++ /dev/null
@@ -1,1007 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Library/Vector.H                             $* 
- *                                                                                             * 
- *                      $Author:: Byon_g                                                      $*
- *                                                                                             * 
- *                     $Modtime:: 3/12/98 2:09p                                               $*
- *                                                                                             * 
- *                    $Revision:: 2                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   VectorClass<T>::VectorClass -- Constructor for vector class.                              *
- *   VectorClass<T>::~VectorClass -- Default destructor for vector class.                      *
- *   VectorClass<T>::VectorClass -- Copy constructor for vector object.                        *
- *   VectorClass<T>::operator = -- The assignment operator.                                    *
- *   VectorClass<T>::operator == -- Equality operator for vector objects.                      *
- *   VectorClass<T>::Clear -- Frees and clears the vector.                                     *
- *   VectorClass<T>::Resize -- Changes the size of the vector.                                 *
- *   DynamicVectorClass<T>::DynamicVectorClass -- Constructor for dynamic vector.              *
- *   DynamicVectorClass<T>::Resize -- Changes the size of a dynamic vector.                    *
- *   DynamicVectorClass<T>::Add -- Add an element to the vector.                               *
- *   DynamicVectorClass<T>::Delete -- Remove the specified object from the vector.             *
- *   DynamicVectorClass<T>::Delete -- Deletes the specified index from the vector.             *
- *   VectorClass<T>::ID -- Pointer based conversion to index number.                           *
- *   VectorClass<T>::ID -- Finds object ID based on value.                                     *
- *   DynamicVectorClass<T>::ID -- Find matching value in the dynamic vector.                   *
- *   DynamicVectorClass<T>::Uninitialized_Add -- Add an empty place to the vector.             *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#ifndef VECTOR_H
-#define VECTOR_H
-
-#include	"noinit.h"
-#include	<assert.h>
-#include	<new.h>
-#include	<string.h>
-#include	<stddef.h>
-#include	<stdlib.h>
-#include	<Utility/stdint_adapter.h>
-
-
-/**************************************************************************
-**	This is a general purpose vector class. A vector is defined by this
-**	class, as an array of arbitrary objects where the array can be dynamically
-**	sized. Because is deals with arbitrary object types, it can handle everything.
-**	As a result of this, it is not terribly efficient for integral objects (such
-**	as char or int). It will function correctly, but the copy constructor and
-**	equality operator could be highly optimized if the integral type were known.
-**	This efficiency can be implemented by deriving an integral vector template
-**	from this one in order to supply more efficient routines.
-*/
-
-// Why, oh why does Visual C need this!!! It's bugged. <sigh>
-#pragma warning(disable : 4505)
-
-
-template<class T>
-class VectorClass
-{
-	public:
-		VectorClass(NoInitClass const &) {};
-		VectorClass(int size=0, T const * array=0);
-		VectorClass(VectorClass<T> const &);		// Copy constructor.
-		virtual ~VectorClass(void);
-
-		T & operator[](int index) {assert(unsigned(index) < unsigned(VectorMax));return(Vector[index]);};
-		T const & operator[](int index) const {assert(unsigned(index) < unsigned(VectorMax));return(Vector[index]);};
-		VectorClass<T> & operator = (VectorClass<T> const &); // Assignment operator.
-		
-		virtual bool operator == (VectorClass<T> const &) const;	// Equality operator.
-		
-		virtual bool Resize(int newsize, T const * array=0);
-		virtual void Clear(void);
-		int Length(void) const {return VectorMax;};
-		virtual int ID(T const * ptr);	// Pointer based identification.
-		virtual int ID(T const & ptr);	// Value based identification.
-
-	protected:
-
-		/*
-		**	This is a pointer to the allocated vector array of elements.
-		*/
-		T * Vector;
-
-		/*
-		**	This is the maximum number of elements allowed in this vector.
-		*/
-		int VectorMax;
-
-		/*
-		**	This indicates if the vector is in a valid (even if empty) state.
-		*/
-		bool IsValid;
-
-		/*
-		**	Does the vector data pointer refer to memory that this class has manually
-		**	allocated? If so, then this class is responsible for deleting it.
-		*/
-		bool IsAllocated;
-};
-
-
-/***********************************************************************************************
- * VectorClass<T>::VectorClass -- Constructor for vector class.                                *
- *                                                                                             *
- *    This constructor for the vector class is passed the initial size of the vector and an    *
- *    optional pointer to a preallocated block of memory that the vector will be placed in.    *
- *    If this optional pointer is NULL (or not provided), then the vector is allocated out     *
- *    of free store (with the "new" operator).                                                 *
- *                                                                                             *
- * INPUT:   size  -- The number of elements to initialize this vector to.                      *
- *                                                                                             *
- *          array -- Optional pointer to a previously allocated memory block to hold the       *
- *                   vector.                                                                   *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-VectorClass<T>::VectorClass(int size, T const * array) :
-	Vector(0),
-	VectorMax(size),
-	IsValid(true),
-	IsAllocated(false)
-{
-	/*
-	**	Allocate the vector. The default constructor will be called for every
-	**	object in this vector.
-	*/
-	if (size) {
-		if (array) {
-			Vector = new((void*)array) T[size];
-		} else {
-			Vector = new T[size];
-			IsAllocated = true;
-		}
-	}
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::~VectorClass -- Default destructor for vector class.                        *
- *                                                                                             *
- *    This is the default destructor for the vector class. It will deallocate any memory       *
- *    that it may have allocated.                                                              *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-VectorClass<T>::~VectorClass(void)
-{
-	VectorClass<T>::Clear();
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::VectorClass -- Copy constructor for vector object.                          *
- *                                                                                             *
- *    This is the copy constructor for the vector class. It will duplicate the provided        *
- *    vector into the new vector being created.                                                *
- *                                                                                             *
- * INPUT:   vector   -- Reference to the vector to use as a copy.                              *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-VectorClass<T>::VectorClass(VectorClass<T> const & vector) :
-	Vector(0),
-	VectorMax(0),
-	IsValid(true),
-	IsAllocated(false)
-{
-	*this = vector;
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::operator = -- The assignment operator.                                      *
- *                                                                                             *
- *    This the the assignment operator for vector objects. It will alter the existing lvalue   *
- *    vector to duplicate the rvalue one.                                                      *
- *                                                                                             *
- * INPUT:   vector   -- The rvalue vector to copy into the lvalue one.                         *
- *                                                                                             *
- * OUTPUT:  Returns with reference to the newly copied vector.                                 *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-VectorClass<T> & VectorClass<T>::operator =(VectorClass<T> const & vector)
-{
-	if (this != &vector) {
-		Clear();
-		VectorMax = vector.Length();
-		if (VectorMax) {
-			Vector = new T[VectorMax];
-			if (Vector) {
-				IsAllocated = true;
-				for (int index = 0; index < VectorMax; index++) {
-					Vector[index] = vector[index];
-				}
-			}
-		} else {
-			Vector = 0;
-			IsAllocated = false;
-		}
-	}
-	return(*this);
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::operator == -- Equality operator for vector objects.                        *
- *                                                                                             *
- *    This operator compares two vectors for equality. It does this by performing an object    *
- *    by object comparison between the two vectors.                                            *
- *                                                                                             *
- * INPUT:   vector   -- The right vector expression.                                           *
- *                                                                                             *
- * OUTPUT:  bool; Are the two vectors essentially equal? (do they contain comparable elements  *
- *                in the same order?)                                                          *
- *                                                                                             *
- * WARNINGS:   The equality operator must exist for the objects that this vector contains.     *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool VectorClass<T>::operator == (VectorClass<T> const & vector) const
-{
-	if (VectorMax == vector.Length()) {
-		for (int index = 0; index < VectorMax; index++) {
-			if (Vector[index] != vector[index]) {
-				return(false);
-			}
-		}
-		return(true);
-	}
-	return(false);
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::ID -- Pointer based conversion to index number.                             *
- *                                                                                             *
- *    Use this routine to convert a pointer to an element in the vector back into the index    *
- *    number of that object. This routine ONLY works with actual pointers to object within     *
- *    the vector. For "equivalent" object index number (such as with similar integral values)  *
- *    then use the "by value" index number ID function.                                        *
- *                                                                                             *
- * INPUT:   pointer  -- Pointer to an actual object in the vector.                             *
- *                                                                                             *
- * OUTPUT:  Returns with the index number for the object pointed to by the parameter.          *
- *                                                                                             *
- * WARNINGS:   This routine is only valid for actual pointers to object that exist within      *
- *             the vector. All other object pointers will yield undefined results.             *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/13/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-inline int VectorClass<T>::ID(T const * ptr)
-{
-	if (!IsValid) return(0);
-	return(((uintptr_t)ptr - (uintptr_t)&(*this)[0]) / sizeof(T));
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::ID -- Finds object ID based on value.                                       *
- *                                                                                             *
- *    Use this routine to find the index value of an object with equivalent value in the       *
- *    vector. Typical use of this would be for integral types.                                 *
- *                                                                                             *
- * INPUT:   object   -- Reference to the object that is to be looked up in the vector.         *
- *                                                                                             *
- * OUTPUT:  Returns with the index number of the object that is equivalent to the one          *
- *          specified. If no matching value could be found then -1 is returned.                *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/13/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-int VectorClass<T>::ID(T const & object)
-{
-	if (!IsValid) return(0);
-
-	for (int index = 0; index < VectorMax; index++) {
-		if ((*this)[index] == object) {
-			return(index);
-		}
-	}
-	return(-1);
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::Clear -- Frees and clears the vector.                                       *
- *                                                                                             *
- *    Use this routine to reset the vector to an empty (non-allocated) state. A vector will    *
- *    free all allocated memory when this routine is called. In order for the vector to be     *
- *    useful after this point, the Resize function must be called to give it element space.    *
- *                                                                                             *
- * INPUT:   none                                                                               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-void VectorClass<T>::Clear(void)
-{
-	if (Vector && IsAllocated) {
-		delete[] Vector;
-		Vector = 0;
-	}
-	IsAllocated = false;
-	VectorMax = 0;
-}
-
-
-/***********************************************************************************************
- * VectorClass<T>::Resize -- Changes the size of the vector.                                   *
- *                                                                                             *
- *    This routine is used to change the size (usually to increase) the size of a vector. This *
- *    is the only way to increase the vector's working room (number of elements).              *
- *                                                                                             *
- * INPUT:   newsize  -- The desired size of the vector.                                        *
- *                                                                                             *
- *          array    -- Optional pointer to a previously allocated memory block that the       *
- *                      array will be located in. If this parameter is not supplied, then      *
- *                      the array will be allocated from free store.                           *
- *                                                                                             *
- * OUTPUT:  bool; Was the array resized successfully?                                          *
- *                                                                                             *
- * WARNINGS:   Failure to succeed could be the result of running out of memory.                *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool VectorClass<T>::Resize(int newsize, T const * array)
-{
-	if (newsize) {
-
-		/*
-		**	Allocate a new vector of the size specified. The default constructor
-		**	will be called for every object in this vector.
-		*/
-		T * newptr;
-
-		/*
-		**	Either create a new memory block for the object array or initialize
-		**	an existing block as indicated by the array parameter. When creating a new
-		**	memory block, flag that the vector object is currently in an invalid
-		**	state. This is necessary because the default constructor for the object
-		**	elements may look to the vector to fetch their ID number.
-		*/
-		IsValid = false;
-		if (!array) {
-			newptr = new T[newsize];
-		} else {
-			newptr = new((void*)array) T[newsize];
-		}
-		IsValid = true;
-		if (!newptr) {
-			return(false);
-		}
-
-		/*
-		**	If there is an old vector, then it must be copied (as much as is feasible)
-		**	to the new vector.
-		*/
-		if (Vector != NULL) {
-
-			/*
-			**	Copy as much of the old vector into the new vector as possible. This
-			**	presumes that there is a functional assignment operator for each
-			**	of the objects in the vector.
-			*/
-			int copycount = (newsize < VectorMax) ? newsize : VectorMax;
-			for (int index = 0; index < copycount; index++) {
-				newptr[index] = Vector[index];
-			}
-
-			/*
-			**	Delete the old vector. This might cause the destructors to be called
-			**	for all of the old elements. This makes the implementation of suitable
-			**	assignment operator very important. The default assignment operator will
-			**	only work for the simplest of objects.
-			*/
-			if (IsAllocated) {
-				delete[] Vector;
-				Vector = 0;
-			}
-		}
-
-		/*
-		**	Assign the new vector data to this class.
-		*/
-		Vector = newptr;
-		VectorMax = newsize;
-		IsAllocated = (Vector && !array);
-
-	} else {
-
-		/*
-		**	Resizing to zero is the same as clearing the vector.
-		*/
-		Clear();
-	}
-	return(true);
-}
-
-
-
-/**************************************************************************
-**	This derivative vector class adds the concept of adding and deleting
-**	objects. The objects are packed to the beginning of the vector array.
-**	If this is instantiated for a class object, then the assignment operator
-**	and the equality operator must be supported. If the vector allocates its
-**	own memory, then the vector can grow if it runs out of room adding items.
-**	The growth rate is controlled by setting the growth step rate. A growth
-**	step rate of zero disallows growing.
-*/
-template<class T>
-class DynamicVectorClass : public VectorClass<T>
-{
-protected:
-		using VectorClass<T>::IsAllocated;
-		using VectorClass<T>::Vector;
-		using VectorClass<T>::VectorMax;
-	public:
-		using VectorClass<T>::Length;
-
-	public:
-		DynamicVectorClass(unsigned size=0, T const * array=0);
-
-		// Change maximum size of vector.
-		virtual bool Resize(int newsize, T const * array=0);
-
-		// Resets and frees the vector array.
-		virtual void Clear(void) {ActiveCount = 0;VectorClass<T>::Clear();};
-
-		// Fetch number of "allocated" vector objects.
-		int Count(void) const {return(ActiveCount);};
-
-		// Add object to vector (growing as necessary).
-		bool Add(T const & object);
-		bool Add_Head(T const & object);
-
-		// Delete object just like this from vector.
-		bool Delete(T const & object);
-
-		// Delete object at this vector index.
-		bool Delete(int index);
-
-		// Deletes all objects in the vector.
-		void Delete_All(void) {ActiveCount = 0;};
-
-		// Set amount that vector grows by.
-		int Set_Growth_Step(int step) {return(GrowthStep = step);};
-
-		// Fetch current growth step rate.
-		int Growth_Step(void) {return GrowthStep;};
-
-		virtual int ID(T const * ptr) {return(VectorClass<T>::ID(ptr));};
-		virtual int ID(T const & ptr);
-
-		DynamicVectorClass<T> & operator =(DynamicVectorClass<T> const & rvalue) {
-			VectorClass<T>::operator = (rvalue);
-			ActiveCount = rvalue.ActiveCount;
-			GrowthStep = rvalue.GrowthStep;
-			return(*this);
-		} 
-
-      // Uninitialized Add - does everything an Add does, except copying an
-      // object into the 'new' spot in the array. It returns a pointer to
-      // the 'new' spot. (NULL if the Add failed). NOTE - you must then fill
-      // this memory area with a valid object (e.g. by using placement new),
-      // or chaos will result!
-      T * Uninitialized_Add(void);
-
-	protected:
-
-		/*
-		**	This is a count of the number of active objects in this
-		**	vector. The memory array often times is bigger than this
-		**	value.
-		*/
-		int ActiveCount;
-
-		/*
-		**	If there is insufficient room in the vector array for a new
-		**	object to be added, then the vector will grow by the number
-		**	of objects specified by this value. This is controlled by
-		**	the Set_Growth_Step() function.
-		*/
-		int GrowthStep;
-};
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::DynamicVectorClass -- Constructor for dynamic vector.                *
- *                                                                                             *
- *    This is the normal constructor for the dynamic vector class. It is similar to the normal *
- *    vector class constructor. The vector is initialized to contain the number of elements    *
- *    specified in the "size" parameter. The memory is allocated from free store unless the    *
- *    optional array parameter is provided. In this case it will place the vector at the       *
- *    memory location specified.                                                               *
- *                                                                                             *
- * INPUT:   size  -- The maximum number of objects allowed in this vector.                     *
- *                                                                                             *
- *          array -- Optional pointer to the memory area to place the vector at.               *
- *                                                                                             *
- * OUTPUT:  none                                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-DynamicVectorClass<T>::DynamicVectorClass(unsigned size, T const * array)
-	: VectorClass<T>(size, array)
-{
-	GrowthStep = 10;
-	ActiveCount = 0;
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Resize -- Changes the size of a dynamic vector.                      *
- *                                                                                             *
- *    Use this routine to change the size of the vector. The size changed is the maximum       *
- *    number of allocated objects within this vector. If a memory buffer is provided, then     *
- *    the vector will be located there. Otherwise, the memory will be allocated out of free    *
- *    store.                                                                                   *
- *                                                                                             *
- * INPUT:   newsize  -- The desired maximum size of this vector.                               *
- *                                                                                             *
- *          array    -- Optional pointer to a previously allocated memory array.               *
- *                                                                                             *
- * OUTPUT:  bool; Was vector successfully resized according to specifications?                 *
- *                                                                                             *
- * WARNINGS:   Failure to resize the vector could be the result of lack of free store.         *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool DynamicVectorClass<T>::Resize(int newsize, T const * array)
-{
-	if (VectorClass<T>::Resize(newsize, array)) {
-		if (Length() < ActiveCount) ActiveCount = Length();
-		return(true);
-	}
-	return(false);
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::ID -- Find matching value in the dynamic vector.                     *
- *                                                                                             *
- *    Use this routine to find a matching object (by value) in the vector. Unlike the base     *
- *    class ID function of similar name, this one restricts the scan to the current number     *
- *    of valid objects.                                                                        *
- *                                                                                             *
- * INPUT:   object   -- A reference to the object that a match is to be found in the           *
- *                      vector.                                                                *
- *                                                                                             *
- * OUTPUT:  Returns with the index number of the object that is equivalent to the one          *
- *          specified. If no equivalent object could be found then -1 is returned.             *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/13/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-int DynamicVectorClass<T>::ID(T const & object)
-{
-	for (int index = 0; index < Count(); index++) {
-		if ((*this)[index] == object) return(index);
-	}
-	return(-1);
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Add -- Add an element to the vector.                                 *
- *                                                                                             *
- *    Use this routine to add an element to the vector. The vector will automatically be       *
- *    resized to accomodate the new element IF the vector was allocated previously and the     *
- *    growth rate is not zero.                                                                 *
- *                                                                                             *
- * INPUT:   object   -- Reference to the object that will be added to the vector.              *
- *                                                                                             *
- * OUTPUT:  bool; Was the object added successfully? If so, the object is added to the end     *
- *                of the vector.                                                               *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool DynamicVectorClass<T>::Add(T const & object)
-{
-	if (ActiveCount >= Length()) {
-		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
-			if (!Resize(Length() + GrowthStep)) {
-
-				/*
-				**	Failure to increase the size of the vector is an error condition.
-				**	Return with the error flag.
-				*/
-				return(false);
-			}
-		} else {
-
-			/*
-			**	Increasing the size of this vector is not allowed! Bail this
-			**	routine with the error code.
-			*/
-			return(false);
-		}
-	}
-
-	/*
-	**	There is room for the new object now. Add it to the end of the object vector.
-	*/
-	(*this)[ActiveCount++] = object;
-	return(true);
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Add_Head -- Adds element to head of the list.                        *
- *                                                                                             *
- *    This routine will add the specified element to the head of the vector. If necessary,     *
- *    the vector will be expanded accordingly.                                                 *
- *                                                                                             *
- * INPUT:   object   -- Reference to the object to add to the head of this vector.             *
- *                                                                                             *
- * OUTPUT:  bool; Was the object added without error?                                          *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   09/21/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool DynamicVectorClass<T>::Add_Head(T const & object)
-{
-	if (ActiveCount >= Length()) {
-		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
-			if (!Resize(Length() + GrowthStep)) {
-
-				/*
-				**	Failure to increase the size of the vector is an error condition.
-				**	Return with the error flag.
-				*/
-				return(false);
-			}
-		} else {
-
-			/*
-			**	Increasing the size of this vector is not allowed! Bail this
-			**	routine with the error code.
-			*/
-			return(false);
-		}
-	}
-
-	/*
-	**	There is room for the new object now. Add it to the end of the object vector.
-	*/
-	if (ActiveCount) {
-		memmove(&(*this)[1], &(*this)[0], ActiveCount * sizeof(T));
-	}
-	(*this)[0] = object;
-	ActiveCount++;
-//	(*this)[ActiveCount++] = object;
-	return(true);
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Delete -- Remove the specified object from the vector.               *
- *                                                                                             *
- *    This routine will delete the object referenced from the vector. All objects in the       *
- *    vector that follow the one deleted will be moved "down" to fill the hole.                *
- *                                                                                             *
- * INPUT:   object   -- Reference to the object in this vector that is to be deleted.          *
- *                                                                                             *
- * OUTPUT:  bool; Was the object deleted successfully? This should always be true.             *
- *                                                                                             *
- * WARNINGS:   Do no pass a reference to an object that is NOT part of this vector. The        *
- *             results of this are undefined and probably catastrophic.                        *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool DynamicVectorClass<T>::Delete(T const & object)
-{
-	int id = ID(object);
-	if (id != -1) {
-		return(Delete(id));
-	}
-	return(false);
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Delete -- Deletes the specified index from the vector.               *
- *                                                                                             *
- *    Use this routine to delete the object at the specified index from the objects in the     *
- *    vector. This routine will move all the remaining objects "down" in order to fill the     *
- *    hole.                                                                                    *
- *                                                                                             *
- * INPUT:   index -- The index number of the object in the vector that is to be deleted.       *
- *                                                                                             *
- * OUTPUT:  bool; Was the object index deleted successfully? Failure might mean that the index *
- *                specified was out of bounds.                                                 *
- *                                                                                             *
- * WARNINGS:   none                                                                            *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/10/1995 JLB : Created.                                                                 *
- *=============================================================================================*/
-template<class T>
-bool DynamicVectorClass<T>::Delete(int index)
-{
-	if (index < ActiveCount) {
-		ActiveCount--;
-
-		/*
-		**	If there are any objects past the index that was deleted, copy those
-		**	objects down in order to fill the hole. A simple memory copy is
-		**	not sufficient since the vector could contain class objects that
-		**	need to use the assignment operator for movement.
-		*/
-		for (int i = index; i < ActiveCount; i++) {
-			(*this)[i] = (*this)[i+1];
-		}
-		return(true);
-	}
-	return(false);
-}
-
-
-/***********************************************************************************************
- * DynamicVectorClass<T>::Uninitialized_Add -- Add an empty place to the vector.               *
- *                                                                                             *
- *    To avoid copying when creating an object and adding it to the vector, use this and       *
- *    immediately fill the area that the return value points to with a valid object (by hand   *
- *    for a struct or by using placement new for a class object).                              *
- *    This function does everything Add does except copying an object into the new space,      *
- *    thus leaving an uninitialized area of memory.                                            *
- *                                                                                             *
- * INPUT:   none.                                                                              *
- *                                                                                             *
- * OUTPUT:  T *; Points to the empty space where the new object is to be created. (If the      *
- *               space was not added succesfully, returns NULL).                              *
- *                                                                                             *
- * WARNINGS:   If memory area is left uninitialized, Very Bad Things will happen.              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   03/04/1998 NH : Created.                                                                  *
- *=============================================================================================*/
-template<class T>
-T * DynamicVectorClass<T>::Uninitialized_Add(void)
-{
-	if (ActiveCount >= Length()) {
-		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
-			if (!Resize(Length() + GrowthStep)) {
-
-				/*
-				**	Failure to increase the size of the vector is an error condition.
-				**	Return with the error value.
-				*/
-				return(NULL);
-			}
-		} else {
-
-			/*
-			**	Increasing the size of this vector is not allowed! Bail this
-			**	routine with the error value.
-			*/
-			return(NULL);
-		}
-	}
-
-	/*
-	**	There is room for the new space now. Add it to the end of the object
-   ** vector. and return a pointer to it.
-	*/
-   return &((*this)[ActiveCount++]);
-}
-
-
-void Set_Bit(void * array, int bit, int value);
-int Get_Bit(void const * array, int bit);
-int First_True_Bit(void const * array);
-int First_False_Bit(void const * array);
-
-
-/**************************************************************************
-**	This is a derivative of a vector class that supports boolean flags. Since
-**	a boolean flag can be represented by a single bit, this class packs the
-**	array of boolean flags into an array of bytes containing 8 boolean values
-**	each. For large boolean arrays, this results in an 87.5% savings. Although
-**	the indexing "[]" operator is supported, DO NOT pass pointers to sub elements
-**	of this bit vector class. A pointer derived from the indexing operator is
-**	only valid until the next call. Because of this, only simple
-**	direct use of the "[]" operator is allowed.
-*/
-class BooleanVectorClass
-{
-	public:
-		BooleanVectorClass(unsigned size=0, unsigned char * array=0);
-		BooleanVectorClass(BooleanVectorClass const & vector);
-
-		// Assignment operator.
-		BooleanVectorClass & operator =(BooleanVectorClass const & vector);
-
-		// Equivalency operator.
-		bool operator == (BooleanVectorClass const & vector);
-
-		// Fetch number of boolean objects in vector.
-		int Length(void) {return BitCount;};
-
-		// Set all boolean values to false;
-		void Reset(void);
-
-		// Set all boolean values to true.
-		void Set(void);
-
-		// Resets vector to zero length (frees memory).
-		void Clear(void);
-
-		// Change size of this boolean vector.
-		int Resize(unsigned size);
-
-		// Fetch reference to specified index.
-		bool const & operator[](int index) const {
-			if (LastIndex != index) Fixup(index);
-			return(Copy);
-		};
-		bool & operator[](int index) {
-			if (LastIndex != index) Fixup(index);
-			return(Copy);
-		};
-
-		// Quick check on boolean state.
-		bool Is_True(int index) const {
-			if (index == LastIndex) return(Copy);
-			return(Get_Bit(&BitArray[0], index) != 0);
-		};
-
-		// Find first index that is false.
-		int First_False(void) const {
-			if (LastIndex != -1) Fixup(-1);
-
-			int retval = First_False_Bit(&BitArray[0]);
-			if (retval < BitCount) return(retval);
-
-			/*
-			**	Failure to find a false boolean value in the vector. Return this
-			**	fact in the form of an invalid index number.
-			*/
-			return(-1);
-		}
-
-		// Find first index that is true.
-		int First_True(void) const {
-			if (LastIndex != -1) Fixup(-1);
-
-			int retval = First_True_Bit(&BitArray[0]);
-			if (retval < BitCount) return(retval);
-
-			/*
-			**	Failure to find a true boolean value in the vector. Return this
-			**	fact in the form of an invalid index number.
-			*/
-			return(-1);
-		}
-
-	private:
-		void Fixup(int index=-1) const;
-
-		/*
-		**	This is the number of boolean values in the vector. This value is
-		**	not necessarily a multiple of 8, even though the underlying character
-		**	vector contains a multiple of 8 bits.
-		*/
-		int BitCount;
-
-		/*
-		**	This is a referential copy of an element in the bit vector. The
-		**	purpose of this copy is to allow normal reference access to this
-		**	object (for speed reasons). This hides the bit packing scheme from
-		**	the user of this class.
-		*/
-		bool Copy;
-
-		/*
-		**	This records the index of the value last fetched into the reference
-		**	boolean variable. This index is used to properly restore the value
-		**	when the reference copy needs updating.
-		*/
-		int LastIndex;
-
-		/*
-		**	This points to the allocated bitfield array.
-		*/
-		VectorClass<unsigned char> BitArray;
-};
-
-
-template<class T>
-int Pointer_Vector_Add(T * ptr, VectorClass<T *> & vec)
-{
-	int id = 0;
-	bool foundspot = false;
-	for (int index = 0; index < vec.Length(); index++) {
-		if (vec[index] == NULL) {
-			id = index;
-			foundspot = true;
-			break;
-		}
-	}
-	if (!foundspot) {
-		id = vec.Length();
-		vec.Resize((vec.Length()+1) * 2);
-		for (int index = id; index < vec.Length(); index++) {
-			vec[index] = NULL;
-		}
-	}
-	vec[id] = ptr;
-	return(id);
-}
-
-
-template<class T>
-bool Pointer_Vector_Remove(T const * ptr, VectorClass<T *> & vec)
-{
-	int id = vec.ID((T *)ptr);
-	if (id != -1) {
-		vec[id] = NULL;
-		return(true);
-	}
-	return(false);
-}
-
-
-#endif
-
diff --git a/Core/Tools/WW3D/pluglib/Vector.cpp b/Core/Tools/WW3D/pluglib/Vector.cpp
new file mode 100644
index 00000000000..328add8e5d2
--- /dev/null
+++ b/Core/Tools/WW3D/pluglib/Vector.cpp
@@ -0,0 +1,355 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/pluglib/Vector.cpp                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 3/29/98 10:42a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   BooleanVectorClass::BooleanVectorClass -- Copy constructor for boolean array.             *
+ *   BooleanVectorClass::BooleanVectorClass -- Explicit data buffer constructor.               *
+ *   BooleanVectorClass::Clear -- Resets boolean vector to empty state.                        *
+ *   BooleanVectorClass::Fixup -- Updates the boolean vector to a known state.                 *
+ *   BooleanVectorClass::Reset -- Clear all boolean values in array.                           *
+ *   BooleanVectorClass::Resize -- Resizes a boolean vector object.                            *
+ *   BooleanVectorClass::Set -- Forces all boolean elements to true.                           *
+ *   BooleanVectorClass::operator = -- Assignment operator.                                    *
+ *   BooleanVectorClass::operator == -- Comparison operator for boolean vector.                *
+ *   VectorClass<T>::Clear -- Frees and clears the vector.                                     *
+ *   VectorClass<T>::ID -- Finds object ID based on value.                                     *
+ *   VectorClass<T>::ID -- Pointer based conversion to index number.                           *
+ *   VectorClass<T>::Resize -- Changes the size of the vector.                                 *
+ *   VectorClass<T>::VectorClass -- Constructor for vector class.                              *
+ *   VectorClass<T>::VectorClass -- Copy constructor for vector object.                        *
+ *   VectorClass<T>::operator = -- The assignment operator.                                    *
+ *   VectorClass<T>::operator == -- Equality operator for vector objects.                      *
+ *   VectorClass<T>::~VectorClass -- Default destructor for vector class.                      *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#include	"always.h"
+#include	"Vector.h"
+#include	<string.h>
+
+/*
+**	The following template function can be located here ONLY if all the instantiations are
+**	declared in a header file this module includes. By placing the template functions here,
+**	it speeds up compiler operation and reduces object module size.
+*/
+
+//----------------------------------------------------------------------------------------------
+
+/***********************************************************************************************
+ * BooleanVectorClass::BooleanVectorClass -- Explicit data buffer constructor.                 *
+ *                                                                                             *
+ *    This is the constructor for a boolean array. This constructor takes the memory pointer   *
+ *    provided as assigns that as the array data pointer.                                      *
+ *                                                                                             *
+ * INPUT:   size  -- The size of the array (in bits).                                          *
+ *                                                                                             *
+ *          array -- Pointer to the memory that the array is to use.                           *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   You must make sure that the memory specified is large enough to contain the     *
+ *             bits specified.                                                                 *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/18/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+BooleanVectorClass::BooleanVectorClass(unsigned size, unsigned char * array) :
+	BitCount(size),
+	Copy(false),
+	LastIndex(-1),
+	BitArray(0, 0)
+{
+	BitArray.Resize(((size + (8-1)) / 8), array);
+//	LastIndex = -1;
+//	BitCount = size;
+}
+
+
+/***********************************************************************************************
+ * BooleanVectorClass::BooleanVectorClass -- Copy constructor of boolean array.                *
+ *                                                                                             *
+ *    This is the copy constructor for a boolean array. It is used to make a duplicate of the  *
+ *    boolean array.                                                                           *
+ *                                                                                             *
+ * INPUT:   vector   -- Reference to the vector to be duplicated.                              *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/18/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+BooleanVectorClass::BooleanVectorClass(BooleanVectorClass const & vector)
+{
+	LastIndex = -1;
+	*this = vector;
+}
+
+
+/***********************************************************************************************
+ * BooleanVectorClass::operator = -- Assignment operator.                                      *
+ *                                                                                             *
+ *    This routine will make a copy of the specified boolean vector array. The vector is       *
+ *    copied into an already constructed existing vector. The values from the existing vector  *
+ *    are destroyed by this copy.                                                              *
+ *                                                                                             *
+ * INPUT:   vector   -- Reference to the vector to make a copy of.                             *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/18/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+BooleanVectorClass & BooleanVectorClass::operator =(BooleanVectorClass const & vector)
+{
+	Fixup();
+	Copy = vector.Copy;
+	LastIndex = vector.LastIndex;
+	BitArray = vector.BitArray;
+	BitCount = vector.BitCount;
+	return(*this);
+}
+
+
+/***********************************************************************************************
+ * BooleanVectorClass::operator == -- Comparison operator for boolean vector.                  *
+ *                                                                                             *
+ *    This is the comparison operator for a boolean vector class. Boolean vectors are equal    *
+ *    if the bit count and bit values are identical.                                           *
+ *                                                                                             *
+ * INPUT:   vector   -- Reference to the vector to compare to.                                 *
+ *                                                                                             *
+ * OUTPUT:  Are the boolean vectors identical?                                                 *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/18/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+bool BooleanVectorClass::operator == (const BooleanVectorClass & vector)
+{
+	Fixup(LastIndex);
+	return(BitCount == vector.BitCount && BitArray == vector.BitArray);
+}
+
+
+/***********************************************************************************************
+ * BooleanVectorClass::Resize -- Resizes a boolean vector object.                              *
+ *                                                                                             *
+ *    This routine will resize the boolean vector object. An index value used with a boolean   *
+ *    vector must be less than the value specified in as the new size.                         *
+ *                                                                                             *
+ * INPUT:   size  -- The new maximum size of this boolean vector.                              *
+ *                                                                                             *
+ * OUTPUT:  Was the boolean vector sized successfully?                                         *
+ *                                                                                             *
+ * WARNINGS:   The boolean array might be reallocated or even deleted by this routine.         *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/18/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+int BooleanVectorClass::Resize(unsigned size)
+{
+	Fixup();
+
+	if (size > 0) {
+
+		/*
+		**	Record the previous bit count of the boolean vector. This is used
+		**	to determine if the array has grown in size and thus clearing is
+		**	necessary.
+		*/
+		unsigned oldsize = BitCount;
+
+		/*
+		**	Actually resize the bit array. Since this is a bit packed array,
+		**	there are 8 elements per byte (rounded up).
+		*/
+		int success = BitArray.Resize(((size + (8-1)) / 8));
+
+		/*
+		**	Since there is no default constructor for bit packed integers, a manual
+		**	clearing of the bits is required.
+		*/
+		BitCount = size;
+		if (success && oldsize < size) {
+			for (unsigned index = oldsize; index < size; index++) {
+				(*this)[index] = 0;
+			}
+		}
+
+		return(success);
+	}
+
+	/*
+	**	Resizing to zero is the same as clearing and deallocating the array.
+	**	This is always successful.
+	*/
+	Clear();
+	return(true);
+}
+
+
+/***********************************************************************************************
+ * BooleanVectorClass::Clear -- Resets boolean vector to empty state.                          *
+ *                                                                                             *
+ *    This routine will clear out the boolean array. This will free any allocated memory and   *
+ *    result in the boolean vector being unusable until the Resize function is subsequently    *
+ *    called.                                                                                  *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   The boolean vector cannot be used until it is resized to a non null condition.  *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/18/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+void BooleanVectorClass::Clear(void)
+{
+	Fixup();
+	BitCount = 0;
+	BitArray.Clear();
+}
+
+
+/***********************************************************************************************
+ * BooleanVectorClass::Reset -- Clear all boolean values in array.                             *
+ *                                                                                             *
+ *    This is the preferred (and quick) method to clear the boolean array to a false condition.*
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/18/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+void BooleanVectorClass::Reset(void)
+{
+	LastIndex = -1;
+	if (BitArray.Length() > 0) {
+		memset(&BitArray[0], '\0', BitArray.Length());
+	}
+}
+
+
+/***********************************************************************************************
+ * BooleanVectorClass::Set -- Forces all boolean elements to true.                             *
+ *                                                                                             *
+ *    This is the preferred (and fast) way to set all boolean elements to true.                *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/18/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+void BooleanVectorClass::Set(void)
+{
+	LastIndex = -1;
+	if (BitArray.Length() > 0) {
+		memset(&BitArray[0], '\xFF', BitArray.Length());
+	}
+}
+
+
+/***********************************************************************************************
+ * BooleanVectorClass::Fixup -- Updates the boolean vector to a known state.                   *
+ *                                                                                             *
+ *    Use this routine to set the boolean value copy to match the appropriate bit in the       *
+ *    boolean array. The boolean array will be updated with any changes from the last time     *
+ *    a value was fetched from the boolean vector. By using this update method, the boolean    *
+ *    array can be treated as a normal array even though the elements are composed of          *
+ *    otherwise inaccessible bits.                                                             *
+ *                                                                                             *
+ * INPUT:   index -- The index to set the new copy value to. If the index is -1, then the      *
+ *                   previous value will be updated into the vector array, but no new value    *
+ *                   will be fetched from it.                                                  *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   Always call this routine with "-1" if any direct manipulation of the bit        *
+ *             array is to occur. This ensures that the bit array is accurate.                 *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/18/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+void BooleanVectorClass::Fixup(int index) const
+{
+	/*
+	**	If the requested index value is illegal, then force the index
+	**	to be -1. This is the default non-index value.
+	*/
+	if ((unsigned)index >= (unsigned)BitCount) {
+		index = -1;
+	}
+
+	/*
+	**	If the new index is different than the previous index, there might
+	**	be some fixing up required.
+	*/
+	if (index != LastIndex) {
+
+		/*
+		**	If the previously fetched boolean value was changed, then update
+		**	the boolean array accordingly.
+		*/
+		if (LastIndex != -1) {
+			assert(unsigned(LastIndex) < unsigned(BitCount));
+			Set_Bit((void*)&BitArray[0], LastIndex, Copy);
+		}
+
+		/*
+		**	If this new current index is valid, then fill in the reference boolean
+		**	value with the appropriate data from the bit array.
+		*/
+		if (index != -1) {
+			assert(unsigned(index) < unsigned(BitCount));
+			((unsigned char &)Copy) = (unsigned char)Get_Bit((void*)&BitArray[0], index);
+//			((unsigned char&)Copy) = Get_Bit((void*)&BitArray[0], index);
+		}
+
+		((BooleanVectorClass *)this)->LastIndex = index;
+	}
+}
+
+
diff --git a/Core/Tools/WW3D/pluglib/Vector.h b/Core/Tools/WW3D/pluglib/Vector.h
new file mode 100644
index 00000000000..aa2ce7b26f1
--- /dev/null
+++ b/Core/Tools/WW3D/pluglib/Vector.h
@@ -0,0 +1,1002 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Library/Vector.h                             $*
+ *                                                                                             *
+ *                      $Author:: Byon_g                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 3/12/98 2:09p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   VectorClass<T>::VectorClass -- Constructor for vector class.                              *
+ *   VectorClass<T>::~VectorClass -- Default destructor for vector class.                      *
+ *   VectorClass<T>::VectorClass -- Copy constructor for vector object.                        *
+ *   VectorClass<T>::operator = -- The assignment operator.                                    *
+ *   VectorClass<T>::operator == -- Equality operator for vector objects.                      *
+ *   VectorClass<T>::Clear -- Frees and clears the vector.                                     *
+ *   VectorClass<T>::Resize -- Changes the size of the vector.                                 *
+ *   DynamicVectorClass<T>::DynamicVectorClass -- Constructor for dynamic vector.              *
+ *   DynamicVectorClass<T>::Resize -- Changes the size of a dynamic vector.                    *
+ *   DynamicVectorClass<T>::Add -- Add an element to the vector.                               *
+ *   DynamicVectorClass<T>::Delete -- Remove the specified object from the vector.             *
+ *   DynamicVectorClass<T>::Delete -- Deletes the specified index from the vector.             *
+ *   VectorClass<T>::ID -- Pointer based conversion to index number.                           *
+ *   VectorClass<T>::ID -- Finds object ID based on value.                                     *
+ *   DynamicVectorClass<T>::ID -- Find matching value in the dynamic vector.                   *
+ *   DynamicVectorClass<T>::Uninitialized_Add -- Add an empty place to the vector.             *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#pragma once
+
+#include	"noinit.h"
+#include	<assert.h>
+#include	<new.h>
+#include	<string.h>
+#include	<stddef.h>
+#include	<stdlib.h>
+#include	<Utility/stdint_adapter.h>
+
+
+/**************************************************************************
+**	This is a general purpose vector class. A vector is defined by this
+**	class, as an array of arbitrary objects where the array can be dynamically
+**	sized. Because is deals with arbitrary object types, it can handle everything.
+**	As a result of this, it is not terribly efficient for integral objects (such
+**	as char or int). It will function correctly, but the copy constructor and
+**	equality operator could be highly optimized if the integral type were known.
+**	This efficiency can be implemented by deriving an integral vector template
+**	from this one in order to supply more efficient routines.
+*/
+
+// Why, oh why does Visual C need this!!! It's bugged. <sigh>
+#pragma warning(disable : 4505)
+
+
+template<class T>
+class VectorClass
+{
+	public:
+		VectorClass(NoInitClass const &) {};
+		VectorClass(int size=0, T const * array=0);
+		VectorClass(VectorClass<T> const &);		// Copy constructor.
+		virtual ~VectorClass(void);
+
+		T & operator[](int index) {assert(unsigned(index) < unsigned(VectorMax));return(Vector[index]);};
+		T const & operator[](int index) const {assert(unsigned(index) < unsigned(VectorMax));return(Vector[index]);};
+		VectorClass<T> & operator = (VectorClass<T> const &); // Assignment operator.
+
+		virtual bool operator == (VectorClass<T> const &) const;	// Equality operator.
+
+		virtual bool Resize(int newsize, T const * array=0);
+		virtual void Clear(void);
+		int Length(void) const {return VectorMax;};
+		virtual int ID(T const * ptr);	// Pointer based identification.
+		virtual int ID(T const & ptr);	// Value based identification.
+
+	protected:
+
+		/*
+		**	This is a pointer to the allocated vector array of elements.
+		*/
+		T * Vector;
+
+		/*
+		**	This is the maximum number of elements allowed in this vector.
+		*/
+		int VectorMax;
+
+		/*
+		**	This indicates if the vector is in a valid (even if empty) state.
+		*/
+		bool IsValid;
+
+		/*
+		**	Does the vector data pointer refer to memory that this class has manually
+		**	allocated? If so, then this class is responsible for deleting it.
+		*/
+		bool IsAllocated;
+};
+
+
+/***********************************************************************************************
+ * VectorClass<T>::VectorClass -- Constructor for vector class.                                *
+ *                                                                                             *
+ *    This constructor for the vector class is passed the initial size of the vector and an    *
+ *    optional pointer to a preallocated block of memory that the vector will be placed in.    *
+ *    If this optional pointer is NULL (or not provided), then the vector is allocated out     *
+ *    of free store (with the "new" operator).                                                 *
+ *                                                                                             *
+ * INPUT:   size  -- The number of elements to initialize this vector to.                      *
+ *                                                                                             *
+ *          array -- Optional pointer to a previously allocated memory block to hold the       *
+ *                   vector.                                                                   *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+VectorClass<T>::VectorClass(int size, T const * array) :
+	Vector(0),
+	VectorMax(size),
+	IsValid(true),
+	IsAllocated(false)
+{
+	/*
+	**	Allocate the vector. The default constructor will be called for every
+	**	object in this vector.
+	*/
+	if (size) {
+		if (array) {
+			Vector = new((void*)array) T[size];
+		} else {
+			Vector = new T[size];
+			IsAllocated = true;
+		}
+	}
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::~VectorClass -- Default destructor for vector class.                        *
+ *                                                                                             *
+ *    This is the default destructor for the vector class. It will deallocate any memory       *
+ *    that it may have allocated.                                                              *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+VectorClass<T>::~VectorClass(void)
+{
+	VectorClass<T>::Clear();
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::VectorClass -- Copy constructor for vector object.                          *
+ *                                                                                             *
+ *    This is the copy constructor for the vector class. It will duplicate the provided        *
+ *    vector into the new vector being created.                                                *
+ *                                                                                             *
+ * INPUT:   vector   -- Reference to the vector to use as a copy.                              *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+VectorClass<T>::VectorClass(VectorClass<T> const & vector) :
+	Vector(0),
+	VectorMax(0),
+	IsValid(true),
+	IsAllocated(false)
+{
+	*this = vector;
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::operator = -- The assignment operator.                                      *
+ *                                                                                             *
+ *    This the the assignment operator for vector objects. It will alter the existing lvalue   *
+ *    vector to duplicate the rvalue one.                                                      *
+ *                                                                                             *
+ * INPUT:   vector   -- The rvalue vector to copy into the lvalue one.                         *
+ *                                                                                             *
+ * OUTPUT:  Returns with reference to the newly copied vector.                                 *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+VectorClass<T> & VectorClass<T>::operator =(VectorClass<T> const & vector)
+{
+	if (this != &vector) {
+		Clear();
+		VectorMax = vector.Length();
+		if (VectorMax) {
+			Vector = new T[VectorMax];
+			if (Vector) {
+				IsAllocated = true;
+				for (int index = 0; index < VectorMax; index++) {
+					Vector[index] = vector[index];
+				}
+			}
+		} else {
+			Vector = 0;
+			IsAllocated = false;
+		}
+	}
+	return(*this);
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::operator == -- Equality operator for vector objects.                        *
+ *                                                                                             *
+ *    This operator compares two vectors for equality. It does this by performing an object    *
+ *    by object comparison between the two vectors.                                            *
+ *                                                                                             *
+ * INPUT:   vector   -- The right vector expression.                                           *
+ *                                                                                             *
+ * OUTPUT:  bool; Are the two vectors essentially equal? (do they contain comparable elements  *
+ *                in the same order?)                                                          *
+ *                                                                                             *
+ * WARNINGS:   The equality operator must exist for the objects that this vector contains.     *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool VectorClass<T>::operator == (VectorClass<T> const & vector) const
+{
+	if (VectorMax == vector.Length()) {
+		for (int index = 0; index < VectorMax; index++) {
+			if (Vector[index] != vector[index]) {
+				return(false);
+			}
+		}
+		return(true);
+	}
+	return(false);
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::ID -- Pointer based conversion to index number.                             *
+ *                                                                                             *
+ *    Use this routine to convert a pointer to an element in the vector back into the index    *
+ *    number of that object. This routine ONLY works with actual pointers to object within     *
+ *    the vector. For "equivalent" object index number (such as with similar integral values)  *
+ *    then use the "by value" index number ID function.                                        *
+ *                                                                                             *
+ * INPUT:   pointer  -- Pointer to an actual object in the vector.                             *
+ *                                                                                             *
+ * OUTPUT:  Returns with the index number for the object pointed to by the parameter.          *
+ *                                                                                             *
+ * WARNINGS:   This routine is only valid for actual pointers to object that exist within      *
+ *             the vector. All other object pointers will yield undefined results.             *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/13/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+inline int VectorClass<T>::ID(T const * ptr)
+{
+	if (!IsValid) return(0);
+	return(((uintptr_t)ptr - (uintptr_t)&(*this)[0]) / sizeof(T));
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::ID -- Finds object ID based on value.                                       *
+ *                                                                                             *
+ *    Use this routine to find the index value of an object with equivalent value in the       *
+ *    vector. Typical use of this would be for integral types.                                 *
+ *                                                                                             *
+ * INPUT:   object   -- Reference to the object that is to be looked up in the vector.         *
+ *                                                                                             *
+ * OUTPUT:  Returns with the index number of the object that is equivalent to the one          *
+ *          specified. If no matching value could be found then -1 is returned.                *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/13/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+int VectorClass<T>::ID(T const & object)
+{
+	if (!IsValid) return(0);
+
+	for (int index = 0; index < VectorMax; index++) {
+		if ((*this)[index] == object) {
+			return(index);
+		}
+	}
+	return(-1);
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::Clear -- Frees and clears the vector.                                       *
+ *                                                                                             *
+ *    Use this routine to reset the vector to an empty (non-allocated) state. A vector will    *
+ *    free all allocated memory when this routine is called. In order for the vector to be     *
+ *    useful after this point, the Resize function must be called to give it element space.    *
+ *                                                                                             *
+ * INPUT:   none                                                                               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+void VectorClass<T>::Clear(void)
+{
+	if (Vector && IsAllocated) {
+		delete[] Vector;
+		Vector = 0;
+	}
+	IsAllocated = false;
+	VectorMax = 0;
+}
+
+
+/***********************************************************************************************
+ * VectorClass<T>::Resize -- Changes the size of the vector.                                   *
+ *                                                                                             *
+ *    This routine is used to change the size (usually to increase) the size of a vector. This *
+ *    is the only way to increase the vector's working room (number of elements).              *
+ *                                                                                             *
+ * INPUT:   newsize  -- The desired size of the vector.                                        *
+ *                                                                                             *
+ *          array    -- Optional pointer to a previously allocated memory block that the       *
+ *                      array will be located in. If this parameter is not supplied, then      *
+ *                      the array will be allocated from free store.                           *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the array resized successfully?                                          *
+ *                                                                                             *
+ * WARNINGS:   Failure to succeed could be the result of running out of memory.                *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool VectorClass<T>::Resize(int newsize, T const * array)
+{
+	if (newsize) {
+
+		/*
+		**	Allocate a new vector of the size specified. The default constructor
+		**	will be called for every object in this vector.
+		*/
+		T * newptr;
+
+		/*
+		**	Either create a new memory block for the object array or initialize
+		**	an existing block as indicated by the array parameter. When creating a new
+		**	memory block, flag that the vector object is currently in an invalid
+		**	state. This is necessary because the default constructor for the object
+		**	elements may look to the vector to fetch their ID number.
+		*/
+		IsValid = false;
+		if (!array) {
+			newptr = new T[newsize];
+		} else {
+			newptr = new((void*)array) T[newsize];
+		}
+		IsValid = true;
+		if (!newptr) {
+			return(false);
+		}
+
+		/*
+		**	If there is an old vector, then it must be copied (as much as is feasible)
+		**	to the new vector.
+		*/
+		if (Vector != NULL) {
+
+			/*
+			**	Copy as much of the old vector into the new vector as possible. This
+			**	presumes that there is a functional assignment operator for each
+			**	of the objects in the vector.
+			*/
+			int copycount = (newsize < VectorMax) ? newsize : VectorMax;
+			for (int index = 0; index < copycount; index++) {
+				newptr[index] = Vector[index];
+			}
+
+			/*
+			**	Delete the old vector. This might cause the destructors to be called
+			**	for all of the old elements. This makes the implementation of suitable
+			**	assignment operator very important. The default assignment operator will
+			**	only work for the simplest of objects.
+			*/
+			if (IsAllocated) {
+				delete[] Vector;
+				Vector = 0;
+			}
+		}
+
+		/*
+		**	Assign the new vector data to this class.
+		*/
+		Vector = newptr;
+		VectorMax = newsize;
+		IsAllocated = (Vector && !array);
+
+	} else {
+
+		/*
+		**	Resizing to zero is the same as clearing the vector.
+		*/
+		Clear();
+	}
+	return(true);
+}
+
+
+
+/**************************************************************************
+**	This derivative vector class adds the concept of adding and deleting
+**	objects. The objects are packed to the beginning of the vector array.
+**	If this is instantiated for a class object, then the assignment operator
+**	and the equality operator must be supported. If the vector allocates its
+**	own memory, then the vector can grow if it runs out of room adding items.
+**	The growth rate is controlled by setting the growth step rate. A growth
+**	step rate of zero disallows growing.
+*/
+template<class T>
+class DynamicVectorClass : public VectorClass<T>
+{
+protected:
+		using VectorClass<T>::IsAllocated;
+		using VectorClass<T>::Vector;
+		using VectorClass<T>::VectorMax;
+	public:
+		using VectorClass<T>::Length;
+
+	public:
+		DynamicVectorClass(unsigned size=0, T const * array=0);
+
+		// Change maximum size of vector.
+		virtual bool Resize(int newsize, T const * array=0);
+
+		// Resets and frees the vector array.
+		virtual void Clear(void) {ActiveCount = 0;VectorClass<T>::Clear();};
+
+		// Fetch number of "allocated" vector objects.
+		int Count(void) const {return(ActiveCount);};
+
+		// Add object to vector (growing as necessary).
+		bool Add(T const & object);
+		bool Add_Head(T const & object);
+
+		// Delete object just like this from vector.
+		bool Delete(T const & object);
+
+		// Delete object at this vector index.
+		bool Delete(int index);
+
+		// Deletes all objects in the vector.
+		void Delete_All(void) {ActiveCount = 0;};
+
+		// Set amount that vector grows by.
+		int Set_Growth_Step(int step) {return(GrowthStep = step);};
+
+		// Fetch current growth step rate.
+		int Growth_Step(void) {return GrowthStep;};
+
+		virtual int ID(T const * ptr) {return(VectorClass<T>::ID(ptr));};
+		virtual int ID(T const & ptr);
+
+		DynamicVectorClass<T> & operator =(DynamicVectorClass<T> const & rvalue) {
+			VectorClass<T>::operator = (rvalue);
+			ActiveCount = rvalue.ActiveCount;
+			GrowthStep = rvalue.GrowthStep;
+			return(*this);
+		}
+
+      // Uninitialized Add - does everything an Add does, except copying an
+      // object into the 'new' spot in the array. It returns a pointer to
+      // the 'new' spot. (NULL if the Add failed). NOTE - you must then fill
+      // this memory area with a valid object (e.g. by using placement new),
+      // or chaos will result!
+      T * Uninitialized_Add(void);
+
+	protected:
+
+		/*
+		**	This is a count of the number of active objects in this
+		**	vector. The memory array often times is bigger than this
+		**	value.
+		*/
+		int ActiveCount;
+
+		/*
+		**	If there is insufficient room in the vector array for a new
+		**	object to be added, then the vector will grow by the number
+		**	of objects specified by this value. This is controlled by
+		**	the Set_Growth_Step() function.
+		*/
+		int GrowthStep;
+};
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::DynamicVectorClass -- Constructor for dynamic vector.                *
+ *                                                                                             *
+ *    This is the normal constructor for the dynamic vector class. It is similar to the normal *
+ *    vector class constructor. The vector is initialized to contain the number of elements    *
+ *    specified in the "size" parameter. The memory is allocated from free store unless the    *
+ *    optional array parameter is provided. In this case it will place the vector at the       *
+ *    memory location specified.                                                               *
+ *                                                                                             *
+ * INPUT:   size  -- The maximum number of objects allowed in this vector.                     *
+ *                                                                                             *
+ *          array -- Optional pointer to the memory area to place the vector at.               *
+ *                                                                                             *
+ * OUTPUT:  none                                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+DynamicVectorClass<T>::DynamicVectorClass(unsigned size, T const * array)
+	: VectorClass<T>(size, array)
+{
+	GrowthStep = 10;
+	ActiveCount = 0;
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Resize -- Changes the size of a dynamic vector.                      *
+ *                                                                                             *
+ *    Use this routine to change the size of the vector. The size changed is the maximum       *
+ *    number of allocated objects within this vector. If a memory buffer is provided, then     *
+ *    the vector will be located there. Otherwise, the memory will be allocated out of free    *
+ *    store.                                                                                   *
+ *                                                                                             *
+ * INPUT:   newsize  -- The desired maximum size of this vector.                               *
+ *                                                                                             *
+ *          array    -- Optional pointer to a previously allocated memory array.               *
+ *                                                                                             *
+ * OUTPUT:  bool; Was vector successfully resized according to specifications?                 *
+ *                                                                                             *
+ * WARNINGS:   Failure to resize the vector could be the result of lack of free store.         *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool DynamicVectorClass<T>::Resize(int newsize, T const * array)
+{
+	if (VectorClass<T>::Resize(newsize, array)) {
+		if (Length() < ActiveCount) ActiveCount = Length();
+		return(true);
+	}
+	return(false);
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::ID -- Find matching value in the dynamic vector.                     *
+ *                                                                                             *
+ *    Use this routine to find a matching object (by value) in the vector. Unlike the base     *
+ *    class ID function of similar name, this one restricts the scan to the current number     *
+ *    of valid objects.                                                                        *
+ *                                                                                             *
+ * INPUT:   object   -- A reference to the object that a match is to be found in the           *
+ *                      vector.                                                                *
+ *                                                                                             *
+ * OUTPUT:  Returns with the index number of the object that is equivalent to the one          *
+ *          specified. If no equivalent object could be found then -1 is returned.             *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/13/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+int DynamicVectorClass<T>::ID(T const & object)
+{
+	for (int index = 0; index < Count(); index++) {
+		if ((*this)[index] == object) return(index);
+	}
+	return(-1);
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Add -- Add an element to the vector.                                 *
+ *                                                                                             *
+ *    Use this routine to add an element to the vector. The vector will automatically be       *
+ *    resized to accomodate the new element IF the vector was allocated previously and the     *
+ *    growth rate is not zero.                                                                 *
+ *                                                                                             *
+ * INPUT:   object   -- Reference to the object that will be added to the vector.              *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the object added successfully? If so, the object is added to the end     *
+ *                of the vector.                                                               *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool DynamicVectorClass<T>::Add(T const & object)
+{
+	if (ActiveCount >= Length()) {
+		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
+			if (!Resize(Length() + GrowthStep)) {
+
+				/*
+				**	Failure to increase the size of the vector is an error condition.
+				**	Return with the error flag.
+				*/
+				return(false);
+			}
+		} else {
+
+			/*
+			**	Increasing the size of this vector is not allowed! Bail this
+			**	routine with the error code.
+			*/
+			return(false);
+		}
+	}
+
+	/*
+	**	There is room for the new object now. Add it to the end of the object vector.
+	*/
+	(*this)[ActiveCount++] = object;
+	return(true);
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Add_Head -- Adds element to head of the list.                        *
+ *                                                                                             *
+ *    This routine will add the specified element to the head of the vector. If necessary,     *
+ *    the vector will be expanded accordingly.                                                 *
+ *                                                                                             *
+ * INPUT:   object   -- Reference to the object to add to the head of this vector.             *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the object added without error?                                          *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   09/21/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool DynamicVectorClass<T>::Add_Head(T const & object)
+{
+	if (ActiveCount >= Length()) {
+		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
+			if (!Resize(Length() + GrowthStep)) {
+
+				/*
+				**	Failure to increase the size of the vector is an error condition.
+				**	Return with the error flag.
+				*/
+				return(false);
+			}
+		} else {
+
+			/*
+			**	Increasing the size of this vector is not allowed! Bail this
+			**	routine with the error code.
+			*/
+			return(false);
+		}
+	}
+
+	/*
+	**	There is room for the new object now. Add it to the end of the object vector.
+	*/
+	if (ActiveCount) {
+		memmove(&(*this)[1], &(*this)[0], ActiveCount * sizeof(T));
+	}
+	(*this)[0] = object;
+	ActiveCount++;
+//	(*this)[ActiveCount++] = object;
+	return(true);
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Delete -- Remove the specified object from the vector.               *
+ *                                                                                             *
+ *    This routine will delete the object referenced from the vector. All objects in the       *
+ *    vector that follow the one deleted will be moved "down" to fill the hole.                *
+ *                                                                                             *
+ * INPUT:   object   -- Reference to the object in this vector that is to be deleted.          *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the object deleted successfully? This should always be true.             *
+ *                                                                                             *
+ * WARNINGS:   Do no pass a reference to an object that is NOT part of this vector. The        *
+ *             results of this are undefined and probably catastrophic.                        *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool DynamicVectorClass<T>::Delete(T const & object)
+{
+	int id = ID(object);
+	if (id != -1) {
+		return(Delete(id));
+	}
+	return(false);
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Delete -- Deletes the specified index from the vector.               *
+ *                                                                                             *
+ *    Use this routine to delete the object at the specified index from the objects in the     *
+ *    vector. This routine will move all the remaining objects "down" in order to fill the     *
+ *    hole.                                                                                    *
+ *                                                                                             *
+ * INPUT:   index -- The index number of the object in the vector that is to be deleted.       *
+ *                                                                                             *
+ * OUTPUT:  bool; Was the object index deleted successfully? Failure might mean that the index *
+ *                specified was out of bounds.                                                 *
+ *                                                                                             *
+ * WARNINGS:   none                                                                            *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/10/1995 JLB : Created.                                                                 *
+ *=============================================================================================*/
+template<class T>
+bool DynamicVectorClass<T>::Delete(int index)
+{
+	if (index < ActiveCount) {
+		ActiveCount--;
+
+		/*
+		**	If there are any objects past the index that was deleted, copy those
+		**	objects down in order to fill the hole. A simple memory copy is
+		**	not sufficient since the vector could contain class objects that
+		**	need to use the assignment operator for movement.
+		*/
+		for (int i = index; i < ActiveCount; i++) {
+			(*this)[i] = (*this)[i+1];
+		}
+		return(true);
+	}
+	return(false);
+}
+
+
+/***********************************************************************************************
+ * DynamicVectorClass<T>::Uninitialized_Add -- Add an empty place to the vector.               *
+ *                                                                                             *
+ *    To avoid copying when creating an object and adding it to the vector, use this and       *
+ *    immediately fill the area that the return value points to with a valid object (by hand   *
+ *    for a struct or by using placement new for a class object).                              *
+ *    This function does everything Add does except copying an object into the new space,      *
+ *    thus leaving an uninitialized area of memory.                                            *
+ *                                                                                             *
+ * INPUT:   none.                                                                              *
+ *                                                                                             *
+ * OUTPUT:  T *; Points to the empty space where the new object is to be created. (If the      *
+ *               space was not added succesfully, returns NULL).                              *
+ *                                                                                             *
+ * WARNINGS:   If memory area is left uninitialized, Very Bad Things will happen.              *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   03/04/1998 NH : Created.                                                                  *
+ *=============================================================================================*/
+template<class T>
+T * DynamicVectorClass<T>::Uninitialized_Add(void)
+{
+	if (ActiveCount >= Length()) {
+		if ((IsAllocated || !VectorMax) && GrowthStep > 0) {
+			if (!Resize(Length() + GrowthStep)) {
+
+				/*
+				**	Failure to increase the size of the vector is an error condition.
+				**	Return with the error value.
+				*/
+				return(NULL);
+			}
+		} else {
+
+			/*
+			**	Increasing the size of this vector is not allowed! Bail this
+			**	routine with the error value.
+			*/
+			return(NULL);
+		}
+	}
+
+	/*
+	**	There is room for the new space now. Add it to the end of the object
+   ** vector. and return a pointer to it.
+	*/
+   return &((*this)[ActiveCount++]);
+}
+
+
+void Set_Bit(void * array, int bit, int value);
+int Get_Bit(void const * array, int bit);
+int First_True_Bit(void const * array);
+int First_False_Bit(void const * array);
+
+
+/**************************************************************************
+**	This is a derivative of a vector class that supports boolean flags. Since
+**	a boolean flag can be represented by a single bit, this class packs the
+**	array of boolean flags into an array of bytes containing 8 boolean values
+**	each. For large boolean arrays, this results in an 87.5% savings. Although
+**	the indexing "[]" operator is supported, DO NOT pass pointers to sub elements
+**	of this bit vector class. A pointer derived from the indexing operator is
+**	only valid until the next call. Because of this, only simple
+**	direct use of the "[]" operator is allowed.
+*/
+class BooleanVectorClass
+{
+	public:
+		BooleanVectorClass(unsigned size=0, unsigned char * array=0);
+		BooleanVectorClass(BooleanVectorClass const & vector);
+
+		// Assignment operator.
+		BooleanVectorClass & operator =(BooleanVectorClass const & vector);
+
+		// Equivalency operator.
+		bool operator == (BooleanVectorClass const & vector);
+
+		// Fetch number of boolean objects in vector.
+		int Length(void) {return BitCount;};
+
+		// Set all boolean values to false;
+		void Reset(void);
+
+		// Set all boolean values to true.
+		void Set(void);
+
+		// Resets vector to zero length (frees memory).
+		void Clear(void);
+
+		// Change size of this boolean vector.
+		int Resize(unsigned size);
+
+		// Fetch reference to specified index.
+		bool const & operator[](int index) const {
+			if (LastIndex != index) Fixup(index);
+			return(Copy);
+		};
+		bool & operator[](int index) {
+			if (LastIndex != index) Fixup(index);
+			return(Copy);
+		};
+
+		// Quick check on boolean state.
+		bool Is_True(int index) const {
+			if (index == LastIndex) return(Copy);
+			return(Get_Bit(&BitArray[0], index) != 0);
+		};
+
+		// Find first index that is false.
+		int First_False(void) const {
+			if (LastIndex != -1) Fixup(-1);
+
+			int retval = First_False_Bit(&BitArray[0]);
+			if (retval < BitCount) return(retval);
+
+			/*
+			**	Failure to find a false boolean value in the vector. Return this
+			**	fact in the form of an invalid index number.
+			*/
+			return(-1);
+		}
+
+		// Find first index that is true.
+		int First_True(void) const {
+			if (LastIndex != -1) Fixup(-1);
+
+			int retval = First_True_Bit(&BitArray[0]);
+			if (retval < BitCount) return(retval);
+
+			/*
+			**	Failure to find a true boolean value in the vector. Return this
+			**	fact in the form of an invalid index number.
+			*/
+			return(-1);
+		}
+
+	private:
+		void Fixup(int index=-1) const;
+
+		/*
+		**	This is the number of boolean values in the vector. This value is
+		**	not necessarily a multiple of 8, even though the underlying character
+		**	vector contains a multiple of 8 bits.
+		*/
+		int BitCount;
+
+		/*
+		**	This is a referential copy of an element in the bit vector. The
+		**	purpose of this copy is to allow normal reference access to this
+		**	object (for speed reasons). This hides the bit packing scheme from
+		**	the user of this class.
+		*/
+		bool Copy;
+
+		/*
+		**	This records the index of the value last fetched into the reference
+		**	boolean variable. This index is used to properly restore the value
+		**	when the reference copy needs updating.
+		*/
+		int LastIndex;
+
+		/*
+		**	This points to the allocated bitfield array.
+		*/
+		VectorClass<unsigned char> BitArray;
+};
+
+
+template<class T>
+int Pointer_Vector_Add(T * ptr, VectorClass<T *> & vec)
+{
+	int id = 0;
+	bool foundspot = false;
+	for (int index = 0; index < vec.Length(); index++) {
+		if (vec[index] == NULL) {
+			id = index;
+			foundspot = true;
+			break;
+		}
+	}
+	if (!foundspot) {
+		id = vec.Length();
+		vec.Resize((vec.Length()+1) * 2);
+		for (int index = id; index < vec.Length(); index++) {
+			vec[index] = NULL;
+		}
+	}
+	vec[id] = ptr;
+	return(id);
+}
+
+
+template<class T>
+bool Pointer_Vector_Remove(T const * ptr, VectorClass<T *> & vec)
+{
+	int id = vec.ID((T *)ptr);
+	if (id != -1) {
+		vec[id] = NULL;
+		return(true);
+	}
+	return(false);
+}
diff --git a/Core/Tools/WW3D/pluglib/WWmatrix3.cpp b/Core/Tools/WW3D/pluglib/WWmatrix3.cpp
index 08c9205805c..9b7b5dd46e6 100644
--- a/Core/Tools/WW3D/pluglib/WWmatrix3.cpp
+++ b/Core/Tools/WW3D/pluglib/WWmatrix3.cpp
@@ -116,17 +116,17 @@ const Matrix3 Matrix3::RotateZ270
 
 
 
-/*********************************************************************************************** 
- * Matrix3::Matrix3 -- Convert a Matrix3D (fake 4x4) to a Matrix3                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3::Matrix3 -- Convert a Matrix3D (fake 4x4) to a Matrix3                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Matrix3::Matrix3(const Matrix3D & m)
 {
@@ -177,7 +177,7 @@ Matrix3 & Matrix3::operator = (const Matrix3D & m)
 	Row[0].Set(m[0][0],m[0][1],m[0][2]);
 	Row[1].Set(m[1][0],m[1][1],m[1][2]);
 	Row[2].Set(m[2][0],m[2][1],m[2][2]);
-	return *this; 
+	return *this;
 }
 
 Matrix3 & Matrix3::operator = (const Matrix4 & m)
@@ -185,13 +185,13 @@ Matrix3 & Matrix3::operator = (const Matrix4 & m)
 	Row[0].Set(m[0][0],m[0][1],m[0][2]);
 	Row[1].Set(m[1][0],m[1][1],m[1][2]);
 	Row[2].Set(m[2][0],m[2][1],m[2][2]);
-	return *this; 
+	return *this;
 }
 
 void Matrix3::Multiply(const Matrix3D & a, const Matrix3 & b,Matrix3 * res)
 {
 	#define ROWCOL(i,j) a[i][0]*b[0][j] + a[i][1]*b[1][j] + a[i][2]*b[2][j]
-    
+
 	(*res)[0][0] = ROWCOL(0,0);
 	(*res)[0][1] = ROWCOL(0,1);
 	(*res)[0][2] = ROWCOL(0,2);
@@ -210,7 +210,7 @@ void Matrix3::Multiply(const Matrix3D & a, const Matrix3 & b,Matrix3 * res)
 void Matrix3::Multiply(const Matrix3 & a, const Matrix3D & b,Matrix3 * res)
 {
 	#define ROWCOL(i,j) a[i][0]*b[0][j] + a[i][1]*b[1][j] + a[i][2]*b[2][j]
-    
+
 	(*res)[0][0] = ROWCOL(0,0);
 	(*res)[0][1] = ROWCOL(0,1);
 	(*res)[0][2] = ROWCOL(0,2);
@@ -229,26 +229,26 @@ void Matrix3::Multiply(const Matrix3 & a, const Matrix3D & b,Matrix3 * res)
 Matrix3 operator * (const Matrix3D & a, const Matrix3 & b)
 {
 	#define ROWCOL(i,j) a[i][0]*b[0][j] + a[i][1]*b[1][j] + a[i][2]*b[2][j]
-    
+
 	return Matrix3(
 			Vector3(ROWCOL(0,0), ROWCOL(0,1), ROWCOL(0,2) ),
 			Vector3(ROWCOL(1,0), ROWCOL(1,1), ROWCOL(1,2) ),
 			Vector3(ROWCOL(2,0), ROWCOL(2,1), ROWCOL(2,2) )
 	);
-	
+
 	#undef ROWCOL
 }
 
 Matrix3 operator * (const Matrix3 & a, const Matrix3D & b)
 {
 	#define ROWCOL(i,j) a[i][0]*b[0][j] + a[i][1]*b[1][j] + a[i][2]*b[2][j]
-    
+
 	return Matrix3(
 			Vector3(ROWCOL(0,0), ROWCOL(0,1), ROWCOL(0,2) ),
 			Vector3(ROWCOL(1,0), ROWCOL(1,1), ROWCOL(1,2) ),
 			Vector3(ROWCOL(2,0), ROWCOL(2,1), ROWCOL(2,2) )
 	);
-	
+
 	#undef ROWCOL
 }
 
@@ -290,14 +290,14 @@ void Matrix3::Multiply(const Matrix3 & A,const Matrix3 & B,Matrix3 * set_res)
 	Matrix3 * Aptr;
 	float tmp1,tmp2,tmp3;
 
-	// Check for aliased parameters, copy the 'A' matrix into a temporary if the 
-	// result is going into 'A'. (in this case, this function is no better than 
+	// Check for aliased parameters, copy the 'A' matrix into a temporary if the
+	// result is going into 'A'. (in this case, this function is no better than
 	// the overloaded C++ operator...)
 	if (set_res == &A) {
 		tmp = A;
 		Aptr = &tmp;
 	} else {
-		Aptr = (Matrix3 *)&A;	
+		Aptr = (Matrix3 *)&A;
 	}
 
 	tmp1 = B[0][0];
@@ -330,7 +330,7 @@ int Matrix3::Is_Orthogonal(void) const
 	Vector3 x(Row[0].X,Row[0].Y,Row[0].Z);
 	Vector3 y(Row[1].X,Row[1].Y,Row[1].Z);
 	Vector3 z(Row[2].X,Row[2].Y,Row[2].Z);
-	
+
 	if (Vector3::Dot_Product(x,y) > WWMATH_EPSILON) return 0;
 	if (Vector3::Dot_Product(y,z) > WWMATH_EPSILON) return 0;
 	if (Vector3::Dot_Product(z,x) > WWMATH_EPSILON) return 0;
@@ -382,7 +382,7 @@ void Matrix3::Re_Orthogonalize(void)
 	Row[1][0] = y.X;
 	Row[1][1] = y.Y;
 	Row[1][2] = y.Z;
-	
+
 	Row[2][0] = z.X;
 	Row[2][1] = z.Y;
 	Row[2][2] = z.Z;
diff --git a/Core/Tools/WW3D/pluglib/WWmatrix3.h b/Core/Tools/WW3D/pluglib/WWmatrix3.h
index bdc6f8beac8..acb168f1e61 100644
--- a/Core/Tools/WW3D/pluglib/WWmatrix3.h
+++ b/Core/Tools/WW3D/pluglib/WWmatrix3.h
@@ -17,49 +17,43 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/WWmatrix3.h 33    2/03/00 4:55p Jason_a $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : WW3D                                                         * 
- *                                                                                             * 
- *                    File Name : MATRIX3.H                                                    * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/02/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 2, 1997 [GH]                                            * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Matrix3::Matrix3 -- Constructor, optionally initialize to Identitiy matrix                * 
- *   Matrix3::Matrix3 -- Copy Constructor                                                      * 
- *   Matrix3::Matrix3 -- Convert a Matrix3D (fake 4x4) to a Matrix3                            * 
- *   Matrix3::Matrix3 -- Constructor                                                           * 
- *   Matrix3::Transpose -- Returns transpose of the matrix                                     * 
- *   Matrix3::Inverse -- returns the inverse of the matrix                                     * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3D                                                         *
+ *                                                                                             *
+ *                    File Name : MATRIX3.h                                                    *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/02/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 2, 1997 [GH]                                            *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Matrix3::Matrix3 -- Constructor, optionally initialize to Identitiy matrix                *
+ *   Matrix3::Matrix3 -- Copy Constructor                                                      *
+ *   Matrix3::Matrix3 -- Convert a Matrix3D (fake 4x4) to a Matrix3                            *
+ *   Matrix3::Matrix3 -- Constructor                                                           *
+ *   Matrix3::Transpose -- Returns transpose of the matrix                                     *
+ *   Matrix3::Inverse -- returns the inverse of the matrix                                     *
  *   Matrix3::Determinant -- returns the determinant of the matrix                             *
- *   Matrix3::operator = -- assignment operator                                                * 
- *   Matrix3::operator += -- "plus equals" operator                                            * 
- *   Matrix3::operator-= -- "minus equals" operator                                            * 
- *   Matrix3::operator *= -- "times equals" operator                                           * 
- *   Matrix3::operator /= -- "divide equals" operator                                          * 
- *   Create_X_Rotation_Matrix3 -- creates a matrix3 which is a rotation about X                * 
- *   Create_Y_Rotation_Matrix3 -- Creates a Matrix3 which is a rotation about Y                * 
- *   Create_Z_Rotation_Matrix3 -- Creates a matrix3 which is a rotation about Z                * 
- *   Matrix3::Rotate_X -- Post-mutiplies an x rotation onto the current matrix                 * 
- *   Matrix3::Rotate_Y -- Post-multiplies the matrix with a rotation about Y                   * 
- *   Matrix3::Rotate_Z -- Post-multiplies the matrix with a rotation about Z                   * 
+ *   Matrix3::operator = -- assignment operator                                                *
+ *   Matrix3::operator += -- "plus equals" operator                                            *
+ *   Matrix3::operator-= -- "minus equals" operator                                            *
+ *   Matrix3::operator *= -- "times equals" operator                                           *
+ *   Matrix3::operator /= -- "divide equals" operator                                          *
+ *   Create_X_Rotation_Matrix3 -- creates a matrix3 which is a rotation about X                *
+ *   Create_Y_Rotation_Matrix3 -- Creates a Matrix3 which is a rotation about Y                *
+ *   Create_Z_Rotation_Matrix3 -- Creates a matrix3 which is a rotation about Z                *
+ *   Matrix3::Rotate_X -- Post-mutiplies an x rotation onto the current matrix                 *
+ *   Matrix3::Rotate_Y -- Post-multiplies the matrix with a rotation about Y                   *
+ *   Matrix3::Rotate_Z -- Post-multiplies the matrix with a rotation about Z                   *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef Matrix3_H
-#define Matrix3_H
 
 #include "always.h"
 #include "vector3.h"
@@ -107,7 +101,7 @@ class Matrix3
 	void Set(const Vector3 & axis,float angle);
 	void Set(const Vector3 & axis,float s_angle,float c_angle);
 	void Set(const Quaternion & q);
-	
+
 	/*
 	** Access operators
 	*/
@@ -156,7 +150,7 @@ class Matrix3
 	float Get_X_Rotation(void) const;
 	float Get_Y_Rotation(void) const;
 	float Get_Z_Rotation(void) const;
-	
+
 	/*
 	** These functions return a vector representing the direction an
    ** axis is pointing.
@@ -167,12 +161,12 @@ class Matrix3
 	void Get_X_Vector(Vector3 * set_x) const;
 	void Get_Y_Vector(Vector3 * set_y) const;
 	void Get_Z_Vector(Vector3 * set_z) const;
-	
+
 	/*
 	** Negation
 	*/
 	friend Matrix3 operator - (const Matrix3& a);
-	
+
 	/*
 	** Scalar multiplication and division
 	*/
@@ -182,7 +176,7 @@ class Matrix3
 
 	/*
 	** matrix addition
-	*/ 
+	*/
 	friend Matrix3 operator + (const Matrix3& a, const Matrix3& b);
 	static void Add(const Matrix3 & a, const Matrix3 & b,Matrix3 * res);
 
@@ -224,7 +218,7 @@ class Matrix3
 	/*
 	** Check whether a matrix is orthogonal, make it orthogonal
 	*/
-	int	Is_Orthogonal(void) const; 
+	int	Is_Orthogonal(void) const;
 	void	Re_Orthogonalize(void);
 
 	/*
@@ -253,17 +247,17 @@ class Matrix3
 };
 
 
-/*********************************************************************************************** 
- * Matrix3::Matrix3 -- Constructor, optionally initialize to Identitiy matrix                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3::Matrix3 -- Constructor, optionally initialize to Identitiy matrix                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3::Matrix3(bool identity)
 {
@@ -274,47 +268,47 @@ inline Matrix3::Matrix3(bool identity)
 	}
 }
 
-/*********************************************************************************************** 
- * Matrix3::Matrix3 -- Copy Constructor                                                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3::Matrix3 -- Copy Constructor                                                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3::Matrix3(const Matrix3 & m)
 {
 	Row[0] = m.Row[0]; Row[1] = m.Row[1]; Row[2] = m.Row[2];
 }
 
-/*********************************************************************************************** 
- * Matrix3::Matrix3 -- Constructor                                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3::Matrix3 -- Constructor                                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3::Matrix3(const Vector3 & r0, const Vector3 & r1, const Vector3 & r2)
-{ 
-	Row[0] = r0; 
-	Row[1] = r1; 
-	Row[2] = r2; 
+{
+	Row[0] = r0;
+	Row[1] = r1;
+	Row[2] = r2;
 }
 
 inline void Matrix3::Set(const Vector3 & r0, const Vector3 & r1, const Vector3 & r2)
-{ 
-	Row[0] = r0; 
-	Row[1] = r1; 
-	Row[2] = r2; 
+{
+	Row[0] = r0;
+	Row[1] = r1;
+	Row[2] = r2;
 }
 
 inline void Matrix3::Make_Identity(void)
@@ -349,14 +343,14 @@ inline void Matrix3::Set
 	Row[2].Set(m31,m32,m33);
 }
 
-inline Matrix3::Matrix3(const Vector3 & axis,float angle) 
-{ 
-	Set(axis,angle); 
+inline Matrix3::Matrix3(const Vector3 & axis,float angle)
+{
+	Set(axis,angle);
 }
 
-inline Matrix3::Matrix3(const Vector3 & axis,float s_angle,float c_angle) 
-{ 
-	Set(axis,s_angle,c_angle); 
+inline Matrix3::Matrix3(const Vector3 & axis,float s_angle,float c_angle)
+{
+	Set(axis,s_angle,c_angle);
 }
 
 inline void Matrix3::Set(const Vector3 & axis,float angle)
@@ -392,17 +386,17 @@ inline Matrix3::Matrix3(const Quaternion & q)
 	this->Set(q);
 }
 
-/*********************************************************************************************** 
- * Matrix3::Transpose -- Returns transpose of the matrix                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3::Transpose -- Returns transpose of the matrix                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3 Matrix3::Transpose() const
 {
@@ -413,17 +407,17 @@ inline Matrix3 Matrix3::Transpose() const
 	);
 }
 
-/*********************************************************************************************** 
- * Matrix3::Inverse -- returns the inverse of the matrix                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3::Inverse -- returns the inverse of the matrix                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3 Matrix3::Inverse() const    // Gauss-Jordan elimination with partial pivoting
 {
@@ -477,114 +471,114 @@ inline Matrix3 Matrix3::Inverse() const    // Gauss-Jordan elimination with part
  * HISTORY:                                                                                    *
  *   1/7/20     DRM : Created.                                                                 *
  *=============================================================================================*/
-inline float Matrix3::Determinant(void) const 
+inline float Matrix3::Determinant(void) const
 {
 	return   Row[0][0] * (Row[1][1] * Row[2][2] - Row[1][2] * Row[2][1])
 		    - Row[0][1] * (Row[1][0] * Row[2][2] - Row[1][2] * Row[2][0])
 			 - Row[0][2] * (Row[1][0] * Row[2][1] - Row[1][1] * Row[2][0]);
 }
 
-/*********************************************************************************************** 
- * Matrix3::operator = -- assignment operator                                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3::operator = -- assignment operator                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3 & Matrix3::operator = (const Matrix3 & m)
 {
 	Row[0] = m.Row[0]; Row[1] = m.Row[1]; Row[2] = m.Row[2];
-	return *this; 
-}
-
-/*********************************************************************************************** 
- * Matrix3::operator += -- "plus equals" operator                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+	return *this;
+}
+
+/***********************************************************************************************
+ * Matrix3::operator += -- "plus equals" operator                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3& Matrix3::operator += (const Matrix3 & m)
 {
-	Row[0] += m.Row[0]; Row[1] += m.Row[1]; Row[2] += m.Row[2]; 
-	return *this; 
-}
-
-/*********************************************************************************************** 
- * Matrix3::operator-= -- "minus equals" operator                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+	Row[0] += m.Row[0]; Row[1] += m.Row[1]; Row[2] += m.Row[2];
+	return *this;
+}
+
+/***********************************************************************************************
+ * Matrix3::operator-= -- "minus equals" operator                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3& Matrix3::operator -= (const Matrix3 & m)
 {
-	Row[0] -= m.Row[0]; Row[1] -= m.Row[1]; Row[2] -= m.Row[2]; 
-	return *this; 
-}
-
-/*********************************************************************************************** 
- * Matrix3::operator *= -- "times equals" operator                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+	Row[0] -= m.Row[0]; Row[1] -= m.Row[1]; Row[2] -= m.Row[2];
+	return *this;
+}
+
+/***********************************************************************************************
+ * Matrix3::operator *= -- "times equals" operator                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3& Matrix3::operator *= (float d)
 {
-	Row[0] *= d; Row[1] *= d; Row[2] *= d; 
-	return *this; 
-}
-
-/*********************************************************************************************** 
- * Matrix3::operator /= -- "divide equals" operator                                            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+	Row[0] *= d; Row[1] *= d; Row[2] *= d;
+	return *this;
+}
+
+/***********************************************************************************************
+ * Matrix3::operator /= -- "divide equals" operator                                            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3& Matrix3::operator /= (float d)
 {
-	Row[0] /= d; Row[1] /= d; Row[2] /= d; 
-	return *this; 
-}
-
-/*********************************************************************************************** 
- * Matrix3::Get_X_Rotation -- approximates the rotation about the X axis                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+	Row[0] /= d; Row[1] /= d; Row[2] /= d;
+	return *this;
+}
+
+/***********************************************************************************************
+ * Matrix3::Get_X_Rotation -- approximates the rotation about the X axis                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline float Matrix3::Get_X_Rotation(void) const
 {
@@ -592,35 +586,35 @@ inline float Matrix3::Get_X_Rotation(void) const
 	return atan2(v[2], v[1]);
 }
 
-/*********************************************************************************************** 
- * Matrix3::Get_Y_Rotation -- approximates the rotation about the Y axis                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3::Get_Y_Rotation -- approximates the rotation about the Y axis                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-inline float Matrix3::Get_Y_Rotation(void) const 
+inline float Matrix3::Get_Y_Rotation(void) const
 {
 	Vector3 v = (*this) * Vector3(0.0,0.0,1.0);
 	return atan2(v[0],v[2]);
 }
 
-/*********************************************************************************************** 
- * Matrix3::Get_Z_Rotation -- approximates the rotation about the Z axis                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3::Get_Z_Rotation -- approximates the rotation about the Z axis                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline float Matrix3::Get_Z_Rotation(void) const
 {
@@ -659,29 +653,29 @@ inline void Matrix3::Get_Z_Vector(Vector3 * set) const
 }
 
 inline Matrix3 operator - (const Matrix3 & a)
-{ 
-	return Matrix3(-a.Row[0], -a.Row[1], -a.Row[2]); 
+{
+	return Matrix3(-a.Row[0], -a.Row[1], -a.Row[2]);
 }
 
 inline Matrix3 operator * (const Matrix3 & a, float d)
-{ 
-	return Matrix3(a.Row[0] * d, a.Row[1] * d, a.Row[2] * d); 
+{
+	return Matrix3(a.Row[0] * d, a.Row[1] * d, a.Row[2] * d);
 }
 
 inline Matrix3 operator * (float d, const Matrix3 & a)
-{ 
-	return a*d; 
+{
+	return a*d;
 }
 
 inline Matrix3 operator / (const Matrix3 & a, float d)
-{ 
+{
 	float ood = 1.0f / d;
-	return Matrix3(a.Row[0] * ood, a.Row[1] * ood, a.Row[2] * ood); 
+	return Matrix3(a.Row[0] * ood, a.Row[1] * ood, a.Row[2] * ood);
 }
 
 /*
 ** matrix addition
-*/ 
+*/
 inline Matrix3 operator + (const Matrix3 & a, const Matrix3 & b)
 {
 	return Matrix3(
@@ -692,7 +686,7 @@ inline Matrix3 operator + (const Matrix3 & a, const Matrix3 & b)
 }
 
 inline void Matrix3::Add(const Matrix3 & a, const Matrix3 & b,Matrix3 * c)
-{ 
+{
 	assert(c);
 	Vector3::Add(a.Row[0],b.Row[0],&(c->Row[0]));
 	Vector3::Add(a.Row[1],b.Row[1],&(c->Row[1]));
@@ -725,13 +719,13 @@ inline void Matrix3::Subtract(const Matrix3 & a, const Matrix3 & b,Matrix3 * c)
 inline Matrix3 operator * (const Matrix3 & a, const Matrix3 & b)
 {
 	#define ROWCOL(i,j) a[i][0]*b[0][j] + a[i][1]*b[1][j] + a[i][2]*b[2][j]
-    
+
 	return Matrix3(
 			Vector3(ROWCOL(0,0), ROWCOL(0,1), ROWCOL(0,2) ),
 			Vector3(ROWCOL(1,0), ROWCOL(1,1), ROWCOL(1,2) ),
 			Vector3(ROWCOL(2,0), ROWCOL(2,1), ROWCOL(2,2) )
 	);
-	
+
 	#undef ROWCOL
 }
 
@@ -739,12 +733,12 @@ inline Matrix3 operator * (const Matrix3 & a, const Matrix3 & b)
 /*
 ** Multiply a Matrix3 by a Vector3. Yeilds a Vector3 result
 */
-inline Vector3 operator * (const Matrix3 & a, const Vector3 & v) 
+inline Vector3 operator * (const Matrix3 & a, const Vector3 & v)
 {
 	return Vector3(
 		a[0][0] * v[0] + a[0][1] * v[1] + a[0][2] * v[2],
 		a[1][0] * v[0] + a[1][1] * v[1] + a[1][2] * v[2],
-		a[2][0] * v[0] + a[2][1] * v[1] + a[2][2] * v[2] 
+		a[2][0] * v[0] + a[2][1] * v[1] + a[2][2] * v[2]
 	);
 }
 
@@ -761,17 +755,17 @@ inline int operator != (const Matrix3 & a, const Matrix3 & b)
 }
 
 
-/*********************************************************************************************** 
- * Matrix3::Rotate_X -- Post-mutiplies an x rotation onto the current matrix                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3::Rotate_X -- Post-mutiplies an x rotation onto the current matrix                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3::Rotate_X(float theta)
 {
@@ -795,17 +789,17 @@ inline void Matrix3::Rotate_X(float s,float c)
 	Row[2][2] = (float)(-s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * Matrix3::Rotate_Y -- Post-multiplies the matrix with a rotation about Y                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3::Rotate_Y -- Post-multiplies the matrix with a rotation about Y                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3::Rotate_Y(float theta)
 {
@@ -830,17 +824,17 @@ inline void Matrix3::Rotate_Y(float s,float c)
 }
 
 
-/*********************************************************************************************** 
- * Matrix3::Rotate_Z -- Post-multiplies the matrix with a rotation about Z                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3::Rotate_Z -- Post-multiplies the matrix with a rotation about Z                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3::Rotate_Z(float theta)
 {
@@ -865,17 +859,17 @@ inline void Matrix3::Rotate_Z(float s,float c)
 }
 
 
-/*********************************************************************************************** 
- * Create_X_Rotation_Matrix3 -- creates a matrix3 which is a rotation about X                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Create_X_Rotation_Matrix3 -- creates a matrix3 which is a rotation about X                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3 Create_X_Rotation_Matrix3(float s,float c)
 {
@@ -901,17 +895,17 @@ inline Matrix3 Create_X_Rotation_Matrix3(float rad)
 	return Create_X_Rotation_Matrix3(sinf(rad),cosf(rad));
 }
 
-/*********************************************************************************************** 
- * Create_Y_Rotation_Matrix3 -- Creates a Matrix3 which is a rotation about Y                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Create_Y_Rotation_Matrix3 -- Creates a Matrix3 which is a rotation about Y                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3 Create_Y_Rotation_Matrix3(float s,float c)
 {
@@ -937,17 +931,17 @@ inline Matrix3 Create_Y_Rotation_Matrix3(float rad)
 	return Create_Y_Rotation_Matrix3(sinf(rad),cosf(rad));
 }
 
-/*********************************************************************************************** 
- * Create_Z_Rotation_Matrix3 -- Creates a matrix3 which is a rotation about Z                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/26/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Create_Z_Rotation_Matrix3 -- Creates a matrix3 which is a rotation about Z                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/26/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3 Create_Z_Rotation_Matrix3(float s,float c)
 {
@@ -1007,5 +1001,3 @@ inline void Matrix3::Transpose_Rotate_Vector(const Matrix3 & A,const Vector3 & i
 	out->Y = (A[0][1] * v->X + A[1][1] * v->Y + A[2][1] * v->Z);
 	out->Z = (A[0][2] * v->X + A[1][2] * v->Y + A[2][2] * v->Z);
 }
-
-#endif /*Matrix3_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/pluglib/aaplane.h b/Core/Tools/WW3D/pluglib/aaplane.h
index 06bac66db5a..0e7cb97e02d 100644
--- a/Core/Tools/WW3D/pluglib/aaplane.h
+++ b/Core/Tools/WW3D/pluglib/aaplane.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef AAPLANE_H
-#define AAPLANE_H
 
 #include "always.h"
 #include "vector3.h"
@@ -79,5 +74,3 @@ inline void AAPlaneClass::Get_Normal(Vector3 * normal) const
 	normal->Set(0,0,0);
 	(*normal)[Normal] = 1.0f;
 }
-
-#endif
diff --git a/Core/Tools/WW3D/pluglib/always.h b/Core/Tools/WW3D/pluglib/always.h
index 81d557d2da9..79a856d2386 100644
--- a/Core/Tools/WW3D/pluglib/always.h
+++ b/Core/Tools/WW3D/pluglib/always.h
@@ -33,12 +33,8 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef ALWAYS_H
-#define ALWAYS_H
+#pragma once
 
 // Disable warning about exception handling not being enabled. It's used as part of STL - in a part of STL we don't use.
 #pragma warning(disable : 4530)
@@ -165,6 +161,3 @@ template <class T> T max(T a,T b)
 #ifndef size_of
 #define size_of(typ,id) sizeof(((typ*)0)->id)
 #endif
-
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/WW3D/pluglib/bool.h b/Core/Tools/WW3D/pluglib/bool.h
index 29b35a64d77..323d7c747b1 100644
--- a/Core/Tools/WW3D/pluglib/bool.h
+++ b/Core/Tools/WW3D/pluglib/bool.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/bool.h                                             $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/bool.h                                             $*
+ *                                                                                             *
  *                      $Author:: Neal_k                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 9/23/99 1:46p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 3                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
+
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #if !defined(TRUE_FALSE_DEFINED) && !defined(__BORLANDC__) && (_MSC_VER < 1100) && !defined(__WATCOMC__)
 #define TRUE_FALSE_DEFINED
diff --git a/Core/Tools/WW3D/pluglib/borlandc.h b/Core/Tools/WW3D/pluglib/borlandc.h
index e1177d89950..61b945dd0ab 100644
--- a/Core/Tools/WW3D/pluglib/borlandc.h
+++ b/Core/Tools/WW3D/pluglib/borlandc.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/borlandc.h                                         $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/borlandc.h                                         $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/02/99 11:57a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
+
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #if !defined(BORLANDC_H) && defined(__BORLANDC__)
 #define BORLANDC_H
@@ -45,4 +44,4 @@
 **	is because Borland C more closely matches the C++ standard than the other compilers.
 */
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Core/Tools/WW3D/pluglib/chunkio.cpp b/Core/Tools/WW3D/pluglib/chunkio.cpp
index 2c6593b49aa..0a34f075264 100644
--- a/Core/Tools/WW3D/pluglib/chunkio.cpp
+++ b/Core/Tools/WW3D/pluglib/chunkio.cpp
@@ -17,45 +17,45 @@
 */
 
 /* $Header: /Commando/Code/wwlib/chunkio.cpp 11    7/12/01 7:44p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Tiberian Sun / Commando / G Library                          * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/chunkio.cpp                            $* 
- *                                                                                             * 
- *                      $Author:: Jani_p                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 7/10/01 7:38p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 11                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   ChunkSaveClass::ChunkSaveClass -- Constructor                                             * 
- *   ChunkSaveClass::Begin_Chunk -- Begin a new chunk in the file                              * 
- *   ChunkSaveClass::End_Chunk -- Close a chunk, computes the size and adds to the header      * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Tiberian Sun / Commando / G Library                          *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/chunkio.cpp                            $*
+ *                                                                                             *
+ *                      $Author:: Jani_p                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 7/10/01 7:38p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 11                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   ChunkSaveClass::ChunkSaveClass -- Constructor                                             *
+ *   ChunkSaveClass::Begin_Chunk -- Begin a new chunk in the file                              *
+ *   ChunkSaveClass::End_Chunk -- Close a chunk, computes the size and adds to the header      *
  *   ChunkSaveClass::Begin_Micro_Chunk -- begins a new "micro-chunk"                           *
  *   ChunkSaveClass::End_Micro_Chunk -- close a micro-chunk                                    *
- *   ChunkSaveClass::Write -- Write data into the current chunk                                * 
+ *   ChunkSaveClass::Write -- Write data into the current chunk                                *
  *   ChunkSaveClass::Write -- write an IOVector2Struct                                         *
  *   ChunkSaveClass::Write -- write an IOVector3Struct                                         *
  *   ChunkSaveClass::Write -- write an IOVector4Struct                                         *
  *   ChunkSaveClass::Write -- write an IOQuaternionStruct                                      *
- *   ChunkSaveClass::Cur_Chunk_Depth -- returns the current chunk recursion depth (debugging)  * 
- *   ChunkLoadClass::ChunkLoadClass -- Constructor                                             * 
- *   ChunkLoadClass::Open_Chunk -- Open a chunk in the file, reads in the chunk header         * 
- *   ChunkLoadClass::Close_Chunk -- Close a chunk, seeks to the end if needed                  * 
- *   ChunkLoadClass::Cur_Chunk_ID -- Returns the ID of the current chunk                       * 
- *   ChunkLoadClass::Cur_Chunk_Length -- Returns the current length of the current chunk       * 
- *   ChunkLoadClass::Cur_Chunk_Depth -- returns the current chunk recursion depth              * 
+ *   ChunkSaveClass::Cur_Chunk_Depth -- returns the current chunk recursion depth (debugging)  *
+ *   ChunkLoadClass::ChunkLoadClass -- Constructor                                             *
+ *   ChunkLoadClass::Open_Chunk -- Open a chunk in the file, reads in the chunk header         *
+ *   ChunkLoadClass::Close_Chunk -- Close a chunk, seeks to the end if needed                  *
+ *   ChunkLoadClass::Cur_Chunk_ID -- Returns the ID of the current chunk                       *
+ *   ChunkLoadClass::Cur_Chunk_Length -- Returns the current length of the current chunk       *
+ *   ChunkLoadClass::Cur_Chunk_Depth -- returns the current chunk recursion depth              *
  *   ChunkLoadClass::Contains_Chunks -- Test whether the current chunk contains chunks (or dat *
  *   ChunkLoadClass::Open_Micro_Chunk -- reads in a micro-chunk header                         *
  *   ChunkLoadClass::Close_Micro_Chunk -- closes a micro-chunk                                 *
  *   ChunkLoadClass::Cur_Micro_Chunk_ID -- returns the ID of the current micro-chunk (asserts  *
  *   ChunkLoadClass::Cur_Micro_Chunk_Length -- returns the size of the current micro chunk     *
- *   ChunkLoadClass::Read -- Read data from the file                                           * 
+ *   ChunkLoadClass::Read -- Read data from the file                                           *
  *   ChunkLoadClass::Read -- read an IOVector2Struct                                           *
  *   ChunkLoadClass::Read -- read an IOVector3Struct                                           *
  *   ChunkLoadClass::Read -- read an IOVector4Struct                                           *
@@ -67,18 +67,18 @@
 #include <assert.h>
 
 
-/*********************************************************************************************** 
- * ChunkSaveClass::ChunkSaveClass -- Constructor                                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *  file - pointer to a FileClass object to write to														  * 
- * 																														  * 
- * OUTPUT:																												  * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkSaveClass::ChunkSaveClass -- Constructor                                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *  file - pointer to a FileClass object to write to														  *
+ * 																														  *
+ * OUTPUT:																												  *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 ChunkSaveClass::ChunkSaveClass(FileClass * file) :
 	File(file),
@@ -92,18 +92,18 @@ ChunkSaveClass::ChunkSaveClass(FileClass * file) :
 }
 
 
-/*********************************************************************************************** 
- * ChunkSaveClass::Begin_Chunk -- Begin a new chunk in the file                                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *  id - id of the chunk																							  * 
- * 																														  * 
- * OUTPUT:																												  * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkSaveClass::Begin_Chunk -- Begin a new chunk in the file                                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *  id - id of the chunk																							  *
+ * 																														  *
+ * OUTPUT:																												  *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool ChunkSaveClass::Begin_Chunk(uint32 id)
 {
@@ -114,17 +114,17 @@ bool ChunkSaveClass::Begin_Chunk(uint32 id)
 	if (StackIndex > 0) {
 		HeaderStack[StackIndex-1].Set_Sub_Chunk_Flag(true);
 	}
-	
+
 	// Save the current file position and chunk header
 	// for the call to End_Chunk.
 	chunkh.Set_Type(id);
 	chunkh.Set_Size(0);
-	filepos = File->Seek(0); 
-	
+	filepos = File->Seek(0);
+
 	PositionStack[StackIndex] = filepos;
-	HeaderStack[StackIndex] = chunkh;	
+	HeaderStack[StackIndex] = chunkh;
 	StackIndex++;
-	
+
 	// write a temporary chunk header (size = 0)
 	if (File->Write(&chunkh,sizeof(chunkh)) != sizeof(chunkh)) {
 		return false;
@@ -133,17 +133,17 @@ bool ChunkSaveClass::Begin_Chunk(uint32 id)
 }
 
 
-/*********************************************************************************************** 
- * ChunkSaveClass::End_Chunk -- Close a chunk, computes the size and adds to the header        * 
- *  																														  * 
- * INPUT:																												  * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkSaveClass::End_Chunk -- Close a chunk, computes the size and adds to the header        *
+ *  																														  *
+ * INPUT:																												  *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool ChunkSaveClass::End_Chunk(void)
 {
@@ -157,7 +157,7 @@ bool ChunkSaveClass::End_Chunk(void)
 	StackIndex--;
 	int chunkpos = PositionStack[StackIndex];
 	ChunkHeader chunkh = HeaderStack[StackIndex];
-	
+
 	// write the completed header
 	File->Seek(chunkpos,SEEK_SET);
 	if (File->Write(&chunkh,sizeof(chunkh)) != sizeof(chunkh)) {
@@ -168,7 +168,7 @@ bool ChunkSaveClass::End_Chunk(void)
 	if (StackIndex != 0) {
 		HeaderStack[StackIndex-1].Add_Size(chunkh.Get_Size() + sizeof(chunkh));
 	}
-	
+
 	// Go back to the end of the file
 	File->Seek(curpos,SEEK_SET);
 
@@ -198,14 +198,14 @@ bool ChunkSaveClass::Begin_Micro_Chunk(uint32 id)
 {
 	assert(id < 256);
 	assert(!InMicroChunk);
-	
+
 	// Save the current file position and chunk header
 	// for the call to End_Micro_Chunk.
 	MCHeader.Set_Type(id);
 	MCHeader.Set_Size(0);
-	MicroChunkPosition = File->Seek(0); 
-	
-	// Write a temporary chunk header 
+	MicroChunkPosition = File->Seek(0);
+
+	// Write a temporary chunk header
 	// NOTE: I'm calling the ChunkSaveClass::Write method so that the bytes for
 	// this header are tracked in the wrapping chunk.  This is because micro-chunks
 	// are simply data inside the normal chunks...
@@ -233,7 +233,7 @@ bool ChunkSaveClass::Begin_Micro_Chunk(uint32 id)
 bool ChunkSaveClass::End_Micro_Chunk(void)
 {
 	assert(InMicroChunk);
-	
+
 	// Save the current position
 	int curpos = File->Seek(0);
 
@@ -249,23 +249,23 @@ bool ChunkSaveClass::End_Micro_Chunk(void)
 	return true;
 }
 
-/*********************************************************************************************** 
- * ChunkSaveClass::Write -- Write data into the current chunk                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkSaveClass::Write -- Write data into the current chunk                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 uint32 ChunkSaveClass::Write(const void * buf, uint32 nbytes)
 {
 	// If this assert hits, you mixed data and chunks within the same chunk NO NO!
 	assert(HeaderStack[StackIndex-1].Get_Sub_Chunk_Flag() == 0);
-	
+
 	// If this assert hits, you didnt open any chunks yet
 	assert(StackIndex > 0);
 
@@ -274,7 +274,7 @@ uint32 ChunkSaveClass::Write(const void * buf, uint32 nbytes)
 
 	// track them in the wrapping chunk
 	HeaderStack[StackIndex-1].Add_Size(nbytes);
-	
+
 	// track them if you are using a micro-chunk too.
 	if (InMicroChunk) {
 		assert(MCHeader.Get_Size() < 255 - nbytes);	// micro chunks can only be 255 bytes
@@ -316,7 +316,7 @@ uint32 ChunkSaveClass::Write(const IOVector2Struct & v)
  *   1/4/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 uint32 ChunkSaveClass::Write(const IOVector3Struct & v)
-{	
+{
 	return Write(&v,sizeof(v));
 }
 
@@ -337,7 +337,7 @@ uint32 ChunkSaveClass::Write(const IOVector4Struct & v)
 {
 	return Write(&v,sizeof(v));
 }
-	
+
 /***********************************************************************************************
  * ChunkSaveClass::Write -- write an IOQuaternionStruct                                        *
  *                                                                                             *
@@ -355,17 +355,17 @@ uint32 ChunkSaveClass::Write(const IOQuaternionStruct & q)
 	return Write(&q,sizeof(q));
 }
 
-/*********************************************************************************************** 
- * ChunkSaveClass::Cur_Chunk_Depth -- returns the current chunk recursion depth (debugging)    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkSaveClass::Cur_Chunk_Depth -- returns the current chunk recursion depth (debugging)    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int ChunkSaveClass::Cur_Chunk_Depth(void)
 {
@@ -373,17 +373,17 @@ int ChunkSaveClass::Cur_Chunk_Depth(void)
 }
 
 
-/*********************************************************************************************** 
- * ChunkLoadClass::ChunkLoadClass -- Constructor                                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::ChunkLoadClass -- Constructor                                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 ChunkLoadClass::ChunkLoadClass(FileClass * file) :
 	File(file),
@@ -397,23 +397,23 @@ ChunkLoadClass::ChunkLoadClass(FileClass * file) :
 }
 
 
-/*********************************************************************************************** 
- * ChunkLoadClass::Open_Chunk -- Open a chunk in the file, reads in the chunk header           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::Open_Chunk -- Open a chunk in the file, reads in the chunk header           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool ChunkLoadClass::Open_Chunk()
 {
 	// if user didn't close any micro chunks that he opened, bad things could happen
-	assert(InMicroChunk == false);							
-	
+	assert(InMicroChunk == false);
+
 	// check for stack overflow
 	assert(StackIndex < MAX_STACK_DEPTH-1);
 
@@ -433,29 +433,29 @@ bool ChunkLoadClass::Open_Chunk()
 }
 
 
-/*********************************************************************************************** 
- * ChunkLoadClass::Close_Chunk -- Close a chunk, seeks to the end if needed                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::Close_Chunk -- Close a chunk, seeks to the end if needed                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool ChunkLoadClass::Close_Chunk()
 {
 	// if user didn't close any micro chunks that he opened, bad things could happen
-	assert(InMicroChunk == false);							
+	assert(InMicroChunk == false);
 
 	// check for stack overflow
 	assert(StackIndex > 0);
-	
+
 	int csize = HeaderStack[StackIndex-1].Get_Size();
 	int pos = PositionStack[StackIndex-1];
-	
+
 	if (pos < csize) {
 		File->Seek(csize - pos,SEEK_CUR);
 	}
@@ -469,17 +469,17 @@ bool ChunkLoadClass::Close_Chunk()
 }
 
 
-/*********************************************************************************************** 
- * ChunkLoadClass::Cur_Chunk_ID -- Returns the ID of the current chunk                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::Cur_Chunk_ID -- Returns the ID of the current chunk                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 uint32 ChunkLoadClass::Cur_Chunk_ID()
 {
@@ -488,17 +488,17 @@ uint32 ChunkLoadClass::Cur_Chunk_ID()
 }
 
 
-/*********************************************************************************************** 
- * ChunkLoadClass::Cur_Chunk_Length -- Returns the current length of the current chunk         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::Cur_Chunk_Length -- Returns the current length of the current chunk         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 uint32 ChunkLoadClass::Cur_Chunk_Length()
 {
@@ -507,17 +507,17 @@ uint32 ChunkLoadClass::Cur_Chunk_Length()
 }
 
 
-/*********************************************************************************************** 
- * ChunkLoadClass::Cur_Chunk_Depth -- returns the current chunk recursion depth                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::Cur_Chunk_Depth -- returns the current chunk recursion depth                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int ChunkLoadClass::Cur_Chunk_Depth()
 {
@@ -557,13 +557,13 @@ int ChunkLoadClass::Contains_Chunks()
 bool ChunkLoadClass::Open_Micro_Chunk()
 {
 	assert(!InMicroChunk);
-	
+
 	// read the chunk header
 	// calling the ChunkLoadClass::Read fn so that if we exhaust the chunk, the read will fail
 	if (Read(&MCHeader,sizeof(MCHeader)) != sizeof(MCHeader)) {
 		return false;
 	}
-	
+
 	InMicroChunk = true;
 	MicroChunkPosition = 0;
 	return true;
@@ -589,12 +589,12 @@ bool ChunkLoadClass::Close_Micro_Chunk()
 
 	int csize = MCHeader.Get_Size();
 	int pos = MicroChunkPosition;
-	
-	// seek the file past this micro chunk 
+
+	// seek the file past this micro chunk
 	if (pos < csize) {
 
 		File->Seek(csize - pos,SEEK_CUR);
-		
+
 		// update the tracking variables for where we are in the normal chunk.
 		if (StackIndex > 0) {
 			PositionStack[StackIndex-1] += csize - pos;
@@ -660,7 +660,7 @@ uint32 ChunkLoadClass::Seek(uint32 nbytes)
 	if (InMicroChunk && MicroChunkPosition + nbytes > MCHeader.Get_Size()) {
 		return 0;
 	}
-	
+
 	uint32 curpos=File->Tell();
 	if (File->Seek(nbytes,SEEK_CUR)-curpos != (int)nbytes) {
 		return 0;
@@ -677,17 +677,17 @@ uint32 ChunkLoadClass::Seek(uint32 nbytes)
 	return nbytes;
 }
 
-/*********************************************************************************************** 
- * ChunkLoadClass::Read -- Read data from the file                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/17/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * ChunkLoadClass::Read -- Read data from the file                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/17/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 uint32 ChunkLoadClass::Read(void * buf,uint32 nbytes)
 {
@@ -702,7 +702,7 @@ uint32 ChunkLoadClass::Read(void * buf,uint32 nbytes)
 	if (InMicroChunk && MicroChunkPosition + nbytes > MCHeader.Get_Size()) {
 		return 0;
 	}
-	
+
 	if (File->Read(buf,nbytes) != (int)nbytes) {
 		return 0;
 	}
diff --git a/Core/Tools/WW3D/pluglib/chunkio.h b/Core/Tools/WW3D/pluglib/chunkio.h
index 5364231594d..2c38fc42b7f 100644
--- a/Core/Tools/WW3D/pluglib/chunkio.h
+++ b/Core/Tools/WW3D/pluglib/chunkio.h
@@ -17,36 +17,32 @@
 */
 
 /* $Header: /Commando/Code/wwlib/chunkio.h 21    7/31/01 6:41p Patrick $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Tiberian Sun / Commando / G Library                          * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/chunkio.h                              $* 
- *                                                                                             * 
- *                      $Author:: Patrick                                                     $* 
- *                                                                                             * 
- *                     $Modtime:: 7/27/01 2:47p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 21                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Tiberian Sun / Commando / G Library                          *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/chunkio.h                              $*
+ *                                                                                             *
+ *                      $Author:: Patrick                                                     $*
+ *                                                                                             *
+ *                     $Modtime:: 7/27/01 2:47p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 21                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef CHUNKIO_H
-#define CHUNKIO_H
+#pragma once
 
 #ifndef ALWAYS_H
 #include "always.h"
 #endif
 
 #ifndef BITTYPE_H
-#include "BITTYPE.H"
+#include "BITTYPE.h"
 #endif
 
 #ifndef WWFILE_H
@@ -374,7 +370,3 @@ class ChunkLoadClass
 */
 #define OBSOLETE_MICRO_CHUNK(id) \
 	case (id): break;
-
-
-
-#endif // CHUNKIO_H
diff --git a/Core/Tools/WW3D/pluglib/errclass.h b/Core/Tools/WW3D/pluglib/errclass.h
index 27d7ac7d5f3..60c26fa0cf2 100644
--- a/Core/Tools/WW3D/pluglib/errclass.h
+++ b/Core/Tools/WW3D/pluglib/errclass.h
@@ -17,26 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/pluglib/errclass.h 5     6/25/99 10:46a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando Tools - W3D export                                  * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/pluglib/errclass.h                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 6/24/99 3:38p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 5                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando Tools - W3D export                                  *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/pluglib/errclass.h                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 6/24/99 3:38p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 5                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef ERRCLASS_H
-#define ERRCLASS_H
+#pragma once
 
 #include <stdarg.h>
 
@@ -76,13 +75,10 @@ inline ErrorClass & ErrorClass::operator = (const ErrorClass & that)
 		free(error_message);
 		error_message = NULL;
 	}
-	
+
 	if (that.error_message != NULL) {
 		error_message = strdup(that.error_message);
 	}
 
 	return *this;
 }
-
-
-#endif //ERRCLASS_H
\ No newline at end of file
diff --git a/Core/Tools/WW3D/pluglib/hashcalc.h b/Core/Tools/WW3D/pluglib/hashcalc.h
index 8039e026efe..a01fbf08ffe 100644
--- a/Core/Tools/WW3D/pluglib/hashcalc.h
+++ b/Core/Tools/WW3D/pluglib/hashcalc.h
@@ -33,31 +33,25 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-
-#ifndef HASHCALC_H
-#define HASHCALC_H
 
+#pragma once
 
 /*
 ** HashCalculatorClass
-** The hash calculator is used to abstract the process of computing a hash 
+** The hash calculator is used to abstract the process of computing a hash
 ** value for an object.  Also, when dealing with floating point values, you
 ** may need to have a fudge factor and therefore have several valid hash
 ** values for a particular object (generated by adding and subtracting an
 ** epsilon to the number(s)).  This class lets you define any number
-** of hash values.  This class is used by the UniqueArrayClass and the HashTableClass 
-** templates.  Basically, you give one of these to the UniqueArrayClass at 
-** construction time.  It will call the Num_Hash_Bits function in order to 
-** properly allocate its hash table.  Then, for each object you pass into the 
-** Add function, it  will call Compute_Hash, then it will loop through 
-** Num_Hash_Values, calling Get_Hash_Value for each index and see if the object 
-** is found in the indicated slot.  Also, when it is checking to see if it has 
-** the object you "Added", the Items_Match function is called.  This again 
-** allows you to do epsilon tests.  Make sense?  
+** of hash values.  This class is used by the UniqueArrayClass and the HashTableClass
+** templates.  Basically, you give one of these to the UniqueArrayClass at
+** construction time.  It will call the Num_Hash_Bits function in order to
+** properly allocate its hash table.  Then, for each object you pass into the
+** Add function, it  will call Compute_Hash, then it will loop through
+** Num_Hash_Values, calling Get_Hash_Value for each index and see if the object
+** is found in the indicated slot.  Also, when it is checking to see if it has
+** the object you "Added", the Items_Match function is called.  This again
+** allows you to do epsilon tests.  Make sense?
 */
 template <class T> class HashCalculatorClass
 {
@@ -68,7 +62,3 @@ template <class T> class HashCalculatorClass
 	virtual int		Num_Hash_Values(void) = 0;
 	virtual int		Get_Hash_Value(int index = 0) = 0;
 };
-
-
-
-#endif
diff --git a/Core/Tools/WW3D/pluglib/hsv.cpp b/Core/Tools/WW3D/pluglib/hsv.cpp
index 58d7932c869..f9932e2d9a1 100644
--- a/Core/Tools/WW3D/pluglib/hsv.cpp
+++ b/Core/Tools/WW3D/pluglib/hsv.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/HSV.CPP                                   $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/HSV.cpp                                   $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   HSVClass::Adjust -- Adjust an HSV color toward specified color.                           *
  *   HSVClass::Difference -- Finds the difference between two HSV color objects.               *
  *   HSVClass::operator RGBClass -- Conversion operator for RGBClass object.                   *
diff --git a/Core/Tools/WW3D/pluglib/hsv.h b/Core/Tools/WW3D/pluglib/hsv.h
index e7f8ae1056a..e3f2cc22213 100644
--- a/Core/Tools/WW3D/pluglib/hsv.h
+++ b/Core/Tools/WW3D/pluglib/hsv.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/HSV.H                                     $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/HSV.h                                     $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef HSV_H
-#define HSV_H
+#pragma once
 
 class RGBClass;
 class HSVClass;
@@ -77,5 +76,3 @@ class HSVClass
 		unsigned char Saturation;
 		unsigned char Value;
 };
-
-#endif
diff --git a/Core/Tools/WW3D/pluglib/iostruct.h b/Core/Tools/WW3D/pluglib/iostruct.h
index 88a933d7c8d..7b0bc9116ee 100644
--- a/Core/Tools/WW3D/pluglib/iostruct.h
+++ b/Core/Tools/WW3D/pluglib/iostruct.h
@@ -33,20 +33,14 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef IOSTRUCT_H
-#define IOSTRUCT_H
+#pragma once
 
 #ifndef BITTYPE_H
-#include "BITTYPE.H"
+
+#include "BITTYPE.h"
 #endif
 
 /*
@@ -78,8 +72,3 @@ struct IOQuaternionStruct
 {
 	float32		Q[4];
 };
-
-
-
-#endif
-
diff --git a/Core/Tools/WW3D/pluglib/jshell.cpp b/Core/Tools/WW3D/pluglib/jshell.cpp
index e025788b025..ac997c6193c 100644
--- a/Core/Tools/WW3D/pluglib/jshell.cpp
+++ b/Core/Tools/WW3D/pluglib/jshell.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/pluglib/jshell.cpp                     $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/pluglib/jshell.cpp                     $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 11/07/00 2:32p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 28                                                          $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   Fatal -- General purpose fatal error handler.                                             *
  *   Set_Bit -- Set bit in a bit array.                                                        *
  *   Get_Bit -- Fetch the bit value from a bit array.                                          *
diff --git a/Core/Tools/WW3D/pluglib/matrix3d.cpp b/Core/Tools/WW3D/pluglib/matrix3d.cpp
index cf7b37cc24e..0b9afa7fcc5 100644
--- a/Core/Tools/WW3D/pluglib/matrix3d.cpp
+++ b/Core/Tools/WW3D/pluglib/matrix3d.cpp
@@ -17,38 +17,38 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/matrix3d.cpp 39    2/03/00 4:55p Jason_a $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Voxel Technology                                             * 
- *                                                                                             * 
- *                    File Name : MATRIX3D.CPP                                                 * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 02/24/97                                                     * 
- *                                                                                             * 
- *                  Last Update : February 28, 1997 [GH]                                       * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Voxel Technology                                             *
+ *                                                                                             *
+ *                    File Name : MATRIX3D.cpp                                                 *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 02/24/97                                                     *
+ *                                                                                             *
+ *                  Last Update : February 28, 1997 [GH]                                       *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   Matrix3D::Set_Rotation -- Sets the rotation part of the matrix                            *
  *   Matrix3D::Set_Rotation -- Sets the rotation part of the matrix                            *
  *   Matrix3D::Set -- Init a matrix3D from a matrix3 and a position                            *
  *   Matrix3D::Set -- Init a matrix3D from a quaternion and a position                         *
- *   Matrix3D::Get_X_Rotation -- approximates the rotation about the X axis                    * 
- *   Matrix3D::Get_Y_Rotation -- approximates the rotation about the Y axis                    * 
- *   Matrix3D::Get_Z_Rotation -- approximates the rotation about the Z axis                    * 
+ *   Matrix3D::Get_X_Rotation -- approximates the rotation about the X axis                    *
+ *   Matrix3D::Get_Y_Rotation -- approximates the rotation about the Y axis                    *
+ *   Matrix3D::Get_Z_Rotation -- approximates the rotation about the Z axis                    *
  *   Matrix3D::Multiply -- matrix multiplication without temporaries.                          *
  *   Matrix3D::Inverse_Rotate_Vector -- rotates a vector by the inverse of the 3x3 sub-matrix  *
  *   Matrix3D::Transform_Min_Max_AABox -- compute transformed axis-aligned box                 *
  *   Matrix3D::Transform_Center_Extent_AABox -- compute transformed axis-aligned box           *
  *   Matrix3D::Get_Inverse -- calculate the inverse of this matrix                             *
- *   Matrix3D::Get_Orthogonal_Inverse -- Returns the inverse of the matrix                     *  
+ *   Matrix3D::Get_Orthogonal_Inverse -- Returns the inverse of the matrix                     *
  *   Matrix3D::Re_Orthogonalize -- makes this matrix orthogonal.                               *
  *   Matrix3D::Is_Orthogonal -- checks whether this matrix is orthogonal                       *
- *   Lerp - linearly interpolate matrices (orientation is slerped)                             * 
+ *   Lerp - linearly interpolate matrices (orientation is slerped)                             *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "matrix3d.h"
@@ -188,7 +188,7 @@ void Matrix3D::Set_Rotation(const Matrix3 & m)
 	Row[0][0] = m[0][0];
 	Row[0][1] = m[0][1];
 	Row[0][2] = m[0][2];
-	
+
 	Row[1][0] = m[1][0];
 	Row[1][1] = m[1][1];
 	Row[1][2] = m[1][2];
@@ -227,17 +227,17 @@ void Matrix3D::Set_Rotation(const Quaternion & q)
 }
 
 
-/*********************************************************************************************** 
- * Matrix3D::Get_X_Rotation -- approximates the rotation about the X axis                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3D::Get_X_Rotation -- approximates the rotation about the X axis                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 float Matrix3D::Get_X_Rotation(void) const
 {
@@ -245,17 +245,17 @@ float Matrix3D::Get_X_Rotation(void) const
 }
 
 
-/*********************************************************************************************** 
- * Matrix3D::Get_Y_Rotation -- approximates the rotation about the Y axis                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3D::Get_Y_Rotation -- approximates the rotation about the Y axis                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 float Matrix3D::Get_Y_Rotation(void) const
 {
@@ -263,17 +263,17 @@ float Matrix3D::Get_Y_Rotation(void) const
 }
 
 
-/*********************************************************************************************** 
- * Matrix3D::Get_Z_Rotation -- approximates the rotation about the Z axis                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix3D::Get_Z_Rotation -- approximates the rotation about the Z axis                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 float Matrix3D::Get_Z_Rotation(void) const
 {
@@ -281,16 +281,16 @@ float Matrix3D::Get_Z_Rotation(void) const
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_Vector -- Uses the 3x3 sub-matrix to rotate a vector                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
+/***********************************************************************************************
+ * M3DC::Rotate_Vector -- Uses the 3x3 sub-matrix to rotate a vector                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
  *=============================================================================================*/
 Vector3 Matrix3D::Rotate_Vector(const Vector3 &vect) const
 {
@@ -323,9 +323,9 @@ Vector3 Matrix3D::Inverse_Rotate_Vector(const Vector3 &vect) const
 	);
 }
 
-/*********************************************************************************************** 
- * M3DC::Look_At -- Creates a "look at" transformation.                                        * 
- *                                                                                             * 
+/***********************************************************************************************
+ * M3DC::Look_At -- Creates a "look at" transformation.                                        *
+ *                                                                                             *
  *	Builds a transformation matrix which positions the origin at p,                             *
  *	points the negative z-axis towards a target t, and rolls about the z-axis                   *
  *	by the angle specified by roll.  														                 *
@@ -333,18 +333,18 @@ Vector3 Matrix3D::Inverse_Rotate_Vector(const Vector3 &vect) const
  *	This can be useful for creating a camera matrix, just invert 							           *
  *	the matrix after initializing it with this function...									           *
  *																							                          *
- * INPUT:                                                                                      * 
- * p - position of the coordinate system                                                       * 
- * t - target of the coordinate system                                                         * 
- * roll - roll angle (in radians)                                                              * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- * This function is written assuming the convention that the "ground" is the X-Y plane and     * 
+ * INPUT:                                                                                      *
+ * p - position of the coordinate system                                                       *
+ * t - target of the coordinate system                                                         *
+ * roll - roll angle (in radians)                                                              *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ * This function is written assuming the convention that the "ground" is the X-Y plane and     *
  * Z is altitude.                                                                              *
- *                                                                                             * 
- * HISTORY:                                                                                    * 
+ *                                                                                             *
+ * HISTORY:                                                                                    *
  *=============================================================================================*/
 void Matrix3D::Look_At(const Vector3 &p,const Vector3 &t,float roll)
 {
@@ -390,16 +390,16 @@ void Matrix3D::Look_At(const Vector3 &p,const Vector3 &t,float roll)
 	Rotate_Y(siny,cosy);
 
 	// rotate about local x axis to pitch up to the targets position
-	Rotate_X(sinp,cosp); 
+	Rotate_X(sinp,cosp);
 
 	// roll about the local z axis (negate since we look down -z)
 	Rotate_Z(-roll);
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Obj_Look_At -- Commando Object "look at" transformation.                              * 
- *                                                                                             * 
+/***********************************************************************************************
+ * M3DC::Obj_Look_At -- Commando Object "look at" transformation.                              *
+ *                                                                                             *
  *	Builds a transformation matrix which positions the origin at p,                             *
  *	points the positive X axis towards a target t, and rolls about the X axis                   *
  *	by the angle specified by roll.  														                 *
@@ -407,16 +407,16 @@ void Matrix3D::Look_At(const Vector3 &p,const Vector3 &t,float roll)
  * The object convention used by Commando and G is Forward = +X, Left = +Y, Up = +Z.  The      *
  *	world is basically the x-y plane with z as altitude and +x is the default "forward".        *
  *																							                          *
- * INPUT:                                                                                      * 
- * p - position of the coordinate system                                                       * 
- * t - target of the coordinate system                                                         * 
- * roll - roll angle (in radians)                                                              * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
+ * INPUT:                                                                                      *
+ * p - position of the coordinate system                                                       *
+ * t - target of the coordinate system                                                         *
+ * roll - roll angle (in radians)                                                              *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
  *=============================================================================================*/
 void Matrix3D::Obj_Look_At(const Vector3 &p,const Vector3 &t,float roll)
 {
@@ -447,15 +447,15 @@ void Matrix3D::Obj_Look_At(const Vector3 &p,const Vector3 &t,float roll)
 		siny = 0.0f;
 		cosy = 1.0f;
 	}
-	
+
 	Make_Identity();
 	Translate(p);
-	
+
 	// Yaw rotation to projection of target in x-y plane
 	Rotate_Z(siny,cosy);
 
 	// Pitch rotation
-	Rotate_Y(-sinp,cosp); 
+	Rotate_Y(-sinp,cosp);
 
 	// Roll rotation
 	Rotate_X(roll);
@@ -480,9 +480,9 @@ void Matrix3D::Get_Inverse(Matrix3D & inv) const
 	Get_Orthogonal_Inverse(inv);
 }
 
-/*********************************************************************************************** 
- * Matrix3D::Get_Orthogonal_Inverse -- Returns the inverse of the matrix                       *  
- *                                                                                             * 
+/***********************************************************************************************
+ * Matrix3D::Get_Orthogonal_Inverse -- Returns the inverse of the matrix                       *
+ *                                                                                             *
  *	NOTE!!! This only works if the matrix is really ORTHOGONAL!!!						              *
  *																							                          *
  ***********************************************************************************************
@@ -501,13 +501,13 @@ void Matrix3D::Get_Inverse(Matrix3D & inv) const
  *  MINV is the inverse of M																						  *
  *																							                          *
  ***********************************************************************************************
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
  *=============================================================================================*/
 void Matrix3D::Get_Orthogonal_Inverse(Matrix3D & inv) const
 {
@@ -524,7 +524,7 @@ void Matrix3D::Get_Orthogonal_Inverse(Matrix3D & inv) const
 	inv.Row[2][1] = Row[1][2];
 	inv.Row[2][2] = Row[2][2];
 
-	// Now, calculate translation portion of matrix: 
+	// Now, calculate translation portion of matrix:
 	// T' = -R'T
 	Vector3 trans = Get_Translation();
 	trans = inv.Rotate_Vector(trans);
@@ -547,7 +547,7 @@ void Matrix3D::Get_Orthogonal_Inverse(Matrix3D & inv) const
  * HISTORY:                                                                                    *
  *   1/16/98    EHC : Created.                                                                 *
  *=============================================================================================*/
-void Matrix3D::Copy_3x3_Matrix(float matrix[3][3]) 
+void Matrix3D::Copy_3x3_Matrix(float matrix[3][3])
 {
 	Row[0][0] = matrix[0][0];
 	Row[0][1] = matrix[0][1];
@@ -586,14 +586,14 @@ void Matrix3D::Multiply(const Matrix3D & A,const Matrix3D & B,Matrix3D * set_res
 	Matrix3D * Aptr;
 	float tmp1,tmp2,tmp3;
 
-	// Check for aliased parameters, copy the 'A' matrix into a temporary if the 
-	// result is going into 'A'. (in this case, this function is no better than 
+	// Check for aliased parameters, copy the 'A' matrix into a temporary if the
+	// result is going into 'A'. (in this case, this function is no better than
 	// the overloaded C++ operator...)
 	if (set_res == &A) {
 		tmp = A;
 		Aptr = &tmp;
 	} else {
-		Aptr = (Matrix3D *)&A;	
+		Aptr = (Matrix3D *)&A;
 	}
 
 	tmp1 = B[0][0];
@@ -655,7 +655,7 @@ void Matrix3D::Transform_Min_Max_AABox
 	assert(set_max != &max);
 
 	float tmp0,tmp1;
-	
+
 	// init the min and max to the translation of the transform
 	set_min->X = set_max->X = Row[0][3];
 	set_min->Y = set_max->Y = Row[1][3];
@@ -720,7 +720,7 @@ void Matrix3D::Transform_Center_Extent_AABox
 
 			(*set_center)[i] += Row[i][j] * center[j];
 			(*set_extent)[i] += WWMath::Fabs(Row[i][j] * extent[j]);
-			
+
 		}
 	}
 }
@@ -743,7 +743,7 @@ int Matrix3D::Is_Orthogonal(void) const
 	Vector3 x(Row[0].X,Row[0].Y,Row[0].Z);
 	Vector3 y(Row[1].X,Row[1].Y,Row[1].Z);
 	Vector3 z(Row[2].X,Row[2].Y,Row[2].Z);
-	
+
 	if (Vector3::Dot_Product(x,y) > WWMATH_EPSILON) return 0;
 	if (Vector3::Dot_Product(y,z) > WWMATH_EPSILON) return 0;
 	if (Vector3::Dot_Product(z,x) > WWMATH_EPSILON) return 0;
@@ -809,24 +809,24 @@ void Matrix3D::Re_Orthogonalize(void)
 	Row[1][0] = y.X;
 	Row[1][1] = y.Y;
 	Row[1][2] = y.Z;
-	
+
 	Row[2][0] = z.X;
 	Row[2][1] = z.Y;
 	Row[2][2] = z.Z;
 }
 
 
-/*********************************************************************************************** 
- * Lerp - linearly interpolate matrices (orientation is slerped)                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/05/1998 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Lerp - linearly interpolate matrices (orientation is slerped)                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/05/1998 NH  : Created.                                                                 *
  *=============================================================================================*/
 Matrix3D Lerp(const Matrix3D &A, const Matrix3D &B, float factor)
 {
diff --git a/Core/Tools/WW3D/pluglib/matrix3d.h b/Core/Tools/WW3D/pluglib/matrix3d.h
index 20911e4c4e9..d8d5111d288 100644
--- a/Core/Tools/WW3D/pluglib/matrix3d.h
+++ b/Core/Tools/WW3D/pluglib/matrix3d.h
@@ -17,65 +17,60 @@
 */
 
 /* $Header: /G/WWMath/matrix3d.h 49    1/13/00 2:57p Naty_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Voxel Technology                                             * 
- *                                                                                             * 
- *                    File Name : MATRIX3D.H                                                   * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 02/24/97                                                     * 
- *                                                                                             * 
- *                  Last Update : February 24, 1997 [GH]                                       * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Matrix3D::Matrix3D -- Constructors for Matrix3D                                           * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Voxel Technology                                             *
+ *                                                                                             *
+ *                    File Name : MATRIX3D.h                                                   *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 02/24/97                                                     *
+ *                                                                                             *
+ *                  Last Update : February 24, 1997 [GH]                                       *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Matrix3D::Matrix3D -- Constructors for Matrix3D                                           *
  *   Matrix3D::Set -- init a Matrix3D from an arrray of 12 floats                              *
  *   Matrix3D::Set -- Init a Matrix3D from 12 individual floats                                *
  *   Matrix3D::Set -- Init a matrix from 3 axis vectors and a position                         *
  *   Matrix3D::Set -- init a matrix to be a rotation about the given axis                      *
  *   Matrix3D::Set -- init a matrix to be a rotation about the given axis                      *
  *   Matrix3D::Set -- Init a matrix to be a pure translation                                   *
- *   Matrix3D::Make_Identity -- Initializes the matrix to be the identity matrix               * 
- *   Matrix3D::Translate -- Post-Multiplies by a Translation Matrix                            * 
- *   Matrix3D::Translate -- Post-Multiplies the matrix by a translation matrix                 * 
- *   M3DC::Translate_X -- Post-Multiplies the matrix by a translation matrix with X only       * 
- *   M3DC::Translate_Y -- Post-Multiplies the matrix by a translation matrix with Y only       * 
- *   M3DC::Translate_Z -- Post-Multiplies the matrix by a translation matrix with Z only       * 
- *   Matrix3D::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis           * 
- *   Matrix3D::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis           * 
- *   Matrix3D::Rotate_Y -- Post-multiplies the matrix by a rotation about the Y axis           * 
- *   Matrix3D::Rotate_Y -- Post-Multiplies the matrix by a rotation about Y                    * 
- *   Matrix3D::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                    * 
- *   Matrix3D::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                    * 
- *   M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                     * 
- *   M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                     * 
- *   M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                     * 
- *   M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                     * 
- *   M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                     * 
- *   M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                     * 
- *   M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by rotation about X * 
- *   M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by rotation about Y * 
- *   M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by rotation about Z * 
- *   M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by rotation about X * 
- *   M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by rotation about Y * 
- *   M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by rotation about Z * 
- *   operator * -- Matrix multiplication                                                       * 
- *   operator * -- Matrix - vector multiplication                                              * 
- *   operator == -- Matrix equality operator                                                   * 
- *   operator != -- Matrix inequality operator                                                 * 
+ *   Matrix3D::Make_Identity -- Initializes the matrix to be the identity matrix               *
+ *   Matrix3D::Translate -- Post-Multiplies by a Translation Matrix                            *
+ *   Matrix3D::Translate -- Post-Multiplies the matrix by a translation matrix                 *
+ *   M3DC::Translate_X -- Post-Multiplies the matrix by a translation matrix with X only       *
+ *   M3DC::Translate_Y -- Post-Multiplies the matrix by a translation matrix with Y only       *
+ *   M3DC::Translate_Z -- Post-Multiplies the matrix by a translation matrix with Z only       *
+ *   Matrix3D::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis           *
+ *   Matrix3D::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis           *
+ *   Matrix3D::Rotate_Y -- Post-multiplies the matrix by a rotation about the Y axis           *
+ *   Matrix3D::Rotate_Y -- Post-Multiplies the matrix by a rotation about Y                    *
+ *   Matrix3D::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                    *
+ *   Matrix3D::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                    *
+ *   M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                     *
+ *   M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                     *
+ *   M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                     *
+ *   M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                     *
+ *   M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                     *
+ *   M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                     *
+ *   M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by rotation about X *
+ *   M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by rotation about Y *
+ *   M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by rotation about Z *
+ *   M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by rotation about X *
+ *   M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by rotation about Y *
+ *   M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by rotation about Z *
+ *   operator * -- Matrix multiplication                                                       *
+ *   operator * -- Matrix - vector multiplication                                              *
+ *   operator == -- Matrix equality operator                                                   *
+ *   operator != -- Matrix inequality operator                                                 *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MATRIX3D_H
-#define MATRIX3D_H
 
 #ifdef _UNIX
 #include "osdep.h"
@@ -99,12 +94,12 @@ class Quaternion;
 	- I use *column-vectors*
 	- I use a *right-handed* coordinate system
 	- These matrices are *orthogonal*
-	  
-	3D Transformation matrices.  This class is really a 4x4 homogeneous 
+
+	3D Transformation matrices.  This class is really a 4x4 homogeneous
 	matrix where the last row is assumed to always be 0 0 0 1.  However,
 	since I don't store the last row, you cant do some things that you can
 	do with a real 4x4 homogeneous matrix.
-	
+
 	I use column-vectors so normally transformations are post-multiplied
 	and camera transformations should be pre-multiplied.  The methods of
 	this class called Translate, Rotate_X, etc. all perform post-multiplication
@@ -131,9 +126,9 @@ class	Matrix3D
 	explicit Matrix3D(
 		float m11,float m12,float m13,float m14,
 		float m21,float m22,float m23,float m24,
-		float m31,float m32,float m33,float m34  
+		float m31,float m32,float m33,float m34
 	);
-	
+
 	explicit Matrix3D(
 		const Vector3	&x,		// x-axis unit vector
 		const Vector3	&y,		// y-axis unit vector
@@ -177,9 +172,9 @@ class	Matrix3D
 	void Set(
 		float m11,float m12,float m13,float m14,
 		float m21,float m22,float m23,float m24,
-		float m31,float m32,float m33,float m34  
+		float m31,float m32,float m33,float m34
 	);
-	
+
 	void Set(
 		const Vector3	&x,		// x-axis unit vector
 		const Vector3	&y,		// y-axis unit vector
@@ -197,7 +192,7 @@ class	Matrix3D
 
 	// Creates identity rotation w. given position.
 	void Set(const Vector3 & position);
-	
+
 	// access functions:
  	Vector4 & operator [] (int i) { return Row[i]; }
 	const Vector4 & operator [] (int i) const { return Row[i]; }
@@ -229,7 +224,7 @@ class	Matrix3D
 	float Get_X_Rotation(void) const;
 	float Get_Y_Rotation(void) const;
 	float Get_Z_Rotation(void) const;
-	
+
 	// Each of the transformation methods performs an
 	// "optimized" post-multiplication with the current matrix.
 	// All angles are assumed to be radians.
@@ -266,7 +261,7 @@ class	Matrix3D
 	// the "world" uses x-y as the ground and z as altitude.
 	// Used for pointing cameras at targets.
 	void	Look_At(const Vector3 &p,const Vector3 &t,float roll);
-	
+
 	// Previous look_at function follows the camera coordinate convention.
 	// This one follows the object convention used in Commando and G.  I
 	// special cased this convention since it is used so much by us rather
@@ -284,15 +279,15 @@ class	Matrix3D
 	void Get_X_Vector(Vector3 * set_x) const { set_x->Set(Row[0][0], Row[1][0], Row[2][0]); }
 	void Get_Y_Vector(Vector3 * set_y) const { set_y->Set(Row[0][1], Row[1][1], Row[2][1]); }
 	void Get_Z_Vector(Vector3 * set_z) const { set_z->Set(Row[0][2], Row[1][2], Row[2][2]); }
-	
-	// Get the inverse of the matrix. 
+
+	// Get the inverse of the matrix.
 	// TODO: currently the "intended-to-be" general inverse function just calls
 	// the special case Orthogonal inverse functions.  Also, when we implement
 	// general case, check where we were using Get_Inverse since usually it should
 	// be changed to Get_Orthogonal_Inverse...
 	void Get_Inverse(Matrix3D & set_inverse) const;
 	void Get_Orthogonal_Inverse(Matrix3D & set_inverse) const;
-	
+
 	// used for importing SurRender matrices
 	void Copy_3x3_Matrix(float matrix[3][3]);
 
@@ -313,7 +308,7 @@ class	Matrix3D
 	static void	Inverse_Rotate_Vector(const Matrix3D & tm,const Vector3 & in,Vector3 * out);
 
 	// Check whether a matrix is orthogonal or FORCE it to be :-)
-	int	Is_Orthogonal(void) const; 
+	int	Is_Orthogonal(void) const;
 	void	Re_Orthogonalize(void);
 
 	// some static matrices which are sometimes useful
@@ -355,17 +350,17 @@ bool operator != (const Matrix3D &A, const Matrix3D &B);
 Matrix3D Lerp(const Matrix3D &A, const Matrix3D &B, float factor);
 
 
-/*********************************************************************************************** 
- * M3DC::Matrix3D -- Constructors for Matrix3D										                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Matrix3D -- Constructors for Matrix3D										                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3D::Matrix3D(float m[12])
 {
@@ -378,7 +373,7 @@ inline Matrix3D::Matrix3D
 (
 	float m11,float m12,float m13,float m14,
 	float m21,float m22,float m23,float m24,
-	float m31,float m32,float m33,float m34  
+	float m31,float m32,float m33,float m34
 )
 {
 	Row[0].Set(m11,m12,m13,m14);
@@ -436,7 +431,7 @@ inline Matrix3D & Matrix3D::operator = (const Matrix3D & m)
 	Row[0] = m.Row[0];
 	Row[1] = m.Row[1];
 	Row[2] = m.Row[2];
-	return *this; 
+	return *this;
 }
 
 
@@ -582,19 +577,19 @@ inline void Matrix3D::Set(const Vector3 & position)
 	Row[1].Set(0.0f,1.0f,0.0f,position[1]);
 	Row[2].Set(0.0f,0.0f,1.0f,position[2]);
 }
-	
-
-/*********************************************************************************************** 
- * M3DC::Make_Identity -- Initializes the matrix to be the identity matrix                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+
+
+/***********************************************************************************************
+ * M3DC::Make_Identity -- Initializes the matrix to be the identity matrix                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3D::Make_Identity(void)
 {
@@ -604,17 +599,17 @@ inline void Matrix3D::Make_Identity(void)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Translate -- Post-Multiplies by a Translation Matrix                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Translate -- Post-Multiplies by a Translation Matrix                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3D::Translate(float x,float y,float z)
 {
@@ -624,17 +619,17 @@ inline void Matrix3D::Translate(float x,float y,float z)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Translate -- Post-Multiplies the matrix by a translation matrix                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Translate -- Post-Multiplies the matrix by a translation matrix                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3D::Translate(const Vector3 &t)
 {
@@ -644,17 +639,17 @@ inline void Matrix3D::Translate(const Vector3 &t)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Translate_X -- Post-Multiplies the matrix by a translation matrix with X only         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/06/1998 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Translate_X -- Post-Multiplies the matrix by a translation matrix with X only         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/06/1998 NH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3D::Translate_X(float x)
 {
@@ -664,17 +659,17 @@ inline void Matrix3D::Translate_X(float x)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Translate_Y -- Post-Multiplies the matrix by a translation matrix with Y only         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/06/1998 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Translate_Y -- Post-Multiplies the matrix by a translation matrix with Y only         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/06/1998 NH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3D::Translate_Y(float y)
 {
@@ -684,17 +679,17 @@ inline void Matrix3D::Translate_Y(float y)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Translate_Z -- Post-Multiplies the matrix by a translation matrix with Z only         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/06/1998 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Translate_Z -- Post-Multiplies the matrix by a translation matrix with Z only         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/06/1998 NH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3D::Translate_Z(float z)
 {
@@ -704,17 +699,17 @@ inline void Matrix3D::Translate_Z(float z)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3D::Rotate_X(float theta)
 {
@@ -739,19 +734,19 @@ inline void Matrix3D::Rotate_X(float theta)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle                                                                       * 
- * c - cosine of the angle                                                                     * 
- * 											                                                           * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Rotate_X -- Post-Multiplies the matrix by a rotation about the X axis                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle                                                                       *
+ * c - cosine of the angle                                                                     *
+ * 											                                                           *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3D::Rotate_X(float s,float c)
 {
@@ -771,18 +766,18 @@ inline void Matrix3D::Rotate_X(float s,float c)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_Y -- Post-multiplies the matrix by a rotation about the Y axis                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Rotate_Y -- Post-multiplies the matrix by a rotation about the Y axis                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3D::Rotate_Y(float theta)
 {
@@ -806,19 +801,19 @@ inline void Matrix3D::Rotate_Y(float theta)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_Y -- Post-Multiplies the matrix by a rotation about Y                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle                                                                       * 
- * c - cosine of the angle                                                                     * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Rotate_Y -- Post-Multiplies the matrix by a rotation about Y                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle                                                                       *
+ * c - cosine of the angle                                                                     *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3D::Rotate_Y(float s,float c)
 {
@@ -838,18 +833,18 @@ inline void Matrix3D::Rotate_Y(float s,float c)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3D::Rotate_Z(float theta)
 {
@@ -873,19 +868,19 @@ inline void Matrix3D::Rotate_Z(float theta)
 }
 
 
-/*********************************************************************************************** 
- * M3DC::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * M3DC::Rotate_Z -- Post-multiplies the matrix by a rotation about Z                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Matrix3D::Rotate_Z(float s,float c)
 {
@@ -904,18 +899,18 @@ inline void Matrix3D::Rotate_Z(float s,float c)
 	Row[2][1] = (float)(-s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 inline void Matrix3D::Pre_Rotate_X(float theta)
 {
@@ -942,18 +937,18 @@ inline void Matrix3D::Pre_Rotate_X(float theta)
 	Row[2][3] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 inline void Matrix3D::Pre_Rotate_Y(float theta)
 {
@@ -980,18 +975,18 @@ inline void Matrix3D::Pre_Rotate_Y(float theta)
 	Row[2][3] = (float)(-s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 inline void Matrix3D::Pre_Rotate_Z(float theta)
 {
@@ -1018,19 +1013,19 @@ inline void Matrix3D::Pre_Rotate_Z(float theta)
 	Row[1][3] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::Pre_Rotate_X -- Pre-multiplies the matrix by a rotation about X                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 inline void Matrix3D::Pre_Rotate_X(float s,float c)
 {
@@ -1053,19 +1048,19 @@ inline void Matrix3D::Pre_Rotate_X(float s,float c)
 	Row[2][3] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::Pre_Rotate_Y -- Pre-multiplies the matrix by a rotation about Y                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 inline void Matrix3D::Pre_Rotate_Y(float s,float c)
 {
@@ -1088,19 +1083,19 @@ inline void Matrix3D::Pre_Rotate_Y(float s,float c)
 	Row[2][3] = (float)(-s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::Pre_Rotate_Z -- Pre-multiplies the matrix by a rotation about Z                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 inline void Matrix3D::Pre_Rotate_Z(float s,float c)
 {
@@ -1123,18 +1118,18 @@ inline void Matrix3D::Pre_Rotate_Z(float s,float c)
 	Row[1][3] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by a rotation about X * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by a rotation about X *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 inline void Matrix3D::In_Place_Pre_Rotate_X(float theta)
 {
@@ -1157,18 +1152,18 @@ inline void Matrix3D::In_Place_Pre_Rotate_X(float theta)
 	Row[2][2] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by a rotation about Y * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by a rotation about Y *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 inline void Matrix3D::In_Place_Pre_Rotate_Y(float theta)
 {
@@ -1191,18 +1186,18 @@ inline void Matrix3D::In_Place_Pre_Rotate_Y(float theta)
 	Row[2][2] = (float)(-s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by a rotation about Z * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * theta - angle (in radians) to rotate                                                        * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by a rotation about Z *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * theta - angle (in radians) to rotate                                                        *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 inline void Matrix3D::In_Place_Pre_Rotate_Z(float theta)
 {
@@ -1225,19 +1220,19 @@ inline void Matrix3D::In_Place_Pre_Rotate_Z(float theta)
 	Row[1][2] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by a rotation about X * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::In_Place_Pre_Rotate_X -- Pre-multiplies rotation part of matrix by a rotation about X *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 inline void Matrix3D::In_Place_Pre_Rotate_X(float s,float c)
 {
@@ -1256,19 +1251,19 @@ inline void Matrix3D::In_Place_Pre_Rotate_X(float s,float c)
 	Row[2][2] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by a rotation about Y * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::In_Place_Pre_Rotate_Y -- Pre-multiplies rotation part of matrix by a rotation about Y *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 inline void Matrix3D::In_Place_Pre_Rotate_Y(float s,float c)
 {
@@ -1287,19 +1282,19 @@ inline void Matrix3D::In_Place_Pre_Rotate_Y(float s,float c)
 	Row[2][2] = (float)(-s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by a rotation about Z * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * s - sine of the angle to rotate                                                             * 
- * c - cosine of the angle to rotate                                                           * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/1/1999 NH  : Created.                                                                  * 
+/***********************************************************************************************
+ * M3DC::In_Place_Pre_Rotate_Z -- Pre-multiplies rotation part of matrix by a rotation about Z *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * s - sine of the angle to rotate                                                             *
+ * c - cosine of the angle to rotate                                                           *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/1/1999 NH  : Created.                                                                  *
  *=============================================================================================*/
 inline void Matrix3D::In_Place_Pre_Rotate_Z(float s,float c)
 {
@@ -1318,17 +1313,17 @@ inline void Matrix3D::In_Place_Pre_Rotate_Z(float s,float c)
 	Row[1][2] = (float)(s*tmp1 + c*tmp2);
 }
 
-/*********************************************************************************************** 
- * operator * -- Matrix multiplication                                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * operator * -- Matrix multiplication                                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix3D operator * (const Matrix3D &A,const Matrix3D &B)
 {
@@ -1370,17 +1365,17 @@ inline Matrix3D operator * (const Matrix3D &A,const Matrix3D &B)
 	return C;
 }
 
-/*********************************************************************************************** 
- * operator * -- Matrix - vector multiplication                                                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * operator * -- Matrix - vector multiplication                                                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Vector3 operator * (const Matrix3D &A,const Vector3 &a)
 {
@@ -1402,17 +1397,17 @@ inline Vector3 operator * (const Matrix3D &A,const Vector3 &a)
 }
 
 
-/*********************************************************************************************** 
- * operator == -- Matrix equality operator                                                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   04/29/1998 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * operator == -- Matrix equality operator                                                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   04/29/1998 NH  : Created.                                                                 *
  *=============================================================================================*/
 inline bool operator == (const Matrix3D &A, const Matrix3D &B)
 {
@@ -1425,17 +1420,17 @@ inline bool operator == (const Matrix3D &A, const Matrix3D &B)
 }
 
 
-/*********************************************************************************************** 
- * operator != -- Matrix inequality operator                                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   04/29/1998 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * operator != -- Matrix inequality operator                                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   04/29/1998 NH  : Created.                                                                 *
  *=============================================================================================*/
 inline bool operator != (const Matrix3D &A, const Matrix3D &B)
 {
@@ -1512,5 +1507,3 @@ inline void	Matrix3D::Inverse_Rotate_Vector(const Matrix3D & A,const Vector3 & i
 	out->Y = (A[0][1] * v->X + A[1][1] * v->Y + A[2][1] * v->Z);
 	out->Z = (A[0][2] * v->X + A[1][2] * v->Y + A[2][2] * v->Z);
 }
-
-#endif /* MATRIX3D_H */
diff --git a/Core/Tools/WW3D/pluglib/matrix4.cpp b/Core/Tools/WW3D/pluglib/matrix4.cpp
index aacb4b4a361..a4686a664b4 100644
--- a/Core/Tools/WW3D/pluglib/matrix4.cpp
+++ b/Core/Tools/WW3D/pluglib/matrix4.cpp
@@ -142,7 +142,7 @@ void Matrix4::Multiply(const Matrix3D &a,const Matrix4 &b,Matrix4 * res)
 void Matrix4::Multiply(const Matrix4 & a,const Matrix3D & b,Matrix4 * res)
 {
 	assert(res != &a);
-	
+
 	// ROWCOL multiplies a row of 'a' by one of the first three columns of 'b' (4th entry in b is zero)
 	// ROWCOL4 multiplies a row of 'a' by the fourth column of 'b' (4th entry in b is one)
 
diff --git a/Core/Tools/WW3D/pluglib/matrix4.h b/Core/Tools/WW3D/pluglib/matrix4.h
index ddfdb1be6e9..8e9298d93f9 100644
--- a/Core/Tools/WW3D/pluglib/matrix4.h
+++ b/Core/Tools/WW3D/pluglib/matrix4.h
@@ -17,48 +17,42 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/matrix4.h 15    2/03/00 4:55p Jason_a $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : WW3D                                                         * 
- *                                                                                             * 
- *                    File Name : MATRIX4.H                                                    * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/02/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 2, 1997 [GH]                                            * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Matrix4::Matrix4 -- Constructor, optionally initialize to Identitiy matrix                * 
- *   Matrix4::Matrix4 -- Copy Constructor                                                      * 
- *   Matrix4::Matrix4 -- Convert a Matrix3D (fake 4x4) to a Matrix4                            * 
- *   Matrix4::Matrix4 -- Constructor                                                           * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : WW3D                                                         *
+ *                                                                                             *
+ *                    File Name : MATRIX4.h                                                    *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/02/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 2, 1997 [GH]                                            *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Matrix4::Matrix4 -- Constructor, optionally initialize to Identitiy matrix                *
+ *   Matrix4::Matrix4 -- Copy Constructor                                                      *
+ *   Matrix4::Matrix4 -- Convert a Matrix3D (fake 4x4) to a Matrix4                            *
+ *   Matrix4::Matrix4 -- Constructor                                                           *
  *   Matrix4::Make_Identity -- Initializes the matrix to Identity                              *
  *   Matrix4::Init -- Initializes from the contents of the give Matrix3D                       *
  *   Matrix4::Init -- Initializes the rows from the given Vector4s                             *
  *   Matrix4::Init_Ortho -- Initialize to an orthographic projection matrix                    *
  *   Matrix4::Init_Perspective -- Initialize to a perspective projection matrix                *
  *   Matrix4::Init_Perspective -- Initialize to a perspective projection matrix                *
- *   Matrix4::Transpose -- Returns transpose of the matrix                                     * 
- *   Matrix4::Inverse -- returns the inverse of the matrix                                     * 
- *   Matrix4::operator = -- assignment operator                                                * 
- *   Matrix4::operator += -- "plus equals" operator                                            * 
- *   Matrix4::operator-= -- "minus equals" operator                                            * 
- *   Matrix4::operator *= -- "times equals" operator                                           * 
- *   Matrix4::operator /= -- "divide equals" operator                                          * 
+ *   Matrix4::Transpose -- Returns transpose of the matrix                                     *
+ *   Matrix4::Inverse -- returns the inverse of the matrix                                     *
+ *   Matrix4::operator = -- assignment operator                                                *
+ *   Matrix4::operator += -- "plus equals" operator                                            *
+ *   Matrix4::operator-= -- "minus equals" operator                                            *
+ *   Matrix4::operator *= -- "times equals" operator                                           *
+ *   Matrix4::operator /= -- "divide equals" operator                                          *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MATRIX4_H
-#define MATRIX4_H
 
 #include "always.h"
 #include "vector4.h"
@@ -80,7 +74,7 @@ class Matrix4
 	explicit Matrix4(const Matrix3D & m);
 	explicit Matrix4(const Matrix3 & m);
 	explicit Matrix4(const Vector4 & v0, const Vector4 & v1, const Vector4 & v2, const Vector4 & v3);
-	
+
 	void		Make_Identity(void);
 	void		Init(const Matrix3D & m);
 	void		Init(const Matrix3 & m);
@@ -115,7 +109,7 @@ class Matrix4
 	** Negation
 	*/
 	friend Matrix4 operator - (const Matrix4& a);
-	
+
 	/*
 	** Scalar multiplication and division
 	*/
@@ -125,7 +119,7 @@ class Matrix4
 
 	/*
 	** matrix addition
-	*/ 
+	*/
 	friend Matrix4 operator + (const Matrix4& a, const Matrix4& b);
 	friend Matrix4 Add(const Matrix4& a);
 
@@ -140,7 +134,7 @@ class Matrix4
 	*/
 	friend Matrix4 operator * (const Matrix4 & a, const Matrix4 & b);
 	friend Matrix4 Multiply(const Matrix4 & a, const Matrix4 & b);
-	
+
 	/*
 	** Comparison operators
 	*/
@@ -174,17 +168,17 @@ class Matrix4
 };
 
 
-/*********************************************************************************************** 
- * Matrix4::Matrix4 -- Constructor, optionally initialize to Identitiy matrix                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4::Matrix4 -- Constructor, optionally initialize to Identitiy matrix                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix4::Matrix4(bool identity)
 {
@@ -193,54 +187,54 @@ inline Matrix4::Matrix4(bool identity)
 	}
 }
 
-/*********************************************************************************************** 
- * Matrix4::Matrix4 -- Copy Constructor                                                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4::Matrix4 -- Copy Constructor                                                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix4::Matrix4(const Matrix4 & m)
 {
-	Row[0] = m.Row[0]; Row[1] = m.Row[1]; Row[2] = m.Row[2]; Row[3] = m.Row[3]; 
+	Row[0] = m.Row[0]; Row[1] = m.Row[1]; Row[2] = m.Row[2]; Row[3] = m.Row[3];
 }
 
-/*********************************************************************************************** 
- * Matrix4::Matrix4 -- Convert a Matrix3D (fake 4x4) to a Matrix4                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4::Matrix4 -- Convert a Matrix3D (fake 4x4) to a Matrix4                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix4::Matrix4(const Matrix3D & m)
 {
 	Init(m);
 }
 
-/*********************************************************************************************** 
- * Matrix4::Matrix4 -- Constructor                                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4::Matrix4 -- Constructor                                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix4::Matrix4(const Vector4 & r0, const Vector4 & r1, const Vector4 & r2, const Vector4 & r3)
-{ 
+{
 	Init(r0,r1,r2,r3);
 }
 
@@ -280,7 +274,7 @@ inline void Matrix4::Make_Identity(void)
  *=============================================================================================*/
 inline void Matrix4::Init(const Matrix3D & m)
 {
-	Row[0] = m[0]; Row[1] = m[1]; Row[2] = m[2]; Row[3] = Vector4(0.0,0.0,0.0,1.0); 
+	Row[0] = m[0]; Row[1] = m[1]; Row[2] = m[2]; Row[3] = Vector4(0.0,0.0,0.0,1.0);
 }
 
 
@@ -298,7 +292,7 @@ inline void Matrix4::Init(const Matrix3D & m)
  *=============================================================================================*/
 inline void Matrix4::Init(const Vector4 & r0, const Vector4 & r1, const Vector4 & r2, const Vector4 & r3)
 {
-	Row[0] = r0; Row[1] = r1; Row[2] = r2; Row[3] = r3; 
+	Row[0] = r0; Row[1] = r1; Row[2] = r2; Row[3] = r3;
 }
 
 
@@ -429,17 +423,17 @@ inline void Matrix4::Init_Perspective
 	Row[3][3] = 0.0f;
 }
 
-/*********************************************************************************************** 
- * Matrix4::Transpose -- Returns transpose of the matrix                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4::Transpose -- Returns transpose of the matrix                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix4 Matrix4::Transpose() const
 {
@@ -451,17 +445,17 @@ inline Matrix4 Matrix4::Transpose() const
 	);
 }
 
-/*********************************************************************************************** 
- * Matrix4::Inverse -- returns the inverse of the matrix                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4::Inverse -- returns the inverse of the matrix                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix4 Matrix4::Inverse() const    // Gauss-Jordan elimination with partial pivoting
 {
@@ -502,121 +496,121 @@ inline Matrix4 Matrix4::Inverse() const    // Gauss-Jordan elimination with part
 	return b;
 }
 
-/*********************************************************************************************** 
- * Matrix4::operator = -- assignment operator                                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4::operator = -- assignment operator                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix4 & Matrix4::operator = (const Matrix4 & m)
 {
 	Row[0] = m.Row[0]; Row[1] = m.Row[1]; Row[2] = m.Row[2]; Row[3] = m.Row[3];
-	return *this; 
+	return *this;
 }
 
-/*********************************************************************************************** 
- * Matrix4::operator += -- "plus equals" operator                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4::operator += -- "plus equals" operator                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix4& Matrix4::operator += (const Matrix4 & m)
 {
 	Row[0] += m.Row[0]; Row[1] += m.Row[1]; Row[2] += m.Row[2]; Row[3] += m.Row[3];
-	return *this; 
+	return *this;
 }
 
-/*********************************************************************************************** 
- * Matrix4::operator-= -- "minus equals" operator                                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4::operator-= -- "minus equals" operator                                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix4& Matrix4::operator -= (const Matrix4 & m)
 {
 	Row[0] -= m.Row[0]; Row[1] -= m.Row[1]; Row[2] -= m.Row[2]; Row[3] -= m.Row[3];
-	return *this; 
+	return *this;
 }
 
-/*********************************************************************************************** 
- * Matrix4::operator *= -- "times equals" operator                                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4::operator *= -- "times equals" operator                                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix4& Matrix4::operator *= (float d)
 {
 	Row[0] *= d; Row[1] *= d; Row[2] *= d; Row[3] *= d;
-	return *this; 
+	return *this;
 }
 
-/*********************************************************************************************** 
- * Matrix4::operator /= -- "divide equals" operator                                            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Matrix4::operator /= -- "divide equals" operator                                            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline Matrix4& Matrix4::operator /= (float d)
 {
 	float ood = d;
 	Row[0] *= ood; Row[1] *= ood; Row[2] *= ood; Row[3] *= ood;
-	return *this; 
+	return *this;
 }
 
 inline Matrix4 operator - (const Matrix4 & a)
-{ 
-	return Matrix4(-a.Row[0], -a.Row[1], -a.Row[2], -a.Row[3]); 
+{
+	return Matrix4(-a.Row[0], -a.Row[1], -a.Row[2], -a.Row[3]);
 }
 
 inline Matrix4 operator * (const Matrix4 & a, float d)
-{ 
-	return Matrix4(a.Row[0] * d, a.Row[1] * d, a.Row[2] * d, a.Row[3] * d); 
+{
+	return Matrix4(a.Row[0] * d, a.Row[1] * d, a.Row[2] * d, a.Row[3] * d);
 }
 
 inline Matrix4 operator * (float d, const Matrix4 & a)
-{ 
-	return a*d; 
+{
+	return a*d;
 }
 
 inline Matrix4 operator / (const Matrix4 & a, float d)
-{ 
+{
 	float ood = 1.0f / d;
-	return Matrix4(a.Row[0] * ood, a.Row[1] * ood, a.Row[2] * ood, a.Row[3] * ood); 
+	return Matrix4(a.Row[0] * ood, a.Row[1] * ood, a.Row[2] * ood, a.Row[3] * ood);
 }
 
 /*
 ** matrix addition
-*/ 
+*/
 inline Matrix4 operator + (const Matrix4 & a, const Matrix4 & b)
 {
 	return Matrix4(
@@ -652,14 +646,14 @@ inline Matrix4 Subtract(const Matrix4 & a, const Matrix4 & b)
 inline Matrix4 operator * (const Matrix4 & a, const Matrix4 & b)
 {
 	#define ROWCOL(i, j) a[i][0]*b[0][j] + a[i][1]*b[1][j] + a[i][2]*b[2][j] + a[i][3]*b[3][j]
-    
+
 	return Matrix4(
 		Vector4(ROWCOL(0,0), ROWCOL(0,1), ROWCOL(0,2), ROWCOL(0,3)),
 		Vector4(ROWCOL(1,0), ROWCOL(1,1), ROWCOL(1,2), ROWCOL(1,3)),
 		Vector4(ROWCOL(2,0), ROWCOL(2,1), ROWCOL(2,2), ROWCOL(2,3)),
 		Vector4(ROWCOL(3,0), ROWCOL(3,1), ROWCOL(3,2), ROWCOL(3,3))
 	);
-	
+
 	#undef ROWCOL
 }
 
@@ -712,5 +706,3 @@ inline void Matrix4::Transform_Vector(const Matrix4 & A,const Vector3 & in,Vecto
 	out->Y = (A[1][0] * v->X + A[1][1] * v->Y + A[1][2] * v->Z + A[1][3]);
 	out->Z = (A[2][0] * v->X + A[2][1] * v->Y + A[2][2] * v->Z + A[2][3]);
 }
-
-#endif /*MATRIX4_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/pluglib/nodefilt.cpp b/Core/Tools/WW3D/pluglib/nodefilt.cpp
index 2e59183e52b..be1d3886fad 100644
--- a/Core/Tools/WW3D/pluglib/nodefilt.cpp
+++ b/Core/Tools/WW3D/pluglib/nodefilt.cpp
@@ -17,29 +17,29 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/nodefilt.cpp 9     1/16/98 10:34a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G                                                 * 
- *                                                                                             * 
- *                    File Name : NODEFILT.CPP                                                 * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/09/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 9, 1997 [GH]                                            * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   VisibleMeshINodeFilter::Accept_Node -- Accepts visible meshes                             * 
- *   AnimatedINodeFilter::Accept_Node -- Accepts animated INodes                               * 
- *   RootINodeFilter::Accept_Node -- Accepts root INodes                                       * 
- *   VisibleHelperINodeFilter::Accept_Node -- Accepts visible helper objects                   * 
- *   VisibleMeshOrHelperINodeFilter::Accept_Node -- Accepts visible helper or mesh objects     * 
- *   HelperINodeFilter::Accept_Node -- Accepts all helper inodes (including hidden)            * 
- *   MeshINodeFilter::Accept_Node -- Accepts all mesh inodes (including hidden)                * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G                                                 *
+ *                                                                                             *
+ *                    File Name : NODEFILT.cpp                                                 *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/09/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 9, 1997 [GH]                                            *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   VisibleMeshINodeFilter::Accept_Node -- Accepts visible meshes                             *
+ *   AnimatedINodeFilter::Accept_Node -- Accepts animated INodes                               *
+ *   RootINodeFilter::Accept_Node -- Accepts root INodes                                       *
+ *   VisibleHelperINodeFilter::Accept_Node -- Accepts visible helper objects                   *
+ *   VisibleMeshOrHelperINodeFilter::Accept_Node -- Accepts visible helper or mesh objects     *
+ *   HelperINodeFilter::Accept_Node -- Accepts all helper inodes (including hidden)            *
+ *   MeshINodeFilter::Accept_Node -- Accepts all mesh inodes (including hidden)                *
  *   VisibleSelectedINodeFilter::Accept_Node -- Accepts Visible and selected inodes            *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
@@ -54,24 +54,24 @@
 VisibleMeshINodeFilter DefaultINodeFilter;
 
 
-/*********************************************************************************************** 
- * HelperINodeFilter::Accept_Node -- Accepts all helper inodes (including hidden)              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HelperINodeFilter::Accept_Node -- Accepts all helper inodes (including hidden)              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 BOOL HelperINodeFilter::Accept_Node(INode * node,TimeValue time)
 {
 	Object * obj = node->EvalWorldState(time).obj;
 
 	if (obj && obj->SuperClassID() == HELPER_CLASS_ID) {
-		
+
 		return TRUE;
 
 	}
@@ -80,17 +80,17 @@ BOOL HelperINodeFilter::Accept_Node(INode * node,TimeValue time)
 }
 
 
-/*********************************************************************************************** 
- * MeshINodeFilter::Accept_Node -- Accepts all mesh inodes (including hidden)                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/10/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshINodeFilter::Accept_Node -- Accepts all mesh inodes (including hidden)                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/10/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 BOOL MeshINodeFilter::Accept_Node(INode * node,TimeValue time)
 {
@@ -111,33 +111,33 @@ BOOL MeshINodeFilter::Accept_Node(INode * node,TimeValue time)
 }
 
 
-/*********************************************************************************************** 
- * VisibleMeshINodeFilter::Accept_Node -- Accepts visible meshes                               * 
- *                                                                                             * 
- * Accepts nodes which: 																							  * 
- * - can be converted to tri-meshes 																			  * 
- * - are not hidden 																									  * 
- * - whose visibility > 0.0																						  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * VisibleMeshINodeFilter::Accept_Node -- Accepts visible meshes                               *
+ *                                                                                             *
+ * Accepts nodes which: 																							  *
+ * - can be converted to tri-meshes 																			  *
+ * - are not hidden 																									  *
+ * - whose visibility > 0.0																						  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 BOOL VisibleMeshINodeFilter::Accept_Node(INode * node, TimeValue time)
 {
 	Object * obj = node->EvalWorldState(time).obj;
 
-	if 
+	if
 	(
-		obj 
-		&& !node->IsHidden ()  
+		obj
+		&& !node->IsHidden ()
 		&& obj->CanConvertToType(triObjectClassID)
-		&& obj->SuperClassID() == GEOMOBJECT_CLASS_ID 
+		&& obj->SuperClassID() == GEOMOBJECT_CLASS_ID
 //		&& node->GetVisibility (time) > 0.0f
 	)
 	{
@@ -151,30 +151,30 @@ BOOL VisibleMeshINodeFilter::Accept_Node(INode * node, TimeValue time)
 	}
 }
 
-/*********************************************************************************************** 
- * VisibleHelperINodeFilter::Accept_Node -- Accepts visible helper objects                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/03/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * VisibleHelperINodeFilter::Accept_Node -- Accepts visible helper objects                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/03/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 BOOL VisibleHelperINodeFilter::Accept_Node(INode * node, TimeValue time)
 {
 	Object * obj = node->EvalWorldState(time).obj;
 
 	if ((!obj) || (node->IsHidden()) /*|| (node->GetVisibility(time) <= 0.0f)*/) {
-		
+
 		return FALSE;
 
 	}
 
 	if (obj->SuperClassID() == HELPER_CLASS_ID) {
-		
+
 		return TRUE;
 
 	}
@@ -183,24 +183,24 @@ BOOL VisibleHelperINodeFilter::Accept_Node(INode * node, TimeValue time)
 }
 
 
-/*********************************************************************************************** 
- * VisibleMeshOrHelperINodeFilter::Accept_Node -- Accepts visible helper or mesh objects       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/03/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * VisibleMeshOrHelperINodeFilter::Accept_Node -- Accepts visible helper or mesh objects       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/03/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 BOOL VisibleMeshOrHelperINodeFilter::Accept_Node(INode * node, TimeValue time)
 {
 	Object * obj = node->EvalWorldState(time).obj;
 
 	if ((!obj) || (node->IsHidden()) /*|| (node->GetVisibility(time) <= 0.0f)*/) {
-		
+
 		return FALSE;
 
 	}
@@ -212,7 +212,7 @@ BOOL VisibleMeshOrHelperINodeFilter::Accept_Node(INode * node, TimeValue time)
 	}
 
 	if (obj->SuperClassID() == HELPER_CLASS_ID) {
-		
+
 		return TRUE;
 
 	}
@@ -220,36 +220,36 @@ BOOL VisibleMeshOrHelperINodeFilter::Accept_Node(INode * node, TimeValue time)
 	return FALSE;
 }
 
-/*********************************************************************************************** 
- * AnimatedINodeFilter::Accept_Node -- Accepts animated INodes                                 * 
- *                                                                                             * 
- * Accepts nodes which: 																							  * 
- * - can be converted to tri-meshes 																			  * 
- * - are not hidden 																									  * 
- * - whose visibility > 0.0 																						  * 
- * - have animation keys!																							  * 
- * 																														  * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * AnimatedINodeFilter::Accept_Node -- Accepts animated INodes                                 *
+ *                                                                                             *
+ * Accepts nodes which: 																							  *
+ * - can be converted to tri-meshes 																			  *
+ * - are not hidden 																									  *
+ * - whose visibility > 0.0 																						  *
+ * - have animation keys!																							  *
+ * 																														  *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 BOOL AnimatedINodeFilter::Accept_Node(INode * node, TimeValue time)
 {
 	Object			* obj = node->EvalWorldState(time).obj;
 	Control			* poscon = node->GetTMController()->GetPositionController();
 	Control			* rotcon = node->GetTMController()->GetRotationController();
-	
+
 	int numkeys = 0;
 	if (poscon != NULL) {
 		IKeyControl	* poskeys = GetKeyControlInterface(poscon);
 		if (poskeys != NULL) numkeys += poskeys->GetNumKeys();
 	}
-	
+
 	if (rotcon != NULL) {
 		IKeyControl	* rotkeys = GetKeyControlInterface(rotcon);
 		if (rotkeys != NULL) numkeys += rotkeys->GetNumKeys();
@@ -258,7 +258,7 @@ BOOL AnimatedINodeFilter::Accept_Node(INode * node, TimeValue time)
 	if (obj && !node->IsHidden() && numkeys > 0) {
 		return TRUE;
 	}
-	
+
 	return FALSE;
 }
 
diff --git a/Core/Tools/WW3D/pluglib/nodefilt.h b/Core/Tools/WW3D/pluglib/nodefilt.h
index 705e82ca3ff..999fd897a42 100644
--- a/Core/Tools/WW3D/pluglib/nodefilt.h
+++ b/Core/Tools/WW3D/pluglib/nodefilt.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/nodefilt.h 6     1/14/98 10:23a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G                                                 * 
- *                                                                                             * 
- *                    File Name : NODEFILT.H                                                   * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/09/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 9, 1997 [GH]                                            * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G                                                 *
+ *                                                                                             *
+ *                    File Name : NODEFILT.h                                                   *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/09/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 9, 1997 [GH]                                            *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef NODEFILT_H
-#define NODEFILT_H
+#pragma once
 
 #include "always.h"
 #include <max.h>
@@ -53,7 +51,7 @@
 *	INodeFilterClass and implementing the Accept_Node method.
 *
 ***************************************************************/
-class INodeFilterClass 
+class INodeFilterClass
 {
 public:
 	virtual BOOL Accept_Node(INode * node, TimeValue time) = 0;
@@ -78,7 +76,7 @@ class AnyINodeFilter	: public INodeFilterClass
 *
 *	HelperINodeFilter
 *
-*	Accepts INodes which are Helper objects 
+*	Accepts INodes which are Helper objects
 *
 ***************************************************************/
 class HelperINodeFilter : public INodeFilterClass
@@ -92,7 +90,7 @@ class HelperINodeFilter : public INodeFilterClass
 *
 *	MeshINodeFilter
 *
-*	Only accepts INodes which are Triangle meshes 
+*	Only accepts INodes which are Triangle meshes
 *
 ***************************************************************/
 class MeshINodeFilter : public INodeFilterClass
@@ -172,7 +170,3 @@ class VisibleSelectedINodeFilter : public INodeFilterClass
 public:
 	virtual BOOL Accept_Node(INode * node, TimeValue time);
 };
-
-
-
-#endif /*NODEFILT_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/pluglib/nodelist.cpp b/Core/Tools/WW3D/pluglib/nodelist.cpp
index 3da8fe13c5b..ef13af11c7d 100644
--- a/Core/Tools/WW3D/pluglib/nodelist.cpp
+++ b/Core/Tools/WW3D/pluglib/nodelist.cpp
@@ -17,31 +17,31 @@
 */
 
 /* $Header: /Commando/Code/Tools/pluglib/nodelist.cpp 8     1/02/01 6:31p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G                                                 * 
- *                                                                                             * 
- *                    File Name : NODELIST.CPP                                                 * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/09/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 9, 1997 [GH]                                            * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   INodeListClass::INodeListClass -- Create an INodeList                                     * 
- *   INodeListClass::~INodeListClass -- Delete the INode List                                  * 
- *   INode * INodeListClass::operator[] -- Array-like access to the list members               * 
- *   INodeListClass::callback -- callback function for MAX                                     * 
- *   INodeListClass::INodeListClass -- A "copy" contstructor with filtering...                 * 
- *   INodeListClass::INodeListClass -- constructor                                             * 
- *   INodeListClass::INodeListClass -- Constructor                                             * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G                                                 *
+ *                                                                                             *
+ *                    File Name : NODELIST.cpp                                                 *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/09/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 9, 1997 [GH]                                            *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   INodeListClass::INodeListClass -- Create an INodeList                                     *
+ *   INodeListClass::~INodeListClass -- Delete the INode List                                  *
+ *   INode * INodeListClass::operator[] -- Array-like access to the list members               *
+ *   INodeListClass::callback -- callback function for MAX                                     *
+ *   INodeListClass::INodeListClass -- A "copy" contstructor with filtering...                 *
+ *   INodeListClass::INodeListClass -- constructor                                             *
+ *   INodeListClass::INodeListClass -- Constructor                                             *
  *   INodeListClass::Insert -- insert a list of nodes into this list                           *
- *   INodeListClass::Insert -- Inserts an INode into the list                                  * 
+ *   INodeListClass::Insert -- Inserts an INode into the list                                  *
  *   INodeListClass::Add_Tree -- Add a tree of INodes to the list                              *
  *   INodeListClass::Remove -- Remove the i'th element of the list                             *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
@@ -69,17 +69,17 @@ class INodeListEntryClass
 	INodeListEntryClass		* Next;
 };
 
-/*********************************************************************************************** 
- * INodeListClass::INodeListClass -- Constructor                                               * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * INodeListClass::INodeListClass -- Constructor                                               *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 INodeListClass::INodeListClass(TimeValue time,INodeFilterClass * inodefilter) :
 	NumNodes(0),
@@ -92,20 +92,20 @@ INodeListClass::INodeListClass(TimeValue time,INodeFilterClass * inodefilter) :
 	}
 }
 
-/*********************************************************************************************** 
- * INodeListClass::INodeListClass -- Create an INodeList                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * scene - 3dsMAX scene to enumerate																			  * 
- * time - time at which to create the list of INodes														  * 
- * inodefilter - object which will accept or reject each INode in the scene						  * 
- * 																														  * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * INodeListClass::INodeListClass -- Create an INodeList                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * scene - 3dsMAX scene to enumerate																			  *
+ * time - time at which to create the list of INodes														  *
+ * inodefilter - object which will accept or reject each INode in the scene						  *
+ * 																														  *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 INodeListClass::INodeListClass(IScene * scene,TimeValue time,INodeFilterClass * inodefilter) :
 	NumNodes(0),
@@ -145,17 +145,17 @@ INodeListClass::INodeListClass(INode * root,TimeValue time,INodeFilterClass * no
 }
 
 
-/*********************************************************************************************** 
- * INodeListClass::INodeListClass -- A "copy" contstructor with filtering...                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * INodeListClass::INodeListClass -- A "copy" contstructor with filtering...                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 INodeListClass::INodeListClass(INodeListClass & copyfrom,TimeValue time,INodeFilterClass * inodefilter) :
 	NumNodes(0),
@@ -171,17 +171,17 @@ INodeListClass::INodeListClass(INodeListClass & copyfrom,TimeValue time,INodeFil
 	}
 }
 
-/*********************************************************************************************** 
- * INodeListClass::~INodeListClass -- Delete the INode List                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * INodeListClass::~INodeListClass -- Delete the INode List                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 INodeListClass::~INodeListClass(void)
 {
@@ -197,19 +197,19 @@ INodeListClass::~INodeListClass(void)
 }
 
 
-/*********************************************************************************************** 
- * INode * INodeListClass::operator[] -- Array-like access to the list members                 * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * 	index - index of the list entry																			  * 
- * 																														  * 
- * OUTPUT:                                                                                     * 
- * 	pointer to an INode																							  * 
- * 																														  * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * INode * INodeListClass::operator[] -- Array-like access to the list members                 *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * 	index - index of the list entry																			  *
+ * 																														  *
+ * OUTPUT:                                                                                     *
+ * 	pointer to an INode																							  *
+ * 																														  *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 INode * INodeListClass::operator[] ( int index ) const
 {
@@ -242,27 +242,27 @@ void INodeListClass::Insert(INodeListClass & insertlist)
 	}
 }
 
-/*********************************************************************************************** 
- * INodeListClass::Insert -- Inserts an INode into the list                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   07/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * INodeListClass::Insert -- Inserts an INode into the list                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   07/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void INodeListClass::Insert(INode * node)
 {
-	if (INodeFilter->Accept_Node(node,Time)) 
+	if (INodeFilter->Accept_Node(node,Time))
 	{
 		INodeListEntryClass * newentry = new INodeListEntryClass(node, Time);
 		newentry->Next = ListHead;
 		ListHead = newentry;
 		NumNodes++;
-	} 
+	}
 }
 
 
@@ -288,7 +288,7 @@ void INodeListClass::Remove(int i)
 	while (i > 1) {
 		prev = prev->Next;
 	}
-	
+
 	INodeListEntryClass * deleteme = prev->Next;
 	if (deleteme != NULL) {
 		prev->Next = prev->Next->Next;
@@ -320,20 +320,20 @@ void INodeListClass::Add_Tree(INode * root)
 }
 
 
-/*********************************************************************************************** 
- * INodeListClass::callback -- callback function for MAX                                       * 
- *                                                                                             * 
- * 3dsMAX calls this function with a pointer to each INode in the scene.  We keep a pointer	  * 
- * to the ones we like.																								  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/09/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * INodeListClass::callback -- callback function for MAX                                       *
+ *                                                                                             *
+ * 3dsMAX calls this function with a pointer to each INode in the scene.  We keep a pointer	  *
+ * to the ones we like.																								  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/09/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int INodeListClass::callback(INode * node)
 {
@@ -350,7 +350,7 @@ void INodeListClass::Sort(const INodeCompareClass & node_compare)
 
 			INodeListEntryClass * ni = get_nth_item(i);
 			INodeListEntryClass * nj = get_nth_item(j);
-			
+
 			if (node_compare(ni->Node,nj->Node) > 0) {
 				INode * tmp = ni->Node;
 				ni->Node = nj->Node;
diff --git a/Core/Tools/WW3D/pluglib/nodelist.h b/Core/Tools/WW3D/pluglib/nodelist.h
index e04b6ab5140..e7adc255e38 100644
--- a/Core/Tools/WW3D/pluglib/nodelist.h
+++ b/Core/Tools/WW3D/pluglib/nodelist.h
@@ -17,27 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/pluglib/nodelist.h 7     1/02/01 6:31p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G                                                 * 
- *                                                                                             * 
- *                    File Name : NODELIST.H                                                   * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/09/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 9, 1997 [GH]                                            * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G                                                 *
+ *                                                                                             *
+ *                    File Name : NODELIST.h                                                   *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/09/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 9, 1997 [GH]                                            *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef NODELIST_H
-#define NODELIST_H
+#pragma once
 
 #include "always.h"
 #include <max.h>
@@ -97,6 +95,3 @@ class INodeCompareClass
 	// returns >0 if nodea > node b.
 	virtual int operator() (INode * nodea,INode * nodeb) const = 0;
 };
-
-
-#endif /*NODELIST_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/pluglib/noinit.h b/Core/Tools/WW3D/pluglib/noinit.h
index 040ae8b249f..dfbe3b15733 100644
--- a/Core/Tools/WW3D/pluglib/noinit.h
+++ b/Core/Tools/WW3D/pluglib/noinit.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/noinit.h                                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/noinit.h                                           $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 3/23/99 5:20p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef NOINIT_H
-#define NOINIT_H
+#pragma once
 
 /**********************************************************************
 **	This class is solely used as a parameter to a constructor that does
@@ -52,6 +51,3 @@ class NoInitClass {
 		void operator () (void) const {};
 };
 #endif
-
-
-#endif
diff --git a/Core/Tools/WW3D/pluglib/palette.cpp b/Core/Tools/WW3D/pluglib/palette.cpp
index d31df0932bd..f270eb8fafa 100644
--- a/Core/Tools/WW3D/pluglib/palette.cpp
+++ b/Core/Tools/WW3D/pluglib/palette.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/PALETTE.CPP                               $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/PALETTE.cpp                               $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   PaletteClass::Adjust -- Adjusts the palette toward another palette.                       *
  *   PaletteClass::Adjust -- Adjusts this palette toward black.                                *
  *   PaletteClass::Closest_Color -- Finds closest match to color specified.                    *
diff --git a/Core/Tools/WW3D/pluglib/palette.h b/Core/Tools/WW3D/pluglib/palette.h
index bfdb7c0feb1..211e9507150 100644
--- a/Core/Tools/WW3D/pluglib/palette.h
+++ b/Core/Tools/WW3D/pluglib/palette.h
@@ -16,29 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/PALETTE.H                                          $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/PALETTE.h                                          $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/02/99 12:00p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef PALETTE_H
-#define PALETTE_H
+#pragma once
 
 #include	"rgb.h"
 
@@ -76,6 +72,3 @@ class PaletteClass
 	protected:
 		RGBClass Palette[COLOR_COUNT];
 };
-
-
-#endif
diff --git a/Core/Tools/WW3D/pluglib/plane.h b/Core/Tools/WW3D/pluglib/plane.h
index 3cc6e7565af..ed7b8bb2530 100644
--- a/Core/Tools/WW3D/pluglib/plane.h
+++ b/Core/Tools/WW3D/pluglib/plane.h
@@ -17,26 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/pluglib/plane.h 8     4/22/98 6:36p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Voxel Technology                                             * 
- *                                                                                             * 
- *                    File Name : PLANE.H                                                      * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 03/17/97                                                     * 
- *                                                                                             * 
- *                  Last Update : March 17, 1997 [GH]                                          * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Voxel Technology                                             *
+ *                                                                                             *
+ *                    File Name : PLANE.h                                                      *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 03/17/97                                                     *
+ *                                                                                             *
+ *                  Last Update : March 17, 1997 [GH]                                          *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef PLANE_H
-#define PLANE_H
+#pragma once
 
 #ifndef VECTOR3_H
 #include "vector3.h"
@@ -58,7 +57,7 @@ class PlaneClass
 	PlaneClass(void) : N(0.0f,0.0f,1.0f), D(0.0f) { }
 	PlaneClass(float a,float b,float c,float d) : N(a,b,c),D(d) { }
 	PlaneClass(const Vector3 & normal,float dist) : N(normal), D(dist) { }
-	
+
 	// Create a plane given the normal and a point on the plane
 	PlaneClass(const Vector3 & normal,const Vector3 & point);
 
@@ -74,7 +73,7 @@ inline PlaneClass::PlaneClass(const Vector3 & normal,const Vector3 & point)
 	D = Vector3::Dot_Product(normal , point);
 }
 
-inline PlaneClass::PlaneClass(const Vector3 & point1, const Vector3 & point2, const Vector3 & point3) 
+inline PlaneClass::PlaneClass(const Vector3 & point1, const Vector3 & point2, const Vector3 & point3)
 {
 	N = Vector3::Cross_Product((point2 - point1), (point3 - point1));
 	if (N != Vector3(0.0f, 0.0f, 0.0f)) {
@@ -93,7 +92,3 @@ inline bool In_Front(const Vector3 & point,const PlaneClass & plane)
 	double dist = point * plane.N;
 	return (dist > plane.D);
 }
-
-
-
-#endif /*PLANE_H*/
\ No newline at end of file
diff --git a/Core/Tools/WW3D/pluglib/rawfile.cpp b/Core/Tools/WW3D/pluglib/rawfile.cpp
index 0884a6b4829..996312b9f94 100644
--- a/Core/Tools/WW3D/pluglib/rawfile.cpp
+++ b/Core/Tools/WW3D/pluglib/rawfile.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /VSS_Sync/wwlib/rawfile.cpp                                 $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /VSS_Sync/wwlib/rawfile.cpp                                 $*
+ *                                                                                             *
  *                      $Author:: Vss_sync                                                    $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 8/29/01 10:24p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 12                                                          $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   RawFileClass::Bias -- Bias a file with a specific starting position and length.           *
  *   RawFileClass::Close -- Perform a closure of the file.                                     *
  *   RawFileClass::Create -- Creates an empty file.                                            *
@@ -74,7 +74,7 @@
 	**	This is a duplicate of the error numbers. The error handler for the RawFileClass handles
 	**	these errors. If the error routine is overridden and additional errors are defined, then
 	**	use numbers starting with 100. Note that these errors here are listed in numerical order.
-	**	These errors are defined in the standard header file "ERRNO.H".
+	**	These errors are defined in the standard header file "ERRNO.h".
 	*/
 	EZERO,				// Non-error.
 	EINVFNC,				// Invalid function number.
@@ -185,7 +185,7 @@ bool RawFileClass::Is_Open(void) const
  *    Display an error message as indicated. If it is allowed to retry, then pressing a key    *
  *    will return from this function. Otherwise, it will exit the program with "exit()".       *
  *                                                                                             *
- * INPUT:   error    -- The error number (same as the DOSERR.H error numbers).                 *
+ * INPUT:   error    -- The error number (same as the DOSERR.h error numbers).                 *
  *                                                                                             *
  *          canretry -- Can this routine exit normally so that retrying can occur? If this is  *
  *                      false, then the program WILL exit in this routine.                     *
@@ -222,7 +222,7 @@ void RawFileClass::Error(int, int, char const * )
  * HISTORY:                                                                                    *
  *   10/18/1994 JLB : Created.                                                                 *
  *=============================================================================================*/
-int RawFileClass::Transfer_Block_Size(void) 
+int RawFileClass::Transfer_Block_Size(void)
 {
 	return (int)((unsigned)UINT_MAX)-16L;
 }
@@ -595,7 +595,7 @@ void RawFileClass::Close(void)
 		*/
 		int closeok;
 		#ifdef _UNIX
-			closeok=(fclose(Handle)==0)?TRUE:FALSE;	
+			closeok=(fclose(Handle)==0)?TRUE:FALSE;
 		#else
 			closeok=CloseHandle(Handle);
 		#endif
@@ -677,7 +677,7 @@ int RawFileClass::Read(void * buffer, int size)
 		#else
 			readok=ReadFile(Handle, buffer, size, &(unsigned long&)bytesread, NULL);
 		#endif
-			
+
 
 		if (! readok) {
 			size -= bytesread;
@@ -880,13 +880,13 @@ int RawFileClass::Size(void)
 
       #ifdef _UNIX
 			fpos_t curpos,startpos,endpos;
-			fgetpos(Handle,&curpos);	
+			fgetpos(Handle,&curpos);
 
 			fseek(Handle,0,SEEK_SET);
-			fgetpos(Handle,&startpos);	
+			fgetpos(Handle,&startpos);
 
 			fseek(Handle,0,SEEK_END);
-			fgetpos(Handle,&endpos);	
+			fgetpos(Handle,&endpos);
 
 			size=endpos-startpos;
 			fsetpos(Handle,&curpos);
@@ -1222,7 +1222,7 @@ int RawFileClass::Raw_Seek(int pos, int dir)
 void RawFileClass::Attach (void *handle, int rights)
 {
 	Reset ();
-	
+
 	Rights = rights;
 	BiasStart = 0;
 	BiasLength = -1;
@@ -1257,6 +1257,6 @@ void RawFileClass::Detach (void)
 	Date = 0;
 	Time = 0;
 	Allocated = false;
-	Handle = NULL_HANDLE;	
+	Handle = NULL_HANDLE;
 }
 
diff --git a/Core/Tools/WW3D/pluglib/rawfile.h b/Core/Tools/WW3D/pluglib/rawfile.h
index cda661c54d1..40d81d696ae 100644
--- a/Core/Tools/WW3D/pluglib/rawfile.h
+++ b/Core/Tools/WW3D/pluglib/rawfile.h
@@ -16,33 +16,29 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/rawfile.h                                          $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/rawfile.h                                          $*
+ *                                                                                             *
  *                      $Author:: Neal_k                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 10/04/99 10:25a                                             $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 8                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   RawFileClass::File_Name -- Returns with the filename associate with the file object.      *
  *   RawFileClass::RawFileClass -- Default constructor for a file object.                      *
  *   RawFileClass::~RawFileClass -- Default deconstructor for a file object.                   *
  *   RawFileClass::Is_Open -- Checks to see if the file is open or not.                        *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef RAWFILE_Hx
-#define RAWFILE_Hx
+#pragma once
 
 //#include	<errno.h>
 
@@ -51,8 +47,8 @@
 #ifdef _UNIX
 #include <stdio.h>
 #include "osdep.h"
-  #define	NULL_HANDLE	 	NULL	
-  #define	HANDLE_TYPE		FILE*	
+  #define	NULL_HANDLE	 	NULL
+  #define	HANDLE_TYPE		FILE*
 #else
   #define	NULL_HANDLE		INVALID_HANDLE_VALUE
   #define	HANDLE_TYPE		HANDLE
@@ -113,10 +109,10 @@ class RawFileClass : public FileClass
 
 		void Bias(int start, int length=-1);
 
-		virtual void * Get_File_Handle(void) { return Handle; } 
+		virtual void * Get_File_Handle(void) { return Handle; }
 
 		virtual void	Attach (void *handle, int rights=READ);
-		virtual void	Detach (void);		
+		virtual void	Detach (void);
 
 		/*
 		**	These bias values enable a sub-portion of a file to appear as if it
@@ -199,7 +195,3 @@ inline char const * RawFileClass::File_Name(void) const
 {
 	return(Filename);
 }
-
-
-
-#endif
diff --git a/Core/Tools/WW3D/pluglib/realcrc.cpp b/Core/Tools/WW3D/pluglib/realcrc.cpp
index 0c8da51632a..9e7708c3860 100644
--- a/Core/Tools/WW3D/pluglib/realcrc.cpp
+++ b/Core/Tools/WW3D/pluglib/realcrc.cpp
@@ -40,10 +40,10 @@
 #include "realcrc.h"
 #include <ctype.h>
 
-//    CRC for poly 0x04C11DB7   
+//    CRC for poly 0x04C11DB7
 unsigned long  CRC32_Table[ 256 ] =
 {
-	0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL, 
+	0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL,
 	0x076DC419L, 0x706AF48FL, 0xE963A535L, 0x9E6495A3L,
 	0x0EDB8832L, 0x79DCB8A4L, 0xE0D5E91EL, 0x97D2D988L,
 	0x09B64C2BL, 0x7EB17CBDL, 0xE7B82D07L, 0x90BF1D91L,
diff --git a/Core/Tools/WW3D/pluglib/realcrc.h b/Core/Tools/WW3D/pluglib/realcrc.h
index 347d962c005..c858e5f5836 100644
--- a/Core/Tools/WW3D/pluglib/realcrc.h
+++ b/Core/Tools/WW3D/pluglib/realcrc.h
@@ -33,17 +33,9 @@
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef REALCRC_H
-#define REALCRC_H
 
+#pragma once
 
 unsigned long	CRC_Memory( const unsigned char *data, unsigned long length, unsigned long crc = 0 );
 unsigned long	CRC_String( const char *string, unsigned long crc = 0 );
 unsigned long	CRC_Stringi( const char *string, unsigned long crc = 0 );
-
-
-#endif
diff --git a/Core/Tools/WW3D/pluglib/rgb.cpp b/Core/Tools/WW3D/pluglib/rgb.cpp
index e54e636f8e1..1bfcc0dbb2f 100644
--- a/Core/Tools/WW3D/pluglib/rgb.cpp
+++ b/Core/Tools/WW3D/pluglib/rgb.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Library/RGB.CPP                                   $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Library/RGB.cpp                                   $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/22/97 11:37a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 1                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   RGBClass::Adjust -- Adjust one RGB value toward another.                                  *
  *   RGBClass::Difference -- Determines the "distance" between two colors.                     *
  *   RGBClass::operator HSVClass -- Conversion operator for RGB to HSV object.                 *
diff --git a/Core/Tools/WW3D/pluglib/rgb.h b/Core/Tools/WW3D/pluglib/rgb.h
index b1c19a1e76c..20b76bd4a6e 100644
--- a/Core/Tools/WW3D/pluglib/rgb.h
+++ b/Core/Tools/WW3D/pluglib/rgb.h
@@ -16,29 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/RGB.H                                              $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/RGB.h                                              $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/02/99 12:00p                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef RGB_H
-#define RGB_H
+#pragma once
 
 class PaletteClass;
 class HSVClass;
@@ -91,5 +87,3 @@ class RGBClass
 };
 
 extern RGBClass const BlackColor;
-
-#endif
diff --git a/Core/Tools/WW3D/pluglib/uarray.h b/Core/Tools/WW3D/pluglib/uarray.h
index c778e874bdc..1b89db61b3d 100644
--- a/Core/Tools/WW3D/pluglib/uarray.h
+++ b/Core/Tools/WW3D/pluglib/uarray.h
@@ -36,19 +36,15 @@
  *   UniqueArrayClass<T>::~UniqueArrayClass -- destructor                                      *
  *   UniqueArrayClass<T>::Add -- Add an item to the array                                      *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef UARRAY_H
-#define UARRAY_H
+#pragma once
 
 #ifndef HASHCALC_H
 #include "hashcalc.h"
 #endif
 
 #ifndef VECTOR_H
-#include "Vector.H"
+#include "Vector.h"
 #endif
 
 
@@ -56,7 +52,7 @@
 ** UniqueArrayClass
 ** This template class can be used to generate an array of unique objects
 ** amongst a huge list of objects which may or may not be unique.  However,
-** in order to use the UniqueArrayClass, you will need to implement a 
+** in order to use the UniqueArrayClass, you will need to implement a
 ** HashCalculatorClass for the type you are using.
 **
 ** Note that the UniqueArrayClass does *copies* of the objects you are
@@ -90,7 +86,7 @@ template <class T> class UniqueArrayClass
 		bool operator == (const HashItem & that) { return ((Item == that.Item) && (NextHashIndex == that.NextHashIndex)); }
 		bool operator != (const HashItem & that) { return !(*this == that); }
 	};
-		
+
 	// Dynamic Vector of the unique items:
 	DynamicVectorClass<HashItem>		UniqueItems;
 
@@ -126,7 +122,7 @@ UniqueArrayClass<T>::UniqueArrayClass(int initial_size,int growth_rate,HashCalcu
 {
 	// set the growth rate.
 	UniqueItems.Set_Growth_Step(growth_rate);
-		
+
 	// sizing and allocating the actual hash table
 	int bits = HashCalculator->Num_Hash_Bits();
 	assert(bits > 0);
@@ -177,8 +173,8 @@ UniqueArrayClass<T>::~UniqueArrayClass(void)
  * HISTORY:                                                                                    *
  *   5/29/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-template <class T> 
-inline int UniqueArrayClass<T>::Add(const T & new_item) 
+template <class T>
+inline int UniqueArrayClass<T>::Add(const T & new_item)
 {
 	/*
 	** Use the hash table to quickly (hopefully :-) detect
@@ -187,14 +183,14 @@ inline int UniqueArrayClass<T>::Add(const T & new_item)
 	int num_hash_vals;
 	HashCalculator->Compute_Hash(new_item);
 	num_hash_vals = HashCalculator->Num_Hash_Values();
-	
+
 	unsigned int lasthash = 0xFFFFFFFF;
 	unsigned int hash;
-	
+
 	for (int hidx = 0; hidx < num_hash_vals; hidx++) {
 		hash = HashCalculator->Get_Hash_Value(hidx);
 		if (hash != lasthash) {
-			
+
 			int test_item_index = HashTable[hash];
 
 			while (test_item_index != 0xFFFFFFFF) {
@@ -217,12 +213,8 @@ inline int UniqueArrayClass<T>::Add(const T & new_item)
 	entry.Item = new_item;
 	entry.NextHashIndex = HashTable[hash_index];
 	HashTable[hash_index] = index;
-	
+
 	UniqueItems.Add(entry);
 
 	return index;
 }
-
-
-#endif // UARRAY_H
-
diff --git a/Core/Tools/WW3D/pluglib/vector2.h b/Core/Tools/WW3D/pluglib/vector2.h
index b343f8667d3..91ff7d7e937 100644
--- a/Core/Tools/WW3D/pluglib/vector2.h
+++ b/Core/Tools/WW3D/pluglib/vector2.h
@@ -17,31 +17,31 @@
 */
 
 /* $Header: /Commando/Code/wwmath/vector2.h 19    9/01/00 5:30p Ian_l $ */
-/*********************************************************************************************** 
- ***                  Confidential - Westwood Studios                                        *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Westwood 3D                                                  * 
- *                                                                                             * 
- *                    File Name : VECTOR2.H                                                    * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 02/24/97                                                     *  
- *                                                                                             * 
- *                  Last Update : February 24, 1997 [GH]                                       * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Scalar Division Operator -- Divide a vector by a scalar                                   * 
- *   Scalar Multiply Operator -- Multiply a vector by a scalar                                 * 
- *   Vector Addition Operator -- Add two vectors                                               * 
- *   Vector Subtraction Operator -- Subract two vectors                                        * 
- *   Vector Inner Product Operator -- Compute the inner or dot product                         * 
- *   Vector Equality Operator -- Detemine if two vectors are identical                         * 
- *   Equal_Within_Epsilon -- Determine if two vectors are identical within                     * 
- *   Vector Inequality Operator -- Detemine if two vectors are identical                       * 
- *   Swap -- swap two Vector2's                                                                * 
+/***********************************************************************************************
+ ***                  Confidential - Westwood Studios                                        ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Westwood 3D                                                  *
+ *                                                                                             *
+ *                    File Name : VECTOR2.h                                                    *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 02/24/97                                                     *
+ *                                                                                             *
+ *                  Last Update : February 24, 1997 [GH]                                       *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Scalar Division Operator -- Divide a vector by a scalar                                   *
+ *   Scalar Multiply Operator -- Multiply a vector by a scalar                                 *
+ *   Vector Addition Operator -- Add two vectors                                               *
+ *   Vector Subtraction Operator -- Subract two vectors                                        *
+ *   Vector Inner Product Operator -- Compute the inner or dot product                         *
+ *   Vector Equality Operator -- Detemine if two vectors are identical                         *
+ *   Equal_Within_Epsilon -- Determine if two vectors are identical within                     *
+ *   Vector Inequality Operator -- Detemine if two vectors are identical                       *
+ *   Swap -- swap two Vector2's                                                                *
  *   Vector2::Is_Valid -- Verifies that all components are valid floats                        *
  *	  Vector2::Update_Min -- sets each component of the vector to the min of this and a.        *
  *	  Vector2::Update_Max -- sets each component of the vector to the max of this and a.        *
@@ -49,12 +49,7 @@
  *   Vector2::Lerp -- linearly interpolates two Vector2's                                      *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VECTOR2_H
-#define VECTOR2_H
 
 #include "always.h"
 #include "wwmath.h"
@@ -85,16 +80,16 @@ class Vector2
 	Vector2(const Vector2 & v) { X = v.X; Y = v.Y; }
 	Vector2(float x, float y) { X = x; Y = y; }
 	Vector2(const float vector[2]) { X = vector[0]; Y = vector[1]; }
-	
-	
+
+
 	// Assignment
-	Vector2 & operator = (const Vector2 & v) { X = v[0]; Y = v[1]; return *this; }	
+	Vector2 & operator = (const Vector2 & v) { X = v[0]; Y = v[1]; return *this; }
 	void	Set(float x, float y) { X = x; Y = y; }
 	void	Set(const Vector2 & v) { X = v.X; Y = v.Y; }
 
 	// Array access
-	float &	operator [](int i) { return (&X)[i]; }     
-	const float &  operator [](int i) const { return (&X)[i]; }  
+	float &	operator [](int i) { return (&X)[i]; }
+	const float &  operator [](int i) const { return (&X)[i]; }
 
 	// normalize, compute length
 	void	Normalize(void);
@@ -102,11 +97,11 @@ class Vector2
 	float	Length2(void) const;
 
 	// unary operators
-	Vector2 operator-() const { return Vector2(-X,-Y); } 
-	Vector2 operator+() const { return *this; } 
+	Vector2 operator-() const { return Vector2(-X,-Y); }
+	Vector2 operator+() const { return *this; }
 
-	Vector2 & operator += (const Vector2 & v) { X += v.X; Y += v.Y; return *this; }	
-	Vector2 & operator -= (const Vector2 & v) { X -= v.X; Y -= v.Y; return *this; }		
+	Vector2 & operator += (const Vector2 & v) { X += v.X; Y += v.Y; return *this; }
+	Vector2 & operator -= (const Vector2 & v) { X -= v.X; Y -= v.Y; return *this; }
 	Vector2 & operator *= (float k) { X = (float)(X*k); Y=(float)(Y*k); return *this; }
 	Vector2 & operator /= (float k) { k=1.0f/k; X*=k; Y*=k; return *this; }
 
@@ -125,7 +120,7 @@ class Vector2
 
 	// dot product between a and perpendicular vector to b
 	static float Perp_Dot_Product(const Vector2 &a,const Vector2 &b);
-	
+
 	// Equality operators
 	friend bool operator == (const Vector2 &a,const Vector2 &b);
 	friend bool operator != (const Vector2 &a,const Vector2 &b);
@@ -153,17 +148,17 @@ class Vector2
 };
 
 
-/************************************************************************** 
- * Scalar Multiply Operator -- Multiply a vector by a scalar              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Scalar Multiply Operator -- Multiply a vector by a scalar              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 inline Vector2 operator * (const Vector2 &a,float k)
 {
@@ -175,16 +170,16 @@ inline Vector2 operator * (float k, const Vector2 &a)
 	return Vector2((a[0] * k),(a[1] * k));
 }
 
-/************************************************************************** 
- * Scalar Division Operator -- Divide a vector by a scalar                * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Scalar Division Operator -- Divide a vector by a scalar                *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline Vector2 operator / (const Vector2 &a,float k)
 {
@@ -192,17 +187,17 @@ inline Vector2 operator / (const Vector2 &a,float k)
 	return Vector2((a[0] * ook),(a[1] * ook));
 }
 
-/************************************************************************** 
- * Vector Addition Operator -- Add two vectors                            * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Vector Addition Operator -- Add two vectors                            *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 inline Vector2 operator + (const Vector2 &a,const Vector2 &b)
 {
@@ -212,17 +207,17 @@ inline Vector2 operator + (const Vector2 &a,const Vector2 &b)
 						);
 }
 
-/************************************************************************** 
- * Vector Subtraction Operator -- Subract two vectors                     * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Vector Subtraction Operator -- Subract two vectors                     *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 inline Vector2 operator - (const Vector2 &a,const Vector2 &b)
 {
@@ -232,16 +227,16 @@ inline Vector2 operator - (const Vector2 &a,const Vector2 &b)
 						);
 }
 
-/************************************************************************** 
- * Vector Inner Product -- Compute the inner or dot product of two vector * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Inner Product -- Compute the inner or dot product of two vector *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline float operator * (const Vector2 &a,const Vector2 &b)
 {
@@ -258,64 +253,64 @@ inline float Vector2::Perp_Dot_Product(const Vector2 &a,const Vector2 &b)
 	return a.X * -b.Y + a.Y * b.X;
 }
 
-/************************************************************************** 
- * Vector Equality Operator -- Detemine if two vectors are identical      * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Equality Operator -- Detemine if two vectors are identical      *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline bool operator == (const Vector2 &a,const Vector2 &b)
 {
 	return ( (a[0] == b[0]) && (a[1] == b[1]));
 }
 
-/************************************************************************** 
- * Vector Inequality Operator -- Detemine if two vectors are identical    * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Inequality Operator -- Detemine if two vectors are identical    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline bool operator != (const Vector2 &a,const Vector2 &b)
 {
 	return ( (a[0] != b[0]) || (a[1] != b[1]));
 }
 
-/************************************************************************** 
- * Equal_Within_Epsilon -- Determine if two vectors are identical within e* 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Equal_Within_Epsilon -- Determine if two vectors are identical within e*
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline bool Equal_Within_Epsilon(const Vector2 &a,const Vector2 &b,float epsilon)
 {
    return( (WWMath::Fabs(a.X - b.X) < epsilon) && (WWMath::Fabs(a.Y - b.Y) < epsilon) );
 }
 
-/************************************************************************** 
- * Vector2::Normalize -- Normalizes the vector.                           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector2::Normalize -- Normalizes the vector.                           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline void Vector2::Normalize()
 {
@@ -336,67 +331,67 @@ inline Vector2 Normalize(const Vector2 & vec)
 	}
 }
 
-/************************************************************************** 
- * Vector2::Length -- Returns the length of the vector                    * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector2::Length -- Returns the length of the vector                    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline float Vector2::Length() const
 {
 	return (float)WWMath::Sqrt(Length2());
 }
 
-/************************************************************************** 
- * Vector2::Length -- Returns the square of the length of the vector      * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector2::Length -- Returns the square of the length of the vector      *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline float Vector2::Length2() const
 {
 	return (X*X + Y*Y);
 }
 
-/************************************************************************** 
- * Vector2::Rotate -- Rotate vector                                       * 
- *                                                                        * 
+/**************************************************************************
+ * Vector2::Rotate -- Rotate vector                                       *
+ *                                                                        *
  * INPUT:                                                                 *
- * float theta - angle to rotate                                          * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+ * float theta - angle to rotate                                          *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline void Vector2::Rotate(float theta)
 {
 	Rotate(sin(theta), cos(theta));
 }
 
-/************************************************************************** 
- * Vector2::Rotate -- Rotate vector                                       * 
- *                                                                        * 
- * INPUT:                                                                 * 
- * s - sine of the angle                                                  * 
- * c - cosine of the angle                                                * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector2::Rotate -- Rotate vector                                       *
+ *                                                                        *
+ * INPUT:                                                                 *
+ * s - sine of the angle                                                  *
+ * c - cosine of the angle                                                *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline void Vector2::Rotate(float s, float c)
 {
@@ -406,44 +401,44 @@ inline void Vector2::Rotate(float s, float c)
 	Y = new_y;
 }
 
-/************************************************************************** 
- * Vector2::Rotate -- Rotate towards given vector (stop on reaching it)   * 
- *                                                                        * 
+/**************************************************************************
+ * Vector2::Rotate -- Rotate towards given vector (stop on reaching it)   *
+ *                                                                        *
  * INPUT:                                                                 *
- * float theta - angle to rotate                                          * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- * bool - true if we have reached the desired vector                      * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- * This function assumes both vectors are normalized!                     * 
- *                                                                        * 
- * HISTORY:                                                               * 
+ * float theta - angle to rotate                                          *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ * bool - true if we have reached the desired vector                      *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ * This function assumes both vectors are normalized!                     *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline bool Vector2::Rotate_Towards_Vector(Vector2 &target, float max_theta, bool & positive_turn)
 {
 	return Rotate_Towards_Vector(target, sin(max_theta), cos(max_theta), positive_turn);
 }
 
-/************************************************************************** 
- * Vector2::Rotate -- Rotate towards given vector (stop on reaching it)   * 
- *                                                                        * 
+/**************************************************************************
+ * Vector2::Rotate -- Rotate towards given vector (stop on reaching it)   *
+ *                                                                        *
  * INPUT:                                                                 *
- * s - sine of the angle                                                  * 
- * c - cosine of the angle                                                * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- * bool - true if we have reached the desired vector                      * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- * This function assumes both vectors are normalized!                     * 
- *                                                                        * 
- * HISTORY:                                                               * 
+ * s - sine of the angle                                                  *
+ * c - cosine of the angle                                                *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ * bool - true if we have reached the desired vector                      *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ * This function assumes both vectors are normalized!                     *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline bool Vector2::Rotate_Towards_Vector(Vector2 &target, float max_s, float max_c, bool & positive_turn)
 {
 	bool return_value = false;
-	
+
 	positive_turn = Vector2::Perp_Dot_Product(target, *this) > 0.0f;
 
 	if (Vector2::Dot_Product(*this, target) >= max_c) {
@@ -461,17 +456,17 @@ inline bool Vector2::Rotate_Towards_Vector(Vector2 &target, float max_s, float m
 	return return_value;
 }
 
-/*********************************************************************************************** 
- * Swap -- swap two Vector2's                                                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Swap -- swap two Vector2's                                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Swap(Vector2 & a,Vector2 & b)
 {
@@ -512,7 +507,7 @@ inline bool Vector2::Is_Valid(void) const
  *   06/12/00   IML : Created.                                                                 *
  *=============================================================================================*/
 inline void Vector2::Update_Min (const Vector2 & a)
-{	
+{
 	if (a.X < X) X = a.X;
 	if (a.Y < Y) Y = a.Y;
 }
@@ -531,7 +526,7 @@ inline void Vector2::Update_Min (const Vector2 & a)
  *   06/12/00   IML : Created.                                                                 *
  *=============================================================================================*/
 inline void Vector2::Update_Max (const Vector2 & a)
-{	
+{
 	if (a.X > X) X = a.X;
 	if (a.Y > Y) Y = a.Y;
 }
@@ -577,7 +572,7 @@ inline float Quick_Distance(float x1, float y1, float x2, float y2)
 	if (x_diff > y_diff)
 	{
 		return ((y_diff / 2) + x_diff);
-	} 
+	}
 	else
 	{
 		return ((x_diff / 2) + y_diff);
@@ -586,7 +581,7 @@ inline float Quick_Distance(float x1, float y1, float x2, float y2)
 
 inline float Vector2::Quick_Distance(const Vector2 &a, const Vector2 &b)
 {
-	return ::Quick_Distance(a.X, a.Y, b.X, b.Y);	
+	return ::Quick_Distance(a.X, a.Y, b.X, b.Y);
 }
 
 
@@ -611,7 +606,7 @@ inline float Distance(float x1, float y1, float x2, float y2)
 {
 	float x_diff = x1 - x2;
 	float y_diff = y1 - y2;
-	
+
 	return (WWMath::Sqrt((x_diff * x_diff) + (y_diff * y_diff)));
 }
 
@@ -634,7 +629,3 @@ inline void Vector2::Lerp(const Vector2 & a,const Vector2 & b,float t,Vector2 *
 	set_result->X = (a.X + (b.X - a.X)*t);
    set_result->Y = (a.Y + (b.Y - a.Y)*t);
 }
-
-
-#endif /* VECTOR2_H */
-
diff --git a/Core/Tools/WW3D/pluglib/vector3.h b/Core/Tools/WW3D/pluglib/vector3.h
index f401cff805f..9249b8a5c1a 100644
--- a/Core/Tools/WW3D/pluglib/vector3.h
+++ b/Core/Tools/WW3D/pluglib/vector3.h
@@ -17,20 +17,20 @@
 */
 
 /* $Header: /Commando/Code/wwmath/vector3.h 40    5/11/01 7:11p Jani_p $ */
-/*********************************************************************************************** 
- ***                  Confidential - Westwood Studios                                        *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Westwood 3D                                                  * 
- *                                                                                             * 
- *                    File Name : VECTOR3.H                                                    *  
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             *  
- *                   Start Date : 02/24/97                                                     * 
- *                                                                                             * 
- *                  Last Update : February 24, 1997 [GH]                                       * 
- *                                                                                             * 
+/***********************************************************************************************
+ ***                  Confidential - Westwood Studios                                        ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Westwood 3D                                                  *
+ *                                                                                             *
+ *                    File Name : VECTOR3.h                                                    *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 02/24/97                                                     *
+ *                                                                                             *
+ *                  Last Update : February 24, 1997 [GH]                                       *
+ *                                                                                             *
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  *   Scalar Division Operator -- Divide a vector by a scalar                                   *
@@ -63,12 +63,7 @@
  *   Vector3::Is_Valid -- Verifies that each component of this vector is a valid float         *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VECTOR3_H
-#define VECTOR3_H
 
 #include "always.h"
 #include "wwmath.h"
@@ -97,15 +92,15 @@ class Vector3
 	WWINLINE Vector3(const Vector3 & v) { X = v.X; Y = v.Y; Z = v.Z; }
 	WWINLINE Vector3(float x, float y, float z) { X = x; Y = y; Z = z; }
 	WWINLINE Vector3(const float vector[3]) { X = vector[0]; Y = vector[1]; Z = vector[2]; }
-	
+
 	// Assignment
-	WWINLINE Vector3 & operator = (const Vector3 & v) { X = v.X; Y = v.Y; Z = v.Z; return *this; }	
+	WWINLINE Vector3 & operator = (const Vector3 & v) { X = v.X; Y = v.Y; Z = v.Z; return *this; }
 	WWINLINE void	Set(float x, float y, float z) { X = x; Y = y; Z = z; }
 	WWINLINE void	Set(const Vector3 & that) { X = that.X; Y = that.Y; Z = that.Z; }
 
 	// Array access
-	WWINLINE float &	operator [](int i) { return (&X)[i]; }     
-	WWINLINE const float &  operator [](int i) const { return (&X)[i]; }  
+	WWINLINE float &	operator [](int i) { return (&X)[i]; }
+	WWINLINE const float &  operator [](int i) const { return (&X)[i]; }
 
 	// normalize, compute length
 	void	Normalize(void);
@@ -123,11 +118,11 @@ class Vector3
 	WWINLINE void	Rotate_Z(float s_angle,float c_angle);
 
 	// unary operators
-	WWINLINE Vector3 operator-() const { return(Vector3(-X,-Y,-Z)); } 
-	WWINLINE Vector3 operator+() const { return *this; } 
+	WWINLINE Vector3 operator-() const { return(Vector3(-X,-Y,-Z)); }
+	WWINLINE Vector3 operator+() const { return *this; }
 
-	WWINLINE Vector3 & operator += (const Vector3 & v) { X += v.X; Y += v.Y; Z += v.Z; return *this; }	
-	WWINLINE Vector3 & operator -= (const Vector3 & v) { X -= v.X; Y -= v.Y; Z -= v.Z; return *this; }		
+	WWINLINE Vector3 & operator += (const Vector3 & v) { X += v.X; Y += v.Y; Z += v.Z; return *this; }
+	WWINLINE Vector3 & operator -= (const Vector3 & v) { X -= v.X; Y -= v.Y; Z -= v.Z; return *this; }
 	WWINLINE Vector3 & operator *= (float k) { X = X*k; Y=Y*k; Z=Z*k; return *this; }
 	WWINLINE Vector3 & operator /= (float k) { float ook=1.0f/k; X=X*ook; Y=Y*ook; Z=Z*ook; return *this; }
 
@@ -148,7 +143,7 @@ class Vector3
 	// dot product / inner product
 	WWINLINE friend float operator * (const Vector3 &a,const Vector3 &b);
 	static WWINLINE float Dot_Product(const Vector3 &a,const Vector3 &b);
-	
+
 	// cross product / outer product
 	static WWINLINE Vector3 Cross_Product(const Vector3 &a,const Vector3 &b);
 	static WWINLINE void Cross_Product(const Vector3 &a,const Vector3 &b,Vector3 * result);
@@ -159,7 +154,7 @@ class Vector3
 	// add and subtract without return by value
 	static WWINLINE void Add(const Vector3 & a,const Vector3 & b,Vector3 * c);
 	static WWINLINE void Subtract(const Vector3 & a,const Vector3 & b,Vector3 * c);
-	
+
 	// Line intersection functions.
 	static WWINLINE float Find_X_At_Y(float y, const Vector3 &p1, const Vector3 &p2);
 	static WWINLINE float Find_X_At_Z(float z, const Vector3 &p1, const Vector3 &p2);
@@ -188,17 +183,17 @@ class Vector3
 };
 
 
-/************************************************************************** 
- * Scalar Multiply Operator -- Multiply a vector by a scalar              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Scalar Multiply Operator -- Multiply a vector by a scalar              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 WWINLINE Vector3 operator * (const Vector3 &a,float k)
 {
@@ -210,16 +205,16 @@ WWINLINE Vector3 operator * (float k, const Vector3 &a)
 	return Vector3((a.X * k),(a.Y * k),(a.Z * k));
 }
 
-/************************************************************************** 
- * Scalar Division Operator -- Divide a vector by a scalar                * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Scalar Division Operator -- Divide a vector by a scalar                *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE Vector3 operator / (const Vector3 &a,float k)
 {
@@ -227,17 +222,17 @@ WWINLINE Vector3 operator / (const Vector3 &a,float k)
 	return Vector3((a.X * ook),(a.Y * ook),(a.Z * ook));
 }
 
-/************************************************************************** 
- * Vector Addition Operator -- Add two vectors                            * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Vector Addition Operator -- Add two vectors                            *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 WWINLINE Vector3 operator + (const Vector3 &a,const Vector3 &b)
 {
@@ -248,17 +243,17 @@ WWINLINE Vector3 operator + (const Vector3 &a,const Vector3 &b)
 						);
 }
 
-/************************************************************************** 
- * Vector Subtraction Operator -- Subract two vectors                     * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Vector Subtraction Operator -- Subract two vectors                     *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 WWINLINE Vector3 operator - (const Vector3 &a,const Vector3 &b)
 {
@@ -269,21 +264,21 @@ WWINLINE Vector3 operator - (const Vector3 &a,const Vector3 &b)
 						);
 }
 
-/************************************************************************** 
- * Vector Inner Product -- Compute the inner or dot product of two vector * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Inner Product -- Compute the inner or dot product of two vector *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE float operator * (const Vector3 &a,const Vector3 &b)
 {
-	return	a.X*b.X + 
-				a.Y*b.Y + 
+	return	a.X*b.X +
+				a.Y*b.Y +
 				a.Z*b.Z;
 }
 
@@ -293,67 +288,67 @@ WWINLINE float Vector3::Dot_Product(const Vector3 &a,const Vector3 &b)
 }
 
 
-/************************************************************************** 
- * Vector Equality Operator -- Determine if two vectors are identical     * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Equality Operator -- Determine if two vectors are identical     *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool operator == (const Vector3 &a,const Vector3 &b)
 {
 	return ( (a.X == b.X) && (a.Y == b.Y) && (a.Z == b.Z));
 }
 
-/************************************************************************** 
- * Vector Inequality Operator -- Determine if two vectors are identical   * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Inequality Operator -- Determine if two vectors are identical   *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool operator != (const Vector3 &a,const Vector3 &b)
 {
 	return ( (a.X != b.X) || (a.Y != b.Y) || (a.Z != b.Z));
 }
 
-/************************************************************************** 
- * Equal_Within_Epsilon -- Determine if two vectors are identical within e* 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Equal_Within_Epsilon -- Determine if two vectors are identical within e*
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE bool Equal_Within_Epsilon(const Vector3 &a,const Vector3 &b,float epsilon)
 {
-   return(	(WWMath::Fabs(a.X - b.X) < epsilon) && 
-				(WWMath::Fabs(a.Y - b.Y) < epsilon) && 
+   return(	(WWMath::Fabs(a.X - b.X) < epsilon) &&
+				(WWMath::Fabs(a.Y - b.Y) < epsilon) &&
 				(WWMath::Fabs(a.Z - b.Z) < epsilon)	);
 }
 
 
-/************************************************************************** 
- * Cross_Product -- compute the cross product of two vectors              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Cross_Product -- compute the cross product of two vectors              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE Vector3 Vector3::Cross_Product(const Vector3 &a,const Vector3 &b)
 {
@@ -387,21 +382,21 @@ WWINLINE float Vector3::Cross_Product_Z(const Vector3 &a,const Vector3 &b)
    return a.X * b.Y - a.Y * b.X;
 }
 
-/************************************************************************** 
- * Vector3::Normalize -- Normalizes the vector.                           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector3::Normalize -- Normalizes the vector.                           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE void Vector3::Normalize()
 {
 	float len2 = Length2();
-	if (len2 != 0.0f) 
+	if (len2 != 0.0f)
 	{
 		float oolen = WWMath::Inv_Sqrt(len2);
 		X *= oolen;
@@ -414,7 +409,7 @@ WWINLINE void Vector3::Normalize()
 WWINLINE Vector3 Normalize(const Vector3 & vec)
 {
 	float len2 = vec.Length2();
-	if (len2 != 0.0f) 
+	if (len2 != 0.0f)
 	{
 		float oolen = WWMath::Inv_Sqrt(len2);
 		return vec * oolen;
@@ -423,32 +418,32 @@ WWINLINE Vector3 Normalize(const Vector3 & vec)
 }
 #endif
 
-/************************************************************************** 
- * Vector3::Length -- Returns the length of the vector                    * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector3::Length -- Returns the length of the vector                    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE float Vector3::Length() const
 {
 	return WWMath::Sqrt(Length2());
 }
 
-/************************************************************************** 
- * Vector3::Length2 -- Returns the square of the length of the vector     * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector3::Length2 -- Returns the square of the length of the vector     *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 WWINLINE float Vector3::Length2() const
 {
@@ -485,17 +480,17 @@ WWINLINE float Vector3::Quick_Length(void) const
 }
 
 
-/*********************************************************************************************** 
- * Swap -- swap two Vector3's                                                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Swap -- swap two Vector3's                                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Swap(Vector3 & a,Vector3 & b)
 {
@@ -504,17 +499,17 @@ WWINLINE void Swap(Vector3 & a,Vector3 & b)
 	b = tmp;
 }
 
-/*********************************************************************************************** 
- * Lerp -- linearly interpolate two Vector3's by an interpolation factor.                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS: No checking is done to ensure that alpha is between 0 and 1.                      * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Lerp -- linearly interpolate two Vector3's by an interpolation factor.                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS: No checking is done to ensure that alpha is between 0 and 1.                      *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE Vector3 Lerp(const Vector3 & a, const Vector3 & b, float alpha)
 {
@@ -609,7 +604,7 @@ WWINLINE void Vector3::Subtract(const Vector3 &a,const Vector3 &b,Vector3 * set_
  *   10/18/99   gth : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Vector3::Update_Min(const Vector3 & a)
-{	
+{
 	if (a.X < X) X = a.X;
 	if (a.Y < Y) Y = a.Y;
 	if (a.Z < Z) Z = a.Z;
@@ -629,7 +624,7 @@ WWINLINE void Vector3::Update_Min(const Vector3 & a)
  *   10/18/99   gth : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Vector3::Update_Max(const Vector3 & a)
-{	
+{
 	if (a.X > X) X = a.X;
 	if (a.Y > Y) Y = a.Y;
 	if (a.Z > Z) Z = a.Z;
@@ -648,7 +643,7 @@ WWINLINE void Vector3::Update_Max(const Vector3 & a)
  *   11/29/99   wst : Created.                                                                 *
  *=============================================================================================*/
 WWINLINE void Vector3::Cap_Absolute_To(const Vector3 & a)
-{	
+{
 	if (X > 0)
 	{
 		if (a.X < X) X = a.X;
@@ -835,27 +830,27 @@ WWINLINE bool Vector3::Is_Valid(void) const
 	return (WWMath::Is_Valid_Float(X) && WWMath::Is_Valid_Float(Y) && WWMath::Is_Valid_Float(Z));
 }
 
-WWINLINE float Vector3::Find_X_At_Y(float y, const Vector3 &p1, const Vector3 &p2) 
+WWINLINE float Vector3::Find_X_At_Y(float y, const Vector3 &p1, const Vector3 &p2)
 {
 	return(p1.X + ((y - p1.Y) * ((p2.X - p1.X) / (p2.Y - p1.Y))));
 }
-WWINLINE float Vector3::Find_X_At_Z(float z, const Vector3 &p1, const Vector3 &p2) 
+WWINLINE float Vector3::Find_X_At_Z(float z, const Vector3 &p1, const Vector3 &p2)
 {
 	return(p1.X + ((z - p1.Z) * ((p2.X - p1.X) / (p2.Z - p1.Z))));
 }
-WWINLINE float Vector3::Find_Y_At_X(float x, const Vector3 &p1, const Vector3 &p2)  
+WWINLINE float Vector3::Find_Y_At_X(float x, const Vector3 &p1, const Vector3 &p2)
 {
 	return(p1.Y + ((x - p1.X) * ((p2.Y - p1.Y) / (p2.X - p1.X))));
 }
-WWINLINE float Vector3::Find_Y_At_Z(float z, const Vector3 &p1, const Vector3 &p2)  
+WWINLINE float Vector3::Find_Y_At_Z(float z, const Vector3 &p1, const Vector3 &p2)
 {
 	return(p1.Y + ((z - p1.Z) * ((p2.Y - p1.Y) / (p2.Z - p1.Z))));
 }
-WWINLINE float Vector3::Find_Z_At_X(float x, const Vector3 &p1, const Vector3 &p2)  
+WWINLINE float Vector3::Find_Z_At_X(float x, const Vector3 &p1, const Vector3 &p2)
 {
 	return(p1.Z + ((x - p1.X) * ((p2.Z - p1.Z) / (p2.X - p1.X))));
 }
-WWINLINE float Vector3::Find_Z_At_Y(float y, const Vector3 &p1, const Vector3 &p2) 
+WWINLINE float Vector3::Find_Z_At_Y(float y, const Vector3 &p1, const Vector3 &p2)
 {
 	return(p1.Z + ((y - p1.Y) * ((p2.Z - p1.Z) / (p2.Y - p1.Y))));
 }
@@ -901,11 +896,11 @@ WWINLINE float Vector3::Quick_Distance(const Vector3 &p1, const Vector3 &p2)
  * HISTORY:                                                                                    *
  *   11/29/1999MLL: Created.                                                                   *
  *=============================================================================================*/
-WWINLINE unsigned long	Vector3::Convert_To_ABGR( void ) const 
+WWINLINE unsigned long	Vector3::Convert_To_ABGR( void ) const
 {
-	return (unsigned(255)<<24) | 
-			 (unsigned(Z*255.0f)<<16) | 
-			 (unsigned(Y*255.0f)<<8) | 
+	return (unsigned(255)<<24) |
+			 (unsigned(Z*255.0f)<<16) |
+			 (unsigned(Y*255.0f)<<8) |
 			 (unsigned(X*255.0f));
 }
 
@@ -918,13 +913,10 @@ WWINLINE unsigned long	Vector3::Convert_To_ABGR( void ) const
  * HISTORY:                                                                                    *
  *   11/29/1999MLL: Created.                                                                   *
  *=============================================================================================*/
-WWINLINE unsigned long	Vector3::Convert_To_ARGB( void ) const 
+WWINLINE unsigned long	Vector3::Convert_To_ARGB( void ) const
 {
-	return (unsigned(255)<<24) | 
-			 (unsigned(X*255.0f)<<16) | 
-			 (unsigned(Y*255.0f)<<8) | 
+	return (unsigned(255)<<24) |
+			 (unsigned(X*255.0f)<<16) |
+			 (unsigned(Y*255.0f)<<8) |
 			 (unsigned(Z*255.0f));
 }
-
-#endif /* Vector3_H */
-
diff --git a/Core/Tools/WW3D/pluglib/vector3i.h b/Core/Tools/WW3D/pluglib/vector3i.h
index 4fb0988c289..4f65ee531ca 100644
--- a/Core/Tools/WW3D/pluglib/vector3i.h
+++ b/Core/Tools/WW3D/pluglib/vector3i.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VECTOR3I_H
-#define VECTOR3I_H
 
 #include "always.h"
 
@@ -66,29 +60,27 @@ WWINLINE Vector3i::Vector3i(void)
 {
 }
 
-WWINLINE Vector3i::Vector3i(int i,int j,int k) 
-{ 
-	I = i; J = j; K = k; 
+WWINLINE Vector3i::Vector3i(int i,int j,int k)
+{
+	I = i; J = j; K = k;
 }
 
 WWINLINE bool Vector3i::operator == (const Vector3i & v) const
-{ 
-	return (I == v.I && J == v.J && K == v.K);	
+{
+	return (I == v.I && J == v.J && K == v.K);
 }
 
 WWINLINE bool Vector3i::operator !=	(const Vector3i& v) const
-{ 
-	return !(I == v.I && J == v.J && K == v.K);	
+{
+	return !(I == v.I && J == v.J && K == v.K);
 }
 
-WWINLINE const int& Vector3i::operator[] (int n) const				
-{ 
-	return ((int*)this)[n]; 
+WWINLINE const int& Vector3i::operator[] (int n) const
+{
+	return ((int*)this)[n];
 }
 
 WWINLINE int& Vector3i::operator[] (int n)
-{ 
-	return ((int*)this)[n]; 
+{
+	return ((int*)this)[n];
 }
-
-#endif
\ No newline at end of file
diff --git a/Core/Tools/WW3D/pluglib/vector4.h b/Core/Tools/WW3D/pluglib/vector4.h
index 851e70ffa94..620664a313d 100644
--- a/Core/Tools/WW3D/pluglib/vector4.h
+++ b/Core/Tools/WW3D/pluglib/vector4.h
@@ -17,39 +17,34 @@
 */
 
 /* $Header: /Commando/Code/wwmath/vector4.h 12    12/14/99 11:08a Greg_h $ */
-/*************************************************************************** 
- ***                  Confidential - Westwood Studios                    *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Westwood 3D                              * 
- *                                                                         * 
- *                    File Name : VECTOR4.H                                * 
- *                                                                         * 
- *                   Programmer : Greg Hjelstrom                           * 
- *                                                                         * 
- *                   Start Date : 02/24/97                                 * 
- *                                                                         * 
- *                  Last Update : June 2, 1997 [GH]                        * 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- *   Scalar Division Operator -- Divide a vector by a scalar               * 
- *   Scalar Multiply Operator -- Multiply a vector by a scalar             * 
- *   Vector Addition Operator -- Add two vectors                           * 
- *   Vector Subtraction Operator -- Subract two vectors                    * 
- *   Vector Inner Product Operator -- Compute the inner or dot product     * 
- *   Vector Equality Operator -- Detemine if two vectors are identical     * 
- *   Vector Inequality Operator -- Detemine if two vectors are identical   * 
- *   Swap -- swap two Vector4's                                            * 
+/***************************************************************************
+ ***                  Confidential - Westwood Studios                    ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : Westwood 3D                              *
+ *                                                                         *
+ *                    File Name : VECTOR4.h                                *
+ *                                                                         *
+ *                   Programmer : Greg Hjelstrom                           *
+ *                                                                         *
+ *                   Start Date : 02/24/97                                 *
+ *                                                                         *
+ *                  Last Update : June 2, 1997 [GH]                        *
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ *   Scalar Division Operator -- Divide a vector by a scalar               *
+ *   Scalar Multiply Operator -- Multiply a vector by a scalar             *
+ *   Vector Addition Operator -- Add two vectors                           *
+ *   Vector Subtraction Operator -- Subract two vectors                    *
+ *   Vector Inner Product Operator -- Compute the inner or dot product     *
+ *   Vector Equality Operator -- Detemine if two vectors are identical     *
+ *   Vector Inequality Operator -- Detemine if two vectors are identical   *
+ *   Swap -- swap two Vector4's                                            *
  *   Vector4::Is_Valid -- Vector4::Is_Valid                                *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VECTOR4_H
-#define VECTOR4_H
 
 #include "always.h"
 #include "wwmath.h"
@@ -74,14 +69,14 @@ class Vector4
 	Vector4(const Vector4 & v) { X = v.X; Y = v.Y; Z = v.Z; W = v.W; }
 	Vector4(float x, float y, float z, float w) { X = x; Y = y; Z = z; W = w; }
 	Vector4(const float vector[4]) { X = vector[0]; Y = vector[1]; Z = vector[2]; W = vector[3]; }
-	
+
 	// Assignment
-	Vector4 & operator = (const Vector4 & v) { X = v.X; Y = v.Y; Z = v.Z; W = v.W; return *this; }	
+	Vector4 & operator = (const Vector4 & v) { X = v.X; Y = v.Y; Z = v.Z; W = v.W; return *this; }
 	void	Set(float x, float y, float z, float w) { X = x; Y = y; Z = z; W = w; }
-	
+
 	// Array access
-	float &	operator [](int i) { return (&X)[i]; }     
-	const float &  operator [](int i) const { return (&X)[i]; }  
+	float &	operator [](int i) { return (&X)[i]; }
+	const float &  operator [](int i) const { return (&X)[i]; }
 
 	// normalize, compute length
 	void	Normalize(void);
@@ -89,11 +84,11 @@ class Vector4
 	float Length2(void) const;
 
 	// unary operators
-	Vector4 operator-() const { return(Vector4(-X,-Y,-Z,-W)); } 
-	Vector4 operator+() const { return *this; } 
+	Vector4 operator-() const { return(Vector4(-X,-Y,-Z,-W)); }
+	Vector4 operator+() const { return *this; }
 
-	Vector4 & operator += (const Vector4 & v) { X += v.X; Y += v.Y; Z += v.Z; W += v.W; return *this; }	
-	Vector4 & operator -= (const Vector4 & v) { X -= v.X; Y -= v.Y; Z -= v.Z; W += v.W; return *this; }		
+	Vector4 & operator += (const Vector4 & v) { X += v.X; Y += v.Y; Z += v.Z; W += v.W; return *this; }
+	Vector4 & operator -= (const Vector4 & v) { X -= v.X; Y -= v.Y; Z -= v.Z; W += v.W; return *this; }
 	Vector4 & operator *= (float k) { X = X*k; Y=Y*k; Z=Z*k; W=W*k; return *this; }
 	Vector4 & operator /= (float k) { k=1.0f/k; X = X*k; Y=Y*k; Z=Z*k; W=W*k; return *this; }
 
@@ -109,7 +104,7 @@ class Vector4
 	// dot product / inner product
 	friend float operator * (const Vector4 &a,const Vector4 &b);
 	static float Dot_Product(const Vector4 &a,const Vector4 &b);
-	
+
 	// Equality operators
 	friend bool operator == (const Vector4 &a,const Vector4 &b);
 	friend bool operator != (const Vector4 &a,const Vector4 &b);
@@ -118,17 +113,17 @@ class Vector4
 	bool Is_Valid(void) const;
 };
 
-/************************************************************************** 
- * Scalar Multiply Operator -- Multiply a vector by a scalar              * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Scalar Multiply Operator -- Multiply a vector by a scalar              *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 inline Vector4 operator * (const Vector4 &a,float k)
 {
@@ -140,16 +135,16 @@ inline Vector4 operator * (float k, const Vector4 &a)
 	return a*k;
 }
 
-/************************************************************************** 
- * Scalar Division Operator -- Divide a vector by a scalar                * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Scalar Division Operator -- Divide a vector by a scalar                *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline Vector4 operator / (const Vector4 &a,float k)
 {
@@ -157,17 +152,17 @@ inline Vector4 operator / (const Vector4 &a,float k)
 	return Vector4((a[0] * ook),(a[1] * ook),(a[2] * ook),(a[3] * ook));
 }
 
-/************************************************************************** 
- * Vector Addition Operator -- Add two vectors                            * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Vector Addition Operator -- Add two vectors                            *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 inline Vector4 operator + (const Vector4 &a,const Vector4 &b)
 {
@@ -179,17 +174,17 @@ inline Vector4 operator + (const Vector4 &a,const Vector4 &b)
 						);
 }
 
-/************************************************************************** 
- * Vector Subtraction Operator -- Subract two vectors                     * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   02/24/1997 GH  : Created.                                            * 
+/**************************************************************************
+ * Vector Subtraction Operator -- Subract two vectors                     *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   02/24/1997 GH  : Created.                                            *
  *========================================================================*/
 inline Vector4 operator - (const Vector4 &a,const Vector4 &b)
 {
@@ -201,22 +196,22 @@ inline Vector4 operator - (const Vector4 &a,const Vector4 &b)
 						);
 }
 
-/************************************************************************** 
- * Vector Inner Product -- Compute the inner or dot product of two vector * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Inner Product -- Compute the inner or dot product of two vector *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline float operator * (const Vector4 &a,const Vector4 &b)
 {
-	return	a[0]*b[0] + 
-				a[1]*b[1] + 
-				a[2]*b[2] + 
+	return	a[0]*b[0] +
+				a[1]*b[1] +
+				a[2]*b[2] +
 				a[3]*b[3];
 }
 
@@ -226,48 +221,48 @@ inline float Vector4::Dot_Product(const Vector4 &a,const Vector4 &b)
 }
 
 
-/************************************************************************** 
- * Vector Equality Operator -- Detemine if two vectors are identical      * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Equality Operator -- Detemine if two vectors are identical      *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline bool operator == (const Vector4 &a,const Vector4 &b)
 {
 	return ( (a[0] == b[0]) && (a[1] == b[1]) && (a[2] == b[2]) && (a[3] == b[3]));
 }
 
-/************************************************************************** 
- * Vector Inequality Operator -- Detemine if two vectors are identical    * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector Inequality Operator -- Detemine if two vectors are identical    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline bool operator != (const Vector4 &a,const Vector4 &b)
 {
 	return ( (a[0] != b[0]) || (a[1] != b[1]) || (a[2] != b[2]) || (a[3] != b[3]));
 }
 
-/************************************************************************** 
- * Vector4::Normalize -- Normalizes the vector.                           * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector4::Normalize -- Normalizes the vector.                           *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline void Vector4::Normalize()
 {
@@ -290,32 +285,32 @@ inline Vector4 Normalize(const Vector4 & vec)
 	}
 }
 
-/************************************************************************** 
- * Vector4::Length -- Returns the length of the vector                    * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector4::Length -- Returns the length of the vector                    *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline float Vector4::Length() const
 {
 	return WWMath::Sqrt(Length2());
 }
 
-/************************************************************************** 
- * Vector4::Length -- Returns the square of the length of the vector      * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
+/**************************************************************************
+ * Vector4::Length -- Returns the square of the length of the vector      *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
  *========================================================================*/
 inline float Vector4::Length2() const
 {
@@ -323,17 +318,17 @@ inline float Vector4::Length2() const
 }
 
 
-/*********************************************************************************************** 
- * Swap -- swap two Vector4's                                                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/02/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Swap -- swap two Vector4's                                                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/02/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 inline void Swap(Vector4 & a,Vector4 & b)
 {
@@ -342,17 +337,17 @@ inline void Swap(Vector4 & a,Vector4 & b)
 	b = tmp;
 }
 
-/*********************************************************************************************** 
- * Lerp -- linearly interpolate two Vector4's by an interpolation factor.                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS: No checking is done to ensure that alpha is between 0 and 1.                      * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   01/14/1999 NH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Lerp -- linearly interpolate two Vector4's by an interpolation factor.                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS: No checking is done to ensure that alpha is between 0 and 1.                      *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   01/14/1999 NH  : Created.                                                                 *
  *=============================================================================================*/
 inline Vector4 Lerp(const Vector4 & a, const Vector4 & b, float alpha)
 {
@@ -384,7 +379,3 @@ inline bool Vector4::Is_Valid(void) const
 {
 	return (WWMath::Is_Valid_Float(X) && WWMath::Is_Valid_Float(Y) && WWMath::Is_Valid_Float(Z) && WWMath::Is_Valid_Float(W));
 }
-
-
-#endif /* VECTOR4_H */
-
diff --git a/Core/Tools/WW3D/pluglib/visualc.h b/Core/Tools/WW3D/pluglib/visualc.h
index 3adace55276..2d23ad8d837 100644
--- a/Core/Tools/WW3D/pluglib/visualc.h
+++ b/Core/Tools/WW3D/pluglib/visualc.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/visualc.h                              $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/visualc.h                              $*
+ *                                                                                             *
  *                      $Author:: Greg_h                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 5/16/01 4:11p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 9                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
+
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #if defined(_MSC_VER)
 
@@ -89,7 +88,7 @@
 // 'copy constructor could not be generated'
 #pragma warning(disable : 4511)
 
-// 'assignment operator could not be generated' 
+// 'assignment operator could not be generated'
 #pragma warning(disable : 4512)
 
 // 'unreferenced formal parameter'
diff --git a/Core/Tools/WW3D/pluglib/w3d_file.h b/Core/Tools/WW3D/pluglib/w3d_file.h
index d770fdbb199..98f09b88e07 100644
--- a/Core/Tools/WW3D/pluglib/w3d_file.h
+++ b/Core/Tools/WW3D/pluglib/w3d_file.h
@@ -17,32 +17,30 @@
 */
 
 /* $Header: /Commando/Code/ww3d/w3d_file.h 56    8/12/98 11:16a Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d/w3d_file.h                              $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 8/11/98 4:15p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 56                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d/w3d_file.h                              $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 8/11/98 4:15p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 56                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef W3D_FILE_H
-#define W3D_FILE_H
+#pragma once
 
 #include "always.h"
 
 #ifndef BITTYPE_H
-#include "BITTYPE.H"
+#include "BITTYPE.h"
 #endif
 
 
@@ -66,50 +64,50 @@ Version 1.0:
 		W3D_CHUNK_TEXCOORDS,				// array of texture coordinates
 		W3D_CHUNK_MATERIALS,				// array of materials
 		W3D_CHUNK_TRIANGLES,				// array of triangles
-		W3D_CHUNK_SURRENDER_TRIANGLES,// array of surrender format tris	
+		W3D_CHUNK_SURRENDER_TRIANGLES,// array of surrender format tris
 		W3D_CHUNK_MESH_USER_TEXT,		// Name of owning hierarchy, text from the MAX comment field
-		
+
 	HIERARCHY TREES - contained the following chunks:
 		W3D_CHUNK_HIERARCHY_HEADER,
 		W3D_CHUNK_PIVOTS,
-		W3D_CHUNK_PIVOT_FIXUPS,		
+		W3D_CHUNK_PIVOT_FIXUPS,
 
-	HIERARCHY ANIMATIONS - contained the following chunks:  
+	HIERARCHY ANIMATIONS - contained the following chunks:
 		W3D_CHUNK_ANIMATION_HEADER,
 		W3D_CHUNK_ANIMATION_CHANNEL,
 
 	MESH CONNECTIONS - (blueprint for a hierarchical model) contained these chunks:
 
-	 
+
 Version 2.0:
 
-	MESHES: 
+	MESHES:
 
 	- Mesh header now contains the hierarchy model name.  The mesh name will be built
 	as <HModelName>.<MeshName> instead of the old convention: <HTreeName>.<Meshname>
 
-	- The material chunk is replaced with a new material structure which contains 
+	- The material chunk is replaced with a new material structure which contains
 	some information for animating materials.
-	
-	- Vertex Influences link vertices of a mesh to bones in a hierarchy, this is 
-	the information needed for skinning.  
-	
+
+	- Vertex Influences link vertices of a mesh to bones in a hierarchy, this is
+	the information needed for skinning.
+
 	- Damage chunks added.  A damage chunk contains	a new set of materials, a set
 	of vertex offsets, and a set of vertex colors.
-	
+
 	Added the following chunks:
 
-		W3D_CHUNK_VERTEX_COLORS,		
-		W3D_CHUNK_VERTEX_INFLUENCES,	
-		W3D_CHUNK_DAMAGE,					
+		W3D_CHUNK_VERTEX_COLORS,
+		W3D_CHUNK_VERTEX_INFLUENCES,
+		W3D_CHUNK_DAMAGE,
 		W3D_CHUNK_DAMAGE_HEADER,
 			W3D_CHUNK_DAMAGE_MATERIALS,
 			W3D_CHUNK_DAMAGE_VERTICES,
 			W3D_CHUNK_DAMAGE_COLORS,
-		W3D_CHUNK_MATERIALS2,		
+		W3D_CHUNK_MATERIALS2,
 
 	MESH CONNECTIONS: Hierarchy models can now contain skins and collision meshes
-	in addition to the normal meshes.  
+	in addition to the normal meshes.
 
 		W3D_CHUNK_COLLISION_CONNECTION,		// collision meshes connected to the hierarchy
 		W3D_CHUNK_SKIN_CONNECTION,				// skins connected to the hierarchy
@@ -129,14 +127,14 @@ Dec 12, 1997
 Feb 6, 1998
 
 	Added W3D_CHUNK_SECTMESH and its sub-chunks.  This will be the file
-	format for the terrain geometry exported from POV's Atlas tool.  
+	format for the terrain geometry exported from POV's Atlas tool.
 
 March 29, 1998 : Version 3.0
 
 	- New material chunk which supports the new features of the 3D engine
 	- Modified HTrees to always have a root transform to remove all of the
 	  special case -1 bone indexes.
-	- Added new mesh types, A mesh can now be categorized as: normal, 
+	- Added new mesh types, A mesh can now be categorized as: normal,
 	  aligned, skin, collision, or shadow.
 
 June 22, 1998
@@ -145,9 +143,9 @@ June 22, 1998
 
 	Adding a new type of object: The 'Tilemap'.  This simple-sounding object
 	is a binary partition tree of tiles where tiles are rectangular regions of
-	space.  In each leaf to the tree, a mesh is referenced.  The tile map is 
+	space.  In each leaf to the tree, a mesh is referenced.  The tile map is
 	made of several chunks:
-	
+
 	- W3D_CHUNK_TILEMAP
 		- W3D_CHUNK_TILEMAP_HEADER
 		- W3D_CHUNK_TILES
@@ -199,20 +197,20 @@ enum {
 		W3D_CHUNK_MATERIALS,				// array of materials
 		O_W3D_CHUNK_TRIANGLES,			// array of triangles (obsolete)
 		O_W3D_CHUNK_QUADRANGLES,		// array of quads (obsolete)
-		W3D_CHUNK_SURRENDER_TRIANGLES,// array of surrender format tris	
+		W3D_CHUNK_SURRENDER_TRIANGLES,// array of surrender format tris
 		O_W3D_CHUNK_POV_TRIANGLES,		// POV format triangles (obsolete)
 		O_W3D_CHUNK_POV_QUADRANGLES,	// POV format quads (obsolete)
 		W3D_CHUNK_MESH_USER_TEXT,		// Name of owning hierarchy, text from the MAX comment field
 		W3D_CHUNK_VERTEX_COLORS,		// Pre-set vertex coloring
 		W3D_CHUNK_VERTEX_INFLUENCES,	// Mesh Deformation vertex connections
-		W3D_CHUNK_DAMAGE,					// Mesh damage, new set of materials, vertex positions, vertex colors	
+		W3D_CHUNK_DAMAGE,					// Mesh damage, new set of materials, vertex positions, vertex colors
 			W3D_CHUNK_DAMAGE_HEADER,		// Header for the damage data, tells what is coming
 			W3D_CHUNK_DAMAGE_VERTICES,		// Array of modified vertices (W3dMeshDamageVertexStruct's)
 			W3D_CHUNK_DAMAGE_COLORS,		// Array of modified vert colors (W3dMeshDamageColorStruct's)
 			O_W3D_CHUNK_DAMAGE_MATERIALS,	// (OBSOLETE) Damage materials simply wrapped with MATERIALS3 or higher
-			
+
 		W3D_CHUNK_MATERIALS2,			// array of version 2 materials (with animation frame counts)
-		
+
 		W3D_CHUNK_MATERIALS3,			// array of version 3 materials (all new surrender features supported)
 			W3D_CHUNK_MATERIAL3,					// Each version 3 material wrapped with this chunk ID
 				W3D_CHUNK_MATERIAL3_NAME,				// Name of the material (array of chars, null terminated)
@@ -270,16 +268,16 @@ struct W3dChunkHeader
 /********************************************************************************
 
 	WTM ( Westwood Triangle Mesh )
-		
+
 	Each mesh will be contained within a WTM_CHUNK_MESH within
 	this chunk will be the following chunks:
 
-	The header will be the first chunk and it tells general 
+	The header will be the first chunk and it tells general
 	information about the mesh such as how many triangles there
 	are, how many vertices, the bounding box, center
-	of mass, inertia matrix, etc.  
+	of mass, inertia matrix, etc.
 
-	The vertex array is an array of Vectors giving the object 
+	The vertex array is an array of Vectors giving the object
 	space location of each vertex
 
 	The normal array is an array of all of the unique vertex
@@ -292,7 +290,7 @@ struct W3dChunkHeader
 	version of surrender can only handle one vertex normal per vertex.
 	In this case, the application should skip the normal array chunk
 	and read the surrender normal chunk into its SR_VERTs
-	
+
 	The texture coord array is all of the unique texture coordinates
 	for the mesh.  This allows triangles to share vertices but not
 	necessarily share texture coordinates.
@@ -301,12 +299,12 @@ struct W3dChunkHeader
 	all of the unique materials used by the mesh.  All triangles will
 	have a material index into this list.
 
-	The triangle array is all of the triangles which make up the 
+	The triangle array is all of the triangles which make up the
 	mesh.  Each triangle has 3 indices to its vertices, vertex normals,
 	and texture coordinates.  Each also has a material id and the
 	coefficients for its plane equation.
 
-	The Surrender Triangle array is all of the triangles in a slightly 
+	The Surrender Triangle array is all of the triangles in a slightly
 	different format.  Surrender triangles contain their u-v coordinates
 	so there is no indirection and no possibility for sharing.  To
 	make the importer faster, the triangles will also be stored in this
@@ -382,7 +380,7 @@ struct W3dMaterial2Struct
 	uint8	 		Red;									// Rgb colors
 	uint8	 		Green;
 	uint8	 		Blue;
-	uint8			Alpha;								
+	uint8			Alpha;
 
 	uint16		PrimaryNumFrames;					// number of animated frames (if 1, not animated)
 	uint16		SecondaryNumFrames;				// number of animated frames (if 1, not animated)
@@ -423,7 +421,7 @@ struct W3dMaterial2Struct
 #define		W3DMAPPING_ENVIRONMENT									1
 
 /////////////////////////////////////////////////////////////////////////////////////////////
-// Version 3.0 Material, A W3D_CHUNK_MATERIALS3 chunk will wrap a bunch of 
+// Version 3.0 Material, A W3D_CHUNK_MATERIALS3 chunk will wrap a bunch of
 // W3D_CHUNK_MATERIAL3 chunks.  Inside each chunk will be a name chunk, an 'info' chunk which
 // contains the following struct, and one or more map chunks. a mesh with 2 materials might
 // look like:
@@ -435,19 +433,19 @@ struct W3dMaterial2Struct
 //			W3D_CHUNK_MATERIAL3_DC_MAP		<-- a map, W3dMap3Struct
 //				W3D_CHUNK_STRING				<-- filename of the map
 //				W3D_CHUNK_MAP_INFO			<-- map parameters
-//			W3D_CHUNK_MATERIAL3_SC_MAP        
+//			W3D_CHUNK_MATERIAL3_SC_MAP
 //				W3D_CHUNK_STRING				<-- filename of the map
 //				W3D_CHUNK_MAP_INFO
 //		W3D_CHUNK_MATERIAL3
 //			W3D_CHUNK_MATERIAL3_NAME
 //			W3D_CHUNK_MATERIAL3_INFO
 //			W3D_CHUNK_MATERIAL3_SI_MAP
-//		
+//
 /////////////////////////////////////////////////////////////////////////////////////////////
 struct W3dMaterial3Struct
 {
 	uint32					Attributes;					// flags,hints,etc.
-	
+
 	W3dRGBStruct			DiffuseColor;				// diffuse color
 	W3dRGBStruct			SpecularColor;				// specular color
 
@@ -506,7 +504,7 @@ struct W3dTriStruct
 /////////////////////////////////////////////////////////////////////////////////////////////
 #define W3D_MESH_FLAG_NONE									0x00000000			// plain ole normal mesh
 #define W3D_MESH_FLAG_COLLISION_BOX						0x00000001			// mesh is a collision box (should be 8 verts, should be hidden, etc)
-#define W3D_MESH_FLAG_SKIN									0x00000002			// skin mesh 
+#define W3D_MESH_FLAG_SKIN									0x00000002			// skin mesh
 #define W3D_MESH_FLAG_SHADOW								0x00000004			// intended to be projected as a shadow
 #define W3D_MESH_FLAG_ALIGNED								0x00000008			// always aligns with camera
 
@@ -526,7 +524,7 @@ struct W3dMeshHeaderStruct
 	uint32					Version;							// Currently version 0x100
 	char						MeshName[W3D_NAME_LEN];		// name of the mesh (Null terminated)
 	uint32					Attributes;
-	
+
 	//
 	// Counts, these can be regarded as an inventory of what is to come in the file.
 	//
@@ -536,7 +534,7 @@ struct W3dMeshHeaderStruct
 
 	uint32					NumPovTris;			// (NOT USED)
 	uint32					NumPovQuads;		// (NOT USED)
-	
+
 	uint32					NumVertices;		// number of unique vertices
 	uint32					NumNormals;			// number of unique normals (OBSOLETE!)
 	uint32					NumSrNormals;		// number of surrender normals (MUST EQUAL NumVertices or 0)
@@ -563,13 +561,13 @@ struct W3dMeshHeaderStruct
 	W3dVectorStruct		SphCenter;			// Center of bounding sphere
 	float32					SphRadius;			// Bounding sphere radius
 
-	// 
+	//
 	// Default transformation
 	//
 	W3dVectorStruct		Translation;
 	float32					Rotation[9];
 
-	// 
+	//
 	// Physics Properties
 	//
 	W3dVectorStruct		MassCenter;			// Center of mass in object space
@@ -587,7 +585,7 @@ struct W3dMeshHeaderStruct
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 // Version 3 Mesh Header, trimmed out some of the junk that was in the
-// previous versions.  
+// previous versions.
 /////////////////////////////////////////////////////////////////////////////////////////////
 #define W3D_VERTEX_CHANNEL_LOCATION		0x00000001	// object-space location of the vertex
 #define W3D_VERTEX_CHANNEL_NORMAL		0x00000002	// object-space normal for the vertex
@@ -599,10 +597,10 @@ struct W3dMeshHeaderStruct
 
 struct W3dMeshHeader3Struct
 {
-	uint32					Version;							
+	uint32					Version;
 	uint32					Attributes;
-	
-	char						MeshName[W3D_NAME_LEN];		
+
+	char						MeshName[W3D_NAME_LEN];
 	char						HierarchyModelName[W3D_NAME_LEN];
 
 	//
@@ -616,7 +614,7 @@ struct W3dMeshHeader3Struct
 
 	uint32					VertexChannels;	// bits for presence of types of per-vertex info
 	uint32					FaceChannels;		// bits for presence of types of per-face info
-	
+
 	//
 	// Bounding volumes
 	//
@@ -630,7 +628,7 @@ struct W3dMeshHeader3Struct
 //
 // Vertex Influences.  For "skins" each vertex can be associated with a
 // different bone.
-// 
+//
 struct W3dVertInfStruct
 {
 	uint16					BoneIdx;
@@ -648,7 +646,7 @@ struct W3dMeshDamageStruct
 	uint32					NumDamageVerts;		// number of vertices to replace
 	uint32					NumDamageColors;		// number of vertex colors to replace
 	uint32					DamageIndex;			// what index is this damage chunk assigned to
-	uint32					FutureUse[4];	
+	uint32					FutureUse[4];
 };
 
 struct W3dMeshDamageVertexStruct
@@ -669,12 +667,12 @@ struct W3dMeshDamageColorStruct
 	WHT ( Westwood Hierarchy Tree )
 
 	A hierarchy tree defines a set of coordinate systems which are connected
-	hierarchically.  The header defines the name, number of pivots, etc.  
+	hierarchically.  The header defines the name, number of pivots, etc.
 	The pivots chunk will contain a W3dPivotStructs for each node in the
-	tree.  
-	
+	tree.
+
 	The W3dPivotFixupStruct contains a transform for each MAX coordinate
-	system and our version of that same coordinate system (bone).  It is 
+	system and our version of that same coordinate system (bone).  It is
 	needed when the user exports the base pose using "Translation Only".
 	These are the matrices which go from the MAX rotated coordinate systems
 	to a system which is unrotated in the base pose.  These transformations
@@ -685,7 +683,7 @@ struct W3dMeshDamageColorStruct
 
 	What are the "fixup" matrices?  These are the transforms which
 	were applied to the base pose when the user wanted to force the
-	base pose to use only matrices with certain properties.  For 
+	base pose to use only matrices with certain properties.  For
 	example, if we wanted the base pose to use translations only,
 	the fixup transform for each node is a transform which when
 	multiplied by the real node's world transform, yeilds a pure
@@ -701,8 +699,8 @@ struct W3dHierarchyStruct
 {
 	uint32					Version;
 	char						Name[W3D_NAME_LEN];	// Name of the hierarchy
-	uint32					NumPivots;				
-	W3dVectorStruct		Center;					
+	uint32					NumPivots;
+	W3dVectorStruct		Center;
 };
 
 struct W3dPivotStruct
@@ -724,9 +722,9 @@ struct W3dPivotFixupStruct
 
 	WHA (Westwood Hierarchy Animation)
 
-	A Hierarchy Animation is a set of data defining deltas from the base 
+	A Hierarchy Animation is a set of data defining deltas from the base
 	position of a hierarchy tree.  Translation and Rotation channels can be
-	attached to any node of the hierarchy tree which the animation is 
+	attached to any node of the hierarchy tree which the animation is
 	associated with.
 
 ********************************************************************************/
@@ -734,13 +732,13 @@ struct W3dPivotFixupStruct
 struct W3dAnimHeaderStruct
 {
 	uint32					Version;
-	char						Name[W3D_NAME_LEN];				
+	char						Name[W3D_NAME_LEN];
 	char						HierarchyName[W3D_NAME_LEN];
 	uint32					NumFrames;
 	uint32					FrameRate;
 };
 
-enum 
+enum
 {
 	ANIM_CHANNEL_X = 0,
 	ANIM_CHANNEL_Y,
@@ -753,8 +751,8 @@ enum
 
 struct W3dAnimChannelStruct
 {
-	uint16					FirstFrame;			
-	uint16					LastFrame;			
+	uint16					FirstFrame;
+	uint16					LastFrame;
 	uint16					VectorLen;			// length of each vector in this channel
 	uint16					Flags;				// channel type.
 	uint16					Pivot;				// pivot affected by this channel
@@ -762,7 +760,7 @@ struct W3dAnimChannelStruct
 	float32					Data[1];				// will be (LastFrame - FirstFrame + 1) * VectorLen long
 };
 
-enum 
+enum
 {
 	BIT_CHANNEL_VIS = 0,							// turn meshes on and off depending on anim frame.
 };
@@ -770,7 +768,7 @@ enum
 struct W3dBitChannelStruct
 {
 	uint16					FirstFrame;			// all frames outside "First" and "Last" are assumed = DefaultVal
-	uint16					LastFrame;			
+	uint16					LastFrame;
 	uint16					Flags;				// channel type.
 	uint16					Pivot;				// pivot affected by this channel
 	uint8						DefaultVal;			// default state when outside valid range.
@@ -781,7 +779,7 @@ struct W3dBitChannelStruct
 
 	(HModel - Hiearchy Model)
 
-	A Hierarchy Model is a set of render objects which should be attached to 
+	A Hierarchy Model is a set of render objects which should be attached to
 	bones in a hierarchy tree.  There can be multiple objects per node
 	in the tree.  Or there may be no objects attached to a particular bone.
 
@@ -792,7 +790,7 @@ struct W3dHModelHeaderStruct
 	uint32					Version;
 	char						Name[W3D_NAME_LEN];				// Name of this connection set (NULL terminated)
 	char						HierarchyName[W3D_NAME_LEN];	// Name of hierarchy associated with these connections (NULL terminated)
-	uint16					NumConnections;				
+	uint16					NumConnections;
 };
 
 struct W3dHModelAuxDataStruct
@@ -806,7 +804,7 @@ struct W3dHModelAuxDataStruct
 
 	float32					LODMin;
 	float32					LODMax;
-	uint32					FutureUse[32];	
+	uint32					FutureUse[32];
 };
 
 struct W3dHModelNodeStruct
@@ -830,10 +828,10 @@ struct W3dLODModelHeaderStruct
 {
 	uint32					Version;
 	char						Name[W3D_NAME_LEN];				// Name of this LOD Model
-	uint16					NumLODs;				
+	uint16					NumLODs;
 };
 
-struct W3dLODStruct 
+struct W3dLODStruct
 {
 	char						RenderObjName[2*W3D_NAME_LEN];
 	float32					LODMin;								// "artist" inspired switching distances
@@ -883,7 +881,3 @@ struct W3dTileMapPartitionStruct
 	W3dVectorStruct	Min;							// min corner of the bounding box
 	W3dVectorStruct	Max;							// max corner of the bounding box
 };
-
-
-
-#endif
diff --git a/Core/Tools/WW3D/pluglib/w3dquat.cpp b/Core/Tools/WW3D/pluglib/w3dquat.cpp
index 60d6ed4dbf7..f50922fbe5a 100644
--- a/Core/Tools/WW3D/pluglib/w3dquat.cpp
+++ b/Core/Tools/WW3D/pluglib/w3dquat.cpp
@@ -17,32 +17,32 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/w3dquat.cpp 29    2/03/00 4:55p Jason_a $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Voxel Technology                                             * 
- *                                                                                             * 
- *                    File Name : QUAT.CPP                                                     * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 02/24/97                                                     * 
- *                                                                                             * 
- *                  Last Update : February 28, 1997 [GH]                                       * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   Quaternion::Quaternion -- constructor                                                     * 
- *   Quaternion::Set -- Set the quaternion                                                     * 
- *   Quaternion::operator= -- Assignment operator                                              * 
- *   Quaternion::Make_Closest -- Use nearest representation to the given quaternion.           * 
- *   Trackball -- Computes a "trackball" quaternion given 2D mouse coordinates                 * 
- *   Axis_To_Quat -- Creates a quaternion given an axis and angle of rotation                  * 
- *   Slerp -- Spherical Linear interpolation!                                                  * 
- *   Build_Quaternion -- Creates a quaternion from a Matrix                                    * 
- *   Build_Matrix -- Creates a Matrix from a Quaternion                                        * 
- *   Normalize -- normalizes a quaternion                                                      * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Voxel Technology                                             *
+ *                                                                                             *
+ *                    File Name : QUAT.cpp                                                     *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 02/24/97                                                     *
+ *                                                                                             *
+ *                  Last Update : February 28, 1997 [GH]                                       *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   Quaternion::Quaternion -- constructor                                                     *
+ *   Quaternion::Set -- Set the quaternion                                                     *
+ *   Quaternion::operator= -- Assignment operator                                              *
+ *   Quaternion::Make_Closest -- Use nearest representation to the given quaternion.           *
+ *   Trackball -- Computes a "trackball" quaternion given 2D mouse coordinates                 *
+ *   Axis_To_Quat -- Creates a quaternion given an axis and angle of rotation                  *
+ *   Slerp -- Spherical Linear interpolation!                                                  *
+ *   Build_Quaternion -- Creates a quaternion from a Matrix                                    *
+ *   Build_Matrix -- Creates a Matrix from a Quaternion                                        *
+ *   Normalize -- normalizes a quaternion                                                      *
  *   Quaternion::Quaternion -- constructor                                                     *
  *   Slerp_Setup -- Get ready to call "Cached_Slerp"                                           *
  *   Cached_Slerp -- Quaternion slerping, optimized with cached values                         *
@@ -78,7 +78,7 @@ static float project_to_sphere(float,float,float);
  *                                                                                             *
  * INPUT:                                                                                      *
  * axis - axis of the rotation                                                                 *
- * angle - rotation angle                                                                      * 
+ * angle - rotation angle                                                                      *
  *                                                                                             *
  * OUTPUT:                                                                                     *
  *                                                                                             *
@@ -98,17 +98,17 @@ Quaternion::Quaternion(const Vector3 & axis,float angle)
 }
 
 
-/*********************************************************************************************** 
- * Quaternion::Normalize -- Normalize to a unit quaternion                                     * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Quaternion::Normalize -- Normalize to a unit quaternion                                     *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void Quaternion::Normalize()
 {
@@ -124,17 +124,17 @@ void Quaternion::Normalize()
 	}
 }
 
-/*********************************************************************************************** 
- * Quaternion::operator= -- Assignment operator                                                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/24/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Quaternion::operator= -- Assignment operator                                                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/24/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Quaternion & Quaternion::operator = (const Quaternion & source)
 {
@@ -146,17 +146,17 @@ Quaternion & Quaternion::operator = (const Quaternion & source)
   return *this;
 }
 
-/*********************************************************************************************** 
- * Q::Make_Closest -- Use nearest representation to the given quaternion.                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Q::Make_Closest -- Use nearest representation to the given quaternion.                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Quaternion & Quaternion::Make_Closest(const Quaternion & qto)
 {
@@ -169,31 +169,31 @@ Quaternion & Quaternion::Make_Closest(const Quaternion & qto)
 		Z = -Z;
 		W = -W;
 	}
-	
+
 	return *this;
 }
 
-/*********************************************************************************************** 
- * Trackball -- Computes a "trackball" quaternion given 2D mouse coordinates                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * x0,y0 - x1,y1 - "normalized" mouse coordinates for the mouse movement                       * 
- * sphsize - size of the trackball sphere                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- * a quaternion representing the rotation of a trackball                                       * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Trackball -- Computes a "trackball" quaternion given 2D mouse coordinates                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * x0,y0 - x1,y1 - "normalized" mouse coordinates for the mouse movement                       *
+ * sphsize - size of the trackball sphere                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ * a quaternion representing the rotation of a trackball                                       *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Quaternion Trackball(float x0, float y0, float x1, float y1, float sphsize)
 {
 	Vector3	a;
 	Vector3	p1;
 	Vector3	p2;
-	Vector3	d;	
+	Vector3	d;
 
 	float phi,t;
 
@@ -229,22 +229,22 @@ Quaternion Trackball(float x0, float y0, float x1, float y1, float sphsize)
 }
 
 
-/*********************************************************************************************** 
- * Axis_To_Quat -- Creates a quaternion given an axis and angle of rotation                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Axis_To_Quat -- Creates a quaternion given an axis and angle of rotation                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Quaternion Axis_To_Quat(const Vector3 &a, float phi)
 {
 	Quaternion q;
-	Vector3 tmp = a;  
+	Vector3 tmp = a;
 
 	tmp.Normalize();
 	q[0] = tmp[0];
@@ -257,29 +257,29 @@ Quaternion Axis_To_Quat(const Vector3 &a, float phi)
 	return q;
 }
 
-/*********************************************************************************************** 
- * Slerp -- Spherical Linear interpolation!                                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *  p - start quaternion                                                                       * 
- *  q - end quaternion                                                                         * 
- *  alpha - interpolating parameter                                                            * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Slerp -- Spherical Linear interpolation!                                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *  p - start quaternion                                                                       *
+ *  q - end quaternion                                                                         *
+ *  alpha - interpolating parameter                                                            *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Quaternion Slerp(const Quaternion & p,const Quaternion & q,float alpha)
-{		
+{
 	float beta;				// complementary interploation parameter
 	float theta;				// angle between p and q
 	float sin_t,cos_t; 		// sine, cosine of theta
 	float oo_sin_t;
 	int qflip;					// use flip of q?
-	
+
 	// cos theta = dot product of p and q
 	cos_t = p.X * q.X + p.Y * q.Y + p.Z * q.Z + p.W * q.W;
 
@@ -336,7 +336,7 @@ Quaternion Slerp(const Quaternion & p,const Quaternion & q,float alpha)
 void Slerp_Setup(const Quaternion & p,const Quaternion & q,SlerpInfoStruct * slerpinfo)
 {
 	float cos_t;
-	
+
 	assert(slerpinfo != NULL);
 
 	// cos theta = dot product of p and q
@@ -361,7 +361,7 @@ void Slerp_Setup(const Quaternion & p,const Quaternion & q,SlerpInfoStruct * sle
 		slerpinfo->Linear = false;
 		slerpinfo->Theta = acos(cos_t);
 		slerpinfo->SinT = sinf(slerpinfo->Theta);
-	
+
 	}
 }
 
@@ -438,18 +438,18 @@ void Cached_Slerp(const Quaternion & p,const Quaternion & q,float alpha,SlerpInf
 	set_q->W = beta*p.W + alpha*q.W;
 }
 
-/*********************************************************************************************** 
- * Build_Quaternion -- Creates a quaternion from a Matrix                                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
+/***********************************************************************************************
+ * Build_Quaternion -- Creates a quaternion from a Matrix                                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
  *   Matrix MUST NOT have scaling!                                                             *
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/28/1997 GH  : Created.                                                                 * 
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Quaternion Build_Quaternion(const Matrix3D & mat)
 {
@@ -459,7 +459,7 @@ Quaternion Build_Quaternion(const Matrix3D & mat)
 
 	// sum the diagonal of the rotation matrix
 	tr = mat[0][0] + mat[1][1] + mat[2][2];
-	
+
 	if (tr > 0.0f) {
 
 		s = sqrt(tr + 1.0);
@@ -486,7 +486,7 @@ Quaternion Build_Quaternion(const Matrix3D & mat)
 		}
 
 		q[3] = 	( mat[k][j] - mat[j][k] ) * s;
-		q[j] =	( mat[j][i] + mat[i][j] ) * s;    
+		q[j] =	( mat[j][i] + mat[i][j] ) * s;
 		q[k] =	( mat[k][i] + mat[i][k] ) * s;
 
 	}
@@ -502,7 +502,7 @@ Quaternion Build_Quaternion(const Matrix3 & mat)
 
 	// sum the diagonal of the rotation matrix
 	tr = mat[0][0] + mat[1][1] + mat[2][2];
-	
+
 	if (tr > 0.0) {
 
 		s = sqrt(tr + 1.0);
@@ -512,7 +512,7 @@ Quaternion Build_Quaternion(const Matrix3 & mat)
 		q[0] = (mat[2][1] - mat[1][2]) * s;
 		q[1] = (mat[0][2] - mat[2][0]) * s;
 		q[2] = (mat[1][0] - mat[0][1]) * s;
-	
+
 	} else {
 
 		i = 0;
@@ -525,16 +525,16 @@ Quaternion Build_Quaternion(const Matrix3 & mat)
 		s = sqrt( (mat[i][i] - (mat[j][j]+mat[k][k])) + 1.0);
 
 		q[i] =	s * 0.5;
-		
+
 		if (s != 0.0) {
 			s = 0.5/s;
 		}
 
 		q[3] = 	( mat[k][j] - mat[j][k] ) * s;
-		q[j] =	( mat[j][i] + mat[i][j] ) * s;    
+		q[j] =	( mat[j][i] + mat[i][j] ) * s;
 		q[k] =	( mat[k][i] + mat[i][k] ) * s;
 	}
-	
+
 	return q;
 }
 
@@ -546,7 +546,7 @@ Quaternion Build_Quaternion(const Matrix4 & mat)
 
 	// sum the diagonal of the rotation matrix
 	tr = mat[0][0] + mat[1][1] + mat[2][2];
-	
+
 	if (tr > 0.0) {
 
 		s = sqrt(tr + 1.0);
@@ -556,10 +556,10 @@ Quaternion Build_Quaternion(const Matrix4 & mat)
 		q[0] = (mat[2][1] - mat[1][2]) * s;
 		q[1] = (mat[0][2] - mat[2][0]) * s;
 		q[2] = (mat[1][0] - mat[0][1]) * s;
-	
+
 	} else {
 
-		i = 0; 
+		i = 0;
 		if (mat[1][1] > mat[0][0]) i = 1;
 		if (mat[2][2] > mat[i][i]) i = 2;
 
@@ -573,25 +573,25 @@ Quaternion Build_Quaternion(const Matrix4 & mat)
 			s = 0.5/s;
 		}
 		q[3] = 	( mat[k][j] - mat[j][k] ) * s;
-		q[j] =	( mat[j][i] + mat[i][j] ) * s;    
+		q[j] =	( mat[j][i] + mat[i][j] ) * s;
 		q[k] =	( mat[k][i] + mat[i][k] ) * s;
 	}
-	
+
 	return q;
 }
 
 
-/*********************************************************************************************** 
- * Build_Matrix -- Creates a Matrix from a Quaternion                                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * Build_Matrix -- Creates a Matrix from a Quaternion                                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/28/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 Matrix3	Build_Matrix3(const Quaternion & q)
 {
@@ -660,22 +660,22 @@ Matrix4 Build_Matrix4(const Quaternion & q)
 	m[3][3] = 1.0f;
 	return m;
 }
-  
+
 void Quaternion::Rotate_X(float theta)
 {
-	// TODO: optimize this 
+	// TODO: optimize this
 	*this = (*this) * Quaternion(Vector3(1,0,0),theta);
 }
 
 void Quaternion::Rotate_Y(float theta)
 {
-	// TODO: optimize this 
+	// TODO: optimize this
 	*this = (*this) * Quaternion(Vector3(0,1,0),theta);
 }
 
 void Quaternion::Rotate_Z(float theta)
 {
-	// TODO: optimize this 
+	// TODO: optimize this
 	*this = (*this) * Quaternion(Vector3(0,0,1),theta);
 }
 
@@ -702,7 +702,7 @@ void Quaternion::Randomize(void)
 	Y = ((float) (rand() & 0xFFFF)) / 65536.0f;
 	Z = ((float) (rand() & 0xFFFF)) / 65536.0f;
 	W = ((float) (rand() & 0xFFFF)) / 65536.0f;
-	
+
 	Normalize();
 }
 
diff --git a/Core/Tools/WW3D/pluglib/w3dquat.h b/Core/Tools/WW3D/pluglib/w3dquat.h
index 57780fb420f..b0ddb01e276 100644
--- a/Core/Tools/WW3D/pluglib/w3dquat.h
+++ b/Core/Tools/WW3D/pluglib/w3dquat.h
@@ -17,30 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/w3dquat.h 27    2/03/00 4:55p Jason_a $ */
-/*************************************************************************** 
- ***                  Confidential - Westwood Studios                    *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Voxel Technology                         * 
- *                                                                         * 
- *                    File Name : QUAT.H                                   * 
- *                                                                         * 
- *                   Programmer : Greg Hjelstrom                           * 
- *                                                                         * 
- *                   Start Date : 02/24/97                                 * 
- *                                                                         * 
- *                  Last Update : February 24, 1997 [GH]                   * 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***                  Confidential - Westwood Studios                    ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : Voxel Technology                         *
+ *                                                                         *
+ *                    File Name : QUAT.h                                   *
+ *                                                                         *
+ *                   Programmer : Greg Hjelstrom                           *
+ *                                                                         *
+ *                   Start Date : 02/24/97                                 *
+ *                                                                         *
+ *                  Last Update : February 24, 1997 [GH]                   *
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef QUAT_H
-#define QUAT_H
 
 #include "always.h"
 #include "wwmath.h"
@@ -74,13 +69,13 @@ class Quaternion
 	void		Scale(float s) { X = (float)(s*X); Y = (float)(s*Y); Z = (float)(s*Z); W = (float)(s*W); }
 
 	// Array access
-	float &	operator [](int i) { return (&X)[i]; }     
-	const float &  operator [](int i) const { return (&X)[i]; }  
+	float &	operator [](int i) { return (&X)[i]; }
+	const float &  operator [](int i) const { return (&X)[i]; }
 
-	// Unary operators.  
-	// Remember that q and -q represent the same 3D rotation.  
-	Quaternion operator-() const { return(Quaternion(-X,-Y,-Z,-W)); } 
-	Quaternion operator+() const { return *this; } 
+	// Unary operators.
+	// Remember that q and -q represent the same 3D rotation.
+	Quaternion operator-() const { return(Quaternion(-X,-Y,-Z,-W)); }
+	Quaternion operator+() const { return *this; }
 
 	// Every 3D rotation can be expressed by two different quaternions,  This
 	// function makes the current quaternion convert itself to the representation
@@ -237,7 +232,7 @@ inline Vector3 Quaternion::Rotate_Vector(const Vector3 & v) const
 inline void Quaternion::Rotate_Vector(const Vector3 & v,Vector3 * result) const
 {
 	assert(result != NULL);
-	
+
 	float x = W*v.X + (Y*v.Z - v.Y*Z);
 	float y = W*v.Y - (X*v.Z - v.X*Z);
 	float z = W*v.Z + (X*v.Y - v.X*Y);
@@ -250,13 +245,8 @@ inline void Quaternion::Rotate_Vector(const Vector3 & v,Vector3 * result) const
 
 inline bool Quaternion::Is_Valid(void) const
 {
-	return (	WWMath::Is_Valid_Float(X) && 
-				WWMath::Is_Valid_Float(Y) && 
+	return (	WWMath::Is_Valid_Float(X) &&
+				WWMath::Is_Valid_Float(Y) &&
 				WWMath::Is_Valid_Float(Z) &&
 				WWMath::Is_Valid_Float(W) );
 }
-
-#endif /* QUAT_H */
-
-
-
diff --git a/Core/Tools/WW3D/pluglib/watcom.h b/Core/Tools/WW3D/pluglib/watcom.h
index 9c213932cde..9acc099e263 100644
--- a/Core/Tools/WW3D/pluglib/watcom.h
+++ b/Core/Tools/WW3D/pluglib/watcom.h
@@ -16,26 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wwlib/WATCOM.H                                           $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wwlib/WATCOM.h                                           $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 4/02/99 11:56a                                              $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 3                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
+
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #if !defined(WATCOM_H) && defined(__WATCOMC__)
 #define WATCOM_H
diff --git a/Core/Tools/WW3D/pluglib/win.h b/Core/Tools/WW3D/pluglib/win.h
index 0614e0b41c3..ecd1c7a64d3 100644
--- a/Core/Tools/WW3D/pluglib/win.h
+++ b/Core/Tools/WW3D/pluglib/win.h
@@ -16,36 +16,32 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/win.h                                  $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/win.h                                  $*
+ *                                                                                             *
  *                      $Author:: Denzil_l                                                    $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 6/26/01 1:59p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 10                                                          $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef WIN_H
-#define WIN_H
+#pragma once
 
 /*
 **	This header file includes the Windows headers. If there are any special pragmas that need
 **	to occur around this process, they are performed here. Typically, certain warnings will need
 **	to be disabled since the Windows headers are repleat with illegal and dangerous constructs.
 **
-**	Within the windows headers themselves, Microsoft has disabled the warnings 4290, 4514, 
+**	Within the windows headers themselves, Microsoft has disabled the warnings 4290, 4514,
 **	4069, 4200, 4237, 4103, 4001, 4035, 4164. Makes you wonder, eh?
 */
 
@@ -69,7 +65,7 @@
 #pragma warning(pop)
 #endif
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 extern HINSTANCE	ProgramInstance;
 extern HWND			MainWindow;
 extern bool GameInFocus;
@@ -84,8 +80,6 @@ void __cdecl Print_Win32Error(unsigned long win32Error);
 
 #endif // RTS_DEBUG
 
-#else // _WINDOWS
+#else // _WIN32
 #include <unistd.h>
-#endif // _WINDOWS
-
-#endif // WIN_H
+#endif // _WIN32
diff --git a/Core/Tools/WW3D/pluglib/wwfile.h b/Core/Tools/WW3D/pluglib/wwfile.h
index 56a583608fd..1ae0e39403a 100644
--- a/Core/Tools/WW3D/pluglib/wwfile.h
+++ b/Core/Tools/WW3D/pluglib/wwfile.h
@@ -16,29 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/wwlib/wwfile.h                               $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/wwlib/wwfile.h                               $*
+ *                                                                                             *
  *                      $Author:: Jani_p                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 5/04/01 7:43p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 8                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
 
-#ifndef WWFILE_Hx
-#define WWFILE_Hx
+#pragma once
 
 #ifdef _UNIX
 #include "osdep.h"
@@ -66,13 +62,13 @@ class FileClass
 {
 	public:
 
-		enum 
+		enum
 		{
 			READ = 1,
 			WRITE = 2,
 			PRINTF_BUFFER_SIZE = 1024
 		};
-		
+
 		virtual ~FileClass(void) {};
 		virtual char const * File_Name(void) const = 0;
 		virtual char const * Set_Name(char const *filename) = 0;
@@ -91,7 +87,7 @@ class FileClass
 		virtual unsigned long Get_Date_Time(void) {return(0);}
 		virtual bool Set_Date_Time(unsigned long ) {return(false);}
 		virtual void Error(int error, int canretry = false, char const * filename=NULL) = 0;
-		virtual void * Get_File_Handle(void) { return reinterpret_cast<void *>(-1); } 
+		virtual void * Get_File_Handle(void) { return reinterpret_cast<void *>(-1); }
 
 		operator char const * ()
 		{
@@ -108,5 +104,3 @@ class FileClass
 		int Printf_Indented(unsigned depth, char *str, ...);
 
 };
-
-#endif
diff --git a/Core/Tools/WW3D/pluglib/wwmath.cpp b/Core/Tools/WW3D/pluglib/wwmath.cpp
index 6797fadd24e..4617646f6c1 100644
--- a/Core/Tools/WW3D/pluglib/wwmath.cpp
+++ b/Core/Tools/WW3D/pluglib/wwmath.cpp
@@ -41,7 +41,7 @@
 /*
 **
 */
-float		WWMath::Random_Float(void) 
-{ 
-	return ((float)(rand() & 0xFFF)) / (float)(0xFFF); 
+float		WWMath::Random_Float(void)
+{
+	return ((float)(rand() & 0xFFF)) / (float)(0xFFF);
 }
diff --git a/Core/Tools/WW3D/pluglib/wwmath.h b/Core/Tools/WW3D/pluglib/wwmath.h
index 20f273cffb6..9bb2cc9bcc1 100644
--- a/Core/Tools/WW3D/pluglib/wwmath.h
+++ b/Core/Tools/WW3D/pluglib/wwmath.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef WWMATH_H
-#define WWMATH_H
 
 #include "always.h"
 #include <math.h>
@@ -59,7 +53,7 @@
 #define WWMATH_OOSQRT3		0.577350269f
 
 
-/* 
+/*
 **	Macros to convert between degrees and radians
 */
 #ifndef RAD_TO_DEG
@@ -81,8 +75,8 @@
 
 
 /*
-** Some simple math functions which work on the built-in types.  
-** Include the various other header files in the WWMATH library 
+** Some simple math functions which work on the built-in types.
+** Include the various other header files in the WWMATH library
 ** in order to get matrices, quaternions, etc.
 */
 class WWMath
@@ -119,15 +113,15 @@ static bool			Is_Valid_Double(double x);
 
 };
 
-inline float WWMath::Sign(float val) 
-{ 
-	if (val > 0.0f) { 
-		return +1.0f; 
-	} 
-	if (val < 0.0f) { 
-		return -1.0f; 
-	} 
-	return 0.0f; 
+inline float WWMath::Sign(float val)
+{
+	if (val > 0.0f) {
+		return +1.0f;
+	}
+	if (val < 0.0f) {
+		return -1.0f;
+	}
+	return 0.0f;
 }
 
 inline bool WWMath::Fast_Is_Float_Positive(const float & val)
@@ -135,26 +129,26 @@ inline bool WWMath::Fast_Is_Float_Positive(const float & val)
 	return !((*(int *)(&val)) & 0x80000000);
 }
 
-inline float WWMath::Random_Float(float min,float max) 
-{ 
-	return Random_Float() * (max-min) + min; 
+inline float WWMath::Random_Float(float min,float max)
+{
+	return Random_Float() * (max-min) + min;
 }
 
-inline float WWMath::Clamp(float val, float min /*= 0.0f*/, float max /*= 1.0f*/) 
+inline float WWMath::Clamp(float val, float min /*= 0.0f*/, float max /*= 1.0f*/)
 {
 	if(val < min) return min;
 	if(val > max) return max;
 	return val;
 }
 
-inline double WWMath::Clamp(double val, double min /*= 0.0f*/, double max /*= 1.0f*/) 
+inline double WWMath::Clamp(double val, double min /*= 0.0f*/, double max /*= 1.0f*/)
 {
 	if(val < min) return min;
 	if(val > max) return max;
 	return val;
 }
 
-inline float WWMath::Wrap(float val, float min /*= 0.0f*/, float max /*= 1.0f*/) 
+inline float WWMath::Wrap(float val, float min /*= 0.0f*/, float max /*= 1.0f*/)
 {
 	// Implemented as an if rather than a while, to long loops
 	if ( val >= max )	val -= (max-min);
@@ -169,7 +163,7 @@ inline float WWMath::Wrap(float val, float min /*= 0.0f*/, float max /*= 1.0f*/)
 	return val;
 }
 
-inline double WWMath::Wrap(double val, double min /*= 0.0f*/, double max /*= 1.0f*/) 
+inline double WWMath::Wrap(double val, double min /*= 0.0f*/, double max /*= 1.0f*/)
 {
 	// Implemented as an if rather than a while, to long loops
 	if ( val >= max )	val -= (max-min);
@@ -206,26 +200,26 @@ inline double	WWMath::Lerp(double a, double b, float lerp )
 }
 
 
-inline long WWMath::Float_To_Long	(float f)	
+inline long WWMath::Float_To_Long	(float f)
 {
 #if defined(_MSC_VER) && defined(_M_IX86)
 	long retval;
 	__asm fld	dword ptr [f]
 	__asm fistp dword ptr [retval]
 	return retval;
-#else 
+#else
 	return (long) f;
 #endif
 }
 
-inline long WWMath::Float_To_Long	(double f)	
+inline long WWMath::Float_To_Long	(double f)
 {
 #if defined(_MSC_VER) && defined(_M_IX86)
 	long retval;
 	__asm fld	qword ptr [f]
 	__asm fistp dword ptr [retval]
 	return retval;
-#else 
+#else
 	return (long) f;
 #endif
 }
@@ -235,7 +229,7 @@ inline bool WWMath::Is_Valid_Float(float x)
 	unsigned long * plong = (unsigned long *)(&x);
 	unsigned long exponent = ((*plong) & 0x7F800000) >> (32-9);
 
-	// if exponent is 0xFF, this is a NAN 
+	// if exponent is 0xFF, this is a NAN
 	if (exponent == 0xFF) {
 		return false;
 	}
@@ -247,11 +241,9 @@ inline bool WWMath::Is_Valid_Double(double x)
 	unsigned long * plong = (unsigned long *)(&x) + 1;
 	unsigned long exponent = ((*plong) & 0x7FF00000) >> (32-12);
 
-	// if exponent is 0x7FF, this is a NAN 
+	// if exponent is 0x7FF, this is a NAN
 	if (exponent == 0x7FF) {
 		return false;
 	}
 	return true;
 }
-
-#endif
diff --git a/Core/Tools/assetcull/assetcull.cpp b/Core/Tools/assetcull/assetcull.cpp
index dc55dcdd368..4535a6f9c30 100644
--- a/Core/Tools/assetcull/assetcull.cpp
+++ b/Core/Tools/assetcull/assetcull.cpp
@@ -69,7 +69,7 @@ static bool filesEqual(const char *fn1, const char *fn2)
     if (fread(buf1,cur,1,f1)!=1||
         fread(buf2,cur,1,f2)!=1)
       break;
-    if (memcmp(buf1,buf2,cur))
+    if (memcmp(buf1,buf2,cur) != 0)
       break;
     k+=cur;
   }
@@ -105,7 +105,7 @@ static int recursiveCull(FILE *batchFile,
   {
     if (fd.attrib&_A_SUBDIR)
     {
-      if (strcmp(fd.name,".")&&
+      if (strcmp(fd.name,".") != 0&&
           strcmp(fd.name,".."))
         subdir.push_back(fd.name);
     }
diff --git a/Core/Tools/buildVersionUpdate/buildVersionUpdate.cpp b/Core/Tools/buildVersionUpdate/buildVersionUpdate.cpp
index 056399ec6fd..18de6bd75b7 100644
--- a/Core/Tools/buildVersionUpdate/buildVersionUpdate.cpp
+++ b/Core/Tools/buildVersionUpdate/buildVersionUpdate.cpp
@@ -115,14 +115,14 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 				while (!feof(filePtr))
 				{
 					fread(buffer, 256, 1, filePtr);
-					if ((stringPtr = strstr(buffer, VERSION_STRING)) != NULL) 
+					if ((stringPtr = strstr(buffer, VERSION_STRING)) != NULL)
 					{
 						char *ptr;
 
 						// Looking for '#define VERSION "x.y.z"'
 						ptr = strtok(stringPtr, " ");	// The VERSION
 						ptr = strtok(NULL, "\n");			// The remainder
-						
+
 						if (*ptr == '\"')
 						{
 							ptr++; // Inc past the first "
@@ -141,9 +141,9 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 						{
 							printf ("Build 0. Oops, didn't find a string of the format: '#define VERSION \"x.y.z\"'");
 						}
-					} // End if if (strstr
-				} // End of while
-			} // End of if filePtr
+					}
+				}
+			}
 			else
 			{
 				// Didn't find the file, write a new one
@@ -153,4 +153,4 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 	}
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/mangler/crc.cpp b/Core/Tools/mangler/crc.cpp
index 1a447ba5e2f..c5e03e9115d 100644
--- a/Core/Tools/mangler/crc.cpp
+++ b/Core/Tools/mangler/crc.cpp
@@ -18,7 +18,7 @@
 
 
 #include <signal.h>
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <process.h> // *MUST* be included before ANY Wnet/Wlib headers if _REENTRANT is defined
 #endif
 
diff --git a/Core/Tools/mangler/crc.h b/Core/Tools/mangler/crc.h
index fbd057f424f..0ff76e0ce95 100644
--- a/Core/Tools/mangler/crc.h
+++ b/Core/Tools/mangler/crc.h
@@ -16,11 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __CRC_H__
-#define __CRC_H__
+#pragma once
 
 void Build_Packet_CRC(unsigned char *buf, int len); // len includes 4-byte CRC at head
 bool Passes_CRC_Check(unsigned char *buf, int len); // len includes 4-byte CRC at head
 void Add_CRC(unsigned long *crc, unsigned long val);
-
-#endif // __CRC_H__
diff --git a/Core/Tools/mangler/endian.h b/Core/Tools/mangler/endian.h
index 9c31d5e428e..9cf4efffa32 100644
--- a/Core/Tools/mangler/endian.h
+++ b/Core/Tools/mangler/endian.h
@@ -16,10 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __ENDIAN_H__
-#define __ENDIAN_H__
-
-
+#pragma once
 
 /*
 ** Network order is big-endian.
@@ -59,7 +56,3 @@ template<class T> inline T Endian(T val)
 
 	return (retval);
 }
-
-
-#endif	//__ENDIAN_H__
-
diff --git a/Core/Tools/mangler/mangler.cpp b/Core/Tools/mangler/mangler.cpp
index 193ec90af79..5f758520f2a 100644
--- a/Core/Tools/mangler/mangler.cpp
+++ b/Core/Tools/mangler/mangler.cpp
@@ -20,7 +20,7 @@
 #include <Utility/iostream_adapter.h>
 
 #include <signal.h>
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <process.h> // *MUST* be included before ANY Wnet/Wlib headers if _REENTRANT is defined
 #endif
 
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
 {
 	ConfigFile config;
 	FILE*	conf;
-	
+
 	if( argc <= 1 )
 	{
 		// No args - use a default config file
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
 		config.readFile(conf);
 		fclose(conf);
 	}
-	
+
 	// ----- LOGGING -----
 	// Setup debugging & logging output
 	Wstring output_file("mangler.log");
@@ -85,7 +85,7 @@ int main(int argc, char **argv)
 	DBGMSG("DBG working...");
 	INFMSG("INF working...");
 	WRNMSG("WRN working...");
-	
+
 	if (htonl(0x12345678) == 0x12345678)
 	{
 		INFMSG("Host is network-byte-order");
@@ -94,19 +94,19 @@ int main(int argc, char **argv)
 	{
 		INFMSG("Host is Intel-byte-order");
 	}
-	
-	
+
+
 	// ----- Initialize Winsock -----
-#ifdef _WINDOWS
+#ifdef _WIN32
 	WORD verReq = MAKEWORD(2, 2);
 	WSADATA wsadata;
-	
+
 	int err = WSAStartup(verReq, &wsadata);
 	if (err != 0) {
 		ERRMSG("Winsock Init failed.");
 		return 1;
 	}
-	
+
 	if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2)) {
 		ERRMSG("Winsock DLL is not 2.2");
 		WSACleanup();
@@ -115,8 +115,8 @@ int main(int argc, char **argv)
 	}
 	INFMSG("Winsock Init done.");
 #endif
-	
-	
+
+
 	// Set up a UDP listener
 	uint8  *buff=new uint8[1024];
 	int     retval;
@@ -150,7 +150,7 @@ int main(int argc, char **argv)
 		ERRMSG("Couldn't bind - error " << retval);
 		exit(1);
 	}
-	
+
 	unsigned char buf[1024];
 	struct sockaddr_in addr;
 	int packet_size = sizeof(ManglerData);
@@ -162,7 +162,7 @@ int main(int argc, char **argv)
 		retval = udp.Wait(15, 0, fdset);
 		if (!retval)
 			continue;
-		
+
 		//DBGMSG("Wait returned " << retval);
 		retval = udp.Read(buf, packet_size, &addr);        // Wait until there is something on the socket
 		if (retval > 0)
@@ -191,7 +191,7 @@ int main(int argc, char **argv)
 				Build_Packet_CRC(buf, packet_size);
 				udp.Write(buf,packet_size,ntohl(addr.sin_addr.s_addr), ntohs(addr.sin_port));
 				INFMSG("Saw " << (int)theAddr[0] << "." << (int)theAddr[1] << "." << (int)theAddr[2] << "." << (int)theAddr[3] << ":" << ntohs(addr.sin_port) << ((blitz)?" Blitzed":"") );
-				
+
 				if (blitz)
 				{
 					udp2.Write(buf,packet_size,ntohl(addr.sin_addr.s_addr), ntohs(addr.sin_port)+1);
@@ -201,8 +201,8 @@ int main(int argc, char **argv)
 			}
 		}
 	}
-	
-	
+
+
 	return 0;
 }
 
diff --git a/Core/Tools/mangler/mangler.h b/Core/Tools/mangler/mangler.h
index c9cb28ed874..4368290acd3 100644
--- a/Core/Tools/mangler/mangler.h
+++ b/Core/Tools/mangler/mangler.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __MANGLER_H__
-#define __MANGLER_H__
+#pragma once
 
 // Packet should consist of a GlobalHeaderType followed by a GlobalPacketType with the fields set as
 // indicated.
@@ -75,5 +74,3 @@ struct ManglerData {
 #if !defined(__GNUC__)
 #pragma pack(pop)
 #endif
-
-#endif // __MANGLER_H__
diff --git a/Core/Tools/mangler/manglertest.cpp b/Core/Tools/mangler/manglertest.cpp
index 49eb731686f..033359a3d18 100644
--- a/Core/Tools/mangler/manglertest.cpp
+++ b/Core/Tools/mangler/manglertest.cpp
@@ -20,7 +20,7 @@
 #include <Utility/iostream_adapter.h>
 
 #include <signal.h>
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <process.h> // *MUST* be included before ANY Wnet/Wlib headers if _REENTRANT is defined
 #endif
 
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
 
 
 	// ----- Initialize Winsock -----
-#ifdef _WINDOWS
+#ifdef _WIN32
 	WORD verReq = MAKEWORD(2, 2);
 	WSADATA wsadata;
 
diff --git a/Core/Tools/mangler/wlib/arraylist.h b/Core/Tools/mangler/wlib/arraylist.h
index 17f4fa1c65d..58c8481842b 100644
--- a/Core/Tools/mangler/wlib/arraylist.h
+++ b/Core/Tools/mangler/wlib/arraylist.h
@@ -19,7 +19,7 @@
 /****************************************************************************\
 *        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S         *
 ******************************************************************************
-Project Name: 
+Project Name:
 File Name   : arraylist.h
 Author      : Neal Kettler
 Start Date  : Jan 19, 1997
@@ -44,8 +44,7 @@ that don't belong to them, etc...
 
 \****************************************************************************/
 
-#ifndef ARRAYLIST_HEADER
-#define ARRAYLIST_HEADER    
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -67,7 +66,7 @@ class ArrayList
                    ArrayList(ArrayList<T> &other);
                   ~ArrayList();
 
-  // Remove all entries from the lsit 
+  // Remove all entries from the lsit
   void             clear(void);
 
   // Add a node after the zero based 'pos'
@@ -83,7 +82,7 @@ class ArrayList
   bit8             remove(OUT T &node,sint32 pos);
   bit8             remove(sint32 pos);
   bit8             removeHead(OUT T &node);
-  bit8             removeTail(OUT T &node); 
+  bit8             removeTail(OUT T &node);
 
   // Replace one obj with another
   bit8             replace(IN T &node, sint32 pos);
@@ -92,7 +91,7 @@ class ArrayList
   // Get a node without removing from the list
   bit8             get(OUT T &node,sint32 pos) RO;
   bit8             getHead(OUT T &node) RO;
-  bit8             getTail(OUT T &node) RO;        
+  bit8             getTail(OUT T &node) RO;
 
   // Get a pointer to the interally managed copy (careful!)
   bit8             getPointer(OUT T **node,sint32 pos) RO;
@@ -126,7 +125,7 @@ class ArrayList
 };
 
 
-//Create the empty list 
+//Create the empty list
 template <class T>
 ArrayList<T>::ArrayList()
 {
@@ -168,7 +167,7 @@ ArrayList<T> &ArrayList<T>::operator=(IN ArrayList<T> &other)
   {
     other.get(node,i);
     addTail(node);
-  } 
+  }
   return(*this);
 }
 
@@ -183,7 +182,7 @@ void ArrayList<T>::clear()
                           //  at home kiddies!
   }
   Entries_=0;
-}            
+}
 
 // ************************* UNSAFE UNSAFE UNSAFE *************************
 // Note - Don't call this on any type with a constructor/destructor since this
@@ -228,7 +227,7 @@ template <class T>
 bit8 ArrayList<T>::add(IN T &node,sint32 pos)
 {
   if (pos > Entries_)      // You can only access one of the end of the vector
-    pos=Entries_; 
+    pos=Entries_;
   if (pos >= Slots_)        // If we're at the end, grow the list
     growVector();
   if (Entries_ >= Slots_)   // enuff space?
@@ -242,7 +241,7 @@ bit8 ArrayList<T>::add(IN T &node,sint32 pos)
   //fprintf(stderr,"Placement new to %p\n",(Vector_+pos));
 
   // This uses the placement new operator. placement new allows us to
-  //  specify the memory address for the new object.  In this case we 
+  //  specify the memory address for the new object.  In this case we
   //  want it at the 'pos' index into our array.
   new((void *)(Vector_+pos)) T((T &)node); // Trust me, this isn't a memory leak
   Entries_++;                         // one new entry
@@ -252,7 +251,7 @@ bit8 ArrayList<T>::add(IN T &node,sint32 pos)
 
 // Add to the first node, all others get shifted down one slot
 template <class T>
-bit8 ArrayList<T>::addHead(IN T &node)  
+bit8 ArrayList<T>::addHead(IN T &node)
 {
   return(add(node,0));
 }
@@ -263,7 +262,7 @@ template <class T>
 bit8 ArrayList<T>::addTail(IN T &node)
 {
   return(add(node,length()));
-}  
+}
 
 
 // addSortedX only works (properly) if evrerything else in the list is added
@@ -376,16 +375,16 @@ sint32 ArrayList<T>::_sortedLookup(IN T &target, int ascending)
 
 
 /*// addNumSortedX works in much the same way as addSortedX, except that I needed
-// it for a very specific thing.  I needed a list of strings numerically sorted, 
+// it for a very specific thing.  I needed a list of strings numerically sorted,
 // not alphabetically sorted.  Furthermore these strings were composed of numbers
-// delimited by underscores.  In the interest of keeping it generic, these 
+// delimited by underscores.  In the interest of keeping it generic, these
 // functions take as args a node, a delimiting character, and a count of the
 // number of fields to include in a sort.  If this is the list of strings:
 //
 //	55_100, 2_5, 23_32, 98_445, 2_48, 8_88, 2_3, 2_4
 //
 // An alphabetical sort is:
-//	
+//
 //	2_3, 2_4, 2_48, 2_5, 55_100, 8_88, 98_445
 //
 // But a numerical sort by calling addNumSortedAsc(<whatever>, "_", 2) will result in:
@@ -393,7 +392,7 @@ sint32 ArrayList<T>::_sortedLookup(IN T &target, int ascending)
 //	2_3, 2_4, 2_5, 2_48, 8_88, 55_100, 98_445
 //
 // Yes...now that you mention it I am on crack...
-//	
+//
 template <class T>
 bit8 ArrayList<T>::addNumSortedAsc(IN T &node, char delim, int fields)
 {
@@ -421,10 +420,10 @@ sint32 ArrayList<T>::_numSortedLookup(IN T &target, char delim, int fields, int
 	T* 	midtarget;
 
 
-	// Trivial case 
+	// Trivial case
 	if( Entries_ == 0 )
 		return 0;
-	
+
 	low = 0;
 	high = Entries_;
 	while( 1 )
@@ -465,14 +464,14 @@ sint32 ArrayList<T>::_numSortedLookup(IN T &target, char delim, int fields, int
 			{
 				if( target <= *lowtarget )
 					return low;
-				else 
+				else
 					return high;
 			}
 			else
 			{
 				if( target <= *lowtarget )
 					return high;
-				else 
+				else
 					return low;
 			}
 		}
@@ -508,7 +507,7 @@ bit8 ArrayList<T>::replace(IN T &node, sint32 pos)
     pos=0;
   if (pos >= Entries_)
     pos=Entries_-1;
-  
+
   (Vector_+pos)->~T();    // Call the destructor manually. Don't try this
                           //  at home kiddies!
 
@@ -523,7 +522,7 @@ bit8 ArrayList<T>::replace(IN T &node, sint32 pos)
 // Remove at the zero based index specified by 'pos'.  When removing from
 // a slot, all others get shifted up by one.
 template <class T>
-bit8 ArrayList<T>::remove(sint32 pos) 
+bit8 ArrayList<T>::remove(sint32 pos)
 {
   if (Entries_==0)
     return(FALSE);
@@ -531,7 +530,7 @@ bit8 ArrayList<T>::remove(sint32 pos)
     pos=0;
   if (pos >= Entries_)
     pos=Entries_-1;
-  
+
   (Vector_+pos)->~T();    // Call the destructor manually. Don't try this
                           //  at home kiddies!
 
@@ -562,7 +561,7 @@ bit8 ArrayList<T>::remove(OUT T &node, sint32 pos)
 
 // Remove the first node of the list
 template <class T>
-bit8 ArrayList<T>::removeHead(OUT T &node)     
+bit8 ArrayList<T>::removeHead(OUT T &node)
 {
   return(remove(node,0));
 }
@@ -573,35 +572,35 @@ template <class T>
 bit8 ArrayList<T>::removeTail(OUT T &node)
 {
   return(remove(node,Entries_-1));
-} 
+}
 
 // get a pointer to the internally managed object.  Try and avoid this, but
 //  sometimes efficiency requires it...
 // get a copy of an item
 template <class T>
-bit8 ArrayList<T>::getPointer(OUT T **node,sint32 pos) RO 
+bit8 ArrayList<T>::getPointer(OUT T **node,sint32 pos) RO
 {
   if ((pos < 0)||(pos >= Entries_))
     return(FALSE);
   *node=&(Vector_[pos]);
-  return(TRUE);  
+  return(TRUE);
 }
-  
+
 
 // get a copy of an item
 template <class T>
-bit8 ArrayList<T>::get(OUT T &node,sint32 pos) RO 
+bit8 ArrayList<T>::get(OUT T &node,sint32 pos) RO
 {
   if ((pos < 0)||(pos >= Entries_))
     return(FALSE);
   node=Vector_[pos];
-  return(TRUE);  
+  return(TRUE);
 }
 
 
 // get a copy of the first node of the list
 template <class T>
-bit8 ArrayList<T>::getHead(OUT T &node) RO 
+bit8 ArrayList<T>::getHead(OUT T &node) RO
 {
   return(get(node,0));
 }
@@ -609,10 +608,10 @@ bit8 ArrayList<T>::getHead(OUT T &node) RO
 
 // get a copy of the last node
 template <class T>
-bit8 ArrayList<T>::getTail(OUT T &node) RO 
+bit8 ArrayList<T>::getTail(OUT T &node) RO
 {
   return(get(node,Entries_-1));
-}      
+}
 
 // just for debugging
 template <class T>
@@ -624,16 +623,16 @@ void ArrayList<T>::print(FILE *out)
   fprintf(out,"Entries: %d  Slots:  %d  sizeof(T): %d\n",Entries_,Slots_,
     sizeof(T));
   fprintf(out,"--------------------\n");
-}            
+}
 
 // Return the current length of the list
 template <class T>
-sint32 ArrayList<T>::length(void) RO 
+sint32 ArrayList<T>::length(void) RO
 {
   return(Entries_);
-}    
+}
 
-// Grow the vector by a factor of 2X 
+// Grow the vector by a factor of 2X
 template <class T>
 bit8 ArrayList<T>::growVector(void)
 {
@@ -663,7 +662,7 @@ bit8 ArrayList<T>::growVector(void)
   Vector_=newVector;
   Slots_=newSlots;
 
-  return(TRUE); 
+  return(TRUE);
 }
 
 
@@ -685,25 +684,22 @@ bit8 ArrayList<T>::shrinkVector(void)
     return(FALSE);
 
   //fprintf(stderr,"Shrinking vector to: %d\n",newSlots);
- 
+
   // The goofy looking new below prevents operator new from getting called
   //  unnecessarily.  This is severall times faster than allocating all of
   //  the slots as objects and then calling the assignment operator on them
   //  when they actually get used.
   //
   T *newVector=(T *)(new uint8[newSlots * sizeof(T)]);
- 
+
   if (Vector_ != NULL)    // Vector_ better not be NULL!
     memcpy(newVector,Vector_,Entries_*sizeof(T));
 
   delete[]((uint8 *)Vector_);  // Get rid of the old vector without calling
                                //  destructors
- 
+
   Vector_=newVector;
   Slots_=newSlots;
- 
+
   return(TRUE);
 }
-
-
-#endif
diff --git a/Core/Tools/mangler/wlib/configfile.cpp b/Core/Tools/mangler/wlib/configfile.cpp
index 6e4231344ce..b8d465b750a 100644
--- a/Core/Tools/mangler/wlib/configfile.cpp
+++ b/Core/Tools/mangler/wlib/configfile.cpp
@@ -23,7 +23,7 @@ Project Name: Carpenter  (The RedAlert ladder creator)
 File Name   : configfile.cpp
 Author      : Neal Kettler
 Start Date  : June 9, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 
 
 This class will read in a config file and store the key value pairs for
@@ -102,11 +102,11 @@ bit8 ConfigFile::readFile(FILE *in)
     key=cptr;
     key.truncate('=');
     key.removeSpaces();  // No spaces allowed in the key
-    key.toUpper();       // make key all caps 
+    key.toUpper();       // make key all caps
 
-    // Add the section name to the end of the key 
+    // Add the section name to the end of the key
     if (strlen(sectionname))
-      key.cat(sectionname);  
+      key.cat(sectionname);
 
     cptr=Eat_Spaces(strchr(cptr,'=')+1); // Jump to after the '='
     value=cptr;
@@ -114,7 +114,7 @@ bit8 ConfigFile::readFile(FILE *in)
     value.truncate('\n');
     value.truncate('#');
 
-    // TheSuperHackers @compile xezon 25/03/2025 Re-implement algorithm to avoid writing into string buffer directly.
+    // TheSuperHackers @build xezon 25/03/2025 Re-implement algorithm to avoid writing into string buffer directly.
     // Remove trailing spaces
     {
       const char* valueStr = value.get();
@@ -128,7 +128,7 @@ bit8 ConfigFile::readFile(FILE *in)
     Critsec_.lock();
     Dictionary_.add(key,value);
     Critsec_.unlock();
-  } 
+  }
   return(TRUE);
 }
 
@@ -187,12 +187,12 @@ bit8 ConfigFile::getString(IN Wstring &_key, Wstring &value, IN char *section) c
   Critsec_.unlock();
 
   if (retval==FALSE)
-  { 
-	DBGMSG("Config entry missing: "<<key.get()); 
+  {
+	DBGMSG("Config entry missing: "<<key.get());
   }
 
   return(retval);
-} 
+}
 
 // Get a config entry as a string
 bit8 ConfigFile::getString(IN char *key,Wstring &value, IN char *section) const
@@ -200,14 +200,14 @@ bit8 ConfigFile::getString(IN char *key,Wstring &value, IN char *section) const
   Wstring sKey;
   sKey.set(key);
   return(getString(sKey,value,section));
-}   
+}
 
 // Get a config entry as an integer
 bit8 ConfigFile::getInt(IN Wstring &_key,sint32 &value, IN char *section) const
 {
   Wstring key(_key);
   key.toUpper();
- 
+
   if (section)  // append section name to key
   {
     key+="[";
@@ -236,7 +236,7 @@ bit8 ConfigFile::getInt(IN char *key,sint32 &value, IN char *section) const
   sKey.set(key);
 
   return(getInt(sKey,value,section));
-}    
+}
 
 
 
@@ -245,7 +245,7 @@ bit8 ConfigFile::getInt(IN Wstring &_key,sint16 &value, IN char *section) const
 {
   Wstring key(_key);
   key.toUpper();
- 
+
   if (section)  // append section name to key
   {
     key+="[";
@@ -266,7 +266,7 @@ bit8 ConfigFile::getInt(IN Wstring &_key,sint16 &value, IN char *section) const
   value=atoi(svalue.get());
   return(TRUE);
 }
- 
+
 // Get a config entry as an integer
 bit8 ConfigFile::getInt(IN char *key,sint16 &value, IN char *section) const
 {
@@ -285,21 +285,21 @@ bit8 ConfigFile::removeEntry(IN Wstring &_key, IN char *section)
 {
 	Wstring key(_key);
 	key.toUpper();
-	
+
 	if (section)  // append section name to key
 	{
 		key+="[";
 		key+=section;
 		key+="]";
 	}
-	
+
 	Critsec_.lock();
 	bit8 retval=Dictionary_.remove(key);
 	Critsec_.unlock();
-	
+
 	if (retval==FALSE)
 	{ DBGMSG("Config entry missing: "<<key.get()); }
-	
+
 	if (retval==FALSE)
 		return(FALSE);
 	return(TRUE);
@@ -318,7 +318,7 @@ bit8 ConfigFile::setString(IN Wstring &_key, IN Wstring &value, IN char *section
 {
 	Wstring key(_key);
 	key.toUpper();
-	
+
 	if (section)  // append section name to key
 	{
 		key+="[";
@@ -329,7 +329,7 @@ bit8 ConfigFile::setString(IN Wstring &_key, IN Wstring &value, IN char *section
 	{
 		section = "";  // give it a default
 	}
-	
+
 	Critsec_.lock();
 	Dictionary_.remove(key);
 	bit8 retval=Dictionary_.add(key,value);
@@ -340,7 +340,7 @@ bit8 ConfigFile::setString(IN Wstring &_key, IN Wstring &value, IN char *section
 	for (i=0; i<sectionList.length(); i++)
 	{
 		sectionList.get(test, i);
-		if (!strcmp(test.get(), section))
+		if (strcmp(test.get(), section) == 0)
 			break;
 	}
 	if (i == sectionList.length())
@@ -351,14 +351,14 @@ bit8 ConfigFile::setString(IN Wstring &_key, IN Wstring &value, IN char *section
 		sectionList.addTail(test);
 	}
 	Critsec_.unlock();
-	
+
 	if (retval==FALSE)
-	{ 
-		DBGMSG("Config could not set entry: "<<key.get()); 
+	{
+		DBGMSG("Config could not set entry: "<<key.get());
 	}
-	
+
 	return(retval);
-} 
+}
 
 // Set a config entry as a string
 bit8 ConfigFile::setString(IN char *key,IN Wstring &value, IN char *section)
@@ -366,14 +366,14 @@ bit8 ConfigFile::setString(IN char *key,IN Wstring &value, IN char *section)
 	Wstring sKey;
 	sKey.set(key);
 	return(setString(sKey,value,section));
-}   
+}
 
 // Set a config entry as an integer
 bit8 ConfigFile::setInt(IN Wstring &_key,IN sint32 &value, IN char *section)
 {
 	Wstring key(_key);
 	key.toUpper();
-	
+
 	if (section)  // append section name to key
 	{
 		key+="[";
@@ -384,7 +384,7 @@ bit8 ConfigFile::setInt(IN Wstring &_key,IN sint32 &value, IN char *section)
 	{
 		section = "";  // give it a default
 	}
-	
+
 	Wstring svalue;
 	svalue.setFormatted("%d", value);
 	Critsec_.lock();
@@ -398,7 +398,7 @@ bit8 ConfigFile::setInt(IN Wstring &_key,IN sint32 &value, IN char *section)
 	{
 		sectionList.get(test, i);
 		//DBGMSG("Looking at " << test.get());
-		if (!strcmp(test.get(), section))
+		if (strcmp(test.get(), section) == 0)
 			break;
 	}
 	if (i == sectionList.length() && section)
@@ -409,10 +409,10 @@ bit8 ConfigFile::setInt(IN Wstring &_key,IN sint32 &value, IN char *section)
 		sectionList.addTail(test);
 	}
 	Critsec_.unlock();
-	
+
 	if (retval==FALSE)
 	{ DBGMSG("Config could not set entry: "<<key.get()); }
-	
+
 	if (retval==FALSE)
 		return(FALSE);
 	return(TRUE);
@@ -424,7 +424,7 @@ bit8 ConfigFile::setInt(IN char *key,IN sint32 &value, IN char *section)
 	Wstring sKey;
 	sKey.set(key);
 	return(setInt(sKey,value,section));
-}    
+}
 
 
 // Write config file to disk.  Does not preserve comments, etc.
@@ -479,7 +479,7 @@ static uint32 Wstring_Hash(const Wstring &string)
     retval=(retval<<8)^(retval>>24);  // ROL 8
   }
   return(retval);
-}         
+}
 
 static char *Eat_Spaces(char *string)
 {
diff --git a/Core/Tools/mangler/wlib/configfile.h b/Core/Tools/mangler/wlib/configfile.h
index 90c7bb3f840..eba5a02c811 100644
--- a/Core/Tools/mangler/wlib/configfile.h
+++ b/Core/Tools/mangler/wlib/configfile.h
@@ -20,14 +20,13 @@
 *        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S         *
 ******************************************************************************
 Project Name: Carpenter  (The RedAlert ladder creator)
-File Name   : configfile.h 
+File Name   : configfile.h
 Author      : Neal Kettler
 Start Date  : June 9, 1997
-Last Update : May 13, 1999  
+Last Update : May 13, 1999
 \***************************************************************************/
 
-#ifndef CONFIGFILE_HEADER
-#define CONFIGFILE_HEADER
+#pragma once
 
 #include "wstypes.h"
 #include "dictionary.h"
@@ -72,5 +71,3 @@ class ConfigFile
   //   are allowed so you don't need to worry about an outer lock around the enumerate
   CritSec                     Critsec_;    // lock around dictionary
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/critsec.cpp b/Core/Tools/mangler/wlib/critsec.cpp
index 9e6eb3770dd..d02aae76c9b 100644
--- a/Core/Tools/mangler/wlib/critsec.cpp
+++ b/Core/Tools/mangler/wlib/critsec.cpp
@@ -49,7 +49,7 @@ CritSec::~CritSec()
 //
 // If refcount is not null you can get the current ref counter after the lock.
 //
-sint32 CritSec::lock(int *refcount) RO 
+sint32 CritSec::lock(int *refcount) RO
 {
  #ifdef _UNIX
     sint32	status;
@@ -93,11 +93,11 @@ sint32 CritSec::lock(int *refcount) RO
 }
 
 // The "unlock" function release the critical section.
-sint32 CritSec::unlock(void) RO 
+sint32 CritSec::unlock(void) RO
 {
  #ifdef _UNIX
     sint32	status = 0;
-    
+
     assert(RefCount_ >= 0);
     if (RefCount_ <= 0)
     {
@@ -116,7 +116,7 @@ sint32 CritSec::unlock(void) RO
     {
 	// Set thread id to zero -- we're going to release mutex
 	ThreadId_ = (pthread_t)0;
-	
+
 	// Unlock the mutex.
 	if ((status = pthread_mutex_unlock(&Mutex_)) != 0)
 	    ERRMSG("pthread_mutex_lock: " << strerror(errno));
diff --git a/Core/Tools/mangler/wlib/critsec.h b/Core/Tools/mangler/wlib/critsec.h
index 3026c4c2892..687667d74d8 100644
--- a/Core/Tools/mangler/wlib/critsec.h
+++ b/Core/Tools/mangler/wlib/critsec.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CRITSEC_HEADER
-#define CRITSEC_HEADER
+#pragma once
 
 #include "wstypes.h"
 #ifdef _WIN32
@@ -45,7 +44,7 @@ class CritSec
  public:
                 CritSec();
                ~CritSec();
-    
+
   sint32		lock(int *refcount=NULL) RO;
   sint32		unlock(void) RO;
 
@@ -58,5 +57,3 @@ class CritSec
     mutable int                 RefCount_;      // Reference count
   #endif
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/dictionary.h b/Core/Tools/mangler/wlib/dictionary.h
index 9a117f8e8d4..2a21b5273b3 100644
--- a/Core/Tools/mangler/wlib/dictionary.h
+++ b/Core/Tools/mangler/wlib/dictionary.h
@@ -35,10 +35,7 @@ is working well, this is much faster than a linked list, but only if
 your hashing function is good.
 \****************************************************************************/
 
-
-#ifndef DICTIONARY_HEADER
-#define DICTIONARY_HEADER    
-
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -57,7 +54,7 @@ class DNode
   K               key;
   V               value;
   DNode<K,V>     *hashNext;
-};        
+};
 
 template <class K,class V>
 class Dictionary
@@ -88,7 +85,7 @@ Dictionary(uint32 (*hashFn)(const K &key)) :
   table=(DNode<K,V> **)new DNode<K,V>* [size];
   assert(table!=NULL);
 
-  memset((void *)table,0,size*sizeof(void *));        
+  memset((void *)table,0,size*sizeof(void *));
   hashFunc=hashFn;
 }
 
@@ -105,7 +102,7 @@ Dictionary(uint32 (*hashFn)(const K &key)) :
   bit8             contains(IN K &key) RO;
   bit8             updateValue(IN K &key,IN V &value);
   bit8             remove(IN K &key,OUT V &value);
-  bit8             remove(IN K &key); 
+  bit8             remove(IN K &key);
   bit8             removeAny(OUT K &key,OUT V &value);
   bit8             iterate(INOUT int &index,INOUT int &offset, OUT V &value) RO;
   bit8             iterate(INOUT int &index,INOUT int &offset, OUT K &key, OUT V &value) RO;
@@ -131,7 +128,7 @@ Dictionary(uint32 (*hashFn)(const K &key)) :
   // See initilizer list of constructor for values
   const double     SHRINK_THRESHOLD; // When table is this % full shrink it
   const double     EXPAND_THRESHOLD; // When table is this % full grow it
-  const int        MIN_TABLE_SIZE;   // must be a power of 2               
+  const int        MIN_TABLE_SIZE;   // must be a power of 2
 };
 
 
@@ -166,20 +163,20 @@ void Dictionary<K,V>::clear()
 
   while ((getSize()>(uint32)MIN_TABLE_SIZE)&&(keepSize==FALSE))
     shrink();
-}            
+}
 
 template <class K,class V>
-uint32 Dictionary<K,V>::keyHash(IN K &key) RO 
+uint32 Dictionary<K,V>::keyHash(IN K &key) RO
 {
   uint32 retval=hashFunc(key);
   retval &= ((1<<tableBits)-1);
   assert(retval<getSize());
   return(retval);
-}   
+}
 
 
 template <class K,class V>
-void Dictionary<K,V>::print(FILE *out) RO 
+void Dictionary<K,V>::print(FILE *out) RO
 {
   DNode<K,V> *temp;
   uint32 i;
@@ -200,7 +197,7 @@ void Dictionary<K,V>::print(FILE *out) RO
     fprintf(out,"\n");
   }
   fprintf(out,"--------------------\n");
-}            
+}
 
 
 template <class K, class V>
@@ -217,7 +214,7 @@ Dictionary<K,V> &Dictionary<K,V>::operator=(Dictionary<K,V> &other)
 //   is returned.
 template <class K,class V>
 bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
-    OUT V &value) RO 
+    OUT V &value) RO
 {
   DNode<K,V> *temp;
 
@@ -255,7 +252,7 @@ bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
     offset++;
 
   return(TRUE);
-}            
+}
 
 
 
@@ -266,34 +263,34 @@ bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
 //   is returned.
 template <class K,class V>
 bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
-    OUT K &key, OUT V &value) RO 
+    OUT K &key, OUT V &value) RO
 {
   DNode<K,V> *temp;
- 
+
   // index out of range
   if ((index<0)||(index >= (int)getSize()))
     return(FALSE);
- 
+
   temp=table[index];
   while ((temp==NULL)&&((++index) < (int)getSize()))
   {
     temp=table[index];
     offset=0;
   }
- 
+
   if (temp==NULL)   // no more slots with data
     return(FALSE);
- 
+
   uint32 i=0;
   while ((temp!=NULL) && ((int)i < offset))
   {
     temp=temp->hashNext;
     i++;
   }
- 
+
   if (temp==NULL)  // should never happen
     return(FALSE);
- 
+
   value=temp->value;
   key=temp->key;
   if (temp->hashNext==NULL)
@@ -303,7 +300,7 @@ bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
   }
   else
     offset++;
- 
+
   return(TRUE);
 }
 
@@ -312,19 +309,19 @@ bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
 
 // Return the current size of the hash table
 template <class K,class V>
-uint32 Dictionary<K,V>::getSize(void) RO 
-{ return(size); }    
+uint32 Dictionary<K,V>::getSize(void) RO
+{ return(size); }
 
 
 // Return the current number of entries in the table
 template <class K,class V>
-uint32 Dictionary<K,V>::getEntries(void) RO 
+uint32 Dictionary<K,V>::getEntries(void) RO
 { return(entries); }
 
 
 // Does the Dictionary contain the key?
 template <class K,class V>
-bit8 Dictionary<K,V>::contains(IN K &key) RO 
+bit8 Dictionary<K,V>::contains(IN K &key) RO
 {
   int offset;
   DNode<K,V> *node;
@@ -339,10 +336,10 @@ bit8 Dictionary<K,V>::contains(IN K &key) RO
   while(node!=NULL)
   {
     if ((node->key)==key)
-    { return(TRUE); }          
+    { return(TRUE); }
     node=node->hashNext;
   }
-  return(FALSE); 
+  return(FALSE);
 }
 
 
@@ -358,7 +355,7 @@ bit8 Dictionary<K,V>::updateValue(IN K &key,IN V &value)
 
   add(key,value);
   return(TRUE);
-}           
+}
 
 
 // Add to the dictionary (if key exists, value is updated with the new V)
@@ -390,7 +387,7 @@ bit8 Dictionary<K,V>::add(IN K &key,IN V &value)
   remove(key);   // Hopefully this will be false...
 
   offset=keyHash(key);
-    
+
   node=table[offset];
 
   if (node==NULL)
@@ -400,7 +397,7 @@ bit8 Dictionary<K,V>::add(IN K &key,IN V &value)
     temp=table[offset];
     table[offset]=item;
     item->hashNext=temp;
-  } 
+  }
 
   entries++;
   percent=(float)entries;
@@ -428,7 +425,7 @@ bit8 Dictionary<K,V>::remove(IN K &key,OUT V &value)
   node=table[offset];
 
   last=node;
-  if (node==NULL) 
+  if (node==NULL)
     return(FALSE);
 
   //special case table points to thing to delete
@@ -469,7 +466,7 @@ bit8 Dictionary<K,V>::remove(IN K &key,OUT V &value)
         memcpy(&value,&(node->value),sizeof(V));
       #else
         value=node->value;
-      #endif 
+      #endif
       last->hashNext=node->hashNext;
       entries--;
       delete(node);
@@ -515,7 +512,7 @@ bit8 Dictionary<K,V>::removeAny(OUT K &key,OUT V &value)
     {
       offset=i;
       break;
-    } 
+    }
 
   if (offset==-1)    // Nothing there
     return(FALSE);
@@ -529,7 +526,7 @@ bit8 Dictionary<K,V>::removeAny(OUT K &key,OUT V &value)
     key=node->key;
   #endif
   #ifdef VALUE_MEM_OPS
-    memcpy(&value,&(node->value),sizeof(V));     
+    memcpy(&value,&(node->value),sizeof(V));
   #else
     value=node->value;
   #endif
@@ -545,7 +542,7 @@ bit8 Dictionary<K,V>::removeAny(OUT K &key,OUT V &value)
 
 
 template <class K,class V>
-bool Dictionary<K,V>::getValue(IN K &key,OUT V &value) RO 
+bool Dictionary<K,V>::getValue(IN K &key,OUT V &value) RO
 {
   V *valptr=NULL;
   bool retval=getPointer(key,&valptr);
@@ -563,7 +560,7 @@ bool Dictionary<K,V>::getValue(IN K &key,OUT V &value) RO
 // Try and avoid this since you're getting a pointer to the internally
 //  managed data!
 template <class K,class V>
-bool Dictionary<K,V>::getPointer(IN K &key,OUT V **valptr) RO 
+bool Dictionary<K,V>::getPointer(IN K &key,OUT V **valptr) RO
 {
   int offset;
   DNode<K,V> *node;
@@ -575,7 +572,7 @@ bool Dictionary<K,V>::getPointer(IN K &key,OUT V **valptr) RO
 
   node=table[offset];
 
-  if (node==NULL) 
+  if (node==NULL)
     return(FALSE);
 
   #ifdef KEY_MEM_OPS
@@ -598,7 +595,7 @@ bool Dictionary<K,V>::getPointer(IN K &key,OUT V **valptr) RO
 //only here to improve performance of the hash table by reducing
 //the length of the linked list at each table entry.
 
-// Shrink the hash table by a factor of 2 (and relocate entries)   
+// Shrink the hash table by a factor of 2 (and relocate entries)
 template <class K,class V>
 void Dictionary<K,V>::shrink(void)
 {
@@ -619,7 +616,7 @@ void Dictionary<K,V>::shrink(void)
 
   table=(DNode<K,V> **)new DNode<K,V>*[size];
   assert(table!=NULL);
-  memset((void *)table,0,size*sizeof(void *)); 
+  memset((void *)table,0,size*sizeof(void *));
 
   for (i=0; i<oldsize; i++)
   {
@@ -658,7 +655,7 @@ void Dictionary<K,V>::expand(void)
 
   table=(DNode<K,V> **)new DNode<K,V>* [size];
   assert(table!=NULL);
-  memset((void *)table,0,size*sizeof(void *));       
+  memset((void *)table,0,size*sizeof(void *));
 
   for (i=0; i<oldsize; i++)
   {
@@ -675,7 +672,3 @@ void Dictionary<K,V>::expand(void)
   }
   delete[](oldtable);
 }
-
-
-#endif
-
diff --git a/Core/Tools/mangler/wlib/filed.h b/Core/Tools/mangler/wlib/filed.h
index ab6ec1f666f..2d00ab1afa3 100644
--- a/Core/Tools/mangler/wlib/filed.h
+++ b/Core/Tools/mangler/wlib/filed.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef FILED_HEADER
-#define FILED_HEADER
+#pragma once
 
 #include "odevice.h"
 
@@ -25,7 +24,7 @@ class FileD : public OutputDevice
 {
  public:
    FileD(IN char *filename, IN char *mode = "w")
-   { 
+   {
      out=fopen(filename,mode);
      if (out==NULL)
        out=fopen("FileDev.out",mode);
@@ -47,5 +46,3 @@ class FileD : public OutputDevice
 
    FILE      *out;
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/linkedlist.h b/Core/Tools/mangler/wlib/linkedlist.h
index 6ef14f33a73..8589c3c45c3 100644
--- a/Core/Tools/mangler/wlib/linkedlist.h
+++ b/Core/Tools/mangler/wlib/linkedlist.h
@@ -19,7 +19,7 @@
 /****************************************************************************\
 *        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S         *
 ******************************************************************************
-Project Name: 
+Project Name:
 File Name   : linkedlist.h
 Author      : Neal Kettler
 Start Date  : June 19, 1997
@@ -33,8 +33,7 @@ Copies of the data are stored instead of a pointer to the original.
 If you want to store pointers then the template should be of a pointer type.
 \****************************************************************************/
 
-#ifndef LINKEDLIST_HEADER
-#define LINKEDLIST_HEADER    
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,7 +49,7 @@ class LNode
   T               Node;
   LNode<T>       *Next;
   LNode<T>       *Prev;
-};        
+};
 
 template <class T>
 class LinkedList
@@ -60,7 +59,7 @@ class LinkedList
                    LinkedList(LinkedList<T> &other);
                   ~LinkedList();
 
-  // Remove all entries from the lsit 
+  // Remove all entries from the lsit
   void             clear(void);
 
   // Add a node after the zero based 'pos'
@@ -72,13 +71,13 @@ class LinkedList
   bit8             remove(OUT T &node,sint32 pos);
   bit8             remove(sint32 pos);
   bit8             removeHead(OUT T &node);
-  bit8             removeTail(OUT T &node); 
+  bit8             removeTail(OUT T &node);
 
 
   // Get a node without removing from the list
   bit8             get(OUT T &node,sint32 pos);
   bit8             getHead(OUT T &node);
-  bit8             getTail(OUT T &node);        
+  bit8             getTail(OUT T &node);
 
   // Get a pointer to the internally managed data (careful!)
   bit8             getPointer(OUT T **node, sint32 pos);
@@ -102,7 +101,7 @@ class LinkedList
 };
 
 
-//Create the empty list 
+//Create the empty list
 template <class T>
 LinkedList<T>::LinkedList()
 {
@@ -138,7 +137,7 @@ LinkedList<T> &LinkedList<T>::operator=(LinkedList<T> &other)
   {
     other.get(node,i);
     addTail(node);
-  } 
+  }
   return(*this);
 }
 
@@ -158,7 +157,7 @@ void LinkedList<T>::clear()
   Entries=0;
   CurIndex=-1;
   Head=Tail=Current=NULL;
-}            
+}
 
 // When adding into a position, the new node goes at the zero based slot
 // specified by pos. All other nodes get moved one slot down.
@@ -186,7 +185,7 @@ bit8 LinkedList<T>::add(IN T &node,sint32 pos, OUT T **newnodeptr)
     if (pos==0) {
       item->Next=Head;
       if (Head)
-        Head->Prev=item; 
+        Head->Prev=item;
       Head=item;
     }
     if (pos==Entries) {
@@ -213,7 +212,7 @@ bit8 LinkedList<T>::add(IN T &node,sint32 pos, OUT T **newnodeptr)
     Entries++;
     return(TRUE);
   }
-  // Check the other possible speedup (adding after CurIndex) 
+  // Check the other possible speedup (adding after CurIndex)
   if (pos==CurIndex+1) {
     item->Next=Current->Next;
     item->Prev=Current;
@@ -223,18 +222,18 @@ bit8 LinkedList<T>::add(IN T &node,sint32 pos, OUT T **newnodeptr)
     CurIndex++;
     Entries++;
     return(TRUE);
-  }    
+  }
 
   // If control reaches here we have to scan the whole thing
   temp=Head->Next;  // Can start at node '1' because head was special cased
   for (int i=1; i<pos; i++) {
-    temp=temp->Next; 
+    temp=temp->Next;
     assert(temp!=NULL);
   }
   item->Next=temp;
   item->Prev=temp->Prev;
   temp->Prev=item;
-  item->Prev->Next=item; 
+  item->Prev->Next=item;
   Current=item;
   CurIndex=pos;
   Entries++;
@@ -245,7 +244,7 @@ bit8 LinkedList<T>::add(IN T &node,sint32 pos, OUT T **newnodeptr)
 
 // Add to the first node, all others get shifted down one slot
 template <class T>
-bit8 LinkedList<T>::addHead(IN T &node, OUT T **newnodeptr)  
+bit8 LinkedList<T>::addHead(IN T &node, OUT T **newnodeptr)
 {
   return(add(node,0,newnodeptr));
 }
@@ -256,13 +255,13 @@ template <class T>
 bit8 LinkedList<T>::addTail(IN T &node, OUT T **newnodeptr)
 {
   return(add(node,length(),newnodeptr));
-}  
+}
 
 
 // Remove at the zero based index specified by 'pos'.  When removing from
 // a slot, all others get shifted up by one.
 template <class T>
-bit8 LinkedList<T>::remove(OUT T &node, sint32 pos) 
+bit8 LinkedList<T>::remove(OUT T &node, sint32 pos)
 {
   ////////LNode<T> *temp;
   LNode<T> *item;
@@ -273,7 +272,7 @@ bit8 LinkedList<T>::remove(OUT T &node, sint32 pos)
   if (pos<0)
     pos=0;
   if (pos>=Entries)
-    pos=Entries-1;    
+    pos=Entries-1;
 
   if ((pos==0)||(pos==Entries-1)) {  // Both can be true for a 1 item list
     if (pos==0) {
@@ -304,7 +303,7 @@ bit8 LinkedList<T>::remove(OUT T &node, sint32 pos)
       assert(Tail==NULL);
     }
     return(TRUE);
-  }     
+  }
   // If control is here, we know the target node is not an endpoint
 
   // Check for possible speedup, so we don't have to scan the list
@@ -349,7 +348,7 @@ bit8 LinkedList<T>::remove(OUT T &node, sint32 pos)
   delete(item);
   Entries--;
 
-  return(TRUE);  
+  return(TRUE);
 }
 
 
@@ -367,7 +366,7 @@ bit8 LinkedList<T>::remove(sint32 pos)
 
 // Remove the first node of the list
 template <class T>
-bit8 LinkedList<T>::removeHead(OUT T &node)     
+bit8 LinkedList<T>::removeHead(OUT T &node)
 {
   return(remove(node,0));
 }
@@ -378,7 +377,7 @@ template <class T>
 bit8 LinkedList<T>::removeTail(OUT T &node)
 {
   return(remove(node,Entries-1));
-}   
+}
 
 
 
@@ -448,7 +447,7 @@ bit8 LinkedList<T>::getPointer(OUT T **node,sint32 pos)
   CurIndex=pos;
   Current=item;
 
-  return(TRUE);  
+  return(TRUE);
 }
 
 
@@ -465,7 +464,7 @@ template <class T>
 bit8 LinkedList<T>::getTail(OUT T &node)
 {
   return(get(node,Entries-1));
-}      
+}
 
 
 template <class T>
@@ -475,21 +474,19 @@ void LinkedList<T>::print(IN FILE *out)
 
   fprintf(out,"--------------------\n");
   fprintf(out,"Entries = %d\n",length());
-  fprintf(out,"H = %8p   C = %8p (%d)   T = %8p\n",Head,Current,CurIndex,Tail); 
+  fprintf(out,"H = %8p   C = %8p (%d)   T = %8p\n",Head,Current,CurIndex,Tail);
 
   temp=Head;
   while (temp) {
     fprintf(out,"  %8p<-((%8p))->%8p  \n",temp->Prev,temp,temp->Next);
     temp=temp->Next;
-  }   
+  }
 
   fprintf(out,"--------------------\n");
-}            
+}
 
 // Return the current length of the list
 template <class T>
 sint32 LinkedList<T>::length(void) {
   return(Entries);
-}    
-
-#endif
+}
diff --git a/Core/Tools/mangler/wlib/mboxd.h b/Core/Tools/mangler/wlib/mboxd.h
index 3c4d0f5dde6..a45eff3700a 100644
--- a/Core/Tools/mangler/wlib/mboxd.h
+++ b/Core/Tools/mangler/wlib/mboxd.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MBOXD_HEADER
-#define MBOXD_HEADER
+#pragma once
 
 #include "odevice.h"
 
@@ -36,5 +35,3 @@ class MboxD : public OutputDevice
    }
 
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/monod.cpp b/Core/Tools/mangler/wlib/monod.cpp
index 296849da2da..103409de5c2 100644
--- a/Core/Tools/mangler/wlib/monod.cpp
+++ b/Core/Tools/mangler/wlib/monod.cpp
@@ -51,7 +51,7 @@ int MonoD::print(const char *str, int len)
     return(len);
   #else
     for (int i=0; i<len; i++)
-      fprintf(stderr,"%c",str[i]); 
+      fprintf(stderr,"%c",str[i]);
     return(len);
   #endif
 }
diff --git a/Core/Tools/mangler/wlib/monod.h b/Core/Tools/mangler/wlib/monod.h
index 494674c9749..4f94fd065e1 100644
--- a/Core/Tools/mangler/wlib/monod.h
+++ b/Core/Tools/mangler/wlib/monod.h
@@ -16,9 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MONOD_HEADER
-#define MONOD_HEADER
-
+#pragma once
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -70,5 +68,3 @@ class MonoD : public OutputDevice
      HANDLE handle;
    #endif
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/odevice.h b/Core/Tools/mangler/wlib/odevice.h
index ccd45e01a89..8cb924ea42a 100644
--- a/Core/Tools/mangler/wlib/odevice.h
+++ b/Core/Tools/mangler/wlib/odevice.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef ODEVICE_HEADER
-#define ODEVICE_HEADER
+#pragma once
 
 // This virtual base class provides an interface for output devices
 //  that can be used for the debugging package.
@@ -28,5 +27,3 @@ class OutputDevice
     virtual     ~OutputDevice() {};
     virtual int print(const char *s,int len)=0;
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/sem4.cpp b/Core/Tools/mangler/wlib/sem4.cpp
index 641ee16a28a..e11b95a362f 100644
--- a/Core/Tools/mangler/wlib/sem4.cpp
+++ b/Core/Tools/mangler/wlib/sem4.cpp
@@ -31,7 +31,7 @@ This is useful because the constructor will automatically call sem_init
 
 Sem4::Sem4()
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   sem_init(&sem,1,1);
 #else
   sem = CreateSemaphore(NULL, 1, 1, NULL);
@@ -40,7 +40,7 @@ Sem4::Sem4()
 
 Sem4::Sem4(uint32 value)
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   sem_init(&sem,1,value);
 #else
   sem = CreateSemaphore(NULL, value, value, NULL);
@@ -49,7 +49,7 @@ Sem4::Sem4(uint32 value)
 
 Sem4::~Sem4()
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   sem_destroy(&sem);
 #else
   if (sem) CloseHandle(sem);
@@ -58,28 +58,28 @@ Sem4::~Sem4()
 
 sint32  Sem4::Wait(void) const
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
 	return(sem_wait((sem_t *)&sem));
 #else
 	if (!sem)
 		return -1; // no semaphore!
 
 	DWORD dwWaitResult = WaitForSingleObject(sem, INFINITE);
-	switch (dwWaitResult) { 
+	switch (dwWaitResult) {
 	case WAIT_OBJECT_0: // The semaphore object was signaled.
 		return 0;
 		break;
 	case WAIT_TIMEOUT: // Should not happen ;)
 		return -1;
-		break; 
+		break;
 	}
 	return -1;
 #endif
-} 
+}
 
 sint32 Sem4::Post(void) const
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   return(sem_post((sem_t *)&sem));
 #else
   if (!sem)
@@ -92,19 +92,19 @@ sint32 Sem4::Post(void) const
 
 sint32 Sem4::TryWait(void) const
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   return(sem_trywait((sem_t *)&sem));
 #else
 	if (!sem)
 		return -1;
 	DWORD dwWaitResult = WaitForSingleObject(sem, 0L);
-	switch (dwWaitResult) { 
+	switch (dwWaitResult) {
 	case WAIT_OBJECT_0: // The semaphore object was signaled.
 		return 0;
 		break;
 	case WAIT_TIMEOUT:
 		return -1;
-		break; 
+		break;
 	}
 	return -1;
 #endif
@@ -112,7 +112,7 @@ sint32 Sem4::TryWait(void) const
 
 sint32 Sem4::GetValue(int *sval) const
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   return(sem_getvalue((sem_t *)&sem,sval));
 #else
 	if (!sem)
@@ -128,14 +128,14 @@ sint32 Sem4::GetValue(int *sval) const
 
 sint32 Sem4::Destroy(void)
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   return(sem_destroy(&sem));
 #else
   return CloseHandle(sem);
 #endif
 }
 
-#else  
+#else
 
 /****************************************************************************
 non threaded versions that do nothing
@@ -156,7 +156,7 @@ Sem4::~Sem4()
 sint32  Sem4::Wait(void) const
 {
   return(0);
-} 
+}
 
 sint32 Sem4::Post(void) const
 {
diff --git a/Core/Tools/mangler/wlib/sem4.h b/Core/Tools/mangler/wlib/sem4.h
index 1ffe33f6a83..303fb1e238f 100644
--- a/Core/Tools/mangler/wlib/sem4.h
+++ b/Core/Tools/mangler/wlib/sem4.h
@@ -16,21 +16,20 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef SEM4_HEADER
-#define SEM4_HEADER
+#pragma once
 
 #include <limits.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 #include "wstypes.h"
 
 #ifdef _REENTRANT
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <semaphore.h>
 #else
 #include <windows.h>
-#endif // _WINDOWS
+#endif // _WIN32
 #endif // _REENTRANT
 
 // Windows headers have a tendency to redefine IN
@@ -43,7 +42,7 @@ class Sem4
 {
  private:
   #ifdef _REENTRANT
-#ifndef _WINDOWS
+#ifndef _WIN32
   sem_t sem;
 #else
   HANDLE sem;
@@ -60,5 +59,3 @@ class Sem4
   sint32       GetValue(int *sval) const;
   sint32       Destroy(void);
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/stderrd.h b/Core/Tools/mangler/wlib/stderrd.h
index abc8b5e0ec0..3af596103e2 100644
--- a/Core/Tools/mangler/wlib/stderrd.h
+++ b/Core/Tools/mangler/wlib/stderrd.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef STDERRD_HEADER
-#define STDERRD_HEADER
+#pragma once
 
 #include "odevice.h"
 
@@ -35,5 +34,3 @@ class StderrD : public OutputDevice
      return(len);
    }
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/stdoutd.h b/Core/Tools/mangler/wlib/stdoutd.h
index 5170fc1f5cf..a7f51a76daf 100644
--- a/Core/Tools/mangler/wlib/stdoutd.h
+++ b/Core/Tools/mangler/wlib/stdoutd.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef STDOUTD_HEADER
-#define STDOUTD_HEADER
+#pragma once
 
 #include "odevice.h"
 
@@ -36,5 +35,3 @@ class StdoutD : public OutputDevice
      return(len);
    }
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/streamer.cpp b/Core/Tools/mangler/wlib/streamer.cpp
index 4c0ed141d1b..061baad77db 100644
--- a/Core/Tools/mangler/wlib/streamer.cpp
+++ b/Core/Tools/mangler/wlib/streamer.cpp
@@ -37,14 +37,14 @@ Streamer::Streamer() : streambuf(), Output_Device(NULL), Buf(NULL)
   static_assert(STREAMER_UNBUFFERED==0, "std::streambuf is assumed to be buffered by default");
 #endif
 }
- 
+
 Streamer::~Streamer()
 {
   ///////// calling sync seems to cause crashes here on Win32
   //sync();
   /////////
-  if (Buf)
-    delete[] Buf;
+
+  delete[] Buf;
 }
 
 int Streamer::setOutputDevice(OutputDevice *device)
@@ -111,14 +111,14 @@ int Streamer::doallocate()
     setb(
        Buf,         // base pointer
        Buf+STREAMER_BUFSIZ,  // ebuf pointer (end of buffer);
-       0);          // 0 = manual deletion of buff 
+       0);          // 0 = manual deletion of buff
 #else
     pubsetbuf(Buf, 2*STREAMER_BUFSIZ);
 #endif
 
     // Get area
     setg(
-        Buf,   // eback 
+        Buf,   // eback
         Buf,   // gptr
         Buf);  // egptr
 
diff --git a/Core/Tools/mangler/wlib/streamer.h b/Core/Tools/mangler/wlib/streamer.h
index ce94139cd0a..d0121a89be8 100644
--- a/Core/Tools/mangler/wlib/streamer.h
+++ b/Core/Tools/mangler/wlib/streamer.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef STREAMER_HEADER
-#define STREAMER_HEADER
+#pragma once
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -63,5 +62,3 @@ class Streamer : public streambuf
     OutputDevice  *Output_Device;
     char* Buf;
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/syslogd.cpp b/Core/Tools/mangler/wlib/syslogd.cpp
index aca18655b29..4107335c7ea 100644
--- a/Core/Tools/mangler/wlib/syslogd.cpp
+++ b/Core/Tools/mangler/wlib/syslogd.cpp
@@ -20,7 +20,7 @@
 
 SyslogD::SyslogD(char *ident,int logopt,int facility,int _priority)
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   openlog(ident,logopt,facility);
   priority=_priority;
 #endif
@@ -28,7 +28,7 @@ SyslogD::SyslogD(char *ident,int logopt,int facility,int _priority)
 
 int SyslogD::print(const char *str, int len)
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   char *temp_str=new char[len+1];
   memset(temp_str,0,len+1);
   strncpy(temp_str,str,len);
diff --git a/Core/Tools/mangler/wlib/syslogd.h b/Core/Tools/mangler/wlib/syslogd.h
index ee427b64182..74b25d313f0 100644
--- a/Core/Tools/mangler/wlib/syslogd.h
+++ b/Core/Tools/mangler/wlib/syslogd.h
@@ -16,12 +16,11 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef SYSLOGD_HEADER
-#define SYSLOGD_HEADER
+#pragma once
 
 #include <stdlib.h>
 #include <stdio.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <syslog.h>
 #endif
 #include <string.h>
@@ -44,5 +43,3 @@ class SyslogD : public OutputDevice
  private:
    int priority;
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/threadfac.cpp b/Core/Tools/mangler/wlib/threadfac.cpp
index b9b073fa789..e9934e71b6d 100644
--- a/Core/Tools/mangler/wlib/threadfac.cpp
+++ b/Core/Tools/mangler/wlib/threadfac.cpp
@@ -55,13 +55,13 @@ struct ThreadInformation
 bit8 ThreadFactory::startThread(Runnable &runable, void *data, bit8 destroy)
 {
 #ifdef _REENTRANT
- 
+
   {
 	  Runnable::CritSec_.lock();
 	  Runnable::ThreadCount_++;
 	  Runnable::CritSec_.unlock();
   }
- 
+
 
   ThreadInformation *tInfo=new ThreadInformation;
   tInfo->startPoint=(void *)&runable;
diff --git a/Core/Tools/mangler/wlib/threadfac.h b/Core/Tools/mangler/wlib/threadfac.h
index 97c9902b502..027de9be53b 100644
--- a/Core/Tools/mangler/wlib/threadfac.h
+++ b/Core/Tools/mangler/wlib/threadfac.h
@@ -20,8 +20,7 @@
 // Platform independent thread creation (Win32 & POSIX)
 //
 
-#ifndef THREADFAC_HEADER
-#define THREADFAC_HEADER
+#pragma once
 
 #ifdef _WIN32
   #include <process.h>
@@ -52,7 +51,7 @@
   #else  // UNIX
     static void *threadFuncLauncher(void *temp);
   #endif
- 
+
   // Fake entry point for classes
   #ifdef _WIN32
     static unsigned __stdcall threadClassLauncher(void *temp);
@@ -97,7 +96,7 @@ class Runnable
 
    // So do the threadClassLaunchers
    #ifdef _WIN32
-      friend static unsigned __stdcall threadClassLauncher(void *temp);
+     friend unsigned __stdcall threadClassLauncher(void *temp);
    #else  // UNIX
      friend void *threadClassLauncher(void *temp);
    #endif
@@ -120,5 +119,3 @@ class Runnable
    static int       ThreadCount_;
    static CritSec   CritSec_;           // to protect ThreadCount_
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/threadsafe.h b/Core/Tools/mangler/wlib/threadsafe.h
index 551ffe837be..bc5492885d4 100644
--- a/Core/Tools/mangler/wlib/threadsafe.h
+++ b/Core/Tools/mangler/wlib/threadsafe.h
@@ -31,8 +31,7 @@
 
 #ifdef _REENTRANT
 
-#ifndef THREADSAFE_HEADER
-#define THREADSAFE_HEADER
+#pragma once
 
 #define strtok		("strtok() is not MT-SAFE!")
 #define ascctime	("asctime() is not MT-SAFE!")
@@ -57,6 +56,4 @@
 #define pclose          ("pclose() is not MT-SAFE!")
 #define ctermid         ("ctermid() is not MT-SAFE!")
 #define getlogin        ("getlogin() is not MT-SAFE!");
-
-#endif  // THREADSAFE_HEADER
 #endif  // _REENTRANT
diff --git a/Core/Tools/mangler/wlib/timezone.cpp b/Core/Tools/mangler/wlib/timezone.cpp
index 34f558b072c..b43235f4752 100644
--- a/Core/Tools/mangler/wlib/timezone.cpp
+++ b/Core/Tools/mangler/wlib/timezone.cpp
@@ -22,7 +22,7 @@
 void GetTimezoneInfo(const char * &timezone_str, int &timezone_offset) {
 	timezone_str = "Unknown Timezone";
 	timezone_offset = 0;
-#ifdef _WINDOWS
+#ifdef _WIN32
 	struct _timeb    wintime;
 	_ftime(&wintime);
 
@@ -37,7 +37,7 @@ void GetTimezoneInfo(const char * &timezone_str, int &timezone_offset) {
 	timezone_offset = wintime.timezone * 60; // its in minutes...
 
 #endif
-#ifndef _WINDOWS
+#ifndef _WIN32
 	struct timeval   unixtime;
 	struct timezone  unixtzone;
 	gettimeofday(&unixtime,&unixtzone);
diff --git a/Core/Tools/mangler/wlib/timezone.h b/Core/Tools/mangler/wlib/timezone.h
index b7fe3ec5f1f..3849cad0001 100644
--- a/Core/Tools/mangler/wlib/timezone.h
+++ b/Core/Tools/mangler/wlib/timezone.h
@@ -25,8 +25,7 @@ only tells you info about what the daylight savings info is now, not 5 minutes
 from now, not 2 hours ago.  Oh well.
 \****************************************************************************/
 
-#ifndef _TIMEZONE_H_
-#define _TIMEZONE_H_
+#pragma once
 
 // Just fill in both the timezone description and its offset from GMT
 void GetTimezoneInfo(const char * &timezone_str, int &timezone_offset);
@@ -36,6 +35,3 @@ const char * TimezoneString(void);
 
 // Returns the offset from GMT of the current timezone
 int TimezoneOffset(void);
-
-#endif // _TIMEZONE_H_
-
diff --git a/Core/Tools/mangler/wlib/ustring.h b/Core/Tools/mangler/wlib/ustring.h
index 7796dfb3dd6..c06e0d06744 100644
--- a/Core/Tools/mangler/wlib/ustring.h
+++ b/Core/Tools/mangler/wlib/ustring.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USTRING_HEADER
-#define USTRING_HEADER
+#pragma once
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -57,5 +56,3 @@ class UstringT : public basic_string<charT, string_char_traits<charT> >
 };
 
 typedef UstringT<char> Ustring;
-
-#endif
diff --git a/Core/Tools/mangler/wlib/wdebug.cpp b/Core/Tools/mangler/wlib/wdebug.cpp
index 5f74856a133..a7490a1bbb1 100644
--- a/Core/Tools/mangler/wlib/wdebug.cpp
+++ b/Core/Tools/mangler/wlib/wdebug.cpp
@@ -37,7 +37,7 @@ static ostream           *warn_ostream=NULL;
 static Streamer           warn_streamer;
 
 static int                error_enabled=0;
-static ostream           *error_ostream=NULL;  
+static ostream           *error_ostream=NULL;
 static Streamer           error_streamer;
 
 
@@ -172,12 +172,12 @@ int MsgManager::setErrorStream(OutputDevice *device)
 ostream *MsgManager::debugStream(void)
 {
   return(debug_ostream);
-}   
+}
 
 ostream *MsgManager::infoStream(void)
 {
   return(info_ostream);
-}   
+}
 
 ostream *MsgManager::warnStream(void)
 {
@@ -187,4 +187,4 @@ ostream *MsgManager::warnStream(void)
 ostream *MsgManager::errorStream(void)
 {
   return(error_ostream);
-}   
+}
diff --git a/Core/Tools/mangler/wlib/wdebug.h b/Core/Tools/mangler/wlib/wdebug.h
index 1f397bd4532..e16319f4daf 100644
--- a/Core/Tools/mangler/wlib/wdebug.h
+++ b/Core/Tools/mangler/wlib/wdebug.h
@@ -50,8 +50,7 @@ will you be ready to leave grasshopper.
 
 \*****************************************************************************/
 
-#ifndef WDEBUG_HEADER
-#define WDEBUG_HEADER
+#pragma once
 
 #define USE_DEBUG_SEM
 
@@ -60,7 +59,7 @@ will you be ready to leave grasshopper.
 #include <Utility/iostream_adapter.h>
 #include <Utility/sstream_adapter.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WIN32)
 // Windows headers have a tendency to redefine IN
 #ifdef IN
 #undef IN
@@ -145,7 +144,7 @@ extern CritSec DebugLibSemaphore;
   if (MsgManager::infoStream()) \
     (*(MsgManager::infoStream())) << X;\
   DEBUGUNLOCK; \
-}    
+}
 
 // Just get a stream to the warning device, no extra junk
 #define WRNSTREAM(X)\
@@ -154,7 +153,7 @@ extern CritSec DebugLibSemaphore;
   if (MsgManager::warnStream()) \
     (*(MsgManager::warnStream())) << X;\
   DEBUGUNLOCK; \
-}    
+}
 
 // Just get a stream to the error device, no extra junk
 #define ERRSTREAM(X)\
@@ -163,7 +162,7 @@ extern CritSec DebugLibSemaphore;
   if (MsgManager::errorStream()) \
     (*(MsgManager::errorStream())) << X;\
   DEBUGUNLOCK; \
-}    
+}
 
 #ifndef DEBUG
 
@@ -184,7 +183,7 @@ extern CritSec DebugLibSemaphore;
 #define DBG(X) X
 
 // In Windows, send a copy to the debugger window
-#ifdef _WINDOWS
+#ifdef _WIN32
 
 // Print a variable
 #define PVAR(v) \
@@ -224,7 +223,7 @@ extern CritSec DebugLibSemaphore;
   __s << X << '\0';\
   OutputDebugString(STRSTREAM_CSTR(__s));\
   DEBUGUNLOCK; \
-}    
+}
 
 // Verbosely execute a statement
 #define VERBOSE(X)\
@@ -240,7 +239,7 @@ extern CritSec DebugLibSemaphore;
   DEBUGUNLOCK; \
 }
 
-#else // _WINDOWS
+#else // _WIN32
 
 // Print a variable
 #define PVAR(v) \
@@ -269,7 +268,7 @@ extern CritSec DebugLibSemaphore;
   if (MsgManager::debugStream()) \
     (*(MsgManager::debugStream())) << X;\
   DEBUGUNLOCK; \
-}    
+}
 
 // Verbosely execute a statement
 #define VERBOSE(X)\
@@ -280,7 +279,7 @@ extern CritSec DebugLibSemaphore;
      "]: " << ##X << endl; X \
   DEBUGUNLOCK; \
 }
-#endif // _WINDOWS
+#endif // _WIN32
 
 #endif  // DEBUG
 
@@ -310,5 +309,3 @@ class MsgManager
    static ostream            *warnStream(void);
    static ostream            *errorStream(void);
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/wstring.cpp b/Core/Tools/mangler/wlib/wstring.cpp
index 67fe0f51e48..a19c9aaa002 100644
--- a/Core/Tools/mangler/wlib/wstring.cpp
+++ b/Core/Tools/mangler/wlib/wstring.cpp
@@ -23,7 +23,7 @@ Project Name: Carpenter  (The RedAlert ladder creator)
 File Name   : string.cpp
 Author      : Neal Kettler
 Start Date  : June 1, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 
 A fairly typical string class.  This string class always copies any input
 string to it's own memory (for assignment or construction).
@@ -56,7 +56,7 @@ Wstring::Wstring(const Wstring &other):str(NULL), strsize(0)
 }
 
 Wstring::~Wstring()
-{ 
+{
   clear();
 }
 
@@ -149,7 +149,7 @@ bit8 Wstring::cat(const char *s)
   if(str)
     len += strlen(str);
 
-  // Space check 
+  // Space check
   strgrow(len);
 
   strcat(str, s);
@@ -241,7 +241,7 @@ bit8 Wstring::removeChar(char c)
 {
   int     len=0;
   char   *cptr=NULL;
-  bit8    removed=FALSE; 
+  bit8    removed=FALSE;
 
   if (str==NULL)
     return(FALSE);
@@ -265,8 +265,7 @@ void Wstring::removeSpaces(void)
 
 void Wstring::clear(void)
 {
- if(str)
-   delete[](str);
+ delete[](str);
  strsize=0;
  str=NULL;
 }
@@ -278,7 +277,7 @@ void Wstring::setSize(sint32 size)
   if (size<0)
     return;
 
-  str=new char[size]; 
+  str=new char[size];
   strsize=size;
   memset(str,0,size);
 }
@@ -319,7 +318,7 @@ uint32 Wstring::length(void) const
 bit8 Wstring::insert(const char *instring, uint32 pos)
 {
   if (str==NULL)
-    return(set(instring)); 
+    return(set(instring));
   if (pos>strlen(str))
     pos=strlen(str);
 
@@ -343,7 +342,7 @@ bit8 Wstring::insert(char k, uint32 pos)
 }
 
 
-// Joe Howes (05/19/2000):  This function inserts commas to nicely format a 
+// Joe Howes (05/19/2000):  This function inserts commas to nicely format a
 // large number (i.e.  1234567890 -> 1,234,567,890).  It doesn't really care
 // if the string is really a number or not.
 bit8 Wstring::beautifyNumber()
@@ -362,7 +361,7 @@ bit8 Wstring::beautifyNumber()
 			numcommas++;
 		}
 		accum = ( accum == 3 || accum == -1 ) ? 1 : accum + 1;
-        }	
+        }
 
 	return(TRUE);
 }
@@ -506,14 +505,14 @@ bit8 Wstring::truncate(uint32 len)
 bit8 Wstring::truncate(char c)
 {
   sint32  len;
- 
+
   if (str==NULL)
     return(FALSE);
 
   char   *cptr=strchr(str,c);
   if (cptr==NULL)
     return(FALSE);
-  len=(sint32)(cptr-str); 
+  len=(sint32)(cptr-str);
   truncate((uint32)len);
   return(TRUE);
 }
@@ -541,7 +540,7 @@ sint32 Wstring::getToken(int offset,const char *delim,Wstring &out) const
     if(strchr(delim,str[i])!=NULL)
       break;
   }
-  stop=i-1; 
+  stop=i-1;
   out.set(str+start);
   out.truncate((uint32)stop-start+1);
   return(stop+1);
@@ -557,7 +556,7 @@ sint32 Wstring::getLine(int offset, Wstring &out)
   start=i=offset;
   if (start >= (sint32)length())
     return(-1);
- 
+
   for (; i<(int)length(); i++) {
     if(strchr("\r\n",str[i])!=NULL)
       break;
diff --git a/Core/Tools/mangler/wlib/wstring.h b/Core/Tools/mangler/wlib/wstring.h
index 1e22d7b0179..dc3cf29dd76 100644
--- a/Core/Tools/mangler/wlib/wstring.h
+++ b/Core/Tools/mangler/wlib/wstring.h
@@ -23,11 +23,10 @@ Project Name: Carpenter  (The RedAlert ladder creator)
 File Name   : main.cpp
 Author      : Neal Kettler
 Start Date  : June 1, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 \****************************************************************************/
 
-#ifndef WSTRING_HEADER
-#define WSTRING_HEADER
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -35,7 +34,7 @@ Last Update : June 17, 1997
 
 class Wstring
 {
- public: 
+ public:
            Wstring();
            Wstring(const Wstring &other);
            Wstring(const char *string);
@@ -89,5 +88,3 @@ class Wstring
    char    *str;      // Pointer to allocated string.
    int      strsize;  // allocated data length
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/wstypes.h b/Core/Tools/mangler/wlib/wstypes.h
index 224c97d91a4..c13ef1fa3c8 100644
--- a/Core/Tools/mangler/wlib/wstypes.h
+++ b/Core/Tools/mangler/wlib/wstypes.h
@@ -23,20 +23,19 @@ Project Name: Carpenter  (The RedAlert ladder creator)
 File Name   : wstypes.h
 Author      : Neal Kettler
 Start Date  : June 3, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 
 Standard type definitions for the sake of portability and readability.
 \***************************************************************************/
 
-#ifndef WSTYPES_HEADER
-#define WSTYPES_HEADER
+#pragma once
 
 #ifdef _REENTRANT   // reentrant = threaded
 // Headers with non threadsafe libs need to come before my hacky
 //  threadsafe.h otherwise they won't compile
 
 #include <time.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #define _POSIX_C_SOURCE 199506L
 #define _POSIX_PTHREAD_SEMANTICS
 #define __EXTENSIONS__
@@ -44,7 +43,7 @@ Standard type definitions for the sake of portability and readability.
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <unistd.h>
 #include <sys/time.h>
 #include <dirent.h>
@@ -108,11 +107,9 @@ typedef double             float64;
 #define MAX_UINT8   0xFF
 #define MAX_SINT32  0x7FFFFFFF
 #define MAX_SINT16  0x7FFF
-#define MAX_SINT8   0x7F   
+#define MAX_SINT8   0x7F
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #define strncasecmp _strnicmp
 #define strcasecmp  _stricmp
-#endif  
-
 #endif
diff --git a/Core/Tools/mangler/wlib/wtime.cpp b/Core/Tools/mangler/wlib/wtime.cpp
index de6fb4d8d5d..3a3e84ea2f2 100644
--- a/Core/Tools/mangler/wlib/wtime.cpp
+++ b/Core/Tools/mangler/wlib/wtime.cpp
@@ -35,7 +35,7 @@ static const char *FULLMONTHS[]={"January","February","March","April","May","Jun
                "July","August","September","October","November","December"};
 
 // MDC: Windows doesn't provide a localtime_r, so make our own...
-#ifdef _WINDOWS
+#ifdef _WIN32
 #ifdef _REENTRANT
 #include "critsec.h"
 static CritSec localtime_critsec;
@@ -54,7 +54,7 @@ static struct tm *localtime_r(const time_t *clockval, struct tm *res) {
 #endif
 	return res;
 }
-#endif // _WINDOWS
+#endif // _WIN32
 
 Wtime::Wtime(void)
 {
@@ -82,13 +82,13 @@ Wtime::~Wtime()
 void Wtime::Update(void)
 {
  sign=POSITIVE;
- #ifdef _WINDOWS
+ #ifdef _WIN32
   struct _timeb    wintime;
   _ftime(&wintime);
   sec=wintime.time;
   usec=(wintime.millitm)*1000;
  #endif
- #ifndef _WINDOWS
+ #ifndef _WIN32
   struct timeval   unixtime;
   struct timezone  unixtzone;
   gettimeofday(&unixtime,&unixtzone);
@@ -159,11 +159,11 @@ bit8 Wtime::ParseDate(char *in)
 
   // The next part of the time is OPTIONAL (+minutes)
 
-  // first skip past the seconds 
+  // first skip past the seconds
   while ((isdigit(*ptr))&&(*ptr!=0)) ptr++;
   if (*ptr==0) return(TRUE);
 
-  // skip past any spaces 
+  // skip past any spaces
   while ((isspace(*ptr))&&(*ptr!=0)) ptr++;
   if (*ptr!='+')
   {
@@ -176,7 +176,7 @@ bit8 Wtime::ParseDate(char *in)
     //printf("\nPTR WAS 0\n");
     return(TRUE);
   }
- 
+
   minOffset=atol(ptr);
   //printf("\n\nAdding %d minutes!\n\n",minOffset);
   sec+=minOffset*60;  // add the minutes as seconds
@@ -210,7 +210,7 @@ bit8 Wtime::FormatTime(char *out, const char *format)
       if (lastWasH==1) lastWasH=2;
       sprintf(out+strlen(out),"%c",*ptr);
       ptr+=1;
-    } 
+    }
     else if (strncmp(ptr,"\"",1)==0)
     {
       break;
@@ -304,7 +304,7 @@ bit8 Wtime::FormatTime(char *out, const char *format)
     {
       sprintf(out+strlen(out),"%ld",((GetMonth()-1)/4)+1);  // GetQuarter
       ptr+=1;
-    } 
+    }
     else if (strncmp(ptr,"yyyy",4)==0)
     {
       sprintf(out+strlen(out),"%ld",GetYear());
@@ -314,7 +314,7 @@ bit8 Wtime::FormatTime(char *out, const char *format)
     {
       sprintf(out+strlen(out),"%02ld",GetYear()%100);
       ptr+=2;
-    } 
+    }
     else if (strncmp(ptr,"y",1)==0)
     {
       sprintf(out+strlen(out),"%ld",GetYDay());
@@ -504,7 +504,7 @@ uint32 Wtime::GetYWeek(void) const
   //phase holds the first weekday of the year.  If (Jan 1 = Sun) phase = 0
   sint32 phase=((wday-yday)%7);
   if (phase<0) phase+=7;
-  yweek=((yday+phase-1)/7)+1; 
+  yweek=((yday+phase-1)/7)+1;
   return(yweek);
 }
 uint32 Wtime::GetMonth(void) const
@@ -549,7 +549,7 @@ int   Wtime::Compare(const Wtime &other) const
   else
     return(-1);
 }
-  
+
 
 bit8 Wtime::operator == ( const Wtime &other ) const
 {
@@ -723,7 +723,7 @@ Wtime &Wtime::operator -= (const Wtime &other)
   sint32 temp;
   if (Compare(other)==-1)
   {
-    sec=0;                  // can't handle negative time 
+    sec=0;                  // can't handle negative time
     usec=0;
     return *this;
   }
diff --git a/Core/Tools/mangler/wlib/wtime.h b/Core/Tools/mangler/wlib/wtime.h
index 79ffb86a4de..e969217da0b 100644
--- a/Core/Tools/mangler/wlib/wtime.h
+++ b/Core/Tools/mangler/wlib/wtime.h
@@ -20,16 +20,15 @@
 wtime                      Neal Kettler
 
 \****************************************************************************/
-#ifndef WTIME_HEADER
-#define WTIME_HEADER
 
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <sys/types.h>
 
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <unistd.h>
 #include <netinet/in.h>
 #include <sys/time.h>
@@ -59,7 +58,7 @@ class Wtime
              ~Wtime();
 
     void      Update();   // Update members sec & usec to system time
-                          
+
 
     void      PrintTime(FILE *out) const;
     void      PrintTime(char *out) const;
@@ -90,7 +89,7 @@ class Wtime
     bit8      GetSign(void) const;  // 0 = pos   1 = neg
 
     int       Compare(const Wtime &other) const;
-    
+
     // comparisons
     bit8   operator == ( const Wtime &other ) const;
     bit8   operator != ( const Wtime &other ) const;
@@ -124,5 +123,3 @@ class Wtime
     uint32    usec;    // microseconds (millionths of a second)
     bit8      sign;    // for time differences 0 = pos 1 = neg
 };
-
-#endif
diff --git a/Core/Tools/mangler/wlib/xtime.cpp b/Core/Tools/mangler/wlib/xtime.cpp
index 58a3bbad017..d36a7ec1875 100644
--- a/Core/Tools/mangler/wlib/xtime.cpp
+++ b/Core/Tools/mangler/wlib/xtime.cpp
@@ -29,7 +29,7 @@ long long after you'll be dead.
 
 #include <ctype.h>
 #include <time.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <sys/time.h>
 #endif
 #include "xtime.h"
@@ -88,9 +88,9 @@ static sint32 Get_Day(int month, int day, int year)
 static bit8 Get_Date_From_Day(sint32 days, OUT sint32 &year, OUT sint32 &yday)
 {
   //register long int rem;
-  register long int y;
+  long int y;
   //register const unsigned short int *ip;
- 
+
   if (days <= 365)
   {
     year=0;
@@ -102,7 +102,7 @@ static bit8 Get_Date_From_Day(sint32 days, OUT sint32 &year, OUT sint32 &yday)
   days-=365;
 
   days--;  // zero based
- 
+
   //
   // As far as I can tell there's no non-iteritive way to
   //   do this...
@@ -111,7 +111,7 @@ static bit8 Get_Date_From_Day(sint32 days, OUT sint32 &year, OUT sint32 &yday)
   {
     /* Guess a corrected year, assuming 365 days per year.  */
     long int yg = y + days / 365 - (days % 365 < 0);
- 
+
     /* Adjust DAYS and Y to match the guessed year.  */
     days -= ((yg - y) * 365
         + LEAPS_THRU_END_OF (yg - 1)
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
         }
         ydaycount++;
       }
-    } 
+    }
     printf("(%d) ",year);
   }
 ***************************************
@@ -269,7 +269,7 @@ void Xtime::normalize(void)
 {
   day_+=(msec_/86400000);
   msec_%=86400000;
- 
+
   while (msec_ < 0)
   {
     day_--;
@@ -286,13 +286,13 @@ void Xtime::update(void)
   day_=719528;  // day_s from year 0 to Jan1, 1970
   msec_=0;
 
- #ifdef _WINDOWS
+ #ifdef _WIN32
   struct _timeb    wintime;
   _ftime(&wintime);
   addSeconds(wintime.time);
   msec_+=wintime.millitm;
  #endif
- #ifndef _WINDOWS
+ #ifndef _WIN32
   struct timeval   unixtime;
   struct timezone  unixtzone;
   gettimeofday(&unixtime,&unixtzone);
@@ -318,14 +318,14 @@ bit8 Xtime::FormatTime(char *out, const char *format)
   int ampmflag = 0;
   out[0]=0;
   const char *ptr=format;
- 
+
   if (*ptr=='"') ptr++;  // skip past open quote if exists
- 
+
   while (*ptr!=0)
   {
     if (lastWasH>0)
       lastWasH--;
- 
+
     if (isspace(*ptr))
     {
       if (lastWasH==1) lastWasH=2;
@@ -501,7 +501,7 @@ bit8 Xtime::FormatTime(char *out, const char *format)
   }
   return(TRUE);
 }
- 
+
 /**************************************
 
  REPLACE THIS CRAP
@@ -567,11 +567,11 @@ bit8 Xtime::ParseDate(char *in)
 
   // The next part of the time is OPTIONAL (+minutes)
 
-  // first skip past the seconds 
+  // first skip past the seconds
   while ((isdigit(*ptr))&&(*ptr!=0)) ptr++;
   if (*ptr==0) return(TRUE);
 
-  // skip past any spaces 
+  // skip past any spaces
   while ((isspace(*ptr))&&(*ptr!=0)) ptr++;
   if (*ptr!='+')
   {
@@ -584,7 +584,7 @@ bit8 Xtime::ParseDate(char *in)
     //printf("\nPTR WAS 0\n");
     return(TRUE);
   }
- 
+
   minOffset=atol(ptr);
   //printf("\n\nAdding %d minutes!\n\n",minOffset);
   sec+=minOffset*60;  // add the minutes as seconds
@@ -699,7 +699,7 @@ int Xtime::getYDay(void) const   // Day of Year  (1-366)  (366 = leap yr)
 //
 // Get all the components of the time in the usual normalized format.
 //
-// Most of the uglyness is in Get_Date_From_Day() 
+// Most of the uglyness is in Get_Date_From_Day()
 //
 bit8 Xtime::getTime(int &month, int &mday, int &year, int &hour, int &minute, int &second) const
 {
@@ -728,7 +728,7 @@ bit8 Xtime::getTime(int &month, int &mday, int &year, int &hour, int &minute, in
 
   // Whew! Now all we have to do is figure out H/M/S from the msec!
   hour=(msec_/3600000)%24;  // 1000*60*60
-  minute=(msec_/60000)%60;  // 1000*60 
+  minute=(msec_/60000)%60;  // 1000*60
   second=(msec_/ 1000)%60;  // 1000
 
   return(TRUE);
@@ -795,7 +795,7 @@ bit8 Xtime::setSecond(sint32 sec)
 //
 bit8 Xtime::setMinute(sint32 min)
 {
-  sint32 minute=(msec_/60000)%60;  // 1000*60 
+  sint32 minute=(msec_/60000)%60;  // 1000*60
   msec_-=(minute*60000);
   msec_+=(min*60000);
   return(TRUE);
@@ -845,7 +845,7 @@ bit8 Xtime::setMonth(sint32 _month)
 
 
 //
-// Modify the day of the month 
+// Modify the day of the month
 //
 bit8 Xtime::setMDay(sint32 _mday)
 {
@@ -881,7 +881,7 @@ int   Xtime::compare(const Xtime &other) const
   else
     return(-1);
 }
-  
+
 
 bit8 Xtime::operator == ( const Xtime &other ) const
 {
diff --git a/Core/Tools/mangler/wlib/xtime.h b/Core/Tools/mangler/wlib/xtime.h
index 7a0a0319a5c..c79e4c9f43a 100644
--- a/Core/Tools/mangler/wlib/xtime.h
+++ b/Core/Tools/mangler/wlib/xtime.h
@@ -22,23 +22,21 @@ xtime                      Neal Kettler
 This is version 2 of the Wtime library (now xtime).  It now supports
 time storage from the year 0 to well after the sun
 will have gone supernova (OK, OK I admit it'll break in the
-year 5 Million.) 
+year 5 Million.)
 
 The call to update the current time will break in 2038.
 Hopefully by then somebody will replace the lame time()
 function :-)
 \****************************************************************************/
 
-#ifndef XTIME_HEADER
-#define XTIME_HEADER
-
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <sys/types.h>
 
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <unistd.h>
 #include <netinet/in.h>
 #include <sys/time.h>
@@ -79,7 +77,7 @@ class Xtime
     void      PrintDate(char *out) const;
 **********/
 
-    sint32    getDay(void) const;    // Get days since year 0 
+    sint32    getDay(void) const;    // Get days since year 0
     sint32    getMsec(void) const;   // Get milliseconds into the day
 
     void      setDay(sint32 day);
@@ -110,11 +108,11 @@ class Xtime
     bit8      setMonth(sint32 month);
     bit8      setMDay(sint32 mday);
 
-    void      normalize(void);  // move msec overflows to the day 
+    void      normalize(void);  // move msec overflows to the day
 
     // Compare two times
     int       compare(const Xtime &other) const;
-    
+
     // comparisons
     bit8   operator == ( const Xtime &other ) const;
     bit8   operator != ( const Xtime &other ) const;
@@ -142,5 +140,3 @@ class Xtime
     sint32    day_;    // days since Jan 1, 0
     sint32    msec_;   // milliseconds  (thousandths of a sec)
 };
-
-#endif
diff --git a/Core/Tools/mangler/wnet/field.cpp b/Core/Tools/mangler/wnet/field.cpp
index 0233bc148bc..699b52507cd 100644
--- a/Core/Tools/mangler/wnet/field.cpp
+++ b/Core/Tools/mangler/wnet/field.cpp
@@ -16,25 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- *                                                                         * 
- *                 Project Name : Westwood Auto Registration App           * 
- *                                                                         * 
- *                    File Name : FIELD.CPP                                * 
- *                                                                         * 
- *                   Programmer : Philip W. Gorrow                         * 
- *                                                                         * 
- *                   Start Date : 04/22/96                                 * 
- *                                                                         * 
- *                  Last Update : April 22, 1996 [PWG]                     * 
- *                                                                         * 
- *  Actual member function for the field class.                            * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ *                                                                         *
+ *                 Project Name : Westwood Auto Registration App           *
+ *                                                                         *
+ *                    File Name : FIELD.cpp                                *
+ *                                                                         *
+ *                   Programmer : Philip W. Gorrow                         *
+ *                                                                         *
+ *                   Start Date : 04/22/96                                 *
+ *                                                                         *
+ *                  Last Update : April 22, 1996 [PWG]                     *
+ *                                                                         *
+ *  Actual member function for the field class.                            *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 #include <string.h>
 #include <sys/types.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <netinet/in.h>
 #else
 #define Win32_Winsock
@@ -61,37 +61,37 @@ FieldClass::FieldClass(char *id, char data)
   Data=NULL;
   Set(id,data);
 }
- 
+
 FieldClass::FieldClass(char *id, unsigned char data)
 {
   Data=NULL;
   Set(id,data);
 }
- 
+
 FieldClass::FieldClass(char *id, short data)
 {
   Data=NULL;
   Set(id,data);
 }
- 
+
 FieldClass::FieldClass(char *id, unsigned short data)
 {
   Data=NULL;
   Set(id,data);
 }
- 
+
 FieldClass::FieldClass(char *id, long data)
 {
   Data=NULL;
   Set(id,data);
 }
- 
+
 FieldClass::FieldClass(char *id, unsigned long data)
 {
   Data=NULL;
   Set(id,data);
 }
- 
+
 FieldClass::FieldClass(char *id, char *data)
 {
   Data=NULL;
@@ -224,20 +224,20 @@ char *FieldClass::Get_ID(void)
 return(ID);
 }
 
-/************************************************************************** 
+/**************************************************************************
  * PACKETCLASS::HOST_TO_NET_FIELD -- Converts host field to net format    *
- *                                                                        * 
+ *                                                                        *
  * INPUT:    FIELD   * to the data field we need to convert               *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:     none                                                       *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/22/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/22/1996 PWG : Created.                                            *
  *========================================================================*/
 void FieldClass::Host_To_Net(void)
 {
   //
-  // Before we convert the data type, we should convert the actual data 
+  // Before we convert the data type, we should convert the actual data
   //  sent.
   //
   switch (DataType) {
@@ -270,15 +270,15 @@ void FieldClass::Host_To_Net(void)
   Size      = htons(Size);
 }
 
-/************************************************************************** 
+/**************************************************************************
  * PACKETCLASS::NET_TO_HOST_FIELD -- Converts net field to host format    *
- *                                                                        * 
+ *                                                                        *
  * INPUT:    FIELD   * to the data field we need to convert               *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:     none                                                       *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/22/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/22/1996 PWG : Created.                                            *
  *========================================================================*/
 void FieldClass::Net_To_Host(void)
 {
@@ -289,7 +289,7 @@ void FieldClass::Net_To_Host(void)
   Size      = ntohs(Size);
 
   //
-  // Before we convert the data type, we should convert the actual data 
+  // Before we convert the data type, we should convert the actual data
   //  sent.
   //
   switch (DataType) {
diff --git a/Core/Tools/mangler/wnet/field.h b/Core/Tools/mangler/wnet/field.h
index cc91f55bce5..de573ddbeec 100644
--- a/Core/Tools/mangler/wnet/field.h
+++ b/Core/Tools/mangler/wnet/field.h
@@ -16,23 +16,23 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- *                                                                         * 
- *                 Project Name : Westwood Auto Registration App           * 
- *                                                                         * 
- *                    File Name : FIELD.H                                  * 
- *                                                                         * 
- *                   Programmer : Philip W. Gorrow                         * 
- *                                                                         * 
- *                   Start Date : 04/22/96                                 * 
- *                                                                         * 
- *                  Last Update : April 22, 1996 [PWG]                     * 
- *                                                                         * 
+/***************************************************************************
+ *                                                                         *
+ *                 Project Name : Westwood Auto Registration App           *
+ *                                                                         *
+ *                    File Name : FIELD.h                                  *
+ *                                                                         *
+ *                   Programmer : Philip W. Gorrow                         *
+ *                                                                         *
+ *                   Start Date : 04/22/96                                 *
+ *                                                                         *
+ *                  Last Update : April 22, 1996 [PWG]                     *
+ *                                                                         *
  * This module takes care of maintaining the field list used to process    *
  * packets.                                                                *
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #define FIELD_HEADER_SIZE	(sizeof(FieldClass) - (sizeof(void *) * 2))
diff --git a/Core/Tools/mangler/wnet/packet.cpp b/Core/Tools/mangler/wnet/packet.cpp
index d5e3bb4be55..8cda4f64b01 100644
--- a/Core/Tools/mangler/wnet/packet.cpp
+++ b/Core/Tools/mangler/wnet/packet.cpp
@@ -16,30 +16,30 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- *                                                                         * 
- *                 Project Name : Westwood Auto Registration App           * 
- *                                                                         * 
- *                    File Name : PACKET.CPP                               * 
- *                                                                         * 
- *                   Programmer : Philip W. Gorrow                         * 
- *                                                                         * 
- *                   Start Date : 04/22/96                                 * 
- *                                                                         * 
- *                  Last Update : April 24, 1996 [PWG]                     * 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- *   *PacketClass::Find_Field -- Finds a field if it exists in the packets * 
- *   Get_Field -- Find specified name and returns data                     * 
- *   PacketClass::~PacketClass -- destroys a packet class be freeing list  * 
- *   PacketClass::Add_Field -- Adds a FieldClass entry to head of packet li* 
+/***************************************************************************
+ *                                                                         *
+ *                 Project Name : Westwood Auto Registration App           *
+ *                                                                         *
+ *                    File Name : PACKET.cpp                               *
+ *                                                                         *
+ *                   Programmer : Philip W. Gorrow                         *
+ *                                                                         *
+ *                   Start Date : 04/22/96                                 *
+ *                                                                         *
+ *                  Last Update : April 24, 1996 [PWG]                     *
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ *   *PacketClass::Find_Field -- Finds a field if it exists in the packets *
+ *   Get_Field -- Find specified name and returns data                     *
+ *   PacketClass::~PacketClass -- destroys a packet class be freeing list  *
+ *   PacketClass::Add_Field -- Adds a FieldClass entry to head of packet li*
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <netinet/in.h>
 #else
 #define Win32_Winsock
@@ -49,15 +49,15 @@
 #include "packet.h"
 
 
-/************************************************************************** 
- * PACKETCLASS::~PACKETCLASS -- destroys a packet class be freeing list   * 
- *                                                                        * 
+/**************************************************************************
+ * PACKETCLASS::~PACKETCLASS -- destroys a packet class be freeing list   *
+ *                                                                        *
  * INPUT:    none                                                         *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:     none                                                       *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/24/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/24/1996 PWG : Created.                                            *
  *========================================================================*/
 PacketClass::~PacketClass()
 {
@@ -74,33 +74,33 @@ PacketClass::~PacketClass()
 }
 
 
-/************************************************************************** 
- * PACKETCLASS::ADD_FIELD -- Adds a FieldClass entry to head of packet li * 
- *                                                                        * 
+/**************************************************************************
+ * PACKETCLASS::ADD_FIELD -- Adds a FieldClass entry to head of packet li *
+ *                                                                        *
  * INPUT:    FieldClass * - a properly constructed field class entry.     *
- *                                                                        * 
- * OUTPUT:     none                                                       * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/24/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * OUTPUT:     none                                                       *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/24/1996 PWG : Created.                                            *
  *========================================================================*/
 void PacketClass::Add_Field(FieldClass *field)
 {
   field->Next = Head;
-  Head = field;  
+  Head = field;
 }
 
-/************************************************************************** 
- * PACKETCLASS::PACKETCLASS -- Creates a Packet object from a COMMS packe * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/22/1996 PWG : Created.                                            * 
+/**************************************************************************
+ * PACKETCLASS::PACKETCLASS -- Creates a Packet object from a COMMS packe *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/22/1996 PWG : Created.                                            *
  *========================================================================*/
 PacketClass::PacketClass(char *curbuf)
 {
@@ -166,19 +166,19 @@ PacketClass::PacketClass(char *curbuf)
   }
 }
 
-/************************************************************************** 
- * CREATE_COMMS_PACKET -- Walks field list creating a packet              * 
- *                                                                        * 
+/**************************************************************************
+ * CREATE_COMMS_PACKET -- Walks field list creating a packet              *
+ *                                                                        *
  * INPUT:    short - the id of the packet so the server can identify it *
  *          unsigned short & - the size of the packet returned here    *
- *                                                                        * 
- * OUTPUT:     void * pointer to the linear packet data                   * 
- *                                                                        * 
+ *                                                                        *
+ * OUTPUT:     void * pointer to the linear packet data                   *
+ *                                                                        *
  * WARNINGS:   This routine allocates memory that the user is responsible *
  *          for freeing.                                *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/22/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/22/1996 PWG : Created.                                            *
  *========================================================================*/
 char *PacketClass::Create_Comms_Packet(int &size)
 {
@@ -201,7 +201,7 @@ char *PacketClass::Create_Comms_Packet(int &size)
   }
 
   //
-  // Now that we know the size allocate a buffer big enough to hold the 
+  // Now that we know the size allocate a buffer big enough to hold the
   // packet.
   //
   char *retval = new char[size];
@@ -251,15 +251,15 @@ char *PacketClass::Create_Comms_Packet(int &size)
 }
 
 
-/************************************************************************** 
- * PACKETCLASS::FIND_FIELD -- Finds a field if it exists in the packets   * 
- *                                                                        * 
+/**************************************************************************
+ * PACKETCLASS::FIND_FIELD -- Finds a field if it exists in the packets   *
+ *                                                                        *
  * INPUT:    char *  - the id of the field we are looking for.            *
- *                                                                        * 
- * OUTPUT:     FieldClass * pointer to the field class                    * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * OUTPUT:     FieldClass * pointer to the field class                    *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 FieldClass *PacketClass::Find_Field(char *id)
 {
@@ -278,7 +278,7 @@ FieldClass *PacketClass::Get_Field_At(int position)
 	FieldClass *current = Head;
 	for (; (current && (i < position)); current = current->Next, i++) {
 	}
-	
+
 	if (current) return current;
 	else return NULL;
 }
@@ -287,27 +287,27 @@ FieldClass *PacketClass::Get_Field_At(int position)
 int PacketClass::Get_Num_Fields()
 {
 	int i = 0;
-		
+
 	for (FieldClass *current = Head; current; current = current->Next, i++) {}
-	
+
 	return i;
 
 }
 
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data                      * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data                      *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *           char &   - the reference to store the data into              *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The data reference is not changed if the field is not       *
  *          found.                                                        *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, char &data)
 {
@@ -316,22 +316,22 @@ bit8 PacketClass::Get_Field(char *id, char &data)
     data = *((char *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data                      * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data                      *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *           unsigned char &   - the reference to store the data into     *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The data reference is not changed if the field is not       *
  *          found.                                                        *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, unsigned char &data)
 {
@@ -340,22 +340,22 @@ bit8 PacketClass::Get_Field(char *id, unsigned char &data)
     data = *((unsigned char *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data                      * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data                      *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *          short &   - the reference to store the data into              *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The data reference is not changed if the field is not       *
  *          found.                                                        *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, short &data)
 {
@@ -364,22 +364,22 @@ bit8 PacketClass::Get_Field(char *id, short &data)
     data = *((short *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data                      * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data                      *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *           unsigned short &   - the reference to store the data into    *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The data reference is not changed if the field is not       *
  *          found.                                                        *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, unsigned short &data)
 {
@@ -388,22 +388,22 @@ bit8 PacketClass::Get_Field(char *id, unsigned short &data)
     data = *((unsigned short *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data                      * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data                      *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *          long &   - the reference to store the data into               *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The data reference is not changed if the field is not       *
  *          found.                                                        *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, long &data)
 {
@@ -412,7 +412,7 @@ bit8 PacketClass::Get_Field(char *id, long &data)
     data = *((long *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 
 
@@ -427,20 +427,20 @@ bit8 PacketClass::Get_Field(char *id, int &data)
 
 
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data as a string          * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data as a string          *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *           char *   - the string to store the data into                 *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The string is not changed if the field is not found.  It    *
  *          is assumed that the string variabled specified by the         *
  *          pointer is large enough to hold the data.                     *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, char *data)
 {
@@ -451,19 +451,19 @@ bit8 PacketClass::Get_Field(char *id, char *data)
   return((field) ? true : false);
 }
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data                      * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data                      *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *          unsigned long &   - the reference to store the data into      *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The data reference is not changed if the field is not       *
  *          found.                                                        *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, unsigned long &data)
 {
@@ -472,7 +472,7 @@ bit8 PacketClass::Get_Field(char *id, unsigned long &data)
     data = *((unsigned long *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 bit8 PacketClass::Get_Field(char *id, unsigned  &data)
 {
@@ -481,7 +481,7 @@ bit8 PacketClass::Get_Field(char *id, unsigned  &data)
     data = *((unsigned *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 
 
@@ -514,7 +514,7 @@ bit8 PacketClass::Get_Field(char *id, void *data, int &length)
 unsigned short PacketClass::Get_Field_Size(char* id)
 {
    FieldClass *field = Find_Field(id);
-   if (field) 
+   if (field)
 	return field->Get_Size();
    else
 	return 0;
diff --git a/Core/Tools/mangler/wnet/packet.h b/Core/Tools/mangler/wnet/packet.h
index c3a21680781..d61870cb9d7 100644
--- a/Core/Tools/mangler/wnet/packet.h
+++ b/Core/Tools/mangler/wnet/packet.h
@@ -16,27 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- *                                                                         * 
- *                 Project Name : Westwood Auto Registration App           * 
- *                                                                         * 
- *                    File Name : PACKET.H                                 * 
- *                                                                         * 
- *                   Programmer : Philip W. Gorrow                         * 
- *                                                                         * 
- *                   Start Date : 04/19/96                                 * 
- *                                                                         * 
- *                  Last Update : April 19, 1996 [PWG]                     * 
- *                                                                         * 
+/***************************************************************************
+ *                                                                         *
+ *                 Project Name : Westwood Auto Registration App           *
+ *                                                                         *
+ *                    File Name : PACKET.h                                 *
+ *                                                                         *
+ *                   Programmer : Philip W. Gorrow                         *
+ *                                                                         *
+ *                   Start Date : 04/19/96                                 *
+ *                                                                         *
+ *                  Last Update : April 19, 1996 [PWG]                     *
+ *                                                                         *
  * This header defines the functions for the PacketClass.  The packet      *
- * class is used to create a linked list of field entries which can be     * 
+ * class is used to create a linked list of field entries which can be     *
  * converted to a linear packet in a COMMS API compatible format.          *
  *                                                                         *
  * Packets can be created empty and then have fields added to them or can  *
  * be created from an existing linear packet.                              *
  *                                                                         *
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "field.h"
@@ -76,7 +76,7 @@ class PacketClass
     void Add_Field(char *field, void *data, int length) {Add_Field(new FieldClass(field, data, length));};
 
     //
-    // These functions search for a field of a given name in the list and 
+    // These functions search for a field of a given name in the list and
     // return the data via a reference value.
     //
     FieldClass *Find_Field(char *id);
@@ -91,14 +91,14 @@ class PacketClass
     bit8 Get_Field(char *id, unsigned &data);
     bit8 Get_Field(char *id, char *data);
     bit8 Get_Field(char *id, void *data, int &length);
-    unsigned short Get_Field_Size(char* id); 
+    unsigned short Get_Field_Size(char* id);
 
     // gks 9/25/2000
     FieldClass *Get_Field_At(int position);
     int Get_Num_Fields();
 
     char *Create_Comms_Packet(int &size);
-        
+
   private:
     unsigned short   Size;
     short            ID;
diff --git a/Core/Tools/mangler/wnet/tcp.cpp b/Core/Tools/mangler/wnet/tcp.cpp
index 8fd62a62222..66ea079c7af 100644
--- a/Core/Tools/mangler/wnet/tcp.cpp
+++ b/Core/Tools/mangler/wnet/tcp.cpp
@@ -25,7 +25,7 @@ SERVER mode.  Note that this uses non-blocking sockets.
 
 The FD_* macros:
 
-  FD_CLR(int fd, fd_set *set);     // clear a single FD 
+  FD_CLR(int fd, fd_set *set);     // clear a single FD
   FD_ISSET(int fd, fd_set *set);   // check whether a single FD is set
   FD_SET(int fd, fd_set *set);     // set a single FD
   FD_ZERO(fd_set * set);           // clear the entire set
@@ -43,7 +43,7 @@ uint8  *buff=new uint8[1024];
 int     retval;
 TCP tcp(CLIENT);
 
-tcp.Bind((uint32)0,(uint16)0); // let system pick local IP and a Port for you 
+tcp.Bind((uint32)0,(uint16)0); // let system pick local IP and a Port for you
 tcp.Connect("tango",13);       // can connect by name or "10.1.1.10"
                                // or the integer in host byte order
 
@@ -99,7 +99,7 @@ while (1)
 #include "tcp.h"
 #include <stdarg.h>
 
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <errno.h>
 #define closesocket close
 #endif
@@ -112,7 +112,7 @@ TCP::TCP(int new_mode)
   fd = -1;
   clientCount=0;
   if ((new_mode==CLIENT)||(new_mode==SERVER))
-    mode=new_mode; 
+    mode=new_mode;
   FD_ZERO(&clientList);
   connectionState=CLOSED;
   inputDelay=5;
@@ -129,7 +129,7 @@ TCP::TCP(int new_mode,sint16 socket)
   fd = socket;
   clientCount=0;
   if ((new_mode==CLIENT)||(new_mode==SERVER))
-    mode=new_mode; 
+    mode=new_mode;
   FD_ZERO(&clientList);
 
   inputDelay=5;
@@ -170,7 +170,7 @@ sint32 TCP::SetBlocking(bit8 block,sint32 whichFD)
    if (whichFD==0)
      whichFD=fd;
 
-   #ifdef _WINDOWS
+   #ifdef _WIN32
    unsigned long flag=1;
    if (block)
      flag=0;
@@ -185,7 +185,7 @@ sint32 TCP::SetBlocking(bit8 block,sint32 whichFD)
    if (block==FALSE)          // set nonblocking
      flags |= O_NONBLOCK;
    else                       // set blocking
-     flags &= ~(O_NONBLOCK);  
+     flags &= ~(O_NONBLOCK);
 
    if (fcntl(whichFD, F_SETFL, flags) < 0)
    {
@@ -217,9 +217,9 @@ sint32 TCP::Write(const uint8 *msg,uint32 len,sint32 whichFD)
       assert(FALSE);
     whichFD=fd;
   }
-  SetBlocking(TRUE,whichFD); 
+  SetBlocking(TRUE,whichFD);
   retval=send(whichFD,(const char *)msg,len,0);
-  #ifdef _WINDOWS
+  #ifdef _WIN32
     if (retval==SOCKET_ERROR)
       retval=-1;
   #endif
@@ -241,7 +241,7 @@ sint32 TCP::WriteNB(uint8 *msg,uint32 len,sint32 whichFD)
     whichFD=fd;
   }
   retval=send(whichFD,(const char *)msg,len,0);
-  #ifdef _WINDOWS
+  #ifdef _WIN32
     if (retval==SOCKET_ERROR)
       retval=-1;
   #endif
@@ -288,7 +288,7 @@ sint32 TCP::EncapsulatedWrite(uint8 *msg,uint32 len,sint32 whichFD)
         data=1;
       else if (data==1)
         data=2;
-      else if (data==255) 
+      else if (data==255)
         data=3;
 
       retval=send(whichFD,(char *)&data,1,0);
@@ -403,15 +403,15 @@ uint16 TCP::GetRemotePort(sint32 whichFD)
 
   if (mode==CLIENT)
   {
-    if(getpeername(fd,(sockaddr *)&sin,&sinSize)==0)    
+    if(getpeername(fd,(sockaddr *)&sin,&sinSize)==0)
       return(ntohs(sin.sin_port));
   }
   else if (mode==SERVER)
   {
-    if(getpeername(whichFD,(sockaddr *)&sin,&sinSize)==0)   
+    if(getpeername(whichFD,(sockaddr *)&sin,&sinSize)==0)
       return(ntohs(sin.sin_port));
   }
-  return(0); 
+  return(0);
 }
 
 
@@ -441,7 +441,7 @@ bit8 TCP::IsConnected(sint32 whichFD)
     }
   return(FALSE);
 }
-    
+
 
 // Not portable?
 /**************
@@ -455,7 +455,7 @@ sint32 TCP::GetSockStatus(sint32 whichFD)
   retval=getsockopt(whichFD,SOL_SOCKET,SO_ERROR,(char *)&status,&size);
   if (retval==-1)
     return(-1);
-  return(status); 
+  return(status);
 }
 *******************/
 
@@ -559,7 +559,7 @@ sint32 TCP::TimedRead(uint8 *msg,uint32 len,int seconds,sint32 whichFD)
     retval=Read(msg+bytes_read,len-bytes_read,whichFD);
     if (retval==0)    // they closed
     {
-      DBGMSG("Remote close!\n");
+      DBGMSG("Remote close!");
       return(bytes_read);
     }
     else if (retval>0)
@@ -646,9 +646,9 @@ sint32 TCP::EncapsulatedRead(uint8 *msg,uint32 len,sint32 whichFD)
         else if (data==2)
           data=1;
         else if (data==3)
-          data=(char)255; 
+          data=(char)255;
       }
-      msg[i]=data; 
+      msg[i]=data;
     }
     if (retval==-1)
       return(bytesRead);
@@ -663,7 +663,7 @@ sint32 TCP::CloseAll(void)
 
   if (mode==CLIENT)
     return(Close());
-  
+
   for(i=0; i<=maxFD; i++)
   {
     if ((i!=fd)&&(FD_ISSET(i,&clientList)))
@@ -708,7 +708,7 @@ sint32 TCP::Close(sint32 whichFD)
          return(closesocket(fd));
        else
          return(-1);
-     } 
+     }
      else if ((whichFD<=maxFD) && (FD_ISSET(whichFD,&clientList)))
      {
        if (whichFD==maxFD)  // make sure maxFD is still correct
@@ -904,7 +904,7 @@ bit8 TCP::Bind(char *Host,uint16 port,bit8 reuseAddr)
 
 bit8 TCP::Bind(uint32 IP,uint16 Port,bit8 reuseAddr)
 {
-  int retval; 
+  int retval;
   int status;
 
   IP=htonl(IP);
@@ -929,20 +929,20 @@ bit8 TCP::Bind(uint32 IP,uint16 Port,bit8 reuseAddr)
 /******************  this may make the socket get garbage data??
     opval=1;
     retval=setsockopt(fd,SOL_SOCKET,SO_REUSEPORT,(char *)&opval,sizeof(opval));
-    if (retval!=0) 
+    if (retval!=0)
       fprintf(stderr,"Could not set socket to SO_REUSEPORT\n");
 **********************/
     #endif
-    #ifdef SO_REUSEADDR 
+    #ifdef SO_REUSEADDR
     opval=1;
     retval=setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,(char *)&opval,sizeof(opval));
     if (retval!=0)
       fprintf(stderr,"Could not set socket to SO_REUSEADDR\n");
-    #endif    
+    #endif
   }
 
   retval=bind(fd,(struct sockaddr *)&addr,sizeof(addr));
-  #ifdef _WINDOWS
+  #ifdef _WIN32
     if (retval==SOCKET_ERROR)
       retval=-1;
   #endif
@@ -1013,7 +1013,7 @@ bit8 TCP::Connect(uint32 IP,uint16 Port)
     result = connect(fd,(struct sockaddr *)&serverAddr, sizeof(serverAddr));
     status=GetStatus();
 
-    #ifdef _WINDOWS
+    #ifdef _WIN32
       if (result==SOCKET_ERROR)
         result=-1;
     #endif
@@ -1091,7 +1091,7 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
   result=-1;
 
   if (connectionState==CONNECTING)
-  { 
+  {
     if (IsConnected(fd))
     {
       DBGMSG("CONNECTION COMPLETE at point 1");
@@ -1107,7 +1107,7 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
   connectErrno=errno;
   status=GetStatus();
 
-  #ifdef _WINDOWS
+  #ifdef _WIN32
     if (result==SOCKET_ERROR)
     {
       DBGMSG("Socket error 1  " << status);
@@ -1124,7 +1124,7 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
     ClearStatus();
     result = connect(fd,(struct sockaddr *)&serverAddr, sizeof(serverAddr));
     status=GetStatus();
-    #ifdef _WINDOWS
+    #ifdef _WIN32
       if (result==SOCKET_ERROR)
       {
         DBGMSG("Socket error 2  " << status);
@@ -1159,14 +1159,14 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
 
 void TCP::ClearStatus(void)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
   errno=0;
   #endif
 }
 
 int TCP::GetStatus(void)
 {
-  #ifdef _WINDOWS
+  #ifdef _WIN32
   int status=WSAGetLastError();
   if (status==0) return(OK);
   else if (status==WSAEINTR) return(INTR);
diff --git a/Core/Tools/mangler/wnet/tcp.h b/Core/Tools/mangler/wnet/tcp.h
index 85030eafc3b..3e76c99eade 100644
--- a/Core/Tools/mangler/wnet/tcp.h
+++ b/Core/Tools/mangler/wnet/tcp.h
@@ -21,8 +21,7 @@ TCP                   Neal Kettler        neal@westwood.com
 
 \****************************************************************************/
 
-#ifndef TCP_HEADER
-#define TCP_HEADER
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,7 +30,7 @@ TCP                   Neal Kettler        neal@westwood.com
 #include <string.h>
 #include <assert.h>
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 
 #include <winsock.h>
 #include <io.h>
@@ -83,14 +82,14 @@ class TCP
 
 
   sint32      inputDelay;         // default delay for semi-blocking reads
-  sint32      outputDelay;        // default delay for semi-blocking writes 
+  sint32      outputDelay;        // default delay for semi-blocking writes
 
   enum ConnectionState
   {
      CLOSED,
      CONNECTING,
      CONNECTED
-  }           connectionState;     // What state is client FD in 
+  }           connectionState;     // What state is client FD in
 
 public:
 
@@ -195,5 +194,3 @@ class TCP
   bit8    SetOutputDelay(sint32 delay) { outputDelay=delay; return(TRUE); };
 
 };
-
-#endif
diff --git a/Core/Tools/mangler/wnet/udp.cpp b/Core/Tools/mangler/wnet/udp.cpp
index 72e0d662ed0..bba9479b658 100644
--- a/Core/Tools/mangler/wnet/udp.cpp
+++ b/Core/Tools/mangler/wnet/udp.cpp
@@ -60,7 +60,7 @@ sint32 UDP::Bind(uint32 IP,uint16 Port)
   addr.sin_port=Port;
   addr.sin_addr.s_addr=IP;
   fd=socket(AF_INET,SOCK_DGRAM,DEFAULT_PROTOCOL);
-  #ifdef _WINDOWS
+  #ifdef _WIN32
   if (fd==SOCKET_ERROR)
     fd=-1;
   #endif
@@ -69,7 +69,7 @@ sint32 UDP::Bind(uint32 IP,uint16 Port)
 
   retval=bind(fd,(struct sockaddr *)&addr,sizeof(addr));
 
-  #ifdef _WINDOWS
+  #ifdef _WIN32
     if (retval==SOCKET_ERROR)
       retval=-1;
   #endif
@@ -81,7 +81,7 @@ sint32 UDP::Bind(uint32 IP,uint16 Port)
   }
 
   int namelen=sizeof(addr);
-  getsockname(fd, (struct sockaddr *)&addr, &namelen); 
+  getsockname(fd, (struct sockaddr *)&addr, &namelen);
 
   myIP=ntohl(addr.sin_addr.s_addr);
   myPort=ntohs(addr.sin_port);
@@ -104,7 +104,7 @@ bit8 UDP::getLocalAddr(uint32 &ip, uint16 &port)
 // private function
 sint32 UDP::SetBlocking(bit8 block)
 {
-  #ifdef _WINDOWS
+  #ifdef _WIN32
    unsigned long flag=1;
    if (block)
      flag=0;
@@ -145,11 +145,11 @@ sint32 UDP::Write(uint8 *msg,uint32 len,uint32 IP,uint16 port)
 
   ClearStatus();
   retval=sendto(fd,(char *)msg,len,0,(struct sockaddr *)&to,sizeof(to));
-  #ifdef _WINDOWS
+  #ifdef _WIN32
   if (retval==SOCKET_ERROR)
     retval=-1;
   #endif
-  
+
   return(retval);
 }
 
@@ -161,7 +161,7 @@ sint32 UDP::Read(uint8 *msg,uint32 len,sockaddr_in *from)
   if (from!=NULL)
   {
     retval=recvfrom(fd,(char *)msg,len,0,(struct sockaddr *)from,&alen);
-    #ifdef _WINDOWS
+    #ifdef _WIN32
     if (retval==SOCKET_ERROR)
       retval=-1;
     #endif
@@ -169,7 +169,7 @@ sint32 UDP::Read(uint8 *msg,uint32 len,sockaddr_in *from)
   else
   {
     retval=recvfrom(fd,(char *)msg,len,0,NULL,NULL);
-    #ifdef _WINDOWS
+    #ifdef _WIN32
     if (retval==SOCKET_ERROR)
       retval=-1;
     #endif
@@ -180,14 +180,14 @@ sint32 UDP::Read(uint8 *msg,uint32 len,sockaddr_in *from)
 
 void UDP::ClearStatus(void)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
   errno=0;
   #endif
 }
 
 UDP::sockStat UDP::GetStatus(void)
 {
- #ifdef _WINDOWS
+ #ifdef _WIN32
   int status=WSAGetLastError();
   if (status==0) return(OK);
   else if (status==WSAEINTR) return(INTR);
@@ -227,13 +227,13 @@ UDP::sockStat UDP::GetStatus(void)
 int UDP::Wait(sint32 sec,sint32 usec,fd_set &returnSet)
 {
   fd_set inputSet;
- 
+
   FD_ZERO(&inputSet);
   FD_SET(fd,&inputSet);
- 
+
   return(Wait(sec,usec,inputSet,returnSet));
 }
- 
+
 //
 // Wait for net activity on a list of sockets
 //
@@ -244,17 +244,17 @@ int UDP::Wait(sint32 sec,sint32 usec,fd_set &givenSet,fd_set &returnSet)
   int          retval=0,done,givenMax;
   bit8         noTimeout=FALSE;
   timeval      tv;
- 
+
   returnSet=givenSet;
   backupSet=returnSet;
- 
+
   if ((sec==-1)&&(usec==-1))
     noTimeout=TRUE;
- 
+
   timeout.SetSec(sec);
   timeout.SetUsec(usec);
   timethen+=timeout;
- 
+
   givenMax=fd;
   for (uint32 i=0; i<(sizeof(fd_set)*8); i++)   // i=maxFD+1
   {
@@ -262,7 +262,7 @@ int UDP::Wait(sint32 sec,sint32 usec,fd_set &givenSet,fd_set &returnSet)
       givenMax=i;
   }
   ///DBGMSG("WAIT  fd="<<fd<<"  givenMax="<<givenMax);
- 
+
   done=0;
   while( ! done)
   {
@@ -273,7 +273,7 @@ int UDP::Wait(sint32 sec,sint32 usec,fd_set &givenSet,fd_set &returnSet)
       timeout.GetTimevalMT(tv);
       retval=select(givenMax+1,&returnSet,0,0,&tv);
     }
- 
+
     if (retval>=0)
       done=1;
 
@@ -310,7 +310,7 @@ int UDP::Wait(sint32 sec,sint32 usec,fd_set &givenSet,fd_set &returnSet)
 
 bit8 UDP::SetInputBuffer(uint32 bytes)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
    int retval,arg=bytes;
 
    retval=setsockopt(fd,SOL_SOCKET,SO_RCVBUF,
@@ -328,7 +328,7 @@ bit8 UDP::SetInputBuffer(uint32 bytes)
 
 bit8 UDP::SetOutputBuffer(uint32 bytes)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
    int retval,arg=bytes;
 
    retval=setsockopt(fd,SOL_SOCKET,SO_SNDBUF,
@@ -342,11 +342,11 @@ bit8 UDP::SetOutputBuffer(uint32 bytes)
   #endif
 }
 
-// Get the system buffer sizes 
+// Get the system buffer sizes
 
 int UDP::GetInputBuffer(void)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
    int retval,arg=0,len=sizeof(int);
 
    retval=getsockopt(fd,SOL_SOCKET,SO_RCVBUF,
@@ -360,7 +360,7 @@ int UDP::GetInputBuffer(void)
 
 int UDP::GetOutputBuffer(void)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
    int retval,arg=0,len=sizeof(int);
 
    retval=getsockopt(fd,SOL_SOCKET,SO_SNDBUF,
diff --git a/Core/Tools/mangler/wnet/udp.h b/Core/Tools/mangler/wnet/udp.h
index e3de5774304..7f40086058d 100644
--- a/Core/Tools/mangler/wnet/udp.h
+++ b/Core/Tools/mangler/wnet/udp.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef UDP_HEADER
-#define UDP_HEADER
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,7 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <winsock.h>
 #include <io.h>
 #define close _close
@@ -57,11 +56,11 @@ class UDP
 {
  // DATA
  private:
-  sint32       fd; 
+  sint32       fd;
   uint32       myIP;
   uint16       myPort;
   struct       sockaddr_in  addr;
-  
+
   // These defines specify a system independent way to
   //   get error codes for socket services.
   enum sockStat
@@ -104,11 +103,9 @@ class UDP
 
   bit8             getLocalAddr(uint32 &ip, uint16 &port);
   sint32           getFD(void) { return(fd); }
- 
+
   bit8             SetInputBuffer(uint32 bytes);
   bit8             SetOutputBuffer(uint32 bytes);
   int              GetInputBuffer(void);
   int              GetOutputBuffer(void);
 };
-
-#endif
diff --git a/Core/Tools/matchbot/debug.cpp b/Core/Tools/matchbot/debug.cpp
index fa10a02bd05..2da4663134c 100644
--- a/Core/Tools/matchbot/debug.cpp
+++ b/Core/Tools/matchbot/debug.cpp
@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 
 #include <stdarg.h>
 void DebugCrash( const char *fmt, ... ) {}
diff --git a/Core/Tools/matchbot/debug.h b/Core/Tools/matchbot/debug.h
index a9ac87b270b..1df2a069478 100644
--- a/Core/Tools/matchbot/debug.h
+++ b/Core/Tools/matchbot/debug.h
@@ -20,8 +20,7 @@
 // Minimal debug info
 // Author: Matthew D. Campbell, Sept 2002
 
-#ifndef __DEBUG_H__
-#define __DEBUG_H__
+#pragma once
 
 #ifdef DEBUG
 
@@ -41,6 +40,3 @@ void DebugLog( const char *fmt, ... );
 #define DEBUG_LOG(x) {}
 
 #endif // DEBUG
-
-#endif // __DEBUG_H__
-
diff --git a/Core/Tools/matchbot/encrypt.h b/Core/Tools/matchbot/encrypt.h
index af2091e5346..f4c204a6479 100644
--- a/Core/Tools/matchbot/encrypt.h
+++ b/Core/Tools/matchbot/encrypt.h
@@ -16,13 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef ENCRYPT_HEADER
-#define ENCRYPT_HEADER
+#pragma once
 
 #define MAX_ENCRYPTED_STRING 8
 //char *do_encrypt(char *, char *);
 char *do_encrypt(char *);
-
-#endif
-
-
diff --git a/Core/Tools/matchbot/generals.cpp b/Core/Tools/matchbot/generals.cpp
index 5e1b699fe6a..8c6837a8790 100644
--- a/Core/Tools/matchbot/generals.cpp
+++ b/Core/Tools/matchbot/generals.cpp
@@ -506,7 +506,7 @@ double GeneralsMatcher::computeMatchFitness(const std::string& i1, const General
 	//DBGMSG("Match fitness: "<<matchFitness);
 
 	/*
-	DBGMSG(i1->first << " vs " << i2->first << " has fitness " << matchFitness << "\n"
+	DBGMSG(i1->first << " vs " << i2->first << " has fitness " << matchFitness
 			   "\tpointPercent: " << pointPercent << "\n"
 			   "\tpingDelta: " << pingDelta << "\n"
 			   "\twidened: " << u1->widened << u2->widened << "\n"
@@ -626,7 +626,7 @@ void GeneralsMatcher::checkMatchesInUserMap(UserMap& userMap, int ladderID, int
 									{
 
 										i5 = i4;
-										for (++i5; i5 != userMap.end(); ++i3)
+										for (++i5; i5 != userMap.end(); ++i5)
 										{
 											u5 = i5->second;
 											if (u5->status != STATUS_WORKING)
@@ -737,12 +737,12 @@ void GeneralsMatcher::checkMatchesInUserMap(UserMap& userMap, int ladderID, int
 					}
 				}
 			}
-		} // for i2
+		}
 
 		if (bestUser && numPlayers == 2)
 		{
 			// we had a match.  send the info.
-			DBGMSG("Matching " << i1->first << " with " << bestName << ":\n"
+			DBGMSG("Matching " << i1->first << " with " << bestName << ":"
 			       "\tmatch fitness: " << bestMatchFitness << "\n"
 			       "\tpoint percentage: " << (1-bestUser->points/(double)u1->points)*100 << "\n"
 			       "\tpoints: " << u1->points << ", " << u2->points << "\n"
@@ -752,7 +752,7 @@ void GeneralsMatcher::checkMatchesInUserMap(UserMap& userMap, int ladderID, int
 			              u1, bestUser, NULL, NULL, NULL, NULL, NULL, NULL, 2, ladderID);
 			break;
 		}
-	} // for i1
+	}
 
 	dumpUsers();
 }
diff --git a/Core/Tools/matchbot/generals.h b/Core/Tools/matchbot/generals.h
index 0cdd581ec94..a00619d704c 100644
--- a/Core/Tools/matchbot/generals.h
+++ b/Core/Tools/matchbot/generals.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __GENERALS_H__
-#define __GENERALS_H__
+#pragma once
 
 #ifdef _WIN32
 #include <process.h>
@@ -189,6 +188,3 @@ class GeneralsClientMatcher : public MatcherClass
 private:
 }
 ;
-
-#endif /* __GENERALS_H__ */
-
diff --git a/Core/Tools/matchbot/global.h b/Core/Tools/matchbot/global.h
index adb3cd0da09..577df4b2c2e 100644
--- a/Core/Tools/matchbot/global.h
+++ b/Core/Tools/matchbot/global.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __GLOBAL_H__
-#define __GLOBAL_H__
+#pragma once
 
 #ifdef _WIN32
 #include <process.h>
@@ -52,6 +51,3 @@ extern GlobalClass Global;
 // Log rotation functions
 void rotateOutput(void);
 void rotateParanoid(void);
-
-#endif
-
diff --git a/Core/Tools/matchbot/main.cpp b/Core/Tools/matchbot/main.cpp
index fcbaa3f4707..8b0a78fb571 100644
--- a/Core/Tools/matchbot/main.cpp
+++ b/Core/Tools/matchbot/main.cpp
@@ -183,7 +183,7 @@ int main(int argc, char ** argv)
 
 	Setup_Signals();
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	// ----- Initialize Winsock -----
 	WORD verReq = MAKEWORD(2, 2);
 	WSADATA wsadata;
@@ -240,10 +240,11 @@ int main(int argc, char ** argv)
 		exit( -1);
 	}
 
-	if (s_generalsMatcher)
-		delete s_generalsMatcher;
-	if (s_generalsClientMatcher)
-		delete s_generalsClientMatcher;
+	delete s_generalsMatcher;
+	s_generalsMatcher = NULL;
+
+	delete s_generalsClientMatcher;
+	s_generalsClientMatcher = NULL;
 
 	return 0;
 }
@@ -319,7 +320,7 @@ void rotateOutput(void)
 	sprintf(filenamebuf, "%s/%02d%02d%04d_%02d%02d%02d_log", logpath.get(),
 	        xtime.getMonth(), xtime.getMDay(), xtime.getYear(), xtime.getHour(),
 	        xtime.getMinute(), xtime.getSecond());
-#ifdef _WINDOWS
+#ifdef _WIN32
 	mkdir(logpath.get());
 #else
 	mkdir(logpath.get(), 00666);
@@ -395,7 +396,7 @@ void rotateParanoid(void)
 	sprintf(filenamebuf, "%s/%02d%02d%04d_%02d%02d%02d_log", logpath.get(),
 	        xtime.getMonth(), xtime.getMDay(), xtime.getYear(), xtime.getHour(),
 	        xtime.getMinute(), xtime.getSecond());
-#ifdef _WINDOWS
+#ifdef _WIN32
 	mkdir(logpath.get());
 #else
 	mkdir(logpath.get(), 00666);
diff --git a/Core/Tools/matchbot/matcher.cpp b/Core/Tools/matchbot/matcher.cpp
index 9af08ecf975..53f4c95a568 100644
--- a/Core/Tools/matchbot/matcher.cpp
+++ b/Core/Tools/matchbot/matcher.cpp
@@ -22,7 +22,7 @@
 #include "timezone.h"
 #include "debug.h"
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #define usleep(x) Sleep((x)/100000)
 #endif
 
@@ -240,29 +240,29 @@ static void NickErrorCallback ( PEER peer, int type, const char * badNick, int n
 void callbackEach( CHAT chat, CHATBool success, int index, const char *channel,
                    const char *topic, int numUsers, void *param )
 {
-	DEBUG_LOG(("Chat channel success: %d\n", success));
+	DEBUG_LOG(("Chat channel success: %d", success));
 	if (!success)
 	{
 		return;
 	}
-	DEBUG_LOG(("Channel[%d]: %s (%s), %d users\n",
+	DEBUG_LOG(("Channel[%d]: %s (%s), %d users",
 	           index, channel, topic, numUsers));
 }
 
 void callbackAll( CHAT chat, CHATBool success, int numChannels, const char **channels,
                   const char **topics, int *numUsers, void *param )
 {
-	DEBUG_LOG(("Chat channels success: %d\n", success));
+	DEBUG_LOG(("Chat channels success: %d", success));
 	if (!success)
 	{
 		return;
 	}
 
-	DEBUG_LOG(("%d channels found\n", numChannels));
+	DEBUG_LOG(("%d channels found", numChannels));
 
 	for (int i=0; i<numChannels; ++i)
 	{
-		DEBUG_LOG(("Channel[%d]: %s (%s), %d users\n",
+		DEBUG_LOG(("Channel[%d]: %s (%s), %d users",
 		           i, channels[i], topics[i], numUsers[i]));
 	}
 }
@@ -271,9 +271,9 @@ void MatcherClass::handleConnect( bool success )
 {
 	m_connectSuccess = success;
 
-	//DEBUG_LOG(("Enumerating chat channels\n"));
+	//DEBUG_LOG(("Enumerating chat channels"));
 	//chatEnumChannels( peerGetChat(m_peer), "", callbackEach, callbackAll, NULL, CHATTrue );
-	//DEBUG_LOG(("Done enumerating chat channels\n"));
+	//DEBUG_LOG(("Done enumerating chat channels"));
 }
 
 void MatcherClass::handleGroupRoomList( bool success, int groupID, const char *name )
diff --git a/Core/Tools/matchbot/matcher.h b/Core/Tools/matchbot/matcher.h
index c143966387c..2d35c8e32fb 100644
--- a/Core/Tools/matchbot/matcher.h
+++ b/Core/Tools/matchbot/matcher.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __MATCHER_H__
-#define __MATCHER_H__
+#pragma once
 
 #ifdef _WIN32
 #include <process.h>
@@ -88,6 +87,3 @@ class MatcherClass
 	time_t m_lastRotation;
 
 };
-
-#endif /* __MATCHER_H__ */
-
diff --git a/Core/Tools/matchbot/mydebug.cpp b/Core/Tools/matchbot/mydebug.cpp
index 7a4da3ab8fd..3ad1e156e40 100644
--- a/Core/Tools/matchbot/mydebug.cpp
+++ b/Core/Tools/matchbot/mydebug.cpp
@@ -80,12 +80,7 @@ int MyMsgManager::ReplaceAllStreams(FileD * output_device, const char *device_fi
 	MYDEBUGLOCK;
 
 	delete(paranoid_ostream);
-
-	if (output_device != NULL)
-	{
-		delete(output_device);
-		output_device = NULL;
-	}
+	delete(output_device);
 
 	rename(device_filename, copy_filename);
 
diff --git a/Core/Tools/matchbot/mydebug.h b/Core/Tools/matchbot/mydebug.h
index 6c5d42877f6..91227b3cfaa 100644
--- a/Core/Tools/matchbot/mydebug.h
+++ b/Core/Tools/matchbot/mydebug.h
@@ -18,10 +18,10 @@
 
 /*****************************************************************************\
 wdebug                        Neal Kettler
- 
+
 MT-LEVEL
     MT-Safe
- 
+
 The debugging module is pretty good for debugging and it has some message
 printing stuff as well.  The basic idea is that you write a class that
 inherits from OutputDevice (several are provided) and assign that output
@@ -31,27 +31,26 @@ or they can all have the same one.  Debugging messages only get compiled
 in if your module defines 'DEBUG'. If you don't define debug, then not even
 the text of the debugging message gets into the binary.   All the other
 output streams get printed regardless of whether DEBUG is defined.
- 
+
 Sample usage:
 FileD debug_device("gameres.debug");     // create a file device
 MsgManager::setDebugStream(&debug_device);
 DBGMSG("This debug message #" << 1 << " you use C++ streams");
- 
+
 Note that since these are defines you really don't need to put a semicolon
 at the end, and it can be bad in situations like this:
- 
+
 if (x)
   DBGMSG("Stuff is broken");
 else
   DBGMSG("Stuff is NOT broken");
- 
+
 This won't compile, read the code until you figure it out.  Only then
 will you be ready to leave grasshopper.
- 
+
 \*****************************************************************************/
 
-#ifndef MYDEBUG_HEADER
-#define MYDEBUG_HEADER
+#pragma once
 
 #define USE_SEM
 
@@ -130,5 +129,3 @@ class MyMsgManager
 
 	static ostream            *paranoidStream(void);
 };
-
-#endif
diff --git a/Core/Tools/matchbot/rand.h b/Core/Tools/matchbot/rand.h
index 59eadee1e80..73ae3ec9be6 100644
--- a/Core/Tools/matchbot/rand.h
+++ b/Core/Tools/matchbot/rand.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __RAND_H__
-#define __RAND_H__
+#pragma once
 
 #include <cstdlib>
 
@@ -40,6 +39,3 @@ class RandClass
 	unsigned int seed[6];
 
 };
-
-#endif /* __RAND_H__ */
-
diff --git a/Core/Tools/matchbot/wlib/arraylist.h b/Core/Tools/matchbot/wlib/arraylist.h
index 17f4fa1c65d..58c8481842b 100644
--- a/Core/Tools/matchbot/wlib/arraylist.h
+++ b/Core/Tools/matchbot/wlib/arraylist.h
@@ -19,7 +19,7 @@
 /****************************************************************************\
 *        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S         *
 ******************************************************************************
-Project Name: 
+Project Name:
 File Name   : arraylist.h
 Author      : Neal Kettler
 Start Date  : Jan 19, 1997
@@ -44,8 +44,7 @@ that don't belong to them, etc...
 
 \****************************************************************************/
 
-#ifndef ARRAYLIST_HEADER
-#define ARRAYLIST_HEADER    
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -67,7 +66,7 @@ class ArrayList
                    ArrayList(ArrayList<T> &other);
                   ~ArrayList();
 
-  // Remove all entries from the lsit 
+  // Remove all entries from the lsit
   void             clear(void);
 
   // Add a node after the zero based 'pos'
@@ -83,7 +82,7 @@ class ArrayList
   bit8             remove(OUT T &node,sint32 pos);
   bit8             remove(sint32 pos);
   bit8             removeHead(OUT T &node);
-  bit8             removeTail(OUT T &node); 
+  bit8             removeTail(OUT T &node);
 
   // Replace one obj with another
   bit8             replace(IN T &node, sint32 pos);
@@ -92,7 +91,7 @@ class ArrayList
   // Get a node without removing from the list
   bit8             get(OUT T &node,sint32 pos) RO;
   bit8             getHead(OUT T &node) RO;
-  bit8             getTail(OUT T &node) RO;        
+  bit8             getTail(OUT T &node) RO;
 
   // Get a pointer to the interally managed copy (careful!)
   bit8             getPointer(OUT T **node,sint32 pos) RO;
@@ -126,7 +125,7 @@ class ArrayList
 };
 
 
-//Create the empty list 
+//Create the empty list
 template <class T>
 ArrayList<T>::ArrayList()
 {
@@ -168,7 +167,7 @@ ArrayList<T> &ArrayList<T>::operator=(IN ArrayList<T> &other)
   {
     other.get(node,i);
     addTail(node);
-  } 
+  }
   return(*this);
 }
 
@@ -183,7 +182,7 @@ void ArrayList<T>::clear()
                           //  at home kiddies!
   }
   Entries_=0;
-}            
+}
 
 // ************************* UNSAFE UNSAFE UNSAFE *************************
 // Note - Don't call this on any type with a constructor/destructor since this
@@ -228,7 +227,7 @@ template <class T>
 bit8 ArrayList<T>::add(IN T &node,sint32 pos)
 {
   if (pos > Entries_)      // You can only access one of the end of the vector
-    pos=Entries_; 
+    pos=Entries_;
   if (pos >= Slots_)        // If we're at the end, grow the list
     growVector();
   if (Entries_ >= Slots_)   // enuff space?
@@ -242,7 +241,7 @@ bit8 ArrayList<T>::add(IN T &node,sint32 pos)
   //fprintf(stderr,"Placement new to %p\n",(Vector_+pos));
 
   // This uses the placement new operator. placement new allows us to
-  //  specify the memory address for the new object.  In this case we 
+  //  specify the memory address for the new object.  In this case we
   //  want it at the 'pos' index into our array.
   new((void *)(Vector_+pos)) T((T &)node); // Trust me, this isn't a memory leak
   Entries_++;                         // one new entry
@@ -252,7 +251,7 @@ bit8 ArrayList<T>::add(IN T &node,sint32 pos)
 
 // Add to the first node, all others get shifted down one slot
 template <class T>
-bit8 ArrayList<T>::addHead(IN T &node)  
+bit8 ArrayList<T>::addHead(IN T &node)
 {
   return(add(node,0));
 }
@@ -263,7 +262,7 @@ template <class T>
 bit8 ArrayList<T>::addTail(IN T &node)
 {
   return(add(node,length()));
-}  
+}
 
 
 // addSortedX only works (properly) if evrerything else in the list is added
@@ -376,16 +375,16 @@ sint32 ArrayList<T>::_sortedLookup(IN T &target, int ascending)
 
 
 /*// addNumSortedX works in much the same way as addSortedX, except that I needed
-// it for a very specific thing.  I needed a list of strings numerically sorted, 
+// it for a very specific thing.  I needed a list of strings numerically sorted,
 // not alphabetically sorted.  Furthermore these strings were composed of numbers
-// delimited by underscores.  In the interest of keeping it generic, these 
+// delimited by underscores.  In the interest of keeping it generic, these
 // functions take as args a node, a delimiting character, and a count of the
 // number of fields to include in a sort.  If this is the list of strings:
 //
 //	55_100, 2_5, 23_32, 98_445, 2_48, 8_88, 2_3, 2_4
 //
 // An alphabetical sort is:
-//	
+//
 //	2_3, 2_4, 2_48, 2_5, 55_100, 8_88, 98_445
 //
 // But a numerical sort by calling addNumSortedAsc(<whatever>, "_", 2) will result in:
@@ -393,7 +392,7 @@ sint32 ArrayList<T>::_sortedLookup(IN T &target, int ascending)
 //	2_3, 2_4, 2_5, 2_48, 8_88, 55_100, 98_445
 //
 // Yes...now that you mention it I am on crack...
-//	
+//
 template <class T>
 bit8 ArrayList<T>::addNumSortedAsc(IN T &node, char delim, int fields)
 {
@@ -421,10 +420,10 @@ sint32 ArrayList<T>::_numSortedLookup(IN T &target, char delim, int fields, int
 	T* 	midtarget;
 
 
-	// Trivial case 
+	// Trivial case
 	if( Entries_ == 0 )
 		return 0;
-	
+
 	low = 0;
 	high = Entries_;
 	while( 1 )
@@ -465,14 +464,14 @@ sint32 ArrayList<T>::_numSortedLookup(IN T &target, char delim, int fields, int
 			{
 				if( target <= *lowtarget )
 					return low;
-				else 
+				else
 					return high;
 			}
 			else
 			{
 				if( target <= *lowtarget )
 					return high;
-				else 
+				else
 					return low;
 			}
 		}
@@ -508,7 +507,7 @@ bit8 ArrayList<T>::replace(IN T &node, sint32 pos)
     pos=0;
   if (pos >= Entries_)
     pos=Entries_-1;
-  
+
   (Vector_+pos)->~T();    // Call the destructor manually. Don't try this
                           //  at home kiddies!
 
@@ -523,7 +522,7 @@ bit8 ArrayList<T>::replace(IN T &node, sint32 pos)
 // Remove at the zero based index specified by 'pos'.  When removing from
 // a slot, all others get shifted up by one.
 template <class T>
-bit8 ArrayList<T>::remove(sint32 pos) 
+bit8 ArrayList<T>::remove(sint32 pos)
 {
   if (Entries_==0)
     return(FALSE);
@@ -531,7 +530,7 @@ bit8 ArrayList<T>::remove(sint32 pos)
     pos=0;
   if (pos >= Entries_)
     pos=Entries_-1;
-  
+
   (Vector_+pos)->~T();    // Call the destructor manually. Don't try this
                           //  at home kiddies!
 
@@ -562,7 +561,7 @@ bit8 ArrayList<T>::remove(OUT T &node, sint32 pos)
 
 // Remove the first node of the list
 template <class T>
-bit8 ArrayList<T>::removeHead(OUT T &node)     
+bit8 ArrayList<T>::removeHead(OUT T &node)
 {
   return(remove(node,0));
 }
@@ -573,35 +572,35 @@ template <class T>
 bit8 ArrayList<T>::removeTail(OUT T &node)
 {
   return(remove(node,Entries_-1));
-} 
+}
 
 // get a pointer to the internally managed object.  Try and avoid this, but
 //  sometimes efficiency requires it...
 // get a copy of an item
 template <class T>
-bit8 ArrayList<T>::getPointer(OUT T **node,sint32 pos) RO 
+bit8 ArrayList<T>::getPointer(OUT T **node,sint32 pos) RO
 {
   if ((pos < 0)||(pos >= Entries_))
     return(FALSE);
   *node=&(Vector_[pos]);
-  return(TRUE);  
+  return(TRUE);
 }
-  
+
 
 // get a copy of an item
 template <class T>
-bit8 ArrayList<T>::get(OUT T &node,sint32 pos) RO 
+bit8 ArrayList<T>::get(OUT T &node,sint32 pos) RO
 {
   if ((pos < 0)||(pos >= Entries_))
     return(FALSE);
   node=Vector_[pos];
-  return(TRUE);  
+  return(TRUE);
 }
 
 
 // get a copy of the first node of the list
 template <class T>
-bit8 ArrayList<T>::getHead(OUT T &node) RO 
+bit8 ArrayList<T>::getHead(OUT T &node) RO
 {
   return(get(node,0));
 }
@@ -609,10 +608,10 @@ bit8 ArrayList<T>::getHead(OUT T &node) RO
 
 // get a copy of the last node
 template <class T>
-bit8 ArrayList<T>::getTail(OUT T &node) RO 
+bit8 ArrayList<T>::getTail(OUT T &node) RO
 {
   return(get(node,Entries_-1));
-}      
+}
 
 // just for debugging
 template <class T>
@@ -624,16 +623,16 @@ void ArrayList<T>::print(FILE *out)
   fprintf(out,"Entries: %d  Slots:  %d  sizeof(T): %d\n",Entries_,Slots_,
     sizeof(T));
   fprintf(out,"--------------------\n");
-}            
+}
 
 // Return the current length of the list
 template <class T>
-sint32 ArrayList<T>::length(void) RO 
+sint32 ArrayList<T>::length(void) RO
 {
   return(Entries_);
-}    
+}
 
-// Grow the vector by a factor of 2X 
+// Grow the vector by a factor of 2X
 template <class T>
 bit8 ArrayList<T>::growVector(void)
 {
@@ -663,7 +662,7 @@ bit8 ArrayList<T>::growVector(void)
   Vector_=newVector;
   Slots_=newSlots;
 
-  return(TRUE); 
+  return(TRUE);
 }
 
 
@@ -685,25 +684,22 @@ bit8 ArrayList<T>::shrinkVector(void)
     return(FALSE);
 
   //fprintf(stderr,"Shrinking vector to: %d\n",newSlots);
- 
+
   // The goofy looking new below prevents operator new from getting called
   //  unnecessarily.  This is severall times faster than allocating all of
   //  the slots as objects and then calling the assignment operator on them
   //  when they actually get used.
   //
   T *newVector=(T *)(new uint8[newSlots * sizeof(T)]);
- 
+
   if (Vector_ != NULL)    // Vector_ better not be NULL!
     memcpy(newVector,Vector_,Entries_*sizeof(T));
 
   delete[]((uint8 *)Vector_);  // Get rid of the old vector without calling
                                //  destructors
- 
+
   Vector_=newVector;
   Slots_=newSlots;
- 
+
   return(TRUE);
 }
-
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/configfile.cpp b/Core/Tools/matchbot/wlib/configfile.cpp
index 6e4231344ce..b8d465b750a 100644
--- a/Core/Tools/matchbot/wlib/configfile.cpp
+++ b/Core/Tools/matchbot/wlib/configfile.cpp
@@ -23,7 +23,7 @@ Project Name: Carpenter  (The RedAlert ladder creator)
 File Name   : configfile.cpp
 Author      : Neal Kettler
 Start Date  : June 9, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 
 
 This class will read in a config file and store the key value pairs for
@@ -102,11 +102,11 @@ bit8 ConfigFile::readFile(FILE *in)
     key=cptr;
     key.truncate('=');
     key.removeSpaces();  // No spaces allowed in the key
-    key.toUpper();       // make key all caps 
+    key.toUpper();       // make key all caps
 
-    // Add the section name to the end of the key 
+    // Add the section name to the end of the key
     if (strlen(sectionname))
-      key.cat(sectionname);  
+      key.cat(sectionname);
 
     cptr=Eat_Spaces(strchr(cptr,'=')+1); // Jump to after the '='
     value=cptr;
@@ -114,7 +114,7 @@ bit8 ConfigFile::readFile(FILE *in)
     value.truncate('\n');
     value.truncate('#');
 
-    // TheSuperHackers @compile xezon 25/03/2025 Re-implement algorithm to avoid writing into string buffer directly.
+    // TheSuperHackers @build xezon 25/03/2025 Re-implement algorithm to avoid writing into string buffer directly.
     // Remove trailing spaces
     {
       const char* valueStr = value.get();
@@ -128,7 +128,7 @@ bit8 ConfigFile::readFile(FILE *in)
     Critsec_.lock();
     Dictionary_.add(key,value);
     Critsec_.unlock();
-  } 
+  }
   return(TRUE);
 }
 
@@ -187,12 +187,12 @@ bit8 ConfigFile::getString(IN Wstring &_key, Wstring &value, IN char *section) c
   Critsec_.unlock();
 
   if (retval==FALSE)
-  { 
-	DBGMSG("Config entry missing: "<<key.get()); 
+  {
+	DBGMSG("Config entry missing: "<<key.get());
   }
 
   return(retval);
-} 
+}
 
 // Get a config entry as a string
 bit8 ConfigFile::getString(IN char *key,Wstring &value, IN char *section) const
@@ -200,14 +200,14 @@ bit8 ConfigFile::getString(IN char *key,Wstring &value, IN char *section) const
   Wstring sKey;
   sKey.set(key);
   return(getString(sKey,value,section));
-}   
+}
 
 // Get a config entry as an integer
 bit8 ConfigFile::getInt(IN Wstring &_key,sint32 &value, IN char *section) const
 {
   Wstring key(_key);
   key.toUpper();
- 
+
   if (section)  // append section name to key
   {
     key+="[";
@@ -236,7 +236,7 @@ bit8 ConfigFile::getInt(IN char *key,sint32 &value, IN char *section) const
   sKey.set(key);
 
   return(getInt(sKey,value,section));
-}    
+}
 
 
 
@@ -245,7 +245,7 @@ bit8 ConfigFile::getInt(IN Wstring &_key,sint16 &value, IN char *section) const
 {
   Wstring key(_key);
   key.toUpper();
- 
+
   if (section)  // append section name to key
   {
     key+="[";
@@ -266,7 +266,7 @@ bit8 ConfigFile::getInt(IN Wstring &_key,sint16 &value, IN char *section) const
   value=atoi(svalue.get());
   return(TRUE);
 }
- 
+
 // Get a config entry as an integer
 bit8 ConfigFile::getInt(IN char *key,sint16 &value, IN char *section) const
 {
@@ -285,21 +285,21 @@ bit8 ConfigFile::removeEntry(IN Wstring &_key, IN char *section)
 {
 	Wstring key(_key);
 	key.toUpper();
-	
+
 	if (section)  // append section name to key
 	{
 		key+="[";
 		key+=section;
 		key+="]";
 	}
-	
+
 	Critsec_.lock();
 	bit8 retval=Dictionary_.remove(key);
 	Critsec_.unlock();
-	
+
 	if (retval==FALSE)
 	{ DBGMSG("Config entry missing: "<<key.get()); }
-	
+
 	if (retval==FALSE)
 		return(FALSE);
 	return(TRUE);
@@ -318,7 +318,7 @@ bit8 ConfigFile::setString(IN Wstring &_key, IN Wstring &value, IN char *section
 {
 	Wstring key(_key);
 	key.toUpper();
-	
+
 	if (section)  // append section name to key
 	{
 		key+="[";
@@ -329,7 +329,7 @@ bit8 ConfigFile::setString(IN Wstring &_key, IN Wstring &value, IN char *section
 	{
 		section = "";  // give it a default
 	}
-	
+
 	Critsec_.lock();
 	Dictionary_.remove(key);
 	bit8 retval=Dictionary_.add(key,value);
@@ -340,7 +340,7 @@ bit8 ConfigFile::setString(IN Wstring &_key, IN Wstring &value, IN char *section
 	for (i=0; i<sectionList.length(); i++)
 	{
 		sectionList.get(test, i);
-		if (!strcmp(test.get(), section))
+		if (strcmp(test.get(), section) == 0)
 			break;
 	}
 	if (i == sectionList.length())
@@ -351,14 +351,14 @@ bit8 ConfigFile::setString(IN Wstring &_key, IN Wstring &value, IN char *section
 		sectionList.addTail(test);
 	}
 	Critsec_.unlock();
-	
+
 	if (retval==FALSE)
-	{ 
-		DBGMSG("Config could not set entry: "<<key.get()); 
+	{
+		DBGMSG("Config could not set entry: "<<key.get());
 	}
-	
+
 	return(retval);
-} 
+}
 
 // Set a config entry as a string
 bit8 ConfigFile::setString(IN char *key,IN Wstring &value, IN char *section)
@@ -366,14 +366,14 @@ bit8 ConfigFile::setString(IN char *key,IN Wstring &value, IN char *section)
 	Wstring sKey;
 	sKey.set(key);
 	return(setString(sKey,value,section));
-}   
+}
 
 // Set a config entry as an integer
 bit8 ConfigFile::setInt(IN Wstring &_key,IN sint32 &value, IN char *section)
 {
 	Wstring key(_key);
 	key.toUpper();
-	
+
 	if (section)  // append section name to key
 	{
 		key+="[";
@@ -384,7 +384,7 @@ bit8 ConfigFile::setInt(IN Wstring &_key,IN sint32 &value, IN char *section)
 	{
 		section = "";  // give it a default
 	}
-	
+
 	Wstring svalue;
 	svalue.setFormatted("%d", value);
 	Critsec_.lock();
@@ -398,7 +398,7 @@ bit8 ConfigFile::setInt(IN Wstring &_key,IN sint32 &value, IN char *section)
 	{
 		sectionList.get(test, i);
 		//DBGMSG("Looking at " << test.get());
-		if (!strcmp(test.get(), section))
+		if (strcmp(test.get(), section) == 0)
 			break;
 	}
 	if (i == sectionList.length() && section)
@@ -409,10 +409,10 @@ bit8 ConfigFile::setInt(IN Wstring &_key,IN sint32 &value, IN char *section)
 		sectionList.addTail(test);
 	}
 	Critsec_.unlock();
-	
+
 	if (retval==FALSE)
 	{ DBGMSG("Config could not set entry: "<<key.get()); }
-	
+
 	if (retval==FALSE)
 		return(FALSE);
 	return(TRUE);
@@ -424,7 +424,7 @@ bit8 ConfigFile::setInt(IN char *key,IN sint32 &value, IN char *section)
 	Wstring sKey;
 	sKey.set(key);
 	return(setInt(sKey,value,section));
-}    
+}
 
 
 // Write config file to disk.  Does not preserve comments, etc.
@@ -479,7 +479,7 @@ static uint32 Wstring_Hash(const Wstring &string)
     retval=(retval<<8)^(retval>>24);  // ROL 8
   }
   return(retval);
-}         
+}
 
 static char *Eat_Spaces(char *string)
 {
diff --git a/Core/Tools/matchbot/wlib/configfile.h b/Core/Tools/matchbot/wlib/configfile.h
index 90c7bb3f840..eba5a02c811 100644
--- a/Core/Tools/matchbot/wlib/configfile.h
+++ b/Core/Tools/matchbot/wlib/configfile.h
@@ -20,14 +20,13 @@
 *        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S         *
 ******************************************************************************
 Project Name: Carpenter  (The RedAlert ladder creator)
-File Name   : configfile.h 
+File Name   : configfile.h
 Author      : Neal Kettler
 Start Date  : June 9, 1997
-Last Update : May 13, 1999  
+Last Update : May 13, 1999
 \***************************************************************************/
 
-#ifndef CONFIGFILE_HEADER
-#define CONFIGFILE_HEADER
+#pragma once
 
 #include "wstypes.h"
 #include "dictionary.h"
@@ -72,5 +71,3 @@ class ConfigFile
   //   are allowed so you don't need to worry about an outer lock around the enumerate
   CritSec                     Critsec_;    // lock around dictionary
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/critsec.cpp b/Core/Tools/matchbot/wlib/critsec.cpp
index 9e6eb3770dd..d02aae76c9b 100644
--- a/Core/Tools/matchbot/wlib/critsec.cpp
+++ b/Core/Tools/matchbot/wlib/critsec.cpp
@@ -49,7 +49,7 @@ CritSec::~CritSec()
 //
 // If refcount is not null you can get the current ref counter after the lock.
 //
-sint32 CritSec::lock(int *refcount) RO 
+sint32 CritSec::lock(int *refcount) RO
 {
  #ifdef _UNIX
     sint32	status;
@@ -93,11 +93,11 @@ sint32 CritSec::lock(int *refcount) RO
 }
 
 // The "unlock" function release the critical section.
-sint32 CritSec::unlock(void) RO 
+sint32 CritSec::unlock(void) RO
 {
  #ifdef _UNIX
     sint32	status = 0;
-    
+
     assert(RefCount_ >= 0);
     if (RefCount_ <= 0)
     {
@@ -116,7 +116,7 @@ sint32 CritSec::unlock(void) RO
     {
 	// Set thread id to zero -- we're going to release mutex
 	ThreadId_ = (pthread_t)0;
-	
+
 	// Unlock the mutex.
 	if ((status = pthread_mutex_unlock(&Mutex_)) != 0)
 	    ERRMSG("pthread_mutex_lock: " << strerror(errno));
diff --git a/Core/Tools/matchbot/wlib/critsec.h b/Core/Tools/matchbot/wlib/critsec.h
index 3026c4c2892..687667d74d8 100644
--- a/Core/Tools/matchbot/wlib/critsec.h
+++ b/Core/Tools/matchbot/wlib/critsec.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CRITSEC_HEADER
-#define CRITSEC_HEADER
+#pragma once
 
 #include "wstypes.h"
 #ifdef _WIN32
@@ -45,7 +44,7 @@ class CritSec
  public:
                 CritSec();
                ~CritSec();
-    
+
   sint32		lock(int *refcount=NULL) RO;
   sint32		unlock(void) RO;
 
@@ -58,5 +57,3 @@ class CritSec
     mutable int                 RefCount_;      // Reference count
   #endif
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/dictionary.h b/Core/Tools/matchbot/wlib/dictionary.h
index 9a117f8e8d4..2a21b5273b3 100644
--- a/Core/Tools/matchbot/wlib/dictionary.h
+++ b/Core/Tools/matchbot/wlib/dictionary.h
@@ -35,10 +35,7 @@ is working well, this is much faster than a linked list, but only if
 your hashing function is good.
 \****************************************************************************/
 
-
-#ifndef DICTIONARY_HEADER
-#define DICTIONARY_HEADER    
-
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -57,7 +54,7 @@ class DNode
   K               key;
   V               value;
   DNode<K,V>     *hashNext;
-};        
+};
 
 template <class K,class V>
 class Dictionary
@@ -88,7 +85,7 @@ Dictionary(uint32 (*hashFn)(const K &key)) :
   table=(DNode<K,V> **)new DNode<K,V>* [size];
   assert(table!=NULL);
 
-  memset((void *)table,0,size*sizeof(void *));        
+  memset((void *)table,0,size*sizeof(void *));
   hashFunc=hashFn;
 }
 
@@ -105,7 +102,7 @@ Dictionary(uint32 (*hashFn)(const K &key)) :
   bit8             contains(IN K &key) RO;
   bit8             updateValue(IN K &key,IN V &value);
   bit8             remove(IN K &key,OUT V &value);
-  bit8             remove(IN K &key); 
+  bit8             remove(IN K &key);
   bit8             removeAny(OUT K &key,OUT V &value);
   bit8             iterate(INOUT int &index,INOUT int &offset, OUT V &value) RO;
   bit8             iterate(INOUT int &index,INOUT int &offset, OUT K &key, OUT V &value) RO;
@@ -131,7 +128,7 @@ Dictionary(uint32 (*hashFn)(const K &key)) :
   // See initilizer list of constructor for values
   const double     SHRINK_THRESHOLD; // When table is this % full shrink it
   const double     EXPAND_THRESHOLD; // When table is this % full grow it
-  const int        MIN_TABLE_SIZE;   // must be a power of 2               
+  const int        MIN_TABLE_SIZE;   // must be a power of 2
 };
 
 
@@ -166,20 +163,20 @@ void Dictionary<K,V>::clear()
 
   while ((getSize()>(uint32)MIN_TABLE_SIZE)&&(keepSize==FALSE))
     shrink();
-}            
+}
 
 template <class K,class V>
-uint32 Dictionary<K,V>::keyHash(IN K &key) RO 
+uint32 Dictionary<K,V>::keyHash(IN K &key) RO
 {
   uint32 retval=hashFunc(key);
   retval &= ((1<<tableBits)-1);
   assert(retval<getSize());
   return(retval);
-}   
+}
 
 
 template <class K,class V>
-void Dictionary<K,V>::print(FILE *out) RO 
+void Dictionary<K,V>::print(FILE *out) RO
 {
   DNode<K,V> *temp;
   uint32 i;
@@ -200,7 +197,7 @@ void Dictionary<K,V>::print(FILE *out) RO
     fprintf(out,"\n");
   }
   fprintf(out,"--------------------\n");
-}            
+}
 
 
 template <class K, class V>
@@ -217,7 +214,7 @@ Dictionary<K,V> &Dictionary<K,V>::operator=(Dictionary<K,V> &other)
 //   is returned.
 template <class K,class V>
 bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
-    OUT V &value) RO 
+    OUT V &value) RO
 {
   DNode<K,V> *temp;
 
@@ -255,7 +252,7 @@ bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
     offset++;
 
   return(TRUE);
-}            
+}
 
 
 
@@ -266,34 +263,34 @@ bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
 //   is returned.
 template <class K,class V>
 bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
-    OUT K &key, OUT V &value) RO 
+    OUT K &key, OUT V &value) RO
 {
   DNode<K,V> *temp;
- 
+
   // index out of range
   if ((index<0)||(index >= (int)getSize()))
     return(FALSE);
- 
+
   temp=table[index];
   while ((temp==NULL)&&((++index) < (int)getSize()))
   {
     temp=table[index];
     offset=0;
   }
- 
+
   if (temp==NULL)   // no more slots with data
     return(FALSE);
- 
+
   uint32 i=0;
   while ((temp!=NULL) && ((int)i < offset))
   {
     temp=temp->hashNext;
     i++;
   }
- 
+
   if (temp==NULL)  // should never happen
     return(FALSE);
- 
+
   value=temp->value;
   key=temp->key;
   if (temp->hashNext==NULL)
@@ -303,7 +300,7 @@ bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
   }
   else
     offset++;
- 
+
   return(TRUE);
 }
 
@@ -312,19 +309,19 @@ bit8 Dictionary<K,V>::iterate(INOUT int &index,INOUT int &offset,
 
 // Return the current size of the hash table
 template <class K,class V>
-uint32 Dictionary<K,V>::getSize(void) RO 
-{ return(size); }    
+uint32 Dictionary<K,V>::getSize(void) RO
+{ return(size); }
 
 
 // Return the current number of entries in the table
 template <class K,class V>
-uint32 Dictionary<K,V>::getEntries(void) RO 
+uint32 Dictionary<K,V>::getEntries(void) RO
 { return(entries); }
 
 
 // Does the Dictionary contain the key?
 template <class K,class V>
-bit8 Dictionary<K,V>::contains(IN K &key) RO 
+bit8 Dictionary<K,V>::contains(IN K &key) RO
 {
   int offset;
   DNode<K,V> *node;
@@ -339,10 +336,10 @@ bit8 Dictionary<K,V>::contains(IN K &key) RO
   while(node!=NULL)
   {
     if ((node->key)==key)
-    { return(TRUE); }          
+    { return(TRUE); }
     node=node->hashNext;
   }
-  return(FALSE); 
+  return(FALSE);
 }
 
 
@@ -358,7 +355,7 @@ bit8 Dictionary<K,V>::updateValue(IN K &key,IN V &value)
 
   add(key,value);
   return(TRUE);
-}           
+}
 
 
 // Add to the dictionary (if key exists, value is updated with the new V)
@@ -390,7 +387,7 @@ bit8 Dictionary<K,V>::add(IN K &key,IN V &value)
   remove(key);   // Hopefully this will be false...
 
   offset=keyHash(key);
-    
+
   node=table[offset];
 
   if (node==NULL)
@@ -400,7 +397,7 @@ bit8 Dictionary<K,V>::add(IN K &key,IN V &value)
     temp=table[offset];
     table[offset]=item;
     item->hashNext=temp;
-  } 
+  }
 
   entries++;
   percent=(float)entries;
@@ -428,7 +425,7 @@ bit8 Dictionary<K,V>::remove(IN K &key,OUT V &value)
   node=table[offset];
 
   last=node;
-  if (node==NULL) 
+  if (node==NULL)
     return(FALSE);
 
   //special case table points to thing to delete
@@ -469,7 +466,7 @@ bit8 Dictionary<K,V>::remove(IN K &key,OUT V &value)
         memcpy(&value,&(node->value),sizeof(V));
       #else
         value=node->value;
-      #endif 
+      #endif
       last->hashNext=node->hashNext;
       entries--;
       delete(node);
@@ -515,7 +512,7 @@ bit8 Dictionary<K,V>::removeAny(OUT K &key,OUT V &value)
     {
       offset=i;
       break;
-    } 
+    }
 
   if (offset==-1)    // Nothing there
     return(FALSE);
@@ -529,7 +526,7 @@ bit8 Dictionary<K,V>::removeAny(OUT K &key,OUT V &value)
     key=node->key;
   #endif
   #ifdef VALUE_MEM_OPS
-    memcpy(&value,&(node->value),sizeof(V));     
+    memcpy(&value,&(node->value),sizeof(V));
   #else
     value=node->value;
   #endif
@@ -545,7 +542,7 @@ bit8 Dictionary<K,V>::removeAny(OUT K &key,OUT V &value)
 
 
 template <class K,class V>
-bool Dictionary<K,V>::getValue(IN K &key,OUT V &value) RO 
+bool Dictionary<K,V>::getValue(IN K &key,OUT V &value) RO
 {
   V *valptr=NULL;
   bool retval=getPointer(key,&valptr);
@@ -563,7 +560,7 @@ bool Dictionary<K,V>::getValue(IN K &key,OUT V &value) RO
 // Try and avoid this since you're getting a pointer to the internally
 //  managed data!
 template <class K,class V>
-bool Dictionary<K,V>::getPointer(IN K &key,OUT V **valptr) RO 
+bool Dictionary<K,V>::getPointer(IN K &key,OUT V **valptr) RO
 {
   int offset;
   DNode<K,V> *node;
@@ -575,7 +572,7 @@ bool Dictionary<K,V>::getPointer(IN K &key,OUT V **valptr) RO
 
   node=table[offset];
 
-  if (node==NULL) 
+  if (node==NULL)
     return(FALSE);
 
   #ifdef KEY_MEM_OPS
@@ -598,7 +595,7 @@ bool Dictionary<K,V>::getPointer(IN K &key,OUT V **valptr) RO
 //only here to improve performance of the hash table by reducing
 //the length of the linked list at each table entry.
 
-// Shrink the hash table by a factor of 2 (and relocate entries)   
+// Shrink the hash table by a factor of 2 (and relocate entries)
 template <class K,class V>
 void Dictionary<K,V>::shrink(void)
 {
@@ -619,7 +616,7 @@ void Dictionary<K,V>::shrink(void)
 
   table=(DNode<K,V> **)new DNode<K,V>*[size];
   assert(table!=NULL);
-  memset((void *)table,0,size*sizeof(void *)); 
+  memset((void *)table,0,size*sizeof(void *));
 
   for (i=0; i<oldsize; i++)
   {
@@ -658,7 +655,7 @@ void Dictionary<K,V>::expand(void)
 
   table=(DNode<K,V> **)new DNode<K,V>* [size];
   assert(table!=NULL);
-  memset((void *)table,0,size*sizeof(void *));       
+  memset((void *)table,0,size*sizeof(void *));
 
   for (i=0; i<oldsize; i++)
   {
@@ -675,7 +672,3 @@ void Dictionary<K,V>::expand(void)
   }
   delete[](oldtable);
 }
-
-
-#endif
-
diff --git a/Core/Tools/matchbot/wlib/filed.h b/Core/Tools/matchbot/wlib/filed.h
index ab6ec1f666f..2d00ab1afa3 100644
--- a/Core/Tools/matchbot/wlib/filed.h
+++ b/Core/Tools/matchbot/wlib/filed.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef FILED_HEADER
-#define FILED_HEADER
+#pragma once
 
 #include "odevice.h"
 
@@ -25,7 +24,7 @@ class FileD : public OutputDevice
 {
  public:
    FileD(IN char *filename, IN char *mode = "w")
-   { 
+   {
      out=fopen(filename,mode);
      if (out==NULL)
        out=fopen("FileDev.out",mode);
@@ -47,5 +46,3 @@ class FileD : public OutputDevice
 
    FILE      *out;
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/linkedlist.h b/Core/Tools/matchbot/wlib/linkedlist.h
index 6ef14f33a73..8589c3c45c3 100644
--- a/Core/Tools/matchbot/wlib/linkedlist.h
+++ b/Core/Tools/matchbot/wlib/linkedlist.h
@@ -19,7 +19,7 @@
 /****************************************************************************\
 *        C O N F I D E N T I A L --- W E S T W O O D   S T U D I O S         *
 ******************************************************************************
-Project Name: 
+Project Name:
 File Name   : linkedlist.h
 Author      : Neal Kettler
 Start Date  : June 19, 1997
@@ -33,8 +33,7 @@ Copies of the data are stored instead of a pointer to the original.
 If you want to store pointers then the template should be of a pointer type.
 \****************************************************************************/
 
-#ifndef LINKEDLIST_HEADER
-#define LINKEDLIST_HEADER    
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,7 +49,7 @@ class LNode
   T               Node;
   LNode<T>       *Next;
   LNode<T>       *Prev;
-};        
+};
 
 template <class T>
 class LinkedList
@@ -60,7 +59,7 @@ class LinkedList
                    LinkedList(LinkedList<T> &other);
                   ~LinkedList();
 
-  // Remove all entries from the lsit 
+  // Remove all entries from the lsit
   void             clear(void);
 
   // Add a node after the zero based 'pos'
@@ -72,13 +71,13 @@ class LinkedList
   bit8             remove(OUT T &node,sint32 pos);
   bit8             remove(sint32 pos);
   bit8             removeHead(OUT T &node);
-  bit8             removeTail(OUT T &node); 
+  bit8             removeTail(OUT T &node);
 
 
   // Get a node without removing from the list
   bit8             get(OUT T &node,sint32 pos);
   bit8             getHead(OUT T &node);
-  bit8             getTail(OUT T &node);        
+  bit8             getTail(OUT T &node);
 
   // Get a pointer to the internally managed data (careful!)
   bit8             getPointer(OUT T **node, sint32 pos);
@@ -102,7 +101,7 @@ class LinkedList
 };
 
 
-//Create the empty list 
+//Create the empty list
 template <class T>
 LinkedList<T>::LinkedList()
 {
@@ -138,7 +137,7 @@ LinkedList<T> &LinkedList<T>::operator=(LinkedList<T> &other)
   {
     other.get(node,i);
     addTail(node);
-  } 
+  }
   return(*this);
 }
 
@@ -158,7 +157,7 @@ void LinkedList<T>::clear()
   Entries=0;
   CurIndex=-1;
   Head=Tail=Current=NULL;
-}            
+}
 
 // When adding into a position, the new node goes at the zero based slot
 // specified by pos. All other nodes get moved one slot down.
@@ -186,7 +185,7 @@ bit8 LinkedList<T>::add(IN T &node,sint32 pos, OUT T **newnodeptr)
     if (pos==0) {
       item->Next=Head;
       if (Head)
-        Head->Prev=item; 
+        Head->Prev=item;
       Head=item;
     }
     if (pos==Entries) {
@@ -213,7 +212,7 @@ bit8 LinkedList<T>::add(IN T &node,sint32 pos, OUT T **newnodeptr)
     Entries++;
     return(TRUE);
   }
-  // Check the other possible speedup (adding after CurIndex) 
+  // Check the other possible speedup (adding after CurIndex)
   if (pos==CurIndex+1) {
     item->Next=Current->Next;
     item->Prev=Current;
@@ -223,18 +222,18 @@ bit8 LinkedList<T>::add(IN T &node,sint32 pos, OUT T **newnodeptr)
     CurIndex++;
     Entries++;
     return(TRUE);
-  }    
+  }
 
   // If control reaches here we have to scan the whole thing
   temp=Head->Next;  // Can start at node '1' because head was special cased
   for (int i=1; i<pos; i++) {
-    temp=temp->Next; 
+    temp=temp->Next;
     assert(temp!=NULL);
   }
   item->Next=temp;
   item->Prev=temp->Prev;
   temp->Prev=item;
-  item->Prev->Next=item; 
+  item->Prev->Next=item;
   Current=item;
   CurIndex=pos;
   Entries++;
@@ -245,7 +244,7 @@ bit8 LinkedList<T>::add(IN T &node,sint32 pos, OUT T **newnodeptr)
 
 // Add to the first node, all others get shifted down one slot
 template <class T>
-bit8 LinkedList<T>::addHead(IN T &node, OUT T **newnodeptr)  
+bit8 LinkedList<T>::addHead(IN T &node, OUT T **newnodeptr)
 {
   return(add(node,0,newnodeptr));
 }
@@ -256,13 +255,13 @@ template <class T>
 bit8 LinkedList<T>::addTail(IN T &node, OUT T **newnodeptr)
 {
   return(add(node,length(),newnodeptr));
-}  
+}
 
 
 // Remove at the zero based index specified by 'pos'.  When removing from
 // a slot, all others get shifted up by one.
 template <class T>
-bit8 LinkedList<T>::remove(OUT T &node, sint32 pos) 
+bit8 LinkedList<T>::remove(OUT T &node, sint32 pos)
 {
   ////////LNode<T> *temp;
   LNode<T> *item;
@@ -273,7 +272,7 @@ bit8 LinkedList<T>::remove(OUT T &node, sint32 pos)
   if (pos<0)
     pos=0;
   if (pos>=Entries)
-    pos=Entries-1;    
+    pos=Entries-1;
 
   if ((pos==0)||(pos==Entries-1)) {  // Both can be true for a 1 item list
     if (pos==0) {
@@ -304,7 +303,7 @@ bit8 LinkedList<T>::remove(OUT T &node, sint32 pos)
       assert(Tail==NULL);
     }
     return(TRUE);
-  }     
+  }
   // If control is here, we know the target node is not an endpoint
 
   // Check for possible speedup, so we don't have to scan the list
@@ -349,7 +348,7 @@ bit8 LinkedList<T>::remove(OUT T &node, sint32 pos)
   delete(item);
   Entries--;
 
-  return(TRUE);  
+  return(TRUE);
 }
 
 
@@ -367,7 +366,7 @@ bit8 LinkedList<T>::remove(sint32 pos)
 
 // Remove the first node of the list
 template <class T>
-bit8 LinkedList<T>::removeHead(OUT T &node)     
+bit8 LinkedList<T>::removeHead(OUT T &node)
 {
   return(remove(node,0));
 }
@@ -378,7 +377,7 @@ template <class T>
 bit8 LinkedList<T>::removeTail(OUT T &node)
 {
   return(remove(node,Entries-1));
-}   
+}
 
 
 
@@ -448,7 +447,7 @@ bit8 LinkedList<T>::getPointer(OUT T **node,sint32 pos)
   CurIndex=pos;
   Current=item;
 
-  return(TRUE);  
+  return(TRUE);
 }
 
 
@@ -465,7 +464,7 @@ template <class T>
 bit8 LinkedList<T>::getTail(OUT T &node)
 {
   return(get(node,Entries-1));
-}      
+}
 
 
 template <class T>
@@ -475,21 +474,19 @@ void LinkedList<T>::print(IN FILE *out)
 
   fprintf(out,"--------------------\n");
   fprintf(out,"Entries = %d\n",length());
-  fprintf(out,"H = %8p   C = %8p (%d)   T = %8p\n",Head,Current,CurIndex,Tail); 
+  fprintf(out,"H = %8p   C = %8p (%d)   T = %8p\n",Head,Current,CurIndex,Tail);
 
   temp=Head;
   while (temp) {
     fprintf(out,"  %8p<-((%8p))->%8p  \n",temp->Prev,temp,temp->Next);
     temp=temp->Next;
-  }   
+  }
 
   fprintf(out,"--------------------\n");
-}            
+}
 
 // Return the current length of the list
 template <class T>
 sint32 LinkedList<T>::length(void) {
   return(Entries);
-}    
-
-#endif
+}
diff --git a/Core/Tools/matchbot/wlib/mboxd.h b/Core/Tools/matchbot/wlib/mboxd.h
index 3c4d0f5dde6..a45eff3700a 100644
--- a/Core/Tools/matchbot/wlib/mboxd.h
+++ b/Core/Tools/matchbot/wlib/mboxd.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MBOXD_HEADER
-#define MBOXD_HEADER
+#pragma once
 
 #include "odevice.h"
 
@@ -36,5 +35,3 @@ class MboxD : public OutputDevice
    }
 
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/monod.cpp b/Core/Tools/matchbot/wlib/monod.cpp
index 296849da2da..103409de5c2 100644
--- a/Core/Tools/matchbot/wlib/monod.cpp
+++ b/Core/Tools/matchbot/wlib/monod.cpp
@@ -51,7 +51,7 @@ int MonoD::print(const char *str, int len)
     return(len);
   #else
     for (int i=0; i<len; i++)
-      fprintf(stderr,"%c",str[i]); 
+      fprintf(stderr,"%c",str[i]);
     return(len);
   #endif
 }
diff --git a/Core/Tools/matchbot/wlib/monod.h b/Core/Tools/matchbot/wlib/monod.h
index 494674c9749..4f94fd065e1 100644
--- a/Core/Tools/matchbot/wlib/monod.h
+++ b/Core/Tools/matchbot/wlib/monod.h
@@ -16,9 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MONOD_HEADER
-#define MONOD_HEADER
-
+#pragma once
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -70,5 +68,3 @@ class MonoD : public OutputDevice
      HANDLE handle;
    #endif
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/odevice.h b/Core/Tools/matchbot/wlib/odevice.h
index ccd45e01a89..8cb924ea42a 100644
--- a/Core/Tools/matchbot/wlib/odevice.h
+++ b/Core/Tools/matchbot/wlib/odevice.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef ODEVICE_HEADER
-#define ODEVICE_HEADER
+#pragma once
 
 // This virtual base class provides an interface for output devices
 //  that can be used for the debugging package.
@@ -28,5 +27,3 @@ class OutputDevice
     virtual     ~OutputDevice() {};
     virtual int print(const char *s,int len)=0;
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/sem4.cpp b/Core/Tools/matchbot/wlib/sem4.cpp
index 641ee16a28a..e11b95a362f 100644
--- a/Core/Tools/matchbot/wlib/sem4.cpp
+++ b/Core/Tools/matchbot/wlib/sem4.cpp
@@ -31,7 +31,7 @@ This is useful because the constructor will automatically call sem_init
 
 Sem4::Sem4()
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   sem_init(&sem,1,1);
 #else
   sem = CreateSemaphore(NULL, 1, 1, NULL);
@@ -40,7 +40,7 @@ Sem4::Sem4()
 
 Sem4::Sem4(uint32 value)
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   sem_init(&sem,1,value);
 #else
   sem = CreateSemaphore(NULL, value, value, NULL);
@@ -49,7 +49,7 @@ Sem4::Sem4(uint32 value)
 
 Sem4::~Sem4()
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   sem_destroy(&sem);
 #else
   if (sem) CloseHandle(sem);
@@ -58,28 +58,28 @@ Sem4::~Sem4()
 
 sint32  Sem4::Wait(void) const
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
 	return(sem_wait((sem_t *)&sem));
 #else
 	if (!sem)
 		return -1; // no semaphore!
 
 	DWORD dwWaitResult = WaitForSingleObject(sem, INFINITE);
-	switch (dwWaitResult) { 
+	switch (dwWaitResult) {
 	case WAIT_OBJECT_0: // The semaphore object was signaled.
 		return 0;
 		break;
 	case WAIT_TIMEOUT: // Should not happen ;)
 		return -1;
-		break; 
+		break;
 	}
 	return -1;
 #endif
-} 
+}
 
 sint32 Sem4::Post(void) const
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   return(sem_post((sem_t *)&sem));
 #else
   if (!sem)
@@ -92,19 +92,19 @@ sint32 Sem4::Post(void) const
 
 sint32 Sem4::TryWait(void) const
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   return(sem_trywait((sem_t *)&sem));
 #else
 	if (!sem)
 		return -1;
 	DWORD dwWaitResult = WaitForSingleObject(sem, 0L);
-	switch (dwWaitResult) { 
+	switch (dwWaitResult) {
 	case WAIT_OBJECT_0: // The semaphore object was signaled.
 		return 0;
 		break;
 	case WAIT_TIMEOUT:
 		return -1;
-		break; 
+		break;
 	}
 	return -1;
 #endif
@@ -112,7 +112,7 @@ sint32 Sem4::TryWait(void) const
 
 sint32 Sem4::GetValue(int *sval) const
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   return(sem_getvalue((sem_t *)&sem,sval));
 #else
 	if (!sem)
@@ -128,14 +128,14 @@ sint32 Sem4::GetValue(int *sval) const
 
 sint32 Sem4::Destroy(void)
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   return(sem_destroy(&sem));
 #else
   return CloseHandle(sem);
 #endif
 }
 
-#else  
+#else
 
 /****************************************************************************
 non threaded versions that do nothing
@@ -156,7 +156,7 @@ Sem4::~Sem4()
 sint32  Sem4::Wait(void) const
 {
   return(0);
-} 
+}
 
 sint32 Sem4::Post(void) const
 {
diff --git a/Core/Tools/matchbot/wlib/sem4.h b/Core/Tools/matchbot/wlib/sem4.h
index 1ffe33f6a83..303fb1e238f 100644
--- a/Core/Tools/matchbot/wlib/sem4.h
+++ b/Core/Tools/matchbot/wlib/sem4.h
@@ -16,21 +16,20 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef SEM4_HEADER
-#define SEM4_HEADER
+#pragma once
 
 #include <limits.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 #include "wstypes.h"
 
 #ifdef _REENTRANT
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <semaphore.h>
 #else
 #include <windows.h>
-#endif // _WINDOWS
+#endif // _WIN32
 #endif // _REENTRANT
 
 // Windows headers have a tendency to redefine IN
@@ -43,7 +42,7 @@ class Sem4
 {
  private:
   #ifdef _REENTRANT
-#ifndef _WINDOWS
+#ifndef _WIN32
   sem_t sem;
 #else
   HANDLE sem;
@@ -60,5 +59,3 @@ class Sem4
   sint32       GetValue(int *sval) const;
   sint32       Destroy(void);
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/stderrd.h b/Core/Tools/matchbot/wlib/stderrd.h
index abc8b5e0ec0..3af596103e2 100644
--- a/Core/Tools/matchbot/wlib/stderrd.h
+++ b/Core/Tools/matchbot/wlib/stderrd.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef STDERRD_HEADER
-#define STDERRD_HEADER
+#pragma once
 
 #include "odevice.h"
 
@@ -35,5 +34,3 @@ class StderrD : public OutputDevice
      return(len);
    }
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/stdoutd.h b/Core/Tools/matchbot/wlib/stdoutd.h
index 5170fc1f5cf..a7f51a76daf 100644
--- a/Core/Tools/matchbot/wlib/stdoutd.h
+++ b/Core/Tools/matchbot/wlib/stdoutd.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef STDOUTD_HEADER
-#define STDOUTD_HEADER
+#pragma once
 
 #include "odevice.h"
 
@@ -36,5 +35,3 @@ class StdoutD : public OutputDevice
      return(len);
    }
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/streamer.cpp b/Core/Tools/matchbot/wlib/streamer.cpp
index 4c0ed141d1b..061baad77db 100644
--- a/Core/Tools/matchbot/wlib/streamer.cpp
+++ b/Core/Tools/matchbot/wlib/streamer.cpp
@@ -37,14 +37,14 @@ Streamer::Streamer() : streambuf(), Output_Device(NULL), Buf(NULL)
   static_assert(STREAMER_UNBUFFERED==0, "std::streambuf is assumed to be buffered by default");
 #endif
 }
- 
+
 Streamer::~Streamer()
 {
   ///////// calling sync seems to cause crashes here on Win32
   //sync();
   /////////
-  if (Buf)
-    delete[] Buf;
+
+  delete[] Buf;
 }
 
 int Streamer::setOutputDevice(OutputDevice *device)
@@ -111,14 +111,14 @@ int Streamer::doallocate()
     setb(
        Buf,         // base pointer
        Buf+STREAMER_BUFSIZ,  // ebuf pointer (end of buffer);
-       0);          // 0 = manual deletion of buff 
+       0);          // 0 = manual deletion of buff
 #else
     pubsetbuf(Buf, 2*STREAMER_BUFSIZ);
 #endif
 
     // Get area
     setg(
-        Buf,   // eback 
+        Buf,   // eback
         Buf,   // gptr
         Buf);  // egptr
 
diff --git a/Core/Tools/matchbot/wlib/streamer.h b/Core/Tools/matchbot/wlib/streamer.h
index ce94139cd0a..d0121a89be8 100644
--- a/Core/Tools/matchbot/wlib/streamer.h
+++ b/Core/Tools/matchbot/wlib/streamer.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef STREAMER_HEADER
-#define STREAMER_HEADER
+#pragma once
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -63,5 +62,3 @@ class Streamer : public streambuf
     OutputDevice  *Output_Device;
     char* Buf;
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/syslogd.cpp b/Core/Tools/matchbot/wlib/syslogd.cpp
index aca18655b29..4107335c7ea 100644
--- a/Core/Tools/matchbot/wlib/syslogd.cpp
+++ b/Core/Tools/matchbot/wlib/syslogd.cpp
@@ -20,7 +20,7 @@
 
 SyslogD::SyslogD(char *ident,int logopt,int facility,int _priority)
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   openlog(ident,logopt,facility);
   priority=_priority;
 #endif
@@ -28,7 +28,7 @@ SyslogD::SyslogD(char *ident,int logopt,int facility,int _priority)
 
 int SyslogD::print(const char *str, int len)
 {
-#ifndef _WINDOWS
+#ifndef _WIN32
   char *temp_str=new char[len+1];
   memset(temp_str,0,len+1);
   strncpy(temp_str,str,len);
diff --git a/Core/Tools/matchbot/wlib/syslogd.h b/Core/Tools/matchbot/wlib/syslogd.h
index ee427b64182..74b25d313f0 100644
--- a/Core/Tools/matchbot/wlib/syslogd.h
+++ b/Core/Tools/matchbot/wlib/syslogd.h
@@ -16,12 +16,11 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef SYSLOGD_HEADER
-#define SYSLOGD_HEADER
+#pragma once
 
 #include <stdlib.h>
 #include <stdio.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <syslog.h>
 #endif
 #include <string.h>
@@ -44,5 +43,3 @@ class SyslogD : public OutputDevice
  private:
    int priority;
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/threadfac.cpp b/Core/Tools/matchbot/wlib/threadfac.cpp
index b9b073fa789..e9934e71b6d 100644
--- a/Core/Tools/matchbot/wlib/threadfac.cpp
+++ b/Core/Tools/matchbot/wlib/threadfac.cpp
@@ -55,13 +55,13 @@ struct ThreadInformation
 bit8 ThreadFactory::startThread(Runnable &runable, void *data, bit8 destroy)
 {
 #ifdef _REENTRANT
- 
+
   {
 	  Runnable::CritSec_.lock();
 	  Runnable::ThreadCount_++;
 	  Runnable::CritSec_.unlock();
   }
- 
+
 
   ThreadInformation *tInfo=new ThreadInformation;
   tInfo->startPoint=(void *)&runable;
diff --git a/Core/Tools/matchbot/wlib/threadfac.h b/Core/Tools/matchbot/wlib/threadfac.h
index 97c9902b502..027de9be53b 100644
--- a/Core/Tools/matchbot/wlib/threadfac.h
+++ b/Core/Tools/matchbot/wlib/threadfac.h
@@ -20,8 +20,7 @@
 // Platform independent thread creation (Win32 & POSIX)
 //
 
-#ifndef THREADFAC_HEADER
-#define THREADFAC_HEADER
+#pragma once
 
 #ifdef _WIN32
   #include <process.h>
@@ -52,7 +51,7 @@
   #else  // UNIX
     static void *threadFuncLauncher(void *temp);
   #endif
- 
+
   // Fake entry point for classes
   #ifdef _WIN32
     static unsigned __stdcall threadClassLauncher(void *temp);
@@ -97,7 +96,7 @@ class Runnable
 
    // So do the threadClassLaunchers
    #ifdef _WIN32
-      friend static unsigned __stdcall threadClassLauncher(void *temp);
+     friend unsigned __stdcall threadClassLauncher(void *temp);
    #else  // UNIX
      friend void *threadClassLauncher(void *temp);
    #endif
@@ -120,5 +119,3 @@ class Runnable
    static int       ThreadCount_;
    static CritSec   CritSec_;           // to protect ThreadCount_
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/threadsafe.h b/Core/Tools/matchbot/wlib/threadsafe.h
index 551ffe837be..bc5492885d4 100644
--- a/Core/Tools/matchbot/wlib/threadsafe.h
+++ b/Core/Tools/matchbot/wlib/threadsafe.h
@@ -31,8 +31,7 @@
 
 #ifdef _REENTRANT
 
-#ifndef THREADSAFE_HEADER
-#define THREADSAFE_HEADER
+#pragma once
 
 #define strtok		("strtok() is not MT-SAFE!")
 #define ascctime	("asctime() is not MT-SAFE!")
@@ -57,6 +56,4 @@
 #define pclose          ("pclose() is not MT-SAFE!")
 #define ctermid         ("ctermid() is not MT-SAFE!")
 #define getlogin        ("getlogin() is not MT-SAFE!");
-
-#endif  // THREADSAFE_HEADER
 #endif  // _REENTRANT
diff --git a/Core/Tools/matchbot/wlib/timezone.cpp b/Core/Tools/matchbot/wlib/timezone.cpp
index 34f558b072c..b43235f4752 100644
--- a/Core/Tools/matchbot/wlib/timezone.cpp
+++ b/Core/Tools/matchbot/wlib/timezone.cpp
@@ -22,7 +22,7 @@
 void GetTimezoneInfo(const char * &timezone_str, int &timezone_offset) {
 	timezone_str = "Unknown Timezone";
 	timezone_offset = 0;
-#ifdef _WINDOWS
+#ifdef _WIN32
 	struct _timeb    wintime;
 	_ftime(&wintime);
 
@@ -37,7 +37,7 @@ void GetTimezoneInfo(const char * &timezone_str, int &timezone_offset) {
 	timezone_offset = wintime.timezone * 60; // its in minutes...
 
 #endif
-#ifndef _WINDOWS
+#ifndef _WIN32
 	struct timeval   unixtime;
 	struct timezone  unixtzone;
 	gettimeofday(&unixtime,&unixtzone);
diff --git a/Core/Tools/matchbot/wlib/timezone.h b/Core/Tools/matchbot/wlib/timezone.h
index b7fe3ec5f1f..3849cad0001 100644
--- a/Core/Tools/matchbot/wlib/timezone.h
+++ b/Core/Tools/matchbot/wlib/timezone.h
@@ -25,8 +25,7 @@ only tells you info about what the daylight savings info is now, not 5 minutes
 from now, not 2 hours ago.  Oh well.
 \****************************************************************************/
 
-#ifndef _TIMEZONE_H_
-#define _TIMEZONE_H_
+#pragma once
 
 // Just fill in both the timezone description and its offset from GMT
 void GetTimezoneInfo(const char * &timezone_str, int &timezone_offset);
@@ -36,6 +35,3 @@ const char * TimezoneString(void);
 
 // Returns the offset from GMT of the current timezone
 int TimezoneOffset(void);
-
-#endif // _TIMEZONE_H_
-
diff --git a/Core/Tools/matchbot/wlib/ustring.h b/Core/Tools/matchbot/wlib/ustring.h
index 7796dfb3dd6..c06e0d06744 100644
--- a/Core/Tools/matchbot/wlib/ustring.h
+++ b/Core/Tools/matchbot/wlib/ustring.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USTRING_HEADER
-#define USTRING_HEADER
+#pragma once
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -57,5 +56,3 @@ class UstringT : public basic_string<charT, string_char_traits<charT> >
 };
 
 typedef UstringT<char> Ustring;
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/wdebug.cpp b/Core/Tools/matchbot/wlib/wdebug.cpp
index 5f74856a133..8dd5005ecbc 100644
--- a/Core/Tools/matchbot/wlib/wdebug.cpp
+++ b/Core/Tools/matchbot/wlib/wdebug.cpp
@@ -37,7 +37,7 @@ static ostream           *warn_ostream=NULL;
 static Streamer           warn_streamer;
 
 static int                error_enabled=0;
-static ostream           *error_ostream=NULL;  
+static ostream           *error_ostream=NULL;
 static Streamer           error_streamer;
 
 
@@ -85,12 +85,7 @@ int MsgManager::ReplaceAllStreams(FileD * output_device, IN char *device_filenam
 	delete(info_ostream);
 	delete(warn_ostream);
 	delete(error_ostream);
-
-	if (output_device != NULL)
-	{
-		delete(output_device);
-		output_device = NULL;
-	}
+	delete(output_device);
 
 	rename(device_filename, copy_filename);
 
@@ -172,12 +167,12 @@ int MsgManager::setErrorStream(OutputDevice *device)
 ostream *MsgManager::debugStream(void)
 {
   return(debug_ostream);
-}   
+}
 
 ostream *MsgManager::infoStream(void)
 {
   return(info_ostream);
-}   
+}
 
 ostream *MsgManager::warnStream(void)
 {
@@ -187,4 +182,4 @@ ostream *MsgManager::warnStream(void)
 ostream *MsgManager::errorStream(void)
 {
   return(error_ostream);
-}   
+}
diff --git a/Core/Tools/matchbot/wlib/wdebug.h b/Core/Tools/matchbot/wlib/wdebug.h
index 1f397bd4532..4b5a8568d12 100644
--- a/Core/Tools/matchbot/wlib/wdebug.h
+++ b/Core/Tools/matchbot/wlib/wdebug.h
@@ -50,8 +50,7 @@ will you be ready to leave grasshopper.
 
 \*****************************************************************************/
 
-#ifndef WDEBUG_HEADER
-#define WDEBUG_HEADER
+#pragma once
 
 #define USE_DEBUG_SEM
 
@@ -60,7 +59,7 @@ will you be ready to leave grasshopper.
 #include <Utility/iostream_adapter.h>
 #include <Utility/sstream_adapter.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WIN32)
 // Windows headers have a tendency to redefine IN
 #ifdef IN
 #undef IN
@@ -145,7 +144,7 @@ extern CritSec DebugLibSemaphore;
   if (MsgManager::infoStream()) \
     (*(MsgManager::infoStream())) << X;\
   DEBUGUNLOCK; \
-}    
+}
 
 // Just get a stream to the warning device, no extra junk
 #define WRNSTREAM(X)\
@@ -154,7 +153,7 @@ extern CritSec DebugLibSemaphore;
   if (MsgManager::warnStream()) \
     (*(MsgManager::warnStream())) << X;\
   DEBUGUNLOCK; \
-}    
+}
 
 // Just get a stream to the error device, no extra junk
 #define ERRSTREAM(X)\
@@ -163,7 +162,7 @@ extern CritSec DebugLibSemaphore;
   if (MsgManager::errorStream()) \
     (*(MsgManager::errorStream())) << X;\
   DEBUGUNLOCK; \
-}    
+}
 
 #ifndef DEBUG
 
@@ -184,7 +183,7 @@ extern CritSec DebugLibSemaphore;
 #define DBG(X) X
 
 // In Windows, send a copy to the debugger window
-#ifdef _WINDOWS
+#ifdef _WIN32
 
 // Print a variable
 #define PVAR(v) \
@@ -197,6 +196,7 @@ extern CritSec DebugLibSemaphore;
   __s << __FILE__ << "[" << __LINE__ << \
        "]: " << ##V << " = " << V << '\n' << '\0';\
   OutputDebugString(STRSTREAM_CSTR(__s));\
+  OutputDebugString("\n");\
   DEBUGUNLOCK; \
 }
 
@@ -211,6 +211,7 @@ extern CritSec DebugLibSemaphore;
   __s << "DBG [" << __FILE__ <<  \
     " " << __LINE__ << "] " << X << '\n' << '\0';\
   OutputDebugString(STRSTREAM_CSTR(__s));\
+  OutputDebugString("\n");\
   DEBUGUNLOCK; \
 }
 
@@ -223,8 +224,9 @@ extern CritSec DebugLibSemaphore;
   strstream __s;\
   __s << X << '\0';\
   OutputDebugString(STRSTREAM_CSTR(__s));\
+  OutputDebugString("\n");\
   DEBUGUNLOCK; \
-}    
+}
 
 // Verbosely execute a statement
 #define VERBOSE(X)\
@@ -237,10 +239,11 @@ extern CritSec DebugLibSemaphore;
   __s  << __FILE__ << "[" << __LINE__ << \
      "]: " << ##X << '\n' << '\0';\
   OutputDebugString(STRSTREAM_CSTR(__s));\
+  OutputDebugString("\n");\
   DEBUGUNLOCK; \
 }
 
-#else // _WINDOWS
+#else // _WIN32
 
 // Print a variable
 #define PVAR(v) \
@@ -269,7 +272,7 @@ extern CritSec DebugLibSemaphore;
   if (MsgManager::debugStream()) \
     (*(MsgManager::debugStream())) << X;\
   DEBUGUNLOCK; \
-}    
+}
 
 // Verbosely execute a statement
 #define VERBOSE(X)\
@@ -280,7 +283,7 @@ extern CritSec DebugLibSemaphore;
      "]: " << ##X << endl; X \
   DEBUGUNLOCK; \
 }
-#endif // _WINDOWS
+#endif // _WIN32
 
 #endif  // DEBUG
 
@@ -310,5 +313,3 @@ class MsgManager
    static ostream            *warnStream(void);
    static ostream            *errorStream(void);
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/wstring.cpp b/Core/Tools/matchbot/wlib/wstring.cpp
index 67fe0f51e48..a19c9aaa002 100644
--- a/Core/Tools/matchbot/wlib/wstring.cpp
+++ b/Core/Tools/matchbot/wlib/wstring.cpp
@@ -23,7 +23,7 @@ Project Name: Carpenter  (The RedAlert ladder creator)
 File Name   : string.cpp
 Author      : Neal Kettler
 Start Date  : June 1, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 
 A fairly typical string class.  This string class always copies any input
 string to it's own memory (for assignment or construction).
@@ -56,7 +56,7 @@ Wstring::Wstring(const Wstring &other):str(NULL), strsize(0)
 }
 
 Wstring::~Wstring()
-{ 
+{
   clear();
 }
 
@@ -149,7 +149,7 @@ bit8 Wstring::cat(const char *s)
   if(str)
     len += strlen(str);
 
-  // Space check 
+  // Space check
   strgrow(len);
 
   strcat(str, s);
@@ -241,7 +241,7 @@ bit8 Wstring::removeChar(char c)
 {
   int     len=0;
   char   *cptr=NULL;
-  bit8    removed=FALSE; 
+  bit8    removed=FALSE;
 
   if (str==NULL)
     return(FALSE);
@@ -265,8 +265,7 @@ void Wstring::removeSpaces(void)
 
 void Wstring::clear(void)
 {
- if(str)
-   delete[](str);
+ delete[](str);
  strsize=0;
  str=NULL;
 }
@@ -278,7 +277,7 @@ void Wstring::setSize(sint32 size)
   if (size<0)
     return;
 
-  str=new char[size]; 
+  str=new char[size];
   strsize=size;
   memset(str,0,size);
 }
@@ -319,7 +318,7 @@ uint32 Wstring::length(void) const
 bit8 Wstring::insert(const char *instring, uint32 pos)
 {
   if (str==NULL)
-    return(set(instring)); 
+    return(set(instring));
   if (pos>strlen(str))
     pos=strlen(str);
 
@@ -343,7 +342,7 @@ bit8 Wstring::insert(char k, uint32 pos)
 }
 
 
-// Joe Howes (05/19/2000):  This function inserts commas to nicely format a 
+// Joe Howes (05/19/2000):  This function inserts commas to nicely format a
 // large number (i.e.  1234567890 -> 1,234,567,890).  It doesn't really care
 // if the string is really a number or not.
 bit8 Wstring::beautifyNumber()
@@ -362,7 +361,7 @@ bit8 Wstring::beautifyNumber()
 			numcommas++;
 		}
 		accum = ( accum == 3 || accum == -1 ) ? 1 : accum + 1;
-        }	
+        }
 
 	return(TRUE);
 }
@@ -506,14 +505,14 @@ bit8 Wstring::truncate(uint32 len)
 bit8 Wstring::truncate(char c)
 {
   sint32  len;
- 
+
   if (str==NULL)
     return(FALSE);
 
   char   *cptr=strchr(str,c);
   if (cptr==NULL)
     return(FALSE);
-  len=(sint32)(cptr-str); 
+  len=(sint32)(cptr-str);
   truncate((uint32)len);
   return(TRUE);
 }
@@ -541,7 +540,7 @@ sint32 Wstring::getToken(int offset,const char *delim,Wstring &out) const
     if(strchr(delim,str[i])!=NULL)
       break;
   }
-  stop=i-1; 
+  stop=i-1;
   out.set(str+start);
   out.truncate((uint32)stop-start+1);
   return(stop+1);
@@ -557,7 +556,7 @@ sint32 Wstring::getLine(int offset, Wstring &out)
   start=i=offset;
   if (start >= (sint32)length())
     return(-1);
- 
+
   for (; i<(int)length(); i++) {
     if(strchr("\r\n",str[i])!=NULL)
       break;
diff --git a/Core/Tools/matchbot/wlib/wstring.h b/Core/Tools/matchbot/wlib/wstring.h
index 1e22d7b0179..dc3cf29dd76 100644
--- a/Core/Tools/matchbot/wlib/wstring.h
+++ b/Core/Tools/matchbot/wlib/wstring.h
@@ -23,11 +23,10 @@ Project Name: Carpenter  (The RedAlert ladder creator)
 File Name   : main.cpp
 Author      : Neal Kettler
 Start Date  : June 1, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 \****************************************************************************/
 
-#ifndef WSTRING_HEADER
-#define WSTRING_HEADER
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -35,7 +34,7 @@ Last Update : June 17, 1997
 
 class Wstring
 {
- public: 
+ public:
            Wstring();
            Wstring(const Wstring &other);
            Wstring(const char *string);
@@ -89,5 +88,3 @@ class Wstring
    char    *str;      // Pointer to allocated string.
    int      strsize;  // allocated data length
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/wstypes.h b/Core/Tools/matchbot/wlib/wstypes.h
index 224c97d91a4..c13ef1fa3c8 100644
--- a/Core/Tools/matchbot/wlib/wstypes.h
+++ b/Core/Tools/matchbot/wlib/wstypes.h
@@ -23,20 +23,19 @@ Project Name: Carpenter  (The RedAlert ladder creator)
 File Name   : wstypes.h
 Author      : Neal Kettler
 Start Date  : June 3, 1997
-Last Update : June 17, 1997  
+Last Update : June 17, 1997
 
 Standard type definitions for the sake of portability and readability.
 \***************************************************************************/
 
-#ifndef WSTYPES_HEADER
-#define WSTYPES_HEADER
+#pragma once
 
 #ifdef _REENTRANT   // reentrant = threaded
 // Headers with non threadsafe libs need to come before my hacky
 //  threadsafe.h otherwise they won't compile
 
 #include <time.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #define _POSIX_C_SOURCE 199506L
 #define _POSIX_PTHREAD_SEMANTICS
 #define __EXTENSIONS__
@@ -44,7 +43,7 @@ Standard type definitions for the sake of portability and readability.
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <unistd.h>
 #include <sys/time.h>
 #include <dirent.h>
@@ -108,11 +107,9 @@ typedef double             float64;
 #define MAX_UINT8   0xFF
 #define MAX_SINT32  0x7FFFFFFF
 #define MAX_SINT16  0x7FFF
-#define MAX_SINT8   0x7F   
+#define MAX_SINT8   0x7F
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #define strncasecmp _strnicmp
 #define strcasecmp  _stricmp
-#endif  
-
 #endif
diff --git a/Core/Tools/matchbot/wlib/wtime.cpp b/Core/Tools/matchbot/wlib/wtime.cpp
index 7fd644e41bf..6ff6a0ce373 100644
--- a/Core/Tools/matchbot/wlib/wtime.cpp
+++ b/Core/Tools/matchbot/wlib/wtime.cpp
@@ -35,7 +35,7 @@ static const char *FULLMONTHS[]={"January","February","March","April","May","Jun
                "July","August","September","October","November","December"};
 
 // MDC: Windows doesn't provide a localtime_r, so make our own...
-#ifdef _WINDOWS
+#ifdef _WIN32
 #ifdef _REENTRANT
 #include "critsec.h"
 static CritSec localtime_critsec;
@@ -54,7 +54,7 @@ static struct tm *localtime_r(const time_t *clockval, struct tm *res) {
 #endif
 	return res;
 }
-#endif // _WINDOWS
+#endif // _WIN32
 
 Wtime::Wtime(void)
 {
@@ -82,13 +82,13 @@ Wtime::~Wtime()
 void Wtime::Update(void)
 {
  sign=POSITIVE;
- #ifdef _WINDOWS
+ #ifdef _WIN32
   struct _timeb    wintime;
   _ftime(&wintime);
   sec=wintime.time;
   usec=(wintime.millitm)*1000;
  #endif
- #ifndef _WINDOWS
+ #ifndef _WIN32
   struct timeval   unixtime;
   struct timezone  unixtzone;
   gettimeofday(&unixtime,&unixtzone);
@@ -159,11 +159,11 @@ bit8 Wtime::ParseDate(char *in)
 
   // The next part of the time is OPTIONAL (+minutes)
 
-  // first skip past the seconds 
+  // first skip past the seconds
   while ((isdigit(*ptr))&&(*ptr!=0)) ptr++;
   if (*ptr==0) return(TRUE);
 
-  // skip past any spaces 
+  // skip past any spaces
   while ((isspace(*ptr))&&(*ptr!=0)) ptr++;
   if (*ptr!='+')
   {
@@ -176,7 +176,7 @@ bit8 Wtime::ParseDate(char *in)
     //printf("\nPTR WAS 0\n");
     return(TRUE);
   }
- 
+
   minOffset=atol(ptr);
   //printf("\n\nAdding %d minutes!\n\n",minOffset);
   sec+=minOffset*60;  // add the minutes as seconds
@@ -210,7 +210,7 @@ bit8 Wtime::FormatTime(char *out, const char *format)
       if (lastWasH==1) lastWasH=2;
       sprintf(out+strlen(out),"%c",*ptr);
       ptr+=1;
-    } 
+    }
     else if (strncmp(ptr,"\"",1)==0)
     {
       break;
@@ -304,7 +304,7 @@ bit8 Wtime::FormatTime(char *out, const char *format)
     {
       sprintf(out+strlen(out),"%ld",((GetMonth()-1)/4)+1);  // GetQuarter
       ptr+=1;
-    } 
+    }
     else if (strncmp(ptr,"yyyy",4)==0)
     {
       sprintf(out+strlen(out),"%ld",GetYear());
@@ -314,7 +314,7 @@ bit8 Wtime::FormatTime(char *out, const char *format)
     {
       sprintf(out+strlen(out),"%02ld",GetYear()%100);
       ptr+=2;
-    } 
+    }
     else if (strncmp(ptr,"y",1)==0)
     {
       sprintf(out+strlen(out),"%ld",GetYDay());
@@ -504,7 +504,7 @@ uint32 Wtime::GetYWeek(void) const
   //phase holds the first weekday of the year.  If (Jan 1 = Sun) phase = 0
   sint32 phase=((wday-yday)%7);
   if (phase<0) phase+=7;
-  yweek=((yday+phase-1)/7)+1; 
+  yweek=((yday+phase-1)/7)+1;
   return(yweek);
 }
 uint32 Wtime::GetMonth(void) const
@@ -549,7 +549,7 @@ int   Wtime::Compare(const Wtime &other) const
   else
     return(-1);
 }
-  
+
 
 bit8 Wtime::operator == ( const Wtime &other ) const
 {
@@ -723,7 +723,7 @@ Wtime &Wtime::operator -= (const Wtime &other)
   sint32 temp;
   if (Compare(other)==-1)
   {
-    sec=0;                  // can't handle negative time 
+    sec=0;                  // can't handle negative time
     usec=0;
     return *this;
   }
diff --git a/Core/Tools/matchbot/wlib/wtime.h b/Core/Tools/matchbot/wlib/wtime.h
index 79ffb86a4de..e969217da0b 100644
--- a/Core/Tools/matchbot/wlib/wtime.h
+++ b/Core/Tools/matchbot/wlib/wtime.h
@@ -20,16 +20,15 @@
 wtime                      Neal Kettler
 
 \****************************************************************************/
-#ifndef WTIME_HEADER
-#define WTIME_HEADER
 
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <sys/types.h>
 
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <unistd.h>
 #include <netinet/in.h>
 #include <sys/time.h>
@@ -59,7 +58,7 @@ class Wtime
              ~Wtime();
 
     void      Update();   // Update members sec & usec to system time
-                          
+
 
     void      PrintTime(FILE *out) const;
     void      PrintTime(char *out) const;
@@ -90,7 +89,7 @@ class Wtime
     bit8      GetSign(void) const;  // 0 = pos   1 = neg
 
     int       Compare(const Wtime &other) const;
-    
+
     // comparisons
     bit8   operator == ( const Wtime &other ) const;
     bit8   operator != ( const Wtime &other ) const;
@@ -124,5 +123,3 @@ class Wtime
     uint32    usec;    // microseconds (millionths of a second)
     bit8      sign;    // for time differences 0 = pos 1 = neg
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wlib/xtime.cpp b/Core/Tools/matchbot/wlib/xtime.cpp
index 58a3bbad017..d36a7ec1875 100644
--- a/Core/Tools/matchbot/wlib/xtime.cpp
+++ b/Core/Tools/matchbot/wlib/xtime.cpp
@@ -29,7 +29,7 @@ long long after you'll be dead.
 
 #include <ctype.h>
 #include <time.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <sys/time.h>
 #endif
 #include "xtime.h"
@@ -88,9 +88,9 @@ static sint32 Get_Day(int month, int day, int year)
 static bit8 Get_Date_From_Day(sint32 days, OUT sint32 &year, OUT sint32 &yday)
 {
   //register long int rem;
-  register long int y;
+  long int y;
   //register const unsigned short int *ip;
- 
+
   if (days <= 365)
   {
     year=0;
@@ -102,7 +102,7 @@ static bit8 Get_Date_From_Day(sint32 days, OUT sint32 &year, OUT sint32 &yday)
   days-=365;
 
   days--;  // zero based
- 
+
   //
   // As far as I can tell there's no non-iteritive way to
   //   do this...
@@ -111,7 +111,7 @@ static bit8 Get_Date_From_Day(sint32 days, OUT sint32 &year, OUT sint32 &yday)
   {
     /* Guess a corrected year, assuming 365 days per year.  */
     long int yg = y + days / 365 - (days % 365 < 0);
- 
+
     /* Adjust DAYS and Y to match the guessed year.  */
     days -= ((yg - y) * 365
         + LEAPS_THRU_END_OF (yg - 1)
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
         }
         ydaycount++;
       }
-    } 
+    }
     printf("(%d) ",year);
   }
 ***************************************
@@ -269,7 +269,7 @@ void Xtime::normalize(void)
 {
   day_+=(msec_/86400000);
   msec_%=86400000;
- 
+
   while (msec_ < 0)
   {
     day_--;
@@ -286,13 +286,13 @@ void Xtime::update(void)
   day_=719528;  // day_s from year 0 to Jan1, 1970
   msec_=0;
 
- #ifdef _WINDOWS
+ #ifdef _WIN32
   struct _timeb    wintime;
   _ftime(&wintime);
   addSeconds(wintime.time);
   msec_+=wintime.millitm;
  #endif
- #ifndef _WINDOWS
+ #ifndef _WIN32
   struct timeval   unixtime;
   struct timezone  unixtzone;
   gettimeofday(&unixtime,&unixtzone);
@@ -318,14 +318,14 @@ bit8 Xtime::FormatTime(char *out, const char *format)
   int ampmflag = 0;
   out[0]=0;
   const char *ptr=format;
- 
+
   if (*ptr=='"') ptr++;  // skip past open quote if exists
- 
+
   while (*ptr!=0)
   {
     if (lastWasH>0)
       lastWasH--;
- 
+
     if (isspace(*ptr))
     {
       if (lastWasH==1) lastWasH=2;
@@ -501,7 +501,7 @@ bit8 Xtime::FormatTime(char *out, const char *format)
   }
   return(TRUE);
 }
- 
+
 /**************************************
 
  REPLACE THIS CRAP
@@ -567,11 +567,11 @@ bit8 Xtime::ParseDate(char *in)
 
   // The next part of the time is OPTIONAL (+minutes)
 
-  // first skip past the seconds 
+  // first skip past the seconds
   while ((isdigit(*ptr))&&(*ptr!=0)) ptr++;
   if (*ptr==0) return(TRUE);
 
-  // skip past any spaces 
+  // skip past any spaces
   while ((isspace(*ptr))&&(*ptr!=0)) ptr++;
   if (*ptr!='+')
   {
@@ -584,7 +584,7 @@ bit8 Xtime::ParseDate(char *in)
     //printf("\nPTR WAS 0\n");
     return(TRUE);
   }
- 
+
   minOffset=atol(ptr);
   //printf("\n\nAdding %d minutes!\n\n",minOffset);
   sec+=minOffset*60;  // add the minutes as seconds
@@ -699,7 +699,7 @@ int Xtime::getYDay(void) const   // Day of Year  (1-366)  (366 = leap yr)
 //
 // Get all the components of the time in the usual normalized format.
 //
-// Most of the uglyness is in Get_Date_From_Day() 
+// Most of the uglyness is in Get_Date_From_Day()
 //
 bit8 Xtime::getTime(int &month, int &mday, int &year, int &hour, int &minute, int &second) const
 {
@@ -728,7 +728,7 @@ bit8 Xtime::getTime(int &month, int &mday, int &year, int &hour, int &minute, in
 
   // Whew! Now all we have to do is figure out H/M/S from the msec!
   hour=(msec_/3600000)%24;  // 1000*60*60
-  minute=(msec_/60000)%60;  // 1000*60 
+  minute=(msec_/60000)%60;  // 1000*60
   second=(msec_/ 1000)%60;  // 1000
 
   return(TRUE);
@@ -795,7 +795,7 @@ bit8 Xtime::setSecond(sint32 sec)
 //
 bit8 Xtime::setMinute(sint32 min)
 {
-  sint32 minute=(msec_/60000)%60;  // 1000*60 
+  sint32 minute=(msec_/60000)%60;  // 1000*60
   msec_-=(minute*60000);
   msec_+=(min*60000);
   return(TRUE);
@@ -845,7 +845,7 @@ bit8 Xtime::setMonth(sint32 _month)
 
 
 //
-// Modify the day of the month 
+// Modify the day of the month
 //
 bit8 Xtime::setMDay(sint32 _mday)
 {
@@ -881,7 +881,7 @@ int   Xtime::compare(const Xtime &other) const
   else
     return(-1);
 }
-  
+
 
 bit8 Xtime::operator == ( const Xtime &other ) const
 {
diff --git a/Core/Tools/matchbot/wlib/xtime.h b/Core/Tools/matchbot/wlib/xtime.h
index 7a0a0319a5c..c79e4c9f43a 100644
--- a/Core/Tools/matchbot/wlib/xtime.h
+++ b/Core/Tools/matchbot/wlib/xtime.h
@@ -22,23 +22,21 @@ xtime                      Neal Kettler
 This is version 2 of the Wtime library (now xtime).  It now supports
 time storage from the year 0 to well after the sun
 will have gone supernova (OK, OK I admit it'll break in the
-year 5 Million.) 
+year 5 Million.)
 
 The call to update the current time will break in 2038.
 Hopefully by then somebody will replace the lame time()
 function :-)
 \****************************************************************************/
 
-#ifndef XTIME_HEADER
-#define XTIME_HEADER
-
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <sys/types.h>
 
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <unistd.h>
 #include <netinet/in.h>
 #include <sys/time.h>
@@ -79,7 +77,7 @@ class Xtime
     void      PrintDate(char *out) const;
 **********/
 
-    sint32    getDay(void) const;    // Get days since year 0 
+    sint32    getDay(void) const;    // Get days since year 0
     sint32    getMsec(void) const;   // Get milliseconds into the day
 
     void      setDay(sint32 day);
@@ -110,11 +108,11 @@ class Xtime
     bit8      setMonth(sint32 month);
     bit8      setMDay(sint32 mday);
 
-    void      normalize(void);  // move msec overflows to the day 
+    void      normalize(void);  // move msec overflows to the day
 
     // Compare two times
     int       compare(const Xtime &other) const;
-    
+
     // comparisons
     bit8   operator == ( const Xtime &other ) const;
     bit8   operator != ( const Xtime &other ) const;
@@ -142,5 +140,3 @@ class Xtime
     sint32    day_;    // days since Jan 1, 0
     sint32    msec_;   // milliseconds  (thousandths of a sec)
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wnet/field.cpp b/Core/Tools/matchbot/wnet/field.cpp
index 0233bc148bc..699b52507cd 100644
--- a/Core/Tools/matchbot/wnet/field.cpp
+++ b/Core/Tools/matchbot/wnet/field.cpp
@@ -16,25 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- *                                                                         * 
- *                 Project Name : Westwood Auto Registration App           * 
- *                                                                         * 
- *                    File Name : FIELD.CPP                                * 
- *                                                                         * 
- *                   Programmer : Philip W. Gorrow                         * 
- *                                                                         * 
- *                   Start Date : 04/22/96                                 * 
- *                                                                         * 
- *                  Last Update : April 22, 1996 [PWG]                     * 
- *                                                                         * 
- *  Actual member function for the field class.                            * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ *                                                                         *
+ *                 Project Name : Westwood Auto Registration App           *
+ *                                                                         *
+ *                    File Name : FIELD.cpp                                *
+ *                                                                         *
+ *                   Programmer : Philip W. Gorrow                         *
+ *                                                                         *
+ *                   Start Date : 04/22/96                                 *
+ *                                                                         *
+ *                  Last Update : April 22, 1996 [PWG]                     *
+ *                                                                         *
+ *  Actual member function for the field class.                            *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 #include <string.h>
 #include <sys/types.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <netinet/in.h>
 #else
 #define Win32_Winsock
@@ -61,37 +61,37 @@ FieldClass::FieldClass(char *id, char data)
   Data=NULL;
   Set(id,data);
 }
- 
+
 FieldClass::FieldClass(char *id, unsigned char data)
 {
   Data=NULL;
   Set(id,data);
 }
- 
+
 FieldClass::FieldClass(char *id, short data)
 {
   Data=NULL;
   Set(id,data);
 }
- 
+
 FieldClass::FieldClass(char *id, unsigned short data)
 {
   Data=NULL;
   Set(id,data);
 }
- 
+
 FieldClass::FieldClass(char *id, long data)
 {
   Data=NULL;
   Set(id,data);
 }
- 
+
 FieldClass::FieldClass(char *id, unsigned long data)
 {
   Data=NULL;
   Set(id,data);
 }
- 
+
 FieldClass::FieldClass(char *id, char *data)
 {
   Data=NULL;
@@ -224,20 +224,20 @@ char *FieldClass::Get_ID(void)
 return(ID);
 }
 
-/************************************************************************** 
+/**************************************************************************
  * PACKETCLASS::HOST_TO_NET_FIELD -- Converts host field to net format    *
- *                                                                        * 
+ *                                                                        *
  * INPUT:    FIELD   * to the data field we need to convert               *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:     none                                                       *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/22/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/22/1996 PWG : Created.                                            *
  *========================================================================*/
 void FieldClass::Host_To_Net(void)
 {
   //
-  // Before we convert the data type, we should convert the actual data 
+  // Before we convert the data type, we should convert the actual data
   //  sent.
   //
   switch (DataType) {
@@ -270,15 +270,15 @@ void FieldClass::Host_To_Net(void)
   Size      = htons(Size);
 }
 
-/************************************************************************** 
+/**************************************************************************
  * PACKETCLASS::NET_TO_HOST_FIELD -- Converts net field to host format    *
- *                                                                        * 
+ *                                                                        *
  * INPUT:    FIELD   * to the data field we need to convert               *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:     none                                                       *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/22/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/22/1996 PWG : Created.                                            *
  *========================================================================*/
 void FieldClass::Net_To_Host(void)
 {
@@ -289,7 +289,7 @@ void FieldClass::Net_To_Host(void)
   Size      = ntohs(Size);
 
   //
-  // Before we convert the data type, we should convert the actual data 
+  // Before we convert the data type, we should convert the actual data
   //  sent.
   //
   switch (DataType) {
diff --git a/Core/Tools/matchbot/wnet/field.h b/Core/Tools/matchbot/wnet/field.h
index cc91f55bce5..de573ddbeec 100644
--- a/Core/Tools/matchbot/wnet/field.h
+++ b/Core/Tools/matchbot/wnet/field.h
@@ -16,23 +16,23 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- *                                                                         * 
- *                 Project Name : Westwood Auto Registration App           * 
- *                                                                         * 
- *                    File Name : FIELD.H                                  * 
- *                                                                         * 
- *                   Programmer : Philip W. Gorrow                         * 
- *                                                                         * 
- *                   Start Date : 04/22/96                                 * 
- *                                                                         * 
- *                  Last Update : April 22, 1996 [PWG]                     * 
- *                                                                         * 
+/***************************************************************************
+ *                                                                         *
+ *                 Project Name : Westwood Auto Registration App           *
+ *                                                                         *
+ *                    File Name : FIELD.h                                  *
+ *                                                                         *
+ *                   Programmer : Philip W. Gorrow                         *
+ *                                                                         *
+ *                   Start Date : 04/22/96                                 *
+ *                                                                         *
+ *                  Last Update : April 22, 1996 [PWG]                     *
+ *                                                                         *
  * This module takes care of maintaining the field list used to process    *
  * packets.                                                                *
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #define FIELD_HEADER_SIZE	(sizeof(FieldClass) - (sizeof(void *) * 2))
diff --git a/Core/Tools/matchbot/wnet/packet.cpp b/Core/Tools/matchbot/wnet/packet.cpp
index d5e3bb4be55..8cda4f64b01 100644
--- a/Core/Tools/matchbot/wnet/packet.cpp
+++ b/Core/Tools/matchbot/wnet/packet.cpp
@@ -16,30 +16,30 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- *                                                                         * 
- *                 Project Name : Westwood Auto Registration App           * 
- *                                                                         * 
- *                    File Name : PACKET.CPP                               * 
- *                                                                         * 
- *                   Programmer : Philip W. Gorrow                         * 
- *                                                                         * 
- *                   Start Date : 04/22/96                                 * 
- *                                                                         * 
- *                  Last Update : April 24, 1996 [PWG]                     * 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- *   *PacketClass::Find_Field -- Finds a field if it exists in the packets * 
- *   Get_Field -- Find specified name and returns data                     * 
- *   PacketClass::~PacketClass -- destroys a packet class be freeing list  * 
- *   PacketClass::Add_Field -- Adds a FieldClass entry to head of packet li* 
+/***************************************************************************
+ *                                                                         *
+ *                 Project Name : Westwood Auto Registration App           *
+ *                                                                         *
+ *                    File Name : PACKET.cpp                               *
+ *                                                                         *
+ *                   Programmer : Philip W. Gorrow                         *
+ *                                                                         *
+ *                   Start Date : 04/22/96                                 *
+ *                                                                         *
+ *                  Last Update : April 24, 1996 [PWG]                     *
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
+ *   *PacketClass::Find_Field -- Finds a field if it exists in the packets *
+ *   Get_Field -- Find specified name and returns data                     *
+ *   PacketClass::~PacketClass -- destroys a packet class be freeing list  *
+ *   PacketClass::Add_Field -- Adds a FieldClass entry to head of packet li*
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <netinet/in.h>
 #else
 #define Win32_Winsock
@@ -49,15 +49,15 @@
 #include "packet.h"
 
 
-/************************************************************************** 
- * PACKETCLASS::~PACKETCLASS -- destroys a packet class be freeing list   * 
- *                                                                        * 
+/**************************************************************************
+ * PACKETCLASS::~PACKETCLASS -- destroys a packet class be freeing list   *
+ *                                                                        *
  * INPUT:    none                                                         *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:     none                                                       *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/24/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/24/1996 PWG : Created.                                            *
  *========================================================================*/
 PacketClass::~PacketClass()
 {
@@ -74,33 +74,33 @@ PacketClass::~PacketClass()
 }
 
 
-/************************************************************************** 
- * PACKETCLASS::ADD_FIELD -- Adds a FieldClass entry to head of packet li * 
- *                                                                        * 
+/**************************************************************************
+ * PACKETCLASS::ADD_FIELD -- Adds a FieldClass entry to head of packet li *
+ *                                                                        *
  * INPUT:    FieldClass * - a properly constructed field class entry.     *
- *                                                                        * 
- * OUTPUT:     none                                                       * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/24/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * OUTPUT:     none                                                       *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/24/1996 PWG : Created.                                            *
  *========================================================================*/
 void PacketClass::Add_Field(FieldClass *field)
 {
   field->Next = Head;
-  Head = field;  
+  Head = field;
 }
 
-/************************************************************************** 
- * PACKETCLASS::PACKETCLASS -- Creates a Packet object from a COMMS packe * 
- *                                                                        * 
- * INPUT:                                                                 * 
- *                                                                        * 
- * OUTPUT:                                                                * 
- *                                                                        * 
- * WARNINGS:                                                              * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/22/1996 PWG : Created.                                            * 
+/**************************************************************************
+ * PACKETCLASS::PACKETCLASS -- Creates a Packet object from a COMMS packe *
+ *                                                                        *
+ * INPUT:                                                                 *
+ *                                                                        *
+ * OUTPUT:                                                                *
+ *                                                                        *
+ * WARNINGS:                                                              *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/22/1996 PWG : Created.                                            *
  *========================================================================*/
 PacketClass::PacketClass(char *curbuf)
 {
@@ -166,19 +166,19 @@ PacketClass::PacketClass(char *curbuf)
   }
 }
 
-/************************************************************************** 
- * CREATE_COMMS_PACKET -- Walks field list creating a packet              * 
- *                                                                        * 
+/**************************************************************************
+ * CREATE_COMMS_PACKET -- Walks field list creating a packet              *
+ *                                                                        *
  * INPUT:    short - the id of the packet so the server can identify it *
  *          unsigned short & - the size of the packet returned here    *
- *                                                                        * 
- * OUTPUT:     void * pointer to the linear packet data                   * 
- *                                                                        * 
+ *                                                                        *
+ * OUTPUT:     void * pointer to the linear packet data                   *
+ *                                                                        *
  * WARNINGS:   This routine allocates memory that the user is responsible *
  *          for freeing.                                *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/22/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/22/1996 PWG : Created.                                            *
  *========================================================================*/
 char *PacketClass::Create_Comms_Packet(int &size)
 {
@@ -201,7 +201,7 @@ char *PacketClass::Create_Comms_Packet(int &size)
   }
 
   //
-  // Now that we know the size allocate a buffer big enough to hold the 
+  // Now that we know the size allocate a buffer big enough to hold the
   // packet.
   //
   char *retval = new char[size];
@@ -251,15 +251,15 @@ char *PacketClass::Create_Comms_Packet(int &size)
 }
 
 
-/************************************************************************** 
- * PACKETCLASS::FIND_FIELD -- Finds a field if it exists in the packets   * 
- *                                                                        * 
+/**************************************************************************
+ * PACKETCLASS::FIND_FIELD -- Finds a field if it exists in the packets   *
+ *                                                                        *
  * INPUT:    char *  - the id of the field we are looking for.            *
- *                                                                        * 
- * OUTPUT:     FieldClass * pointer to the field class                    * 
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * OUTPUT:     FieldClass * pointer to the field class                    *
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 FieldClass *PacketClass::Find_Field(char *id)
 {
@@ -278,7 +278,7 @@ FieldClass *PacketClass::Get_Field_At(int position)
 	FieldClass *current = Head;
 	for (; (current && (i < position)); current = current->Next, i++) {
 	}
-	
+
 	if (current) return current;
 	else return NULL;
 }
@@ -287,27 +287,27 @@ FieldClass *PacketClass::Get_Field_At(int position)
 int PacketClass::Get_Num_Fields()
 {
 	int i = 0;
-		
+
 	for (FieldClass *current = Head; current; current = current->Next, i++) {}
-	
+
 	return i;
 
 }
 
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data                      * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data                      *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *           char &   - the reference to store the data into              *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The data reference is not changed if the field is not       *
  *          found.                                                        *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, char &data)
 {
@@ -316,22 +316,22 @@ bit8 PacketClass::Get_Field(char *id, char &data)
     data = *((char *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data                      * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data                      *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *           unsigned char &   - the reference to store the data into     *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The data reference is not changed if the field is not       *
  *          found.                                                        *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, unsigned char &data)
 {
@@ -340,22 +340,22 @@ bit8 PacketClass::Get_Field(char *id, unsigned char &data)
     data = *((unsigned char *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data                      * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data                      *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *          short &   - the reference to store the data into              *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The data reference is not changed if the field is not       *
  *          found.                                                        *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, short &data)
 {
@@ -364,22 +364,22 @@ bit8 PacketClass::Get_Field(char *id, short &data)
     data = *((short *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data                      * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data                      *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *           unsigned short &   - the reference to store the data into    *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The data reference is not changed if the field is not       *
  *          found.                                                        *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, unsigned short &data)
 {
@@ -388,22 +388,22 @@ bit8 PacketClass::Get_Field(char *id, unsigned short &data)
     data = *((unsigned short *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data                      * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data                      *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *          long &   - the reference to store the data into               *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The data reference is not changed if the field is not       *
  *          found.                                                        *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, long &data)
 {
@@ -412,7 +412,7 @@ bit8 PacketClass::Get_Field(char *id, long &data)
     data = *((long *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 
 
@@ -427,20 +427,20 @@ bit8 PacketClass::Get_Field(char *id, int &data)
 
 
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data as a string          * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data as a string          *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *           char *   - the string to store the data into                 *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The string is not changed if the field is not found.  It    *
  *          is assumed that the string variabled specified by the         *
  *          pointer is large enough to hold the data.                     *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, char *data)
 {
@@ -451,19 +451,19 @@ bit8 PacketClass::Get_Field(char *id, char *data)
   return((field) ? true : false);
 }
 
-/************************************************************************** 
- * GET_FIELD -- Find specified name and returns data                      * 
- *                                                                        * 
+/**************************************************************************
+ * GET_FIELD -- Find specified name and returns data                      *
+ *                                                                        *
  * INPUT:    char *   - the id of the field that holds the data.          *
  *          unsigned long &   - the reference to store the data into      *
- *                                                                        * 
+ *                                                                        *
  * OUTPUT:    true if the field was found, false if it was not.           *
- *                                                                        * 
+ *                                                                        *
  * WARNINGS:  The data reference is not changed if the field is not       *
  *          found.                                                        *
- *                                                                        * 
- * HISTORY:                                                               * 
- *   04/23/1996 PWG : Created.                                            * 
+ *                                                                        *
+ * HISTORY:                                                               *
+ *   04/23/1996 PWG : Created.                                            *
  *========================================================================*/
 bit8 PacketClass::Get_Field(char *id, unsigned long &data)
 {
@@ -472,7 +472,7 @@ bit8 PacketClass::Get_Field(char *id, unsigned long &data)
     data = *((unsigned long *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 bit8 PacketClass::Get_Field(char *id, unsigned  &data)
 {
@@ -481,7 +481,7 @@ bit8 PacketClass::Get_Field(char *id, unsigned  &data)
     data = *((unsigned *)field->Data);
   }
   return((field) ? true : false);
-}  
+}
 
 
 
@@ -514,7 +514,7 @@ bit8 PacketClass::Get_Field(char *id, void *data, int &length)
 unsigned short PacketClass::Get_Field_Size(char* id)
 {
    FieldClass *field = Find_Field(id);
-   if (field) 
+   if (field)
 	return field->Get_Size();
    else
 	return 0;
diff --git a/Core/Tools/matchbot/wnet/packet.h b/Core/Tools/matchbot/wnet/packet.h
index c3a21680781..d61870cb9d7 100644
--- a/Core/Tools/matchbot/wnet/packet.h
+++ b/Core/Tools/matchbot/wnet/packet.h
@@ -16,27 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- *                                                                         * 
- *                 Project Name : Westwood Auto Registration App           * 
- *                                                                         * 
- *                    File Name : PACKET.H                                 * 
- *                                                                         * 
- *                   Programmer : Philip W. Gorrow                         * 
- *                                                                         * 
- *                   Start Date : 04/19/96                                 * 
- *                                                                         * 
- *                  Last Update : April 19, 1996 [PWG]                     * 
- *                                                                         * 
+/***************************************************************************
+ *                                                                         *
+ *                 Project Name : Westwood Auto Registration App           *
+ *                                                                         *
+ *                    File Name : PACKET.h                                 *
+ *                                                                         *
+ *                   Programmer : Philip W. Gorrow                         *
+ *                                                                         *
+ *                   Start Date : 04/19/96                                 *
+ *                                                                         *
+ *                  Last Update : April 19, 1996 [PWG]                     *
+ *                                                                         *
  * This header defines the functions for the PacketClass.  The packet      *
- * class is used to create a linked list of field entries which can be     * 
+ * class is used to create a linked list of field entries which can be     *
  * converted to a linear packet in a COMMS API compatible format.          *
  *                                                                         *
  * Packets can be created empty and then have fields added to them or can  *
  * be created from an existing linear packet.                              *
  *                                                                         *
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "field.h"
@@ -76,7 +76,7 @@ class PacketClass
     void Add_Field(char *field, void *data, int length) {Add_Field(new FieldClass(field, data, length));};
 
     //
-    // These functions search for a field of a given name in the list and 
+    // These functions search for a field of a given name in the list and
     // return the data via a reference value.
     //
     FieldClass *Find_Field(char *id);
@@ -91,14 +91,14 @@ class PacketClass
     bit8 Get_Field(char *id, unsigned &data);
     bit8 Get_Field(char *id, char *data);
     bit8 Get_Field(char *id, void *data, int &length);
-    unsigned short Get_Field_Size(char* id); 
+    unsigned short Get_Field_Size(char* id);
 
     // gks 9/25/2000
     FieldClass *Get_Field_At(int position);
     int Get_Num_Fields();
 
     char *Create_Comms_Packet(int &size);
-        
+
   private:
     unsigned short   Size;
     short            ID;
diff --git a/Core/Tools/matchbot/wnet/tcp.cpp b/Core/Tools/matchbot/wnet/tcp.cpp
index 8fd62a62222..66ea079c7af 100644
--- a/Core/Tools/matchbot/wnet/tcp.cpp
+++ b/Core/Tools/matchbot/wnet/tcp.cpp
@@ -25,7 +25,7 @@ SERVER mode.  Note that this uses non-blocking sockets.
 
 The FD_* macros:
 
-  FD_CLR(int fd, fd_set *set);     // clear a single FD 
+  FD_CLR(int fd, fd_set *set);     // clear a single FD
   FD_ISSET(int fd, fd_set *set);   // check whether a single FD is set
   FD_SET(int fd, fd_set *set);     // set a single FD
   FD_ZERO(fd_set * set);           // clear the entire set
@@ -43,7 +43,7 @@ uint8  *buff=new uint8[1024];
 int     retval;
 TCP tcp(CLIENT);
 
-tcp.Bind((uint32)0,(uint16)0); // let system pick local IP and a Port for you 
+tcp.Bind((uint32)0,(uint16)0); // let system pick local IP and a Port for you
 tcp.Connect("tango",13);       // can connect by name or "10.1.1.10"
                                // or the integer in host byte order
 
@@ -99,7 +99,7 @@ while (1)
 #include "tcp.h"
 #include <stdarg.h>
 
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <errno.h>
 #define closesocket close
 #endif
@@ -112,7 +112,7 @@ TCP::TCP(int new_mode)
   fd = -1;
   clientCount=0;
   if ((new_mode==CLIENT)||(new_mode==SERVER))
-    mode=new_mode; 
+    mode=new_mode;
   FD_ZERO(&clientList);
   connectionState=CLOSED;
   inputDelay=5;
@@ -129,7 +129,7 @@ TCP::TCP(int new_mode,sint16 socket)
   fd = socket;
   clientCount=0;
   if ((new_mode==CLIENT)||(new_mode==SERVER))
-    mode=new_mode; 
+    mode=new_mode;
   FD_ZERO(&clientList);
 
   inputDelay=5;
@@ -170,7 +170,7 @@ sint32 TCP::SetBlocking(bit8 block,sint32 whichFD)
    if (whichFD==0)
      whichFD=fd;
 
-   #ifdef _WINDOWS
+   #ifdef _WIN32
    unsigned long flag=1;
    if (block)
      flag=0;
@@ -185,7 +185,7 @@ sint32 TCP::SetBlocking(bit8 block,sint32 whichFD)
    if (block==FALSE)          // set nonblocking
      flags |= O_NONBLOCK;
    else                       // set blocking
-     flags &= ~(O_NONBLOCK);  
+     flags &= ~(O_NONBLOCK);
 
    if (fcntl(whichFD, F_SETFL, flags) < 0)
    {
@@ -217,9 +217,9 @@ sint32 TCP::Write(const uint8 *msg,uint32 len,sint32 whichFD)
       assert(FALSE);
     whichFD=fd;
   }
-  SetBlocking(TRUE,whichFD); 
+  SetBlocking(TRUE,whichFD);
   retval=send(whichFD,(const char *)msg,len,0);
-  #ifdef _WINDOWS
+  #ifdef _WIN32
     if (retval==SOCKET_ERROR)
       retval=-1;
   #endif
@@ -241,7 +241,7 @@ sint32 TCP::WriteNB(uint8 *msg,uint32 len,sint32 whichFD)
     whichFD=fd;
   }
   retval=send(whichFD,(const char *)msg,len,0);
-  #ifdef _WINDOWS
+  #ifdef _WIN32
     if (retval==SOCKET_ERROR)
       retval=-1;
   #endif
@@ -288,7 +288,7 @@ sint32 TCP::EncapsulatedWrite(uint8 *msg,uint32 len,sint32 whichFD)
         data=1;
       else if (data==1)
         data=2;
-      else if (data==255) 
+      else if (data==255)
         data=3;
 
       retval=send(whichFD,(char *)&data,1,0);
@@ -403,15 +403,15 @@ uint16 TCP::GetRemotePort(sint32 whichFD)
 
   if (mode==CLIENT)
   {
-    if(getpeername(fd,(sockaddr *)&sin,&sinSize)==0)    
+    if(getpeername(fd,(sockaddr *)&sin,&sinSize)==0)
       return(ntohs(sin.sin_port));
   }
   else if (mode==SERVER)
   {
-    if(getpeername(whichFD,(sockaddr *)&sin,&sinSize)==0)   
+    if(getpeername(whichFD,(sockaddr *)&sin,&sinSize)==0)
       return(ntohs(sin.sin_port));
   }
-  return(0); 
+  return(0);
 }
 
 
@@ -441,7 +441,7 @@ bit8 TCP::IsConnected(sint32 whichFD)
     }
   return(FALSE);
 }
-    
+
 
 // Not portable?
 /**************
@@ -455,7 +455,7 @@ sint32 TCP::GetSockStatus(sint32 whichFD)
   retval=getsockopt(whichFD,SOL_SOCKET,SO_ERROR,(char *)&status,&size);
   if (retval==-1)
     return(-1);
-  return(status); 
+  return(status);
 }
 *******************/
 
@@ -559,7 +559,7 @@ sint32 TCP::TimedRead(uint8 *msg,uint32 len,int seconds,sint32 whichFD)
     retval=Read(msg+bytes_read,len-bytes_read,whichFD);
     if (retval==0)    // they closed
     {
-      DBGMSG("Remote close!\n");
+      DBGMSG("Remote close!");
       return(bytes_read);
     }
     else if (retval>0)
@@ -646,9 +646,9 @@ sint32 TCP::EncapsulatedRead(uint8 *msg,uint32 len,sint32 whichFD)
         else if (data==2)
           data=1;
         else if (data==3)
-          data=(char)255; 
+          data=(char)255;
       }
-      msg[i]=data; 
+      msg[i]=data;
     }
     if (retval==-1)
       return(bytesRead);
@@ -663,7 +663,7 @@ sint32 TCP::CloseAll(void)
 
   if (mode==CLIENT)
     return(Close());
-  
+
   for(i=0; i<=maxFD; i++)
   {
     if ((i!=fd)&&(FD_ISSET(i,&clientList)))
@@ -708,7 +708,7 @@ sint32 TCP::Close(sint32 whichFD)
          return(closesocket(fd));
        else
          return(-1);
-     } 
+     }
      else if ((whichFD<=maxFD) && (FD_ISSET(whichFD,&clientList)))
      {
        if (whichFD==maxFD)  // make sure maxFD is still correct
@@ -904,7 +904,7 @@ bit8 TCP::Bind(char *Host,uint16 port,bit8 reuseAddr)
 
 bit8 TCP::Bind(uint32 IP,uint16 Port,bit8 reuseAddr)
 {
-  int retval; 
+  int retval;
   int status;
 
   IP=htonl(IP);
@@ -929,20 +929,20 @@ bit8 TCP::Bind(uint32 IP,uint16 Port,bit8 reuseAddr)
 /******************  this may make the socket get garbage data??
     opval=1;
     retval=setsockopt(fd,SOL_SOCKET,SO_REUSEPORT,(char *)&opval,sizeof(opval));
-    if (retval!=0) 
+    if (retval!=0)
       fprintf(stderr,"Could not set socket to SO_REUSEPORT\n");
 **********************/
     #endif
-    #ifdef SO_REUSEADDR 
+    #ifdef SO_REUSEADDR
     opval=1;
     retval=setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,(char *)&opval,sizeof(opval));
     if (retval!=0)
       fprintf(stderr,"Could not set socket to SO_REUSEADDR\n");
-    #endif    
+    #endif
   }
 
   retval=bind(fd,(struct sockaddr *)&addr,sizeof(addr));
-  #ifdef _WINDOWS
+  #ifdef _WIN32
     if (retval==SOCKET_ERROR)
       retval=-1;
   #endif
@@ -1013,7 +1013,7 @@ bit8 TCP::Connect(uint32 IP,uint16 Port)
     result = connect(fd,(struct sockaddr *)&serverAddr, sizeof(serverAddr));
     status=GetStatus();
 
-    #ifdef _WINDOWS
+    #ifdef _WIN32
       if (result==SOCKET_ERROR)
         result=-1;
     #endif
@@ -1091,7 +1091,7 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
   result=-1;
 
   if (connectionState==CONNECTING)
-  { 
+  {
     if (IsConnected(fd))
     {
       DBGMSG("CONNECTION COMPLETE at point 1");
@@ -1107,7 +1107,7 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
   connectErrno=errno;
   status=GetStatus();
 
-  #ifdef _WINDOWS
+  #ifdef _WIN32
     if (result==SOCKET_ERROR)
     {
       DBGMSG("Socket error 1  " << status);
@@ -1124,7 +1124,7 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
     ClearStatus();
     result = connect(fd,(struct sockaddr *)&serverAddr, sizeof(serverAddr));
     status=GetStatus();
-    #ifdef _WINDOWS
+    #ifdef _WIN32
       if (result==SOCKET_ERROR)
       {
         DBGMSG("Socket error 2  " << status);
@@ -1159,14 +1159,14 @@ bit8 TCP::ConnectAsync(uint32 IP,uint16 Port)
 
 void TCP::ClearStatus(void)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
   errno=0;
   #endif
 }
 
 int TCP::GetStatus(void)
 {
-  #ifdef _WINDOWS
+  #ifdef _WIN32
   int status=WSAGetLastError();
   if (status==0) return(OK);
   else if (status==WSAEINTR) return(INTR);
diff --git a/Core/Tools/matchbot/wnet/tcp.h b/Core/Tools/matchbot/wnet/tcp.h
index 85030eafc3b..3e76c99eade 100644
--- a/Core/Tools/matchbot/wnet/tcp.h
+++ b/Core/Tools/matchbot/wnet/tcp.h
@@ -21,8 +21,7 @@ TCP                   Neal Kettler        neal@westwood.com
 
 \****************************************************************************/
 
-#ifndef TCP_HEADER
-#define TCP_HEADER
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,7 +30,7 @@ TCP                   Neal Kettler        neal@westwood.com
 #include <string.h>
 #include <assert.h>
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 
 #include <winsock.h>
 #include <io.h>
@@ -83,14 +82,14 @@ class TCP
 
 
   sint32      inputDelay;         // default delay for semi-blocking reads
-  sint32      outputDelay;        // default delay for semi-blocking writes 
+  sint32      outputDelay;        // default delay for semi-blocking writes
 
   enum ConnectionState
   {
      CLOSED,
      CONNECTING,
      CONNECTED
-  }           connectionState;     // What state is client FD in 
+  }           connectionState;     // What state is client FD in
 
 public:
 
@@ -195,5 +194,3 @@ class TCP
   bit8    SetOutputDelay(sint32 delay) { outputDelay=delay; return(TRUE); };
 
 };
-
-#endif
diff --git a/Core/Tools/matchbot/wnet/udp.cpp b/Core/Tools/matchbot/wnet/udp.cpp
index 72e0d662ed0..bba9479b658 100644
--- a/Core/Tools/matchbot/wnet/udp.cpp
+++ b/Core/Tools/matchbot/wnet/udp.cpp
@@ -60,7 +60,7 @@ sint32 UDP::Bind(uint32 IP,uint16 Port)
   addr.sin_port=Port;
   addr.sin_addr.s_addr=IP;
   fd=socket(AF_INET,SOCK_DGRAM,DEFAULT_PROTOCOL);
-  #ifdef _WINDOWS
+  #ifdef _WIN32
   if (fd==SOCKET_ERROR)
     fd=-1;
   #endif
@@ -69,7 +69,7 @@ sint32 UDP::Bind(uint32 IP,uint16 Port)
 
   retval=bind(fd,(struct sockaddr *)&addr,sizeof(addr));
 
-  #ifdef _WINDOWS
+  #ifdef _WIN32
     if (retval==SOCKET_ERROR)
       retval=-1;
   #endif
@@ -81,7 +81,7 @@ sint32 UDP::Bind(uint32 IP,uint16 Port)
   }
 
   int namelen=sizeof(addr);
-  getsockname(fd, (struct sockaddr *)&addr, &namelen); 
+  getsockname(fd, (struct sockaddr *)&addr, &namelen);
 
   myIP=ntohl(addr.sin_addr.s_addr);
   myPort=ntohs(addr.sin_port);
@@ -104,7 +104,7 @@ bit8 UDP::getLocalAddr(uint32 &ip, uint16 &port)
 // private function
 sint32 UDP::SetBlocking(bit8 block)
 {
-  #ifdef _WINDOWS
+  #ifdef _WIN32
    unsigned long flag=1;
    if (block)
      flag=0;
@@ -145,11 +145,11 @@ sint32 UDP::Write(uint8 *msg,uint32 len,uint32 IP,uint16 port)
 
   ClearStatus();
   retval=sendto(fd,(char *)msg,len,0,(struct sockaddr *)&to,sizeof(to));
-  #ifdef _WINDOWS
+  #ifdef _WIN32
   if (retval==SOCKET_ERROR)
     retval=-1;
   #endif
-  
+
   return(retval);
 }
 
@@ -161,7 +161,7 @@ sint32 UDP::Read(uint8 *msg,uint32 len,sockaddr_in *from)
   if (from!=NULL)
   {
     retval=recvfrom(fd,(char *)msg,len,0,(struct sockaddr *)from,&alen);
-    #ifdef _WINDOWS
+    #ifdef _WIN32
     if (retval==SOCKET_ERROR)
       retval=-1;
     #endif
@@ -169,7 +169,7 @@ sint32 UDP::Read(uint8 *msg,uint32 len,sockaddr_in *from)
   else
   {
     retval=recvfrom(fd,(char *)msg,len,0,NULL,NULL);
-    #ifdef _WINDOWS
+    #ifdef _WIN32
     if (retval==SOCKET_ERROR)
       retval=-1;
     #endif
@@ -180,14 +180,14 @@ sint32 UDP::Read(uint8 *msg,uint32 len,sockaddr_in *from)
 
 void UDP::ClearStatus(void)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
   errno=0;
   #endif
 }
 
 UDP::sockStat UDP::GetStatus(void)
 {
- #ifdef _WINDOWS
+ #ifdef _WIN32
   int status=WSAGetLastError();
   if (status==0) return(OK);
   else if (status==WSAEINTR) return(INTR);
@@ -227,13 +227,13 @@ UDP::sockStat UDP::GetStatus(void)
 int UDP::Wait(sint32 sec,sint32 usec,fd_set &returnSet)
 {
   fd_set inputSet;
- 
+
   FD_ZERO(&inputSet);
   FD_SET(fd,&inputSet);
- 
+
   return(Wait(sec,usec,inputSet,returnSet));
 }
- 
+
 //
 // Wait for net activity on a list of sockets
 //
@@ -244,17 +244,17 @@ int UDP::Wait(sint32 sec,sint32 usec,fd_set &givenSet,fd_set &returnSet)
   int          retval=0,done,givenMax;
   bit8         noTimeout=FALSE;
   timeval      tv;
- 
+
   returnSet=givenSet;
   backupSet=returnSet;
- 
+
   if ((sec==-1)&&(usec==-1))
     noTimeout=TRUE;
- 
+
   timeout.SetSec(sec);
   timeout.SetUsec(usec);
   timethen+=timeout;
- 
+
   givenMax=fd;
   for (uint32 i=0; i<(sizeof(fd_set)*8); i++)   // i=maxFD+1
   {
@@ -262,7 +262,7 @@ int UDP::Wait(sint32 sec,sint32 usec,fd_set &givenSet,fd_set &returnSet)
       givenMax=i;
   }
   ///DBGMSG("WAIT  fd="<<fd<<"  givenMax="<<givenMax);
- 
+
   done=0;
   while( ! done)
   {
@@ -273,7 +273,7 @@ int UDP::Wait(sint32 sec,sint32 usec,fd_set &givenSet,fd_set &returnSet)
       timeout.GetTimevalMT(tv);
       retval=select(givenMax+1,&returnSet,0,0,&tv);
     }
- 
+
     if (retval>=0)
       done=1;
 
@@ -310,7 +310,7 @@ int UDP::Wait(sint32 sec,sint32 usec,fd_set &givenSet,fd_set &returnSet)
 
 bit8 UDP::SetInputBuffer(uint32 bytes)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
    int retval,arg=bytes;
 
    retval=setsockopt(fd,SOL_SOCKET,SO_RCVBUF,
@@ -328,7 +328,7 @@ bit8 UDP::SetInputBuffer(uint32 bytes)
 
 bit8 UDP::SetOutputBuffer(uint32 bytes)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
    int retval,arg=bytes;
 
    retval=setsockopt(fd,SOL_SOCKET,SO_SNDBUF,
@@ -342,11 +342,11 @@ bit8 UDP::SetOutputBuffer(uint32 bytes)
   #endif
 }
 
-// Get the system buffer sizes 
+// Get the system buffer sizes
 
 int UDP::GetInputBuffer(void)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
    int retval,arg=0,len=sizeof(int);
 
    retval=getsockopt(fd,SOL_SOCKET,SO_RCVBUF,
@@ -360,7 +360,7 @@ int UDP::GetInputBuffer(void)
 
 int UDP::GetOutputBuffer(void)
 {
-  #ifndef _WINDOWS
+  #ifndef _WIN32
    int retval,arg=0,len=sizeof(int);
 
    retval=getsockopt(fd,SOL_SOCKET,SO_SNDBUF,
diff --git a/Core/Tools/matchbot/wnet/udp.h b/Core/Tools/matchbot/wnet/udp.h
index e3de5774304..7f40086058d 100644
--- a/Core/Tools/matchbot/wnet/udp.h
+++ b/Core/Tools/matchbot/wnet/udp.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef UDP_HEADER
-#define UDP_HEADER
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,7 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <winsock.h>
 #include <io.h>
 #define close _close
@@ -57,11 +56,11 @@ class UDP
 {
  // DATA
  private:
-  sint32       fd; 
+  sint32       fd;
   uint32       myIP;
   uint16       myPort;
   struct       sockaddr_in  addr;
-  
+
   // These defines specify a system independent way to
   //   get error codes for socket services.
   enum sockStat
@@ -104,11 +103,9 @@ class UDP
 
   bit8             getLocalAddr(uint32 &ip, uint16 &port);
   sint32           getFD(void) { return(fd); }
- 
+
   bit8             SetInputBuffer(uint32 bytes);
   bit8             SetOutputBuffer(uint32 bytes);
   int              GetInputBuffer(void);
   int              GetOutputBuffer(void);
 };
-
-#endif
diff --git a/Core/Tools/textureCompress/resource.h b/Core/Tools/textureCompress/resource.h
index e3971ec5fbb..a35acd71451 100644
--- a/Core/Tools/textureCompress/resource.h
+++ b/Core/Tools/textureCompress/resource.h
@@ -23,7 +23,7 @@
 #define IDC_FILENAME 1058
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        112
diff --git a/Core/Tools/textureCompress/textureCompress.cpp b/Core/Tools/textureCompress/textureCompress.cpp
index 51b822e7a1a..0eefe77166c 100644
--- a/Core/Tools/textureCompress/textureCompress.cpp
+++ b/Core/Tools/textureCompress/textureCompress.cpp
@@ -64,7 +64,7 @@ static void logStuff(const char *fmt, ...)
 	::MessageBox(NULL, buffer, "textureCompress", MB_OK);
 }
 
-#ifndef NDEBUG
+#ifdef RTS_DEBUG
 
 class DebugMunkee
 {
@@ -96,7 +96,7 @@ static void debugLog(const char *fmt, ...)
 
 #define DEBUG_LOG(x) {}
 
-#endif // NDEBUG
+#endif // RTS_DEBUG
 
 
 static void usage(const char *progname)
@@ -190,7 +190,7 @@ void FileInfo::set( const WIN32_FIND_DATA& info )
 	stat( filename.c_str(), &origStat);
 	modTime = origStat.st_mtime; // use stat(), since the LONGLONG code is unpredictable
 
-	//DEBUG_LOG(("FileInfo::set(): fname=%s, size=%d, modTime=%d\n", filename.c_str(), filesize, modTime));
+	//DEBUG_LOG(("FileInfo::set(): fname=%s, size=%d, modTime=%d", filename.c_str(), filesize, modTime));
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -231,7 +231,7 @@ Directory::Directory( const std::string& dirPath ) : m_dirPath(dirPath)
 		// if this is a subdirectory keep the name around till the end
 		if( item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY )
 		{
-			if ( strcmp( item.cFileName, "." ) && strcmp( item.cFileName, ".." ) )
+			if ( strcmp( item.cFileName, "." ) != 0 && strcmp( item.cFileName, ".." ) )
 			{
 				info.set(item);
 				m_subdirs.insert( info );
@@ -280,7 +280,7 @@ void eraseCachedFiles(const std::string& sourceDirName, const std::string& targe
 		src.append("\\");
 		src.append(*sit);
 
-		DEBUG_LOG(("Erasing cached file: %s\n", src.c_str()));
+		DEBUG_LOG(("Erasing cached file: %s", src.c_str()));
 		DeleteFile(src.c_str());
 	}
 }
@@ -300,10 +300,10 @@ void copyCachedFiles(const std::string& sourceDirName, const std::string& target
 		dest.append("\\");
 		dest.append(*sit);
 
-		DEBUG_LOG(("Copying cached file: %s\n", src.c_str()));
+		DEBUG_LOG(("Copying cached file: %s", src.c_str()));
 		if (_chmod(dest.c_str(), _S_IWRITE | _S_IREAD) == -1)
 		{
-			DEBUG_LOG(("Cannot chmod '%s'\n", dest.c_str()));
+			DEBUG_LOG(("Cannot chmod '%s'", dest.c_str()));
 		}
 		CopyFile(src.c_str(), dest.c_str(), FALSE);
 	}
@@ -320,7 +320,7 @@ void compressOrigFiles(const std::string& sourceDirName, const std::string& targ
 	HANDLE h = CreateFile(tmpFname, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_TEMPORARY, NULL);
 	if (!h)
 	{
-		DEBUG_LOG(("Could not create temp file '%s'!  Unable to compress textures!\n", tmpFname));
+		DEBUG_LOG(("Could not create temp file '%s'!  Unable to compress textures!", tmpFname));
 	}
 
 	StringSet::const_iterator sit;
@@ -344,9 +344,9 @@ void compressOrigFiles(const std::string& sourceDirName, const std::string& targ
 	commandLine.append(" > ");
 	commandLine.append(dxtOutFname);
 
-	DEBUG_LOG(("Compressing textures with command line of '%s'\n", commandLine.c_str()));
+	DEBUG_LOG(("Compressing textures with command line of '%s'", commandLine.c_str()));
 	int ret = system(commandLine.c_str());
-	DEBUG_LOG(("system(%s) returned %d\n", commandLine.c_str(), ret));
+	DEBUG_LOG(("system(%s) returned %d", commandLine.c_str(), ret));
 	DeleteFile(tmpFname);
 
 	// now copy compressed file to target dir
@@ -375,16 +375,16 @@ void compressOrigFiles(const std::string& sourceDirName, const std::string& targ
 		dest.append(*sit);
 		dest.replace(dest.size()-4, 4, ".dds");
 
-		DEBUG_LOG(("Copying new file from %s to %s\n", src.c_str(), dest.c_str()));
+		DEBUG_LOG(("Copying new file from %s to %s", src.c_str(), dest.c_str()));
 
 		if (_chmod(dest.c_str(), _S_IWRITE | _S_IREAD) == -1)
 		{
-			DEBUG_LOG(("Cannot chmod '%s'\n", dest.c_str()));
+			DEBUG_LOG(("Cannot chmod '%s'", dest.c_str()));
 		}
 		BOOL ret = CopyFile(src.c_str(), dest.c_str(), FALSE);
 		if (!ret)
 		{
-			DEBUG_LOG(("Could not copy file!\n"));
+			DEBUG_LOG(("Could not copy file!"));
 		}
 
 		_utime(dest.c_str(), &utb);
@@ -408,23 +408,23 @@ void copyOrigFiles(const std::string& sourceDirName, const std::string& targetDi
 
 		if (_chmod(dest.c_str(), _S_IWRITE | _S_IREAD) == -1)
 		{
-			DEBUG_LOG(("Cannot chmod '%s'\n", dest.c_str()));
+			DEBUG_LOG(("Cannot chmod '%s'", dest.c_str()));
 		}
 		BOOL res = CopyFile(src.c_str(), dest.c_str(), FALSE);
-		DEBUG_LOG(("Copying file: %s returns %d\n", src.c_str(), res));
+		DEBUG_LOG(("Copying file: %s returns %d", src.c_str(), res));
 	}
 }
 
 //-------------------------------------------------------------------------------------------------
 static void scanDir( const std::string& sourceDirName, const std::string& targetDirName, const std::string& cacheDirName, const std::string& dxtOutFname )
 {
-	DEBUG_LOG(("Scanning '%s'\n", sourceDirName.c_str()));
+	DEBUG_LOG(("Scanning '%s'", sourceDirName.c_str()));
 	Directory sourceDir(sourceDirName);
 
-	DEBUG_LOG(("Scanning '%s'\n", targetDirName.c_str()));
+	DEBUG_LOG(("Scanning '%s'", targetDirName.c_str()));
 	Directory targetDir(targetDirName);
 
-	DEBUG_LOG(("Scanning '%s'\n", cacheDirName.c_str()));
+	DEBUG_LOG(("Scanning '%s'", cacheDirName.c_str()));
 	Directory cacheDir(cacheDirName);
 
 	FileInfoSet *sourceFiles = sourceDir.getFiles();
@@ -436,7 +436,7 @@ static void scanDir( const std::string& sourceDirName, const std::string& target
 	StringSet origFilesToCompress;
 	StringSet origFilesToCopy;
 
-	DEBUG_LOG(("Emptying targetDir\n"));
+	DEBUG_LOG(("Emptying targetDir"));
 	for (FileInfoSet::iterator targetIt = targetFiles->begin(); targetIt != targetFiles->end(); ++targetIt)
 	{
 		FileInfo f = *targetIt;
@@ -452,7 +452,7 @@ static void scanDir( const std::string& sourceDirName, const std::string& target
 			{
 				fname.insert(0, "\\");
 				fname.insert(0, targetDirName);
-				DEBUG_LOG(("Deleting now-removed file '%s'\n", fname.c_str()));
+				DEBUG_LOG(("Deleting now-removed file '%s'", fname.c_str()));
 				DeleteFile(fname.c_str());
 			}
 		}
@@ -619,7 +619,7 @@ int main(int argc, const char **argv)
 		const char *targetDir = argv[2];
 		const char *cacheDir  = argv[3];
 
-#ifndef NDEBUG
+#ifdef RTS_DEBUG
 		theDebugMunkee = new DebugMunkee(argv[4]);
 #endif
 
@@ -631,11 +631,11 @@ int main(int argc, const char **argv)
 		//printSet( hasAlpha, "Using Alpha Channel" );
 		//tearDownLoadWindow();
 
-#ifndef NDEBUG
+#ifdef RTS_DEBUG
 		delete theDebugMunkee;
 		theDebugMunkee = NULL;
 #endif
 	}
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/timingTest/StdAfx.cpp b/Core/Tools/timingTest/StdAfx.cpp
index be97e1b641f..a881c7bb192 100644
--- a/Core/Tools/timingTest/StdAfx.cpp
+++ b/Core/Tools/timingTest/StdAfx.cpp
@@ -22,5 +22,5 @@
 
 #include "StdAfx.h"
 
-// TODO: reference any additional headers you need in STDAFX.H
+// TODO: reference any additional headers you need in STDAFX.h
 // and not in this file
diff --git a/Core/Tools/timingTest/StdAfx.h b/Core/Tools/timingTest/StdAfx.h
index c55d5148311..fd99f022064 100644
--- a/Core/Tools/timingTest/StdAfx.h
+++ b/Core/Tools/timingTest/StdAfx.h
@@ -21,12 +21,7 @@
 //      are changed infrequently
 //
 
-#if !defined(AFX_STDAFX_H__2E1EE76B_62B6_41EC_9B2E_E7B1677E0D6E__INCLUDED_)
-#define AFX_STDAFX_H__2E1EE76B_62B6_41EC_9B2E_E7B1677E0D6E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 
@@ -36,5 +31,3 @@
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__2E1EE76B_62B6_41EC_9B2E_E7B1677E0D6E__INCLUDED_)
diff --git a/Core/Tools/timingTest/timingTest.cpp b/Core/Tools/timingTest/timingTest.cpp
index 1c98cfb7cf0..8bd97b1cec2 100644
--- a/Core/Tools/timingTest/timingTest.cpp
+++ b/Core/Tools/timingTest/timingTest.cpp
@@ -35,8 +35,8 @@ char buffer[1024];
 void GetPrecisionTimer(INT64* t)
 {
 #if defined(_MSC_VER) && _MSC_VER < 1300
-	// CPUID is needed to force serialization of any previous instructions. 
-	__asm 
+	// CPUID is needed to force serialization of any previous instructions.
+	__asm
 	{
 		RDTSC
 		MOV ECX,[t]
@@ -56,8 +56,8 @@ void InitPrecisionTimer()
 	static int TESTS = 10;
 
 	cout << "Starting tests..." << flush;
-	
-	for (int i = 0; i < TESTS; ++i) 
+
+	for (int i = 0; i < TESTS; ++i)
 	{
 		int            TimeStart;
 		int            TimeStop;
@@ -97,7 +97,7 @@ int main(int argc, char* argv[])
 	InitPrecisionTimer();
 	FILE *out = fopen("output.txt", "w");
 	cout << "Beginning Looping tests: " << endl;
-	
+
 	const int TESTCOUNT = 60;
 
 	while (1) {
@@ -105,12 +105,12 @@ int main(int argc, char* argv[])
 			GetPrecisionTimer(&startTime);
 			Sleep(5);
 			GetPrecisionTimer(&endTime);
-			totalTime += (endTime - startTime);	
+			totalTime += (endTime - startTime);
 		}
 
 		double avgPerFrame = 1.0 * totalTime / TESTCOUNT;
 
-		sprintf(buffer, "%.8f,\t", avgPerFrame / s_ticksPerMSec );	
+		sprintf(buffer, "%.8f,\t", avgPerFrame / s_ticksPerMSec );
 		fwrite(buffer, strlen(buffer), 1, out);
 		fflush(out);
 		cout << buffer << endl;
diff --git a/Core/Tools/versionUpdate/versionUpdate.cpp b/Core/Tools/versionUpdate/versionUpdate.cpp
index d1abf40df46..e8c1a90929b 100644
--- a/Core/Tools/versionUpdate/versionUpdate.cpp
+++ b/Core/Tools/versionUpdate/versionUpdate.cpp
@@ -129,14 +129,14 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 				while (!feof(filePtr))
 				{
 					fread(buffer, 256, 1, filePtr);
-					if ((stringPtr = strstr(buffer, VERSION_STRING)) != NULL) 
+					if ((stringPtr = strstr(buffer, VERSION_STRING)) != NULL)
 					{
 						char *ptr;
 
 						// Looking for '#define VERSION "x.y.z"'
 						ptr = strtok(stringPtr, " ");	// The VERSION
 						ptr = strtok(NULL, "\n");			// The remainder
-						
+
 						if (*ptr == '\"')
 						{
 							ptr++; // Inc past the first "
@@ -152,9 +152,9 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 						{
 							printf ("Local build is 0. Oops, didn't find a string of the format: '#define VERSION \"x.y.z\"'");
 						}
-					} // End if if (strstr
-				} // End of while
-			} // End of if filePtr
+					}
+				}
+			}
 			else
 			{
 				// Didn't find the file, write a new one
@@ -165,4 +165,4 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 	}
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/Core/Tools/wolSetup/StdAfx.cpp b/Core/Tools/wolSetup/StdAfx.cpp
index cc06faa54c8..a666396e620 100644
--- a/Core/Tools/wolSetup/StdAfx.cpp
+++ b/Core/Tools/wolSetup/StdAfx.cpp
@@ -22,5 +22,5 @@
 
 #include "StdAfx.h"
 
-// TODO: reference any additional headers you need in STDAFX.H
+// TODO: reference any additional headers you need in STDAFX.h
 // and not in this file
diff --git a/Core/Tools/wolSetup/StdAfx.h b/Core/Tools/wolSetup/StdAfx.h
index e2b01528de0..9c16d70d2f7 100644
--- a/Core/Tools/wolSetup/StdAfx.h
+++ b/Core/Tools/wolSetup/StdAfx.h
@@ -21,12 +21,7 @@
 //      are changed infrequently
 //
 
-#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
-#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 
@@ -37,5 +32,3 @@
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
diff --git a/Core/Tools/wolSetup/WOLAPI/chatdefs.h b/Core/Tools/wolSetup/WOLAPI/chatdefs.h
index 094f5e243f3..e0175d75740 100644
--- a/Core/Tools/wolSetup/WOLAPI/chatdefs.h
+++ b/Core/Tools/wolSetup/WOLAPI/chatdefs.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CHATDEFS_HEADER
-#define CHATDEFS_HEADER
+#pragma once
 
 // gks 11/3/1999: version numbers for SetClientVersion
 // GMU 01/12/01 : bumped CHAT_VERSION_MINOR to 15
@@ -32,47 +31,47 @@
 //
 
 // Your nick is still logged into chat
-#define CHAT_E_NICKINUSE       MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 100) 
+#define CHAT_E_NICKINUSE       MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 100)
 // Your password is incorrect during login
-#define CHAT_E_BADPASS         MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 101) 
+#define CHAT_E_BADPASS         MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 101)
 // Reference made to non-existant user or channel
-#define CHAT_E_NONESUCH		   MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 102) 
+#define CHAT_E_NONESUCH		   MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 102)
 // The network layer is down or cannot be initialized for some reason
-#define CHAT_E_CON_NETDOWN        MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 103) 
+#define CHAT_E_CON_NETDOWN        MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 103)
 // Name lookup (e.g DNS) failed for some reason
-#define CHAT_E_CON_LOOKUP_FAILED  MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 104) 
+#define CHAT_E_CON_LOOKUP_FAILED  MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 104)
 // Some fatal error occured with the net connection
-#define CHAT_E_CON_ERROR          MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 105) 
+#define CHAT_E_CON_ERROR          MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 105)
 // General request timeout for a request
-#define CHAT_E_TIMEOUT            MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 106) 
+#define CHAT_E_TIMEOUT            MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 106)
 // Must patch before continuing
-#define CHAT_E_MUSTPATCH        MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 107) 
+#define CHAT_E_MUSTPATCH        MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 107)
 // Miscellaneous internal status error
-#define CHAT_E_STATUSERROR		MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 108) 
+#define CHAT_E_STATUSERROR		MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 108)
 // Server has returned something we don't recognise
-#define CHAT_E_UNKNOWNRESPONSE	MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 109) 
+#define CHAT_E_UNKNOWNRESPONSE	MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 109)
 // Tried to join a channel that has enough players already
-#define CHAT_E_CHANNELFULL		MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 110) 
+#define CHAT_E_CHANNELFULL		MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 110)
 // Tried to create a channel that already exists
-#define CHAT_E_CHANNELEXISTS	MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 111) 
+#define CHAT_E_CHANNELEXISTS	MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 111)
 // Tried to join a channel that does not exist
-#define CHAT_E_CHANNELDOESNOTEXIST		MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 112) 
+#define CHAT_E_CHANNELDOESNOTEXIST		MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 112)
 // Tried to join a channel with the wrong password
-#define CHAT_E_BADCHANNELPASSWORD		MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 113) 
+#define CHAT_E_BADCHANNELPASSWORD		MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 113)
 // You've been banned from the server / channel
-#define CHAT_E_BANNED            MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 114) 
+#define CHAT_E_BANNED            MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 114)
 // You tried to do something that required operator status
-#define CHAT_E_NOT_OPER           MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 115) 
+#define CHAT_E_NOT_OPER           MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 115)
 // Your account is disabled
-#define CHAT_E_DISABLED           MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 116) 
+#define CHAT_E_DISABLED           MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 116)
 // Your serial# has been banned
-#define CHAT_E_SERIALBANNED       MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 117) 
+#define CHAT_E_SERIALBANNED       MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 117)
 // Somebody else is using your serial#
 #define CHAT_E_SERIALDUP          MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 118)
 
 // New error codes -- gks 1/10/2000
 // Serial number does not exist in the database
-#define CHAT_E_SERIALUNKNOWN      MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 119) 
+#define CHAT_E_SERIALUNKNOWN      MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 119)
 // Serial number is for a different product
 #define CHAT_E_SKUSERIALMISMATCH  MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 120)
 
@@ -81,25 +80,25 @@
 // Note: S_OK is the usual success code
 
 // A network connection is underway
-#define CHAT_S_CON_CONNECTING     MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 300) 
+#define CHAT_S_CON_CONNECTING     MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 300)
 // A network connection is complete
-#define CHAT_S_CON_CONNECTED      MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 301) 
+#define CHAT_S_CON_CONNECTED      MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 301)
 // A network connection is going down
-#define CHAT_S_CON_DISCONNECTING  MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 302) 
+#define CHAT_S_CON_DISCONNECTING  MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 302)
 // A network connection is closed
 #define CHAT_S_CON_DISCONNECTED   MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 303)
 
 
 // Find - Nick not in system
-#define CHAT_S_FIND_NOTHERE   MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 304) 
+#define CHAT_S_FIND_NOTHERE   MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 304)
 // Find - Not in any channels
-#define CHAT_S_FIND_NOCHAN   MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 305) 
+#define CHAT_S_FIND_NOCHAN   MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 305)
 // Find - user has find turned off
 #define CHAT_S_FIND_OFF   MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 306)
 
 
 // Page - Nick not in system
-#define CHAT_S_PAGE_NOTHERE   MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 307) 
+#define CHAT_S_PAGE_NOTHERE   MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 307)
 // Page - user has page turned off
 #define CHAT_S_PAGE_OFF   MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 308)
 
@@ -117,19 +116,19 @@
 //
 
 // You are not connected to the chat server
-#define CHAT_E_NOTCONNECTED    MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 500) 
+#define CHAT_E_NOTCONNECTED    MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 500)
 // You are not in a channel
-#define CHAT_E_NOCHANNEL       MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 501) 
+#define CHAT_E_NOCHANNEL       MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 501)
 // Feature is not implemented
-#define CHAT_E_NOTIMPLEMENTED  MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 502) 
+#define CHAT_E_NOTIMPLEMENTED  MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 502)
 // The request was made while while a conflicting request was still pending
-#define CHAT_E_PENDINGREQUEST  MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 503) 
+#define CHAT_E_PENDINGREQUEST  MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 503)
 // Invalid parameter passed - usually a NULL pointer
-#define CHAT_E_PARAMERROR	   MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 504) 
+#define CHAT_E_PARAMERROR	   MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 504)
 // Tried to create or join a channel before leaving the previous one
-#define CHAT_E_LEAVECHANNEL		MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 508) 
+#define CHAT_E_LEAVECHANNEL		MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 508)
 // Tried to send something to a channel when not a member of any channel
-#define CHAT_E_JOINCHANNEL		MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 509) 
+#define CHAT_E_JOINCHANNEL		MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 509)
 // Tried to join a non-existant channel
 #define CHAT_E_UNKNOWNCHANNEL	MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 510)
 
@@ -148,11 +147,11 @@
 // User flags (bit field)
 //
 // The owner of the current channel
-#define CHAT_USER_CHANNELOWNER                 0x0001 
+#define CHAT_USER_CHANNELOWNER                 0x0001
 // The person with voice (conch shell...)
-#define CHAT_USER_VOICE                        0x0002 
+#define CHAT_USER_VOICE                        0x0002
 // Squelched?
-#define CHAT_USER_SQUELCHED                    0x0004 
+#define CHAT_USER_SQUELCHED                    0x0004
 // The local user
 #define CHAT_USER_MYSELF                       0x8000
 
@@ -168,6 +167,3 @@
 #define CHAN_MODE_KEY         0x0100
 #define CHAN_MODE_BAN         0x0200
 #define CHAN_MODE_LIMIT       0x0400
-
-
-#endif
diff --git a/Core/Tools/wolSetup/WOLAPI/downloaddefs.h b/Core/Tools/wolSetup/WOLAPI/downloaddefs.h
index a5a3bf4ceb9..cd78d834a15 100644
--- a/Core/Tools/wolSetup/WOLAPI/downloaddefs.h
+++ b/Core/Tools/wolSetup/WOLAPI/downloaddefs.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _DOWNLOADDEFS_H
-#define _DOWNLOADDEFS_H
+#pragma once
 
 // CDownload statuses
 
@@ -56,5 +55,3 @@
 #define DOWNLOADEVENT_LOCALFILEOPENFAILED	5
 #define DOWNLOADEVENT_TCPERROR				6
 #define DOWNLOADEVENT_DISCONNECTERROR		7
-
-#endif
diff --git a/Core/Tools/wolSetup/WOLAPI/ftpdefs.h b/Core/Tools/wolSetup/WOLAPI/ftpdefs.h
index 35fa5b6a877..1306a38ecbf 100644
--- a/Core/Tools/wolSetup/WOLAPI/ftpdefs.h
+++ b/Core/Tools/wolSetup/WOLAPI/ftpdefs.h
@@ -16,15 +16,10 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __FTPDEFS_H_INCLUDED__
-#define __FTPDEFS_H_INCLUDED__
-
+#pragma once
 
 // CFtp return codes.
 
 #define FTP_SUCCEEDED		S_OK
 #define	FTP_FAILED			MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 1 )
 #define FTP_TRYING			MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 2 )
-
-
-#endif
diff --git a/Core/Tools/wolSetup/WOLAPI/netutildefs.h b/Core/Tools/wolSetup/WOLAPI/netutildefs.h
index 5f3840c10e3..926bc1f2fa5 100644
--- a/Core/Tools/wolSetup/WOLAPI/netutildefs.h
+++ b/Core/Tools/wolSetup/WOLAPI/netutildefs.h
@@ -16,9 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef NETUTILDEFS_HEADER
-#define NETUTILDEFS_HEADER
-
+#pragma once
 
 #define NETUTIL_E_ERROR       MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 100)
 #define NETUTIL_E_BUSY        MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 101)
@@ -28,5 +26,3 @@
 #define NETUTIL_E_CANTVERIFY    MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 257)
 
 #define NETUTIL_S_FINISHED    MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 500)
-
-#endif
diff --git a/Core/Tools/wolSetup/WOLAPI/wolapi.h b/Core/Tools/wolSetup/WOLAPI/wolapi.h
index 05182b56a47..217a6a1a3e7 100644
--- a/Core/Tools/wolSetup/WOLAPI/wolapi.h
+++ b/Core/Tools/wolSetup/WOLAPI/wolapi.h
@@ -24,7 +24,7 @@
  */
 /* Compiler settings for .\WOLAPI.idl:
     Oicf (OptLev=i2), W1, Zp8, env=Win32, ms_ext, c_ext
-    error checks: allocation ref bounds_check enum stub_data 
+    error checks: allocation ref bounds_check enum stub_data
 */
 //@@MIDL_FILE_HEADING(  )
 
@@ -51,9 +51,9 @@
 
 #ifdef __cplusplus
 extern "C"{
-#endif 
+#endif
 
-/* Forward Declarations */ 
+/* Forward Declarations */
 
 #ifndef __IRTPatcher_FWD_DEFINED__
 #define __IRTPatcher_FWD_DEFINED__
@@ -198,56 +198,56 @@ typedef struct Chat2 Chat2;
 #include "ocidl.h"
 
 void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t);
-void __RPC_USER MIDL_user_free( void __RPC_FAR * ); 
+void __RPC_USER MIDL_user_free( void __RPC_FAR * );
 
 #ifndef __IRTPatcher_INTERFACE_DEFINED__
 #define __IRTPatcher_INTERFACE_DEFINED__
 
 /* interface IRTPatcher */
-/* [object][unique][helpstring][uuid] */ 
+/* [object][unique][helpstring][uuid] */
 
 
 EXTERN_C const IID IID_IRTPatcher;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("925CDEDE-71B9-11D1-B1C5-006097176556")
     IRTPatcher : public IUnknown
     {
     public:
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE ApplyPatch( 
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE ApplyPatch(
             /* [string][in] */ LPCSTR destpath,
             /* [string][in] */ LPCSTR filename) = 0;
-        
+
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE PumpMessages( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IRTPatcherVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
             IRTPatcher __RPC_FAR * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
             IRTPatcher __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
             IRTPatcher __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *ApplyPatch )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *ApplyPatch )(
             IRTPatcher __RPC_FAR * This,
             /* [string][in] */ LPCSTR destpath,
             /* [string][in] */ LPCSTR filename);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *PumpMessages )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *PumpMessages )(
             IRTPatcher __RPC_FAR * This);
-        
+
         END_INTERFACE
     } IRTPatcherVtbl;
 
@@ -256,7 +256,7 @@ EXTERN_C const IID IID_IRTPatcher;
         CONST_VTBL struct IRTPatcherVtbl __RPC_FAR *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -284,7 +284,7 @@ EXTERN_C const IID IID_IRTPatcher;
 
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IRTPatcher_ApplyPatch_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IRTPatcher_ApplyPatch_Proxy(
     IRTPatcher __RPC_FAR * This,
     /* [string][in] */ LPCSTR destpath,
     /* [string][in] */ LPCSTR filename);
@@ -297,7 +297,7 @@ void __RPC_STUB IRTPatcher_ApplyPatch_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IRTPatcher_PumpMessages_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IRTPatcher_PumpMessages_Proxy(
     IRTPatcher __RPC_FAR * This);
 
 
@@ -316,52 +316,52 @@ void __RPC_STUB IRTPatcher_PumpMessages_Stub(
 #define __IRTPatcherEvent_INTERFACE_DEFINED__
 
 /* interface IRTPatcherEvent */
-/* [object][unique][helpstring][uuid] */ 
+/* [object][unique][helpstring][uuid] */
 
 
 EXTERN_C const IID IID_IRTPatcherEvent;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("925CDEE3-71B9-11D1-B1C5-006097176556")
     IRTPatcherEvent : public IUnknown
     {
     public:
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnProgress( 
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnProgress(
             /* [in] */ LPCSTR filename,
             /* [in] */ int progress) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnTermination( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnTermination(
             /* [in] */ BOOL success) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IRTPatcherEventVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
             IRTPatcherEvent __RPC_FAR * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
             IRTPatcherEvent __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
             IRTPatcherEvent __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnProgress )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnProgress )(
             IRTPatcherEvent __RPC_FAR * This,
             /* [in] */ LPCSTR filename,
             /* [in] */ int progress);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnTermination )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnTermination )(
             IRTPatcherEvent __RPC_FAR * This,
             /* [in] */ BOOL success);
-        
+
         END_INTERFACE
     } IRTPatcherEventVtbl;
 
@@ -370,7 +370,7 @@ EXTERN_C const IID IID_IRTPatcherEvent;
         CONST_VTBL struct IRTPatcherEventVtbl __RPC_FAR *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -398,7 +398,7 @@ EXTERN_C const IID IID_IRTPatcherEvent;
 
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IRTPatcherEvent_OnProgress_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IRTPatcherEvent_OnProgress_Proxy(
     IRTPatcherEvent __RPC_FAR * This,
     /* [in] */ LPCSTR filename,
     /* [in] */ int progress);
@@ -411,7 +411,7 @@ void __RPC_STUB IRTPatcherEvent_OnProgress_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IRTPatcherEvent_OnTermination_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IRTPatcherEvent_OnTermination_Proxy(
     IRTPatcherEvent __RPC_FAR * This,
     /* [in] */ BOOL success);
 
@@ -431,13 +431,13 @@ void __RPC_STUB IRTPatcherEvent_OnTermination_Stub(
 #define __IChat_INTERFACE_DEFINED__
 
 /* interface IChat */
-/* [object][unique][helpstring][uuid] */ 
+/* [object][unique][helpstring][uuid] */
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
 typedef long time_t;
 #endif
 
-typedef 
+typedef
 enum Locale
     {	LOC_UNKNOWN	= 0,
 	LOC_OTHER	= LOC_UNKNOWN + 1,
@@ -628,336 +628,336 @@ typedef struct Squad Squad;
 EXTERN_C const IID IID_IChat;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("4DD3BAF4-7579-11D1-B1C6-006097176556")
     IChat : public IUnknown
     {
     public:
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE PumpMessages( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestServerList( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestServerList(
             /* [in] */ unsigned long SKU,
             /* [in] */ unsigned long current_version,
             /* [in] */ LPCSTR loginname,
             /* [in] */ LPCSTR password,
             /* [in] */ int timeout) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestConnection( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestConnection(
             /* [in] */ Server __RPC_FAR *server,
             /* [in] */ int timeout,
             int domangle) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelList( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelList(
             /* [in] */ int channelType,
             /* [in] */ int autoping) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelCreate( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelCreate(
             /* [in] */ Channel __RPC_FAR *channel) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelJoin( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelJoin(
             /* [in] */ Channel __RPC_FAR *channel) = 0;
-        
+
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelLeave( void) = 0;
-        
+
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUserList( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPublicMessage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPublicMessage(
             /* [in] */ LPCSTR message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPrivateMessage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPrivateMessage(
             /* [in] */ User __RPC_FAR *users,
             /* [in] */ LPCSTR message) = 0;
-        
+
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestLogout( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPrivateGameOptions( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPrivateGameOptions(
             /* [in] */ User __RPC_FAR *users,
             /* [in] */ LPCSTR options) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPublicGameOptions( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPublicGameOptions(
             /* [in] */ LPCSTR options) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPublicAction( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPublicAction(
             /* [in] */ LPCSTR action) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPrivateAction( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPrivateAction(
             /* [in] */ User __RPC_FAR *users,
             /* [in] */ LPCSTR action) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestGameStart( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestGameStart(
             /* [in] */ User __RPC_FAR *users) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelTopic( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelTopic(
             /* [in] */ LPCSTR topic) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetVersion( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetVersion(
             /* [in] */ unsigned long __RPC_FAR *version) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUserKick( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUserKick(
             /* [in] */ User __RPC_FAR *user) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUserIP( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUserIP(
             /* [in] */ User __RPC_FAR *user) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetGametypeInfo( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetGametypeInfo(
             unsigned int gtype,
             int icon_size,
             unsigned char __RPC_FAR *__RPC_FAR *bitmap,
             int __RPC_FAR *bmp_bytes,
             LPCSTR __RPC_FAR *name,
             LPCSTR __RPC_FAR *URL) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestFind( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestFind(
             User __RPC_FAR *user) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPage(
             User __RPC_FAR *user,
             LPCSTR message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetFindPage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetFindPage(
             int findOn,
             int pageOn) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetSquelch( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetSquelch(
             User __RPC_FAR *user,
             int squelch) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetSquelch( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetSquelch(
             User __RPC_FAR *user) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetChannelFilter( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetChannelFilter(
             int channelType) = 0;
-        
+
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestGameEnd( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetLangFilter( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetLangFilter(
             int onoff) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelBan( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelBan(
             LPCSTR name,
             int ban) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetGametypeList( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetGametypeList(
             LPCSTR __RPC_FAR *list) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetHelpURL( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetHelpURL(
             LPCSTR __RPC_FAR *url) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetProductSKU( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetProductSKU(
             unsigned long SKU) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetNick( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetNick(
             int num,
             LPCSTR __RPC_FAR *nick,
             LPCSTR __RPC_FAR *pass) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetNick( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetNick(
             int num,
             LPCSTR nick,
             LPCSTR pass,
             int domangle) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetLobbyCount( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetLobbyCount(
             int __RPC_FAR *count) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestRawMessage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestRawMessage(
             LPCSTR ircmsg) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetAttributeValue( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetAttributeValue(
             LPCSTR attrib,
             LPCSTR __RPC_FAR *value) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetAttributeValue( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetAttributeValue(
             LPCSTR attrib,
             LPCSTR value) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetChannelExInfo( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetChannelExInfo(
             LPCSTR info) = 0;
-        
+
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE StopAutoping( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestSquadInfo( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestSquadInfo(
             unsigned long id) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestSetTeam( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestSetTeam(
             int team) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestSetLocale( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestSetLocale(
             Locale locale) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUserLocale( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUserLocale(
             User __RPC_FAR *users) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUserTeam( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUserTeam(
             User __RPC_FAR *users) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetNickLocale( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetNickLocale(
             int nicknum,
             Locale __RPC_FAR *locale) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetNickLocale( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetNickLocale(
             int nicknum,
             Locale locale) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetLocaleString( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetLocaleString(
             LPCSTR __RPC_FAR *loc_string,
             Locale locale) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetLocaleCount( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetLocaleCount(
             int __RPC_FAR *num) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetClientVersion( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetClientVersion(
             unsigned long version) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetCodepageFilter( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetCodepageFilter(
             int filter) = 0;
-        
+
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestBuddyList( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestBuddyAdd( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestBuddyAdd(
             User __RPC_FAR *newbuddy) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestBuddyDelete( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestBuddyDelete(
             User __RPC_FAR *buddy) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPublicUnicodeMessage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPublicUnicodeMessage(
             /* [in] */ const unsigned short __RPC_FAR *message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPrivateUnicodeMessage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPrivateUnicodeMessage(
             /* [in] */ User __RPC_FAR *users,
             /* [in] */ const unsigned short __RPC_FAR *message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPublicUnicodeAction( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPublicUnicodeAction(
             /* [in] */ const unsigned short __RPC_FAR *action) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPrivateUnicodeAction( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestPrivateUnicodeAction(
             /* [in] */ User __RPC_FAR *users,
             /* [in] */ const unsigned short __RPC_FAR *action) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUnicodePage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUnicodePage(
             User __RPC_FAR *user,
             const unsigned short __RPC_FAR *message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestSetPlayerCount( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestSetPlayerCount(
             unsigned int currentPlayers,
             unsigned int maxPlayers) = 0;
-        
+
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestServerTime( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestInsiderStatus( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestInsiderStatus(
             User __RPC_FAR *users) = 0;
-        
+
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestSetLocalIP( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestSquadByName( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestSquadByName(
             LPCSTR name) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IChatVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
             IChat __RPC_FAR * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
             IChat __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
             IChat __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *PumpMessages )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *PumpMessages )(
             IChat __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestServerList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestServerList )(
             IChat __RPC_FAR * This,
             /* [in] */ unsigned long SKU,
             /* [in] */ unsigned long current_version,
             /* [in] */ LPCSTR loginname,
             /* [in] */ LPCSTR password,
             /* [in] */ int timeout);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestConnection )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestConnection )(
             IChat __RPC_FAR * This,
             /* [in] */ Server __RPC_FAR *server,
             /* [in] */ int timeout,
             int domangle);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelList )(
             IChat __RPC_FAR * This,
             /* [in] */ int channelType,
             /* [in] */ int autoping);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelCreate )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelCreate )(
             IChat __RPC_FAR * This,
             /* [in] */ Channel __RPC_FAR *channel);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelJoin )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelJoin )(
             IChat __RPC_FAR * This,
             /* [in] */ Channel __RPC_FAR *channel);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelLeave )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelLeave )(
             IChat __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUserList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUserList )(
             IChat __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPublicMessage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPublicMessage )(
             IChat __RPC_FAR * This,
             /* [in] */ LPCSTR message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPrivateMessage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPrivateMessage )(
             IChat __RPC_FAR * This,
             /* [in] */ User __RPC_FAR *users,
             /* [in] */ LPCSTR message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestLogout )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestLogout )(
             IChat __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPrivateGameOptions )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPrivateGameOptions )(
             IChat __RPC_FAR * This,
             /* [in] */ User __RPC_FAR *users,
             /* [in] */ LPCSTR options);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPublicGameOptions )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPublicGameOptions )(
             IChat __RPC_FAR * This,
             /* [in] */ LPCSTR options);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPublicAction )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPublicAction )(
             IChat __RPC_FAR * This,
             /* [in] */ LPCSTR action);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPrivateAction )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPrivateAction )(
             IChat __RPC_FAR * This,
             /* [in] */ User __RPC_FAR *users,
             /* [in] */ LPCSTR action);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestGameStart )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestGameStart )(
             IChat __RPC_FAR * This,
             /* [in] */ User __RPC_FAR *users);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelTopic )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelTopic )(
             IChat __RPC_FAR * This,
             /* [in] */ LPCSTR topic);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetVersion )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetVersion )(
             IChat __RPC_FAR * This,
             /* [in] */ unsigned long __RPC_FAR *version);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUserKick )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUserKick )(
             IChat __RPC_FAR * This,
             /* [in] */ User __RPC_FAR *user);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUserIP )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUserIP )(
             IChat __RPC_FAR * This,
             /* [in] */ User __RPC_FAR *user);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetGametypeInfo )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetGametypeInfo )(
             IChat __RPC_FAR * This,
             unsigned int gtype,
             int icon_size,
@@ -965,196 +965,196 @@ EXTERN_C const IID IID_IChat;
             int __RPC_FAR *bmp_bytes,
             LPCSTR __RPC_FAR *name,
             LPCSTR __RPC_FAR *URL);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestFind )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestFind )(
             IChat __RPC_FAR * This,
             User __RPC_FAR *user);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPage )(
             IChat __RPC_FAR * This,
             User __RPC_FAR *user,
             LPCSTR message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetFindPage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetFindPage )(
             IChat __RPC_FAR * This,
             int findOn,
             int pageOn);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetSquelch )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetSquelch )(
             IChat __RPC_FAR * This,
             User __RPC_FAR *user,
             int squelch);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetSquelch )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetSquelch )(
             IChat __RPC_FAR * This,
             User __RPC_FAR *user);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetChannelFilter )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetChannelFilter )(
             IChat __RPC_FAR * This,
             int channelType);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestGameEnd )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestGameEnd )(
             IChat __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetLangFilter )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetLangFilter )(
             IChat __RPC_FAR * This,
             int onoff);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelBan )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelBan )(
             IChat __RPC_FAR * This,
             LPCSTR name,
             int ban);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetGametypeList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetGametypeList )(
             IChat __RPC_FAR * This,
             LPCSTR __RPC_FAR *list);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetHelpURL )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetHelpURL )(
             IChat __RPC_FAR * This,
             LPCSTR __RPC_FAR *url);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetProductSKU )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetProductSKU )(
             IChat __RPC_FAR * This,
             unsigned long SKU);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetNick )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetNick )(
             IChat __RPC_FAR * This,
             int num,
             LPCSTR __RPC_FAR *nick,
             LPCSTR __RPC_FAR *pass);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetNick )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetNick )(
             IChat __RPC_FAR * This,
             int num,
             LPCSTR nick,
             LPCSTR pass,
             int domangle);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetLobbyCount )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetLobbyCount )(
             IChat __RPC_FAR * This,
             int __RPC_FAR *count);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestRawMessage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestRawMessage )(
             IChat __RPC_FAR * This,
             LPCSTR ircmsg);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetAttributeValue )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetAttributeValue )(
             IChat __RPC_FAR * This,
             LPCSTR attrib,
             LPCSTR __RPC_FAR *value);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetAttributeValue )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetAttributeValue )(
             IChat __RPC_FAR * This,
             LPCSTR attrib,
             LPCSTR value);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetChannelExInfo )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetChannelExInfo )(
             IChat __RPC_FAR * This,
             LPCSTR info);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *StopAutoping )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *StopAutoping )(
             IChat __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestSquadInfo )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestSquadInfo )(
             IChat __RPC_FAR * This,
             unsigned long id);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestSetTeam )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestSetTeam )(
             IChat __RPC_FAR * This,
             int team);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestSetLocale )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestSetLocale )(
             IChat __RPC_FAR * This,
             Locale locale);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUserLocale )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUserLocale )(
             IChat __RPC_FAR * This,
             User __RPC_FAR *users);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUserTeam )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUserTeam )(
             IChat __RPC_FAR * This,
             User __RPC_FAR *users);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetNickLocale )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetNickLocale )(
             IChat __RPC_FAR * This,
             int nicknum,
             Locale __RPC_FAR *locale);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetNickLocale )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetNickLocale )(
             IChat __RPC_FAR * This,
             int nicknum,
             Locale locale);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetLocaleString )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetLocaleString )(
             IChat __RPC_FAR * This,
             LPCSTR __RPC_FAR *loc_string,
             Locale locale);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetLocaleCount )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetLocaleCount )(
             IChat __RPC_FAR * This,
             int __RPC_FAR *num);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetClientVersion )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetClientVersion )(
             IChat __RPC_FAR * This,
             unsigned long version);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetCodepageFilter )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetCodepageFilter )(
             IChat __RPC_FAR * This,
             int filter);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestBuddyList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestBuddyList )(
             IChat __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestBuddyAdd )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestBuddyAdd )(
             IChat __RPC_FAR * This,
             User __RPC_FAR *newbuddy);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestBuddyDelete )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestBuddyDelete )(
             IChat __RPC_FAR * This,
             User __RPC_FAR *buddy);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPublicUnicodeMessage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPublicUnicodeMessage )(
             IChat __RPC_FAR * This,
             /* [in] */ const unsigned short __RPC_FAR *message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPrivateUnicodeMessage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPrivateUnicodeMessage )(
             IChat __RPC_FAR * This,
             /* [in] */ User __RPC_FAR *users,
             /* [in] */ const unsigned short __RPC_FAR *message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPublicUnicodeAction )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPublicUnicodeAction )(
             IChat __RPC_FAR * This,
             /* [in] */ const unsigned short __RPC_FAR *action);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPrivateUnicodeAction )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPrivateUnicodeAction )(
             IChat __RPC_FAR * This,
             /* [in] */ User __RPC_FAR *users,
             /* [in] */ const unsigned short __RPC_FAR *action);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUnicodePage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUnicodePage )(
             IChat __RPC_FAR * This,
             User __RPC_FAR *user,
             const unsigned short __RPC_FAR *message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestSetPlayerCount )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestSetPlayerCount )(
             IChat __RPC_FAR * This,
             unsigned int currentPlayers,
             unsigned int maxPlayers);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestServerTime )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestServerTime )(
             IChat __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestInsiderStatus )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestInsiderStatus )(
             IChat __RPC_FAR * This,
             User __RPC_FAR *users);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestSetLocalIP )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestSetLocalIP )(
             IChat __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestSquadByName )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestSquadByName )(
             IChat __RPC_FAR * This,
             LPCSTR name);
-        
+
         END_INTERFACE
     } IChatVtbl;
 
@@ -1163,7 +1163,7 @@ EXTERN_C const IID IID_IChat;
         CONST_VTBL struct IChatVtbl __RPC_FAR *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -1380,7 +1380,7 @@ EXTERN_C const IID IID_IChat;
 
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_PumpMessages_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_PumpMessages_Proxy(
     IChat __RPC_FAR * This);
 
 
@@ -1391,7 +1391,7 @@ void __RPC_STUB IChat_PumpMessages_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestServerList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestServerList_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ unsigned long SKU,
     /* [in] */ unsigned long current_version,
@@ -1407,7 +1407,7 @@ void __RPC_STUB IChat_RequestServerList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestConnection_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestConnection_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ Server __RPC_FAR *server,
     /* [in] */ int timeout,
@@ -1421,7 +1421,7 @@ void __RPC_STUB IChat_RequestConnection_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestChannelList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestChannelList_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ int channelType,
     /* [in] */ int autoping);
@@ -1434,7 +1434,7 @@ void __RPC_STUB IChat_RequestChannelList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestChannelCreate_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestChannelCreate_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ Channel __RPC_FAR *channel);
 
@@ -1446,7 +1446,7 @@ void __RPC_STUB IChat_RequestChannelCreate_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestChannelJoin_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestChannelJoin_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ Channel __RPC_FAR *channel);
 
@@ -1458,7 +1458,7 @@ void __RPC_STUB IChat_RequestChannelJoin_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestChannelLeave_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestChannelLeave_Proxy(
     IChat __RPC_FAR * This);
 
 
@@ -1469,7 +1469,7 @@ void __RPC_STUB IChat_RequestChannelLeave_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestUserList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestUserList_Proxy(
     IChat __RPC_FAR * This);
 
 
@@ -1480,7 +1480,7 @@ void __RPC_STUB IChat_RequestUserList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPublicMessage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPublicMessage_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ LPCSTR message);
 
@@ -1492,7 +1492,7 @@ void __RPC_STUB IChat_RequestPublicMessage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPrivateMessage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPrivateMessage_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ User __RPC_FAR *users,
     /* [in] */ LPCSTR message);
@@ -1505,7 +1505,7 @@ void __RPC_STUB IChat_RequestPrivateMessage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestLogout_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestLogout_Proxy(
     IChat __RPC_FAR * This);
 
 
@@ -1516,7 +1516,7 @@ void __RPC_STUB IChat_RequestLogout_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPrivateGameOptions_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPrivateGameOptions_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ User __RPC_FAR *users,
     /* [in] */ LPCSTR options);
@@ -1529,7 +1529,7 @@ void __RPC_STUB IChat_RequestPrivateGameOptions_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPublicGameOptions_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPublicGameOptions_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ LPCSTR options);
 
@@ -1541,7 +1541,7 @@ void __RPC_STUB IChat_RequestPublicGameOptions_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPublicAction_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPublicAction_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ LPCSTR action);
 
@@ -1553,7 +1553,7 @@ void __RPC_STUB IChat_RequestPublicAction_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPrivateAction_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPrivateAction_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ User __RPC_FAR *users,
     /* [in] */ LPCSTR action);
@@ -1566,7 +1566,7 @@ void __RPC_STUB IChat_RequestPrivateAction_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestGameStart_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestGameStart_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ User __RPC_FAR *users);
 
@@ -1578,7 +1578,7 @@ void __RPC_STUB IChat_RequestGameStart_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestChannelTopic_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestChannelTopic_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ LPCSTR topic);
 
@@ -1590,7 +1590,7 @@ void __RPC_STUB IChat_RequestChannelTopic_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetVersion_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetVersion_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ unsigned long __RPC_FAR *version);
 
@@ -1602,7 +1602,7 @@ void __RPC_STUB IChat_GetVersion_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestUserKick_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestUserKick_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ User __RPC_FAR *user);
 
@@ -1614,7 +1614,7 @@ void __RPC_STUB IChat_RequestUserKick_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestUserIP_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestUserIP_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ User __RPC_FAR *user);
 
@@ -1626,7 +1626,7 @@ void __RPC_STUB IChat_RequestUserIP_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetGametypeInfo_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetGametypeInfo_Proxy(
     IChat __RPC_FAR * This,
     unsigned int gtype,
     int icon_size,
@@ -1643,7 +1643,7 @@ void __RPC_STUB IChat_GetGametypeInfo_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestFind_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestFind_Proxy(
     IChat __RPC_FAR * This,
     User __RPC_FAR *user);
 
@@ -1655,7 +1655,7 @@ void __RPC_STUB IChat_RequestFind_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPage_Proxy(
     IChat __RPC_FAR * This,
     User __RPC_FAR *user,
     LPCSTR message);
@@ -1668,7 +1668,7 @@ void __RPC_STUB IChat_RequestPage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetFindPage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetFindPage_Proxy(
     IChat __RPC_FAR * This,
     int findOn,
     int pageOn);
@@ -1681,7 +1681,7 @@ void __RPC_STUB IChat_SetFindPage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetSquelch_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetSquelch_Proxy(
     IChat __RPC_FAR * This,
     User __RPC_FAR *user,
     int squelch);
@@ -1694,7 +1694,7 @@ void __RPC_STUB IChat_SetSquelch_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetSquelch_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetSquelch_Proxy(
     IChat __RPC_FAR * This,
     User __RPC_FAR *user);
 
@@ -1706,7 +1706,7 @@ void __RPC_STUB IChat_GetSquelch_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetChannelFilter_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetChannelFilter_Proxy(
     IChat __RPC_FAR * This,
     int channelType);
 
@@ -1718,7 +1718,7 @@ void __RPC_STUB IChat_SetChannelFilter_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestGameEnd_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestGameEnd_Proxy(
     IChat __RPC_FAR * This);
 
 
@@ -1729,7 +1729,7 @@ void __RPC_STUB IChat_RequestGameEnd_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetLangFilter_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetLangFilter_Proxy(
     IChat __RPC_FAR * This,
     int onoff);
 
@@ -1741,7 +1741,7 @@ void __RPC_STUB IChat_SetLangFilter_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestChannelBan_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestChannelBan_Proxy(
     IChat __RPC_FAR * This,
     LPCSTR name,
     int ban);
@@ -1754,7 +1754,7 @@ void __RPC_STUB IChat_RequestChannelBan_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetGametypeList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetGametypeList_Proxy(
     IChat __RPC_FAR * This,
     LPCSTR __RPC_FAR *list);
 
@@ -1766,7 +1766,7 @@ void __RPC_STUB IChat_GetGametypeList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetHelpURL_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetHelpURL_Proxy(
     IChat __RPC_FAR * This,
     LPCSTR __RPC_FAR *url);
 
@@ -1778,7 +1778,7 @@ void __RPC_STUB IChat_GetHelpURL_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetProductSKU_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetProductSKU_Proxy(
     IChat __RPC_FAR * This,
     unsigned long SKU);
 
@@ -1790,7 +1790,7 @@ void __RPC_STUB IChat_SetProductSKU_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetNick_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetNick_Proxy(
     IChat __RPC_FAR * This,
     int num,
     LPCSTR __RPC_FAR *nick,
@@ -1804,7 +1804,7 @@ void __RPC_STUB IChat_GetNick_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetNick_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetNick_Proxy(
     IChat __RPC_FAR * This,
     int num,
     LPCSTR nick,
@@ -1819,7 +1819,7 @@ void __RPC_STUB IChat_SetNick_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetLobbyCount_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetLobbyCount_Proxy(
     IChat __RPC_FAR * This,
     int __RPC_FAR *count);
 
@@ -1831,7 +1831,7 @@ void __RPC_STUB IChat_GetLobbyCount_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestRawMessage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestRawMessage_Proxy(
     IChat __RPC_FAR * This,
     LPCSTR ircmsg);
 
@@ -1843,7 +1843,7 @@ void __RPC_STUB IChat_RequestRawMessage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetAttributeValue_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetAttributeValue_Proxy(
     IChat __RPC_FAR * This,
     LPCSTR attrib,
     LPCSTR __RPC_FAR *value);
@@ -1856,7 +1856,7 @@ void __RPC_STUB IChat_GetAttributeValue_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetAttributeValue_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetAttributeValue_Proxy(
     IChat __RPC_FAR * This,
     LPCSTR attrib,
     LPCSTR value);
@@ -1869,7 +1869,7 @@ void __RPC_STUB IChat_SetAttributeValue_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetChannelExInfo_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetChannelExInfo_Proxy(
     IChat __RPC_FAR * This,
     LPCSTR info);
 
@@ -1881,7 +1881,7 @@ void __RPC_STUB IChat_SetChannelExInfo_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_StopAutoping_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_StopAutoping_Proxy(
     IChat __RPC_FAR * This);
 
 
@@ -1892,7 +1892,7 @@ void __RPC_STUB IChat_StopAutoping_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestSquadInfo_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestSquadInfo_Proxy(
     IChat __RPC_FAR * This,
     unsigned long id);
 
@@ -1904,7 +1904,7 @@ void __RPC_STUB IChat_RequestSquadInfo_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestSetTeam_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestSetTeam_Proxy(
     IChat __RPC_FAR * This,
     int team);
 
@@ -1916,7 +1916,7 @@ void __RPC_STUB IChat_RequestSetTeam_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestSetLocale_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestSetLocale_Proxy(
     IChat __RPC_FAR * This,
     Locale locale);
 
@@ -1928,7 +1928,7 @@ void __RPC_STUB IChat_RequestSetLocale_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestUserLocale_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestUserLocale_Proxy(
     IChat __RPC_FAR * This,
     User __RPC_FAR *users);
 
@@ -1940,7 +1940,7 @@ void __RPC_STUB IChat_RequestUserLocale_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestUserTeam_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestUserTeam_Proxy(
     IChat __RPC_FAR * This,
     User __RPC_FAR *users);
 
@@ -1952,7 +1952,7 @@ void __RPC_STUB IChat_RequestUserTeam_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetNickLocale_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetNickLocale_Proxy(
     IChat __RPC_FAR * This,
     int nicknum,
     Locale __RPC_FAR *locale);
@@ -1965,7 +1965,7 @@ void __RPC_STUB IChat_GetNickLocale_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetNickLocale_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetNickLocale_Proxy(
     IChat __RPC_FAR * This,
     int nicknum,
     Locale locale);
@@ -1978,7 +1978,7 @@ void __RPC_STUB IChat_SetNickLocale_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetLocaleString_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetLocaleString_Proxy(
     IChat __RPC_FAR * This,
     LPCSTR __RPC_FAR *loc_string,
     Locale locale);
@@ -1991,7 +1991,7 @@ void __RPC_STUB IChat_GetLocaleString_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetLocaleCount_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_GetLocaleCount_Proxy(
     IChat __RPC_FAR * This,
     int __RPC_FAR *num);
 
@@ -2003,7 +2003,7 @@ void __RPC_STUB IChat_GetLocaleCount_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetClientVersion_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetClientVersion_Proxy(
     IChat __RPC_FAR * This,
     unsigned long version);
 
@@ -2015,7 +2015,7 @@ void __RPC_STUB IChat_SetClientVersion_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetCodepageFilter_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_SetCodepageFilter_Proxy(
     IChat __RPC_FAR * This,
     int filter);
 
@@ -2027,7 +2027,7 @@ void __RPC_STUB IChat_SetCodepageFilter_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestBuddyList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestBuddyList_Proxy(
     IChat __RPC_FAR * This);
 
 
@@ -2038,7 +2038,7 @@ void __RPC_STUB IChat_RequestBuddyList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestBuddyAdd_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestBuddyAdd_Proxy(
     IChat __RPC_FAR * This,
     User __RPC_FAR *newbuddy);
 
@@ -2050,7 +2050,7 @@ void __RPC_STUB IChat_RequestBuddyAdd_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestBuddyDelete_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestBuddyDelete_Proxy(
     IChat __RPC_FAR * This,
     User __RPC_FAR *buddy);
 
@@ -2062,7 +2062,7 @@ void __RPC_STUB IChat_RequestBuddyDelete_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPublicUnicodeMessage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPublicUnicodeMessage_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ const unsigned short __RPC_FAR *message);
 
@@ -2074,7 +2074,7 @@ void __RPC_STUB IChat_RequestPublicUnicodeMessage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPrivateUnicodeMessage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPrivateUnicodeMessage_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ User __RPC_FAR *users,
     /* [in] */ const unsigned short __RPC_FAR *message);
@@ -2087,7 +2087,7 @@ void __RPC_STUB IChat_RequestPrivateUnicodeMessage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPublicUnicodeAction_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPublicUnicodeAction_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ const unsigned short __RPC_FAR *action);
 
@@ -2099,7 +2099,7 @@ void __RPC_STUB IChat_RequestPublicUnicodeAction_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPrivateUnicodeAction_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestPrivateUnicodeAction_Proxy(
     IChat __RPC_FAR * This,
     /* [in] */ User __RPC_FAR *users,
     /* [in] */ const unsigned short __RPC_FAR *action);
@@ -2112,7 +2112,7 @@ void __RPC_STUB IChat_RequestPrivateUnicodeAction_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestUnicodePage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestUnicodePage_Proxy(
     IChat __RPC_FAR * This,
     User __RPC_FAR *user,
     const unsigned short __RPC_FAR *message);
@@ -2125,7 +2125,7 @@ void __RPC_STUB IChat_RequestUnicodePage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestSetPlayerCount_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestSetPlayerCount_Proxy(
     IChat __RPC_FAR * This,
     unsigned int currentPlayers,
     unsigned int maxPlayers);
@@ -2138,7 +2138,7 @@ void __RPC_STUB IChat_RequestSetPlayerCount_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestServerTime_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestServerTime_Proxy(
     IChat __RPC_FAR * This);
 
 
@@ -2149,7 +2149,7 @@ void __RPC_STUB IChat_RequestServerTime_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestInsiderStatus_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestInsiderStatus_Proxy(
     IChat __RPC_FAR * This,
     User __RPC_FAR *users);
 
@@ -2161,7 +2161,7 @@ void __RPC_STUB IChat_RequestInsiderStatus_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestSetLocalIP_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestSetLocalIP_Proxy(
     IChat __RPC_FAR * This);
 
 
@@ -2172,7 +2172,7 @@ void __RPC_STUB IChat_RequestSetLocalIP_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestSquadByName_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat_RequestSquadByName_Proxy(
     IChat __RPC_FAR * This,
     LPCSTR name);
 
@@ -2192,518 +2192,518 @@ void __RPC_STUB IChat_RequestSquadByName_Stub(
 #define __IChatEvent_INTERFACE_DEFINED__
 
 /* interface IChatEvent */
-/* [object][unique][helpstring][uuid] */ 
+/* [object][unique][helpstring][uuid] */
 
 
 EXTERN_C const IID IID_IChatEvent;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("4DD3BAF6-7579-11D1-B1C6-006097176556")
     IChatEvent : public IUnknown
     {
     public:
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnServerList( 
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnServerList(
             /* [in] */ HRESULT res,
             /* [in] */ Server __RPC_FAR *servers) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUpdateList( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUpdateList(
             /* [in] */ HRESULT res,
             /* [in] */ Update __RPC_FAR *updates) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnServerError( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnServerError(
             /* [in] */ HRESULT res,
             /* [in] */ LPCSTR ircmsg) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnConnection( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnConnection(
             /* [in] */ HRESULT res,
             /* [in] */ LPCSTR motd) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnMessageOfTheDay( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnMessageOfTheDay(
             /* [in] */ HRESULT res,
             /* [in] */ LPCSTR motd) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelList( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelList(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channels) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelCreate( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelCreate(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelJoin( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelJoin(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *user) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelLeave( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelLeave(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *user) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelTopic( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelTopic(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ LPCSTR topic) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPrivateAction( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPrivateAction(
             /* [in] */ HRESULT res,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ LPCSTR action) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPublicAction( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPublicAction(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             User __RPC_FAR *user,
             /* [in] */ LPCSTR action) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserList( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserList(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *users) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPublicMessage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPublicMessage(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ LPCSTR message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPrivateMessage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPrivateMessage(
             /* [in] */ HRESULT res,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ LPCSTR message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnSystemMessage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnSystemMessage(
             /* [in] */ HRESULT res,
             /* [in] */ LPCSTR message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnNetStatus( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnNetStatus(
             /* [in] */ HRESULT res) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnLogout( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnLogout(
             /* [in] */ HRESULT status,
             /* [in] */ User __RPC_FAR *user) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPrivateGameOptions( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPrivateGameOptions(
             /* [in] */ HRESULT res,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ LPCSTR options) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPublicGameOptions( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPublicGameOptions(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ LPCSTR options) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnGameStart( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnGameStart(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *users,
             /* [in] */ int gameid) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserKick( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserKick(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *kicked,
             /* [in] */ User __RPC_FAR *kicker) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserIP( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserIP(
             /* [in] */ HRESULT res,
             /* [in] */ User __RPC_FAR *user) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnFind( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnFind(
             HRESULT res,
             Channel __RPC_FAR *chan) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPageSend( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPageSend(
             HRESULT res) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPaged( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPaged(
             HRESULT res,
             User __RPC_FAR *user,
             LPCSTR message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnServerBannedYou( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnServerBannedYou(
             HRESULT res,
             time_t bannedTill) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserFlags( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserFlags(
             HRESULT res,
             LPCSTR name,
             unsigned int flags,
             unsigned int mask) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelBan( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelBan(
             HRESULT res,
             LPCSTR name,
             int banned) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnSquadInfo( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnSquadInfo(
             HRESULT res,
             unsigned long id,
             Squad __RPC_FAR *squad) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserLocale( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserLocale(
             HRESULT res,
             User __RPC_FAR *users) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserTeam( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserTeam(
             HRESULT res,
             User __RPC_FAR *users) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnSetLocale( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnSetLocale(
             HRESULT res,
             Locale newlocale) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnSetTeam( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnSetTeam(
             HRESULT res,
             int newteam) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnBuddyList( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnBuddyList(
             HRESULT res,
             User __RPC_FAR *buddy_list) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnBuddyAdd( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnBuddyAdd(
             HRESULT res,
             User __RPC_FAR *buddy_added) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnBuddyDelete( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnBuddyDelete(
             HRESULT res,
             User __RPC_FAR *buddy_deleted) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPublicUnicodeMessage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPublicUnicodeMessage(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ const unsigned short __RPC_FAR *message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPrivateUnicodeMessage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPrivateUnicodeMessage(
             /* [in] */ HRESULT res,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ const unsigned short __RPC_FAR *message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPrivateUnicodeAction( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPrivateUnicodeAction(
             /* [in] */ HRESULT res,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ const unsigned short __RPC_FAR *action) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPublicUnicodeAction( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPublicUnicodeAction(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             User __RPC_FAR *user,
             /* [in] */ const unsigned short __RPC_FAR *action) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPagedUnicode( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnPagedUnicode(
             HRESULT res,
             User __RPC_FAR *user,
             const unsigned short __RPC_FAR *message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnServerTime( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnServerTime(
             HRESULT res,
             time_t stime) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnInsiderStatus( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnInsiderStatus(
             HRESULT res,
             User __RPC_FAR *users) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnSetLocalIP( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnSetLocalIP(
             HRESULT res,
             LPCSTR message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelListBegin( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelListBegin(
             /* [in] */ HRESULT res) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelListEntry( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelListEntry(
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelListEnd( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelListEnd(
             /* [in] */ HRESULT res) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IChatEventVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
             IChatEvent __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
             IChatEvent __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnServerList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnServerList )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Server __RPC_FAR *servers);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUpdateList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUpdateList )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Update __RPC_FAR *updates);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnServerError )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnServerError )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ LPCSTR ircmsg);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnConnection )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnConnection )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ LPCSTR motd);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnMessageOfTheDay )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnMessageOfTheDay )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ LPCSTR motd);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelList )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channels);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelCreate )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelCreate )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelJoin )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelJoin )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *user);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelLeave )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelLeave )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *user);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelTopic )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelTopic )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ LPCSTR topic);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPrivateAction )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPrivateAction )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ LPCSTR action);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPublicAction )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPublicAction )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             User __RPC_FAR *user,
             /* [in] */ LPCSTR action);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserList )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *users);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPublicMessage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPublicMessage )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ LPCSTR message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPrivateMessage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPrivateMessage )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ LPCSTR message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnSystemMessage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnSystemMessage )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ LPCSTR message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnNetStatus )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnNetStatus )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnLogout )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnLogout )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT status,
             /* [in] */ User __RPC_FAR *user);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPrivateGameOptions )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPrivateGameOptions )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ LPCSTR options);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPublicGameOptions )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPublicGameOptions )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ LPCSTR options);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnGameStart )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnGameStart )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *users,
             /* [in] */ int gameid);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserKick )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserKick )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *kicked,
             /* [in] */ User __RPC_FAR *kicker);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserIP )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserIP )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ User __RPC_FAR *user);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnFind )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnFind )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             Channel __RPC_FAR *chan);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPageSend )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPageSend )(
             IChatEvent __RPC_FAR * This,
             HRESULT res);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPaged )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPaged )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             User __RPC_FAR *user,
             LPCSTR message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnServerBannedYou )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnServerBannedYou )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             time_t bannedTill);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserFlags )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserFlags )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             LPCSTR name,
             unsigned int flags,
             unsigned int mask);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelBan )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelBan )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             LPCSTR name,
             int banned);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnSquadInfo )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnSquadInfo )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             unsigned long id,
             Squad __RPC_FAR *squad);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserLocale )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserLocale )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             User __RPC_FAR *users);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserTeam )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserTeam )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             User __RPC_FAR *users);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnSetLocale )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnSetLocale )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             Locale newlocale);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnSetTeam )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnSetTeam )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             int newteam);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnBuddyList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnBuddyList )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             User __RPC_FAR *buddy_list);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnBuddyAdd )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnBuddyAdd )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             User __RPC_FAR *buddy_added);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnBuddyDelete )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnBuddyDelete )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             User __RPC_FAR *buddy_deleted);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPublicUnicodeMessage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPublicUnicodeMessage )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ const unsigned short __RPC_FAR *message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPrivateUnicodeMessage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPrivateUnicodeMessage )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ const unsigned short __RPC_FAR *message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPrivateUnicodeAction )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPrivateUnicodeAction )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ User __RPC_FAR *user,
             /* [in] */ const unsigned short __RPC_FAR *action);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPublicUnicodeAction )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPublicUnicodeAction )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel,
             User __RPC_FAR *user,
             /* [in] */ const unsigned short __RPC_FAR *action);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPagedUnicode )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPagedUnicode )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             User __RPC_FAR *user,
             const unsigned short __RPC_FAR *message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnServerTime )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnServerTime )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             time_t stime);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnInsiderStatus )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnInsiderStatus )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             User __RPC_FAR *users);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnSetLocalIP )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnSetLocalIP )(
             IChatEvent __RPC_FAR * This,
             HRESULT res,
             LPCSTR message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelListBegin )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelListBegin )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelListEntry )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelListEntry )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res,
             /* [in] */ Channel __RPC_FAR *channel);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelListEnd )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelListEnd )(
             IChatEvent __RPC_FAR * This,
             /* [in] */ HRESULT res);
-        
+
         END_INTERFACE
     } IChatEventVtbl;
 
@@ -2712,7 +2712,7 @@ EXTERN_C const IID IID_IChatEvent;
         CONST_VTBL struct IChatEventVtbl __RPC_FAR *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -2878,7 +2878,7 @@ EXTERN_C const IID IID_IChatEvent;
 
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnServerList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnServerList_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Server __RPC_FAR *servers);
@@ -2891,7 +2891,7 @@ void __RPC_STUB IChatEvent_OnServerList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUpdateList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUpdateList_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Update __RPC_FAR *updates);
@@ -2904,7 +2904,7 @@ void __RPC_STUB IChatEvent_OnUpdateList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnServerError_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnServerError_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ LPCSTR ircmsg);
@@ -2917,7 +2917,7 @@ void __RPC_STUB IChatEvent_OnServerError_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnConnection_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnConnection_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ LPCSTR motd);
@@ -2930,7 +2930,7 @@ void __RPC_STUB IChatEvent_OnConnection_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnMessageOfTheDay_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnMessageOfTheDay_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ LPCSTR motd);
@@ -2943,7 +2943,7 @@ void __RPC_STUB IChatEvent_OnMessageOfTheDay_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelList_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channels);
@@ -2956,7 +2956,7 @@ void __RPC_STUB IChatEvent_OnChannelList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelCreate_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelCreate_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel);
@@ -2969,7 +2969,7 @@ void __RPC_STUB IChatEvent_OnChannelCreate_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelJoin_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelJoin_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel,
@@ -2983,7 +2983,7 @@ void __RPC_STUB IChatEvent_OnChannelJoin_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelLeave_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelLeave_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel,
@@ -2997,7 +2997,7 @@ void __RPC_STUB IChatEvent_OnChannelLeave_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelTopic_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelTopic_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel,
@@ -3011,7 +3011,7 @@ void __RPC_STUB IChatEvent_OnChannelTopic_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPrivateAction_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPrivateAction_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ User __RPC_FAR *user,
@@ -3025,7 +3025,7 @@ void __RPC_STUB IChatEvent_OnPrivateAction_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPublicAction_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPublicAction_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel,
@@ -3040,7 +3040,7 @@ void __RPC_STUB IChatEvent_OnPublicAction_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUserList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUserList_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel,
@@ -3054,7 +3054,7 @@ void __RPC_STUB IChatEvent_OnUserList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPublicMessage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPublicMessage_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel,
@@ -3069,7 +3069,7 @@ void __RPC_STUB IChatEvent_OnPublicMessage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPrivateMessage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPrivateMessage_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ User __RPC_FAR *user,
@@ -3083,7 +3083,7 @@ void __RPC_STUB IChatEvent_OnPrivateMessage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnSystemMessage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnSystemMessage_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ LPCSTR message);
@@ -3096,7 +3096,7 @@ void __RPC_STUB IChatEvent_OnSystemMessage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnNetStatus_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnNetStatus_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res);
 
@@ -3108,7 +3108,7 @@ void __RPC_STUB IChatEvent_OnNetStatus_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnLogout_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnLogout_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT status,
     /* [in] */ User __RPC_FAR *user);
@@ -3121,7 +3121,7 @@ void __RPC_STUB IChatEvent_OnLogout_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPrivateGameOptions_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPrivateGameOptions_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ User __RPC_FAR *user,
@@ -3135,7 +3135,7 @@ void __RPC_STUB IChatEvent_OnPrivateGameOptions_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPublicGameOptions_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPublicGameOptions_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel,
@@ -3150,7 +3150,7 @@ void __RPC_STUB IChatEvent_OnPublicGameOptions_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnGameStart_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnGameStart_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel,
@@ -3165,7 +3165,7 @@ void __RPC_STUB IChatEvent_OnGameStart_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUserKick_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUserKick_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel,
@@ -3180,7 +3180,7 @@ void __RPC_STUB IChatEvent_OnUserKick_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUserIP_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUserIP_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ User __RPC_FAR *user);
@@ -3193,7 +3193,7 @@ void __RPC_STUB IChatEvent_OnUserIP_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnFind_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnFind_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     Channel __RPC_FAR *chan);
@@ -3206,7 +3206,7 @@ void __RPC_STUB IChatEvent_OnFind_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPageSend_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPageSend_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res);
 
@@ -3218,7 +3218,7 @@ void __RPC_STUB IChatEvent_OnPageSend_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPaged_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPaged_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     User __RPC_FAR *user,
@@ -3232,7 +3232,7 @@ void __RPC_STUB IChatEvent_OnPaged_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnServerBannedYou_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnServerBannedYou_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     time_t bannedTill);
@@ -3245,7 +3245,7 @@ void __RPC_STUB IChatEvent_OnServerBannedYou_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUserFlags_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUserFlags_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     LPCSTR name,
@@ -3260,7 +3260,7 @@ void __RPC_STUB IChatEvent_OnUserFlags_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelBan_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelBan_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     LPCSTR name,
@@ -3274,7 +3274,7 @@ void __RPC_STUB IChatEvent_OnChannelBan_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnSquadInfo_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnSquadInfo_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     unsigned long id,
@@ -3288,7 +3288,7 @@ void __RPC_STUB IChatEvent_OnSquadInfo_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUserLocale_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUserLocale_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     User __RPC_FAR *users);
@@ -3301,7 +3301,7 @@ void __RPC_STUB IChatEvent_OnUserLocale_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUserTeam_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnUserTeam_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     User __RPC_FAR *users);
@@ -3314,7 +3314,7 @@ void __RPC_STUB IChatEvent_OnUserTeam_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnSetLocale_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnSetLocale_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     Locale newlocale);
@@ -3327,7 +3327,7 @@ void __RPC_STUB IChatEvent_OnSetLocale_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnSetTeam_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnSetTeam_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     int newteam);
@@ -3340,7 +3340,7 @@ void __RPC_STUB IChatEvent_OnSetTeam_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnBuddyList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnBuddyList_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     User __RPC_FAR *buddy_list);
@@ -3353,7 +3353,7 @@ void __RPC_STUB IChatEvent_OnBuddyList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnBuddyAdd_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnBuddyAdd_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     User __RPC_FAR *buddy_added);
@@ -3366,7 +3366,7 @@ void __RPC_STUB IChatEvent_OnBuddyAdd_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnBuddyDelete_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnBuddyDelete_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     User __RPC_FAR *buddy_deleted);
@@ -3379,7 +3379,7 @@ void __RPC_STUB IChatEvent_OnBuddyDelete_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPublicUnicodeMessage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPublicUnicodeMessage_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel,
@@ -3394,7 +3394,7 @@ void __RPC_STUB IChatEvent_OnPublicUnicodeMessage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPrivateUnicodeMessage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPrivateUnicodeMessage_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ User __RPC_FAR *user,
@@ -3408,7 +3408,7 @@ void __RPC_STUB IChatEvent_OnPrivateUnicodeMessage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPrivateUnicodeAction_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPrivateUnicodeAction_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ User __RPC_FAR *user,
@@ -3422,7 +3422,7 @@ void __RPC_STUB IChatEvent_OnPrivateUnicodeAction_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPublicUnicodeAction_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPublicUnicodeAction_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel,
@@ -3437,7 +3437,7 @@ void __RPC_STUB IChatEvent_OnPublicUnicodeAction_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPagedUnicode_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnPagedUnicode_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     User __RPC_FAR *user,
@@ -3451,7 +3451,7 @@ void __RPC_STUB IChatEvent_OnPagedUnicode_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnServerTime_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnServerTime_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     time_t stime);
@@ -3464,7 +3464,7 @@ void __RPC_STUB IChatEvent_OnServerTime_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnInsiderStatus_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnInsiderStatus_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     User __RPC_FAR *users);
@@ -3477,7 +3477,7 @@ void __RPC_STUB IChatEvent_OnInsiderStatus_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnSetLocalIP_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnSetLocalIP_Proxy(
     IChatEvent __RPC_FAR * This,
     HRESULT res,
     LPCSTR message);
@@ -3490,7 +3490,7 @@ void __RPC_STUB IChatEvent_OnSetLocalIP_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelListBegin_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelListBegin_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res);
 
@@ -3502,7 +3502,7 @@ void __RPC_STUB IChatEvent_OnChannelListBegin_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelListEntry_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelListEntry_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res,
     /* [in] */ Channel __RPC_FAR *channel);
@@ -3515,7 +3515,7 @@ void __RPC_STUB IChatEvent_OnChannelListEntry_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelListEnd_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChatEvent_OnChannelListEnd_Proxy(
     IChatEvent __RPC_FAR * This,
     /* [in] */ HRESULT res);
 
@@ -3535,49 +3535,49 @@ void __RPC_STUB IChatEvent_OnChannelListEnd_Stub(
 #define __IDownload_INTERFACE_DEFINED__
 
 /* interface IDownload */
-/* [unique][helpstring][dual][uuid][object] */ 
+/* [unique][helpstring][dual][uuid][object] */
 
 
 EXTERN_C const IID IID_IDownload;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("0BF5FCEB-9F03-11D1-9DC7-006097C54321")
     IDownload : public IUnknown
     {
     public:
-        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE DownloadFile( 
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE DownloadFile(
             LPCSTR server,
             LPCSTR login,
             LPCSTR password,
             LPCSTR file,
             LPCSTR localfile,
             LPCSTR regkey) = 0;
-        
+
         virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Abort( void) = 0;
-        
+
         virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE PumpMessages( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDownloadVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
             IDownload __RPC_FAR * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
             IDownload __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
             IDownload __RPC_FAR * This);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *DownloadFile )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *DownloadFile )(
             IDownload __RPC_FAR * This,
             LPCSTR server,
             LPCSTR login,
@@ -3585,13 +3585,13 @@ EXTERN_C const IID IID_IDownload;
             LPCSTR file,
             LPCSTR localfile,
             LPCSTR regkey);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Abort )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Abort )(
             IDownload __RPC_FAR * This);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *PumpMessages )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *PumpMessages )(
             IDownload __RPC_FAR * This);
-        
+
         END_INTERFACE
     } IDownloadVtbl;
 
@@ -3600,7 +3600,7 @@ EXTERN_C const IID IID_IDownload;
         CONST_VTBL struct IDownloadVtbl __RPC_FAR *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -3631,7 +3631,7 @@ EXTERN_C const IID IID_IDownload;
 
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IDownload_DownloadFile_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IDownload_DownloadFile_Proxy(
     IDownload __RPC_FAR * This,
     LPCSTR server,
     LPCSTR login,
@@ -3648,7 +3648,7 @@ void __RPC_STUB IDownload_DownloadFile_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IDownload_Abort_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IDownload_Abort_Proxy(
     IDownload __RPC_FAR * This);
 
 
@@ -3659,7 +3659,7 @@ void __RPC_STUB IDownload_Abort_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IDownload_PumpMessages_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IDownload_PumpMessages_Proxy(
     IDownload __RPC_FAR * This);
 
 
@@ -3678,73 +3678,73 @@ void __RPC_STUB IDownload_PumpMessages_Stub(
 #define __IDownloadEvent_INTERFACE_DEFINED__
 
 /* interface IDownloadEvent */
-/* [object][unique][helpstring][uuid] */ 
+/* [object][unique][helpstring][uuid] */
 
 
 EXTERN_C const IID IID_IDownloadEvent;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("6869E99D-9FB4-11D1-9DC8-006097C54321")
     IDownloadEvent : public IUnknown
     {
     public:
         virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnEnd( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnError( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnError(
             int error) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnProgressUpdate( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnProgressUpdate(
             int bytesread,
             int totalsize,
             int timetaken,
             int timeleft) = 0;
-        
+
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnQueryResume( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnStatusUpdate( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnStatusUpdate(
             int status) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDownloadEventVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
             IDownloadEvent __RPC_FAR * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
             IDownloadEvent __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
             IDownloadEvent __RPC_FAR * This);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnEnd )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnEnd )(
             IDownloadEvent __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnError )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnError )(
             IDownloadEvent __RPC_FAR * This,
             int error);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnProgressUpdate )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnProgressUpdate )(
             IDownloadEvent __RPC_FAR * This,
             int bytesread,
             int totalsize,
             int timetaken,
             int timeleft);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnQueryResume )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnQueryResume )(
             IDownloadEvent __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnStatusUpdate )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnStatusUpdate )(
             IDownloadEvent __RPC_FAR * This,
             int status);
-        
+
         END_INTERFACE
     } IDownloadEventVtbl;
 
@@ -3753,7 +3753,7 @@ EXTERN_C const IID IID_IDownloadEvent;
         CONST_VTBL struct IDownloadEventVtbl __RPC_FAR *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -3790,7 +3790,7 @@ EXTERN_C const IID IID_IDownloadEvent;
 
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IDownloadEvent_OnEnd_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IDownloadEvent_OnEnd_Proxy(
     IDownloadEvent __RPC_FAR * This);
 
 
@@ -3801,7 +3801,7 @@ void __RPC_STUB IDownloadEvent_OnEnd_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IDownloadEvent_OnError_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IDownloadEvent_OnError_Proxy(
     IDownloadEvent __RPC_FAR * This,
     int error);
 
@@ -3813,7 +3813,7 @@ void __RPC_STUB IDownloadEvent_OnError_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IDownloadEvent_OnProgressUpdate_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IDownloadEvent_OnProgressUpdate_Proxy(
     IDownloadEvent __RPC_FAR * This,
     int bytesread,
     int totalsize,
@@ -3828,7 +3828,7 @@ void __RPC_STUB IDownloadEvent_OnProgressUpdate_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IDownloadEvent_OnQueryResume_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IDownloadEvent_OnQueryResume_Proxy(
     IDownloadEvent __RPC_FAR * This);
 
 
@@ -3839,7 +3839,7 @@ void __RPC_STUB IDownloadEvent_OnQueryResume_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IDownloadEvent_OnStatusUpdate_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IDownloadEvent_OnStatusUpdate_Proxy(
     IDownloadEvent __RPC_FAR * This,
     int status);
 
@@ -3859,24 +3859,24 @@ void __RPC_STUB IDownloadEvent_OnStatusUpdate_Stub(
 #define __INetUtil_INTERFACE_DEFINED__
 
 /* interface INetUtil */
-/* [object][unique][helpstring][uuid] */ 
+/* [object][unique][helpstring][uuid] */
 
 
 EXTERN_C const IID IID_INetUtil;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("B832B0AA-A7D3-11D1-97C3-00609706FA0C")
     INetUtil : public IUnknown
     {
     public:
-        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE RequestGameresSend( 
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE RequestGameresSend(
             LPCSTR host,
             int port,
             unsigned char __RPC_FAR *data,
             int length) = 0;
-        
-        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE RequestLadderSearch( 
+
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE RequestLadderSearch(
             LPCSTR host,
             int port,
             LPCSTR key,
@@ -3886,8 +3886,8 @@ EXTERN_C const IID IID_INetUtil;
             int sort,
             int number,
             int leading) = 0;
-        
-        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE RequestLadderList( 
+
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE RequestLadderList(
             LPCSTR host,
             int port,
             LPCSTR keys,
@@ -3895,38 +3895,38 @@ EXTERN_C const IID IID_INetUtil;
             int team,
             int cond,
             int sort) = 0;
-        
-        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE RequestPing( 
+
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE RequestPing(
             LPCSTR host,
             int timeout,
             int __RPC_FAR *handle) = 0;
-        
+
         virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE PumpMessages( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetAvgPing( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetAvgPing(
             unsigned long ip,
             int __RPC_FAR *avg) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestNewNick( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestNewNick(
             LPCSTR nick,
             LPCSTR pass,
             LPCSTR email,
             LPCSTR parentEmail,
             int newsletter,
             int shareinfo) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestAgeCheck( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestAgeCheck(
             int month,
             int day,
             int year,
             LPCSTR email) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestWDTState( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestWDTState(
             LPCSTR host,
             int port,
             unsigned char request) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestLocaleLadderList( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestLocaleLadderList(
             LPCSTR host,
             int port,
             LPCSTR keys,
@@ -3935,8 +3935,8 @@ EXTERN_C const IID IID_INetUtil;
             int cond,
             int sort,
             Locale locale) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestLocaleLadderSearch( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestLocaleLadderSearch(
             LPCSTR host,
             int port,
             LPCSTR key,
@@ -3947,43 +3947,43 @@ EXTERN_C const IID IID_INetUtil;
             int number,
             int leading,
             Locale locale) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestHighscore( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestHighscore(
             LPCSTR host,
             int port,
             LPCSTR keys,
             unsigned long SKU) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetGameResMD5( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetGameResMD5(
             int flag) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct INetUtilVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
             INetUtil __RPC_FAR * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
             INetUtil __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
             INetUtil __RPC_FAR * This);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestGameresSend )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestGameresSend )(
             INetUtil __RPC_FAR * This,
             LPCSTR host,
             int port,
             unsigned char __RPC_FAR *data,
             int length);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestLadderSearch )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestLadderSearch )(
             INetUtil __RPC_FAR * This,
             LPCSTR host,
             int port,
@@ -3994,8 +3994,8 @@ EXTERN_C const IID IID_INetUtil;
             int sort,
             int number,
             int leading);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestLadderList )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestLadderList )(
             INetUtil __RPC_FAR * This,
             LPCSTR host,
             int port,
@@ -4004,22 +4004,22 @@ EXTERN_C const IID IID_INetUtil;
             int team,
             int cond,
             int sort);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPing )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestPing )(
             INetUtil __RPC_FAR * This,
             LPCSTR host,
             int timeout,
             int __RPC_FAR *handle);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *PumpMessages )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *PumpMessages )(
             INetUtil __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetAvgPing )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetAvgPing )(
             INetUtil __RPC_FAR * This,
             unsigned long ip,
             int __RPC_FAR *avg);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestNewNick )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestNewNick )(
             INetUtil __RPC_FAR * This,
             LPCSTR nick,
             LPCSTR pass,
@@ -4027,21 +4027,21 @@ EXTERN_C const IID IID_INetUtil;
             LPCSTR parentEmail,
             int newsletter,
             int shareinfo);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestAgeCheck )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestAgeCheck )(
             INetUtil __RPC_FAR * This,
             int month,
             int day,
             int year,
             LPCSTR email);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestWDTState )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestWDTState )(
             INetUtil __RPC_FAR * This,
             LPCSTR host,
             int port,
             unsigned char request);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestLocaleLadderList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestLocaleLadderList )(
             INetUtil __RPC_FAR * This,
             LPCSTR host,
             int port,
@@ -4051,8 +4051,8 @@ EXTERN_C const IID IID_INetUtil;
             int cond,
             int sort,
             Locale locale);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestLocaleLadderSearch )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestLocaleLadderSearch )(
             INetUtil __RPC_FAR * This,
             LPCSTR host,
             int port,
@@ -4064,18 +4064,18 @@ EXTERN_C const IID IID_INetUtil;
             int number,
             int leading,
             Locale locale);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestHighscore )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestHighscore )(
             INetUtil __RPC_FAR * This,
             LPCSTR host,
             int port,
             LPCSTR keys,
             unsigned long SKU);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetGameResMD5 )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetGameResMD5 )(
             INetUtil __RPC_FAR * This,
             int flag);
-        
+
         END_INTERFACE
     } INetUtilVtbl;
 
@@ -4084,7 +4084,7 @@ EXTERN_C const IID IID_INetUtil;
         CONST_VTBL struct INetUtilVtbl __RPC_FAR *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -4145,7 +4145,7 @@ EXTERN_C const IID IID_INetUtil;
 
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestGameresSend_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestGameresSend_Proxy(
     INetUtil __RPC_FAR * This,
     LPCSTR host,
     int port,
@@ -4160,7 +4160,7 @@ void __RPC_STUB INetUtil_RequestGameresSend_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestLadderSearch_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestLadderSearch_Proxy(
     INetUtil __RPC_FAR * This,
     LPCSTR host,
     int port,
@@ -4180,7 +4180,7 @@ void __RPC_STUB INetUtil_RequestLadderSearch_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestLadderList_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestLadderList_Proxy(
     INetUtil __RPC_FAR * This,
     LPCSTR host,
     int port,
@@ -4198,7 +4198,7 @@ void __RPC_STUB INetUtil_RequestLadderList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestPing_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestPing_Proxy(
     INetUtil __RPC_FAR * This,
     LPCSTR host,
     int timeout,
@@ -4212,7 +4212,7 @@ void __RPC_STUB INetUtil_RequestPing_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtil_PumpMessages_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtil_PumpMessages_Proxy(
     INetUtil __RPC_FAR * This);
 
 
@@ -4223,7 +4223,7 @@ void __RPC_STUB INetUtil_PumpMessages_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_GetAvgPing_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_GetAvgPing_Proxy(
     INetUtil __RPC_FAR * This,
     unsigned long ip,
     int __RPC_FAR *avg);
@@ -4236,7 +4236,7 @@ void __RPC_STUB INetUtil_GetAvgPing_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestNewNick_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestNewNick_Proxy(
     INetUtil __RPC_FAR * This,
     LPCSTR nick,
     LPCSTR pass,
@@ -4253,7 +4253,7 @@ void __RPC_STUB INetUtil_RequestNewNick_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestAgeCheck_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestAgeCheck_Proxy(
     INetUtil __RPC_FAR * This,
     int month,
     int day,
@@ -4268,7 +4268,7 @@ void __RPC_STUB INetUtil_RequestAgeCheck_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestWDTState_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestWDTState_Proxy(
     INetUtil __RPC_FAR * This,
     LPCSTR host,
     int port,
@@ -4282,7 +4282,7 @@ void __RPC_STUB INetUtil_RequestWDTState_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestLocaleLadderList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestLocaleLadderList_Proxy(
     INetUtil __RPC_FAR * This,
     LPCSTR host,
     int port,
@@ -4301,7 +4301,7 @@ void __RPC_STUB INetUtil_RequestLocaleLadderList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestLocaleLadderSearch_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestLocaleLadderSearch_Proxy(
     INetUtil __RPC_FAR * This,
     LPCSTR host,
     int port,
@@ -4322,7 +4322,7 @@ void __RPC_STUB INetUtil_RequestLocaleLadderSearch_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestHighscore_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_RequestHighscore_Proxy(
     INetUtil __RPC_FAR * This,
     LPCSTR host,
     int port,
@@ -4337,7 +4337,7 @@ void __RPC_STUB INetUtil_RequestHighscore_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_SetGameResMD5_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtil_SetGameResMD5_Proxy(
     INetUtil __RPC_FAR * This,
     int flag);
 
@@ -4357,121 +4357,121 @@ void __RPC_STUB INetUtil_SetGameResMD5_Stub(
 #define __INetUtilEvent_INTERFACE_DEFINED__
 
 /* interface INetUtilEvent */
-/* [object][unique][helpstring][uuid] */ 
+/* [object][unique][helpstring][uuid] */
 
 
 EXTERN_C const IID IID_INetUtilEvent;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("B832B0AC-A7D3-11D1-97C3-00609706FA0C")
     INetUtilEvent : public IUnknown
     {
     public:
-        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnPing( 
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnPing(
             HRESULT res,
             int time,
             unsigned long ip,
             int handle) = 0;
-        
-        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnLadderList( 
+
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnLadderList(
             HRESULT res,
             /* [in] */ Ladder __RPC_FAR *list,
             int totalCount,
             long timeStamp,
             int keyRung) = 0;
-        
-        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnGameresSent( 
+
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE OnGameresSent(
             HRESULT res) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnNewNick( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnNewNick(
             HRESULT res,
             LPCSTR message,
             LPCSTR nick,
             LPCSTR pass) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnAgeCheck( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnAgeCheck(
             HRESULT res,
             int years,
             int consent) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnWDTState( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnWDTState(
             HRESULT res,
             unsigned char __RPC_FAR *state,
             int length) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnHighscore( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnHighscore(
             HRESULT res,
             /* [in] */ Highscore __RPC_FAR *list,
             int totalCount,
             long timeStamp,
             int keyRung) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct INetUtilEventVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
             INetUtilEvent __RPC_FAR * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
             INetUtilEvent __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
             INetUtilEvent __RPC_FAR * This);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPing )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnPing )(
             INetUtilEvent __RPC_FAR * This,
             HRESULT res,
             int time,
             unsigned long ip,
             int handle);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnLadderList )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnLadderList )(
             INetUtilEvent __RPC_FAR * This,
             HRESULT res,
             /* [in] */ Ladder __RPC_FAR *list,
             int totalCount,
             long timeStamp,
             int keyRung);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnGameresSent )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnGameresSent )(
             INetUtilEvent __RPC_FAR * This,
             HRESULT res);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnNewNick )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnNewNick )(
             INetUtilEvent __RPC_FAR * This,
             HRESULT res,
             LPCSTR message,
             LPCSTR nick,
             LPCSTR pass);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnAgeCheck )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnAgeCheck )(
             INetUtilEvent __RPC_FAR * This,
             HRESULT res,
             int years,
             int consent);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnWDTState )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnWDTState )(
             INetUtilEvent __RPC_FAR * This,
             HRESULT res,
             unsigned char __RPC_FAR *state,
             int length);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnHighscore )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnHighscore )(
             INetUtilEvent __RPC_FAR * This,
             HRESULT res,
             /* [in] */ Highscore __RPC_FAR *list,
             int totalCount,
             long timeStamp,
             int keyRung);
-        
+
         END_INTERFACE
     } INetUtilEventVtbl;
 
@@ -4480,7 +4480,7 @@ EXTERN_C const IID IID_INetUtilEvent;
         CONST_VTBL struct INetUtilEventVtbl __RPC_FAR *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -4523,7 +4523,7 @@ EXTERN_C const IID IID_INetUtilEvent;
 
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnPing_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnPing_Proxy(
     INetUtilEvent __RPC_FAR * This,
     HRESULT res,
     int time,
@@ -4538,7 +4538,7 @@ void __RPC_STUB INetUtilEvent_OnPing_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnLadderList_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnLadderList_Proxy(
     INetUtilEvent __RPC_FAR * This,
     HRESULT res,
     /* [in] */ Ladder __RPC_FAR *list,
@@ -4554,7 +4554,7 @@ void __RPC_STUB INetUtilEvent_OnLadderList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnGameresSent_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnGameresSent_Proxy(
     INetUtilEvent __RPC_FAR * This,
     HRESULT res);
 
@@ -4566,7 +4566,7 @@ void __RPC_STUB INetUtilEvent_OnGameresSent_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnNewNick_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnNewNick_Proxy(
     INetUtilEvent __RPC_FAR * This,
     HRESULT res,
     LPCSTR message,
@@ -4581,7 +4581,7 @@ void __RPC_STUB INetUtilEvent_OnNewNick_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnAgeCheck_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnAgeCheck_Proxy(
     INetUtilEvent __RPC_FAR * This,
     HRESULT res,
     int years,
@@ -4595,7 +4595,7 @@ void __RPC_STUB INetUtilEvent_OnAgeCheck_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnWDTState_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnWDTState_Proxy(
     INetUtilEvent __RPC_FAR * This,
     HRESULT res,
     unsigned char __RPC_FAR *state,
@@ -4609,7 +4609,7 @@ void __RPC_STUB INetUtilEvent_OnWDTState_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnHighscore_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE INetUtilEvent_OnHighscore_Proxy(
     INetUtilEvent __RPC_FAR * This,
     HRESULT res,
     /* [in] */ Highscore __RPC_FAR *list,
@@ -4633,7 +4633,7 @@ void __RPC_STUB INetUtilEvent_OnHighscore_Stub(
 #define __IChat2_INTERFACE_DEFINED__
 
 /* interface IChat2 */
-/* [object][unique][helpstring][uuid] */ 
+/* [object][unique][helpstring][uuid] */
 
 typedef unsigned long GID;
 
@@ -4657,107 +4657,107 @@ typedef enum CHAN_CTYPE_ CHAN_CTYPE;
 EXTERN_C const IID IID_IChat2;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("8B938190-EF3F-11D1-9808-00609706FA0C")
     IChat2 : public IUnknown
     {
     public:
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE PumpMessages( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestConnection( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestConnection(
             Server __RPC_FAR *server,
             int timeout) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestMessage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestMessage(
             GID who,
             LPCSTR message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetTypeFromGID( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetTypeFromGID(
             GID id,
             GTYPE __RPC_FAR *type) = 0;
-        
+
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelList( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelJoin( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelJoin(
             LPCSTR name) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelLeave( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelLeave(
             Channel __RPC_FAR *chan) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUserList( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestUserList(
             Channel __RPC_FAR *chan) = 0;
-        
+
         virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestLogout( void) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelCreate( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestChannelCreate(
             Channel __RPC_FAR *chan) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestRawCmd( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RequestRawCmd(
             LPCSTR cmd) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IChat2Vtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
             IChat2 __RPC_FAR * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
             IChat2 __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
             IChat2 __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *PumpMessages )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *PumpMessages )(
             IChat2 __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestConnection )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestConnection )(
             IChat2 __RPC_FAR * This,
             Server __RPC_FAR *server,
             int timeout);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestMessage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestMessage )(
             IChat2 __RPC_FAR * This,
             GID who,
             LPCSTR message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeFromGID )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeFromGID )(
             IChat2 __RPC_FAR * This,
             GID id,
             GTYPE __RPC_FAR *type);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelList )(
             IChat2 __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelJoin )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelJoin )(
             IChat2 __RPC_FAR * This,
             LPCSTR name);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelLeave )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelLeave )(
             IChat2 __RPC_FAR * This,
             Channel __RPC_FAR *chan);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUserList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestUserList )(
             IChat2 __RPC_FAR * This,
             Channel __RPC_FAR *chan);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestLogout )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestLogout )(
             IChat2 __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelCreate )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestChannelCreate )(
             IChat2 __RPC_FAR * This,
             Channel __RPC_FAR *chan);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestRawCmd )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RequestRawCmd )(
             IChat2 __RPC_FAR * This,
             LPCSTR cmd);
-        
+
         END_INTERFACE
     } IChat2Vtbl;
 
@@ -4766,7 +4766,7 @@ EXTERN_C const IID IID_IChat2;
         CONST_VTBL struct IChat2Vtbl __RPC_FAR *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -4821,7 +4821,7 @@ EXTERN_C const IID IID_IChat2;
 
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_PumpMessages_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_PumpMessages_Proxy(
     IChat2 __RPC_FAR * This);
 
 
@@ -4832,7 +4832,7 @@ void __RPC_STUB IChat2_PumpMessages_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestConnection_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestConnection_Proxy(
     IChat2 __RPC_FAR * This,
     Server __RPC_FAR *server,
     int timeout);
@@ -4845,7 +4845,7 @@ void __RPC_STUB IChat2_RequestConnection_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestMessage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestMessage_Proxy(
     IChat2 __RPC_FAR * This,
     GID who,
     LPCSTR message);
@@ -4858,7 +4858,7 @@ void __RPC_STUB IChat2_RequestMessage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_GetTypeFromGID_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_GetTypeFromGID_Proxy(
     IChat2 __RPC_FAR * This,
     GID id,
     GTYPE __RPC_FAR *type);
@@ -4871,7 +4871,7 @@ void __RPC_STUB IChat2_GetTypeFromGID_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestChannelList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestChannelList_Proxy(
     IChat2 __RPC_FAR * This);
 
 
@@ -4882,7 +4882,7 @@ void __RPC_STUB IChat2_RequestChannelList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestChannelJoin_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestChannelJoin_Proxy(
     IChat2 __RPC_FAR * This,
     LPCSTR name);
 
@@ -4894,7 +4894,7 @@ void __RPC_STUB IChat2_RequestChannelJoin_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestChannelLeave_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestChannelLeave_Proxy(
     IChat2 __RPC_FAR * This,
     Channel __RPC_FAR *chan);
 
@@ -4906,7 +4906,7 @@ void __RPC_STUB IChat2_RequestChannelLeave_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestUserList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestUserList_Proxy(
     IChat2 __RPC_FAR * This,
     Channel __RPC_FAR *chan);
 
@@ -4918,7 +4918,7 @@ void __RPC_STUB IChat2_RequestUserList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestLogout_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestLogout_Proxy(
     IChat2 __RPC_FAR * This);
 
 
@@ -4929,7 +4929,7 @@ void __RPC_STUB IChat2_RequestLogout_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestChannelCreate_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestChannelCreate_Proxy(
     IChat2 __RPC_FAR * This,
     Channel __RPC_FAR *chan);
 
@@ -4941,7 +4941,7 @@ void __RPC_STUB IChat2_RequestChannelCreate_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestRawCmd_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2_RequestRawCmd_Proxy(
     IChat2 __RPC_FAR * This,
     LPCSTR cmd);
 
@@ -4961,121 +4961,121 @@ void __RPC_STUB IChat2_RequestRawCmd_Stub(
 #define __IChat2Event_INTERFACE_DEFINED__
 
 /* interface IChat2Event */
-/* [object][unique][helpstring][uuid] */ 
+/* [object][unique][helpstring][uuid] */
 
 
 EXTERN_C const IID IID_IChat2Event;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("8B938192-EF3F-11D1-9808-00609706FA0C")
     IChat2Event : public IUnknown
     {
     public:
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnNetStatus( 
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnNetStatus(
             HRESULT res) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnMessage( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnMessage(
             HRESULT res,
             User __RPC_FAR *user,
             LPCSTR message) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelList( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelList(
             HRESULT res,
             Channel __RPC_FAR *list) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelJoin( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelJoin(
             HRESULT res,
             Channel __RPC_FAR *chan,
             User __RPC_FAR *user) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnLogin( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnLogin(
             HRESULT res) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserList( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUserList(
             HRESULT res,
             Channel __RPC_FAR *chan,
             User __RPC_FAR *users) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelLeave( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelLeave(
             HRESULT res,
             Channel __RPC_FAR *chan,
             User __RPC_FAR *user) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelCreate( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnChannelCreate(
             HRESULT res,
             Channel __RPC_FAR *chan) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUnknownLine( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE OnUnknownLine(
             HRESULT res,
             LPCSTR line) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IChat2EventVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
             IChat2Event __RPC_FAR * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
             IChat2Event __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
             IChat2Event __RPC_FAR * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnNetStatus )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnNetStatus )(
             IChat2Event __RPC_FAR * This,
             HRESULT res);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnMessage )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnMessage )(
             IChat2Event __RPC_FAR * This,
             HRESULT res,
             User __RPC_FAR *user,
             LPCSTR message);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelList )(
             IChat2Event __RPC_FAR * This,
             HRESULT res,
             Channel __RPC_FAR *list);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelJoin )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelJoin )(
             IChat2Event __RPC_FAR * This,
             HRESULT res,
             Channel __RPC_FAR *chan,
             User __RPC_FAR *user);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnLogin )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnLogin )(
             IChat2Event __RPC_FAR * This,
             HRESULT res);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserList )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUserList )(
             IChat2Event __RPC_FAR * This,
             HRESULT res,
             Channel __RPC_FAR *chan,
             User __RPC_FAR *users);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelLeave )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelLeave )(
             IChat2Event __RPC_FAR * This,
             HRESULT res,
             Channel __RPC_FAR *chan,
             User __RPC_FAR *user);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelCreate )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnChannelCreate )(
             IChat2Event __RPC_FAR * This,
             HRESULT res,
             Channel __RPC_FAR *chan);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUnknownLine )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *OnUnknownLine )(
             IChat2Event __RPC_FAR * This,
             HRESULT res,
             LPCSTR line);
-        
+
         END_INTERFACE
     } IChat2EventVtbl;
 
@@ -5084,7 +5084,7 @@ EXTERN_C const IID IID_IChat2Event;
         CONST_VTBL struct IChat2EventVtbl __RPC_FAR *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -5133,7 +5133,7 @@ EXTERN_C const IID IID_IChat2Event;
 
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnNetStatus_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnNetStatus_Proxy(
     IChat2Event __RPC_FAR * This,
     HRESULT res);
 
@@ -5145,7 +5145,7 @@ void __RPC_STUB IChat2Event_OnNetStatus_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnMessage_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnMessage_Proxy(
     IChat2Event __RPC_FAR * This,
     HRESULT res,
     User __RPC_FAR *user,
@@ -5159,7 +5159,7 @@ void __RPC_STUB IChat2Event_OnMessage_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnChannelList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnChannelList_Proxy(
     IChat2Event __RPC_FAR * This,
     HRESULT res,
     Channel __RPC_FAR *list);
@@ -5172,7 +5172,7 @@ void __RPC_STUB IChat2Event_OnChannelList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnChannelJoin_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnChannelJoin_Proxy(
     IChat2Event __RPC_FAR * This,
     HRESULT res,
     Channel __RPC_FAR *chan,
@@ -5186,7 +5186,7 @@ void __RPC_STUB IChat2Event_OnChannelJoin_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnLogin_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnLogin_Proxy(
     IChat2Event __RPC_FAR * This,
     HRESULT res);
 
@@ -5198,7 +5198,7 @@ void __RPC_STUB IChat2Event_OnLogin_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnUserList_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnUserList_Proxy(
     IChat2Event __RPC_FAR * This,
     HRESULT res,
     Channel __RPC_FAR *chan,
@@ -5212,7 +5212,7 @@ void __RPC_STUB IChat2Event_OnUserList_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnChannelLeave_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnChannelLeave_Proxy(
     IChat2Event __RPC_FAR * This,
     HRESULT res,
     Channel __RPC_FAR *chan,
@@ -5226,7 +5226,7 @@ void __RPC_STUB IChat2Event_OnChannelLeave_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnChannelCreate_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnChannelCreate_Proxy(
     IChat2Event __RPC_FAR * This,
     HRESULT res,
     Channel __RPC_FAR *chan);
@@ -5239,7 +5239,7 @@ void __RPC_STUB IChat2Event_OnChannelCreate_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnUnknownLine_Proxy( 
+/* [helpstring] */ HRESULT STDMETHODCALLTYPE IChat2Event_OnUnknownLine_Proxy(
     IChat2Event __RPC_FAR * This,
     HRESULT res,
     LPCSTR line);
@@ -5260,63 +5260,63 @@ void __RPC_STUB IChat2Event_OnUnknownLine_Stub(
 #define __IIGROptions_INTERFACE_DEFINED__
 
 /* interface IIGROptions */
-/* [unique][helpstring][dual][uuid][object] */ 
+/* [unique][helpstring][dual][uuid][object] */
 
 
 EXTERN_C const IID IID_IIGROptions;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("89DD1ECD-0DCA-49d8-8EF3-3375E6D6EE9D")
     IIGROptions : public IUnknown
     {
     public:
         virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Init( void) = 0;
-        
+
         virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Is_Auto_Login_Allowed( void) = 0;
-        
+
         virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Is_Storing_Nicks_Allowed( void) = 0;
-        
+
         virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Is_Running_Reg_App_Allowed( void) = 0;
-        
-        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Set_Options( 
+
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Set_Options(
             unsigned int options) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IIGROptionsVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
             IIGROptions __RPC_FAR * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
             IIGROptions __RPC_FAR * This);
-        
-        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
             IIGROptions __RPC_FAR * This);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Init )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Init )(
             IIGROptions __RPC_FAR * This);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Is_Auto_Login_Allowed )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Is_Auto_Login_Allowed )(
             IIGROptions __RPC_FAR * This);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Is_Storing_Nicks_Allowed )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Is_Storing_Nicks_Allowed )(
             IIGROptions __RPC_FAR * This);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Is_Running_Reg_App_Allowed )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Is_Running_Reg_App_Allowed )(
             IIGROptions __RPC_FAR * This);
-        
-        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Set_Options )( 
+
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Set_Options )(
             IIGROptions __RPC_FAR * This,
             unsigned int options);
-        
+
         END_INTERFACE
     } IIGROptionsVtbl;
 
@@ -5325,7 +5325,7 @@ EXTERN_C const IID IID_IIGROptions;
         CONST_VTBL struct IIGROptionsVtbl __RPC_FAR *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -5362,7 +5362,7 @@ EXTERN_C const IID IID_IIGROptions;
 
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IIGROptions_Init_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IIGROptions_Init_Proxy(
     IIGROptions __RPC_FAR * This);
 
 
@@ -5373,7 +5373,7 @@ void __RPC_STUB IIGROptions_Init_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IIGROptions_Is_Auto_Login_Allowed_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IIGROptions_Is_Auto_Login_Allowed_Proxy(
     IIGROptions __RPC_FAR * This);
 
 
@@ -5384,7 +5384,7 @@ void __RPC_STUB IIGROptions_Is_Auto_Login_Allowed_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IIGROptions_Is_Storing_Nicks_Allowed_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IIGROptions_Is_Storing_Nicks_Allowed_Proxy(
     IIGROptions __RPC_FAR * This);
 
 
@@ -5395,7 +5395,7 @@ void __RPC_STUB IIGROptions_Is_Storing_Nicks_Allowed_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IIGROptions_Is_Running_Reg_App_Allowed_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IIGROptions_Is_Running_Reg_App_Allowed_Proxy(
     IIGROptions __RPC_FAR * This);
 
 
@@ -5406,7 +5406,7 @@ void __RPC_STUB IIGROptions_Is_Running_Reg_App_Allowed_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IIGROptions_Set_Options_Proxy( 
+/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE IIGROptions_Set_Options_Proxy(
     IIGROptions __RPC_FAR * This,
     unsigned int options);
 
@@ -5427,7 +5427,7 @@ void __RPC_STUB IIGROptions_Set_Options_Stub(
 #define __WOLAPILib_LIBRARY_DEFINED__
 
 /* library WOLAPILib */
-/* [helpstring][version][uuid] */ 
+/* [helpstring][version][uuid] */
 
 
 EXTERN_C const IID LIBID_WOLAPILib;
diff --git a/Core/Tools/wolSetup/resource.h b/Core/Tools/wolSetup/resource.h
index 918b6c06879..bc741d4629f 100644
--- a/Core/Tools/wolSetup/resource.h
+++ b/Core/Tools/wolSetup/resource.h
@@ -40,7 +40,7 @@
 #define IDC_EDIT_SERIAL                 1011
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        103
diff --git a/Core/Tools/wolSetup/verchk.h b/Core/Tools/wolSetup/verchk.h
index d83f7cf5ba8..4584bc1632e 100644
--- a/Core/Tools/wolSetup/verchk.h
+++ b/Core/Tools/wolSetup/verchk.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __VERCHK_H__
-#define __VERCHK_H__
+#pragma once
 
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
@@ -27,6 +26,3 @@
 // Obtain version information from the specified file.
 bool GetVersionInfo(char* filename, VS_FIXEDFILEINFO* fileInfo);
 bool loadWolapi( char *filename );
-
-#endif // __VERCHK_H__
-
diff --git a/Core/Tools/wolSetup/wolSetup.cpp b/Core/Tools/wolSetup/wolSetup.cpp
index ec131625a30..5ef59825bf5 100644
--- a/Core/Tools/wolSetup/wolSetup.cpp
+++ b/Core/Tools/wolSetup/wolSetup.cpp
@@ -35,14 +35,14 @@ void registerDLL(const char *dllName)
 {
 	HINSTANCE hLib = LoadLibrary(dllName);
 	FARPROC lpDllEntryPoint;
-	
+
 	if (hLib < (HINSTANCE)HINSTANCE_ERROR)
 	{
 		return;
 	}
-	
+
 	// Find the entry point.
-	(FARPROC&)lpDllEntryPoint = GetProcAddress(hLib, 
+	(FARPROC&)lpDllEntryPoint = GetProcAddress(hLib,
 		"DllRegisterServer");
 	if (lpDllEntryPoint != NULL)
 		(*lpDllEntryPoint)();
diff --git a/Core/Tools/wolSetup/wolSetup.h b/Core/Tools/wolSetup/wolSetup.h
index 1241952d56c..80350df1198 100644
--- a/Core/Tools/wolSetup/wolSetup.h
+++ b/Core/Tools/wolSetup/wolSetup.h
@@ -19,8 +19,7 @@
 // FILE: wolSetup.h //////////////////////////////////////////////////////
 // Author: Matthew D. Campbell, December 2001
 
-#ifndef __WOLSETUP_H__
-#define __WOLSETUP_H__
+#pragma once
 
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
@@ -42,5 +41,3 @@ extern char g_generalsSerial[];
 // TheSuperHackers @todo Check if this should be returning unsigned long.
 static int MAJOR(unsigned long x) { return (((x) & 0xffff0000) >> 16); }
 static int MINOR(unsigned long x) { return ((x) & 0xffff); }
-
-#endif // __WOLSETUP_H__
diff --git a/Dependencies/Benchmark/CMakeLists.txt b/Dependencies/Benchmark/CMakeLists.txt
deleted file mode 100644
index 77e88b75dc2..00000000000
--- a/Dependencies/Benchmark/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_library(benchmark INTERFACE)
-target_include_directories(benchmark INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-)
diff --git a/Dependencies/Benchmark/benchmark.h b/Dependencies/Benchmark/benchmark.h
deleted file mode 100644
index 00a2379a28b..00000000000
--- a/Dependencies/Benchmark/benchmark.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-// Cheeky stub that just returns "good" results.
-inline int RunBenchmark(int argc, char *argv[], float *floatResult, float *intResult, float *memResult)
-{
-    if (floatResult) {
-        *floatResult = 10.0f;
-    }
-    
-    if (intResult) {
-        *intResult = 10.0f;
-    }
-    
-    if (memResult) {
-        *memResult = 10.0f;
-    }
-
-    return 1;
-}
diff --git a/Dependencies/Utility/Utility/CppMacros.h b/Dependencies/Utility/Utility/CppMacros.h
index 57aaa75abc8..8bfb0297f29 100644
--- a/Dependencies/Utility/Utility/CppMacros.h
+++ b/Dependencies/Utility/Utility/CppMacros.h
@@ -21,8 +21,12 @@
 
 #if __cplusplus >= 201703L
 #define NOEXCEPT_17 noexcept
+#define REGISTER
+#define FALLTHROUGH [[fallthrough]]
 #else
 #define NOEXCEPT_17
+#define REGISTER register
+#define FALLTHROUGH
 #endif
 
 // noexcept for methods of IUNKNOWN interface
@@ -33,17 +37,10 @@
 #endif
 
 #if __cplusplus >= 201103L
-    #define CPP_11(code) code
-#else
-    #define CPP_11(code)
-#endif
-
-#if __cplusplus >= 201703L
-#define REGISTER
+#define CPP_11(code) code
 #else
-#define REGISTER register
-#endif
-
-#if __cplusplus < 201103L
+#define CPP_11(code)
 #define static_assert(expr, msg)
+#define constexpr
+#define nullptr 0
 #endif
diff --git a/Dependencies/Utility/Utility/compat.h b/Dependencies/Utility/Utility/compat.h
index 7af2c302c24..32d00018aaa 100644
--- a/Dependencies/Utility/Utility/compat.h
+++ b/Dependencies/Utility/Utility/compat.h
@@ -71,4 +71,5 @@
 #include "time_compat.h"
 #include "thread_compat.h"
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/Dependencies/Utility/Utility/endian_compat.h b/Dependencies/Utility/Utility/endian_compat.h
index 56b35c33bef..08c6fdb16f4 100644
--- a/Dependencies/Utility/Utility/endian_compat.h
+++ b/Dependencies/Utility/Utility/endian_compat.h
@@ -19,7 +19,6 @@
 // This file contains macros to help with endian conversions between different endian systems.
 #pragma once
 
-// VC6 does not support pragma once
 #ifndef ENDIAN_COMPAT_H
 #define ENDIAN_COMPAT_H
 
@@ -195,30 +194,30 @@ template <typename Type, size_t Size = sizeof(Type)> struct betohHelper;
 template <typename Type, size_t Size = sizeof(Type)> struct letohHelper;
 
 // 2 byte integer, enum
-template <typename Type> struct htobeHelper<Type, 2> { static inline Type swap(Type value) { return static_cast<Type>(htobe16(static_cast<SwapType16>(value))); } };
-template <typename Type> struct htoleHelper<Type, 2> { static inline Type swap(Type value) { return static_cast<Type>(htole16(static_cast<SwapType16>(value))); } };
-template <typename Type> struct betohHelper<Type, 2> { static inline Type swap(Type value) { return static_cast<Type>(be16toh(static_cast<SwapType16>(value))); } };
-template <typename Type> struct letohHelper<Type, 2> { static inline Type swap(Type value) { return static_cast<Type>(le16toh(static_cast<SwapType16>(value))); } };
+template <typename Type> struct htobeHelper<Type, 2> { static Type swap(Type value) { return static_cast<Type>(htobe16(static_cast<SwapType16>(value))); } };
+template <typename Type> struct htoleHelper<Type, 2> { static Type swap(Type value) { return static_cast<Type>(htole16(static_cast<SwapType16>(value))); } };
+template <typename Type> struct betohHelper<Type, 2> { static Type swap(Type value) { return static_cast<Type>(be16toh(static_cast<SwapType16>(value))); } };
+template <typename Type> struct letohHelper<Type, 2> { static Type swap(Type value) { return static_cast<Type>(le16toh(static_cast<SwapType16>(value))); } };
 // 4 byte integer, enum
-template <typename Type> struct htobeHelper<Type, 4> { static inline Type swap(Type value) { return static_cast<Type>(htobe32(static_cast<SwapType32>(value))); } };
-template <typename Type> struct htoleHelper<Type, 4> { static inline Type swap(Type value) { return static_cast<Type>(htole32(static_cast<SwapType32>(value))); } };
-template <typename Type> struct betohHelper<Type, 4> { static inline Type swap(Type value) { return static_cast<Type>(be32toh(static_cast<SwapType32>(value))); } };
-template <typename Type> struct letohHelper<Type, 4> { static inline Type swap(Type value) { return static_cast<Type>(le16toh(static_cast<SwapType32>(value))); } };
+template <typename Type> struct htobeHelper<Type, 4> { static Type swap(Type value) { return static_cast<Type>(htobe32(static_cast<SwapType32>(value))); } };
+template <typename Type> struct htoleHelper<Type, 4> { static Type swap(Type value) { return static_cast<Type>(htole32(static_cast<SwapType32>(value))); } };
+template <typename Type> struct betohHelper<Type, 4> { static Type swap(Type value) { return static_cast<Type>(be32toh(static_cast<SwapType32>(value))); } };
+template <typename Type> struct letohHelper<Type, 4> { static Type swap(Type value) { return static_cast<Type>(le16toh(static_cast<SwapType32>(value))); } };
 // 8 byte integer, enum
-template <typename Type> struct htobeHelper<Type, 8> { static inline Type swap(Type value) { return static_cast<Type>(htobe64(static_cast<SwapType64>(value))); } };
-template <typename Type> struct htoleHelper<Type, 8> { static inline Type swap(Type value) { return static_cast<Type>(htole64(static_cast<SwapType64>(value))); } };
-template <typename Type> struct betohHelper<Type, 8> { static inline Type swap(Type value) { return static_cast<Type>(be64toh(static_cast<SwapType64>(value))); } };
-template <typename Type> struct letohHelper<Type, 8> { static inline Type swap(Type value) { return static_cast<Type>(le16toh(static_cast<SwapType64>(value))); } };
+template <typename Type> struct htobeHelper<Type, 8> { static Type swap(Type value) { return static_cast<Type>(htobe64(static_cast<SwapType64>(value))); } };
+template <typename Type> struct htoleHelper<Type, 8> { static Type swap(Type value) { return static_cast<Type>(htole64(static_cast<SwapType64>(value))); } };
+template <typename Type> struct betohHelper<Type, 8> { static Type swap(Type value) { return static_cast<Type>(be64toh(static_cast<SwapType64>(value))); } };
+template <typename Type> struct letohHelper<Type, 8> { static Type swap(Type value) { return static_cast<Type>(le16toh(static_cast<SwapType64>(value))); } };
 // float
-template <> struct htobeHelper<float, 4> { static inline float swap(float value) { SwapType32 v = htobe32(*reinterpret_cast<SwapType32*>(&value)); return *reinterpret_cast<float*>(&v); } };
-template <> struct htoleHelper<float, 4> { static inline float swap(float value) { SwapType32 v = htole32(*reinterpret_cast<SwapType32*>(&value)); return *reinterpret_cast<float*>(&v); } };
-template <> struct betohHelper<float, 4> { static inline float swap(float value) { SwapType32 v = be32toh(*reinterpret_cast<SwapType32*>(&value)); return *reinterpret_cast<float*>(&v); } };
-template <> struct letohHelper<float, 4> { static inline float swap(float value) { SwapType32 v = le16toh(*reinterpret_cast<SwapType32*>(&value)); return *reinterpret_cast<float*>(&v); } };
+template <> struct htobeHelper<float, 4> { static float swap(float value) { SwapType32 v = htobe32(*reinterpret_cast<SwapType32*>(&value)); return *reinterpret_cast<float*>(&v); } };
+template <> struct htoleHelper<float, 4> { static float swap(float value) { SwapType32 v = htole32(*reinterpret_cast<SwapType32*>(&value)); return *reinterpret_cast<float*>(&v); } };
+template <> struct betohHelper<float, 4> { static float swap(float value) { SwapType32 v = be32toh(*reinterpret_cast<SwapType32*>(&value)); return *reinterpret_cast<float*>(&v); } };
+template <> struct letohHelper<float, 4> { static float swap(float value) { SwapType32 v = le16toh(*reinterpret_cast<SwapType32*>(&value)); return *reinterpret_cast<float*>(&v); } };
 // double
-template <> struct htobeHelper<double, 8> { static inline double swap(double value) { SwapType64 v = htobe64(*reinterpret_cast<SwapType64*>(&value)); return *reinterpret_cast<double*>(&v); } };
-template <> struct htoleHelper<double, 8> { static inline double swap(double value) { SwapType64 v = htole64(*reinterpret_cast<SwapType64*>(&value)); return *reinterpret_cast<double*>(&v); } };
-template <> struct betohHelper<double, 8> { static inline double swap(double value) { SwapType64 v = be64toh(*reinterpret_cast<SwapType64*>(&value)); return *reinterpret_cast<double*>(&v); } };
-template <> struct letohHelper<double, 8> { static inline double swap(double value) { SwapType64 v = le16toh(*reinterpret_cast<SwapType64*>(&value)); return *reinterpret_cast<double*>(&v); } };
+template <> struct htobeHelper<double, 8> { static double swap(double value) { SwapType64 v = htobe64(*reinterpret_cast<SwapType64*>(&value)); return *reinterpret_cast<double*>(&v); } };
+template <> struct htoleHelper<double, 8> { static double swap(double value) { SwapType64 v = htole64(*reinterpret_cast<SwapType64*>(&value)); return *reinterpret_cast<double*>(&v); } };
+template <> struct betohHelper<double, 8> { static double swap(double value) { SwapType64 v = be64toh(*reinterpret_cast<SwapType64*>(&value)); return *reinterpret_cast<double*>(&v); } };
+template <> struct letohHelper<double, 8> { static double swap(double value) { SwapType64 v = le16toh(*reinterpret_cast<SwapType64*>(&value)); return *reinterpret_cast<double*>(&v); } };
 } // namespace Endian
 
 // c++ template functions, takes any 2, 4, 8 bytes, including float, double, enum
@@ -243,4 +242,5 @@ template<typename Type> inline void letoh_ref(Type &value) { value = Endian::let
 
 #endif // _MSC_VER < 1300
 
-#endif // ENDIAN_COMPAT_H
\ No newline at end of file
+#endif // ENDIAN_COMPAT_H
+
diff --git a/Dependencies/Utility/Utility/intrin_compat.h b/Dependencies/Utility/Utility/intrin_compat.h
index c02913e4325..efea3e62c78 100644
--- a/Dependencies/Utility/Utility/intrin_compat.h
+++ b/Dependencies/Utility/Utility/intrin_compat.h
@@ -103,7 +103,7 @@ static inline uint64_t _rdtsc()
 #endif
 }
 #endif // _rdtsc
- 
+
 #ifdef _WIN32
 #include <intrin.h>
 #pragma intrinsic(_ReturnAddress)
@@ -120,7 +120,7 @@ static inline uint64_t _rdtsc()
 #error "No implementation for _ReturnAddress"
 #endif
 
-#if defined(__has_builtin) 
+#if defined(__has_builtin)
     #if  __has_builtin(__builtin_debugtrap)
     #define __debugbreak() __builtin_debugtrap()
     #elif __has_builtin(__builtin_trap)
diff --git a/Dependencies/Utility/Utility/mem_compat.h b/Dependencies/Utility/Utility/mem_compat.h
index 189e1d058f9..42a5e8f0bfb 100644
--- a/Dependencies/Utility/Utility/mem_compat.h
+++ b/Dependencies/Utility/Utility/mem_compat.h
@@ -20,4 +20,5 @@
 #pragma once
 
 #include <alloca.h>
-#define _alloca alloca
\ No newline at end of file
+#define _alloca alloca
+
diff --git a/Dependencies/Utility/Utility/stdint_adapter.h b/Dependencies/Utility/Utility/stdint_adapter.h
index b73de836038..241b7cdb653 100644
--- a/Dependencies/Utility/Utility/stdint_adapter.h
+++ b/Dependencies/Utility/Utility/stdint_adapter.h
@@ -26,7 +26,7 @@
 #else
   typedef int intptr_t;
   typedef unsigned int uintptr_t;
-#endif 
+#endif
 
 /* 7.18.1.1  Exact-width integer types */
 typedef signed char int8_t;
diff --git a/Dependencies/Utility/Utility/stdio_adapter.h b/Dependencies/Utility/Utility/stdio_adapter.h
index bdee0600af7..4228e081996 100644
--- a/Dependencies/Utility/Utility/stdio_adapter.h
+++ b/Dependencies/Utility/Utility/stdio_adapter.h
@@ -26,38 +26,52 @@
 
 inline int vsnprintf(char* _Buffer, size_t _BufferCount, const char* _Format, va_list _ArgList)
 {
-    // Microsoft's _vsnprintf does not null terminate when writing the entire length.
-    int result = _vsnprintf(_Buffer, _BufferCount, _Format, _ArgList);
-    _Buffer[_BufferCount - 1] = '\0';
-    return result;
+	if (_BufferCount == 0)
+		return -1;
+	// Microsoft's _vsnprintf does not null terminate when writing the entire length.
+	int result = _vsnprintf(_Buffer, _BufferCount, _Format, _ArgList);
+	// Deal with errors and edge cases.
+	if (result == -1 || (size_t)result == _BufferCount)
+	{
+		_Buffer[_BufferCount - 1] = '\0';
+		return -1;
+	}
+	return result;
 }
 
 // Yes, this is called vswprintf instead of vsnwprintf
 inline int vswprintf(wchar_t* _Buffer, size_t _BufferCount, const wchar_t* _Format, va_list _ArgList)
 {
-    // Microsoft's _vsnwprintf does not null terminate when writing the entire length.
-    int result = _vsnwprintf(_Buffer, _BufferCount, _Format, _ArgList);
-    _Buffer[_BufferCount - 1] = L'\0';
-    return result;
+	if (_BufferCount == 0)
+		return -1;
+	// Microsoft's _vsnwprintf does not null terminate when writing the entire length.
+	int result = _vsnwprintf(_Buffer, _BufferCount, _Format, _ArgList);
+	// Deal with errors and edge cases.
+	if (result == -1 || (size_t)result == _BufferCount)
+	{
+		_Buffer[_BufferCount - 1] = L'\0';
+		return -1;
+	}
+	return result;
 }
 
 inline int snprintf(char* _Buffer, size_t _BufferCount, const char* _Format, ...)
 {
-    va_list _ArgList;
-    va_start(_ArgList, _Format);
-    int result = vsnprintf(_Buffer, _BufferCount, _Format, _ArgList);
-    va_end(_ArgList);
-    return result;
+	va_list _ArgList;
+	va_start(_ArgList, _Format);
+	int result = vsnprintf(_Buffer, _BufferCount, _Format, _ArgList);
+	va_end(_ArgList);
+	return result;
 }
 
 // Yes, this is called swprintf instead of snwprintf
 inline int swprintf(wchar_t* _Buffer, size_t _BufferCount, const wchar_t* _Format, ...)
 {
-    va_list _ArgList;
-    va_start(_ArgList, _Format);
-    int result = vswprintf(_Buffer, _BufferCount, _Format, _ArgList);
-    va_end(_ArgList);
-    return result;
+	va_list _ArgList;
+	va_start(_ArgList, _Format);
+	int result = vswprintf(_Buffer, _BufferCount, _Format, _ArgList);
+	va_end(_ArgList);
+	return result;
 }
 
 #endif
diff --git a/Dependencies/Utility/Utility/string_compat.h b/Dependencies/Utility/Utility/string_compat.h
index 0e26f3267ea..ff88aaa7a43 100644
--- a/Dependencies/Utility/Utility/string_compat.h
+++ b/Dependencies/Utility/Utility/string_compat.h
@@ -34,4 +34,5 @@ inline char *_strlwr(char *str) {
 #define strlwr _strlwr
 #define stricmp strcasecmp
 #define strnicmp strncasecmp
-#define strcmpi strcasecmp
\ No newline at end of file
+#define strcmpi strcasecmp
+
diff --git a/Dependencies/Utility/Utility/tchar_compat.h b/Dependencies/Utility/Utility/tchar_compat.h
index f5a470fbef7..69c85124095 100644
--- a/Dependencies/Utility/Utility/tchar_compat.h
+++ b/Dependencies/Utility/Utility/tchar_compat.h
@@ -27,4 +27,5 @@ typedef TCHAR* LPTSTR;
 #define _tcscmp strcmp
 #define _tcsicmp strcasecmp
 #define _tcsclen strlen
-#define _tcscpy strcpy
\ No newline at end of file
+#define _tcscpy strcpy
+
diff --git a/Dependencies/Utility/Utility/thread_compat.h b/Dependencies/Utility/Utility/thread_compat.h
index 9345944e7f7..bd13a42f5ab 100644
--- a/Dependencies/Utility/Utility/thread_compat.h
+++ b/Dependencies/Utility/Utility/thread_compat.h
@@ -29,4 +29,5 @@ inline int GetCurrentThreadId()
 inline void Sleep(int ms)
 {
   usleep(ms * 1000);
-}
\ No newline at end of file
+}
+
diff --git a/Dependencies/Utility/Utility/time_compat.h b/Dependencies/Utility/Utility/time_compat.h
index 1dd9582079a..82449ee9aef 100644
--- a/Dependencies/Utility/Utility/time_compat.h
+++ b/Dependencies/Utility/Utility/time_compat.h
@@ -37,4 +37,5 @@ inline unsigned int GetTickCount()
   clock_gettime(CLOCK_MONOTONIC, &ts);
   // Return ms since boot
   return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
-}
\ No newline at end of file
+}
+
diff --git a/Dependencies/Utility/Utility/wchar_compat.h b/Dependencies/Utility/Utility/wchar_compat.h
index e43fa7a7033..a6761905a71 100644
--- a/Dependencies/Utility/Utility/wchar_compat.h
+++ b/Dependencies/Utility/Utility/wchar_compat.h
@@ -30,4 +30,5 @@ typedef WCHAR* LPWSTR;
 // MultiByteToWideChar
 #define CP_ACP 0
 #define MultiByteToWideChar(cp, flags, mbstr, cb, wcstr, cch) mbstowcs(wcstr, mbstr, cch)
-#define WideCharToMultiByte(cp, flags, wcstr, cch, mbstr, cb, defchar, used) wcstombs(mbstr, wcstr, cb)
\ No newline at end of file
+#define WideCharToMultiByte(cp, flags, wcstr, cch, mbstr, cb, defchar, used) wcstombs(mbstr, wcstr, cb)
+
diff --git a/Generals/CMakeLists.txt b/Generals/CMakeLists.txt
index 7953714f5a9..78f920244e6 100644
--- a/Generals/CMakeLists.txt
+++ b/Generals/CMakeLists.txt
@@ -15,23 +15,31 @@ add_subdirectory(Code)
 
 # If we are building on windows for windows, try and get the game install path from the registry.
 if("${CMAKE_HOST_SYSTEM}" MATCHES "Windows" AND "${CMAKE_SYSTEM}" MATCHES "Windows")
-    # Check the CD registry path
-    if(NOT RTS_INSTALL_PREFIX_GENERALS)
-        get_filename_component(RTS_INSTALL_PREFIX_GENERALS  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Electronic Arts\\EA Games\\Generals;InstallPath]" ABSOLUTE CACHE)
-    endif()
+    include(${CMAKE_SOURCE_DIR}/cmake/registry.cmake)
+
+    # Check the EA App/CD registry path
+    fetch_registry_value(
+        "HKEY_LOCAL_MACHINE/SOFTWARE/Electronic Arts/EA Games/Generals"
+        "InstallPath"
+        RTS_INSTALL_PREFIX_GENERALS
+        "Generals install path from registry")
 
     # Check the "First Decade" registry path
-    if(NOT RTS_INSTALL_PREFIX_GENERALS OR "${RTS_INSTALL_PREFIX_GENERALS}" STREQUAL "/registry")
-        get_filename_component(RTS_INSTALL_PREFIX_GENERALS  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer The First Decade;gr_folder]" ABSOLUTE CACHE)
-    endif()
+    fetch_registry_value(
+        "HKEY_LOCAL_MACHINE/SOFTWARE/Electronic Arts/EA Games/Command and Conquer The First Decade"
+        "gr_folder"
+        RTS_INSTALL_PREFIX_GENERALS
+        "Generals install path from registry")
 
     # Check the Steam registry path
-    if(NOT RTS_INSTALL_PREFIX_GENERALS OR "${RTS_INSTALL_PREFIX_GENERALS}" STREQUAL "/registry")
-        get_filename_component(RTS_INSTALL_PREFIX_GENERALS  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Electronic Arts\\EA Games\\Generals;installPath]" ABSOLUTE CACHE)
-    endif()
+    fetch_registry_value(
+        "HKEY_LOCAL_MACHINE/SOFTWARE/Electronic Arts/EA Games/Generals"
+        "installPath"
+        RTS_INSTALL_PREFIX_GENERALS
+        "Generals install path from registry")
 endif()
 
-if(RTS_INSTALL_PREFIX_GENERALS AND NOT "${RTS_INSTALL_PREFIX_GENERALS}" STREQUAL "/registry")
+if(RTS_INSTALL_PREFIX_GENERALS)
     install(TARGETS g_generals RUNTIME DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}")
     install(FILES $<TARGET_PDB_FILE:g_generals> DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}" OPTIONAL)
 
@@ -69,4 +77,8 @@ if(RTS_INSTALL_PREFIX_GENERALS AND NOT "${RTS_INSTALL_PREFIX_GENERALS}" STREQUAL
         install(TARGETS g_w3dview RUNTIME DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}")
         install(FILES $<TARGET_PDB_FILE:g_w3dview> DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}" OPTIONAL)
     endif()
+else()
+    message(STATUS "Generals install path not found. Registry keys for 'Generals' not found. "
+                   "Generals targets will be built, but not installed. "
+                   "You can specify the path manually by setting RTS_INSTALL_PREFIX_GENERALS.")
 endif()
diff --git a/Generals/Code/CMakeLists.txt b/Generals/Code/CMakeLists.txt
index 838818eff2f..33576cba689 100644
--- a/Generals/Code/CMakeLists.txt
+++ b/Generals/Code/CMakeLists.txt
@@ -1,23 +1,14 @@
 # g stands for Generals, i stands for Interface
-add_library(gi_gameengine INTERFACE)
 add_library(gi_gameengine_include INTERFACE)
-add_library(gi_gameenginedevice_include INTERFACE)
 add_library(gi_libraries_include INTERFACE)
 add_library(gi_libraries_source_wwvegas INTERFACE)
-add_library(gi_libraries_source_wwvegas_ww3d2 INTERFACE)
-add_library(gi_libraries_source_wwvegas_wwmath INTERFACE)
-add_library(gi_libraries_source_wwvegas_wwsaveload INTERFACE)
 add_library(gi_main INTERFACE)
 add_library(gi_always INTERFACE)
 
-target_include_directories(gi_gameengine INTERFACE "GameEngine")
 target_include_directories(gi_gameengine_include INTERFACE "GameEngine/Include")
-target_include_directories(gi_gameenginedevice_include INTERFACE "GameEngineDevice/Source")
+target_link_libraries(gi_gameengine_include INTERFACE corei_gameengine_include)
 target_include_directories(gi_libraries_include INTERFACE "Libraries/Include")
 target_include_directories(gi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
-target_include_directories(gi_libraries_source_wwvegas_ww3d2 INTERFACE "Libraries/Source/WWVegas/WW3D2")
-target_include_directories(gi_libraries_source_wwvegas_wwmath INTERFACE "Libraries/Source/WWVegas/WWMath")
-target_include_directories(gi_libraries_source_wwvegas_wwsaveload INTERFACE "Libraries/Source/WWVegas/WWSaveLoad")
 target_include_directories(gi_main INTERFACE "Main")
 
 target_compile_definitions(gi_always INTERFACE
diff --git a/Generals/Code/GameEngine/CMakeLists.txt b/Generals/Code/GameEngine/CMakeLists.txt
index f1fe224b5b2..9553884b67f 100644
--- a/Generals/Code/GameEngine/CMakeLists.txt
+++ b/Generals/Code/GameEngine/CMakeLists.txt
@@ -1,15 +1,15 @@
 set(GAMEENGINE_SRC
     Include/Common/ActionManager.h
-    Include/Common/ArchiveFile.h
-    Include/Common/ArchiveFileSystem.h
-    Include/Common/AsciiString.h
-    Include/Common/AudioAffect.h
-    Include/Common/AudioEventInfo.h
-    Include/Common/AudioEventRTS.h
-    Include/Common/AudioHandleSpecialValues.h
-    Include/Common/AudioRandomValue.h
-    Include/Common/AudioRequest.h
-    Include/Common/AudioSettings.h
+#    Include/Common/ArchiveFile.h
+#    Include/Common/ArchiveFileSystem.h
+#    Include/Common/AsciiString.h
+#    Include/Common/AudioAffect.h
+#    Include/Common/AudioEventInfo.h
+#    Include/Common/AudioEventRTS.h
+#    Include/Common/AudioHandleSpecialValues.h
+#    Include/Common/AudioRandomValue.h
+#    Include/Common/AudioRequest.h
+#    Include/Common/AudioSettings.h
     Include/Common/BattleHonors.h
     Include/Common/BezFwdIterator.h
     Include/Common/BezierSegment.h
@@ -19,13 +19,13 @@ set(GAMEENGINE_SRC
     Include/Common/CDManager.h
     Include/Common/ClientUpdateModule.h
     Include/Common/CommandLine.h
-    Include/Common/crc.h
-    Include/Common/CRCDebug.h
+#    Include/Common/crc.h
+#    Include/Common/CRCDebug.h
     Include/Common/CriticalSection.h
     Include/Common/CustomMatchPreferences.h
     Include/Common/DamageFX.h
     Include/Common/DataChunk.h
-    Include/Common/Debug.h
+#    Include/Common/Debug.h
     Include/Common/Dict.h
     Include/Common/Directory.h
     Include/Common/DisabledTypes.h
@@ -34,17 +34,17 @@ set(GAMEENGINE_SRC
     Include/Common/encrypt.h
     Include/Common/Energy.h
     Include/Common/Errors.h
-    Include/Common/file.h
-    Include/Common/FileSystem.h
+#    Include/Common/file.h
+#    Include/Common/FileSystem.h
     Include/Common/FunctionLexicon.h
-    Include/Common/GameAudio.h
+#    Include/Common/GameAudio.h
     Include/Common/GameCommon.h
 #    Include/Common/GameDefines.h
     Include/Common/GameEngine.h
     Include/Common/GameLOD.h
-    Include/Common/GameMemory.h
-    Include/Common/GameMusic.h
-    Include/Common/GameSounds.h
+#    Include/Common/GameMemory.h
+#    Include/Common/GameMusic.h
+#    Include/Common/GameSounds.h
     Include/Common/GameSpyMiscPreferences.h
     Include/Common/GameState.h
     Include/Common/GameStateMap.h
@@ -60,13 +60,13 @@ set(GAMEENGINE_SRC
     Include/Common/Language.h
     Include/Common/LatchRestore.h
     Include/Common/List.h
-    Include/Common/LocalFile.h
-    Include/Common/LocalFileSystem.h
-    Include/Common/MapObject.h
+#    Include/Common/LocalFile.h
+#    Include/Common/LocalFileSystem.h
+#    Include/Common/MapObject.h
     Include/Common/MapReaderWriterInfo.h
     Include/Common/MessageStream.h
     Include/Common/MiniLog.h
-    Include/Common/MiscAudio.h
+#    Include/Common/MiscAudio.h
     Include/Common/MissionStats.h
     Include/Common/ModelState.h
     Include/Common/Module.h
@@ -74,7 +74,7 @@ set(GAMEENGINE_SRC
     Include/Common/Money.h
     Include/Common/MultiplayerSettings.h
     Include/Common/NameKeyGenerator.h
-    Include/Common/ObjectStatusTypes.h
+#    Include/Common/ObjectStatusTypes.h
     Include/Common/OSDisplay.h
     Include/Common/Overridable.h
     Include/Common/Override.h
@@ -87,10 +87,11 @@ set(GAMEENGINE_SRC
     Include/Common/ProductionPrerequisite.h
     Include/Common/QuickmatchPreferences.h
     Include/Common/QuotedPrintable.h
-    Include/Common/Radar.h
-    Include/Common/RAMFile.h
-    Include/Common/RandomValue.h
+#    Include/Common/Radar.h
+#    Include/Common/RAMFile.h
+#    Include/Common/RandomValue.h
     Include/Common/Recorder.h
+#    Include/Common/ReplaySimulation.h
     Include/Common/Registry.h
     Include/Common/ResourceGatheringManager.h
     Include/Common/Science.h
@@ -106,7 +107,7 @@ set(GAMEENGINE_SRC
     Include/Common/StateMachine.h
     Include/Common/StatsCollector.h
     Include/Common/STLTypedefs.h
-    Include/Common/StreamingArchiveFile.h
+#    Include/Common/StreamingArchiveFile.h
     Include/Common/SubsystemInterface.h
     Include/Common/SystemInfo.h
     Include/Common/Team.h
@@ -117,12 +118,13 @@ set(GAMEENGINE_SRC
     Include/Common/ThingSort.h
     Include/Common/ThingTemplate.h
     Include/Common/TunnelTracker.h
-    Include/Common/UnicodeString.h
+#    Include/Common/UnicodeString.h
     Include/Common/UnitTimings.h
     Include/Common/Upgrade.h
     Include/Common/UserPreferences.h
     Include/Common/version.h
     Include/Common/WellKnownKeys.h
+#    Include/Common/WorkerProcess.h
 #    Include/Common/Xfer.h
 #    Include/Common/XferCRC.h
 #    Include/Common/XferDeepCRC.h
@@ -133,7 +135,7 @@ set(GAMEENGINE_SRC
     Include/GameClient/CampaignManager.h
     Include/GameClient/CDCheck.h
     Include/GameClient/ClientInstance.h
-    Include/GameClient/ClientRandomValue.h
+#    Include/GameClient/ClientRandomValue.h
     Include/GameClient/Color.h
     Include/GameClient/CommandXlat.h
     Include/GameClient/ControlBar.h
@@ -190,7 +192,7 @@ set(GAMEENGINE_SRC
     Include/GameClient/Line2D.h
     Include/GameClient/LoadScreen.h
     Include/GameClient/LookAtXlat.h
-    Include/GameClient/MapUtil.h
+#    Include/GameClient/MapUtil.h
     Include/GameClient/MessageBox.h
     Include/GameClient/MetaEvent.h
     Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
@@ -209,13 +211,13 @@ set(GAMEENGINE_SRC
     Include/GameClient/ShellHooks.h
     Include/GameClient/ShellMenuScheme.h
     Include/GameClient/Statistics.h
-    Include/GameClient/TerrainRoads.h
-    Include/GameClient/TerrainVisual.h
-    Include/GameClient/VideoPlayer.h
-    Include/GameClient/View.h
-    Include/GameClient/Water.h
+#    Include/GameClient/TerrainRoads.h
+#    Include/GameClient/TerrainVisual.h
+#    Include/GameClient/VideoPlayer.h
+#    Include/GameClient/View.h
+#    Include/GameClient/Water.h
     Include/GameClient/WindowLayout.h
-    Include/GameClient/WindowVideoManager.h
+#    Include/GameClient/WindowVideoManager.h
     Include/GameClient/WindowXlat.h
     Include/GameClient/WinInstanceData.h
     Include/GameLogic/AI.h
@@ -238,7 +240,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/GhostObject.h
     Include/GameLogic/Locomotor.h
     Include/GameLogic/LocomotorSet.h
-    Include/GameLogic/LogicRandomValue.h
+#    Include/GameLogic/LogicRandomValue.h
     Include/GameLogic/Module/ActiveBody.h
     Include/GameLogic/Module/ActiveShroudUpgrade.h
     Include/GameLogic/Module/AIUpdate.h
@@ -455,72 +457,74 @@ set(GAMEENGINE_SRC
     Include/GameLogic/WeaponSetFlags.h
     Include/GameLogic/WeaponSetType.h
     Include/GameLogic/WeaponStatus.h
-    Include/GameNetwork/Connection.h
-    Include/GameNetwork/ConnectionManager.h
-    Include/GameNetwork/DisconnectManager.h
-    Include/GameNetwork/DownloadManager.h
-    Include/GameNetwork/FileTransfer.h
-    Include/GameNetwork/FirewallHelper.h
-    Include/GameNetwork/FrameData.h
-    Include/GameNetwork/FrameDataManager.h
-    Include/GameNetwork/FrameMetrics.h
-    Include/GameNetwork/GameInfo.h
-    Include/GameNetwork/GameMessageParser.h
+#    Include/GameNetwork/Connection.h
+#    Include/GameNetwork/ConnectionManager.h
+#    Include/GameNetwork/DisconnectManager.h
+#    Include/GameNetwork/DownloadManager.h
+#    Include/GameNetwork/FileTransfer.h
+#    Include/GameNetwork/FirewallHelper.h
+#    Include/GameNetwork/FrameData.h
+#    Include/GameNetwork/FrameDataManager.h
+#    Include/GameNetwork/FrameMetrics.h
+#    Include/GameNetwork/GameInfo.h
+#    Include/GameNetwork/GameMessageParser.h
     Include/GameNetwork/GameSpy.h
-    Include/GameNetwork/GameSpy/BuddyDefs.h
-    Include/GameNetwork/GameSpy/BuddyThread.h
-    Include/GameNetwork/GameSpy/GameResultsThread.h
-    Include/GameNetwork/GameSpy/GSConfig.h
-    Include/GameNetwork/GameSpy/LadderDefs.h
-    Include/GameNetwork/GameSpy/LobbyUtils.h
-    Include/GameNetwork/GameSpy/MainMenuUtils.h
-    Include/GameNetwork/GameSpy/PeerDefs.h
-    Include/GameNetwork/GameSpy/PeerDefsImplementation.h
-    Include/GameNetwork/GameSpy/PeerThread.h
-    Include/GameNetwork/GameSpy/PersistentStorageDefs.h
-    Include/GameNetwork/GameSpy/PersistentStorageThread.h
-    Include/GameNetwork/GameSpy/PingThread.h
-    Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
-    Include/GameNetwork/GameSpy/ThreadUtils.h
+#    Include/GameNetwork/GameSpy/BuddyDefs.h
+#    Include/GameNetwork/GameSpy/BuddyThread.h
+#    Include/GameNetwork/GameSpy/GameResultsThread.h
+#    Include/GameNetwork/GameSpy/GSConfig.h
+#    Include/GameNetwork/GameSpy/LadderDefs.h
+#    Include/GameNetwork/GameSpy/LobbyUtils.h
+#    Include/GameNetwork/GameSpy/MainMenuUtils.h
+#    Include/GameNetwork/GameSpy/PeerDefs.h
+#    Include/GameNetwork/GameSpy/PeerDefsImplementation.h
+#    Include/GameNetwork/GameSpy/PeerThread.h
+#    Include/GameNetwork/GameSpy/PersistentStorageDefs.h
+#    Include/GameNetwork/GameSpy/PersistentStorageThread.h
+#    Include/GameNetwork/GameSpy/PingThread.h
+#    Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
+#    Include/GameNetwork/GameSpy/ThreadUtils.h
     Include/GameNetwork/GameSpyChat.h
     Include/GameNetwork/GameSpyGameInfo.h
     Include/GameNetwork/GameSpyGP.h
-    Include/GameNetwork/GameSpyOverlay.h
+#    Include/GameNetwork/GameSpyOverlay.h
     Include/GameNetwork/GameSpyPersistentStorage.h
-    Include/GameNetwork/GameSpyThread.h
+#    Include/GameNetwork/GameSpyThread.h
     Include/GameNetwork/GUIUtil.h
-    Include/GameNetwork/IPEnumeration.h
-    Include/GameNetwork/LANAPI.h
-    Include/GameNetwork/LANAPICallbacks.h
-    Include/GameNetwork/LANGameInfo.h
-    Include/GameNetwork/LANPlayer.h
-    Include/GameNetwork/NAT.h
-    Include/GameNetwork/NetCommandList.h
-    Include/GameNetwork/NetCommandMsg.h
-    Include/GameNetwork/NetCommandRef.h
-    Include/GameNetwork/NetCommandWrapperList.h
-    Include/GameNetwork/NetPacket.h
-    Include/GameNetwork/NetworkDefs.h
-    Include/GameNetwork/NetworkInterface.h
-    Include/GameNetwork/networkutil.h
-    Include/GameNetwork/RankPointValue.h
-    Include/GameNetwork/Transport.h
-    Include/GameNetwork/udp.h
-    Include/GameNetwork/User.h
-    Include/GameNetwork/WOLBrowser/FEBDispatch.h
-    Include/GameNetwork/WOLBrowser/WebBrowser.h
+#    Include/GameNetwork/IPEnumeration.h
+#    Include/GameNetwork/LANAPI.h
+#    Include/GameNetwork/LANAPICallbacks.h
+#    Include/GameNetwork/LANGameInfo.h
+#    Include/GameNetwork/LANPlayer.h
+#    Include/GameNetwork/NAT.h
+#    Include/GameNetwork/NetCommandList.h
+#    Include/GameNetwork/NetCommandMsg.h
+#    Include/GameNetwork/NetCommandRef.h
+#    Include/GameNetwork/NetCommandWrapperList.h
+#    Include/GameNetwork/NetPacket.h
+#    Include/GameNetwork/NetworkDefs.h
+#    Include/GameNetwork/NetworkInterface.h
+#    Include/GameNetwork/networkutil.h
+#    Include/GameNetwork/RankPointValue.h
+#    Include/GameNetwork/Transport.h
+#    Include/GameNetwork/udp.h
+#    Include/GameNetwork/User.h
+#    Include/GameNetwork/WOLBrowser/FEBDispatch.h
+#    Include/GameNetwork/WOLBrowser/WebBrowser.h
     Include/Precompiled/PreRTS.h
-    Source/Common/Audio/AudioEventRTS.cpp
-    Source/Common/Audio/AudioRequest.cpp
-    Source/Common/Audio/GameAudio.cpp
-    Source/Common/Audio/GameMusic.cpp
-    Source/Common/Audio/GameSounds.cpp
+#    Source/Common/Audio/AudioEventRTS.cpp
+#    Source/Common/Audio/AudioRequest.cpp
+#    Source/Common/Audio/GameAudio.cpp
+#    Source/Common/Audio/GameMusic.cpp
+#    Source/Common/Audio/GameSounds.cpp
+    #Source/Common/Audio/simpleplayer.cpp # unused
+    #Source/Common/Audio/urllaunch.cpp # unused
     Source/Common/Bezier/BezFwdIterator.cpp
     Source/Common/Bezier/BezierSegment.cpp
     Source/Common/BitFlags.cpp
     Source/Common/CommandLine.cpp
-    Source/Common/crc.cpp
-    Source/Common/CRCDebug.cpp
+#    Source/Common/crc.cpp
+#    Source/Common/CRCDebug.cpp
     Source/Common/DamageFX.cpp
     Source/Common/Dict.cpp
     Source/Common/DiscreteCircle.cpp
@@ -531,7 +535,7 @@ set(GAMEENGINE_SRC
     Source/Common/INI/INI.cpp
     Source/Common/INI/INIAiData.cpp
     Source/Common/INI/INIAnimation.cpp
-    Source/Common/INI/INIAudioEventInfo.cpp
+#    Source/Common/INI/INIAudioEventInfo.cpp
     Source/Common/INI/INICommandButton.cpp
     Source/Common/INI/INICommandSet.cpp
     Source/Common/INI/INIControlBarScheme.cpp
@@ -542,7 +546,7 @@ set(GAMEENGINE_SRC
     Source/Common/INI/INIMapCache.cpp
     Source/Common/INI/INIMapData.cpp
     Source/Common/INI/INIMappedImage.cpp
-    Source/Common/INI/INIMiscAudio.cpp
+#    Source/Common/INI/INIMiscAudio.cpp
     Source/Common/INI/INIModel.cpp
     Source/Common/INI/INIMultiplayer.cpp
     Source/Common/INI/INIObject.cpp
@@ -552,7 +556,7 @@ set(GAMEENGINE_SRC
     Source/Common/INI/INITerrainBridge.cpp
     Source/Common/INI/INITerrainRoad.cpp
     Source/Common/INI/INIUpgrade.cpp
-    Source/Common/INI/INIVideo.cpp
+#    Source/Common/INI/INIVideo.cpp
     Source/Common/INI/INIWater.cpp
     Source/Common/INI/INIWeapon.cpp
     Source/Common/INI/INIWebpageURL.cpp
@@ -563,7 +567,7 @@ set(GAMEENGINE_SRC
     Source/Common/NameKeyGenerator.cpp
     Source/Common/PartitionSolver.cpp
     Source/Common/PerfTimer.cpp
-    Source/Common/RandomValue.cpp
+#    Source/Common/RandomValue.cpp
     Source/Common/Recorder.cpp
     Source/Common/RTS/ActionManager.cpp
     Source/Common/RTS/Energy.cpp
@@ -583,19 +587,19 @@ set(GAMEENGINE_SRC
     Source/Common/SkirmishBattleHonors.cpp
     Source/Common/StateMachine.cpp
     Source/Common/StatsCollector.cpp
-    Source/Common/System/ArchiveFile.cpp
-    Source/Common/System/ArchiveFileSystem.cpp
-    Source/Common/System/AsciiString.cpp
+#    Source/Common/System/ArchiveFile.cpp
+#    Source/Common/System/ArchiveFileSystem.cpp
+#    Source/Common/System/AsciiString.cpp
     Source/Common/System/BuildAssistant.cpp
     Source/Common/System/CDManager.cpp
     Source/Common/System/CriticalSection.cpp
     Source/Common/System/DataChunk.cpp
-    Source/Common/System/Debug.cpp
+#    Source/Common/System/Debug.cpp
     Source/Common/System/Directory.cpp
     Source/Common/System/DisabledTypes.cpp
     Source/Common/System/encrypt.cpp
-    Source/Common/System/File.cpp
-    Source/Common/System/FileSystem.cpp
+#    Source/Common/System/File.cpp
+#    Source/Common/System/FileSystem.cpp
     Source/Common/System/FunctionLexicon.cpp
     Source/Common/System/GameCommon.cpp
     #Source/Common/System/GameMemory.cpp
@@ -603,22 +607,22 @@ set(GAMEENGINE_SRC
     Source/Common/System/Geometry.cpp
     Source/Common/System/KindOf.cpp
     Source/Common/System/List.cpp
-    Source/Common/System/LocalFile.cpp
-    Source/Common/System/LocalFileSystem.cpp
+#    Source/Common/System/LocalFile.cpp
+#    Source/Common/System/LocalFileSystem.cpp
     #Source/Common/System/MemoryInit.cpp
-    Source/Common/System/ObjectStatusTypes.cpp
+#    Source/Common/System/ObjectStatusTypes.cpp
     Source/Common/System/QuotedPrintable.cpp
-    Source/Common/System/Radar.cpp
-    Source/Common/System/RAMFile.cpp
+#    Source/Common/System/Radar.cpp
+#    Source/Common/System/RAMFile.cpp
     Source/Common/System/registry.cpp
     Source/Common/System/SaveGame/GameState.cpp
     Source/Common/System/SaveGame/GameStateMap.cpp
     Source/Common/System/Snapshot.cpp
     Source/Common/System/StackDump.cpp
-    Source/Common/System/StreamingArchiveFile.cpp
+#    Source/Common/System/StreamingArchiveFile.cpp
     Source/Common/System/SubsystemInterface.cpp
     Source/Common/System/Trig.cpp
-    Source/Common/System/UnicodeString.cpp
+#    Source/Common/System/UnicodeString.cpp
     Source/Common/System/Upgrade.cpp
 #    Source/Common/System/Xfer.cpp
 #    Source/Common/System/XferCRC.cpp
@@ -633,6 +637,7 @@ set(GAMEENGINE_SRC
     Source/Common/Thing/ThingTemplate.cpp
     Source/Common/UserPreferences.cpp
     Source/Common/version.cpp
+#    Source/Common/WorkerProcess.cpp
     Source/GameClient/ClientInstance.cpp
     Source/GameClient/Color.cpp
     Source/GameClient/Credits.cpp
@@ -741,14 +746,14 @@ set(GAMEENGINE_SRC
     Source/GameClient/GUI/Shell/Shell.cpp
     Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
     Source/GameClient/GUI/WindowLayout.cpp
-    Source/GameClient/GUI/WindowVideoManager.cpp
+#    Source/GameClient/GUI/WindowVideoManager.cpp
     Source/GameClient/GUI/WinInstanceData.cpp
     Source/GameClient/InGameUI.cpp
     Source/GameClient/Input/Keyboard.cpp
     Source/GameClient/Input/Mouse.cpp
     Source/GameClient/LanguageFilter.cpp
     Source/GameClient/Line2D.cpp
-    Source/GameClient/MapUtil.cpp
+#    Source/GameClient/MapUtil.cpp
     Source/GameClient/MessageStream/CommandXlat.cpp
     Source/GameClient/MessageStream/GUICommandTranslator.cpp
     Source/GameClient/MessageStream/HintSpy.cpp
@@ -763,16 +768,16 @@ set(GAMEENGINE_SRC
     Source/GameClient/Statistics.cpp
     Source/GameClient/System/Anim2D.cpp
     Source/GameClient/System/CampaignManager.cpp
-    "Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp"
+#    "Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp"
     Source/GameClient/System/DebugDisplay.cpp
     Source/GameClient/System/Image.cpp
     Source/GameClient/System/ParticleSys.cpp
     Source/GameClient/System/RayEffect.cpp
-    Source/GameClient/Terrain/TerrainRoads.cpp
-    Source/GameClient/Terrain/TerrainVisual.cpp
-    Source/GameClient/VideoPlayer.cpp
-    Source/GameClient/View.cpp
-    Source/GameClient/Water.cpp
+#    Source/GameClient/Terrain/TerrainRoads.cpp
+#    Source/GameClient/Terrain/TerrainVisual.cpp
+#    Source/GameClient/VideoPlayer.cpp
+#    Source/GameClient/View.cpp
+#    Source/GameClient/Water.cpp
     Source/GameLogic/AI/AI.cpp
     Source/GameLogic/AI/AIDock.cpp
     Source/GameLogic/AI/AIGroup.cpp
@@ -1000,69 +1005,71 @@ set(GAMEENGINE_SRC
     Source/GameLogic/System/GameLogic.cpp
     Source/GameLogic/System/GameLogicDispatch.cpp
     Source/GameLogic/System/RankInfo.cpp
-    Source/GameNetwork/Connection.cpp
-    Source/GameNetwork/ConnectionManager.cpp
-    Source/GameNetwork/DisconnectManager.cpp
-    Source/GameNetwork/DownloadManager.cpp
-    Source/GameNetwork/FileTransfer.cpp
-    Source/GameNetwork/FirewallHelper.cpp
-    Source/GameNetwork/FrameData.cpp
-    Source/GameNetwork/FrameDataManager.cpp
-    Source/GameNetwork/FrameMetrics.cpp
-    Source/GameNetwork/GameInfo.cpp
-    Source/GameNetwork/GameMessageParser.cpp
+#    Source/GameNetwork/Connection.cpp
+#    Source/GameNetwork/ConnectionManager.cpp
+#    Source/GameNetwork/DisconnectManager.cpp
+#    Source/GameNetwork/DownloadManager.cpp
+#    Source/GameNetwork/FileTransfer.cpp
+#    Source/GameNetwork/FirewallHelper.cpp
+#    Source/GameNetwork/FrameData.cpp
+#    Source/GameNetwork/FrameDataManager.cpp
+#    Source/GameNetwork/FrameMetrics.cpp
+#    Source/GameNetwork/GameInfo.cpp
+#    Source/GameNetwork/GameMessageParser.cpp
     #Source/GameNetwork/GameSpy.cpp
     #Source/GameNetwork/GameSpyChat.cpp
     #Source/GameNetwork/GameSpyGameInfo.cpp
     #Source/GameNetwork/GameSpyGP.cpp
     #Source/GameNetwork/GameSpyPersistentStorage.cpp
-    Source/GameNetwork/GameSpy/Chat.cpp
-    Source/GameNetwork/GameSpy/GSConfig.cpp
-    Source/GameNetwork/GameSpy/LadderDefs.cpp
-    Source/GameNetwork/GameSpy/LobbyUtils.cpp
-    Source/GameNetwork/GameSpy/MainMenuUtils.cpp
-    Source/GameNetwork/GameSpy/PeerDefs.cpp
-    Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
-    Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
-    Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
-    Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
-    Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
-    Source/GameNetwork/GameSpy/Thread/PingThread.cpp
-    Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
-    Source/GameNetwork/GameSpyOverlay.cpp
+#    Source/GameNetwork/GameSpy/Chat.cpp
+#    Source/GameNetwork/GameSpy/GSConfig.cpp
+#    Source/GameNetwork/GameSpy/LadderDefs.cpp
+#    Source/GameNetwork/GameSpy/LobbyUtils.cpp
+#    Source/GameNetwork/GameSpy/MainMenuUtils.cpp
+#    Source/GameNetwork/GameSpy/PeerDefs.cpp
+#    Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
+#    Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
+#    Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
+#    Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
+#    Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
+#    Source/GameNetwork/GameSpy/Thread/PingThread.cpp
+#    Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
+#    Source/GameNetwork/GameSpyOverlay.cpp
     Source/GameNetwork/GUIUtil.cpp
-    Source/GameNetwork/IPEnumeration.cpp
-    Source/GameNetwork/LANAPI.cpp
-    Source/GameNetwork/LANAPICallbacks.cpp
-    Source/GameNetwork/LANAPIhandlers.cpp
-    Source/GameNetwork/LANGameInfo.cpp
-    Source/GameNetwork/NAT.cpp
-    Source/GameNetwork/NetCommandList.cpp
-    Source/GameNetwork/NetCommandMsg.cpp
-    Source/GameNetwork/NetCommandRef.cpp
-    Source/GameNetwork/NetCommandWrapperList.cpp
-    Source/GameNetwork/NetMessageStream.cpp
-    Source/GameNetwork/NetPacket.cpp
-    Source/GameNetwork/Network.cpp
-    Source/GameNetwork/NetworkUtil.cpp
-    Source/GameNetwork/Transport.cpp
-    Source/GameNetwork/udp.cpp
-    Source/GameNetwork/User.cpp
-    Source/GameNetwork/WOLBrowser/WebBrowser.cpp
+#    Source/GameNetwork/IPEnumeration.cpp
+#    Source/GameNetwork/LANAPI.cpp
+#    Source/GameNetwork/LANAPICallbacks.cpp
+#    Source/GameNetwork/LANAPIhandlers.cpp
+#    Source/GameNetwork/LANGameInfo.cpp
+#    Source/GameNetwork/NAT.cpp
+#    Source/GameNetwork/NetCommandList.cpp
+#    Source/GameNetwork/NetCommandMsg.cpp
+#    Source/GameNetwork/NetCommandRef.cpp
+#    Source/GameNetwork/NetCommandWrapperList.cpp
+#    Source/GameNetwork/NetMessageStream.cpp
+#    Source/GameNetwork/NetPacket.cpp
+#    Source/GameNetwork/Network.cpp
+#    Source/GameNetwork/NetworkUtil.cpp
+#    Source/GameNetwork/Transport.cpp
+#    Source/GameNetwork/udp.cpp
+#    Source/GameNetwork/User.cpp
+#    Source/GameNetwork/WOLBrowser/WebBrowser.cpp
     Source/Precompiled/PreRTS.cpp
 )
 
 if(RTS_GAMEMEMORY_ENABLE)
     # Uses the original Game Memory implementation.
     list(APPEND GAMEENGINE_SRC
-        Source/Common/System/GameMemory.cpp
-        Source/Common/System/MemoryInit.cpp
+#        Source/Common/System/GameMemory.cpp
+#        Source/Common/System/GameMemoryInitDMA_Generals.inl
+#        Source/Common/System/GameMemoryInitPools_Generals.inl
+#        Source/Common/System/MemoryInit.cpp
     )
 else()
     # Uses the null implementation when disabled.
     list(APPEND GAMEENGINE_SRC
-        Source/Common/System/GameMemoryNull.cpp
-        Include/Common/GameMemoryNull.h
+#        Source/Common/System/GameMemoryNull.cpp
+#        Include/Common/GameMemoryNull.h
     )
 endif()
 
diff --git a/Generals/Code/GameEngine/Include/Common/ActionManager.h b/Generals/Code/GameEngine/Include/Common/ActionManager.h
index bf7ca2be788..54e982788e0 100644
--- a/Generals/Code/GameEngine/Include/Common/ActionManager.h
+++ b/Generals/Code/GameEngine/Include/Common/ActionManager.h
@@ -24,19 +24,16 @@
 
 // FILE: ActionManager.h //////////////////////////////////////////////////////////////////////////
 // Author: Colin Day
-// Desc:   TheActionManager is a convenient place for us to wrap up all sorts of logical 
+// Desc:   TheActionManager is a convenient place for us to wrap up all sorts of logical
 //				 queries about what objects can do in the world and to other objects.  The purpose
 //				 of having a central place for this logic assists us in making these logical kind
 //				 of queries in the user interface and allows us to use the same code to validate
-//				 commands as they come in over the network interface in order to do the 
+//				 commands as they come in over the network interface in order to do the
 //				 real action.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __ACTIONMANAGER_H_
-#define __ACTIONMANAGER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/SubsystemInterface.h"
 
@@ -110,5 +107,3 @@ class ActionManager : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern ActionManager *TheActionManager;
-
-#endif  // end __ACTIONMANAGER_H_
diff --git a/Generals/Code/GameEngine/Include/Common/ArchiveFile.h b/Generals/Code/GameEngine/Include/Common/ArchiveFile.h
deleted file mode 100644
index 6838938d791..00000000000
--- a/Generals/Code/GameEngine/Include/Common/ArchiveFile.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/////// ArchiveFile.h ////////////////////
-// Bryan Cleveland, August 2002
-//////////////////////////////////////////
-
-#pragma once
-
-#ifndef __ARCHIVEFILE_H
-#define __ARCHIVEFILE_H
-
-#include "Lib/BaseType.h"
-#include "Common/AsciiString.h"
-#include "Common/ArchiveFileSystem.h"
-
-class File;
-
-/**
-  *	An archive file is itself a collection of sub files. Each file inside the archive file
-	* has a unique name by which it can be accessed. The ArchiveFile object class is the
-	* runtime interface to the mix file and the sub files. Each file inside the mix 
-	* file can be accessed by the openFile().
-	*
-	* ArchiveFile interfaces can be created by the TheArchiveFileSystem object.
-	*/
-//===============================
-
-class ArchiveFile
-{
-public:
-	ArchiveFile();
-	virtual ~ArchiveFile();
-
-	virtual Bool					getFileInfo( const AsciiString& filename, FileInfo *fileInfo) const = 0;	///< fill in the fileInfo struct with info about the file requested.
-	virtual File*					openFile( const Char *filename, Int access = 0) = 0;	///< Open the specified file within the archive file
-	virtual void					closeAllFiles( void ) = 0;									///< Close all file opened in this archive file
-	virtual AsciiString		getName( void ) = 0;												///< Returns the name of the archive file
-	virtual AsciiString		getPath( void ) = 0;												///< Returns full path and name of archive file
-	virtual void					setSearchPriority( Int new_priority ) = 0;	///< Set this archive file's search priority
-	virtual void					close( void ) = 0;													///< Close this archive file
-	void									attachFile(File *file);
-
-	void									getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
-	void									getFileListInDirectory(const DetailedArchivedDirectoryInfo *dirInfo, const AsciiString& currentDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
-
-	void									addFile(const AsciiString& path, const ArchivedFileInfo *fileInfo); ///< add this file to our directory tree.
-
-protected:
-	const ArchivedFileInfo *		getArchivedFileInfo(const AsciiString& filename) const;	///< return the ArchivedFileInfo from the directory tree.
-
-	File *m_file; ///< file pointer to the archive file on disk.  Kept open so we don't have to continuously open and close the file all the time.
-	DetailedArchivedDirectoryInfo m_rootDirectory;
-};
-
-#endif // __ARCHIVEFILE_H
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/Common/ArchiveFileSystem.h b/Generals/Code/GameEngine/Include/Common/ArchiveFileSystem.h
deleted file mode 100644
index b1f75e7411e..00000000000
--- a/Generals/Code/GameEngine/Include/Common/ArchiveFileSystem.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    Generals
-//
-// Module:     Archive files
-//
-// File name:  Common/ArchiveFileSystem.h
-//
-// Created:    11/26/01 TR
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __ARCHIVEFILESYSTEM_H_
-#define __ARCHIVEFILESYSTEM_H_
-
-#define MUSIC_BIG "Music.big"
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/SubsystemInterface.h"
-#include "Common/AsciiString.h"
-#include "Common/FileSystem.h" // for typedefs, etc.
-#include "Common/STLTypedefs.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-class File;
-class ArchiveFile;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-
-//===============================
-// ArchiveFileSystem
-//===============================
-/**
-  *	Creates and manages ArchiveFile interfaces. ArchiveFiles can be accessed
-	* by calling the openArchiveFile() member. ArchiveFiles can be accessed by
-	* name or by File interface.
-	*
-	* openFile() member searches all Archive files for the specified sub file.
-	*/
-//===============================
-class ArchivedDirectoryInfo;
-class DetailedArchivedDirectoryInfo;
-class ArchivedFileInfo;
-
-typedef std::map<AsciiString, DetailedArchivedDirectoryInfo> DetailedArchivedDirectoryInfoMap;
-typedef std::map<AsciiString, ArchivedDirectoryInfo> ArchivedDirectoryInfoMap;
-typedef std::map<AsciiString, ArchivedFileInfo> ArchivedFileInfoMap;
-typedef std::map<AsciiString, ArchiveFile *> ArchiveFileMap;
-typedef std::map<AsciiString, AsciiString> ArchivedFileLocationMap; // first string is the file name, second one is the archive filename.
-
-class ArchivedDirectoryInfo 
-{
-public:
-	AsciiString								m_directoryName;
-	ArchivedDirectoryInfoMap	m_directories;
-	ArchivedFileLocationMap		m_files;
-
-	void clear()
-	{
-		m_directoryName.clear();
-		m_directories.clear();
-		m_files.clear();
-	}
-
-};
-
-class DetailedArchivedDirectoryInfo 
-{
-public:
-	AsciiString												m_directoryName;
-	DetailedArchivedDirectoryInfoMap	m_directories;
-	ArchivedFileInfoMap								m_files;
-
-	void clear()
-	{
-		m_directoryName.clear();
-		m_directories.clear();
-		m_files.clear();
-	}
-};
-
-class ArchivedFileInfo 
-{
-public:
-	AsciiString m_filename;
-	AsciiString m_archiveFilename;
-	UnsignedInt m_offset;
-	UnsignedInt m_size;
-
-	ArchivedFileInfo()
-	{
-		clear();
-	}
-
-	void clear()
-	{
-		m_filename.clear();
-		m_archiveFilename.clear();
-		m_offset = 0;
-		m_size = 0;
-	}
-};
-
-
-class ArchiveFileSystem : public SubsystemInterface
-{
-	public:
-	ArchiveFileSystem();
-	virtual ~ArchiveFileSystem();
-
-	virtual void init( void ) = 0;
-	virtual void update( void ) = 0;
-	virtual void reset( void ) = 0;
-	virtual void postProcessLoad( void ) = 0;
-
-	// ArchiveFile operations
-	virtual ArchiveFile*	openArchiveFile( const Char *filename ) = 0;		///< Create new or return existing Archive file from file name
-	virtual void					closeArchiveFile( const Char *filename ) = 0;		///< Close the one specified big file.
-	virtual void					closeAllArchiveFiles( void ) = 0;								///< Close all Archivefiles currently open
-
-	// File operations
-	virtual File*					openFile( const Char *filename, Int access = 0);	///< Search Archive files for specified file name and open it if found
-	virtual void					closeAllFiles( void ) = 0;									///< Close all files associated with ArchiveFiles
-	virtual Bool					doesFileExist(const Char *filename) const;		///< return true if that file exists in an archive file somewhere.
-
-	void					getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.  Scans each Archive file.
-	Bool					getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const; ///< see FileSystem.h
-	
-	virtual Bool	loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) = 0;
-
-	// Unprotected this for copy-protection routines
-	AsciiString						getArchiveFilenameForFile(const AsciiString& filename) const;
-	void loadMods( void );
-
-protected:
-	virtual void					loadIntoDirectoryTree(const ArchiveFile *archiveFile, const AsciiString& archiveFilename, Bool overwrite = FALSE );	///< load the archive file's header information and apply it to the global archive directory tree.
-
-	ArchiveFileMap m_archiveFileMap;
-	ArchivedDirectoryInfo m_rootDirectory;
-};
-
-
-extern ArchiveFileSystem *TheArchiveFileSystem;
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-#endif // __ARCHIVEFILESYSTEM_H_
diff --git a/Generals/Code/GameEngine/Include/Common/AsciiString.h b/Generals/Code/GameEngine/Include/Common/AsciiString.h
deleted file mode 100644
index fcfb049f528..00000000000
--- a/Generals/Code/GameEngine/Include/Common/AsciiString.h
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: AsciiString.h 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  AsciiString.h
-//
-// Created:    Steven Johnson, October 2001
-//
-// Desc:       General-purpose string classes
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef ASCIISTRING_H
-#define ASCIISTRING_H
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include "Lib/BaseType.h"
-#include "Common/Debug.h"
-#include "Common/Errors.h"
-
-class UnicodeString;
-
-// -----------------------------------------------------
-/**
-	AsciiString is the fundamental single-byte string type used in the Generals
-	code base, and should be preferred over all other string constructions
-	(e.g., array of char, STL string<>, WWVegas StringClass, etc.)
-
-	Of course, other string setups may be used when necessary or appropriate!
-
-	AsciiString is modeled after the MFC CString class, with some minor
-	syntactic differences to keep in line with our coding conventions.
-
-	Basically, AsciiString allows you to treat a string as an intrinsic
-	type, rather analogous to 'int' -- when passed by value, a new string
-	is created, and modifying the new string doesn't modify the original.
-	This is done fairly efficiently, so that no new memory allocation is done
-	unless the string is actually modified. 
-
-	Naturally, AsciiString handles all memory issues, so there's no need
-	to do anything to free memory... just allow the AsciiString's
-	destructor to run.
-
-	AsciiStrings are suitable for use as automatic, member, or static variables.
-*/
-
-class AsciiString
-{
-private:
-	
-	// Note, this is a Plain Old Data Structure... don't
-	// add a ctor/dtor, 'cuz they won't ever be called.
-	struct AsciiStringData
-	{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		const char* m_debugptr;	// just makes it easier to read in the debugger
-#endif
-		unsigned short	m_refCount;						// reference count
-		unsigned short	m_numCharsAllocated;  // length of data allocated
-		// char m_stringdata[];
-
-		inline char* peek() { return (char*)(this+1); }
-	};
-
-	#ifdef RTS_DEBUG
-	void validate() const;
-	#else
-	inline void validate() const { }
-	#endif
-
-protected:
-	AsciiStringData* m_data;   // pointer to ref counted string data
-
-	char* peek() const;
-	void releaseBuffer();
-	void ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData, const char* strToCpy, const char* strToCat);
-
-public:
-
-	enum 
-	{ 
-		MAX_FORMAT_BUF_LEN = 2048,		///< max total len of string created by format/format_va
-		MAX_LEN = 32767							///< max total len of any AsciiString, in chars
-	};
-
-
-	/**
-		This is a convenient global used to indicate the empty
-		string, so we don't need to construct temporaries
-		for such a common thing.
-	*/
-	static AsciiString TheEmptyString;
-
-	/**
-		Default constructor -- construct a new, empty AsciiString.
-	*/
-	AsciiString();
-	/**
-		Copy constructor -- make this AsciiString identical to the
-		other AsciiString. (This is actually quite efficient, because
-		they will simply share the same string and increment the
-		refcount.)
-	*/
-	AsciiString(const AsciiString& stringSrc);
-	/**
-		Constructor -- from a literal string. Constructs an AsciiString
-		with the given string. Note that a copy of the string is made;
-		the input ptr is not saved. 
-		Note that this is no longer explicit, as the conversion is almost
-		always wanted, anyhow.
-	*/
-	AsciiString(const char* s);
-
-	/**
-		Destructor. Not too exciting... clean up the works and such.
-	*/
-	~AsciiString();
-
-	/**
-		Return the length, in characters (not bytes!), of the string.
-	*/
-	int getLength() const;
-	/**
-		Return true iff the length of the string is zero. Equivalent
-		to (getLength() == 0) but slightly more efficient.
-	*/
-	Bool isEmpty() const;
-	/**
-		Make the string empty. Equivalent to (str = "") but slightly more efficient.
-	*/
-	void clear();
-
-	/**
-		Return the character and the given (zero-based) index into the string.
-		No range checking is done (except in debug mode).
-	*/
-	char getCharAt(int index) const;
-	/**
-		Return a pointer to the (null-terminated) string. Note that this is 
-		a const pointer: do NOT change this! It is imperative that it be 
-		impossible (or at least, really difficuly) for someone to change our
-		private data, since it might be shared amongst other AsciiStrings.
-	*/
-	const char* str() const;
-
-	/**
-		Makes sure there is room for a string of len+1 characters, and
-		returns a pointer to the string buffer.  This ensures that the
-		string buffer is NOT shared.  This is intended for the file reader, 
-		that is reading new strings in from a file. jba.
-	*/
-	char* getBufferForRead(Int len);
-
-	/**
-		Replace the contents of self with the given string.
-		(This is actually quite efficient, because
-		they will simply share the same string and increment the
-		refcount.)
-	*/
-	void set(const AsciiString& stringSrc);
-	/**
-		Replace the contents of self with the given string.
-		Note that a copy of the string is made; the input ptr is not saved.
-	*/
-	void set(const char* s);
-
-	/**
-		replace contents of self with the given string. Note the
-		nomenclature is translate rather than set; this is because
-		not all single-byte strings translate one-for-one into
-		UnicodeStrings, so some data manipulation may be necessary,
-		and the resulting strings may not be equivalent.
-	*/
-	void translate(const UnicodeString& stringSrc);
-
-	/**
-		Concatenate the given string onto self.
-	*/
-	void concat(const AsciiString& stringSrc);
-	/**
-		Concatenate the given string onto self.
-	*/
-	void concat(const char* s);
-	/**
-		Concatenate the given character onto self.
-	*/
-	void concat(const char c);
-
-	/**
-	  Remove leading and trailing whitespace from the string.
-	*/
-	void trim( void );
-
-	/**
-	  Make the string lowercase
-	*/
-	void toLower( void );
-
-	/**
-		Remove the final character in the string. If the string is empty,
-		do nothing. (This is a rather dorky method, but used a lot in 
-		text editing, thus its presence here.)
-	*/
-	void removeLastChar();
-
-	/**
-		Analogous to sprintf() -- this formats a string according to the
-		given sprintf-style format string (and the variable argument list)
-		and stores the result in self.
-	*/
-	void format(AsciiString format, ...);
-	void format(const char* format, ...);
-	/**
-		Identical to format(), but takes a va_list rather than
-		a variable argument list. (i.e., analogous to vsprintf.)
-	*/
-	void format_va(const AsciiString& format, va_list args);
-	void format_va(const char* format, va_list args);
-
-	/**
-		Conceptually identical to strcmp().
-	*/
-	int compare(const AsciiString& stringSrc) const;
-	/**
-		Conceptually identical to strcmp().
-	*/
-	int compare(const char* s) const;
-	/**
-		Conceptually identical to _stricmp().
-	*/
-	int compareNoCase(const AsciiString& stringSrc) const;
-	/**
-		Conceptually identical to _stricmp().
-	*/
-	int compareNoCase(const char* s) const;
-
-	/**
-		Conceptually identical to strchr().
-	*/
-	const char* find(char c) const;
-
-	/**
-		Conceptually identical to strrchr().
-	*/
-	const char* reverseFind(char c) const;
-
-	/**
-		return true iff self starts with the given string.
-	*/
-	Bool startsWith(const char* p) const;
-	inline Bool startsWith(const AsciiString& stringSrc) const { return startsWith(stringSrc.str()); }
-
-	/**
-		return true iff self starts with the given string. (case insensitive)
-	*/
-	Bool startsWithNoCase(const char* p) const;
-	inline Bool startsWithNoCase(const AsciiString& stringSrc) const { return startsWithNoCase(stringSrc.str()); }
-
-	/**
-		return true iff self ends with the given string.
-	*/
-	Bool endsWith(const char* p) const;
-	Bool endsWith(const AsciiString& stringSrc) const { return endsWith(stringSrc.str()); }
-
-	/**
-		return true iff self ends with the given string. (case insensitive)
-	*/
-	Bool endsWithNoCase(const char* p) const;
-	Bool endsWithNoCase(const AsciiString& stringSrc) const { return endsWithNoCase(stringSrc.str()); }
-
-	/**
-		conceptually similar to strtok():
-
-		extract the next seps-delimited token from the front
-		of 'this' and copy it into 'token', returning true if a nonempty
-		token was found. (note that this modifies 'this' as well, stripping
-		the token off!)
-	*/
-	Bool nextToken(AsciiString* token, const char* seps = NULL);
-
-	/**
-		return true iff the string is "NONE" (case-insensitive).
-		Hey, hokey, but we use it a ton.
-	*/
-	Bool isNone() const;
-
-	Bool isNotEmpty() const { return !isEmpty(); }
-	Bool isNotNone() const { return !isNone(); }
-
-//
-// You might think it would be a good idea to overload the * operator
-// to allow for an implicit conversion to an char*. This is
-// (in theory) a good idea, but in practice, there's lots of code
-// that assumes it should check text fields for null, which
-// is meaningless for us, since we never return a null ptr.
-//
-//	operator const char*() const { return str(); }
-//
-
-	AsciiString& operator=(const AsciiString& stringSrc);	///< the same as set()
-	AsciiString& operator=(const char* s);				///< the same as set()
-
-	void debugIgnoreLeaks();
-
-};
-
-// -----------------------------------------------------
-inline char* AsciiString::peek() const
-{
-	DEBUG_ASSERTCRASH(m_data, ("null string ptr"));
-	validate();
-	return m_data->peek();
-}
-
-// -----------------------------------------------------
-inline AsciiString::AsciiString() : m_data(0)
-{
-	validate();
-}
-
-// -----------------------------------------------------
-inline AsciiString::~AsciiString()
-{
-	validate();
-	releaseBuffer();
-}
-
-// -----------------------------------------------------
-inline int AsciiString::getLength() const
-{
-	validate();
-	return m_data ? strlen(peek()) : 0;
-}
-
-// -----------------------------------------------------
-inline Bool AsciiString::isEmpty() const
-{
-	validate();
-	return m_data == NULL || peek()[0] == 0;
-}
-
-// -----------------------------------------------------
-inline void AsciiString::clear()
-{
-	validate();
-	releaseBuffer();
-	validate();
-}
-
-// -----------------------------------------------------
-inline char AsciiString::getCharAt(int index) const
-{
-	DEBUG_ASSERTCRASH(index >= 0 && index < getLength(), ("bad index in getCharAt"));
-	validate();
-	return m_data ? peek()[index] : 0;
-}
-
-// -----------------------------------------------------
-inline const char* AsciiString::str() const
-{
-	validate();
-	static const char TheNullChr = 0;
-	return m_data ? peek() : &TheNullChr;
-}
-
-// -----------------------------------------------------
-inline AsciiString& AsciiString::operator=(const AsciiString& stringSrc)
-{
-	validate();
-	set(stringSrc);
-	validate();
-	return *this;
-}
-
-// -----------------------------------------------------
-inline AsciiString& AsciiString::operator=(const char* s)
-{
-	validate();
-	set(s);
-	validate();
-	return *this;
-}
-
-// -----------------------------------------------------
-inline void AsciiString::concat(const AsciiString& stringSrc)
-{
-	validate();
-	concat(stringSrc.str());
-	validate();
-}
-
-// -----------------------------------------------------
-inline void AsciiString::concat(const char c)
-{
-	validate();
-	/// this can probably be made more efficient, if necessary
-	char tmp[2] = { c, 0 };
-	concat(tmp);
-	validate();
-}
-
-// -----------------------------------------------------
-inline int AsciiString::compare(const AsciiString& stringSrc) const
-{
-	validate();
-	return strcmp(this->str(), stringSrc.str());
-}
-
-// -----------------------------------------------------
-inline int AsciiString::compare(const char* s) const
-{
-	validate();
-	return strcmp(this->str(), s);
-}
-
-// -----------------------------------------------------
-inline int AsciiString::compareNoCase(const AsciiString& stringSrc) const
-{
-	validate();
-	return _stricmp(this->str(), stringSrc.str());
-}
-
-// -----------------------------------------------------
-inline int AsciiString::compareNoCase(const char* s) const
-{
-	validate();
-	return _stricmp(this->str(), s);
-}
-
-// -----------------------------------------------------
-inline const char* AsciiString::find(char c) const
-{
-	return strchr(this->str(), c);
-}
-
-// -----------------------------------------------------
-inline const char* AsciiString::reverseFind(char c) const
-{
-	return strrchr(this->str(), c);
-}
-
-// -----------------------------------------------------
-inline Bool operator==(const AsciiString& s1, const AsciiString& s2)
-{
-	return strcmp(s1.str(), s2.str()) == 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator!=(const AsciiString& s1, const AsciiString& s2)
-{
-	return strcmp(s1.str(), s2.str()) != 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator<(const AsciiString& s1, const AsciiString& s2)
-{
-	return strcmp(s1.str(), s2.str()) < 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator<=(const AsciiString& s1, const AsciiString& s2)
-{
-	return strcmp(s1.str(), s2.str()) <= 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator>(const AsciiString& s1, const AsciiString& s2)
-{
-	return strcmp(s1.str(), s2.str()) > 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator>=(const AsciiString& s1, const AsciiString& s2)
-{
-	return strcmp(s1.str(), s2.str()) >= 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator==(const AsciiString& s1, const char* s2)
-{
-	return strcmp(s1.str(), s2) == 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator!=(const AsciiString& s1, const char* s2)
-{
-	return strcmp(s1.str(), s2) != 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator<(const AsciiString& s1, const char* s2)
-{
-	return strcmp(s1.str(), s2) < 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator<=(const AsciiString& s1, const char* s2)
-{
-	return strcmp(s1.str(), s2) <= 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator>(const AsciiString& s1, const char* s2)
-{
-	return strcmp(s1.str(), s2) > 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator>=(const AsciiString& s1, const char* s2)
-{
-	return strcmp(s1.str(), s2) >= 0;
-}
-
-#endif // ASCIISTRING_H
diff --git a/Generals/Code/GameEngine/Include/Common/AudioAffect.h b/Generals/Code/GameEngine/Include/Common/AudioAffect.h
deleted file mode 100644
index 6613abaef42..00000000000
--- a/Generals/Code/GameEngine/Include/Common/AudioAffect.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// EA Pacific
-// John McDonald, Jr
-// Do not distribute
-#pragma once
-
-#ifndef _AUDIOAFFECT_H_
-#define _AUDIOAFFECT_H_
-
-#include <Lib/BaseType.h>
-
-// if it is set by the options panel, use the system setting parameter. Otherwise, this will be 
-// appended to whatever the current system volume is.
-enum AudioAffect CPP_11(: Int)
-{
-	AudioAffect_Music		= 0x01,
-	AudioAffect_Sound		= 0x02,
-	AudioAffect_Sound3D	= 0x04,
-	AudioAffect_Speech	= 0x08,
-	AudioAffect_All			= (AudioAffect_Music | AudioAffect_Sound | AudioAffect_Sound3D | AudioAffect_Speech),
-
-	AudioAffect_SystemSetting = 0x10,
-};
-
-#endif // _AUDIOAFFECT_H_
diff --git a/Generals/Code/GameEngine/Include/Common/AudioEventInfo.h b/Generals/Code/GameEngine/Include/Common/AudioEventInfo.h
deleted file mode 100644
index a9924df3179..00000000000
--- a/Generals/Code/GameEngine/Include/Common/AudioEventInfo.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: AudioEventInfo.h /////////////////////////////////////////////////////////////////////////
-// AudioEventInfo structure
-// Author: John K. McDonald, March 2002
-
-#pragma once
-#ifndef _H_AUDIOEVENTINFO_
-#define _H_AUDIOEVENTINFO_
-
-#include "Common/AsciiString.h"
-#include "Common/GameMemory.h"
-#include "Common/STLTypedefs.h"
-
-// DEFINES
-#define NO_INTENSIVE_AUDIO_DEBUG
-
-// FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
-struct FieldParse;
-
-// USEFUL DECLARATIONS ////////////////////////////////////////////////////////////////////////////
-enum AudioType CPP_11(: Int)
-{
-	AT_Music,
-	AT_Streaming,
-	AT_SoundEffect
-};
-
-extern const char *theAudioPriorityNames[];
-enum AudioPriority CPP_11(: Int)
-{
-	AP_LOWEST,
-	AP_LOW,
-	AP_NORMAL,
-	AP_HIGH,
-	AP_CRITICAL
-};
-
-extern const char *theSoundTypeNames[];
-enum SoundType CPP_11(: Int)
-{
-	ST_UI										= 0x0001,
-	ST_WORLD								= 0x0002,
-	ST_SHROUDED							= 0x0004,
-	ST_GLOBAL								= 0x0008,
-	ST_VOICE								= 0x0010,
-	ST_PLAYER								= 0x0020,
-	ST_ALLIES								= 0x0040,
-	ST_ENEMIES							= 0x0080,
-	ST_EVERYONE							= 0x0100,	
-};
-
-extern const char *theAudioControlNames[];
-enum AudioControl CPP_11(: Int)
-{
-	AC_LOOP									= 0x0001,
-	AC_RANDOM								= 0x0002,
-	AC_ALL									= 0x0004,
-	AC_POSTDELAY						= 0x0008,
-	AC_INTERRUPT						= 0x0010,
-};
-
-class DynamicAudioEventInfo;
-
-struct AudioEventInfo : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AudioEventInfo, "AudioEventInfo" )
-
-public:
-	AsciiString m_audioName;	// This name matches the name of the AudioEventRTS
-	AsciiString m_filename;		// For music tracks, this is the filename of the track
-
-	Real m_volume;						// Desired volume of this audio
-	Real m_volumeShift;				// Desired volume shift of the audio
-	Real m_minVolume;					// Clamped minimum value, useful when muting sound effects
-	Real m_pitchShiftMin;			// minimum pitch shift value
-	Real m_pitchShiftMax;			// maximum pitch shift value
-	Int m_delayMin;						// minimum delay before we'll fire up another one of these 
-	Int m_delayMax;						// maximum delay before we'll fire up another one of these 
-	Int m_limit;							// Limit to the number of these sounds that can be fired up simultaneously
-	Int m_loopCount;					// number of times to loop this sound
-	
-	AudioPriority m_priority;	// Priority of this sound
-	UnsignedInt m_type;								// Type of sound
-	UnsignedInt m_control;						// control of sound
-
-	std::vector<AsciiString> m_soundsMorning;	// Sounds to play in the wee hours of the morning
-	std::vector<AsciiString> m_sounds;				// Default sounds to play
-	std::vector<AsciiString> m_soundsNight;		// Sounds to play at night
-	std::vector<AsciiString> m_soundsEvening;	// Sounds to play in the evening
-
-	std::vector<AsciiString> m_attackSounds;
-	std::vector<AsciiString> m_decaySounds;
-
-	Real m_lowPassFreq;			// When performing low pass filters, what is the maximum frequency heard, expressed as a percentage?
-	Real m_minDistance;			// less than this distance and the sound behaves as though it is at minDistance
-	Real m_maxDistance;			// greater than this distance and the sound behaves as though it is muted
-
-	AudioType m_soundType;	// This should be either Music, Streaming or SoundEffect
-	
-  
-  // DynamicAudioEventInfo interfacing functions
-  virtual Bool isLevelSpecific() const { return false; } ///< If true, this sound is only defined on the current level and can be deleted when that level ends
-  virtual DynamicAudioEventInfo * getDynamicAudioEventInfo() { return NULL; }  ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
-  virtual const DynamicAudioEventInfo * getDynamicAudioEventInfo() const { return NULL; } ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
-
-  /// Is this a permenant sound? That is, if I start this sound up, will it ever end
-  /// "on its own" or only if I explicitly kill it?
-  Bool isPermanentSound() const { return BitIsSet( m_control, AC_LOOP ) && (m_loopCount == 0 );  }
-  
-	static const FieldParse m_audioEventInfo[];		///< the parse table for INI definition
-	const FieldParse *getFieldParse( void ) const { return m_audioEventInfo; }
-};
-
-#endif /* _H_AUDIOEVENTINFO_ */
diff --git a/Generals/Code/GameEngine/Include/Common/AudioEventRTS.h b/Generals/Code/GameEngine/Include/Common/AudioEventRTS.h
deleted file mode 100644
index 4bf690e6040..00000000000
--- a/Generals/Code/GameEngine/Include/Common/AudioEventRTS.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: AudioEventRTS.h ///////////////////////////////////////////////////////////////////////////////
-// AudioEventRTS structure
-// Author: John K. McDonald, March 2002
-
-#pragma once
-#ifndef _H_AUDIOEVENTRTS_
-#define _H_AUDIOEVENTRTS_
-
-#include "Common/AsciiString.h"
-#include "Common/GameAudio.h"
-#include "Common/GameMemory.h"
-#include "Common/GameType.h"
-
-// forward declarations ///////////////////////////////////////////////////////////////////////////
-struct AudioEventInfo;
-
-enum OwnerType CPP_11(: Int)
-{
-	OT_Positional,
-	OT_Drawable,
-	OT_Object,
-	OT_Dead,
-	OT_INVALID
-};
-
-enum PortionToPlay CPP_11(: Int)
-{
-	PP_Attack,
-	PP_Sound,
-	PP_Decay,
-	PP_Done
-};
-
-enum AudioPriority CPP_11(: Int);
-
-// This is called AudioEventRTS because AudioEvent is a typedef in ww3d
-// You might want this to be memory pooled (I personally do), but it can't
-// because we allocate them on the stack frequently.
-class AudioEventRTS
-{	
-public:
-	AudioEventRTS( );
-	AudioEventRTS( const AsciiString& eventName );
-	AudioEventRTS( const AsciiString& eventName, ObjectID ownerID );
-	AudioEventRTS( const AsciiString& eventName, DrawableID drawableID );	// Pass 0 for unused if attaching to drawable
-	AudioEventRTS( const AsciiString& eventName, const Coord3D *positionOfAudio );
-
-	virtual ~AudioEventRTS( );
-
-	AudioEventRTS( const AudioEventRTS& right );
-	AudioEventRTS& operator=( const AudioEventRTS& right );
-
-	void setEventName( AsciiString name );
-	const AsciiString& getEventName( void ) const { return m_eventName; }
-
-	// generateFilename is separate from generatePlayInfo because generatePlayInfo should only be called once
-	// per triggered event. generateFilename will be called once per loop, or once to get each filename if 'all' is 
-	// specified.
-	void generateFilename( void );
-	AsciiString getFilename( void );
-
-	// The attack and decay sounds are generated in generatePlayInfo, because they will never be played more
-	// than once during a given sound event.
-	void generatePlayInfo( void );
-	Real getPitchShift( void ) const;
-	Real getVolumeShift( void ) const;
-	AsciiString getAttackFilename( void ) const;
-	AsciiString getDecayFilename( void ) const;
-	Real getDelay( void ) const;
-
-	void decrementDelay( Real timeToDecrement );
-
-	PortionToPlay getNextPlayPortion( void ) const;
-	void advanceNextPlayPortion( void );
-	void setNextPlayPortion( PortionToPlay ptp );
-	
-	void decreaseLoopCount( void );
-	Bool hasMoreLoops( void ) const;
-	
-	void setAudioEventInfo( const AudioEventInfo *eventInfo ) const;
-	const AudioEventInfo *getAudioEventInfo( void ) const;
-	
-	void setPlayingHandle( AudioHandle handle );	// for ID of this audio piece.
-	AudioHandle getPlayingHandle( void ); // for ID of this audio piece
-
-	void setPosition( const Coord3D *pos );
-	const Coord3D* getPosition( void );
-
-	void setObjectID( ObjectID objID );
-	ObjectID getObjectID( void );
-
-	Bool isDead() const { return m_ownerType == OT_Dead; }
-	OwnerType getOwnerType() const { return m_ownerType; }
-	
-	void setDrawableID( DrawableID drawID );
-	DrawableID getDrawableID( void );
-
-	void setTimeOfDay( TimeOfDay tod );
-	TimeOfDay getTimeOfDay( void ) const;
-
-	void setHandleToKill( AudioHandle handleToKill );
-	AudioHandle getHandleToKill( void ) const;
-
-	void setShouldFade( Bool shouldFade );
-	Bool getShouldFade( void ) const;
-
-	void setIsLogicalAudio( Bool isLogicalAudio );
-	Bool getIsLogicalAudio( void ) const;
-
-	Bool isPositionalAudio( void ) const;
-	Bool isCurrentlyPlaying( void ) const;
-
-	AudioPriority getAudioPriority( void ) const;
-	void setAudioPriority( AudioPriority newPriority );
-
-	Real getVolume( void ) const;
-	void setVolume( Real vol );
-
-	Int getPlayerIndex( void ) const;
-	void setPlayerIndex( Int playerNdx );
-
-	Int getPlayingAudioIndex( void ) { return m_playingAudioIndex; };
-	void setPlayingAudioIndex( Int pai )  { m_playingAudioIndex = pai; };
-
-	Bool getUninterruptable( ) const { return m_uninterruptable; }
-	void setUninterruptable( Bool uninterruptable ) { m_uninterruptable = uninterruptable; } 
-
-
-	// This will retrieve the appropriate position based on type.	
-	const Coord3D *getCurrentPosition( void );	
-
-	// This will return the directory leading up to the appropriate type, including the trailing '\\'
-	// If localized is true, we'll append a language specifc directory to the end of the path.
-	AsciiString generateFilenamePrefix( AudioType audioTypeToPlay, Bool localized );
-	AsciiString generateFilenameExtension( AudioType audioTypeToPlay );
-protected:
-	void adjustForLocalization( AsciiString &strToAdjust );
-
-protected:
-	AsciiString m_filenameToLoad;
-	mutable const AudioEventInfo *m_eventInfo;	// Mutable so that it can be modified even on const objects
-	AudioHandle m_playingHandle;
-	
-	AudioHandle m_killThisHandle;		///< Sometimes sounds will canabilize other sounds in order to take their handle away.
-																	///< This is one of those instances.
-
-	AsciiString m_eventName;				///< This should correspond with an entry in Dialog.ini, Speech.ini, or Audio.ini
-	AsciiString m_attackName;				///< This is the filename that should be used during the attack.
-	AsciiString m_decayName;				///< This is the filename that should be used during the decay.
-
-	AudioPriority m_priority;				///< This should be the priority as given by the event info, or the overrided priority.
-	Real m_volume;									///< This is the override for the volume. It will either be the normal 
-	TimeOfDay m_timeOfDay;					///< This should be the current Time Of Day.
-
-	Coord3D m_positionOfAudio;			///< Position of the sound if no further positional updates are necessary
-	union	// These are now unioned.
-	{
-		ObjectID m_objectID;						///< ObjectID of the object that this sound is tied to. Position can be automatically updated from this.
-		DrawableID m_drawableID;				///< DrawableID of the drawable that owns this sound
-	};
-	OwnerType m_ownerType;
-
-	Bool m_shouldFade;							///< This should fade in or out (if it is starting or stopping)
-	Bool m_isLogicalAudio;					///< Should probably only be true for scripted sounds
-	Bool m_uninterruptable;
-
-	// Playing attributes
-	Real m_pitchShift;							///< Pitch shift that should occur on this piece of audio
-	Real m_volumeShift;							///< Volume shift that should occur on this piece of audio
-	Real m_delay;										///< Amount to delay before playing this sound
-	Int m_loopCount;								///< The current loop count value. Only valid if this is a looping type event or the override has been set.
-	Int m_playingAudioIndex;				///< The sound index we are currently playing. In the case of non-random, we increment this to move to the next sound
-	Int m_allCount;									///< If this sound is an ALL type, then this is how many sounds we have played so far.
-	
-	Int m_playerIndex;							///< The index of the player who owns this sound. Used for sounds that should have an owner, but don't have an object, etc.
-
-	PortionToPlay m_portionToPlayNext;	///< Which portion (attack, sound, decay) should be played next?
-};
-
-class DynamicAudioEventRTS : public MemoryPoolObject
-{	
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DynamicAudioEventRTS, "DynamicAudioEventRTS" )		
-public:
-
-	DynamicAudioEventRTS() { }
-	DynamicAudioEventRTS(const AudioEventRTS& a) : m_event(a) { }
-
-	AudioEventRTS	m_event;
-};
-EMPTY_DTOR(DynamicAudioEventRTS)
-
-#endif /* _H_AUDIOEVENTRTS_ */
-
diff --git a/Generals/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h b/Generals/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h
deleted file mode 100644
index 3893609f4db..00000000000
--- a/Generals/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// EA Pacific
-// John McDonald, Jr
-// Do not distribute
-
-#pragma once
-
-#ifndef _AUDIOHANDLESPECIALVALUES_H_
-#define _AUDIOHANDLESPECIALVALUES_H_
-
-enum AudioHandleSpecialValues CPP_11(: Int)
-{
-	AHSV_Error					= 0x00,
-	AHSV_NoSound,
-	AHSV_Muted,
-	AHSV_NotForLocal,
-	AHSV_StopTheMusic,
-	AHSV_StopTheMusicFade,
-	AHSV_FirstHandle
-};
-
-#endif // _AUDIOHANDLESPECIALVALUES_H_
diff --git a/Generals/Code/GameEngine/Include/Common/AudioRandomValue.h b/Generals/Code/GameEngine/Include/Common/AudioRandomValue.h
deleted file mode 100644
index 2fa4ec7cb74..00000000000
--- a/Generals/Code/GameEngine/Include/Common/AudioRandomValue.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// AudioRandomValue.h
-// Random number generation system
-// Author: Michael S. Booth, January 1998
-// Split out into separate Logic/Client/Audio headers by MDC Sept 2002
-
-#pragma once
-
-#ifndef _AUDIO_RANDOM_VALUE_H_
-#define _AUDIO_RANDOM_VALUE_H_
-
-#include "Lib/BaseType.h"
-
-// do NOT use these functions directly, rather use the macros below
-extern Int GetGameAudioRandomValue( int lo, int hi, const char *file, int line );
-extern Real GetGameAudioRandomValueReal( Real lo, Real hi, const char *file, int line );
-
-// use these macros to access the random value functions
-#define GameAudioRandomValue( lo, hi ) GetGameAudioRandomValue( lo, hi, __FILE__, __LINE__ )
-#define GameAudioRandomValueReal( lo, hi ) GetGameAudioRandomValueReal( lo, hi, __FILE__, __LINE__ )
-
-//--------------------------------------------------------------------------------------------------------------
-
-#endif // _AUDIO_RANDOM_VALUE_H_
diff --git a/Generals/Code/GameEngine/Include/Common/AudioRequest.h b/Generals/Code/GameEngine/Include/Common/AudioRequest.h
deleted file mode 100644
index 18c3085acb4..00000000000
--- a/Generals/Code/GameEngine/Include/Common/AudioRequest.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// EA Pacific
-// John McDonald, Jr
-// Do not distribute
-
-#pragma once
-
-#ifndef _AUDIOREQUEST_H_
-#define _AUDIOREQUEST_H_
-
-#include "Common/GameAudio.h"
-#include "Common/GameMemory.h"
-
-class AudioEventRTS;
-
-enum RequestType CPP_11(: Int)
-{
-	AR_Play,
-	AR_Pause,
-	AR_Stop
-};
-
-struct AudioRequest : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AudioRequest, "AudioRequest" )
-
-public:
-	RequestType m_request;
-	union 
-	{
-		AudioEventRTS *m_pendingEvent;
-		AudioHandle m_handleToInteractOn;
-	};
-	Bool m_usePendingEvent;
-	Bool m_requiresCheckForSample;
-};
-
-#endif // _AUDIOREQUEST_H_
diff --git a/Generals/Code/GameEngine/Include/Common/AudioSettings.h b/Generals/Code/GameEngine/Include/Common/AudioSettings.h
deleted file mode 100644
index 7d198855440..00000000000
--- a/Generals/Code/GameEngine/Include/Common/AudioSettings.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// EA Pacific
-// John McDonald, Jr
-// Do not distribute
-
-#pragma once
-
-#ifndef _AUDIOSETTINGS_H_
-#define _AUDIOSETTINGS_H_
-
-#include "Common/AsciiString.h"
-
-enum { MAX_HW_PROVIDERS = 4 };
-
-struct AudioSettings
-{
-	AsciiString m_audioRoot;
-	AsciiString m_soundsFolder;
-	AsciiString m_musicFolder;
-	AsciiString m_streamingFolder;
-	AsciiString m_soundsExtension;
-	Bool m_useDigital;
-	Bool m_useMidi;
-	Int m_outputRate;
-	Int m_outputBits;
-	Int m_outputChannels;
-	Int m_sampleCount2D;
-	Int m_sampleCount3D;
-	Int m_streamCount;
-	Int m_globalMinRange;
-	Int m_globalMaxRange;
-	Int m_drawableAmbientFrames;
-	Int m_fadeAudioFrames;
-	UnsignedInt m_maxCacheSize;
-
-	Real m_minVolume;		// At volumes less than this, the sample will be culled.
-	
-	AsciiString m_preferred3DProvider[MAX_HW_PROVIDERS + 1];
-
-	//Defaults actually don't ever get changed!
-	Real m_relative2DVolume;		//2D volume compared to 3D
-	Real m_defaultSoundVolume;
-	Real m_default3DSoundVolume;
-	Real m_defaultSpeechVolume;
-	Real m_defaultMusicVolume;
-	UnsignedInt m_defaultSpeakerType2D;
-	UnsignedInt m_defaultSpeakerType3D;
-
-	//If you want to change a value, store it somewhere else (like here)
-	Real m_preferredSoundVolume;
-	Real m_preferred3DSoundVolume;
-	Real m_preferredSpeechVolume;
-	Real m_preferredMusicVolume;
-
-	//The desired altitude of the microphone to improve panning relative to terrain.
-	Real m_microphoneDesiredHeightAboveTerrain;
-
-	//When tracing a line between the ground look-at-point and the camera, we want
-	//to ensure a maximum percentage, so the microphone never goes behind the camera.
-	Real m_microphoneMaxPercentageBetweenGroundAndCamera;
-
-	//Handles changing sound volume whenever the camera is close to the microphone.
-  Real m_zoomMinDistance;			//If we're closer than the minimum distance, then apply the full bonus no matter how close.
-  Real m_zoomMaxDistance;			//The maximum distance from microphone we need to be before benefiting from any bonus.
-	
-  //NOTE: The higher this value is, the lower normal sounds will be! If you specify a sound volume value of 25%, then sounds will play
-	//between 75% and 100%, not 100% to 125%!
-  Real m_zoomSoundVolumePercentageAmount;	//The amount of sound volume dedicated to zooming.
-};
-
-#endif // _AUDIOSETTINGS_H_
diff --git a/Generals/Code/GameEngine/Include/Common/BattleHonors.h b/Generals/Code/GameEngine/Include/Common/BattleHonors.h
index 8cf710b003b..96ed04409f3 100644
--- a/Generals/Code/GameEngine/Include/Common/BattleHonors.h
+++ b/Generals/Code/GameEngine/Include/Common/BattleHonors.h
@@ -24,12 +24,12 @@
 
 // FILE: BattleHonors.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,17 +37,14 @@
 //	Filename: 	BattleHonors.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __BATTLE_HONORS_H_
-#define __BATTLE_HONORS_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -123,5 +120,3 @@ enum
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __BATTLE_HONORS_H_
diff --git a/Generals/Code/GameEngine/Include/Common/BezFwdIterator.h b/Generals/Code/GameEngine/Include/Common/BezFwdIterator.h
index 6228e57a2a5..ad052ed8ad9 100644
--- a/Generals/Code/GameEngine/Include/Common/BezFwdIterator.h
+++ b/Generals/Code/GameEngine/Include/Common/BezFwdIterator.h
@@ -34,7 +34,7 @@ class BezFwdIterator
 
 		BezierSegment mBezSeg;
 		Coord3D mCurrPoint;
-		
+
 		Coord3D mDq;	// First Derivative
 		Coord3D mDDq;	// Second Derivative
 		Coord3D mDDDq;	// Third Derivative
@@ -42,10 +42,10 @@ class BezFwdIterator
 	public:
 		BezFwdIterator();
 		BezFwdIterator(Int stepsDesired, const BezierSegment *bezSeg);
-	
+
 		void start(void);
 		Bool done(void);
 		const Coord3D& getCurrent(void) const;
 
 		void next(void);
-};
\ No newline at end of file
+};
diff --git a/Generals/Code/GameEngine/Include/Common/BezierSegment.h b/Generals/Code/GameEngine/Include/Common/BezierSegment.h
index e41916b555d..b16df7d8cee 100644
--- a/Generals/Code/GameEngine/Include/Common/BezierSegment.h
+++ b/Generals/Code/GameEngine/Include/Common/BezierSegment.h
@@ -28,8 +28,6 @@
 // DO NOT DISTRIBUTE
 
 #pragma once
-#ifndef __BEZIERSEGMENT_H__
-#define __BEZIERSEGMENT_H__
 
 #include <d3dx8math.h>
 #include "Common/STLTypedefs.h"
@@ -52,9 +50,9 @@ class BezierSegment
 		BezierSegment(Real cp[12]);
 
 
-		BezierSegment(const Coord3D& cp0, 
-									const Coord3D& cp1, 
-									const Coord3D& cp2, 
+		BezierSegment(const Coord3D& cp0,
+									const Coord3D& cp1,
+									const Coord3D& cp2,
 									const Coord3D& cp3);
 
 		BezierSegment(Coord3D cp[4]);
@@ -69,5 +67,3 @@ class BezierSegment
 	public:	// He get's friendly access.
 		friend class BezFwdIterator;
 };
-
-#endif /* __BEZIERSEGMENT_H__ */
diff --git a/Generals/Code/GameEngine/Include/Common/BitFlags.h b/Generals/Code/GameEngine/Include/Common/BitFlags.h
index 5c06671a69d..2616939a118 100644
--- a/Generals/Code/GameEngine/Include/Common/BitFlags.h
+++ b/Generals/Code/GameEngine/Include/Common/BitFlags.h
@@ -24,14 +24,11 @@
 
 // FILE: BitFlags.h /////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, March 2002
-// Desc:   
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __BitFlags_H_
-#define __BitFlags_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/STLTypedefs.h"
 
@@ -53,10 +50,11 @@ class BitFlags
 {
 private:
 	std::bitset<NUMBITS>				m_bits;
-	static const char*					s_bitNameList[];
 
 public:
-	
+	CPP_11(static constexpr size_t NumBits = NUMBITS);
+	static const char* const s_bitNameList[];
+
 	/*
 		just a little syntactic sugar so that there is no "foo = 0" compatible constructor
 	*/
@@ -65,29 +63,29 @@ class BitFlags
 		kInit = 0
 	};
 
-	inline BitFlags()
+	BitFlags()
 	{
 	}
 
-	inline BitFlags(BogusInitType k, Int idx1)
+	BitFlags(BogusInitType k, Int idx1)
 	{
 		m_bits.set(idx1);
 	}
 
-	inline BitFlags(BogusInitType k, Int idx1, Int idx2)
+	BitFlags(BogusInitType k, Int idx1, Int idx2)
 	{
 		m_bits.set(idx1);
 		m_bits.set(idx2);
 	}
 
-	inline BitFlags(BogusInitType k, Int idx1, Int idx2, Int idx3)
+	BitFlags(BogusInitType k, Int idx1, Int idx2, Int idx3)
 	{
 		m_bits.set(idx1);
 		m_bits.set(idx2);
 		m_bits.set(idx3);
 	}
 
-	inline BitFlags(BogusInitType k, Int idx1, Int idx2, Int idx3, Int idx4)
+	BitFlags(BogusInitType k, Int idx1, Int idx2, Int idx3, Int idx4)
 	{
 		m_bits.set(idx1);
 		m_bits.set(idx2);
@@ -95,7 +93,7 @@ class BitFlags
 		m_bits.set(idx4);
 	}
 
-	inline BitFlags(BogusInitType k, Int idx1, Int idx2, Int idx3, Int idx4, Int idx5)
+	BitFlags(BogusInitType k, Int idx1, Int idx2, Int idx3, Int idx4, Int idx5)
 	{
 		m_bits.set(idx1);
 		m_bits.set(idx2);
@@ -104,11 +102,11 @@ class BitFlags
 		m_bits.set(idx5);
 	}
 
-	inline BitFlags(BogusInitType k, 
-										Int idx1, 
-										Int idx2, 
-										Int idx3, 
-										Int idx4, 
+	BitFlags(BogusInitType k,
+										Int idx1,
+										Int idx2,
+										Int idx3,
+										Int idx4,
 										Int idx5,
 										Int idx6,
 										Int idx7,
@@ -133,36 +131,36 @@ class BitFlags
 		m_bits.set(idx12);
 	}
 
-	inline Bool operator==(const BitFlags& that) const
+	Bool operator==(const BitFlags& that) const
 	{
 		return this->m_bits == that.m_bits;
 	}
 
-	inline Bool operator!=(const BitFlags& that) const
+	Bool operator!=(const BitFlags& that) const
 	{
 		return this->m_bits != that.m_bits;
 	}
 
-	inline void set(Int i, Int val = 1)
+	void set(Int i, Int val = 1)
 	{
 		m_bits.set(i, val);
 	}
 
-	inline Bool test(Int i) const
+	Bool test(Int i) const
 	{
 		return m_bits.test(i);
 	}
 
 	//Tests for any bits that are set in both.
-	inline Bool testForAny( const BitFlags& that ) const
+	Bool testForAny( const BitFlags& that ) const
 	{
 		BitFlags tmp = *this;
 		tmp.m_bits &= that.m_bits;
 		return tmp.m_bits.any();
-	} 
+	}
 
 	//All argument bits must be set in our bits too in order to return TRUE
-	inline Bool testForAll( const BitFlags& that ) const
+	Bool testForAll( const BitFlags& that ) const
 	{
 		DEBUG_ASSERTCRASH( that.any(), ("BitFlags::testForAll is always true if you ask about zero flags.  Did you mean that?") );
 
@@ -173,54 +171,54 @@ class BitFlags
 	}
 
 	//None of the argument bits must be set in our bits in order to return TRUE
-	inline Bool testForNone( const BitFlags& that ) const
+	Bool testForNone( const BitFlags& that ) const
 	{
 		BitFlags tmp = *this;
 		tmp.m_bits &= that.m_bits;
 		return !tmp.m_bits.any();
 	}
 
-	inline Int size() const
+	Int size() const
 	{
 		return m_bits.size();
 	}
 
-	inline Int count() const
+	Int count() const
 	{
 		return m_bits.count();
 	}
 
-	inline Bool any() const
+	Bool any() const
 	{
 		return m_bits.any();
 	}
 
-	inline void flip()
+	void flip()
 	{
 		m_bits.flip();
 	}
 
-	inline void clear()
+	void clear()
 	{
 		m_bits.reset();
 	}
 
-	inline Int countIntersection(const BitFlags& that) const
+	Int countIntersection(const BitFlags& that) const
 	{
 		BitFlags tmp = *this;
 		tmp.m_bits &= that.m_bits;
 		return tmp.m_bits.count();
-	} 
+	}
 
-	inline Int countInverseIntersection(const BitFlags& that) const
+	Int countInverseIntersection(const BitFlags& that) const
 	{
 		BitFlags tmp = *this;
 		tmp.m_bits.flip();
 		tmp.m_bits &= that.m_bits;
 		return tmp.m_bits.count();
-	} 
+	}
 
-	inline Bool anyIntersectionWith(const BitFlags& that) const
+	Bool anyIntersectionWith(const BitFlags& that) const
 	{
 		/// @todo srj -- improve me.
 		BitFlags tmp = that;
@@ -228,40 +226,40 @@ class BitFlags
 		return tmp.m_bits.any();
 	}
 
-	inline void clear(const BitFlags& clr)
+	void clear(const BitFlags& clr)
 	{
 		m_bits &= ~clr.m_bits;
 	}
 
-	inline void set(const BitFlags& set)
+	void set(const BitFlags& set)
 	{
 		m_bits |= set.m_bits;
 	}
 
-	inline void clearAndSet(const BitFlags& clr, const BitFlags& set)
+	void clearAndSet(const BitFlags& clr, const BitFlags& set)
 	{
 		m_bits &= ~clr.m_bits;
 		m_bits |= set.m_bits;
 	}
 
-	inline Bool testSetAndClear(const BitFlags& mustBeSet, const BitFlags& mustBeClear) const
+	Bool testSetAndClear(const BitFlags& mustBeSet, const BitFlags& mustBeClear) const
 	{
 		/// @todo srj -- improve me.
 		BitFlags tmp = *this;
 		tmp.m_bits &= mustBeClear.m_bits;
-		if (tmp.m_bits.any()) 
+		if (tmp.m_bits.any())
 			return false;
 
 		tmp = *this;
 		tmp.m_bits.flip();
 		tmp.m_bits &= mustBeSet.m_bits;
-		if (tmp.m_bits.any()) 
+		if (tmp.m_bits.any())
 			return false;
 
 		return true;
 	}
 
-  static const char** getBitNames()
+  static const char* const* getBitNames()
   {
     return s_bitNameList;
   }
@@ -274,7 +272,7 @@ class BitFlags
   static Int getSingleBitFromName(const char* token)
   {
     Int i = 0;
-	  for(const char** name = s_bitNameList; *name; ++name, ++i )
+	  for(const char* const* name = s_bitNameList; *name; ++name, ++i )
 	  {
 		  if( stricmp( *name, token ) == 0 )
 		  {
@@ -289,13 +287,13 @@ class BitFlags
     return test(i) ? s_bitNameList[i] : NULL;
   }
 
-  Bool setBitByName(const char* token) 
+  Bool setBitByName(const char* token)
   {
     Int i = getSingleBitFromName(token);
 		if (i >= 0)
 		{
       set(i);
-			return true; 
+			return true;
 		}
 		else
 		{
@@ -323,11 +321,8 @@ class BitFlags
 				str->concat( bitName );
 				str->concat( ",\n");
 			}
-		}  
-	} 
+		}
+	}
 
 
 };
-
-#endif // __BitFlags_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h b/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h
index 5911362b0a1..197c79f31fa 100644
--- a/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h
+++ b/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h
@@ -24,14 +24,11 @@
 
 // FILE: BitFlagsIO.h /////////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, March 2002
-// Desc:   
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __BitFlagsIO_H_
-#define __BitFlagsIO_H_
-
 #include "Common/BitFlags.h"
 #include "Common/INI.h"
 #include "Common/Xfer.h"
@@ -44,7 +41,7 @@ void BitFlags<NUMBITS>::buildDescription( AsciiString* str ) const
 {
 	if ( str == NULL )
 		return;//sanity
- 
+
 	for( Int i = 0; i < size(); ++i )
 	{
 		const char* bitName = getBitNameIfSet(i);
@@ -54,8 +51,8 @@ void BitFlags<NUMBITS>::buildDescription( AsciiString* str ) const
 			str->concat( bitName );
 			str->concat( ",\n");
 		}
-	}  
-} 
+	}
+}
 */
 
 //-------------------------------------------------------------------------------------------------
@@ -182,9 +179,9 @@ void BitFlags<NUMBITS>::xfer(Xfer* xfer)
 			AsciiString bitNameA = bitName;
 			xfer->xferAsciiString( &bitNameA );
 
-		}  // end for i
+		}
 
-	}  // end if, save
+	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
   	// clear the kind of mask data
@@ -210,24 +207,26 @@ void BitFlags<NUMBITS>::xfer(Xfer* xfer)
 				throw XFER_READ_ERROR;
 			}
 
-		}  // end for, i
+		}
 
-	}  // end else if, load
+	}
 	else if( xfer->getXferMode() == XFER_CRC )
 	{
 
 		// just call the xfer implementation on the data values
+#if RETAIL_COMPATIBLE_CRC
 		xfer->xferUser( this, sizeof( this ) );
+#else
+		xfer->xferUser( this, sizeof( *this ) );
+#endif
 
-	}  // end else if, crc
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "BitFlagsXfer - Unknown xfer mode '%d'\n", xfer->getXferMode() ));
+		DEBUG_CRASH(( "BitFlagsXfer - Unknown xfer mode '%d'", xfer->getXferMode() ));
 		throw XFER_MODE_UNKNOWN;
 
-	}  // end else
-
-}  // end xfer
+	}
 
-#endif
+}
diff --git a/Generals/Code/GameEngine/Include/Common/BorderColors.h b/Generals/Code/GameEngine/Include/Common/BorderColors.h
index 00f1a38bae4..d9395537cce 100644
--- a/Generals/Code/GameEngine/Include/Common/BorderColors.h
+++ b/Generals/Code/GameEngine/Include/Common/BorderColors.h
@@ -18,15 +18,16 @@
 
 
 // jkmcd
+
 #pragma once
 
 struct BorderColor
 {
 	const char *m_colorName;
-	long m_borderColor;
+	unsigned long m_borderColor;
 };
 
-const BorderColor BORDER_COLORS[] = 
+const BorderColor BORDER_COLORS[] =
 {
 	{ "Orange",					0xFFFF8700, },
 	{ "Green",					0xFF00FF00, },
diff --git a/Generals/Code/GameEngine/Include/Common/BuildAssistant.h b/Generals/Code/GameEngine/Include/Common/BuildAssistant.h
index 2934918bb49..84a2d206781 100644
--- a/Generals/Code/GameEngine/Include/Common/BuildAssistant.h
+++ b/Generals/Code/GameEngine/Include/Common/BuildAssistant.h
@@ -25,14 +25,11 @@
 // FILE: BuildAssistant.h /////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, February 2002
 // Desc:   Singleton class to encapsulate some of the more common functions or rules
-//				 that apply to building structures and units 
+//				 that apply to building structures and units
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __BUILDASSISTANT_H_
-#define __BUILDASSISTANT_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/STLTypedefs.h"
 #include "Lib/BaseType.h"
@@ -103,7 +100,7 @@ class BuildAssistant : public SubsystemInterface
 {
 
 public:
-	
+
 	struct TileBuildInfo
 	{
 		Int tilesUsed;
@@ -114,10 +111,10 @@ class BuildAssistant : public SubsystemInterface
 	{
 		TERRAIN_RESTRICTIONS	= 0x00000001,	///< Check for basic terrain restrictions
 		CLEAR_PATH						= 0x00000002,	///< Must be able to path find to location
-		NO_OBJECT_OVERLAP			= 0X00000004,	///< Can't overlap enemy objects, or locally controled objects that can't move out of the way			
+		NO_OBJECT_OVERLAP			= 0X00000004,	///< Can't overlap enemy objects, or locally controled objects that can't move out of the way
 		USE_QUICK_PATHFIND    = 0x00000008, ///< Use the quick pathfind method for CLEAR_PATH
 		SHROUD_REVEALED				= 0x00000010,	///< Check to make sure the shroud is revealed
-		NO_ENEMY_OBJECT_OVERLAP=0x00000020,	///< Can't overlap enemy objects only.			
+		NO_ENEMY_OBJECT_OVERLAP=0x00000020,	///< Can't overlap enemy objects only.
 	};
 
 public:
@@ -138,17 +135,17 @@ class BuildAssistant : public SubsystemInterface
 												 void *funcUserData );
 
 	/// create object from a build and put it in the world now
-	virtual Object *buildObjectNow( Object *constructorObject, const ThingTemplate *what, 
+	virtual Object *buildObjectNow( Object *constructorObject, const ThingTemplate *what,
 																	const Coord3D *pos, Real angle, Player *owningPlayer );
 
 	/// using the "line placement" for objects (like walls etc) create that line of objects line
-	virtual void buildObjectLineNow( Object *constructorObject, const ThingTemplate *what, 
+	virtual void buildObjectLineNow( Object *constructorObject, const ThingTemplate *what,
 																	 const Coord3D *start, const Coord3D *end, Real angle,
 																	 Player *owningPlayer );
 
 	/// query if we can build at this location
 	virtual LegalBuildCode isLocationLegalToBuild( const Coord3D *worldPos,
-																								 const ThingTemplate *build, 
+																								 const ThingTemplate *build,
 																								 Real angle,  // angle to construct 'build' at
 																								 UnsignedInt options,		// use LocationLegalToBuildOptions
 																								 Object *builderObject,
@@ -156,10 +153,10 @@ class BuildAssistant : public SubsystemInterface
 
 	/// query if we can build at this location
 	virtual Bool isLocationClearOfObjects( const Coord3D *worldPos,
-																								 const ThingTemplate *build, 
+																								 const ThingTemplate *build,
 																								 Real angle,  // angle to construct 'build' a
 																								 Object *builderObject,
-																								 UnsignedInt options, 
+																								 UnsignedInt options,
 																								 Player *thePlayer);
 
 	/// Adds bib highlighting for this location.
@@ -174,7 +171,7 @@ class BuildAssistant : public SubsystemInterface
 																							Object *builderObject );
 
 	/// return the "scratch pad" array that can be used to create a line of build locations
-	virtual inline Coord3D *getBuildLocations( void ) { return m_buildPositions; }
+	virtual Coord3D *getBuildLocations( void ) { return m_buildPositions; }
 
 	/// is the template a line build object, like a wall
 	virtual Bool isLineBuildTemplate( const ThingTemplate *tTemplate );
@@ -194,24 +191,21 @@ class BuildAssistant : public SubsystemInterface
 
 	/// some objects will be "cleared" automatically when constructing
 	Bool isRemovableForConstruction( Object *obj );
-	
+
 	/// clear the area of removable objects for construction
-	void clearRemovableForConstruction( const ThingTemplate *whatToBuild, 
+	void clearRemovableForConstruction( const ThingTemplate *whatToBuild,
 																			const Coord3D *pos, Real angle );
 
 	/// will move objects that can move out of the way.
 	/// will return false if there are objects that cannot be moved out of the way.
-	Bool moveObjectsForConstruction( const ThingTemplate *whatToBuild, 
+	Bool moveObjectsForConstruction( const ThingTemplate *whatToBuild,
 																	 const Coord3D *pos, Real angle, Player *playerToBuild );
 
 	Coord3D *m_buildPositions;			///< array used to create a line of build locations (think walls)
 	Int m_buildPositionSize;				///< number of elements in the build position array
 	ObjectSellList m_sellList;			///< list of objects currently going through the "sell process"
 
-};  // end BuildAssistant
+};
 
 // EXTERN /////////////////////////////////////////////////////////////////////////////////////////
 extern BuildAssistant *TheBuildAssistant;
-
-#endif // __BUILDASSISTANT_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/CDManager.h b/Generals/Code/GameEngine/Include/Common/CDManager.h
index 92538949158..2b5a60b1574 100644
--- a/Generals/Code/GameEngine/Include/Common/CDManager.h
+++ b/Generals/Code/GameEngine/Include/Common/CDManager.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    Generals
@@ -43,12 +43,8 @@
 
 #pragma once
 
-#ifndef _COMMON_CDMANAGER_H_
-#define _COMMON_CDMANAGER_H_
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "Common/List.h"
@@ -79,7 +75,7 @@ namespace CD
 };
 
 //===============================
-// CDDriveInterface 
+// CDDriveInterface
 //===============================
 /**
   *	Interface to a CD ROM drive
@@ -92,7 +88,7 @@ class CDDriveInterface
 
 		virtual ~CDDriveInterface() {};
 
-		virtual void refreshInfo( void ) = 0;					///< Update drive with least 
+		virtual void refreshInfo( void ) = 0;					///< Update drive with least
 
 		virtual AsciiString getDiskName( void ) = 0;	///< Returns the drive path for this drive
 		virtual AsciiString getPath( void ) = 0;			///< Returns the drive path for this drive
@@ -101,7 +97,7 @@ class CDDriveInterface
 };
 
 //===============================
-// CDDrive 
+// CDDrive
 //===============================
 
 class CDDrive : public CDDriveInterface
@@ -116,7 +112,7 @@ class CDDrive : public CDDriveInterface
 		virtual AsciiString getPath( void );			///< Returns the drive path for this drive
 		virtual AsciiString getDiskName( void );	///< Returns the drive path for this drive
 		virtual CD::Disk getDisk( void );					///< Returns ID of current disk in this drive
-		virtual void refreshInfo( void );					///< Update drive with least 
+		virtual void refreshInfo( void );					///< Update drive with least
 
 		// CDDrive operations
 		void setPath( const Char *path );					///< Set the drive's path
@@ -131,7 +127,7 @@ class CDDrive : public CDDriveInterface
 
 
 //===============================
-// CDManagerInterface 
+// CDManagerInterface
 //===============================
 
 class CDManagerInterface : public SubsystemInterface
@@ -155,7 +151,7 @@ class CDManagerInterface : public SubsystemInterface
 // CDManager
 //===============================
 
-class CDManager : public CDManagerInterface 
+class CDManager : public CDManagerInterface
 {
 	public:
 
@@ -182,10 +178,8 @@ class CDManager : public CDManagerInterface
 };
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
 
 extern CDManagerInterface *TheCDManager;
 CDManagerInterface* CreateCDManager( void );
-
-#endif // _COMMON_CDMANAGER_H_
diff --git a/Generals/Code/GameEngine/Include/Common/CRCDebug.h b/Generals/Code/GameEngine/Include/Common/CRCDebug.h
deleted file mode 100644
index 6a0d7e2f267..00000000000
--- a/Generals/Code/GameEngine/Include/Common/CRCDebug.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// CRCDebug.h ///////////////////////////////////////////////////////////////
-// Macros/functions/etc to help logging values for tracking down sync errors
-// Author: Matthew D. Campbell, June 2002
-
-// no #pragma once - we want to be able to conditionally define NO_DEBUG_CRC in indiv .cpp files
-
-#ifndef __CRCDEBUG_H__
-#define __CRCDEBUG_H__
-
-#include "Common/Debug.h"
-
-#ifndef NO_DEBUG_CRC
-	#ifdef DEBUG_LOGGING
-		#define DEBUG_CRC
-	#endif
-#endif
-
-#ifdef DEBUG_CRC
-
-#include "Common/AsciiString.h"
-#include "GameLogic/GameLogic.h"
-#include "Lib/BaseType.h"
-#include "WWMath/vector3.h"
-#include "WWMath/matrix3d.h"
-
-	#define AS_INT(x) (*(Int *)(&x))
-	#define DUMPVEL DUMPCOORD3DNAMED(&m_vel, "m_vel")
-	#define DUMPACCEL DUMPCOORD3DNAMED(&m_accel, "m_accel")
-	#define DUMPVECTOR3(x) DUMPVECTOR3NAMED(x, #x)
-	#define DUMPVECTOR3NAMED(x, y) dumpVector3(x, y, __FILE__, __LINE__)
-	#define DUMPCOORD3D(x) DUMPCOORD3DNAMED(x, #x)
-	#define DUMPCOORD3DNAMED(x, y) dumpCoord3D(x, y, __FILE__, __LINE__)
-	#define DUMPMATRIX3D(x) DUMPMATRIX3DNAMED(x, #x)
-	#define DUMPMATRIX3DNAMED(x, y) dumpMatrix3D(x, y, __FILE__, __LINE__)
-	#define DUMPREAL(x) DUMPREALNAMED(x, #x)
-	#define DUMPREALNAMED(x, y) dumpReal(x, y, __FILE__, __LINE__)
-
-	extern Int TheCRCFirstFrameToLog;
-	extern UnsignedInt TheCRCLastFrameToLog;
-
-	void dumpVector3(const Vector3 *v, AsciiString name, AsciiString fname, Int line);
-	void dumpCoord3D(const Coord3D *c, AsciiString name, AsciiString fname, Int line);
-	void dumpMatrix3D(const Matrix3D *m, AsciiString name, AsciiString fname, Int line);
-	void dumpReal(Real r, AsciiString name, AsciiString fname, Int line);
-
-	void outputCRCDebugLines( void );
-	void CRCDebugStartNewGame( void );
-	void outputCRCDumpLines( void );
-
-	void addCRCDebugLine(const char *fmt, ...);
-	void addCRCDebugLineNoCounter(const char *fmt, ...);
-	void addCRCDumpLine(const char *fmt, ...);
-	void addCRCGenLine(const char *fmt, ...);
-	#define CRCDEBUG_LOG(x) addCRCDebugLine x
-	#define CRCDUMP_LOG(x) addCRCDumpLine x
-	#define CRCGEN_LOG(x) addCRCGenLine x
-
-	class CRCVerification
-	{
-	public:
-		CRCVerification();
-		~CRCVerification();
-	protected:
-		UnsignedInt m_startCRC;
-	};
-	#define VERIFY_CRC CRCVerification crcVerification;
-
-	extern Int lastCRCDebugFrame;
-	extern Int lastCRCDebugIndex;
-	
-	extern Bool g_verifyClientCRC;
-	extern Bool g_clientDeepCRC;
-
-	extern Bool g_crcModuleDataFromClient;
-	extern Bool g_crcModuleDataFromLogic;
-
-	extern Bool g_keepCRCSaves;
-	extern Bool g_saveDebugCRCPerFrame;
-	extern AsciiString g_saveDebugCRCPerFrameDir;
-
-	extern Bool g_logObjectCRCs;
-
-#else // DEBUG_CRC
-
-	#define DUMPVEL {}
-	#define DUMPACCEL {}
-	#define DUMPVECTOR3(x) {}
-	#define DUMPVECTOR3NAMED(x, y) {}
-	#define DUMPCOORD3D(x) {}
-	#define DUMPCOORD3DNAMED(x, y) {}
-	#define DUMPMATRIX3D(x) {}
-	#define DUMPMATRIX3DNAMED(x, y) {}
-
-	#define DUMPREAL(x) {}
-	#define DUMPREALNAMED(x, y) {}
-
-	#define CRCDEBUG_LOG(x) {}
-	#define CRCDUMP_LOG(x) {}
-	#define CRCGEN_LOG(x) {}
-
-	#define VERIFY_CRC {}
-
-#endif
-
-extern Int NET_CRC_INTERVAL;
-extern Int REPLAY_CRC_INTERVAL;
-extern Bool TheDebugIgnoreSyncErrors;
-
-#endif // __CRCDEBUG_H__
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h b/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h
index 9e1cb592b1c..c90e0adffaf 100644
--- a/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h
+++ b/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: ClientUpdateModule.h /////////////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:	 
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __ClientUpdateModule_H_
-#define __ClientUpdateModule_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include <stdlib.h>
 
@@ -63,7 +60,3 @@ class ClientUpdateModule : public DrawableModule
 inline ClientUpdateModule::ClientUpdateModule( Thing *thing, const ModuleData* moduleData ) : DrawableModule( thing, moduleData ) { }
 inline ClientUpdateModule::~ClientUpdateModule() { }
 //-------------------------------------------------------------------------------------------------
-
-
-#endif // __ClientUpdateModule_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/CommandLine.h b/Generals/Code/GameEngine/Include/Common/CommandLine.h
index 6e8997c7dac..48e078dc3dd 100644
--- a/Generals/Code/GameEngine/Include/Common/CommandLine.h
+++ b/Generals/Code/GameEngine/Include/Common/CommandLine.h
@@ -28,9 +28,10 @@
 
 #pragma once
 
-#ifndef _COMMAND_LINE_H_
-#define _COMMAND_LINE_H_
+class CommandLine
+{
+public:
 
-void parseCommandLine(int argc, char *argv[]); ///< Parse command-line parameters
-
-#endif // _COMMAND_LINE_H_
+	static void parseCommandLineForStartup();
+	static void parseCommandLineForEngineInit();
+};
diff --git a/Generals/Code/GameEngine/Include/Common/CriticalSection.h b/Generals/Code/GameEngine/Include/Common/CriticalSection.h
index 797b9596b2f..b44a88f2ffb 100644
--- a/Generals/Code/GameEngine/Include/Common/CriticalSection.h
+++ b/Generals/Code/GameEngine/Include/Common/CriticalSection.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __CRITICALSECTION_H__
-#define __CRITICALSECTION_H__
-
 #include "Common/PerfTimer.h"
 
 #ifdef PERF_TIMERS
@@ -59,14 +56,14 @@ class CriticalSection
 		}
 
 	public:	// Use these when entering/exiting a critical section.
-		void enter( void ) 
-		{ 
+		void enter( void )
+		{
 			#ifdef PERF_TIMERS
 			AutoPerfGather a(TheCritSecPerfGather);
 			#endif
 			EnterCriticalSection( &m_windowsCriticalSection );
 		}
-		
+
 		void exit( void )
 		{
 			#ifdef PERF_TIMERS
@@ -80,17 +77,17 @@ class ScopedCriticalSection
 {
 	private:
 		CriticalSection *m_cs;
-	
+
 	public:
 		ScopedCriticalSection( CriticalSection *cs ) : m_cs(cs)
-		{ 
-			if (m_cs) 
+		{
+			if (m_cs)
 				m_cs->enter();
 		}
 
 		virtual ~ScopedCriticalSection( )
-		{ 
-			if (m_cs) 
+		{
+			if (m_cs)
 				m_cs->exit();
 		}
 };
@@ -102,5 +99,3 @@ extern CriticalSection *TheUnicodeStringCriticalSection;
 extern CriticalSection *TheDmaCriticalSection;
 extern CriticalSection *TheMemoryPoolCriticalSection;
 extern CriticalSection *TheDebugLogCriticalSection;
-
-#endif /* __CRITICALSECTION_H__ */
diff --git a/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h b/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h
index 2893e7ef117..cc384c60a0a 100644
--- a/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h
+++ b/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h
@@ -30,16 +30,13 @@
 
 #pragma once
 
-#ifndef __CUSTOMMATCHPREFERENCES_H__
-#define __CUSTOMMATCHPREFERENCES_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 #include "Common/UserPreferences.h"
 
 //-----------------------------------------------------------------------------
-// CustomMatchPreferences base class 
+// CustomMatchPreferences base class
 //-----------------------------------------------------------------------------
 class CustomMatchPreferences : public UserPreferences
 {
@@ -78,6 +75,15 @@ class CustomMatchPreferences : public UserPreferences
 	Bool getDisallowNonAsianText( void );
 	void setDisallowNonAsianText( Bool val );
 
-};
+  Bool getSuperweaponRestricted(void) const;
+  void setSuperweaponRestricted( Bool superweaponRestricted);
+
+  Money getStartingCash(void) const;
+  void setStartingCash( const Money &startingCash );
 
-#endif // __CUSTOMMATCHPREFERENCES_H__
+  Bool getFactionsLimited(void) const; // Prefers to only use the original 3 sides, not USA Air Force General, GLA Toxin General, et al
+  void setFactionsLimited( Bool factionsLimited );
+
+  Bool getUseStats( void ) const;
+  void setUseStats( Bool useStats );
+};
diff --git a/Generals/Code/GameEngine/Include/Common/DamageFX.h b/Generals/Code/GameEngine/Include/Common/DamageFX.h
index 6b17e4cb94a..710a76e55cc 100644
--- a/Generals/Code/GameEngine/Include/Common/DamageFX.h
+++ b/Generals/Code/GameEngine/Include/Common/DamageFX.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _DamageFX_H_
-#define _DamageFX_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameCommon.h"
 #include "Common/NameKeyGenerator.h"
@@ -64,7 +61,7 @@ typedef const FXList* ConstFXListPtr;
 
 	-- DamageFX is shared between multiple units; there should generally only be one instance
 	of any particular class. The implication is that it should not require private data storage
-	to do what it needs to do, aside from stuff initialized at object instantiation time. To help 
+	to do what it needs to do, aside from stuff initialized at object instantiation time. To help
 	enforce this, all it's methods are declared 'const'. If you can't implement the damage you
 	need within this framework, please *don't* simply de-const things, because it could lead to very
 	strange side-effects. Instead, the system will have to be enhanced to allow for multiple instances
@@ -107,8 +104,8 @@ class DamageFX
 	struct DFX
 	{
 		Real									m_amountForMajorFX;				///< if damage done is >= this, use major fx
-		ConstFXListPtr				m_majorDamageFXList;			///< fx to make 
-		ConstFXListPtr				m_minorDamageFXList;			///< fx to make 
+		ConstFXListPtr				m_majorDamageFXList;			///< fx to make
+		ConstFXListPtr				m_minorDamageFXList;			///< fx to make
 		UnsignedInt						m_damageFXThrottleTime;
 
 		DFX()
@@ -126,10 +123,10 @@ class DamageFX
 	};
 
 	DFX m_dfx[DAMAGE_NUM_TYPES][LEVEL_COUNT];
-};  
+};
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
 	The "store" used to hold all the DamageFXs in existence. This is usually used when creating
 	an Object (actually, a Body module), but can be used at any time after that. (It is explicitly
 	OK to swap an Object's DamageFX out at any given time.)
@@ -150,7 +147,9 @@ class DamageFXStore : public SubsystemInterface
 	/**
 		Find the DamageFX with the given name. If no such DamageFX exists, return null.
 	*/
-	const DamageFX *findDamageFX( AsciiString name ) const;
+	const DamageFX *findDamageFX( NameKeyType namekey ) const;
+	const DamageFX *findDamageFX( const AsciiString& name ) const;
+	const DamageFX *findDamageFX( const char* name ) const;
 
 	static void parseDamageFXDefinition(INI* ini);
 
@@ -164,6 +163,3 @@ class DamageFXStore : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern DamageFXStore *TheDamageFXStore;
-
-#endif // _DamageFX_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/DataChunk.h b/Generals/Code/GameEngine/Include/Common/DataChunk.h
index a1130f184cb..9c0e747d9c2 100644
--- a/Generals/Code/GameEngine/Include/Common/DataChunk.h
+++ b/Generals/Code/GameEngine/Include/Common/DataChunk.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _DATA_CHUNK_H_
-#define _DATA_CHUNK_H_
-
 #include "Common/GameMemory.h"
 #include "Common/Dict.h"
 #include "Common/MapReaderWriterInfo.h"
@@ -47,7 +44,7 @@ class DataChunkTableOfContents;
 //----------------------------------------------------------------------
 class Mapping : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Mapping, "Mapping")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Mapping, "Mapping")
 public:
 	Mapping*			next;
 	AsciiString		name;
@@ -60,7 +57,7 @@ EMPTY_DTOR(Mapping)
 //----------------------------------------------------------------------
 class OutputChunk : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(OutputChunk, "OutputChunk")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(OutputChunk, "OutputChunk")
 public:
 	OutputChunk*	next;
 	UnsignedInt		id;															// chunk symbol type from table of contents
@@ -73,7 +70,7 @@ EMPTY_DTOR(OutputChunk)
 //----------------------------------------------------------------------
 class InputChunk : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(InputChunk, "InputChunk")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(InputChunk, "InputChunk")
 public:
 	InputChunk*						next;
 	UnsignedInt						id;															// chunk symbol type from table of contents
@@ -117,7 +114,7 @@ class DataChunkTableOfContents
 class DataChunkOutput
 {
 protected:
-	OutputStream*							m_pOut;										// The actual output stream.	
+	OutputStream*							m_pOut;										// The actual output stream.
 	FILE *										m_tmp_file;												// tmp output file stream
 	DataChunkTableOfContents	m_contents;			// table of contents of data chunk types
 	OutputChunk*							m_chunkStack;													// current stack of open data chunks
@@ -157,7 +154,7 @@ typedef Bool (*DataChunkParserPtr)( DataChunkInput &file, DataChunkInfo *info, v
 //----------------------------------------------------------------------
 class UserParser : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(UserParser, "UserParser")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(UserParser, "UserParser")
 public:
 	UserParser *next;
 
@@ -187,7 +184,7 @@ class DataChunkInput
 
 public:
 	void *m_currentObject;														// user parse routines can use this to allow one chunk
-																									// to create an object, and a subsequent chunk to 
+																									// to create an object, and a subsequent chunk to
 																									// parse values into that object.  However, the second
 																									// chunk parser could also create and parse an object
 																									// of its own if this pointer is NULL.
@@ -232,7 +229,3 @@ class DataChunkInput
 
 	NameKeyType readNameKey(void);
 };
-
-
-
-#endif // _DATA_CHUNK_H_
diff --git a/Generals/Code/GameEngine/Include/Common/Debug.h b/Generals/Code/GameEngine/Include/Common/Debug.h
deleted file mode 100644
index 829946295e0..00000000000
--- a/Generals/Code/GameEngine/Include/Common/Debug.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Debug.h 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  Debug.h
-//
-// Created:    Steven Johnson, August 2001
-//
-// Desc:       Debug Utilities
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __DEBUG_H_
-#define __DEBUG_H_
-
-class AsciiString;
-
-#if defined(RTS_DEBUG) && defined(RTS_INTERNAL)
-	#error "Only one at a time of these should ever be defined"
-#endif
-
-// These are stolen from the WW3D Debug file. REALLY useful. :-)
-#define STRING_IT(a) #a																				  
-#define TOKEN_IT(a) STRING_IT(,##a)
-#define MESSAGE(a) message (__FILE__ "(" TOKEN_IT(__LINE__) ") : " a)
-
-// BGC, 3/26/03 - put this in so we can build internal worldbuilder for a patch that doesn't
-// have any debugging of any kind.
-//#define DISABLE_DEBUG_LOGGING
-
-// by default, turn on ALLOW_DEBUG_UTILS if RTS_DEBUG is turned on.
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(ALLOW_DEBUG_UTILS) && !defined(DISABLE_ALLOW_DEBUG_UTILS)
-	#define ALLOW_DEBUG_UTILS 1
-#elif defined(DEBUG_LOGGING) || defined(DEBUG_CRASHING) || defined(DEBUG_STACKTRACE) || defined(DEBUG_PROFILE)
-	// TheSuperHackers @tweak also turn on when any of the above options is already set.
-	#define ALLOW_DEBUG_UTILS 1
-#endif
-
-// these are predicated on ALLOW_DEBUG_UTILS, not RTS_DEBUG, and allow you to selectively disable
-// bits of the debug stuff for special builds.
-#if defined(ALLOW_DEBUG_UTILS) && !defined(DEBUG_LOGGING) && !defined(DISABLE_DEBUG_LOGGING)
-	#define DEBUG_LOGGING 1
-#endif
-#if defined(ALLOW_DEBUG_UTILS) && !defined(DEBUG_CRASHING) && !defined(DISABLE_DEBUG_CRASHING)
-	#define DEBUG_CRASHING 1
-#endif
-#if defined(ALLOW_DEBUG_UTILS) && !defined(DEBUG_STACKTRACE) && !defined(DISABLE_DEBUG_STACKTRACE)
-	#define DEBUG_STACKTRACE 1
-	#ifndef DEBUG_LOGGING
-		#define DEBUG_LOGGING 1 // TheSuperHackers @compile Stack trace requires logging.
-	#endif
-#endif
-#if defined(ALLOW_DEBUG_UTILS) && !defined(DEBUG_PROFILE) && !defined(DISABLE_DEBUG_PROFILE)
-	#define DEBUG_PROFILE 1
-#endif
-
-#ifdef __cplusplus
-	#define DEBUG_EXTERN_C extern "C"
-#else
-	#define DEBUG_EXTERN_C extern
-#endif
-
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-
-// INLINING ///////////////////////////////////////////////////////////////////
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
-
-/// @todo: the standard line-to-string trick isn't working correctly in vc6; figure out why
-#define DEBUG_STRING_IT(b)	#b
-#define DEBUG_TOKEN_IT(a)		DEBUG_STRING_IT(a)
-#define DEBUG_FILENLINE			__FILE__ ":" DEBUG_TOKEN_IT(__LINE__)
-
-#ifdef ALLOW_DEBUG_UTILS
-
-	enum 
-	{
-		DEBUG_FLAG_LOG_TO_FILE = 0x01,	
-		DEBUG_FLAG_LOG_TO_CONSOLE = 0x02,
-		DEBUG_FLAG_PREPEND_TIME = 0x04,
-#ifdef RTS_INTERNAL
-		// by default, RTS_INTERNAL builds log to file, but not to console, in the interest
-		// of speed. want console output? just change this line:
-		DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE)
-#else
-		DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE | DEBUG_FLAG_LOG_TO_CONSOLE)
-#endif
-	};
-
-	DEBUG_EXTERN_C void DebugInit(int flags);
-	DEBUG_EXTERN_C void DebugShutdown();
-
-	DEBUG_EXTERN_C int DebugGetFlags();
-	DEBUG_EXTERN_C void DebugSetFlags(int flags);
-
-	#define DEBUG_INIT(f)						do { DebugInit(f); } while (0)
-	#define DEBUG_SHUTDOWN()				do { DebugShutdown(); } while (0)
-
-#else
-
-	#define DEBUG_INIT(f)						((void)0)
-	#define DEBUG_SHUTDOWN()				((void)0)
-
-#endif
-
-#ifdef DEBUG_LOGGING
-
-	DEBUG_EXTERN_C void DebugLog(const char *format, ...);
-	DEBUG_EXTERN_C const char* DebugGetLogFileName();
-	DEBUG_EXTERN_C const char* DebugGetLogFileNamePrev();
-
-	// This defines a bitmask of log types that we care about, to allow some flexability
-	// in what gets logged.  This should be extended to asserts, too, but the assert box
-	// is waiting to be rewritten. -MDC 3/19/2003
-	extern unsigned int DebugLevelMask;
-	enum
-	{
-		DEBUG_LEVEL_NET = 0,           // in-game network
-		DEBUG_LEVEL_MAX
-	};
-	extern const char *TheDebugLevels[DEBUG_LEVEL_MAX];
-
-	#define DEBUG_LOG(m)						do { { DebugLog m ; } } while (0)
-	#define DEBUG_LOG_LEVEL(l, m)		do { if (l & DebugLevelMask) { DebugLog m ; } } while (0)
-	#define DEBUG_ASSERTLOG(c, m)		do { { if (!(c)) DebugLog m ; } } while (0)
-
-#else
-
-	#define DEBUG_LOG(m)						((void)0)
-	#define DEBUG_LOG_LEVEL(l, m)		((void)0)
-	#define DEBUG_ASSERTLOG(c, m)		((void)0)
-
-#endif
-
-#ifdef DEBUG_CRASHING
-
-	DEBUG_EXTERN_C void DebugCrash(const char *format, ...);
-
-	/*
-		Yeah, it's a sleazy global, since we can't reasonably add
-		any args to DebugCrash due to the varargs nature of it. 
-		We'll just let it slide in this case...
-	*/
-	DEBUG_EXTERN_C char* TheCurrentIgnoreCrashPtr;
-
-	#define DEBUG_CRASH(m)	\
-		do { \
-			{ \
-				static char ignoreCrash = 0; \
-				if (!ignoreCrash) { \
-					TheCurrentIgnoreCrashPtr = &ignoreCrash; \
-					DebugCrash m ; \
-					TheCurrentIgnoreCrashPtr = NULL; \
-				} \
-			} \
-		} while (0)
-
-	#define DEBUG_ASSERTCRASH(c, m)		do { { if (!(c)) DEBUG_CRASH(m); } } while (0)
-
-	//Note: RELEASE_CRASH(m) is now always defined.
-	//#define RELEASE_CRASH(m)					DEBUG_CRASH((m))
-
-#else
-
-	#define DEBUG_CRASH(m)					((void)0)
-	#define DEBUG_ASSERTCRASH(c, m)	((void)0)
-
-//	DEBUG_EXTERN_C void ReleaseCrash(const char* reason);
-
-//	#define RELEASE_CRASH(m)				do { ReleaseCrash(m); } while (0)
-
-#endif
-
-DEBUG_EXTERN_C void ReleaseCrash(const char* reason);
-DEBUG_EXTERN_C void ReleaseCrashLocalized(const AsciiString& p, const AsciiString& m);
-
-#define RELEASE_CRASH(m)				do { ReleaseCrash(m); } while (0)
-#define RELEASE_CRASHLOCALIZED(p, m)		do { ReleaseCrashLocalized(p, m); } while (0)
-
-
-#ifdef DEBUG_PROFILE
-
-class SimpleProfiler
-{
-private:
-	__int64 m_freq;
-	__int64 m_startThisSession;
-	__int64 m_totalThisSession;
-	__int64 m_totalAllSessions;
-	int			m_numSessions;
-
-public:
-
-	SimpleProfiler();
-	void start();
-	void stop();
-	void stopAndLog(const char *msg, int howOftenToLog, int howOftenToResetAvg);
-	double getTime();				// of most recent session, in milliseconds
-	int getNumSessions();
-	double getTotalTime();	// total over all sessions, in milliseconds
-	double getAverageTime();	// averaged over all sessions, in milliseconds
-
-};
-
-#define BEGIN_PROFILE(uniqueid) \
-	static SimpleProfiler prof_##uniqueid; \
-	prof_##uniqueid.start();
-
-#define END_PROFILE(uniqueid, msg, howoftentolog, howoftentoreset) \
-	prof_##uniqueid.stopAndLog(msg, howoftentolog, howoftentoreset);
-
-#else
-	
-#define BEGIN_PROFILE(uniqueid)
-#define END_PROFILE(uniqueid, msg, howoftentolog, howoftentoreset)
-
-#endif
-
-// MACROS //////////////////////////////////////////////////////////////////
-
-#endif // __DEBUG_H_
diff --git a/Generals/Code/GameEngine/Include/Common/Dict.h b/Generals/Code/GameEngine/Include/Common/Dict.h
index 7ac311a0ac6..424fa3ae6bf 100644
--- a/Generals/Code/GameEngine/Include/Common/Dict.h
+++ b/Generals/Code/GameEngine/Include/Common/Dict.h
@@ -22,14 +22,14 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Dict.h 
+// FILE: Dict.h
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,17 +45,14 @@
 
 #pragma once
 
-#ifndef Dict_H
-#define Dict_H
-
 #include "Common/Errors.h"
 #include "Common/NameKeyGenerator.h"
 
 // -----------------------------------------------------
 /**
-	Dict provides a general utility class for maintaining 
+	Dict provides a general utility class for maintaining
 	a sorted key-value pair list. Keys are currently required
-	to be of type NameKeyType, and data may be Bool, int, real, 
+	to be of type NameKeyType, and data may be Bool, int, real,
 	or string.
 
 	Current implementation keeps the pairs sorted by key, and
@@ -66,8 +63,8 @@
 class Dict
 {
 public:
-	enum 
-	{ 
+	enum
+	{
 		MAX_LEN = 32767							///< max total len of any Dict, in Pairs
 	};
 
@@ -128,7 +125,7 @@ class Dict
 	/**
 		Return there is a pair with the given key and datatype, return true.
 	*/
-	inline Bool known(NameKeyType key, DataType d) const
+	Bool known(NameKeyType key, DataType d) const
 	{
 		return getType(key) == d;
 	}
@@ -141,62 +138,62 @@ class Dict
 
 	/**
 		return the value for the pair with the given key.
-		if there is no pair with the given key, or the value is 
+		if there is no pair with the given key, or the value is
 		not of the correct type, 0 is returned.
 	*/
 	Bool getBool(NameKeyType key, Bool* exists = NULL) const;
 	/**
 		return the value for the pair with the given key.
-		if there is no pair with the given key, or the value is 
+		if there is no pair with the given key, or the value is
 		not of the correct type, 0 is returned.
 	*/
 	Int getInt(NameKeyType key, Bool* exists = NULL) const;
 	/**
 		return the value for the pair with the given key.
-		if there is no pair with the given key, or the value is 
+		if there is no pair with the given key, or the value is
 		not of the correct type, 0 is returned.
 	*/
 	Real getReal(NameKeyType key, Bool* exists = NULL) const;
 	/**
 		return the value for the pair with the given key.
-		if there is no pair with the given key, or the value is 
+		if there is no pair with the given key, or the value is
 		not of the correct type, "" is returned.
 	*/
 	AsciiString getAsciiString(NameKeyType key, Bool* exists = NULL) const;
 	/**
 		return the value for the pair with the given key.
-		if there is no pair with the given key, or the value is 
+		if there is no pair with the given key, or the value is
 		not of the correct type, "" is returned.
 	*/
 	UnicodeString getUnicodeString(NameKeyType key, Bool* exists = NULL) const;
 
 	/**
 		return the value for the pair with the given index.
-		if the index is out of range, or the value is 
+		if the index is out of range, or the value is
 		not of the correct type, 0 is returned.
 	*/
 	Bool getNthBool(Int n) const;
 	/**
 		return the value for the pair with the given index.
-		if the index is out of range, or the value is 
+		if the index is out of range, or the value is
 		not of the correct type, 0 is returned.
 	*/
 	Int getNthInt(Int n) const;
 	/**
 		return the value for the pair with the given index.
-		if the index is out of range, or the value is 
+		if the index is out of range, or the value is
 		not of the correct type, 0 is returned.
 	*/
 	Real getNthReal(Int n) const;
 	/**
 		return the value for the pair with the given index.
-		if the index is out of range, or the value is 
+		if the index is out of range, or the value is
 		not of the correct type, "" is returned.
 	*/
 	AsciiString getNthAsciiString(Int n) const;
 	/**
 		return the value for the pair with the given index.
-		if the index is out of range, or the value is 
+		if the index is out of range, or the value is
 		not of the correct type, "" is returned.
 	*/
 	UnicodeString getNthUnicodeString(Int n) const;
@@ -255,7 +252,7 @@ class Dict
 	void copyPairFrom(const Dict& that, NameKeyType key);
 
 private:
-	
+
 	struct DictPair;
 	struct DictPairData;
 
@@ -266,7 +263,7 @@ class Dict
 	DictPair* findPairByKey(NameKeyType key) const;
 	void releaseData();
 	DictPair *ensureUnique(int numPairsNeeded, Bool preserveData, DictPair *pairToTranslate);
-	
+
 	enum DictPairKeyType
 	{
 		DICTPAIRKEY_ILLEGAL = 0
@@ -281,17 +278,17 @@ class Dict
 		DictPairKeyType		m_key;
 		void*							m_value;
 
-		inline static DictPairKeyType createKey(NameKeyType keyVal, DataType nt)
+		static DictPairKeyType createKey(NameKeyType keyVal, DataType nt)
 		{
 			return (DictPairKeyType)((((UnsignedInt)(keyVal)) << 8) | ((UnsignedInt)nt));
 		}
 
-		inline static DataType getTypeFromKey(DictPairKeyType nk)
+		static DataType getTypeFromKey(DictPairKeyType nk)
 		{
 			return (DataType)(((UnsignedInt)nk) & 0xff);
 		}
 
-		inline static NameKeyType getNameFromKey(DictPairKeyType nk)
+		static NameKeyType getNameFromKey(DictPairKeyType nk)
 		{
 			return (NameKeyType)(((UnsignedInt)nk) >> 8);
 		}
@@ -301,13 +298,13 @@ class Dict
 		void clear();
 		void copyFrom(DictPair* that);
 		void setNameAndType(NameKeyType key, DataType type);
-		inline DataType getType() const { return getTypeFromKey(m_key); }
-		inline NameKeyType getName() const { return getNameFromKey(m_key); }
-		inline Bool* asBool() { return (Bool*)&m_value; }
-		inline Int* asInt() { return (Int*)&m_value; }
-		inline Real* asReal() { return (Real*)&m_value; }
-		inline AsciiString* asAsciiString() { return (AsciiString*)&m_value; }
-		inline UnicodeString* asUnicodeString() { return (UnicodeString*)&m_value; }
+		DataType getType() const { return getTypeFromKey(m_key); }
+		NameKeyType getName() const { return getNameFromKey(m_key); }
+		Bool* asBool() { return (Bool*)&m_value; }
+		Int* asInt() { return (Int*)&m_value; }
+		Real* asReal() { return (Real*)&m_value; }
+		AsciiString* asAsciiString() { return (AsciiString*)&m_value; }
+		UnicodeString* asUnicodeString() { return (UnicodeString*)&m_value; }
 	};
 
 	struct DictPairData
@@ -317,13 +314,13 @@ class Dict
 		unsigned short	m_numPairsUsed;				// length of data allocated
 		//DictPair m_pairs[];
 
-		inline DictPair* peek() { return (DictPair*)(this+1); }
+		DictPair* peek() { return (DictPair*)(this+1); }
 	};
 
 	#ifdef RTS_DEBUG
 	void validate() const;
 	#else
-	inline void validate() const { }
+	void validate() const { }
 	#endif
 
 };
@@ -362,7 +359,3 @@ inline Dict::DataType Dict::getNthType(Int n) const
 		return DICT_NONE;
 	return m_data->peek()[n].getType();
 }
-
-#endif // Dict_H
-
-
diff --git a/Generals/Code/GameEngine/Include/Common/Directory.h b/Generals/Code/GameEngine/Include/Common/Directory.h
index 773c179d7c8..7d1f0adf7e5 100644
--- a/Generals/Code/GameEngine/Include/Common/Directory.h
+++ b/Generals/Code/GameEngine/Include/Common/Directory.h
@@ -27,10 +27,8 @@
 // Desc:	 Directory info class
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #if (0)
-#pragma once
 
-#ifndef __DIRECTORY_H__
-#define __DIRECTORY_H__
+#pragma once
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/AsciiString.h"
@@ -90,6 +88,4 @@ class Directory
 
 //-------------------------------------------------------------------------------------------------
 
-#endif // __DIRECTORY_H__
-
-#endif
\ No newline at end of file
+#endif
diff --git a/Generals/Code/GameEngine/Include/Common/DisabledTypes.h b/Generals/Code/GameEngine/Include/Common/DisabledTypes.h
index 89ecb6aa320..31fd14a0b70 100644
--- a/Generals/Code/GameEngine/Include/Common/DisabledTypes.h
+++ b/Generals/Code/GameEngine/Include/Common/DisabledTypes.h
@@ -25,13 +25,10 @@
 // FILE: DisabledTypes.h //////////////////////////////////////////////////////////////////////////
 // Author: Kris Morness, September 2002
 // Desc:  Defines all the types of disabled statii any given object can have.
-///////////////////////////////////////////////////////////////////////////////////////////////////	
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __DISABLED_TYPES_H_
-#define __DISABLED_TYPES_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
 #include "Common/BitFlags.h"
@@ -66,13 +63,13 @@ typedef BitFlags<DISABLED_COUNT>	DisabledMaskType;
 #define MAKE_DISABLED_MASK4(k,a,b,c) DisabledMaskType(DisabledMaskType::kInit, (k), (a), (b), (c))
 #define MAKE_DISABLED_MASK5(k,a,b,c,d) DisabledMaskType(DisabledMaskType::kInit, (k), (a), (b), (c), (d))
 
-inline Bool TEST_DISABLEDMASK(const DisabledMaskType& m, DisabledType t) 
-{ 
-	return m.test(t); 
+inline Bool TEST_DISABLEDMASK(const DisabledMaskType& m, DisabledType t)
+{
+	return m.test(t);
 }
 
-inline Bool TEST_DISABLEDMASK_ANY(const DisabledMaskType& m, const DisabledMaskType& mask) 
-{ 
+inline Bool TEST_DISABLEDMASK_ANY(const DisabledMaskType& m, const DisabledMaskType& mask)
+{
 	return m.anyIntersectionWith(mask);
 }
 
@@ -81,14 +78,14 @@ inline Bool TEST_DISABLEDMASK_MULTI(const DisabledMaskType& m, const DisabledMas
 	return m.testSetAndClear(mustBeSet, mustBeClear);
 }
 
-inline Bool DISABLEDMASK_ANY_SET(const DisabledMaskType& m) 
-{ 
-	return m.any(); 
+inline Bool DISABLEDMASK_ANY_SET(const DisabledMaskType& m)
+{
+	return m.any();
 }
 
-inline void CLEAR_DISABLEDMASK(DisabledMaskType& m) 
-{ 
-	m.clear(); 
+inline void CLEAR_DISABLEDMASK(DisabledMaskType& m)
+{
+	m.clear();
 }
 
 inline void SET_ALL_DISABLEDMASK_BITS(DisabledMaskType& m)
@@ -109,6 +106,3 @@ extern const char *TheDisabledNames[];
 extern DisabledMaskType DISABLEDMASK_NONE;	// inits to all zeroes
 extern DisabledMaskType DISABLEDMASK_ALL;		// inits to all bits set.
 void initDisabledMasks();
-
-#endif	// __DISABLED_TYPES_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h b/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h
index 782631b9359..1ec8fcd5ab0 100644
--- a/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h
+++ b/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h
@@ -29,12 +29,9 @@
 
 #pragma once
 
-#ifndef __DISCRETECIRCLE_H__
-#define __DISCRETECIRCLE_H__
-
 //-------------------------------------------------------------------------------------------------
 /**
-	One horizontal line of the circle we are going to generate, the points drawn should be from 
+	One horizontal line of the circle we are going to generate, the points drawn should be from
 	(xStart, yPos)-(xEnd, yPos), inclusive.
 */
 struct HorzLine
@@ -54,8 +51,8 @@ typedef VecHorzLine::iterator VecHorzLineIt;
 typedef void (*ScanlineDrawFunc)(Int xStart, Int xEnd, Int yPos, void *otherParms);
 
 /**
-	DiscreteCircle generates a circle centered at xCenter, yCenter, including radius. It generates 
-	horizontal segments for the top half of the circle only, so they need to be duplicated for the 
+	DiscreteCircle generates a circle centered at xCenter, yCenter, including radius. It generates
+	horizontal segments for the top half of the circle only, so they need to be duplicated for the
 	bottom half.
 */
 class DiscreteCircle
@@ -69,11 +66,8 @@ class DiscreteCircle
 		__inline const VecHorzLine &getEdges(void) const { return m_edges; }
 		__inline Int getEdgeCount(void) const { return m_edges.size(); }
 		void drawCircle(ScanlineDrawFunc functionToDrawWith, void *parmToPass);
-		
+
 	protected:
 		void generateEdgePairs(Int xCenter, Int yCenter, Int radius);
 		void removeDuplicates();
 };
-
-#endif /* __DISCRETECIRCLE_H__ */
-
diff --git a/Generals/Code/GameEngine/Include/Common/DrawModule.h b/Generals/Code/GameEngine/Include/Common/DrawModule.h
index 152b137d637..e13310fa187 100644
--- a/Generals/Code/GameEngine/Include/Common/DrawModule.h
+++ b/Generals/Code/GameEngine/Include/Common/DrawModule.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: DrawModule.h /////////////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:	 
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __DRAWMODULE_H_
-#define __DRAWMODULE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameType.h"
 #include "Common/Module.h"
@@ -41,6 +38,7 @@
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Matrix3D;
 class RenderCost;
+class OBBoxClass;
 
 // TYPES //////////////////////////////////////////////////////////////////////////////////////////
 
@@ -66,18 +64,18 @@ class DrawModule : public DrawableModule
 	MAKE_STANDARD_MODULE_MACRO_ABC( DrawModule )
 
 public:
-	
+
 	DrawModule( Thing *thing, const ModuleData* moduleData );
 	static ModuleType getModuleType() { return MODULETYPE_DRAW; }
 	static Int getInterfaceMask() { return MODULEINTERFACE_DRAW; }
-	
+
 	virtual void doDrawModule(const Matrix3D* transformMtx) = 0;
 
 	virtual void setShadowsEnabled(Bool enable) = 0;
 	virtual void releaseShadows(void) = 0;	///< frees all shadow resources used by this module - used by Options screen.
 	virtual void allocateShadows(void) = 0; ///< create shadow resources if not already present. Used by Options screen.
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+#if defined(RTS_DEBUG)
 	virtual void getRenderCost(RenderCost & rc) const { };  ///< estimates the render cost of this draw module
 #endif
 
@@ -86,12 +84,12 @@ class DrawModule : public DrawableModule
 	virtual void setTerrainDecalOpacity(Real o) {};
 
 	virtual void setFullyObscuredByShroud(Bool fullyObscured) = 0;
-	
+
 	virtual Bool isVisible() const { return true; }	///< for limiting tree sway, etc to visible objects
 
 	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle) = 0;
 	virtual void reactToGeometryChange() = 0;
-	
+
 	virtual Bool isLaser() const { return false; }
 
 	// interface acquisition
@@ -157,12 +155,16 @@ class ObjectDrawInterface
 
 	// this method must ONLY be called from the client, NEVER From the logic, not even indirectly.
 	virtual Bool clientOnly_getRenderObjInfo(Coord3D* pos, Real* boundingSphereRadius, Matrix3D* transform) const = 0;
+
+	// (gth) C&C3 adding these accessors to render object properties
+	virtual Bool clientOnly_getRenderObjBoundBox(OBBoxClass * boundbox) const = 0;
+	virtual Bool clientOnly_getRenderObjBoneTransform(const AsciiString & boneName,Matrix3D * set_tm) const = 0;
 	/**
 		Find the bone(s) with the given name and return their positions and/or transforms in the given arrays.
 		We look for a bone named "boneNamePrefixQQ", where QQ is 01, 02, 03, etc, starting at the
 		value of "startIndex". Want to look for just a specific boneName with no numeric suffix?
-		just pass zero (0) for startIndex. (no, we never look for "boneNamePrefix00".) 
-		We copy up to 'maxBones' into the array(s), and return the total count found. 
+		just pass zero (0) for startIndex. (no, we never look for "boneNamePrefix00".)
+		We copy up to 'maxBones' into the array(s), and return the total count found.
 
 		NOTE: this returns the positions and transform for the "ideal" model... that is,
 		at its default rotation and scale, located at (0,0,0). You'll have to concatenate
@@ -187,7 +189,7 @@ class ObjectDrawInterface
 	virtual void setSelectable(Bool selectable) = 0;
 
 	/**
-		This call says, "I want the current animation (if any) to take n frames to complete a single cycle". 
+		This call says, "I want the current animation (if any) to take n frames to complete a single cycle".
 		If it's a looping anim, each loop will take n frames. someday, we may want to add the option to insert
 		"pad" frames at the start and/or end, but for now, we always just "stretch" the animation to fit.
 		Note that you must call this AFTER setting the condition codes.
@@ -196,12 +198,12 @@ class ObjectDrawInterface
 
 	/**
 		similar to the above, but assumes that the current state is a "ONCE",
-		and is smart about transition states... if there is a transition state 
+		and is smart about transition states... if there is a transition state
 		"inbetween", it is included in the completion time.
 	*/
 	virtual void setAnimationCompletionTime(UnsignedInt numFrames) = 0;
 	virtual Bool updateBonesForClientParticleSystems( void ) = 0;///< this will reposition particle systems on the fly ML
-	
+
 	/**
 	  This call is used to pause or resume an animation.
 	*/
@@ -211,7 +213,7 @@ class ObjectDrawInterface
 	virtual void showSubObject( const AsciiString& name, Bool show ) = 0;
 
 	/**
-		This call asks, "In the current animation (if any) how far along are you, from 0.0f to 1.0f". 
+		This call asks, "In the current animation (if any) how far along are you, from 0.0f to 1.0f".
 	*/
 #ifdef ALLOW_ANIM_INQUIRIES
 // srj sez: not sure if this is a good idea, for net sync reasons...
@@ -248,7 +250,3 @@ class RenderCost
 	int		m_boneCount;
 	int		m_shadowDrawCount;
 };
-
-
-#endif // __DRAWMODULE_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/Energy.h b/Generals/Code/GameEngine/Include/Common/Energy.h
index aea27403673..ecdda0f2f6f 100644
--- a/Generals/Code/GameEngine/Include/Common/Energy.h
+++ b/Generals/Code/GameEngine/Include/Common/Energy.h
@@ -24,12 +24,12 @@
 
 // FILE: Energy.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef _ENERGY_H_
-#define _ENERGY_H_
-
 // INLCUDES /////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Snapshot.h"
 
@@ -65,7 +62,7 @@ class Energy : public Snapshot
 {
 
 public:
-	
+
 	Energy();
 
 	// reset energy information to base values.
@@ -83,7 +80,7 @@ class Energy : public Snapshot
 	Int getConsumption() const { return m_energyConsumption; }
 
 	Bool hasSufficientPower(void) const;
-	
+
 	// If adding is false, we're supposed to be removing this.
 	void adjustPower(Int powerDelta, Bool adding);
 
@@ -118,6 +115,3 @@ class Energy : public Snapshot
 	Int		m_energyConsumption;	///< level of energy consumption, in kw
 	Player *m_owner;						///< Tight pointer to the Player I am intrinsic to.
 };
-
-#endif // _ENERGY_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/Errors.h b/Generals/Code/GameEngine/Include/Common/Errors.h
index 74ae98bcd8f..2c2cec27c6c 100644
--- a/Generals/Code/GameEngine/Include/Common/Errors.h
+++ b/Generals/Code/GameEngine/Include/Common/Errors.h
@@ -22,14 +22,14 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Errors.h 
+// FILE: Errors.h
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __ERRORS_H_
-#define __ERRORS_H_
-
 /**
 	An ErrorCode is the repository for failure modes. In almost all situations,
 	these values will  be THROWN, not returned as error codes. Feel free
@@ -64,9 +61,7 @@ enum ErrorCode CPP_11(: UnsignedInt)
 	ERROR_INVALID_FILE_VERSION	= (ERROR_BASE + 0x0003),		///< Unrecognized file version.
 	ERROR_CORRUPT_FILE_FORMAT		= (ERROR_BASE + 0x0004),		///< Invalid file format.
 	ERROR_BAD_INI								= (ERROR_BASE + 0x0005),		///< Bad INI data.
-	ERROR_INVALID_D3D						= (ERROR_BASE + 0x0006),    ///< Error initing D3D 
+	ERROR_INVALID_D3D						= (ERROR_BASE + 0x0006),    ///< Error initing D3D
 
 	ERROR_LAST
 };
-
-#endif // __ERRORS_H_
diff --git a/Generals/Code/GameEngine/Include/Common/FileSystem.h b/Generals/Code/GameEngine/Include/Common/FileSystem.h
deleted file mode 100644
index abd90f0f08b..00000000000
--- a/Generals/Code/GameEngine/Include/Common/FileSystem.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    GameEngine
-//
-// Module:     IO
-//
-// File name:  FileSystem.h
-//
-// Created:    
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __FILESYSTEM_H
-#define __FILESYSTEM_H
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/STLTypedefs.h"
-#include "Common/SubsystemInterface.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-class File;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-typedef std::set<AsciiString, rts::less_than_nocase<AsciiString> > FilenameList;
-typedef FilenameList::iterator FilenameListIter;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-//#define W3D_DIR_PATH "../FinalArt/W3D/"					///< .w3d files live here
-//#define TGA_DIR_PATH "../FinalArt/Textures/"		///< .tga texture files live here
-//#define TERRAIN_TGA_DIR_PATH "../FinalArt/Terrain/"		///< terrain .tga texture files live here
-#define W3D_DIR_PATH "Art/W3D/"					///< .w3d files live here
-#define TGA_DIR_PATH "Art/Textures/"		///< .tga texture files live here
-#define TERRAIN_TGA_DIR_PATH "Art/Terrain/"		///< terrain .tga texture files live here
-#define MAP_PREVIEW_DIR_PATH "%sMapPreviews/"	///< We need a common place we can copy the map previews to at runtime.
-#define USER_W3D_DIR_PATH "%sW3D/"					///< .w3d files live here
-#define USER_TGA_DIR_PATH "%sTextures/"		///< User .tga texture files live here
-
-// the following defines are only to be used while maintaining legacy compatability
-// with old files until they are completely gone and in the regular art set
-#ifdef MAINTAIN_LEGACY_FILES
-#define LEGACY_W3D_DIR_PATH "../LegacyArt/W3D/"				///< .w3d files live here
-#define LEGACY_TGA_DIR_PATH "../LegacyArt/Textures/"	///< .tga texture files live here
-#endif  // MAINTAIN_LEGACY_FILES
-
-// LOAD_TEST_ASSETS automatically loads w3d assets from the TEST_W3D_DIR_PATH
-// without having to add an INI entry.
-///@todo this allows us to use the test art directory, it should be removed for FINAL release
-#define LOAD_TEST_ASSETS 1
-#ifdef LOAD_TEST_ASSETS
-	#define ROAD_DIRECTORY		"../TestArt/TestRoad/"
-	#define TEST_STRING				"***TESTING"
-// the following directories will be used to look for test art
-#define LOOK_FOR_TEST_ART
-#define TEST_W3D_DIR_PATH "../TestArt/"					///< .w3d files live here
-#define TEST_TGA_DIR_PATH "../TestArt/"		///< .tga texture files live here
-#endif
-
-struct FileInfo {
-	Int sizeHigh;
-	Int sizeLow;
-	Int timestampHigh;
-	Int timestampLow;
-};
-
-//===============================
-// FileSystem
-//===============================
-/**
-  * FileSystem is an interface class for creating specific FileSystem objects.
-  * 
-	* A FileSystem object's implemenation decides what derivative of File object needs to be 
-	* created when FileSystem::Open() gets called.
-	*/
-//===============================
-
-class FileSystem : public SubsystemInterface
-{
-public:
-	FileSystem();
-	virtual	~FileSystem();
-
-	void init();
-	void reset();
-	void update();
-
-	File* openFile( const Char *filename, Int access = 0 );		///< opens a File interface to the specified file
-	Bool doesFileExist(const Char *filename) const;								///< returns TRUE if the file exists.  filename should have no directory.
-	void getFileListInDirectory(const AsciiString& directory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.
-	Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const; ///< fills in the FileInfo struct for the file given. returns TRUE if successful.
-
-	Bool createDirectory(AsciiString directory); ///< create a directory of the given name.
-
-	Bool areMusicFilesOnCD();
-	void loadMusicFilesFromCD();
-	void unloadMusicFilesFromCD();
-protected:
-
-
-};
-
-extern FileSystem*	TheFileSystem;
-
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-
-
-#endif // __WSYS_FILESYSTEM_H
diff --git a/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h b/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h
index 3566485a737..bdc82b65de3 100644
--- a/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h
+++ b/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __FUNCTIONLEXICON_H_
-#define __FUNCTIONLEXICON_H_
-
 #include "Common/SubsystemInterface.h"
 #include "Common/NameKeyGenerator.h"
 #include "Common/GameMemory.h"
@@ -68,7 +65,7 @@ class FunctionLexicon : public SubsystemInterface
 		TABLE_WIN_LAYOUT_UPDATE,
 		TABLE_WIN_LAYOUT_SHUTDOWN,
 
-		MAX_FUNCTION_TABLES			// keep this last
+		MAX_FUNCTION_TABLES
 	};
 
 public:
@@ -91,7 +88,7 @@ class FunctionLexicon : public SubsystemInterface
 	// that functions in the tables are unique and that there is a 1 to 1
 	// mapping of a symbol to a function address.  However, when compiling
 	// in release, functions that have the same arguments and the same
-	// body (mainly empty stub functions) get optimized to the 
+	// body (mainly empty stub functions) get optimized to the
 	// SAME ADDRESS.  That destroyes our 1 to 1 mapping so it is something
 	// that we must avoid
 	//
@@ -117,7 +114,7 @@ class FunctionLexicon : public SubsystemInterface
 	/** given a key find the function, the index parameter can limit the search
 	to a single table or to ANY of the tables */
 	void *findFunction( NameKeyType key, TableIndex index );
-	
+
 #ifdef NOT_IN_USE
 	const char *funcToName( void *func, TableEntry *table );  ///< internal searching
 #endif
@@ -125,10 +122,10 @@ class FunctionLexicon : public SubsystemInterface
 
 	TableEntry *m_tables[ MAX_FUNCTION_TABLES ];  ///< the lookup tables
 
-};  // end class FunctionLexicon
+};
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// INLINING 
+// INLINING
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 inline FunctionLexicon::TableEntry *FunctionLexicon::getTable( TableIndex index )
 	{ return m_tables[ index ]; }
@@ -146,9 +143,6 @@ inline WindowLayoutShutdownFunc FunctionLexicon::winLayoutShutdownFunc( NameKeyT
 	{ return (WindowLayoutShutdownFunc)findFunction( key, index ); }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// EXTERNALS 
+// EXTERNALS
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 extern FunctionLexicon *TheFunctionLexicon;  ///< function dictionary external
-
-#endif // end __FUNCTIONLEXICON_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/GameAudio.h b/Generals/Code/GameEngine/Include/Common/GameAudio.h
deleted file mode 100644
index 9897b6a45cb..00000000000
--- a/Generals/Code/GameEngine/Include/Common/GameAudio.h
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    RTS 3
-//
-// File name:  Common/GameAudio.h
-//
-// Created:    5/01/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __COMMON_GAMEAUDIO_H_
-#define __COMMON_GAMEAUDIO_H_
-
-// Includes                                                      
-#include "Lib/BaseType.h"
-#include "Common/STLTypedefs.h"
-#include "Common/SubsystemInterface.h"
-
-
-// Forward Declarations
-
-class AsciiString;
-class AudioEventRTS;
-class DebugDisplayInterface;
-class Drawable;
-class MusicManager;
-class Object;
-class SoundManager;
-
-
-enum AudioAffect CPP_11(: Int);
-enum AudioType CPP_11(: Int);
-
-struct AudioEventInfo;
-struct AudioRequest;
-struct AudioSettings;
-struct MiscAudio;
-
-typedef std::hash_map<AsciiString, AudioEventInfo*, rts::hash<AsciiString>, rts::equal_to<AsciiString> > AudioEventInfoHash;
-typedef AudioEventInfoHash::iterator AudioEventInfoHashIt;
-typedef UnsignedInt AudioHandle;
-
-
-// Defines
-enum
-{
-	PROVIDER_ERROR = 0xFFFFFFFF
-};
-
-// Class AudioManager
-/**
-	The life of audio.
-
-	When audio is requested to play, it is done so in the following manner:
-	1) An AudioEventRTS is created on the stack.
-	2) Its guts are copied from elsewhere (for instance, a ThingTemplate, or MiscAudio).
-	3) It is added to TheAudio via TheAudio->addAudioEvent(...)
-
-	The return value from addAudioEvent can be saved in case the sound needs to loop and/or be 
-	terminated at some point. 
-	
-	To reomve a playing sound, the call TheAudio->removeAudioEvent(...) is used. This will search 
-	the list of currently playing audio for the specified handle, and kill the attached sound. It 
-	will play a decay sound, if one is specified.
-
-	The important functions of TheAudio, are therefore 
-		GameAudio::addAudioEvent()
-		GameAudio::removeAudioEvent()
-	All other functions exist to support these two basic requirements.
-
-	In addition to the fundamental requirements, the audio has a fairly complicated sound management
-	scheme. If all units were always allowed to sound off, the sound engine would be overwhelmed and 
-	would sound awful. Therefore, when an audio event is requested, it goes through a series of 
-	checks to determine if it is near enough to the camera, if it should be heard based on shroud, 
-	local player affiliation, etc. (The entire list of checks is contained in shouldPlayLocally()).
-	
-	In addition, the world and unit audio are never allowed to exceed their footprint, as specified
-	in the audio settings INI file. In order to accomodate this, the audio uses an audio cache. The
-	audio cache will attempt to load a sample, assuming there is enough room. If there is not enough
-	room, then it goes through and finds any samples that are lower priority, and kills them until 
-	enough room is present for the sample. If it cannot free enough room, nothing happens to the 
-	cache.
-
-	Although the audio is multithreaded, most of the operations are performed such that the worst 
-	case scenario for thread miscommunication is that the main thread misses an event for one frame.
-	One specific case of this is the status of playing audio. Because audio is playing 
-	asynchronously, it can complete at any time. When most audio completes, it sets a flag on the 
-	event noting that it has completed. During the next update (from the main thread), anything with
-	that flag set is moved to the stopped list, and then is cleaned up. (Basically, the audio uses 
-	a push model for its multithreadedness, which doesn't require thread safety such as mutexes or 
-	semaphores).
-
-	All in all, the best way to learn how the audio works is to track the lifetime of an event 
-	through the system. This will give a better understanding than all the documentation I could 
-	write.
-
-	-jkmcd 
-	-December 2002
-*/
-
-class AudioManager : public SubsystemInterface
-{
-	public:
-		AudioManager();
-		virtual ~AudioManager();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *userData, FILE *fp = NULL ) = 0;
-#endif
-
-		// From SubsystemInterface
-		virtual void init();
-		virtual void postProcessLoad();
-		virtual void reset();
-		virtual void update();
-
-		// device dependent stop, pause and resume
-		virtual void stopAudio( AudioAffect which ) = 0;
-		virtual void pauseAudio( AudioAffect which ) = 0;
-		virtual void resumeAudio( AudioAffect which ) = 0;
-		virtual void pauseAmbient( Bool shouldPause ) = 0;
-
-		// for focus issues
-		virtual void loseFocus( void );
-		virtual void regainFocus( void );
-
-		// control for AudioEventsRTS
-		virtual AudioHandle addAudioEvent( const AudioEventRTS *eventToAdd );	///< Add an audio event (event must be declared in an INI file)
-		virtual void removeAudioEvent( AudioHandle audioEvent );	///< Remove an audio event, stop for instance.
-		virtual void killAudioEventImmediately( AudioHandle audioEvent ) = 0;
-
-		virtual Bool isValidAudioEvent( const AudioEventRTS *eventToCheck ) const;	///< validate that this piece of audio exists
-		virtual Bool isValidAudioEvent( AudioEventRTS *eventToCheck ) const;	///< validate that this piece of audio exists
-
-		// add tracks during INIification
-		void addTrackName( const AsciiString& trackName );
-		AsciiString nextTrackName(const AsciiString& currentTrack );
-		AsciiString prevTrackName(const AsciiString& currentTrack );
-		
-		// changing music tracks
-		virtual void nextMusicTrack( void ) = 0;
-		virtual void prevMusicTrack( void ) = 0;
-		virtual Bool isMusicPlaying( void ) const = 0;
-		virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const = 0;
-		virtual AsciiString getMusicTrackName( void ) const = 0;
-
-		virtual void setAudioEventEnabled( AsciiString eventToAffect, Bool enable );
-		virtual void setAudioEventVolumeOverride( AsciiString eventToAffect, Real newVolume );
-		virtual void removeAudioEvent( AsciiString eventToRemove );
-		virtual void removeDisabledEvents();
-
-		// Really meant for internal purposes only, but cannot be protected.
-		virtual void getInfoForAudioEvent( const AudioEventRTS *eventToFindAndFill ) const;	// Note: m_eventInfo is Mutable, and so this function will overwrite it if found
-
-		///< Return whether the current audio is playing or not. 
-		///< NOTE NOTE NOTE !!DO NOT USE THIS IN FOR GAMELOGIC PURPOSES!! NOTE NOTE NOTE
-		virtual Bool isCurrentlyPlaying( AudioHandle handle );
-
-		// Device Dependent open and close functions
-		virtual void openDevice( void ) = 0;
-		virtual void closeDevice( void ) = 0;
-		virtual void *getDevice( void ) = 0;
-
-		// Debice Dependent notification functions
-		virtual void notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags ) = 0;
-
-		// Device Dependent enumerate providers functions. It is okay for there to be only 1 provider (Miles provides a maximum of 64.
-		virtual UnsignedInt getProviderCount( void ) const = 0;
-		virtual AsciiString getProviderName( UnsignedInt providerNum ) const = 0;
-		virtual UnsignedInt getProviderIndex( AsciiString providerName ) const = 0;
-		virtual void selectProvider( UnsignedInt providerNdx ) = 0;
-		virtual void unselectProvider( void ) = 0;
-		virtual UnsignedInt getSelectedProvider( void ) const = 0;
-		virtual void setSpeakerType( UnsignedInt speakerType ) = 0;
-		virtual UnsignedInt getSpeakerType( void ) = 0;
-
-		virtual UnsignedInt translateSpeakerTypeToUnsignedInt( const AsciiString& speakerType );
-		virtual AsciiString translateUnsignedIntToSpeakerType( UnsignedInt speakerType );
-
-		// Device Dependent calls to get the number of channels for each type of audio (2-D, 3-D, Streams)
-		virtual UnsignedInt getNum2DSamples( void ) const = 0;
-		virtual UnsignedInt getNum3DSamples( void ) const = 0;
-		virtual UnsignedInt getNumStreams( void ) const = 0;
-
-		// Device Dependent calls to determine sound prioritization info
-		virtual Bool doesViolateLimit( AudioEventRTS *event ) const = 0;
-		virtual Bool isPlayingLowerPriority( AudioEventRTS *event ) const = 0;
-		virtual Bool isPlayingAlready( AudioEventRTS *event ) const = 0;
-		virtual Bool isObjectPlayingVoice( UnsignedInt objID ) const = 0;
-
-		virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume) = 0;
-		virtual void removePlayingAudio( AsciiString eventName ) = 0;
-		virtual void removeAllDisabledAudio() = 0;
-		
-		// Is the audio device on? We can skip a lot of audio processing if not.
-		virtual Bool isOn( AudioAffect whichToGet ) const;
-		virtual void setOn( Bool turnOn, AudioAffect whichToAffect );
-
-		// Set and get the device Volume
-		virtual void setVolume( Real volume, AudioAffect whichToAffect );
-		virtual Real getVolume( AudioAffect whichToGet );
-		
-		// To get a more 3-D feeling from the universe, we adjust the volume of the 3-D samples based 
-		// on zoom.
-		virtual void set3DVolumeAdjustment( Real volumeAdjustment );
-
-    virtual Bool has3DSensitiveStreamsPlaying( void ) const = 0;
-
- 		virtual void *getHandleForBink( void ) = 0;
- 		virtual void releaseHandleForBink( void ) = 0;
-
-		// this function will play an audio event rts by loading it into memory. It should not be used
-		// by anything except for the load screens.
-		virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) = 0;
-
-		// Update Listener position information
-		virtual void setListenerPosition( const Coord3D *newListenerPos, const Coord3D *newListenerOrientation );
-		virtual const Coord3D *getListenerPosition( void ) const;
-
-		virtual AudioRequest *allocateAudioRequest( Bool useAudioEvent );
-		virtual void releaseAudioRequest( AudioRequest *requestToRelease );
-		virtual void appendAudioRequest( AudioRequest *m_request );
-		virtual void processRequestList( void );
-	
-		virtual AudioEventInfo *newAudioEventInfo( AsciiString newEventName );
-    virtual void addAudioEventInfo( AudioEventInfo * newEventInfo );
-		virtual AudioEventInfo *findAudioEventInfo( AsciiString eventName ) const;
-
-		const AudioSettings *getAudioSettings( void ) const;
-		const MiscAudio *getMiscAudio( void ) const;
-
-		// This function should only be called by AudioManager, MusicManager and SoundManager
-		virtual void releaseAudioEventRTS( AudioEventRTS *&eventToRelease );
-
-		// For INI
-		AudioSettings *friend_getAudioSettings( void );
-		MiscAudio *friend_getMiscAudio( void );
-		const FieldParse *getFieldParseTable( void ) const;
-
-		const AudioEventRTS *getValidSilentAudioEvent() const { return m_silentAudioEvent; }
-
-		virtual void setHardwareAccelerated(Bool accel) { m_hardwareAccel = accel; }
-		virtual Bool getHardwareAccelerated() { return m_hardwareAccel; }
-
-		virtual void setSpeakerSurround(Bool surround) { m_surroundSpeakers = surround; }
-		virtual Bool getSpeakerSurround() { return m_surroundSpeakers; }
-
-		virtual void refreshCachedVariables();
-
-		virtual void setPreferredProvider(AsciiString providerNdx) = 0;
-		virtual void setPreferredSpeaker(AsciiString speakerType) = 0;
-
-		// For Scripting
-		virtual Real getAudioLengthMS( const AudioEventRTS *event );
-		virtual Real getFileLengthMS( AsciiString strToLoad ) const = 0;
-
-		// For the file cache to know when to remove files.
-		virtual void closeAnySamplesUsingFile( const void *fileToClose ) = 0;
-		
-		virtual Bool isMusicAlreadyLoaded(void) const;
-		virtual Bool isMusicPlayingFromCD(void) const { return m_musicPlayingFromCD; }
-
-		Bool getDisallowSpeech( void ) const { return m_disallowSpeech; }
-		void setDisallowSpeech( Bool disallowSpeech ) { m_disallowSpeech = disallowSpeech; }	
-
-		// For Worldbuilder, to build lists from which to select
-		virtual void findAllAudioEventsOfType( AudioType audioType, std::vector<AudioEventInfo*>& allEvents );
-    virtual const AudioEventInfoHash & getAllAudioEvents() const { return m_allAudioEventInfo; }
-
-		Real getZoomVolume() const { return m_zoomVolume; }
-	protected:
-
-		// Is the currently selected provider actually HW accelerated?
-		virtual Bool isCurrentProviderHardwareAccelerated();
-	
-		// Is the currently selected speaker type Surround sound?
-		virtual Bool isCurrentSpeakerTypeSurroundSound();
-
-		// Should this piece of audio play on the local machine?
-		virtual Bool shouldPlayLocally(const AudioEventRTS *audioEvent);
-
-		// Set the Listening position for the device
-		virtual void setDeviceListenerPosition( void ) = 0;
-
-		// For tracking purposes
-		virtual AudioHandle allocateNewHandle( void );	
-    // Remove all AudioEventInfo's with the m_isLevelSpecific flag
-    virtual void removeLevelSpecificAudioEventInfos( void );
-    
-    void removeAllAudioRequests( void );
-    
-	protected:
-		AudioSettings *m_audioSettings;
-		MiscAudio *m_miscAudio;
-		MusicManager *m_music;
-		SoundManager *m_sound;
-		Coord3D m_listenerPosition;
-		Coord3D m_listenerOrientation;
-		std::list<AudioRequest*> m_audioRequests;
-		std::vector<AsciiString> m_musicTracks;
-
-		AudioEventInfoHash m_allAudioEventInfo;
-		AudioHandle theAudioHandlePool;
-		std::list<std::pair<AsciiString, Real> > m_adjustedVolumes;
-
-		Real m_musicVolume;
-		Real m_soundVolume;
-		Real m_sound3DVolume;
-		Real m_speechVolume;
-
-		Real m_scriptMusicVolume;
-		Real m_scriptSoundVolume;
-		Real m_scriptSound3DVolume;
-		Real m_scriptSpeechVolume;
-		
-		Real m_systemMusicVolume;
-		Real m_systemSoundVolume;
-		Real m_systemSound3DVolume;
-		Real m_systemSpeechVolume;
-		Real m_zoomVolume;
-
-		
-		AudioEventRTS *m_silentAudioEvent;
-		
-		enum { NUM_VOLUME_TYPES = 4 };
-		Real *m_savedValues;
-
-		// Group of 8
-		Bool m_speechOn						: 1;
-		Bool m_soundOn						: 1;
-		Bool m_sound3DOn					: 1;
-		Bool m_musicOn						: 1;
-		Bool m_volumeHasChanged		: 1;
-		Bool m_hardwareAccel			: 1;
-		Bool m_surroundSpeakers		: 1;
-		Bool m_musicPlayingFromCD : 1;
-
-		// Next 8
-		Bool m_disallowSpeech			: 1;
-};
-
-// TheSuperHackers @feature helmutbuhler 17/05/2025
-// AudioManager that does nothing. Used for Headless Mode.
-class AudioManagerDummy : public AudioManager
-{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	virtual void audioDebugDisplay(DebugDisplayInterface* dd, void* userData, FILE* fp) {}
-#endif
-	virtual void stopAudio(AudioAffect which) {}
-	virtual void pauseAudio(AudioAffect which) {}
-	virtual void resumeAudio(AudioAffect which) {}
-	virtual void pauseAmbient(Bool shouldPause) {}
-	virtual void killAudioEventImmediately(AudioHandle audioEvent) {}
-	virtual void nextMusicTrack() {}
-	virtual void prevMusicTrack() {}
-	virtual Bool isMusicPlaying() const { return false; }
-	virtual Bool hasMusicTrackCompleted(const AsciiString& trackName, Int numberOfTimes) const { return false; }
-	virtual AsciiString getMusicTrackName() const { return ""; }
-	virtual void openDevice() {}
-	virtual void closeDevice() {}
-	virtual void* getDevice() { return NULL; }
-	virtual void notifyOfAudioCompletion(UnsignedInt audioCompleted, UnsignedInt flags) {}
-	virtual UnsignedInt getProviderCount(void) const { return 0; };
-	virtual AsciiString getProviderName(UnsignedInt providerNum) const { return ""; }
-	virtual UnsignedInt getProviderIndex(AsciiString providerName) const { return 0; }
-	virtual void selectProvider(UnsignedInt providerNdx) {}
-	virtual void unselectProvider(void) {}
-	virtual UnsignedInt getSelectedProvider(void) const { return 0; }
-	virtual void setSpeakerType(UnsignedInt speakerType) {}
-	virtual UnsignedInt getSpeakerType(void) { return 0; }
-	virtual UnsignedInt getNum2DSamples(void) const { return 0; }
-	virtual UnsignedInt getNum3DSamples(void) const { return 0; }
-	virtual UnsignedInt getNumStreams(void) const { return 0; }
-	virtual Bool doesViolateLimit(AudioEventRTS* event) const { return false; }
-	virtual Bool isPlayingLowerPriority(AudioEventRTS* event) const { return false; }
-	virtual Bool isPlayingAlready(AudioEventRTS* event) const { return false; }
-	virtual Bool isObjectPlayingVoice(UnsignedInt objID) const { return false; }
-	virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume) {}
-	virtual void removePlayingAudio(AsciiString eventName) {}
-	virtual void removeAllDisabledAudio() {}
-	virtual Bool has3DSensitiveStreamsPlaying(void) const { return false; }
-	virtual void* getHandleForBink(void) { return NULL; }
-	virtual void releaseHandleForBink(void) {}
-	virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) {}
-	virtual void setPreferredProvider(AsciiString providerNdx) {}
-	virtual void setPreferredSpeaker(AsciiString speakerType) {}
-	virtual Real getFileLengthMS(AsciiString strToLoad) const { return -1; }
-	virtual void closeAnySamplesUsingFile(const void* fileToClose) {}
-	virtual void setDeviceListenerPosition(void) {}
-};
-
-
-extern AudioManager *TheAudio;
-
-#endif // __COMMON_GAMEAUDIO_H_
diff --git a/Generals/Code/GameEngine/Include/Common/GameCommon.h b/Generals/Code/GameEngine/Include/Common/GameCommon.h
index 54c61454324..77d9eb99d8b 100644
--- a/Generals/Code/GameEngine/Include/Common/GameCommon.h
+++ b/Generals/Code/GameEngine/Include/Common/GameCommon.h
@@ -24,12 +24,12 @@
 
 // FILE: GameCommon.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -47,14 +47,13 @@
 
 #pragma once
 
-#ifndef _GAMECOMMON_H_
-#define _GAMECOMMON_H_
-
 // ----------------------------------------------------------------------------------------------
 #include "Lib/BaseType.h"
+#include "WWCommon.h"
+#include "Common/GameDefines.h"
 
 // ----------------------------------------------------------------------------------------------
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 	#define NO_DUMP_PERF_STATS
 #else
 	#define NO_DUMP_PERF_STATS
@@ -63,7 +62,8 @@
 // ----------------------------------------------------------------------------------------------
 enum
 {
-	LOGICFRAMES_PER_SECOND = 30,
+	BaseFps = 30, // The historic base frame rate for this game. This value must never change.
+	LOGICFRAMES_PER_SECOND = WWSyncPerSecond,
 	MSEC_PER_SECOND = 1000
 };
 const Real LOGICFRAMES_PER_MSEC_REAL = (((Real)LOGICFRAMES_PER_SECOND) / ((Real)MSEC_PER_SECOND));
@@ -74,36 +74,36 @@ const Real SECONDS_PER_LOGICFRAME_REAL = 1.0f / LOGICFRAMES_PER_SECONDS_REAL;
 // ----------------------------------------------------------------------------------------------
 // note that this returns a REAL value, not an int... most callers will want to
 // call ceil() on the result, so that partial frames get converted to full frames!
-inline Real ConvertDurationFromMsecsToFrames(Real msec) 
-{	
-	return (msec * LOGICFRAMES_PER_MSEC_REAL); 
+inline Real ConvertDurationFromMsecsToFrames(Real msec)
+{
+	return (msec * LOGICFRAMES_PER_MSEC_REAL);
 }
 
 // ----------------------------------------------------------------------------------------------
-inline Real ConvertVelocityInSecsToFrames(Real distPerMsec) 
-{	
+inline Real ConvertVelocityInSecsToFrames(Real distPerMsec)
+{
 	// this looks wrong, but is the correct conversion factor.
-	return (distPerMsec * SECONDS_PER_LOGICFRAME_REAL); 
+	return (distPerMsec * SECONDS_PER_LOGICFRAME_REAL);
 }
 
 // ----------------------------------------------------------------------------------------------
-inline Real ConvertAccelerationInSecsToFrames(Real distPerSec2) 
-{	
+inline Real ConvertAccelerationInSecsToFrames(Real distPerSec2)
+{
 	// this looks wrong, but is the correct conversion factor.
 	const Real SEC_PER_LOGICFRAME_SQR = (SECONDS_PER_LOGICFRAME_REAL * SECONDS_PER_LOGICFRAME_REAL);
-	return (distPerSec2 * SEC_PER_LOGICFRAME_SQR); 
+	return (distPerSec2 * SEC_PER_LOGICFRAME_SQR);
 }
 
 // ----------------------------------------------------------------------------------------------
-inline Real ConvertAngularVelocityInDegreesPerSecToRadsPerFrame(Real degPerSec) 
-{	
+inline Real ConvertAngularVelocityInDegreesPerSecToRadsPerFrame(Real degPerSec)
+{
 	const Real RADS_PER_DEGREE = PI / 180.0f;
-	return (degPerSec * (SECONDS_PER_LOGICFRAME_REAL * RADS_PER_DEGREE)); 
+	return (degPerSec * (SECONDS_PER_LOGICFRAME_REAL * RADS_PER_DEGREE));
 }
 
 // ----------------------------------------------------------------------------------------------
-enum 
-{ 
+enum
+{
 	MAX_PLAYER_COUNT = 16											///< max number of Players.
 };
 
@@ -145,8 +145,6 @@ enum CellShroudStatus CPP_11(: Int)
 	CELLSHROUD_CLEAR,
 	CELLSHROUD_FOGGED,
 	CELLSHROUD_SHROUDED,
-
-	CELLSHROUD_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -159,8 +157,6 @@ enum ObjectShroudStatus CPP_11(: Int)
 	OBJECTSHROUD_FOGGED,				///< object is completely fogged
 	OBJECTSHROUD_SHROUDED,			///< object is completely shrouded
 	OBJECTSHROUD_INVALID_BUT_PREVIOUS_VALID,			///< indeterminate state, will recompute, BUT previous status is valid, don't reset (used for save/load)
-
-	OBJECTSHROUD_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -172,8 +168,8 @@ enum GuardMode CPP_11(: Int)
 };
 
 // ---------------------------------------------------
-enum 
-{ 
+enum
+{
 	NEVER				= 0,
 	FOREVER			= 0x3fffffff			// (we use 0x3fffffff so that we can add offsets and not overflow...
 																//		at 30fps we're still pretty safe!)
@@ -187,7 +183,7 @@ enum
 // NOTE NOTE NOTE: Keep TheVeterencyNames in sync with these.
 enum VeterancyLevel CPP_11(: Int)
 {
-	LEVEL_REGULAR = 0,
+	LEVEL_REGULAR,
 	LEVEL_VETERAN,
 	LEVEL_ELITE,
 	LEVEL_HEROIC,
@@ -195,24 +191,25 @@ enum VeterancyLevel CPP_11(: Int)
 	LEVEL_COUNT,
 	LEVEL_INVALID,
 
-	LEVEL_FIRST = LEVEL_REGULAR,
+	LEVEL_FIRST = 0,
 	LEVEL_LAST = LEVEL_HEROIC
 };
 
 // TheVeterancyNames is defined in GameCommon.cpp
-extern const char *TheVeterancyNames[]; 
+extern const char *const TheVeterancyNames[];
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum CommandSourceType CPP_11(: Int) 
-{ 
+enum CommandSourceType CPP_11(: Int)
+{
 
-	CMD_FROM_PLAYER = 0, 
-	CMD_FROM_SCRIPT, 
+	CMD_FROM_PLAYER = 0,
+	CMD_FROM_SCRIPT,
 	CMD_FROM_AI,
 	CMD_FROM_DOZER,							// Special rare command when the dozer originates a command to attack a mine. Mines are not ai-attackable, and it seems deceitful for the dozer to generate a player or script command. jba.
 
-};		///< the source of a command
+	COMMAND_SOURCE_TYPE_COUNT
+};
 
 //-------------------------------------------------------------------------------------------------
 enum AbleToAttackType CPP_11(: Int)
@@ -231,7 +228,7 @@ enum AbleToAttackType CPP_11(: Int)
 		(The only current difference between this and ATTACK_NEW_TARGET is that disguised units
 		are force-attackable even when stealthed.)
 	*/
-	ATTACK_NEW_TARGET_FORCED= (_ATTACK_FORCED),	
+	ATTACK_NEW_TARGET_FORCED= (_ATTACK_FORCED),
 
 	/**
 		can we attack if this is continuation of an existing attack?
@@ -252,7 +249,7 @@ enum AbleToAttackType CPP_11(: Int)
 		For example, a unit inside couldn't normally see outside and would fail.
 	*/
 	ATTACK_TUNNEL_NETWORK_GUARD = (_ATTACK_TUNNELNETWORK_GUARD)
-	
+
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -358,7 +355,7 @@ private:																																							\
 		inline ~DLINKHEAD_##LISTNAME()																										\
 			{ DEBUG_ASSERTCRASH(!m_head,("destroying dlinkhead still in a list " #LISTNAME)); }				\
 	};																																									\
-	DLINKHEAD_##LISTNAME m_dlinkhead_##LISTNAME;	
+	DLINKHEAD_##LISTNAME m_dlinkhead_##LISTNAME;
 
 // ----------------------------------------------------------------------------------------------
 #define MAKE_DLINK(OBJCLASS, LISTNAME)	\
@@ -412,11 +409,11 @@ private:																\
 		inline ~DLINK_##LISTNAME()					\
 			{ DEBUG_ASSERTCRASH(!m_prev && !m_next,("destroying dlink still in a list "  #LISTNAME)); } \
 	};																		\
-	DLINK_##LISTNAME m_dlink_##LISTNAME;	
+	DLINK_##LISTNAME m_dlink_##LISTNAME;
 
 // ------------------------------------------------------------------------
 // this is the weird C++ syntax for "call pointer-to-member-function"... see C++ FAQ LITE for details.
-#define callMemberFunction(object,ptrToMember)  ((object).*(ptrToMember)) 
+#define callMemberFunction(object,ptrToMember)  ((object).*(ptrToMember))
 
 // ------------------------------------------------------------------------
 template<class OBJCLASS>
@@ -424,29 +421,29 @@ class DLINK_ITERATOR
 {
 public:
 	// this is the weird C++ syntax for "pointer-to-member-function"
-	typedef OBJCLASS* (OBJCLASS::*GetNextFunc)() const;	
+	typedef OBJCLASS* (OBJCLASS::*GetNextFunc)() const;
 private:
 	OBJCLASS* m_cur;
 	GetNextFunc m_getNextFunc;	// this is the weird C++ syntax for "pointer-to-member-function"
 public:
-	DLINK_ITERATOR(OBJCLASS* cur, GetNextFunc getNextFunc) : m_cur(cur), m_getNextFunc(getNextFunc) 
-	{ 
+	DLINK_ITERATOR(OBJCLASS* cur, GetNextFunc getNextFunc) : m_cur(cur), m_getNextFunc(getNextFunc)
+	{
 	}
-	
+
 	void advance()
-	{ 
+	{
 		if (m_cur)
 			m_cur = callMemberFunction(*m_cur, m_getNextFunc)();
 	}
-	
+
 	Bool done() const
-	{ 
-		return m_cur == NULL; 
+	{
+		return m_cur == NULL;
 	}
 
-	OBJCLASS* cur() const 
-	{ 
-		return m_cur; 
+	OBJCLASS* cur() const
+	{
+		return m_cur;
 	}
 
 };
@@ -465,6 +462,7 @@ enum WhichTurretType CPP_11(: Int)
 
 // ------------------------------------------------------------------------
 // this normalizes an angle to the range -PI...PI.
+// TheSuperHackers @todo DO NOT USE THIS FUNCTION! Use WWMath::Normalize_Angle instead. Delete this.
 extern Real normalizeAngle(Real angle);
 
 // ------------------------------------------------------------------------
@@ -478,14 +476,13 @@ inline Real stdAngleDiff(Real a1, Real a2)
 // NOTE NOTE NOTE: Keep TheRelationShipNames in sync with this enum
 enum Relationship CPP_11(: Int)
 {
-	ENEMIES = 0,
+	ENEMIES,
 	NEUTRAL,
-	ALLIES
+	ALLIES,
+
+	RELATIONSHIP_COUNT
 };
 
 
 // TheRelationShipNames is defined in Common/GameCommon.cpp
-extern const char *TheRelationshipNames[];
-
-#endif // _GAMECOMMON_H_
-
+extern const char *const TheRelationshipNames[];
diff --git a/Generals/Code/GameEngine/Include/Common/GameEngine.h b/Generals/Code/GameEngine/Include/Common/GameEngine.h
index e483db6548d..08462292462 100644
--- a/Generals/Code/GameEngine/Include/Common/GameEngine.h
+++ b/Generals/Code/GameEngine/Include/Common/GameEngine.h
@@ -28,14 +28,9 @@
 
 #pragma once
 
-#ifndef _GAME_ENGINE_H_
-#define _GAME_ENGINE_H_
-
 #include "Common/SubsystemInterface.h"
 #include "Common/GameType.h"
 
-#define DEFAULT_MAX_FPS		45
-
 // forward declarations
 class AudioManager;
 class GameLogic;
@@ -55,26 +50,23 @@ class Radar;
 class WebBrowser;
 class ParticleSystemManager;
 
-/**
- * The implementation of the game engine
- */
 class GameEngine : public SubsystemInterface
 {
-
 public:
 
 	GameEngine( void );
 	virtual ~GameEngine();
 
 	virtual void init( void );								///< Init engine by creating client and logic
-	virtual void init( int argc, char *argv[] );			///< Init engine by creating client and logic
 	virtual void reset( void );								///< reset system to starting state
 	virtual void update( void );							///< per frame update
 
 	virtual void execute( void );											/**< The "main loop" of the game engine.
 																								 It will not return until the game exits. */
-	virtual void setFramesPerSecondLimit( Int fps );	///< Set the maximum rate engine updates are allowed to occur
-	virtual Int  getFramesPerSecondLimit( void );			///< Get maxFPS.  Not inline since it is called from another lib.
+
+	static Bool isTimeFrozen(); ///< Returns true if a script has frozen time.
+	static Bool isGameHalted(); ///< Returns true if the game is paused or the network is stalling.
+
 	virtual void setQuitting( Bool quitting );				///< set quitting status
 	virtual Bool getQuitting(void);						///< is app getting ready to quit.
 
@@ -86,6 +78,12 @@ class GameEngine : public SubsystemInterface
 
 protected:
 
+	virtual void resetSubsystems( void );
+
+	Bool canUpdateGameLogic();
+	Bool canUpdateNetworkGameLogic();
+	Bool canUpdateRegularGameLogic();
+
 	virtual FileSystem *createFileSystem( void );								///< Factory for FileSystem classes
 	virtual LocalFileSystem *createLocalFileSystem( void ) = 0;	///< Factory for LocalFileSystem classes
 	virtual ArchiveFileSystem *createArchiveFileSystem( void ) = 0;	///< Factory for ArchiveFileSystem classes
@@ -100,11 +98,12 @@ class GameEngine : public SubsystemInterface
 	virtual ParticleSystemManager* createParticleSystemManager( void ) = 0;
 	virtual AudioManager *createAudioManager( void ) = 0;				///< Factory for Audio Manager
 
-	Int m_maxFPS;																									///< Maximum frames per second allowed
-  Bool m_quitting;  ///< true when we need to quit the game
-	Bool m_isActive;	///< app has OS focus.
+	Real m_logicTimeAccumulator; ///< Frame time accumulated towards submitting a new logic frame
 
+	Bool m_quitting; ///< true when we need to quit the game
+	Bool m_isActive; ///< app has OS focus.
 };
+
 inline void GameEngine::setQuitting( Bool quitting ) { m_quitting = quitting; }
 inline Bool GameEngine::getQuitting(void) { return m_quitting; }
 
@@ -115,6 +114,4 @@ extern GameEngine *TheGameEngine;
 extern GameEngine *CreateGameEngine( void );
 
 /// The entry point for the game system
-extern void GameMain( int argc, char *argv[] );
-
-#endif // _GAME_ENGINE_H_
+extern Int GameMain();
diff --git a/Generals/Code/GameEngine/Include/Common/GameLOD.h b/Generals/Code/GameEngine/Include/Common/GameLOD.h
index d726bf80868..0e3390d77c2 100644
--- a/Generals/Code/GameEngine/Include/Common/GameLOD.h
+++ b/Generals/Code/GameEngine/Include/Common/GameLOD.h
@@ -33,23 +33,26 @@
 
 #pragma once
 
-#ifndef _GAME_LOD_H_
-#define _GAME_LOD_H_
-
 enum ParticlePriorityType CPP_11(: Int);
 
-#define MAX_LOD_PRESETS_PER_LEVEL	32	//number of hardware configs preset for each low,medium,high
+#define MAX_LOD_PRESETS_PER_LEVEL	32	//number of hardware configs preset for each low,medium,high,veryhigh
 #define MAX_BENCH_PROFILES	16
 
 //Make sure this enum stays in sync with GameLODNames[]
 enum StaticGameLODLevel CPP_11(: Int)
 {
 	STATIC_GAME_LOD_UNKNOWN=-1,
+
 	STATIC_GAME_LOD_LOW,
 	STATIC_GAME_LOD_MEDIUM,
 	STATIC_GAME_LOD_HIGH,
+	STATIC_GAME_LOD_VERY_HIGH,
+
 	STATIC_GAME_LOD_CUSTOM,	//make sure this remains last!
-	STATIC_GAME_LOD_COUNT
+
+	STATIC_GAME_LOD_COUNT,
+	STATIC_GAME_LOD_FIRST = 0,
+	STATIC_GAME_LOD_LAST = STATIC_GAME_LOD_CUSTOM - 1,
 };
 
 enum DynamicGameLODLevel CPP_11(: Int)
@@ -69,6 +72,8 @@ enum CpuType CPP_11(: Int)
 	P3,
 	P4,
 	K7,
+
+	CPU_MAX
 };
 
 //Keep this in sync with VideoNames in Gamelod.cpp
@@ -112,7 +117,7 @@ struct StaticGameLODInfo
 	Int m_maxTankTrackFadeDelay;	///<maximum amount of time a tank track segment remains visible.
 	Bool m_useBuildupScaffolds;		///<draw scaffold during structure building.
 	Bool m_useTreeSway;		///<sway trees to simulate wind.
-	Bool m_useEmissiveNightMaterials; ///<perform second lighting pass on night buildings. 
+	Bool m_useEmissiveNightMaterials; ///<perform second lighting pass on night buildings.
 	Int m_textureReduction;	///<reduce texture resolution by dividing in half n times.
 	Bool m_useFpsLimit;	///<don't lock fps to 30hz
 	Bool m_enableDynamicLOD;	///<don't do dynamic lod based on current fps.
@@ -161,15 +166,13 @@ class GameLODManager
 
 	const char *getStaticGameLODLevelName(StaticGameLODLevel level);
 	const char *getDynamicGameLODLevelName(DynamicGameLODLevel level);
-	StaticGameLODLevel findStaticLODLevel(void);	///< calculate the optimal static LOD level for this system.
+	StaticGameLODLevel getRecommendedStaticLODLevel(void);	///< calculate the optimal static LOD level for this system.
 	Bool setStaticLODLevel(StaticGameLODLevel level);	///< set the current static LOD level.
 	StaticGameLODLevel getStaticLODLevel(void) { return m_currentStaticLOD;}
 	DynamicGameLODLevel findDynamicLODLevel(Real averageFPS);	///<given an average fps, return the optimal dynamic LOD.
 	Bool setDynamicLODLevel(DynamicGameLODLevel level);	///< set the current dynamic LOD level.
 	DynamicGameLODLevel getDynamicLODLevel(void) { return m_currentDynamicLOD;}
 	void init(void);	///<initialize tables of preset LOD's.
-	void setCurrentTextureReduction(Int val) {m_currentTextureReduction = val;}
-	Int getCurrentTextureReduction(void) {return m_currentTextureReduction;}
 	Int getStaticGameLODIndex(AsciiString name);
 	Int getDynamicGameLODIndex(AsciiString name);
 	inline Bool isParticleSkipped(void);
@@ -191,9 +194,11 @@ class GameLODManager
 	BenchProfile m_benchProfiles[MAX_BENCH_PROFILES];
 
 protected:
+	void initStaticLODLevels();
 	void applyStaticLODLevel(StaticGameLODLevel level);
 	void applyDynamicLODLevel(DynamicGameLODLevel level);
 	void refreshCustomStaticLODLevel(void);	///<grabs current globaldata values and makes them the custom detail setting.
+	StaticGameLODLevel getRecommendedTextureLODLevel();
 
 	static const FieldParse m_staticGameLODFieldParseTable[];
 	StaticGameLODLevel m_currentStaticLOD;		///< current value of static LOD.
@@ -213,13 +218,12 @@ class GameLODManager
 	StaticGameLODLevel m_idealDetailLevel;
 	ChipsetType m_videoChipType;
 	CpuType m_cpuType;
-	Int m_numRAM;
+	MemValueType m_numRAM;
 	Int m_cpuFreq;
 	Real m_intBenchIndex;
 	Real m_floatBenchIndex;
 	Real m_memBenchIndex;
 	Real m_compositeBenchIndex;
-	Real m_currentTextureReduction;
 	Int m_reallyLowMHz;
 };
 
@@ -249,4 +253,3 @@ ParticlePriorityType GameLODManager::getMinDynamicParticleSkipPriority(void)
 }
 
 extern GameLODManager *TheGameLODManager;
-#endif // _GAME_LOD_H_
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/Common/GameMemory.h b/Generals/Code/GameEngine/Include/Common/GameMemory.h
deleted file mode 100644
index 21d41e77300..00000000000
--- a/Generals/Code/GameEngine/Include/Common/GameMemory.h
+++ /dev/null
@@ -1,919 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Memory.h 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C); 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  Memory.h
-//
-// Created:    Steven Johnson, August 2001
-//
-// Desc:       Memory manager
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef _GAME_MEMORY_H_ 
-#define _GAME_MEMORY_H_
-
-// Turn off memory pool checkpointing for now.
-#ifndef DISABLE_MEMORYPOOL_CHECKPOINTING
-	#define DISABLE_MEMORYPOOL_CHECKPOINTING 1
-#endif
-
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(MEMORYPOOL_DEBUG_CUSTOM_NEW) && !defined(DISABLE_MEMORYPOOL_DEBUG_CUSTOM_NEW)
-	#define MEMORYPOOL_DEBUG_CUSTOM_NEW
-#endif
-
-//#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
-#if (defined(RTS_DEBUG)) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
-	#define MEMORYPOOL_DEBUG
-#endif
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-#include <new.h>
-#include <stdio.h>
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-	#include <malloc.h>
-#endif
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-
-#include "Lib/BaseType.h"
-#include "Common/Debug.h"
-#include "Common/Errors.h"
-
-// MACROS //////////////////////////////////////////////////////////////////
-
-#ifdef MEMORYPOOL_DEBUG
-
-	// by default, enable free-block-retention for checkpointing in debug mode
-	#if !defined(DISABLE_MEMORYPOOL_CHECKPOINTING) || DISABLE_MEMORYPOOL_CHECKPOINTING == 0
-		#define MEMORYPOOL_CHECKPOINTING
-	#endif
-
-	// by default, enable bounding walls in debug mode (unless we have specifically disabled them)
-	#ifndef DISABLE_MEMORYPOOL_BOUNDINGWALL
-		#define MEMORYPOOL_BOUNDINGWALL
-	#endif
-
-	#if !defined(MEMORYPOOL_STACKTRACE) && !defined(DISABLE_MEMORYPOOL_STACKTRACE)
-		#define MEMORYPOOL_STACKTRACE
-	#endif
-
-	// flags for the memory-report options.
-	enum 
-	{
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-		// ------------------------------------------------------
-		// you usually won't use the _REPORT bits directly; see below for more convenient combinations.
-
-		// you must set at least one of the 'allocate' bits.
-		_REPORT_CP_ALLOCATED_BEFORE			= 0x0001,
-		_REPORT_CP_ALLOCATED_BETWEEN		= 0x0002,
-		_REPORT_CP_ALLOCATED_DONTCARE		= (_REPORT_CP_ALLOCATED_BEFORE|_REPORT_CP_ALLOCATED_BETWEEN),
-
-		// you must set at least one of the 'freed' bits.
-		_REPORT_CP_FREED_BEFORE					= 0x0010,
-		_REPORT_CP_FREED_BETWEEN				= 0x0020,
-		_REPORT_CP_FREED_NEVER					= 0x0040,	// ie, still in existence
-		_REPORT_CP_FREED_DONTCARE				= (_REPORT_CP_FREED_BEFORE|_REPORT_CP_FREED_BETWEEN|_REPORT_CP_FREED_NEVER),
-		// ------------------------------------------------------
-#endif // MEMORYPOOL_CHECKPOINTING
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-		/** display the stacktrace for allocation location for all blocks found. 
-			this bit may be mixed-n-matched with any other flag.
-		*/
-		REPORT_CP_STACKTRACE		= 0x0100,
-#endif
-		
-		/** display stats for each pool, in addition to each block.
-			(this is useful for finding suitable allocation counts for the pools.)
-			this bit may be mixed-n-matched with any other flag.
-		*/
-		REPORT_POOLINFO					= 0x0200, 
-
-		/** report on the overall memory situation (including all pools and dma's).
-			this bit may be mixed-n-matched with any other flag.
-		*/
-		REPORT_FACTORYINFO			= 0x0400,	
-
-		/** report on pools that have overflowed their initial allocation.
-			this bit may be mixed-n-matched with any other flag.
-		*/
-		REPORT_POOL_OVERFLOW		= 0x0800,	
-
-		/** simple-n-cheap leak checking */
-		REPORT_SIMPLE_LEAKS			= 0x1000,
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-		/** report on blocks that were allocated between the checkpoints.
-		 (don't care if they were freed or not.)
-		*/
-		REPORT_CP_ALLOCATES	= (_REPORT_CP_ALLOCATED_BETWEEN | _REPORT_CP_FREED_DONTCARE),	
-
-		/** report on blocks that were freed between the checkpoints.
-		 (don't care when they were allocated.)
-		*/
-		REPORT_CP_FREES			= (_REPORT_CP_ALLOCATED_DONTCARE | _REPORT_CP_FREED_BETWEEN),	
-
-		/** report on blocks that were allocated between the checkpoints, and still exist
-		 (note that this reports *potential* leaks -- some such blocks may be desired)
-		*/
-		REPORT_CP_LEAKS			= (_REPORT_CP_ALLOCATED_BETWEEN | _REPORT_CP_FREED_NEVER),
-
-		/** report on blocks that existed before checkpoint #1 and still exist now.
-		*/
-		REPORT_CP_LONGTERM		= (_REPORT_CP_ALLOCATED_BEFORE | _REPORT_CP_FREED_NEVER),
-		
-		/** report on blocks that were allocated-and-freed between the checkpoints.
-		*/
-		REPORT_CP_TRANSIENT		= (_REPORT_CP_ALLOCATED_BETWEEN | _REPORT_CP_FREED_BETWEEN),
-
-		/** report on all blocks that currently exist
-		*/
-		REPORT_CP_EXISTING		= (_REPORT_CP_ALLOCATED_BEFORE | _REPORT_CP_ALLOCATED_BETWEEN | _REPORT_CP_FREED_NEVER),
-
-		/** report on all blocks that have ever existed (!) (or at least, since the last call
-			to debugResetCheckpoints)
-		*/
-		REPORT_CP_ALL					= (_REPORT_CP_ALLOCATED_DONTCARE | _REPORT_CP_FREED_DONTCARE)
-#endif // MEMORYPOOL_CHECKPOINTING
-		
-	};
-
-#endif // MEMORYPOOL_DEBUG
-
-// TheSuperHackers @compile xezon 30/03/2025 Define DISABLE_GAMEMEMORY to use a null implementations for Game Memory.
-// Useful for address sanitizer checks and other investigations.
-// Is included below the macros so that memory pool debug code can still be used.
-#ifdef DISABLE_GAMEMEMORY
-#include "GameMemoryNull.h"
-#else
-
-#ifdef MEMORYPOOL_DEBUG
-
-	#define DECLARE_LITERALSTRING_ARG1										const char * debugLiteralTagString
-	#define PASS_LITERALSTRING_ARG1												debugLiteralTagString
-	#define DECLARE_LITERALSTRING_ARG2										, const char * debugLiteralTagString
-	#define PASS_LITERALSTRING_ARG2												, debugLiteralTagString
-
-	#define MP_LOC_SUFFIX																/*" [" DEBUG_FILENLINE "]"*/
-
-	#define allocateBlock(ARGLITERAL)										allocateBlockImplementation(ARGLITERAL MP_LOC_SUFFIX)
-	#define allocateBlockDoNotZero(ARGLITERAL)					allocateBlockDoNotZeroImplementation(ARGLITERAL MP_LOC_SUFFIX)
-	#define allocateBytes(ARGCOUNT,ARGLITERAL)					allocateBytesImplementation(ARGCOUNT, ARGLITERAL MP_LOC_SUFFIX)
-	#define allocateBytesDoNotZero(ARGCOUNT,ARGLITERAL)	allocateBytesDoNotZeroImplementation(ARGCOUNT, ARGLITERAL MP_LOC_SUFFIX)
-	#define newInstanceDesc(ARGCLASS,ARGLITERAL)				new(ARGCLASS::ARGCLASS##_GLUE_NOT_IMPLEMENTED, ARGLITERAL MP_LOC_SUFFIX) ARGCLASS
-	#define newInstance(ARGCLASS)												new(ARGCLASS::ARGCLASS##_GLUE_NOT_IMPLEMENTED, __FILE__) ARGCLASS
-
-#else
-
-	#define DECLARE_LITERALSTRING_ARG1
-	#define PASS_LITERALSTRING_ARG1	
-	#define DECLARE_LITERALSTRING_ARG2
-	#define PASS_LITERALSTRING_ARG2
-
-	#define allocateBlock(ARGLITERAL)										allocateBlockImplementation()
-	#define allocateBlockDoNotZero(ARGLITERAL)					allocateBlockDoNotZeroImplementation()
-	#define allocateBytes(ARGCOUNT,ARGLITERAL)					allocateBytesImplementation(ARGCOUNT)
-	#define allocateBytesDoNotZero(ARGCOUNT,ARGLITERAL)	allocateBytesDoNotZeroImplementation(ARGCOUNT)
-	#define newInstanceDesc(ARGCLASS,ARGLITERAL)				new(ARGCLASS::ARGCLASS##_GLUE_NOT_IMPLEMENTED) ARGCLASS
-	#define newInstance(ARGCLASS)												new(ARGCLASS::ARGCLASS##_GLUE_NOT_IMPLEMENTED) ARGCLASS
-
-#endif
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-
-class MemoryPoolSingleBlock;
-class MemoryPoolBlob;
-class MemoryPool;
-class MemoryPoolFactory;
-class DynamicMemoryAllocator;
-class BlockCheckpointInfo;
-
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-/**
-	This class is purely a convenience used to pass optional arguments to initMemoryManager(),
-	and by extension, to createDynamicMemoryAllocator(). You can specify how many sub-pools you
-	want, what size each is, what the allocation counts are to be, etc. Most apps will
-	construct an array of these to pass to initMemoryManager() and never use it elsewhere.
-*/
-struct PoolInitRec
-{
-	const char *poolName;					///< name of the pool; by convention, "dmaPool_XXX" where XXX is allocationSize
-	Int allocationSize;						///< size, in bytes, of the pool.
-	Int initialAllocationCount;		///< initial number of blocks to allocate.
-	Int overflowAllocationCount;	///< when the pool runs out of space, allocate more blocks in this increment
-};
-
-enum 
-{
-	MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS = 8	///< The max number of subpools allowed in a DynamicMemoryAllocator
-};
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-// ----------------------------------------------------------------------------
-/**
-	This class exists purely for coding convenience, and should never be used by external code.
-	It simply allows MemoryPool and DynamicMemoryAllocator to share checkpoint-related
-	code in a seamless way.
-*/
-class Checkpointable
-{
-private:
-	BlockCheckpointInfo	*m_firstCheckpointInfo;		///< head of the linked list of checkpoint infos for this pool/dma
-	Bool								m_cpiEverFailed;					///< flag to detect if we ran out of memory accumulating checkpoint info.
-
-protected:
-
-	Checkpointable();
-	~Checkpointable();
-
-	/// create a new checkpoint info and add it to the list.
-	BlockCheckpointInfo *debugAddCheckpointInfo(
-		const char *debugLiteralTagString,
-		Int allocCheckpoint,
-		Int blockSize
-	);
-
-public:
-	/// dump a checkpoint report to logfile
-	void debugCheckpointReport(Int flags, Int startCheckpoint, Int endCheckpoint, const char *poolName);
-	/// reset all the checkpoints for this pool/dma
-	void debugResetCheckpoints();
-};
-#endif
-
-// ----------------------------------------------------------------------------
-/**
-	A MemoryPool provides a way to efficiently allocate objects of the same (or similar)
-	size. We allocate large a large chunk of memory (a "blob") and subdivide it into
-	even-size chunks, doling these out as needed. If the first blob gets full, we allocate
-	additional blobs as necessary. A given pool can allocate blocks of only one size;
-	if you need a different size, you should use a different pool.
-*/
-class MemoryPool 
-#ifdef MEMORYPOOL_CHECKPOINTING
-	: public Checkpointable
-#endif
-{
-private:
-
-	MemoryPoolFactory	*m_factory;									///< the factory that created us
-	MemoryPool				*m_nextPoolInFactory;				///< linked list node, managed by factory
-	const char				*m_poolName;								///< name of this pool. (literal string; must not be freed)
-	Int								m_allocationSize;						///< size of the blocks allocated by this pool, in bytes
-	Int								m_initialAllocationCount;		///< number of blocks to be allocated in initial blob
-	Int								m_overflowAllocationCount;	///< number of blocks to be allocated in any subsequent blob(s)
-	Int								m_usedBlocksInPool;					///< total number of blocks in use in the pool.
-	Int								m_totalBlocksInPool;				///< total number of blocks in all blobs of this pool (used or not).
-	Int								m_peakUsedBlocksInPool;			///< high-water mark of m_usedBlocksInPool
-	MemoryPoolBlob		*m_firstBlob;								///< head of linked list: first blob for this pool.
-	MemoryPoolBlob		*m_lastBlob;								///< tail of linked list: last blob for this pool. (needed for efficiency)
-	MemoryPoolBlob		*m_firstBlobWithFreeBlocks;	///< first blob in this pool that has at least one unallocated block.
-
-private:
-	/// create a new blob with the given number of blocks.
-	MemoryPoolBlob* createBlob(Int allocationCount);
-
-	/// destroy a blob.
-	Int freeBlob(MemoryPoolBlob *blob);
-
-public:
-
-	// 'public' funcs that are really only for use by MemoryPoolFactory
-	MemoryPool *getNextPoolInList();					///< return next pool in linked list
-	void addToList(MemoryPool **pHead);				///< add this pool to head of the linked list
-	void removeFromList(MemoryPool **pHead);	///< remove this pool from the linked list
-	#ifdef MEMORYPOOL_DEBUG
-		static void debugPoolInfoReport( MemoryPool *pool, FILE *fp = NULL );	///< dump a report about this pool to the logfile
-		const char *debugGetBlockTagString(void *pBlock);		///< return the tagstring for the given block (assumed to belong to this pool)
-		void debugMemoryVerifyPool();												///< perform internal consistency check on this pool.
-		Int debugPoolReportLeaks( const char* owner );
-	#endif
-	#ifdef MEMORYPOOL_CHECKPOINTING
-		void debugResetCheckpoints();												///< throw away all checkpoint information for this pool.
-	#endif
-
-public:
-
-	MemoryPool();
-
-	/// initialize the given memory pool.
-	void init(MemoryPoolFactory *factory, const char *poolName, Int allocationSize, Int initialAllocationCount, Int overflowAllocationCount);
-
-	~MemoryPool();
-
-	/// allocate a block from this pool. (don't call directly; use allocateBlock() macro)
-	void *allocateBlockImplementation(DECLARE_LITERALSTRING_ARG1);
-
-	/// same as allocateBlockImplementation, but memory returned is not zeroed
-	void *allocateBlockDoNotZeroImplementation(DECLARE_LITERALSTRING_ARG1);
-	
-	/// free the block. it is OK to pass null.
-	void freeBlock(void *pMem);
-
-	/// return the factory that created (and thus owns) this pool.
-	MemoryPoolFactory *getOwningFactory();
-
-	/// return the name of this pool. the result is a literal string and must not be freed.
-	const char *getPoolName();
-
-	/// return the block allocation size of this pool.
-	Int getAllocationSize();
-
-	/// return the number of free (available) blocks in this pool.
-	Int getFreeBlockCount();
-
-	/// return the number of blocks in use in this pool.
-	Int getUsedBlockCount();
-
-	/// return the total number of blocks in this pool. [ == getFreeBlockCount() + getUsedBlockCount() ]
-	Int getTotalBlockCount();
-
-	/// return the high-water mark for getUsedBlockCount()
-	Int getPeakBlockCount();
-
-	/// return the initial allocation count for this pool
-	Int getInitialBlockCount();
-
-	Int countBlobsInPool();
-
-	/// if this pool has any empty blobs, return them to the system.
-	Int releaseEmpties();
-
-	/// destroy all blocks and blobs in this pool.
-	void reset();
-
-	#ifdef MEMORYPOOL_DEBUG
-		/// return true iff this block was allocated by this pool.
-		Bool debugIsBlockInPool(void *pBlock);
-	#endif
-};
-
-// ----------------------------------------------------------------------------
-/**
-	The DynamicMemoryAllocator class is used to handle unpredictably-sized
-	allocation requests. It basically allocates a number of (private) MemoryPools,
-	then routes request to the smallest-size pool that will satisfy the request.
-	(Requests too large for any of the pool are routed to the system memory allocator.)
-	You should normally use this in place of malloc/free or (global) new/delete.
-*/
-class DynamicMemoryAllocator 
-#ifdef MEMORYPOOL_CHECKPOINTING
-	: public Checkpointable
-#endif
-{
-private:
-	MemoryPoolFactory					*m_factory;						///< the factory that created us
-	DynamicMemoryAllocator		*m_nextDmaInFactory;	///< linked list node, managed by factory
-	Int												m_numPools;						///< number of subpools (up to MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS)
-	Int												m_usedBlocksInDma;		///< total number of blocks allocated, from subpools and "raw"
-	MemoryPool								*m_pools[MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS];	///< the subpools
-	MemoryPoolSingleBlock			*m_rawBlocks;					///< linked list of "raw" blocks allocated directly from system
-
-	/// return the best pool for the given allocSize, or null if none are suitable
-	MemoryPool *findPoolForSize(Int allocSize);
-
-public:
-
-	// 'public' funcs that are really only for use by MemoryPoolFactory
-
-	DynamicMemoryAllocator *getNextDmaInList();						///< return next dma in linked list
-	void addToList(DynamicMemoryAllocator **pHead);				///< add this dma to the list
-	void removeFromList(DynamicMemoryAllocator **pHead);	///< remove this dma from the list
-	#ifdef MEMORYPOOL_DEBUG
-		Int debugCalcRawBlockBytes(Int *numBlocks);												///< calculate the number of bytes in "raw" (non-subpool) blocks
-		void debugMemoryVerifyDma();												///< perform internal consistency check
-		const char *debugGetBlockTagString(void *pBlock);		///< return the tagstring for the given block (assumed to belong to this dma)
-		void debugDmaInfoReport( FILE *fp = NULL );					///< dump a report about this pool to the logfile
-		Int debugDmaReportLeaks();
-	#endif
-	#ifdef MEMORYPOOL_CHECKPOINTING
-		void debugResetCheckpoints();												///< toss all checkpoint information
-	#endif
-
-public:
-
-	DynamicMemoryAllocator();
-
-	/// initialize the dma. pass 0/null for numSubPool/parms to get some reasonable default subpools.
-	void init(MemoryPoolFactory *factory, Int numSubPools, const PoolInitRec pParms[]);
-	
-	~DynamicMemoryAllocator();
-
-	/// allocate bytes from this pool. (don't call directly; use allocateBytes() macro)
-	void *allocateBytesImplementation(Int numBytes DECLARE_LITERALSTRING_ARG2);
-
-	/// like allocateBytesImplementation, but zeroes the memory before returning
-	void *allocateBytesDoNotZeroImplementation(Int numBytes DECLARE_LITERALSTRING_ARG2);
-
-#ifdef MEMORYPOOL_DEBUG
-	void debugIgnoreLeaksForThisBlock(void* pBlockPtr);
-#endif
-
-	/// free the bytes. (assumes allocated by this dma.)
-	void freeBytes(void* pMem);
-
-	/**
-		return the actual number of bytes that would be allocated 
-		if you tried to allocate the given size. (It will generally be slightly
-		larger than you request.) This lets you use extra space if you're gonna get it anyway...
-		The idea is that you will call this before doing a memory allocation, to see if
-		you got any extra "bonus" space.
-	*/
-	Int getActualAllocationSize(Int numBytes);
-
-	/// destroy all allocations performed by this DMA.
-	void reset();
-
-	Int getDmaMemoryPoolCount() const { return m_numPools; }
-	MemoryPool* getNthDmaMemoryPool(Int i) const { return m_pools[i]; }
-
-	#ifdef MEMORYPOOL_DEBUG
-
-		/// return true iff this block was allocated by this dma
-		Bool debugIsBlockInDma(void *pBlock);
-
-		/// return true iff the pool is a subpool of this dma
-		Bool debugIsPoolInDma(MemoryPool *pool);
-
-	#endif	// MEMORYPOOL_DEBUG
-};
-
-// ----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-enum { MAX_SPECIAL_USED = 256 };
-#endif
-
-// ----------------------------------------------------------------------------
-/**
-	The class that manages all the MemoryPools and DynamicMemoryAllocators.
-	Usually you will create exactly one of these (TheMemoryPoolFactory)
-	and use it for everything.
-*/
-class MemoryPoolFactory
-{
-private:
-	MemoryPool								*m_firstPoolInFactory;		///< linked list of pools
-	DynamicMemoryAllocator		*m_firstDmaInFactory;			///< linked list of dmas
-#ifdef MEMORYPOOL_CHECKPOINTING
-	Int												m_curCheckpoint;					///< most recent checkpoint value
-#endif
-#ifdef MEMORYPOOL_DEBUG
-	Int												m_usedBytes;							///< total bytes in use
-	Int												m_physBytes;							///< total bytes allocated to all pools (includes unused blocks)
-	Int												m_peakUsedBytes;					///< high-water mark of m_usedBytes
-	Int												m_peakPhysBytes;					///< high-water mark of m_physBytes
-	Int												m_usedBytesSpecial[MAX_SPECIAL_USED];
-	Int												m_usedBytesSpecialPeak[MAX_SPECIAL_USED];
-	Int												m_physBytesSpecial[MAX_SPECIAL_USED];
-	Int												m_physBytesSpecialPeak[MAX_SPECIAL_USED];
-#endif
-
-public:
-
-		// 'public' funcs that are really only for use by MemoryPool and friends
-	#ifdef MEMORYPOOL_DEBUG
-		/// adjust the usedBytes and physBytes variables by the given amoun ts.
-		void adjustTotals(const char* tagString, Int usedDelta, Int physDelta);
-	#endif
-	#ifdef MEMORYPOOL_CHECKPOINTING
-		/// return the current checkpoint value.
-		Int getCurCheckpoint() { return m_curCheckpoint; }
-	#endif
-
-public:
-	
-	MemoryPoolFactory();
-	void init();
-	~MemoryPoolFactory();
-
-	/// create a new memory pool with the given settings. if a pool with the given name already exists, return it.
-	MemoryPool *createMemoryPool(const PoolInitRec *parms);
-
-	/// overloaded version of createMemoryPool with explicit parms.
-	MemoryPool *createMemoryPool(const char *poolName, Int allocationSize, Int initialAllocationCount, Int overflowAllocationCount);
-	
-	/// return the pool with the given name. if no such pool exists, return null.
-	MemoryPool *findMemoryPool(const char *poolName);
-
-	/// destroy the given pool.
-	void destroyMemoryPool(MemoryPool *pMemoryPool);
-
-	/// create a DynamicMemoryAllocator with subpools with the given parms.
-	DynamicMemoryAllocator *createDynamicMemoryAllocator(Int numSubPools, const PoolInitRec pParms[]);
-
-	/// destroy the given DynamicMemoryAllocator.
-	void destroyDynamicMemoryAllocator(DynamicMemoryAllocator *dma);
-
-	/// destroy the contents of all pools and dmas. (the pools and dma's are not destroyed, just reset)
-	void reset();
-
-	void memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead = NULL );
-
-	#ifdef MEMORYPOOL_DEBUG
-
-		/// perform internal consistency checking
-		void debugMemoryVerify();
-
-		/// return true iff the block was allocated by any pool or dma owned by this factory.
-		Bool debugIsBlockInAnyPool(void *pBlock);
-
-		/// return the tag string for the block. 
-		const char *debugGetBlockTagString(void *pBlock);
-
-		/// dump a report with the given options to the logfile.
-		void debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp = NULL );
-
-		void debugSetInitFillerIndex(Int index);
-
-	#endif
-	#ifdef MEMORYPOOL_CHECKPOINTING
-		
-		/// set a new checkpoint.
-		Int debugSetCheckpoint();
-
-		/// reset all checkpoint information.
-		void debugResetCheckpoints();
-
-	#endif
-};
-
-// how many bytes are we allowed to 'waste' per pool allocation before the debug code starts yelling at us...
-#define MEMORY_POOL_OBJECT_ALLOCATION_SLOP	16
-
-// ----------------------------------------------------------------------------
-#define GCMP_FIND(ARGCLASS, ARGPOOLNAME) \
-private: \
-	static MemoryPool *getClassMemoryPool() \
-	{ \
-		/* \
-			Note that this static variable will be initialized exactly once: the first time \
-			control flows over this section of code. This allows us to neatly resolve the \
-			order-of-execution problem for static variables, ensuring this is not executed \
-			prior to the initialization of TheMemoryPoolFactory. \
-		*/ \
-		DEBUG_ASSERTCRASH(TheMemoryPoolFactory, ("TheMemoryPoolFactory is NULL\n")); \
-		static MemoryPool *The##ARGCLASS##Pool = TheMemoryPoolFactory->findMemoryPool(ARGPOOLNAME); \
-		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool, ("Pool \"%s\" not found (did you set it up in initMemoryPools?)\n", ARGPOOLNAME)); \
-		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool->getAllocationSize() >= sizeof(ARGCLASS), ("Pool \"%s\" is too small for this class (currently %d, need %d)\n", ARGPOOLNAME, The##ARGCLASS##Pool->getAllocationSize(), sizeof(ARGCLASS))); \
-		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool->getAllocationSize() <= sizeof(ARGCLASS)+MEMORY_POOL_OBJECT_ALLOCATION_SLOP, ("Pool \"%s\" is too large for this class (currently %d, need %d)\n", ARGPOOLNAME, The##ARGCLASS##Pool->getAllocationSize(), sizeof(ARGCLASS))); \
-		return The##ARGCLASS##Pool; \
-	} 
-
-// ----------------------------------------------------------------------------
-#define GCMP_CREATE(ARGCLASS, ARGPOOLNAME, ARGINITIAL, ARGOVERFLOW) \
-private: \
-	static MemoryPool *getClassMemoryPool() \
-	{ \
-		/* \
-			Note that this static variable will be initialized exactly once: the first time \
-			control flows over this section of code. This allows us to neatly resolve the \
-			order-of-execution problem for static variables, ensuring this is not executed \
-			prior to the initialization of TheMemoryPoolFactory. \
-		*/ \
-		DEBUG_ASSERTCRASH(TheMemoryPoolFactory, ("TheMemoryPoolFactory is NULL\n")); \
-		static MemoryPool *The##ARGCLASS##Pool = TheMemoryPoolFactory->createMemoryPool(ARGPOOLNAME, sizeof(ARGCLASS), ARGINITIAL, ARGOVERFLOW); \
-		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool, ("Pool \"%s\" not found (did you set it up in initMemoryPools?)\n", ARGPOOLNAME)); \
-		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool->getAllocationSize() >= sizeof(ARGCLASS), ("Pool \"%s\" is too small for this class (currently %d, need %d)\n", ARGPOOLNAME, The##ARGCLASS##Pool->getAllocationSize(), sizeof(ARGCLASS))); \
-		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool->getAllocationSize() <= sizeof(ARGCLASS)+MEMORY_POOL_OBJECT_ALLOCATION_SLOP, ("Pool \"%s\" is too large for this class (currently %d, need %d)\n", ARGPOOLNAME, The##ARGCLASS##Pool->getAllocationSize(), sizeof(ARGCLASS))); \
-		return The##ARGCLASS##Pool; \
-	} 
-	
-// ----------------------------------------------------------------------------
-#define MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
-protected: \
-	virtual ~ARGCLASS(); \
-public: \
-	enum ARGCLASS##MagicEnum { ARGCLASS##_GLUE_NOT_IMPLEMENTED = 0 }; \
-public: \
-	inline void *operator new(size_t s, ARGCLASS##MagicEnum e DECLARE_LITERALSTRING_ARG2) \
-	{ \
-		DEBUG_ASSERTCRASH(s == sizeof(ARGCLASS), ("The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up correctly")); \
-		return ARGCLASS::getClassMemoryPool()->allocateBlockImplementation(PASS_LITERALSTRING_ARG1); \
-	} \
-public: \
-	/* \
-		Note that this delete operator can't be called directly; it is called \
-		only if the analogous new operator is called, AND the constructor \
-		throws an exception... \
-	*/ \
-	inline void operator delete(void *p, ARGCLASS##MagicEnum e DECLARE_LITERALSTRING_ARG2) \
-	{ \
-		ARGCLASS::getClassMemoryPool()->freeBlock(p); \
-	} \
-protected: \
-	/* \
-		Make normal new and delete protected, so they can't be called by the outside world. \
-		Note that delete is funny, in that it can still be called by the class itself; \
-		this is safe but not recommended, for consistency purposes. More problematically, \
-		it can be called by another class that has declared itself 'friend' to us. \
-		In theory, this shouldn't work, since it may not use the right operator-delete, \
-		and thus the wrong memory pool; in practice, it seems the right delete IS called \
-		in MSVC -- it seems to make operator delete virtual if the destructor is also virtual. \
-		At any rate, this is undocumented behavior as far as I can tell, so we put a big old \
-		crash into operator delete telling people to do the right thing and call deleteInstance \
-		instead -- it'd be nice if we could catch this at compile time, but catching it at \
-		runtime seems to be the best we can do... \
-	*/ \
-	inline void *operator new(size_t s) \
-	{ \
-		DEBUG_CRASH(("This operator new should normally never be called... please use new(char*) instead.")); \
-		DEBUG_ASSERTCRASH(s == sizeof(ARGCLASS), ("The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up correctly")); \
-		throw ERROR_BUG; \
-		return 0; \
-	} \
-	inline void operator delete(void *p) \
-	{ \
-		DEBUG_CRASH(("Please call deleteInstance instead of delete.")); \
-		ARGCLASS::getClassMemoryPool()->freeBlock(p); \
-	} \
-private: \
-	virtual MemoryPool *getObjectMemoryPool() \
-	{ \
-		return ARGCLASS::getClassMemoryPool(); \
-	} \
-public: /* include this line at the end to reset visibility to 'public' */ 
-
-// ----------------------------------------------------------------------------
-#define MEMORY_POOL_GLUE(ARGCLASS, ARGPOOLNAME) \
-	MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
-	GCMP_FIND(ARGCLASS, ARGPOOLNAME)
-
-// ----------------------------------------------------------------------------
-#define MEMORY_POOL_GLUE_WITH_EXPLICIT_CREATE(ARGCLASS, ARGPOOLNAME, ARGINITIAL, ARGOVERFLOW) \
-	MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
-	GCMP_CREATE(ARGCLASS, ARGPOOLNAME, ARGINITIAL, ARGOVERFLOW)
-
-// ----------------------------------------------------------------------------
-#define MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ARGCLASS, ARGPOOLNAME) \
-	MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
-	GCMP_CREATE(ARGCLASS, ARGPOOLNAME, -1, -1)
-
-// ----------------------------------------------------------------------------
-// this is the version for an Abstract Base Class, which will never be instantiated...
-#define MEMORY_POOL_GLUE_ABC(ARGCLASS) \
-protected: \
-	virtual ~ARGCLASS(); \
-public: \
-	enum ARGCLASS##MagicEnum { ARGCLASS##_GLUE_NOT_IMPLEMENTED = 0 }; \
-protected: \
-	inline void *operator new(size_t s, ARGCLASS##MagicEnum e DECLARE_LITERALSTRING_ARG2) \
-	{ \
-		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
-		DEBUG_ASSERTCRASH(s == sizeof(ARGCLASS), ("The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up correctly")); \
-		throw ERROR_BUG; \
-		return 0; \
-	} \
-protected: \
-	inline void operator delete(void *p, ARGCLASS##MagicEnum e DECLARE_LITERALSTRING_ARG2) \
-	{ \
-		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
-	} \
-protected: \
-	inline void *operator new(size_t s) \
-	{ \
-		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
-		DEBUG_ASSERTCRASH(s == sizeof(ARGCLASS), ("The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up correctly")); \
-		throw ERROR_BUG; \
-		return 0; \
-	} \
-	inline void operator delete(void *p) \
-	{ \
-		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
-	} \
-private: \
-	virtual MemoryPool *getObjectMemoryPool() \
-	{ \
-		throw ERROR_BUG; \
-		return 0; \
-	} \
-public: /* include this line at the end to reset visibility to 'public' */ 
-
-
-
-// ----------------------------------------------------------------------------
-/**
-	This class is provided as a simple and safe way to integrate C++ object allocation
-	into MemoryPool usage. To use it, you must have your class inherit from
-	MemoryPoolObject, then put the macro MEMORY_POOL_GLUE(MyClassName, "MyPoolName")
-	at the start of your class definition. (This does not create the pool itself -- you
-	must create that manually using MemoryPoolFactory::createMemoryPool)
-*/
-class MemoryPoolObject
-{
-protected:
-
-	/** ensure that all destructors are virtual */
-	virtual ~MemoryPoolObject() { }
-
-protected: 
-	inline void *operator new(size_t s) { DEBUG_CRASH(("This should be impossible")); return 0; }
-	inline void operator delete(void *p) { DEBUG_CRASH(("This should be impossible")); }
-
-protected: 
-
-	virtual MemoryPool *getObjectMemoryPool() = 0;
-	
-public: 
-
-	static void deleteInstanceInternal(MemoryPoolObject* mpo) 
-	{	
-		if (mpo)
-		{
-			MemoryPool *pool = mpo->getObjectMemoryPool(); // save this, since the dtor will nuke our vtbl
-			mpo->~MemoryPoolObject();	// it's virtual, so the right one will be called.
-			pool->freeBlock((void *)mpo); 
-		}
-	} 
-};
-
-inline void deleteInstance(MemoryPoolObject* mpo)
-{
-	MemoryPoolObject::deleteInstanceInternal(mpo);
-}
-
-
-// INLINING ///////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-inline MemoryPoolFactory *MemoryPool::getOwningFactory() { return m_factory; }
-inline MemoryPool *MemoryPool::getNextPoolInList() { return m_nextPoolInFactory; }
-inline const char *MemoryPool::getPoolName() { return m_poolName; }
-inline Int MemoryPool::getAllocationSize() { return m_allocationSize; }
-inline Int MemoryPool::getFreeBlockCount() { return getTotalBlockCount() - getUsedBlockCount(); }
-inline Int MemoryPool::getUsedBlockCount() { return m_usedBlocksInPool; }
-inline Int MemoryPool::getTotalBlockCount() { return m_totalBlocksInPool; }
-inline Int MemoryPool::getPeakBlockCount() { return m_peakUsedBlocksInPool; }
-inline Int MemoryPool::getInitialBlockCount() { return m_initialAllocationCount; }
-
-// ----------------------------------------------------------------------------
-inline DynamicMemoryAllocator *DynamicMemoryAllocator::getNextDmaInList() { return m_nextDmaInFactory; }
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
-
-/**
-	Initialize the memory manager. Construct a new MemoryPoolFactory and 
-	DynamicMemoryAllocator and store 'em in the singletons of the relevant
-	names. 
-*/
-extern void initMemoryManager();
-
-/**
-	return true if initMemoryManager() has been called.
-	return false if only preMainInitMemoryManager() has been called.
-*/
-extern Bool isMemoryManagerOfficiallyInited();
-
-/**
-	similar to initMemoryManager, but this should be used if the memory manager must be initialized
-	prior to main() (e.g., from a static constructor). If preMainInitMemoryManager() is called prior
-	to initMemoryManager(), then subsequent calls to either are quietly ignored, AS IS any subsequent
-	call to shutdownMemoryManager() [since there's no safe way to ensure that shutdownMemoryManager
-	will execute after all static destructors].
-
-	(Note: this function is actually not externally visible, but is documented here for clarity.)
-*/
-/* extern void preMainInitMemoryManager(); */
-
-/**
-	Shut down the memory manager. Throw away TheMemoryPoolFactory and 
-	TheDynamicMemoryAllocator.
-*/
-extern void shutdownMemoryManager();
-
-extern MemoryPoolFactory *TheMemoryPoolFactory;
-extern DynamicMemoryAllocator *TheDynamicMemoryAllocator;
-
-/**
-	This function is declared in this header, but is not defined anywhere -- you must provide
-	it in your code. It is called by initMemoryManager() or preMainInitMemoryManager() in order
-	to get the specifics of the subpool for the dynamic memory allocator. (If you just want
-	some defaults, set both return arguments to zero.) The reason for this odd setup is that 
-	we may need to init the memory manager prior to main() [due to static C++ ctors] and
-	this allows us a way to get the necessary parameters.
-*/
-extern void userMemoryManagerGetDmaParms(Int *numSubPools, const PoolInitRec **pParms);
-
-/**
-	This function is declared in this header, but is not defined anywhere -- you must provide
-	it in your code. It is called by initMemoryManager() or preMainInitMemoryManager() in order
-	to initialize the pools to be used. (You can define an empty function if you like.)
-*/
-extern void userMemoryManagerInitPools();
-
-/**
-	This function is declared in this header, but is not defined anywhere -- you must provide
-	it in your code. It is called by createMemoryPool to adjust the allocation size(s) for a 
-	given pool. Note that the counts are in-out parms!
-*/
-extern void userMemoryAdjustPoolSize(const char *poolName, Int& initialAllocationCount, Int& overflowAllocationCount);
-
-#ifdef __cplusplus
-
-#ifndef _OPERATOR_NEW_DEFINED_
-
-	#define _OPERATOR_NEW_DEFINED_
-
-	extern void * __cdecl operator new		(size_t size);
-	extern void __cdecl operator delete		(void *p);
-
-	extern void * __cdecl operator new[]	(size_t size);
-	extern void __cdecl operator delete[]	(void *p);
-
-	// additional overloads to account for VC/MFC funky versions
-	extern void* __cdecl operator new(size_t nSize, const char *, int);
-	extern void __cdecl operator delete(void *, const char *, int);
-
-	extern void* __cdecl operator new[](size_t nSize, const char *, int);
-	extern void __cdecl operator delete[](void *, const char *, int);
-
-#if defined(_MSC_VER) && _MSC_VER < 1300
-	// additional overloads for 'placement new'
-	//inline void* __cdecl operator new							(size_t s, void *p) { return p; }
-	//inline void __cdecl operator delete						(void *, void *p)		{ }
-	inline void* __cdecl operator new[]						(size_t s, void *p) { return p; }
-	inline void __cdecl operator delete[]					(void *, void *p)		{ }
-#endif
-
-#endif
-
-#ifdef MEMORYPOOL_DEBUG_CUSTOM_NEW
-	#define MSGNEW(MSG)		new(MSG, 0)
-	#define NEW						new(__FILE__, __LINE__)
-#else
-	#define MSGNEW(MSG)		new
-	#define NEW						new
-#endif
-
-#endif
-
-class STLSpecialAlloc 
-{
-public:
-	static void* allocate(size_t __n);
-	static void deallocate(void* __p, size_t);
-};
-
-#endif //DISABLE_GAMEMEMORY
-
-
-// ----------------------------------------------------------------------------
-/**
-	A simple utility class to ensure exception safety; this holds a MemoryPoolObject
-	and deletes it in its destructor. Especially useful for iterators!
-*/
-class MemoryPoolObjectHolder
-{
-private:
-	MemoryPoolObject *m_mpo;
-public:
-	MemoryPoolObjectHolder(MemoryPoolObject *mpo = NULL) : m_mpo(mpo) { }
-	void hold(MemoryPoolObject *mpo) { DEBUG_ASSERTCRASH(!m_mpo, ("already holding")); m_mpo = mpo; }
-	void release() { m_mpo = NULL; }
-	~MemoryPoolObjectHolder() { deleteInstance(m_mpo); }
-};
-
-
-#define EMPTY_DTOR(CLASS) inline CLASS::~CLASS() { }
-
-#endif // _GAME_MEMORY_H_
diff --git a/Generals/Code/GameEngine/Include/Common/GameMemoryNull.h b/Generals/Code/GameEngine/Include/Common/GameMemoryNull.h
deleted file mode 100644
index 38de891775f..00000000000
--- a/Generals/Code/GameEngine/Include/Common/GameMemoryNull.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 TheSuperHackers
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define allocateBytes(ARGCOUNT,ARGLITERAL)          allocateBytesImplementation(ARGCOUNT)
-#define allocateBytesDoNotZero(ARGCOUNT,ARGLITERAL) allocateBytesDoNotZeroImplementation(ARGCOUNT)
-#define newInstanceDesc(ARGCLASS,ARGLITERAL)        new ARGCLASS
-#define newInstance(ARGCLASS)                       new ARGCLASS
-#define MSGNEW(MSG)                                 new
-#define NEW                                         new
-
-
-/**
-	The DynamicMemoryAllocator class is used to handle unpredictably-sized
-	allocation requests.
-*/
-class DynamicMemoryAllocator
-{
-public:
-
-	/// allocate bytes from this pool. (don't call directly; use allocateBytes() macro)
-	void *allocateBytesImplementation(Int numBytes);
-
-	/// like allocateBytesImplementation, but zeroes the memory before returning
-	void *allocateBytesDoNotZeroImplementation(Int numBytes);
-
-#ifdef MEMORYPOOL_DEBUG
-	void debugIgnoreLeaksForThisBlock(void* pBlockPtr);
-#endif
-
-	/// free the bytes. (assumes allocated by this dma.)
-	void freeBytes(void* pMem);
-
-	/**
-		return the actual number of bytes that would be allocated 
-		if you tried to allocate the given size.
-	*/
-	Int getActualAllocationSize(Int numBytes);
-};
-
-
-/**
-	The class that manages all the MemoryPools and DynamicMemoryAllocators.
-	Usually you will create exactly one of these (TheMemoryPoolFactory)
-	and use it for everything.
-*/
-class MemoryPoolFactory
-{
-public:
-
-	void memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead = NULL );
-
-#ifdef MEMORYPOOL_DEBUG
-
-	void debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp = NULL );
-	void debugSetInitFillerIndex(Int index);
-
-#endif
-};
-
-
-#define MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
-protected: \
-	virtual ~ARGCLASS(); \
-public: /* include this line at the end to reset visibility to 'public' */ 
-
-
-#define MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ARGCLASS, ARGPOOLNAME) \
-	MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS)
-
-
-// this is the version for an Abstract Base Class, which will never be instantiated...
-#define MEMORY_POOL_GLUE_ABC(ARGCLASS) \
-protected: \
-	virtual ~ARGCLASS(); \
-public: /* include this line at the end to reset visibility to 'public' */ 
-
-
-/**
-	This class is provided as a simple and safe way to integrate C++ object allocation
-	into MemoryPool usage. To use it, you must have your class inherit from
-	MemoryPoolObject, then put the macro MEMORY_POOL_GLUE(MyClassName, "MyPoolName")
-	at the start of your class definition. (This does not create the pool itself -- you
-	must create that manually using MemoryPoolFactory::createMemoryPool)
-*/
-class MemoryPoolObject
-{
-protected:
-
-	/** ensure that all destructors are virtual */
-	virtual ~MemoryPoolObject() { }
-
-public:
-
-	static void deleteInstanceInternal(MemoryPoolObject* mpo) 
-	{
-		delete mpo;
-	}
-};
-
-inline void deleteInstance(MemoryPoolObject* mpo)
-{
-	MemoryPoolObject::deleteInstanceInternal(mpo);
-}
-
-
-/**
-	Initialize the memory manager. Construct a new MemoryPoolFactory and 
-	DynamicMemoryAllocator and store 'em in the singletons of the relevant
-	names. 
-*/
-extern void initMemoryManager();
-
-/**
-	return true if initMemoryManager() has been called.
-	return false if only preMainInitMemoryManager() has been called.
-*/
-extern Bool isMemoryManagerOfficiallyInited();
-
-/**
-	Shut down the memory manager. Throw away TheMemoryPoolFactory and 
-	TheDynamicMemoryAllocator.
-*/
-extern void shutdownMemoryManager();
-
-extern MemoryPoolFactory *TheMemoryPoolFactory;
-extern DynamicMemoryAllocator *TheDynamicMemoryAllocator;
-
-
-// TheSuperHackers @info
-// The new operator overloads will zero all memory after allocation.
-// This replicates the behavior of the original Game Memory implementation and is necessary to avoid crashing the game,
-// where data is not properly zero initialized. Disable these operators when fixing those issues.
-#ifndef DISABLE_GAMEMEMORY_NEW_OPERATORS
-
-extern void * __cdecl operator new(size_t size);
-extern void __cdecl operator delete(void *p);
-
-extern void * __cdecl operator new[](size_t size);
-extern void __cdecl operator delete[](void *p);
-
-// additional overloads to account for VC/MFC funky versions
-extern void* __cdecl operator new(size_t size, const char *, int);
-extern void __cdecl operator delete(void *p, const char *, int);
-
-extern void* __cdecl operator new[](size_t size, const char *, int);
-extern void __cdecl operator delete[](void *p, const char *, int);
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/Common/GameMusic.h b/Generals/Code/GameEngine/Include/Common/GameMusic.h
deleted file mode 100644
index e1f781aa76a..00000000000
--- a/Generals/Code/GameEngine/Include/Common/GameMusic.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    RTS 3
-//
-// File name:  Common/GameMusic.h
-//
-// Created:    5/01/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __COMMON_GAMEMUSIC_H_
-#define __COMMON_GAMEMUSIC_H_
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/GameAudio.h"
-#include "Common/GameMemory.h"
-
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-class AudioEventRTS;
-struct FieldParse;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-
-//===============================
-// MusicTrack
-//===============================
-
-//-------------------------------------------------------------------------------------------------
-/** The MusicTrack struct holds all information about a music track. 
-	* Place data in TrackInfo that is useful to the game code in determining 
-	* what tracks to play. */
-//-------------------------------------------------------------------------------------------------
-
-class MusicTrack : public MemoryPoolObject
-{
-
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( MusicTrack, "MusicTrack" )
-
-public:
-
-		MusicTrack();
-		// virtual destructor prototype defined by memory pool object
-
-		const FieldParse *getFieldParse( void ) const { return m_musicTrackFieldParseTable; }
-			
-		Int					index;									///< Track index
-		AsciiString name;										///< Logical name of track
-		AsciiString filename;								///< Filename with extension of music track
-		Real				volume;									///< Mixing level for this track
-		Bool				ambient;								///< Game info about this track(public)
-
-		MusicTrack *next;
-		MusicTrack *prev;
-
-	static const FieldParse m_musicTrackFieldParseTable[];		///< the parse table for INI definition
-
-};
-
-class MusicManager
-{
-	public:
-		MusicManager();
-		virtual ~MusicManager();
-
-		void playTrack( AudioEventRTS *eventToUse );
-		void stopTrack( AudioHandle eventToRemove );
-
-		virtual void addAudioEvent(AudioEventRTS *eventToAdd);	// pre-copied
-		virtual void removeAudioEvent( AudioHandle eventToRemove );
-
-		void setVolume( Real m_volume );
-};
-
-#endif // __COMMON_GAMEMUSIC_H_
diff --git a/Generals/Code/GameEngine/Include/Common/GameSounds.h b/Generals/Code/GameEngine/Include/Common/GameSounds.h
deleted file mode 100644
index 41bf4d3b61d..00000000000
--- a/Generals/Code/GameEngine/Include/Common/GameSounds.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    RTS 3
-//
-// File name:  Common/GameSounds.h
-//
-// Created:    5/02/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-#ifndef __COMMON_GAMESOUNDS_H_
-#define __COMMON_GAMESOUNDS_H_
-
-#include "Common/SubsystemInterface.h"
-#include "Common/GameAudio.h"
-#include "Common/GameType.h"
-
-// Forward declarations
-class AudioEventRTS;
-
-class SoundManager : public SubsystemInterface
-{
-	public:
-		SoundManager();
-		virtual ~SoundManager();
-
-		virtual void init( void );										///< Initializes the sounds system
-		virtual void postProcessLoad();
-		virtual void update( void );									///< Services sounds tasks. Called by AudioInterface
-		virtual void reset( void );										///< Reset the sounds system
-
-		virtual void loseFocus( void );								///< Called when application loses focus
-		virtual void regainFocus( void );							///< Called when application regains focus
-		
-		virtual void setListenerPosition( const Coord3D *position );	///< Set the listener position for map3DSound() calculations
-		virtual void setViewRadius( Real viewRadius );///< Sets the radius of the view from the center of the screen in world coordinate units
-		virtual void setCameraAudibleDistance( Real audibleDistance );
-		virtual Real getCameraAudibleDistance( void );
-		
-		virtual void addAudioEvent(AudioEventRTS *&eventToAdd);	// pre-copied
-
-		virtual void notifyOf2DSampleStart( void );
-		virtual void notifyOf3DSampleStart( void );
-
-		virtual void notifyOf2DSampleCompletion( void );
-		virtual void notifyOf3DSampleCompletion( void );
-
-		virtual Int getAvailableSamples( void );
-		virtual Int getAvailable3DSamples( void );
-
-		// empty string means that this sound wasn't found or some error occurred. CHECK FOR EMPTY STRING.
-		virtual AsciiString getFilenameForPlayFromAudioEvent( const AudioEventRTS *eventToGetFrom );
-
-		// called by this class and MilesAudioManager to determine if a sound can still be played
-		virtual Bool canPlayNow( AudioEventRTS *event );
-
-	protected:
-		virtual Bool violatesVoice( AudioEventRTS *event );
-		virtual Bool isInterrupting( AudioEventRTS *event );
-		
-
-	protected:
-		UnsignedInt m_num2DSamples;
-		UnsignedInt m_num3DSamples;
-
-		UnsignedInt m_numPlaying2DSamples;
-		UnsignedInt m_numPlaying3DSamples;
-};
-
-#endif // __COMMON_GAMESOUNDS_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h b/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h
index e3aeefd3c5a..603b93c219b 100644
--- a/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h
+++ b/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h
@@ -30,16 +30,13 @@
 
 #pragma once
 
-#ifndef __GAMESPYMISCPREFERENCES_H__
-#define __GAMESPYMISCPREFERENCES_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 #include "Common/UserPreferences.h"
 
 //-----------------------------------------------------------------------------
-// GameSpyMiscPreferences base class 
+// GameSpyMiscPreferences base class
 //-----------------------------------------------------------------------------
 class GameSpyMiscPreferences : public UserPreferences
 {
@@ -57,5 +54,3 @@ class GameSpyMiscPreferences : public UserPreferences
 
 	Int getMaxMessagesPerUpdate( void );
 };
-
-#endif // __GAMESPYMISCPREFERENCES_H__
diff --git a/Generals/Code/GameEngine/Include/Common/GameState.h b/Generals/Code/GameEngine/Include/Common/GameState.h
index 4d0a5a423cc..5259cc99dab 100644
--- a/Generals/Code/GameEngine/Include/Common/GameState.h
+++ b/Generals/Code/GameEngine/Include/Common/GameState.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GAME_STATE_H_
-#define __GAME_STATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/STLTypedefs.h"
 #include "Common/Snapshot.h"
@@ -47,7 +44,7 @@ class WindowLayout;
 typedef void (*IterateSaveFileCallback)( AsciiString filename, void *userData );
 
 // ------------------------------------------------------------------------------------------------
-/** The save/load window is used for a variety of formats, using this type during the 
+/** The save/load window is used for a variety of formats, using this type during the
 	* save/load menu initialization you can make that menu allow loading only, or allow
 	* both saving and loading from the same menu */
 // ------------------------------------------------------------------------------------------------
@@ -57,8 +54,6 @@ enum SaveLoadLayoutType CPP_11(: Int)
 	SLLT_SAVE_AND_LOAD,
 	SLLT_LOAD_ONLY,
 	SLLT_SAVE_ONLY,
-
-	SLLT_NUM_TYPES // keep this last, why? don't know, it's not really used, but we like it this way
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -86,8 +81,6 @@ enum SaveFileType CPP_11(: Int)
 {
 	SAVE_FILE_TYPE_NORMAL,		///< a regular save game at any arbitrary point in the game
 	SAVE_FILE_TYPE_MISSION,		///< a save game in between missions (a mission save)
-
-	SAVE_FILE_TYPE_NUM_TYPES
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -163,16 +156,16 @@ class GameState : public SubsystemInterface,
 	virtual void update( void ) { }
 
 	// save game methods
-	SaveCode saveGame( AsciiString filename, 
-										 UnicodeString desc, 
-										 SaveFileType saveType, 
+	SaveCode saveGame( AsciiString filename,
+										 UnicodeString desc,
+										 SaveFileType saveType,
 										 SnapshotType which = SNAPSHOT_SAVELOAD  );  ///< save a game
 	SaveCode missionSave( void );																	 ///< do a in between mission save
 	SaveCode loadGame( AvailableGameInfo gameInfo );							 ///< load a save file
 	SaveGameInfo *getSaveGameInfo( void ) { return &m_gameInfo; }
 
 	// snapshot interaction
-	void addPostProcessSnapshot( Snapshot *snapshot );					///< add snapshot to post process laod	
+	void addPostProcessSnapshot( Snapshot *snapshot );					///< add snapshot to post process laod
 
 	// manipulating files
 	Bool doesSaveGameExist( AsciiString filename );							///< does the save file exist
@@ -217,14 +210,14 @@ class GameState : public SubsystemInterface,
 	{
 		Snapshot *snapshot;								///< the snapshot object that handles this block
 		AsciiString blockName;						///< the block name
-	};	
+	};
 	typedef std::list< SnapshotBlock > SnapshotBlockList;
 	typedef SnapshotBlockList::iterator SnapshotBlockListIterator;
 	void addSnapshotBlock( AsciiString blockName, Snapshot *snapshot, SnapshotType which );
 	SnapshotBlock *findBlockInfoByToken( AsciiString token, SnapshotType which );
 
 	SnapshotBlockList m_snapshotBlockList[SNAPSHOT_MAX];	///< list of snapshot blocks of save file data
-	SaveGameInfo m_gameInfo;						///< save game info struct					
+	SaveGameInfo m_gameInfo;						///< save game info struct
 
 	typedef std::list< Snapshot * > SnapshotList;
 	typedef SnapshotList::iterator SnapshotListIterator;
@@ -237,11 +230,8 @@ class GameState : public SubsystemInterface,
 };
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
-extern GameState *TheGameState;	
-
-
-UnicodeString getUnicodeTimeBuffer(SYSTEMTIME timeVal); 
-UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal); 
+extern GameState *TheGameState;
 
 
-#endif  // end __GAME_STATE_H_
+UnicodeString getUnicodeTimeBuffer(SYSTEMTIME timeVal);
+UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal);
diff --git a/Generals/Code/GameEngine/Include/Common/GameStateMap.h b/Generals/Code/GameEngine/Include/Common/GameStateMap.h
index 3f2bc2508a0..bbfad135a5c 100644
--- a/Generals/Code/GameEngine/Include/Common/GameStateMap.h
+++ b/Generals/Code/GameEngine/Include/Common/GameStateMap.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GAME_STATE_MAP_H_
-#define __GAME_STATE_MAP_H_
-
 // INLCUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Snapshot.h"
 #include "Common/SubsystemInterface.h"
@@ -69,5 +66,3 @@ class GameStateMap : public SubsystemInterface,
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern GameStateMap *TheGameStateMap;
-
-#endif  // end __GAME_STATE_MAP_H_
diff --git a/Generals/Code/GameEngine/Include/Common/GameType.h b/Generals/Code/GameEngine/Include/Common/GameType.h
index b7937380732..23a9a129281 100644
--- a/Generals/Code/GameEngine/Include/Common/GameType.h
+++ b/Generals/Code/GameEngine/Include/Common/GameType.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _GAME_TYPE_H_
-#define _GAME_TYPE_H_
-
 #include "Lib/BaseType.h"
 
 // the default size of the world map
@@ -67,17 +64,18 @@ class INI;
 //-------------------------------------------------------------------------------------------------
 enum TimeOfDay CPP_11(: Int)
 {
-	TIME_OF_DAY_INVALID = 0,
-	TIME_OF_DAY_FIRST = 1,
-	TIME_OF_DAY_MORNING = TIME_OF_DAY_FIRST,
+	TIME_OF_DAY_INVALID,
+
+	TIME_OF_DAY_MORNING,
 	TIME_OF_DAY_AFTERNOON,
 	TIME_OF_DAY_EVENING,
 	TIME_OF_DAY_NIGHT,
 
-	TIME_OF_DAY_COUNT					// keep this last
+	TIME_OF_DAY_COUNT,
+	TIME_OF_DAY_FIRST = TIME_OF_DAY_MORNING,
 };
 
-extern const char *TimeOfDayNames[];
+extern const char *const TimeOfDayNames[];
 // defined in Common/GameType.cpp
 
 //-------------------------------------------------------------------------------------------------
@@ -86,21 +84,21 @@ enum Weather CPP_11(: Int)
 	WEATHER_NORMAL = 0,
 	WEATHER_SNOWY = 1,
 
-	WEATHER_COUNT					// keep this last
+	WEATHER_COUNT
 };
 
-extern const char *WeatherNames[];
+extern const char *const WeatherNames[];
 
 enum Scorches CPP_11(: Int)
 {
 	SCORCH_1 = 0,
 	SCORCH_2 = 1,
-	SCORCH_3 = 2, 
-	SCORCH_4 = 3, 
+	SCORCH_3 = 2,
+	SCORCH_4 = 3,
 	SHADOW_SCORCH = 4,
-/*	SCORCH_6 = 5, 
-	SCORCH_7 = 6, 
-	SCORCH_8 = 7, 
+/*	SCORCH_6 = 5,
+	SCORCH_7 = 6,
+	SCORCH_8 = 7,
 
 	CRATER_1 = 8,
 	CRATER_2 = 9,
@@ -111,7 +109,7 @@ enum Scorches CPP_11(: Int)
 	CRATER_7 = 14,
 	CRATER_8 = 15,
 
-	
+
 	MISC_DECAL_1 = 16,
 	MISC_DECAL_2 = 17,
 	MISC_DECAL_3 = 18,
@@ -176,14 +174,14 @@ enum WeaponSlotType CPP_11(: Int)
 	SECONDARY_WEAPON,
 	TERTIARY_WEAPON,
 
-	WEAPONSLOT_COUNT	// keep last
+	WEAPONSLOT_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
 // Pathfind layers - ground is the first layer, each bridge is another. jba.
 // Layer 1 is the ground.
 // Layer 2 is the top layer - bridge if one is present, ground otherwise.
-// Layer 2 - LAYER_LAST -1 are bridges. 
+// Layer 2 - LAYER_LAST -1 are bridges.
 // Layer_WALL is a special "wall" layer for letting units run aroound on top of a wall
 // made of structures.
 // Note that the bridges just index in the pathfinder, so you don't actually
@@ -191,6 +189,3 @@ enum WeaponSlotType CPP_11(: Int)
 enum PathfindLayerEnum CPP_11(: Int) {LAYER_INVALID = 0, LAYER_GROUND = 1, LAYER_WALL = 15, LAYER_LAST=15};
 
 //-------------------------------------------------------------------------------------------------
-
-#endif // _GAME_TYPE_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/Geometry.h b/Generals/Code/GameEngine/Include/Common/Geometry.h
index 3d6874a3218..35930f6fa19 100644
--- a/Generals/Code/GameEngine/Include/Common/Geometry.h
+++ b/Generals/Code/GameEngine/Include/Common/Geometry.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GEOMETRY_H_
-#define __GEOMETRY_H_
-
 #include "Lib/BaseType.h"
 #include "Common/AsciiString.h"
 #include "Common/Snapshot.h"
@@ -42,32 +39,33 @@ class INI;
 /** Geometry type descriptions, keep this in the same order as GeometryNames[] below
 	*
 	* NOTE: Do *NOT* change the order of these defines unless you update the
-	* partition manager ... in particular theCollideTestProcs depend on the 
+	* partition manager ... in particular theCollideTestProcs depend on the
 	* order of this geometry and the fact that the values start at 1
 	*/
 //-------------------------------------------------------------------------------------------------
 enum GeometryType CPP_11(: Int)
 {
-	GEOMETRY_SPHERE = 0,	///< partition/collision testing as sphere. (majorRadius = radius)
+	GEOMETRY_SPHERE,			///< partition/collision testing as sphere. (majorRadius = radius)
 	GEOMETRY_CYLINDER,		///< partition/collision testing as cylinder. (majorRadius = radius, height = height)
 	GEOMETRY_BOX,					///< partition/collision testing as rectangular box (majorRadius = half len in forward dir; minorRadius = half len in side dir; height = height)
 
-	GEOMETRY_NUM_TYPES,  // keep this last
-	GEOMETRY_FIRST = GEOMETRY_SPHERE
+	GEOMETRY_NUM_TYPES,
+	GEOMETRY_FIRST = 0
 };
 
 #ifdef DEFINE_GEOMETRY_NAMES
-static const char *GeometryNames[] = 
+static const char *const GeometryNames[] =
 {
-	"SPHERE",		
-	"CYLINDER",	
-	"BOX",			
+	"SPHERE",
+	"CYLINDER",
+	"BOX",
 	NULL
 };
+static_assert(ARRAY_SIZE(GeometryNames) == GEOMETRY_NUM_TYPES + 1, "Incorrect array size");
 #endif  // end DEFINE_GEOMETRY_NAMES
 
 //-------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 enum ExtentModType CPP_11(: Int)
 {
 	EXTENTMOD_INVALID = 0,
@@ -90,21 +88,21 @@ class GeometryInfo : public Snapshot
 	Real m_height;
 	Real m_majorRadius;
 	Real m_minorRadius;
-	
+
 	Real m_boundingCircleRadius;	///< not in INI file -- size of bounding circle (2d)
 	Real m_boundingSphereRadius;	///< not in INI -- size of bounding sphere (3d)
 
 	void calcBoundingStuff();
 
 protected:
-	
+
 	// snapshot methods
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
 
 public:
-	
+
 	static void parseGeometryType( INI* ini, void * /*instance*/, void *store, const void* /*userData*/ );
 	static void parseGeometryIsSmall( INI* ini, void * /*instance*/, void *store, const void* /*userData*/ );
 	static void parseGeometryHeight( INI* ini, void * /*instance*/, void *store, const void* /*userData*/ );
@@ -113,42 +111,38 @@ class GeometryInfo : public Snapshot
 
 	GeometryInfo(GeometryType type, Bool isSmall, Real height, Real majorRadius, Real minorRadius)
 	{
-		// Added by Sadullah Nader
-		// Initializations missing and needed
 		m_boundingCircleRadius = 0.0f;
 		m_boundingSphereRadius = 0.0f;
-		//
-
 		set(type, isSmall, height, majorRadius, minorRadius);
 	}
 
 	void set(GeometryType type, Bool isSmall, Real height, Real majorRadius, Real minorRadius);
 
 	// bleah, icky but needed for legacy code
-	inline void setMajorRadius(Real majorRadius)
+	void setMajorRadius(Real majorRadius)
 	{
 		m_majorRadius = majorRadius;
 		calcBoundingStuff();
 	}
 
 	// bleah, icky but needed for legacy code
-	inline void setMinorRadius(Real minorRadius)
+	void setMinorRadius(Real minorRadius)
 	{
 		m_minorRadius = minorRadius;
 		calcBoundingStuff();
 	}
 
-	inline GeometryType getGeomType() const { return m_type; }
-	inline Bool getIsSmall() const { return m_isSmall; }
-	inline Real getMajorRadius() const { return m_majorRadius; }	// x-axis
-	inline Real getMinorRadius() const { return m_minorRadius; }	// y-axis
-	
-	// this has been removed and should never need to be called... 
+	GeometryType getGeomType() const { return m_type; }
+	Bool getIsSmall() const { return m_isSmall; }
+	Real getMajorRadius() const { return m_majorRadius; }	// x-axis
+	Real getMinorRadius() const { return m_minorRadius; }	// y-axis
+
+	// this has been removed and should never need to be called...
 	// you should generally call getMaxHeightAbovePosition() instead. (srj)
 	//inline Real getGeomHeight() const { return m_height; }				// z-axis
 
-	inline Real getBoundingCircleRadius() const { return m_boundingCircleRadius; }
-	inline Real getBoundingSphereRadius() const { return m_boundingSphereRadius; }
+	Real getBoundingCircleRadius() const { return m_boundingCircleRadius; }
+	Real getBoundingSphereRadius() const { return m_boundingSphereRadius; }
 
 	Bool isIntersectedByLineSegment(const Coord3D& loc, const Coord3D& from, const Coord3D& to) const;
 
@@ -188,12 +182,9 @@ class GeometryInfo : public Snapshot
 	// given an object with this geom, SET how far above the object's canonical position its max z should extend.
 	void setMaxHeightAbovePosition(Real z);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	void tweakExtents(ExtentModType extentModType, Real extentModAmount);
 	AsciiString getDescriptiveString() const;
 #endif
 
 };
-
-#endif 
-
diff --git a/Generals/Code/GameEngine/Include/Common/GlobalData.h b/Generals/Code/GameEngine/Include/Common/GlobalData.h
index 6bdd10bc380..cb7c0d1dda5 100644
--- a/Generals/Code/GameEngine/Include/Common/GlobalData.h
+++ b/Generals/Code/GameEngine/Include/Common/GlobalData.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _GLOBALDATA_H_
-#define _GLOBALDATA_H_
-
 #include "Common/GameCommon.h"	// ensure we get DUMP_PERF_STATS, or not
 #include "Common/AsciiString.h"
 #include "Common/GameType.h"
@@ -39,10 +36,12 @@
 #include "Common/SubsystemInterface.h"
 #include "GameClient/Color.h"
 #include "Common/STLTypedefs.h"
+#include "Common/Money.h"
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
 struct FieldParse;
 enum _TerrainLOD CPP_11(: Int);
+class CommandLine;
 class GlobalData;
 class INI;
 class WeaponBonusSet;
@@ -51,13 +50,29 @@ enum AIDebugOptions CPP_11(: Int);
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 
-const Int MAX_GLOBAL_LIGHTS	= 3;
+constexpr const Int MAX_GLOBAL_LIGHTS = 3;
+constexpr const Int SIMULATE_REPLAYS_SEQUENTIAL = -1;
+
+//-------------------------------------------------------------------------------------------------
+class CommandLineData
+{
+	friend class CommandLine;
+	friend class GlobalData;
+
+	CommandLineData()
+		: m_hasParsedCommandLineForStartup(false)
+		, m_hasParsedCommandLineForEngineInit(false)
+	{}
+
+	Bool m_hasParsedCommandLineForStartup;
+	Bool m_hasParsedCommandLineForEngineInit;
+};
 
 //-------------------------------------------------------------------------------------------------
 /** Global data container class
   *	Defines all global game data used by the system
 	* @todo Change this entire system. Otherwise this will end up a huge class containing tons of variables,
-	* and will cause re-compilation dependancies throughout the codebase. */
+	* and will cause re-compilation dependencies throughout the code base. */
 //-------------------------------------------------------------------------------------------------
 class GlobalData : public SubsystemInterface
 {
@@ -67,13 +82,14 @@ class GlobalData : public SubsystemInterface
 	GlobalData();
 	virtual ~GlobalData();
 
-	void init();
-	void reset();
-	void update() { }
+	virtual void init();
+	virtual void reset();
+	virtual void update() { }
 
 	Bool setTimeOfDay( TimeOfDay tod );		///< Use this function to set the Time of day;
 
 	static void parseGameDataDefinition( INI* ini );
+	void parseCustomDefinition();
 
 	//-----------------------------------------------------------------------------------------------
 	struct TerrainLighting
@@ -87,6 +103,8 @@ class GlobalData : public SubsystemInterface
 	//-----------------------------------------------------------------------------------------------
 	//-----------------------------------------------------------------------------------------------
 
+	CommandLineData m_commandLineData;
+
 	AsciiString m_mapName;  ///< hack for now, this whole this is going away
 	AsciiString m_moveHintName;
 	Bool m_useTrees;
@@ -130,11 +148,12 @@ class GlobalData : public SubsystemInterface
 	Real m_waterPositionX;
 	Real m_waterPositionY;
 	Real m_waterPositionZ;
-	Real m_waterExtentX;	
+	Real m_waterExtentX;
 	Real m_waterExtentY;
 	Int	m_waterType;
 	Bool m_showSoftWaterEdge;
 	Bool m_usingWaterTrackEditor;
+	Bool m_isWorldBuilder;
 
 	Int m_featherWater;
 
@@ -159,6 +178,7 @@ class GlobalData : public SubsystemInterface
 	Real m_skyBoxPositionZ;
 	Real m_drawSkyBox;
 	Real m_skyBoxScale;
+	Real m_viewportHeightScale; // The height scale of the tactical view ranging 0..1. Used to hide the world behind the Control Bar.
 	Real m_cameraPitch;
 	Real m_cameraYaw;
 	Real m_cameraHeight;
@@ -193,7 +213,7 @@ class GlobalData : public SubsystemInterface
 	Int m_maxTankTrackEdges;	///<maximum length of tank track
 	Int m_maxTankTrackOpaqueEdges;	///<maximum length of tank track before it starts fading.
 	Int m_maxTankTrackFadeDelay;	///<maximum amount of time a tank track segment remains visible.
-	
+
 	AsciiString m_levelGainAnimationName; ///< The animation to play when a level is gained.
 	Real m_levelGainAnimationDisplayTimeInSeconds;		///< time to play animation for
 	Real m_levelGainAnimationZRisePerSecond;					///< rise animation up while playing
@@ -257,11 +277,11 @@ class GlobalData : public SubsystemInterface
 	Bool m_winCursors;						///< Should we force use of windows cursors?
 	Bool m_constantDebugUpdate;		///< should we update the debug stats constantly, vs every 2 seconds?
 	Bool m_showTeamDot;						///< Shows the little colored team dot representing which team you are controlling.
-	
+
 #ifdef DUMP_PERF_STATS
 	Bool m_dumpPerformanceStatistics;
 #endif
-	
+
 	Bool m_forceBenchmark;	///<forces running of CPU detection benchmark, even on known cpu's.
 
 	Int m_fixedSeed;							///< fixed random seed for game logic (less than 0 to disable)
@@ -320,9 +340,12 @@ class GlobalData : public SubsystemInterface
 	Real m_cameraAdjustSpeed;					///< Rate at which we adjust camera height
 	Bool m_enforceMaxCameraHeight;		///< Enfoce max camera height while scrolling?
 	Bool m_buildMapCache;
-	AsciiString m_initialFile;				///< If this is specified, load a specific map/replay from the command-line
+	AsciiString m_initialFile;				///< If this is specified, load a specific map from the command-line
 	AsciiString m_pendingFile;				///< If this is specified, use this map at the next game start
 
+	std::vector<AsciiString> m_simulateReplays; ///< If not empty, simulate this list of replays and exit.
+	Int m_simulateReplayJobs; ///< Maximum number of processes to use for simulation, or SIMULATE_REPLAYS_SEQUENTIAL for sequential simulation
+
 	Int m_maxParticleCount;						///< maximum number of particles that can exist
 	Int m_maxFieldParticleCount;			///< maximum number of field-type particles that can exist (roughly)
 	WeaponBonusSet* m_weaponBonusSet;
@@ -340,16 +363,13 @@ class GlobalData : public SubsystemInterface
 
 	Real m_keyboardScrollFactor;			///< Factor applied to game scrolling speed via keyboard scrolling
 	Real m_keyboardDefaultScrollFactor;			///< Factor applied to game scrolling speed via keyboard scrolling
-	
-  Real m_musicVolumeFactor;         ///< Factor applied to loudness of music volume
-  Real m_SFXVolumeFactor;           ///< Factor applied to loudness of SFX volume
-  Real m_voiceVolumeFactor;         ///< Factor applied to loudness of voice volume
-  Bool m_3DSoundPref;               ///< Whether user wants to use 3DSound or not
+	Bool m_drawScrollAnchor;					///< Set that the scroll anchor should be enabled
+	Bool m_moveScrollAnchor;					///< set that the scroll anchor should move
 
 	Bool m_animateWindows;						///< Should we animate window transitions?
 
 	Bool m_incrementalAGPBuf;
-	
+
 	UnsignedInt m_iniCRC;							///< CRC of important INI files
 	UnsignedInt m_exeCRC;							///< CRC of the executable
 
@@ -364,10 +384,10 @@ class GlobalData : public SubsystemInterface
 	Bool m_selectionFlashHouseColor ;  /// skip the house color and just use white.
 
 	Real m_cameraAudibleRadius;				///< If the camera is being used as the position of audio, then how far can we hear?
-	Real m_groupMoveClickToGatherFactor; /** if you take all the selected units and calculate the smallest possible rectangle 
-																			 that contains them all, and click within that, all the selected units will break 
+	Real m_groupMoveClickToGatherFactor; /** if you take all the selected units and calculate the smallest possible rectangle
+																			 that contains them all, and click within that, all the selected units will break
 																			 formation and gather at the point the user clicked (if the value is 1.0). If it's 0.0,
-																			 units will always keep their formation. If it's <1.0, then the user must click a 
+																			 units will always keep their formation. If it's <1.0, then the user must click a
 																			 smaller area within the rectangle to order the gather. */
 
 	Int m_antiAliasBoxValue;          ///< value of selected antialias from combo box in options menu
@@ -378,6 +398,21 @@ class GlobalData : public SubsystemInterface
 	Bool m_saveCameraInReplay;
 	Bool m_useCameraInReplay;
 
+	// TheSuperHackers @feature xezon 09/09/2025 Enable the shroud and everything related for observing individual players in any game mode.
+	// Enabling this does have a performance cost because the ghost object manager must keep track of all relevant objects for all players.
+	Bool m_enablePlayerObserver;
+
+	// TheSuperHackers @feature L3-M 05/09/2025 allow the network latency counter and render fps counter font size to be set, a size of zero disables them
+	Int m_networkLatencyFontSize;
+	Int m_renderFpsFontSize;
+	// TheSuperHackers @feature Mauller 21/06/2025 allow the system time and game time font size to be set, a size of zero disables them
+	Int m_systemTimeFontSize;
+	Int m_gameTimeFontSize;
+
+	// TheSuperHackers @feature L3-M 21/08/2025 toggle the money per minute display, false shows only the original current money
+	Bool m_showMoneyPerMinute;
+	Bool m_allowMoneyPerMinuteForPlayer;
+
 	Real m_shakeSubtleIntensity;			///< Intensity for shaking a camera with SHAKE_SUBTLE
 	Real m_shakeNormalIntensity;			///< Intensity for shaking a camera with SHAKE_NORMAL
 	Real m_shakeStrongIntensity;			///< Intensity for shaking a camera with SHAKE_STRONG
@@ -397,18 +432,21 @@ class GlobalData : public SubsystemInterface
 #endif
 
 	Color m_hotKeyTextColor;					///< standard color for all hotkeys.
-	
+
 	AsciiString m_specialPowerViewObjectName;	///< Created when certain special powers are fired so players can watch.
 
+	Real m_objectPlacementOpacity; ///< Sets the opacity of build preview objects.
+	Bool m_objectPlacementShadows; ///< Enables or disables shadows of build preview objects.
+
 	std::vector<AsciiString> m_standardPublicBones;
 
 	Real m_standardMinefieldDensity;
 	Real m_standardMinefieldDistance;
 
-	
-	Bool m_showMetrics;								///< whether or not to show the metrics.
-	Int m_defaultStartingCash;				///< The amount of cash a player starts with by default.
-	
+
+	Bool  m_showMetrics;								///< whether or not to show the metrics.
+	Money m_defaultStartingCash;				///< The amount of cash a player starts with by default.
+
 	Bool m_debugShowGraphicalFramerate;		///< Whether or not to show the graphical framerate bar.
 
 	Int m_powerBarBase;										///< Logrithmic base for the power bar scale
@@ -419,7 +457,7 @@ class GlobalData : public SubsystemInterface
 	UnsignedInt m_unlookPersistDuration;	///< How long after unlook until the sighting info executes the undo
 
 	Bool m_shouldUpdateTGAToDDS;					///< Should we attempt to update old TGAs to DDS stuff on loadup?
-	
+
 	UnsignedInt m_doubleClickTimeMS;	///< What is the maximum amount of time that can seperate two clicks in order
 																		///< for us to generate a double click message?
 
@@ -438,20 +476,21 @@ class GlobalData : public SubsystemInterface
 	UnsignedInt m_networkDisconnectTime;				///< The number of milliseconds between when the game gets stuck on a frame for a network stall and when the disconnect dialog comes up.
 	UnsignedInt m_networkPlayerTimeoutTime;			///< The number of milliseconds between when a player's last keep alive command was recieved and when they are considered disconnected from the game.
 	UnsignedInt	m_networkDisconnectScreenNotifyTime; ///< The number of milliseconds between when the disconnect screen comes up and when the other players are notified that we are on the disconnect screen.
-	
+
 	Real				m_keyboardCameraRotateSpeed;    ///< How fast the camera rotates when rotated via keyboard controls.
   Int					m_playStats;									///< Int whether we want to log play stats or not, if <= 0 then we don't log
 
   Bool m_TiVOFastMode;            ///< When true, the client speeds up the framerate... set by HOTKEY!
-  
 
+#if defined(RTS_DEBUG) || ENABLE_CONFIGURABLE_SHROUD
+	Bool m_shroudOn;
+#endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	Bool m_wireframe;
 	Bool m_stateMachineDebug;
 	Bool m_useCameraConstraints;
 	Bool m_specialPowerUsesDelay;
-	Bool m_shroudOn;
 	Bool m_fogOfWarOn;
 	Bool m_jabberOn;
 	Bool m_munkeeOn;
@@ -505,7 +544,7 @@ class GlobalData : public SubsystemInterface
 
 	Bool				m_isBreakableMovie;							///< if we enter a breakable movie, set this flag
 	Bool				m_breakTheMovie;								///< The user has hit escape!
-	
+
 	AsciiString m_modDir;
 	AsciiString m_modBIG;
 
@@ -514,12 +553,14 @@ class GlobalData : public SubsystemInterface
 
 private:
 
+	static UnsignedInt generateExeCRC();
+
 	static const FieldParse s_GlobalDataFieldParseTable[];
 
 	// this is private, since we read the info from Windows and cache it for
 	// future use. No one is allowed to change it, ever. (srj)
 	AsciiString m_userDataDir;
-	
+
 	// just the "leaf name", read from INI. private because no one is ever allowed
 	// to look at it directly; they must go thru getPath_UserData(). (srj)
 	AsciiString m_userDataLeafName;
@@ -542,6 +583,9 @@ class GlobalData : public SubsystemInterface
 // singleton
 extern GlobalData* TheWritableGlobalData;
 
+// use TheGlobalData for all read-only accesses
+#if __cplusplus >= 201703L
+inline const GlobalData* const& TheGlobalData = TheWritableGlobalData;
+#else
 #define TheGlobalData ((const GlobalData*)TheWritableGlobalData)
-
 #endif
diff --git a/Generals/Code/GameEngine/Include/Common/Handicap.h b/Generals/Code/GameEngine/Include/Common/Handicap.h
index 684e146991c..2ffabc9458e 100644
--- a/Generals/Code/GameEngine/Include/Common/Handicap.h
+++ b/Generals/Code/GameEngine/Include/Common/Handicap.h
@@ -24,12 +24,12 @@
 
 // FILE: Handicap.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef _HANDICAP_H_
-#define _HANDICAP_H_
-
 #include "Lib/BaseType.h"
 
 // ----------------------------------------------------------------------------------------------
@@ -56,7 +53,7 @@ class ThingTemplate;
 
 // ----------------------------------------------------------------------------------------------
 /**
-	Handicap encapsulates the sets of modifiers to abilities used to balance 
+	Handicap encapsulates the sets of modifiers to abilities used to balance
 	the game and give different abilities to different Players.
 	Conceptually, it's a large set of coefficients (typically, but not necessarily,
 	in the range of 0.0...1.0).
@@ -85,7 +82,7 @@ class Handicap
 	/// reset all handicaps to a default value.
 	void init();
 
-	/** 
+	/**
 		initialize from the fields in the Dict. Note that this does NOT call init()
 		internally, so only those fields that are present in the dict will be set.
 		if you want to ensure all fields are something reasonable, you should call init()
@@ -96,7 +93,7 @@ class Handicap
 	/**
 		return the multiplier for the given Handicap type on the given Object.
 		The Object's type (unit, building, etc.) will generally be examined
-		to determine what value to return. 
+		to determine what value to return.
 	*/
 	Real getHandicap(HandicapType t, const ThingTemplate *tmpl) const;
 
@@ -117,5 +114,3 @@ class Handicap
 
 	static ThingType getBestThingType(const ThingTemplate *tmpl);
 };
-
-#endif // _HANDICAP_H_
diff --git a/Generals/Code/GameEngine/Include/Common/INI.h b/Generals/Code/GameEngine/Include/Common/INI.h
index b056007956a..0e48452dc53 100644
--- a/Generals/Code/GameEngine/Include/Common/INI.h
+++ b/Generals/Code/GameEngine/Include/Common/INI.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __INI_H_
-#define __INI_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include <stddef.h>	// for offsetof, which we don't use but everyone who includes us does
 #include "Common/STLTypedefs.h"
@@ -48,7 +45,7 @@ enum ScienceType CPP_11(: Int);
 /** These control the behavior of loading the INI data into items */
 //-------------------------------------------------------------------------------------------------
 enum INILoadType CPP_11(: Int)
-{	
+{
 	INI_LOAD_INVALID,						///< invalid load type
 	INI_LOAD_OVERWRITE,					///< create new or load *over* existing data instance
 	INI_LOAD_CREATE_OVERRIDES,	///< create new or load into *new* override data instance
@@ -91,14 +88,14 @@ enum
 /** Function typedef for parsing data block fields.
 	*
 	* buffer - the character buffer of the line from INI that we are reading and parsing
-	* instance - instance of what we're loading (for example a thingtemplate instance)
+	* instance - instance of what we're loading (for example a ThingTemplate instance)
 	* store - where to store the data parsed, this is a field in the *instance* 'instance'
 	*/
 //-------------------------------------------------------------------------------------------------
 typedef void (*INIFieldParseProc)( INI *ini, void *instance, void *store, const void* userData );
 
 //-------------------------------------------------------------------------------------------------
-typedef const char* ConstCharPtr;
+typedef const char* const ConstCharPtr;
 typedef ConstCharPtr* ConstCharPtrArray;
 
 //-------------------------------------------------------------------------------------------------
@@ -119,7 +116,7 @@ struct FieldParse
 	const void*					userData;					///< field-specific data
 	Int									offset;						///< offset to data field
 
-	inline void set(const char* t, INIFieldParseProc p, const void* u, Int o)
+	void set(const char* t, INIFieldParseProc p, const void* u, Int o)
 	{
 		token = t;
 		parse = p;
@@ -139,21 +136,17 @@ class MultiIniFieldParse
 	Int								m_count;
 
 public:
-	MultiIniFieldParse() : m_count(0) 
-	{ 
-		//Added By Sadullah Nader
-		//Initializations missing and needed
+	MultiIniFieldParse() : m_count(0)
+	{
 		for(Int i = 0; i < MAX_MULTI_FIELDS; i++)
 			m_extraOffset[i] = 0;
-		//
-
 	}
-	
+
 	void add(const FieldParse* f, UnsignedInt e = 0);
 
-	inline Int getCount() const { return m_count; }
-	inline const FieldParse* getNthFieldParse(Int i) const { return m_fieldParse[i]; }
-	inline UnsignedInt getNthExtraOffset(Int i) const { return m_extraOffset[i]; }
+	Int getCount() const { return m_count; }
+	const FieldParse* getNthFieldParse(Int i) const { return m_fieldParse[i]; }
+	UnsignedInt getNthExtraOffset(Int i) const { return m_extraOffset[i]; }
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -173,8 +166,19 @@ class INI
 	INI();
 	~INI();
 
-	void loadDirectory( AsciiString dirName, Bool subdirs, INILoadType loadType, Xfer *pXfer );  ///< load directory of INI files
-	void load( AsciiString filename, INILoadType loadType, Xfer *pXfer );		///< load INI file
+	// TheSuperHackers @feature xezon 19/08/2025
+	// Load a specific INI file by name and/or INI files from a directory (and its subdirectories).
+	// For example "Data\INI\Armor" loads "Data\INI\Armor.ini" and all *.ini files in "Data\INI\Armor".
+	// Throws if not a single INI file is found or one is not read correctly.
+	UnsignedInt loadFileDirectory( AsciiString fileDirName, INILoadType loadType, Xfer *pXfer, Bool subdirs = TRUE );
+
+	// Load INI files from a directory (and its subdirectories).
+	// Throws if one INI file is not read correctly.
+	UnsignedInt loadDirectory( AsciiString dirName, INILoadType loadType, Xfer *pXfer, Bool subdirs = TRUE );
+
+	// Load one specific INI file by name.
+	// Throws if the INI file is not found or is not read correctly.
+	UnsignedInt load( AsciiString filename, INILoadType loadType, Xfer *pXfer );
 
 	static Bool isDeclarationOfType( AsciiString blockType, AsciiString blockName, char *bufferToCheck );
 	static Bool isEndOfBlock( char *bufferToCheck );
@@ -200,6 +204,7 @@ class INI
 	static void parseParticleSystemDefinition( INI *ini );
 	static void parseWaterSettingDefinition( INI *ini );
 	static void parseWaterTransparencyDefinition( INI *ini );
+	static void parseWeatherDefinition( INI *ini );
 	static void parseMappedImageDefinition( INI *ini );
 	static void parseArmorDefinition( INI *ini );
 	static void parseDamageFXDefinition( INI *ini );
@@ -240,19 +245,19 @@ class INI
 	static void parseWindowTransitions( INI* ini );
 
 
-	inline AsciiString getFilename( void ) const { return m_filename; }
-	inline INILoadType getLoadType( void ) const { return m_loadType; }
-	inline UnsignedInt getLineNum( void ) const { return m_lineNum; }
-	inline const char *getSeps( void ) const { return m_seps; }
-	inline const char *getSepsPercent( void ) const { return m_sepsPercent; }
-	inline const char *getSepsColon( void ) const { return m_sepsColon; }
-	inline const char *getSepsQuote( void ) { return m_sepsQuote; }
-	inline Bool isEOF( void ) const { return m_endOfFile; }
+	AsciiString getFilename( void ) const { return m_filename; }
+	INILoadType getLoadType( void ) const { return m_loadType; }
+	UnsignedInt getLineNum( void ) const { return m_lineNum; }
+	const char *getSeps( void ) const { return m_seps; }
+	const char *getSepsPercent( void ) const { return m_sepsPercent; }
+	const char *getSepsColon( void ) const { return m_sepsColon; }
+	const char *getSepsQuote( void ) { return m_sepsQuote; }
+	Bool isEOF( void ) const { return m_endOfFile; }
 
 	void initFromINI( void *what, const FieldParse* parseTable );
 	void initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList );
 	void initFromINIMultiProc( void *what, BuildMultiIniFieldProc proc );
-	
+
 	static void parseUnsignedByte( INI *ini, void *instance, void *store, const void* userData );
 	static void parseShort( INI *ini, void *instance, void *store, const void* userData );
 	static void parseUnsignedShort( INI *ini, void *instance, void *store, const void* userData );
@@ -312,11 +317,11 @@ class INI
 	static void parseDeathTypeFlags(INI* ini, void* instance, void* store, const void* userData);
 	static void parseVeterancyLevelFlags(INI* ini, void* instance, void* store, const void* userData);
 	static void parseSoundsList( INI* ini, void *instance, void *store, const void* /*userData*/ );
-	
-	
+
+
 	/**
 		return the next token. if seps is null (or omitted), the standard seps are used.
-		
+
 		this will *never* return null; if there are no more tokens, an exception will be thrown.
 	*/
 	const char* getNextToken(const char* seps = NULL);
@@ -330,7 +335,7 @@ class INI
 
 	/**
 		This is called when the next thing you expect is something like:
-			
+
 			Tag:value
 
 		pass "Tag" (without the colon) for 'expected', and you will have the 'value'
@@ -380,7 +385,7 @@ class INI
 
 protected:
 
-	static Bool isValidINIFilename( const char *filename ); ///< is this a valid .ini filename		
+	static Bool isValidINIFilename( const char *filename ); ///< is this a valid .ini filename
 
 	void prepFile( AsciiString filename, INILoadType loadType );
 	void unPrepFile();
@@ -403,6 +408,3 @@ class INI
 	char m_curBlockStart[ INI_MAX_CHARS_PER_LINE ];	///< first line of cur block
 #endif
 };
-
-#endif // __INI_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/INIException.h b/Generals/Code/GameEngine/Include/Common/INIException.h
index 2a197e38fe9..5afca81bc13 100644
--- a/Generals/Code/GameEngine/Include/Common/INIException.h
+++ b/Generals/Code/GameEngine/Include/Common/INIException.h
@@ -45,8 +45,6 @@ class INIException
 
 	~INIException()
 	{
-		if (mFailureMessage) {
-			delete [] mFailureMessage;
-		}
+		delete [] mFailureMessage;
 	}
-};
\ No newline at end of file
+};
diff --git a/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h b/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h
index 1e8be225371..1801f0c5195 100644
--- a/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h
+++ b/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h
@@ -24,12 +24,12 @@
 
 // FILE: IgnorePreferences.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,17 +37,14 @@
 //	Filename: 	IgnorePreferences.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __IGNORE_PREFERENCES_H_
-#define __IGNORE_PREFERENCES_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -82,5 +79,3 @@ class IgnorePreferences : public UserPreferences
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __IGNORE_PREFERENCES_H_
diff --git a/Generals/Code/GameEngine/Include/Common/KindOf.h b/Generals/Code/GameEngine/Include/Common/KindOf.h
index 6a47f33c77b..8dbec5da7cc 100644
--- a/Generals/Code/GameEngine/Include/Common/KindOf.h
+++ b/Generals/Code/GameEngine/Include/Common/KindOf.h
@@ -24,14 +24,11 @@
 
 // FILE: KindOf.h //////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, Dec 2001
-// Desc:	 
-///////////////////////////////////////////////////////////////////////////////////////////////////	
+// Desc:
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __KINDOF_H_
-#define __KINDOF_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
 #include "Common/BitFlags.h"
@@ -43,8 +40,8 @@
 enum KindOfType CPP_11(: Int)
 {
 	KINDOF_INVALID = -1,
-	KINDOF_FIRST = 0,
-	KINDOF_OBSTACLE = KINDOF_FIRST,	///< an obstacle to land-based pathfinders
+
+	KINDOF_OBSTACLE,								///< an obstacle to land-based pathfinders
 	KINDOF_SELECTABLE,							///< Selectable
 	KINDOF_IMMOBILE,								///< fixed in location
 	KINDOF_CAN_ATTACK,							///< can attack
@@ -79,7 +76,7 @@ enum KindOfType CPP_11(: Int)
 	KINDOF_NO_COLLIDE,							///< Never collide with or be collided with
 	KINDOF_REPAIR_PAD,							///< is a repair pad object that can repair other machines
 	KINDOF_HEAL_PAD,								///< is a heal pad object that can heal flesh and bone units
-	KINDOF_STEALTH_GARRISON,				/** enemy teams can't tell that unit is in building.. and if they 
+	KINDOF_STEALTH_GARRISON,				/** enemy teams can't tell that unit is in building.. and if they
 																		garrison that building, they stealth unit will eject. */
 	KINDOF_CASH_GENERATOR,					///< used to check if the unit generates cash... checked by cash hackers and whatever else comes up
 	KINDOF_AIRFIELD,								///< unit has a runway that planes can takeoff/land on
@@ -143,21 +140,21 @@ enum KindOfType CPP_11(: Int)
 	KINDOF_IGNORES_SELECT_ALL,			///< Too late to figure out intelligently if something should respond to a Select All command
 	KINDOF_DONT_AUTO_CRUSH_INFANTRY,					///< These units don't try to crush the infantry if ai.
 
-	KINDOF_COUNT										// total number of kindofs
-
+	KINDOF_COUNT,										// total number of kindofs
+	KINDOF_FIRST = 0,
 };
 
 typedef BitFlags<KINDOF_COUNT>	KindOfMaskType;
 
 #define MAKE_KINDOF_MASK(k) KindOfMaskType(KindOfMaskType::kInit, (k))
 
-inline Bool TEST_KINDOFMASK(const KindOfMaskType& m, KindOfType t) 
-{ 
-	return m.test(t); 
+inline Bool TEST_KINDOFMASK(const KindOfMaskType& m, KindOfType t)
+{
+	return m.test(t);
 }
 
-inline Bool TEST_KINDOFMASK_ANY(const KindOfMaskType& m, const KindOfMaskType& mask) 
-{ 
+inline Bool TEST_KINDOFMASK_ANY(const KindOfMaskType& m, const KindOfMaskType& mask)
+{
 	return m.anyIntersectionWith(mask);
 }
 
@@ -166,14 +163,14 @@ inline Bool TEST_KINDOFMASK_MULTI(const KindOfMaskType& m, const KindOfMaskType&
 	return m.testSetAndClear(mustBeSet, mustBeClear);
 }
 
-inline Bool KINDOFMASK_ANY_SET(const KindOfMaskType& m) 
-{ 
-	return m.any(); 
+inline Bool KINDOFMASK_ANY_SET(const KindOfMaskType& m)
+{
+	return m.any();
 }
 
-inline void CLEAR_KINDOFMASK(KindOfMaskType& m) 
-{ 
-	m.clear(); 
+inline void CLEAR_KINDOFMASK(KindOfMaskType& m)
+{
+	m.clear();
 }
 
 inline void SET_ALL_KINDOFMASK_BITS(KindOfMaskType& m)
@@ -189,6 +186,3 @@ inline void FLIP_KINDOFMASK(KindOfMaskType& m)
 
 // defined in Common/System/Kindof.cpp
 extern KindOfMaskType KINDOFMASK_NONE;	// inits to all zeroes
-
-#endif	// __KINDOF_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/LadderPreferences.h b/Generals/Code/GameEngine/Include/Common/LadderPreferences.h
index b9149a0f586..e28d63721e2 100644
--- a/Generals/Code/GameEngine/Include/Common/LadderPreferences.h
+++ b/Generals/Code/GameEngine/Include/Common/LadderPreferences.h
@@ -30,16 +30,13 @@
 
 #pragma once
 
-#ifndef __LADDERPREFERENCES_H__
-#define __LADDERPREFERENCES_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 #include "Common/UserPreferences.h"
 
 //-----------------------------------------------------------------------------
-// LadderPreferences base class 
+// LadderPreferences base class
 //-----------------------------------------------------------------------------
 
 class LadderPref
@@ -59,7 +56,7 @@ class LadderPref
 typedef std::map<time_t, LadderPref> LadderPrefMap;
 
 //-----------------------------------------------------------------------------
-// LadderPreferences base class 
+// LadderPreferences base class
 //-----------------------------------------------------------------------------
 class LadderPreferences : public UserPreferences
 {
@@ -76,5 +73,3 @@ class LadderPreferences : public UserPreferences
 private:
 	LadderPrefMap m_ladders;
 };
-
-#endif // __LADDERPREFERENCES_H__
diff --git a/Generals/Code/GameEngine/Include/Common/Language.h b/Generals/Code/GameEngine/Include/Common/Language.h
index d592af4b13a..1a25b2cef2a 100644
--- a/Generals/Code/GameEngine/Include/Common/Language.h
+++ b/Generals/Code/GameEngine/Include/Common/Language.h
@@ -24,12 +24,12 @@
 
 // FILE: Language.h ///////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __LANGUAGE_H_
-#define __LANGUAGE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -75,34 +72,9 @@ typedef enum
 
 } LanguageID;
 
-#define GameStrcpy wcscpy
-#define GameStrncpy wcsncpy
-#define GameStrlen wcslen
-#define GameStrcat wcscat
-#define GameStrcmp wcscmp
-#define GameStrncmp wcsncmp
-#define GameStricmp wcsicmp
-#define GameStrnicmp wcsnicmp
-#define GameStrtok wcstok
-#define GameSprintf swprintf
-#define GameVsprintf vswprintf
-/// @todo -- add a non-malloc-based string dup func #define GameStrdup wcsdup
-#define GameAtoi(S) wcstol( (S), NULL, 10)
-#define GameAtod(S) wcstod( (S), NULL )
-#define GameItoa _itow
-#define GameSscanf swscanf
-#define GameStrstr wcsstr 
-#define GameStrchr wcschr
-#define GameIsDigit iswdigit
-#define GameIsAscii iswascii
-#define GameIsAlNum iswalnum
-#define GameIsAlpha iswalpha
 #define GameArrayEnd(array) (array)[(sizeof(array)/sizeof((array)[0]))-1] = 0
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
 extern LanguageID OurLanguage;  ///< our current language definition
-
-#endif // __LANGUAGE_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/LatchRestore.h b/Generals/Code/GameEngine/Include/Common/LatchRestore.h
index 11f70e3ae70..eb516c4b7e2 100644
--- a/Generals/Code/GameEngine/Include/Common/LatchRestore.h
+++ b/Generals/Code/GameEngine/Include/Common/LatchRestore.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __LATCHRESTORE_H__
-#define __LATCHRESTORE_H__
-
 /*
 	The purpose of the LatchRestore class is to allow you to override member variables for the scope
 	of a function. Here's the code that this saves:
@@ -92,7 +89,7 @@
 
 */
 
-template <typename T> 
+template <typename T>
 class LatchRestore
 {
 	protected:
@@ -111,7 +108,3 @@ class LatchRestore
 			whereToRestore = valueToRestore;
 		}
 };
-
-
-#endif /* __LATCHRESTORE_H__ */
-
diff --git a/Generals/Code/GameEngine/Include/Common/List.h b/Generals/Code/GameEngine/Include/Common/List.h
index 8cb55b186da..ef47c1ee819 100644
--- a/Generals/Code/GameEngine/Include/Common/List.h
+++ b/Generals/Code/GameEngine/Include/Common/List.h
@@ -23,17 +23,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    WSYS Library
 //
-// Module:     
+// Module:
 //
 // File name:  wsys/List.h
 //
@@ -43,17 +43,11 @@
 
 #pragma once
 
-
-#ifndef	__WSYS_LIST_H
-#define	__WSYS_LIST_H
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
-#ifndef _BASE_TYPE_H_
 #include <Lib/BaseType.h>
-#endif
 
 //----------------------------------------------------------------------------
 //           Forward References
@@ -83,7 +77,7 @@ class	LListNode
 		Int						m_pri;					///< Node's priority, used for sorting
 		void					*m_item;				///< Item we are referencing if any
 		Bool					m_autoDelete;		///< destroy() should call delete
-		
+
 	public:
 
 									LListNode();											///< Constructor
@@ -100,7 +94,7 @@ class	LListNode
 		void					setPriority( Int new_pri );				///< Sets node's priority
 		void*					item( void );											///< Returns the item this links to, if any
 		void					setItem( void *item );						///< Make node point to an item
-		void					destroy( void );									///< Delete node 
+		void					destroy( void );									///< Delete node
 		void					autoDelete( void );
 }	;
 
@@ -118,11 +112,11 @@ class	LList
 	public:
 
 		/// Enumeration of list sorting methods
-		enum SortMode	
-			{ 
+		enum SortMode
+			{
 				ASCENDING,  ///< Lower priority numbers to front of list
 				DESCENDING  ///< Higher priority numbers to front of list
-			};			
+			};
 
 	protected:
 
@@ -158,11 +152,11 @@ class	LList
 }	;
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
 
 inline		Bool					LListNode::inList( void ) { return m_prev != this; };
-inline		Bool					LListNode::isHead( void ) { return ( m_item == (void*)&this->m_item ); }; 
+inline		Bool					LListNode::isHead( void ) { return ( m_item == (void*)&this->m_item ); };
 inline		Int						LListNode::priority( void ) { return m_pri; };
 inline		void					LListNode::setPriority( Int new_pri ) { m_pri = new_pri; };
 inline		void					LListNode::autoDelete( void ) { m_autoDelete = TRUE; };
@@ -170,12 +164,10 @@ inline		void*					LListNode::item( void ) { return m_item; };
 inline		void					LListNode::setItem( void *item ) { m_item = item; };
 
 
-inline		void					LList::addToHead( LListNode *new_node ) { m_head.append( new_node); };	
-inline		void					LList::addToTail( LListNode *new_node ) { m_head.insert( new_node); };	
-inline		LListNode*		LList::firstNode( void ) { return m_head.next();} ;												
-inline		LListNode*		LList::lastNode( void ) { return m_head.prev();} ;												
-inline		void					LList::setSortMode( SortMode new_mode ) { m_sortMode = new_mode; };						
-inline		Bool					LList::isEmpty( void ) { return !m_head.inList(); };											
+inline		void					LList::addToHead( LListNode *new_node ) { m_head.append( new_node); };
+inline		void					LList::addToTail( LListNode *new_node ) { m_head.insert( new_node); };
+inline		LListNode*		LList::firstNode( void ) { return m_head.next();} ;
+inline		LListNode*		LList::lastNode( void ) { return m_head.prev();} ;
+inline		void					LList::setSortMode( SortMode new_mode ) { m_sortMode = new_mode; };
+inline		Bool					LList::isEmpty( void ) { return !m_head.inList(); };
 inline		void					LList::destroy( void ) { clear();};
-
-#endif	//	__GDF_LIST_H_
diff --git a/Generals/Code/GameEngine/Include/Common/LocalFile.h b/Generals/Code/GameEngine/Include/Common/LocalFile.h
deleted file mode 100644
index 0a04bb0967c..00000000000
--- a/Generals/Code/GameEngine/Include/Common/LocalFile.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    WSYS Library
-//
-// Module:     IO
-//
-// File name:  LocalFile.h
-//
-// Created:    4/23/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __LOCALFILE_H
-#define __LOCALFILE_H
-
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/file.h"
-
-// srj sez: this was purely an experiment in optimization.
-// at the present time, it doesn't appear to be a good one.
-// but I am leaving the code in for now.
-// if still present in 2003, please nuke.
-#define NO_USE_BUFFERED_IO
-#ifdef USE_BUFFERED_IO
-#include <stdio.h>
-#endif
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// LocalFile
-//===============================
-/**
-  *	File abstraction for standard C file operators: open, close, lseek, read, write
-	*/
-//===============================
-
-class LocalFile : public File
-{
-	MEMORY_POOL_GLUE_ABC(LocalFile)		
-	private:
-
-#ifdef USE_BUFFERED_IO
-		FILE* m_file;
-
-		enum { BUF_SIZE = 32768 };
-		char m_vbuf[BUF_SIZE];	
-#else
-		int m_handle;											///< Local C file handle
-#endif
-		
-	public:
-		
-		LocalFile();										
-		//virtual				~LocalFile();
-
-
-		virtual Bool	open( const Char *filename, Int access = 0 );				///< Open a file for access
-		virtual void	close( void );																			///< Close the file
-		virtual Int		read( void *buffer, Int bytes );										///< Read the specified number of bytes in to buffer: See File::read
-		virtual Int		write( const void *buffer, Int bytes );							///< Write the specified number of bytes from the buffer: See File::write
-		virtual Int		seek( Int new_pos, seekMode mode = CURRENT );				///< Set file position: See File::seek
-		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0);				///< moves file position to after the next new-line
-		virtual Bool	scanInt(Int &newInt);																///< return what gets read in as an integer at the current file position.
-		virtual Bool	scanReal(Real &newReal);														///< return what gets read in as a float at the current file position.
-		virtual	Bool	scanString(AsciiString &newString);									///< return what gets read in as a string at the current file position.
-		/**
-			Allocate a buffer large enough to hold entire file, read 
-			the entire file into the buffer, then close the file.
-			the buffer is owned by the caller, who is responsible
-			for freeing is (via delete[]). This is a Good Thing to
-			use because it minimizes memory copies for BIG files.
-		*/
-		virtual char* readEntireAndClose();
-		virtual File* convertToRAMFile();
-
-};
-
-
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-
-#endif // __LOCALFILE_H
diff --git a/Generals/Code/GameEngine/Include/Common/LocalFileSystem.h b/Generals/Code/GameEngine/Include/Common/LocalFileSystem.h
deleted file mode 100644
index 3e58119975e..00000000000
--- a/Generals/Code/GameEngine/Include/Common/LocalFileSystem.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/////// LocalFileSystem.h ////////////////////////////////
-// Bryan Cleveland, August 2002
-//////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __LOCALFILESYSTEM_H
-#define __LOCALFILESYSTEM_H
-
-#include "Common/SubsystemInterface.h"
-#include "FileSystem.h" // for typedefs, etc.
-
-class File;
-
-class LocalFileSystem : public SubsystemInterface
-{
-public:
-	virtual ~LocalFileSystem() {}
-
-	virtual void init() = 0;
-	virtual void reset() = 0;
-	virtual void update() = 0;
-
-	virtual File * openFile(const Char *filename, Int access = 0) = 0;
-	virtual Bool doesFileExist(const Char *filename) const = 0;
-	virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const = 0; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.
-	virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const = 0; ///< see FileSystem.h
-	virtual Bool createDirectory(AsciiString directory) = 0; ///< see FileSystem.h
-
-protected:
-};
-
-extern LocalFileSystem *TheLocalFileSystem;
-
-#endif // __LOCALFILESYSTEM_H
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/Common/MapObject.h b/Generals/Code/GameEngine/Include/Common/MapObject.h
deleted file mode 100644
index 7c68eb2516c..00000000000
--- a/Generals/Code/GameEngine/Include/Common/MapObject.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-// MapObject.h
-// Class to encapsulate height map.
-// Author: John Ahlquist, April 2001
-
-#pragma once
-
-#ifndef MapObject_H
-#define MapObject_H
-
-#include "Common/Dict.h"
-#include "Common/GameMemory.h"
-#include "GameClient/TerrainRoads.h"
-
-/** MapObject class 
-Not ref counted.  Do not store pointers to this class.  */
-class WorldHeightMap;
-class RenderObjClass;
-class ThingTemplate;
-class Shadow;
-enum WaypointID CPP_11(: Int);
-
-#define MAP_XY_FACTOR			(10.0f)	 //How wide and tall each height map square is in world space.
-#define MAP_HEIGHT_SCALE	(MAP_XY_FACTOR/16.0f)		//divide all map heights by 8.
-
-// m_flags bit values.
-enum {
-	FLAG_DRAWS_IN_MIRROR		= 0x00000001,			 ///< If set, draws in water mirror.
-	FLAG_ROAD_POINT1				= 0x00000002,			 ///< If set, is the first point in a road segment.
-	FLAG_ROAD_POINT2				= 0x00000004,			 ///< If set, is the second point in a road segment.
-	FLAG_ROAD_FLAGS					= (FLAG_ROAD_POINT1|FLAG_ROAD_POINT2),	 ///< If nonzero, object is a road piece.
-	FLAG_ROAD_CORNER_ANGLED	= 0x00000008,			 ///< If set, the road corner is angled rather than curved.
-	FLAG_BRIDGE_POINT1			= 0x00000010,			 ///< If set, is the first point in a bridge.
-	FLAG_BRIDGE_POINT2			= 0x00000020,			 ///< If set, is the second point in a bridge.
-	FLAG_BRIDGE_FLAGS				= (FLAG_BRIDGE_POINT1|FLAG_BRIDGE_POINT2),	 ///< If nonzero, object is a bridge piece.
-	FLAG_ROAD_CORNER_TIGHT	= 0x00000040,     
-	FLAG_ROAD_JOIN					= 0x00000080,			 ///< If set, this road end does a generic alpha join.			
-	FLAG_DONT_RENDER				= 0x00000100			 ///< If set, do not render this object. Only WB pays attention to this. (Right now, anyways)
-};
-
-class MapObject : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(MapObject, "MapObject")		
-
-// friend doesn't play well with MPO -- srj
-//	friend class WorldHeightMap;
-//	friend class WorldHeightMapEdit;
-//	friend class AddObjectUndoable;
-//	friend class DeleteInfo;
-
-	enum
-	{	
-		MO_SELECTED = 0x01,
-		MO_LIGHT = 0x02,
-		MO_WAYPOINT = 0x04,
-		MO_SCORCH = 0x08
-	};
-
-	// This data is currently written out into the map data file.
-	Coord3D								m_location;					///< Location of the center of the object.
-	AsciiString						m_objectName;				///< The object name.
-	const ThingTemplate*	m_thingTemplate; ///< thing template for map object
-	Real									m_angle;						///< positive x is 0 degrees, angle is counterclockwise in degrees.
-	MapObject*						m_nextMapObject;		///< linked list.
-	Int										m_flags;						///< Bit flags.  
-	Dict									m_properties;				///< general property sheet.
-	// This data is runtime data that is used by the worldbuider editor, but 
-	// not saved in the map file.
-	Int										m_color;		 ///< Display color.
-	RenderObjClass*				m_renderObj; ///< object that renders in the 3d scene.
-	Shadow*								m_shadowObj; ///< object that renders shadow in the 3d scene.
-	RenderObjClass*				m_bridgeTowers[ BRIDGE_MAX_TOWERS ];		///< for bridge towers
-	Int										m_runtimeFlags;
-
-public:
-	static MapObject *TheMapObjectListPtr;
-	static Dict TheWorldDict;
-
-public:
-	MapObject(Coord3D loc, AsciiString name, Real angle, Int flags, const Dict* props,
-						const ThingTemplate *thingTemplate );
-	//~MapObject(void);		///< Note that deleting the head of a list deletes all linked objects in the list.
-
-public:
-
-	Dict *getProperties() { return &m_properties; }	///< return the object's property sheet.
-
-	void setNextMap(MapObject *nextMap) {m_nextMapObject = nextMap;} ///< Link the next map object.
-	const Coord3D *getLocation(void) const {return &m_location;} ///< Get the center point.
-	Real getAngle(void) const {return m_angle;} ///< Get the angle.
-	Int getColor(void) const {return m_color;} ///< Gets whatever ui color we set.
-	void setColor(Int color) {m_color=color;} ///< Sets the ui color.
-	AsciiString getName(void) const {return m_objectName;} ///< Gets the object name
-	void setName(AsciiString name); ///< Sets the object name
-	void setThingTemplate( const ThingTemplate* thing ); ///< set template
-	const ThingTemplate *getThingTemplate( void ) const;
-	MapObject *getNext(void) const {return m_nextMapObject;}		 ///< Next map object in the list.  Not a copy, don't delete it.
-	MapObject *duplicate(void);		 ///< Allocates a copy.  Caller is responsible for delete-ing this when done with it.
-
-	void setAngle(Real angle) {m_angle = normalizeAngle(angle);}
-	void setLocation(Coord3D *pLoc) {m_location = *pLoc;}
-	void setFlag(Int flag) {m_flags |= flag;}
-	void clearFlag(Int flag) {m_flags &= (~flag);}
-	Bool getFlag(Int flag) const {return (m_flags&flag)?true:false;}
-	Int getFlags(void) const {return (m_flags);}
-
-	Bool isSelected(void) const {return (m_runtimeFlags & MO_SELECTED) != 0;}
-	void setSelected(Bool sel) { if (sel) m_runtimeFlags |= MO_SELECTED; else m_runtimeFlags &= ~MO_SELECTED; }
-
-	Bool isLight(void) const {return (m_runtimeFlags & MO_LIGHT) != 0;}
-	Bool isWaypoint(void) const {return (m_runtimeFlags & MO_WAYPOINT) != 0;}
-	Bool isScorch(void) const {return (m_runtimeFlags & MO_SCORCH) != 0;}
-
-	void setIsLight() {m_runtimeFlags |= MO_LIGHT;}
-	void setIsWaypoint() { m_runtimeFlags |= MO_WAYPOINT; }
-	void setIsScorch() { m_runtimeFlags |= MO_SCORCH; }
-
-	void setRenderObj(RenderObjClass *pObj);
-	RenderObjClass *getRenderObj(void) const {return m_renderObj;}
-	void setShadowObj(Shadow *pObj)	{m_shadowObj=pObj;}
-	Shadow *getShadowObj(void) const {return m_shadowObj;}
-
-	RenderObjClass* getBridgeRenderObject( BridgeTowerType type );
-	void setBridgeRenderObject( BridgeTowerType type, RenderObjClass* renderObj );
-
-	WaypointID getWaypointID();
-	AsciiString getWaypointName();
-	void setWaypointID(Int i);
-	void setWaypointName(AsciiString n);
-	
-	// calling validate will call verifyValidTeam and verifyValidUniqueID.
-	void validate(void);
-
-	// verifyValidTeam will either place the map object on an approrpriate team, or leave the 
-	// current team (if it is valid)
-	void verifyValidTeam(void);
-
-	// verifyValidUniqueID will ensure that this unit isn't sharing a number with another unit.
-	void verifyValidUniqueID(void);
-
-	// The fast version doesn't attempt to verify uniqueness. It goes 
-	static void fastAssignAllUniqueIDs(void);
-	
-
-	static MapObject *getFirstMapObject(void) { return TheMapObjectListPtr; }
-	static Dict* getWorldDict() { return &TheWorldDict; }
-	static Int countMapObjectsWithOwner(const AsciiString& n);
-};
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h b/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h
index b25483cea7d..733d6d26c99 100644
--- a/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h
+++ b/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _MAP_READER_WRITER_INFO_H_
-#define _MAP_READER_WRITER_INFO_H_
-
 #define K_HEIGHT_MAP_VERSION_1	1	// Height map cell = 5.0
 #define K_HEIGHT_MAP_VERSION_2	2	// Height map cell = 10.0
 #define K_HEIGHT_MAP_VERSION_3	3	// Added m_borderSize
@@ -117,8 +114,6 @@ class FileInputStream : public ChunkInputStream
 };
 */
 
-#endif // _MAP_READER_WRITER_INFO_H_
-
 /*
 	rev K_HEIGHT_MAP_VERSION_4
 
diff --git a/Generals/Code/GameEngine/Include/Common/MessageStream.h b/Generals/Code/GameEngine/Include/Common/MessageStream.h
index 6bc24acb762..8c5e6c188eb 100644
--- a/Generals/Code/GameEngine/Include/Common/MessageStream.h
+++ b/Generals/Code/GameEngine/Include/Common/MessageStream.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _MESSAGE_STREAM_H_
-#define _MESSAGE_STREAM_H_
-
 #include "Common/GameCommon.h"	// ensure we get DUMP_PERF_STATS, or not
 #include "Common/SubsystemInterface.h"
 #include "Lib/BaseType.h"
@@ -54,9 +51,9 @@ union GameMessageArgumentType														///< Union of possible data for given
 	Int							integer;
 	Real 						real;
 	Bool						boolean;
-	ObjectID				objectID;									
-	DrawableID			drawableID;									
-	UnsignedInt			teamID;	
+	ObjectID				objectID;
+	DrawableID			drawableID;
+	UnsignedInt			teamID;
 	UnsignedInt			squadID;
 	Coord3D					location;
 	ICoord2D				pixel;
@@ -65,7 +62,7 @@ union GameMessageArgumentType														///< Union of possible data for given
 	WideChar				wChar;
 };
 
-enum GameMessageArgumentDataType CPP_11(: Int) 
+enum GameMessageArgumentDataType CPP_11(: Int)
 {
 	ARGUMENTDATATYPE_INTEGER,
 	ARGUMENTDATATYPE_REAL,
@@ -83,7 +80,7 @@ enum GameMessageArgumentDataType CPP_11(: Int)
 
 class GameMessageArgument : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessageArgument, "GameMessageArgument")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessageArgument, "GameMessageArgument")
 public:
 	GameMessageArgument*				m_next;									///< The next argument
 	GameMessageArgumentType			m_data;									///< The data storage of an argument
@@ -100,13 +97,13 @@ EMPTY_DTOR(GameMessageArgument)
 class GameMessage : public MemoryPoolObject
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessage, "GameMessage")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessage, "GameMessage")
 
 public:
 
 	/// The various messages which can be sent in a MessageStream
 	/// @todo Replace this hardcoded enum with a generalized system that can be easily changed and updated
-	/** @todo Because the Client will run faster than Logic, we'll need "superceding" messages for events 
+	/** @todo Because the Client will run faster than Logic, we'll need "superceding" messages for events
 						such as mouse movements so we only send the latest one over the net */
 	/**	@todo Create two classes of message: raw input messages, and command messages. Raw input messages
 						will be destroyed when they reach the end of the stream, whereas command messages will be
@@ -141,7 +138,7 @@ class GameMessage : public MemoryPoolObject
 		MSG_RAW_KEY_UP,															///< (KeyDefType) the given key was released
 
 		// Refined Mouse messages
-		// NOTE: All processing should attempt to use these refined mouse messages, rather than the 
+		// NOTE: All processing should attempt to use these refined mouse messages, rather than the
 		// RAW_* variants. (Please.) :-) jkmcd
 		MSG_MOUSE_LEFT_CLICK,												///< (pixelRegion, 0 sized means its a point), (Int, modifier keys)
 		MSG_MOUSE_LEFT_DOUBLE_CLICK,								///< (pixelRegion, 0 sized means its a point), (Int, modifier keys)
@@ -158,7 +155,7 @@ class GameMessage : public MemoryPoolObject
 		// solely to provide an abstraction layer useful for keyboard/mouse remapping.
 		// they should NEVER be sent over the network.
 		MSG_BEGIN_META_MESSAGES,										///< Marker to delineate "meta" messages
-		
+
 		MSG_META_SAVE_VIEW1,												///< save current view as the given user-defined view
 		MSG_META_SAVE_VIEW2,												///< save current view as the given user-defined view
 		MSG_META_SAVE_VIEW3,												///< save current view as the given user-defined view
@@ -216,11 +213,12 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_VIEW_TEAM8,												///< center view on given user-defined team (but do not affect selection)
 		MSG_META_VIEW_TEAM9,												///< center view on given user-defined team (but do not affect selection)
 
-		MSG_META_SELECT_MATCHING_UNITS,              ///< selects mathcing units, used for both on screen and across map 
+		MSG_META_SELECT_MATCHING_UNITS,              ///< selects mathcing units, used for both on screen and across map
 		MSG_META_SELECT_NEXT_UNIT,									///< select 'next' unit
 		MSG_META_SELECT_PREV_UNIT,									///< select 'prev' unit
 		MSG_META_SELECT_NEXT_WORKER,                ///< select 'next' worker
 		MSG_META_SELECT_PREV_WORKER,                ///< select 'prev' worker
+		MSG_META_SELECT_NEXT_IDLE_WORKER,                        ///< TheSuperHackers @feature L3-M 03/08/2025 select next idle worker
 		MSG_META_VIEW_COMMAND_CENTER,								///< center view on command center
 		MSG_META_VIEW_LAST_RADAR_EVENT,							///< center view on last radar event
 		MSG_META_SELECT_HERO,                       ///< selects player's hero character, if exists...
@@ -236,12 +234,17 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_CHAT_EVERYONE,											///< send chat msg to everyone (incl. observers)
 		MSG_META_DIPLOMACY,													///< bring up diplomacy screen
 		MSG_META_OPTIONS,														///< bring up options screen
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		MSG_META_HELP,															///< bring up help screen
 #endif
 
+		MSG_META_INCREASE_MAX_RENDER_FPS,						///< TheSuperHackers @feature Increase the max render fps
+		MSG_META_DECREASE_MAX_RENDER_FPS,						///< TheSuperHackers @feature Decrease the max render fps
+		MSG_META_INCREASE_LOGIC_TIME_SCALE,					///< TheSuperHackers @feature Increase the logic time scale
+		MSG_META_DECREASE_LOGIC_TIME_SCALE,					///< TheSuperHackers @feature Decrease the logic time scale
 		MSG_META_TOGGLE_LOWER_DETAILS,							///< toggles graphics options to crappy mode instantly
 		MSG_META_TOGGLE_CONTROL_BAR,								///< show/hide controlbar
+		MSG_META_TOGGLE_PLAYER_OBSERVER,						///< TheSuperHackers @feature Toggle the player observer view in game
 
 		MSG_META_BEGIN_PATH_BUILD,									///< enter path-building mode
 		MSG_META_END_PATH_BUILD,										///< exit path-building mode
@@ -257,24 +260,28 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_TAKE_SCREENSHOT,										///< take screenshot
 		MSG_META_ALL_CHEER,													///< Yay! :)
 		MSG_META_TOGGLE_ATTACKMOVE,									///< enter attack-move mode
-		
+
 		MSG_META_BEGIN_CAMERA_ROTATE_LEFT,
 		MSG_META_END_CAMERA_ROTATE_LEFT,
+		MSG_META_ALT_CAMERA_ROTATE_LEFT,						///< TheSuperHackers @feature Rotate camera in 45 degree increments
 		MSG_META_BEGIN_CAMERA_ROTATE_RIGHT,
 		MSG_META_END_CAMERA_ROTATE_RIGHT,
+		MSG_META_ALT_CAMERA_ROTATE_RIGHT,						///< TheSuperHackers @feature Rotate camera in 45 degree increments
 		MSG_META_BEGIN_CAMERA_ZOOM_IN,
 		MSG_META_END_CAMERA_ZOOM_IN,
 		MSG_META_BEGIN_CAMERA_ZOOM_OUT,
 		MSG_META_END_CAMERA_ZOOM_OUT,
 		MSG_META_CAMERA_RESET,
 		MSG_META_TOGGLE_FAST_FORWARD_REPLAY,				///< Toggle the fast forward feature
-		MSG_META_TOGGLE_PAUSE,											///< TheSuperHackers @feature Toggle game pause (in replay playbacks)
-		MSG_META_STEP_FRAME,												///< TheSuperHackers @feature Step one frame (in replay playbacks)
+		MSG_META_TOGGLE_PAUSE,											///< TheSuperHackers @feature Toggle game pause
+		MSG_META_TOGGLE_PAUSE_ALT,									///< TheSuperHackers @feature Toggle game pause (alternative mapping)
+		MSG_META_STEP_FRAME,												///< TheSuperHackers @feature Step one frame
+		MSG_META_STEP_FRAME_ALT,										///< TheSuperHackers @feature Step one frame (alternative mapping)
 
 
 		// META items that are really for debug/demo/development use only...
 		// They do not get built into RELEASE builds.
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS,			///< Toggles showing units behind buildings or not
 		MSG_META_DEMO_TOGGLE_LETTERBOX,							///< enable/disable letterbox mode
 		MSG_META_DEMO_TOGGLE_MESSAGE_TEXT,					///< toggle the text from the UI messages
@@ -315,9 +322,9 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_DEMO_BEGIN_ADJUST_FOV,							///< enter adjust-FOV mode
 		MSG_META_DEMO_END_ADJUST_FOV,								///< exit adjust-FOV mode
 		MSG_META_DEMO_LOCK_CAMERA_TO_PLANES,				///< lock camera to airborne thingies
-		MSG_META_DEMO_REMOVE_PREREQ,								///< Turn of Prerequisite checks in building legality
-		MSG_META_DEMO_INSTANT_BUILD,								///< All building is with a timer of 1
-		MSG_META_DEMO_FREE_BUILD,										///< All building is for 0 money
+		MSG_META_DEMO_REMOVE_PREREQ,								///< Turn off Prerequisite checks in building legality, works in MULTIPLAYER for all humans
+		MSG_META_DEMO_INSTANT_BUILD,								///< All building is with a timer of 1, works in MULTIPLAYER for all humans
+		MSG_META_DEMO_FREE_BUILD,										///< All building is for 0 money, works in MULTIPLAYER for all humans
 		MSG_META_DEMO_RUNSCRIPT1,										///< run script named "KEY_F1"
 		MSG_META_DEMO_RUNSCRIPT2,										///< run script named "KEY_F2"
 		MSG_META_DEMO_RUNSCRIPT3,										///< run script named "KEY_F3"
@@ -368,7 +375,7 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_DEBUG_VTUNE_OFF,										///< turn on/off Vtune
 		MSG_META_DEBUG_TOGGLE_FEATHER_WATER, 			///< toggle lorenzen's feather water
 
-		MSG_META_DEBUG_DUMP_ASSETS,						///< dumps currently used map assets to a file. 
+		MSG_META_DEBUG_DUMP_ASSETS,						///< dumps currently used map assets to a file.
 
 		MSG_NO_DRAW,																///< show/hide all objects to test Drawing code
 		MSG_META_DEMO_TOGGLE_METRICS,								///< Toggle the metrics on/off
@@ -377,10 +384,10 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_DEMO_TOGGLE_THREATDEBUG,						///< Toggle the threat debugger on/off
 		MSG_META_DEMO_TOGGLE_CASHMAPDEBUG,					///< Toggle the cash map debugger on/off
 		MSG_META_DEMO_TOGGLE_GRAPHICALFRAMERATEBAR,	///< Toggle the graphical framerate bar on/off
-		MSG_META_DEMO_GIVE_ALL_SCIENCES,						///< grant all grantable sciences
-		MSG_META_DEMO_GIVE_RANKLEVEL,								///< up one RankLevel
-		MSG_META_DEMO_TAKE_RANKLEVEL,								///< up one RankLevel
-		MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS,		///< give yourself an SPP (but no rank change)
+		MSG_META_DEMO_GIVE_ALL_SCIENCES,						///< grant all available sciences, works in MULTIPLAYER for all humans
+		MSG_META_DEMO_GIVE_RANKLEVEL,								///< up one rank level
+		MSG_META_DEMO_TAKE_RANKLEVEL,								///< up one rank level
+		MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS,		///< give a science purchase point (but no rank change)
 		MSG_META_DEBUG_TOGGLE_NETWORK,							///< toggle between having and not having network traffic.
 		MSG_META_DEBUG_DUMP_PLAYER_OBJECTS,					///< Dump numbers of objects owned by each player to the script debug window
 		MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS,			///< Dump numbers of objects owned by each player to the script debug window, and additional object info
@@ -388,11 +395,11 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_DEBUG_WIN,													///< Instant Win
 		MSG_META_DEMO_TOGGLE_DEBUG_STATS,						///< show/hide the debug stats
 		/// @todo END section to REMOVE (not disable) for release
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // defined(RTS_DEBUG)
 
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 		MSG_META_DEMO_TOGGLE_AUDIODEBUG,						///< show/hide the audio debug info
-#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#endif//defined(RTS_DEBUG)
 #ifdef DUMP_PERF_STATS
 		MSG_META_DEMO_PERFORM_STATISTICAL_DUMP,			///< dump performance stats for this frame to StatisticsDump.txt
 #endif//DUMP_PERF_STATS
@@ -505,7 +512,7 @@ class GameMessage : public MemoryPoolObject
 		MSG_DO_SPECIAL_POWER,												///< do special
 		MSG_DO_SPECIAL_POWER_AT_LOCATION,						///< do special with target location
 		MSG_DO_SPECIAL_POWER_AT_OBJECT,							///< do special at with target object
-		MSG_SET_RALLY_POINT,												///< (objectID, location) 
+		MSG_SET_RALLY_POINT,												///< (objectID, location)
 		MSG_PURCHASE_SCIENCE,												///< purchase a science
 		MSG_QUEUE_UPGRADE,													///< queue the "research" of an upgrade
 		MSG_CANCEL_UPGRADE,													///< cancel the "research" of an upgrade
@@ -513,10 +520,10 @@ class GameMessage : public MemoryPoolObject
 		MSG_CANCEL_UNIT_CREATE,											///< clicked on UI button to cancel production of a unit
 		MSG_DOZER_CONSTRUCT,												/**< building things requires clicking on a dozer
 																										 selecting what to build, selecting where to
-																										 build it ... this construct message will 
+																										 build it ... this construct message will
 																										 start the actual build process */
 		MSG_DOZER_CONSTRUCT_LINE,										///< Like MSG_CONSTRUCT, but for build procesess that occur in a line (like walls)
-		MSG_DOZER_CANCEL_CONSTRUCT,									///< cancel construction of a building 
+		MSG_DOZER_CANCEL_CONSTRUCT,									///< cancel construction of a building
 		MSG_SELL,																		///< sell a structure
 		MSG_EXIT,																		///< WE want to exit from whatever WE are inside of
 		MSG_EVACUATE,																///< Dump out all of OUR contained objects
@@ -534,8 +541,8 @@ class GameMessage : public MemoryPoolObject
 		MSG_ENTER,																	///< Enter object
 		MSG_DOCK,																		///< Dock with this object
 		MSG_DO_MOVETO,															///< location
-		MSG_DO_ATTACKMOVETO,												///< location 
-		MSG_DO_FORCEMOVETO,													///< location 
+		MSG_DO_ATTACKMOVETO,												///< location
+		MSG_DO_FORCEMOVETO,													///< location
 		MSG_ADD_WAYPOINT,														///< location
 		MSG_DO_GUARD_POSITION,											///< Guard with the currently selected group
 		MSG_DO_GUARD_OBJECT,												///< Guard with the currently selected group
@@ -565,7 +572,7 @@ class GameMessage : public MemoryPoolObject
 
 		MSG_BEGIN_DEBUG_NETWORK_MESSAGES = 1900,		///< network messages that exist only in debug/internal builds. all grouped separately.
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		// all debug/internal-only messages must go here.
 		MSG_DEBUG_KILL_SELECTION,
 		MSG_DEBUG_HURT_OBJECT,
@@ -597,8 +604,8 @@ class GameMessage : public MemoryPoolObject
 	Type getType( void ) const { return m_type; }					///< Return the message type
 	UnsignedByte getArgumentCount( void ) const { return m_argCount; }	///< Return the number of arguments for this msg
 
-	AsciiString getCommandAsAsciiString( void ); ///< returns a string representation of the command type.
-	static AsciiString getCommandTypeAsAsciiString(GameMessage::Type t);
+	const char *getCommandAsString( void ) const; ///< returns a string representation of the command type.
+	static const char *getCommandTypeAsString(GameMessage::Type t);
 
 	Int getPlayerIndex( void ) const { return m_playerIndex; }		///< Return the originating player
 
@@ -666,7 +673,7 @@ class GameMessageList : public SubsystemInterface
 	virtual void reset( void ) { };			///< Reset system
 	virtual void update( void ) { };		///< Update system
 
-	GameMessage *getFirstMessage( void ) { return m_firstMessage; }	///< Return the first message 
+	GameMessage *getFirstMessage( void ) { return m_firstMessage; }	///< Return the first message
 
 	virtual void appendMessage( GameMessage *msg );			///< Add message to end of the list
 	virtual void insertMessage( GameMessage *msg, GameMessage *messageToInsertAfter );	// Insert message after messageToInsertAfter.
@@ -680,7 +687,7 @@ class GameMessageList : public SubsystemInterface
 	GameMessage *m_lastMessage;									///< The last message on the list
 };
 
-/** 
+/**
 	What to do with a GameMessage after a translator has handled it.
 	Use a custom enum (rather than a Bool) to make the code more obvious.
 */
@@ -698,7 +705,7 @@ class GameMessageTranslator
 };
 
 /**
- * A MessageStream contains an ordered list of messages which can have one or more 
+ * A MessageStream contains an ordered list of messages which can have one or more
  * prioritized message handler functions ("translators") attached to it.
  */
 class MessageStream : public GameMessageList
@@ -720,7 +727,7 @@ class MessageStream : public GameMessageList
 	// Methods NOT Inherited ------------------------------------------------------------------------
 	void propagateMessages( void );													///< Propagate messages through attached translators
 
-	/** 
+	/**
 		Attach a translator function to the stream at a priority value. Lower priorities are executed first.
 		Note that MessageStream assumes ownership of the translator, and is responsible for freeing it!
 	*/
@@ -799,5 +806,3 @@ extern CommandList *TheCommandList;
  * construct a valid 2D bounding region.
  */
 extern void buildRegion( const ICoord2D *anchor, const ICoord2D *dest, IRegion2D *region );
-
-#endif // _MESSAGE_STREAM_H_
diff --git a/Generals/Code/GameEngine/Include/Common/MiscAudio.h b/Generals/Code/GameEngine/Include/Common/MiscAudio.h
deleted file mode 100644
index 69b09a05648..00000000000
--- a/Generals/Code/GameEngine/Include/Common/MiscAudio.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///MiscAudio.h/////////////////////////////////////////////////////////////////////////////////////
-// This file is for miscellaneous sound hooks that don't have another happy home.
-
-#pragma once
-
-#ifndef _MISCAUDIO_H_
-#define _MISCAUDIO_H_
-
-#include "Common/AudioEventRTS.h"
-
-struct MiscAudio
-{
-	static const FieldParse m_fieldParseTable[];
-	
-	AudioEventRTS m_radarUnitUnderAttackSound;						///< radar sounds to play when unit under attack
-	AudioEventRTS m_radarHarvesterUnderAttackSound;				///< radar sounds to play when harvester under attack
-	AudioEventRTS m_radarStructureUnderAttackSound;				///< radar sounds to play when structure under attack
-	AudioEventRTS m_radarUnderAttackSound;								///< radar sounds to play when ? under attack
-	AudioEventRTS m_radarInfiltrationSound;								///< radar sounds to play when something is infiltrated
-	AudioEventRTS m_radarOnlineSound;											///< radar sounds to play when radar goes online
-	AudioEventRTS m_radarOfflineSound;										///< radar sounds to play when radar goes offline
-	AudioEventRTS m_defectorTimerTickSound;								///< snd to play during transient invulnerability while defecting // lorenzen
-	AudioEventRTS m_defectorTimerDingSound;								///< snd to play when you become vulnerable again // lorenzen
-	AudioEventRTS m_lockonTickSound;											///< snd to play during stealth-fighter-lockon period
-	AudioEventRTS m_allCheerSound;												///< snd to play when user presses 'cheer' key
-	AudioEventRTS m_battleCrySound;												///< snd to play when user presses 'battlecry' key
-	AudioEventRTS m_guiClickSound;												///< snd to play when user presses button in GUI
-	AudioEventRTS m_noCanDoSound;													///< Global "No Can Do" sound
-	AudioEventRTS	m_stealthDiscoveredSound;								///< I have just discovered an enemy stealth unit
-	AudioEventRTS	m_stealthNeutralizedSound;							///< One of my stealthed units has just been discovered by the enemy
-	AudioEventRTS m_moneyDepositSound;										///< Money was deposited in my bank
-	AudioEventRTS m_moneyWithdrawSound;										///< Money was withdrawn from my bank
-	AudioEventRTS m_buildingDisabled;											///< Building has lost power, been hit with an EMP, or disable hacked.
-	AudioEventRTS m_buildingReenabled;										///< Building has recovered from being disabled.
-	AudioEventRTS m_vehicleDisabled;											///< Vehicle has been disabled via EMP or hacker attack.
-	AudioEventRTS m_vehicleReenabled;											///< Vehicle has recovered from being disabled.
-	AudioEventRTS m_splatterVehiclePilotsBrain;						///< Pilot has been sniped by Jarmen Kell.
-	AudioEventRTS m_terroristInCarMoveVoice;							///< Terrorist issues a move order while in a car.
-	AudioEventRTS m_terroristInCarAttackVoice;						///< Terrorist issues attack order while in a car.
-	AudioEventRTS m_terroristInCarSelectVoice;						///< Terrorist is selected while in a car.
-	AudioEventRTS m_crateHeal;														///< When heal crate is picked up.
-	AudioEventRTS m_crateShroud;													///< When shroud crate is picked up.
-	AudioEventRTS m_crateSalvage;													///< When salvage crate is picked up.
-	AudioEventRTS m_crateFreeUnit;												///< When free unit crate is picked up.
-	AudioEventRTS m_crateMoney;														///< When money crate is picked up.
-	AudioEventRTS m_unitPromoted;													///< Unit is promoted.
-	AudioEventRTS m_repairSparks;													///< Battle drone repairs unit.
-	AudioEventRTS m_aircraftWheelScreech;									///< When a jet lands on a runway.
-};
-
-
-#endif /* _MISCAUDIO_H_ */
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/Common/MissionStats.h b/Generals/Code/GameEngine/Include/Common/MissionStats.h
index 46602c50501..e57116f8c78 100644
--- a/Generals/Code/GameEngine/Include/Common/MissionStats.h
+++ b/Generals/Code/GameEngine/Include/Common/MissionStats.h
@@ -24,12 +24,12 @@
 
 // FILE: MissionStats.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,16 +44,13 @@
 
 #pragma once
 
-#ifndef _MISSIONSTATS_H_
-#define _MISSIONSTATS_H_
-
 #include "Lib/BaseType.h"
 #include "Common/GameCommon.h"
 #include "Common/Snapshot.h"
 
 // ----------------------------------------------------------------------------------------------
 /**
-	Class that accumulates stats during a mission. Some of this will be for scoring purposes, 
+	Class that accumulates stats during a mission. Some of this will be for scoring purposes,
 	and some will probably be used by AI to determine future moves.
 
 	@todo: not sure what need to be here. Alas. For now, I have just put in the fields from RA2
@@ -64,7 +61,7 @@ class MissionStats : public Snapshot
 {
 
 public:
-	
+
 	MissionStats();
 
 	/// reset all stats to "nothing".
@@ -85,6 +82,3 @@ class MissionStats : public Snapshot
 	Int m_buildingsLost;													///< how many of our buildings were destroyed?
 	//Int	m_whoLastHurtMe;													///< last Player to destroy one of my units
 };
-
-#endif // _MISSIONSTATS_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/ModelState.h b/Generals/Code/GameEngine/Include/Common/ModelState.h
index 9ca76f0f978..5997dd8e2e1 100644
--- a/Generals/Code/GameEngine/Include/Common/ModelState.h
+++ b/Generals/Code/GameEngine/Include/Common/ModelState.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _ModelState_H_
-#define _ModelState_H_
-
 #include "Lib/BaseType.h"
 #include "Common/INI.h"
 #include "Common/BitFlags.h"
@@ -41,45 +38,45 @@
 	THE PROBLEM
 	-----------
 
-	-- there are lots of different states. (consider that structures can be: day/night, snow/nosnow, 
+	-- there are lots of different states. (consider that structures can be: day/night, snow/nosnow,
 	powered/not, garrisoned/empty, damaged/not... you do the math.)
 
-	-- some states are mutually exclusive (idle vs. moving), others are not (snow/nosnow, day/night). 
-	generally, humanoid units have mostly the former, while structure units have mostly the latter. 
+	-- some states are mutually exclusive (idle vs. moving), others are not (snow/nosnow, day/night).
+	generally, humanoid units have mostly the former, while structure units have mostly the latter.
 	The current ModelState system really only supports the mutually-exclusive states well.
 
-	-- we'd rather not have to specify every state in the INI files, BUT we do want to be able 
+	-- we'd rather not have to specify every state in the INI files, BUT we do want to be able
 	to intelligently choose the best model for a given state, whether or not a "real" state exists for it.
 
-	-- it would be desirable to have a unified way of representing "ModelState" so that we don't 
+	-- it would be desirable to have a unified way of representing "ModelState" so that we don't
 	have multiple similar-yet-different systems.
 
 	YUCK, WHAT NOW
 	--------------
 
-	Let's represent the Model State with two dictinct pieces: 
-	
-	-- an "ActionState" piece, representing the mutually-exclusive states, which are almost 
+	Let's represent the Model State with two dictinct pieces:
+
+	-- an "ActionState" piece, representing the mutually-exclusive states, which are almost
 		always an action of some sort
-		
-	-- and a "ConditionState" piece, which is a set of bitflags to indicate the static "condition" 
+
+	-- and a "ConditionState" piece, which is a set of bitflags to indicate the static "condition"
 		of the model.
 
 	Note that these are usually set independently in code, but they are lumped together in order to
 	determine the actual model to be used.
 
-	(Let's require all objects would be required to have an "Idle" ActionState, which is the 
-	normal, just-sitting there condition.) 
+	(Let's require all objects would be required to have an "Idle" ActionState, which is the
+	normal, just-sitting there condition.)
 
-	From a code point of view, this becomes an issue of requesting a certain state, and 
+	From a code point of view, this becomes an issue of requesting a certain state, and
 	finding the best-fit match for it. So, what are the rules for finding a good match?
 
-	-- Action states must match exactly. If the desired action state is not found, then the 
+	-- Action states must match exactly. If the desired action state is not found, then the
 	IDLE state is substituted (but this should generally be considered an error condition).
 
-	-- Condition states choose the match with the closest match among the "Condition" bits in the 
+	-- Condition states choose the match with the closest match among the "Condition" bits in the
 	INI file, based on satisfying the most of the "required" conditions and the fewest of the
-	"forbidden" conditions. 
+	"forbidden" conditions.
 
 */
 
@@ -91,13 +88,11 @@ enum ModelConditionFlagType CPP_11(: Int)
 {
 	MODELCONDITION_INVALID = -1,
 
-	MODELCONDITION_FIRST = 0,
-
 //
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-	MODELCONDITION_TOPPLED = MODELCONDITION_FIRST,
+	MODELCONDITION_TOPPLED,
 	MODELCONDITION_FRONTCRUSHED,
 	MODELCONDITION_BACKCRUSHED,
 	MODELCONDITION_DAMAGED,
@@ -186,7 +181,7 @@ enum ModelConditionFlagType CPP_11(: Int)
 
 	//Special model conditions work as following:
 	//Something turns it on... but a timer in the object will turn them off after a given
-	//amount of time. If you add any more special animations, then you'll need to add the 
+	//amount of time. If you add any more special animations, then you'll need to add the
 	//code to turn off the state.
 	MODELCONDITION_SPECIAL_CHEERING,	//When units do a victory cheer (or player initiated cheer).
 
@@ -214,7 +209,8 @@ enum ModelConditionFlagType CPP_11(: Int)
 // existing values!
 //
 
-	MODELCONDITION_COUNT	// keep last!
+	MODELCONDITION_COUNT,
+	MODELCONDITION_FIRST = 0,
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -233,6 +229,3 @@ typedef BitFlags<MODELCONDITION_COUNT> ModelConditionFlags;
 //-------------------------------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------------------------------
-
-#endif // _ModelState_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/Module.h b/Generals/Code/GameEngine/Include/Common/Module.h
index a291cfed567..adc0e98e27f 100644
--- a/Generals/Code/GameEngine/Include/Common/Module.h
+++ b/Generals/Code/GameEngine/Include/Common/Module.h
@@ -31,9 +31,6 @@
 
 #pragma once
 
-#ifndef __MODULE_H_
-#define __MODULE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "Common/GameMemory.h"
@@ -54,7 +51,7 @@ struct FieldParse;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum ModuleType CPP_11(: Int) 
+enum ModuleType CPP_11(: Int)
 {
 	MODULETYPE_BEHAVIOR = 0,
 
@@ -69,7 +66,7 @@ enum ModuleType CPP_11(: Int)
 	MODULETYPE_CLIENT_UPDATE = 2,
 	// put new drawable module types here
 
-	NUM_MODULE_TYPES,  // keep this last!
+	NUM_MODULE_TYPES,
 
 	FIRST_DRAWABLE_MODULE_TYPE = MODULETYPE_DRAW,
 	LAST_DRAWABLE_MODULE_TYPE = MODULETYPE_CLIENT_UPDATE,
@@ -79,7 +76,7 @@ enum ModuleType CPP_11(: Int)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum ModuleInterfaceType CPP_11(: Int) 
+enum ModuleInterfaceType CPP_11(: Int)
 {
 	MODULEINTERFACE_UPDATE					= 0x00000001,
 	MODULEINTERFACE_DIE							= 0x00000002,
@@ -109,12 +106,12 @@ class ModuleData : public Snapshot
 	NameKeyType getModuleTagNameKey() const { return m_moduleTagNameKey; }
 
 	virtual Bool isAiModuleData() const { return false; }
-	
+
 	// ugh, hack
 	virtual const W3DModelDrawModuleData* getAsW3DModelDrawModuleData() const { return NULL; }
 	virtual StaticGameLODLevel getMinimumRequiredGameLOD() const { return (StaticGameLODLevel)0;}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
 		// nothing
 	}
@@ -170,7 +167,7 @@ public: \
 	MAKE_STANDARD_MODULE_DATA_MACRO_ABC(cls, clsmd)
 
 //-------------------------------------------------------------------------------------------------
-/** Common interface for thing modules, we want a single common base class 
+/** Common interface for thing modules, we want a single common base class
 	* for all the modules (either object or drawable) so that we can use
 	* a single module factory to handle instancing them ... it's just
 	* convenient this way */
@@ -192,15 +189,15 @@ class Module : public MemoryPoolObject,
 
 	virtual NameKeyType getModuleNameKey() const = 0;
 
-	inline NameKeyType getModuleTagNameKey() const { return getModuleData()->getModuleTagNameKey(); }
+	NameKeyType getModuleTagNameKey() const { return getModuleData()->getModuleTagNameKey(); }
 
 	/** this is called after all the Modules for a given Thing are created; it
 		allows Modules to resolve any inter-Module dependencies.
 	*/
 	virtual void onObjectCreated() { }
-	
+
 	/**
-		this is called whenever a drawable is bound to the object. 
+		this is called whenever a drawable is bound to the object.
 		drawable is NOT guaranteed to be non-null.
 	*/
 	virtual void onDrawableBoundToObject() { }
@@ -214,7 +211,7 @@ class Module : public MemoryPoolObject,
 
 protected:
 
-	inline const ModuleData* getModuleData() const { return m_moduleData; }
+	const ModuleData* getModuleData() const { return m_moduleData; }
 
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
@@ -223,7 +220,7 @@ class Module : public MemoryPoolObject,
 private:
 	const ModuleData* m_moduleData;
 
-};  // end Module
+};
 //-------------------------------------------------------------------------------------------------
 
 
@@ -251,8 +248,8 @@ class ObjectModule : public Module
 
 protected:
 
-	inline Object *getObject() { return m_object; }
-	inline const Object *getObject() const { return m_object; }
+	Object *getObject() { return m_object; }
+	const Object *getObject() const { return m_object; }
 
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
@@ -294,8 +291,8 @@ class DrawableModule : public Module
 
 protected:
 
-	inline Drawable *getDrawable() { return m_drawable; }
-	inline const Drawable *getDrawable() const { return m_drawable; }
+	Drawable *getDrawable() { return m_drawable; }
+	const Drawable *getDrawable() const { return m_drawable; }
 
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
@@ -314,7 +311,3 @@ class DrawableModule : public Module
 //-------------------------------------------------------------------------------------------------
 /** VARIOUS MODULE INTERFACES */
 //-------------------------------------------------------------------------------------------------
-
-
-#endif // __MODULE_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/ModuleFactory.h b/Generals/Code/GameEngine/Include/Common/ModuleFactory.h
index 3c12dd6da92..f3f4182f90f 100644
--- a/Generals/Code/GameEngine/Include/Common/ModuleFactory.h
+++ b/Generals/Code/GameEngine/Include/Common/ModuleFactory.h
@@ -27,7 +27,7 @@
 // Desc:	 TheModuleFactory is where we actually instance modules for objects
 //				 and drawbles.  Those modules are things such as an UpdateModule
 //			   or DamageModule or DrawModule etc.
-//	
+//
 //				 TheModuleFactory will contain a list of ModuleTemplates, when we
 //				 request a new module, we will look for that template in our
 //				 list and create it
@@ -36,9 +36,6 @@
 
 #pragma once
 
-#ifndef __MODULEFACTORY_H_
-#define __MODULEFACTORY_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include <stdlib.h>
 
@@ -79,7 +76,7 @@ class ModuleFactory : public SubsystemInterface, public Snapshot
 
 	Module *newModule( Thing *thing, const AsciiString& name, const ModuleData* data, ModuleType type );  ///< allocate a new module
 
-	// module-data 
+	// module-data
 	ModuleData* newModuleDataFromINI(INI* ini, const AsciiString& name, ModuleType type, const AsciiString& moduleTag);
 
 	Int findModuleInterfaceMask(const AsciiString& name, ModuleType type);
@@ -122,10 +119,7 @@ class ModuleFactory : public SubsystemInterface, public Snapshot
 	ModuleTemplateMap			m_moduleTemplateMap;
 	ModuleDataList				m_moduleDataList;
 
-};  // end class ModuleFactory
+};
 
 // EXTERN /////////////////////////////////////////////////////////////////////////////////////////
 extern ModuleFactory *TheModuleFactory;  ///< singleton definition
-
-#endif // __MODULEFACTORY_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/Money.h b/Generals/Code/GameEngine/Include/Common/Money.h
index c8b13e9d0c2..2c4bbe3c6a6 100644
--- a/Generals/Code/GameEngine/Include/Common/Money.h
+++ b/Generals/Code/GameEngine/Include/Common/Money.h
@@ -24,12 +24,12 @@
 
 // FILE: Money.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,13 +44,12 @@
 
 #pragma once
 
-#ifndef _MONEY_H_
-#define _MONEY_H_
-
 #include "Lib/BaseType.h"
 #include "Common/Debug.h"
 #include "Common/Snapshot.h"
 
+class AudioEventRTS;
+
 // ----------------------------------------------------------------------------------------------
 /**
 	How much "money" (Tiberium, Gems, Magic Resource Boxes, whatever) the Player has.
@@ -62,26 +61,31 @@ class Money : public Snapshot
 
 public:
 
-	inline Money() : m_money(0), m_playerIndex(0)
+	Money() : m_playerIndex(0)
 	{
+		init();
 	}
 
 	void init()
 	{
-		m_money = 0;
+		setStartingCash(0);
 	}
 
-	inline UnsignedInt countMoney() const 
-	{ 
-		return m_money; 
+	UnsignedInt countMoney() const
+	{
+		return m_money;
 	}
 
 	/// returns the actual amount withdrawn, which may be less than you want. (sorry, can't go into debt...)
 	UnsignedInt withdraw(UnsignedInt amountToWithdraw, Bool playSound = TRUE);
-	void deposit(UnsignedInt amountToDeposit, Bool playSound = TRUE);
+	void deposit(UnsignedInt amountToDeposit, Bool playSound = TRUE, Bool trackIncome = TRUE);
+
+	void setStartingCash(UnsignedInt amount);
+	void updateIncomeBucket();
+	UnsignedInt getCashPerMinute() const;
 
 	void setPlayerIndex(Int ndx) { m_playerIndex = ndx; }
-	
+
   static void parseMoneyAmount( INI *ini, void *instance, void *store, const void* userData );
 
   // Does the amount of this == the amount of that (compare everything except m_playerIndex)
@@ -91,6 +95,9 @@ class Money : public Snapshot
   }
 
 protected:
+
+	void triggerAudioEvent(const AudioEventRTS& audioEvent);
+
 	// snapshot methods
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
@@ -100,7 +107,7 @@ class Money : public Snapshot
 
 	UnsignedInt m_money;	///< amount of money
 	Int m_playerIndex;	///< what is my player index?
+	UnsignedInt m_incomeBuckets[60];	///< circular buffer of 60 seconds for income tracking
+	UnsignedInt m_currentBucket;
+	UnsignedInt m_cashPerMinute;
 };
-
-#endif // _MONEY_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h b/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h
index 8cc00ebb40d..4ea47f91b62 100644
--- a/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h
+++ b/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h
@@ -29,10 +29,8 @@
 
 #pragma once
 
-#ifndef _MULTIPLAYERSETTINGS_H_
-#define _MULTIPLAYERSETTINGS_H_
-
 #include "GameClient/Color.h"
+#include "Common/Money.h"
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
 struct FieldParse;
@@ -48,11 +46,11 @@ class MultiplayerColorDefinition
 	static const FieldParse m_colorFieldParseTable[];		///< the parse table for INI definition
 	const FieldParse *getFieldParse( void ) const { return m_colorFieldParseTable; }
 
-	inline AsciiString getTooltipName(void) const { return m_tooltipName; };
-	inline RGBColor getRGBValue(void) const { return m_rgbValue; };
-	inline RGBColor getRGBNightValue(void) const { return m_rgbValueNight; };
-	inline Color getColor(void) const { return m_color; }
-	inline Color getNightColor(void) const { return m_colorNight; }
+	AsciiString getTooltipName(void) const { return m_tooltipName; };
+	RGBColor getRGBValue(void) const { return m_rgbValue; };
+	RGBColor getRGBNightValue(void) const { return m_rgbValueNight; };
+	Color getColor(void) const { return m_color; }
+	Color getNightColor(void) const { return m_colorNight; }
 	void setColor( RGBColor rgb );
 	void setNightColor( RGBColor rgb );
 
@@ -69,6 +67,9 @@ class MultiplayerColorDefinition
 typedef std::map<Int, MultiplayerColorDefinition> MultiplayerColorList;
 typedef std::map<Int, MultiplayerColorDefinition>::iterator MultiplayerColorIter;
 
+// A list of values to display in the starting money dropdown
+typedef std::vector< Money > MultiplayerStartingMoneyList;
+
 //-------------------------------------------------------------------------------------------------
 /** Multiplayer Settings container class
   *	Defines multiplayer settings */
@@ -91,16 +92,14 @@ class MultiplayerSettings : public SubsystemInterface
 	MultiplayerColorDefinition * findMultiplayerColorDefinitionByName(AsciiString name);
 	MultiplayerColorDefinition * newMultiplayerColorDefinition(AsciiString name);
 
-	inline Int getInitialCreditsMin( void ) { return m_initialCreditsMin; }
-	inline Int getInitialCreditsMax( void ) { return m_initialCreditsMax; }
-	inline Int getStartCountdownTimerSeconds( void ) { return m_startCountdownTimerSeconds; }
-	inline Int getMaxBeaconsPerPlayer( void ) { return m_maxBeaconsPerPlayer; }
-	inline Bool isShroudInMultiplayer( void ) { return m_isShroudInMultiplayer; }
-	inline Bool showRandomPlayerTemplate( void ) { return m_showRandomPlayerTemplate; }
-	inline Bool showRandomStartPos( void ) { return m_showRandomStartPos; }
-	inline Bool showRandomColor( void ) { return m_showRandomColor; }
+	Int getStartCountdownTimerSeconds( void ) { return m_startCountdownTimerSeconds; }
+	Int getMaxBeaconsPerPlayer( void ) { return m_maxBeaconsPerPlayer; }
+	Bool isShroudInMultiplayer( void ) { return m_isShroudInMultiplayer; }
+	Bool showRandomPlayerTemplate( void ) { return m_showRandomPlayerTemplate; }
+	Bool showRandomStartPos( void ) { return m_showRandomStartPos; }
+	Bool showRandomColor( void ) { return m_showRandomColor; }
 
-	inline Int getNumColors( void ) 
+	Int getNumColors( void )
 	{
 		if (m_numColors == 0) {
 			m_numColors = m_colorList.size();
@@ -109,6 +108,17 @@ class MultiplayerSettings : public SubsystemInterface
 	}
 	MultiplayerColorDefinition * getColor(Int which);
 
+
+  const Money & getDefaultStartingMoney() const
+  {
+    DEBUG_ASSERTCRASH( m_gotDefaultStartingMoney, ("You must specify a default starting money amount in multiplayer.ini") );
+    return m_defaultStartingMoney;
+  }
+
+  const MultiplayerStartingMoneyList & getStartingMoneyList() const { return m_startingMoneyList; }
+
+  void addStartingMoneyChoice( const Money & money, Bool isDefault );
+
 private:
 	Int m_initialCreditsMin;
 	Int m_initialCreditsMax;
@@ -123,9 +133,10 @@ class MultiplayerSettings : public SubsystemInterface
 	Int m_numColors;
 	MultiplayerColorDefinition m_observerColor;
 	MultiplayerColorDefinition m_randomColor;
+  MultiplayerStartingMoneyList      m_startingMoneyList;
+  Money                             m_defaultStartingMoney;
+  Bool                              m_gotDefaultStartingMoney;
 };
 
 // singleton
 extern MultiplayerSettings *TheMultiplayerSettings;
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h b/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h
index 583f42d6587..2662543140c 100644
--- a/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h
+++ b/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h
@@ -30,31 +30,26 @@
 
 #pragma once
 
-#ifndef __NAMEKEYGENERATOR_H_
-#define __NAMEKEYGENERATOR_H_
-
 #include "Lib/BaseType.h"
 #include "Common/SubsystemInterface.h"
 #include "Common/GameMemory.h"
 #include "Common/AsciiString.h"
 
-//------------------------------------------------------------------------------------------------- 
-/**
-	Note that NameKeyType isn't a "real" enum, but an enum type used to enforce the
-	fact that NameKeys are really magic cookies, and aren't really interchangeable
-	with ints. NAMEKEY_INVALID is always a legal value, but all other values are dynamically
-	determined at runtime. (The generated code is basically identical, of course.)
-*/
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
+// Note that NameKeyType isn't a "real" enum, but an enum type used to enforce the
+// fact that NameKeys are really magic cookies, and aren't really interchangeable
+// with integers. NAMEKEY_INVALID is always a legal value, but all other values are dynamically
+// determined at runtime. (The generated code is basically identical, of course.)
+//-------------------------------------------------------------------------------------------------
 enum NameKeyType CPP_11(: Int)
 {
 	NAMEKEY_INVALID					= 0,
-	NAMEKEY_MAX							= 1<<23,					// max ordinal value of a NameKey (some code relies on these fitting into 24 bits safely)
-	FORCE_NAMEKEYTYPE_LONG	= 0x7fffffff	// a trick to ensure the NameKeyType is a 32-bit int
+	NAMEKEY_MAX							= 1<<23, // max ordinal value of a NameKey (some code relies on these fitting into 24 bits safely)
+	FORCE_NAMEKEYTYPE_LONG	= 0x7fffffff, // a trick to ensure the NameKeyType is a 32-bit int
 };
 
 //-------------------------------------------------------------------------------------------------
-/** A bucket entry for the name key generator */
+// A bucket entry for the name key generator
 //-------------------------------------------------------------------------------------------------
 class Bucket : public MemoryPoolObject
 {
@@ -62,7 +57,7 @@ class Bucket : public MemoryPoolObject
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( Bucket, "NameKeyBucketPool" );
 
 public:
-	
+
 	Bucket();
 //~Bucket();
 
@@ -74,14 +69,14 @@ class Bucket : public MemoryPoolObject
 inline Bucket::Bucket() : m_nextInSocket(NULL), m_key(NAMEKEY_INVALID) { }
 inline Bucket::~Bucket() { }
 
-//------------------------------------------------------------------------------------------------- 
-/** This class implements the conversion of an arbitrary string into a unique
-	* integer "key". Calling the nameToKey() method with the same string is 
-	* guaranteed to return the same key. Also, all keys generated by an 
-	* instance of this class are guaranteed to be unique with respect to that 
-	* instance's catalog of names.  Multiple instances of this class can be 
-	* created to service multiple namespaces. */
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
+// This class implements the conversion of an arbitrary string into a unique
+// integer "key". Calling the nameToKey() method with the same string is
+// guaranteed to return the same key. Also, all keys generated by an
+// instance of this class are guaranteed to be unique with respect to that
+// instance's catalog of names. Multiple instances of this class can be
+// created to service multiple namespaces.
+//-------------------------------------------------------------------------------------------------
 class NameKeyGenerator : public SubsystemInterface
 {
 
@@ -95,23 +90,21 @@ class NameKeyGenerator : public SubsystemInterface
 	virtual void update() { }
 
 	/// Given a string, convert into a unique integer key.
-	NameKeyType nameToKey(const AsciiString& name) { return nameToKey(name.str()); }
-	NameKeyType nameToLowercaseKey(const AsciiString& name) { return nameToLowercaseKey(name.str()); }
+	NameKeyType nameToKey(const AsciiString& name);
+	NameKeyType nameToLowercaseKey(const AsciiString& name);
 
 	/// Given a string, convert into a unique integer key.
 	NameKeyType nameToKey(const char* name);
 	NameKeyType nameToLowercaseKey(const char *name);
 
-	/** 
-		given a key, return the name. this is almost never needed,
-		except for a few rare cases like object serialization. also
-		note that it's not particularly fast; it does a dumb linear
-		search for the key.
-	*/
+	// given a key, return the name. this is almost never needed,
+	// except for a few rare cases like object serialization. also
+	// note that it's not particularly fast; it does a dumb linear
+	// search for the key.
 	AsciiString keyToName(NameKeyType key);
 
-  // Get a string out of the INI. Store it into a NameKeyType
-  static void parseStringAsNameKeyType( INI *ini, void *instance, void *store, const void* userData );
+	// Get a string out of the INI. Store it into a NameKeyType
+	static void parseStringAsNameKeyType( INI *ini, void *instance, void *store, const void* userData );
 
 private:
 
@@ -123,16 +116,26 @@ class NameKeyGenerator : public SubsystemInterface
 		SOCKET_COUNT = 6473
 	};
 
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+	Bool addReservedKey();
+#endif
+
+	NameKeyType nameToKeyImpl(const AsciiString& name);
+	NameKeyType nameToLowercaseKeyImpl(const AsciiString& name);
+	NameKeyType nameToKeyImpl(const char* name);
+	NameKeyType nameToLowercaseKeyImpl(const char *name);
+	NameKeyType createNameKey(UnsignedInt hash, const AsciiString& name);
+
 	void freeSockets();
 
 	Bucket*				m_sockets[SOCKET_COUNT];			///< Catalog of all Buckets already generated
 	UnsignedInt		m_nextID;											///< Next available ID
 
-};  // end class NameKeyGenerator
+};
 
-//------------------------------------------------------------------------------------------------- 
-//           Externals                                                     
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
+//           Externals
+//-------------------------------------------------------------------------------------------------
 extern NameKeyGenerator *TheNameKeyGenerator;  ///< just one namespace for now
 
 // typing "TheNameKeyGenerator->nameToKey()" is awfully wordy. Here are shorter synonyms:
@@ -141,7 +144,7 @@ inline NameKeyType NAMEKEY(const char* name) { return TheNameKeyGenerator->nameT
 
 inline AsciiString KEYNAME(NameKeyType nk) { return TheNameKeyGenerator->keyToName(nk); }
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 class StaticNameKey
 {
 private:
@@ -151,8 +154,5 @@ class StaticNameKey
 	StaticNameKey(const char* p) : m_key(NAMEKEY_INVALID), m_name(p) {}
 	NameKeyType key() const;
 	// ugh, this is a little hokey, but lets us pretend that a StaticNameKey == NameKeyType
-	inline operator NameKeyType() const { return key(); }
+	operator NameKeyType() const { return key(); }
 };
-
-#endif // __NAMEKEYGENERATOR_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/OSDisplay.h b/Generals/Code/GameEngine/Include/Common/OSDisplay.h
index fe733b06607..1385a944b17 100644
--- a/Generals/Code/GameEngine/Include/Common/OSDisplay.h
+++ b/Generals/Code/GameEngine/Include/Common/OSDisplay.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __OSDISPLAY_H__
-#define __OSDISPLAY_H__
-
 #include "Lib/BaseType.h"
 
 class AsciiString;
@@ -39,8 +36,8 @@ enum OSDisplayButtonType CPP_11(: UnsignedInt)
 {
 	OSDBT_OK										= 0x00000001,
 	OSDBT_CANCEL								= 0x00000002,
-															
-															
+
+
 	OSDBT_ERROR									= 0x80000000
 };
 
@@ -49,7 +46,7 @@ enum OSDisplayOtherFlags CPP_11(: UnsignedInt)
 	OSDOF_SYSTEMMODAL						= 0x00000001,
 	OSDOF_APPLICATIONMODAL			= 0x00000002,
 	OSDOF_TASKMODAL							= 0x00000004,
-	
+
 	OSDOF_EXCLAMATIONICON				= 0x00000008,
 	OSDOF_INFORMATIONICON				= 0x00000010,
 	OSDOF_ERRORICON							= 0x00000011,
@@ -59,8 +56,10 @@ enum OSDisplayOtherFlags CPP_11(: UnsignedInt)
 };
 
 // Display a warning box to the user with the specified localized prompt, message, and
-// buttons. (Feel free to add buttons as appropriate to the enum above). 
+// buttons. (Feel free to add buttons as appropriate to the enum above).
 // This function will return the button pressed to close the dialog.
 OSDisplayButtonType OSDisplayWarningBox(AsciiString p, AsciiString m, UnsignedInt buttonFlags, UnsignedInt otherFlags);
 
-#endif /* __OSDISPLAY_H__ */
\ No newline at end of file
+// TheSuperHackers @feature Tell the Operating System that the game is considered busy
+// and we would not like the display screen and/or system to shut off.
+void OSDisplaySetBusyState(Bool busyDisplay, Bool busySystem);
diff --git a/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h b/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h
deleted file mode 100644
index 456195327b8..00000000000
--- a/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: ObjectStatusTypes.h /////////////////////////////////////////////////////////////////////////
-// Author: Kris, May 2003
-// Desc:   Object status types that are stackable using the BitSet system. Used to be ObjectStatusBits
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __OBJECT_STATUS_TYPES_H
-#define __OBJECT_STATUS_TYPES_H
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Lib/BaseType.h"
-#include "Common/BitFlags.h"
-#include "Common/BitFlagsIO.h"
-
-//-------------------------------------------------------------------------------------------------
-/** Object status types */
-//-------------------------------------------------------------------------------------------------
-enum ObjectStatusTypes CPP_11(: Int)
-{
-	//These are saved. Do not insert or remove any!
-
-	OBJECT_STATUS_NONE,									///< no status bit
-	OBJECT_STATUS_DESTROYED,						///< has been destroyed, pending delete
-	OBJECT_STATUS_CAN_ATTACK,						///< used by garrissoned buildings, is OR'ed with KINDOF_CAN_ATTACK in isAbleToAttack()
-	OBJECT_STATUS_UNDER_CONSTRUCTION,		///< object is being constructed and is not yet complete
-	OBJECT_STATUS_UNSELECTABLE,					///< This is a negative condition since these statuses are overrides.  ie their presence forces the condition, but their absence means nothing
-	OBJECT_STATUS_NO_COLLISIONS,				///< object should be ignored for object-object collisions (but not object-ground); used for thing like collapsing parachutes that are intangible
-	OBJECT_STATUS_NO_ATTACK,						///< Absolute override to being able to attack
-	OBJECT_STATUS_AIRBORNE_TARGET,			///< InTheAir as far as AntiAir weapons are concerned only.
-	OBJECT_STATUS_PARACHUTING,					///< object is on a parachute
-	OBJECT_STATUS_REPULSOR,							///< object repulses "KINDOF_CAN_BE_REPULSED" objects.
-	OBJECT_STATUS_HIJACKED,  						///< unit is in the possesion of an enemy criminal, call the authorities
-	OBJECT_STATUS_AFLAME,								///< This object is on fire.
-	OBJECT_STATUS_BURNED,								///< This object has already burned as much as it can.
-	OBJECT_STATUS_WET,									///< object has been soaked with water
-	OBJECT_STATUS_IS_FIRING_WEAPON,			///< Object is firing a weapon, now. Not true for special attacks. --Lorenzen
-	OBJECT_STATUS_BRAKING,							///< Object is braking, and subverts the physics.
-	OBJECT_STATUS_STEALTHED,						///< Object is currently "stealthed"
-	OBJECT_STATUS_DETECTED,							///< Object is in range of a stealth-detector unit (meaningless if STEALTHED not set)
-	OBJECT_STATUS_CAN_STEALTH,					///< Object has ability to stealth allowing the stealth update module to run.
-	OBJECT_STATUS_SOLD,									///< Object is being sold
-	OBJECT_STATUS_UNDERGOING_REPAIR,		///< Object is awaiting/undergoing a repair order that has been issued
-	OBJECT_STATUS_RECONSTRUCTING,				///< Reconstructing
-	OBJECT_STATUS_MASKED,								///< Masked objects are not selectable and targetable by players or AI
-	OBJECT_STATUS_IS_ATTACKING,					///< Object is in the general Attack state (incl. aim, approach, etc.). Note that IS_FIRING_WEAPON and IS_AIMING_WEAPON is a subset of this!
-	OBJECT_STATUS_IS_USING_ABILITY,			///< Object is in the process of preparing or firing a special ability.
-	OBJECT_STATUS_IS_AIMING_WEAPON,			///< Object is aiming a weapon, now. Not true for special attacks. 
-	OBJECT_STATUS_NO_ATTACK_FROM_AI,		///< attacking this object may not be done from commandSource == CMD_FROM_AI
-	OBJECT_STATUS_IGNORING_STEALTH,			///< temporarily ignoring all stealth bits. (used only for some special-case mine clearing stuff.)
-	OBJECT_STATUS_IS_CARBOMB,						///< Object is now a carbomb.
-	// add more status types here and don't forget to add to the string table ObjectStatusMaskType::s_bitNameList[]
-
-	OBJECT_STATUS_COUNT
-
-};
-
-typedef BitFlags<OBJECT_STATUS_COUNT>	ObjectStatusMaskType;
-
-#define MAKE_OBJECT_STATUS_MASK(k) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k))
-#define MAKE_OBJECT_STATUS_MASK2(k,a) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k), (a))
-#define MAKE_OBJECT_STATUS_MASK3(k,a,b) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k), (a), (b))
-#define MAKE_OBJECT_STATUS_MASK4(k,a,b,c) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k), (a), (b), (c))
-#define MAKE_OBJECT_STATUS_MASK5(k,a,b,c,d) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k), (a), (b), (c), (d))
-
-inline Bool TEST_OBJECT_STATUS_MASK( const ObjectStatusMaskType& m, ObjectStatusTypes t ) 
-{ 
-	return m.test( t ); 
-}
-
-inline Bool TEST_OBJECT_STATUS_MASK_ANY( const ObjectStatusMaskType& m, const ObjectStatusMaskType& mask ) 
-{ 
-	return m.anyIntersectionWith( mask );
-}
-
-inline Bool TEST_OBJECT_STATUS_MASK_MULTI( const ObjectStatusMaskType& m, const ObjectStatusMaskType& mustBeSet, const ObjectStatusMaskType& mustBeClear )
-{
-	return m.testSetAndClear( mustBeSet, mustBeClear );
-}
-
-inline Bool OBJECT_STATUS_MASK_ANY_SET( const ObjectStatusMaskType& m) 
-{ 
-	return m.any(); 
-}
-
-inline void CLEAR_OBJECT_STATUS_MASK( ObjectStatusMaskType& m ) 
-{ 
-	m.clear(); 
-}
-
-inline void SET_ALL_OBJECT_STATUS_MASK_BITS( ObjectStatusMaskType& m )
-{
-	m.clear( );
-	m.flip( );
-}
-
-inline void FLIP_OBJECT_STATUS_MASK( ObjectStatusMaskType& m )
-{
-	m.flip();
-}
-
-// defined in Common/System/ObjectStatusTypes.cpp
-extern ObjectStatusMaskType OBJECT_STATUS_MASK_NONE;	// inits to all zeroes
-
-#endif /* __OBJECT_STATUS_TYPES_H */
diff --git a/Generals/Code/GameEngine/Include/Common/Overridable.h b/Generals/Code/GameEngine/Include/Common/Overridable.h
index ce8c0a89f00..f3951278843 100644
--- a/Generals/Code/GameEngine/Include/Common/Overridable.h
+++ b/Generals/Code/GameEngine/Include/Common/Overridable.h
@@ -28,14 +28,11 @@
 
 #pragma once
 
-#ifndef _OVERRIDABLE_H_
-#define _OVERRIDABLE_H_
-
 #include "Common/GameMemory.h"
 
 /*
-	In order for something to live in an OVERRIDE<> object, it must be derived from Overridable 
-	(publicly). 
+	In order for something to live in an OVERRIDE<> object, it must be derived from Overridable
+	(publicly).
 
 	This is useful for things like templates, where we want to override the template and make sure
 	that all instances get the updated values (for instance, via map.ini)
@@ -52,7 +49,7 @@ class Overridable : public MemoryPoolObject
 	public:
 		Overridable() : m_nextOverride(NULL), m_isOverride(false) {}
 
-		// return a constant version of m_nextOverride, which can be NULL if there is no 
+		// return a constant version of m_nextOverride, which can be NULL if there is no
 		// override
 		const Overridable *getNextOverride( void ) const
 		{
@@ -120,11 +117,7 @@ class Overridable : public MemoryPoolObject
 };
 
 // cleans up and dangling overrides.
-__inline Overridable::~Overridable() 
+__inline Overridable::~Overridable()
 {
-	if (m_nextOverride) 
-		deleteInstance(m_nextOverride);
+	deleteInstance(m_nextOverride);
 }
-
-
-#endif /* _OVERRIDABLE_H_ */
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/Common/Override.h b/Generals/Code/GameEngine/Include/Common/Override.h
index 4fd9536b955..d89ee693241 100644
--- a/Generals/Code/GameEngine/Include/Common/Override.h
+++ b/Generals/Code/GameEngine/Include/Common/Override.h
@@ -28,22 +28,19 @@
 
 #pragma once
 
-#ifndef _OVERRIDE_H_
-#define _OVERRIDE_H_
-
 #include "Common/Overridable.h"
 
 /*
-	An OVERRIDE is a replacement for a pointer of its contained type, ie, rather than containing 
+	An OVERRIDE is a replacement for a pointer of its contained type, ie, rather than containing
 	a LocomotorTemplate*, you would contain an OVERRIDE<LocomotorTemplate>.
 
-	OVERRIDE pretends in all ways (dereference via *, -> and casting to type*) to be a type*, so 
+	OVERRIDE pretends in all ways (dereference via *, -> and casting to type*) to be a type*, so
 	there should be very little code that needs to be rewritten to work with these.
 
 	In order to make something overridable, these are the steps:
 		1) Make the desired class derive from Overridable.
 		2) Make the container class contain an instance of OVERRIDE<Type>
-		3) Make the newOverride function (wherever an override is new'd) request the overridables lastOverride, 
+		3) Make the newOverride function (wherever an override is new'd) request the overridables lastOverride,
 			to ensure that no leaks are created.
 
 		See LocomotorTemplate for an example.
@@ -136,6 +133,3 @@ OVERRIDE<T>::operator const T*( ) const
 {
 	return operator*();
 }
-
-#endif /* _OVERRIDE_H_ */
-
diff --git a/Generals/Code/GameEngine/Include/Common/PartitionSolver.h b/Generals/Code/GameEngine/Include/Common/PartitionSolver.h
index 40891e61c82..6487bb74486 100644
--- a/Generals/Code/GameEngine/Include/Common/PartitionSolver.h
+++ b/Generals/Code/GameEngine/Include/Common/PartitionSolver.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Statistics.h 
+// FILE: Statistics.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -38,8 +38,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_PARTITIONSOLVER_
-#define _H_PARTITIONSOLVER_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 
@@ -78,10 +76,8 @@ class PartitionSolver
 
 	public:
 		PartitionSolver(const EntriesVec& elements, const SpacesVec& spaces, SolutionType solveHow);
-		
+
 		// Solve could potentially take a LONG TIME (as in NEVER complete). This problem is NP-complete.
 		void solve(void);
 		const SolutionVec& getSolution( void ) const;
 };
-
-#endif /* _H_PARTITIONSOLVER_ */
diff --git a/Generals/Code/GameEngine/Include/Common/PerfMetrics.h b/Generals/Code/GameEngine/Include/Common/PerfMetrics.h
index 43a5dd0db65..f2d82d86159 100644
--- a/Generals/Code/GameEngine/Include/Common/PerfMetrics.h
+++ b/Generals/Code/GameEngine/Include/Common/PerfMetrics.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __PERFMETRICS_H__
-#define __PERFMETRICS_H__
-
 // For load timings
 enum { PERFMETRICS_LOAD_STARTFRAME = 0 };
 enum { PERFMETRICS_LOAD_STOPFRAME = 1 };
@@ -42,7 +39,3 @@ enum { PERFMETRICS_LOGIC_STOPFRAME = 1000 };
 
 // For showing metrics
 enum { PERFMETRICS_BETWEEN_METRICS = 150 };
-
-#endif /* __PERFMETRICS_H__ */
-
-
diff --git a/Generals/Code/GameEngine/Include/Common/PerfTimer.h b/Generals/Code/GameEngine/Include/Common/PerfTimer.h
index fee64c7509f..071b35b3485 100644
--- a/Generals/Code/GameEngine/Include/Common/PerfTimer.h
+++ b/Generals/Code/GameEngine/Include/Common/PerfTimer.h
@@ -28,12 +28,9 @@
 
 #pragma once
 
-#ifndef __PERFTIMER_H__
-#define __PERFTIMER_H__
-
 #include "Utility/intrin_compat.h"
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	/*
 		NOTE NOTE NOTE: never check this in with this enabled, since there is a nonzero time penalty
 		for running in this mode. Only enable it for local builds for testing purposes! (srj)
@@ -227,7 +224,7 @@ AutoPerfGatherIgnore::~AutoPerfGatherIgnore()
 }
 
 //-------------------------------------------------------------------------------------------------
-#define DECLARE_PERF_TIMER(id)					static PerfGather s_##id(#id); 
+#define DECLARE_PERF_TIMER(id)					static PerfGather s_##id(#id);
 #define USE_PERF_TIMER(id)							AutoPerfGather a_##id(s_##id);
 #define IGNORE_PERF_TIMER(id)						AutoPerfGatherIgnore a_##id(s_##id);
 
@@ -243,7 +240,7 @@ class PerfTimer
 	virtual ~PerfTimer( );
 	__forceinline void startTimer( void );
 	__forceinline void stopTimer( void );
-	
+
 protected:
 	Int64 m_startTime;
 
@@ -271,7 +268,7 @@ class PerfTimer
 void PerfTimer::startTimer( void )
 {
 	UnsignedInt frm = (TheGameLogic ? TheGameLogic->getFrame() : m_startFrame);
-	if (frm >= m_startFrame && (m_endFrame == -1 || frm <= m_endFrame)) 
+	if (frm >= m_startFrame && (m_endFrame == -1 || frm <= m_endFrame))
 	{
 		GetPrecisionTimer(&m_startTime);
 	}
@@ -281,7 +278,7 @@ void PerfTimer::startTimer( void )
 void PerfTimer::stopTimer( void )
 {
 	UnsignedInt frm = (TheGameLogic ? TheGameLogic->getFrame() : m_startFrame);
-	if (frm >= m_startFrame && (m_endFrame == -1 || frm <= m_endFrame)) 
+	if (frm >= m_startFrame && (m_endFrame == -1 || frm <= m_endFrame))
 	{
 		Int64 tmp;
 		GetPrecisionTimer(&tmp);
@@ -289,7 +286,7 @@ void PerfTimer::stopTimer( void )
 		++m_callCount;
 		m_lastFrame = frm;
 	}
-	
+
 
 	if (TheGlobalData && TheGlobalData->m_showMetrics && m_endFrame > m_startFrame + PERFMETRICS_BETWEEN_METRICS) {
 		m_endFrame = m_startFrame + PERFMETRICS_BETWEEN_METRICS;
@@ -310,10 +307,8 @@ extern void StatMetricsDisplay( DebugDisplayInterface *dd, void *, FILE *fp );
 
 #else		// PERF_TIMERS
 
-	#define DECLARE_PERF_TIMER(id)					
+	#define DECLARE_PERF_TIMER(id)
 	#define USE_PERF_TIMER(id)
-	#define IGNORE_PERF_TIMER(id)	
+	#define IGNORE_PERF_TIMER(id)
 
 #endif	// PERF_TIMERS
-
-#endif /* __PERFTIMER_H__ */
diff --git a/Generals/Code/GameEngine/Include/Common/Player.h b/Generals/Code/GameEngine/Include/Common/Player.h
index be96a90299d..69327b447fa 100644
--- a/Generals/Code/GameEngine/Include/Common/Player.h
+++ b/Generals/Code/GameEngine/Include/Common/Player.h
@@ -24,12 +24,12 @@
 
 // FILE: Player.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef _PLAYER_H_
-#define _PLAYER_H_
-
 #include "Common/Debug.h"
 #include "Common/Energy.h"
 #include "Common/GameType.h"
@@ -61,7 +58,6 @@
 #include "Common/STLTypedefs.h"
 #include "Common/ScoreKeeper.h"
 #include "Common/Team.h"
-#include "Common/STLTypedefs.h"
 #include "Common/Upgrade.h"
 
 // ----------------------------------------------------------------------------------------------
@@ -101,13 +97,14 @@ enum ScienceAvailabilityType CPP_11(: Int)
 };
 
 #ifdef DEFINE_SCIENCE_AVAILABILITY_NAMES
-static const char *ScienceAvailabilityNames[] = 
+static const char *const ScienceAvailabilityNames[] =
 {
 	"Available",
 	"Disabled",
 	"Hidden",
 	NULL
 };
+static_assert(ARRAY_SIZE(ScienceAvailabilityNames) == SCIENCE_AVAILABILITY_COUNT + 1, "Incorrect array size");
 #endif	// end DEFINE_SCIENCE_AVAILABILITY_NAMES
 
 static const Int NUM_HOTKEY_SQUADS = 10;
@@ -121,7 +118,7 @@ typedef Int PlayerIndex;
 // ------------------------------------------------------------------------------------------------
 class KindOfPercentProductionChange : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(KindOfPercentProductionChange, "KindOfPercentProductionChange")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(KindOfPercentProductionChange, "KindOfPercentProductionChange")
 public:
 	KindOfMaskType		m_kindOf;
 	Real							m_percent;
@@ -154,7 +151,7 @@ class PlayerRelationMap : public MemoryPoolObject,
 													public Snapshot
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( PlayerRelationMap, "PlayerRelationMapPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( PlayerRelationMap, "PlayerRelationMapPool" )
 
 public:
 
@@ -175,16 +172,16 @@ class PlayerRelationMap : public MemoryPoolObject,
 
 // ----------------------------------------------------------------------------------------------
 /**
-	A "Player" as an entity that contains the persistent info of the Player, as well as containing 
+	A "Player" as an entity that contains the persistent info of the Player, as well as containing
 	transient mission data.
 
-	Some of the Player's attributes persist between missions, whereas others are "transient" and only 
-	have meaning in a mission, wherein they change a lot (current tech tree state, current buildings 
+	Some of the Player's attributes persist between missions, whereas others are "transient" and only
+	have meaning in a mission, wherein they change a lot (current tech tree state, current buildings
 	built, units trained, money, etc). (For clarity of nomenclature, we'll refer to all "persistent"
 	vs "non-persistent" attributes, since "transient" has an unclear duration.)
 
-	A "Player" consists of an entity controlling a single set of units in a mission. 
-	A Player may be human or computer controlled. 
+	A "Player" consists of an entity controlling a single set of units in a mission.
+	A Player may be human or computer controlled.
 
 	All Players have a (transient) "Player Index" associated which allows us to do some shorthand for
 	representing Players in some cases (mainly in bitfields). This is always a 0-based
@@ -192,8 +189,8 @@ class PlayerRelationMap : public MemoryPoolObject,
 	is that it makes it desirable to limit the maximum number of simultaneous Players
 	to 32, but that seems quite reasonable.
 
-	All persistent data associated with the Player will be saved to local storage and/or 
-	synchronized with one of our servers for online play. 
+	All persistent data associated with the Player will be saved to local storage and/or
+	synchronized with one of our servers for online play.
 
 	Note, simple accessor methods are omitted for brevity... for now, you may infer
 	them from the data structures.
@@ -213,52 +210,52 @@ class Player : public Snapshot
 	virtual ~Player();
 
 	void update();			///< player update opportunity
-	
+
 	void newMap();			///< player after map loaded opportunity
-	
+
 	void init(const PlayerTemplate* pt);
 	void initFromDict(const Dict* d);
 	void setDefaultTeam(void);
 
 	void deletePlayerAI();
 
-	inline UnicodeString getPlayerDisplayName() { return m_playerDisplayName; }
-	inline NameKeyType getPlayerNameKey() const { return m_playerNameKey; }
+	UnicodeString getPlayerDisplayName() { return m_playerDisplayName; }
+	NameKeyType getPlayerNameKey() const { return m_playerNameKey; }
 
-	inline AsciiString getSide() const { return m_side; }
+	AsciiString getSide() const { return m_side; }
 
-	inline const PlayerTemplate* getPlayerTemplate() const { return m_playerTemplate;	}
+	const PlayerTemplate* getPlayerTemplate() const { return m_playerTemplate;	}
 	/// return the Player's Handicap sub-object
-	inline const Handicap *getHandicap() const { return &m_handicap; }
-	inline Handicap *getHandicap() { return &m_handicap; }
+	const Handicap *getHandicap() const { return &m_handicap; }
+	Handicap *getHandicap() { return &m_handicap; }
 
 	/// return the Player's Money sub-object
-	inline Money *getMoney() { return &m_money; }
-	inline const Money *getMoney() const { return &m_money; }
+	Money *getMoney() { return &m_money; }
+	const Money *getMoney() const { return &m_money; }
 
 	UnsignedInt getSupplyBoxValue();///< Many things can affect the alue of a crate, but at heart it is a GlobalData ratio.
 
-	inline Energy *getEnergy() { return &m_energy; }
-	inline const Energy *getEnergy() const { return &m_energy; }
+	Energy *getEnergy() { return &m_energy; }
+	const Energy *getEnergy() const { return &m_energy; }
 
 	// adds a power bonus to this player because of energy upgrade at his power plants
-	inline void addPowerBonus(Object *obj) { m_energy.addPowerBonus(obj); }
-	inline void removePowerBonus(Object *obj) { m_energy.removePowerBonus(obj); }
+	void addPowerBonus(Object *obj) { m_energy.addPowerBonus(obj); }
+	void removePowerBonus(Object *obj) { m_energy.removePowerBonus(obj); }
 
-	inline ResourceGatheringManager *getResourceGatheringManager(){ return m_resourceGatheringManager; }
-	inline TunnelTracker* getTunnelSystem(){ return m_tunnelSystem; }
+	ResourceGatheringManager *getResourceGatheringManager(){ return m_resourceGatheringManager; }
+	TunnelTracker* getTunnelSystem(){ return m_tunnelSystem; }
 
-	inline Color getPlayerColor() const { return m_color; }
-	inline Color getPlayerNightColor() const { return m_nightColor;}
+	Color getPlayerColor() const { return m_color; }
+	Color getPlayerNightColor() const { return m_nightColor;}
 	/// return the type of controller
-	inline PlayerType getPlayerType() const { return m_playerType; }
+	PlayerType getPlayerType() const { return m_playerType; }
 	void setPlayerType(PlayerType t, Bool skirmish);
 
-	inline PlayerIndex getPlayerIndex() const { return m_playerIndex; }
+	PlayerIndex getPlayerIndex() const { return m_playerIndex; }
 
 	/// return a bitmask that is unique to this player.
-	inline PlayerMaskType getPlayerMask() const { return 1 << m_playerIndex; }
-	
+	PlayerMaskType getPlayerMask() const { return 1 << m_playerIndex; }
+
 	/// a convenience function to test the ThingTemplate against the players canBuild flags
 	/// called by canBuild
 	Bool allowedToBuild(const ThingTemplate *tmplate) const;
@@ -274,7 +271,7 @@ class Player : public Snapshot
 
 	/** return the player's command center. (must be one of his "normal" ones,
 			not a captured one.)
-			if he has none, return null. 
+			if he has none, return null.
 			if he has multiple, return one arbitrarily. */
 	Object* findNaturalCommandCenter();
 
@@ -283,7 +280,7 @@ class Player : public Snapshot
 	Bool isScienceDisabled( ScienceType t ) const;	///< Can't purchase this science because of script reasons.
 	Bool isScienceHidden( ScienceType t ) const;		///< This science is effectively hidden due to  script reasons.
 
-	//Allows scripts to make specific sciences available, hidden, or disabled. 
+	//Allows scripts to make specific sciences available, hidden, or disabled.
 	void setScienceAvailability( ScienceType science, ScienceAvailabilityType type );
 
 	ScienceAvailabilityType getScienceAvailabilityTypeFromString( const AsciiString& name );
@@ -291,8 +288,8 @@ class Player : public Snapshot
 	/// return t iff the player has all sciences that are prereqs for knowing the given science
 	Bool hasPrereqsForScience(ScienceType t) const;
 
-	Bool hasUpgradeComplete( const UpgradeTemplate *upgradeTemplate );		///< does player have totally done and produced upgrade
-	Bool hasUpgradeComplete( UpgradeMaskType testMask );		///< does player have totally done and produced upgrade
+	Bool hasUpgradeComplete( const UpgradeTemplate *upgradeTemplate ) const;		///< does player have totally done and produced upgrade
+	Bool hasUpgradeComplete( UpgradeMaskType testMask ) const;		///< does player have totally done and produced upgrade
 	UpgradeMaskType getCompletedUpgradeMask() const { return m_upgradesCompleted; }	///< get list of upgrades that are completed
 	Bool hasUpgradeInProduction( const UpgradeTemplate *upgradeTemplate );		///< does player have this upgrade in progress right now
 	Upgrade *addUpgrade( const UpgradeTemplate *upgradeTemplate,
@@ -306,18 +303,21 @@ class Player : public Snapshot
 
 	void onUpgradeCompleted( const UpgradeTemplate *upgradeTemplate );				///< An upgrade just finished, do things like tell all objects to recheck UpgradeModules
 	void onUpgradeRemoved(){}					///< An upgrade just got removed, this doesn't do anything now.
- 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 	/// Prereq disabling cheat key
 	void toggleIgnorePrereqs(){ m_DEMO_ignorePrereqs = !m_DEMO_ignorePrereqs; }
+	void enableIgnorePrereqs(Bool enable) { m_DEMO_ignorePrereqs = enable; }
 	Bool ignoresPrereqs() const { return m_DEMO_ignorePrereqs; }
 
 	/// No cost building cheat key
 	void toggleFreeBuild(){ m_DEMO_freeBuild = !m_DEMO_freeBuild; }
+	void enableFreeBuild(Bool enable) { m_DEMO_freeBuild = enable; }
 	Bool buildsForFree() const { return m_DEMO_freeBuild; }
 
 	/// No time building cheat key
 	void toggleInstantBuild(){ m_DEMO_instantBuild = !m_DEMO_instantBuild; }
+	void enableInstantBuild(Bool enable) { m_DEMO_instantBuild = enable; }
 	Bool buildsInstantly() const { return m_DEMO_instantBuild; }
 #endif
 
@@ -329,7 +329,7 @@ class Player : public Snapshot
 	///< one of my command centers just fired a special power, let us reset timers for all command centers.
 	void resetOrStartSpecialPowerReadyFrame( const SpecialPowerTemplate *temp );
 	///< my new command center wants to init his timers to the status quo
-	UnsignedInt getOrStartSpecialPowerReadyFrame( const SpecialPowerTemplate *temp); 
+	UnsignedInt getOrStartSpecialPowerReadyFrame( const SpecialPowerTemplate *temp);
 	void expressSpecialPowerReadyFrame( const SpecialPowerTemplate *temp, UnsignedInt frame );
 	void addNewSharedSpecialPowerTimer( const SpecialPowerTemplate *temp, UnsignedInt frame );
 
@@ -366,7 +366,7 @@ class Player : public Snapshot
 	/** Return bonus or penalty for construction of this thing.
 	*/
 	Real getProductionCostChangePercent( AsciiString buildTemplateName ) const;
-	
+
 	/** Return bonus or penalty for construction of this thing.
 	*/
 	Real getProductionTimeChangePercent( AsciiString buildTemplateName ) const;
@@ -460,7 +460,7 @@ class Player : public Snapshot
 		simply returns the number of objects owned by this player with a specific KindOfMaskType
 	*/
 	Int countObjects(KindOfMaskType setMask, KindOfMaskType clearMask);
-	
+
 	/// Returns the closest of a given type to the given object
 	Object *findClosestByKindOf( Object *queryObject, KindOfMaskType setMask, KindOfMaskType clearMask );
 
@@ -501,7 +501,7 @@ class Player : public Snapshot
 
 	/**
 		* Iterate all objects that this player has
-		*/	
+		*/
 	void iterateObjects( ObjectIterateFunc func, void *userData );
 
 	/**
@@ -515,7 +515,7 @@ class Player : public Snapshot
 	void addToBuildList(Object *obj);			///< Adds this to the build list.	 Used for factories placed instead of in build list.
 	void addToPriorityBuildList(AsciiString templateName, Coord3D *pos, Real angle);			///< Adds this to the build list.	 Used for factories placed instead of in build list.
 
-	/// get the relationship between this->that. 
+	/// get the relationship between this->that.
 	Relationship getRelationship(const Team *that) const;
 
 	/// set the relationship between this->that. (note that this doesn't affect the that->this relationship.)
@@ -528,14 +528,14 @@ class Player : public Snapshot
 	void removeTeamFromList(TeamPrototype* team);
 
 	typedef std::list<TeamPrototype*> PlayerTeamList;
-	inline const PlayerTeamList* getPlayerTeams() const { return &m_playerTeamPrototypes; }
+	const PlayerTeamList* getPlayerTeams() const { return &m_playerTeamPrototypes; }
 
-	inline Int getMpStartIndex(void) {return m_mpStartIndex;}
+	Int getMpStartIndex(void) {return m_mpStartIndex;}
 
 	/// Set that all units should begin hunting.
 	void setUnitsShouldHunt(Bool unitsShouldHunt, CommandSourceType source);
 	Bool getUnitsShouldHunt() const { return m_unitsShouldHunt; }
-	
+
 	/// All of our units are new spied upon; they sight for the given enemy
 	void setUnitsVisionSpied( Bool setting, PlayerIndex byWhom );
 
@@ -572,14 +572,14 @@ class Player : public Snapshot
 	/// Enable/Disable the construction of units
 	Bool getCanBuildUnits(void) { return m_canBuildUnits; }
 	void setCanBuildUnits(Bool canProduce) { m_canBuildUnits = canProduce; }
-	
+
 	/// Enable/Disable the construction of base buildings.
 	Bool getCanBuildBase(void) { return m_canBuildBase; }
 	void setCanBuildBase(Bool canProduce) { m_canBuildBase = canProduce; }
 
 	/// Transfer all assets from player that to this
 	void transferAssetsFromThat(Player* that);
-	
+
 	/// Sell everything this player owns.
 	void sellEverythingUnderTheSun(void);
 
@@ -587,12 +587,12 @@ class Player : public Snapshot
 	void ungarrisonAllUnits(CommandSourceType source);
 
 	void setUnitsShouldIdleOrResume(Bool idle);
-	
+
 	Bool isPlayableSide( void ) const;
 
-	Bool isPlayerObserver( void ) const; // Favor !isActive() - this is used for Observer GUI mostly, not in-game stuff
-	Bool isPlayerDead(void) const; // Favor !isActive() - this is used so OCLs don't give us stuff after death.
-	Bool isPlayerActive(void) const;
+	Bool isPlayerObserver( void ) const; // Favor !isPlayerActive() - this is used for Observer GUI mostly, not in-game stuff
+	Bool isPlayerDead(void) const; // Favor !isPlayerActive() - this is used so OCLs don't give us stuff after death.
+	Bool isPlayerActive(void) const; // Player is alive and not observer. !isPlayerActive() is synonymous with observing.
 
 	Bool didPlayerPreorder( void ) const { return m_isPreorder; }
 
@@ -600,7 +600,7 @@ class Player : public Snapshot
 	ScoreKeeper* getScoreKeeper( void ) { return &m_scoreKeeper; }
 
 	/// time to create a hotkey team based on this GameMessage
-	void processCreateTeamGameMessage(Int hotkeyNum, GameMessage *msg);
+	void processCreateTeamGameMessage(Int hotkeyNum, const GameMessage *msg);
 
 	/// time to select a hotkey team based on this GameMessage
 	void processSelectTeamGameMessage(Int hotkeyNum, GameMessage *msg);
@@ -608,7 +608,7 @@ class Player : public Snapshot
 	// add to the player's current selection this hotkey team.
 	void processAddTeamGameMessage(Int hotkeyNum, GameMessage *msg);
 
-	// returns an AIGroup object that is the currently selected group.
+	// fills an AIGroup object that is the currently selected group.
 	void getCurrentSelectionAsAIGroup(AIGroup *group);
 
 	// sets the currently selected group to be the given AIGroup
@@ -619,13 +619,13 @@ class Player : public Snapshot
 
 	// return the requested hotkey squad
 	Squad *getHotkeySquad(Int squadNumber);
-	
+
 	// return the hotkey squad that a unit is in, or NO_HOTKEY_SQUAD if it isn't in one.
 	Int getSquadNumberForObject(const Object *objToFind) const;
-	
+
 	// remove an object from any hotkey squads that its in.
 	void removeObjectFromHotkeySquad(Object *objToRemove);
-	
+
 	void setAttackedBy( Int playerNdx );
 	Bool getAttackedBy( Int playerNdx ) const;
 	UnsignedInt getAttackedFrame(void) {return m_attackedFrame;}  // Return last frame attacked.
@@ -652,7 +652,7 @@ class Player : public Snapshot
 	Int getRankLevel() const							{ return m_rankLevel; }
 	Int getSkillPointsLevelUp() const			{ return m_levelUp;	}
 	Int getSkillPointsLevelDown() const			{ return m_levelDown;	}
-	UnicodeString getGeneralName() const	{ return m_generalName; }	
+	UnicodeString getGeneralName() const	{ return m_generalName; }
 	void setGeneralName( UnicodeString name ){ m_generalName = name;	}
 	/// returns TRUE if rank level really changed.
 	Bool setRankLevel(Int level);
@@ -664,7 +664,7 @@ class Player : public Snapshot
 	Bool addSkillPointsForKill(const Object* killer, const Object* victim);
 
 	void addSciencePurchasePoints(Int delta);
-	
+
 	void setSkillPointsModifier(Real expMod) { m_skillPointsModifier = expMod; }
 	Real getSkillPointsModifier(void) const { return m_skillPointsModifier; }
 
@@ -674,13 +674,13 @@ class Player : public Snapshot
 	/// reset rank to 1.
 	void resetRank();
 
-	/** 
+	/**
 		attempt to purchase the science, but use prereqs, and charge points.
 		return true if successful.
 	*/
 	Bool attemptToPurchaseScience(ScienceType science);
 
-	/** 
+	/**
 		grant the science, ignore prereqs & charge no points,
 		but still restrict you to purchasable sciences (ie, intrinsic and rank sciences
 		are not allowed)
@@ -697,7 +697,7 @@ class Player : public Snapshot
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
-	
+
 	void deleteUpgradeList( void );															///< delete all our upgrades
 
 private:
@@ -739,13 +739,13 @@ class Player : public Snapshot
 	ScienceVec					m_sciences;					///< (SAVE) sciences that we know (either intrinsically or via later purchases)
 	ScienceVec					m_sciencesDisabled;	///< (SAVE) sciences that we are not permitted to purchase "yet". Controlled by mission scripts.
 	ScienceVec					m_sciencesHidden;		///< (SAVE) sciences that aren't shown. Controlled by mission scripts.
-	
+
 	Int									m_rankLevel;			///< (SAVE) our RankLevel, 1...n
 	Int									m_skillPoints;		///< (SAVE) our cumulative SkillPoint total
 	Int									m_sciencePurchasePoints;		///< (SAVE) our unspent SciencePurchasePoint total
 	Int									m_levelUp, m_levelDown;			///< (NO-SAVE) skill points to go up/down a level (runtime only)
 	UnicodeString				m_generalName;		///< (SAVE) This is the name of the general the player is allowed to change.
-	
+
 	PlayerTeamList				m_playerTeamPrototypes;				///< ALL the teams we control, via prototype
 	PlayerRelationMap			*m_playerRelations;						///< allies & enemies
 	TeamRelationMap				*m_teamRelations;							///< allies & enemies
@@ -763,11 +763,11 @@ class Player : public Snapshot
 	UnsignedInt						m_attackedFrame;	///< Last frame attacked.
 	Int										m_visionSpiedBy[MAX_PLAYER_COUNT];  ///< Reference count of having units spied on by players.
 	PlayerMaskType				m_visionSpiedMask;	///< For quick lookup and edge triggered maintenance
-	
+
 	Real									m_cashBountyPercent;
 
 	/// @todo REMOVE (not disable) these cheat keys
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	Bool									m_DEMO_ignorePrereqs;		///< Can I ignore prereq checks?
 	Bool									m_DEMO_freeBuild;				///< Can I build everything for no money?
 	Bool									m_DEMO_instantBuild;		///< Can I build anything in one frame?
@@ -778,7 +778,7 @@ class Player : public Snapshot
 	typedef std::list<KindOfPercentProductionChange*> KindOfPercentProductionChangeList;
 	typedef KindOfPercentProductionChangeList::iterator KindOfPercentProductionChangeListIt;
 	mutable KindOfPercentProductionChangeList m_kindOfPercentProductionChangeList;
-	
+
 
 	typedef std::list<SpecialPowerReadyTimerType> SpecialPowerReadyTimerList;
 	typedef SpecialPowerReadyTimerList::iterator SpecialPowerReadyTimerListIterator;
@@ -789,5 +789,3 @@ class Player : public Snapshot
 
 	Bool									m_isPlayerDead;
 };
-
-#endif // _PLAYER_H_
diff --git a/Generals/Code/GameEngine/Include/Common/PlayerList.h b/Generals/Code/GameEngine/Include/Common/PlayerList.h
index af61c735a78..2f0362b4895 100644
--- a/Generals/Code/GameEngine/Include/Common/PlayerList.h
+++ b/Generals/Code/GameEngine/Include/Common/PlayerList.h
@@ -24,12 +24,12 @@
 
 // FILE: PlayerList.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef _PLAYERLIST_H_
-#define _PLAYERLIST_H_
-
 #include "Common/SubsystemInterface.h"
 #include "Common/GameCommon.h"
 #include "Common/NameKeyGenerator.h"
@@ -64,7 +61,7 @@ enum AllowPlayerRelationship CPP_11(: Int)
 {
 	ALLOW_SAME_PLAYER			= 0x01,		///< allow only objects of the same player as m_obj
 	ALLOW_ALLIES					= 0x02,		///< allow objects that m_obj considers allies
-	ALLOW_ENEMIES					= 0x04,		///< allow objects that m_obj considers enemy 
+	ALLOW_ENEMIES					= 0x04,		///< allow objects that m_obj considers enemy
 	ALLOW_NEUTRAL					= 0x08		///< allow objects that m_obj considers neutral
 };
 
@@ -112,7 +109,7 @@ class PlayerList : public SubsystemInterface,
 	Player *getNeutralPlayer() { DEBUG_ASSERTCRASH(m_players[0] != NULL, ("null neutral")); return m_players[0]; }
 
 	/**
-		return the Player with the given internal name, or null if none found. 
+		return the Player with the given internal name, or null if none found.
 	*/
 	Player *findPlayerWithNameKey(NameKeyType key);
 
@@ -132,7 +129,7 @@ class PlayerList : public SubsystemInterface,
 		Return the player matching the player mask
 	*/
 	Player *getPlayerFromMask( PlayerMaskType mask );
-	
+
 	/**
 		Get each player in numerical order that this mask represents.
 		Note that maskToAdjust will be adjusted by removing the associated player's mask from it.
@@ -147,8 +144,8 @@ class PlayerList : public SubsystemInterface,
 	void updateTeamStates(void);
 
 	/**
-		a convenience routine to return the players who srcPlayer considers to have one of the 
-		relationships specified in allowedRelationships. Note that allowedRelationships should be 
+		a convenience routine to return the players who srcPlayer considers to have one of the
+		relationships specified in allowedRelationships. Note that allowedRelationships should be
 		a bitwise OR of AllowPlayerRelationship flags.
 	*/
 	PlayerMaskType getPlayersWithRelationship( Int srcPlayerIndex, UnsignedInt allowedRelationships );
@@ -171,5 +168,3 @@ class PlayerList : public SubsystemInterface,
 
 // ----------------------------------------------------------------------------------------------
 extern PlayerList *ThePlayerList;	///< singleton instance of PlayerList
-
-#endif // _PLAYERLIST_H_
diff --git a/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h b/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h
index 6d0be82cbb4..1caf4221674 100644
--- a/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h
+++ b/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h
@@ -24,12 +24,12 @@
 
 // FILE: PlayerTemplate.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef _PLAYERTEMPLATE_H_
-#define _PLAYERTEMPLATE_H_
-
 #include "Common/SubsystemInterface.h"
 #include "Common/GameMemory.h"
 #include "Common/Debug.h"
@@ -77,36 +74,36 @@ class PlayerTemplate
 
 	PlayerTemplate();
 
-	inline void setNameKey(NameKeyType namekey) { m_nameKey = namekey; }
+	void setNameKey(NameKeyType namekey) { m_nameKey = namekey; }
 
-	inline NameKeyType getNameKey() const { DEBUG_ASSERTCRASH(m_nameKey != NAMEKEY_INVALID, ("bad namekey")); return m_nameKey; }
-	inline AsciiString getName() const { return KEYNAME(m_nameKey); }
+	NameKeyType getNameKey() const { DEBUG_ASSERTCRASH(m_nameKey != NAMEKEY_INVALID, ("bad namekey")); return m_nameKey; }
+	AsciiString getName() const { return KEYNAME(m_nameKey); }
 
-	inline UnicodeString getDisplayName() const { return m_displayName; }
+	UnicodeString getDisplayName() const { return m_displayName; }
 
-	inline AsciiString getSide() const { return m_side; }
+	AsciiString getSide() const { return m_side; }
 
 	/// return the tech tree for the player.
-	inline const Handicap *getHandicap() const { return &m_handicap; }
+	const Handicap *getHandicap() const { return &m_handicap; }
 
 	/// return the money for the player.
-	inline const Money *getMoney() const { return &m_money; }
-	
-	inline const RGBColor* getPreferredColor() const { return &m_preferredColor; }
+	const Money *getMoney() const { return &m_money; }
+
+	const RGBColor* getPreferredColor() const { return &m_preferredColor; }
 
-	inline AsciiString getStartingBuilding( void ) const { return m_startingBuilding; }
+	AsciiString getStartingBuilding( void ) const { return m_startingBuilding; }
 	AsciiString getStartingUnit( Int i ) const;
 
-	inline const ProductionChangeMap& getProductionCostChanges() const { return m_productionCostChanges; }
-	inline const ProductionChangeMap& getProductionTimeChanges() const { return m_productionTimeChanges; }
-	inline const ProductionVeterancyMap& getProductionVeterancyLevels() const { return m_productionVeterancyLevels; }
-	inline Bool isObserver() const { return m_observer; }
-	inline Bool isPlayableSide() const { return m_playableSide; }
+	const ProductionChangeMap& getProductionCostChanges() const { return m_productionCostChanges; }
+	const ProductionChangeMap& getProductionTimeChanges() const { return m_productionTimeChanges; }
+	const ProductionVeterancyMap& getProductionVeterancyLevels() const { return m_productionVeterancyLevels; }
+	Bool isObserver() const { return m_observer; }
+	Bool isPlayableSide() const { return m_playableSide; }
+
+	AsciiString getScoreScreen (void ) const { return m_scoreScreenImage;	}
+	AsciiString getLoadScreen (void ) const { return m_loadScreenImage;	}
+	AsciiString getBeaconTemplate( void ) const { return m_beaconTemplate; }
 
-	inline AsciiString getScoreScreen (void ) const { return m_scoreScreenImage;	}
-	inline AsciiString getLoadScreen (void ) const { return m_loadScreenImage;	}
-	inline AsciiString getBeaconTemplate( void ) const { return m_beaconTemplate; }
-	
 	const Image *getHeadWaterMarkImage( void ) const;
 	const Image *getFlagWaterMarkImage( void ) const;
 	const Image *getEnabledImage( void ) const;
@@ -114,7 +111,8 @@ class PlayerTemplate
 	//const Image *getHiliteImage( void ) const;
 	//const Image *getPushedImage( void ) const;
 	const Image *getSideIconImage( void ) const;
-	
+	const AsciiString getTooltip() const { return m_tooltip; }
+
 	const ScienceVec& getIntrinsicSciences() const { return m_intrinsicSciences; }
 	Int getIntrinsicSciencePurchasePoints() const { return m_intrinsicSPP; }
 	AsciiString getPurchaseScienceCommandSetRank1( void ) const {return m_purchaseScienceCommandSetRank1;	}
@@ -124,9 +122,9 @@ class PlayerTemplate
 	AsciiString getSpecialPowerShortcutCommandSet( void ) const {return m_specialPowerShortcutCommandSet;	}
 	AsciiString getSpecialPowerShortcutWinName( void ) const {return m_specialPowerShortcutWinName;	}
 	Int getSpecialPowerShortcutButtonCount( void ) const {return m_specialPowerShortcutButtonCount;	}
-	
+
 	AsciiString getLoadScreenMusic( void ) const {return m_loadScreenMusic;	}
-	
+
 
 	static const FieldParse* getFieldParse();
 
@@ -161,6 +159,7 @@ class PlayerTemplate
 	AsciiString				m_specialPowerShortcutWinName;			///< The name of the window we'll be using for the shortcut bar
 	Int								m_specialPowerShortcutButtonCount;	///< The number of buttons located on the shortcut bar
 	AsciiString				m_loadScreenMusic;									///< the load screen music we want to play
+	AsciiString				m_tooltip;								///< The tooltip describing this player template
 	Bool							m_observer;
 	Bool							m_playableSide;
 
@@ -168,7 +167,7 @@ class PlayerTemplate
 
 	AsciiString			m_scoreScreenImage;			///< Image that will be shown on the score screen
 	AsciiString			m_loadScreenImage;
-	
+
 	AsciiString			m_headWaterMark;				///< Image that will be the background on the observer control bar
 	AsciiString			m_flagWaterMark;				///< Imabe that will be the background on the observer control bar
 	AsciiString			m_enabledImage;					///< enable button image
@@ -199,11 +198,11 @@ class PlayerTemplateStore : public SubsystemInterface
 
 	const PlayerTemplate* getNthPlayerTemplate(Int i) const;
 	const PlayerTemplate* findPlayerTemplate(NameKeyType namekey) const;
-	inline Int getPlayerTemplateCount() const { return m_playerTemplates.size(); }
+	Int getPlayerTemplateCount() const { return m_playerTemplates.size(); }
+
 
-	
 	// This function will fill outStringList with all the sides found in all the templates
-	void getAllSideStrings(AsciiStringList *outStringList);	
+	void getAllSideStrings(AsciiStringList *outStringList);
 
 private:
 
@@ -214,5 +213,3 @@ class PlayerTemplateStore : public SubsystemInterface
 
 // ----------------------------------------------------------------------------------------------
 extern PlayerTemplateStore *ThePlayerTemplateStore;	///< singleton instance of PlayerTemplateStore
-
-#endif // _PLAYERTEMPLATE_H_
diff --git a/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h b/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h
index 0a6958a4b27..a6f97ad35d1 100644
--- a/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h
+++ b/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h
@@ -24,12 +24,12 @@
 
 // FILE: ProductionPrerequisite.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -42,11 +42,8 @@
 
 #pragma once
 
-#ifndef __ProductionPrerequisite_H_
-#define __ProductionPrerequisite_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "Common/GameMemory.h"
 #include "Common/GameCommon.h"
@@ -85,9 +82,9 @@ class ProductionPrerequisite
 	/// return true iff the player satisfies our set of prerequisites
 	Bool isSatisfied(const Player *player) const;
 
-	/** 
-		return the BuildFacilityTemplate, if any. 
-		
+	/**
+		return the BuildFacilityTemplate, if any.
+
 		if this template needs no build facility, null is returned.
 
 		if the template needs a build facility but the given player doesn't have any in existence,
@@ -100,13 +97,13 @@ class ProductionPrerequisite
 	Int getAllPossibleBuildFacilityTemplates(const ThingTemplate* tmpls[], Int maxtmpls) const;
 
 private:
-	
-	enum 
+
+	enum
 	{
 		UNIT_OR_WITH_PREV = 0x01	// if set, unit is "or-ed" with prev unit, so that either one's presence satisfies
 	};
 
-	struct PrereqUnitRec 
+	struct PrereqUnitRec
 	{
 		const ThingTemplate*	unit;
 		Int										flags;
@@ -121,5 +118,3 @@ class ProductionPrerequisite
 };
 
 //-----------------------------------------------------------------------------
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h b/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h
index 5979011e4f0..fdf0d8fe998 100644
--- a/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h
+++ b/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h
@@ -30,16 +30,13 @@
 
 #pragma once
 
-#ifndef __QUICKMATCHPREFERENCES_H__
-#define __QUICKMATCHPREFERENCES_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 #include "Common/UserPreferences.h"
 
 //-----------------------------------------------------------------------------
-// QuickMatchPreferences base class 
+// QuickMatchPreferences base class
 //-----------------------------------------------------------------------------
 class QuickMatchPreferences : public UserPreferences
 {
@@ -78,5 +75,3 @@ class QuickMatchPreferences : public UserPreferences
 	void setSide(Int val);
 	Int getSide( void );
 };
-
-#endif // __QUICKMATCHPREFERENCES_H__
diff --git a/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h b/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h
index 934ab51b515..af373e9bb6a 100644
--- a/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h
+++ b/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h
@@ -29,13 +29,8 @@
 
 #pragma once
 
-#ifndef __QUOTEDPRINTABLE_H__
-#define __QUOTEDPRINTABLE_H__
-
 UnicodeString QuotedPrintableToUnicodeString(AsciiString original);
 AsciiString UnicodeStringToQuotedPrintable(UnicodeString original);
 
 AsciiString QuotedPrintableToAsciiString(AsciiString original);
 AsciiString AsciiStringToQuotedPrintable(AsciiString original);
-
-#endif // __QUOTEDPRINTABLE_H__
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/Common/RAMFile.h b/Generals/Code/GameEngine/Include/Common/RAMFile.h
deleted file mode 100644
index f28192aaabb..00000000000
--- a/Generals/Code/GameEngine/Include/Common/RAMFile.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    WSYS Library
-//
-// Module:     IO
-//
-// File name:  wsys/RAMFile.h
-//
-// Created:    11/08/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __RAMFILE_H
-#define __RAMFILE_H
-
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/file.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// RAMFile
-//===============================
-/**
-  *	File abstraction for standard C file operators: open, close, lseek, read, write
-	*/
-//===============================
-
-class RAMFile : public File
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RAMFile, "RAMFile")		
-	protected:
-
-		Char				*m_data;											///< File data in memory
-		Int					m_pos;												///< current read position
-		Int					m_size;												///< size of file in memory
-		
-	public:
-		
-		RAMFile();
-		//virtual				~RAMFile();
-
-
-		virtual Bool	open( const Char *filename, Int access = 0 );				///< Open a file for access
-		virtual void	close( void );																			///< Close the file
-		virtual Int		read( void *buffer, Int bytes );										///< Read the specified number of bytes in to buffer: See File::read
-		virtual Int		write( const void *buffer, Int bytes );							///< Write the specified number of bytes from the buffer: See File::write
-		virtual Int		seek( Int new_pos, seekMode mode = CURRENT );				///< Set file position: See File::seek
-		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0);				///< moves current position to after the next new-line
-
-		virtual Bool	scanInt(Int &newInt);																///< return what gets read as an integer from the current memory position.
-		virtual Bool	scanReal(Real &newReal);														///< return what gets read as a float from the current memory position.
-		virtual Bool	scanString(AsciiString &newString);									///< return what gets read as a string from the current memory position.
-
-		virtual Bool	open( File *file );																	///< Open file for fast RAM access
-		virtual Bool	openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size); ///< copy file data from the given file at the given offset for the given size.
-		virtual Bool	copyDataToFile(File *localFile);										///< write the contents of the RAM file to the given local file.  This could be REALLY slow.
-
-		/**
-			Allocate a buffer large enough to hold entire file, read 
-			the entire file into the buffer, then close the file.
-			the buffer is owned by the caller, who is responsible
-			for freeing is (via delete[]). This is a Good Thing to
-			use because it minimizes memory copies for BIG files.
-		*/
-		virtual char* readEntireAndClose();
-		virtual File* convertToRAMFile();
-};
-
-
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-
-#endif // __WSYS_RAMFILE_H
diff --git a/Generals/Code/GameEngine/Include/Common/Radar.h b/Generals/Code/GameEngine/Include/Common/Radar.h
deleted file mode 100644
index 8fc78aa25dc..00000000000
--- a/Generals/Code/GameEngine/Include/Common/Radar.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Radar.h //////////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, January 2002
-// Desc:   Logical radar implementation
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __RADAR_H_
-#define __RADAR_H_
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Lib/BaseType.h"
-#include "Common/SubsystemInterface.h"
-#include "Common/GameMemory.h"
-#include "GameClient/Display.h"	// for ShroudLevel
-#include "GameClient/Color.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-class GameWindow;
-class Object;
-class Player;
-class TerrainLogic;
-
-// GLOBAL /////////////////////////////////////////////////////////////////////////////////////////
-//
-// the following is used for the resolution of the radar "cells" ... this is how accurate
-// the radar is and also reflects directly the size of the image we build ... which with
-// WW3D must be a square power of two as well
-//
-enum 
-{ 
-	RADAR_CELL_WIDTH  = 128,	// radar created at this horz resolution
-	RADAR_CELL_HEIGHT = 128   // radar created at this vert resolution
-};
-
-//-------------------------------------------------------------------------------------------------
-/** These event types determine the colors radar events happen in to make it easier for us
-	* to play events with a consistent color scheme */
-//-------------------------------------------------------------------------------------------------
-enum RadarEventType CPP_11(: Int)
-{
-	RADAR_EVENT_INVALID = 0,
-	RADAR_EVENT_CONSTRUCTION,
-	RADAR_EVENT_UPGRADE,
-	RADAR_EVENT_UNDER_ATTACK,
-	RADAR_EVENT_INFORMATION,
-	RADAR_EVENT_BEACON_PULSE,
-	RADAR_EVENT_INFILTRATION, //for defection, hijacking, hacking, carbombing, and other sneaks
-	RADAR_EVENT_BATTLE_PLAN,
-	RADAR_EVENT_STEALTH_DISCOVERED,		// we discovered a stealth unit
-	RADAR_EVENT_STEALTH_NEUTRALIZED,	// our stealth unit has been revealed
-	RADAR_EVENT_FAKE,					//Internally creates a radar event, but doesn't notify the player (unit lost 
-														//for example, so we can use the spacebar to jump to the event).
- 
- 	RADAR_EVENT_NUM_EVENTS  // keep this last
- 	
-};
-
-// PROTOTYPES /////////////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-/** Radar objects are objects that are on the radar, go figure :) */
-//-------------------------------------------------------------------------------------------------
-class RadarObject : public MemoryPoolObject,
-										public Snapshot
-{
-
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( RadarObject, "RadarObject" )
-
-public:
-	
-	RadarObject( void );
-	// destructor prototype defined by memory pool glue
-
-	// color management
-	void setColor( Color c ) { m_color = c; }
-	inline Color getColor( void ) const { return m_color; }
-
-	inline void friend_setObject( Object *obj ) { m_object = obj; }
-	inline Object *friend_getObject( void ) { return m_object; }
-	inline const Object *friend_getObject( void ) const { return m_object; }
-
-	inline void friend_setNext( RadarObject *next ) { m_next = next; }
-	inline RadarObject *friend_getNext( void ) { return m_next; }
-	inline const RadarObject *friend_getNext( void ) const { return m_next; }
-
-	Bool isTemporarilyHidden() const;
-
-protected:
-
-	// snapshot methods
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-	Object *m_object;				///< the object
-	RadarObject *m_next;		///< next radar object
-	Color m_color;					///< color to draw for this object on the radar
-
-};
-
-//-------------------------------------------------------------------------------------------------
-/** Radar priorities.  Keep this in sync with the priority names list below */
-//-------------------------------------------------------------------------------------------------
-enum RadarPriorityType CPP_11(: Int)
-{
-	RADAR_PRIORITY_INVALID,					// a priority that has not been set (in general it won't show up on the radar)
-	RADAR_PRIORITY_NOT_ON_RADAR,		// object specifically forbidden from being on the radar
-	RADAR_PRIORITY_STRUCTURE,				// structure level drawing priority
-	RADAR_PRIORITY_UNIT,						// unit level drawing priority
-	RADAR_PRIORITY_LOCAL_UNIT_ONLY,	// unit priority, but only on the radar if controlled by the local player
-
-	RADAR_PRIORITY_NUM_PRIORITIES		// keep this last
-};
-#ifdef DEFINE_RADAR_PRIORITY_NAMES
-static const char *RadarPriorityNames[] = 
-{
-	"INVALID",											// a priority that has not been set (in general it won't show up on the radar)
-	"NOT_ON_RADAR",									// object specifically forbidden from being on the radar
-	"STRUCTURE",										// structure level drawing priority
-	"UNIT",													// unit level drawing priority
-	"LOCAL_UNIT_ONLY",							// unit priority, but only on the radar if controlled by the local player
-
-	NULL														// keep this last
-};
-#endif  // DEFINE_RADAR_PRIOTITY_NAMES
-
-//-------------------------------------------------------------------------------------------------
-/** Interface for the radar */
-//-------------------------------------------------------------------------------------------------
-class Radar : public Snapshot,
-							public SubsystemInterface
-{
-
-public:
-	
-	Radar( void );
-	virtual ~Radar( void );
-
-	virtual void init( void ) { }														///< subsystem initialization
-	virtual void reset( void );															///< subsystem reset
-	virtual void update( void );														///< subsystem per frame update
-
-	// is the game window parameter the radar window
-	Bool isRadarWindow( GameWindow *window ) { return (m_radarWindow == window) && (m_radarWindow != NULL); }
-
-	Bool radarToWorld( const ICoord2D *radar, Coord3D *world );		///< radar point to world point on terrain
-	Bool radarToWorld2D( const ICoord2D *radar, Coord3D *world );		///< radar point to world point (x,y only!)
-	Bool worldToRadar( const Coord3D *world, ICoord2D *radar );		///< translate world point to radar (x,y)
-	Bool localPixelToRadar( const ICoord2D *pixel, ICoord2D *radar );	///< translate pixel (with UL of radar being (0,0)) to logical radar coords
-	Bool screenPixelToWorld( const ICoord2D *pixel, Coord3D *world ); ///< translate pixel (with UL of the screen being (0,0)) to world position in the world
-	Object *objectUnderRadarPixel( const ICoord2D *pixel );				///< return the object (if any) represented by the pixel coords passed in
-	void findDrawPositions( Int startX, Int startY, Int width, Int height, 
-													ICoord2D *ul, ICoord2D *lr );					///< make translation for screen area of radar square to scaled aspect ratio preserving points inside the radar area
-
-	// priority inquiry
-	Bool isPriorityVisible( RadarPriorityType priority ) const;		///< is the priority passed in a "visible" one on the radar
-
-	// radar events
-	void createEvent( const Coord3D *world, RadarEventType type, Real secondsToLive = 4.0f );	///< create radar event at location in world
-	void createPlayerEvent( Player *player, const Coord3D *world, RadarEventType type, Real secondsToLive = 4.0f );  ///< create radar event using player colors
-
-	Bool getLastEventLoc( Coord3D *eventPos );							///< get last event loc (if any)
-	void tryUnderAttackEvent( const Object *obj );					///< try to make an "under attack" event if it's the proper time
-	void tryInfiltrationEvent( const Object *obj );					///< try to make an "infiltration" event if it's the proper time
- 	Bool tryEvent( RadarEventType event, const Coord3D *pos );	///< try to make a "stealth" event
-
-	// adding and removing objects from the radar
-	void addObject( Object *obj );													///< add object to radar
-	void removeObject( Object *obj );												///< remove object from radar
-	void examineObject( Object *obj );											///< re-examine object and resort if needed
-
-	// radar options
-	void hide( Bool hide ) { m_radarHidden = hide; }				///< hide/unhide the radar
-	Bool isRadarHidden( void ) { return m_radarHidden; }		///< is radar hidden
-	// other radar option methods here like the ability to show a certain
-	// team, show buildings, show units at all, etc
-
-	// forcing the radar on/off regardless of player situation
-	void forceOn( Bool force ) { m_radarForceOn = force; }				///< force the radar to be on
-	Bool isRadarForced( void ) { return m_radarForceOn; }		///< is radar forced on?
-
-	/// refresh the water values for the radar
-	virtual void refreshTerrain( TerrainLogic *terrain );
-
-	/// queue a refresh of the terran at the next available time
-	virtual void queueTerrainRefresh( void );
-
-	virtual void newMap( TerrainLogic *terrain );	///< reset radar for new map
-
-	virtual void draw( Int pixelX, Int pixelY, Int width, Int height ) = 0;	///< draw the radar
-
-	/// empty the entire shroud
-	virtual void clearShroud() = 0;
-
-	/// set the shroud level at shroud cell x,y
-	virtual void setShroudLevel( Int x, Int y, CellShroudStatus setting ) = 0;
-
-protected:
-
-	// snapshot methods
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-	/// internal method for creating a radar event with specific colors
-	void internalCreateEvent( const Coord3D *world, RadarEventType type, Real secondsToLive,
-														const RGBAColorInt *color1, const RGBAColorInt *color2 );
-
-	void deleteListResources( void );			///< delete list radar resources used
-	Bool deleteFromList( Object *obj, RadarObject **list );	///< try to remove object from specific list
-
-	inline Real getTerrainAverageZ() const { return m_terrainAverageZ; }
-	inline Real getWaterAverageZ() const { return m_waterAverageZ; }
-	inline const RadarObject* getObjectList() const { return m_objectList; }
-	inline const RadarObject* getLocalObjectList() const { return m_localObjectList; }
-
-	void clearAllEvents( void );					///< remove all radar events in progress
-
-	// search the object list for an object that maps to the given logical radar coords
-	Object *searchListForRadarLocationMatch( RadarObject *listHead, ICoord2D *radarMatch );
-
-	Bool m_radarHidden;										///< true when radar is not visible
-	Bool m_radarForceOn;									///< true when radar is forced to be on
-	RadarObject *m_objectList;						///< list of objects in the radar
-	RadarObject *m_localObjectList;				/** list of objects for the local player, sorted
-																					* in exactly the same priority as the regular
-																					* object list for all other objects */
-
-	Real m_terrainAverageZ;								///< average Z for terrain samples
-	Real m_waterAverageZ;									///< average Z for water samples
-
-	//
-	// when dealing with world sampling we will sample at these intervals so that
-	// the whole map can be accounted for within our RADAR_CELL_WIDTH and
-	// RADAR_CELL_HEIGHT resolutions
-	//
-	Real m_xSample;												
-	Real m_ySample;												  
-
-	enum { MAX_RADAR_EVENTS = 64 };
-	struct RadarEvent
-	{
-		RadarEventType type;								///< type of this radar event
-		Bool active;												///< TRUE when event is "active", otherwise it's just historical information in the event array to look through
-		UnsignedInt createFrame;						///< frame event was created on
-		UnsignedInt dieFrame;								///< frame the event will go away on
-		UnsignedInt fadeFrame;							///< start fading out on this frame
-		RGBAColorInt color1;								///< color 1 for drawing
-		RGBAColorInt color2;								///< color 2 for drawing
-		Coord3D worldLoc;										///< location of event in the world
-		ICoord2D radarLoc;									///< 2D radar location of the event
-		Bool soundPlayed;										///< TRUE when we have played the radar sound for this
-	};
-	RadarEvent m_event[ MAX_RADAR_EVENTS ];///< our radar events
-	Int m_nextFreeRadarEvent;							///< index into m_event for where to store the next event
-	Int m_lastRadarEvent;									///< index of the most recent radar event
-
-	GameWindow *m_radarWindow;						///< window we display the radar in
-
-	Region3D m_mapExtent;									///< extents of the current map
-
-	UnsignedInt m_queueTerrainRefreshFrame;  ///< frame we requested the last terrain refresh on
-
-};
-
-// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
-extern Radar *TheRadar;  ///< the radar singleton extern
-
-// TheSuperHackers @feature helmutbuhler 10/04/2025
-// Radar that does nothing. Used for Headless Mode.
-class RadarDummy : public Radar
-{
-public:
-	virtual void draw(Int pixelX, Int pixelY, Int width, Int height) { }
-	virtual void clearShroud() { }
-	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) { }
-};
-
-#endif  // __RADAR_H_
-
-
-
diff --git a/Generals/Code/GameEngine/Include/Common/RandomValue.h b/Generals/Code/GameEngine/Include/Common/RandomValue.h
deleted file mode 100644
index 422b9f00434..00000000000
--- a/Generals/Code/GameEngine/Include/Common/RandomValue.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// RandomValue.h
-// Random number generation system
-// Author: Michael S. Booth, January 1998
-
-#pragma once
-
-#ifndef _RANDOM_VALUE_H_
-#define _RANDOM_VALUE_H_
-
-#include "Lib/BaseType.h"
-
-extern void InitRandom( void );
-extern void InitRandom( UnsignedInt seed );
-extern void InitGameLogicRandom( UnsignedInt seed ); ///< Set the GameLogic seed to a known value at game start
-extern UnsignedInt GetGameLogicRandomSeed( void );   ///< Get the seed (used for replays)
-extern UnsignedInt GetGameLogicRandomSeedCRC( void );///< Get the seed (used for CRCs)
-
-//--------------------------------------------------------------------------------------------------------------
-
-#endif // _RANDOM_VALUE_H_
diff --git a/Generals/Code/GameEngine/Include/Common/Recorder.h b/Generals/Code/GameEngine/Include/Common/Recorder.h
index fefd82c89d4..e1b98b6ae71 100644
--- a/Generals/Code/GameEngine/Include/Common/Recorder.h
+++ b/Generals/Code/GameEngine/Include/Common/Recorder.h
@@ -22,12 +22,13 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
 #include "Common/MessageStream.h"
 #include "GameNetwork/GameInfo.h"
 
+class File;
+
 /**
   * The ReplayGameInfo class holds information about the replay game and
 	* the contents of its slot list for reconstructing multiplayer games.
@@ -48,6 +49,7 @@ class ReplayGameInfo : public GameInfo
 enum RecorderModeType CPP_11(: Int) {
 	RECORDERMODETYPE_RECORD,
 	RECORDERMODETYPE_PLAYBACK,
+	RECORDERMODETYPE_SIMULATION_PLAYBACK, // Play back replay without any graphics
 	RECORDERMODETYPE_NONE // this is a valid state to be in on the shell map, or in saved games
 };
 
@@ -74,11 +76,13 @@ class RecorderClass : public SubsystemInterface {
 	Bool replayMatchesGameVersion(AsciiString filename); ///< Returns true if the playback is a valid playback file for this version.
 	static Bool replayMatchesGameVersion(const ReplayHeader& header); ///< Returns true if the playback is a valid playback file for this version.
 	AsciiString getCurrentReplayFilename( void );			///< valid during playback only
+	UnsignedInt getPlaybackFrameCount() const { return m_playbackFrameCount; }			///< valid during playback only
 	void stopPlayback();															///< Stops playback.  Its fine to call this even if not playing back a file.
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+	Bool simulateReplay(AsciiString filename);
+#if defined(RTS_DEBUG)
 	Bool analyzeReplay( AsciiString filename );
-	Bool isAnalysisInProgress( void );
 #endif
+	Bool isPlaybackInProgress() const;
 
 public:
 	void handleCRCMessage(UnsignedInt newCRC, Int playerIndex, Bool fromPlayback);
@@ -100,7 +104,7 @@ class RecorderClass : public SubsystemInterface {
 		UnsignedInt iniCRC;
 		time_t startTime;
 		time_t endTime;
-		UnsignedInt frameDuration;
+		UnsignedInt frameCount;
 		Bool quitEarly;
 		Bool desyncGame;
 		Bool playerDiscons[MAX_SLOTS];
@@ -110,11 +114,13 @@ class RecorderClass : public SubsystemInterface {
 	Bool readReplayHeader( ReplayHeader& header );
 
 	RecorderModeType getMode();												///< Returns the current operating mode.
+	Bool isPlaybackMode() const { return m_mode == RECORDERMODETYPE_PLAYBACK || m_mode == RECORDERMODETYPE_SIMULATION_PLAYBACK; }
 	void initControls();															///< Show or Hide the Replay controls
 
-	AsciiString getReplayDir();												///< Returns the directory that holds the replay files.
-	AsciiString getReplayExtention();									///< Returns the file extention for replay files.
-	AsciiString getLastReplayFileName();							///< Returns the filename used for the default replay.
+	static AsciiString getReplayDir();								///< Returns the directory that holds the replay files.
+	static AsciiString getReplayArchiveDir();					///< Returns the directory that holds the archived replay files.
+	static AsciiString getReplayExtention();					///< Returns the file extention for replay files.
+	static AsciiString getLastReplayFileName();				///< Returns the filename used for the default replay.
 
 	GameInfo *getGameInfo( void ) { return &m_gameInfo; }	///< Returns the slot list for playback game start
 
@@ -124,12 +130,15 @@ class RecorderClass : public SubsystemInterface {
 
 	void logPlayerDisconnect(UnicodeString player, Int slot);
 	void logCRCMismatch( void );
+	Bool sawCRCMismatch() const;
 	void cleanUpReplayFile( void );										///< after a crash, send replay/debug info to a central repository
 
+	void setArchiveEnabled(Bool enable) { m_archiveReplays = enable; } ///< Enable or disable replay archiving.
 	void stopRecording();															///< Stop recording and close m_file.
 protected:
 	void startRecording(GameDifficulty diff, Int originalGameMode, Int rankPoints, Int maxFPS);					///< Start recording to m_file.
 	void writeToFile(GameMessage *msg);								///< Write this GameMessage to m_file.
+	void archiveReplay(AsciiString fileName);					///< Move the specified replay file to the archive directory.
 
 	void logGameStart(AsciiString options);
 	void logGameEnd( void );
@@ -149,16 +158,18 @@ class RecorderClass : public SubsystemInterface {
 
 	CullBadCommandsResult cullBadCommands(); ///< prevent the user from giving mouse commands that he shouldn't be able to do during playback.
 
-	FILE *m_file;
+	File* m_file;
 	AsciiString m_fileName;
 	Int m_currentFilePosition;
 	RecorderModeType m_mode;
 	AsciiString m_currentReplayFilename;							///< valid during playback only
+	UnsignedInt m_playbackFrameCount;
 
 	ReplayGameInfo m_gameInfo;
 	Bool m_wasDesync;
 
 	Bool m_doingAnalysis;
+	Bool m_archiveReplays;														///< if true, each replay is archived to the replay archive folder after recording
 
 	Int m_originalGameMode; // valid in replays
 
@@ -166,4 +177,4 @@ class RecorderClass : public SubsystemInterface {
 };
 
 extern RecorderClass *TheRecorder;
-RecorderClass *createRecorder();
\ No newline at end of file
+RecorderClass *createRecorder();
diff --git a/Generals/Code/GameEngine/Include/Common/Registry.h b/Generals/Code/GameEngine/Include/Common/Registry.h
index fff1c836aa3..83ecb7dd24b 100644
--- a/Generals/Code/GameEngine/Include/Common/Registry.h
+++ b/Generals/Code/GameEngine/Include/Common/Registry.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __REGISTRY_H__
-#define __REGISTRY_H__
-
 #include <Common/AsciiString.h>
 
 /**
@@ -47,5 +44,3 @@ AsciiString GetRegistryLanguage(void); // convenience function
 AsciiString GetRegistryGameName(void); // convenience function
 UnsignedInt GetRegistryVersion(void); // convenience function
 UnsignedInt GetRegistryMapPackVersion(void); // convenience function
-
-#endif // __REGISTRY_H__
diff --git a/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h b/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h
index db472afd937..437f6d2fdd3 100644
--- a/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h
+++ b/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef RESOURCE_GATHER_MANAGER_H
-#define RESOURCE_GATHER_MANAGER_H
-
 #include "Common/GameType.h"
 #include "Common/Snapshot.h"
 
@@ -72,5 +69,3 @@ class ResourceGatheringManager : public MemoryPoolObject,
 	objectIDList m_supplyCenters;
 
 };
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/Common/STLTypedefs.h b/Generals/Code/GameEngine/Include/Common/STLTypedefs.h
index dc8c89c8344..484b3f33e80 100644
--- a/Generals/Code/GameEngine/Include/Common/STLTypedefs.h
+++ b/Generals/Code/GameEngine/Include/Common/STLTypedefs.h
@@ -24,12 +24,12 @@
 
 // FILE: STLTypedefs.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef __STLTYPEDEFS_H__
-#define __STLTYPEDEFS_H__
-
 //-----------------------------------------------------------------------------
 // srj sez: this must come first, first, first.
 #define _STLP_USE_NEWALLOC					1
@@ -73,6 +70,7 @@ enum DrawableID CPP_11(: Int);
 #include <Utility/hash_map_adapter.h>
 #include <list>
 #include <map>
+#include <numeric>
 #include <queue>
 #include <set>
 #include <stack>
@@ -113,15 +111,15 @@ typedef std::map< NameKeyType, Real, std::less<NameKeyType> > ProductionChangeMa
 typedef std::map< NameKeyType, VeterancyLevel, std::less<NameKeyType> > ProductionVeterancyMap;
 
 // Some useful, common hash and equal_to functors for use with hash_map
-namespace rts 
+namespace rts
 {
-	
-	// Generic hash functor. This should almost always be overridden for 
+
+	// Generic hash functor. This should almost always be overridden for
 	// specific types.
 	template<typename T> struct hash
 	{
 		size_t operator()(const T& __t) const
-		{ 
+		{
 			std::hash<T> tmp;
 			return tmp(__t);
 		}
@@ -152,7 +150,7 @@ namespace rts
 	template<> struct hash<NameKeyType>
 	{
 		size_t operator()(NameKeyType nkt) const
-		{ 
+		{
 			std::hash<UnsignedInt> tmp;
 			return tmp((UnsignedInt)nkt);
 		}
@@ -161,7 +159,7 @@ namespace rts
 	template<> struct hash<DrawableID>
 	{
 		size_t operator()(DrawableID nkt) const
-		{ 
+		{
 			std::hash<UnsignedInt> tmp;
 			return tmp((UnsignedInt)nkt);
 		}
@@ -170,16 +168,30 @@ namespace rts
 	template<> struct hash<ObjectID>
 	{
 		size_t operator()(ObjectID nkt) const
-		{ 
+		{
 			std::hash<UnsignedInt> tmp;
 			return tmp((UnsignedInt)nkt);
 		}
 	};
 
+	template<> struct hash<const Char*>
+	{
+		size_t operator()(const Char* s) const
+		{
+#ifdef USING_STLPORT
+			std::hash<const Char*> hasher;
+			return hasher(s);
+#else
+			std::hash<std::string_view> hasher;
+			return hasher(s);
+#endif
+		}
+	};
+
 	// This is the equal_to overload for char* comparisons. We compare the
 	// strings to determine whether they are equal or not.
 	// Other overloads should go into specific header files, not here (unless
-	// they are ot be used in lots of places.)
+	// they are to be used in lots of places.)
 	template<> struct equal_to<const char*>
 	{
 		Bool operator()(const char* s1, const char* s2) const
@@ -226,6 +238,60 @@ namespace rts
 			return (__t1.compareNoCase(__t2) < 0);
 		}
 	};
-}
 
-#endif /* __STLTYPEDEFS_H__ */
+	// TheSuperHackers @info Structs to help create maps that can use C strings for
+	// lookups without the need to allocate a string.
+	template <typename String>
+	struct string_key
+	{
+		typedef typename String::const_pointer const_pointer;
+
+		static string_key temporary(const_pointer s)
+		{
+			string_key key;
+			key.cstr = s;
+			return key;
+		}
+
+		string_key(const_pointer s)
+			: storage(s)
+			, cstr(storage.str())
+		{}
+
+		string_key(const String& s)
+			: storage(s)
+			, cstr(storage.str())
+		{}
+
+		const_pointer c_str() const
+		{
+			return cstr;
+		}
+
+	private:
+		string_key() {}
+
+		String storage;
+		const_pointer cstr;
+	};
+
+	template <typename String>
+	struct string_key_hash
+	{
+		typedef typename String::const_pointer const_pointer;
+		size_t operator()(const string_key<String>& key) const
+		{
+			return hash<const_pointer>()(key.c_str());
+		}
+	};
+
+	template <typename String>
+	struct string_key_equal
+	{
+		bool operator()(const string_key<String>& a, const string_key<String>& b) const
+		{
+			return strcmp(a.c_str(), b.c_str()) == 0;
+		}
+	};
+
+} // namespace rts
diff --git a/Generals/Code/GameEngine/Include/Common/Science.h b/Generals/Code/GameEngine/Include/Common/Science.h
index 192da64f1bb..f7bfcd6ce04 100644
--- a/Generals/Code/GameEngine/Include/Common/Science.h
+++ b/Generals/Code/GameEngine/Include/Common/Science.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SCIENCE_H_
-#define __SCIENCE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Overridable.h"
 #include "Common/NameKeyGenerator.h"
@@ -98,8 +95,8 @@ class ScienceStore : public SubsystemInterface
 	/**
 		this is a subtle call, and should ALMOST NEVER be called by external code...
 		this is used to determine if you have the "root" requirements for a given science,
-		and thus could *potentially* obtain it if you got extra prereqs. 
-		
+		and thus could *potentially* obtain it if you got extra prereqs.
+
 		Generally, you should call getPurchasableSciences() instead of this!
 	*/
 	Bool playerHasRootPrereqsForScience(const Player* player, ScienceType st) const;
@@ -109,7 +106,7 @@ class ScienceStore : public SubsystemInterface
 	ScienceType getScienceFromInternalName(const AsciiString& name) const;
 	AsciiString getInternalNameForScience(ScienceType science) const;
 
-	/** return a list of the sciences the given player can purchase now, and a list he might be able to purchase in the future, 
+	/** return a list of the sciences the given player can purchase now, and a list he might be able to purchase in the future,
 		but currently lacks prereqs or points for. (either might be an empty list) */
 	void getPurchasableSciences(const Player* player, ScienceVec& purchasable, ScienceVec& potentiallyPurchasable) const;
 
@@ -134,7 +131,3 @@ class ScienceStore : public SubsystemInterface
 };
 
 extern ScienceStore* TheScienceStore;
-
-
-#endif // __SCIENCE_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/ScopedMutex.h b/Generals/Code/GameEngine/Include/Common/ScopedMutex.h
index ffac55a025b..aadd9531e2e 100644
--- a/Generals/Code/GameEngine/Include/Common/ScopedMutex.h
+++ b/Generals/Code/GameEngine/Include/Common/ScopedMutex.h
@@ -23,9 +23,6 @@
 
 #pragma once
 
-#ifndef __SCOPEDMUTEX_H__
-#define __SCOPEDMUTEX_H__
-
 class ScopedMutex
 {
 	private:
@@ -42,5 +39,3 @@ class ScopedMutex
 			ReleaseMutex(m_mutex);
 		}
 };
-
-#endif /* __SCOPEDMUTEX_H__ */
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h b/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h
index 9726632f85d..98bf12b894e 100644
--- a/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h
+++ b/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h
@@ -24,12 +24,12 @@
 
 // FILE: ScoreKeeper.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jun 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ScoreKeeper.h
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Header file for the scorekeeper class
 //
 //-----------------------------------------------------------------------------
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __SCOREKEEPER_H_
-#define __SCOREKEEPER_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -73,22 +70,22 @@ class ScoreKeeper : public Snapshot
 
 	void reset( Int playerIdx );			///< Zero out the variables
 	Int calculateScore( void );				///< Performs the equation to calculate the score
-	
+
 	void addMoneySpent( Int money );								///< Adds money to the amount spent
 	void addMoneyEarned( Int money );								///< Adds money to the earned amount
-	
+
 	void addObjectBuilt( const Object *o );
 	void addObjectDestroyed( const Object *o );
 	void addObjectLost( const Object *o );
 	void addObjectCaptured( const Object *o );
 
 	void removeObjectBuilt( const Object *o );
-	
+
 	Int getTotalMoneyEarned( void ) { return m_totalMoneyEarned; }
 	Int getTotalMoneySpent( void ) { return m_totalMoneySpent; }
 	Int getTotalUnitsDestroyed( void );
 	Int getTotalUnitsBuilt( void ) { return m_totalUnitsBuilt; }
-	Int getTotalUnitsLost( void ) { return m_totalUnitsLost; } 
+	Int getTotalUnitsLost( void ) { return m_totalUnitsLost; }
 	Int getTotalBuildingsDestroyed( void );
 	Int getTotalBuildingsBuilt( void ) { return m_totalBuildingsBuilt; }
 	Int getTotalBuildingsLost( void ) { return m_totalBuildingsLost; }
@@ -100,7 +97,7 @@ class ScoreKeeper : public Snapshot
 	Int getTotalUnitsBuilt( KindOfMaskType validMask, KindOfMaskType invalidMask );
 
 protected:
-	
+
 	// snapshot methods
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
@@ -129,7 +126,7 @@ class ScoreKeeper : public Snapshot
 	ObjectCountMap m_objectsLost;				///< how many and what kinds of objects did we loose
 	ObjectCountMap m_objectsCaptured;
 	void xferObjectCountMap( Xfer *xfer, ObjectCountMap *map );
-		
+
 };
 
 //-----------------------------------------------------------------------------
@@ -141,5 +138,3 @@ inline void ScoreKeeper::addMoneyEarned( Int money )						{	m_totalMoneyEarned +
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __SCOREKEEPER_H_
diff --git a/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h b/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h
index 25f112d7219..ce1c68254df 100644
--- a/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h
+++ b/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __SKIRMISHBATTLEHONORS_H__
-#define __SKIRMISHBATTLEHONORS_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -44,7 +41,7 @@ class GameWindow;
 class WinInstanceData;
 
 //-----------------------------------------------------------------------------
-// CustomMatchPreferences base class 
+// CustomMatchPreferences base class
 //-----------------------------------------------------------------------------
 class SkirmishBattleHonors : public UserPreferences
 {
@@ -96,5 +93,3 @@ void InsertBattleHonor(GameWindow *list, const Image *image, Bool enabled, Int i
 void BattleHonorTooltip(GameWindow *window,
 												WinInstanceData *instData,
 												UnsignedInt mouse);
-
-#endif // __SKIRMISHBATTLEHONORS_H__
diff --git a/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h b/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h
index dca426c2640..562b4720af1 100644
--- a/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h
+++ b/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h
@@ -30,16 +30,13 @@
 
 #pragma once
 
-#ifndef __SKIRMISHPREFERENCES_H__
-#define __SKIRMISHPREFERENCES_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 #include "Common/UserPreferences.h"
 
 //-----------------------------------------------------------------------------
-// SkirmishPreferences class 
+// SkirmishPreferences class
 //-----------------------------------------------------------------------------
 class SkirmishPreferences : public UserPreferences
 {
@@ -57,6 +54,10 @@ class SkirmishPreferences : public UserPreferences
 	Int getPreferredColor(void);				// convenience function
 	AsciiString getPreferredMap(void);	// convenience function
 	Bool usesSystemMapDir(void);		// convenience function
-};
 
-#endif // __SKIRMISHPREFERENCES_H__
+  Bool getSuperweaponRestricted(void) const;
+  void setSuperweaponRestricted( Bool superweaponRestricted);
+
+  Money getStartingCash(void) const;
+  void setStartingCash( const Money &startingCash );
+};
diff --git a/Generals/Code/GameEngine/Include/Common/Snapshot.h b/Generals/Code/GameEngine/Include/Common/Snapshot.h
index ac1b177277b..e8a3ef7434c 100644
--- a/Generals/Code/GameEngine/Include/Common/Snapshot.h
+++ b/Generals/Code/GameEngine/Include/Common/Snapshot.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __SNAPSHOT_H_
-#define __SNAPSHOT_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AsciiString.h"
 
@@ -50,7 +47,7 @@ friend class XferSave;
 friend class XferCRC;
 
 public:
-	
+
 	Snapshot( void );
 	~Snapshot( void );
 
@@ -68,6 +65,3 @@ friend class XferCRC;
 	virtual void loadPostProcess( void ) = 0;
 
 };
-
-#endif // __SNAPSHOT_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h b/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h
index e3a933b502d..38e3bbed4d3 100644
--- a/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h
+++ b/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h
@@ -24,26 +24,29 @@
 
 // FILE: SparseMatchFinder.h /////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, March 2002
-// Desc:   
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __SparseMatchFinder_H_
-#define __SparseMatchFinder_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/BitFlags.h"
 #include "Common/STLTypedefs.h"
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	#define SPARSEMATCH_DEBUG
 #else
 	#undef SPARSEMATCH_DEBUG
 #endif
 
+typedef UnsignedInt SparseMatchFinderFlags;
+enum SparseMatchFinderFlags_ CPP_11(: SparseMatchFinderFlags)
+{
+	SparseMatchFinderFlags_NoCopy = 1<<0,
+};
+
 //-------------------------------------------------------------------------------------------------
-template<class MATCHABLE, class BITSET>
+template<class MATCHABLE, class BITSET, SparseMatchFinderFlags FLAGS = 0>
 class SparseMatchFinder
 {
 private:
@@ -98,7 +101,7 @@ class SparseMatchFinder
 	//-------------------------------------------------------------------------------------------------
 	// MEMBER VARS
 	//-------------------------------------------------------------------------------------------------
-	
+
 	mutable MatchMap m_bestMatches;
 
 	//-------------------------------------------------------------------------------------------------
@@ -106,16 +109,16 @@ class SparseMatchFinder
 	//-------------------------------------------------------------------------------------------------
 
 	//-------------------------------------------------------------------------------------------------
-	inline static Int countConditionIntersection(const BITSET& a, const BITSET& b)
+	static Int countConditionIntersection(const BITSET& a, const BITSET& b)
 	{
 		return a.countIntersection(b);
-	} 
+	}
 
 	//-------------------------------------------------------------------------------------------------
-	inline static Int countConditionInverseIntersection(const BITSET& a, const BITSET& b)
+	static Int countConditionInverseIntersection(const BITSET& a, const BITSET& b)
 	{
 		return a.countInverseIntersection(b);
-	} 
+	}
 
 	//-------------------------------------------------------------------------------------------------
 	const MATCHABLE* findBestInfoSlow(const std::vector<MATCHABLE>& v, const BITSET& bits) const
@@ -124,8 +127,8 @@ class SparseMatchFinder
 		Int bestYesMatch = 0;							// want to maximize this
 		Int bestYesExtraneousBits = 999;	// want to minimize this
 
-	#ifdef SPARSEMATCH_DEBUG 
-		Int numDupMatches = 0; 
+	#ifdef SPARSEMATCH_DEBUG
+		Int numDupMatches = 0;
 		AsciiString curBestMatchStr, dupMatchStr;
 	#endif
 
@@ -144,7 +147,7 @@ class SparseMatchFinder
 				Int yesExtraneousBits = countConditionInverseIntersection(bits, yesFlags);
 
 	#ifdef SPARSEMATCH_DEBUG
-				if (yesMatch == bestYesMatch && 
+				if (yesMatch == bestYesMatch &&
 						yesExtraneousBits == bestYesExtraneousBits)
 				{
 					++numDupMatches;
@@ -163,16 +166,16 @@ class SparseMatchFinder
 					curBestMatchStr = it->getDescription();
 	#endif
 				}
-			}	// end for i
+			}
 
-		}	// end for it
+		}
 
 #ifdef SPARSEMATCH_DEBUG
 		if (numDupMatches > 0)
 		{
 			AsciiString curConditionStr;
-			bits.buildDescription(&curConditionStr); 
-			DEBUG_CRASH(("ambiguous model match in findBestInfoSlow \n\nbetween \n(%s)\n<and>\n(%s)\n\n(%d extra matches found)\n\ncurrent bits are (\n%s)\n",
+			bits.buildDescription(&curConditionStr);
+			DEBUG_CRASH(("ambiguous model match in findBestInfoSlow \n\nbetween \n(%s)\n<and>\n(%s)\n\n(%d extra matches found)\n\ncurrent bits are (\n%s)",
 					curBestMatchStr.str(),
 					dupMatchStr.str(),
 					numDupMatches,
@@ -183,9 +186,29 @@ class SparseMatchFinder
 		return result;
 	}
 
-	//-------------------------------------------------------------------------------------------------
 public:
 
+
+	//-------------------------------------------------------------------------------------------------
+	SparseMatchFinder() {}
+	SparseMatchFinder(const SparseMatchFinder& other)
+	{
+		*this = other;
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	SparseMatchFinder& operator=(const SparseMatchFinder& other)
+	{
+		if constexpr ((FLAGS & SparseMatchFinderFlags_NoCopy) == 0)
+		{
+			if (this != &other)
+			{
+				m_bestMatches = other.m_bestMatches;
+			}
+		}
+		return *this;
+	}
+
 	//-------------------------------------------------------------------------------------------------
 	void clear()
 	{
@@ -205,10 +228,10 @@ class SparseMatchFinder
 		if (first != NULL) {
 			return first;
 		}
-		
+
 		const MATCHABLE* info = findBestInfoSlow(v, bits);
 
-		DEBUG_ASSERTCRASH(info != NULL, ("no suitable match for criteria was found!\n"));
+		DEBUG_ASSERTCRASH(info != NULL, ("no suitable match for criteria was found!"));
 		if (info != NULL) {
 			m_bestMatches[bits] = info;
 		}
@@ -217,6 +240,3 @@ class SparseMatchFinder
 	}
 
 };
-
-#endif // __SparseMatchFinder_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/SpecialPower.h b/Generals/Code/GameEngine/Include/Common/SpecialPower.h
index d50e9242e35..8317c3e1042 100644
--- a/Generals/Code/GameEngine/Include/Common/SpecialPower.h
+++ b/Generals/Code/GameEngine/Include/Common/SpecialPower.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __SPECIALPOWER_H_
-#define __SPECIALPOWER_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/GameMemory.h"
@@ -56,25 +53,25 @@ struct FieldParse;
 
 #define MAKE_SPECIALPOWER_MASK(k) SpecialPowerMaskType(SpecialPowerMaskType::kInit, (k))
 
-inline Bool TEST_SPECIALPOWERMASK(const SpecialPowerMaskType& m, SpecialPowerType t) 
-{ 
-	return m.test(t); 
+inline Bool TEST_SPECIALPOWERMASK(const SpecialPowerMaskType& m, SpecialPowerType t)
+{
+	return m.test(t);
 }
-inline Bool TEST_SPECIALPOWERMASK_ANY(const SpecialPowerMaskType& m, const SpecialPowerMaskType& mask) 
-{ 
+inline Bool TEST_SPECIALPOWERMASK_ANY(const SpecialPowerMaskType& m, const SpecialPowerMaskType& mask)
+{
 	return m.anyIntersectionWith(mask);
 }
 inline Bool TEST_SPECIALPOWERMASK_MULTI(const SpecialPowerMaskType& m, const SpecialPowerMaskType& mustBeSet, const SpecialPowerMaskType& mustBeClear)
 {
 	return m.testSetAndClear(mustBeSet, mustBeClear);
 }
-inline Bool SPECIALPOWERMASK_ANY_SET(const SpecialPowerMaskType& m) 
-{ 
-	return m.any(); 
+inline Bool SPECIALPOWERMASK_ANY_SET(const SpecialPowerMaskType& m)
+{
+	return m.any();
 }
-inline void CLEAR_SPECIALPOWERMASK(SpecialPowerMaskType& m) 
-{ 
-	m.clear(); 
+inline void CLEAR_SPECIALPOWERMASK(SpecialPowerMaskType& m)
+{
+	m.clear();
 }
 inline void SET_SPECIALPOWERMASK( SpecialPowerMaskType& m, SpecialPowerType t, Int val = 1 )
 {
@@ -125,7 +122,7 @@ class SpecialPowerTemplate : public Overridable
 	Real getRadiusCursorRadius() const { return getFO()->m_radiusCursorRadius; }
 	Bool isShortcutPower() const { return getFO()->m_shortcutPower; }
 
-private: 
+private:
 
 	const SpecialPowerTemplate* getFO() const { return (const SpecialPowerTemplate*)friend_getFinalOverride(); }
 
@@ -136,7 +133,7 @@ class SpecialPowerTemplate : public Overridable
 	ScienceType				m_requiredScience;		///< science required (if any) to actually execute this power
 	AudioEventRTS			m_initiateSound;			///< sound to play when initiated
 	AudioEventRTS			m_initiateAtLocationSound;		///< sound to play at target location (if any)
-	UnsignedInt				m_detectionTime;			///< (frames) after using infiltration power (defection, etc.), 
+	UnsignedInt				m_detectionTime;			///< (frames) after using infiltration power (defection, etc.),
 																					///< how long it takes for ex comrades to realize it on their own
 	UnsignedInt				m_viewObjectDuration;	///< Lifetime of a looking object we slap down so you can watch the effect
 	Real							m_viewObjectRange;		///< And how far that object can see.
@@ -188,5 +185,3 @@ class SpecialPowerStore : public SubsystemInterface
 
 // EXTERNAL ///////////////////////////////////////////////////////////////////////////////////////
 extern SpecialPowerStore *TheSpecialPowerStore;
-
-#endif  // end __SPECIALPOWER_H_
diff --git a/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h b/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h
index ffabd68f9c3..f72371b0e82 100644
--- a/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h
+++ b/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h
@@ -27,13 +27,9 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __SPECIALPOWERMASKTYPE_H__
-#define __SPECIALPOWERMASKTYPE_H__
 
 #include "Common/BitFlags.h"
 #include "Common/BitFlagsIO.h"
 #include "Common/SpecialPowerType.h"
 
 typedef BitFlags<SPECIALPOWER_COUNT>	SpecialPowerMaskType;
-
-#endif /* __SPECIALPOWERMASKTYPE_H__ */
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h b/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h
index 32cbc9a35c6..4fc2a6031d0 100644
--- a/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h
+++ b/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h
@@ -27,8 +27,6 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __SPECIALPOWERTYPE_H__
-#define __SPECIALPOWERTYPE_H__
 
 // ------------------------------------------------------------------------------------------------
 // don't forget to add new strings to SpecialPowerMaskType::s_bitNameList[]
@@ -91,11 +89,9 @@ enum SpecialPowerType CPP_11(: Int)
 	SPECIAL_CLEANUP_AREA,
 	// don't forget to add new strings to SpecialPowerMaskType::s_bitNameList[]
 	SPECIAL_LAUNCH_BAIKONUR_ROCKET,
-		
+
 	SPECIALPOWER_COUNT,
 	// don't forget to add new strings to SpecialPowerMaskType::s_bitNameList[]
 };
 
 	// Definition of these names is located in SpecialPower.cpp
-
-#endif /* __SPECIALPOWERTYPE_H__ */
diff --git a/Generals/Code/GameEngine/Include/Common/StackDump.h b/Generals/Code/GameEngine/Include/Common/StackDump.h
index 2a6b040ab6a..9a0e836dcf2 100644
--- a/Generals/Code/GameEngine/Include/Common/StackDump.h
+++ b/Generals/Code/GameEngine/Include/Common/StackDump.h
@@ -24,14 +24,11 @@
 
 #pragma once
 
-#ifndef __STACKDUMP_H_
-#define __STACKDUMP_H_
-
 #ifndef IG_DEGBUG_STACKTRACE
 #define IG_DEBUG_STACKTRACE	1
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(IG_DEBUG_STACKTRACE)
+#if defined(RTS_DEBUG) || defined(IG_DEBUG_STACKTRACE)
 
 // Writes a stackdump (provide a callback : gets called per line)
 // If callback is NULL then will write using OuputDebugString
@@ -70,6 +67,3 @@ __inline void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info ) {}
 #endif
 
 extern AsciiString g_LastErrorDump;
-
-
-#endif // __STACKDUMP_H_
diff --git a/Generals/Code/GameEngine/Include/Common/StateMachine.h b/Generals/Code/GameEngine/Include/Common/StateMachine.h
index 3d1dd9e5521..964612308b1 100644
--- a/Generals/Code/GameEngine/Include/Common/StateMachine.h
+++ b/Generals/Code/GameEngine/Include/Common/StateMachine.h
@@ -28,17 +28,12 @@
 
 #pragma once
 
-#ifndef _STATE_MACHINE_H_
-#define _STATE_MACHINE_H_
-
 #include "Common/GameMemory.h"
 #include "Common/GameType.h"
 #include "Common/ModelState.h"
 #include "Common/Snapshot.h"
 #include "Common/Xfer.h"
 
-#include "refcount.h"
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -51,9 +46,6 @@ class Object;
 #if defined(RTS_DEBUG)
 	#define STATE_MACHINE_DEBUG
 #endif
-#if defined(RTS_INTERNAL)
-	#define STATE_MACHINE_DEBUG	//uncomment to debug state machines in internal.  jba.
-#endif
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -66,8 +58,8 @@ typedef Bool (*StateTransFuncPtr)( State *state, void* userData );
 /**
  * State return codes
  */
-enum StateReturnType CPP_11(: Int) 
-{ 
+enum StateReturnType CPP_11(: Int)
+{
 	// note that all positive values are reserved for STATE_SLEEP!
 
 	STATE_CONTINUE	= 0,						///< stay in this state (only for update method)
@@ -109,17 +101,17 @@ inline StateReturnType MIN_SLEEP(UnsignedInt encloserSleep, StateReturnType encl
 }
 
 
-/** 
+/**
  * Special argument for onCondition. It means when the given condition
  * becomes true, the state machine will exit and return the given status.
  */
-enum 
-{ 
+enum
+{
 	EXIT_MACHINE_WITH_SUCCESS = 9998,
 	EXIT_MACHINE_WITH_FAILURE = 9999
 };
 
-/** 
+/**
  * Parameters for onExit().
  */
 enum StateExitType CPP_11(: Int)
@@ -160,8 +152,8 @@ class State : public MemoryPoolObject, public Snapshot
 	//Definition of busy -- when explicitly in the busy state. Moving or attacking is not considered busy!
 	virtual Bool isBusy() const { return false; }
 
-	inline StateMachine* getMachine() { return m_machine; }		///< return the machine this state is part of
-	inline StateID getID() const { return m_ID; }			///< get this state's id 
+	StateMachine* getMachine() { return m_machine; }		///< return the machine this state is part of
+	StateID getID() const { return m_ID; }			///< get this state's id
 
 	Object* getMachineOwner();
 	const Object* getMachineOwner() const;
@@ -175,9 +167,9 @@ class State : public MemoryPoolObject, public Snapshot
 #endif
 
 	// for internal use by the StateMachine class ---------------------------------------------------------
-	inline void friend_setID( StateID id ) { m_ID = id; }			///< define this state's id (for use only by StateMachine class)
+	void friend_setID( StateID id ) { m_ID = id; }			///< define this state's id (for use only by StateMachine class)
 	void friend_onSuccess( StateID toStateID ) { m_successStateID = toStateID; }	///< define which state to move to after successful completion
-	void friend_onFailure( StateID toStateID ) { m_failureStateID = toStateID; }	///< define which state to move to after failure 
+	void friend_onFailure( StateID toStateID ) { m_failureStateID = toStateID; }	///< define which state to move to after failure
 	void friend_onCondition( StateTransFuncPtr test, StateID toStateID, void* userData, const char* description = NULL );	///< define when to change state
 	StateReturnType friend_checkForTransitions( StateReturnType status );	///< given a return code, handle state transitions
 	StateReturnType friend_checkForSleepTransitions( StateReturnType status );	///< given a return code, handle state transitions
@@ -191,7 +183,7 @@ class State : public MemoryPoolObject, public Snapshot
 protected:
 	// snapshot interface	 - pure virtual here.
 	// Essentially all the member data gets set up on creation and shouldn't change.
-	// So none of it needs to be saved, and it nicely forces all user states to 
+	// So none of it needs to be saved, and it nicely forces all user states to
 	// remember to implement crc, xfer & loadPostProcess.  jba
 	virtual void crc( Xfer *xfer )=0;
 	virtual void xfer( Xfer *xfer )=0;
@@ -208,12 +200,12 @@ class State : public MemoryPoolObject, public Snapshot
 		const char*					description;							///< description (for debugging purposes)
 #endif
 
-		TransitionInfo(StateTransFuncPtr t, StateID id, void* ud, const char* desc) : 
-			test(t), 
+		TransitionInfo(StateTransFuncPtr t, StateID id, void* ud, const char* desc) :
+			test(t),
 			toStateID(id),
 			userData(ud)
 #ifdef STATE_MACHINE_DEBUG
-			, description(desc) 
+			, description(desc)
 #endif
 		{ }
 	};
@@ -238,7 +230,7 @@ inline State::~State() { }
 /**
  * A finite state machine.
  */
-class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountClass
+class StateMachine : public MemoryPoolObject, public Snapshot
 {
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( StateMachine, "StateMachinePool" );
 
@@ -260,10 +252,14 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 	/** must be called to jump the StateMachine into the default state... this may fail
 		(return a failure code), so it can't be done via the ctor. you MUST call this before
 		using the state machine. */
-	virtual StateReturnType initDefaultState();	
+	virtual StateReturnType initDefaultState();
 
 	virtual StateReturnType setState( StateID newStateID );			///< change the current state of the machine (which may cause further state changes, due to onEnter)
 
+	void Add_Ref() const { m_refCount.Add_Ref(); }
+	void Release_Ref() const { m_refCount.Release_Ref(MemoryPoolObject::deleteInstanceInternal, this); }
+	UnsignedByte Num_Refs() const { return m_refCount.Num_Refs(); }
+
 	StateID getCurrentStateID() const { return m_currentState ? m_currentState->getID() : INVALID_STATE_ID; }	///< return the id of the current state of the machine
 	Bool isInIdleState() const { return m_currentState ? m_currentState->isIdle() : true; }	// stateless things are considered 'idle'
 	Bool isInAttackState() const { return m_currentState ? m_currentState->isAttack() : true; }	// stateless things are considered 'idle'
@@ -280,17 +276,17 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 	 * Lock/unlock this state machine.
 	 * If a machine is locked, it cannot be reset, or given external setStates(), etc.
 	 */
-	void lock(const char* msg) 
+	void lock(const char* msg)
 	{
-		m_locked = true; 
+		m_locked = true;
 #ifdef STATE_MACHINE_DEBUG
 		m_lockedby = msg;
 #endif
 	}
 
-	void unlock() 
-	{ 
-		m_locked = false; 
+	void unlock()
+	{
+		m_locked = false;
 #ifdef STATE_MACHINE_DEBUG
 		m_lockedby = NULL;
 #endif
@@ -312,8 +308,8 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 	const Object *getGoalObject() const;
 	void setGoalPosition( const Coord3D *pos );
 	const Coord3D *getGoalPosition() const { return &m_goalPosition; }
-	Bool isGoalObjectDestroyed() const;  ///< Returns true if we had a goal object, but it has been destroyed. 
-	
+	Bool isGoalObjectDestroyed() const;  ///< Returns true if we had a goal object, but it has been destroyed.
+
 	virtual void halt(void); ///< Stops the state machine & disables it in preparation for deleting it.
 
 	//
@@ -321,7 +317,7 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 	//
 	StateReturnType internalSetState( StateID newStateID );	///< for internal use only - change the current state of the machine
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	UnsignedInt peekSleepTill() const { return m_sleepTill; }
 #endif
 
@@ -332,34 +328,28 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 	inline AsciiString getName() const {return m_name;}
 	virtual AsciiString getCurrentStateName() const { return m_currentState ? m_currentState->getName() : AsciiString::TheEmptyString;}
 #else
-	inline Bool getWantsDebugOutput() const { return false; }
-	inline AsciiString getCurrentStateName() const { return AsciiString::TheEmptyString;}
+	Bool getWantsDebugOutput() const { return false; }
+	AsciiString getCurrentStateName() const { return AsciiString::TheEmptyString;}
 #endif
 
 protected:
 	// snapshot interface
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();	
-
-	// RefCountClass interface
-	virtual void Delete_This()
-	{
-		MemoryPoolObject::deleteInstanceInternal(this);
-	}
+	virtual void loadPostProcess();
 
 protected:
 
 	/**
-	 * Given a unique (to this machine) integer ID representing a state, and an instance 
+	 * Given a unique (to this machine) integer ID representing a state, and an instance
 	 * of that state, the machine records this as a possible state, and
 	 * internally maps the given integer ID to the state instance.
 	 * These state id's are used to change the machine's state via setState().
 	 */
-	void defineState( StateID id, State *state, 
-										StateID successID, 
+	void defineState( StateID id, State *state,
+										StateID successID,
 										StateID failureID,
-										const StateConditionInfo* conditions = NULL);	
+										const StateConditionInfo* conditions = NULL);
 
 	State* internalGetState( StateID id );
 
@@ -371,7 +361,7 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 
 
 	std::map<StateID, State *>	m_stateMap;			///< the mapping of ids to states
-	Object*											m_owner;				///< object that "owns" this machine 
+	Object*											m_owner;				///< object that "owns" this machine
 
 	UnsignedInt		m_sleepTill;									///< if nonzero, we are sleeping 'till this frame
 
@@ -384,6 +374,8 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 	Bool					m_locked;													///< whether this machine is locked or not
 	Bool					m_defaultStateInited;							///< if initDefaultState has been called
 
+	RefCountValue<UnsignedByte> m_refCount;
+
 #ifdef STATE_MACHINE_DEBUG
 	Bool					m_debugOutput;
 	AsciiString		m_name;													///< Human readable name of this state - for debugging.  jba.
@@ -407,7 +399,7 @@ inline const Coord3D* State::getMachineGoalPosition() const { return m_machine->
 */
 class SuccessState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SuccessState, "SuccessState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SuccessState, "SuccessState")
 public:
 	SuccessState( StateMachine *machine ) : State( machine, "SuccessState") { }
 	virtual StateReturnType onEnter() { return STATE_SUCCESS; }
@@ -427,7 +419,7 @@ EMPTY_DTOR(SuccessState)
 */
 class FailureState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FailureState, "FailureState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FailureState, "FailureState")
 public:
 	FailureState( StateMachine *machine ) : State( machine, "FailureState") { }
 	virtual StateReturnType onEnter() { return STATE_FAILURE; }
@@ -439,7 +431,7 @@ class FailureState : public State
 	virtual void loadPostProcess(){};
 };
 EMPTY_DTOR(FailureState)
- 
+
 
 //-----------------------------------------------------------------------------------------------------------
 /**
@@ -447,7 +439,7 @@ EMPTY_DTOR(FailureState)
 */
 class ContinueState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ContinueState, "ContinueState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ContinueState, "ContinueState")
 public:
 	ContinueState( StateMachine *machine ) : State( machine, "ContinueState" ) { }
 	virtual StateReturnType onEnter() { return STATE_CONTINUE; }
@@ -467,7 +459,7 @@ EMPTY_DTOR(ContinueState)
 */
 class SleepState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SleepState, "SleepState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SleepState, "SleepState")
 public:
 	SleepState( StateMachine *machine ) : State( machine, "SleepState" ) { }
 	virtual StateReturnType onEnter() { return STATE_SLEEP_FOREVER; }
@@ -486,8 +478,6 @@ EMPTY_DTOR(SleepState)
 // @todo Replace calls to deleteInstance with RefCountPtr<StateMachine> when so appropriate.
 inline void deleteInstance(StateMachine* machine)
 {
-	machine->Release_Ref();
+	if (machine != NULL)
+		machine->Release_Ref();
 }
-
-
-#endif // _STATE_MACHINE_H_
diff --git a/Generals/Code/GameEngine/Include/Common/StatsCollector.h b/Generals/Code/GameEngine/Include/Common/StatsCollector.h
index d700d35d2ce..9b67159c405 100644
--- a/Generals/Code/GameEngine/Include/Common/StatsCollector.h
+++ b/Generals/Code/GameEngine/Include/Common/StatsCollector.h
@@ -24,12 +24,12 @@
 
 // FILE: StatsCollector.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,7 +37,7 @@
 //	Filename: 	StatsCollector.h
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Convinience class to help with collecting stats.
 //
 //-----------------------------------------------------------------------------
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __STATSCOLLECTOR_H_
-#define __STATSCOLLECTOR_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -70,9 +67,9 @@ class StatsCollector
 public:
 	StatsCollector( void );
 	~StatsCollector( void );
-	
+
 	void reset( void );							///< Reset's all values and writes the file header
-	
+
 	void collectMsgStats( const GameMessage *msg );			///< collects Msg Stats if
 	void collectUnitCountStats( void );									///< cycle through all units and takes count
 	void incrementScrollMoveCount( void );
@@ -83,13 +80,13 @@ class StatsCollector
 	void endScrollTime( void );			///< end our logging on the amount of time we're scrolling
 
 	void update( void );						///< called once a frame to see if we should poll this frame
-	
+
 	void writeFileEnd(void);				///< Write the end of the file
 private:
-	
+
 	void createFileName( void );		///< Create a snazzy filename
 	AsciiString m_statsFileName;		///< store the snazzy filename
-	
+
 	void writeInitialFileInfo(void );		///< write the header file info
 	void writeStatInfo( void );					///< write the stats we're keeping track of
 
@@ -100,7 +97,7 @@ class StatsCollector
 	UnsignedInt m_scrollMapCommands;///< scroll map commands
 	UnsignedInt m_AIUnits;					///< tally of all the AI Units
 	UnsignedInt m_playerUnits;			///< tally of all the player Units
-	
+
 	UnsignedInt m_scrollBeginTime;	///< Begin time in frames
 	UnsignedInt m_scrollTime;				///< our totals for the scrolltime
 	Bool m_isScrolling;							///< flag to make sure we are scrolling
@@ -119,5 +116,3 @@ class StatsCollector
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 extern StatsCollector* TheStatsCollector;			///< we need a singleton
-
-#endif // __STATSCOLLECTOR_H_
diff --git a/Generals/Code/GameEngine/Include/Common/StreamingArchiveFile.h b/Generals/Code/GameEngine/Include/Common/StreamingArchiveFile.h
deleted file mode 100644
index f255e07d306..00000000000
--- a/Generals/Code/GameEngine/Include/Common/StreamingArchiveFile.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    RTS 3
-//
-// Module:     IO
-//
-// File name:  Common/StreamingArchiveFile.h
-//
-// Created:    11/08/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __STREAMINGARCHIVEFILE_H
-#define __STREAMINGARCHIVEFILE_H
-
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/RAMFile.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// StreamingArchiveFile
-//===============================
-/**
-  *	File abstraction for standard C file operators: open, close, lseek, read, write
-	*/
-//===============================
-
-class StreamingArchiveFile : public RAMFile
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(StreamingArchiveFile, "StreamingArchiveFile")		
-	protected:
-
-		File					*m_file;											///< The archive file that I came from
-		Int						m_startingPos;								///< My starting position in the archive
-		Int						m_size;												///< My length
-		Int						m_curPos;											///< My current position.
-		
-	public:
-		
-		StreamingArchiveFile();
-		//virtual				~StreamingArchiveFile();
-
-
-		virtual Bool	open( const Char *filename, Int access = 0 );				///< Open a file for access
-		virtual void	close( void );																			///< Close the file
-		virtual Int		read( void *buffer, Int bytes );										///< Read the specified number of bytes in to buffer: See File::read
-		virtual Int		write( const void *buffer, Int bytes );							///< Write the specified number of bytes from the buffer: See File::write
-		virtual Int		seek( Int new_pos, seekMode mode = CURRENT );				///< Set file position: See File::seek
-		
-		// Ini's should not be parsed with streaming files, that's just dumb.
-		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0) { DEBUG_CRASH(("Should not call nextLine on a streaming file.\n")); } 
-		virtual Bool	scanInt(Int &newInt) { DEBUG_CRASH(("Should not call scanInt on a streaming file.\n"));  return FALSE; } 
-		virtual Bool	scanReal(Real &newReal) { DEBUG_CRASH(("Should not call scanReal on a streaming file.\n")); return FALSE; } 
-		virtual Bool	scanString(AsciiString &newString) { DEBUG_CRASH(("Should not call scanString on a streaming file.\n")); return FALSE; } 
-
-		virtual Bool	open( File *file );																	///< Open file for fast RAM access
-		virtual Bool	openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size); ///< copy file data from the given file at the given offset for the given size.
-		virtual Bool	copyDataToFile(File *localFile) { DEBUG_CRASH(("Are you sure you meant to copyDataToFile on a streaming file?")); return FALSE; }
-
-		virtual char* readEntireAndClose() { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return NULL; }
-		virtual File* convertToRAMFile() { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return this; }
-};
-
-
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-
-#endif // __STREAMINGARCHIVEFILE_H
diff --git a/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h b/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h
index 4cb54b1937d..740accba46a 100644
--- a/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h
+++ b/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h
@@ -29,11 +29,8 @@
 
 #pragma once
 
-#ifndef __SUBSYSTEMINTERFACE_H_
-#define __SUBSYSTEMINTERFACE_H_
-
 #include "Common/INI.h"
-#include "Common/STLTypedefs.h"	
+#include "Common/STLTypedefs.h"
 
 class Xfer;
 
@@ -44,7 +41,7 @@ class Xfer;
 	*
 	* Nothing about the subsystems is automatic, this interface does not wrap up automated
 	* functions, it is only here to provide a basic interface and rules for behavior
-	* all subsystems 
+	* all subsystems
 	*/
 class SubsystemInterface
 {
@@ -61,7 +58,7 @@ class SubsystemInterface
 
 	//-----------------------------------------------------------------------------------------------
 	/** - Free any resources allocated for this class.
-		* 
+		*
 		* - DO NOT throw exceptions during any destruction ever, and do not call other
 		*		methods that have the possibility of throwing exceptions.  Try to keep it
 		*		simple and keep as much work actually inside the destructor as possible.
@@ -91,7 +88,7 @@ class SubsystemInterface
 		*		re-initialize the resources already allocated.
 		*
 		*	- After a reset, the system does not need to be in EXACTLY the same state as a
-		*		fresh instantiation.  If there are persistent state information for the 
+		*		fresh instantiation.  If there are persistent state information for the
 		*		system make sure you maintain it while restoring or re-initializing other
 		*		transient parts.
 		*/
@@ -103,7 +100,7 @@ class SubsystemInterface
 		*		to service the system.
 		*
 		*	- Note that currently the GameClient and GameLogic will be updating
-		*		at different rates where the logic is running real time, and the 
+		*		at different rates where the logic is running real time, and the
 		*		client will adjust how many loops can be done during one server
 		*		time slice in order to improve performance on low end machines.
 		*/
@@ -122,31 +119,31 @@ class SubsystemInterface
 protected:
 	static Real s_msConsumed;
 	Real m_startTimeConsumed;
-	Real m_curUpdateTime;	
+	Real m_curUpdateTime;
 
 	Real m_startDrawTimeConsumed;
 	Real m_curDrawTime;
-#else 
-	inline void UPDATE(void) {update();}
-	inline void DRAW(void) {draw();}
+#else
+	void UPDATE(void) {update();}
+	void DRAW(void) {draw();}
 #endif
 protected:
-	AsciiString m_name;	
+	AsciiString m_name;
 public:
 	AsciiString getName(void) {return m_name;}
 	void setName(AsciiString name) {m_name = name;}
 
-};  // end SubsystemInterface
+};
 
 //-------------------------------------------------------------------------------------------------
 class SubsystemInterfaceList
 {
 public:
-	
+
 	SubsystemInterfaceList();
 	~SubsystemInterfaceList();
 
-	void initSubsystem(SubsystemInterface* sys, const char* path1, const char* path2, const char* dirpath, Xfer *pXfer, AsciiString name="");
+	void initSubsystem(SubsystemInterface* sys, const char* path1, const char* path2, Xfer *pXfer, AsciiString name="");
 	void addSubsystem(SubsystemInterface* sys);
 	void removeSubsystem(SubsystemInterface* sys);
 	void postProcessLoadAll();
@@ -165,6 +162,3 @@ class SubsystemInterfaceList
 };
 
 extern SubsystemInterfaceList* TheSubsystemList;
-
-#endif // __SUBSYSTEMINTERFACE_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/SystemInfo.h b/Generals/Code/GameEngine/Include/Common/SystemInfo.h
index 3400aba47f7..8b08868eabf 100644
--- a/Generals/Code/GameEngine/Include/Common/SystemInfo.h
+++ b/Generals/Code/GameEngine/Include/Common/SystemInfo.h
@@ -28,11 +28,4 @@
 
 #pragma once
 
-#ifndef __SYSTEMINFO_H__
-#define __SYSTEMINFO_H__
-
 extern const Bool TheSystemIsUnicode;
-
-
-
-#endif /* __SYSTEMINFO_H__ */
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/Common/Team.h b/Generals/Code/GameEngine/Include/Common/Team.h
index f27e3a46d15..d510d1cc5c9 100644
--- a/Generals/Code/GameEngine/Include/Common/Team.h
+++ b/Generals/Code/GameEngine/Include/Common/Team.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _TEAM_H_
-#define _TEAM_H_
-
 #include "Common/GameType.h"
 #include "Common/Snapshot.h"
 #include "Common/Thing.h"
@@ -50,7 +47,7 @@ class TeamRelationMap : public MemoryPoolObject,
 												public Snapshot
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TeamRelationMap, "TeamRelationMapPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TeamRelationMap, "TeamRelationMapPool" )
 
 public:
 
@@ -82,14 +79,14 @@ typedef void (*ObjectIterateFunc)( Object *obj, void *userData );		///< callback
 	-- All Teams (toplevel and subteams) are in the list
 	-- Each TeamDict contains:
 		-- Team Name (an internal ascii str)
-		-- Owning Team (or Player), by Name 
+		-- Owning Team (or Player), by Name
 		-- Misc Flags
 		-- Teams we are allies with, by name (only for toplevel teams)
 		-- Teams we are enemies with, by name (only for toplevel teams)
 
 	-- Note that Players and Teams share the same namespace, so you cannot have a team
-		with the same name as a player (or vice versa). 
-	
+		with the same name as a player (or vice versa).
+
 	-- MapObject Dicts will be revised to have an "owning team" rather than "owning player" entry
 
 	-- BuildLists must also have a way to assign units to Teams, as appropriate
@@ -160,7 +157,7 @@ class TeamTemplateInfo : public Snapshot
 	AsciiString				m_transportUnitType;					///< Unit used to transport the team.
 	AsciiString				m_startReinforceWaypoint;			///< Waypoint where the reinforcement team starts.
 	Bool							m_teamStartsFull;							///< If true, team loads into member transports.
-	Bool							m_transportsExit;							///< True if the transports leave after deploying team.	
+	Bool							m_transportsExit;							///< True if the transports leave after deploying team.
 	VeterancyLevel		m_veterancy;								///< Veterancy level;
 
 	// Production scripts stuff
@@ -182,7 +179,7 @@ class Team : public MemoryPoolObject,
 						 public Snapshot
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Team, "TeamPool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Team, "TeamPool" )
 
 private:
 
@@ -248,14 +245,14 @@ class Team : public MemoryPoolObject,
 	/// return the prototype used to create this team
 	const TeamPrototype *getPrototype( void ) { return m_proto; }
 
-	void setID( TeamID id ) { m_id = id; }	
+	void setID( TeamID id ) { m_id = id; }
 	TeamID getID() const { return m_id; }
 
 	/**
 		 Set the attack priority name for a team.
 	*/
 	void setAttackPriorityName(AsciiString name);
-	
+
 	/**
 		return the player currently controlling this team (backtracking up if necessary)
 	*/
@@ -266,7 +263,7 @@ class Team : public MemoryPoolObject,
 	*/
 	void setControllingPlayer(Player *newController);
 
-	/** 
+	/**
 		Get the team's state
 	*/
 	const AsciiString& getState(void) const {return m_state;}
@@ -276,7 +273,7 @@ class Team : public MemoryPoolObject,
 	*/
 	void getTeamAsAIGroup(AIGroup *pAIGroup);
 
-	/** 
+	/**
 		Get the team's state
 	*/
 	inline const AsciiString& getName() const;
@@ -286,52 +283,52 @@ class Team : public MemoryPoolObject,
 	*/
 	Int getTargetableCount() const;
 
-	/** 
+	/**
 		Set the team's AI state.
 	*/
 	void setState(const AsciiString& state) {m_state = state;}
 
-	/** 
+	/**
 		Set the team's AI recruitablity.
 	*/
 	void setRecruitable(Bool recruitable) {m_isRecruitablitySet = true; m_isRecruitable = recruitable;}
 
-	/** 
+	/**
 		Set the team's target object.
 	*/
 	void setTeamTargetObject(const Object *target) ;
 
-	/** 
+	/**
 		Set the team's target object.
 	*/
-	Object *getTeamTargetObject(void); 
+	Object *getTeamTargetObject(void);
 
-	/** 
+	/**
 		Set the team as active.  A team is considered created when set active.
 	*/
 	void setActive(void) {if (!m_active) { m_created = true;m_active = true;}}
 
-	/** 
+	/**
 		Is this team active?
 	*/
 	Bool isActive(void) {return m_active;}
 
-	/** 
+	/**
 		Is this team just createc?  (stays true one logic frame.)
 	*/
 	Bool isCreated(void) {return m_created;}
 
-	/** 
+	/**
 		Note that a team member entered or exited a trigger area.
 	*/
 	void setEnteredExited(void) {m_enteredOrExited = true;}
 
-	/** 
+	/**
 		Did a team member enter or exit a trigger area.
 	*/
 	Bool didEnterOrExit(void) {return m_enteredOrExited;}
 
-	/** 
+	/**
 		Clear the flag that a team member entered or exited a trigger area.
 		Also checks and executes any onCreate scripts, and clears the created flag.
 	*/
@@ -352,7 +349,7 @@ class Team : public MemoryPoolObject,
 	/**
 		return our relationship with the other team.
 		this is done as follows:
-		
+
 		-- if there's a TeamRelationship between this team and that team, return it.
 		-- otherwise, we use the relationship between our players.
 
@@ -367,7 +364,7 @@ class Team : public MemoryPoolObject,
 	void setOverrideTeamRelationship( TeamID teamID, Relationship r );
 
 	/**
-		remove the special relation (if any) between this and that. 
+		remove the special relation (if any) between this and that.
 		remove all special relations for 'this' if that==null.
 		return true if anything removed.
 	*/
@@ -382,7 +379,7 @@ class Team : public MemoryPoolObject,
 	void setOverridePlayerRelationship( Int playerIndex, Relationship r );
 
 	/**
-		remove the special relation (if any) between this and that. 
+		remove the special relation (if any) between this and that.
 		remove all special relations for 'this' if that==null.
 		return true if anything removed.
 	*/
@@ -395,13 +392,13 @@ class Team : public MemoryPoolObject,
 		the team's list-of-objects only once.
 	*/
 	void countObjectsByThingTemplate(Int numTmplates, const ThingTemplate* const* things, Bool ignoreDead, Int *counts, Bool ignoreUnderConstruction = TRUE ) const;
-	
-	
+
+
 	/**
 		returns the number of buildings on this team, by checking each things' template kindof against KINDOF_STRUCTURE
 	*/
 	Int countBuildings(void);
-	
+
 	/**
 		simply returns the number of objects on this team with a specific KindOfMaskType
 	*/
@@ -440,7 +437,7 @@ class Team : public MemoryPoolObject,
 	/**
 		a convenience routine to quickly check if all the units are idle.
 	*/
-	Bool isIdle(void) const;		
+	Bool isIdle(void) const;
 
 	/**
 		a convenience routine to quickly check if any objects are in a trigger area.
@@ -464,7 +461,7 @@ class Team : public MemoryPoolObject,
 
 	/**
 		a convenience routine to destroy this team. The team goes through all shutdown stuff.
-		Note that this doesn't actually call deleteInstance, the team will actually be 
+		Note that this doesn't actually call deleteInstance, the team will actually be
 		deleted on the next update, if it is a deletable team.
 		IgnoreDead lets you not delete people who are dying anyway.  Needed for scripts.
 	*/
@@ -475,18 +472,18 @@ class Team : public MemoryPoolObject,
 		of the first member of the team
 		*/
 	const Coord3D* getEstimateTeamPosition(void);
-	
+
 	/**
 		a convenience routine to move a team's units to another team.
 	*/
 	void transferUnitsTo(Team *newTeam);
 
-	/** 
+	/**
 		a function to kill all members of a team
 	*/
 	void killTeam(void);
 
-	/** 
+	/**
 		a function to make all containers on a team to dump contents
 	*/
 	void evacuateTeam(void);
@@ -497,17 +494,17 @@ class Team : public MemoryPoolObject,
 	const Waypoint *getCurrentWaypoint(void) {return m_currentWaypoint;}
 	void setCurrentWaypoint(const Waypoint *way) {m_currentWaypoint = way;}
 
-	/** 
+	/**
 		Update the generic scripts, allow them to see if they should run, etc.
 	*/
 
 	void updateGenericScripts(void);
-	
+
 };
 
 // ------------------------------------------------------------------------
 /**
-	Note that TeamPrototype is used to hold information that is invariant between 
+	Note that TeamPrototype is used to hold information that is invariant between
 	multiple instances of a given Team (e.g., alliance info).
 
 	However, a TeamPrototype doesn't contain any build-list style info; that is handled
@@ -516,22 +513,22 @@ class Team : public MemoryPoolObject,
 class TeamPrototype : public MemoryPoolObject,
 											public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TeamPrototype, "TeamPrototypePool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TeamPrototype, "TeamPrototypePool" )
 
 public:
 
-	TeamPrototype( TeamFactory *tf, 
-								 const AsciiString& name, 
-								 Player *ownerPlayer, 
-								 Bool isSingleton, 
+	TeamPrototype( TeamFactory *tf,
+								 const AsciiString& name,
+								 Player *ownerPlayer,
+								 Bool isSingleton,
 								 Dict *d,
 								 TeamPrototypeID id );
 	// virtual destructor prototype provided by memory pool object
 
-	inline TeamPrototypeID getID() const { return m_id; }
-	inline const AsciiString& getName() const { return m_name; }
-	inline Bool getIsSingleton() const { return (m_flags & TEAM_SINGLETON) != 0; }
-	inline const TeamTemplateInfo *getTemplateInfo(void) const {return &m_teamTemplate;}
+	TeamPrototypeID getID() const { return m_id; }
+	const AsciiString& getName() const { return m_name; }
+	Bool getIsSingleton() const { return (m_flags & TEAM_SINGLETON) != 0; }
+	const TeamTemplateInfo *getTemplateInfo(void) const {return &m_teamTemplate;}
 	/**
 		return the team's owner (backtracking up if necessary)
 	*/
@@ -541,13 +538,13 @@ class TeamPrototype : public MemoryPoolObject,
 		* Return a team with matching team ID if present
 	*/
 	Team *findTeamByID( TeamID teamID );
-		
+
 	/**
 		set the team's owner. (NULL is not allowed)
 	*/
 	void setControllingPlayer(Player *newController);
 
-	/** 
+	/**
 		Evaluate team's production condition.
 	*/
 	Bool evaluateProductionCondition(void);
@@ -580,7 +577,7 @@ class TeamPrototype : public MemoryPoolObject,
 	/// count the number of teams that have been instanced by this prototype
 	Int countTeamInstances( void );
 
-	/** 
+	/**
 		Checks & clears the flags that a team member entered or exited a trigger area, or was created.
 	*/
 	void updateState(void);
@@ -588,7 +585,7 @@ class TeamPrototype : public MemoryPoolObject,
 	/**
 		a convenience routine to quickly check if any buildings are owned.
 	*/
-	Bool hasAnyBuildings(void) const;		
+	Bool hasAnyBuildings(void) const;
 
 	/**
 		a convenience routine to quickly check if any buildings with a specific KindOfType flag are owned.
@@ -598,12 +595,12 @@ class TeamPrototype : public MemoryPoolObject,
 	/**
 		a convenience routine to quickly check if any units are owned.
 	*/
-	Bool hasAnyUnits(void) const;		
+	Bool hasAnyUnits(void) const;
 
 	/**
 		a convenience routine to quickly check if any objects are owned.
 	*/
-	Bool hasAnyObjects(void) const;		
+	Bool hasAnyObjects(void) const;
 
 	/**
 		a convenience routine to quickly check if any buildfacilities are owned.
@@ -648,7 +645,7 @@ class TeamPrototype : public MemoryPoolObject,
 	{
 		/**
 			if set, this prototype should only produce one team. if there's already a team
-			by this name, newly produced team members are added to it, rather than 
+			by this name, newly produced team members are added to it, rather than
 			put into a new team of the same name.
 		*/
 		TEAM_SINGLETON = 0x01
@@ -663,10 +660,10 @@ class TeamPrototype : public MemoryPoolObject,
 
 	Bool									m_productionConditionAlwaysFalse; ///< Flag set to true if we don't have a production condition.
 	Script								*m_productionConditionScript; ///< Script to evaluate for production condition.
-	
+
 	Bool									m_retrievedGenericScripts;
 	Script								*m_genericScriptsToRun[MAX_GENERIC_SCRIPTS];
-	
+
 	TeamTemplateInfo			m_teamTemplate;						///< Team template info.
 
 	AsciiString						m_attackPriorityName;
@@ -756,5 +753,3 @@ const AsciiString& Team::getName(void) const
 
 
 // ------------------------------------------------------------------------
-
-#endif // _TEAM_H_
diff --git a/Generals/Code/GameEngine/Include/Common/Terrain.h b/Generals/Code/GameEngine/Include/Common/Terrain.h
index 3d20810c15f..dd6ea409a39 100644
--- a/Generals/Code/GameEngine/Include/Common/Terrain.h
+++ b/Generals/Code/GameEngine/Include/Common/Terrain.h
@@ -32,14 +32,9 @@
 
 #pragma once
 
-#ifndef __TERRAIN_H_
-#define __TERRAIN_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 
 // DEFINE /////////////////////////////////////////////////////////////////////
 #define MAX_TERRAIN_NAME_LEN 64  ///< max size of map filename with extenstion
-
-#endif  // end __TERRAIN_H_
diff --git a/Generals/Code/GameEngine/Include/Common/TerrainTypes.h b/Generals/Code/GameEngine/Include/Common/TerrainTypes.h
index ea626a38f60..b0b2e2013e2 100644
--- a/Generals/Code/GameEngine/Include/Common/TerrainTypes.h
+++ b/Generals/Code/GameEngine/Include/Common/TerrainTypes.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __TERRAINTYPE_H_
-#define __TERRAINTYPE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
 #include "Common/SubsystemInterface.h"
@@ -70,11 +67,11 @@ typedef enum
 	TERRAIN_WOOD,
 	TERRAIN_BLEND_EDGES,
 
-	TERRAIN_NUM_CLASSES  // keep this last
+	TERRAIN_NUM_CLASSES
 
 } TerrainClass;
 #ifdef DEFINE_TERRAIN_TYPE_NAMES
-static const char *terrainTypeNames[] = 
+static const char *const terrainTypeNames[] =
 {
 	"NONE",
 	"DESERT_1",
@@ -100,10 +97,11 @@ static const char *terrainTypeNames[] =
 	"SAND",
 	"CLIFF",
 	"WOOD",
-	"BLEND_EDGE", 
+	"BLEND_EDGE",
 
 	NULL
 };
+static_assert(ARRAY_SIZE(terrainTypeNames) == TERRAIN_NUM_CLASSES + 1, "Incorrect array size");
 #endif  // end DEFINE_TERRAIN_TYPE_NAMES
 
 //-------------------------------------------------------------------------------------------------
@@ -120,40 +118,40 @@ class TerrainType : public MemoryPoolObject
 	// destructor prototype defined by memory pool glue
 
 	/// get the name for this terrain
-	inline AsciiString getName( void ) { return m_name; }
+	AsciiString getName( void ) { return m_name; }
 
 	/// get whether this terrain is blend edge terrain.
-	inline Bool isBlendEdge( void ) { return m_blendEdgeTexture; }
+	Bool isBlendEdge( void ) { return m_blendEdgeTexture; }
 
 	/// get the type of this terrain
-	inline TerrainClass getClass( void ) { return m_class; }
+	TerrainClass getClass( void ) { return m_class; }
 
 	/// get the construction restrictions
-	inline Bool getRestrictConstruction( void ) { return m_restrictConstruction; }
+	Bool getRestrictConstruction( void ) { return m_restrictConstruction; }
 
 	/// get the texture file for this terrain
-	inline AsciiString getTexture( void ) { return m_texture; }
+	AsciiString getTexture( void ) { return m_texture; }
 
 	/// get next terrain in list, only for use by the terrain collection
-	inline TerrainType *friend_getNext( void ) { return m_next; }
+	TerrainType *friend_getNext( void ) { return m_next; }
 
 	/// set the name for this terrain, for use by terrain collection only
-	inline void friend_setName( AsciiString name ) { m_name = name; }
+	void friend_setName( AsciiString name ) { m_name = name; }
 
 	/// set the next pointer for the terrain list, for use by terrain collection only
-	inline void friend_setNext( TerrainType *next ) { m_next = next; }
+	void friend_setNext( TerrainType *next ) { m_next = next; }
 
 	/// set the texture, for use by terrain collection only
-	inline void friend_setTexture( AsciiString texture ) { m_texture = texture; }
+	void friend_setTexture( AsciiString texture ) { m_texture = texture; }
 
 	/// set the class, for use by terrain collection only
-	inline void friend_setClass( TerrainClass terrainClass ) { m_class = terrainClass; }
+	void friend_setClass( TerrainClass terrainClass ) { m_class = terrainClass; }
 
 	/// set the restrict construction flag, for use by terrain collection only
-	inline void friend_setRestrictConstruction( Bool restrict ) { m_restrictConstruction = restrict; }
+	void friend_setRestrictConstruction( Bool restrict ) { m_restrictConstruction = restrict; }
 
 	/// set whether this terrain is blend edge terrain, for use by terrain collection only
-	inline void friend_setBlendEdge( Bool isBlend ) { m_blendEdgeTexture = isBlend; }
+	void friend_setBlendEdge( Bool isBlend ) { m_blendEdgeTexture = isBlend; }
 
 	/// get the parsing table for INI
 	const FieldParse *getFieldParse( void ) { return m_terrainTypeFieldParseTable; }
@@ -188,7 +186,7 @@ class TerrainTypeCollection : public SubsystemInterface
 	void update() { }
 
 	TerrainType *findTerrain( AsciiString name );		///< find terrain by name
-	TerrainType *newTerrain( AsciiString name );			///< allocate a new terrain 
+	TerrainType *newTerrain( AsciiString name );			///< allocate a new terrain
 
 	/// get first terrain in list
 	TerrainType *firstTerrain( void ) { return m_terrainList; }
@@ -204,6 +202,3 @@ class TerrainTypeCollection : public SubsystemInterface
 
 // EXTERNAL ///////////////////////////////////////////////////////////////////////////////////////
 extern TerrainTypeCollection *TheTerrainTypes;
-
-#endif // __TERRAINTYPE_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/Thing.h b/Generals/Code/GameEngine/Include/Common/Thing.h
index 995b3e1e1cf..838480831ed 100644
--- a/Generals/Code/GameEngine/Include/Common/Thing.h
+++ b/Generals/Code/GameEngine/Include/Common/Thing.h
@@ -24,12 +24,12 @@
 
 // FILE: Thing.h //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -48,13 +48,10 @@
 
 #pragma once
 
-#ifndef __THING_H_
-#define __THING_H_
-
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "Common/GameMemory.h"
 #include "Common/KindOf.h"
@@ -98,7 +95,7 @@ class Thing : public MemoryPoolObject
 
 	Thing( const ThingTemplate *thingTemplate );
 
-	/** 
+	/**
 		return the thing template for this thing.
 	*/
 	const ThingTemplate *getTemplate() const;
@@ -121,6 +118,9 @@ class Thing : public MemoryPoolObject
 
 	inline const Coord3D *getPosition() const { return &m_cachedPos; }
 	inline Real getOrientation() const { return m_cachedAngle; }
+
+	Bool isPositioned() const;
+
 	const Coord3D *getUnitDirectionVector2D() const;
 	void getUnitDirectionVector2D(Coord3D& dir) const;
 	void getUnitDirectionVector3D(Coord3D& dir) const;
@@ -161,7 +161,7 @@ class Thing : public MemoryPoolObject
 	// since ThingTemplates are shared between many, many Things, the Thing
 	// should never be able to change it.
 	OVERRIDE<ThingTemplate> m_template;	///< reference back to template database
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	AsciiString m_templateName;
 #endif
 	/*
@@ -188,12 +188,9 @@ class Thing : public MemoryPoolObject
 	mutable Real			m_cachedAltitudeAboveTerrainOrWater;
 	mutable Int				m_cacheFlags;
 
-}; 
+};
 
 
 //-----------------------------------------------------------------------------
-//           Externals                                                     
+//           Externals
 //-----------------------------------------------------------------------------
-
-#endif // $label
-
diff --git a/Generals/Code/GameEngine/Include/Common/ThingFactory.h b/Generals/Code/GameEngine/Include/Common/ThingFactory.h
index cb9f2c2fac9..c9469239c2f 100644
--- a/Generals/Code/GameEngine/Include/Common/ThingFactory.h
+++ b/Generals/Code/GameEngine/Include/Common/ThingFactory.h
@@ -24,14 +24,11 @@
 
 // FILE: ThingFactory.h ///////////////////////////////////////////////////////////////////////////
 // Created: Colin Day, April 2001
-// Desc:		This is how we go and make our things, we make our things, we make our things!	
+// Desc:		This is how we go and make our things, we make our things, we make our things!
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __THINGFACTORY_H_
-#define __THINGFACTORY_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
 
@@ -69,30 +66,30 @@ class ThingFactory : public SubsystemInterface
 	/// create a new template with name 'name' and add to template list
 	ThingTemplate *newTemplate( const AsciiString& name );
 
-	// get the first template in our list 
+	// get the first template in our list
 	const ThingTemplate *firstTemplate( void ) { return m_firstTemplate; }
 
-	/** 
+	/**
 		get a template given template database name. return null if not found.
 		note, this is now substantially faster (does a hash-table lookup)
 	*/
-	const ThingTemplate *findTemplate( const AsciiString& name ) { return findTemplateInternal(name); }
+	const ThingTemplate *findTemplate( const AsciiString& name, Bool check = TRUE ) { return findTemplateInternal( name, check ); }
 
-	/** 
+	/**
 		get a template given ID. return null if not found.
 		note, this is not particularly fast (does a linear search).
 	*/
 	const ThingTemplate *findByTemplateID( UnsignedShort id );
 
-	/** request a new object using the given template. 
+	/** request a new object using the given template.
 		this will throw an exception on failure; it will never return null.
 	*/
 	Object *newObject( const ThingTemplate *tmplate, Team *team, ObjectStatusMaskType statusMask = OBJECT_STATUS_MASK_NONE );
 
-	/** request a new drawable using the given template. 
+	/** request a new drawable using the given template.
 		this will throw an exception on failure; it will never return null.
 	*/
-	Drawable *newDrawable(const ThingTemplate *tmplate, DrawableStatus statusBits = DRAWABLE_STATUS_NONE );
+	Drawable *newDrawable(const ThingTemplate *tmplate, DrawableStatusBits statusBits = DRAWABLE_STATUS_DEFAULT );
 
 	static void parseObjectDefinition( INI* ini, const AsciiString& name, const AsciiString& reskinFrom );
 
@@ -103,9 +100,9 @@ class ThingFactory : public SubsystemInterface
 
 	void addTemplate( ThingTemplate *thing );		///< add the template to the DB
 
-	/** 
+	/**
 		create a new template with name 'name', do *NOT* add to template, but instead
-		add as m_override of template 'template' 
+		add as m_override of template 'template'
 
 		Note, this is private, and should always remain so. It should never, ever, ever
 		be called outside of ini parsing code, because if you do, you will tempted to make
@@ -115,26 +112,22 @@ class ThingFactory : public SubsystemInterface
 	ThingTemplate* newOverride( ThingTemplate *thingTemplate );
 
 
-	/** 
+	/**
 		This now does a search through the hashmap, and returns the associated thing template
 		This should speed up load times dramatically, as we've been wasting lots of time in this
 		O(N^2) insertion.
-	
+
 		NOTE: this is protected since it returns a NON-CONST template, and
 		folks outside of the template system itself shouldn't get access...
 	*/
-	ThingTemplate *findTemplateInternal( const AsciiString& name );
+	ThingTemplate *findTemplateInternal( const AsciiString& name, Bool check = TRUE );
 
 	ThingTemplate					*m_firstTemplate;			///< head of linked list
-	UnsignedShort					m_nextTemplateID;			///< next available ID for templates 
+	UnsignedShort					m_nextTemplateID;			///< next available ID for templates
 
 	ThingTemplateHashMap	m_templateHashMap;		///< all thing templates, for fast lookup.
-		
+
 };
 
 // EXTERN /////////////////////////////////////////////////////////////////////////////////////////
 extern ThingFactory *TheThingFactory;  ///< the template singleton
-
-
-#endif // __THINGFACTORY_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/ThingSort.h b/Generals/Code/GameEngine/Include/Common/ThingSort.h
index 3820bcf5d5c..e35702922c8 100644
--- a/Generals/Code/GameEngine/Include/Common/ThingSort.h
+++ b/Generals/Code/GameEngine/Include/Common/ThingSort.h
@@ -29,15 +29,12 @@
 
 #pragma once
 
-#ifndef __THINGSORT_H_
-#define __THINGSORT_H_
+#include "GameCommon.h"
 
 //-------------------------------------------------------------------------------------------------
 enum EditorSortingType CPP_11(: Int)
 {
-	ES_FIRST = 0,
-
-	ES_NONE = ES_FIRST,
+	ES_NONE,
 	ES_STRUCTURE,
 	ES_INFANTRY,
 	ES_VEHICLE,
@@ -52,11 +49,12 @@ enum EditorSortingType CPP_11(: Int)
 	ES_ROAD,						// road objects...should never actually be in the object panel.
 	ES_WAYPOINT,					// waypoint objects...should never actually be in the object panel.
 
-	ES_NUM_SORTING_TYPES      // keep this last
-
+	ES_NUM_SORTING_TYPES,
+	ES_FIRST = 0,
 };
+
 #ifdef DEFINE_EDITOR_SORTING_NAMES
-static const char *EditorSortingNames[] = 
+static const char *const EditorSortingNames[] =
 {
 	"NONE",
 	"STRUCTURE",
@@ -75,7 +73,5 @@ static const char *EditorSortingNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(EditorSortingNames) == ES_NUM_SORTING_TYPES + 1, "Incorrect array size");
 #endif
-
-#endif // __THINGSORT_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/ThingTemplate.h b/Generals/Code/GameEngine/Include/Common/ThingTemplate.h
index 38c88874d7d..f01dc7038ea 100644
--- a/Generals/Code/GameEngine/Include/Common/ThingTemplate.h
+++ b/Generals/Code/GameEngine/Include/Common/ThingTemplate.h
@@ -25,16 +25,13 @@
 // FILE: ThingTemplate.h //////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, April 2001
 // Desc:	 Thing templates are a 'roadmap' to creating things
-///////////////////////////////////////////////////////////////////////////////////////////////////	
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __THINGTEMPLATE_H_
-#define __THINGTEMPLATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
- 
+
 #include "Common/AudioEventRTS.h"
 #include "Common/FileSystem.h"
 #include "Common/GameCommon.h"
@@ -82,7 +79,7 @@ typedef std::map<AsciiString, const FXList*> PerUnitFXMap;
 //	INV_IMAGE_HILITE,
 //	INV_IMAGE_PUSHED,
 //
-//	INV_IMAGE_NUM_IMAGES  // keep this last
+//	INV_IMAGE_NUM_IMAGES
 //
 //};
 //-------------------------------------------------------------------------------------------------
@@ -131,7 +128,7 @@ enum ThingTemplateAudioType CPP_11(: Int)
 	TTAUDIO_soundPromotedElite,				///< Sound when unit gets promoted to Elite level
 	TTAUDIO_soundPromotedHero,				///< Sound when unit gets promoted to Hero level
 	TTAUDIO_voiceGarrison,						///< Unit is ordered to enter a garrisonable building
-	TTAUDIO_soundFalling,							///< This sound is actually called on a unit when it is exiting another. 
+	TTAUDIO_soundFalling,							///< This sound is actually called on a unit when it is exiting another.
 																		///< However, there is a soundExit which refers to the container, and this is only used for bombs falling from planes.
 #ifdef ALLOW_SURRENDER
 	TTAUDIO_voiceSurrender,						///< Unit surrenders
@@ -141,7 +138,7 @@ enum ThingTemplateAudioType CPP_11(: Int)
 	TTAUDIO_voiceAttackAir,						///< Unit is ordered to attack an airborne unit
 	TTAUDIO_voiceGuard,								///< Unit is ordered to guard an area
 
-	TTAUDIO_COUNT   // keep last!
+	TTAUDIO_COUNT
 };
 
 class AudioArray
@@ -158,8 +155,7 @@ class AudioArray
 	~AudioArray()
 	{
 		for (Int i = 0; i < TTAUDIO_COUNT; ++i)
-			if (m_audio[i])
-				deleteInstance(m_audio[i]);
+			deleteInstance(m_audio[i]);
 	}
 
 	AudioArray(const AudioArray& that)
@@ -205,10 +201,10 @@ enum BuildCompletionType CPP_11(: Int)
 	BC_APPEARS_AT_RALLY_POINT,	///< unit appears at rally point of its #1 prereq
 	BC_PLACED_BY_PLAYER,				///< unit must be manually placed by player
 
-	BC_NUM_TYPES								// leave this last
+	BC_NUM_TYPES
 };
 #ifdef DEFINE_BUILD_COMPLETION_NAMES
-static const char *BuildCompletionNames[] = 
+static const char *const BuildCompletionNames[] =
 {
 	"INVALID",
 	"APPEARS_AT_RALLY_POINT",
@@ -216,6 +212,7 @@ static const char *BuildCompletionNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(BuildCompletionNames) == BC_NUM_TYPES + 1, "Incorrect array size");
 #endif  // end DEFINE_BUILD_COMPLETION_NAMES
 
 enum BuildableStatus CPP_11(: Int)
@@ -226,11 +223,11 @@ enum BuildableStatus CPP_11(: Int)
 	BSTATUS_NO,
 	BSTATUS_ONLY_BY_AI,
 
-	BSTATUS_NUM_TYPES	// leave this last
+	BSTATUS_NUM_TYPES
 };
 
 #ifdef DEFINE_BUILDABLE_STATUS_NAMES
-static const char *BuildableStatusNames[] = 
+static const char *const BuildableStatusNames[] =
 {
 	"Yes",
 	"Ignore_Prerequisites",
@@ -238,6 +235,7 @@ static const char *BuildableStatusNames[] =
 	"Only_By_AI",
 	NULL
 };
+static_assert(ARRAY_SIZE(BuildableStatusNames) == BSTATUS_NUM_TYPES + 1, "Incorrect array size");
 #endif	// end DEFINE_BUILDABLE_STATUS_NAMES
 
 //-------------------------------------------------------------------------------------------------
@@ -261,14 +259,14 @@ class ModuleInfo
 		Bool copiedFromDefault;
 		Bool inheritable;
 
-		Nugget(const AsciiString& n, const AsciiString& moduleTag, const ModuleData* d, Int i, Bool inh) 
-		: first(n), 
-			m_moduleTag(moduleTag), 
-			second(d), 
-			interfaceMask(i), 
-			copiedFromDefault(false), 
+		Nugget(const AsciiString& n, const AsciiString& moduleTag, const ModuleData* d, Int i, Bool inh)
+		: first(n),
+			m_moduleTag(moduleTag),
+			second(d),
+			interfaceMask(i),
+			copiedFromDefault(false),
 			inheritable(inh)
-		{ 
+		{
 		}
 
 	};
@@ -281,12 +279,12 @@ class ModuleInfo
 	void addModuleInfo(ThingTemplate *thingTemplate, const AsciiString& name, const AsciiString& moduleTag, const ModuleData* data, Int interfaceMask, Bool inheritable);
 	const ModuleInfo::Nugget *getNuggetWithTag( const AsciiString& tag ) const;
 
-	Int getCount() const 
-	{ 
-		return m_info.size(); 
+	Int getCount() const
+	{
+		return m_info.size();
 	}
-	
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 	Bool containsPartialName(const char* n) const
 	{
 		for (size_t i = 0; i < m_info.size(); i++)
@@ -326,9 +324,9 @@ class ModuleInfo
 	// for use only by ThingTemplate::friend_getAIModuleInfo
 	ModuleData* friend_getNthData(Int i);
 
-	void clear() 
-	{ 
-		m_info.clear(); 
+	void clear()
+	{
+		m_info.clear();
 	}
 
 	void setCopiedFromDefault(Bool v)
@@ -348,14 +346,14 @@ class ModuleInfo
 class ThingTemplate : public Overridable
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ThingTemplate, "ThingTemplatePool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ThingTemplate, "ThingTemplatePool" )
 
 private:
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
-	ThingTemplate(const ThingTemplate& that) : m_geometryInfo(that.m_geometryInfo) 
-	{ 
-		DEBUG_CRASH(("This should never be called\n")); 
+	ThingTemplate(const ThingTemplate& that) : m_geometryInfo(that.m_geometryInfo)
+	{
+		DEBUG_CRASH(("This should never be called"));
 	}
 #else
 	ThingTemplate(const ThingTemplate& that) = delete;
@@ -365,7 +363,7 @@ class ThingTemplate : public Overridable
 
 
 	ThingTemplate();
-	
+
 	// copy the guts of that into this, but preserve this' name, id, and list-links.
 	void copyFrom(const ThingTemplate* that);
 
@@ -377,10 +375,10 @@ class ThingTemplate : public Overridable
 	inline AsciiString getLTAName() const { return m_LTAName; }
 #endif
 
-	/** 
+	/**
 		return a unique identifier suitable for identifying this ThingTemplate on machines playing
 		across the net. this should be considered a Magic Cookie and used only for net traffic or
-		similar sorts of things. To convert an id back to a ThingTemplate, use ThingFactory::findByID(). 
+		similar sorts of things. To convert an id back to a ThingTemplate, use ThingFactory::findByID().
 		Note that 0 is always an invalid id.  NOTE that we are not referencing m_override here
 		because even though we actually have multiple templates here representing overrides,
 		we still only conceptually have one template and want to always use one single
@@ -393,29 +391,29 @@ class ThingTemplate : public Overridable
 	// note that m_override is not used here, see getTemplateID(), for it is the same reasons
 	const AsciiString& getName() const { return m_nameString; }  ///< return the name of this template
 
-	/// get the display color (used for the editor)	
+	/// get the display color (used for the editor)
 	Color getDisplayColor() const { return m_displayColor; }
 
-	/// get the editor sorting 
+	/// get the editor sorting
 	EditorSortingType getEditorSorting() const { return (EditorSortingType)m_editorSorting; }
 
 	/// return true iff the template has the specified kindOf flag set.
-	inline Bool isKindOf(KindOfType t) const 
-	{ 
-		return TEST_KINDOFMASK(m_kindof, t); 
+	Bool isKindOf(KindOfType t) const
+	{
+		return TEST_KINDOFMASK(m_kindof, t);
 	}
 
 	/// convenience for doing multiple kindof testing at once.
-	inline Bool isKindOfMulti(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) const 
-	{ 		
+	Bool isKindOfMulti(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) const
+	{
 		return TEST_KINDOFMASK_MULTI(m_kindof, mustBeSet, mustBeClear);
 	}
 
-	inline Bool isAnyKindOf( const KindOfMaskType& anyKindOf ) const
+	Bool isAnyKindOf( const KindOfMaskType& anyKindOf ) const
 	{
 		return TEST_KINDOFMASK_ANY(m_kindof, anyKindOf);
 	}
-	
+
 	/// set the display name
 	const UnicodeString& getDisplayName() const { return m_displayName; }  ///< return display name
 
@@ -429,11 +427,12 @@ class ThingTemplate : public Overridable
 	Real getFenceXOffset() const { return m_fenceXOffset; }  // return fence offset
 
 	Bool isBridge() const { return m_isBridge; }  // return fence offset
+	Bool isBridgeLike() const { return isBridge() || isKindOf(KINDOF_WALK_ON_TOP_OF_WALL); }
 
 	// Only Object can ask this.  Everyone else should ask the Object.  In fact, you really should ask the Object everything.
 	Real friend_getVisionRange() const { return m_visionRange; }  ///< get vision range
 	Real friend_getShroudClearingRange() const { return m_shroudClearingRange; }  ///< get vision range for Shroud ONLY (Design requested split)
-	
+
 	// This function is only for use by the AIUpdateModuleData::parseLocomotorSet function.
 	AIUpdateModuleData *friend_getAIModuleInfo(void);
 
@@ -445,7 +444,7 @@ class ThingTemplate : public Overridable
 
 	const AsciiString& getShadowTextureName( void ) const { return m_shadowTextureName; }
 	UnsignedInt getOcclusionDelay(void) const { return m_occlusionDelay;}
-	
+
 	const ModuleInfo& getBehaviorModuleInfo() const { return m_behaviorModuleInfo; }
 	const ModuleInfo& getDrawModuleInfo() const { return m_drawModuleInfo; }
 	const ModuleInfo& getClientUpdateModuleInfo() const { return m_clientUpdateModuleInfo; }
@@ -515,7 +514,7 @@ class ThingTemplate : public Overridable
 	void validate();
 
 // The version that does not take an Object argument is labeled friend for use by WorldBuilder.  All game requests
-// for CommandSet must use Object::getCommandSetString, as we have two different sources for dynamic answers. 
+// for CommandSet must use Object::getCommandSetString, as we have two different sources for dynamic answers.
 	const AsciiString& friend_getCommandSetString() const { return m_commandSetString; }
 
 	const std::vector<AsciiString>& getBuildVariations() const { return m_buildVariations; }
@@ -535,30 +534,30 @@ class ThingTemplate : public Overridable
 	// these are intended ONLY for the private use of ThingFactory and do not use
 	// the m_override pointer, it deals only with templates at the "top" level
 	//
-	inline void friend_setTemplateName( const AsciiString& name ) { m_nameString = name; }
-	inline ThingTemplate *friend_getNextTemplate() const { return m_nextThingTemplate; }
-	inline void friend_setNextTemplate(ThingTemplate *tmplate) { m_nextThingTemplate = tmplate; }
-	inline void friend_setTemplateID(UnsignedShort id) { m_templateID = id; }
+	void friend_setTemplateName( const AsciiString& name ) { m_nameString = name; }
+	ThingTemplate *friend_getNextTemplate() const { return m_nextThingTemplate; }
+	void friend_setNextTemplate(ThingTemplate *tmplate) { m_nextThingTemplate = tmplate; }
+	void friend_setTemplateID(UnsignedShort id) { m_templateID = id; }
 
 	Int getEnergyProduction() const { return m_energyProduction; }
 	Int getEnergyBonus() const { return m_energyBonus; }
 
-	// these are NOT publicly available; you should call calcCostToBuild() or calcTimeToBuild() 
+	// these are NOT publicly available; you should call calcCostToBuild() or calcTimeToBuild()
 	// instead, because they will take player handicaps into account.
 	// Int getBuildCost() const { return m_buildCost; }
-	
+
 	Int getRefundValue() const { return m_refundValue; }
 
 	BuildCompletionType getBuildCompletion() const { return (BuildCompletionType)m_buildCompletion; }
 
 	BuildableStatus getBuildable() const;
-	
+
 	Int getPrereqCount() const { return m_prereqInfo.size(); }
 	const ProductionPrerequisite *getNthPrereq(Int i) const { return &m_prereqInfo[i]; }
 
-	/** 
-		return the BuildFacilityTemplate, if any. 
-		
+	/**
+		return the BuildFacilityTemplate, if any.
+
 		if this template needs no build facility, null is returned.
 
 		if the template needs a build facility but the given player doesn't have any in existence,
@@ -608,13 +607,13 @@ class ThingTemplate : public Overridable
 
 	UnsignedByte getCrushableLevel() const { return m_crushableLevel; }
 	UnsignedByte getCrusherLevel() const { return m_crusherLevel; }
-	
+
 	AsciiString getUpgradeCameoName( Int n)const{ return m_upgradeCameoUpgradeNames[n];	}
 
 protected:
 
 	//
-	// these are NOT publicly available; you should call calcCostToBuild() or calcTimeToBuild() 
+	// these are NOT publicly available; you should call calcCostToBuild() or calcTimeToBuild()
 	// instead, because they will take player handicaps into account.
 	//
 	Int getBuildCost() const { return m_buildCost; }
@@ -638,8 +637,8 @@ class ThingTemplate : public Overridable
 
 	static void parseAddModule(INI *ini, void *instance, void *store, const void *userData);
 	static void parseRemoveModule(INI *ini, void *instance, void *store, const void *userData);
-	static void parseReplaceModule(INI *ini, void *instance, void *store, const void *userData);	
-	static void parseInheritableModule(INI *ini, void *instance, void *store, const void *userData);	
+	static void parseReplaceModule(INI *ini, void *instance, void *store, const void *userData);
+	static void parseInheritableModule(INI *ini, void *instance, void *store, const void *userData);
 
 	Bool removeModuleInfo(const AsciiString& moduleToRemove, AsciiString& clearedModuleNameOut);
 
@@ -677,10 +676,15 @@ class ThingTemplate : public Overridable
 	Int											m_skillPointValues[LEVEL_COUNT];
 	Int											m_experienceValues[LEVEL_COUNT];		///< How much I am worth at each experience level
 	Int											m_experienceRequired[LEVEL_COUNT];	///< How many experience points I need for each level
-	
+
 	//Code renderer handles these states now.
 	//AsciiString							m_inventoryImage[ INV_IMAGE_NUM_IMAGES ];  ///< portrait inventory pictures
 
+	// TheSuperHackers @bugfix Caball009/xezon 06/07/2025 No longer copy SparseMatchFinder to prevent copied instances linking to unrelated data.
+	// This avoids mismatching in certain maps, for example those that spawn units with veterancy.
+	typedef SparseMatchFinder<WeaponTemplateSet, WeaponSetFlags, SparseMatchFinderFlags_NoCopy> WeaponTemplateSetFinder;
+	typedef SparseMatchFinder<ArmorTemplateSet, ArmorSetFlags, SparseMatchFinderFlags_NoCopy> ArmorTemplateSetFinder;
+
 	// ---- STL-sized things
 	std::vector<ProductionPrerequisite>	m_prereqInfo;				///< the unit Prereqs for this tech
 	std::vector<AsciiString>						m_buildVariations;	/**< if we build a unit of this type via script or ui, randomly choose one
@@ -696,7 +700,7 @@ class ThingTemplate : public Overridable
 	ThingTemplate*				m_nextThingTemplate;
 	const ThingTemplate*	m_reskinnedFrom;									///< non NULL if we were generated via a reskin
 	const Image *					m_selectedPortraitImage;		/// portrait image when selected (to display in GUI)
-	const Image	*					m_buttonImage;			
+	const Image	*					m_buttonImage;
 
 	// ---- Real-sized things
 	Real					m_fenceWidth;								///< Fence width for fence type objects.
@@ -708,7 +712,7 @@ class ThingTemplate : public Overridable
 	Real					m_factoryExtraBibWidth;					///< when placing buildings this will be the width of the reserved exit area on the right side.
 	Real					m_buildTime;									///< Seconds to build
 	Real					m_assetScale;
-	Real					m_instanceScaleFuzziness; ///< scale randomization tolerance to init for each Drawable instance, 
+	Real					m_instanceScaleFuzziness; ///< scale randomization tolerance to init for each Drawable instance,
 	Real					m_shadowSizeX;				///< world-space extent of decal shadow texture
 	Real					m_shadowSizeY;				///< world-space extent of decal shadow texture
 	Real					m_shadowOffsetX;			///< world-space offset of decal shadow texture
@@ -752,12 +756,9 @@ class ThingTemplate : public Overridable
 };
 
 //-----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//           Externals                                                     
+//           Externals
 //-----------------------------------------------------------------------------
-
-#endif // __THINGTEMPLATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/Common/TunnelTracker.h b/Generals/Code/GameEngine/Include/Common/TunnelTracker.h
index 5f708c5a860..eddc5b3c104 100644
--- a/Generals/Code/GameEngine/Include/Common/TunnelTracker.h
+++ b/Generals/Code/GameEngine/Include/Common/TunnelTracker.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef TUNNEL_TRACKER_H
-#define TUNNEL_TRACKER_H
-
 #include "Common/GameType.h"
 #include "Common/GameMemory.h"
 #include "Common/Snapshot.h"
@@ -48,7 +45,8 @@ class TunnelTracker : public MemoryPoolObject,
 	void iterateContained( ContainIterateFunc func, void *userData, Bool reverse );
 	UnsignedInt getContainCount() const { return m_containListSize; }
 	Int getContainMax() const;
-	const ContainedItemsList* getContainedItemsList() const { return &m_containList; }	
+	const ContainedItemsList* getContainedItemsList() const { return &m_containList; }
+	void swapContainedItemsList(ContainedItemsList& newList);
 
 	Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const;
 	void addToContainList( Object *obj );				///< add 'obj' to contain list
@@ -61,8 +59,12 @@ class TunnelTracker : public MemoryPoolObject,
 	static void destroyObject( Object *obj, void *userData ); ///< Callback for Iterate Contained system
 	static void healObject( Object *obj, void *frames ); ///< Callback for Iterate Contained system
 
+#if PRESERVE_RETAIL_BEHAVIOR || RETAIL_COMPATIBLE_CRC
 	void healObjects(Real frames);	///< heal all objects within the tunnel
-	
+#else
+	void healObjects();	///< heal all objects within the tunnel
+#endif
+
 	UnsignedInt friend_getTunnelCount() const {return m_tunnelCount;}///< TunnelContains are allowed to ask if they are the last one ahead of deletion time
 
 	const std::list< ObjectID > *getContainerList() const {return &m_tunnelIDs;}
@@ -77,15 +79,16 @@ class TunnelTracker : public MemoryPoolObject,
 	virtual void loadPostProcess( void );
 
 private:
-	
+	void updateFullHealTime();
+
 	std::list< ObjectID > m_tunnelIDs;			///< I have to try to keep track of these because Caves need to iterate on them.
 	ContainedItemsList m_containList;				///< the contained object pointers list
 	std::list< ObjectID > m_xferContainList;///< for loading of m_containList during post processing
 	Int m_containListSize;									///< size of the contain list
 	UnsignedInt m_tunnelCount;							///< How many tunnels have registered so we know when we should kill our contain list
+	UnsignedInt m_framesForFullHeal;				///< How many frames it takes to fully heal a unit
+	Bool m_needsFullHealTimeUpdate;					///< Set to true when needing to recalc full heal time to batch the operation
 
 	ObjectID		m_curNemesisID;							///< If we have team(s) guarding a tunnel network system, this is one of the current targets.
 	UnsignedInt m_nemesisTimestamp;					///< We only keep nemesis for a couple of seconds.
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/Common/UnicodeString.h b/Generals/Code/GameEngine/Include/Common/UnicodeString.h
deleted file mode 100644
index 5f15a0e046d..00000000000
--- a/Generals/Code/GameEngine/Include/Common/UnicodeString.h
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: UnicodeString.h 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  UnicodeString.h
-//
-// Created:    Steven Johnson, October 2001
-//
-// Desc:       General-purpose string classes
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef UNICODESTRING_H
-#define UNICODESTRING_H
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include "Lib/BaseType.h"
-#include "Common/Debug.h"
-#include "Common/Errors.h"
-
-class AsciiString;
-
-// -----------------------------------------------------
-/**
-	UnicodeString is the fundamental double-byte string type used in the Generals
-	code base, and should be preferred over all other string constructions
-	(e.g., array of WideChar, STL string<>, WWVegas StringClass, etc.)
-
-	Of course, other string setups may be used when necessary or appropriate!
-
-	UnicodeString is modeled after the MFC CString class, with some minor
-	syntactic differences to keep in line with our coding conventions.
-
-	Basically, UnicodeString allows you to treat a string as an intrinsic
-	type, rather analogous to 'int' -- when passed by value, a new string
-	is created, and modifying the new string doesn't modify the original.
-	This is done fairly efficiently, so that no new memory allocation is done
-	unless the string is actually modified. 
-
-	Naturally, UnicodeString handles all memory issues, so there's no need
-	to do anything to free memory... just allow the UnicodeString's
-	destructor to run.
-
-	UnicodeStrings are suitable for use as automatic, member, or static variables.
-*/
-
-class UnicodeString
-{
-private:
-	
-	// Note, this is a Plain Old Data Structure... don't
-	// add a ctor/dtor, 'cuz they won't ever be called.
-	struct UnicodeStringData
-	{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		const WideChar* m_debugptr;	// just makes it easier to read in the debugger
-#endif
-		unsigned short	m_refCount;						// reference count
-		unsigned short	m_numCharsAllocated;  // length of data allocated
-		// WideChar m_stringdata[];
-
-		inline WideChar* peek() { return (WideChar*)(this+1); }
-	};
-
-	#ifdef RTS_DEBUG
-	void validate() const;
-	#else
-	inline void validate() const { }
-	#endif
-
-protected:
-	UnicodeStringData* m_data;   // pointer to ref counted string data
-
-	WideChar* peek() const;
-	void releaseBuffer();
-	void ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData, const WideChar* strToCpy, const WideChar* strToCat);
-
-public:
-
-	enum 
-	{ 
-		MAX_FORMAT_BUF_LEN = 2048,		///< max total len of string created by format/format_va
-		MAX_LEN = 32767							///< max total len of any UnicodeString, in chars
-	};
-
-
-	/**
-		This is a convenient global used to indicate the empty
-		string, so we don't need to construct temporaries
-		for such a common thing.
-	*/
-	static UnicodeString TheEmptyString;
-
-	/**
-		Default constructor -- construct a new, empty UnicodeString.
-	*/
-	UnicodeString();
-	/**
-		Copy constructor -- make this UnicodeString identical to the
-		other UnicodeString. (This is actually quite efficient, because
-		they will simply share the same string and increment the
-		refcount.)
-	*/
-	UnicodeString(const UnicodeString& stringSrc);
-	/**
-		Constructor -- from a literal string. Constructs an UnicodeString
-		with the given string. Note that a copy of the string is made;
-		the input ptr is not saved. Note also that this is declared
-		'explicit' to avoid implicit conversions from const-WideChar-*
-		(e.g., as input arguments).
-	*/
-	explicit UnicodeString(const WideChar* s);
-
-	/**
-		Destructor. Not too exciting... clean up the works and such.
-	*/
-	~UnicodeString();
-
-	/**
-		Return the length, in characters (not bytes!), of the string.
-	*/
-	int getLength() const;
-	/**
-		Return true iff the length of the string is zero. Equivalent
-		to (getLength() == 0) but slightly more efficient.
-	*/
-	Bool isEmpty() const;
-	/**
-		Make the string empty. Equivalent to (str = "") but slightly more efficient.
-	*/
-	void clear();
-
-	/**
-		Return the character and the given (zero-based) index into the string.
-		No range checking is done (except in debug mode).
-	*/
-	WideChar getCharAt(int index) const;
-	/**
-		Return a pointer to the (null-terminated) string. Note that this is 
-		a const pointer: do NOT change this! It is imperative that it be 
-		impossible (or at least, really difficuly) for someone to change our
-		private data, since it might be shared amongst other UnicodeStrings.
-	*/
-	const WideChar* str() const;
-
-	/**
-		Makes sure there is room for a string of len+1 characters, and
-		returns a pointer to the string buffer.  This ensures that the
-		string buffer is NOT shared.  This is intended for the file reader, 
-		that is reading new strings in from a file. jba.
-	*/
-	WideChar* getBufferForRead(Int len);
-
-	/**
-		Replace the contents of self with the given string.
-		(This is actually quite efficient, because
-		they will simply share the same string and increment the
-		refcount.)
-	*/
-	void set(const UnicodeString& stringSrc);
-	/**
-		Replace the contents of self with the given string.
-		Note that a copy of the string is made; the input ptr is not saved.
-	*/
-	void set(const WideChar* s);
-
-	/**
-		replace contents of self with the given string. Note the
-		nomenclature is translate rather than set; this is because
-		not all single-byte strings translate one-for-one into
-		UnicodeStrings, so some data manipulation may be necessary,
-		and the resulting strings may not be equivalent.
-	*/
-	void translate(const AsciiString& stringSrc);
-
-	/**
-		Concatenate the given string onto self.
-	*/
-	void concat(const UnicodeString& stringSrc);
-	/**
-		Concatenate the given string onto self.
-	*/
-	void concat(const WideChar* s);
-	/**
-		Concatenate the given character onto self.
-	*/
-	void concat(const WideChar c);
-
-	/**
-	  Remove leading and trailing whitespace from the string.
-	*/
-	void trim( void );
-
-	/**
-		Remove the final character in the string. If the string is empty,
-		do nothing. (This is a rather dorky method, but used a lot in 
-		text editing, thus its presence here.)
-	*/
-	void removeLastChar();
-
-	/**
-		Analogous to sprintf() -- this formats a string according to the
-		given sprintf-style format string (and the variable argument list)
-		and stores the result in self.
-	*/
-	void format(UnicodeString format, ...);
-	void format(const WideChar* format, ...);
-	/**
-		Identical to format(), but takes a va_list rather than
-		a variable argument list. (i.e., analogous to vsprintf.)
-	*/
-	void format_va(const UnicodeString& format, va_list args);
-	void format_va(const WideChar* format, va_list args);
-
-	/**
-		Conceptually identical to wsccmp().
-	*/
-	int compare(const UnicodeString& stringSrc) const;
-	/**
-		Conceptually identical to wsccmp().
-	*/
-	int compare(const WideChar* s) const;
-	/**
-		Conceptually identical to _wcsicmp().
-	*/
-	int compareNoCase(const UnicodeString& stringSrc) const;
-	/**
-		Conceptually identical to _wcsicmp().
-	*/
-	int compareNoCase(const WideChar* s) const;
-
-	/**
-		conceptually similar to strtok():
-
-		extract the next whitespace-delimited token from the front
-		of 'this' and copy it into 'token', returning true if a nonempty
-		token was found. (note that this modifies 'this' as well, stripping
-		the token off!)
-	*/
-	Bool nextToken(UnicodeString* token, UnicodeString delimiters = UnicodeString::TheEmptyString);
-
-//
-// You might think it would be a good idea to overload the * operator
-// to allow for an implicit conversion to an WideChar*. This is
-// in theory a good idea, but in practice, there's lots of code
-// that assumes it should check text fields for null, which
-// is meaningless for us, since we never return a null ptr.
-//
-//	operator const WideChar*() const { return str(); }
-//
-
-	UnicodeString& operator=(const UnicodeString& stringSrc);	///< the same as set()
-	UnicodeString& operator=(const WideChar* s);				///< the same as set()
-};
-
-
-// -----------------------------------------------------
-inline WideChar* UnicodeString::peek() const
-{
-	DEBUG_ASSERTCRASH(m_data, ("null string ptr"));
-	validate();
-	return m_data->peek();
-}
-
-// -----------------------------------------------------
-inline UnicodeString::UnicodeString() : m_data(0)
-{
-	validate();
-}
-
-// -----------------------------------------------------
-inline UnicodeString::~UnicodeString()
-{
-	validate();
-	releaseBuffer();
-}
-
-// -----------------------------------------------------
-inline int UnicodeString::getLength() const
-{
-	validate();
-	return m_data ? wcslen(peek()) : 0;
-}
-
-// -----------------------------------------------------
-inline Bool UnicodeString::isEmpty() const
-{
-	validate();
-	return m_data == NULL || peek()[0] == 0;
-}
-
-// -----------------------------------------------------
-inline void UnicodeString::clear()
-{
-	validate();
-	releaseBuffer();
-	validate();
-}
-
-// -----------------------------------------------------
-inline WideChar UnicodeString::getCharAt(int index) const
-{
-	DEBUG_ASSERTCRASH(index >= 0 && index < getLength(), ("bad index in getCharAt"));
-	validate();
-	return m_data ? peek()[index] : 0;
-}
-
-// -----------------------------------------------------
-inline const WideChar* UnicodeString::str() const
-{
-	validate();
-	static const WideChar TheNullChr = 0;
-	return m_data ? peek() : &TheNullChr;
-}
-
-// -----------------------------------------------------
-inline UnicodeString& UnicodeString::operator=(const UnicodeString& stringSrc)
-{
-	validate();
-	set(stringSrc);
-	validate();
-	return *this;
-}
-
-// -----------------------------------------------------
-inline UnicodeString& UnicodeString::operator=(const WideChar* s)
-{
-	validate();
-	set(s);
-	validate();
-	return *this;
-}
-
-// -----------------------------------------------------
-inline void UnicodeString::concat(const UnicodeString& stringSrc)
-{
-	validate();
-	concat(stringSrc.str());
-	validate();
-}
-
-// -----------------------------------------------------
-inline void UnicodeString::concat(const WideChar c)
-{
-	validate();
-	/// this can probably be made more efficient, if necessary
-	WideChar tmp[2] = { c, 0 };
-	concat(tmp);
-	validate();
-}
-
-// -----------------------------------------------------
-inline int UnicodeString::compare(const UnicodeString& stringSrc) const
-{
-	validate();
-	return wcscmp(this->str(), stringSrc.str());
-}
-
-// -----------------------------------------------------
-inline int UnicodeString::compare(const WideChar* s) const
-{
-	validate();
-	return wcscmp(this->str(), s);
-}
-
-// -----------------------------------------------------
-inline int UnicodeString::compareNoCase(const UnicodeString& stringSrc) const
-{
-	validate();
-	return _wcsicmp(this->str(), stringSrc.str());
-}
-
-// -----------------------------------------------------
-inline int UnicodeString::compareNoCase(const WideChar* s) const
-{
-	validate();
-	return _wcsicmp(this->str(), s);
-}
-
-// -----------------------------------------------------
-inline Bool operator==(const UnicodeString& s1, const UnicodeString& s2)
-{
-	return wcscmp(s1.str(), s2.str()) == 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator!=(const UnicodeString& s1, const UnicodeString& s2)
-{
-	return wcscmp(s1.str(), s2.str()) != 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator<(const UnicodeString& s1, const UnicodeString& s2)
-{
-	return wcscmp(s1.str(), s2.str()) < 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator<=(const UnicodeString& s1, const UnicodeString& s2)
-{
-	return wcscmp(s1.str(), s2.str()) <= 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator>(const UnicodeString& s1, const UnicodeString& s2)
-{
-	return wcscmp(s1.str(), s2.str()) > 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator>=(const UnicodeString& s1, const UnicodeString& s2)
-{
-	return wcscmp(s1.str(), s2.str()) >= 0;
-}
-
-#endif // UNICODESTRING_H
diff --git a/Generals/Code/GameEngine/Include/Common/UnitTimings.h b/Generals/Code/GameEngine/Include/Common/UnitTimings.h
index 01d2218bd06..2aef897e2ff 100644
--- a/Generals/Code/GameEngine/Include/Common/UnitTimings.h
+++ b/Generals/Code/GameEngine/Include/Common/UnitTimings.h
@@ -29,11 +29,4 @@
 
 #pragma once
 
-#ifndef __UNITTIMINGS_H_
-#define __UNITTIMINGS_H_
-
-
 #define dontDO_UNIT_TIMINGS
-
-#endif 
-
diff --git a/Generals/Code/GameEngine/Include/Common/Upgrade.h b/Generals/Code/GameEngine/Include/Common/Upgrade.h
index de8e000f228..9f587e36bc7 100644
--- a/Generals/Code/GameEngine/Include/Common/Upgrade.h
+++ b/Generals/Code/GameEngine/Include/Common/Upgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __UPGRADE_H_
-#define __UPGRADE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/INI.h"
@@ -53,7 +50,7 @@ enum UpgradeStatusType CPP_11(: Int)
 	UPGRADE_STATUS_COMPLETE
 };
 
-//The maximum number of upgrades. 
+//The maximum number of upgrades.
 #define UPGRADE_MAX_COUNT 64
 
 typedef BitFlags<UPGRADE_MAX_COUNT>	UpgradeMaskType;
@@ -64,13 +61,13 @@ typedef BitFlags<UPGRADE_MAX_COUNT>	UpgradeMaskType;
 #define MAKE_UPGRADE_MASK4(k,a,b,c) UpgradeMaskType(UpgradeMaskType::kInit, (k), (a), (b), (c))
 #define MAKE_UPGRADE_MASK5(k,a,b,c,d) UpgradeMaskType(UpgradeMaskType::kInit, (k), (a), (b), (c), (d))
 
-inline Bool TEST_UPGRADE_MASK( const UpgradeMaskType& m, Int index ) 
-{ 
-	return m.test( index ); 
+inline Bool TEST_UPGRADE_MASK( const UpgradeMaskType& m, Int index )
+{
+	return m.test( index );
 }
 
-inline Bool TEST_UPGRADE_MASK_ANY( const UpgradeMaskType& m, const UpgradeMaskType& mask ) 
-{ 
+inline Bool TEST_UPGRADE_MASK_ANY( const UpgradeMaskType& m, const UpgradeMaskType& mask )
+{
 	return m.anyIntersectionWith( mask );
 }
 
@@ -79,14 +76,14 @@ inline Bool TEST_UPGRADE_MASK_MULTI( const UpgradeMaskType& m, const UpgradeMask
 	return m.testSetAndClear( mustBeSet, mustBeClear );
 }
 
-inline Bool UPGRADE_MASK_ANY_SET( const UpgradeMaskType& m) 
-{ 
-	return m.any(); 
+inline Bool UPGRADE_MASK_ANY_SET( const UpgradeMaskType& m)
+{
+	return m.any();
 }
 
-inline void CLEAR_UPGRADE_MASK( UpgradeMaskType& m ) 
-{ 
-	m.clear(); 
+inline void CLEAR_UPGRADE_MASK( UpgradeMaskType& m )
+{
+	m.clear();
 }
 
 inline void SET_ALL_UPGRADE_MASK_BITS( UpgradeMaskType& m )
@@ -149,9 +146,9 @@ enum UpgradeType CPP_11(: Int)
 	UPGRADE_TYPE_PLAYER = 0,						// upgrade applies to a player as a whole
 	UPGRADE_TYPE_OBJECT,								// upgrade applies to an object instance only
 
-	NUM_UPGRADE_TYPES,		// keep this last
+	NUM_UPGRADE_TYPES
 };
-extern const char *TheUpgradeTypeNames[]; //Change above, change this!
+extern const char *const TheUpgradeTypeNames[]; //Change above, change this!
 
 //-------------------------------------------------------------------------------------------------
 /** A single upgrade template definition */
@@ -204,7 +201,7 @@ class UpgradeTemplate : public MemoryPoolObject
 	NameKeyType m_nameKey;							///< name key
 	AsciiString m_displayNameLabel;			///< String manager label for UI display name
 	Real m_buildTime;										///< database # for how long it takes to "build" this
-	Int m_cost;													///< cost for production 
+	Int m_cost;													///< cost for production
 	UpgradeMaskType m_upgradeMask;			///< Unique bitmask for this upgrade template
 	AudioEventRTS	m_researchSound;			///< Sound played when upgrade researched.
 	AudioEventRTS	m_unitSpecificSound;	///< Secondary sound played when upgrade researched.
@@ -235,10 +232,11 @@ class UpgradeCenter : public SubsystemInterface
 	void reset( void );												///< subsystem interface
 	void update( void ) { }										///< subsystem interface
 
-	UpgradeTemplate *firstUpgradeTemplate( void );	///< return the first upgrade template
-	const UpgradeTemplate *findUpgradeByKey( NameKeyType key ) const;		///< find upgrade by name key
-	const UpgradeTemplate *findUpgrade( const AsciiString& name ) const;				///< find and return upgrade by name
-	const UpgradeTemplate *findVeterancyUpgrade(VeterancyLevel level) const;				///< find and return upgrade by name
+	UpgradeTemplate *firstUpgradeTemplate( void ); ///< return the first upgrade template
+	const UpgradeTemplate *findUpgradeByKey( NameKeyType key ) const; ///< find upgrade by name key
+	const UpgradeTemplate *findUpgrade( const AsciiString& name ) const; ///< find and return upgrade by name
+	const UpgradeTemplate *findUpgrade( const char* name ) const; ///< find and return upgrade by name
+	const UpgradeTemplate *findVeterancyUpgrade(VeterancyLevel level) const; ///< find and return upgrade by veterancy level
 
 	UpgradeTemplate *newUpgrade( const AsciiString& name );				///< allocate, link, and return new upgrade
 
@@ -263,5 +261,3 @@ class UpgradeCenter : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern UpgradeCenter *TheUpgradeCenter;
-
-#endif  // end __UPGRADE_H_
diff --git a/Generals/Code/GameEngine/Include/Common/UserPreferences.h b/Generals/Code/GameEngine/Include/Common/UserPreferences.h
index 7a47480a37e..aef49361d36 100644
--- a/Generals/Code/GameEngine/Include/Common/UserPreferences.h
+++ b/Generals/Code/GameEngine/Include/Common/UserPreferences.h
@@ -30,14 +30,15 @@
 
 #pragma once
 
-#ifndef __USERPREFERENCES_H__
-#define __USERPREFERENCES_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 #include "Common/STLTypedefs.h"
 
+class Money;
+typedef UnsignedInt CursorCaptureMode;
+typedef UnsignedInt ScreenEdgeScrollMode;
+
 //-----------------------------------------------------------------------------
 // PUBLIC TYPES ///////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -45,7 +46,7 @@
 typedef std::map<AsciiString, AsciiString> PreferenceMap;
 
 //-----------------------------------------------------------------------------
-// UserPreferences base class 
+// UserPreferences base class
 //-----------------------------------------------------------------------------
 class UserPreferences : public PreferenceMap
 {
@@ -56,7 +57,7 @@ class UserPreferences : public PreferenceMap
 	// Loads or creates a file with the given name in the user data directory.
 	virtual Bool load(AsciiString fname);
 	virtual Bool write(void);
-	
+
 	Bool getBool(AsciiString key, Bool defaultValue) const;
 	Real getReal(AsciiString key, Real defaultValue) const;
 	Int getInt(AsciiString key, Int defaultValue) const;
@@ -72,7 +73,7 @@ class UserPreferences : public PreferenceMap
 };
 
 //-----------------------------------------------------------------------------
-// OptionsPreferences options menu class 
+// OptionsPreferences options menu class
 //-----------------------------------------------------------------------------
 class OptionPreferences : public UserPreferences
 {
@@ -88,8 +89,19 @@ class OptionPreferences : public UserPreferences
 	void setOnlineIPAddress(AsciiString IP);	// convenience function
 	void setLANIPAddress(UnsignedInt IP);			// convenience function
 	void setOnlineIPAddress(UnsignedInt IP);	// convenience function
+	Bool getArchiveReplaysEnabled() const;		// convenience function
 	Bool getAlternateMouseModeEnabled(void);	// convenience function
 	Real getScrollFactor(void);								// convenience function
+	Bool getDrawScrollAnchor(void);
+	Bool getMoveScrollAnchor(void);
+	Bool getCursorCaptureEnabledInWindowedGame() const;
+	Bool getCursorCaptureEnabledInWindowedMenu() const;
+	Bool getCursorCaptureEnabledInFullscreenGame() const;
+	Bool getCursorCaptureEnabledInFullscreenMenu() const;
+	CursorCaptureMode getCursorCaptureMode() const;
+	Bool getScreenEdgeScrollEnabledInWindowedApp() const;
+	Bool getScreenEdgeScrollEnabledInFullscreenApp() const;
+	ScreenEdgeScrollMode getScreenEdgeScrollMode() const;
 	Bool getSendDelay(void);									// convenience function
 	Int getFirewallBehavior(void);						// convenience function
 	Short getFirewallPortAllocationDelta(void);	// convenience function
@@ -102,8 +114,10 @@ class OptionPreferences : public UserPreferences
 	Real get3DSoundVolume(void);							// convenience function
 	Real getSpeechVolume(void);								// convenience function
 	Real getMusicVolume(void);								// convenience function
+	Real getMoneyTransactionVolume(void) const;
 	Bool saveCameraInReplays(void);
 	Bool useCameraInReplays(void);
+	Bool getPlayerObserverEnabled() const;
 	Int	 getStaticGameDetail(void);	// detail level selected by the user.
 	Int	 getIdealStaticGameDetail(void);	// detail level detected for user.
  	Real getGammaValue(void);
@@ -124,10 +138,19 @@ class OptionPreferences : public UserPreferences
 
 	Int	 getCampaignDifficulty(void);
 	void setCampaignDifficulty( Int diff );
+
+	Int getNetworkLatencyFontSize(void);
+	Int getRenderFpsFontSize(void);
+	Int getSystemTimeFontSize(void);
+	Int getGameTimeFontSize(void);
+
+	Real getResolutionFontAdjustment(void);
+
+	Bool getShowMoneyPerMinute(void) const;
 };
 
 //-----------------------------------------------------------------------------
-// LANPreferences class 
+// LANPreferences class
 //-----------------------------------------------------------------------------
 class LANPreferences : public UserPreferences
 {
@@ -144,6 +167,9 @@ class LANPreferences : public UserPreferences
 	Bool usesSystemMapDir(void);		// convenience function
 	Int getNumRemoteIPs(void);					// convenience function
 	UnicodeString getRemoteIPEntry(Int i);	// convenience function
-};
 
-#endif // __USERPREFERENCES_H__
+  Bool getSuperweaponRestricted(void) const;
+  Money getStartingCash(void) const;
+  void setSuperweaponRestricted( Bool superweaponRestricted);
+  void setStartingCash( const Money & startingCash );
+};
diff --git a/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h b/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h
index b8cfb835523..67cacd62e22 100644
--- a/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h
+++ b/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h
@@ -24,12 +24,12 @@
 
 // FILE: WellKnownKeys.h ///////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef _H_WELLKNOWNKEYS
-#define _H_WELLKNOWNKEYS
-
 #include "Common/NameKeyGenerator.h"
 
 #ifdef INSTANTIATE_WELL_KNOWN_KEYS
@@ -431,7 +428,7 @@ DEFINE_KEY(teamVeterancy)
 /**
 	Which: Team
 	Type: Bool
-	Usage: Does the team execute the actions in 
+	Usage: Does the team execute the actions in
 */
 DEFINE_KEY(teamExecutesActionsOnCreate)
 
@@ -490,7 +487,7 @@ DEFINE_KEY(lightAmbientColor)
 	Type: Int (RGB color in 0xAARRGGBB format)
 	Usage: If unit is a light, Diffuse color.
 */
-DEFINE_KEY(lightDiffuseColor)	
+DEFINE_KEY(lightDiffuseColor)
 
 /**
 	Which: MapObject Properties
@@ -846,5 +843,3 @@ DEFINE_KEY(Player_7_Start)
 DEFINE_KEY(Player_8_Start)
 
 // ---------------------------------------------------------------------------------------
-
-#endif	// _H_WELLKNOWNKEYS
diff --git a/Generals/Code/GameEngine/Include/Common/crc.h b/Generals/Code/GameEngine/Include/Common/crc.h
deleted file mode 100644
index 5b05c92f2ad..00000000000
--- a/Generals/Code/GameEngine/Include/Common/crc.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// CRC.h ///////////////////////////////////////////////////////////////
-// A class encapsulating CRC calculation
-// Author: Matthew D. Campbell, October 2001
-
-#pragma once
-
-#ifndef _CRC_H_
-#define _CRC_H_
-
-#include "Lib/BaseType.h"
-
-#ifdef RTS_DEBUG
-
-//#include "winsock2.h" // for htonl
-
-class CRC
-{
-public:
-	CRC() { crc = 0; }
-
-	void computeCRC( const void *buf, Int len );		///< Compute the CRC for a buffer, added into current CRC
-	void clear( void ) { crc = 0; }									///< Clears the CRC to 0
-//	UnsignedInt get( void ) { return htonl(crc); }	///< Get the combined CRC
-	UnsignedInt get( void );
-
-#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
-  void set( UnsignedInt v )
-  {
-    crc = v;
-  }
-#endif
-
-private:
-	void addCRC( UnsignedByte val );									///< CRC a 4-byte block
-
-	UnsignedInt crc;
-};
-
-#else
-
-// optimized inline only version
-class CRC
-{
-public:
-	CRC(void) { crc=0; }
-
-  /// Compute the CRC for a buffer, added into current CRC
-	__forceinline void computeCRC( const void *buf, Int len )
-  {
-    if (!buf||len<1)
-      return;
-    
-#if !(defined(_MSC_VER) && _MSC_VER < 1300)
-    // C++ version left in for reference purposes
-	  for (UnsignedByte *uintPtr=(UnsignedByte *)buf;len>0;len--,uintPtr++)
-    {
-    	int hibit;
-    	if (crc & 0x80000000) 
-      {
-		    hibit = 1;
-	    } 
-      else 
-      {
-		    hibit = 0;
-	    }
-
-	    crc <<= 1;
-	    crc += *uintPtr;
-	    crc += hibit;
-    }
-#else
-    // ASM version, verified by comparing resulting data with C++ version data
-    unsigned *crcPtr=&crc;
-    _asm
-    {
-      mov esi,[buf]
-      mov ecx,[len]
-      dec ecx
-      mov edi,[crcPtr]
-      mov ebx,dword ptr [edi]
-      xor eax,eax
-    lp:
-      mov al,byte ptr [esi]
-      shl ebx,1
-      inc esi
-      adc ebx,eax
-      dec ecx
-      jns lp
-      mov dword ptr [edi],ebx
-    };
-#endif
-  }
-
-  /// Clears the CRC to 0
-	void clear( void ) 
-  { 
-    crc = 0; 
-  }									
-
-  ///< Get the combined CRC
-	UnsignedInt get( void ) const
-  {
-    return crc;
-  }
-
-#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
-  void set( UnsignedInt v )
-  {
-    crc = v;
-  }
-#endif
-
-private:
-	UnsignedInt crc;
-};
-
-#endif
-
-#endif // _CRC_H_
diff --git a/Generals/Code/GameEngine/Include/Common/encrypt.h b/Generals/Code/GameEngine/Include/Common/encrypt.h
index d57d2ddb965..e441432f9e6 100644
--- a/Generals/Code/GameEngine/Include/Common/encrypt.h
+++ b/Generals/Code/GameEngine/Include/Common/encrypt.h
@@ -28,16 +28,9 @@
 
 #pragma once
 
-#ifndef ENCRYPT_HEADER
-#define ENCRYPT_HEADER
-
 // This routine is non-reentrant, as it returns a static buffer!!!
 // Valid input is 4-8 characters, and can contain letters and numbers and '.' and '/'
 
 #define MAX_ENCRYPTED_STRING 8
 
 const char *EncryptString(const char *);
-
-#endif
-
-
diff --git a/Generals/Code/GameEngine/Include/Common/file.h b/Generals/Code/GameEngine/Include/Common/file.h
deleted file mode 100644
index 878e9519e74..00000000000
--- a/Generals/Code/GameEngine/Include/Common/file.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    WSYS Library
-//
-// Module:     IO
-//
-// File name:  wsys/File.h
-//
-// Created:    4/23/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __FILE_H
-#define __FILE_H
-
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Lib/BaseType.h"
-#include "Common/AsciiString.h"
-#include "Common/GameMemory.h"
-// include FileSystem.h as it will be used alot with File.h
-//#include "Common/FileSystem.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// File
-//===============================
-/**
-  *	File is an interface class for basic file operations.
-	*
-	* All code should use the File class and not its derivatives, unless
-	* absolutely necessary. Also FS::Open should be used to create File objects and open files.
-	*/
-//===============================
-
-class File : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_ABC(File)
-// friend doesn't play well with MPO (srj)
-//	friend class FileSystem;
-
-	public:
-	
-		enum access
-		{
-			NONE			= 0x00000000,				
-			READ			= 0x00000001,				///< Access file for reading
-			WRITE			= 0x00000002,				///< Access file for writing
-			APPEND		= 0x00000004,				///< Seek to end of file on open
-			CREATE		= 0x00000008,				///< Create file if it does not exist
-			TRUNCATE	= 0x00000010,				///< Delete all data in file when opened
-			TEXT			= 0x00000020,				///< Access file as text data
-			BINARY		= 0x00000040,				///< Access file as binary data
-			READWRITE = (READ | WRITE),
-			ONLYNEW		= 0x00000080,				///< Only create file if it does not exist
-			
-			// NOTE: STREAMING is Mutually exclusive with WRITE
-			STREAMING = 0x00000100				///< Do not read this file into a ram file, read it as requested.
-		};
-
-		enum seekMode
-		{
-			START,												///< Seek position is relative to start of file
-			CURRENT,											///< Seek position is relative to current file position
-			END														///< Seek position is relative from the end of the file
-		};
-
-	protected:
-
-		AsciiString	m_nameStr;						///< Stores file name
-		Int					m_access;									///< How the file was opened
-		Bool				m_open;										///< Has the file been opened
-		Bool				m_deleteOnClose;					///< delete File object on close()
-		
-		
-		File();											///< This class can only used as a base class
-		//virtual				~File();
-
-	public:
-		
-
-						Bool	eof();
-		virtual Bool	open( const Char *filename, Int access = 0 );				///< Open a file for access
-		virtual void	close( void );																			///< Close the file !!! File object no longer valid after this call !!!
-
-		virtual Int		read( void *buffer, Int bytes ) = NULL ;						/**< Read the specified number of bytes from the file in to the 
-																																			  *  memory pointed at by buffer. Returns the number of bytes read.
-																																			  *  Returns -1 if an error occured.
-																																			  */
-		virtual Int		write( const void *buffer, Int bytes ) = NULL ;						/**< Write the specified number of bytes from the    
-																																			  *	 memory pointed at by buffer to the file. Returns the number of bytes written.
-																																			  *	 Returns -1 if an error occured.
-																																			  */
-		virtual Int		seek( Int bytes, seekMode mode = CURRENT ) = NULL;	/**< Sets the file position of the next read/write operation. Returns the new file
-																																				*  position as the number of bytes from the start of the file.
-																																				*  Returns -1 if an error occured.
-																																				*
-																																				*  seekMode determines how the seek is done:
-																																				*
-																																				*  START : means seek to the specified number of bytes from the start of the file
-																																				*  CURRENT: means seek the specified the number of bytes from the current file position
-																																				*  END: means seek the specified number of bytes back from the end of the file
-																																				*/
-		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0) = 0;		///< reads until it reaches a new-line character
-
-		virtual Bool	scanInt(Int &newInt) = 0;														///< read an integer from the current file position.
-		virtual Bool	scanReal(Real &newReal) = 0;												///< read a real number from the current file position.
-		virtual Bool	scanString(AsciiString &newString) = 0;							///< read a string from the current file position.
-
-		virtual Bool	print ( const Char *format, ...);										///< Prints formated string to text file
-		virtual Int		size( void );																				///< Returns the size of the file
-		virtual Int		position( void );																		///< Returns the current read/write position
-
-
-		void					setName( const char *name );												///< Set the name of the file
-		const char*		getName( void ) const;															///< Returns a pointer to the name of the file
-		Int						getAccess( void ) const;														///< Returns file's access flags
-
-		void					deleteOnClose ( void );															///< Causes the File object to delete itself when it closes
-
-		/**
-			Allocate a buffer large enough to hold entire file, read 
-			the entire file into the buffer, then close the file.
-			the buffer is owned by the caller, who is responsible
-			for freeing is (via delete[]). This is a Good Thing to
-			use because it minimizes memory copies for BIG files.
-		*/
-		virtual char* readEntireAndClose() = 0;
-		virtual File* convertToRAMFile() = 0;
-};
-
-
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-inline const char* File::getName( void ) const { return m_nameStr.str(); }
-inline void File::setName( const char *name ) { m_nameStr.set(name); }
-inline Int File::getAccess( void ) const { return m_access; }
-inline void File::deleteOnClose( void ) { m_deleteOnClose = TRUE; }
-
-
-
-
-
-#endif // __FILE_H
diff --git a/Generals/Code/GameEngine/Include/Common/simpleplayer.h b/Generals/Code/GameEngine/Include/Common/simpleplayer.h
deleted file mode 100644
index cc48f527095..00000000000
--- a/Generals/Code/GameEngine/Include/Common/simpleplayer.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef SIMPLEPLAYER_H
-#define SIMPLEPLAYER_H
-
-#include "wmsdk.h"
-
-//
-// we preserve a list of "ready-to-free" list of wave headers for the
-// caller to unprepare and free
-//
-typedef struct WAVEHDR_LIST {
-    LPWAVEHDR           pwh;
-    struct WAVEHDR_LIST *next;
-}   WAVEHDR_LIST;
-
-#define SIMPLE_PLAYER_OPEN_EVENT  _T( "45ab58e0-382e-4d1c-ac50-88a5f9601851" )
-#define SIMPLE_PLAYER_CLOSE_EVENT _T( "276095fa-a8e0-48e6-ac61-8b0002345607" )
-#define WMAPLAY_EVENT             _T( "9e828a72-64f3-48f0-9de8-13dafd0cbd3a" )
-///////////////////////////////////////////////////////////////////////////////
-class CSimplePlayer : public IWMReaderCallback
-{
-public:
-    CSimplePlayer( HRESULT* phr );
-    ~CSimplePlayer();
-    
-    virtual HRESULT Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hCompletionEvent, HRESULT *phrCompletion );
-
-//
-// IUnknown Implemenation
-//
-public:
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(
-        REFIID riid,
-        void **ppvObject );
-
-    virtual ULONG STDMETHODCALLTYPE AddRef();
-    virtual ULONG STDMETHODCALLTYPE Release();
-
-//
-// IWMReaderCallback Implemenation
-//
-public:
-    virtual HRESULT STDMETHODCALLTYPE OnSample( 
-        /* [in] */ DWORD dwOutputNum,
-        /* [in] */ QWORD cnsSampleTime,
-        /* [in] */ QWORD cnsSampleDuration,
-        /* [in] */ DWORD dwFlags,
-        /* [in] */ INSSBuffer __RPC_FAR *pSample,
-        /* [in] */ void __RPC_FAR *pvContext);
-    
-    virtual HRESULT STDMETHODCALLTYPE OnStatus( 
-        /* [in] */ WMT_STATUS Status,
-        /* [in] */ HRESULT hr,
-        /* [in] */ WMT_ATTR_DATATYPE dwType,
-        /* [in] */ BYTE __RPC_FAR *pValue,
-        /* [in] */ void __RPC_FAR *pvContext);
-
-//
-// Helper Methods
-//
-protected:
-
-    HRESULT Close();
-
-    void OnWaveOutMsg( UINT uMsg, DWORD dwParam1, DWORD dwParam2 );
-
-    static void CALLBACK WaveProc(
-                          HWAVEOUT hwo,      
-                          UINT uMsg,         
-                          DWORD dwInstance,  
-                          DWORD dwParam1,    
-                          DWORD dwParam2 );
- 
-    HRESULT AddWaveHeader( LPWAVEHDR pwh );
-    void    RemoveWaveHeaders( void );
-
-    CRITICAL_SECTION    m_CriSec;
-    WAVEHDR_LIST       *m_whdrHead;
-
-    LONG    m_cRef;
-    LONG    m_cBuffersOutstanding;
-    BOOL    m_fEof;
-    HANDLE  m_hCompletionEvent;
-
-    IWMReader *m_pReader;
-    IWMHeaderInfo *m_pHeader;
-    HWAVEOUT m_hwo;
-
-    HRESULT *m_phrCompletion;
-
-    HRESULT m_hrOpen;
-    HANDLE m_hOpenEvent;
-    HANDLE m_hCloseEvent;
-
-    union
-    {
-        WAVEFORMATEX m_wfx;
-        BYTE m_WfxBuf[1024];
-    };
-
-    LPWSTR  m_pszUrl;
-
-};
-
-#endif // SIMPLEPLAYER_H
diff --git a/Generals/Code/GameEngine/Include/Common/urllaunch.h b/Generals/Code/GameEngine/Include/Common/urllaunch.h
deleted file mode 100644
index 27ebc43d5d2..00000000000
--- a/Generals/Code/GameEngine/Include/Common/urllaunch.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef URLLAUNCH_H
-#define URLLAUNCH_H
-
-HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL );
-
-HRESULT LaunchURL( LPCWSTR pszURL );
-
-#endif  // URLLAUNCH_H
diff --git a/Generals/Code/GameEngine/Include/Common/version.h b/Generals/Code/GameEngine/Include/Common/version.h
index bc38f38bed5..088a0f7217c 100644
--- a/Generals/Code/GameEngine/Include/Common/version.h
+++ b/Generals/Code/GameEngine/Include/Common/version.h
@@ -28,35 +28,75 @@
 
 #pragma once
 
-#ifndef __VERSION_H__
-#define __VERSION_H__
+#include <time.h>
 
-/** 
+/**
  * The Version class formats the version number into integer and string
  * values for different parts of the game.
  * @todo: increment build number on compile, and stamp exe with username
  */
+// TheSuperHackers @tweak The Version class now also provides Git information
+// alongside the original Version information.
 class Version
 {
 public:
 	Version();
-	UnsignedInt getVersionNumber( void );						///< Return a 4-byte integer suitable for WOLAPI
-	AsciiString getAsciiVersion( void );						///< Return a human-readable version number
-	UnicodeString getUnicodeVersion( void );				///< Return a human-readable version number
-	UnicodeString getFullUnicodeVersion( void );		///< Return a human-readable version number
-	AsciiString getAsciiBuildTime( void );					///< Return a formated date/time string for build time
-	UnicodeString getUnicodeBuildTime( void );			///< Return a formated date/time string for build time
-	AsciiString getAsciiBuildLocation( void );			///< Return a string with the build location
-	UnicodeString getUnicodeBuildLocation( void );	///< Return a string with the build location
-	AsciiString getAsciiBuildUser( void );					///< Return a string with the build user
-	UnicodeString getUnicodeBuildUser( void );			///< Return a string with the build user
-
-	Bool showFullVersion( void ) { return m_showFullVersion; }
+
+	UnsignedInt getVersionNumber() const;           ///< Return a 4-byte integer suitable for WOLAPI
+
+	AsciiString getAsciiVersion() const;            ///< Return a human-readable game version number
+	UnicodeString getUnicodeVersion() const;        ///< Return a human-readable game version number. Is decorated with localized string
+
+	AsciiString getAsciiBuildTime() const;          ///< Return a formated date/time string for build time
+	UnicodeString getUnicodeBuildTime() const;      ///< Return a formated date/time string for build time. Is decorated with localized string
+
+	AsciiString getAsciiBuildLocation() const;      ///< Return a string with the build location
+	UnicodeString getUnicodeBuildLocation() const;  ///< Return a string with the build location. Is decorated with localized string
+
+	AsciiString getAsciiBuildUser() const;          ///< Return a string with the build user
+	UnicodeString getUnicodeBuildUser() const;      ///< Return a string with the build user. Is decorated with localized string
+
+	static Int getGitCommitCount();                    ///< Returns the git commit count as a number
+	static time_t getGitCommitTime();                  ///< Returns the git head commit time as a UTC timestamp
+	static const char* getGitCommitAuthorName();       ///< Returns the git head commit author name
+
+	AsciiString getAsciiGitCommitCount() const;        ///< Returns the git commit count. Is prefixed with ~ if there were uncommitted changes.
+	UnicodeString getUnicodeGitCommitCount() const;    ///< Returns the git commit count. Is prefixed with ~ if there were uncommitted changes.
+
+	AsciiString getAsciiGitTagOrHash() const;          ///< Returns the git head commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
+	UnicodeString getUnicodeGitTagOrHash() const;      ///< Returns the git head commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
+
+	AsciiString getAsciiGitCommitTime() const;         ///< Returns the git head commit time in YYYY-mm-dd HH:MM:SS format
+	UnicodeString getUnicodeGitCommitTime() const;     ///< Returns the git head commit time in YYYY-mm-dd HH:MM:SS format
+
+	AsciiString getAsciiGitVersion() const;            ///< Returns the git version
+	UnicodeString getUnicodeGitVersion() const;        ///< Returns the git version
+
+	AsciiString getAsciiBuildUserOrGitCommitAuthorName() const;
+	UnicodeString getUnicodeBuildUserOrGitCommitAuthorName() const; ///< Is decorated with localized string
+
+	UnicodeString getUnicodeProductTitle() const;
+	UnicodeString getUnicodeProductVersion() const;
+	UnicodeString getUnicodeProductAuthor() const; ///< Is decorated with localized string
+	UnicodeString getUnicodeProductString() const; ///< Returns a string that contains product title, version and other, if specified. Is decorated with localized string
+	UnicodeString getUnicodeProductVersionHashString() const; ///< Returns a string that contains the product string, game version and hashes. Is decorated with localized string
+
+	Bool showFullVersion() const { return m_showFullVersion; }
 	void setShowFullVersion( Bool val ) { m_showFullVersion = val; }
 
 	void setVersion(Int major, Int minor, Int buildNum,
 		Int localBuildNum, AsciiString user, AsciiString location,
-		AsciiString buildTime, AsciiString buildDate); ///< Set version info
+		AsciiString buildTime, AsciiString buildDate);
+
+private:
+	static AsciiString buildAsciiGitCommitCount();
+	static UnicodeString buildUnicodeGitCommitCount();
+
+	static AsciiString buildAsciiGitTagOrHash();
+	static UnicodeString buildUnicodeGitTagOrHash();
+
+	static AsciiString buildAsciiGitCommitTime();
+	static UnicodeString buildUnicodeGitCommitTime();
 
 private:
 	Int m_major;
@@ -67,9 +107,13 @@ class Version
 	AsciiString m_buildUser;
 	AsciiString m_buildTime;
 	AsciiString m_buildDate;
+	AsciiString m_asciiGitCommitCount;
+	AsciiString m_asciiGitTagOrHash;
+	AsciiString m_asciiGitCommitTime;
+	UnicodeString m_unicodeGitCommitCount;
+	UnicodeString m_unicodeGitTagOrHash;
+	UnicodeString m_unicodeGitCommitTime;
 	Bool m_showFullVersion;
 };
 
-extern Version *TheVersion;	///< The Version singleton
-
-#endif // __VERSION_H__
+extern Version *TheVersion;
diff --git a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h b/Generals/Code/GameEngine/Include/GameClient/Anim2D.h
index cdd8765005a..e3853a37102 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Anim2D.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ANIM_2D_H_
-#define __ANIM_2D_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Snapshot.h"
 
@@ -42,7 +39,7 @@ class Image;
 // ------------------------------------------------------------------------------------------------
 enum Anim2DMode CPP_11(: Int)
 {
-	
+
 	ANIM_2D_INVALID = 0,
 	ANIM_2D_ONCE,
 	ANIM_2D_ONCE_BACKWARDS,
@@ -52,11 +49,11 @@ enum Anim2DMode CPP_11(: Int)
 	ANIM_2D_PING_PONG_BACKWARDS,
 	// dont' forget to add new animation mode names to Anim2DModeNames[] below
 
-	ANIM_2D_NUM_MODES						// keep this last please
+	ANIM_2D_NUM_MODES
 
 };
 #ifdef DEFINE_ANIM_2D_MODE_NAMES
-static const char *Anim2DModeNames[] = 
+static const char *const Anim2DModeNames[] =
 {
 	"NONE",
 	"ONCE",
@@ -67,6 +64,7 @@ static const char *Anim2DModeNames[] =
 	"PING_PONG_BACKWARDS",
 	NULL
 };
+static_assert(ARRAY_SIZE(Anim2DModeNames) == ANIM_2D_NUM_MODES + 1, "Incorrect array size");
 #endif
 
 // ------------------------------------------------------------------------------------------------
@@ -74,7 +72,7 @@ static const char *Anim2DModeNames[] =
 // ------------------------------------------------------------------------------------------------
 class Anim2DTemplate : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Anim2DTemplate, "Anim2DTemplate")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Anim2DTemplate, "Anim2DTemplate")
 public:
 
 	Anim2DTemplate( AsciiString name );
@@ -90,7 +88,7 @@ class Anim2DTemplate : public MemoryPoolObject
 	// list access for use by the Anim2DCollection only
 	void friend_setNextTemplate( Anim2DTemplate *animTemplate ) { m_nextTemplate = animTemplate; }
 	Anim2DTemplate *friend_getNextTemplate( void ) const { return m_nextTemplate; };
-	
+
 	// INI methods
 	const FieldParse *getFieldParse( void ) const { return s_anim2DFieldParseTable; }
 	void storeImage( const Image *image );								///< store image in next available slot
@@ -221,5 +219,3 @@ class Anim2DCollection : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern Anim2DCollection *TheAnim2DCollection;
-
-#endif  // end __ANIM_2D_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h b/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
index 87f1e2f2091..523a4276f5c 100644
--- a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
+++ b/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
@@ -24,12 +24,12 @@
 
 // FILE: AnimateWindowManager.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Mar 2002
@@ -37,7 +37,7 @@
 //	Filename: AnimateWindowManager.h
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The Animate Window class will be used by registering a window with
 //						the manager with stating what kind of animation to do. Then on every
 //						update, we'll move the windows.
@@ -47,9 +47,6 @@
 
 #pragma once
 
-#ifndef __ANIMATEWINDOWMANAGER_H_
-#define __ANIMATEWINDOWMANAGER_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -95,12 +92,12 @@ enum AnimTypes CPP_11(: Int)
 } ;
 
 //-----------------------------------------------------------------------------
-// TheSuperHackers @compile xezon 14/03/2025 Puts class into namespace to avoid name collision with AnimateWindow function in WinUser.h
+// TheSuperHackers @build xezon 14/03/2025 Puts class into namespace to avoid name collision with AnimateWindow function in WinUser.h
 namespace wnd
 {
 class AnimateWindow : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AnimateWindow, "AnimateWindow")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AnimateWindow, "AnimateWindow")
 public:
 	AnimateWindow( void );
 	//~AnimateWindow( void );
@@ -141,7 +138,7 @@ class AnimateWindow : public MemoryPoolObject
 
 private:
 	UnsignedInt m_delay;													///< Holds the delay time in which the animation will start (in milliseconds)
-	ICoord2D m_startPos;													///< Holds the starting position of the animation 
+	ICoord2D m_startPos;													///< Holds the starting position of the animation
 																								///<(usuall is also the end position of the animation when the animation is reversed)
 	ICoord2D m_endPos;														///< Holds the target End Position (usually is the same as the rest position)
 	ICoord2D m_curPos;														///< It's Current Position
@@ -169,9 +166,9 @@ class AnimateWindowManager : public SubsystemInterface
 	~AnimateWindowManager( void );
 
 	// Inhertited from subsystem ====================================================================
-	virtual void init( void );			
-	virtual void reset( void );			
-	virtual void update( void );		
+	virtual void init( void );
+	virtual void reset( void );
+	virtual void update( void );
 	//===============================================================================================
 
 	void registerGameWindow(GameWindow *win, AnimTypes animType, Bool needsToFinish, UnsignedInt ms = 0, UnsignedInt delayMs = 0);			// Registers a new window to animate.
@@ -194,7 +191,7 @@ class AnimateWindowManager : public SubsystemInterface
 	ProcessAnimateWindowSlideFromBottomTimed *m_slideFromBottomTimed;		///< Holds the process in which the windows slide from the Bottom in a time-based fashion
 	ProcessAnimateWindowSlideFromTopFast *m_slideFromTopFast;			///< holds the process in wich the windows slide from the top,fast
 	ProcessAnimateWindow *getProcessAnimate( AnimTypes animType);		///< returns the process for the kind of animation we need.
-	
+
 };
 
 //-----------------------------------------------------------------------------
@@ -229,12 +226,10 @@ namespace wnd
 	inline void	AnimateWindow::setNeedsToFinish( Bool needsToFinish)		{ m_needsToFinish = needsToFinish; };
 	inline Bool	AnimateWindow::needsToFinish( void )							{ return m_needsToFinish; };
 } // namespace wnd
-	
+
 	inline Bool AnimateWindowManager::isFinished( void )					{ return !m_needsUpdate;	};
 	inline Bool AnimateWindowManager::isReversed( void )						{ return m_reverse;	};
-	inline Bool AnimateWindowManager::isEmpty( void ){return (m_winList.size() == 0 && m_winMustFinishList.size() == 0);	}
+	inline Bool AnimateWindowManager::isEmpty( void ){return (m_winList.empty() && m_winMustFinishList.empty());	}
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __ANIMATEWINDOWMANAGER_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/CDCheck.h b/Generals/Code/GameEngine/Include/GameClient/CDCheck.h
index a5a4a9ff524..e5e3a8921ef 100644
--- a/Generals/Code/GameEngine/Include/GameClient/CDCheck.h
+++ b/Generals/Code/GameEngine/Include/GameClient/CDCheck.h
@@ -29,12 +29,7 @@
 
 #pragma once
 
-#ifndef __CDCHECK_H_
-#define __CDCHECK_H_
-
 typedef void (*gameStartCallback) (void);
 
 Bool IsFirstCDPresent(void);
 void CheckForCDAtGameStart( gameStartCallback callback );
-
-#endif //__CDCHECK_H_
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h b/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h
index 40c1fe96be7..2ea11594e4d 100644
--- a/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h
+++ b/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h
@@ -24,12 +24,12 @@
 
 // FILE: CampaignManager.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,17 +37,14 @@
 //	Filename: 	CampaignManager.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CAMPAIGN_MANAGER_H_
-#define __CAMPAIGN_MANAGER_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -77,7 +74,7 @@ class Mission : public MemoryPoolObject
 
 public:
 	AsciiString m_name;
-	AsciiString m_mapName;	
+	AsciiString m_mapName;
 	AsciiString m_nextMission;
 	AsciiString m_movieLabel;
 	AsciiString m_missionObjectivesLabel[MAX_OBJECTIVE_LINES];
@@ -93,7 +90,7 @@ class Campaign : public MemoryPoolObject
 public:
 	Campaign( void );
 	//~Campaign( void );
-	
+
 	Mission *newMission( AsciiString name );
 	Mission *getNextMission( Mission *current);
 	Mission *getMission( AsciiString missionName);
@@ -134,7 +131,7 @@ class CampaignManager : public Snapshot
 	const FieldParse *getFieldParse( void ) const { return m_campaignFieldParseTable; }								///< returns the parsing fields
 	static const FieldParse m_campaignFieldParseTable[];																				///< the parse table
 	static void parseMissionPart( INI* ini, void *instance, void *store, const void *userData );					///< Parse the Mission Part
-	
+
 	Campaign *newCampaign(AsciiString name);
 	Bool isVictorious( void ) { return m_victorious; }
 	void SetVictorious( Bool victory ) { m_victorious = victory;	}
@@ -164,5 +161,3 @@ class CampaignManager : public Snapshot
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 extern CampaignManager *TheCampaignManager;
-
-#endif // __CAMPAIGN_MANAGER_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/ClientInstance.h b/Generals/Code/GameEngine/Include/GameClient/ClientInstance.h
index 74e7add404b..1f1ada1daca 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ClientInstance.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ClientInstance.h
@@ -30,6 +30,15 @@ class ClientInstance
 
 	static bool isInitialized();
 
+	static bool isMultiInstance();
+
+	// Change multi instance on runtime. Must be called before initialize.
+	static void setMultiInstance(bool v);
+
+	// Skips using the primary instance. Must be called before initialize.
+	// Useful when the new process is not meant to collide with another normal Generals process.
+	static void skipPrimaryInstance();
+
 	// Returns the instance index of this game client. Starts at 0.
 	static UnsignedInt getInstanceIndex();
 
@@ -42,6 +51,7 @@ class ClientInstance
 private:
 	static HANDLE s_mutexHandle;
 	static UnsignedInt s_instanceIndex;
+	static Bool s_isMultiInstance;
 };
 
 } // namespace rts
diff --git a/Generals/Code/GameEngine/Include/GameClient/ClientRandomValue.h b/Generals/Code/GameEngine/Include/GameClient/ClientRandomValue.h
deleted file mode 100644
index d821f74f928..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/ClientRandomValue.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// ClientRandomValue.h
-// Random number generation system
-// Author: Michael S. Booth, January 1998
-// Split out into separate Logic/Client/Audio headers by MDC Sept 2002
-
-#pragma once
-
-#ifndef _CLIENT_RANDOM_VALUE_H_
-#define _CLIENT_RANDOM_VALUE_H_
-
-#include "Lib/BaseType.h"
-
-// do NOT use these functions directly, rather use the macros below
-extern Int GetGameClientRandomValue( int lo, int hi, const char *file, int line );
-extern Real GetGameClientRandomValueReal( Real lo, Real hi, const char *file, int line );
-
-// use these macros to access the random value functions
-#define GameClientRandomValue( lo, hi ) GetGameClientRandomValue( lo, hi, __FILE__, __LINE__ )
-#define GameClientRandomValueReal( lo, hi ) GetGameClientRandomValueReal( lo, hi, __FILE__, __LINE__ )
-
-//--------------------------------------------------------------------------------------------------------------
-class CColorAlphaDialog;
-class DebugWindowDialog;
-
-/**
- * A GameClientRandomVariable represents a distribution of random values
- * from which discrete values can be retrieved.
- */
-class GameClientRandomVariable
-{
-public:
-	// NOTE: This class cannot have a constructor or destructor due to its use within unions
-
-	/**
-	 * CONSTANT represents a single, constant, value.
-	 * UNIFORM represents a uniform distribution of random values.
-	 * GAUSSIAN represents a normally distributed set of random values.
-	 * TRIANGULAR represents a distribution of random values in the shape
-	 *		of a triangle, with the peak probability midway between low and high.
-	 * LOW_BIAS represents a distribution of random values with
-	 *		maximum probability at low, and zero probability at high.
-	 * HIGH_BIAS represents a distribution of random values with
-	 *		zero probability at low, and maximum probability at high.
-	 */
-	enum DistributionType 
-	{ 
-		CONSTANT, UNIFORM, GAUSSIAN, TRIANGULAR, LOW_BIAS, HIGH_BIAS
-	};
-
-	static const char *DistributionTypeNames[]; 
-
-	/// define the range of random values, and the distribution of values
-	void setRange( Real low, Real high, DistributionType type = UNIFORM );
-
-	Real getValue( void ) const;														///< return a value from the random distribution
-	inline Real getMinimumValue( void ) const { return m_low; }
-	inline Real getMaximumValue( void ) const { return m_high; }
-	inline DistributionType getDistributionType( void ) const { return m_type; }
-protected:
-	DistributionType m_type;																		///< the kind of random distribution
-	Real m_low, m_high;																					///< the range of random values
-
-	// These two friends are for particle editing.
-	friend CColorAlphaDialog;
-	friend DebugWindowDialog;
-
-};
-
-//--------------------------------------------------------------------------------------------------------------
-
-#endif // _CLIENT_RANDOM_VALUE_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/Color.h b/Generals/Code/GameEngine/Include/GameClient/Color.h
index 94d952790ca..87c497de181 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Color.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Color.h
@@ -24,12 +24,12 @@
 
 // FILE: Color.h //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __COLOR_H_
-#define __COLOR_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -68,7 +65,7 @@ typedef Int Color;
 
 inline Color GameMakeColor( UnsignedByte red, UnsignedByte green, UnsignedByte blue, UnsignedByte alpha )
 {
-	return (alpha << 24) | (red << 16) | (green << 8) | (blue); 
+	return (alpha << 24) | (red << 16) | (green << 8) | (blue);
 }
 
 extern void GameGetColorComponents( Color color,
@@ -88,6 +85,3 @@ extern void GameGetColorComponents( Color color,
 extern void GameGetColorComponentsReal( Color color, Real *red, Real *green, Real *blue, Real *alpha );
 
 extern Color GameDarkenColor( Color color, Int percent = 10 );
-
-#endif // __COLOR_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h b/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h
index a56484d6d46..aebea584fa2 100644
--- a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h
+++ b/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef _H_CommandXlat
-#define _H_CommandXlat
-
 #include "GameClient/InGameUI.h"
 
 enum GUICommandType CPP_11(: Int);
@@ -52,7 +49,7 @@ class CommandTranslator : public GameMessageTranslator
 
 	Int m_objective;
 	Bool m_teamExists;				///< is there a currently selected "team"?
-  
+
  	// these are for determining if a drag occurred or it wasjust a sloppy click
  	ICoord2D m_mouseRightDragAnchor;		// the location of a possible mouse drag start
  	ICoord2D m_mouseRightDragLift;			// the location of a possible mouse drag end
@@ -79,6 +76,7 @@ enum FilterTypes CPP_11(: Int)
 	FT_VIEW_BW_FILTER,		//filter to apply a black & white filter to the screen.
 	FT_VIEW_MOTION_BLUR_FILTER, //filter to apply motion blur filter to screen.
 	FT_VIEW_CROSSFADE,				///<filter to apply a cross blend between previous/current views.
+	FT_VIEW_DEFAULT,				///<default filter mode for default filter.
 	FT_MAX
 };
 
@@ -95,7 +93,7 @@ enum FilterModes CPP_11(: Int)
 	FM_VIEW_CROSSFADE_CIRCLE,	// Fades from previous to current view using expanding circle.
 	FM_VIEW_CROSSFADE_FB_MASK,	// Fades from previous to current using mask stored in framebuffer alpha.
 
-	// These apply to FT_VIEW_MOTION_BLUR_FILTER 
+	// These apply to FT_VIEW_MOTION_BLUR_FILTER
 	FM_VIEW_MB_IN_AND_OUT_ALPHA, // Motion blur filter in and out alpha blur
 	FM_VIEW_MB_IN_AND_OUT_SATURATE, // Motion blur filter in and out saturated blur
 	FM_VIEW_MB_IN_ALPHA, // Motion blur filter in alpha blur
@@ -104,8 +102,8 @@ enum FilterModes CPP_11(: Int)
 	FM_VIEW_MB_OUT_SATURATE, // Motion blur filter out saturated blur
 	FM_VIEW_MB_END_PAN_ALPHA, // Moton blur on screen pan (for camera tracks object mode)
 
-	
-	
+	FM_VIEW_DEFAULT,	//Default filter that's enabled when all others are off.
+
 	// NOTE: This has to be the last entry in this enum.
 	// Add new entries before this one.  jba.
 	FM_VIEW_MB_PAN_ALPHA, // Moton blur on screen pan (for camera tracks object mode)
@@ -124,5 +122,3 @@ class PickAndPlayInfo
 };
 
 extern void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type msgType, PickAndPlayInfo *info = NULL );
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h
index 47e96c62fc3..19e6580aae9 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __CONTROLBAR_H_
-#define __CONTROLBAR_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/GameType.h"
@@ -99,12 +96,10 @@ enum CommandOption CPP_11(: Int)
 	SCRIPT_ONLY									= 0x00080000, // Only a script can use this command (not by users)
 	IGNORES_UNDERPOWERED				= 0x00100000, // this button isn't disabled if its object is merely underpowered
 	USES_MINE_CLEARING_WEAPONSET= 0x00200000,	// uses the special mine-clearing weaponset, even if not current
-
-	NUM_COMMAND_OPTIONS						// keep this last
 };
 
 #ifdef DEFINE_COMMAND_OPTION_NAMES
-static const char *TheCommandOptionNames[] = 
+static const char *const TheCommandOptionNames[] =
 {
 	"NEED_TARGET_ENEMY_OBJECT",
 	"NEED_TARGET_NEUTRAL_OBJECT",
@@ -138,7 +133,7 @@ static const char *TheCommandOptionNames[] =
 #endif  // end DEFINE_COMMAND_OPTION_NAMES
 
 // convenient bit masks to group some command options together
-const UnsignedInt COMMAND_OPTION_NEED_TARGET = 
+const UnsignedInt COMMAND_OPTION_NEED_TARGET =
 					NEED_TARGET_ENEMY_OBJECT |
 					NEED_TARGET_NEUTRAL_OBJECT |
 					NEED_TARGET_ALLY_OBJECT |
@@ -156,7 +151,7 @@ const UnsignedInt COMMAND_OPTION_NEED_OBJECT_TARGET =
 	* on all units, in fact, many commands are for a particular single command.  It will
 	* be up to the command GUI to translate the command assigned to a button into the
 	* appropriate game command and get it across the network to the game logic to perform the
-	* actual command logic 
+	* actual command logic
 	*
 	* IMPORTANT: Make sure the GUICommandType enum and the TheGuiCommandNames[] have the same
 	*						 entries in the same order */
@@ -208,11 +203,11 @@ enum GUICommandType CPP_11(: Int)
 
 	// add more commands here, don't forget to update the string command list below too ...
 
-	GUI_COMMAND_NUM_COMMANDS							// keep this last
+	GUI_COMMAND_NUM_COMMANDS
 };
 
 #ifdef DEFINE_GUI_COMMMAND_NAMES
-static const char *TheGuiCommandNames[] = 
+static const char *const TheGuiCommandNames[] =
 {
 	"NONE",
 	"DOZER_CONSTRUCT",
@@ -254,6 +249,7 @@ static const char *TheGuiCommandNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheGuiCommandNames) == GUI_COMMAND_NUM_COMMANDS + 1, "Incorrect array size");
 #endif  // end DEFINE_GUI_COMMAND_NAMES
 
 enum CommandButtonMappedBorderType CPP_11(: Int)
@@ -264,21 +260,22 @@ enum CommandButtonMappedBorderType CPP_11(: Int)
 	COMMAND_BUTTON_BORDER_ACTION,
 	COMMAND_BUTTON_BORDER_SYSTEM,
 
-	COMMAND_BUTTON_BORDER_COUNT // keep this last
+	COMMAND_BUTTON_BORDER_COUNT
 };
 
-static const LookupListRec CommandButtonMappedBorderTypeNames[] = 
+static const LookupListRec CommandButtonMappedBorderTypeNames[] =
 {
 	{ "NONE",					COMMAND_BUTTON_BORDER_NONE },
 	{ "BUILD",				COMMAND_BUTTON_BORDER_BUILD },
 	{ "UPGRADE",			COMMAND_BUTTON_BORDER_UPGRADE },
 	{ "ACTION",				COMMAND_BUTTON_BORDER_ACTION },
 	{ "SYSTEM",				COMMAND_BUTTON_BORDER_SYSTEM },
-	
-	{ NULL, 0	}// keep this last!
+
+	{ NULL, 0	}
 };
+static_assert(ARRAY_SIZE(CommandButtonMappedBorderTypeNames) == COMMAND_BUTTON_BORDER_COUNT + 1, "Incorrect array size");
 //-------------------------------------------------------------------------------------------------
-/** Command buttons are used to load the buttons we place on throughout the command bar 
+/** Command buttons are used to load the buttons we place on throughout the command bar
 	* interface in different context sensitive windows depending on the situation and
 	* type of the object selected */
 //-------------------------------------------------------------------------------------------------
@@ -302,7 +299,7 @@ class CommandButton : public Overridable
 	Bool isValidObjectTarget(const Player* sourcePlayer, const Object* targetObj) const;
 	Bool isValidObjectTarget(const Object* sourceObj, const Object* targetObj) const;
 	Bool isValidObjectTarget(const Drawable* source, const Drawable* target) const;
-	
+
 	// Note: It is perfectly valid for either (or both!) of targetObj and targetLocation to be NULL.
 	// This is a convenience function to make several calls to other functions.
 	Bool isValidToUseOn(const Object *sourceObj, const Object *targetObj, const Coord3D *targetLocation, CommandSourceType commandSource) const;
@@ -341,20 +338,20 @@ class CommandButton : public Overridable
 
 	// bleah. shouldn't be const, but is. sue me. (srj)
 	void copyImagesFrom( const CommandButton *button, Bool markUIDirtyIfChanged ) const;
-	
+
 	// bleah. shouldn't be const, but is. sue me. (Kris) -snork!
 	void copyButtonTextFrom( const CommandButton *button, Bool shortcutButton, Bool markUIDirtyIfChanged ) const;
 
 	// bleah. shouldn't be const, but is. sue me. (srj)
 	void setFlashCount(Int c) const { m_flashCount = c; }
-	
+
 	// only for ControlBar!
 	void friend_addToList(CommandButton** list) {	m_next = *list;	*list = this; }
 	CommandButton* friend_getNext() { return m_next; }
 
 private:
 	AsciiString										m_name;												///< template name
-	GUICommandType								m_command;										///< type of command this button 
+	GUICommandType								m_command;										///< type of command this button
 	CommandButton*								m_next;
 	UnsignedInt										m_options;										///< command options (see CommandOption enum)
 	const ThingTemplate*					m_thingTemplate;							///< for commands that use thing templates in command data
@@ -367,7 +364,7 @@ class CommandButton : public Overridable
 	// bleah. shouldn't be mutable, but is. sue me. (Kris) -snork!
 	mutable AsciiString										m_textLabel;									///< string manager text label
 	mutable AsciiString										m_descriptionLabel;						///< The description of the current command, read in from the ini
-	
+
 	AsciiString										m_purchasedLabel;							///< Description for the current command if it has already been purchased.
 	AsciiString										m_conflictingLabel;						///< Description for the current command if it can't be selected due to multually-exclusive choice.
 	WeaponSlotType								m_weaponSlot;									///< for commands that refer to a weapon slot
@@ -391,7 +388,7 @@ class CommandButton : public Overridable
 //-------------------------------------------------------------------------------------------------
 enum { MAX_COMMANDS_PER_SET = 12 };  // user interface max button limit for commands
 enum { MAX_RIGHT_HUD_UPGRADE_CAMEOS = 5};
-enum { 
+enum {
 			 MAX_PURCHASE_SCIENCE_RANK_1 = 3,
 			 MAX_PURCHASE_SCIENCE_RANK_3 = 12,
 			 MAX_PURCHASE_SCIENCE_RANK_8 = 1,
@@ -437,8 +434,6 @@ class SideSelectWindowData
 public:
 	SideSelectWindowData(void)
 	{
-		//Added By Sadullah Nader
-		//Initializations
 		generalSpeak = NULL;
 		m_currColor = 0;
 		m_gereralsNameWin = NULL;
@@ -462,10 +457,9 @@ class SideSelectWindowData
 		m_upgradeLabel3Win = NULL;
 		m_upgradeLabel4Win = NULL;
 		sideWindow = NULL;
-		//
 	}
 	~SideSelectWindowData(void);
-	
+
 	void init( ScienceType science, GameWindow *control );
 	void reset( void );
 	void update( void );
@@ -491,7 +485,7 @@ class SideSelectWindowData
 	GameWindow *m_gereralsNameWin;
 	GameWindow *m_sideNameWin;
 
-	
+
 	GameWindow *m_upgradeLabel1Win;
 	GameWindow *m_upgradeLabel2Win;
 	GameWindow *m_upgradeLabel3Win;
@@ -501,7 +495,7 @@ class SideSelectWindowData
 	GameWindow *m_upgradeImage2Win;
 	GameWindow *m_upgradeImage3Win;
 	GameWindow *m_upgradeImage4Win;
-	
+
 	Image *m_upgradeImage1;
 	Image *m_upgradeImage2;
 	Image *m_upgradeImage3;
@@ -509,7 +503,7 @@ class SideSelectWindowData
 
 	IRegion2D m_leftLineFromButton;
 	IRegion2D m_rightLineFromButton;
-	
+
 	IRegion2D m_upgradeLine1a;
 	IRegion2D m_upgradeLine2a;
 	IRegion2D m_upgradeLine3a;
@@ -519,7 +513,7 @@ class SideSelectWindowData
 	IRegion2D m_upgradeLine2;
 	IRegion2D m_upgradeLine3;
 	IRegion2D m_upgradeLine4;
-	
+
 	IRegion2D m_upgradeLine1MidReg;
 	IRegion2D m_upgradeLine2MidReg;
 	IRegion2D m_upgradeLine3MidReg;
@@ -534,12 +528,12 @@ class SideSelectWindowData
 	ICoord2D m_line1End;
 	ICoord2D m_line2End;
 
-	
+
 	ICoord2D m_upgradeLine1Mid;
 	ICoord2D m_upgradeLine2Mid;
 	ICoord2D m_upgradeLine3Mid;
 	ICoord2D m_upgradeLine4Mid;
-	
+
 	ICoord2D m_upgradeLine1End;
 	ICoord2D m_upgradeLine2End;
 	ICoord2D m_upgradeLine3End;
@@ -574,8 +568,6 @@ enum ControlBarContext CPP_11(: Int)
 	CB_CONTEXT_OBSERVER_INFO,					///< for when we want to populate the player info
 	CB_CONTEXT_OBSERVER_LIST,					///< for when we want to update the observer list
 	CB_CONTEXT_OCL_TIMER,							///< Countdown for OCL spewers
-
-	NUM_CB_CONTEXTS
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -628,7 +620,7 @@ enum ControlBarStages CPP_11(: Int)
 	CONTROL_BAR_STAGE_SQUISHED,				///< squished just for expeirenced players
 	CONTROL_BAR_STAGE_LOW,						///< control bar a la minimalist
 	CONTROL_BAR_STAGE_HIDDEN,					///< yo, where be da control bar at?
-	
+
 	MAX_CONTROL_BAR_STAGES
 };
 
@@ -660,14 +652,14 @@ class ControlBar : public SubsystemInterface
 
 	/** if this button is part of the context sensitive command system, process a button click
 	the gadgetMessage is either a GBM_SELECTED or GBM_SELECTED_RIGHT */
-	CBCommandStatus processContextSensitiveButtonClick( GameWindow *button, 
+	CBCommandStatus processContextSensitiveButtonClick( GameWindow *button,
 																											GadgetGameMessage gadgetMessage );
 
 	/** if this button is part of the context sensitive command system, process the Transition
 	gadgetMessage is either a GBM_MOUSE_LEAVING or GBM_MOUSE_ENTERING */
-	CBCommandStatus processContextSensitiveButtonTransition( GameWindow *button, 
+	CBCommandStatus processContextSensitiveButtonTransition( GameWindow *button,
 																											GadgetGameMessage gadgetMessage );
-	
+
 
 	/// is the drawable the currently selected drawable for the context sensitive UI?
 	Bool isDrivingContextUI( Drawable *draw ) const { return draw == m_currentSelectedDrawable; }
@@ -690,7 +682,9 @@ class ControlBar : public SubsystemInterface
 	void showSpecialPowerShortcut( void );
 	void hideSpecialPowerShortcut( void );
 	void animateSpecialPowerShortcut( Bool isOn );
-	
+
+	void setFullViewportHeight();
+	void setScaledViewportHeight();
 
 	/// set the control bar to the proper scheme based off a player template that's passed in
 	ControlBarSchemeManager *getControlBarSchemeManager( void ) { return m_controlBarSchemeManager; }
@@ -703,7 +697,7 @@ class ControlBar : public SubsystemInterface
 
 	/// We need to sometime change what the images look like depending on what scheme we're using
 	void updateRightHUDImage( const Image *image );
-	
+
 	/// We need to be able to update the command marker image based on which scheme we're using.
 	void updateCommandMarkerImage( const Image *image );
 	void updateSlotExitImage( const Image *image);
@@ -723,12 +717,21 @@ class ControlBar : public SubsystemInterface
 
 	// Initialize the Observer controls Must be called after we've already loaded the window
 	void initObserverControls( void );
-	void setObserverLookAtPlayer (Player *p) { m_observerLookAtPlayer = p;}
-	Player *getObserverLookAtPlayer (void ) { return m_observerLookAtPlayer;}
 	void populateObserverInfoWindow ( void );
 	void populateObserverList( void );
 	Bool isObserverControlBarOn( void ) { return m_isObserverCommandBar;}
-	
+
+	void setObserverLookAtPlayer (Player *player); ///< Sets the looked at player. Used to present information about the player.
+	Player *getObserverLookAtPlayer (void ) const { return m_observerLookAtPlayer; } ///< Returns the looked at player. Can return null.
+
+	void setObservedPlayer(Player *player); ///< Sets the observed player. Used to present the game world as if that player was the local player.
+	Player *getObservedPlayer() const { return m_observedPlayer; } ///< Return the observed player. Can return null.
+
+	/// Returns the currently viewed player. May return NULL if no player is selected while observing.
+	Player* getCurrentlyViewedPlayer();
+	/// Returns the relationship with the currently viewed player. May return NEUTRAL if no player is selected while observing.
+	Relationship getCurrentlyViewedPlayerRelationship(const Team* team);
+
 //	ControlBarResizer *getControlBarResizer( void ) {return m_controlBarResizer;}
 
 	// Functions for repositioning/resizing the control bar
@@ -753,13 +756,13 @@ class ControlBar : public SubsystemInterface
 	void drawTransitionHandler( void );
 	const Image *getArrowImage( void ){ return m_genArrow;	}
 	void setArrowImage( const Image *arrowImage ){ m_genArrow = arrowImage;	}
-	
+
 	void initSpecialPowershortcutBar( Player *player);
 
 	void triggerRadarAttackGlow( void );
 protected:
 	void updateRadarAttackGlow ( void );
-	
+
 	void setDefaultControlBarConfig( void );
 	void setSquishedControlBarConfig( void );
 	void setLowControlBarConfig( void );
@@ -767,7 +770,7 @@ class ControlBar : public SubsystemInterface
 
 	/// find existing command button if present
 	CommandButton* findNonConstCommandButton( const AsciiString& name );
-	
+
 	/// allocate a new command button, link to list, initialize to default, and return
 	CommandButton *newCommandButton( const AsciiString& name );
 	CommandButton *newCommandButtonOverride( CommandButton *buttonToOverride );
@@ -829,12 +832,12 @@ class ControlBar : public SubsystemInterface
 	void updateContextBeacon( void );
 	void updateContextUnderConstruction( void );
 	void updateContextOCLTimer( void );
-	
+
 	// the following methods are for the special power shortcut window
 
 	void populateSpecialPowerShortcut( Player *player);
 	void updateSpecialPowerShortcut( void );
-	
+
 	static const Image* calculateVeterancyOverlayForThing( const ThingTemplate *thingTemplate );
 	static const Image* calculateVeterancyOverlayForObject( const Object *obj );
 
@@ -870,7 +873,7 @@ class ControlBar : public SubsystemInterface
 	Drawable *m_currentSelectedDrawable;					///< currently selected drawable for the context sensitive interface
 	ControlBarContext m_currContext;							///< our current displayed context
 
-	DrawableID m_rallyPointDrawableID;						///< rally point drawable for visual rally point 
+	DrawableID m_rallyPointDrawableID;						///< rally point drawable for visual rally point
 
 	Real m_displayedConstructPercent;							///< construct percent last displayed to user
 	UnsignedInt m_displayedOCLTimerSeconds;				///< OCL Timer seconds remaining last displayed to user
@@ -883,7 +886,7 @@ class ControlBar : public SubsystemInterface
 	GameWindow *m_rightHUDUnitSelectParent;
 
 	GameWindow *m_communicatorButton;             ///< button for the communicator
-	
+
 	WindowLayout *m_scienceLayout;								///< the Science window layout
 	GameWindow *m_sciencePurchaseWindowsRank1[ MAX_PURCHASE_SCIENCE_RANK_1 ];			///< command window controls for easy access
 	GameWindow *m_sciencePurchaseWindowsRank3[ MAX_PURCHASE_SCIENCE_RANK_3 ];			///< command window controls for easy access
@@ -900,7 +903,7 @@ class ControlBar : public SubsystemInterface
 	const CommandButton *m_commonCommands[ MAX_COMMANDS_PER_SET ];	///< shared commands we will use for multi-selection
 
 		// removed from multiplayer branch
-	//GameWindow *m_commandMarkers[ MAX_COMMANDS_PER_SET ];			///< When we don't have a command, they want to show an image	
+	//GameWindow *m_commandMarkers[ MAX_COMMANDS_PER_SET ];			///< When we don't have a command, they want to show an image
 // removed from multiplayer branch
 	//void showCommandMarkers( void );													///< function that compare's what's being shown in m_commandWindows and shows the ones that are hidden.
 
@@ -944,11 +947,12 @@ class ControlBar : public SubsystemInterface
 
 	Color m_buildUpClockColor;
 
-	Bool m_isObserverCommandBar;												///< If this is true, the command bar behaves greatly differnt
+	Bool m_isObserverCommandBar;												///< If this is true, the command bar behaves greatly different
 	Player *m_observerLookAtPlayer;											///< The current player we're looking at, Null if we're not looking at anyone.
+	Player *m_observedPlayer;														///< The current player we're observing, Null if we're not observing anyone.
 
 	WindowLayout *m_buildToolTipLayout;										///< The window that will slide on/display tooltips
-	Bool m_showBuildToolTipLayout;											///< every frame we test to see if we aregoing to continue showing this or not.
+	Bool m_showBuildToolTipLayout;											///< every frame we test to see if we are going to continue showing this or not.
 public:
 	void showBuildTooltipLayout( GameWindow *cmdButton );
 	void hideBuildTooltipLayout( void );
@@ -964,7 +968,7 @@ class ControlBar : public SubsystemInterface
 	Color m_commandButtonBorderActionColor;
 	Color m_commandButtonBorderUpgradeColor;
 	Color m_commandButtonBorderSystemColor;
-	
+
 	Color m_commandBarBorderColor;
 
 	void setCommandBarBorder( GameWindow *button, CommandButtonMappedBorderType type);
@@ -999,24 +1003,21 @@ class ControlBar : public SubsystemInterface
 
 	Bool m_genStarFlash;
 	Int m_lastFlashedAtPointValue;
-	
+
 	ICoord2D m_controlBarForegroundMarkerPos;
 	ICoord2D m_controlBarBackgroundMarkerPos;
-	
+
 	Bool m_radarAttackGlowOn;
 	Int m_remainingRadarAttackGlowFrames;
 	GameWindow *m_radarAttackGlowWindow;
 
-#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG )
+#if defined(RTS_DEBUG)
 	UnsignedInt m_lastFrameMarkedDirty;
 	UnsignedInt m_consecutiveDirtyFrames;
 #endif
 //	ControlBarResizer *m_controlBarResizer;
 
-}; 
+};
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern ControlBar *TheControlBar;
-
-#endif  // end __CONTROLBAR_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h b/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h
index 3ae55dce397..62b82e01ad9 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarResizer.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,17 +37,14 @@
 //	Filename: 	ControlBarResizer.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CONTROL_BAR_RESIZER_H_
-#define __CONTROL_BAR_RESIZER_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -79,7 +76,7 @@ class ControlBarResizer
 public:
 	ControlBarResizer( void );
 	~ControlBarResizer( void );
-	
+
 	void init( void );
 
 	// parse Functions for the INI file
@@ -88,7 +85,7 @@ class ControlBarResizer
 
 	ResizerWindow *findResizerWindow( AsciiString name ); ///< attempt to find the control bar scheme by it's name
 	ResizerWindow *newResizerWindow( AsciiString name );	///< create a new control bar scheme and return it.
-	
+
 	void sizeWindowsDefault( void );
 	void sizeWindowsAlt( void );
 
@@ -103,5 +100,3 @@ class ControlBarResizer
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __CONTROL_BAR_RESIZER_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h b/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h
index a1430b17b09..7c4852c2626 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarScheme.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Apr 2002
@@ -37,17 +37,14 @@
 //	Filename: 	ControlBarScheme.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CONTROL_BAR_SCHEME_H_
-#define __CONTROL_BAR_SCHEME_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -86,7 +83,7 @@ class ControlBarSchemeImage
 
 	// m_layer is where the image will get drawn,  everything in layer 0-2 gets drawn during the forground draw
 	// the layers 3-5 gets drawn during the background draw
-	Int m_layer; //layer means how deep the image will be drawn, it's a number between 0-5 with 0 being on top 	
+	Int m_layer; //layer means how deep the image will be drawn, it's a number between 0-5 with 0 being on top
 };
 
 // Class that will hold the information needed for the animations
@@ -128,10 +125,10 @@ class ControlBarScheme
 public:
 	ControlBarScheme( void );
 	~ControlBarScheme( void );
-	
+
 	void init( void );
 	void update( void );
-	void drawForeground( Coord2D multi, ICoord2D offset );	///< draw function to be called within a w3d draw procedure for the foreground 
+	void drawForeground( Coord2D multi, ICoord2D offset );	///< draw function to be called within a w3d draw procedure for the foreground
 	void drawBackground( Coord2D multi, ICoord2D offset );	///< draw function to be called within a w3d draw procedure for the background
 	void reset( void );
 
@@ -142,11 +139,11 @@ class ControlBarScheme
 
 	AsciiString m_name;												///< it's name
 	ICoord2D m_ScreenCreationRes;							///< Used to determine what screen res this will look the best on
-	AsciiString m_side;												///< contain what faction type this command bar was made for (used when selecting command bar by template	
+	AsciiString m_side;												///< contain what faction type this command bar was made for (used when selecting command bar by template
 	Image *m_buttonQueueImage;								///< We'll probably want each one to have it's own image.
 	Image *m_rightHUDImage;										///< We'll probably want each one to have it's own right HUD image.
 	Color m_buildUpClockColor;								///< we can setup the color for the buildup clock if we want
-	
+
 	Color m_borderBuildColor;									///< we can setup the color for the button border colors
 	Color m_borderActionColor;								///< we can setup the color for the button border colors
 	Color m_borderUpgradeColor;								///< we can setup the color for the button border colors
@@ -252,20 +249,20 @@ class ControlBarSchemeManager
 
 	void init( void );						///< Initialize from the INI files
 	void update( void );					///< move the animations if we have any
-	void drawForeground( ICoord2D offset );	///< draw function to be called within a w3d draw procedure for the foreground 
+	void drawForeground( ICoord2D offset );	///< draw function to be called within a w3d draw procedure for the foreground
 	void drawBackground( ICoord2D offset );	///< draw function to be called within a w3d draw procedure for the background
 
 	void setControlBarSchemeByPlayer(Player *p);																				///< Based off the playerTemplate, pick the right scheme for the control bar
 	void setControlBarSchemeByPlayerTemplate( const PlayerTemplate *pt, Bool useSmall = FALSE);
 	void setControlBarScheme(AsciiString schemeName);																										///< SchemeName must be a valid INI entry
-	
+
 	// parse Functions for the INI file
 	const FieldParse *getFieldParse() const { return m_controlBarSchemeFieldParseTable; }								///< returns the parsing fields
 	static const FieldParse m_controlBarSchemeFieldParseTable[];																				///< the parse table
 	static void parseImagePart( INI* ini, void *instance, void *store, const void *userData );					///< Parse the image part of the INI file
 	static void parseAnimatingPart( INI* ini, void *instance, void *store, const void *userData );			///< Parse the animation part of the INI file
-	static void parseAnimatingPartImage( INI* ini, void *instance, void *store, const void *userData );	///< parse the image part of the animation part :) 
-	
+	static void parseAnimatingPartImage( INI* ini, void *instance, void *store, const void *userData );	///< parse the image part of the animation part :)
+
 	ControlBarScheme *findControlBarScheme( AsciiString name ); ///< attempt to find the control bar scheme by it's name
 	ControlBarScheme *newControlBarScheme( AsciiString name );	///< create a new control bar scheme and return it.
 
@@ -273,8 +270,8 @@ class ControlBarSchemeManager
 
 private:
 	ControlBarScheme *m_currentScheme;													///< the current scheme that everythign uses
-	Coord2D m_multiplyer;																	
-	
+	Coord2D m_multiplyer;
+
 	typedef std::list< ControlBarScheme* > ControlBarSchemeList;			///< list of control bar schemes
 	ControlBarSchemeList m_schemeList;
 
@@ -287,5 +284,3 @@ class ControlBarSchemeManager
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __CONTROL_BAR_SCHEME_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/Credits.h b/Generals/Code/GameEngine/Include/GameClient/Credits.h
index 3cccf6f86a0..bba068bd64f 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Credits.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Credits.h
@@ -24,12 +24,12 @@
 
 // FILE: Credits.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Dec 2002
@@ -37,7 +37,7 @@
 //	Filename: 	Credits.h
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	header file for the credits
 //
 //-----------------------------------------------------------------------------
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __CREDITS_H_
-#define __CREDITS_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -67,24 +64,26 @@ class DisplayString;
 enum
 {
 CREDIT_STYLE_TITLE = 0,
-CREDIT_STYLE_POSITION, 
+CREDIT_STYLE_POSITION,
 CREDIT_STYLE_NORMAL,
 CREDIT_STYLE_COLUMN,
 CREDIT_STYLE_BLANK,			///< Keep this second to last
-MAX_CREDIT_STYLES				///< Keep this last
+
+MAX_CREDIT_STYLES
 };
 
 enum{ CREDIT_SPACE_OFFSET = 2 };
 
-static const LookupListRec CreditStyleNames[] = 
+static const LookupListRec CreditStyleNames[] =
 {
 	{ "TITLE",					CREDIT_STYLE_TITLE },
 	{ "MINORTITLE",				CREDIT_STYLE_POSITION },
 	{ "NORMAL",			CREDIT_STYLE_NORMAL },
 	{ "COLUMN",				CREDIT_STYLE_COLUMN },
-	
-	{ NULL, 0	}// keep this last!
+	// CREDIT_STYLE_BLANK
+	{ NULL, 0	}
 };
+static_assert(ARRAY_SIZE(CreditStyleNames) == MAX_CREDIT_STYLES, "Incorrect array size");
 
 
 class CreditsLine
@@ -124,7 +123,7 @@ class CreditsManager: public SubsystemInterface
 	static const FieldParse m_creditsFieldParseTable[];																				///< the parse table
 	static void parseBlank( INI* ini, void *instance, void *store, const void *userData );					///< Parse the image part of the INI file
 	static void parseText( INI* ini, void *instance, void *store, const void *userData );					///< Parse the image part of the INI file
-	
+
 	Bool isFinished( void ) { return m_isFinished;	}
 	void addBlank( void );
 	void addText( AsciiString text );
@@ -145,7 +144,7 @@ class CreditsManager: public SubsystemInterface
 	Color			m_titleColor;
 	Color			m_positionColor;
 	Color			m_normalColor;
-	
+
 	Int m_currentStyle;
 
 	Bool m_isFinished;
@@ -163,4 +162,3 @@ class CreditsManager: public SubsystemInterface
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 extern CreditsManager *TheCredits;
-#endif // __CREDITS_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h b/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h
index c156b900b97..145cff3c5dc 100644
--- a/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h
+++ b/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    Generals
@@ -43,16 +43,12 @@
 
 #pragma once
 
-#ifndef __GAMECLIENT_DEBUGDISPLAY_H
-#define __GAMECLIENT_DEBUGDISPLAY_H
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "Lib/BaseType.h"
-#include <stdio.h>
+#include <Utility/stdio_adapter.h>
 
 
 //----------------------------------------------------------------------------
@@ -67,7 +63,7 @@
 
 
 //===============================
-// DebugDisplayInterface 
+// DebugDisplayInterface
 //===============================
 
 class DebugDisplayInterface
@@ -83,7 +79,6 @@ class DebugDisplayInterface
 			RED,
 			GREEN,
 			BLUE,
-			NUM_COLORS
 		};
 
 		virtual ~DebugDisplayInterface() {};
@@ -106,7 +101,7 @@ class DebugDisplayInterface
 
 
 //===============================
-// DebugDisplay 
+// DebugDisplay
 //===============================
 
 class DebugDisplay : public DebugDisplayInterface
@@ -142,15 +137,11 @@ class DebugDisplay : public DebugDisplayInterface
 
 // displayers
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 extern void AudioDebugDisplay( DebugDisplayInterface *debugDisplay, void *userData, FILE *fp );
 #endif
 
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-
-#endif // __GAMECLIENT_DEBUGDISPLAY_H
diff --git a/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h b/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h
index 0011d93d7da..a26861cf437 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h
@@ -28,13 +28,8 @@
 
 #pragma once
 
-#ifndef __DIPLOMACY_H__
-#define __DIPLOMACY_H__
-
 void PopulateInGameDiplomacyPopup( void );
 void UpdateDiplomacyBriefingText(AsciiString newText, Bool clear);
 
 typedef std::list<AsciiString> BriefingList;
 BriefingList* GetBriefingTextList(void);
-
-#endif // #ifndef __DIPLOMACY_H__
diff --git a/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h b/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h
index 7561cc37057..457c263febd 100644
--- a/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h
+++ b/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __DISCONNECTDIALOG_H
-#define __DISCONNECTDIALOG_H
-
 #include "GameNetwork/DisconnectManager.h"
 
 enum DisconnectMenuStateType CPP_11(: Int) {
@@ -69,15 +65,13 @@ class DisconnectMenu {
 	DisconnectManager *m_disconnectManager;		///< For retrieving status updates from the disconnect manager.
 	DisconnectMenuStateType m_menuState;			///< The current state of the menu screen.
 
-	static const char *m_playerNameTextControlNames[MAX_SLOTS];	///< names of the player name controls in the window.
-	static const char *m_playerTimeoutTextControlNames[MAX_SLOTS]; ///< names of the timeout controls in the window.
-	static const char *m_playerVoteButtonControlNames[MAX_SLOTS];	///< names of the vote button controls in the window.
-	static const char *m_playerVoteCountControlNames[MAX_SLOTS];	///< names of the vote count static text controls in the window.
-	static const char *m_packetRouterTimeoutControlName;	///< name of the packet router timeout control window.
-	static const char *m_packetRouterTimeoutLabelControlName; ///< name of the packet router timeout label control window.
-	static const char *m_textDisplayControlName;	///< name of the text display listbox control window.
+	static const char *const m_playerNameTextControlNames[MAX_SLOTS];	///< names of the player name controls in the window.
+	static const char *const m_playerTimeoutTextControlNames[MAX_SLOTS]; ///< names of the timeout controls in the window.
+	static const char *const m_playerVoteButtonControlNames[MAX_SLOTS];	///< names of the vote button controls in the window.
+	static const char *const m_playerVoteCountControlNames[MAX_SLOTS];	///< names of the vote count static text controls in the window.
+	static const char *const m_packetRouterTimeoutControlName;	///< name of the packet router timeout control window.
+	static const char *const m_packetRouterTimeoutLabelControlName; ///< name of the packet router timeout label control window.
+	static const char *const m_textDisplayControlName;	///< name of the text display listbox control window.
 };
 
 extern DisconnectMenu *TheDisconnectMenu;
-
-#endif // #ifndef __DISCONNECTDIALOG_H
diff --git a/Generals/Code/GameEngine/Include/GameClient/Display.h b/Generals/Code/GameEngine/Include/GameClient/Display.h
index 1a873ce8e66..3d6a9d857cc 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Display.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Display.h
@@ -28,16 +28,10 @@
 
 #pragma once
 
-#ifndef _GAME_DISPLAY_H_
-#define _GAME_DISPLAY_H_
-
-#include <stdio.h>
 #include "Common/SubsystemInterface.h"
-#include "View.h"
 #include "GameClient/Color.h"
 #include "GameClient/GameFont.h"
-
-class View;
+#include "GameClient/View.h"
 
 struct ShroudLevel
 {
@@ -78,7 +72,7 @@ class Display : public SubsystemInterface
 
 	//---------------------------------------------------------------------------------------
 	// Display attribute methods
-	virtual void setWidth( UnsignedInt width );										///< Sets the width of the display		
+	virtual void setWidth( UnsignedInt width );										///< Sets the width of the display
 	virtual void setHeight( UnsignedInt height );									///< Sets the height of the display
 	virtual UnsignedInt getWidth( void ) { return m_width; }			///< Returns the width of the display
 	virtual UnsignedInt getHeight( void ) { return m_height; }		///< Returns the height of the display
@@ -92,7 +86,7 @@ class Display : public SubsystemInterface
  	virtual void setGamma(Real gamma, Real bright, Real contrast, Bool calibrate) {};
 	virtual Bool testMinSpecRequirements(Bool *videoPassed, Bool *cpuPassed, Bool *memPassed,StaticGameLODLevel *idealVideoLevel=NULL, Real *cpuTime=NULL) {*videoPassed=*cpuPassed=*memPassed=true; return true;}
 	virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) = 0;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void dumpAssetUsage(const char* mapname) = 0;
 #endif
 
@@ -109,6 +103,7 @@ class Display : public SubsystemInterface
 
 	virtual void drawViews( void );																///< Render all views of the world
 	virtual void updateViews ( void );															///< Updates state of world views
+	virtual void stepViews(); ///< Update views for every fixed time step
 
 	virtual VideoBuffer*	createVideoBuffer( void ) = 0;							///< Create a video buffer that can be used for this display
 
@@ -118,17 +113,18 @@ class Display : public SubsystemInterface
 	virtual	Bool isClippingEnabled( void ) = 0;
 	virtual	void enableClipping( Bool onoff ) = 0;
 
+	virtual void step() {}; ///< Do one fixed time step
 	virtual void draw( void );																		///< Redraw the entire display
 	virtual void setTimeOfDay( TimeOfDay tod ) = 0;								///< Set the time of day for this display
-	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real attenuationWidth, 
+	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real attenuationWidth,
 																 UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE
 																 ) = 0;
 
 	/// draw a line on the display in pixel coordinates with the specified color
-	virtual void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
 												 Real lineWidth, UnsignedInt lineColor ) = 0;
 	/// draw a line on the display in pixel coordinates with the specified 2 colors
-	virtual void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
 												 Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) = 0;
 	/// draw a rect border on the display in pixel coordinates with the specified color
 	virtual void drawOpenRect( Int startX, Int startY, Int width, Int height,
@@ -136,20 +132,21 @@ class Display : public SubsystemInterface
 	/// draw a filled rect on the display in pixel coords with the specified color
 	virtual void drawFillRect( Int startX, Int startY, Int width, Int height,
 														 UnsignedInt color ) = 0;
-	
+
 	/// Draw a percentage of a rectange, much like a clock
 	virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) = 0;
 	virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) = 0;
 
 	/// draw an image fit within the screen coordinates
-	virtual void drawImage( const Image *image, Int startX, Int startY, 
+	virtual void drawImage( const Image *image, Int startX, Int startY,
 													Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA) = 0;
 
 	/// draw a video buffer fit within the screen coordinates
-	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY, 
+	virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) = 0;
+	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY,
 													Int endX, Int endY ) = 0;
 
-	/// FullScreen video playback 
+	/// FullScreen video playback
 	virtual void playLogoMovie( AsciiString movieName, Int minMovieLength, Int minCopyrightLength );
 	virtual void playMovie( AsciiString movieName );
 	virtual void stopMovie( void );
@@ -163,7 +160,7 @@ class Display : public SubsystemInterface
 	virtual void clearShroud() = 0;														///< empty the entire shroud
 	virtual void setBorderShroudLevel(UnsignedByte level) = 0;	///<color that will appear in unused border terrain.
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void dumpModelAssets(const char *path) = 0;	///< dump all used models/textures to a file.
 #endif
 	virtual void preloadModelAssets( AsciiString model ) = 0;	///< preload model asset
@@ -174,12 +171,14 @@ class Display : public SubsystemInterface
 	virtual void toggleLetterBox(void) = 0;										///< enabled letter-boxed display
 	virtual void enableLetterBox(Bool enable) = 0;						///< forces letter-boxed display on/off
 	virtual Bool isLetterBoxFading( void ) { return FALSE; }	///< returns true while letterbox fades in/out
+	virtual Bool isLetterBoxed( void ) { return FALSE; }	//WST 10/2/2002. Added query interface
 
 	virtual void setCinematicText( AsciiString string ) { m_cinematicText = string; }
 	virtual void setCinematicFont( GameFont *font ) { m_cinematicFont = font; }
 	virtual void setCinematicTextFrames( Int frames ) { m_cinematicTextFrames = frames; }
 
 	virtual Real getAverageFPS( void ) = 0;	///< returns the average FPS.
+	virtual Real getCurrentFPS( void ) = 0;	///< returns the current FPS.
 	virtual Int getLastFrameDrawCalls( void ) = 0;  ///< returns the number of draw calls issued in the previous frame
 
 protected:
@@ -219,10 +218,8 @@ extern Display *TheDisplay;
 
 extern void StatDebugDisplay( DebugDisplayInterface *dd, void *, FILE *fp = NULL );
 
-//Added By Saad
 //Necessary for display resolution confirmation dialog box
 //Holds the previous and current display settings
-
 typedef struct _DisplaySettings
 {
 	Int xRes;  //Resolution width
@@ -230,6 +227,3 @@ typedef struct _DisplaySettings
 	Int bitDepth; //Color Depth
 	Bool windowed; //Window mode TRUE: we're windowed, FALSE: we're not windowed
 } DisplaySettings;
-
-
-#endif // _GAME_DISPLAY_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/DisplayString.h b/Generals/Code/GameEngine/Include/GameClient/DisplayString.h
index 642157e058a..164ad25bbb2 100644
--- a/Generals/Code/GameEngine/Include/GameClient/DisplayString.h
+++ b/Generals/Code/GameEngine/Include/GameClient/DisplayString.h
@@ -24,12 +24,12 @@
 
 // FILE: DisplayString.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __DISPLAYSTRING_H_
-#define __DISPLAYSTRING_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -100,6 +97,9 @@ class DisplayString : public MemoryPoolObject
 	virtual void setClipRegion( IRegion2D *region );  ///< clip text in this region
 
 	virtual void removeLastChar( void );			///< remove the last character
+	virtual void truncateBy(const Int charCount);	///< remove the last charCount characters
+	virtual void truncateTo(const Int maxLength);	///< remove characters, if needed, until the string is maxLength long excluding null terminator
+
 	virtual void appendChar( WideChar c );		///< append character to end
 
 	DisplayString *next( void );							///< return next string
@@ -108,11 +108,11 @@ class DisplayString : public MemoryPoolObject
 
 	UnicodeString m_textString;
 	GameFont *m_font;			 ///< font to display this string with
-	
+
 	DisplayString *m_next;  ///< for the display string factory list ONLY
 	DisplayString *m_prev;	///< for the display string factory list ONLY
 
-};  // end DisplayString
+};
 
 ///////////////////////////////////////////////////////////////////////////////
 // INLINING ///////////////////////////////////////////////////////////////////
@@ -126,6 +126,3 @@ inline void DisplayString::notifyTextChanged( void ) {}
 inline DisplayString *DisplayString::next( void ) { return m_next; }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __DISPLAYSTRING_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h b/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h
index 2fe02600111..6ce394d3fe5 100644
--- a/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h
+++ b/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DISPLAYSTRINGMANAGER_H_
-#define __DISPLAYSTRINGMANAGER_H_
-
 #include "Common/SubsystemInterface.h"
 #include "GameClient/DisplayString.h"
 
@@ -66,6 +63,3 @@ class DisplayStringManager : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern DisplayStringManager *TheDisplayStringManager;  ///< singleton extern
-
-#endif // __DISPLAYSTRINGMANAGER_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h b/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h
index ff52efde124..0637bd8ec4b 100644
--- a/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h
+++ b/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h
@@ -27,8 +27,6 @@
 // Author: John K. McDonald, March 2002
 
 #pragma once
-#ifndef _H_DRAWGROUPINFO_
-#define _H_DRAWGROUPINFO_
 
 struct DrawGroupInfo
 {
@@ -43,14 +41,14 @@ struct DrawGroupInfo
 	Int m_dropShadowOffsetX;
 	Int m_dropShadowOffsetY;
 
-	union 
+	union
 	{
 		Int m_pixelOffsetX;
 		Real m_percentOffsetX;
 	};
 	Bool m_usingPixelOffsetX;
 
-	union 
+	union
 	{
 		Int m_pixelOffsetY;
 		Real m_percentOffsetY;
@@ -58,11 +56,9 @@ struct DrawGroupInfo
 	Bool m_usingPixelOffsetY;
 
 	DrawGroupInfo();
-	
+
 	static const FieldParse s_fieldParseTable[];		///< the parse table for INI definition
 	const FieldParse *getFieldParse( void ) const { return s_fieldParseTable; }
 };
 
 extern DrawGroupInfo *TheDrawGroupInfo;
-
-#endif /* _H_DRAWGROUPINFO */
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameClient/Drawable.h b/Generals/Code/GameEngine/Include/GameClient/Drawable.h
index 934b47d7e98..8d4c158d7c4 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Drawable.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Drawable.h
@@ -27,8 +27,6 @@
 // Author: Michael S. Booth, March 2001
 
 #pragma once
-#ifndef _DRAWABLE_H_
-#define _DRAWABLE_H_
 
 #include "Common/AudioEventRTS.h"
 #include "Common/GameType.h"
@@ -57,7 +55,7 @@ class Anim2DTemplate;
 class Image;
 enum BodyDamageType CPP_11(: Int);
 
-// this is a very worthwhile performance win. left conditionally defined for now, just 
+// this is a very worthwhile performance win. left conditionally defined for now, just
 // in case, but probably should be made permanent soon. (srj)
 #define DIRTY_CONDITION_FLAGS
 
@@ -69,7 +67,7 @@ enum BodyDamageType CPP_11(: Int);
 
 //-----------------------------------------------------------------------------
 //@TODO -- The drawable icon system needs to be implemented in a proper manner -- KM
-//				 Fact 1: Every drawable in the world shouldn't have to have a pointer 
+//				 Fact 1: Every drawable in the world shouldn't have to have a pointer
 //				 and frame counter for every possible icon type. It should be a dynamic vector.
 //				 Fact 2: It's polling every frame for every object on screen for every possible icon condition...
 // KM : I moved this into Drawable.cpp so I don't have to recompile the entire project
@@ -81,9 +79,8 @@ enum DrawableIconType CPP_11(: Int)
 /** NOTE: This enum MUST appear in the same order as TheDrawableIconNames array to be
 	* indexed correctly using that array */
 	ICON_INVALID = -1,
-	ICON_FIRST = 0,
 
-	ICON_DEFAULT_HEAL = ICON_FIRST,
+	ICON_DEFAULT_HEAL,
 	ICON_STRUCTURE_HEAL,
 	ICON_VEHICLE_HEAL,
 #ifdef ALLOW_DEMORALIZE
@@ -102,27 +99,28 @@ enum DrawableIconType CPP_11(: Int)
 	ICON_ENTHUSIASTIC_SUBLIMINAL,
 	ICON_CARBOMB,
 
-	MAX_ICONS									///< keep this last
+	MAX_ICONS,
+	ICON_FIRST = 0,
 };
 
 //-----------------------------------------------------------------------------
 class DrawableIconInfo : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DrawableIconInfo, "DrawableIconInfo" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DrawableIconInfo, "DrawableIconInfo" )
 public:
 	Anim2D*								m_icon[MAX_ICONS];
 	UnsignedInt						m_keepTillFrame[MAX_ICONS];
 
 	DrawableIconInfo();
 	//~DrawableIconInfo();
-	
+
 	void clear();
 	void killIcon(DrawableIconType t);
 
 };
 
 //-----------------------------------------------------------------------------
-struct TWheelInfo 
+struct TWheelInfo
 {
 	Real m_frontLeftHeightOffset;			 ///< Height offsets for tires due to suspension sway
 	Real m_frontRightHeightOffset;
@@ -136,7 +134,7 @@ struct TWheelInfo
 //-----------------------------------------------------------------------------
 class DrawableLocoInfo : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DrawableLocoInfo, "DrawableLocoInfo" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DrawableLocoInfo, "DrawableLocoInfo" )
 public:
 	Real m_pitch;								///< pitch of the entire drawable
 	Real m_pitchRate;						///< rate of change of pitch
@@ -158,18 +156,18 @@ class DrawableLocoInfo : public MemoryPoolObject
 //-----------------------------------------------------------------------------
 //* TintEnvelope handles the fading of the tint color up, down stable etc...
 //* assumes that 0,0,0, is the color for the AT REST state, used as decay target
-//* works like an ADSR envelope, 
-//* except that SUSTAIN and RELEASE are randomly (or never) triggered, externally 
+//* works like an ADSR envelope,
+//* except that SUSTAIN and RELEASE are randomly (or never) triggered, externally
 class TintEnvelope : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TintEnvelope, "TintEnvelope" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TintEnvelope, "TintEnvelope" )
 public:
 
 	TintEnvelope(void);
 	void update(void);  ///< does all the work
-	void play(const RGBColor *peak, 
-						UnsignedInt atackFrames = DEF_ATTACK_FRAMES, 
-						UnsignedInt decayFrames = DEF_DECAY_FRAMES, 
+	void play(const RGBColor *peak,
+						UnsignedInt attackFrames = DEF_ATTACK_FRAMES,
+						UnsignedInt decayFrames = DEF_DECAY_FRAMES,
 						UnsignedInt sustainAtPeak = DEF_SUSTAIN_FRAMES ); // ask MLorenzen
 	void sustain(void) { m_envState = ENVELOPE_STATE_SUSTAIN; }
 	void release(void) { m_envState = ENVELOPE_STATE_DECAY; }
@@ -187,7 +185,7 @@ class TintEnvelope : public MemoryPoolObject, public Snapshot
 private:
 
 	void setAttackFrames(UnsignedInt frames);
-	void setDecayFrames( UnsignedInt frames); 
+	void setDecayFrames( UnsignedInt frames);
 	void setPeakColor( const RGBColor *peak) {m_peakColor = Vector3( peak->red, peak->green, peak->blue );};
 	void setPeakColor( Real r, Real g, Real b ) {m_peakColor.Set( r, g, b );};
 
@@ -196,14 +194,14 @@ class TintEnvelope : public MemoryPoolObject, public Snapshot
 		ENVELOPE_STATE_REST,
 		ENVELOPE_STATE_ATTACK,
 		ENVELOPE_STATE_DECAY,
-		ENVELOPE_STATE_SUSTAIN ///< RELEASE IS THE LOGICAL COMPLIMENT TO SUSTAIN								
+		ENVELOPE_STATE_SUSTAIN ///< RELEASE IS THE LOGICAL COMPLIMENT TO SUSTAIN
 	};
 
-	Vector3							m_attackRate;		 	///< step amount to make tint turn on slow or fast 
+	Vector3							m_attackRate;		 	///< step amount to make tint turn on slow or fast
 	Vector3							m_decayRate;			///< step amount to make tint turn off slow or fast
 	Vector3							m_peakColor;			///< um, the peak color, what color we are headed toward during attack
 	Vector3							m_currentColor;		///< um, the current color, how we are colored, now
-	UnsignedInt					m_sustainCounter;
+	Real								m_sustainCounter;
 	Byte								m_envState;				///< a randomly switchable SUSTAIN state, release is compliment
 	Bool								m_affect;         ///< set TRUE if this has any effect (has a non 0,0,0 color).
 };
@@ -217,7 +215,7 @@ enum StealthLookType CPP_11(: Int)
 	STEALTHLOOK_DISGUISED_ENEMY,		///< we can have units that are disguised (instead of invisible)
 	STEALTHLOOK_VISIBLE_DETECTED,		///< unit is stealthed and invisible, but a second material pass
 																						///< is added to reveal the invisible unit as with heat vision
-	STEALTHLOOK_VISIBLE_FRIENDLY_DETECTED,		///< unit is stealthed-but-visible due to being detected, 
+	STEALTHLOOK_VISIBLE_FRIENDLY_DETECTED,		///< unit is stealthed-but-visible due to being detected,
 																						///< and rendered in heatvision effect second material pass
 	STEALTHLOOK_INVISIBLE						///< unit is stealthed-and-invisible
 };
@@ -225,14 +223,16 @@ enum StealthLookType CPP_11(: Int)
 // ------------------------------------------------------------------------------------------------
 /** Drawable status bits */
 // ------------------------------------------------------------------------------------------------
-enum DrawableStatus CPP_11(: Int)
+typedef UnsignedInt DrawableStatusBits;
+enum DrawableStatus CPP_11(: DrawableStatusBits)
 {
 	DRAWABLE_STATUS_NONE									= 0x00000000,		///< no status
 	DRAWABLE_STATUS_DRAWS_IN_MIRROR				=	0x00000001,		///< drawable can reflect
 	DRAWABLE_STATUS_SHADOWS								=	0x00000002,		///< use setShadowsEnabled() access method
-	DRAWABLE_STATUS_TINT_COLOR_LOCKED			=	0x00000004,		///< drawable tint color is "locked" and won't fade to normal
 	DRAWABLE_STATUS_NO_STATE_PARTICLES		= 0x00000008,		///< do *not* auto-create particle systems based on model condition
 	DRAWABLE_STATUS_NO_SAVE								= 0x00000010,		///< do *not* save this drawable (UI fluff only). ignored (error, actually) if attached to an object
+
+	DRAWABLE_STATUS_DEFAULT = DRAWABLE_STATUS_SHADOWS,
 };
 
 enum TintStatus CPP_11(: Int)
@@ -261,13 +261,24 @@ enum TerrainDecalType CPP_11(: Int)
 	TERRAIN_DECAL_HORDE_VEHICLE,
 	TERRAIN_DECAL_HORDE_WITH_NATIONALISM_UPGRADE_VEHICLE,
 	TERRAIN_DECAL_CRATE,
+#if RTS_GENERALS && RETAIL_COMPATIBLE_XFER_SAVE
 	TERRAIN_DECAL_NONE,
+	TERRAIN_DECAL_HORDE_WITH_FANATICISM_UPGRADE,
+	TERRAIN_DECAL_CHEMSUIT,
+#else
+	TERRAIN_DECAL_HORDE_WITH_FANATICISM_UPGRADE,
+	TERRAIN_DECAL_CHEMSUIT,
+	TERRAIN_DECAL_NONE,
+#endif
+	TERRAIN_DECAL_SHADOW_TEXTURE,	//use the shadow texture as the terrain decal.
 
-	TERRAIN_DECAL_MAX	///< keep this last
+	TERRAIN_DECAL_MAX
 };
 
 //-----------------------------------------------------------------------------
 
+constexpr const UnsignedInt InvalidShroudClearFrame = ~0u;
+
 const Int DRAWABLE_FRAMES_PER_FLASH = LOGICFRAMES_PER_SECOND / 2;
 
 //-----------------------------------------------------------------------------
@@ -279,11 +290,11 @@ class Drawable : public Thing,
 								 public Snapshot
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Drawable, "Drawable" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Drawable, "Drawable" )
 
 public:
 
-	Drawable( const ThingTemplate *thing, DrawableStatus statusBits = DRAWABLE_STATUS_NONE );
+	Drawable( const ThingTemplate *thing, DrawableStatusBits statusBits = DRAWABLE_STATUS_DEFAULT );
 
 	void onDestroy( void );																							///< run from GameClient::destroyDrawable
 
@@ -293,7 +304,7 @@ class Drawable : public Thing,
 
 	void friend_bindToObject( Object *obj ); ///< bind this drawable to an object ID. for use ONLY by GameLogic!
 	void setIndicatorColor(Color color);
-	
+
 	void setTintStatus( TintStatus statusBits ) { BitSet( m_tintStatus, statusBits ); };
 	void clearTintStatus( TintStatus statusBits ) { BitClear( m_tintStatus, statusBits ); };
 	Bool testTintStatus( TintStatus statusBits ) const { return BitIsSet( m_tintStatus, statusBits ); };
@@ -304,19 +315,19 @@ class Drawable : public Thing,
 	void setTerrainDecalSize(Real x, Real y);
 	void setTerrainDecalFadeTarget(Real target, Real rate = 0.1f);
 
-	inline Object *getObject( void ) { return m_object; }								///< return object ID bound to this drawble
-	inline const Object *getObject( void ) const { return m_object; }		///< return object ID bound to this drawble
+	Object *getObject( void ) { return m_object; }								///< return object ID bound to this drawble
+	const Object *getObject( void ) const { return m_object; }		///< return object ID bound to this drawble
 
-	inline DrawableInfo *getDrawableInfo(void) {return &m_drawableInfo;}
+	DrawableInfo *getDrawableInfo(void) {return &m_drawableInfo;}
 
 	void setDrawableHidden( Bool hidden );																		///< hide or unhide drawable
 	//
 	// note that this is not necessarily the 'get' reflection of setDrawableHidden, since drawables
 	// can spontaneously hide via stealth. (srj)
 	//
-	inline Bool isDrawableEffectivelyHidden() const { return m_hidden || m_hiddenByStealth; }
+	Bool isDrawableEffectivelyHidden() const { return m_hidden || m_hiddenByStealth; }
 
-	void setSelectable( Bool selectable );												///< Changes the drawables selectability	
+	void setSelectable( Bool selectable );												///< Changes the drawables selectability
 	Bool isSelectable( void ) const;
 	Bool isMassSelectable( void ) const;
 
@@ -326,7 +337,7 @@ class Drawable : public Thing,
 
 	void updateDrawableClipStatus( UnsignedInt shotsRemaining, UnsignedInt maxShots, WeaponSlotType slot ); ///< This will do the show/hide work if ProjectileBoneFeedbackEnabled is set.
 	void updateDrawableSupplyStatus( Int maxSupply, Int currentSupply ); ///< This will do visual feedback on Supplies carried
-	
+
 	void notifyDrawableDependencyCleared();///< If any of your draw modules were waiting for something, it's ready now.
 
 	// Override.
@@ -336,7 +347,7 @@ class Drawable : public Thing,
 	const GeometryInfo& getDrawableGeometryInfo() const;
 
 	void reactToBodyDamageStateChange(BodyDamageType newState);
-	
+
 	Real getScale (void) const ;
 
 	// access to modules
@@ -346,17 +357,18 @@ class Drawable : public Thing,
 	ClientUpdateModule const** getClientUpdateModules() const { return (ClientUpdateModule const**)getModuleList(MODULETYPE_CLIENT_UPDATE); }
 	ClientUpdateModule* findClientUpdateModule( NameKeyType key );
 
+	// never returns null
 	DrawModule** getDrawModules();
 	DrawModule const** getDrawModules() const;
 
 	//---------------------------------------------------------------------------
 	void setDrawableStatus( DrawableStatus bit )  { BitSet( m_status, bit ); }
 	void clearDrawableStatus( DrawableStatus bit ) { BitClear( m_status, bit ); }
-	inline Bool testDrawableStatus( DrawableStatus bit ) const { return (m_status & bit) != 0; }
+	Bool testDrawableStatus( DrawableStatus bit ) const { return (m_status & bit) != 0; }
 
 	void setShroudClearFrame( UnsignedInt frame )  { m_shroudClearFrame = frame; }
 	UnsignedInt getShroudClearFrame( void ) { return m_shroudClearFrame; }
- 
+
 	void setShadowsEnabled(Bool enable);
 	Bool getShadowsEnabled() const { return BitIsSet(m_status, DRAWABLE_STATUS_SHADOWS); }
 
@@ -364,15 +376,15 @@ class Drawable : public Thing,
 	void allocateShadows(void); ///< create shadow resources if not already present. Used by Options screen.
 
 	void setFullyObscuredByShroud(Bool fullyObscured);
-	inline Bool getFullyObscuredByShroud(void) {return m_drawableFullyObscuredByShroud;}
+	Bool getFullyObscuredByShroud(void) {return m_drawableFullyObscuredByShroud;}
 
 	Bool getDrawsInMirror() const { return BitIsSet(m_status, DRAWABLE_STATUS_DRAWS_IN_MIRROR) || isKindOf(KINDOF_CAN_CAST_REFLECTIONS); }
 
-	void colorFlash( const RGBColor *color, UnsignedInt decayFrames = DEF_DECAY_FRAMES, UnsignedInt attackFrames = 0, UnsignedInt sustainAtPeak = FALSE );  ///< flash a drawable in the color specified for a short time
+	void colorFlash( const RGBColor *color, UnsignedInt decayFrames = DEF_DECAY_FRAMES, UnsignedInt attackFrames = 0, UnsignedInt sustainAtPeak = 0 );  ///< flash a drawable in the color specified for a short time
 	void colorTint( const RGBColor *color );	 ///< tint this drawable the color specified
 	void setTintEnvelope( const RGBColor *color, Real attack, Real decay );	 ///< how to transition color
 	void flashAsSelected( const RGBColor *color = NULL ); ///< drawable takes care of the details if you spec no color
-	
+
 	/// Return true if drawable has been marked as "selected"
 	Bool isSelected( void ) const {	return m_selected; }
 	void onSelected();														///< Work unrelated to selection that must happen at time of selection
@@ -383,14 +395,14 @@ class Drawable : public Thing,
 	// an "instance" matrix defines the local transform of the Drawable, and is concatenated with the global transform
 	void setInstanceMatrix( const Matrix3D *instance );									///< set the Drawable's instance transform
 	const Matrix3D *getInstanceMatrix( void ) const { return &m_instance; }		///< get drawable instance transform
-	inline Bool isInstanceIdentity() const { return m_instanceIsIdentity; }
+	Bool isInstanceIdentity() const { return m_instanceIsIdentity; }
 
-	inline Real getInstanceScale( void ) const { return m_instanceScale; }		///< get scale that will be applied to instance matrix
+	Real getInstanceScale( void ) const { return m_instanceScale; }		///< get scale that will be applied to instance matrix
 	void setInstanceScale(Real value) { m_instanceScale = value;}	///< set scale that will be applied to instance matrix before rendering.
 
 	const Matrix3D *getTransformMatrix( void ) const;	///< return the world transform
 
-	void draw( View *view );													///< render the drawable to the given view
+	void draw();													///< render the drawable to the given view
 	void updateDrawable();														///< update the drawable
 
 	void drawIconUI( void );													///< draw "icon"(s) needed on drawable (health bars, veterency, etc)
@@ -404,10 +416,10 @@ class Drawable : public Thing,
 	void removeFromList(Drawable **pListHead);
 	void setID( DrawableID id );											///< set this drawable's unique ID
 
-	inline const ModelConditionFlags& getModelConditionFlags( void ) const { return m_conditionState; }
+	const ModelConditionFlags& getModelConditionFlags( void ) const { return m_conditionState; }
 
 	//
-	// NOTE: avoid repeated calls to the set and clear for the condition state as they 
+	// NOTE: avoid repeated calls to the set and clear for the condition state as they
 	// reconstruct and load models which is expensive ... wrap up all our bit flags to
 	// set and clear into one function call
 	//
@@ -421,15 +433,15 @@ class Drawable : public Thing,
 	void replaceModelConditionFlags( const ModelConditionFlags &flags, Bool forceReplace = FALSE );
 
 	void attachToParticleSystem( Particle *p );								///< attach this Drawable to a particle system
-	void detachFromParticleSystem( void );										///< detach this from any particle system 
+	void detachFromParticleSystem( void );										///< detach this from any particle system
 
 	Bool handleWeaponFireFX(
-							WeaponSlotType wslot, 
-							Int specificBarrelToUse, 
-							const FXList* fxl, 
-							Real weaponSpeed, 
-							Real recoilAmount, 
-							Real recoilAngle, 
+							WeaponSlotType wslot,
+							Int specificBarrelToUse,
+							const FXList* fxl,
+							Real weaponSpeed,
+							Real recoilAmount,
+							Real recoilAngle,
 							const Coord3D* victimPos,
 							Real damageRadius
 							);
@@ -451,8 +463,8 @@ class Drawable : public Thing,
 		Find the bone(s) with the given name and return their positions and/or transforms in the given arrays.
 		We look for a bone named "boneNamePrefixQQ", where QQ is 01, 02, 03, etc, starting at the
 		value of "startIndex". Want to look for just a specific boneName with no numeric suffix?
-		just pass zero (0) for startIndex. (no, we never look for "boneNamePrefix00".) 
-		We copy up to 'maxBones' into the array(s), and return the total count found. 
+		just pass zero (0) for startIndex. (no, we never look for "boneNamePrefix00".)
+		We copy up to 'maxBones' into the array(s), and return the total count found.
 
 		NOTE: this returns the positions and transform for the "ideal" model... that is,
 		at its default rotation and scale, located at (0,0,0). You'll have to concatenate
@@ -462,14 +474,14 @@ class Drawable : public Thing,
 	*/
 	Int getPristineBonePositions(const char* boneNamePrefix, Int startIndex, Coord3D* positions, Matrix3D* transforms, Int maxBones) const;
 	Int getCurrentClientBonePositions(const char* boneNamePrefix, Int startIndex, Coord3D* positions, Matrix3D* transforms, Int maxBones) const;
-	
+
 	// this is a special-purpose call for W3DModelDraw. (srj)
 	Bool getCurrentWorldspaceClientBonePositions(const char* boneName, Matrix3D& transform) const;
 
 	Bool getProjectileLaunchOffset(WeaponSlotType wslot, Int specificBarrelToUse, Matrix3D* launchPos, WhichTurretType tur, Coord3D* turretRotPos, Coord3D* turretPitchPos = NULL) const;
 
 	/**
-		This call says, "I want the current animation (if any) to take n frames to complete a single cycle". 
+		This call says, "I want the current animation (if any) to take n frames to complete a single cycle".
 		If it's a looping anim, each loop will take n frames. someday, we may want to add the option to insert
 		"pad" frames at the start and/or end, but for now, we always just "stretch" the animation to fit.
 		Note that you must call this AFTER setting the condition codes.
@@ -477,7 +489,7 @@ class Drawable : public Thing,
 	void setAnimationLoopDuration(UnsignedInt numFrames);
 	/**
 		similar to the above, but assumes that the current state is a "ONCE",
-		and is smart about transition states... if there is a transition state 
+		and is smart about transition states... if there is a transition state
 		"inbetween", it is included in the completion time.
 	*/
 	void setAnimationCompletionTime(UnsignedInt numFrames);
@@ -496,32 +508,32 @@ class Drawable : public Thing,
 	// *ONLY* the InGameUI should do the actual drawable selection and de-selection
 	//
 	void friend_setSelected( void );							///< mark drawable as "selected"
-	void friend_clearSelected( void );						///< clear drawable's "selected" 
-	
+	void friend_clearSelected( void );						///< clear drawable's "selected"
+
 	Vector3 * getAmbientLight( void );					///< get color value to add to ambient light when drawing
 	void setAmbientLight( Vector3 *ambient );		///< set color value to add to ambient light when drawing
 
 	const Vector3 * getTintColor( void ) const;					///< get FX color value to add to ALL LIGHTS when drawing
 	const Vector3 * getSelectionColor( void ) const;					///< get FX color value to add to ALL LIGHTS when drawing
 
-	inline TerrainDecalType getTerrainDecalType( void ) const { return m_terrainDecalType; }
+	TerrainDecalType getTerrainDecalType( void ) const { return m_terrainDecalType; }
+
+	void setDrawableOpacity( Real value ) { m_explicitOpacity = value; }	///< set alpha/opacity value used to override defaults when drawing.
 
-	inline void setDrawableOpacity( Real value ) { m_explicitOpacity = value; }	///< set alpha/opacity value used to override defaults when drawing.
-	
 	// note that this is not the 'get' inverse of setDrawableOpacity, since stealthing can also affect the effective opacity!
-	inline Real getEffectiveOpacity() const { return m_explicitOpacity * m_effectiveStealthOpacity; }		///< get alpha/opacity value used to override defaults when drawing.
+	Real getEffectiveOpacity() const { return m_explicitOpacity * m_effectiveStealthOpacity; }		///< get alpha/opacity value used to override defaults when drawing.
 	void setEffectiveOpacity( Real pulseFactor, Real explicitOpacity = -1.0f );
-	
+
 	// this is for the heatvision effect which operates completely independently of the stealth opacity effects. Draw() does the fading every frame.
-	inline Real getHeatVisionOpacity() const { return m_heatVisionOpacity; }		///< get alpha/opacity value used to render add'l heatvision rendering pass.
+	Real getHeatVisionOpacity() const { return m_heatVisionOpacity; }		///< get alpha/opacity value used to render add'l heatvision rendering pass.
 	void setHeatVisionOpacity( Real op ) { m_heatVisionOpacity = op; }; ///< set alpha/opacity value used to render add'l heatvision rendering pass.
-	
+
 	// both of these assume that you are starting at one extreme 100% or 0% opacity and are trying to go to the other!! -- amit
 	void fadeOut( UnsignedInt frames );		///< fade object out...how gradually this is done is determined by frames
 	void fadeIn( UnsignedInt frames );		///< fade object in...how gradually this is done is determined by frames
 
 	void preloadAssets( TimeOfDay timeOfDay );	///< preload the assets
-	
+
 	Bool isVisible();											///< for limiting tree sway, etc to visible objects
 
 	Bool getShouldAnimate( Bool considerPower ) const;
@@ -559,13 +571,13 @@ class Drawable : public Thing,
 	Drawable *asDrawableMeth() { return this; }
 	const Drawable *asDrawableMeth() const { return this; }
 
-	inline Module** getModuleList(ModuleType i)
+	Module** getModuleList(ModuleType i)
 	{
 		Module** m = m_modules[i - FIRST_DRAWABLE_MODULE_TYPE];
 		return m;
 	}
 
-	inline Module* const* getModuleList(ModuleType i) const
+	Module* const* getModuleList(ModuleType i) const
 	{
 		Module** m = m_modules[i - FIRST_DRAWABLE_MODULE_TYPE];
 		return m;
@@ -598,8 +610,12 @@ class Drawable : public Thing,
 	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle);
 	void updateHiddenStatus();
 
+	void replaceModelConditionStateInDrawable();
+
 private:
 
+	const Locomotor* getLocomotor() const;
+
 	// note, these are lazily allocated!
 	TintEnvelope*		m_selectionFlashEnvelope;	///< used for selection flash, works WITH m_colorTintEnvelope
 	TintEnvelope*		m_colorTintEnvelope;			///< house color flashing, etc... works WITH m_selectionFlashEnvelope
@@ -621,15 +637,15 @@ class Drawable : public Thing,
 
 	Object *m_object;						///< object (if any) that this drawable represents
 	Particle *m_particle;				///< particle (if any) that this Drawable is associated with
-		
+
 	DrawableID m_id;						///< this drawable's unique ID
-	Drawable *m_nextDrawable; 
+	Drawable *m_nextDrawable;
 	Drawable *m_prevDrawable;		///< list links
 
-	UnsignedInt m_status;				///< status bits (see DrawableStatus enum)
+	DrawableStatusBits m_status;		///< status bits (see DrawableStatus enum)
 	UnsignedInt m_tintStatus;				///< tint color status bits (see TintStatus enum)
 	UnsignedInt m_prevTintStatus;///< for edge testing with m_tintStatus
-	
+
 	enum FadingMode
 	{
 		FADING_NONE,
@@ -644,6 +660,8 @@ class Drawable : public Thing,
 
 	DrawableLocoInfo*	m_locoInfo;	// lazily allocated
 
+	PhysicsXformInfo* m_physicsXform;
+
 	DynamicAudioEventRTS*	m_ambientSound;		///< sound module for ambient sound (lazily allocated)
 	Bool								m_ambientSoundEnabled;
 
@@ -655,7 +673,7 @@ class Drawable : public Thing,
 	Color m_flashColor;					///< color to flash the drawable
 
 	Matrix3D m_instance;				///< The instance matrix that holds the initial/default position & orientation
-	Real m_instanceScale;				///< the uniform scale factor applied to the instance matrix before it is sent to W3D. 
+	Real m_instanceScale;				///< the uniform scale factor applied to the instance matrix before it is sent to W3D.
 
 	DrawableInfo				m_drawableInfo;		///< structure pointed to by W3D render objects so they know which drawable they belong to.
 
@@ -677,14 +695,14 @@ class Drawable : public Thing,
 	Bool m_instanceIsIdentity;	///< If true, instance matrix can be skipped
 	Bool m_drawableFullyObscuredByShroud;	///<drawable is hidden by shroud/fog
 #ifdef DIRTY_CONDITION_FLAGS
-	mutable Bool m_isModelDirty;				///< if true, must call replaceModelConditionState() before drawing or accessing drawmodule info
+	Bool m_isModelDirty;				///< if true, must call replaceModelConditionState() before drawing or accessing drawmodule info
 #endif
 
 	//*******************************************
 	//Perhaps we can move this out of Drawable???
 public:
 	static void killStaticImages();
-	
+
 #ifdef DIRTY_CONDITION_FLAGS
 	// only for StDrawableDirtyStuffLocker!
 	static void friend_lockDirtyStuffForIteration();
@@ -715,7 +733,7 @@ class Drawable : public Thing,
 	void drawBattlePlans( const IRegion2D* healthBarRegion );				///< Icons rendering for active battle plan statii
 
 	Bool drawsAnyUIText( void );
-	
+
 	static Bool							s_staticImagesInited;
 	static const Image*			s_veterancyImage[LEVEL_COUNT];
 	static const Image*			s_fullAmmo;
@@ -749,5 +767,3 @@ class StDrawableDirtyStuffLocker
 	}
 };
 #endif
-
-#endif // _DRAWABLE_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h b/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h
index 1e4b762544c..1b469cc39c9 100644
--- a/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h
+++ b/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h
@@ -27,8 +27,6 @@
 // Author: Mark Wilczynski, August 2002
 
 #pragma once
-#ifndef _DRAWABLEINFO_H_
-#define _DRAWABLEINFO_H_
 
 #include "Common/GameType.h"
 
@@ -45,7 +43,7 @@ struct DrawableInfo
 		ERF_POTENTIAL_OCCLUDEE=	0x00000004,
 		ERF_IS_TRANSLUCENT= 0x00000008,
 		ERF_IS_NON_OCCLUDER_OR_OCCLUDEE = 0x00000010,
-		ERF_DELAYED_RENDER = ERF_IS_TRANSLUCENT|ERF_POTENTIAL_OCCLUDEE, 
+		ERF_DELAYED_RENDER = ERF_IS_TRANSLUCENT|ERF_POTENTIAL_OCCLUDEE,
 	};
 
 	DrawableInfo(void) : m_shroudStatusObjectID(INVALID_ID), m_drawable(NULL), m_ghostObject(NULL), m_flags(ERF_IS_NORMAL) {}
@@ -55,5 +53,3 @@ struct DrawableInfo
 	GhostObject *m_ghostObject;	///<pointer to ghostObject for this drawable used for fogged versions.
 	Int m_flags;	///<extra render settings flags that are tied to render objects with drawables.
 };
-
-#endif // _DRAWABLEINFO_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h b/Generals/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
index 15e38144a6c..50351552e09 100644
--- a/Generals/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
+++ b/Generals/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
@@ -47,9 +47,9 @@ class EstablishConnectionsMenu {
 protected:
 	EstablishConnectionsMenuStateType m_menuState;
 
-	static const char *m_playerReadyControlNames[MAX_SLOTS];
-	static const char *m_playerNameControlNames[MAX_SLOTS];
-	static const char *m_playerStatusControlNames[MAX_SLOTS];
+	static const char *const m_playerReadyControlNames[MAX_SLOTS];
+	static const char *const m_playerNameControlNames[MAX_SLOTS];
+	static const char *const m_playerStatusControlNames[MAX_SLOTS];
 };
 
-extern EstablishConnectionsMenu *TheEstablishConnectionsMenu;
\ No newline at end of file
+extern EstablishConnectionsMenu *TheEstablishConnectionsMenu;
diff --git a/Generals/Code/GameEngine/Include/GameClient/Eva.h b/Generals/Code/GameEngine/Include/GameClient/Eva.h
index ecf7c852766..a4c2fa1e86e 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Eva.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Eva.h
@@ -27,8 +27,6 @@
 // DO NOT DISTRIBUTE
 
 #pragma once
-#ifndef __EVA_H__
-#define __EVA_H__
 
 #include "Common/SubsystemInterface.h"
 #include "Common/AudioEventRTS.h"
@@ -39,8 +37,7 @@ class Player;
 // Keep in sync with TheEvaMessageNames AND Eva::s_shouldPlayFuncs
 enum EvaMessage CPP_11(: Int)
 {
-	EVA_FIRST = 0,
-	EVA_LowPower = EVA_FIRST,
+	EVA_LowPower,
 	EVA_InsufficientFunds,
 	EVA_SuperweaponDetected_ParticleCannon,
 	EVA_SuperweaponDetected_Nuke,
@@ -61,9 +58,10 @@ enum EvaMessage CPP_11(: Int)
 	EVA_BuildingBeingStolen,
 
 	EVA_COUNT,
+	EVA_FIRST = 0,
 };
 
-extern const char *TheEvaMessageNames[];
+extern const char *const TheEvaMessageNames[];
 
 //------------------------------------------------------------------------------------ EvaCheckInfo
 struct EvaSideSounds
@@ -78,7 +76,7 @@ struct EvaSideSounds
 //------------------------------------------------------------------------------------ EvaCheckInfo
 class EvaCheckInfo : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(EvaCheckInfo, "EvaCheckInfo")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(EvaCheckInfo, "EvaCheckInfo")
 
 public:
 	EvaMessage									m_message;
@@ -86,7 +84,7 @@ class EvaCheckInfo : public MemoryPoolObject
 	UnsignedInt									m_framesToExpire;
 	UnsignedInt									m_priority;	// higher priority is more important, and will be played in preference to lower preference
 	std::vector<EvaSideSounds>	m_evaSideSounds;
-	
+
 	EvaCheckInfo();
 
 	static const FieldParse s_evaEventInfo[];		///< the parse table for INI definition
@@ -103,7 +101,7 @@ struct EvaCheck
 	const EvaCheckInfo *m_evaInfo;
 	UnsignedInt m_triggeredOnFrame;
 	UnsignedInt m_timeForNextCheck;
-	Bool m_alreadyPlayed;	
+	Bool m_alreadyPlayed;
 
 		EvaCheck();
 };
@@ -124,7 +122,7 @@ class Eva : public SubsystemInterface
 		typedef std::vector<EvaCheck> EvaCheckVec;
 		typedef EvaCheckVec::iterator EvaCheckVecIt;
 
-		// This list contains things that either want to play, 
+		// This list contains things that either want to play,
 		// or have played and are waiting till they are allowed to check again to play.
 		EvaCheckVec m_checks;
 
@@ -133,12 +131,12 @@ class Eva : public SubsystemInterface
 
 		Player *m_localPlayer;
 
-		// Variables for condition checks go here. 
+		// Variables for condition checks go here.
 		Int m_previousBuildingCount;
 		Int m_previousUnitCount;
 		mutable EvaMessage m_messageBeingTested;	// Used by the generic hooks so they can figure out which flag to test.
 		Bool m_shouldPlay[EVA_COUNT];	// These aren't all used, but some of them are.
-		
+
 		Bool m_enabled;
 
 	public:
@@ -175,5 +173,3 @@ class Eva : public SubsystemInterface
 };
 
 extern Eva *TheEva;
-
-#endif /* __EVA_H__ */
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h b/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
index 6a96a65bb53..25c13a718f8 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __EXTENDEDMESSAGEBOX_H_
-#define __EXTENDEDMESSAGEBOX_H_
-
 #include "GameClient/GameWindowManager.h"
 
 // return codes for message box callbacks
@@ -70,5 +67,3 @@ GameWindow *ExMessageBoxOk					(UnicodeString titleString,UnicodeString bodyStri
 
 GameWindow *ExMessageBoxCancel			(UnicodeString titleString,UnicodeString bodyString, void *userData,
 																		 MessageBoxFunc cancelCallback);
-
-#endif //__EXTENDEDMESSAGEBOX_H_
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameClient/FXList.h b/Generals/Code/GameEngine/Include/GameClient/FXList.h
index 8b82aefe2a0..9a10758adee 100644
--- a/Generals/Code/GameEngine/Include/GameClient/FXList.h
+++ b/Generals/Code/GameEngine/Include/GameClient/FXList.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _FXList_H_
-#define _FXList_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
 #include "Common/NameKeyGenerator.h"
@@ -49,24 +46,24 @@ class Matrix3D;
 /**
 	An FXNugget encapsulates a particular type of audio/video effect. FXNuggets are virtually
 	never used on their own, but rather, as a component of an FXList (see below).
-	
+
 	Important notes:
 
 	-- FXNugget is an ABC; all the implementations are (currently) located in FXList.cpp,
 	thought they will probably be spread out more as we add more implementations.
 
-	-- As part of an FXList, an FXNugget is shared between multiple units. The implication is that 
-	an FXNugget should not require private data storage to do what it needs to do, aside from stuff 
-	initialized at FXNugget instantiation time (eg, parameters from an INI file). To help 
+	-- As part of an FXList, an FXNugget is shared between multiple units. The implication is that
+	an FXNugget should not require private data storage to do what it needs to do, aside from stuff
+	initialized at FXNugget instantiation time (eg, parameters from an INI file). To help
 	enforce this, all it's methods are declared 'const'. If you can't implement what you
 	need within this framework, please *don't* simply de-const things, because it could lead to very
 	strange side-effects. Instead, the system will have to be enhanced to allow for multiple instances
 	of each FXNugget.
 
-	-- an individual FXNugget is generally not directly accessible to anyone outside of the	
+	-- an individual FXNugget is generally not directly accessible to anyone outside of the
 	FXList system; in fact, it could probably be a private class, but isn't, mainly for coding convenience.
 
-	-- Unlike most other game systems, FXNuggets can't be overridden by subsequent INI file 
+	-- Unlike most other game systems, FXNuggets can't be overridden by subsequent INI file
 	loads. This isn't really a problem, because all you really need to do to "override" one is to
 	specify a different one.
 */
@@ -92,7 +89,7 @@ class FXNugget : public MemoryPoolObject
 
 private:
 
-};  
+};
 EMPTY_DTOR(FXNugget)
 
 //-------------------------------------------------------------------------------------------------
@@ -100,23 +97,23 @@ EMPTY_DTOR(FXNugget)
 	An FXList is a way of encapsulating a particular set of audio/video effect(s).
 	Lots of other game systems (eg, DamageFX) use FXLists to abstract AV effects into data files
 	(rather than hardcoding them, which would be suboptimal).
-	
+
 	Important notes:
 
 	-- an FXList is specified solely by name, and the only parameters it receives when performing
 	its AV effects are a primary (and optional secondary) object position.
-	
+
 	-- There is no inheritance or overriding of FXLists; if you need an FXList that is nearly-but-not-quite
 	identical to an existing one, you must simply make an entirely new FXList. Realistically, this shouldn't
 	be a problem, since they are pretty simple to specify, and don't consume a lot of memory.
 
-	-- an FXList is shared between multiple units. To help 
+	-- an FXList is shared between multiple units. To help
 	enforce this, all it's methods are declared 'const'. If you can't implement the stuff you
 	need within this framework, please *don't* simply de-const things, because it could lead to very
 	strange side-effects. Instead, the system will have to be enhanced to allow for multiple instances
 	of each FXNugget.
 
-	-- Unlike most other game systems, FXList can't be overridden by subsequent INI file 
+	-- Unlike most other game systems, FXList can't be overridden by subsequent INI file
 	loads. This isn't really a problem, because all you really need to do to "override" one is to
 	specify a different one.
 */
@@ -183,11 +180,11 @@ class FXList
 
 	FXNuggetList m_nuggets;
 
-};  
+};
 
 //-------------------------------------------------------------------------------------------------
 /**
-	The "store" used to hold all the FXLists in existence. 
+	The "store" used to hold all the FXLists in existence.
 */
 class FXListStore : public SubsystemInterface
 {
@@ -206,12 +203,12 @@ class FXListStore : public SubsystemInterface
 		return NULL if no such FXList exists.
 	*/
 	const FXList *findFXList( const char* name ) const;
-	
+
 	static void parseFXListDefinition(INI* ini);
 
 private:
 
-	// use the hashing function for Ints. 
+	// use the hashing function for Ints.
 	typedef std::hash_map< NameKeyType, FXList, rts::hash<NameKeyType>, rts::equal_to<NameKeyType> > FXListMap;
 
 	FXListMap m_fxmap;
@@ -220,6 +217,3 @@ class FXListStore : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern FXListStore *TheFXListStore;
-
-#endif // _FXList_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/FontDesc.h b/Generals/Code/GameEngine/Include/GameClient/FontDesc.h
index 2fba4028a4f..2c92e123c93 100644
--- a/Generals/Code/GameEngine/Include/GameClient/FontDesc.h
+++ b/Generals/Code/GameEngine/Include/GameClient/FontDesc.h
@@ -27,8 +27,6 @@
 // Author: Mark Wilczynski, October 2002
 
 #pragma once
-#ifndef _FONTDESC_H_
-#define _FONTDESC_H_
 
 #include "Common/GameType.h"
 
@@ -39,5 +37,3 @@ struct FontDesc
 	Int	size;			///<point size
 	Bool bold;			///<is bold?
 };
-
-#endif // _FONTDESC_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/GUICallbacks.h b/Generals/Code/GameEngine/Include/GameClient/GUICallbacks.h
index 7fbe17386d5..908dc916ffc 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GUICallbacks.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GUICallbacks.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GUICALLBACKS_H_
-#define __GUICALLBACKS_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/GameWindow.h"
 
@@ -378,7 +375,3 @@ extern WindowMsgHandledType MOTDSystem( GameWindow *window, UnsignedInt msg, Win
 // Message Box --------------------------------------------------------------------------------
 extern WindowMsgHandledType MessageBoxSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 );
 extern WindowMsgHandledType QuitMessageBoxSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 );
-
-
-#endif // __GUICALLBACKS_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GUICommandTranslator.h b/Generals/Code/GameEngine/Include/GameClient/GUICommandTranslator.h
index b8c258107a8..9c2bad908d7 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GUICommandTranslator.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GUICommandTranslator.h
@@ -31,15 +31,12 @@
 
 #pragma once
 
-#ifndef __GUICOMMANDTRANSLATOR_H_
-#define __GUICOMMANDTRANSLATOR_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/InGameUI.h"
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class GUICommandTranslator : public GameMessageTranslator                          
+class GUICommandTranslator : public GameMessageTranslator
 {
 
 public:
@@ -48,8 +45,4 @@ class GUICommandTranslator : public GameMessageTranslator
 	~GUICommandTranslator( void );
 
 	virtual GameMessageDisposition translateGameMessage( const GameMessage *msg );
-};	
-
-#endif  // end __GUICOMMANDTRANSLATOR_H_
-
-
+};
diff --git a/Generals/Code/GameEngine/Include/GameClient/Gadget.h b/Generals/Code/GameEngine/Include/GameClient/Gadget.h
index 397204c7834..f0140ad47b8 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Gadget.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Gadget.h
@@ -24,12 +24,12 @@
 
 // FILE: Gadget.h /////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GADGET_H_
-#define __GADGET_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -90,7 +87,7 @@ enum
 // Gadget window styles, keep in same order as WindowStyleNames[]
 enum
 {
-						
+
 	GWS_PUSH_BUTTON				= 0x00000001,
 	GWS_RADIO_BUTTON			= 0x00000002,
 	GWS_CHECK_BOX					= 0x00000004,
@@ -191,7 +188,7 @@ enum GadgetGameMessage CPP_11(: Int)
 	GCM_GET_SELECTION,
 	GCM_SET_SELECTION,
 	GCM_UPDATE_TEXT,
-	
+
 	// Entry field messages
 	GEM_GET_TEXT,
 	GEM_SET_TEXT,
@@ -226,7 +223,7 @@ enum
 
 // GadgetMsg ------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _GadgetMsg 
+typedef struct _GadgetMsg
 {
 
 	GameWindow *window;           // Originator of message
@@ -237,7 +234,7 @@ typedef struct _GadgetMsg
 
 // SliderMsg ------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _SliderMsg 
+typedef struct _SliderMsg
 {
 
 	GameWindow *window;						// Originator of message
@@ -249,7 +246,7 @@ typedef struct _SliderMsg
 
 // ListboxMsg -----------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _ListboxMsg 
+typedef struct _ListboxMsg
 {
 
 	GameWindow *window;						// Originator of message
@@ -259,7 +256,7 @@ typedef struct _ListboxMsg
 
 // SliderData -----------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _SliderData 
+typedef struct _SliderData
 {
 
 	Int					minVal;						// Minimum slider value
@@ -274,7 +271,7 @@ typedef struct _SliderData
 
 // EntryData ------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _EntryData 
+typedef struct _EntryData
 {
 
 	DisplayString *text;						///< the entry text
@@ -305,7 +302,7 @@ typedef struct _EntryData
 
 // TextData -------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _TextData 
+typedef struct _TextData
 {
 
 	DisplayString *text;  ///< the text data
@@ -319,7 +316,7 @@ typedef struct _ListEntryCell
 {
 	Int cellType;									// Holds either LISTBOX_TEXT or LISTBOX_IMAGE
 	Color						color;				// use this color
-	void						*data;				// pointer to either a DisplayString or an image	
+	void						*data;				// pointer to either a DisplayString or an image
 	void						*userData;		// Attach user data to the cell
 	Int							width;				// Used if this is an image and we don't want to use the default
 	Int							height;				// used if this is an image and we don't want ot use the default
@@ -333,14 +330,14 @@ typedef struct _ListEntryRow
 	// The following fields are for internal use and
 	// should not be initialized by the user
 	Int							listHeight;		// calculated total Height at the bottom of this entry
-	Byte						height;				// Maintain the height of the row
+	Int							height;				// Maintain the height of the row
 	ListEntryCell		*cell;				// Holds the array of ListEntry Cells
-	
+
 } ListEntryRow;
 
 // ListboxData ----------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _ListboxData 
+typedef struct _ListboxData
 {
 
 	Short				listLength;				// Max Number of entries in the list
@@ -359,7 +356,7 @@ typedef struct _ListboxData
 	Bool				audioFeedback;		// Audio click feedback?
 
 	//
-	// The following fields are for internal use and should not be initialized 
+	// The following fields are for internal use and should not be initialized
 	// by the user
 	//
 	Int					*columnWidth;			// Pointer to array of column widths based off of user input
@@ -394,7 +391,7 @@ typedef struct _ComboBoxData
 	ListboxData *listboxData;			// Needed for the listbox component of the combo box
 	EntryData		*entryData;				// Needed for the text entry component of the combo box
 	//
-	// The following fields are for internal use and should not be initialized 
+	// The following fields are for internal use and should not be initialized
 	// by the user
 	//
 	Bool dontHide;								// A flag we'll use that'll determine if we hide the listbox or not when selected
@@ -406,7 +403,7 @@ typedef struct _ComboBoxData
 
 // RadioButtonData ------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _RadioButtonData	
+typedef struct _RadioButtonData
 {
 
 	Int screen;  ///< screen identifier
@@ -452,7 +449,7 @@ enum
 	NUM_TAB_PANES = 8,//(MAX_DRAW_DATA - 1)
 };
 
-typedef struct _TabControlData	
+typedef struct _TabControlData
 {
 	//Set in editor
 	Int tabOrientation;
@@ -464,7 +461,7 @@ typedef struct _TabControlData
 
 	GameWindow *subPanes[NUM_TAB_PANES];
 	Bool subPaneDisabled[NUM_TAB_PANES];//tabCount will control how many even exist.  Individual ones can be disabled
-	Int paneBorder; 
+	Int paneBorder;
 
 	//Working computations
 	Int activeTab;
@@ -534,5 +531,3 @@ extern void InformEntry( WideChar c );
 
 // list box stuff
 extern Int GetListboxTopEntry( ListboxData list );
-
-#endif // __GADGET_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetCheckBox.h b/Generals/Code/GameEngine/Include/GameClient/GadgetCheckBox.h
index f801752f62e..8c7ef8334ca 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetCheckBox.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GadgetCheckBox.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetCheckBox.h /////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -61,9 +61,6 @@
 
 #pragma once
 
-#ifndef __GADGETCHECKBOX_H_
-#define __GADGETCHECKBOX_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -140,6 +137,3 @@ inline Color		 GadgetCheckBoxGetHiliteCheckedBoxColor( GameWindow *g )						{ re
 inline Color		 GadgetCheckBoxGetHiliteCheckedBoxBorderColor( GameWindow *g )			{ return g->winGetHiliteBorderColor( 2 ); }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETCHECKBOX_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h b/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h
index 3447236275e..5619581ef57 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetComboBox.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GADGETCOMBOBOX_H_
-#define __GADGETCOMBOBOX_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -94,17 +91,17 @@ extern void GadgetComboBoxSetIMECompositeTextColors( GameWindow *comboBox, Color
 // and those slider buttons and thumb as well as the drop down button and edit box.
 //
 extern void GadgetComboBoxSetColors( GameWindow *comboBox,
-																	  Color enabledColor, 
+																	  Color enabledColor,
 																	  Color enabledBorderColor,
-																	  Color enabledSelectedItemColor, 
+																	  Color enabledSelectedItemColor,
 																	  Color enabledSelectedItemBorderColor,
-																	  Color disabledColor, 
+																	  Color disabledColor,
 																	  Color disabledBorderColor,
-																	  Color disabledSelectedItemColor, 
+																	  Color disabledSelectedItemColor,
 																	  Color disabledSelectedItemBorderColor,
-																	  Color hiliteColor, 
+																	  Color hiliteColor,
 																	  Color hiliteBorderColor,
-																	  Color hiliteSelectedItemColor, 
+																	  Color hiliteSelectedItemColor,
 																	  Color hiliteSelectedItemBorderColor );
 
 inline void GadgetComboBoxSetEnabledImage( GameWindow *g, const Image *image )													{ g->winSetEnabledImage( 0, image ); }
@@ -193,6 +190,3 @@ inline GameWindow *GadgetComboBoxGetEditBox( GameWindow *g )
 }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETLISTBOX_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h b/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h
index 74dbe520162..02313409eef 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetListBox.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GADGETLISTBOX_H_
-#define __GADGETLISTBOX_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -72,7 +69,8 @@ extern void GadgetListboxCreateScrollbar( GameWindow *listbox );
 extern void GadgetListBoxAddMultiSelect( GameWindow *listbox );
 extern void GadgetListBoxRemoveMultiSelect( GameWindow *listbox );
 extern void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength );
-extern Int  GadgetListBoxGetListLength( GameWindow *listbox );
+extern Int  GadgetListBoxGetListLength( GameWindow *listbox ); ///< Returns the maximum possible number of list entries. Length is synonymous to rows
+extern Int  GadgetListBoxGetMaxSelectedLength( GameWindow *listbox ); ///< Returns the maximum possible number of list entries that can be selected
 extern Int  GadgetListBoxGetNumEntries( GameWindow *listbox );
 extern Int  GadgetListBoxGetNumColumns( GameWindow *listbox );
 extern Int  GadgetListBoxGetColumnWidth( GameWindow *listbox, Int column );
@@ -111,17 +109,17 @@ extern void GadgetListBoxSetAudioFeedback( GameWindow *listbox, Bool enable );
 // and those slider buttons and thumb
 //
 extern void GadgetListBoxSetColors( GameWindow *listbox,
-																	  Color enabledColor, 
+																	  Color enabledColor,
 																	  Color enabledBorderColor,
-																	  Color enabledSelectedItemColor, 
+																	  Color enabledSelectedItemColor,
 																	  Color enabledSelectedItemBorderColor,
-																	  Color disabledColor, 
+																	  Color disabledColor,
 																	  Color disabledBorderColor,
-																	  Color disabledSelectedItemColor, 
+																	  Color disabledSelectedItemColor,
 																	  Color disabledSelectedItemBorderColor,
-																	  Color hiliteColor, 
+																	  Color hiliteColor,
 																	  Color hiliteBorderColor,
-																	  Color hiliteSelectedItemColor, 
+																	  Color hiliteSelectedItemColor,
 																	  Color hiliteSelectedItemBorderColor );
 
 inline void GadgetListBoxSetEnabledImage( GameWindow *g, const Image *image )													{ g->winSetEnabledImage( 0, image ); }
@@ -208,6 +206,3 @@ inline GameWindow *GadgetListBoxGetDownButton( GameWindow *g )
 }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETLISTBOX_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h b/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h
index de2cc70294e..a4ce3684857 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetProgressBar.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GADGETPROGRESSBAR_H_
-#define __GADGETPROGRESSBAR_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -141,6 +138,3 @@ inline const Image * GadgetProgressBarGetHiliteBarImageCenter( GameWindow *g )
 inline const Image * GadgetProgressBarGetHiliteBarImageSmallCenter( GameWindow *g )	{ return g->winGetHiliteImage( 7 ); }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETPROGRESSBAR_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h b/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h
index 5246e592810..5a8691a392b 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetPushButton.h ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -40,7 +40,7 @@
 //
 // Desc:       Helpful interface for PushButtons
 //
-// PushButton IMAGE/COLOR organization 
+// PushButton IMAGE/COLOR organization
 // When control is enabled:
 //   enabledDrawData[ 0 ] is the background image for the whole enabled control
 //   enabledDrawData[ 1 ] is the enabled, selected button graphic
@@ -58,9 +58,6 @@
 
 #pragma once
 
-#ifndef __GADGETPUSHBUTTON_H_
-#define __GADGETPUSHBUTTON_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -172,6 +169,3 @@ inline void GadgetButtonSetLeftEnabledImage( GameWindow *g, const Image *image )
 inline void GadgetButtonSetMiddleEnabledImage( GameWindow *g, const Image *image )					{ g->winSetEnabledImage( 5, image ); }
 inline void GadgetButtonSetRightEnabledImage( GameWindow *g, const Image *image )					{ g->winSetEnabledImage( 6, image ); }
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETPUSHBUTTON_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h b/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h
index 6b46664e7d9..331927813cd 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetRadioButton.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -64,9 +64,6 @@
 
 #pragma once
 
-#ifndef __GADGETRADIOBUTTON_H_
-#define __GADGETRADIOBUTTON_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -147,6 +144,3 @@ inline const Image *GadgetRadioGetSelectedCheckedBoxImage( GameWindow *g )
 
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETRADIOBUTTON_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h b/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h
index 4b8be3f58ee..3ffc2a45007 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetSlider.h ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,7 +45,7 @@
 //						 to fill small seams.  Since there are vertical sliders
 //						 and horizontal sliders, the LEFT end of a horizontal
 //						 slider is stored in the same place as the TOP end for a
-//						 vertical slider.  The RIGHT end of a horizontal is 
+//						 vertical slider.  The RIGHT end of a horizontal is
 //						 also equivalent to the BOTTOM end of a vertical one.
 //
 //-----------------------------------------------------------------------------
@@ -53,9 +53,6 @@
 
 #pragma once
 
-#ifndef __GADGETSLIDER_H_
-#define __GADGETSLIDER_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -103,7 +100,7 @@ inline Int GadgetSliderGetPosition( GameWindow *win )
 
 // sliders are drawn from pieces, a left/top, right/bottom, repeating center, and small repeating center
 inline void GadgetSliderSetEnabledImages( GameWindow *g, const Image *left, const Image *right, const Image *center, const Image *smallCenter )
-{ 
+{
 	g->winSetEnabledImage( 0, left );
 	g->winSetEnabledImage( 1, right );
 	g->winSetEnabledImage( 2, center );
@@ -128,7 +125,7 @@ inline Color	GadgetSliderGetEnabledBorderColor( GameWindow *g )			{ return g->wi
 
 // sliders are drawn from pieces, a left/top, right/bottom, repeating center, and small repeating center
 inline void GadgetSliderSetDisabledImages( GameWindow *g, const Image *left, const Image *right, const Image *center, const Image *smallCenter )
-{ 
+{
 	g->winSetDisabledImage( 0, left );
 	g->winSetDisabledImage( 1, right );
 	g->winSetDisabledImage( 2, center );
@@ -153,7 +150,7 @@ inline Color	GadgetSliderGetDisabledBorderColor( GameWindow *g )			{ return g->w
 
 // sliders are drawn from pieces, a left/top, right/bottom, repeating center, and small repeating center
 inline void GadgetSliderSetHiliteImages( GameWindow *g, const Image *left, const Image *right, const Image *center, const Image *smallCenter )
-{ 
+{
 	g->winSetHiliteImage( 0, left );
 	g->winSetHiliteImage( 1, right );
 	g->winSetHiliteImage( 2, center );
@@ -440,6 +437,3 @@ inline Color GadgetSliderGetHiliteSelectedThumbBorderColor( GameWindow *g )
 																						}
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETSLIDER_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h b/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h
index b1720e866d0..83090aec761 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetStaticText.h ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -40,7 +40,7 @@
 //
 // Desc:       Helpful interface for StaticTexts
 //
-// StaticText IMAGE/COLOR organization 
+// StaticText IMAGE/COLOR organization
 // When control is enabled:
 //   enabledDrawData[ 0 ] is the background image for the whole enabled control
 //
@@ -55,9 +55,6 @@
 
 #pragma once
 
-#ifndef __GADGETSTATICTEXT_H_
-#define __GADGETSTATICTEXT_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -101,6 +98,3 @@ inline Color		 GadgetStaticTextGetHiliteColor( GameWindow *g )								{ return g
 inline Color		 GadgetStaticTextGetHiliteBorderColor( GameWindow *g )					{ return g->winGetHiliteBorderColor( 0 ); }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETSTATICTEXT_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h b/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h
index c05be43a902..17a91ba631a 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef __GADGETTABCONTROL_H_
-#define __GADGETTABCONTROL_H_
-
 enum
 {
 	GTC_BACKGROUND = 0,
@@ -274,6 +271,3 @@ inline Color GadgetTabControlGetHiliteBorderColorBackground( GameWindow *g )
 
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETTABCONTROL_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h b/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h
index 2233c206acf..b7efd3251f1 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetTextEntry.h ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -40,7 +40,7 @@
 //
 // Desc:       Helpful interface for TextEntrys
 //
-// TextEntry IMAGE/COLOR organization 
+// TextEntry IMAGE/COLOR organization
 //
 // note that windows that have an outlined text field will use the color
 // for the outline specified with the TextBorder... functions
@@ -50,9 +50,6 @@
 
 #pragma once
 
-#ifndef __GADGETTEXTENTRY_H_
-#define __GADGETTEXTENTRY_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -67,9 +64,9 @@ class GameWindow;
 // INLINING ///////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-inline void GadgetTextEntrySetText( GameWindow *g, UnicodeString text ) 
-{ 
-	TheWindowManager->winSendSystemMsg( g, GEM_SET_TEXT, (WindowMsgData)&text, 0 ); 
+inline void GadgetTextEntrySetText( GameWindow *g, UnicodeString text )
+{
+	TheWindowManager->winSendSystemMsg( g, GEM_SET_TEXT, (WindowMsgData)&text, 0 );
 }
 extern UnicodeString GadgetTextEntryGetText( GameWindow *textentry ); ///< Get the text from the text entry field
 extern void GadgetTextEntrySetFont( GameWindow *g, GameFont *font );  ///< set font for window and edit text display strings
@@ -124,6 +121,3 @@ inline Color GadgetTextEntryGetHiliteColor( GameWindow *g )								{ return g->w
 inline Color GadgetTextEntryGetHiliteBorderColor( GameWindow *g )					{ return g->winGetHiliteBorderColor( 0 ); }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETTEXTENTRY_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameClient.h b/Generals/Code/GameEngine/Include/GameClient/GameClient.h
index d599305b21c..16b1f1d7a49 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GameClient.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GameClient.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _GAME_INTERFACE_H_
-#define _GAME_INTERFACE_H_
-
 #include "Common/GameType.h"
 #include "Common/MessageStream.h"		// for GameMessageTranslator
 #include "Common/Snapshot.h"
@@ -56,7 +53,7 @@ class VideoPlayerInterface;
 struct RayEffectData;
 
 /// Function pointers for use by GameClient callback functions.
-typedef void (*GameClientFuncPtr)( Drawable *draw, void *userData ); 
+typedef void (*GameClientFuncPtr)( Drawable *draw, void *userData );
 typedef std::hash_map<DrawableID, Drawable *, rts::hash<DrawableID>, rts::equal_to<DrawableID> > DrawablePtrHash;
 typedef DrawablePtrHash::iterator DrawablePtrHashIt;
 
@@ -70,12 +67,12 @@ class GameClientMessageDispatcher : public GameMessageTranslator
 public:
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
 	virtual ~GameClientMessageDispatcher() { }
-};	
+};
 
 
 //-----------------------------------------------------------------------------
 /**
- * The GameClient class is used to instantiate a singleton which 
+ * The GameClient class is used to instantiate a singleton which
  * implements the interface to all GameClient operations such as Drawable access and user-interface functions.
  */
 class GameClient : public SubsystemInterface,
@@ -95,6 +92,10 @@ class GameClient : public SubsystemInterface,
 	virtual void setFrame( UnsignedInt frame ) { m_frame = frame; }			///< Set the GameClient's internal frame number
 	virtual void registerDrawable( Drawable *draw );										///< Given a drawable, register it with the GameClient and give it a unique ID
 
+	void step(); ///< Do one fixed time step
+
+	void updateHeadless();
+
 	void addDrawableToLookupTable( Drawable *draw );			///< add drawable ID to hash lookup table
 	void removeDrawableFromLookupTable( Drawable *draw );	///< remove drawable ID from hash lookup table
 
@@ -105,12 +106,13 @@ class GameClient : public SubsystemInterface,
 
 	virtual Drawable *firstDrawable( void ) { return m_drawableList; }
 
-	virtual GameMessage::Type evaluateContextCommand( Drawable *draw, 
-																										const Coord3D *pos, 
+	virtual GameMessage::Type evaluateContextCommand( Drawable *draw,
+																										const Coord3D *pos,
 																										CommandTranslator::CommandEvaluateType cmdType );
 	void addTextBearingDrawable( Drawable *tbd );
 	void flushTextBearingDrawables( void);
-	
+	void updateFakeDrawables(void);
+
 	virtual void removeFromRayEffects( Drawable *draw );  ///< remove the drawable from the ray effect system if present
 	virtual void getRayEffectData( Drawable *draw, RayEffectData *effectData );  ///< get ray effect data for a drawable
 	virtual void createRayEffectByTemplate( const Coord3D *start, const Coord3D *end, const ThingTemplate* tmpl ) = 0;  ///< create effect needing start and end location
@@ -122,7 +124,7 @@ class GameClient : public SubsystemInterface,
 
 	virtual void iterateDrawablesInRegion( Region3D *region, GameClientFuncPtr userFunc, void *userData );		///< Calls userFunc for each drawable contained within the region
 
-	virtual Drawable *friend_createDrawable( const ThingTemplate *thing, DrawableStatus statusBits = DRAWABLE_STATUS_NONE ) = 0;
+	virtual Drawable *friend_createDrawable( const ThingTemplate *thing, DrawableStatusBits statusBits = DRAWABLE_STATUS_DEFAULT ) = 0;
 	virtual void destroyDrawable( Drawable *draw );											///< Destroy the given drawable
 
 	virtual void setTimeOfDay( TimeOfDay tod );													///< Tell all the drawables what time of day it is now
@@ -134,7 +136,8 @@ class GameClient : public SubsystemInterface,
 
 	//---------------------------------------------------------------------------
 	virtual void setTeamColor( Int red, Int green, Int blue ) = 0;  ///< @todo superhack for demo, remove!!!
-	virtual void adjustLOD( Int adj ) = 0; ///< @todo hack for evaluation, remove.
+
+	virtual void setTextureLOD( Int level ) = 0;
 
 	virtual void releaseShadows(void);	///< frees all shadow resources used by this module - used by Options screen.
 	virtual void allocateShadows(void); ///< create shadow resources if not already present. Used by Options screen.
@@ -142,7 +145,7 @@ class GameClient : public SubsystemInterface,
   virtual void preloadAssets( TimeOfDay timeOfDay );									///< preload assets
 
 	virtual Drawable *getDrawableList( void ) { return m_drawableList; }
-	
+
 	void resetRenderedObjectCount() { m_renderedObjectCount = 0; }
 	UnsignedInt getRenderedObjectCount() const { return m_renderedObjectCount; }
 	void incrementRenderedObjectCount() { m_renderedObjectCount++; }
@@ -199,15 +202,15 @@ class GameClient : public SubsystemInterface,
 	DrawableTOCEntry *findTOCEntryByName( AsciiString name );	///< find DrawableTOC by name
 	DrawableTOCEntry *findTOCEntryById( UnsignedShort id );		///< find DrawableTOC by id
 	void xferDrawableTOC( Xfer *xfer );												///< save/load drawable TOC for current state of map
-	
+
 	typedef std::list< Drawable* > TextBearingDrawableList;
 	typedef TextBearingDrawableList::iterator TextBearingDrawableListIterator;
 	TextBearingDrawableList m_textBearingDrawableList;	///< the drawables that have registered here during drawablepostdraw
 };
 
 //Kris: Try not to use this if possible. In every case I found in the code base, the status was always Drawable::SELECTED.
-//      There is another iterator already in game that stores JUST selected drawables. Take a look at the efficient 
-//      example, InGameUI::getAllSelectedDrawables(). 
+//      There is another iterator already in game that stores JUST selected drawables. Take a look at the efficient
+//      example, InGameUI::getAllSelectedDrawables().
 #define BEGIN_ITERATE_DRAWABLES_WITH_STATUS(STATUS, DRAW) \
 	do \
 	{ \
@@ -216,7 +219,7 @@ class GameClient : public SubsystemInterface,
 		{ \
 			_xq_nextDrawable = DRAW->getNextDrawable(); \
 			if (DRAW->getStatusFlags() & (STATUS)) \
-			{ 
+			{
 
 #define END_ITERATE_DRAWABLES \
 			} \
@@ -269,5 +272,3 @@ extern GameClient *TheGameClient;
 //					m_roadBuffer = NULL
 //					m_shroud = NULL
 //		TheRadar = RadarDummy
-
-#endif // _GAME_INTERFACE_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameFont.h b/Generals/Code/GameEngine/Include/GameClient/GameFont.h
index 908d9fe68dd..2307e00547b 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GameFont.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GameFont.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GAMEFONT_H_
-#define __GAMEFONT_H_
-
 #include "Common/SubsystemInterface.h"
 #include "Lib/BaseType.h"
 #include "Common/AsciiString.h"
@@ -42,7 +39,7 @@
 //-------------------------------------------------------------------------------------------------
 class GameFont : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameFont, "GameFont")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameFont, "GameFont")
 public:
 	GameFont*			next;  ///< for library use
 	AsciiString		nameString;
@@ -97,7 +94,7 @@ class FontLibrary : public SubsystemInterface
 // INLINING ///////////////////////////////////////////////////////////////////////////////////////
 inline Int FontLibrary::getCount( void ) { return m_count; }
 inline GameFont *FontLibrary::firstFont( void ) { return m_fontList; }
-inline GameFont *FontLibrary::nextFont( GameFont *font ) 
+inline GameFont *FontLibrary::nextFont( GameFont *font )
 {
 	if( font )
 		return font->next;
@@ -106,6 +103,3 @@ inline GameFont *FontLibrary::nextFont( GameFont *font )
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern FontLibrary *TheFontLibrary;  ///< font library external
-
-#endif // __GAMEFONT_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h b/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h
index c4aa41f403f..a7c8dea16bd 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GAMEINFOWINDOW_H_
-#define __GAMEINFOWINDOW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/GameWindow.h"
 #include "GameNetwork/LANGameInfo.h"
@@ -41,6 +38,3 @@ extern void CreateLANGameInfoWindow( GameWindow *sizeAndPosWin );
 extern void DestroyGameInfoWindow(void);
 extern void RefreshGameInfoWindow(GameInfo *gameInfo, UnicodeString gameName);
 extern void HideGameInfoWindow(Bool hide);
-
-#endif // __GAMEINFOWINDOW_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameText.h b/Generals/Code/GameEngine/Include/GameClient/GameText.h
index 0f93032970d..65d9ce60fbf 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GameText.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GameText.h
@@ -24,12 +24,12 @@
 
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    RTS 3
@@ -42,12 +42,8 @@
 
 #pragma once
 
-#ifndef __GAMECLIENT_GAMETEXT_H_
-#define __GAMECLIENT_GAMETEXT_H_
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
@@ -63,7 +59,7 @@ class UnicodeString;
 typedef std::vector<AsciiString> AsciiStringVec;
 
 //===============================
-// GameTextInterface 
+// GameTextInterface
 //===============================
 /** Game text interface object for localised text.
 	*/
@@ -77,11 +73,29 @@ class GameTextInterface : public SubsystemInterface
 		virtual ~GameTextInterface() {};
 
 		virtual UnicodeString fetch( const Char *label, Bool *exists = NULL ) = 0;		///< Returns the associated labeled unicode text
-		virtual UnicodeString fetch( AsciiString label, Bool *exists = NULL ) = 0;		///< Returns the associated labeled unicode text
+		virtual UnicodeString fetch( AsciiString label, Bool *exists = NULL ) = 0;		///< Returns the associated labeled unicode text ; TheSuperHackers @todo Remove
+		virtual UnicodeString fetchFormat( const Char *label, ... ) = 0;
+
+		// Do not call this directly, but use the FETCH_OR_SUBSTITUTE macro
+		virtual UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText ) = 0;
+		virtual UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... ) = 0;
+		virtual UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args ) = 0;
+
 		// This function is not performance tuned.. Its really only for Worldbuilder. jkmcd
 		virtual AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) = 0;
 
 		virtual void					initMapStringFile( const AsciiString& filename ) = 0;
+
+#if __cplusplus < 201103L // TheSuperHackers @todo Remove function when abandoning VC6
+		inline UnicodeString FETCH_OR_SUBSTITUTE_FORMAT( const Char *label, const WideChar *substituteFormat, ... )
+		{
+			va_list args;
+			va_start(args, substituteFormat);
+			UnicodeString str = fetchOrSubstituteFormatVA(label, substituteFormat, args);
+			va_end(args);
+			return str;
+		}
+#endif
 };
 
 
@@ -89,8 +103,25 @@ extern GameTextInterface *TheGameText;
 extern GameTextInterface* CreateGameTextInterface( void );
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
 
+// TheSuperHackers @info This is meant to be used like:
+// TheGameText->FETCH_OR_SUBSTITUTE("GUI:LabelName", L"Substitute Fallback Text")
+// TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:LabelName", L"Substitute Fallback Text %d %d", 1, 2)
+// The substitute text will be compiled out if ENABLE_GAMETEXT_SUBSTITUTES is not defined.
+#if ENABLE_GAMETEXT_SUBSTITUTES
+
+#define FETCH_OR_SUBSTITUTE(labelA, substituteTextW) fetchOrSubstitute(labelA, substituteTextW)
+#if __cplusplus >= 201103L // TheSuperHackers @todo Remove condition when abandoning VC6
+#define FETCH_OR_SUBSTITUTE_FORMAT(labelA, substituteFormatW, ...) fetchOrSubstituteFormat(labelA, substituteFormatW, __VA_ARGS__)
+#endif
+
+#else
+
+#define FETCH_OR_SUBSTITUTE(labelA, substituteTextW) fetch(labelA)
+#if __cplusplus >= 201103L // TheSuperHackers @todo Remove condition when abandoning VC6
+#define FETCH_OR_SUBSTITUTE_FORMAT(labelA, substituteTextW, ...) fetchFormat(labelA, __VA_ARGS__)
+#endif
 
-#endif // __GAMECLIENT_GAMETEXT_H_
+#endif // ENABLE_GAMETEXT_SUBSTITUTES
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindow.h b/Generals/Code/GameEngine/Include/GameClient/GameWindow.h
index 86e116142b0..05bcc41d18b 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GameWindow.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GameWindow.h
@@ -24,12 +24,12 @@
 
 // FILE: GameWindow.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __GAMEWINDOW_H_
-#define __GAMEWINDOW_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -83,20 +80,20 @@ enum WindowMsgHandledType CPP_11(: Int) { MSG_IGNORED, MSG_HANDLED };
 
 // callback types -------------------------------------------------------------
 typedef void (*GameWinMsgBoxFunc)( void ); //used for the Message box callbacks.
-typedef void (*GameWinDrawFunc)( GameWindow *, 
+typedef void (*GameWinDrawFunc)( GameWindow *,
 																 WinInstanceData * );
-typedef void (*GameWinTooltipFunc)( GameWindow *, 
-																		WinInstanceData *, 
+typedef void (*GameWinTooltipFunc)( GameWindow *,
+																		WinInstanceData *,
 																		UnsignedInt );
-typedef WindowMsgHandledType (*GameWinInputFunc)( GameWindow *, 
-																	UnsignedInt, 
-																	WindowMsgData, 
+typedef WindowMsgHandledType (*GameWinInputFunc)( GameWindow *,
+																	UnsignedInt,
+																	WindowMsgData,
 																	WindowMsgData );
-typedef WindowMsgHandledType (*GameWinSystemFunc)( GameWindow *, 
-																	 UnsignedInt, 
-																	 WindowMsgData, 
+typedef WindowMsgHandledType (*GameWinSystemFunc)( GameWindow *,
+																	 UnsignedInt,
+																	 WindowMsgData,
 																	 WindowMsgData );
-	 
+
 enum
 {
 
@@ -195,7 +192,7 @@ enum
 	MSG_BOX_YES							= 0x01, //Display the yes button
 	MSG_BOX_NO							= 0x02, //Display the No button
 	MSG_BOX_OK							= 0x08, //Display the Ok button
-	MSG_BOX_CANCEL					= 0x04, //Display the Cancel button	
+	MSG_BOX_CANCEL					= 0x04, //Display the Cancel button
 };
 
 
@@ -261,11 +258,11 @@ friend class GameWindowManager;
 	UnsignedInt winGetStyle( void );  ///< get style bits
 	Int winNextTab( void );  ///< advance focus to next window
 	Int winPrevTab( void );  ///< change focus to previous window
-	Int winSetPosition( Int x, Int y );  ///< set window position                                 
+	Int winSetPosition( Int x, Int y );  ///< set window position
 	Int winGetPosition( Int *x, Int *y );  ///< get window position
 	Int winGetScreenPosition( Int *x, Int *y );  ///< get screen coordinates
 	Int winGetRegion( IRegion2D *region );  ///< get window region
-	Int winSetCursorPosition( Int x, Int y );  ///< set window cursor position                                 
+	Int winSetCursorPosition( Int x, Int y );  ///< set window cursor position
 	Int winGetCursorPosition( Int *x, Int *y );  ///< get window cursor position
 
 	// --------------------------------------------------------------------------
@@ -341,7 +338,7 @@ friend class GameWindowManager;
 
 	// these are for interacting with a group of windows as a shell "screen"
 	void winSetNextInLayout( GameWindow *next );  ///< set next in layout
-	void winSetPrevInLayout( GameWindow *prev );  ///< set prev in layout 
+	void winSetPrevInLayout( GameWindow *prev );  ///< set prev in layout
 	void winSetLayout( WindowLayout *layout );  ///< set layout
 	WindowLayout *winGetLayout( void );  ///< get layout layout
 	GameWindow *winGetNextInLayout( void );  ///< get next window in layout
@@ -358,7 +355,7 @@ friend class GameWindowManager;
 
 	// pick correlation ---------------------------------------------------------
 	Bool winPointInWindow( Int x, Int y );  /**is point inside this window?
-																					also return TRUE if point is in 
+																					also return TRUE if point is in
 																					a child */
 	/** given a piont, return the child window which contains the mouse pointer,
 	if the point is not in a chilc, the function returns the 'window' paramater
@@ -431,7 +428,7 @@ friend class GameWindowManager;
 	// vector of window transitions that have a relation to the current GameWindow
 	std::vector<TransitionWindow*> m_transitionWindows;
 
-};  // end class GameWindow
+};
 
 // TheSuperHackers @feature helmutbuhler 24/04/2025
 // GameWindow that does nothing. Used for Headless Mode.
@@ -456,7 +453,7 @@ class ModalWindow : public MemoryPoolObject
 EMPTY_DTOR(ModalWindow)
 
 // Errors returned by window functions
-enum 
+enum
 {
 
 	WIN_ERR_OK								=  0,	// No Error
@@ -482,26 +479,23 @@ enum
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-extern void GameWinDefaultDraw( GameWindow *window, 
+extern void GameWinDefaultDraw( GameWindow *window,
 																WinInstanceData *instData );
-extern WindowMsgHandledType GameWinDefaultSystem( GameWindow *window, 
-																	UnsignedInt msg, 
-																  WindowMsgData mData1, 
+extern WindowMsgHandledType GameWinDefaultSystem( GameWindow *window,
+																	UnsignedInt msg,
+																  WindowMsgData mData1,
 																	WindowMsgData mData2 );
-extern WindowMsgHandledType GameWinDefaultInput( GameWindow *window, 
+extern WindowMsgHandledType GameWinDefaultInput( GameWindow *window,
 																 UnsignedInt msg,
-																 WindowMsgData mData1, 
+																 WindowMsgData mData1,
 																 WindowMsgData mData2 );
-extern WindowMsgHandledType GameWinBlockInput( GameWindow *window, 
+extern WindowMsgHandledType GameWinBlockInput( GameWindow *window,
 																 UnsignedInt msg,
-																 WindowMsgData mData1, 
+																 WindowMsgData mData1,
 																 WindowMsgData mData2 );
-extern void GameWinDefaultTooltip( GameWindow *window, 
+extern void GameWinDefaultTooltip( GameWindow *window,
 																	 WinInstanceData *instData,
 																	 UnsignedInt mouse );
 
-extern const char *WindowStatusNames[];
-extern const char *WindowStyleNames[];
-
-#endif // __GAMEWINDOW_H_
-
+extern const char *const WindowStatusNames[];
+extern const char *const WindowStyleNames[];
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h
index fd7e8768ac9..d27d107b9e7 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowGlobal.h ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __GAMEWINDOWGLOBAL_H_
-#define __GAMEWINDOWGLOBAL_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -64,6 +61,3 @@
 ///////////////////////////////////////////////////////////////////////////////
 // EXTERNALS //////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-
-#endif // __GAMEWINDOWGLOBAL_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h
index ee4a6baedbe..9d5eec2be54 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowID.h ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -47,9 +47,6 @@
 
 #pragma once
 
-#ifndef __GAMEWINDOWID_H_
-#define __GAMEWINDOWID_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -84,6 +81,3 @@
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GAMEWINDOWID_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h
index 2a5b476effc..6b14f7bba29 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h
@@ -25,16 +25,12 @@
 // FILE: GameWindowManager.h //////////////////////////////////////////////////////////////////////
 // Created:    Colin Day, June 2001
 // Desc:       The game window manager is the interface for interacting with
-//						 the windowing system for purposes of any menus, or GUI 
+//						 the windowing system for purposes of any menus, or GUI
 //						 controls.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __GAMEWINDOWMANAGER_H_
-#define __GAMEWINDOWMANAGER_H_
-
-
 #include "Common/STLTypedefs.h"
 #include "Common/SubsystemInterface.h"
 #include "GameClient/WindowLayout.h"
@@ -70,7 +66,7 @@ class WindowLayoutInfo
 };
 
 //-------------------------------------------------------------------------------------------------
-/** There exists a singleton GameWindowManager that defines how we can 
+/** There exists a singleton GameWindowManager that defines how we can
 	* interact with the game windowing system */
 //-------------------------------------------------------------------------------------------------
 class GameWindowManager : public SubsystemInterface
@@ -145,54 +141,54 @@ friend class GameWindow;
 	//---------------------------------------------------------------------------
 	// gadget creation
 	virtual GameWindow *gogoGadgetPushButton( GameWindow *parent, UnsignedInt status,
-																						Int x, Int y, Int width, Int height,	
-																						WinInstanceData *instData, 
+																						Int x, Int y, Int width, Int height,
+																						WinInstanceData *instData,
 																						GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetCheckbox( GameWindow *parent, UnsignedInt status,
-																					Int x, Int y, Int width, Int height, 
+																					Int x, Int y, Int width, Int height,
 																					WinInstanceData *instData,
 																					GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetRadioButton( GameWindow *parent, UnsignedInt status,
-																						 Int x, Int y, Int width, Int height, 
-																						 WinInstanceData *instData, 
+																						 Int x, Int y, Int width, Int height,
+																						 WinInstanceData *instData,
 																						 RadioButtonData *rData,
 																						 GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetTabControl( GameWindow *parent, UnsignedInt status,
-																						 Int x, Int y, Int width, Int height, 
-																						 WinInstanceData *instData, 
+																						 Int x, Int y, Int width, Int height,
+																						 WinInstanceData *instData,
 																						 TabControlData *rData,
 																						 GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetListBox( GameWindow *parent, UnsignedInt status,
 																				 Int x, Int y, Int width, Int height,
-																				 WinInstanceData *instData, 
+																				 WinInstanceData *instData,
 																				 ListboxData *listboxData,
 																				 GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetSlider( GameWindow *parent, UnsignedInt status,
 																				Int x, Int y, Int width, Int height,
-																				WinInstanceData *instData, 
+																				WinInstanceData *instData,
 																				SliderData *sliderData,
 																				GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetProgressBar( GameWindow *parent, UnsignedInt status,
-																						 Int x, Int y, Int width, Int height, 
+																						 Int x, Int y, Int width, Int height,
 																						 WinInstanceData *instData,
 																						 GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetStaticText( GameWindow *parent, UnsignedInt status,
 																						Int x, Int y, Int width, Int height,
-																						WinInstanceData *instData, 
+																						WinInstanceData *instData,
 																						TextData *textData,
 																						GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetTextEntry( GameWindow *parent, UnsignedInt status,
 																					 Int x, Int y, Int width, Int height,
-																					 WinInstanceData *instData, 
+																					 WinInstanceData *instData,
 																					 EntryData *entryData,
 																					 GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetComboBox( GameWindow *parent, UnsignedInt status,
 										                              Int x, Int y, Int width, Int height,
-																									WinInstanceData *instData, 
+																									WinInstanceData *instData,
 																									ComboBoxData *comboBoxDataTemplate,
 																								  GameFont *defaultFont, Bool defaultVisual );
 
-	/** Use this method to assign the default images to gadgets as 
+	/** Use this method to assign the default images to gadgets as
 		* they area created */
 	virtual void assignDefaultGadgetLook( GameWindow *gadget,
 																				GameFont *defaultFont,
@@ -226,7 +222,7 @@ friend class GameWindow;
 																	 Bool hideFlag );
 	/// enable all windows in a range of id's (inclusive)
 	virtual void enableWindowsInRange( GameWindow *baseWindow, Int first, Int last,
-																		 Bool enableFlag );	
+																		 Bool enableFlag );
 
 	/// this gets called from winHide() when a window hides itself
 	virtual void windowHiding( GameWindow *window );
@@ -246,7 +242,7 @@ friend class GameWindow;
 														 ICoord2D *mousePos,
 														 void *data );
 	/// process a singke key event
-	virtual WinInputReturnCode winProcessKey( UnsignedByte key, 
+	virtual WinInputReturnCode winProcessKey( UnsignedByte key,
 																						UnsignedByte state );
 	// --------------------------------------------------------------------------
 
@@ -256,6 +252,10 @@ friend class GameWindow;
 	virtual GameWindow *winGetGrabWindow( void );  ///< who is currently 'held' by mouse
 	virtual void winSetLoneWindow( GameWindow *window );  ///< set the open window
 
+	// Finds the top-level window at the mouse position that matches the required and forbidden status masks.
+	virtual GameWindow* findWindowUnderMouse(GameWindow*& toolTipWindow, const ICoord2D* mousePos, unsigned int requiredStatusMask, unsigned int forbiddenStatusMask);
+	static bool isMouseWithinWindow(GameWindow* window, const ICoord2D* mousePos, unsigned int requiredStatusMask, unsigned int forbiddenStatusMask);
+
 	virtual Bool isEnabled( GameWindow *win );  ///< is window or parents enabled
 	virtual Bool isHidden( GameWindow *win );  ///< is parent or parents hidden
 	virtual void addWindowToParent( GameWindow *window, GameWindow *parent );
@@ -271,7 +271,7 @@ friend class GameWindow;
 
 	/** get the window pointer from id, starting at 'window' and searching
 	down the heirarchy.  If 'window' is NULL then all windows will
-	be searched */ 
+	be searched */
 	virtual GameWindow *winGetWindowFromId( GameWindow *window, Int id );
 	virtual Int winCapture( GameWindow *window );  ///< captures the mouse
 	virtual Int winRelease( GameWindow *window );  ///< release mouse capture
@@ -313,14 +313,14 @@ friend class GameWindow;
 	virtual Int winIsAlNum( Int c );  ///< is character alpha-numeric
 	virtual void winFormatText( GameFont *font, UnicodeString text, Color color,
 															Int x, Int y, Int width, Int height );
-	virtual void winGetTextSize( GameFont *font, UnicodeString text, 
+	virtual void winGetTextSize( GameFont *font, UnicodeString text,
 															 Int *width, Int *height, Int maxWidth );
 	virtual UnicodeString winTextLabelToText( AsciiString label );  ///< convert localizable text label to real text
 	virtual GameFont *winFindFont( AsciiString fontName, Int pointSize, Bool bold );  ///< get a font given a name
 
 	/// @todo just for testing, remov this
 	Bool initTestGUI( void );
-	
+
 	virtual GameWindow *getWindowUnderCursor( Int x, Int y, Bool ignoreEnabled = FALSE );	///< find the top window at the given coordinates
 
 	//---------------------------------------------------------------------------
@@ -355,7 +355,7 @@ friend class GameWindow;
 	const Image *m_cursorBitmap;
 	UnsignedInt m_captureFlags;
 
-};  // end GameWindowManager
+};
 
 // INLINE /////////////////////////////////////////////////////////////////////////////////////////
 inline GameWinDrawFunc GameWindowManager::getDefaultDraw( void ) { return GameWinDefaultDraw; }
@@ -367,16 +367,16 @@ inline GameWinTooltipFunc GameWindowManager::getDefaultTooltip( void ) { return
 extern GameWindowManager *TheWindowManager;			///< singleton extern definition
 extern UnsignedInt WindowLayoutCurrentVersion;  ///< current version of our window layouts
 
-// this function lets us generically pass button selections to our parent, we may 
+// this function lets us generically pass button selections to our parent, we may
 // frequently want to do this because we want windows grouped on child windows for
 // convenience, but only want one logical system procedure responding to them all
-extern WindowMsgHandledType PassSelectedButtonsToParentSystem( GameWindow *window, 
+extern WindowMsgHandledType PassSelectedButtonsToParentSystem( GameWindow *window,
 																															 UnsignedInt msg,
-																															 WindowMsgData mData1, 
+																															 WindowMsgData mData1,
 																															 WindowMsgData mData2 );
-extern WindowMsgHandledType PassMessagesToParentSystem( GameWindow *window, 
+extern WindowMsgHandledType PassMessagesToParentSystem( GameWindow *window,
 																															 UnsignedInt msg,
-																															 WindowMsgData mData1, 
+																															 WindowMsgData mData1,
 																															 WindowMsgData mData2 );
 
 // TheSuperHackers @feature helmutbuhler 24/04/2025
@@ -412,6 +412,3 @@ class GameWindowManagerDummy : public GameWindowManager
 	virtual GameWinDrawFunc getTextEntryImageDrawFunc() { return NULL; }
 	virtual GameWinDrawFunc getTextEntryDrawFunc() { return NULL; }
 };
-
-#endif // __GAMEWINDOWMANAGER_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h
index ce558b2bdc8..cf4cee46abb 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowTransitions.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Dec 2002
@@ -37,16 +37,15 @@
 //	Filename: 	GameWindowTransitions.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __GAME_WINDOW_TRANSITIONS_H_
-#define __GAME_WINDOW_TRANSITIONS_H_
+#include "Common/GameCommon.h"
 
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
@@ -84,10 +83,10 @@ CONTROL_BAR_ARROW_TRANSITION,
 SCORE_SCALE_UP_TRANSITION,
 REVERSE_SOUND_TRANSITION,
 
-MAX_TRANSITION_WINDOW_STYLES				///< Keep this last
+MAX_TRANSITION_WINDOW_STYLES
 };
 
-static const LookupListRec TransitionStyleNames[] = 
+static const LookupListRec TransitionStyleNames[] =
 {
 	{ "FLASH",					TRANSITION_FLASH },
 	{ "BUTTONFLASH",		BUTTON_TRANSITION_FLASH },
@@ -104,11 +103,9 @@ static const LookupListRec TransitionStyleNames[] =
 	{ "CONTROLBARARROW",			CONTROL_BAR_ARROW_TRANSITION },
 	{ "SCORESCALEUP",			SCORE_SCALE_UP_TRANSITION },
 	{ "REVERSESOUND",			REVERSE_SOUND_TRANSITION },
-	
-	
-
-	{ NULL, 0	}// keep this last!
+	{ NULL, 0	}
 };
+static_assert(ARRAY_SIZE(TransitionStyleNames) == MAX_TRANSITION_WINDOW_STYLES + 1, "Incorrect array size");
 
 // base class for the transitions
 // inherit off of this adding in all the values
@@ -122,14 +119,14 @@ class Transition
 	virtual void update( Int frame ) = 0;
 	virtual void reverse( void ) = 0;
 	virtual void draw( void ) = 0;
-	
+
 	virtual void skip( void ) = 0;
-	
+
 	void unlinkGameWindow(GameWindow* win) { if ( m_win == win ) m_win = NULL; }
 	Bool isFinished( void ) { return m_isFinished;	}
 	Int getFrameLength( void ){ return m_frameLength;	}
 protected:
-	
+
 	Int m_frameLength;	// how many frames does this thing take.
 	Bool m_isFinished;  // when we finish we set this
 	Bool m_isForward;
@@ -148,9 +145,9 @@ class TextOnFrameTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	TEXTONFRAMETRANSITION_START = 0,
@@ -170,9 +167,9 @@ class ReverseSoundTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	REVERSESOUNDTRANSITION_START = 0,
@@ -193,9 +190,9 @@ class FullFadeTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	FULLFADETRANSITION_START = 0,
@@ -205,7 +202,7 @@ class FullFadeTransition : public Transition
 	ICoord2D m_size;
 	Real m_percent;
 	Int m_drawState;
-	
+
 };
 //-----------------------------------------------------------------------------
 class ControlBarArrowTransition : public Transition
@@ -218,9 +215,9 @@ class ControlBarArrowTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	CONTROLBARARROWTRANSITION_START = 0,
@@ -234,7 +231,7 @@ class ControlBarArrowTransition : public Transition
 	Real m_fadePercent;
 	Int m_drawState;
 	const Image* m_arrowImage;
-	
+
 };
 //-----------------------------------------------------------------------------
 class ScreenFadeTransition : public Transition
@@ -247,9 +244,9 @@ class ScreenFadeTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	SCREENFADETRANSITION_START = 0,
@@ -259,7 +256,7 @@ class ScreenFadeTransition : public Transition
 	ICoord2D m_size;
 	Real m_percent;
 	Int m_drawState;
-	
+
 };
 //-----------------------------------------------------------------------------
 class CountUpTransition : public Transition
@@ -272,9 +269,9 @@ class CountUpTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	COUNTUPTRANSITION_START = 0,
@@ -306,9 +303,9 @@ class TextTypeTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	TEXTTYPETRANSITION_START = 0,
@@ -333,9 +330,9 @@ class MainMenuScaleUpTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	MAINMENUSCALEUPTRANSITION_START = 0,
@@ -363,9 +360,9 @@ class MainMenuMediumScaleUpTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	MAINMENUMEDIUMSCALEUPTRANSITION_START = 0,
@@ -391,9 +388,9 @@ class MainMenuSmallScaleDownTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	MAINMENUSMALLSCALEDOWNTRANSITION_START = 0,
@@ -402,7 +399,7 @@ class MainMenuSmallScaleDownTransition : public Transition
 	MAINMENUSMALLSCALEDOWNTRANSITION_3 = 3,
 	MAINMENUSMALLSCALEDOWNTRANSITION_4 = 4,
 	MAINMENUSMALLSCALEDOWNTRANSITION_5 = 5,
-	MAINMENUSMALLSCALEDOWNTRANSITION_END 
+	MAINMENUSMALLSCALEDOWNTRANSITION_END
 	};
 	ICoord2D m_pos;
 	ICoord2D m_size;
@@ -424,9 +421,9 @@ class ScaleUpTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	SCALEUPTRANSITION_START = 0,
@@ -449,7 +446,7 @@ class ScaleUpTransition : public Transition
 //	SCALEUPTRANSITION_17 = 17,
 //	SCALEUPTRANSITION_18 = 18,
 //	SCALEUPTRANSITION_19 = 19,
-	SCALEUPTRANSITION_END 
+	SCALEUPTRANSITION_END
 	};
 	ICoord2D m_pos;
 	ICoord2D m_size;
@@ -469,9 +466,9 @@ class ScoreScaleUpTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	SCORESCALEUPTRANSITION_START = 0,
@@ -481,7 +478,7 @@ class ScoreScaleUpTransition : public Transition
 	SCORESCALEUPTRANSITION_4 = 4,
 	SCORESCALEUPTRANSITION_5 = 5,
 
-	SCORESCALEUPTRANSITION_END 
+	SCORESCALEUPTRANSITION_END
 	};
 	ICoord2D m_pos;
 	ICoord2D m_size;
@@ -503,9 +500,9 @@ class FadeTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	FADETRANSITION_START = 0,
@@ -518,7 +515,7 @@ class FadeTransition : public Transition
 	FADETRANSITION_FADE_IN_7 = 7,
 	FADETRANSITION_FADE_IN_8 = 8,
 	FADETRANSITION_FADE_IN_9 = 9,
-	FADETRANSITION_END 
+	FADETRANSITION_END
 	};
 	ICoord2D m_pos;
 	ICoord2D m_size;
@@ -538,9 +535,9 @@ class FlashTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	FLASHTRANSITION_START = 0,
@@ -551,7 +548,7 @@ class FlashTransition : public Transition
 	FLASHTRANSITION_FADE_TO_BACKGROUND_2 = 5,
 	FLASHTRANSITION_FADE_TO_BACKGROUND_3 = 6,
 	FLASHTRANSITION_FADE_TO_BACKGROUND_4 = 7,
-	FLASHTRANSITION_END 
+	FLASHTRANSITION_END
 	};
 	ICoord2D m_pos;
 	ICoord2D m_size;
@@ -569,9 +566,9 @@ class ButtonFlashTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	BUTTONFLASHTRANSITION_START = 0,
@@ -638,7 +635,7 @@ class TransitionGroup
 	Bool isFinished( void );
 	void reverse( void );
 	void draw( void );
-	
+
 	void skip ( void );
 	AsciiString getName( void ) { return m_name; }
 	void setName( AsciiString name){ m_name = name;	}
@@ -650,7 +647,7 @@ class TransitionGroup
 	typedef std::list<TransitionWindow *> TransitionWindowList;
 	TransitionWindowList m_transitionWindowList;
 	Int m_directionMultiplier;
-	Int m_currentFrame; ///< maintain how long we've spent on this transition;
+	Real m_currentFrame; ///< maintain how long we've spent on this transition (in 30fps-equivalent frames);
 	AsciiString m_name;
 };
 
@@ -696,5 +693,3 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha );
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 extern GameWindowTransitionsHandler *TheTransitionHandler;
-#endif // __GAME_WINDOW_TRANSITIONS_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h b/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h
index 3b17183e611..9ceb7abe0fa 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h
@@ -24,12 +24,12 @@
 
 // FILE: GlobalLanguage.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,8 +37,8 @@
 //	Filename: 	GlobalLanguage.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	With workingwith different languages, we need some options that 
+//
+//	purpose:	With workingwith different languages, we need some options that
 //						change.  Essentially, this is the global data that's unique to languages
 //
 //-----------------------------------------------------------------------------
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __GLOBAL_LANGUAGE_H_
-#define __GLOBAL_LANGUAGE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -68,6 +65,18 @@ class AsciiString;
 //-----------------------------------------------------------------------------
 class GlobalLanguage : public SubsystemInterface
 {
+public:
+
+	enum ResolutionFontSizeMethod
+	{
+		ResolutionFontSizeMethod_Classic, // Uses the original scaling method. Scales poorly on wide screens and large resolutions.
+		ResolutionFontSizeMethod_ClassicNoCeiling, // Uses the original scaling method, but without ceiling. Works ok for the original Game UI and with large resolutions. Scales poorly on very wide screens.
+		ResolutionFontSizeMethod_Strict, // Uses a strict scaling method. Width and height are strictly bounded on upscales. Works well for accurate UI layouts and with large resolutions.
+		ResolutionFontSizeMethod_Balanced, // Uses a balanced scaling method. Width and height are evenly weighted for upscales. Works well for the original Game UI and with large resolutions.
+
+		ResolutionFontSizeMethod_Default = ResolutionFontSizeMethod_ClassicNoCeiling,
+	};
+
 public:
 
 	GlobalLanguage();
@@ -98,15 +107,17 @@ class GlobalLanguage : public SubsystemInterface
 	FontDesc	m_creditsTitleFont;
 	FontDesc  m_creditsPositionFont;
 	FontDesc  m_creditsNormalFont;
-
 	Real			m_resolutionFontSizeAdjustment;
+	Real			m_userResolutionFontSizeAdjustment;
+	ResolutionFontSizeMethod m_resolutionFontSizeMethod;
 
-	//UnicodeString	m_unicodeFontNameUStr;
-	
+	float getResolutionFontSizeAdjustment() const;
 	Int adjustFontSize(Int theFontSize);	// Adjusts font size for resolution. jba.
 
-	typedef std::list<AsciiString> StringList;					// Used for our font file names that we want to load		
-	typedef StringList::iterator StringListIt;				
+	void parseCustomDefinition();
+
+	typedef std::list<AsciiString> StringList;					// Used for our font file names that we want to load
+	typedef StringList::iterator StringListIt;
 
 	StringList m_localFonts;														// List of the font filenames that are in our local directory
 	static void parseFontFileName( INI *ini, void *instance, void *store, const void* userData );
@@ -120,4 +131,3 @@ class GlobalLanguage : public SubsystemInterface
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 extern GlobalLanguage *TheGlobalLanguageData;
-#endif // __GLOBAL_LANGUAGE_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h b/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h
index 8b936d168bb..97cc938851b 100644
--- a/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h
+++ b/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h
@@ -24,12 +24,12 @@
 
 // FILE: GraphDraw.h //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,18 +37,16 @@
 //	Filename: 	GraphDraw.h
 //
 //	author:		John McDonald
-//	
-//	purpose:	Contains the functions to queue up and display a single graph for 
+//
+//	purpose:	Contains the functions to queue up and display a single graph for
 //						each frame. Note: This class is presently only intended for use by
-//						the Performance timers, all though it could be easily adapted for 
+//						the Performance timers, all though it could be easily adapted for
 //						other purposes.
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
-#ifndef __GRAPHDRAW_H__
-#define __GRAPHDRAW_H__
 
 #include "Common/PerfTimer.h"
 #include "Common/STLTypedefs.h"
@@ -85,6 +83,3 @@ extern GraphDraw *TheGraphDraw;
 
 
 #endif /* PERF_TIMERS */
-
-#endif /* __GRAPHDRAW_H__ */
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h b/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h
index d0257172ce2..edeec5a3c45 100644
--- a/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h
+++ b/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h
@@ -24,12 +24,12 @@
 
 // FILE: HeaderTemplate.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,17 +37,14 @@
 //	Filename: 	HeaderTemplate.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __HEADER_TEMPLATE_H_
-#define __HEADER_TEMPLATE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -76,28 +73,28 @@ class HeaderTemplate
 	AsciiString m_fontName;
 	Int m_point;
 	Bool m_bold;
-	
+
 };
 
 class HeaderTemplateManager
 {
 public:
 	HeaderTemplateManager( void );
-	~HeaderTemplateManager( void );	
+	~HeaderTemplateManager( void );
 
 	void init( void );
-	
+
 	const FieldParse *getFieldParse( void ) const { return m_headerFieldParseTable; }		///< Return the field parse info
 	static const FieldParse m_headerFieldParseTable[];
-	
+
 	HeaderTemplate *findHeaderTemplate( AsciiString name );
 	HeaderTemplate *newHeaderTemplate( AsciiString name );
-	
+
 	GameFont *getFontFromTemplate( AsciiString name );
 	HeaderTemplate *getFirstHeader( void );
 	HeaderTemplate *getNextHeader( HeaderTemplate *ht );
 
-	void headerNotifyResolutionChange(void);
+	void onResolutionChanged(void);
 
 private:
 	void populateGameFonts( void );
@@ -116,4 +113,3 @@ class HeaderTemplateManager
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 extern HeaderTemplateManager *TheHeaderTemplateManager;
-#endif // __HEADER_TEMPLATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/HintSpy.h b/Generals/Code/GameEngine/Include/GameClient/HintSpy.h
index c37af637e48..06ae41156f7 100644
--- a/Generals/Code/GameEngine/Include/GameClient/HintSpy.h
+++ b/Generals/Code/GameEngine/Include/GameClient/HintSpy.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef _H_HintSpy
-#define _H_HintSpy
-
 #include "GameClient/InGameUI.h"
 
 //-----------------------------------------------------------------------------
@@ -38,6 +35,4 @@ class HintSpyTranslator : public GameMessageTranslator
 public:
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
 	virtual ~HintSpyTranslator() { }
-};	
-
-#endif
+};
diff --git a/Generals/Code/GameEngine/Include/GameClient/HotKey.h b/Generals/Code/GameEngine/Include/GameClient/HotKey.h
index b91986b31dc..84becd005d3 100644
--- a/Generals/Code/GameEngine/Include/GameClient/HotKey.h
+++ b/Generals/Code/GameEngine/Include/GameClient/HotKey.h
@@ -25,12 +25,12 @@
 
 // FILE: HotKey.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -38,17 +38,14 @@
 //	Filename: 	HotKey.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __HOT_KEY_H_
-#define __HOT_KEY_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -79,7 +76,7 @@ class HotKey
 public:
 	HotKey( void );
 	GameWindow *m_win;
-	AsciiString m_key;	
+	AsciiString m_key;
 	// we may need a checkmark system.
 };
 
@@ -97,7 +94,7 @@ class HotKeyManager : public SubsystemInterface
 
 	void addHotKey( GameWindow *win, const AsciiString& key);
 	Bool executeHotKey( const AsciiString& key); // called fromt eh HotKeyTranslator
-	
+
 	AsciiString searchHotKey( const AsciiString& label);
 	AsciiString searchHotKey( const UnicodeString& uStr );
 
@@ -113,6 +110,3 @@ extern HotKeyManager *TheHotKeyManager;
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __HOT_KEY_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/IMEManager.h b/Generals/Code/GameEngine/Include/GameClient/IMEManager.h
index dfb633fff9e..7b245c5e845 100644
--- a/Generals/Code/GameEngine/Include/GameClient/IMEManager.h
+++ b/Generals/Code/GameEngine/Include/GameClient/IMEManager.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    Generals
@@ -43,12 +43,8 @@
 
 #pragma once
 
-#ifndef __GAMECLIENT_IMEMANAGER_H
-#define __GAMECLIENT_IMEMANAGER_H
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "Lib/BaseType.h"
@@ -77,7 +73,7 @@ class IMEManagerInterface : public SubsystemInterface
 	public:
 
 		virtual ~IMEManagerInterface() {};
-		
+
 		virtual void					attach( GameWindow *window ) = 0;		///< attach IME to specified window
 		virtual void					detatch( void ) = 0;								///< detatch IME from current window
 		virtual void					enable( void ) = 0;									///< Enable IME
@@ -87,12 +83,12 @@ class IMEManagerInterface : public SubsystemInterface
 		virtual GameWindow*		getWindow( void ) = 0;							///< Returns the window we are currently attached to
 		virtual Bool					isComposing( void ) = 0;						///< Manager is currently composing new input string
 		virtual void					getCompositionString( UnicodeString &string ) = 0; ///< Return the current composition string
-		virtual Int						getCompositionCursorPosition( void ) =0;			///< Returns the composition cursor position 
+		virtual Int						getCompositionCursorPosition( void ) =0;			///< Returns the composition cursor position
 		virtual Int						getIndexBase( void ) = 0;						///< Get index base for candidate list
 
 
 		virtual Int						getCandidateCount() = 0;						///< Returns the total number of candidates
-		virtual UnicodeString*getCandidate( Int index ) = 0;			///< Returns the candidate string 
+		virtual const UnicodeString* getCandidate( Int index ) = 0;	///< Returns the candidate string
 		virtual Int						getSelectedCandidateIndex() = 0;		///< Returns the indexed of the currently selected candidate
 		virtual Int						getCandidatePageSize() = 0;					///< Returns the page size for the candidates list
 		virtual Int						getCandidatePageStart() = 0;				///< Returns the index of the first visibel candidate
@@ -100,7 +96,7 @@ class IMEManagerInterface : public SubsystemInterface
 
 
 		/// Checks for and service IME messages. Returns TRUE if message serviced
-		virtual Bool serviceIMEMessage(	void *windowsHandle, 
+		virtual Bool serviceIMEMessage(	void *windowsHandle,
 												UnsignedInt message,
 												Int wParam,
 												Int lParam ) = 0;
@@ -113,9 +109,5 @@ extern IMEManagerInterface *CreateIMEManagerInterface( void );
 
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-
-#endif // __GAMECLIENT_IMEMANAGER_H
diff --git a/Generals/Code/GameEngine/Include/GameClient/Image.h b/Generals/Code/GameEngine/Include/GameClient/Image.h
index b27943d9565..0f68b50949a 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Image.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Image.h
@@ -30,12 +30,10 @@
 
 #pragma once
 
-#ifndef __IMAGE_H_
-#define __IMAGE_H_
-
 #include "Common/AsciiString.h"
 #include "Common/GameMemory.h"
 #include "Common/SubsystemInterface.h"
+#include <map>
 
 struct FieldParse;
 class INI;
@@ -51,7 +49,7 @@ typedef enum
 
 } ImageStatus;
 #ifdef DEFINE_IMAGE_STATUS_NAMES
-static const char *imageStatusNames[] =
+static const char *const imageStatusNames[] =
 {
 	"ROTATED_90_CLOCKWISE",
 	"RAW_TEXTURE",
@@ -68,7 +66,7 @@ class Image : public MemoryPoolObject
 MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( Image, "Image" );
 
 public:
-	
+
 	Image( void );
 	// virtual desctructor defined by memory pool object
 
@@ -109,17 +107,16 @@ friend class ImageCollection;
 	void *m_rawTextureData;		///< raw texture data
 	UnsignedInt m_status;			///< status bits from ImageStatus
 
-	Image *m_next;						///< for maintaining lists as collections
-
 	static const FieldParse m_imageFieldParseTable[];		///< the parse table for INI definition
 
-};  // end Image
+};
 
 //-------------------------------------------------------------------------------------------------
 /** A collection of images */
 //-------------------------------------------------------------------------------------------------
 class ImageCollection : public SubsystemInterface
 {
+	typedef std::map<NameKeyType, Image *> ImageMap;
 
 public:
 
@@ -131,27 +128,32 @@ class ImageCollection : public SubsystemInterface
 	virtual void update( void ) { };			///< update system
 
 	void load( Int textureSize );												 ///< load images
-		
-	const Image *findImageByName( const AsciiString& name );					 ///< find image based on name
-	const Image *findImageByFilename( const AsciiString& name );  ///< find image based on filename
-	
-	Image *firstImage( void );						///< return first image in list
-	Image *nextImage( Image *image );			///< return next image
 
-	Image *newImage( void );							///< return a new, linked image
+	const Image *findImage( NameKeyType namekey ) const; ///< find image based on name key
+	const Image *findImageByName( const AsciiString& name ) const; ///< find image based on name
+	const Image *findImageByName( const char* name ) const; ///< find image based on name
 
-protected:
+  /// adds the given image to the collection, transfers ownership to this object
+  void addImage(Image *image);
 
-	Image *m_imageList;  ///< the image list
+  /// enumerates the list of existing images
+  Image *Enum(unsigned index)
+  {
+    for (ImageMap::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
+      if (!index--)
+        return i->second;
+    return NULL;
+  }
 
-};  // end ImageCollection
+protected:
+  ImageMap m_imageMap;  ///< maps named keys to images
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////////////////////////
 inline void Image::setName( AsciiString name ) { m_name = name; }
 inline AsciiString Image::getName( void ) const { return m_name; }
 inline void Image::setFilename( AsciiString name ) { m_filename = name; }
 inline AsciiString Image::getFilename( void ) const { return m_filename; }
-inline Image *ImageCollection::firstImage( void ) { return m_imageList; }
 inline void Image::setUV( Region2D *uv ) { if( uv ) m_UVCoords = *uv; }
 inline const Region2D *Image::getUV( void ) const { return &m_UVCoords; }
 inline void Image::setTextureWidth( Int width ) { m_textureSize.x = width; }
@@ -167,6 +169,3 @@ inline UnsignedInt Image::getStatus( void ) const { return m_status; }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern ImageCollection *TheMappedImageCollection;  ///< mapped images
-
-#endif // __IMAGE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/InGameUI.h b/Generals/Code/GameEngine/Include/GameClient/InGameUI.h
index 304a24d202d..710b5efe419 100644
--- a/Generals/Code/GameEngine/Include/GameClient/InGameUI.h
+++ b/Generals/Code/GameEngine/Include/GameClient/InGameUI.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _IN_GAME_UI_H_
-#define _IN_GAME_UI_H_
-
 #include "Common/GameCommon.h"
 #include "Common/GameType.h"
 #include "Common/MessageStream.h"		// for GameMessageTranslator
@@ -77,32 +74,32 @@ enum RadiusCursorType CPP_11(: Int)
 	RADIUSCURSOR_FRIENDLY_SPECIALPOWER,
 	RADIUSCURSOR_OFFENSIVE_SPECIALPOWER,
 	RADIUSCURSOR_SUPERWEAPON_SCATTER_AREA,
-	
-	RADIUSCURSOR_PARTICLECANNON, 
+
+	RADIUSCURSOR_PARTICLECANNON,
 	RADIUSCURSOR_A10STRIKE,
 	RADIUSCURSOR_CARPETBOMB,
 	RADIUSCURSOR_DAISYCUTTER,
 	RADIUSCURSOR_PARADROP,
-	RADIUSCURSOR_SPYSATELLITE, 
+	RADIUSCURSOR_SPYSATELLITE,
 
-	RADIUSCURSOR_NUCLEARMISSILE, 
+	RADIUSCURSOR_NUCLEARMISSILE,
 	RADIUSCURSOR_EMPPULSE,
 	RADIUSCURSOR_ARTILLERYBARRAGE,
 	RADIUSCURSOR_NAPALMSTRIKE,
 	RADIUSCURSOR_CLUSTERMINES,
 
-	RADIUSCURSOR_SCUDSTORM, 
+	RADIUSCURSOR_SCUDSTORM,
 	RADIUSCURSOR_ANTHRAXBOMB,
-	RADIUSCURSOR_AMBUSH, 
+	RADIUSCURSOR_AMBUSH,
 	RADIUSCURSOR_RADAR,
 	RADIUSCURSOR_SPYDRONE,
 
 
-	RADIUSCURSOR_COUNT	// keep last
+	RADIUSCURSOR_COUNT
 };
 
 #ifdef DEFINE_RADIUSCURSOR_NAMES
-static const char *TheRadiusCursorNames[] = 
+static const char *const TheRadiusCursorNames[] =
 {
 	"NONE",
 	"ATTACK_DAMAGE_AREA",
@@ -114,27 +111,28 @@ static const char *TheRadiusCursorNames[] =
 	"OFFENSIVE_SPECIALPOWER", //red
 	"SUPERWEAPON_SCATTER_AREA",//red
 
-	"PARTICLECANNON", 
+	"PARTICLECANNON",
 	"A10STRIKE",
 	"CARPETBOMB",
 	"DAISYCUTTER",
 	"PARADROP",
-	"SPYSATELLITE", 
+	"SPYSATELLITE",
 
-	"NUCLEARMISSILE", 
+	"NUCLEARMISSILE",
 	"EMPPULSE",
 	"ARTILLERYBARRAGE",
 	"NAPALMSTRIKE",
 	"CLUSTERMINES",
 
-	"SCUDSTORM", 
+	"SCUDSTORM",
 	"ANTHRAXBOMB",
-	"AMBUSH", 
+	"AMBUSH",
 	"RADAR",
 	"SPYDRONE",
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheRadiusCursorNames) == RADIUSCURSOR_COUNT + 1, "Incorrect array size");
 #endif
 
 // ------------------------------------------------------------------------------------------------
@@ -159,7 +157,7 @@ typedef std::list<Drawable *>::const_iterator DrawableListCIt;
 // ------------------------------------------------------------------------------------------------
 class SuperweaponInfo : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SuperweaponInfo, "SuperweaponInfo")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SuperweaponInfo, "SuperweaponInfo")
 
 private:
 // not saved
@@ -176,10 +174,10 @@ class SuperweaponInfo : public MemoryPoolObject
 		Bool hiddenByScript,
 		Bool hiddenByScience,
 		Bool ready,
-		const AsciiString& superweaponNormalFont, 
-		Int superweaponNormalPointSize, 
+		const AsciiString& superweaponNormalFont,
+		Int superweaponNormalPointSize,
 		Bool superweaponNormalBold,
-		Color c, 
+		Color c,
 		const SpecialPowerTemplate* spt
 	);
 
@@ -210,7 +208,7 @@ typedef std::map<AsciiString, SuperweaponList> SuperweaponMap;
 // Popup message box
 class PopupMessageData : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PopupMessageData, "PopupMessageData")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PopupMessageData, "PopupMessageData")
 public:
 	UnicodeString		message;
 	Int							x;
@@ -226,7 +224,7 @@ EMPTY_DTOR(PopupMessageData)
 // ------------------------------------------------------------------------------------------------
 class NamedTimerInfo : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NamedTimerInfo, "NamedTimerInfo")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NamedTimerInfo, "NamedTimerInfo")
 public:
 	AsciiString			m_timerName;							///< Timer name, needed on Load to reconstruct Map.
 	UnicodeString		timerText;								///< timer text
@@ -248,7 +246,7 @@ enum {MAX_SUBTITLE_LINES = 4};							///< The maximum number of lines a subtitle
 // Floating Text Data
 class FloatingTextData : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FloatingTextData, "FloatingTextData")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FloatingTextData, "FloatingTextData")
 public:
 	FloatingTextData(void);
 	//~FloatingTextData(void);
@@ -264,7 +262,7 @@ class FloatingTextData : public MemoryPoolObject
 typedef std::list<FloatingTextData *> FloatingTextList;
 typedef FloatingTextList::iterator	FloatingTextListIt;
 
-enum 
+enum
 {
 	DEFAULT_FLOATING_TEXT_TIMEOUT = LOGICFRAMES_PER_SECOND/3,
 };
@@ -304,12 +302,17 @@ typedef WorldAnimationList::iterator WorldAnimationListIterator;
 
 // ------------------------------------------------------------------------------------------------
 /** Basic functionality common to all in-game user interfaces */
-// ------------------------------------------------------------------------------------------------ 
+// ------------------------------------------------------------------------------------------------
 class InGameUI : public SubsystemInterface, public Snapshot
 {
-	
+
 friend class Drawable;	// for selection/deselection transactions
-		
+
+protected:
+
+	typedef std::list<Object*> ObjectList;
+	typedef std::list<Object*>::iterator ObjectListIt;
+
 public:  // ***************************************************************************************
 
 	enum SelectionRules
@@ -340,13 +343,12 @@ friend class Drawable;	// for selection/deselection transactions
 		ACTIONTYPE_SET_RALLY_POINT,
 		ACTIONTYPE_COMBATDROP_INTO,
 
-		//Keep last.
 		NUM_ACTIONTYPES
 	};
 
 	InGameUI( void );
 	virtual ~InGameUI( void );
-	
+
 	// Inherited from subsystem interface -----------------------------------------------------------
 	virtual	void init( void );															///< Initialize the in-game user interface
 	virtual void update( void );														///< Update the UI by calling preDraw(), draw(), and postDraw()
@@ -362,17 +364,20 @@ friend class Drawable;	// for selection/deselection transactions
 	// interface for messages to the user
 	// srj sez: passing as const-ref screws up varargs for some reason. dunno why. just pass by value.
 	virtual void messageColor( const RGBColor *rgbColor, UnicodeString format, ... );	///< display a colored message to the user
+	virtual void messageNoFormat( const UnicodeString& message ); ///< display a message to the user
+	virtual void messageNoFormat( const RGBColor *rgbColor, const UnicodeString& message ); ///< display a colored message to the user
 	virtual void message( UnicodeString format, ... );				  ///< display a message to the user
 	virtual void message( AsciiString stringManagerLabel, ... );///< display a message to the user
 	virtual void toggleMessages( void ) { m_messagesOn = 1 - m_messagesOn; }	///< toggle messages on/off
 	virtual Bool isMessagesOn( void ) { return m_messagesOn; }	///< are the display messages on
 	void freeMessageResources( void );				///< free resources for the ui messages
+	void freeCustomUiResources( void );				///< free resources for custom ui elements
 	Color getMessageColor(Bool altColor) { return (altColor)?m_messageColor2:m_messageColor1; }
-	
+
 	// interface for military style messages
 	virtual void militarySubtitle( const AsciiString& label, Int duration );			// time in milliseconds
 	virtual void removeMilitarySubtitle( void );
-	
+
 	// for can't build messages
 	virtual void displayCantBuildMessage( LegalBuildCode lbc ); ///< display message to use as to why they can't build here
 
@@ -386,7 +391,7 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual void createMouseoverHint( const GameMessage *msg );	///< An object is mouse hovered over, start hint if any
 	virtual void createCommandHint( const GameMessage *msg );		///< Used by HintSpy. Someone is selected so generate the right Cursor for the potential action
 	virtual void createGarrisonHint( const GameMessage *msg );  ///< A garrison command has occurred, start graphical "hint"
-	
+
 	virtual void addSuperweapon(Int playerIndex, const AsciiString& powerName, ObjectID id, const SpecialPowerTemplate *powerTemplate);
 	virtual Bool removeSuperweapon(Int playerIndex, const AsciiString& powerName, ObjectID id, const SpecialPowerTemplate *powerTemplate);
 	virtual void objectChangedTeam(const Object *obj, Int oldPlayerIndex, Int newPlayerIndex);	// notification for superweapons, etc
@@ -435,9 +440,10 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual const DrawableList *getAllSelectedDrawables( void ) const;	///< Return the list of all the currently selected Drawable IDs.
 	virtual const DrawableList *getAllSelectedLocalDrawables( void );		///< Return the list of all the currently selected Drawable IDs owned by the current player.
 	virtual Drawable *getFirstSelectedDrawable( void );							///< get the first selected drawable (if any)
-	virtual DrawableID getSoloNexusSelectedDrawableID( void ) { return m_soloNexusSelectedDrawableID; }  ///< Return the one drawable of the nexus if only 1 angry mob is selected 
+	virtual DrawableID getSoloNexusSelectedDrawableID( void ) { return m_soloNexusSelectedDrawableID; }  ///< Return the one drawable of the nexus if only 1 angry mob is selected
 	virtual Bool isDrawableSelected( DrawableID idToCheck ) const;	///< Return true if the selected ID is in the drawable list
-	virtual Bool isAnySelectedKindOf( KindOfType kindOf ) const;		///< is any selected object a kind of 
+	virtual Bool areAllObjectsSelected(const std::vector<Object*>& objectsToCheck) const;	///< Return true if all of the selected objects are in the drawable list
+	virtual Bool isAnySelectedKindOf( KindOfType kindOf ) const;		///< is any selected object a kind of
 	virtual Bool isAllSelectedKindOf( KindOfType kindOf ) const;		///< are all selected objects a kind of
 
 	virtual void setRadiusCursor(RadiusCursorType r, const SpecialPowerTemplate* sp, WeaponSlotType wslot);
@@ -451,20 +457,21 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual void preDraw( void );														///< Logic which needs to occur before the UI renders
 	virtual void draw( void ) = 0;													///< Render the in-game user interface
 	virtual void postDraw( void );													///< Logic which needs to occur after the UI renders
+	virtual void postWindowDraw( void );											///< Logic which needs to occur after the WindowManager has repainted the menus
 
-	/// Ingame video playback 
+	/// Ingame video playback
 	virtual void playMovie( const AsciiString& movieName );
 	virtual void stopMovie( void );
 	virtual VideoBuffer* videoBuffer( void );
 
-	/// Ingame cameo video playback 
+	/// Ingame cameo video playback
 	virtual void playCameoMovie( const AsciiString& movieName );
 	virtual void stopCameoMovie( void );
 	virtual VideoBuffer* cameoVideoBuffer( void );
 
-  // mouse over information	
+  // mouse over information
 	virtual DrawableID getMousedOverDrawableID( void ) const;	///< Get drawble ID of drawable under cursor
-	
+
 	/// Set the ingame flag as to if we have the Quit menu up or not
 	virtual void setQuitMenuVisible( Bool t ) { m_isQuitMenuVisible = t; }
 	virtual Bool isQuitMenuVisible( void ) const { return m_isQuitMenuVisible; }
@@ -490,11 +497,11 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual Int selectMatchingAcrossMap();                            ///< selects matching units across map
 	virtual Int selectMatchingAcrossRegion( IRegion2D *region );			// -1 = no locally-owned selection, 0+ = # of units selected
 
-	virtual Int selectAllUnitsByType(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);                
-	virtual Int selectAllUnitsByTypeAcrossScreen(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);                         
-	virtual Int selectAllUnitsByTypeAcrossMap(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);                            
-	virtual Int selectAllUnitsByTypeAcrossRegion( IRegion2D *region, KindOfMaskType mustBeSet, KindOfMaskType mustBeClear );			
-	
+	virtual Int selectAllUnitsByType(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);
+	virtual Int selectAllUnitsByTypeAcrossScreen(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);
+	virtual Int selectAllUnitsByTypeAcrossMap(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);
+	virtual Int selectAllUnitsByTypeAcrossRegion( IRegion2D *region, KindOfMaskType mustBeSet, KindOfMaskType mustBeClear );
+
 	virtual void buildRegion( const ICoord2D *anchor, const ICoord2D *dest, IRegion2D *region );  ///< builds a region around the specified coordinates
 
 	virtual Bool getDisplayedMaxWarning( void ) { return m_displayedMaxWarning; }
@@ -509,7 +516,7 @@ friend class Drawable;	// for selection/deselection transactions
 	Bool				isDrawableCaptionBold( void )				{ return m_drawableCaptionBold; }
 	Color				getDrawableCaptionColor( void )			{ return m_drawableCaptionColor; }
 
-	inline Bool shouldMoveRMBScrollAnchor( void ) { return m_moveRMBScrollAnchor; }
+	Bool shouldMoveRMBScrollAnchor( void ) { return m_moveRMBScrollAnchor; }
 
 	Bool isClientQuiet( void ) const			{ return m_clientQuiet; }
 	Bool isInWaypointMode( void ) const			{ return m_waypointMode; }
@@ -522,11 +529,11 @@ friend class Drawable;	// for selection/deselection transactions
 	void setForceMoveMode( Bool enabled )		{ m_forceMoveToMode = enabled; }
 	void setForceAttackMode( Bool enabled )		{ m_forceAttackMode = enabled; }
 	void setPreferSelectionMode( Bool enabled )		{ m_preferSelection = enabled; }
-	
+
 	void toggleAttackMoveToMode( void )				{ m_attackMoveToMode = !m_attackMoveToMode; }
 	Bool isInAttackMoveToMode( void ) const		{ return m_attackMoveToMode; }
 	void clearAttackMoveToMode( void )				{ m_attackMoveToMode = FALSE; }
-	
+
 	void setCameraRotateLeft( Bool set )		{ m_cameraRotatingLeft = set; }
 	void setCameraRotateRight( Bool set )		{ m_cameraRotatingRight = set; }
 	void setCameraZoomIn( Bool set )				{ m_cameraZoomingIn = set; }
@@ -540,8 +547,14 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual void addIdleWorker( Object *obj );
 	virtual void removeIdleWorker( Object *obj, Int playerNumber );
 	virtual void selectNextIdleWorker( void );
+	static std::vector<Object*> getUniqueIdleWorkers(const ObjectList& idleWorkers);
 
 	virtual void recreateControlBar( void );
+	virtual void refreshCustomUiResources( void );
+	virtual void refreshNetworkLatencyResources(void);
+	virtual void refreshRenderFpsResources(void);
+	virtual void refreshSystemTimeResources( void );
+	virtual void refreshGameTimeResources( void );
 
 	virtual void disableTooltipsUntil(UnsignedInt frameNum);
 	virtual void clearTooltipsDisabled();
@@ -561,19 +574,25 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual void updateIdleWorker( void );
 	virtual void resetIdleWorker( void );
 
+	void updateRenderFpsString();
+	void drawNetworkLatency(Int &x, Int &y);
+	void drawRenderFps(Int &x, Int &y);
+	void drawSystemTime(Int &x, Int &y);
+	void drawGameTime();
+
 public:
 	void registerWindowLayout(WindowLayout *layout); // register a layout for updates
 	void unregisterWindowLayout(WindowLayout *layout); // stop updates for this layout
 
 public:
 	// World 2D animation methods
-	void addWorldAnimation( Anim2DTemplate *animTemplate, 
+	void addWorldAnimation( Anim2DTemplate *animTemplate,
 													const Coord3D *pos,
 													WorldAnimationOptions options,
 													Real durationInSeconds,
 													Real zRisePerSecond );
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void DEBUG_addFloatingText(const AsciiString& text,const Coord3D * pos, Color color);
 #endif
 
@@ -583,7 +602,7 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
 
-protected: 
+protected:
 
 	// ----------------------------------------------------------------------------------------------
 	// Protected Types ------------------------------------------------------------------------------
@@ -596,16 +615,14 @@ friend class Drawable;	// for selection/deselection transactions
 #ifdef RTS_DEBUG
 		DEBUG_HINT,
 #endif
-		NUM_HINT_TYPES  // keep this one last
 	};
 
 	// mouse mode interface
-	enum MouseMode 
+	enum MouseMode
 	{
 		MOUSEMODE_DEFAULT = 0,
 		MOUSEMODE_BUILD_PLACE,
 		MOUSEMODE_GUI_COMMAND,
-		MOUSEMODE_MAX
 	};
 
 	enum { MAX_MOVE_HINTS = 256 };
@@ -640,9 +657,6 @@ friend class Drawable;	// for selection/deselection transactions
 		Color color;															///< what color should we display the military subtitles
 	};
 
-	typedef std::list<Object *> ObjectList;
-	typedef std::list<Object *>::iterator ObjectListIt;
-	
 	// ----------------------------------------------------------------------------------------------
 	// Protected Methods ----------------------------------------------------------------------------
 	// ----------------------------------------------------------------------------------------------
@@ -664,7 +678,7 @@ friend class Drawable;	// for selection/deselection transactions
 
 	void setMouseCursor(Mouse::MouseCursor c);
 
-	
+
 	void addMessageText( const UnicodeString& formattedMessage, const RGBColor *rgbColor = NULL );  ///< internal workhorse for adding plain text for messages
 	void removeMessageAtIndex( Int i );				///< remove the message at index i
 
@@ -719,6 +733,50 @@ friend class Drawable;	// for selection/deselection transactions
 	VideoBuffer*								m_cameoVideoBuffer;///< video playback buffer
 	VideoStreamInterface*				m_cameoVideoStream;///< Video stream;
 
+	// Network Latency Counter
+	DisplayString *							m_networkLatencyString;
+	AsciiString									m_networkLatencyFont;
+	Int													m_networkLatencyPointSize;
+	Bool												m_networkLatencyBold;
+	Coord2D											m_networkLatencyPosition;
+	Color												m_networkLatencyColor;
+	Color												m_networkLatencyDropColor;
+	UnsignedInt									m_lastNetworkLatencyFrames;
+
+	// Render FPS Counter
+	DisplayString *							m_renderFpsString;
+	DisplayString *							m_renderFpsLimitString;
+	AsciiString									m_renderFpsFont;
+	Int													m_renderFpsPointSize;
+	Bool												m_renderFpsBold;
+	Coord2D											m_renderFpsPosition;
+	Color												m_renderFpsColor;
+	Color												m_renderFpsLimitColor;
+	Color												m_renderFpsDropColor;
+	UnsignedInt									m_renderFpsRefreshMs;
+	UnsignedInt									m_lastRenderFps;
+	UnsignedInt									m_lastRenderFpsLimit;
+	UnsignedInt									m_lastRenderFpsUpdateMs;
+
+	// System Time
+	DisplayString *										m_systemTimeString;
+	AsciiString											m_systemTimeFont;
+	Int													m_systemTimePointSize;
+	Bool												m_systemTimeBold;
+	Coord2D												m_systemTimePosition;
+	Color												m_systemTimeColor;
+	Color												m_systemTimeDropColor;
+
+	// Game Time
+	DisplayString *										m_gameTimeString;
+	DisplayString *										m_gameTimeFrameString;
+	AsciiString											m_gameTimeFont;
+	Int													m_gameTimePointSize;
+	Bool												m_gameTimeBold;
+	Coord2D												m_gameTimePosition;
+	Color												m_gameTimeColor;
+	Color												m_gameTimeDropColor;
+
 	// message data
 	UIMessage										m_uiMessages[ MAX_UI_MESSAGES ];/**< messages to display to the user, the
 																						array is organized with newer messages at
@@ -727,7 +785,7 @@ friend class Drawable;	// for selection/deselection transactions
 	SuperweaponMap							m_superweapons[MAX_PLAYER_COUNT];
 	Coord2D											m_superweaponPosition;
 	Real												m_superweaponFlashDuration;
-	
+
 	// superweapon timer font info
 	AsciiString									m_superweaponNormalFont;
 	Int													m_superweaponNormalPointSize;
@@ -811,21 +869,21 @@ friend class Drawable;	// for selection/deselection transactions
 
 	PopupMessageData *					m_popupMessageData;
 	Color												m_popupMessageColor;
-	
+
  	Bool												m_waypointMode;			///< are we in waypoint plotting mode?
 	Bool												m_forceAttackMode;		///< are we in force attack mode?
 	Bool												m_forceMoveToMode;		///< are we in force move mode?
 	Bool												m_attackMoveToMode;	///< are we in attack move mode?
 	Bool												m_preferSelection;		///< the shift key has been depressed.
 
-	Bool												m_cameraRotatingLeft; 
+	Bool												m_cameraRotatingLeft;
 	Bool 												m_cameraRotatingRight;
 	Bool 												m_cameraZoomingIn;
 	Bool 												m_cameraZoomingOut;
-	
+
 	Bool												m_drawRMBScrollAnchor;
 	Bool												m_moveRMBScrollAnchor;
-	Bool												m_clientQuiet;         ///< When the user clicks exit,restart, etc. this is set true 
+	Bool												m_clientQuiet;         ///< When the user clicks exit,restart, etc. this is set true
 																												///< to skip some client sounds/fx during shutdown
 
 	// World Animation Data
@@ -848,5 +906,3 @@ friend class Drawable;	// for selection/deselection transactions
 
 // the singleton
 extern InGameUI *TheInGameUI;
-
-#endif // _IN_GAME_UI_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h b/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h
index d9d8e612757..3c9f14394de 100644
--- a/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h
+++ b/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h
@@ -24,12 +24,12 @@
 
 // FILE: KeyDefs.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -42,10 +42,10 @@
 // Desc:       Basic keyboard key definitions.
 //
 /** @todo NOTE: These key definitions are currently tied directly to the
-*		Direct Input key codes, therefore making these definitions device 
+*		Direct Input key codes, therefore making these definitions device
 *		dependent even though this code lives on the device INdependent side
-*		of the engine.  In the future to be truly device independent we 
-*		need to define our own key codes, and have a translation between 
+*		of the engine.  In the future to be truly device independent we
+*		need to define our own key codes, and have a translation between
 *		what we read from the device to our own system*/
 //
 //-----------------------------------------------------------------------------
@@ -53,9 +53,6 @@
 
 #pragma once
 
-#ifndef __KEYDEFS_H_
-#define __KEYDEFS_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
 #ifndef DIRECTINPUT_VERSION
@@ -105,9 +102,9 @@
 /** The key tables */
 //=============================================================================
 
-enum KeyDefType CPP_11(: Int)
+enum KeyDefType CPP_11(: UnsignedByte)
 {
-	// keypad keys ---------------------------------------------------------------- 
+	// keypad keys ----------------------------------------------------------------
 	KEY_KP0 								= DIK_NUMPAD0,
 	KEY_KP1 								= DIK_NUMPAD1,
 	KEY_KP2 								= DIK_NUMPAD2,
@@ -227,9 +224,14 @@ enum KeyDefType CPP_11(: Int)
 
 	// specials -------------------------------------------------------------------
 	KEY_NONE								= 0x00,		///< to report end of key stream
-	KEY_LOST								= 0xFF		///< to report lost keyboard focus
+	KEY_LOST								= 0xFF,		///< to report lost keyboard focus
 
-};	// end KeyDefType
+};
+
+enum
+{
+	KEY_COUNT = 256
+};
 
 // state for keyboard IO ------------------------------------------------------
 enum
@@ -252,10 +254,8 @@ enum
 	KEY_STATE_SHIFT			= (KEY_STATE_LSHIFT | KEY_STATE_RSHIFT | KEY_STATE_SHIFT2 ),
 	KEY_STATE_ALT				= (KEY_STATE_LALT | KEY_STATE_RALT)
 
-};	// end KeyStateType
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __KEYDEFS_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/Keyboard.h b/Generals/Code/GameEngine/Include/GameClient/Keyboard.h
index fc06307f638..8e54ae6ac1c 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Keyboard.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Keyboard.h
@@ -24,12 +24,12 @@
 
 // FILE: Keyboard.h ///////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __KEYBOARD_H_
-#define __KEYBOARD_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -68,18 +65,20 @@
 struct KeyboardIO
 {
 
-	enum StatusType
+	enum StatusType CPP_11(: UnsignedByte)
 	{
 		STATUS_UNUSED		= 0x00,					// Key has not been used
 		STATUS_USED			= 0x01					// Key has been eaten
 	};
 
-	UnsignedByte	key;										// key data
+	void setUsed() { status = STATUS_USED; }
+
+	UnsignedByte	key;										// KeyDefType, key data
 	UnsignedByte	status;									// StatusType, above
 	UnsignedShort	state;									// KEY_STATE_* in KeyDefs.h
-	UnsignedInt		sequence;								// sequence info from DirectX used for order
+	UnsignedInt		keyDownTimeMsec;				// real-time in milliseconds when key went down
 
-};  // end KeyboardIO
+};
 
 // class Keyboard =============================================================
 /** Keyboard singleton to interface with the keyboard */
@@ -87,38 +86,45 @@ struct KeyboardIO
 class Keyboard : public SubsystemInterface
 {
 
-	enum { KEY_REPEAT_DELAY = 10 };
+	enum
+	{
+		KEY_REPEAT_DELAY_MSEC = 333,	// 10 frames at 30 FPS
+		KEY_REPEAT_INTERVAL_MSEC = 67	// ~2 frames at 30 FPS
+	};
 
 public:
 
 	Keyboard( void );
 	virtual ~Keyboard( void );
 
-	// you may extend the functionanilty of these for your device
-	virtual void init( void );							/**< initialize the keyboard, only extend this 
+	// you may extend the functionality of these for your device
+	virtual void init( void );							/**< initialize the keyboard, only extend this
 																							 functionality, do not replace */
 	virtual void reset( void );							///< Reset keyboard system
-	virtual void update( void );						/**< gather current state of all keys, extend 
+	virtual void update( void );						/**< gather current state of all keys, extend
 																							 this functionality, do not replace */
 	virtual Bool getCapsState( void ) = 0;  ///< get state of caps lock key, return TRUE if down
 
-	virtual void createStreamMessages( void );  /**< given state of device, create 
-																							messages and put them on the 
+	virtual void createStreamMessages( void );  /**< given state of device, create
+																							messages and put them on the
 																							stream for the raw state. */
 	// simplified versions where the caller doesn't care which key type was pressed.
 	Bool isShift();
 	Bool isCtrl();
 	Bool isAlt();
 	Int getModifierFlags() { return m_modifiers; }
-	
+
 	// access methods for key data
 	void resetKeys( void );												///< reset the state of the keys
 	KeyboardIO *getFirstKey( void );							///< get first key ready for processing
-	void setKeyStatusData( UnsignedByte key, 
+	KeyboardIO *findKey( KeyDefType key, KeyboardIO::StatusType status ); ///< get key ready for processing, can return NULL
+	void setKeyStatusData( KeyDefType key,
 												 KeyboardIO::StatusType data );   ///< set key status
-	WideChar translateKey( WideChar keyCode );		///< translte key code to printable UNICODE char
-	WideChar getPrintableKey( UnsignedByte key, Int state );
+	WideChar translateKey( WideChar keyCode );		///< translate key code to printable UNICODE char
+	WideChar getPrintableKey( KeyDefType key, Int state );
 	enum { MAX_KEY_STATES = 3};
+private:
+	void refreshAltKeys() const;									///< refresh the state of the alt keys, necessary after alt tab
 protected:
 
 	/** get the key data for a single key, KEY_NONE should be returned when
@@ -129,10 +135,9 @@ class Keyboard : public SubsystemInterface
 	void initKeyNames( void );  ///< initialize the key names table
 	void updateKeys( void );  ///< update the state of our key data
 	Bool checkKeyRepeat( void );  ///< check for repeating keys
-	UnsignedByte getKeyStatusData( UnsignedByte key );  ///< get key status
-	Bool getKeyStateBit( UnsignedByte key, Int bit );  ///< get key state bit
-	UnsignedInt getKeySequenceData( UnsignedByte key );  ///< get key sequence
-	void setKeyStateData( UnsignedByte key, UnsignedByte data );  ///< get key state
+	UnsignedByte getKeyStatusData( KeyDefType key );  ///< get key status
+	Bool getKeyStateBit( KeyDefType key, Int bit );  ///< get key state bit
+	void setKeyStateData( KeyDefType key, UnsignedByte data );  ///< get key state
 
 	UnsignedShort m_modifiers;
 	// internal keyboard data members
@@ -145,28 +150,24 @@ class Keyboard : public SubsystemInterface
 	//Bool m_rControlState; // 1 if right control is down
 	//Bool m_lAltState;			// 1 if left alt is down
 	//Bool m_rAltState;			// 1 if right alt is down
-	UnsignedByte m_shift2Key;  // what key is the secondary shift key
+	KeyDefType m_shift2Key;  // what key is the secondary shift key
 
 	enum { NUM_KEYS  = 256 };
 	KeyboardIO m_keys[ NUM_KEYS ];  ///< the keys
-	KeyboardIO m_keyStatus[ NUM_KEYS ];  ///< the key status flags
+	KeyboardIO m_keyStatus[ KEY_COUNT ];  ///< the key status flags
 
-	enum { KEY_NAMES_COUNT = 256 };
-	struct 
+	struct
 	{
 
 		WideChar stdKey;
 		WideChar shifted;
 		WideChar shifted2;
 
-	} m_keyNames[ KEY_NAMES_COUNT ];
-	UnsignedInt m_inputFrame;  ///< frame input was gathered on
+	} m_keyNames[ KEY_COUNT ];
 
-};  // end Keyboard
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
 extern Keyboard *TheKeyboard;
-
-#endif // __KEYBOARD_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h b/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h
index 67862d69816..da533ce974d 100644
--- a/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h
+++ b/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __LANGUAGEFILTER_H
-#define __LANGUAGEFILTER_H
-
 #include "Common/STLTypedefs.h"
 #include "Common/AsciiString.h"
 #include "Common/UnicodeString.h"
@@ -55,12 +51,7 @@ struct UnicodeStringsEqual
 	Bool operator()(UnicodeString a, UnicodeString b) const
 	{
 		Bool retval = (a.compareNoCase(b) == 0);
-		DEBUG_LOG(("Comparing %ls with %ls, return value is ", a.str(), b.str()));
-		if (retval) {
-			DEBUG_LOG(("true.\n"));
-		} else {
-			DEBUG_LOG(("false.\n"));
-		}
+		DEBUG_LOG(("Comparing %ls with %ls, return value is %s.", a.str(), b.str(), retval ? "true" : "false"));
 		return retval;
 	}
 };
@@ -90,5 +81,3 @@ class LanguageFilter : public SubsystemInterface {
 
 extern LanguageFilter *TheLanguageFilter;
 LanguageFilter * createLanguageFilter();
-
-#endif //#define __LANGUAGEFILTER_H
diff --git a/Generals/Code/GameEngine/Include/GameClient/Line2D.h b/Generals/Code/GameEngine/Include/GameClient/Line2D.h
index 0f177849e54..218ebb40b89 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Line2D.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Line2D.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __LINE2D_H_
-#define __LINE2D_H_
-
 typedef std::vector<ICoord2D> Coord2DVector;
 typedef std::vector<ICoord3D> Coord3DVector;
 
@@ -43,8 +40,8 @@ extern Bool ClipLine2D( ICoord2D *p1, ICoord2D *p2, ICoord2D *c1, ICoord2D *c2,
 ///< IntersectLine2D will take two segments delimited by ab and cd and will return whether
 ///< they intersect within the length of ab. They will also return the intersection point out
 ///< intersection if it is non-NULL.
-extern Bool IntersectLine2D( const Coord2D *a, const Coord2D *b, 
-															const Coord2D *c, const Coord2D *d, 
+extern Bool IntersectLine2D( const Coord2D *a, const Coord2D *b,
+															const Coord2D *c, const Coord2D *d,
 															Coord2D *intersection = NULL);
 
 ///< PointInsideRect2D will return true iff inputPoint lies iside of the rectangle specified
@@ -81,11 +78,7 @@ extern Bool PointInsideArea2D( const Coord3D *ptToTest,
 															 Int numPointsInArea);
 
 ///< This function will find the shortest distance between the given segment (ab) and the pt.
-///< It will also give the intersection points on the segment (ab) if desired. 
+///< It will also give the intersection points on the segment (ab) if desired.
 ///< outU will return the U value determined. This is a shortcut for panning
 extern void ShortestDistancePointToSegment2D( const Coord2D *a, const Coord2D *b, const Coord2D *pt,
 																							Real *outDistance, Coord2D *outPosition, Real *outU );
-
-
-#endif // __LINE2D_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h b/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h
index 6cb73b7b203..f0f2ac53fe8 100644
--- a/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h
+++ b/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _LOADSCREEN_H_
-#define _LOADSCREEN_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -83,9 +80,9 @@ class SinglePlayerLoadScreen : public LoadScreen
 	virtual void init( GameInfo *game );		///< Init the loadscreen
 	virtual void reset( void );		///< Reset the system
 	virtual void update( void )
-	{	
+	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
-	}; 
+	};
 	virtual void update(Int percent);		 ///< Update the state of the progress bar
 	virtual void processProgress(Int playerId, Int percentage)
 	{
@@ -102,12 +99,12 @@ class SinglePlayerLoadScreen : public LoadScreen
 	GameWindow *m_objectiveLines[MAX_OBJECTIVE_LINES];
 	GameWindow *m_unitDesc[MAX_DISPLAYED_UNITS];
 	GameWindow *m_location;
-	
+
 	Int m_currentObjectiveLine;
 	Int m_currentObjectiveLineCharacter;
 	Int m_currentObjectiveWidthOffset;
 	Bool m_finishedObjectiveText;
-	
+
 	UnicodeString m_unicodeObjectiveLines[MAX_OBJECTIVE_LINES];
 
 	VideoBuffer *m_videoBuffer;
@@ -132,9 +129,9 @@ class ShellGameLoadScreen : public LoadScreen
 	virtual void init( GameInfo *game );		///< Init the loadscreen
 	virtual void reset( void );		///< Reset the system
 	virtual void update( void )
-	{	
+	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
-	}; 
+	};
 	virtual void update(Int percent);		 ///< Update the state of the progress bar
 	virtual void processProgress(Int playerId, Int percentage)
 	{
@@ -160,9 +157,9 @@ class MultiPlayerLoadScreen : public LoadScreen
 	virtual void init( GameInfo *game );		///< Init the loadscreen
 	virtual void reset( void );		///< Reset the system
 	virtual void update( void )
-	{	
+	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
-	}; 
+	};
 	virtual void update(Int percent);		 ///< Update the state of the progress bar
 	void processProgress(Int playerId, Int percentage);
 	virtual void setProgressRange( Int min, Int max ) { }
@@ -188,9 +185,9 @@ class GameSpyLoadScreen : public LoadScreen
 	virtual void init( GameInfo *game );		///< Init the loadscreen
 	virtual void reset( void );		///< Reset the system
 	virtual void update( void )
-	{	
+	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
-	}; 
+	};
 	virtual void update(Int percent);		 ///< Update the state of the progress bar
 	void processProgress(Int playerId, Int percentage);
 	virtual void setProgressRange( Int min, Int max ) { }
@@ -222,9 +219,9 @@ class MapTransferLoadScreen : public LoadScreen
 	virtual void init( GameInfo *game );		///< Init the loadscreen
 	virtual void reset( void );							///< Reset the system
 	virtual void update( void )
-	{	
+	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
-	}; 
+	};
 	virtual void update(Int percent);				///< Update the state of the progress bar
 	virtual void processProgress(Int playerId, Int percentage)
 	{
@@ -244,5 +241,3 @@ class MapTransferLoadScreen : public LoadScreen
 	GameWindow *m_timeoutText;
 	Int m_oldTimeout;												///< old val, so we can call processTimeout() every frame and not touch the GUI
 };
-
-#endif //_LOADSCREEN_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h b/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h
index eeca0f9d849..619f9bea85e 100644
--- a/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h
+++ b/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h
@@ -27,30 +27,41 @@
 
 #pragma once
 
-#ifndef _H_LookAtXlat
-#define _H_LookAtXlat
-
 #include "GameClient/InGameUI.h"
 
+//-----------------------------------------------------------------------------
+// TheSuperHackers @feature The Screen Edge Scrolling can now be enabled or
+// disabled depending on the App being Windowed or Fullscreen.
+typedef UnsignedInt ScreenEdgeScrollMode;
+enum ScreenEdgeScrollMode_ CPP_11(: ScreenEdgeScrollMode)
+{
+	ScreenEdgeScrollMode_EnabledInWindowedApp = 1<<0, // Scroll when touching the edge while the app is windowed
+	ScreenEdgeScrollMode_EnabledInFullscreenApp = 1<<1, // Scroll when touching the edge while the app is fullscreen
+
+	ScreenEdgeScrollMode_Default = ScreenEdgeScrollMode_EnabledInFullscreenApp, // Default based on original game behavior
+};
+
 //-----------------------------------------------------------------------------
 class LookAtTranslator : public GameMessageTranslator
 {
 public:
 	LookAtTranslator();
 	~LookAtTranslator();
+
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
 	virtual const ICoord2D* getRMBScrollAnchor(void); // get m_anchor ICoord2D if we're RMB scrolling
 	Bool hasMouseMovedRecently( void );
 	void setCurrentPos( const ICoord2D& pos );
+	void setScreenEdgeScrollMode(ScreenEdgeScrollMode mode);
 
 	void resetModes(); //Used when disabling input, so when we reenable it we aren't stuck in a mode.
 
 private:
-	enum 
+	enum
 	{
 		MAX_VIEW_LOCS = 8
 	};
-	enum
+	enum ScrollType
 	{
 		SCROLL_NONE = 0,
 		SCROLL_RMB,
@@ -59,20 +70,22 @@ class LookAtTranslator : public GameMessageTranslator
 	};
 	ICoord2D m_anchor;
 	ICoord2D m_originalAnchor;
-	ICoord2D m_currentPos;									
+	ICoord2D m_currentPos;
+	Real m_anchorAngle;
 	Bool m_isScrolling;				// set to true if we are in the act of RMB scrolling
 	Bool m_isRotating;					// set to true if we are in the act of MMB rotating
 	Bool m_isPitching;					// set to true if we are in the act of ALT pitch rotation
 	Bool m_isChangingFOV;			// set to true if we are in the act of changing the field of view
-	UnsignedInt m_timestamp;				// set when button goes down
+	UnsignedInt m_middleButtonDownTimeMsec;				// real-time in milliseconds when middle button goes down
 	DrawableID m_lastPlaneID;
 	ViewLocation m_viewLocation[ MAX_VIEW_LOCS ];
-	Int m_scrollType;
-	void setScrolling( Int );
+	ScrollType m_scrollType;
+	ScreenEdgeScrollMode m_screenEdgeScrollMode;
+	UnsignedInt m_lastMouseMoveTimeMsec;				// real-time in milliseconds when mouse last moved
+
+	void setScrolling( ScrollType scrollType );
 	void stopScrolling( void );
-	UnsignedInt m_lastMouseMoveFrame;
-};	
+	Bool canScrollAtScreenEdge() const;
+};
 
 extern LookAtTranslator *TheLookAtTranslator;
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameClient/MapUtil.h b/Generals/Code/GameEngine/Include/GameClient/MapUtil.h
deleted file mode 100644
index 0d3eb599f60..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/MapUtil.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: MapUtil.h /////////////////////////////////////////////////////////
-// Author: Matt Campbell, December 2001
-// Description: Map utility/convenience routines
-////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __MAPUTIL_H__
-#define __MAPUTIL_H__
-
-#include "Common/AsciiString.h"
-#include "Common/UnicodeString.h"
-
-#include "Common/STLTypedefs.h"
-
-class GameWindow;
-class AsciiString;
-struct Coord3D;
-struct FileInfo;
-class Image;
-class DataChunkInput;
-struct DataChunkInfo;
-// This matches the windows timestamp.
-enum { SUPPLY_TECH_SIZE = 15};
-typedef std::list <ICoord2D> ICoord2DList;
-
-class TechAndSupplyImages
-{
-public:
-	ICoord2DList m_techPosList;
-	ICoord2DList m_supplyPosList;
-};
-
-struct WinTimeStamp
-{
-	UnsignedInt m_lowTimeStamp;
-	UnsignedInt m_highTimeStamp;
-};
-
-
-class WaypointMap : public std::map<AsciiString, Coord3D>
-{
-public:
-	void update( void );	///< returns the number of multiplayer start spots found
-	Int m_numStartSpots;
-};
-
-typedef std::list <Coord3D> Coord3DList;
-
-class MapMetaData
-{
-public:
-	UnicodeString m_displayName;
-	Region3D m_extent;
-	Int m_numPlayers;
-	Bool m_isMultiplayer;
-
-	Bool m_isOfficial;
-	UnsignedInt m_filesize;
-	UnsignedInt m_CRC;
-
-	WinTimeStamp m_timestamp;
-
-	WaypointMap m_waypoints;
-	Coord3DList m_supplyPositions;
-	Coord3DList m_techPositions;
-	AsciiString m_fileName;
-};
-
-class MapCache : public std::map<AsciiString, MapMetaData>
-{
-public:
-	MapCache() {}
-	void updateCache( void );
-
-	AsciiString getMapDir() const;
-	AsciiString getUserMapDir() const;
-	AsciiString getMapExtension() const;
-
-	const MapMetaData *findMap(AsciiString mapName);
-
-	// allow us to create a set of shippable maps to be in mapcache.ini.  For use with -buildMapCache.
-	void addShippingMap(AsciiString mapName) { mapName.toLower(); m_allowedMaps.insert(mapName); }
-
-private:
-	Bool clearUnseenMaps( AsciiString dirName );
-	void loadStandardMaps(void);
-	Bool loadUserMaps(void);				// returns true if we needed to (re)parse a map
-//	Bool addMap( AsciiString dirName, AsciiString fname, WinTimeStamp timestamp,
-//		UnsignedInt filesize, Bool isOfficial );	///< returns true if it had to (re)parse the map
-	Bool addMap( AsciiString dirName, AsciiString fname, FileInfo *fileInfo, Bool isOfficial); ///< returns true if it had to (re)parse the map
-	void writeCacheINI( Bool userDir );
-
-	static const char * m_mapCacheName;
-	std::map<AsciiString, Bool> m_seen;
-
-	std::set<AsciiString> m_allowedMaps;
-};
-
-extern MapCache *TheMapCache;
-extern TechAndSupplyImages TheSupplyAndTechImageLocations;
-Int populateMapListbox( GameWindow *listbox, Bool useSystemMaps, Bool isMultiplayer, AsciiString mapToSelect = AsciiString::TheEmptyString );		/// Read a list of maps from the run directory and fill in the listbox.  Return the selected index
-Int populateMapListboxNoReset( GameWindow *listbox, Bool useSystemMaps, Bool isMultiplayer, AsciiString mapToSelect = AsciiString::TheEmptyString );		/// Read a list of maps from the run directory and fill in the listbox.  Return the selected index
-Bool isValidMap( AsciiString mapName, Bool isMultiplayer );						/// Validate a map
-Image *getMapPreviewImage( AsciiString mapName );
-AsciiString getDefaultMap( Bool isMultiplayer );											/// Find a valid map
-Bool parseMapPreviewChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-void findDrawPositions( Int startX, Int startY, Int width, Int height, Region3D extent,
-															 ICoord2D *ul, ICoord2D *lr );
-Bool WouldMapTransfer( const AsciiString& mapName );
-#endif // __MAPUTIL_H__
diff --git a/Generals/Code/GameEngine/Include/GameClient/MessageBox.h b/Generals/Code/GameEngine/Include/GameClient/MessageBox.h
index e78d248c5da..cf5951e0990 100644
--- a/Generals/Code/GameEngine/Include/GameClient/MessageBox.h
+++ b/Generals/Code/GameEngine/Include/GameClient/MessageBox.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __MESSAGEBOX_H_
-#define __MESSAGEBOX_H_
-
 #include "GameClient/GameWindowManager.h"
 
 GameWindow *MessageBoxYesNo(UnicodeString titleString,UnicodeString bodyString,GameWinMsgBoxFunc yesCallback,GameWinMsgBoxFunc noCallback);  ///< convenience function for displaying a Message box with Yes and No buttons
@@ -47,5 +44,3 @@ GameWindow *MessageBoxOk(UnicodeString titleString,UnicodeString bodyString,Game
 
 
 GameWindow *MessageBoxCancel(UnicodeString titleString,UnicodeString bodyString,GameWinMsgBoxFunc cancelCallback);///< convenience function for displaying a Message box with Cancel button
-
-#endif //__MESSAGEBOX_H_
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h b/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h
index f7799ecc4a9..497f78f9013 100644
--- a/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h
+++ b/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef _H_MetaEvent
-#define _H_MetaEvent
-
 #include "Common/SubsystemInterface.h"
 #include "GameClient/InGameUI.h"
 
@@ -44,10 +41,11 @@ enum MappableKeyCategories CPP_11(: Int)
 	CATEGORY_TEAM,
 	CATEGORY_MISC,
 	CATEGORY_DEBUG,
-	CATEGORY_NUM_CATEGORIES // keep this last
+
+	CATEGORY_NUM_CATEGORIES
 };
 
-static const LookupListRec CategoryListName[] = 
+static const LookupListRec CategoryListName[] =
 {
 	{"CONTROL",						CATEGORY_CONTROL},
 	{"INFORMATION",				CATEGORY_INFORMATION},
@@ -57,7 +55,7 @@ static const LookupListRec CategoryListName[] =
 	{"TEAM",							CATEGORY_TEAM},
 	{"MISC",							CATEGORY_MISC},
 	{"DEBUG",							CATEGORY_DEBUG},
-	{NULL, 0}// keep this last
+	{NULL, 0}
 };
 
 
@@ -69,6 +67,24 @@ static const LookupListRec CategoryListName[] =
 // KeyDefType; this is extremely important to maintain!
 enum MappableKeyType CPP_11(: Int)
 {
+	// keypad keys ----------------------------------------------------------------
+	MK_KP0					= KEY_KP0,
+	MK_KP1					= KEY_KP1,
+	MK_KP2					= KEY_KP2,
+	MK_KP3					= KEY_KP3,
+	MK_KP4					= KEY_KP4,
+	MK_KP5					= KEY_KP5,
+	MK_KP6					= KEY_KP6,
+	MK_KP7					= KEY_KP7,
+	MK_KP8					= KEY_KP8,
+	MK_KP9					= KEY_KP9,
+	MK_KPDEL				= KEY_KPDEL,
+	MK_KPSTAR				= KEY_KPSTAR,
+	MK_KPMINUS			= KEY_KPMINUS,
+	MK_KPPLUS				= KEY_KPPLUS,
+	MK_KPENTER			= KEY_KPENTER,
+	MK_KPSLASH			= KEY_KPSLASH,
+
 	MK_ESC					= KEY_ESC,
 	MK_BACKSPACE		= KEY_BACKSPACE,
 	MK_ENTER				= KEY_ENTER,
@@ -122,16 +138,6 @@ enum MappableKeyType CPP_11(: Int)
 	MK_8						= KEY_8,
 	MK_9						= KEY_9,
 	MK_0						= KEY_0,
-	MK_KP1					= KEY_KP1,
-	MK_KP2					= KEY_KP2,
-	MK_KP3					= KEY_KP3,
-	MK_KP4					= KEY_KP4,
-	MK_KP5					= KEY_KP5,
-	MK_KP6					= KEY_KP6,
-	MK_KP7					= KEY_KP7,
-	MK_KP8					= KEY_KP8,
-	MK_KP9					= KEY_KP9,
-	MK_KP0					= KEY_KP0,
 	MK_MINUS				= KEY_MINUS,
 	MK_EQUAL				= KEY_EQUAL,
 	MK_LBRACKET			= KEY_LBRACKET,
@@ -153,13 +159,30 @@ enum MappableKeyType CPP_11(: Int)
 	MK_PGDN					= KEY_PGDN,
 	MK_INS					= KEY_INS,
 	MK_DEL					= KEY_DEL,
-	MK_KPSLASH			= KEY_KPSLASH,
 	MK_NONE					= KEY_NONE
 
-};	
+};
 
-static const LookupListRec KeyNames[] = 
+static const LookupListRec KeyNames[] =
 {
+	// keypad keys ----------------------------------------------------------------
+	{ "KEY_KP0", MK_KP0 },
+	{ "KEY_KP1", MK_KP1 },
+	{ "KEY_KP2", MK_KP2 },
+	{ "KEY_KP3", MK_KP3 },
+	{ "KEY_KP4", MK_KP4 },
+	{ "KEY_KP5", MK_KP5 },
+	{ "KEY_KP6", MK_KP6 },
+	{ "KEY_KP7", MK_KP7 },
+	{ "KEY_KP8", MK_KP8 },
+	{ "KEY_KP9", MK_KP9 },
+	{ "KEY_KPDEL", MK_KPDEL },
+	{ "KEY_KPSTAR", MK_KPSTAR },
+	{ "KEY_KPMINUS", MK_KPMINUS },
+	{ "KEY_KPPLUS", MK_KPPLUS },
+	{ "KEY_KPENTER", MK_KPENTER },
+	{ "KEY_KPSLASH", MK_KPSLASH },
+
 	{ "KEY_ESC", MK_ESC },
 	{ "KEY_BACKSPACE", MK_BACKSPACE },
 	{ "KEY_ENTER", MK_ENTER },
@@ -213,16 +236,6 @@ static const LookupListRec KeyNames[] =
 	{ "KEY_8", MK_8 },
 	{ "KEY_9", MK_9 },
 	{ "KEY_0", MK_0 },
-	{ "KEY_KP1", MK_KP1 },
-	{ "KEY_KP2", MK_KP2 },
-	{ "KEY_KP3", MK_KP3 },
-	{ "KEY_KP4", MK_KP4 },
-	{ "KEY_KP5", MK_KP5 },
-	{ "KEY_KP6", MK_KP6 },
-	{ "KEY_KP7", MK_KP7 },
-	{ "KEY_KP8", MK_KP8 },
-	{ "KEY_KP9", MK_KP9 },
-	{ "KEY_KP0", MK_KP0 },
 	{ "KEY_MINUS", MK_MINUS },
 	{ "KEY_EQUAL", MK_EQUAL },
 	{ "KEY_LBRACKET", MK_LBRACKET },
@@ -244,9 +257,8 @@ static const LookupListRec KeyNames[] =
 	{ "KEY_PGDN", MK_PGDN },
 	{ "KEY_INS", MK_INS },
 	{ "KEY_DEL", MK_DEL },
-	{ "KEY_KPSLASH", MK_KPSLASH },
 	{ "KEY_NONE", MK_NONE },
-	{ NULL, 0	} // keep this last!
+	{ NULL, 0	}
 };
 
 // -------------------------------------------------------------------------------
@@ -254,16 +266,19 @@ enum MappableKeyTransition CPP_11(: Int)
 {
 	DOWN,
 	UP,
-	DOUBLEDOWN	// if a key transition is repeated immediately, we generate this.
+	DOUBLEDOWN,	// if a key transition is repeated immediately, we generate this.
+
+	MAPPABLE_KEY_TRANSITION_COUNT
 };
 
-static const LookupListRec TransitionNames[] = 
+static const LookupListRec TransitionNames[] =
 {
 	{ "DOWN",				DOWN },
 	{ "UP",					UP },
 	{ "DOUBLEDOWN",	DOUBLEDOWN },
-	{ NULL, 0	}// keep this last!
+	{ NULL, 0	}
 };
+static_assert(ARRAY_SIZE(TransitionNames) == MAPPABLE_KEY_TRANSITION_COUNT + 1, "Incorrect array size");
 
 // -------------------------------------------------------------------------------
 // an easier-to-type subset of the KEY_STATE stuff.
@@ -279,7 +294,7 @@ enum MappableKeyModState CPP_11(: Int)
 	SHIFT_ALT_CTRL		= SHIFT|ALT|CTRL
 };
 
-static const LookupListRec ModifierNames[] = 
+static const LookupListRec ModifierNames[] =
 {
 	{ "NONE",							NONE },
 	{ "CTRL",							CTRL },
@@ -289,7 +304,7 @@ static const LookupListRec ModifierNames[] =
 	{ "SHIFT_CTRL",				SHIFT_CTRL },
 	{ "SHIFT_ALT",				SHIFT_ALT },
 	{ "SHIFT_ALT_CTRL" ,	SHIFT_ALT_CTRL },
-	{ NULL, 0	}// keep this last!
+	{ NULL, 0	}
 };
 
 
@@ -300,14 +315,18 @@ enum CommandUsableInType CPP_11(: Int)
 {
 	COMMANDUSABLE_NONE				= 0,
 
-	COMMANDUSABLE_SHELL				= (1 << 0),
-	COMMANDUSABLE_GAME				= (1 << 1)
+	COMMANDUSABLE_SHELL				= (1 << 0), // Command is usable when in Shell (Menus)
+	COMMANDUSABLE_GAME				= (1 << 1), // Command is usable when not in Shell
+	COMMANDUSABLE_OBSERVER		= (1 << 2), // TheSuperHackers @feature Command is usable when observing
+
+	COMMANDUSABLE_EVERYWHERE = ~0,
 };
 
-static const char* TheCommandUsableInNames[] =
+static const char* const TheCommandUsableInNames[] =
 {
 	"SHELL",
 	"GAME",
+	"OBSERVER",
 
 	NULL
 };
@@ -315,7 +334,7 @@ static const char* TheCommandUsableInNames[] =
 // -------------------------------------------------------------------------------
 class MetaMapRec : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(MetaMapRec, "MetaMapRec")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(MetaMapRec, "MetaMapRec")
 public:
 	MetaMapRec*							m_next;
 	GameMessage::Type				m_meta;						///< the meta-event to emit
@@ -332,7 +351,7 @@ EMPTY_DTOR(MetaMapRec)
 
 
 //-----------------------------------------------------------------------------
-class MetaEventTranslator : public GameMessageTranslator                          
+class MetaEventTranslator : public GameMessageTranslator
 {
 private:
 
@@ -347,7 +366,7 @@ class MetaEventTranslator : public GameMessageTranslator
 	MetaEventTranslator();
 	~MetaEventTranslator();
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
-};	
+};
 
 //-----------------------------------------------------------------------------
 class MetaMap : public SubsystemInterface
@@ -362,7 +381,7 @@ class MetaMap : public SubsystemInterface
 	MetaMapRec *getMetaMapRec(GameMessage::Type t);
 
 public:
-	
+
 	MetaMap();
 	~MetaMap();
 
@@ -380,5 +399,3 @@ class MetaMap : public SubsystemInterface
 };
 
 extern MetaMap *TheMetaMap;
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h b/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
index 608e4461404..f3296be3808 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ANIMPARTICLESYSBONEUPDATE_H_
-#define __ANIMPARTICLESYSBONEUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ClientUpdateModule.h"
 
@@ -59,6 +56,3 @@ class AnimatedParticleSysBoneClientUpdate : public ClientUpdateModule
 	UnsignedInt m_life;
 
 };
-
-#endif // __ANIMPARTICLESYSBONEUPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h b/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h
index 9249fd299a7..d50ac633730 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BEACONCLIENTUPDATE_H_
-#define __BEACONCLIENTUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ClientUpdateModule.h"
 
@@ -75,6 +72,3 @@ class BeaconClientUpdate : public ClientUpdateModule
 	UnsignedInt m_lastRadarPulse;
 
 };
-
-#endif // __BEACONCLIENTUPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h b/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h
index 595342db301..e2046660e70 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SWAYCLIENTUPDATE_H_
-#define __SWAYCLIENTUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ClientUpdateModule.h"
 
@@ -61,7 +58,7 @@ class SwayClientUpdate : public ClientUpdateModule
 
 	Real			m_curValue;
 	Real			m_curAngle;
-	Real			m_curDelta;	 
+	Real			m_curDelta;
 	Real			m_curAngleLimit;
 	Real			m_leanAngle;							///<Angle that the tree leans away from the wind.
 	Short			m_curVersion;
@@ -70,6 +67,3 @@ class SwayClientUpdate : public ClientUpdateModule
 
 	void updateSway(void);
 };
-
-#endif // __SWAYCLIENTUPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/Mouse.h b/Generals/Code/GameEngine/Include/GameClient/Mouse.h
index 12eb6e554b0..07583b79f78 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Mouse.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Mouse.h
@@ -24,12 +24,12 @@
 
 // FILE: Mouse.h //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __MOUSE_H_
-#define __MOUSE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -59,10 +56,13 @@
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////
 
+enum GameMode CPP_11(: Int);
+
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 
 enum MouseButtonState CPP_11(: Int)
 {
+	MBS_None = -1,
 	MBS_Up = 0,
 	MBS_Down,
 	MBS_DoubleClick,
@@ -106,17 +106,14 @@ struct MouseIO
 								 user while - is down/toward user */
 	ICoord2D deltaPos;  ///< overall change in mouse pointer this frame
 
-	MouseButtonState leftState;					// button state: Up, Down, DoubleClick (Which is also down)
+	MouseButtonState leftState;					// button state: None (no event), Up, Down, DoubleClick
 	Int leftEvent;											// Most important event this frame
-	Int leftFrame;											// last frame button state changed
 
 	MouseButtonState rightState;
 	Int rightEvent;
-	Int rightFrame;
 
 	MouseButtonState middleState;
 	Int middleEvent;
-	Int middleFrame;
 };
 
 class CursorInfo
@@ -139,20 +136,51 @@ class CursorInfo
 	Int						numDirections;	//number of directions for cursors like scrolling/panning.
 };
 
+typedef UnsignedInt CursorCaptureMode;
+enum CursorCaptureMode_ CPP_11(: CursorCaptureMode)
+{
+	CursorCaptureMode_EnabledInWindowedGame = 1<<0, // Captures the cursor when in game while the app is windowed
+	CursorCaptureMode_EnabledInWindowedMenu = 1<<1, // Captures the cursor when in menu while the app is windowed
+	CursorCaptureMode_EnabledInFullscreenGame = 1<<2, // Captures the cursor when in game while the app is fullscreen
+	CursorCaptureMode_EnabledInFullscreenMenu = 1<<3, // Captures the cursor when in menu while the app is fullscreen
+
+	CursorCaptureMode_Default =
+		CursorCaptureMode_EnabledInWindowedGame |
+		CursorCaptureMode_EnabledInFullscreenGame |
+		CursorCaptureMode_EnabledInFullscreenMenu,
+};
+
 // Mouse ----------------------------------------------------------------------
-/** Class interface for working with a mouse pointing device */
+// Class interface for working with a mouse pointing device
+//
+// TheSuperHackers @feature xezon 26/07/2025 Implements mouse cursor capture
+// functionality. The Mouse class handles most of the logic for it internally.
 //-----------------------------------------------------------------------------
 class Mouse : public SubsystemInterface
 {
 
-public:  // enumerations and types
+	// enumerations and types
+
+	typedef UnsignedInt CursorCaptureBlockReasonInt;
+
+	enum CursorCaptureBlockReason
+	{
+		CursorCaptureBlockReason_NoInit,
+		CursorCaptureBlockReason_Paused,
+		CursorCaptureBlockReason_Unfocused,
+		CursorCaptureBlockReadon_CursorIsOutside,
+
+		CursorCaptureBlockReason_Count
+	};
+
+public:
 
 	// ----------------------------------------------------------------------------------------------
 	/** If you update this enum make sure you update CursorININames[] */
 	// ----------------------------------------------------------------------------------------------
 	enum MouseCursor
 	{
-		
+
 		// ***** dont forget to update CursorININames[] *****
 		// ***** dont forget to update CursorININames[] *****
 		// ***** dont forget to update CursorININames[] *****
@@ -217,7 +245,7 @@ class Mouse : public SubsystemInterface
 
 
 		// ***** dont forget to update CursorININames[] *****
-		NUM_MOUSE_CURSORS  // keep this last
+		NUM_MOUSE_CURSORS
 
 	};
 
@@ -228,10 +256,12 @@ class Mouse : public SubsystemInterface
 		RM_W3D,				//W3D model tied to frame rate.
 		RM_POLYGON,		//alpha blended polygon tied to frame rate.
 		RM_DX8,			//hardware cursor independent of frame rate.
-		RM_MAX	// keep this last.
+
+		RM_MAX
 	};
 
-	static const char *RedrawModeName[RM_MAX];
+	static const char *const CursorCaptureBlockReasonNames[];
+	static const char *const RedrawModeName[];
 
 	CursorInfo m_cursorInfo[NUM_MOUSE_CURSORS];
 
@@ -247,16 +277,17 @@ class Mouse : public SubsystemInterface
 	virtual void update( void );  ///< update the state of the mouse position and buttons
 	virtual void initCursorResources(void)=0;	///< needed so Win32 cursors can load resources before D3D device created.
 
-	virtual void createStreamMessages( void );  /**< given state of device, create 
-																									 messages and put them on the 
+	virtual void createStreamMessages( void );  /**< given state of device, create
+																									 messages and put them on the
 																									 stream for the raw state. */
-	
+
 	virtual void draw( void );													///< draw the mouse
 	virtual void setPosition( Int x, Int y );						///< set the mouse position
 	virtual void setCursor( MouseCursor cursor ) = 0;		///< set mouse cursor
 
-	virtual void capture( void ) = 0;					///< capture the mouse
-	virtual void releaseCapture( void ) = 0;  ///< release mouse capture
+	void setCursorCaptureMode(CursorCaptureMode mode); ///< set the rules for the mouse capture
+	void refreshCursorCapture(); ///< refresh the mouse capture
+	Bool isCursorCaptured(); ///< true if the mouse is captured in the game window
 
 	// access methods for the mouse data
 	const MouseIO *getMouseStatus( void ) { return &m_currMouse; }							///< get current mouse status
@@ -271,14 +302,23 @@ class Mouse : public SubsystemInterface
 	virtual void setRedrawMode(RedrawMode mode)	{m_currentRedrawMode=mode;} ///<set cursor drawing method.
 	virtual RedrawMode getRedrawMode(void) { return m_currentRedrawMode; } //get cursor drawing method
 	virtual void setVisibility(Bool visible) { m_visible = visible; } // set visibility for load screens, etc
-	inline Bool getVisibility(void) { return m_visible; } // get visibility state
-	
+	Bool getVisibility(void) { return m_visible; } // get visibility state
+
 	void drawTooltip( void );					///< draw the tooltip text
 	void drawCursorText( void );			///< draw the mouse cursor text
 	Int getCursorIndex( const AsciiString& name );
 	void resetTooltipDelay( void );
 
-	void mouseNotifyResolutionChange(void);
+	virtual void loseFocus(); ///< called when window has lost focus
+	virtual void regainFocus(); ///< called when window has regained focus
+
+	void onCursorMovedOutside(); ///< called when cursor has left game window
+	void onCursorMovedInside(); ///< called when cursor has entered game window
+	Bool isCursorInside() const; ///< true if the mouse is located inside the game window
+
+	void onResolutionChanged(void);
+	void onGameModeChanged(GameMode prev, GameMode next);
+	void onGamePaused(Bool paused);
 
 	Bool isClick(const ICoord2D *anchor, const ICoord2D *dest, UnsignedInt previousMouseClick, UnsignedInt currentMouseClick);
 
@@ -304,10 +344,19 @@ class Mouse : public SubsystemInterface
 	UnsignedInt m_dragTolerance;
 	UnsignedInt m_dragTolerance3D;
 	UnsignedInt m_dragToleranceMS;
-	
+
 
 protected:
 
+	void initCapture();
+	Bool canCapture() const; ///< true if the mouse can be captured
+	void unblockCapture(CursorCaptureBlockReason reason); // unset a reason to block mouse capture
+	void blockCapture(CursorCaptureBlockReason reason); // set a reason to block mouse capture
+	void onCursorCaptured(Bool captured); ///< called when the mouse was successfully captured or released
+
+	virtual void capture( void ) = 0; ///< capture the mouse in the game window
+	virtual void releaseCapture( void ) = 0; ///< release the mouse capture
+
 	/// you must implement getting a buffered mouse event from you device here
 	virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush ) = 0;
 
@@ -324,7 +373,7 @@ class Mouse : public SubsystemInterface
 
 	UnsignedByte m_numButtons;  ///< number of buttons on this mouse
 	UnsignedByte m_numAxes;			///< number of axes this mouse has
-	Bool m_forceFeedback;				///< set to TRUE if mouse supprots force feedback
+	Bool m_forceFeedback;				///< set to TRUE if mouse supports force feedback
 
 	UnicodeString m_tooltipString;	///< tooltip text
 	DisplayString *m_tooltipDisplayString; ///< tooltipDisplayString
@@ -342,16 +391,14 @@ class Mouse : public SubsystemInterface
 	Int m_minY;							///< mouse is locked to this region
 	Int m_maxY;							///< mouse is locked to this region
 
-	UnsignedInt m_inputFrame;				///< frame input was gathered on
-	UnsignedInt m_deadInputFrame;		///< Frame which last input occured
-
 	Bool m_inputMovesAbsolute;			/**< if TRUE, when processing mouse position
 																	chanages the movement will be done treating
 																	the	coords as ABSOLUTE positions and NOT
 																	relative coordinate changes */
 
 	Bool m_visible;	// visibility status
-	
+	Bool m_isCursorCaptured;
+
 	MouseCursor m_currentCursor;		///< current mouse cursor
 
 	DisplayString *m_cursorTextDisplayString;		///< text to display on the cursor (if specified)
@@ -368,7 +415,10 @@ class Mouse : public SubsystemInterface
 
 	Int m_eventsThisFrame;
 
-};  // end class Mouse
+	CursorCaptureMode m_cursorCaptureMode;
+	CursorCaptureBlockReasonInt m_captureBlockReasonBits;
+
+};
 
 // TheSuperHackers @feature helmutbuhler 17/05/2025
 // Mouse that does nothing. Used for Headless Mode.
@@ -387,5 +437,3 @@ class MouseDummy : public Mouse
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
 extern Mouse *TheMouse;  ///< extern mouse singleton definition
-
-#endif // _MOUSE_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h b/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h
index 73c3fbb95b8..8b2194f5332 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h
@@ -29,10 +29,6 @@
 
 #pragma once
 
-#ifndef _PARTICLE_SYS_H_
-#define _PARTICLE_SYS_H_
-
-#include <stdio.h>
 #include "Common/AsciiString.h"
 #include "Common/GameMemory.h"
 #include "Common/GameType.h"
@@ -43,9 +39,9 @@
 #include "WWMath/matrix3d.h"		///< @todo Replace with our own matrix library
 #include "Common/STLTypedefs.h"
 
- 
+
 /// @todo Once the client framerate is decoupled, the frame counters within will have to become time-based
- 
+
 class Particle;
 class ParticleSystem;
 class ParticleSystemManager;
@@ -84,7 +80,7 @@ struct RGBColorKeyframe
 
 enum ParticlePriorityType CPP_11(: Int)
 {
-	INVALID_PRIORITY = 0, 
+	INVALID_PRIORITY = 0,
 	PARTICLE_PRIORITY_LOWEST = 1,
 //	FLUFF = PARTICLE_PRIORITY_LOWEST,		///< total and absolute fluff
 //	DEBRIS,		///< debris related particles
@@ -107,8 +103,8 @@ enum ParticlePriorityType CPP_11(: Int)
 	CRITICAL,				///< super special top priority like a superweapon
 	ALWAYS_RENDER,	///< used for logically important display (not just fluff), so must never be culled, regardless of particle cap, lod, etc
 	// !!! *Noting* goes here ... special is the top priority !!!
-	PARTICLE_PRIORITY_HIGHEST = ALWAYS_RENDER,
-	NUM_PARTICLE_PRIORITIES  ///< Keep this last
+	NUM_PARTICLE_PRIORITIES,
+	PARTICLE_PRIORITY_HIGHEST = NUM_PARTICLE_PRIORITIES - 1,
 };
 
 /**
@@ -164,11 +160,11 @@ class ParticleInfo : public Snapshot
  * An individual particle created by a ParticleSystem.
  * NOTE: Particles cannot exist without a parent particle system.
  */
-class Particle : public MemoryPoolObject, 
+class Particle : public MemoryPoolObject,
 								 public ParticleInfo
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( Particle, "ParticlePool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( Particle, "ParticlePool" )
 
 public:
 
@@ -180,20 +176,20 @@ class Particle : public MemoryPoolObject,
 	void applyForce( const Coord3D *force );		///< add the given acceleration
 	void detachDrawable( void ) { m_drawable = NULL; }	///< detach the Drawable pointer from this particle
 
-	inline const Coord3D *getPosition( void ) { return &m_pos; }
-	inline Real getSize( void ) { return m_size; }
-	inline Real getAngle( void ) { return m_angleZ; }
-	inline Real getAlpha( void ) { return m_alpha; }
-	inline const RGBColor *getColor( void ) { return &m_color; }
-	inline void setColor( RGBColor *color ) { m_color = *color; }
+	const Coord3D *getPosition( void ) { return &m_pos; }
+	Real getSize( void ) { return m_size; }
+	Real getAngle( void ) { return m_angleZ; }
+	Real getAlpha( void ) { return m_alpha; }
+	const RGBColor *getColor( void ) { return &m_color; }
+	void setColor( RGBColor *color ) { m_color = *color; }
 
 	Bool isInvisible( void );										///< return true if this particle is invisible
-	inline Bool isCulled (void) {return m_isCulled;}				///< return true if the particle falls off the edge of the screen
-	inline void setIsCulled (Bool enable) { m_isCulled = enable;}		///< set particle to not visible because it's outside view frustum
+	Bool isCulled (void) {return m_isCulled;}				///< return true if the particle falls off the edge of the screen
+	void setIsCulled (Bool enable) { m_isCulled = enable;}		///< set particle to not visible because it's outside view frustum
 
 	void controlParticleSystem( ParticleSystem *sys ) { m_systemUnderControl = sys; }
 	void detachControlledParticleSystem( void ) { m_systemUnderControl = NULL; }
-	
+
 	// get priority of this particle ... which is the priority of the system it belongs to
 	ParticlePriorityType getPriority( void );
 
@@ -250,46 +246,6 @@ class Particle : public MemoryPoolObject,
 
 };
 
-
-//--------------------------------------------------------------------------------------------------------------
-
-#ifdef DEFINE_PARTICLE_SYSTEM_NAMES
-
-/**** NOTE: These MUST be kept in sync with the enumerations below *****/
-
-static const char *ParticleShaderTypeNames[] = 
-{
-	"NONE", "ADDITIVE", "ALPHA", "ALPHA_TEST", "MULTIPLY", NULL
-};
-
-static const char *ParticleTypeNames[] = 
-{
-	"NONE", "PARTICLE", "DRAWABLE", "STREAK", "VOLUME_PARTICLE", NULL
-};
-
-static const char *EmissionVelocityTypeNames[] =
-{
-	"NONE", "ORTHO", "SPHERICAL", "HEMISPHERICAL", "CYLINDRICAL", "OUTWARD", NULL
-};
-
-static const char *EmissionVolumeTypeNames[] =
-{
-	"NONE", "POINT", "LINE", "BOX", "SPHERE", "CYLINDER", NULL
-};
-
-//"NONE", "FLUFF", "DEBRIS", "NATURE", "WEAPON", "DAMAGE", "SPECIAL"
-static const char *ParticlePriorityNames[] = 
-{
-	"NONE", "WEAPON_EXPLOSION","SCORCHMARK","DUST_TRAIL","BUILDUP","DEBRIS_TRAIL","UNIT_DAMAGE_FX","DEATH_EXPLOSION","SEMI_CONSTANT","CONSTANT","WEAPON_TRAIL","AREA_EFFECT","CRITICAL", "ALWAYS_RENDER", NULL
-};
-
-static const char *WindMotionNames[] = 
-{
-	"NONE", "Unused", "PingPong", "Circular", NULL
-};
-
-#endif
-
 /**
  * All of the properties of a particle system, used by both ParticleSystemTemplates
  * and ParticleSystem classes.
@@ -310,13 +266,15 @@ class ParticleSystemInfo : public Snapshot
 
 	enum ParticleShaderType
 	{
-		INVALID_SHADER=0, ADDITIVE, ALPHA, ALPHA_TEST, MULTIPLY
-	} 
+		INVALID_SHADER=0, ADDITIVE, ALPHA, ALPHA_TEST, MULTIPLY,
+		PARTICLE_SHADER_TYPE_COUNT
+	}
 	m_shaderType;																///< how this particle is rendered
 
 	enum ParticleType
 	{
-		INVALID_TYPE=0, PARTICLE, DRAWABLE, STREAK, VOLUME_PARTICLE	 ///< is a particle a 2D-screen-facing particle, or a Drawable, or a Segment in a streak?
+		INVALID_TYPE=0, PARTICLE, DRAWABLE, STREAK, VOLUME_PARTICLE, ///< is a particle a 2D-screen-facing particle, or a Drawable, or a Segment in a streak?
+		PARTICLE_TYPE_COUNT
 	}
 	m_particleType;
 
@@ -356,7 +314,7 @@ class ParticleSystemInfo : public Snapshot
 	typedef Int Color;
 
 	void tintAllColors( Color tintColor );
-	
+
 	GameClientRandomVariable m_colorScale;								///< color coefficient
 
 	GameClientRandomVariable m_burstDelay;								///< time between particle emissions
@@ -376,7 +334,8 @@ class ParticleSystemInfo : public Snapshot
 	// The direction and speed at which particles are emitted
 	enum EmissionVelocityType
 	{
-		INVALID_VELOCITY=0, ORTHO, SPHERICAL, HEMISPHERICAL, CYLINDRICAL, OUTWARD
+		INVALID_VELOCITY=0, ORTHO, SPHERICAL, HEMISPHERICAL, CYLINDRICAL, OUTWARD,
+		EMISSION_VELOCITY_TYPE_COUNT
 	}
 	m_emissionVelocityType;
 
@@ -419,10 +378,11 @@ class ParticleSystemInfo : public Snapshot
 	// Note that the volume is relative to the system's position and orientation
 	enum EmissionVolumeType
 	{
-		INVALID_VOLUME=0, POINT, LINE, BOX, SPHERE, CYLINDER
+		INVALID_VOLUME=0, POINT, LINE, BOX, SPHERE, CYLINDER,
+		EMISSION_VOLUME_TYPE_COUNT
 	}
 	m_emissionVolumeType;												///< the type of volume where particles are created
-	
+
 	union emissionVolumeUnion
 	{
 		// point just uses system's position
@@ -459,7 +419,7 @@ class ParticleSystemInfo : public Snapshot
 	m_emissionVolume;														///< the dimensions of the emission volume
 
 	Bool m_isEmissionVolumeHollow;							///< if true, only create particles at boundary of volume
-	Bool m_isGroundAligned;											///< if true, align with the ground. if false, then do the normal billboarding. 
+	Bool m_isGroundAligned;											///< if true, align with the ground. if false, then do the normal billboarding.
 	Bool m_isEmitAboveGroundOnly;								///< if true, only emit particles when the system is above ground.
 	Bool m_isParticleUpTowardsEmitter;					///< if true, align the up direction to be towards the emitter.
 
@@ -468,7 +428,9 @@ class ParticleSystemInfo : public Snapshot
 		WIND_MOTION_INVALID = 0,
 		WIND_MOTION_NOT_USED,
 		WIND_MOTION_PING_PONG,
-		WIND_MOTION_CIRCULAR
+		WIND_MOTION_CIRCULAR,
+
+		WIND_MOTION_COUNT
 	};
 	WindMotion m_windMotion;				///< motion of the wind angle updating
 	Real m_windAngle;								///< angle of the "wind" associated with this system
@@ -485,13 +447,56 @@ class ParticleSystemInfo : public Snapshot
 
 };
 
+//--------------------------------------------------------------------------------------------------------------
+
+#ifdef DEFINE_PARTICLE_SYSTEM_NAMES
+
+/**** NOTE: These MUST be kept in sync with the enumerations above *****/
+
+static const char *const ParticleShaderTypeNames[] =
+{
+	"NONE", "ADDITIVE", "ALPHA", "ALPHA_TEST", "MULTIPLY", NULL
+};
+static_assert(ARRAY_SIZE(ParticleShaderTypeNames) == ParticleSystemInfo::PARTICLE_SHADER_TYPE_COUNT + 1, "Incorrect array size");
+
+static const char *const ParticleTypeNames[] =
+{
+	"NONE", "PARTICLE", "DRAWABLE", "STREAK", "VOLUME_PARTICLE", NULL
+};
+static_assert(ARRAY_SIZE(ParticleTypeNames) == ParticleSystemInfo::PARTICLE_TYPE_COUNT + 1, "Incorrect array size");
+
+static const char *const EmissionVelocityTypeNames[] =
+{
+	"NONE", "ORTHO", "SPHERICAL", "HEMISPHERICAL", "CYLINDRICAL", "OUTWARD", NULL
+};
+static_assert(ARRAY_SIZE(EmissionVelocityTypeNames) == ParticleSystemInfo::EMISSION_VELOCITY_TYPE_COUNT + 1, "Incorrect array size");
+
+static const char *const EmissionVolumeTypeNames[] =
+{
+	"NONE", "POINT", "LINE", "BOX", "SPHERE", "CYLINDER", NULL
+};
+static_assert(ARRAY_SIZE(EmissionVolumeTypeNames) == ParticleSystemInfo::EMISSION_VOLUME_TYPE_COUNT + 1, "Incorrect array size");
+
+static const char *const ParticlePriorityNames[] =
+{
+	"NONE", "WEAPON_EXPLOSION","SCORCHMARK","DUST_TRAIL","BUILDUP","DEBRIS_TRAIL","UNIT_DAMAGE_FX","DEATH_EXPLOSION","SEMI_CONSTANT","CONSTANT","WEAPON_TRAIL","AREA_EFFECT","CRITICAL", "ALWAYS_RENDER", NULL
+};
+static_assert(ARRAY_SIZE(ParticlePriorityNames) == NUM_PARTICLE_PRIORITIES + 1, "Incorrect array size");
+
+static const char *const WindMotionNames[] =
+{
+	"NONE", "Unused", "PingPong", "Circular", NULL
+};
+static_assert(ARRAY_SIZE(WindMotionNames) == ParticleSystemInfo::WIND_MOTION_COUNT + 1, "Incorrect array size");
+
+#endif
 
 /**
  * A ParticleSystemTemplate, used by the ParticleSystemManager to instantiate ParticleSystems.
  */
 class ParticleSystemTemplate : public MemoryPoolObject, protected ParticleSystemInfo
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( ParticleSystemTemplate, "ParticleSystemTemplatePool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( ParticleSystemTemplate, "ParticleSystemTemplatePool" )
 
 public:
 	ParticleSystemTemplate( const AsciiString &name );
@@ -510,7 +515,7 @@ class ParticleSystemTemplate : public MemoryPoolObject, protected ParticleSystem
 protected:
 	friend class ParticleSystemManager;					///< @todo remove this friendship
 	friend class ParticleSystem;								///< @todo remove this friendship
-	
+
 	// These friendships are naughty but necessary for particle editing.
 	friend class DebugWindowDialog;							///< @todo remove this friendship when no longer editing particles
 	friend void _updateAsciiStringParmsToSystem(ParticleSystemTemplate *particleTemplate);
@@ -534,19 +539,19 @@ class ParticleSystemTemplate : public MemoryPoolObject, protected ParticleSystem
  * before destroying itself in order to ensure everything can be cleaned up if the system
  * is reset.
  */
-class ParticleSystem : public MemoryPoolObject, 
+class ParticleSystem : public MemoryPoolObject,
 											 public ParticleSystemInfo
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( ParticleSystem, "ParticleSystemPool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( ParticleSystem, "ParticleSystemPool" )
 
 public:
 
-	ParticleSystem( const ParticleSystemTemplate *sysTemplate, 
+	ParticleSystem( const ParticleSystemTemplate *sysTemplate,
 									ParticleSystemID id,
 									Bool createSlaves );			///< create a particle system from a template and assign it this ID
 
-	inline ParticleSystemID getSystemID( void ) const { return m_systemID; }	///< get unique system ID
+	ParticleSystemID getSystemID( void ) const { return m_systemID; }	///< get unique system ID
 
 	void setPosition( const Coord3D *pos );			///< set the position of the particle system
 	void getPosition( Coord3D *pos );				///< get the position of the particle system
@@ -554,7 +559,7 @@ class ParticleSystem : public MemoryPoolObject,
 	void rotateLocalTransformX( Real x );				///< rotate local transform matrix
 	void rotateLocalTransformY( Real y );				///< rotate local transform matrix
 	void rotateLocalTransformZ( Real z );				///< rotate local transform matrix
-		
+
 	const Coord3D *getDriftVelocity( void ) { return &m_driftVelocity; }	///< get the drift velocity of the system
 
 	void attachToDrawable( const Drawable *draw );							///< attach this particle system to a Drawable
@@ -600,7 +605,7 @@ class ParticleSystem : public MemoryPoolObject,
 	void setMaster( ParticleSystem *master );  ///< make this a slave with a master
 	ParticleSystem *getMaster( void ) { return m_masterSystem; }
 	const Coord3D *getSlavePositionOffset( void ) { return &m_slavePosOffset; }
-	
+
 	void setSystemLifetime( UnsignedInt frames ) { m_systemLifetimeLeft = frames; }; ///< not the particle life, the system!... Lorenzen
 	void setLifetimeRange( Real min, Real max );
 	Bool isSystemForever() const {return m_isForever;}
@@ -629,8 +634,8 @@ class ParticleSystem : public MemoryPoolObject,
 	void removeParticle( Particle *p );
 	UnsignedInt getParticleCount( void ) const { return m_particleCount; }
 
-	inline ObjectID getAttachedObject( void ) { return m_attachedToObjectID; }
-	inline DrawableID getAttachedDrawable( void ) { return m_attachedToDrawableID; }
+	ObjectID getAttachedObject( void ) { return m_attachedToObjectID; }
+	DrawableID getAttachedDrawable( void ) { return m_attachedToDrawableID; }
 
 	// Access to dynamically changing part of a particle system.
 	void setEmissionVolumeSphereRadius( Real newRadius ) { if (m_emissionVolumeType == SPHERE) m_emissionVolume.sphere.radius = newRadius; }
@@ -743,15 +748,15 @@ class ParticleSystemManager : public SubsystemInterface,
 
 	/// given a template, instantiate a particle system
 	ParticleSystem *createParticleSystem( const ParticleSystemTemplate *sysTemplate,
-																				Bool createSlaves = TRUE );	
+																				Bool createSlaves = TRUE );
 
-	/** given a template, instantiate a particle system. 
+	/** given a template, instantiate a particle system.
 		if attachTo is not null, attach the particle system to the given object.
 		return the particle system's ID, NOT its pointer.
 	*/
 	ParticleSystemID createAttachedParticleSystemID( const ParticleSystemTemplate *sysTemplate,
 																				Object* attachTo,
-																				Bool createSlaves = TRUE );	
+																				Bool createSlaves = TRUE );
 
 	/// find a particle system given a unique system identifier
 	ParticleSystem *findParticleSystem( ParticleSystemID id );
@@ -764,7 +769,7 @@ class ParticleSystemManager : public SubsystemInterface,
 	TemplateMap::iterator endParticleSystemTemplate() { return m_templateMap.end(); }
 	TemplateMap::const_iterator beginParticleSystemTemplate() const { return m_templateMap.begin(); }
 	TemplateMap::const_iterator endParticleSystemTemplate() const { return m_templateMap.end(); }
-	
+
 	/// destroy attached systems to object
 	void destroyAttachedSystems( Object *obj );
 
@@ -780,10 +785,10 @@ class ParticleSystemManager : public SubsystemInterface,
 
 	// @todo const this jkmcd
 	ParticleSystemList &getAllParticleSystems( void ) { return m_allParticleSystemList; }
-	
+
 	virtual void doParticles(RenderInfoClass &rinfo) = 0;
 	virtual void queueParticleRender() = 0;
-	
+
 	virtual void preloadAssets( TimeOfDay timeOfDay );
 
 	// these are only for use by partcle systems to link and unlink themselves
@@ -820,6 +825,3 @@ extern ParticleSystemManager *TheParticleSystemManager;
 
 class DebugDisplayInterface;
 extern void ParticleSystemDebugDisplay( DebugDisplayInterface *dd, void *, FILE *fp = NULL );
-
-
-#endif // _PARTICLE_SYS_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h b/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h
index 88dbf9ab44c..3d367d3c95d 100644
--- a/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h
+++ b/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h
@@ -27,13 +27,10 @@
 
 #pragma once
 
-#ifndef _H_PlaceEventTranslator
-#define _H_PlaceEventTranslator
-
 #include "GameClient/InGameUI.h"
 
 //-----------------------------------------------------------------------------
-class PlaceEventTranslator : public GameMessageTranslator                          
+class PlaceEventTranslator : public GameMessageTranslator
 {
 private:
 	UnsignedInt m_frameOfUpButton;
@@ -42,6 +39,4 @@ class PlaceEventTranslator : public GameMessageTranslator
 	PlaceEventTranslator();
 	~PlaceEventTranslator();
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
-};	
-
-#endif
+};
diff --git a/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h b/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h
index 786a07a66c7..1e82c6d0e77 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h
@@ -24,12 +24,12 @@
 
 // FILE: ProcessAnimateWindow.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Mar 2002
@@ -37,11 +37,11 @@
 //	Filename: 	ProcessAnimateWindow.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	If a new animation is wanted to be added for the windows, All you 
+//
+//	purpose:	If a new animation is wanted to be added for the windows, All you
 //						have to do is create a new class derived from ProcessAnimateWindow.
 //						Then setup each of the virtual classes to process an AnimateWindow
-//						class.  The Update adn reverse functions get called every frame 
+//						class.  The Update adn reverse functions get called every frame
 //						by the shell and will continue to process the AdminWin until the
 //						isFinished flag on the adminWin is set to true.
 //
@@ -50,9 +50,6 @@
 
 #pragma once
 
-#ifndef __PROCESSANIMATEWINDOW_H_
-#define __PROCESSANIMATEWINDOW_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -265,5 +262,3 @@ Real m_speedUpRatio;  // how fast the windows speed up
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __PROCESSANIMATEWINDOW_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h b/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h
index 2333f8bba72..c1b3bd5ad12 100644
--- a/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h
+++ b/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef _RadiusDecal_H_
-#define _RadiusDecal_H_
-
 #include "Common/GameCommon.h"
 #include "Common/GameType.h"
 #include "GameClient/Color.h"
@@ -56,7 +53,7 @@ class RadiusDecal
 	void xferRadiusDecal( Xfer *xfer );
 
 	// please note: it is very important, for game/net sync reasons, to ensure that
-	// isEmpty() returns the same value, regardless of whether this decal will 
+	// isEmpty() returns the same value, regardless of whether this decal will
 	// be visible to the local player or not.
 	Bool isEmpty() const { return m_empty; }
 	void clear();
@@ -91,5 +88,3 @@ class RadiusDecalTemplate
 
 	static void parseRadiusDecalTemplate(INI* ini, void *instance, void * store, const void* /*userData*/);
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameClient/RayEffect.h b/Generals/Code/GameEngine/Include/GameClient/RayEffect.h
index 0c612e45e27..f7442da69be 100644
--- a/Generals/Code/GameEngine/Include/GameClient/RayEffect.h
+++ b/Generals/Code/GameEngine/Include/GameClient/RayEffect.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RAYEFFECT_H_
-#define __RAYEFFECT_H_
-
 // INCLUDE ////////////////////////////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
 #include "Common/SubsystemInterface.h"
@@ -49,7 +46,7 @@ struct RayEffectData
 	Coord3D startLoc;  ///< start location for ray
 	Coord3D endLoc;  ///< end location for ray
 
-};  // end RayEffectData
+};
 
 //-------------------------------------------------------------------------------------------------
 /** This class maintains all the ray effects visible in the world */
@@ -87,10 +84,7 @@ class RayEffectSystem : public SubsystemInterface
 	};
 	RayEffectData m_effectData[ MAX_RAY_EFFECTS ];  ///< all the ray effects
 
-};  // end RayEffectSystem
+};
 
 // EXTERN /////////////////////////////////////////////////////////////////////////////////////////
 extern RayEffectSystem *TheRayEffects;  ///< the ray effects singleton external
-
-#endif // $label
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h b/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h
index e6a54913478..e0d07c059a4 100644
--- a/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h
+++ b/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h
@@ -28,12 +28,9 @@
 
 #pragma once
 
-#ifndef __SELECTIONINFO_H__
-#define __SELECTIONINFO_H__
-
 #include "GameClient/InGameUI.h"
 
-// This structure gives you a rough idea about the counts of the kinds of guys in the 
+// This structure gives you a rough idea about the counts of the kinds of guys in the
 // current selection, and in the selection that would be made.
 struct SelectionInfo
 {
@@ -59,7 +56,7 @@ struct SelectionInfo
 	Bool selectFriends;
 
 
-	SelectionInfo(); 
+	SelectionInfo();
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -68,7 +65,7 @@ struct PickDrawableStruct
 	// List to fill with Drawables. This should be provided by the caller.
 	DrawableList *drawableListToFill;
 	Bool forceAttackMode;
-	
+
 	// Note, this is OR'd with the things we are attempting to select.
 	KindOfMaskType kindofsToMatch;
 
@@ -76,7 +73,7 @@ struct PickDrawableStruct
 };
 
 //-------------------------------------------------------------------------------------------------
-extern Bool contextCommandForNewSelection(const DrawableList *currentlySelectedDrawables, 
+extern Bool contextCommandForNewSelection(const DrawableList *currentlySelectedDrawables,
 																					const DrawableList *newlySelectedDrawables,
 																					SelectionInfo *outSelectionInfo,
 																					Bool selectionIsPoint);
@@ -97,9 +94,6 @@ extern void translatePickTypesToKindof(UnsignedInt pickTypes, KindOfMaskType& ou
 
 //-------------------------------------------------------------------------------------------------
 // Given a drawable, add it to an stl list. Useful for iterateDrawablesInRegion.
-// userData should be a pointer to a PickDrawableStruct, which is defined in 
+// userData should be a pointer to a PickDrawableStruct, which is defined in
 // above.
 extern Bool addDrawableToList( Drawable *draw, void *userData );
-
-
-#endif /* __SELECTIONINFO_H__ */
diff --git a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h
index 6fac8da100a..978ccfb1b6c 100644
--- a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h
+++ b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef _H_SelectionXlat
-#define _H_SelectionXlat
-
 #include "GameClient/InGameUI.h"
 
 class ThingTemplate;
@@ -65,15 +62,11 @@ class SelectionTranslator : public GameMessageTranslator
 	SelectionTranslator();
 	~SelectionTranslator();
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
-
-	//Added By Sadullah Nader
 	//added for fix to the drag selection when entering control bar
 	//changes the mode of drag selecting to it's opposite
 	void setDragSelecting(Bool dragSelect);
 	void setLeftMouseButton(Bool state);
-};	
+};
 
 Bool CanSelectDrawable( const Drawable *draw, Bool dragSelecting );
 extern SelectionTranslator *TheSelectionTranslator;
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameClient/Shadow.h b/Generals/Code/GameEngine/Include/GameClient/Shadow.h
index f536de90db8..0ea345a84f8 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Shadow.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Shadow.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __SHADOW_H_
-#define __SHADOW_H_
-
 //
 // skeleton definition of shadow types
 //
@@ -40,17 +37,17 @@
 // shadow bit flags, keep this in sync with TheShadowNames
 enum ShadowType CPP_11(: Int)
 {
-	SHADOW_NONE											=	0x00000000, 
+	SHADOW_NONE											=	0x00000000,
 	SHADOW_DECAL										=	0x00000001,		//shadow decal applied via modulate blend
-	SHADOW_VOLUME										=	0x00000002, 
+	SHADOW_VOLUME										=	0x00000002,
 	SHADOW_PROJECTION								=	0x00000004,
 	SHADOW_DYNAMIC_PROJECTION				= 0x00000008,		//extra setting for shadows which need dynamic updates
 	SHADOW_DIRECTIONAL_PROJECTION		= 0x00000010,		//extra setting for shadow decals that rotate with sun direction
 	SHADOW_ALPHA_DECAL							= 0x00000020,		//not really for shadows but for other decal uses. Alpha blended.
-	SHADOW_ADDITIVE_DECAL						= 0x00000040		//not really for shadows but for other decal uses. Additive blended. 
+	SHADOW_ADDITIVE_DECAL						= 0x00000040		//not really for shadows but for other decal uses. Additive blended.
 };
 #ifdef DEFINE_SHADOW_NAMES
-static const char* TheShadowNames[] = 
+static const char* const TheShadowNames[] =
 {
 	"SHADOW_DECAL",
 	"SHADOW_VOLUME",
@@ -73,9 +70,9 @@ class Shadow
 {
 
 public:
-		
+
 		struct	ShadowTypeInfo
-		{	
+		{
 				char	m_ShadowName[64];	//when set, overrides the default model shadow (used mostly for Decals).
 				ShadowType m_type;			//type of shadow
 				Bool	allowUpdates;			//whether to update the shadow image when object/light moves.
@@ -89,7 +86,7 @@ class Shadow
 		Shadow(void) : m_diffuse(0xffffffff), m_color(0xffffffff), m_opacity (0x000000ff), m_localAngle(0.0f) {}
 
 		///<if this is set, then no render will occur, even if enableShadowRender() is enabled. Used by Shroud.
-		void enableShadowInvisible(Bool isEnabled);	
+		void enableShadowInvisible(Bool isEnabled);
 		void enableShadowRender(Bool isEnabled);
 		Bool isRenderEnabled(void) {return m_isEnabled;}
 		Bool isInvisibleEnabled(void) {return m_isInvisibleEnabled;}
@@ -101,22 +98,22 @@ class Shadow
 
 		void setSize(Real sizeX, Real sizeY)
 		{
-			m_decalSizeX = sizeX; 
-			m_decalSizeY = sizeY; 
-			
-			if (sizeX == 0) 
+			m_decalSizeX = sizeX;
+			m_decalSizeY = sizeY;
+
+			if (sizeX == 0)
 				m_oowDecalSizeX = 0;
 			else
 				m_oowDecalSizeX = 1.0f/sizeX ;
 
-			if (sizeY == 0) 
+			if (sizeY == 0)
 				m_oowDecalSizeY = 0;
 			else
 				m_oowDecalSizeY = 1.0f/sizeY ;
 
 		};
 
-		#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+		#if defined(RTS_DEBUG)
 		virtual void getRenderCost(RenderCost & rc) const = 0;
 		#endif
 
@@ -173,7 +170,7 @@ inline void Shadow::setOpacity(Int value)
 }
 
 inline void Shadow::setColor(Color value)
-{ 
+{
 	m_color = value & 0x00ffffff;	//filter out alpha
 
 	if (m_type & SHADOW_ALPHA_DECAL)
@@ -213,6 +210,3 @@ class ProjectedShadowManager
 };
 
 extern ProjectedShadowManager *TheProjectedShadowManager;
-
-#endif // __SHADOW_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/Shell.h b/Generals/Code/GameEngine/Include/GameClient/Shell.h
index 08bb8274b0d..93dd2fbcfb3 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Shell.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Shell.h
@@ -60,10 +60,10 @@
 //
 //		- Init() [OPTIONAL]
 //			This is called as a result of a push or pop operation (see above for more info)
-//			The window layout is loaded from disk and then this Init() 
-//			method is run.  All shell layout Init() methods should show 
+//			The window layout is loaded from disk and then this Init()
+//			method is run.  All shell layout Init() methods should show
 //			the layout windows.  At this point you could move windows
-//			to starting positions, set a state that the Update() method looks at to 
+//			to starting positions, set a state that the Update() method looks at to
 //			"animate" the windows to the desired positions.
 //
 //		- Update() [OPTIONAL]
@@ -77,7 +77,7 @@
 //		- Shutdown() [REQUIRED]
 //			This is called when a layout is popped off the stack, or when a new layout
 //			is pushed on top of this one (see above for more detail on what happens
-//			during the push/pop process).  You can switch into a "shutdown" state and 
+//			during the push/pop process).  You can switch into a "shutdown" state and
 //			animate the layout appropriately in the Update() method for the layout.
 //			When shutdown is actually complete you should hide the all windows in
 //			the layout and then you are REQUIRED to notify the shell by calling
@@ -94,9 +94,6 @@
 
 #pragma once
 
-#ifndef __SHELL_H_
-#define __SHELL_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
@@ -120,11 +117,13 @@ class Shell : public SubsystemInterface
 	~Shell( void );
 
 	// Inhertited from subsystem ====================================================================
-	virtual void init( void );			
-	virtual void reset( void );			
-	virtual void update( void );		
+	virtual void init( void );
+	virtual void reset( void );
+	virtual void update( void );
 	//===============================================================================================
 
+	void recreateWindowLayouts( void );
+
 	void showShellMap(Bool useShellMap );										///< access function to turn on and off the shell map
 
 	void hide( Bool hide );																	///< show/hide all shell layouts
@@ -136,13 +135,11 @@ class Shell : public SubsystemInterface
 	void showShell( Bool runInit = TRUE );									///< init the top of stack
 	void hideShell( void );																	///< shutdown the top of stack
 	WindowLayout *top( void );															///< return top layout
-	
+
 	void shutdownComplete( WindowLayout *layout, Bool impendingPush = FALSE );	///< layout has completed shutdown
 
 	WindowLayout *findScreenByFilename( AsciiString filename );		///< find screen
-	inline Bool isShellActive( void ) { return m_isShellActive; }  ///<	Returns true if the shell is active
-	
-	inline Int getScreenCount(void) { return m_screenCount; }			///< Return the current number of screens
+	Bool isShellActive( void ) { return m_isShellActive; }  ///<	Returns true if the shell is active
 
 	void registerWithAnimateManager( GameWindow *win, AnimTypes animType, Bool needsToFinish, UnsignedInt delayMS = 0);
 	Bool isAnimFinished( void );
@@ -152,6 +149,9 @@ class Shell : public SubsystemInterface
 	void loadScheme( AsciiString name );
 	ShellMenuSchemeManager *getShellMenuSchemeManager( void ) { return m_schemeManager;	}
 
+	Int getScreenCount( void ) const { return m_screenCount; } ///< Return the current number of screens
+	WindowLayout *getScreenLayout( Int index ) const;
+
 	WindowLayout *getSaveLoadMenuLayout( void );		///< create if necessary and return layout for save load menu
 	WindowLayout *getPopupReplayLayout( void );			///< create if necessary and return layout for replay save menu
 	WindowLayout *getOptionsLayout( Bool create );	///< return layout for options menu, create if necessary and we are allowed to.
@@ -159,6 +159,9 @@ class Shell : public SubsystemInterface
 
 protected:
 
+	void construct( void );
+	void deconstruct( void );
+
 	void linkScreen( WindowLayout *screen );								///< link screen to list
 	void unlinkScreen( WindowLayout *screen );							///< remove screen from list
 
@@ -194,12 +197,9 @@ class Shell : public SubsystemInterface
 	WindowLayout *m_popupReplayLayout;											///< replay save menu layout
 	WindowLayout *m_optionsLayout;													///< options menu layout
 
-};  // end class Shell
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern Shell *TheShell;  ///< the shell external interface
-
-#endif // __SHELL_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h b/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h
index 65ca11000c9..d6fe0418607 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h
@@ -28,15 +28,12 @@
 
 #pragma once
 
-#ifndef SHELLHOOKS_H
-#define SHELLHOOKS_H
-
 //
-// This enumeration holds all the shell script hooks that we currently have, If you are going to 
-// add more, it's important to keep the enum lined up with the names in TheShellHookNames located 
+// This enumeration holds all the shell script hooks that we currently have, If you are going to
+// add more, it's important to keep the enum lined up with the names in TheShellHookNames located
 // in Scripts.cpp.
 //
-enum 
+enum
 {
 	SHELL_SCRIPT_HOOK_MAIN_MENU_CAMPAIGN_SELECTED = 0,
 	SHELL_SCRIPT_HOOK_MAIN_MENU_CAMPAIGN_HIGHLIGHTED,
@@ -77,11 +74,8 @@ enum
 	SHELL_SCRIPT_HOOK_LAN_CLOSED,
 	SHELL_SCRIPT_HOOK_LAN_ENTERED_FROM_GAME,
 
-	SHELL_SCRIPT_HOOK_TOTAL			// Keep this guy last!
+	SHELL_SCRIPT_HOOK_TOTAL
 };
 
-extern const char *TheShellHookNames[];				///< Contains a list of the text representation of the shell hooks Used in WorldBuilder and in the shell.
+extern const char *const TheShellHookNames[];				///< Contains a list of the text representation of the shell hooks Used in WorldBuilder and in the shell.
 void SignalUIInteraction(Int interaction);
-
-#endif // SHELLHOOKS_H
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h b/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h
index 5581fce8841..3219b1a87cb 100644
--- a/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h
+++ b/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h
@@ -24,12 +24,12 @@
 
 // FILE: ShellMenuScheme.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,17 +37,14 @@
 //	Filename: 	ShellMenuScheme.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __SHELL_MENU_SCHEME_H_
-#define __SHELL_MENU_SCHEME_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -69,8 +66,8 @@ class ShellMenuSchemeLine
 {
 public:
 	ShellMenuSchemeLine( void );
-	~ShellMenuSchemeLine( void );	
-	
+	~ShellMenuSchemeLine( void );
+
 	ICoord2D m_startPos;
 	ICoord2D m_endPos;
 	Int m_width;
@@ -82,7 +79,7 @@ class ShellMenuSchemeImage
 {
 public:
 	ShellMenuSchemeImage( void );
-	~ShellMenuSchemeImage( void );	
+	~ShellMenuSchemeImage( void );
 
 	AsciiString m_name;						///< Name of the image
 	ICoord2D m_position;					///< the position we'll draw it at
@@ -94,25 +91,25 @@ class ShellMenuScheme
 {
 public:
 	ShellMenuScheme( void );
-	~ShellMenuScheme( void );	
-	
+	~ShellMenuScheme( void );
+
 	void draw( void );
 	void addImage( ShellMenuSchemeImage* schemeImage );
 	void addLine( ShellMenuSchemeLine* schemeLine );
-	
+
 
 	AsciiString m_name;
 
 	typedef std::list< ShellMenuSchemeImage* > ShellMenuSchemeImageList;
 	typedef ShellMenuSchemeImageList::iterator ShellMenuSchemeImageListIt;
 	ShellMenuSchemeImageList m_imageList;
-	
+
 	typedef std::list< ShellMenuSchemeLine* > ShellMenuSchemeLineList;
 	typedef ShellMenuSchemeLineList::iterator ShellMenuSchemeLineListIt;
 	ShellMenuSchemeLineList m_lineList;
 
 
-	
+
 
 };
 
@@ -121,12 +118,12 @@ class ShellMenuSchemeManager
 public:
 	ShellMenuSchemeManager( void );
 	~ShellMenuSchemeManager( void );
-	
+
 	void init( void );
 	void update( void );
 
 	void setShellMenuScheme( AsciiString name );
-	
+
 	void draw( void );
 
 	// parse Functions for the INI file
@@ -153,5 +150,3 @@ class ShellMenuSchemeManager
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __SHELL_MENU_SCHEME_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/Statistics.h b/Generals/Code/GameEngine/Include/GameClient/Statistics.h
index 2fa6fc353cc..8031fe35fde 100644
--- a/Generals/Code/GameEngine/Include/GameClient/Statistics.h
+++ b/Generals/Code/GameEngine/Include/GameClient/Statistics.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Statistics.h 
+// FILE: Statistics.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -38,8 +38,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_STATISTICS_
-#define _H_STATISTICS_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
@@ -50,7 +48,7 @@
 
 
 // valueToRun is the value (between 0 and maxValueForVal) to test.
-// mu is designates the steepness of the curve. 
+// mu is designates the steepness of the curve.
 // The return value is a value in [-1, 1]
 extern Real MuLaw(Real valueToRun, Real maxValueForVal, Real mu);
 
@@ -62,5 +60,3 @@ extern Real Normalize(Real valueToNormalize, Real minRange, Real maxRange);
 
 // same as Normalize, except that output will be in the range [outRangeMin, outRangeMax]
 extern Real NormalizeToRange(Real valueToNormalize, Real minRange, Real maxRange, Real outRangeMin, Real outRangeMax);
-
-#endif /* _H_STATISTICS_ */
diff --git a/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h b/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h
deleted file mode 100644
index eb85c663229..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: TerrainRoads.h ///////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, December 2001
-// Desc:   Terrain road descriptions	
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __TERRAINROADS_H_
-#define __TERRAINROADS_H_
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/GameMemory.h"
-#include "Common/SubsystemInterface.h"
-
-#include "GameLogic/Module/BodyModule.h"
-
-
-// FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
-struct FieldParse;
-class AsciiString;
-
-// ------------------------------------------------------------------------------------------------
-/** Bridges have 4 towers around it that the player can attack or use to repair the bridge */
-// ------------------------------------------------------------------------------------------------
-enum BridgeTowerType CPP_11(: Int)
-{
-	BRIDGE_TOWER_FROM_LEFT = 0,
-	BRIDGE_TOWER_FROM_RIGHT,
-	BRIDGE_TOWER_TO_LEFT,
-	BRIDGE_TOWER_TO_RIGHT,
-	BRIDGE_MAX_TOWERS				///< keep this last
-};
-
-// ------------------------------------------------------------------------------------------------
-enum { MAX_BRIDGE_BODY_FX = 3 };
-
-//-------------------------------------------------------------------------------------------------
-/** Terrain road description, good for roads and bridges */
-//-------------------------------------------------------------------------------------------------
-class TerrainRoadType : public MemoryPoolObject
-{
-
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TerrainRoadType, "TerrainRoadType" )
-
-public:
-
-	TerrainRoadType( void );
-	// destructor prototypes defined by memory pool object
-
-	inline AsciiString getName( void ) { return m_name; }
-	inline AsciiString getTexture( void ) { return m_texture; }
-	inline Bool isBridge( void ) { return m_isBridge; }
-	inline UnsignedInt getID( void ) { return m_id; }
-
-	inline Real getRoadWidth( void ) { return m_roadWidth; }
-	inline Real getRoadWidthInTexture( void ) { return m_roadWidthInTexture; }
-
-	inline Real getBridgeScale( void ) { return m_bridgeScale; }
-	inline AsciiString getScaffoldObjectName( void ) { return m_scaffoldObjectName; }
-	inline AsciiString getScaffoldSupportObjectName( void ) { return m_scaffoldSupportObjectName; }
-	inline RGBColor getRadarColor( void ) { return m_radarColor; }
-	inline AsciiString getBridgeModel( void ) { return m_bridgeModelName; }
-	inline AsciiString getBridgeModelNameDamaged( void ) { return m_bridgeModelNameDamaged; }
-	inline AsciiString getBridgeModelNameReallyDamaged( void ) { return m_bridgeModelNameReallyDamaged; }
-	inline AsciiString getBridgeModelNameBroken( void ) { return m_bridgeModelNameBroken; }
-	inline AsciiString getTextureDamaged( void ) { return m_textureDamaged; }
-	inline AsciiString getTextureReallyDamaged( void ) { return m_textureReallyDamaged; }
-	inline AsciiString getTextureBroken( void ) { return m_textureBroken; }
-	inline AsciiString getTowerObjectName( BridgeTowerType tower ) { return m_towerObjectName[ tower ]; }
-	inline AsciiString getDamageToSoundString( BodyDamageType state ) { return m_damageToSoundString[ state ]; }
-	inline AsciiString getDamageToOCLString( BodyDamageType state, Int index ) { return m_damageToOCLString[ state ][ index ]; }
-	inline AsciiString getDamageToFXString( BodyDamageType state, Int index ) { return m_damageToFXString[ state ][ index ]; }
-	inline AsciiString getRepairedToSoundString( BodyDamageType state ) { return m_repairedToSoundString[ state ]; }
-	inline AsciiString getRepairedToOCLString( BodyDamageType state, Int index ) { return m_repairedToOCLString[ state ][ index ]; }
-	inline AsciiString getRepairedToFXString( BodyDamageType state, Int index ) { return m_repairedToFXString[ state ][ index ]; }
-	inline Real getTransitionEffectsHeight( void ) { return m_transitionEffectsHeight; }
-	inline Int getNumFXPerType( void ) { return m_numFXPerType; }
-
-	// friend access methods to be used by the road collection only!
-	inline void friend_setName( AsciiString name ) { m_name = name; }
-	inline void friend_setTexture( AsciiString texture ) { m_texture = texture; }
-	inline void friend_setBridge( Bool isBridge ) { m_isBridge = isBridge; }
-	inline void friend_setID( UnsignedInt id ) { m_id = id; }							
-	inline void friend_setNext( TerrainRoadType *next ) { m_next = next; }
-	inline TerrainRoadType *friend_getNext( void ) { return m_next; }			
-	inline void friend_setRoadWidth( Real width ) { m_roadWidth = width; }	
-	inline void friend_setRoadWidthInTexture( Real width ) { m_roadWidthInTexture = width; }
-	inline void friend_setBridgeScale( Real scale ) { m_bridgeScale = scale; }
-	inline void friend_setScaffoldObjectName( AsciiString name ) { m_scaffoldObjectName = name; }
-	inline void friend_setScaffoldSupportObjectName( AsciiString name ) { m_scaffoldSupportObjectName = name; }
-	inline void friend_setBridgeModelName( AsciiString name ) { m_bridgeModelName = name; }
-	inline void friend_setBridgeModelNameDamaged( AsciiString name ) { m_bridgeModelNameDamaged = name; }
-	inline void friend_setBridgeModelNameReallyDamaged( AsciiString name ) { m_bridgeModelNameReallyDamaged = name; }
-	inline void friend_setBridgeModelNameBroken( AsciiString name ) { m_bridgeModelNameBroken = name; }
-	inline void friend_setTextureDamaged( AsciiString texture ) { m_textureDamaged = texture; }
-	inline void friend_setTextureReallyDamaged( AsciiString texture ) { m_textureReallyDamaged = texture; }
-	inline void friend_setTextureBroken( AsciiString texture ) { m_textureBroken = texture; }
-	inline void friend_setTowerObjectName( BridgeTowerType tower, AsciiString name ) { m_towerObjectName[ tower ] = name; }
-	inline void friend_setDamageToSoundString( BodyDamageType state, AsciiString s ) { m_damageToSoundString[ state ] = s; }
-	inline void friend_setDamageToOCLString( BodyDamageType state, Int index, AsciiString s ) { m_damageToOCLString[ state ][ index ] = s; }
-	inline void friend_setDamageToFXString( BodyDamageType state, Int index, AsciiString s ) { m_damageToFXString[ state ][ index ] = s; }
-	inline void friend_setRepairedToSoundString( BodyDamageType state, AsciiString s ) { m_repairedToSoundString[ state ] = s; }
-	inline void friend_setRepairedToOCLString( BodyDamageType state, Int index, AsciiString s ) { m_repairedToOCLString[ state ][ index ] = s; }
-	inline void friend_setRepairedToFXString( BodyDamageType state, Int index, AsciiString s ) { m_repairedToFXString[ state ][ index ] = s; }
-	inline void friend_setTransitionEffectsHeight( Real height ) { m_transitionEffectsHeight = height; }
-	inline void friend_setNumFXPerType( Int num ) { m_numFXPerType = num; }
-
-	/// get the parsing table for INI
-	const FieldParse *getRoadFieldParse( void ) { return m_terrainRoadFieldParseTable; }
-	const FieldParse *getBridgeFieldParse( void ) { return m_terrainBridgeFieldParseTable; }
-
-protected:
-
-	AsciiString m_name;								///< entry name
-	Bool m_isBridge;									///< true if entry is for a bridge
-	UnsignedInt m_id;									///< unique id
-	TerrainRoadType *m_next;					///< next in road list
-
-	// for parsing from INI
-	static const FieldParse m_terrainRoadFieldParseTable[];		///< the parse table for INI definition
-	static const FieldParse m_terrainBridgeFieldParseTable[];		///< the parse table for INI definition
-	static void parseTransitionToOCL( INI *ini, void *instance, void *store, const void *userData );
-	static void parseTransitionToFX( INI *ini, void *instance, void *store, const void *userData );
-
-	//
-	// *note* I would union the road and bridge data, but unions can't have a copy 
-	// constructor such as the AsciiString does
-	//
-
-	// road data
-	Real m_roadWidth;														///< width of road
-	Real m_roadWidthInTexture;									///< width of road in the texture
-
-	// bridge data
-	Real m_bridgeScale;													///< scale for bridge
-
-	AsciiString m_scaffoldObjectName;						///< scaffold object name
-	AsciiString m_scaffoldSupportObjectName;		///< scaffold support object name
-
-	RGBColor m_radarColor;											///< color for this bridge on the radar
-
-	AsciiString m_bridgeModelName;							///< model name for bridge
-	AsciiString m_texture;											///< texture filename
-
-	AsciiString m_bridgeModelNameDamaged;				///< model name for bridge
-	AsciiString m_textureDamaged;								///< model name for bridge
-
-	AsciiString m_bridgeModelNameReallyDamaged;	///< model name for bridge
-	AsciiString m_textureReallyDamaged;					///< model name for bridge
-
-	AsciiString m_bridgeModelNameBroken;				///< model name for bridge
-	AsciiString m_textureBroken;								///< model name for bridge
-
-	AsciiString m_towerObjectName[ BRIDGE_MAX_TOWERS ];	///< object names for the targetable towers on the bridge
-
-	//
-	// the following strings are for repair/damage transition events, what sounds to 
-	// play and a collection of OCL and FX lists to play over the bridge area
-	//
-	AsciiString m_damageToSoundString[ BODYDAMAGETYPE_COUNT ];
-	AsciiString m_damageToOCLString[ BODYDAMAGETYPE_COUNT ][ MAX_BRIDGE_BODY_FX ];
-	AsciiString m_damageToFXString[ BODYDAMAGETYPE_COUNT ][ MAX_BRIDGE_BODY_FX ];
-	AsciiString m_repairedToSoundString[ BODYDAMAGETYPE_COUNT ];
-	AsciiString m_repairedToOCLString[ BODYDAMAGETYPE_COUNT ][ MAX_BRIDGE_BODY_FX ];
-	AsciiString m_repairedToFXString[ BODYDAMAGETYPE_COUNT ][ MAX_BRIDGE_BODY_FX ];
-	Real m_transitionEffectsHeight;
-	Int m_numFXPerType; ///< for *each* fx/ocl we will make this many of them on the bridge area
-
-};
-
-//-------------------------------------------------------------------------------------------------
-/** Collection of all roads and bridges */
-//-------------------------------------------------------------------------------------------------
-class TerrainRoadCollection : public SubsystemInterface
-{
-
-public:
-	
-	TerrainRoadCollection( void );
-	~TerrainRoadCollection( void );
-
-	void init() { }
-	void reset() { }
-	void update() { }
-
-	TerrainRoadType *findRoad( AsciiString name );		///< find road with matching name
-	TerrainRoadType *newRoad( AsciiString name );			///< allocate new road, assing name, and link to list
-	TerrainRoadType *firstRoad( void ) { return m_roadList; }			///< return first road
-	TerrainRoadType *nextRoad( TerrainRoadType *road );						///< get next road
-
-	TerrainRoadType *findBridge( AsciiString name );	///< find bridge with matching name
-	TerrainRoadType *newBridge( AsciiString name );		///< allocate new bridge, assign name, and link
-	TerrainRoadType *firstBridge( void ) { return m_bridgeList; } ///< return first bridge
-	TerrainRoadType *nextBridge( TerrainRoadType *bridge );				///< get next bridge
-
-	TerrainRoadType *findRoadOrBridge( AsciiString name );				///< search roads and bridges
-
-protected:
-
-	TerrainRoadType *m_roadList;				///< list of available roads
-	TerrainRoadType *m_bridgeList;			///< list of available bridges
-	static UnsignedInt m_idCounter;			///< unique id counter when allocating roads/bridges
-
-};
-
-// EXTERNAL ////////////////////////////////////////////////////////////////////////////////////////
-extern TerrainRoadCollection *TheTerrainRoads;
-
-#endif // __TERRAINROADS_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h b/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h
deleted file mode 100644
index d3db11d4b3b..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: TerrainVisual.h //////////////////////////////////////////////////////////////////////////
-// Interface for visual representation of terrain on the client
-// Author: Colin Day, April 2001
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __TERRAINVISUAL_H_
-#define __TERRAINVISUAL_H_
-
-#include "Common/Terrain.h"
-#include "Common/Snapshot.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-class TerrainType;
-class WaterHandle;
-class Matrix3D;
-class Object;
-class Drawable;
-
-//-------------------------------------------------------------------------------------------------
-/** LOD values for terrain, keep this in sync with TerrainLODNames[] */
-//-------------------------------------------------------------------------------------------------
-typedef enum _TerrainLOD CPP_11(: Int)
-{ 
-	TERRAIN_LOD_INVALID								= 0,
-	TERRAIN_LOD_MIN										= 1,  // note that this is less than max
-	TERRAIN_LOD_STRETCH_NO_CLOUDS			= 2,
-	TERRAIN_LOD_HALF_CLOUDS						= 3,
-	TERRAIN_LOD_NO_CLOUDS							= 4,
-	TERRAIN_LOD_STRETCH_CLOUDS				= 5,
-	TERRAIN_LOD_NO_WATER							= 6,
-	TERRAIN_LOD_MAX										= 7,  // note that this is larger than min
-	TERRAIN_LOD_AUTOMATIC							= 8,
-	TERRAIN_LOD_DISABLE								= 9,
-
-	TERRAIN_LOD_NUM_TYPES								// keep this last
-
-} TerrainLOD;
-#ifdef DEFINE_TERRAIN_LOD_NAMES
-static const char * TerrainLODNames[] = 
-{
-	"NONE",
-	"MIN",
-	"STRETCH_NO_CLOUDS",
-	"HALF_CLOUDS",
-	"NO_CLOUDS",
-	"STRETCH_CLOUDS",
-	"NO_WATER",
-	"MAX",
-	"AUTOMATIC",
-	"DISABLE",
-
-	NULL
-};
-#endif  // end DEFINE_TERRAIN_LOD_NAMES
-
-//-------------------------------------------------------------------------------------------------
-/** Device independent implementation for visual terrain */
-//-------------------------------------------------------------------------------------------------
-class TerrainVisual : public Snapshot,
-											public SubsystemInterface
-{
-
-public:
-
-	enum {NumSkyboxTextures = 5};
-
-	TerrainVisual();
-	virtual ~TerrainVisual();
-
-	virtual void init( void );
-	virtual void reset( void );
-	virtual void update( void );
-
-	virtual Bool load( AsciiString filename );
-
-	/// get color of texture on the terrain at location specified
-	virtual void getTerrainColorAt( Real x, Real y, RGBColor *pColor ) = 0;
-
-	/// get the terrain tile type at the world location in the (x,y) plane ignoring Z
-	virtual TerrainType *getTerrainTile( Real x, Real y ) = 0;
-
-	/** intersect the ray with the terrain, if a hit occurs TRUE is returned
-	and the result point on the terrain is returned in "result" */
-	virtual Bool intersectTerrain( Coord3D *rayStart, 
-																 Coord3D *rayEnd, 
-																 Coord3D *result ) { return FALSE; }
-
-	//
-	// water methods
-	//
-	virtual void enableWaterGrid( Bool enable ) = 0;
-	/// set min/max height values allowed in water grid pointed to by waterTable
-	virtual void setWaterGridHeightClamps( const WaterHandle *waterTable, Real minZ, Real maxZ ) = 0;
-	/// adjust fallof parameters for grid change method
-	virtual void setWaterAttenuationFactors( const WaterHandle *waterTable, Real a, Real b, Real c, Real range ) = 0;
-	/// set the water table position and orientation in world space
-	virtual void setWaterTransform( const WaterHandle *waterTable, Real angle, Real x, Real y, Real z ) = 0;
-	virtual void setWaterTransform( const Matrix3D *transform ) = 0;
-	/// get water transform parameters
-	virtual void getWaterTransform( const WaterHandle *waterTable, Matrix3D *transform ) = 0;
-	/// water grid resolution spacing
-	virtual void setWaterGridResolution( const WaterHandle *waterTable, Real gridCellsX, Real gridCellsY, Real cellSize ) = 0;
-	virtual void getWaterGridResolution( const WaterHandle *waterTable, Real *gridCellsX, Real *gridCellsY, Real *cellSize ) = 0;
-	/// adjust the water grid in world coords by the delta
-	virtual void changeWaterHeight( Real x, Real y, Real delta ) = 0;
-	/// adjust the velocity at a water grid point corresponding to the world x,y
-	virtual void addWaterVelocity( Real worldX, Real worldY, Real velocity, Real preferredHeight ) = 0;
-	/// get height of water grid at specified position
-	virtual Bool getWaterGridHeight( Real worldX, Real worldY, Real *height) = 0;
-
-	/// set detail of terrain tracks.
-	virtual void setTerrainTracksDetail(void)=0;
-	virtual void setShoreLineDetail(void)=0;
-		
-	/// Add a bib for an object at location.  
-	virtual void addFactionBib(Object *factionBuilding, Bool highlight, Real extra = 0)=0;
-	/// Remove a bib.  
-	virtual void removeFactionBib(Object *factionBuilding)=0;
-
-	/// Add a bib for a drawable at location.  
-	virtual void addFactionBibDrawable(Drawable *factionBuilding, Bool highlight, Real extra = 0)=0;
-	/// Remove a bib.  
-	virtual void removeFactionBibDrawable(Drawable *factionBuilding)=0;
-
-	virtual void removeAllBibs(void)=0;
-	virtual void removeBibHighlighting(void)=0;
-
-
-	//
-	// Modify height.
-	//
-	virtual void setRawMapHeight(const ICoord2D *gridPos, Int height)=0;
-	
-	/// Replace the skybox texture
-	virtual void replaceSkyboxTextures(const AsciiString *oldTexName[NumSkyboxTextures], const AsciiString *newTexName[NumSkyboxTextures])=0;
-
-protected:
-
-	// snapshot methods
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-	AsciiString m_filenameString;							///< file with terrain data
-
-};  // end class TerrainVisual
-
-// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
-extern TerrainVisual *TheTerrainVisual;  ///< singleton extern
-
-#endif  // end __TERRAINVISUAL_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/VideoPlayer.h b/Generals/Code/GameEngine/Include/GameClient/VideoPlayer.h
deleted file mode 100644
index 1d9a365a133..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/VideoPlayer.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    Generals
-//
-// File name:  GameClient/VideoPlayer.h
-//
-// Created:    10/22/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __GAMECLIENT_VIDEOPLAYER_H_
-#define __GAMECLIENT_VIDEOPLAYER_H_
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include <Lib/BaseType.h>
-#include "WWMath/rect.h"
-#include "Common/SubsystemInterface.h"
-#include "Common/AsciiString.h"
-#include "Common/INI.h"
-#include "Common/STLTypedefs.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-struct Video;
-class VideoPlayer;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-typedef std::vector<Video>	VecVideo;
-typedef std::vector<Video>::iterator	VecVideoIt;
-
-//----------------------------------------------------------------------------
-//           Video (Struct)                                                   
-//----------------------------------------------------------------------------
-struct Video
-{
-	AsciiString m_filename;																	///< should be filled with the filename on disk
-	AsciiString m_internalName;															///< should be our internal reference name
-	AsciiString m_commentForWB;
-};
-
-//===============================
-// VideoBuffer
-//===============================
-/**
-  * Video buffer interface class. The VideoPlayer uses this buffer abstraction
-	* in order to be able to render a video stream.
-	*/
-//===============================
-
-class VideoBuffer
-{
-	public:
-
-	// Enumeration of buffer pixel formats
-		enum Type
-		{
-			TYPE_UNKNOWN,
-			TYPE_R8G8B8,
-			TYPE_X8R8G8B8,
-			TYPE_R5G6B5,
-			TYPE_X1R5G5B5,
-			NUM_TYPES
-		};
-
-
-	protected:
-
-		UnsignedInt m_xPos;					///< X pixel buffer offset
-		UnsignedInt m_yPos;					///< Y pixel buffer offset
-		UnsignedInt m_width;				///< Buffer visible width
-		UnsignedInt m_height;				///< Buffer height
-		UnsignedInt m_textureWidth;	///< Buffer visible width
-		UnsignedInt m_textureHeight;///< Buffer height
-		UnsignedInt m_pitch;				///< buffer pitch
-
-		Type m_format;			///< buffer pixel format
-
-	public:
-
-		VideoBuffer( Type format );
-		virtual ~VideoBuffer() {};
-
-		virtual	Bool		allocate( UnsignedInt width, UnsignedInt Height ) = 0; ///< Allocate buffer
-		virtual void		free( void ) = 0;			///< Free the buffer
-		virtual	void*		lock( void ) = 0;			///< Returns memory pointer to start of buffer
-		virtual void		unlock( void ) = 0;		///< Release buffer
-		virtual Bool		valid( void ) = 0;		///< Is the buffer valid to use
-
-		UnsignedInt			xPos( void ) { return m_xPos;};///< X pixel offset to draw into
-		UnsignedInt			yPos( void ) { return m_yPos;};///< Y pixel offset to draw into
-		void		setPos( UnsignedInt x, UnsignedInt y ) { m_xPos = x; m_yPos = y;};	///< Set the x and y buffer offset
-		UnsignedInt			width( void ) { return m_width;};		///< Returns pixel width of visible texture
-		UnsignedInt			height( void ) { return m_height;};	///< Returns pixel height of visible texture
-		UnsignedInt			textureWidth( void ) { return m_textureWidth;};		///< Returns pixel width of texture
-		UnsignedInt			textureHeight( void ) { return m_textureHeight;};	///< Returns pixel height of texture
-		UnsignedInt			pitch( void ) { return m_pitch;};		///< Returns buffer pitch in bytes
-		Type		format( void ) { return m_format;};	///< Returns buffer pixel format
-
-		RectClass				Rect( Real x1, Real y1, Real x2, Real y2 );
-
-};
-
-
-//===============================
-// VideoStreamInterface
-//===============================
-/**
-  * Video stream interface class. 
-	*/
-//===============================
-
-class VideoStreamInterface
-{
-	friend class VideoPlayerInterface;
-
-	protected:
-
-		virtual ~VideoStreamInterface(){};								///< only VideoPlayerInterfaces can create these
-
-	public:
-
-
-		virtual	VideoStreamInterface* next( void ) = 0;		///< Returns next open stream
-		virtual void update( void ) = 0;									///< Update stream
-		virtual void close( void ) = 0;										///< Close and free stream
-																											
-		virtual Bool	isFrameReady( void ) = 0;						///< Is the frame ready to be displayed
-		virtual void	frameDecompress( void ) = 0;				///< Render current frame in to buffer
-		virtual void	frameRender( VideoBuffer *buffer ) = 0; ///< Render current frame in to buffer
-		virtual void	frameNext( void ) = 0;							///< Advance to next frame
-		virtual Int		frameIndex( void ) = 0;							///< Returns zero based index of current frame
-		virtual Int		frameCount( void ) = 0;							///< Returns the total number of frames in the stream
-		virtual void	frameGoto( Int index ) = 0;					///< Go to the spcified frame index
-		virtual Int		height( void ) = 0;									///< Return the height of the video
-		virtual Int		width( void ) = 0;									///< Return the width of the video
-
-};
-
-//===============================
-// VideoStream 
-//===============================
-
-
-
-class VideoStream : public VideoStreamInterface
-{
-	friend class VideoPlayer;
-
-	protected:
-
-		VideoPlayer							*m_player;								///< Video player we were created with
-		VideoStream							*m_next;									///< Next open stream
-																											
-		VideoStream();																		///< only VideoPlayer can create these
-		virtual ~VideoStream();
-
-	public:
-
- 		virtual	VideoStreamInterface* next( void );				///< Returns next open stream
-		virtual void update( void );											///< Update stream
-		virtual void close( void );												///< Close and free stream
-																											
-		virtual Bool	isFrameReady( void );								///< Is the frame ready to be displayed
-		virtual void	frameDecompress( void );						///< Render current frame in to buffer
-		virtual void	frameRender( VideoBuffer *buffer ); ///< Render current frame in to buffer
-		virtual void	frameNext( void );									///< Advance to next frame
-		virtual Int		frameIndex( void );									///< Returns zero based index of current frame
-		virtual Int		frameCount( void );									///< Returns the total number of frames in the stream
-		virtual void	frameGoto( Int index );							///< Go to the spcified frame index
-		virtual Int		height( void );											///< Return the height of the video
-		virtual Int		width( void );											///< Return the width of the video
-
-
-};
-
-//===============================
-// VideoPlayerInterface 
-//===============================
-/**
-  *	Interface for video playback.
-	*/
-//===============================
-
-class VideoPlayerInterface : public SubsystemInterface
-{
-
-	public:
-
-		virtual void	init( void ) = 0;														///< Initialize video playback
-		virtual void	reset( void ) = 0;													///< Reset video playback
-		virtual void	update( void ) = 0;													///< Services all video tasks. Should be called frequently
-																															
-		virtual void	deinit( void ) = 0;													///< Close down player
-																															
-		virtual				~VideoPlayerInterface() {};
-																															
-		// service																								
-		virtual void	loseFocus( void ) = 0;											///< Should be called when application loses focus
-		virtual void	regainFocus( void ) = 0;										///< Should be called when application regains focus
-
-		virtual VideoStreamInterface*	open( AsciiString movieTitle ) = 0;	///< Open video file for playback
-		virtual VideoStreamInterface*	load( AsciiString movieTitle ) = 0;	///< Load video file in to memory for playback
-
-		virtual VideoStreamInterface* firstStream( void ) = 0;		///< Return the first open/loaded video stream
-
-		virtual void	closeAllStreams( void ) = 0;								///< Close all open streams
-		virtual void	addVideo( Video* videoToAdd ) = 0;					///< Add a video to the list of videos we can play
-		virtual void	removeVideo( Video* videoToRemove ) = 0;		///< Remove a video to the list of videos we can play
-		virtual Int getNumVideos( void ) = 0;											///< Retrieve info about the number of videos currently listed
-		virtual const Video* getVideo( AsciiString movieTitle ) = 0;	///< Retrieve info about a movie based on internal name
-		virtual const Video* getVideo( Int index ) = 0;						///< Retrieve info about a movie based on index
-
-		virtual const FieldParse *getFieldParse( void ) const = 0;		///< Return the field parse info
-
-		virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) = 0;		///< Notify the video player that they can now ask for an audio handle, or they need to give theirs up.
-};
-
-
-//===============================
-// VideoPlayer
-//===============================
-/**
-  *	Common video playback code.
-	*/
-//===============================
-
-class VideoPlayer : public VideoPlayerInterface
-{
-	protected:
-		VecVideo mVideosAvailableForPlay;
-		VideoStream		*m_firstStream;
-		static const FieldParse m_videoFieldParseTable[];
-
-	public:
-
-		// subsytem requirements
-		virtual void	init( void );														///< Initialize video playback code
-		virtual void	reset( void );													///< Reset video playback
-		virtual void	update( void );													///< Services all audio tasks. Should be called frequently
-																													
-		virtual void	deinit( void );													///< Close down player
-																													
-																													
-		VideoPlayer();																				
-		~VideoPlayer();																				
-																													
-		// service																						
-		virtual void	loseFocus( void );											///< Should be called when application loses focus
-		virtual void	regainFocus( void );										///< Should be called when application regains focus
-																												
-		virtual VideoStreamInterface*	open( AsciiString movieTitle );	///< Open video file for playback
-		virtual VideoStreamInterface*	load( AsciiString movieTitle );	///< Load video file in to memory for playback
-		virtual VideoStreamInterface* firstStream( void );		///< Return the first open/loaded video stream
-		virtual void	closeAllStreams( void );								///< Close all open streams
-
-		virtual void	addVideo( Video* videoToAdd );					///< Add a video to the list of videos we can play
-		virtual void	removeVideo( Video* videoToRemove );		///< Remove a video to the list of videos we can play
-		virtual Int getNumVideos( void );											///< Retrieve info about the number of videos currently listed
-		virtual const Video* getVideo( AsciiString movieTitle );	///< Retrieve info about a movie based on internal name
-		virtual const Video* getVideo( Int index );						///< Retrieve info about a movie based on index
-		virtual const FieldParse *getFieldParse( void ) const { return m_videoFieldParseTable; }		///< Return the field parse info
-
-		virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) { }
-
-		// Implementation specific
-		void remove( VideoStream *stream );										///< remove stream from active list
-		
-};
-
-extern VideoPlayerInterface *TheVideoPlayer;
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-#endif // __GAMECLIENT_VIDEOPLAYER_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/View.h b/Generals/Code/GameEngine/Include/GameClient/View.h
deleted file mode 100644
index dbe6d9270a1..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/View.h
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// View.h /////////////////////////////////////////////////////////////////////////////////////////
-// A "view", or window, into the World
-// Author: Michael S. Booth, February 2001
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef _VIEW_H_
-#define _VIEW_H_
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/GameType.h"
-#include "Common/Snapshot.h"
-#include "Lib/BaseType.h"
-#include "WW3D2/coltype.h"			///< we don't generally do this, but we need the W3D collision types
-
-#define DEFAULT_VIEW_WIDTH 640
-#define DEFAULT_VIEW_HEIGHT 480
-#define DEFAULT_VIEW_ORIGIN_X 0
-#define DEFAULT_VIEW_ORIGIN_Y 0
-
-// FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
-class Drawable;
-class ViewLocation;
-class Thing;
-class Waypoint;
-class LookAtTranslator;
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-enum PickType CPP_11(: Int)
-{
-	PICK_TYPE_TERRAIN						= COLL_TYPE_0,
-	PICK_TYPE_SELECTABLE				= COLL_TYPE_1,
-	PICK_TYPE_SHRUBBERY					= COLL_TYPE_2,
-	PICK_TYPE_MINES							= COLL_TYPE_3,	// mines aren't normally selectable, but workers/dozers need to
-	PICK_TYPE_FORCEATTACKABLE		= COLL_TYPE_4,
-	PICK_TYPE_ALL_DRAWABLES			= (PICK_TYPE_SELECTABLE | PICK_TYPE_SHRUBBERY | PICK_TYPE_MINES | PICK_TYPE_FORCEATTACKABLE)
-};
-
-// ------------------------------------------------------------------------------------------------
-/** The implementation of common view functionality. */
-// ------------------------------------------------------------------------------------------------
-class View : public Snapshot
-{
-
-public:
-
-	/// Add an impulse force to shake the camera
-	enum CameraShakeType 
-	{ 
-		SHAKE_SUBTLE = 0, 
-		SHAKE_NORMAL, 
-		SHAKE_STRONG, 
-		SHAKE_SEVERE, 
-		SHAKE_CINE_EXTREME,		//Added for cinematics ONLY
-		SHAKE_CINE_INSANE,		//Added for cinematics ONLY
-		SHAKE_COUNT 
-	};
-
-  // Return values for worldToScreenTriReturn
-  enum WorldToScreenReturn CPP_11(: Int)
-  {
-    WTS_INSIDE_FRUSTUM = 0, // On the screen (inside frustum of camera)
-    WTS_OUTSIDE_FRUSTUM,    // Return is valid but off the screen (outside frustum of camera)
-    WTS_INVALID,            // No transform possible
-
-    WTS_COUNT
-  };
-
-public:
-
-	View( void );
-	virtual ~View( void );
-
-	virtual void init( void );
-	virtual void reset( void );
-	virtual UnsignedInt getID( void ) { return m_id; }
-
-	virtual void setZoomLimited( Bool limit ) { m_zoomLimited = limit; }			///< limit the zoom height
-	virtual Bool isZoomLimited( void ) { return m_zoomLimited; }							///< get status of zoom limit
-
-	/// pick drawable given the screen pixel coords.  If force attack, picks bridges as well.
-	virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ) = 0;
-
-	/// all drawables in the 2D screen region will call the 'callback'
-	virtual Int iterateDrawablesInRegion( IRegion2D *screenRegion,
-																				Bool (*callback)( Drawable *draw, void *userData ),
-																				void *userData ) = 0;
-
-	/** project the 4 corners of this view into the world and return each point as a parameter,
-			the world points are at the requested Z */
-	virtual void getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
-																							Coord3D *bottomLeft, Coord3D *bottomRight,
-																							Real z );
-
-	virtual void setWidth( Int width ) { m_width = width; }
-	virtual Int getWidth( void ) { return m_width; }
-	virtual void setHeight( Int height ) { m_height = height; }
-	virtual Int getHeight( void ) { return m_height; }
-	virtual void setOrigin( Int x, Int y) { m_originX=x; m_originY=y;}				///< Sets location of top-left view corner on display 
-	virtual void getOrigin( Int *x, Int *y) { *x=m_originX; *y=m_originY;}			///< Return location of top-left view corner on display
-
-	virtual void forceRedraw() = 0;
-
-	virtual void lookAt( const Coord3D *o );														///< Center the view on the given coordinate
-	virtual void initHeightForMap( void ) {};														///<  Init the camera height for the map at the current position.
-	virtual void scrollBy( Coord2D *delta );														///< Shift the view by the given delta
-
-	virtual void moveCameraTo(const Coord3D *o, Int frames, Int shutter, Bool orient) { lookAt( o ); }
-	virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, Bool orient) { }
-	virtual Bool isCameraMovementFinished( void ) { return TRUE; }
-	virtual void cameraModFinalZoom(Real finalZoom){};			 ///< Final zoom for current camera movement.
-	virtual void cameraModRollingAverage(Int framesToAverage){}; ///< Number of frames to average movement for current camera movement.
-	virtual void cameraModFinalTimeMultiplier(Int finalMultiplier){}; ///< Final time multiplier for current camera movement.
-	virtual void cameraModFinalPitch(Real finalPitch){};		 ///< Final pitch for current camera movement.
-	virtual void cameraModFreezeTime(void){ }					///< Freezes time during the next camera movement.
-	virtual void cameraModFreezeAngle(void){ }					///< Freezes time during the next camera movement.
-	virtual void cameraModLookToward(Coord3D *pLoc){}			///< Sets a look at point during camera movement.
-	virtual void cameraModFinalLookToward(Coord3D *pLoc){}			///< Sets a look at point during camera movement.
-	virtual void cameraModFinalMoveTo(Coord3D *pLoc){ };			///< Sets a final move to.
-
-	virtual enum FilterModes getViewFilterMode(void) {return (enum FilterModes)0;}			///< Turns on viewport special effect (black & white mode)
-	virtual enum FilterTypes getViewFilterType(void) {return (enum FilterTypes)0;}			///< Turns on viewport special effect (black & white mode)
-	virtual Bool setViewFilterMode(enum FilterModes filterMode) { return FALSE; }			///< Turns on viewport special effect (black & white mode)
-	virtual void setViewFilterPos(const Coord3D *pos) { };			///<  Passes a position to the special effect filter.
-	virtual Bool setViewFilter(	enum FilterTypes filter) { return FALSE;}			///< Turns on viewport special effect (black & white mode)
-
-	virtual void setFadeParameters(Int fadeFrames, Int direction) { };
-	virtual void set3DWireFrameMode(Bool enable) { };
-
- 	virtual void resetCamera(const Coord3D *location, Int frames) {}; ///< Move camera to location, and reset to default angle & zoom.
- 	virtual void rotateCamera(Real rotations, Int frames) {}; ///< Rotate camera about current viewpoint.
-	virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds) {};	///< Rotate camera to face an object, and hold on it
-	virtual void rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds) {};	///< Rotate camera to face a location.
-	virtual Bool isTimeFrozen(void){ return false;}					///< Freezes time during the next camera movement.
-	virtual Int	 getTimeMultiplier(void) {return 1;};				///< Get the time multiplier.
-	virtual void setTimeMultiplier(Int multiple) {}; ///< Set the time multiplier.
-	virtual void setDefaultView(Real pitch, Real angle, Real maxHeight) {};
-	virtual void zoomCamera( Real finalZoom, Int milliseconds ) {};
-	virtual void pitchCamera( Real finalPitch, Int milliseconds ) {};
-
-	virtual void setAngle( Real angle );																///< Rotate the view around the up axis to the given angle
-	virtual Real getAngle( void ) { return m_angle; }
-	virtual void setPitch( Real angle );																///< Rotate the view around the horizontal axis to the given angle
-	virtual Real getPitch( void ) { return m_pitchAngle; }							///< Return current camera pitch
-	virtual void setAngleAndPitchToDefault( void );											///< Set the view angle back to default 
-	virtual void getPosition(Coord3D *pos)	{ *pos=m_pos;}							///< Returns position camera is looking at (z will be zero)
-
-	virtual const Coord3D& get3DCameraPosition() const = 0;							///< Returns the actual camera position
-
-	virtual Real getZoom() { return m_zoom; }
-	virtual void setZoom(Real z) { }
-	virtual Real getHeightAboveGround() { return m_heightAboveGround; }
-	virtual void setHeightAboveGround(Real z) { m_heightAboveGround = z; }
-	virtual void zoomIn( void );																				///< Zoom in, closer to the ground, limit to min
-	virtual void zoomOut( void );																				///< Zoom out, farther away from the ground, limit to max
-	virtual void setZoomToDefault( void ) { }														///< Set zoom to default value
-	virtual Real getMaxZoom( void ) { return m_maxZoom; }								///< return max zoom value
-	virtual void setOkToAdjustHeight( Bool val ) { m_okToAdjustHeight = val; }	///< Set this to adjust camera height
-
-	// for debugging
-	virtual Real getTerrainHeightUnderCamera() { return m_terrainHeightUnderCamera; }
-	virtual void setTerrainHeightUnderCamera(Real z) { m_terrainHeightUnderCamera = z; }
-	virtual Real getCurrentHeightAboveGround() { return m_currentHeightAboveGround; }
-	virtual void setCurrentHeightAboveGround(Real z) { m_currentHeightAboveGround = z; }
-
-	virtual void setFieldOfView( Real angle ) { m_FOV = angle; }				///< Set the horizontal field of view angle
-	virtual Real getFieldOfView( void ) { return m_FOV; }								///< Get the horizontal field of view angle
-
-  Bool worldToScreen( const Coord3D *w, ICoord2D *s ) { return worldToScreenTriReturn( w, s ) == WTS_INSIDE_FRUSTUM; }	///< Transform world coordinate "w" into screen coordinate "s"
-  virtual WorldToScreenReturn worldToScreenTriReturn(const Coord3D *w, ICoord2D *s ) = 0; ///< Like worldToScreen(), but with a more informative return value
-	virtual void screenToWorld( const ICoord2D *s, Coord3D *w ) = 0;										///< Transform screen coordinate "s" into world coordinate "w"
-	virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world ) = 0;  ///< transform screen coord to a point on the 3D terrain
-	virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) = 0;  ///< transform screen point to world point at the specified world Z value
-
-	virtual void getLocation ( ViewLocation *location );								///< write the view's current location in to the view location object
-	virtual void setLocation ( const ViewLocation *location );					///< set the view's current location from to the view location object
-
-
-	virtual void drawView( void ) = 0;															///< Render the world visible in this view.
-	virtual void updateView(void) = 0;					///<called once per frame to determine the final camera and object transforms
-
-
-
-
-	virtual ObjectID getCameraLock() const { return m_cameraLock; }
-	virtual void setCameraLock(ObjectID id) { m_cameraLock = id; m_lockDist = 0.0f; m_lockType = LOCK_FOLLOW; }
-	virtual void snapToCameraLock( void ) { m_snapImmediate = TRUE; }
-	enum CameraLockType { LOCK_FOLLOW, LOCK_TETHER };
-	virtual void setSnapMode( CameraLockType lockType, Real lockDist ) { m_lockType = lockType; m_lockDist = lockDist; }
-
-	virtual Drawable *getCameraLockDrawable() const { return m_cameraLockDrawable; }
-	virtual void setCameraLockDrawable(Drawable *drawable) { m_cameraLockDrawable = drawable; m_lockDist = 0.0f; }
-
-	virtual void setMouseLock( Bool mouseLocked ) { m_mouseLocked = mouseLocked; }					///< lock/unlock the mouse input to the tactical view
-	virtual Bool isMouseLocked( void ) { return m_mouseLocked; }														///< is the mouse input locked to the tactical view?
-
-	/// Add an impulse force to shake the camera
-	virtual void shake( const Coord3D *epicenter, CameraShakeType shakeType ) { };
-
-	virtual Real getFXPitch( void ) const { return 1.0f; }					///< returns the FX pitch angle
-	virtual void forceCameraConstraintRecalc(void) {}
-	virtual void setGuardBandBias( const Coord2D *gb ) = 0;
-
-protected:
-
-	friend class Display;
-
-	// snapshot methods
-	virtual void crc( Xfer *xfer ) { }
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void ) { }
-
-	void setPosition( const Coord3D *pos ) { m_pos = *pos; }					
-	const Coord3D *getPosition( void ) const { return &m_pos; }					
-
-	virtual View *prependViewToList( View *list );							///< Prepend this view to the given list, return the new list
-	virtual View *getNextView( void ) { return m_next; }				///< Return next view in the set
-
-
-	// **********************************************************************************************
-
-	View *m_next;																								///< List links used by the Display class
-
-	UnsignedInt m_id;																						///< Rhe ID of this view
-	static UnsignedInt m_idNext;																///< Used for allocating view ID's for all views
-
-	Coord3D m_pos;																							///< Position of this view, in world coordinates
-	Int m_width, m_height;																			///< Dimensions of the view
-	Int m_originX, m_originY;																		///< Location of top/left view corner
-
-	Real m_angle;																								///< Angle at which view has been rotated about the Z axis
-	Real m_pitchAngle;																					///< Rotation of view direction around horizontal (X) axis
-
-	Real m_maxZoom;																							///< Largest zoom value (minimum actual zoom)
-	Real m_minZoom;																							///< Smallest zoom value (maximum actual zoom)
-	Real m_maxHeightAboveGround;
-	Real m_minHeightAboveGround;
-	Real m_zoom;																								///< Current zoom value
-	Real m_heightAboveGround;																		///< User's desired height above ground
-	Bool m_zoomLimited;																					///< Camera restricted in zoom height
-	Real m_defaultAngle;
-	Real m_defaultPitchAngle;
-	Real m_currentHeightAboveGround;														///< Cached value for debugging
-	Real m_terrainHeightUnderCamera;														///< Cached value for debugging
-
-	ObjectID m_cameraLock;																			///< if nonzero, id of object that the camera should follow
-	Drawable *m_cameraLockDrawable;															///< if nonzero, drawble of object that camera should follow.
-	CameraLockType m_lockType;																	///< are we following or just tethering?
-	Real m_lockDist;																						///< how far can we be when tethered?
-
-	Real m_FOV;																									///< the current field of view angle
-	Bool m_mouseLocked;																					///< is the mouse input locked to the tactical view?
-
-	Bool m_okToAdjustHeight;																		///< Should we attempt to adjust camera height?
-	Bool m_snapImmediate;																				///< Should we immediately snap to the object we're following?
-
-	Coord2D m_guardBandBias; ///< Exttra beefy margins so huge thins can stay "on-screen"
-
-};
-
-// ------------------------------------------------------------------------------------------------
-/** Used to save and restore view position */
-// ------------------------------------------------------------------------------------------------
-class ViewLocation
-{
-	friend class View;
-	friend class LookAtTranslator;
-
-	protected:
-		Bool m_valid;																								///< Is this location valid
-		Coord3D m_pos;																							///< Position of this view, in world coordinates
-		Real m_angle;																								///< Angle at which view has been rotated about the Z axis
-		Real m_pitch;																								///< Angle at which view has been rotated about the Y axis
-		Real m_zoom;																								///< Current zoom value
-
-	public:
-
-		ViewLocation() 
-		{ 
-			m_valid = FALSE;
-			//Added By Sadullah Nader
-			//Initialization(s) inserted
-			m_pos.zero();
-			m_angle = m_pitch = m_zoom = 0.0;
-			//
-		}
-		
-		const Coord3D& getPosition() const { return m_pos; }
-		Bool isValid() const { return m_valid; }
-		Real getAngle() const { return m_angle; }
-		Real getPitch() const { return m_pitch; }
-		Real getZoom() const { return m_zoom; }
-
-		void init(Real x, Real y, Real z, Real angle, Real pitch, Real zoom)
-		{
-			m_pos.x = x;
-			m_pos.y = y;
-			m_pos.z = z;
-			m_angle = angle;
-			m_pitch = pitch;
-			m_zoom = zoom;
-			m_valid = true;
-		}
-};
-
-// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
-extern View *TheTacticalView;		///< the main tactical interface to the game world
-
-#endif // _VIEW_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/Water.h b/Generals/Code/GameEngine/Include/GameClient/Water.h
deleted file mode 100644
index e9d08766749..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/Water.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Water.h //////////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, December 2001
-// Desc:   Water settings
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WATER_H_
-#define __WATER_H_
-
-// INLCLUDES //////////////////////////////////////////////////////////////////////////////////////
-#include "Common/GameType.h"
-#include "Common/Overridable.h"
-#include "Common/Override.h"
-
-//-------------------------------------------------------------------------------------------------
-struct FieldParse;
-
-//-------------------------------------------------------------------------------------------------
-/** This structures keeps the settings for how our water will look */
-//-------------------------------------------------------------------------------------------------
-class WaterSetting
-{
-
-public:
-
-	WaterSetting( void );
-	virtual ~WaterSetting( void );
-
-	/// Get the INI parsing table for loading
-	const FieldParse *getFieldParse( void ) { return m_waterSettingFieldParseTable; }
-
-	static const FieldParse m_waterSettingFieldParseTable[];		///< the parse table for INI definition
-	AsciiString m_skyTextureFile;
-	AsciiString m_waterTextureFile;
-	Int m_waterRepeatCount;
-	Real m_skyTexelsPerUnit;	//texel density of sky plane (higher value repeats texture more).
-	RGBAColorInt m_vertex00Diffuse;
-	RGBAColorInt m_vertex10Diffuse;
-	RGBAColorInt m_vertex11Diffuse;
-	RGBAColorInt m_vertex01Diffuse;
-	RGBAColorInt m_waterDiffuseColor;
-	RGBAColorInt m_transparentWaterDiffuse;
-	Real m_uScrollPerMs;		
-	Real m_vScrollPerMs;
-
-};
-
-//-------------------------------------------------------------------------------------------------
-/** This structure keeps the transparency and vertex settings, which are the same regardless of the
-		time of day. They can be overridden on a per-map basis. */
-//-------------------------------------------------------------------------------------------------
-class WaterTransparencySetting : public Overridable
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( WaterTransparencySetting, "WaterTransparencySetting"  )
-
-	public:
-		Real m_transparentWaterDepth;
-		Real m_minWaterOpacity;
-		RGBColor m_standingWaterColor;
-		RGBColor m_radarColor;
-		Bool m_additiveBlend;
-		AsciiString m_standingWaterTexture;
-		
-		AsciiString m_skyboxTextureN;
-		AsciiString m_skyboxTextureE;
-		AsciiString m_skyboxTextureS;
-		AsciiString m_skyboxTextureW;
-		AsciiString m_skyboxTextureT;
-
-	public:
-		WaterTransparencySetting()
-		{
-			m_transparentWaterDepth = 3.0f;
-			m_minWaterOpacity = 1.0f;
-			m_standingWaterColor.red = 1.0f;
-			m_standingWaterColor.green = 1.0f;
-			m_standingWaterColor.blue = 1.0f;
-			m_radarColor.red = 0.55f;
-			m_radarColor.green = 0.55f;
-			m_radarColor.blue = 1.0f;
-			m_standingWaterTexture = "TWWater01.tga";
-			m_additiveBlend = FALSE;
-
-			m_skyboxTextureN = "TSMorningN.tga";
-			m_skyboxTextureE = "TSMorningE.tga";
-			m_skyboxTextureS = "TSMorningS.tga";
-			m_skyboxTextureW = "TSMorningW.tga";
-			m_skyboxTextureT = "TSMorningT.tga";
-		}
-
-		static const FieldParse m_waterTransparencySettingFieldParseTable[];		///< the parse table for INI definition
-
-		/// Get the INI parsing table for loading
-		const FieldParse *getFieldParse( void ) const { return m_waterTransparencySettingFieldParseTable; }
-};
-
-EMPTY_DTOR(WaterTransparencySetting)
-
-// EXTERNAL ///////////////////////////////////////////////////////////////////////////////////////
-extern WaterSetting WaterSettings[ TIME_OF_DAY_COUNT ];
-
-extern OVERRIDE<WaterTransparencySetting> TheWaterTransparency;
-
-#endif // __WATER_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h b/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h
index 9733e8a39f9..242dbeca0ae 100644
--- a/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h
+++ b/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h
@@ -24,12 +24,12 @@
 
 // FILE: WinInstanceData.h ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __WININSTANCEDATA_H_
-#define __WININSTANCEDATA_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -98,7 +95,7 @@ struct TextDrawData
 // NOTE if you add data to this make sure you update winSetInstanceData()
 // NOTE if you add data to this make sure you update winSetInstanceData()
 //-----------------------------------------------------------------------------
-class WinInstanceData 
+class WinInstanceData
 {
 
 public:
@@ -134,7 +131,7 @@ class WinInstanceData
 // NOTE if you add data to this make sure you update winSetInstanceData()
 
 	/** @todo you may want to make these data members protected, they are public
-	because of the legacy of porting all this code in from Nox, but they 
+	because of the legacy of porting all this code in from Nox, but they
 	really should be protected and have the rest of the code use access
 	functions to edit them */
 
@@ -167,10 +164,10 @@ class WinInstanceData
 
 	DisplayString *m_text;				 ///< generic text for any window to display
 	DisplayString *m_tooltip;		 ///< tooltip for display
-	
+
 	//NOTE Video Buffer cannot be transfered to another window.
 	VideoBuffer *m_videoBuffer;			///< Each window can be made to play a video in it.
-	
+
 // NOTE if you add data to this make sure you update winSetInstanceData()
 // NOTE if you add data to this make sure you update winSetInstanceData()
 // NOTE if you add data to this make sure you update winSetInstanceData()
@@ -184,9 +181,9 @@ class WinInstanceData
 ///////////////////////////////////////////////////////////////////////////////
 inline UnsignedInt WinInstanceData::getStyle( void ) { return m_style; }
 inline UnsignedInt WinInstanceData::getStatus( void ) { return m_status; }
-inline UnsignedInt WinInstanceData::getState( void ) { return m_state; }  
-inline GameWindow *WinInstanceData::getOwner( void ) { return m_owner; }  
-inline GameFont		*WinInstanceData::getFont( void ) { return m_font; }    
+inline UnsignedInt WinInstanceData::getState( void ) { return m_state; }
+inline GameWindow *WinInstanceData::getOwner( void ) { return m_owner; }
+inline GameFont		*WinInstanceData::getFont( void ) { return m_font; }
 inline DisplayString *WinInstanceData::getTextDisplayString( void ) { return m_text; }
 inline DisplayString *WinInstanceData::getTooltipDisplayString( void ) { return m_tooltip; }
 inline UnicodeString WinInstanceData::getTooltipText( void )
@@ -216,6 +213,3 @@ inline Int WinInstanceData::getTooltipTextLength( void )
 }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __WININSTANCEDATA_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h b/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h
index bdd4443837b..155c6e91bbf 100644
--- a/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h
+++ b/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __WINDOWLAYOUT_H_
-#define __WINDOWLAYOUT_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
 #include "GameClient/GameWindow.h"
@@ -62,17 +59,17 @@ class WindowLayout : public MemoryPoolObject
 	// ~WindowLayout( void );												///< defined by memory pool glue
 
 	// manipulating screen properties ---------------------------------------------------------------
-	AsciiString getFilename( void );											///< return source window filename
-	Bool load( AsciiString filename );										///< create windows and load from .wnd file
-	void hide( Bool hide );													///< hide/unhide all windows on this screen
-	Bool isHidden( void );													///< return visible state of screen
+	AsciiString getFilename( void ) const;					///< return source window filename
+	Bool load( AsciiString filename );							///< create windows and load from .wnd file
+	void hide( Bool hide );													///< hide/show all windows on this screen
+	Bool isHidden( void ) const;										///< return visible state of screen
 	void bringForward( void );											///< bring all windows in this screen forward
 
 	// manipulating window lists --------------------------------------------------------------------
 	void addWindow( GameWindow *window );						///< add window to screen
 	void removeWindow( GameWindow *window );				///< remove window from screen
 	void destroyWindows( void );										///< destroy all windows in this screen
-	GameWindow *getFirstWindow( void );							///< get first window in list for screen
+	GameWindow *getFirstWindow( void ) const;				///< get first window in list for screen
 
 	// accessing layout callbacks  ------------------------------------------------------------------
 	void runInit( void *userData = NULL );									///< run the init method if available
@@ -98,7 +95,7 @@ class WindowLayout : public MemoryPoolObject
 	Bool m_hidden;																	///< visible state of this screen
 
 	//
-	// These are callbacks you can attach to a "layout file" ... they are not 
+	// These are callbacks you can attach to a "layout file" ... they are not
 	// automatically called when using the WindowManager to load and create
 	// the layout.  You can incorporate when and where init, shutdown and update should
 	// be called for any system or code that is uses these window layouts
@@ -107,12 +104,12 @@ class WindowLayout : public MemoryPoolObject
 	WindowLayoutUpdateFunc	 m_update;							///< update callback
 	WindowLayoutShutdownFunc m_shutdown;						///< shutdown callback
 
-};  // end class WindowLayout
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////////////////////////
-inline AsciiString WindowLayout::getFilename( void ) { return m_filenameString; }
-inline GameWindow *WindowLayout::getFirstWindow( void ) { return m_windowList; }
-inline Bool WindowLayout::isHidden( void ) { return m_hidden; }
+inline AsciiString WindowLayout::getFilename( void ) const { return m_filenameString; }
+inline GameWindow *WindowLayout::getFirstWindow( void ) const { return m_windowList; }
+inline Bool WindowLayout::isHidden( void ) const { return m_hidden; }
 
 inline void WindowLayout::runInit( void *userData ) { if( m_init ) m_init( this, userData ); }
 inline void WindowLayout::runUpdate( void *userData ) { if( m_update ) m_update( this, userData ); }
@@ -121,6 +118,3 @@ inline void WindowLayout::runShutdown( void *userData ) { if( m_shutdown ) m_shu
 inline void WindowLayout::setInit( WindowLayoutInitFunc init ) { m_init = init; }
 inline void WindowLayout::setUpdate( WindowLayoutUpdateFunc update ) { m_update = update; }
 inline void WindowLayout::setShutdown( WindowLayoutShutdownFunc shutdown ) {m_shutdown = shutdown;}
-
-#endif // __WINDOWLAYOUT_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameClient/WindowVideoManager.h b/Generals/Code/GameEngine/Include/GameClient/WindowVideoManager.h
deleted file mode 100644
index 452ff1a9a3b..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/WindowVideoManager.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: WindowVideoManager.h /////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-//	created:	Mar 2002
-//
-//	Filename: 	WindowVideoManager.h
-//
-//	author:		Chris Huybregts
-//	
-//	purpose:	
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WINDOWVIDEOMANAGER_H_
-#define __WINDOWVIDEOMANAGER_H_
-
-//-----------------------------------------------------------------------------
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// USER INCLUDES //////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-class GameWindow;
-class AsciiString;
-class VideoStreamInterface;
-class VideoBuffer;
-
-//-----------------------------------------------------------------------------
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-
-enum WindowVideoPlayType CPP_11(: Int)
-{
-	WINDOW_PLAY_MOVIE_ONCE = 0,
-	WINDOW_PLAY_MOVIE_LOOP,
-	WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME,
-
-	WINDOW_PLAY_MOVIE_COUNT
-};
-
-enum WindowVideoStates CPP_11(: Int)
-{
-	WINDOW_VIDEO_STATE_START = 0,
-	WINDOW_VIDEO_STATE_STOP,
-	WINDOW_VIDEO_STATE_PAUSE,
-	WINDOW_VIDEO_STATE_PLAY,
-	WINDOW_VIDEO_STATE_HIDDEN,
-	
-	WINDOW_VIDEO_STATE_COUNT	
-};
-
-class WindowVideo
-{
-public:
-	WindowVideo( void );
-	~WindowVideo( void );
-	
-	VideoStreamInterface *getVideoStream( void );
-	VideoBuffer *getVideoBuffer( void );
-	GameWindow *getWin( void );
-	AsciiString getMovieName( void );
-	WindowVideoPlayType getPlayType ( void );
-	WindowVideoStates getState( void );
-
-	void setPlayType(WindowVideoPlayType playType);
-	void setWindowState( WindowVideoStates state );
-
-	void init( GameWindow *win, AsciiString movieName, WindowVideoPlayType playType,VideoBuffer *videoBuffer, 
-	VideoStreamInterface *videoStream);
-	
-private:
-	WindowVideoPlayType m_playType;
-	GameWindow *m_win;
-	VideoBuffer *m_videoBuffer;
-	VideoStreamInterface *m_videoStream;
-	AsciiString m_movieName;
-	WindowVideoStates m_state;
-
-};
-
-
-class WindowVideoManager : public SubsystemInterface
-{
-public:
-	WindowVideoManager( void );
-	~WindowVideoManager( void );
-
-	// Inhertited from subsystem ====================================================================
-	virtual void init( void );			
-	virtual void reset( void );			
-	virtual void update( void );		
-	//===============================================================================================
-
-	
-	void playMovie( GameWindow *win, AsciiString movieName, WindowVideoPlayType playType );
-	void hideMovie( GameWindow *win );							///< If the window becomes hidden while we're playing, stop the movie but test to see if we should resume
-	void pauseMovie( GameWindow *win );							///< Pause a movie and display it's current frame
-	void resumeMovie( GameWindow *win );						///< If a movie has been stopped, resume it.
-	void stopMovie( GameWindow *win );							///< Stop a movie
-	void stopAndRemoveMovie( GameWindow *win );			///< Stop a movie, and remove it from the manager
-	void stopAllMovies( void );											///< Stop all playing movies
-	void pauseAllMovies( void );										///< Pauses all movies on their current frame
-	void resumeAllMovies( void );										///< Resume Playing all movies
-	Int getWinState( GameWindow *win );			///< return the current state of the window.
-	
-private:
-
-	typedef const GameWindow* ConstGameWindowPtr;
-	// use special class for hashing, since std::hash won't compile for arbitrary ptrs
-	struct hashConstGameWindowPtr
-	{
-	size_t operator()(ConstGameWindowPtr p) const
-	{
-		std::hash<UnsignedInt> hasher;
-		return hasher((UnsignedInt)p);
-	}
-	};
-
-	typedef std::hash_map< ConstGameWindowPtr, WindowVideo *, hashConstGameWindowPtr, std::equal_to<ConstGameWindowPtr> > WindowVideoMap;
-
-	WindowVideoMap m_playingVideos;								///< List of currently playin Videos
-	//WindowVideoMap m_pausedVideos;									///< List of currently paused Videos
-	Bool m_stopAllMovies;														///< Maintains is we're in a stop all Movies State
-	Bool m_pauseAllMovies;													///< Maintains if we're in a pause all movies state
-
-
-};
-
-//-----------------------------------------------------------------------------
-// INLINING ///////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-inline VideoStreamInterface *WindowVideo::getVideoStream( void ){ return m_videoStream; };
-inline VideoBuffer *WindowVideo::getVideoBuffer( void ){ return m_videoBuffer; };
-inline GameWindow *WindowVideo::getWin( void ){ return m_win; };
-inline AsciiString WindowVideo::getMovieName( void ){ return m_movieName; };
-inline WindowVideoPlayType WindowVideo::getPlayType ( void ){ return m_playType; };
-inline WindowVideoStates WindowVideo::getState( void ){ return m_state; };
-
-inline void WindowVideo::setPlayType(WindowVideoPlayType playType){ m_playType = playType; };
-	
-
-
-//-----------------------------------------------------------------------------
-// EXTERNALS //////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-#endif // __WINDOWVIDEOMANAGER_H_
diff --git a/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h b/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h
index 1d25ac38b7d..d04f20d0ba5 100644
--- a/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h
+++ b/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h
@@ -27,13 +27,10 @@
 
 #pragma once
 
-#ifndef _H_WindowXlat
-#define _H_WindowXlat
-
 #include "GameClient/InGameUI.h"
 
 //-----------------------------------------------------------------------------
-class WindowTranslator : public GameMessageTranslator                          
+class WindowTranslator : public GameMessageTranslator
 {
 private:
 	// nothing
@@ -41,6 +38,4 @@ class WindowTranslator : public GameMessageTranslator
 	WindowTranslator();
 	~WindowTranslator();
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
-};	
-
-#endif
+};
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AI.h b/Generals/Code/GameEngine/Include/GameLogic/AI.h
index 5814cad7a68..dc2053d4cc9 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/AI.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/AI.h
@@ -28,19 +28,17 @@
 
 #pragma once
 
-#ifndef _AI_H_
-#define _AI_H_
-
 #include "Common/Snapshot.h"
 #include "Common/SubsystemInterface.h"
 #include "Common/GameMemory.h"
 #include "Common/GameType.h"
 #include "GameLogic/Damage.h"
 #include "Common/STLTypedefs.h"
+#include "ref_ptr.h"
 
 class AIGroup;
 class AttackPriorityInfo;
-class BuildListInfo;	
+class BuildListInfo;
 class CommandButton;
 class Object;
 class PartitionFilter;
@@ -57,6 +55,12 @@ enum WeaponSetType CPP_11(: Int);
 enum WeaponLockType CPP_11(: Int);
 enum SpecialPowerType CPP_11(: Int);
 
+#if RETAIL_COMPATIBLE_AIGROUP
+typedef AIGroup* AIGroupPtr;
+#else
+typedef RefCountPtr<AIGroup> AIGroupPtr;
+#endif
+
 typedef std::vector<ObjectID> VecObjectID;
 typedef VecObjectID::iterator VecObjectIDIt;
 
@@ -65,7 +69,7 @@ typedef ListObjectPtr::iterator ListObjectPtrIt;
 
 enum AIDebugOptions CPP_11(: Int)
 {
-	AI_DEBUG_NONE = 0, 
+	AI_DEBUG_NONE = 0,
 	AI_DEBUG_PATHS,
 	AI_DEBUG_TERRAIN,
 	AI_DEBUG_CELLS,
@@ -73,7 +77,7 @@ enum AIDebugOptions CPP_11(: Int)
 	AI_DEBUG_END
 };
 
-enum 
+enum
 {
 	// multiply by the owner type, either AI or human
 	AI_VISIONFACTOR_OWNERTYPE = 0x01,
@@ -93,7 +97,7 @@ typedef struct {
 
 class AISideInfo : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AISideInfo, "AISideInfo")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AISideInfo, "AISideInfo")
 public:
 	AISideInfo( void ) : m_easy(0), m_normal(1), m_hard(2), m_next(NULL)
 	{
@@ -103,7 +107,7 @@ class AISideInfo : public MemoryPoolObject
 
 	AsciiString m_side;						///< Name of the side
 	Int					m_easy;						///< Number of gatherers to use in easy, normal & hard
-	Int					m_normal;	
+	Int					m_normal;
 	Int					m_hard;
 	TSkillSet		m_skillSet1;
 	TSkillSet		m_skillSet2;
@@ -117,11 +121,11 @@ EMPTY_DTOR(AISideInfo)
 
 class AISideBuildList : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AISideBuildList, "AISideBuildList")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AISideBuildList, "AISideBuildList")
 public:
-	AISideBuildList( AsciiString side ); 
+	AISideBuildList( AsciiString side );
 	//~AISideBuildList();
-	
+
 	void addInfo(BuildListInfo *info);
 
 public:
@@ -160,36 +164,36 @@ class TAiData : public Snapshot
 	Real m_guardOuterModifierAI;	// Multiply the AI unit's vision by this much == guard outer circle.
 	Real m_guardInnerModifierHuman;	// Multiply the human unit's vision by this much == guard inner circle
 	Real m_guardOuterModifierHuman;	// Multiply the human unit's vision by this much == guard outer circle
-	UnsignedInt m_guardChaseUnitFrames;		// Number of frames for which a unit should 
+	UnsignedInt m_guardChaseUnitFrames;		// Number of frames for which a unit should
 	UnsignedInt m_guardEnemyScanRate;		// rate to scan for enemies while guarding
 	UnsignedInt m_guardEnemyReturnScanRate;		// rate to scan for enemies while guarding but returning
 
 	Real m_wallHeight;				// Height of special wall units can walk on top of.
-	
+
 	Real m_alertRangeModifier;			// When a unit is alert, its range will be modified by this value
 	Real m_aggressiveRangeModifier;	// When a unit is aggressive, its range will be modified by this value
 
 	/* The attack priority distance modifier changes relative values.  The relative priority
 	   is reduced by the distance away, divided by the modifier.
 		 Example: tanks are priority 10, powerplants priority 15, and modifier = 100.0
-		 If a powerplant is 700 feet away from the attacker, and the tank is 
+		 If a powerplant is 700 feet away from the attacker, and the tank is
 		 100 feet, the effective priority for tank is 9 (10-(100/100), and the
 		 effective priority for powerplant is 8 (15 -(700/100).  So the tanks
 		 would be attacked first because their distance weighted priority is greater. */
 	Real m_attackPriorityDistanceModifier; // Distance to reduce a relative AttackPriority by 1.
-	
-	
-	/* 
+
+
+	/*
 		How close to a waypoint does a group of units have to be to consider itself at the waypoint?
 		m_skirmishGroupFudgeValue is multiplied by the number of the units in the group asking if its
 		close enough to determine this.
-		
-		So for instance (if m_skirmishGroupFudgeValue was 5), if 2 units are walking along a path, 
-		they would check to see if they were less than 10 feet away from the waypoint in order 
-		to say they were close enough. A group of 10 units would consider themselves close enough 
+
+		So for instance (if m_skirmishGroupFudgeValue was 5), if 2 units are walking along a path,
+		they would check to see if they were less than 10 feet away from the waypoint in order
+		to say they were close enough. A group of 10 units would consider themselves close enough
 		if they were within 50 feet of the waypoint.
 	*/
-	Real m_skirmishGroupFudgeValue;	
+	Real m_skirmishGroupFudgeValue;
 
 	Real m_maxRecruitDistance; // Maximum distance away that units can be recruited.
 	Real m_repulsedDistance; // How far a repulsed unit will run past vision range before stopping.
@@ -229,7 +233,7 @@ class TAiData : public Snapshot
 //------------------------------------------------------------------------------------------------------------
 /**
  * The AI subsystem is responsible for the implementation of
- * the Artificial Intelligence of the game.  This includes 
+ * the Artificial Intelligence of the game.  This includes
  * the behaviors or all game entities, pathfinding, etc.
  */
 class AI : public SubsystemInterface, public Snapshot
@@ -242,7 +246,7 @@ class AI : public SubsystemInterface, public Snapshot
 	virtual void reset( void );						///< reset the AI system to prepare for a new map
 	virtual void update( void );					///< do one frame of AI computation
 
-	inline Pathfinder *pathfinder( void ) { return m_pathfinder; }	///< public access to the pathfind system
+	Pathfinder *pathfinder( void ) { return m_pathfinder; }	///< public access to the pathfind system
 	enum
 	{
 		CAN_SEE														=	1 << 0,
@@ -252,7 +256,7 @@ class AI : public SubsystemInterface, public Snapshot
 		WITHIN_ATTACK_RANGE								= 1 << 4,
 		UNFOGGED													= 1 << 5
 	};
-	Object *findClosestEnemy( const Object *me, Real range, UnsignedInt qualifiers, 
+	Object *findClosestEnemy( const Object *me, Real range, UnsignedInt qualifiers,
 		const AttackPriorityInfo *info=NULL, PartitionFilter *optionalFilter=NULL);
 
 	Object *findClosestRepulsor( const Object *me, Real range);
@@ -265,7 +269,7 @@ class AI : public SubsystemInterface, public Snapshot
 	void loadPostProcess( void );
 
 	// AI Groups -----------------------------------------------------------------------------------------------
-	AIGroup *createGroup( void );					///< instantiate a new AI Group
+	AIGroupPtr createGroup( void ); ///< instantiate a new AI Group
 	void destroyGroup( AIGroup *group );	///< destroy the given AI Group
 	AIGroup *findGroup( UnsignedInt id );	///< return the AI Group with the given ID
 
@@ -284,7 +288,7 @@ class AI : public SubsystemInterface, public Snapshot
 	static void parseSkillSet( INI* ini, void *instance, void *store, const void *userData );					///< Parse the image part of the INI file
 	static void parseScience( INI* ini, void *instance, void *store, const void *userData );					///< Parse the image part of the INI file
 
-	inline UnsignedInt getNextGroupID( void ) { return ++m_nextGroupID; }
+	UnsignedInt getNextGroupID( void ) { return ++m_nextGroupID; }
 
 protected:
 	Pathfinder *m_pathfinder;							///< the pathfinding system
@@ -292,7 +296,7 @@ class AI : public SubsystemInterface, public Snapshot
 	TAiData *m_aiData;
 	void newOverride(void);
 	void addSideInfo(AISideInfo *info);
-	
+
 	UnsignedInt m_nextGroupID;
 	FormationID m_nextFormationID;
 };
@@ -304,9 +308,9 @@ class Waypoint;
 class Team;
 class Weapon;
 
-// TheSuperHackers @compile xezon 22/03/2025 Renames AI_PASSIVE to not conflict with macro in ws2def.h
+// TheSuperHackers @build xezon 22/03/2025 Renames AI_PASSIVE to not conflict with macro in ws2def.h
 
-// Note - written out in save/load xfer and .map files, don't change these numbers.  
+// Note - written out in save/load xfer and .map files, don't change these numbers.
 enum AttitudeType CPP_11(: Int) {
 	ATTITUDE_SLEEP = -2,
 	ATTITUDE_PASSIVE=-1,
@@ -314,21 +318,23 @@ enum AttitudeType CPP_11(: Int) {
 	ATTITUDE_ALERT=1,
 	ATTITUDE_AGGRESSIVE=2,
 	ATTITUDE_INVALID=3
-};		///< AI "attitude" behavior modifiers
+};
 
 enum CommandSourceType CPP_11(: Int);
 
 typedef UnsignedInt CommandSourceMask;
 
 #ifdef DEFINE_COMMANDSOURCEMASK_NAMES
-static const char *TheCommandSourceMaskNames[] = 
+static const char *const TheCommandSourceMaskNames[] =
 {
 	"FROM_PLAYER",
 	"FROM_SCRIPT",
 	"FROM_AI",
+	"FROM_DOZER", //don't use this
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheCommandSourceMaskNames) == COMMAND_SOURCE_TYPE_COUNT + 1, "Incorrect array size");
 #endif
 
 //------------------------------------------------------------------------------------------------------------
@@ -391,8 +397,6 @@ enum AICommandType CPP_11(: Int)	// Stored in save file, do not reorder/renumber
 	AICMD_FOLLOW_PATH_APPEND,
 	AICMD_MOVE_TO_POSITION_EVEN_IF_SLEEPING,	// same as AICMD_MOVE_TO_POSITION, but even ATTITUDE_SLEEP units respond.
 	AICMD_GUARD_TUNNEL_NETWORK,
-
-	AICMD_NUM_COMMANDS	// keep last
 };
 
 struct AICommandParms
@@ -404,8 +408,8 @@ struct AICommandParms
   Object*									m_otherObj;
   const Team*							m_team;
 	std::vector<Coord3D>		m_coords;
-  const Waypoint*         m_waypoint; 
-  const PolygonTrigger*   m_polygon;     
+  const Waypoint*         m_waypoint;
+  const PolygonTrigger*   m_polygon;
   Int											m_intValue;       /// misc usage
   DamageInfo							m_damage;
 	const CommandButton*		m_commandButton;
@@ -424,8 +428,8 @@ class AICommandParmsStorage
   ObjectID								m_otherObj;
   AsciiString							m_teamName;
 	std::vector<Coord3D>		m_coords;
-  const Waypoint*         m_waypoint; 
-  const PolygonTrigger*   m_polygon;     
+  const Waypoint*         m_waypoint;
+  const PolygonTrigger*   m_polygon;
   Int											m_intValue;       /// misc usage
   DamageInfo							m_damage;
 	const CommandButton*  	m_commandButton;
@@ -439,7 +443,7 @@ class AICommandParmsStorage
 
 /**
 	AI interface.  AIGroups, or Objects with an AIUpdate can be given these commands.
-	
+
 	NOTE NOTE NOTE: all of these may be overridden and possibly deferred by various AI classes,
 	so they are NOT ALLOWED TO RETURN ANY VALUES, since the particular command issued might
 	not be executed immediately...
@@ -447,92 +451,92 @@ class AICommandParmsStorage
 class AICommandInterface
 {
 public:
-	
+
 	virtual void aiDoCommand(const AICommandParms* parms) = 0;
 
-	inline void aiMoveToPosition( const Coord3D *pos, CommandSourceType cmdSource )
+	void aiMoveToPosition( const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_MOVE_TO_POSITION, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiMoveToPositionEvenIfSleeping( const Coord3D *pos, CommandSourceType cmdSource )
+	void aiMoveToPositionEvenIfSleeping( const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_MOVE_TO_POSITION_EVEN_IF_SLEEPING, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiMoveToObject( Object *obj, CommandSourceType cmdSource )
+	void aiMoveToObject( Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_MOVE_TO_OBJECT, cmdSource);
 		parms.m_obj = obj;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiTightenToPosition( const Coord3D *pos, CommandSourceType cmdSource )
+	void aiTightenToPosition( const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_TIGHTEN_TO_POSITION, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiMoveToAndEvacuate( const Coord3D *pos, CommandSourceType cmdSource )
+	void aiMoveToAndEvacuate( const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_MOVE_TO_POSITION_AND_EVACUATE, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiMoveToAndEvacuateAndExit( const Coord3D *pos, CommandSourceType cmdSource )
+	void aiMoveToAndEvacuateAndExit( const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_MOVE_TO_POSITION_AND_EVACUATE_AND_EXIT, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiIdle(CommandSourceType cmdSource)
+	void aiIdle(CommandSourceType cmdSource)
 	{
 		AICommandParms parms(AICMD_IDLE, cmdSource);
 		aiDoCommand(&parms);
 	}
 
-	inline void aiBusy(CommandSourceType cmdSource)
+	void aiBusy(CommandSourceType cmdSource)
 	{
 		AICommandParms parms(AICMD_BUSY, cmdSource);
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowWaypointPath( const Waypoint *way, CommandSourceType cmdSource )
+	void aiFollowWaypointPath( const Waypoint *way, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_WAYPOINT_PATH, cmdSource);
 		parms.m_waypoint = way;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowWaypointPathExact( const Waypoint *way, CommandSourceType cmdSource )
+	void aiFollowWaypointPathExact( const Waypoint *way, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_WAYPOINT_PATH_EXACT, cmdSource);
 		parms.m_waypoint = way;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowWaypointPathAsTeam( const Waypoint *way, CommandSourceType cmdSource )
+	void aiFollowWaypointPathAsTeam( const Waypoint *way, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_WAYPOINT_PATH_AS_TEAM, cmdSource);
 		parms.m_waypoint = way;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowWaypointPathExactAsTeam( const Waypoint *way, CommandSourceType cmdSource )
+	void aiFollowWaypointPathExactAsTeam( const Waypoint *way, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_WAYPOINT_PATH_AS_TEAM_EXACT, cmdSource);
 		parms.m_waypoint = way;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowExitProductionPath( const std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource )
+	void aiFollowExitProductionPath( const std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_EXITPRODUCTION_PATH, cmdSource);
 		parms.m_coords = *path;
@@ -540,7 +544,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowPath( const std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource )
+	void aiFollowPath( const std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_PATH, cmdSource);
 		parms.m_coords = *path;
@@ -548,14 +552,14 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowPathAppend( const Coord3D* pos, CommandSourceType cmdSource )
+	void aiFollowPathAppend( const Coord3D* pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_PATH_APPEND, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACK_OBJECT, cmdSource);
 		parms.m_obj = victim;
@@ -563,7 +567,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FORCE_ATTACK_OBJECT, cmdSource);
 		parms.m_obj = victim;
@@ -571,7 +575,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackTeam( const Team *team, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiAttackTeam( const Team *team, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACK_TEAM, cmdSource);
 		parms.m_team = team;
@@ -579,7 +583,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACK_POSITION, cmdSource);
 		parms.m_pos = *pos;
@@ -587,7 +591,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackMoveToPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiAttackMoveToPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACKMOVE_TO_POSITION, cmdSource);
 		parms.m_pos = *pos;
@@ -595,7 +599,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackFollowWaypointPath( const Waypoint *way, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiAttackFollowWaypointPath( const Waypoint *way, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACKFOLLOW_WAYPOINT_PATH, cmdSource);
 		parms.m_waypoint = way;
@@ -603,7 +607,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackFollowWaypointPathAsTeam( const Waypoint *way, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiAttackFollowWaypointPathAsTeam( const Waypoint *way, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACKFOLLOW_WAYPOINT_PATH_AS_TEAM, cmdSource);
 		parms.m_waypoint = way;
@@ -611,20 +615,20 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiHunt( CommandSourceType cmdSource )
+	void aiHunt( CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_HUNT, cmdSource);
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackArea( const PolygonTrigger *areaToGuard, CommandSourceType cmdSource )
+	void aiAttackArea( const PolygonTrigger *areaToGuard, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACK_AREA, cmdSource);
 		parms.m_polygon = areaToGuard;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiRepair( Object *obj, CommandSourceType cmdSource )
+	void aiRepair( Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_REPAIR, cmdSource);
 		parms.m_obj = obj;
@@ -636,7 +640,7 @@ class AICommandInterface
 	{
 		AICommandParms parms( AICMD_PICK_UP_PRISONER, cmdSource );
 		parms.m_obj = obj;
-		aiDoCommand( &parms );	
+		aiDoCommand( &parms );
 	}
 #endif
 
@@ -649,49 +653,49 @@ class AICommandInterface
 	}
 #endif
 
-	inline void aiResumeConstruction( Object *obj, CommandSourceType cmdSource )
+	void aiResumeConstruction( Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_RESUME_CONSTRUCTION, cmdSource);
 		parms.m_obj = obj;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGetHealed( Object *healDepot, CommandSourceType cmdSource )
+	void aiGetHealed( Object *healDepot, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GET_HEALED, cmdSource);
 		parms.m_obj = healDepot;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGetRepaired( Object *repairDepot, CommandSourceType cmdSource )
+	void aiGetRepaired( Object *repairDepot, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GET_REPAIRED, cmdSource);
 		parms.m_obj = repairDepot;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiEnter( Object *obj, CommandSourceType cmdSource )
+	void aiEnter( Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ENTER, cmdSource);
 		parms.m_obj = obj;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiDock( Object *obj, CommandSourceType cmdSource )
+	void aiDock( Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_DOCK, cmdSource);
 		parms.m_obj = obj;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiExit( Object *objectToExit, CommandSourceType cmdSource )
+	void aiExit( Object *objectToExit, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_EXIT, cmdSource);
 		parms.m_obj = objectToExit;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiEvacuate( Bool exposeStealthUnits, CommandSourceType cmdSource )
+	void aiEvacuate( Bool exposeStealthUnits, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_EVACUATE, cmdSource);
 		if( exposeStealthUnits )
@@ -701,20 +705,20 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiExecuteRailedTransport( CommandSourceType cmdSource )
+	void aiExecuteRailedTransport( CommandSourceType cmdSource )
 	{
 		AICommandParms parms( AICMD_EXECUTE_RAILED_TRANSPORT, cmdSource );
 		aiDoCommand( &parms );
 	}
 
-	inline void aiGoProne( const DamageInfo *damageInfo, CommandSourceType cmdSource )
+	void aiGoProne( const DamageInfo *damageInfo, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GO_PRONE, cmdSource);
 		parms.m_damage = *damageInfo;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGuardPosition( const Coord3D *pos, GuardMode guardMode, CommandSourceType cmdSource )
+	void aiGuardPosition( const Coord3D *pos, GuardMode guardMode, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GUARD_POSITION, cmdSource);
 		parms.m_pos = *pos;
@@ -722,7 +726,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGuardObject( Object *objToGuard, GuardMode guardMode, CommandSourceType cmdSource )
+	void aiGuardObject( Object *objToGuard, GuardMode guardMode, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GUARD_OBJECT, cmdSource);
 		parms.m_obj = objToGuard;
@@ -730,7 +734,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGuardArea( const PolygonTrigger *areaToGuard, GuardMode guardMode, CommandSourceType cmdSource )
+	void aiGuardArea( const PolygonTrigger *areaToGuard, GuardMode guardMode, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GUARD_AREA, cmdSource);
 		parms.m_polygon = areaToGuard;
@@ -738,34 +742,34 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGuardTunnelNetwork( GuardMode guardMode, CommandSourceType cmdSource )
+	void aiGuardTunnelNetwork( GuardMode guardMode, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GUARD_TUNNEL_NETWORK, cmdSource);
 		parms.m_intValue = guardMode;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiHackInternet( CommandSourceType cmdSource )
+	void aiHackInternet( CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_HACK_INTERNET, cmdSource);
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFaceObject( Object *target, CommandSourceType cmdSource )
+	void aiFaceObject( Object *target, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FACE_OBJECT, cmdSource);
 		parms.m_obj = target;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFacePosition( const Coord3D *pos, CommandSourceType cmdSource )
+	void aiFacePosition( const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FACE_POSITION, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiRappelInto( Object *target, const Coord3D& pos, CommandSourceType cmdSource )
+	void aiRappelInto( Object *target, const Coord3D& pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_RAPPEL_INTO, cmdSource);
 		parms.m_obj = target;
@@ -773,7 +777,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiCombatDrop( Object *target, const Coord3D& pos, CommandSourceType cmdSource )
+	void aiCombatDrop( Object *target, const Coord3D& pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_COMBATDROP, cmdSource);
 		parms.m_obj = target;
@@ -781,14 +785,14 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiDoCommandButton( const CommandButton *commandButton, CommandSourceType cmdSource )
+	void aiDoCommandButton( const CommandButton *commandButton, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_COMMANDBUTTON, cmdSource);
 		parms.m_commandButton = commandButton;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiDoCommandButtonAtPosition( const CommandButton *commandButton, const Coord3D *pos, CommandSourceType cmdSource )
+	void aiDoCommandButtonAtPosition( const CommandButton *commandButton, const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_COMMANDBUTTON_POS, cmdSource);
 		parms.m_pos = *pos;
@@ -796,7 +800,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiDoCommandButtonAtObject( const CommandButton *commandButton, Object *obj, CommandSourceType cmdSource )
+	void aiDoCommandButtonAtObject( const CommandButton *commandButton, Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_COMMANDBUTTON_OBJ, cmdSource);
 		parms.m_obj = obj;
@@ -804,27 +808,27 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiMoveAwayFromUnit( Object *obj, CommandSourceType cmdSource )
+	void aiMoveAwayFromUnit( Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_MOVE_AWAY_FROM_UNIT, cmdSource);
 		parms.m_obj = obj;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiWander( const Waypoint *way, CommandSourceType cmdSource )
+	void aiWander( const Waypoint *way, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_WANDER, cmdSource);
 		parms.m_waypoint = way;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiWanderInPlace(CommandSourceType cmdSource)
+	void aiWanderInPlace(CommandSourceType cmdSource)
 	{
 		AICommandParms parms(AICMD_WANDER_IN_PLACE, cmdSource);
 		aiDoCommand(&parms);
 	}
 
-	inline void aiPanic( const Waypoint *way, CommandSourceType cmdSource )
+	void aiPanic( const Waypoint *way, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_PANIC, cmdSource);
 		parms.m_waypoint = way;
@@ -851,6 +855,12 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	void xfer( Xfer *xfer );
 	void loadPostProcess( void );
 
+#if !RETAIL_COMPATIBLE_AIGROUP
+	void Add_Ref() const { m_refCount.Add_Ref(); }
+	void Release_Ref() const { m_refCount.Release_Ref(destroy, this); }
+	UnsignedShort Num_Refs() const { return m_refCount.Num_Refs(); }
+#endif
+
 	void groupMoveToPosition( const Coord3D *pos, Bool addWaypoint, CommandSourceType cmdSource );
 	void groupMoveToAndEvacuate( const Coord3D *pos, CommandSourceType cmdSource );			///< move to given position(s)
 	void groupMoveToAndEvacuateAndExit( const Coord3D *pos, CommandSourceType cmdSource );			///< move to given position & unload transport.
@@ -891,7 +901,7 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	void groupAttackArea( const PolygonTrigger *areaToGuard, CommandSourceType cmdSource ); ///< guard an area
 	void groupHackInternet( CommandSourceType cmdSource );				///< Begin hacking the internet for free cash from the heavens.
 	void groupDoSpecialPower( UnsignedInt specialPowerID, UnsignedInt commandOptions );
-	void groupDoSpecialPowerAtObject( UnsignedInt specialPowerID, Object *object, UnsignedInt commandOptions ); 
+	void groupDoSpecialPowerAtObject( UnsignedInt specialPowerID, Object *object, UnsignedInt commandOptions );
 	void groupDoSpecialPowerAtLocation( UnsignedInt specialPowerID, const Coord3D *location, Real angle, const Object *object, UnsignedInt commandOptions );
 #ifdef ALLOW_SURRENDER
 	void groupSurrender( const Object *objWeSurrenderedTo, Bool surrender, CommandSourceType cmdSource );
@@ -911,7 +921,7 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	void groupOverrideSpecialPowerDestination( SpecialPowerType spType, const Coord3D *loc, CommandSourceType cmdSource );
 
 	void setAttitude( AttitudeType tude );	///< set the behavior modifier for this agent
-	AttitudeType getAttitude( void ) const;				///< get the current behavior modifier state	
+	AttitudeType getAttitude( void ) const;				///< get the current behavior modifier state
 
 	Bool isIdle() const;
 	//Definition of busy -- when explicitly in the busy state. Moving or attacking is not considered busy!
@@ -930,32 +940,34 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	Real getSpeed( void );									///< return the speed of the group's slowest member
 	Bool getCenter( Coord3D *center );				///< compute centroid of group
 	Bool getMinMaxAndCenter( Coord2D *min, Coord2D *max, Coord3D *center );
-	void computeIndividualDestination( Coord3D *dest, const Coord3D *groupDest, 
+	void computeIndividualDestination( Coord3D *dest, const Coord3D *groupDest,
 		Object *obj, const Coord3D *center, Bool isFormation ); ///< compute destination of individual object, based on group destination
 	Int getCount( void );										///< return the number of objects in the group
 	Bool isEmpty( void );										///< returns true if the group has no members
 	void queueUpgrade( const UpgradeTemplate *upgrade );	///< queue an upgrade
 
 	void add( Object *obj );								///< add object to group
-	
-	// returns true if remove destroyed the group for us.
+
+	// Returns true if the group was emptied.
 	Bool remove( Object *obj);
-	
+
+	void removeAll( void );
+
 	// If the group contains any objects not owned by ownerPlayer, return TRUE.
 	Bool containsAnyObjectsNotOwnedByPlayer( const Player *ownerPlayer );
 
-	// Remove any objects that aren't owned by the player, and return true if the group was destroyed due to emptiness
+	// Removes any objects that aren't owned by the player, and returns true if the group was emptied.
 	Bool removeAnyObjectsNotOwnedByPlayer( const Player *ownerPlayer );
-	
+
 	UnsignedInt getID( void );
-		
+
 	///< get IDs for every object in this group
 	const VecObjectID& getAllIDs ( void ) const;
 
 	void recomputeGroupSpeed() { m_dirty = true; }
 
 	void setMineClearingDetail( Bool set );
-	Bool setWeaponLockForGroup( WeaponSlotType weaponSlot, WeaponLockType lockType ); ///< Set the groups' weapon choice.  
+	Bool setWeaponLockForGroup( WeaponSlotType weaponSlot, WeaponLockType lockType ); ///< Set the groups' weapon choice.
 	void releaseWeaponLockForGroup(WeaponLockType lockType);///< Clear each guys weapon choice
 	void setWeaponSetFlag( WeaponSetType wst );
 
@@ -974,6 +986,13 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	friend class AI;
 	AIGroup( void );
 
+#if !RETAIL_COMPATIBLE_AIGROUP
+	static void destroy(AIGroup* self)
+	{
+		TheAI->destroyGroup(self);
+	}
+#endif
+
 	void recompute( void );									///< recompute various group info, such as speed, leader, etc
 
 	ListObjectPtr m_memberList;							///< the list of member Objects
@@ -982,11 +1001,12 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	Real m_speed;														///< maximum speed of group (slowest member)
 	Bool m_dirty;														///< "dirty bit" - if true then group speed, leader, needs recompute
 
+#if !RETAIL_COMPATIBLE_AIGROUP
+	RefCountValue<UnsignedShort> m_refCount; ///< the reference counter
+#endif
+
 	UnsignedInt m_id;												///< the unique ID of this group
 	Path *m_groundPath;											///< Group ground path.
-	
+
 	mutable VecObjectID	m_lastRequestedIDList;			///< this is used so we can return by reference, saving a copy
 };
-
-
-#endif // _AI_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIDock.h b/Generals/Code/GameEngine/Include/GameLogic/AIDock.h
index 48b3039ce1c..994f7cd8088 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/AIDock.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/AIDock.h
@@ -28,13 +28,10 @@
 
 #pragma once
 
-#ifndef _AI_DOCK_H_
-#define _AI_DOCK_H_
-
 #include "Common/GameMemory.h"
 #include "GameLogic/AIStateMachine.h"
 
-/** 
+/**
  * The states of the Docking state machine.
  */
 enum
@@ -58,7 +55,7 @@ class AIDockMachine : public StateMachine
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AIDockMachine, "AIDockMachinePool" );
 
 public:
-	/** 
+	/**
 	 * The implementation of this constructor defines the states
 	 * used by this machine.
 	 */
@@ -77,12 +74,12 @@ class AIDockMachine : public StateMachine
 
 };
 
-// Please do not use these states in some other machine.  I know that wouldn't even make sense, but they 
+// Please do not use these states in some other machine.  I know that wouldn't even make sense, but they
 // cast their getMachine to an AIDock machine to store stuff across states so you'd crash.
 //-----------------------------------------------------------------------------------------------------------
 class AIDockApproachState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockApproachState, "AIDockApproachState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockApproachState, "AIDockApproachState")
 public:
 	AIDockApproachState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockApproachState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -99,7 +96,7 @@ EMPTY_DTOR(AIDockApproachState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockWaitForClearanceState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockWaitForClearanceState, "AIDockWaitForClearanceState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockWaitForClearanceState, "AIDockWaitForClearanceState")
 public:
 	AIDockWaitForClearanceState( StateMachine *machine ) : State( machine, "AIDockWaitForClearanceState" ), m_enterFrame(0) { }
 	virtual StateReturnType onEnter( void );
@@ -118,7 +115,7 @@ EMPTY_DTOR(AIDockWaitForClearanceState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockAdvancePositionState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockAdvancePositionState, "AIDockAdvancePositionState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockAdvancePositionState, "AIDockAdvancePositionState")
 public:
 	AIDockAdvancePositionState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockApproachState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -130,7 +127,7 @@ EMPTY_DTOR(AIDockAdvancePositionState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockMoveToEntryState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToEntryState, "AIDockMoveToEntryState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToEntryState, "AIDockMoveToEntryState")
 public:
 	AIDockMoveToEntryState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToEntryState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -142,7 +139,7 @@ EMPTY_DTOR(AIDockMoveToEntryState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockMoveToDockState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToDockState, "AIDockMoveToDockState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToDockState, "AIDockMoveToDockState")
 public:
 	AIDockMoveToDockState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToDockState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -154,7 +151,7 @@ EMPTY_DTOR(AIDockMoveToDockState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockMoveToRallyState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToRallyState, "AIDockMoveToRallyState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToRallyState, "AIDockMoveToRallyState")
 public:
 	AIDockMoveToRallyState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToRallyState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -166,7 +163,7 @@ EMPTY_DTOR(AIDockMoveToRallyState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockProcessDockState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockProcessDockState, "AIDockProcessDockState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockProcessDockState, "AIDockProcessDockState")
 public:
 	AIDockProcessDockState( StateMachine *machine );
 	virtual StateReturnType onEnter( void );
@@ -193,7 +190,7 @@ EMPTY_DTOR(AIDockProcessDockState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockMoveToExitState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToExitState, "AIDockMoveToExitState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToExitState, "AIDockMoveToExitState")
 public:
 	AIDockMoveToExitState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToExitState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -203,6 +200,3 @@ class AIDockMoveToExitState : public AIInternalMoveToState
 EMPTY_DTOR(AIDockMoveToExitState)
 
 //-----------------------------------------------------------------------------------------------------------
-
-
-#endif // _AI_DOCK_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h
index 6daf0e6f860..9672c5668f2 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: AIGuard.h 
+// FILE: AIGuard.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -38,8 +38,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_AIGUARD_
-#define _H_AIGUARD_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
@@ -52,7 +50,7 @@
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 enum
 {
-	// prevent collisions with other states that we might use, (namely AI_IDLE) 
+	// prevent collisions with other states that we might use, (namely AI_IDLE)
 	AI_GUARD_INNER = 5000,					///< Attack anything within this area till death
 	AI_GUARD_IDLE,									///< Wait till something shows up to attack.
 	AI_GUARD_OUTER,									///< Attack anything within this area that has been aggressive, until the timer expires
@@ -80,8 +78,6 @@ class ExitConditions : public AttackExitConditionsInterface
 
 	ExitConditions() : m_attackGiveUpFrame(0), m_conditionsToConsider(0), m_radiusSqr(0.0f)
 	{
-		//Added By Sadullah Nader
-		// Initializations missing and needed
 		m_center.zero();
 	}
 
@@ -110,14 +106,14 @@ class AIGuardMachine : public StateMachine
 	virtual void loadPostProcess();
 
 public:
-	/** 
+	/**
 	 * The implementation of this constructor defines the states
 	 * used by this machine.
 	 */
 	AIGuardMachine( Object *owner );
 	Object* findTargetToGuardByID( void ) { return TheGameLogic->findObjectByID(m_targetToGuard); }
 	void setTargetToGuard( const Object *object ) { m_targetToGuard = object ? object->getID() : INVALID_ID; }
-	
+
 	const Coord3D *getPositionToGuard( void ) const { return &m_positionToGuard; }
 	void setTargetPositionToGuard( const Coord3D *pos) { m_positionToGuard = *pos; }
 
@@ -138,9 +134,12 @@ class AIGuardMachine : public StateMachine
 //--------------------------------------------------------------------------------------
 class AIGuardInnerState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardInnerState, "AIGuardInnerState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardInnerState, "AIGuardInnerState")
 public:
-	AIGuardInnerState( StateMachine *machine ) : State( machine, "AIGuardInner" ) { }
+	AIGuardInnerState( StateMachine *machine ) : State( machine, "AIGuardInner" )
+	{
+		m_attackState = NULL;
+	}
 	virtual StateReturnType onEnter( void );
 	virtual StateReturnType update( void );
 	virtual void onExit( StateExitType status );
@@ -152,15 +151,14 @@ class AIGuardInnerState : public State
 private:
 	AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); }
 
-	ExitConditions m_exitConditions; 
+	ExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 };
-EMPTY_DTOR(AIGuardInnerState)
 
 //--------------------------------------------------------------------------------------
 class AIGuardIdleState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardIdleState, "AIGuardIdleState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardIdleState, "AIGuardIdleState")
 public:
 	AIGuardIdleState( StateMachine *machine ) : State( machine, "AIGuardIdleState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -182,9 +180,9 @@ EMPTY_DTOR(AIGuardIdleState)
 //--------------------------------------------------------------------------------------
 class AIGuardOuterState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardOuterState, "AIGuardOuterState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardOuterState, "AIGuardOuterState")
 public:
-	AIGuardOuterState( StateMachine *machine ) : State( machine, "AIGuardOuter" ) 
+	AIGuardOuterState( StateMachine *machine ) : State( machine, "AIGuardOuter" )
 	{
 		m_attackState = NULL;
 	}
@@ -199,19 +197,18 @@ class AIGuardOuterState : public State
 private:
 	AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); }
 
-	ExitConditions m_exitConditions; 
+	ExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 };
-EMPTY_DTOR(AIGuardOuterState)
 
 //--------------------------------------------------------------------------------------
 class AIGuardReturnState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardReturnState, "AIGuardReturnState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardReturnState, "AIGuardReturnState")
 private:
 	AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); }
 public:
-	AIGuardReturnState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIGuardReturn" ) 
+	AIGuardReturnState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIGuardReturn" )
 	{
 		m_nextReturnScanTime = 0;
 	}
@@ -232,7 +229,7 @@ EMPTY_DTOR(AIGuardReturnState)
 //--------------------------------------------------------------------------------------
 class AIGuardPickUpCrateState : public AIPickUpCrateState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardPickUpCrateState, "AIGuardPickUpCrateState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardPickUpCrateState, "AIGuardPickUpCrateState")
 public:
 	AIGuardPickUpCrateState( StateMachine *machine );
 	virtual StateReturnType onEnter( void );
@@ -244,7 +241,7 @@ EMPTY_DTOR(AIGuardPickUpCrateState)
 //--------------------------------------------------------------------------------------
 class AIGuardAttackAggressorState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardAttackAggressorState, "AIGuardAttackAggressorState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardAttackAggressorState, "AIGuardAttackAggressorState")
 public:
 	AIGuardAttackAggressorState( StateMachine *machine );
 	virtual StateReturnType onEnter( void );
@@ -257,12 +254,8 @@ class AIGuardAttackAggressorState : public State
 	virtual void loadPostProcess();
 private:
 	AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); }
-	ExitConditions m_exitConditions; 
+	ExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 };
 
-EMPTY_DTOR(AIGuardAttackAggressorState)
-
 //--------------------------------------------------------------------------------------
-
-#endif /* _H_AIGUARD_ */
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h b/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h
index 4818f1aeeca..a66480e02e8 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _PATHFIND_H_
-#define _PATHFIND_H_												 
-
 #include "Common/GameType.h"
 #include "Common/GameMemory.h"
 #include "Common/Snapshot.h"
@@ -81,21 +78,21 @@ class PathNode : public MemoryPoolObject
 	void setNextOptimized( PathNode *node );
 
 	PathNode *getNextOptimized(Coord2D* dir = NULL, Real* dist = NULL)  	///< return next node in optimized path
-	{ 
+	{
 		if (dir)
 			*dir = m_nextOptiDirNorm2D;
 		if (dist)
 			*dist = m_nextOptiDist2D;
-		return m_nextOpti; 
+		return m_nextOpti;
 	}
 
 	const PathNode *getNextOptimized(Coord2D* dir = NULL, Real* dist = NULL) const  	///< return next node in optimized path
-	{ 
+	{
 		if (dir)
 			*dir = m_nextOptiDirNorm2D;
 		if (dist)
 			*dist = m_nextOptiDist2D;
-		return m_nextOpti; 
+		return m_nextOpti;
 	}
 
 	void setCanOptimize(Bool canOpt) { m_canOptimize = canOpt;}
@@ -107,10 +104,10 @@ class PathNode : public MemoryPoolObject
 	/// given a list, append this node, return new list.  slow implementation.
 	/// @todo optimize this
 	PathNode *appendToList( PathNode *list );
-	
+
 	/// given a node, append to this node
 	void append( PathNode *list );
-	
+
 public:
 	mutable Int					m_id; // Used in Path::xfer() to save & recreate the path list.
 
@@ -129,7 +126,7 @@ class PathNode : public MemoryPoolObject
 
 };
 
-// this doesn't actually seem to be a particularly useful win, 
+// this doesn't actually seem to be a particularly useful win,
 // performance-wise, so I didn't enable it. (srj)
 #define NO_CPOP_STARTS_FROM_PREV_SEG
 
@@ -147,7 +144,7 @@ class Path : public MemoryPoolObject, public Snapshot
 {
 public:
 	Path();
-	
+
 	PathNode *getFirstNode( void ) { return m_path; }
 	PathNode *getLastNode( void ) { return m_pathTail; }
 
@@ -207,6 +204,9 @@ class PathfindCellInfo
 {
 	friend class PathfindCell;
 public:
+#if RETAIL_COMPATIBLE_PATHFINDING
+	static void forceCleanPathFindCellInfos(void);
+#endif
 	static void allocateCellInfos(void);
 	static void releaseCellInfos(void);
 
@@ -215,7 +215,7 @@ class PathfindCellInfo
 
 protected:
 	static PathfindCellInfo *s_infoArray;
-	static PathfindCellInfo *s_firstFree;							///< 
+	static PathfindCellInfo *s_firstFree;							///<
 
 
 	PathfindCellInfo *m_nextOpen, *m_prevOpen;						///< for A* "open" list, shared by closed list
@@ -227,13 +227,13 @@ class PathfindCellInfo
 
 	/// have to include cell's coordinates, since cells are often accessed via pointer only
 	ICoord2D m_pos;
-	
+
 	ObjectID m_goalUnitID; ///< The objectID of the ground unit whose goal this is.
 	ObjectID m_posUnitID;  ///< The objectID of the ground unit that is occupying this cell.
 	ObjectID m_goalAircraftID; ///< The objectID of the aircraft whose goal this is.
 
 	ObjectID m_obstacleID;	///< the object ID who overlaps this cell
-	
+
 	UnsignedInt m_isFree:1;
 	UnsignedInt m_blockedByAlly:1;///< True if this cell is blocked by an allied unit.
 	UnsignedInt m_obstacleIsFence:1;///< True if occupied by a fence.
@@ -300,22 +300,22 @@ class PathfindCell
 	UnsignedInt costSoFar( PathfindCell *parent );
 
 	/// put self on "open" list in ascending cost order, return new list
-	PathfindCell *putOnSortedOpenList( PathfindCell *list );		
+	PathfindCell *putOnSortedOpenList( PathfindCell *list );
 
 	/// remove self from "open" list
-	PathfindCell *removeFromOpenList( PathfindCell *list );		
+	PathfindCell *removeFromOpenList( PathfindCell *list );
 
 	/// put self on "closed" list, return new list
-	PathfindCell *putOnClosedList( PathfindCell *list );		
+	PathfindCell *putOnClosedList( PathfindCell *list );
 
 	/// remove self from "closed" list
-	PathfindCell *removeFromClosedList( PathfindCell *list );	
+	PathfindCell *removeFromClosedList( PathfindCell *list );
 
 	/// remove all cells from closed list.
-	static Int releaseClosedList( PathfindCell *list );	
+	static Int releaseClosedList( PathfindCell *list );
 
 	/// remove all cells from closed list.
-	static Int releaseOpenList( PathfindCell *list );	
+	static Int releaseOpenList( PathfindCell *list );
 
 	inline PathfindCell *getNextOpen(void) {return m_info->m_nextOpen?m_info->m_nextOpen->m_cell:NULL;}
 
@@ -338,7 +338,7 @@ class PathfindCell
 	void setParentCellHierarchical(PathfindCell* parent);
 	inline PathfindCell* getParentCell(void) const {return m_info->m_pathParent?m_info->m_pathParent->m_cell:NULL;}
 
-	Bool startPathfind( PathfindCell *goalCell ); 
+	Bool startPathfind( PathfindCell *goalCell );
 	Bool getPinched(void) const {return m_pinched;}
 	void setPinched(Bool pinch) {m_pinched = pinch;	}
 
@@ -352,7 +352,7 @@ class PathfindCell
 	void setPosUnit(ObjectID unit, const ICoord2D &pos );
 	inline ObjectID getGoalUnit(void) const {ObjectID id = m_info?m_info->m_goalUnitID:INVALID_ID; return id;}
 	inline ObjectID getGoalAircraft(void) const {ObjectID id = m_info?m_info->m_goalAircraftID:INVALID_ID; return id;}
-	inline ObjectID getPosUnit(void) const {ObjectID id = m_info?m_info->m_posUnitID:INVALID_ID; return id;}	
+	inline ObjectID getPosUnit(void) const {ObjectID id = m_info?m_info->m_posUnitID:INVALID_ID; return id;}
 
 	inline ObjectID getObstacleID(void) const {ObjectID id = m_info?m_info->m_obstacleID:INVALID_ID; return id;}
 
@@ -368,7 +368,7 @@ class PathfindCell
 														// you still may be able to if you can cross multiple terrain types.
 	UnsignedShort m_aircraftGoal:1; //< This is an aircraft goal cell.
 	UnsignedShort m_pinched:1; //< This cell is surrounded by obstacle cells.
-	UnsignedByte m_type:4;			///< what type of cell terrain this is.  
+	UnsignedByte m_type:4;			///< what type of cell terrain this is.
 	UnsignedByte m_flags:4;			///< what type of units are in or moving through this cell.
 	UnsignedByte m_connectsToLayer:4;	///< This cell can pathfind onto this layer, if > LAYER_TOP.
   UnsignedByte m_layer:4;					 ///< Layer of this cell.
@@ -409,7 +409,7 @@ class PathfindLayer
 	Bool connectsZones(PathfindZoneManager *zm, const LocomotorSet& locomotorSet,Int zone1, Int zone2);
 	Bool isPointOnWall(ObjectID *wallPieces, Int numPieces, const Coord3D *pt);
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	void doDebugIcons(void) ;
 #endif
 protected:
@@ -442,19 +442,19 @@ enum { PATHFIND_QUEUE_LEN=512};
 
 struct TCheckMovementInfo;
 
-/** 
- * This class is a helper class for zone manager.  It maintains information regarding the 
- * LocomotorSurfaceTypeMask equivalencies within a ZONE_BLOCK_SIZE x ZONE_BLOCK_SIZE area of 
- * cells.  This is used in hierarchical pathfinding to find the best coarse path at the 
+/**
+ * This class is a helper class for zone manager.  It maintains information regarding the
+ * LocomotorSurfaceTypeMask equivalencies within a ZONE_BLOCK_SIZE x ZONE_BLOCK_SIZE area of
+ * cells.  This is used in hierarchical pathfinding to find the best coarse path at the
  * block level.
  */
 class ZoneBlock
 {
-public: 
+public:
 	ZoneBlock();
 	~ZoneBlock();  // not virtual, please don't override without making virtual.  jba.
 
-	void blockCalculateZones(	PathfindCell **map, PathfindLayer layers[], const IRegion2D &bounds);	///< Does zone calculations.  
+	void blockCalculateZones(	PathfindCell **map, PathfindLayer layers[], const IRegion2D &bounds);	///< Does zone calculations.
 	zoneStorageType getEffectiveZone(LocomotorSurfaceTypeMask acceptableSurfaces, Bool crusher, zoneStorageType zone) const;
 
 	void clearMarkedPassable(void) {m_markedPassable = false;}
@@ -472,7 +472,7 @@ class ZoneBlock
 	ICoord2D		m_cellOrigin;
 
 	zoneStorageType m_firstZone; // First zone in this block.
-	UnsignedShort m_numZones;	 // Number of zones in this block.  If == 1, there is only one zone, and 
+	UnsignedShort m_numZones;	 // Number of zones in this block.  If == 1, there is only one zone, and
 														 // no zone equivalency arrays will be allocated.
 
 	UnsignedShort m_zonesAllocated;
@@ -487,17 +487,17 @@ typedef ZoneBlock *ZoneBlockP;
 
 /**
  * This class manages the zones in the map.  A zone is an area in the map that
- * is one contiguous type of terrain (clear, cliff, water, building).  If 
- * a unit is in a zone, and wants to move to another location, the destination 
+ * is one contiguous type of terrain (clear, cliff, water, building).  If
+ * a unit is in a zone, and wants to move to another location, the destination
  * zone has to be the same, or it can't get there.
- * There are equivalency tables for meta-zones.  For example, an amphibious craft can 
- * travel through water and clear cells. 
+ * There are equivalency tables for meta-zones.  For example, an amphibious craft can
+ * travel through water and clear cells.
  */
 class PathfindZoneManager
 {
 public:
 	enum {INITIAL_ZONES = 256};
-	enum {ZONE_BLOCK_SIZE = 10};	// Zones are calculated in blocks of 20x20.  This way, the raw zone numbers can be used to 
+	enum {ZONE_BLOCK_SIZE = 10};	// Zones are calculated in blocks of 20x20.  This way, the raw zone numbers can be used to
 																// compute hierarchically between the 20x20 blocks of cells. jba.
 	PathfindZoneManager();
 	~PathfindZoneManager();
@@ -506,7 +506,7 @@ class PathfindZoneManager
 
 	Bool needToCalculateZones(void) const {return m_needToCalculateZones;} ///< Returns true if the zones need to be recalculated.
 	void markZonesDirty(void) ; ///< Called when the zones need to be recalculated.
-	void calculateZones(	PathfindCell **map, PathfindLayer layers[], const IRegion2D &bounds);	///< Does zone calculations.  
+	void calculateZones(	PathfindCell **map, PathfindLayer layers[], const IRegion2D &bounds);	///< Does zone calculations.
 	zoneStorageType getEffectiveZone(LocomotorSurfaceTypeMask acceptableSurfaces, Bool crusher, zoneStorageType zone) const;
 	zoneStorageType getEffectiveTerrainZone(zoneStorageType zone) const;
 
@@ -547,35 +547,35 @@ class PathfindZoneManager
 	zoneStorageType *m_hierarchicalZones;
 };
 
-/** 
+/**
  * The pathfinding services interface provides access to the 3 expensive path find calls:
  * findPath, findClosestPath, and findAttackPath.
  * It is only available to units when their ai interface doPathfind method is called.
- * This allows the pathfinder to spread out the pathfinding over a number of frames 
+ * This allows the pathfinder to spread out the pathfinding over a number of frames
  * when a lot of units are trying to pathfind all at the same time.
  */
 class PathfindServicesInterface {
 public:
-	virtual Path *findPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, 
+	virtual Path *findPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 		const Coord3D *to )=0;	///< Find a short, valid path between given locations
 	/** Find a short, valid path to a location NEAR the to location.
 		This succeds when the destination is unreachable (like inside a building).
 		If the destination is unreachable, it will adjust the to point.  */
 	virtual Path *findClosestPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
-		Coord3D *to, Bool blocked, Real pathCostMultiplier, Bool moveAllies )=0;	
+		Coord3D *to, Bool blocked, Real pathCostMultiplier, Bool moveAllies )=0;
 
 	/** Find a short, valid path to a location that obj can attack victim from.  */
 	virtual Path *findAttackPath( const Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
-		const Object *victim, const Coord3D* victimPos, const Weapon *weapon )=0;	
+		const Object *victim, const Coord3D* victimPos, const Weapon *weapon )=0;
 
-	/** Patch to the exiting path from the current position, either because we became blocked, 
+	/** Patch to the exiting path from the current position, either because we became blocked,
   or because we had to move off the path to avoid other units. */
-	virtual Path *patchPath( const Object *obj, const LocomotorSet& locomotorSet, 
+	virtual Path *patchPath( const Object *obj, const LocomotorSet& locomotorSet,
 		Path *originalPath, Bool blocked ) = 0;
 
 	/** Find a short, valid path to a location that is away from the repulsors.  */
-	virtual Path *findSafePath( const Object *obj, const LocomotorSet& locomotorSet, 
-		const Coord3D *from, const Coord3D* repulsorPos1, const Coord3D* repulsorPos2, Real repulsorRadius ) = 0;	
+	virtual Path *findSafePath( const Object *obj, const LocomotorSet& locomotorSet,
+		const Coord3D *from, const Coord3D* repulsorPos1, const Coord3D* repulsorPos2, Real repulsorRadius ) = 0;
 
 };
 
@@ -591,19 +591,19 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 		This succeds when the destination is unreachable (like inside a building).
 		If the destination is unreachable, it will adjust the to point.  */
 	virtual Path *findClosestPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
-		Coord3D *to, Bool blocked, Real pathCostMultiplier, Bool moveAllies );	
+		Coord3D *to, Bool blocked, Real pathCostMultiplier, Bool moveAllies );
 
 	/** Find a short, valid path to a location that obj can attack victim from.  */
 	virtual Path *findAttackPath( const Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
-		const Object *victim, const Coord3D* victimPos, const Weapon *weapon );	
+		const Object *victim, const Coord3D* victimPos, const Weapon *weapon );
 
 	/** Find a short, valid path to a location that is away from the repulsors.  */
-	virtual Path *findSafePath( const Object *obj, const LocomotorSet& locomotorSet, 
-		const Coord3D *from, const Coord3D* repulsorPos1, const Coord3D* repulsorPos2, Real repulsorRadius );	
+	virtual Path *findSafePath( const Object *obj, const LocomotorSet& locomotorSet,
+		const Coord3D *from, const Coord3D* repulsorPos1, const Coord3D* repulsorPos2, Real repulsorRadius );
 
-	/** Patch to the exiting path from the current position, either because we became blocked, 
+	/** Patch to the exiting path from the current position, either because we became blocked,
   or because we had to move off the path to avoid other units. */
-	virtual Path *patchPath( const Object *obj, const LocomotorSet& locomotorSet, 
+	virtual Path *patchPath( const Object *obj, const LocomotorSet& locomotorSet,
 		Path *originalPath, Bool blocked );
 
 public:
@@ -618,7 +618,7 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 	void loadPostProcess( void );
 
 	Bool quickDoesPathExist( const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to );  ///< Can we build any path at all between the locations	(terrain & buildings check - fast)
-	Bool slowDoesPathExist( Object *obj, const Coord3D *from, 
+	Bool slowDoesPathExist( Object *obj, const Coord3D *from,
 		const Coord3D *to, ObjectID ignoreObject=INVALID_ID );  ///< Can we build any path at all between the locations	(terrain, buildings & units check - slower)
 
 	Bool queueForPath(ObjectID id);	 ///< The object wants to request a pathfind, so put it on the list to process.
@@ -626,7 +626,7 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 	void forceMapRecalculation( );	///< Force pathfind map recomputation. If region is given, only that area is recomputed
 
 	/** Returns an aircraft path to the goal.  */
-	Path *getAircraftPath( const Object *obj, const Coord3D *to); 
+	Path *getAircraftPath( const Object *obj, const Coord3D *to);
 	Path *findGroundPath( const Coord3D *from, const Coord3D *to, Int pathRadius,
 		Bool crusher);	///< Find a short, valid path of the desired width on the ground.
 
@@ -662,7 +662,7 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 	Bool worldToCell( const Coord3D *pos, ICoord2D *cell );	///< Given a world position, return grid cell coordinate
 
 	const ICoord2D *getExtent(void) const {return &m_extent.hi;}
-	
+
 	void setIgnoreObstacleID( ObjectID objID );					///< if non-zero, the pathfinder will ignore the given obstacle
 
 	Bool validMovementPosition( Bool isCrusher, LocomotorSurfaceTypeMask acceptableSurfaces, PathfindCell *toCell, PathfindCell *fromCell = NULL );		///< Return true if given position is a valid movement location
@@ -676,13 +676,13 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 
 	Bool isAttackViewBlockedByObstacle(const Object* obj, const Coord3D& attackerPos,  const Object* victim, const Coord3D& victimPos);	///< Return true if the straight line between the given points contains any obstacle, and thus blocks vision
 
-	Bool isLinePassable( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces, 
-		PathfindLayerEnum layer, const Coord3D& startWorld, const Coord3D& endWorld, 
+	Bool isLinePassable( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces,
+		PathfindLayerEnum layer, const Coord3D& startWorld, const Coord3D& endWorld,
 		Bool blocked, Bool allowPinched );	///< Return true if the straight line between the given points is passable
 
-	void moveAlliesAwayFromDestination( Object *obj,const Coord3D& destination);	
+	void moveAlliesAwayFromDestination( Object *obj,const Coord3D& destination);
 
-	Bool isGroundPathPassable( Bool isCrusher, const Coord3D& startWorld, PathfindLayerEnum startLayer, 
+	Bool isGroundPathPassable( Bool isCrusher, const Coord3D& startWorld, PathfindLayerEnum startLayer,
 		const Coord3D& endWorld, Int pathDiameter);	///< Return true if the straight line between the given points is passable
 
 	// for debugging
@@ -691,17 +691,20 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 	Path *getDebugPath( void );
 	void setDebugPath( Path *debugpath );
 
+#if RETAIL_COMPATIBLE_PATHFINDING
+	void forceCleanCells(void);
+#endif
 	void cleanOpenAndClosedLists(void);
 
 	// Adjusts the destination to a spot near dest that is not occupied by other units.
-	Bool adjustDestination(Object *obj, const LocomotorSet& locomotorSet, 
+	Bool adjustDestination(Object *obj, const LocomotorSet& locomotorSet,
 		Coord3D *dest, const Coord3D *groupDest=NULL);
 
 	// Adjusts the destination to a spot near dest for landing that is not occupied by other units.
 	Bool adjustToLandingDestination(Object *obj, Coord3D *dest);
 
 	// Adjusts the destination to a spot that can attack target that is not occupied by other units.
-	Bool adjustTargetDestination(const Object *obj, const Object *target, const Coord3D *targetPos, 
+	Bool adjustTargetDestination(const Object *obj, const Object *target, const Coord3D *targetPos,
 		const Weapon *weapon, Coord3D *dest);
 
 	// Adjusts destination to a spot near dest that is possible to path to.
@@ -725,56 +728,56 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 
 protected:
 	virtual Path *internalFindPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to);	///< Find a short, valid path between given locations
-	Path *findHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to, Bool crusher);	
-	Path *findClosestHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to, Bool crusher);	
-	Path *internal_findHierarchicalPath( Bool isHuman, const LocomotorSurfaceTypeMask locomotorSurface, const Coord3D *from, const Coord3D *to, Bool crusher, Bool closestOK);	
+	Path *findHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to, Bool crusher);
+	Path *findClosestHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to, Bool crusher);
+	Path *internal_findHierarchicalPath( Bool isHuman, const LocomotorSurfaceTypeMask locomotorSurface, const Coord3D *from, const Coord3D *to, Bool crusher, Bool closestOK);
 	void processHierarchicalCell( const ICoord2D &scanCell, const ICoord2D &deltaPathfindCell,
-																PathfindCell *parentCell, 
-																PathfindCell *goalCell, zoneStorageType parentZone, 
+																PathfindCell *parentCell,
+																PathfindCell *goalCell, zoneStorageType parentZone,
 																zoneStorageType *examinedZones, Int &numExZones,
 																Bool crusher, Int &cellCount);
-	Bool checkForAdjust(Object *, const LocomotorSet& locomotorSet, Bool isHuman, Int cellX, Int cellY, 
+	Bool checkForAdjust(Object *, const LocomotorSet& locomotorSet, Bool isHuman, Int cellX, Int cellY,
 		PathfindLayerEnum layer, Int iRadius, Bool center,Coord3D *dest, const Coord3D *groupDest) ;
-	Bool checkForLanding(Int cellX, Int cellY, 
+	Bool checkForLanding(Int cellX, Int cellY,
 		PathfindLayerEnum layer, Int iRadius, Bool center,Coord3D *dest) ;
 	Bool checkForTarget(const Object *obj, 	Int cellX, Int cellY, const Weapon *weapon,
 																const Object *victim, const Coord3D *victimPos,
 																Int iRadius, Bool center,Coord3D *dest) ;
-	Bool checkForPossible(Bool isCrusher, Int fromZone,  Bool center, const LocomotorSet& locomotorSet, 
+	Bool checkForPossible(Bool isCrusher, Int fromZone,  Bool center, const LocomotorSet& locomotorSet,
 		Int cellX, Int cellY, PathfindLayerEnum layer, Coord3D *dest, Bool startingInObstacle) ;
 	void getRadiusAndCenter(const Object *obj, Int &iRadius, Bool &center);
 	void adjustCoordToCell(Int cellX, Int cellY, Bool centerInCell, Coord3D &pos, PathfindLayerEnum layer);
 	Bool checkDestination(const Object *obj, Int cellX, Int cellY, PathfindLayerEnum layer, Int iRadius, Bool centerInCell);
 	Bool checkForMovement(const Object *obj, TCheckMovementInfo &info);
-	Bool segmentIntersectsTallBuilding(const PathNode *curNode, PathNode *nextNode,  
+	Bool segmentIntersectsTallBuilding(const PathNode *curNode, PathNode *nextNode,
 		ObjectID ignoreBuilding, Coord3D *insertPos1, Coord3D *insertPos2, Coord3D *insertPos3);	///< Return true if the straight line between the given points intersects a tall building.
 	Bool circleClipsTallBuilding(const Coord3D *from, const Coord3D *to, Real radius, ObjectID ignoreBuilding, Coord3D *adjustTo);	///< Return true if the circle at the end of the line between the given points intersects a tall building.
 
 	enum {NO_ATTACK=0};
 	Int examineNeighboringCells(PathfindCell *parentCell, PathfindCell *goalCell,
-										const LocomotorSet& locomotorSet, Bool isHumanPlayer, 
+										const LocomotorSet& locomotorSet, Bool isHumanPlayer,
 										Bool centerInCell, Int radius, const ICoord2D &startCellNdx,
 										const Object *obj, Int attackDistance);
 
- 	Bool pathDestination( Object *obj, const LocomotorSet& locomotorSet, Coord3D *dest, 
+ 	Bool pathDestination( Object *obj, const LocomotorSet& locomotorSet, Coord3D *dest,
 		PathfindLayerEnum layer, const Coord3D *groupDest);	///< Checks cost between given locations
 
-	Int checkPathCost(Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, 
+	Int checkPathCost(Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 		const Coord3D *to);
 
-	void tightenPath(Object *obj, const LocomotorSet& locomotorSet, Coord3D *from, 
+	void tightenPath(Object *obj, const LocomotorSet& locomotorSet, Coord3D *from,
 		const Coord3D *to);
 
 	/**
-		return 0 to continue iterating the line, nonzero to terminate the iteration. 
+		return 0 to continue iterating the line, nonzero to terminate the iteration.
 		the nonzero result will be returned as the result of iterateCellsAlongLine().
 		iterateCellsAlongLine will return zero if it completes.
 	*/
 	typedef Int (*CellAlongLineProc)(Pathfinder* pathfinder, PathfindCell* from, PathfindCell* to, Int to_x, Int to_y, void* userData);
-	Int iterateCellsAlongLine(const Coord3D& startWorld, const Coord3D& endWorld, 
+	Int iterateCellsAlongLine(const Coord3D& startWorld, const Coord3D& endWorld,
 		PathfindLayerEnum layer, CellAlongLineProc proc, void* userData);
 
-	Int iterateCellsAlongLine(const ICoord2D &start, const ICoord2D &end, 
+	Int iterateCellsAlongLine(const ICoord2D &start, const ICoord2D &end,
 		PathfindLayerEnum layer, CellAlongLineProc proc, void* userData);
 
 	static Int linePassableCallback(Pathfinder* pathfinder, PathfindCell* from, PathfindCell* to, Int to_x, Int to_y, void* userData);
@@ -790,10 +793,10 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 
 	void classifyMap( void );					///< Classify all cells in grid as obstacles, etc
 	void classifyObjectFootprint( Object *obj, Bool insert );	/** Classify the cells under the given object
-																																If 'insert' is true, object is being added 
+																																If 'insert' is true, object is being added
 																																If 'insert' is false, object is being removed */
 	void internal_classifyObjectFootprint( Object *obj, Bool insert );	/** Classify the cells under the given object
-																																If 'insert' is true, object is being added 
+																																If 'insert' is true, object is being added
 																																If 'insert' is false, object is being removed */
 	void classifyFence( Object *obj, Bool insert );	/** Classify the cells under the given fence object. */
 	void classifyUnitFootprint( Object *obj, Bool insert, Bool remove, Bool update );	/** Classify the cells under the given object If 'insert' is true, object is being added */
@@ -801,17 +804,17 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 	void worldToGrid( const Coord3D *pos, ICoord2D *cellIndex );
 
 	Bool evaluateCell(PathfindCell* newCell, PathfindCell *parentCell,
-									const LocomotorSet& locomotorSet, 
-									 Bool centerInCell, Int radius, 
+									const LocomotorSet& locomotorSet,
+									 Bool centerInCell, Int radius,
 									 const Object *obj, Int attackDistance);
 
-	Path *buildActualPath( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces, 
+	Path *buildActualPath( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces,
 		const Coord3D *fromPos, PathfindCell *goalCell, Bool center, Bool blocked );	///< Work backwards from goal cell to construct final path
-	Path *buildGroundPath( Bool isCrusher,const Coord3D *fromPos, PathfindCell *goalCell, 
+	Path *buildGroundPath( Bool isCrusher,const Coord3D *fromPos, PathfindCell *goalCell,
 		Bool center, Int pathDiameter );	///< Work backwards from goal cell to construct final path
 	Path *buildHierachicalPath( const Coord3D *fromPos, PathfindCell *goalCell);	///< Work backwards from goal cell to construct final path
 
-	void  prependCells( Path *path, const Coord3D *fromPos, 
+	void  prependCells( Path *path, const Coord3D *fromPos,
 																	PathfindCell *goalCell, Bool center ); ///< Add pathfind cells to a path.
 
 	void debugShowSearch( Bool pathFound );				///< Show all cells touched in the last search
@@ -819,7 +822,9 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 
 	void checkChangeLayers(PathfindCell *parentCell);
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+	bool checkCellOutsideExtents(ICoord2D& cell);
+
+#if defined(RTS_DEBUG)
 	void doDebugIcons(void) ;
 #endif
 
@@ -867,10 +872,10 @@ inline void Pathfinder::setIgnoreObstacleID( ObjectID objID )
 	m_ignoreObstacleID = objID;
 }
 
-inline void Pathfinder::worldToGrid( const Coord3D *pos, ICoord2D *cellIndex ) 
-{ 
-	cellIndex->x = REAL_TO_INT(pos->x/PATHFIND_CELL_SIZE); 
-	cellIndex->y = REAL_TO_INT(pos->y/PATHFIND_CELL_SIZE); 
+inline void Pathfinder::worldToGrid( const Coord3D *pos, ICoord2D *cellIndex )
+{
+	cellIndex->x = REAL_TO_INT(pos->x/PATHFIND_CELL_SIZE);
+	cellIndex->y = REAL_TO_INT(pos->y/PATHFIND_CELL_SIZE);
 }
 
 inline Bool Pathfinder::validMovementPosition( Bool isCrusher, PathfindLayerEnum layer, const LocomotorSet& locomotorSet, Int x, Int y )
@@ -887,44 +892,44 @@ inline Bool Pathfinder::validMovementPosition( Bool isCrusher, PathfindLayerEnum
 	return validMovementPosition( isCrusher, layer, locomotorSet, x, y );
 }
 
-inline const Coord3D *Pathfinder::getDebugPathPosition( void ) 
-{ 
-	return &debugPathPos; 
+inline const Coord3D *Pathfinder::getDebugPathPosition( void )
+{
+	return &debugPathPos;
 }
 
-inline void Pathfinder::setDebugPathPosition( const Coord3D *pos ) 
-{ 
-	debugPathPos = *pos; 
+inline void Pathfinder::setDebugPathPosition( const Coord3D *pos )
+{
+	debugPathPos = *pos;
 }
 
-inline Path *Pathfinder::getDebugPath( void ) 
-{ 
-	return debugPath; 
+inline Path *Pathfinder::getDebugPath( void )
+{
+	return debugPath;
 }
 
-inline void Pathfinder::addObjectToPathfindMap( class Object *obj ) 
-{ 
-	classifyObjectFootprint( obj, true ); 
+inline void Pathfinder::addObjectToPathfindMap( class Object *obj )
+{
+	classifyObjectFootprint( obj, true );
 }
 
-inline void Pathfinder::removeObjectFromPathfindMap( class Object *obj ) 
-{ 
-	classifyObjectFootprint( obj, false ); 
+inline void Pathfinder::removeObjectFromPathfindMap( class Object *obj )
+{
+	classifyObjectFootprint( obj, false );
 }
 
-inline PathfindCell *Pathfinder::getCell( PathfindLayerEnum layer, Int x, Int y ) 
-{ 
+inline PathfindCell *Pathfinder::getCell( PathfindLayerEnum layer, Int x, Int y )
+{
 	if (x >= m_extent.lo.x && x <= m_extent.hi.x &&
-		y >= m_extent.lo.y && y <= m_extent.hi.y)	
+		y >= m_extent.lo.y && y <= m_extent.hi.y)
 	{
 		PathfindCell *cell = NULL;
-		if (layer > LAYER_GROUND && layer <= LAYER_LAST) 
+		if (layer > LAYER_GROUND && layer <= LAYER_LAST)
 		{
 			cell = m_layers[layer].getCell(x, y);
-			if (cell) 
+			if (cell)
 				return cell;
 		}
-		return &m_map[x][y]; 
+		return &m_map[x][y];
 	}
 	else
 	{
@@ -932,7 +937,7 @@ inline PathfindCell *Pathfinder::getCell( PathfindLayerEnum layer, Int x, Int y
 	}
 }
 
-inline PathfindCell *Pathfinder::getCell( PathfindLayerEnum layer, const Coord3D *pos ) 
+inline PathfindCell *Pathfinder::getCell( PathfindLayerEnum layer, const Coord3D *pos )
 {
 	ICoord2D cell;
 	Bool overflow = worldToCell( pos, &cell );
@@ -972,6 +977,3 @@ inline Bool PathfindCell::isObstaclePresent( ObjectID objID ) const
 
 	return false;
 }
-
-
-#endif // _PATHFIND_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h
index 074afc3263f..1e42be06037 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _AI_PLAYER_H_
-#define _AI_PLAYER_H_
-
 #include "Common/GameMemory.h"
 #include "Common/Snapshot.h"
 
@@ -41,7 +38,7 @@ class BuildListInfo;
 /**
  * When a team is selected for training, a list of these
  * "work orders" are created, one for each member of the team.
- * This pairs team members with production buildings to keep 
+ * This pairs team members with production buildings to keep
  * track of who is building what, and allows us to track if
  * a building was destroyed while in the process of training a unit.
  */
@@ -49,7 +46,7 @@ class WorkOrder : public MemoryPoolObject,
 									public Snapshot
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( WorkOrder, "WorkOrder" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( WorkOrder, "WorkOrder" )
 
 public:
 
@@ -94,7 +91,7 @@ class TeamInQueue : public MemoryPoolObject,
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TeamInQueue, "TeamInQueue"  )
 
-private:		
+private:
 
 	MAKE_DLINK(TeamInQueue, TeamBuildQueue)				///< the instances of our prototype
 	MAKE_DLINK(TeamInQueue, TeamReadyQueue)				///< the instances of our prototype
@@ -108,19 +105,16 @@ class TeamInQueue : public MemoryPoolObject,
 
 public:
 
-	TeamInQueue() : 
-		m_workOrders(NULL), 
-		m_team(NULL), 
-		m_nextTeamInQueue(NULL), 
-		m_sentToStartLocation(false), 
-		m_reinforcement(false), 
+	TeamInQueue() :
+		m_workOrders(NULL),
+		m_team(NULL),
+		m_nextTeamInQueue(NULL),
+		m_sentToStartLocation(false),
+		m_reinforcement(false),
 		m_stopQueueing(false),
 		m_reinforcementID(INVALID_ID),
-		//Added By Sadullah Nader
-		//Initialization(s) inserted
 		m_frameStarted(0),
 		m_priorityBuild(FALSE)
-		//		
 	{
 	}
 
@@ -153,12 +147,12 @@ class TeamInQueue : public MemoryPoolObject,
 class AIPlayer : public MemoryPoolObject,
 								 public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AIPlayer, "AIPlayer"  )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AIPlayer, "AIPlayer"  )
 
 public:
 
 	AIPlayer( Player *p );							///< constructor
-	
+
 	virtual void computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord3D *pos, Int playerNdx, Real weaponRadius); ///< Calculates best pos for weapon given radius.
 
 public: // AIPlayer interface, may be overridden by AISkirmishPlayer.  jba.
@@ -233,7 +227,7 @@ class AIPlayer : public MemoryPoolObject,
 	virtual void processBaseBuilding( void );		///< do base-building behaviors
 	virtual void processTeamBuilding( void );		///< do team-building behaviors
  	static Int getPlayerSuperweaponValue(Coord3D *center, Int playerNdx, Real radius);
-// End of aiplayer interface. 
+// End of aiplayer interface.
 
 protected:
 
@@ -255,7 +249,7 @@ class AIPlayer : public MemoryPoolObject,
 	Object *findSupplyCenter(Int minSupplies);
 	static void getPlayerStructureBounds(Region2D *bounds, Int playerNdx);
 
-protected:	 
+protected:
 
 	Player *m_player;									///< the Player we represent
 
@@ -293,8 +287,3 @@ class AIPlayer : public MemoryPoolObject,
 
 	ObjectID m_curWarehouseID;
 };
-
-#endif // _AI_PLAYER_H_
-
-
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h b/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h
index 0fd9ed237d6..6c80a102ed4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h
@@ -28,13 +28,10 @@
 
 #pragma once
 
-#ifndef _AI_SKIRMISH_PLAYER_H_
-#define _AI_SKIRMISH_PLAYER_H_
-
 #include "Common/GameMemory.h"
 #include "GameLogic/AIPlayer.h"
 
-class BuildListInfo;	
+class BuildListInfo;
 class SpecialPowerTemplate;
 
 
@@ -43,14 +40,14 @@ class SpecialPowerTemplate;
  */
 class AISkirmishPlayer : public AIPlayer
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AISkirmishPlayer, "AISkirmishPlayer"  )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AISkirmishPlayer, "AISkirmishPlayer"  )
 
 public:	 // AISkirmish specific methods.
 
 	AISkirmishPlayer( Player *p );							///< constructor
 	virtual void computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord3D *pos, Int playerNdx, Real weaponRadius); ///< Calculates best pos for weapon given radius.
 
-public:	// AIPlayer interface methods.  
+public:	// AIPlayer interface methods.
 
 	virtual void update();											///< simulates the behavior of a player
 
@@ -118,8 +115,3 @@ class AISkirmishPlayer : public AIPlayer
 	Player			*m_currentEnemy;
 
 };
-
-#endif // _AI_SKIRMISH_PLAYER_H_
-
-
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h b/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h
index 864f57aad7f..03f0de0e733 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _AI_STATE_MACHINE_H_
-#define _AI_STATE_MACHINE_H_
-
 #include "Lib/BaseType.h"
 
 #include "Common/AudioEventRTS.h"
@@ -52,7 +49,7 @@ class Squad;
 //-----------------------------------------------------------------------------------------------------------
 
 
-/** 
+/**
  * The AI state IDs.
  * Each of these constants will be associated with an instance of a State class
  * in a given StateMachine.
@@ -103,7 +100,6 @@ enum AIStateType CPP_11(: Int)
 	AI_MOVE_AWAY_FROM_REPULSORS,							///< Civilians are running away from repulsors. (enemies or dead civs, usually) jba
 	AI_WANDER_IN_PLACE,												///< Civilians just wander around a spot, rather than along a path.
 	AI_BUSY,																	///< This is a state that things will be in when they are busy doing random stuff that doesn't require AI interaction.
-	NUM_AI_STATES
 };
 
 //-----------------------------------------------------------------------------------------------------------
@@ -111,12 +107,12 @@ enum AIStateType CPP_11(: Int)
 extern Bool outOfWeaponRangeObject( State *thisState, void* userData );
 extern Bool outOfWeaponRangePosition( State *thisState, void* userData );
 extern Bool wantToSquishTarget( State *thisState, void* userData );
-	
+
 //-----------------------------------------------------------------------------------------------------------
 /**
-  The AI state machine.  This is used by AIUpdate to implement all of the 
+  The AI state machine.  This is used by AIUpdate to implement all of the
   commands in the AICommandInterface.
- 
+
 	NOTE NOTE NOTE NOTE NOTE
 
 	Do NOT subclass this unless you want ALL of the states this machine possesses.
@@ -131,7 +127,7 @@ class AIStateMachine : public StateMachine
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AIStateMachine, "AIStateMachine" );
 
 public:
-	/** 
+	/**
 	 * The implementation of this constructor defines the states
 	 * used by this machine.
 	 */
@@ -140,7 +136,7 @@ class AIStateMachine : public StateMachine
 	virtual void clear();
 	virtual StateReturnType resetToDefaultState();
 	virtual StateReturnType setState( StateID newStateID );
-	
+
 	/// @todo Rethink state parameter passing. Continuing in this fashion will have a pile of params in the machine (MSB)
 	void setGoalPath( const std::vector<Coord3D>* path );
 	void addToGoalPath( const Coord3D *pathPoint );
@@ -157,7 +153,7 @@ class AIStateMachine : public StateMachine
 	void setGoalAIGroup( const AIGroup *group );
 
 	Squad *getGoalSquad(void);
-	
+
 	StateReturnType setTemporaryState( StateID newStateID, Int frameLimitCoount );			///< change the temporary state of the machine, and number of frames limit.
 	StateID getTemporaryState(void) const {return m_temporaryState?m_temporaryState->getID():INVALID_STATE_ID;}
 
@@ -166,7 +162,7 @@ class AIStateMachine : public StateMachine
 #ifdef STATE_MACHINE_DEBUG
 	virtual AsciiString getCurrentStateName() const ;
 #endif
-	
+
 protected:
 	// snapshot interface
 	virtual void crc( Xfer *xfer );
@@ -178,9 +174,9 @@ class AIStateMachine : public StateMachine
 	const Waypoint *			m_goalWaypoint;
 	Squad *								m_goalSquad;
 
-	/** A temporary state to run for a while (usually AI_MOVE_OUT_OF_THE_WAY).  
+	/** A temporary state to run for a while (usually AI_MOVE_OUT_OF_THE_WAY).
 	Doesn't clear or reset the state machine, so it goes back to doing what it was doing.  jba. */
-	State									*m_temporaryState;			 
+	State									*m_temporaryState;
 	UnsignedInt						m_temporaryStateFramEnd; ///< Last frame to run m_temporaryState.
 };
 
@@ -198,7 +194,6 @@ enum StateType CPP_11(: Int)
 		APPROACH_TARGET,											///< Approach a non-moving target.
 		AIM_AT_TARGET,												///< rotate to face GoalObject or GoalPosition
 		FIRE_WEAPON,													///< fire the machine owner's current weapon
-		NUM_ATTACK_STATES
 	};
 	AttackStateMachine( Object *owner, AIAttackState* att, AsciiString name, Bool follow, Bool attackingObject, Bool forceAttacking );
 
@@ -212,7 +207,7 @@ enum StateType CPP_11(: Int)
 //-----------------------------------------------------------------------------------------------------------
 class AIIdleState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIIdleState, "AIIdleState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIIdleState, "AIIdleState")
 private:
 
 	UnsignedShort m_initialSleepOffset;
@@ -248,10 +243,10 @@ EMPTY_DTOR(AIIdleState)
  */
 class AIInternalMoveToState : public State
 {
-	MEMORY_POOL_GLUE_ABC(AIInternalMoveToState)		
+	MEMORY_POOL_GLUE_ABC(AIInternalMoveToState)
 public:
-	AIInternalMoveToState( StateMachine *machine, AsciiString name ) : State( machine, name ) 
-	{ 
+	AIInternalMoveToState( StateMachine *machine, AsciiString name ) : State( machine, name )
+	{
 		m_goalPosition.zero();
 		m_pathGoalPosition.zero();
 		m_pathTimestamp = 0;
@@ -299,7 +294,7 @@ class AIInternalMoveToState : public State
 	AudioHandle		m_ambientPlayingHandle;							///< Audio handle for the looping sound that we may play.
 	UnsignedInt		m_pathTimestamp;										///< time of last pathfind
 	UnsignedInt		m_blockedRepathTimestamp;						///< time of last blocked pathfind
-	Bool					m_adjustDestinations;								///< Adjust destinations to avoid stacking units on top of each other.  Normally true, but 
+	Bool					m_adjustDestinations;								///< Adjust destinations to avoid stacking units on top of each other.  Normally true, but
 																										//   occasionally false for things like car bombs.
 protected:
 	Bool					m_waitingForPath;										///< If we are waiting for a path.
@@ -313,7 +308,7 @@ EMPTY_DTOR(AIInternalMoveToState)
  */
 class AIRappelState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIRappelState, "AIRappelState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIRappelState, "AIRappelState")
 protected:
 	Real m_rappelRate;
 	Real m_destZ;
@@ -338,7 +333,7 @@ EMPTY_DTOR(AIRappelState)
  */
 class AIBusyState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIBusyState, "AIBusyState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIBusyState, "AIBusyState")
 public:
 	AIBusyState( StateMachine *machine ) : State( machine, "AIBusyState" ) { }
 	virtual StateReturnType onEnter() { return STATE_CONTINUE; }
@@ -360,7 +355,7 @@ EMPTY_DTOR(AIBusyState)
  */
 class AIMoveToState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveToState, "AIMoveToState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveToState, "AIMoveToState")
 protected:
 	Bool m_isMoveTo;
 public:
@@ -377,7 +372,7 @@ EMPTY_DTOR(AIMoveToState)
  */
 class AIMoveOutOfTheWayState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveOutOfTheWayState, "AIMoveOutOfTheWayState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveOutOfTheWayState, "AIMoveOutOfTheWayState")
 public:
 	AIMoveOutOfTheWayState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveOutOfTheWayState" ) { }
 	virtual StateReturnType onEnter();
@@ -395,14 +390,14 @@ EMPTY_DTOR(AIMoveOutOfTheWayState)
  */
 class AIMoveAndTightenState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAndTightenState, "AIMoveAndTightenState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAndTightenState, "AIMoveAndTightenState")
 public:
-	AIMoveAndTightenState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveAndTightenState" ) 
+	AIMoveAndTightenState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveAndTightenState" )
 	{
 		m_checkForPath = false;
 		m_okToRepathTimes = 0;
 	}
-	AIMoveAndTightenState( StateMachine *machine, const char *name ) : AIInternalMoveToState( machine, name ) 
+	AIMoveAndTightenState( StateMachine *machine, const char *name ) : AIInternalMoveToState( machine, name )
 	{
 		m_checkForPath = false;
 		m_okToRepathTimes = 0;
@@ -411,7 +406,7 @@ class AIMoveAndTightenState : public AIInternalMoveToState
 	virtual StateReturnType update();
 protected:
 	virtual Bool computePath();												///< compute the path
-	Int m_okToRepathTimes; 
+	Int m_okToRepathTimes;
 	Bool m_checkForPath;
 protected:
 	// snapshot interface
@@ -427,7 +422,7 @@ EMPTY_DTOR(AIMoveAndTightenState)
  */
 class AIMoveAwayFromRepulsorsState : public AIMoveAndTightenState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAwayFromRepulsorsState, "AIMoveAwayFromRepulsorsState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAwayFromRepulsorsState, "AIMoveAwayFromRepulsorsState")
 public:
 	AIMoveAwayFromRepulsorsState( StateMachine *machine ) : AIMoveAndTightenState( machine, "AIMoveAwayFromRepulsors" ) { }
 	virtual StateReturnType onEnter();
@@ -445,16 +440,16 @@ EMPTY_DTOR(AIMoveAwayFromRepulsorsState)
  */
 class AIAttackApproachTargetState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackApproachTargetState, "AIAttackApproachTargetState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackApproachTargetState, "AIAttackApproachTargetState")
 public:
-	AIAttackApproachTargetState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking ) : 
-		AIInternalMoveToState( machine, "AIAttackApproachTargetState" ), 
+	AIAttackApproachTargetState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking ) :
+		AIInternalMoveToState( machine, "AIAttackApproachTargetState" ),
 		m_follow(follow),
 		m_isAttackingObject(attackingObject),
 		m_isInitialApproach(true),
 		m_isForceAttacking(forceAttacking)
-	{ 
-		// we're setting m_isInitialApproach to true in the constructor because we want the first pass 
+	{
+		// we're setting m_isInitialApproach to true in the constructor because we want the first pass
 		// through this state to allow a unit to attack incidental targets (if it is turreted)
 	}
 	virtual StateReturnType onEnter();
@@ -491,18 +486,18 @@ EMPTY_DTOR(AIAttackApproachTargetState)
  */
 class AIAttackPursueTargetState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackPursueTargetState, "AIAttackPursueTargetState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackPursueTargetState, "AIAttackPursueTargetState")
 public:
-	AIAttackPursueTargetState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking ) : 
-		AIInternalMoveToState( machine, "AIAttackPursueTargetState" ), 
+	AIAttackPursueTargetState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking ) :
+		AIInternalMoveToState( machine, "AIAttackPursueTargetState" ),
 		m_follow(follow),
 		m_isAttackingObject(attackingObject),
 		m_isInitialApproach(true),
 		m_isForceAttacking(forceAttacking),
 		m_approachTimestamp(0),
 		m_stopIfInRange(false)
-	{ 
-		// we're setting m_isInitialApproach to true in the constructor because we want the first pass 
+	{
+		// we're setting m_isInitialApproach to true in the constructor because we want the first pass
 		// through this state to allow a unit to attack incidental targets (if it is turreted)
 	}
 	virtual StateReturnType onEnter();
@@ -539,12 +534,12 @@ EMPTY_DTOR(AIAttackPursueTargetState)
  */
 class AIPickUpCrateState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIPickUpCrateState, "AIPickUpCrateState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIPickUpCrateState, "AIPickUpCrateState")
 public:
-	AIPickUpCrateState( StateMachine *machine ) : 
+	AIPickUpCrateState( StateMachine *machine ) :
 		AIInternalMoveToState( machine, "AIAttackPickUpCrateState" )
-	{ 
-		// we're setting m_isInitialApproach to true in the constructor because we want the first pass 
+	{
+		// we're setting m_isInitialApproach to true in the constructor because we want the first pass
 		// through this state to allow a unit to attack incidental targets (if it is turreted)
 	}
 	virtual StateReturnType onEnter();
@@ -569,7 +564,7 @@ EMPTY_DTOR(AIPickUpCrateState)
  */
  class AIAttackMoveToState : public AIMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackMoveToState, "AIAttackMoveToState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackMoveToState, "AIAttackMoveToState")
 public:
 	AIAttackMoveToState( StateMachine *machine );
 	//virtual ~AIAttackMoveToState();
@@ -601,16 +596,16 @@ EMPTY_DTOR(AIPickUpCrateState)
  */
 class AIFollowWaypointPathState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFollowWaypointPathState, "AIFollowWaypointPathState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFollowWaypointPathState, "AIFollowWaypointPathState")
 public:
-	AIFollowWaypointPathState( StateMachine *machine, Bool asGroup ) : m_isFollowWaypointPathState(true), 
-		m_moveAsGroup(asGroup), AIInternalMoveToState( machine, "AIFollowWaypointPathState" ) 
+	AIFollowWaypointPathState( StateMachine *machine, Bool asGroup ) : m_isFollowWaypointPathState(true),
+		m_moveAsGroup(asGroup), AIInternalMoveToState( machine, "AIFollowWaypointPathState" )
 	{
 		m_angle = 0.0f;
 	}
-	AIFollowWaypointPathState( StateMachine *machine, Bool asGroup, Bool isFollow) : 
-		m_isFollowWaypointPathState(isFollow), m_moveAsGroup(asGroup), AIInternalMoveToState( machine, 
-																"AIFollowWaypointPathState" ) 
+	AIFollowWaypointPathState( StateMachine *machine, Bool asGroup, Bool isFollow) :
+		m_isFollowWaypointPathState(isFollow), m_moveAsGroup(asGroup), AIInternalMoveToState( machine,
+																"AIFollowWaypointPathState" )
 	{
 		m_angle = 0.0f;
 	}
@@ -633,7 +628,7 @@ class AIFollowWaypointPathState : public AIInternalMoveToState
 	Bool m_appendGoalPosition;
 
 	const Bool m_moveAsGroup;
-	// this is necessary because we derive from FollowWaypointPathState, but we do not want to incur the 
+	// this is necessary because we derive from FollowWaypointPathState, but we do not want to incur the
 	// expense of checking RTTI to determine whether we are actually a FollowWaypointPathState or not
 	const Bool m_isFollowWaypointPathState;	// derived classes should set this false.
 
@@ -651,9 +646,9 @@ EMPTY_DTOR(AIFollowWaypointPathState)
  */
 class AIFollowWaypointPathExactState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFollowWaypointPathExactState, "AIFollowWaypointPathExactState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFollowWaypointPathExactState, "AIFollowWaypointPathExactState")
 public:
-	AIFollowWaypointPathExactState( StateMachine *machine, Bool asGroup ) : m_moveAsGroup(asGroup), 
+	AIFollowWaypointPathExactState( StateMachine *machine, Bool asGroup ) : m_moveAsGroup(asGroup),
 		m_lastWaypoint(NULL),
 		AIInternalMoveToState( machine, "AIFollowWaypointPathExactState" ) { }
 	virtual StateReturnType onEnter();
@@ -678,7 +673,7 @@ EMPTY_DTOR(AIFollowWaypointPathExactState)
  */
 class AIAttackFollowWaypointPathState : public AIFollowWaypointPathState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackFollowWaypointPathState, "AIAttackFollowWaypointPathState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackFollowWaypointPathState, "AIAttackFollowWaypointPathState")
 public:
 	AIAttackFollowWaypointPathState( StateMachine *machine, Bool asGroup );
 	//virtual ~AIAttackFollowWaypointPathState();
@@ -705,13 +700,13 @@ class AIAttackFollowWaypointPathState : public AIFollowWaypointPathState
  */
 class AIWanderState : public AIFollowWaypointPathState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWanderState, "AIWanderState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWanderState, "AIWanderState")
 public:
-	AIWanderState( StateMachine *machine ) : AIFollowWaypointPathState( machine, false ) 
-	{ 
+	AIWanderState( StateMachine *machine ) : AIFollowWaypointPathState( machine, false )
+	{
 #ifdef STATE_MACHINE_DEBUG
 		setName("AIWanderState");
-#endif 
+#endif
 		m_timer = 0;
 		m_waitFrames = 0;
 	}
@@ -737,9 +732,9 @@ EMPTY_DTOR(AIWanderState)
  */
 class AIWanderInPlaceState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWanderInPlaceState, "AIWanderInPlaceState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWanderInPlaceState, "AIWanderInPlaceState")
 public:
-	AIWanderInPlaceState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIWanderInPlaceState" ) 
+	AIWanderInPlaceState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIWanderInPlaceState" )
 	{
 		m_origin.zero();
 		m_waitFrames = 0;
@@ -757,7 +752,7 @@ class AIWanderInPlaceState : public AIInternalMoveToState
 
 protected:
 	void computeWanderGoal();
-	Coord3D m_origin;									///< The point we're wandering around.	
+	Coord3D m_origin;									///< The point we're wandering around.
 	Int		m_waitFrames;
 	Int		m_timer;
 };
@@ -769,13 +764,13 @@ EMPTY_DTOR(AIWanderInPlaceState)
  */
 class AIPanicState : public AIFollowWaypointPathState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIPanicState, "AIPanicState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIPanicState, "AIPanicState")
 public:
 	AIPanicState( StateMachine *machine ) : AIFollowWaypointPathState( machine, false)
-	{ 
+	{
 #ifdef STATE_MACHINE_DEBUG
 		setName("AIPanicState");
-#endif	
+#endif
 	}
 	virtual StateReturnType onEnter();
 	virtual StateReturnType update();
@@ -799,10 +794,10 @@ EMPTY_DTOR(AIPanicState)
  */
 class AIFollowPathState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFollowPathState, "AIFollowPathState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFollowPathState, "AIFollowPathState")
 public:
-	AIFollowPathState( StateMachine *machine, AsciiString name = "AIFollowPathState" ) : 
-		m_adjustFinal(true), 
+	AIFollowPathState( StateMachine *machine, AsciiString name = "AIFollowPathState" ) :
+		m_adjustFinal(true),
 		m_adjustFinalOverride(false),
 		m_index(0),
 		m_retryCount(10),
@@ -824,7 +819,7 @@ class AIFollowPathState : public AIInternalMoveToState
 	virtual void loadPostProcess();
 
 private:
-	Int m_index;																		///< current path index	
+	Int m_index;																		///< current path index
 	Bool m_adjustFinal;
 	Bool m_adjustFinalOverride;
 	Int m_retryCount;
@@ -837,9 +832,9 @@ EMPTY_DTOR(AIFollowPathState)
  */
 class AIMoveAndEvacuateState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAndEvacuateState, "AIMoveAndEvacuateState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAndEvacuateState, "AIMoveAndEvacuateState")
 public:
-	AIMoveAndEvacuateState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveAndEvacuateState" ) 
+	AIMoveAndEvacuateState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveAndEvacuateState" )
 	{
 		m_origin.zero();
 	}
@@ -853,7 +848,7 @@ class AIMoveAndEvacuateState : public AIInternalMoveToState
 	virtual void loadPostProcess();
 
 private:
-	Coord3D m_origin;													///< current position - set as goal on exit in case we follow with MoveToAndDelete.	
+	Coord3D m_origin;													///< current position - set as goal on exit in case we follow with MoveToAndDelete.
 };
 EMPTY_DTOR(AIMoveAndEvacuateState)
 
@@ -863,9 +858,9 @@ EMPTY_DTOR(AIMoveAndEvacuateState)
  */
 class AIMoveAndDeleteState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAndDeleteState, "AIMoveAndDeleteState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAndDeleteState, "AIMoveAndDeleteState")
 public:
-	AIMoveAndDeleteState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveAndDeleteState" ) 
+	AIMoveAndDeleteState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveAndDeleteState" )
 	{
 		m_appendGoalPosition = FALSE;
 	}
@@ -886,15 +881,15 @@ EMPTY_DTOR(AIMoveAndDeleteState)
 //-----------------------------------------------------------------------------------------------------------
 class AIAttackAimAtTargetState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackAimAtTargetState, "AIAttackAimAtTargetState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackAimAtTargetState, "AIAttackAimAtTargetState")
 public:
-	AIAttackAimAtTargetState( StateMachine *machine, Bool attackingObject, Bool forceAttacking ) : 
+	AIAttackAimAtTargetState( StateMachine *machine, Bool attackingObject, Bool forceAttacking ) :
 		State( machine, "AIAttackAimAtTargetState" ),
 		m_isAttackingObject(attackingObject),
 		m_canTurnInPlace(false),
 		m_isForceAttacking(forceAttacking),
 		m_setLocomotor(false)
-	{ 
+	{
 	}
 	virtual StateReturnType onEnter();
 	virtual void onExit( StateExitType status );
@@ -915,7 +910,7 @@ EMPTY_DTOR(AIAttackAimAtTargetState)
 //-----------------------------------------------------------------------------------------------------------
 class AIWaitState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWaitState, "AIWaitState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWaitState, "AIWaitState")
 public:
 	AIWaitState( StateMachine *machine ) : State( machine,"AIWaitState" ) { }
 	virtual StateReturnType update();
@@ -941,12 +936,12 @@ class NotifyWeaponFiredInterface	// an ABC
 //-----------------------------------------------------------------------------------------------------------
 class AIAttackFireWeaponState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackFireWeaponState, "AIAttackFireWeaponState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackFireWeaponState, "AIAttackFireWeaponState")
 public:
-	AIAttackFireWeaponState( StateMachine *machine, NotifyWeaponFiredInterface* att ) : 
-		State( machine, "AIAttackFireWeaponState" ), 
-		m_att(att) 
-	{ 
+	AIAttackFireWeaponState( StateMachine *machine, NotifyWeaponFiredInterface* att ) :
+		State( machine, "AIAttackFireWeaponState" ),
+		m_att(att)
+	{
 	}
 	virtual StateReturnType update();
 	virtual void onExit( StateExitType status );
@@ -971,7 +966,7 @@ class AttackExitConditionsInterface
 //-----------------------------------------------------------------------------------------------------------
 class AIAttackState : public State, public NotifyWeaponFiredInterface
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackState, "AIAttackState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackState, "AIAttackState")
 public:
 
 	AIAttackState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking, AttackExitConditionsInterface* attackParameters);
@@ -985,7 +980,7 @@ class AIAttackState : public State, public NotifyWeaponFiredInterface
 	virtual void notifyNewVictimChosen(Object* victim);
 	virtual const Coord3D* getOriginalVictimPos() const { return &m_originalVictimPos; }
 	virtual Bool isWeaponSlotOkToFire(WeaponSlotType wslot) const { return true; }
-	virtual Bool isAttackingObject() const { return m_isAttackingObject; } 
+	virtual Bool isAttackingObject() const { return m_isAttackingObject; }
 	virtual Bool isForceAttacking() const { return m_isForceAttacking; }
 #ifdef STATE_MACHINE_DEBUG
 	virtual AsciiString getName() const ;
@@ -1016,9 +1011,9 @@ class AIAttackState : public State, public NotifyWeaponFiredInterface
 //-----------------------------------------------------------------------------------------------------------
 class AIAttackSquadState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackSquadState, "AIAttackSquadState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackSquadState, "AIAttackSquadState")
 public:
-	AIAttackSquadState( StateMachine *machine, AttackExitConditionsInterface *attackParameters = NULL) : 
+	AIAttackSquadState( StateMachine *machine, AttackExitConditionsInterface *attackParameters = NULL) :
 			State( machine , "AIAttackSquadState") {	}
 	//~AIAttackSquadState();
 
@@ -1044,7 +1039,7 @@ class AIAttackSquadState : public State
 //-----------------------------------------------------------------------------------------------------------
 class AIDeadState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDeadState, "AIDeadState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDeadState, "AIDeadState")
 public:
 	AIDeadState( StateMachine *machine ) : State( machine, "AIDeadState" ) { }
 	virtual StateReturnType onEnter();
@@ -1061,7 +1056,7 @@ EMPTY_DTOR(AIDeadState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockState, "AIDockState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockState, "AIDockState")
 public:
 	AIDockState( StateMachine *machine ) : State( machine, "AIDockState" ), m_dockMachine(NULL), m_usingPrecisionMovement(FALSE) { }
 	//~AIDockState();
@@ -1088,7 +1083,7 @@ class AIDockState : public State
  */
 class AIEnterState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIEnterState, "AIEnterState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIEnterState, "AIEnterState")
 protected:
 	ObjectID m_entryToClear;
 protected:
@@ -1107,7 +1102,7 @@ EMPTY_DTOR(AIEnterState)
 //-----------------------------------------------------------------------------------------------------------
 class AIExitState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIExitState, "AIExitState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIExitState, "AIExitState")
 protected:
 	ObjectID m_entryToClear;
 protected:
@@ -1129,9 +1124,9 @@ EMPTY_DTOR(AIExitState)
  */
 class AIGuardState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardState, "AIGuardState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardState, "AIGuardState")
 public:
-	AIGuardState( StateMachine *machine ) : State( machine, "AIGuardState" ), m_guardMachine(NULL) 
+	AIGuardState( StateMachine *machine ) : State( machine, "AIGuardState" ), m_guardMachine(NULL)
 	{
 		m_guardMachine = NULL;
 	}
@@ -1158,9 +1153,9 @@ class AIGuardState : public State
  */
 class AITunnelNetworkGuardState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITunnelNetworkGuardState, "AITunnelNetworkGuardState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITunnelNetworkGuardState, "AITunnelNetworkGuardState")
 public:
-	AITunnelNetworkGuardState( StateMachine *machine ) : State( machine, "AITunnelNetworkGuardState" ), m_guardMachine(NULL) 
+	AITunnelNetworkGuardState( StateMachine *machine ) : State( machine, "AITunnelNetworkGuardState" ), m_guardMachine(NULL)
 	{
 		m_guardMachine = NULL;
 	}
@@ -1187,10 +1182,10 @@ class AITunnelNetworkGuardState : public State
  */
 class AIHuntState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIHuntState, "AIHuntState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIHuntState, "AIHuntState")
 public:
-	AIHuntState( StateMachine *machine ) : State( machine, "AIHuntState" ), m_huntMachine(NULL) 
-	{ 
+	AIHuntState( StateMachine *machine ) : State( machine, "AIHuntState" ), m_huntMachine(NULL)
+	{
 		m_nextEnemyScanTime = 0;
 	}
 	//~AIHuntState();
@@ -1219,9 +1214,9 @@ class AIHuntState : public State
  */
 class AIAttackAreaState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackAreaState, "AIAttackAreaState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackAreaState, "AIAttackAreaState")
 public:
-	AIAttackAreaState( StateMachine *machine ) : State( machine, "AIAttackAreaState" ), m_attackMachine(NULL), 
+	AIAttackAreaState( StateMachine *machine ) : State( machine, "AIAttackAreaState" ), m_attackMachine(NULL),
 		m_nextEnemyScanTime(0) { }
 	//~AIAttackAreaState();
 	virtual StateReturnType onEnter();
@@ -1248,7 +1243,7 @@ class AIAttackAreaState : public State
 //-----------------------------------------------------------------------------------------------------------
 class AIFaceState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFaceState, "AIFaceState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFaceState, "AIFaceState")
 public:
 	AIFaceState( StateMachine *machine, Bool obj ) : State( machine, "AIFaceState" ), m_canTurnInPlace(false), m_obj(obj) { }
 	virtual StateReturnType onEnter();
@@ -1265,5 +1260,3 @@ class AIFaceState : public State
 	Bool m_canTurnInPlace;
 };
 EMPTY_DTOR(AIFaceState)
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h b/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h
index d458a83b1e0..ec7efe94237 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: AITNGuard.h 
+// FILE: AITNGuard.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -38,8 +38,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_AITNGUARD_
-#define _H_AITNGUARD_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
@@ -52,7 +50,7 @@
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 enum
 {
-	// prevent collisions with other states that we might use, (namely AI_IDLE) 
+	// prevent collisions with other states that we might use, (namely AI_IDLE)
 	AI_TN_GUARD_INNER = 5000,					///< Attack anything within this area till death
 	AI_TN_GUARD_IDLE,									///< Wait till something shows up to attack.
 	AI_TN_GUARD_OUTER,									///< Attack anything within this area that has been aggressive, until the timer expires
@@ -95,12 +93,12 @@ class AITNGuardMachine : public StateMachine
 	virtual void loadPostProcess();
 
 public:
-	/** 
+	/**
 	 * The implementation of this constructor defines the states
 	 * used by this machine.
 	 */
 	AITNGuardMachine( Object *owner );
-	
+
 	const Coord3D *getPositionToGuard( void ) const { return &m_positionToGuard; }
 	void setTargetPositionToGuard( const Coord3D *pos) { m_positionToGuard = *pos; }
 
@@ -118,9 +116,12 @@ class AITNGuardMachine : public StateMachine
 //--------------------------------------------------------------------------------------
 class AITNGuardInnerState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardInnerState, "AITNGuardInnerState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardInnerState, "AITNGuardInnerState")
 public:
-	AITNGuardInnerState( StateMachine *machine ) : State( machine, "AITNGuardInner" ) { }
+	AITNGuardInnerState( StateMachine *machine ) : State( machine, "AITNGuardInner" )
+	{
+		m_attackState = NULL;
+	}
 	virtual StateReturnType onEnter( void );
 	virtual StateReturnType update( void );
 	virtual void onExit( StateExitType status );
@@ -132,16 +133,15 @@ class AITNGuardInnerState : public State
 private:
 	AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); }
 
-	TunnelNetworkExitConditions m_exitConditions; 
+	TunnelNetworkExitConditions m_exitConditions;
 	Bool			m_scanForEnemy;
 	AIAttackState *m_attackState;
 };
-EMPTY_DTOR(AITNGuardInnerState)
 
 //--------------------------------------------------------------------------------------
 class AITNGuardIdleState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardIdleState, "AITNGuardIdleState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardIdleState, "AITNGuardIdleState")
 public:
 	AITNGuardIdleState( StateMachine *machine ) : State( machine, "AITNGuardIdleState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -163,9 +163,9 @@ EMPTY_DTOR(AITNGuardIdleState)
 //--------------------------------------------------------------------------------------
 class AITNGuardOuterState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardOuterState, "AITNGuardOuterState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardOuterState, "AITNGuardOuterState")
 public:
-	AITNGuardOuterState( StateMachine *machine ) : State( machine, "AITNGuardOuter" ) 
+	AITNGuardOuterState( StateMachine *machine ) : State( machine, "AITNGuardOuter" )
 	{
 		m_attackState = NULL;
 	}
@@ -180,15 +180,14 @@ class AITNGuardOuterState : public State
 private:
 	AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); }
 
-	TunnelNetworkExitConditions m_exitConditions; 
+	TunnelNetworkExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 };
-EMPTY_DTOR(AITNGuardOuterState)
 
 //--------------------------------------------------------------------------------------
 class AITNGuardReturnState : public AIEnterState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardReturnState, "AITNGuardReturnState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardReturnState, "AITNGuardReturnState")
 private:
 	AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); }
 public:
@@ -215,7 +214,7 @@ EMPTY_DTOR(AITNGuardReturnState)
 //--------------------------------------------------------------------------------------
 class AITNGuardPickUpCrateState : public AIPickUpCrateState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardPickUpCrateState, "AITNGuardPickUpCrateState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardPickUpCrateState, "AITNGuardPickUpCrateState")
 public:
 	AITNGuardPickUpCrateState( StateMachine *machine );
 	virtual StateReturnType onEnter( void );
@@ -227,7 +226,7 @@ EMPTY_DTOR(AITNGuardPickUpCrateState)
 //--------------------------------------------------------------------------------------
 class AITNGuardAttackAggressorState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardAttackAggressorState, "AITNGuardAttackAggressorState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardAttackAggressorState, "AITNGuardAttackAggressorState")
 public:
 	AITNGuardAttackAggressorState( StateMachine *machine );
 	virtual StateReturnType onEnter( void );
@@ -240,12 +239,8 @@ class AITNGuardAttackAggressorState : public State
 	virtual void loadPostProcess();
 private:
 	AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); }
-	TunnelNetworkExitConditions m_exitConditions; 
+	TunnelNetworkExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 };
 
-EMPTY_DTOR(AITNGuardAttackAggressorState)
-
 //--------------------------------------------------------------------------------------
-
-#endif /* _H_AIGUARD_ */
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Armor.h b/Generals/Code/GameEngine/Include/GameLogic/Armor.h
index b810af07863..829d1e84f1f 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Armor.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Armor.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _Armor_H_
-#define _Armor_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/NameKeyGenerator.h"
 #include "Common/STLTypedefs.h"
@@ -41,7 +38,7 @@
 class ArmorStore;
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
 	An Armor encapsulates the a particular type of actual modifier to damage taken, in order
 	to simulate different materials, and to help make game balance easier to adjust.
 */
@@ -56,8 +53,8 @@ class ArmorTemplate
 
 	/**
 		This is the real "meat" of the class: given a damage type and amount, adjust the damage
-		and return the amount that should be dealt. 
-	*/	
+		and return the amount that should be dealt.
+	*/
 	Real adjustDamage(DamageType t, Real damage) const;
 
 	static void parseArmorCoefficients( INI* ini, void *instance, void* /* store */, const void* userData );
@@ -66,15 +63,15 @@ class ArmorTemplate
 
 private:
 	Real						m_damageCoefficient[DAMAGE_NUM_TYPES];	///< modifiers to damage
-};  
+};
 
 //-------------------------------------------------------------------------------------------------
 class Armor
 {
 public:
 
-	inline Armor(const ArmorTemplate* tmpl = NULL) : m_template(tmpl) 
-	{ 
+	inline Armor(const ArmorTemplate* tmpl = NULL) : m_template(tmpl)
+	{
 	}
 
 	inline Real adjustDamage(DamageType t, Real damage) const
@@ -108,10 +105,12 @@ class ArmorStore : public SubsystemInterface
 	void reset() { }
 	void update() { }
 
+	const ArmorTemplate* findArmorTemplate(NameKeyType namekey) const;
 	/**
 		Find the Armor with the given name. If no such Armor exists, return null.
 	*/
-	const ArmorTemplate* findArmorTemplate(AsciiString name) const;
+	const ArmorTemplate* findArmorTemplate(const AsciiString& name) const;
+	const ArmorTemplate* findArmorTemplate(const char* name) const;
 
 	inline Armor makeArmor(const ArmorTemplate *tmpl) const
 	{
@@ -129,6 +128,3 @@ class ArmorStore : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern ArmorStore *TheArmorStore;
-
-#endif // _Armor_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h b/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h
index fe0bd377dab..d684bee3675 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h
@@ -26,13 +26,9 @@
 
 #pragma once
 
-#ifndef _ArmorSet_H_
-#define _ArmorSet_H_
-
 #include "Lib/BaseType.h"
 #include "Common/GameType.h"
 #include "Common/SparseMatchFinder.h"
-#include "Common/SparseMatchFinder.h"
 
 //-------------------------------------------------------------------------------------------------
 class ArmorTemplate;
@@ -52,7 +48,7 @@ enum ArmorSetType CPP_11(: Int)
 	ARMORSET_PLAYER_UPGRADE = 3,
 	ARMORSET_WEAK_VERSUS_BASEDEFENSES = 4,
 
-	ARMORSET_COUNT			///< keep last, please
+	ARMORSET_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -67,25 +63,25 @@ class ArmorTemplateSet
 	const DamageFX* m_fx;
 
 public:
-	inline ArmorTemplateSet()
+	ArmorTemplateSet()
 	{
 		clear();
 	}
 
-	inline void clear()
+	void clear()
 	{
 		m_types.clear();
 		m_template = NULL;
 		m_fx = NULL;
 	}
 
-	inline const ArmorTemplate* getArmorTemplate() const { return m_template; } 
-	inline const DamageFX* getDamageFX() const { return m_fx; } 
+	const ArmorTemplate* getArmorTemplate() const { return m_template; }
+	const DamageFX* getDamageFX() const { return m_fx; }
 
-	inline Int getConditionsYesCount() const { return 1; }
-	inline const ArmorSetFlags& getNthConditionsYes(Int i) const { return m_types; }
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	inline AsciiString getDescription() const { return AsciiString("ArmorTemplateSet"); }
+	Int getConditionsYesCount() const { return 1; }
+	const ArmorSetFlags& getNthConditionsYes(Int i) const { return m_types; }
+#if defined(RTS_DEBUG)
+	inline AsciiString getDescription() const { return "ArmorTemplateSet"; }
 #endif
 
 	void parseArmorTemplateSet( INI* ini );
@@ -93,8 +89,3 @@ class ArmorTemplateSet
 
 //-------------------------------------------------------------------------------------------------
 typedef std::vector<ArmorTemplateSet> ArmorTemplateSetVector;
-
-//-------------------------------------------------------------------------------------------------
-typedef SparseMatchFinder<ArmorTemplateSet, ArmorSetFlags> ArmorTemplateSetFinder;
-
-#endif	// _ArmorSet_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h b/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h
index f148b63bf24..1a3637e75a8 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef CAVE_SYSTEM_H
-#define CAVE_SYSTEM_H
-
 class Object;
 class TunnelTracker; // The player owns one such object for his Tunnels, so instead of duplicating
 // so much code, this SubSystem will manage all of the Cave systems.
@@ -39,7 +36,7 @@ class TunnelTracker; // The player owns one such object for his Tunnels, so inst
 #include "Common/Snapshot.h"
 #include "Common/SubsystemInterface.h"
 
-/** 
+/**
 		System responsible for Crates as code objects - ini, new/delete etc
 */
 class CaveSystem : public SubsystemInterface,
@@ -55,7 +52,7 @@ class CaveSystem : public SubsystemInterface,
 
 	Bool canSwitchIndexToIndex( Int oldIndex, Int newIndex ); // If either Index has guys in it, no, you can't
 	void registerNewCave( Int theIndex );			// All Caves are born with a default index, which could be new
-	void unregisterCave( Int theIndex );				// 
+	void unregisterCave( Int theIndex );				//
 	TunnelTracker *getTunnelTrackerForCaveIndex( Int theIndex );
 
 protected:
@@ -73,4 +70,3 @@ class CaveSystem : public SubsystemInterface,
 };
 
 extern CaveSystem *TheCaveSystem;
-#endif
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h
index 4954637bc1f..c7c4745e31c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef CRATE_SYSTEM_H
-#define CRATE_SYSTEM_H
-
 #include "Common/INI.h"
 #include "Common/Overridable.h"
 #include "Common/Override.h"
@@ -48,7 +45,7 @@ typedef std::list< crateCreationEntry >											crateCreationEntryList;
 typedef std::list< crateCreationEntry >::iterator						crateCreationEntryIterator;
 typedef std::list< crateCreationEntry >::const_iterator			crateCreationEntryConstIterator;
 
-/** 
+/**
 		A CrateTemplate is a ini defined set of conditions plus a ThingTemplate that is the Object
 		containing the correct CrateCollide module.
 */
@@ -63,7 +60,7 @@ class CrateTemplate : public Overridable
 	void setName( AsciiString name ) { m_name = name; }
 	AsciiString getName(){ return m_name; }
 
-	inline const FieldParse *getFieldParse() const { return TheCrateTemplateFieldParseTable; }
+	const FieldParse *getFieldParse() const { return TheCrateTemplateFieldParseTable; }
 	static const FieldParse TheCrateTemplateFieldParseTable[];		///< the parse table for INI definition
 
 	static void parseCrateCreationEntry( INI* ini, void *instance, void *store, const void* /*userData*/ );
@@ -84,7 +81,7 @@ class CrateTemplate : public Overridable
 typedef OVERRIDE<CrateTemplate> CrateTemplateOverride;
 
 
-/** 
+/**
 		System responsible for Crates as code objects - ini, new/delete etc
 */
 class CrateSystem : public SubsystemInterface
@@ -103,7 +100,7 @@ class CrateSystem : public SubsystemInterface
 	CrateTemplate *newCrateTemplate( AsciiString name );
 	CrateTemplate *newCrateTemplateOverride( CrateTemplate *crateToOverride );
 
-	
+
 
 	static void parseCrateTemplateDefinition(INI* ini);
 
@@ -113,4 +110,3 @@ class CrateSystem : public SubsystemInterface
 };
 
 extern CrateSystem *TheCrateSystem;
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Damage.h b/Generals/Code/GameEngine/Include/GameLogic/Damage.h
index 5bbc50fd9b9..452fde8ce2f 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Damage.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Damage.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DAMAGE_H_
-#define __DAMAGE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameType.h"
 #include "Common/Snapshot.h"
@@ -44,20 +41,20 @@ class INI;
 /** Damage types, keep this in sync with TheDamageNames[] */
 //-------------------------------------------------------------------------------------------------
 enum DamageType CPP_11(: Int)
-{	
-	DAMAGE_EXPLOSION							= 0,			
-	DAMAGE_CRUSH									= 1,					
+{
+	DAMAGE_EXPLOSION							= 0,
+	DAMAGE_CRUSH									= 1,
 	DAMAGE_ARMOR_PIERCING					= 2,
-	DAMAGE_SMALL_ARMS							= 3,		
-	DAMAGE_GATTLING								= 4,				
-	DAMAGE_RADIATION							= 5,			
-	DAMAGE_FLAME									= 6,					
-	DAMAGE_LASER									= 7,					
-	DAMAGE_SNIPER									= 8,				
-	DAMAGE_POISON									= 9,			
-	DAMAGE_HEALING								= 10,	
+	DAMAGE_SMALL_ARMS							= 3,
+	DAMAGE_GATTLING								= 4,
+	DAMAGE_RADIATION							= 5,
+	DAMAGE_FLAME									= 6,
+	DAMAGE_LASER									= 7,
+	DAMAGE_SNIPER									= 8,
+	DAMAGE_POISON									= 9,
+	DAMAGE_HEALING								= 10,
 	DAMAGE_UNRESISTABLE						= 11,		// this is for scripting to cause 'armorproof' damage
-	DAMAGE_WATER									= 12,	
+	DAMAGE_WATER									= 12,
 	DAMAGE_DEPLOY									= 13,					// for transports to deploy units and order them to all attack.
 // this stays, even if ALLOW_SURRENDER is not defed, since flashbangs still use 'em
 	DAMAGE_SURRENDER							= 14,				// if something "dies" to surrender damage, they surrender.... duh!
@@ -70,18 +67,18 @@ enum DamageType CPP_11(: Int)
 	DAMAGE_HAZARD_CLEANUP					= 21,	// special damage type for cleaning up hazards like radiation or bio-poison.
 	DAMAGE_PARTICLE_BEAM					= 22,	// Incinerates virtually everything (insanely powerful orbital beam)
 	DAMAGE_TOPPLING								= 23,	// damage from getting toppled.
-	DAMAGE_INFANTRY_MISSILE				= 24,	
-	DAMAGE_AURORA_BOMB						= 25,	
-	DAMAGE_LAND_MINE							= 26,	
-	DAMAGE_JET_MISSILES						= 27,	
-	DAMAGE_STEALTHJET_MISSILES		= 28,	
-	DAMAGE_MOLOTOV_COCKTAIL				= 29,	
-	DAMAGE_COMANCHE_VULCAN				= 30,	
+	DAMAGE_INFANTRY_MISSILE				= 24,
+	DAMAGE_AURORA_BOMB						= 25,
+	DAMAGE_LAND_MINE							= 26,
+	DAMAGE_JET_MISSILES						= 27,
+	DAMAGE_STEALTHJET_MISSILES		= 28,
+	DAMAGE_MOLOTOV_COCKTAIL				= 29,
+	DAMAGE_COMANCHE_VULCAN				= 30,
 	DAMAGE_FLESHY_SNIPER					= 31,		// like DAMAGE_SNIPER, but (generally) does no damage to vehicles.
 
 	// Please note: There is a string array below this enum, and when you change them,
 	// you need to search on the array names to find all the stuff that generates names
-	// based on these strings.  (eg DamageFX does a strcat to make its array of names so 
+	// based on these strings.  (eg DamageFX does a strcat to make its array of names so
 	// change DamageFX.ini and its Default)
 
 
@@ -96,47 +93,48 @@ enum DamageType CPP_11(: Int)
 	// !!!!!!!!!!!!!!!!!!!!! NOTE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	// !!!!!!!!!!!!!!!!!!!!! NOTE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-	DAMAGE_NUM_TYPES			// keep this last
+	DAMAGE_NUM_TYPES
 };
 
 #ifdef DEFINE_DAMAGE_NAMES
-static const char *TheDamageNames[] = 
+static const char *const TheDamageNames[] =
 {
-	"EXPLOSION",			
-	"CRUSH",					
+	"EXPLOSION",
+	"CRUSH",
 	"ARMOR_PIERCING",
-	"SMALL_ARMS",		
-	"GATTLING",			
-	"RADIATION",			
-	"FLAME",					
-	"LASER",					
-	"SNIPER",				
-	"POISON",			
-	"HEALING",	
-	"UNRESISTABLE",	
+	"SMALL_ARMS",
+	"GATTLING",
+	"RADIATION",
+	"FLAME",
+	"LASER",
+	"SNIPER",
+	"POISON",
+	"HEALING",
+	"UNRESISTABLE",
 	"WATER",
-	"DEPLOY",	
-	"SURRENDER",	
-	"HACK",	
-	"KILL_PILOT",	
-	"PENALTY",	
-	"FALLING",	
-	"MELEE",	
-	"DISARM",	
-	"HAZARD_CLEANUP",	
+	"DEPLOY",
+	"SURRENDER",
+	"HACK",
+	"KILL_PILOT",
+	"PENALTY",
+	"FALLING",
+	"MELEE",
+	"DISARM",
+	"HAZARD_CLEANUP",
 	"PARTICLE_BEAM",
 	"TOPPLING",
-	"INFANTRY_MISSILE",	
-	"AURORA_BOMB",	
-	"LAND_MINE",	
-	"JET_MISSILES",	
-	"STEALTHJET_MISSILES",	
-	"MOLOTOV_COCKTAIL",	
-	"COMANCHE_VULCAN",	
-	"FLESHY_SNIPER",	
+	"INFANTRY_MISSILE",
+	"AURORA_BOMB",
+	"LAND_MINE",
+	"JET_MISSILES",
+	"STEALTHJET_MISSILES",
+	"MOLOTOV_COCKTAIL",
+	"COMANCHE_VULCAN",
+	"FLESHY_SNIPER",
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheDamageNames) == DAMAGE_NUM_TYPES + 1, "Incorrect array size");
 #endif // end DEFINE_DAMAGE_NAMES
 
 
@@ -167,12 +165,12 @@ inline DamageTypeFlags clearDamageTypeFlag(DamageTypeFlags flags, DamageType dt)
 /** Death types, keep this in sync with TheDeathNames[] */
 //-------------------------------------------------------------------------------------------------
 enum DeathType CPP_11(: Int)
-{	
+{
 	// note that these DELIBERATELY have (slightly) different names from the damage names,
 	// since there isn't necessarily a one-to-one correspondence. e.g., DEATH_BURNED
 	// can come from DAMAGE_FLAME but also from DAMAGE_PARTICLE_BEAM.
 	DEATH_NORMAL		= 0,
-	DEATH_NONE			= 1,					///< this is a "special case" that can't normally cause death			
+	DEATH_NONE			= 1,					///< this is a "special case" that can't normally cause death
   DEATH_CRUSHED		= 2,
   DEATH_BURNED		= 3,
   DEATH_EXPLODED	= 4,
@@ -184,28 +182,28 @@ enum DeathType CPP_11(: Int)
 	DEATH_DETONATED	= 10,		/**< this is the "death" that occurs when a missile/warhead/etc detonates normally,
 														as opposed to being shot down, etc */
 	DEATH_SPLATTED	= 11,		/**< the death that results from DAMAGE_FALLING */
-	DEATH_POISONED_BETA	= 12,	
+	DEATH_POISONED_BETA	= 12,
 
 	// these are the "extra" types for yet-to-be-defined stuff. Don't bother renaming or adding
 	// or removing these; they are reserved for modders :-)
-	DEATH_EXTRA_2		= 13,	
-	DEATH_EXTRA_3		= 14,	
-	DEATH_EXTRA_4		= 15,	
-	DEATH_EXTRA_5		= 16,	
-	DEATH_EXTRA_6		= 17,	
-	DEATH_EXTRA_7		= 18,	
-	DEATH_EXTRA_8		= 19,	
-	
-	DEATH_NUM_TYPES			// keep this last
+	DEATH_EXTRA_2		= 13,
+	DEATH_EXTRA_3		= 14,
+	DEATH_EXTRA_4		= 15,
+	DEATH_EXTRA_5		= 16,
+	DEATH_EXTRA_6		= 17,
+	DEATH_EXTRA_7		= 18,
+	DEATH_EXTRA_8		= 19,
+
+	DEATH_NUM_TYPES
 };
 
 #ifdef DEFINE_DEATH_NAMES
-static const char *TheDeathNames[] = 
+static const char *const TheDeathNames[] =
 {
-	"NORMAL",			
-	"NONE",			
-	"CRUSHED",					
-	"BURNED",		
+	"NORMAL",
+	"NONE",
+	"CRUSHED",
+	"BURNED",
 	"EXPLODED",
 	"POISONED",
 	"TOPPLED",
@@ -214,18 +212,19 @@ static const char *TheDeathNames[] =
 	"LASERED",
 	"DETONATED",
 	"SPLATTED",
-	"POISONED_BETA",	
+	"POISONED_BETA",
 
-	"EXTRA_2",	
-	"EXTRA_3",	
-	"EXTRA_4",	
-	"EXTRA_5",	
-	"EXTRA_6",	
-	"EXTRA_7",	
-	"EXTRA_8",	
+	"EXTRA_2",
+	"EXTRA_3",
+	"EXTRA_4",
+	"EXTRA_5",
+	"EXTRA_6",
+	"EXTRA_7",
+	"EXTRA_8",
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheDeathNames) == DEATH_NUM_TYPES + 1, "Incorrect array size");
 #endif // end DEFINE_DEATH_NAMES
 
 
@@ -260,13 +259,13 @@ class DamageInfoInput : public Snapshot
 
 public:
 
-	DamageInfoInput( void ) 
-	{ 
-		m_sourceID = INVALID_ID; 
+	DamageInfoInput( void )
+	{
+		m_sourceID = INVALID_ID;
 		m_sourcePlayerMask = 0;
-		m_damageType = DAMAGE_EXPLOSION; 
-		m_deathType = DEATH_NORMAL; 
-		m_amount = 0; 
+		m_damageType = DAMAGE_EXPLOSION;
+		m_deathType = DEATH_NORMAL;
+		m_amount = 0;
 	}
 
 	ObjectID		   m_sourceID;							///< source of the damage
@@ -281,7 +280,7 @@ class DamageInfoInput : public Snapshot
 	virtual void crc( Xfer *xfer ) { }
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void ) { }
-	
+
 };
 
 const Real HUGE_DAMAGE_AMOUNT = 999999.0f;
@@ -294,15 +293,15 @@ class DamageInfoOutput : public Snapshot
 
 public:
 
-	DamageInfoOutput( void ) 
-	{ 
-		m_actualDamageDealt = 0; 
-		m_actualDamageClipped = 0; 
+	DamageInfoOutput( void )
+	{
+		m_actualDamageDealt = 0;
+		m_actualDamageClipped = 0;
 		m_noEffect = false;
 	}
 
-	/** 
-		m_actualDamageDealt is the damage we tried to apply to object (after multipliers and such). 
+	/**
+		m_actualDamageDealt is the damage we tried to apply to object (after multipliers and such).
 		m_actualDamageClipped is the value of m_actualDamageDealt, but clipped to the max health remaining of the obj.
 		example:
 			a mammoth tank fires a round at a small tank, attempting 100 damage.
@@ -310,7 +309,7 @@ class DamageInfoOutput : public Snapshot
 			furthermore, the small tank has only 30 health remaining.
 			so: m_actualDamageDealt = 50, m_actualDamageClipped = 30.
 
-		this distinction is useful, since visual fx really wants to do the fx for "50 damage", 
+		this distinction is useful, since visual fx really wants to do the fx for "50 damage",
 		even though it was more than necessary to kill this object; game logic, on the other hand,
 		may want to know the "clipped" damage for ai purposes.
 	*/
@@ -352,6 +351,3 @@ class DamageInfo : public Snapshot
 	virtual void loadPostProcess( void ){ }
 
 };
-
-#endif // __DAMAGE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h b/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h
index 6753a0803b6..8f33f93d113 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef EXPERIENCE_TRACKER_H
-#define EXPERIENCE_TRACKER_H
-
 #include "Common/GameCommon.h"
 #include "Common/GameType.h"
 #include "Common/GameMemory.h"
@@ -41,7 +38,7 @@ class Object;
 
 class ExperienceTracker : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ExperienceTracker, "ExperienceTrackerPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ExperienceTracker, "ExperienceTrackerPool" )
 public:
 	ExperienceTracker(Object *parent);
 
@@ -49,15 +46,18 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot
 	Int getExperienceValue( const Object* killer ) const;										///< How much do give for being killed
 	Int getCurrentExperience( void ) const { return m_currentExperience; };	///< How much experience do I have at the moment?
 	Bool isTrainable() const;																						///< Can I gain experience?
+	void setTrainable(Bool trainable);																	///< Set whether I can gain experience
+	void resetTrainable();																							///< Set to default trainable state from template
 	Bool isAcceptingExperiencePoints() const;														///< Either I am trainable, or I have a Sink set up
 
-	void setVeterancyLevel( VeterancyLevel newLevel );						///< Set Level to this
-	void setMinVeterancyLevel( VeterancyLevel newLevel );					///< Set Level to AT LEAST this... if we are already >= this level, do nothing.
+	void setVeterancyLevel( VeterancyLevel newLevel, Bool provideFeedback = TRUE );						///< Set Level to this
+	void setMinVeterancyLevel( VeterancyLevel newLevel, Bool provideFeedback = TRUE );					///< Set Level to AT LEAST this... if we are already >= this level, do nothing.
 	void addExperiencePoints( Int experienceGain, Bool canScaleForBonus = TRUE );	///< Gain this many exp.
 	Bool gainExpForLevel(Int levelsToGain, Bool canScaleForBonus = TRUE );			  ///< Gain enough exp to gain a level. return false if can't gain a level.
 	Bool canGainExpForLevel(Int levelsToGain) const;															///< return same value as gainExpForLevel, but don't change anything
-	void setExperienceAndLevel(Int experienceIn);
+	void setExperienceAndLevel(Int experienceIn, Bool provideFeedback = TRUE );
 	void setExperienceSink( ObjectID sink );											///< My experience actually goes to this person (loose couple)
+	ObjectID getExperienceSink() const;
 
 	Real getExperienceScalar() const { return m_experienceScalar; }
 	void setExperienceScalar( Real scalar ) { m_experienceScalar = scalar; }
@@ -73,6 +73,5 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot
 	Int								m_currentExperience;								///< Number of experience points
 	ObjectID					m_experienceSink;										///< ID of object I have pledged my experience point gains to
 	Real							m_experienceScalar;									///< Scales any experience gained by this multiplier.
+	Bool							m_isTrainable;											///< Can I gain experience?
 };
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h b/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h
index d4cc3621964..8ea15e213f5 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h
@@ -29,14 +29,9 @@
 
 #pragma once
 
-#ifndef __FPUCONTROL_H__
-#define __FPUCONTROL_H__
-
 /**
   * setFPMode sets the FPU internal precision and rounding mode.  As DirectX is not guaranteed to
 	* leave the FPU in a good state, we must call this at the start of GameLogic::update() and
 	* anywhere that touches DirectX inside GameLogic loops (LoadScreen).
 	*/
 void setFPMode( void );
-
-#endif // __FPUCONTROL_H__
diff --git a/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h b/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h
index 5cc86d80d1e..46637984e5e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef FIRING_TRACKER_H
-#define FIRING_TRACKER_H
-
 #include "Common/GameType.h"
 #include "Common/GameMemory.h"
 #include "Common/AudioEventRTS.h"
@@ -52,7 +49,7 @@ class FiringTrackerModuleData : public ModuleData
 class FiringTracker : public UpdateModule
 {
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( FiringTracker, FiringTrackerModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FiringTracker, "FiringTrackerPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FiringTracker, "FiringTrackerPool" )
 public:
 	FiringTracker(Thing *thing, const ModuleData *modData);
 	void shotFired(const Weapon* weaponFired, ObjectID victimID );			///< Owner just fired this weapon at this Object
@@ -91,6 +88,3 @@ class FiringTracker : public UpdateModule
 	UnsignedInt			m_frameToStopLoopingSound;	///< if sound is looping, frame to stop looping it (or zero if not looping)
 	AudioHandle			m_audioHandle;
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h
index 1ce79b3df91..5a138b5c195 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h
@@ -29,16 +29,12 @@
 
 #pragma once
 
-#ifndef _GAME_LOGIC_H_
-#define _GAME_LOGIC_H_
-
 #include "Common/GameCommon.h"	// ensure we get DUMP_PERF_STATS, or not
 #include "Common/GameType.h"
 #include "Common/Snapshot.h"
 #include "Common/STLTypedefs.h"
 #include "Common/ObjectStatusTypes.h"
 #include "GameNetwork/NetworkDefs.h"
-#include "Common/STLTypedefs.h"
 #include "GameLogic/Module/UpdateModule.h"	// needed for DIRECT_UPDATEMODULE_ACCESS
 
 /*
@@ -71,7 +67,7 @@ enum BuildableStatus CPP_11(: Int);
 typedef const CommandButton* ConstCommandButtonPtr;
 
 // What kind of game we're in.
-enum
+enum GameMode CPP_11(: Int)
 {
 	GAME_SINGLE_PLAYER,
 	GAME_LAN,
@@ -89,14 +85,15 @@ enum
 };
 
 /// Function pointers for use by GameLogic callback functions.
-typedef void (*GameLogicFuncPtr)( Object *obj, void *userData ); 
+typedef void (*GameLogicFuncPtr)( Object *obj, void *userData );
 typedef std::hash_map<ObjectID, Object *, rts::hash<ObjectID>, rts::equal_to<ObjectID> > ObjectPtrHash;
 typedef ObjectPtrHash::const_iterator ObjectPtrIter;
 
+typedef std::vector<Object*> ObjectPtrVector;
 
 // ------------------------------------------------------------------------------------------------
 /**
- * The implementation of GameLogic 
+ * The implementation of GameLogic
  */
 class GameLogic : public SubsystemInterface, public Snapshot
 {
@@ -115,9 +112,9 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 	void processCommandList( CommandList *list );		///< process the command list
 
-	void prepareNewGame( Int gameMode, GameDifficulty diff, Int rankPoints );						///< prepare for new game 
+	void prepareNewGame( GameMode gameMode, GameDifficulty diff, Int rankPoints );						///< prepare for new game
 
-	void logicMessageDispatcher( GameMessage *msg, 
+	void logicMessageDispatcher( GameMessage *msg,
 																			 void *userData );	///< Logic command list processing
 
 	void registerObject( Object *obj );							///< Given an object, register it with the GameLogic and give it a unique ID
@@ -132,6 +129,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	Real getHeight( void );													///< Returns the height of the world
 
 	Bool isInGameLogicUpdate( void ) const { return m_isInUpdate; }
+	Bool hasUpdated() const { return m_hasUpdated; } ///< Returns true if the logic frame has advanced in the current client/render update
 	UnsignedInt getFrame( void );										///< Returns the current simulation frame number
 	UnsignedInt getCRC( Int mode = CRC_CACHED, AsciiString deepCRCFileName = AsciiString::TheEmptyString );		///< Returns the CRC
 
@@ -159,11 +157,12 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 	void updateLoadProgress( Int progress );
 	void deleteLoadScreen( void );
-	
+
 	void setGameLoading( Bool loading );
-	void setGameMode( Int mode );
-	Int getGameMode( void );
-	Bool isInGame( void );
+	void setGameMode( GameMode mode );
+	GameMode getGameMode( void );
+
+	Bool isInGame( void ); // Includes Shell Game
 	Bool isInLanGame( void );
 	Bool isInSinglePlayerGame( void );
 	Bool isInSkirmishGame( void );
@@ -171,6 +170,10 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	Bool isInInternetGame( void );
 	Bool isInShellGame( void );
 	Bool isInMultiplayerGame( void );
+	Bool isInInteractiveGame() const;
+
+	static Bool isInInteractiveGame(GameMode mode) { return mode != GAME_NONE && mode != GAME_SHELL; }
+
 	Bool isLoadingGame();
 	void enableScoring(Bool score) { m_isScoringEnabled = score; }
 	Bool isScoringEnabled() const { return m_isScoringEnabled; }
@@ -192,6 +195,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	void updateObjectsChangedTriggerAreas(void) {m_frameObjectsChangedTriggerAreas = m_frame;}
 	UnsignedInt getFrameObjectsChangedTriggerAreas(void) {return m_frameObjectsChangedTriggerAreas;}
 
+	void exitGame();
 	void clearGameData(Bool showScoreScreen = TRUE);														///< Clear the game data
 	void closeWindows( void );
 
@@ -200,7 +204,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 	void bindObjectAndDrawable(Object* obj, Drawable* draw);
 
-	void setGamePausedInFrame( UnsignedInt frame );
+	void setGamePausedInFrame( UnsignedInt frame, Bool disableLogicTimeScale );
 	UnsignedInt getGamePauseFrame() const { return m_pauseFrame; }
 	void setGamePaused( Bool paused, Bool pauseMusic = TRUE, Bool pauseInput = TRUE );
 	Bool isGamePaused( void );
@@ -214,12 +218,12 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	UnsignedInt getObjectCount( void );
 
 	Int getRankLevelLimit() const { return m_rankLevelLimit; }
-	void setRankLevelLimit(Int limit) 
-	{ 
+	void setRankLevelLimit(Int limit)
+	{
 		if (limit < 1) limit = 1;
-		m_rankLevelLimit = limit; 
+		m_rankLevelLimit = limit;
 	}
-	
+
 	// We need to allow access to this, because on a restartGame, we need to restart with the settings we started with
 	Int getRankPointsToAddAtGameStart() const { return m_rankPointsToAddAtGameStart; }
 
@@ -229,7 +233,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	void incrementOverallFailedPathfinds() { m_overallFailedPathfinds++; }
 	UnsignedInt getOverallFailedPathfinds() const { return m_overallFailedPathfinds; }
 #endif
-	
+
 	// NOTE: selectObject and deselectObject should be called *only* by logical things, NEVER by the
 	// client. These will cause the client to select or deselect the object, if affectClient is true.
 	// If createToSelection is TRUE, this object causes a new group to be selected.
@@ -248,6 +252,8 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 private:
 
+	void updateDisplayBusyState();
+
 	void pauseGameLogic(Bool paused);
 	void pauseGameSound(Bool paused);
 	void pauseGameMusic(Bool paused);
@@ -280,18 +286,16 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 	Real m_width, m_height;																	///< Dimensions of the world
 	UnsignedInt m_frame;																		///< Simulation frame number
-	
+
 	// CRC cache system -----------------------------------------------------------------------------
 	UnsignedInt	m_CRC;																			///< Cache of previous CRC value
 	std::map<Int, UnsignedInt> m_cachedCRCs;								///< CRCs we've seen this frame
 	Bool m_shouldValidateCRCs;															///< Should we validate CRCs this frame?
 	//-----------------------------------------------------------------------------------------------
-
-	//Added By Sadullah Nader
-	//Used to for load scene
 	Bool m_loadingScene;
 
 	Bool m_isInUpdate;
+	Bool m_hasUpdated;
 
 	Int m_rankPointsToAddAtGameStart;
 
@@ -313,7 +317,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	// (for an excellent discussion of priority queues, please see:
 	// http://dogma.net/markn/articles/pq_stl/priority.htm)
 	std::vector<UpdateModulePtr> m_sleepyUpdates;
-	
+
 #ifdef ALLOW_NONSLEEPY_UPDATES
 	// this is a plain old list, not a pq.
 	std::list<UpdateModulePtr> m_normalUpdates;
@@ -325,7 +329,6 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 	ObjectID m_nextObjID;																		///< For allocating object id's
 
-	void setDefaults( Bool saveGame );											///< Set default values of class object
 	void processDestroyList( void );												///< Destroy all pending objects on the destroy list
 
 	void destroyAllObjectsImmediate();											///< destroy, and process destroy list immediately
@@ -334,7 +337,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	virtual TerrainLogic *createTerrainLogic( void );
 	virtual GhostObjectManager *createGhostObjectManager(void);
 
-	Int m_gameMode;
+	GameMode m_gameMode;
 	Int m_rankLevelLimit;
 
 	LoadScreen *getLoadScreen( Bool saveGame );
@@ -347,6 +350,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	Bool m_pauseInput;
 	Bool m_inputEnabledMemory;// Latches used to remember what to restore to after we unpause
 	Bool m_mouseVisibleMemory;
+	Bool m_logicTimeScaleEnabledMemory;
 
 	Bool m_progressComplete[MAX_SLOTS];
 	enum { PROGRESS_COMPLETE_TIMEOUT = 60000 };							///< Timeout we wait for when we've completed our Load
@@ -375,7 +379,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	ObjectTOCEntry *findTOCEntryById( UnsignedShort id );		///< find ObjectTOC by id
 	void xferObjectTOC( Xfer *xfer );												///< save/load object TOC for current state of map
 	void prepareLogicForObjectLoad( void );									///< prepare engine for object data from game file
-		
+
 };
 
 // INLINE /////////////////////////////////////////////////////////////////////////////////////////
@@ -385,12 +389,12 @@ inline void GameLogic::setHeight( Real height ) { m_height = height; }
 inline Real GameLogic::getHeight( void ) { return m_height; }
 inline UnsignedInt GameLogic::getFrame( void ) { return m_frame; }
 
-inline Bool GameLogic::isInGame( void ) { return !(m_gameMode == GAME_NONE); }
-inline void GameLogic::setGameMode( Int mode ) { m_gameMode = mode; }
-inline Int  GameLogic::getGameMode( void ) { return m_gameMode; }
+inline Bool GameLogic::isInGame( void ) { return m_gameMode != GAME_NONE; }
+inline GameMode GameLogic::getGameMode( void ) { return m_gameMode; }
 inline Bool GameLogic::isInLanGame( void ) { return (m_gameMode == GAME_LAN); }
 inline Bool GameLogic::isInSkirmishGame( void ) { return (m_gameMode == GAME_SKIRMISH); }
-inline Bool GameLogic::isInMultiplayerGame( void ) { return ((m_gameMode == GAME_LAN) || (m_gameMode == GAME_INTERNET)) ; }
+inline Bool GameLogic::isInMultiplayerGame( void ) { return (m_gameMode == GAME_LAN) || (m_gameMode == GAME_INTERNET) ; }
+inline Bool GameLogic::isInInteractiveGame() const { return isInInteractiveGame(m_gameMode); }
 inline Bool GameLogic::isInReplayGame( void ) { return (m_gameMode == GAME_REPLAY); }
 inline Bool GameLogic::isInInternetGame( void ) { return (m_gameMode == GAME_INTERNET); }
 inline Bool GameLogic::isInShellGame( void ) { return (m_gameMode == GAME_SHELL); }
@@ -405,7 +409,7 @@ inline Object* GameLogic::findObjectByID( ObjectID id )
 	ObjectPtrHash::iterator it = m_objHash.find(id);
 	if (it == m_objHash.end())
 		return NULL;
-	
+
 	return (*it).second;
 }
 
@@ -413,6 +417,3 @@ inline Object* GameLogic::findObjectByID( ObjectID id )
 
 // the singleton
 extern GameLogic *TheGameLogic;
-
-#endif // _GAME_LOGIC_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h b/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h
index e2a52bbb8e0..17ea737e919 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h
@@ -29,18 +29,11 @@
 
 #pragma once
 
-#ifndef _GHOSTOBJECT_H_
-#define _GHOSTOBJECT_H_
-
 #include "Lib/BaseType.h"
 #include "Common/Snapshot.h"
 
 // #define DEBUG_FOG_MEMORY	///< this define is used to force object snapshots for all players, not just local player.
 
-//Magic pointer value which indicates that a drawable pointer is actually invalid
-//because we're looking at a ghost object.
-#define GHOST_OBJECT_DRAWABLE	0xFFFFFFFF
-
 class Object;
 class PartitionData;
 enum GeometryType CPP_11(: Int);
@@ -54,16 +47,15 @@ class GhostObject : public Snapshot
 	virtual void snapShot(int playerIndex)=0;
 	virtual void updateParentObject(Object *object, PartitionData *mod)=0;
 	virtual void freeSnapShot(int playerIndex)=0;
-	inline PartitionData *friend_getPartitionData(void) const {return m_partitionData;}
-	inline GeometryType getGeometryType(void) const {return m_parentGeometryType;}
-	inline Bool getGeometrySmall(void) const {return m_parentGeometryIsSmall;}
-	inline Real getGeometryMajorRadius(void) const {return m_parentGeometryMajorRadius;}
-	inline Real getGeometryMinorRadius(void) const {return m_parentGeometryminorRadius;}
-	inline Real getParentAngle(void) const {return m_parentAngle;}
-	inline const Coord3D *getParentPosition(void) const {return &m_parentPosition;}
+	PartitionData *friend_getPartitionData(void) const {return m_partitionData;}
+	GeometryType getGeometryType(void) const {return m_parentGeometryType;}
+	Bool getGeometrySmall(void) const {return m_parentGeometryIsSmall;}
+	Real getGeometryMajorRadius(void) const {return m_parentGeometryMajorRadius;}
+	Real getGeometryMinorRadius(void) const {return m_parentGeometryminorRadius;}
+	Real getParentAngle(void) const {return m_parentAngle;}
+	const Coord3D *getParentPosition(void) const {return &m_parentPosition;}
 
 protected:
-
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
@@ -83,26 +75,38 @@ class GhostObjectManager : public Snapshot
 public:
 	GhostObjectManager();
 	virtual ~GhostObjectManager();
+
 	virtual void reset(void);
 	virtual GhostObject *addGhostObject(Object *object, PartitionData *pd);
 	virtual void removeGhostObject(GhostObject *mod);
-	virtual inline void setLocalPlayerIndex(int index) { m_localPlayer = index; }
-	inline int getLocalPlayerIndex(void)	{ return m_localPlayer; }
-	virtual void updateOrphanedObjects(int *playerIndexList, int numNonLocalPlayers);
+	virtual void setLocalPlayerIndex(int playerIndex) { m_localPlayer = playerIndex; }
+	int getLocalPlayerIndex(void)	{ return m_localPlayer; }
+	virtual void updateOrphanedObjects(int *playerIndexList, int playerIndexCount);
 	virtual void releasePartitionData(void);	///<saves data needed to later rebuild partition manager data.
 	virtual void restorePartitionData(void);	///<restores ghost objects into the partition manager.
-	inline void lockGhostObjects(Bool enableLock) {m_lockGhostObjects=enableLock;}	///<temporary lock on creating new ghost objects. Only used by map border resizing!
-	inline void saveLockGhostObjects(Bool enableLock) {m_saveLockGhostObjects=enableLock;}
+	void lockGhostObjects(Bool enableLock) {m_lockGhostObjects=enableLock;}	///<temporary lock on creating new ghost objects. Only used by map border resizing!
+	void saveLockGhostObjects(Bool enableLock) {m_saveLockGhostObjects=enableLock;}
+	inline Bool trackAllPlayers() const; ///< returns whether the ghost object status is tracked for all players or for the local player only
+
 protected:
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
+
 	Int m_localPlayer;
 	Bool m_lockGhostObjects;
 	Bool m_saveLockGhostObjects;	///< used to lock the ghost object system during a save/load
+	Bool m_trackAllPlayers; ///< if enabled, tracks ghost object status for all players, otherwise for the local player only
 };
 
+inline Bool GhostObjectManager::trackAllPlayers() const
+{
+#ifdef DEBUG_FOG_MEMORY
+	return true;
+#else
+	return m_trackAllPlayers;
+#endif
+}
+
 // the singleton
 extern GhostObjectManager *TheGhostObjectManager;
-
-#endif // _GAME_DISPLAY_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h
index ba666917598..a074f4f3496 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __Locomotor_H_
-#define __Locomotor_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/NameKeyGenerator.h"
 #include "Common/Override.h"
@@ -60,18 +57,22 @@ enum LocomotorAppearance CPP_11(: Int)
 	LOCO_THRUST,
 	LOCO_WINGS,
 	LOCO_CLIMBER,			// human climber - backs down cliffs.
-	LOCO_OTHER
+	LOCO_OTHER,
+
+	LOCOMOTOR_APPEARANCE_COUNT
 };
 
 enum LocomotorPriority CPP_11(: Int)
 {
-	LOCO_MOVES_BACK=0,				// In a group, this one moves toward the back
-	LOCO_MOVES_MIDDLE=1,			// In a group, this one stays in the middle
-	LOCO_MOVES_FRONT=2				// In a group, this one moves toward the front of the group
+	LOCO_MOVES_BACK,				// In a group, this one moves toward the back
+	LOCO_MOVES_MIDDLE,			// In a group, this one stays in the middle
+	LOCO_MOVES_FRONT,				// In a group, this one moves toward the front of the group
+
+	LOCOMOTOR_PRIORITY_COUNT
 };
 
 #ifdef DEFINE_LOCO_APPEARANCE_NAMES
-static const char *TheLocomotorAppearanceNames[] = 
+static const char *const TheLocomotorAppearanceNames[] =
 {
 	"TWO_LEGS",
 	"FOUR_WHEELS",
@@ -84,6 +85,7 @@ static const char *TheLocomotorAppearanceNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheLocomotorAppearanceNames) == LOCOMOTOR_APPEARANCE_COUNT + 1, "Array size");
 #endif
 
 //-------------------------------------------------------------------------------------------------
@@ -96,11 +98,13 @@ enum LocomotorBehaviorZ CPP_11(: Int)
 	Z_FIXED_SURFACE_RELATIVE_HEIGHT,		// stays fixed at surface-rel height, regardless of physics
 	Z_FIXED_ABSOLUTE_HEIGHT,						// stays fixed at absolute height, regardless of physics
 	Z_RELATIVE_TO_GROUND_AND_BUILDINGS,	// stays fixed at surface-rel height including buildings, regardless of physics
-	Z_SMOOTH_RELATIVE_TO_HIGHEST_LAYER	// try to follow a height relative to the highest layer.
+	Z_SMOOTH_RELATIVE_TO_HIGHEST_LAYER,	// try to follow a height relative to the highest layer.
+
+	LOCOMOTOR_BEHAVIOR_Z_COUNT
 };
 
 #ifdef DEFINE_LOCO_Z_NAMES
-static const char *TheLocomotorBehaviorZNames[] = 
+static const char *const TheLocomotorBehaviorZNames[] =
 {
 	"NO_Z_MOTIVE_FORCE",
 	"SEA_LEVEL",
@@ -113,6 +117,7 @@ static const char *TheLocomotorBehaviorZNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheLocomotorBehaviorZNames) == LOCOMOTOR_BEHAVIOR_Z_COUNT + 1, "Array size");
 #endif
 
 //-------------------------------------------------------------------------------------------------
@@ -184,7 +189,7 @@ class LocomotorTemplate : public Overridable
 	Real											m_uniformAxialDamping;	///< For Attenuating the pitch and roll rates
 	Real											m_turnPivotOffset;			///< should we pivot around noncenter? (-1.0 = rear, 0.0 = center, 1.0 = front)
 	Int												m_airborneTargetingHeight;	///< The height transition at witch I should mark myself as a AA target.
-	
+
 	Real											m_closeEnoughDist;			///< How close we have to approach the end of a path before stopping
 	Bool											m_isCloseEnoughDist3D;	///< And is that calculation 3D, for very rare cases that need to move straight down.
 	Real											m_ultraAccurateSlideIntoPlaceFactor;			///< how much we can fudge turning when ultra-accurate
@@ -204,14 +209,14 @@ class LocomotorTemplate : public Overridable
 	Real											m_wanderWidthFactor;
 	Real											m_wanderLengthFactor;
 	Real											m_wanderAboutPointRadius;
-};	
+};
 
 typedef OVERRIDE<LocomotorTemplate> LocomotorTemplateOverride;
 
 // ---------------------------------------------------------
 class Locomotor : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Locomotor, "Locomotor" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Locomotor, "Locomotor" )
 
 	friend class LocomotorStore;
 
@@ -219,7 +224,7 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 
 	void setPhysicsOptions(Object* obj);
 
-	void locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalPos, 
+	void locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalPos,
 		Real onPathDistToGoal, Real desiredSpeed, Bool *blocked);
 	void locoUpdate_moveTowardsAngle(Object* obj, Real angle);
 	/**
@@ -228,7 +233,7 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 		return true if we can maintain the position without being called every frame (eg, we are
 		resting on the ground), false if not (eg, we are hovering or circling)
 	*/
-	Bool locoUpdate_maintainCurrentPosition(Object* obj); 
+	Bool locoUpdate_maintainCurrentPosition(Object* obj);
 
 	Real getMaxSpeedForCondition(BodyDamageType condition) const;  ///< get max speed given condition
 	Real getMaxTurnRate(BodyDamageType condition) const;  ///< get max turning rate given condition
@@ -236,67 +241,67 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 	Real getMaxLift(BodyDamageType condition) const;  ///< get acceleration given condition
 	Real getBraking() const;  ///< get braking given condition
 
-	inline Real getPreferredHeight() const { return m_preferredHeight;} ///< Just return preferredheight, no damage consideration
-	inline void restorePreferredHeightFromTemplate() { m_preferredHeight = m_template->m_preferredHeight; };
-	inline Real getPreferredHeightDamping() const { return m_preferredHeightDamping;} 
-	inline LocomotorAppearance getAppearance() const { return m_template->m_appearance; }
-	inline LocomotorPriority getMovePriority() const { return m_template->m_movePriority; }
-	inline LocomotorSurfaceTypeMask getLegalSurfaces() const { return m_template->m_surfaces; }
-
-	inline AsciiString getTemplateName() const { return m_template->m_name;}
-	inline Real getMinSpeed() const { return m_template->m_minSpeed;}
-	inline Real getAccelPitchLimit() const { return m_template->m_accelPitchLimit;}	///< Maximum amount we will pitch up or down under acceleration (including recoil.)
-	inline Real getBounceKick() const { return m_template->m_bounceKick;}						///< How much simulating rough terrain "bounces" a wheel up.
-	inline Real getPitchStiffness() const { return m_template->m_pitchStiffness;}			///< How stiff the springs are forward & back.
-	inline Real getRollStiffness() const { return m_template->m_rollStiffness;}				///< How stiff the springs are side to side.
-	inline Real getPitchDamping() const { return m_template->m_pitchDamping;}	///< How good the shock absorbers are.
-	inline Real getRollDamping() const { return m_template->m_rollDamping;}	///< How good the shock absorbers are.
-	inline Real getPitchByZVelCoef() const { return m_template->m_pitchByZVelCoef;}		///< How much we pitch in response to speed.
-	inline Real getThrustRoll() const { return m_template->m_thrustRoll; }  ///< Thrust roll
-	inline Real getWobbleRate() const { return m_template->m_wobbleRate; }  ///< how fast thrust things "wobble"
-	inline Real getMaxWobble() const { return m_template->m_maxWobble; }  ///< how much thrust things "wobble"
-	inline Real getMinWobble() const { return m_template->m_minWobble; }  ///< how much thrust things "wobble"
-
-	inline Real getForwardVelCoef() const { return m_template->m_forwardVelCoef;}		///< How much we pitch in response to speed.
-	inline Real getLateralVelCoef() const { return m_template->m_lateralVelCoef;}			///< How much we roll in response to speed.
-	inline Real getForwardAccelCoef() const { return m_template->m_forwardAccelCoef;}		///< How much we pitch in response to acceleration.
-	inline Real getLateralAccelCoef() const { return m_template->m_lateralAccelCoef;}			///< How much we roll in response to acceleration.
-	inline Real getUniformAxialDamping() const { return m_template->m_uniformAxialDamping;}			///< How much we roll in response to acceleration.
-	inline Real getTurnPivotOffset() const { return m_template->m_turnPivotOffset;}
-	inline Bool getApply2DFrictionWhenAirborne() const { return m_template->m_apply2DFrictionWhenAirborne; }
-	inline Bool getIsDownhillOnly() const { return m_template->m_downhillOnly; }
-	inline Bool getAllowMotiveForceWhileAirborne() const { return m_template->m_allowMotiveForceWhileAirborne; }
-	inline Int getAirborneTargetingHeight() const { return m_template->m_airborneTargetingHeight; }
-	inline Bool getLocomotorWorksWhenDead() const { return m_template->m_locomotorWorksWhenDead; }
-	inline Bool getStickToGround() const { return m_template->m_stickToGround; }
-	inline Real getCloseEnoughDist() const { return m_closeEnoughDist; }
-	inline Bool isCloseEnoughDist3D() const { return getFlag(IS_CLOSE_ENOUGH_DIST_3D); }
-	inline Bool hasSuspension() const {return m_template->m_hasSuspension;}
-	inline Bool canMoveBackwards() const {return m_template->m_canMoveBackward;}
-	inline Real getMaxWheelExtension() const {return m_template->m_maximumWheelExtension;}
-	inline Real getMaxWheelCompression() const {return m_template->m_maximumWheelCompression;}
-	inline Real getWheelTurnAngle() const {return m_template->m_wheelTurnAngle;}
-
-	inline Real getWanderWidthFactor() const {return m_template->m_wanderWidthFactor;}
-	inline Real getWanderAboutPointRadius() const {return m_template->m_wanderAboutPointRadius;}
+	Real getPreferredHeight() const { return m_preferredHeight;} ///< Just return preferredheight, no damage consideration
+	void restorePreferredHeightFromTemplate() { m_preferredHeight = m_template->m_preferredHeight; };
+	Real getPreferredHeightDamping() const { return m_preferredHeightDamping;}
+	LocomotorAppearance getAppearance() const { return m_template->m_appearance; }
+	LocomotorPriority getMovePriority() const { return m_template->m_movePriority; }
+	LocomotorSurfaceTypeMask getLegalSurfaces() const { return m_template->m_surfaces; }
+
+	AsciiString getTemplateName() const { return m_template->m_name;}
+	Real getMinSpeed() const { return m_template->m_minSpeed;}
+	Real getAccelPitchLimit() const { return m_template->m_accelPitchLimit;}	///< Maximum amount we will pitch up or down under acceleration (including recoil.)
+	Real getBounceKick() const { return m_template->m_bounceKick;}						///< How much simulating rough terrain "bounces" a wheel up.
+	Real getPitchStiffness() const { return m_template->m_pitchStiffness;}			///< How stiff the springs are forward & back.
+	Real getRollStiffness() const { return m_template->m_rollStiffness;}				///< How stiff the springs are side to side.
+	Real getPitchDamping() const { return m_template->m_pitchDamping;}	///< How good the shock absorbers are.
+	Real getRollDamping() const { return m_template->m_rollDamping;}	///< How good the shock absorbers are.
+	Real getPitchByZVelCoef() const { return m_template->m_pitchByZVelCoef;}		///< How much we pitch in response to speed.
+	Real getThrustRoll() const { return m_template->m_thrustRoll; }  ///< Thrust roll
+	Real getWobbleRate() const { return m_template->m_wobbleRate; }  ///< how fast thrust things "wobble"
+	Real getMaxWobble() const { return m_template->m_maxWobble; }  ///< how much thrust things "wobble"
+	Real getMinWobble() const { return m_template->m_minWobble; }  ///< how much thrust things "wobble"
+
+	Real getForwardVelCoef() const { return m_template->m_forwardVelCoef;}		///< How much we pitch in response to speed.
+	Real getLateralVelCoef() const { return m_template->m_lateralVelCoef;}			///< How much we roll in response to speed.
+	Real getForwardAccelCoef() const { return m_template->m_forwardAccelCoef;}		///< How much we pitch in response to acceleration.
+	Real getLateralAccelCoef() const { return m_template->m_lateralAccelCoef;}			///< How much we roll in response to acceleration.
+	Real getUniformAxialDamping() const { return m_template->m_uniformAxialDamping;}			///< How much we roll in response to acceleration.
+	Real getTurnPivotOffset() const { return m_template->m_turnPivotOffset;}
+	Bool getApply2DFrictionWhenAirborne() const { return m_template->m_apply2DFrictionWhenAirborne; }
+	Bool getIsDownhillOnly() const { return m_template->m_downhillOnly; }
+	Bool getAllowMotiveForceWhileAirborne() const { return m_template->m_allowMotiveForceWhileAirborne; }
+	Int getAirborneTargetingHeight() const { return m_template->m_airborneTargetingHeight; }
+	Bool getLocomotorWorksWhenDead() const { return m_template->m_locomotorWorksWhenDead; }
+	Bool getStickToGround() const { return m_template->m_stickToGround; }
+	Real getCloseEnoughDist() const { return m_closeEnoughDist; }
+	Bool isCloseEnoughDist3D() const { return getFlag(IS_CLOSE_ENOUGH_DIST_3D); }
+	Bool hasSuspension() const {return m_template->m_hasSuspension;}
+	Bool canMoveBackwards() const {return m_template->m_canMoveBackward;}
+	Real getMaxWheelExtension() const {return m_template->m_maximumWheelExtension;}
+	Real getMaxWheelCompression() const {return m_template->m_maximumWheelCompression;}
+	Real getWheelTurnAngle() const {return m_template->m_wheelTurnAngle;}
+
+	Real getWanderWidthFactor() const {return m_template->m_wanderWidthFactor;}
+	Real getWanderAboutPointRadius() const {return m_template->m_wanderAboutPointRadius;}
 
 	Real calcMinTurnRadius(BodyDamageType condition, Real* timeToTravelThatDist) const;
 
 	/// this is handy for doing things like forcing helicopters to crash realistically: cut their lift.
-	inline void setMaxLift(Real lift) { m_maxLift = lift; }
-	inline void setMaxSpeed(Real speed) 
-	{ 
-		DEBUG_ASSERTCRASH(!(speed <= 0.0f && m_template->m_appearance == LOCO_THRUST), ("THRUST locos may not have zero speeds!\n")); 
-		m_maxSpeed = speed; 
+	void setMaxLift(Real lift) { m_maxLift = lift; }
+	void setMaxSpeed(Real speed)
+	{
+		DEBUG_ASSERTCRASH(!(speed <= 0.0f && m_template->m_appearance == LOCO_THRUST), ("THRUST locos may not have zero speeds!"));
+		m_maxSpeed = speed;
 	}
-	inline void setMaxAcceleration(Real accel) { m_maxAccel = accel; }
-	inline void setMaxBraking(Real braking) { m_maxBraking = braking; }
-	inline void setMaxTurnRate(Real turn) { m_maxTurnRate = turn; }
-	inline void setAllowInvalidPosition(Bool allow) { setFlag(ALLOW_INVALID_POSITION, allow); }
-	inline void setCloseEnoughDist( Real dist ) { m_closeEnoughDist = dist; }
-	inline void setCloseEnoughDist3D( Bool setting ) { setFlag(IS_CLOSE_ENOUGH_DIST_3D, setting); }
+	void setMaxAcceleration(Real accel) { m_maxAccel = accel; }
+	void setMaxBraking(Real braking) { m_maxBraking = braking; }
+	void setMaxTurnRate(Real turn) { m_maxTurnRate = turn; }
+	void setAllowInvalidPosition(Bool allow) { setFlag(ALLOW_INVALID_POSITION, allow); }
+	void setCloseEnoughDist( Real dist ) { m_closeEnoughDist = dist; }
+	void setCloseEnoughDist3D( Bool setting ) { setFlag(IS_CLOSE_ENOUGH_DIST_3D, setting); }
 
-	inline void setPreferredHeight( Real height ) { m_preferredHeight = height; }
+	void setPreferredHeight( Real height ) { m_preferredHeight = height; }
 
 #ifdef CIRCLE_FOR_LANDING
 	/**
@@ -305,25 +310,25 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 	*/
 	inline void setAltitudeChangeThresholdForCircling(Real a) { m_circleThresh = a; }
 #endif
-	
+
 	/**
 		when off (the default), things get to adjust their z-pos as their
-		loco says (in particular, airborne things tend to try to fly at a preferred height). 
+		loco says (in particular, airborne things tend to try to fly at a preferred height).
 
 		when on, they do their best to reach the specified zpos, even if it's not at their preferred height.
 		this is used mainly for force missiles to swoop in on their target, and to force airplane takeoff/landing
 		to go smoothly.
 	*/
-	inline void setUsePreciseZPos(Bool u) { setFlag(PRECISE_Z_POS, u); }
+	void setUsePreciseZPos(Bool u) { setFlag(PRECISE_Z_POS, u); }
 
 	/**
-    when off (the default), units slow down as they approach their target. 
+    when off (the default), units slow down as they approach their target.
 
     when on, units go full speed till the end, and may overshoot their target.
     this is useful mainly in some weird, temporary situations where we know we are
     going to follow this move with another one...	or for carbombs.
 	*/
-	inline void setNoSlowDownAsApproachingDest(Bool u) { setFlag(NO_SLOW_DOWN_AS_APPROACHING_DEST, u); }
+	void setNoSlowDownAsApproachingDest(Bool u) { setFlag(NO_SLOW_DOWN_AS_APPROACHING_DEST, u); }
 
 	/**
     when off (the default), units do their normal stuff.
@@ -336,10 +341,10 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 		For ground units, it also allows units to have a destination off of a pathfing grid.
 
 	*/
-	inline void setUltraAccurate(Bool u) { setFlag(ULTRA_ACCURATE, u); }
-	inline Bool isUltraAccurate() const { return getFlag(ULTRA_ACCURATE); }
+	void setUltraAccurate(Bool u) { setFlag(ULTRA_ACCURATE, u); }
+	Bool isUltraAccurate() const { return getFlag(ULTRA_ACCURATE); }
 
-	inline Bool isMovingBackwards(void) const {return getFlag(MOVING_BACKWARDS);}
+	Bool isMovingBackwards(void) const {return getFlag(MOVING_BACKWARDS);}
 
 	void startMove(void); ///< Indicates that a move is starting, primarily to reset the donut timer. jba.
 
@@ -414,8 +419,8 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 		OFFSET_INCREASING
 	};
 
-	inline Bool getFlag(LocoFlag f) const { return (m_flags & (1 << f)) != 0; }
-	inline void setFlag(LocoFlag f, Bool b) { if (b) m_flags |= (1<<f); else m_flags &= ~(1<<f); }
+	Bool getFlag(LocoFlag f) const { return (m_flags & (1 << f)) != 0; }
+	void setFlag(LocoFlag f, Bool b) { if (b) m_flags |= (1<<f); else m_flags &= ~(1<<f); }
 
 	LocomotorTemplateOverride m_template;		///< the kind of Locomotor this is
 	Coord3D			m_maintainPos;
@@ -464,14 +469,14 @@ class LocomotorStore : public SubsystemInterface
 	const LocomotorTemplate* findLocomotorTemplate(NameKeyType namekey) const;
 	LocomotorTemplate* findLocomotorTemplate(NameKeyType namekey);
 
-	inline Locomotor* newLocomotor(const LocomotorTemplate *tmpl) const
+	Locomotor* newLocomotor(const LocomotorTemplate *tmpl) const
 	{
 		return newInstance(Locomotor)(tmpl);	// my, that was easy
 	}
 
 	// locoTemplate is who we're overriding
 	LocomotorTemplate *newOverride(LocomotorTemplate *locoTemplate);
-	
+
 
 	static void parseLocomotorTemplateDefinition(INI* ini);
 
@@ -487,6 +492,3 @@ class LocomotorStore : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern LocomotorStore *TheLocomotorStore;
-
-#endif // __Locomotor_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h b/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h
index 440c7598b78..e73f804193e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __LocomotorSet_H_
-#define __LocomotorSet_H_
-
 // no, please do NOT include this.
 //#include "GameLogic/Locomotor.h"
 #include "Common/GameCommon.h"
@@ -61,7 +58,7 @@ const LocomotorSurfaceTypeMask NO_SURFACES = (LocomotorSurfaceTypeMask)0x0000;
 const LocomotorSurfaceTypeMask ALL_SURFACES = (LocomotorSurfaceTypeMask)0xffff;
 
 #ifdef DEFINE_SURFACECATEGORY_NAMES
-static const char *TheLocomotorSurfaceTypeNames[] = 
+static const char *const TheLocomotorSurfaceTypeNames[] =
 {
 	"GROUND",
 	"WATER",
@@ -83,7 +80,7 @@ class LocomotorSet : public Snapshot
 	LocomotorVector						m_locomotors;
 	LocomotorSurfaceTypeMask	m_validLocomotorSurfaces;
 	Bool											m_downhillOnly;
-	
+
 	LocomotorSet(const LocomotorSet& that);
 	LocomotorSet& operator=(const LocomotorSet& that);
 
@@ -103,12 +100,10 @@ class LocomotorSet : public Snapshot
 	void addLocomotor(const LocomotorTemplate* lt);
 
 	Locomotor* findLocomotor(LocomotorSurfaceTypeMask t);
-	
+
 	void xferSelfAndCurLocoPtr(Xfer *xfer, Locomotor** loco);
 
-	inline LocomotorSurfaceTypeMask getValidSurfaces() const { return m_validLocomotorSurfaces; }
-	inline Bool isDownhillOnly( void ) const { return m_downhillOnly; };
+	LocomotorSurfaceTypeMask getValidSurfaces() const { return m_validLocomotorSurfaces; }
+	Bool isDownhillOnly( void ) const { return m_downhillOnly; };
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/LogicRandomValue.h b/Generals/Code/GameEngine/Include/GameLogic/LogicRandomValue.h
deleted file mode 100644
index 01022e8dbb3..00000000000
--- a/Generals/Code/GameEngine/Include/GameLogic/LogicRandomValue.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// LogicRandomValue.h
-// Random number generation system
-// Author: Michael S. Booth, January 1998
-// Split out into separate Logic/Client/Audio headers by MDC Sept 2002
-
-#pragma once
-
-#ifndef _LOGIC_RANDOM_VALUE_H_
-#define _LOGIC_RANDOM_VALUE_H_
-
-#include "Lib/BaseType.h"
-
-// do NOT use these functions directly, rather use the macros below
-extern Int GetGameLogicRandomValue( int lo, int hi, const char *file, int line );
-extern Real GetGameLogicRandomValueReal( Real lo, Real hi, const char *file, int line );
-
-// use these macros to access the random value functions
-#define GameLogicRandomValue( lo, hi ) GetGameLogicRandomValue( lo, hi, __FILE__, __LINE__ )
-#define GameLogicRandomValueReal( lo, hi ) GetGameLogicRandomValueReal( lo, hi, __FILE__, __LINE__ )
-
-//--------------------------------------------------------------------------------------------------------------
-class CColorAlphaDialog;
-class DebugWindowDialog;
-
-/**
- * A GameLogicRandomVariable represents a distribution of random values
- * from which discrete values can be retrieved.
- */
-class GameLogicRandomVariable
-{
-public:
-	// NOTE: This class cannot have a constructor or destructor due to its use within unions
-
-	/**
-	 * CONSTANT represents a single, constant, value.
-	 * UNIFORM represents a uniform distribution of random values.
-	 * GAUSSIAN represents a normally distributed set of random values.
-	 * TRIANGULAR represents a distribution of random values in the shape
-	 *		of a triangle, with the peak probability midway between low and high.
-	 * LOW_BIAS represents a distribution of random values with
-	 *		maximum probability at low, and zero probability at high.
-	 * HIGH_BIAS represents a distribution of random values with
-	 *		zero probability at low, and maximum probability at high.
-	 */
-	enum DistributionType 
-	{ 
-		CONSTANT, UNIFORM, GAUSSIAN, TRIANGULAR, LOW_BIAS, HIGH_BIAS
-	};
-
-	static const char *DistributionTypeNames[]; 
-
-	/// define the range of random values, and the distribution of values
-	void setRange( Real low, Real high, DistributionType type = UNIFORM );
-
-	Real getValue( void ) const;														///< return a value from the random distribution
-	inline Real getMinimumValue( void ) const { return m_low; }
-	inline Real getMaximumValue( void ) const { return m_high; }
-	inline DistributionType getDistributionType( void ) const { return m_type; }
-protected:
-	DistributionType m_type;																		///< the kind of random distribution
-	Real m_low, m_high;																					///< the range of random values
-
-	// These two friends are for particle editing.
-	friend CColorAlphaDialog;
-	friend DebugWindowDialog;
-
-};
-
-//--------------------------------------------------------------------------------------------------------------
-
-#endif // _LOGIC_RANDOM_VALUE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
index c3e3047c030..0482f737aa2 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _AI_UPDATE_H_
-#define _AI_UPDATE_H_
-
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameLogic/AI.h"
 #include "GameLogic/AIStateMachine.h"
@@ -43,7 +40,7 @@ class AttackPriorityInfo;
 class DamageInfo;
 class DozerAIInterface;
 class Object;
-class Path; 
+class Path;
 class PathfindServicesInterface;
 class PathNode;
 class PhysicsBehavior;
@@ -59,6 +56,7 @@ class HackInternetAIInterface;
 class AssaultTransportAIInterface;
 
 enum AIStateType CPP_11(: Int);
+enum HordeActionType CPP_11(: Int);
 enum ObjectID CPP_11(: Int);
 
 
@@ -83,12 +81,12 @@ enum LocomotorSetType CPP_11(: Int)
 	LOCOMOTORSET_SUPERSONIC,	// set used for high-speed attacks
 	LOCOMOTORSET_SLUGGISH,		// set used for abnormally slow (but not damaged) speeds
 
-	LOCOMOTORSET_COUNT	///< keep last, please
+	LOCOMOTORSET_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
 enum GuardTargetType CPP_11(: Int)
-{ 
+{
 	GUARDTARGET_LOCATION,	// Guard a coord3d
 	GUARDTARGET_OBJECT,		// Guard an object
 	GUARDTARGET_AREA,			// Guard a Polygon trigger
@@ -96,7 +94,7 @@ enum GuardTargetType CPP_11(: Int)
 };
 
 #ifdef DEFINE_LOCOMOTORSET_NAMES
-static const char *TheLocomotorSetNames[] = 
+static const char *const TheLocomotorSetNames[] =
 {
 	"SET_NORMAL",
 	"SET_NORMAL_UPGRADED",
@@ -109,7 +107,8 @@ static const char *TheLocomotorSetNames[] =
 
 	NULL
 };
-#endif 
+static_assert(ARRAY_SIZE(TheLocomotorSetNames) == LOCOMOTORSET_COUNT + 1, "Incorrect array size");
+#endif
 
 enum AutoAcquireStates CPP_11(: Int)
 {
@@ -121,7 +120,7 @@ enum AutoAcquireStates CPP_11(: Int)
 };
 
 #ifdef DEFINE_AUTOACQUIRE_NAMES
-static const char *TheAutoAcquireEnemiesNames[] = 
+static const char *const TheAutoAcquireEnemiesNames[] =
 {
 	"YES",
 	"STEALTHED",
@@ -141,21 +140,21 @@ enum MoodMatrixParameters CPP_11(: Int)
 	MM_Controller_Player		= 0x00000001,
 	MM_Controller_AI				= 0x00000002,
 	MM_Controller_Bitmask		= (MM_Controller_Player | MM_Controller_AI),
-	
+
 	// UnitTypes are mutually exclusive, ie: you cannot be turreted and air at the same time (we do
 	// not make such a distinction, so air takes precedence over turretedness)
 	MM_UnitType_NonTurreted = 0x00000010,
 	MM_UnitType_Turreted		= 0x00000020,
 	MM_UnitType_Air					= 0x00000040,
 	MM_UnitType_Bitmask			= (MM_UnitType_NonTurreted | MM_UnitType_Turreted | MM_UnitType_Air),
-	
+
 	// A unit can be in only one mood at a time.
 	MM_Mood_Sleep						= 0x00000100,
 	MM_Mood_Passive					= 0x00000200,
 	MM_Mood_Normal					= 0x00000400,
 	MM_Mood_Alert						= 0x00000800,
 	MM_Mood_Aggressive			= 0x00001000,
-	MM_Mood_Bitmask					= (MM_Mood_Sleep | MM_Mood_Passive | MM_Mood_Normal | MM_Mood_Alert | MM_Mood_Aggressive) 
+	MM_Mood_Bitmask					= (MM_Mood_Sleep | MM_Mood_Passive | MM_Mood_Normal | MM_Mood_Alert | MM_Mood_Aggressive)
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -222,7 +221,7 @@ enum AIFreeToExitType CPP_11(: Int) // Note - written out in save/load xfer, don
 };
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * The AIUpdateInterface module contains the interface to the AI system,
  * and performs the actual AI behaviors.
  */
@@ -239,7 +238,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	virtual void privateMoveToObject( Object *obj, CommandSourceType cmdSource );			///< move to given object
 	virtual void privateMoveToAndEvacuate( const Coord3D *pos, CommandSourceType cmdSource );			///< move to given position(s)
 	virtual void privateMoveToAndEvacuateAndExit( const Coord3D *pos, CommandSourceType cmdSource );			///< move to given position & unload transport.
-	virtual void privateIdle(CommandSourceType cmdSource);						///< Enter idle state.	
+	virtual void privateIdle(CommandSourceType cmdSource);						///< Enter idle state.
 	virtual void privateTightenToPosition( const Coord3D *pos, CommandSourceType cmdSource );			///< move to given position(s) tightening the formation.
 	virtual void privateFollowWaypointPath( const Waypoint *way, CommandSourceType cmdSource );///< start following the path from the given point
 	virtual void privateFollowWaypointPathAsTeam( const Waypoint *way, CommandSourceType cmdSource );///< start following the path from the given point
@@ -296,7 +295,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 	// Disabled conditions to process (AI will still process held status)
 	virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); }
-	
+
 	// Some very specific, complex behaviors are used by more than one AIUpdate.  Here are their interfaces.
 	virtual DozerAIInterface* getDozerAIInterface() {return NULL;}
 	virtual SupplyTruckAIInterface* getSupplyTruckAIInterface() {return NULL;}
@@ -319,12 +318,12 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 #endif
 
 	virtual void joinTeam( void );			///< This unit just got added to a team & needs to catch up.
-	
 
-	// this is present solely for some transports to override, so that they can land before 
+
+	// this is present solely for some transports to override, so that they can land before
 	// allowing people to exit...
 	virtual AIFreeToExitType getAiFreeToExit(const Object* exiter) const { return FREE_TO_EXIT; }
-	
+
 	// this is present solely to allow some special-case things to override, like landed choppers.
 	virtual Bool isAllowedToAdjustDestination() const { return true; }
 	virtual Bool isAllowedToMoveAwayFromUnit() const { return true; }
@@ -340,9 +339,9 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 	virtual void onObjectCreated();
 	virtual void doQuickExit( const std::vector<Coord3D>* path );			///< get out of this Object
-	
+
 	virtual void aiDoCommand(const AICommandParms* parms);
-	
+
 	virtual const Coord3D *getGuardLocation( void ) const { return &m_locationToGuard;	}
 	virtual ObjectID getGuardObject( void ) const { return m_objectToGuard; }
 	virtual const PolygonTrigger *getAreaToGuard( void ) const { return m_areaToGuard; }
@@ -350,15 +349,15 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	virtual void clearGuardTargetType() { m_guardTargetType[1] = m_guardTargetType[0]; m_guardTargetType[0] = GUARDTARGET_NONE; }
 	virtual GuardMode getGuardMode() const { return m_guardMode; }
 
-	virtual Object* construct( const ThingTemplate *what, 
-														 const Coord3D *pos, Real angle, 
+	virtual Object* construct( const ThingTemplate *what,
+														 const Coord3D *pos, Real angle,
 														 Player *owningPlayer,
 														 Bool isRebuild ) { return NULL; }///< construct a building
 
 
 	void ignoreObstacle( const Object *obj );			///< tell the pathfinder to ignore the given object as an obstacle
 	void ignoreObstacleID( ObjectID id );			///< tell the pathfinder to ignore the given object as an obstacle
-	
+
 	AIStateType getAIStateType() const;							///< What general state is the AIState Machine in?
 
 	AsciiString getCurrentStateName(void) const { return m_stateMachine->getCurrentStateName(); }
@@ -379,7 +378,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	virtual void addTargeter(ObjectID id, Bool add) { return; }
 	virtual Bool isTemporarilyPreventingAimSuccess() const { return false; }
 
-	 
+
 	void setPriorWaypointID( UnsignedInt id )   { m_priorWaypointID = id; };
 	void setCurrentWaypointID( UnsignedInt id ) { m_currentWaypointID = id; };
 
@@ -404,10 +403,10 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	virtual void setLocomotorGoalPositionExplicit(const Coord3D& newPos);
 	virtual void setLocomotorGoalOrientation(Real angle);
 	virtual void setLocomotorGoalNone();
-	virtual Bool isDoingGroundMovement(void) const;  ///< True if moving along ground. 
+	virtual Bool isDoingGroundMovement(void) const;  ///< True if moving along ground.
 
 	Bool isValidLocomotorPosition(const Coord3D* pos) const;
-	Bool isAircraftThatAdjustsDestination(void) const;  ///< True if is aircraft that doesn't stack destinations (missles for example do stack destinations.) 
+	Bool isAircraftThatAdjustsDestination(void) const;  ///< True if is aircraft that doesn't stack destinations (missles for example do stack destinations.)
 	Real getCurLocomotorSpeed() const;
 	Real getLocomotorDistanceToGoal();
 	const Locomotor *getCurLocomotor() const {return m_curLocomotor;}
@@ -419,7 +418,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	WhichTurretType getWhichTurretForWeaponSlot(WeaponSlotType wslot, Real* turretAngle, Real* turretPitch = NULL) const;
 	WhichTurretType getWhichTurretForCurWeapon() const;
 	/**
-		return true iff the weapon is on a turret, that turret is trying to aim at the victim, 
+		return true iff the weapon is on a turret, that turret is trying to aim at the victim,
 		BUT is not yet pointing in the right dir.
 	*/
 	Bool isWeaponSlotOnTurretAndAimingAtTarget(WeaponSlotType wslot, const Object* victim) const;
@@ -447,7 +446,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 #endif
 
 public:
-	void doPathfind( PathfindServicesInterface *pathfinder ); 
+	void doPathfind( PathfindServicesInterface *pathfinder );
 	void requestPath( Coord3D *destination, Bool isGoalDestination );	///< Queues a request to pathfind to destination.
 	void requestAttackPath( ObjectID victimID, const Coord3D* victimPos );	///< computes path to attack the current target, returns false if no path
 	void requestApproachPath( Coord3D *destination );	///< computes path to attack the current target, returns false if no path
@@ -455,7 +454,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 	Bool isWaitingForPath(void) const {return m_waitingForPath;}
 	Bool isAttackPath(void) const {return m_isAttackPath;} ///< True if we have a path to an attack location.
-	void cancelPath(void); ///< Called if we no longer need the path. 
+	void cancelPath(void); ///< Called if we no longer need the path.
 	Path* getPath( void ) { return m_path; }				///< return the agent's current path
 	const Path* getPath( void ) const { return m_path; }				///< return the agent's current path
 	void destroyPath( void );												///< destroy the current path, setting it to NULL
@@ -470,8 +469,8 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	Bool isMoving() const;
 	Bool isMovingAwayFrom(Object *obj) const;
 
-	// the following routines should only be called by the AIInternalMoveToState.  
-	// They are used to determine when we are really through moving.  Due to the nature of the beast, 
+	// the following routines should only be called by the AIInternalMoveToState.
+	// They are used to determine when we are really through moving.  Due to the nature of the beast,
 	// we often exit one move state & immediately enter another.  This should not cause a "stop start".
 	// jba.
 	void friend_startingMove(void);
@@ -491,7 +490,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 	const LocomotorSet& getLocomotorSet(void) const {return m_locomotorSet;}
 	void setPathExtraDistance(Real dist) {m_pathExtraDistance = dist;}
-	inline Real getPathExtraDistance() const { return m_pathExtraDistance; }
+	Real getPathExtraDistance() const { return m_pathExtraDistance; }
 
 	virtual Bool chooseLocomotorSet(LocomotorSetType wst);
 
@@ -502,9 +501,9 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 	void setCurPathfindCell(const ICoord2D &cell) {m_pathfindCurCell = cell;}
 	void setPathfindGoalCell(const ICoord2D &cell) {m_pathfindGoalCell = cell;}
-	
+
 	void setPathFromWaypoint(const Waypoint *way, const Coord2D *offset);
-	
+
 	const ICoord2D *getCurPathfindCell(void) const {return &m_pathfindCurCell;}
 	const ICoord2D *getPathfindGoalCell(void) const {return &m_pathfindGoalCell;}
 
@@ -518,20 +517,20 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	void transferAttack(ObjectID fromID, ObjectID toID);
 
 	void setCurrentVictim( const Object *nemesis );			///<  Current victim.
-	Object *getCurrentVictim( void ) const;	
+	Object *getCurrentVictim( void ) const;
 	virtual void notifyVictimIsDead() { }
 
 	// if we are attacking a position (and NOT an object), return it. otherwise return null.
-	const Coord3D *getCurrentVictimPos( void ) const;	
+	const Coord3D *getCurrentVictimPos( void ) const;
 
 	void setLocomotorUpgrade(Bool set);
 
 	// This function is used to notify the unit that it may have a target of opportunity to attack.
 	void wakeUpAndAttemptToTarget( void );
-	
+
 	void resetNextMoodCheckTime( void );
 
-	//Specifically set a frame to check next mood time -- added for the purpose of ordering a stealth combat unit that can't 
+	//Specifically set a frame to check next mood time -- added for the purpose of ordering a stealth combat unit that can't
 	//autoacquire while stealthed, but isn't stealthed and can stealth and is not detected, and the player specifically orders
 	//that unit to stop. In this case, instead of the unit autoacquiring another unit, and preventing him from stealthing,
 	//we will instead delay the autoacquire until later to give him enough time to stealth properly.
@@ -540,7 +539,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	///< States should call this with calledByAI set true to prevent them from checking every frame
 	///< States that are doing idle checks should call with calledDuringIdle set true so that they check their
 
-	Object *getNextMoodTarget( Bool calledByAI, Bool calledDuringIdle );	
+	Object *getNextMoodTarget( Bool calledByAI, Bool calledDuringIdle );
 	UnsignedInt getNextMoodCheckTime() const { return m_nextMoodCheckTime; }
 
 	// This function will return a combination of MoodMatrixParameter flags.
@@ -549,14 +548,18 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	void setAttitude( AttitudeType tude );	///< set the behavior modifier for this agent
 
 	// Common AI "status" effects -------------------------------------------------------------------
-	void evaluateMoraleBonus( void );
+	Bool hasNationalism() const;
+	Bool hasFanaticism() const;
+	void evaluateMoraleBonus( Bool inHorde, Bool allowNationalism, HordeActionType type );
+	void evaluateNationalismBonusClassic( Bool inHorde, Bool allowNationalism );
+	void evaluateNationalismBonus( Bool inHorde, Bool allowNationalism );
 
 #ifdef ALLOW_DEMORALIZE
 	// demoralization ... what a nifty word to write.
 	Bool isDemoralized( void ) const { return m_demoralizedFramesLeft > 0; }
 	void setDemoralized( UnsignedInt durationInFrames );
 #endif
-	
+
 	Bool canPathThroughUnits( void ) const { return m_canPathThroughUnits; }
 	void setCanPathThroughUnits( Bool canPath ) { m_canPathThroughUnits = canPath; if (canPath) m_isBlockedAndStuck=false;}
 
@@ -569,7 +572,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 	void setQueueForPathTime(Int frames);
 
-	// For the attack move, that switches from move to attack, and the attack is CMD_FROM_AI, 
+	// For the attack move, that switches from move to attack, and the attack is CMD_FROM_AI,
 	// while the move is the original command source.  John A.
 	void friend_setLastCommandSource( CommandSourceType source ) {m_lastCommandSource = source;}
 
@@ -577,9 +580,9 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	Bool canAutoAcquireWhileStealthed() const { return getAIUpdateModuleData()->m_autoAcquireEnemiesWhenIdle & AAS_Idle_Stealthed; }
 
 protected:
-	
+
 	/*
-		AIUpdates run in the initial phase. 
+		AIUpdates run in the initial phase.
 
 		It's actually quite important that AI (the thing that drives Locomotors) and Physics
 		run in the same order, relative to each other, for a given object; otherwise,
@@ -610,51 +613,51 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	virtual Bool getTreatAsAircraftForLocoDistToGoal() const;
 
 	// yes, protected, NOT public... try to avoid exposing the state machine directly, please
-	inline AIStateMachine* getStateMachine() { return m_stateMachine; }
-	inline const AIStateMachine* getStateMachine() const { return m_stateMachine; }
+	AIStateMachine* getStateMachine() { return m_stateMachine; }
+	const AIStateMachine* getStateMachine() const { return m_stateMachine; }
 
 	void wakeUpNow();
 
 public:
 
-	inline StateID getCurrentStateID() const { return getStateMachine()->getCurrentStateID(); }	///< return the id of the current state of the machine
+	StateID getCurrentStateID() const { return getStateMachine()->getCurrentStateID(); }	///< return the id of the current state of the machine
 /// @ todo -- srj sez: JBA NUKE THIS CODE, IT IS EVIL
-	inline void friend_addToWaypointGoalPath( const Coord3D *pathPoint ) { getStateMachine()->addToGoalPath(pathPoint); }
+	void friend_addToWaypointGoalPath( const Coord3D *pathPoint ) { getStateMachine()->addToGoalPath(pathPoint); }
 
 	// this is intended for use ONLY by W3dWaypointBuffer and AIFollowPathState.
-	inline const Coord3D* friend_getGoalPathPosition( Int index ) const { return getStateMachine()->getGoalPathPosition( index ); }
+	const Coord3D* friend_getGoalPathPosition( Int index ) const { return getStateMachine()->getGoalPathPosition( index ); }
 
 	// this is intended for use ONLY by W3dWaypointBuffer.
 	Int friend_getWaypointGoalPathSize() const;
 
 	// this is intended for use ONLY by W3dWaypointBuffer.
-	inline Int friend_getCurrentGoalPathIndex() const { return m_nextGoalPathIndex; }
+	Int friend_getCurrentGoalPathIndex() const { return m_nextGoalPathIndex; }
 
 	// this is intended for use ONLY by AIFollowPathState.
-	inline void friend_setCurrentGoalPathIndex( Int index ) { m_nextGoalPathIndex = index; }
+	void friend_setCurrentGoalPathIndex( Int index ) { m_nextGoalPathIndex = index; }
 #ifdef DEBUG_LOGGING
 	inline const Coord3D *friend_getRequestedDestination() const { return &m_requestedDestination; }
 	inline const Coord3D *friend_getRequestedDestination2() const { return &m_requestedDestination2; }
 #endif
 
-	inline Object* getGoalObject() { return getStateMachine()->getGoalObject(); }	///< return the id of the current state of the machine
-	inline const Coord3D* getGoalPosition() const { return getStateMachine()->getGoalPosition(); }	///< return the id of the current state of the machine
+	Object* getGoalObject() { return getStateMachine()->getGoalObject(); }	///< return the id of the current state of the machine
+	const Coord3D* getGoalPosition() const { return getStateMachine()->getGoalPosition(); }	///< return the id of the current state of the machine
+
+	WhichTurretType friend_getTurretSync() const { return m_turretSyncFlag; }
+	void friend_setTurretSync(WhichTurretType t) { m_turretSyncFlag = t; }
 
-	inline WhichTurretType friend_getTurretSync() const { return m_turretSyncFlag; }
-	inline void friend_setTurretSync(WhichTurretType t) { m_turretSyncFlag = t; }
+	UnsignedInt getPriorWaypointID ( void ) { return m_priorWaypointID; };
+	UnsignedInt getCurrentWaypointID ( void ) { return m_currentWaypointID; };
 
-	inline UnsignedInt getPriorWaypointID ( void ) { return m_priorWaypointID; };
-	inline UnsignedInt getCurrentWaypointID ( void ) { return m_currentWaypointID; };
+	void clearMoveOutOfWay(void) {m_moveOutOfWay1 = INVALID_ID; m_moveOutOfWay2 = INVALID_ID;}
 
-	inline void clearMoveOutOfWay(void) {m_moveOutOfWay1 = INVALID_ID; m_moveOutOfWay2 = INVALID_ID;}
+	void setTmpValue(Int val) {m_tmpInt = val;}
+	Int getTmpValue(void) {return m_tmpInt;}
 
-	inline void setTmpValue(Int val) {m_tmpInt = val;}
-	inline Int getTmpValue(void) {return m_tmpInt;}
+	Bool getRetryPath(void) {return m_retryPath;}
 
-	inline Bool getRetryPath(void) {return m_retryPath;}
-	
-	inline void setAllowedToChase( Bool allow ) { m_allowedToChase = allow; }
-	inline Bool isAllowedToChase() const { return m_allowedToChase; }
+	void setAllowedToChase( Bool allow ) { m_allowedToChase = allow; }
+	Bool isAllowedToChase() const { return m_allowedToChase; }
 
 	// only for AIStateMachine.
 	virtual void friend_notifyStateMachineChanged();
@@ -698,7 +701,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	Path*				m_path;											///< current path to follow (for moving)
 	ObjectID		m_requestedVictimID;
 	Coord3D			m_requestedDestination;
-	Coord3D			m_requestedDestination2;							
+	Coord3D			m_requestedDestination2;
 	UnsignedInt	m_pathTimestamp;						///< time of path construction
 	ObjectID		m_ignoreObstacleID;					///< ignore this obstacle when pathfinding
 	Real				m_pathExtraDistance;				///< If we are following a waypoint path, there will be extra distance beyond the current path.
@@ -761,7 +764,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	Int						m_tmpInt;
 
 	// -------------------------------------------------------------------
-	Bool				m_doFinalPosition;					///< True if we are moving towards final position in a non-physics kind of way. 
+	Bool				m_doFinalPosition;					///< True if we are moving towards final position in a non-physics kind of way.
 	Bool				m_waitingForPath;						///< True if we have a pathfind request outstanding.
 	Bool				m_isAttackPath;							///< True if we have an attack path.
 	Bool				m_isFinalGoal;							///< True if this path ends at our destination (as opposed to an intermediate point on a waypoint path).
@@ -780,12 +783,9 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	Bool				m_retryPath;								///< If true, we need to try the path a second time.  jba.
 	Bool				m_allowedToChase;						///< Allowed to pursue targets.
 	Bool				m_isInUpdate;								///< If true, we are inside our update method.
-	Bool				m_fixLocoInPostProcess;		
+	Bool				m_fixLocoInPostProcess;
 };
 
 //------------------------------------------------------------------------------------------------------------
 // Inlines
 //
-
-#endif // _AI_UPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h
index ce6f248badf..354e5933577 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ACTIVEBODY_H_
-#define __ACTIVEBODY_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DamageFX.h"
 #include "GameLogic/Module/BodyModule.h"
@@ -48,7 +45,7 @@ class ParticleSystemTemplate;
 //-------------------------------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------------------------------
-class ActiveBodyModuleData : public BodyModuleData 
+class ActiveBodyModuleData : public BodyModuleData
 {
 public:
 	Real m_maxHealth;
@@ -79,7 +76,7 @@ class ActiveBody : public BodyModule
 	virtual Real getHealth() const;													///< get current health
 	virtual BodyDamageType getDamageState() const;
 	virtual void setDamageState( BodyDamageType newState );	///< control damage state directly.  Will adjust hitpoints.
-	virtual void setAflame( Bool setting );///< This is a major change like a damage state.  
+	virtual void setAflame( Bool setting );///< This is a major change like a damage state.
 
 	virtual const DamageInfo *getLastDamageInfo() const { return &m_lastDamageInfo; }	///< return info on last damage dealt to this object
 	virtual UnsignedInt getLastDamageTimestamp() const { return m_lastDamageTimestamp; }	///< return frame of last damage dealt
@@ -87,7 +84,7 @@ class ActiveBody : public BodyModule
 	virtual ObjectID getClearableLastAttacker() const { return (m_lastDamageCleared ? INVALID_ID : m_lastDamageInfo.in.m_sourceID); }
 	virtual void clearLastAttacker() { m_lastDamageCleared = true; }
 
-	void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel );
+	void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = TRUE );
 
 	virtual void setArmorSetFlag(ArmorSetType ast) { m_curArmorSetFlags.set(ast, 1); }
 	virtual void clearArmorSetFlag(ArmorSetType ast) { m_curArmorSetFlags.set(ast, 0); }
@@ -117,7 +114,7 @@ class ActiveBody : public BodyModule
 	void validateArmorAndDamageFX() const;
 	void doDamageFX( const DamageInfo *damageInfo );
 
-	void createParticleSystems( const AsciiString &boneBaseName, 
+	void createParticleSystems( const AsciiString &boneBaseName,
 															const ParticleSystemTemplate *systemTemplate,
 															Int maxSystems );
 	void deleteAllParticleSystems( void );
@@ -152,6 +149,3 @@ class ActiveBody : public BodyModule
 	mutable const DamageFX*						m_curDamageFX;
 
 };
-
-#endif // __ACTIVEBODY_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h
index d0ce50b2e06..55921700021 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ACTIVE_SHROUD_UPGRADE_H_
-#define __ACTIVE_SHROUD_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -75,6 +72,3 @@ class ActiveShroudUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-#endif // __ACTIVE_SHROUD_UPGRADE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h
index 0d945eb04b6..35f8c146df7 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h
@@ -24,12 +24,12 @@
 
 // FILE: ArmorUpgrade.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	July 2002
@@ -37,17 +37,14 @@
 //	Filename: 	ArmorUpgrade.h
 //
 //	author:		Chris Brue
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __ARMOR_UPGRADE_H_
-#define __ARMOR_UPGRADE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -90,5 +87,3 @@ class ArmorUpgrade : public UpgradeModule
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __ARMOR_UPGRADE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
index c5a1039204f..9a7cba0a7d3 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __ASSAULT_TRANSPORT_AI_UPDATE_H
-#define __ASSAULT_TRANSPORT_AI_UPDATE_H
-
 #include "Common/StateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -58,11 +55,11 @@ class AssaultTransportAIUpdateModuleData : public AIUpdateModuleData
 		m_clearRangeRequiredToContinueAttackMove = 50.0f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     AIUpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MembersGetHealedAtLifeRatio",						INI::parseReal,	NULL, offsetof( AssaultTransportAIUpdateModuleData, m_membersGetHealedAtLifeRatio ) },
 			{ "ClearRangeRequiredToContinueAttackMove", INI::parseReal, NULL, offsetof( AssaultTransportAIUpdateModuleData, m_clearRangeRequiredToContinueAttackMove ) },
@@ -123,6 +120,3 @@ class AssaultTransportAIUpdate : public AIUpdateInterface, public AssaultTranspo
 	Bool							m_isAttackObject;
 	Bool							m_newOccupantsAreNewMembers;
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h
index 1ad3a7a2cd6..532cc02aed1 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _ASSISTED_TARGETING_UPDATE_H
-#define _ASSISTED_TARGETING_UPDATE_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -76,6 +73,3 @@ class AssistedTargetingUpdate : public UpdateModule
 private:
 	void makeFeedbackLaser( const ThingTemplate *laserTemplate, const Object *from, const Object *to );
 };
-
-#endif 
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h
index f5c77dfe915..b0df5fec9d0 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h
@@ -24,12 +24,12 @@
 
 // FILE: AutoDepositUpdate.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	AutoDepositUpdate.h
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Auto Deposit Update Module
 //
 //-----------------------------------------------------------------------------
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __AUTO_DEPOSIT_UPDATE_H_
-#define __AUTO_DEPOSIT_UPDATE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -85,10 +82,10 @@ class AutoDepositUpdateModuleData : public UpdateModuleData
 		m_initialCaptureBonus = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "DepositTiming",					INI::parseDurationUnsignedInt,		NULL, offsetof( AutoDepositUpdateModuleData, m_depositFrame ) },
 			{ "DepositAmount",					INI::parseInt,		NULL, offsetof( AutoDepositUpdateModuleData, m_depositAmount ) },
@@ -131,5 +128,3 @@ class AutoDepositUpdate : public UpdateModule
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __AUTO_DEPOSIT_UPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h
index 92b1fae0513..5786e668631 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __AUTO_FIND_HEALING_UPDATE_H_
-#define __AUTO_FIND_HEALING_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -54,7 +51,7 @@ class AutoFindHealingUpdateModuleData : public ModuleData
 	AutoFindHealingUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -80,7 +77,3 @@ class AutoFindHealingUpdate : public UpdateModule
 protected:
 	Int m_nextScanFrames;
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h
index bc04246761d..c1f3a178341 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h
@@ -27,15 +27,12 @@
 // Desc:   Update that heals itself
 //------------------------------------------
 // Modified by Kris Morness, September 2002
-// Kris: Added the ability to add effects, radius healing, and restricting the type of objects 
+// Kris: Added the ability to add effects, radius healing, and restricting the type of objects
 //       subjected to the heal (or repair).
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __AutoHealBehavior_H_
-#define __AutoHealBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/ParticleSys.h"
 #include "GameLogic/Module/BehaviorModule.h"
@@ -77,16 +74,16 @@ class AutoHealBehaviorModuleData : public UpdateModuleData
 		SET_ALL_KINDOFMASK_BITS( m_kindOf );
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "StartsActive",	INI::parseBool, NULL, offsetof( AutoHealBehaviorModuleData, m_initiallyActive ) },
 			{ "SingleBurst",	INI::parseBool, NULL, offsetof( AutoHealBehaviorModuleData, m_singleBurst ) },
 			{ "HealingAmount",		INI::parseInt,												NULL, offsetof( AutoHealBehaviorModuleData, m_healingAmount ) },
 			{ "HealingDelay",			INI::parseDurationUnsignedInt,				NULL, offsetof( AutoHealBehaviorModuleData, m_healingDelay ) },
 			{ "Radius",						INI::parseReal,												NULL, offsetof( AutoHealBehaviorModuleData, m_radius ) },
-			{ "KindOf",						KindOfMaskType::parseFromINI,											NULL, offsetof( AutoHealBehaviorModuleData, m_kindOf ) },		
+			{ "KindOf",						KindOfMaskType::parseFromINI,											NULL, offsetof( AutoHealBehaviorModuleData, m_kindOf ) },
 			{ "RadiusParticleSystemName",					INI::parseParticleSystemTemplate,	NULL, offsetof( AutoHealBehaviorModuleData, m_radiusParticleSystemTmpl ) },
 			{ "UnitHealPulseParticleSystemName",	INI::parseParticleSystemTemplate,	NULL, offsetof( AutoHealBehaviorModuleData, m_unitHealPulseParticleSystemTmpl ) },
 			{ "StartHealingDelay",			INI::parseDurationUnsignedInt,				NULL, offsetof( AutoHealBehaviorModuleData, m_startHealingDelay ) },
@@ -103,7 +100,7 @@ class AutoHealBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class AutoHealBehavior : public UpdateModule, 
+class AutoHealBehavior : public UpdateModule,
 												 public UpgradeMux,
 												 public DamageModuleInterface
 {
@@ -137,8 +134,8 @@ class AutoHealBehavior : public UpdateModule,
 
 protected:
 
-	virtual void upgradeImplementation() 
-	{ 
+	virtual void upgradeImplementation()
+	{
 		setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
 	}
 
@@ -157,8 +154,8 @@ class AutoHealBehavior : public UpdateModule,
 		return getAutoHealBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers;
 	}
 
-	inline Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
-	
+	Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
+
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 
@@ -168,7 +165,7 @@ class AutoHealBehavior : public UpdateModule,
 
 	ParticleSystemID m_radiusParticleSystemID;
 
-	UnsignedInt m_soonestHealFrame;/** I need to record this, because with multiple wake up sources, 
+	UnsignedInt m_soonestHealFrame;/** I need to record this, because with multiple wake up sources,
 																		I can't rely solely on my sleeping.  So this will guard onDamage's wake up.
 																		I could guard the act of healing, but that would defeat the gain of being
 																		a sleepy module.  I never want to run update unless I am going to heal.
@@ -177,6 +174,3 @@ class AutoHealBehavior : public UpdateModule,
 	Bool m_stopped;
 
 };
-
-#endif // __AutoHealBehavior_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h
index b6abc03f786..813fbe822a6 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h
@@ -24,12 +24,12 @@
 
 // FILE: BaikonurLaunchPower.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	November 2002
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __BAIKONUR_LAUNCH_POWER_H_
-#define __BAIKONUR_LAUNCH_POWER_H_
-
 #include "GameLogic/Module/SpecialPowerModule.h"
 
 class Object;
@@ -64,7 +61,7 @@ class BaikonurLaunchPowerModuleData : public SpecialPowerModuleData
 
 	static void buildFieldParse( MultiIniFieldParse& p );
 
-	AsciiString m_detonationObject;		
+	AsciiString m_detonationObject;
 };
 
 
@@ -85,5 +82,3 @@ class BaikonurLaunchPower : public SpecialPowerModule
 protected:
 
 };
-
-#endif // __BAIKONUR_LAUNCH_POWER_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h
index 8277a8aa04d..d481f0634d1 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BASE_REGENERATE_UPDATE_H_
-#define __BASE_REGENERATE_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameLogic/Module/DamageModule.h"
@@ -81,5 +78,3 @@ class BaseRegenerateUpdate : public UpdateModule,
 private:
 
 };
-
-#endif  // end __BASE_REGENERATE_UPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h
index aeb4c63ff69..a746cd0b46e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BATTLE_PLAN_UPDATE_H_
-#define __BATTLE_PLAN_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/SpecialPowerUpdateModule.h"
@@ -86,7 +83,7 @@ class BattlePlanUpdateModuleData : public ModuleData
 	BattlePlanUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -108,7 +105,7 @@ enum BattlePlanStatus CPP_11(: Int)
 
 class BattlePlanBonuses : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(BattlePlanBonuses, "BattlePlanBonuses")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(BattlePlanBonuses, "BattlePlanBonuses")
 public:
 	Real						m_armorScalar;
 	Int							m_bombardment;				//Represents having weapon bonuses for bombardment plan
@@ -162,13 +159,13 @@ class BattlePlanUpdate : public UpdateModule, public SpecialPowerUpdateInterface
 	void recenterTurret();
 	Bool isTurretInNaturalPosition();
 	void setBattlePlan( BattlePlanStatus plan );
-	void createVisionObject();	
+	void createVisionObject();
 
 	BattlePlanStatus m_currentPlan;	//The current battle plan displayed by the building (includes packing & unpacking)
 	BattlePlanStatus m_desiredPlan; //The user desired battle plan
 	BattlePlanStatus m_planAffectingArmy; //The current battle plan that is affecting troops!
 	TransitionStatus m_status;
-	
+
 	UnsignedInt m_nextReadyFrame;
 	SpecialPowerModuleInterface *m_specialPowerModule;
 	Bool				m_invalidSettings;
@@ -190,7 +187,3 @@ class BattlePlanUpdate : public UpdateModule, public SpecialPowerUpdateInterface
 	ObjectID m_visionObjectID;
 
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h
index d75394f372f..6feb21738af 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h
@@ -24,14 +24,11 @@
 
 // FILE: BehaviorModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __BehaviorModule_H_
-#define __BehaviorModule_H_
-
 #include "Common/GameType.h"
 #include "Common/Module.h"
 
@@ -90,7 +87,7 @@ class BehaviorModuleData : public ModuleData
 	{
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     ModuleData::buildFieldParse(p);
 	}
@@ -202,28 +199,34 @@ class BehaviorModule : public ObjectModule, public BehaviorModuleInterface
 inline BehaviorModule::BehaviorModule( Thing *thing, const ModuleData* moduleData ) : ObjectModule( thing, moduleData ) { }
 inline BehaviorModule::~BehaviorModule() { }
 
+enum
+{
+	InvalidRunway = -1,
+};
+
 //-------------------------------------------------------------------------------------------------
 class ParkingPlaceBehaviorInterface
 {
 public:
 	struct PPInfo
 	{
-		Coord3D		parkingSpace; 
+		Coord3D		parkingSpace;
 		Real			parkingOrientation;
-		Coord3D		runwayPrep; 
-		Coord3D		runwayStart; 
-		Coord3D		runwayEnd; 
+		Coord3D		runwayPrep;
+		Coord3D		runwayStart;
+		Coord3D		runwayEnd;
 		Coord3D		runwayApproach;
 		Coord3D		hangarInternal;
 		Real			hangarInternalOrient;
 	};
-	virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const = 0; 
-	virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const = 0; 
-	virtual Bool hasReservedSpace(ObjectID id) const = 0; 
+	virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const = 0;
+	virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const = 0;
+	virtual Bool hasReservedSpace(ObjectID id) const = 0;
 	virtual Bool reserveSpace(ObjectID id, Real parkingOffset, PPInfo* info) = 0;
-	virtual void releaseSpace(ObjectID id) = 0; 
+	virtual void releaseSpace(ObjectID id) = 0;
 	virtual Bool reserveRunway(ObjectID id, Bool forLanding) = 0;
-	virtual void releaseRunway(ObjectID id) = 0; 
+	virtual void releaseRunway(ObjectID id) = 0;
+	virtual Int getRunwayIndex(ObjectID id) = 0;
 	virtual Int getRunwayCount() const = 0;
 	virtual ObjectID getRunwayReservation(Int r) = 0;
 	virtual void transferRunwayReservationToNextInLineForTakeoff(ObjectID id) = 0;
@@ -257,5 +260,3 @@ class LandMineInterface
 };
 
 //-------------------------------------------------------------------------------------------------
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
index 9a51797c26d..f63a0e6525b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
@@ -24,14 +24,11 @@
 
 // FILE: BodyModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __BODYMODULE_H_
-#define __BODYMODULE_H_
-
 #include "Common/Module.h"
 #include "GameLogic/Damage.h"
 #include "GameLogic/ArmorSet.h"
@@ -44,7 +41,7 @@
 class WeaponTemplate;
 
 //-------------------------------------------------------------------------------------------------
-/** Damage states for structures 
+/** Damage states for structures
 	*
 	* NOTE: the macros below for IS_CONDITION_WORSE and IS_CONDITION_BETTER depend on this
 	* enumeration being in sequential order
@@ -61,7 +58,7 @@ enum BodyDamageType CPP_11(: Int)
 };
 
 #ifdef DEFINE_BODYDAMAGETYPE_NAMES
-static const char* TheBodyDamageTypeNames[] =
+static const char* const TheBodyDamageTypeNames[] =
 {
 	"PRISTINE",
 	"DAMAGED",
@@ -70,6 +67,7 @@ static const char* TheBodyDamageTypeNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheBodyDamageTypeNames) == BODYDAMAGETYPE_COUNT + 1, "Incorrect array size");
 #endif
 
 enum MaxHealthChangeType CPP_11(: Int)
@@ -77,20 +75,24 @@ enum MaxHealthChangeType CPP_11(: Int)
 	SAME_CURRENTHEALTH,
 	PRESERVE_RATIO,
 	ADD_CURRENT_HEALTH_TOO,
+
+	MAX_HEALTH_CHANGE_COUNT
 };
 
 #ifdef DEFINE_MAXHEALTHCHANGETYPE_NAMES
-static const char* TheMaxHealthChangeTypeNames[] = 
+static const char* const TheMaxHealthChangeTypeNames[] =
 {
 	"SAME_CURRENTHEALTH",
 	"PRESERVE_RATIO",
 	"ADD_CURRENT_HEALTH_TOO",
+	NULL
 };
+static_assert(ARRAY_SIZE(TheMaxHealthChangeTypeNames) == MAX_HEALTH_CHANGE_COUNT + 1, "Incorrect array size");
 #endif
 
 
 //
-// is condition A worse than condition B  ... NOTE: this assumes the conditions 
+// is condition A worse than condition B  ... NOTE: this assumes the conditions
 // in BodyDamageType are in sequential order
 //
 // is a worse than b
@@ -108,7 +110,7 @@ class BodyModuleData : public BehaviorModuleData
 	{
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     BehaviorModuleData::buildFieldParse(p);
 	}
@@ -148,9 +150,9 @@ class BodyModuleInterface
 
 	virtual BodyDamageType getDamageState() const = 0;
 	virtual void setDamageState( BodyDamageType newState ) = 0;	///< control damage state directly.  Will adjust hitpoints.
-	virtual void setAflame( Bool setting ) = 0;///< This is a major change like a damage state.  
+	virtual void setAflame( Bool setting ) = 0;///< This is a major change like a damage state.
 
-	virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel ) = 0;	///< I just achieved this level right this moment
+	virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback ) = 0;	///< I just achieved this level right this moment
 
 	virtual void setArmorSetFlag(ArmorSetType ast) = 0;
 	virtual void clearArmorSetFlag(ArmorSetType ast) = 0;
@@ -168,12 +170,12 @@ class BodyModuleInterface
 
 	virtual void setFrontCrushed(Bool v) = 0;
 	virtual void setBackCrushed(Bool v) = 0;
-	
+
 	virtual void applyDamageScalar( Real scalar ) = 0;
 	virtual Real getDamageScalar() const = 0;
 
 	/**
-		Change the module's health by the given delta. Note that 
+		Change the module's health by the given delta. Note that
 		the module's DamageFX and Armor are NOT taken into
 		account, so you should think about what you're bypassing when you
 		call this directly (especially when when decreasing health, since
@@ -235,9 +237,9 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface
 
 	virtual BodyDamageType getDamageState() const = 0;
 	virtual void setDamageState( BodyDamageType newState ) = 0;	///< control damage state directly.  Will adjust hitpoints.
-	virtual void setAflame( Bool setting ) = 0;///< This is a major change like a damage state.  
+	virtual void setAflame( Bool setting ) = 0;///< This is a major change like a damage state.
 
-	virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel ) = 0;	///< I just achieved this level right this moment
+	virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = FALSE ) = 0;	///< I just achieved this level right this moment
 
 	virtual void setArmorSetFlag(ArmorSetType ast) = 0;
 	virtual void clearArmorSetFlag(ArmorSetType ast) = 0;
@@ -265,7 +267,7 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface
 	virtual Real getDamageScalar() const { return m_damageScalar; }
 
 	/**
-		Change the module's health by the given delta. Note that 
+		Change the module's health by the given delta. Note that
 		the module's DamageFX and Armor are NOT taken into
 		account, so you should think about what you're bypassing when you
 		call this directly (especially when when decreasing health, since
@@ -288,5 +290,3 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface
 };
 inline BodyModule::BodyModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ), m_damageScalar(1.0f) { }
 inline BodyModule::~BodyModule() { }
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h
index c12dce79542..b1959cb10f4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h
@@ -29,12 +29,9 @@
 
 #pragma once
 
-#ifndef __BONEFXDAMAGE_H_
-#define __BONEFXDAMAGE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 
-#include "GameLogic/Module/DamageModule.h" 
+#include "GameLogic/Module/DamageModule.h"
 
 //#include "GameLogic/Module/BodyModule.h" -- Yikes... not necessary to include this! (KM)
 enum BodyDamageType CPP_11(: Int); //Ahhhh much better!
@@ -57,8 +54,8 @@ class BoneFXDamage : public DamageModule
 	// damage module methods
 	virtual void onDamage( DamageInfo *damageInfo ) { }
 	virtual void onHealing( DamageInfo *damageInfo ) { }
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState );
 
 protected:
@@ -66,5 +63,3 @@ class BoneFXDamage : public DamageModule
 	virtual void onObjectCreated();
 
 };
-
-#endif  // end __BONEFXDAMAGE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h
index 9c6ed608498..9f6ff668e70 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BONEFXUPDATE_H_
-#define __BONEFXUPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/ParticleSys.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -39,7 +36,7 @@
 //#include "GameLogic/Module/DamageModule.h" -- Yikes... not necessary to include this! (KM)
 class DamageInfo; //Ahhhh much better!
 
-#include "GameLogic/Module/BodyModule.h" 
+#include "GameLogic/Module/BodyModule.h"
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Thing;
@@ -99,11 +96,11 @@ class BoneFXUpdateModuleData : public UpdateModuleData
 
 	BoneFXUpdateModuleData( void );
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 
 			{ "DamageFXTypes",				INI::parseDamageTypeFlags, NULL, offsetof( BoneFXUpdateModuleData, m_damageFXTypes ) },
@@ -277,5 +274,3 @@ class BoneFXUpdate : public UpdateModule
 	Bool m_bonesResolved[BODYDAMAGETYPE_COUNT];
 	Bool m_active;
 };
-
-#endif  // end __BONEFXUPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h
index 9d0cec524bd..cdb19194988 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BRIDGE_BEHAVIOR_H_
-#define __BRIDGE_BEHAVIOR_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "GameClient/TerrainRoads.h"
@@ -129,7 +126,7 @@ class BridgeBehavior : public UpdateModule,
 	// virtual destructor prototype provided by memory pool declaration
 
 	// module methods
-	static Int getInterfaceMask( void ) { return (MODULEINTERFACE_DAMAGE) | 
+	static Int getInterfaceMask( void ) { return (MODULEINTERFACE_DAMAGE) |
 																							 (MODULEINTERFACE_DIE) |
 																							 (MODULEINTERFACE_UPDATE); }
 	virtual BridgeBehaviorInterface* getBridgeBehaviorInterface( void ) { return this; }
@@ -139,8 +136,8 @@ class BridgeBehavior : public UpdateModule,
 	virtual DamageModuleInterface* getDamage( void ) { return this; }
 	virtual void onDamage( DamageInfo *damageInfo );
 	virtual void onHealing( DamageInfo *damageInfo );
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState );
 
 	// Die methods
@@ -164,17 +161,17 @@ class BridgeBehavior : public UpdateModule,
 
 	void resolveFX( void );
 	void handleObjectsOnBridgeOnDie( void );
-	void doAreaEffects( TerrainRoadType *bridgeTemplate, Bridge *bridge, 
+	void doAreaEffects( TerrainRoadType *bridgeTemplate, Bridge *bridge,
 											const ObjectCreationList *ocl, const FXList *fx );
-	void setScaffoldData( Object *obj, 
-												Real *angle, 
-												Real *sunkenHeight, 
-												const Coord3D *riseToPos, 
-												const Coord3D *buildPos, 
+	void setScaffoldData( Object *obj,
+												Real *angle,
+												Real *sunkenHeight,
+												const Coord3D *riseToPos,
+												const Coord3D *buildPos,
 												const Coord3D *bridgeCenter );
 
-	void getRandomSurfacePosition( TerrainRoadType *bridgeTemplate, 
-																 const BridgeInfo *bridgeInfo, 
+	void getRandomSurfacePosition( TerrainRoadType *bridgeTemplate,
+																 const BridgeInfo *bridgeInfo,
 																 Coord3D *pos );
 
 	ObjectID m_towerID[ BRIDGE_MAX_TOWERS ];		///< the towers that are a part of us
@@ -197,5 +194,3 @@ class BridgeBehavior : public UpdateModule,
 	UnsignedInt m_deathFrame;								///< frame we died on
 
 };
-
-#endif  // end __BRIDGE_DAMAGE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h
index f6916ffc482..0c725e5da4a 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BRIDGE_SCAFFOLD_BEHAVIOR_H_
-#define __BRIDGE_SCAFFOLD_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -112,6 +109,3 @@ class BridgeScaffoldBehavior : public UpdateModule,
 	Coord3D m_targetPos;									///< current target position for our motion type
 
 };
-
-
-#endif  // end __BRIDGE_SCAFFOLD_BEHAVIOR_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h
index 7b347d59e6e..53f5b79bad0 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BRIDGE_TOWER_BEHAVIOR_H_
-#define __BRIDGE_TOWER_BEHAVIOR_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DamageModule.h"
@@ -49,7 +46,7 @@ class BridgeTowerBehaviorInterface
 	virtual void setBridge( Object *bridge ) = 0;
 	virtual ObjectID getBridgeID( void ) = 0;
 	virtual void setTowerType( BridgeTowerType type ) = 0;
-	
+
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -81,8 +78,8 @@ class BridgeTowerBehavior : public BehaviorModule,
 	virtual DamageModuleInterface* getDamage() { return this; }
 	virtual void onDamage( DamageInfo *damageInfo );
 	virtual void onHealing( DamageInfo *damageInfo );
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState );
 
 	// Die methods
@@ -95,5 +92,3 @@ class BridgeTowerBehavior : public BehaviorModule,
 	BridgeTowerType m_type;				///< type of tower (positioning) we are
 
 };
-
-#endif  // end __BRIDGE_TOWER_DAMAGE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h
index b672c2541c8..553c99822e6 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h
@@ -24,29 +24,26 @@
 
 // FILE: CashBountyPower.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
 //
 //	Filename: 	CashBountyPower.h
 //
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CashBountyPower_H_
-#define __CashBountyPower_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -127,5 +124,3 @@ class CashBountyPower : public SpecialPowerModule
 	Real findBounty() const;
 
 };
-
-#endif // __CashBountyPower_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h
index b26b9b58206..de389216971 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __CASHHACKSPECIALPOWER_H_
-#define __CASHHACKSPECIALPOWER_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/SpecialPowerModule.h"
 
@@ -85,6 +82,3 @@ class CashHackSpecialPower : public SpecialPowerModule
 	Int findAmountToSteal() const;
 
 };
-
-#endif  // end __CASHHACKSPECIALPOWER_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h
index ab3179e3a1e..a5ee0e8aca7 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h
@@ -25,15 +25,12 @@
 // FILE: CaveContain.h ////////////////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, July 2002
 // Desc:   A version of OpenContain that overrides where the passengers are stored: one of CaveManager's
-//					entries. Changing entry is a script or ini command.  All queries about capacity and 
+//					entries. Changing entry is a script or ini command.  All queries about capacity and
 //					contents are also redirected.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CAVE_CONTAIN_H_
-#define __CAVE_CONTAIN_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CreateModule.h"
 #include "GameLogic/Module/OpenContain.h"
@@ -52,11 +49,11 @@ class CaveContainModuleData : public OpenContainModuleData
 		m_caveIndexData = 0;// By default, all Caves will be grouped together as number 0
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     OpenContainModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "CaveIndex", INI::parseInt, NULL, offsetof( CaveContainModuleData, m_caveIndexData ) },
 			{ 0, 0, 0, 0 }
@@ -71,7 +68,7 @@ class CaveContain : public OpenContain, public CreateModuleInterface, public Cav
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( CaveContain, "CaveContain" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( CaveContain, CaveContainModuleData )
-	
+
 public:
 
 	CaveContain( Thing *thing, const ModuleData* moduleData );
@@ -102,7 +99,7 @@ class CaveContain : public OpenContain, public CreateModuleInterface, public Cav
 	virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse );
 	virtual UnsignedInt getContainCount() const;
 	virtual Int getContainMax( void ) const;
-	virtual const ContainedItemsList* getContainedItemsList() const;	
+	virtual const ContainedItemsList* getContainedItemsList() const;
 	virtual Bool isKickOutOnCapture(){ return FALSE; }///< Caves and Tunnels don't kick out on capture.
 
 	// override the onDie we inherit from OpenContain
@@ -120,11 +117,9 @@ class CaveContain : public OpenContain, public CreateModuleInterface, public Cav
 
 	void changeTeamOnAllConnectedCaves( Team *newTeam, Bool setOriginalTeams );	///< When one gets captured, all connected ones get captured.  DistributedGarrison.
 
-	Bool m_needToRunOnBuildComplete; 
+	Bool m_needToRunOnBuildComplete;
 	Int m_caveIndex;
 
 	Team *m_originalTeam;												///< our original team before we were garrisoned
 
 };
-
-#endif  // end __CAVE_CONTAIN_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h
index c923c9f59ec..08fc5d2dcf3 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef CHECKPOINT_UPDATE_H
-#define CHECKPOINT_UPDATE_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "Common/KindOf.h"
@@ -52,10 +49,10 @@ class CheckpointUpdateModuleData : public UpdateModuleData
 		m_enemyScanDelayTime = LOGICFRAMES_PER_SECOND;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "ScanDelayTime",		INI::parseDurationUnsignedInt,		NULL, offsetof( CheckpointUpdateModuleData, m_enemyScanDelayTime ) },
 			{ 0, 0, 0, 0 }
@@ -88,6 +85,3 @@ class CheckpointUpdate : public UpdateModule
 	void checkForAlliesAndEnemies( void );
 
 };
-
-#endif // end CHECKPOINT_UPDATE_H
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
index 1cf874ccb4c..fc8102420d9 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
@@ -24,11 +24,8 @@
 
 // ChinookAIUpdate.h //////////
 // Author: Steven Johnson, June 2002
- 
-#pragma once
 
-#ifndef _ChinookAIUpdate_H_
-#define _ChinookAIUpdate_H_
+#pragma once
 
 #include "GameLogic/AIStateMachine.h"
 #include "GameLogic/Module/SupplyTruckAIUpdate.h"
@@ -65,7 +62,7 @@ class ChinookAIUpdateModuleData : public SupplyTruckAIUpdateModuleData
 };
 
 //-------------------------------------------------------------------------------------------------
-enum ChinookFlightStatus CPP_11(: Int) // Stored in save file, don't renumber.  jba. 
+enum ChinookFlightStatus CPP_11(: Int) // Stored in save file, don't renumber.  jba.
 {
 	CHINOOK_TAKING_OFF				= 0,
 	CHINOOK_FLYING						= 1,
@@ -89,7 +86,7 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate
 	virtual UpdateSleepTime update();
  	virtual void aiDoCommand(const AICommandParms* parms);
 	virtual Bool chooseLocomotorSet(LocomotorSetType wst);
-	// this is present solely for some transports to override, so that they can land before 
+	// this is present solely for some transports to override, so that they can land before
 	// allowing people to exit...
 	virtual AIFreeToExitType getAiFreeToExit(const Object* exiter) const;
 	virtual Bool isAllowedToAdjustDestination() const;
@@ -99,7 +96,7 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate
 	// prevent supply-ferry behavior in some cases (eg, when toting passengers)
 	virtual Bool isAvailableForSupplying() const;
 	virtual Bool isCurrentlyFerryingSupplies() const;
-	
+
 	virtual Bool isIdle() const;
 
 	const ChinookAIUpdateModuleData* friend_getData() const { return getChinookAIUpdateModuleData(); }
@@ -122,6 +119,3 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate
 	ObjectID								m_airfieldForHealing;
 	Bool										m_hasPendingCommand;
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h
index ee6998a0791..fbdc7f8977d 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h
@@ -24,28 +24,25 @@
 
 // FILE: CleanupAreaPower.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	September 2002
 //
 //	Author:		Kris Morness
-//	
-//  Makes use of the cleanup hazard update by augmenting the cleanup range 
+//
+//  Makes use of the cleanup hazard update by augmenting the cleanup range
 //  until there is nothing left to cleanup at which time it goes idle.
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CLEANUP_AREA_POWER_H_
-#define __CLEANUP_AREA_POWER_H_
-
 //-----------------------------------------------------------------------------
 #include "GameLogic/Module/SpecialPowerModule.h"
 
@@ -75,5 +72,3 @@ class CleanupAreaPower : public SpecialPowerModule
 
 	virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions );
 };
-
-#endif 
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h
index fa6d7a65d86..a9d12e58ee5 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __CLEANUP_HAZARD_UPDATE_H_
-#define __CLEANUP_HAZARD_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -53,7 +50,7 @@ class CleanupHazardUpdateModuleData : public ModuleData
 	CleanupHazardUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -91,7 +88,3 @@ class CleanupHazardUpdate : public UpdateModule
 	Coord3D m_pos;
 	Real		m_moveRange;
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h
index b258be12098..2f1dde30404 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h
@@ -24,24 +24,21 @@
 
 // FILE: CollideModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CollideModule_H_
-#define __CollideModule_H_
-
 #include "Common/Module.h"
 #include "GameLogic/Module/BehaviorModule.h"
 
 //-------------------------------------------------------------------------------------------------
 /** OBJECT COLLIDE MODULE
 	- Called when two objects collide (or when object collides with ground)
-	- Note in the 'collide' method that 'other' can be NULL, this indicates a 
+	- Note in the 'collide' method that 'other' can be NULL, this indicates a
 		collision with the ground
-	- Also note the 'collide' method is the response for the object that THIS module 
-		belongs to, we do not need to worry about the collision moudle of 'other', 
+	- Also note the 'collide' method is the response for the object that THIS module
+		belongs to, we do not need to worry about the collision moudle of 'other',
 		it will have its own collide action called separately */
 //-------------------------------------------------------------------------------------------------
 class CollideModuleInterface
@@ -61,7 +58,7 @@ class CollideModuleData : public BehaviorModuleData
 {
 public:
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
 		BehaviorModuleData::buildFieldParse(p);
 	}
@@ -69,7 +66,7 @@ class CollideModuleData : public BehaviorModuleData
 
 
 //-------------------------------------------------------------------------------------------------
-class CollideModule : public BehaviorModule, 
+class CollideModule : public BehaviorModule,
 											public CollideModuleInterface
 {
 
@@ -100,5 +97,3 @@ class CollideModule : public BehaviorModule,
 inline CollideModule::CollideModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { }
 inline CollideModule::~CollideModule() { }
 //-------------------------------------------------------------------------------------------------
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h
index 6f0e25cce97..95efb7be174 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __COMMAND_BUTTON_HUNT_UPDATE_H_
-#define __COMMAND_BUTTON_HUNT_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -52,7 +49,7 @@ class CommandButtonHuntUpdateModuleData : public ModuleData
 	CommandButtonHuntUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -85,7 +82,3 @@ class CommandButtonHuntUpdate : public UpdateModule
 	AsciiString		m_commandButtonName;
 	const CommandButton *m_commandButton;
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h
index 1e9e646fe62..271d87744c5 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _COMMAND_SET_UPGRADE_H
-#define _COMMAND_SET_UPGRADE_H
-
 #include "GameLogic/Module/UpgradeModule.h"
 
 //-----------------------------------------------------------------------------
@@ -65,6 +62,3 @@ class CommandSetUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-#endif // _COMMAND_SET_UPGRADE_H
-
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
index 33b86a9d014..b62b2a7f244 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
@@ -24,14 +24,11 @@
 
 // FILE: ContainModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __ContainModule_H_
-#define __ContainModule_H_
-
 #include "Common/Module.h"
 
 //-------------------------------------------------------------------------------------------------
@@ -68,7 +65,7 @@ typedef void (*ContainIterateFunc)( Object *obj, void *userData );		///< callbac
 class ContainModuleInterface
 {
 public:
-	
+
 	// we have a two basic container types that it is convenient to query and use
 	virtual OpenContain *asOpenContain() = 0;
 
@@ -86,12 +83,13 @@ class ContainModuleInterface
 	virtual Bool isGarrisonable() const = 0;
 	virtual Bool isSpecialZeroSlotContainer() const = 0;
 	virtual Bool isHealContain() const = 0;
+	virtual Bool isTunnelContain() const = 0;
 	virtual Bool isImmuneToClearBuildingAttacks() const = 0;
 
-	
+
 	///< if my object gets selected, then my visible passengers should, too
 	///< this gets called from
-	virtual void clientVisibleContainedFlashAsSelected() = 0; 
+	virtual void clientVisibleContainedFlashAsSelected() = 0;
 
 
 
@@ -126,7 +124,7 @@ class ContainModuleInterface
 	virtual Int getContainMax() const = 0; ///< The max needs to be virtual, but only two inheritors care.  -1 means "I don't care".
 
 	virtual ExitInterface* getContainExitInterface() = 0;
-	
+
 	virtual void orderAllPassengersToExit( CommandSourceType ) = 0; ///< All of the smarts of exiting are in the passenger's AIExit. removeAllFrommContain is a last ditch system call, this is the game Evacuate
 	virtual void markAllPassengersDetected() = 0;										///< Cool game stuff got added to the system calls since this layer didn't exist, so this regains that functionality
 
@@ -134,8 +132,8 @@ class ContainModuleInterface
 	// interface for containing objects inside of objects.  Objects that are
 	// contained remove their drawable representations entirely from the client
 	//
-	/** 
-		can this container contain this kind of object? 
+	/**
+		can this container contain this kind of object?
 		and, if checkCapacity is TRUE, does this container have enough space left to hold the given unit?
 	*/
 	virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const = 0;
@@ -157,7 +155,8 @@ class ContainModuleInterface
 	virtual const Object *friend_getRider() const = 0; ///< Damn.  The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
 	virtual Real getContainedItemsMass() const = 0;
 	virtual UnsignedInt getStealthUnitsContained() const = 0;
-	
+	virtual UnsignedInt getHeroUnitsContained() const = 0;
+
 	virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ) = 0;
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ) = 0;
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos ) = 0;
@@ -182,5 +181,3 @@ class ContainModuleInterface
 	}
 };
 //-------------------------------------------------------------------------------------------------
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h
index 3a14a46d975..a9cee09e8ce 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef CONVERT_TO_CAR_BOMB_CRATE_COLLIDE_H_
-#define CONVERT_TO_CAR_BOMB_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -54,11 +51,11 @@ class ConvertToCarBombCrateCollideModuleData : public CrateCollideModuleData
 		m_fxList = NULL;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "FXList",		INI::parseFXList,		NULL, offsetof( ConvertToCarBombCrateCollideModuleData, m_fxList ) },
 			{ 0, 0, 0, 0 }
@@ -89,5 +86,3 @@ class ConvertToCarBombCrateCollide : public CrateCollide
 	virtual Bool isRailroad() const { return FALSE;};
 	virtual Bool isCarBombCrateCollide() const { return TRUE; }
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h
index 68e2d12872f..653737df53e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h
@@ -23,19 +23,16 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: ConvertToHijackedVehicleCrateCollide.h 
+//
+// FILE: ConvertToHijackedVehicleCrateCollide.h
 // Author: Mark Lorenzen, July 2002
-// Desc:   A crate (actually a terrorist - mobile crate) that makes the target vehicle switch 
+// Desc:   A crate (actually a terrorist - mobile crate) that makes the target vehicle switch
 //				 sides, and kills its driver
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef CONVERT_TO_HIJACKED_VEHICLE_CRATE_COLLIDE_H_
-#define CONVERT_TO_HIJACKED_VEHICLE_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -54,7 +51,7 @@ class ConvertToHijackedVehicleCrateCollideModuleData : public CrateCollideModule
 		m_rangeOfEffect = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 	}
@@ -83,5 +80,3 @@ class ConvertToHijackedVehicleCrateCollide : public CrateCollide
 
 	virtual Bool isHijackedVehicleCrateCollide() const { return TRUE; }
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h
index 8fdb0224e52..594ead4b3a2 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h
@@ -24,12 +24,12 @@
 
 // FILE: CostModifierUpgrade.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,17 +37,14 @@
 //	Filename: 	CostModifierUpgrade.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __COST_MODIFIER_UPGRADE_H_
-#define __COST_MODIFIER_UPGRADE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -107,7 +104,7 @@ class CostModifierUpgrade : public UpgradeModule
 	// virtual destructor prototype defined by MemoryPoolObject
 
 	virtual void onDelete( void );																///< we have some work to do when this module goes away
-	virtual void onCapture( Player *oldOwner, Player *newOwner ); 
+	virtual void onCapture( Player *oldOwner, Player *newOwner );
 
 protected:
 
@@ -115,5 +112,3 @@ class CostModifierUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-#endif // __COST_MODIFIER_UPGRADE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h
index 7cf3ce6d556..d560519cd02 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef CRATE_COLLIDE_H_
-#define CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CollideModule.h"
 
@@ -42,7 +39,7 @@ class FXList;
 enum ScienceType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
-class CrateCollideModuleData : public CollideModuleData 
+class CrateCollideModuleData : public CollideModuleData
 {
 public:
 	KindOfMaskType	m_kindof;				///< the kind(s) of units that can be collided with
@@ -52,7 +49,7 @@ class CrateCollideModuleData : public CollideModuleData
 	Bool m_isHumanOnlyPickup;				///< Can this crate only be picked up by a human player?  (Mission thing)
 	ScienceType m_pickupScience;		///< Can only be picked up by a unit whose player has this science
 	FXList *m_executeFX;						///< FXList to play when activated
-	
+
 	AsciiString m_executionAnimationTemplate;				///< Anim2D to play at crate location
 	Real m_executeAnimationDisplayTimeInSeconds;		///< time to play animation for
 	Real m_executeAnimationZRisePerSecond;					///< rise animation up while playing
@@ -93,5 +90,3 @@ class CrateCollide : public CollideModule
 	virtual Bool isValidToExecute( const Object *other ) const;
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h
index 0a111396704..4cbc1f77b1f 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _CREATE_CRATE_DIE_H_
-#define _CREATE_CRATE_DIE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "GameLogic/Module/DieModule.h"
@@ -49,8 +46,6 @@ class CreateCrateDieModuleData : public DieModuleData
 
 	CreateCrateDieModuleData()
 	{
-		// Added By Sadullah Nader
-		// Initializations missing and needed
 		m_crateNameList.clear();
 	}
 	~CreateCrateDieModuleData()
@@ -58,11 +53,11 @@ class CreateCrateDieModuleData : public DieModuleData
 		m_crateNameList.clear();
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     DieModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "CrateData",	CreateCrateDieModuleData::parseCrateData,		NULL, NULL },
 			{ 0, 0, 0, 0 }
@@ -86,7 +81,7 @@ class CreateCrateDie : public DieModule
 	CreateCrateDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 private:
 	Bool testCreationChance( CrateTemplate const *currentCrateData );
@@ -96,5 +91,3 @@ class CreateCrateDie : public DieModule
 
 	Object *createCrate( CrateTemplate const *currentCrateData );
 };
-
-#endif 
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h
index 1dbd8532c78..698b9f7232a 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h
@@ -24,14 +24,11 @@
 
 // FILE: CreateModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CreateModule_H_
-#define __CreateModule_H_
-
 #include "Common/Module.h"
 #include "GameLogic/Module/BehaviorModule.h"
 
@@ -52,7 +49,7 @@ class CreateModuleData : public BehaviorModuleData
 {
 public:
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
 		BehaviorModuleData::buildFieldParse(p);
 	}
@@ -85,5 +82,3 @@ class CreateModule : public BehaviorModule, public CreateModuleInterface
 	Bool m_needToRunOnBuildComplete; ///< Prevent the multiple calling of onBuildComplete
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h
index 354d74ae7df..e8b61f9d908 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _CREATE_OBJECT_DIE_H_
-#define _CREATE_OBJECT_DIE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "GameLogic/Module/DieModule.h"
@@ -68,9 +65,6 @@ class CreateObjectDie : public DieModule
 	CreateObjectDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-#endif // _CREATE_OBJECT_DIE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h
index 68436834740..4c81de8af1b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __CrushDie_H_
-#define __CrushDie_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/INI.h"
@@ -67,11 +64,11 @@ class CrushDieModuleData : public DieModuleData
 		}
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     DieModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "TotalCrushSound",					INI::parseAudioEventRTS,			NULL, offsetof( CrushDieModuleData, m_crushSounds[TOTAL_CRUSH] ) },
 			{ "BackEndCrushSound",				INI::parseAudioEventRTS,			NULL, offsetof( CrushDieModuleData, m_crushSounds[BACK_END_CRUSH] ) },
@@ -90,7 +87,7 @@ class CrushDie : public DieModule
 {
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( CrushDie, "CrushDie" )
-	
+
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( CrushDie, CrushDieModuleData );
 
 public:
@@ -98,9 +95,6 @@ class CrushDie : public DieModule
 	CrushDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
-	
-};
-
-#endif // __CrushDie_H_
+	virtual void onDie( const DamageInfo *damageInfo );
 
+};
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h
index 593956e7c6d..6be4b927961 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DAMDIE_H_
-#define __DAMDIE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 
@@ -45,7 +42,7 @@ class DamDieModuleData : public DieModuleData
 	DamDieModuleData( void );
 
 	static void buildFieldParse(MultiIniFieldParse& p);
-		
+
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -61,8 +58,6 @@ class DamDie : public DieModule
 	DamDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prorotype provided by MemoryPoolObject
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-#endif  // end __DAMDIE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
index ee90cfe55c3..2487b2f3d2e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
@@ -24,14 +24,11 @@
 
 // FILE: DamageModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __DamageModule_H_
-#define __DamageModule_H_
-
 #include "Common/Module.h"
 #include "GameLogic/Damage.h"
 #include "GameLogic/Module/BehaviorModule.h"
@@ -50,8 +47,8 @@ class DamageModuleInterface
 
 	virtual void onDamage( DamageInfo *damageInfo ) = 0;	///< damage callback
 	virtual void onHealing( DamageInfo *damageInfo ) = 0;	///< healing callback
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState) = 0;  ///< state change callback
 
 };
@@ -67,11 +64,11 @@ class DamageModuleData : public BehaviorModuleData
 	{
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     BehaviorModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 //			{ "DamageTypes", INI::parseDamageTypeFlags, NULL, offsetof( DamageModuleData, m_damageTypes ) },
 			{ 0, 0, 0, 0 }
@@ -103,8 +100,8 @@ class DamageModule : public BehaviorModule, public DamageModuleInterface
 	// damage module callbacks
 	virtual void onDamage( DamageInfo *damageInfo ) = 0;	///< damage callback
 	virtual void onHealing( DamageInfo *damageInfo ) = 0;	///< healing callback
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState) = 0;  ///< state change callback
 
 protected:
@@ -113,5 +110,3 @@ class DamageModule : public BehaviorModule, public DamageModuleInterface
 inline DamageModule::DamageModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { }
 inline DamageModule::~DamageModule() { }
 //-------------------------------------------------------------------------------------------------
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h
index 413515b1c20..414402c641b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _DEFAULT_PRODUCTION_EXIT_UPDATE_H
-#define _DEFAULT_PRODUCTION_EXIT_UPDATE_H
-
 #include "GameLogic/Module/UpdateModule.h"
 #include "Common/INI.h"
 #include "Lib/BaseType.h"
@@ -52,10 +49,10 @@ class DefaultProductionExitUpdateModuleData : public UpdateModuleData
 		m_naturalRallyPoint.zero();
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UnitCreatePoint",		INI::parseCoord3D,		NULL, offsetof( DefaultProductionExitUpdateModuleData, m_unitCreatePoint ) },
 			{ "NaturalRallyPoint",  INI::parseCoord3D,		NULL, offsetof( DefaultProductionExitUpdateModuleData, m_naturalRallyPoint ) },
@@ -114,5 +111,3 @@ inline const Coord3D *DefaultProductionExitUpdate::getRallyPoint( void ) const
 
 	return NULL;
 }
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h
index 71135babcb9..953ac689453 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h
@@ -24,7 +24,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //
-// FILE: DefectorSpecialPower.h 
+// FILE: DefectorSpecialPower.h
 // Author: Mark Lorenzen, JULY 2002
 // Desc:   General can click command cursor on any enemy, and it becomes his
 //
@@ -32,9 +32,6 @@
 
 #pragma once
 
-#ifndef __DEFECTORSPECIALPOWER_H_
-#define __DEFECTORSPECIALPOWER_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/SpecialPowerModule.h"
 
@@ -81,5 +78,3 @@ class DefectorSpecialPower : public SpecialPowerModule
 protected:
 
 };
-#endif  // end DefectorSpecialPower
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h
index f63ac307931..d5d3f63eb7d 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h
@@ -24,15 +24,12 @@
 
 // FILE: DelayedUpgrade.h /////////////////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, April 2002
-// Desc:	 An Upgrade that broadcasts to all DelayedUpgradeUpdates that maybe they should start 
+// Desc:	 An Upgrade that broadcasts to all DelayedUpgradeUpdates that maybe they should start
 //					counting down to execution
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __DELAYED_UPGRADE_H_
-#define __DELAYED_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -47,11 +44,11 @@ class DelayedUpgradeModuleData : public UpgradeModuleData
 		m_delayTime = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpgradeModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "DelayTime",	INI::parseDurationUnsignedInt,	NULL, offsetof( DelayedUpgradeModuleData, m_delayTime ) },
 			{ 0, 0, 0, 0 }
@@ -82,7 +79,3 @@ class DelayedUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h
index 30f11a25b17..5e0811dc40e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DELAYED_WEAPON_SET_UPGRADE_UPDATE_H_
-#define __DELAYED_WEAPON_SET_UPGRADE_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -67,7 +64,5 @@ class DelayedWeaponSetUpgradeUpdate : public UpdateModule, public DelayedUpgrade
 	virtual UpdateSleepTime update();
 
 protected:
-	
-};
 
-#endif
+};
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h
index 5f3da93eead..fcb180e8f9d 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DELETION_UPDATE_H_
-#define __DELETION_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -48,10 +45,10 @@ class DeletionUpdateModuleData : public UpdateModuleData
 		m_maxFrames = 0.0f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MinLifetime",					INI::parseDurationUnsignedInt,		NULL, offsetof( DeletionUpdateModuleData, m_minFrames ) },
 			{ "MaxLifetime",					INI::parseDurationUnsignedInt,		NULL, offsetof( DeletionUpdateModuleData, m_maxFrames ) },
@@ -86,6 +83,3 @@ class DeletionUpdate : public UpdateModule
 	UnsignedInt m_dieFrame;			///< frame we die on
 
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h
index 8bc6fa71eb6..17b89253056 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _DELIVER_PAYLOAD_AI_UPDATE_H_
-#define _DELIVER_PAYLOAD_AI_UPDATE_H_
-
 #include "Common/StateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameClient/RadiusDecal.h"
@@ -56,7 +53,7 @@ class DeliverPayloadStateMachine : public StateMachine
 //-------------------------------------------------------------------------------------------------
 class ApproachState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ApproachState, "ApproachState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ApproachState, "ApproachState")
 	//Approaching the drop zone
 public:
 	ApproachState( StateMachine *machine ) :State( machine, "ApproachState" ) {}
@@ -73,13 +70,13 @@ EMPTY_DTOR(ApproachState)
 //-------------------------------------------------------------------------------------------------
 class DeliveringState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DeliveringState, "DeliveringState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DeliveringState, "DeliveringState")
 	// Kickin' stuff out the door
 public:
-	DeliveringState( StateMachine *machine ) :State( machine, "DeliveringState" ) 
-	{ 
-		m_dropDelayLeft = 0; 
-		m_didOpen = false; 
+	DeliveringState( StateMachine *machine ) :State( machine, "DeliveringState" )
+	{
+		m_dropDelayLeft = 0;
+		m_didOpen = false;
 	}
 	virtual StateReturnType update();
 	virtual StateReturnType onEnter();
@@ -99,7 +96,7 @@ EMPTY_DTOR(DeliveringState)
 //-------------------------------------------------------------------------------------------------
 class ConsiderNewApproachState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ConsiderNewApproachState, "ConsiderNewApproachState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ConsiderNewApproachState, "ConsiderNewApproachState")
 	//Should I try again?  Has own data to keep track.
 public:
 	ConsiderNewApproachState( StateMachine *machine ) : State( machine, "ConsiderNewApproachState" ), m_numberEntriesToState(0) { }
@@ -120,7 +117,7 @@ EMPTY_DTOR(ConsiderNewApproachState)
 //-------------------------------------------------------------------------------------------------
 class RecoverFromOffMapState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RecoverFromOffMapState, "RecoverFromOffMapState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RecoverFromOffMapState, "RecoverFromOffMapState")
 public:
 	RecoverFromOffMapState( StateMachine *machine ) : State( machine, "RecoverFromOffMapState" ), m_reEntryFrame(0) { }
 	virtual StateReturnType update();
@@ -139,7 +136,7 @@ EMPTY_DTOR(RecoverFromOffMapState)
 //-------------------------------------------------------------------------------------------------
 class HeadOffMapState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeadOffMapState, "HeadOffMapState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeadOffMapState, "HeadOffMapState")
 	//I'm outta here
 public:
 	HeadOffMapState( StateMachine *machine ) :State( machine, "HeadOffMapState" ) {}
@@ -156,7 +153,7 @@ EMPTY_DTOR(HeadOffMapState)
 //-------------------------------------------------------------------------------------------------
 class CleanUpState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(CleanUpState, "CleanUpState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(CleanUpState, "CleanUpState")
 	//Made it off map, delete ourselves
 public:
 	CleanUpState( StateMachine *machine ) :State( machine, "CleanUpState" ) {}
@@ -205,20 +202,16 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData
 		m_dropOffset.zero();
 		m_dropVariance.zero();
 		m_deliveryDecalRadius = 0;
-		// Added By Sadullah Nader
-		// Initialization missing and needed
-
 		m_putInContainerName.clear();
-		// End Add
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     AIUpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
-			//These values represent script only reinforcements using deliverPayloadViaModuleData()! 
+			//These values represent script only reinforcements using deliverPayloadViaModuleData()!
 			//***********************************************************************************
 			//DO NOT ADD DATA HERE UNLESS YOU ARE SUPPORTING SCRIPTED TEAM REINFORCEMENT DELIVERY
 			//THESE DATA VALUES ARE SPECIFIED ONLY BY FACTIONUNIT.INI
@@ -296,14 +289,9 @@ class DeliverPayloadData
 		m_visiblePayloadWeaponTemplate = NULL;
 		m_selfDestructObject = FALSE;
 		m_deliveryDecalRadius = 0;
-		// Added By Sadullah Nader
-		// Initialization missing and needed  
-		
 		m_visibleDropBoneName.clear();
 		m_visiblePayloadTemplateName.clear();
 		m_visibleSubObjectName.clear();
-		
-		// End Add
 	}
 
 	static const FieldParse* getFieldParse();
@@ -381,6 +369,3 @@ class DeliverPayloadAIUpdate : public AIUpdateInterface
 
 
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h
index b49a7cbb73f..ecb65aef278 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DEMO_TRAP_UPDATE_H_
-#define __DEMO_TRAP_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -54,11 +51,11 @@ class DemoTrapUpdateModuleData : public ModuleData
 	Bool						m_defaultsToProximityMode;
 	Bool						m_friendlyDetonation;
 	Bool						m_detonateWhenKilled;
-	
+
 	DemoTrapUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -86,7 +83,3 @@ class DemoTrapUpdate : public UpdateModule
 	Int m_nextScanFrames;
 	Bool m_detonated;
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h
index eaec166a87a..2c0a9ebfb55 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DEMORALIZE_SPECIAL_POWER_H_
-#define __DEMORALIZE_SPECIAL_POWER_H_
-
 #ifdef ALLOW_DEMORALIZE
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
@@ -82,6 +79,3 @@ class DemoralizeSpecialPower : public SpecialPowerModule
 };
 
 #endif // ALLOW_DEMORALIZE
-
-
-#endif  // end __DEMORALIZE_SPECIAL_POWER_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
index 4c031a82bc0..74a90c299a3 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
@@ -24,14 +24,11 @@
 
 // DeployStyleAIUpdate.h ////////////
 // Author: Kris Morness, August 2002
-// Desc:   State machine that allows deploying/undeploying to control the AI. 
+// Desc:   State machine that allows deploying/undeploying to control the AI.
 //         When deployed, you can't move, when undeployed, you can't attack.
 
 #pragma once
 
-#ifndef __DEPLOY_STYLE_AI_UPDATE_H
-#define __DEPLOY_STYLE_AI_UPDATE_H
-
 #include "Common/StateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -50,8 +47,8 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData
 {
 public:
 	UnsignedInt			m_unpackTime;
-	UnsignedInt			m_packTime;		
-	Bool						m_resetTurretBeforePacking;	
+	UnsignedInt			m_packTime;
+	Bool						m_resetTurretBeforePacking;
 	Bool						m_turretsFunctionOnlyWhenDeployed;
 	Bool						m_turretsMustCenterBeforePacking;
 
@@ -61,17 +58,14 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData
 		m_packTime = 0;
 		m_resetTurretBeforePacking = false;
 		m_turretsFunctionOnlyWhenDeployed = false;
-		// Added By Sadullah Nader
-		// Initialization necessary 
 		m_turretsMustCenterBeforePacking = FALSE;
-		// End Add
 	}
 
 	static void buildFieldParse(MultiIniFieldParse& p)
 	{
 		AIUpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UnpackTime",					INI::parseDurationUnsignedInt,	NULL, offsetof( DeployStyleAIUpdateModuleData, m_unpackTime ) },
 			{ "PackTime",						INI::parseDurationUnsignedInt,	NULL, offsetof( DeployStyleAIUpdateModuleData, m_packTime ) },
@@ -125,6 +119,3 @@ class DeployStyleAIUpdate : public AIUpdateInterface
 	Bool										m_isGuardingPosition;
 	Bool										m_overriddenAttack;
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h
index 4c2411b0c64..f2b8cce9098 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DestroyDie_H_
-#define __DestroyDie_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 #include "Common/INI.h"
@@ -50,9 +47,6 @@ class DestroyDie : public DieModule
 	DestroyDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-#endif // __DestroyDie_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h
index 37281980dc4..569b2bf5419 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h
@@ -24,14 +24,11 @@
 
 // FILE: DestroyModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __DestroyModule_H_
-#define __DestroyModule_H_
-
 #include "Common/Module.h"
 #include "GameLogic/Module/BehaviorModule.h"
 
@@ -66,5 +63,3 @@ class DestroyModule : public BehaviorModule, public DestroyModuleInterface
 protected:
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h
index a091ac7211c..d16a49ab3d9 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h
@@ -24,14 +24,11 @@
 
 // FILE: DieModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __DieModule_H_
-#define __DieModule_H_
-
 #include "Common/Module.h"
 #include "GameLogic/Damage.h"
 #include "GameLogic/Module/BehaviorModule.h"
@@ -73,13 +70,13 @@ class DieModuleData : public BehaviorModuleData
 public:
 	DieMuxData			m_dieMuxData;
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
 		BehaviorModuleData::buildFieldParse(p);
 		p.add(DieMuxData::getFieldParse(), offsetof( DieModuleData, m_dieMuxData ));
 	}
 
-	inline Bool isDieApplicable(const Object* obj, const DamageInfo *damageInfo) const { return m_dieMuxData.isDieApplicable(obj, damageInfo); }
+	Bool isDieApplicable(const Object* obj, const DamageInfo *damageInfo) const { return m_dieMuxData.isDieApplicable(obj, damageInfo); }
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -104,9 +101,7 @@ class DieModule : public BehaviorModule, public DieModuleInterface
 
 protected:
 	Bool isDieApplicable(const DamageInfo *damageInfo) const { return getDieModuleData()->isDieApplicable(getObject(), damageInfo); }
-	
+
 };
 inline DieModule::DieModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { }
 inline DieModule::~DieModule() { }
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h
index e0323cb9850..a6add30d44c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _DOCK_UPDATE_H_
-#define _DOCK_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "Common/GameMemory.h"
@@ -49,7 +46,7 @@ enum
 };
 
 //-------------------------------------------------------------------------------------------------
-class DockUpdateModuleData : public UpdateModuleData 
+class DockUpdateModuleData : public UpdateModuleData
 {
 public:
 	Int m_numberApproachPositionsData; // A positive number is an absolute, DYNAMIC_APPROACH_VECTOR_FLAG means dynamic vector
@@ -86,8 +83,8 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface
 	*/
 	virtual Bool advanceApproachPosition( Object* docker, Coord3D *position, Int *index );
 
-	/** Return true when it is OK for docker to begin entering the dock 
-			The Dock will lift the restriction on one particular docker on its own, 
+	/** Return true when it is OK for docker to begin entering the dock
+			The Dock will lift the restriction on one particular docker on its own,
 			so you must continually ask.
 	*/
 	virtual Bool isClearToEnter( Object const* docker ) const;
@@ -99,23 +96,23 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface
 
 	/** Give me the point that is the start of your docking path
 			Returning NULL means there is none free
-			All functions take docker as arg so we could have multiple docks on a building.  
+			All functions take docker as arg so we could have multiple docks on a building.
 			Docker is not assumed, it is recorded and checked.
 	*/
-	virtual void getEnterPosition( Object* docker, Coord3D *position );			
+	virtual void getEnterPosition( Object* docker, Coord3D *position );
 
-	/** Give me the middle point of the dock process where the action() happens */	
-	virtual void getDockPosition( Object* docker, Coord3D *position );					
+	/** Give me the middle point of the dock process where the action() happens */
+	virtual void getDockPosition( Object* docker, Coord3D *position );
 
 	/** Give me the point to drive to when I am done */
-	virtual void getExitPosition( Object* docker, Coord3D *position );					
+	virtual void getExitPosition( Object* docker, Coord3D *position );
 
-	virtual void onApproachReached( Object* docker );		///< I have reached the Approach Point.  
-	virtual void onEnterReached( Object* docker );			///< I have reached the Enter Point.  
+	virtual void onApproachReached( Object* docker );		///< I have reached the Approach Point.
+	virtual void onEnterReached( Object* docker );			///< I have reached the Enter Point.
 	virtual void onDockReached( Object* docker );				///< I have reached the Dock point
 	virtual void onExitReached( Object* docker );				///< I have reached the exit.  You are no longer busy
 
-	//The fact that action() is not here is intentional.  This object cannot exist.  You must 
+	//The fact that action() is not here is intentional.  This object cannot exist.  You must
 	//derive off it and implement action().
 
 	virtual void cancelDock( Object* docker );	///< Clear me from any reserved points, and if I was the reason you were Busy, you aren't anymore.
@@ -126,7 +123,7 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface
 	virtual Bool isAllowPassthroughType();	///< Not all docks allow you to path through them in your AIDock machine
 
 	virtual Bool isRallyPointAfterDockType(){return FALSE;} ///< A minority of docks want to give you a final command to their rally point
-	
+
 	virtual void setDockCrippled( Bool setting ); ///< Game Logic can set me as inoperative.  I get to decide what that means.
 
 	virtual UpdateSleepTime update();	///< In charge of lifting dock restriction for one registered as Approached if all is ready
@@ -145,7 +142,7 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface
 
 	VecCoord3D m_approachPositions;
 	ObjectIDVector m_approachPositionOwners;	///< Who is in or at least reserved each spot
-	BoolVector m_approachPositionReached;			///< Which positions have actually been reached 
+	BoolVector m_approachPositionReached;			///< Which positions have actually been reached
 
 	ObjectID m_activeDocker;	///< we could expand this to multiple dock paths since we always get docker in our methods
 	Bool m_dockerInside; ///< This is true while our active docker is between Enter and Exit. This is shorter than activeDocker's lifetime as it doesn't include approach to enter
@@ -153,8 +150,6 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface
 
 	Bool m_dockOpen;  ///< Is the dock open for dockers
 
-	void loadDockPositions();  ///< load all the dock positions 
+	void loadDockPositions();  ///< load all the dock positions
 	Coord3D computeApproachPosition( Int positionIndex, Object *forWhom ); ///< Do a smart lookup of this bone position
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
index 657ba7a3349..1488eecb0d2 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DOZERAIUPDATE_H_
-#define __DOZERAIUPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -71,12 +68,13 @@ class DozerPrimaryStateMachine : public StateMachine
 enum DozerTask CPP_11(: Int) // These enums are saved in the game save file, so DO NOT renumber them. jba.
 {
 	DOZER_TASK_INVALID = -1,
-	DOZER_TASK_FIRST = 0,
-	DOZER_TASK_BUILD = DOZER_TASK_FIRST,		///< go build something
-	DOZER_TASK_REPAIR = 1,											///< go repair something
-	DOZER_TASK_FORTIFY = 2,											///< go fortify something
 
-	DOZER_NUM_TASKS													// keep this last
+	DOZER_TASK_BUILD,												///< go build something
+	DOZER_TASK_REPAIR,											///< go repair something
+	DOZER_TASK_FORTIFY,											///< go fortify something
+
+	DOZER_NUM_TASKS,												// keep this last
+	DOZER_TASK_FIRST = 0,
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -86,7 +84,8 @@ enum DozerDockPoint CPP_11(: Int)	 // These enums are saved in the game save fil
 	DOZER_DOCK_POINT_START	= 0,
 	DOZER_DOCK_POINT_ACTION	= 1,
 	DOZER_DOCK_POINT_END		= 2,
-	DOZER_NUM_DOCK_POINTS  // keep this one last
+
+	DOZER_NUM_DOCK_POINTS
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -119,8 +118,8 @@ class DozerAIInterface
 	virtual Real getBoredRange( void ) const = 0;							///< when we're bored, we look this far away to do things
 
 	// methods to override for the dozer behaviors
-	virtual Object *construct( const ThingTemplate *what, 
-														 const Coord3D *pos, Real angle, 
+	virtual Object *construct( const ThingTemplate *what,
+														 const Coord3D *pos, Real angle,
 														 Player *owningPlayer,
 														 Bool isRebuild ) = 0;
 
@@ -188,7 +187,7 @@ class DozerAIUpdateModuleData : public AIUpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 /** The Dozer AI Update interface.  Dozers are workers that are capable of building all the
-	* structures available to a player, as well as repairing building, and fortifying 
+	* structures available to a player, as well as repairing building, and fortifying
 	* civilian structures */
 //-------------------------------------------------------------------------------------------------
 class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface
@@ -221,8 +220,8 @@ class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface
 	virtual Real getBoredRange( void ) const;							///< when we're bored, we look this far away to do things
 
 	// methods to override for the dozer behaviors
-	virtual Object* construct( const ThingTemplate *what, 
-														 const Coord3D *pos, Real angle, 
+	virtual Object* construct( const ThingTemplate *what,
+														 const Coord3D *pos, Real angle,
 														 Player *owningPlayer,
 														 Bool isRebuild );								///< construct an object
 
@@ -274,11 +273,11 @@ class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface
 
 	virtual void privateRepair( Object *obj, CommandSourceType cmdSource );	///< repair the target
 	virtual void privateResumeConstruction( Object *obj, CommandSourceType cmdSource );  ///< resume construction on obj
-	
+
 	struct DozerTaskInfo
 	{
 		ObjectID m_targetObjectID;				///< target object ID of task
-		UnsignedInt m_taskOrderFrame;			///< logic frame we decided we wanted to do this task	
+		UnsignedInt m_taskOrderFrame;			///< logic frame we decided we wanted to do this task
 	} m_task[ DOZER_NUM_TASKS ];				///< tasks we want to do indexed by DozerTask
 
 	DozerPrimaryStateMachine *m_dozerMachine;  ///< the custom state machine for Dozer behavior
@@ -303,7 +302,3 @@ class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface
 	void createMachines( void );		///< create our behavior machines we need
 
 };
-
-
-#endif // __DOZERAIUPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h
index ca876b9bed1..5c565545a73 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h
@@ -24,13 +24,10 @@
 
 // FILE:		DumbProjectileBehavior.h
 // Author:	Steven Johnson, July 2002
-// Desc:		
+// Desc:
 
 #pragma once
 
-#ifndef _DumbProjectileBehavior_H_
-#define _DumbProjectileBehavior_H_
-
 #include "Common/GameType.h"
 #include "Common/GlobalData.h"
 #include "Common/STLTypedefs.h"
@@ -116,11 +113,8 @@ class DumbProjectileBehavior : public UpdateModule, public ProjectileUpdateInter
 	WeaponBonusConditionFlags		m_extraBonusFlags;
 
 	Bool calcFlightPath(Bool recalcNumSegments);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	void displayFlightPath();	///< Uses little debug icons in worldspace to show the path chosen when it is decided upon
 #endif
 
 };
-
-#endif // _DumbProjectileBehavior_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h
index b877c172cbc..eaf2eef4d50 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DYNAMIC_GEOMETRY_INFO_UPDATE_H_
-#define __DYNAMIC_GEOMETRY_INFO_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Geometry.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -61,7 +58,7 @@ class DynamicGeometryInfoUpdateModuleData : public ModuleData
 	DynamicGeometryInfoUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -102,7 +99,3 @@ class DynamicGeometryInfoUpdate : public UpdateModule
 	Real m_finalMinorRadius;
 
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h
index 6a464074300..aeb8eb9d757 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DYNAMIC_SHROUD_RANGE_UPDATE_H_
-#define __DYNAMIC_SHROUD_RANGE_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameClient/RadiusDecal.h"///< For the pseudo-wireframe decal effect
@@ -127,8 +124,5 @@ class DynamicShroudClearingRangeUpdate : public UpdateModule
 	Real m_currentClearingRange;							///<ToKeepTrackOfWhere We are at
 
 	RadiusDecal m_gridDecal[GRID_FX_DECAL_COUNT];///< For the pseudo-wireframe decal effect
-	
-};
-
-#endif
 
+};
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h
index 656e0d9e250..2472decda5b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __EMPUPDATE_H_
-#define __EMPUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -39,7 +36,7 @@
 class EMPUpdateModuleData : public UpdateModuleData
 {
 public:
-	UnsignedInt m_lifeFrames;	
+	UnsignedInt m_lifeFrames;
 	UnsignedInt m_startFadeFrame;
 	UnsignedInt m_disabledDuration;
 	Real				m_startScale; ///< how big I start drawing
@@ -55,7 +52,7 @@ class EMPUpdateModuleData : public UpdateModuleData
 	{
 		m_lifeFrames = 1;
 		m_startFadeFrame = 0;
-		m_startScale = 1.0f; 
+		m_startScale = 1.0f;
 		m_targetScaleMax = 1.0f;
 		m_targetScaleMin = 1.0f;
 		m_startColor.setFromInt(0xffffffff);
@@ -67,10 +64,10 @@ class EMPUpdateModuleData : public UpdateModuleData
 
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "Lifetime",	INI::parseDurationUnsignedInt,		NULL, offsetof( EMPUpdateModuleData, m_lifeFrames ) },
 			{ "StartFadeTime",	INI::parseDurationUnsignedInt,		NULL, offsetof( EMPUpdateModuleData, m_startFadeFrame ) },
@@ -123,6 +120,3 @@ class EMPUpdate : public UpdateModule
 
 
 };
-
-#endif // __EMPUPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h
index c9539d34d70..0cadd3fbba4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _EjectPilotDie_H_
-#define _EjectPilotDie_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 #include "Common/INI.h"
@@ -68,10 +65,7 @@ class EjectPilotDie : public DieModule
 
 	static void ejectPilot(const ObjectCreationList* ocl, const Object* dyingObject, const Object* damageDealer);
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 	virtual DieModuleInterface* getEjectPilotDieInterface( void ) {return this; }
 
 };
-
-#endif // _EjectPilotDie_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h
index 9c31f5def9a..4d39ec7875f 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __EnemyNearUpdate_H_
-#define __EnemyNearUpdate_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "Common/KindOf.h"
@@ -48,10 +45,10 @@ class EnemyNearUpdateModuleData : public UpdateModuleData
 		m_enemyScanDelayTime = LOGICFRAMES_PER_SECOND;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "ScanDelayTime",		INI::parseDurationUnsignedInt,		NULL, offsetof( EnemyNearUpdateModuleData, m_enemyScanDelayTime ) },
 			{ 0, 0, 0, 0 }
@@ -84,6 +81,3 @@ class EnemyNearUpdate : public UpdateModule
 	void checkForEnemies( void );
 
 };
-
-#endif // end __EnemyNearUpdate_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h
index f25cf0745d7..6456872aaa0 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __EXPERIENCE_SCALAR_UPGRADE_H_
-#define __EXPERIENCE_SCALAR_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -72,7 +69,3 @@ class ExperienceScalarUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-
-#endif // __DEFAULTDIE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h
index e7d637f2336..6e3da938017 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FXListDie_H_
-#define __FXListDie_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "GameLogic/Module/DieModule.h"
@@ -46,7 +43,7 @@ class FXList;
 class FXListDieModuleData : public DieModuleData
 {
 public:
-	const FXList *m_defaultDeathFX;								///< default fx to make 
+	const FXList *m_defaultDeathFX;								///< default fx to make
 	Bool m_orientToObject;
 
 	FXListDieModuleData()
@@ -55,11 +52,11 @@ class FXListDieModuleData : public DieModuleData
 		m_orientToObject = true;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     DieModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "DeathFX",							INI::parseFXList,		NULL, offsetof( FXListDieModuleData, m_defaultDeathFX ) },
 			{ "OrientToObject",				INI::parseBool,		NULL, offsetof( FXListDieModuleData, m_orientToObject ) },
@@ -81,10 +78,6 @@ class FXListDie : public DieModule
 	FXListDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-
-#endif // __FXListDie_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h
index fc5265917f6..90a71879877 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __FIRE_OCL_AFTER_WEAPON_COOLDOWN_UPDATE_H
-#define __FIRE_OCL_AFTER_WEAPON_COOLDOWN_UPDATE_H
-
 class UpgradeMuxData;
 
 #include "GameLogic/Module/UpdateModule.h"
@@ -95,12 +92,9 @@ class FireOCLAfterWeaponCooldownUpdate : public UpdateModule, public UpgradeMux
 	void fireOCL();
 
 private:
-	
+
 	Bool				m_valid;
 	UnsignedInt m_consecutiveShots;
 	UnsignedInt m_startFrame;
 
 };
-
-#endif // __FIRE_OCL_AFTER_WEAPON_COOLDOWN_UPDATE_H
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h
index 0539ce86d1b..3f2c9212863 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FIRE_SPREAD_UPDATE_H_
-#define __FIRE_SPREAD_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -72,10 +69,7 @@ class FireSpreadUpdate : public UpdateModule
 	void startFireSpreading();
 
 protected:
-	
+
 	UnsignedInt calcNextSpreadDelay();
 
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h
index 8b171f4cf0c..0ec32bde612 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FireWeaponCollide_H_
-#define __FireWeaponCollide_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CollideModule.h"
 #include "GameLogic/Weapon.h"
@@ -80,7 +77,3 @@ class FireWeaponCollide : public CollideModule
 	Bool m_everFired;
 
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h
index dff6cc6a0a6..123e2c2e90c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FIRE_WEAPON_UPDATE_H_
-#define __FIRE_WEAPON_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameLogic/Weapon.h"
@@ -67,10 +64,7 @@ class FireWeaponUpdate : public UpdateModule
 protected:
 
 	Bool isOkayToFire();
-	
+
 	Weapon* m_weapon;
 
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h
index 8677d022f88..906e7784d93 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FireWeaponWhenDamagedBehavior_H_
-#define __FireWeaponWhenDamagedBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/UpgradeModule.h"
@@ -45,13 +42,13 @@ class FireWeaponWhenDamagedBehaviorModuleData : public UpdateModuleData
 public:
 	UpgradeMuxData				m_upgradeMuxData;
 	Bool									m_initiallyActive;
-	DamageTypeFlags				m_damageTypes;					
-	Real									m_damageAmount;	
-	const WeaponTemplate* m_reactionWeaponPristine;///< fire these weapons only when damage is received				
-	const WeaponTemplate* m_reactionWeaponDamaged;				
-	const WeaponTemplate* m_reactionWeaponReallyDamaged;	
-	const WeaponTemplate* m_reactionWeaponRubble;					
-	const WeaponTemplate*	m_continuousWeaponPristine;///< fire these weapons continuously, versus just onDamage 
+	DamageTypeFlags				m_damageTypes;
+	Real									m_damageAmount;
+	const WeaponTemplate* m_reactionWeaponPristine;///< fire these weapons only when damage is received
+	const WeaponTemplate* m_reactionWeaponDamaged;
+	const WeaponTemplate* m_reactionWeaponReallyDamaged;
+	const WeaponTemplate* m_reactionWeaponRubble;
+	const WeaponTemplate*	m_continuousWeaponPristine;///< fire these weapons continuously, versus just onDamage
 	const WeaponTemplate*	m_continuousWeaponDamaged;
 	const WeaponTemplate*	m_continuousWeaponReallyDamaged;
 	const WeaponTemplate*	m_continuousWeaponRubble;
@@ -63,18 +60,18 @@ class FireWeaponWhenDamagedBehaviorModuleData : public UpdateModuleData
 		m_reactionWeaponDamaged = NULL;
 		m_reactionWeaponReallyDamaged = NULL;
 		m_reactionWeaponRubble = NULL;
-		m_continuousWeaponPristine = NULL; 
-		m_continuousWeaponDamaged = NULL;	
-		m_continuousWeaponReallyDamaged = NULL;	
-		m_continuousWeaponRubble = NULL;	
+		m_continuousWeaponPristine = NULL;
+		m_continuousWeaponDamaged = NULL;
+		m_continuousWeaponReallyDamaged = NULL;
+		m_continuousWeaponRubble = NULL;
 		m_damageTypes = DAMAGE_TYPE_FLAGS_ALL;
 		m_damageAmount = 0;
 	}
 
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "StartsActive",	INI::parseBool, NULL, offsetof( FireWeaponWhenDamagedBehaviorModuleData, m_initiallyActive ) },
 			{ "ReactionWeaponPristine", INI::parseWeaponTemplate, NULL, offsetof(FireWeaponWhenDamagedBehaviorModuleData,				m_reactionWeaponPristine) },
@@ -102,8 +99,8 @@ class FireWeaponWhenDamagedBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class FireWeaponWhenDamagedBehavior : public UpdateModule, 
-																			public UpgradeMux, 
+class FireWeaponWhenDamagedBehavior : public UpdateModule,
+																			public UpgradeMux,
 																			public DamageModuleInterface
 {
 
@@ -132,8 +129,8 @@ class FireWeaponWhenDamagedBehavior : public UpdateModule,
 
 protected:
 
-	virtual void upgradeImplementation() 
-	{ 
+	virtual void upgradeImplementation()
+	{
 		setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
 	}
 
@@ -152,8 +149,8 @@ class FireWeaponWhenDamagedBehavior : public UpdateModule,
 		return getFireWeaponWhenDamagedBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers;
 	}
 
-	inline Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
-	
+	Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
+
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 private:
@@ -167,6 +164,3 @@ class FireWeaponWhenDamagedBehavior : public UpdateModule,
 	Weapon *m_continuousWeaponRubble;
 
 };
-
-#endif // __FireWeaponWhenDamagedBehavior_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h
index 6e217de9623..a7d6a9bc7c6 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FireWeaponWhenDeadBehavior_H_
-#define __FireWeaponWhenDeadBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -53,9 +50,9 @@ class FireWeaponWhenDeadBehaviorModuleData : public BehaviorModuleData
 		m_deathWeapon = NULL;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "StartsActive",	INI::parseBool, NULL, offsetof( FireWeaponWhenDeadBehaviorModuleData, m_initiallyActive ) },
 			{ "DeathWeapon", INI::parseWeaponTemplate,	NULL, offsetof( FireWeaponWhenDeadBehaviorModuleData, m_deathWeapon ) },
@@ -71,7 +68,7 @@ class FireWeaponWhenDeadBehaviorModuleData : public BehaviorModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class FireWeaponWhenDeadBehavior : public BehaviorModule, 
+class FireWeaponWhenDeadBehavior : public BehaviorModule,
 																	 public UpgradeMux,
 																	 public DieModuleInterface
 {
@@ -116,11 +113,8 @@ class FireWeaponWhenDeadBehavior : public BehaviorModule,
 		return getFireWeaponWhenDeadBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers;
 	}
 
-	inline Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
-	
+	Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
+
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-#endif // __FireWeaponWhenDeadBehavior_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h
index fc8d3ea0ec8..2e368c19504 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FIRESTORM_DYNAMIC_GEOMETRY_INFO_UPDATE_H_
-#define __FIRESTORM_DYNAMIC_GEOMETRY_INFO_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Geometry.h"
 #include "GameLogic/Module/DynamicGeometryInfoUpdate.h"
@@ -84,7 +81,3 @@ class FirestormDynamicGeometryInfoUpdate : public DynamicGeometryInfoUpdate
 	Bool m_scorchPlaced;							///< TRUE once we have placed the scorch mark
 	UnsignedInt m_lastDamageFrame;		///< frame we last did damage on
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
index 4f88c04a0a6..33ee283915b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FLAMMABLE_UPDATE_H_
-#define __FLAMMABLE_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "GameLogic/Module/DamageModule.h"
@@ -45,8 +42,6 @@ enum FlammabilityStatusType CPP_11(: Int)
 	FS_NORMAL = 0,
 	FS_AFLAME,
 	FS_BURNED,
-
-	FS_NORMAL_COUNT	// keep last
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -54,7 +49,7 @@ class FlammableUpdateModuleData : public UpdateModuleData
 {
 public:
 	UnsignedInt		m_burnedDelay;	///< How long before I am ::Burned.  0 means never
-	UnsignedInt		m_aflameDuration; ///< How long I stay ::Aflame.  Independent of Burned.  
+	UnsignedInt		m_aflameDuration; ///< How long I stay ::Aflame.  Independent of Burned.
 	// When aflame wears out is when I check to be normal or burned,  So my model can
 	// change to burned while I am still aflame.
 	UnsignedInt		m_aflameDamageDelay;	///< While ::Aflame, I take damage this often.  If 0, never.
@@ -96,12 +91,12 @@ class FlammableUpdate : public UpdateModule, public DamageModuleInterface
 	//DamageModuleInterface
 	virtual void onDamage( DamageInfo *damageInfo );
 	virtual void onHealing( DamageInfo *damageInfo ) { }
-	virtual void onBodyDamageStateChange( const DamageInfo *damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo *damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState ) { }
 
 protected:
-	
+
 	UpdateSleepTime calcSleepTime();
 	void doAflameDamage();
 	void startBurningSound();
@@ -113,8 +108,6 @@ class FlammableUpdate : public UpdateModule, public DamageModuleInterface
 	UnsignedInt							m_damageEndFrame;
 	AudioHandle							m_audioHandle;
 	Real										m_flameDamageLimit;
+	ObjectID								m_flameSource;
 	UnsignedInt							m_lastFlameDamageDealt;
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h
index c609fbc84e7..0c174ee6025 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FLOATUPDATE_H_
-#define __FLOATUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -70,9 +67,7 @@ class FloatUpdate : public UpdateModule
 
 protected:
 
-	
+
 	Bool m_enabled;			///< enabled
 
 };
-
-#endif  // end __FLOATUPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h
index 8f7ed50876d..b2c9a74d989 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GARRISONCONTAIN_H_
-#define __GARRISONCONTAIN_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 #include "Common/ModelState.h"
@@ -58,11 +55,11 @@ class GarrisonContainModuleData : public OpenContainModuleData
 
 	GarrisonContainModuleData( void );
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     OpenContainModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MobileGarrison", INI::parseBool, NULL, offsetof( GarrisonContainModuleData, m_mobileGarrison ) },
 			{ "HealObjects", INI::parseBool, NULL, offsetof( GarrisonContainModuleData, m_doIHealObjects ) },
@@ -81,7 +78,7 @@ class GarrisonContainModuleData : public OpenContainModuleData
 		const char* name = ini->getNextToken();
 		const char* countStr = ini->getNextTokenOrNull();
 		Int count = countStr ? INI::scanInt(countStr) : 1;
-		
+
 		self->m_initialRoster.templateName.set(name);
 		self->m_initialRoster.count = count;
 	};
@@ -119,8 +116,8 @@ class GarrisonContain : public OpenContain
 	virtual void onRemoving( Object *obj );					///< object no longer contains 'obj'
 
 	// A Garrison Contain must eject all passengers when it crosses the ReallyDamaged threshold.
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState);  ///< Die Interface state change callback
 
 
@@ -142,7 +139,7 @@ class GarrisonContain : public OpenContain
 	virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos );
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim );
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos );
-		
+
 	void updateEffects( void );										///< do any effects needed per frame
 	void loadGarrisonPoints( void );							///< load garrison point position data and save for later
 	void putObjectAtBestGarrisonPoint( Object *obj, Object *target, const Coord3D *targetPos );	///< place object at position of the best garrison point to use for its target
@@ -156,7 +153,7 @@ class GarrisonContain : public OpenContain
 	enum { GARRISON_INDEX_INVALID = -1 };
 	Int findConditionIndex( void );										///< find the condition index to use given the current object body state
 	Int getObjectGarrisonPointIndex( Object *obj );		///< get the garrison point index object is at (if present)
-	Int findClosestFreeGarrisonPointIndex( Int conditionIndex, 
+	Int findClosestFreeGarrisonPointIndex( Int conditionIndex,
 																				 const Coord3D *targetPos );  ///< find closest free garrison point to the target location
 
 	void healObjects( void );	///< heal all the objects within me
@@ -174,7 +171,7 @@ class GarrisonContain : public OpenContain
 	//
 	// ----------------------------------------------------------------------------------------------
 	struct GarrisonPointData
-	{	
+	{
 		union
 		{
 			Object *		object;							///< object at this garrison point
@@ -191,13 +188,13 @@ class GarrisonContain : public OpenContain
 	};
 
 	// ----------------------------------------------------------------------------------------------
-	enum 
+	enum
 	{
 		GARRISON_POINT_PRISTINE,
 		GARRISON_POINT_DAMAGED,
 		GARRISON_POINT_REALLY_DAMAGED,
 
-		MAX_GARRISON_POINT_CONDITIONS				///< leave this last
+		MAX_GARRISON_POINT_CONDITIONS
 	};
 
 	Team *							m_originalTeam;																///< our original team before we were garrisoned
@@ -207,10 +204,7 @@ class GarrisonContain : public OpenContain
 	Coord3D							m_exitRallyPoint;												///< Point to rally at when exiting structure (if possible)
 
 	Bool		m_garrisonPointsInitialized;							///< TRUE once we have loaded the garrison point positions from the art
-	Bool		m_hideGarrisonedStateFromNonallies;								///< if T, don't appear to be garrisoned (all stealthy)										
+	Bool		m_hideGarrisonedStateFromNonallies;								///< if T, don't appear to be garrisoned (all stealthy)
 	Bool		m_rallyValid;															///< TRUE when m_exitRallyPoint is valid
 
 };
-
-#endif // __GARRISONCONTAIN_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h
index 10544713c1e..91b1d681774 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GenerateMinefieldBehavior_H_
-#define __GenerateMinefieldBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -65,7 +62,7 @@ class GenerateMinefieldBehaviorModuleData : public BehaviorModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class GenerateMinefieldBehavior : public BehaviorModule, 
+class GenerateMinefieldBehavior : public BehaviorModule,
 																	public DieModuleInterface,
 																	public UpgradeMux
 {
@@ -113,7 +110,7 @@ class GenerateMinefieldBehavior : public BehaviorModule,
 	Coord3D m_target;
 	Bool m_hasTarget;
 	Bool m_generated;
-	
+
 	const Coord3D* getMinefieldTarget() const;
 	void placeMines();
 	void placeMinesInFootprint(const GeometryInfo& geom, const ThingTemplate* mineTemplate);
@@ -122,6 +119,3 @@ class GenerateMinefieldBehavior : public BehaviorModule,
 	void placeMinesAroundRect(const Coord3D& pos, Real majorRadius, Real minorRadius, const ThingTemplate* mineTemplate);
 	Object* placeMineAt(const Coord3D& pt, const ThingTemplate* mineTemplate, Team* team, const Object* producer);
 };
-
-#endif // __GenerateMinefieldBehavior_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h
index 0c6ab86a8e2..c6731172eda 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GRANTUPGRADECREATE_H_
-#define __GRANTUPGRADECREATE_H_
-
 #define DEFINE_OBJECT_STATUS_NAMES
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
@@ -77,6 +74,3 @@ class GrantUpgradeCreate : public CreateModule
 protected:
 
 };
-
-#endif // __GRANTUPGRADECREATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h
index 6fc04c60960..8599b393c50 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __HACK_INTERNET_AI_UPDATE_H
-#define __HACK_INTERNET_AI_UPDATE_H
-
 #include "Common/StateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -45,14 +42,11 @@ class HackInternetStateMachine : public AIStateMachine
 //-------------------------------------------------------------------------------------------------
 class HackInternetState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HackInternetState, "HackInternetState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HackInternetState, "HackInternetState")
 public:
 	HackInternetState( StateMachine *machine ) :State( machine, "HackInternetState" )
 	{
-		//Added By Sadullah Nader
-		//Initializations missing and needed
 		m_framesRemaining = 0;
-		//
 	}
 	virtual StateReturnType update();
 	virtual StateReturnType onEnter();
@@ -72,14 +66,11 @@ EMPTY_DTOR(HackInternetState)
 //-------------------------------------------------------------------------------------------------
 class PackingState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PackingState, "PackingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PackingState, "PackingState")
 public:
 	PackingState( StateMachine *machine ) : State( machine, "PackingState" )
 	{
-		//Added By Sadullah Nader
-		//Initializations inserted
 		m_framesRemaining = 0;
-		//
 	}
 	virtual StateReturnType update();
 	virtual StateReturnType onEnter();
@@ -98,7 +89,7 @@ EMPTY_DTOR(PackingState)
 //-------------------------------------------------------------------------------------------------
 class UnpackingState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(UnpackingState, "UnpackingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(UnpackingState, "UnpackingState")
 public:
 	UnpackingState( StateMachine *machine ) :State( machine, "UnpackingState" )
 	{
@@ -132,7 +123,7 @@ class HackInternetAIUpdateModuleData : public AIUpdateModuleData
 {
 public:
 	UnsignedInt		m_unpackTime;
-	UnsignedInt		m_packTime;				
+	UnsignedInt		m_packTime;
 	UnsignedInt		m_cashUpdateDelay;
 	UnsignedInt		m_regularCashAmount;
 	UnsignedInt		m_veteranCashAmount;
@@ -154,11 +145,11 @@ class HackInternetAIUpdateModuleData : public AIUpdateModuleData
 		m_packUnpackVariationFactor = 0.0f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     AIUpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UnpackTime",					INI::parseDurationUnsignedInt,	NULL, offsetof( HackInternetAIUpdateModuleData, m_unpackTime ) },
 			{ "PackTime",						INI::parseDurationUnsignedInt,	NULL, offsetof( HackInternetAIUpdateModuleData, m_packTime ) },
@@ -221,10 +212,7 @@ class HackInternetAIUpdate : public AIUpdateInterface, public HackInternetAIInte
 protected:
 
 	virtual AIStateMachine* makeStateMachine();
-	
+
 	AICommandParmsStorage		m_pendingCommand;
-	Bool m_hasPendingCommand;	
+	Bool m_hasPendingCommand;
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h
index 6dde10ba796..def1c32bdf0 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __HEALCONTAIN_H_
-#define __HEALCONTAIN_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 
@@ -58,7 +55,7 @@ class HealContain : public OpenContain
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( HealContain, "HealContain" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( HealContain, HealContainModuleData )
-	
+
 public:
 
 	HealContain( Thing *thing, const ModuleData* moduleData );
@@ -66,11 +63,10 @@ class HealContain : public OpenContain
 
 	virtual UpdateSleepTime update();												///< called once per frame
 	virtual Bool isHealContain() const { return true; } ///< true when container only contains units while healing (not a transport!)
+	virtual Bool isTunnelContain() const { return FALSE; }
 
 protected:
 
 	Bool doHeal( Object *obj, UnsignedInt framesForFullHeal );		///< do the heal on an object
 
 };
-
-#endif  // end __HEALCONTAIN_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h
index 500eb1f471d..8768958c1a0 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef HEAL_CRATE_COLLIDE_H_
-#define HEAL_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -56,5 +53,3 @@ class HealCrateCollide : public CrateCollide
 	/// This is the game logic execution function that all real CrateCollides will implement
 	virtual Bool executeCrateBehavior( Object *other );
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h
index 024ae3e3daf..85892be371b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __HEIGHTDIEUPDATE_H_
-#define __HEIGHTDIEUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -71,7 +68,7 @@ class HeightDieUpdate : public UpdateModule
 	virtual UpdateSleepTime update();
 
 protected:
-	
+
 
 	Bool m_hasDied;							///< TRUE once we have triggered death
 	Bool m_particlesDestroyed;	///< TRUE once we destroy attached systems (so we do it only once)
@@ -79,5 +76,3 @@ class HeightDieUpdate : public UpdateModule
 	UnsignedInt m_earliestDeathFrame; ///< Earliest we are allowed to think about dying
 
 };
-
-#endif  // end __HEIGHTDIEUPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h
index c9c47d718ea..2fe350c6b68 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __HelicopterSlowDeathBehavior_H_
-#define __HelicopterSlowDeathBehavior_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "GameLogic/Module/SlowDeathBehavior.h"
@@ -113,5 +110,3 @@ class HelicopterSlowDeathBehavior : public SlowDeathBehavior
 	AudioEventRTS m_deathSound;						///< Sound played during death sequence.
 
 };
-
-#endif  // end __HelicopterSlowDeathBehavior_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h
index b2521710308..bb721a431e9 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __HIGHLANDER_BODY_H
-#define __HIGHLANDER_BODY_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ActiveBody.h"
 
@@ -57,6 +54,3 @@ class HighlanderBody : public ActiveBody
 protected:
 
 };
-
-#endif 
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h
index 7f0a9a7db18..374e0e3c426 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h
@@ -27,15 +27,12 @@
 //
 // FILE: HijackerUpdate.h /////////////////////////////////////////////////////////////////////////
 // Author: Mark Lorenzen, July 2002
-// Desc:   Allows hijacker to keep with his hijacked vehicle (though hidden) until it dies, then 
+// Desc:   Allows hijacker to keep with his hijacked vehicle (though hidden) until it dies, then
 // to become a hijacker once more
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
- 
-#ifndef __HIJACKER_UPDATE_H
-#define __HIJACKER_UPDATE_H
 
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -48,10 +45,10 @@ class HijackerUpdateModuleData : public UpdateModuleData
 
 	//StickBombUpdateModuleData();
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "AttachToTargetBone",	INI::parseAsciiString,		NULL, offsetof( HijackerUpdateModuleData, m_attachToBone ) },
 			{ "ParachuteName",	INI::parseAsciiString,		NULL, offsetof( HijackerUpdateModuleData, m_parachuteName ) },
@@ -77,8 +74,8 @@ class HijackerUpdate : public UpdateModule
 
 	void setTargetObject( const Object *object );
 	Object* getTargetObject() const;
-	void setUpdate(Bool u ) {m_update = u;} 
-	void setIsInVehicle(Bool i ) {m_isInVehicle = i;} 
+	void setUpdate(Bool u ) {m_update = u;}
+	void setIsInVehicle(Bool i ) {m_isInVehicle = i;}
 
 private:
 
@@ -88,10 +85,7 @@ class HijackerUpdate : public UpdateModule
 	Bool		 m_isInVehicle;
 	Bool		 m_wasTargetAirborne;
 
-//	DieModuleInterface *m_ejectPilotDMI; // point to ejectpilotdiemodule 
+//	DieModuleInterface *m_ejectPilotDMI; // point to ejectpilotdiemodule
 																			 // of target vehicle if it has one
 
 };
-
-#endif // __HIJACKER_UPDATE_H
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h
index 8621c4e3359..2c73c868f0a 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h
@@ -31,9 +31,6 @@
 
 #pragma once
 
-#ifndef __HIVE_STRUCTURE_BODY_H
-#define __HIVE_STRUCTURE_BODY_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/StructureBody.h"
 #include "GameLogic/Damage.h"
@@ -49,10 +46,10 @@ class HiveStructureBodyModuleData : public StructureBodyModuleData
 
 	HiveStructureBodyModuleData();
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     StructureBodyModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "PropagateDamageTypesToSlavesWhenExisting",   INI::parseDamageTypeFlags, NULL, offsetof( HiveStructureBodyModuleData, m_damageTypesToPropagateToSlaves ) },
 			{ "SwallowDamageTypesIfSlavesNotExisting",			INI::parseDamageTypeFlags, NULL, offsetof( HiveStructureBodyModuleData, m_damageTypesToSwallow ) },
@@ -81,6 +78,3 @@ class HiveStructureBody : public StructureBody
 
 	virtual void attemptDamage( DamageInfo *damageInfo );		///< try to damage this object
 };
-
-#endif // __HIVE_STRUCTURE_BODY_H
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h
index 0e29c39d93d..65a46608520 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __HordeUpdate_H_
-#define __HordeUpdate_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "Common/KindOf.h"
@@ -44,19 +41,41 @@ class UpgradeTemplate;
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 
+// TheSuperHackers @bugfix xezon 15/09/2025 Adds a new horde action to select a fixed implementation.
+//
+// TheSuperHackers @todo If we want more control over the horde setup, then we need to implement
+// filters for separate weapon bonuses and required upgrades. But adding more behavior modules will
+// be a performance concern. Example INI setup:
+//
+// Behavior = HordeUpdate ModuleTag
+//   Action = NATIONALISM
+//   ;ApplyWeaponBonus = NATIONALISM
+//   UpgradeRequired = Upgrade_Nationalism
+// End
+//
 enum HordeActionType CPP_11(: Int)
 {
-	HORDEACTION_HORDE = 0,
+	HORDEACTION_HORDE, ///< Classic action, applies the Horde bonus correctly, but Nationalism and Fanaticism bonuses are not removed after leaving horde.
+	HORDEACTION_HORDE_FIXED, ///< Applies the Horde, Nationalism and Fanaticism bonuses correctly.
+
+	HORDEACTION_COUNT,
 
-	HORDEACTION_COUNT
+#if RETAIL_COMPATIBLE_CRC
+	HORDEACTION_DEFAULT = HORDEACTION_HORDE,
+#else
+	HORDEACTION_DEFAULT = HORDEACTION_HORDE_FIXED, ///< Does not change unmodified retail game behavior, because all its horde update modules explicitly set Action = HORDE.
+#endif
 };
 
 #ifdef DEFINE_HORDEACTION_NAMES
-static const char *TheHordeActionTypeNames[] =
+static const char *const TheHordeActionTypeNames[] =
 {
 	"HORDE",
+	"HORDE_FIXED",
+
 	NULL
 };
+static_assert(ARRAY_SIZE(TheHordeActionTypeNames) == HORDEACTION_COUNT + 1, "Incorrect array size");
 #endif
 
 //-------------------------------------------------------------------------------------------------
@@ -64,19 +83,20 @@ class HordeUpdateModuleData : public ModuleData
 {
 public:
   UnsignedInt								m_updateRate;   ///< how often to recheck our horde status
-	KindOfMaskType						m_kindof;				///< the kind(s) of units that count towards horde-ness
+	KindOfMaskType						m_kindof;				///< the kind(s) of units that count towards hordeness
 	Int												m_minCount;		  ///< min count to get "horde" status
-  Real											m_minDist;      ///< min dist to contribute to horde-ness
+  Real											m_minDist;      ///< min dist to contribute to hordeness
 	Bool											m_alliesOnly;		///< if true, only allied units count towards hordeness
 	Bool											m_exactMatch;		///< if true, only exact same type of units count towards hordeness
 	Real											m_rubOffRadius;///< If I am this close to another guy who is a true hordesman, it'll rub off on me
-	HordeActionType						m_action;				///< what to do if we get horde-ness
-	std::vector<AsciiString>	m_flagSubObjNames;		///< name(s) of the flag subobj
+	HordeActionType						m_action;				///< what to do if we get hordeness
+	Bool											m_allowedNationalism; ///< Nationalism is hard coded.  Yeah!  Add to the goodness with this flag instead of rewriting after Alpha.
+	std::vector<AsciiString>	m_flagSubObjNames;		///< name(s) of the flag sub obj
 
 	HordeUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -86,8 +106,9 @@ class HordeUpdateInterface
 public:
 	virtual Bool isInHorde() const = 0;
 	virtual Bool hasFlag() const = 0;
-	virtual Bool isTrueHordeMember() const = 0; 
-
+	virtual Bool isTrueHordeMember() const = 0;
+	virtual Bool isAllowedNationalism() const = 0;
+	virtual HordeActionType getHordeActionType() const = 0;
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -104,10 +125,13 @@ class HordeUpdate : public UpdateModule, public HordeUpdateInterface
 	HordeUpdateInterface *getHordeUpdateInterface() { return this; }
 
 	virtual void onDrawableBoundToObject();
+	virtual UpdateSleepTime update();	///< update this object's AI
+
 	virtual Bool isInHorde() const { return m_inHorde; }
-	virtual Bool isTrueHordeMember() const { return m_trueHordeMember && m_inHorde; } 
 	virtual Bool hasFlag() const { return m_hasFlag; }
-	virtual UpdateSleepTime update();	///< update this object's AI
+	virtual Bool isTrueHordeMember() const { return m_trueHordeMember && m_inHorde; }
+	virtual Bool isAllowedNationalism() const;
+	virtual HordeActionType getHordeActionType() const { return getHordeUpdateModuleData()->m_action; };
 
 protected:
 
@@ -116,11 +140,8 @@ class HordeUpdate : public UpdateModule, public HordeUpdateInterface
 
 private:
 	UnsignedInt m_lastHordeRefreshFrame; //Just like it sounds
-	Bool				m_inHorde;				 //I amy be a trueMember, or I may merely inherit hordehood from a neighbor who is
-	Bool				m_trueHordeMember; //meaning, I have enough hordesman near me to qualify
+	Bool				m_inHorde;				 //I may be a true member, or I may merely inherit hordehood from a neighbor who is
+	Bool				m_trueHordeMember; //meaning, I have enough hordesmen near me to qualify
 	Bool				m_hasFlag;
 
 };
-
-#endif // __HordeUpdate_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h
index 0179b29a1db..c430234a5d2 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __IMMORTAL_BODY_H
-#define __IMMORTAL_BODY_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ActiveBody.h"
 
@@ -57,6 +54,3 @@ class ImmortalBody : public ActiveBody
 protected:
 
 };
-
-#endif // __STRUCTUREBODY_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h
index 7e7c348d722..bc1708bbf33 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __INACTIVEBODY_H_
-#define __INACTIVEBODY_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BodyModule.h"
 
@@ -56,9 +53,9 @@ class InactiveBody : public BodyModule
 	virtual Real getHealth() const;													///< get current health
 	virtual BodyDamageType getDamageState() const;
 	virtual void setDamageState( BodyDamageType newState );	///< control damage state directly.  Will adjust hitpoints.
-	virtual void setAflame( Bool setting ){}///< This is a major change like a damage state.  
+	virtual void setAflame( Bool setting ){}///< This is a major change like a damage state.
 
-	void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel ) { /* nothing */ }
+	void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback ) { /* nothing */ }
 
 	virtual void setArmorSetFlag(ArmorSetType ast) { /* nothing */ }
 	virtual void clearArmorSetFlag(ArmorSetType ast) { /* nothing */ }
@@ -68,6 +65,3 @@ class InactiveBody : public BodyModule
 private:
 	Bool m_dieCalled;
 };
-
-#endif // __INACTIVEBODY_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h
index e82b2f547e7..1eb543cc56c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __InstantDeathBehavior_H_
-#define __InstantDeathBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 
@@ -76,6 +73,3 @@ class InstantDeathBehavior : public DieModule
 	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-#endif // __InstantDeathBehavior_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h
index 05dd1894420..cc6f8c4e722 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h
@@ -24,22 +24,14 @@
 
 // JetAIUpdate.h //////////
 // Author: Steven Johnson, June 2002
- 
-#pragma once
 
-#ifndef _JET_AI_UPDATE_H_
-#define _JET_AI_UPDATE_H_
+#pragma once
 
 #include "Common/STLTypedefs.h"
 #include "Common/GameMemory.h"
 #include "GameLogic/AIStateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -66,9 +58,9 @@ class JetAIUpdateModuleData : public AIUpdateModuleData
 	UnsignedInt							m_lockonTime;											///< time it takes for someone to lock-on to us.
 	AsciiString							m_lockonCursor;										///< template used for lockon.
 	Real										m_lockonInitialDist;							///< how far away the lockon cursor starts.
-	Real										m_lockonFreq;											
+	Real										m_lockonFreq;
 	Real										m_lockonAngleSpin;								///< how many times to spin around it
-	Real										m_lockonBlinky;								
+	Real										m_lockonBlinky;
 	UnsignedInt							m_returnToBaseIdleTime;						///< if we're idle for this long, return to base
 
 	JetAIUpdateModuleData();
@@ -137,7 +129,7 @@ class JetAIUpdate : public AIUpdateInterface
 
 	void pruneDeadTargeters();
 	void positionLockon();
-	
+
 	virtual Bool getTreatAsAircraftForLocoDistToGoal() const;
 	Bool isParkedAt(const Object* obj) const;
 
@@ -172,9 +164,6 @@ class JetAIUpdate : public AIUpdateInterface
 	void getProducerLocation();
 	void buildLockonDrawableIfNecessary();
 	void doLandingCommand(Object *airfield, CommandSourceType cmdSource);
-	inline Bool getFlag(FlagType f) const { return (m_flags & (1<<f)) != 0; }
-	inline void setFlag(FlagType f, Bool v) { if (v) m_flags |= (1<<f); else m_flags &= ~(1<<f); }
+	Bool getFlag(FlagType f) const { return (m_flags & (1<<f)) != 0; }
+	void setFlag(FlagType f, Bool v) { if (v) m_flags |= (1<<f); else m_flags &= ~(1<<f); }
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h
index 65306d4fa2e..f668cdb007e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __JET_SLOW_DEATH_BEHAVIOR_H_
-#define __JET_SLOW_DEATH_BEHAVIOR_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "GameLogic/Module/BehaviorModule.h"
@@ -63,7 +60,7 @@ class JetSlowDeathBehaviorModuleData : public SlowDeathBehaviorModuleData
 
 	const FXList *m_fxHitGround;									///< FXList for hit ground
 	const ObjectCreationList *m_oclHitGround;			///< OCL for hit ground
-	
+
 	UnsignedInt m_delayFinalBlowUpFromHitGround;	///< delay (in frames) from hit ground, to final explosion
 	const FXList *m_fxFinalBlowUp;								///< FxList for final blow up
 	const ObjectCreationList *m_oclFinalBlowUp;		///< OCL for final blow up
@@ -105,6 +102,3 @@ class JetSlowDeathBehavior : public SlowDeathBehavior
 	AudioEventRTS m_deathLoopSound;					///< death loop sound
 
 };
-
-
-#endif  // end __JET_SLOW_DEATH_BEHAVIOR_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h
index 8d3a97e14e3..e3d9361139b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h
@@ -32,9 +32,6 @@
 
 #pragma once
 
-#ifndef __KEEP_OBJECT_DIE_H_
-#define __KEEP_OBJECT_DIE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 #include "Common/INI.h"
@@ -53,9 +50,6 @@ class KeepObjectDie : public DieModule
 	KeepObjectDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-#endif // __KEEP_OBJECT_DIE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
index 351e5ce54e5..bedd3b2b556 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __LASER_UPDATE_H
-#define __LASER_UPDATE_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ClientUpdateModule.h"
 
@@ -55,7 +52,7 @@ class LaserUpdateModuleData : public ClientUpdateModuleData
 	LaserUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -105,7 +102,7 @@ class LaserUpdate : public ClientUpdateModule
 
 	const Coord3D* getStartPos() const { return &m_startPos; }
 	const Coord3D* getEndPos() const { return &m_endPos; }
- 
+
 	Real getTemplateLaserRadius() const;
 	Real getCurrentLaserRadius() const;
 
@@ -125,7 +122,3 @@ class LaserUpdate : public ClientUpdateModule
 
 	LaserRadiusUpdate m_laserRadius;
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h
index ee29a248392..67e3f81b685 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __LIFETIMEUPDATE_H_
-#define __LIFETIMEUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -48,10 +45,10 @@ class LifetimeUpdateModuleData : public UpdateModuleData
 		m_maxFrames = 0.0f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MinLifetime",					INI::parseDurationUnsignedInt,		NULL, offsetof( LifetimeUpdateModuleData, m_minFrames ) },
 			{ "MaxLifetime",					INI::parseDurationUnsignedInt,		NULL, offsetof( LifetimeUpdateModuleData, m_maxFrames ) },
@@ -85,6 +82,3 @@ class LifetimeUpdate : public UpdateModule
 
 	UnsignedInt m_dieFrame;
 };
-
-#endif // __LIFETIMEUPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h
index a6d1ee6cf75..e6c68e7af96 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h
@@ -24,14 +24,11 @@
 
 // FILE: LocomotorSetUpgrade.h /////////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, Aug 2002
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __LocomotorSetUpgrade_H_
-#define __LocomotorSetUpgrade_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -57,7 +54,3 @@ class LocomotorSetUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-
-#endif // __LocomotorSetUpgrade_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h
index 9c6a0ea9530..133cd880364 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __MAX_HEALTH_UPGRADE_H_
-#define __MAX_HEALTH_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -74,7 +71,3 @@ class MaxHealthUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-
-#endif // __DEFAULTDIE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h
index a330f36c15e..d0ad4e355f2 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __MinefieldBEHAVIOR_H_
-#define __MinefieldBEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/CollideModule.h"
@@ -52,7 +49,7 @@ class MinefieldBehaviorModuleData : public UpdateModuleData
 
 	const WeaponTemplate*	m_detonationWeapon;								///< what happens when we detonate
 	Int										m_detonatedBy;										///< can we be triggered by allies, etc?
-	Bool									m_stopsRegenAfterCreatorDies;	
+	Bool									m_stopsRegenAfterCreatorDies;
 	Bool									m_regenerates;										///< if t, can't be killed normally
 	Bool									m_workersDetonate;								///< if f, workers don't detonate mines
 	UnsignedInt						m_creatorDeathCheckRate;					///< if above is true, how often to check
@@ -65,7 +62,7 @@ class MinefieldBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class MinefieldBehavior : public UpdateModule, 
+class MinefieldBehavior : public UpdateModule,
 													public CollideModuleInterface,
 													public DamageModuleInterface,
 													public DieModuleInterface,
@@ -142,5 +139,3 @@ class MinefieldBehavior : public UpdateModule,
 	UpdateSleepTime calcSleepTime();
 
 };
-
-#endif  // end __MinefieldBEHAVIOR_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h
index 9d2afe47e7f..4712f41e5aa 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _MISSILE_AI_UPDATE_H_
-#define _MISSILE_AI_UPDATE_H_
-
 #include "Common/GameType.h"
 #include "Common/GlobalData.h"
 #include "GameLogic/Module/AIUpdate.h"
@@ -49,7 +46,7 @@ class MissileAIUpdateModuleData : public AIUpdateModuleData
 	Bool						m_tryToFollowTarget;	///< if true, attack object, not pos
 	UnsignedInt			m_fuelLifetime;				///< num frames till missile runs out of motive power (0 == inf)
 	UnsignedInt			m_ignitionDelay;			///< delay in frames from when missile is 'fired', to when it starts moving		15
-	Real						m_initialVel;			
+	Real						m_initialVel;
 	Real						m_initialDist;
 	Real						m_diveDistance;				///< If I get this close to my target, start ignoring my preferred height
 	const FXList*		m_ignitionFX;					///< FXList to do when missile 'ignites'
@@ -139,6 +136,3 @@ class MissileAIUpdate : public AIUpdateInterface, public ProjectileUpdateInterfa
 
 
 };
-
-#endif // _MISSILE_AI_UPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h
index e78eb1b2a77..3e8466d67b4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _MissileLauncherBuildingUpdate_H_
-#define _MissileLauncherBuildingUpdate_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/INI.h"
@@ -67,11 +64,11 @@ class MissileLauncherBuildingUpdateModuleData : public UpdateModuleData
 		m_openingFX = m_openFX = m_waitingToCloseFX = m_closingFX = m_closedFX = NULL;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "SpecialPowerTemplate",	INI::parseSpecialPowerTemplate,					NULL, offsetof( MissileLauncherBuildingUpdateModuleData, m_specialPowerTemplate ) },
 			{ "DoorOpenTime",					INI::parseDurationUnsignedInt,	NULL, offsetof( MissileLauncherBuildingUpdateModuleData, m_doorOpenTime ) },
@@ -126,7 +123,7 @@ class MissileLauncherBuildingUpdate : public UpdateModule, public SpecialPowerUp
 		DOOR_WAITING_TO_CLOSE,
 		DOOR_CLOSING,
 	};
-	
+
 	void switchToState(DoorStateType dst);
 
 	const SpecialPowerModuleInterface*	m_specialPowerModule;
@@ -135,5 +132,3 @@ class MissileLauncherBuildingUpdate : public UpdateModule, public SpecialPowerUp
 	UnsignedInt													m_timeoutFrame;
 	AudioEventRTS												m_openIdleAudio;
 };
-
-#endif // _MissileLauncherBuildingUpdate_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h
index 213af0324be..4f8e639bc28 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h
@@ -25,11 +25,8 @@
 // MobMemberSlavedUpdate.h /////////////////////////////////////////////////////////////
 // Will obey to spawner... or die trying... used by angry mob members
 // Author: Mark Lorenzen, August 2002
- 
-#pragma once
 
-#ifndef _MOBMEMBER_SLAVED_UPDATE_H_
-#define _MOBMEMBER_SLAVED_UPDATE_H_
+#pragma once
 
 #define MM_SLAVED_UPDATE_RATE (LOGICFRAMES_PER_SECOND / 8) ///< This is a low priority module that only needs to be called every this many frames
 #define MIN_SQUIRRELLINESS (0.01f)
@@ -52,7 +49,7 @@ class MobMemberSlavedUpdateModuleData : public UpdateModuleData
 	//Example: Currently used by scout drones owned by rangers AND stinger soldiers owned by stinger sites.
 	Int m_mustCatchUpRadius;		//Distance from master I'm allowed when he's idle. If I go too far away, I'll come back.
 	Int m_noNeedToCatchUpRadius;	//Allowable wander distance from master while guarding master.
-	Real m_squirrellinessRatio; 
+	Real m_squirrellinessRatio;
 	UnsignedInt m_catchUpCrisisBailTime; //after this many consecutive frames outside the catchup radius, I will teleport to the nexus
 
 	MobMemberSlavedUpdateModuleData()
@@ -63,10 +60,10 @@ class MobMemberSlavedUpdateModuleData : public UpdateModuleData
 		m_catchUpCrisisBailTime = 999999;//default to very large number
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MustCatchUpRadius",			INI::parseInt,	NULL, offsetof( MobMemberSlavedUpdateModuleData, m_mustCatchUpRadius ) },
 			{ "CatchUpCrisisBailTime",			INI::parseUnsignedInt,	NULL, offsetof( MobMemberSlavedUpdateModuleData, m_catchUpCrisisBailTime ) },
@@ -131,7 +128,5 @@ class MobMemberSlavedUpdate : public UpdateModule, public SlavedUpdateInterface
 	UnsignedInt m_catchUpCrisisTimer;// how many consecutive frames have I remained outside the catchup radius
 	//This is a failsafe to make sure that an individual mobmember does not get isolated from his buddies
 	// thus causing the mob to become invincible, since they will continue to bud around the nexus
-	
-};
-#endif //_MOBMEMBER_AI_UPDATE_H_
 
+};
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h
index e6fbf28f8dd..f365c425206 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __MOBNEXUSCONTAIN_H_
-#define __MOBNEXUSCONTAIN_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 
@@ -62,7 +59,7 @@ class MobNexusContainModuleData : public OpenContainModuleData
 };
 
 //-------------------------------------------------------------------------------------------------
-class MobNexusContain : public OpenContain, 
+class MobNexusContain : public OpenContain,
 												public TransportPassengerInterface // lorenzen add a MobMemberInterface
 {
 
@@ -99,10 +96,7 @@ class MobNexusContain : public OpenContain,
 protected:
 
 private:
-	
+
 	Int m_extraSlotsInUse;
 
 };
-
-#endif // __MOBNEXUSCONTAIN_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h
index b13b8e70444..12a474cb61f 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef MONEY_CRATE_COLLIDE_H_
-#define MONEY_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -50,11 +47,11 @@ class MoneyCrateCollideModuleData : public CrateCollideModuleData
 		m_moneyProvided = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MoneyProvided",	INI::parseUnsignedInt,	NULL, offsetof( MoneyCrateCollideModuleData, m_moneyProvided ) },
 			{ 0, 0, 0, 0 }
@@ -81,5 +78,3 @@ class MoneyCrateCollide : public CrateCollide
 	/// This is the game logic execution function that all real CrateCollides will implement
 	virtual Bool executeCrateBehavior( Object *other );
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h
index 3ed2de7191d..e398d2cf807 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __NEUTRONMISSILESlowDeathBehavior_H_
-#define __NEUTRONMISSILESlowDeathBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/SlowDeathBehavior.h"
 
@@ -40,7 +37,7 @@ class FXList;
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 enum NeutronBlast CPP_11(: Int)
-{ 
+{
 	NEUTRON_BLAST_1 = 0,
 	NEUTRON_BLAST_2,
 	NEUTRON_BLAST_3,
@@ -51,7 +48,7 @@ enum NeutronBlast CPP_11(: Int)
 	NEUTRON_BLAST_8,
 	NEUTRON_BLAST_9,
 
-	MAX_NEUTRON_BLASTS  // keep this last
+	MAX_NEUTRON_BLASTS
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -60,7 +57,7 @@ struct BlastInfo
 {
   Bool enabled;					///< this blast is enabled
 	Real delay;						///< delay after death to start the regular blast
-	Real scorchDelay;			///< delay after death to start a scorch blast 
+	Real scorchDelay;			///< delay after death to start a scorch blast
 	Real innerRadius;			///< inner radius of damage
 	Real outerRadius;			///< outer radius of damage
 	Real maxDamage;				///< max amount
@@ -112,5 +109,3 @@ class NeutronMissileSlowDeathBehavior : public SlowDeathBehavior
 	Bool m_scorchPlaced;														///< TRUE once we've placed the scorch mark
 
 };
-
-#endif  // end __NEUTRONMISSILESlowDeathBehavior_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h
index 1eaab4ba537..87b275cdde4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _MISSILE_UPDATE_H_
-#define _MISSILE_UPDATE_H_
-
 #include "GameClient/RadiusDecal.h"
 #include "Common/GameType.h"
 #include "Common/GlobalData.h"
@@ -47,7 +44,7 @@ class NeutronMissileUpdateModuleData : public UpdateModuleData
 {
 public:
 	Real					m_initialDist;
-	Real					m_maxTurnRate;		
+	Real					m_maxTurnRate;
 	Real					m_forwardDamping;
 	Real					m_relativeSpeed;
 	Real					m_targetFromDirectlyAbove;	///< aim first for dest+offset, then dest
@@ -70,7 +67,7 @@ class NeutronMissileUpdateModuleData : public UpdateModuleData
 /**
  * This module encapsulates missile behavior.
  */
-class NeutronMissileUpdate : public UpdateModule, 
+class NeutronMissileUpdate : public UpdateModule,
 	public DieModuleInterface,
 	public ProjectileUpdateInterface
 {
@@ -122,7 +119,7 @@ class NeutronMissileUpdate : public UpdateModule,
 	Coord3D m_vel;
 
 	UnsignedInt m_stateTimestamp;				///< time of state change
-	Bool m_isLaunched;							
+	Bool m_isLaunched;
 	Bool m_isArmed;											///< if true, missile will explode on contact
 	Real m_noTurnDistLeft;				///< when zero, ok to start turning
 	Bool m_reachedIntermediatePos;
@@ -138,6 +135,3 @@ class NeutronMissileUpdate : public UpdateModule,
 
 
 };
-
-#endif // _MISSILE_UPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h
index ba2cc52b123..d6b0d0d305e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OCLSPECIALPOWER_H_
-#define __OCLSPECIALPOWER_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/SpecialPowerModule.h"
 #include "Common/Science.h"
@@ -47,6 +44,8 @@ enum OCLCreateLocType CPP_11(: Int)
 	USE_OWNER_OBJECT,
 	CREATE_ABOVE_LOCATION,
 	CREATE_AT_EDGE_FARTHEST_FROM_TARGET,
+
+	OCL_CREATE_LOC_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -96,5 +95,3 @@ class OCLSpecialPower : public SpecialPowerModule
 
 	const ObjectCreationList* findOCL() const;
 };
-
-#endif  // end __OCLSPECIALPOWER_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h
index d0d5482c4d2..c54e8186d21 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OCL_UPDATE_H_
-#define __OCL_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -73,7 +70,7 @@ class OCLUpdate : public UpdateModule
 	UnsignedInt getRemainingFrames() const; ///< For feedback display
 
 protected:
-	
+
 	UnsignedInt m_nextCreationFrame;
 	UnsignedInt m_timerStartedFrame;
 
@@ -81,6 +78,3 @@ class OCLUpdate : public UpdateModule
 	void setNextCreationFrame();
 
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h
index 662b0bc8e04..739fa491639 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OBJECTCREATIONUPGRADE_H_
-#define __OBJECTCREATIONUPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -77,6 +74,3 @@ class ObjectCreationUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-#endif // __OBJECTCREATIONUPGRADE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h
index f9df61a62c1..27a8ea53fe4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OBJECT_DEFECTION_HELPER_H_
-#define __OBJECT_DEFECTION_HELPER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ObjectHelper.h"
 
@@ -51,7 +48,7 @@ class ObjectDefectionHelper : public ObjectHelper
 {
 
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( ObjectDefectionHelper, ObjectDefectionHelperModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectDefectionHelper, "ObjectDefectionHelperPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectDefectionHelper, "ObjectDefectionHelperPool" )
 
 private:
 
@@ -62,15 +59,12 @@ class ObjectDefectionHelper : public ObjectHelper
 
 public:
 
-	ObjectDefectionHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) 
+	ObjectDefectionHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData )
 	{
-		//Added By Sadullah Nader
-		//Initializations inserted
 		m_defectionDetectionEnd = 0;
 		m_defectionDetectionFlashPhase = FALSE;
 		m_defectionDetectionStart = 0;
 		m_doDefectorFX = FALSE;
-		//
 	}
 	// virtual destructor prototype provided by memory pool object
 
@@ -83,6 +77,3 @@ class ObjectDefectionHelper : public ObjectHelper
 	void startDefectionTimer(UnsignedInt numFrames, Bool withDefectorFX = TRUE);
 
 };
-
-
-#endif  // end __OBJECT_DEFECTION_HELPER_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h
index 4c4bd488daa..c36df7483d4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OBJECT_HELPER_H_
-#define __OBJECT_HELPER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -51,9 +48,9 @@ class ObjectHelper : public UpdateModule
 
 public:
 
-	ObjectHelper( Thing *thing, const ModuleData *modData ) : 
-		UpdateModule( thing, modData ) 
-	{ 
+	ObjectHelper( Thing *thing, const ModuleData *modData ) :
+		UpdateModule( thing, modData )
+	{
 		setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 	}
 
@@ -64,5 +61,3 @@ class ObjectHelper : public UpdateModule
 	void sleepUntil(UnsignedInt when);
 
 };
-
-#endif  // end __OBJECT_HELPER_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h
index e4bc2eddadd..4cf6117fcb7 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ObjectRepulsorHelper_H_
-#define __ObjectRepulsorHelper_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ObjectHelper.h"
 
@@ -48,7 +45,7 @@ class ObjectRepulsorHelper : public ObjectHelper
 {
 
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( ObjectRepulsorHelper, ObjectRepulsorHelperModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectRepulsorHelper, "ObjectRepulsorHelper" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectRepulsorHelper, "ObjectRepulsorHelper" )
 
 public:
 
@@ -58,6 +55,3 @@ class ObjectRepulsorHelper : public ObjectHelper
 	virtual UpdateSleepTime update();
 
 };
-
-
-#endif  // end __ObjectRepulsorHelper_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h
index e3f88e0e2a4..d43bf6ff9c5 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OBJECT_SMC_HELPER_H_
-#define __OBJECT_SMC_HELPER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ObjectHelper.h"
 
@@ -48,7 +45,7 @@ class ObjectSMCHelper : public ObjectHelper
 {
 
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( ObjectSMCHelper, ObjectSMCHelperModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectSMCHelper, "ObjectSMCHelperPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectSMCHelper, "ObjectSMCHelperPool" )
 
 public:
 
@@ -58,6 +55,3 @@ class ObjectSMCHelper : public ObjectHelper
 	virtual UpdateSleepTime update();
 
 };
-
-
-#endif  // end __OBJECT_SMC_HELPER_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h
index 80fd05afa63..5f90b503701 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OBJECT_WEAPON_STATUS_HELPER_H_
-#define __OBJECT_WEAPON_STATUS_HELPER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ThingTemplate.h"
 #include "GameLogic/Object.h"
@@ -50,7 +47,7 @@ class ObjectWeaponStatusHelper : public ObjectHelper
 {
 
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( ObjectWeaponStatusHelper, ObjectWeaponStatusHelperModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectWeaponStatusHelper, "ObjectWeaponStatusHelperPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectWeaponStatusHelper, "ObjectWeaponStatusHelperPool" )
 
 protected:
 
@@ -65,9 +62,9 @@ class ObjectWeaponStatusHelper : public ObjectHelper
 	}
 public:
 
-	ObjectWeaponStatusHelper( Thing *thing, const ModuleData *modData ) : 
-		ObjectHelper( thing, modData ) 
-	{ 
+	ObjectWeaponStatusHelper( Thing *thing, const ModuleData *modData ) :
+		ObjectHelper( thing, modData )
+	{
 		// unlike other helpers, this one needs to start active.
 		DEBUG_ASSERTCRASH(getObject()->getTemplate()->canPossiblyHaveAnyWeapon(), ("should not be instantiated if we have no weapon"));
 		setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
@@ -78,8 +75,6 @@ class ObjectWeaponStatusHelper : public ObjectHelper
 	{
 		getObject()->adjustModelConditionForWeaponStatus();
 		// unlike other helpers, this one must run every frame.
-		return UPDATE_SLEEP_NONE; 
+		return UPDATE_SLEEP_NONE;
 	}
 };
-
-#endif  // end __OBJECT_DEFECTION_HELPER_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h
index 5c1cff51eec..a60d56c3ce4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h
@@ -25,16 +25,13 @@
 // FILE: OpenContain.h ////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, November 2001
 // Desc:   The OpenContainer ContainModule allows objects to be contained inside of other
-//				 objects.  There is a set of functionality that will be common to 
+//				 objects.  There is a set of functionality that will be common to
 //				 all container modules that provides the actual containment
 //				 implementations, those implementations are found here
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __OPENCONTAIN_H_
-#define __OPENCONTAIN_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/CollideModule.h"
@@ -78,17 +75,17 @@ class OpenContainModuleData : public UpdateModuleData
 //-------------------------------------------------------------------------------------------------
 /** An open container can actually contain other objects */
 //-------------------------------------------------------------------------------------------------
-class OpenContain : public UpdateModule, 
-										public ContainModuleInterface, 
-										public CollideModuleInterface, 
-										public DieModuleInterface, 
+class OpenContain : public UpdateModule,
+										public ContainModuleInterface,
+										public CollideModuleInterface,
+										public DieModuleInterface,
 										public DamageModuleInterface,
 										public ExitInterface
 {
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( OpenContain, "OpenContain" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( OpenContain, OpenContainModuleData )
-	
+
 public:
 
 	OpenContain( Thing *thing, const ModuleData* moduleData );
@@ -121,8 +118,8 @@ class OpenContain : public UpdateModule,
 	// DamageModuleInterface
 	virtual void onDamage( DamageInfo *damageInfo ){};	///< damage callback
 	virtual void onHealing( DamageInfo *damageInfo ){};	///< healing callback
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState){};  ///< state change callback
 
 
@@ -132,14 +129,14 @@ class OpenContain : public UpdateModule,
 	virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ) { return FALSE; }
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ) { return FALSE; }
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos ) { return FALSE; }
-	
+
 	///< if my object gets selected, then my visible passengers should, too
 	///< this gets called from
-	virtual void clientVisibleContainedFlashAsSelected() {}; 
+	virtual void clientVisibleContainedFlashAsSelected() {};
 
 	virtual const Player* getApparentControllingPlayer(const Player* observingPlayer) const { return NULL; }
 	virtual void recalcApparentControllingPlayer() { }
-		
+
 	virtual void onContaining( Object *obj );		///< object now contains 'obj'
 	virtual void onRemoving( Object *obj );			///< object no longer contains 'obj'
 	virtual void onSelling();///< Container is being sold.  Open responds by kicking people out
@@ -163,10 +160,11 @@ class OpenContain : public UpdateModule,
 	// contain list access
 	virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse );
 	virtual UnsignedInt getContainCount() const { return m_containListSize; }
-	virtual const ContainedItemsList* getContainedItemsList() const { return &m_containList; }	
+	virtual const ContainedItemsList* getContainedItemsList() const { return &m_containList; }
 	virtual const Object *friend_getRider() const{return NULL;} ///< Damn.  The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
 	virtual Real getContainedItemsMass() const;
 	virtual UnsignedInt getStealthUnitsContained() const { return m_stealthUnitsContained; }
+	virtual UnsignedInt getHeroUnitsContained() const { return m_heroUnitsContained; }
 
 	virtual PlayerMaskType getPlayerWhoEntered(void) const { return m_playerEnteredMask; }
 
@@ -178,7 +176,7 @@ class OpenContain : public UpdateModule,
 	virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor );
 	virtual void exitObjectInAHurry( Object *newObj );
 
-	
+
 	virtual void unreserveDoorForExit( ExitDoorType exitDoor ) { /*nothing*/ }
 	virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; };
 
@@ -191,6 +189,7 @@ class OpenContain : public UpdateModule,
 
 	virtual Bool isGarrisonable() const { return false; }		///< can this unit be Garrisoned? (ick)
 	virtual Bool isHealContain() const { return false; } ///< true when container only contains units while healing (not a transport!)
+	virtual Bool isTunnelContain() const { return FALSE; }
 	virtual Bool isSpecialZeroSlotContainer() const { return false; }
 	virtual Bool isImmuneToClearBuildingAttacks() const { return true; }
 
@@ -220,9 +219,9 @@ class OpenContain : public UpdateModule,
 	void scatterToNearbyPosition(Object* obj);
 	void removeFromContainViaIterator( ContainedItemsList::iterator it, Bool exposeStealthUnits = FALSE );  ///< remove item from contain list
 	void removeFromPassengerViaIterator( ContainedItemsList::iterator it );///< remove item from passenger list
-	
-	virtual void doLoadSound();	
-	virtual void doUnloadSound();	
+
+	virtual void doLoadSound();
+	virtual void doUnloadSound();
 	virtual void positionContainedObjectsRelativeToContainer(){}
 
 	virtual void addOrRemoveObjFromWorld(Object* obj, Bool add);
@@ -240,6 +239,8 @@ class OpenContain : public UpdateModule,
 
 	ObjectEnterExitMap	m_objectEnterExitInfo;
 	UnsignedInt					m_stealthUnitsContained;				///< number of stealth units that can't be seen by enemy players.
+	UnsignedInt					m_heroUnitsContained;						///< cached hero count
+	XferVersion					m_xferVersion;									///< version of loaded save file for loadPostProcess
 	Int									m_whichExitPath; ///< Cycles from 1 to n and is used only in modules whose data has numberOfExitPaths > 1.
 	UnsignedInt					m_doorCloseCountdown;						///< When should I shut my door.
 
@@ -250,7 +251,7 @@ class OpenContain : public UpdateModule,
 
 /// @todo srj -- move this to a lazily-allocated subobject
 	enum { MAX_FIRE_POINTS = 32 };
-	ModelConditionFlags	m_conditionState;				///< The Drawables current behavior state	
+	ModelConditionFlags	m_conditionState;				///< The Drawables current behavior state
 	Matrix3D						m_firePoints[ MAX_FIRE_POINTS ];
 	Int									m_firePointStart;												///< start firepoint index to use when building becomes occupied
 	Int									m_firePointNext;												///< next index to place objects at
@@ -262,5 +263,3 @@ class OpenContain : public UpdateModule,
 	Bool								m_loadSoundsEnabled;								///< Don't serialize -- used for disabling sounds during payload creation.
 
 };
-
-#endif  // end __OPENCONTAIN_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h
index 6fbb61185a0..82a23b5eaf0 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h
@@ -31,9 +31,6 @@
 
 #pragma once
 
-#ifndef __OVERCHARGE_BEHAVIOR_H_
-#define __OVERCHARGE_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DamageModule.h"
@@ -70,7 +67,7 @@ class OverchargeBehaviorInterface
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class OverchargeBehavior : public UpdateModule, 
+class OverchargeBehavior : public UpdateModule,
 													 public DamageModuleInterface,
 													 public OverchargeBehaviorInterface
 {
@@ -96,8 +93,8 @@ class OverchargeBehavior : public UpdateModule,
 	// DamageModuleInterface
 	virtual void onDamage( DamageInfo *damageInfo );
 	virtual void onHealing( DamageInfo *damageInfo ) { }
-	virtual void onBodyDamageStateChange( const DamageInfo *damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo *damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState ) { }
 
 
@@ -114,5 +111,3 @@ class OverchargeBehavior : public UpdateModule,
 	Bool m_overchargeActive;				///< Overcharge is currently on/off for this object
 
 };
-
-#endif  // end __OVERCHARGE_BEHAVIOR_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h
index 7e8851023ee..cb28040e673 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OVERLORD_CONTAIN_H_
-#define __OVERLORD_CONTAIN_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/TransportContain.h"
 
@@ -52,14 +49,14 @@ class OverlordContain : public TransportContain
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( OverlordContain, "OverlordContain" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( OverlordContain, OverlordContainModuleData )
 
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState);  ///< state change callback
 public:
 
 	OverlordContain( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
-	
+
 	virtual OpenContain *asOpenContain() { return this; }  ///< treat as open container
 	virtual Bool isGarrisonable() const;	///< can this unit be Garrisoned? (ick)
 	virtual Bool isHealContain() const { return false; } ///< true when container only contains units while healing (not a transport!)
@@ -86,19 +83,19 @@ class OverlordContain : public TransportContain
 	virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse );
 	virtual UnsignedInt getContainCount() const;
 	virtual Int getContainMax( void ) const;
-	virtual const ContainedItemsList* getContainedItemsList() const;	
+	virtual const ContainedItemsList* getContainedItemsList() const;
 
 	// Friend for our Draw module only.
 	virtual const Object *friend_getRider() const; ///< Damn.  The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
-	
+
 	///< if my object gets selected, then my visible passengers should, too
 	///< this gets called from
-	virtual void clientVisibleContainedFlashAsSelected(); 
+	virtual void clientVisibleContainedFlashAsSelected();
 
 	virtual Bool getContainerPipsToShow(Int& numTotal, Int& numFull);
 
 private:
-	/**< An empty overlord is a conatiner, but a full one redirects calls to its passengers.  If this returns NULL, 
+	/**< An empty overlord is a conatiner, but a full one redirects calls to its passengers.  If this returns NULL,
 	we are either empty or carrying a non container.
 	*/
 	ContainModuleInterface *getRedirectedContain() const; ///< And this gets what are redirecting to.
@@ -108,6 +105,3 @@ class OverlordContain : public TransportContain
 	Bool m_redirectionActivated;
 
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
index 89ca0c5fb15..b046386039c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __POW_TRUCK_AI_UPDATE_H_
-#define __POW_TRUCK_AI_UPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -58,7 +55,7 @@ class POWTruckAIUpdateModuleData : public AIUpdateModuleData
 // ------------------------------------------------------------------------------------------------
 enum POWTruckTask CPP_11(: Int)	// Stored in save file, do not renumber.  jba.
 {
-	POW_TRUCK_TASK_WAITING						= 0, ///< Waiting for something to do 
+	POW_TRUCK_TASK_WAITING						= 0, ///< Waiting for something to do
 	POW_TRUCK_TASK_FIND_TARGET				= 1, ///< We need to search out a target to collect
 	POW_TRUCK_TASK_COLLECTING_TARGET	= 2, ///< collecting a targeted POW
 	POW_TRUCK_TASK_RETURNING_PRISONERS= 3	///< return all POWs to base
@@ -80,7 +77,7 @@ class POWTruckAIUpdateInterface
 
 //-------------------------------------------------------------------------------------------------
 /** The Dozer AI Update interface.  Dozers are workers that are capable of building all the
-	* structures available to a player, as well as repairing building, and fortifying 
+	* structures available to a player, as well as repairing building, and fortifying
 	* civilian structures */
 //-------------------------------------------------------------------------------------------------
 class POWTruckAIUpdate : public AIUpdateInterface,
@@ -135,7 +132,7 @@ class POWTruckAIUpdate : public AIUpdateInterface,
 	// AIUpdateInterface implementations
 	virtual void privatePickUpPrisoner( Object *prisoner, CommandSourceType cmdSource );
 	virtual void privateReturnPrisoners( Object *prison, CommandSourceType cmdSource );
-	
+
 	POWTruckAIMode m_aiMode;						///< Type of AI, automatic or explicitly controlled be player
 	POWTruckTask m_currentTask;					///< our current task
 	ObjectID m_targetID;								///< Object ID of the target we're going to collect
@@ -146,5 +143,3 @@ class POWTruckAIUpdate : public AIUpdateInterface,
 };
 
 #endif
-
-#endif  // end __POW_TRUCK_AI_UPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h
index d339767b510..03a50f4f3f3 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __POW_TRUCK_BEHAVIOR_H_
-#define __POW_TRUCK_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 
@@ -45,7 +42,7 @@ class POWTruckBehaviorModuleData : public OpenContainModuleData
 public:
 
 	POWTruckBehaviorModuleData( void );
-	
+
 	static void buildFieldParse( MultiIniFieldParse &p );
 
 };
@@ -65,11 +62,9 @@ class POWTruckBehavior : public OpenContain
 
 	// collide methods
 	virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal );
-	
+
 protected:
 
 };
 
 #endif
-
-#endif  // end __POW_TRUCK_BEHAVIOR_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h
index 5099763d4b3..6e4d652e77e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ParachuteContain_H_
-#define __ParachuteContain_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 
@@ -87,7 +84,7 @@ class ParachuteContain : public OpenContain
 	virtual void positionContainedObjectsRelativeToContainer();
 
 private:
-	
+
 	void positionRider(Object* obj);
 	void updateBonePositions();
 	void updateOffsetsFromBones();
@@ -113,6 +110,3 @@ class ParachuteContain : public OpenContain
 	Bool m_needToUpdateParaBones;
 	Bool m_opened;
 };
-
-#endif // __ParachuteContain_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h
index 77e93401ecf..35d4ea3b88b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h
@@ -24,14 +24,11 @@
 
 // FILE: ParkingPlaceBehavior.h /////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, June 2002
-// Desc:   
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __ParkingPlaceBehavior_H_
-#define __ParkingPlaceBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -64,7 +61,7 @@ class ParkingPlaceBehaviorModuleData : public UpdateModuleData
 	{
 		UpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "NumRows",						INI::parseInt,									NULL, offsetof( ParkingPlaceBehaviorModuleData, m_numRows ) },
 			{ "NumCols",						INI::parseInt,									NULL, offsetof( ParkingPlaceBehaviorModuleData, m_numCols ) },
@@ -84,7 +81,7 @@ class ParkingPlaceBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class ParkingPlaceBehavior : public UpdateModule, 
+class ParkingPlaceBehavior : public UpdateModule,
 														 public DieModuleInterface,
 														 public ParkingPlaceBehaviorInterface,
 														 public ExitInterface
@@ -112,7 +109,7 @@ class ParkingPlaceBehavior : public UpdateModule,
 	virtual void unreserveDoorForExit( ExitDoorType exitDoor );
 	virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; }
 
-	virtual Bool getExitPosition( Coord3D& rallyPoint ) const;		
+	virtual Bool getExitPosition( Coord3D& rallyPoint ) const;
 	virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const;
 	virtual void setRallyPoint( const Coord3D *pos );			///< define a "rally point" for units to move towards
 	virtual const Coord3D *getRallyPoint( void ) const;			///< define a "rally point" for units to move towards
@@ -124,13 +121,14 @@ class ParkingPlaceBehavior : public UpdateModule,
 	virtual void onDie( const DamageInfo *damageInfo );
 
 	// ParkingPlaceBehaviorInterface
-	Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const; 
-	Bool hasAvailableSpaceFor(const ThingTemplate* thing) const; 
-	Bool hasReservedSpace(ObjectID id) const; 
+	Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const;
+	Bool hasAvailableSpaceFor(const ThingTemplate* thing) const;
+	Bool hasReservedSpace(ObjectID id) const;
 	Bool reserveSpace(ObjectID id, Real parkingOffset, PPInfo* info);
-	void releaseSpace(ObjectID id); 
+	void releaseSpace(ObjectID id);
 	Bool reserveRunway(ObjectID id, Bool forLanding);
-	void releaseRunway(ObjectID id); 
+	void releaseRunway(ObjectID id);
+	virtual Int getRunwayIndex(ObjectID id);
 	Int getRunwayCount() const { return m_runways.size(); }
 	ObjectID getRunwayReservation(Int r);
 	void transferRunwayReservationToNextInLineForTakeoff(ObjectID id);
@@ -143,15 +141,16 @@ class ParkingPlaceBehavior : public UpdateModule,
 
 	struct ParkingPlaceInfo
 	{
-		Coord3D				m_hangarStart;
-		Real					m_hangarStartOrient;
-		Coord3D				m_location;
-		Coord3D				m_prep;
-		Real					m_orientation;
-		Int						m_runway;
-		ExitDoorType	m_door;
-		ObjectID			m_objectInSpace;
-		Bool					m_reservedForExit;
+		Coord3D      m_hangarStart;
+		Real         m_hangarStartOrient;
+		Coord3D      m_location;
+		Coord3D      m_prep;
+		Real         m_orientation;
+		Int          m_runway;
+		ExitDoorType m_door;
+		ObjectID     m_objectInSpace;
+		Bool         m_reservedForExit;
+		Bool         m_postponedRunwayReservationForTakeoff;
 
 		ParkingPlaceInfo()
 		{
@@ -164,7 +163,8 @@ class ParkingPlaceBehavior : public UpdateModule,
 			m_door = DOOR_NONE_AVAILABLE;
 			m_objectInSpace = INVALID_ID;
 			m_reservedForExit = false;
-		} 
+			m_postponedRunwayReservationForTakeoff = false;
+		}
 	};
 
 	struct RunwayInfo
@@ -188,6 +188,7 @@ class ParkingPlaceBehavior : public UpdateModule,
 	UnsignedInt										m_nextHealFrame;
 	Bool													m_gotInfo;
 
+	Bool postponeRunwayReservation(UnsignedInt spaceIndex, Bool forLanding);
 	void buildInfo();
 	void purgeDead();
 	void resetWakeFrame();
@@ -195,9 +196,6 @@ class ParkingPlaceBehavior : public UpdateModule,
 	ParkingPlaceInfo* findPPI(ObjectID id);
 	ParkingPlaceInfo* findEmptyPPI();
 
-	Coord3D m_heliRallyPoint;		
+	Coord3D m_heliRallyPoint;
 	Bool m_heliRallyPointExists;				///< Only move to the rally point if this is true
 };
-
-#endif // __ParkingPlaceBehavior_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h
index b8b1b8c3e96..f313a06f55c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PARTICLE_UPLINK_CANNON_UPDATE_H_
-#define __PARTICLE_UPLINK_CANNON_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/LaserUpdate.h"
@@ -74,7 +71,7 @@ class ParticleUplinkCannonUpdateModuleData : public ModuleData
 	AsciiString			m_laserBaseLightFlareParticleSystemName;
 	AsciiString			m_laserBaseMediumFlareParticleSystemName;
 	AsciiString			m_laserBaseIntenseFlareParticleSystemName;
-	
+
 	AsciiString			m_fireBoneName;
 	AsciiString			m_particleBeamLaserName;
 
@@ -109,7 +106,7 @@ class ParticleUplinkCannonUpdateModuleData : public ModuleData
 	ParticleUplinkCannonUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -237,7 +234,3 @@ class ParticleUplinkCannonUpdate : public UpdateModule, public SpecialPowerUpdat
 	Bool						m_manualTargetMode;
 	Bool						m_clientShroudedLastFrame;
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
index 65e0ce53aec..17f24932846 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _PHYSICSUPDATE_H_
-#define _PHYSICSUPDATE_H_
-
 #include "Common/AudioEventRTS.h"
 #include "Common/GameAudio.h"
 #include "GameLogic/Module/BehaviorModule.h"
@@ -70,10 +67,10 @@ class PhysicsBehaviorModuleData : public UpdateModuleData
 };
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Simple rigid body physics update module
  */
-class PhysicsBehavior : public UpdateModule, 
+class PhysicsBehavior : public UpdateModule,
 												public CollideModuleInterface
 {
 
@@ -147,7 +144,7 @@ class PhysicsBehavior : public UpdateModule,
 
 	PhysicsTurningType getTurning(void) const { return m_turning; }		///< 0 = not turning, -1 = turn negative, 1 = turn positive.
 	void setTurning(PhysicsTurningType turning) { m_turning = turning; }
-	
+
 	/** This is a force scrub for velocity when ai objects are colliding. */
 	void scrubVelocity2D( Real desiredVelocity );
 
@@ -184,7 +181,7 @@ class PhysicsBehavior : public UpdateModule,
 
 	void setBounceSound(const AudioEventRTS* bounceSound);
 	const AudioEventRTS* getBounceSound() { return m_bounceSound ? &m_bounceSound->m_event : TheAudio->getValidSilentAudioEvent(); }
-	
+
 	/**
 		Reset all values (vel, accel, etc) to starting values.
 		You should ALMOST NEVER use this; it's intended for cases where you need
@@ -198,12 +195,12 @@ class PhysicsBehavior : public UpdateModule,
 	void setIgnoreCollisionsWith(const Object* obj);
 	Bool isIgnoringCollisionsWith(ObjectID id) const;
 
-	inline Bool getAllowCollideForce() const { return getFlag(ALLOW_COLLIDE_FORCE); }
+	Bool getAllowCollideForce() const { return getFlag(ALLOW_COLLIDE_FORCE); }
 
 protected:
 
 	/*
-		Physics runs in its own phase, after AI, but before all others. 
+		Physics runs in its own phase, after AI, but before all others.
 		It's actually quite important that AI (the thing that drives Locomotors) and Physics
 		run in the same order, relative to each other, for a given object; otherwise,
 		interesting oscillations can occur in some situations, with friction being applied
@@ -230,7 +227,7 @@ class PhysicsBehavior : public UpdateModule,
 
 	enum PhysicsFlagsType
 	{
-		// Note - written out in save/load xfer; don't change these numbers.  
+		// Note - written out in save/load xfer; don't change these numbers.
 		STICK_TO_GROUND									= 0x0001,
 		ALLOW_BOUNCE										= 0x0002,
 		APPLY_FRICTION2D_WHEN_AIRBORNE	= 0x0004,
@@ -245,9 +242,9 @@ class PhysicsBehavior : public UpdateModule,
 	};
 
 	/*
-		Note: these are private because you should never manipulate these directly, 
+		Note: these are private because you should never manipulate these directly,
 		even if you are a subclass... if you want to change the acceleration, you
-		MUST call applyForce(). 
+		MUST call applyForce().
 	*/
 	Real												m_yawRate;								///< rate of rotation around up vector
 	Real												m_rollRate;								///< rate of rotation around forward vector
@@ -269,8 +266,8 @@ class PhysicsBehavior : public UpdateModule,
 	ProjectileUpdateInterface*	m_pui;
 	mutable Real								m_velMag;									///< magnitude of cur vel (recalced when m_vel changes)
 
-	inline void setFlag(PhysicsFlagsType f, Bool set) { if (set) m_flags |= f; else m_flags &= ~f; }
-	inline Bool getFlag(PhysicsFlagsType f) const { return (m_flags & f) != 0; }
+	void setFlag(PhysicsFlagsType f, Bool set) { if (set) m_flags |= f; else m_flags &= ~f; }
+	Bool getFlag(PhysicsFlagsType f) const { return (m_flags & f) != 0; }
 
 
 };
@@ -291,6 +288,3 @@ inline ObjectID PhysicsBehavior::getLastCollidee() const
 {
 	return m_lastCollidee;
 }
-
-#endif // _PHYSICSUPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h
index 94a5b0e7bd2..9d064ba7997 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PILOT_FIND_VEHICLE_UPDATE_H_
-#define __PILOT_FIND_VEHICLE_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -53,7 +50,7 @@ class PilotFindVehicleUpdateModuleData : public ModuleData
 	PilotFindVehicleUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -79,7 +76,3 @@ class PilotFindVehicleUpdate : public UpdateModule
 protected:
 	Bool		m_didMoveToBase;
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h
index 597a01ad867..b26bbddc626 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __POINT_DEFENSE_LASER_UPDATE_H_
-#define __POINT_DEFENSE_LASER_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -56,7 +53,7 @@ class PointDefenseLaserUpdateModuleData : public ModuleData
 	PointDefenseLaserUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -87,7 +84,3 @@ class PointDefenseLaserUpdate : public UpdateModule
 	Int m_nextScanFrames;
 	Int m_nextShotAvailableInFrames;
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h
index 7a12a54de6a..a535d3cf9f4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __Poisoned_Behavior_H_
-#define __Poisoned_Behavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DamageModule.h"
@@ -55,7 +52,7 @@ class PoisonedBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class PoisonedBehavior : public UpdateModule, 
+class PoisonedBehavior : public UpdateModule,
 												 public DamageModuleInterface
 {
 
@@ -92,9 +89,7 @@ class PoisonedBehavior : public UpdateModule,
 	UnsignedInt		m_poisonDamageFrame;
 	UnsignedInt		m_poisonOverallStopFrame;
 	Real					m_poisonDamageAmount;
+	ObjectID			m_poisonSource;
 	DeathType			m_deathType;
 
 };
-
-#endif // __Poisoned_Behavior_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h
index f5d6d0e611c..d30a0f30355 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __POWERPLANTUPDATE_H_
-#define __POWERPLANTUPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -44,11 +41,11 @@ class PowerPlantUpdateModuleData : public UpdateModuleData
 
 	PowerPlantUpdateModuleData( void );
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse( p );
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 
 			{ "RodsExtendTime", INI::parseDurationUnsignedInt, NULL, offsetof( PowerPlantUpdateModuleData, m_rodsExtendTime ) },
@@ -99,5 +96,3 @@ class PowerPlantUpdate : public UpdateModule,
 	Bool m_extended;										 ///< TRUE when extend is all done
 
 };
-
-#endif  // end __POWERPLANTUPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h
index 1afce4f215b..d99f1ce8280 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __POWERPLANTUPGRADE_H_
-#define __POWERPLANTUPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -62,6 +59,3 @@ class PowerPlantUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-#endif // __POWERPLANTUPGRADE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h
index ccd0f80167a..8e9eef96c30 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _PREORDER_CREATE_H_
-#define _PREORDER_CREATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CreateModule.h"
 
@@ -58,5 +55,3 @@ class PreorderCreate : public CreateModule
 protected:
 
 };
-
-#endif // _PREORDER_CREATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h
index 9c539947f98..591d58ff384 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h
@@ -27,8 +27,7 @@
 // Desc:   Prison Behaviors
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifndef __PRISON_BEHAVIOR_H_
-#define __PRISON_BEHAVIOR_H_
+#pragma once
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
@@ -81,9 +80,7 @@ class PrisonBehavior : public OpenContain
 	void removeVisual( Object *obj );						///< remove prisoner visual
 
 	PrisonVisual *m_visualList;									///< list of visual representation data (if needed)
-			
+
 };
 
 #endif
-
-#endif  // end __PRISON_BEHAVIOR_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h
index 98ed172a3e8..9857791ba99 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PRISON_DOCK_UPDATE_H_
-#define __PRISON_DOCK_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
 #include "GameLogic/Module/DockUpdate.h"
@@ -55,9 +52,7 @@ class PrisonDockUpdate : public DockUpdate
 	virtual Bool action( Object *docker, Object *drone = NULL );	///< for me this means do some Prison
 
 protected:
-	
+
 };
 
 #endif
-
-#endif  // end __PRISON_DOCK_UPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h
index bb6147a9b5e..239a853d12c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PRODUCTIONUPDATE_H_
-#define __PRODUCTIONUPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/ModelState.h"
 #include "GameLogic/Module/DieModule.h"
@@ -56,7 +53,7 @@ enum ProductionType CPP_11(: Int)
 };
 
 //-------------------------------------------------------------------------------------------------
-/** A ProductionEntry is a single entry representing something that we are supposed to 
+/** A ProductionEntry is a single entry representing something that we are supposed to
 	* produce */
 //-------------------------------------------------------------------------------------------------
 class ProductionEntry : public MemoryPoolObject
@@ -95,7 +92,7 @@ friend class ProductionUpdate;
 	void setExitDoor(ExitDoorType exitDoor) { m_exitDoor = exitDoor; }
 
 protected:
-	
+
 	ProductionType m_type;														///< production type
 	union
 	{
@@ -202,7 +199,7 @@ class ProductionUpdate : public UpdateModule, public ProductionUpdateInterface,
 	virtual CanMakeType canQueueUpgrade( const UpgradeTemplate *upgrade ) const;
 
 	/** this method is used to request a unique ID to assign to the production of a single
-	unit.  It is unique to all units that can be created from this source object, but is 
+	unit.  It is unique to all units that can be created from this source object, but is
 	not unique amoung multiple source objects */
 	virtual ProductionID requestUniqueUnitID( void ) { ProductionID tmp = m_uniqueID; m_uniqueID = (ProductionID)(m_uniqueID+1); return tmp; }
 
@@ -213,7 +210,7 @@ class ProductionUpdate : public UpdateModule, public ProductionUpdateInterface,
 
 	virtual Bool queueCreateUnit( const ThingTemplate *unitType, ProductionID productionID );					///< queue unit to be produced
 	virtual void cancelUnitCreate( ProductionID productionID );		      ///< cancel construction of unit with matching production ID
-	virtual void cancelAllUnitsOfType( const ThingTemplate *unitType);	///< cancel all production of type unitType 
+	virtual void cancelAllUnitsOfType( const ThingTemplate *unitType);	///< cancel all production of type unitType
 
 	virtual void cancelAndRefundAllProduction( void );									///< cancel and refund anything in the production queue
 
@@ -257,5 +254,3 @@ class ProductionUpdate : public UpdateModule, public ProductionUpdateInterface,
 	Bool								m_flagsDirty;										///< clearFlags/setFlags needs to be set into the model
 
 };
-
-#endif  // end __PRODUCTIONUPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h
index 4f371434ad7..65afb8d35fc 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PROJECTILE_STREAM_UPDATE_H_
-#define __PROJECTILE_STREAM_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
@@ -74,7 +71,3 @@ class ProjectileStreamUpdate : public UpdateModule
 	Int m_firstValidIndex;
 	ObjectID m_owningObject;
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h
index 4505d862d7c..1ca107561c1 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PRONE_UPDATE_H_
-#define __PRONE_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -49,7 +46,7 @@ class ProneUpdateModuleData : public ModuleData
 	ProneUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -78,7 +75,3 @@ class ProneUpdate : public UpdateModule
 
 	Int m_proneFrames;
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h
index aac22b8e3ea..2673d20e8ed 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h
@@ -27,8 +27,7 @@
 // Desc:   Propaganda Center Behavior
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifndef __PROPAGANDA_CENTER_BEHAVIOR_H_
-#define __PROPAGANDA_CENTER_BEHAVIOR_H_
+#pragma once
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/PrisonBehavior.h"
@@ -80,9 +79,7 @@ class PropagandaCenterBehavior : public PrisonBehavior
 	ObjectID m_brainwashingSubjectID;								///< who we're currently brainwashing
 	UnsignedInt m_brainwashingSubjectStartFrame;		///< frame we started brainwashing
 	BrainwashedIDList m_brainwashedList;						///< list of objects we've brainwashed
-		
+
 };
 
 #endif
-
-#endif  // end __PROPAGANDA_CENTER_BEHAVIOR_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h
index 443f45809a7..5d51f5f30de 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PROPAGANDA_TOWER_BEHAVIOR_H_
-#define __PROPAGANDA_TOWER_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/PropagandaTowerBehavior.h"
@@ -95,14 +92,14 @@ class PropagandaTowerBehavior : public UpdateModule,
 	// of our effect on people.  We don't say "Be affected for n frames", we toggle people.  We need to process
 	// so we can toggle everyone off.
 	virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; }
-	
+
 	// our own public module methods
 
 protected:
 
 	virtual void removeAllInfluence( void );			///< remove any influence we had on all objects we've affected
 	virtual void doScan( void );									///< do a scan
-	virtual void effectLogic( Object *obj, Bool giving, 
+	virtual void effectLogic( Object *obj, Bool giving,
 														const PropagandaTowerBehaviorModuleData *modData);///< give/remove effect on object
 
 	UnsignedInt m_lastScanFrame;									///< last frame we did a scan on
@@ -111,6 +108,3 @@ class PropagandaTowerBehavior : public UpdateModule,
 	const UpgradeTemplate *m_upgradeRequired;			///< Upgrade required to use the upgraded pulse FX
 
 };
-
-#endif  // end __PROPAGANDA_TOWER_BEHAVIOR_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h
index 4490ac97e51..0dd4fec2a6a 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _QUEUE_PRODUCTION_EXIT_UPDATE_H
-#define _QUEUE_PRODUCTION_EXIT_UPDATE_H
-
 #include "GameLogic/Module/UpdateModule.h"
 #include "Common/INI.h"
 #include "Lib/BaseType.h"
@@ -47,7 +44,7 @@ class QueueProductionExitUpdateModuleData : public UpdateModuleData
 	Coord3D m_naturalRallyPoint;
 	UnsignedInt m_exitDelayData;
 	Bool m_allowAirborneCreationData;
-	UnsignedInt m_initialBurst; 
+	UnsignedInt m_initialBurst;
 
 	QueueProductionExitUpdateModuleData()
 	{
@@ -58,10 +55,10 @@ class QueueProductionExitUpdateModuleData : public UpdateModuleData
 		m_initialBurst = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UnitCreatePoint",				INI::parseCoord3D,							NULL, offsetof( QueueProductionExitUpdateModuleData, m_unitCreatePoint ) },
 			{ "NaturalRallyPoint",			INI::parseCoord3D,							NULL, offsetof( QueueProductionExitUpdateModuleData, m_naturalRallyPoint ) },
@@ -81,7 +78,7 @@ class QueueProductionExitUpdate : public UpdateModule, public ExitInterface
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( QueueProductionExitUpdate, "QueueProductionExitUpdate" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( QueueProductionExitUpdate, QueueProductionExitUpdateModuleData )
 
-public: 
+public:
 
 	virtual ExitInterface* getUpdateExitInterface() { return this; }
 
@@ -110,7 +107,7 @@ class QueueProductionExitUpdate : public UpdateModule, public ExitInterface
 	Real				m_creationClearDistance;		///< I can think of myself as ready when the previous guy is this far away.
 	UnsignedInt m_currentBurstCount;				///< how many times must I still override the delay timer
 
-	Bool isFreeToExit() const; 
+	Bool isFreeToExit() const;
 };
 
 inline void QueueProductionExitUpdate::setRallyPoint( const Coord3D *pos )
@@ -126,5 +123,3 @@ inline const Coord3D *QueueProductionExitUpdate::getRallyPoint( void )  const
 
 	return NULL;
 }
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h
index de857f8ea38..b800637373b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RADARUPDATE_H_
-#define __RADARUPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -44,11 +41,11 @@ class RadarUpdateModuleData : public UpdateModuleData
 
 	RadarUpdateModuleData( void );
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse( p );
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 
 			{ "RadarExtendTime", INI::parseDurationReal, NULL, offsetof( RadarUpdateModuleData, m_radarExtendTime ) },
@@ -88,5 +85,3 @@ class RadarUpdate : public UpdateModule
 	Bool m_radarActive;												 ///< TRUE when radar is actually online and generating radar information.
 
 };
-
-#endif  // end __RADARUPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h
index e079a1bd19c..daeaefac52f 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RADARUPGRADE_H_
-#define __RADARUPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -78,6 +75,3 @@ class RadarUpgrade : public UpgradeModule
 
 
 };
-
-#endif // __RADARUPGRADE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h
index 3b73f60245e..4add4ff719a 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef __RadiusDecalUpdate_H_
-#define __RadiusDecalUpdate_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameClient/RadiusDecal.h"
@@ -46,10 +43,10 @@ class RadiusDecalUpdateModuleData : public UpdateModuleData
 		//m_deliveryDecalRadius = 0.0f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			//{ "DeliveryDecal",						RadiusDecalTemplate::parseRadiusDecalTemplate,	NULL, offsetof( RadiusDecalUpdateModuleData, m_deliveryDecalTemplate ) },
 			//{ "DeliveryDecalRadius",			INI::parseReal,									NULL,	offsetof( RadiusDecalUpdateModuleData, m_deliveryDecalRadius ) },
@@ -75,7 +72,7 @@ class RadiusDecalUpdate : public UpdateModule
 	//void createRadiusDecal( const Coord3D& pos );
 	void createRadiusDecal( const RadiusDecalTemplate& tmpl, Real radius, const Coord3D& pos );
 	void killWhenNoLongerAttacking(Bool v) { m_killWhenNoLongerAttacking = v; }
-	void killRadiusDecal(); 
+	void killRadiusDecal();
 
 	virtual UpdateSleepTime update( void );
 
@@ -84,6 +81,3 @@ class RadiusDecalUpdate : public UpdateModule
 	RadiusDecal m_deliveryDecal;
 	Bool m_killWhenNoLongerAttacking;
 };
-
-#endif // __RadiusDecalUpdate_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h
index f36abf0dbc6..ac50fcfb50e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RAILED_TRANSPORT_AI_UPDATE_H_
-#define __RAILED_TRANSPORT_AI_UPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -96,7 +93,3 @@ class RailedTransportAIUpdate : public AIUpdateInterface
 	Bool m_waypointDataLoaded;		///< TRUE once we've searched the map to load m_path
 
 };
-
-
-#endif  // end __RAILED_TRANSPORT_AI_UPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h
index fb10a7a3a4d..a1b5982f980 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RAILED_TRANSPORT_CONTAIN_H_
-#define __RAILED_TRANSPORT_CONTAIN_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/TransportContain.h"
 
@@ -57,5 +54,3 @@ class RailedTransportContain : public TransportContain
 	virtual Bool isSpecificRiderFreeToExit( Object *obj );
 
 };
-
-#endif  // end __RAILED_TRANSPORT_CONTAIN_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h
index b1d393fb360..6e64d818374 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h
@@ -27,8 +27,7 @@
 // Desc:   Railed transport dock update
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifndef __RAILED_TRANSPORT_DOCK_UPDATE_H_
-#define __RAILED_TRANSPORT_DOCK_UPDATE_H_
+#pragma once
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DockUpdate.h"
@@ -44,7 +43,7 @@ class RailedTransportDockUpdateModuleData : public DockUpdateModuleData
 
 	static void buildFieldParse( MultiIniFieldParse &p );
 
-	UnsignedInt m_pullInsideDurationInFrames;		/**< how long it takes to pull object inside 
+	UnsignedInt m_pullInsideDurationInFrames;		/**< how long it takes to pull object inside
 																									 once they're at the dock action point */
 	UnsignedInt m_pushOutsideDurationInFrames;	/**< how long it takes to push object outside
 																									 when we're unloading */
@@ -109,5 +108,3 @@ class RailedTransportDockUpdate : public DockUpdate,
 	Int m_unloadCount;												///< count used to govern unloading 1 or all objects
 
 };
-
-#endif  // end __RAILED_TRANSPORT_DOCK_UPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h
index 8ec96cd3e20..b33a49da945 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RAILROADGUIDE_AI_UPDATE_H_
-#define __RAILROADGUIDE_AI_UPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/Module/PhysicsUpdate.h"
@@ -53,7 +50,7 @@ class RailroadBehaviorModuleData : public PhysicsBehaviorModuleData
 	{
 		PhysicsBehaviorModuleData::buildFieldParse( p );
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "PathPrefixName",		INI::parseAsciiString, NULL,	offsetof( RailroadBehaviorModuleData, m_pathPrefixName ) },
 			{ "CrashFXTemplateName",		INI::parseAsciiString, NULL,	offsetof( RailroadBehaviorModuleData, m_CrashFXTemplateName ) },
@@ -77,7 +74,7 @@ class RailroadBehaviorModuleData : public PhysicsBehaviorModuleData
 
 		p.add( dataFieldParse );
 
-	}  // end buildFieldParse
+	}
 
 	TemplateNameList m_carriageTemplateNameData;
 	AsciiString m_pathPrefixName;		///< prefix to use for waypont start and end points we'll look for
@@ -93,13 +90,13 @@ class RailroadBehaviorModuleData : public PhysicsBehaviorModuleData
 	UnsignedInt m_waitAtStationTime;
 	AudioEventRTS			m_runningSound;
 	AudioEventRTS			m_clicketyClackSound;
-	AudioEventRTS				m_bigMetalImpactDefaultSound;		
-	AudioEventRTS				m_smallMetalImpactDefaultSound;	
-	AudioEventRTS				m_meatyImpactDefaultSound;			
-	AudioEventRTS				m_whistleSound;						
+	AudioEventRTS				m_bigMetalImpactDefaultSound;
+	AudioEventRTS				m_smallMetalImpactDefaultSound;
+	AudioEventRTS				m_meatyImpactDefaultSound;
+	AudioEventRTS				m_whistleSound;
 };
 //-------------------------------------------------------------------------------------------------
- 
+
 //-------------------------------------------------------------------------------------------------
 
 
@@ -158,9 +155,9 @@ struct TrainTrack
 	};
 
 
-	void clear( void ) 
-	{ 
-		m_pointList.clear(); 
+	void clear( void )
+	{
+		m_pointList.clear();
 		m_isLooping = FALSE;
 		m_isValid = FALSE;
 		m_refCount = 0;
@@ -171,10 +168,10 @@ struct TrainTrack
 	Bool m_isValid;
 	Real m_length;
 
-	void incReference(); 
-	Bool releaseReference(); 
+	void incReference();
+	Bool releaseReference();
 
-	// To protect the track form ever going out of sync between cars on the same train... 
+	// To protect the track form ever going out of sync between cars on the same train...
 	// I restrict write access to the first referencer, before a second one is added (the locomotive)
 	TrackPointList* getWritablePointList( void ) { return m_refCount == 1 ? &m_pointList : NULL; };
 	const TrackPointList* getPointList( void ) { return &m_pointList; };
@@ -214,8 +211,8 @@ class RailroadBehavior	: public PhysicsBehavior
 	};
 
 	typedef std::vector<AsciiString> TemplateNameVector;
-	typedef TemplateNameVector::const_iterator TemplateNameIterator;;
-	
+	typedef TemplateNameVector::const_iterator TemplateNameIterator;
+
 
 
 	//UpdateModule methods
@@ -271,10 +268,10 @@ class RailroadBehavior	: public PhysicsBehavior
 	AudioEventRTS			m_clicketyClackSound;
 	AudioEventRTS			m_runningSound;
 	AudioHandle				m_runningSoundHandle;
-	
+
 	TrainTrack *m_track;
 
-	Int m_currentPointHandle; 
+	Int m_currentPointHandle;
 	Int m_waitAtStationTimer;
 
 	//Flags
@@ -283,12 +280,12 @@ class RailroadBehavior	: public PhysicsBehavior
 	Bool m_trackDataLoaded; ///< have I TRIED to load track data, yet? I only try once!
 	Bool m_waitingInWings; /// I have not entered the real track yet, so leave me alone
 	Bool m_endOfLine;				/// I have reached the end of a non looping track
-	Bool m_isLocomotive; ///< Am I a locomotive, 
-	Bool m_isLeadCarraige; ///< Am the carraige in front,  
-	Int m_wantsToBeLeadCarraige; ///< Am the carraige in front,  
+	Bool m_isLocomotive; ///< Am I a locomotive,
+	Bool m_isLeadCarraige; ///< Am the carraige in front,
+	Int m_wantsToBeLeadCarraige; ///< Am the carraige in front,
 	Bool m_disembark; ///< If I wait at a station, I should also evacuate everybody when I get theres
-	Bool m_inTunnel; ///< Am I in a tunnel, so I wil not snap to ground height, until the next waypoint, 
-												//  i.e. do I provide the movement and scheduling AI for m_trailerID 
+	Bool m_inTunnel; ///< Am I in a tunnel, so I wil not snap to ground height, until the next waypoint,
+												//  i.e. do I provide the movement and scheduling AI for m_trailerID
 												//  And therefore for his and his and his..........
 
 	ConductorState m_conductorState;
@@ -297,7 +294,3 @@ class RailroadBehavior	: public PhysicsBehavior
 
 
 };
-
-
-#endif  // end __RAILROAD_GUIDE_AI_UPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h
index bd6a04f2bc7..8cbcc525a45 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __REBUILD_HOLE_BEHAVIOR_H_
-#define __REBUILD_HOLE_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -49,7 +46,7 @@ class RebuildHoleBehaviorModuleData : public UpdateModuleData
 	static void buildFieldParse( MultiIniFieldParse &p );
 
 	Real m_workerRespawnDelay;							///< delay in frames from death of object till respawn of worker
-	Real m_holeHealthRegenPercentPerSecond; ///< the hole recovers this % of the max hit points per second 
+	Real m_holeHealthRegenPercentPerSecond; ///< the hole recovers this % of the max hit points per second
 	AsciiString m_workerTemplateName;				///< name of worker object
 
 private:
@@ -67,12 +64,12 @@ class RebuildHoleBehaviorInterface
 	virtual ObjectID getSpawnerID( void ) = 0;
 	virtual ObjectID getReconstructedBuildingID( void ) = 0;
 	virtual const ThingTemplate* getRebuildTemplate() const = 0;
-	
+
 };
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class RebuildHoleBehavior : public UpdateModule, 
+class RebuildHoleBehavior : public UpdateModule,
 														public DieModuleInterface,
 														public RebuildHoleBehaviorInterface
 {
@@ -120,5 +117,3 @@ class RebuildHoleBehavior : public UpdateModule,
 	const ThingTemplate *m_rebuildTemplate;	///< what we are rebuilding
 
 };
-
-#endif  // end __REBUILD_HOLE_BEHAVIOR_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h
index 2d6f42d635a..4f9f4766577 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __REBUILD_HOLE_EXPOSE_DIE_H_
-#define __REBUILD_HOLE_EXPOSE_DIE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "GameLogic/Module/DieModule.h"
@@ -69,9 +66,6 @@ class RebuildHoleExposeDie : public DieModule
 	RebuildHoleExposeDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-
-#endif  // end __REBUILD_HOLE_EXPOSE_DIE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h
index 683aad30e13..c8d458ef508 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __REPAIRDOCKUPDATE_H_
-#define __REPAIRDOCKUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
 #include "GameLogic/Module/SupplyCenterDockUpdate.h"
@@ -74,7 +71,5 @@ class RepairDockUpdate : public DockUpdate
 
   ObjectID m_lastRepair;			///< object we were repairing last
 	Real m_healthToAddPerFrame;	///< health to add per frame to current docked object
-	
-};
 
-#endif
+};
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h
index 72effd91520..8c4639ca966 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef SALVAGE_CRATE_COLLIDE_H_
-#define SALVAGE_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "Common/STLTypedefs.h"
@@ -60,11 +57,11 @@ class SalvageCrateCollideModuleData : public CrateCollideModuleData
 		m_maximumMoney = 75;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "WeaponChance",	INI::parsePercentToReal,	NULL, offsetof( SalvageCrateCollideModuleData, m_weaponChance ) },
 			{ "LevelChance",	INI::parsePercentToReal,	NULL, offsetof( SalvageCrateCollideModuleData, m_levelChance ) },
@@ -111,5 +108,3 @@ class SalvageCrateCollide : public CrateCollide
 	void doMoney( Object *other );
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h
index 8606b391dea..566cdf14c75 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef SHROUD_CRATE_COLLIDE_H_
-#define SHROUD_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -56,5 +53,3 @@ class ShroudCrateCollide : public CrateCollide
 	/// This is the game logic execution function that all real CrateCollides will implement
 	virtual Bool executeCrateBehavior( Object *other );
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h
index 4bbe77da620..a4e8967c401 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h
@@ -29,10 +29,8 @@
 //        soldiers that are close to a stinger site. It's important to note that any slaved units
 //				can use any or all features, some of which are specialized.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma once
 
-#ifndef _SLAVED_UPDATE_H_
-#define _SLAVED_UPDATE_H_
+#pragma once
 
 const Int SLAVED_UPDATE_RATE = LOGICFRAMES_PER_SECOND/4; ///< This is a low priority module that only needs to be called every this many frames
 
@@ -56,7 +54,7 @@ class SlavedUpdateModuleData : public UpdateModuleData
 	Int m_scoutRange;				//If master is moving somewhere, I'll scout ahead -- how far am I allowed to go?
 	Int m_scoutWanderRange;	//If I'm at the scout point, how far can I wander from it.
 	Int m_distToTargetToGrantRangeBonus;	//How close I have to be to the master's target in order to grant master a range bonus.
-	
+
 	//Example: Below are used by battle drones
 	Int m_repairRange;
 	Real m_repairMinAltitude;
@@ -67,7 +65,7 @@ class SlavedUpdateModuleData : public UpdateModuleData
 	Int m_minReadyFrames;
 	Int m_maxReadyFrames;
 	Int m_minWeldFrames;
-	Int m_maxWeldFrames; 
+	Int m_maxWeldFrames;
 	AsciiString m_weldingSysName;
 	AsciiString m_weldingFXBone;
 
@@ -93,10 +91,10 @@ class SlavedUpdateModuleData : public UpdateModuleData
 		m_stayOnSameLayerAsMaster = false;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "GuardMaxRange",			INI::parseInt,	NULL, offsetof( SlavedUpdateModuleData, m_guardMaxRange ) },
 			{ "GuardWanderRange",		INI::parseInt,	NULL, offsetof( SlavedUpdateModuleData, m_guardWanderRange ) },
@@ -177,5 +175,3 @@ class SlavedUpdate : public UpdateModule, public SlavedUpdateInterface
 	RepairStates m_repairState;
 	Bool m_repairing;
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
index d9621cd55e6..7bf3506088a 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SlowDeathBehavior_H_
-#define __SlowDeathBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -54,11 +51,11 @@ enum SlowDeathPhaseType CPP_11(: Int)
 	SDPHASE_MIDPOINT,
 	SDPHASE_FINAL,
 
-	SD_PHASE_COUNT	// keep last
+	SD_PHASE_COUNT
 };
 
 #ifdef DEFINE_SLOWDEATHPHASE_NAMES
-static const char *TheSlowDeathPhaseNames[] = 
+static const char *const TheSlowDeathPhaseNames[] =
 {
 	"INITIAL",
 	"MIDPOINT",
@@ -66,6 +63,7 @@ static const char *TheSlowDeathPhaseNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheSlowDeathPhaseNames) == SD_PHASE_COUNT + 1, "Incorrect array size");
 #endif
 
 
@@ -90,7 +88,7 @@ class SlowDeathBehaviorModuleData : public UpdateModuleData
 	Real							m_flingPitch;
 	Real							m_flingPitchVariance;
 
-	enum 
+	enum
 	{
 		//flags used by m_maskOfLoadedEffects
 		HAS_FX							= 1,
@@ -102,7 +100,7 @@ class SlowDeathBehaviorModuleData : public UpdateModuleData
 
 	SlowDeathBehaviorModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
-	inline Bool hasNonLodEffects() const
+	Bool hasNonLodEffects() const
 	{
 		return (m_maskOfLoadedEffects & SlowDeathBehaviorModuleData::HAS_NON_LOD_EFFECTS) != 0;
 	}
@@ -123,7 +121,7 @@ class SlowDeathBehaviorInterface
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class SlowDeathBehavior : public UpdateModule, 
+class SlowDeathBehavior : public UpdateModule,
 													public DieModuleInterface,
 													public SlowDeathBehaviorInterface
 {
@@ -142,7 +140,7 @@ class SlowDeathBehavior : public UpdateModule,
 	virtual DieModuleInterface* getDie() { return this; }
 
 	// UpdateModuleInterface
-	virtual UpdateSleepTime update();	
+	virtual UpdateSleepTime update();
 	virtual SlowDeathBehaviorInterface* getSlowDeathBehaviorInterface() { return this; }
 	// Disabled conditions to process -- all
 	virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; }
@@ -158,11 +156,11 @@ class SlowDeathBehavior : public UpdateModule,
 protected:
 
 	void doPhaseStuff(SlowDeathPhaseType sdphase);
-	inline Bool isSlowDeathActivated() const { return (m_flags & (1<<SLOW_DEATH_ACTIVATED)) != 0; }
-	inline UnsignedInt getDestructionFrame() const { return m_destructionFrame; }
+	Bool isSlowDeathActivated() const { return (m_flags & (1<<SLOW_DEATH_ACTIVATED)) != 0; }
+	UnsignedInt getDestructionFrame() const { return m_destructionFrame; }
 
 private:
-	
+
 	enum
 	{
 		SLOW_DEATH_ACTIVATED,
@@ -173,10 +171,7 @@ class SlowDeathBehavior : public UpdateModule,
 
 	UnsignedInt m_sinkFrame;							///< Frame to be sunken into the ground on
 	UnsignedInt m_midpointFrame;					///< The midpoint is between .25 through life and .75 through life (eg)
-	UnsignedInt m_destructionFrame;	
+	UnsignedInt m_destructionFrame;
 	Real				m_acceleratedTimeScale;		///<used to speedup deaths when needed to improve game performance.
 	UnsignedInt	m_flags;
 };
-
-#endif // __SlowDeathBehavior_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
index 0d7e91c407b..debea0cc3e3 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _SPAWN_BEHAVIOR_H_
-#define _SPAWN_BEHAVIOR_H_
-
 const Int SPAWN_UPDATE_RATE = LOGICFRAMES_PER_SECOND/2; ///< This is a low priority module that only needs to be called every this many frames
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
@@ -62,35 +59,32 @@ class SpawnBehaviorModuleData : public BehaviorModuleData
 	DamageTypeFlags m_damageTypesToPropagateToSlaves;
 	std::vector<AsciiString> m_spawnTemplateNameData;
 	DieMuxData m_dieMuxData;
-	
+
 	SpawnBehaviorModuleData()
 	{
 		m_spawnNumberData = 0;
 		m_spawnReplaceDelayData = 0;
-		//Added By Sadullah Nader
-		//Initialization(s) inserted
 		m_spawnStartNumberData = 0;
-		//
 		m_initialBurst = 0;
 		m_isOneShotData = FALSE;
 		m_canReclaimOrphans = FALSE;
-		m_aggregateHealth = FALSE;	
+		m_aggregateHealth = FALSE;
 		m_exitByBudding = FALSE;
 		m_spawnTemplateNameData.clear();
 		m_spawnedRequireSpawner = FALSE;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     BehaviorModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "SpawnNumber",							INI::parseInt,										NULL, offsetof( SpawnBehaviorModuleData, m_spawnNumberData ) },
 			{ "SpawnReplaceDelay",				INI::parseDurationUnsignedInt,		NULL, offsetof( SpawnBehaviorModuleData, m_spawnReplaceDelayData ) },
 			{ "OneShot",									INI::parseBool,										NULL, offsetof( SpawnBehaviorModuleData, m_isOneShotData ) },
 			{ "CanReclaimOrphans",				INI::parseBool,										NULL,	offsetof( SpawnBehaviorModuleData, m_canReclaimOrphans ) },
-			{ "AggregateHealth",  				INI::parseBool,										NULL, offsetof( SpawnBehaviorModuleData, m_aggregateHealth ) },		
-			{ "ExitByBudding",    				INI::parseBool,										NULL, offsetof( SpawnBehaviorModuleData, m_exitByBudding ) },		
+			{ "AggregateHealth",  				INI::parseBool,										NULL, offsetof( SpawnBehaviorModuleData, m_aggregateHealth ) },
+			{ "ExitByBudding",    				INI::parseBool,										NULL, offsetof( SpawnBehaviorModuleData, m_exitByBudding ) },
 			{ "SpawnTemplateName",				INI::parseAsciiStringVectorAppend,NULL, offsetof( SpawnBehaviorModuleData, m_spawnTemplateNameData ) },
 			{ "SpawnedRequireSpawner",		INI::parseBool,										NULL,	offsetof( SpawnBehaviorModuleData, m_spawnedRequireSpawner ) },
 			{ "PropagateDamageTypesToSlavesWhenExisting",   INI::parseDamageTypeFlags, NULL, offsetof( SpawnBehaviorModuleData, m_damageTypesToPropagateToSlaves ) },
@@ -152,8 +146,8 @@ class SpawnBehavior : public UpdateModule,
 	// damage methods
 	virtual void onDamage( DamageInfo *damageInfo );
 	virtual void onHealing( DamageInfo *damageInfo ) { }
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState) { }
 
 	// SpawnBehaviorInterface methods
@@ -196,7 +190,7 @@ class SpawnBehavior : public UpdateModule,
 	intList m_replacementTimes;			///< A list of frame times that I need to create new spawns
 	objectIDList m_spawnIDs;				///< My darling little spawns.  I need to keep track of them explicitly for the Slave type stuff
 	Bool m_active;									///< Am I currently turned on
-	
+
 
 	Object *reclaimOrphanSpawn( void );		///< find existing orphaned spawn object if present
 
@@ -210,5 +204,3 @@ class SpawnBehavior : public UpdateModule,
 	std::vector<AsciiString>::const_iterator m_templateNameIterator;
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h
index 97cac3faef7..0b1943bb8bc 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _SPAWN_POINT_PRODUCTION_EXIT_UPDATE_H
-#define _SPAWN_POINT_PRODUCTION_EXIT_UPDATE_H
-
 #include "GameLogic/Module/UpdateModule.h"
 #include "Common/INI.h"
 #include "Lib/BaseType.h"
@@ -50,10 +47,10 @@ class SpawnPointProductionExitUpdateModuleData : public UpdateModuleData
 public:
 	AsciiString m_spawnPointBoneNameData;
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "SpawnPointBoneName",		INI::parseAsciiString,		NULL, offsetof( SpawnPointProductionExitUpdateModuleData, m_spawnPointBoneNameData ) },
 			{ 0, 0, 0, 0 }
@@ -100,5 +97,3 @@ class SpawnPointProductionExitUpdate : public UpdateModule, public ExitInterface
 	void initializeBonePositions();	///< Look up the bone positions and store them in world space coords
 	void revalidateOccupiers();			///< Do a lookup on all our ID's and clear the dead ones.
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h
index 03eaff3d464..0696e6e1130 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h
@@ -24,15 +24,12 @@
 
 // FILE: Special Ability.h ///////////////////////////////////////////////////////////////
 // Author: Kris Morness, July 2002
-// Desc:   This is the class that handles processing of any special attack from a unit. There are 
+// Desc:   This is the class that handles processing of any special attack from a unit. There are
 //         many different styles and rules for various attacks.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __SPECIAL_ABILITY_H_
-#define __SPECIAL_ABILITY_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/SpecialPowerModule.h"
 
@@ -65,5 +62,3 @@ class SpecialAbility : public SpecialPowerModule
 protected:
 
 };
-
-#endif  // end __SPECIAL_ABILITY_H_
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h
index f4a06f28b87..d7eca3b9942 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h
@@ -29,14 +29,11 @@
 
 #pragma once
 
-#ifndef __SPECIAL_ABILITY_UPDATE_H
-#define __SPECIAL_ABILITY_UPDATE_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/INI.h"
 #include "GameLogic/Module/SpecialPowerUpdateModule.h"
-#include "GameClient/ParticleSys.h"	
+#include "GameClient/ParticleSys.h"
 
 class DamageInfo;
 class SpecialPowerTemplate;
@@ -113,11 +110,11 @@ class SpecialAbilityUpdateModuleData : public UpdateModuleData
 		m_preTriggerUnstealthFrames = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			//Primary data values
 			{ "SpecialPowerTemplate",				INI::parseSpecialPowerTemplate,		NULL, offsetof( SpecialAbilityUpdateModuleData, m_specialPowerTemplate ) },
@@ -130,7 +127,7 @@ class SpecialAbilityUpdateModuleData : public UpdateModuleData
 			{ "PreTriggerUnstealthTime",	  INI::parseDurationUnsignedInt,		NULL, offsetof( SpecialAbilityUpdateModuleData, m_preTriggerUnstealthFrames ) },
 			{ "SkipPackingWithNoTarget",		INI::parseBool,										NULL, offsetof( SpecialAbilityUpdateModuleData, m_skipPackingWithNoTarget ) },
 			{ "PackUnpackVariationFactor",	INI::parseReal,										NULL, offsetof( SpecialAbilityUpdateModuleData, m_packUnpackVariationFactor ) },
- 
+
 			//Secondary data values
 			{ "SpecialObject",							INI::parseAsciiString,						NULL, offsetof( SpecialAbilityUpdateModuleData, m_specialObjectName ) },
 			{ "SpecialObjectAttachToBone",	INI::parseAsciiString,						NULL, offsetof( SpecialAbilityUpdateModuleData, m_specialObjectAttachToBoneName ) },
@@ -187,7 +184,7 @@ class SpecialAbilityUpdate : public UpdateModule, public SpecialPowerUpdateInter
 	// UpdateModule
 	virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; }
 	virtual CommandOption getCommandOption() const { return (CommandOption)0; }
-	virtual UpdateSleepTime update();	
+	virtual UpdateSleepTime update();
 
 	// ??? ugh, public stuff that shouldn't be -- hell yeah!
 	UnsignedInt getSpecialObjectCount() const;
@@ -250,13 +247,13 @@ class SpecialAbilityUpdate : public UpdateModule, public SpecialPowerUpdateInter
 
 	enum PackingState
 	{
-		STATE_NONE, 
-		STATE_PACKING, 
+		STATE_NONE,
+		STATE_PACKING,
 		STATE_UNPACKING,
-		STATE_PACKED,		
-		STATE_UNPACKED,	
+		STATE_PACKED,
+		STATE_UNPACKED,
 	};
-	
+
 	AudioEventRTS									m_prepSoundLoop;
 	UnsignedInt										m_prepFrames;
 	UnsignedInt										m_animFrames;	//Used for packing/unpacking unit before or after using ability.
@@ -274,5 +271,3 @@ class SpecialAbilityUpdate : public UpdateModule, public SpecialPowerUpdateInter
 	Bool													m_withinStartAbilityRange;
 	Bool													m_doDisableFXParticles;      // smaller targets cause this flag to toggle, making the particle effect more sparse
 };
-
-#endif // _SPECIAL_POWER_UPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h
index 34b3776f097..7d332abe483 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SPECIAL_POWER_COMPLETION_DIE_H_
-#define _SPECIAL_POWER_COMPLETION_DIE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "GameLogic/Module/DieModule.h"
@@ -49,11 +46,11 @@ class SpecialPowerCompletionDieModuleData : public DieModuleData
 		m_specialPowerTemplate = NULL;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     DieModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "SpecialPowerTemplate", INI::parseSpecialPowerTemplate,	NULL, offsetof( SpecialPowerCompletionDieModuleData, m_specialPowerTemplate ) },
 			{ 0, 0, 0, 0 }
@@ -80,7 +77,7 @@ class SpecialPowerCompletionDie : public DieModule
 	void setCreator( ObjectID creatorID );
 	void notifyScriptEngine( void );
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 protected:
 
@@ -89,6 +86,4 @@ class SpecialPowerCompletionDie : public DieModule
 
 };
 
-#endif // _SPECIAL_POWER_COMPLETION_DIE_H_
-
-// Creator is stored as ID, so a failed lookup just means that he died first and noone cares that we are going.
\ No newline at end of file
+// Creator is stored as ID, so a failed lookup just means that he died first and noone cares that we are going.
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h
index 59ebde16369..7d6d705f88c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SPECIAL_POWER_CREATE_H_
-#define _SPECIAL_POWER_CREATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CreateModule.h"
 
@@ -57,5 +54,3 @@ class SpecialPowerCreate : public CreateModule
 protected:
 
 };
-
-#endif // _SPECIAL_POWER_CREATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h
index ce437dcb651..00b87fac76c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SPECIALPOWERMODULE_H_
-#define __SPECIALPOWERMODULE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/Module.h"
@@ -67,7 +64,7 @@ class SpecialPowerModuleInterface
 	virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) = 0;
 	virtual void doSpecialPowerUsingWaypoints( const Waypoint *way, UnsignedInt commandOptions ) = 0;
 	virtual void markSpecialPowerTriggered( const Coord3D *location ) = 0;
-	virtual void startPowerRecharge() = 0;	
+	virtual void startPowerRecharge() = 0;
 	virtual const AudioEventRTS& getInitiateSound() const = 0;
 };
 
@@ -89,7 +86,7 @@ class SpecialPowerModuleData : public BehaviorModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class SpecialPowerModule : public BehaviorModule, 
+class SpecialPowerModule : public BehaviorModule,
 													 public SpecialPowerModuleInterface
 {
 
@@ -108,7 +105,7 @@ class SpecialPowerModule : public BehaviorModule,
 	Bool isModuleForPower( const SpecialPowerTemplate *specialPowerTemplate ) const;	///< is this module for the specified special power
 	Bool isReady( void ) const; 						///< is this special power available now
 //  This is the althernate way to one-at-a-time BlackLotus' specials; we'll keep it commented her until Dustin decides, or until 12/10/02
-//	Bool isBusy( void ) const { return FALSE; } 
+//	Bool isBusy( void ) const { return FALSE; }
 
 	Real getPercentReady( void ) const;		///< get the percent ready (1.0 = ready now, 0.5 = half charged up etc.)
 
@@ -139,13 +136,13 @@ class SpecialPowerModule : public BehaviorModule,
 
 	/**
 	 Now, there are special powers that require some preliminary processing before the actual
-	 special power triggers. When the ini setting "UpdateModuleStartsAttack" is true, then 
-	 the update module will call the doSpecialPower a second time. This function then resets 
+	 special power triggers. When the ini setting "UpdateModuleStartsAttack" is true, then
+	 the update module will call the doSpecialPower a second time. This function then resets
 	 the power recharge, and tells the scriptengine that the attack has started.
-	 
-	 A good example of something that uses this is the Black Lotus - capture building hack attack. 
-	 When the user initiates the attack, the doSpecialPower is called, which triggers the update 
-	 module. The update module then orders the unit to move within range, and it isn't until the 
+
+	 A good example of something that uses this is the Black Lotus - capture building hack attack.
+	 When the user initiates the attack, the doSpecialPower is called, which triggers the update
+	 module. The update module then orders the unit to move within range, and it isn't until the
 	 hacker start the physical attack, that the timer is reset and the attack technically begins.
 	*/
 	virtual void markSpecialPowerTriggered( const Coord3D *location );
@@ -169,6 +166,3 @@ class SpecialPowerModule : public BehaviorModule,
 	Real m_pausedPercent;
 
 };
-
-#endif  // end __SPECIALPOWERMODULE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h
index adc89c1f8ad..41f95ad25df 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SPECIAL_POWER_UPDATE_MODULE_H
-#define __SPECIAL_POWER_UPDATE_MODULE_H
-
 #include "Common/Module.h"
 #include "Common/GameType.h"
 
@@ -49,5 +46,3 @@ class SpecialPowerUpdateInterface
 	virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) = 0;
 	virtual Bool isPowerCurrentlyInUse( const CommandButton *command = NULL ) const = 0;
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h
index 8c7b9e33119..09afaa62818 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SPY_VISION_SPECIAL_POWER_H_
-#define __SPY_VISION_SPECIAL_POWER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/SpecialPowerModule.h"
 
@@ -73,5 +70,3 @@ class SpyVisionSpecialPower : public SpecialPowerModule
 protected:
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h
index d860f74a173..8f294cd5296 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h
@@ -24,16 +24,13 @@
 
 // FILE: SpyVisionUpdate.h /////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, September 2002
-// Desc:   Special Power will spy on the vision of all enemy players.  
+// Desc:   Special Power will spy on the vision of all enemy players.
 //				Putting a SpecialPower in a behavior takes a big huge amount of code duplication and
 //				has no precedent.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef _SPY_VISION_UPDATE_H
-#define _SPY_VISION_UPDATE_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -73,6 +70,3 @@ class SpyVisionUpdate : public UpdateModule
 
 	UnsignedInt m_deactivateFrame;
 };
-
-#endif 
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h
index 1bd3fd6f451..b8ea5018475 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SquishCollide_H_
-#define __SquishCollide_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CollideModule.h"
 
@@ -58,6 +55,3 @@ class SquishCollide : public CollideModule
 protected:
 
 };
-
-#endif // __SquishCollide_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h
index f8f38a6a6fb..6e572c40c38 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h
@@ -24,12 +24,12 @@
 
 // FILE: StatusBitsUpgrade.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	May 2002
@@ -37,17 +37,14 @@
 //	Filename: 	StatusBitsUpgrade.h
 //
 //	author:		Steven Johnson
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __StatusBitsUpgrade_H_
-#define __StatusBitsUpgrade_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -106,7 +103,3 @@ class StatusBitsUpgrade : public UpgradeModule
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __StatusBitsUpgrade_H_
-
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h
index f17e759696d..3790710fc42 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __STEALTHDETECTOR_UPDATE_H_
-#define __STEALTHDETECTOR_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -97,7 +94,3 @@ class StealthDetectorUpdate : public UpdateModule
 	Bool m_enabled;
 
 };
-
-
-#endif	// __STEALTHDETECTOR_UPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
index 1ebc3991379..649e36d3593 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __STEALTH_UPDATE_H_
-#define __STEALTH_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -52,7 +49,7 @@ enum
 };
 
 #ifdef DEFINE_STEALTHLEVEL_NAMES
-static const char *TheStealthLevelNames[] = 
+static const char *const TheStealthLevelNames[] =
 {
 	"ATTACKING",
 	"MOVING",
@@ -88,11 +85,8 @@ class StealthUpdateModuleData : public UpdateModuleData
 
 	StealthUpdateModuleData()
 	{
-		//Added By Sadullah Nader
-		//Initialization(s) inserted
 		m_disguiseFX = NULL;
 		m_disguiseRevealFX = NULL;
-		//
 		m_stealthDelay		= UINT_MAX;
 		m_stealthLevel		= 0;
 		m_stealthSpeed		= 0.0f;
@@ -155,7 +149,7 @@ class StealthUpdate : public UpdateModule
 	UnsignedInt						m_stealthAllowedFrame;
 	UnsignedInt						m_detectionExpiresFrame;
 	Bool									m_enabled;
-	
+
 	Real                  m_pulsePhaseRate;
 	Real                  m_pulsePhase;
 
@@ -171,7 +165,3 @@ class StealthUpdate : public UpdateModule
 	Bool									m_xferRestoreDisguise;			//Tells us we need to restore our disguise
 
 };
-
-
-#endif 
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h
index 58c646b043c..d6a860c17c9 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __STEALTH_UPGRADE_H_
-#define __STEALTH_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -57,7 +54,3 @@ class StealthUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h
index db14a38ee0d..a9f089efa3c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __STICK_BOMB_UPDATE_H
-#define __STICK_BOMB_UPDATE_H
-
 #include "GameLogic/Module/UpdateModule.h"
 
 //-------------------------------------------------------------------------------------------------
@@ -47,10 +44,10 @@ class StickyBombUpdateModuleData : public UpdateModuleData
 		m_offsetZ = 10.0f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "AttachToTargetBone",	INI::parseAsciiString,						NULL, offsetof( StickyBombUpdateModuleData, m_attachToBone ) },
 			{ "OffsetZ",						INI::parseReal,						NULL, offsetof( StickyBombUpdateModuleData, m_offsetZ ) },
@@ -89,6 +86,3 @@ class StickyBombUpdate : public UpdateModule
 	UnsignedInt		m_dieFrame;
 	UnsignedInt   m_nextPingFrame;
 };
-
-#endif // __STICK_BOMB_UPDATE_H
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h
index 8c3c1e41835..33f8ff3b78f 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __STRUCTUREBODY_H_
-#define __STRUCTUREBODY_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ActiveBody.h"
 
@@ -40,16 +37,16 @@
 class Object;
 
 //-------------------------------------------------------------------------------------------------
-class StructureBodyModuleData : public ActiveBodyModuleData 
+class StructureBodyModuleData : public ActiveBodyModuleData
 {
 public:
 
-	StructureBodyModuleData(){}	
+	StructureBodyModuleData(){}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     ActiveBodyModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ 0, 0, 0, 0 }
 		};
@@ -79,6 +76,3 @@ class StructureBody : public ActiveBody
 	ObjectID m_constructorObjectID;					///< object that built this structure
 
 };
-
-#endif // __STRUCTUREBODY_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h
index 1a549646465..13c1919e7f1 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __StructureCollapseUpdate_H_
-#define __StructureCollapseUpdate_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -53,7 +50,7 @@ enum StructureCollapsePhaseType CPP_11(: Int)
 	SCPHASE_BURST,
 	SCPHASE_FINAL,
 
-	SC_PHASE_COUNT	// keep last
+	SC_PHASE_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -78,9 +75,6 @@ class StructureCollapseUpdateModuleData : public UpdateModuleData
 		m_minCollapseDelay = 0;
 		m_maxCollapseDelay = 0;
 		m_minBurstDelay = 9999;
-		//Removed by Sadullah Nader
-		//Redundancy from above
-		//m_minBurstDelay = 9999;
 		m_maxShudder = 0;
 		m_collapseDamping = 0.0;
 		m_bigBurstFrequency = 0;
@@ -134,14 +128,14 @@ class StructureCollapseUpdate : public UpdateModule,
 
 	void doPhaseStuff(StructureCollapsePhaseType scphase, const Coord3D *target);
 
-	enum StructureCollapseStateType 
+	enum StructureCollapseStateType
 	{
 		COLLAPSESTATE_STANDING,
 		COLLAPSESTATE_WAITINGFORCOLLAPSESTART,
 		COLLAPSESTATE_COLLAPSING,
 		COLLAPSESTATE_DONE
 	};
-	
+
 	UnsignedInt									m_collapseFrame;
 	UnsignedInt									m_burstFrame;
 	StructureCollapseStateType	m_collapseState;
@@ -149,6 +143,3 @@ class StructureCollapseUpdate : public UpdateModule,
 	Real												m_currentHeight;
 
 };
-
-#endif // __StructureCollapseUpdate_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
index c154205643e..eeb21ea77a7 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __StructureToppleUpdate_H_
-#define __StructureToppleUpdate_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -46,7 +43,7 @@ class ObjectCreationList;
 typedef std::vector<const ObjectCreationList*> OCLVec;
 
 //-------------------------------------------------------------------------------------------------
-struct FXBoneInfo 
+struct FXBoneInfo
 {
 	AsciiString boneName;
 	const ParticleSystemTemplate* particleSystemTemplate;
@@ -70,10 +67,10 @@ enum StructureTopplePhaseType CPP_11(: Int)
 	STPHASE_DELAY,
 	STPHASE_FINAL,
 
-	ST_PHASE_COUNT	// keep last
+	ST_PHASE_COUNT
 };
 
-static const char *TheStructureTopplePhaseNames[] = 
+static const char *const TheStructureTopplePhaseNames[] =
 {
 	"INITIAL",
 	"DELAY",
@@ -81,6 +78,7 @@ static const char *TheStructureTopplePhaseNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheStructureTopplePhaseNames) == ST_PHASE_COUNT + 1, "Incorrect array size");
 
 //-------------------------------------------------------------------------------------------------
 class StructureToppleUpdateModuleData : public UpdateModuleData
@@ -120,7 +118,6 @@ class StructureToppleUpdateModuleData : public UpdateModuleData
 		m_toppleDoneFXList = NULL;
 		m_toppleFXList = NULL;
 		m_crushingFXList = NULL;
-		m_crushingWeaponName.set("");
 
 		for (int i = 0; i < ST_PHASE_COUNT; ++i)
 		{
@@ -182,7 +179,7 @@ class StructureToppleUpdate : public UpdateModule,
 		TOPPLESTATE_WAITINGFORDONE,
 		TOPPLESTATE_DONE
 	};
-	
+
 	UnsignedInt m_toppleFrame;
 	Coord2D m_toppleDirection;
 	StructureToppleStateType m_toppleState;
@@ -195,6 +192,3 @@ class StructureToppleUpdate : public UpdateModule,
 	Real m_buildingHeight;
 
 };
-
-#endif // __StructureToppleUpdate_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h
index 87e7ca1b673..dfc24b45e12 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h
@@ -24,12 +24,12 @@
 
 // FILE: SubObjectsUpgrade.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	September 2002
@@ -37,7 +37,7 @@
 //	Filename: SubObjectsUpgrade.cpp
 //
 //	Author:		Kris Morness
-//	
+//
 //	Purpose:	Shows or hides a list of subobjects based on upgrade statii. It
 //            will override any animation subobjects states.
 //
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __SUB_OBJECTS_UPGRADE_H
-#define __SUB_OBJECTS_UPGRADE_H
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -88,7 +85,3 @@ class SubObjectsUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return true; }
 
 };
-
-#endif
-
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h
index e756aed35db..8f18f034c13 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_CENTER_CREATE_H_
-#define _SUPPLY_CENTER_CREATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CreateModule.h"
 
@@ -57,5 +54,3 @@ class SupplyCenterCreate : public CreateModule
 protected:
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h
index 4724d28faab..fea5c20041c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_CENTER_DOCK_UPDATE_H_
-#define _SUPPLY_CENTER_DOCK_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "Common/GameMemory.h"
@@ -45,7 +42,7 @@ class SupplyCenterDockUpdateModuleData : public DockUpdateModuleData
 public:
 
   SupplyCenterDockUpdateModuleData( void );
-	
+
 	static void buildFieldParse(MultiIniFieldParse& p);
 };
 
@@ -70,5 +67,3 @@ class SupplyCenterDockUpdate : public DockUpdate
 
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h
index d94b3bb907f..ba9d02f11f4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_CENTER_PRODUCTION_EXIT_UPDATE_H
-#define _SUPPLY_CENTER_PRODUCTION_EXIT_UPDATE_H
-
 #include "GameLogic/Module/UpdateModule.h"
 
 class Object;
@@ -50,10 +47,10 @@ class SupplyCenterProductionExitUpdateModuleData : public UpdateModuleData
 		m_naturalRallyPoint.zero();
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UnitCreatePoint",		INI::parseCoord3D,		NULL, offsetof( SupplyCenterProductionExitUpdateModuleData, m_unitCreatePoint ) },
 			{ "NaturalRallyPoint",  INI::parseCoord3D,		NULL, offsetof( SupplyCenterProductionExitUpdateModuleData, m_naturalRallyPoint ) },
@@ -112,6 +109,3 @@ inline const Coord3D *SupplyCenterProductionExitUpdate::getRallyPoint( void ) co
 
 	return NULL;
 }
-
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h
index 635e65cb72e..6bb66bb7531 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_TRUCK_AI_UPDATE_H_
-#define _SUPPLY_TRUCK_AI_UPDATE_H_
-
 #include "Common/StateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -60,7 +57,7 @@ class SupplyTruckStateMachine : public StateMachine
 //-------------------------------------------------------------------------------------------------
 class SupplyTruckWantsToPickUpOrDeliverBoxesState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckWantsToPickUpOrDeliverBoxesState, "SupplyTruckWantsToPickUpOrDeliverBoxesState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckWantsToPickUpOrDeliverBoxesState, "SupplyTruckWantsToPickUpOrDeliverBoxesState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -78,7 +75,7 @@ EMPTY_DTOR(SupplyTruckWantsToPickUpOrDeliverBoxesState)
 //-------------------------------------------------------------------------------------------------
 class RegroupingState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RegroupingState, "RegroupingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RegroupingState, "RegroupingState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -95,7 +92,7 @@ EMPTY_DTOR(RegroupingState)
 //-------------------------------------------------------------------------------------------------
 class DockingState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DockingState, "DockingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DockingState, "DockingState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -137,11 +134,11 @@ class SupplyTruckAIUpdateModuleData : public AIUpdateModuleData
 		m_warehouseScanDistance = 100;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     AIUpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MaxBoxes",					INI::parseInt,		NULL, offsetof( SupplyTruckAIUpdateModuleData, m_maxBoxesData ) },
 			{ "SupplyCenterActionDelay", INI::parseDurationUnsignedInt, NULL, offsetof( SupplyTruckAIUpdateModuleData, m_centerDelay ) },
@@ -210,7 +207,7 @@ class SupplyTruckAIUpdate : public AIUpdateInterface, public SupplyTruckAIInterf
 	virtual void setForceWantingState(Bool v) { m_forcePending = v; } // When a Supply Center creates us (or maybe other sources later), we need to hop into autopilot mode.
 	virtual Bool isForcedIntoWantingState() const { return m_forcePending; }
 
-	virtual void setForceBusyState(Bool v) { m_forcedBusyPending = v; } 
+	virtual void setForceBusyState(Bool v) { m_forcedBusyPending = v; }
 	virtual Bool isForcedIntoBusyState() const { return m_forcedBusyPending; }
 
 	virtual ObjectID getPreferredDockID() const { return m_preferredDock; }
@@ -222,18 +219,16 @@ class SupplyTruckAIUpdate : public AIUpdateInterface, public SupplyTruckAIInterf
 
 	virtual AIStateMachine* makeStateMachine();
 	virtual void privateDock( Object *obj, CommandSourceType cmdSource );
-	virtual void privateIdle(CommandSourceType cmdSource);						///< Enter idle state.	
+	virtual void privateIdle(CommandSourceType cmdSource);						///< Enter idle state.
 
 private:
 	SupplyTruckStateMachine*	m_supplyTruckStateMachine;
 	ObjectID									m_preferredDock;			///< Instead of searching, try this one first
 	Int												m_numberBoxes;
-	Bool											m_forcePending;				// To prevent a function from doing a setState, 
+	Bool											m_forcePending;				// To prevent a function from doing a setState,
 																									// forceWanting will latch into here until serviced.
 	Bool											m_forcedBusyPending;	// A supply truck can't tell the difference between Idle since
 																									// I'm between docking states, or a Stop command without help.
  	AudioEventRTS m_suppliesDepletedVoice;						///< Sound played when I take the last box.
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h
index 18668ae3f22..382a01be5a5 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_WAREHOUSE_CREATE_H_
-#define _SUPPLY_WAREHOUSE_CREATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CreateModule.h"
 
@@ -56,6 +53,3 @@ class SupplyWarehouseCreate : public CreateModule
 protected:
 
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h
index 444fa9289cc..18b6e9440bc 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_WAREHOUSE_CRIPPLING_BEHAVIOR_H
-#define _SUPPLY_WAREHOUSE_CRIPPLING_BEHAVIOR_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DamageModule.h"
@@ -56,7 +53,7 @@ class SupplyWarehouseCripplingBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class SupplyWarehouseCripplingBehavior : public UpdateModule, 
+class SupplyWarehouseCripplingBehavior : public UpdateModule,
 																				 public DamageModuleInterface
 {
 
@@ -90,6 +87,3 @@ class SupplyWarehouseCripplingBehavior : public UpdateModule,
 	UnsignedInt		m_healingSupressedUntilFrame;
 	UnsignedInt		m_nextHealingFrame;
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h
index 6a6de51e7c0..b91526d912a 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_WAREHOUSE_DOCK_UPDATE_H_
-#define _SUPPLY_WAREHOUSE_DOCK_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "Common/GameMemory.h"
@@ -44,7 +41,7 @@ class SupplyWarehouseDockUpdateModuleData : public DockUpdateModuleData
 public:
 
   SupplyWarehouseDockUpdateModuleData( void );
-	
+
 	static void buildFieldParse(MultiIniFieldParse& p);
 
 	Int m_startingBoxesData;
@@ -78,5 +75,3 @@ class SupplyWarehouseDockUpdate : public DockUpdate
 	Int m_boxesStored;
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h
index b9eece4b9fd..11354d2e810 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __TECH_BUILDING_BEHAVIOR_H_
-#define __TECH_BUILDING_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -80,5 +77,3 @@ class TechBuildingBehavior : public UpdateModule,
 protected:
 
 };
-
-#endif  // end __TECH_BUILDING_BEHAVIOR_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h
index b15fbb8e553..6513153d789 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __TENSILEFORMATIONUPDATE_H_
-#define __TENSILEFORMATIONUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -49,7 +46,7 @@ class TensileFormationUpdateModuleData: public UpdateModuleData
 	static void buildFieldParse(MultiIniFieldParse& p);
 
 	Bool m_enabled;							///< enabled
-	AudioEventRTS				m_crackSound;						
+	AudioEventRTS				m_crackSound;
 
 };
 
@@ -83,12 +80,10 @@ class TensileFormationUpdate : public UpdateModule
 	Coord3D m_inertia;
 	Bool m_enabled;			///< enabled
 	Bool m_linksInited;
-	UnsignedInt m_motionlessCounter; 
+	UnsignedInt m_motionlessCounter;
 	UnsignedInt m_life;
 	Real m_lowestSlideElevation;
 
-	AudioEventRTS				m_crackSound;						
+	AudioEventRTS				m_crackSound;
 
 };
-
-#endif  // end __TENSILEFORMATIONUPDATE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h
index 3931ee08909..f2e029c3ef0 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: ToppleUpdate.h /////////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:   
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __TOPPLEUPDATE_H_
-#define __TOPPLEUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/CollideModule.h"
@@ -95,8 +92,8 @@ class ToppleUpdate : public UpdateModule,
 	Bool isAbleToBeToppled() const;
 
 	// UpdateModuleInterface
-	virtual UpdateSleepTime update();	
-	
+	virtual UpdateSleepTime update();
+
 	// CollideModuleInterface
 	virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal );
 	/// this is used for things like pilots, to determine if they can "enter" something
@@ -127,6 +124,3 @@ class ToppleUpdate : public UpdateModule,
 	ObjectID			m_stumpID;								///< stump generated, if any
 
 };
-
-#endif // end __TOPPLEUPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h
index 1fe7ba8875f..6bdd3318c01 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h
@@ -29,12 +29,9 @@
 
 #pragma once
 
-#ifndef __TRANSITIONDAMAGEFX_H_
-#define __TRANSITIONDAMAGEFX_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/ParticleSys.h"
-#include "GameLogic/Module/DamageModule.h" 
+#include "GameLogic/Module/DamageModule.h"
 #include "GameLogic/Module/BodyModule.h"
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
@@ -49,7 +46,7 @@ class ParticleSystemTemplate;
 enum { DAMAGE_MODULE_MAX_FX = 12 };
 
 typedef Char FXDamageLocType;
-enum 
+enum
 {
 	FX_DAMAGE_LOC_TYPE_BONE  = 0,
 	FX_DAMAGE_LOC_TYPE_COORD = 1
@@ -98,11 +95,11 @@ class TransitionDamageFXModuleData : public DamageModuleData
 
 	TransitionDamageFXModuleData( void );
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     DamageModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 
 			{ "DamageFXTypes",				INI::parseDamageTypeFlags, NULL, offsetof( TransitionDamageFXModuleData, m_damageFXTypes ) },
@@ -253,8 +250,8 @@ class TransitionDamageFX : public DamageModule
 
 	virtual void onDamage( DamageInfo *damageInfo ) { }
 	virtual void onHealing( DamageInfo *damageInfo ) { }
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState );
 
 protected:
@@ -263,5 +260,3 @@ class TransitionDamageFX : public DamageModule
 	ParticleSystemID m_particleSystemID[ BODYDAMAGETYPE_COUNT ][ DAMAGE_MODULE_MAX_FX ];
 
 };
-
-#endif  // end __TRANSITIONDAMAGEFX
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h
index 2afb244b017..6ef47631dc6 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h
@@ -23,18 +23,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // TransportAIUpdate.cpp //////////
-// Needs to check legality of evacuate, and may move to a place that is better to evacuate at 
+// Needs to check legality of evacuate, and may move to a place that is better to evacuate at
 // Author: Graham Smallwood, July 2002
- 
-#pragma once
 
-#ifndef _TRANSPORT_AI_UPDATE_H_
-#define _TRANSPORT_AI_UPDATE_H_
+#pragma once
 
 #include "GameLogic/Module/AIUpdate.h"
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Soldier behavior implementation.
  * Override or extend AIUpdate methods to customize the Soldier's behavior.
  */
@@ -65,6 +62,3 @@ class TransportAIUpdate : public AIUpdateInterface
 	virtual void privateAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource );///< Extension.  Also tell occupants to attackPosition
 	virtual void privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource );///< Extension.  Also tell occupants to forceAttackObject
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h
index 5197dbf2d94..1c0bf819144 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __TransportContain_H_
-#define __TransportContain_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 
@@ -102,12 +99,9 @@ class TransportContain : public OpenContain
 private:
 
 	void createPayload();
-	
-	Bool m_payloadCreated;	
+
+	Bool m_payloadCreated;
 	Int m_extraSlotsInUse;
 	UnsignedInt m_frameExitNotBusy;
 
 };
-
-#endif // __TransportContain_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h
index c76b2961baf..e164131f880 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __TUNNEL_CONTAIN_H_
-#define __TUNNEL_CONTAIN_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 #include "GameLogic/Module/HealContain.h"
@@ -62,11 +59,11 @@ class TunnelContainModuleData : public OpenContainModuleData
 
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     OpenContainModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "TimeForFullHeal", INI::parseDurationReal, NULL, offsetof( TunnelContainModuleData, m_framesForFullHeal ) },
 			{ 0, 0, 0, 0 }
@@ -80,7 +77,7 @@ class TunnelContain : public OpenContain, public CreateModuleInterface
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TunnelContain, "TunnelContain" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( TunnelContain, TunnelContainModuleData )
-	
+
 public:
 
 	TunnelContain( Thing *thing, const ModuleData* moduleData );
@@ -98,6 +95,8 @@ class TunnelContain : public OpenContain, public CreateModuleInterface
 	virtual void onRemoving( Object *obj );			///< object no longer contains 'obj'
 	virtual void onSelling();///< Container is being sold.  Tunnel responds by kicking people out if this is the last tunnel.
 
+	virtual void orderAllPassengersToExit( CommandSourceType commandSource ); ///< All of the smarts of exiting are in the passenger's AIExit. removeAllFrommContain is a last ditch system call, this is the game Evacuate
+
 	virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const;
 	virtual void addToContainList( Object *obj );		///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved)
 	virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE );	///< remove 'obj' from contain list
@@ -107,7 +106,8 @@ class TunnelContain : public OpenContain, public CreateModuleInterface
 	virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse );
 	virtual UnsignedInt getContainCount() const;
 	virtual Int getContainMax( void ) const;
-	virtual const ContainedItemsList* getContainedItemsList() const;	
+	virtual const ContainedItemsList* getContainedItemsList() const;
+	virtual UnsignedInt getFullTimeForHeal(void) const; ///< Returns the time in frames until a contained object becomes fully healed
 	virtual Bool isDisplayedOnControlBar() const { return TRUE; } ///< Does this container display its contents on the ControlBar?
 	virtual Bool isKickOutOnCapture(){ return FALSE; }///< Caves and Tunnels don't kick out on capture.
 
@@ -119,15 +119,13 @@ class TunnelContain : public OpenContain, public CreateModuleInterface
 	virtual void onBuildComplete();	///< This is called when you are a finished game object
 	virtual Bool shouldDoOnBuildComplete() const { return m_needToRunOnBuildComplete; }
 
-	// so that the ppl within the tunnel network can get healed	
+	// so that the ppl within the tunnel network can get healed
 	virtual UpdateSleepTime update();												///< called once per frame
 
 protected:
 
 	void scatterToNearbyPosition(Object* obj);
-	Bool m_needToRunOnBuildComplete; 
+	Bool m_needToRunOnBuildComplete;
 	Bool m_isCurrentlyRegistered; ///< Keeps track if this is registered with the player, so we don't double remove and mess up
 
 };
-
-#endif  // end __TUNNEL_CONTAIN_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h
index 5317985932e..905ae7d740e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef UNIT_CRATE_COLLIDE_H_
-#define UNIT_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -49,14 +46,13 @@ class UnitCrateCollideModuleData : public CrateCollideModuleData
 	UnitCrateCollideModuleData()
 	{
 		m_unitCount = 0;
-		m_unitType = "";
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UnitCount",	INI::parseUnsignedInt,	NULL, offsetof( UnitCrateCollideModuleData, m_unitCount ) },
 			{ "UnitName",		INI::parseAsciiString,	NULL, offsetof( UnitCrateCollideModuleData, m_unitType ) },
@@ -84,5 +80,3 @@ class UnitCrateCollide : public CrateCollide
 protected:
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h
index 0efd427ac58..f277ccaec55 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h
@@ -24,16 +24,13 @@
 
 // FILE: UnpauseSpecialPowerUpgrade.h ///////////////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, August 2002
-// Desc:	 An upgrade that starts the timer on a Special Power module, so you can have them 
+// Desc:	 An upgrade that starts the timer on a Special Power module, so you can have them
 // dependent on upgrades on the logic side, like NEED_UPGRADE does on the client side by disabling
 // the button.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __UNPAUSE_SPECIAL_POWER_UPGRADE_H_
-#define __UNPAUSE_SPECIAL_POWER_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -75,6 +72,3 @@ class UnpauseSpecialPowerUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-#endif 
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
index 05fbc91da52..f5e7c462ea6 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
@@ -24,14 +24,11 @@
 
 // FILE: UpdateModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __UpdateModule_H_
-#define __UpdateModule_H_
-
 #include "Common/Module.h"
 #include "Common/GameType.h"
 #include "Common/DisabledTypes.h"
@@ -67,8 +64,8 @@ class Waypoint;
 enum CommandOption CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
-enum UpdateSleepTime CPP_11(: Int) 
-{ 
+enum UpdateSleepTime CPP_11(: Int)
+{
 	UPDATE_SLEEP_INVALID	= 0,
 	UPDATE_SLEEP_NONE			= 1,
 	// (we use 0x3fffffff so that we can add offsets and not overflow...
@@ -93,7 +90,7 @@ enum SleepyUpdatePhase CPP_11(: Int)
 	PHASE_NORMAL				= 2,
 	PHASE_FINAL					= 3
 };
-	
+
 //-------------------------------------------------------------------------------------------------
 class UpdateModuleInterface
 {
@@ -104,8 +101,8 @@ class UpdateModuleInterface
 	virtual DisabledMaskType getDisabledTypesToProcess() const = 0;
 
 #ifdef DIRECT_UPDATEMODULE_ACCESS
-	// these aren't in the interface; they are in the implementation, 
-	// because making them virtual is simply too much overhead. 
+	// these aren't in the interface; they are in the implementation,
+	// because making them virtual is simply too much overhead.
 	// no, really; I have the profiling data to prove it. (srj)
 #else
 	// these are for use ONLY by GameLogic scheduler. do not call otherwise,
@@ -125,7 +122,7 @@ class UpdateModuleData : public BehaviorModuleData
 {
 public:
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
 		BehaviorModuleData::buildFieldParse(p);
 	}
@@ -143,7 +140,7 @@ class UpdateModule : public BehaviorModule, public UpdateModuleInterface
 
 	// this is an absolute frame, not a frame count.
 	// actually, it's not a real frame at all, it has phase info in the lower bits...
-	UnsignedInt m_nextCallFrameAndPhase;	
+	UnsignedInt m_nextCallFrameAndPhase;
 	Int m_indexInLogic;
 
 protected:
@@ -177,67 +174,67 @@ class UpdateModule : public BehaviorModule, public UpdateModuleInterface
 	// UpdateModuleInterface
 	virtual UpdateSleepTime update() = 0;
 
-	DisabledMaskType getDisabledTypesToProcess() const 
-	{ 
-		return DISABLEDMASK_NONE; 
+	DisabledMaskType getDisabledTypesToProcess() const
+	{
+		return DISABLEDMASK_NONE;
 	}
 
 #ifdef DIRECT_UPDATEMODULE_ACCESS
 	#define UPDATEMODULE_FRIEND_DECLARATOR __forceinline
 #else
-	#define UPDATEMODULE_FRIEND_DECLARATOR virtual 
+	#define UPDATEMODULE_FRIEND_DECLARATOR virtual
 #endif
 
 	// for use ONLY by GameLogic scheduler. do not call otherwise.
-	UPDATEMODULE_FRIEND_DECLARATOR UnsignedInt friend_getPriority() const 
-	{ 
-		return m_nextCallFrameAndPhase; 
+	UPDATEMODULE_FRIEND_DECLARATOR UnsignedInt friend_getPriority() const
+	{
+		return m_nextCallFrameAndPhase;
 	}
 
-	UPDATEMODULE_FRIEND_DECLARATOR UnsignedInt friend_getNextCallFrame() const 
-	{ 
-		return m_nextCallFrameAndPhase >> 2; 
+	UPDATEMODULE_FRIEND_DECLARATOR UnsignedInt friend_getNextCallFrame() const
+	{
+		return m_nextCallFrameAndPhase >> 2;
 	}
 
-	UPDATEMODULE_FRIEND_DECLARATOR SleepyUpdatePhase friend_getNextCallPhase() const 
-	{ 
-		return (SleepyUpdatePhase)(m_nextCallFrameAndPhase & 3); 
+	UPDATEMODULE_FRIEND_DECLARATOR SleepyUpdatePhase friend_getNextCallPhase() const
+	{
+		return (SleepyUpdatePhase)(m_nextCallFrameAndPhase & 3);
 	}
 
-	UPDATEMODULE_FRIEND_DECLARATOR void friend_setNextCallFrame(UnsignedInt frame) 
-	{ 
+	UPDATEMODULE_FRIEND_DECLARATOR void friend_setNextCallFrame(UnsignedInt frame)
+	{
 		// anything greater than "forever" is still "forever"
 		// (this makes setWakeFrame() comparisons simpler and more efficient)
 		if (frame > UPDATE_SLEEP_FOREVER)
 			frame = UPDATE_SLEEP_FOREVER;
-		m_nextCallFrameAndPhase = (frame << 2) | getUpdatePhase(); 
+		m_nextCallFrameAndPhase = (frame << 2) | getUpdatePhase();
 	}
 
-	UPDATEMODULE_FRIEND_DECLARATOR Int friend_getIndexInLogic() const 
-	{ 
-		return m_indexInLogic; 
+	UPDATEMODULE_FRIEND_DECLARATOR Int friend_getIndexInLogic() const
+	{
+		return m_indexInLogic;
 	}
 
 	UPDATEMODULE_FRIEND_DECLARATOR void friend_setIndexInLogic(Int i)
-	{ 
-		m_indexInLogic = i; 
+	{
+		m_indexInLogic = i;
 	}
 
-	UPDATEMODULE_FRIEND_DECLARATOR const Object* friend_getObject() const 
-	{ 
-		return getObject(); 
+	UPDATEMODULE_FRIEND_DECLARATOR const Object* friend_getObject() const
+	{
+		return getObject();
 	}
 
 };
-inline UpdateModule::UpdateModule( Thing *thing, const ModuleData* moduleData ) : 
+inline UpdateModule::UpdateModule( Thing *thing, const ModuleData* moduleData ) :
 	BehaviorModule( thing, moduleData ),
 	m_indexInLogic(-1),
-	m_nextCallFrameAndPhase(0) 
-{ 
+	m_nextCallFrameAndPhase(0)
+{
 	// nothing
 }
-inline UpdateModule::~UpdateModule() 
-{ 
+inline UpdateModule::~UpdateModule()
+{
 	DEBUG_ASSERTCRASH(m_indexInLogic == -1, ("destroying an updatemodule still in the logic list"));
 }
 
@@ -289,8 +286,8 @@ class DockUpdateInterface
 	*/
 	virtual Bool advanceApproachPosition( Object* docker, Coord3D *position, Int *index ) = 0;
 
-	/** Return true when it is OK for docker to begin entering the dock 
-			The Dock will lift the restriction on one particular docker on its own, 
+	/** Return true when it is OK for docker to begin entering the dock
+			The Dock will lift the restriction on one particular docker on its own,
 			so you must continually ask.
 	*/
 	virtual Bool isClearToEnter( Object const* docker ) const = 0;
@@ -302,19 +299,19 @@ class DockUpdateInterface
 
 	/** Give me the point that is the start of your docking path
 			Returning NULL means there is none free
-			All functions take docker as arg so we could have multiple docks on a building.  
+			All functions take docker as arg so we could have multiple docks on a building.
 			Docker is not assumed, it is recorded and checked.
 	*/
-	virtual void getEnterPosition( Object* docker, Coord3D *position ) = 0;			
+	virtual void getEnterPosition( Object* docker, Coord3D *position ) = 0;
 
-	/** Give me the middle point of the dock process where the action() happens */	
-	virtual void getDockPosition( Object* docker, Coord3D *position ) = 0;					
+	/** Give me the middle point of the dock process where the action() happens */
+	virtual void getDockPosition( Object* docker, Coord3D *position ) = 0;
 
 	/** Give me the point to drive to when I am done */
-	virtual void getExitPosition( Object* docker, Coord3D *position ) = 0;					
+	virtual void getExitPosition( Object* docker, Coord3D *position ) = 0;
 
-	virtual void onApproachReached( Object* docker ) = 0;		///< I have reached the Enter Point.  
-	virtual void onEnterReached( Object* docker ) = 0;			///< I have reached the Enter Point.  
+	virtual void onApproachReached( Object* docker ) = 0;		///< I have reached the Enter Point.
+	virtual void onEnterReached( Object* docker ) = 0;			///< I have reached the Enter Point.
 	virtual void onDockReached( Object* docker ) = 0;				///< I have reached the Dock point
 	virtual void onExitReached( Object* docker ) = 0;				///< I have reached the exit.  You are no longer busy
 
@@ -324,11 +321,11 @@ class DockUpdateInterface
 
 	virtual Bool isDockOpen( void ) = 0;						///< Is the dock open to accepting dockers
 	virtual void setDockOpen( Bool open ) = 0;			///< Open/Close the dock
-	
+
 	virtual void setDockCrippled( Bool setting ) = 0; ///< Game Logic can set me as inoperative.  I get to decide what that means.
 
 	virtual Bool isAllowPassthroughType() = 0;	///< Not all docks allow you to path through them in your AIDock machine
-	
+
 	virtual Bool isRallyPointAfterDockType() = 0; ///< A minority of docks want to give you a final command to their rally point
 };
 
@@ -349,14 +346,14 @@ enum ExitDoorType CPP_11(: Int)
 //-------------------------------------------------------------------------------------------------
 ///< Different types of modules have an interest in exiting units out of themselves for whatever reason.
 class ExitInterface
-{ 
+{
 public:
 	virtual Bool isExitBusy() const = 0;	///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check.
 	virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) = 0;		///< All types can answer if they are free to exit or not, and you can ask about a specific guy or just exit anything in general
 	virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) = 0;							///< Here is the object for you to exit to the world in your own special way
 	virtual void exitObjectByBudding( Object *newObj, Object *budHost ) = 0;	///< puts new spawn on top of an existing one
 	virtual void unreserveDoorForExit( ExitDoorType exitDoor ) = 0;	///< if you get permission to exit, but then don't/can't call exitObjectViaDoor, you should call this to "give up" your permission
-	
+
 	virtual void exitObjectInAHurry( Object *newObj) {}; ///< Special call for objects exiting a tunnel network, does NOT change the ai state. jba.
 
 	virtual void setRallyPoint( const Coord3D *pos ) = 0;				///< define a "rally point" for units to move towards
@@ -372,5 +369,3 @@ class DelayedUpgradeUpdateInterface
 	virtual Bool isTriggeredBy( UpgradeMaskType potentialMask ) = 0;	///< If you were an upgrade, would you trigger for this?
 	virtual void setDelay( UnsignedInt startingDelay ) = 0;	///< Start the upgrade doing countdown
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h
index 661bcaeb425..e8781d31621 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __UPGRADEDIE_H
-#define __UPGRADEDIE_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "GameLogic/Module/DieModule.h"
@@ -48,12 +45,12 @@ class UpgradeDieModuleData : public DieModuleData
 
 	UpgradeDieModuleData(){}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
-    
+
 		DieModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UpgradeToRemove",					INI::parseAsciiString,		NULL, offsetof( UpgradeDieModuleData, m_upgradeName ) },
 			{ 0, 0, 0, 0 }
@@ -75,9 +72,6 @@ class UpgradeDie : public DieModule
 	UpgradeDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-#endif // __UPGRADEDIE_H
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h
index 6b06b765519..6cce9a1fda0 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __UPGRADE_MODULE_H_
-#define __UPGRADE_MODULE_H_
-
 #include "Common/Module.h"
 #include "Common/STLTypedefs.h"
 #include "Common/Upgrade.h"
@@ -82,9 +79,9 @@ class UpgradeMuxData	// does NOT inherit from ModuleData.
 		m_requiresAllTriggers = false;
 	}
 
-	static const FieldParse* getFieldParse() 
+	static const FieldParse* getFieldParse()
 	{
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "TriggeredBy",		INI::parseAsciiStringVector, NULL, offsetof( UpgradeMuxData, m_activationUpgradeNames ) },
 			{ "ConflictsWith",	INI::parseAsciiStringVector, NULL, offsetof( UpgradeMuxData, m_conflictingUpgradeNames ) },
@@ -124,7 +121,7 @@ class UpgradeMux : public UpgradeModuleInterface
 	virtual void performUpgradeFX() = 0;	///< perform the associated fx list
 	virtual Bool requiresAllActivationUpgrades() const = 0;
 	virtual Bool isSubObjectsUpgrade() = 0;
-	
+
 	void giveSelfUpgrade()
 	{
 		// If I have an activation condition, and I haven't activated, and this key matches my condition.
@@ -153,7 +150,7 @@ struct UpgradeModuleData : public BehaviorModuleData
 public:
 	UpgradeMuxData				m_upgradeMuxData;
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     ModuleData::buildFieldParse(p);
 		p.add(UpgradeMuxData::getFieldParse(), offsetof( UpgradeModuleData, m_upgradeMuxData ));
@@ -199,6 +196,3 @@ class UpgradeModule : public BehaviorModule, public UpgradeMux
 };
 inline UpgradeModule::UpgradeModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { }
 inline UpgradeModule::~UpgradeModule() { }
-
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h
index 34bb3fc1de2..a07a65287a7 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef VETERANCY_CRATE_COLLIDE_H_
-#define VETERANCY_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -54,11 +51,11 @@ class VeterancyCrateCollideModuleData : public CrateCollideModuleData
 		m_isPilot = false;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "EffectRange",	INI::parseUnsignedInt,	NULL, offsetof( VeterancyCrateCollideModuleData, m_rangeOfEffect ) },
 			{ "AddsOwnerVeterancy",	INI::parseBool,	NULL, offsetof( VeterancyCrateCollideModuleData, m_addsOwnerVeterancy ) },
@@ -93,5 +90,3 @@ class VeterancyCrateCollide : public CrateCollide
 	Int getLevelsToGain() const;
 
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h
index 5196f79a21a..fbf01296364 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __VETERANCY_GAIN_CREATE_H_
-#define __VETERANCY_GAIN_CREATE_H_
-
 #define DEFINE_VETERANCY_NAMES
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameCommon.h"
@@ -70,6 +67,3 @@ class VeterancyGainCreate : public CreateModule
 protected:
 
 };
-
-#endif 
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h
index e9be4520019..3b94033618e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h
@@ -25,16 +25,13 @@
 // WanderAIUpdate.h //////////
 // Will give self random move commands
 // Author: Graham Smallwood, April 2002
- 
-#pragma once
 
-#ifndef _WANDER_AI_UPDATE_H_
-#define _WANDER_AI_UPDATE_H_
+#pragma once
 
 #include "GameLogic/Module/AIUpdate.h"
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Soldier behavior implementation.
  * Override or extend AIUpdate methods to customize the Soldier's behavior.
  */
@@ -63,6 +60,3 @@ class WanderAIUpdate : public AIUpdateInterface
 	virtual AIStateMachine* makeStateMachine();
 
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h
index d246c1aefb7..16dbd2577fc 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __WATERWAVE_H_
-#define __WATERWAVE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -97,7 +94,7 @@ class WaveGuideUpdate : public UpdateModule
 	void doDamage( void );								///< do damage to things that have crossed our path
 
 	UnsignedInt m_activeFrame;						///< frame we became active on
-	Bool m_needDisable;									
+	Bool m_needDisable;
 	Bool m_initialized;										///< set to TRUE after we're enabled and in motion
 
 	enum { MAX_WAVEGUIDE_SHAPE_POINTS = 64 };
@@ -111,5 +108,3 @@ class WaveGuideUpdate : public UpdateModule
 	Coord3D m_finalDestination;						///< the final destination of the waveguide path
 
 };
-
-#endif  // end __WATERWAVE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h
index 5aae816e83a..79c1f42c7a4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h
@@ -24,12 +24,12 @@
 
 // FILE: WeaponBonusUpgrade.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	May 2002
@@ -37,17 +37,14 @@
 //	Filename: 	WeaponBonusUpgrade.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __WEAPON_BONUS_UPGRADE_H_
-#define __WEAPON_BONUS_UPGRADE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -90,7 +87,3 @@ class WeaponBonusUpgrade : public UpgradeModule
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __WEAPON_BONUS_UPGRADE_H_
-
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h
index 18081017c62..acb4df3d52f 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __WEAPON_SET_UPGRADE_H_
-#define __WEAPON_SET_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -57,7 +54,3 @@ class WeaponSetUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-
-#endif // __DEFAULTDIE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h
index dee9b14bd70..a124c77affc 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __WORKER_AI_UPDATE_H_
-#define __WORKER_AI_UPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/StateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
@@ -89,11 +86,11 @@ class WorkerAIUpdateModuleData : public AIUpdateModuleData
 		m_warehouseScanDistance = 100;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     AIUpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MaxBoxes",					INI::parseInt,		NULL, offsetof( WorkerAIUpdateModuleData, m_maxBoxesData ) },
 			{ "RepairHealthPercentPerSecond",	INI::parsePercentToReal,	NULL, offsetof( WorkerAIUpdateModuleData, m_repairHealthPercentPerSecond ) },
@@ -140,8 +137,8 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public
 	virtual Real getBoredTime( void ) const;							///< how long till we're bored
 	virtual Real getBoredRange( void ) const;							///< when we're bored, we look this far away to do things
 
-	virtual Object *construct( const ThingTemplate *what, 
-														 const Coord3D *pos, Real angle, 
+	virtual Object *construct( const ThingTemplate *what,
+														 const Coord3D *pos, Real angle,
 														 Player *owningPlayer,
 														 Bool isRebuild );			///< construct a building
 
@@ -185,7 +182,7 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public
 	virtual Bool isCurrentlyFerryingSupplies() const;
 	virtual Real getWarehouseScanDistance() const; ///< How far can I look for a warehouse?
 
-	virtual void setForceBusyState(Bool v) { m_forcedBusyPending = v; } 
+	virtual void setForceBusyState(Bool v) { m_forcedBusyPending = v; }
 	virtual Bool isForcedIntoBusyState() const { return m_forcedBusyPending; }
 
 	virtual void setForceWantingState(Bool v){ m_forcePending = v; }
@@ -209,14 +206,14 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public
 
 	virtual void startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID );
 	virtual void finishBuildingSound();
-	
+
 protected:
 
 // Dozer data
 	struct DozerTaskInfo
 	{
 		ObjectID m_targetObjectID;				///< target object ID of task
-		UnsignedInt m_taskOrderFrame;			///< logic frame we decided we wanted to do this task	
+		UnsignedInt m_taskOrderFrame;			///< logic frame we decided we wanted to do this task
 	} m_task[ DOZER_NUM_TASKS ];				///< tasks we want to do indexed by DozerTask
 
 
@@ -255,7 +252,7 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public
 	virtual void privateRepair( Object *obj, CommandSourceType cmdSource );	///< repair the target
 	virtual void privateResumeConstruction( Object *obj, CommandSourceType cmdSource );  ///< resume construction on obj
 	virtual void privateDock( Object *obj, CommandSourceType cmdSource );
-	virtual void privateIdle(CommandSourceType cmdSource);						///< Enter idle state.	
+	virtual void privateIdle(CommandSourceType cmdSource);						///< Enter idle state.
 
 private:
 
@@ -263,7 +260,3 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public
  	AudioEventRTS m_suppliesDepletedVoice;						///< Sound played when I take the last box.
 
 };
-
-
-#endif // __WORKER_AI_UPDATE_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Object.h b/Generals/Code/GameEngine/Include/GameLogic/Object.h
index aa26a6c2a00..9f0f0869b30 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Object.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Object.h
@@ -27,10 +27,9 @@
 // Author: Michael S. Booth, October 2000
 
 #pragma once
-#ifndef _OBJECT_H_
-#define _OBJECT_H_
 
 #include "Lib/BaseType.h"
+#include "ref_ptr.h"
 
 #include "Common/Geometry.h"
 #include "Common/Snapshot.h"
@@ -116,9 +115,6 @@ enum WeaponStatus CPP_11(: Int);
 enum RadarPriorityType CPP_11(: Int);
 enum CanAttackResult CPP_11(: Int);
 
-// For ObjectStatusTypes
-#include "Common/ObjectStatusTypes.h"
-
 // For ObjectScriptStatusBit
 #include "GameLogic/ObjectScriptStatusBits.h"
 
@@ -143,8 +139,8 @@ struct TTriggerInfo
 
 enum CrushSquishTestType CPP_11(: Int)
 {
-	TEST_CRUSH_ONLY, 
-	TEST_SQUISH_ONLY, 
+	TEST_CRUSH_ONLY,
+	TEST_SQUISH_ONLY,
 	TEST_CRUSH_OR_SQUISH
 };
 
@@ -157,7 +153,7 @@ enum CrushSquishTestType CPP_11(: Int)
 class Object : public Thing, public Snapshot
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Object, "ObjectPool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Object, "ObjectPool" )
 
 public:
 
@@ -215,8 +211,8 @@ class Object : public Thing, public Snapshot
 	void kill();																			///< do max health amount of kill damage to object
 	void healCompletely();														///< Restore max health to this Object
 
-	void scoreTheKill( const Object *victim );						///< I just killed this object.  
-	void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel );	///< I just achieved this level right this moment
+	void scoreTheKill( const Object *victim );						///< I just killed this object.
+	void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = TRUE );	///< I just achieved this level right this moment
 	ExperienceTracker* getExperienceTracker() {return m_experienceTracker;}
 	const ExperienceTracker* getExperienceTracker() const {return m_experienceTracker;}
 	VeterancyLevel getVeterancyLevel() const;
@@ -241,9 +237,12 @@ class Object : public Thing, public Snapshot
 	void setCustomIndicatorColor(Color c);
 	void removeCustomIndicatorColor();
 
+	Bool isLogicallyVisible() const; ///< Returns whether the object is logically visible to the player, irrespective of shroud.
+
 	Bool isLocallyControlled() const;
+	Bool isLocallyViewed() const;
 	Bool isNeutralControlled() const;
-	
+
 	Bool getIsUndetectedDefector(void) const { return BitIsSet(m_privateStatus, UNDETECTED_DEFECTOR); }
 	void friend_setUndetectedDefector(Bool status);
 
@@ -257,10 +256,10 @@ class Object : public Thing, public Snapshot
 	void setGeometryInfoZ( Real newZ );
 
 	void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal );
-	
+
 	// access to modules
 	//-----------------------------------------------------------------------------
-	
+
 	//This is a good creation inspector. There's been multitudes of issues with conflicts of
 	//Objects getting constructed causing crashes either because the modules aren't created
 	//yet, and there's stuff being done inside of setTeam() that cares.
@@ -296,7 +295,7 @@ class Object : public Thing, public Snapshot
 	//
 	ProductionUpdateInterface* getProductionUpdateInterface( void );
 
-	// 
+	//
 	// Find us our dock update interface if we have one.  Again, this method exists simple
 	// because we want to do this in a lot of places throughout the code
 	//
@@ -318,10 +317,10 @@ class Object : public Thing, public Snapshot
 	UpgradeMaskType getObjectCompletedUpgradeMask() const { return m_objectUpgradesCompleted; } ///< Upgrades I complete locally
 
 	//This function sucks.
-	//It was added for objects that can disguise as other objects and contain upgraded subobject overrides. 
+	//It was added for objects that can disguise as other objects and contain upgraded subobject overrides.
 	//A concrete example is the bomb truck. Different payloads are displayed based on which upgrades have been
 	//made. When the bomb truck disguises as something else, these subobjects are lost because the vector is
-	//stored in W3DDrawModule. When we revert back to the original bomb truck, we call this function to 
+	//stored in W3DDrawModule. When we revert back to the original bomb truck, we call this function to
 	//recalculate those upgraded subobjects.
 	void forceRefreshSubObjectUpgradeStatus();
 
@@ -331,12 +330,12 @@ class Object : public Thing, public Snapshot
 	inline void clearScriptStatus( ObjectScriptStatusBit bit ) { setScriptStatus(bit, false); }
 
 	// Selectable is individually controlled on an object by object basis for design now.
-	// It defaults to the thingTemplate->isKindof(KINDOF_SELECTABLE), however, it can be overridden on an 
-	// object by object basis.  Finally, it can be temporarily overriden by the OBJECT_STATUS_UNSELECTABLE. 
+	// It defaults to the thingTemplate->isKindof(KINDOF_SELECTABLE), however, it can be overridden on an
+	// object by object basis.  Finally, it can be temporarily overriden by the OBJECT_STATUS_UNSELECTABLE.
 	// jba.
 	void setSelectable(Bool selectable);
 	Bool isSelectable() const;
-	
+
 	Bool isMassSelectable() const;
 
 	// User specified formation.
@@ -344,7 +343,7 @@ class Object : public Thing, public Snapshot
 	enum FormationID getFormationID(void) const {return m_formationID;}
 	void setFormationOffset(const Coord2D& offset) {m_formationOffset = offset;}
 	void getFormationOffset(Coord2D* offset) const {*offset = m_formationOffset;}
-		
+
 
 //THIS FUNCTION BELONGS AT THE OBJECT LEVEL BECAUSE THERE IS AT LEAST ONE SPECIAL UNIT
 //(ANGRY MOB) WHICH NEEDS LOGIC-SIDE POSITION CALC'S...
@@ -358,8 +357,8 @@ class Object : public Thing, public Snapshot
 
 	void markSingleUseCommandUsed() { m_singleUseCommandUsed = true; }
 	Bool hasSingleUseCommandBeenUsed() const { return m_singleUseCommandUsed; }
-	
-	/// returns true iff the object can run over the other object. 
+
+	/// returns true iff the object can run over the other object.
 	Bool canCrushOrSquish(Object *otherObj, CrushSquishTestType testType = TEST_CRUSH_OR_SQUISH) const;
 	UnsignedByte getCrusherLevel() const;
 	UnsignedByte getCrushableLevel() const;
@@ -390,6 +389,7 @@ class Object : public Thing, public Snapshot
 	void friend_setPartitionData(PartitionData *pd) { m_partitionData = pd; }
 	PartitionData *friend_getPartitionData() const { return m_partitionData; }
 	const PartitionData *friend_getConstPartitionData() const { return m_partitionData; }
+	Bool hasGhostObject() const; ///< This object has a ghost object. This does not imply that a ghost snapshot is taken or active.
 
 	void onPartitionCellChange();///< We have moved a 'significant' amount, so do maintenence that can be considered 'cell-based'
 	void handlePartitionCellMaintenance();					///< Undo and redo all shroud actions.  Call when something has changed, like position or ownership or Death
@@ -420,6 +420,8 @@ class Object : public Thing, public Snapshot
 	void onRemovedFrom( Object *removedFrom );
 	Int getTransportSlotCount() const;
 	void friend_setContainedBy( Object *containedBy ) { m_containedBy = containedBy; }
+	const Object* getEnclosingContainedBy() const; ///< Find the first enclosing container in the containment chain.
+	const Object* getOuterObject() const; ///< Get the top-level object
 
 	// Special Powers -------------------------------------------------------------------------------
 	SpecialPowerModuleInterface *getSpecialPowerModule( const SpecialPowerTemplate *specialPowerTemplate ) const;
@@ -431,7 +433,7 @@ class Object : public Thing, public Snapshot
 	void doCommandButton( const CommandButton *commandButton, CommandSourceType cmdSource );
 	void doCommandButtonAtObject( const CommandButton *commandButton, Object *obj, CommandSourceType cmdSource );
 	void doCommandButtonAtPosition( const CommandButton *commandButton, const Coord3D *pos, CommandSourceType cmdSource );
-	
+
 	/**
 		 For Object specific dynamic command sets.  Different from the Science specific ones handled in ThingTemplate
 	*/
@@ -457,7 +459,7 @@ class Object : public Thing, public Snapshot
 	Weapon* getCurrentWeapon(WeaponSlotType* wslot = NULL);
 	const Weapon* getCurrentWeapon(WeaponSlotType* wslot = NULL) const;
 	void setFiringConditionForCurrentWeapon() const;
-	void adjustModelConditionForWeaponStatus();	///< Check to see if I should change my model condition. 
+	void adjustModelConditionForWeaponStatus();	///< Check to see if I should change my model condition.
 	void fireCurrentWeapon(Object *target);
 	void fireCurrentWeapon(const Coord3D* pos);
 	void preFireCurrentWeapon( const Object *victim );
@@ -468,12 +470,12 @@ class Object : public Thing, public Snapshot
 
 	/**
 		Determines if the unit has any weapon that could conceivably
-		harm the victim. this does not take range, ammo, etc. into 
+		harm the victim. this does not take range, ammo, etc. into
 		account, but immutable weapon properties, such as "can you
 		target airborne victims".
 	*/
 	/*
-		NOTE: getAbleToAttackSpecificObject NO LONGER internally calls isAbleToAttack(), 
+		NOTE: getAbleToAttackSpecificObject NO LONGER internally calls isAbleToAttack(),
 		since that isn't an incredibly fast call, and this is called repeatedly in some inner loops
 		where we already know that isAbleToAttack() == true. so you should always
 		call isAbleToAttack prior to calling this! (srj)
@@ -528,7 +530,7 @@ class Object : public Thing, public Snapshot
 	Bool getSingleLogicalBonePosition(const char* boneName, Coord3D* position, Matrix3D* transform) const;
 	Bool getSingleLogicalBonePositionOnTurret(WhichTurretType whichTurret, const char* boneName, Coord3D* position, Matrix3D* transform) const;
 	Int getMultiLogicalBonePosition(const char* boneNamePrefix, Int maxBones, Coord3D* positions, Matrix3D* transforms, Bool convertToWorld = TRUE ) const;
-	
+
 	// Entered & exited.
 	Bool didEnter(const PolygonTrigger *pTrigger) const;
 	Bool didExit(const PolygonTrigger *pTrigger) const;
@@ -548,29 +550,29 @@ class Object : public Thing, public Snapshot
 	void setDisabledUntil( DisabledType type, UnsignedInt frame );
 	Bool isDisabledByType( DisabledType type ) const { return TEST_DISABLEDMASK( m_disabledMask, type ); }
 
-	void pauseAllSpecialPowers( const Bool disabling ) const;	
-	
+	void pauseAllSpecialPowers( const Bool disabling ) const;
+
 	//Checks any timers and clears disabled statii that have expired.
 	void checkDisabledStatus();
-	
+
 	//When an AIAttackState is over, it needs to clean up any weapons that might be in leech range mode
 	//or else those weapons will have unlimited range!
 	void clearLeechRangeModeForAllWeapons();
-	
+
 	Int getNumConsecutiveShotsFiredAtTarget( const Object *victim) const;
 
 	void setHealthBoxOffset( const Coord3D& offset ) { m_healthBoxOffset = offset; } ///< for special amorphous like angry mob
 
 	void defect( Team *newTeam, UnsignedInt detectionTime );
 	void goInvulnerable( UnsignedInt time );
-	
+
 	// This is public, since there is no Thing level master setting of Turret stuff.  It is all done in a sleepy hamlet
 	// of a module called TurretAI.
 	virtual void reactToTurretChange( WhichTurretType turret, Real oldRotation, Real oldPitch );
 
 	// Convenience function for checking certain kindof bits
 	Bool isStructure(void) const;
-	
+
 	// Convenience function for checking certain kindof bits
 	Bool isFactionStructure(void) const;
 
@@ -581,7 +583,7 @@ class Object : public Thing, public Snapshot
 	void setReceivingDifficultyBonus(Bool receive);
 
 	inline UnsignedInt getSafeOcclusionFrame(void) { return m_safeOcclusionFrame; }	//< this is an object specific frame at which it's safe to enable building occlusion.
-	inline void	setSafeOcclusionFrame(UnsignedInt frame) { m_safeOcclusionFrame = frame;} 
+	inline void	setSafeOcclusionFrame(UnsignedInt frame) { m_safeOcclusionFrame = frame;}
 
 	// All of our cheating for radars and power go here.
 	// This is the function that we now call in becomingTeamMember to adjust our power.
@@ -623,7 +625,7 @@ class Object : public Thing, public Snapshot
 
 	void updateTriggerAreaFlags(void);
 	void setTriggerAreaFlagsForChangeInPosition(void);
-	
+
 	/// Look and unlook are protected.  They should be called from Object::reasonToLook.  Like Capture, or death.
 	void look();
 	void unlook();
@@ -663,7 +665,11 @@ class Object : public Thing, public Snapshot
 
 	GeometryInfo	m_geometryInfo;
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	AIGroup*			m_group;								///< if non-NULL, we are part of this group of agents
+#else
+	RefCountPtr<AIGroup> m_group; ///< if non-NULL, we are part of this group of agents
+#endif
 
 	// These will last for my lifetime.  I will reuse them and reset them.  The truly dynamic ones are in PartitionManager
 	SightingInfo	*m_partitionLastLook;		///< Where and for whom I last looked, so I can undo its effects when I stop
@@ -715,7 +721,7 @@ class Object : public Thing, public Snapshot
 	Color													m_indicatorColor;			///< if nonzero, use this instead of controlling player's color
 
 	Coord3D												m_healthBoxOffset; ///< generally zero, except for special amorphous ones like angry mob
-	
+
 	/// @todo srj -- convert to non-DLINK list, after it is once again possible to test the change
 	MAKE_DLINK(Object, TeamMemberList)			///< other Things that are members of the same team
 
@@ -737,7 +743,7 @@ class Object : public Thing, public Snapshot
 	TTriggerInfo									m_triggerInfo[MAX_TRIGGER_AREA_INFOS];
 	UnsignedInt										m_enteredOrExitedFrame;
 	ICoord3D											m_iPos;
-	
+
 	PathfindLayerEnum							m_layer;							// Layer object is pathing on.
 	PathfindLayerEnum							m_destinationLayer;		// Layer of current path goal.
 
@@ -746,13 +752,13 @@ class Object : public Thing, public Snapshot
 	Coord2D												m_formationOffset;
 
 	AsciiString										m_commandSetStringOverride;///< To allow specific object to switch command sets
-	
+
 	UnsignedInt										m_safeOcclusionFrame;	///<flag used by occlusion renderer so it knows when objects have exited their production building.
 
 	// --------- BYTE-SIZED THINGS GO HERE
 	Bool													m_isSelectable;
 	Bool													m_modulesReady;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	Bool													m_hasDiedAlready;
 #endif
 	UnsignedByte									m_scriptStatus;					///< status as set by scripting, corresponds to ORed ObjectScriptStatusBits
@@ -761,7 +767,7 @@ class Object : public Thing, public Snapshot
 	Bool													m_singleUseCommandUsed;
 	Bool													m_isReceivingDifficultyBonus;
 
-};  // end class Object
+};
 
 // deleteInstance is not meant to be used with Object in order to require the use of TheGameLogic->destroyObject()
 void deleteInstance(Object* object) CPP_11(= delete);
@@ -769,7 +775,7 @@ void deleteInstance(Object* object) CPP_11(= delete);
 // describe an object as an AsciiString: e.g. "Object 102 (KillerBuggy) [GLARocketBuggy, owned by player 2 (GLAIntroPlayer)]"
 AsciiString DebugDescribeObject(const Object *obj);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	#define DEBUG_OBJECT_ID_EXISTS
 #else
 	#undef DEBUG_OBJECT_ID_EXISTS
@@ -778,5 +784,3 @@ AsciiString DebugDescribeObject(const Object *obj);
 #ifdef DEBUG_OBJECT_ID_EXISTS
 extern ObjectID TheObjectIDToDebug;
 #endif
-
-#endif // _OBJECT_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h
index a64c6c5226f..c5fcee6975e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h
@@ -32,9 +32,6 @@
 
 #pragma once
 
-#ifndef _ObjectCreationList_H_
-#define _ObjectCreationList_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
 
@@ -49,24 +46,24 @@ class Object;
 /**
 	An ObjectCreationNugget encapsulates the creation of an Object. ObjectCreationNuggets are virtually
 	never used on their own, but rather, as a component of an ObjectCreationList (see below).
-	
+
 	Important notes:
 
 	-- ObjectCreationNugget is an ABC; all the implementations are (currently) located in ObjectCreationList.cpp,
 	thought they will probably be spread out more as we add more implementations.
 
-	-- As part of an ObjectCreationList, an ObjectCreationNugget is shared between multiple units. The implication is that 
-	an ObjectCreationNugget should not require private data storage to do what it needs to do, aside from stuff 
-	initialized at ObjectCreationNugget instantiation time (eg, parameters from an INI file). To help 
+	-- As part of an ObjectCreationList, an ObjectCreationNugget is shared between multiple units. The implication is that
+	an ObjectCreationNugget should not require private data storage to do what it needs to do, aside from stuff
+	initialized at ObjectCreationNugget instantiation time (eg, parameters from an INI file). To help
 	enforce this, all it's methods are declared 'const'. If you can't implement what you
 	need within this framework, please *don't* simply de-const things, because it could lead to very
 	strange side-effects. Instead, the system will have to be enhanced to allow for multiple instances
 	of each ObjectCreationNugget.
 
-	-- an individual ObjectCreationNugget is generally not directly accessible to anyone outside of the	
+	-- an individual ObjectCreationNugget is generally not directly accessible to anyone outside of the
 	ObjectCreationList system; in fact, it could probably be a private class, but isn't, mainly for coding convenience.
 
-	-- Unlike most other game systems, ObjectCreationNuggets can't be overridden by subsequent INI file 
+	-- Unlike most other game systems, ObjectCreationNuggets can't be overridden by subsequent INI file
 	loads. This isn't really a problem, because all you really need to do to "override" one is to
 	specify a different one.
 */
@@ -97,29 +94,29 @@ class ObjectCreationNugget : public MemoryPoolObject
 		object, or using the existing one.
 	*/
 	virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D *secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const;
-};  
+};
 EMPTY_DTOR(ObjectCreationNugget)
 
 //-------------------------------------------------------------------------------------------------
 /**
 	An ObjectCreationList is a way of creating a particular set of Objects.
-	
+
 	Important notes:
 
 	-- an ObjectCreationList is specified solely by name, and the only parameters it receives when performing
 	its AV effects are a primary (and optional secondary) object position.
-	
+
 	-- There is no inheritance or overriding of ObjectCreationLists; if you need an ObjectCreationList that is nearly-but-not-quite
 	identical to an existing one, you must simply make an entirely new ObjectCreationList. Realistically, this shouldn't
 	be a problem, since they are pretty simple to specify, and don't consume a lot of memory.
 
-	-- an ObjectCreationList is shared between multiple units. To help 
+	-- an ObjectCreationList is shared between multiple units. To help
 	enforce this, all it's methods are declared 'const'. If you can't implement the stuff you
 	need within this framework, please *don't* simply de-const things, because it could lead to very
 	strange side-effects. Instead, the system will have to be enhanced to allow for multiple instances
 	of each ObjectCreationNugget.
 
-	-- Unlike most other game systems, ObjectCreationList can't be overridden by subsequent INI file 
+	-- Unlike most other game systems, ObjectCreationList can't be overridden by subsequent INI file
 	loads. This isn't really a problem, because all you really need to do to "override" one is to
 	specify a different one.
 */
@@ -137,9 +134,9 @@ class ObjectCreationList
 
 	// Kris: August 23, 2003
 	// All OCLs return the first object that is created (or NULL if not applicable).
-	inline static Object* create( const ObjectCreationList* ocl, const Object* primaryObj, const Coord3D *primary, const Coord3D *secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 )
+	static Object* create( const ObjectCreationList* ocl, const Object* primaryObj, const Coord3D *primary, const Coord3D *secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 )
 	{
-		if( ocl ) 
+		if( ocl )
 			return ocl->createInternal( primaryObj, primary, secondary, createOwner, lifetimeFrames );
 		return NULL;
 	}
@@ -147,9 +144,9 @@ class ObjectCreationList
 	// Kris: August 23, 2003
 	// All OCLs return the first object that is created (or NULL if not applicable).
 	/// inline convenience method to avoid having to check for null.
-	inline static Object* create(const ObjectCreationList* ocl, const Object* primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 )
+	static Object* create(const ObjectCreationList* ocl, const Object* primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 )
 	{
-		if (ocl) 
+		if (ocl)
 			return ocl->createInternal( primaryObj, primary, secondary, lifetimeFrames );
 		return NULL;
 	}
@@ -157,9 +154,9 @@ class ObjectCreationList
 	// Kris: August 23, 2003
 	// All OCLs return the first object that is created (or NULL if not applicable).
 	/// inline convenience method to avoid having to check for null.
-	inline static Object* create( const ObjectCreationList* ocl, const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 )
+	static Object* create( const ObjectCreationList* ocl, const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 )
 	{
-		if (ocl) 
+		if (ocl)
 			return ocl->createInternal( primary, secondary, lifetimeFrames );
 		return NULL;
 	}
@@ -178,11 +175,11 @@ class ObjectCreationList
 	typedef std::vector<ObjectCreationNugget*> ObjectCreationNuggetVector;
 	ObjectCreationNuggetVector m_nuggets;
 
-};  
+};
 
 //-------------------------------------------------------------------------------------------------
 /**
-	The "store" used to hold all the ObjectCreationLists in existence. 
+	The "store" used to hold all the ObjectCreationLists in existence.
 */
 class ObjectCreationListStore : public SubsystemInterface
 {
@@ -201,7 +198,7 @@ class ObjectCreationListStore : public SubsystemInterface
 		return NULL if no such ObjectCreationList exists.
 	*/
 	const ObjectCreationList *findObjectCreationList(const char* name) const;
-	
+
 	static void parseObjectCreationListDefinition(INI* ini);
 
 	void addObjectCreationNugget(ObjectCreationNugget* nugget);
@@ -219,6 +216,3 @@ class ObjectCreationListStore : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern ObjectCreationListStore *TheObjectCreationListStore;
-
-#endif // _ObjectCreationList_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h
index e2b35068b4b..03f15d38e38 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _OBJECT_ITER_H_
-#define _OBJECT_ITER_H_
-
 #include "Common/GameType.h"
 #include "Common/GameMemory.h"
 
@@ -69,7 +66,7 @@ enum IterOrderType CPP_11(: Int)
 	}
 	deleteInstance(iter);								// you own it, so you must delete it
 
-	note that the iterator is required to deal intelligently with deleted objects; 
+	note that the iterator is required to deal intelligently with deleted objects;
 	in particular, next() will check if an obj has been killed and simply skip it.
 */
 class ObjectIterator : public MemoryPoolObject
@@ -90,12 +87,12 @@ inline ObjectIterator::~ObjectIterator() { }
 */
 class SimpleObjectIterator : public ObjectIterator
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SimpleObjectIterator, "SimpleObjectIteratorPool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SimpleObjectIterator, "SimpleObjectIteratorPool" )
 private:
 
 	class Clump : public MemoryPoolObject
 	{
-		MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Clump, "SimpleObjectIteratorClumpPool" )		
+		MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Clump, "SimpleObjectIteratorClumpPool" )
 	public:
 
 		Clump			*m_nextClump;
@@ -135,7 +132,7 @@ class SimpleObjectIterator : public ObjectIterator
 	/**
 		throw away all contents of the iterator.
 	*/
-	void makeEmpty();	
+	void makeEmpty();
 
 	/**
 		insert an object at the head of the iterator. the given numeric value
@@ -155,7 +152,3 @@ class SimpleObjectIterator : public ObjectIterator
 	*/
 	Int getCount() { return m_clumpCount; }
 };
-
-
-#endif // _OBJECT_ITER_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h
index 89682ffe2e6..5fdf12c639c 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h
@@ -27,8 +27,6 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __OBJECTSCRIPTSTATUSBITS_H__
-#define __OBJECTSCRIPTSTATUSBITS_H__
 
 //-------------------------------------------------------------------------------------------------
 /** Object status bits */
@@ -42,6 +40,3 @@ enum ObjectScriptStatusBit CPP_11(: Int)
 	OBJECT_STATUS_SCRIPT_TARGETABLE					= 0x10,  ///< This unit can be targeted by the player, but not autoacquired.
 	// NOTE: Object currently only uses a Byte for this, so if you add status bits, you may need to enlarge that field.
 };
-
-#endif /* __OBJECTSCRIPTSTATUSBITS_H__ */
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h
index a4d0f4ebabe..0309c09bd47 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h
@@ -25,13 +25,10 @@
 // ObjectTypes.h //////////////////////////////////////////////////////////////////////////////////
 // Author: John McDonald, Jr.
 // September 2002
-// DO NOT DISTRIBUTE 
+// DO NOT DISTRIBUTE
 
 #pragma once
 
-#ifndef __OBJECT_TYPES_H__
-#define __OBJECT_TYPES_H__
-
 #include "Common/AsciiString.h"
 #include "Common/Snapshot.h"
 
@@ -40,13 +37,13 @@ class Player;
 class ObjectTypes : public MemoryPoolObject,
 										public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectTypes, "ObjectTypes")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectTypes, "ObjectTypes")
 private:
 	typedef std::vector<AsciiString> AsciiStringVec;
 	typedef AsciiStringVec::iterator AsciiStringVecIt;
 
 private:
-	// Note, there is no direct access to m_objectTypes. Please endeavor to keep it this way, and 
+	// Note, there is no direct access to m_objectTypes. Please endeavor to keep it this way, and
 	// add any functions you might need to this class.
 	AsciiString m_listName;
 	AsciiStringVec m_objectTypes;
@@ -65,7 +62,7 @@ class ObjectTypes : public MemoryPoolObject,
 	// Maintenance
 	void addObjectType(const AsciiString &objectType);
 	void removeObjectType(const AsciiString &objectType);
-	
+
 	// Which list is this again?
 	const AsciiString& getListName() const;
 	void setListName(const AsciiString& listName);
@@ -76,7 +73,7 @@ class ObjectTypes : public MemoryPoolObject,
 
 	// Is the set empty?
 	size_t getListSize(void) const { return m_objectTypes.size(); }
-	
+
 	// I'd like to loop through, please.
 	AsciiString getNthInList( size_t index ) const { return (index < getListSize()) ? m_objectTypes[index] : AsciiString::TheEmptyString; }
 
@@ -87,5 +84,3 @@ class ObjectTypes : public MemoryPoolObject,
 	Bool canBuildAny(Player *player);
 };
 EMPTY_DTOR(ObjectTypes)
-
-#endif /* __OBJECT_TYPES_H__ */
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h
index 95914228109..6631616c306 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h
@@ -24,12 +24,12 @@
 
 // FILE: PartitionManager.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -39,18 +39,15 @@
 // Created:    Steven Johnson, September 2001
 //
 // Desc:       Partition management, this system will allow us to partition the
-//						 objects in space, iterate objects in specified volumes, 
+//						 objects in space, iterate objects in specified volumes,
 //						 regions, by types and other properties.
 //
 //-----------------------------------------------------------------------------
 
 #pragma once
 
-#ifndef __PARTITIONMANAGER_H_
-#define __PARTITIONMANAGER_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "Common/GameCommon.h"	// ensure we get DUMP_PERF_STATS, or not
 #include "GameLogic/ObjectIter.h"
@@ -61,7 +58,7 @@
 #include "GameClient/Display.h"	// for ShroudLevel
 
 //-----------------------------------------------------------------------------
-//           defines                                                      
+//           defines
 //-----------------------------------------------------------------------------
 
 /*
@@ -77,7 +74,7 @@
 const Real HUGE_DIST = 1000000.0f;
 
 //-----------------------------------------------------------------------------
-//           Type Definitions                                                      
+//           Type Definitions
 //-----------------------------------------------------------------------------
 
 struct Coord3D;
@@ -103,7 +100,6 @@ enum ValueOrThreat CPP_11(: Int)
 {
 	VOT_CashValue = 1,
 	VOT_ThreatValue,
-	VOT_NumItems
 };
 
 // ----------------------------------------------------------------------------------------------
@@ -168,7 +164,7 @@ struct CollideLocAndNormal
 };
 
 //=====================================
-/** 
+/**
 	PartitionContactList is a utility class used by the Partition Manager
 	to hold potential collisions as it updates objects in the partition.
 	It stores pairs of potentially-colliding objects (eliminating duplicates)
@@ -179,7 +175,7 @@ class PartitionContactList;
 
 
 //=====================================
-/** 
+/**
 	This class (often called COI for short) is the abstraction
 	of the intersection between an Object and a Partition Cell.
 	For every Cell that an Object's geometry touches, even partially,
@@ -207,7 +203,7 @@ class CellAndObjectIntersection	// not MPO: we allocate these in arrays
 		list of COIs.
 	*/
 	void addCoverage(PartitionCell *cell, PartitionData *module);
-	
+
 	/**
 		make 'this' refer to nothing at all. this involves resetting the member
 		variables to null, and removing 'this' from the Cell's list of COI's.
@@ -217,22 +213,22 @@ class CellAndObjectIntersection	// not MPO: we allocate these in arrays
 	/**
 		return the Cell for this COI (null if the COI is not in use)
 	*/
-	inline PartitionCell *getCell() { return m_cell; }
+	PartitionCell *getCell() { return m_cell; }
 
 	/**
 		return the Module for this COI (null if the COI is not in use)
 	*/
-	inline PartitionData *getModule() { return m_module; }
+	PartitionData *getModule() { return m_module; }
 
 	/**
 		return the previous COI in the Cell's list of COIs.
 	*/
-	inline CellAndObjectIntersection *getPrevCoi() { return m_prevCoi; }
+	CellAndObjectIntersection *getPrevCoi() { return m_prevCoi; }
 
 	/**
 		return the next COI in the Cell's list of COIs.
 	*/
-	inline CellAndObjectIntersection *getNextCoi() { return m_nextCoi; }
+	CellAndObjectIntersection *getNextCoi() { return m_nextCoi; }
 
 	// only for use by PartitionCell.
 	void friend_addToCellList(CellAndObjectIntersection **pListHead);
@@ -255,7 +251,7 @@ class SightingInfo : public MemoryPoolObject, public Snapshot
 	Coord3D					m_where;
 	Real						m_howFar;
 	PlayerMaskType	m_forWhom;	// ask not for whom the sighting is masked; it masks for thee
-	
+
 	UnsignedInt			m_data;			// Threat and value use as the value.  Sighting uses it for a Timestamp
 
 protected:
@@ -269,7 +265,7 @@ class SightingInfo : public MemoryPoolObject, public Snapshot
 
 //=====================================
 /**
-	We sometimes need to save whether or not an area was fogged or permanently revealed through a 
+	We sometimes need to save whether or not an area was fogged or permanently revealed through a
 	script. This helps us do so.
 */
 //=====================================
@@ -283,11 +279,11 @@ enum
 struct ShroudStatusStoreRestore
 {
 	std::vector<UnsignedByte> m_foggedOrRevealed[MAX_PLAYER_COUNT];
-	Int m_cellsWide;	// m_cellsHigh is computed by m_foggedOrRevealed[0].size() / m_cellsWide 
+	Int m_cellsWide;	// m_cellsHigh is computed by m_foggedOrRevealed[0].size() / m_cellsWide
 };
 
 //=====================================
-/** 
+/**
 	The world's terrain is partitioned into a large grid of Partition Cells.
 	The Cell is the fundamental unit of space in the Partition Manager.
 */
@@ -296,7 +292,7 @@ class PartitionCell : public Snapshot	// not MPO: allocated in an array
 {
 private:
 	CellAndObjectIntersection*		m_firstCoiInCell;	///< list of COIs in this cell (may be null).
-	ShroudLevel										m_shroudLevel[MAX_PLAYER_COUNT];	
+	ShroudLevel										m_shroudLevel[MAX_PLAYER_COUNT];
 #ifdef PM_CACHE_TERRAIN_HEIGHT
 	Real													m_loTerrainZ;			///< lowest terrain-pt in this cell
 	Real													m_hiTerrainZ;			///< highest terrain-pt in this cell
@@ -345,13 +341,13 @@ class PartitionCell : public Snapshot	// not MPO: allocated in an array
 	void invalidateShroudedStatusForAllCois(Int playerIndex);
 
 #ifdef PM_CACHE_TERRAIN_HEIGHT
-	inline Real getLoTerrain() const { return m_loTerrainZ; }
-	inline Real getHiTerrain() const { return m_hiTerrainZ; }
+	Real getLoTerrain() const { return m_loTerrainZ; }
+	Real getHiTerrain() const { return m_hiTerrainZ; }
 #endif
 
 	void getCellCenterPos(Real& x, Real& y);
 
-	inline CellAndObjectIntersection *getFirstCoiInCell() { return m_firstCoiInCell; }
+	CellAndObjectIntersection *getFirstCoiInCell() { return m_firstCoiInCell; }
 
 	#ifdef RTS_DEBUG
 	void validateCoiList();
@@ -365,14 +361,14 @@ class PartitionCell : public Snapshot	// not MPO: allocated in an array
 };
 
 //=====================================
-/** 
+/**
 	A PartitionData is the part of an Object that understands
 	how to maintain the Object in the space partitioning system.
 */
 //=====================================
 class PartitionData : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PartitionData, "PartitionDataPool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PartitionData, "PartitionDataPool" )
 
 private:
 
@@ -392,14 +388,14 @@ class PartitionData : public MemoryPoolObject
 
 	Int													m_coiArrayCount;					///< number of COIs allocated (may be more than are in use)
 	Int													m_coiInUseCount;					///< number of COIs that are actually in use
-	CellAndObjectIntersection		*m_coiArray;							///< The array of COIs 
+	CellAndObjectIntersection		*m_coiArray;							///< The array of COIs
 	Int													m_doneFlag;
 	DirtyStatus									m_dirtyStatus;
-	ObjectShroudStatus					m_shroudedness[MAX_PLAYER_COUNT];						
-	ObjectShroudStatus					m_shroudednessPrevious[MAX_PLAYER_COUNT];	///<previous frames value of m_shroudedness						
+	ObjectShroudStatus					m_shroudedness[MAX_PLAYER_COUNT];
+	ObjectShroudStatus					m_shroudednessPrevious[MAX_PLAYER_COUNT];	///<previous frames value of m_shroudedness
 	Bool												m_everSeenByPlayer[MAX_PLAYER_COUNT];		///<whether this object has ever been seen by a given player.
 	const PartitionCell					*m_lastCell;							///< The last cell I thought my center was in.
-	
+
 	/**
 		Given a shape's geometry and size parameters, calculate the maximum number of COIs
 		that the object could possibly occupy.
@@ -418,7 +414,7 @@ class PartitionData : public MemoryPoolObject
 	*/
 	void allocCoiArray();
 
-	/** 
+	/**
 		free the array of COIs (m_coiArray) for this module (if any).
 	*/
 	void freeCoiArray();
@@ -426,7 +422,7 @@ class PartitionData : public MemoryPoolObject
 	/**
 			marks self as touching no cells. (and any previous cells as not touching self!)
 	*/
-	void removeAllTouchedCells();									
+	void removeAllTouchedCells();
 
 	/**
 		this discards all current 'touch' information (via removeAllTouchedCells) and recalculates
@@ -514,8 +510,8 @@ class PartitionData : public MemoryPoolObject
 
 	ObjectShroudStatus getShroudedStatus(Int playerIndex);
 
-	inline Int wasSeenByAnyPlayers() const	///<check if a player in the game has seen the object but is now looking at fogged version.
-	{	
+	Int wasSeenByAnyPlayers() const	///<check if a player in the game has seen the object but is now looking at fogged version.
+	{
 		Int i=0;
 		for (; i<MAX_PLAYER_COUNT; i++)
 			if (m_everSeenByPlayer[i] && m_shroudedness[i] == OBJECTSHROUD_FOGGED)
@@ -527,7 +523,7 @@ class PartitionData : public MemoryPoolObject
 	Int getControllingPlayerIndex() const;
 
 	/**
-		enumerate the objects that share space with 'this' 
+		enumerate the objects that share space with 'this'
 		(ie, the objects in the same Partition Cells) and
 		add 'em to the given contact list. also, if self
 		is intersecting the ground, add it to the list as a possible
@@ -542,7 +538,7 @@ class PartitionData : public MemoryPoolObject
 	void friend_setGhostObject(GhostObject *object) {m_ghostObject=object;}	///<used by ghost object manager to free link to partition data.
 	void friend_setShroudednessPrevious(Int playerIndex,ObjectShroudStatus status); ///<only used to restore state after map border resizing and/or xfer!
 	ObjectShroudStatus friend_getShroudednessPrevious(Int playerIndex) {return m_shroudednessPrevious[playerIndex];}
-	
+
 	void friend_removeAllTouchedCells() { removeAllTouchedCells(); }	///< this is only for use by PartitionManager
 	void friend_updateCellsTouched()	{ updateCellsTouched(); } ///< this is only for use by PartitionManager
 	Int friend_getCoiInUseCount() { return m_coiInUseCount; } ///< this is only for use by PartitionManager
@@ -553,13 +549,13 @@ class PartitionData : public MemoryPoolObject
 	Int friend_getDoneFlag() { return m_doneFlag; }
 	void friend_setDoneFlag(Int i) { m_doneFlag = i; }
 
-	inline Bool isInListDirtyModules(PartitionData* const* pListHead) const
+	Bool isInListDirtyModules(PartitionData* const* pListHead) const
 	{
 		Bool result = (*pListHead == this || m_prevDirty || m_nextDirty);
 		DEBUG_ASSERTCRASH(result == (m_dirtyStatus != NOT_DIRTY), ("dirty flag mismatch"));
 		return result;
 	}
-	inline void prependToDirtyModules(PartitionData** pListHead)
+	void prependToDirtyModules(PartitionData** pListHead)
 	{
 		DEBUG_ASSERTCRASH((m_dirtyStatus != NOT_DIRTY), ("dirty flag mismatch"));
 		m_nextDirty = *pListHead;
@@ -595,13 +591,13 @@ class PartitionFilter
 {
 public:
 	virtual Bool allow(Object *objOther) = 0;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() = 0;
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Reject any objects that aren't currently flying.
 */
 class PartitionFilterIsFlying : public PartitionFilter
@@ -609,7 +605,7 @@ class PartitionFilterIsFlying : public PartitionFilter
 public:
 	PartitionFilterIsFlying() { }
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterIsFlying"; }
 #endif
 };
@@ -625,13 +621,13 @@ class PartitionFilterWouldCollide : public PartitionFilter
 public:
 	PartitionFilterWouldCollide(const Coord3D& pos, const GeometryInfo& geom, Real angle, Bool desired);
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterWouldCollide"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Reject any objects that aren't controlled by the same player.
 */
 class PartitionFilterSamePlayer : public PartitionFilter
@@ -641,15 +637,15 @@ class PartitionFilterSamePlayer : public PartitionFilter
 public:
 	PartitionFilterSamePlayer(const Player *player) : m_player(player) { }
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterSamePlayer"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Reject any objects that don't match the alliance
-	affiliations compared with 'm_obj'. You 
+	affiliations compared with 'm_obj'. You
 	may reject objects that are allied, neutral,
 	or enemy with respect to it.
 */
@@ -659,22 +655,22 @@ class PartitionFilterRelationship : public PartitionFilter
 	const Object *m_obj;
 	Int m_flags;
 public:
-	enum 
+	enum
 	{
 		ALLOW_ALLIES					= (1<<ALLIES),		///< allow objects that m_obj considers allies
-		ALLOW_ENEMIES					= (1<<ENEMIES),		///< allow objects that m_obj considers enemy 
+		ALLOW_ENEMIES					= (1<<ENEMIES),		///< allow objects that m_obj considers enemy
 		ALLOW_NEUTRAL					= (1<<NEUTRAL)		///< allow objects that m_obj considers neutral
 	};
 	PartitionFilterRelationship(const Object *obj, Int flags) : m_obj(obj), m_flags(flags) { }
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterRelationship"; }
 #endif
 };
 
 //=====================================
 /**
-	Reject any objects that aren't on the specific 
+	Reject any objects that aren't on the specific
 	team.
 */
 class PartitionFilterAcceptOnTeam : public PartitionFilter
@@ -684,14 +680,14 @@ class PartitionFilterAcceptOnTeam : public PartitionFilter
 public:
 	PartitionFilterAcceptOnTeam(const Team *team);
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterAcceptOnTeam"; }
 #endif
 };
 
 //=====================================
 /**
-	Reject any objects that aren't on the specific 
+	Reject any objects that aren't on the specific
 	squad.
 */
 class PartitionFilterAcceptOnSquad : public PartitionFilter
@@ -701,13 +697,13 @@ class PartitionFilterAcceptOnSquad : public PartitionFilter
 public:
 	PartitionFilterAcceptOnSquad(const Squad *squad);
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterAcceptOnSquad"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Reject any objects that are not within clear line-of-sight
 	of a given object. "Line of sight" takes into account
 	terrain (ie, no hills between 'em) but does not
@@ -724,7 +720,7 @@ class PartitionFilterLineOfSight : public PartitionFilter
 public:
 	PartitionFilterLineOfSight(const Object *obj);
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterLineOfSight"; }
 #endif
 };
@@ -742,7 +738,7 @@ class PartitionFilterPossibleToAttack : public PartitionFilter
 public:
 	PartitionFilterPossibleToAttack(AbleToAttackType t, const Object *obj, CommandSourceType commandSource);
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterPossibleToAttack"; }
 #endif
 };
@@ -758,13 +754,13 @@ class PartitionFilterLastAttackedBy : public PartitionFilter
 public:
 	PartitionFilterLastAttackedBy(Object *obj);
 	virtual Bool allow(Object *other);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterLastAttackedBy"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Only objects that match the given masks are accepted.
 */
 class PartitionFilterAcceptByObjectStatus : public PartitionFilter
@@ -774,13 +770,13 @@ class PartitionFilterAcceptByObjectStatus : public PartitionFilter
 public:
 	PartitionFilterAcceptByObjectStatus(ObjectStatusMaskType mustBeSet, ObjectStatusMaskType mustBeClear) : m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear) { }
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterAcceptByObjectStatus"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Just like PartitionFilterAcceptByObjectStatus, except that objects
 	that match the given masks are REJECTED.
 */
@@ -789,18 +785,18 @@ class PartitionFilterRejectByObjectStatus : public PartitionFilter
 private:
 	ObjectStatusMaskType m_mustBeSet, m_mustBeClear;
 public:
-	PartitionFilterRejectByObjectStatus(ObjectStatusMaskType mustBeSet, ObjectStatusMaskType mustBeClear) 
-		: m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear) 
-	{ 
+	PartitionFilterRejectByObjectStatus(ObjectStatusMaskType mustBeSet, ObjectStatusMaskType mustBeClear)
+		: m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear)
+	{
 	}
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterRejectByObjectStatus"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Objects that are stealthed and not detected or disguised are accepted or rejected based on allow bool.
 */
 class PartitionFilterStealthedAndUndetected : public PartitionFilter
@@ -809,15 +805,15 @@ class PartitionFilterStealthedAndUndetected : public PartitionFilter
 	const Object *m_obj;
 	Bool m_allow;
 public:
-	PartitionFilterStealthedAndUndetected( const Object *obj, Bool allow ) { m_obj = obj; m_allow = allow; } 
+	PartitionFilterStealthedAndUndetected( const Object *obj, Bool allow ) { m_obj = obj; m_allow = allow; }
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterStealthedAndUndetected"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Only objects that match the given masks are accepted.
 */
 class PartitionFilterAcceptByKindOf : public PartitionFilter
@@ -827,13 +823,13 @@ class PartitionFilterAcceptByKindOf : public PartitionFilter
 public:
 	PartitionFilterAcceptByKindOf(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) : m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear) { }
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterAcceptByKindOf"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Just like PartitionFilterAcceptByKindOf, except that objects
 	that match the given masks are REJECTED.
 */
@@ -842,18 +838,18 @@ class PartitionFilterRejectByKindOf : public PartitionFilter
 private:
 	KindOfMaskType m_mustBeSet, m_mustBeClear;
 public:
-	PartitionFilterRejectByKindOf(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) 
-		: m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear) 
-	{ 
+	PartitionFilterRejectByKindOf(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear)
+		: m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear)
+	{
 	}
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterRejectByKindOf"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
  * Reject any objects "behind" the given object.
  * This is a 3D check.
  */
@@ -864,7 +860,7 @@ class PartitionFilterRejectBehind: public PartitionFilter
 public:
 	PartitionFilterRejectBehind( Object *obj );
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterRejectBehind"; }
 #endif
 };
@@ -879,7 +875,7 @@ class PartitionFilterAlive : public PartitionFilter
 	PartitionFilterAlive(void) { }
 protected:
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterAlive"; }
 #endif
 };
@@ -897,7 +893,7 @@ class PartitionFilterSameMapStatus : public PartitionFilter
 	PartitionFilterSameMapStatus(const Object *obj) : m_obj(obj) { }
 protected:
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterSameMapStatus"; }
 #endif
 };
@@ -912,14 +908,14 @@ class PartitionFilterOnMap : public PartitionFilter
 	PartitionFilterOnMap() { }
 protected:
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterOnMap"; }
 #endif
 };
 
 //=====================================
 /**
- * Reject buildings, unless they can attack, or 
+ * Reject buildings, unless they can attack, or
  * we are the computer-controlled AI and the building
  * is owned by the enemy.
  */
@@ -932,7 +928,7 @@ class PartitionFilterRejectBuildings : public PartitionFilter
 	PartitionFilterRejectBuildings(const Object *o);
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterRejectBuildings"; }
 #endif
 };
@@ -940,7 +936,7 @@ class PartitionFilterRejectBuildings : public PartitionFilter
 //=====================================
 /**
  * Accept/Reject Insignificant buildings
- * Note: This will allow things that 
+ * Note: This will allow things that
  */
 class PartitionFilterInsignificantBuildings : public PartitionFilter
 {
@@ -948,11 +944,11 @@ class PartitionFilterInsignificantBuildings : public PartitionFilter
 	Bool m_allowNonBuildings;
 	Bool m_allowInsignificant;
 public:
-	PartitionFilterInsignificantBuildings(Bool allowNonBuildings, Bool allowInsignificant) : 
+	PartitionFilterInsignificantBuildings(Bool allowNonBuildings, Bool allowInsignificant) :
 			m_allowNonBuildings(allowNonBuildings), m_allowInsignificant(allowInsignificant) {}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterInsignificantBuildings"; }
 #endif
 };
@@ -966,11 +962,11 @@ class PartitionFilterFreeOfFog : public PartitionFilter
 private:
 	Int m_comparisonIndex;
 public:
-	PartitionFilterFreeOfFog(Int toWhom) : 
+	PartitionFilterFreeOfFog(Int toWhom) :
 			m_comparisonIndex(toWhom){}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterFreeOfFog"; }
 #endif
 };
@@ -987,7 +983,7 @@ class PartitionFilterRepulsor : public PartitionFilter
 	PartitionFilterRepulsor(const Object *o) : m_self(o) { }
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterRepulsor"; }
 #endif
 };
@@ -1008,7 +1004,7 @@ class PartitionFilterIrregularArea : public PartitionFilter
 	PartitionFilterIrregularArea(Coord3D* area, Int numPointsInArea) : m_area(area), m_numPointsInArea(numPointsInArea) {}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterIrregularArea"; }
 #endif
 };
@@ -1028,7 +1024,7 @@ class PartitionFilterPolygonTrigger : public PartitionFilter
 	PartitionFilterPolygonTrigger(const PolygonTrigger *trigger) : m_trigger(trigger) {}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterPolygonTrigger"; }
 #endif
 };
@@ -1048,7 +1044,7 @@ class PartitionFilterPlayer : public PartitionFilter
 	PartitionFilterPlayer(const Player *player, Bool match) : m_player(player), m_match(match) {}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterPlayer"; }
 #endif
 };
@@ -1056,7 +1052,7 @@ class PartitionFilterPlayer : public PartitionFilter
 //=====================================
 /**
  * Allow or reject (based on match) all Objects whose affiliation matches one of those
- * specified by 
+ * specified by
  */
 class PartitionFilterPlayerAffiliation : public PartitionFilter
 {
@@ -1068,12 +1064,12 @@ class PartitionFilterPlayerAffiliation : public PartitionFilter
 public:
 	// whichAffiliation should use AllowPlayerRelationship flags specified in PlayerList.h
 	PartitionFilterPlayerAffiliation(const Player *player, UnsignedInt whichAffiliation, Bool match)
-		: m_player(player), m_affiliation(whichAffiliation), m_match(match) 
+		: m_player(player), m_affiliation(whichAffiliation), m_match(match)
 	{
 	}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterPlayerAffiliation"; }
 #endif
 };
@@ -1090,10 +1086,12 @@ class PartitionFilterThing : public PartitionFilter
 	Bool  m_match;
 
 public:
-	PartitionFilterThing(const ThingTemplate *thing, Bool match) : m_tThing(thing), m_match(match) {}
+	PartitionFilterThing(const ThingTemplate *thing, Bool match) : m_tThing(thing), m_match(match) {
+		DEBUG_ASSERTCRASH(m_tThing != NULL, ("ThingTemplate for PartitionFilterThing is NULL"));
+	}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterThing"; }
 #endif
 };
@@ -1109,16 +1107,13 @@ class PartitionFilterGarrisonable : public PartitionFilter
 	Bool  m_match;
 
 public:
-	PartitionFilterGarrisonable( Bool match ) : m_match(match) 
+	PartitionFilterGarrisonable( Bool match ) : m_match(match)
 	{
-		//Added By Sadullah Nader
-		//Initializations 
 		m_player = NULL;
-		//
 	}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterGarrisonable"; }
 #endif
 };
@@ -1136,19 +1131,19 @@ class PartitionFilterGarrisonableByPlayer : public PartitionFilter
 
 public:
 	PartitionFilterGarrisonableByPlayer( Player *player, Bool match, CommandSourceType commandSource ):
-			m_player(player), m_match(match), m_commandSource(commandSource) 
+			m_player(player), m_match(match), m_commandSource(commandSource)
 	{
 	}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterGarrisonableByPlayer"; }
 #endif
 };
 
 //=====================================
 /**
- * Accept all objects that are/n't unmanned. 
+ * Accept all objects that are/n't unmanned.
  */
 class PartitionFilterUnmannedObject : public PartitionFilter
 {
@@ -1159,7 +1154,7 @@ class PartitionFilterUnmannedObject : public PartitionFilter
 	PartitionFilterUnmannedObject( Bool match ) : m_match(match) {}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterUnmannedObject"; }
 #endif
 };
@@ -1177,17 +1172,17 @@ class PartitionFilterValidCommandButtonTarget : public PartitionFilter
 	CommandSourceType m_commandSource;
 
 public:
-	PartitionFilterValidCommandButtonTarget( Object *source, const CommandButton *commandButton, Bool match, CommandSourceType commandSource) : 
+	PartitionFilterValidCommandButtonTarget( Object *source, const CommandButton *commandButton, Bool match, CommandSourceType commandSource) :
 		m_source(source), m_commandButton(commandButton), m_match(match), m_commandSource(commandSource) {}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterValidCommandButtonTarget"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	PartitionManager is the singleton class that manages the entire partition/collision
 	system. It maintains the set of PartitionCells that correspond to the world system,
 	and updates the PartitionDatas as needed during update phase.
@@ -1224,15 +1219,15 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 protected:
 
 	/**
-		This is an internal function that is used to implement the public 
-		getClosestObject and iterateObjects calls. 
+		This is an internal function that is used to implement the public
+		getClosestObject and iterateObjects calls.
 	*/
 	Object *getClosestObjects(
-		const Object *obj, 
-		const Coord3D *pos, 
-		Real maxDist, 
-		DistanceCalculationType dc, 
-		PartitionFilter **filters, 
+		const Object *obj,
+		const Coord3D *pos,
+		Real maxDist,
+		DistanceCalculationType dc,
+		PartitionFilter **filters,
 		SimpleObjectIterator *iter,	// if nonnull, append ALL satisfactory objects to the iterator (not just the single closest)
 		Real *closestDistArg,
 		Coord3D *closestVecArg
@@ -1247,7 +1242,7 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	typedef Int (*CellAlongLineProc)(PartitionCell* cell, void* userData);
 
 	Int iterateCellsAlongLine(const Coord3D& pos, const Coord3D& posOther, CellAlongLineProc proc, void* userData);
-	
+
 	// note iterateCellsBreadthFirst returns the cell index that made the CellBreadthFirstProc return
 	// non-Zero.
 	typedef Int (*CellBreadthFirstProc)(PartitionCell* cell, void* userData);
@@ -1258,7 +1253,7 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	void calcRadiusVec();
 #endif
 
-	// These are all friend functions now. They will continue to function as before, but can be passed into 
+	// These are all friend functions now. They will continue to function as before, but can be passed into
 	// the DiscreteCircle::drawCircle function.
 	friend void hLineAddLooker(Int x1, Int x2, Int y, void *playerIndex);
 	friend void hLineRemoveLooker(Int x1, Int x2, Int y, void *playerIndex);
@@ -1289,7 +1284,7 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	void xfer( Xfer *xfer );
 	void loadPostProcess( void );
 
-	inline Bool getUpdatedSinceLastReset( void ) const { return m_updatedSinceLastReset; }
+	Bool getUpdatedSinceLastReset( void ) const { return m_updatedSinceLastReset; }
 
 	void registerObject( Object *object );				///< add thing to system
 	void unRegisterObject( Object *object );			///< remove thing from system
@@ -1308,7 +1303,7 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	PartitionCell *getCellAt(Int x, Int y);
 	const PartitionCell *getCellAt(Int x, Int y) const;
 
-	/// A convenience funtion to reveal shroud at some location 
+	/// A convenience funtion to reveal shroud at some location
 	// Queueing does not give you control of the timestamp to enforce the queue.  I own the delay, you don't.
 	void doShroudReveal( Real centerX, Real centerY, Real radius, PlayerMaskType playerMask);
 	void undoShroudReveal( Real centerX, Real centerY, Real radius, PlayerMaskType playerMask);
@@ -1326,24 +1321,24 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	void getCellCenterPos(Int x, Int y, Real& xx, Real& yy);
 
 	// find the cell that covers the world coords (wx,wy) and return its coords.
-	void worldToCell(Real wx, Real wy, Int *cx, Int *cy);
+	void worldToCell(Real wx, Real wy, Int *cx, Int *cy) const;
 
 	// given a distance in world coords, return the number of cells needed to cover that distance (rounding up)
 	Int worldToCellDist(Real w);
 
 	Object *getClosestObject(
-		const Object *obj, 
-		Real maxDist, 
-		DistanceCalculationType dc, 
-		PartitionFilter **filters = NULL, 
+		const Object *obj,
+		Real maxDist,
+		DistanceCalculationType dc,
+		PartitionFilter **filters = NULL,
 		Real *closestDist = NULL,
 		Coord3D *closestDistVec = NULL
 	);
 	Object *getClosestObject(
-		const Coord3D *pos, 
-		Real maxDist, 
-		DistanceCalculationType dc, 
-		PartitionFilter **filters = NULL, 
+		const Coord3D *pos,
+		Real maxDist,
+		DistanceCalculationType dc,
+		PartitionFilter **filters = NULL,
 		Real *closestDist = NULL,
 		Coord3D *closestDistVec = NULL
 	);
@@ -1374,48 +1369,48 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 #endif
 
 	SimpleObjectIterator *iterateObjectsInRange(
-		const Object *obj, 
-		Real maxDist, 
-		DistanceCalculationType dc, 
-		PartitionFilter **filters = NULL, 
+		const Object *obj,
+		Real maxDist,
+		DistanceCalculationType dc,
+		PartitionFilter **filters = NULL,
 		IterOrderType order = ITER_FASTEST
 	);
 
 	SimpleObjectIterator *iterateObjectsInRange(
-		const Coord3D *pos, 
-		Real maxDist, 
-		DistanceCalculationType dc, 
-		PartitionFilter **filters = NULL, 
+		const Coord3D *pos,
+		Real maxDist,
+		DistanceCalculationType dc,
+		PartitionFilter **filters = NULL,
 		IterOrderType order = ITER_FASTEST
 	);
 
-	SimpleObjectIterator *iterateAllObjects(PartitionFilter **filters = NULL);		
+	SimpleObjectIterator *iterateAllObjects(PartitionFilter **filters = NULL);
 
 	/**
 		return the Objects that would (or would not) collide with the given
 		geometry.
 	*/
 	SimpleObjectIterator* iteratePotentialCollisions(
-		const Coord3D* pos, 
+		const Coord3D* pos,
 		const GeometryInfo& geom,
 		Real angle,
 		Bool use2D = false
 	);
-	
+
 	Bool isColliding( const Object *a, const Object *b ) const;
 
-	/// Checks a geometry against an arbitrary geometry. 
-	Bool geomCollidesWithGeom( const Coord3D* pos1, 
+	/// Checks a geometry against an arbitrary geometry.
+	Bool geomCollidesWithGeom( const Coord3D* pos1,
 							const GeometryInfo& geom1,
-							Real angle1, 
-							const Coord3D* pos2, 
+							Real angle1,
+							const Coord3D* pos2,
 							const GeometryInfo& geom2,
-							Real angle2 
+							Real angle2
   ) const;
 
 	/// finding legal positions in the world
 	Bool findPositionAround( const Coord3D *center,
-													 const FindPositionOptions *options, 
+													 const FindPositionOptions *options,
 													 Coord3D *result );
 
 	/// return the size of a PartitionCell, in world coords.
@@ -1424,26 +1419,26 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	/// return (1.0 / getCellSize); this is used frequently, so we cache it for efficiency
 	Real getCellSizeInv() { return m_cellSizeInv; }
 
-	/** 
+	/**
 		return true iff there is clear line-of-sight between the two positions.
-		this only takes terrain into account; it does not consider objects, units, 
-		trees, buildings, etc. 
+		this only takes terrain into account; it does not consider objects, units,
+		trees, buildings, etc.
 	*/
 	Bool isClearLineOfSightTerrain(const Object* obj, const Coord3D& objPos, const Object* other, const Coord3D& otherPos);
 
-	inline Bool isInListDirtyModules(PartitionData* o) const
+	Bool isInListDirtyModules(PartitionData* o) const
 	{
 		return o->isInListDirtyModules(&m_dirtyModules);
 	}
-	inline void prependToDirtyModules(PartitionData* o)
+	void prependToDirtyModules(PartitionData* o)
 	{
 		o->prependToDirtyModules(&m_dirtyModules);
 	}
-	inline void removeFromDirtyModules(PartitionData* o)
+	void removeFromDirtyModules(PartitionData* o)
 	{
 		o->removeFromDirtyModules(&m_dirtyModules);
 	}
-	inline void removeAllDirtyModules()
+	void removeAllDirtyModules()
 	{
 		while (m_dirtyModules)
 		{
@@ -1452,22 +1447,22 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 		}
 	}
 
-	/** 
+	/**
 		Reveals the map for the given player, but does not override Shroud generation.  (Script)
 		*/
 	void revealMapForPlayer( Int playerIndex );
 
-	/** 
+	/**
 		Reveals the map for the given player, AND permanently disables all Shroud generation (Observer Mode).
 		*/
 	void revealMapForPlayerPermanently( Int playerIndex );
 
-	/** 
+	/**
 		Adds a layer of permanent blindness.  Used solely to undo the permanent reveal for debugging
 		*/
 	void undoRevealMapForPlayerPermanently( Int playerIndex );
 
-	/** 
+	/**
 		Resets the shroud for the given player with passive shroud (can re-explore).
 		*/
 	void shroudMapForPlayer( Int playerIndex );
@@ -1484,20 +1479,22 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	CellShroudStatus getShroudStatusForPlayer( Int playerIndex, Int x, Int y ) const;
 	CellShroudStatus getShroudStatusForPlayer( Int playerIndex, const Coord3D *loc ) const;
 
+	ObjectShroudStatus getPropShroudStatusForPlayer(Int playerIndex, const Coord3D *loc ) const;
+
 	Real getGroundOrStructureHeight(Real posx, Real posy);
 
 	void getMostValuableLocation( Int playerIndex, UnsignedInt whichPlayerTypes, ValueOrThreat valType, Coord3D *outLocation );
 	void getNearestGroupWithValue( Int playerIndex, UnsignedInt whichPlayerTypes, ValueOrThreat valType, const Coord3D *sourceLocation,
 																 Int valueRequired, Bool greaterThan, Coord3D *outLocation );
 
-	// If saveToFog is true, then we are writing STORE_FOG. 
+	// If saveToFog is true, then we are writing STORE_FOG.
 	// If saveToFog is false, then we are writing STORE_PERMENANT_REVEAL
 	void storeFoggedCells(ShroudStatusStoreRestore &outPartitionStore, Bool storeToFog) const;
 	void restoreFoggedCells(const ShroudStatusStoreRestore &inPartitionStore, Bool restoreToFog);
-};  // end class PartitionManager
+};
 
 // -----------------------------------------------------------------------------
-inline void PartitionManager::worldToCell(Real wx, Real wy, Int *cx, Int *cy)
+inline void PartitionManager::worldToCell(Real wx, Real wy, Int *cx, Int *cy) const
 {
 	*cx = REAL_TO_INT_FLOOR((wx - m_worldExtents.lo.x) * m_cellSizeInv);
 	*cy = REAL_TO_INT_FLOOR((wy - m_worldExtents.lo.y) * m_cellSizeInv);
@@ -1514,7 +1511,7 @@ inline PartitionCell *PartitionManager::getCellAt(Int x, Int y)
 {
 	return (x < 0 || y < 0 || x >= m_cellCountX || y >= m_cellCountY) ? NULL : &m_cells[y * m_cellCountX + x];
 }
-	
+
 //-----------------------------------------------------------------------------
 inline const PartitionCell *PartitionManager::getCellAt(Int x, Int y) const
 {
@@ -1551,13 +1548,10 @@ class CellOutwardIterator
 #endif
 
 //-----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//           Externals                                                     
+//           Externals
 //-----------------------------------------------------------------------------
 extern PartitionManager *ThePartitionManager;  ///< object manager singleton
-
-#endif // __PARTITIONMANAGER_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h b/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h
index 35e24e647d7..2cd94188ee0 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h
@@ -25,17 +25,14 @@
 
 // PolygonTrigger.h
 // Class to encapsulate polygon triggers for maps.
-// Note - Polygons are used for two reasons - one is area triggers for 
-// scripts, so units can be tested for entering or exiting areas, and 
+// Note - Polygons are used for two reasons - one is area triggers for
+// scripts, so units can be tested for entering or exiting areas, and
 // second to specify areas that are filled with water in the map.
 // See the m_isWaterArea to differentiate.
 // Author: John Ahlquist, November 2001
 
 #pragma once
 
-#ifndef PolygonTrigger_H
-#define PolygonTrigger_H
-
 #include "Common/GameMemory.h"
 #include "Common/Snapshot.h"
 #include "Common/STLTypedefs.h"
@@ -57,7 +54,7 @@ class WaterHandle
 
 	WaterHandle( void ) { m_polygon = NULL; }
 
-	///@todo we need to formalize the water systems 
+	///@todo we need to formalize the water systems
 	PolygonTrigger *m_polygon;	///< valid when water is a polygon area, NULL if water is a grid
 
 };
@@ -67,7 +64,7 @@ class WaterHandle
 class PolygonTrigger : public MemoryPoolObject,
 											 public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PolygonTrigger, "PolygonTrigger")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PolygonTrigger, "PolygonTrigger")
 
 protected:
 	PolygonTrigger*		m_nextPolygonTrigger;		///< linked list.
@@ -77,7 +74,7 @@ class PolygonTrigger : public MemoryPoolObject,
 	ICoord3D*					m_points;	///< Points that are the polygon.
 	Int								m_numPoints; ///< Num points in m_points.
 	Int								m_sizePoints; ///< Space allocated for m_points.
-	mutable IRegion2D	m_bounds;  ///< 2D bounding box for quick checks.	
+	mutable IRegion2D	m_bounds;  ///< 2D bounding box for quick checks.
 	mutable Real			m_radius;
 	Int								m_riverStart;	///< Identifies the start point of the river.
 	mutable Bool			m_boundsNeedsUpdate;
@@ -130,16 +127,14 @@ class PolygonTrigger : public MemoryPoolObject,
 	const PolygonTrigger *getNext(void) const {return m_nextPolygonTrigger;}
 	AsciiString getTriggerName(void)  const {return m_triggerName;} ///< Gets the trigger name.
 	Bool pointInTrigger(ICoord3D &point) const;
-	Bool doExportWithScripts(void) const {return m_exportWithScripts;} 
-	void setDoExportWithScripts(Bool val) {m_exportWithScripts = val;} 
-	Bool isWaterArea(void) const {return m_isWaterArea;} 
-	void setWaterArea(Bool val) {m_isWaterArea = val;} 
-	Bool isRiver(void) const {return m_isRiver;} 
-	void setRiver(Bool val) {m_isRiver = val;} 
-	Int getRiverStart(void) const {return m_riverStart;} 
-	void setRiverStart(Int val) {m_riverStart = val;} 
+	Bool doExportWithScripts(void) const {return m_exportWithScripts;}
+	void setDoExportWithScripts(Bool val) {m_exportWithScripts = val;}
+	Bool isWaterArea(void) const {return m_isWaterArea;}
+	void setWaterArea(Bool val) {m_isWaterArea = val;}
+	Bool isRiver(void) const {return m_isRiver;}
+	void setRiver(Bool val) {m_isRiver = val;}
+	Int getRiverStart(void) const {return m_riverStart;}
+	void setRiverStart(Int val) {m_riverStart = val;}
 	const WaterHandle* getWaterHandle(void) const;
 	Bool isValid(void) const;
 };
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Powers.h b/Generals/Code/GameEngine/Include/GameLogic/Powers.h
index e77e92b42f1..53438b12446 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Powers.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Powers.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __POWERS_H_
-#define __POWERS_H_
-
 //
 // skeleton definition of unit powers
 //
@@ -39,16 +36,16 @@
 // power bit flags, keep this in sync with PowerNames
 enum
 {
-	POWER_NONE = 0,				// 0x0000000000000000 
-	POWER_FASTER,					// 0x0000000000000001 
-	POWER_DOUBLE_SHOT,		// 0x0000000000000002 
-	POWER_SELF_HEALING,		// 0x0000000000000004 
+	POWER_NONE = 0,				// 0x0000000000000000
+	POWER_FASTER,					// 0x0000000000000001
+	POWER_DOUBLE_SHOT,		// 0x0000000000000002
+	POWER_SELF_HEALING,		// 0x0000000000000004
 
 	POWERS_NUM_POWERS
 };
 
 #ifdef DEFINE_POWER_NAMES
-static const char *PowerNames[] = 
+static const char *const PowerNames[] =
 {
 	"NONE",
 	"FASTER",
@@ -56,7 +53,5 @@ static const char *PowerNames[] =
 	"SELF_HEALING",
 	NULL
 };
+static_assert(ARRAY_SIZE(PowerNames) == POWERS_NUM_POWERS + 1, "Incorrect array size");
 #endif  // end DEFINE_POWER_NAMES
-
-#endif // __POWERS_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h b/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h
index 44aaf8d8e9f..581928a9eff 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RankInfo_H_
-#define __RankInfo_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Science.h"
 #include "Common/UnicodeString.h"
@@ -76,7 +73,3 @@ class RankInfoStore : public SubsystemInterface
 };
 
 extern RankInfoStore* TheRankInfoStore;
-
-
-#endif // __RankInfo_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h
index 47da7cf3163..4a9d99212c6 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SCRIPTACTIONS_H_
-#define __SCRIPTACTIONS_H_
-
 class ScriptAction;
 class GameWindow;
 class	Team;
@@ -60,7 +57,7 @@ class ScriptActionsInterface : public SubsystemInterface
 
 	// Called by the script engine in postProcessLoad()
 	virtual void doEnableOrDisableObjectDifficultyBonuses(Bool enableBonuses) = 0;
-};  // end class ScriptActionsInterface
+};
 extern ScriptActionsInterface *TheScriptActions;   ///< singleton definition
 
 
@@ -160,12 +157,12 @@ class ScriptActions : public ScriptActionsInterface
 	void doTeamHuntWithCommandButton(const AsciiString& teamName, const AsciiString& commandButton);
 	void doPlayerHunt(const AsciiString& playerName);
 	void doNamedDelete(const AsciiString& unitName);
-	
+
 	void doTeamGarrisonSpecificBuilding(const AsciiString& teamName, const AsciiString& buildingName);
 	void doTeamGarrisonNearestBuilding(const AsciiString& teamName);
 	void doTeamExitAllBuildings(const AsciiString& teamName);
 	void doExitSpecificBuilding(const AsciiString& buildingName);
-	
+
 	void doUnitGarrisonSpecificBuilding(const AsciiString& unitName, const AsciiString& buildingName);
 	void doUnitGarrisonNearestBuilding(const AsciiString& unitName);
 	void doUnitExitBuilding(const AsciiString& unitName);
@@ -175,10 +172,10 @@ class ScriptActions : public ScriptActionsInterface
 	void doLetterBoxMode(Bool startLetterbox);	// if true, start it. If false, end it.
 	void doBlackWhiteMode(Bool startBWMode, Int frames);	// if true, start it. If false, end it.
 	void doSkyBox(Bool showSkyBox);	// if true, start it. If false, end it.
-	
+
 	void doFreezeTime( void );
 	void doUnfreezeTime( void );
-	
+
 	void doMilitaryCaption(const AsciiString& briefing, Int duration);
 	void doCameraSetAudibleDistance(Real audibleDistance);
 
@@ -186,7 +183,7 @@ class ScriptActions : public ScriptActionsInterface
 
 	void doNamedSetStoppingDistance(const AsciiString& unit, Real stoppingDistance);
 	void doSetStoppingDistance(const AsciiString& team, Real stoppingDistance);
-	
+
 	void doDisableSpecialPowerDisplay( void );
 	void doEnableSpecialPowerDisplay( void );
 	void doNamedHideSpecialPowerDisplay( const AsciiString& unit );
@@ -215,9 +212,9 @@ class ScriptActions : public ScriptActionsInterface
 	void doHideCounter(const AsciiString& counterName);
 
 	void doAudioSetVolume(AudioAffect whichToAffect, Real newVolumeLevel);
-	
+
 	void doTransferTeamToPlayer(const AsciiString& teamName, const AsciiString& playerName);
-	
+
 	void doSetMoney(const AsciiString& playerName, Int money);		// Set a player's cash reserves to a specific value.
 	void doGiveMoney(const AsciiString& playerName, Int money);	// Add/subtract cash from a player's reserves.
 
@@ -366,7 +363,7 @@ class ScriptActions : public ScriptActionsInterface
 	void doGuardSupplyCenter(const AsciiString& teamName, Int supplies);
 	void doTeamGuardInTunnelNetwork(const AsciiString& teamName);
 	void doAffectPlayerSkillset(const AsciiString& playerName, Int skillset);
-	void doOverrideHulkLifetime( Real seconds );	
+	void doOverrideHulkLifetime( Real seconds );
 	void doNamedFaceNamed( const AsciiString &unitName, const AsciiString &faceUnitName );
 	void doNamedFaceWaypoint( const AsciiString &unitName, const AsciiString &faceWaypointName );
 	void doTeamFaceNamed( const AsciiString &teamName, const AsciiString &faceUnitName );
@@ -376,10 +373,5 @@ class ScriptActions : public ScriptActionsInterface
 	void doAffectSkillPointsModifier(const AsciiString& playerName, Real newModifier);
 	void doResizeViewGuardband(const Real gbx, const Real gby );
 	void deleteAllUnmanned();
-	
-};  // end class ScriptActions
-
-
-#endif  // end __SCRIPTACTIONS_H_
-
 
+};
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h
index 71669f9ac31..4bc9c058c8e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SCRIPTCONDITIONS_H_
-#define __SCRIPTCONDITIONS_H_
-
 class Condition;
 class ObjectTypes;
 class Parameter;
@@ -57,7 +54,7 @@ class ScriptConditionsInterface : public SubsystemInterface
 	virtual Bool evaluateSkirmishCommandButtonIsReady( Parameter *pSkirmishPlayerParm, Parameter *pTeamParm, Parameter *pCommandButtonParm, Bool allReady ) = 0;
 	virtual Bool evaluateTeamIsContained(Parameter *pTeamParm, Bool allContained) = 0;
 
-};  // end class ScriptConditionsInterface
+};
 extern ScriptConditionsInterface *TheScriptConditions;   ///< singleton definition
 
 
@@ -95,7 +92,7 @@ class ScriptConditions : public ScriptConditionsInterface
 	Bool evaluateNamedUnitDying(Parameter *pUnitParm);
 	Bool evaluateNamedUnitTotallyDead(Parameter *pUnitParm);
 	Bool evaluateHasUnits(Parameter *pTeamParm);
-	
+
 	Bool evaluateTeamEnteredAreaEntirely(Parameter *pTeamParm, Parameter *pTriggerParm, Parameter *pTypeParm);
 	Bool evaluateTeamEnteredAreaPartially(Parameter *pTeamParm, Parameter *pTriggerParm, Parameter *pTypeParm);
 	Bool evaluateTeamExitedAreaEntirely(Parameter *pTeamParm, Parameter *pTriggerParm, Parameter *pTypeParm);
@@ -108,7 +105,7 @@ class ScriptConditions : public ScriptConditionsInterface
 	Bool evaluateNamedExitedArea(Parameter *pUnitParm, Parameter *pTriggerParm);
 	Bool evaluateNamedInsideArea(Parameter *pUnitParm, Parameter *pTriggerParm);
 	Bool evaluateNamedOutsideArea(Parameter *pUnitParm, Parameter *pTriggerParm);
-	
+
 	Bool evaluateTeamStateIs(Parameter *pTeamParm, Parameter *pStateParm);
 	Bool evaluateTeamStateIsNot(Parameter *pTeamParm, Parameter *pStateParm);
 	Bool evaluatePlayerHasCredits(Parameter *pCreditsParm, Parameter* pComparisonParm, Parameter *pPlayerParm);
@@ -160,7 +157,7 @@ class ScriptConditions : public ScriptConditionsInterface
 	Bool evaluateMusicHasCompleted(Parameter *pMusicParm, Parameter *pIntParm);
 	Bool evaluatePlayerLostObjectType(Parameter *pPlayerParm, Parameter *pTypeParm);
 
-	// Skirmish Scripts. Please note that ALL Skirmish conditions should first pass a pSkirmishPlayerParm to 
+	// Skirmish Scripts. Please note that ALL Skirmish conditions should first pass a pSkirmishPlayerParm to
 	// prevent the necessity of having to write additional scripts for other players / skirmish types later.
 	Bool evaluateSkirmishSpecialPowerIsReady(Parameter *pSkirmishPlayerParm, Parameter *pPower);
 	Bool evaluateSkirmishValueInArea(Condition *pCondition, Parameter *pSkirmishPlayerParm, Parameter *pComparisonParm, Parameter *pMoneyParm, Parameter *pTriggerParm);
@@ -181,12 +178,9 @@ class ScriptConditions : public ScriptConditionsInterface
 	Bool evaluateSkirmishSupplySourceAttacked(Parameter *pSkirmishPlayerParm );
 	Bool evaluateSkirmishStartPosition(Parameter *pSkirmishPlayerParm, Parameter *startNdx );
 
-	
+
 	// Stubs
 	Bool evaluateMissionAttempts(Parameter *pPlayerParm, Parameter *pComparisonParm, Parameter *pAttemptsParm);
 
 
-};  // end class ScriptConditions
-
-
-#endif  // end __SCRIPTCONDITIONS_H_
+};
diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h
index af7ed44b27e..bc025c88d8e 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SCRIPTENGINE_H_
-#define __SCRIPTENGINE_H_
-
 #include "Common/GameType.h"
 #include "Common/GameMemory.h"
 #include "Common/STLTypedefs.h"
@@ -50,13 +47,13 @@ class Player;
 class PolygonTrigger;
 class ObjectTypes;
 
-#ifdef RTS_INTERNAL
+#ifdef RTS_PROFILE
 #define SPECIAL_SCRIPT_PROFILING
 #endif
 
 // Slightly odd place to put breeze info, but the breeze info is
 // set by script, so it's as good a place as any.  john a.
-struct BreezeInfo 
+struct BreezeInfo
 {
 	Real		m_direction;				///< Direction of the breeze in radians. 0 == +x direction.
 	Coord2D	m_directionVec;			///< sin/cos of direction, for efficiency.
@@ -73,7 +70,7 @@ struct NamedReveal
 	AsciiString m_revealName;
 	AsciiString m_waypointName;
 	Real				m_radiusToReveal;
-	AsciiString m_playerName; 
+	AsciiString m_playerName;
 };
 
 struct TScriptListReadInfo
@@ -122,7 +119,7 @@ typedef AllObjectTypes::iterator AllObjectTypesIt;
 typedef std::vector<NamedReveal> VecNamedReveal;
 typedef VecNamedReveal::iterator VecNamedRevealIt;
 
-// TheSuperHackers @compile xezon 17/03/2025 Fixes destructor visibility by removing MemoryPoolObject base class.
+// TheSuperHackers @build xezon 17/03/2025 Fixes destructor visibility by removing MemoryPoolObject base class.
 // MemoryPoolObject looks to be unnecessary because it is never dynamically allocated.
 class AttackPriorityInfo : public Snapshot
 {
@@ -160,7 +157,7 @@ class AttackPriorityInfo : public Snapshot
 
 class SequentialScript : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SequentialScript, "SequentialScript")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SequentialScript, "SequentialScript")
 
 public:
 
@@ -190,7 +187,7 @@ EMPTY_DTOR(SequentialScript)
 #ifdef NOT_IN_USE
 class SequentialScriptStatus : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SequentialScriptStatus, "SequentialScriptStatus")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SequentialScriptStatus, "SequentialScriptStatus")
 
 public:
 
@@ -234,7 +231,7 @@ class ScriptEngine : public SubsystemInterface,
 	UnsignedInt getFrameObjectCountChanged(void) {return m_frameObjectCountChanged;}
 	void setSequentialTimer(Object *obj, Int frameCount);
 	void setSequentialTimer(Team *team, Int frameCount);
-	
+
 	void removeAllSequentialScripts(Object *obj);
 	void removeAllSequentialScripts(Team *team);
 
@@ -263,7 +260,7 @@ class ScriptEngine : public SubsystemInterface,
 	Bool hasShownMPLocalDefeatWindow(void);
 	void markMPLocalDefeatWindowShown(void);
 
-	// NOTE NOTE NOTE: do not store of the return value of this call (getObjectTypeList) beyond the life of the 
+	// NOTE NOTE NOTE: do not store of the return value of this call (getObjectTypeList) beyond the life of the
 	// function it will be used in, as it can be deleted from under you if maintenance is performed on the object.
 	virtual ObjectTypes *getObjectTypes(const AsciiString& objectTypeList);
 	virtual void doObjectTypeListMaintenance(const AsciiString& objectTypeList, const AsciiString& objectType, Bool addObject);
@@ -274,7 +271,7 @@ class ScriptEngine : public SubsystemInterface,
 	// For other systems to evaluate Conditions, execute Actions, etc.
 
 	///< if pThisTeam is specified, then scripts in here can use <This Team> to mean the team this script is attached to.
-	virtual Bool evaluateConditions( Script *pScript, Team *pThisTeam = NULL, Player *pPlayer=NULL );	
+	virtual Bool evaluateConditions( Script *pScript, Team *pThisTeam = NULL, Player *pPlayer=NULL );
 	virtual void friend_executeAction( ScriptAction *pActionHead, Team *pThisTeam = NULL);	///< Use this at yer peril.
 
 	virtual Object *getUnitNamed(const AsciiString& unitName); ///< Gets the named unit. May be null.
@@ -289,7 +286,7 @@ class ScriptEngine : public SubsystemInterface,
 	virtual void notifyOfCompletedSpecialPower( Int playerIndex, const AsciiString& completedPower, ObjectID sourceObj );
 	virtual void notifyOfCompletedUpgrade			( Int playerIndex, const AsciiString& upgrade,				 ObjectID sourceObj );
 	virtual void notifyOfAcquiredScience				( Int playerIndex, ScienceType science );
-	
+
 	virtual void signalUIInteract(const AsciiString& hookName);	///< Notify that a UI button was pressed and some flag should go true, for one frame only.
 
 	virtual Bool isVideoComplete( const AsciiString& completedVideo, Bool removeFromList );	///< Determine whether a video has completed
@@ -305,9 +302,9 @@ class ScriptEngine : public SubsystemInterface,
 	virtual void adjustToppleDirection( Object *object, Coord2D *direction);
 	virtual void adjustToppleDirection( Object *object, Coord3D *direction);
 	virtual const Script *findScriptByName(const AsciiString& scriptName) {return findScript(scriptName);} ///<  Finds a script.
-		
+
 	const BreezeInfo& getBreezeInfo() const {return m_breezeInfo;}
-	
+
 	Bool isTimeFrozenScript( void );		///< Ask whether a script has frozen time or not
 	void doFreezeTime( void );
 	void doUnfreezeTime( void );
@@ -334,9 +331,9 @@ class ScriptEngine : public SubsystemInterface,
 	/// Attack priority stuff.
 	const AttackPriorityInfo *getDefaultAttackInfo(void);
 	const AttackPriorityInfo *getAttackInfo(const AsciiString& name);
-	
-	const TCounter *getCounter(const AsciiString& counterName);	
-	
+
+	const TCounter *getCounter(const AsciiString& counterName);
+
 	void createNamedMapReveal(const AsciiString& revealName, const AsciiString& waypointName, Real radiusToReveal, const AsciiString& playerName);
 	void doNamedMapReveal(const AsciiString& revealName);
 	void undoNamedMapReveal(const AsciiString& revealName);
@@ -352,7 +349,7 @@ class ScriptEngine : public SubsystemInterface,
 	void setEnableVTune(Bool value);
 	Bool getEnableVTune() const;
 	///End VTUNE
-//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+//#if defined(RTS_DEBUG)
 	void debugVictory( void );
 //#endif
 protected:
@@ -406,13 +403,13 @@ class ScriptEngine : public SubsystemInterface,
 	typedef VecSequentialScriptPtr::iterator VecSequentialScriptPtrIt;
 
 	VecSequentialScriptPtr m_sequentialScripts;
-	
+
 	void evaluateAndProgressAllSequentialScripts( void );
 	VecSequentialScriptPtrIt cleanupSequentialScript(VecSequentialScriptPtrIt it, Bool cleanDanglers);
 
 	Bool hasUnitCompletedSequentialScript( Object *object, const AsciiString& sequentialScriptName );
 	Bool hasTeamCompletedSequentialScript( Team *team, const AsciiString& sequentialScriptName );
-	
+
 
 
 
@@ -432,7 +429,7 @@ class ScriptEngine : public SubsystemInterface,
 	Team							*m_conditionTeam;				///< Team that is being used to evaluate conditions, used for THIS_TEAM
 	Object						*m_conditionObject;				///< Unit that is being used to evaluate conditions, used for THIS_OBJECT
 	VecNamedRequests	m_namedObjects;
-	Bool							m_firstUpdate;			
+	Bool							m_firstUpdate;
 	Player						*m_currentPlayer;
 	Player						*m_skirmishHumanPlayer;
 	AsciiString				m_currentTrackName;
@@ -456,7 +453,7 @@ class ScriptEngine : public SubsystemInterface,
 	ListAsciiStringUINT		m_testingAudio;
 
 	ListAsciiString				m_uiInteractions;
-	
+
 	ListAsciiStringObjectID	m_triggeredSpecialPowers[MAX_PLAYER_COUNT];
 	ListAsciiStringObjectID	m_midwaySpecialPowers		[MAX_PLAYER_COUNT];
 	ListAsciiStringObjectID	m_finishedSpecialPowers	[MAX_PLAYER_COUNT];
@@ -474,7 +471,7 @@ class ScriptEngine : public SubsystemInterface,
 	AllObjectTypes		m_allObjectTypeLists;
 	Bool							m_objectsShouldReceiveDifficultyBonus;
 	Bool							m_ChooseVictimAlwaysUsesNormal;
-	
+
 	Bool							m_shownMPLocalDefeatWindow;
 
 #ifdef SPECIAL_SCRIPT_PROFILING
@@ -486,9 +483,6 @@ class ScriptEngine : public SubsystemInterface,
 #endif
 #endif
 
-};  // end class ScriptEngine
+};
 
 extern ScriptEngine *TheScriptEngine;   ///< singleton definition
-																				
-
-#endif  // end __SCRIPTENGINE_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Scripts.h b/Generals/Code/GameEngine/Include/GameLogic/Scripts.h
index b5fca6b310d..70428cc389f 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Scripts.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Scripts.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef SCRIPTS_H
-#define SCRIPTS_H
-
 #include "Common/Snapshot.h"
 #include "GameNetwork/NetworkDefs.h"
 #include "Common/ObjectStatusTypes.h"
@@ -89,8 +86,8 @@ class DataChunkOutput;
 #define NO_MORE_COMPLEX_SKIRMISH_SCRIPTS
 #ifndef NO_MORE_COMPLEX_SKIRMISH_SCRIPTS
 // For now, we only actually allow the simple stuff to be chosen. However, as soon as I can get more
-// time on the schedule, we need to extend these scripts to be more useful. To that end, I've 
-// created the parameters and such necessary for more complex behavior, but for now only the 
+// time on the schedule, we need to extend these scripts to be more useful. To that end, I've
+// created the parameters and such necessary for more complex behavior, but for now only the
 // rudimentary support is enabled. jkmcd
 	#define MORE_COMPLEX_SKIRMISH_SCRIPTS
 #endif
@@ -110,12 +107,12 @@ extern const char *ShakeIntensities[];
 // ******************************** class ScriptGroup ***********************************************
 //-------------------------------------------------------------------------------------------------
 class ScriptGroup : public MemoryPoolObject, public Snapshot
-// This is a list of scripts that are grouped and named, with some 
+// This is a list of scripts that are grouped and named, with some
 // additional properties.
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ScriptGroup, "ScriptGroup")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ScriptGroup, "ScriptGroup")
 protected:
-	
+
 	// snapshot methods
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
@@ -136,7 +133,7 @@ class ScriptGroup : public MemoryPoolObject, public Snapshot
 public:
 
 	ScriptGroup *duplicate(void) const;		// note, duplicates just this node, not the full list.
-	ScriptGroup *duplicateAndQualify(const AsciiString& qualifier, 
+	ScriptGroup *duplicateAndQualify(const AsciiString& qualifier,
 			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;		// note, duplicates just this node, not the full list.
 
 	void setName(AsciiString name) { m_groupName = name;}
@@ -165,18 +162,18 @@ class ScriptGroup : public MemoryPoolObject, public Snapshot
 /// This is a linked list of or clauses, each containing a list of and clauses.
 class OrCondition : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(OrCondition, "OrCondition")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(OrCondition, "OrCondition")
 protected:
 	OrCondition *m_nextOr;   // Next or clause.
 	Condition *m_firstAnd;	 // These are Anded.
-	
+
 public:
 	OrCondition():m_nextOr(NULL),m_firstAnd(NULL){};
 	//~OrCondition();
 	/// Duplicate creates a "deep" copy.  If it is head of a linked list, duplicates the entire list.
 	OrCondition *duplicate(void) const;
-	OrCondition *duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;		
+	OrCondition *duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;
 
 public:
 	void setNextOrCondition(OrCondition *pOr) {m_nextOr = pOr;}
@@ -189,7 +186,7 @@ class OrCondition : public MemoryPoolObject
 	void deleteCondition(Condition *pCond);
 	static void WriteOrConditionDataChunk(DataChunkOutput &chunkWriter, OrCondition *pCondition);
 	static Bool ParseOrConditionDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	
+
 	// Utility for moving scripts upwards
 	Condition *findPreviousCondition( Condition *curCond );
 };
@@ -197,18 +194,18 @@ class OrCondition : public MemoryPoolObject
 //-------------------------------------------------------------------------------------------------
 // ******************************** class ScriptAction ***********************************************
 //-------------------------------------------------------------------------------------------------
-/** This is an action that can be executed by a script.  The Action Types 
+/** This is an action that can be executed by a script.  The Action Types
 are defined by ActionTemplates created in the ScriptEngine::init method. */
 enum {MAX_PARMS=12};
 
 class ScriptAction : public MemoryPoolObject // This is the action class.
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ScriptAction, "ScriptAction")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ScriptAction, "ScriptAction")
 // friend bad for MPOs. (srj)
 //friend class EditAction;
 public:
 	/// @todo Use a "symbol table" so we can re-order this enum without breaking old maps (MSB)
-	enum ScriptActionType 
+	enum ScriptActionType
 	{
 		DEBUG_MESSAGE_BOX=0,							///< Show a message box.
 		SET_FLAG,													///< Set a flag true of false.
@@ -278,7 +275,7 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 		PLAYER_ENABLE_BASE_CONSTRUCTION,	///< Allow a player to build bases
 		PLAYER_ENABLE_FACTORIES,					///< Allow a player to build from his factories
 		PLAYER_ENABLE_UNIT_CONSTRUCTION,	///< Allow a player to build units
-		CAMERA_MOVE_HOME,									///< Impl JKMCD	
+		CAMERA_MOVE_HOME,									///< Impl JKMCD
 		BUILD_TEAM,												///< Build a team from a teamtemplate
 		NAMED_DAMAGE,											///< Damage a unit
 		NAMED_DELETE,											///< Delete a unit
@@ -436,7 +433,7 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 		INGAME_POPUP_MESSAGE,											///< Popup an ingame popup message box
 		SET_CAVE_INDEX,														///< Set the index of which set of caves a cave is connected to.
 		NAMED_SET_HELD,														///< Sets a named object to be "held" in place or not
-		NAMED_SET_TOPPLE_DIRECTION,								///< Set the topple direction of the specified direction 
+		NAMED_SET_TOPPLE_DIRECTION,								///< Set the topple direction of the specified direction
 		UNIT_MOVE_TOWARDS_NEAREST_OBJECT_TYPE,		///< Move a named unit towards the nearest object of type type
 		TEAM_MOVE_TOWARDS_NEAREST_OBJECT_TYPE,		///< For each member of the team, move towards the nearest object of type
 		MAP_REVEAL_ALL_PERM,
@@ -449,7 +446,7 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 		DISPLAY_COUNTER,													///< shows a counter
 		HIDE_COUNTER,															///< hides a counter
 		TEAM_USE_COMMANDBUTTON_ABILITY_ON_NAMED,	///< Make a team use an ability on another unit.
-		TEAM_USE_COMMANDBUTTON_ABILITY_AT_WAYPOINT,			///< Make a team use an ability on a waypoint.		
+		TEAM_USE_COMMANDBUTTON_ABILITY_AT_WAYPOINT,			///< Make a team use an ability on a waypoint.
 		NAMED_USE_COMMANDBUTTON_ABILITY,					///< Make a unit use an ability.
 		TEAM_USE_COMMANDBUTTON_ABILITY,						///< Make a team use an ability.
 		NAMED_FLASH_WHITE,												///< Flashes a specific unit
@@ -479,7 +476,7 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 		TEAM_ALL_USE_COMMANDBUTTON_ON_NEAREST_ENEMY_BUILDING,	///< Tell the team to use the commandbutton on the nearest enemy building
 		TEAM_ALL_USE_COMMANDBUTTON_ON_NEAREST_ENEMY_BUILDING_CLASS,	///< Tell the team to use the commandbutton on the nearest enemy building class
 		TEAM_ALL_USE_COMMANDBUTTON_ON_NEAREST_OBJECTTYPE,	///< Tell the team to use the commandbutton on the nearest enemy object of type
-		TEAM_PARTIAL_USE_COMMANDBUTTON,						///< Tell some percentage of the team to use the commandbutton on 
+		TEAM_PARTIAL_USE_COMMANDBUTTON,						///< Tell some percentage of the team to use the commandbutton on
 		TEAM_CAPTURE_NEAREST_UNOWNED_FACTION_UNIT,///< Tell the team to capture the nearest unowned faction unit (unit whose pilot has been killed by Jarmen Kell)
 		PLAYER_CREATE_TEAM_FROM_CAPTURED_UNITS,		///< Tell the player to create a new named team from all the units who have been captured.
 		PLAYER_ADD_SKILLPOINTS,										///< add/subtract skill points to the player.
@@ -544,12 +541,12 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 		// add new items here, please
 		NUM_ITEMS
 	};
-	ScriptAction(ScriptActionType type); 
-	//~ScriptAction(); 
+	ScriptAction(ScriptActionType type);
+	//~ScriptAction();
 
 	ScriptAction *duplicate(void) const;
-	ScriptAction *duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;		
+	ScriptAction *duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;
 
 protected:
 		ScriptAction();  ///< Protected constructor for read.
@@ -569,11 +566,11 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 	void setWarnings(Bool warnings) { m_hasWarnings = warnings;}
 	ScriptActionType getActionType(void) {return m_actionType;}
 	ScriptAction * getNext(void) {return m_nextAction;}
-	AsciiString getUiText(void);				
-	Parameter *getParameter(Int ndx) 
+	AsciiString getUiText(void);
+	Parameter *getParameter(Int ndx)
 	{
-		if (ndx>=0 && ndx<m_numParms) 
-			return m_parms[ndx]; 
+		if (ndx>=0 && ndx<m_numParms)
+			return m_parms[ndx];
 
 		return NULL;
 	}
@@ -591,11 +588,11 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 //-------------------------------------------------------------------------------------------------
 // ******************************** class Script ***********************************************
 //-------------------------------------------------------------------------------------------------
-/** This is a script, in a linked list of scripts.  The m_condition list is evaluated, and if one of the 
+/** This is a script, in a linked list of scripts.  The m_condition list is evaluated, and if one of the
 or clauses is true, the m_action list is executed.  . */
 class Script : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Script, "Script")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Script, "Script")
 protected:	// Note - If you add any member vars, you must take them into account in duplicate() and updateFrom(), as well as file read/write.
 
 	// snapshot methods
@@ -632,8 +629,8 @@ class Script : public MemoryPoolObject, public Snapshot
 	Script();
 	//~Script();
 	Script *duplicate(void) const;	// note, duplicates just this node, not the full list.
-	Script *duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;		
+	Script *duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;
 
 public:
 	void setName(AsciiString name) { m_scriptName = name;}
@@ -693,7 +690,7 @@ class Script : public MemoryPoolObject, public Snapshot
 	// Support routines for moving conditions around
 	OrCondition *findPreviousOrCondition( OrCondition *curOr );
 
-	// Support routines for ScriptEngine - 
+	// Support routines for ScriptEngine -
 	AsciiString getConditionTeamName(void) {return m_conditionTeamName;}
 	void setConditionTeamName(AsciiString teamName) {m_conditionTeamName = teamName;}
 };
@@ -704,7 +701,7 @@ class Script : public MemoryPoolObject, public Snapshot
 /** This is a parameter, in either a condition or an action. */
 class Parameter : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Parameter, "Parameter")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Parameter, "Parameter")
 // friend bad for MPOs. (srj)
 //friend class EditParameter;
 //friend class EditCoordParameter;
@@ -714,7 +711,7 @@ class Parameter : public MemoryPoolObject
 
 public:
 
-	enum ParameterType 
+	enum ParameterType
 	{
 		INT=0,							// Int.
 		REAL,								// Real.
@@ -742,7 +739,7 @@ class Parameter : public MemoryPoolObject
 		MOVIE,							// String, specifies string usable with open(...) or load(...)
 		WAYPOINT_PATH,			// String, waypoint path label.
 		LOCALIZED_TEXT,			// String, must be looked up from the localized text file.
-		BRIDGE,							// String, Named bridge.			
+		BRIDGE,							// String, Named bridge.
 		KIND_OF_PARAM,			// Integer, KindOfType enum.
 		ATTACK_PRIORITY_SET,// String, name of an attack priority set.
 		RADAR_EVENT_TYPE,		// Int. Specifies the radar Event type
@@ -760,13 +757,13 @@ class Parameter : public MemoryPoolObject
 		COMMANDBUTTON_ALL_ABILITIES, // String, refers to all command buttons
 		SKIRMISH_WAYPOINT_PATH, // String, name of a predefined skirmish waypoint path.
 		COLOR,							// color (as int) in ARGB format.
-		EMOTICON,						// List of all possible emoticons. 
+		EMOTICON,						// List of all possible emoticons.
 		OBJECT_PANEL_FLAG,	// String, specifies a flag name available on the options panel.
 		FACTION_NAME,				// The name of the faction (GLA, America, Munkee, China, etc)
 		OBJECT_TYPE_LIST,		// String, Special case of Object Type.
 		REVEALNAME,					// String, the name of the look taking place.
 		SCIENCE_AVAILABILITY, // String, the name of the different science availabilities.
-		NUM_ITEMS	
+		NUM_ITEMS
 	};
 
 	enum { // Comparison types.  Stored in Int value.
@@ -784,7 +781,7 @@ class Parameter : public MemoryPoolObject
 		REL_FRIEND		= ALLIES
 	};
 
-	Parameter(ParameterType type, int val = 0) : 
+	Parameter(ParameterType type, int val = 0) :
 		m_initialized(false),
 		m_paramType(type),
 		m_int(val),
@@ -832,25 +829,25 @@ class Parameter : public MemoryPoolObject
 };
 EMPTY_DTOR(Parameter)
 
-extern const char* TheObjectFlagsNames[];
+extern const char* const TheObjectFlagsNames[];
 
 //-------------------------------------------------------------------------------------------------
 // ******************************** class Condition ***********************************************
 //-------------------------------------------------------------------------------------------------
-/** This is a condition.  The parameters for a ConditionType are set up in 
-ConditionTemplates created in ScriptEngine::init. 
+/** This is a condition.  The parameters for a ConditionType are set up in
+ConditionTemplates created in ScriptEngine::init.
 
-// SPECIAL NOTE ABOUT Skirmish Scripts: Please note that ALL Skirmish conditions should first pass a pSkirmishPlayerParm to 
+// SPECIAL NOTE ABOUT Skirmish Scripts: Please note that ALL Skirmish conditions should first pass a pSkirmishPlayerParm to
 // prevet the necessity of having to write additional scripts for other players / skirmish types later.
 */
 
 class Condition : public MemoryPoolObject  // This is the conditional class.
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Condition, "Condition")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Condition, "Condition")
 // friend bad for MPOs. (srj)
 //friend class EditCondition;
 public:
-	enum ConditionType 
+	enum ConditionType
 	{
 		CONDITION_FALSE=0,										// Always evaluates to false.
 		COUNTER,															// COUNTER, COMPARISON, INT
@@ -859,7 +856,7 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 		TIMER_EXPIRED,												// If a timer expired.
 		PLAYER_ALL_DESTROYED,									// If a side (player) is totally destroyed.
 		PLAYER_ALL_BUILDFACILITIES_DESTROYED, // If a side (player) has all build facilities destroyed.
-		TEAM_INSIDE_AREA_PARTIALLY,						// If a player has units from a team entering an area.		
+		TEAM_INSIDE_AREA_PARTIALLY,						// If a player has units from a team entering an area.
 		TEAM_DESTROYED,												// If a team has been destroyed.
 		CAMERA_MOVEMENT_FINISHED,							// If the camera has completed it's current movement.
 		TEAM_HAS_UNITS,												// If a team has units.
@@ -876,7 +873,7 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 		NAMED_ATTACKED_BY_PLAYER,							// If a unit has been attacked by a unit controlled by player
 		TEAM_ATTACKED_BY_PLAYER,							// If a team has been attacked by a unit controlled by player
 		BUILT_BY_PLAYER,											// If a unit of type objecttype has been built by player
-		NAMED_CREATED,												// If a unit is currently in existence 
+		NAMED_CREATED,												// If a unit is currently in existence
 		TEAM_CREATED,													// If a team is currently in existence
 		PLAYER_HAS_CREDITS,										// If X [Less Than | Equal | More than] Players credits
 		NAMED_DISCOVERED,											// If a named unit is currently "seen" by a player.
@@ -885,7 +882,7 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 		NAMED_OWNED_BY_PLAYER,								// If a unit is currently owned by a player
 		TEAM_OWNED_BY_PLAYER,									// If a team is currently owned by a player
 		PLAYER_HAS_N_OR_FEWER_BUILDINGS,			// If a player has count or fewer buildings
-		PLAYER_HAS_POWER,											// If a player currently has power to his facilities 
+		PLAYER_HAS_POWER,											// If a player currently has power to his facilities
 		NAMED_REACHED_WAYPOINTS_END,					// If a unit has reached the end of the path that contains Waypoint
 		TEAM_REACHED_WAYPOINTS_END,						// If a team has reached the end of the path that contains Waypoint
 		NAMED_SELECTED,												// If a unit is selected
@@ -946,7 +943,7 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 		SKIRMISH_UNOWNED_FACTION_UNIT_EXISTS,		// True if there are comparison to unowned faction unit on the map.
 		SKIRMISH_PLAYER_HAS_PREREQUISITE_TO_BUILD,	// True if we can build this thing (we have prerequisites)
 		SKIRMISH_PLAYER_HAS_COMPARISON_GARRISONED,	// True if there are comparison to garrisoned buildings (by player) on the map
-		SKIRMISH_PLAYER_HAS_COMPARISON_CAPTURED_UNITS,	// True if there are comparison to captured units 
+		SKIRMISH_PLAYER_HAS_COMPARISON_CAPTURED_UNITS,	// True if there are comparison to captured units
 		SKIRMISH_NAMED_AREA_EXIST,							// True if a named area exists
 		SKIRMISH_PLAYER_HAS_UNITS_IN_AREA,			// True if a player has units in an area
 		SKIRMISH_PLAYER_HAS_BEEN_ATTACKED_BY_PLAYER,	// True if the player has been attacked by a player
@@ -958,19 +955,19 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 		PLAYER_CAN_PURCHASE_SCIENCE,						// True is player can purchase the given science (has all prereqs & points needed)
 		MUSIC_TRACK_HAS_COMPLETED,							// True if the specified track has completed at least N times
 		PLAYER_LOST_OBJECT_TYPE,								// True if a player has lost a specific unit type
-		
+
 		SUPPLY_SOURCE_SAFE,											// True if the nearest available supply source is not under enemy influence.
 		SUPPLY_SOURCE_ATTACKED,									// True if our supply depot or dozer near depot was attacked.
 		START_POSITION_IS,											// True if our start position matches.
 		NUM_ITEMS		 // Always the last condition.
 	};
 
-	Condition(enum ConditionType type); 
-	//~Condition(); 
+	Condition(enum ConditionType type);
+	//~Condition();
 
 	Condition *duplicate(void) const;
-	Condition *duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;		
+	Condition *duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;
 
 protected:
 	Condition();  ///< Protected constructor for read.
@@ -982,7 +979,7 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 	Condition *m_nextAndCondition;
 
 	Int				m_hasWarnings; ///< Runtime flag used by the editor only.
-	Int				m_customData; 
+	Int				m_customData;
 
 public:
 	void setConditionType(enum ConditionType type);
@@ -992,11 +989,11 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 	void setWarnings(Bool warnings) { m_hasWarnings = warnings;}
 	enum ConditionType getConditionType(void) {return m_conditionType;}
 	Condition * getNext(void) {return m_nextAndCondition;}
-	AsciiString getUiText(void);				
-	Parameter *getParameter(Int ndx) 
+	AsciiString getUiText(void);
+	Parameter *getParameter(Int ndx)
 	{
-		if (ndx>=0 && ndx<m_numParms) 
-			return m_parms[ndx]; 
+		if (ndx>=0 && ndx<m_numParms)
+			return m_parms[ndx];
 
 		return NULL;
 	}
@@ -1015,11 +1012,11 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 //-------------------------------------------------------------------------------------------------
 // ******************************** class Template ***********************************************
 //-------------------------------------------------------------------------------------------------
-/** The template defines the parameters and ui strings used to display a 
+/** The template defines the parameters and ui strings used to display a
 condition or action. */
-class Template : public MemoryPoolObject 
+class Template : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Template, "Template")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Template, "Template")
 // friend bad for MPOs. (srj)
 //friend class ScriptEngine;
 public:
@@ -1056,10 +1053,10 @@ class ActionTemplate : public Template{};
 //-------------------------------------------------------------------------------------------------
 /// List of scripts.  May have one level of hierarchy in the ScriptGroup list.
 class ScriptList : public MemoryPoolObject, public Snapshot
-// A script list belongs to a Player.  It contains the heads of the 
+// A script list belongs to a Player.  It contains the heads of the
 // the top level scripts, and the script groups.
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ScriptList, "ScriptList")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ScriptList, "ScriptList")
 protected:
 
 	// snapshot methods
@@ -1080,15 +1077,15 @@ class ScriptList : public MemoryPoolObject, public Snapshot
 
 public:
 	static void updateDefaults(void);
-	static void reset(void); 
+	static void reset(void);
 	static Int getNextID(void) {m_curId++; return m_curId;};
-	
+
 public:
 	ScriptGroup *getScriptGroup(void) {return m_firstGroup;};
 	Script *getScript(void) {return m_firstScript;};
 	void WriteScriptListDataChunk(DataChunkOutput &chunkWriter);
 	static Bool ParseScriptListDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	
+
 	void addGroup(ScriptGroup *pGrp, Int ndx);
 	void addScript(Script *pScr, Int ndx);
 	void deleteScript(Script *pScr);
@@ -1097,17 +1094,14 @@ class ScriptList : public MemoryPoolObject, public Snapshot
 	void discard(void);
 
 	ScriptList *duplicate(void) const;
-	ScriptList *duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName ) const;		
+	ScriptList *duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName ) const;
 	/// Reads a set of scripts into m_readScripts.  Use getReadScripts to access.
 	static Bool ParseScriptsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
 	/// Writes sides (including build list info.)
 	static void WriteScriptsDataChunk(DataChunkOutput &chunkWriter, ScriptList *scriptLists[], Int numLists);
 
-	/// Returns array of script list pointers.  This can only be called once after scripts 
+	/// Returns array of script list pointers.  This can only be called once after scripts
 	/// are read, and the caller is responsible for deleting the scripts.
 	static Int getReadScripts(ScriptList *scriptLists[MAX_PLAYER_COUNT]);
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/SidesList.h b/Generals/Code/GameEngine/Include/GameLogic/SidesList.h
index a5431da90ae..cb1033fa5ce 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/SidesList.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/SidesList.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef SIDESLIST_H
-#define SIDESLIST_H
-
 #include "Common/Dict.h"
 #include "Common/Errors.h"
 #include "Common/GameType.h"
@@ -53,7 +50,7 @@ class Shadow;
 	Note that a side corresponds to a Player in the game.  The lightweight
 	Side is used to give the WB Editor somewhere to hang build lists.
 */
-class SidesInfo 
+class SidesInfo
 {
 protected:
 	BuildListInfo*	m_pBuildList;		///< linked list.
@@ -76,7 +73,7 @@ class SidesInfo
 	void setScriptList(ScriptList *pScriptList) {m_scripts = pScriptList;};
 
 	// ug, I hate having to overload stuff, but this makes it a lot easier to make copies safely
-	SidesInfo& operator=(const SidesInfo& that);	
+	SidesInfo& operator=(const SidesInfo& that);
 };
 
 // ----------------------------------------------------------------------------------------------
@@ -110,22 +107,22 @@ class TeamsInfoRec
 	void addTeam(const Dict* d);
 	void removeTeam(Int i);
 	Int getNumTeams() const { return m_numTeams; }
-	TeamsInfo * getTeamInfo(Int team) 
+	TeamsInfo * getTeamInfo(Int team)
 	{
-		if (team>=0&&team<m_numTeams) 
+		if (team>=0&&team<m_numTeams)
 		{
 			return(&m_teams[team]);
 		}
-		DEBUG_CRASH(("Out of range.")); 
+		DEBUG_CRASH(("Out of range."));
 		throw ERROR_BAD_ARG;
 		return NULL;
-	}	
+	}
 };
 
 // ----------------------------------------------------------------------------------------------
 /**
 	This is a singleton class that maintains the list of Sides.
-	In RTS it is associated with the Player singleton.  
+	In RTS it is associated with the Player singleton.
 	Note that a side corresponds to a Player in the game.  The lightweight
 	Side is used to give the WB Editor somewhere to hang build lists, as
 	it doesn't instantiate the Player subsystem
@@ -173,7 +170,7 @@ class SidesList : public SubsystemInterface,
  	void addSkirmishTeam(const Dict* d);
 
 	TeamsInfo *findTeamInfo(AsciiString name, Int* index = NULL);
-	
+
 	Bool isPlayerDefaultTeam(TeamsInfo *t);
 
 	void clear();
@@ -206,37 +203,37 @@ class SidesList : public SubsystemInterface,
 };
 
 
-inline TeamsInfo * SidesList::getTeamInfo(Int team) 
+inline TeamsInfo * SidesList::getTeamInfo(Int team)
 {
 	return m_teamrec.getTeamInfo(team);
-}	
+}
 
-inline TeamsInfo * SidesList::getSkirmishTeamInfo(Int team) 
+inline TeamsInfo * SidesList::getSkirmishTeamInfo(Int team)
 {
 	return m_skirmishTeamrec.getTeamInfo(team);
-}	
+}
 
-inline SidesInfo * SidesList::getSideInfo(Int side) 
+inline SidesInfo * SidesList::getSideInfo(Int side)
 {
-	if (side>=0&&side<m_numSides) 
+	if (side>=0&&side<m_numSides)
 	{
 		return(&m_sides[side]);
 	}
-	DEBUG_CRASH(("Out of range.")); 
+	DEBUG_CRASH(("Out of range."));
 	throw ERROR_BAD_ARG;
 	return NULL;
-}	
+}
 
-inline SidesInfo * SidesList::getSkirmishSideInfo(Int side) 
+inline SidesInfo * SidesList::getSkirmishSideInfo(Int side)
 {
-	if (side>=0&&side<m_numSkirmishSides) 
+	if (side>=0&&side<m_numSkirmishSides)
 	{
 		return(&m_skirmishSides[side]);
 	}
-	DEBUG_CRASH(("Out of range.")); 
+	DEBUG_CRASH(("Out of range."));
 	throw ERROR_BAD_ARG;
 	return NULL;
-}	
+}
 
 
 // ----------------------------------------------------------------------------------------------
@@ -249,7 +246,7 @@ extern SidesList *TheSidesList;	 ///< singleton instance of SidesList
 */
 class BuildListInfo : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(BuildListInfo, "BuildListInfo")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(BuildListInfo, "BuildListInfo")
 
 // friend doesn't play well with MPO... it reveals delete, which shouldn't be visible, even to friends (srj)
 //friend class SidesInfo;  // This is essentially a component of the SidesInfo data structure.
@@ -257,7 +254,7 @@ class BuildListInfo : public MemoryPoolObject, public Snapshot
 //friend class BuildList;  // This is the class in WB that edits build lists.
 //friend class BuildListTool; // Other class in wb that edits build lists.
 //friend class WBDocUndoable; // Other class in wb that edits build lists.
-//friend class Player; 
+//friend class Player;
 //friend class AISideBuildList;
 //friend class AISkirmishPlayer;
 
@@ -301,7 +298,7 @@ class BuildListInfo : public MemoryPoolObject, public Snapshot
 	ObjectID m_objectID;								///< the object on the map instantiated by this info
 	UnsignedInt m_objectTimestamp;			///< frame when object was built
 	Bool		 m_underConstruction;				///< True if being constructed by dozer.
-	ObjectID m_resourceGatherers[MAX_RESOURCE_GATHERERS];	///< gatherers for this supply center type building. 
+	ObjectID m_resourceGatherers[MAX_RESOURCE_GATHERERS];	///< gatherers for this supply center type building.
 	Bool		 m_isSupplyBuilding;				///< Uses gatherers to get supplies.
 	Int			 m_desiredGatherers;				///< Number of gatherers desired.
 	Int			 m_currentGatherers;				///< Number of gatherers available.
@@ -371,15 +368,15 @@ class BuildListInfo : public MemoryPoolObject, public Snapshot
 	BuildListInfo *duplicate(void);
 };
 
-inline void BuildListInfo::decrementNumRebuilds(void)  
+inline void BuildListInfo::decrementNumRebuilds(void)
 {
-	if (m_numRebuilds > 0 && m_numRebuilds != UNLIMITED_REBUILDS) 
+	if (m_numRebuilds > 0 && m_numRebuilds != UNLIMITED_REBUILDS)
 		m_numRebuilds--;
 }
 
-inline void BuildListInfo::incrementNumRebuilds(void)  
+inline void BuildListInfo::incrementNumRebuilds(void)
 {
-	if (m_numRebuilds != UNLIMITED_REBUILDS) 
+	if (m_numRebuilds != UNLIMITED_REBUILDS)
 		m_numRebuilds++;
 }
 
@@ -390,7 +387,3 @@ inline Bool BuildListInfo::isBuildable( void )
 
 	return false;
 }
-
-
-#endif
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Squad.h b/Generals/Code/GameEngine/Include/GameLogic/Squad.h
index 66b132e1733..d76b358b9d1 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Squad.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Squad.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Sqaud.h 
+// FILE: Sqaud.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -38,8 +38,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_SQAUD_
-#define _H_SQAUD_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Common/Snapshot.h"
@@ -62,7 +60,7 @@ typedef VecObjectPtr::iterator VecObjectPtrIt;
 
 class Squad : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Squad, "Squad")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Squad, "Squad")
 
 protected:
 	// snapshot methods
@@ -96,5 +94,3 @@ class Squad : public MemoryPoolObject, public Snapshot
 	void aiGroupFromSquad(AIGroup* aiGroupToFill);
 };
 EMPTY_DTOR(Squad)
-
-#endif /* _H_SQAUD_ */
diff --git a/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h b/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h
index c41b163de8f..55614c57572 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __TERRAINLOGIC_H_
-#define __TERRAINLOGIC_H_
-
 #include "Common/GameMemory.h"
 #include "Common/Snapshot.h"
 #include "Common/STLTypedefs.h"
@@ -63,12 +60,12 @@ enum WaypointID CPP_11(: Int)
 */
 class Waypoint : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Waypoint, "Waypoint")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Waypoint, "Waypoint")
 
 // friends do not play well with MPO (srj)
 //friend class TerrainLogic;
 public:
-	Waypoint(WaypointID id, AsciiString name, const Coord3D *pLoc, AsciiString label1, 
+	Waypoint(WaypointID id, AsciiString name, const Coord3D *pLoc, AsciiString label1,
 						AsciiString label2, AsciiString label3, Bool biDirectional);
 	//~Waypoint();
 	enum {MAX_LINKS=8};
@@ -88,13 +85,13 @@ class Waypoint : public MemoryPoolObject
 public:
 	// should be protected, but friendly access needed (srj)
 	void setNext(Waypoint *pNext) {m_pNext = pNext; }
-	//void setLink(Int ndx, Waypoint *pLink) 
+	//void setLink(Int ndx, Waypoint *pLink)
 	//{
-	//	if (ndx>=0 && ndx <=MAX_LINKS) m_links[ndx] = pLink; 
+	//	if (ndx>=0 && ndx <=MAX_LINKS) m_links[ndx] = pLink;
 	//}
-	void addLink(Waypoint* pLink) 
+	void addLink(Waypoint* pLink)
 	{
-		if (m_numLinks < MAX_LINKS) 
+		if (m_numLinks < MAX_LINKS)
 		{
 			m_links[m_numLinks] = pLink;
 			++m_numLinks;
@@ -130,7 +127,7 @@ class Waypoint : public MemoryPoolObject
 // Bridge
 /** Helper class for bridge info in terrain logic.
 */
-class BridgeInfo 
+class BridgeInfo
 {
 public:
 	BridgeInfo();
@@ -151,7 +148,7 @@ class BridgeInfo
 // Bridge
 /** Helper class for bridge info in terrain logic.
 */
-struct TBridgeAttackInfo 
+struct TBridgeAttackInfo
 {
 public:
 	Coord3D attackPoint1, attackPoint2; /// The points that can be attacked..
@@ -161,7 +158,7 @@ struct TBridgeAttackInfo
 //-------------------------------------------------------------------------------------------------
 class Bridge : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Bridge, "Bridge")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Bridge, "Bridge")
 // friends do not play well with MPO (srj)
 //friend class TerrainLogic;
 public:
@@ -181,9 +178,9 @@ class Bridge : public MemoryPoolObject
 public:
 	// should be protected, but friendly access needed (srj)
 	void setNext(Bridge *pNext) {m_next = pNext; }
-	Object *createTower( Coord3D *worldPos, BridgeTowerType towerPos, 
+	Object *createTower( Coord3D *worldPos, BridgeTowerType towerPos,
 											 const ThingTemplate *towerTemplate, Object *bridge );
-	
+
 public:
 	/// return the bridge template name
 	AsciiString getBridgeTemplateName( void ) { return m_templateName; }
@@ -197,16 +194,16 @@ class Bridge : public MemoryPoolObject
 	Bool isPointOnBridge(const Coord3D *pLoc);
 	Drawable *pickBridge(const Vector3 &from, const Vector3 &to, Vector3 *pos);
 	void updateDamageState(void); ///< Updates a bridge's damage info.
-	inline const BridgeInfo *peekBridgeInfo(void) const {return &m_bridgeInfo;}
-	inline PathfindLayerEnum getLayer(void) const {return m_layer;}
-	inline void setLayer(PathfindLayerEnum layer) {m_layer = layer;}
+	const BridgeInfo *peekBridgeInfo(void) const {return &m_bridgeInfo;}
+	PathfindLayerEnum getLayer(void) const {return m_layer;}
+	void setLayer(PathfindLayerEnum layer) {m_layer = layer;}
 	const Region2D *getBounds(void) const {return &m_bounds;}
 	Bool isCellOnEnd(const Region2D *cell);	 // Is pathfind cell on the sides of the bridge
 	Bool isCellOnSide(const Region2D *cell); // Is pathfind cell on the end of the bridge
 	Bool isCellEntryPoint(const Region2D *cell); // Is pathfind cell an entry point to the bridge
-	
-	inline void setBridgeObjectID( ObjectID id ) { m_bridgeInfo.bridgeObjectID = id; }
-	inline void setTowerObjectID( ObjectID id, BridgeTowerType which ) { m_bridgeInfo.towerObjectID[ which ] = id; }
+
+	void setBridgeObjectID( ObjectID id ) { m_bridgeInfo.bridgeObjectID = id; }
+	void setTowerObjectID( ObjectID id, BridgeTowerType which ) { m_bridgeInfo.towerObjectID[ which ] = id; }
 
 };
 
@@ -248,8 +245,8 @@ class TerrainLogic : public Snapshot,
 	virtual const WaterHandle* getWaterHandle( Real x, Real y );					///< get water handle at this location
 	virtual const WaterHandle* getWaterHandleByName( AsciiString name );	///< get water handle by name
 	virtual Real getWaterHeight( const WaterHandle *water );							///< get height of water table
-	virtual void setWaterHeight( const WaterHandle *water, 
-															 Real height, 
+	virtual void setWaterHeight( const WaterHandle *water,
+															 Real height,
 															 Real damageAmount,
 															 Bool forcePathfindUpdate );	///< set height of water table
 	virtual void changeWaterHeightOverTime( const WaterHandle *water,
@@ -372,11 +369,10 @@ class TerrainLogic : public Snapshot,
 	} m_waterToUpdate[ MAX_DYNAMIC_WATER ];  ///< water tables to dynamicall update
 	Int m_numWaterToUpdate;						///< how many valid entries are in m_waterToUpdate
 
-};  // end class TerrainLogic
+};
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern TerrainLogic *TheTerrainLogic;   ///< singleton definition
 
 extern void makeAlignToNormalMatrix( Real angle, const Coord3D& pos, const Coord3D& normal, Matrix3D& mtx);
 extern Bool LineInRegion( const Coord2D *p1, const Coord2D *p2, const Region2D *clipRegion );
-#endif  // end __TERRAINLOGIC_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h b/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h
index a45a1995a6c..3a2570aaae4 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h
@@ -28,16 +28,13 @@
 
 #pragma once
 
-#ifndef _TURRETAI_H_
-#define _TURRETAI_H_
-
 #include "Common/StateMachine.h"
 #include "Common/GameMemory.h"
 
 const Real DEFAULT_TURN_RATE = 0.01f;
 const Real DEFAULT_PITCH_RATE = 0.01f;
 
-/** 
+/**
  * The TurretAI state IDs.
  * Each of these constants will be associated with an instance of a State class
  * in a given StateMachine.
@@ -60,7 +57,7 @@ class TurretAI;
 
 //-----------------------------------------------------------------------------------------------------------
 /**
- * The AI state machine.  This is used by AIUpdate to implement all of the 
+ * The AI state machine.  This is used by AIUpdate to implement all of the
  * commands in the AICommandInterface.
  */
 class TurretStateMachine : public StateMachine
@@ -68,12 +65,12 @@ class TurretStateMachine : public StateMachine
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TurretStateMachine, "TurretStateMachine" );
 
 public:
-	/** 
+	/**
 	 * The implementation of this constructor defines the states
 	 * used by this machine.
 	 */
 	TurretStateMachine( TurretAI* tai, Object* owner, AsciiString name );
-	
+
 	TurretAI* getTurretAI() const { return m_turretAI; }
 
 	virtual void clear();
@@ -93,7 +90,7 @@ class TurretStateMachine : public StateMachine
 //-----------------------------------------------------------------------------------------------------------
 class TurretState : public State
 {
-	MEMORY_POOL_GLUE_ABC(TurretState)		
+	MEMORY_POOL_GLUE_ABC(TurretState)
 protected:
 	TurretState( TurretStateMachine* machine, AsciiString name ) : State( machine, name) { }
 	TurretAI* getTurretAI() { return ((TurretStateMachine*)getMachine())->getTurretAI(); }
@@ -102,8 +99,8 @@ EMPTY_DTOR(TurretState)
 
 //-----------------------------------------------------------------------------------------------------------
 class TurretAIIdleState : public TurretState
-{	
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIIdleState, "TurretAIIdleState")		
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIIdleState, "TurretAIIdleState")
 public:
 	TurretAIIdleState( TurretStateMachine* machine ) : TurretState( machine, "TurretAIIdleState"), m_nextIdleScan(0) { }
 	virtual StateReturnType onEnter();
@@ -123,7 +120,7 @@ EMPTY_DTOR(TurretAIIdleState)
 //-----------------------------------------------------------------------------------------------------------
 class TurretAIIdleScanState : public TurretState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIIdleScanState, "TurretAIIdleScanState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIIdleScanState, "TurretAIIdleScanState")
 public:
 	TurretAIIdleScanState( TurretStateMachine* machine ) : TurretState( machine, "TurretAIIdleScanState"), m_desiredAngle(0) { }
 	virtual StateReturnType onEnter();
@@ -146,15 +143,15 @@ EMPTY_DTOR(TurretAIIdleScanState)
  */
 class TurretAIAimTurretState : public TurretState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIAimTurretState, "TurretAIAimTurretState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIAimTurretState, "TurretAIAimTurretState")
 private:
 #ifdef INTER_TURRET_DELAY
 	UnsignedInt m_extraDelay;
 #endif
 public:
 	TurretAIAimTurretState( TurretStateMachine* machine ) : TurretState( machine, "TurretAIAimTurretState" )
-	{ 
-	
+	{
+
 	}
 	virtual StateReturnType onEnter();
 	virtual void onExit( StateExitType status );
@@ -173,7 +170,7 @@ EMPTY_DTOR(TurretAIAimTurretState)
  */
 class TurretAIRecenterTurretState : public TurretState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIRecenterTurretState, "TurretAIRecenterTurretState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIRecenterTurretState, "TurretAIRecenterTurretState")
 public:
 	TurretAIRecenterTurretState( TurretStateMachine* machine ) : TurretState( machine, "TurretAIRecenterTurretState" ) { }
 	virtual StateReturnType onEnter();
@@ -193,11 +190,11 @@ EMPTY_DTOR(TurretAIRecenterTurretState)
  */
 class TurretAIHoldTurretState : public TurretState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIHoldTurretState, "TurretAIHoldTurretState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIHoldTurretState, "TurretAIHoldTurretState")
 private:
 	UnsignedInt m_timestamp;										///< frame this state was last entered
 public:
-	TurretAIHoldTurretState( TurretStateMachine* machine ) : TurretState( machine , "AIHoldTurretState") 
+	TurretAIHoldTurretState( TurretStateMachine* machine ) : TurretState( machine , "AIHoldTurretState")
 	{
 		m_timestamp = 0;
 	}
@@ -215,7 +212,7 @@ EMPTY_DTOR(TurretAIHoldTurretState)
 //-------------------------------------------------------------------------------------------------
 class TurretAIData : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIData, "TurretAIData")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIData, "TurretAIData")
 public:
 	Real						m_turnRate;
 	Real						m_pitchRate;
@@ -256,7 +253,7 @@ enum TurretTargetType CPP_11(: Int)
 };
 
 //-----------------------------------------------------------------------------------------------------
-/** 
+/**
  * Turret behavior implementation.
  */
 class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFiredInterface
@@ -289,7 +286,7 @@ class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFi
 
 	Bool isOwnersCurWeaponOnTurret() const;
 	Bool isWeaponSlotOnTurret(WeaponSlotType wslot) const;
-	Bool isAttackingObject() const { return m_target == TARGET_OBJECT; } 
+	Bool isAttackingObject() const { return m_target == TARGET_OBJECT; }
 	Bool isForceAttacking() const { return m_isForceAttacking; }
 
 	// this will cause the turret to continuously track the given victim.
@@ -373,6 +370,3 @@ class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFi
 	mutable Bool						m_targetWasSetByIdleMood : 1;
 
 };
-
-#endif // end _TURRETAI_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h
index 4a71a7b2c00..de74d3fa723 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __VICTORYCONDITIONS_H__
-#define __VICTORYCONDITIONS_H__
-
 #include "Common/SubsystemInterface.h"
 #include "Lib/BaseType.h"
 
@@ -53,13 +50,13 @@ class VictoryConditionsInterface : public SubsystemInterface
 {
 public:
 	VictoryConditionsInterface() { m_victoryConditions = 0; }
-	
+
 	virtual void init( void ) = 0;
 	virtual void reset( void ) = 0;
 	virtual void update( void ) = 0;
 
-	inline void setVictoryConditions( Int victoryConditions ) { m_victoryConditions = victoryConditions; }
-	inline Int getVictoryConditions( void ) { return m_victoryConditions; }
+	void setVictoryConditions( Int victoryConditions ) { m_victoryConditions = victoryConditions; }
+	Int getVictoryConditions( void ) { return m_victoryConditions; }
 
 	virtual Bool hasAchievedVictory(Player *player) = 0;					///< has a specific player and his allies won?
 	virtual Bool hasBeenDefeated(Player *player) = 0;							///< has a specific player and his allies lost?
@@ -79,5 +76,3 @@ class VictoryConditionsInterface : public SubsystemInterface
 VictoryConditionsInterface * createVictoryConditions( void );
 
 extern VictoryConditionsInterface *TheVictoryConditions;
-
-#endif // __VICTORYCONDITIONS_H__
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h
index b355e6c83e5..6895677ba1a 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __WEAPON_H_
-#define __WEAPON_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/GameCommon.h"
@@ -60,17 +57,20 @@ enum WeaponReloadType CPP_11(: Int)
 {
 	AUTO_RELOAD,
 	NO_RELOAD,
-	RETURN_TO_BASE_TO_RELOAD
+	RETURN_TO_BASE_TO_RELOAD,
+
+	WEAPON_RELOAD_COUNT
 };
 
 #ifdef DEFINE_WEAPONRELOAD_NAMES
-static const char *TheWeaponReloadNames[] = 
+static const char *const TheWeaponReloadNames[] =
 {
 	"YES",
 	"NO",
 	"RETURN_TO_BASE",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheWeaponReloadNames) == WEAPON_RELOAD_COUNT + 1, "Incorrect array size");
 #endif
 
 //-------------------------------------------------------------------------------------------------
@@ -84,13 +84,14 @@ enum WeaponPrefireType CPP_11(: Int)
 };
 
 #ifdef DEFINE_WEAPONPREFIRE_NAMES
-static const char *TheWeaponPrefireNames[] = 
+static const char *const TheWeaponPrefireNames[] =
 {
 	"PER_SHOT",
 	"PER_ATTACK",
 	"PER_CLIP",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheWeaponPrefireNames) == PREFIRE_COUNT + 1, "Incorrect array size");
 #endif
 
 //-------------------------------------------------------------------------------------------------
@@ -119,7 +120,7 @@ enum WeaponAffectsMaskType CPP_11(: Int)
 };
 
 #ifdef DEFINE_WEAPONAFFECTSMASK_NAMES
-static const char *TheWeaponAffectsMaskNames[] = 
+static const char *const TheWeaponAffectsMaskNames[] =
 {
 	"SELF",
 	"ALLIES",
@@ -137,19 +138,19 @@ enum WeaponCollideMaskType CPP_11(: Int)
 {
 	// all of these apply to *nontargeted* things that might just happen to get in the way...
 	// the target can always be collided with, regardless of flags
-	WEAPON_COLLIDE_ALLIES									= 0x0001,	
-	WEAPON_COLLIDE_ENEMIES								= 0x0002,	
+	WEAPON_COLLIDE_ALLIES									= 0x0001,
+	WEAPON_COLLIDE_ENEMIES								= 0x0002,
 	WEAPON_COLLIDE_STRUCTURES							= 0x0004,	// this is "all structures EXCEPT for structures belonging to the projectile's controller".
 	WEAPON_COLLIDE_SHRUBBERY							= 0x0008,
 	WEAPON_COLLIDE_PROJECTILE							= 0x0010,
 	WEAPON_COLLIDE_WALLS									= 0x0020,
-	WEAPON_COLLIDE_SMALL_MISSILES					= 0x0040, //All missiles are also projectiles! 
+	WEAPON_COLLIDE_SMALL_MISSILES					= 0x0040, //All missiles are also projectiles!
 	WEAPON_COLLIDE_BALLISTIC_MISSILES			= 0x0080, //All missiles are also projectiles!
 	WEAPON_COLLIDE_CONTROLLED_STRUCTURES	= 0x0100	//this is "ONLY structures belonging to the projectile's controller".
 };
 
 #ifdef DEFINE_WEAPONCOLLIDEMASK_NAMES
-static const char *TheWeaponCollideMaskNames[] = 
+static const char *const TheWeaponCollideMaskNames[] =
 {
 	"ALLIES",
 	"ENEMIES",
@@ -200,11 +201,16 @@ enum WeaponBonusConditionType CPP_11(: Int)
 	WEAPONBONUSCONDITION_SOLO_AI_EASY,
 	WEAPONBONUSCONDITION_SOLO_AI_NORMAL,
 	WEAPONBONUSCONDITION_SOLO_AI_HARD,
+	WEAPONBONUSCONDITION_TARGET_FAERIE_FIRE,
+  WEAPONBONUSCONDITION_FANATICISM, // FOR THE NEW GC INFANTRY GENERAL... adds to nationalism
+	WEAPONBONUSCONDITION_FRENZY_ONE,
+	WEAPONBONUSCONDITION_FRENZY_TWO,
+	WEAPONBONUSCONDITION_FRENZY_THREE,
 
 	WEAPONBONUSCONDITION_COUNT
 };
 #ifdef DEFINE_WEAPONBONUSCONDITION_NAMES
-static const char *TheWeaponBonusNames[] = 
+static const char *const TheWeaponBonusNames[] =
 {
 	// This is a RHS enum (weapon.ini will have WeaponBonus = IT) so it is all caps
 	"GARRISONED",
@@ -233,8 +239,15 @@ static const char *TheWeaponBonusNames[] =
 	"SOLO_AI_EASY",
 	"SOLO_AI_NORMAL",
 	"SOLO_AI_HARD",
+	"TARGET_FAERIE_FIRE",
+  "FANATICISM", // FOR THE NEW GC INFANTRY GENERAL... adds to nationalism
+	"FRENZY_ONE",
+	"FRENZY_TWO",
+	"FRENZY_THREE",
+
 	NULL
 };
+static_assert(ARRAY_SIZE(TheWeaponBonusNames) == WEAPONBONUSCONDITION_COUNT + 1, "Incorrect array size");
 #endif
 
 // For WeaponBonusConditionFlags
@@ -255,7 +268,7 @@ class WeaponBonus
 		RATE_OF_FIRE,
 		PRE_ATTACK,
 
-		FIELD_COUNT	// keep last
+		FIELD_COUNT
 	};
 
 	WeaponBonus()
@@ -263,14 +276,14 @@ class WeaponBonus
 		clear();
 	}
 
-	inline void clear()
+	void clear()
 	{
 		for (int i = 0; i < FIELD_COUNT; ++i)
 			m_field[i] = 1.0f;
 	}
 
-	inline Real getField(Field f) const { return m_field[f]; }
-	inline void setField(Field f, Real v) { m_field[f] = v; }
+	Real getField(Field f) const { return m_field[f]; }
+	void setField(Field f, Real v) { m_field[f] = v; }
 
 	void appendBonuses(WeaponBonus& bonus) const;
 
@@ -280,7 +293,7 @@ class WeaponBonus
 };
 
 #ifdef DEFINE_WEAPONBONUSFIELD_NAMES
-static const char *TheWeaponBonusFieldNames[] = 
+static const char *const TheWeaponBonusFieldNames[] =
 {
 	"DAMAGE",
 	"RADIUS",
@@ -289,6 +302,7 @@ static const char *TheWeaponBonusFieldNames[] =
 	"PRE_ATTACK",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheWeaponBonusFieldNames) == WeaponBonus::FIELD_COUNT + 1, "Incorrect array size");
 #endif
 
 
@@ -314,9 +328,10 @@ struct HistoricWeaponDamageInfo
 	// The time and location this weapon was fired
 	UnsignedInt						frame;
 	Coord3D								location;
+	UnsignedInt						triggerId; ///< Unique Id assigned to any grouped damage instances
 
 	HistoricWeaponDamageInfo(UnsignedInt f, const Coord3D& l) :
-		frame(f), location(l)
+		frame(f), location(l), triggerId(0)
 	{
 	}
 };
@@ -342,11 +357,11 @@ class WeaponTemplate : public MemoryPoolObject
 	Bool isOverride( void ) { return m_nextTemplate != NULL; }
 
 	/// field table for loading the values from an INI
-	inline const FieldParse *getFieldParse() const { return TheWeaponTemplateFieldParseTable; }
+	const FieldParse *getFieldParse() const { return TheWeaponTemplateFieldParseTable; }
 
-	/** 
+	/**
 		fire the weapon. return the logic-frame in which the damage will be dealt.
-		
+
 		If the damage will be determined at an indeterminate later date (eg, via Projectile),
 		or will never be dealt (eg, target was out of range), return zero.
 
@@ -354,11 +369,11 @@ class WeaponTemplate : public MemoryPoolObject
 	*/
 	UnsignedInt fireWeaponTemplate
 	(
-		const Object *sourceObj, 
-		WeaponSlotType wslot, 
-		Int specificBarrelToUse, 
-		const Object *victimObj, 
-		const Coord3D* victimPos, 
+		const Object *sourceObj,
+		WeaponSlotType wslot,
+		Int specificBarrelToUse,
+		const Object *victimObj,
+		const Coord3D* victimPos,
 		const WeaponBonus& bonus,
 		Bool isProjectileDetonation,
 		Bool ignoreRanges,
@@ -373,9 +388,9 @@ class WeaponTemplate : public MemoryPoolObject
 		take weapon range into account -- it ASSUMES that the victim is within range!
 	*/
 	Real estimateWeaponTemplateDamage(
-		const Object *sourceObj, 
-		const Object *victimObj, 
-		const Coord3D* victimPos, 
+		const Object *sourceObj,
+		const Object *victimObj,
+		const Coord3D* victimPos,
 		const WeaponBonus& bonus
 	) const;
 
@@ -391,62 +406,62 @@ class WeaponTemplate : public MemoryPoolObject
 	Int getPreAttackDelay(const WeaponBonus& bonus) const;
 	Bool isContactWeapon() const;
 
-	inline Real getRequestAssistRange() const {return m_requestAssistRange;}
-	inline AsciiString getName() const { return m_name; }
-	inline AsciiString getProjectileStreamName() const { return m_projectileStreamName; }
-	inline AsciiString getLaserName() const { return m_laserName; }
-	inline NameKeyType getNameKey() const { return m_nameKey; }
-	inline Real getWeaponSpeed() const { return m_weaponSpeed; }
-	inline Real getMinWeaponSpeed() const { return m_minWeaponSpeed; }
-	inline Bool isScaleWeaponSpeed() const { return m_isScaleWeaponSpeed; }
-	inline Real getWeaponRecoilAmount() const { return m_weaponRecoil; }
-	inline Real getMinTargetPitch() const { return m_minTargetPitch; }
-	inline Real getMaxTargetPitch() const { return m_maxTargetPitch; }
-	inline DamageType getDamageType() const { return m_damageType; }
-	inline DeathType getDeathType() const { return m_deathType; }
-	inline Real getContinueAttackRange() const { return m_continueAttackRange; }
-	inline Real getInfantryInaccuracyDist() const { return m_infantryInaccuracyDist; }
-	inline Real getAimDelta() const { return m_aimDelta; }
-	inline Real getScatterRadius() const { return m_scatterRadius; }
-	inline Real getScatterTargetScalar() const { return m_scatterTargetScalar; }
-	inline const ThingTemplate* getProjectileTemplate() const { return m_projectileTmpl; }
-	inline Bool getDamageDealtAtSelfPosition() const { return m_damageDealtAtSelfPosition; }
-	inline Int getAffectsMask() const { return m_affectsMask; }
-	inline Int getProjectileCollideMask() const { return m_collideMask; }
-	inline WeaponReloadType getReloadType() const { return m_reloadType; }
-	inline WeaponPrefireType getPrefireType() const { return m_prefireType; }
-	inline Bool getAutoReloadsClip() const { return m_reloadType == AUTO_RELOAD; }
-	inline Int getClipSize() const { return m_clipSize; }
-	inline Int getContinuousFireOneShotsNeeded() const { return m_continuousFireOneShotsNeeded; }
-	inline Int getContinuousFireTwoShotsNeeded() const { return m_continuousFireTwoShotsNeeded; }
-	inline UnsignedInt getContinuousFireCoastFrames() const { return m_continuousFireCoastFrames; }
-	inline UnsignedInt getAutoReloadWhenIdleFrames() const { return m_autoReloadWhenIdleFrames; }
-	inline UnsignedInt getSuspendFXDelay() const { return m_suspendFXDelay; }
-
-	inline const FXList* getFireFX(VeterancyLevel v) const { return m_fireFXs[v]; }
-	inline const FXList* getProjectileDetonateFX(VeterancyLevel v) const { return m_projectileDetonateFXs[v]; }
-	inline const ObjectCreationList* getFireOCL(VeterancyLevel v) const { return m_fireOCLs[v]; }
-	inline const ObjectCreationList* getProjectileDetonationOCL(VeterancyLevel v) const { return m_projectileDetonationOCLs[v]; }
-	inline const ParticleSystemTemplate* getProjectileExhaust(VeterancyLevel v) const { return m_projectileExhausts[v]; }
-
-	inline const AudioEventRTS& getFireSound() const { return m_fireSound; }
-	inline UnsignedInt getFireSoundLoopTime() const { return m_fireSoundLoopTime; }
-	inline const std::vector<Coord2D>& getScatterTargetsVector() const { return m_scatterTargets; }
-	inline const WeaponBonusSet* getExtraBonus() const { return m_extraBonus; }
-	inline Int getShotsPerBarrel() const { return m_shotsPerBarrel; }
-	inline Int getAntiMask() const { return m_antiMask; }
-	inline Bool isLeechRangeWeapon() const { return m_leechRangeWeapon; }
-	inline Bool isCapableOfFollowingWaypoint() const { return m_capableOfFollowingWaypoint; }
-	inline Bool isShowsAmmoPips() const { return m_isShowsAmmoPips; }
-	inline Bool isPlayFXWhenStealthed() const { return m_playFXWhenStealthed; }
+	Real getRequestAssistRange() const {return m_requestAssistRange;}
+	AsciiString getName() const { return m_name; }
+	AsciiString getProjectileStreamName() const { return m_projectileStreamName; }
+	AsciiString getLaserName() const { return m_laserName; }
+	NameKeyType getNameKey() const { return m_nameKey; }
+	Real getWeaponSpeed() const { return m_weaponSpeed; }
+	Real getMinWeaponSpeed() const { return m_minWeaponSpeed; }
+	Bool isScaleWeaponSpeed() const { return m_isScaleWeaponSpeed; }
+	Real getWeaponRecoilAmount() const { return m_weaponRecoil; }
+	Real getMinTargetPitch() const { return m_minTargetPitch; }
+	Real getMaxTargetPitch() const { return m_maxTargetPitch; }
+	DamageType getDamageType() const { return m_damageType; }
+	DeathType getDeathType() const { return m_deathType; }
+	Real getContinueAttackRange() const { return m_continueAttackRange; }
+	Real getInfantryInaccuracyDist() const { return m_infantryInaccuracyDist; }
+	Real getAimDelta() const { return m_aimDelta; }
+	Real getScatterRadius() const { return m_scatterRadius; }
+	Real getScatterTargetScalar() const { return m_scatterTargetScalar; }
+	const ThingTemplate* getProjectileTemplate() const { return m_projectileTmpl; }
+	Bool getDamageDealtAtSelfPosition() const { return m_damageDealtAtSelfPosition; }
+	Int getAffectsMask() const { return m_affectsMask; }
+	Int getProjectileCollideMask() const { return m_collideMask; }
+	WeaponReloadType getReloadType() const { return m_reloadType; }
+	WeaponPrefireType getPrefireType() const { return m_prefireType; }
+	Bool getAutoReloadsClip() const { return m_reloadType == AUTO_RELOAD; }
+	Int getClipSize() const { return m_clipSize; }
+	Int getContinuousFireOneShotsNeeded() const { return m_continuousFireOneShotsNeeded; }
+	Int getContinuousFireTwoShotsNeeded() const { return m_continuousFireTwoShotsNeeded; }
+	UnsignedInt getContinuousFireCoastFrames() const { return m_continuousFireCoastFrames; }
+	UnsignedInt getAutoReloadWhenIdleFrames() const { return m_autoReloadWhenIdleFrames; }
+	UnsignedInt getSuspendFXDelay() const { return m_suspendFXDelay; }
+
+	const FXList* getFireFX(VeterancyLevel v) const { return m_fireFXs[v]; }
+	const FXList* getProjectileDetonateFX(VeterancyLevel v) const { return m_projectileDetonateFXs[v]; }
+	const ObjectCreationList* getFireOCL(VeterancyLevel v) const { return m_fireOCLs[v]; }
+	const ObjectCreationList* getProjectileDetonationOCL(VeterancyLevel v) const { return m_projectileDetonationOCLs[v]; }
+	const ParticleSystemTemplate* getProjectileExhaust(VeterancyLevel v) const { return m_projectileExhausts[v]; }
+
+	const AudioEventRTS& getFireSound() const { return m_fireSound; }
+	UnsignedInt getFireSoundLoopTime() const { return m_fireSoundLoopTime; }
+	const std::vector<Coord2D>& getScatterTargetsVector() const { return m_scatterTargets; }
+	const WeaponBonusSet* getExtraBonus() const { return m_extraBonus; }
+	Int getShotsPerBarrel() const { return m_shotsPerBarrel; }
+	Int getAntiMask() const { return m_antiMask; }
+	Bool isLeechRangeWeapon() const { return m_leechRangeWeapon; }
+	Bool isCapableOfFollowingWaypoint() const { return m_capableOfFollowingWaypoint; }
+	Bool isShowsAmmoPips() const { return m_isShowsAmmoPips; }
+	Bool isPlayFXWhenStealthed() const { return m_playFXWhenStealthed; }
 
 	Bool shouldProjectileCollideWith(
-		const Object* projectileLauncher, 
-		const Object* projectile, 
+		const Object* projectileLauncher,
+		const Object* projectile,
 		const Object* thingWeCollidedWith,
 		ObjectID intendedVictimID	// could be INVALID_ID for a position-shot
 	) const;
-	
+
 	void postProcessLoad();
 
 protected:
@@ -454,9 +469,11 @@ class WeaponTemplate : public MemoryPoolObject
 	// actually deal out the damage.
 	void dealDamageInternal(ObjectID sourceID, ObjectID victimID, const Coord3D *pos, const WeaponBonus& bonus, Bool isProjectileDetonation) const;
 	void trimOldHistoricDamage() const;
+	void trimTriggeredHistoricDamage() const;
+	void processHistoricDamage(const Object* source, const Coord3D* pos) const;
 
 private:
-	
+
 	// NOTE: m_nextTemplate will be cleaned up if it is NON-NULL.
 	WeaponTemplate *m_nextTemplate;
 
@@ -473,7 +490,7 @@ class WeaponTemplate : public MemoryPoolObject
 	Real m_primaryDamage;										///< primary damage amount
 	Real m_primaryDamageRadius;							///< primary damage radius range
 	Real m_secondaryDamage;									///< secondary damage amount
-	Real m_secondaryDamageRadius;						///< secondary damage radius range	
+	Real m_secondaryDamageRadius;						///< secondary damage radius range
 	Real m_attackRange;											///< max distance the weapon can deal damage
 	Real m_minimumAttackRange;							///< Min distance the weapon should be fired from
 	Real m_requestAssistRange;							///< My object will look this far around to get people to join in the attack.
@@ -530,7 +547,8 @@ class WeaponTemplate : public MemoryPoolObject
 	Real m_infantryInaccuracyDist;					///< When this weapon is used against infantry, it can randomly miss by as much as this distance.
 	UnsignedInt m_suspendFXDelay;						///< The fx can be suspended for any delay, in frames, then they will execute as normal
 	mutable HistoricWeaponDamageList m_historicDamage;
-};  
+	mutable UnsignedInt m_historicDamageTriggerId;
+};
 
 // ---------------------------------------------------------
 class Weapon : public MemoryPoolObject,
@@ -635,44 +653,44 @@ class Weapon : public MemoryPoolObject,
 
 	// we must pass the source object for these (and for ANY FUTURE ADDITIONS)
 	// so that we can take the source's weapon bonuses, if any, into account.
-	// Also note: you should RARELY need to call getAttackRange. If what you want is to 
+	// Also note: you should RARELY need to call getAttackRange. If what you want is to
 	// determine if you are within attack range, please call isWithinAttackRange instead.
 	Real getAttackRange(const Object *source) const;
 
 	// Returns the max distance between the centerpoints of source & victim	for victim to be in range.
 	Real getAttackDistance(const Object *source, const Object *victim, const Coord3D* victimPos) const;
 
-	void newProjectileFired( const Object *sourceObj, const Object *projectile );///<I just made this projectile and may need to keep track of it 
-	
+	void newProjectileFired( const Object *sourceObj, const Object *projectile );///<I just made this projectile and may need to keep track of it
+
 	Bool isLaser() const { return m_template->getLaserName().isNotEmpty(); }
 	void createLaser( const Object *sourceObj, const Object *victimObj, const Coord3D *victimPos );
 
-	inline const WeaponTemplate* getTemplate() const { return m_template; }
-	inline WeaponSlotType getWeaponSlot() const { return m_wslot; }
-	inline AsciiString getName() const { return m_template->getName(); }
-	inline UnsignedInt getLastShotFrame() const { return m_lastFireFrame; }						///< frame a shot was last fired on
+	const WeaponTemplate* getTemplate() const { return m_template; }
+	WeaponSlotType getWeaponSlot() const { return m_wslot; }
+	AsciiString getName() const { return m_template->getName(); }
+	UnsignedInt getLastShotFrame() const { return m_lastFireFrame; }						///< frame a shot was last fired on
 	// If we are "reloading", then m_ammoInClip is a lie.  It will say full.
-	inline UnsignedInt getRemainingAmmo() const { return (getStatus() == RELOADING_CLIP) ? 0 : m_ammoInClip; }
-	inline WeaponReloadType getReloadType() const { return m_template->getReloadType(); }
-	inline Bool getAutoReloadsClip() const { return m_template->getAutoReloadsClip(); }
-	inline Real getAimDelta() const { return m_template->getAimDelta(); }
-	inline Real getScatterRadius() const { return m_template->getScatterRadius(); }
-	inline Real getScatterTargetScalar() const { return m_template->getScatterTargetScalar(); }
-	inline Int getAntiMask() const { return m_template->getAntiMask(); }
-	inline Bool isCapableOfFollowingWaypoint() const { return m_template->isCapableOfFollowingWaypoint(); }
-	inline Int getContinuousFireOneShotsNeeded() const { return m_template->getContinuousFireOneShotsNeeded(); }
-	inline Int getContinuousFireTwoShotsNeeded() const { return m_template->getContinuousFireTwoShotsNeeded(); }
-	inline UnsignedInt getContinuousFireCoastFrames() const { return m_template->getContinuousFireCoastFrames(); }
-	inline UnsignedInt getAutoReloadWhenIdleFrames() const { return m_template->getAutoReloadWhenIdleFrames(); }
-	inline const AudioEventRTS& getFireSound() const { return m_template->getFireSound(); }
-	inline UnsignedInt getFireSoundLoopTime() const { return m_template->getFireSoundLoopTime(); }
-	inline DamageType getDamageType() const { return m_template->getDamageType(); }
-	inline DeathType getDeathType() const { return m_template->getDeathType(); }
-	inline Real getContinueAttackRange() const { return m_template->getContinueAttackRange(); }
-	inline Bool isShowsAmmoPips() const { return m_template->isShowsAmmoPips(); }
-	inline Int getClipSize() const { return m_template->getClipSize(); }
+	UnsignedInt getRemainingAmmo() const { return (getStatus() == RELOADING_CLIP) ? 0 : m_ammoInClip; }
+	WeaponReloadType getReloadType() const { return m_template->getReloadType(); }
+	Bool getAutoReloadsClip() const { return m_template->getAutoReloadsClip(); }
+	Real getAimDelta() const { return m_template->getAimDelta(); }
+	Real getScatterRadius() const { return m_template->getScatterRadius(); }
+	Real getScatterTargetScalar() const { return m_template->getScatterTargetScalar(); }
+	Int getAntiMask() const { return m_template->getAntiMask(); }
+	Bool isCapableOfFollowingWaypoint() const { return m_template->isCapableOfFollowingWaypoint(); }
+	Int getContinuousFireOneShotsNeeded() const { return m_template->getContinuousFireOneShotsNeeded(); }
+	Int getContinuousFireTwoShotsNeeded() const { return m_template->getContinuousFireTwoShotsNeeded(); }
+	UnsignedInt getContinuousFireCoastFrames() const { return m_template->getContinuousFireCoastFrames(); }
+	UnsignedInt getAutoReloadWhenIdleFrames() const { return m_template->getAutoReloadWhenIdleFrames(); }
+	const AudioEventRTS& getFireSound() const { return m_template->getFireSound(); }
+	UnsignedInt getFireSoundLoopTime() const { return m_template->getFireSoundLoopTime(); }
+	DamageType getDamageType() const { return m_template->getDamageType(); }
+	DeathType getDeathType() const { return m_template->getDeathType(); }
+	Real getContinueAttackRange() const { return m_template->getContinueAttackRange(); }
+	Bool isShowsAmmoPips() const { return m_template->isShowsAmmoPips(); }
+	Int getClipSize() const { return m_template->getClipSize(); }
 	// Contact weapons (like car bombs) need to basically collide with their target.
-	inline Bool isContactWeapon() const { return m_template->isContactWeapon(); }
+	Bool isContactWeapon() const { return m_template->isContactWeapon(); }
 
 	UnsignedInt getClipReloadTime(const Object *source) const;
 
@@ -685,7 +703,7 @@ class Weapon : public MemoryPoolObject,
 	Bool isPitchLimited() const { return m_pitchLimited; }
 	Bool isWithinTargetPitch(const Object *source, const Object *victim) const;
 
-	//Leech range functionality simply means this weapon has unlimited range temporarily. How it works is if the 
+	//Leech range functionality simply means this weapon has unlimited range temporarily. How it works is if the
 	//weapon template has the LeechRangeWeapon set, it means that once the unit has closed to standard weapon range
 	//it fires the weapon, and will be able to hit the target even if it moves out of range! The unit will simply
 	//stand there. This functionality is used by hack attacks.
@@ -702,17 +720,17 @@ class Weapon : public MemoryPoolObject,
 	Bool isClearGoalFiringLineOfSightTerrain(const Object* source, const Coord3D& goalPos, const Coord3D& victimPos) const;
 
 	static void calcProjectileLaunchPosition(
-		const Object* launcher, 
-		WeaponSlotType wslot, 
+		const Object* launcher,
+		WeaponSlotType wslot,
 		Int specificBarrelToUse,
 		Matrix3D& worldTransform,
 		Coord3D& worldPos
 	);
 
 	static void positionProjectileForLaunch(
-		Object* projectile, 
-		const Object *launcher, 
-		WeaponSlotType wslot, 
+		Object* projectile,
+		const Object *launcher,
+		WeaponSlotType wslot,
 		Int specificBarrelToUse
 	);
 
@@ -730,11 +748,11 @@ class Weapon : public MemoryPoolObject,
 
 	// return true if we auto-reloaded our clip after firing.
 	Bool privateFireWeapon(
-		const Object *sourceObj, 
-		Object *victimObj, 
-		const Coord3D* victimPos, 
-		Bool isProjectileDetonation, 
-		Bool ignoreRanges, 
+		const Object *sourceObj,
+		Object *victimObj,
+		const Coord3D* victimPos,
+		Bool isProjectileDetonation,
+		Bool ignoreRanges,
 		WeaponBonusConditionFlags extraBonusFlags,
 		ObjectID* projectileID
 	);
@@ -753,7 +771,7 @@ class Weapon : public MemoryPoolObject,
 private:
 	const WeaponTemplate*			m_template;									///< the kind of weapon this is
 	WeaponSlotType						m_wslot;										///< are we primary, secondary, etc. weapon? (used for projectile placement on reload)
-	mutable WeaponStatus			m_status;										///< weapon status 
+	mutable WeaponStatus			m_status;										///< weapon status
 	UnsignedInt								m_ammoInClip;								///< how many shots left in current clip
 	UnsignedInt								m_whenWeCanFireAgain;				///< the first frame the weapon can fire again
 	UnsignedInt								m_whenPreAttackFinished;		///< the frame the pre attack will complete.
@@ -796,25 +814,26 @@ class WeaponStore : public SubsystemInterface
 	/**
 		Find the WeaponTemplate with the given name. If no such WeaponTemplate exists, return null.
 	*/
-	const WeaponTemplate *findWeaponTemplate(AsciiString name) const;
+	const WeaponTemplate *findWeaponTemplate(const AsciiString& name) const;
+	const WeaponTemplate *findWeaponTemplate(const char* name) const;
 	const WeaponTemplate *findWeaponTemplateByNameKey( NameKeyType key ) const { return findWeaponTemplatePrivate( key ); }
 
 	// this dynamically allocates a new Weapon, which is owned (and must be freed!) by the caller.
-	inline Weapon* allocateNewWeapon(const WeaponTemplate *tmpl, WeaponSlotType wslot) const
+	Weapon* allocateNewWeapon(const WeaponTemplate *tmpl, WeaponSlotType wslot) const
 	{
 		return newInstance(Weapon)(tmpl, wslot);	// my, that was easy
 	}
 
 	void createAndFireTempWeapon(const WeaponTemplate* w, const Object *source, const Coord3D* pos);
 	void createAndFireTempWeapon(const WeaponTemplate* w, const Object *source, Object *target);
-	
+
 	void handleProjectileDetonation(const WeaponTemplate* w, const Object *source, const Coord3D* pos, WeaponBonusConditionFlags extraBonusFlags);
-	
+
 	static void parseWeaponTemplateDefinition(INI* ini);
 
 protected:
 
-	WeaponTemplate *findWeaponTemplatePrivate( NameKeyType key ) const;	
+	WeaponTemplate *findWeaponTemplatePrivate( NameKeyType key ) const;
 
 	WeaponTemplate *newWeaponTemplate( AsciiString name );
 	WeaponTemplate *newOverride( WeaponTemplate *weaponTemplate );
@@ -843,11 +862,13 @@ class WeaponStore : public SubsystemInterface
 	};
 
 	std::vector<WeaponTemplate*> m_weaponTemplateVector;
+
+	// TheSuperHackers @performance IamInnocent 01/01/2026 - Now additionally stores the same weapon templates in a hash map to optimize lookups by name key
+	typedef std::hash_map<NameKeyType, WeaponTemplate*, rts::hash<NameKeyType>, rts::equal_to<NameKeyType> > WeaponTemplateMap;
+	WeaponTemplateMap m_weaponTemplateHashMap;
+
 	std::list<WeaponDelayedDamageInfo> m_weaponDDI;
 };
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern WeaponStore *TheWeaponStore;
-
-#endif // __WEAPON_H_
-
diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h
index cad75b1ee36..d8642d3123b 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h
@@ -27,9 +27,5 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __WEAPONBONUSCONDITIONFLAGS_H__
-#define __WEAPONBONUSCONDITIONFLAGS_H__
 
 typedef UnsignedInt WeaponBonusConditionFlags;
-
-#endif /* __WEAPONBONUSCONDITIONFLAGS_H__ */
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h
index 8ab67fb6cbd..eecd011a369 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h
@@ -26,9 +26,6 @@
 
 #pragma once
 
-#ifndef _WeaponSet_H_
-#define _WeaponSet_H_
-
 #include "Lib/BaseType.h"
 #include "Common/GameType.h"
 #include "Common/KindOf.h"
@@ -53,7 +50,7 @@ enum DamageType CPP_11(: Int);
 #include "GameLogic/WeaponSetFlags.h"
 
 #ifdef DEFINE_WEAPONSLOTTYPE_NAMES
-static const char *TheWeaponSlotTypeNames[] = 
+static const char *const TheWeaponSlotTypeNames[] =
 {
 	"PRIMARY",
 	"SECONDARY",
@@ -61,17 +58,19 @@ static const char *TheWeaponSlotTypeNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheWeaponSlotTypeNames) == WEAPONSLOT_COUNT + 1, "Incorrect array size");
 
-static const LookupListRec TheWeaponSlotTypeNamesLookupList[] = 
+static const LookupListRec TheWeaponSlotTypeNamesLookupList[] =
 {
 	{ "PRIMARY",		PRIMARY_WEAPON },
 	{ "SECONDARY",	SECONDARY_WEAPON },
 	{ "TERTIARY",		TERTIARY_WEAPON },
-	
-	{ NULL, 0	}// keep this last!
+
+	{ NULL, 0	}
 };
+static_assert(ARRAY_SIZE(TheWeaponSlotTypeNamesLookupList) == WEAPONSLOT_COUNT + 1, "Incorrect array size");
 
-#endif  
+#endif
 
 //-------------------------------------------------------------------------------------------------
 #ifdef DEFINE_WEAPONCONDITIONMAP
@@ -117,7 +116,7 @@ class WeaponTemplateSet
 	static void parsePreferredAgainst(INI* ini, void *instance, void *store, const void* userData);
 
 public:
-	inline WeaponTemplateSet()
+	WeaponTemplateSet()
 	{
 		clear();
 	}
@@ -132,23 +131,20 @@ class WeaponTemplateSet
 	Bool isWeaponLockSharedAcrossSets() const {return m_isWeaponLockSharedAcrossSets; }
 
 	Bool hasAnyWeapons() const;
-	inline const WeaponTemplate* getNth(WeaponSlotType n) const { return m_template[n]; } 
-	inline UnsignedInt getNthCommandSourceMask(WeaponSlotType n) const { return m_autoChooseMask[n]; } 
-	inline const KindOfMaskType& getNthPreferredAgainstMask(WeaponSlotType n) const { return m_preferredAgainst[n]; } 
-
-	inline Int getConditionsYesCount() const { return 1; }
-	inline const WeaponSetFlags& getNthConditionsYes(Int i) const { return m_types; }
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	inline AsciiString getDescription() const { return AsciiString("ArmorTemplateSet"); }
+	const WeaponTemplate* getNth(WeaponSlotType n) const { return m_template[n]; }
+	UnsignedInt getNthCommandSourceMask(WeaponSlotType n) const { return m_autoChooseMask[n]; }
+	const KindOfMaskType& getNthPreferredAgainstMask(WeaponSlotType n) const { return m_preferredAgainst[n]; }
+
+	Int getConditionsYesCount() const { return 1; }
+	const WeaponSetFlags& getNthConditionsYes(Int i) const { return m_types; }
+#if defined(RTS_DEBUG)
+	inline AsciiString getDescription() const { return "ArmorTemplateSet"; }
 #endif
 };
 
 //-------------------------------------------------------------------------------------------------
 typedef std::vector<WeaponTemplateSet> WeaponTemplateSetVector;
 
-//-------------------------------------------------------------------------------------------------
-typedef SparseMatchFinder<WeaponTemplateSet, WeaponSetFlags> WeaponTemplateSetFinder;
-
 //-------------------------------------------------------------------------------------------------
 enum WeaponChoiceCriteria CPP_11(: Int)
 {
@@ -225,7 +221,7 @@ class WeaponSet : public Snapshot
 
 	/**
 		Determines if the unit has any weapon that could conceivably
-		harm the victim. this does not take range, ammo, etc. into 
+		harm the victim. this does not take range, ammo, etc. into
 		account, but immutable weapon properties, such as "can you
 		target airborne victims".
 	*/
@@ -246,5 +242,3 @@ class WeaponSet : public Snapshot
 
 	static ModelConditionFlags getModelConditionForWeaponSlot(WeaponSlotType wslot, WeaponSetConditionType a);
 };
-
-#endif	// _WeaponSet_H_
diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h
index 70c8c3fb7b1..f57263f6c05 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h
@@ -27,11 +27,7 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __WEAPONSETFLAGS_H__
-#define __WEAPONSETFLAGS_H__
 
 #include "GameLogic/WeaponSetType.h"
 
 typedef BitFlags<WEAPONSET_COUNT> WeaponSetFlags;
-
-#endif /* __WEAPONSETFLAGS_H__ */
diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h
index b0274dc0876..b34868e60c8 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h
@@ -27,15 +27,13 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __WEAPONSETTYPE_H__
-#define __WEAPONSETTYPE_H__
 
 //-------------------------------------------------------------------------------------------------
 // IMPORTANT NOTE: you should endeavor to set up states such that the most "normal"
 // state is defined by the bit being off. That is, the typical "normal" condition
 // has all condition flags set to zero.
 //
-// IMPORTANT NOTE #2: if you add or modify this list, be sure to update TheWeaponSetNames, 
+// IMPORTANT NOTE #2: if you add or modify this list, be sure to update TheWeaponSetNames,
 // *and* TheWeaponSetTypeToModelConditionTypeMap!
 //
 enum WeaponSetType CPP_11(: Int)
@@ -51,7 +49,5 @@ enum WeaponSetType CPP_11(: Int)
 	WEAPONSET_CARBOMB,
 	WEAPONSET_MINE_CLEARING_DETAIL,
 
-	WEAPONSET_COUNT			///< keep last, please
+	WEAPONSET_COUNT
 };
-
-#endif /* __WEAPONSETTYPE_H__ */
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h
index a9dc0422054..0a80eb8bd1d 100644
--- a/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h
+++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h
@@ -27,8 +27,6 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __WEAPONSTATUS_H__
-#define __WEAPONSTATUS_H__
 
 enum WeaponStatus CPP_11(: Int)
 {
@@ -38,7 +36,5 @@ enum WeaponStatus CPP_11(: Int)
 	RELOADING_CLIP,
 	PRE_ATTACK,
 
-	WEAPON_STATUS_COUNT	// keep last
+	WEAPON_STATUS_COUNT
 };
-
-#endif /* __WEAPONSTATUS_H__ */
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/Connection.h b/Generals/Code/GameEngine/Include/GameNetwork/Connection.h
deleted file mode 100644
index 3a0178510fc..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/Connection.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * The Connection class handles queues for individual players, one connection per player.
- * Connections are identified by their names (m_name).  This should accomodate changing IPs
- * in the face of modem disconnects, NAT irregularities, etc.
- * Messages can be guaranteed or non-guaranteed, sequenced or not.
- *
- *
- * So how this works is this:
- * The connection contains the incoming and outgoing commands to and from the player this
- * connection object represents.  The incoming packets are separated into the different frames
- * of execution.  This is done for efficiency reasons since we will be keeping track of commands
- * that are to be executed on many different frames, and they will need to be retrieved by the
- * connection manager on a per-frame basis.  We don't really care what frame the outgoing
- * commands are executed on as they all need to be sent out right away to ensure that the commands
- * get to their destination in time.
- */
-
-#pragma once
-
-#ifndef __CONNECTION_H
-#define __CONNECTION_H
-
-#include "GameNetwork/NetCommandList.h"
-#include "GameNetwork/User.h"
-#include "GameNetwork/Transport.h"
-#include "GameNetwork/NetPacket.h"
-
-#define CONNECTION_LATENCY_HISTORY_LENGTH 200
-
-class Connection : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Connection, "Connection")		
-public:
-	Connection();
-	//~Connection();
-
-	void update();
-	void init();
-	void reset();
-
-	UnsignedInt doSend();
-	void doRecv();
-
-	Bool allCommandsReady(UnsignedInt frame);
-	Bool isQueueEmpty();
-	void attachTransport(Transport *transport);
-	void setUser(User *user);
-	User *getUser();
-	void setFrameGrouping(time_t frameGrouping);
-
-	void sendNetCommandMsg(NetCommandMsg *msg, UnsignedByte relay);
-
-	// These two processAck calls do the same thing, just take different types of ACK commands.
-	NetCommandRef * processAck(NetAckBothCommandMsg *msg);
-	NetCommandRef * processAck(NetAckStage1CommandMsg *msg);
-	NetCommandRef * processAck(NetCommandMsg *msg);
-	NetCommandRef * processAck(UnsignedShort commandID, UnsignedByte originalPlayerID);
-
-	void clearCommandsExceptFrom( Int playerIndex );
-
-	void setQuitting( void );
-	Bool isQuitting( void ) { return m_isQuitting; }
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	void debugPrintCommands();
-#endif
-
-protected:
-	void doRetryMetrics();
-
-	Bool m_isQuitting;
-	UnsignedInt m_quitTime;
-
-	Transport *m_transport;
-	User *m_user;
-
-	NetCommandList *m_netCommandList;
-	time_t m_retryTime;						///< The time between sending retry packets for this connection.  Time is in milliseconds.
-	Real m_averageLatency;			///< The average time between sending a command and receiving an ACK.
-	Real m_latencies[CONNECTION_LATENCY_HISTORY_LENGTH];	///< List of the last 100 latencies.
-
-	time_t m_frameGrouping;				///< The minimum time between packet sends.
-	time_t m_lastTimeSent;				///< The time of the last packet send.
-	Int m_numRetries;							///< The number of retries for the last second.
-	time_t m_retryMetricsTime;		///< The start time of the current retry metrics thing.
-};
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h b/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h
deleted file mode 100644
index 81b99037a94..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * The connection manager maintains a collection of Connections to each player.  Messages are queued up
- * from here, as well as removed through here.
- */
-
-#pragma once
-
-#ifndef __CONNECTIONMANAGER_H
-#define __CONNECTIONMANAGER_H
-
-#include "GameNetwork/Connection.h"
-#include "GameNetwork/NetCommandList.h"
-#include "GameNetwork/Transport.h"
-#include "GameNetwork/FrameDataManager.h"
-#include "GameNetwork/FrameMetrics.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/DisconnectManager.h"
-
-class GameInfo;
-class NetCommandWrapperList;
-
-typedef std::map<UnsignedShort, AsciiString> FileCommandMap;
-typedef std::map<UnsignedShort, UnsignedByte> FileMaskMap;
-typedef std::map<UnsignedShort, Int> FileProgressMap;
-
-class ConnectionManager
-{
-public:
-	ConnectionManager();
-	~ConnectionManager();
-
-	virtual void init();				///< Initialize this instance.
-	virtual void reset();				///< Take this instance back to the initial state.
-	virtual void update(Bool isInGame);			///< Service the Connections being managed by this instance.
-
-	// End SubsystemInterface functions
-
-	void updateRunAhead(Int oldRunAhead, Int frameRate, Bool didSelfSlug, Int nextExecutionFrame);	///< Update the run ahead value.  If we are the current packet router, issue the command.
-
-	void attachTransport(Transport *transport);
-
-	void parseUserList(const GameInfo *game);
-	void sendChat(UnicodeString text, Int playerMask, UnsignedInt executionFrame);
-	void sendDisconnectChat(UnicodeString text);
-	void sendLocalCommand(NetCommandMsg *msg, UnsignedByte relay = 0xff);		///< Send command to the players specified in the relay, goes through packet router.
-	void sendLocalCommandDirect(NetCommandMsg *msg, UnsignedByte relay);		///< Send command directly to the players specified, doesn't go through packet router.
-	void sendLocalGameMessage(GameMessage *msg, UnsignedInt frame);
-	void sendCommand(NetCommandMsg *msg);
-	Bool allCommandsReady(UnsignedInt frame, Bool justTesting = FALSE);
-	void handleAllCommandsReady(void);
-	NetCommandList *getFrameCommandList(UnsignedInt frame);
-//	void AddConnection(User *user, UnsignedInt slot);
-	void determineRouterFallbackPlan();
-	void zeroFrames(UnsignedInt startingFrame, UnsignedInt numFrames);
-	void destroyGameMessages();
-//	void createConnections(UnsignedInt numberOfPlayers, UnsignedInt localSlot);
-	void setLocalAddress(UnsignedInt ip, UnsignedInt port);
-	void initTransport();
-	void processFrameTick(UnsignedInt frame);
-	void handleLocalPlayerLeaving(UnsignedInt frame);
-
-	void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID);
-	UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask);
-	Int getFileTransferProgress(Int playerID, AsciiString path);
-	Bool areAllQueuesEmpty(void);
-
-	UnsignedInt getLocalPlayerID();
-	UnicodeString getPlayerName(Int playerNum);
-	Int getNumPlayers();
-
-	UnsignedInt getPacketRouterFallbackSlot(Int packetRouterNumber);	///< Returns the slot of the given packet router number in the fallback plan.
-	UnsignedInt getPacketRouterSlot();																///< Returns the current packet router's slot.
-	PlayerLeaveCode disconnectPlayer(Int slot);												///< Disconnect this player immediately.  This should only be called by the disconnect manager.
-	void disconnectLocalPlayer();																			///< Does whatever is necessary to get TheNetwork to realize that it should be leaving the game now.
-	void quitGame();																									///< Disconnect from the game RIGHT NOW!!  Tell everyone else we are disconnecting.
-
-	void voteForPlayerDisconnect(Int slot);														///< Register a vote for a player to be disconnected.
-
-	void resendPendingCommands();																			///< Resend the pending commands to the packet router.
-
-	void setFrameGrouping(time_t frameGrouping);				///< Set the number of frames that are grouped together into packets.
-
-	PlayerLeaveCode processPlayerLeave(NetPlayerLeaveCommandMsg *msg);
-	Bool canILeave();																///< Returns true if the local player is allowed to leave.
-
-	// Bandwidth metrics
-	Real getIncomingBytesPerSecond( void );
-	Real getIncomingPacketsPerSecond( void );
-	Real getOutgoingBytesPerSecond( void );
-	Real getOutgoingPacketsPerSecond( void );
-	Real getUnknownBytesPerSecond( void );
-	Real getUnknownPacketsPerSecond( void );
-	UnsignedInt getPacketArrivalCushion( void );
-
-	UnsignedInt getMinimumCushion();
-
-	void flushConnections();
-
-	void processChat(NetChatCommandMsg *msg); // this actually needs to be public because it is frame-synchronized
-	
-	void updateLoadProgress( Int progress );
-	void loadProgressComplete( void );
-	void sendTimeOutGameStart( void );
-	
-	Bool isPacketRouter( void );
-
-	Bool isPlayerConnected( Int playerID );
-
-	void notifyOthersOfCurrentFrame(Int frame);
-	void sendFrameDataToPlayer(UnsignedInt playerID, UnsignedInt startingFrame);
-	void sendSingleFrameToPlayer(UnsignedInt playerID, UnsignedInt frame);
-	void notifyOthersOfNewFrame(UnsignedInt frame);
-
-	UnsignedInt getNextPacketRouterSlot(UnsignedInt playerID); ///< returns the packet router player that comes after the given player.
-	
-	Int getAverageFPS( void );
-	Int getSlotAverageFPS(Int slot);
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	void debugPrintConnectionCommands();
-#endif
-
-	// For disconnect blame assignment
-	UnsignedInt getPingFrame();
-	Int getPingsSent();
-	Int getPingsRecieved();
-
-private:
-	void doRelay();
-	void doKeepAlive();
-	void sendRemoteCommand(NetCommandRef *msg);
-	void ackCommand(NetCommandRef *ref, UnsignedInt localSlot);
-
-	Bool processNetCommand(NetCommandRef *ref);
-	void processAckStage1(NetCommandMsg *msg);
-	void processAckStage2(NetCommandMsg *msg);
-	void processAck(NetCommandMsg *msg);
-	void processFrameInfo(NetFrameCommandMsg *msg);
-	void processRunAheadMetrics(NetRunAheadMetricsCommandMsg *msg);
-	void processDisconnectChat(NetDisconnectChatCommandMsg *msg);
-	void processProgress( NetProgressCommandMsg *msg );
-	void processLoadComplete( NetCommandMsg *msg );
-	void processTimeOutGameStart( NetCommandMsg *msg );
-	void processWrapper(NetCommandRef *ref);
-	void processFrameResendRequest(NetFrameResendRequestCommandMsg *msg);
-
-	void processFile(NetFileCommandMsg *ref);
-	void processFileAnnounce(NetFileAnnounceCommandMsg *ref);
-	void processFileProgress(NetFileProgressCommandMsg *ref);
-
-	//	void doPerFrameMetrics(UnsignedInt frame);
-	void getMinimumFps(Int &minFps, Int &minFpsPlayer);			///< Returns the smallest FPS in the m_fpsAverages list.
-	Real getMaximumLatency(); ///< This actually sums the two biggest latencies in the m_latencyAverages list.
-
-	void requestFrameDataResend(Int playerID, UnsignedInt frame); ///< request of this player that he send the specified frame's data.
-
-	// The connections are set up like the slot list. The connection corresponding to the local
-	// player's position in the slot list will be NULL.  Connections corresponding to slots that
-	// do not have a player will also be NULL.
-	Connection *m_connections[MAX_SLOTS];
-
-	Transport *m_transport;
-	UnsignedInt m_localSlot;
-	UnsignedInt m_packetRouterSlot;
-	UnsignedInt m_packetRouterFallback[MAX_SLOTS];
-	UnsignedInt m_localAddr;
-	UnsignedInt m_localPort;
-	User* m_localUser;
-
-	DisconnectManager *m_disconnectManager;						///< Controls the disconnect dialog.
-
-	FrameDataManager *m_frameData[MAX_SLOTS];
-
-	NetCommandList *m_pendingCommands;
-	NetCommandList *m_relayedCommands;
-
-	FrameMetrics m_frameMetrics;
-
-	NetCommandWrapperList *m_netCommandWrapperList;
-
-	// These variables are used to keep track of the other players' average fps and latency.
-	// yup.
-	Real m_latencyAverages[MAX_SLOTS];
-	Int  m_fpsAverages[MAX_SLOTS];
-	Int  m_minFpsPlayer;
-	Int  m_minFps;
-	UnsignedInt m_smallestPacketArrivalCushion;
-	Bool m_didSelfSlug;
-
-	// -----------------------------------------------------------------------------
-	FileCommandMap s_fileCommandMap;
-	FileMaskMap s_fileRecipientMaskMap;
-	FileProgressMap s_fileProgressMap[MAX_SLOTS];
-	// -----------------------------------------------------------------------------
-};
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h b/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h
deleted file mode 100644
index dc7819f93d7..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __DISCONNECTMANAGER_H
-#define __DISCONNECTMANAGER_H
-
-#include "GameNetwork/NetCommandRef.h"
-#include "Lib/BaseType.h"
-//#include "GameNetwork/ConnectionManager.h"
-
-enum DisconnectStateType CPP_11(: Int) {
-	DISCONNECTSTATETYPE_SCREENON,
-	DISCONNECTSTATETYPE_SCREENOFF
-//	DISCONNECTSTATETYPE_WAITINGFORPACKETROUTER
-};
-
-class ConnectionManager;
-
-struct DisconnectVoteStruct {
-	Bool vote;
-	UnsignedInt frame;
-};
-
-class DisconnectManager 
-{
-public:
-	DisconnectManager();
-	virtual ~DisconnectManager();
-
-	void init();
-	void update(ConnectionManager *conMgr);
-
-	void processDisconnectCommand(NetCommandRef *ref, ConnectionManager *conMgr);
-	void allCommandsReady(UnsignedInt frame, ConnectionManager *conMgr, Bool waitForPacketRouter = TRUE);
-	void nextFrame(UnsignedInt frame, ConnectionManager *conMgr);
-	Bool allowedToContinue();			///< Allow the next frame to go through?
-	void playerHasAdvancedAFrame(Int slot, UnsignedInt frame); ///< this player has advanced to that frame.
-
-	void voteForPlayerDisconnect(Int slot, ConnectionManager *conMgr);
-
-	// For disconnect blame assignment
-	UnsignedInt getPingFrame();
-	Int getPingsSent();
-	Int getPingsRecieved();
-
-protected:
-	void sendKeepAlive(ConnectionManager *conMgr);
-	void populateDisconnectScreen(ConnectionManager *conMgr);
-	Int translatedSlotPosition(Int slot, Int localSlot);
-	Int untranslatedSlotPosition(Int slot, Int localSlot);
-	void resetPlayerTimeouts(ConnectionManager *conMgr);
-	void resetPlayerTimeout(Int slot);
-	void resetPacketRouterTimeout();
-	void updateDisconnectStatus(ConnectionManager *conMgr);
-	void disconnectPlayer(Int slot, ConnectionManager *conMgr);
-	void sendDisconnectCommand(Int slot, ConnectionManager *conMgr);
-	void sendVoteCommand(Int slot, ConnectionManager *conMgr);
-	void updateWaitForPacketRouter(ConnectionManager *conMgr);
-	void recalculatePacketRouterIndex(ConnectionManager *conMgr);
-	Bool allOnSameFrame(ConnectionManager *conMgr); ///< returns true if all players are stuck on the same frame.
-	Bool isLocalPlayerNextPacketRouter(ConnectionManager *conMgr); ///< returns true if the local player is next in line to be the packet router with all the players that have timed out being taken out of the picture.
-	Bool hasPlayerTimedOut(Int slot); ///< returns true if this player has timed out.
-	void sendPlayerDestruct(Int slot, ConnectionManager *conMgr); ///< send a destruct player network message.
-	Bool isPlayerVotedOut(Int slot, ConnectionManager *conMgr);	///< returns true if this player has been voted out.
-	Bool isPlayerInGame(Int slot, ConnectionManager *conMgr); ///< returns true if the player has neither timed out or been voted out.
-	UnsignedInt getMaxDisconnectFrame();	///< returns the highest frame that people have got to.
-	Int countVotesForPlayer(Int slot); ///< return the number of disconnect votes a player has.
-	void resetPlayersVotes(Int playerID, UnsignedInt frame, ConnectionManager *conMgr); ///< reset the votes for this player.
-
-	void turnOnScreen(ConnectionManager *conMgr); ///< This gets called when the disconnect screen is first turned on.
-
-	void processDisconnectKeepAlive(NetCommandMsg *msg, ConnectionManager *conMgr);
-	void processDisconnectPlayer(NetCommandMsg *msg, ConnectionManager *conMgr);
-	void processPacketRouterQuery(NetCommandMsg *msg, ConnectionManager *conMgr);
-	void processPacketRouterAck(NetCommandMsg *msg, ConnectionManager *conMgr);
-	void processDisconnectVote(NetCommandMsg *msg, ConnectionManager *conMgr);
-	void processDisconnectFrame(NetCommandMsg *msg, ConnectionManager *conMgr);
-	void processDisconnectScreenOff(NetCommandMsg *msg, ConnectionManager *conMgr);
-
-	void applyDisconnectVote(Int slot, UnsignedInt frame, Int castingSlot, ConnectionManager *conMgr);
-
-	UnsignedInt m_lastFrame;
-	time_t m_lastFrameTime;
-	DisconnectStateType m_disconnectState;
-
-	UnsignedInt m_packetRouterFallback[MAX_SLOTS];
-	UnsignedInt m_currentPacketRouterIndex;
-
-	time_t m_lastKeepAliveSendTime;
-
-	time_t m_playerTimeouts[MAX_SLOTS - 1];
-	time_t m_packetRouterTimeout;
-
-	DisconnectVoteStruct m_playerVotes[MAX_SLOTS][MAX_SLOTS];
-//	Bool m_myVotes[MAX_SLOTS - 1];
-
-	UnsignedInt m_disconnectFrames[MAX_SLOTS];
-	Bool m_disconnectFramesReceived[MAX_SLOTS];
-	Bool m_haveNotifiedOtherPlayersOfCurrentFrame;
-
-	time_t m_timeOfDisconnectScreenOn;
-
-	Int m_pingsSent;
-	Int m_pingsRecieved;
-	UnsignedInt m_pingFrame;
-};
-
-
-#endif // #ifndef __DISCONNECTMANAGER_H
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h b/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h
deleted file mode 100644
index 1c9bd6ab412..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: DownloadManager.h //////////////////////////////////////////////////////
-// Generals download class definitions
-// Author: Matthew D. Campbell, July 2002
-
-#pragma once
-
-#ifndef __DOWNLOADMANAGER_H__
-#define __DOWNLOADMANAGER_H__
-
-#include "WWDownload/downloaddefs.h"
-#include "WWDownload/Download.h"
-
-class CDownload;
-class QueuedDownload
-{
-public:
-	AsciiString server;
-	AsciiString userName;
-	AsciiString password;
-	AsciiString file;
-	AsciiString localFile;
-	AsciiString regKey;
-	Bool tryResume;
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// DownloadManager
-
-class DownloadManager : public IDownload
-{
-public:
-	DownloadManager();
-	virtual ~DownloadManager();
-	
-public:
-	void init( void );
-	HRESULT update( void );
-	void reset( void );
-
-	virtual HRESULT OnError( Int error );
-	virtual HRESULT OnEnd();
-	virtual HRESULT OnQueryResume();
-	virtual HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft );
-	virtual HRESULT OnStatusUpdate( Int status );
-
-	virtual HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume );
-	AsciiString getLastLocalFile( void );
-
-	Bool isDone( void ) { return m_sawEnd || m_wasError; }
-	Bool isOk( void ) { return m_sawEnd; }
-	Bool wasError( void ) { return m_wasError; }
-
-	UnicodeString getStatusString( void ) { return m_statusString; }
-	UnicodeString getErrorString( void ) { return m_errorString; }
-
-	void queueFileForDownload( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume );
-	Bool isFileQueuedForDownload( void ) { return !m_queuedDownloads.empty(); }
-	HRESULT downloadNextQueuedFile( void );
-
-private:
-	Bool m_winsockInit;
-	CDownload *m_download;
-	Bool m_wasError;
-	Bool m_sawEnd;
-	UnicodeString m_errorString;
-	UnicodeString m_statusString;
-
-protected:
-	std::list<QueuedDownload> m_queuedDownloads;
-};
-
-extern DownloadManager *TheDownloadManager;
-
-#endif // __DOWNLOADMANAGER_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h b/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h
deleted file mode 100644
index 4d7379f15aa..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: FileTransfer.h
-// Author: Matthew D. Campbell, December 2002
-// Description: File Transfer wrapper using TheNetwork
-///////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-#ifndef __FILE_TRANSFER_H__
-#define __FILE_TRANSFER_H__
-
-class GameInfo;
-
-// Convenience functions
-AsciiString GetBasePathFromPath( AsciiString path );
-AsciiString GetFileFromPath( AsciiString path );
-AsciiString GetExtensionFromFile( AsciiString fname );
-AsciiString GetBaseFileFromFile( AsciiString fname );
-AsciiString GetPreviewFromMap( AsciiString path );
-AsciiString GetINIFromMap( AsciiString path );
-AsciiString GetStrFileFromMap( AsciiString path );
-AsciiString GetSoloINIFromMap( AsciiString path );
-AsciiString GetAssetUsageFromMap( AsciiString path );
-AsciiString GetReadmeFromMap( AsciiString path );
-
-// The meat of file (map) transfers
-Bool DoAnyMapTransfers(GameInfo *game);
-
-#endif // __FILE_TRANSFER_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h b/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h
deleted file mode 100644
index dba7b988480..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /RedAlert2/NAT.CPP                                          $*
- *                                                                                             *
- *                      $Author:: Steve_t                                                     $*
- *                                                                                             *
- *                     $Modtime:: 3/15/01 12:00PM                                             $*
- *                                                                                             *
- *                    $Revision:: 1                                                           $*
- *                                                                                             *
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- *                                                                                             *
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- *                                                                                             *
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#pragma once
-
-#ifndef __FIREWALLHELPER_H
-#define __FIREWALLHELPER_H
-
-class UDP;
-
-#define NUM_TEST_PORTS 4
-#define MAX_SPARE_SOCKETS 8
-
-/*
-**
-**   Class to help in dealing with firewalls.
-**
-**
-**
-*/
-
-struct SpareSocketStruct {
-	UDP *udp;
-	UnsignedShort port;
-};
-
-enum FirewallDetectionState CPP_11(: Int) {
-	DETECTIONSTATE_IDLE,
-	DETECTIONSTATE_BEGIN,
-	DETECTIONSTATE_TEST1,
-	DETECTIONSTATE_TEST2,
-	DETECTIONSTATE_TEST3,
-	DETECTIONSTATE_TEST3_WAITFORRESPONSES,
-	DETECTIONSTATE_TEST4_1,
-	DETECTIONSTATE_TEST4_2,
-	DETECTIONSTATE_TEST5,
-	DETECTIONSTATE_DONE
-};
-
-#pragma pack(push, 1)
-
-// size = 16 bytes
-struct ManglerData {
-		unsigned int		CRC;
-		unsigned short	magic;
-		unsigned short	PacketID;
-		unsigned short	MyMangledPortNumber;
-		unsigned short	OriginalPortNumber;
-		unsigned char		MyMangledAddress[4];
-		unsigned char		NetCommandType;
-		unsigned char		BlitzMe;
-		unsigned short	Padding;
-};
-
-// size = TransportMessageHeader + ManglerData + 10 bytes = 26 bytes
-struct ManglerMessage {
-        ManglerData							data;
-        int											length;
-        unsigned int						ip;
-        unsigned short					port;
-};
-
-#pragma pack(pop)
-
-static const Int MAX_NUM_MANGLERS = 4;
-static const UnsignedShort MANGLER_PORT = 4321;
-
-class FirewallHelperClass {
-
-	public:
-
-		/*
-		** Enumeration of firewall behaviors we can detect.
-		**
-		** It is assumed that all port mangling firewalls change the mangled source port in response to
-		** an application source port change.
-		*/
-		typedef enum tFirewallBehaviorType {
-
-			FIREWALL_MIN = 0,
-
-			/*
-			** Just used as an initialiser.
-			*/
-			FIREWALL_TYPE_UNKNOWN = 0,
-
-			/*
-			** This is a simple, non-port translating firewall, or there is no firewall at all.
-			*/
-			FIREWALL_TYPE_SIMPLE = 1,
-
-			/*
-			** This is a firewall/NAT with port mangling but it's pretty dumb - it uses the same mangled
-			** source port regardless of the destination address.
-			*/
-			FIREWALL_TYPE_DUMB_MANGLING = 2,
-
-			/*
-			** This is a smarter firewall/NAT with port mangling that uses different mangled source ports
-			** for different destination IPs.
-			*/
-			FIREWALL_TYPE_SMART_MANGLING = 4,
-
-			/*
-			** This is a firewall that exhibits the bug as seen in the Netgear firewalls. A previously good
-			** source port mapping will change in response to unsolicited traffic from a known IP.
-			*/
-			FIREWALL_TYPE_NETGEAR_BUG = 8,
-
-			/*
-			** This firewall has a simple absolute offset port allocation scheme.
-			*/
-			FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION = 16,
-
-			/*
-			** This firewall has a relative offset port allocation scheme. For these firewalls, we have to
-			** subtract the actual source port from the mangled source port to discover the allocation scheme.
-			** The mangled port number is based in part on the original source port number.
-			*/
-			FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION = 32,
-
-			/*
-			** This firewall mangles source ports differently depending on the destination port.
-			*/
-			FIREWALL_TYPE_DESTINATION_PORT_DELTA = 64,
-
-			FIREWALL_MAX = 128
-
-		} FirewallBehaviorType;
-
-
-
-		FirewallHelperClass(void);
-		virtual ~FirewallHelperClass(void);
-		Bool detectFirewall(void);
-		UnsignedShort getRawFirewallBehavior(void) {return((UnsignedShort)m_behavior);}
-		Short getSourcePortAllocationDelta(void);
-		Int getFirewallHardness(FirewallBehaviorType behavior);
-		Int getFirewallRetries(FirewallBehaviorType behavior);
-		void setSourcePortPoolStart(Int port) {m_sourcePortPool = port;};
-		Int getSourcePortPool(void) {return(m_sourcePortPool);};
-		void readFirewallBehavior(void);
-		void reset(void);
-		Bool behaviorDetectionUpdate(void);
-		
-		FirewallBehaviorType getFirewallBehavior(void);
-		void writeFirewallBehavior(void);
-
-		void flagNeedToRefresh(Bool flag);
-
-		static void getManglerName(Int manglerIndex, Char *nameBuf);
-		Bool sendToManglerFromPort(UnsignedInt address, UnsignedShort port, UnsignedShort packetID, Bool blitzme = FALSE);
-		UnsignedShort getManglerResponse(UnsignedShort packetID, Int time = 0);
-		Bool openSpareSocket(UnsignedShort port);
-		void closeSpareSocket(UnsignedShort port);
-		void closeAllSpareSockets();
-		UnsignedShort getNextTemporarySourcePort(Int skip);
-
-		Bool detectionBeginUpdate(void);
-		Bool detectionTest1Update(void);
-		Bool detectionTest2Update(void);
-		Bool detectionTest3Update(void);
-		Bool detectionTest3WaitForResponsesUpdate(void);
-		Bool detectionTest4Stage1Update(void);
-		Bool detectionTest4Stage2Update(void);
-		Bool detectionTest5Update(void);
-
-
-		/*
-		** Behavior query functions.
-		*/
-		inline Bool isNAT(void) {
-			if (m_behavior == FIREWALL_TYPE_UNKNOWN || (m_behavior & FIREWALL_TYPE_SIMPLE) != 0) {
-				return(FALSE);
-			}
-			return(TRUE);
-		};
-
-		inline Bool isNAT(FirewallBehaviorType behavior) {
-			if (behavior == FIREWALL_TYPE_UNKNOWN || (behavior & FIREWALL_TYPE_SIMPLE) != 0) {
-				return(FALSE);
-			}
-			return(TRUE);
-		};
-
-		inline Bool isNetgear(FirewallBehaviorType behavior) {
-			if ((behavior & FIREWALL_TYPE_NETGEAR_BUG) != 0) {
-				return(TRUE);
-			}
-			return(FALSE);
-		};
-
-		inline Bool isNetgear(void) {
-			if ((m_behavior & FIREWALL_TYPE_NETGEAR_BUG) != 0) {
-				return(TRUE);
-			}
-			return(FALSE);
-		};
-
-
-
-	private:
-
-		Int getNATPortAllocationScheme(Int numPorts, UnsignedShort *originalPorts, UnsignedShort *mangledPorts, Bool &relativeDelta, Bool &looksGood);
-		void detectFirewallBehavior(/*Bool &canRecord*/);
-		Bool getReferencePort(void);
-
-		SpareSocketStruct * findSpareSocketByPort(UnsignedShort port);
-		ManglerMessage * findEmptyMessage();
-
-		void byteAdjust(ManglerData *data);
-
-		/*
-		** How does our firewall behave?
-		*/
-		FirewallBehaviorType m_behavior;
-
-		/*
-		** How did the firewall behave the last time we ran the game.
-		*/
-		FirewallBehaviorType m_lastBehavior;
-
-		/*
-		** What is the delta in our firewalls NAT port allocation scheme.
-		*/
-		Int m_sourcePortAllocationDelta;
-
-		/*
-		** What was the delta the last time we ran?
-		*/
-		Int m_lastSourcePortAllocationDelta;
-
-		/*
-		** Source ports used only to discover port allocation patterns.
-		** Needs to be static so that previous communications with the manglers
-		** don't affect the current one.
-		*/
-		static Int m_sourcePortPool;
-
-		/*
-		** Spare sockets used for detecting mangling and such.
-		*/
-		SpareSocketStruct m_spareSockets[MAX_SPARE_SOCKETS];
-
-		UnsignedInt m_manglers[MAX_NUM_MANGLERS];
-		Int m_numManglers;
-
-		UnsignedShort m_sparePorts[MAX_SPARE_SOCKETS];
-		UnsignedShort m_mangledPorts[MAX_SPARE_SOCKETS];
-		UnsignedShort m_packetID;
-
-		ManglerMessage m_messages[MAX_SPARE_SOCKETS];
-
-		FirewallDetectionState m_currentState;
-		time_t m_timeoutStart;
-		time_t m_timeoutLength;
-
-		Int m_numResponses;
-		Int m_currentTry;
-};
-
-
-
-extern FirewallHelperClass *TheFirewallHelper;
-FirewallHelperClass * createFirewallHelper();
-
-
-#endif	// __FIREWALLHELPER_H
-
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h b/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h
deleted file mode 100644
index 7317032f634..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __FRAMEDATA_H
-#define __FRAMEDATA_H
-
-#include "Lib/BaseType.h"
-#include "GameNetwork/NetCommandList.h"
-
-enum FrameDataReturnType CPP_11(: Int) {
-	FRAMEDATA_NOTREADY,
-	FRAMEDATA_RESEND,
-	FRAMEDATA_READY
-};
-
-class FrameData {
-public:
-	FrameData();
-	~FrameData();
-
-	void init();
-	void reset();
-	void update();
-
-	UnsignedInt getFrame();
-	void setFrame(UnsignedInt frame);
-	FrameDataReturnType allCommandsReady(Bool debugSpewage);
-	NetCommandList * getCommandList();
-	void setFrameCommandCount(UnsignedInt totalCommandCount);
-	UnsignedInt getFrameCommandCount();
-	void addCommand(NetCommandMsg *msg);
-	UnsignedInt getCommandCount();
-	void zeroFrame();
-	void destroyGameMessages();
-
-protected:
-	UnsignedInt m_frame;
-	UnsignedInt m_frameCommandCount;
-	UnsignedInt m_commandCount;
-	NetCommandList *m_commandList;
-	UnsignedInt m_lastFailedCC;
-	UnsignedInt m_lastFailedFrameCC;
-};
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h b/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h
deleted file mode 100644
index a849fe638eb..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __FRAMEDATAMANAGER_H
-#define __FRAMEDATAMANAGER_H
-
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/FrameData.h"
-
-class FrameDataManager : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FrameDataManager, "FrameDataManager")		
-public:
-	FrameDataManager(Bool isLocal);
-	//virtual ~FrameDataManager();
-
-	void init();
-	void reset();
-	void update();
-
-	void addNetCommandMsg(NetCommandMsg *msg);
-	void setIsLocal(Bool isLocal);
-	FrameDataReturnType allCommandsReady(UnsignedInt frame, Bool debugSpewage);
-	NetCommandList * getFrameCommandList(UnsignedInt frame);
-	UnsignedInt getCommandCount(UnsignedInt frame);
-	void setFrameCommandCount(UnsignedInt frame, UnsignedInt commandCount);
-	UnsignedInt getFrameCommandCount(UnsignedInt frame);
-	void zeroFrames(UnsignedInt startingFrame, UnsignedInt numFrames);
-	void destroyGameMessages();
-	void resetFrame(UnsignedInt frame, Bool isAdvancing = TRUE);
-	void setQuitFrame(UnsignedInt frame);
-	UnsignedInt getQuitFrame();
-	Bool getIsQuitting();
-
-protected:
-	FrameData *m_frameData;
-	Bool m_isLocal;
-
-	Bool m_isQuitting;
-	UnsignedInt m_quitFrame;
-};
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h b/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h
deleted file mode 100644
index 9d0217ecfe8..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/** FrameMetrics.h */
-
-#pragma once
-
-#ifndef __FRAMEMETRICS_H
-#define __FRAMEMETRICS_H
-
-#include "Lib/BaseType.h"
-#include "GameNetwork/NetworkDefs.h"
-
-class FrameMetrics {
-public:
-	FrameMetrics();
-	virtual ~FrameMetrics();
-
-	void init();
-	void reset();
-
-	void doPerFrameMetrics(UnsignedInt frame);
-	void processLatencyResponse(UnsignedInt frame);
-	void addCushion(Int cushion);
-
-	Real getAverageLatency();
-	Int getAverageFPS();
-	Int getMinimumCushion();
-
-protected:
-	// These are used for keeping track of parameters to the run ahead equation.
-	// frames per second history variables.
-	Real *m_fpsList;								///< A record of how many game logic frames per second there were for the last 60 seconds.
-	time_t m_lastFpsTimeThing;																///< The time when the last fps entry started being recorded.
-	Int m_fpsListIndex;																				///< Index into the array of the current fps list entry being measured.
-	Real m_averageFps;																				///< The current average logic fps, computed just like m_averageLatency below but with the fps numbers.
-
-	// round trip time to packet router variables.
-	// The lists are indexed off the frame number of the frame info packet they are associated with.
-	// The index used should be the frame number mod the array length.
-	Real *m_latencyList;				///< A record of the round trip latencies of the frame info packets to the packet router.  Values in seconds.
-	time_t *m_pendingLatencies;																///< The latencies of frame info packets that are "in the air."
-	Real m_averageLatency;																		///< The current average latency, this is used to save calculation time.
-																														///< When a new latency value is received, the old one is subtracted out and the new
-																														///< one is added in.
-
-	// packet arrival cushion variables.
-	// Keeps track of the cushion for the incoming commands.
-	UnsignedInt m_cushionIndex;															///< The next index to use for the cushion list.
-	Int m_minimumCushion;																			///< The average cushion for the history.
-};
-
-#endif // __FRAMEMETRICS_H
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h b/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h
index ae4263a9faa..fc3b8059a41 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef __GUIUTIL_H__
-#define __GUIUTIL_H__
-
 class GameWindow;
 class GameInfo;
 
@@ -37,20 +34,19 @@ void ShowUnderlyingGUIElements( Bool show, const char *layoutFilename, const cha
 															 const char **gadgetsToHide, const char **perPlayerGadgetsToHide );
 
 void PopulateColorComboBox(Int comboBox, GameWindow *comboArray[], GameInfo *myGame, Bool isObserver = FALSE);
-void PopulatePlayerTemplateComboBox(Int comboBox, GameWindow *comboArray[], GameInfo *myGame, Bool allowObservers);
+void PopulatePlayerTemplateComboBox(Int comboBox, GameWindow *comboArray[], GameInfo *myGame, Bool allowObservers );
 void PopulateTeamComboBox(Int comboBox, GameWindow *comboArray[], GameInfo *myGame, Bool isObserver = FALSE);
+void PopulateStartingCashComboBox(GameWindow *comboBox, GameInfo *myGame);
 
 void EnableSlotListUpdates( Bool val );
 Bool AreSlotListUpdatesEnabled( void );
 
 void UpdateSlotList( GameInfo *myGame, GameWindow *comboPlayer[],
 										GameWindow *comboColor[], GameWindow *comboPlayerTemplate[],
-										GameWindow *comboTeam[], GameWindow *buttonAccept[], 
+										GameWindow *comboTeam[], GameWindow *buttonAccept[],
 										GameWindow *buttonStart, GameWindow *buttonMapStartPosition[] );
 
 void EnableAcceptControls(Bool Enabled, GameInfo *myGame, GameWindow *comboPlayer[],
 										GameWindow *comboColor[], GameWindow *comboPlayerTemplate[],
 										GameWindow *comboTeam[], GameWindow *buttonAccept[], GameWindow *buttonStart,
 										GameWindow *buttonMapStartPosition[], Int slotNum = -1);
-
-#endif // __GUIUTIL_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h b/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h
deleted file mode 100644
index 1d453186b2b..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GameInfo.h //////////////////////////////////////////////////////
-// Generals game setup information
-// Author: Matthew D. Campbell, December 2001
-
-#pragma once
-
-#ifndef __GAMEINFO_H__
-#define __GAMEINFO_H__
-
-#include "Common/Snapshot.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/FirewallHelper.h"
-
-enum SlotState CPP_11(: Int)
-{
-	SLOT_OPEN,
-	SLOT_CLOSED,
-	SLOT_EASY_AI,
-	SLOT_MED_AI,
-	SLOT_BRUTAL_AI,
-	SLOT_PLAYER
-};
-
-enum
-{
-	PLAYERTEMPLATE_RANDOM = -1,
-	PLAYERTEMPLATE_OBSERVER = -2,
-	PLAYERTEMPLATE_MIN = PLAYERTEMPLATE_OBSERVER
-};
-
-/**
-  * GameSlot class - maintains information about the contents of a
-	* game slot.  This persists throughout the game.
-	*/
-class GameSlot
-{
-public:
-	GameSlot();
-	virtual void reset();
-
-	void setAccept( void ) { m_isAccepted = true; }		///< Accept the current options
-	void unAccept( void );														///< Unaccept (options changed, etc)
-	Bool isAccepted( void ) const { return m_isAccepted; }	///< Non-human slots are always accepted
-
-	void setMapAvailability( Bool hasMap );						///< Set whether the slot has the map
-	Bool hasMap( void ) const { return m_hasMap; }		///< Non-human slots always have the map
-
-	void setState( SlotState state,
-		UnicodeString name = UnicodeString::TheEmptyString,
-		UnsignedInt IP = 0);														///< Set the slot's state (human, AI, open, etc)
-	SlotState getState( void ) const { return m_state; }		///< Get the slot state
-
-	void setColor( Int color ) { m_color = color; }
-	Int getColor( void ) const { return m_color; }
-
-	void setStartPos( Int startPos ) { m_startPos = startPos; }
-	Int getStartPos( void ) const { return m_startPos; }
-
-	void setPlayerTemplate( Int playerTemplate ) 
-	{ m_playerTemplate = playerTemplate;
-		if (playerTemplate <= PLAYERTEMPLATE_MIN)
-			m_startPos = -1;
-	 }
-	Int getPlayerTemplate( void ) const { return m_playerTemplate; }
-
-	void setTeamNumber( Int teamNumber ) { m_teamNumber = teamNumber; }
-	Int getTeamNumber( void ) const { return m_teamNumber; }
-
-	inline void setName( UnicodeString name ) { m_name = name; }
-	inline UnicodeString getName( void ) const { return m_name; }
-
-	inline void setIP( UnsignedInt IP ) { m_IP = IP; }
-	inline UnsignedInt getIP( void ) const { return m_IP; }
-
-	inline void setPort( UnsignedShort port ) { m_port = port; }
-	inline UnsignedShort getPort( void ) const { return m_port; }
-
-	inline void setNATBehavior( FirewallHelperClass::FirewallBehaviorType NATBehavior) { m_NATBehavior = NATBehavior; }
-	inline FirewallHelperClass::FirewallBehaviorType getNATBehavior() const { return m_NATBehavior; }
-	
-	void saveOffOriginalInfo( void );
-	inline Int getOriginalPlayerTemplate( void ) const	{ return m_origPlayerTemplate; }
-	inline Int getOriginalColor( void ) const						{ return m_origColor; }
-	inline Int getOriginalStartPos( void ) const				{ return m_origStartPos; }
-	Int getApparentPlayerTemplate( void ) const;
-	Int getApparentColor( void ) const;
-	Int getApparentStartPos( void ) const;
-	UnicodeString getApparentPlayerTemplateDisplayName( void ) const;
-
-	// Various tests
-	Bool isHuman( void ) const;															///< Is this slot occupied by a human player?
-	Bool isOccupied( void ) const;													///< Is this slot occupied (by a human or an AI)?
-	Bool isAI( void ) const;																///< Is this slot occupied by an AI?
-	Bool isPlayer( AsciiString userName ) const;						///< Does this slot contain the given user?
-	Bool isPlayer( UnicodeString userName ) const;					///< Does this slot contain the given user?
-	Bool isPlayer( UnsignedInt ip ) const;									///< Is this slot at this IP?
-	Bool isOpen( void ) const;
-
-	void setLastFrameInGame( UnsignedInt frame ) { m_lastFrameInGame = frame; }
-	void markAsDisconnected( void ) { m_disconnected = TRUE; }
-	UnsignedInt lastFrameInGame( void ) const { return m_lastFrameInGame; }
-	Bool disconnected( void ) const { return isHuman() && m_disconnected; }
-
-	void mute( Bool isMuted ) { m_isMuted = isMuted; }
-	Bool isMuted( void ) const { return m_isMuted; }
-protected:
-	SlotState m_state;
-	Bool m_isAccepted;
-	Bool m_hasMap;
-	Bool m_isMuted;
-	Int m_color;																			///< color, or -1 for random
-	Int m_startPos;																		///< start position, or -1 for random
-	Int m_playerTemplate;															///< PlayerTemplate
-	Int m_teamNumber;																	///< alliance, -1 for none
-	Int m_origColor;																			///< color, or -1 for random
-	Int m_origStartPos;																		///< start position, or -1 for random
-	Int m_origPlayerTemplate;															///< PlayerTemplate
-	UnicodeString m_name;															///< Only valid for human players
-	UnsignedInt m_IP;																	///< Only valid for human players in LAN/WOL
-	UnsignedShort m_port;															///< Only valid for human players in LAN/WOL
-	FirewallHelperClass::FirewallBehaviorType m_NATBehavior;	///< The NAT behavior for this slot's player.
-	UnsignedInt m_lastFrameInGame;	// only valid for human players
-	Bool m_disconnected;						// only valid for human players
-};
-
-/**
-  * GameInfo class - maintains information about the game setup and
-	* the contents of its slot list hroughout the game.
-	*/
-class GameInfo
-{
-public:
-	GameInfo();
-	
-	void init( void );
-	virtual void reset( void );
-
-	void clearSlotList( void );
-
-	Int getNumPlayers( void ) const;									///< How many players (human and AI) are in the game?
-	Int getNumNonObserverPlayers( void ) const;				///< How many non-observer players (human and AI) are in the game?
-	Int getMaxPlayers( void ) const;									///< How many players (human and AI) can be in the game?
-
-	void enterGame( void );														///< Mark us as having entered the game
-	void leaveGame( void );														///< Mark us as having left the game
-	virtual void startGame( Int gameID );											///< Mark our game as started, and record the game ID
-	void endGame( void );															///< Mark us as out of game
-	inline Int getGameID( void ) const;								///< Get the game ID of the current game or the last one if we're not in game
-
-	inline void setInGame( void );										///< set the m_inGame flag
-	inline Bool isInGame( void ) const;											///< Are we (in game or in game setup)?  As opposed to chatting, matching, etc
-	inline Bool isGameInProgress( void ) const;							///< Is the game in progress?
-	inline void setGameInProgress( Bool inProgress ); ///< Set whether the game is in progress or not.
-	void setSlot( Int slotNum, GameSlot slotInfo );		///< Set the slot state (human, open, AI, etc)
-	GameSlot* getSlot( Int slotNum );									///< Get the slot
-	const GameSlot* getConstSlot( Int slotNum ) const;	///< Get the slot
-	virtual Bool amIHost( void ) const;															///< Convenience function - is the local player the game host?
-	virtual Int getLocalSlotNum( void ) const;				///< Get the local slot number, or -1 if we're not present
-	Int getSlotNum( AsciiString userName ) const;			///< Get the slot number corresponding to a specific user, or -1 if he's not present
-
-	// Game options
-	void setMap( AsciiString mapName );								///< Set the map to play on
-	void setMapCRC( UnsignedInt mapCRC );							///< Set the map CRC
-	void setMapSize( UnsignedInt mapSize );						///< Set the map size
-	void setMapContentsMask( Int mask );							///< Set the map contents mask (1=map,2=preview,4=map.ini)
-	inline AsciiString getMap( void ) const;								///< Get the game map
-	inline UnsignedInt getMapCRC( void ) const;							///< Get the map CRC
-	inline UnsignedInt getMapSize( void ) const;						///< Get the map size
-	inline Int getMapContentsMask( void ) const;						///< Get the map contents mask
-	void setSeed( Int seed );													///< Set the random seed for the game
-	inline Int getSeed( void ) const;												///< Get the game seed
-
-	void setSlotPointer( Int index, GameSlot *slot );	///< Set the slot info pointer
-
-	void setLocalIP( UnsignedInt ip ) { m_localIP =ip; }	///< Set the local IP
-	UnsignedInt getLocalIP( void ) const { return m_localIP; }	///< Get the local IP
-
-	Bool isColorTaken(Int colorIdx, Int slotToIgnore = -1 ) const;
-	Bool isStartPositionTaken(Int positionIdx, Int slotToIgnore = -1 ) const;
-
-	virtual void resetAccepted(void);															///< Reset the accepted flag on all players
-	virtual void resetStartSpots(void);						///< reset the start spots for the new map.
-	virtual void adjustSlotsForMap(void);					///< adjusts the slots to open and closed depending on the players in the game and the number of players the map can hold.
-
-	virtual void closeOpenSlots(void);						///< close all slots that are currently unoccupied.
-
-	// CRC checking hack
-	void setCRCInterval( Int val ) { m_crcInterval = (val<100)?val:100; }
-	inline Int getCRCInterval( void ) const { return m_crcInterval; }
-	
-	Bool haveWeSurrendered(void) { return m_surrendered; }
-	void markAsSurrendered(void) { m_surrendered = TRUE; }
-
-	Bool isSkirmish(void); // TRUE if 1 human & 1+ AI are present && !isSandbox()
-	Bool isMultiPlayer(void); // TRUE if 2+ human are present
-	Bool isSandbox(void); // TRUE if everybody is on the same team
-	
-	Bool isPlayerPreorder(Int index);
-	void markPlayerAsPreorder(Int index);
-
-protected:
-	Int m_preorderMask;
-	Int m_crcInterval;
-	Bool m_inGame;
-	Bool m_inProgress;
-	Bool m_surrendered;
-	Int m_gameID;
-	GameSlot *m_slot[MAX_SLOTS];
-
-	UnsignedInt m_localIP;
-
-	// Game options
-	AsciiString m_mapName;
-	UnsignedInt m_mapCRC;
-	UnsignedInt m_mapSize;
-	Int m_mapMask;
-	Int m_seed;
-};
-
-extern GameInfo *TheGameInfo;
-
-// Inline functions
-Int					GameInfo::getGameID( void ) const								{ return m_gameID; }
-AsciiString	GameInfo::getMap( void ) const									{ return m_mapName; }
-UnsignedInt	GameInfo::getMapCRC( void ) const								{ return m_mapCRC; }
-UnsignedInt	GameInfo::getMapSize( void ) const							{ return m_mapSize; }
-Int					GameInfo::getMapContentsMask( void ) const			{ return m_mapMask; }
-Int					GameInfo::getSeed( void ) const									{ return m_seed; }
-Bool				GameInfo::isInGame( void ) const								{ return m_inGame; }
-void				GameInfo::setInGame( void )											{ m_inGame = true; }
-Bool				GameInfo::isGameInProgress( void ) const				{ return m_inProgress; }
-void				GameInfo::setGameInProgress( Bool inProgress )	{ m_inProgress = inProgress; }
-
-AsciiString GameInfoToAsciiString( const GameInfo *game );
-Bool ParseAsciiStringToGameInfo( GameInfo *game, AsciiString options );
-
-
-/**
-  * The SkirmishGameInfo class holds information about the skirmish game and
-	* the contents of its slot list.
-	*/
-
-class SkirmishGameInfo : public GameInfo, public Snapshot
-{
-private:
-	GameSlot m_skirmishSlot[MAX_SLOTS];
-
-protected:
-	// snapshot methods
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-public:
-	SkirmishGameInfo()
-	{
-		for (Int i = 0; i< MAX_SLOTS; ++i)
-			setSlotPointer(i, &m_skirmishSlot[i]);
-	}
-};
-
-extern SkirmishGameInfo *TheSkirmishGameInfo;
-
-#endif // __GAMEINFO_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameMessageParser.h b/Generals/Code/GameEngine/Include/GameNetwork/GameMessageParser.h
deleted file mode 100644
index 3679b67ac6a..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameMessageParser.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#include "Common/MessageStream.h"
-#include "Common/GameMemory.h"
-
-//----------------------------------------------------------------------------
-class GameMessageParserArgumentType : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessageParserArgumentType, "GameMessageParserArgumentType")		
-public:
-	GameMessageParserArgumentType(GameMessageArgumentDataType type, Int argCount);
-	//virtual ~GameMessageParserArgumentType();
-
-	GameMessageParserArgumentType *getNext();
-	void setNext(GameMessageParserArgumentType *next);
-	Int getArgCount();
-	GameMessageArgumentDataType getType();
-
-protected:
-	GameMessageParserArgumentType*	m_next;
-	GameMessageArgumentDataType			m_type;
-	Int															m_argCount;
-};
-
-//----------------------------------------------------------------------------
-inline GameMessageParserArgumentType * GameMessageParserArgumentType::getNext() 
-{
-	return m_next;
-}
-
-//----------------------------------------------------------------------------
-inline void GameMessageParserArgumentType::setNext(GameMessageParserArgumentType *next) 
-{
-	m_next = next;
-}
-
-//----------------------------------------------------------------------------
-inline GameMessageArgumentDataType GameMessageParserArgumentType::getType() 
-{
-	return m_type;
-}
-
-//----------------------------------------------------------------------------
-inline Int GameMessageParserArgumentType::getArgCount() 
-{
-	return m_argCount;
-}
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-class GameMessageParser : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessageParser, "GameMessageParser")		
-public:
-	GameMessageParser();
-	GameMessageParser(GameMessage *msg);
-	//virtual ~GameMessageParser();
-
-	GameMessageParserArgumentType *getFirstArgumentType();
-	void addArgType(GameMessageArgumentDataType type, Int argCount);
-	Int getNumTypes();
-
-protected:
-	GameMessageParserArgumentType *m_first, *m_last;
-	Int m_argTypeCount;
-};
-
-//----------------------------------------------------------------------------
-inline GameMessageParserArgumentType * GameMessageParser::getFirstArgumentType() 
-{
-	return m_first;
-}
-
-//----------------------------------------------------------------------------
-inline Int GameMessageParser::getNumTypes() 
-{
-	return m_argTypeCount;
-}
-
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h
index 3379625ec54..0f80d91bf25 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __GameSpy_H__
-#define __GameSpy_H__
-
 #include "gamespy/peer/peer.h"
 
 #include "GameClient/Color.h"
@@ -143,6 +140,3 @@ enum GameSpyColors CPP_11(: Int) {
 };
 
 extern const Color GameSpyColor[GSCOLOR_MAX];
-
-
-#endif // __GameSpy_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h
deleted file mode 100644
index 6a2cac82b7e..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: BuddyDefs.h //////////////////////////////////////////////////////
-// Generals GameSpy Buddy (GP) definitions
-// Author: Matthew D. Campbell, July 2002
-
-#pragma once
-
-#ifndef __BUDDYDEFS_H__
-#define __BUDDYDEFS_H__
-
-void HandleBuddyResponses(void);
-void PopulateOldBuddyMessages(void);
-
-#endif // __BUDDYDEFS_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h
deleted file mode 100644
index fd71e6d3c15..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: BuddyThread.h //////////////////////////////////////////////////////
-// Generals GameSpy BuddyList thread class interface
-// Author: Matthew D. Campbell, June 2002
-
-#pragma once
-
-#ifndef __BUDDYTHREAD_H__
-#define __BUDDYTHREAD_H__
-
-#include "gamespy/gp/gp.h"
-
-#define MAX_BUDDY_CHAT_LEN 128
-
-// this class encapsulates a request for the buddy thread
-class BuddyRequest
-{
-public:
-	enum
-	{
-		BUDDYREQUEST_LOGIN,				// attempt to login
-		BUDDYREQUEST_RELOGIN,			// log in after being disconnected
-		BUDDYREQUEST_LOGOUT,			// log out if connected
-		BUDDYREQUEST_MESSAGE,
-		BUDDYREQUEST_LOGINNEW,		// attempt to create a new nick and login
-		//BUDDYREQUEST_DELETELOGIN,
-		BUDDYREQUEST_ADDBUDDY,		// add someone to your buddy list
-		BUDDYREQUEST_DELBUDDY,		// delete someone from your buddy list
-		BUDDYREQUEST_OKADD,				// allow someone to add you to their buddy list
-		BUDDYREQUEST_DENYADD,			// don't allow someone to add you to their buddy list
-		BUDDYREQUEST_SETSTATUS,		// Set our status
-		BUDDYREQUEST_DELETEACCT,	// Delete our account
-		BUDDYREQUEST_MAX
-	} buddyRequestType;
-
-	union
-	{
-		struct
-		{
-			GPProfile recipient;
-			WideChar text[MAX_BUDDY_CHAT_LEN];
-		} message;
-
-		struct
-		{
-			char nick[GP_NICK_LEN];
-			char email[GP_EMAIL_LEN];
-			char password[GP_PASSWORD_LEN];
-			Bool hasFirewall;
-		} login;
-
-		struct
-		{
-			GPProfile id;
-			WideChar text[MAX_BUDDY_CHAT_LEN];
-		} addbuddy;
-
-		struct
-		{
-			GPProfile id;
-		} profile;
-
-		struct
-		{
-			GPEnum status;
-			char statusString[GP_STATUS_STRING_LEN];
-			char locationString[GP_LOCATION_STRING_LEN];
-		} status;
-
-	} arg;
-};
-
-//-------------------------------------------------------------------------
-
-// this class encapsulates an action the buddy thread wants from the UI
-class BuddyResponse
-{
-public:
-	enum
-	{
-		BUDDYRESPONSE_LOGIN,
-		BUDDYRESPONSE_DISCONNECT,
-		BUDDYRESPONSE_MESSAGE,
-		BUDDYRESPONSE_REQUEST,
-		BUDDYRESPONSE_STATUS,
-		BUDDYRESPONSE_MAX
-	} buddyResponseType;
-
-	GPProfile profile;
-	GPResult result;
-
-	union
-	{
-		struct
-		{
-			UnsignedInt date;
-			char nick[GP_NICK_LEN];
-			WideChar text[MAX_BUDDY_CHAT_LEN];
-		} message;
-
-		struct
-		{
-			char nick[GP_NICK_LEN];
-			char email[GP_EMAIL_LEN];
-			char countrycode[GP_COUNTRYCODE_LEN];
-			WideChar text[GP_REASON_LEN];
-		} request;
-
-		struct
-		{
-			//GPResult result;
-			GPErrorCode errorCode;
-			char errorString[MAX_BUDDY_CHAT_LEN];
-			GPEnum fatal;
-		} error;
-
-		struct
-		{
-			char nick[GP_NICK_LEN];
-			char email[GP_EMAIL_LEN];
-			char countrycode[GP_COUNTRYCODE_LEN];
-			char location[GP_LOCATION_STRING_LEN];
-			GPEnum status;
-			char statusString[GP_STATUS_STRING_LEN];
-		} status;
-	} arg;
-};
-
-//-------------------------------------------------------------------------
-
-// this is the actual message queue used to pass messages between threads
-class GameSpyBuddyMessageQueueInterface
-{
-public:
-	virtual ~GameSpyBuddyMessageQueueInterface() {}
-	virtual void startThread( void ) = 0;
-	virtual void endThread( void ) = 0;
-	virtual Bool isThreadRunning( void ) = 0;
-	virtual Bool isConnected( void ) = 0;
-	virtual Bool isConnecting( void ) = 0;
-
-	virtual void addRequest( const BuddyRequest& req ) = 0;
-	virtual Bool getRequest( BuddyRequest& req ) = 0;
-
-	virtual void addResponse( const BuddyResponse& resp ) = 0;
-	virtual Bool getResponse( BuddyResponse& resp ) = 0;
-
-	virtual GPProfile getLocalProfileID( void ) = 0;
-
-	static GameSpyBuddyMessageQueueInterface* createNewMessageQueue( void );
-};
-
-extern GameSpyBuddyMessageQueueInterface *TheGameSpyBuddyMessageQueue;
-
-
-#endif // __BUDDYTHREAD_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h
deleted file mode 100644
index 561c2f232a5..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GSConfig.h ///////////////////////////////////////////////////////////
-// Author: Matthew D. Campbell, Sept 2002
-// Description: GameSpy online config
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __GSCONFIG_H__
-#define __GSCONFIG_H__
-
-#include "Common/AsciiString.h"
-#include "Common/STLTypedefs.h"
-
-class GameSpyConfigInterface
-{
-public:
-	virtual ~GameSpyConfigInterface() {}
-
-	// Pings
-	virtual std::list<AsciiString> getPingServers(void) = 0;
-	virtual Int getNumPingRepetitions(void) = 0;
-	virtual Int getPingTimeoutInMs(void) = 0;
-	virtual Int getPingCutoffGood( void ) = 0;
-	virtual Int getPingCutoffBad( void ) = 0;
-
-	// QM
-	virtual std::list<AsciiString> getQMMaps(void) = 0;
-	virtual Int getQMBotID(void) = 0;
-	virtual Int getQMChannel(void) = 0;
-	virtual void setQMChannel(Int channel) = 0;
-
-	// Player Info
-	virtual Int getPointsForRank(Int rank) = 0;
-	virtual Bool isPlayerVIP(Int id) = 0;
-
-	// mangler Info
-	virtual Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port) = 0;
-
-	// Ladder / Any other external parsing
-	virtual AsciiString getLeftoverConfig(void) = 0;
-
-	// NAT Timeouts
-	virtual Int getTimeBetweenRetries() = 0;
-	virtual Int getMaxManglerRetries() = 0;
-	virtual time_t getRetryInterval() = 0;
-	virtual time_t getKeepaliveInterval() = 0;
-	virtual time_t getPortTimeout() = 0;
-	virtual time_t getRoundTimeout() = 0;
-
-	// Custom match
-	virtual Bool restrictGamesToLobby() = 0;
-
-	static GameSpyConfigInterface* create(AsciiString config);
-};
-
-extern GameSpyConfigInterface *TheGameSpyConfig;
-
-#endif // __GSCONFIG_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h
deleted file mode 100644
index 4cb190ca0f3..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GameResultsThread.h //////////////////////////////////////////////////////
-// Generals game results thread class interface
-// Author: Matthew D. Campbell, August 2002
-
-#pragma once
-
-#ifndef __GAMERESULTSTHREAD_H__
-#define __GAMERESULTSTHREAD_H__
-
-#include "Common/SubsystemInterface.h"
-
-// this class encapsulates a request for the thread
-class GameResultsRequest
-{
-public:
-	std::string hostname;
-	UnsignedShort port;
-	std::string results;
-};
-
-//-------------------------------------------------------------------------
-
-// this class encapsulates a response from the thread
-class GameResultsResponse
-{
-public:
-	std::string hostname;
-	UnsignedShort port;
-	Bool sentOk;
-};
-
-//-------------------------------------------------------------------------
-
-// this is the actual message queue used to pass messages between threads
-class GameResultsInterface : public SubsystemInterface
-{
-public:
-	virtual ~GameResultsInterface() {}
-	virtual void startThreads( void ) = 0;
-	virtual void endThreads( void ) = 0;
-	virtual Bool areThreadsRunning( void ) = 0;
-
-	virtual void addRequest( const GameResultsRequest& req ) = 0;
-	virtual Bool getRequest( GameResultsRequest& resp ) = 0;
-
-	virtual void addResponse( const GameResultsResponse& resp ) = 0;
-	virtual Bool getResponse( GameResultsResponse& resp ) = 0;
-
-	static GameResultsInterface* createNewGameResultsInterface( void );
-
-	virtual Bool areGameResultsBeingSent( void ) = 0;
-};
-
-extern GameResultsInterface *TheGameResultsQueue;
-
-
-#endif // __GAMERESULTSTHREAD_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h
deleted file mode 100644
index b7f1ba53834..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: LadderDefs.h //////////////////////////////////////////////////////
-// Generals ladder definitions
-// Author: Matthew D. Campbell, August 2002
-
-#pragma once
-
-#ifndef __LADDERDEFS_H__
-#define __LADDERDEFS_H__
-
-#include "Common/UnicodeString.h"
-#include "Common/AsciiString.h"
-#include "Common/STLTypedefs.h"
-
-class GameWindow;
-
-class LadderInfo
-{
-public:
-	LadderInfo();
-	UnicodeString name;
-	UnicodeString description;
-	UnicodeString location;
-	Int playersPerTeam;
-	Int minWins;
-	Int maxWins;
-	Bool randomMaps;
-	Bool randomFactions;
-	Bool validQM;
-	Bool validCustom;
-	std::list<AsciiString> validMaps;
-	std::list<AsciiString> validFactions;
-	AsciiString cryptedPassword;
-	AsciiString address;
-	UnsignedShort port;
-	AsciiString homepageURL;
-	Bool submitReplay; // with game results
-	Int index;
-};
-
-typedef std::list<LadderInfo *> LadderInfoList;
-
-class LadderList
-{
-public:
-	LadderList();
-	~LadderList();
-
-	const LadderInfo* findLadder( const AsciiString& addr, UnsignedShort port );
-	const LadderInfo* findLadderByIndex( Int index );	// doesn't look in local ladders
-	const LadderInfoList* getLocalLadders( void );
-	const LadderInfoList* getSpecialLadders( void );
-	const LadderInfoList* getStandardLadders( void );
-
-private:
-	void loadLocalLadders( void );
-	void checkLadder( AsciiString fname, Int index );
-	LadderInfoList m_localLadders;
-	LadderInfoList m_specialLadders;
-	LadderInfoList m_standardLadders;
-};
-
-extern LadderList *TheLadderList;
-
-#endif // __LADDERDEFS_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
deleted file mode 100644
index b5170166487..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: LobbyUtils.h //////////////////////////////////////////////////////
-// Generals lobby utils
-// Author: Matthew D. Campbell, Sept 2002
-
-#pragma once
-
-#ifndef __LOBBYUTILS_H__
-#define __LOBBYUTILS_H__
-
-class GameWindow;
-
-GameWindow *GetGameListBox( void );
-GameWindow *GetGameInfoListBox( void );
-NameKeyType GetGameListBoxID( void );
-NameKeyType GetGameInfoListBoxID( void );
-void GrabWindowInfo( void );
-void ReleaseWindowInfo( void );
-void RefreshGameInfoListBox( GameWindow *mainWin, GameWindow *win );
-void RefreshGameListBoxes( void );
-void ToggleGameListType( void );
-
-enum GameSortType CPP_11(: Int)
-{
-	GAMESORT_ALPHA_ASCENDING = 0,
-	GAMESORT_ALPHA_DESCENDING,
-	GAMESORT_PING_ASCENDING,
-	GAMESORT_PING_DESCENDING,
-	GAMESORT_MAX,
-};
-
-Bool HandleSortButton( NameKeyType sortButton );
-void PopulateLobbyPlayerListbox(void);
-
-#endif // __LOBBYUTILS_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h
deleted file mode 100644
index db8f31f05f6..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: MainMenuUtils.h //////////////////////////////////////////////////////
-// Author: Matthew D. Campbell, Sept 2002
-// Description: GameSpy version check, patch download, etc utils
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __MAINMENUUTILS_H__
-#define __MAINMENUUTILS_H__
-
-void HTTPThinkWrapper( void );
-void StopAsyncDNSCheck( void );
-void StartPatchCheck( void );
-void CancelPatchCheckCallback( void );
-void StartDownloadingPatches( void );
-void HandleCanceledDownload( Bool resetDropDown = TRUE );
-
-enum OverallStatsPeriod CPP_11(: Int)
-{
-	STATS_TODAY = 0,
-	STATS_YESTERDAY,
-	STATS_ALLTIME,
-	STATS_LASTWEEK,
-	STATS_MAX
-};
-
-struct OverallStats
-{
-	OverallStats();
-	Int wins[STATS_MAX];
-	Int losses[STATS_MAX];
-};
-
-void CheckOverallStats( void );
-void HandleOverallStats( const OverallStats& USA, const OverallStats& China, const OverallStats& GLA );
-
-void CheckNumPlayersOnline( void );
-void HandleNumPlayersOnline( Int numPlayersOnline );
-
-#endif // __MAINMENUUTILS_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
deleted file mode 100644
index 19cb03cddaf..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PeerDefs.h //////////////////////////////////////////////////////
-// Generals GameSpy Peer (chat) definitions
-// Author: Matthew D. Campbell, June 2002
-
-#pragma once
-
-#ifndef __PEERDEFS_H__
-#define __PEERDEFS_H__
-
-#include "gamespy/peer/peer.h"
-#include "gamespy/gp/gp.h"
-
-#include "GameClient/Color.h"
-#include "Common/STLTypedefs.h"
-#include "GameNetwork/GameSpy/StagingRoomGameInfo.h"
-
-class GameWindow;
-class PSPlayerStats;
-
-typedef std::set<AsciiString> IgnoreList;
-typedef std::map<Int, AsciiString> SavedIgnoreMap;
-
-enum RCItemType CPP_11(: Int)
-{
-	ITEM_BUDDY,
-	ITEM_REQUEST,
-	ITEM_NONBUDDY,
-	ITEM_NONE,
-};
-
-class GameSpyRCMenuData
-{
-public:
-	AsciiString m_nick;
-	GPProfile m_id;
-	RCItemType m_itemType;
-};
-
-class BuddyInfo
-{
-public:
-	GPProfile m_id;
-	AsciiString m_name;
-	AsciiString m_email;
-	AsciiString m_countryCode;
-	GPEnum m_status;
-	UnicodeString m_statusString;
-	UnicodeString m_locationString;
-};
-typedef std::map<GPProfile, BuddyInfo> BuddyInfoMap;
-
-class BuddyMessage
-{
-public:
-	UnsignedInt m_timestamp;
-	GPProfile m_senderID;
-	AsciiString m_senderNick;
-	GPProfile m_recipientID;
-	AsciiString m_recipientNick;
-	UnicodeString m_message;
-};
-typedef std::list<BuddyMessage> BuddyMessageList;
-
-class GameSpyGroupRoom
-{
-public:
-	GameSpyGroupRoom() { m_name = AsciiString::TheEmptyString; m_translatedName = UnicodeString::TheEmptyString; m_groupID = m_numWaiting = m_maxWaiting = m_numGames = m_numPlaying = 0; }
-	AsciiString m_name;
-	UnicodeString m_translatedName;
-	Int m_groupID;
-	Int m_numWaiting;
-	Int m_maxWaiting;
-	Int m_numGames;
-	Int m_numPlaying;
-};
-typedef std::map<Int, GameSpyGroupRoom> GroupRoomMap;
-
-class Transport;
-class NAT;
-
-typedef std::map<Int, GameSpyStagingRoom *> StagingRoomMap;
-
-class PlayerInfo
-{
-public:
-	PlayerInfo() { m_name = m_locale = AsciiString::TheEmptyString; m_wins = m_losses = m_rankPoints = m_side = m_preorder = m_profileID = m_flags = 0; }
-	AsciiString m_name;
-	AsciiString m_locale;
-	Int m_wins;
-	Int m_losses;
-	Int m_profileID;
-	Int m_flags;
-	Int m_rankPoints;
-	Int m_side;
-	Int m_preorder;
-	Bool isIgnored( void );
-};
-struct AsciiComparator
-{
-	bool operator()(AsciiString s1, AsciiString s2) const;
-};
-
-
-typedef std::map<AsciiString, PlayerInfo, AsciiComparator> PlayerInfoMap;
-
-enum GameSpyColors CPP_11(: Int) {
-	GSCOLOR_DEFAULT = 0,
-	GSCOLOR_CURRENTROOM,
-	GSCOLOR_ROOM,
-	GSCOLOR_GAME,
-	GSCOLOR_GAME_FULL,
-	GSCOLOR_GAME_CRCMISMATCH,
-	GSCOLOR_PLAYER_NORMAL,
-	GSCOLOR_PLAYER_OWNER,
-	GSCOLOR_PLAYER_BUDDY,
-	GSCOLOR_PLAYER_SELF,
-	GSCOLOR_PLAYER_IGNORED,
-	GSCOLOR_CHAT_NORMAL,
-	GSCOLOR_CHAT_EMOTE,
-	GSCOLOR_CHAT_OWNER,
-	GSCOLOR_CHAT_OWNER_EMOTE,
-	GSCOLOR_CHAT_PRIVATE,
-	GSCOLOR_CHAT_PRIVATE_EMOTE,
-	GSCOLOR_CHAT_PRIVATE_OWNER,
-	GSCOLOR_CHAT_PRIVATE_OWNER_EMOTE,
-	GSCOLOR_CHAT_BUDDY,
-	GSCOLOR_CHAT_SELF,
-	GSCOLOR_ACCEPT_TRUE,
-	GSCOLOR_ACCEPT_FALSE,
-	GSCOLOR_MAP_SELECTED,
-	GSCOLOR_MAP_UNSELECTED,
-	GSCOLOR_MOTD,
-	GSCOLOR_MOTD_HEADING,
-	GSCOLOR_MAX
-};
-
-extern Color GameSpyColor[GSCOLOR_MAX];
-
-enum GameSpyBuddyStatus CPP_11(: Int) {
-	BUDDY_OFFLINE,
-	BUDDY_ONLINE,
-	BUDDY_LOBBY,
-	BUDDY_STAGING,
-	BUDDY_LOADING,
-	BUDDY_PLAYING,
-	BUDDY_MATCHING,
-	BUDDY_MAX
-};
-
-// ---------------------------------------------------
-// this class holds info used in the main thread
-class GameSpyInfoInterface
-{
-public:
-	virtual ~GameSpyInfoInterface() {};
-	virtual void reset( void ) {};
-	virtual void clearGroupRoomList( void ) = 0;
-	virtual GroupRoomMap* getGroupRoomList( void ) = 0;
-	virtual void addGroupRoom( GameSpyGroupRoom room ) = 0;
-	virtual Bool gotGroupRoomList( void ) = 0;
-	virtual void joinGroupRoom( Int groupID ) = 0;
-	virtual void leaveGroupRoom( void ) = 0;
-	virtual void joinBestGroupRoom( void ) = 0;
-	virtual void setCurrentGroupRoom( Int groupID ) = 0;
-	virtual Int  getCurrentGroupRoom( void ) = 0;
-	virtual void updatePlayerInfo( PlayerInfo pi, AsciiString oldNick = AsciiString::TheEmptyString ) = 0;
-	virtual void playerLeftGroupRoom( AsciiString nick ) = 0;
-	virtual PlayerInfoMap* getPlayerInfoMap( void ) = 0;
-
-	virtual BuddyInfoMap* getBuddyMap( void ) = 0;
-	virtual BuddyInfoMap* getBuddyRequestMap( void ) = 0;
-	virtual BuddyMessageList* getBuddyMessages( void ) = 0;
-	virtual Bool isBuddy( Int id ) = 0;
-
-	virtual void setLocalName( AsciiString name ) = 0;
-	virtual AsciiString getLocalName( void ) = 0;
-	virtual void setLocalProfileID( Int profileID ) = 0;
-	virtual Int getLocalProfileID( void ) = 0;
-	virtual AsciiString getLocalEmail( void ) = 0;
-	virtual void setLocalEmail( AsciiString email ) = 0;
-	virtual AsciiString getLocalPassword( void ) = 0;
-	virtual void setLocalPassword( AsciiString passwd ) = 0;
-	virtual void setLocalBaseName( AsciiString name ) = 0;
-	virtual AsciiString getLocalBaseName( void ) = 0;
-
-	virtual void setCachedLocalPlayerStats( PSPlayerStats stats ) = 0;
-	virtual PSPlayerStats getCachedLocalPlayerStats( void ) = 0;
-
-	virtual void clearStagingRoomList( void ) = 0;
-	virtual StagingRoomMap* getStagingRoomList( void ) = 0;
-	virtual GameSpyStagingRoom* findStagingRoomByID( Int id ) = 0;
-	virtual void addStagingRoom( GameSpyStagingRoom room ) = 0;
-	virtual void updateStagingRoom( GameSpyStagingRoom room ) = 0;
-	virtual void removeStagingRoom( GameSpyStagingRoom room ) = 0;
-	virtual Bool hasStagingRoomListChanged( void ) = 0;
-	virtual void leaveStagingRoom( void ) = 0;
-	virtual void markAsStagingRoomHost( void ) = 0;
-	virtual void markAsStagingRoomJoiner( Int game ) = 0;
-	virtual void sawFullGameList( void ) = 0;
-
-	virtual Bool amIHost( void ) = 0;
-	virtual GameSpyStagingRoom* getCurrentStagingRoom( void ) = 0;
-	virtual void setGameOptions( void ) = 0;
-	virtual Int getCurrentStagingRoomID( void ) = 0;
-
-	virtual void setDisallowAsianText( Bool val ) = 0;
-	virtual void setDisallowNonAsianText( Bool val ) = 0;
-	virtual Bool getDisallowAsianText( void ) = 0;
-	virtual Bool getDisallowNonAsianText(void ) = 0;
-
-	// chat
-	virtual void registerTextWindow( GameWindow *win ) = 0;
-	virtual void unregisterTextWindow( GameWindow *win ) = 0;
-	virtual Int addText( UnicodeString message, Color c, GameWindow *win ) = 0;
-	virtual void addChat( PlayerInfo p, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win ) = 0;
-	virtual void addChat( AsciiString nick, Int profileID, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win ) = 0;
-	virtual Bool sendChat( UnicodeString message, Bool isAction, GameWindow *playerListbox ) = 0;
-
-	virtual void setMOTD( const AsciiString& motd ) = 0;
-	virtual const AsciiString& getMOTD( void ) = 0;
-
-	virtual void setConfig( const AsciiString& config ) = 0;
-	virtual const AsciiString& getConfig( void ) = 0;
-
-	virtual void setPingString( const AsciiString& ping ) = 0;
-	virtual const AsciiString& getPingString( void ) = 0;
-	virtual Int getPingValue( const AsciiString& otherPing ) = 0;
-
-	static GameSpyInfoInterface* createNewGameSpyInfoInterface( void );
-	
-	virtual void addToSavedIgnoreList( Int profileID, AsciiString nick ) = 0;
-	virtual void removeFromSavedIgnoreList( Int profileID ) = 0;
-	virtual Bool isSavedIgnored( Int profileID ) = 0;		
-	virtual SavedIgnoreMap returnSavedIgnoreList( void ) = 0;
-	virtual void loadSavedIgnoreList( void ) = 0;
-	
-	virtual IgnoreList returnIgnoreList( void ) = 0;
-	virtual void addToIgnoreList( AsciiString nick ) = 0;
-	virtual void removeFromIgnoreList( AsciiString nick ) = 0;
-	virtual Bool isIgnored( AsciiString nick ) = 0;
-
-	virtual void setLocalIPs(UnsignedInt internalIP, UnsignedInt externalIP) = 0;
-	virtual UnsignedInt getInternalIP(void) = 0;
-	virtual UnsignedInt getExternalIP(void) = 0;
-
-	virtual Bool isDisconnectedAfterGameStart(Int *reason) const = 0;
-	virtual void markAsDisconnectedAfterGameStart(Int reason) = 0;
-
-	virtual Bool didPlayerPreorder( Int profileID ) const = 0;
-	virtual void markPlayerAsPreorder( Int profileID ) = 0;
-
-	virtual void setMaxMessagesPerUpdate( Int num ) = 0;
-	virtual Int getMaxMessagesPerUpdate( void ) = 0;
-
-	virtual Int getAdditionalDisconnects( void ) = 0;
-	virtual void clearAdditionalDisconnects( void ) = 0;
-	virtual void readAdditionalDisconnects( void ) = 0;
-	virtual void updateAdditionalGameSpyDisconnections(Int count) = 0;
-};
-
-extern GameSpyInfoInterface *TheGameSpyInfo;
-
-void WOLDisplayGameOptions( void );
-void WOLDisplaySlotList( void );
-Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverPort, UnsignedInt& localIP);
-void SetLobbyAttemptHostJoin(Bool start);
-void SendStatsToOtherPlayers(const GameInfo *game);
-
-class PSPlayerStats;
-void GetAdditionalDisconnectsFromUserFile(PSPlayerStats *stats);
-extern Int GetAdditionalDisconnectsFromUserFile(Int playerID);
-
-//-------------------------------------------------------------------------
-// These functions set up the globals and threads neccessary for our GameSpy impl.
-
-void SetUpGameSpy( const char *motdBuffer, const char *configBuffer );
-void TearDownGameSpy( void );
-
-#endif // __PEERDEFS_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h
deleted file mode 100644
index f086b48b93b..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PeerDefsImplementation.h //////////////////////////////////////////////////////
-// Generals GameSpy Peer (chat) implementation definitions
-// Author: Matthew D. Campbell, Sept 2002
-
-#pragma once
-
-#ifndef __PEERDEFSIMPLEMENTATION_H__
-#define __PEERDEFSIMPLEMENTATION_H__
-
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-
-
-class GameSpyInfo : public GameSpyInfoInterface
-{
-public:
-	GameSpyInfo();
-	virtual ~GameSpyInfo();
-	virtual void reset( void );
-	virtual void clearGroupRoomList( void ) { m_groupRooms.clear(); m_gotGroupRoomList = false; }
-	virtual GroupRoomMap* getGroupRoomList( void ) { return &m_groupRooms; }
-	virtual void addGroupRoom( GameSpyGroupRoom room );
-	virtual Bool gotGroupRoomList( void ) { return m_gotGroupRoomList; }
-	virtual void joinGroupRoom( Int groupID );
-	virtual void leaveGroupRoom( void );
-	virtual void joinBestGroupRoom( void );
-	virtual void setCurrentGroupRoom( Int groupID ) { m_currentGroupRoomID = groupID; m_playerInfoMap.clear(); }
-	virtual Int  getCurrentGroupRoom( void ) { return m_currentGroupRoomID; }
-	virtual void updatePlayerInfo( PlayerInfo pi, AsciiString oldNick = AsciiString::TheEmptyString );
-	virtual void playerLeftGroupRoom( AsciiString nick );
-	virtual PlayerInfoMap* getPlayerInfoMap( void ) { return &m_playerInfoMap; }
-
-	virtual void setLocalName( AsciiString name ) { m_localName = name; }
-	virtual AsciiString getLocalName( void ) { return m_localName; }
-	virtual void setLocalProfileID( Int profileID ) { m_localProfileID = profileID; }
-	virtual Int getLocalProfileID( void ) { return m_localProfileID; }
-	virtual AsciiString getLocalEmail( void ) { return m_localEmail; }
-	virtual void setLocalEmail( AsciiString email ) { m_localEmail = email;	}
-	virtual AsciiString getLocalPassword( void ){ return m_localPasswd;	}
-	virtual void setLocalPassword( AsciiString passwd ) { m_localPasswd = passwd;	}
-	virtual void setLocalBaseName( AsciiString name ) { m_localBaseName = name; }
-	virtual AsciiString getLocalBaseName( void ){ return m_localBaseName; }
-
-	virtual void setCachedLocalPlayerStats( PSPlayerStats stats ) {m_cachedLocalPlayerStats = stats;	}
-	virtual PSPlayerStats getCachedLocalPlayerStats( void ){ return m_cachedLocalPlayerStats;	}
-
-	virtual BuddyInfoMap* getBuddyMap( void ) { return &m_buddyMap; }
-	virtual BuddyInfoMap* getBuddyRequestMap( void ) { return &m_buddyRequestMap; }
-	virtual BuddyMessageList* getBuddyMessages( void ) { return &m_buddyMessages; }
-	virtual Bool isBuddy( Int id );
-
-	virtual void clearStagingRoomList( void );
-	virtual StagingRoomMap* getStagingRoomList( void ) { return &m_stagingRooms; }
-	virtual GameSpyStagingRoom* findStagingRoomByID( Int id );
-	virtual void addStagingRoom( GameSpyStagingRoom room );
-	virtual void updateStagingRoom( GameSpyStagingRoom room );
-	virtual void removeStagingRoom( GameSpyStagingRoom room );
-	virtual Bool hasStagingRoomListChanged( void );
-	virtual void leaveStagingRoom( void );
-	virtual void markAsStagingRoomHost( void );
-	virtual void markAsStagingRoomJoiner( Int game );
-	virtual Int getCurrentStagingRoomID( void ) { return m_localStagingRoomID; }
-
-	virtual void sawFullGameList( void ) { m_sawFullGameList = TRUE; }
-
-	virtual void setDisallowAsianText( Bool val );
-	virtual void setDisallowNonAsianText( Bool val );
-	virtual Bool getDisallowAsianText( void );
-	virtual Bool getDisallowNonAsianText(void );
-	// chat
-	virtual void registerTextWindow( GameWindow *win );
-	virtual void unregisterTextWindow( GameWindow *win );
-	virtual Int addText( UnicodeString message, Color c, GameWindow *win );
-	virtual void addChat( PlayerInfo p, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win );
-	virtual void addChat( AsciiString nick, Int profileID, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win );
-	virtual Bool sendChat( UnicodeString message, Bool isAction, GameWindow *playerListbox );
-
-	virtual void setMOTD( const AsciiString& motd );
-	virtual const AsciiString& getMOTD( void );
-	virtual void setConfig( const AsciiString& config );
-	virtual const AsciiString& getConfig( void );
-
-	virtual void setPingString( const AsciiString& ping ) { m_pingString = ping; }
-	virtual const AsciiString& getPingString( void ) { return m_pingString; }
-	virtual Int getPingValue( const AsciiString& otherPing );
-
-	virtual Bool amIHost( void );
-	virtual GameSpyStagingRoom* getCurrentStagingRoom( void );
-	virtual void setGameOptions( void );
-
-	virtual void addToIgnoreList( AsciiString nick );
-	virtual void removeFromIgnoreList( AsciiString nick );
-	virtual Bool isIgnored( AsciiString nick );
-	virtual IgnoreList returnIgnoreList( void );
-
-	virtual void loadSavedIgnoreList( void );
-	virtual SavedIgnoreMap returnSavedIgnoreList( void );
-	virtual void addToSavedIgnoreList( Int profileID, AsciiString nick);
-	virtual void removeFromSavedIgnoreList( Int profileID );
-	virtual Bool isSavedIgnored( Int profileID );	
-	virtual void setLocalIPs(UnsignedInt internalIP, UnsignedInt externalIP);
-	virtual UnsignedInt getInternalIP(void) { return m_internalIP; }
-	virtual UnsignedInt getExternalIP(void) { return m_externalIP; }
-
-	virtual Bool isDisconnectedAfterGameStart(Int *reason) const { if (reason) *reason = m_disconReason; return m_isDisconAfterGameStart; }
-	virtual void markAsDisconnectedAfterGameStart(Int reason) { m_isDisconAfterGameStart = TRUE; m_disconReason = reason; }
-	
-	virtual Bool didPlayerPreorder( Int profileID ) const;
-	virtual void markPlayerAsPreorder( Int profileID );
-
-	virtual void setMaxMessagesPerUpdate( Int num );
-	virtual Int getMaxMessagesPerUpdate( void );
-
-	virtual Int getAdditionalDisconnects( void );
-	virtual void clearAdditionalDisconnects( void );
-	virtual void readAdditionalDisconnects( void );
-	virtual void updateAdditionalGameSpyDisconnections(Int count);
-private:
-	Bool m_sawFullGameList;
-	Bool m_isDisconAfterGameStart;
-	Int m_disconReason;
-	AsciiString m_rawMotd;
-	AsciiString m_rawConfig;
-	AsciiString m_pingString;
-	GroupRoomMap m_groupRooms;
-	StagingRoomMap m_stagingRooms;
-	Bool m_stagingRoomsDirty;
-	BuddyInfoMap m_buddyMap;
-	BuddyInfoMap m_buddyRequestMap;
-	PlayerInfoMap m_playerInfoMap;
-	BuddyMessageList m_buddyMessages;
-	Int m_currentGroupRoomID;
-	Bool m_gotGroupRoomList;
-	AsciiString m_localName;
-	Int m_localProfileID;
-	AsciiString m_localPasswd;
-	AsciiString m_localEmail;
-	AsciiString m_localBaseName;
-	PSPlayerStats m_cachedLocalPlayerStats;
-	Bool m_disallowAsainText;
-	Bool m_disallowNonAsianText;
-	UnsignedInt m_internalIP, m_externalIP;
-	Int m_maxMessagesPerUpdate;
-
-	Int m_joinedStagingRoom;								// if we join a staging room, this holds its ID (0 otherwise)
-	Bool m_isHosting;												// if we host, this is true, and
-	GameSpyStagingRoom m_localStagingRoom;	// this holds the GameInfo for it.
-	Int m_localStagingRoomID;
-
-	IgnoreList m_ignoreList;
-	SavedIgnoreMap m_savedIgnoreMap;
-
-	std::set<GameWindow *> m_textWindows;
-
-	std::set<Int> m_preorderPlayers;
-
-	Int m_additionalDisconnects;
-};
-
-#endif // __PEERDEFS_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
deleted file mode 100644
index 78988f860d3..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PeerThread.h //////////////////////////////////////////////////////
-// Generals GameSpy Peer-to-peer chat thread class interface
-// Author: Matthew D. Campbell, June 2002
-
-#pragma once
-
-#ifndef __PEERTHREAD_H__
-#define __PEERTHREAD_H__
-
-#include "gamespy/peer/peer.h"
-#include "GameNetwork/NetworkDefs.h"
-
-enum SerialAuthResult CPP_11(: Int)
-{
-	SERIAL_NONEXISTENT,
-	SERIAL_AUTHFAILED,
-	SERIAL_BANNED,
-	SERIAL_OK
-};
-
-// this class encapsulates a request for the peer thread
-class PeerRequest
-{
-public:
-	enum
-	{
-		PEERREQUEST_LOGIN,				// attempt to login
-		PEERREQUEST_LOGOUT,				// log out if connected
-		PEERREQUEST_MESSAGEPLAYER,
-		PEERREQUEST_MESSAGEROOM,
-		PEERREQUEST_JOINGROUPROOM,
-		PEERREQUEST_LEAVEGROUPROOM,
-		PEERREQUEST_STARTGAMELIST,
-		PEERREQUEST_STOPGAMELIST,
-		PEERREQUEST_CREATESTAGINGROOM,
-		PEERREQUEST_SETGAMEOPTIONS,
-		PEERREQUEST_JOINSTAGINGROOM,
-		PEERREQUEST_LEAVESTAGINGROOM,
-		PEERREQUEST_UTMPLAYER,
-		PEERREQUEST_UTMROOM,
-		PEERREQUEST_STARTGAME,
-		PEERREQUEST_STARTQUICKMATCH,
-		PEERREQUEST_WIDENQUICKMATCHSEARCH,
-		PEERREQUEST_STOPQUICKMATCH,
-		PEERREQUEST_PUSHSTATS,
-		PEERREQUEST_GETEXTENDEDSTAGINGROOMINFO,
-		PEERREQUEST_MAX
-	} peerRequestType;
-
-	std::string nick;	// only used by login, but must be outside the union b/c of copy constructor
-	std::wstring text;  // can't be in a union
-	std::string password;
-	std::string email;
-	std::string id;
-	
-	// gameopts
-	std::string options; // full string for UTMs
-	std::string ladderIP;
-	std::string hostPingStr;
-	std::string gameOptsMapName;
-	std::string gameOptsPlayerNames[MAX_SLOTS];
-
-	std::vector<bool> qmMaps;
-
-	union
-	{
-		struct
-		{
-			Int profileID;
-		} login;
-
-		struct
-		{
-			Int id;
-		} groupRoom;
-		
-		struct
-		{
-			Bool restrictGameList;
-		} gameList;
-
-		struct
-		{
-			Bool isAction;
-		} message;
-
-		struct
-		{
-			Int id;
-		} stagingRoom;
-
-		struct
-		{
-			UnsignedInt exeCRC;
-			UnsignedInt iniCRC;
-			UnsignedInt gameVersion;
-			Bool allowObservers;
-			UnsignedShort ladPort;
-			UnsignedInt ladPassCRC;
-			Bool restrictGameList;
-		} stagingRoomCreation;
-
-		struct
-		{
-			Int wins[MAX_SLOTS];
-			Int losses[MAX_SLOTS];
-			Int profileID[MAX_SLOTS];
-			Int faction[MAX_SLOTS];
-			Int color[MAX_SLOTS];
-			Int numPlayers;
-			Int maxPlayers;
-			Int numObservers;
-		} gameOptions;
-
-		struct
-		{
-			Bool isStagingRoom;
-		} UTM;
-
-		struct
-		{
-			Int minPointPercentage, maxPointPercentage, points;
-			Int widenTime;
-			Int ladderID;
-			UnsignedInt ladderPassCRC;
-			Int maxPing;
-			Int maxDiscons, discons;
-			char pings[17]; // 8 servers (0-ff), 1 NULL
-			Int numPlayers;
-			Int botID;
-			Int roomID;
-			Int side;
-			Int color;
-			Int NAT;
-			UnsignedInt exeCRC;
-			UnsignedInt iniCRC;
-		} QM;
-
-		struct
-		{
-			Int locale;
-			Int wins;
-			Int losses;
-			Int rankPoints;
-			Int side;
-			Bool preorder;
-		} statsToPush;
-
-	};
-};
-
-//-------------------------------------------------------------------------
-
-enum DisconnectReason CPP_11(: Int)
-{
-	DISCONNECT_NICKTAKEN = 1,
-	DISCONNECT_BADNICK,
-	DISCONNECT_LOSTCON,
-	DISCONNECT_COULDNOTCONNECT,
-	DISCONNECT_GP_LOGIN_TIMEOUT,
-	DISCONNECT_GP_LOGIN_BAD_NICK,
-	DISCONNECT_GP_LOGIN_BAD_EMAIL,
-	DISCONNECT_GP_LOGIN_BAD_PASSWORD,
-	DISCONNECT_GP_LOGIN_BAD_PROFILE,
-	DISCONNECT_GP_LOGIN_PROFILE_DELETED,
-	DISCONNECT_GP_LOGIN_CONNECTION_FAILED,
-	DISCONNECT_GP_LOGIN_SERVER_AUTH_FAILED,
-	DISCONNECT_SERIAL_INVALID,
-	DISCONNECT_SERIAL_NOT_PRESENT,
-	DISCONNECT_SERIAL_BANNED,
-	DISCONNECT_GP_NEWUSER_BAD_NICK,
-	DISCONNECT_GP_NEWUSER_BAD_PASSWORD,
-	DISCONNECT_GP_NEWPROFILE_BAD_NICK,
-	DISCONNECT_GP_NEWPROFILE_BAD_OLD_NICK,
-	DISCONNECT_MAX,
-};
-
-enum QMStatus CPP_11(: Int)
-{
-	QM_IDLE,
-	QM_JOININGQMCHANNEL,
-	QM_LOOKINGFORBOT,
-	QM_SENTINFO,
-	QM_WORKING,
-	QM_POOLSIZE,
-	QM_WIDENINGSEARCH,
-	QM_MATCHED,
-	QM_INCHANNEL,
-	QM_NEGOTIATINGFIREWALLS,
-	QM_STARTINGGAME,
-	QM_COULDNOTFINDBOT,
-	QM_COULDNOTFINDCHANNEL,
-	QM_COULDNOTNEGOTIATEFIREWALLS,
-	QM_STOPPED,
-};
-
-// this class encapsulates an action the peer thread wants from the UI
-class PeerResponse
-{
-public:
-	enum
-	{
-		PEERRESPONSE_LOGIN,
-		PEERRESPONSE_DISCONNECT,
-		PEERRESPONSE_MESSAGE,
-		PEERRESPONSE_GROUPROOM,
-		PEERRESPONSE_STAGINGROOM,
-		PEERRESPONSE_STAGINGROOMLISTCOMPLETE,
-		PEERRESPONSE_STAGINGROOMPLAYERINFO,
-		PEERRESPONSE_JOINGROUPROOM,
-		PEERRESPONSE_CREATESTAGINGROOM,
-		PEERRESPONSE_JOINSTAGINGROOM,
-		PEERRESPONSE_PLAYERJOIN,
-		PEERRESPONSE_PLAYERLEFT,
-		PEERRESPONSE_PLAYERCHANGEDNICK,
-		PEERRESPONSE_PLAYERINFO,
-		PEERRESPONSE_PLAYERCHANGEDFLAGS,
-		PEERRESPONSE_ROOMUTM,
-		PEERRESPONSE_PLAYERUTM,
-		PEERRESPONSE_QUICKMATCHSTATUS,
-		PEERRESPONSE_GAMESTART,
-		PEERRESPONSE_FAILEDTOHOST,
-		PEERRESPONSE_MAX
-	} peerResponseType;
-
-	std::string groupRoomName; // can't be in union
-
-	std::string nick;   // can't be in a union
-	std::string oldNick;   // can't be in a union
-	std::wstring text;  // can't be in a union
-	std::string locale; // can't be in a union
-
-	std::string stagingServerGameOptions; // full string from UTMs
-
-	// game opts sent with PEERRESPONSE_STAGINGROOM
-	std::wstring stagingServerName;
-	std::string stagingServerPingString;
-	std::string stagingServerLadderIP;
-	std::string stagingRoomMapName;
-
-	// game opts sent with PEERRESPONSE_STAGINGROOMPLAYERINFO
-	std::string stagingRoomPlayerNames[MAX_SLOTS];
-
-	std::string command;
-	std::string commandOptions;
-
-	union
-	{
-		struct
-		{
-			DisconnectReason reason;
-		} discon;
-
-		struct
-		{
-			Int id;
-			Int numWaiting;
-			Int maxWaiting;
-			Int numGames;
-			Int numPlaying;
-		} groupRoom;
-
-		struct
-		{
-			Int id;
-			Bool ok;
-		} joinGroupRoom;
-		
-		struct
-		{
-			Int result;
-		} createStagingRoom;
-		
-		struct
-		{
-			Int id;
-			Bool ok;
-			Bool isHostPresent;
-			Int result; // for failures
-		} joinStagingRoom;
-		
-		struct
-		{
-			Bool isPrivate;
-			Bool isAction;
-			Int profileID;
-		} message;
-
-		struct
-		{
-			Int profileID;
-			Int wins;
-			Int losses;
-			RoomType roomType;
-			Int flags;
-			UnsignedInt IP;
-			Int rankPoints;
-			Int side;
-			Int preorder;
-			UnsignedInt internalIP; // for us, on connection
-			UnsignedInt externalIP; // for us, on connection
-		} player;
-
-		struct
-		{
-			Int id;
-			Int action;
-			Bool isStaging;
-			Bool requiresPassword;
-			Bool allowObservers;
-			UnsignedInt version;
-			UnsignedInt exeCRC;
-			UnsignedInt iniCRC;
-			UnsignedShort ladderPort;
-			Int wins[MAX_SLOTS];
-			Int losses[MAX_SLOTS];
-			Int profileID[MAX_SLOTS];
-			Int faction[MAX_SLOTS];
-			Int color[MAX_SLOTS];
-			Int numPlayers;
-			Int numObservers;
-			Int maxPlayers;
-			Int percentComplete;
-		} stagingRoom;
-
-		struct
-		{
-			QMStatus status;
-			Int poolSize;
-			Int mapIdx; // when matched
-			Int seed; // when matched
-			UnsignedInt IP[MAX_SLOTS]; // when matched
-			Int side[MAX_SLOTS]; // when matched
-			Int color[MAX_SLOTS]; // when matched
-			Int nat[MAX_SLOTS];
-		} qmStatus;
-	};
-};
-
-//-------------------------------------------------------------------------
-
-// this is the actual message queue used to pass messages between threads
-class GameSpyPeerMessageQueueInterface
-{
-public:
-	virtual ~GameSpyPeerMessageQueueInterface() {}
-	virtual void startThread( void ) = 0;
-	virtual void endThread( void ) = 0;
-	virtual Bool isThreadRunning( void ) = 0;
-	virtual Bool isConnected( void ) = 0;
-	virtual Bool isConnecting( void ) = 0;
-
-	virtual void addRequest( const PeerRequest& req ) = 0;
-	virtual Bool getRequest( PeerRequest& req ) = 0;
-
-	virtual void addResponse( const PeerResponse& resp ) = 0;
-	virtual Bool getResponse( PeerResponse& resp ) = 0;
-
-	virtual SerialAuthResult getSerialAuthResult( void ) = 0;
-
-	static GameSpyPeerMessageQueueInterface* createNewMessageQueue( void );
-};
-
-extern GameSpyPeerMessageQueueInterface *TheGameSpyPeerMessageQueue;
-
-#endif // __PEERTHREAD_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h
deleted file mode 100644
index cfa09d7cd48..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PersistentStorageDefs.h //////////////////////////////////////////////////////
-// Generals GameSpy Persistent Storage definitions
-// Author: Matthew D. Campbell, July 2002
-
-#pragma once
-
-#ifndef __PERSISTENTSTORAGEDEFS_H__
-#define __PERSISTENTSTORAGEDEFS_H__
-
-enum LocaleType CPP_11(: Int)
-{
-    LOC_UNKNOWN = 0,
-    LOC_MIN = 1,
-    LOC_MAX = 37
-};
-
-void HandlePersistentStorageResponses(void);
-void UpdateLocalPlayerStats(void);
-
-void SetLookAtPlayer( Int id, AsciiString nick );
-void PopulatePlayerInfoWindows( AsciiString parentWindowName );
-
-#endif // __PERSISTENTSTORAGEDEFS_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h
deleted file mode 100644
index 430f5e0cd70..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PersistentStorageThread.h //////////////////////////////////////////////////////
-// Generals GameSpy Persistent Storage thread class interface
-// Author: Matthew D. Campbell, July 2002
-
-#pragma once
-
-#ifndef __PERSISTENTSTORAGETHREAD_H__
-#define __PERSISTENTSTORAGETHREAD_H__
-
-#include "gamespy/gstats/gpersist.h"
-
-#define MAX_BUDDY_CHAT_LEN 128
-
-typedef std::map<Int, UnsignedInt> PerGeneralMap;
-// this structure holds all info on a player that is stored online
-class PSPlayerStats
-{
-public:
-	PSPlayerStats( void );
-	PSPlayerStats( const PSPlayerStats& other );
-	void reset(void);
-
-	Int id;
-	PerGeneralMap wins;
-	PerGeneralMap losses;
-	PerGeneralMap games;
-	PerGeneralMap duration;
-	PerGeneralMap unitsKilled;
-	PerGeneralMap unitsLost;
-	PerGeneralMap unitsBuilt;
-	PerGeneralMap buildingsKilled;
-	PerGeneralMap buildingsLost;
-	PerGeneralMap buildingsBuilt;
-	PerGeneralMap earnings;
-	PerGeneralMap techCaptured;
-	PerGeneralMap discons;
-	PerGeneralMap desyncs;
-	PerGeneralMap surrenders;
-	PerGeneralMap gamesOf2p;
-	PerGeneralMap gamesOf3p;
-	PerGeneralMap gamesOf4p;
-	PerGeneralMap gamesOf5p;
-	PerGeneralMap gamesOf6p;
-	PerGeneralMap gamesOf7p;
-	PerGeneralMap gamesOf8p;
-	PerGeneralMap customGames;
-	PerGeneralMap QMGames;
-	Int locale;
-	Int gamesAsRandom;
-	std::string options;
-	std::string systemSpec;
-	Real lastFPS;
-	Int lastGeneral;
-	Int gamesInRowWithLastGeneral;
-	Int challengeMedals;
-	Int battleHonors;
-	Int QMwinsInARow;
-	Int maxQMwinsInARow;
-
-	Int winsInARow;
-	Int maxWinsInARow;
-	Int lossesInARow;
-	Int maxLossesInARow;
-	Int disconsInARow;
-	Int maxDisconsInARow;
-	Int desyncsInARow;
-	Int maxDesyncsInARow;
-
-	Int builtParticleCannon;
-	Int builtNuke;
-	Int builtSCUD;
-
-	Int lastLadderPort;
-	std::string lastLadderHost;
-
-	void incorporate( const PSPlayerStats& other );
-};
-
-// this class encapsulates a request for the thread
-class PSRequest
-{
-public:
-	PSRequest();
-	enum
-	{
-		PSREQUEST_READPLAYERSTATS,			// read stats for a player
-		PSREQUEST_UPDATEPLAYERSTATS,		// update stats on the server
-		PSREQUEST_UPDATEPLAYERLOCALE,		// update locale on the server
-		PSREQUEST_READCDKEYSTATS,				// read stats for a cdkey
-		PSREQUEST_SENDGAMERESTOGAMESPY,	// report game results to GameSpy
-		PSREQUEST_MAX
-	} requestType;
-
-	// player stats for the *PLAYERSTATS
-	PSPlayerStats player;
-
-	// cdkey for READCDKEYSTATS;
-	std::string cdkey;
-
-	// our info for UPDATEPLAYERSTATS
-	std::string nick;
-	std::string password;
-	std::string email;
-	Bool addDiscon;
-	Bool addDesync;
-	Int lastHouse;
-
-	// for GameRes
-	std::string results;
-};
-
-//-------------------------------------------------------------------------
-
-// this class encapsulates a response from the thread
-class PSResponse
-{
-public:
-	enum
-	{
-		PSRESPONSE_PLAYERSTATS,
-		PSRESPONSE_COULDNOTCONNECT,
-		PSRESPONSE_PREORDER,
-		PSRESPONSE_MAX
-	} responseType;
-
-	// player stats for the *PLAYERSTATS
-	PSPlayerStats player;
-
-	// preorder flag
-	Bool preorder;
-};
-
-//-------------------------------------------------------------------------
-
-// this is the actual message queue used to pass messages between threads
-class GameSpyPSMessageQueueInterface
-{
-public:
-	virtual ~GameSpyPSMessageQueueInterface() {}
-	virtual void startThread( void ) = 0;
-	virtual void endThread( void ) = 0;
-	virtual Bool isThreadRunning( void ) = 0;
-
-	virtual void addRequest( const PSRequest& req ) = 0;
-	virtual Bool getRequest( PSRequest& req ) = 0;
-
-	virtual void addResponse( const PSResponse& resp ) = 0;
-	virtual Bool getResponse( PSResponse& resp ) = 0;
-
-	// called from the main thread
-	virtual void trackPlayerStats( PSPlayerStats stats ) = 0;
-	virtual PSPlayerStats findPlayerStatsByID( Int id ) = 0;
-
-	static GameSpyPSMessageQueueInterface* createNewMessageQueue( void );
-
-	static std::string formatPlayerKVPairs( PSPlayerStats stats );
-	static PSPlayerStats parsePlayerKVPairs( std::string kvPairs );
-};
-
-extern GameSpyPSMessageQueueInterface *TheGameSpyPSMessageQueue;
-
-
-#endif // __PERSISTENTSTORAGETHREAD_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h
deleted file mode 100644
index 0ed12049189..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PingThread.h //////////////////////////////////////////////////////
-// Generals ping thread class interface
-// Author: Matthew D. Campbell, August 2002
-// Note: adapted from WOLAPI
-
-#pragma once
-
-#ifndef __PINGTHREAD_H__
-#define __PINGTHREAD_H__
-
-// this class encapsulates a request for the thread
-class PingRequest
-{
-public:
-	std::string hostname;
-	Int repetitions;
-	Int timeout;
-};
-
-//-------------------------------------------------------------------------
-
-// this class encapsulates a response from the thread
-class PingResponse
-{
-public:
-	std::string hostname;
-	Int avgPing;
-	Int repetitions;
-};
-
-//-------------------------------------------------------------------------
-
-// this is the actual message queue used to pass messages between threads
-class PingerInterface
-{
-public:
-	virtual ~PingerInterface() {}
-	virtual void startThreads( void ) = 0;
-	virtual void endThreads( void ) = 0;
-	virtual Bool areThreadsRunning( void ) = 0;
-
-	virtual void addRequest( const PingRequest& req ) = 0;
-	virtual Bool getRequest( PingRequest& resp ) = 0;
-
-	virtual void addResponse( const PingResponse& resp ) = 0;
-	virtual Bool getResponse( PingResponse& resp ) = 0;
-
-	static PingerInterface* createNewPingerInterface( void );
-
-	virtual Bool arePingsInProgress( void ) = 0;
-	virtual Int getPing( AsciiString hostname ) = 0;
-	virtual void clearPingMap( void ) = 0;
-	virtual AsciiString getPingString( Int timeout ) = 0;
-};
-
-extern PingerInterface *ThePinger;
-
-
-#endif // __PINGTHREAD_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
deleted file mode 100644
index a66e9a1e180..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: StagingRoomGameInfo.h //////////////////////////////////////////////////////
-// Generals GameSpy GameInfo
-// Author: Matthew D. Campbell, Sept 2002
-
-#pragma once
-
-#ifndef __STAGINGROOMGAMEINFO_H__
-#define __STAGINGROOMGAMEINFO_H__
-
-#include "GameNetwork/GameInfo.h"
-#include "GameNetwork/Transport.h"
-
-class GameSpyGameSlot : public GameSlot
-{
-public:
-	GameSpyGameSlot();
-	Int getProfileID( void ) const { return m_profileID; }
-	void setProfileID( Int id ) { m_profileID = id; }
-	AsciiString getLoginName( void ) const { return m_gameSpyLogin; }
-	void setLoginName( AsciiString name ) { m_gameSpyLogin = name; }
-	AsciiString getLocale( void ) const { return m_gameSpyLocale; }
-	void setLocale( AsciiString name ) { m_gameSpyLocale = name; }
-	Int getWins( void ) const { return m_wins; }
-	Int getLosses( void ) const { return m_losses; }
-	void setWins( Int wins ) { m_wins = wins; }
-	void setLosses( Int losses ) { m_losses = losses; }
-
-	Int getSlotRankPoints( void ) const { return m_rankPoints; }
-	Int getFavoriteSide( void ) const { return m_favoriteSide; }
-	void setSlotRankPoints( Int val ) { m_rankPoints = val; }
-	void setFavoriteSide( Int val ) { m_favoriteSide = val; }
-
-	void setPingString( AsciiString pingStr );
-	inline AsciiString getPingString( void ) const { return m_pingStr; }
-	inline Int getPingAsInt( void ) const { return m_pingInt; }
-
-protected:
-	Int m_profileID;
-	AsciiString m_gameSpyLogin;
-	AsciiString m_gameSpyLocale;
-
-	AsciiString m_pingStr;
-	Int m_pingInt;
-	Int m_wins, m_losses;
-	Int m_rankPoints, m_favoriteSide;
-};
-
-/**
-  * GameSpyStagingRoom class - maintains information about the GameSpy game and
-	* the contents of its slot list throughout the game.
-	*/
-class GameSpyStagingRoom : public GameInfo
-{
-private:
-	GameSpyGameSlot m_GameSpySlot[MAX_SLOTS];											///< The GameSpy Games Slot List
-	UnicodeString m_gameName;
-	Int m_id;
-	Transport *m_transport;
-	AsciiString m_localName;
-	Bool m_requiresPassword;
-	Bool m_allowObservers;
-	UnsignedInt m_version;
-	UnsignedInt m_exeCRC;
-	UnsignedInt m_iniCRC;
-	Bool m_isQM;
-
-	AsciiString m_ladderIP;
-	AsciiString m_pingStr;
-	Int m_pingInt;
-	UnsignedShort m_ladderPort;
-
-	Int m_reportedNumPlayers;
-	Int m_reportedMaxPlayers;
-	Int m_reportedNumObservers;
-
-public:
-	GameSpyStagingRoom();
-	virtual void reset( void );
-
-	void cleanUpSlotPointers(void);
-	inline void setID(Int id) { m_id = id; }
-	inline Int getID( void ) const { return m_id; }
-
-	inline void setHasPassword(Bool val) { m_requiresPassword = val; }
-	inline Bool getHasPassword(void) const { return m_requiresPassword; }
-	inline void setAllowObservers(Bool val) { m_allowObservers = val; }
-	inline Bool getAllowObservers(void) const { return m_allowObservers; }
-
-	inline void setVersion(UnsignedInt val) { m_version = val; }
-	inline UnsignedInt getVersion(void) const { return m_version; }
-	inline void setExeCRC(UnsignedInt val) { m_exeCRC = val; }
-	inline UnsignedInt getExeCRC(void) const { return m_exeCRC; }
-	inline void setIniCRC(UnsignedInt val) { m_iniCRC = val; }
-	inline UnsignedInt getIniCRC(void) const { return m_iniCRC; }
-
-	inline void setReportedNumPlayers(Int val) { m_reportedNumPlayers = val; }
-	inline Int getReportedNumPlayers(void) const { return m_reportedNumPlayers; }
-
-	inline void setReportedMaxPlayers(Int val) { m_reportedMaxPlayers = val; }
-	inline Int getReportedMaxPlayers(void) const { return m_reportedMaxPlayers; }
-
-	inline void setReportedNumObservers(Int val) { m_reportedNumObservers = val; }
-	inline Int getReportedNumObservers(void) const { return m_reportedNumObservers; }
-
-	inline void setLadderIP( AsciiString ladderIP ) { m_ladderIP = ladderIP; }
-	inline AsciiString getLadderIP( void ) const { return m_ladderIP; }
-	inline void setLadderPort( UnsignedShort ladderPort ) { m_ladderPort = ladderPort; }
-	inline UnsignedShort getLadderPort( void ) const { return m_ladderPort; }
-	void setPingString( AsciiString pingStr );
-	inline AsciiString getPingString( void ) const { return m_pingStr; }
-	inline Int getPingAsInt( void ) const { return m_pingInt; }
-
-	virtual Bool amIHost( void ) const;															///< Convenience function - is the local player the game host?
-	
-	GameSpyGameSlot *getGameSpySlot( Int index );
-
-	AsciiString generateGameSpyGameResultsPacket( void );
-	AsciiString generateLadderGameResultsPacket( void );
-	void markGameAsQM( void ) { m_isQM = TRUE; }
-	Bool isQMGame( void ) { return m_isQM; }
-
-	virtual void init(void);
-	virtual void resetAccepted(void);															///< Reset the accepted flag on all players
-
-	virtual void startGame(Int gameID);														///< Mark our game as started and record the game ID.
-	void launchGame( void );																			///< NAT negotiation has finished - really start
-	virtual Int getLocalSlotNum( void ) const;										///< Get the local slot number, or -1 if we're not present
-
-	inline void setGameName( UnicodeString name ) { m_gameName = name; }
-	inline UnicodeString getGameName( void ) const { return m_gameName; }
-
-	inline void setLocalName( AsciiString name ) { m_localName = name; }
-};
-
-extern GameSpyStagingRoom *TheGameSpyGame;
-
-#endif // __STAGINGROOMGAMEINFO_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h
deleted file mode 100644
index be97c956eba..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: ThreadUtils.h //////////////////////////////////////////////////////
-// Generals GameSpy thread utils
-// Author: Matthew D. Campbell, July 2002
-
-#pragma once
-
-#ifndef __GAMESPY_THREADUTILS_H__
-#define __GAMESPY_THREADUTILS_H__
-
-std::wstring MultiByteToWideCharSingleLine( const char *orig );
-std::string WideCharStringToMultiByte( const WideChar *orig );
-
-#endif // __GAMESPY_THREADUTILS_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h
index c5c67f5f369..4b56c34b8e0 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __GAMESPYCHAT_H__
-#define __GAMESPYCHAT_H__
-
 #include "gamespy/peer/peer.h"
 
 class GameWindow;
@@ -56,5 +53,3 @@ void RoomMessageCallback(PEER peer, RoomType roomType,
 void PlayerMessageCallback(PEER peer, const char * nick,
 													 const char * message, MessageType messageType,
 													 void * param);														///< Called when a private message is received from another player.
-
-#endif // __GAMESPYCHAT_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h
index 340a5f49620..df001959ed8 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __GAMESPYGP_H__
-#define __GAMESPYGP_H__
-
 #include "gamespy/gp/gp.h"
 
 void GPRecvBuddyRequestCallback(GPConnection * connection, GPRecvBuddyRequestArg * arg, void * param);
@@ -43,5 +40,3 @@ void GameSpyUpdateBuddyOverlay(void);
 extern GPConnection *TheGPConnection;
 
 Bool IsGameSpyBuddy(GPProfile id);
-
-#endif // __GAMESPYGP_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h
index 1fcd53ec127..daba3ca64fa 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h
@@ -29,10 +29,6 @@
 #pragma once
 
 #error this file is obsolete
-
-#ifndef __GAMESPYGAMEINFO_H__
-#define __GAMESPYGAMEINFO_H__
-
 #include "gamespy/peer/peer.h"
 
 #include "GameNetwork/GameInfo.h"
@@ -74,7 +70,7 @@ class GameSpyGameInfo : public GameInfo
 
 	inline void setServer(SBServer server) { m_server = server; }
 	inline SBServer getServer( void ) { return m_server; }
-	
+
 	AsciiString generateGameResultsPacket( void );
 
 	virtual void init(void);
@@ -94,5 +90,3 @@ void WOLDisplaySlotList( void );
 void GameSpyStartGame( void );
 void GameSpyLaunchGame( void );
 Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverPort, UnsignedInt& localIP);
-
-#endif // __LANGAMEINFO_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h
deleted file mode 100644
index 76a505e754f..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GamespyOverlay.h //////////////////////////////////////////////////////
-// Generals GameSpy overlay screens
-// Author: Matthew D. Campbell, March 2002
-
-#pragma once
-
-#ifndef __GAMESPYOVERLAY_H__
-#define __GAMESPYOVERLAY_H__
-
-#include "Common/NameKeyGenerator.h"
-#include "GameClient/WindowLayout.h"
-#include "GameClient/Gadget.h"
-#include "GameClient/Shell.h"
-#include "GameClient/KeyDefs.h"
-#include "GameClient/GameWindowManager.h"
-
-void ClearGSMessageBoxes( void );	///< Tear down any GS message boxes (e.g. in case we have a new one to put up)
-void GSMessageBoxOk(UnicodeString titleString,UnicodeString bodyString, GameWinMsgBoxFunc okFunc = NULL);	///< Display a Message box with Ok button and track it
-void GSMessageBoxOkCancel(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc okFunc, GameWinMsgBoxFunc cancelFunc);	///< Display a Message box with Ok/Cancel buttons and track it
-void GSMessageBoxYesNo(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc yesFunc, GameWinMsgBoxFunc noFunc);	///< Display a Message box with Yes/No buttons and track it
-void RaiseGSMessageBox( void );		///< Bring GS message box to the foreground (if we transition screens while a message box is up)
-
-enum GSOverlayType CPP_11(: Int)
-{
-	GSOVERLAY_PLAYERINFO,
-	GSOVERLAY_MAPSELECT,
-	GSOVERLAY_BUDDY,
-	GSOVERLAY_PAGE,
-	GSOVERLAY_GAMEOPTIONS,
-	GSOVERLAY_GAMEPASSWORD,
-	GSOVERLAY_LADDERSELECT,
-	GSOVERLAY_LOCALESELECT,
-	GSOVERLAY_OPTIONS,
-	GSOVERLAY_MAX
-};
-
-void GameSpyOpenOverlay( GSOverlayType );
-void GameSpyCloseOverlay( GSOverlayType );
-void GameSpyCloseAllOverlays( void );
-Bool GameSpyIsOverlayOpen( GSOverlayType );
-void GameSpyToggleOverlay( GSOverlayType );
-void GameSpyUpdateOverlays( void );
-void ReOpenPlayerInfo( void );
-void CheckReOpenPlayerInfo(void );
-#endif // __GAMESPYOVERLAY_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h
index d16363b63ec..d5f4028f550 100644
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h
+++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __GAMESPYPersistentStorage_H__
-#define __GAMESPYPersistentStorage_H__
-
 class GameSpyPlayerInfoInterface : public SubsystemInterface
 {
 public:
@@ -58,5 +55,3 @@ class GameSpyPlayerInfoInterface : public SubsystemInterface
 GameSpyPlayerInfoInterface *createGameSpyPlayerInfo( void );
 
 extern GameSpyPlayerInfoInterface *TheGameSpyPlayerInfo;
-
-#endif // __GAMESPYPersistentStorage_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h
deleted file mode 100644
index 2a06a2ddeb5..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GameSpyThread.h //////////////////////////////////////////////////////
-// Generals GameSpy thread class
-// Author: Matthew D. Campbell, March 2002
-
-#pragma once
-
-#ifndef __GAMESPYTHREAD_H__
-#define __GAMESPYTHREAD_H__
-
-#include "mutex.h"
-#include "thread.h"
-
-class GameSpyThreadClass : public ThreadClass
-{
-
-public:
-	GameSpyThreadClass::GameSpyThreadClass() : ThreadClass() { m_doLogin = false; m_readStats = false; m_updateWins = false; m_updateLosses = false; m_updateLocale = false; m_showLocaleSelect = false; m_nextShellScreen.clear(); }
-	void queueLogin(AsciiString nick, AsciiString pass, AsciiString email) { m_nick = nick; m_pass = pass; m_email = email; m_doLogin = true; }
-	void queueReadPersistentStatsFromServer( void ) { m_readStats = true; }
-	void queueUpdateLocale( AsciiString locale ) { m_locale = locale; m_updateLocale = true; }
-	void queueUpdateWins  ( AsciiString wins   ) { m_wins   = wins;   m_updateWins   = true; }
-	void queueUpdateLosses( AsciiString losses ) { m_losses = losses; m_updateLosses = true; }
-
-	void Thread_Function();
-
-	AsciiString getNextShellScreen( void );
-	Bool showLocaleSelect( void );
-
-	void setNextShellScreen( AsciiString nextShellScreen );
-	void setShowLocaleSelect( Bool val );
-
-private:
-	AsciiString m_nick, m_pass, m_email;
-	Bool m_doLogin, m_readStats, m_updateWins, m_updateLosses, m_updateLocale;
-	AsciiString m_locale, m_wins, m_losses;
-	AsciiString m_nextShellScreen;
-	Bool m_showLocaleSelect;
-};
-
-extern GameSpyThreadClass *TheGameSpyThread;
-extern MutexClass TheGameSpyMutex;
-
-#endif // __GAMESPYTHREAD_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h b/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h
deleted file mode 100644
index 4badbff81eb..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// IPEnumeration.h ///////////////////////////////////////////////////////////////
-// Class for enumerating IP addresses
-// Author: Matthew D. Campbell, October 2001
-
-#pragma once
-
-#ifndef _IPENUMERATION_H_
-#define _IPENUMERATION_H_
-
-#include "GameNetwork/Transport.h"
-
-/**
- * IP wrapper class.
- */
-class EnumeratedIP : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(EnumeratedIP, "EnumeratedIP")		
-public:
-	EnumeratedIP() { m_IPstring = ""; m_next = NULL; m_IP = 0; }
-
-	// Access functions
-	inline AsciiString getIPstring( void ) { return m_IPstring; }
-	inline void setIPstring( AsciiString name ) { m_IPstring = name; }
-	inline UnsignedInt getIP( void ) { return m_IP; }
-	inline void setIP( UnsignedInt IP ) { m_IP = IP; }
-	inline EnumeratedIP *getNext( void ) { return m_next; }
-	inline void setNext( EnumeratedIP *next ) { m_next = next; }
-
-protected:
-	AsciiString m_IPstring;
-	UnsignedInt m_IP;
-	EnumeratedIP *m_next;
-};
-EMPTY_DTOR(EnumeratedIP)
-
-
-/**
- * The IPEnumeration class is used to obtain a list of IP addresses on the
- * local machine.
- */
-class IPEnumeration
-{
-public:
-
-	IPEnumeration();
-	~IPEnumeration();
-
-	EnumeratedIP * getAddresses( void );		///< Return a linked list of local IP addresses
-	AsciiString getMachineName( void );			///< Return the Network Neighborhood machine name
-
-protected:
-	void addNewIP( UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedByte d );
-
-	EnumeratedIP *m_IPlist;
-	Bool m_isWinsockInitialized;
-};
-
-
-#endif // _IPENUMERATION_H_
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h b/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h
deleted file mode 100644
index c1c6560e851..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// LANAPI.h ///////////////////////////////////////////////////////////////
-// LANAPI singleton class - defines interface to LAN broadcast communications
-// Author: Matthew D. Campbell, October 2001
-
-#pragma once
-
-#ifndef _LANAPI_H_
-#define _LANAPI_H_
-
-#include "GameNetwork/Transport.h"
-#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/LANPlayer.h"
-#include "GameNetwork/LANGameInfo.h"
-
-//static const Int g_lanPlayerNameLength = 20;
-static const Int g_lanPlayerNameLength = 12; // reduced length because of game option length
-//static const Int g_lanLoginNameLength = 16;
-//static const Int g_lanHostNameLength = 16;
-static const Int g_lanLoginNameLength = 1;
-static const Int g_lanHostNameLength = 1;
-//static const Int g_lanGameNameLength = 32;
-static const Int g_lanGameNameLength = 16; // reduced length because of game option length
-static const Int g_lanGameNameReservedLength = 16; // save N wchars for ID info
-static const Int g_lanMaxChatLength = 100;
-static const Int m_lanMaxOptionsLength = MAX_PACKET_SIZE - ( 8 + (g_lanGameNameLength+1)*2 + 4 + (g_lanPlayerNameLength+1)*2
-																														+ (g_lanLoginNameLength+1) + (g_lanHostNameLength+1) );
-static const Int g_maxSerialLength = 23; // including the trailing '\0'
-
-struct LANMessage;
-
-/**
- * The LANAPI class is used to instantiate a singleton which 
- * implements the interface to all LAN broadcast communications.
- */
-class LANAPIInterface : public SubsystemInterface
-{
-public:
-
-	virtual ~LANAPIInterface() { };
-
-	virtual void init( void ) = 0;															///< Initialize or re-initialize the instance
-	virtual void reset( void ) = 0;															///< reset the logic system
-	virtual void update( void ) = 0;														///< update the world
-
-	virtual void setIsActive(Bool isActive ) = 0;								///< Tell TheLAN whether or not the app is active.
-
-	// Possible types of chat messages
-	enum ChatType
-	{
-		LANCHAT_NORMAL = 0,
-		LANCHAT_EMOTE,
-		LANCHAT_SYSTEM,
-		LANCHAT_MAX
-	};
-
-	// Request functions generate network traffic
-	virtual void RequestLocations( void ) = 0;																				///< Request everybody to respond with where they are
-	virtual void RequestGameJoin( LANGameInfo *game, UnsignedInt ip = 0 ) = 0;				///< Request to join a game
-	virtual void RequestGameJoinDirectConnect( UnsignedInt ipaddress ) = 0;						///< Request to join a game at an IP address
-	virtual void RequestGameLeave( void ) = 0;																				///< Tell everyone we're leaving
-	virtual void RequestAccept( void ) = 0;																						///< Indicate we're OK with the game options
-	virtual void RequestHasMap( void ) = 0;																						///< Send our map status
-	virtual void RequestChat( UnicodeString message, ChatType format ) = 0;						///< Send a chat message
-	virtual void RequestGameStart( void ) = 0;																				///< Tell everyone the game is starting
-	virtual void RequestGameStartTimer( Int seconds ) = 0;
-	virtual void RequestGameOptions( AsciiString gameOptions, Bool isPublic, UnsignedInt ip = 0 ) = 0;		///< Change the game options
-	virtual void RequestGameCreate( UnicodeString gameName, Bool isDirectConnect ) = 0;	///< Try to host a game
-	virtual void RequestGameAnnounce( void ) = 0;																			///< Sound out current game info if host
-//	virtual void RequestSlotList( void ) = 0;																					///< Pump out the Slot info.
-	virtual void RequestSetName( UnicodeString newName ) = 0;													///< Pick a new name
-	virtual void RequestLobbyLeave( Bool forced ) = 0;																///< Announce that we're leaving the lobby
-	virtual void ResetGameStartTimer( void ) = 0;
-
-	// Possible result codes passed to On functions
-	enum ReturnType
-	{
-		RET_OK,							// Any function
-		RET_TIMEOUT,				// OnGameJoin/Leave/Start, etc
-		RET_GAME_FULL,			// OnGameJoin
-		RET_DUPLICATE_NAME,	// OnGameJoin
-		RET_CRC_MISMATCH,		// OnGameJoin
-		RET_SERIAL_DUPE,		// OnGameJoin
-		RET_GAME_STARTED,		// OnGameJoin
-		RET_GAME_EXISTS,		// OnGameCreate
-		RET_GAME_GONE,			// OnGameJoin
-		RET_BUSY,						// OnGameCreate/Join/etc if another action is in progress
-		RET_UNKNOWN,				// Default message for oddity
-		RET_MAX
-	};
-	UnicodeString getErrorStringFromReturnType( ReturnType ret );
-
-	// On functions are (generally) the result of network traffic
-	virtual void OnGameList( LANGameInfo *gameList ) = 0;																							///< List of games
-	virtual void OnPlayerList( LANPlayer *playerList ) = 0;																				///< List of players in the Lobby
-	virtual void OnGameJoin( ReturnType ret, LANGameInfo *theGame ) = 0;															///< Did we get in the game?
-	virtual void OnPlayerJoin( Int slot, UnicodeString playerName ) = 0;													///< Someone else joined our game (host only; joiners get a slotlist)
-	virtual void OnHostLeave( void ) = 0;																													///< Host left the game
-	virtual void OnPlayerLeave( UnicodeString player ) = 0;																				///< Someone left the game
-	virtual void OnAccept( UnsignedInt playerIP, Bool status ) = 0;																///< Someone's accept status changed
-	virtual void OnHasMap( UnsignedInt playerIP, Bool status ) = 0;																///< Someone's map status changed
-	virtual void OnChat( UnicodeString player, UnsignedInt ip,
-											 UnicodeString message, ChatType format ) = 0;														///< Chat message from someone
-	virtual void OnGameStart( void ) = 0;																													///< The game is starting
-	virtual void OnGameStartTimer( Int seconds ) = 0;
-	virtual void OnGameOptions( UnsignedInt playerIP, Int playerSlot, AsciiString options ) = 0;	///< Someone sent game options
-	virtual void OnGameCreate( ReturnType ret ) = 0;																							///< Your game is created
-//	virtual void OnSlotList( ReturnType ret, LANGameInfo *theGame ) = 0;															///< Slotlist for a game in setup
-	virtual void OnNameChange( UnsignedInt IP, UnicodeString newName ) = 0;												///< Someone has morphed
-
-	// Misc utility functions
-	virtual LANGameInfo * LookupGame( UnicodeString gameName ) = 0;														///< return a pointer to a game we know about
-	virtual LANGameInfo * LookupGameByListOffset( Int offset ) = 0;														///< return a pointer to a game we know about
-	virtual Bool SetLocalIP( UnsignedInt localIP ) = 0;																		///< For multiple NIC machines
-	virtual void SetLocalIP( AsciiString localIP ) = 0;																		///< For multiple NIC machines
-	virtual Bool AmIHost( void ) = 0;																											///< Am I hosting a game?
-	virtual inline UnicodeString GetMyName( void ) = 0;																		///< What's my name?
-	virtual inline LANGameInfo *GetMyGame( void ) = 0;															          ///< What's my Game?
-	virtual void fillInLANMessage( LANMessage *msg ) = 0;																	///< Fill in default params
-	virtual void checkMOTD( void ) = 0;
-};
-
-
-/**
- * The LANAPI class is used to instantiate a singleton which 
- * implements the interface to all LAN broadcast communications.
- */
-class LANAPI : public LANAPIInterface
-{
-public:
-
-	LANAPI();
-	virtual ~LANAPI();
-
-	virtual void init( void );															///< Initialize or re-initialize the instance
-	virtual void reset( void );															///< reset the logic system
-	virtual void update( void );														///< update the world
-
-	virtual void setIsActive(Bool isActive);								///< tell TheLAN whether or not
-
-	// Request functions generate network traffic
-	virtual void RequestLocations( void );																				///< Request everybody to respond with where they are
-	virtual void RequestGameJoin( LANGameInfo *game, UnsignedInt ip = 0 );				///< Request to join a game
-	virtual void RequestGameJoinDirectConnect( UnsignedInt ipaddress );						///< Request to join a game at an IP address
-	virtual void RequestGameLeave( void );																				///< Tell everyone we're leaving
-	virtual void RequestAccept( void );																						///< Indicate we're OK with the game options
-	virtual void RequestHasMap( void );																						///< Send our map status
-	virtual void RequestChat( UnicodeString message, ChatType format );						///< Send a chat message
-	virtual void RequestGameStart( void );																				///< Tell everyone the game is starting
-	virtual void RequestGameStartTimer( Int seconds );
-	virtual void RequestGameOptions( AsciiString gameOptions, Bool isPublic, UnsignedInt ip = 0 );		///< Change the game options
-	virtual void RequestGameCreate( UnicodeString gameName, Bool isDirectConnect );	///< Try to host a game
-	virtual void RequestGameAnnounce( void );																			///< Send out game info if host
-	virtual void RequestSetName( UnicodeString newName );													///< Pick a new name
-//	virtual void RequestSlotList( void );																					///< Pump out the Slot info.
-	virtual void RequestLobbyLeave( Bool forced );																///< Announce that we're leaving the lobby
-	virtual void ResetGameStartTimer( void );
-
-	// On functions are (generally) the result of network traffic
-	virtual void OnGameList( LANGameInfo *gameList );																							///< List of games
-	virtual void OnPlayerList( LANPlayer *playerList );																				///< List of players in the Lobby
-	virtual void OnGameJoin( ReturnType ret, LANGameInfo *theGame );															///< Did we get in the game?
-	virtual void OnPlayerJoin( Int slot, UnicodeString playerName );													///< Someone else joined our game (host only; joiners get a slotlist)
-	virtual void OnHostLeave( void );																													///< Host left the game
-	virtual void OnPlayerLeave( UnicodeString player );																				///< Someone left the game
-	virtual void OnAccept( UnsignedInt playerIP, Bool status );																///< Someone's accept status changed
-	virtual void OnHasMap( UnsignedInt playerIP, Bool status );																///< Someone's map status changed
-	virtual void OnChat( UnicodeString player, UnsignedInt ip,
-											 UnicodeString message, ChatType format );														///< Chat message from someone
-	virtual void OnGameStart( void );																													///< The game is starting
-	virtual void OnGameStartTimer( Int seconds );
-	virtual void OnGameOptions( UnsignedInt playerIP, Int playerSlot, AsciiString options );	///< Someone sent game options
-	virtual void OnGameCreate( ReturnType ret );																							///< Your game is created
-	//virtual void OnSlotList( ReturnType ret, LANGameInfo *theGame );															///< Slotlist for a game in setup
-	virtual void OnNameChange( UnsignedInt IP, UnicodeString newName );												///< Someone has morphed
-	virtual void OnInActive( UnsignedInt IP );																								///< Someone has alt-tabbed out.
-
-
-	// Misc utility functions
-	virtual LANGameInfo * LookupGame( UnicodeString gameName );														///< return a pointer to a game we know about
-	virtual LANGameInfo * LookupGameByListOffset( Int offset );														///< return a pointer to a game we know about
-	virtual LANPlayer * LookupPlayer( UnsignedInt playerIP );													///< return a pointer to a player we know about
-	virtual Bool SetLocalIP( UnsignedInt localIP );																		///< For multiple NIC machines
-	virtual void SetLocalIP( AsciiString localIP );																		///< For multiple NIC machines
-	virtual Bool AmIHost( void );																											///< Am I hosting a game?
-	virtual inline UnicodeString GetMyName( void ) { return m_name; }                 ///< What's my name?
-	virtual inline LANGameInfo* GetMyGame( void ) { return m_currentGame; }					      ///< What's my Game?
-	virtual inline UnsignedInt GetLocalIP( void ) { return m_localIP; }								///< What's my IP?
-	virtual void fillInLANMessage( LANMessage *msg );																	///< Fill in default params
-	virtual void checkMOTD( void );
-protected:
-
-	enum PendingActionType
-	{
-		ACT_NONE = 0,
-		ACT_JOIN,
-		ACT_JOINDIRECTCONNECT,
-		ACT_LEAVE,
-		ACT_MAX
-	};
-
-	static const UnsignedInt s_resendDelta; // in ms
-
-protected:
-	LANPlayer *					m_lobbyPlayers;			///< List of players in the lobby
-	LANGameInfo *				m_games;								///< List of games
-	UnicodeString				m_name;							///< Who do we think we are?
-	AsciiString					m_userName;						///< login name
-	AsciiString					m_hostName;						///< machine name
-	UnsignedInt					m_gameStartTime;
-	Int									m_gameStartSeconds;
-
-	PendingActionType		m_pendingAction;	///< What action are we performing?
-	UnsignedInt					m_expiration;						///< When should we give up on our action?
-	UnsignedInt					m_actionTimeout;
-	UnsignedInt					m_directConnectRemoteIP;///< The IP address of the game we are direct connecting to.
-
-	// Resend timer ---------------------------------------------------------------------------
-	UnsignedInt					m_lastResendTime; // in ms
-
-	Bool								m_isInLANMenu;		///< true while we are in a LAN menu (lobby, game options, direct connect)
-	Bool								m_inLobby;											///< Are we in the lobby (not in a game)?
-	LANGameInfo *				m_currentGame;							///< Pointer to game (setup screen) we are currently in (NULL for lobby)
-	//LANGameInfo *m_currentGameInfo;			///< Pointer to game setup info we are currently in.
-
-	UnsignedInt					m_localIP;
-	Transport*					m_transport;
-
-	UnsignedInt					m_broadcastAddr;
-
-	UnsignedInt					m_lastUpdate;
-	AsciiString					m_lastGameopt; /// @todo: hack for demo - remove this
-
-	Bool								m_isActive;			///< is the game currently active?
-
-protected:
-	void sendMessage(LANMessage *msg, UnsignedInt ip = 0); // Convenience function
-	void removePlayer(LANPlayer *player);
-	void removeGame(LANGameInfo *game);
-	void addPlayer(LANPlayer *player);
-	void addGame(LANGameInfo *game);
-	AsciiString createSlotString( void );
-
-	// Functions to handle incoming messages -----------------------------------
-	void handleRequestLocations( LANMessage *msg, UnsignedInt senderIP );
-	void handleGameAnnounce( LANMessage *msg, UnsignedInt senderIP );
-	void handleLobbyAnnounce( LANMessage *msg, UnsignedInt senderIP );
-	void handleRequestGameInfo( LANMessage *msg, UnsignedInt senderIP );
-	void handleRequestJoin( LANMessage *msg, UnsignedInt senderIP );
-	void handleJoinAccept( LANMessage *msg, UnsignedInt senderIP );
-	void handleJoinDeny( LANMessage *msg, UnsignedInt senderIP );
-	void handleRequestGameLeave( LANMessage *msg, UnsignedInt senderIP );
-	void handleRequestLobbyLeave( LANMessage *msg, UnsignedInt senderIP );
-	void handleSetAccept( LANMessage *msg, UnsignedInt senderIP );
-	void handleHasMap( LANMessage *msg, UnsignedInt senderIP );
-	void handleChat( LANMessage *msg, UnsignedInt senderIP );
-	void handleGameStart( LANMessage *msg, UnsignedInt senderIP );
-	void handleGameStartTimer( LANMessage *msg, UnsignedInt senderIP );
-	void handleGameOptions( LANMessage *msg, UnsignedInt senderIP );
-	void handleInActive( LANMessage *msg, UnsignedInt senderIP );
-
-};
-
-
-
-/**
- * LAN message class
- */
-#pragma pack(push, 1)
-struct LANMessage
-{
-	enum											///< What kind of message are we?
-	{
-		// Locating everybody
-		MSG_REQUEST_LOCATIONS,	///< Hey, where is everybody?
-		MSG_GAME_ANNOUNCE,			///< Here I am, and here's my game info!
-		MSG_LOBBY_ANNOUNCE,			///< Hey, I'm in the lobby!
-
-		// Joining games
-		MSG_REQUEST_JOIN,				///< Let me in!  Let me in!
-		MSG_JOIN_ACCEPT,				///< Okay, you can join.
-		MSG_JOIN_DENY,					///< Go away!  We don't want any!
-
-		// Leaving games
-		MSG_REQUEST_GAME_LEAVE,	///< I want to leave the game
-		MSG_REQUEST_LOBBY_LEAVE,///< I'm leaving the lobby
-
-		// Game options, chat, etc
-		MSG_SET_ACCEPT,					///< I'm cool with everything as is.
-		MSG_MAP_AVAILABILITY,		///< I do (not) have the map.
-		MSG_CHAT,								///< Just spouting my mouth off.
-		MSG_GAME_START,					///< Hold on; we're starting!
-		MSG_GAME_START_TIMER,		///< The game will start in N seconds
-		MSG_GAME_OPTIONS,				///< Here's some info about the game.
-		MSG_INACTIVE,						///< I've alt-tabbed out.  Unaccept me cause I'm a poo-flinging monkey.
-
-		MSG_REQUEST_GAME_INFO,	///< For direct connect, get the game info from a specific IP Address
-
-		MSG_MAX
-	} LANMessageType;
-
-	WideChar name[g_lanPlayerNameLength+1]; ///< My name, for convenience
-	char userName[g_lanLoginNameLength+1];	///< login name, for convenience
-	char hostName[g_lanHostNameLength+1];		///< machine name, for convenience
-
-	// No additional data is required for REQUEST_LOCATIONS, LOBBY_ANNOUNCE,
-	// REQUEST_LOBBY_LEAVE, GAME_START.
-	union
-	{
-		// StartTimer is sent with GAME_START_TIMER
-		struct
-		{
-			Int seconds;
-		} StartTimer;
-
-		// GameJoined is sent with REQUEST_GAME_LEAVE
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-		} GameToLeave;
-
-		// GameInfo if sent with GAME_ANNOUNCE
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-			Bool inProgress;
-			char options[m_lanMaxOptionsLength+1];
-			Bool isDirectConnect;
-		} GameInfo;
-
-		// PlayerInfo is sent with REQUEST_GAME_INFO for direct connect games.
-		struct
-		{
-			UnsignedInt ip;
-			WideChar playerName[g_lanPlayerNameLength+1];
-		} PlayerInfo;
-
-		// GameToJoin is sent with REQUEST_JOIN
-		struct
-		{
-			UnsignedInt gameIP;
-			UnsignedInt exeCRC;
-			UnsignedInt iniCRC;
-			char serial[g_maxSerialLength];
-		} GameToJoin;
-
-		// GameJoined is sent with JOIN_ACCEPT
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-			UnsignedInt gameIP;
-			UnsignedInt playerIP;
-			Int slotPosition;
-		} GameJoined;
-
-		// GameNotJoined is sent with JOIN_DENY
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-			UnsignedInt gameIP;
-			UnsignedInt playerIP;
-			LANAPIInterface::ReturnType reason;
-		} GameNotJoined;
-
-		// Accept is sent with SET_ACCEPT
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-			Bool isAccepted;
-		} Accept;
-
-		// Accept is sent with MAP_AVAILABILITY
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-			UnsignedInt mapCRC;	// to make sure we're talking about the same map
-			Bool hasMap;
-		} MapStatus;
-
-		// Chat is sent with CHAT
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-			LANAPIInterface::ChatType chatType;
-			WideChar message[g_lanMaxChatLength+1];
-		} Chat;
-
-		// GameOptions is sent with GAME_OPTIONS
-		struct
-		{
-			char options[m_lanMaxOptionsLength+1];
-		} GameOptions;
-
-	};
-};
-#pragma pack(pop)
-
-
-#endif // _LANAPI_H_
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h b/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h
deleted file mode 100644
index 837003ca2ad..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: LANAPICallbacks.h
-// Author: Chris Huybregts, October 2001
-// Description: LAN API Callbacks header
-///////////////////////////////////////////////////////////////////////////////////////
-#pragma once
-
-#ifndef _LANAPI_CALLBACKS_H_
-#define _LANAPI_CALLBACKS_H_
-
-#include "Common/NameKeyGenerator.h"
-#include "GameClient/Shell.h"
-#include "GameClient/GadgetListBox.h"
-#include "GameClient/GadgetTextEntry.h"
-#include "GameNetwork/LANAPI.h"
-
-
-// LAN API Singleton ----------------------------------------------------------------------
-extern LANAPI *TheLAN;
-
-//external declarations of the Gadgets the callbacks can use
-// LanLobby
-extern NameKeyType listboxChatWindowID;
-extern GameWindow *listboxChatWindow;
-extern GameWindow *listboxPlayers;
-extern NameKeyType listboxGamesID;
-extern GameWindow *listboxGames;
-//LanGame Options screen
-extern NameKeyType listboxChatWindowLanGameID;
-extern GameWindow *listboxChatWindowLanGame;
-extern WindowLayout *mapSelectLayout;
-// ScoreScreen
-extern NameKeyType listboxChatWindowScoreScreenID;
-extern GameWindow *listboxChatWindowScoreScreen;
-
-
-//Colors used for the chat dialogs
-extern const Color playerColor;
-extern const Color gameColor;
-extern const Color gameInProgressColor;
-extern const Color chatNormalColor;
-extern const Color chatActionColor;
-extern const Color chatLocalNormalColor;
-extern const Color chatLocalActionColor;
-extern const Color chatSystemColor;
-extern const Color chatSystemColor;
-extern const Color acceptTrueColor;
-extern const Color acceptFalseColor;
-
-
-void lanUpdateSlotList( void );
-void updateGameOptions( void );
-
-
-//Enum is used for the utility function so other windows do not need
-//to know about controls on LanGameOptions window.
-enum PostToLanGameType CPP_11(: Int){ SEND_GAME_OPTS = 0,
-												MAP_BACK,
-												POST_TO_LAN_GAME_TYPE_COUNT };
-//the utility function mentioned above
-void PostToLanGameOptions(PostToLanGameType post);
-
-												
-
-#endif //_LANAPI_CALLBACKS_H_
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h b/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h
deleted file mode 100644
index 1ea0026c2c3..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: LANGameInfo.h //////////////////////////////////////////////////////
-// Generals LAN game setup information
-// Author: Matthew D. Campbell, December 2001
-
-#pragma once
-
-#ifndef __LANGAMEINFO_H__
-#define __LANGAMEINFO_H__
-
-#include "GameNetwork/GameInfo.h"
-#include "GameNetwork/LANPlayer.h"
-
-class GameWindow;
-
-/**
-  * LANGameSlot class - maintains information about the contents of a
-	* game slot.  This persists throughout the game.
-	*/
-class LANGameSlot : public GameSlot
-{
-public:
-	LANGameSlot();
-
-	LANPlayer *getUser( void );																	///< Get the User structure associated with the slot (NULL for non-humans)
-
-	// Various tests
-	Bool isUser( LANPlayer *user );															///< Does this slot contain the given user?  Based off user->name
-	Bool isUser( UnicodeString userName );									///< Does this slot contain the given user?
-	Bool isLocalPlayer( void ) const;															///< Is this slot me?
-	inline void setLogin( UnicodeString name ) { m_user.setLogin(name); }
-	inline void setLogin( AsciiString name ) { m_user.setLogin(name); }
-	inline void setHost( UnicodeString name ) { m_user.setHost(name); }
-	inline void setHost( AsciiString name ) { m_user.setHost(name); }
-	inline void setSerial( AsciiString serial ) { m_serial = serial; }
-	inline AsciiString getSerial( void ) { return m_serial; }
-
-	inline void setLastHeard( UnsignedInt t ) { m_lastHeard = t; }
-	inline UnsignedInt getLastHeard( void ) { return m_lastHeard; }
-
-	//LANGameSlot& operator=(const LANGameSlot& src);
-
-private:
-
-	LANPlayer m_user;	///< filled in for each getUser() call
-	AsciiString m_serial;
-
-	UnsignedInt m_lastHeard;
-};
-
-/**
-  * LANGameInfo class - maintains information about the LAN game and
-	* the contents of its slot list hroughout the game.
-	*/
-class LANGameInfo : public GameInfo
-{
-private:
-	LANGameSlot m_LANSlot[MAX_SLOTS];											///< The Lan Games Slot List
-
-public:
-	LANGameInfo();
-	void setSlot( Int slotNum, LANGameSlot slotInfo );	///< Set the slot state (human, open, AI, etc)
-	LANGameSlot* getLANSlot( Int slotNum );							///< Get the slot
-	const LANGameSlot* getConstLANSlot( Int slotNum ) const;							///< Get the slot
-	virtual Int getLocalSlotNum( void ) const;												///< Get the local slot number, or -1 if we're not present
-	Int getSlotNum( UnicodeString userName );						///< Get the slot number corresponding to a specific user, or -1 if he's not present
-	
-	inline UnsignedInt getLastHeard( void ) { return m_lastHeard; }
-	inline void setLastHeard( UnsignedInt lastHeard ) { m_lastHeard = lastHeard; }
-	inline LANGameInfo *getNext( void ) { return m_next; }
-	inline void setNext( LANGameInfo *next ) { m_next = next; }
-	
-	// Game options
-	void setMap( AsciiString mapName );									///< Set the map to play on
-	void setSeed( Int seed );														///< Set the random seed for the game
-	
-	inline void setName( UnicodeString name ) { m_gameName = name; }		///< Set the Name of the Game
-	inline UnicodeString getName( void ) { return m_gameName; }					///< Get the Name of the Game
-
-	// Convinience functions that interface with the LANPlayer held in the slot list	
-	virtual void resetAccepted(void);														///< Reset the accepted flag on all players
-	Bool amIHost( void );																///< Convenience function - is the local player the game host?
-
-	/// Get the IP of selected player or return 0
-	inline UnsignedInt getIP( int who ) 
-	{
-		return m_LANSlot[who].getIP();
-	}
-	
-	/// Set the IP of the Selected Player
-	inline void setIP( int who, UnsignedInt IP )
-	{
-		m_LANSlot[who].setIP(IP); 
-	}
-
-	/// set whether or not this is a direct connect game or not.
-	inline void setIsDirectConnect(Bool isDirectConnect)
-	{
-		m_isDirectConnect = isDirectConnect;
-	}
-
-	/// returns whether or not this is a direct connect game or not.
-	inline Bool getIsDirectConnect()
-	{
-		return m_isDirectConnect;
-	}
-	
-	/// Set the Player Name
-	inline void setPlayerName( int who, UnicodeString name )
-	{
-		m_LANSlot[who].setName(name); 
-	}
-
-	/// Return the Player name or TheEmptyString
-	inline UnicodeString getPlayerName(int who)
-	{
-		return m_LANSlot[who].getName(); 
-	} 
-	
-	/// Return the time the player was heard from last, or 0
-	inline UnsignedInt getPlayerLastHeard( int who )
-	{
-		if (m_LANSlot[who].isHuman())
-			return m_LANSlot[who].getLastHeard();
-		return 0;
-	}
-
-	/// Set the last time we heard from the player
-	inline void setPlayerLastHeard( int who, UnsignedInt lastHeard ) 	
-	{
-		DEBUG_LOG(("LANGameInfo::setPlayerLastHeard - changing player %d last heard from %d to %d\n", who, getPlayerLastHeard(who), lastHeard));
-		if (m_LANSlot[who].isHuman())
-			m_LANSlot[who].setLastHeard(lastHeard);
-	}
-
-	/// Return the hosts IP or 0
-	UnsignedInt getHostIP(void)
-	{ 
-		if (m_LANSlot[0].isHuman())
-			return m_LANSlot[0].getIP();
-		return 0;
-	}
-
-	
-private:
-	LANGameInfo *m_next;																///< Pointer for linked list
-	UnsignedInt m_lastHeard;														///< The last time we heard from this game (for timeout purposes)
-	UnicodeString m_gameName;														///< Game name.  @todo: are game names based off of host player names?
-	Bool m_isDirectConnect;															///< Is this game a direct connect game, or a LAN game?
-};
-
-void LANDisplayGameList( GameWindow *gameListbox, LANGameInfo *gameList );	///< Displays the list of games in a listbox, preserving selections
-void LANEnableStartButton(Bool enabled);
-
-void LANDisplaySlotList( void );		///< Displays the slot list according to TheLANGameInfo
-void LANDisplayGameOptions( void );	///< Displays the game options according to TheLANGameInfo
-
-AsciiString GenerateGameOptionsString( void );
-Bool ParseGameOptionsString(LANGameInfo *game, AsciiString options);
-
-
-#endif // __LANGAMEINFO_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/LANPlayer.h b/Generals/Code/GameEngine/Include/GameNetwork/LANPlayer.h
deleted file mode 100644
index f59c73bb12e..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/LANPlayer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// LANPlayer.h ///////////////////////////////////////////////////////////////
-// LAN Player Class used for both the LANAPI and LANGameInfo
-// Author: Matthew D. Campbell, October 2001 (Pulled out of LANAPI.h by CLH on 12/21/01
-
-#pragma once
-
-#ifndef _LANPLAYER_H_
-#define _LANPLAYER_H_
-
-
-/**
- * LAN player class.  This is for players sitting in the lobby.  Players are
- * uniquely identified by their IP addresses.
- */
-class LANPlayer
-{
-public:
-	LANPlayer() { m_name = m_login = m_host = L""; m_lastHeard = 0; m_next = NULL; m_IP = 0; }
-
-	// Access functions
-	inline UnicodeString getName( void ) { return m_name; }
-	inline void setName( UnicodeString name ) { m_name = name; }
-	inline UnicodeString getLogin( void ) { return m_login; }
-	inline void setLogin( UnicodeString name ) { m_login = name; }
-	inline void setLogin( AsciiString name ) { m_login.translate(name); }
-	inline UnicodeString getHost( void ) { return m_host; }
-	inline void setHost( UnicodeString name ) { m_host = name; }
-	inline void setHost( AsciiString name ) { m_host.translate(name); }
-	inline UnsignedInt getLastHeard( void ) { return m_lastHeard; }
-	inline void setLastHeard( UnsignedInt lastHeard ) { m_lastHeard = lastHeard; }
-	inline LANPlayer *getNext( void ) { return m_next; }
-	inline void setNext( LANPlayer *next ) { m_next = next; }
-	inline UnsignedInt getIP( void ) { return m_IP; }
-	inline void setIP( UnsignedInt IP ) { m_IP = IP; }
-	
-protected:
-	UnicodeString m_name;			///< Player name
-	UnicodeString m_login;		///< login name
-	UnicodeString m_host;			///< machine name
-	UnsignedInt m_lastHeard;	///< The last time we heard from this player (for timeout purposes)
-	LANPlayer *m_next;				///< Linked list pointer
-	UnsignedInt m_IP;					///< Player's IP
-};
-
-#endif //_LANPLAYER_H_
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NAT.h b/Generals/Code/GameEngine/Include/GameNetwork/NAT.h
deleted file mode 100644
index c79421bf104..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/NAT.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: NAT.h /////////////////////////////////////////////////////////////////////////////////
-// Author: Bryan Cleveland April 2002
-// Desc:   Resolves NAT'd IPs and port numbers for the other players in a game.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __NAT_H
-#define __NAT_H
-
-#include "Lib/BaseType.h"
-#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/FirewallHelper.h"
-
-class Transport;
-class GameSlot;
-
-enum NATStateType CPP_11(: Int) {
-	NATSTATE_IDLE,
-	NATSTATE_DOCONNECTIONPATHS,
-	NATSTATE_WAITFORSTATS,
-	NATSTATE_DONE,
-	NATSTATE_FAILED
-};
-
-enum NATConnectionState CPP_11(: Int) {
-	NATCONNECTIONSTATE_NOSTATE,
-	NATCONNECTIONSTATE_WAITINGTOBEGIN,
-//	NATCONNECTIONSTATE_NETGEARDELAY,
-	NATCONNECTIONSTATE_WAITINGFORMANGLERRESPONSE,
-	NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT,
-	NATCONNECTIONSTATE_WAITINGFORRESPONSE,
-	NATCONNECTIONSTATE_DONE,
-	NATCONNECTIONSTATE_FAILED
-};
-
-struct ConnectionNodeType {
-	FirewallHelperClass::tFirewallBehaviorType m_behavior;	///< the NAT/Firewall behavior of this node.
-	UnsignedInt m_slotIndex; ///< the player list index of this node.
-};
-
-class NAT {
-public:
-	NAT();
-	virtual ~NAT();
-
-	NATStateType update();
-
-	void attachSlotList(GameSlot **slotList, Int localSlot, UnsignedInt localIP);
-	void establishConnectionPaths();
-
-	Int getSlotPort(Int slot);
-	Transport * getTransport();	///< return the newly created Transport layer that has all the connections and whatnot.
-
-	// Notification messages from GameSpy
-	void processGlobalMessage(Int slotNum, const char *options);
-
-protected:
-	NATConnectionState connectionUpdate(); ///< the update function for the connections.
-	void sendMangledSourcePort(); ///< starts the process to get the next mangled source port.
-	void processManglerResponse(UnsignedShort mangledPort);
-
-	Bool allConnectionsDoneThisRound();
-	Bool allConnectionsDone();
-
-	void generatePortNumbers(GameSlot **slotList, Int localSlot); ///< generate all of the slots' port numbers to be used.
-
-	void doThisConnectionRound();	///< compute who will connect with who for this round.
-	void setConnectionState(Int nodeNumber, NATConnectionState state); ///< central point for changing a connection's state.
-	void sendAProbe(UnsignedInt ip, UnsignedShort port, Int fromNode);	///< send a "PROBE" packet to this IP and port.
-	void notifyTargetOfProbe(GameSlot *targetSlot);
-	void notifyUsersOfConnectionDone(Int nodeIndex);
-	void notifyUsersOfConnectionFailed(Int nodeIndex);
-	void sendMangledPortNumberToTarget(UnsignedShort mangledPort, GameSlot *targetSlot);
-
-	void probed(Int nodeNumber);
-	void gotMangledPort(Int nodeNumber, UnsignedShort mangledPort);
-	void gotInternalAddress(Int nodeNumber, UnsignedInt address);
-	void connectionComplete(Int slotIndex);
-	void connectionFailed(Int slotIndex);
-
-	Transport *m_transport;
-	GameSlot **m_slotList;
-	NATStateType m_NATState;
-	Int m_localNodeNumber;	///< The node number of the local player.
-	Int m_targetNodeNumber;	///< The node number of the player we are connecting to this round.
-	UnsignedInt m_localIP;	///< The IP of the local computer.
-	UnsignedInt m_numNodes;	///< The number of players we have to connect together.
-	UnsignedInt m_connectionRound; ///< The "round" of connections we are currently on.
-
-	Int m_numRetries;
-	Int m_maxNumRetriesAllowed;
-
-	UnsignedShort m_packetID;
-	UnsignedShort m_spareSocketPort;
-	time_t m_manglerRetryTime;
-	Int m_manglerRetries;
-	UnsignedShort m_previousSourcePort;
-
-	Bool m_beenProbed; ///< have I been notified that I've been probed this round?
-	
-	UnsignedInt m_manglerAddress;
-
-	time_t m_timeTillNextSend; ///< The number of milliseconds till we send to the other guy's port again.
-	NATConnectionState m_connectionStates[MAX_SLOTS]; ///< connection states for this round for all the nodes.
-
-	ConnectionNodeType m_connectionNodes[MAX_SLOTS]; ///< info regarding the nodes that are being connected.
-
-	UnsignedShort m_sourcePorts[MAX_SLOTS]; ///< the source ports that the other players communicate to us on.
-
-	Bool m_myConnections[MAX_SLOTS]; ///< keeps track of all the nodes I've connected to. For keepalive.
-	time_t m_nextKeepaliveTime; ///< the next time we will send out our keepalive packets.
-
-	static Int m_connectionPairs[MAX_SLOTS-1][MAX_SLOTS-1][MAX_SLOTS];
-	Int m_connectionPairIndex;
-
-	UnsignedShort m_startingPortNumber; ///< the starting port number for this game. The slots all get port numbers with their port numbers based on this number.
-																			///< this is done so that games that are played right after each other with the same players in the same
-																			///< slot order will not use the old source port allocation scheme in case their NAT
-																			///< hasn't timed out that connection.
-
-	time_t m_nextPortSendTime; ///< Last time we sent our mangled port number to our target this round.
-
-	time_t m_timeoutTime; ///< the time at which we will time out waiting for the other player's port number.
-	time_t m_roundTimeout;	///< the time at which we will time out this connection round.
-
- static Int m_timeBetweenRetries; // 1 second between retries sounds good to me.
- static time_t m_manglerRetryTimeInterval; // sounds good to me.
- static Int m_maxAllowedManglerRetries; // works for me.
- static time_t m_keepaliveInterval; // 15 seconds between keepalive packets seems good.
- static time_t m_timeToWaitForPort; // wait for ten seconds for the other player's port number.
- static time_t m_timeForRoundTimeout; // wait for at most ten seconds for each connection round to finish.
-
-};
-
-extern NAT *TheNAT;
-
-#endif // #ifndef __NAT_H
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h
deleted file mode 100644
index 0ae1f2be1b5..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __NETCOMMANDLIST_H
-#define __NETCOMMANDLIST_H
-
-#include "Common/GameMemory.h"
-#include "GameNetwork/NetCommandRef.h"
-
-/**
- * The NetCommandList is a ordered linked list of NetCommandRef objects.
- * The list is ordered based on the command id, player id, and command type.
- * It is ordered in this way to aid in constructing the packets efficiently.
- * The list keeps track of the last message inserted in order to accommodate
- * adding commands in order more efficiently since that is whats going to be
- * done most of the time.  If the new message doesn't go after the last message
- * inserted, then the list will be traversed linearly until the proper spot is
- * found.  We can get away with this inefficient method since these occurances
- * will be rare.  Also, the list is not expected to ever have more than 30 or so
- * commands on it at a time.  Five commands would probably be a normal amount.
- */
-
-class NetCommandList : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandList, "NetCommandList")		
-public:
-	NetCommandList();
-	//virtual ~NetCommandList();
-
-	void init();									///< Initialize the list
-	void reset();									///< Reset the list to the initial state.
-	NetCommandRef * addMessage(NetCommandMsg *cmdMsg);	///< Add message to the list in its properly ordered place.
-	Bool isEqualCommandMsg(NetCommandMsg *msg1, NetCommandMsg *msg2);
-	NetCommandRef * getFirstMessage();				///< Get the first message on the list.
-	NetCommandRef * findMessage(NetCommandMsg *msg);	///< Find and return a reference to the given message if one exists.
-	NetCommandRef * findMessage(UnsignedShort commandID, UnsignedByte playerID);	///< Find and return a reference to the
-																								///< message given the player id and the command id.
-																								///< This will only check against messages of types that require
-																								///< a command id.
-	void removeMessage(NetCommandRef *msg);			///< Remove the given message from the list.
-	void appendList(NetCommandList *list);			///< Append the given list to the end of this list.
-	Int length();									///< Returns the number of nodes in this list.  This is inefficient and is meant to be a debug tool.
-
-protected:
-	NetCommandRef *m_first;							///< Head of the list.
-	NetCommandRef *m_last;							///< Tail of the list.
-	NetCommandRef *m_lastMessageInserted;			///< The last message that was inserted to this list.
-};
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h
deleted file mode 100644
index 9611aa76a68..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h
+++ /dev/null
@@ -1,526 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//------------------------------------------------------------------------------------
-// The CommandMsg class is a linked-list wrapper around GameMessage objects that
-// are queued up to execute at a later time
-
-#pragma once
-
-#ifndef __NETCOMMANDMSG_H
-#define __NETCOMMANDMSG_H
-
-#include "Lib/BaseType.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "Common/UnicodeString.h"
-
-//-----------------------------------------------------------------------------
-class NetCommandMsg : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandMsg, "NetCommandMsg")		
-public:
-	NetCommandMsg();
-	//virtual ~NetCommandMsg();
-	inline UnsignedInt GetTimestamp() { return m_timestamp; }
-	inline void SetTimestamp(UnsignedInt timestamp) { m_timestamp = timestamp; }
-	inline void setExecutionFrame(UnsignedInt frame) { m_executionFrame = frame; }
-	inline void setPlayerID(UnsignedInt playerID) { m_playerID = playerID; }
-	inline void setID(UnsignedShort id) { m_id = id; }
-	inline UnsignedInt getExecutionFrame() { return m_executionFrame; }
-	inline UnsignedInt getPlayerID() { return m_playerID; }
-	inline UnsignedShort getID() { return m_id; }
-	inline void setNetCommandType(NetCommandType type) { m_commandType = type; }
-	inline NetCommandType getNetCommandType() { return m_commandType; }
-	virtual Int getSortNumber();
-	void attach();
-	void detach();
-
-	// For debugging purposes
-	virtual AsciiString getContentsAsAsciiString(void) { return AsciiString::TheEmptyString; }
-
-protected:
-	UnsignedInt m_timestamp;
-	UnsignedInt m_executionFrame;
-	UnsignedInt m_playerID;
-	UnsignedShort m_id;
-
-	NetCommandType m_commandType;
-	Int m_referenceCount;
-};
-
-
-//-----------------------------------------------------------------------------
-/**
- * The NetGameCommandMsg is the NetCommandMsg representation of a GameMessage
- */
-class NetGameCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetGameCommandMsg, "NetGameCommandMsg")		
-public:
-	NetGameCommandMsg();
-	NetGameCommandMsg(GameMessage *msg);
-	//virtual ~NetGameCommandMsg();
-
-	GameMessage *constructGameMessage();
-	void addArgument(const GameMessageArgumentDataType type, GameMessageArgumentType arg);
-	void setGameMessageType(GameMessage::Type type);
-
-	// For debugging purposes
-	virtual AsciiString getContentsAsAsciiString(void);
-
-protected:
-	Int m_numArgs;
-	Int m_argSize;
-	GameMessage::Type m_type;
-	GameMessageArgument *m_argList, *m_argTail;
-};
-
-//-----------------------------------------------------------------------------
-/**
- * The NetAckBothCommandMsg is the NetCommandMsg representation of the combination of a
- * stage 1 ack and a stage 2 ack.
- */
-class NetAckBothCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetAckBothCommandMsg, "NetAckBothCommandMsg")		
-public:
-	NetAckBothCommandMsg(NetCommandMsg *msg);
-	NetAckBothCommandMsg();
-	//virtual ~NetAckBothCommandMsg();
-
-	UnsignedShort getCommandID();
-	void setCommandID(UnsignedShort commandID);
-	UnsignedByte getOriginalPlayerID();
-	void setOriginalPlayerID(UnsignedByte originalPlayerID);
-	virtual Int getSortNumber();
-
-protected:
-	UnsignedShort m_commandID;
-	UnsignedByte m_originalPlayerID;
-};
-
-//-----------------------------------------------------------------------------
-/**
- * The NetAckStage1CommandMsg is the NetCommandMsg representation of an ack message for the initial
- * recipient.
- */
-class NetAckStage1CommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetAckStage1CommandMsg, "NetAckStage1CommandMsg")		
-public:
-	NetAckStage1CommandMsg(NetCommandMsg *msg);
-	NetAckStage1CommandMsg();
-	//virtual ~NetAckStage1CommandMsg();
-
-	UnsignedShort getCommandID();
-	void setCommandID(UnsignedShort commandID);
-	UnsignedByte getOriginalPlayerID();
-	void setOriginalPlayerID(UnsignedByte originalPlayerID);
-	virtual Int getSortNumber();
-
-protected:
-	UnsignedShort m_commandID;
-	UnsignedByte m_originalPlayerID;
-};
-
-//-----------------------------------------------------------------------------
-/**
- * The NetAckStage2CommandMsg is the NetCommandMsg representation of an ack message for all eventual
- * recipients. (when this is returned, all the players in the relay mask have received the packet)
- */
-class NetAckStage2CommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetAckStage2CommandMsg, "NetAckStage2CommandMsg")		
-public:
-	NetAckStage2CommandMsg(NetCommandMsg *msg);
-	NetAckStage2CommandMsg();
-	//virtual ~NetAckStage2CommandMsg();
-
-	UnsignedShort getCommandID();
-	void setCommandID(UnsignedShort commandID);
-	UnsignedByte getOriginalPlayerID();
-	void setOriginalPlayerID(UnsignedByte originalPlayerID);
-	virtual Int getSortNumber();
-
-protected:
-	UnsignedShort m_commandID;
-	UnsignedByte m_originalPlayerID;
-};
-
-//-----------------------------------------------------------------------------
-class NetFrameCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFrameCommandMsg, "NetFrameCommandMsg")		
-public:
-	NetFrameCommandMsg();
-	//virtual ~NetFrameCommandMsg();
-
-	void setCommandCount(UnsignedShort commandCount);
-	UnsignedShort getCommandCount();
-
-protected:
-	UnsignedShort m_commandCount;
-};
-
-//-----------------------------------------------------------------------------
-class NetPlayerLeaveCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetPlayerLeaveCommandMsg, "NetPlayerLeaveCommandMsg")		
-public:
-	NetPlayerLeaveCommandMsg();
-	//virtual ~NetPlayerLeaveCommandMsg();
-
-	UnsignedByte getLeavingPlayerID();
-	void setLeavingPlayerID(UnsignedByte id);
-
-protected:
-	UnsignedByte m_leavingPlayerID;
-};
-
-//-----------------------------------------------------------------------------
-class NetRunAheadMetricsCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetRunAheadMetricsCommandMsg, "NetRunAheadMetricsCommandMsg")		
-public:
-	NetRunAheadMetricsCommandMsg();
-	//virtual ~NetRunAheadMetricsCommandMsg();
-
-	Real getAverageLatency();
-	void setAverageLatency(Real avgLat);
-	Int  getAverageFps();
-	void setAverageFps(Int fps);
-
-protected:
-	Real m_averageLatency;
-	Int  m_averageFps;
-};
-
-//-----------------------------------------------------------------------------
-class NetRunAheadCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetRunAheadCommandMsg, "NetRunAheadCommandMsg")		
-public:
-	NetRunAheadCommandMsg();
-	//virtual ~NetRunAheadCommandMsg();
-
-	UnsignedShort getRunAhead();
-	void setRunAhead(UnsignedShort runAhead);
-
-	UnsignedByte getFrameRate();
-	void setFrameRate(UnsignedByte frameRate);
-
-protected:
-	UnsignedShort m_runAhead;
-	UnsignedByte m_frameRate;
-};
-
-//-----------------------------------------------------------------------------
-class NetDestroyPlayerCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDestroyPlayerCommandMsg, "NetDestroyPlayerCommandMsg")		
-public:
-	NetDestroyPlayerCommandMsg();
-	//virtual ~NetDestroyPlayerCommandMsg();
-
-	UnsignedInt getPlayerIndex();
-	void setPlayerIndex(UnsignedInt playerIndex);
-
-protected:
-	UnsignedInt m_playerIndex;
-};
-
-//-----------------------------------------------------------------------------
-class NetKeepAliveCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetKeepAliveCommandMsg, "NetKeepAliveCommandMsg")		
-public:
-	NetKeepAliveCommandMsg();
-	//virtual ~NetKeepAliveCommandMsg();
-};
-
-//-----------------------------------------------------------------------------
-class NetDisconnectKeepAliveCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectKeepAliveCommandMsg, "NetDisconnectKeepAliveCommandMsg")		
-public:
-	NetDisconnectKeepAliveCommandMsg();
-	//virtual ~NetDisconnectKeepAliveCommandMsg();
-};
-
-//-----------------------------------------------------------------------------
-class NetDisconnectPlayerCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectPlayerCommandMsg, "NetDisconnectPlayerCommandMsg")		
-public:
-	NetDisconnectPlayerCommandMsg();
-	//virtual ~NetDisconnectPlayerCommandMsg();
-
-	UnsignedByte getDisconnectSlot();
-	void setDisconnectSlot(UnsignedByte slot);
-
-	UnsignedInt getDisconnectFrame();
-	void setDisconnectFrame(UnsignedInt frame);
-
-protected:
-	UnsignedByte m_disconnectSlot;
-	UnsignedInt m_disconnectFrame;
-};
-
-//-----------------------------------------------------------------------------
-class NetPacketRouterQueryCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetPacketRouterQueryCommandMsg, "NetPacketRouterQueryCommandMsg")		
-public:
-	NetPacketRouterQueryCommandMsg();
-	//virtual ~NetPacketRouterQueryCommandMsg();
-};
-
-//-----------------------------------------------------------------------------
-class NetPacketRouterAckCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetPacketRouterAckCommandMsg, "NetPacketRouterAckCommandMsg")		
-public:
-	NetPacketRouterAckCommandMsg();
-	//virtual ~NetPacketRouterAckCommandMsg();
-};
-
-//-----------------------------------------------------------------------------
-class NetDisconnectChatCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectChatCommandMsg, "NetDisconnectChatCommandMsg")		
-public:
-	NetDisconnectChatCommandMsg();
-	//virtual ~NetDisconnectChatCommandMsg();
-
-	UnicodeString getText();
-	void setText(UnicodeString text);
-
-protected:
-	UnicodeString m_text;
-};
-
-//-----------------------------------------------------------------------------
-class NetChatCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetChatCommandMsg, "NetChatCommandMsg")		
-public:
-	NetChatCommandMsg();
-	//virtual ~NetChatCommandMsg();
-
-	UnicodeString getText();
-	void setText(UnicodeString text);
-
-	Int getPlayerMask( void );
-	void setPlayerMask( Int playerMask );
-
-protected:
-	UnicodeString m_text;
-	Int m_playerMask;
-};
-
-//-----------------------------------------------------------------------------
-class NetDisconnectVoteCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectVoteCommandMsg, "NetDisconnectVoteCommandMsg")		
-public:
-	NetDisconnectVoteCommandMsg();
-	//virtual ~NetDisconnectVoteCommandMsg();
-
-	UnsignedByte getSlot();
-	void setSlot(UnsignedByte slot);
-
-	UnsignedInt getVoteFrame();
-	void setVoteFrame(UnsignedInt voteFrame);
-
-protected:
-	UnsignedByte m_slot;
-	UnsignedInt m_voteFrame;
-};
-
-//-----------------------------------------------------------------------------
-class NetProgressCommandMsg: public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetProgressCommandMsg, "NetProgressCommandMsg")		
-public:
-	NetProgressCommandMsg( void );
-	//virtual ~NetProgressCommandMsg( void );
-		
-	UnsignedByte getPercentage();
-	void setPercentage( UnsignedByte percent );
-protected:
-	UnsignedByte m_percent;
-};
-
-//-----------------------------------------------------------------------------
-class NetWrapperCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetWrapperCommandMsg, "NetWrapperCommandMsg")		
-public:
-	NetWrapperCommandMsg( void );
-	//virtual ~NetWrapperCommandMsg();
-
-	UnsignedByte * getData();
-	void setData(UnsignedByte *data, UnsignedInt dataLength);
-	
-	UnsignedInt getChunkNumber();
-	void setChunkNumber(UnsignedInt chunkNumber);
-
-	UnsignedInt getNumChunks();
-	void setNumChunks(UnsignedInt numChunks);
-
-	UnsignedInt getDataLength();
-
-	UnsignedInt getTotalDataLength();
-	void setTotalDataLength(UnsignedInt totalDataLength);
-
-	UnsignedInt getDataOffset();
-	void setDataOffset(UnsignedInt offset);
-
-	UnsignedShort getWrappedCommandID();
-	void setWrappedCommandID(UnsignedShort wrappedCommandID);
-
-private:
-	UnsignedByte *m_data;
-	// using UnsignedInt's so we can send around files of effectively unlimited size easily
-	UnsignedInt m_dataLength;
-	UnsignedInt m_dataOffset;
-	UnsignedInt m_totalDataLength;
-	UnsignedInt m_chunkNumber;
-	UnsignedInt m_numChunks;
-	UnsignedShort m_wrappedCommandID;
-};
-
-//-----------------------------------------------------------------------------
-class NetFileCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFileCommandMsg, "NetFileCommandMsg")		
-public:
-	NetFileCommandMsg();
-	//virtual ~NetFileCommandMsg();
-
-	AsciiString getRealFilename();
-	void setRealFilename(AsciiString filename);
-
-	AsciiString getPortableFilename() { return m_portableFilename; }
-	void setPortableFilename(AsciiString filename) { m_portableFilename = filename; }
-
-	UnsignedInt getFileLength();
-
-	UnsignedByte * getFileData();
-	void setFileData(UnsignedByte *data, UnsignedInt dataLength);
-
-protected:
-	AsciiString m_portableFilename;
-
-	UnsignedByte *m_data;
-	UnsignedInt m_dataLength;
-};
-
-//-----------------------------------------------------------------------------
-class NetFileAnnounceCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFileAnnounceCommandMsg, "NetFileAnnounceCommandMsg")		
-public:
-	NetFileAnnounceCommandMsg();
-	//virtual ~NetFileAnnounceCommandMsg();
-
-	AsciiString getRealFilename();
-	void setRealFilename(AsciiString filename);
-
-	AsciiString getPortableFilename() { return m_portableFilename; }
-	void setPortableFilename(AsciiString filename) { m_portableFilename = filename; }
-
-	UnsignedShort getFileID();
-	void setFileID(UnsignedShort fileID);
-
-	UnsignedByte getPlayerMask(void);
-	void setPlayerMask(UnsignedByte playerMask);
-
-protected:
-	AsciiString m_portableFilename;
-	UnsignedShort m_fileID;
-	UnsignedByte m_playerMask;
-};
-
-//-----------------------------------------------------------------------------
-class NetFileProgressCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFileProgressCommandMsg, "NetFileProgressCommandMsg")		
-public:
-	NetFileProgressCommandMsg();
-	//virtual ~NetFileProgressCommandMsg();
-
-	UnsignedShort getFileID();
-	void setFileID(UnsignedShort val);
-
-	Int getProgress();
-	void setProgress(Int val);
-
-protected:
-	UnsignedShort m_fileID;
-	Int m_progress;
-};
-
-//-----------------------------------------------------------------------------
-class NetDisconnectFrameCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectFrameCommandMsg, "NetDisconnectFrameCommandMsg")
-public:
-	NetDisconnectFrameCommandMsg();
-
-	UnsignedInt getDisconnectFrame();
-	void setDisconnectFrame(UnsignedInt disconnectFrame);
-
-protected:
-	UnsignedInt m_disconnectFrame;
-};
-
-//-----------------------------------------------------------------------------
-class NetDisconnectScreenOffCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectScreenOffCommandMsg, "NetDisconnectScreenOffCommandMsg")
-public:
-	NetDisconnectScreenOffCommandMsg();
-
-	UnsignedInt getNewFrame();
-	void setNewFrame(UnsignedInt newFrame);
-
-protected:
-	UnsignedInt m_newFrame;
-};
-
-//-----------------------------------------------------------------------------
-class NetFrameResendRequestCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFrameResendRequestCommandMsg, "NetFrameResendRequestCommandMsg")
-public:
-	NetFrameResendRequestCommandMsg();
-	
-	UnsignedInt getFrameToResend();
-	void setFrameToResend(UnsignedInt frame);
-	
-protected:
-	UnsignedInt m_frameToResend;	
-};
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h
deleted file mode 100644
index 79d1ad12fb6..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __NETCOMMANDREF_H
-#define __NETCOMMANDREF_H
-
-#include "GameNetwork/NetCommandMsg.h"
-#include "Common/GameMemory.h"
-
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
-//	#define DEBUG_NETCOMMANDREF
-#endif
-
-#ifdef DEBUG_NETCOMMANDREF
-#define NEW_NETCOMMANDREF(msg) newInstance(NetCommandRef)(msg, __FILE__, __LINE__)
-#else
-#define NEW_NETCOMMANDREF(msg) newInstance(NetCommandRef)(msg)
-#endif
- 
-
-class NetCommandRef : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandRef, "NetCommandRef")		
-public:
-#ifdef DEBUG_NETCOMMANDREF
-	NetCommandRef(NetCommandMsg *msg, char *filename, int line);
-#else
-	NetCommandRef(NetCommandMsg *msg);
-#endif
-	//~NetCommandRef();
-
-	NetCommandMsg *getCommand();
-	NetCommandRef *getNext();
-	NetCommandRef *getPrev();
-	void setNext(NetCommandRef *next);
-	void setPrev(NetCommandRef *prev);
-
-	void setRelay(UnsignedByte relay);
-	UnsignedByte getRelay() const;
-
-	time_t getTimeLastSent() const;
-	void setTimeLastSent(time_t timeLastSent);
-
-protected:
-	NetCommandMsg *m_msg;
-	NetCommandRef *m_next;
-	NetCommandRef *m_prev;
-	UnsignedByte m_relay; ///< Need this in the command reference since the relay value will be different depending on where this particular reference is being sent.
-	time_t m_timeLastSent;
-
-#ifdef DEBUG_NETCOMMANDREF
-	UnsignedInt m_id;
-#endif
-};
-
-/**
- * Return the command message.
- */
-inline NetCommandMsg * NetCommandRef::getCommand() 
-{
-	return m_msg;
-}
-
-/**
- * Return the next command ref in the list.
- */
-inline NetCommandRef * NetCommandRef::getNext() 
-{
-	return m_next;
-}
-
-/**
- * Return the previous command ref in the list.
- */
-inline NetCommandRef * NetCommandRef::getPrev() 
-{
-	return m_prev;
-}
-
-/**
- * Set the next command ref in the list.
- */
-inline void NetCommandRef::setNext(NetCommandRef *next) 
-{
-	m_next = next;
-}
-
-/**
- * Set the previous command ref in the list.
- */
-inline void NetCommandRef::setPrev(NetCommandRef *prev) 
-{
-	m_prev = prev;
-}
-
-/**
- * Return the time for the last time this command was sent from this reference.
- */
-inline time_t NetCommandRef::getTimeLastSent() const
-{
-	return m_timeLastSent;
-}
-
-/**
- * Set the time for the last time this command was sent from this reference.
- */
-inline void NetCommandRef::setTimeLastSent(time_t timeLastSent) 
-{
-	m_timeLastSent = timeLastSent;
-}
-
-/**
- * Set the send relay for this reference of the command.
- */
-inline void NetCommandRef::setRelay(UnsignedByte relay) 
-{
-	m_relay = relay;
-}
-
-/**
- * Return the send relay for this refreence of the command.
- */
-inline UnsignedByte NetCommandRef::getRelay() const
-{
-	return m_relay;
-}
-
-#endif // #ifndef __NETCOMMANDREF_H
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h
deleted file mode 100644
index 5be4a13940a..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-////// NetCommandWrapperList.h ////////////////////////////////
-// Bryan Cleveland
-
-#pragma once
-
-#ifndef __NETCOMMANDWRAPPERLIST_H
-#define __NETCOMMANDWRAPPERLIST_H
-
-#include "GameNetwork/NetCommandList.h"
-
-class NetCommandWrapperListNode : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandWrapperListNode, "NetCommandWrapperListNode")		
-public:
-	NetCommandWrapperListNode(NetWrapperCommandMsg *msg);
-	//virtual ~NetCommandWrapperListNode();
-
-	Bool isComplete();
-	UnsignedShort getCommandID();
-	UnsignedInt getRawDataLength();
-	void copyChunkData(NetWrapperCommandMsg *msg);
-	UnsignedByte * getRawData();
-
-	Int getPercentComplete(void);
-
-	NetCommandWrapperListNode *m_next;
-
-protected:
-	UnsignedShort m_commandID;
-	UnsignedByte *m_data;
-	UnsignedInt m_dataLength;
-	Bool *m_chunksPresent;
-	UnsignedInt m_numChunks;
-	UnsignedInt m_numChunksPresent;
-
-};
-
-class NetCommandWrapperList : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandWrapperList, "NetCommandWrapperList")		
-public:
-	NetCommandWrapperList();
-	//virtual ~NetCommandWrapperList();
-
-	void init();
-	void reset();
-
-	void processWrapper(NetCommandRef *ref);
-	NetCommandList * getReadyCommands();
-
-	Int getPercentComplete(UnsignedShort wrappedCommandID);
-
-protected:
-	void removeFromList(NetCommandWrapperListNode *node);
-
-	NetCommandWrapperListNode *m_list;
-};
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h b/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h
deleted file mode 100644
index 7897f25166d..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/*
-Ok, how this should have been done is to make each of the command types
-have a bitmask telling which command message header information
-each command type required.  That would make finding out the size of
-a particular command easier to find, without so much repetitious code.
-We would still need to have a separate function for each command type
-for the data, but at least that wouldn't be repeating code, that would
-be specialized code.
-*/
-
-
-
-#pragma once
-
-#ifndef __NETPACKET_H
-#define __NETPACKET_H
-
-#include "NetworkDefs.h"
-#include "GameNetwork/NetCommandList.h"
-#include "Common/MessageStream.h"
-#include "Common/GameMemory.h"
-
-class NetPacket;
-
-typedef std::list<NetPacket *> NetPacketList;
-typedef std::list<NetPacket *>::iterator NetPacketListIter;
-
-class NetPacket : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetPacket, "NetPacket")		
-public:
-	NetPacket();
-	NetPacket(TransportMessage *msg);
-	//virtual ~NetPacket();
-
-	void init();
-	void reset();
-	void setAddress(Int addr, Int port);
-	Bool addCommand(NetCommandRef *msg);
-	Int getNumCommands();
-
-	NetCommandList *getCommandList();
-
-	static NetCommandRef * ConstructNetCommandMsgFromRawData(UnsignedByte *data, UnsignedShort dataLength);
-	static NetPacketList ConstructBigCommandPacketList(NetCommandRef *ref);
-
-	UnsignedByte *getData();
-	Int getLength();
-	UnsignedInt getAddr();
-	UnsignedShort getPort();
-
-protected:
-	static UnsignedInt GetBufferSizeNeededForCommand(NetCommandMsg *msg);
-	static void FillBufferWithCommand(UnsignedByte *buffer, NetCommandRef *msg);
-
-	// These functions return the size of the command without any compression, repetition, etc.
-	// i.e. All of the required fields are taken into account when returning the size.
-	static UnsignedInt GetGameCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetAckCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetFrameCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetPlayerLeaveCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetRunAheadMetricsCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetRunAheadCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDestroyPlayerCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetKeepAliveCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDisconnectKeepAliveCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDisconnectPlayerCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetPacketRouterQueryCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetPacketRouterAckCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDisconnectChatCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDisconnectVoteCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetChatCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetProgressMessageSize(NetCommandMsg *msg);
-	static UnsignedInt GetLoadCompleteMessageSize(NetCommandMsg *msg);
-	static UnsignedInt GetTimeOutGameStartMessageSize(NetCommandMsg *msg);
-	static UnsignedInt GetWrapperCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetFileCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetFileAnnounceCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetFileProgressCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDisconnectFrameCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDisconnectScreenOffCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetFrameResendRequestCommandSize(NetCommandMsg *msg);
-
-	static void FillBufferWithGameCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithAckCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithKeepAliveCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDisconnectKeepAliveCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithPacketRouterQueryCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithPacketRouterAckCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithProgressMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithLoadCompleteMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithTimeOutGameStartMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithFileMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithFileProgressMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithFileAnnounceMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDisconnectFrameMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDisconnectScreenOffMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithFrameResendRequestMessage(UnsignedByte *buffer, NetCommandRef *msg);
-
-	Bool addFrameCommand(NetCommandRef *msg);
-	Bool isRoomForFrameMessage(NetCommandRef *msg);
-	Bool addAckCommand(NetCommandRef *msg, UnsignedShort commandID, UnsignedByte originalPlayerID);
-	Bool addAckStage1Command(NetCommandRef *msg);
-	Bool addAckStage2Command(NetCommandRef *msg);
-	Bool addAckBothCommand(NetCommandRef *msg);
-	Bool isRoomForAckMessage(NetCommandRef *msg);
-	Bool addGameCommand(NetCommandRef *msg);
-	Bool isRoomForGameMessage(NetCommandRef *msg, GameMessage *gmsg);
-	Bool addPlayerLeaveCommand(NetCommandRef *msg);
-	Bool isRoomForPlayerLeaveMessage(NetCommandRef *msg);
-	Bool addRunAheadMetricsCommand(NetCommandRef *msg);
-	Bool isRoomForRunAheadMetricsMessage(NetCommandRef *msg);
-	Bool addRunAheadCommand(NetCommandRef *msg);
-	Bool isRoomForRunAheadMessage(NetCommandRef *msg);
-	Bool addDestroyPlayerCommand(NetCommandRef *msg);
-	Bool isRoomForDestroyPlayerMessage(NetCommandRef *msg);
-	Bool addKeepAliveCommand(NetCommandRef *msg);
-	Bool isRoomForKeepAliveMessage(NetCommandRef *msg);
-	Bool addDisconnectKeepAliveCommand(NetCommandRef *msg);
-	Bool isRoomForDisconnectKeepAliveMessage(NetCommandRef *msg);
-	Bool addDisconnectPlayerCommand(NetCommandRef *msg);
-	Bool isRoomForDisconnectPlayerMessage(NetCommandRef *msg);
-	Bool addPacketRouterQueryCommand(NetCommandRef *msg);
-	Bool isRoomForPacketRouterQueryMessage(NetCommandRef *msg);
-	Bool addPacketRouterAckCommand(NetCommandRef *msg);
-	Bool isRoomForPacketRouterAckMessage(NetCommandRef *msg);
-	Bool addDisconnectChatCommand(NetCommandRef *msg);
-	Bool isRoomForDisconnectChatMessage(NetCommandRef *msg);
-	Bool addChatCommand(NetCommandRef *msg);
-	Bool isRoomForChatMessage(NetCommandRef *msg);
-	Bool addDisconnectVoteCommand(NetCommandRef *msg);
-	Bool isRoomForDisconnectVoteMessage(NetCommandRef *msg);
-	Bool addProgressMessage( NetCommandRef *msg );
-	Bool isRoomForProgressMessage( NetCommandRef *msg );
-	Bool addLoadCompleteMessage( NetCommandRef *msg );
-	Bool isRoomForLoadCompleteMessage( NetCommandRef *msg );
-	Bool addTimeOutGameStartMessage( NetCommandRef *msg );
-	Bool isRoomForTimeOutGameStartMessage( NetCommandRef *msg );
-	Bool addWrapperCommand(NetCommandRef *msg);
-	Bool isRoomForWrapperMessage(NetCommandRef *msg);
-	Bool addFileCommand(NetCommandRef *msg);
-	Bool isRoomForFileMessage(NetCommandRef *msg);
-	Bool addFileAnnounceCommand(NetCommandRef *msg);
-	Bool isRoomForFileAnnounceMessage(NetCommandRef *msg);
-	Bool addFileProgressCommand(NetCommandRef *msg);
-	Bool isRoomForFileProgressMessage(NetCommandRef *msg);
-	Bool addDisconnectFrameCommand(NetCommandRef *msg);
-	Bool isRoomForDisconnectFrameMessage(NetCommandRef *msg);
-	Bool addDisconnectScreenOffCommand(NetCommandRef *msg);
-	Bool isRoomForDisconnectScreenOffMessage(NetCommandRef *msg);
-	Bool addFrameResendRequestCommand(NetCommandRef *msg);
-	Bool isRoomForFrameResendRequestMessage(NetCommandRef *msg);
-
-	Bool isAckRepeat(NetCommandRef *msg);
-	Bool isAckBothRepeat(NetCommandRef *msg);
-	Bool isAckStage1Repeat(NetCommandRef *msg);
-	Bool isAckStage2Repeat(NetCommandRef *msg);
-	Bool isFrameRepeat(NetCommandRef *msg);
-
-	static NetCommandMsg * readGameMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readAckBothMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readAckStage1Message(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readAckStage2Message(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readFrameMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readPlayerLeaveMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readRunAheadMetricsMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readRunAheadMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDestroyPlayerMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readKeepAliveMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDisconnectKeepAliveMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDisconnectPlayerMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readPacketRouterQueryMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readPacketRouterAckMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDisconnectChatMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDisconnectVoteMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readChatMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readProgressMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readLoadCompleteMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readTimeOutGameStartMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readWrapperMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readFileMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readFileAnnounceMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readFileProgressMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDisconnectFrameMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDisconnectScreenOffMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readFrameResendRequestMessage(UnsignedByte *data, Int &i);
-
-	void writeGameMessageArgumentToPacket(GameMessageArgumentDataType type, GameMessageArgumentType arg);
-	static void readGameMessageArgumentFromPacket(GameMessageArgumentDataType type, NetGameCommandMsg *msg, UnsignedByte *data, Int &i);
-
-	void dumpPacketToLog();
-
-protected:
-	UnsignedByte		m_packet[MAX_PACKET_SIZE];
-	Int							m_packetLen;
-	UnsignedInt			m_addr;
-	Int							m_numCommands;
-	NetCommandRef*	m_lastCommand;
-	UnsignedInt			m_lastFrame;
-	UnsignedShort		m_port;
-	UnsignedShort		m_lastCommandID;
-	UnsignedByte		m_lastPlayerID;
-	UnsignedByte		m_lastCommandType;
-	UnsignedByte		m_lastRelay;
-};
-
-#endif // __NETPACKET_H
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
deleted file mode 100644
index ebdf010385d..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __NETWORKDEFS_H
-#define __NETWORKDEFS_H
-
-#include "Lib/BaseType.h"
-#include "Common/MessageStream.h"
-
-static const Int WOL_NAME_LEN = 64;
-
-/// Max number of commands per frame
-static const Int MAX_COMMANDS = 256;
-
-extern Int MAX_FRAMES_AHEAD;
-extern Int MIN_RUNAHEAD;
-
-// FRAME_DATA_LENGTH needs to be MAX_FRAMES_AHEAD+1 because a player on a different
-// computer can send commands for a frame that is one beyond twice the max runahead.
-extern Int FRAME_DATA_LENGTH;
-extern Int FRAMES_TO_KEEP;
-
-// This is the connection numbering: 1-8 are for players, 9 is a broadcast con.
-enum ConnectionNumbers CPP_11(: Int)
-{
-	MAX_PLAYER = 7,			// The index of the highest possible player number.  This is 0 based, so the most players allowed in a game is MAX_PLAYER+1.
-	NUM_CONNECTIONS
-};
-
-static const Int MAX_SLOTS = MAX_PLAYER+1;
-
-// UDP (8 bytes) + IP header (28 bytes) = 36 bytes total.  We want a total packet size of 512, so 512 - 36 = 476
-static const Int MAX_PACKET_SIZE = 476;
-
-/**
- * Command packet - contains frame #, total # of commands, and each command.  This is what gets sent
- * to each player every frame
- */
-#define MAX_MESSAGE_LEN 1024
-#define MAX_MESSAGES 128
-static const Int numCommandsPerCommandPacket = (MAX_MESSAGE_LEN - sizeof(UnsignedInt) - sizeof(UnsignedShort))/sizeof(GameMessage);
-#pragma pack(push, 1)
-struct CommandPacket
-{
-	UnsignedInt m_frame;
-	UnsignedShort m_numCommands;
-	unsigned char m_commands[numCommandsPerCommandPacket * sizeof(GameMessage)];
-};
-#pragma pack(pop)
-
-#define MAX_TRANSPORT_STATISTICS_SECONDS 30
-
-#pragma pack(push, 1)
-struct TransportMessageHeader
-{
-	UnsignedInt crc;											///< packet-level CRC (must be first in packet)
-	UnsignedShort magic;									///< Magic number identifying Generals packets
-//	Int id;
-//	NetMessageFlags flags;
-};
-#pragma pack(pop)
-
-/**
- * Transport message - encapsulating info kept by the transport layer about each
- * packet.  These structs make up the in/out buffers at the transport layer.
- */
-#pragma pack(push, 1)
-struct TransportMessage
-{
-	TransportMessageHeader header;
-	UnsignedByte data[MAX_MESSAGE_LEN];
-	Int length;
-	UnsignedInt addr;
-	UnsignedShort port;
-};
-#pragma pack(pop)
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-#pragma pack(push, 1)
-struct DelayedTransportMessage
-{
-	UnsignedInt deliveryTime;
-	TransportMessage message;
-};
-#pragma pack(pop)
-#endif
-
-/**
- * Message types
- */
-enum NetMessageFlag CPP_11(: Int) {
-	MSG_ACK = 1,
-	MSG_NEEDACK = 2,
-	MSG_SEQUENCED = 4,
-	MSG_SUPERCEDING = 8
-};
-typedef UnsignedByte NetMessageFlags;
-
-enum NetCommandType CPP_11(: Int) {
-	NETCOMMANDTYPE_UNKNOWN = -1,
-	NETCOMMANDTYPE_ACKBOTH = 0,
-	NETCOMMANDTYPE_ACKSTAGE1,
-	NETCOMMANDTYPE_ACKSTAGE2,
-	NETCOMMANDTYPE_FRAMEINFO,
-	NETCOMMANDTYPE_GAMECOMMAND,
-	NETCOMMANDTYPE_PLAYERLEAVE,
-	NETCOMMANDTYPE_RUNAHEADMETRICS,
-	NETCOMMANDTYPE_RUNAHEAD,
-	NETCOMMANDTYPE_DESTROYPLAYER,
-	NETCOMMANDTYPE_KEEPALIVE,
-	NETCOMMANDTYPE_DISCONNECTCHAT,
-	NETCOMMANDTYPE_CHAT,
-	NETCOMMANDTYPE_MANGLERQUERY,
-	NETCOMMANDTYPE_MANGLERRESPONSE,
-	NETCOMMANDTYPE_PROGRESS,
-	NETCOMMANDTYPE_LOADCOMPLETE,
-	NETCOMMANDTYPE_TIMEOUTSTART,
-	NETCOMMANDTYPE_WRAPPER,							// A wrapper command that holds a command thats too big to fit in a single packet.
-	NETCOMMANDTYPE_FILE,
-	NETCOMMANDTYPE_FILEANNOUNCE,
-	NETCOMMANDTYPE_FILEPROGRESS,
-	NETCOMMANDTYPE_FRAMERESENDREQUEST,
-
-	// Disconnect menu command section.
-	NETCOMMANDTYPE_DISCONNECTSTART,
-	NETCOMMANDTYPE_DISCONNECTKEEPALIVE,
-	NETCOMMANDTYPE_DISCONNECTPLAYER,
-	NETCOMMANDTYPE_PACKETROUTERQUERY,
-	NETCOMMANDTYPE_PACKETROUTERACK,
-	NETCOMMANDTYPE_DISCONNECTVOTE,
-	NETCOMMANDTYPE_DISCONNECTFRAME,
-	NETCOMMANDTYPE_DISCONNECTSCREENOFF,
-	NETCOMMANDTYPE_DISCONNECTEND,
-
-	NETCOMMANDTYPE_MAX
-};
-
-enum NetLocalStatus CPP_11(: Int) {
-	NETLOCALSTATUS_PREGAME = 0,
-	NETLOCALSTATUS_INGAME,
-	NETLOCALSTATUS_LEAVING,
-	NETLOCALSTATUS_LEFT,
-	NETLOCALSTATUS_POSTGAME
-};
-
-enum PlayerLeaveCode CPP_11(: Int) {
-	PLAYERLEAVECODE_CLIENT = 0,
-	PLAYERLEAVECODE_LOCAL,
-	PLAYERLEAVECODE_PACKETROUTER,
-	PLAYERLEAVECODE_UNKNOWN
-};
-
-// Magic number for identifying a Generals packet.
-static const UnsignedShort GENERALS_MAGIC_NUMBER = 0xF00D;
-
-// The number of fps history entries.
-//static const Int NETWORK_FPS_HISTORY_LENGTH = 30;
-
-// The number of ping history entries.
-//static const Int NETWORK_LATENCY_HISTORY_LENGTH = 200;
-
-// The number of miliseconds between run ahead metrics things
-//static const Int NETWORK_RUN_AHEAD_METRICS_TIME = 5000;
-
-// The number of cushion values to keep.
-//static const Int NETWORK_CUSHION_HISTORY_LENGTH = 10;
-
-// The amount of slack in the run ahead value.  This is the percentage of the calculated run ahead that is added.
-//static const Int NETWORK_RUN_AHEAD_SLACK = 20;
-
-// The number of seconds between when the connections to each player send a keep-alive packet.
-// This should be less than 30 just to keep firewall ports open.
-//static const Int NETWORK_KEEPALIVE_DELAY = 20;
-
-// The number of milliseconds between when the game gets stuck on a frame for a network stall and
-// and when the disconnect dialog comes up.
-//static const Int NETWORK_DISCONNECT_TIME = 5000;
-
-// The number of miliseconds between when a player's last disconnect keep alive command
-// was recieved and when they are considered disconnected from the game.
-//static const Int NETWORK_PLAYER_TIMEOUT_TIME = 60000;
-
-// The base port number used for the transport socket.  A players slot number is added to this
-// value to get their actual port number.
-static const Int NETWORK_BASE_PORT_NUMBER = 8088;
-
-// the singleton
-class NetworkInterface;
-extern NetworkInterface *TheNetwork;
-
-#define PRINTF_IP_AS_4_INTS(ip) ((ip) >> 24) & 0xff, ((ip) >> 16) & 0xff, ((ip) >> 8 ) & 0xff, (ip) & 0xff
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h b/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h
deleted file mode 100644
index 2dc06db8d17..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// NetworkInterface.h ///////////////////////////////////////////////////////////////
-// Network singleton class - defines interface to Network methods
-// Author: Matthew D. Campbell, July 2001
-
-#pragma once
-
-#ifndef _NETWORK_INTERFACE_H_
-#define _NETWORK_INTERFACE_H_
-
-#include "Common/MessageStream.h"
-#include "GameNetwork/ConnectionManager.h"
-#include "GameNetwork/User.h"
-#include "GameNetwork/NetworkDefs.h"
-
-// forward declarations
-
-struct CommandPacket;
-class GameMessage;
-class GameInfo;
-
-void ClearCommandPacket(UnsignedInt frame);										///< ClearCommandPacket clears the command packet at the start of the frame.
-CommandPacket *GetCommandPacket(void);											///< TheNetwork calls GetCommandPacket to get commands to send.
-
-
-
-/**
- * Interface definition for the Network.
- */
-class NetworkInterface : public SubsystemInterface
-{
-protected:
-
-public:
-	virtual ~NetworkInterface() { };
-
-	static NetworkInterface * createNetwork( void );
-
-	//---------------------------------------------------------------------------------------
-	// SubsystemInterface functions
-	virtual void init( void ) = 0;																		///< Initialize the network
-	virtual void reset( void ) = 0;																		///< Re-initialize the network
-	virtual void update( void ) = 0;																	///< Updates the network
-	virtual void liteupdate( void ) = 0;															///< does a lightweight update for passing messages around.
-
-	virtual void setLocalAddress(UnsignedInt ip, UnsignedInt port) = 0;	///< Tell the network what local ip and port to bind to.
-	virtual Bool isFrameDataReady( void ) = 0;												///< Are the commands for the next frame available?
-	virtual void parseUserList( const GameInfo *game ) = 0;						///< Parse a userlist, creating connections
-	virtual void startGame(void) = 0;																	///< Sets the network game frame counter to -1
-	virtual UnsignedInt getRunAhead(void) = 0;												///< Get the current RunAhead value
-	virtual UnsignedInt getFrameRate(void) = 0;												///< Get the current allowed frame rate.
-	virtual UnsignedInt getPacketArrivalCushion(void) = 0;						///< Get the smallest packet arrival cushion since this was last called.
-
-	// Chat functions
-	virtual void sendChat(UnicodeString text, Int playerMask) = 0;		///< Send a chat line using the normal system.
-	virtual void sendDisconnectChat(UnicodeString text) = 0;					///< Send a chat line using the disconnect manager.
-
-	virtual void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID) = 0;
-	virtual UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask) = 0;
-	virtual Int getFileTransferProgress(Int playerID, AsciiString path) = 0;
-	virtual Bool areAllQueuesEmpty(void) = 0;
-
-	virtual void quitGame() = 0;																			///< Quit the game right now.
-	
-	virtual void selfDestructPlayer(Int index) = 0;
-
-	virtual void voteForPlayerDisconnect(Int slot) = 0;								///< register a vote towards this player's disconnect.
-	virtual Bool isPacketRouter( void ) = 0;
-
-	// Bandwidth metrics
-	virtual Real getIncomingBytesPerSecond( void ) = 0;
-	virtual Real getIncomingPacketsPerSecond( void ) = 0;
-	virtual Real getOutgoingBytesPerSecond( void ) = 0;
-	virtual Real getOutgoingPacketsPerSecond( void ) = 0;
-	virtual Real getUnknownBytesPerSecond( void ) = 0;
-	virtual Real getUnknownPacketsPerSecond( void ) = 0;
-
-	virtual void updateLoadProgress( Int percent ) = 0;
-	virtual void loadProgressComplete( void ) = 0;
-	virtual void sendTimeOutGameStart( void ) = 0;
-	virtual UnsignedInt getLocalPlayerID()= 0;
-	virtual UnicodeString getPlayerName(Int playerNum)= 0;
-	virtual Int getNumPlayers() = 0;
-
-	virtual Int getAverageFPS() = 0;
-	virtual Int getSlotAverageFPS(Int slot) = 0;
-
-	virtual void attachTransport(Transport *transport) = 0;
-	virtual void initTransport() = 0;
-	virtual Bool sawCRCMismatch() = 0;
-	virtual void setSawCRCMismatch() = 0;
-
-	virtual Bool isPlayerConnected(Int playerID) = 0;
-
-	virtual void notifyOthersOfCurrentFrame() = 0;					///< Tells all the other players what frame we are on.
-	virtual void notifyOthersOfNewFrame(UnsignedInt frame) = 0;							///< Tells all the other players that we are on a new frame.
-
-	virtual Int  getExecutionFrame() = 0;																			///< Returns the next valid frame for simultaneous command execution.
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	virtual void toggleNetworkOn( void ) = 0;													///< toggle whether or not to send network traffic.
-#endif
-
-	// For disconnect blame assignment
-	virtual UnsignedInt getPingFrame() = 0;
-	virtual Int getPingsSent() = 0;
-	virtual Int getPingsRecieved() = 0;
-};
-
-
-/**
- * ResolveIP turns a string ("games2.westwood.com", or "192.168.0.1") into
- * a 32-bit unsigned integer.
- */
-UnsignedInt ResolveIP(AsciiString host);
-
-#endif // _NETWORK_INTERFACE_H_
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h b/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h
deleted file mode 100644
index 0f2d9a19567..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: RankPointValue.h /////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-//	created:	Sep 2002
-//
-//	Filename: 	RankPointValue.h
-//
-//	author:		Chris Huybregts
-//	
-//	purpose:	
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __RANK_POINT_VALUE_H_
-#define __RANK_POINT_VALUE_H_
-
-//-----------------------------------------------------------------------------
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// USER INCLUDES //////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-class Image;
-class PSPlayerStats;
-//-----------------------------------------------------------------------------
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-enum
-{
-	RANK_PRIVATE = 0,
-	RANK_CORPORAL,
-	RANK_SERGEANT,
-	RANK_LIEUTENANT,
-	RANK_CAPTAIN,
-	RANK_MAJOR,
-	RANK_COLONEL,
-	RANK_BRIGADIER_GENERAL,
-	RANK_GENERAL,
-	RANK_COMMANDER_IN_CHIEF,
-
-	MAX_RANKS // keep last
-};
-
-struct RankPoints
-{
-RankPoints(void );
-	Int m_ranks[MAX_RANKS];
-	Real m_winMultiplier;
-	Real m_lostMultiplier;
-	Real m_hourSpentOnlineMultiplier;
-	Real m_completedSoloCampaigns;
-	Real m_disconnectMultiplier;
-};
-//-----------------------------------------------------------------------------
-// INLINING ///////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// EXTERNALS //////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-Int CalculateRank( const PSPlayerStats& stats );
-Int GetFavoriteSide( const PSPlayerStats& stats );
-const Image* LookupSmallRankImage(Int side, Int rankPoints);
-extern RankPoints *TheRankPointValues;
-
-#endif // __RANK_POINT_VALUE_H_
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/Transport.h b/Generals/Code/GameEngine/Include/GameNetwork/Transport.h
deleted file mode 100644
index 0408129adf8..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/Transport.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// Transport.h ///////////////////////////////////////////////////////////////
-// Transport layer - a thin layer around a UDP socket, with queues.
-// Author: Matthew D. Campbell, July 2001
-
-#pragma once
-
-#ifndef _TRANSPORT_H_
-#define _TRANSPORT_H_
-
-#include "GameNetwork/udp.h"
-#include "GameNetwork/NetworkDefs.h"
-
-/**
- * The transport layer handles the UDP socket for the game, and will packetize and
- * de-packetize multiple ACK/CommandPacket/etc packets into larger aggregates.
- */
-// we only ever allocate one of there, and it is quite large, so we really DON'T want
-// it to be a MemoryPoolObject (srj)
-class Transport //: public MemoryPoolObject
-{
-	//MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Transport, "Transport")		
-public:
-
-	Transport();
-	~Transport();
-
-	Bool init( AsciiString ip, UnsignedShort port );
-	Bool init( UnsignedInt ip, UnsignedShort port );
-	void reset( void );
-	Bool update( void );									///< Call this once a GameEngine tick, regardless of whether the frame advances.
-
-	Bool doRecv( void );		///< call this to service the receive packets
-	Bool doSend( void );		///< call this to service the send queue.
-
-	Bool queueSend(UnsignedInt addr, UnsignedShort port, const UnsignedByte *buf, Int len /*,
-		NetMessageFlags flags, Int id */);				///< Queue a packet for sending to the specified address and port.  This will be sent on the next update() call.
-
-	inline Bool allowBroadcasts(Bool val) { if (!m_udpsock) return false; return (m_udpsock->AllowBroadcasts(val))?true:false; }
-
-	// Latency insertion and packet loss
-	void setLatency( Bool val ) { m_useLatency = val; }
-	void setPacketLoss( Bool val ) { m_usePacketLoss = val; }
-
-	// Bandwidth metrics
-	Real getIncomingBytesPerSecond( void );
-	Real getIncomingPacketsPerSecond( void );
-	Real getOutgoingBytesPerSecond( void );
-	Real getOutgoingPacketsPerSecond( void );
-	Real getUnknownBytesPerSecond( void );
-	Real getUnknownPacketsPerSecond( void );
-
-	TransportMessage m_outBuffer[MAX_MESSAGES];
-	TransportMessage m_inBuffer[MAX_MESSAGES];
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	DelayedTransportMessage m_delayedInBuffer[MAX_MESSAGES];
-#endif
-
-	UnsignedShort m_port;
-private:
-	Bool m_winsockInit;
-	UDP *m_udpsock;
-
-	// Latency insertion and packet loss
-	Bool m_useLatency;
-	Bool m_usePacketLoss;
-
-	// Bandwidth metrics
-	UnsignedInt m_incomingBytes[MAX_TRANSPORT_STATISTICS_SECONDS];
-	UnsignedInt m_unknownBytes[MAX_TRANSPORT_STATISTICS_SECONDS];
-	UnsignedInt m_outgoingBytes[MAX_TRANSPORT_STATISTICS_SECONDS];
-	UnsignedInt m_incomingPackets[MAX_TRANSPORT_STATISTICS_SECONDS];
-	UnsignedInt m_unknownPackets[MAX_TRANSPORT_STATISTICS_SECONDS];
-	UnsignedInt m_outgoingPackets[MAX_TRANSPORT_STATISTICS_SECONDS];
-	Int m_statisticsSlot;
-	UnsignedInt m_lastSecond;
-
-	Bool isGeneralsPacket( TransportMessage *msg );
-};
-
-#endif // _TRANSPORT_H_
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/User.h b/Generals/Code/GameEngine/Include/GameNetwork/User.h
deleted file mode 100644
index a3228d7d005..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/User.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * User class used by the network.
- */
-
-#pragma once
-
-#ifndef __USER_H
-#define __USER_H
-
-#include "GameNetwork/NetworkDefs.h"
-#include "Common/UnicodeString.h"
-
-class User : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(User, "User")		
-public:
-	User() {}
-	User(UnicodeString name, UnsignedInt addr, UnsignedInt port);
-	User &operator= (const User *other);
-	Bool operator== (const User *other);
-	Bool operator!= (const User *other);
-
-	inline UnicodeString GetName() { return m_name; }
-	void setName(UnicodeString name);
-	inline UnsignedShort GetPort() { return m_port; }
-	inline UnsignedInt GetIPAddr() { return m_ipaddr; }
-	inline void SetPort(UnsignedShort port) { m_port = port; }
-	inline void SetIPAddr(UnsignedInt ipaddr) { m_ipaddr = ipaddr; }
-
-
-private:
-	UnicodeString m_name;
-	UnsignedShort m_port;
-	UnsignedInt m_ipaddr;
-};
-EMPTY_DTOR(User)
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h
deleted file mode 100644
index 8843ff69667..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//
-// FEBDispatch class is a template class which, when inherited from, can implement the
-// IDispatch for a COM object with a type library.
-//
-
-#ifndef _FEBDISPATCH_H__
-#define _FEBDISPATCH_H__
-
-#include <atlbase.h>
-extern CComModule _Module;
-#include <atlcom.h>
-#include <comutil.h>    // For _bstr_t.
-
-#include "oleauto.h"
-
-template <class T, class C, const IID *I>
-class FEBDispatch :
-public CComObjectRootEx<CComSingleThreadModel>,
-public CComCoClass<T>,
-public C
-{
-public:
-	
-	BEGIN_COM_MAP(T)
-		COM_INTERFACE_ENTRY(C)
-		COM_INTERFACE_ENTRY_AGGREGATE(IID_IDispatch, m_dispatch)
-	END_COM_MAP()
-		
-		FEBDispatch()
-	{
-		m_ptinfo = NULL;
-		m_dispatch = NULL;
-		
-		ITypeLib *ptlib;
-		HRESULT hr;
-		HRESULT TypeLibraryLoadResult;
-		char filename[256];
-
-		GetModuleFileName(NULL, filename, sizeof(filename));
-		_bstr_t bstr(filename);
-		
-		TypeLibraryLoadResult = LoadTypeLib(bstr, &ptlib);
-
-		DEBUG_ASSERTCRASH(TypeLibraryLoadResult == 0, ("Can't load type library for Embedded Browser"));
-		
-		if (TypeLibraryLoadResult == S_OK)
-		{
-			hr = ptlib->GetTypeInfoOfGuid(*I, &m_ptinfo);
-			ptlib->Release();
-			
-			if (hr == S_OK)
-			{
-				hr = CreateStdDispatch(static_cast<IUnknown*>(this), static_cast<C*>(this), m_ptinfo, &m_dispatch);
-				
-				m_dispatch->AddRef();
-				// Don't release the IUnknown from CreateStdDispatch without calling AddRef.
-				// It looks like CreateStdDispatch doesn't call AddRef on the IUnknown it returns.
-			}
-		}
-		
-		if ( m_dispatch == NULL )
-		{
-			DEBUG_LOG(("Error creating Dispatch for Web interface\n"));
-		}
-	}
-	
-	virtual ~FEBDispatch()
-	{
-		if (m_ptinfo)
-			m_ptinfo->Release();
-		
-		if (m_dispatch)
-			m_dispatch->Release();
-	}
-	
-	IUnknown *m_dispatch;
-
-private:
-	ITypeInfo *m_ptinfo;
-};
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
deleted file mode 100644
index 7c98c1fc957..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/******************************************************************************
-*
-* NAME
-*     $Archive:  $
-*
-* DESCRIPTION
-*     Web Browser
-*
-* PROGRAMMER
-*     Bryan Cleveland
-*     $Author:  $
-*
-* VERSION INFO
-*     $Revision:  $
-*     $Modtime:  $
-*
-******************************************************************************/
-
-#pragma once
-
-#ifndef __WEBBROWSER_H__
-#define __WEBBROWSER_H__
-
-#include "Common/SubsystemInterface.h"
-#include <atlbase.h>
-#include <windows.h>
-#include <Common/GameMemory.h>
-#include "EABrowserDispatch/BrowserDispatch.h"
-#include "FEBDispatch.h"
-#include <Lib/BaseType.h>
-
-class GameWindow;
-
-class WebBrowserURL : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( WebBrowserURL, "WebBrowserURL" )
-
-public:
-
-	WebBrowserURL();
-	// virtual destructor prototype defined by memory pool object
-
-	const FieldParse *getFieldParse( void ) const { return m_URLFieldParseTable; }
-
-	AsciiString m_tag;
-	AsciiString m_url;
-
-	WebBrowserURL *m_next;
-
-	static const FieldParse m_URLFieldParseTable[];		///< the parse table for INI definition
-
-};
-
-
-
-class WebBrowser :
-		public FEBDispatch<WebBrowser, IBrowserDispatch, &IID_IBrowserDispatch>,
-		public SubsystemInterface
-	{
-	public:
-		void init( void );
-		void reset( void );
-		void update( void );
-
-		// Create an instance of the embedded browser for Dune Emperor.
-		virtual Bool createBrowserWindow(const char *tag, GameWindow *win) = 0;
-		virtual void closeBrowserWindow(GameWindow *win) = 0;
-
-		WebBrowserURL *makeNewURL(AsciiString tag);
-		WebBrowserURL *findURL(AsciiString tag);
-
-	protected:
-		// Protected to prevent direct construction via new, use CreateInstance() instead.
-		WebBrowser();
-		virtual ~WebBrowser();
-
-		// Protected to prevent copy and assignment
-		WebBrowser(const WebBrowser&);
-		const WebBrowser& operator=(const WebBrowser&);
-
-//		Bool RetrievePageURL(const char* page, char* url, int size);
-//		Bool RetrieveHTMLPath(char* path, int size);
-
-	protected:
-		ULONG mRefCount;
-		WebBrowserURL *m_urlList;
-
-	//---------------------------------------------------------------------------
-	// IUnknown methods
-	//---------------------------------------------------------------------------
-	protected:
-		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) IUNKNOWN_NOEXCEPT;
-		ULONG STDMETHODCALLTYPE AddRef(void) IUNKNOWN_NOEXCEPT;
-		ULONG STDMETHODCALLTYPE Release(void) IUNKNOWN_NOEXCEPT;
-
-	//---------------------------------------------------------------------------
-	// IBrowserDispatch methods
-	//---------------------------------------------------------------------------
-	public:
-		STDMETHOD(TestMethod)(Int num1);
-	};
-
-extern CComObject<WebBrowser> *TheWebBrowser;
-#endif // __WEBBROWSER_H__
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h b/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h
deleted file mode 100644
index d5bab653763..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-#ifndef __NETWORKUTIL_H
-#define __NETWORKUTIL_H
-
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/NetworkInterface.h"
-
-UnsignedInt AssembleIp(UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedByte d);
-UnsignedInt ResolveIP(AsciiString host);
-UnsignedShort GenerateNextCommandID();
-Bool DoesCommandRequireACommandID(NetCommandType type);
-Bool CommandRequiresAck(NetCommandMsg *msg);
-Bool CommandRequiresDirectSend(NetCommandMsg *msg);
-Bool IsCommandSynchronized(NetCommandType type);
-AsciiString GetAsciiNetCommandType(NetCommandType type);
-
-#ifdef DEBUG_LOGGING
-extern "C" {
-void dumpBufferToLog(const void *vBuf, Int len, const char *fname, Int line);
-};
-#define LOGBUFFER(buf, len) dumpBufferToLog(buf, len, __FILE__, __LINE__)
-#else
-#define LOGBUFFER(buf, len) {}
-#endif // DEBUG_LOGGING
-
-inline UnsignedInt AssembleIp(UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedByte d)
-{
-    return ((UnsignedInt)(a) << 24) |
-           ((UnsignedInt)(b) << 16) |
-           ((UnsignedInt)(c) << 8) |
-           ((UnsignedInt)(d));
-}
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/udp.h b/Generals/Code/GameEngine/Include/GameNetwork/udp.h
deleted file mode 100644
index ec0849264d9..00000000000
--- a/Generals/Code/GameEngine/Include/GameNetwork/udp.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef UDP_HEADER
-#define UDP_HEADER
-
-#ifdef _UNIX
-#include <errno.h>
-#endif
-
-#ifdef _WINDOWS
-#include <winsock.h>
-#include <io.h>
-//#define close _close
-//#define read  _read
-//#define write _write
-
-#else  //UNIX
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#include <limits.h>
-#endif
-
-#ifdef AIX
-#include <sys/select.h>
-#endif
-
-#include "Lib/BaseType.h"
-
-#define DEFAULT_PROTOCOL 0
-
-//#include "wlib/wstypes.h"
-//#include "wlib/wtime.h"
-
-class UDP
-{
- // DATA
- private:
-  Int       fd; 
-  UnsignedInt       myIP;
-  UnsignedShort       myPort;
-  struct       sockaddr_in  addr;
-  
- public:
-  // These defines specify a system independent way to
-  //   get error codes for socket services.
-  enum sockStat CPP_11(: Int)
-  {
-    OK           =  0,     // Everything's cool
-    UNKNOWN      = -1,     // There was an error of unknown type
-    ISCONN       = -2,     // The socket is already connected
-    INPROGRESS   = -3,     // The socket is non-blocking and the operation
-                           //   isn't done yet
-    ALREADY      = -4,     // The socket is already attempting a connection
-                           //   but isn't done yet
-    AGAIN        = -5,     // Try again.
-    ADDRINUSE    = -6,     // Address already in use
-    ADDRNOTAVAIL = -7,     // That address is not available on the remote host
-    BADF         = -8,     // Not a valid FD
-    CONNREFUSED  = -9,     // Connection was refused
-    INTR         =-10,     // Operation was interrupted
-    NOTSOCK      =-11,     // FD wasn't a socket
-    PIPE         =-12,     // That operation just made a SIGPIPE
-    WOULDBLOCK   =-13,     // That operation would block
-    INVAL        =-14,     // Invalid
-    TIMEDOUT     =-15      // Timeout
-  };
-
-// CODE
- private:
-  Int           SetBlocking(Int block);
-	
-	Int m_lastError;
-
- public:
-                   UDP();
-                  ~UDP();
-  Int           Bind(UnsignedInt IP,UnsignedShort port);
-  Int           Bind(const char *Host,UnsignedShort port);
-  Int           Write(const unsigned char *msg,UnsignedInt len,UnsignedInt IP,UnsignedShort port);
-  Int           Read(unsigned char *msg,UnsignedInt len,sockaddr_in *from);
-  sockStat         GetStatus(void);
-  void             ClearStatus(void);
-  //int              Wait(Int sec,Int usec,fd_set &returnSet);
-  //int              Wait(Int sec,Int usec,fd_set &givenSet,fd_set &returnSet);
-
-  Int             getLocalAddr(UnsignedInt &ip, UnsignedShort &port);
-  Int           getFD(void) { return(fd); }
- 
-  Int             SetInputBuffer(UnsignedInt bytes);
-  Int             SetOutputBuffer(UnsignedInt bytes);
-  int              GetInputBuffer(void);
-  int              GetOutputBuffer(void);
-	Int						AllowBroadcasts(Bool status);
-};
-
-#ifdef DEBUG_LOGGING
-AsciiString GetWSAErrorString( Int error );
-#endif
-
-#endif
diff --git a/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h b/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h
index cd2daff73a2..2432971b175 100644
--- a/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h
+++ b/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h
@@ -23,11 +23,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // This file contains all the header files that shouldn't change frequently.
-// Be careful what you stick in here, because putting files that change often in here will 
+// Be careful what you stick in here, because putting files that change often in here will
 // tend to cheese people's goats.
 
-#ifndef __PRERTS_H__
-#define __PRERTS_H__
+#pragma once
 
 //-----------------------------------------------------------------------------
 // srj sez: this must come first, first, first.
@@ -36,10 +35,10 @@
 class STLSpecialAlloc;
 
 
-// We actually don't use Windows for much other than timeGetTime, but it was included in 40 
+// We actually don't use Windows for much other than timeGetTime, but it was included in 40
 // different .cpp files, so I bit the bullet and included it here.
 // PLEASE DO NOT ABUSE WINDOWS OR IT WILL BE REMOVED ENTIRELY. :-)
-//--------------------------------------------------------------------------------- System Includes 
+//--------------------------------------------------------------------------------- System Includes
 #define WIN32_LEAN_AND_MEAN
 #include <atlbase.h>
 #include <windows.h>
@@ -69,9 +68,7 @@ class STLSpecialAlloc;
 #include <snmp.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <Utility/stdio_adapter.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/timeb.h>
 #include <sys/types.h>
@@ -111,7 +108,6 @@ class STLSpecialAlloc;
 #include "Common/SubsystemInterface.h"
 
 #include "Common/GameCommon.h"
-#include "Common/GameDefines.h"
 #include "Common/GameMemory.h"
 #include "Common/GameType.h"
 #include "Common/GlobalData.h"
@@ -127,5 +123,3 @@ class STLSpecialAlloc;
 
 #include "Common/Thing.h"
 #include "Common/UnicodeString.h"
-
-#endif /* __PRERTS_H__ */
diff --git a/Generals/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp b/Generals/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp
deleted file mode 100644
index a5f5f9b6ab6..00000000000
--- a/Generals/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp
+++ /dev/null
@@ -1,848 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: AudioEventRTS.cpp 
-/*---------------------------------------------------------------------------*/
-/* EA Pacific                                                                */
-/* Confidential Information	                                                 */
-/* Copyright (C) 2001 - All Rights Reserved                                  */
-/* DO NOT DISTRIBUTE                                                         */
-/*---------------------------------------------------------------------------*/
-/* Project:    RTS3                                                          */
-/* File name:  AudioEventRTS.cpp                                             */
-/* Created:    John K. McDonald, Jr., 3/21/2002                              */
-/* Desc:       AudioEventRTS constructors and assignment operator, etc.      */
-/* Revision History:                                                         */
-/*		3/21/2002 : Initial creation                                           */
-/*---------------------------------------------------------------------------*/
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/AudioEventRTS.h"
-
-#include "Common/AudioEventInfo.h"
-#include "Common/AudioRandomValue.h"
-#include "Common/AudioSettings.h"
-#include "Common/file.h"
-#include "Common/FileSystem.h"
-#include "Common/GameSounds.h"
-#include "Common/GlobalData.h"
-#include "Common/Player.h"
-#include "Common/Registry.h"
-
-#include "GameLogic/GameLogic.h"	// For getObjectByID
-#include "GameLogic/LogicRandomValue.h"
-#include "GameLogic/Object.h"
-
-#include "GameClient/Drawable.h"	// For getPosition
-#include "GameClient/GameClient.h"	// For getDrawableByID
-
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::AudioEventRTS()
-									: m_eventName(AsciiString::TheEmptyString), 
-										m_priority(AP_NORMAL), 
-										m_volume(-1.0),
-										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
-										m_ownerType(OT_INVALID),
-										m_shouldFade(false),
-										m_isLogicalAudio(false),
-										m_filenameToLoad(AsciiString::TheEmptyString),
-										m_eventInfo(NULL),
-										m_playingHandle(0),
-										m_killThisHandle(0),
-										m_pitchShift(1.0),
-										m_volumeShift(0.0),
-										m_loopCount(1),
-										m_playingAudioIndex(-1),
-										m_allCount(0),
-										m_playerIndex(-1),
-										m_delay(0.0f),
-										m_uninterruptable(FALSE)
-{
-	m_attackName.clear();
-	m_decayName.clear();
-	m_positionOfAudio.zero();
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::AudioEventRTS( const AsciiString& eventName )
-									: m_eventName(eventName), 
-										m_priority(AP_NORMAL), 
-										m_volume(-1.0),
-										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
-										m_ownerType(OT_INVALID),
-										m_shouldFade(false),
-										m_isLogicalAudio(false),
-										m_filenameToLoad(AsciiString::TheEmptyString),
-										m_eventInfo(NULL),
-										m_playingHandle(0),
-										m_killThisHandle(0),
-										m_pitchShift(1.0),
-										m_volumeShift(0.0),
-										m_loopCount(1),
-										m_playingAudioIndex(-1),
-										m_allCount(0),
-										m_playerIndex(-1),
-										m_delay(0.0f),
-										m_uninterruptable(FALSE)
-{
-	m_attackName.clear();
-	m_decayName.clear();
-	m_positionOfAudio.zero();
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::AudioEventRTS( const AsciiString& eventName, ObjectID ownerID )
-									: m_eventName(eventName), 
-										m_priority(AP_NORMAL), 
-										m_volume(-1.0),
-										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
-										m_objectID(ownerID),
-										m_ownerType(OT_INVALID),
-										m_shouldFade(false),
-										m_isLogicalAudio(false),
-										m_filenameToLoad(AsciiString::TheEmptyString),
-										m_eventInfo(NULL),
-										m_playingHandle(0),
-										m_killThisHandle(0),
-										m_pitchShift(1.0),
-										m_volumeShift(0.0),
-										m_loopCount(1),
-										m_playingAudioIndex(-1),
-										m_allCount(0),
-										m_playerIndex(-1),
-										m_delay(0.0f),
-										m_uninterruptable(FALSE)
-{						
-	m_attackName.clear();
-	m_decayName.clear();
-
-	if(	m_objectID ) 
-	{
-		m_ownerType = OT_Object;
-	} 
-	else 
-	{
-		m_objectID = INVALID_ID;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::AudioEventRTS( const AsciiString& eventName, DrawableID drawableID )
-									: m_eventName(eventName), 
-										m_priority(AP_NORMAL), 
-										m_volume(-1.0),
-										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
-										m_drawableID(drawableID),
-										m_ownerType(OT_INVALID),
-										m_shouldFade(false),
-										m_isLogicalAudio(false),
-										m_filenameToLoad(AsciiString::TheEmptyString),
-										m_eventInfo(NULL),
-										m_playingHandle(0),
-										m_killThisHandle(0),
-										m_pitchShift(1.0),
-										m_volumeShift(0.0),
-										m_loopCount(1),
-										m_playingAudioIndex(-1),
-										m_allCount(0),
-										m_playerIndex(-1),
-										m_delay(0.0f),
-										m_uninterruptable(FALSE)
-{
-	m_attackName.clear();
-	m_decayName.clear();
-
-	if( m_drawableID )
-	{
-		m_ownerType = OT_Drawable;
-	} 
-	else 
-	{
-		m_drawableID = INVALID_DRAWABLE_ID;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::AudioEventRTS( const AsciiString& eventName, const Coord3D *positionOfAudio )
-									: m_eventName(eventName), 
-										m_priority(AP_NORMAL), 
-										m_volume(-1.0),
-										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
-										m_ownerType(OT_Positional),
-										m_shouldFade(false),
-										m_isLogicalAudio(false),
-										m_filenameToLoad(AsciiString::TheEmptyString),
-										m_eventInfo(NULL),
-										m_playingHandle(0),
-										m_killThisHandle(0),
-										m_pitchShift(1.0),
-										m_volumeShift(0.0),
-										m_loopCount(1),
-										m_playingAudioIndex(-1),
-										m_allCount(0),
-										m_playerIndex(-1),
-										m_delay(0.0f),
-										m_uninterruptable(FALSE)
-{
-	m_positionOfAudio.set( positionOfAudio );
-	m_attackName.clear();
-	m_decayName.clear();
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::AudioEventRTS( const AudioEventRTS& right )
-{
-	m_filenameToLoad			= right.m_filenameToLoad;
-	m_eventInfo						= right.m_eventInfo;
-	m_playingHandle				= right.m_playingHandle;
-	m_killThisHandle			= right.m_killThisHandle;
-	m_eventName						= right.m_eventName;
-	m_priority						= right.m_priority;
-	m_volume							= right.m_volume;
-	m_timeOfDay						= right.m_timeOfDay;
-	m_ownerType						= right.m_ownerType;
-	m_shouldFade					= right.m_shouldFade;
-	m_isLogicalAudio			= right.m_isLogicalAudio;
-	m_pitchShift					= right.m_pitchShift;
-	m_volumeShift					= right.m_volumeShift;
-	m_loopCount						= right.m_loopCount;
-	m_playingAudioIndex		= right.m_playingAudioIndex;
-	m_allCount						= right.m_allCount;
-	m_playerIndex					= right.m_playerIndex;
-	m_delay								= right.m_delay;
-	m_attackName					= right.m_attackName;
-	m_decayName						= right.m_decayName;
-	m_portionToPlayNext		= right.m_portionToPlayNext;
-	m_uninterruptable			= right.m_uninterruptable;
-
-	if( m_ownerType == OT_Positional || m_ownerType == OT_Dead ) 
-	{
-		m_positionOfAudio.set( &right.m_positionOfAudio );
-	} 
-	else if( m_ownerType == OT_Drawable ) 
-	{
-		m_drawableID = right.m_drawableID;
-	} 
-	else if( m_ownerType == OT_Object ) 
-	{
-		m_objectID = right.m_objectID;
-	}
-
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS& AudioEventRTS::operator=( const AudioEventRTS& right )
-{
-	m_filenameToLoad			= right.m_filenameToLoad;
-	m_eventInfo						= right.m_eventInfo;
-	m_playingHandle				= right.m_playingHandle;
-	m_killThisHandle			= right.m_killThisHandle;
-	m_eventName						= right.m_eventName;
-	m_priority						= right.m_priority;
-	m_volume							= right.m_volume;
-	m_timeOfDay						= right.m_timeOfDay;
-	m_ownerType						= right.m_ownerType;
-	m_shouldFade					= right.m_shouldFade;
-	m_isLogicalAudio			= right.m_isLogicalAudio;
-	m_pitchShift					= right.m_pitchShift;
-	m_volumeShift					= right.m_volumeShift;
-	m_loopCount						= right.m_loopCount;
-	m_playingAudioIndex		= right.m_playingAudioIndex;
-	m_allCount						= right.m_allCount;
-	m_playerIndex					= right.m_playerIndex;
-	m_delay								= right.m_delay;
-	m_attackName					= right.m_attackName;
-	m_decayName						= right.m_decayName;
-	m_portionToPlayNext		= right.m_portionToPlayNext;
-	m_uninterruptable			= right.m_uninterruptable;
-
-	if( m_ownerType == OT_Positional || m_ownerType == OT_Dead ) 
-	{
-		m_positionOfAudio.set( &right.m_positionOfAudio );
-	} 
-	else if( m_ownerType == OT_Drawable ) 
-	{
-		m_drawableID = right.m_drawableID;
-	} 
-	else if( m_ownerType == OT_Object ) 
-	{
-		m_objectID = right.m_objectID;
-	} 
-	return *this;
-
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::~AudioEventRTS()
-{
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setEventName( AsciiString name )
-{
-	if ((name != m_eventName) && m_eventInfo != NULL) {
-		// Clear out the audio event info, cause its not valid for the new event.
-		m_eventInfo = NULL;
-	}
-
-	m_eventName = name;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::generateFilename( void )
-{
-	// A Logic Random Value is used because we may ask "How long will it take to play this sound?"
-	// In that case, we need the same answer across all pcs.
-
-	if (!m_eventInfo) {
-		return;
-	}
-	
-	m_filenameToLoad = generateFilenamePrefix(m_eventInfo->m_soundType, false);
-	
-	Int which = 0;
-
-	if (m_eventInfo->m_soundType == AT_Music || m_eventInfo->m_soundType == AT_Streaming) {
-		m_filenameToLoad.concat(m_eventInfo->m_filename);
-		adjustForLocalization(m_filenameToLoad);
-		return;
-	} else {
-		if (m_eventInfo->m_sounds.size() == 0) {
-			m_filenameToLoad = AsciiString::TheEmptyString;
-			return;
-		}
-
-
-		
-		if (BitIsSet(m_eventInfo->m_control, AC_RANDOM)) 
-		{ 
-			if (m_isLogicalAudio) 
-			{
-				which = GameLogicRandomValue(0, m_eventInfo->m_sounds.size() - 1);
-			} 
-			else 
-			{
-				which = GameAudioRandomValue(0, m_eventInfo->m_sounds.size() - 1);
-			}
-
-			if (which == m_playingAudioIndex && m_eventInfo->m_sounds.size() > 2)
-				which = ( which + 1 ) % m_eventInfo->m_sounds.size();
-
-			m_playingAudioIndex = which;//caching random choice to compare next call
-
-		}
-		else
-			which = (++m_playingAudioIndex) % m_eventInfo->m_sounds.size();
- 
-
-	}
-	
-	m_filenameToLoad.concat(m_eventInfo->m_sounds[which]);
-	m_filenameToLoad.concat(generateFilenameExtension(m_eventInfo->m_soundType));
-	adjustForLocalization(m_filenameToLoad);
-
-	// Note: Also generate Delay when generating a filename, cause 
-	// we want delay to apply between every loop of a sound.
-	m_delay = GameAudioRandomValueReal(m_eventInfo->m_delayMin, m_eventInfo->m_delayMax);
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioEventRTS::getFilename( void )
-{
-	return m_filenameToLoad;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::generatePlayInfo( void )
-{
-	m_pitchShift = GameAudioRandomValueReal(m_eventInfo->m_pitchShiftMin, m_eventInfo->m_pitchShiftMax);
-	m_volumeShift = GameAudioRandomValueReal(1.0f + m_eventInfo->m_volumeShift, 1.0f);	// volume shifts are between 0 and 1
-	m_loopCount = m_eventInfo->m_loopCount;
-	
-	m_portionToPlayNext = PP_Attack;
-	Int attackSize = m_eventInfo->m_attackSounds.size();
-	if (attackSize > 0) {
-		m_attackName = generateFilenamePrefix(m_eventInfo->m_soundType, false);
-		// needs to be logic because it needs to be the same on all systems.
-		Int attackToPlay;
-		if (m_isLogicalAudio) {
-			attackToPlay = GameLogicRandomValue(0, attackSize - 1);
-		} else {
-			attackToPlay = GameAudioRandomValue(0, attackSize - 1);
-		}
-		
-		m_attackName.concat(m_eventInfo->m_attackSounds[attackToPlay]);
-		m_attackName.concat(generateFilenameExtension(m_eventInfo->m_soundType));
-		adjustForLocalization(m_attackName);
-	} else {
-		m_portionToPlayNext = PP_Sound;
-	}
-
-	Int decaySize = m_eventInfo->m_decaySounds.size();
-	if (decaySize > 0) {
-		m_decayName = generateFilenamePrefix(m_eventInfo->m_soundType, false);
-		// needs to be logic because it needs to be the same on all systems.
-		Int decayToPlay;
-		if (m_isLogicalAudio) {
-			decayToPlay = GameLogicRandomValue(0, decaySize - 1);
-		} else {
-			decayToPlay = GameAudioRandomValue(0, decaySize - 1);
-		}
-		
-		m_decayName.concat(m_eventInfo->m_decaySounds[decayToPlay]);
-		m_decayName.concat(generateFilenameExtension(m_eventInfo->m_soundType));
-		adjustForLocalization(m_decayName);
-	}
-
-	m_isLogicalAudio = FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-Real AudioEventRTS::getPitchShift( void ) const
-{
-	return m_pitchShift;
-}
-
-//-------------------------------------------------------------------------------------------------
-Real AudioEventRTS::getVolumeShift( void ) const
-{
-	return m_volumeShift;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioEventRTS::getAttackFilename( void ) const
-{
-	return m_attackName;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioEventRTS::getDecayFilename( void ) const
-{
-	return m_decayName;
-}
-
-//-------------------------------------------------------------------------------------------------
-Real AudioEventRTS::getDelay( void ) const
-{
-	return m_delay;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::decrementDelay( Real timeToDecrement )
-{
-	m_delay -= timeToDecrement;
-}
-
-//-------------------------------------------------------------------------------------------------
-PortionToPlay AudioEventRTS::getNextPlayPortion( void ) const
-{
-	return m_portionToPlayNext;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::advanceNextPlayPortion( void )
-{
-	switch (m_portionToPlayNext) 
-	{
-		case PP_Attack:
-			m_portionToPlayNext = PP_Sound;
-			break;
-		case PP_Sound:
-			if (m_eventInfo && BitIsSet(m_eventInfo->m_control, AC_ALL)) 
-			{
-				if (m_allCount == m_eventInfo->m_sounds.size()) {
-					m_portionToPlayNext = PP_Decay;
-				}
-
-				// Advance the all count so that we move to the next sound.
-				++m_allCount;
-			}
-			if (!m_decayName.isEmpty()) {
-				m_portionToPlayNext = PP_Decay;
-			} else {
-				m_portionToPlayNext = PP_Done;
-			}
-			break;
-		case PP_Decay:
-			m_portionToPlayNext = PP_Done;
-			break;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setNextPlayPortion( PortionToPlay ptp )
-{
-	m_portionToPlayNext = ptp;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::decreaseLoopCount( void )
-{
-	if (m_loopCount == 1) {
-		m_loopCount = -1;
-	} else if (m_loopCount > 1) {
-		--m_loopCount;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioEventRTS::hasMoreLoops( void ) const
-{
-	return (m_loopCount >= 0);
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setAudioEventInfo( const AudioEventInfo *eventInfo ) const
-{
-	m_eventInfo = eventInfo;
-}
-
-//-------------------------------------------------------------------------------------------------
-const AudioEventInfo *AudioEventRTS::getAudioEventInfo( void ) const
-{
-	if (m_eventInfo) {
-		if (m_eventInfo->m_audioName == m_eventName) {
-			return m_eventInfo;
-		} else {
-			m_eventInfo = NULL;
-		}
-	}
-
-	return m_eventInfo;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setPlayingHandle( AudioHandle handle )
-{
-	m_playingHandle = handle;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioHandle AudioEventRTS::getPlayingHandle( void )
-{
-	return m_playingHandle;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setPosition( const Coord3D *pos )
-{
-	if (!pos) {
-		return;
-	}
-
-	if (!(m_ownerType == OT_Positional || m_ownerType == OT_INVALID)) {
-		return;
-	}
-
-	m_positionOfAudio = *pos;
-	m_ownerType = OT_Positional;
-}
-
-//-------------------------------------------------------------------------------------------------
-const Coord3D* AudioEventRTS::getPosition( void )
-{
-	if( m_ownerType != OT_INVALID ) 
-	{
-		return &m_positionOfAudio;
-	}
-
-	return NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setObjectID( ObjectID objID )
-{
-	if (!(m_ownerType == OT_Object || m_ownerType == OT_INVALID)) {
-		return;
-	}
-
-	m_objectID = objID;
-	m_ownerType = OT_Object;
-}
-
-//-------------------------------------------------------------------------------------------------
-ObjectID AudioEventRTS::getObjectID( void )
-{
-	if (m_ownerType == OT_Object) {
-		return m_objectID;
-	}
-
-	return INVALID_ID;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setDrawableID( DrawableID drawID )
-{
-	if (!(m_ownerType == OT_Drawable || m_ownerType == OT_INVALID)) {
-		return;
-	}
-
-	m_drawableID = drawID;
-	m_ownerType = OT_Drawable;
-}
-
-//-------------------------------------------------------------------------------------------------
-DrawableID AudioEventRTS::getDrawableID( void )
-{
-	if (m_ownerType == OT_Drawable) {
-		return m_drawableID;
-	}
-
-	return INVALID_DRAWABLE_ID;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setTimeOfDay( TimeOfDay tod )
-{
-	m_timeOfDay = tod;
-}
-
-//-------------------------------------------------------------------------------------------------
-TimeOfDay AudioEventRTS::getTimeOfDay( void ) const
-{
-	return m_timeOfDay;
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setHandleToKill( AudioHandle handleToKill )
-{
-	m_killThisHandle = handleToKill;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioHandle AudioEventRTS::getHandleToKill( void ) const
-{
-	return m_killThisHandle;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setShouldFade( Bool shouldFade )
-{
-	m_shouldFade = shouldFade;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioEventRTS::getShouldFade( void ) const
-{
-	return m_shouldFade;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setIsLogicalAudio( Bool isLogicalAudio )
-{
-	m_isLogicalAudio = isLogicalAudio;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioEventRTS::getIsLogicalAudio( void ) const
-{
-	return m_isLogicalAudio;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioEventRTS::isPositionalAudio( void ) const
-{
-	if( m_eventInfo ) 
-	{
-		if( !BitIsSet( m_eventInfo->m_type, ST_WORLD ) ) 
-		{
-			return FALSE;
-		}
-	}
-	if( m_ownerType != OT_INVALID )
-	{
-		if( m_drawableID != INVALID_DRAWABLE_ID || m_objectID != INVALID_ID || m_ownerType == OT_Positional )
-		{
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioEventRTS::isCurrentlyPlaying( void ) const
-{
-	return TheAudio->isCurrentlyPlaying(m_playingHandle);
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioPriority AudioEventRTS::getAudioPriority( void ) const
-{
-	return m_priority;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setAudioPriority( AudioPriority newPriority )
-{
-	m_priority = newPriority;
-
-}
-
-
-//-------------------------------------------------------------------------------------------------
-Real AudioEventRTS::getVolume( void ) const
-{
-	if (m_volume == -1.0f) {
-		if (m_eventInfo) {
-			return m_eventInfo->m_volume;
-		}
-		return 0.5;
-	}
-	
-	return m_volume;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setVolume( Real vol )
-{
-	m_volume = vol;
-}
-
-//-------------------------------------------------------------------------------------------------
-const Coord3D *AudioEventRTS::getCurrentPosition( void )
-{
-	if (m_ownerType == OT_Positional) 
-	{
-		return &m_positionOfAudio;
-	} 
-	else if (m_ownerType == OT_Object) 
-	{
-		Object *obj = TheGameLogic->findObjectByID(m_objectID);
-		if (obj)
-		{
-			m_positionOfAudio.set( obj->getPosition() );
-		}
-		else
-		{
-			m_ownerType = OT_Dead;
-		}
-		return &m_positionOfAudio;
-	} 
-	else if (m_ownerType == OT_Drawable) 
-	{
-		Drawable *draw = TheGameClient->findDrawableByID(m_drawableID);
-		if( draw )
-		{
-			m_positionOfAudio.set( draw->getPosition() );
-		}
-		else
-		{
-			m_ownerType = OT_Dead;
-		}
-		return &m_positionOfAudio;
-	}
-	else if( m_ownerType == OT_Dead )
-	{
-		return &m_positionOfAudio;
-	}
-
-	return NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioEventRTS::generateFilenamePrefix( AudioType audioTypeToPlay, Bool localized )
-{
-	AsciiString retStr;
-	retStr = TheAudio->getAudioSettings()->m_audioRoot;
-	retStr.concat("\\");
-	if (audioTypeToPlay == AT_Music) {
-		retStr.concat(TheAudio->getAudioSettings()->m_musicFolder);
-	} else if (audioTypeToPlay == AT_Streaming) {
-		retStr.concat(TheAudio->getAudioSettings()->m_streamingFolder);
-	} else {
-		retStr.concat(TheAudio->getAudioSettings()->m_soundsFolder);
-	}
-	retStr.concat("\\");
-
-	if (localized) {
-		retStr.concat(GetRegistryLanguage());
-		retStr.concat("\\");
-	}
-
-	return retStr;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioEventRTS::generateFilenameExtension( AudioType audioTypeToPlay )
-{
-	AsciiString retStr = AsciiString::TheEmptyString;
-	if (audioTypeToPlay != AT_Music) {
-		retStr = ".";
-		retStr.concat(TheAudio->getAudioSettings()->m_soundsExtension);
-	}
-
-	return retStr;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::adjustForLocalization(AsciiString &strToAdjust)
-{
-	if (TheFileSystem->doesFileExist(strToAdjust.str()))
-	{
-		return;
-	}
-
-	const char *str = strToAdjust.reverseFind('\\');
-	if (!str) {
-		return;
-	}
-
-	AsciiString filename = str;
-
-	strToAdjust = generateFilenamePrefix(m_eventInfo->m_soundType, TRUE);
-	strToAdjust.concat(filename);
-}
-
-//-------------------------------------------------------------------------------------------------
-Int AudioEventRTS::getPlayerIndex( void ) const
-{
-	if (m_ownerType == OT_Object) {
-		Object *obj = TheGameLogic->findObjectByID(m_objectID);
-		if (obj) {
-			return obj->getControllingPlayer()->getPlayerIndex();
-		}
-	} else if (m_ownerType == OT_Drawable) {
-		Drawable *draw = TheGameClient->findDrawableByID(m_drawableID);
-		if (draw) {
-			Object *obj = draw->getObject();
-			if (obj) {
-				return obj->getControllingPlayer()->getPlayerIndex();
-			}
-		}
-	}
-
-	return m_playerIndex;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setPlayerIndex( Int playerNdx )
-{
-	m_playerIndex = playerNdx;
-}
diff --git a/Generals/Code/GameEngine/Source/Common/Audio/AudioRequest.cpp b/Generals/Code/GameEngine/Source/Common/Audio/AudioRequest.cpp
deleted file mode 100644
index 2e9406961ef..00000000000
--- a/Generals/Code/GameEngine/Source/Common/Audio/AudioRequest.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/AudioRequest.h"
-
-
-AudioRequest::~AudioRequest() 
-{
-	
-}
diff --git a/Generals/Code/GameEngine/Source/Common/Audio/GameAudio.cpp b/Generals/Code/GameEngine/Source/Common/Audio/GameAudio.cpp
deleted file mode 100644
index f9a7f32d15b..00000000000
--- a/Generals/Code/GameEngine/Source/Common/Audio/GameAudio.cpp
+++ /dev/null
@@ -1,1170 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: GameAudio.cpp
-//
-// Created:   5/01/01
-//
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#include "Common/GameAudio.h"
-
-#include "Common/AudioAffect.h"
-#include "Common/AudioEventInfo.h"
-#include "Common/AudioEventRTS.h"
-#include "Common/AudioHandleSpecialValues.h"
-#include "Common/AudioRequest.h"
-#include "Common/AudioSettings.h"
-#include "Common/FileSystem.h"
-#include "Common/GameEngine.h"
-#include "Common/GameMusic.h"
-#include "Common/GameSounds.h"
-#include "Common/MiscAudio.h"
-#include "Common/OSDisplay.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "Common/UserPreferences.h"
-
-#include "GameClient/ControlBar.h"
-#include "GameClient/Drawable.h"
-#include "GameClient/View.h"
-
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/TerrainLogic.h"
-
-#include "WWMath/matrix3d.h"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-static const char* TheSpeakerTypes[] =
-{
-	"2 Speakers",
-	"Headphones",
-	"Surround Sound",
-	"4 Speaker",
-	"5.1 Surround",
-	"7.1 Surround",
-	NULL
-};
-
-static const Int TheSpeakerTypesCount = sizeof(TheSpeakerTypes) / sizeof(TheSpeakerTypes[0]);
-
-static void parseSpeakerType( INI *ini, void *instance, void *store, const void *userData );
-
-// Field Parse table for Audio Settings ///////////////////////////////////////////////////////////
-static const FieldParse audioSettingsFieldParseTable[] =
-{
-	{ "AudioRoot",						INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_audioRoot) },
-	{ "SoundsFolder",					INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_soundsFolder) },
-	{ "MusicFolder",					INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_musicFolder) },
-	{ "StreamingFolder",			INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_streamingFolder) },
-	{ "SoundsExtension",			INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_soundsExtension) },
-
-	{ "UseDigital",						INI::parseBool,											NULL,							offsetof( AudioSettings, m_useDigital) },
-	{ "UseMidi",							INI::parseBool,											NULL,							offsetof( AudioSettings, m_useMidi) },
-	{ "OutputRate",						INI::parseInt,											NULL,							offsetof( AudioSettings, m_outputRate) },
-	{ "OutputBits",						INI::parseInt,											NULL,							offsetof( AudioSettings, m_outputBits) },
-	{ "OutputChannels",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_outputChannels) },
-	{ "SampleCount2D",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_sampleCount2D) },
-	{ "SampleCount3D",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_sampleCount3D) },
-	{ "StreamCount",					INI::parseInt,											NULL,							offsetof( AudioSettings, m_streamCount) },
-
-	{ "Preferred3DHW1",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[0]) },
-	{ "Preferred3DHW2",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[1]) },
-	{ "Preferred3DHW3",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[2]) },
-	{ "Preferred3DHW4",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[3]) },
-
-	{ "Preferred3DSW",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[4]) },
-
-	{ "Default2DSpeakerType",		 parseSpeakerType,							NULL,							offsetof( AudioSettings, m_defaultSpeakerType2D) },
-	{ "Default3DSpeakerType",		 parseSpeakerType,							NULL,							offsetof( AudioSettings, m_defaultSpeakerType3D) },
-
-	{ "MinSampleVolume",			INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_minVolume) },
-	{ "GlobalMinRange",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_globalMinRange) },
-	{ "GlobalMaxRange",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_globalMaxRange) },
-	{ "TimeBetweenDrawableSounds", INI::parseDurationUnsignedInt, NULL,							offsetof( AudioSettings, m_drawableAmbientFrames) },
-	{ "TimeToFadeAudio",			INI::parseDurationUnsignedInt,			NULL,							offsetof( AudioSettings, m_fadeAudioFrames) },
-	{ "AudioFootprintInBytes",INI::parseUnsignedInt,							NULL,							offsetof( AudioSettings, m_maxCacheSize) },
-	{ "Relative2DVolume",			INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_relative2DVolume ) },
-	{ "DefaultSoundVolume",		INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_defaultSoundVolume) },
-	{ "Default3DSoundVolume",	INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_default3DSoundVolume) },
-	{ "DefaultSpeechVolume",	INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_defaultSpeechVolume) },
-	{ "DefaultMusicVolume",		INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_defaultMusicVolume) },
-	{ "MicrophoneDesiredHeightAboveTerrain",	INI::parseReal,			NULL,							offsetof( AudioSettings, m_microphoneDesiredHeightAboveTerrain ) },
-	{ "MicrophoneMaxPercentageBetweenGroundAndCamera", INI::parsePercentToReal,	NULL,	offsetof( AudioSettings, m_microphoneMaxPercentageBetweenGroundAndCamera ) },
-  { "ZoomMinDistance",		INI::parseReal,									NULL,							offsetof( AudioSettings, m_zoomMinDistance ) },
-  { "ZoomMaxDistance",		INI::parseReal,									NULL,							offsetof( AudioSettings, m_zoomMaxDistance ) },
-  { "ZoomSoundVolumePercentageAmount",		INI::parsePercentToReal,	NULL,		offsetof( AudioSettings, m_zoomSoundVolumePercentageAmount ) },
-
-	{ NULL, NULL, NULL, NULL }
-};
-
-// Singleton TheAudio /////////////////////////////////////////////////////////////////////////////
-AudioManager *TheAudio = NULL;
-
-
-// AudioManager Device Independent functions //////////////////////////////////////////////////////
-AudioManager::AudioManager() : 
-	m_soundOn(TRUE), 
-	m_sound3DOn(TRUE), 
-	m_musicOn(TRUE), 
-	m_speechOn(TRUE), 
-	m_music(NULL), 
-	m_sound(NULL),
-	m_surroundSpeakers(FALSE),
-	m_hardwareAccel(FALSE),
-	m_musicPlayingFromCD(FALSE)
-{
-	// Added by Sadullah Nader
-	m_adjustedVolumes.clear();
-	m_audioRequests.clear();
-	m_listenerPosition.zero();
-	m_musicTracks.clear();
-	m_musicVolume = 0.0f;
-	m_sound3DVolume = 0.0f;	
-	m_soundVolume   = 0.0f;
-	m_speechVolume  = 0.0f;
-	m_systemMusicVolume   = 0.0f;
-	m_systemSound3DVolume = 0.0f;
-	m_systemSoundVolume   = 0.0f; 
-	m_systemSpeechVolume  = 0.0f;
-	m_volumeHasChanged			= FALSE;
-	//
-
-	m_listenerOrientation.set(0.0, 1.0, 0.0);
-	theAudioHandlePool = AHSV_FirstHandle;
-	m_audioSettings = NEW AudioSettings;
-	m_miscAudio = NEW MiscAudio;
-	m_silentAudioEvent = NEW AudioEventRTS;
-	m_savedValues = NULL;
-	m_disallowSpeech = FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioManager::~AudioManager()
-{
-	// cleanup all of the loaded AudioEventInfos
-	AudioEventInfoHashIt it;
-	for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) {
-		AudioEventInfo *eventInfo = (*it).second;
-		if (eventInfo) {
-			deleteInstance(eventInfo);
-			eventInfo = NULL;
-		}
-	}
-
-	delete m_silentAudioEvent;
-	m_silentAudioEvent = NULL;
-	
-	delete m_music;
-	m_music = NULL;
-	
-	delete m_sound;
-	m_sound = NULL;
-	
-	delete m_miscAudio;
-	m_miscAudio = NULL;
-
-	delete m_audioSettings;
-	m_audioSettings = NULL;
-
-	if (m_savedValues) 
-		delete [] m_savedValues;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::init()
-{
-	INI ini;
-	ini.load( AsciiString( "Data\\INI\\AudioSettings.ini" ), INI_LOAD_OVERWRITE, NULL);
-
-	ini.load( AsciiString( "Data\\INI\\Default\\Music.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\Music.ini" ), INI_LOAD_OVERWRITE, NULL );
-
-	ini.load( AsciiString( "Data\\INI\\Default\\SoundEffects.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\SoundEffects.ini" ), INI_LOAD_OVERWRITE, NULL );
-
-	ini.load( AsciiString( "Data\\INI\\Default\\Speech.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\Speech.ini" ), INI_LOAD_OVERWRITE, NULL );
-
-	ini.load( AsciiString( "Data\\INI\\Default\\Voice.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\Voice.ini" ), INI_LOAD_OVERWRITE, NULL );
-
-	// do the miscellaneous sound files last so that we find the audioeventrts associated with the events.
-	ini.load( AsciiString( "Data\\INI\\MiscAudio.ini" ), INI_LOAD_OVERWRITE, NULL);
-	
-	// determine if one of the music tracks exists. Since their now BIGd, one implies all.
-	// If they don't exist, then attempt to load them from the CD. 
-	if (!isMusicAlreadyLoaded()) 
-	{
-		m_musicPlayingFromCD = TRUE;
-		while (TRUE) 
-		{
-			// @todo Unload any files from CD first. - jkmcd
-
-			TheFileSystem->loadMusicFilesFromCD();
-			if (isMusicAlreadyLoaded()) 
-			{
-				break;
-			}
-			// We loop infinitely on the splash screen if we don't allow breaking out of this loop.
-//#if !defined( RTS_DEBUG ) && !defined( RTS_INTERNAL )
-			else
-			{
-				// Display the warning.
-				
-				if (OSDisplayWarningBox("GUI:InsertCDPrompt", "GUI:InsertCDMessage", OSDBT_OK | OSDBT_CANCEL, OSDOF_SYSTEMMODAL | OSDOF_EXCLAMATIONICON) == OSDBT_CANCEL) {
-					//TheGameEngine->setQuitting(TRUE);  // Can't do this to WorldBuilder
-					break;
-				}
-			}
-//#endif
-		}
-	}
-	
-	m_music = NEW MusicManager;
-	m_sound = NEW SoundManager;
-
-	// Set our system volumes from the user's preferred settings, not the defaults.
-	m_systemMusicVolume = getAudioSettings() ? getAudioSettings()->m_preferredMusicVolume : 0.55f;
-	m_systemSoundVolume = getAudioSettings() ? getAudioSettings()->m_preferredSoundVolume : 0.75f;
-	m_systemSound3DVolume = getAudioSettings() ? getAudioSettings()->m_preferred3DSoundVolume: 0.75f;
-	m_systemSpeechVolume = getAudioSettings() ? getAudioSettings()->m_preferredSpeechVolume : 0.55f;
-
-	m_scriptMusicVolume = 1.0f;
-	m_scriptSoundVolume = 1.0f;
-	m_scriptSound3DVolume = 1.0f;
-	m_scriptSpeechVolume = 1.0f;
-	
-	m_musicVolume = m_systemMusicVolume;
-	m_soundVolume = m_systemSoundVolume;
-	m_sound3DVolume = m_systemSound3DVolume;
-	m_speechVolume = m_systemSpeechVolume;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::postProcessLoad()
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::reset()
-{
-	// clear out any adjusted volumes we might have set.
-	m_adjustedVolumes.clear();
-
-	// adjust the scripted volumes, and reset the 
-	m_scriptMusicVolume = 1.0f;
-	m_scriptSoundVolume = 1.0f;
-	m_scriptSound3DVolume = 1.0f;
-	m_scriptSpeechVolume = 1.0f;
-
-	// restore the final values to the 
-	m_musicVolume = m_systemMusicVolume;
-	m_soundVolume = m_systemSoundVolume;
-	m_sound3DVolume = m_systemSound3DVolume;
-	m_speechVolume = m_systemSpeechVolume;
-
-	m_disallowSpeech = FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::update()
-{
-	Coord3D groundPos, microphonePos;
-	TheTacticalView->getPosition( &groundPos );
-	Real angle = TheTacticalView->getAngle();
-	Matrix3D rot = Matrix3D::Identity;
-	rot.Rotate_Z( angle );
-	Vector3 forward( 0, 1, 0 );
-	rot.mulVector3( forward );
-
-	Real desiredHeight = TheAudio->getAudioSettings()->m_microphoneDesiredHeightAboveTerrain;
-	Real maxPercentage = TheAudio->getAudioSettings()->m_microphoneMaxPercentageBetweenGroundAndCamera;
-
-	Coord3D lookTo;
-	lookTo.set(forward.X, forward.Y, forward.Z);
-
-	//Kris: At this point, the microphone is calculated to be at the ground position where the camera is looking at.
-	//Instead we want to move the microphone towards the camera. Hopefully, it'll be a desired altitude, but if it
-	//gets too close to the camera (or even past it), that would be undesirable. Therefore, we have a backup method
-	//of making sure we only go a certain percentage towards the camera or the desired height, whichever occurs first.
-	Coord3D cameraPos = TheTacticalView->get3DCameraPosition();
-	Coord3D groundToCameraVector;
-	groundToCameraVector.set( &cameraPos );
-	groundToCameraVector.sub( &groundPos );
-	Real bestScaleFactor;
-
-	if( cameraPos.z <= desiredHeight || groundToCameraVector.z <= 0.0f )
-	{
-		//Use the percentage calculation!
-		bestScaleFactor = maxPercentage;
-	}
-	else
-	{
-		//Calculate the stopping position of the groundToCameraVector when we force z to be m_microphoneDesiredHeightAboveTerrain
-		Real zScale = desiredHeight / groundToCameraVector.z;
-
-		//Use the smallest of the two scale calculations
-		bestScaleFactor = MIN( maxPercentage, zScale );
-	}
-
-	//Now apply the best scalar to the ground-to-camera vector.
-	groundToCameraVector.scale( bestScaleFactor );
-
-	//Set the microphone to be the ground position adjusted for terrain plus the vector we just calculated.
-	groundPos.z = TheTerrainLogic->getGroundHeight( groundPos.x, groundPos.y );
-	microphonePos.set( &groundPos );
-	microphonePos.add( &groundToCameraVector );
-
-	//Viola! A properly placed microphone.
-	setListenerPosition( &microphonePos, &lookTo );
-
-
-	//Now determine if we would like to boost the volume based on the camera being close to the microphone!
-	Real maxBoostScalar = TheAudio->getAudioSettings()->m_zoomSoundVolumePercentageAmount;
-	Real minDist = TheAudio->getAudioSettings()->m_zoomMinDistance;
-	Real maxDist = TheAudio->getAudioSettings()->m_zoomMaxDistance;
-
-	//We can't boost a sound above 100%, instead reduce the normal sound level.
-	m_zoomVolume = 1.0f - maxBoostScalar;
-
-	//Are we even using a boost?
-	if( maxBoostScalar > 0.0f )
-	{
-		//How far away is the camera from the microphone?
-		Coord3D vector = cameraPos;
-		vector.sub( &microphonePos );
-		Real dist = vector.length();
-
-		if( dist < minDist )
-		{
-			//Max volume!
-			m_zoomVolume = 1.0f;
-		}
-		else if( dist < maxDist )
-		{
-			//Determine what the boost amount will be. 
-			Real scalar = (dist - minDist) / (maxDist - minDist);
-			m_zoomVolume = 1.0f - scalar * maxBoostScalar;
-		}
-	}
-
-	set3DVolumeAdjustment( m_zoomVolume );
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::getInfoForAudioEvent( const AudioEventRTS *eventToFindAndFill ) const
-{
-	if (!eventToFindAndFill) {
-		return;
-	}
-
-	if (eventToFindAndFill->getAudioEventInfo()) {
-		// already done
-		return;
-	}
-
-	eventToFindAndFill->setAudioEventInfo(findAudioEventInfo(eventToFindAndFill->getEventName()));
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioHandle AudioManager::addAudioEvent(const AudioEventRTS *eventToAdd)
-{
-	if (eventToAdd->getEventName().isEmpty() || eventToAdd->getEventName() == AsciiString("NoSound")) {
-		return AHSV_NoSound;
-	}
-
-#ifdef INTENSIVE_AUDIO_DEBUG
-	DEBUG_LOG(("AUDIO (%d): Received addAudioEvent('%s')", TheGameLogic->getFrame(), eventToAdd->getEventName().str()));
-#endif
-	if (!eventToAdd->getAudioEventInfo()) {
-		getInfoForAudioEvent(eventToAdd);
-		if (!eventToAdd->getAudioEventInfo()) {
-			DEBUG_CRASH(("No info for requested audio event '%s'\n", eventToAdd->getEventName().str()));
-			return AHSV_Error;
-		}
-	}
-
-	switch (eventToAdd->getAudioEventInfo()->m_soundType)
-	{
-		case AT_Music:
-			if (!isOn(AudioAffect_Music)) 
-				return AHSV_NoSound;
-			break;
-		case AT_SoundEffect:
-			if (!isOn(AudioAffect_Sound) || !isOn(AudioAffect_Sound3D)) 
-				return AHSV_NoSound;
-			break;
-		case AT_Streaming:
-			if (!isOn(AudioAffect_Speech)) 
-				return AHSV_NoSound;
-			break;
-	}
-
-	// if we're currently playing uninterruptable speech, then disallow the addition of this sample
-	if (getDisallowSpeech() && eventToAdd->getAudioEventInfo()->m_soundType == AT_Streaming) {
-		return AHSV_NoSound;
-	}
-
-
-	AudioEventRTS *audioEvent = MSGNEW("AudioEventRTS") AudioEventRTS(*eventToAdd);		// poolify
-	audioEvent->setPlayingHandle( allocateNewHandle() );
-	audioEvent->generateFilename();	// which file are we actually going to play?
-	((AudioEventRTS*)eventToAdd)->setPlayingAudioIndex( audioEvent->getPlayingAudioIndex() );
-	audioEvent->generatePlayInfo();	// generate pitch shift and volume shift now as well
-
-	std::list<std::pair<AsciiString, Real> >::iterator it;
-	for (it = m_adjustedVolumes.begin(); it != m_adjustedVolumes.end(); ++it) {
-		if (it->first == audioEvent->getEventName()) {
-			audioEvent->setVolume(it->second);
-			break;
-		}
-	}
-	
-	if (!audioEvent->getUninterruptable()) {
-		if (!shouldPlayLocally(audioEvent)) {
-			releaseAudioEventRTS(audioEvent);
-			return AHSV_NotForLocal;
-		}
-	}
-
-	// cull muted audio
-	if (audioEvent->getVolume() < TheAudio->getAudioSettings()->m_minVolume) {
-#ifdef INTENSIVE_AUDIO_DEBUG
-		DEBUG_LOG((" - culled due to muting (%d).\n", audioEvent->getVolume()));
-#endif
-		releaseAudioEventRTS(audioEvent);
-		return AHSV_Muted;
-	}
-
-	AudioType type = eventToAdd->getAudioEventInfo()->m_soundType;
-	if (type == AT_Music) 
-	{
-		m_music->addAudioEvent(audioEvent);
-	} 
-	else 
-	{
-		//Possible to nuke audioEvent inside.
-		m_sound->addAudioEvent(audioEvent);
-	}
-
-	if( audioEvent )
-	{
-		return audioEvent->getPlayingHandle();
-	}
-	return AHSV_NoSound;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isValidAudioEvent(const AudioEventRTS *eventToCheck) const
-{
-	if (eventToCheck->getEventName().isEmpty()) {
-		return false;
-	}
-
-	getInfoForAudioEvent(eventToCheck);
-
-	return (eventToCheck->getAudioEventInfo() != NULL);
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isValidAudioEvent( AudioEventRTS *eventToCheck ) const
-{
-	if( eventToCheck->getEventName().isEmpty() ) 
-	{
-		return false;
-	}
-
-	getInfoForAudioEvent( eventToCheck );
-
-	return( eventToCheck->getAudioEventInfo() );
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::addTrackName( const AsciiString& trackName )
-{
-	m_musicTracks.push_back(trackName);
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioManager::nextTrackName(const AsciiString& currentTrack )
-{
-	std::vector<AsciiString>::iterator it;
-	for (it = m_musicTracks.begin(); it != m_musicTracks.end(); ++it) {
-		if (*it == currentTrack) {
-			break;
-		}
-	}
-
-	if (it != m_musicTracks.end()) {
-		++it;
-	}
-
-	if (it == m_musicTracks.end()) {
-		it = m_musicTracks.begin();
-		if (it == m_musicTracks.end()) {
-			return AsciiString::TheEmptyString;
-		}
-	}
-
-	return *it;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioManager::prevTrackName(const AsciiString& currentTrack )
-{
-	std::vector<AsciiString>::reverse_iterator rit;
-	for (rit = m_musicTracks.rbegin(); rit != m_musicTracks.rend(); ++rit) {
-		if (*rit == currentTrack) {
-			break;
-		}
-	}
-	
-	if (rit != m_musicTracks.rend()) {
-		++rit;
-	}
-
-	if (rit == m_musicTracks.rend()) {
-		rit = m_musicTracks.rbegin();
-		if (rit == m_musicTracks.rend()) {
-			return AsciiString::TheEmptyString;
-		}
-	}
-
-	return *rit;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::removeAudioEvent(AudioHandle audioEvent)
-{
-	if (audioEvent == AHSV_StopTheMusic || audioEvent == AHSV_StopTheMusicFade) {
-		m_music->removeAudioEvent(audioEvent);
-		return;
-	}
-
-	if (audioEvent < AHSV_FirstHandle) {
-		return;
-	}
-
-	AudioRequest *req = allocateAudioRequest( false );
-	req->m_handleToInteractOn = audioEvent;
-	req->m_request = AR_Stop;
-	appendAudioRequest( req );
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::setAudioEventEnabled( AsciiString eventToAffect, Bool enable )
-{
-	setAudioEventVolumeOverride(eventToAffect, (enable ? -1.0f : 0.0f) );
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::setAudioEventVolumeOverride( AsciiString eventToAffect, Real newVolume )
-{
-	if (eventToAffect == AsciiString::TheEmptyString) {
-		m_adjustedVolumes.clear();
-		return;
-	}
-
-	// Find any playing audio events and adjust their volume accordingly.
-	if (newVolume != -1.0f) {
-		adjustVolumeOfPlayingAudio(eventToAffect, newVolume);
-	}
-
-	std::list<std::pair<AsciiString, Real> >::iterator it;
-	for (it = m_adjustedVolumes.begin(); it != m_adjustedVolumes.end(); ++it) {
-		if (it->first == eventToAffect) {
-			if (newVolume == -1.0f) {
-				m_adjustedVolumes.erase(it);
-				return;
-			} else {
-				it->second = newVolume;
-				return;
-			}
-		}
-	}
-
-	if (newVolume != -1.0f) {
-		std::pair<AsciiString, Real> newPair;
-		newPair.first = eventToAffect;
-		newPair.second = newVolume;
-		m_adjustedVolumes.push_front(newPair);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::removeAudioEvent( AsciiString eventToRemove )
-{
-	removePlayingAudio( eventToRemove );
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::removeDisabledEvents()
-{
-	removeAllDisabledAudio();
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isCurrentlyPlaying( AudioHandle audioEvent )
-{
-	return true;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt AudioManager::translateSpeakerTypeToUnsignedInt( const AsciiString& speakerType )
-{
-	for (UnsignedInt i = 0; TheSpeakerTypes[i]; ++i) {
-		if (TheSpeakerTypes[i] == speakerType) {
-			return i;
-		}
-	}
-
-	return 0;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioManager::translateUnsignedIntToSpeakerType( UnsignedInt speakerType )
-{
-	if (speakerType >= TheSpeakerTypesCount) {
-		return TheSpeakerTypes[0];
-	}
-	
-	return TheSpeakerTypes[speakerType];
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isOn( AudioAffect whichToGet ) const
-{
-	if (whichToGet & AudioAffect_Music) {
-		return m_musicOn;
-	} else if (whichToGet & AudioAffect_Sound) {
-		return m_soundOn;
-	} else if (whichToGet & AudioAffect_Sound3D) {
-		return m_sound3DOn;
-	}
-
-	// Speech
-	return m_speechOn;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::setOn( Bool turnOn, AudioAffect whichToAffect )
-{
-	if (whichToAffect & AudioAffect_Music) {
-		m_musicOn = turnOn;
-	}
-
-	if (whichToAffect & AudioAffect_Sound) {
-		m_soundOn = turnOn;
-	}
-
-	if (whichToAffect & AudioAffect_Sound3D) {
-		m_sound3DOn = turnOn;
-	}
-
-	if (whichToAffect & AudioAffect_Speech) {
-		m_speechOn = turnOn;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::setVolume( Real volume, AudioAffect whichToAffect )
-{
-	if (whichToAffect & AudioAffect_Music) {
-		if (whichToAffect & AudioAffect_SystemSetting) {
-			m_systemMusicVolume = volume;
-		} else {
-			m_scriptMusicVolume = volume;
-		}
-
-		m_musicVolume = m_scriptMusicVolume * m_systemMusicVolume;
-	}
-
-	if (whichToAffect & AudioAffect_Sound) {
-		if (whichToAffect & AudioAffect_SystemSetting) {
-			m_systemSoundVolume = volume;
-		} else {
-			m_scriptSoundVolume = volume;
-		}
-
-		m_soundVolume = m_scriptSoundVolume * m_systemSoundVolume;
-	}
-
-	if (whichToAffect & AudioAffect_Sound3D) {
-		if (whichToAffect & AudioAffect_SystemSetting) {
-			m_systemSound3DVolume = volume;
-		} else {
-			m_scriptSound3DVolume = volume;
-		}
-		m_sound3DVolume = m_scriptSound3DVolume * m_systemSound3DVolume;
-	}
-
-	if (whichToAffect & AudioAffect_Speech) {
-		if (whichToAffect & AudioAffect_SystemSetting) {
-			m_systemSpeechVolume = volume;
-		} else {
-			m_scriptSpeechVolume = volume;
-		}
-		m_speechVolume = m_scriptSpeechVolume * m_systemSpeechVolume;
-	}
-
-	m_volumeHasChanged = true;
-}
-
-//-------------------------------------------------------------------------------------------------
-Real AudioManager::getVolume( AudioAffect whichToGet )
-{
-	if (whichToGet & AudioAffect_Music) {
-		return m_musicVolume;
-	} else if (whichToGet & AudioAffect_Sound) {
-		return m_soundVolume;
-	} else if (whichToGet & AudioAffect_Sound3D) {
-		return m_sound3DVolume;
-	}
-
-	// Speech
-	return m_speechVolume;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::set3DVolumeAdjustment( Real volumeAdjustment )
-{
-	m_sound3DVolume = volumeAdjustment * m_scriptSound3DVolume * m_systemSound3DVolume;
-	
-	// clamp
-	if (m_sound3DVolume < 0.0f) 
-		m_sound3DVolume = 0.0f;
-
-	if (m_sound3DVolume > 1.0f) 
-		m_sound3DVolume = 1.0f;
-
-  if ( ! has3DSensitiveStreamsPlaying() )
-  	m_volumeHasChanged = TRUE;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::setListenerPosition( const Coord3D *newListenerPos, const Coord3D *newListenerOrientation )
-{
-	m_listenerPosition = *newListenerPos;
-	m_listenerOrientation = *newListenerOrientation;
-}
-
-//-------------------------------------------------------------------------------------------------
-const Coord3D *AudioManager::getListenerPosition( void ) const
-{
-	return &m_listenerPosition;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioRequest *AudioManager::allocateAudioRequest( Bool useAudioEvent )
-{
-	AudioRequest *audioReq = newInstance(AudioRequest);
-	audioReq->m_usePendingEvent = useAudioEvent;
-	audioReq->m_requiresCheckForSample = false;
-	return audioReq;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::releaseAudioRequest( AudioRequest *requestToRelease )
-{
-	if (requestToRelease) {
-		deleteInstance(requestToRelease);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::appendAudioRequest( AudioRequest *m_request )
-{
-	m_audioRequests.push_back(m_request);
-}
-
-//-------------------------------------------------------------------------------------------------
-// Remove all pending audio requests
-void AudioManager::removeAllAudioRequests( void )
-{
-  std::list<AudioRequest*>::iterator it;
-  for ( it = m_audioRequests.begin(); it != m_audioRequests.end(); it++ ) {
-    releaseAudioRequest( *it );
-  }
-
-  m_audioRequests.clear();
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::processRequestList( void )
-{
-	
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventInfo *AudioManager::newAudioEventInfo( AsciiString audioName )
-{
-	AudioEventInfo *eventInfo = findAudioEventInfo(audioName);
-	if (eventInfo) {
-		DEBUG_CRASH(("Requested add of '%s' multiple times. Is this intentional? - jkmcd\n", audioName.str()));
-		return eventInfo;
-	}
-
-	m_allAudioEventInfo[audioName] = newInstance(AudioEventInfo);
-	return m_allAudioEventInfo[audioName];
-}
-
-//-------------------------------------------------------------------------------------------------
-// Add an AudioEventInfo structure allocated elsewhere to the audio event list
-void AudioManager::addAudioEventInfo( AudioEventInfo * newEvent )
-{
-  // Warning: Don't try to copy the structure. It may be a derived class
-  AudioEventInfo *eventInfo = findAudioEventInfo( newEvent->m_audioName );
-  if (eventInfo) 
-  {
-    DEBUG_CRASH(("Requested add of '%s' multiple times. Is this intentional? - jkmcd\n", newEvent->m_audioName.str()));
-    *eventInfo = *newEvent;
-  }
-  else
-  {
-    m_allAudioEventInfo[newEvent->m_audioName] = newEvent;
-  }
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventInfo *AudioManager::findAudioEventInfo( AsciiString eventName ) const
-{
-	AudioEventInfoHash::const_iterator it;
-	it = m_allAudioEventInfo.find(eventName);
-	if (it == m_allAudioEventInfo.end()) {
-		return NULL;
-	}
-
-	return (*it).second;
-}
-
-//-------------------------------------------------------------------------------------------------
-// Remove all AudioEventInfo's with the m_isLevelSpecific flag
-void AudioManager::removeLevelSpecificAudioEventInfos(void)
-{
-  AudioEventInfoHash::iterator it = m_allAudioEventInfo.begin();
-
-  while ( it != m_allAudioEventInfo.end() )
-  {
-    AudioEventInfoHash::iterator next = it; // Make sure erase doesn't cause problems
-    next++;
-
-    if ( it->second->isLevelSpecific() )
-    {
-      deleteInstance(it->second);
-      m_allAudioEventInfo.erase( it );
-    }
-
-    it = next;
-  }
-
-}
-
-//-------------------------------------------------------------------------------------------------
-const AudioSettings *AudioManager::getAudioSettings( void ) const
-{
-	return m_audioSettings;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioSettings *AudioManager::friend_getAudioSettings( void )
-{
-	return m_audioSettings;
-}
-
-//-------------------------------------------------------------------------------------------------
-const MiscAudio *AudioManager::getMiscAudio( void ) const
-{
-	return m_miscAudio;
-}
-
-//-------------------------------------------------------------------------------------------------
-MiscAudio *AudioManager::friend_getMiscAudio( void )
-{
-	return m_miscAudio;
-}
-
-//-------------------------------------------------------------------------------------------------
-const FieldParse *AudioManager::getFieldParseTable( void ) const
-{
-	return audioSettingsFieldParseTable;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::refreshCachedVariables()
-{
-	m_hardwareAccel = isCurrentProviderHardwareAccelerated();
-	m_surroundSpeakers = isCurrentSpeakerTypeSurroundSound();
-}
-
-//-------------------------------------------------------------------------------------------------
-Real AudioManager::getAudioLengthMS( const AudioEventRTS *event )
-{
-	if (!event->getAudioEventInfo()) {
-		getInfoForAudioEvent(event);
-		if (!event->getAudioEventInfo()) {
-			return 0.0f;
-		}
-	}
-
-	AudioEventRTS tmpEvent = *event;
-
-	tmpEvent.generateFilename();
-	tmpEvent.generatePlayInfo();
-	return getFileLengthMS(tmpEvent.getAttackFilename()) + 
-				 getFileLengthMS(tmpEvent.getFilename()) + 
-				 getFileLengthMS(tmpEvent.getDecayFilename());
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isMusicAlreadyLoaded(void) const
-{
-	const AudioEventInfo *musicToLoad = NULL;
-	AudioEventInfoHash::const_iterator it;
-	for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) {
-		if (it->second) {
-			const AudioEventInfo *aet = it->second;
-			if (aet->m_soundType == AT_Music) {
-				musicToLoad = aet;
-			}
-		}
-	}
-
-	if (!musicToLoad) {
-		return FALSE;
-	}
-
-	AudioEventRTS aud;
-	aud.setAudioEventInfo(musicToLoad);
-	aud.generateFilename();
-
-	AsciiString astr = aud.getFilename();
-
-	return (TheFileSystem->doesFileExist(astr.str()));
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::findAllAudioEventsOfType( AudioType audioType, std::vector<AudioEventInfo*>& allEvents )
-{
-	AudioEventInfoHashIt it;
-	for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) {
-		AudioEventInfo *aud = (*it).second;
-		if (aud->m_soundType == audioType) {
-			allEvents.push_back(aud);
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isCurrentProviderHardwareAccelerated()
-{
-	for (Int i = 0; i < MAX_HW_PROVIDERS; ++i) {
-		if (getProviderName(getSelectedProvider()) == TheAudio->getAudioSettings()->m_preferred3DProvider[i]) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isCurrentSpeakerTypeSurroundSound()
-{
-	return (getSpeakerType() == TheAudio->getAudioSettings()->m_defaultSpeakerType3D);
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::shouldPlayLocally(const AudioEventRTS *audioEvent)
-{
-	Player *localPlayer = ThePlayerList->getLocalPlayer();
-	if( !localPlayer->isPlayerActive() ) 
-	{
-		//We are dead, thus are observing. Get the player we are observing. It's 
-		//possible that we're not looking at any player, therefore it can be NULL.
-		localPlayer = TheControlBar->getObserverLookAtPlayer();
-	}
-
-	const AudioEventInfo *ei = audioEvent->getAudioEventInfo();
-
-	// Music should always play locally.
-	if (ei->m_soundType == AT_Music) {
-		return TRUE;
-	}
-
-	if (!BitIsSet(ei->m_type, (ST_PLAYER | ST_ALLIES | ST_ENEMIES | ST_EVERYONE))) {
-		DEBUG_CRASH(("No player restrictions specified for '%s'. Using Everyone.\n", ei->m_audioName.str()));
-		return TRUE;
-	}
-
-	if (BitIsSet(ei->m_type, ST_EVERYONE)) {
-		return TRUE;
-	}
-
-	Player *owningPlayer = ThePlayerList->getNthPlayer(audioEvent->getPlayerIndex());
-
-	if (BitIsSet(ei->m_type, ST_PLAYER) && BitIsSet(ei->m_type, ST_UI) && owningPlayer == NULL) {
-		DEBUG_ASSERTCRASH(!TheGameLogic->isInGameLogicUpdate(), ("Playing %s sound -- player-based UI sound without specifying a player.\n"));
-		return TRUE;
-	}
-
-	if (owningPlayer == NULL) {
-		DEBUG_CRASH(("Sound '%s' expects an owning player, but the audio event that created it didn't specify one.\n", ei->m_audioName.str()));
-		return FALSE;
-	}
-
-	if( !localPlayer )
-	{
-		return FALSE;
-	}
-
-	const Team *localTeam = localPlayer->getDefaultTeam();
-	if (localTeam == NULL) { 
-		return FALSE;
-	}
-
-	if (BitIsSet(ei->m_type, ST_PLAYER))  {
-		return owningPlayer == localPlayer;
-	}
-
-	if (BitIsSet(ei->m_type, ST_ALLIES)) { 
-		// We have to also check that the owning player isn't the local player, because PLAYER 
-		// wasn't specified, or we wouldn't have gotten here.
-		return (owningPlayer != localPlayer) && owningPlayer->getRelationship(localTeam) == ALLIES;
-	}
-
-	if (BitIsSet(ei->m_type, ST_ENEMIES)) {
-		return owningPlayer->getRelationship(localTeam) == ENEMIES;
-	}
-	
-	return FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioHandle AudioManager::allocateNewHandle( void )
-{
-	// note, intenionally a post increment rather than a pre increment.
-	return theAudioHandlePool++;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::releaseAudioEventRTS( AudioEventRTS *&eventToRelease )
-{
-	if( eventToRelease )
-	{
-		delete eventToRelease;
-		eventToRelease = NULL;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::loseFocus( void )
-{
-	DEBUG_ASSERTLOG(m_savedValues == NULL, ("AudioManager::loseFocus() - leak - jkmcd\n"));
-	// In this case, make all the audio go silent.
-	m_savedValues = NEW Real[NUM_VOLUME_TYPES];
-	m_savedValues[0] = m_systemMusicVolume;
-	m_savedValues[1] = m_systemSoundVolume;
-	m_savedValues[2] = m_systemSound3DVolume;
-	m_savedValues[3] = m_systemSpeechVolume;
-
-	// Now, set them all to 0.
-	setVolume(0.0f, (AudioAffect) (AudioAffect_All | AudioAffect_SystemSetting));
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::regainFocus( void )
-{
-	if (!m_savedValues) {
-		return;
-	}
-
-	// We got focus back. Restore the previous audio values.
-	setVolume(m_savedValues[0], (AudioAffect) (AudioAffect_Music | AudioAffect_SystemSetting));
-	setVolume(m_savedValues[1], (AudioAffect) (AudioAffect_Sound | AudioAffect_SystemSetting));
-	setVolume(m_savedValues[2], (AudioAffect) (AudioAffect_Sound3D | AudioAffect_SystemSetting));
-	setVolume(m_savedValues[3], (AudioAffect) (AudioAffect_Speech | AudioAffect_SystemSetting));
-
-	// Now, blow away the old volumes.
-	delete [] m_savedValues;
-	m_savedValues = NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void INI::parseAudioSettingsDefinition( INI *ini )
-{
-	ini->initFromINI(TheAudio->friend_getAudioSettings(), TheAudio->getFieldParseTable());
-
-	// time to override the volume settings, default 3-D provider, and speaker setup with the
-	// ones stored from the prefs
-	OptionPreferences prefs;
-
-	TheAudio->setPreferredProvider(prefs.getPreferred3DProvider());
-	TheAudio->setPreferredSpeaker(prefs.getSpeakerType());
-
-	Real relative2DVolume = TheAudio->getAudioSettings()->m_relative2DVolume;
-	relative2DVolume = MIN( 1.0f, MAX( -1.0f, relative2DVolume ) );
-
-	TheAudio->friend_getAudioSettings()->m_preferredSoundVolume		= prefs.getSoundVolume() / 100.0f;
-	TheAudio->friend_getAudioSettings()->m_preferred3DSoundVolume	= prefs.get3DSoundVolume() / 100.0f;
-	TheAudio->friend_getAudioSettings()->m_preferredSpeechVolume	= prefs.getSpeechVolume() / 100.0f;
-	TheAudio->friend_getAudioSettings()->m_preferredMusicVolume		= prefs.getMusicVolume() / 100.0f;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-
-//-------------------------------------------------------------------------------------------------
-void parseSpeakerType( INI *ini, void *instance, void *store, const void* userData )
-{
-	AsciiString str;
-	ini->parseAsciiString( ini, instance, &str, userData );
-
-	(*(UnsignedInt*)store) = TheAudio->translateSpeakerTypeToUnsignedInt(str);
-}
-
diff --git a/Generals/Code/GameEngine/Source/Common/Audio/GameMusic.cpp b/Generals/Code/GameEngine/Source/Common/Audio/GameMusic.cpp
deleted file mode 100644
index d9adae25204..00000000000
--- a/Generals/Code/GameEngine/Source/Common/Audio/GameMusic.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: GameMusic.cpp
-//
-// Created:   5/01/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameMusic.h"
-
-#include "Common/AudioEventRTS.h"
-#include "Common/AudioRequest.h"
-#include "Common/GameAudio.h"
-#include "Common/INI.h"
-
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-#define MUSIC_PATH "Data\\Audio\\Tracks"  // directory path to the music files
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-//-------------------------------------------------------------------------------------------------
-/** The INI data fields for music tracks */
-//-------------------------------------------------------------------------------------------------
-const FieldParse MusicTrack::m_musicTrackFieldParseTable[] = 
-{
-
-	{ "Filename",								INI::parseAsciiString,							NULL, offsetof( MusicTrack, filename ) },
-	{ "Volume",									INI::parsePercentToReal,						NULL, offsetof( MusicTrack, volume ) },
-	{ "Ambient",								INI::parseBool,											NULL, offsetof( MusicTrack, ambient ) },
-	{ NULL,											NULL,																NULL, 0 },
-};
-
-
-//-------------------------------------------------------------------------------------------------
-MusicManager::MusicManager()
-{	
-
-}
-
-//-------------------------------------------------------------------------------------------------
-MusicManager::~MusicManager()
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void MusicManager::playTrack( AudioEventRTS *eventToUse )
-{
-	AudioRequest *audioRequest = TheAudio->allocateAudioRequest( true );
-	audioRequest->m_pendingEvent = eventToUse;
-	audioRequest->m_request = AR_Play;
-	TheAudio->appendAudioRequest( audioRequest );
-}
-
-//-------------------------------------------------------------------------------------------------
-void MusicManager::stopTrack( AudioHandle eventToRemove )
-{
-	AudioRequest *audioRequest = TheAudio->allocateAudioRequest( false );
-	audioRequest->m_handleToInteractOn = eventToRemove;
-	audioRequest->m_request = AR_Stop;
-	TheAudio->appendAudioRequest( audioRequest );
-}
-
-//-------------------------------------------------------------------------------------------------
-void MusicManager::addAudioEvent( AudioEventRTS *eventToAdd )
-{
-	playTrack( eventToAdd );
-}
-
-//-------------------------------------------------------------------------------------------------
-void MusicManager::removeAudioEvent( AudioHandle eventToRemove )
-{
-	stopTrack( eventToRemove );
-}
-
diff --git a/Generals/Code/GameEngine/Source/Common/Audio/GameSounds.cpp b/Generals/Code/GameEngine/Source/Common/Audio/GameSounds.cpp
deleted file mode 100644
index 6a0f0b93f5a..00000000000
--- a/Generals/Code/GameEngine/Source/Common/Audio/GameSounds.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: GameSounds.cpp
-//
-// Created:   5/02/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Lib/BaseType.h"
-#include "Common/GameSounds.h"
-
-#include "Common/AudioEventInfo.h"
-#include "Common/AudioEventRTS.h"
-#include "Common/AudioRequest.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-
-#include "GameLogic/PartitionManager.h"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-------------------------------------------------------------------------------------------------
-SoundManager::SoundManager()
-{
-	// nada to do
-}
-
-//-------------------------------------------------------------------------------------------------
-SoundManager::~SoundManager()
-{
-	// nada to do
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::init( void )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::postProcessLoad()
-{
-	// The AudioManager should actually be live now, so go ahead and get the info we need from it 
-	// here
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::update( void )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::reset( void )
-{
-	m_numPlaying2DSamples = 0;
-	m_numPlaying3DSamples = 0;
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::loseFocus( void )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::regainFocus( void )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::setListenerPosition( const Coord3D *position )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::setViewRadius( Real viewRadius )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::setCameraAudibleDistance( Real audibleDistance )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-Real SoundManager::getCameraAudibleDistance( void )
-{
-	return 1.0f;
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::addAudioEvent(AudioEventRTS *&eventToAdd)
-{
-	if (m_num2DSamples == 0 && m_num3DSamples == 0) {
-		m_num2DSamples = TheAudio->getNum2DSamples();
-		m_num3DSamples = TheAudio->getNum3DSamples();
-	}
-
-	if (canPlayNow(eventToAdd)) {
-#ifdef INTENSIVE_AUDIO_DEBUG
-		DEBUG_LOG((" - appended to request list with handle '%d'.\n", (UnsignedInt) eventToAdd->getPlayingHandle()));
-#endif
-		AudioRequest *audioRequest = TheAudio->allocateAudioRequest( true );
-		audioRequest->m_pendingEvent = eventToAdd;
-		audioRequest->m_request = AR_Play;
-		TheAudio->appendAudioRequest(audioRequest);
-	} else {
-		TheAudio->releaseAudioEventRTS(eventToAdd);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::notifyOf2DSampleStart( void )
-{
-	++m_numPlaying2DSamples;
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::notifyOf3DSampleStart( void )
-{
-	++m_numPlaying3DSamples;
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::notifyOf2DSampleCompletion( void )
-{
-	if (m_numPlaying2DSamples > 0) {
-		--m_numPlaying2DSamples;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::notifyOf3DSampleCompletion( void )
-{
-	if (m_numPlaying3DSamples > 0) {
-		--m_numPlaying3DSamples;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-Int SoundManager::getAvailableSamples( void )
-{
-	return (m_num2DSamples - m_numPlaying2DSamples);
-}
-
-//-------------------------------------------------------------------------------------------------
-Int SoundManager::getAvailable3DSamples( void )
-{
-	return (m_num3DSamples - m_numPlaying3DSamples);
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString SoundManager::getFilenameForPlayFromAudioEvent( const AudioEventRTS *eventToGetFrom )
-{
-	return AsciiString::TheEmptyString;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool SoundManager::canPlayNow( AudioEventRTS *event )
-{
-	Bool retVal = false;
-	// 1) Are we muted because we're beyond our maximum distance?
-	// 2) Are we shrouded and this is a shroud sound?
-	// 3) Are we violating our voice count or are we playing above the limit? (If so, stop now)
-	// 4) is there an avaiable channel open?
-	// 5) if not, then determine if there is anything of lower priority that we can kill
-	// 6) if not, are we an interrupt-sound type?
-	// if so, are there any sounds of our type playing right now that we can interrupt?
-	// potentially here: Are there any sounds that are playing that are now beyond their distance?
-	// if so, kill them and start our sound
-	// if not, we're done. Can't play dude.
-	
-	if( event->isPositionalAudio() && !BitIsSet( event->getAudioEventInfo()->m_type, ST_GLOBAL) && event->getAudioEventInfo()->m_priority != AP_CRITICAL ) 
-	{
-		Coord3D distance = *TheAudio->getListenerPosition();
-		const Coord3D *pos = event->getCurrentPosition();
-		if (pos) 
-		{
-			distance.sub(pos);
-			if (distance.length() >= event->getAudioEventInfo()->m_maxDistance) 
-			{
-#ifdef INTENSIVE_AUDIO_DEBUG
-				DEBUG_LOG(("- culled due to distance (%.2f).\n", distance.length()));
-#endif
-				return false;
-			}
-			
-			Int localPlayerNdx = ThePlayerList->getLocalPlayer()->getPlayerIndex();
-			if( (event->getAudioEventInfo()->m_type & ST_SHROUDED) && 
-					 ThePartitionManager->getShroudStatusForPlayer(localPlayerNdx, pos) != CELLSHROUD_CLEAR ) 
-			{
-#ifdef INTENSIVE_AUDIO_DEBUG
-				DEBUG_LOG(("- culled due to shroud.\n"));
-#endif
-				return false;
-			}
-		} 
-	}
-
-	if (violatesVoice(event)) 
-	{
-		retVal = isInterrupting(event);
-		if (retVal) 
-		{
-			return true;
-		} 
-		else 
-		{
-#ifdef INTENSIVE_AUDIO_DEBUG
-		DEBUG_LOG(("- culled due to voice.\n"));
-#endif
-			return false;
-		}
-	}
-	
-	if( TheAudio->doesViolateLimit( event ) )
-	{
-#ifdef INTENSIVE_AUDIO_DEBUG
-		DEBUG_LOG(("- culled due to limit.\n" ));
-#endif
-		return false;
-	}
-	else if( isInterrupting( event ) )
-	{
-		return true;
-	}
-
-	if (event->isPositionalAudio()) 
-	{
-		if (m_numPlaying3DSamples < m_num3DSamples) 
-		{
-			return true;
-		}
-#ifdef INTENSIVE_AUDIO_DEBUG
-		DEBUG_LOG(("- %d samples playing, %d samples available", m_numPlaying3DSamples, m_num3DSamples));
-#endif
-	} 
-	else 
-	{
-		// its a UI sound (and thus, 2-D)
-		if (m_numPlaying2DSamples < m_num2DSamples) 
-		{
-			return true;
-		}
-	}
-
-	if (TheAudio->isPlayingLowerPriority(event)) 
-	{
-		return true;
-	}
-
-	if (isInterrupting(event)) 
-	{
-		retVal = TheAudio->isPlayingAlready(event);
-		if (retVal) 
-		{
-			return true;
-		} 
-		else 
-		{
-#ifdef INTENSIVE_AUDIO_DEBUG
-			DEBUG_LOG(("- culled due to no channels available and non-interrupting.\n" ));
-#endif
-			return false;
-		}
-	}
-#ifdef INTENSIVE_AUDIO_DEBUG
-	DEBUG_LOG(("culled due to unavailable channels"));
-#endif
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool SoundManager::violatesVoice( AudioEventRTS *event )
-{
-	if (event->getAudioEventInfo()->m_type & ST_VOICE) {
-		return (event->getObjectID() && TheAudio->isObjectPlayingVoice(event->getObjectID()));
-	}
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool SoundManager::isInterrupting( AudioEventRTS *event )
-{
-	return event->getAudioEventInfo()->m_control & AC_INTERRUPT;
-}
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Source/Common/Audio/simpleplayer.cpp b/Generals/Code/GameEngine/Source/Common/Audio/simpleplayer.cpp
deleted file mode 100644
index 6eccd1f575a..00000000000
--- a/Generals/Code/GameEngine/Source/Common/Audio/simpleplayer.cpp
+++ /dev/null
@@ -1,708 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "Common/simpleplayer.h"
-#include "Common/urllaunch.h"
-
-
-///////////////////////////////////////////////////////////////////////////////
-CSimplePlayer::CSimplePlayer( HRESULT* phr )
-{
-    m_cRef = 1;
-    m_cBuffersOutstanding = 0;
-
-    m_pReader = NULL;
-
-    m_pHeader = NULL;
-    m_hwo = NULL;
-
-    m_fEof = FALSE;
-    m_pszUrl = NULL;
-
-	*phr = S_OK;
-
-    m_hOpenEvent = CreateEvent( NULL, FALSE, FALSE, SIMPLE_PLAYER_OPEN_EVENT );
-	if ( NULL == m_hOpenEvent )
-	{
-		*phr = E_OUTOFMEMORY;
-	}
-    m_hCloseEvent = CreateEvent( NULL, FALSE, FALSE, SIMPLE_PLAYER_CLOSE_EVENT );
-	if ( NULL == m_hCloseEvent )
-	{
-		*phr = E_OUTOFMEMORY;
-	}
-
-    m_hrOpen = S_OK;
-
-	m_hCompletionEvent = NULL;
-
-    InitializeCriticalSection( &m_CriSec );
-    m_whdrHead = NULL;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-CSimplePlayer::~CSimplePlayer()
-{
-    DEBUG_ASSERTCRASH( 0 == m_cBuffersOutstanding,("CSimplePlayer destructor m_cBuffersOutstanding != 0") );
-
-    Close();
-
-    //
-    // final remove of everything in the wave header list
-    //
-    RemoveWaveHeaders();
-    DeleteCriticalSection( &m_CriSec );
-
-    if( m_pHeader != NULL )
-    {
-        m_pHeader->Release();
-        m_pHeader = NULL;
-    }
-
-    if( m_pReader != NULL )
-    {
-        m_pReader->Release();
-        m_pReader = NULL;
-    }
-
-    if( m_hwo != NULL )
-    {
-        waveOutClose( m_hwo );
-    }
-
-    delete [] m_pszUrl;
-
-	if ( m_hOpenEvent )
-	{
-	    CloseHandle( m_hOpenEvent );
-	}
-	if ( m_hCloseEvent )
-	{
-        CloseHandle( m_hCloseEvent );
-	}
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT STDMETHODCALLTYPE CSimplePlayer::QueryInterface(
-    REFIID riid,
-    void **ppvObject )
-{
-    return( E_NOINTERFACE );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-ULONG STDMETHODCALLTYPE CSimplePlayer::AddRef()
-{
-    return( InterlockedIncrement( &m_cRef ) );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-ULONG STDMETHODCALLTYPE CSimplePlayer::Release()
-{
-    ULONG uRet = InterlockedDecrement( &m_cRef );
-
-    if( 0 == uRet )
-    {
-        delete this;
-    }
-
-    return( uRet );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT STDMETHODCALLTYPE CSimplePlayer::OnSample( 
-        /* [in] */ DWORD dwOutputNum,
-        /* [in] */ QWORD cnsSampleTime,
-        /* [in] */ QWORD cnsSampleDuration,
-        /* [in] */ DWORD dwFlags,
-        /* [in] */ INSSBuffer __RPC_FAR *pSample,
-        /* [in] */ VOID *pvContext )
-{
-    if( 0 != dwOutputNum )
-    {
-        return( S_OK );
-    }
-
-    HRESULT hr = S_OK;
-    BYTE *pData;
-    DWORD cbData;
-
-    //
-    // first UnprepareHeader and remove everthing in the ready list
-    //
-    RemoveWaveHeaders( );
-
-    hr = pSample->GetBufferAndLength( &pData, &cbData );
-    if ( FAILED( hr ) )
-    {
-        return( E_UNEXPECTED );
-    }
-
-    DEBUG_LOG(( " New Sample of length %d and PS time %d ms\n", 
-              cbData, ( DWORD ) ( cnsSampleTime / 10000 ) ));
-
-    LPWAVEHDR pwh = (LPWAVEHDR) new BYTE[ sizeof( WAVEHDR ) + cbData ];
-
-    if( NULL == pwh )
-    {
-        DEBUG_LOG(( "OnSample OUT OF MEMORY! \n"));
-
-        *m_phrCompletion = E_OUTOFMEMORY;
-        SetEvent( m_hCompletionEvent );
-        return( E_UNEXPECTED );
-    }
-
-    pwh->lpData = (LPSTR)&pwh[1];
-    pwh->dwBufferLength = cbData;
-    pwh->dwBytesRecorded = cbData;
-    pwh->dwUser = 0;
-    pwh->dwLoops = 0;
-    pwh->dwFlags = 0;
-
-    CopyMemory( pwh->lpData, pData, cbData );
-
-    MMRESULT mmr;
-
-    mmr = waveOutPrepareHeader( m_hwo, pwh, sizeof(WAVEHDR) );
-    mmr = MMSYSERR_NOERROR;
-
-    if( mmr != MMSYSERR_NOERROR )
-    {
-        DEBUG_LOG(( "failed to prepare wave buffer, error=%lu\n" , mmr ));
-        *m_phrCompletion = E_UNEXPECTED;
-        SetEvent( m_hCompletionEvent );
-        return( E_UNEXPECTED );
-    }
-
-    mmr = waveOutWrite( m_hwo, pwh, sizeof(WAVEHDR) );
-    mmr = MMSYSERR_NOERROR;
-
-    if( mmr != MMSYSERR_NOERROR )
-    {
-        delete pwh;
-
-        DEBUG_LOG(( "failed to write wave sample, error=%lu\n" , mmr ));
-        *m_phrCompletion = E_UNEXPECTED;
-        SetEvent( m_hCompletionEvent );
-        return( E_UNEXPECTED );
-    }
-
-    InterlockedIncrement( &m_cBuffersOutstanding );
-
-    return( S_OK );
-}
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT CSimplePlayer::Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hCompletionEvent, HRESULT *phrCompletion )
-{
-    HRESULT hr;
-
-    //
-    // If the URL is not a UNC path, a full path, or an Internet-style URL then assume it is
-    // a relative local file name that needs to be expanded to a full path.
-    //
-    WCHAR wszFullUrl[ MAX_PATH ];
-
-    if( ( 0 == wcsstr( pszUrl, L"\\\\" ) )
-        && ( 0 == wcsstr( pszUrl, L":\\" ) )
-        && ( 0 == wcsstr( pszUrl, L"://" ) ) )
-    {
-        //
-        // Expand to a full path name
-        //
-        LPWSTR pszCheck = _wfullpath( wszFullUrl, pszUrl, MAX_PATH );
-
-        if( NULL == pszCheck )
-        {
-           DEBUG_LOG(( "internal error %lu\n" , GetLastError() ));
-           return E_UNEXPECTED ;
-        }
-
-		pszUrl = wszFullUrl;
-    }
-
-    //
-    // Save a copy of the URL
-    //
-    delete[] m_pszUrl;
-
-    m_pszUrl = new WCHAR[ wcslen( pszUrl ) + 1 ];
-
-    if( NULL == m_pszUrl )
-    {
-        DEBUG_LOG(( "insufficient Memory\n"  )) ;
-        return( E_OUTOFMEMORY );
-    }
-
-    wcscpy( m_pszUrl, pszUrl );
-
-    //
-    // Attempt to open the URL
-    //
-    m_hCompletionEvent = hCompletionEvent;
-
-    m_phrCompletion = phrCompletion;
-
-#ifdef SUPPORT_DRM
-
-    hr = WMCreateReader( NULL, WMT_RIGHT_PLAYBACK, &m_pReader );
-
-#else
-
-    hr = WMCreateReader( NULL, 0, &m_pReader );
-
-#endif
-
-    if( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "failed to create audio reader (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    //
-    // Open the file
-    //
-    hr = m_pReader->Open( m_pszUrl, this, NULL );
-    if ( SUCCEEDED( hr ) )
-    {
-        WaitForSingleObject( m_hOpenEvent, INFINITE );
-        hr = m_hrOpen;
-    }
-    if ( NS_E_NO_STREAM == hr )
-    {
-        DEBUG_LOG(( "Waiting for transmission to begin...\n" ));
-        WaitForSingleObject( m_hOpenEvent, INFINITE );
-        hr = m_hrOpen;
-    }
-    if ( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "failed to open (hr=0x%08x)\n", hr ));
-        return( hr );
-    }
-         
-
-    //
-    // It worked!  Display various attributes
-    //
-    hr = m_pReader->QueryInterface( IID_IWMHeaderInfo, ( VOID ** )&m_pHeader );
-    if ( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "failed to qi for header interface (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    WORD i, wAttrCnt;
-
-    hr = m_pHeader->GetAttributeCount( 0, &wAttrCnt );
-    if ( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "GetAttributeCount Failed (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    WCHAR *pwszName = NULL;
-    BYTE *pValue = NULL;
-
-    for ( i = 0; i < wAttrCnt ; i++ )
-    {
-        WORD wStream = 0;
-        WORD cchNamelen = 0;
-        WMT_ATTR_DATATYPE type;
-        WORD cbLength = 0;
-
-        hr = m_pHeader->GetAttributeByIndex( i, &wStream, NULL, &cchNamelen, &type, NULL, &cbLength );
-        if ( FAILED( hr ) ) 
-        {
-            DEBUG_LOG(( "GetAttributeByIndex Failed (hr=0x%08x)\n" , hr ));
-            break;
-        }
-
-        pwszName = new WCHAR[ cchNamelen ];
-        pValue = new BYTE[ cbLength ];
-
-        if( NULL == pwszName || NULL == pValue )
-        {
-            hr = E_OUTOFMEMORY;
-            break;
-        }
-
-        hr = m_pHeader->GetAttributeByIndex( i, &wStream, pwszName, &cchNamelen, &type, pValue, &cbLength );
-        if ( FAILED( hr ) ) 
-        {
-            DEBUG_LOG(( "GetAttributeByIndex Failed (hr=0x%08x)\n" , hr ));
-            break;
-        }
-
-        switch ( type )
-        {
-        case WMT_TYPE_DWORD:
-            DEBUG_LOG(("%ws:  %u\n" , pwszName, *((DWORD *) pValue) ));
-            break;
-        case WMT_TYPE_STRING:
-            DEBUG_LOG(("%ws:   %ws\n" , pwszName, (WCHAR *) pValue ));
-            break;
-        case WMT_TYPE_BINARY:
-            DEBUG_LOG(("%ws:   Type = Binary of Length %u\n" , pwszName, cbLength ));
-            break;
-        case WMT_TYPE_BOOL:
-            DEBUG_LOG(("%ws:   %s\n" , pwszName, ( * ( ( BOOL * ) pValue) ? _T( "true" ) : _T( "false" ) ) ));
-            break;
-        case WMT_TYPE_WORD:
-            DEBUG_LOG(("%ws:  %hu\n" , pwszName, *((WORD *) pValue) ));
-            break;
-        case WMT_TYPE_QWORD:
-            DEBUG_LOG(("%ws:  %I64u\n" , pwszName, *((QWORD *) pValue) ));
-            break;
-        case WMT_TYPE_GUID:
-            DEBUG_LOG(("%ws:  %I64x%I64x\n" , pwszName, *((QWORD *) pValue), *((QWORD *) pValue + 1) ));
-            break;
-        default:
-            DEBUG_LOG(("%ws:   Type = %d, Length %u\n" , pwszName, type, cbLength ));
-            break;
-        }
-
-        delete pwszName;
-        pwszName = NULL;
-
-        delete pValue;
-        pValue = NULL;
-    }
-
-    delete pwszName;
-    pwszName = NULL;
-
-    delete pValue;
-    pValue = NULL;
-
-    if ( FAILED( hr ) )
-    {
-        return( hr );
-    }
-
-    //
-    // Make sure we're audio only
-    //
-    DWORD cOutputs;
-
-    hr = m_pReader->GetOutputCount( &cOutputs );
-    if ( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "failed GetOutputCount(), (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    if ( cOutputs != 1 )
-    {
-        DEBUG_LOG(( "Not audio only (cOutputs = %d).\n" , cOutputs ));
-        // return( E_UNEXPECTED );
-    }
-
-    IWMOutputMediaProps *pProps;
-    hr = m_pReader->GetOutputProps( 0, &pProps );
-    if ( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "failed GetOutputProps(), (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    DWORD cbBuffer = 0;
-
-    hr = pProps->GetMediaType( NULL, &cbBuffer );
-    if ( FAILED( hr ) )
-    {
-        pProps->Release( );
-        DEBUG_LOG(( "GetMediaType failed (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-    
-	WM_MEDIA_TYPE *pMediaType = ( WM_MEDIA_TYPE * ) new BYTE[cbBuffer] ;
-
-	hr = pProps->GetMediaType( pMediaType, &cbBuffer );
-    if ( FAILED( hr ) )
-    {
-        pProps->Release( );
-        DEBUG_LOG(( "GetMediaType failed (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    pProps->Release( );
-
-    if ( pMediaType->majortype != WMMEDIATYPE_Audio )
-    {
-		delete[] (BYTE *) pMediaType ;
-        DEBUG_LOG(( "Not audio only (major type mismatch).\n"  ));
-        return( E_UNEXPECTED );
-    }
-    
-    //
-    // Set up for audio playback
-    //
-    WAVEFORMATEX *pwfx = ( WAVEFORMATEX * )pMediaType->pbFormat;
-    memcpy( &m_wfx, pwfx, sizeof( WAVEFORMATEX ) + pwfx->cbSize );
-    
-    delete[] (BYTE *)pMediaType ;
-	pMediaType = NULL ;
-
-    MMRESULT mmr;
-
-    mmr = waveOutOpen( &m_hwo,
-                       WAVE_MAPPER, 
-                       &m_wfx, 
-                       (DWORD)WaveProc, 
-                       (DWORD)this, 
-                       CALLBACK_FUNCTION );
-    mmr = MMSYSERR_NOERROR;
-
-    if( mmr != MMSYSERR_NOERROR  )
-    {
-        
-        DEBUG_LOG(( "failed to open wav output device, error=%lu\n" , mmr ));
-        return( E_UNEXPECTED );
-    }
-
-    //
-    // Start reading the data (and rendering the audio)
-    //
-    QWORD cnsDuration = ( QWORD ) dwSecDuration * 10000000;
-    hr = m_pReader->Start( 0, cnsDuration, 1.0, NULL );
-
-    if( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "failed Start(), (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    return( hr );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT STDMETHODCALLTYPE CSimplePlayer::OnStatus( 
-        /* [in] */ WMT_STATUS Status,
-        /* [in] */ HRESULT hr,
-        /* [in] */ WMT_ATTR_DATATYPE dwType,
-        /* [in] */ BYTE __RPC_FAR *pValue,
-        /* [in] */ void __RPC_FAR *pvContext)
-{
-    switch( Status )
-    {
-    case WMT_OPENED:
-        DEBUG_LOG(( "OnStatus( WMT_OPENED )\n"  ));
-        m_hrOpen = hr;
-        SetEvent( m_hOpenEvent );
-        break;
-
-    case WMT_SOURCE_SWITCH:
-        DEBUG_LOG(( "OnStatus( WMT_SOURCE_SWITCH )\n"  ));
-        m_hrOpen = hr;
-        SetEvent( m_hOpenEvent );
-        break;
-
-    case WMT_ERROR:
-        DEBUG_LOG(( "OnStatus( WMT_ERROR )\n"  ));
-        break;
-
-    case WMT_STARTED:
-        DEBUG_LOG(( "OnStatus( WMT_STARTED )\n"  ));
-        break;
-
-    case WMT_STOPPED:
-        DEBUG_LOG(( "OnStatus( WMT_STOPPED )\n"  ));
-        break;
-
-    case WMT_BUFFERING_START:
-        DEBUG_LOG(( "OnStatus( WMT_BUFFERING START)\n"  ));
-        break;
-
-    case WMT_BUFFERING_STOP:
-        DEBUG_LOG(( "OnStatus( WMT_BUFFERING STOP)\n"  ));
-        break;
-
-    case WMT_EOF:
-        DEBUG_LOG(( "OnStatus( WMT_EOF )\n"  ));
-
-        //
-        // cleanup and exit
-        //
-
-        m_fEof = TRUE;
-
-        if( 0 == m_cBuffersOutstanding )
-        {
-            SetEvent( m_hCompletionEvent );
-        }
-
-        break;
-
-    case WMT_END_OF_SEGMENT:
-        DEBUG_LOG(( "OnStatus( WMT_END_OF_SEGMENT )\n"  ));
-
-        //
-        // cleanup and exit
-        //
-
-        m_fEof = TRUE;
-
-        if( 0 == m_cBuffersOutstanding )
-        {
-            SetEvent( m_hCompletionEvent );
-        }
-
-        break;
-
-    case WMT_LOCATING:
-        DEBUG_LOG(( "OnStatus( WMT_LOCATING )\n"  ));
-        break;
-
-    case WMT_CONNECTING:
-        DEBUG_LOG(( "OnStatus( WMT_CONNECTING )\n"  ));
-        break;
-
-    case WMT_NO_RIGHTS:
-        {
-            LPWSTR pwszEscapedURL = NULL;
-
-            hr = MakeEscapedURL( m_pszUrl, &pwszEscapedURL );
-
-            if( SUCCEEDED( hr ) )
-            {
-                WCHAR wszURL[ 0x1000 ];
-
-                swprintf( wszURL, L"%s&filename=%s&embedded=false", pValue, pwszEscapedURL );
-
-                hr = LaunchURL( wszURL );
-
-                if( FAILED( hr ) )
-                {
-                    DEBUG_LOG(( "Unable to launch web browser to retrieve playback license (hr=0x%08x)\n" , hr ));
-                }
-
-                delete [] pwszEscapedURL;
-				pwszEscapedURL = NULL ;
-            }
-        }
-        break;
-
-    case WMT_MISSING_CODEC:
-		{
-			DEBUG_LOG(( "Missing codec: (hr=0x%08x)\n" , hr ));
-			break;
-		}
-
-    case WMT_CLOSED:
-        SetEvent( m_hCloseEvent );
-        break;
-    };
-
-    return( S_OK );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT CSimplePlayer::Close()
-{
-    HRESULT hr = S_OK;
-
-    if( NULL != m_pReader )
-    {
-        hr = m_pReader->Close();
-
-        if( SUCCEEDED( hr ) )
-        {
-            WaitForSingleObject( m_hCloseEvent, INFINITE );
-        }
-    }
-
-    return( hr );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-void CSimplePlayer::OnWaveOutMsg( UINT uMsg, DWORD dwParam1, DWORD dwParam2 )
-{
-    if( WOM_DONE == uMsg )
-    {
-        //
-        // add the wave header to ready-to-free list for the caller
-        // to pick up and free in the next OnSample call
-        //
-        AddWaveHeader( ( LPWAVEHDR )dwParam1 );
-
-        InterlockedDecrement( &m_cBuffersOutstanding );
-
-        if( m_fEof && ( 0 == m_cBuffersOutstanding ) )
-        {
-            SetEvent( m_hCompletionEvent );
-        }
-    }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-void CALLBACK CSimplePlayer::WaveProc( 
-                                HWAVEOUT hwo, 
-                                UINT uMsg, 
-                                DWORD dwInstance, 
-                                DWORD dwParam1, 
-                                DWORD dwParam2 )
-{
-    CSimplePlayer *pThis = (CSimplePlayer*)dwInstance;
-
-    pThis->OnWaveOutMsg( uMsg, dwParam1, dwParam2 );
-}
-
-//////////////////////////////////////////////////////////////////////////////
-HRESULT CSimplePlayer::AddWaveHeader( LPWAVEHDR pwh )
-{
-    WAVEHDR_LIST *tmp = new WAVEHDR_LIST;
-    if( NULL == tmp )
-    {
-        return( E_OUTOFMEMORY );
-    }
-    tmp->pwh = pwh;
-
-    EnterCriticalSection( &m_CriSec );
-    tmp->next = m_whdrHead;
-    m_whdrHead = tmp;
-    LeaveCriticalSection( &m_CriSec );
-    return( S_OK );
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void CSimplePlayer::RemoveWaveHeaders( )
-{
-    WAVEHDR_LIST *tmp;
-
-    EnterCriticalSection( &m_CriSec );
-    while( NULL != m_whdrHead )
-    {
-        tmp = m_whdrHead->next;
-        DEBUG_ASSERTCRASH( m_whdrHead->pwh->dwFlags & WHDR_DONE, ("RemoveWaveHeaders!") );
-        waveOutUnprepareHeader( m_hwo, m_whdrHead->pwh, sizeof( WAVEHDR ) );
-        delete m_whdrHead->pwh;
-        delete m_whdrHead;
-        m_whdrHead = tmp;
-    }
-    LeaveCriticalSection( &m_CriSec );
-}
diff --git a/Generals/Code/GameEngine/Source/Common/Audio/urllaunch.cpp b/Generals/Code/GameEngine/Source/Common/Audio/urllaunch.cpp
deleted file mode 100644
index e3be6c9cc5f..00000000000
--- a/Generals/Code/GameEngine/Source/Common/Audio/urllaunch.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "Common/urllaunch.h"
-
-#define FILE_PREFIX     L"file://"
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL )
-{
-    if( ( NULL == pszInURL ) || ( NULL == ppszOutURL ) )
-    {
-        return( E_INVALIDARG );
-    }
-
-    //
-    // Do we need to pre-pend file://?
-    //
-    BOOL fNeedFilePrefix = ( 0 == wcsstr( pszInURL, L"://" ) );
-
-    //
-    // Count how many characters need to be escaped
-    //
-    LPWSTR pszTemp = pszInURL;
-    DWORD cEscapees = 0;
-
-    while( TRUE )
-    {
-        LPWSTR pchToEscape = wcspbrk( pszTemp, L" #$%&\\+,;=@[]^{}" );
-
-        if( NULL == pchToEscape )
-        {
-            break;
-        }
-
-        cEscapees++;
-
-        pszTemp = pchToEscape + 1;
-    }
-
-    //
-    // Allocate sufficient outgoing buffer space
-    //
-    int cchNeeded = wcslen( pszInURL ) + ( 2 * cEscapees ) + 1;
-
-    if( fNeedFilePrefix )
-    {
-        cchNeeded += wcslen( FILE_PREFIX );
-    }
-
-    *ppszOutURL = new WCHAR[ cchNeeded ];
-
-    if( NULL == *ppszOutURL )
-    {
-        return( E_OUTOFMEMORY );
-    }
-
-    //
-    // Fill in the outgoing escaped buffer
-    //
-    pszTemp = pszInURL;
-
-    LPWSTR pchNext = *ppszOutURL;
-
-    if( fNeedFilePrefix )
-    {
-        wcscpy( *ppszOutURL, FILE_PREFIX );
-        pchNext += wcslen( FILE_PREFIX );
-    }
-
-    while( TRUE )
-    {
-        LPWSTR pchToEscape = wcspbrk( pszTemp, L" #$%&\\+,;=@[]^{}" );
-
-        if( NULL == pchToEscape )
-        {
-            //
-            // Copy the rest of the input string and get out
-            //
-            wcscpy( pchNext, pszTemp );
-            break;
-        }
-
-        //
-        // Copy all characters since the previous escapee
-        //
-        int cchToCopy = pchToEscape - pszTemp;
-
-        if( cchToCopy > 0 )
-        {
-            wcsncpy( pchNext, pszTemp, cchToCopy );
-
-            pchNext += cchToCopy;
-        }
-
-        //
-        // Expand this character into an escape code and move on
-        //
-        pchNext += swprintf( pchNext, L"%%%02x", *pchToEscape );
-
-        pszTemp = pchToEscape + 1;
-    }
-
-    return( S_OK );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT GetShellOpenCommand( LPTSTR ptszShellOpenCommand, DWORD cbShellOpenCommand )
-{
-    LONG lResult;
-
-    HKEY hKey = NULL;
-    HKEY hFileKey = NULL;
-
-    BOOL fFoundExtensionCommand = FALSE;
-
-    do
-    {
-        //
-        // Look for the file type associated with .html files
-        //
-        TCHAR szFileType[ MAX_PATH ];
-
-        lResult = RegOpenKeyEx( HKEY_CLASSES_ROOT, _T( ".html" ), 0, KEY_READ, &hKey );
-
-        if( ERROR_SUCCESS != lResult )
-        {
-            break;
-        }
-
-        DWORD dwLength = sizeof( szFileType );
-
-        lResult = RegQueryValueEx( hKey, NULL, 0, NULL, (BYTE *)szFileType, &dwLength );
-
-        if( ERROR_SUCCESS != lResult )
-        {
-            break;
-        }
-
-        //
-        // Find the command for the shell's open verb associated with this file type
-        //
-        TCHAR szKeyName[ MAX_PATH + 20 ];
-
-        wsprintf( szKeyName, _T( "%s\\shell\\open\\command" ), szFileType );
-
-        lResult = RegOpenKeyEx( HKEY_CLASSES_ROOT, szKeyName, 0, KEY_READ, &hFileKey );
-
-        if( ERROR_SUCCESS != lResult )
-        {
-            break;
-        }
-
-        dwLength = cbShellOpenCommand;
-
-        lResult = RegQueryValueEx( hFileKey, NULL, 0, NULL, (BYTE *)ptszShellOpenCommand, &dwLength );
-
-        if( 0 == lResult )
-        {
-            fFoundExtensionCommand = TRUE;
-        }
-    }
-    while( FALSE );
-
-    //
-    // If there was no application associated with .html files by extension, look for
-    // an application associated with the http protocol
-    //
-    if( !fFoundExtensionCommand )
-    {
-        if( NULL != hKey )
-        {
-            RegCloseKey( hKey );
-        }
-
-        do
-        {
-            //
-            // Find the command for the shell's open verb associated with the http protocol
-            //
-            lResult = RegOpenKeyEx( HKEY_CLASSES_ROOT, _T( "http\\shell\\open\\command" ), 0, KEY_READ, &hKey );
-
-            if( ERROR_SUCCESS != lResult )
-            {
-                break;
-            }
-
-            DWORD dwLength = cbShellOpenCommand;
-
-            lResult = RegQueryValueEx( hKey, NULL, 0, NULL, (BYTE *)ptszShellOpenCommand, &dwLength );
-        }
-        while( FALSE );
-    }
-
-    if( NULL != hKey )
-    {
-        RegCloseKey( hKey );
-    }
-
-    if( NULL != hFileKey )
-    {
-        RegCloseKey( hFileKey );
-    }
-
-    return( HRESULT_FROM_WIN32( lResult ) );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT LaunchURL( LPCWSTR pszURL )
-{
-    HRESULT hr;
-
-    //
-    // Find the appropriate command to launch URLs with
-    //
-    TCHAR szShellOpenCommand[ MAX_PATH * 2 ];
-
-    hr = GetShellOpenCommand( szShellOpenCommand, sizeof( szShellOpenCommand ) );
-
-    if( FAILED( hr ) )
-    {
-        return( hr );
-    }
-
-    //
-    // Build the appropriate command line, substituting our URL parameter
-    //
-    TCHAR szLaunchCommand[ 2000 ];
-
-    LPTSTR pszParam = _tcsstr( szShellOpenCommand, _T( "\"%1\"" ) );
-
-    if( NULL == pszParam )
-    {
-        pszParam = _tcsstr( szShellOpenCommand, _T( "\"%*\"" ) );
-    }
-
-    if( NULL != pszParam )
-    {
-        *pszParam = _T( '\0' ) ;
-
-        wsprintf( szLaunchCommand, _T( "%s%ws%s" ), szShellOpenCommand, pszURL, pszParam + 4 );
-    }
-    else
-    {
-        wsprintf( szLaunchCommand, _T( "%s %ws" ), szShellOpenCommand, pszURL );
-    }
-
-    //
-    // Find the application name, stripping quotes if necessary
-    //
-    TCHAR szExe[ MAX_PATH * 2 ];
-    LPTSTR pchFirst = szShellOpenCommand;
-    LPTSTR pchNext = NULL;
-
-    while( _T( ' ' ) == *pchFirst )
-    {
-        pchFirst++;
-    }
-
-    if( _T( '"' ) == *pchFirst )
-    {
-        pchFirst++;
-
-        pchNext = _tcschr( pchFirst, _T( '"' ) );
-    }
-    else
-    {
-        pchNext = _tcschr( pchFirst + 1, _T( ' ' ) );
-    }
-
-    if( NULL == pchNext )
-    {
-        pchNext = szShellOpenCommand + _tcslen( szShellOpenCommand );
-    }
-
-    _tcsncpy( szExe, pchFirst, pchNext - pchFirst );
-    szExe[ pchNext - pchFirst ] = _T( '\0' ) ;
-
-    //
-    // Because of the extremely long length of the URLs, neither
-    // WinExec, nor ShellExecute, were working correctly.  For this reason 
-    // we use CreateProcess.  The CreateProcess documentation in MSDN says
-    // that the most robust way to call CreateProcess is to pass the full
-    // command line, where the first element is the application name, in the
-    // lpCommandLine parameter.  In our case this is necesssary to get Netscape
-    // to function properly.
-    //
-    PROCESS_INFORMATION ProcInfo;
-    ZeroMemory( (LPVOID)&ProcInfo, sizeof( PROCESS_INFORMATION ) );
-
-    STARTUPINFO StartUp;
-    ZeroMemory( (LPVOID)&StartUp, sizeof( STARTUPINFO ) );
-
-    StartUp.cb = sizeof(STARTUPINFO); 
-
-    if( !CreateProcess( szExe, szLaunchCommand, NULL, NULL, 
-                        FALSE, 0, NULL, NULL, &StartUp, &ProcInfo) )
-    {
-        hr = HRESULT_FROM_WIN32( GetLastError() );
-    }
-    else
-    {
-        //
-        // CreateProcess succeeded and we do not need the handles to the thread 
-        // or the process, so close them now.
-        //
-        if( NULL != ProcInfo.hThread )
-        {
-            CloseHandle( ProcInfo.hThread );
-        }
-
-        if( NULL != ProcInfo.hProcess )
-        {
-            CloseHandle( ProcInfo.hProcess );
-        }
-    }
-
-    return( hr );
-}
diff --git a/Generals/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp b/Generals/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp
index 863ad4fba80..13c26feb030 100644
--- a/Generals/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp
+++ b/Generals/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp
@@ -27,24 +27,20 @@
 
 //-------------------------------------------------------------------------------------------------
 BezFwdIterator::BezFwdIterator(): mStep(0), mStepsDesired(0)
-{ 
-	// Added by Sadullah Nader
+{
 	mCurrPoint.zero();
 	mDDDq.zero();
 	mDDq.zero();
 	mDq.zero();
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 BezFwdIterator::BezFwdIterator(Int stepsDesired, const BezierSegment *bezSeg)
 {
-	// Added by Sadullah Nader
 	mCurrPoint.zero();
 	mDDDq.zero();
 	mDDq.zero();
 	mDq.zero();
-	//
-
 	mStepsDesired = stepsDesired;
 	mBezSeg = (*bezSeg);
 }
diff --git a/Generals/Code/GameEngine/Source/Common/Bezier/BezierSegment.cpp b/Generals/Code/GameEngine/Source/Common/Bezier/BezierSegment.cpp
index 675cd1bb474..36aff788898 100644
--- a/Generals/Code/GameEngine/Source/Common/Bezier/BezierSegment.cpp
+++ b/Generals/Code/GameEngine/Source/Common/Bezier/BezierSegment.cpp
@@ -31,15 +31,15 @@
 
 //-------------------------------------------------------------------------------------------------
 BezierSegment::BezierSegment()
-{ 
+{
 	for(int i=0; i < 4; i++)
 		m_controlPoints[i].zero();
 }
 
 //-------------------------------------------------------------------------------------------------
-BezierSegment::BezierSegment(Real x0, Real y0, Real z0, 
-														 Real x1, Real y1, Real z1, 
-														 Real x2, Real y2, Real z2, 
+BezierSegment::BezierSegment(Real x0, Real y0, Real z0,
+														 Real x1, Real y1, Real z1,
+														 Real x2, Real y2, Real z2,
 														 Real x3, Real y3, Real z3)
 {
 	m_controlPoints[0].x = x0;
@@ -110,7 +110,7 @@ void BezierSegment::evaluateBezSegmentAtT(Real tValue, Coord3D *outResult) const
 
 	D3DXVECTOR4 tResult;
 	D3DXVec4Transform(&tResult, &tVec, &BezierSegment::s_bezBasisMatrix);
-	
+
 	outResult->x = D3DXVec4Dot(&xCoords, &tResult);
 	outResult->y = D3DXVec4Dot(&yCoords, &tResult);
 	outResult->z = D3DXVec4Dot(&zCoords, &tResult);
@@ -122,7 +122,7 @@ void BezierSegment::getSegmentPoints(Int numSegments, VecCoord3D *outResult) con
 	if (!outResult) {
 		return;
 	}
-	
+
 	outResult->clear();
 	outResult->resize(numSegments);
 
@@ -137,24 +137,24 @@ void BezierSegment::getSegmentPoints(Int numSegments, VecCoord3D *outResult) con
 }
 
 //-------------------------------------------------------------------------------------------------
-// This function isn't terribly fast. There are alternatives, and if this is too slow, we can 
+// This function isn't terribly fast. There are alternatives, and if this is too slow, we can
 // take a look at the other approximations.
 // There is no known close-form solution to this problem.
 Real BezierSegment::getApproximateLength(Real withinTolerance) const
 {
 	/*
 		How this works:
-		We can determine the approximate length of a bezier segment by 
-		L0 = |(P0,P1)| + |(P1,P2)| + |(P2,P3)| 
+		We can determine the approximate length of a bezier segment by
+		L0 = |(P0,P1)| + |(P1,P2)| + |(P2,P3)|
 		L1 = |(P0,P3)|
-		
+
 		The length of the segment is approximately 1/2 L0 + 1/2 L1
 
 		P1__P2
 		/		 \
 	 P0----P3
 
-		The error in this is L1 - L0. If the error is too much, then we subdivide the curve and 
+		The error in this is L1 - L0. If the error is too much, then we subdivide the curve and
 		try again.
 	*/
 
@@ -211,12 +211,12 @@ void BezierSegment::splitSegmentAtT(Real tValue, BezierSegment &outSeg1, BezierS
 	p1p2.add(&m_controlPoints[1]);
 	p2p3.add(&m_controlPoints[2]);
 
-	Coord3D triLeft = { p1p2.x - p0p1.x, 
-											p1p2.y - p0p1.y, 
+	Coord3D triLeft = { p1p2.x - p0p1.x,
+											p1p2.y - p0p1.y,
 											p1p2.z - p0p1.z, };
 
-	Coord3D triRight = { p2p3.x - p1p2.x, 
-											 p2p3.y - p1p2.y, 
+	Coord3D triRight = { p2p3.x - p1p2.x,
+											 p2p3.y - p1p2.y,
 											 p2p3.z - p1p2.z, };
 
 	triLeft.scale(tValue);
@@ -233,7 +233,7 @@ void BezierSegment::splitSegmentAtT(Real tValue, BezierSegment &outSeg1, BezierS
 	outSeg2.m_controlPoints[0] = outSeg1.m_controlPoints[3];
 	outSeg2.m_controlPoints[1] = triRight;
 	outSeg2.m_controlPoints[2] = p2p3;
-	outSeg2.m_controlPoints[3] = m_controlPoints[3];	
+	outSeg2.m_controlPoints[3] = m_controlPoints[3];
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/Common/BitFlags.cpp b/Generals/Code/GameEngine/Source/Common/BitFlags.cpp
index 5f0e09ec230..ceb943c9742 100644
--- a/Generals/Code/GameEngine/Source/Common/BitFlags.cpp
+++ b/Generals/Code/GameEngine/Source/Common/BitFlags.cpp
@@ -32,13 +32,14 @@
 
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
-#include "Common/BitFlags.h" 
+#include "Common/BitFlags.h"
 #include "Common/BitFlagsIO.h"
 #include "Common/ModelState.h"
 #include "GameLogic/ArmorSet.h"
 
-const char* ModelConditionFlags::s_bitNameList[] = 
-{	
+template<>
+const char* const ModelConditionFlags::s_bitNameList[] =
+{
 	"TOPPLED",
 	"FRONTCRUSHED",
 	"BACKCRUSHED",
@@ -125,7 +126,7 @@ const char* ModelConditionFlags::s_bitNameList[] =
 	"RAPPELLING",
 	"ARMED",
 	"POWER_PLANT_UPGRADING",
-	
+
 	"SPECIAL_CHEERING",
 
 	"CONTINUOUS_FIRE_SLOW",
@@ -147,14 +148,17 @@ const char* ModelConditionFlags::s_bitNameList[] =
 
 	NULL
 };
- 
-const char* ArmorSetFlags::s_bitNameList[] = 
+static_assert(ARRAY_SIZE(ModelConditionFlags::s_bitNameList) == ModelConditionFlags::NumBits + 1, "Incorrect array size");
+
+template<>
+const char* const ArmorSetFlags::s_bitNameList[] =
 {
 	"VETERAN",
 	"ELITE",
 	"HERO",
 	"PLAYER_UPGRADE",
+	"WEAK_VERSUS_BASEDEFENSES",
 
 	NULL
 };
-
+static_assert(ARRAY_SIZE(ArmorSetFlags::s_bitNameList) == ArmorSetFlags::NumBits + 1, "Incorrect array size");
diff --git a/Generals/Code/GameEngine/Source/Common/CRCDebug.cpp b/Generals/Code/GameEngine/Source/Common/CRCDebug.cpp
deleted file mode 100644
index e6f8981f57c..00000000000
--- a/Generals/Code/GameEngine/Source/Common/CRCDebug.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/CRCDebug.h"
-#include "Common/Debug.h"
-#include "Common/PerfTimer.h"
-#include "Common/LocalFileSystem.h"
-#include "GameClient/InGameUI.h"
-#include "GameNetwork/IPEnumeration.h"
-#include <cstdarg>
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#ifdef DEBUG_CRC
-
-static const Int MaxStrings = 64000;
-static const Int MaxStringLen = 1024;
-
-static char DebugStrings[MaxStrings][MaxStringLen];
-static Int nextDebugString = 0;
-static Int numDebugStrings = 0;
-//static char DumpStrings[MaxStrings][MaxStringLen];
-//static Int nextDumpString = 0;
-//static Int numDumpStrings = 0;
-
-#define IS_FRAME_OK_TO_LOG TheGameLogic->isInGame() && !TheGameLogic->isInShellGame() && !TheDebugIgnoreSyncErrors && \
-	TheCRCFirstFrameToLog >= 0 && TheCRCFirstFrameToLog <= TheGameLogic->getFrame() \
-	&& TheGameLogic->getFrame() <= TheCRCLastFrameToLog
-
-CRCVerification::CRCVerification()
-{
-#ifdef DEBUG_LOGGING
-/**/
-	if (g_verifyClientCRC && (IS_FRAME_OK_TO_LOG))
-	{
-		m_startCRC = TheGameLogic->getCRC(CRC_RECALC, (g_clientDeepCRC)?"clientPre.crc":"");
-	}
-	else
-	{
-		m_startCRC = 0;
-	}
-/**/
-#endif
-}
-
-CRCVerification::~CRCVerification()
-{
-#ifdef DEBUG_LOGGING
-/**/
-	UnsignedInt endCRC = 0;
-	if (g_verifyClientCRC && (IS_FRAME_OK_TO_LOG))
-	{
-		endCRC = TheGameLogic->getCRC(CRC_RECALC, (g_clientDeepCRC)?"clientPost.crc":"");
-	}
-	DEBUG_ASSERTCRASH(!TheGameLogic->isInGame() || m_startCRC == endCRC, ("GameLogic changed outside of GameLogic::update() on frame %d!", TheGameLogic->getFrame()));
-	if (TheGameLogic->isInMultiplayerGame() && m_startCRC != endCRC)
-	{
-		if (TheInGameUI)
-		{
-			TheInGameUI->message(UnicodeString(L"GameLogic changed outside of GameLogic::update() - call Matt (x36804)!"));
-		}
-		CRCDEBUG_LOG(("GameLogic changed outside of GameLogic::update()!!!\n"));
-	}
-/**/
-#endif
-}
-
-void outputCRCDebugLines( void )
-{
-	IPEnumeration ips;
-	AsciiString fname;
-	fname.format("crcDebug%s.txt", ips.getMachineName().str());
-	FILE *fp = fopen(fname.str(), "wt");
-	int start = 0;
-	int end = nextDebugString;
-	if (numDebugStrings >= MaxStrings)
-		start = nextDebugString - MaxStrings;
-
-	for (Int i=start; i<end; ++i)
-	{
-		const char *line = DebugStrings[ (i + MaxStrings) % MaxStrings ];
-		DEBUG_LOG(("%s\n", line));
-		if (fp) fprintf(fp, "%s\n", line);
-	}
-
-	if (fp) fclose(fp);
-}
-
-Int lastCRCDebugFrame = 0;
-Int lastCRCDebugIndex = 0;
-extern Bool inCRCGen;
-
-void CRCDebugStartNewGame()
-{
-	if (TheGameLogic->isInShellGame())
-		return;
-	if (g_saveDebugCRCPerFrame)
-	{
-		// Create folder for frame data, if it doesn't exist yet.
-		CreateDirectory(g_saveDebugCRCPerFrameDir.str(), NULL);
-
-		// Delete existing files
-		FilenameList files;
-		AsciiString dir = g_saveDebugCRCPerFrameDir;
-		dir.concat("/");
-		TheLocalFileSystem->getFileListInDirectory(dir.str(), "", "DebugFrame_*.txt", files, FALSE);
-		FilenameList::iterator it;
-		for (it = files.begin(); it != files.end(); ++it)
-		{
-			DeleteFile(it->str());
-		}
-	}
-	nextDebugString = 0;
-	numDebugStrings = 0;
-	lastCRCDebugFrame = 0;
-	lastCRCDebugIndex = 0;
-}
-
-static void outputCRCDebugLinesPerFrame()
-{
-	if (!g_saveDebugCRCPerFrame || numDebugStrings == 0)
-		return;
-	AsciiString fname;
-	fname.format("%s/DebugFrame_%06d.txt", g_saveDebugCRCPerFrameDir.str(), lastCRCDebugFrame);
-	FILE *fp = fopen(fname.str(), "wt");
-	int start = 0;
-	int end = nextDebugString;
-	if (numDebugStrings >= MaxStrings)
-		start = nextDebugString - MaxStrings;
-	nextDebugString = 0;
-	numDebugStrings = 0;
-	if (!fp)
-		return;
-
-	for (Int i=start; i<end; ++i)
-	{
-		const char *line = DebugStrings[ (i + MaxStrings) % MaxStrings ];
-		//DEBUG_LOG(("%s\n", line));
-		fprintf(fp, "%s\n", line);
-	}
-
-	fclose(fp);
-}
-
-void outputCRCDumpLines( void )
-{
-	/*
-	int start = 0;
-	int end = nextDumpString;
-	if (numDumpStrings >= MaxStrings)
-		start = nextDumpString - MaxStrings;
-
-	for (Int i=start; i<end; ++i)
-	{
-		const char *line = DumpStrings[ (i + MaxStrings) % MaxStrings ];
-		DEBUG_LOG(("%s", line));
-	}
-	*/
-}
-
-static AsciiString getFname(AsciiString path)
-{
-	return path.reverseFind('\\') + 1;
-}
-
-static void addCRCDebugLineInternal(bool count, const char *fmt, va_list args)
-{
-	if (TheGameLogic == NULL || !(IS_FRAME_OK_TO_LOG))
-		return;
-
-	if (lastCRCDebugFrame != TheGameLogic->getFrame())
-	{
-		outputCRCDebugLinesPerFrame();
-		lastCRCDebugFrame = TheGameLogic->getFrame();
-		lastCRCDebugIndex = 0;
-	}
-
-	if (count)
-		sprintf(DebugStrings[nextDebugString], "%d:%05d ", TheGameLogic->getFrame(), lastCRCDebugIndex++);
-	else
-		DebugStrings[nextDebugString][0] = 0;
-	Int len = strlen(DebugStrings[nextDebugString]);
-
-	vsnprintf(DebugStrings[nextDebugString]+len, MaxStringLen-len, fmt, args);
-
-	char *tmp = DebugStrings[nextDebugString];
-	while (tmp && *tmp)
-	{
-		if (*tmp == '\r' || *tmp == '\n')
-		{
-			*tmp = ' ';
-		}
-		++tmp;
-	}
-
-	//DEBUG_LOG(("%s\n", DebugStrings[nextDebugString]));
-
-	++nextDebugString;
-	++numDebugStrings;
-	if (nextDebugString == MaxStrings)
-		nextDebugString = 0;
-}
-
-void addCRCDebugLine(const char *fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    addCRCDebugLineInternal(true, fmt, args);
-    va_end(args);
-}
-
-void addCRCDebugLineNoCounter(const char *fmt, ...)
-{
-	// TheSuperHackers @feature helmutbuhler 04/09/2025
-	// This version doesn't increase the lastCRCDebugIndex counter
-	// and can be used for logging lines that don't necessarily match up on all peers.
-	// (Otherwise the numbers would no longer match up and the diff would be very difficult to read)
-    va_list args;
-    va_start(args, fmt);
-    addCRCDebugLineInternal(false, fmt, args);
-    va_end(args);
-}
-
-void addCRCGenLine(const char *fmt, ...)
-{
-	if (!(IS_FRAME_OK_TO_LOG))
-		return;
-
-	static char buf[MaxStringLen];
-	va_list va;
-	va_start( va, fmt );
-	vsnprintf(buf, MaxStringLen, fmt, va );
-	va_end( va );
-	addCRCDebugLine("%s", buf);
-
-	//DEBUG_LOG(("%s", buf));
-}
-
-void addCRCDumpLine(const char *fmt, ...)
-{
-	/*
-	va_list va;
-	va_start( va, fmt );
-	vsnprintf(DumpStrings[nextDumpString], MaxStringLen, fmt, va );
-	va_end( va );
-
-	++nextDumpString;
-	++numDumpStrings;
-	if (nextDumpString == MaxStrings)
-		nextDumpString = 0;
-		*/
-}
-
-void dumpVector3(const Vector3 *v, AsciiString name, AsciiString fname, Int line)
-{
-	if (!(IS_FRAME_OK_TO_LOG)) return;
-	fname.toLower();
-	fname = getFname(fname);
-	addCRCDebugLine("dumpVector3() %s:%d %s %8.8X %8.8X %8.8X\n",
-		fname.str(), line, name.str(),
-		AS_INT(v->X), AS_INT(v->Y), AS_INT(v->Z));
-}
-
-void dumpCoord3D(const Coord3D *c, AsciiString name, AsciiString fname, Int line)
-{
-	if (!(IS_FRAME_OK_TO_LOG)) return;
-	fname.toLower();
-	fname = getFname(fname);
-	addCRCDebugLine("dumpCoord3D() %s:%d %s %8.8X %8.8X %8.8X\n",
-		fname.str(), line, name.str(),
-		AS_INT(c->x), AS_INT(c->y), AS_INT(c->z));
-}
-
-void dumpMatrix3D(const Matrix3D *m, AsciiString name, AsciiString fname, Int line)
-{
-	if (!(IS_FRAME_OK_TO_LOG)) return;
-	fname.toLower();
-	fname = getFname(fname);
-	const Real *matrix = (const Real *)m;
-	addCRCDebugLine("dumpMatrix3D() %s:%d %s\n",
-		fname.str(), line, name.str());
-	for (Int i=0; i<3; ++i)
-		addCRCDebugLine("      0x%08X 0x%08X 0x%08X 0x%08X\n",
-			AS_INT(matrix[(i<<2)+0]), AS_INT(matrix[(i<<2)+1]), AS_INT(matrix[(i<<2)+2]), AS_INT(matrix[(i<<2)+3]));
-}
-
-void dumpReal(Real r, AsciiString name, AsciiString fname, Int line)
-{
-	if (!(IS_FRAME_OK_TO_LOG)) return;
-	fname.toLower();
-	fname = getFname(fname);
-	addCRCDebugLine("dumpReal() %s:%d %s %8.8X (%f)\n",
-		fname.str(), line, name.str(), AS_INT(r), r);
-}
-
-#endif // DEBUG_CRC
diff --git a/Generals/Code/GameEngine/Source/Common/CommandLine.cpp b/Generals/Code/GameEngine/Source/Common/CommandLine.cpp
index f5899829fab..0ec260b3861 100644
--- a/Generals/Code/GameEngine/Source/Common/CommandLine.cpp
+++ b/Generals/Code/GameEngine/Source/Common/CommandLine.cpp
@@ -29,16 +29,14 @@
 #include "Common/CommandLine.h"
 #include "Common/CRCDebug.h"
 #include "Common/LocalFileSystem.h"
+#include "Common/Recorder.h"
 #include "Common/version.h"
+#include "GameClient/ClientInstance.h"
 #include "GameClient/TerrainVisual.h" // for TERRAIN_LOD_MIN definition
 #include "GameClient/GameText.h"
 #include "GameNetwork/NetworkDefs.h"
+#include "trim.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
@@ -58,7 +56,7 @@ Bool g_clientDeepCRC = FALSE;
 Bool g_logObjectCRCs = FALSE;
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 extern Bool g_useStringFile;
 #endif
 
@@ -85,7 +83,7 @@ static void ConvertShortMapPathToLongMapPath(AsciiString &mapName)
 		return;
 	}
 	path.nextToken(&token, "\\/");
-	while (!token.endsWithNoCase(".map") && (token.getLength() > 0))
+	while (!token.endsWithNoCase(".map") && (!token.isEmpty()))
 	{
 		actualpath.concat(token);
 		actualpath.concat('\\');
@@ -97,10 +95,7 @@ static void ConvertShortMapPathToLongMapPath(AsciiString &mapName)
 		DEBUG_CRASH(("Invalid map name %s", mapName.str()));
 	}
 	// remove the .map from the end.
-	token.removeLastChar();
-	token.removeLastChar();
-	token.removeLastChar();
-	token.removeLastChar();
+	token.truncateBy(4);
 
 	actualpath.concat(token);
 	actualpath.concat('\\');
@@ -114,7 +109,7 @@ static void ConvertShortMapPathToLongMapPath(AsciiString &mapName)
 //=============================================================================
 Int parseNoLogOrCrash(char *args[], int)
 {
-	DEBUG_CRASH(("-NoLogOrCrash not supported in this build\n"));
+	DEBUG_CRASH(("-NoLogOrCrash not supported in this build"));
 	return 1;
 }
 
@@ -122,10 +117,8 @@ Int parseNoLogOrCrash(char *args[], int)
 //=============================================================================
 Int parseWin(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_windowed = true;
-	}
+	TheWritableGlobalData->m_windowed = true;
+
 	return 1;
 }
 
@@ -133,10 +126,8 @@ Int parseWin(char *args[], int)
 //=============================================================================
 Int parseNoMusic(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_musicOn = false;
-	}
+	TheWritableGlobalData->m_musicOn = false;
+
 	return 1;
 }
 
@@ -145,10 +136,8 @@ Int parseNoMusic(char *args[], int)
 //=============================================================================
 Int parseNoVideo(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_videoOn = false;
-	}
+	TheWritableGlobalData->m_videoOn = false;
+
 	return 1;
 }
 
@@ -167,14 +156,21 @@ Int parseFPUPreserve(char *args[], int argc)
 //=============================================================================
 Int parseUseWaveEditor(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_usingWaterTrackEditor = TRUE;
-	}
+	TheWritableGlobalData->m_usingWaterTrackEditor = TRUE;
+
 	return 1;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+//=============================================================================
+//=============================================================================
+Int parseFullViewport(char *args[], int num)
+{
+	TheWritableGlobalData->m_viewportHeightScale = 1.0f;
+
+	return 1;
+}
+
+#if defined(RTS_DEBUG)
 
 //=============================================================================
 //=============================================================================
@@ -188,10 +184,8 @@ Int parseUseCSF(char *args[], int)
 //=============================================================================
 Int parseNoInputDisable(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_disableScriptedInputDisabling = true;
-	}
+	TheWritableGlobalData->m_disableScriptedInputDisabling = true;
+
 	return 1;
 }
 
@@ -199,10 +193,8 @@ Int parseNoInputDisable(char *args[], int)
 //=============================================================================
 Int parseNoFade(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_disableCameraFade = true;
-	}
+	TheWritableGlobalData->m_disableCameraFade = true;
+
 	return 1;
 }
 
@@ -210,13 +202,11 @@ Int parseNoFade(char *args[], int)
 //=============================================================================
 Int parseNoMilCap(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_disableMilitaryCaption = true;
-	}
+	TheWritableGlobalData->m_disableMilitaryCaption = true;
+
 	return 1;
 }
-#endif // RTS_DEBUG || RTS_INTERNAL
+#endif // RTS_DEBUG
 
 //=============================================================================
 //=============================================================================
@@ -351,15 +341,12 @@ Int parseReplayCRCInterval(char *args[], int argc)
 Int parseNoDraw(char *args[], int argc)
 {
 #ifdef DEBUG_CRC
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_noDraw = TRUE;
-	}
+	TheWritableGlobalData->m_noDraw = TRUE;
 #endif
 	return 1;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 
 //=============================================================================
 //=============================================================================
@@ -371,19 +358,17 @@ Int parseLogToConsole(char *args[], int)
 	return 1;
 }
 
-#endif // RTS_DEBUG || RTS_INTERNAL
+#endif // RTS_DEBUG
 
 //=============================================================================
 //=============================================================================
 Int parseNoAudio(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_audioOn = false;
-		TheWritableGlobalData->m_speechOn = false;
-		TheWritableGlobalData->m_soundsOn = false;
-		TheWritableGlobalData->m_musicOn = false;
-	}
+	TheWritableGlobalData->m_audioOn = false;
+	TheWritableGlobalData->m_speechOn = false;
+	TheWritableGlobalData->m_soundsOn = false;
+	TheWritableGlobalData->m_musicOn = false;
+
 	return 1;
 }
 
@@ -391,10 +376,8 @@ Int parseNoAudio(char *args[], int)
 //=============================================================================
 Int parseNoWin(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_windowed = false;
-	}
+	TheWritableGlobalData->m_windowed = false;
+
 	return 1;
 }
 
@@ -409,17 +392,15 @@ Int parseFullVersion(char *args[], int num)
 
 Int parseNoShadows(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_useShadowVolumes = false;
-		TheWritableGlobalData->m_useShadowDecals = false;
-	}
+	TheWritableGlobalData->m_useShadowVolumes = false;
+	TheWritableGlobalData->m_useShadowDecals = false;
+
 	return 1;
 }
 
 Int parseMapName(char *args[], int num)
 {
-	if (TheWritableGlobalData && num == 2)
+	if (num == 2)
 	{
 		TheWritableGlobalData->m_mapName.set( args[ 1 ] );
 		ConvertShortMapPathToLongMapPath(TheWritableGlobalData->m_mapName);
@@ -427,9 +408,59 @@ Int parseMapName(char *args[], int num)
 	return 1;
 }
 
+Int parseHeadless(char *args[], int num)
+{
+	TheWritableGlobalData->m_headless = TRUE;
+	TheWritableGlobalData->m_playIntro = FALSE;
+	TheWritableGlobalData->m_afterIntro = TRUE;
+	TheWritableGlobalData->m_playSizzle = FALSE;
+	return 1;
+}
+
+Int parseReplay(char *args[], int num)
+{
+	if (num > 1)
+	{
+		AsciiString filename = args[1];
+		if (!filename.endsWithNoCase(RecorderClass::getReplayExtention()))
+		{
+			printf("Invalid replay name \"%s\"\n", filename.str());
+			exit(1);
+		}
+		TheWritableGlobalData->m_simulateReplays.push_back(filename);
+
+		TheWritableGlobalData->m_playIntro = FALSE;
+		TheWritableGlobalData->m_afterIntro = TRUE;
+		TheWritableGlobalData->m_playSizzle = FALSE;
+		TheWritableGlobalData->m_shellMapOn = FALSE;
+
+		// Make replay playback possible while other clients (possible retail) are running
+		rts::ClientInstance::setMultiInstance(TRUE);
+		rts::ClientInstance::skipPrimaryInstance();
+
+		return 2;
+	}
+	return 1;
+}
+
+Int parseJobs(char *args[], int num)
+{
+	if (num > 1)
+	{
+		TheWritableGlobalData->m_simulateReplayJobs = atoi(args[1]);
+		if (TheGlobalData->m_simulateReplayJobs < SIMULATE_REPLAYS_SEQUENTIAL || TheGlobalData->m_simulateReplayJobs == 0)
+		{
+			printf("Invalid number of jobs: %d\n", TheGlobalData->m_simulateReplayJobs);
+			exit(1);
+		}
+		return 2;
+	}
+	return 1;
+}
+
 Int parseXRes(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_xResolution = atoi(args[1]);
 		return 2;
@@ -439,7 +470,7 @@ Int parseXRes(char *args[], int num)
 
 Int parseYRes(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_yResolution = atoi(args[1]);
 		return 2;
@@ -447,12 +478,12 @@ Int parseYRes(char *args[], int num)
 	return 1;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 //=============================================================================
 //=============================================================================
 Int parseLatencyAverage(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_latencyAverage = atoi(args[1]);
 	}
@@ -463,7 +494,7 @@ Int parseLatencyAverage(char *args[], int num)
 //=============================================================================
 Int parseLatencyAmplitude(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_latencyAmplitude = atoi(args[1]);
 	}
@@ -474,7 +505,7 @@ Int parseLatencyAmplitude(char *args[], int num)
 //=============================================================================
 Int parseLatencyPeriod(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_latencyPeriod = atoi(args[1]);
 	}
@@ -485,7 +516,7 @@ Int parseLatencyPeriod(char *args[], int num)
 //=============================================================================
 Int parseLatencyNoise(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_latencyNoise = atoi(args[1]);
 	}
@@ -496,7 +527,7 @@ Int parseLatencyNoise(char *args[], int num)
 //=============================================================================
 Int parsePacketLoss(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_packetLoss = atoi(args[1]);
 	}
@@ -507,10 +538,8 @@ Int parsePacketLoss(char *args[], int num)
 //=============================================================================
 Int parseLowDetail(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_terrainLOD = TERRAIN_LOD_MIN;
-	}
+	TheWritableGlobalData->m_terrainLOD = TERRAIN_LOD_MIN;
+
 	return 1;
 }
 
@@ -518,10 +547,8 @@ Int parseLowDetail(char *args[], int num)
 //=============================================================================
 Int parseNoDynamicLOD(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_enableDynamicLOD = FALSE;
-	}
+	TheWritableGlobalData->m_enableDynamicLOD = FALSE;
+
 	return 1;
 }
 
@@ -529,10 +556,8 @@ Int parseNoDynamicLOD(char *args[], int num)
 //=============================================================================
 Int parseNoStaticLOD(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_enableStaticLOD = FALSE;
-	}
+	TheWritableGlobalData->m_enableStaticLOD = FALSE;
+
 	return 1;
 }
 
@@ -540,7 +565,7 @@ Int parseNoStaticLOD(char *args[], int num)
 //=============================================================================
 Int parseFPSLimit(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_framesPerSecondLimit = atoi(args[1]);
 	}
@@ -550,132 +575,108 @@ Int parseFPSLimit(char *args[], int num)
 //=============================================================================
 Int parseNoViewLimit(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_useCameraConstraints = FALSE;
-	}
+	TheWritableGlobalData->m_useCameraConstraints = FALSE;
+
 	return 1;
 }
 
 Int parseWireframe(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_wireframe = TRUE;
-	}
+	TheWritableGlobalData->m_wireframe = TRUE;
+
 	return 1;
 }
 
 Int parseShowCollision(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_showCollisionExtents = TRUE;
-	}
+	TheWritableGlobalData->m_showCollisionExtents = TRUE;
+
 	return 1;
 }
 
 Int parseNoShowClientPhysics(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_showClientPhysics = FALSE;
-	}
+	TheWritableGlobalData->m_showClientPhysics = FALSE;
+
 	return 1;
 }
 
 Int parseShowTerrainNormals(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_showTerrainNormals = TRUE;
-	}
+	TheWritableGlobalData->m_showTerrainNormals = TRUE;
+
 	return 1;
 }
 
 Int parseStateMachineDebug(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_stateMachineDebug = TRUE;
-	}
+	TheWritableGlobalData->m_stateMachineDebug = TRUE;
+
 	return 1;
 }
 
 Int parseJabber(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_jabberOn = TRUE;
-	}
+	TheWritableGlobalData->m_jabberOn = TRUE;
+
 	return 1;
 }
 
 Int parseMunkee(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_munkeeOn = TRUE;
-	}
+	TheWritableGlobalData->m_munkeeOn = TRUE;
+
 	return 1;
 }
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // defined(RTS_DEBUG)
 
 Int parseScriptDebug(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_scriptDebug = TRUE;
-		TheWritableGlobalData->m_winCursors = TRUE;
-	}
+	TheWritableGlobalData->m_scriptDebug = TRUE;
+	TheWritableGlobalData->m_winCursors = TRUE;
+
 	return 1;
 }
 
 Int parseParticleEdit(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_particleEdit = TRUE;
-		TheWritableGlobalData->m_winCursors = TRUE;
-		TheWritableGlobalData->m_windowed = TRUE;
-	}
+	TheWritableGlobalData->m_particleEdit = TRUE;
+	TheWritableGlobalData->m_winCursors = TRUE;
+	TheWritableGlobalData->m_windowed = TRUE;
+
 	return 1;
 }
 
 
 Int parseBuildMapCache(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_buildMapCache = true;
-	}
+	TheWritableGlobalData->m_buildMapCache = true;
+
 	return 1;
 }
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 Int parsePreload( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-		TheWritableGlobalData->m_preloadAssets = TRUE;
+	TheWritableGlobalData->m_preloadAssets = TRUE;
+
 	return 1;
 }
 #endif
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) 
+#if defined(RTS_DEBUG)
 Int parseDisplayDebug(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_displayDebug = TRUE;
-	}
+	TheWritableGlobalData->m_displayDebug = TRUE;
+
 	return 1;
 }
 
 Int parseFile(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_initialFile = args[1];
 		ConvertShortMapPathToLongMapPath(TheWritableGlobalData->m_initialFile);
@@ -686,144 +687,120 @@ Int parseFile(char *args[], int num)
 
 Int parsePreloadEverything( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-	{
-		TheWritableGlobalData->m_preloadAssets = TRUE;
-		TheWritableGlobalData->m_preloadEverything = TRUE;
-	}
+	TheWritableGlobalData->m_preloadAssets = TRUE;
+	TheWritableGlobalData->m_preloadEverything = TRUE;
+
 	return 1;
 }
 
 Int parseLogAssets( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-	{
-		FILE *logfile=fopen("PreloadedAssets.txt","w");
-		if (logfile)	//clear the file
-			fclose(logfile);
-		TheWritableGlobalData->m_preloadReport = TRUE;
-	}
+	FILE *logfile=fopen("PreloadedAssets.txt","w");
+	if (logfile)	//clear the file
+		fclose(logfile);
+	TheWritableGlobalData->m_preloadReport = TRUE;
+
 	return 1;
 }
 
 /// begin stuff for VTUNE
 Int parseVTune ( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-		TheWritableGlobalData->m_vTune = TRUE;
+	TheWritableGlobalData->m_vTune = TRUE;
+
 	return 1;
 }
 /// end stuff for VTUNE
 
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // defined(RTS_DEBUG)
 
 //=============================================================================
 //=============================================================================
 
 Int parseNoFX(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_useFX = FALSE;
-	}
+	TheWritableGlobalData->m_useFX = FALSE;
+
 	return 1;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG) && ENABLE_CONFIGURABLE_SHROUD
 Int parseNoShroud(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_shroudOn = FALSE;
-	}
+	TheWritableGlobalData->m_shroudOn = FALSE;
+
 	return 1;
 }
 #endif
 
 Int parseForceBenchmark(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_forceBenchmark = TRUE;
-	}
+	TheWritableGlobalData->m_forceBenchmark = TRUE;
+
 	return 1;
 }
 
 Int parseNoMoveCamera(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_disableCameraMovement = true;
-	}
+	TheWritableGlobalData->m_disableCameraMovement = true;
+
 	return 1;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseNoCinematic(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_disableCameraMovement = true;
-		TheWritableGlobalData->m_disableMilitaryCaption = true;
-		TheWritableGlobalData->m_disableCameraFade = true;
-		TheWritableGlobalData->m_disableScriptedInputDisabling = true;
-	}
+	TheWritableGlobalData->m_disableCameraMovement = true;
+	TheWritableGlobalData->m_disableMilitaryCaption = true;
+	TheWritableGlobalData->m_disableCameraFade = true;
+	TheWritableGlobalData->m_disableScriptedInputDisabling = true;
+
 	return 1;
 }
 #endif
 
 Int parseSync(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheDebugIgnoreSyncErrors = true;
-	}
+	TheDebugIgnoreSyncErrors = true;
+
 	return 1;
 }
 
 Int parseNoShellMap(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_shellMapOn = FALSE;
-	}
+	TheWritableGlobalData->m_shellMapOn = FALSE;
+
 	return 1;
 }
 
 Int parseNoShaders(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_chipSetType = 1;	//force to a voodoo card which uses least amount of features.
-	}
+	TheWritableGlobalData->m_chipSetType = 1;	//force to a voodoo card which uses least amount of features.
+
 	return 1;
 }
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+#if defined(RTS_DEBUG)
 Int parseNoLogo(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_playIntro = FALSE;
-		TheWritableGlobalData->m_afterIntro = TRUE;
-		TheWritableGlobalData->m_playSizzle = FALSE;
-	}
+	TheWritableGlobalData->m_playIntro = FALSE;
+	TheWritableGlobalData->m_afterIntro = TRUE;
+	TheWritableGlobalData->m_playSizzle = FALSE;
+
 	return 1;
 }
 #endif
 
 Int parseNoSizzle( char *args[], int )
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_playSizzle = FALSE;
-	}
+	TheWritableGlobalData->m_playSizzle = FALSE;
+
 	return 1;
 }
 
 Int parseShellMap(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_shellMapName = args[1];
 	}
@@ -832,25 +809,21 @@ Int parseShellMap(char *args[], int num)
 
 Int parseNoWindowAnimation(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_animateWindows = FALSE;
-	}
+	TheWritableGlobalData->m_animateWindows = FALSE;
+
 	return 1;
 }
 
 Int parseWinCursors(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_winCursors = TRUE;
-	}
+	TheWritableGlobalData->m_winCursors = TRUE;
+
 	return 1;
 }
 
 Int parseQuickStart( char *args[], int num )
 {
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+#if defined(RTS_DEBUG)
   parseNoLogo( args, num );
 #else
 	//Kris: Patch 1.01 -- Allow release builds to skip the sizzle video, but still force the EA logo to show up.
@@ -862,31 +835,18 @@ Int parseQuickStart( char *args[], int num )
 	return 1;
 }
 
-Int parseHeadless( char *args[], int num )
-{
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_headless = TRUE;
-	}
-	return 1;
-}
-
 Int parseConstantDebug( char *args[], int num )
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_constantDebugUpdate = TRUE;
-	}
+	TheWritableGlobalData->m_constantDebugUpdate = TRUE;
+
 	return 1;
 }
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+#if defined(RTS_DEBUG)
 Int parseExtraLogging( char *args[], int num )
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_extraLogging = TRUE;
-	}
+	TheWritableGlobalData->m_extraLogging = TRUE;
+
 	return 1;
 }
 #endif
@@ -895,31 +855,25 @@ Int parseExtraLogging( char *args[], int num )
 /*
 Int parseAllAdvice( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-	{
-		TheWritableGlobalData->m_allAdvice = TRUE;
-	}
+	TheWritableGlobalData->m_allAdvice = TRUE;
+
 	return 1;
 }
 */
 
 Int parseShowTeamDot( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-	{
-		TheWritableGlobalData->m_showTeamDot = TRUE;
-	}
+	TheWritableGlobalData->m_showTeamDot = TRUE;
+
 	return 1;
 }
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseSelectAll( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-	{
-		TheWritableGlobalData->m_allowUnselectableSelection = TRUE;
-	}
+	TheWritableGlobalData->m_allowUnselectableSelection = TRUE;
+
 	return 1;
 }
 
@@ -938,7 +892,7 @@ Int parseRunAhead( char *args[], Int num )
 
 Int parseSeed(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_fixedSeed = atoi(args[1]);
 	}
@@ -947,16 +901,14 @@ Int parseSeed(char *args[], int num)
 
 Int parseIncrAGPBuf(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_incrementalAGPBuf = TRUE;
-	}
+	TheWritableGlobalData->m_incrementalAGPBuf = TRUE;
+
 	return 1;
 }
 
 Int parseNetMinPlayers(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_netMinPlayers = atoi(args[1]);
 	}
@@ -965,7 +917,7 @@ Int parseNetMinPlayers(char *args[], int num)
 
 Int parsePlayStats(char *args[], int num)
 {
-	if (TheWritableGlobalData  && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_playStats  = atoi(args[1]);
 	}
@@ -974,17 +926,15 @@ Int parsePlayStats(char *args[], int num)
 
 Int parseDemoLoadScreen(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_loadScreenDemo = TRUE;
-	}
+	TheWritableGlobalData->m_loadScreenDemo = TRUE;
+
 	return 1;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseSaveStats(char *args[], int num)
 {
-	if (TheWritableGlobalData  && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_saveStats = TRUE;
 		TheWritableGlobalData->m_baseStatsDir = args[1];
@@ -993,10 +943,10 @@ Int parseSaveStats(char *args[], int num)
 }
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseSaveAllStats(char *args[], int num)
 {
-	if (TheWritableGlobalData  && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_saveStats = TRUE;
 		TheWritableGlobalData->m_baseStatsDir = args[1];
@@ -1006,10 +956,10 @@ Int parseSaveAllStats(char *args[], int num)
 }
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseLocalMOTD(char *args[], int num)
 {
-	if (TheWritableGlobalData  && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_useLocalMOTD = TRUE;
 		TheWritableGlobalData->m_MOTDPath = args[1];
@@ -1018,21 +968,19 @@ Int parseLocalMOTD(char *args[], int num)
 }
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseCameraDebug(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_debugCamera = TRUE;
-	}
+	TheWritableGlobalData->m_debugCamera = TRUE;
+
 	return 1;
 }
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseBenchmark(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_benchmarkTimer = atoi(args[1]);
 		TheWritableGlobalData->m_playStats  = atoi(args[1]);
@@ -1041,11 +989,11 @@ Int parseBenchmark(char *args[], int num)
 }
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 #ifdef DUMP_PERF_STATS
 Int parseStats(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_dumpStatsAtInterval = TRUE;
 		TheWritableGlobalData->m_statsInterval  = atoi(args[1]);
@@ -1058,7 +1006,7 @@ Int parseStats(char *args[], int num)
 #ifdef DEBUG_CRASHING
 Int parseIgnoreAsserts(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 0)
+	if (num > 0)
 	{
 		TheWritableGlobalData->m_debugIgnoreAsserts = true;
 	}
@@ -1069,7 +1017,7 @@ Int parseIgnoreAsserts(char *args[], int num)
 #ifdef DEBUG_STACKTRACE
 Int parseIgnoreStackTrace(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 0)
+	if (num > 0)
 	{
 		TheWritableGlobalData->m_debugIgnoreStackTrace = true;
 	}
@@ -1079,26 +1027,22 @@ Int parseIgnoreStackTrace(char *args[], int num)
 
 Int parseNoFPSLimit(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_useFpsLimit = false;
-		TheWritableGlobalData->m_framesPerSecondLimit = 30000;
-	}
+	TheWritableGlobalData->m_useFpsLimit = false;
+	TheWritableGlobalData->m_framesPerSecondLimit = 30000;
+
 	return 1;
 }
 
 Int parseDumpAssetUsage(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_dumpAssetUsage = true;
-	}
+	TheWritableGlobalData->m_dumpAssetUsage = true;
+
 	return 1;
 }
 
 Int parseJumpToFrame(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		parseNoFPSLimit(args, num);
 		TheWritableGlobalData->m_noDraw = atoi(args[1]);
@@ -1109,16 +1053,14 @@ Int parseJumpToFrame(char *args[], int num)
 
 Int parseUpdateImages(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_shouldUpdateTGAToDDS = TRUE;
-	}
+	TheWritableGlobalData->m_shouldUpdateTGAToDDS = TRUE;
+
 	return 1;
 }
 
 Int parseMod(char *args[], Int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		AsciiString modPath = args[1];
 		if (strchr(modPath.str(), ':') || modPath.startsWith("/") || modPath.startsWith("\\"))
@@ -1129,11 +1071,11 @@ Int parseMod(char *args[], Int num)
 		{
 			modPath.format("%s%s", TheGlobalData->getPath_UserData().str(), args[1]);
 		}
-		DEBUG_LOG(("Looking for mod '%s'\n", modPath.str()));
+		DEBUG_LOG(("Looking for mod '%s'", modPath.str()));
 
 		if (!TheLocalFileSystem->doesFileExist(modPath.str()))
 		{
-			DEBUG_LOG(("Mod does not exist.\n"));
+			DEBUG_LOG(("Mod does not exist."));
 			return 2; // no such file/dir.
 		}
 
@@ -1141,7 +1083,7 @@ Int parseMod(char *args[], Int num)
 		struct _stat statBuf;
 		if (_stat(modPath.str(), &statBuf) != 0)
 		{
-			DEBUG_LOG(("Could not _stat() mod.\n"));
+			DEBUG_LOG(("Could not _stat() mod."));
 			return 2; // could not stat the file/dir.
 		}
 
@@ -1149,12 +1091,12 @@ Int parseMod(char *args[], Int num)
 		{
 			if (!modPath.endsWith("\\") && !modPath.endsWith("/"))
 				modPath.concat('\\');
-			DEBUG_LOG(("Mod dir is '%s'.\n", modPath.str()));
+			DEBUG_LOG(("Mod dir is '%s'.", modPath.str()));
 			TheWritableGlobalData->m_modDir = modPath;
 		}
 		else
 		{
-			DEBUG_LOG(("Mod file is '%s'.\n", modPath.str()));
+			DEBUG_LOG(("Mod file is '%s'.", modPath.str()));
 			TheWritableGlobalData->m_modBIG = modPath;
 		}
 
@@ -1199,15 +1141,38 @@ Int parseClearDebugLevel(char *args[], int num)
 }
 #endif
 
-static CommandLineParam params[] =
+// Initial Params are parsed before Windows Creation.
+// Note that except for TheGlobalData, no other global objects exist yet when these are parsed.
+static CommandLineParam paramsForStartup[] =
 {
-	{ "-noshellmap", parseNoShellMap },
 	{ "-win", parseWin },
+	{ "-fullscreen", parseNoWin },
+
+	// TheSuperHackers @feature helmutbuhler 11/04/2025
+	// This runs the game without a window, graphics, input and audio. You can combine this with -replay
+	{ "-headless", parseHeadless },
+
+	// TheSuperHackers @feature helmutbuhler 13/04/2025
+	// Play back a replay. Pass the filename including .rep afterwards.
+	// You can pass this multiple times to play back multiple replays.
+	// You can also include wildcards. The file must be in the replay folder or in a subfolder.
+	{ "-replay", parseReplay },
+
+	// TheSuperHackers @feature helmutbuhler 23/05/2025
+	// Simulate each replay in a separate process and use 1..N processes at the same time.
+	// (If you have 4 cores, call it with -jobs 4)
+	// If you do not call this, all replays will be simulated in sequence in the same process.
+	{ "-jobs", parseJobs },
+};
+
+// These Params are parsed during Engine Init before INI data is loaded
+static CommandLineParam paramsForEngineInit[] =
+{
+	{ "-noshellmap", parseNoShellMap },
 	{ "-xres", parseXRes },
 	{ "-yres", parseYRes },
-	{ "-fullscreen", parseNoWin },
 	{ "-fullVersion", parseFullVersion },
-	{	"-particleEdit", parseParticleEdit },
+	{ "-particleEdit", parseParticleEdit },
 	{ "-scriptDebug", parseScriptDebug },
 	{ "-playStats", parsePlayStats },
 	{ "-mod", parseMod },
@@ -1215,11 +1180,10 @@ static CommandLineParam params[] =
 	{ "-quickstart", parseQuickStart },
 	{ "-useWaveEditor", parseUseWaveEditor },
 
-	// TheSuperHackers @feature helmutbuhler 11/04/2025
-	// This runs the game without a window, graphics, input and audio. Used for testing.
-	{ "-headless", parseHeadless },
+	// TheSuperHackers @feature xezon 03/08/2025 Force full viewport for 'Control Bar Pro' Addons like GenTool did it.
+	{ "-forcefullviewport", parseFullViewport },
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+#if defined(RTS_DEBUG)
 	{ "-noaudio", parseNoAudio },
 	{ "-map", parseMapName },
 	{ "-nomusic", parseNoMusic },
@@ -1228,9 +1192,9 @@ static CommandLineParam params[] =
 	{ "-FPUPreserve", parseFPUPreserve },
 	{ "-benchmark", parseBenchmark },
 #ifdef DUMP_PERF_STATS
-	{ "-stats", parseStats }, 
+	{ "-stats", parseStats },
 #endif
-  { "-saveStats", parseSaveStats },
+	{ "-saveStats", parseSaveStats },
 	{ "-localMOTD", parseLocalMOTD },
 	{ "-UseCSF", parseUseCSF },
 	{ "-NoInputDisable", parseNoInputDisable },
@@ -1284,7 +1248,7 @@ static CommandLineParam params[] =
 	// Number of frames between each CRC that is written to replay files in singleplayer games.
 	{ "-ReplayCRCInterval", parseReplayCRCInterval },
 #endif
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+#if defined(RTS_DEBUG)
 	{ "-saveAllStats", parseSaveAllStats },
 	{ "-noDraw", parseNoDraw },
 	{ "-nomilcap", parseNoMilCap },
@@ -1310,10 +1274,10 @@ static CommandLineParam params[] =
 	{ "-munkee", parseMunkee },
 	{ "-displayDebug", parseDisplayDebug },
 	{ "-file", parseFile },
-  
+
 //	{ "-preload", parsePreload },
-	
-  { "-preloadEverything", parsePreloadEverything },
+
+	{ "-preloadEverything", parsePreloadEverything },
 	{ "-logAssets", parseLogAssets },
 	{ "-netMinPlayers", parseNetMinPlayers },
 	{ "-DemoLoadScreen", parseDemoLoadScreen },
@@ -1322,7 +1286,9 @@ static CommandLineParam params[] =
 	{ "-vTune", parseVTune },
 	{ "-selectTheUnselectable", parseSelectAll },
 	{ "-RunAhead", parseRunAhead },
+#if ENABLE_CONFIGURABLE_SHROUD
 	{ "-noshroud", parseNoShroud },
+#endif
 	{ "-forceBenchmark", parseForceBenchmark },
 	{ "-buildmapcache", parseBuildMapCache },
 	{ "-noshadowvolumes", parseNoShadows },
@@ -1360,25 +1326,80 @@ static CommandLineParam params[] =
 	//-allAdvice feature
 	//{ "-allAdvice", parseAllAdvice },
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
-  { "-preload", parsePreload },
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+	{ "-preload", parsePreload },
 #endif
 
 
 };
 
-// parseCommandLine ===========================================================
-/** Parse command-line parameters. */
-//=============================================================================
-void parseCommandLine(int argc, char *argv[])
+char *nextParam(char *newSource, const char *seps)
 {
-	// To parse command-line parameters, we loop through a table holding arguments
-	// and functions to handle them.  Comparisons can be case-(in)sensitive, and
-	// can check the entire string (for testing the presence of a flag) or check
-	// just the start (for a key=val argument).  The handling function can also
-	// look at the next argument(s), to accomodate multi-arg parameters, e.g. "-p 1234".
-	int arg=1, param;
-	Bool found;
+	static char *source = NULL;
+	if (newSource)
+	{
+		source = newSource;
+	}
+	if (!source)
+	{
+		return NULL;
+	}
+
+	// find first separator
+	char *first = source;//strpbrk(source, seps);
+	if (first)
+	{
+		// go past separator
+		char *firstSep = strpbrk(first, seps);
+		char firstChar[2] = {0,0};
+		if (firstSep == first)
+		{
+			firstChar[0] = *first;
+			while (*first == firstChar[0]) first++;
+		}
+
+		// find end
+		char *end;
+		if (firstChar[0])
+			end = strpbrk(first, firstChar);
+		else
+			end = strpbrk(first, seps);
+
+		// trim string & save next start pos
+		if (end)
+		{
+			source = end+1;
+			*end = 0;
+
+			if (!*source)
+				source = NULL;
+		}
+		else
+		{
+			source = NULL;
+		}
+
+		if (first && !*first)
+			first = NULL;
+	}
+
+	return first;
+}
+
+static void parseCommandLine(const CommandLineParam* params, int numParams)
+{
+	std::vector<char*> argv;
+
+	std::string cmdLine = GetCommandLineA();
+	char *token = nextParam(&cmdLine[0], "\" ");
+	while (token != NULL)
+	{
+		argv.push_back(strtrim(token));
+		token = nextParam(NULL, "\" ");
+	}
+	int argc = argv.size();
+
+	int arg = 1;
 
 #ifdef DEBUG_LOGGING
 	DEBUG_LOG(("Command-line args:"));
@@ -1388,34 +1409,68 @@ void parseCommandLine(int argc, char *argv[])
 	{
 		DEBUG_LOG((" %s", argv[arg]));
 	}
-	DEBUG_LOG(("\n"));
+	DEBUG_LOG_RAW(("\n"));
 	DebugSetFlags(debugFlags); // turn timestamps back on iff they were on before
 	arg = 1;
 #endif // DEBUG_LOGGING
 
+	// To parse command-line parameters, we loop through a table holding arguments
+	// and functions to handle them.  Comparisons can be case-(in)sensitive, and
+	// can check the entire string (for testing the presence of a flag) or check
+	// just the start (for a key=val argument).  The handling function can also
+	// look at the next argument(s), to accomodate multi-arg parameters, e.g. "-p 1234".
 	while (arg<argc)
 	{
 		// Look at arg #i
-		found = false;
-		for (param=0; !found && param<sizeof(params)/sizeof(params[0]); ++param)
+		Bool found = false;
+		for (int param=0; !found && param<numParams; ++param)
 		{
 			int len = strlen(params[param].name);
 			int len2 = strlen(argv[arg]);
 			if (len2 != len)
 				continue;
-			if (!strnicmp(argv[arg], params[param].name, len))
+			if (strnicmp(argv[arg], params[param].name, len) == 0)
 			{
-				arg += params[param].func(argv+arg, argc-arg);
+				arg += params[param].func(&argv[0]+arg, argc-arg);
 				found = true;
+				break;
 			}
-		}	// for
+		}
 		if (!found)
 		{
 			arg++;
 		}
 	}
+}
+
+void createGlobalData()
+{
+	if (TheGlobalData == NULL)
+		TheWritableGlobalData = NEW GlobalData;
+}
 
-	TheArchiveFileSystem->loadMods();
+void CommandLine::parseCommandLineForStartup()
+{
+	// We need the GlobalData initialized before parsing the command line.
+	// Note that this function is potentially called multiple times and only initializes the first time.
+	createGlobalData();
+
+	if (TheGlobalData->m_commandLineData.m_hasParsedCommandLineForStartup)
+		return;
+	TheWritableGlobalData->m_commandLineData.m_hasParsedCommandLineForStartup = true;
+
+	parseCommandLine(paramsForStartup, ARRAY_SIZE(paramsForStartup));
 }
 
+void CommandLine::parseCommandLineForEngineInit()
+{
+	createGlobalData();
+
+	DEBUG_ASSERTCRASH(TheGlobalData->m_commandLineData.m_hasParsedCommandLineForStartup,
+		("parseCommandLineForStartup is expected to be called before parseCommandLineForEngineInit\n"));
+	DEBUG_ASSERTCRASH(!TheGlobalData->m_commandLineData.m_hasParsedCommandLineForEngineInit,
+		("parseCommandLineForEngineInit is expected to be called once only\n"));
+	TheWritableGlobalData->m_commandLineData.m_hasParsedCommandLineForEngineInit = true;
 
+	parseCommandLine(paramsForEngineInit, ARRAY_SIZE(paramsForEngineInit));
+}
diff --git a/Generals/Code/GameEngine/Source/Common/DamageFX.cpp b/Generals/Code/GameEngine/Source/Common/DamageFX.cpp
index c4329770a87..cd1a4fa3951 100644
--- a/Generals/Code/GameEngine/Source/Common/DamageFX.cpp
+++ b/Generals/Code/GameEngine/Source/Common/DamageFX.cpp
@@ -84,14 +84,14 @@ void DamageFX::clear()
 }
 
 //-------------------------------------------------------------------------------------------------
-UnsignedInt DamageFX::getDamageFXThrottleTime(DamageType t, const Object* source) const 
-{ 
-	return m_dfx[t][source ? source->getVeterancyLevel() : LEVEL_REGULAR].m_damageFXThrottleTime; 
+UnsignedInt DamageFX::getDamageFXThrottleTime(DamageType t, const Object* source) const
+{
+	return m_dfx[t][source ? source->getVeterancyLevel() : LEVEL_REGULAR].m_damageFXThrottleTime;
 }
 
 //-------------------------------------------------------------------------------------------------
 void DamageFX::doDamageFX(DamageType t, Real damageAmount, const Object* source, const Object* victim) const
-{ 
+{
 	ConstFXListPtr fx = getDamageFXList(t, damageAmount, source);
 	// since the victim is receiving the damage, it's the "primary" object.
 	// the source is the "secondary" object -- unused by most fx, but could be
@@ -101,7 +101,7 @@ void DamageFX::doDamageFX(DamageType t, Real damageAmount, const Object* source,
 
 //-------------------------------------------------------------------------------------------------
 ConstFXListPtr DamageFX::getDamageFXList(DamageType t, Real damageAmount, const Object* source) const
-{ 
+{
 	/*
 		if damage is zero, never do damage fx. this is by design, since "zero" damage can happen
 		with some special weapons, like the battleship, which is a "faux" weapon that never does damage.
@@ -111,9 +111,9 @@ ConstFXListPtr DamageFX::getDamageFXList(DamageType t, Real damageAmount, const
 		return NULL;
 
 	const DFX& dfx = m_dfx[t][source ? source->getVeterancyLevel() : LEVEL_REGULAR];
-	ConstFXListPtr fx = 
-		damageAmount >= dfx.m_amountForMajorFX ? 
-		dfx.m_majorDamageFXList : 
+	ConstFXListPtr fx =
+		damageAmount >= dfx.m_amountForMajorFX ?
+		dfx.m_majorDamageFXList :
 		dfx.m_minorDamageFXList;
 
 	return fx;
@@ -122,7 +122,7 @@ ConstFXListPtr DamageFX::getDamageFXList(DamageType t, Real damageAmount, const
 //-------------------------------------------------------------------------------------------------
 const FieldParse* DamageFX::getFieldParse() const
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ "AmountForMajorFX",						parseAmount,			NULL, 0 },
 		{ "MajorFX",										parseMajorFXList,	NULL, 0 },
@@ -139,11 +139,11 @@ const FieldParse* DamageFX::getFieldParse() const
 
 //-------------------------------------------------------------------------------------------Static
 static void parseCommonStuff(
-	INI* ini, 
-	ConstCharPtrArray names, 
-	VeterancyLevel& vetFirst, 
-	VeterancyLevel& vetLast, 
-	DamageType& damageFirst, 
+	INI* ini,
+	ConstCharPtrArray names,
+	VeterancyLevel& vetFirst,
+	VeterancyLevel& vetLast,
+	DamageType& damageFirst,
 	DamageType& damageLast
 )
 {
@@ -274,11 +274,10 @@ DamageFXStore::~DamageFXStore()
 }
 
 //-------------------------------------------------------------------------------------------------
-const DamageFX *DamageFXStore::findDamageFX(AsciiString name) const
+const DamageFX *DamageFXStore::findDamageFX(NameKeyType namekey) const
 {
-	NameKeyType namekey = TheNameKeyGenerator->nameToKey(name);
-  DamageFXMap::const_iterator it = m_dfxmap.find(namekey);
-  if (it == m_dfxmap.end()) 
+	DamageFXMap::const_iterator it = m_dfxmap.find(namekey);
+	if (it == m_dfxmap.end())
 	{
 		return NULL;
 	}
@@ -288,6 +287,18 @@ const DamageFX *DamageFXStore::findDamageFX(AsciiString name) const
 	}
 }
 
+//-------------------------------------------------------------------------------------------------
+const DamageFX *DamageFXStore::findDamageFX(const AsciiString& name) const
+{
+	return findDamageFX(TheNameKeyGenerator->nameToKey(name));
+}
+
+//-------------------------------------------------------------------------------------------------
+const DamageFX *DamageFXStore::findDamageFX(const char* name) const
+{
+	return findDamageFX(TheNameKeyGenerator->nameToKey(name));
+}
+
 //-------------------------------------------------------------------------------------------------
 void DamageFXStore::init()
 {
@@ -296,7 +307,7 @@ void DamageFXStore::init()
 //-------------------------------------------------------------------------------------------------
 void DamageFXStore::reset()
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void DamageFXStore::update()
diff --git a/Generals/Code/GameEngine/Source/Common/Dict.cpp b/Generals/Code/GameEngine/Source/Common/Dict.cpp
index 340d6399e26..f9f9e58dfd2 100644
--- a/Generals/Code/GameEngine/Source/Common/Dict.cpp
+++ b/Generals/Code/GameEngine/Source/Common/Dict.cpp
@@ -22,14 +22,14 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Dict.cpp 
+// FILE: Dict.cpp
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -130,7 +130,7 @@ Dict::DictPair* Dict::findPairByKey(NameKeyType key) const
 	DictPair* base = m_data->peek();
 	Int minIdx = 0;
 	Int maxIdx = m_data->m_numPairsUsed;
-	while (minIdx < maxIdx) 
+	while (minIdx < maxIdx)
 	{
 		Int midIdx = (((minIdx + maxIdx) - 1) >> 1);
 		DictPair* mid = base + midIdx;
@@ -160,11 +160,12 @@ Dict::DictPair *Dict::ensureUnique(int numPairsNeeded, Bool preserveData, DictPa
 	Dict::DictPairData* newData = NULL;
 	if (numPairsNeeded > 0)
 	{
+		DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order."));
 		DEBUG_ASSERTCRASH(numPairsNeeded <= MAX_LEN, ("Dict::ensureUnique exceeds max pairs length %d with requested length %d", MAX_LEN, numPairsNeeded));
 		int minBytes = sizeof(Dict::DictPairData) + numPairsNeeded*sizeof(Dict::DictPair);
 		int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
 		// note: be certain to alloc with zero; we'll take advantage of the fact that all-zero
-		// is a bit-pattern that happens to init all our pairs to legal values: 
+		// is a bit-pattern that happens to init all our pairs to legal values:
 		// type BOOL, key INVALID, value FALSE.
 		newData = (Dict::DictPairData*)TheDynamicMemoryAllocator->allocateBytes(actualBytes, "Dict::ensureUnique");
 		newData->m_refCount = 1;
@@ -181,7 +182,7 @@ Dict::DictPair *Dict::ensureUnique(int numPairsNeeded, Bool preserveData, DictPa
 		}
 	}
 
-	Int delta;
+	Int delta = 0;
 	if (pairToTranslate && m_data)
 		delta = pairToTranslate - m_data->peek();
 
@@ -273,7 +274,7 @@ Bool Dict::getBool(NameKeyType key, Bool *exists/*=NULL*/) const
 		if (exists) *exists = true;
 		return *pair->asBool();
 	}
-	DEBUG_ASSERTCRASH(exists != NULL, ("dict key missing, or of wrong type\n"));	// only assert if they didn't check result
+	DEBUG_ASSERTCRASH(exists != NULL, ("dict key missing, or of wrong type"));	// only assert if they didn't check result
 	if (exists) *exists = false;
 	return false;
 }
@@ -288,7 +289,7 @@ Int Dict::getInt(NameKeyType key, Bool *exists/*=NULL*/) const
 		if (exists) *exists = true;
 		return *pair->asInt();
 	}
-	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type\n"));	// only assert if they didn't check result
+	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type"));	// only assert if they didn't check result
 	if (exists) *exists = false;
 	return 0;
 }
@@ -303,7 +304,7 @@ Real Dict::getReal(NameKeyType key, Bool *exists/*=NULL*/) const
 		if (exists) *exists = true;
 		return *pair->asReal();
 	}
-	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type\n"));	// only assert if they didn't check result
+	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type"));	// only assert if they didn't check result
 	if (exists) *exists = false;
 	return 0.0f;
 }
@@ -318,7 +319,7 @@ AsciiString Dict::getAsciiString(NameKeyType key, Bool *exists/*=NULL*/) const
 		if (exists) *exists = true;
 		return *pair->asAsciiString();
 	}
-	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type\n"));	// only assert if they didn't check result
+	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type"));	// only assert if they didn't check result
 	if (exists) *exists = false;
 	return AsciiString::TheEmptyString;
 }
@@ -333,7 +334,7 @@ UnicodeString Dict::getUnicodeString(NameKeyType key, Bool *exists/*=NULL*/) con
 		if (exists) *exists = true;
 		return *pair->asUnicodeString();
 	}
-	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type\n"));	// only assert if they didn't check result
+	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type"));	// only assert if they didn't check result
 	if (exists) *exists = false;
 	return UnicodeString::TheEmptyString;
 }
@@ -342,14 +343,14 @@ UnicodeString Dict::getUnicodeString(NameKeyType key, Bool *exists/*=NULL*/) con
 Bool Dict::getNthBool(Int n) const
 {
 	validate();
-	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range\n"));
+	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range"));
 	if (m_data)
 	{
 		DictPair* pair = &m_data->peek()[n];
 		if (pair && pair->getType() == DICT_BOOL)
 			return *pair->asBool();
 	}
-	DEBUG_CRASH(("dict key missing, or of wrong type\n"));
+	DEBUG_CRASH(("dict key missing, or of wrong type"));
 	return false;
 }
 
@@ -357,14 +358,14 @@ Bool Dict::getNthBool(Int n) const
 Int Dict::getNthInt(Int n) const
 {
 	validate();
-	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range\n"));
+	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range"));
 	if (m_data)
 	{
 		DictPair* pair = &m_data->peek()[n];
 		if (pair && pair->getType() == DICT_INT)
 			return *pair->asInt();
 	}
-	DEBUG_CRASH(("dict key missing, or of wrong type\n"));
+	DEBUG_CRASH(("dict key missing, or of wrong type"));
 	return 0;
 }
 
@@ -372,14 +373,14 @@ Int Dict::getNthInt(Int n) const
 Real Dict::getNthReal(Int n) const
 {
 	validate();
-	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range\n"));
+	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range"));
 	if (m_data)
 	{
 		DictPair* pair = &m_data->peek()[n];
 		if (pair && pair->getType() == DICT_REAL)
 			return *pair->asReal();
 	}
-	DEBUG_CRASH(("dict key missing, or of wrong type\n"));
+	DEBUG_CRASH(("dict key missing, or of wrong type"));
 	return 0.0f;
 }
 
@@ -387,14 +388,14 @@ Real Dict::getNthReal(Int n) const
 AsciiString Dict::getNthAsciiString(Int n) const
 {
 	validate();
-	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range\n"));
+	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range"));
 	if (m_data)
 	{
 		DictPair* pair = &m_data->peek()[n];
 		if (pair && pair->getType() == DICT_ASCIISTRING)
 			return *pair->asAsciiString();
 	}
-	DEBUG_CRASH(("dict key missing, or of wrong type\n"));
+	DEBUG_CRASH(("dict key missing, or of wrong type"));
 	return AsciiString::TheEmptyString;
 }
 
@@ -402,14 +403,14 @@ AsciiString Dict::getNthAsciiString(Int n) const
 UnicodeString Dict::getNthUnicodeString(Int n) const
 {
 	validate();
-	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range\n"));
+	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range"));
 	if (m_data)
 	{
 		DictPair* pair = &m_data->peek()[n];
 		if (pair && pair->getType() == DICT_UNICODESTRING)
 			return *pair->asUnicodeString();
 	}
-	DEBUG_CRASH(("dict key missing, or of wrong type\n"));
+	DEBUG_CRASH(("dict key missing, or of wrong type"));
 	return UnicodeString::TheEmptyString;
 }
 
@@ -420,7 +421,7 @@ Dict::DictPair *Dict::setPrep(NameKeyType key, Dict::DataType type)
 	Int pairsNeeded = getPairCount();
 	if (!pair)
 		++pairsNeeded;
-	pair = ensureUnique(pairsNeeded, true, pair);	
+	pair = ensureUnique(pairsNeeded, true, pair);
 	if (!pair)
 	{
 		pair = &m_data->peek()[m_data->m_numPairsUsed++];
@@ -437,21 +438,21 @@ void Dict::sortPairs()
 		return;
 
 	// yer basic shellsort.
-	for (Int gap = m_data->m_numPairsUsed >> 1; gap > 0; gap >>= 1) 
+	for (Int gap = m_data->m_numPairsUsed >> 1; gap > 0; gap >>= 1)
 	{
-		for (Int i = gap; i < m_data->m_numPairsUsed; i++) 
+		for (Int i = gap; i < m_data->m_numPairsUsed; i++)
 		{
-			for (Int j = i - gap; j >= 0; j -= gap) 
+			for (Int j = i - gap; j >= 0; j -= gap)
 			{
 				DictPair* a = m_data->peek() + j;
 				DictPair* b = m_data->peek() + j + gap;
-				if (a->getName() > b->getName()) 
+				if (a->getName() > b->getName())
 				{
 					DictPair tmp = *a;
 					*a = *b;
 					*b = tmp;
-				} 
-				else 
+				}
+				else
 				{
 					break;
 				}
@@ -517,14 +518,14 @@ Bool Dict::remove(NameKeyType key)
 	DictPair* pair = findPairByKey(key);
 	if (pair)
 	{
-		pair = ensureUnique(m_data->m_numPairsUsed, true, pair);	
+		pair = ensureUnique(m_data->m_numPairsUsed, true, pair);
 		pair->setNameAndType((NameKeyType)0x7fffffff, DICT_BOOL);
 		sortPairs();
 		--m_data->m_numPairsUsed;
 		validate();
 		return true;
 	}
-	DEBUG_CRASH(("dict key missing in remove\n"));
+	DEBUG_CRASH(("dict key missing in remove"));
 	return false;
 }
 
diff --git a/Generals/Code/GameEngine/Source/Common/DiscreteCircle.cpp b/Generals/Code/GameEngine/Source/Common/DiscreteCircle.cpp
index a071cbce4d9..cfd9a1ca624 100644
--- a/Generals/Code/GameEngine/Source/Common/DiscreteCircle.cpp
+++ b/Generals/Code/GameEngine/Source/Common/DiscreteCircle.cpp
@@ -24,12 +24,12 @@
 
 // FILE: DiscreteCircle.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       EA Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       EA Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -81,11 +81,11 @@ void DiscreteCircle::generateEdgePairs(Int xCenter, Int yCenter, Int radius)
 		hl.xEnd		= xCenter + x;
 		hl.yPos		= yCenter + y;
 		m_edges.push_back(hl);
-		
+
 		if (d + y > 0) {
 			--y;
 			d -= ((y << 1) - 1);
-		} 
+		}
 
 		if (x > d) {
 			++x;
@@ -107,8 +107,8 @@ void DiscreteCircle::removeDuplicates()
 
 		if (it->yPos == nextIt->yPos) {
 			it = m_edges.erase(it);
-		} else { 
+		} else {
 			++it;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp
index 809cf78dbaa..f8ce2dd61c3 100644
--- a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp
+++ b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp
@@ -32,6 +32,7 @@
 #include "Common/AudioAffect.h"
 #include "Common/BuildAssistant.h"
 #include "Common/CRCDebug.h"
+#include "Common/FramePacer.h"
 #include "Common/Radar.h"
 #include "Common/PlayerTemplate.h"
 #include "Common/Team.h"
@@ -83,7 +84,7 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/SidesList.h"
 
-#include "GameClient/Display.h"
+#include "GameClient/ClientInstance.h"
 #include "GameClient/FXList.h"
 #include "GameClient/GameClient.h"
 #include "GameClient/Keyboard.h"
@@ -110,11 +111,6 @@
 
 #include "Common/version.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 
@@ -143,7 +139,7 @@ void DeepCRCSanityCheck::reset(void)
 	fname.format("%sCRCAfter%dMaps.dat", TheGlobalData->getPath_UserData().str(), timesThrough);
 	UnsignedInt thisCRC = TheGameLogic->getCRC( CRC_RECALC, fname );
 
-	DEBUG_LOG(("DeepCRCSanityCheck: CRC is %X\n", thisCRC));
+	DEBUG_LOG(("DeepCRCSanityCheck: CRC is %X", thisCRC));
 	DEBUG_ASSERTCRASH(timesThrough == 0 || thisCRC == lastCRC,
 		("CRC after reset did not match beginning CRC!\nNetwork games won't work after this.\nOld: 0x%8.8X, New: 0x%8.8X",
 		lastCRC, thisCRC));
@@ -162,11 +158,16 @@ SubsystemInterfaceList* TheSubsystemList = NULL;
 
 //-------------------------------------------------------------------------------------------------
 template<class SUBSYSTEM>
-void initSubsystem(SUBSYSTEM*& sysref, AsciiString name, SUBSYSTEM* sys, Xfer *pXfer,  const char* path1 = NULL, 
-									 const char* path2 = NULL, const char* dirpath = NULL)
+void initSubsystem(
+	SUBSYSTEM*& sysref,
+	AsciiString name,
+	SUBSYSTEM* sys,
+	Xfer *pXfer,
+	const char* path1 = NULL,
+	const char* path2 = NULL)
 {
 	sysref = sys;
-	TheSubsystemList->initSubsystem(sys, path1, path2, dirpath, pXfer, name);
+	TheSubsystemList->initSubsystem(sys, path1, path2, pXfer, name);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -176,19 +177,80 @@ extern CComModule _Module;
 //-------------------------------------------------------------------------------------------------
 static void updateTGAtoDDS();
 
-Int GameEngine::getFramesPerSecondLimit( void )
+//-------------------------------------------------------------------------------------------------
+static void updateWindowTitle()
 {
-	return m_maxFPS;
+	// TheSuperHackers @tweak Now prints product and version information in the Window title.
+
+	DEBUG_ASSERTCRASH(TheVersion != NULL, ("TheVersion is NULL"));
+	DEBUG_ASSERTCRASH(TheGameText != NULL, ("TheGameText is NULL"));
+
+	UnicodeString title;
+
+	if (rts::ClientInstance::getInstanceId() > 1u)
+	{
+		UnicodeString str;
+		str.format(L"Instance:%.2u", rts::ClientInstance::getInstanceId());
+		title.concat(str);
+	}
+
+	UnicodeString productString = TheVersion->getUnicodeProductString();
+
+	if (!productString.isEmpty())
+	{
+		if (!title.isEmpty())
+			title.concat(L" ");
+		title.concat(productString);
+	}
+
+#if RTS_GENERALS
+	const WideChar* defaultGameTitle = L"Command and Conquer Generals";
+#elif RTS_ZEROHOUR
+	const WideChar* defaultGameTitle = L"Command and Conquer Generals Zero Hour";
+#endif
+	UnicodeString gameTitle = TheGameText->FETCH_OR_SUBSTITUTE("GUI:Command&ConquerGenerals", defaultGameTitle);
+
+	if (!gameTitle.isEmpty())
+	{
+		UnicodeString gameTitleFinal;
+		UnicodeString gameVersion = TheVersion->getUnicodeVersion();
+
+		if (productString.isEmpty())
+		{
+			gameTitleFinal = gameTitle;
+		}
+		else
+		{
+			UnicodeString gameTitleFormat = TheGameText->FETCH_OR_SUBSTITUTE("Version:GameTitle", L"for %ls");
+			gameTitleFinal.format(gameTitleFormat.str(), gameTitle.str());
+		}
+
+		if (!title.isEmpty())
+			title.concat(L" ");
+		title.concat(gameTitleFinal.str());
+		title.concat(L" ");
+		title.concat(gameVersion.str());
+	}
+
+	if (!title.isEmpty())
+	{
+		AsciiString titleA;
+		titleA.translate(title);	//get ASCII version for Win 9x
+
+		extern HWND ApplicationHWnd;  ///< our application window handle
+		if (ApplicationHWnd) {
+			//Set it twice because Win 9x does not support SetWindowTextW.
+			::SetWindowText(ApplicationHWnd, titleA.str());
+			::SetWindowTextW(ApplicationHWnd, title.str());
+		}
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
 GameEngine::GameEngine( void )
 {
-	// Set the time slice size to 1 ms.
-	timeBeginPeriod(1);
-
 	// initialize to non garbage values
-	m_maxFPS = 0;
+	m_logicTimeAccumulator = 0.0f;
 	m_quitting = FALSE;
 	m_isActive = FALSE;
 
@@ -209,6 +271,10 @@ GameEngine::~GameEngine()
 
 	TheGameResultsQueue->endThreads();
 
+	// TheSuperHackers @fix helmutbuhler 03/06/2025
+	// Reset all subsystems before deletion to prevent crashing due to cross dependencies.
+	reset();
+
 	TheSubsystemList->shutdownAll();
 	delete TheSubsystemList;
 	TheSubsystemList = NULL;
@@ -232,22 +298,51 @@ GameEngine::~GameEngine()
 #ifdef PERF_TIMERS
 	PerfGather::termPerfDump();
 #endif
+}
 
-	// Restore the previous time slice for Windows.
-	timeEndPeriod(1);
+//-------------------------------------------------------------------------------------------------
+Bool GameEngine::isTimeFrozen()
+{
+	// TheSuperHackers @fix The time can no longer be frozen in Network games. It would disconnect the player.
+	if (TheNetwork != NULL)
+		return false;
+
+	if (TheTacticalView != NULL)
+	{
+		if (TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished())
+			return true;
+	}
+
+	if (TheScriptEngine != NULL)
+	{
+		if (TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript())
+			return true;
+	}
+
+	return false;
 }
 
-void GameEngine::setFramesPerSecondLimit( Int fps )
+//-------------------------------------------------------------------------------------------------
+Bool GameEngine::isGameHalted()
 {
-	DEBUG_LOG(("GameEngine::setFramesPerSecondLimit() - setting max fps to %d (TheGlobalData->m_useFpsLimit == %d)\n", fps, TheGlobalData->m_useFpsLimit));
-	m_maxFPS = fps;
+	if (TheNetwork != NULL)
+	{
+		if (TheNetwork->isStalling())
+			return true;
+	}
+	else
+	{
+		if (TheGameLogic != NULL && TheGameLogic->isGamePaused())
+			return true;
+	}
+
+	return false;
 }
 
 /** -----------------------------------------------------------------------------------------------
  * Initialize the game engine by initializing the GameLogic and GameClient.
  */
-void GameEngine::init( void ) {} /// @todo: I changed this to take argc & argv so we can parse those after the GDF is loaded.  We need to rethink this immediately as it is a nasty hack
-void GameEngine::init( int argc, char *argv[] )
+void GameEngine::init()
 {
 	try {
 		//create an INI object to use for loading stuff
@@ -255,27 +350,20 @@ void GameEngine::init( int argc, char *argv[] )
 
 		if (TheVersion)
 		{
-			DEBUG_LOG(("================================================================================\n"));
-#ifdef DEBUG_LOGGING
-	#if defined RTS_DEBUG
-			const char *buildType = "Debug";
-	#elif defined RTS_INTERNAL
-			const char *buildType = "Internal";
-	#else
-			const char *buildType = "Release";
-	#endif
-#endif // DEBUG_LOGGING
-			DEBUG_LOG(("Generals version %s (%s)\n", TheVersion->getAsciiVersion().str(), buildType));
-			DEBUG_LOG(("Build date: %s\n", TheVersion->getAsciiBuildTime().str()));
-			DEBUG_LOG(("Build location: %s\n", TheVersion->getAsciiBuildLocation().str()));
-			DEBUG_LOG(("Built by: %s\n", TheVersion->getAsciiBuildUser().str()));
-			DEBUG_LOG(("================================================================================\n"));
+			DEBUG_LOG(("================================================================================"));
+			DEBUG_LOG(("Generals version %s", TheVersion->getAsciiVersion().str()));
+			DEBUG_LOG(("Build date: %s", TheVersion->getAsciiBuildTime().str()));
+			DEBUG_LOG(("Build location: %s", TheVersion->getAsciiBuildLocation().str()));
+			DEBUG_LOG(("Build user: %s", TheVersion->getAsciiBuildUser().str()));
+			DEBUG_LOG(("Build git revision: %s", TheVersion->getAsciiGitCommitCount().str()));
+			DEBUG_LOG(("Build git version: %s", TheVersion->getAsciiGitTagOrHash().str()));
+			DEBUG_LOG(("Build git commit time: %s", TheVersion->getAsciiGitCommitTime().str()));
+			DEBUG_LOG(("Build git commit author: %s", Version::getGitCommitAuthorName()));
+			DEBUG_LOG(("================================================================================"));
 		}
-		
-		m_maxFPS = DEFAULT_MAX_FPS;
 
 		TheSubsystemList = MSGNEW("GameEngineSubsystem") SubsystemInterfaceList;
-		
+
 		TheSubsystemList->addSubsystem(this);
 
 		// initialize the random number system
@@ -297,28 +385,27 @@ void GameEngine::init( int argc, char *argv[] )
 
 		initSubsystem(TheLocalFileSystem, "TheLocalFileSystem", createLocalFileSystem(), NULL);
 		initSubsystem(TheArchiveFileSystem, "TheArchiveFileSystem", createArchiveFileSystem(), NULL); // this MUST come after TheLocalFileSystem creation
-		initSubsystem(TheWritableGlobalData, "TheWritableGlobalData", MSGNEW("GameEngineSubsystem") GlobalData(), &xferCRC, "Data\\INI\\Default\\GameData.ini", "Data\\INI\\GameData.ini");
 
-		
-		// TheSuperHackers @bugfix helmutbuhler 14/04/2025
-		// Pump messages during startup to ensure that the application window is correctly
-		// positioned on slower computers and in debug builds by a later call to SetWindowPos.
-		// It is unclear what the issue with SetWindowPos is when it fails to reposition the window.
-		serviceWindowsOS();
+		DEBUG_ASSERTCRASH(TheWritableGlobalData,("TheWritableGlobalData expected to be created"));
+		initSubsystem(TheWritableGlobalData, "TheWritableGlobalData", TheWritableGlobalData, &xferCRC, "Data\\INI\\Default\\GameData", "Data\\INI\\GameData");
+		TheWritableGlobalData->parseCustomDefinition();
 
 
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		// If we're in Debug or Internal, load the Debug info as well.
-		ini.load( AsciiString( "Data\\INI\\GameDataDebug.ini" ), INI_LOAD_OVERWRITE, NULL );
+
+	#if defined(RTS_DEBUG)
+		// If we're in Debug, load the Debug settings as well.
+		ini.loadFileDirectory( "Data\\INI\\GameDataDebug", INI_LOAD_OVERWRITE, NULL );
 	#endif
-		
+
 		// special-case: parse command-line parameters after loading global data
-		parseCommandLine(argc, argv);
+		CommandLine::parseCommandLineForEngineInit();
+
+		TheArchiveFileSystem->loadMods();
 
 		// doesn't require resets so just create a single instance here.
 		TheGameLODManager = MSGNEW("GameEngineSubsystem") GameLODManager;
 		TheGameLODManager->init();
-		
+
 		// after parsing the command line, we may want to perform dds stuff. Do that here.
 		if (TheGlobalData->m_shouldUpdateTGAToDDS) {
 			// update any out of date targas here.
@@ -326,7 +413,7 @@ void GameEngine::init( int argc, char *argv[] )
 		}
 
 	#if defined(PERF_TIMERS) || defined(DUMP_PERF_STATS)
-		DEBUG_LOG(("Calculating CPU frequency for performance timers.\n"));
+		DEBUG_LOG(("Calculating CPU frequency for performance timers."));
 		InitPrecisionTimer();
 	#endif
 	#ifdef PERF_TIMERS
@@ -334,18 +421,20 @@ void GameEngine::init( int argc, char *argv[] )
 	#endif
 
 		// read the water settings from INI (must do prior to initing GameClient, apparently)
-		ini.load( AsciiString( "Data\\INI\\Default\\Water.ini" ), INI_LOAD_OVERWRITE, &xferCRC );
-		ini.load( AsciiString( "Data\\INI\\Water.ini" ), INI_LOAD_OVERWRITE, &xferCRC );
+		ini.loadFileDirectory( "Data\\INI\\Default\\Water", INI_LOAD_OVERWRITE, &xferCRC );
+		ini.loadFileDirectory( "Data\\INI\\Water", INI_LOAD_OVERWRITE, &xferCRC );
 
 #ifdef DEBUG_CRC
-		initSubsystem(TheDeepCRCSanityCheck, "TheDeepCRCSanityCheck", MSGNEW("GameEngineSubystem") DeepCRCSanityCheck, NULL, NULL, NULL, NULL);
+		initSubsystem(TheDeepCRCSanityCheck, "TheDeepCRCSanityCheck", MSGNEW("GameEngineSubystem") DeepCRCSanityCheck, NULL);
 #endif // DEBUG_CRC
 		initSubsystem(TheGameText, "TheGameText", CreateGameTextInterface(), NULL);
-		initSubsystem(TheScienceStore,"TheScienceStore", MSGNEW("GameEngineSubsystem") ScienceStore(), &xferCRC, "Data\\INI\\Default\\Science.ini", "Data\\INI\\Science.ini");
-		initSubsystem(TheMultiplayerSettings,"TheMultiplayerSettings", MSGNEW("GameEngineSubsystem") MultiplayerSettings(), &xferCRC, "Data\\INI\\Default\\Multiplayer.ini", "Data\\INI\\Multiplayer.ini");
-		initSubsystem(TheTerrainTypes,"TheTerrainTypes", MSGNEW("GameEngineSubsystem") TerrainTypeCollection(), &xferCRC, "Data\\INI\\Default\\Terrain.ini", "Data\\INI\\Terrain.ini");
-		initSubsystem(TheTerrainRoads,"TheTerrainRoads", MSGNEW("GameEngineSubsystem") TerrainRoadCollection(), &xferCRC, "Data\\INI\\Default\\Roads.ini", "Data\\INI\\Roads.ini");
+		updateWindowTitle();
+		initSubsystem(TheScienceStore,"TheScienceStore", MSGNEW("GameEngineSubsystem") ScienceStore(), &xferCRC, "Data\\INI\\Default\\Science", "Data\\INI\\Science");
+		initSubsystem(TheMultiplayerSettings,"TheMultiplayerSettings", MSGNEW("GameEngineSubsystem") MultiplayerSettings(), &xferCRC, "Data\\INI\\Default\\Multiplayer", "Data\\INI\\Multiplayer");
+		initSubsystem(TheTerrainTypes,"TheTerrainTypes", MSGNEW("GameEngineSubsystem") TerrainTypeCollection(), &xferCRC, "Data\\INI\\Default\\Terrain", "Data\\INI\\Terrain");
+		initSubsystem(TheTerrainRoads,"TheTerrainRoads", MSGNEW("GameEngineSubsystem") TerrainRoadCollection(), &xferCRC, "Data\\INI\\Default\\Roads", "Data\\INI\\Roads");
 		initSubsystem(TheGlobalLanguageData,"TheGlobalLanguageData",MSGNEW("GameEngineSubsystem") GlobalLanguage, NULL); // must be before the game text
+		TheGlobalLanguageData->parseCustomDefinition();
 		initSubsystem(TheCDManager,"TheCDManager", CreateCDManager(), NULL);
 		initSubsystem(TheAudio,"TheAudio", TheGlobalData->m_headless ? NEW AudioManagerDummy : createAudioManager(), NULL);
 		if (!TheAudio->isMusicAlreadyLoaded())
@@ -355,60 +444,60 @@ void GameEngine::init( int argc, char *argv[] )
 		initSubsystem(TheMessageStream,"TheMessageStream", createMessageStream(), NULL);
 		initSubsystem(TheSidesList,"TheSidesList", MSGNEW("GameEngineSubsystem") SidesList(), NULL);
 		initSubsystem(TheCaveSystem,"TheCaveSystem", MSGNEW("GameEngineSubsystem") CaveSystem(), NULL);
-		initSubsystem(TheRankInfoStore,"TheRankInfoStore", MSGNEW("GameEngineSubsystem") RankInfoStore(), &xferCRC, NULL, "Data\\INI\\Rank.ini");
-		initSubsystem(ThePlayerTemplateStore,"ThePlayerTemplateStore", MSGNEW("GameEngineSubsystem") PlayerTemplateStore(), &xferCRC, "Data\\INI\\Default\\PlayerTemplate.ini", "Data\\INI\\PlayerTemplate.ini");
+		initSubsystem(TheRankInfoStore,"TheRankInfoStore", MSGNEW("GameEngineSubsystem") RankInfoStore(), &xferCRC, NULL, "Data\\INI\\Rank");
+		initSubsystem(ThePlayerTemplateStore,"ThePlayerTemplateStore", MSGNEW("GameEngineSubsystem") PlayerTemplateStore(), &xferCRC, "Data\\INI\\Default\\PlayerTemplate", "Data\\INI\\PlayerTemplate");
 		initSubsystem(TheParticleSystemManager,"TheParticleSystemManager", createParticleSystemManager(), NULL);
-		initSubsystem(TheFXListStore,"TheFXListStore", MSGNEW("GameEngineSubsystem") FXListStore(), &xferCRC, "Data\\INI\\Default\\FXList.ini", "Data\\INI\\FXList.ini");
-		initSubsystem(TheWeaponStore,"TheWeaponStore", MSGNEW("GameEngineSubsystem") WeaponStore(), &xferCRC, NULL, "Data\\INI\\Weapon.ini");
-		initSubsystem(TheObjectCreationListStore,"TheObjectCreationListStore", MSGNEW("GameEngineSubsystem") ObjectCreationListStore(), &xferCRC, "Data\\INI\\Default\\ObjectCreationList.ini", "Data\\INI\\ObjectCreationList.ini");
-		initSubsystem(TheLocomotorStore,"TheLocomotorStore", MSGNEW("GameEngineSubsystem") LocomotorStore(), &xferCRC, NULL, "Data\\INI\\Locomotor.ini");
-		initSubsystem(TheSpecialPowerStore,"TheSpecialPowerStore", MSGNEW("GameEngineSubsystem") SpecialPowerStore(), &xferCRC, "Data\\INI\\Default\\SpecialPower.ini", "Data\\INI\\SpecialPower.ini");
-		initSubsystem(TheDamageFXStore,"TheDamageFXStore", MSGNEW("GameEngineSubsystem") DamageFXStore(), &xferCRC, NULL, "Data\\INI\\DamageFX.ini");
-		initSubsystem(TheArmorStore,"TheArmorStore", MSGNEW("GameEngineSubsystem") ArmorStore(), &xferCRC, NULL, "Data\\INI\\Armor.ini");
+		initSubsystem(TheFXListStore,"TheFXListStore", MSGNEW("GameEngineSubsystem") FXListStore(), &xferCRC, "Data\\INI\\Default\\FXList", "Data\\INI\\FXList");
+		initSubsystem(TheWeaponStore,"TheWeaponStore", MSGNEW("GameEngineSubsystem") WeaponStore(), &xferCRC, NULL, "Data\\INI\\Weapon");
+		initSubsystem(TheObjectCreationListStore,"TheObjectCreationListStore", MSGNEW("GameEngineSubsystem") ObjectCreationListStore(), &xferCRC, "Data\\INI\\Default\\ObjectCreationList", "Data\\INI\\ObjectCreationList");
+		initSubsystem(TheLocomotorStore,"TheLocomotorStore", MSGNEW("GameEngineSubsystem") LocomotorStore(), &xferCRC, NULL, "Data\\INI\\Locomotor");
+		initSubsystem(TheSpecialPowerStore,"TheSpecialPowerStore", MSGNEW("GameEngineSubsystem") SpecialPowerStore(), &xferCRC, "Data\\INI\\Default\\SpecialPower", "Data\\INI\\SpecialPower");
+		initSubsystem(TheDamageFXStore,"TheDamageFXStore", MSGNEW("GameEngineSubsystem") DamageFXStore(), &xferCRC, NULL, "Data\\INI\\DamageFX");
+		initSubsystem(TheArmorStore,"TheArmorStore", MSGNEW("GameEngineSubsystem") ArmorStore(), &xferCRC, NULL, "Data\\INI\\Armor");
 		initSubsystem(TheBuildAssistant,"TheBuildAssistant", MSGNEW("GameEngineSubsystem") BuildAssistant, NULL);
-		initSubsystem(TheThingFactory,"TheThingFactory", createThingFactory(), &xferCRC, "Data\\INI\\Default\\Object.ini", NULL, "Data\\INI\\Object");
-		initSubsystem(TheUpgradeCenter,"TheUpgradeCenter", MSGNEW("GameEngineSubsystem") UpgradeCenter, &xferCRC, "Data\\INI\\Default\\Upgrade.ini", "Data\\INI\\Upgrade.ini");
+		initSubsystem(TheThingFactory,"TheThingFactory", createThingFactory(), &xferCRC, "Data\\INI\\Default\\Object", "Data\\INI\\Object");
+		initSubsystem(TheUpgradeCenter,"TheUpgradeCenter", MSGNEW("GameEngineSubsystem") UpgradeCenter, &xferCRC, "Data\\INI\\Default\\Upgrade", "Data\\INI\\Upgrade");
 		initSubsystem(TheGameClient,"TheGameClient", createGameClient(), NULL);
-		initSubsystem(TheAI,"TheAI", MSGNEW("GameEngineSubsystem") AI(), &xferCRC,  "Data\\INI\\Default\\AIData.ini", "Data\\INI\\AIData.ini");
+		initSubsystem(TheAI,"TheAI", MSGNEW("GameEngineSubsystem") AI(), &xferCRC,  "Data\\INI\\Default\\AIData", "Data\\INI\\AIData");
 		initSubsystem(TheGameLogic,"TheGameLogic", createGameLogic(), NULL);
 		initSubsystem(TheTeamFactory,"TheTeamFactory", MSGNEW("GameEngineSubsystem") TeamFactory(), NULL);
-		initSubsystem(TheCrateSystem,"TheCrateSystem", MSGNEW("GameEngineSubsystem") CrateSystem(), &xferCRC, "Data\\INI\\Default\\Crate.ini", "Data\\INI\\Crate.ini");
+		initSubsystem(TheCrateSystem,"TheCrateSystem", MSGNEW("GameEngineSubsystem") CrateSystem(), &xferCRC, "Data\\INI\\Default\\Crate", "Data\\INI\\Crate");
 		initSubsystem(ThePlayerList,"ThePlayerList", MSGNEW("GameEngineSubsystem") PlayerList(), NULL);
 		initSubsystem(TheRecorder,"TheRecorder", createRecorder(), NULL);
 		initSubsystem(TheRadar,"TheRadar", TheGlobalData->m_headless ? NEW RadarDummy : createRadar(), NULL);
 		initSubsystem(TheVictoryConditions,"TheVictoryConditions", createVictoryConditions(), NULL);
 
 		AsciiString fname;
-		fname.format("Data\\%s\\CommandMap.ini", GetRegistryLanguage().str());
-		initSubsystem(TheMetaMap,"TheMetaMap", MSGNEW("GameEngineSubsystem") MetaMap(), NULL, fname.str(), "Data\\INI\\CommandMap.ini");
+		fname.format("Data\\%s\\CommandMap", GetRegistryLanguage().str());
+		initSubsystem(TheMetaMap,"TheMetaMap", MSGNEW("GameEngineSubsystem") MetaMap(), NULL, fname.str(), "Data\\INI\\CommandMap");
 
 		TheMetaMap->generateMetaMap();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		ini.load("Data\\INI\\CommandMapDebug.ini", INI_LOAD_MULTIFILE, NULL);
+#if defined(RTS_DEBUG)
+		ini.loadFileDirectory("Data\\INI\\CommandMapDebug", INI_LOAD_MULTIFILE, NULL);
 #endif
 
 		initSubsystem(TheActionManager,"TheActionManager", MSGNEW("GameEngineSubsystem") ActionManager(), NULL);
 		//initSubsystem((CComObject<WebBrowser> *)TheWebBrowser,"(CComObject<WebBrowser> *)TheWebBrowser", (CComObject<WebBrowser> *)createWebBrowser(), NULL);
-		initSubsystem(TheGameStateMap,"TheGameStateMap", MSGNEW("GameEngineSubsystem") GameStateMap, NULL, NULL, NULL );
-		initSubsystem(TheGameState,"TheGameState", MSGNEW("GameEngineSubsystem") GameState, NULL, NULL, NULL );
+		initSubsystem(TheGameStateMap,"TheGameStateMap", MSGNEW("GameEngineSubsystem") GameStateMap, NULL );
+		initSubsystem(TheGameState,"TheGameState", MSGNEW("GameEngineSubsystem") GameState, NULL );
 
 		// Create the interface for sending game results
-		initSubsystem(TheGameResultsQueue,"TheGameResultsQueue", GameResultsInterface::createNewGameResultsInterface(), NULL, NULL, NULL, NULL);
+		initSubsystem(TheGameResultsQueue,"TheGameResultsQueue", GameResultsInterface::createNewGameResultsInterface(), NULL);
 
 		xferCRC.close();
 		TheWritableGlobalData->m_iniCRC = xferCRC.getCRC();
-		DEBUG_LOG(("INI CRC is 0x%8.8X\n", TheGlobalData->m_iniCRC));
+		DEBUG_LOG(("INI CRC is 0x%8.8X", TheGlobalData->m_iniCRC));
 
 		TheSubsystemList->postProcessLoadAll();
 
-		setFramesPerSecondLimit(TheGlobalData->m_framesPerSecondLimit);
+		TheFramePacer->setFramesPerSecondLimit(TheGlobalData->m_framesPerSecondLimit);
 
 		TheAudio->setOn(TheGlobalData->m_audioOn && TheGlobalData->m_musicOn, AudioAffect_Music);
 		TheAudio->setOn(TheGlobalData->m_audioOn && TheGlobalData->m_soundsOn, AudioAffect_Sound);
 		TheAudio->setOn(TheGlobalData->m_audioOn && TheGlobalData->m_sounds3DOn, AudioAffect_Sound3D);
 		TheAudio->setOn(TheGlobalData->m_audioOn && TheGlobalData->m_speechOn, AudioAffect_Speech);
-			
+
 		// We're not in a network game yet, so set the network singleton to NULL.
 		TheNetwork = NULL;
 
@@ -417,7 +506,7 @@ void GameEngine::init( int argc, char *argv[] )
 
 		// If we turn m_quitting to FALSE here, then we throw away any requests to quit that
 		// took place during loading. :-\ - jkmcd
-		// If this really needs to take place, please make sure that pressing cancel on the audio 
+		// If this really needs to take place, please make sure that pressing cancel on the audio
 		// load music dialog will still cause the game to quit.
 		// m_quitting = FALSE;
 
@@ -431,11 +520,11 @@ void GameEngine::init( int argc, char *argv[] )
 			//populateMapListbox(NULL, true, true);
 			m_quitting = TRUE;
 		}
-		
+
 		// load the initial shell screen
-		//TheShell->push( AsciiString("Menus/MainMenu.wnd") );
-		
-		// This allows us to run a map/reply from the command line
+		//TheShell->push( "Menus/MainMenu.wnd" );
+
+		// This allows us to run a map from the command line
 		if (TheGlobalData->m_initialFile.isEmpty() == FALSE)
 		{
 			AsciiString fname = TheGlobalData->m_initialFile;
@@ -457,13 +546,9 @@ void GameEngine::init( int argc, char *argv[] )
 				msg->appendIntegerArgument(0);
 				InitRandom(0);
 			}
-			else if (fname.endsWithNoCase(".rep"))
-			{
-				TheRecorder->playbackFile(fname);
-			}
 		}
 
-		// 
+		//
 		if (TheMapCache && TheGlobalData->m_shellMapOn)
 		{
 			AsciiString lowerName = TheGlobalData->m_shellMapName;
@@ -507,12 +592,13 @@ void GameEngine::init( int argc, char *argv[] )
 
 	initDisabledMasks();
 
-	TheSubsystemList->resetAll();
+	resetSubsystems();
+
 	HideControlBar();
-}  // end init
+}
 
 /** -----------------------------------------------------------------------------------------------
-	* Reset all necessary parts of the game engine to be ready to accept new game data 
+	* Reset all necessary parts of the game engine to be ready to accept new game data
 	*/
 void GameEngine::reset( void )
 {
@@ -526,13 +612,12 @@ void GameEngine::reset( void )
 	if (TheGameLogic->isInMultiplayerGame())
 		deleteNetwork = true;
 
-	TheSubsystemList->resetAll();
+	resetSubsystems();
 
 	if (deleteNetwork)
 	{
 		DEBUG_ASSERTCRASH(TheNetwork, ("Deleting NULL TheNetwork!"));
-		if (TheNetwork)
-			delete TheNetwork;
+		delete TheNetwork;
 		TheNetwork = NULL;
 	}
 	if(background)
@@ -543,28 +628,104 @@ void GameEngine::reset( void )
 	}
 }
 
+/// -----------------------------------------------------------------------------------------------
+void GameEngine::resetSubsystems( void )
+{
+	// TheSuperHackers @fix xezon 09/06/2025 Reset GameLogic first to purge all world objects early.
+	// This avoids potentially catastrophic issues when objects and subsystems have cross dependencies.
+	TheGameLogic->reset();
+
+	TheSubsystemList->resetAll();
+}
+
+/// -----------------------------------------------------------------------------------------------
+Bool GameEngine::canUpdateGameLogic()
+{
+	// Must be first.
+	TheGameLogic->preUpdate();
+
+	TheFramePacer->setTimeFrozen(isTimeFrozen());
+	TheFramePacer->setGameHalted(isGameHalted());
+
+	if (TheNetwork != NULL)
+	{
+		return canUpdateNetworkGameLogic();
+	}
+	else
+	{
+		return canUpdateRegularGameLogic();
+	}
+}
+
+/// -----------------------------------------------------------------------------------------------
+Bool GameEngine::canUpdateNetworkGameLogic()
+{
+	DEBUG_ASSERTCRASH(TheNetwork != NULL, ("TheNetwork is NULL"));
+
+	if (TheNetwork->isFrameDataReady())
+	{
+		// Important: The Network is definitely no longer stalling.
+		TheFramePacer->setGameHalted(false);
+
+		return true;
+	}
+
+	return false;
+}
+
+/// -----------------------------------------------------------------------------------------------
+Bool GameEngine::canUpdateRegularGameLogic()
+{
+	const Bool enabled = TheFramePacer->isLogicTimeScaleEnabled();
+	const Int logicTimeScaleFps = TheFramePacer->getLogicTimeScaleFps();
+	const Int maxRenderFps = TheFramePacer->getFramesPerSecondLimit();
+
+#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+	const Bool useFastMode = TheGlobalData->m_TiVOFastMode;
+#else	//always allow this cheat key if we're in a replay game.
+	const Bool useFastMode = TheGlobalData->m_TiVOFastMode && TheGameLogic->isInReplayGame();
+#endif
+
+	if (useFastMode || !enabled || logicTimeScaleFps >= maxRenderFps)
+	{
+		// Logic time scale is uncapped or larger equal Render FPS. Update straight away.
+		return true;
+	}
+	else
+	{
+		// TheSuperHackers @tweak xezon 06/08/2025
+		// The logic time step is now decoupled from the render update.
+		const Real targetFrameTime = 1.0f / logicTimeScaleFps;
+		m_logicTimeAccumulator += min(TheFramePacer->getUpdateTime(), targetFrameTime);
+
+		if (m_logicTimeAccumulator >= targetFrameTime)
+		{
+			m_logicTimeAccumulator -= targetFrameTime;
+			return true;
+		}
+	}
+
+	return false;
+}
+
 /// -----------------------------------------------------------------------------------------------
 DECLARE_PERF_TIMER(GameEngine_update)
 
 /** -----------------------------------------------------------------------------------------------
  * Update the game engine by updating the GameClient and GameLogic singletons.
- * @todo Allow the client to run as fast as possible, but limit the execution
- * of TheNetwork and TheGameLogic to a fixed framerate.
  */
 void GameEngine::update( void )
-{ 
+{
 	USE_PERF_TIMER(GameEngine_update)
 	{
-
 		{
-			
 			// VERIFY CRC needs to be in this code block.  Please to not pull TheGameLogic->update() inside this block.
 			VERIFY_CRC
 
 			TheRadar->UPDATE();
 
 			/// @todo Move audio init, update, etc, into GameClient update
-			
+
 			TheAudio->UPDATE();
 			TheGameClient->UPDATE();
 			TheMessageStream->propagateMessages();
@@ -573,19 +734,26 @@ void GameEngine::update( void )
 			{
 				TheNetwork->UPDATE();
 			}
-			 
+
 			TheCDManager->UPDATE();
 		}
 
-		TheGameLogic->preUpdate();
+		const Bool canUpdate = canUpdateGameLogic();
+		const Bool canUpdateLogic = canUpdate && !TheFramePacer->isGameHalted() && !TheFramePacer->isTimeFrozen();
+		const Bool canUpdateScript = canUpdate && !TheFramePacer->isGameHalted();
 
-		if ((TheNetwork == NULL && !TheGameLogic->isGamePaused()) || (TheNetwork && TheNetwork->isFrameDataReady()))
+		if (canUpdateLogic)
 		{
+			TheGameClient->step();
 			TheGameLogic->UPDATE();
 		}
-
-	}	// end perfGather
-
+		else if (canUpdateScript)
+		{
+			// TheSuperHackers @info Still update the Script Engine to allow
+			// for scripted camera movements while the time is frozen.
+			TheScriptEngine->UPDATE();
+		}
+	}
 }
 
 // Horrible reference, but we really, really need to know if we are windowed.
@@ -593,13 +761,11 @@ extern bool DX8Wrapper_IsWindowed;
 extern HWND ApplicationHWnd;
 
 /** -----------------------------------------------------------------------------------------------
- * The "main loop" of the game engine. It will not return until the game exits. 
+ * The "main loop" of the game engine. It will not return until the game exits.
  */
 void GameEngine::execute( void )
 {
-	
-	DWORD prevTime = timeGetTime();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	DWORD startTime = timeGetTime() / 1000;
 #endif
 
@@ -616,7 +782,7 @@ void GameEngine::execute( void )
 
 		{
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 			{
 				// enter only if in benchmark mode
 				if (TheGlobalData->m_benchmarkTimer > 0)
@@ -637,9 +803,9 @@ void GameEngine::execute( void )
 				}
 			}
 #endif
-			
+
 			{
-				try 
+				try
 				{
 					// compute a frame
 					update();
@@ -655,7 +821,7 @@ void GameEngine::execute( void )
 				catch (...)
 				{
 					// try to save info off
-					try 
+					try
 					{
 						if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_RECORD && TheRecorder->isMultiplayer())
 							TheRecorder->cleanUpReplayFile();
@@ -664,46 +830,11 @@ void GameEngine::execute( void )
 					{
 					}
 					RELEASE_CRASH(("Uncaught Exception in GameEngine::update"));
-				}	// catch
-			}	// perf
-
-			{
-
-				if (TheTacticalView->getTimeMultiplier()<=1 && !TheScriptEngine->isTimeFast()) 
-				{
-
-		// I'm disabling this in internal because many people need alt-tab capability.  If you happen to be
-		// doing performance tuning, please just change this on your local system. -MDC
-		#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-					::Sleep(1); // give everyone else a tiny time slice.
-		#endif
-
-
-		#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
-          if ( ! TheGlobalData->m_TiVOFastMode )
-		#else	//always allow this cheatkey if we're in a replaygame.
-		  if ( ! (TheGlobalData->m_TiVOFastMode && TheGameLogic->isInReplayGame()))
-		#endif
-          {
-            // limit the framerate
-					  DWORD now = timeGetTime();
-					  DWORD limit = (1000.0f/m_maxFPS)-1;
-					  while (TheGlobalData->m_useFpsLimit && (now - prevTime) < limit) 
-					  {
-						  ::Sleep(0);
-						  now = timeGetTime();
-					  }
-					  //Int slept = now - prevTime;
-					  //DEBUG_LOG(("delayed %d\n",slept));
-
-					  prevTime = now;
-
-          }        
-        
-        }
+				}
 			}
 
-		}	// perfgather for execute_loop
+			TheFramePacer->update();
+		}
 
 #ifdef PERF_TIMERS
 		if (!m_quitting && TheGameLogic->isInGame() && !TheGameLogic->isInShellGame() && !TheGameLogic->isGamePaused())
@@ -715,7 +846,6 @@ void GameEngine::execute( void )
 #endif
 
 	}
-
 }
 
 /** -----------------------------------------------------------------------------------------------
@@ -756,16 +886,16 @@ void GameEngine::checkAbnormalQuitting(void)
 
 		Int localID = TheGameSpyInfo->getLocalProfileID();
 		PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(localID);
-		
+
 		Player *player=ThePlayerList->getLocalPlayer();
 
 		Int ptIdx;
 		const PlayerTemplate *myTemplate = player->getPlayerTemplate();
-		DEBUG_LOG(("myTemplate = %X(%s)\n", myTemplate, myTemplate->getName().str()));
+		DEBUG_LOG(("myTemplate = %X(%s)", myTemplate, myTemplate->getName().str()));
 		for (ptIdx = 0; ptIdx < ThePlayerTemplateStore->getPlayerTemplateCount(); ++ptIdx)
 		{
 			const PlayerTemplate *nthTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(ptIdx);
-			DEBUG_LOG(("nthTemplate = %X(%s)\n", nthTemplate, nthTemplate->getName().str()));
+			DEBUG_LOG(("nthTemplate = %X(%s)", nthTemplate, nthTemplate->getName().str()));
 			if (nthTemplate == myTemplate)
 			{
 					break;
@@ -786,35 +916,35 @@ void GameEngine::checkAbnormalQuitting(void)
 		UserPreferences pref;
 		AsciiString userPrefFilename;
 		userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", stats.id);
-		DEBUG_LOG(("using the file %s\n", userPrefFilename.str()));
+		DEBUG_LOG(("using the file %s", userPrefFilename.str()));
 		pref.load(userPrefFilename);
 
 		Int addedInDesyncs2 = pref.getInt("0", 0);
-		DEBUG_LOG(("addedInDesyncs2 = %d\n", addedInDesyncs2));
+		DEBUG_LOG(("addedInDesyncs2 = %d", addedInDesyncs2));
 		if (addedInDesyncs2 < 0)
 			addedInDesyncs2 = 10;
 		Int addedInDesyncs3 = pref.getInt("1", 0);
-		DEBUG_LOG(("addedInDesyncs3 = %d\n", addedInDesyncs3));
+		DEBUG_LOG(("addedInDesyncs3 = %d", addedInDesyncs3));
 		if (addedInDesyncs3 < 0)
 			addedInDesyncs3 = 10;
 		Int addedInDesyncs4 = pref.getInt("2", 0);
-		DEBUG_LOG(("addedInDesyncs4 = %d\n", addedInDesyncs4));
+		DEBUG_LOG(("addedInDesyncs4 = %d", addedInDesyncs4));
 		if (addedInDesyncs4 < 0)
 			addedInDesyncs4 = 10;
 		Int addedInDiscons2 = pref.getInt("3", 0);
-		DEBUG_LOG(("addedInDiscons2 = %d\n", addedInDiscons2));
+		DEBUG_LOG(("addedInDiscons2 = %d", addedInDiscons2));
 		if (addedInDiscons2 < 0)
 			addedInDiscons2 = 10;
 		Int addedInDiscons3 = pref.getInt("4", 0);
-		DEBUG_LOG(("addedInDiscons3 = %d\n", addedInDiscons3));
+		DEBUG_LOG(("addedInDiscons3 = %d", addedInDiscons3));
 		if (addedInDiscons3 < 0)
 			addedInDiscons3 = 10;
 		Int addedInDiscons4 = pref.getInt("5", 0);
-		DEBUG_LOG(("addedInDiscons4 = %d\n", addedInDiscons4));
+		DEBUG_LOG(("addedInDiscons4 = %d", addedInDiscons4));
 		if (addedInDiscons4 < 0)
 			addedInDiscons4 = 10;
 
-		DEBUG_LOG(("req.addDesync=%d, req.addDiscon=%d, addedInDesync=%d,%d,%d, addedInDiscon=%d,%d,%d\n",
+		DEBUG_LOG(("req.addDesync=%d, req.addDiscon=%d, addedInDesync=%d,%d,%d, addedInDiscon=%d,%d,%d",
 			req.addDesync, req.addDiscon, addedInDesyncs2, addedInDesyncs3, addedInDesyncs4,
 			addedInDiscons2, addedInDiscons3, addedInDiscons4));
 
@@ -827,7 +957,7 @@ void GameEngine::checkAbnormalQuitting(void)
 				pref["0"] = val;
 				val.format("%d", addedInDiscons2 + req.addDiscon);
 				pref["3"] = val;
-				DEBUG_LOG(("house 2 req.addDesync || req.addDiscon: %d %d\n",
+				DEBUG_LOG(("house 2 req.addDesync || req.addDiscon: %d %d",
 					addedInDesyncs2 + req.addDesync, addedInDiscons2 + req.addDiscon));
 			}
 			else if (req.lastHouse == 3)
@@ -836,7 +966,7 @@ void GameEngine::checkAbnormalQuitting(void)
 				pref["1"] = val;
 				val.format("%d", addedInDiscons3 + req.addDiscon);
 				pref["4"] = val;
-				DEBUG_LOG(("house 3 req.addDesync || req.addDiscon: %d %d\n",
+				DEBUG_LOG(("house 3 req.addDesync || req.addDiscon: %d %d",
 					addedInDesyncs3 + req.addDesync, addedInDiscons3 + req.addDiscon));
 			}
 			else
@@ -845,7 +975,7 @@ void GameEngine::checkAbnormalQuitting(void)
 				pref["2"] = val;
 				val.format("%d", addedInDiscons4 + req.addDiscon);
 				pref["5"] = val;
-				DEBUG_LOG(("house 4 req.addDesync || req.addDiscon: %d %d\n",
+				DEBUG_LOG(("house 4 req.addDesync || req.addDiscon: %d %d",
 					addedInDesyncs4 + req.addDesync, addedInDiscons4 + req.addDiscon));
 			}
 			pref.write();
@@ -861,9 +991,9 @@ void GameEngine::checkAbnormalQuitting(void)
 void updateTGAtoDDS()
 {
 	// Here's the scoop. We're going to traverse through all of the files in the Art\Textures folder
-	// and determine if there are any .tga files that are newer than associated .dds files. If there 
+	// and determine if there are any .tga files that are newer than associated .dds files. If there
 	// are, then we will re-run the compression tool on them.
-	
+
 	File *fp = TheLocalFileSystem->openFile("buildDDS.txt", File::WRITE | File::CREATE | File::TRUNCATE | File::TEXT);
 	if (!fp) {
 		return;
@@ -891,17 +1021,15 @@ void updateTGAtoDDS()
 		}
 
 		// replace tga with dds
-		filenameDDS.removeLastChar();	// a
-		filenameDDS.removeLastChar();	// g
-		filenameDDS.removeLastChar();	// t
+		filenameDDS.truncateBy(3);	// "tga"
 		filenameDDS.concat("dds");
 
 		Bool needsToBeUpdated = FALSE;
 		FileInfo infoDDS;
 		if (TheFileSystem->doesFileExist(filenameDDS.str())) {
 			TheFileSystem->getFileInfo(filenameDDS, &infoDDS);
-			if (infoTGA.timestampHigh > infoDDS.timestampHigh || 
-					(infoTGA.timestampHigh == infoDDS.timestampHigh && 
+			if (infoTGA.timestampHigh > infoDDS.timestampHigh ||
+					(infoTGA.timestampHigh == infoDDS.timestampHigh &&
 					 infoTGA.timestampLow > infoDDS.timestampLow)) {
 				needsToBeUpdated = TRUE;
 			}
diff --git a/Generals/Code/GameEngine/Source/Common/GameLOD.cpp b/Generals/Code/GameEngine/Source/Common/GameLOD.cpp
index 08600c85ce3..b4f4592ed29 100644
--- a/Generals/Code/GameEngine/Source/Common/GameLOD.cpp
+++ b/Generals/Code/GameEngine/Source/Common/GameLOD.cpp
@@ -41,20 +41,15 @@
 #define DEFINE_PARTICLE_SYSTEM_NAMES
 #include "GameClient/ParticleSys.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define PROFILE_ERROR_LIMIT	0.94f	//fraction of profiled result needed to get a match.  Allows some room for error/fluctuation.
 
 //Hack to get access to a static method on the W3DDevice side. -MW
-extern Bool testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, Int *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex);
+extern Bool testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, MemValueType *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex);
 
 GameLODManager *TheGameLODManager=NULL;
 
-static const FieldParse TheStaticGameLODFieldParseTable[] = 
+static const FieldParse TheStaticGameLODFieldParseTable[] =
 {
 	{ "MinimumFPS",						INI::parseInt,					NULL,	offsetof( StaticGameLODInfo, m_minFPS)},
 	{ "MinimumProcessorFps",			INI::parseInt,					NULL,	offsetof( StaticGameLODInfo, m_minProcessorFPS)},
@@ -76,13 +71,15 @@ static const FieldParse TheStaticGameLODFieldParseTable[] =
 	{ "TextureReductionFactor",		INI::parseInt,					NULL,	offsetof( StaticGameLODInfo, m_textureReduction ) },
 };
 
-static const char *StaticGameLODNames[]=
+static const char *const StaticGameLODNames[]=
 {
 	"Low",
 	"Medium",
 	"High",
+	"VeryHigh",
 	"Custom"
 };
+static_assert(ARRAY_SIZE(StaticGameLODNames) == STATIC_GAME_LOD_COUNT, "Incorrect array size");
 
 StaticGameLODInfo::StaticGameLODInfo(void)
 {
@@ -110,7 +107,7 @@ StaticGameLODInfo::StaticGameLODInfo(void)
 	m_useTrees = TRUE;
 }
 
-static const FieldParse TheDynamicGameLODFieldParseTable[] = 
+static const FieldParse TheDynamicGameLODFieldParseTable[] =
 {
 	{ "MinimumFPS",						INI::parseInt,					NULL,	offsetof( DynamicGameLODInfo, m_minFPS)},
 	{ "ParticleSkipMask",				INI::parseInt,					NULL,	offsetof( DynamicGameLODInfo, m_dynamicParticleSkipMask)},
@@ -120,13 +117,14 @@ static const FieldParse TheDynamicGameLODFieldParseTable[] =
 	{ "MinParticleSkipPriority",		INI::parseIndexList, ParticlePriorityNames,	offsetof( DynamicGameLODInfo, m_minDynamicParticleSkipPriority)},
 };
 
-static const char *DynamicGameLODNames[]=
+static const char *const DynamicGameLODNames[]=
 {
 	"Low",
 	"Medium",
 	"High",
 	"VeryHigh"
 };
+static_assert(ARRAY_SIZE(DynamicGameLODNames) == DYNAMIC_GAME_LOD_COUNT, "Incorrect array size");
 
 DynamicGameLODInfo::DynamicGameLODInfo(void)
 {
@@ -139,16 +137,18 @@ DynamicGameLODInfo::DynamicGameLODInfo(void)
 };
 
 //Keep this in sync with enum in GameLOD.h
-static const char *CPUNames[] = 
+static const char *const CPUNames[] =
 {
 	"XX","P3", "P4","K7", NULL
 };
+static_assert(ARRAY_SIZE(CPUNames) == CPU_MAX + 1, "Incorrect array size");
 
 //Keep this in sync with enum in GameLOD.h
-static const char *VideoNames[] = 
+static const char *const VideoNames[] =
 {
 	"XX","V2","V3","V4","V5","TNT","TNT2","GF2","R100","PS11","GF3","GF4","PS14","R200","PS20","R300", NULL
 };
+static_assert(ARRAY_SIZE(VideoNames) == DC_MAX + 1, "Incorrect array size");
 
 void parseReallyLowMHz(INI* ini)
 {
@@ -227,11 +227,12 @@ GameLODManager::GameLODManager(void)
 	m_memBenchIndex=0;
 	m_compositeBenchIndex=0;
 	m_numBenchProfiles=0;
-	m_currentTextureReduction=0;
 	m_reallyLowMHz = 400;
-	
+
 	for (Int i=0; i<STATIC_GAME_LOD_CUSTOM; i++)
 		m_numLevelPresets[i]=0;
+
+	initStaticLODLevels();
 };
 
 GameLODManager::~GameLODManager()
@@ -239,27 +240,59 @@ GameLODManager::~GameLODManager()
 
 }
 
+void GameLODManager::initStaticLODLevels()
+{
+	// TheSuperHackers @info Initialize new system specs in this function when we cannot rely on new edits to GameLOD.ini.
+
+	StaticGameLODInfo& veryhigh = m_staticGameLODInfo[STATIC_GAME_LOD_VERY_HIGH];
+	veryhigh.m_minFPS = 55;
+	veryhigh.m_minProcessorFPS = 59;
+	veryhigh.m_sampleCount2D = 6;
+	veryhigh.m_sampleCount3D = 24;
+	veryhigh.m_streamCount = 2;
+	veryhigh.m_maxParticleCount = 5000;
+	veryhigh.m_useShadowVolumes = TRUE;
+	veryhigh.m_useShadowDecals = TRUE;
+	veryhigh.m_useCloudMap = TRUE;
+	veryhigh.m_useLightMap = TRUE;
+	veryhigh.m_showSoftWaterEdge = TRUE;
+	veryhigh.m_maxTankTrackEdges = 100;
+	veryhigh.m_maxTankTrackOpaqueEdges = 25;
+	veryhigh.m_maxTankTrackFadeDelay = 60000;
+	veryhigh.m_useBuildupScaffolds = TRUE;
+	veryhigh.m_useTreeSway = TRUE;
+	veryhigh.m_useEmissiveNightMaterials = TRUE;
+	veryhigh.m_textureReduction = 0;
+	veryhigh.m_useFpsLimit = TRUE;
+	veryhigh.m_enableDynamicLOD = TRUE;
+	veryhigh.m_useTrees = TRUE;
+}
+
 BenchProfile *GameLODManager::newBenchProfile(void)
 {
 	if (m_numBenchProfiles < MAX_BENCH_PROFILES)
-	{	
+	{
 		m_numBenchProfiles++;
 		return &m_benchProfiles[m_numBenchProfiles-1];
 	}
 
-	DEBUG_CRASH(( "GameLODManager::newBenchProfile - Too many profiles defined\n"));
+	DEBUG_CRASH(( "GameLODManager::newBenchProfile - Too many profiles defined"));
 	return NULL;
 }
 
 LODPresetInfo *GameLODManager::newLODPreset(StaticGameLODLevel index)
 {
-	if (m_numLevelPresets[index] < MAX_LOD_PRESETS_PER_LEVEL)
-	{	
-		m_numLevelPresets[index]++;
-		return &m_lodPresets[index][m_numLevelPresets[index]-1];
+	if (index >= 0 && index < STATIC_GAME_LOD_COUNT)
+	{
+		if (m_numLevelPresets[index] < MAX_LOD_PRESETS_PER_LEVEL)
+		{
+			m_numLevelPresets[index]++;
+			return &m_lodPresets[index][m_numLevelPresets[index]-1];
+		}
+
+		DEBUG_CRASH(( "GameLODManager::newLODPreset - Too many presets defined for '%s'", TheGameLODManager->getStaticGameLODLevelName(index)));
 	}
 
-	DEBUG_CRASH(( "GameLODManager::newLODPreset - Too many presets defined for '%s'\n", TheGameLODManager->getStaticGameLODLevelName(index)));
 	return NULL;
 }
 
@@ -267,10 +300,10 @@ void GameLODManager::init(void)
 {
 	INI ini;
 	//Get Presets for each LOD level.
-	ini.load( AsciiString( "Data\\INI\\GameLOD.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\GameLOD", INI_LOAD_OVERWRITE, NULL );
 
 	//Get presets for each known hardware configuration
-	ini.load( AsciiString( "Data\\INI\\GameLODPresets.ini"), INI_LOAD_OVERWRITE, NULL);
+	ini.loadFileDirectory( "Data\\INI\\GameLODPresets", INI_LOAD_OVERWRITE, NULL);
 
 	//Get Presets for custom LOD level by pulling them out of initial globaldata (which should
 	//have all settings already applied).
@@ -295,7 +328,7 @@ void GameLODManager::init(void)
 		{
 			//need to run the benchmark
 			testMinimumRequirements(NULL,NULL,NULL,NULL,&m_intBenchIndex,&m_floatBenchIndex,&m_memBenchIndex);
-			
+
 			if (TheGlobalData->m_forceBenchmark)
 			{	//we want to see the numbers.  So dump them to a logfile.
 				FILE *fp=fopen("Benchmark.txt","w");
@@ -316,8 +349,8 @@ void GameLODManager::init(void)
 			{
 				//Check if we're within 5% of the performance of this cpu profile.
 				if (m_intBenchIndex/prof->m_intBenchIndex >= PROFILE_ERROR_LIMIT && m_floatBenchIndex/prof->m_floatBenchIndex >= PROFILE_ERROR_LIMIT && m_memBenchIndex/prof->m_memBenchIndex >= PROFILE_ERROR_LIMIT)
-				{	
-					for (Int i=STATIC_GAME_LOD_HIGH; i >= STATIC_GAME_LOD_LOW; i--)
+				{
+					for (Int i=STATIC_GAME_LOD_LAST; i >= STATIC_GAME_LOD_FIRST; i--)
 					{
 						LODPresetInfo *preset=&m_lodPresets[i][0];	//pointer to first preset at this LOD level.
 						for (Int j=0; j<m_numLevelPresets[i]; j++)
@@ -336,8 +369,8 @@ void GameLODManager::init(void)
 				}
 				prof++;
 			}
-		}	//finding equivalent CPU to unkown cpu.
-	}	//find data needed to determine m_idealDetailLevel
+		}
+	}
 
 	if (userSetDetail == STATIC_GAME_LOD_CUSTOM)
 	{
@@ -390,7 +423,7 @@ Int GameLODManager::getStaticGameLODIndex(AsciiString name)
 			return i;
 	}
 
-	DEBUG_CRASH(( "GameLODManager::getGameLODIndex - Invalid LOD name '%s'\n", name.str() ));
+	DEBUG_CRASH(( "GameLODManager::getGameLODIndex - Invalid LOD name '%s'", name.str() ));
 	return STATIC_GAME_LOD_UNKNOWN;
 }
 
@@ -402,7 +435,7 @@ void INI::parseStaticGameLODDefinition( INI* ini )
 
 	// read the name
 	c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	if( TheGameLODManager )
 	{
@@ -427,7 +460,7 @@ void INI::parseStaticGameLODLevel( INI* ini, void * , void *store, const void*)
 			return;
 		}
 
-	DEBUG_CRASH(("invalid GameLODLevel token %s -- expected LOW/MEDIUM/HIGH\n",tok));
+	DEBUG_CRASH(("invalid GameLODLevel token %s -- expected LOW/MEDIUM/HIGH",tok));
 	throw INI_INVALID_DATA;
 }
 
@@ -438,7 +471,7 @@ const char *GameLODManager::getStaticGameLODLevelName(StaticGameLODLevel level)
 
 /**Function which calculates the recommended LOD level for current hardware
 configuration.*/
-StaticGameLODLevel GameLODManager::findStaticLODLevel(void)
+StaticGameLODLevel GameLODManager::getRecommendedStaticLODLevel(void)
 {
 	//Check if we have never done the test on current system
 	if (m_idealDetailLevel == STATIC_GAME_LOD_UNKNOWN)
@@ -453,7 +486,7 @@ StaticGameLODLevel GameLODManager::findStaticLODLevel(void)
 
 		Int numMBRam=m_numRAM/(1024*1024);
 
-		for (Int i=STATIC_GAME_LOD_HIGH; i >= STATIC_GAME_LOD_LOW; i--)
+		for (Int i=STATIC_GAME_LOD_LAST; i >= STATIC_GAME_LOD_FIRST; i--)
 		{
 				LODPresetInfo *preset=&m_lodPresets[i][0];	//pointer to first preset at this LOD level.
 				for (Int j=0; j<m_numLevelPresets[i]; j++)
@@ -489,7 +522,7 @@ StaticGameLODLevel GameLODManager::findStaticLODLevel(void)
 Bool GameLODManager::setStaticLODLevel(StaticGameLODLevel level)
 {
 	if (!TheGlobalData->m_enableStaticLOD)
-	{	m_currentStaticLOD = STATIC_GAME_LOD_CUSTOM; 
+	{	m_currentStaticLOD = STATIC_GAME_LOD_CUSTOM;
 		return FALSE;
 	}
 
@@ -521,16 +554,23 @@ void GameLODManager::applyStaticLODLevel(StaticGameLODLevel level)
 	StaticGameLODInfo *lodInfo=&m_staticGameLODInfo[level];
 	StaticGameLODInfo *prevLodInfo=&prevLodBackup;
 
-	Int requestedTextureReduction = 0;
-	Bool requestedTrees = m_memPassed;	//only use trees if memory requirement passed.
+	Int requestedTextureReduction;
+	Bool requestedTrees;
 	if (level == STATIC_GAME_LOD_CUSTOM)
-	{	requestedTextureReduction = lodInfo->m_textureReduction;
+	{
+		requestedTextureReduction = lodInfo->m_textureReduction;
 		requestedTrees = lodInfo->m_useTrees;
 	}
 	else
-	if (level >= STATIC_GAME_LOD_LOW)
-	{	//normal non-custom level gets texture reduction based on recommendation
-		requestedTextureReduction = getRecommendedTextureReduction();
+	{
+		//normal non-custom level gets texture reduction based on recommendation
+		StaticGameLODLevel textureLevel = getRecommendedTextureLODLevel();
+		if (textureLevel == STATIC_GAME_LOD_UNKNOWN)
+			textureLevel = level;
+		requestedTextureReduction = getLevelTextureReduction(textureLevel);
+
+		//only use trees if memory requirement passed.
+		requestedTrees = m_memPassed;
 	}
 
 	if (TheGlobalData)
@@ -539,13 +579,7 @@ void GameLODManager::applyStaticLODLevel(StaticGameLODLevel level)
 		TheWritableGlobalData->m_useShadowVolumes=lodInfo->m_useShadowVolumes;
 		TheWritableGlobalData->m_useShadowDecals=lodInfo->m_useShadowDecals;
 
-		//Check if texture resolution changed.  No need to apply when current is unknown because display will do it
-		if (requestedTextureReduction != m_currentTextureReduction)
-		{
-				TheWritableGlobalData->m_textureReductionFactor = requestedTextureReduction;
-				if (TheGameClient)
-					TheGameClient->adjustLOD(0);	//apply the new setting stored in globaldata
-		}
+		TheWritableGlobalData->m_textureReductionFactor = requestedTextureReduction;
 
 		//Check if shadow state changed
 		if (m_currentStaticLOD == STATIC_GAME_LOD_UNKNOWN	||
@@ -577,13 +611,17 @@ void GameLODManager::applyStaticLODLevel(StaticGameLODLevel level)
 		TheWritableGlobalData->m_enableDynamicLOD = lodInfo->m_enableDynamicLOD;
 		TheWritableGlobalData->m_useFpsLimit = lodInfo->m_useFpsLimit;
 		TheWritableGlobalData->m_useTrees = requestedTrees;
+
+		if (!m_memPassed || isReallyLowMHz()) {
+			TheWritableGlobalData->m_shellMapOn = false;
+		}
 	}
-	if (!m_memPassed || isReallyLowMHz()) {
-		TheWritableGlobalData->m_shellMapOn = false;
-	}
+
 	if (TheTerrainVisual)
 		TheTerrainVisual->setTerrainTracksDetail();
 
+	if (TheGameClient)
+		TheGameClient->setTextureLOD(requestedTextureReduction);
 }
 
 /**Parse a description of all the LOD settings for a given detail level*/
@@ -594,7 +632,7 @@ void INI::parseDynamicGameLODDefinition( INI* ini )
 
 	// read the name
 	c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	if( TheGameLODManager )
 	{
@@ -619,7 +657,7 @@ void INI::parseDynamicGameLODLevel( INI* ini, void * , void *store, const void*)
 			return;
 		}
 
-	DEBUG_CRASH(("invalid GameLODLevel token %s -- expected LOW/MEDIUM/HIGH\n",tok));
+	DEBUG_CRASH(("invalid GameLODLevel token %s -- expected LOW/MEDIUM/HIGH",tok));
 	throw INI_INVALID_DATA;
 }
 
@@ -632,7 +670,7 @@ Int GameLODManager::getDynamicGameLODIndex(AsciiString name)
 			return i;
 	}
 
-	DEBUG_CRASH(( "GameLODManager::getGameLODIndex - Invalid LOD name '%s'\n", name.str() ));
+	DEBUG_CRASH(( "GameLODManager::getGameLODIndex - Invalid LOD name '%s'", name.str() ));
 	return STATIC_GAME_LOD_UNKNOWN;
 }
 
@@ -682,13 +720,36 @@ void GameLODManager::applyDynamicLODLevel(DynamicGameLODLevel level)
 
 Int GameLODManager::getRecommendedTextureReduction(void)
 {
-	if (m_idealDetailLevel == STATIC_GAME_LOD_UNKNOWN)
-		findStaticLODLevel();	//it was never tested, so test now.
+	StaticGameLODLevel level = getRecommendedTextureLODLevel();
 
-	if (!m_memPassed)	//if they have < 256 MB, force them to low res textures.
-		return m_staticGameLODInfo[STATIC_GAME_LOD_LOW].m_textureReduction;
+	if (level == STATIC_GAME_LOD_UNKNOWN)
+	{
+		level = getStaticLODLevel();
+	}
+	return getLevelTextureReduction(level);
+}
+
+StaticGameLODLevel GameLODManager::getRecommendedTextureLODLevel()
+{
+	// TheSuperHackers @bugfix xezon 24/09/2025 Disables the recommended static LOD level for texture reduction
+	// because the benchmark code always generates a low level for it. Can revisit if the benchmarking is changed.
+	constexpr const Bool UseRecommendedStaticLODLevel = FALSE;
 
-	return m_staticGameLODInfo[m_idealDetailLevel].m_textureReduction;
+	StaticGameLODLevel level = STATIC_GAME_LOD_LOW;
+
+	// Force low res textures if user has less than 256 MB.
+	if (m_memPassed)
+	{
+		if constexpr (UseRecommendedStaticLODLevel)
+		{
+			level = getRecommendedStaticLODLevel();
+		}
+		else
+		{
+			level = STATIC_GAME_LOD_UNKNOWN;
+		}
+	}
+	return level;
 }
 
 Int GameLODManager::getLevelTextureReduction(StaticGameLODLevel level)
@@ -697,6 +758,6 @@ Int GameLODManager::getLevelTextureReduction(StaticGameLODLevel level)
 }
 
 Bool GameLODManager::didMemPass( void )
-{ 
-	return m_memPassed;	
+{
+	return m_memPassed;
 }
diff --git a/Generals/Code/GameEngine/Source/Common/GameMain.cpp b/Generals/Code/GameEngine/Source/Common/GameMain.cpp
index a8cbc291f91..870829597bc 100644
--- a/Generals/Code/GameEngine/Source/Common/GameMain.cpp
+++ b/Generals/Code/GameEngine/Source/Common/GameMain.cpp
@@ -28,24 +28,39 @@
 
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/FramePacer.h"
 #include "Common/GameEngine.h"
+#include "Common/ReplaySimulation.h"
 
 
 /**
  * This is the entry point for the game system.
  */
-void GameMain( int argc, char *argv[] )
+Int GameMain()
 {
+	int exitcode = 0;
 	// initialize the game engine using factory function
+	TheFramePacer = new FramePacer();
+	TheFramePacer->enableFramesPerSecondLimit(TRUE);
 	TheGameEngine = CreateGameEngine();
-	TheGameEngine->init(argc, argv);
+	TheGameEngine->init();
 
-	// run it
-	TheGameEngine->execute();
+	if (!TheGlobalData->m_simulateReplays.empty())
+	{
+		exitcode = ReplaySimulation::simulateReplays(TheGlobalData->m_simulateReplays, TheGlobalData->m_simulateReplayJobs);
+	}
+	else
+	{
+		// run it
+		TheGameEngine->execute();
+	}
 
 	// since execute() returned, we are exiting the game
+	delete TheFramePacer;
+	TheFramePacer = NULL;
 	delete TheGameEngine;
 	TheGameEngine = NULL;
 
+	return exitcode;
 }
 
diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp
index b3c407c02da..24d13f14da8 100644
--- a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp
+++ b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp
@@ -32,12 +32,15 @@
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/GlobalData.h"
+
 #define DEFINE_TERRAIN_LOD_NAMES
 #define DEFINE_TIME_OF_DAY_NAMES
 #define DEFINE_WEATHER_NAMES
 #define DEFINE_BODYDAMAGETYPE_NAMES
 #define DEFINE_PANNING_NAMES
 
+#include "Common/AddonCompat.h"
 #include "Common/crc.h"
 #include "Common/file.h"
 #include "Common/FileSystem.h"
@@ -64,7 +67,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-/*static*/ const FieldParse GlobalData::s_GlobalDataFieldParseTable[] = 
+/*static*/ const FieldParse GlobalData::s_GlobalDataFieldParseTable[] =
 {
 	{ "Windowed",									INI::parseBool,				NULL,			offsetof( GlobalData, m_windowed ) },
 	{ "XResolution",							INI::parseInt,				NULL,			offsetof( GlobalData, m_xResolution ) },
@@ -87,8 +90,8 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "StretchTerrain",						INI::parseBool,				NULL,			offsetof( GlobalData, m_stretchTerrain ) },
 	{ "UseHalfHeightMap",					INI::parseBool,				NULL,			offsetof( GlobalData, m_useHalfHeightMap ) },
 	{ "UserDataLeafName",					INI::parseQuotedAsciiString,	NULL,			offsetof( GlobalData, m_userDataLeafName ) },
-	
-	
+
+
 	{ "DrawEntireTerrain",					INI::parseBool,				NULL,			offsetof( GlobalData, m_drawEntireTerrain ) },
 	{ "TerrainLOD",									INI::parseIndexList,	TerrainLODNames,	offsetof( GlobalData, m_terrainLOD ) },
 	{ "TerrainLODTargetTimeMS",			INI::parseInt,				NULL,			offsetof( GlobalData, m_terrainLODTargetTimeMS ) },
@@ -176,6 +179,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "SkyBoxPositionZ",				INI::parseReal,				NULL,			offsetof( GlobalData, m_skyBoxPositionZ ) },
 	{ "SkyBoxScale",				INI::parseReal,				NULL,			offsetof( GlobalData, m_skyBoxScale ) },
 	{ "DrawSkyBox",				INI::parseBool,				NULL,			offsetof( GlobalData, m_drawSkyBox ) },
+	{ "ViewportHeightScale", INI::parseReal, NULL, offsetof( GlobalData, m_viewportHeightScale ) },
 	{ "CameraPitch",								INI::parseReal,				NULL,			offsetof( GlobalData, m_cameraPitch ) },
 	{ "CameraYaw",									INI::parseReal,				NULL,			offsetof( GlobalData, m_cameraYaw ) },
 	{ "CameraHeight",								INI::parseReal,				NULL,			offsetof( GlobalData, m_cameraHeight ) },
@@ -189,7 +193,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "Gravity",									INI::parseAccelerationReal,				NULL,				offsetof( GlobalData, m_gravity ) },
 	{ "StealthFriendlyOpacity",		INI::parsePercentToReal,				NULL,				offsetof( GlobalData, m_stealthFriendlyOpacity ) },
 	{ "DefaultOcclusionDelay",				INI::parseDurationUnsignedInt,				NULL,			offsetof( GlobalData, m_defaultOcclusionDelay ) },
-	
+
 	{ "PartitionCellSize",				INI::parseReal,				NULL,			offsetof( GlobalData, m_partitionCellSize ) },
 
 	{ "AmmoPipScaleFactor",				INI::parseReal,				NULL,			offsetof( GlobalData, m_ammoPipScaleFactor ) },
@@ -243,7 +247,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "TerrainObjectsLightingNightDiffuse",				INI::parseRGBColor,			NULL,			offsetof( GlobalData, m_terrainObjectsLighting[ TIME_OF_DAY_NIGHT ][0].diffuse ) },
 	{ "TerrainObjectsLightingNightLightPos",			INI::parseCoord3D,			NULL,			offsetof( GlobalData, m_terrainObjectsLighting[ TIME_OF_DAY_NIGHT ][0].lightPos ) },
 
-	//Secondary global light	
+	//Secondary global light
 	{ "TerrainLightingMorningAmbient2",			INI::parseRGBColor,			NULL,			offsetof( GlobalData, m_terrainLighting[ TIME_OF_DAY_MORNING ][1].ambient ) },
 	{ "TerrainLightingMorningDiffuse2",			INI::parseRGBColor,			NULL,			offsetof( GlobalData, m_terrainLighting[ TIME_OF_DAY_MORNING ][1].diffuse ) },
 	{ "TerrainLightingMorningLightPos2",		INI::parseCoord3D,			NULL,			offsetof( GlobalData, m_terrainLighting[ TIME_OF_DAY_MORNING ][1].lightPos ) },
@@ -297,7 +301,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "TerrainObjectsLightingNightDiffuse3",				INI::parseRGBColor,			NULL,			offsetof( GlobalData, m_terrainObjectsLighting[ TIME_OF_DAY_NIGHT ][2].diffuse ) },
 	{ "TerrainObjectsLightingNightLightPos3",			INI::parseCoord3D,			NULL,			offsetof( GlobalData, m_terrainObjectsLighting[ TIME_OF_DAY_NIGHT ][2].lightPos ) },
 
-	
+
 	{ "NumberGlobalLights",								INI::parseInt,				NULL,			offsetof( GlobalData, m_numGlobalLights)},
 	{ "InfantryLightMorningScale",				INI::parseReal,			NULL,			offsetof( GlobalData, m_infantryLightScale[TIME_OF_DAY_MORNING] ) },
 	{ "InfantryLightAfternoonScale",				INI::parseReal,			NULL,			offsetof( GlobalData, m_infantryLightScale[TIME_OF_DAY_AFTERNOON] ) },
@@ -307,7 +311,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "MaxTranslucentObjects",						INI::parseInt,				NULL,			offsetof( GlobalData, m_maxVisibleTranslucentObjects) },
 	{ "OccludedColorLuminanceScale",				INI::parseReal,				NULL,			offsetof( GlobalData, m_occludedLuminanceScale) },
 
-/* These are internal use only, they do not need file definitons 
+/* These are internal use only, they do not need file definitons
 	{ "TerrainAmbientRGB",				INI::parseRGBColor,		NULL,			offsetof( GlobalData, m_terrainAmbient ) },
 	{ "TerrainDiffuseRGB",				INI::parseRGBColor,		NULL,			offsetof( GlobalData, m_terrainDiffuse ) },
 	{ "TerrainLightPos",					INI::parseCoord3D,		NULL,			offsetof( GlobalData, m_terrainLightPos ) },
@@ -318,7 +322,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "MaxRoadTypes",								INI::parseInt,				NULL,			offsetof( GlobalData, m_maxRoadTypes ) },
 
 	{ "ValuePerSupplyBox",					INI::parseInt,				NULL,			offsetof( GlobalData, m_baseValuePerSupplyBox ) },
-	
+
 	{ "AudioOn",										INI::parseBool,				NULL,			offsetof( GlobalData, m_audioOn ) },
 	{ "MusicOn",										INI::parseBool,				NULL,			offsetof( GlobalData, m_musicOn ) },
 	{ "SoundsOn",										INI::parseBool,				NULL,			offsetof( GlobalData, m_soundsOn ) },
@@ -327,7 +331,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "VideoOn",										INI::parseBool,				NULL,			offsetof( GlobalData, m_videoOn ) },
 	{ "DisableCameraMovements",			INI::parseBool,				NULL,			offsetof( GlobalData, m_disableCameraMovement ) },
 
-/* These are internal use only, they do not need file definitons 		
+/* These are internal use only, they do not need file definitons
 	/// @todo remove this hack
 	{ "InGame",											INI::parseBool,				NULL,			offsetof( GlobalData, m_inGame ) },
 */
@@ -361,7 +365,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "AutoAflameParticleSystem",					INI::parseAsciiString,  NULL,  offsetof( GlobalData, m_autoAflameParticleSystem ) },
 	{ "AutoAflameParticleMax",						INI::parseInt,					NULL,	 offsetof( GlobalData, m_autoAflameParticleMax ) },
 
-/* These are internal use only, they do not need file definitons 	
+/* These are internal use only, they do not need file definitons
 	{ "LatencyAverage",							INI::parseInt,				NULL,			offsetof( GlobalData, m_latencyAverage ) },
 	{ "LatencyAmplitude",						INI::parseInt,				NULL,			offsetof( GlobalData, m_latencyAmplitude ) },
 	{ "LatencyPeriod",							INI::parseInt,				NULL,			offsetof( GlobalData, m_latencyPeriod ) },
@@ -397,6 +401,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "EnforceMaxCameraHeight",			INI::parseBool,				NULL,			offsetof( GlobalData, m_enforceMaxCameraHeight ) },
 	{ "KeyboardScrollSpeedFactor",	INI::parseReal,				NULL,			offsetof( GlobalData, m_keyboardScrollFactor ) },
 	{ "KeyboardDefaultScrollSpeedFactor",	INI::parseReal,				NULL,			offsetof( GlobalData, m_keyboardDefaultScrollFactor ) },
+	{ "KeyboardCameraRotateSpeed", INI::parseReal, NULL, offsetof( GlobalData, m_keyboardCameraRotateSpeed ) },
 	{ "MovementPenaltyDamageState",	INI::parseIndexList,	TheBodyDamageTypeNames,	 offsetof( GlobalData, m_movementPenaltyDamageState ) },
 
 // you cannot set this; it always has a value of 100%.
@@ -437,6 +442,11 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 
 	{	"CameraAudibleRadius",				INI::parseReal,				NULL,			offsetof( GlobalData, m_cameraAudibleRadius ) },
 	{ "GroupMoveClickToGatherAreaFactor", INI::parseReal,	NULL,			offsetof( GlobalData, m_groupMoveClickToGatherFactor ) },
+
+#if !PRESERVE_RETAIL_BEHAVIOR
+	{ "AllowMoneyPerMinuteForPlayer",	INI::parseBool,			NULL,			offsetof( GlobalData, m_allowMoneyPerMinuteForPlayer ) },
+#endif
+
 	{ "ShakeSubtleIntensity",				INI::parseReal,				NULL,			offsetof( GlobalData, m_shakeSubtleIntensity ) },
 	{ "ShakeNormalIntensity",				INI::parseReal,				NULL,			offsetof( GlobalData, m_shakeNormalIntensity ) },
 	{ "ShakeStrongIntensity",				INI::parseReal,				NULL,			offsetof( GlobalData, m_shakeStrongIntensity ) },
@@ -456,13 +466,18 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 
 	{ "SpecialPowerViewObject",			INI::parseAsciiString,	NULL,			offsetof( GlobalData, m_specialPowerViewObjectName ) },
 
+	// TheSuperHackers @feature Customize the opacity (0..1) and shadows of build preview objects. Shadows are enabled by default.
+	// Note that disabling shadows loses a fair bit of contrast visually and warrants raising the opacity.
+	{ "ObjectPlacementOpacity", INI::parseReal, NULL, offsetof( GlobalData, m_objectPlacementOpacity ) },
+	{ "ObjectPlacementShadows", INI::parseBool, NULL, offsetof( GlobalData, m_objectPlacementShadows ) },
+
 	{ "StandardPublicBone", INI::parseAsciiStringVectorAppend, NULL, offsetof(GlobalData, m_standardPublicBones) },
-	{ "ShowMetrics",								INI::parseBool,				NULL,			offsetof( GlobalData, m_showMetrics ) },
-	{ "DefaultStartingCash",				INI::parseUnsignedInt, NULL,		offsetof( GlobalData, m_defaultStartingCash ) },
+	{ "ShowMetrics",								INI::parseBool,				   NULL,		offsetof( GlobalData, m_showMetrics ) },
+  { "DefaultStartingCash",				Money::parseMoneyAmount, NULL,		offsetof( GlobalData, m_defaultStartingCash ) },
 
 // NOTE: m_doubleClickTimeMS is still in use, but we disallow setting it from the GameData.ini file. It is now set in the constructor according to the windows parameter.
 //	{ "DoubleClickTimeMS",									INI::parseUnsignedInt,			NULL, offsetof( GlobalData, m_doubleClickTimeMS ) },
-	
+
 	{ "ShroudColor",		INI::parseRGBColor,						NULL,	offsetof( GlobalData, m_shroudColor) },
 	{ "ClearAlpha",			INI::parseUnsignedByte,				NULL,	offsetof( GlobalData, m_clearAlpha) },
 	{ "FogAlpha",				INI::parseUnsignedByte,				NULL,	offsetof( GlobalData, m_fogAlpha) },
@@ -484,11 +499,10 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "NetworkDisconnectTime", INI::parseInt, NULL, offsetof(GlobalData, m_networkDisconnectTime) },
 	{ "NetworkPlayerTimeoutTime", INI::parseInt, NULL, offsetof(GlobalData, m_networkPlayerTimeoutTime) },
 	{ "NetworkDisconnectScreenNotifyTime", INI::parseInt, NULL, offsetof(GlobalData, m_networkDisconnectScreenNotifyTime) },
-	
-	{ "KeyboardCameraRotateSpeed", INI::parseReal, NULL, offsetof( GlobalData, m_keyboardCameraRotateSpeed ) },
+
 	{ "PlayStats",									INI::parseInt,				NULL,			offsetof( GlobalData, m_playStats ) },
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	{ "DisableCameraFade",			INI::parseBool,				NULL,			offsetof( GlobalData, m_disableCameraFade ) },
 	{ "DisableScriptedInputDisabling",			INI::parseBool,		NULL,			offsetof( GlobalData, m_disableScriptedInputDisabling ) },
 	{ "DisableMilitaryCaption",			INI::parseBool,				NULL,			offsetof( GlobalData, m_disableMilitaryCaption ) },
@@ -522,7 +536,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "ExtraLogging",								INI::parseBool,				NULL,			offsetof( GlobalData, m_extraLogging ) },
 #endif
 
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
+	{ NULL,					NULL,						NULL,						0 }
 
 };
 
@@ -535,7 +549,7 @@ GlobalData::GlobalData()
 
 	//
 	// we have now instanced a global data instance, if theOriginal is NULL, this is
-	// *the* very first instance and it shall be recorded.  This way, when we load 
+	// *the* very first instance and it shall be recorded.  This way, when we load
 	// overrides of the global data, we can revert to the common, original data
 	// in m_theOriginal
 	//
@@ -545,11 +559,14 @@ GlobalData::GlobalData()
 
   m_TiVOFastMode = FALSE;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG) || ENABLE_CONFIGURABLE_SHROUD
+	m_shroudOn = TRUE;
+#endif
+
+#if defined(RTS_DEBUG)
 	m_wireframe = 0;
 	m_stateMachineDebug = FALSE;
 	m_useCameraConstraints = TRUE;
-	m_shroudOn = TRUE;
 	m_fogOfWarOn = FALSE;
 	m_jabberOn = FALSE;
 	m_munkeeOn = FALSE;
@@ -562,13 +579,13 @@ GlobalData::GlobalData()
 	m_debugVisibilityTileDuration = LOGICFRAMES_PER_SECOND;
 	m_debugProjectilePath = FALSE;
 	m_debugProjectileTileWidth = 10;
-	m_debugProjectileTileDuration = LOGICFRAMES_PER_SECOND;  // Changed By Sadullah Nader
+	m_debugProjectileTileDuration = LOGICFRAMES_PER_SECOND;
 	m_debugThreatMap = FALSE;
 	m_maxDebugThreat = 5000;
-	m_debugThreatMapTileDuration = LOGICFRAMES_PER_SECOND;  // Changed By Sadullah Nader
+	m_debugThreatMapTileDuration = LOGICFRAMES_PER_SECOND;
 	m_debugCashValueMap = FALSE;
 	m_maxDebugValue = 10000;
-	m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader
+	m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND;
 	m_vTune = false;
 	m_checkForLeaks = TRUE;
 	m_benchmarkTimer = -1;
@@ -610,8 +627,8 @@ GlobalData::GlobalData()
 	m_chipSetType = 0;
 	m_headless = FALSE;
 	m_windowed = 0;
-	m_xResolution = 800;
-	m_yResolution = 600;
+	m_xResolution = DEFAULT_DISPLAY_WIDTH;
+	m_yResolution = DEFAULT_DISPLAY_HEIGHT;
 	m_maxShellScreens = 0;
 	m_useCloudMap = FALSE;
 	m_use3WayTerrainBlends = 1;
@@ -647,12 +664,13 @@ GlobalData::GlobalData()
 	m_waterPositionX = 0.0f;
 	m_waterPositionY = 0.0f;
 	m_waterPositionZ = 0.0f;
-	m_waterExtentX = 0.0f;	
+	m_waterExtentX = 0.0f;
 	m_waterExtentY = 0.0f;
 	m_waterType = 0;
 	m_featherWater = FALSE;
 	m_showSoftWaterEdge = TRUE;	//display soft water edge
 	m_usingWaterTrackEditor = FALSE;
+	m_isWorldBuilder = FALSE;
 
 	m_showMetrics = false;
 
@@ -672,10 +690,8 @@ GlobalData::GlobalData()
 		m_vertexWaterAttenuationB[ i ] = 0.0f;
 		m_vertexWaterAttenuationC[ i ] = 0.0f;
 		m_vertexWaterAttenuationRange[ i ] = 0.0f;
-		//Added By Sadullah Nader
-		//Initializations missing and needed
 		m_vertexWaterAvailableMaps[i].clear();
-	}  // end for i
+	}
 
 	m_skyBoxPositionZ = 0.0f;
 	m_drawSkyBox = FALSE;
@@ -746,7 +762,7 @@ GlobalData::GlobalData()
 
 	for (j=TIME_OF_DAY_FIRST; j<TIME_OF_DAY_COUNT; j++)
 		m_infantryLightScale[j] = 1.5f;
-	
+
 	m_scriptOverrideInfantryLightScale = -1.0f;
 
 	m_numGlobalLights = 3;
@@ -772,7 +788,7 @@ GlobalData::GlobalData()
 
 	m_useFX = TRUE;
 
-//	m_inGame = FALSE;	
+//	m_inGame = FALSE;
 
 	m_noDraw = 0;
 	m_particleScale = 1.0f;
@@ -784,9 +800,7 @@ GlobalData::GlobalData()
 	m_autoSmokeParticleMediumMax = 0;
 	m_autoSmokeParticleLargeMax = 0;
 	m_autoAflameParticleMax = 0;
-  
-	// Added By Sadullah Nader
-	// Initializations missing and needed
+
 	m_autoFireParticleSmallPrefix.clear();
 	m_autoFireParticleMediumPrefix.clear();
 	m_autoFireParticleLargePrefix.clear();
@@ -809,8 +823,6 @@ GlobalData::GlobalData()
 	m_drawEntireTerrain = FALSE;
 	m_maxParticleCount = 0;
 	m_maxFieldParticleCount = 30;
-	
-	// End Add
 
 	m_debugAI = AI_DEBUG_NONE;
 	m_debugSupplyCenterPlacement = FALSE;
@@ -821,6 +833,8 @@ GlobalData::GlobalData()
 
 	m_particleEdit = FALSE;
 
+	m_viewportHeightScale = 0.80f; // Default value for the original Control Bar.
+
 	m_cameraPitch = 0.0f;
 	m_cameraYaw = 0.0f;
 	m_cameraHeight = 0.0f;
@@ -861,7 +875,10 @@ GlobalData::GlobalData()
 
 	m_standardMinefieldDensity = 0.01f;
 	m_standardMinefieldDistance = 40.0f;
-	
+
+	m_objectPlacementOpacity = 0.45f;
+	m_objectPlacementShadows = TRUE;
+
 	m_groupSelectMinSelectSize = 5;
 	m_groupSelectVolumeBase = 0.5f;
 	m_groupSelectVolumeIncrement = 0.02f;
@@ -915,10 +932,18 @@ GlobalData::GlobalData()
 	m_firewallPortAllocationDelta = 0;
 	m_loadScreenDemo = FALSE;
 	m_disableRender = false;
-	
+
 	m_saveCameraInReplay = FALSE;
 	m_useCameraInReplay = FALSE;
+	m_enablePlayerObserver = FALSE;
 
+	m_networkLatencyFontSize = 8;
+	m_renderFpsFontSize = 8;
+	m_systemTimeFontSize = 8;
+	m_gameTimeFontSize = 8;
+
+	m_showMoneyPerMinute = FALSE;
+	m_allowMoneyPerMinuteForPlayer = FALSE;
 
 	m_debugShowGraphicalFramerate = FALSE;
 
@@ -948,6 +973,9 @@ GlobalData::GlobalData()
 	m_initialFile.clear();
 	m_pendingFile.clear();
 
+	m_simulateReplays.clear();
+	m_simulateReplayJobs = SIMULATE_REPLAYS_SEQUENTIAL;
+
 	for (i = LEVEL_FIRST; i <= LEVEL_LAST; ++i)
 		m_healthBonus[i] = 1.0f;
 
@@ -969,95 +997,26 @@ GlobalData::GlobalData()
 	m_afterIntro = FALSE;
 	m_allowExitOutOfMovies = FALSE;
 	m_loadScreenRender = FALSE;
-  m_musicVolumeFactor = 0.5f;
- 	m_SFXVolumeFactor = 0.5f;
-  m_voiceVolumeFactor = 0.5f;
-  m_3DSoundPref = false;
 
 	m_keyboardDefaultScrollFactor = m_keyboardScrollFactor = 0.5f;
+	m_drawScrollAnchor = FALSE;
+	m_moveScrollAnchor = FALSE;
 	m_scrollAmountCutoff = 10.0f;
 	m_cameraAdjustSpeed = 0.1f;
 	m_enforceMaxCameraHeight = TRUE;
-	
+
 	m_animateWindows = TRUE;
-	
+
 	m_iniCRC = 0;
 	m_exeCRC = 0;
-	
-	// lets CRC the executable!  Whee!
-	const Int blockSize = 65536;
-	CRC exeCRC;
-	File *fp;
-	// TheSuperHackers @tweak SkyAero/xezon 27/05/2025
-	// Simulate the EXE's CRC value to force Network and Replay compatibility with another build.
-#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
-
-#define GENERALS_108_CD_EXE_CRC    0x93d1eab4
-#define GENERALS_108_STEAM_EXE_CRC 0x8d6e4dd7
-#define GENERALS_108_EAAPP_EXE_CRC 0xb07fbd50
-
-	exeCRC.set(GENERALS_108_CD_EXE_CRC);
-	DEBUG_LOG(("Fake EXE CRC is 0x%8.8X\n", exeCRC.get()));
-
-#else
-	{
-		Char buffer[ _MAX_PATH ];
-		GetModuleFileName( NULL, buffer, sizeof( buffer ) );
-		fp = TheFileSystem->openFile(buffer, File::READ | File::BINARY);
-		if (fp != NULL) {
-			unsigned char crcBlock[blockSize];
-			Int amtRead = 0;
-			while ( (amtRead=fp->read(crcBlock, blockSize)) > 0 )
-			{
-				exeCRC.computeCRC(crcBlock, amtRead);
-			}
-			DEBUG_LOG(("EXE CRC is 0x%8.8X\n", exeCRC.get()));
-			fp->close();
-			fp = NULL;
-		}
-	}
-#endif
-
-	UnsignedInt version = 0;
-	if (TheVersion)
-	{
-		version = TheVersion->getVersionNumber();
-		exeCRC.computeCRC( &version, sizeof(UnsignedInt) );
-	}
-	// Add in MP scripts to the EXE CRC, since the game will go out of sync if they change
-	fp = TheFileSystem->openFile("Data\\Scripts\\SkirmishScripts.scb", File::READ | File::BINARY);
-	if (fp != NULL) {
-		unsigned char crcBlock[blockSize];
-		Int amtRead = 0;
-		while ( (amtRead=fp->read(crcBlock, blockSize)) > 0 )
-		{
-			exeCRC.computeCRC(crcBlock, amtRead);
-		}
-		fp->close();
-		fp = NULL;
-	}
-	fp = TheFileSystem->openFile("Data\\Scripts\\MultiplayerScripts.scb", File::READ | File::BINARY);
-	if (fp != NULL) {
-		unsigned char crcBlock[blockSize];
-		Int amtRead = 0;
-		while ( (amtRead=fp->read(crcBlock, blockSize)) > 0 )
-		{
-			exeCRC.computeCRC(crcBlock, amtRead);
-		}
-		fp->close();
-		fp = NULL;
-	}
 
-	m_exeCRC = exeCRC.get();
-	DEBUG_LOG(("EXE+Version(%d.%d)+SCB CRC is 0x%8.8X\n", version >> 16, version & 0xffff, m_exeCRC));
-	
 	m_movementPenaltyDamageState = BODY_REALLYDAMAGED;
-	
+
 	m_shouldUpdateTGAToDDS = FALSE;
-	
+
 	// Default DoubleClickTime to System double click time.
 	m_doubleClickTimeMS = GetDoubleClickTime(); // Note: This is actual MS, not frames.
-	
+
 #ifdef DUMP_PERF_STATS
 	m_dumpPerformanceStatistics = FALSE;
 #endif
@@ -1066,7 +1025,7 @@ GlobalData::GlobalData()
 
 	m_keyboardCameraRotateSpeed = 0.1f;
 
-}  // end GlobalData
+}
 
 //-------------------------------------------------------------------------------------------------
 AsciiString GlobalData::getPath_UserData() const
@@ -1078,17 +1037,16 @@ AsciiString GlobalData::getPath_UserData() const
 //-------------------------------------------------------------------------------------------------
 GlobalData::~GlobalData( void )
 {
-	DEBUG_ASSERTCRASH( TheWritableGlobalData->m_next == NULL, ("~GlobalData: theOriginal is not original\n") );
+	DEBUG_ASSERTCRASH( TheWritableGlobalData->m_next == NULL, ("~GlobalData: theOriginal is not original") );
 
-	if (m_weaponBonusSet)
-		deleteInstance(m_weaponBonusSet);
+	deleteInstance(m_weaponBonusSet);
 
 	if( m_theOriginal == this )	{
 		m_theOriginal = NULL;
 		TheWritableGlobalData = NULL;
 	}
 
-}  // end ~GlobalData
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1121,7 +1079,7 @@ GlobalData *GlobalData::newOverride( void )
 	GlobalData *override = NEW GlobalData;
 
 	// copy the data from the latest override (TheWritableGlobalData) to the newly created instance
-	DEBUG_ASSERTCRASH( TheWritableGlobalData, ("GlobalData::newOverride() - no existing data\n") );
+	DEBUG_ASSERTCRASH( TheWritableGlobalData, ("GlobalData::newOverride() - no existing data") );
 	*override = *TheWritableGlobalData;
 
 	//
@@ -1136,12 +1094,12 @@ GlobalData *GlobalData::newOverride( void )
 
 	return override;
 
-}  // end newOveride
+}
 
 //-------------------------------------------------------------------------------------------------
 void GlobalData::init( void )
 {
-	// nothing
+	m_exeCRC = generateExeCRC();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1160,7 +1118,7 @@ void GlobalData::reset( void )
 	{
 
 		// get next instance
-		GlobalData* next = TheWritableGlobalData->m_next;
+		GlobalData* next = m_next;
 
 		// delete the head of the global data list (the latest override)
 		delete TheWritableGlobalData;
@@ -1168,16 +1126,16 @@ void GlobalData::reset( void )
 		// set next as top
 		TheWritableGlobalData = next;
 
-	}  // end while
+	}
 
 	//
 	// we now have the one single global data in TheWritableGlobalData singleton, lets sanity check
 	// some of all that
 	//
-	DEBUG_ASSERTCRASH( TheWritableGlobalData->m_next == NULL, ("ResetGlobalData: theOriginal is not original\n") );
-	DEBUG_ASSERTCRASH( TheWritableGlobalData == GlobalData::m_theOriginal, ("ResetGlobalData: oops\n") );
+	DEBUG_ASSERTCRASH( TheWritableGlobalData->m_next == NULL, ("ResetGlobalData: theOriginal is not original") );
+	DEBUG_ASSERTCRASH( TheWritableGlobalData == GlobalData::m_theOriginal, ("ResetGlobalData: oops") );
 
-}  // end ResetGlobalData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse GameData entry */
@@ -1187,21 +1145,21 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	if( TheWritableGlobalData && ini->getLoadType() != INI_LOAD_MULTIFILE)
 	{
 
-		// 
+		//
 		// if the type of loading we're doing creates override data, we need to
 		// be loading into a new override item
 		//
 		if( ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES )
 			TheWritableGlobalData->newOverride();
 
-	}  // end if
+	}
 	else if (!TheWritableGlobalData)
 	{
 
 		// we don't have any global data instance at all yet, create one
 		TheWritableGlobalData = NEW GlobalData;
 
-	}  // end else
+	}
 	// If we're multifile, then continue loading stuff into the Global Data as normal.
 
 	// parse the ini weapon definition
@@ -1224,15 +1182,24 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	OptionPreferences optionPref;
  	TheWritableGlobalData->m_useAlternateMouse = optionPref.getAlternateMouseModeEnabled();
 	TheWritableGlobalData->m_keyboardScrollFactor = optionPref.getScrollFactor();
+	TheWritableGlobalData->m_drawScrollAnchor = optionPref.getDrawScrollAnchor();
+	TheWritableGlobalData->m_moveScrollAnchor = optionPref.getMoveScrollAnchor();
 	TheWritableGlobalData->m_defaultIP = optionPref.getLANIPAddress();
 	TheWritableGlobalData->m_firewallSendDelay = optionPref.getSendDelay();
 	TheWritableGlobalData->m_firewallBehavior = optionPref.getFirewallBehavior();
 	TheWritableGlobalData->m_firewallPortAllocationDelta = optionPref.getFirewallPortAllocationDelta();
 	TheWritableGlobalData->m_firewallPortOverride = optionPref.getFirewallPortOverride();
-	
+
 	TheWritableGlobalData->m_saveCameraInReplay = optionPref.saveCameraInReplays();
 	TheWritableGlobalData->m_useCameraInReplay = optionPref.useCameraInReplays();
-	
+	TheWritableGlobalData->m_enablePlayerObserver = optionPref.getPlayerObserverEnabled();
+
+	TheWritableGlobalData->m_networkLatencyFontSize = optionPref.getNetworkLatencyFontSize();
+	TheWritableGlobalData->m_renderFpsFontSize = optionPref.getRenderFpsFontSize();
+	TheWritableGlobalData->m_systemTimeFontSize = optionPref.getSystemTimeFontSize();
+	TheWritableGlobalData->m_gameTimeFontSize = optionPref.getGameTimeFontSize();
+	TheWritableGlobalData->m_showMoneyPerMinute = optionPref.getShowMoneyPerMinute();
+
 	Int val=optionPref.getGammaValue();
 	//generate a value between 0.6 and 2.0.
 	if (val < 50)
@@ -1253,3 +1220,87 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	TheWritableGlobalData->m_yResolution = yres;
 }
 
+void GlobalData::parseCustomDefinition()
+{
+	if (addon::HasFullviewportDat())
+	{
+		// TheSuperHackers @tweak xezon 03/08/2025 Force full viewport for 'Control Bar Pro' Addons like GenTool did it.
+		m_viewportHeightScale = 1.0f;
+	}
+}
+
+UnsignedInt GlobalData::generateExeCRC()
+{
+	DEBUG_ASSERTCRASH(TheFileSystem != NULL, ("TheFileSystem is NULL"));
+
+	// lets CRC the executable!  Whee!
+	const Int blockSize = 65536;
+	CRC exeCRC;
+	File *fp;
+	// TheSuperHackers @tweak SkyAero/xezon 27/05/2025
+	// Simulate the EXE's CRC value to force Network and Replay compatibility with another build.
+#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
+
+#define GENERALS_108_CD_EXE_CRC    0x93d1eab4u
+#define GENERALS_108_STEAM_EXE_CRC 0x8d6e4dd7u
+#define GENERALS_108_EAAPP_EXE_CRC 0xb07fbd50u
+
+	exeCRC.set(GENERALS_108_CD_EXE_CRC);
+	DEBUG_LOG(("Fake EXE CRC is 0x%8.8X", exeCRC.get()));
+
+#else
+	{
+		Char buffer[ _MAX_PATH ];
+		GetModuleFileName( NULL, buffer, sizeof( buffer ) );
+		fp = TheFileSystem->openFile(buffer, File::READ | File::BINARY);
+		if (fp != NULL) {
+			unsigned char crcBlock[blockSize];
+			Int amtRead = 0;
+			while ( (amtRead=fp->read(crcBlock, blockSize)) > 0 )
+			{
+				exeCRC.computeCRC(crcBlock, amtRead);
+			}
+			DEBUG_LOG(("EXE CRC is 0x%8.8X", exeCRC.get()));
+			fp->close();
+			fp = NULL;
+		}
+		else {
+			DEBUG_CRASH(("Executable file has failed to open"));
+		}
+	}
+#endif
+
+	UnsignedInt version = 0;
+	if (TheVersion)
+	{
+		version = TheVersion->getVersionNumber();
+		exeCRC.computeCRC( &version, sizeof(UnsignedInt) );
+	}
+	// Add in MP scripts to the EXE CRC, since the game will go out of sync if they change
+	fp = TheFileSystem->openFile("Data\\Scripts\\SkirmishScripts.scb", File::READ | File::BINARY);
+	if (fp != NULL) {
+		unsigned char crcBlock[blockSize];
+		Int amtRead = 0;
+		while ( (amtRead=fp->read(crcBlock, blockSize)) > 0 )
+		{
+			exeCRC.computeCRC(crcBlock, amtRead);
+		}
+		fp->close();
+		fp = NULL;
+	}
+	fp = TheFileSystem->openFile("Data\\Scripts\\MultiplayerScripts.scb", File::READ | File::BINARY);
+	if (fp != NULL) {
+		unsigned char crcBlock[blockSize];
+		Int amtRead = 0;
+		while ( (amtRead=fp->read(crcBlock, blockSize)) > 0 )
+		{
+			exeCRC.computeCRC(crcBlock, amtRead);
+		}
+		fp->close();
+		fp = NULL;
+	}
+
+	DEBUG_LOG(("EXE+Version(%d.%d)+SCB CRC is 0x%8.8X", version >> 16, version & 0xffff, exeCRC.get()));
+
+	return exeCRC.get();
+}
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INI.cpp b/Generals/Code/GameEngine/Source/Common/INI/INI.cpp
index ec573971627..51b8fc2e8ac 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INI.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INI.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_DAMAGE_NAMES
 #define DEFINE_DEATH_NAMES
 
@@ -59,11 +59,6 @@
 #include "GameLogic/ObjectCreationList.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -132,6 +127,7 @@ static const BlockParse theTypeTable[] =
 	{ "Video",							INI::parseVideoDefinition },
 	{ "WaterSet",						INI::parseWaterSettingDefinition },
 	{ "WaterTransparency",	INI::parseWaterTransparencyDefinition},
+	{ "Weather",	INI::parseWeatherDefinition},
 	{ "Weapon",							INI::parseWeaponTemplateDefinition },
 	{ "WebpageURL",					INI::parseWebpageURLDefinition },
 	{ "HeaderTemplate",			INI::parseHeaderTemplateDefinition },
@@ -140,8 +136,8 @@ static const BlockParse theTypeTable[] =
 	{ "LODPreset",					INI::parseLODPreset },
 	{	"BenchProfile",				INI::parseBenchProfile },
 	{	"ReallyLowMHz",				parseReallyLowMHz },
-	
-	{ NULL,									NULL },		// keep this last!
+
+	{ NULL,									NULL },
 };
 
 
@@ -168,7 +164,7 @@ Bool INI::isValidINIFilename( const char *filename )
 
 	return TRUE;
 
-} 
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -194,22 +190,61 @@ INI::INI( void )
 	m_curBlockStart[0]	= 0;
 #endif
 
-}  // end INI
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 INI::~INI( void )
 {
 
-}  // end ~INI
+}
+
+//-------------------------------------------------------------------------------------------------
+UnsignedInt INI::loadFileDirectory( AsciiString fileDirName, INILoadType loadType, Xfer *pXfer, Bool subdirs )
+{
+	UnsignedInt filesRead = 0;
+
+	AsciiString iniDir = fileDirName;
+	AsciiString iniFile = fileDirName;
+
+	char ext[] = ".ini";
+
+	if (iniDir.endsWithNoCase(ext))
+	{
+		iniDir.truncateBy(ARRAY_SIZE(ext)-1);
+	}
+
+	if (!iniFile.endsWithNoCase(ext))
+	{
+		iniFile.concat(ext);
+	}
+
+	if (TheFileSystem->doesFileExist(iniFile.str()))
+	{
+		filesRead += load(iniFile, loadType, pXfer);
+	}
+
+	// Load any additional ini files from a "filename" directory and its subdirectories.
+	filesRead += loadDirectory(iniDir, loadType, pXfer, subdirs);
+
+	// Expect to open and load at least one file.
+	if (filesRead == 0)
+	{
+		throw INI_CANT_OPEN_FILE;
+	}
+
+	return filesRead;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Load all INI files in the specified directory (and subdirectories if indicated).
 	* If we are to load subdirectories, we will load them *after* we load all the
 	* files in the current directory */
 //-------------------------------------------------------------------------------------------------
-void INI::loadDirectory( AsciiString dirName, Bool subdirs, INILoadType loadType, Xfer *pXfer )
+UnsignedInt INI::loadDirectory( AsciiString dirName, INILoadType loadType, Xfer *pXfer, Bool subdirs )
 {
+	UnsignedInt filesRead = 0;
+
 	// sanity
 	if( dirName.isEmpty() )
 		throw INI_INVALID_DIRECTORY;
@@ -218,7 +253,7 @@ void INI::loadDirectory( AsciiString dirName, Bool subdirs, INILoadType loadType
 	{
 		FilenameList filenameList;
 		dirName.concat('\\');
-		TheFileSystem->getFileListInDirectory(dirName, "*.ini", filenameList, TRUE);
+		TheFileSystem->getFileListInDirectory(dirName, "*.ini", filenameList, subdirs);
 		// Load the INI files in the dir now, in a sorted order.  This keeps things the same between machines
 		// in a network game.
 		FilenameList::const_iterator it = filenameList.begin();
@@ -229,7 +264,7 @@ void INI::loadDirectory( AsciiString dirName, Bool subdirs, INILoadType loadType
 
 			if ((tempname.find('\\') == NULL) && (tempname.find('/') == NULL)) {
 				// this file doesn't reside in a subdirectory, load it first.
-				load( *it, loadType, pXfer );
+				filesRead += load( *it, loadType, pXfer );
 			}
 			++it;
 		}
@@ -241,18 +276,19 @@ void INI::loadDirectory( AsciiString dirName, Bool subdirs, INILoadType loadType
 			tempname = (*it).str() + dirName.getLength();
 
 			if ((tempname.find('\\') != NULL) || (tempname.find('/') != NULL)) {
-				load( *it, loadType, pXfer );
+				filesRead += load( *it, loadType, pXfer );
 			}
 			++it;
 		}
-	} 
-	catch (...) 
+	}
+	catch (...)
 	{
 		// propagate the exception
 		throw;
 	}
 
-}  // end loadDirectory
+	return filesRead;
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -262,27 +298,27 @@ void INI::prepFile( AsciiString filename, INILoadType loadType )
 	if( m_file != NULL )
 	{
 
-		DEBUG_CRASH(( "INI::load, cannot open file '%s', file already open\n", filename.str() ));
+		DEBUG_CRASH(( "INI::load, cannot open file '%s', file already open", filename.str() ));
 		throw INI_FILE_ALREADY_OPEN;
 
-	}  // end if
+	}
 
 	// open the file
 	m_file = TheFileSystem->openFile(filename.str(), File::READ);
 	if( m_file == NULL )
 	{
 
-		DEBUG_CRASH(( "INI::load, cannot open file '%s'\n", filename.str() ));
+		DEBUG_CRASH(( "INI::load, cannot open file '%s'", filename.str() ));
 		throw INI_CANT_OPEN_FILE;
 
-	}  // end if
+	}
 
 	m_file = m_file->convertToRAMFile();
 
 	// save our filename
 	m_filename = filename;
 
-	// save our load time
+	// save our load type
 	m_loadType = loadType;
 }
 
@@ -327,7 +363,7 @@ static INIFieldParseProc findFieldParse(const FieldParse* parseTable, const char
 		}
 	}
 
-	if (!parse->token && parse->parse) 
+	if (!parse->token && parse->parse)
 	{
 		offset = parse->offset;
 		userData = token;
@@ -342,7 +378,7 @@ static INIFieldParseProc findFieldParse(const FieldParse* parseTable, const char
 //-------------------------------------------------------------------------------------------------
 /** Load and parse an INI file */
 //-------------------------------------------------------------------------------------------------
-void INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
+UnsignedInt INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
 {
 	setFPMode(); // so we have consistent Real values for GameLogic -MDC
 
@@ -353,7 +389,7 @@ void INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
 	{
 
 		// read all lines in the file
-		DEBUG_ASSERTCRASH( m_endOfFile == FALSE, ("INI::load, EOF at the beginning!\n") );
+		DEBUG_ASSERTCRASH( m_endOfFile == FALSE, ("INI::load, EOF at the beginning!") );
 		while( m_endOfFile == FALSE )
 		{
 			// read this line
@@ -369,13 +405,14 @@ void INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
 				if (parse)
 				{
 					#ifdef DEBUG_CRASHING
+					static_assert(ARRAY_SIZE(m_curBlockStart) >= ARRAY_SIZE(m_buffer), "Incorrect array size");
 					strcpy(m_curBlockStart, m_buffer);
 					#endif
 					try {
 						(*parse)( this );
 
 					} catch (...) {
-						DEBUG_CRASH(("Error parsing block '%s' in INI file '%s'\n", token, m_filename.str()) );
+						DEBUG_CRASH(("Error parsing block '%s' in INI file '%s'", token, m_filename.str()) );
 						char buff[1024];
 						sprintf(buff, "Error parsing INI file '%s' (Line: '%s')\n", m_filename.str(), currentLine.str());
 
@@ -387,14 +424,14 @@ void INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
 				}
 				else
 				{
-					DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown block '%s'\n",
+					DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown block '%s'",
 														 getLineNum(), getFilename().str(), token ) );
 					throw INI_UNKNOWN_TOKEN;
 				}
-				
-			}  // end if 
-				
-		}  // end while
+
+			}
+
+		}
 	}
 	catch (...)
 	{
@@ -406,10 +443,11 @@ void INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
 
 	unPrepFile();
 
-}  // end load
+	return 1;
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Read a line from the already open file.  Any comments will be remved and
+/** Read a line from the already open file.  Any comments will be removed and
 	* therefore ignored from any given line */
 //-------------------------------------------------------------------------------------------------
 void INI::readLine( void )
@@ -417,12 +455,12 @@ void INI::readLine( void )
 	Bool isComment = FALSE;
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_file, ("readLine(), file pointer is NULL\n") );
+	DEBUG_ASSERTCRASH( m_file, ("readLine(), file pointer is NULL") );
 
 	// if we've reached end of file we'll just keep returning empty string in our buffer
 	if( m_endOfFile )
 	{
-		m_buffer[ 0 ] = '\0';	
+		m_buffer[ 0 ] = '\0';
 	}
 	else
 	{
@@ -438,17 +476,17 @@ void INI::readLine( void )
 			// check for end of file
 			if( m_endOfFile )
 			{
-		
+
 				done = TRUE;
 				m_buffer[ i ] = '\0';
 
-			}  // end if
+			}
 
 			// check for new line
 			if( m_buffer[ i ] == '\n' )
 				done = TRUE;
 
-			DEBUG_ASSERTCRASH(m_buffer[ i ] != '\t', ("tab characters are not allowed in INI files (%s). please check your editor settings. Line Number %d\n",m_filename.str(), getLineNum()));
+			DEBUG_ASSERTCRASH(m_buffer[ i ] != '\t', ("tab characters are not allowed in INI files (%s). please check your editor settings. Line Number %d",m_filename.str(), getLineNum()));
 
 			// make all whitespace characters actual spaces
 			if( isspace( m_buffer[ i ] ) )
@@ -473,7 +511,7 @@ void INI::readLine( void )
 			if( ++i == INI_MAX_CHARS_PER_LINE )
 				done = TRUE;
 
-		}  // end while
+		}
 
 		// increase our line count
 		m_lineNum++;
@@ -482,16 +520,16 @@ void INI::readLine( void )
 		if( i == INI_MAX_CHARS_PER_LINE )
 		{
 
-			DEBUG_ASSERTCRASH( 0, ("Buffer too small (%d) and was truncated, increase INI_MAX_CHARS_PER_LINE\n", 
+			DEBUG_ASSERTCRASH( 0, ("Buffer too small (%d) and was truncated, increase INI_MAX_CHARS_PER_LINE",
 														 INI_MAX_CHARS_PER_LINE) );
 
-		}  // end if
+		}
 	}
 
 	if (s_xfer)
 	{
 		s_xfer->xferUser( m_buffer, sizeof( char ) * strlen( m_buffer ) );
-		//DEBUG_LOG(("Xfer val is now 0x%8.8X in %s, line %s\n", ((XferCRC *)s_xfer)->getCRC(),
+		//DEBUG_LOG(("Xfer val is now 0x%8.8X in %s, line %s", ((XferCRC *)s_xfer)->getCRC(),
 			//m_filename.str(), m_buffer));
 	}
 }
@@ -509,7 +547,7 @@ void INI::parseUnsignedByte( INI* ini, void * /*instance*/, void *store, const v
 		throw ERROR_BUG;
 	}
 	*(Byte *)store = (Byte)value;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse signed short from buffer and assign at location 'store' */
@@ -524,7 +562,7 @@ void INI::parseShort( INI* ini, void * /*instance*/, void *store, const void* /*
 		throw ERROR_BUG;
 	}
 	*(Short *)store = (Short)value;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse unsigned short from buffer and assign at location 'store' */
@@ -539,7 +577,7 @@ void INI::parseUnsignedShort( INI* ini, void * /*instance*/, void *store, const
 		throw ERROR_BUG;
 	}
 	*(UnsignedShort *)store = (UnsignedShort)value;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse integer from buffer and assign at location 'store' */
@@ -549,7 +587,7 @@ void INI::parseInt( INI* ini, void * /*instance*/, void *store, const void* /*us
 	const char *token = ini->getNextToken();
 	*(Int *)store = scanInt(token);
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse unsigned integer from buffer and assign at location 'store' */
@@ -569,7 +607,7 @@ void INI::parseReal( INI* ini, void * /*instance*/, void *store, const void* /*u
 	const char *token = ini->getNextToken();
 	*(Real *)store = scanReal(token);
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse real from buffer and assign at location 'store' */
@@ -580,7 +618,7 @@ void INI::parsePositiveNonZeroReal( INI* ini, void * /*instance*/, void *store,
 	*(Real *)store = scanReal(token);
 	if (*(Real *)store <= 0.0f)
 	{
-		DEBUG_CRASH(("invalid Real value %f -- expected > 0\n",*(Real*)store));
+		DEBUG_CRASH(("invalid Real value %f -- expected > 0",*(Real*)store));
 		throw INI_INVALID_DATA;
 	}
 
@@ -590,7 +628,7 @@ void INI::parsePositiveNonZeroReal( INI* ini, void * /*instance*/, void *store,
 /** Parse a degree value (0 to 360) and store the radian value of that degree
 	* in a Real */
 //-------------------------------------------------------------------------------------------------
-void INI::parseAngleReal( INI *ini, void * /*instance*/, 
+void INI::parseAngleReal( INI *ini, void * /*instance*/,
 																			void *store, const void *userData )
 {
 	const char *token = ini->getNextToken();
@@ -604,7 +642,7 @@ void INI::parseAngleReal( INI *ini, void * /*instance*/,
 /** Parse an angular velocity in degrees-per-sec and store the rads-per-frame value of that degree
 	* in a Real */
 //-------------------------------------------------------------------------------------------------
-void INI::parseAngularVelocityReal( INI *ini, void * /*instance*/, 
+void INI::parseAngularVelocityReal( INI *ini, void * /*instance*/,
 																			void *store, const void *userData )
 {
 	const char *token = ini->getNextToken();
@@ -649,7 +687,7 @@ void INI::parseBitInInt32( INI *ini, void *instance, void *store, const void* us
 		return FALSE;
 	else
 	{
-		DEBUG_CRASH(("invalid boolean token %s -- expected Yes or No\n",token));
+		DEBUG_CRASH(("invalid boolean token %s -- expected Yes or No",token));
 		throw INI_INVALID_DATA;
 		return false;	// keep compiler happy
 	}
@@ -725,12 +763,13 @@ AsciiString INI::getNextQuotedAsciiString()
 {
 	AsciiString result;
 	char buff[INI_MAX_CHARS_PER_LINE];
+	buff[0] = '\0';
 
 	const char *token = getNextTokenOrNull();	// if null, just leave an empty string
 	if (token != NULL)
 	{
-		if (token[0] != '\"') 
-		{	
+		if (token[0] != '\"')
+		{
 			// if token is simply "
 			result.set( token );	// Start following the "
 		}
@@ -739,7 +778,7 @@ AsciiString INI::getNextQuotedAsciiString()
 			Bool done=FALSE;
 			if ((strLen=strlen(token)) > 1)
 			{
-				strcpy(buff, &token[1]);	//skip the starting quote
+				strlcpy(buff, &token[1], ARRAY_SIZE(buff));	//skip the starting quote
 				//Check for end of quoted string.  Checking here fixes cases where quoted string on same line with other data.
 				if (buff[strLen-2]=='"')	//skip ending quote if present
 				{	buff[strLen-2]='\0';
@@ -750,11 +789,11 @@ AsciiString INI::getNextQuotedAsciiString()
 			if (!done)
 			{
 				token = getNextToken(getSepsQuote());
-				
+
 				if (strlen(token) > 1 && token[1] != '\t')
 				{
-					strcat(buff, " ");
-					strcat(buff, token);
+					strlcat(buff, " ", ARRAY_SIZE(buff));
+					strlcat(buff, token, ARRAY_SIZE(buff));
 				}
 				else
 				{	Int buflen=strlen(buff);
@@ -777,8 +816,8 @@ AsciiString INI::getNextAsciiString()
 	const char *token = getNextTokenOrNull();	// if null, just leave an empty string
 	if (token != NULL)
 	{
-		if (token[0] != '\"') 
-		{	
+		if (token[0] != '\"')
+		{
 			// if token is simply "
 			result.set( token );	// Start following the "
 		}
@@ -788,16 +827,16 @@ AsciiString INI::getNextAsciiString()
 
 			if (strlen(token) > 1)
 			{
-				strcpy(buff, &token[1]);
-			} 
+				strlcpy(buff, &token[1], ARRAY_SIZE(buff));
+			}
 
 			token = getNextToken(getSepsQuote());
-			
+
 			if (strlen(token) > 1 && token[1] != '\t')
 			{
-				strcat(buff, " ");
+				strlcat(buff, " ", ARRAY_SIZE(buff));
 			}
-			strcat(buff, token);
+			strlcat(buff, token, ARRAY_SIZE(buff));
 			result.set(buff);
 		}
 	}
@@ -821,7 +860,7 @@ void INI::parseAndTranslateLabel( INI* ini, void * /*instance*/, void *store, co
 	UnicodeString *theString = (UnicodeString *)store;
 	theString->set( translated.str() );
 
-}  // end parseAndTranslateLabel
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a string label assumed as an image as part of the image collection.  Translate
@@ -834,19 +873,19 @@ void INI::parseMappedImage( INI *ini, void * /*instance*/, void *store, const vo
 	if( TheMappedImageCollection )
 	{
 		typedef const Image* ConstImagePtr;
-		*(ConstImagePtr*)store = TheMappedImageCollection->findImageByName( AsciiString( token ) );
+		*(ConstImagePtr*)store = TheMappedImageCollection->findImageByName( token );
 	}
-	
+
 	//KM: If we are in the worldbuilder, we want to parse commandbuttons for informational purposes,
 	//but we don't care about the images -- because we never access them. In RTS/GUIEdit, they always
 	//exist -- and in those cases, it will never call this code anyways because it'll throw long before.
 	//else
 	//	throw INI_UNKNOWN_ERROR;
 
-}  // end parseMappedImage
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Parse a string label assumed as a Anim2D template name.  Translate that name to an 
+/** Parse a string label assumed as a Anim2D template name.  Translate that name to an
 	* actual template pointer for storage */
 // ------------------------------------------------------------------------------------------------
 /*static*/ void INI::parseAnim2DTemplate( INI *ini, void *instance, void *store, const void *userData )
@@ -857,16 +896,16 @@ void INI::parseMappedImage( INI *ini, void * /*instance*/, void *store, const vo
 	{
 		Anim2DTemplate **anim2DTemplate = (Anim2DTemplate **)store;
 		*anim2DTemplate = TheAnim2DCollection->findTemplate( AsciiString( token ) );
-	}  // end if
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "INI::parseAnim2DTemplate - TheAnim2DCollection is NULL\n" ));
+		DEBUG_CRASH(( "INI::parseAnim2DTemplate - TheAnim2DCollection is NULL" ));
 		throw INI_UNKNOWN_ERROR;
 
-	}  // end else
+	}
 
-}  // end parseAnim2DTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a percent in int or real form such as "23%" or "95.4%" and assign
@@ -878,7 +917,7 @@ void INI::parsePercentToReal( INI* ini, void * /*instance*/, void *store, const
 	Real *theReal = (Real *)store;
 	*theReal = scanPercentToReal(token);
 
-}  // end parsePercentToReal
+}
 
 //-------------------------------------------------------------------------------------------------
 /** 'store' points to an 32 bit unsigned integer.  We will zero that integer, parse each token
@@ -909,7 +948,7 @@ void INI::parseBitString32( INI* ini, void * /*instance*/, void *store, const vo
 
 	if( flagList == NULL || flagList[ 0 ] == NULL)
 	{
-		DEBUG_ASSERTCRASH( flagList, ("INTERNAL ERROR! parseBitString32: No flag list provided!\n") );
+		DEBUG_ASSERTCRASH( flagList, ("INTERNAL ERROR! parseBitString32: No flag list provided!") );
 		throw INI_INVALID_NAME_LIST;
 	}
 
@@ -1027,7 +1066,7 @@ void INI::parseRGBAColorInt( INI* ini, void * /*instance*/, void *store, const v
 			// if present, the token must match.
 			if (stricmp(token, names[i]) != 0)
 			{
-				throw INI_INVALID_DATA;				
+				throw INI_INVALID_DATA;
 			}
 			colors[i] = scanInt(ini->getNextToken(ini->getSepsColon()));
 		}
@@ -1047,7 +1086,7 @@ void INI::parseRGBAColorInt( INI* ini, void * /*instance*/, void *store, const v
 	theColor->blue	= colors[ 2 ];
 	theColor->alpha = colors[ 3 ];
 
-}  // end parseRGBAColorInt
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a color in the form of
@@ -1079,7 +1118,7 @@ void INI::parseColorInt( INI* ini, void * /*instance*/, void *store, const void*
 			// if present, the token must match.
 			if (stricmp(token, names[i]) != 0)
 			{
-				throw INI_INVALID_DATA;				
+				throw INI_INVALID_DATA;
 			}
 			colors[i] = scanInt(ini->getNextToken(ini->getSepsColon()));
 		}
@@ -1096,7 +1135,7 @@ void INI::parseColorInt( INI* ini, void * /*instance*/, void *store, const void*
 	Color *theColor = (Color *)store;
 	*theColor = GameMakeColor(colors[0], colors[1], colors[2], colors[3]);
 
-}  // end parseColorInt
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a 3D coordinate of reals in the form of:
@@ -1110,7 +1149,7 @@ void INI::parseCoord3D( INI* ini, void * /*instance*/, void *store, const void*
 	theCoord->y = scanReal(ini->getNextSubToken("Y"));
 	theCoord->z = scanReal(ini->getNextSubToken("Z"));
 
-}  // end parseCoord3D
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a 2D coordinate of reals in the form of:
@@ -1123,7 +1162,7 @@ void INI::parseCoord2D( INI* ini, void * /*instance*/, void *store, const void*
 	theCoord->x = scanReal(ini->getNextSubToken("X"));
 	theCoord->y = scanReal(ini->getNextSubToken("Y"));
 
-}  // end parseCoord2D
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a 2D coordinate of Ints in the form of:
@@ -1136,7 +1175,7 @@ void INI::parseICoord2D( INI* ini, void * /*instance*/, void *store, const void*
 	theCoord->x = scanInt(ini->getNextSubToken("X"));
 	theCoord->y = scanInt(ini->getNextSubToken("Y"));
 
-}  // end parseICoord2D
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an audio event and assign to the 'AudioEventRTS*' at store */
@@ -1145,15 +1184,12 @@ void INI::parseDynamicAudioEventRTS( INI *ini, void * /*instance*/, void *store,
 {
 	const char *token = ini->getNextToken();
 	DynamicAudioEventRTS** theSound = (DynamicAudioEventRTS**)store;
-	
+
 	// translate the string into a sound
-	if (stricmp(token, "NoSound") == 0) 
+	if (stricmp(token, "NoSound") == 0)
 	{
-		if (*theSound)
-		{
-			deleteInstance(*theSound);
-			*theSound = NULL;
-		}
+		deleteInstance(*theSound);
+		*theSound = NULL;
 	}
 	else
 	{
@@ -1161,7 +1197,7 @@ void INI::parseDynamicAudioEventRTS( INI *ini, void * /*instance*/, void *store,
 			*theSound = newInstance(DynamicAudioEventRTS);
 		(*theSound)->m_event.setEventName(AsciiString(token));
 	}
-	
+
 	if (*theSound)
 		TheAudio->getInfoForAudioEvent(&(*theSound)->m_event);
 }
@@ -1174,7 +1210,7 @@ void INI::parseAudioEventRTS( INI *ini, void * /*instance*/, void *store, const
 	const char *token = ini->getNextToken();
 
 	AudioEventRTS *theSound = (AudioEventRTS*)store;
-	
+
 	// translate the string into a sound
 	if (stricmp(token, "NoSound") != 0) {
 		theSound->setEventName(AsciiString(token));
@@ -1197,7 +1233,7 @@ void INI::parseThingTemplate( INI* ini, void * /*instance*/, void *store, const
 	}
 
 	typedef const ThingTemplate *ConstThingTemplatePtr;
-	ConstThingTemplatePtr* theThingTemplate = (ConstThingTemplatePtr*)store;		
+	ConstThingTemplatePtr* theThingTemplate = (ConstThingTemplatePtr*)store;
 
 	if (stricmp(token, "None") == 0)
 	{
@@ -1206,12 +1242,12 @@ void INI::parseThingTemplate( INI* ini, void * /*instance*/, void *store, const
 	else
 	{
 		const ThingTemplate *tt = TheThingFactory->findTemplate(token);	// could be null!
-		DEBUG_ASSERTCRASH(tt, ("ThingTemplate %s not found!\n",token));
+		DEBUG_ASSERTCRASH(tt, ("ThingTemplate %s not found!",token));
 		// assign it, even if null!
 		*theThingTemplate = tt;
 	}
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an ArmorTemplate and assign to the 'ArmorTemplate *' at store */
@@ -1221,7 +1257,7 @@ void INI::parseArmorTemplate( INI* ini, void * /*instance*/, void *store, const
 	const char *token = ini->getNextToken();
 
 	typedef const ArmorTemplate *ConstArmorTemplatePtr;
-	ConstArmorTemplatePtr* theArmorTemplate = (ConstArmorTemplatePtr*)store;		
+	ConstArmorTemplatePtr* theArmorTemplate = (ConstArmorTemplatePtr*)store;
 
 	if (stricmp(token, "None") == 0)
 	{
@@ -1230,12 +1266,12 @@ void INI::parseArmorTemplate( INI* ini, void * /*instance*/, void *store, const
 	else
 	{
 		const ArmorTemplate *tt = TheArmorStore->findArmorTemplate(token);	// could be null!
-		DEBUG_ASSERTCRASH(tt, ("ArmorTemplate %s not found!\n",token));
+		DEBUG_ASSERTCRASH(tt, ("ArmorTemplate %s not found!",token));
 		// assign it, even if null!
 		*theArmorTemplate = tt;
 	}
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an WeaponTemplate and assign to the 'WeaponTemplate *' at store */
@@ -1245,14 +1281,14 @@ void INI::parseWeaponTemplate( INI* ini, void * /*instance*/, void *store, const
 	const char *token = ini->getNextToken();
 
 	typedef const WeaponTemplate *ConstWeaponTemplatePtr;
-	ConstWeaponTemplatePtr* theWeaponTemplate = (ConstWeaponTemplatePtr*)store;		
+	ConstWeaponTemplatePtr* theWeaponTemplate = (ConstWeaponTemplatePtr*)store;
 
 	const WeaponTemplate *tt = TheWeaponStore->findWeaponTemplate(token);	// could be null!
-	DEBUG_ASSERTCRASH(tt || stricmp(token, "None") == 0, ("WeaponTemplate %s not found!\n",token));
+	DEBUG_ASSERTCRASH(tt || stricmp(token, "None") == 0, ("WeaponTemplate %s not found!",token));
 	// assign it, even if null!
 	*theWeaponTemplate = tt;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an FXList and assign to the 'FXList *' at store */
@@ -1262,14 +1298,14 @@ void INI::parseFXList( INI* ini, void * /*instance*/, void *store, const void* /
 	const char *token = ini->getNextToken();
 
 	typedef const FXList *ConstFXListPtr;
-	ConstFXListPtr* theFXList = (ConstFXListPtr*)store;		
+	ConstFXListPtr* theFXList = (ConstFXListPtr*)store;
 
 	const FXList *fxl = TheFXListStore->findFXList(token);	// could be null!
-	DEBUG_ASSERTCRASH(fxl != NULL || stricmp(token, "None") == 0, ("FXList %s not found!\n",token));
+	DEBUG_ASSERTCRASH(fxl != NULL || stricmp(token, "None") == 0, ("FXList %s not found!",token));
 	// assign it, even if null!
 	*theFXList = fxl;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a particle system and assign to 'ParticleSystemTemplate *' at store */
@@ -1279,14 +1315,14 @@ void INI::parseParticleSystemTemplate( INI *ini, void * /*instance*/, void *stor
 	const char *token = ini->getNextToken();
 
 	const ParticleSystemTemplate *pSystemT = TheParticleSystemManager->findTemplate( AsciiString( token ) );
-	DEBUG_ASSERTCRASH( pSystemT || stricmp( token, "None" ) == 0, ("ParticleSystem %s not found!\n",token) );
+	DEBUG_ASSERTCRASH( pSystemT || stricmp( token, "None" ) == 0, ("ParticleSystem %s not found!",token) );
 
 	typedef const ParticleSystemTemplate* ConstParticleSystemTemplatePtr;
-	ConstParticleSystemTemplatePtr* theParticleSystemTemplate = (ConstParticleSystemTemplatePtr*)store;		
+	ConstParticleSystemTemplatePtr* theParticleSystemTemplate = (ConstParticleSystemTemplatePtr*)store;
 
 	*theParticleSystemTemplate = pSystemT;
 
-}  // end parseParticleSystemTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an DamageFX and assign to the 'DamageFX *' at store */
@@ -1296,7 +1332,7 @@ void INI::parseDamageFX( INI* ini, void * /*instance*/, void *store, const void*
 	const char *token = ini->getNextToken();
 
 	typedef const DamageFX *ConstDamageFXPtr;
-	ConstDamageFXPtr* theDamageFX = (ConstDamageFXPtr*)store;		
+	ConstDamageFXPtr* theDamageFX = (ConstDamageFXPtr*)store;
 
 	if (stricmp(token, "None") == 0)
 	{
@@ -1305,12 +1341,12 @@ void INI::parseDamageFX( INI* ini, void * /*instance*/, void *store, const void*
 	else
 	{
 		const DamageFX *fxl = TheDamageFXStore->findDamageFX(token);	// could be null!
-		DEBUG_ASSERTCRASH(fxl, ("DamageFX %s not found!\n",token));
+		DEBUG_ASSERTCRASH(fxl, ("DamageFX %s not found!",token));
 		// assign it, even if null!
 		*theDamageFX = fxl;
 	}
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an ObjectCreationList and assign to the 'ObjectCreationList *' at store */
@@ -1320,14 +1356,14 @@ void INI::parseObjectCreationList( INI* ini, void * /*instance*/, void *store, c
 	const char *token = ini->getNextToken();
 
 	typedef const ObjectCreationList *ConstObjectCreationListPtr;
-	ConstObjectCreationListPtr* theObjectCreationList = (ConstObjectCreationListPtr*)store;		
+	ConstObjectCreationListPtr* theObjectCreationList = (ConstObjectCreationListPtr*)store;
 
 	const ObjectCreationList *ocl = TheObjectCreationListStore->findObjectCreationList(token);	// could be null!
-	DEBUG_ASSERTCRASH(ocl || stricmp(token, "None") == 0, ("ObjectCreationList %s not found!\n",token));
+	DEBUG_ASSERTCRASH(ocl || stricmp(token, "None") == 0, ("ObjectCreationList %s not found!",token));
 	// assign it, even if null!
 	*theObjectCreationList = ocl;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a upgrade template string and store as template pointer */
@@ -1342,13 +1378,13 @@ void INI::parseUpgradeTemplate( INI* ini, void * /*instance*/, void *store, cons
 		throw ERROR_BUG;
 	}
 
-	const UpgradeTemplate *uu = TheUpgradeCenter->findUpgrade( AsciiString( token ) );
-	DEBUG_ASSERTCRASH( uu || stricmp( token, "None" ) == 0, ("Upgrade %s not found!\n",token) );
+	const UpgradeTemplate *uu = TheUpgradeCenter->findUpgrade( token );
+	DEBUG_ASSERTCRASH( uu || stricmp( token, "None" ) == 0, ("Upgrade %s not found!",token) );
 
 	typedef const UpgradeTemplate* ConstUpgradeTemplatePtr;
-	ConstUpgradeTemplatePtr* theUpgradeTemplate = (ConstUpgradeTemplatePtr *)store;		
+	ConstUpgradeTemplatePtr* theUpgradeTemplate = (ConstUpgradeTemplatePtr *)store;
 	*theUpgradeTemplate = uu;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a special power template string and store as template pointer */
@@ -1364,12 +1400,12 @@ void INI::parseSpecialPowerTemplate( INI* ini, void * /*instance*/, void *store,
 	}
 
 	const SpecialPowerTemplate *sPowerT = TheSpecialPowerStore->findSpecialPowerTemplate( AsciiString( token ) );
-	DEBUG_ASSERTCRASH( sPowerT || stricmp( token, "None" ) == 0, ("Specialpower %s not found!\n",token) );
+	DEBUG_ASSERTCRASH( sPowerT || stricmp( token, "None" ) == 0, ("Specialpower %s not found!",token) );
 
 	typedef const SpecialPowerTemplate* ConstSpecialPowerTemplatePtr;
-	ConstSpecialPowerTemplatePtr* theSpecialPowerTemplate = (ConstSpecialPowerTemplatePtr *)store;		
+	ConstSpecialPowerTemplatePtr* theSpecialPowerTemplate = (ConstSpecialPowerTemplatePtr *)store;
 	*theSpecialPowerTemplate = sPowerT;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a science string and store as science type */
@@ -1399,7 +1435,7 @@ void INI::parseIndexList( INI* ini, void * /*instance*/, void *store, const void
 {
 	ConstCharPtrArray nameList = (ConstCharPtrArray)userData;
 	*(Int *)store = scanIndexList(ini->getNextToken(), nameList);
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a single string token, check for that token in the index list
@@ -1418,7 +1454,7 @@ void INI::parseByteSizedIndexList( INI* ini, void * /*instance*/, void *store, c
 		throw ERROR_BUG;
 	}
 	*(Byte *)store = (Byte)value;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a single string token, check for that token in the index list
@@ -1437,7 +1473,7 @@ void INI::parseLookupList( INI* ini, void * /*instance*/, void *store, const voi
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-	
+
 //-------------------------------------------------------------------------------------------------
 void MultiIniFieldParse::add(const FieldParse* f, UnsignedInt e)
 {
@@ -1477,7 +1513,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 
 	if( what == NULL )
 	{
-		DEBUG_ASSERTCRASH( 0, ("INI::initFromINI - Invalid parameters supplied!\n") );
+		DEBUG_ASSERTCRASH( 0, ("INI::initFromINI - Invalid parameters supplied!") );
 		throw INI_INVALID_PARAMS;
 	}
 
@@ -1513,7 +1549,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 						(*parse)( this, what, (char *)what + offset + parseTableList.getNthExtraOffset(ptIdx), userData );
 
 						} catch (...) {
-							DEBUG_CRASH( ("[LINE: %d - FILE: '%s'] Error reading field '%s' of block '%s'\n",
+							DEBUG_CRASH( ("[LINE: %d - FILE: '%s'] Error reading field '%s' of block '%s'",
 																 INI::getLineNum(), INI::getFilename().str(), field, m_curBlockStart) );
 
 
@@ -1521,36 +1557,35 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 							sprintf(buff, "[LINE: %d - FILE: '%s'] Error reading field '%s'\n", INI::getLineNum(), INI::getFilename().str(), field);
 							throw INIException(buff);
 						}
-						
+
 						found = true;
 						break;
-						
+
 					}
 				}
 
 				if (!found)
 				{
-					DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown field '%s' in block '%s'\n",
+					DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown field '%s' in block '%s'",
 														 INI::getLineNum(), INI::getFilename().str(), field, m_curBlockStart) );
-					throw INI_UNKNOWN_TOKEN;
 				}
 
-			}  // end else
+			}
 
-		}  // end if
+		}
 
 		// sanity check for reaching end of file with no closing end token
 		if( done == FALSE && INI::isEOF() == TRUE )
 		{
 
 			done = TRUE;
-			DEBUG_ASSERTCRASH( 0, ("Error parsing block '%s', in INI file '%s'.  Missing '%s' token\n",
+			DEBUG_ASSERTCRASH( 0, ("Error parsing block '%s', in INI file '%s'.  Missing '%s' token",
 												 m_curBlockStart, getFilename().str(), m_blockEndToken) );
 			throw INI_MISSING_END_TOKEN;
 
-		}  // end if
+		}
 
-	}  // end while
+	}
 
 }
 
@@ -1559,7 +1594,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 {
 	if (!seps) seps = getSeps();
 	const char *token = ::strtok(NULL, seps);
-	if (!token) 
+	if (!token)
 		throw INI_INVALID_DATA;
 	return token;
 }
@@ -1620,7 +1655,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 	if( nameList == NULL || nameList[ 0 ] == NULL )
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("INTERNAL ERROR! scanIndexList, invalid name list\n") );
+		DEBUG_ASSERTCRASH( 0, ("INTERNAL ERROR! scanIndexList, invalid name list") );
 		throw INI_INVALID_NAME_LIST;
 
 	}
@@ -1635,7 +1670,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 		}
 	}
 
-	DEBUG_CRASH(("token %s is not a valid member of the index list\n",token));
+	DEBUG_CRASH(("token %s is not a valid member of the index list",token));
 	throw INI_INVALID_DATA;
 	return 0;	// never executed, but keeps compiler happy
 
@@ -1645,7 +1680,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 {
 	if( lookupList == NULL || lookupList[ 0 ].name == NULL )
 	{
-		DEBUG_ASSERTCRASH( 0, ("INTERNAL ERROR! scanLookupList, invalid name list\n") );
+		DEBUG_ASSERTCRASH( 0, ("INTERNAL ERROR! scanLookupList, invalid name list") );
 		throw INI_INVALID_NAME_LIST;
 	}
 
@@ -1661,7 +1696,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 		}
 	}
 
-	DEBUG_CRASH(("token %s is not a valid member of the lookup list\n",token));
+	DEBUG_CRASH(("token %s is not a valid member of the lookup list",token));
 	throw INI_INVALID_DATA;
 	return 0;	// never executed, but keeps compiler happy
 
@@ -1872,61 +1907,39 @@ void INI::parseDeathTypeFlags(INI* ini, void* /*instance*/, void* store, const v
 // both blockType and blockName are case insensitive
 Bool INI::isDeclarationOfType( AsciiString blockType, AsciiString blockName, char *bufferToCheck )
 {
-	Bool retVal = true;
-	if (!bufferToCheck || blockType.isEmpty() || blockName.isEmpty()) {
+	if (!bufferToCheck || blockType.isEmpty() || blockName.isEmpty())
 		return false;
-	}
-	// DO NOT RETURN EARLY FROM THIS FUNCTION. (beyond this point)
-	// we have to restore the bufferToCheck to its previous state before returning, so 
-	// it is important to get through all the checks.
-	
-	char restoreChar;
-	char *tempBuff = bufferToCheck;
-	int blockTypeLength = blockType.getLength();
-	int blockNameLength = blockName.getLength();
 
-	while (isspace(*tempBuff)) {
+	const char* tempBuff = bufferToCheck;
+
+	while (isspace(*tempBuff))
 		++tempBuff;
-	}
-	
-	if (strlen(tempBuff) > blockTypeLength) {
-		restoreChar = tempBuff[blockTypeLength];
-		tempBuff[blockTypeLength] = 0;
-		
-		if (stricmp(blockType.str(), tempBuff) != 0) {
-			retVal = false;
-		}
 
-		tempBuff[blockTypeLength] = restoreChar;
-		tempBuff = tempBuff + blockTypeLength;
-	} else {
-		retVal = false;
-	}
+	const int blockTypeLength = blockType.getLength();
+	if (strnicmp(tempBuff, blockType.str(), blockTypeLength) != 0)
+		return false;
 
-	while (isspace(*tempBuff)) {
+	tempBuff += blockTypeLength;
+
+	if (!isspace(*tempBuff++))
+		return false;
+
+	while (isspace(*tempBuff))
 		++tempBuff;
-	}
 
-	if (strlen(tempBuff) > blockNameLength) {
-		restoreChar = tempBuff[blockNameLength];
-		tempBuff[blockNameLength] = 0;
-		
-		if (stricmp(blockName.str(), tempBuff) != 0) {
-			retVal = false;
-		}
+	const int blockNameLength = blockName.getLength();
+	if (strnicmp(tempBuff, blockName.str(), blockNameLength) != 0)
+		return false;
 
-		tempBuff[blockNameLength] = restoreChar;
-		tempBuff = tempBuff + blockNameLength;
-	} else {
-		retVal = false;
-	}
+	tempBuff += blockNameLength;
 
-	while (strlen(tempBuff)) {
-		retVal = retVal && isspace(tempBuff[0]);
+	while (isspace(*tempBuff))
 		++tempBuff;
-	}
 
-	return retVal;
+	if (*tempBuff != '\0')
+		return false;
+
+	return true;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1940,23 +1953,23 @@ Bool INI::isEndOfBlock( char *bufferToCheck )
 	}
 
 	// DO NOT RETURN EARLY FROM THIS FUNCTION (beyond this point)
-	// we have to restore the bufferToCheck to its previous state before returning, so 
+	// we have to restore the bufferToCheck to its previous state before returning, so
 	// it is important to get through all the checks.
-	
+
 	static const char* endString = "End";
 	int endStringLength = strlen(endString);
 	char restoreChar;
 	char *tempBuff = bufferToCheck;
-	
+
 
 	while (isspace(*tempBuff)) {
 		++tempBuff;
 	}
-	
+
 	if (strlen(tempBuff) > endStringLength) {
 		restoreChar = tempBuff[endStringLength];
 		tempBuff[endStringLength] = 0;
-		
+
 		if (stricmp(endString, tempBuff) != 0) {
 			retVal = false;
 		}
@@ -1967,8 +1980,8 @@ Bool INI::isEndOfBlock( char *bufferToCheck )
 		retVal = false;
 	}
 
-	while (strlen(tempBuff)) {
-		retVal = retVal && isspace(tempBuff[0]);
+	while (*tempBuff && retVal) {
+		retVal = isspace(*tempBuff);
 		++tempBuff;
 	}
 
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIAiData.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIAiData.cpp
index 234646053d4..98b2d4eb43e 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIAiData.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIAiData.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameLogic/AI.h"
@@ -47,6 +47,6 @@
 void INI::parseAIDataDefinition( INI* ini )
 {
 	AI::parseAiDataDefinition(ini);
-} 
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIAnimation.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIAnimation.cpp
index 5149356467c..0fd66a40454 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIAnimation.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIAnimation.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/Anim2D.h"
@@ -43,7 +43,7 @@ void INI::parseAnim2DDefinition( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	//
 	// find existing item if present, note that we do not support overrides
@@ -56,7 +56,7 @@ void INI::parseAnim2DDefinition( INI* ini )
 		//We don't need it if we're in the builder... which doesn't have this.
 		return;
 
-	}  // end if
+	}
 
 	// find existing animation template if present
 	animTemplate = TheAnim2DCollection->findTemplate( name );
@@ -65,24 +65,24 @@ void INI::parseAnim2DDefinition( INI* ini )
 
 		// item not found, create a new one
 		animTemplate = TheAnim2DCollection->newTemplate( name );
-		DEBUG_ASSERTCRASH( animTemplate, ("INI""parseAnim2DDefinition -  unable to allocate animation template for '%s'\n",
+		DEBUG_ASSERTCRASH( animTemplate, ("INI::parseAnim2DDefinition -  unable to allocate animation template for '%s'",
 											 name.str()) );
 
-	}  // end if
+	}
 	else
 	{
 
 		// we're loading over an existing animation template ... something is probably wrong
-		DEBUG_CRASH(( "INI::parseAnim2DDefinition - Animation template '%s' already exists\n",
+		DEBUG_CRASH(( "INI::parseAnim2DDefinition - Animation template '%s' already exists",
 									animTemplate->getName().str() ));
 		return;
 
-	}  // end else
+	}
 
 	// parse the ini definition
 	ini->initFromINI( animTemplate, animTemplate->getFieldParse() );
 
-}  // end parseAnim2DDefinition
+}
 
 
 
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIAudioEventInfo.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIAudioEventInfo.cpp
deleted file mode 100644
index 8ca148daf28..00000000000
--- a/Generals/Code/GameEngine/Source/Common/INI/INIAudioEventInfo.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: INIAudioEventInfo.cpp ////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, July 2002
-// Desc:   Parsing AudioEvent, MusicTrack and DialogEvent INI entries
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/INI.h"
-#include "Common/GameAudio.h"
-#include "Common/AudioEventInfo.h"
-
-AudioEventInfo::~AudioEventInfo()
-{
-
-}
-// @todo: Get these functions unified.
-
-//-------------------------------------------------------------------------------------------------
-void INI::parseMusicTrackDefinition( INI* ini )
-{
-	AsciiString name;
-	AudioEventInfo *track;
-
-	// read the name
-	const char* c = ini->getNextToken();
-	name.set( c );	
-
-	track = TheAudio->newAudioEventInfo( name );
-	if (!track) {
-		return;
-	}
-
-	AudioEventInfo *defaultInfo = TheAudio->findAudioEventInfo("DefaultMusicTrack");
-	if (defaultInfo) {
-		(*track) = (*defaultInfo);
-		TheAudio->addTrackName( name );
-	}
-
-	track->m_audioName = name;
-	track->m_soundType = AT_Music;
-
-	// parse the ini definition
-	ini->initFromINI( track, track->getFieldParse() );
-}  // end parseMusicTrackDefinition
-
-//-------------------------------------------------------------------------------------------------
-void INI::parseAudioEventDefinition( INI* ini )
-{
-	AsciiString name;
-	AudioEventInfo *track;
-
-	// read the name
-	const char* c = ini->getNextToken();
-	name.set( c );	
-
-	track = TheAudio->newAudioEventInfo( name );
-	if (!track) {
-		return;
-	}
-
-	AudioEventInfo *defaultInfo = TheAudio->findAudioEventInfo("DefaultSoundEffect");
-	if (defaultInfo) {
-		(*track) = (*defaultInfo);
-	}
-
-	track->m_audioName = name;
-	track->m_soundType = AT_SoundEffect;
-
-	// parse the ini definition
-	ini->initFromINI( track, track->getFieldParse() );
-}  // end parseAudioEventDefinition
-
-//-------------------------------------------------------------------------------------------------
-void INI::parseDialogDefinition( INI* ini )
-{
-	AsciiString name;
-	AudioEventInfo *track;
-
-	// read the name
-	const char* c = ini->getNextToken();
-	name.set( c );	
-
-	track = TheAudio->newAudioEventInfo( name );
-	if (!track) {
-		return;
-	}
-
-	AudioEventInfo *defaultInfo = TheAudio->findAudioEventInfo("DefaultDialog");
-	if (defaultInfo) {
-		(*track) = (*defaultInfo);
-	}
-
-	track->m_audioName = name;
-	track->m_soundType = AT_Streaming;
-
-	// parse the ini definition
-	ini->initFromINI( track, track->getFieldParse() );
-}  // end parseAudioEventDefinition
-
-
-//-------------------------------------------------------------------------------------------------
-static void parseDelay( INI* ini, void *instance, void *store, const void* /*userData*/ );
-static void parsePitchShift( INI* ini, void *instance, void *store, const void* /*userData*/ );
-
-//-------------------------------------------------------------------------------------------------
-const FieldParse AudioEventInfo::m_audioEventInfo[] = 
-{
-	{ "Filename",							INI::parseAsciiString,		NULL,								offsetof( AudioEventInfo, m_filename) },
-	{ "Volume",								INI::parsePercentToReal,	NULL,								offsetof( AudioEventInfo, m_volume ) },
-	{ "VolumeShift",					INI::parsePercentToReal,	NULL,								offsetof( AudioEventInfo, m_volumeShift ) },
-	{ "MinVolume",						INI::parsePercentToReal,	NULL,								offsetof( AudioEventInfo, m_minVolume ) },
-	{ "PitchShift",						parsePitchShift,					NULL,								0 },
-	{ "Delay",								parseDelay,								NULL,								0 },
-	{ "Limit",								INI::parseInt,						NULL,								offsetof( AudioEventInfo, m_limit ) },
-	{ "LoopCount",						INI::parseInt,						NULL,								offsetof( AudioEventInfo, m_loopCount ) },
-	{ "Priority",							INI::parseIndexList,			theAudioPriorityNames,	offsetof( AudioEventInfo, m_priority ) },
-	{ "Type",									INI::parseBitString32,		theSoundTypeNames,			offsetof( AudioEventInfo, m_type ) },
-	{ "Control",							INI::parseBitString32,		theAudioControlNames,	offsetof( AudioEventInfo, m_control ) },
-	{ "Sounds",								INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_sounds ) },
-	{ "SoundsNight",					INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_soundsNight ) },
-	{ "SoundsEvening",				INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_soundsEvening ) },
-	{ "SoundsMorning",				INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_soundsMorning ) },
-	{ "Attack",								INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_attackSounds ) },
-	{ "Decay",								INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_decaySounds ) },
-	{ "MinRange",							INI::parseReal,						NULL,								offsetof( AudioEventInfo, m_minDistance) },
-	{ "MaxRange",							INI::parseReal,						NULL,								offsetof( AudioEventInfo, m_maxDistance) },
-	{ "LowPassCutoff",				INI::parsePercentToReal,	NULL,								offsetof( AudioEventInfo, m_lowPassFreq) },
-};
-
-//-------------------------------------------------------------------------------------------------
-static void parseDelay( INI* ini, void *instance, void *store, const void* /*userData*/ )
-{
-	AudioEventInfo *attribs = (AudioEventInfo*) store;
-
-	Int min = ini->scanInt(ini->getNextToken());
-	Int max = ini->scanInt(ini->getNextToken());
-
-	DEBUG_ASSERTCRASH( min >= 0 && max >= min, ("Bad delay values for audio event %s", attribs->m_audioName.str()));
-	attribs->m_delayMax = max;
-	attribs->m_delayMin = min;
-}
-
-//-------------------------------------------------------------------------------------------------
-static void parsePitchShift( INI* ini, void *instance, void *store, const void* /*userData*/ )
-{
-	AudioEventInfo *attribs = (AudioEventInfo*) store;
-
-	Real min = ini->scanReal(ini->getNextToken());
-	Real max = ini->scanReal(ini->getNextToken());
-
-	DEBUG_ASSERTCRASH( min > -100 && max >= min, ("Bad pitch shift values for audio event %s", attribs->m_audioName.str()));
-	attribs->m_pitchShiftMin = 1.0f + min/100;
-	attribs->m_pitchShiftMax = 1.0f + max/100;
-}
-
-// STATIC DEFINIITIONS ////////////////////////////////////////////////////////////////////////////
-
-const char *theAudioPriorityNames[] = 
-{
-	"LOWEST",
-	"LOW",
-	"NORMAL",
-	"HIGH",
-	"CRITICAL",
-	NULL
-};
-
-const char *theSoundTypeNames[] = 
-{ 
-	"UI",
-	"WORLD",
-	"SHROUDED",
-	"GLOBAL",
-	"VOICE",
-	"PLAYER",
-	"ALLIES",
-	"ENEMIES",
-	"EVERYONE",
-	NULL
-};
-
-const char *theAudioControlNames[] = 
-{
-	"LOOP",
-	"RANDOM",
-	"ALL",
-	"POSTDELAY",
-	"INTERRUPT",
-	NULL
-};
-
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INICommandButton.cpp b/Generals/Code/GameEngine/Source/Common/INI/INICommandButton.cpp
index 178463c103c..9bff103b0dc 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INICommandButton.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INICommandButton.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/SpecialPower.h"
@@ -57,11 +57,11 @@ void ControlBar::parseCommandButtonDefinition( INI *ini )
 	{
 		// allocate a new item
 		button = TheControlBar->newCommandButton( name );
-		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES) 
+		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES)
 		{
 			button->markAsOverride();
 		}
-	}  // end if
+	}
 	else if( ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES )
 	{
 		DEBUG_CRASH(( "[LINE: %d in '%s'] Duplicate commandbutton %s found!", ini->getLineNum(), ini->getFilename().str(), name.str() ));
@@ -73,7 +73,7 @@ void ControlBar::parseCommandButtonDefinition( INI *ini )
 
 	// parse the ini definition
 	ini->initFromINI( button, button->getFieldParse() );
-	
+
 
 	//Make sure buttons with special power templates also have the appropriate option set.
 	const SpecialPowerTemplate *spTemplate = button->getSpecialPowerTemplate();
@@ -89,6 +89,6 @@ void ControlBar::parseCommandButtonDefinition( INI *ini )
 			ini->getLineNum(), ini->getFilename().str(), name.str() ) );
 	}
 
-}  // end parseCommandButtonDefinition
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INICommandSet.cpp b/Generals/Code/GameEngine/Source/Common/INI/INICommandSet.cpp
index 0dac3e9a3e4..efe52f8123b 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INICommandSet.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INICommandSet.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/ControlBar.h"
@@ -40,4 +40,4 @@
 void INI::parseCommandSetDefinition( INI *ini )
 {
 	ControlBar::parseCommandSetDefinition(ini);
-}  // end parseCommandSetDefinition
+}
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIControlBarScheme.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIControlBarScheme.cpp
index 2988e64d026..dbe467b7ba3 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIControlBarScheme.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIControlBarScheme.cpp
@@ -24,12 +24,12 @@
 
 // FILE: INIControlBarScheme.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Apr 2002
@@ -37,7 +37,7 @@
 //	Filename: 	INIControlBarScheme.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Parse a control Bar Scheme
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/ControlBar.h"
@@ -78,24 +78,24 @@ void INI::parseControlBarSchemeDefinition( INI *ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
 	CBSchemeManager = TheControlBar->getControlBarSchemeManager();
-	DEBUG_ASSERTCRASH( CBSchemeManager, ("parseControlBarSchemeDefinition: Unable to Get CBSchemeManager\n") );
+	DEBUG_ASSERTCRASH( CBSchemeManager, ("parseControlBarSchemeDefinition: Unable to Get CBSchemeManager") );
 	if( !CBSchemeManager )
 		return;
 
 	// If we have a previously allocated control bar, this will return a cleared out pointer to it so we
-	// can overwrite it	
+	// can overwrite it
 	CBScheme = CBSchemeManager->newControlBarScheme( name );
 
 	// sanity
-	DEBUG_ASSERTCRASH( CBScheme, ("parseControlBarSchemeDefinition: Unable to allocate Scheme '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( CBScheme, ("parseControlBarSchemeDefinition: Unable to allocate Scheme '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( CBScheme, CBSchemeManager->getFieldParse() );
 
-}  // end parseCommandButtonDefinition
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INICrate.cpp b/Generals/Code/GameEngine/Source/Common/INI/INICrate.cpp
index ecf20ba01b8..c4e7b75fe75 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INICrate.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INICrate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameLogic/CrateSystem.h"
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIDamageFX.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIDamageFX.cpp
index 71a3aa95bf0..3033aaca763 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIDamageFX.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIDamageFX.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/DamageFX.h"
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIDrawGroupInfo.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIDrawGroupInfo.cpp
index fb4bc958490..0d1f1a25097 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIDrawGroupInfo.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIDrawGroupInfo.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/DrawGroupInfo.h"
@@ -39,7 +39,7 @@ void parseInt( INI* ini, void * /*instance*/, void *store, const void* userData
 	if (userData == 0) {
 		store = &dgi->m_pixelOffsetX;
 		dgi->m_usingPixelOffsetX = TRUE;
-	} else { 
+	} else {
 		store = &dgi->m_pixelOffsetY;
 		dgi->m_usingPixelOffsetY = TRUE;
 	}
@@ -53,7 +53,7 @@ void parsePercentToReal( INI* ini, void * /*instance*/, void *store, const void*
 	if (userData == 0) {
 		store = &dgi->m_pixelOffsetX;
 		dgi->m_usingPixelOffsetX = FALSE;
-	} else { 
+	} else {
 		store = &dgi->m_pixelOffsetY;
 		dgi->m_usingPixelOffsetY = FALSE;
 	}
@@ -61,12 +61,12 @@ void parsePercentToReal( INI* ini, void * /*instance*/, void *store, const void*
 	INI::parsePercentToReal(ini, NULL, store, NULL);
 }
 
-const FieldParse DrawGroupInfo::s_fieldParseTable[] = 
+const FieldParse DrawGroupInfo::s_fieldParseTable[] =
 {
 	{ "UsePlayerColor",												INI::parseBool,						NULL, offsetof( DrawGroupInfo, m_usePlayerColor) },
 	{ "ColorForText",													INI::parseColorInt,				NULL, offsetof( DrawGroupInfo, m_colorForText ) },
 	{ "ColorForTextDropShadow",								INI::parseColorInt,				NULL, offsetof( DrawGroupInfo, m_colorForTextDropShadow ) },
-	
+
 	{ "FontName",															INI::parseQuotedAsciiString,		NULL, offsetof( DrawGroupInfo, m_fontName ) },
 	{ "FontSize",															INI::parseInt,						NULL, offsetof( DrawGroupInfo, m_fontSize ) },
 	{ "FontIsBold",														INI::parseBool,						NULL, offsetof( DrawGroupInfo, m_fontIsBold ) },
@@ -76,7 +76,7 @@ const FieldParse DrawGroupInfo::s_fieldParseTable[] =
 	{ "DrawPositionXPercent",			  					parsePercentToReal,				(void*)0, 0 },
 	{ "DrawPositionYPixel",			  						parseInt,									(void*)1, 0 },
 	{ "DrawPositionYPercent",			  					parsePercentToReal,				(void*)1, 0 },
-	
+
 	{ 0, 0, 0, 0 }
 };
 
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIGameData.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIGameData.cpp
index 8c4c71d73c1..ddb1f7b6702 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIGameData.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIGameData.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/GlobalData.h"
@@ -47,6 +47,6 @@
 void INI::parseGameDataDefinition( INI* ini )
 {
 	GlobalData::parseGameDataDefinition(ini);
-} 
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIMapCache.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIMapCache.cpp
index abc56997d50..bf7f0220cba 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIMapCache.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIMapCache.cpp
@@ -28,21 +28,17 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Lib/BaseType.h"
 #include "Common/INI.h"
 #include "GameClient/MapUtil.h"
+#include "GameClient/GameText.h"
 #include "GameNetwork/NetworkDefs.h"
 #include "Common/NameKeyGenerator.h"
 #include "Common/WellKnownKeys.h"
 #include "Common/QuotedPrintable.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 class MapMetaDataReader
 {
@@ -51,6 +47,7 @@ class MapMetaDataReader
 	Int m_numPlayers;
 	Bool m_isMultiplayer;
 	AsciiString m_asciiDisplayName;
+	AsciiString m_asciiNameLookupTag;
 
 	Bool m_isOfficial;
 	WinTimeStamp m_timestamp;
@@ -84,7 +81,7 @@ void parseTechPositionsCoord3D( INI* ini, void * instance, void * /*store*/, con
 
 }
 
-const FieldParse MapMetaDataReader::m_mapFieldParseTable[] = 
+const FieldParse MapMetaDataReader::m_mapFieldParseTable[] =
 {
 
 	{ "isOfficial",							INI::parseBool,			NULL,	offsetof( MapMetaDataReader, m_isOfficial ) },
@@ -97,6 +94,7 @@ const FieldParse MapMetaDataReader::m_mapFieldParseTable[] =
 	{ "timestampLo",						INI::parseInt,			NULL,	offsetof( MapMetaDataReader, m_timestamp.m_lowTimeStamp ) },
 	{ "timestampHi",						INI::parseInt,			NULL,	offsetof( MapMetaDataReader, m_timestamp.m_highTimeStamp ) },
 	{ "displayName",						INI::parseAsciiString,	NULL,	offsetof( MapMetaDataReader, m_asciiDisplayName ) },
+	{ "nameLookupTag",					INI::parseAsciiString,	NULL,	offsetof( MapMetaDataReader, m_asciiNameLookupTag ) },
 
 	{ "supplyPosition",					parseSupplyPositionCoord3D,	NULL, NULL },
 	{ "techPosition",						parseTechPositionsCoord3D,	NULL, NULL },
@@ -112,7 +110,7 @@ const FieldParse MapMetaDataReader::m_mapFieldParseTable[] =
 
 	{ "InitialCameraPosition",	INI::parseCoord3D,	NULL,	offsetof( MapMetaDataReader, m_initialCameraPosition ) },
 
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
+	{ NULL,					NULL,						NULL,						0 }
 
 };
 
@@ -133,6 +131,7 @@ void INI::parseMapCacheDefinition( INI* ini )
 
 	md.m_extent = mdr.m_extent;
 	md.m_isOfficial = mdr.m_isOfficial != 0;
+	md.m_doesExist = TRUE;
 	md.m_isMultiplayer = mdr.m_isMultiplayer != 0;
 	md.m_numPlayers = mdr.m_numPlayers;
 	md.m_filesize = mdr.m_filesize;
@@ -141,7 +140,36 @@ void INI::parseMapCacheDefinition( INI* ini )
 
 	md.m_waypoints[TheNameKeyGenerator->keyToName(TheKey_InitialCameraPosition)] = mdr.m_initialCameraPosition;
 
+#if RTS_GENERALS
 	md.m_displayName = QuotedPrintableToUnicodeString(mdr.m_asciiDisplayName);
+#else
+	md.m_nameLookupTag = QuotedPrintableToAsciiString(mdr.m_asciiNameLookupTag);
+
+	if (md.m_nameLookupTag.isEmpty())
+	{
+		// maps without localized name tags
+		AsciiString tempdisplayname;
+		tempdisplayname = name.reverseFind('\\') + 1;
+		md.m_displayName.translate(tempdisplayname);
+		if (md.m_numPlayers >= 2)
+		{
+			UnicodeString extension;
+			extension.format(L" (%d)", md.m_numPlayers);
+			md.m_displayName.concat(extension);
+		}
+	}
+	else
+	{
+		// official maps with name tags
+		md.m_displayName = TheGameText->fetch(md.m_nameLookupTag);
+		if (md.m_numPlayers >= 2)
+		{
+			UnicodeString extension;
+			extension.format(L" (%d)", md.m_numPlayers);
+			md.m_displayName.concat(extension);
+		}
+	}
+#endif
 
 	AsciiString startingCamName;
 	for (Int i=0; i<md.m_numPlayers; ++i)
@@ -169,7 +197,7 @@ void INI::parseMapCacheDefinition( INI* ini )
 		AsciiString lowerName = name;
 		lowerName.toLower();
 		md.m_fileName = lowerName;
-//		DEBUG_LOG(("INI::parseMapCacheDefinition - adding %s to map cache\n", lowerName.str()));
+//		DEBUG_LOG(("INI::parseMapCacheDefinition - adding %s to map cache", lowerName.str()));
 		(*TheMapCache)[lowerName] = md;
 	}
 }
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIMapData.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIMapData.cpp
index 54fcfc6d5b5..461d725e942 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIMapData.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIMapData.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 
@@ -45,6 +45,6 @@
 //-------------------------------------------------------------------------------------------------
 void INI::parseMapDataDefinition( INI* ini )
 {
-}  // end parseMapData
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIMappedImage.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIMappedImage.cpp
index 403eafb173f..8d044752ae2 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIMappedImage.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIMappedImage.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/Image.h"
@@ -42,11 +42,8 @@
 //-------------------------------------------------------------------------------------------------
 void INI::parseMappedImageDefinition( INI* ini )
 {
-	AsciiString name;
-
 	// read the name
-	const char* c = ini->getNextToken();
-	name.set( c );	
+	const char* name = ini->getNextToken();
 
 	//
 	// find existing item if present, note that we do not support overrides
@@ -66,14 +63,14 @@ void INI::parseMappedImageDefinition( INI* ini )
 	{
 
 		// image not found, create a new one
-		image = TheMappedImageCollection->newImage();
+		image = newInstance(Image);
 		image->setName( name );
-		DEBUG_ASSERTCRASH( image, ("parseMappedImage: unable to allocate image for '%s'\n",
-															name.str()) );
+		TheMappedImageCollection->addImage(image);
+		DEBUG_ASSERTCRASH( image, ("parseMappedImage: unable to allocate image for '%s'", name) );
 
-	}  // end if
+	}
 
 	// parse the ini definition
 	ini->initFromINI( image, image->getFieldParse());
 
-}  // end parseMappedImage
+}
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIMiscAudio.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIMiscAudio.cpp
deleted file mode 100644
index ef775ebdb3f..00000000000
--- a/Generals/Code/GameEngine/Source/Common/INI/INIMiscAudio.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/MiscAudio.h"
-#include "Common/INI.h"
-
-const FieldParse MiscAudio::m_fieldParseTable[] = 
-{ 
-	{ "RadarNotifyUnitUnderAttackSound",			INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarUnitUnderAttackSound ) },
-	{ "RadarNotifyHarvesterUnderAttackSound",	INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarHarvesterUnderAttackSound ) },
-	{ "RadarNotifyStructureUnderAttackSound", INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarStructureUnderAttackSound ) },
-	{ "RadarNotifyUnderAttackSound",					INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarUnderAttackSound ) },
-	{ "RadarNotifyInfiltrationSound",					INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarInfiltrationSound ) },
-	{ "RadarNotifyOnlineSound",								INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarOnlineSound ) },
-	{ "RadarNotifyOfflineSound",							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarOfflineSound ) },
-	{ "DefectorTimerTickSound",			  				INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_defectorTimerTickSound ) },
-	{ "DefectorTimerDingSound",			  				INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_defectorTimerDingSound ) },
-	{ "LockonTickSound",			  							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_lockonTickSound ) },
-	{ "AllCheerSound",												INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_allCheerSound )	},
-	{ "BattleCrySound",												INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_battleCrySound )	},
-	{ "GUIClickSound",												INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_guiClickSound )	},
-	{ "NoCanDoSound",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_noCanDoSound )	},
-	{ "StealthDiscoveredSound",								INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_stealthDiscoveredSound ) },
-	{ "StealthNeutralizedSound",							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_stealthNeutralizedSound ) },
-	{ "MoneyDepositSound",										INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_moneyDepositSound ) },
-	{ "MoneyWithdrawSound",										INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_moneyWithdrawSound ) },
-	{ "BuildingDisabled",											INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_buildingDisabled ) },
-	{ "BuildingReenabled",										INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_buildingReenabled ) },
-	{ "VehicleDisabled",											INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_vehicleDisabled ) },
-	{ "VehicleReenabled",											INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_vehicleReenabled ) },
-	{ "SplatterVehiclePilotsBrain",						INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_splatterVehiclePilotsBrain ) },
-	{ "TerroristInCarMoveVoice",							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_terroristInCarMoveVoice ) },
-	{ "TerroristInCarAttackVoice",						INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_terroristInCarAttackVoice ) },
-	{ "TerroristInCarSelectVoice",						INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_terroristInCarSelectVoice ) },
-	{ "CrateHeal",														INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateHeal ) },
-	{ "CrateShroud",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateShroud ) },
-	{ "CrateSalvage",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateSalvage ) },
-	{ "CrateFreeUnit",												INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateFreeUnit ) },
-	{ "CrateMoney",														INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateMoney ) },
-	{ "UnitPromoted",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_unitPromoted ) },
-	{ "RepairSparks",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_repairSparks ) },
-	{ "AircraftWheelScreech",									INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_aircraftWheelScreech ) },
-	
-	{ 0, 0, 0, 0 }
-};
-
-
-//-------------------------------------------------------------------------------------------------
-void INI::parseMiscAudio( INI *ini )
-{
-	ini->initFromINI(TheAudio->friend_getMiscAudio(), MiscAudio::m_fieldParseTable);
-}
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIModel.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIModel.cpp
index d592eaf39dc..3e7fc739f55 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIModel.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIModel.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp
index f6addbd04eb..ba62a15dbf6 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/MultiplayerSettings.h"
@@ -37,7 +37,7 @@ void INI::parseMultiplayerSettingsDefinition( INI* ini )
 {
 	if( TheMultiplayerSettings )
 	{
-		// 
+		//
 		// if the type of loading we're doing creates override data, we need to
 		// be loading into a new override item
 		//
@@ -45,12 +45,12 @@ void INI::parseMultiplayerSettingsDefinition( INI* ini )
 		{
 			DEBUG_ASSERTCRASH(false, ("Creating an override of MultiplayerSettings!"));
 		}
-	}  // end if
+	}
 	else
 	{
 		// we don't have any multiplayer settings instance at all yet, create one
 		TheMultiplayerSettings = NEW MultiplayerSettings;
-	}  // end else
+	}
 
 	// parse the ini definition
 	ini->initFromINI( TheMultiplayerSettings, TheMultiplayerSettings->getFieldParse() );
@@ -64,9 +64,9 @@ void INI::parseMultiplayerColorDefinition( INI* ini )
 
 	// read the name
 	c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
-	// find existing item if present, but this type does not allow overrides, 
+	// find existing item if present, but this type does not allow overrides,
 	//so if it exists just overwrite it.
 	multiplayerColorDefinition = TheMultiplayerSettings->findMultiplayerColorDefinitionByName( name );
 	if( multiplayerColorDefinition == NULL )
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIObject.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIObject.cpp
index 0cf2f157e8a..b847407e695 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIObject.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIObject.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/ThingTemplate.h"
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIParticleSys.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIParticleSys.cpp
index f6c1be0a97c..a83d5467ee0 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIParticleSys.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIParticleSys.cpp
@@ -27,14 +27,14 @@
 // Desc:   Parsing Particle System INI entries
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/ParticleSys.h"
 
 
-/** 
- * Parse entry 
+/**
+ * Parse entry
  */
 void INI::parseParticleSystemDefinition( INI* ini )
 {
@@ -42,7 +42,7 @@ void INI::parseParticleSystemDefinition( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
 	ParticleSystemTemplate *sysTemplate = const_cast<ParticleSystemTemplate*>(TheParticleSystemManager->findTemplate( name ));
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INISpecialPower.cpp b/Generals/Code/GameEngine/Source/Common/INI/INISpecialPower.cpp
index 56d79a1556d..f4f36ce6397 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INISpecialPower.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INISpecialPower.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/SpecialPower.h"
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INITerrain.cpp b/Generals/Code/GameEngine/Source/Common/INI/INITerrain.cpp
index 6a3c5c1bcc7..114adb3e3d5 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INITerrain.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INITerrain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/TerrainTypes.h"
@@ -43,7 +43,7 @@ void INI::parseTerrainDefinition( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
 	terrainType = TheTerrainTypes->findTerrain( name );
@@ -51,12 +51,12 @@ void INI::parseTerrainDefinition( INI* ini )
 		terrainType = TheTerrainTypes->newTerrain( name );
 
 	// sanity
-	DEBUG_ASSERTCRASH( terrainType, ("Unable to allocate terrain type '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( terrainType, ("Unable to allocate terrain type '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( terrainType, terrainType->getFieldParse() );
 
-}  // end parseTerrain
+}
 
 
 
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INITerrainBridge.cpp b/Generals/Code/GameEngine/Source/Common/INI/INITerrainBridge.cpp
index ac0b0fe7fa8..98694736ff9 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INITerrainBridge.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INITerrainBridge.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/TerrainRoads.h"
@@ -43,7 +43,7 @@ void INI::parseTerrainBridgeDefinition( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present or allocate new one
 	bridge = TheTerrainRoads->findBridge( name );
@@ -53,21 +53,21 @@ void INI::parseTerrainBridgeDefinition( INI* ini )
 	{
 
 		// sanity
-		DEBUG_ASSERTCRASH( bridge->isBridge(), ("Redefining road '%s' as a bridge!\n", 
+		DEBUG_ASSERTCRASH( bridge->isBridge(), ("Redefining road '%s' as a bridge!",
 											 bridge->getName().str()) );
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
-	if( bridge == NULL )	
+	if( bridge == NULL )
 		bridge = TheTerrainRoads->newBridge( name );
 
-	DEBUG_ASSERTCRASH( bridge, ("Unable to allcoate bridge '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( bridge, ("Unable to allcoate bridge '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( bridge, bridge->getBridgeFieldParse() );
 
-}  // end parseTerrainBridge
+}
 
 
 
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INITerrainRoad.cpp b/Generals/Code/GameEngine/Source/Common/INI/INITerrainRoad.cpp
index dc6e3695a85..c652ab51858 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INITerrainRoad.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INITerrainRoad.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/TerrainRoads.h"
@@ -43,7 +43,7 @@ void INI::parseTerrainRoadDefinition( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present or allocate new one
 	road = TheTerrainRoads->findRoad( name );
@@ -53,21 +53,21 @@ void INI::parseTerrainRoadDefinition( INI* ini )
 	{
 
 		// sanity
-		DEBUG_ASSERTCRASH( road->isBridge() == FALSE, ("Redefining bridge '%s' as a road!\n", 
+		DEBUG_ASSERTCRASH( road->isBridge() == FALSE, ("Redefining bridge '%s' as a road!",
 											 road->getName().str()) );
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
-	if( road == NULL )	
+	if( road == NULL )
 		road = TheTerrainRoads->newRoad( name );
 
-	DEBUG_ASSERTCRASH( road, ("Unable to allocate road '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( road, ("Unable to allocate road '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( road, road->getRoadFieldParse() );
 
-}  // end parseTerrainRoad
+}
 
 
 
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIUpgrade.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIUpgrade.cpp
index bf947ff1d23..be2956f743d 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/Upgrade.h"
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIVideo.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIVideo.cpp
deleted file mode 100644
index 854c5ea7ed7..00000000000
--- a/Generals/Code/GameEngine/Source/Common/INI/INIVideo.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: INIVideo.cpp /////////////////////////////////////////////////////////////////////////////
-// Author: John McDonald, February 2002
-// Desc:   Parsing Video INI entries
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/INI.h"
-#include "GameClient/VideoPlayer.h"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-/** Parse Music entry */
-//-------------------------------------------------------------------------------------------------
-void INI::parseVideoDefinition( INI* ini )
-{
-	// read the name
-	const char* c = ini->getNextToken();
-
-	Video video;
-	video.m_internalName.set( c );
-
-	ini->initFromINI(&video, TheVideoPlayer->getFieldParse() );
-	TheVideoPlayer->addVideo(&video);
-
-
-}  // end parseVideoDefinition
-
-
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIWater.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIWater.cpp
index ea7a03774fb..5a231166fab 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIWater.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIWater.cpp
@@ -24,11 +24,11 @@
 
 // FILE: INIWater.cpp /////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, December 2001
-// Desc:   Water settings 
+// Desc:   Water settings
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_TIME_OF_DAY_NAMES
 
@@ -57,7 +57,7 @@ void INI::parseWaterSettingDefinition( INI* ini )
 	name.set( token );
 
 	// get the water setting we want to load based on name
-	const char **timeOfDayName = TimeOfDayNames;
+	const char *const *timeOfDayName = TimeOfDayNames;
 	Int timeOfDayIndex = 0;  // TIME_OF_DAY_INVALID
 	while( timeOfDayName && *timeOfDayName )
 	{
@@ -68,13 +68,13 @@ void INI::parseWaterSettingDefinition( INI* ini )
 			waterSetting = &WaterSettings[ timeOfDayIndex ];
 			break;
 
-		}  // end if
+		}
 
 		// next name
 		timeOfDayName++;
 		timeOfDayIndex++;
 
-	}  // end while
+	}
 
 	// check for no time of day match
 	if( waterSetting == NULL )
@@ -83,7 +83,7 @@ void INI::parseWaterSettingDefinition( INI* ini )
 	// parse the data
 	ini->initFromINI( waterSetting, waterSetting->getFieldParse() );
 
-}  // end parseWaterSetting
+}
 
 //-------------------------------------------------------------------------------------------------
 void INI::parseWaterTransparencyDefinition( INI *ini )
@@ -107,7 +107,7 @@ void INI::parseWaterTransparencyDefinition( INI *ini )
 	waterTrans = (WaterTransparencySetting*) (waterTrans->friend_getFinalOverride());
 	// parse the data
 	ini->initFromINI( waterTrans, TheWaterTransparency->getFieldParse() );
-	
+
 	// If we overrode any skybox textures, then call the W3D Water stuff.
 	if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES) {
 		// Check to see if we overrode any skybox textures.
@@ -120,7 +120,7 @@ void INI::parseWaterTransparencyDefinition( INI *ini )
 		const WaterTransparencySetting* wtOriginal = TheWaterTransparency.getNonOverloadedPointer();
 		OVERRIDE<WaterTransparencySetting> wtOverride = TheWaterTransparency;
 
-		if (wtOriginal == wtOverride) 
+		if (wtOriginal == wtOverride)
 			return;
 
 		const AsciiString *oldTextures[5],*newTextures[5];
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIWeapon.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIWeapon.cpp
index de346146322..52006534e41 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIWeapon.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIWeapon.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameLogic/Weapon.h"
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp
index 324913d2188..441782733db 100644
--- a/Generals/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp
+++ b/Generals/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp
@@ -28,17 +28,12 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/Registry.h"
 #include "GameNetwork/WOLBrowser/WebBrowser.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -109,7 +104,7 @@ void INI::parseWebpageURLDefinition( INI* ini )
 
 //	}  // end if
 
-//	DEBUG_ASSERTCRASH( track, ("parseMusicTrackDefinition: Unable to allocate track '%s'\n",
+//	DEBUG_ASSERTCRASH( track, ("parseMusicTrackDefinition: Unable to allocate track '%s'",
 //										 name.str()) );
 
 	// parse the ini definition
@@ -121,8 +116,8 @@ void INI::parseWebpageURLDefinition( INI* ini )
 		getcwd(cwd, _MAX_PATH);
 
 		url->m_url.format("file://%s\\Data\\%s\\%s", encodeURL(cwd).str(), GetRegistryLanguage().str(), url->m_url.str()+7);
-		DEBUG_LOG(("INI::parseWebpageURLDefinition() - converted URL to [%s]\n", url->m_url.str()));
+		DEBUG_LOG(("INI::parseWebpageURLDefinition() - converted URL to [%s]", url->m_url.str()));
 	}
-}  // end parseMusicTrackDefinition
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/Common/Language.cpp b/Generals/Code/GameEngine/Source/Common/Language.cpp
index 606669a7a52..7548a7982d7 100644
--- a/Generals/Code/GameEngine/Source/Common/Language.cpp
+++ b/Generals/Code/GameEngine/Source/Common/Language.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Language.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -46,7 +46,7 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Language.h"
 
diff --git a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp
index 24a1ccda094..0af149735ed 100644
--- a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp
+++ b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp
@@ -26,7 +26,7 @@
 // Implementation of the message stream
 // Author: Michael S. Booth, February 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/MessageStream.h"
 #include "Common/Player.h"
@@ -42,11 +42,6 @@ CommandList *TheCommandList = NULL;
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
@@ -57,22 +52,22 @@ CommandList *TheCommandList = NULL;
 /**
  * Constructor
  */
-GameMessage::GameMessage( GameMessage::Type type ) 
-{ 
+GameMessage::GameMessage( GameMessage::Type type )
+{
 	m_playerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();
-	m_type = type; 
+	m_type = type;
 	m_argList = NULL;
 	m_argTail = NULL;
-	m_argCount = 0; 
-	m_list = 0; 
+	m_argCount = 0;
+	m_list = 0;
 }
 
 
 /**
  * Destructor
  */
-GameMessage::~GameMessage( ) 
-{ 
+GameMessage::~GameMessage( )
+{
 	// free all arguments
 	GameMessageArgument *arg, *nextArg;
 
@@ -126,10 +121,10 @@ GameMessageArgumentDataType GameMessage::getArgumentDataType( Int argIndex )
 /**
  * Allocate a new argument, add it to the argument list, and increment the total arg count
  */
-GameMessageArgument *GameMessage::allocArg( void ) 
-{ 
+GameMessageArgument *GameMessage::allocArg( void )
+{
 	// allocate a new argument
-	GameMessageArgument *arg = newInstance(GameMessageArgument); 
+	GameMessageArgument *arg = newInstance(GameMessageArgument);
 
 	// add to end of argument list
 	if (m_argTail)
@@ -228,428 +223,449 @@ void GameMessage::appendWideCharArgument( const WideChar& arg )
 	a->m_type = ARGUMENTDATATYPE_WIDECHAR;
 }
 
-AsciiString GameMessage::getCommandAsAsciiString( void )
+const char *GameMessage::getCommandAsString( void ) const
 {
-	return getCommandTypeAsAsciiString(m_type);
+	return getCommandTypeAsString(m_type);
 }
 
-AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t)
+const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 {
-#define CHECK_IF(x) if (t == x) { return #x; }
-	AsciiString commandName = "UnknownMessage";
-	if (t >= GameMessage::MSG_COUNT)
-	{
-		commandName = "Invalid command";
-	}
-	CHECK_IF(MSG_INVALID)
-	CHECK_IF(MSG_FRAME_TICK)
-	CHECK_IF(MSG_RAW_MOUSE_BEGIN)
-	CHECK_IF(MSG_RAW_MOUSE_POSITION)
-	CHECK_IF(MSG_RAW_MOUSE_LEFT_BUTTON_DOWN)
-	CHECK_IF(MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK)
-	CHECK_IF(MSG_RAW_MOUSE_LEFT_BUTTON_UP)
-	CHECK_IF(MSG_RAW_MOUSE_LEFT_CLICK)
-	CHECK_IF(MSG_RAW_MOUSE_LEFT_DRAG)
-	CHECK_IF(MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN)
-	CHECK_IF(MSG_RAW_MOUSE_MIDDLE_DOUBLE_CLICK)
-	CHECK_IF(MSG_RAW_MOUSE_MIDDLE_BUTTON_UP)
-	CHECK_IF(MSG_RAW_MOUSE_MIDDLE_DRAG)
-	CHECK_IF(MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN)
-	CHECK_IF(MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK)
-	CHECK_IF(MSG_RAW_MOUSE_RIGHT_BUTTON_UP)
-	CHECK_IF(MSG_RAW_MOUSE_RIGHT_DRAG)
-	CHECK_IF(MSG_RAW_MOUSE_WHEEL)
-	CHECK_IF(MSG_RAW_MOUSE_END)
-	CHECK_IF(MSG_RAW_KEY_DOWN)
-	CHECK_IF(MSG_RAW_KEY_UP)
-	CHECK_IF(MSG_MOUSE_LEFT_CLICK)
-	CHECK_IF(MSG_MOUSE_LEFT_DOUBLE_CLICK)
-	CHECK_IF(MSG_MOUSE_MIDDLE_CLICK)
-	CHECK_IF(MSG_MOUSE_MIDDLE_DOUBLE_CLICK)
-	CHECK_IF(MSG_MOUSE_RIGHT_CLICK)
-	CHECK_IF(MSG_MOUSE_RIGHT_DOUBLE_CLICK)
-	CHECK_IF(MSG_CLEAR_GAME_DATA)
-	CHECK_IF(MSG_NEW_GAME)
-	CHECK_IF(MSG_BEGIN_META_MESSAGES)
-	CHECK_IF(MSG_META_SAVE_VIEW1)
-	CHECK_IF(MSG_META_SAVE_VIEW2)
-	CHECK_IF(MSG_META_SAVE_VIEW3)
-	CHECK_IF(MSG_META_SAVE_VIEW4)
-	CHECK_IF(MSG_META_SAVE_VIEW5)
-	CHECK_IF(MSG_META_SAVE_VIEW6)
-	CHECK_IF(MSG_META_SAVE_VIEW7)
-	CHECK_IF(MSG_META_SAVE_VIEW8)
-	CHECK_IF(MSG_META_VIEW_VIEW1)
-	CHECK_IF(MSG_META_VIEW_VIEW2)
-	CHECK_IF(MSG_META_VIEW_VIEW3)
-	CHECK_IF(MSG_META_VIEW_VIEW4)
-	CHECK_IF(MSG_META_VIEW_VIEW5)
-	CHECK_IF(MSG_META_VIEW_VIEW6)
-	CHECK_IF(MSG_META_VIEW_VIEW7)
-	CHECK_IF(MSG_META_VIEW_VIEW8)
-	CHECK_IF(MSG_META_CREATE_TEAM0)
-	CHECK_IF(MSG_META_CREATE_TEAM1)
-	CHECK_IF(MSG_META_CREATE_TEAM2)
-	CHECK_IF(MSG_META_CREATE_TEAM3)
-	CHECK_IF(MSG_META_CREATE_TEAM4)
-	CHECK_IF(MSG_META_CREATE_TEAM5)
-	CHECK_IF(MSG_META_CREATE_TEAM6)
-	CHECK_IF(MSG_META_CREATE_TEAM7)
-	CHECK_IF(MSG_META_CREATE_TEAM8)
-	CHECK_IF(MSG_META_CREATE_TEAM9)
-	CHECK_IF(MSG_META_SELECT_TEAM0)
-	CHECK_IF(MSG_META_SELECT_TEAM1)
-	CHECK_IF(MSG_META_SELECT_TEAM2)
-	CHECK_IF(MSG_META_SELECT_TEAM3)
-	CHECK_IF(MSG_META_SELECT_TEAM4)
-	CHECK_IF(MSG_META_SELECT_TEAM5)
-	CHECK_IF(MSG_META_SELECT_TEAM6)
-	CHECK_IF(MSG_META_SELECT_TEAM7)
-	CHECK_IF(MSG_META_SELECT_TEAM8)
-	CHECK_IF(MSG_META_SELECT_TEAM9)
-	CHECK_IF(MSG_META_ADD_TEAM0)
-	CHECK_IF(MSG_META_ADD_TEAM1)
-	CHECK_IF(MSG_META_ADD_TEAM2)
-	CHECK_IF(MSG_META_ADD_TEAM3)
-	CHECK_IF(MSG_META_ADD_TEAM4)
-	CHECK_IF(MSG_META_ADD_TEAM5)
-	CHECK_IF(MSG_META_ADD_TEAM6)
-	CHECK_IF(MSG_META_ADD_TEAM7)
-	CHECK_IF(MSG_META_ADD_TEAM8)
-	CHECK_IF(MSG_META_ADD_TEAM9)
-	CHECK_IF(MSG_META_VIEW_TEAM0)
-	CHECK_IF(MSG_META_VIEW_TEAM1)
-	CHECK_IF(MSG_META_VIEW_TEAM2)
-	CHECK_IF(MSG_META_VIEW_TEAM3)
-	CHECK_IF(MSG_META_VIEW_TEAM4)
-	CHECK_IF(MSG_META_VIEW_TEAM5)
-	CHECK_IF(MSG_META_VIEW_TEAM6)
-	CHECK_IF(MSG_META_VIEW_TEAM7)
-	CHECK_IF(MSG_META_VIEW_TEAM8)
-	CHECK_IF(MSG_META_VIEW_TEAM9)
-	CHECK_IF(MSG_META_SELECT_MATCHING_UNITS)
-	CHECK_IF(MSG_META_SELECT_NEXT_UNIT)
-	CHECK_IF(MSG_META_SELECT_PREV_UNIT)
-	CHECK_IF(MSG_META_SELECT_NEXT_WORKER)
-	CHECK_IF(MSG_META_SELECT_PREV_WORKER)
-	CHECK_IF(MSG_META_VIEW_COMMAND_CENTER)
-	CHECK_IF(MSG_META_VIEW_LAST_RADAR_EVENT)
-	CHECK_IF(MSG_META_SELECT_HERO)
-	CHECK_IF(MSG_META_SELECT_ALL)
-	CHECK_IF(MSG_META_SELECT_ALL_AIRCRAFT)
-	CHECK_IF(MSG_META_SCATTER)
-	CHECK_IF(MSG_META_STOP)
-	CHECK_IF(MSG_META_DEPLOY)
-	CHECK_IF(MSG_META_CREATE_FORMATION)
-	CHECK_IF(MSG_META_FOLLOW)
-	CHECK_IF(MSG_META_CHAT_PLAYERS)
-	CHECK_IF(MSG_META_CHAT_ALLIES)
-	CHECK_IF(MSG_META_CHAT_EVERYONE)
-	CHECK_IF(MSG_META_DIPLOMACY)
-	CHECK_IF(MSG_META_OPTIONS)
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	CHECK_IF(MSG_META_HELP)
+#define CASE_LABEL(x) case x: return #x;
+
+	switch (t) {
+	default: return (t >= GameMessage::MSG_COUNT) ? "Invalid command" : "UnknownMessage";
+
+	CASE_LABEL(MSG_INVALID)
+	CASE_LABEL(MSG_FRAME_TICK)
+	CASE_LABEL(MSG_RAW_MOUSE_BEGIN)
+	CASE_LABEL(MSG_RAW_MOUSE_POSITION)
+	CASE_LABEL(MSG_RAW_MOUSE_LEFT_BUTTON_DOWN)
+	CASE_LABEL(MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK)
+	CASE_LABEL(MSG_RAW_MOUSE_LEFT_BUTTON_UP)
+	CASE_LABEL(MSG_RAW_MOUSE_LEFT_CLICK)
+	CASE_LABEL(MSG_RAW_MOUSE_LEFT_DRAG)
+	CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN)
+	CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_DOUBLE_CLICK)
+	CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_BUTTON_UP)
+	CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_DRAG)
+	CASE_LABEL(MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN)
+	CASE_LABEL(MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK)
+	CASE_LABEL(MSG_RAW_MOUSE_RIGHT_BUTTON_UP)
+	CASE_LABEL(MSG_RAW_MOUSE_RIGHT_DRAG)
+	CASE_LABEL(MSG_RAW_MOUSE_WHEEL)
+	CASE_LABEL(MSG_RAW_MOUSE_END)
+	CASE_LABEL(MSG_RAW_KEY_DOWN)
+	CASE_LABEL(MSG_RAW_KEY_UP)
+	CASE_LABEL(MSG_MOUSE_LEFT_CLICK)
+	CASE_LABEL(MSG_MOUSE_LEFT_DOUBLE_CLICK)
+	CASE_LABEL(MSG_MOUSE_MIDDLE_CLICK)
+	CASE_LABEL(MSG_MOUSE_MIDDLE_DOUBLE_CLICK)
+	CASE_LABEL(MSG_MOUSE_RIGHT_CLICK)
+	CASE_LABEL(MSG_MOUSE_RIGHT_DOUBLE_CLICK)
+	CASE_LABEL(MSG_CLEAR_GAME_DATA)
+	CASE_LABEL(MSG_NEW_GAME)
+	CASE_LABEL(MSG_BEGIN_META_MESSAGES)
+	CASE_LABEL(MSG_META_SAVE_VIEW1)
+	CASE_LABEL(MSG_META_SAVE_VIEW2)
+	CASE_LABEL(MSG_META_SAVE_VIEW3)
+	CASE_LABEL(MSG_META_SAVE_VIEW4)
+	CASE_LABEL(MSG_META_SAVE_VIEW5)
+	CASE_LABEL(MSG_META_SAVE_VIEW6)
+	CASE_LABEL(MSG_META_SAVE_VIEW7)
+	CASE_LABEL(MSG_META_SAVE_VIEW8)
+	CASE_LABEL(MSG_META_VIEW_VIEW1)
+	CASE_LABEL(MSG_META_VIEW_VIEW2)
+	CASE_LABEL(MSG_META_VIEW_VIEW3)
+	CASE_LABEL(MSG_META_VIEW_VIEW4)
+	CASE_LABEL(MSG_META_VIEW_VIEW5)
+	CASE_LABEL(MSG_META_VIEW_VIEW6)
+	CASE_LABEL(MSG_META_VIEW_VIEW7)
+	CASE_LABEL(MSG_META_VIEW_VIEW8)
+	CASE_LABEL(MSG_META_CREATE_TEAM0)
+	CASE_LABEL(MSG_META_CREATE_TEAM1)
+	CASE_LABEL(MSG_META_CREATE_TEAM2)
+	CASE_LABEL(MSG_META_CREATE_TEAM3)
+	CASE_LABEL(MSG_META_CREATE_TEAM4)
+	CASE_LABEL(MSG_META_CREATE_TEAM5)
+	CASE_LABEL(MSG_META_CREATE_TEAM6)
+	CASE_LABEL(MSG_META_CREATE_TEAM7)
+	CASE_LABEL(MSG_META_CREATE_TEAM8)
+	CASE_LABEL(MSG_META_CREATE_TEAM9)
+	CASE_LABEL(MSG_META_SELECT_TEAM0)
+	CASE_LABEL(MSG_META_SELECT_TEAM1)
+	CASE_LABEL(MSG_META_SELECT_TEAM2)
+	CASE_LABEL(MSG_META_SELECT_TEAM3)
+	CASE_LABEL(MSG_META_SELECT_TEAM4)
+	CASE_LABEL(MSG_META_SELECT_TEAM5)
+	CASE_LABEL(MSG_META_SELECT_TEAM6)
+	CASE_LABEL(MSG_META_SELECT_TEAM7)
+	CASE_LABEL(MSG_META_SELECT_TEAM8)
+	CASE_LABEL(MSG_META_SELECT_TEAM9)
+	CASE_LABEL(MSG_META_ADD_TEAM0)
+	CASE_LABEL(MSG_META_ADD_TEAM1)
+	CASE_LABEL(MSG_META_ADD_TEAM2)
+	CASE_LABEL(MSG_META_ADD_TEAM3)
+	CASE_LABEL(MSG_META_ADD_TEAM4)
+	CASE_LABEL(MSG_META_ADD_TEAM5)
+	CASE_LABEL(MSG_META_ADD_TEAM6)
+	CASE_LABEL(MSG_META_ADD_TEAM7)
+	CASE_LABEL(MSG_META_ADD_TEAM8)
+	CASE_LABEL(MSG_META_ADD_TEAM9)
+	CASE_LABEL(MSG_META_VIEW_TEAM0)
+	CASE_LABEL(MSG_META_VIEW_TEAM1)
+	CASE_LABEL(MSG_META_VIEW_TEAM2)
+	CASE_LABEL(MSG_META_VIEW_TEAM3)
+	CASE_LABEL(MSG_META_VIEW_TEAM4)
+	CASE_LABEL(MSG_META_VIEW_TEAM5)
+	CASE_LABEL(MSG_META_VIEW_TEAM6)
+	CASE_LABEL(MSG_META_VIEW_TEAM7)
+	CASE_LABEL(MSG_META_VIEW_TEAM8)
+	CASE_LABEL(MSG_META_VIEW_TEAM9)
+	CASE_LABEL(MSG_META_SELECT_MATCHING_UNITS)
+	CASE_LABEL(MSG_META_SELECT_NEXT_UNIT)
+	CASE_LABEL(MSG_META_SELECT_PREV_UNIT)
+	CASE_LABEL(MSG_META_SELECT_NEXT_WORKER)
+	CASE_LABEL(MSG_META_SELECT_PREV_WORKER)
+	CASE_LABEL(MSG_META_VIEW_COMMAND_CENTER)
+	CASE_LABEL(MSG_META_VIEW_LAST_RADAR_EVENT)
+	CASE_LABEL(MSG_META_SELECT_HERO)
+	CASE_LABEL(MSG_META_SELECT_ALL)
+	CASE_LABEL(MSG_META_SELECT_ALL_AIRCRAFT)
+	CASE_LABEL(MSG_META_SCATTER)
+	CASE_LABEL(MSG_META_STOP)
+	CASE_LABEL(MSG_META_DEPLOY)
+	CASE_LABEL(MSG_META_CREATE_FORMATION)
+	CASE_LABEL(MSG_META_FOLLOW)
+	CASE_LABEL(MSG_META_CHAT_PLAYERS)
+	CASE_LABEL(MSG_META_CHAT_ALLIES)
+	CASE_LABEL(MSG_META_CHAT_EVERYONE)
+	CASE_LABEL(MSG_META_DIPLOMACY)
+	CASE_LABEL(MSG_META_OPTIONS)
+
+#if defined(RTS_DEBUG)
+	CASE_LABEL(MSG_META_HELP)
 #endif
-	CHECK_IF(MSG_META_TOGGLE_LOWER_DETAILS)
-	CHECK_IF(MSG_META_TOGGLE_CONTROL_BAR)
-	CHECK_IF(MSG_META_BEGIN_PATH_BUILD)
-	CHECK_IF(MSG_META_END_PATH_BUILD)
-	CHECK_IF(MSG_META_BEGIN_FORCEATTACK)
-	CHECK_IF(MSG_META_END_FORCEATTACK)
-	CHECK_IF(MSG_META_BEGIN_FORCEMOVE)
-	CHECK_IF(MSG_META_END_FORCEMOVE)
-	CHECK_IF(MSG_META_BEGIN_WAYPOINTS)
-	CHECK_IF(MSG_META_END_WAYPOINTS)
-	CHECK_IF(MSG_META_BEGIN_PREFER_SELECTION)
-	CHECK_IF(MSG_META_END_PREFER_SELECTION)
-	CHECK_IF(MSG_META_TAKE_SCREENSHOT)
-	CHECK_IF(MSG_META_ALL_CHEER)
-	CHECK_IF(MSG_META_TOGGLE_ATTACKMOVE)
-	CHECK_IF(MSG_META_BEGIN_CAMERA_ROTATE_LEFT)
-	CHECK_IF(MSG_META_END_CAMERA_ROTATE_LEFT)
-	CHECK_IF(MSG_META_BEGIN_CAMERA_ROTATE_RIGHT)
-	CHECK_IF(MSG_META_END_CAMERA_ROTATE_RIGHT)
-	CHECK_IF(MSG_META_BEGIN_CAMERA_ZOOM_IN)
-	CHECK_IF(MSG_META_END_CAMERA_ZOOM_IN)
-	CHECK_IF(MSG_META_BEGIN_CAMERA_ZOOM_OUT)
-	CHECK_IF(MSG_META_END_CAMERA_ZOOM_OUT)
-	CHECK_IF(MSG_META_CAMERA_RESET)
-
-
-    CHECK_IF(MSG_META_TOGGLE_FAST_FORWARD_REPLAY)
-    CHECK_IF(MSG_META_TOGGLE_PAUSE)
-    CHECK_IF(MSG_META_STEP_FRAME)
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_LETTERBOX)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_MESSAGE_TEXT)
-	CHECK_IF(MSG_META_DEMO_LOD_DECREASE)
-	CHECK_IF(MSG_META_DEMO_LOD_INCREASE)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_ZOOM_LOCK)
-	CHECK_IF(MSG_META_DEMO_PLAY_CAMEO_MOVIE)
-	CHECK_IF(MSG_META_DEMO_INSTANT_QUIT)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_SPECIAL_POWER_DELAYS)
-	CHECK_IF(MSG_META_DEMO_BATTLE_CRY)
-	CHECK_IF(MSG_META_DEMO_SWITCH_TEAMS)
-	CHECK_IF(MSG_META_DEMO_SWITCH_TEAMS_BETWEEN_CHINA_USA)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_PARTICLEDEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_SHADOW_VOLUMES)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_FOGOFWAR)
-	CHECK_IF(MSG_META_DEMO_KILL_ALL_ENEMIES)
-	CHECK_IF(MSG_META_DEMO_KILL_SELECTION)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_HURT_ME_MODE)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_HAND_OF_GOD_MODE)
-	CHECK_IF(MSG_META_DEMO_DEBUG_SELECTION)
-	CHECK_IF(MSG_META_DEMO_LOCK_CAMERA_TO_SELECTION)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_SOUND)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_TRACKMARKS)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_WATERPLANE)
-	CHECK_IF(MSG_META_DEMO_TIME_OF_DAY)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_MUSIC)
-	CHECK_IF(MSG_META_DEMO_MUSIC_NEXT_TRACK)
-	CHECK_IF(MSG_META_DEMO_MUSIC_PREV_TRACK)
-	CHECK_IF(MSG_META_DEMO_NEXT_OBJECTIVE_MOVIE)
-	CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE1)
-	CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE2)
-	CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE3)
-	CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE4)
-	CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE5)
-	CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE6)
-	CHECK_IF(MSG_META_DEMO_BEGIN_ADJUST_PITCH)
-	CHECK_IF(MSG_META_DEMO_END_ADJUST_PITCH)
-	CHECK_IF(MSG_META_DEMO_BEGIN_ADJUST_FOV)
-	CHECK_IF(MSG_META_DEMO_END_ADJUST_FOV)
-	CHECK_IF(MSG_META_DEMO_LOCK_CAMERA_TO_PLANES)
-	CHECK_IF(MSG_META_DEMO_REMOVE_PREREQ)
-	CHECK_IF(MSG_META_DEMO_INSTANT_BUILD)
-	CHECK_IF(MSG_META_DEMO_FREE_BUILD)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT1)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT2)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT3)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT4)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT5)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT6)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT7)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT8)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT9)
-	CHECK_IF(MSG_META_DEMO_ENSHROUD)
-	CHECK_IF(MSG_META_DEMO_DESHROUD)
-	CHECK_IF(MSG_META_DEBUG_SHOW_EXTENTS)
-	CHECK_IF(MSG_META_DEBUG_SHOW_HEALTH)
-	CHECK_IF(MSG_META_DEBUG_GIVE_VETERANCY)
-	CHECK_IF(MSG_META_DEBUG_TAKE_VETERANCY)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_AI_DEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_CAMERA_DEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_AVI)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_BW_VIEW)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_RED_VIEW)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_GREEN_VIEW)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_MOTION_BLUR_ZOOM)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_MILITARY_SUBTITLES)
-	CHECK_IF(MSG_META_DEMO_ADD_CASH)
+
+	CASE_LABEL(MSG_META_INCREASE_MAX_RENDER_FPS)
+	CASE_LABEL(MSG_META_DECREASE_MAX_RENDER_FPS)
+	CASE_LABEL(MSG_META_INCREASE_LOGIC_TIME_SCALE)
+	CASE_LABEL(MSG_META_DECREASE_LOGIC_TIME_SCALE)
+	CASE_LABEL(MSG_META_TOGGLE_LOWER_DETAILS)
+	CASE_LABEL(MSG_META_TOGGLE_CONTROL_BAR)
+	CASE_LABEL(MSG_META_TOGGLE_PLAYER_OBSERVER)
+	CASE_LABEL(MSG_META_BEGIN_PATH_BUILD)
+	CASE_LABEL(MSG_META_END_PATH_BUILD)
+	CASE_LABEL(MSG_META_BEGIN_FORCEATTACK)
+	CASE_LABEL(MSG_META_END_FORCEATTACK)
+	CASE_LABEL(MSG_META_BEGIN_FORCEMOVE)
+	CASE_LABEL(MSG_META_END_FORCEMOVE)
+	CASE_LABEL(MSG_META_BEGIN_WAYPOINTS)
+	CASE_LABEL(MSG_META_END_WAYPOINTS)
+	CASE_LABEL(MSG_META_BEGIN_PREFER_SELECTION)
+	CASE_LABEL(MSG_META_END_PREFER_SELECTION)
+	CASE_LABEL(MSG_META_TAKE_SCREENSHOT)
+	CASE_LABEL(MSG_META_ALL_CHEER)
+	CASE_LABEL(MSG_META_TOGGLE_ATTACKMOVE)
+	CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_LEFT)
+	CASE_LABEL(MSG_META_END_CAMERA_ROTATE_LEFT)
+	CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_RIGHT)
+	CASE_LABEL(MSG_META_END_CAMERA_ROTATE_RIGHT)
+	CASE_LABEL(MSG_META_BEGIN_CAMERA_ZOOM_IN)
+	CASE_LABEL(MSG_META_END_CAMERA_ZOOM_IN)
+	CASE_LABEL(MSG_META_BEGIN_CAMERA_ZOOM_OUT)
+	CASE_LABEL(MSG_META_END_CAMERA_ZOOM_OUT)
+	CASE_LABEL(MSG_META_CAMERA_RESET)
+	CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY)
+	CASE_LABEL(MSG_META_TOGGLE_PAUSE)
+	CASE_LABEL(MSG_META_TOGGLE_PAUSE_ALT)
+	CASE_LABEL(MSG_META_STEP_FRAME)
+	CASE_LABEL(MSG_META_STEP_FRAME_ALT)
+
+#if defined(RTS_DEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_LETTERBOX)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_MESSAGE_TEXT)
+	CASE_LABEL(MSG_META_DEMO_LOD_DECREASE)
+	CASE_LABEL(MSG_META_DEMO_LOD_INCREASE)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_ZOOM_LOCK)
+	CASE_LABEL(MSG_META_DEMO_PLAY_CAMEO_MOVIE)
+	CASE_LABEL(MSG_META_DEMO_INSTANT_QUIT)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_SPECIAL_POWER_DELAYS)
+	CASE_LABEL(MSG_META_DEMO_BATTLE_CRY)
+	CASE_LABEL(MSG_META_DEMO_SWITCH_TEAMS)
+	CASE_LABEL(MSG_META_DEMO_SWITCH_TEAMS_BETWEEN_CHINA_USA)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_PARTICLEDEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_SHADOW_VOLUMES)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_FOGOFWAR)
+	CASE_LABEL(MSG_META_DEMO_KILL_ALL_ENEMIES)
+	CASE_LABEL(MSG_META_DEMO_KILL_SELECTION)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_HURT_ME_MODE)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_HAND_OF_GOD_MODE)
+	CASE_LABEL(MSG_META_DEMO_DEBUG_SELECTION)
+	CASE_LABEL(MSG_META_DEMO_LOCK_CAMERA_TO_SELECTION)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_SOUND)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_TRACKMARKS)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_WATERPLANE)
+	CASE_LABEL(MSG_META_DEMO_TIME_OF_DAY)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_MUSIC)
+	CASE_LABEL(MSG_META_DEMO_MUSIC_NEXT_TRACK)
+	CASE_LABEL(MSG_META_DEMO_MUSIC_PREV_TRACK)
+	CASE_LABEL(MSG_META_DEMO_NEXT_OBJECTIVE_MOVIE)
+	CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE1)
+	CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE2)
+	CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE3)
+	CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE4)
+	CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE5)
+	CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE6)
+	CASE_LABEL(MSG_META_DEMO_BEGIN_ADJUST_PITCH)
+	CASE_LABEL(MSG_META_DEMO_END_ADJUST_PITCH)
+	CASE_LABEL(MSG_META_DEMO_BEGIN_ADJUST_FOV)
+	CASE_LABEL(MSG_META_DEMO_END_ADJUST_FOV)
+	CASE_LABEL(MSG_META_DEMO_LOCK_CAMERA_TO_PLANES)
+	CASE_LABEL(MSG_META_DEMO_REMOVE_PREREQ)
+	CASE_LABEL(MSG_META_DEMO_INSTANT_BUILD)
+	CASE_LABEL(MSG_META_DEMO_FREE_BUILD)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT1)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT2)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT3)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT4)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT5)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT6)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT7)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT8)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT9)
+	CASE_LABEL(MSG_META_DEMO_ENSHROUD)
+	CASE_LABEL(MSG_META_DEMO_DESHROUD)
+	CASE_LABEL(MSG_META_DEBUG_SHOW_EXTENTS)
+	CASE_LABEL(MSG_META_DEBUG_SHOW_HEALTH)
+	CASE_LABEL(MSG_META_DEBUG_GIVE_VETERANCY)
+	CASE_LABEL(MSG_META_DEBUG_TAKE_VETERANCY)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_AI_DEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_CAMERA_DEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_AVI)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_BW_VIEW)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_RED_VIEW)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_GREEN_VIEW)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_MOTION_BLUR_ZOOM)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_MILITARY_SUBTITLES)
+	CASE_LABEL(MSG_META_DEMO_ADD_CASH)
+
 #ifdef ALLOW_SURRENDER
-	CHECK_IF(MSG_META_DEMO_TEST_SURRENDER)
+	CASE_LABEL(MSG_META_DEMO_TEST_SURRENDER)
 #endif
-	CHECK_IF(MSG_META_DEMO_TOGGLE_RENDER)
-	CHECK_IF(MSG_META_DEMO_KILL_AREA_SELECTION)
-	CHECK_IF(MSG_META_DEMO_CYCLE_LOD_LEVEL)
-	CHECK_IF(MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED)
-	CHECK_IF(MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED)
-	CHECK_IF(MSG_META_DEBUG_CYCLE_EXTENT_TYPE)
-	CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR)
-	CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR_BIG)
-	CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR)
-	CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR_BIG)
-	CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MINOR)
-	CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MINOR_BIG)
-	CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MINOR)
-	CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MINOR_BIG)
-	CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT)
-	CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT_BIG)
-	CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT)
-	CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT_BIG)
-	CHECK_IF(MSG_META_DEBUG_VTUNE_ON)
-	CHECK_IF(MSG_META_DEBUG_VTUNE_OFF)
-	CHECK_IF(MSG_META_DEBUG_TOGGLE_FEATHER_WATER)
-	CHECK_IF(MSG_META_DEBUG_DUMP_ASSETS)
-	CHECK_IF(MSG_NO_DRAW)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_METRICS)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_PROJECTILEDEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_VISIONDEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_THREATDEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_CASHMAPDEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_GRAPHICALFRAMERATEBAR)
-	CHECK_IF(MSG_META_DEMO_GIVE_ALL_SCIENCES)
-	CHECK_IF(MSG_META_DEMO_GIVE_RANKLEVEL)
-	CHECK_IF(MSG_META_DEMO_TAKE_RANKLEVEL)
-	CHECK_IF(MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS)
-	CHECK_IF(MSG_META_DEBUG_TOGGLE_NETWORK)
-	CHECK_IF(MSG_META_DEBUG_DUMP_PLAYER_OBJECTS)
-	CHECK_IF(MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS)
-	CHECK_IF(MSG_META_DEBUG_WIN)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_DEBUG_STATS)
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-
-
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_AUDIODEBUG)
-#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_RENDER)
+	CASE_LABEL(MSG_META_DEMO_KILL_AREA_SELECTION)
+	CASE_LABEL(MSG_META_DEMO_CYCLE_LOD_LEVEL)
+	CASE_LABEL(MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED)
+	CASE_LABEL(MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED)
+	CASE_LABEL(MSG_META_DEBUG_CYCLE_EXTENT_TYPE)
+	CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR)
+	CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR_BIG)
+	CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR)
+	CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR_BIG)
+	CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MINOR)
+	CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MINOR_BIG)
+	CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MINOR)
+	CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MINOR_BIG)
+	CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT)
+	CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT_BIG)
+	CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT)
+	CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT_BIG)
+	CASE_LABEL(MSG_META_DEBUG_VTUNE_ON)
+	CASE_LABEL(MSG_META_DEBUG_VTUNE_OFF)
+	CASE_LABEL(MSG_META_DEBUG_TOGGLE_FEATHER_WATER)
+	CASE_LABEL(MSG_META_DEBUG_DUMP_ASSETS)
+	CASE_LABEL(MSG_NO_DRAW)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_METRICS)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_PROJECTILEDEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_VISIONDEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_THREATDEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_CASHMAPDEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_GRAPHICALFRAMERATEBAR)
+	CASE_LABEL(MSG_META_DEMO_GIVE_ALL_SCIENCES)
+	CASE_LABEL(MSG_META_DEMO_GIVE_RANKLEVEL)
+	CASE_LABEL(MSG_META_DEMO_TAKE_RANKLEVEL)
+	CASE_LABEL(MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS)
+	CASE_LABEL(MSG_META_DEBUG_TOGGLE_NETWORK)
+	CASE_LABEL(MSG_META_DEBUG_DUMP_PLAYER_OBJECTS)
+	CASE_LABEL(MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS)
+	CASE_LABEL(MSG_META_DEBUG_WIN)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_DEBUG_STATS)
+#endif // defined(RTS_DEBUG)
+
+#if defined(RTS_DEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG)
+#endif//defined(RTS_DEBUG)
+
 #ifdef DUMP_PERF_STATS
-	CHECK_IF(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP)
+	CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP)
 #endif//DUMP_PERF_STATS
-	CHECK_IF(MSG_META_PLACE_BEACON)
-	CHECK_IF(MSG_META_REMOVE_BEACON)
-	CHECK_IF(MSG_END_META_MESSAGES)
-	CHECK_IF(MSG_MOUSEOVER_DRAWABLE_HINT)
-	CHECK_IF(MSG_MOUSEOVER_LOCATION_HINT)
-	CHECK_IF(MSG_VALID_GUICOMMAND_HINT)
-	CHECK_IF(MSG_INVALID_GUICOMMAND_HINT)
-	CHECK_IF(MSG_AREA_SELECTION_HINT)
-	CHECK_IF(MSG_DO_ATTACK_OBJECT_HINT)
-	CHECK_IF(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
-	CHECK_IF(MSG_DO_FORCE_ATTACK_OBJECT_HINT)
-	CHECK_IF(MSG_DO_FORCE_ATTACK_GROUND_HINT)
-	CHECK_IF(MSG_GET_REPAIRED_HINT)
-	CHECK_IF(MSG_GET_HEALED_HINT)
-	CHECK_IF(MSG_DO_REPAIR_HINT)
-	CHECK_IF(MSG_RESUME_CONSTRUCTION_HINT)
-	CHECK_IF(MSG_ENTER_HINT)
-	CHECK_IF(MSG_DOCK_HINT)
-	CHECK_IF(MSG_DO_MOVETO_HINT)
-	CHECK_IF(MSG_DO_ATTACKMOVETO_HINT)
-	CHECK_IF(MSG_ADD_WAYPOINT_HINT)
-	CHECK_IF(MSG_HIJACK_HINT)
-	CHECK_IF(MSG_FIREBOMB_HINT)
-	CHECK_IF(MSG_CONVERT_TO_CARBOMB_HINT)
-	CHECK_IF(MSG_CAPTUREBUILDING_HINT)
-	CHECK_IF(MSG_HACK_HINT)
+
+	CASE_LABEL(MSG_META_PLACE_BEACON)
+	CASE_LABEL(MSG_META_REMOVE_BEACON)
+	CASE_LABEL(MSG_END_META_MESSAGES)
+	CASE_LABEL(MSG_MOUSEOVER_DRAWABLE_HINT)
+	CASE_LABEL(MSG_MOUSEOVER_LOCATION_HINT)
+	CASE_LABEL(MSG_VALID_GUICOMMAND_HINT)
+	CASE_LABEL(MSG_INVALID_GUICOMMAND_HINT)
+	CASE_LABEL(MSG_AREA_SELECTION_HINT)
+	CASE_LABEL(MSG_DO_ATTACK_OBJECT_HINT)
+	CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
+	CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT_HINT)
+	CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND_HINT)
+	CASE_LABEL(MSG_GET_REPAIRED_HINT)
+	CASE_LABEL(MSG_GET_HEALED_HINT)
+	CASE_LABEL(MSG_DO_REPAIR_HINT)
+	CASE_LABEL(MSG_RESUME_CONSTRUCTION_HINT)
+	CASE_LABEL(MSG_ENTER_HINT)
+	CASE_LABEL(MSG_DOCK_HINT)
+	CASE_LABEL(MSG_DO_MOVETO_HINT)
+	CASE_LABEL(MSG_DO_ATTACKMOVETO_HINT)
+	CASE_LABEL(MSG_ADD_WAYPOINT_HINT)
+	CASE_LABEL(MSG_HIJACK_HINT)
+	CASE_LABEL(MSG_FIREBOMB_HINT)
+	CASE_LABEL(MSG_CONVERT_TO_CARBOMB_HINT)
+	CASE_LABEL(MSG_CAPTUREBUILDING_HINT)
+	CASE_LABEL(MSG_HACK_HINT)
+
 #ifdef ALLOW_SURRENDER
-	CHECK_IF(MSG_PICK_UP_PRISONER_HINT)
+	CASE_LABEL(MSG_PICK_UP_PRISONER_HINT)
 #endif
-	CHECK_IF(MSG_SNIPE_VEHICLE_HINT)
-	CHECK_IF(MSG_DEFECTOR_HINT)
-	CHECK_IF(MSG_SET_RALLY_POINT_HINT)
-	CHECK_IF(MSG_DO_SALVAGE_HINT)
-	CHECK_IF(MSG_DO_INVALID_HINT)
-	CHECK_IF(MSG_BEGIN_NETWORK_MESSAGES)
-	CHECK_IF(MSG_CREATE_SELECTED_GROUP)
-	CHECK_IF(MSG_CREATE_SELECTED_GROUP_NO_SOUND)
-	CHECK_IF(MSG_DESTROY_SELECTED_GROUP)
-	CHECK_IF(MSG_REMOVE_FROM_SELECTED_GROUP)
-	CHECK_IF(MSG_SELECTED_GROUP_COMMAND)
-	CHECK_IF(MSG_CREATE_TEAM0)
-	CHECK_IF(MSG_CREATE_TEAM1)
-	CHECK_IF(MSG_CREATE_TEAM2)
-	CHECK_IF(MSG_CREATE_TEAM3)
-	CHECK_IF(MSG_CREATE_TEAM4)
-	CHECK_IF(MSG_CREATE_TEAM5)
-	CHECK_IF(MSG_CREATE_TEAM6)
-	CHECK_IF(MSG_CREATE_TEAM7)
-	CHECK_IF(MSG_CREATE_TEAM8)
-	CHECK_IF(MSG_CREATE_TEAM9)
-	CHECK_IF(MSG_SELECT_TEAM0)
-	CHECK_IF(MSG_SELECT_TEAM1)
-	CHECK_IF(MSG_SELECT_TEAM2)
-	CHECK_IF(MSG_SELECT_TEAM3)
-	CHECK_IF(MSG_SELECT_TEAM4)
-	CHECK_IF(MSG_SELECT_TEAM5)
-	CHECK_IF(MSG_SELECT_TEAM6)
-	CHECK_IF(MSG_SELECT_TEAM7)
-	CHECK_IF(MSG_SELECT_TEAM8)
-	CHECK_IF(MSG_SELECT_TEAM9)
-	CHECK_IF(MSG_ADD_TEAM0)
-	CHECK_IF(MSG_ADD_TEAM1)
-	CHECK_IF(MSG_ADD_TEAM2)
-	CHECK_IF(MSG_ADD_TEAM3)
-	CHECK_IF(MSG_ADD_TEAM4)
-	CHECK_IF(MSG_ADD_TEAM5)
-	CHECK_IF(MSG_ADD_TEAM6)
-	CHECK_IF(MSG_ADD_TEAM7)
-	CHECK_IF(MSG_ADD_TEAM8)
-	CHECK_IF(MSG_ADD_TEAM9)
-	CHECK_IF(MSG_DO_ATTACKSQUAD)
-	CHECK_IF(MSG_DO_WEAPON)
-	CHECK_IF(MSG_DO_WEAPON_AT_LOCATION)
-	CHECK_IF(MSG_DO_WEAPON_AT_OBJECT)
-	CHECK_IF(MSG_DO_SPECIAL_POWER)
-	CHECK_IF(MSG_DO_SPECIAL_POWER_AT_LOCATION)
-	CHECK_IF(MSG_DO_SPECIAL_POWER_AT_OBJECT)
-	CHECK_IF(MSG_SET_RALLY_POINT)
-	CHECK_IF(MSG_PURCHASE_SCIENCE)
-	CHECK_IF(MSG_QUEUE_UPGRADE)
-	CHECK_IF(MSG_CANCEL_UPGRADE)
-	CHECK_IF(MSG_QUEUE_UNIT_CREATE)
-	CHECK_IF(MSG_CANCEL_UNIT_CREATE)
-	CHECK_IF(MSG_DOZER_CONSTRUCT)
-	CHECK_IF(MSG_DOZER_CONSTRUCT_LINE)
-	CHECK_IF(MSG_DOZER_CANCEL_CONSTRUCT)
-	CHECK_IF(MSG_SELL)
-	CHECK_IF(MSG_EXIT)
-	CHECK_IF(MSG_EVACUATE)
-	CHECK_IF(MSG_EXECUTE_RAILED_TRANSPORT)
-	CHECK_IF(MSG_COMBATDROP_AT_LOCATION)
-	CHECK_IF(MSG_COMBATDROP_AT_OBJECT)
-	CHECK_IF(MSG_AREA_SELECTION)
-	CHECK_IF(MSG_DO_ATTACK_OBJECT)
-	CHECK_IF(MSG_DO_FORCE_ATTACK_OBJECT)
-	CHECK_IF(MSG_DO_FORCE_ATTACK_GROUND)
-	CHECK_IF(MSG_GET_REPAIRED)
-	CHECK_IF(MSG_GET_HEALED)
-	CHECK_IF(MSG_DO_REPAIR)
-	CHECK_IF(MSG_RESUME_CONSTRUCTION)
-	CHECK_IF(MSG_ENTER)
-	CHECK_IF(MSG_DOCK)
-	CHECK_IF(MSG_DO_MOVETO)
-	CHECK_IF(MSG_DO_ATTACKMOVETO)
-	CHECK_IF(MSG_DO_FORCEMOVETO)
-	CHECK_IF(MSG_ADD_WAYPOINT)
-	CHECK_IF(MSG_DO_GUARD_POSITION)
-	CHECK_IF(MSG_DO_GUARD_OBJECT)
-	CHECK_IF(MSG_DO_STOP)
-	CHECK_IF(MSG_DO_SCATTER)
-	CHECK_IF(MSG_INTERNET_HACK)
-	CHECK_IF(MSG_DO_CHEER)
+
+	CASE_LABEL(MSG_SNIPE_VEHICLE_HINT)
+	CASE_LABEL(MSG_DEFECTOR_HINT)
+	CASE_LABEL(MSG_SET_RALLY_POINT_HINT)
+	CASE_LABEL(MSG_DO_SALVAGE_HINT)
+	CASE_LABEL(MSG_DO_INVALID_HINT)
+	CASE_LABEL(MSG_BEGIN_NETWORK_MESSAGES)
+	CASE_LABEL(MSG_CREATE_SELECTED_GROUP)
+	CASE_LABEL(MSG_CREATE_SELECTED_GROUP_NO_SOUND)
+	CASE_LABEL(MSG_DESTROY_SELECTED_GROUP)
+	CASE_LABEL(MSG_REMOVE_FROM_SELECTED_GROUP)
+	CASE_LABEL(MSG_SELECTED_GROUP_COMMAND)
+	CASE_LABEL(MSG_CREATE_TEAM0)
+	CASE_LABEL(MSG_CREATE_TEAM1)
+	CASE_LABEL(MSG_CREATE_TEAM2)
+	CASE_LABEL(MSG_CREATE_TEAM3)
+	CASE_LABEL(MSG_CREATE_TEAM4)
+	CASE_LABEL(MSG_CREATE_TEAM5)
+	CASE_LABEL(MSG_CREATE_TEAM6)
+	CASE_LABEL(MSG_CREATE_TEAM7)
+	CASE_LABEL(MSG_CREATE_TEAM8)
+	CASE_LABEL(MSG_CREATE_TEAM9)
+	CASE_LABEL(MSG_SELECT_TEAM0)
+	CASE_LABEL(MSG_SELECT_TEAM1)
+	CASE_LABEL(MSG_SELECT_TEAM2)
+	CASE_LABEL(MSG_SELECT_TEAM3)
+	CASE_LABEL(MSG_SELECT_TEAM4)
+	CASE_LABEL(MSG_SELECT_TEAM5)
+	CASE_LABEL(MSG_SELECT_TEAM6)
+	CASE_LABEL(MSG_SELECT_TEAM7)
+	CASE_LABEL(MSG_SELECT_TEAM8)
+	CASE_LABEL(MSG_SELECT_TEAM9)
+	CASE_LABEL(MSG_ADD_TEAM0)
+	CASE_LABEL(MSG_ADD_TEAM1)
+	CASE_LABEL(MSG_ADD_TEAM2)
+	CASE_LABEL(MSG_ADD_TEAM3)
+	CASE_LABEL(MSG_ADD_TEAM4)
+	CASE_LABEL(MSG_ADD_TEAM5)
+	CASE_LABEL(MSG_ADD_TEAM6)
+	CASE_LABEL(MSG_ADD_TEAM7)
+	CASE_LABEL(MSG_ADD_TEAM8)
+	CASE_LABEL(MSG_ADD_TEAM9)
+	CASE_LABEL(MSG_DO_ATTACKSQUAD)
+	CASE_LABEL(MSG_DO_WEAPON)
+	CASE_LABEL(MSG_DO_WEAPON_AT_LOCATION)
+	CASE_LABEL(MSG_DO_WEAPON_AT_OBJECT)
+	CASE_LABEL(MSG_DO_SPECIAL_POWER)
+	CASE_LABEL(MSG_DO_SPECIAL_POWER_AT_LOCATION)
+	CASE_LABEL(MSG_DO_SPECIAL_POWER_AT_OBJECT)
+	CASE_LABEL(MSG_SET_RALLY_POINT)
+	CASE_LABEL(MSG_PURCHASE_SCIENCE)
+	CASE_LABEL(MSG_QUEUE_UPGRADE)
+	CASE_LABEL(MSG_CANCEL_UPGRADE)
+	CASE_LABEL(MSG_QUEUE_UNIT_CREATE)
+	CASE_LABEL(MSG_CANCEL_UNIT_CREATE)
+	CASE_LABEL(MSG_DOZER_CONSTRUCT)
+	CASE_LABEL(MSG_DOZER_CONSTRUCT_LINE)
+	CASE_LABEL(MSG_DOZER_CANCEL_CONSTRUCT)
+	CASE_LABEL(MSG_SELL)
+	CASE_LABEL(MSG_EXIT)
+	CASE_LABEL(MSG_EVACUATE)
+	CASE_LABEL(MSG_EXECUTE_RAILED_TRANSPORT)
+	CASE_LABEL(MSG_COMBATDROP_AT_LOCATION)
+	CASE_LABEL(MSG_COMBATDROP_AT_OBJECT)
+	CASE_LABEL(MSG_AREA_SELECTION)
+	CASE_LABEL(MSG_DO_ATTACK_OBJECT)
+	CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT)
+	CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND)
+	CASE_LABEL(MSG_GET_REPAIRED)
+	CASE_LABEL(MSG_GET_HEALED)
+	CASE_LABEL(MSG_DO_REPAIR)
+	CASE_LABEL(MSG_RESUME_CONSTRUCTION)
+	CASE_LABEL(MSG_ENTER)
+	CASE_LABEL(MSG_DOCK)
+	CASE_LABEL(MSG_DO_MOVETO)
+	CASE_LABEL(MSG_DO_ATTACKMOVETO)
+	CASE_LABEL(MSG_DO_FORCEMOVETO)
+	CASE_LABEL(MSG_ADD_WAYPOINT)
+	CASE_LABEL(MSG_DO_GUARD_POSITION)
+	CASE_LABEL(MSG_DO_GUARD_OBJECT)
+	CASE_LABEL(MSG_DO_STOP)
+	CASE_LABEL(MSG_DO_SCATTER)
+	CASE_LABEL(MSG_INTERNET_HACK)
+	CASE_LABEL(MSG_DO_CHEER)
+
 #ifdef ALLOW_SURRENDER
-	CHECK_IF(MSG_DO_SURRENDER)
+	CASE_LABEL(MSG_DO_SURRENDER)
 #endif
-	CHECK_IF(MSG_TOGGLE_OVERCHARGE)
+
+	CASE_LABEL(MSG_TOGGLE_OVERCHARGE)
+
 #ifdef ALLOW_SURRENDER
-	CHECK_IF(MSG_RETURN_TO_PRISON)
+	CASE_LABEL(MSG_RETURN_TO_PRISON)
 #endif
-	CHECK_IF(MSG_SWITCH_WEAPONS)
-	CHECK_IF(MSG_CONVERT_TO_CARBOMB)
-	CHECK_IF(MSG_CAPTUREBUILDING)
-	CHECK_IF(MSG_DISABLEVEHICLE_HACK)
-	CHECK_IF(MSG_STEALCASH_HACK)
-	CHECK_IF(MSG_DISABLEBUILDING_HACK)
-	CHECK_IF(MSG_SNIPE_VEHICLE)
+
+	CASE_LABEL(MSG_SWITCH_WEAPONS)
+	CASE_LABEL(MSG_CONVERT_TO_CARBOMB)
+	CASE_LABEL(MSG_CAPTUREBUILDING)
+	CASE_LABEL(MSG_DISABLEVEHICLE_HACK)
+	CASE_LABEL(MSG_STEALCASH_HACK)
+	CASE_LABEL(MSG_DISABLEBUILDING_HACK)
+	CASE_LABEL(MSG_SNIPE_VEHICLE)
+
 #ifdef ALLOW_SURRENDER
-	CHECK_IF(MSG_PICK_UP_PRISONER)
+	CASE_LABEL(MSG_PICK_UP_PRISONER)
 #endif
-	CHECK_IF(MSG_DO_SALVAGE)
-	CHECK_IF(MSG_CLEAR_INGAME_POPUP_MESSAGE)
-	CHECK_IF(MSG_PLACE_BEACON)
-	CHECK_IF(MSG_REMOVE_BEACON)
-	CHECK_IF(MSG_SET_BEACON_TEXT)
-	CHECK_IF(MSG_SET_REPLAY_CAMERA)
-	CHECK_IF(MSG_SELF_DESTRUCT)
-	CHECK_IF(MSG_CREATE_FORMATION)
-	CHECK_IF(MSG_LOGIC_CRC)
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	CHECK_IF(MSG_DEBUG_KILL_SELECTION)
-	CHECK_IF(MSG_DEBUG_HURT_OBJECT)
-	CHECK_IF(MSG_DEBUG_KILL_OBJECT)
+
+	CASE_LABEL(MSG_DO_SALVAGE)
+	CASE_LABEL(MSG_CLEAR_INGAME_POPUP_MESSAGE)
+	CASE_LABEL(MSG_PLACE_BEACON)
+	CASE_LABEL(MSG_REMOVE_BEACON)
+	CASE_LABEL(MSG_SET_BEACON_TEXT)
+	CASE_LABEL(MSG_SET_REPLAY_CAMERA)
+	CASE_LABEL(MSG_SELF_DESTRUCT)
+	CASE_LABEL(MSG_CREATE_FORMATION)
+	CASE_LABEL(MSG_LOGIC_CRC)
+
+#if defined(RTS_DEBUG)
+	CASE_LABEL(MSG_DEBUG_KILL_SELECTION)
+	CASE_LABEL(MSG_DEBUG_HURT_OBJECT)
+	CASE_LABEL(MSG_DEBUG_KILL_OBJECT)
 #endif
-	CHECK_IF(MSG_END_NETWORK_MESSAGES)
-	CHECK_IF(MSG_TIMESTAMP)
-	CHECK_IF(MSG_OBJECT_CREATED)
-	CHECK_IF(MSG_OBJECT_DESTROYED)
-	CHECK_IF(MSG_OBJECT_POSITION)
-	CHECK_IF(MSG_OBJECT_ORIENTATION)
-	CHECK_IF(MSG_OBJECT_JOINED_TEAM)
-	CHECK_IF(MSG_SET_MINE_CLEARING_DETAIL)
-	return commandName;
+
+	CASE_LABEL(MSG_END_NETWORK_MESSAGES)
+	CASE_LABEL(MSG_TIMESTAMP)
+	CASE_LABEL(MSG_OBJECT_CREATED)
+	CASE_LABEL(MSG_OBJECT_DESTROYED)
+	CASE_LABEL(MSG_OBJECT_POSITION)
+	CASE_LABEL(MSG_OBJECT_ORIENTATION)
+	CASE_LABEL(MSG_OBJECT_JOINED_TEAM)
+	CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL)
+	}
+
+#undef CASE_LABEL
 }
 
 
@@ -715,10 +731,10 @@ void GameMessageList::insertMessage( GameMessage *msg, GameMessage *messageToIns
 {
 	// First, set msg's next to be messageToInsertAfter's next.
 	msg->friend_setNext(messageToInsertAfter->next());
-	
+
 	// Next, set msg's prev to be messageToInsertAfter
 	msg->friend_setPrev(messageToInsertAfter);
-	
+
 	// Now update the next message's prev to be msg
 	if (msg->next())
 		msg->next()->friend_setPrev(msg);
@@ -800,7 +816,7 @@ void MessageStream::init( void )
 {
 	// extend
 	GameMessageList::init();
-} 
+}
 
 /**
 	* Reset
@@ -860,7 +876,7 @@ GameMessage *MessageStream::insertMessage( GameMessage::Type type, GameMessage *
  * Translators share a priority, they are kept in the same order they
  * were attached.
  */
-TranslatorID MessageStream::attachTranslator( GameMessageTranslator *translator, 
+TranslatorID MessageStream::attachTranslator( GameMessageTranslator *translator,
 																							UnsignedInt priority)
 {
 	MessageStream::TranslatorData *newSS = NEW MessageStream::TranslatorData;
@@ -918,7 +934,7 @@ TranslatorID MessageStream::attachTranslator( GameMessageTranslator *translator,
 }
 
 /**
-	* Find a translator attached to this message stream given the ID 
+	* Find a translator attached to this message stream given the ID
 	*/
 GameMessageTranslator* MessageStream::findTranslator( TranslatorID id )
 {
@@ -967,17 +983,24 @@ void MessageStream::removeTranslator( TranslatorID id )
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 
 Bool isInvalidDebugCommand( GameMessage::Type t )
 {
 	// see if this is something that should be prevented in multiplayer games
 	// Don't reject this stuff in skirmish games.
-	if (TheGameLogic && !TheGameLogic->isInSkirmishGame() && 
+	if (TheGameLogic && !TheGameLogic->isInSkirmishGame() &&
 			(TheRecorder && TheRecorder->isMultiplayer() && TheRecorder->getMode() == RECORDERMODETYPE_RECORD))
 	{
 		switch (t)
 		{
+		case GameMessage::MSG_META_DEMO_REMOVE_PREREQ:
+		case GameMessage::MSG_META_DEMO_INSTANT_BUILD:
+		case GameMessage::MSG_META_DEMO_FREE_BUILD:
+		case GameMessage::MSG_META_DEMO_GIVE_ALL_SCIENCES:
+			// TheSuperHackers @tweak Debug cheats are now multiplayer compatible. Happy cheating Munkees :)
+			return false;
+
 		case GameMessage::MSG_META_DEMO_INSTANT_QUIT:
 		case GameMessage::MSG_META_DEMO_SWITCH_TEAMS:
 		case GameMessage::MSG_META_DEMO_SWITCH_TEAMS_BETWEEN_CHINA_USA:
@@ -988,9 +1011,6 @@ Bool isInvalidDebugCommand( GameMessage::Type t )
 		case GameMessage::MSG_META_DEMO_TOGGLE_SPECIAL_POWER_DELAYS:
 		case GameMessage::MSG_META_DEMO_TIME_OF_DAY:
 		case GameMessage::MSG_META_DEMO_LOCK_CAMERA_TO_PLANES:
-		case GameMessage::MSG_META_DEMO_REMOVE_PREREQ:
-		case GameMessage::MSG_META_DEMO_INSTANT_BUILD:
-		case GameMessage::MSG_META_DEMO_FREE_BUILD:
 		case GameMessage::MSG_META_DEMO_RUNSCRIPT1:
 		case GameMessage::MSG_META_DEMO_RUNSCRIPT2:
 		case GameMessage::MSG_META_DEMO_RUNSCRIPT3:
@@ -1004,7 +1024,6 @@ Bool isInvalidDebugCommand( GameMessage::Type t )
 		case GameMessage::MSG_META_DEMO_DESHROUD:
 		case GameMessage::MSG_META_DEBUG_GIVE_VETERANCY:
 		case GameMessage::MSG_META_DEBUG_TAKE_VETERANCY:
-//#pragma MESSAGE ("WARNING - DEBUG key in multiplayer!")
 		case GameMessage::MSG_META_DEMO_ADD_CASH:
 		case GameMessage::MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED:
 		case GameMessage::MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED:
@@ -1027,7 +1046,6 @@ Bool isInvalidDebugCommand( GameMessage::Type t )
 		case GameMessage::MSG_DEBUG_HURT_OBJECT:
 		case GameMessage::MSG_DEBUG_KILL_OBJECT:
 		case GameMessage::MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS:
-		case GameMessage::MSG_META_DEMO_GIVE_ALL_SCIENCES:
 		case GameMessage::MSG_META_DEMO_GIVE_RANKLEVEL:
 		case GameMessage::MSG_META_DEMO_TAKE_RANKLEVEL:
 		case GameMessage::MSG_META_DEBUG_WIN:
@@ -1054,9 +1072,9 @@ void MessageStream::propagateMessages( void )
 	for( ss=m_firstTranslator; ss; ss=ss->m_next )
 	{
 		for( msg=m_firstMessage; msg; msg=next )
-		{			
-			if (ss->m_translator 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+		{
+			if (ss->m_translator
+#if defined(RTS_DEBUG)
 				&& !isInvalidDebugCommand(msg->getType())
 #endif
 				)
@@ -1067,8 +1085,8 @@ void MessageStream::propagateMessages( void )
 				{
 					deleteInstance(msg);
 				}
-			} 
-			else 
+			}
+			else
 			{
 				next = msg->next();
 			}
@@ -1114,7 +1132,7 @@ void CommandList::init( void )
 	// extend
 	GameMessageList::init();
 
-} 
+}
 
 /**
 	* Destroy all messages on the list, and reset list to empty
@@ -1154,20 +1172,20 @@ void CommandList::destroyAllMessages( void )
 		next = msg->next();
 		deleteInstance(msg);
 	}
-	
+
 	m_firstMessage = NULL;
 	m_lastMessage = NULL;
 
 }
 
-/** 
+/**
  * Adds messages to the end of TheCommandList.
- * Primarily used by TheMessageStream to put the final messages that reach the end of the 
- * stream on TheCommandList. Since TheGameClient will update faster than TheNetwork 
+ * Primarily used by TheMessageStream to put the final messages that reach the end of the
+ * stream on TheCommandList. Since TheGameClient will update faster than TheNetwork
  * and TheGameLogic, messages will accumulate on this list.
  */
-void CommandList::appendMessageList( GameMessage *list ) 
-{ 
+void CommandList::appendMessageList( GameMessage *list )
+{
 	GameMessage *msg, *next;
 
 	for( msg = list; msg; msg = next )
diff --git a/Generals/Code/GameEngine/Source/Common/MiniLog.cpp b/Generals/Code/GameEngine/Source/Common/MiniLog.cpp
index f23e97d2384..aba90df6968 100644
--- a/Generals/Code/GameEngine/Source/Common/MiniLog.cpp
+++ b/Generals/Code/GameEngine/Source/Common/MiniLog.cpp
@@ -27,7 +27,7 @@
 // Author: Matthew D. Campbell, January 2003
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/MiniLog.h"
 
 #ifdef DEBUG_LOGGING
@@ -36,19 +36,13 @@ LogClass::LogClass(const char *fname)
 {
 	char buffer[ _MAX_PATH ];
 	GetModuleFileName( NULL, buffer, sizeof( buffer ) );
-	char *pEnd = buffer + strlen( buffer );
-	while( pEnd != buffer )
+	if (char *pEnd = strrchr(buffer, '\\'))
 	{
-		if( *pEnd == '\\' )
-		{
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+		*pEnd = 0;
 	}
-	AsciiString fullPath;
-	fullPath.format("%s\\%s", buffer, fname);
-	m_fp = fopen(fullPath.str(), "wt");
+	// TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.
+	const std::string fullPath = std::string(buffer) + "\\" + fname;
+	m_fp = fopen(fullPath.c_str(), "wt");
 }
 
 LogClass::~LogClass()
diff --git a/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp b/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp
index d13d8f21809..f9ec094415b 100644
--- a/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp
+++ b/Generals/Code/GameEngine/Source/Common/MultiplayerSettings.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_TERRAIN_LOD_NAMES
 #define DEFINE_TIME_OF_DAY_NAMES
@@ -43,17 +43,17 @@ MultiplayerSettings *TheMultiplayerSettings = NULL;				///< The MultiplayerSetti
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-const FieldParse MultiplayerColorDefinition::m_colorFieldParseTable[] = 
+const FieldParse MultiplayerColorDefinition::m_colorFieldParseTable[] =
 {
 
 	{ "TooltipName",	INI::parseAsciiString,	NULL,	offsetof( MultiplayerColorDefinition, m_tooltipName ) },
 	{ "RGBColor",			INI::parseRGBColor,			NULL,	offsetof( MultiplayerColorDefinition, m_rgbValue ) },
 	{ "RGBNightColor",			INI::parseRGBColor,		NULL,	offsetof( MultiplayerColorDefinition, m_rgbValueNight ) },
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
+	{ NULL,					NULL,						NULL,						0 }
 
 };
 
-const FieldParse MultiplayerSettings::m_multiplayerSettingsFieldParseTable[] = 
+const FieldParse MultiplayerSettings::m_multiplayerSettingsFieldParseTable[] =
 {
 
 	{ "InitialCreditsMin",				INI::parseInt,	NULL,	offsetof( MultiplayerSettings, m_initialCreditsMin ) },
@@ -65,7 +65,7 @@ const FieldParse MultiplayerSettings::m_multiplayerSettingsFieldParseTable[] =
 	{ "ShowRandomStartPos",				INI::parseBool,	NULL,	offsetof( MultiplayerSettings, m_showRandomStartPos ) },
 	{ "ShowRandomColor",					INI::parseBool,	NULL,	offsetof( MultiplayerSettings, m_showRandomColor ) },
 
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
+	{ NULL,					NULL,						NULL,						0 }
 
 };
 
@@ -74,24 +74,17 @@ const FieldParse MultiplayerSettings::m_multiplayerSettingsFieldParseTable[] =
 MultiplayerSettings::MultiplayerSettings()
 {
 	m_initialCreditsMin = 5000;
-	
-	//Fixed And Added Code By Sadullah Nader
-	//DID U MEAN m_initialCreditsMax = 10000;?
-	//Initializations inserted
 	m_initialCreditsMax = 10000;
 	m_maxBeaconsPerPlayer = 3;
-	//
-
 	m_startCountdownTimerSeconds = 0;
 	m_numColors = 0;
 	m_isShroudInMultiplayer = TRUE;
 	m_showRandomPlayerTemplate = TRUE;
 	m_showRandomStartPos = TRUE;
 	m_showRandomColor = TRUE;
-	
 	m_observerColor;
 	m_randomColor;
-}  // end MultiplayerSettings
+}
 
 MultiplayerColorDefinition::MultiplayerColorDefinition()
 {
diff --git a/Generals/Code/GameEngine/Source/Common/NameKeyGenerator.cpp b/Generals/Code/GameEngine/Source/Common/NameKeyGenerator.cpp
index 639a6c5ab3f..f1efaf1b04b 100644
--- a/Generals/Code/GameEngine/Source/Common/NameKeyGenerator.cpp
+++ b/Generals/Code/GameEngine/Source/Common/NameKeyGenerator.cpp
@@ -28,12 +28,12 @@
 // Desc:      Name key system to translate between names and unique key ids
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // Public Data ////////////////////////////////////////////////////////////////////////////////////
 NameKeyGenerator *TheNameKeyGenerator = NULL;  ///< name key gen. singleton
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 NameKeyGenerator::NameKeyGenerator()
 {
 
@@ -42,18 +42,18 @@ NameKeyGenerator::NameKeyGenerator()
 	for (Int i = 0; i < SOCKET_COUNT; ++i)
 		m_sockets[i] = NULL;
 
-}  // end NameKeyGenerator
+}
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 NameKeyGenerator::~NameKeyGenerator()
 {
-	
+
 	// free all system data
 	freeSockets();
 
-}  // end ~NameKeyGenerator
+}
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 void NameKeyGenerator::init()
 {
 	DEBUG_ASSERTCRASH(m_nextID == (UnsignedInt)NAMEKEY_INVALID, ("NameKeyGen already inited"));
@@ -62,17 +62,17 @@ void NameKeyGenerator::init()
 	freeSockets();
 	m_nextID = 1;
 
-}  // end init
+}
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 void NameKeyGenerator::reset()
 {
 	freeSockets();
 	m_nextID = 1;
 
-}  // end reset
+}
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 void NameKeyGenerator::freeSockets()
 {
 	for (Int i = 0; i < SOCKET_COUNT; ++i)
@@ -86,29 +86,29 @@ void NameKeyGenerator::freeSockets()
 		m_sockets[i] = NULL;
 	}
 
-}  // end freeSockets
+}
 
-/* ------------------------------------------------------------------------ */
+//-------------------------------------------------------------------------------------------------
 inline UnsignedInt calcHashForString(const char* p)
 {
-	UnsignedInt result = 0; 
+	UnsignedInt result = 0;
 	Byte *pp = (Byte*)p;
-	while (*pp) 
-		result = (result << 5) + result + *pp++; 
+	while (*pp)
+		result = (result << 5) + result + *pp++;
 	return result;
 }
 
-/* ------------------------------------------------------------------------ */
+//-------------------------------------------------------------------------------------------------
 inline UnsignedInt calcHashForLowercaseString(const char* p)
 {
-	UnsignedInt result = 0; 
+	UnsignedInt result = 0;
 	Byte *pp = (Byte*)p;
-	while (*pp) 
-		result = (result << 5) + result + tolower(*pp++); 
+	while (*pp)
+		result = (result << 5) + result + tolower(*pp++);
 	return result;
 }
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 AsciiString NameKeyGenerator::keyToName(NameKeyType key)
 {
 	for (Int i = 0; i < SOCKET_COUNT; ++i)
@@ -122,78 +122,151 @@ AsciiString NameKeyGenerator::keyToName(NameKeyType key)
 	return AsciiString::TheEmptyString;
 }
 
-//------------------------------------------------------------------------------------------------- 
-NameKeyType NameKeyGenerator::nameToKey(const char* nameString)
+//-------------------------------------------------------------------------------------------------
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+// TheSuperHackers @info xezon 04/09/2025 This key reservation is required for CRC compatibility,
+// because the name keys are somehow CRC relevant. It was originally used by the file exist cache
+// of the file system in Zero Hour.
+Bool NameKeyGenerator::addReservedKey()
 {
-	Bucket *b;
+	switch (m_nextID)
+	{
+	case 97: nameToLowercaseKeyImpl("Data\\English\\Language9x.ini"); return true;
+	case 98: nameToLowercaseKeyImpl("Data\\Audio\\Tracks\\English\\GLA_02.mp3"); return true;
+	case 99: nameToLowercaseKeyImpl("Data\\Audio\\Tracks\\GLA_02.mp3"); return true;
+	}
+	return false;
+}
+#endif
 
-	UnsignedInt hash = calcHashForString(nameString) % SOCKET_COUNT;
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToKey(const AsciiString& name)
+{
+	const NameKeyType key = nameToKeyImpl(name);
+
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+	while (addReservedKey());
+#endif
+
+	return key;
+}
+
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToLowercaseKey(const AsciiString& name)
+{
+	const NameKeyType key = nameToLowercaseKeyImpl(name);
+
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+	while (addReservedKey());
+#endif
 
-	// hmm, do we have it already?
+	return key;
+}
+
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToKey(const char* name)
+{
+	const NameKeyType key = nameToKeyImpl(name);
+
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+	while (addReservedKey());
+#endif
+
+	return key;
+}
+
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToLowercaseKey(const char *name)
+{
+	const NameKeyType key = nameToLowercaseKeyImpl(name);
+
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+	while (addReservedKey());
+#endif
+
+	return key;
+}
+
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToKeyImpl(const AsciiString& name)
+{
+	const UnsignedInt hash = calcHashForString(name.str()) % SOCKET_COUNT;
+
+	// do we have it already?
+	const Bucket *b;
 	for (b = m_sockets[hash]; b; b = b->m_nextInSocket)
 	{
-		if (strcmp(nameString, b->m_nameString.str()) == 0)
-			return b->m_key; 
+		if (name.compare(b->m_nameString) == 0)
+			return b->m_key;
 	}
 
 	// nope, guess not. let's allocate it.
-	b = newInstance(Bucket);
-	b->m_key = (NameKeyType)m_nextID++;
-	b->m_nameString = nameString;
-	b->m_nextInSocket = m_sockets[hash];
-	m_sockets[hash] = b;
+	return createNameKey(hash, name);
+}
 
-	NameKeyType result = b->m_key;
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToLowercaseKeyImpl(const AsciiString& name)
+{
+	const UnsignedInt hash = calcHashForLowercaseString(name.str()) % SOCKET_COUNT;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	// reality-check to be sure our hasher isn't going bad.
-	const Int maxThresh = 3;
-	Int numOverThresh = 0;
-	for (Int i = 0; i < SOCKET_COUNT; ++i)
+	// do we have it already?
+	const Bucket *b;
+	for (b = m_sockets[hash]; b; b = b->m_nextInSocket)
 	{
-		Int numInThisSocket = 0;
-		for (b = m_sockets[i]; b; b = b->m_nextInSocket)
-			++numInThisSocket;
-
-		if (numInThisSocket > maxThresh)
-			++numOverThresh;
+		if (name.compareNoCase(b->m_nameString) == 0)
+			return b->m_key;
 	}
-	
-	// if more than a small percent of the sockets are getting deep, probably want to increase the socket count.
-	if (numOverThresh > SOCKET_COUNT/20)
+
+	// nope, guess not. let's allocate it.
+	return createNameKey(hash, name);
+}
+
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToKeyImpl(const char* name)
+{
+	const UnsignedInt hash = calcHashForString(name) % SOCKET_COUNT;
+
+	// do we have it already?
+	const Bucket *b;
+	for (b = m_sockets[hash]; b; b = b->m_nextInSocket)
 	{
-		DEBUG_CRASH(("hmm, might need to increase the number of bucket-sockets for NameKeyGenerator (numOverThresh %d = %f%%)\n",numOverThresh,(Real)numOverThresh/(Real)(SOCKET_COUNT/20)));
+		if (strcmp(name, b->m_nameString.str()) == 0)
+			return b->m_key;
 	}
-#endif
-
-	return result;
 
-}  // end nameToKey
+	// nope, guess not. let's allocate it.
+	return createNameKey(hash, name);
+}
 
-//------------------------------------------------------------------------------------------------- 
-NameKeyType NameKeyGenerator::nameToLowercaseKey(const char* nameString)
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToLowercaseKeyImpl(const char* name)
 {
-	Bucket *b;
-
-	UnsignedInt hash = calcHashForLowercaseString(nameString) % SOCKET_COUNT;
+	const UnsignedInt hash = calcHashForLowercaseString(name) % SOCKET_COUNT;
 
-	// hmm, do we have it already?
+	// do we have it already?
+	const Bucket *b;
 	for (b = m_sockets[hash]; b; b = b->m_nextInSocket)
 	{
-		if (_stricmp(nameString, b->m_nameString.str()) == 0)
-			return b->m_key; 
+		if (_stricmp(name, b->m_nameString.str()) == 0)
+			return b->m_key;
 	}
 
 	// nope, guess not. let's allocate it.
-	b = newInstance(Bucket);
+	return createNameKey(hash, name);
+}
+
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::createNameKey(UnsignedInt hash, const AsciiString& name)
+{
+	Bucket *b = newInstance(Bucket);
 	b->m_key = (NameKeyType)m_nextID++;
-	b->m_nameString = nameString;
+	b->m_nameString = name;
 	b->m_nextInSocket = m_sockets[hash];
 	m_sockets[hash] = b;
 
 	NameKeyType result = b->m_key;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	// reality-check to be sure our hasher isn't going bad.
 	const Int maxThresh = 3;
 	Int numOverThresh = 0;
@@ -206,28 +279,27 @@ NameKeyType NameKeyGenerator::nameToLowercaseKey(const char* nameString)
 		if (numInThisSocket > maxThresh)
 			++numOverThresh;
 	}
-	
+
 	// if more than a small percent of the sockets are getting deep, probably want to increase the socket count.
 	if (numOverThresh > SOCKET_COUNT/20)
 	{
-		DEBUG_CRASH(("hmm, might need to increase the number of bucket-sockets for NameKeyGenerator (numOverThresh %d = %f%%)\n",numOverThresh,(Real)numOverThresh/(Real)(SOCKET_COUNT/20)));
+		DEBUG_CRASH(("hmm, might need to increase the number of bucket-sockets for NameKeyGenerator (numOverThresh %d = %f%%)",numOverThresh,(Real)numOverThresh/(Real)(SOCKET_COUNT/20)));
 	}
 #endif
 
 	return result;
+}
 
-}  // end nameToLowercaseKey
-
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 // Get a string out of the INI. Store it into a NameKeyType
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 void NameKeyGenerator::parseStringAsNameKeyType( INI *ini, void *instance, void *store, const void* userData )
 {
   *(NameKeyType *)store = TheNameKeyGenerator->nameToKey( ini->getNextToken() );
 }
 
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 NameKeyType StaticNameKey::key() const
 {
 	if (m_key == NAMEKEY_INVALID)
diff --git a/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp b/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp
index 2996d5d506e..f33969a3b7e 100644
--- a/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp
+++ b/Generals/Code/GameEngine/Source/Common/PartitionSolver.cpp
@@ -39,17 +39,17 @@
 /**************************************************************************************************
 Some info about partioning problems:
 
-	This problem is contained in a very interesting class of problems known as NP complete. The 
-	basic problem is that there is no way to tell whether you have an optimal solution or not. 
-	Worst case, you try out every possible solution and still don't find the optimal solution: 
+	This problem is contained in a very interesting class of problems known as NP complete. The
+	basic problem is that there is no way to tell whether you have an optimal solution or not.
+	Worst case, you try out every possible solution and still don't find the optimal solution:
 	this takes 2^n time to find, where N is the number of elements you are attempting to place.
 	For this reason, a value near PREFER_FAST_SOLUTION should almost always be chosen. We will use
-	a flat multiply to determine how many solutions to attempt before giving up and returning our 
+	a flat multiply to determine how many solutions to attempt before giving up and returning our
 	best attempt. If you want more info, this site contains info on the problem:
 	http://odysseus.nat.uni-magdeburg.de/~mertens/npp/index.shtml
 **************************************************************************************************/
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PartitionSolver.h"
 
@@ -63,10 +63,7 @@ PartitionSolver::PartitionSolver(const EntriesVec& elements, const SpacesVec& sp
 	m_data = elements;
 	m_spacesForData = spaces;
 	m_howToSolve = solveHow;
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_currentSolutionLeftovers = 0;
-	//
 }
 
 void PartitionSolver::solve(void)
@@ -74,7 +71,7 @@ void PartitionSolver::solve(void)
 	m_bestSolution.clear();
 	m_currentSolution.clear();
 	m_currentSolutionLeftovers = 0x7fffffff;
-	
+
 	Int minSizeForAllData = 0;
 	Int slotsAllotted = 0;
 	size_t i, j;
@@ -92,22 +89,22 @@ void PartitionSolver::solve(void)
 	// out whole classes of solutions
 
 	std::sort(m_data.begin(), m_data.end(), greater_than);
-	
+
 	// Also make the largest partition first.
 	std::sort(m_spacesForData.begin(), m_spacesForData.end(), greater_than);
 
 	// work in our temporary vector.
 	SpacesVec spacesStillAvailable = m_spacesForData;
-	
-	if (m_howToSolve == PREFER_FAST_SOLUTION) 
+
+	if (m_howToSolve == PREFER_FAST_SOLUTION)
 	{
 		// we prefer the fast, but not necessarily correct solution
 		// simply start placing the stuff. Skip things you can't place.
-		for (i = 0; i < m_data.size(); ++i) 
+		for (i = 0; i < m_data.size(); ++i)
 		{
-			for (j = 0; j < spacesStillAvailable.size(); ++j) 
+			for (j = 0; j < spacesStillAvailable.size(); ++j)
 			{
-				if (m_data[i].second <= spacesStillAvailable[j].second) 
+				if (m_data[i].second <= spacesStillAvailable[j].second)
 				{
 					spacesStillAvailable[j].second -= m_data[i].second;
 					m_bestSolution.push_back(std::make_pair(m_data[i].first, spacesStillAvailable[j].first));
@@ -123,4 +120,4 @@ void PartitionSolver::solve(void)
 const SolutionVec& PartitionSolver::getSolution( void ) const
 {
 	return m_bestSolution;
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp
index 91e9fb8774b..1505f846194 100644
--- a/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp
+++ b/Generals/Code/GameEngine/Source/Common/PerfTimer.cpp
@@ -23,10 +23,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: PerfTimer.cpp ///////////////////////////////////////////////////////////////////////////
-// Author: 
+// Author:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 
@@ -36,11 +36,6 @@
 #include "GameClient/GraphDraw.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -69,8 +64,8 @@ void InitPrecisionTimer()
 	Int64 totalTime = 0;
 	Int64	TotalTicks = 0;
 	static int TESTS = 5;
-	
-	for (int i = 0; i < TESTS; ++i) 
+
+	for (int i = 0; i < TESTS; ++i)
 	{
 		int        TimeStart;
 		int        TimeStop;
@@ -115,7 +110,7 @@ void InitPrecisionTimer()
 		GetPrecisionTimer(&bogus[7]);
 	}
 	TheTicksToGetTicks = (bogus[7] - start) / (ITERS*8);
-	DEBUG_LOG(("TheTicksToGetTicks is %d (%f usec)\n",(int)TheTicksToGetTicks,TheTicksToGetTicks/s_ticksPerUSec));
+	DEBUG_LOG(("TheTicksToGetTicks is %d (%f usec)",(int)TheTicksToGetTicks,TheTicksToGetTicks/s_ticksPerUSec));
 #endif
 
 }
@@ -149,9 +144,9 @@ class PerfMetricsOutput
 
 	AsciiString& getStatsString(const AsciiString& id)
 	{
-		for (int i = 0; i < m_outputStats.size(); ++i) 
+		for (int i = 0; i < m_outputStats.size(); ++i)
 		{
-			if (m_outputStats[i].first == id) 
+			if (m_outputStats[i].first == id)
 				return m_outputStats[i].second;
 		}
 		std::pair<AsciiString, AsciiString> newPair;
@@ -162,9 +157,9 @@ class PerfMetricsOutput
 
 	void clearStatsString(const AsciiString& id)
 	{
-		for (int i = 0; i < m_outputStats.size(); ++i) 
+		for (int i = 0; i < m_outputStats.size(); ++i)
 		{
-			if (m_outputStats[i].first == id) 
+			if (m_outputStats[i].first == id)
 			{
 				m_outputStats.erase(&m_outputStats[i]);
 				return;
@@ -228,19 +223,16 @@ void PerfGather::removeFromList()
 }
 
 //-------------------------------------------------------------------------------------------------
-PerfGather::PerfGather(const char *identifier) : 
-	m_identifier(identifier), 
-	m_startTime(0), 
-	m_runningTimeGross(0), 
-	m_runningTimeNet(0), 
+PerfGather::PerfGather(const char *identifier) :
+	m_identifier(identifier),
+	m_startTime(0),
+	m_runningTimeGross(0),
+	m_runningTimeNet(0),
 	m_callCount(0),
 	m_next(0),
 	m_prev(0)
 {
-	//Added By Sadullah Nader
-	//Initializations inserted 
 	m_ignore = FALSE;
-	//
 	DEBUG_ASSERTCRASH(strchr(m_identifier, ',') == NULL, ("PerfGather names must not contain commas"));
 	addToList();
 }
@@ -274,11 +266,12 @@ void PerfGather::reset()
 {
 	PerfGather::termPerfDump();
 
-	strcpy(s_buf, fname);
+	strlcpy(s_buf, fname, ARRAY_SIZE(s_buf);
 
 	char tmp[256];
+	static_assert(ARRAY_SIZE(tmp) >= ARRAY_SIZE(s_buf), "Incorrect array size");
 	strcpy(tmp, s_buf);
-	strcat(tmp, ".csv");
+	strlcat(tmp, ".csv", ARRAY_SIZE(tmp));
 
 	s_perfStatsFile = fopen(tmp, "w");
 	s_perfDumpOptions = options;
@@ -288,7 +281,7 @@ void PerfGather::reset()
 		DEBUG_CRASH(("could not open/create perf file %s -- is it open in another app?",s_buf));
 		return;
 	}
-	
+
 	if (s_stopStartOverhead == -1)
 	{
 		const Int ITERS = 100000;
@@ -308,7 +301,7 @@ void PerfGather::reset()
 		}
 		GetPrecisionTimer(&end);
 		s_stopStartOverhead = (end - start) / (ITERS*8);
-		DEBUG_LOG(("s_stopStartOverhead is %d (%f usec)\n",(int)s_stopStartOverhead,s_stopStartOverhead/s_ticksPerUSec));
+		DEBUG_LOG(("s_stopStartOverhead is %d (%f usec)",(int)s_stopStartOverhead,s_stopStartOverhead/s_ticksPerUSec));
 	}
 }
 
@@ -317,7 +310,7 @@ void PerfGather::reset()
 {
 	if (frame < s_lastDumpedFrame)
 	{
-		// must have reset or started a new game. 
+		// must have reset or started a new game.
 		termPerfDump();
 		initPerfDump(s_buf, s_perfDumpOptions);
 	}
@@ -360,7 +353,7 @@ void PerfGather::reset()
 			}
 			fprintf(s_perfStatsFile, "\n");
 		}
-		
+
 		// a strange value so we can find it in the dump, if necessary.
 		// there's nothing magic about this value, it's purely determined from sample dumps...
 //		const Real CLIP_BIG_SPIKES = 1e10f;
@@ -408,7 +401,7 @@ void PerfGather::reset()
 }
 
 //-------------------------------------------------------------------------------------------------
-// This function will queue up stuff to draw on the next frame. We also need to adjust the 
+// This function will queue up stuff to draw on the next frame. We also need to adjust the
 // perf timers to not include time spent paused by the script engine.
 /*static*/ void PerfGather::displayGraph(UnsignedInt frame)
 {
@@ -421,7 +414,7 @@ void PerfGather::reset()
 		// always skip the first second or so, since it loads everything and skews the results horribly
 	}
 	else
-	{	
+	{
 		const Real CLIP_BIG_SPIKES = 100000.0f;
 
 		if (s_perfDumpOptions & PERF_GROSSTIME)
@@ -444,7 +437,7 @@ void PerfGather::reset()
 				t /= s_ticksPerUSec;
 				if (t > CLIP_BIG_SPIKES)
 					t = CLIP_BIG_SPIKES;
-				
+
 				TheGraphDraw->addEntry(head->m_identifier, REAL_TO_INT(t));
 			}
 		}
@@ -454,7 +447,7 @@ void PerfGather::reset()
 			{
 				Real t = head->m_callCount;
 				TheGraphDraw->addEntry(head->m_identifier, REAL_TO_INT(t));
-				
+
 			}
 		}
 	}
@@ -478,15 +471,13 @@ void PerfGather::reset()
 
 //-------------------------------------------------------------------------------------------------
 PerfTimer::PerfTimer( const char *identifier, Bool crashWithInfo, Int startFrame, Int endFrame) :
-	m_identifier(identifier), 
-	m_crashWithInfo(crashWithInfo), 
-	m_startFrame(startFrame), 
+	m_identifier(identifier),
+	m_crashWithInfo(crashWithInfo),
+	m_startFrame(startFrame),
 	m_endFrame(endFrame),
 	m_callCount(0),
 	m_runningTime(0),
 	m_outputInfo(true),
-	//Added By Sadullah Nader
-	//Intializations inserted
 	m_lastFrame(-1)
 {
 }
@@ -517,7 +508,7 @@ void PerfTimer::outputInfo( void )
 		return;
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	double totalTimeInMS = 1000.0 * m_runningTime / s_ticksPerSec;
 	double avgTimePerFrame = totalTimeInMS / (m_lastFrame - m_startFrame + 1);
 	double avgTimePerCall = totalTimeInMS / m_callCount;
@@ -525,29 +516,29 @@ void PerfTimer::outputInfo( void )
 
 	if (m_crashWithInfo) {
 		DEBUG_CRASH(("%s\n"
-								 "Average Time (per call): %.4f ms\n" 
+								 "Average Time (per call): %.4f ms\n"
 								 "Average Time (per frame): %.4f ms\n"
 								 "Average calls per frame: %.2f\n"
 								 "Number of calls: %d\n"
-								 "Max possible FPS: %.4f\n",
-								 m_identifier, 
+								 "Max possible FPS: %.4f",
+								 m_identifier,
 								 avgTimePerCall,
 								 avgTimePerFrame,
 								 1.0f * m_callCount / (m_lastFrame - m_startFrame + 1),
-								 m_callCount,								 
+								 m_callCount,
 								 1000.0f / avgTimePerFrame));
 	} else {
 		DEBUG_LOG(("%s\n"
-								 "Average Time (per call): %.4f ms\n" 
+								 "Average Time (per call): %.4f ms\n"
 								 "Average Time (per frame): %.4f ms\n"
 								 "Average calls per frame: %.2f\n"
 								 "Number of calls: %d\n"
-								 "Max possible FPS: %.4f\n",
-								 m_identifier, 
+								 "Max possible FPS: %.4f",
+								 m_identifier,
 								 avgTimePerCall,
 								 avgTimePerFrame,
 								 1.0f * m_callCount / (m_lastFrame - m_startFrame + 1),
-								 m_callCount,								 
+								 m_callCount,
 								 1000.0f / avgTimePerFrame));
 	}
 }
@@ -555,7 +546,7 @@ void PerfTimer::outputInfo( void )
 //-------------------------------------------------------------------------------------------------
 void PerfTimer::showMetrics( void )
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	double totalTimeInMS = 1000.0 * m_runningTime / s_ticksPerSec;
 	double avgTimePerFrame = totalTimeInMS / (m_lastFrame - m_startFrame + 1);
 	double avgTimePerCall = totalTimeInMS / m_callCount;
@@ -564,9 +555,9 @@ void PerfTimer::showMetrics( void )
 	// we want to work on the thing in the array, so just store a reference.
 	AsciiString &outputStats = s_output.getStatsString(m_identifier);
 
-	outputStats.format("%s: %.2fms / call, %.2fms / frame \n", 
-											m_identifier, 
-											avgTimePerCall,											
+	outputStats.format("%s: %.2fms / call, %.2fms / frame \n",
+											m_identifier,
+											avgTimePerCall,
 											avgTimePerFrame);
 	m_callCount = 0;
 	m_runningTime = 0;
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp
index 7eb26c8cb83..d588bc3cf89 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp
@@ -24,16 +24,16 @@
 
 // FILE: ActionManager.cpp ////////////////////////////////////////////////////////////////////////
 // Author: Colin Day
-// Desc:   TheActionManager is a convenient place for us to wrap up all sorts of logical 
+// Desc:   TheActionManager is a convenient place for us to wrap up all sorts of logical
 //				 queries about what objects can do in the world and to other objects.  The purpose
 //				 of having a central place for this logic assists us in making these logical kind
 //				 of queries in the user interface and allows us to use the same code to validate
-//				 commands as they come in over the network interface in order to do the 
+//				 commands as they come in over the network interface in order to do the
 //				 real action.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/GlobalData.h"
@@ -64,11 +64,6 @@
 
 #include "GameLogic/ExperienceTracker.h"//LORENZEN
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // GLOBAL /////////////////////////////////////////////////////////////////////////////////////////
 ActionManager *TheActionManager = NULL;
@@ -106,14 +101,14 @@ static Bool isObjectShroudedForAction ( const Object *source, const Object *targ
 	// GS Keeping this comment to show we now have commandSource, so everything should be fine again.
 
 	// The target is only shrouded for action if...
-	
+
 	// the asking player is human
 	// the asking impetus is not from a script
 	// and the target object is Fogged or worse
 
-	if( source && target && source->getControllingPlayer() ) 
+	if( source && target && source->getControllingPlayer() )
 	{
-		if( source->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN 
+		if( source->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN
 			&& commandSource != CMD_FROM_SCRIPT
 			&& target->getShroudedStatus( source->getControllingPlayer()->getPlayerIndex() ) >= OBJECTSHROUD_FOGGED
 			)
@@ -132,18 +127,18 @@ static Bool isObjectShroudedForAction ( const Object *source, const Object *targ
 ActionManager::ActionManager( void )
 {
 
-}  // end ActionManager
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 ActionManager::~ActionManager( void )
 {
 
-}  // end ~ActionManager
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Bool ActionManager::canGetRepairedAt( const Object *obj, const Object *repairDest, CommandSourceType commandSource ) 
+Bool ActionManager::canGetRepairedAt( const Object *obj, const Object *repairDest, CommandSourceType commandSource )
 {
 
 	// sanity
@@ -168,7 +163,7 @@ Bool ActionManager::canGetRepairedAt( const Object *obj, const Object *repairDes
 	// Can't get repaired at something being sold
 	if( repairDest->testStatus(OBJECT_STATUS_SOLD) )
 		return FALSE;
-	
+
 	// only vehicles can go get repaired at something
 	if( obj->isKindOf( KINDOF_VEHICLE ) == FALSE )
 		return FALSE;
@@ -199,12 +194,12 @@ Bool ActionManager::canGetRepairedAt( const Object *obj, const Object *repairDes
 	// all is well, we can be repaired here
 	return TRUE;
 
-}  // end canGetRepairedAt
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 // note that "dest" is typically a building...
-Bool ActionManager::canTransferSuppliesAt( const Object *obj, const Object *transferDest ) 
+Bool ActionManager::canTransferSuppliesAt( const Object *obj, const Object *transferDest )
 {
 
 	// sanity
@@ -224,7 +219,7 @@ Bool ActionManager::canTransferSuppliesAt( const Object *obj, const Object *tran
 	// Can't transfer at something being sold
 	if( transferDest->testStatus(OBJECT_STATUS_SOLD) )
 		return FALSE;
-	
+
 	// I must be something with a Supply Transfering AI interface
 	const AIUpdateInterface *ai= obj->getAI();
 	if( ai == NULL )
@@ -262,13 +257,13 @@ Bool ActionManager::canTransferSuppliesAt( const Object *obj, const Object *tran
 	// if the target is in the shroud, we can't do anything
 //	if (isObjectShroudedForAction(obj, transferDest))
 //		return FALSE;
-	//Commented out to show it is an intentional difference to most commands.  
+	//Commented out to show it is an intentional difference to most commands.
 
 	// Fogged is okay for player, and anything is okay for AI.
 	Player *objPlayer = obj->getControllingPlayer();
 	if( objPlayer )
 	{
-		if( objPlayer->getPlayerType() == PLAYER_HUMAN && 
+		if( objPlayer->getPlayerType() == PLAYER_HUMAN &&
 			transferDest->getShroudedStatus( objPlayer->getPlayerIndex() ) == OBJECTSHROUD_SHROUDED )
 		{
 			return FALSE;
@@ -278,7 +273,7 @@ Bool ActionManager::canTransferSuppliesAt( const Object *obj, const Object *tran
 	// all is well, we can transfer here
 	return TRUE;
 
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Can object 'obj' dock with object 'dockDest' for any reason */
@@ -315,16 +310,16 @@ Bool ActionManager::canDockAt( const Object *obj, const Object *dockDest, Comman
 		if( obj->isKindOf( KINDOF_VEHICLE ) || obj->isKindOf( KINDOF_INFANTRY ) )
 			return TRUE;
 
-	}  // end if
+	}
 
 	// cannot dock
 	return FALSE;
 
-}  // end canDockAt
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Bool ActionManager::canGetHealedAt( const Object *obj, const Object *healDest, CommandSourceType commandSource ) 
+Bool ActionManager::canGetHealedAt( const Object *obj, const Object *healDest, CommandSourceType commandSource )
 {
 
 	// sanity
@@ -349,7 +344,7 @@ Bool ActionManager::canGetHealedAt( const Object *obj, const Object *healDest, C
 	// Can't get healed at something being sold
 	if( healDest->testStatus(OBJECT_STATUS_SOLD) )
 		return FALSE;
-	
+
 	// only infantry can go get "healed" somewhere (vehicles get "repaired")
 	if( obj->isKindOf( KINDOF_INFANTRY ) == FALSE )
 		return FALSE;
@@ -361,7 +356,7 @@ Bool ActionManager::canGetHealedAt( const Object *obj, const Object *healDest, C
 	// if the target is in the shroud, we can't do anything
 	if (isObjectShroudedForAction(obj, healDest, commandSource))
 		return FALSE;
-	
+
 	BodyModuleInterface *body = obj->getBodyModule();
 	if( body && body->getHealth() == body->getMaxHealth() )
 	{
@@ -372,11 +367,11 @@ Bool ActionManager::canGetHealedAt( const Object *obj, const Object *healDest, C
 	// all is well, we can be healed here
 	return TRUE;
 
-}  // end canGetHealedAt
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Bool ActionManager::canRepairObject( const Object *obj, const Object *objectToRepair, CommandSourceType commandSource ) 
+Bool ActionManager::canRepairObject( const Object *obj, const Object *objectToRepair, CommandSourceType commandSource )
 {
 
 	// sanity
@@ -436,18 +431,18 @@ Bool ActionManager::canRepairObject( const Object *obj, const Object *objectToRe
 	if( obj->getContainedBy() )
 	{
 		// We can't heal things while in a transport (especially our own transport, you cheater)
-		return FALSE; 
+		return FALSE;
 	}
 
 	return TRUE;
 
-}  // end canRepair
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Can 'obj' resume the construction of 'objectBeingConstructed' */
 // ------------------------------------------------------------------------------------------------
-Bool ActionManager::canResumeConstructionOf( const Object *obj, 
-																						 const Object *objectBeingConstructed, 
+Bool ActionManager::canResumeConstructionOf( const Object *obj,
+																						 const Object *objectBeingConstructed,
 																						 CommandSourceType commandSource )
 {
 
@@ -484,12 +479,12 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj,
 	if( builder )
 	{
 		AIUpdateInterface *ai = builder->getAI();
-		DEBUG_ASSERTCRASH( ai, ("Builder object does not have an AI interface!\n") );
+		DEBUG_ASSERTCRASH( ai, ("Builder object does not have an AI interface!") );
 
 		if( ai )
 		{
 			DozerAIInterface *dozerAI = ai->getDozerAIInterface();
-			DEBUG_ASSERTCRASH( dozerAI, ("Builder object doest not have a DozerAI interface!\n") );
+			DEBUG_ASSERTCRASH( dozerAI, ("Builder object doest not have a DozerAI interface!") );
 
 			if( dozerAI )
 			{
@@ -498,11 +493,11 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj,
 						dozerAI->getTaskTarget( DOZER_TASK_BUILD ) == objectBeingConstructed->getID() )
 					return FALSE;
 
-			}  // end if
+			}
 
-		}  // en dif
+		}
 
-	}  //end if
+	}
 
 	// if the target is in the shroud, we can't do anything
 	if (isObjectShroudedForAction(obj, objectBeingConstructed, commandSource))
@@ -515,7 +510,7 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj,
 
 	return TRUE;
 
-}  // end canResumeConstructionOf
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -525,7 +520,7 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 	// sanity
 	if( obj == NULL || objectToEnter == NULL )
 		return FALSE;
-	
+
 	if( obj == objectToEnter )
 	{
 		//You can't contain yourself (crash fix for pow truck reselection)
@@ -546,15 +541,15 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 	{
 		return FALSE;
 	}
-	
+
 	// Can't enter something being sold
 	if( objectToEnter->testStatus(OBJECT_STATUS_SOLD) )
 		return FALSE;
 	if ( obj->isKindOf( KINDOF_IGNORED_IN_GUI )  //As in, Angry Mob Members, Cargo Planes
-		|| obj->isKindOf( KINDOF_MOB_NEXUS )   
+		|| obj->isKindOf( KINDOF_MOB_NEXUS )
 		|| objectToEnter->isKindOf( KINDOF_IGNORED_IN_GUI ) )  // As in Cargo Planes
-	{																					
-																						
+	{
+
 		return FALSE;
 	}
 
@@ -575,7 +570,7 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 	{
 		if (!obj->isAboveTerrain())
 			return FALSE;
-		
+
 		if( obj->getControllingPlayer() == objectToEnter->getControllingPlayer() )
 		{
 			//Kris -- added code to prevent aircraft from landing in any airstrips other than their own!
@@ -589,7 +584,7 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 
 				if (pp->hasReservedSpace(obj->getID()))
 					return TRUE;
-						
+
 				if (pp->shouldReserveDoorWhenQueued(obj->getTemplate()) && pp->hasAvailableSpaceFor(obj->getTemplate()))
 					return TRUE;
 			}
@@ -610,12 +605,12 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 			//getting to any of the other checks. The key is that it usually doesn't return
 			//TRUE because most things aren't trying to collide with objects. This is different
 			//for terrorist converting carbombs, and pilots entering vehicles. In these cases,
-			//the vehicles don't have transport capacities, therefore returning true here 
+			//the vehicles don't have transport capacities, therefore returning true here
 			//foregoes that checking later on.
 			return TRUE;
 		}
 	}
-	
+
 #ifdef ALLOW_SURRENDER
 	if( objectToEnter->isKindOf( KINDOF_PRISON ) )
 	{
@@ -644,7 +639,7 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 		BodyModuleInterface *body = obj->getBodyModule();
 		if( body->getHealth() == body->getMaxHealth() )
 		{
-			//This container is only used for the purposes of healing and we cannot 
+			//This container is only used for the purposes of healing and we cannot
 			//enter it with full health. This is not a normal container.
 			return FALSE;
 		}
@@ -674,7 +669,7 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 			// faction structure... can't do it.
 			if (objectToEnter->isFactionStructure())
 				return FALSE;
-			
+
 			// it's stealth-garrisoned... ignore check-cap and fall thru to
 			// normal isValid test.
 			if (stealthContainCount > 0 && nonStealthContainCount == 0)
@@ -685,7 +680,7 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 		/// @todo srj -- seems like we should check always (not just for checkCap), but scared to change now -- check later
 		if( checkCapacity && obj->getTransportSlotCount() == 0 )
 		{
-			return FALSE;		
+			return FALSE;
 		}
 
 		// finally: make sure that objectToEnter is a valid container for obj
@@ -743,7 +738,7 @@ CanAttackResult ActionManager::getCanAttackObject( const Object *obj, const Obje
 		{
 			//We found the spawn interface, now get the closest slave to the target.
 			Object *slave = spawnInterface->getClosestSlave( objectToAttack->getPosition() );
-			
+
 			if( slave )
 			{
 				result = slave->getAbleToAttackSpecificObject( attackType, objectToAttack, commandSource );
@@ -760,7 +755,7 @@ CanAttackResult ActionManager::getCanAttackObject( const Object *obj, const Obje
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Bool ActionManager::canConvertObjectToCarBomb( const Object *obj, const Object *objectToConvert, CommandSourceType commandSource ) 
+Bool ActionManager::canConvertObjectToCarBomb( const Object *obj, const Object *objectToConvert, CommandSourceType commandSource )
 {
 
 	// sanity
@@ -837,7 +832,7 @@ Bool ActionManager::canHijackVehicle( const Object *obj, const Object *objectToH
 	//{
 	//	return FALSE;
 	//}
-	
+
 	//Kris -- Hijackers can no longer hijack any aircraft.
 	if( objectToHijack->isKindOf( KINDOF_AIRCRAFT ) )
 	{
@@ -852,7 +847,7 @@ Bool ActionManager::canHijackVehicle( const Object *obj, const Object *objectToH
 //		return FALSE;
 //	}
 
-	// last, see if we'd like to collide with 'objectToHijack' 
+	// last, see if we'd like to collide with 'objectToHijack'
 	for (BehaviorModule** m = obj->getBehaviorModules(); *m; ++m)
 	{
 		CollideModuleInterface* collide = (*m)->getCollide();
@@ -981,7 +976,7 @@ Bool ActionManager::canCaptureBuilding( const Object *obj, const Object *objectT
 		return false;
 
 	//If the enemy unit is stealthed and not detected, then we can't capture it!
-	if( objectToCapture->testStatus( OBJECT_STATUS_STEALTHED ) && 
+	if( objectToCapture->testStatus( OBJECT_STATUS_STEALTHED ) &&
 			!objectToCapture->testStatus( OBJECT_STATUS_DETECTED ) )
 	{
 		return FALSE;
@@ -1032,7 +1027,7 @@ Bool ActionManager::canDisableVehicleViaHacking( const Object *obj, const Object
 //	if ( cashSPI && cashSPI->isBusy() )
 //		return FALSE;
 
-	
+
 	SpecialPowerModuleInterface *spInterface = obj->findSpecialPowerModuleInterface( SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK );
 	if (checkSourceRequirements)
 	{
@@ -1070,7 +1065,7 @@ Bool ActionManager::canDisableVehicleViaHacking( const Object *obj, const Object
 		}
 
 		//If the enemy unit is stealthed and not detected, then we can't attack it!
-	if( objectToHack->testStatus( OBJECT_STATUS_STEALTHED ) && 
+	if( objectToHack->testStatus( OBJECT_STATUS_STEALTHED ) &&
 			!objectToHack->testStatus( OBJECT_STATUS_DETECTED ) )
 		{
 			return FALSE;
@@ -1127,7 +1122,7 @@ Bool ActionManager::canPickUpPrisoner( const Object *obj, const Object *prisoner
 
 	return TRUE;
 
-}  // end canPickUpPrisoner
+}
 #endif
 
 // ------------------------------------------------------------------------------------------------
@@ -1185,13 +1180,13 @@ Bool ActionManager::canStealCashViaHacking( const Object *obj, const Object *obj
 		{
 			return FALSE;
 		}
-		
+
 		//Make sure object isn't under construction!
 		if( objectToHack->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 		{
 			return FALSE;
 		}
-		
+
 		//Make sure the building is considered hackable (temp: using capturable)
 		if( !objectToHack->isKindOf( KINDOF_CAPTURABLE ) || objectToHack->isKindOf( KINDOF_REBUILD_HOLE ) )
 		{
@@ -1199,7 +1194,7 @@ Bool ActionManager::canStealCashViaHacking( const Object *obj, const Object *obj
 		}
 
 		//If the enemy unit is stealthed and not detected, then we can't attack it!
-	if( objectToHack->testStatus( OBJECT_STATUS_STEALTHED ) && 
+	if( objectToHack->testStatus( OBJECT_STATUS_STEALTHED ) &&
 			!objectToHack->testStatus( OBJECT_STATUS_DETECTED ) )
 		{
 			return FALSE;
@@ -1228,7 +1223,7 @@ Bool ActionManager::canDisableBuildingViaHacking( const Object *obj, const Objec
 	{
 		return FALSE;
 	}
-	
+
 	SpecialPowerModuleInterface *spInterface = obj->findSpecialPowerModuleInterface( SPECIAL_HACKER_DISABLE_BUILDING );
 	if( !spInterface || spInterface->getPercentReady() < 1.0f )
 	{
@@ -1265,13 +1260,13 @@ Bool ActionManager::canDisableBuildingViaHacking( const Object *obj, const Objec
 		return FALSE;
 	}
 
-	
+
 	if ( objectToHack->isKindOf( KINDOF_REBUILD_HOLE ) || objectToHack->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ))
 		return FALSE;
 
 
 	//If the enemy unit is stealthed and not detected, then we can't attack it!
-	if( objectToHack->testStatus( OBJECT_STATUS_STEALTHED ) && 
+	if( objectToHack->testStatus( OBJECT_STATUS_STEALTHED ) &&
 			!objectToHack->testStatus( OBJECT_STATUS_DETECTED ) )
 	{
 		return FALSE;
@@ -1341,7 +1336,7 @@ Bool ActionManager::canSnipeVehicle( const Object *obj, const Object *objectToSn
 
 		return TRUE;
 	}
-	
+
 	return FALSE;
 }
 
@@ -1456,7 +1451,7 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 	}
 
 	Relationship r = obj->getRelationship(target);
-	
+
 	SpecialPowerModuleInterface *mod = obj->getSpecialPowerModule( spTemplate );
 	if( mod )
 	{
@@ -1494,7 +1489,7 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 				break;
 
 			case SPECIAL_HACKER_DISABLE_BUILDING:
-				//Can only disable buildings... 
+				//Can only disable buildings...
 				if( target->isKindOf( KINDOF_STRUCTURE ) && r == ENEMIES )
 				{
 					//Make sure the building is considered hackable (temp: using capturable)
@@ -1505,19 +1500,19 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 					return true;
 				}
 				break;
-			
+
 			case SPECIAL_INFANTRY_CAPTURE_BUILDING:
 			case SPECIAL_BLACKLOTUS_CAPTURE_BUILDING:
 				return canCaptureBuilding( obj, target, commandSource );
 
 			case SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK:
 				return canDisableVehicleViaHacking( obj, target, commandSource, false );
-				
+
 			case SPECIAL_BLACKLOTUS_STEAL_CASH_HACK:
 				return canStealCashViaHacking( obj, target, commandSource );
 
 			case SPECIAL_CASH_HACK:
-				//Can only disable enemy supply centers. 
+				//Can only disable enemy supply centers.
 				if( target->isKindOf( KINDOF_STRUCTURE ) && r == ENEMIES )
 				{
 					//Make sure the building is considered hackable (temp: using capturable)
@@ -1525,13 +1520,13 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 					{
 						return FALSE;
 					}
-					
+
 					//Can't cash hack a building that's under construction.
 					if( target->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 					{
 						return FALSE;
 					}
-					
+
 					if (target->isKindOf( KINDOF_CASH_GENERATOR ) )
 					{
 						return true;
@@ -1567,7 +1562,7 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 // "attack" Mines to disarm them...
 //				if ( target->isKindOf( KINDOF_CAN_ATTACK ) )
 					{
-						//neutral or same-team units are worthless defectors 
+						//neutral or same-team units are worthless defectors
 						if( r == ENEMIES )
 						{
 							return canMakeObjectDefector( obj, target, commandSource );
@@ -1645,7 +1640,7 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 							{
 								return false;
 							}
-						
+
 							return true;
 						}
 					}
@@ -1673,7 +1668,7 @@ Bool ActionManager::canDoSpecialPower( const Object *obj, const SpecialPowerTemp
 	SpecialPowerModuleInterface *mod = obj->getSpecialPowerModule( spTemplate );
 	if( mod )
 	{
-		if (checkSourceRequirements) 
+		if (checkSourceRequirements)
 		{
 			if( mod->getPercentReady() < 1.0f )
 			{
@@ -1761,7 +1756,7 @@ Bool ActionManager::canFireWeaponAtObject( const Object *obj, const Object *targ
 	//}
 
 	CanAttackResult result = obj->getAbleToAttackSpecificObject( ATTACK_NEW_TARGET, target, commandSource );
-	
+
 	if( result == ATTACKRESULT_POSSIBLE || result == ATTACKRESULT_POSSIBLE_AFTER_MOVING )
 	{
 		return weapon->estimateWeaponDamage( obj, target ) != 0.0f;
@@ -1786,7 +1781,7 @@ Bool ActionManager::canFireWeapon( const Object *obj, const WeaponSlotType slot,
 	}
 
 	return true;
-	
+
 }
 
 //------------------------------------------------------------------------------------------------
@@ -1803,11 +1798,11 @@ Bool ActionManager::canGarrison( const Object *obj, const Object *target, Comman
 		return false;
 
 	ContainModuleInterface *objCMI = obj->getContain();
-	if (!objCMI) 
+	if (!objCMI)
 		return false;
 
 	ContainModuleInterface *cmi = target->getContain();
-	if (cmi == NULL) 
+	if (cmi == NULL)
 		return false;
 
 	if (cmi->isGarrisonable() == false)
@@ -1832,7 +1827,7 @@ Bool ActionManager::canPlayerGarrison( const Player *player, const Object *targe
 {
 	if (!(player && target))
 		return false;
-	
+
 	if (target->isEffectivelyDead()) {
 		return false;
 	}
@@ -1841,7 +1836,7 @@ Bool ActionManager::canPlayerGarrison( const Player *player, const Object *targe
 		return false;
 
 	ContainModuleInterface *cmi = target->getContain();
-	if (cmi == NULL) 
+	if (cmi == NULL)
 		return false;
 
 	if (cmi->isGarrisonable() == false)
@@ -1858,7 +1853,7 @@ Bool ActionManager::canPlayerGarrison( const Player *player, const Object *targe
 		return cmi->getContainCount() == 0;
 	}
 
-	return false;	
+	return false;
 }
 
 //------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Energy.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Energy.cpp
index 711568b020f..f321b4b463d 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/Energy.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/Energy.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Energy.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,7 +42,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Energy.h"
 #include "Common/Player.h"
@@ -51,11 +51,6 @@
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 Energy::Energy()
@@ -67,14 +62,14 @@ Energy::Energy()
 
 //-----------------------------------------------------------------------------
 Int Energy::getProduction() const
-{ 
-	return m_energyProduction; 
+{
+	return m_energyProduction;
 }
 
 //-----------------------------------------------------------------------------
-Real Energy::getEnergySupplyRatio() const 
-{ 
-	DEBUG_ASSERTCRASH(m_energyProduction >= 0 && m_energyConsumption >= 0, ("neg Energy numbers\n"));
+Real Energy::getEnergySupplyRatio() const
+{
+	DEBUG_ASSERTCRASH(m_energyProduction >= 0 && m_energyConsumption >= 0, ("neg Energy numbers"));
 
 	if (m_energyConsumption == 0)
 		return (Real)m_energyProduction;
@@ -96,7 +91,7 @@ void Energy::adjustPower(Int powerDelta, Bool adding)
 	}
 
 	if (powerDelta > 0) {
-		if (adding) { 
+		if (adding) {
 			addProduction(powerDelta);
 		} else {
 			addProduction(-powerDelta);
@@ -131,11 +126,11 @@ void Energy::objectEnteringInfluence( Object *obj )
 		addProduction( energy );
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0, 
+	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0,
 										 ("Energy - Negative Energy numbers, Produce=%d Consume=%d\n",
 										 m_energyProduction, m_energyConsumption) );
 
-}  // end objectEnteringInfluence
+}
 
 //-------------------------------------------------------------------------------------------------
 /** 'obj' will now no longer add/subtrack from this energy construct */
@@ -157,7 +152,7 @@ void Energy::objectLeavingInfluence( Object *obj )
 		addProduction( -energy );
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0, 
+	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0,
 										 ("Energy - Negative Energy numbers, Produce=%d Consume=%d\n",
 										 m_energyProduction, m_energyConsumption) );
 
@@ -177,7 +172,7 @@ void Energy::addPowerBonus( Object *obj )
 	addProduction(obj->getTemplate()->getEnergyBonus());
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0, 
+	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0,
 										 ("Energy - Negative Energy numbers, Produce=%d Consume=%d\n",
 										 m_energyProduction, m_energyConsumption) );
 
@@ -193,14 +188,20 @@ void Energy::removePowerBonus( Object *obj )
 	if( obj == NULL )
 		return;
 
+	// TheSuperHackers @bugfix Caball009 14/11/2025 Don't remove power bonus for disabled power plants.
+#if !RETAIL_COMPATIBLE_CRC
+	if ( obj->isDisabled() )
+		return;
+#endif
+
 	addProduction( -obj->getTemplate()->getEnergyBonus() );
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0, 
+	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0,
 										 ("Energy - Negative Energy numbers, Produce=%d Consume=%d\n",
 										 m_energyProduction, m_energyConsumption) );
 
-}  // end removePowerBonus
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -208,7 +209,7 @@ void Energy::removePowerBonus( Object *obj )
 // ------------------------------------------------------------------------------------------------
 void Energy::addProduction(Int amt)
 {
-	m_energyProduction += amt; 
+	m_energyProduction += amt;
 
 	if( m_owner == NULL )
 		return;
@@ -221,7 +222,7 @@ void Energy::addProduction(Int amt)
 // ------------------------------------------------------------------------------------------------
 void Energy::addConsumption(Int amt)
 {
-	m_energyConsumption += amt; 
+	m_energyConsumption += amt;
 
 	if( m_owner == NULL )
 		return;
@@ -235,7 +236,7 @@ void Energy::addConsumption(Int amt)
 void Energy::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -256,7 +257,7 @@ void Energy::xfer( Xfer *xfer )
 	// production
 	if( version < 2 )
 		xfer->xferInt( &m_energyProduction );
-	
+
 	// consumption
 	if( version < 2 )
 		xfer->xferInt( &m_energyConsumption );
@@ -268,7 +269,7 @@ void Energy::xfer( Xfer *xfer )
 	xfer->xferInt( &owningPlayerIndex );
 	m_owner = ThePlayerList->getNthPlayer( owningPlayerIndex );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -276,4 +277,4 @@ void Energy::xfer( Xfer *xfer )
 void Energy::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Handicap.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Handicap.cpp
index e02ca95e09a..85420402741 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/Handicap.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/Handicap.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Handicap.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,7 +42,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Handicap.h"
 #include "Common/Player.h"
@@ -50,7 +50,7 @@
 #include "Common/ThingTemplate.h"
 
 //-----------------------------------------------------------------------------
-Handicap::Handicap() 
+Handicap::Handicap()
 {
 	init();
 }
@@ -66,10 +66,10 @@ void Handicap::init()
 //-----------------------------------------------------------------------------
 void Handicap::readFromDict(const Dict* d)
 {
-	// this isn't very efficient, but is only called at load times, 
+	// this isn't very efficient, but is only called at load times,
 	// so it probably doesn't really matter.
 
-	const char* htNames[HANDICAP_TYPE_COUNT] = 
+	const char* htNames[HANDICAP_TYPE_COUNT] =
 	{
 		"BUILDCOST",
 		"BUILDTIME",
@@ -80,7 +80,7 @@ void Handicap::readFromDict(const Dict* d)
 //		"INCOME"
 	};
 
-	const char* ttNames[THING_TYPE_COUNT] = 
+	const char* ttNames[THING_TYPE_COUNT] =
 	{
 		"GENERIC",
 		"BUILDINGS",
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/MissionStats.cpp b/Generals/Code/GameEngine/Source/Common/RTS/MissionStats.cpp
index 93d09bb1a36..978c824711d 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/MissionStats.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/MissionStats.cpp
@@ -24,12 +24,12 @@
 
 // FILE: MissionStats.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,20 +42,20 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/MissionStats.h"
 #include "Common/Player.h"
 #include "Common/Xfer.h"
 
 //-----------------------------------------------------------------------------
-MissionStats::MissionStats() 
+MissionStats::MissionStats()
 {
 	init();
 }
 
 //-----------------------------------------------------------------------------
-void MissionStats::init() 
+void MissionStats::init()
 {
 	Int i;
 
@@ -75,7 +75,7 @@ void MissionStats::init()
 void MissionStats::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -102,7 +102,7 @@ void MissionStats::xfer( Xfer *xfer )
 	// buildings lost
 	xfer->xferInt( &m_buildingsLost );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -110,4 +110,4 @@ void MissionStats::xfer( Xfer *xfer )
 void MissionStats::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Money.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Money.cpp
index 13d219f0648..00237714f5e 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/Money.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/Money.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Money.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,30 +42,36 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Money.h"
 
+#include "Common/AudioSettings.h"
 #include "Common/GameAudio.h"
 #include "Common/MiscAudio.h"
 #include "Common/Player.h"
+#include "Common/PlayerList.h"
 #include "Common/Xfer.h"
+#include "GameLogic/GameLogic.h"
 
 // ------------------------------------------------------------------------------------------------
 UnsignedInt Money::withdraw(UnsignedInt amountToWithdraw, Bool playSound)
 {
+#if defined(RTS_DEBUG)
+	Player* player = ThePlayerList->getNthPlayer(m_playerIndex);
+	if (player != NULL && player->buildsForFree())
+		return 0;
+#endif
+
 	if (amountToWithdraw > m_money)
 		amountToWithdraw = m_money;
 
 	if (amountToWithdraw == 0)
 		return amountToWithdraw;
 
-	//@todo: Do we do this frequently enough that it is a performance hit?
-	AudioEventRTS event = TheAudio->getMiscAudio()->m_moneyWithdrawSound;
-	event.setPlayerIndex(m_playerIndex);
-
-	// Play a sound
 	if (playSound)
-		TheAudio->addAudioEvent(&event);
+	{
+		triggerAudioEvent(TheAudio->getMiscAudio()->m_moneyWithdrawSound);
+	}
 
 	m_money -= amountToWithdraw;
 
@@ -73,47 +79,108 @@ UnsignedInt Money::withdraw(UnsignedInt amountToWithdraw, Bool playSound)
 }
 
 // ------------------------------------------------------------------------------------------------
-void Money::deposit(UnsignedInt amountToDeposit, Bool playSound)
+void Money::deposit(UnsignedInt amountToDeposit, Bool playSound, Bool trackIncome)
 {
 	if (amountToDeposit == 0)
 		return;
 
-	//@todo: Do we do this frequently enough that it is a performance hit?
-	AudioEventRTS event = TheAudio->getMiscAudio()->m_moneyDepositSound;
-	event.setPlayerIndex(m_playerIndex);
-
-	// Play a sound
 	if (playSound)
-		TheAudio->addAudioEvent(&event);
-	
+	{
+		triggerAudioEvent(TheAudio->getMiscAudio()->m_moneyDepositSound);
+	}
+
+	if (trackIncome)
+	{
+		m_incomeBuckets[m_currentBucket] += amountToDeposit;
+		m_cashPerMinute += amountToDeposit;
+	}
+
 	m_money += amountToDeposit;
 }
 
+// ------------------------------------------------------------------------------------------------
+void Money::setStartingCash(UnsignedInt amount)
+{
+	m_money = amount;
+	std::fill(m_incomeBuckets, m_incomeBuckets + ARRAY_SIZE(m_incomeBuckets), 0u);
+	m_currentBucket = 0u;
+	m_cashPerMinute = 0u;
+}
+
+// ------------------------------------------------------------------------------------------------
+void Money::updateIncomeBucket()
+{
+	UnsignedInt frame = TheGameLogic->getFrame();
+	UnsignedInt nextBucket = (frame / LOGICFRAMES_PER_SECOND) % ARRAY_SIZE(m_incomeBuckets);
+	if (nextBucket != m_currentBucket)
+	{
+		m_cashPerMinute -= m_incomeBuckets[nextBucket];
+		m_currentBucket = nextBucket;
+		m_incomeBuckets[m_currentBucket] = 0u;
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+UnsignedInt Money::getCashPerMinute() const
+{
+	return m_cashPerMinute;
+}
+
+void Money::triggerAudioEvent(const AudioEventRTS& audioEvent)
+{
+	Real volume = TheAudio->getAudioSettings()->m_preferredMoneyTransactionVolume;
+	volume *= audioEvent.getVolume();
+	if (volume <= 0.0f)
+		return;
+
+	//@todo: Do we do this frequently enough that it is a performance hit?
+	AudioEventRTS event = audioEvent;
+	event.setPlayerIndex(m_playerIndex);
+	event.setVolume(volume);
+	TheAudio->addAudioEvent(&event);
+}
+
 // ------------------------------------------------------------------------------------------------
 /** CRC */
 // ------------------------------------------------------------------------------------------------
 void Money::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version */
+	* 1: Initial version
+	* 2: Add saveload support for the cash per minute income tracking */
 // ------------------------------------------------------------------------------------------------
 void Money::xfer( Xfer *xfer )
 {
 
 	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
 	XferVersion currentVersion = 1;
+#else
+	XferVersion currentVersion = 2;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
 	// money value
 	xfer->xferUnsignedInt( &m_money );
 
-}  // end xfer
+	if (version <= 1)
+	{
+		setStartingCash(m_money);
+	}
+	else
+	{
+		xfer->xferUser(m_incomeBuckets, sizeof(m_incomeBuckets));
+		xfer->xferUnsignedInt(&m_currentBucket);
+
+		m_cashPerMinute = std::accumulate(m_incomeBuckets, m_incomeBuckets + ARRAY_SIZE(m_incomeBuckets), 0u);
+	}
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -121,7 +188,7 @@ void Money::xfer( Xfer *xfer )
 void Money::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -131,5 +198,7 @@ void Money::parseMoneyAmount( INI *ini, void *instance, void *store, const void*
 {
   // Someday, maybe, have mulitple fields like Gold:10000 Wood:1000 Tiberian:10
   Money * money = (Money *)store;
-  INI::parseUnsignedInt( ini, instance, &money->m_money, userData );
+	UnsignedInt moneyAmount;
+	INI::parseUnsignedInt( ini, instance, &moneyAmount, userData );
+	money->setStartingCash(moneyAmount);
 }
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp
index 57d54c5b2f2..6fe1d4fca44 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Player.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,7 +42,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_SCIENCE_AVAILABILITY_NAMES
 
@@ -98,14 +98,10 @@
 #include "GameLogic/Module/BattlePlanUpdate.h"
 #include "GameLogic/VictoryConditions.h"
 
+#include "GameNetwork/GameInfo.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
-//Grey for neutral.  
+//Grey for neutral.
 #define NEUTRAL_PLAYER_COLOR 0xffffffff
 
 // ------------------------------------------------------------------------------------------------
@@ -150,7 +146,7 @@ static void findClosestKindOf( Object *obj, void *userData )
 	{
 		closestData->m_closest = obj;
 		closestData->m_closestDistSq = distSq;
-	} 
+	}
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -163,7 +159,7 @@ static void findClosestKindOf( Object *obj, void *userData )
 AsciiString kindofMaskAsAsciiString(KindOfMaskType m)
 {
 	AsciiString s;
-	const char** kindofNames = KindOfMaskType::getBitNames();
+	const char* const* kindofNames = KindOfMaskType::getBitNames();
 	for (Int i=KINDOF_FIRST; i<KINDOF_COUNT; ++i)
 	{
 		if (m.test(i))
@@ -179,7 +175,7 @@ AsciiString kindofMaskAsAsciiString(KindOfMaskType m)
 }
 void dumpBattlePlanBonuses(const BattlePlanBonuses *b, AsciiString name, const Player *p, const Object *o, AsciiString fname, Int line, Bool doDebugLog)
 {
-	CRCDEBUG_LOG(("dumpBattlePlanBonuses() %s:%d %s\n  Player %d(%ls) object %d(%s) armor:%g/%8.8X bombardment:%d, holdTheLine:%d, searchAndDestroy:%d sight:%g/%8.8X, valid:%s invalid:%s\n",
+	CRCDEBUG_LOG(("dumpBattlePlanBonuses() %s:%d %s\n  Player %d(%ls) object %d(%s) armor:%g/%8.8X bombardment:%d, holdTheLine:%d, searchAndDestroy:%d sight:%g/%8.8X, valid:%s invalid:%s",
 		fname.str(), line, name.str(),
 		(p)?p->getPlayerIndex():-1, (p)?((Player *)p)->getPlayerDisplayName().str():L"<No Name>", (o)?o->getID():-1, (o)?o->getTemplate()->getName().str():"<No Name>",
 		b->m_armorScalar, AS_INT(b->m_armorScalar),
@@ -189,7 +185,7 @@ void dumpBattlePlanBonuses(const BattlePlanBonuses *b, AsciiString name, const P
 		kindofMaskAsAsciiString(b->m_invalidKindOf).str()));
 	if (!doDebugLog)
 		return;
-	DEBUG_LOG(("dumpBattlePlanBonuses() %s:%d %s\n  Player %d(%ls) object %d(%s) armor:%g/%8.8X bombardment:%d, holdTheLine:%d, searchAndDestroy:%d sight:%g/%8.8X, valid:%s invalid:%s\n",
+	DEBUG_LOG(("dumpBattlePlanBonuses() %s:%d %s\n  Player %d(%ls) object %d(%s) armor:%g/%8.8X bombardment:%d, holdTheLine:%d, searchAndDestroy:%d sight:%g/%8.8X, valid:%s invalid:%s",
 		fname.str(), line, name.str(),
 		(p)?p->getPlayerIndex():-1, (p)?((Player *)p)->getPlayerDisplayName().str():L"<No Name>", (o)?o->getID():-1, (o)?o->getTemplate()->getName().str():"<No Name>",
 		b->m_armorScalar, AS_INT(b->m_armorScalar),
@@ -208,7 +204,7 @@ void dumpBattlePlanBonuses(const BattlePlanBonuses *b, AsciiString name, const P
 PlayerRelationMap::PlayerRelationMap( void )
 {
 
-}  // end PlayerRelationMap
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -218,7 +214,7 @@ PlayerRelationMap::~PlayerRelationMap( void )
 	// make sure the data is cleared
 	m_map.clear();
 
-}  // end ~PlayerRelationmap
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -226,12 +222,12 @@ PlayerRelationMap::~PlayerRelationMap( void )
 void PlayerRelationMap::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	*/
 // ------------------------------------------------------------------------------------------------
 void PlayerRelationMap::xfer( Xfer *xfer )
@@ -256,7 +252,7 @@ void PlayerRelationMap::xfer( Xfer *xfer )
 		// go through all player relations
 		for( playerRelationIt = m_map.begin(); playerRelationIt != m_map.end(); ++playerRelationIt )
 		{
-		
+
 			// write player index
 			playerIndex = (*playerRelationIt).first;
 			xfer->xferInt( &playerIndex );
@@ -265,12 +261,12 @@ void PlayerRelationMap::xfer( Xfer *xfer )
 			r = (*playerRelationIt).second;
 			xfer->xferUser( &r, sizeof( Relationship ) );
 
-		}  // end for, playerRelationIt
-					
-	}  // end if, save
+		}
+
+	}
 	else
 	{
-			
+
 		for( UnsignedShort i = 0; i < playerRelationCount; ++i )
 		{
 
@@ -282,12 +278,12 @@ void PlayerRelationMap::xfer( Xfer *xfer )
 
 			// assign relationship
 			m_map[ playerIndex ] = r;
-				
-		}  // end for, i
 
-	}  // end else, load
+		}
+
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -295,7 +291,7 @@ void PlayerRelationMap::xfer( Xfer *xfer )
 void PlayerRelationMap::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //=============================================================================
 Player::Player( Int playerIndex )
@@ -325,8 +321,6 @@ Player::Player( Int playerIndex )
 	m_visionSpiedMask = PLAYERMASK_NONE;
 	m_battlePlanBonuses = NULL;
 	m_skillPointsModifier = 1.0f;
-	//Added By Sadullah 
-	//Initializations inserted
 	m_canBuildUnits = TRUE;
 	m_canBuildBase  = TRUE;
 	m_cashBountyPercent = 0.0f;
@@ -342,8 +336,7 @@ Player::Player( Int playerIndex )
 	{
 		m_squads[i] = NULL;
 	}
-	//
-	for (i = 0; i < MAX_PLAYER_COUNT; ++i) 
+	for (i = 0; i < MAX_PLAYER_COUNT; ++i)
 	{
 		m_attackedBy[i] = false;
 		m_visionSpiedBy[i] = 0;
@@ -359,7 +352,7 @@ Player::Player( Int playerIndex )
 void Player::init(const PlayerTemplate* pt)
 {
 
-	DEBUG_ASSERTCRASH(m_playerTeamPrototypes.size() == 0, ("Player::m_playerTeamPrototypes is not empty at game start!\n"));
+	DEBUG_ASSERTCRASH(m_playerTeamPrototypes.empty(), ("Player::m_playerTeamPrototypes is not empty at game start!"));
 	m_skillPointsModifier = 1.0f;
 	m_attackedFrame = 0;
 
@@ -373,55 +366,37 @@ void Player::init(const PlayerTemplate* pt)
 	m_bombardBattlePlans = 0;
 	m_holdTheLineBattlePlans = 0;
 	m_searchAndDestroyBattlePlans = 0;
-	if( m_battlePlanBonuses )
-	{
-		deleteInstance(m_battlePlanBonuses);
-		m_battlePlanBonuses = NULL;
-	}
+
+	deleteInstance(m_battlePlanBonuses);
+	m_battlePlanBonuses = NULL;
 
 	deleteUpgradeList();
 
 	m_energy.init(this);
 	m_stats.init();
-	if (m_pBuildList != NULL) 
-	{
-		deleteInstance(m_pBuildList);
-		m_pBuildList = NULL;
-	}
+
+	deleteInstance(m_pBuildList);
+	m_pBuildList = NULL;
+
 	m_defaultTeam = NULL;
 
-	if (m_ai)
-	{
-		deleteInstance(m_ai);
-	}
+	deleteInstance(m_ai);
 	m_ai = NULL;
 
-	if( m_resourceGatheringManager )
-	{
-		deleteInstance(m_resourceGatheringManager);
-		m_resourceGatheringManager = NULL;
-	}
+	deleteInstance(m_resourceGatheringManager);
+	m_resourceGatheringManager = NULL;
 
 	for (Int i = 0; i < NUM_HOTKEY_SQUADS; ++i) {
-		if (m_squads[i] != NULL) {
-			deleteInstance(m_squads[i]);
-			m_squads[i] = NULL;
-		}
-		m_squads[i] = newInstance(Squad);	
+		deleteInstance(m_squads[i]);
+		m_squads[i] = newInstance(Squad);
 	}
 
-	if (m_currentSelection != NULL) {
-		deleteInstance(m_currentSelection) ;
-		m_currentSelection = NULL;
-	}
+	deleteInstance(m_currentSelection);
 	m_currentSelection = newInstance(Squad);
-	
-	if( m_tunnelSystem )
-	{
-		deleteInstance(m_tunnelSystem);
-		m_tunnelSystem = NULL;
-	}
-	
+
+	deleteInstance(m_tunnelSystem);
+	m_tunnelSystem = NULL;
+
 	m_canBuildBase = true;
 	m_canBuildUnits = true;
 	m_observer = false;
@@ -430,7 +405,7 @@ void Player::init(const PlayerTemplate* pt)
 
 	m_unitsShouldHunt = FALSE;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	m_DEMO_ignorePrereqs = FALSE;
 	m_DEMO_freeBuild = FALSE;
 	m_DEMO_instantBuild = FALSE;
@@ -452,7 +427,16 @@ void Player::init(const PlayerTemplate* pt)
 
 		if( m_money.countMoney() == 0 )
 		{
-			m_money.deposit( TheGlobalData->m_defaultStartingCash, FALSE );
+			// TheSuperHackers @bugfix Now correctly deposits the money and fixes its audio and academy issues.
+			// Note that copying the entire Money class instead would also copy the player index inside of it.
+			if ( TheGameInfo )
+			{
+				m_money.deposit( TheGameInfo->getStartingCash().countMoney(), FALSE, FALSE );
+			}
+			else
+			{
+				m_money.deposit( TheGlobalData->m_defaultStartingCash.countMoney(), FALSE, FALSE );
+			}
 		}
 
 		m_playerDisplayName.clear();
@@ -499,8 +483,7 @@ void Player::init(const PlayerTemplate* pt)
 	{
 		KindOfPercentProductionChange *tof = *it;
 		it = m_kindOfPercentProductionChangeList.erase( it );
-		if(tof)
-			deleteInstance(tof);
+		deleteInstance(tof);
 	}
 
 }
@@ -511,7 +494,7 @@ Player::~Player()
 	m_defaultTeam = NULL;
 	m_playerTemplate = NULL;
 
-	for( PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for( PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
 	{
 		(*it)->friend_setOwningPlayer(NULL);
@@ -520,25 +503,21 @@ Player::~Player()
 
 	// delete the relation maps (the destructor clears the actual map if any data is present)
 	deleteInstance(m_teamRelations);
+	m_teamRelations = NULL;
+
 	deleteInstance(m_playerRelations);
+	m_playerRelations = NULL;
 
 	for (Int i = 0; i < NUM_HOTKEY_SQUADS; ++i) {
-		if (m_squads[i] != NULL) {
-			deleteInstance(m_squads[i]);
-			m_squads[i] = NULL;
-		}
+		deleteInstance(m_squads[i]);
+		m_squads[i] = NULL;
 	}
 
-	if (m_currentSelection != NULL) {
-		deleteInstance(m_currentSelection);
-		m_currentSelection = NULL;
-	}
+	deleteInstance(m_currentSelection);
+	m_currentSelection = NULL;
 
-	if( m_battlePlanBonuses )
-	{
-		deleteInstance(m_battlePlanBonuses);
-		m_battlePlanBonuses = NULL;
-	}
+	deleteInstance(m_battlePlanBonuses);
+	m_battlePlanBonuses = NULL;
 }
 
 //=============================================================================
@@ -551,13 +530,13 @@ Relationship Player::getRelationship(const Team *that) const
 		// do we have an override for that particular team? if so, return it.
 		if (!m_teamRelations->m_map.empty())
 		{
-			TeamRelationMapType::const_iterator it = m_teamRelations->m_map.find(that->getID());			
+			TeamRelationMapType::const_iterator it = m_teamRelations->m_map.find(that->getID());
 			if (it != m_teamRelations->m_map.end())
 			{
 				return (*it).second;
 			}
 		}
-		
+
 		// hummm... well, do we have something for that team's player?
 		if (!m_playerRelations->m_map.empty())
 		{
@@ -645,26 +624,23 @@ Bool Player::removeTeamRelationship(const Team *that)
 void Player::setBuildList(BuildListInfo *pBuildList)
 {
 
-	if (m_pBuildList != NULL) 
-	{
-		deleteInstance(m_pBuildList);
-	}
+	deleteInstance(m_pBuildList);
 	m_pBuildList = pBuildList;
 
-} 
+}
 
 //=============================================================================
 void Player::addToBuildList(Object *obj)
 {
 	BuildListInfo *newInfo = newInstance( BuildListInfo );
-	newInfo->setObjectID(obj->getID());	
+	newInfo->setObjectID(obj->getID());
 	newInfo->setTemplateName(obj->getTemplate()->getName());
 	newInfo->setLocation(*obj->getPosition());
 	newInfo->setAngle(obj->getOrientation());
-	newInfo->setNumRebuilds(0);	 // Can't rebuild. 
+	newInfo->setNumRebuilds(0);	 // Can't rebuild.
 	newInfo->setNextBuildList(m_pBuildList);
 	m_pBuildList = newInfo;
-} 
+}
 
 //=============================================================================
 void Player::addToPriorityBuildList(AsciiString templateName, Coord3D *pos, Real angle)
@@ -674,10 +650,10 @@ void Player::addToPriorityBuildList(AsciiString templateName, Coord3D *pos, Real
 	newInfo->setLocation(*pos);
 	newInfo->setAngle(angle);
 	newInfo->markPriorityBuild();
-	newInfo->setNumRebuilds(1);	 // Build once. 
+	newInfo->setNumRebuilds(1);	 // Build once.
 	newInfo->setNextBuildList(m_pBuildList);
 	m_pBuildList = newInfo;
-} 
+}
 
 //=============================================================================
 void Player::update()
@@ -697,6 +673,16 @@ void Player::update()
 			team->updateGenericScripts();
 		}
 	}
+
+#if !PRESERVE_RETAIL_BEHAVIOR && !RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix Stubbjax 26/09/2025 The Tunnel System now heals
+	// all units once per frame instead of once per frame per Tunnel Network.
+	TunnelTracker* tunnelSystem = getTunnelSystem();
+	if (tunnelSystem)
+		tunnelSystem->healObjects();
+#endif
+
+	m_money.updateIncomeBucket();
 }
 
 //=============================================================================
@@ -711,10 +697,7 @@ void Player::setPlayerType(PlayerType t, Bool skirmish)
 {
 	m_playerType = t;
 
-	if (m_ai)
-	{
-		deleteInstance(m_ai);
-	}
+	deleteInstance(m_ai);
 	m_ai = NULL;
 
 	if (t == PLAYER_COMPUTER)
@@ -747,11 +730,8 @@ void Player::setDefaultTeam(void) {
 //=============================================================================
 void Player::deletePlayerAI()
 {
-	if (m_ai)
-	{
-		deleteInstance(m_ai);
-		m_ai = NULL;
-	}
+	deleteInstance(m_ai);
+	m_ai = NULL;
 }
 
 //=============================================================================
@@ -761,8 +741,8 @@ void Player::initFromDict(const Dict* d)
 {
 	AsciiString tmplname = d->getAsciiString(TheKey_playerFaction);
 	const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(tmplname));
-	DEBUG_ASSERTCRASH(pt != NULL, ("PlayerTemplate %s not found -- this is an obsolete map (please open and resave in WB)\n",tmplname.str()));
-	
+	DEBUG_ASSERTCRASH(pt != NULL, ("PlayerTemplate %s not found -- this is an obsolete map (please open and resave in WB)",tmplname.str()));
+
 	init(pt);
 
 	m_playerDisplayName = d->getUnicodeString(TheKey_playerDisplayName);
@@ -784,7 +764,7 @@ void Player::initFromDict(const Dict* d)
 		{
 			AsciiString spTemplateName = TheSidesList->getSkirmishSideInfo(spIdx)->getDict()->getAsciiString(TheKey_playerFaction);
 			const PlayerTemplate* spt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(spTemplateName));
-			if (spt && spt->getSide() == getSide()) 
+			if (spt && spt->getSide() == getSide())
 			{
 				skirmish = true;
 				break;
@@ -825,10 +805,10 @@ void Player::initFromDict(const Dict* d)
 
 				ScriptList *scripts = TheSidesList->getSkirmishSideInfo(i)->getScriptList()->duplicateAndQualify(
 							qualifier, qualTemplatePlayerName, pname);
-				if (TheSidesList->getSideInfo(getPlayerIndex())->getScriptList()) {
-					deleteInstance(TheSidesList->getSideInfo(getPlayerIndex())->getScriptList());
-				}
+
+				deleteInstance(TheSidesList->getSideInfo(getPlayerIndex())->getScriptList());
 				TheSidesList->getSideInfo(getPlayerIndex())->setScriptList(scripts);
+
 				deleteInstance(TheSidesList->getSkirmishSideInfo(i)->getScriptList());
 				TheSidesList->getSkirmishSideInfo(i)->setScriptList(NULL);
 			}
@@ -874,12 +854,10 @@ void Player::initFromDict(const Dict* d)
 			qualifier.format("%d", m_mpStartIndex);
 			ScriptList *scripts = TheSidesList->getSkirmishSideInfo(skirmishNdx)->getScriptList()->duplicateAndQualify(
 						qualifier, qualTemplatePlayerName, pname);
-			ScriptList* slist = TheSidesList->getSideInfo(getPlayerIndex())->getScriptList();
-			if (slist) 
-			{
-				deleteInstance(slist);
-			}
+
+			deleteInstance(TheSidesList->getSideInfo(getPlayerIndex())->getScriptList());
 			TheSidesList->getSideInfo(getPlayerIndex())->setScriptList(scripts);
+
 			for (i=0; i<TheSidesList->getNumTeams(); i++) {
 				if (TheSidesList->getTeamInfo(i)->getDict()->getAsciiString(TheKey_teamOwner) == pname)
 				{
@@ -895,7 +873,7 @@ void Player::initFromDict(const Dict* d)
 				if (TheSidesList->getSkirmishTeamInfo(i)->getDict()->getAsciiString(TheKey_teamOwner) == originalPlayerName)
 				{
 					Dict teamDict(*TheSidesList->getSkirmishTeamInfo(i)->getDict());
-					AsciiString teamName = teamDict.getAsciiString(TheKey_teamName); 
+					AsciiString teamName = teamDict.getAsciiString(TheKey_teamName);
 					AsciiString newName;
 					newName.format("%s%d", teamDict.getAsciiString(TheKey_teamName).str(), m_mpStartIndex);
 
@@ -904,7 +882,7 @@ void Player::initFromDict(const Dict* d)
 					teamDict.setAsciiString(TheKey_teamName, newName);
 					// qualify scripts.
 
-					NameKeyType nameKeys[] = 
+					NameKeyType nameKeys[] =
 					{
 						TheKey_teamOnCreateScript,
 						TheKey_teamOnIdleScript,
@@ -944,20 +922,13 @@ void Player::initFromDict(const Dict* d)
 					TheSidesList->addTeam(&teamDict);
 				}
 			}
-		}						 
-	}																																 
-	if( m_resourceGatheringManager )
-	{
-		deleteInstance(m_resourceGatheringManager);
-		m_resourceGatheringManager = NULL;
+		}
 	}
+
+	deleteInstance(m_resourceGatheringManager);
 	m_resourceGatheringManager = newInstance(ResourceGatheringManager);
 
-	if( m_tunnelSystem )
-	{
-		deleteInstance(m_tunnelSystem);
-		m_tunnelSystem = NULL;
-	}
+	deleteInstance(m_tunnelSystem);
 	m_tunnelSystem = newInstance(TunnelTracker);
 
 	m_handicap.readFromDict(d);
@@ -965,10 +936,10 @@ void Player::initFromDict(const Dict* d)
 	/// @todo Ack!  the todo in PlayerList::reset() mentioning the need for a Player::reset() really needs to get done.
 	m_playerRelations->m_map.clear(); // For now, it has been decided to just fix this one.  Dear god me must reset.
 	m_teamRelations->m_map.clear(); // For now, it has been decided to just fix this one.  Dear god me must reset.
-	
+
 	Int i;
 	for ( i = 0; i < MAX_PLAYER_COUNT; ++i ) // For now, it has been decided to just fix this one.  Dear god me must reset.
-	{ 
+	{
 		m_attackedBy[i] = false;
 		m_visionSpiedBy[i] = 0;
 	}
@@ -992,33 +963,26 @@ void Player::initFromDict(const Dict* d)
 		m_money.deposit(m);
 
 	for ( i = 0; i < NUM_HOTKEY_SQUADS; ++i ) {
-		if (m_squads[i] != NULL)
-		{
-			deleteInstance(m_squads[i]);
-			m_squads[i] = NULL;
-		}
+		deleteInstance(m_squads[i]);
 		m_squads[i] = newInstance( Squad );
 	}
 
-	if (m_currentSelection != NULL) {
-		deleteInstance(m_currentSelection);
-		m_currentSelection = NULL;
-	}
+	deleteInstance(m_currentSelection);
 	m_currentSelection = newInstance( Squad );
 }
 
 //=============================================================================
-void Player::becomingTeamMember(Object *obj, Bool yes) 
-{ 
+void Player::becomingTeamMember(Object *obj, Bool yes)
+{
 	if (!obj)
-		return;	
+		return;
 
 	// energy production/consumption hooks, note we ignore things that are UNDER_CONSTRUCTION
 	if( !obj->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 	{
 		obj->friend_adjustPowerForPlayer(yes);
-	}  // end if
-		
+	}
+
 	// when we capture a building, we need to see if there's an AutoDepositUpdate hooked to it,
 	// if so, award the cash bonus
 	if(this != ThePlayerList->getNeutralPlayer() && yes)
@@ -1040,13 +1004,13 @@ void Player::becomingTeamMember(Object *obj, Bool yes)
 		else
 		{
 			//We are leaving a team with active battle plans so remove them now.
-			removeBattlePlanBonusesForObject( obj ); 
+			removeBattlePlanBonusesForObject( obj );
 		}
 	}
-	
 
-	if (obj->isKindOf(KINDOF_DOZER) 
-			&& obj->getAIUpdateInterface() 
+
+	if (obj->isKindOf(KINDOF_DOZER)
+			&& obj->getAIUpdateInterface()
 			&& obj->getAIUpdateInterface()->isIdle())
 	{
 		// Need to remove it from the pick a peasant button
@@ -1078,12 +1042,12 @@ void Player::becomingLocalPlayer(Bool yes)
 			{
 				// Added support for updating the perceptions of garrisoned buildings containing enemy stealth units.
 				// When changing teams, it is necessary to update this information.
+				Bool requireRadarRefresh = false;
 				ContainModuleInterface *contain = object->getContain();
 				if( contain )
 				{
 					contain->recalcApparentControllingPlayer();
-					TheRadar->removeObject( object );
-					TheRadar->addObject( object );
+					requireRadarRefresh = true;
 				}
 
 				if( object->isKindOf( KINDOF_DISGUISER ) )
@@ -1113,11 +1077,16 @@ void Player::becomingLocalPlayer(Bool yes)
 								else
 									draw->setIndicatorColor( object->getIndicatorColor() );
 							}
-							TheRadar->removeObject( object );
-							TheRadar->addObject( object );
+							requireRadarRefresh = true;
 						}
 					}
 				}
+
+				if (requireRadarRefresh)
+				{
+					TheRadar->removeObject( object );
+					TheRadar->addObject( object );
+				}
 			}
 			deleteInstance(iter);
 		}
@@ -1133,7 +1102,7 @@ void Player::becomingLocalPlayer(Bool yes)
 //-------------------------------------------------------------------------------------------------
 Bool Player::isSkirmishAIPlayer( void )
 {
-	return m_ai ? m_ai->isSkirmishAI() : false; 
+	return m_ai ? m_ai->isSkirmishAI() : false;
 }
 
 
@@ -1153,12 +1122,12 @@ void Player::computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord3D
 //-------------------------------------------------------------------------------------------------
 Player  *Player::getCurrentEnemy( void )
 {
-	return m_ai?m_ai->getAiEnemy():NULL; 
+	return m_ai?m_ai->getAiEnemy():NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
-/** return the player's command center. 
-		if he has none, return null. 
+/** return the player's command center.
+		if he has none, return null.
 		if he has multiple, return one arbitrarily. */
 //-------------------------------------------------------------------------------------------------
 
@@ -1175,7 +1144,7 @@ Player  *Player::getCurrentEnemy( void )
 
 		FCCInfo* info = (FCCInfo*)userData;
 
-		if (info->cmdCenter == NULL 
+		if (info->cmdCenter == NULL
 				&& obj->isKindOf(KINDOF_COMMANDCENTER)
 				&& obj->getTemplate()->getDefaultOwningSide() == info->player->getSide()
 				&& !obj->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION)
@@ -1199,7 +1168,7 @@ Object* Player::findNaturalCommandCenter()
 //-------------------------------------------------------------------------------------------------
 GameDifficulty Player::getPlayerDifficulty(void) const
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		return m_ai->getAIDifficulty();
 	}
@@ -1211,7 +1180,7 @@ GameDifficulty Player::getPlayerDifficulty(void) const
 //-------------------------------------------------------------------------------------------------
 Bool Player::checkBridges(Object *unit, Waypoint *way)
 {
-	return m_ai?m_ai->checkBridges(unit, way):false; 
+	return m_ai?m_ai->checkBridges(unit, way):false;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1219,7 +1188,7 @@ Bool Player::checkBridges(Object *unit, Waypoint *way)
 //-------------------------------------------------------------------------------------------------
 Bool Player::getAiBaseCenter(Coord3D *pos)
 {
-	return m_ai?m_ai->getBaseCenter(pos):false; 
+	return m_ai?m_ai->getBaseCenter(pos):false;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1227,9 +1196,9 @@ Bool Player::getAiBaseCenter(Coord3D *pos)
 //-------------------------------------------------------------------------------------------------
 void Player::repairStructure(ObjectID structureID)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
-		m_ai->repairStructure(structureID); 
+		m_ai->repairStructure(structureID);
 	}
 }
 
@@ -1238,7 +1207,7 @@ void Player::repairStructure(ObjectID structureID)
 //-------------------------------------------------------------------------------------------------
 void Player::onUnitCreated( Object *factory, Object *unit )
 {
-	// When a a unit is completed, it becomes "real" as far as scripting is 
+	// When a a unit is completed, it becomes "real" as far as scripting is
 	// concerned. jba.
 	TheScriptEngine->notifyOfObjectCreationOrDestruction();
 
@@ -1248,7 +1217,7 @@ void Player::onUnitCreated( Object *factory, Object *unit )
 	// ai notification callback
 	if( m_ai )
 		m_ai->onUnitProduced( factory, unit );
-}  // end onUnitCreated
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -1260,7 +1229,7 @@ Bool Player::isSupplySourceSafe( Int minSupplies )
 	if( m_ai )
 		return m_ai->isSupplySourceSafe( minSupplies );
 	return true;
-}  // isSupplySourceSafe
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is a supply source attacked? */
@@ -1271,7 +1240,7 @@ Bool Player::isSupplySourceAttacked( void )
 	if( m_ai )
 		return m_ai->isSupplySourceAttacked( );
 	return false;
-}  // isSupplySourceSafe
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set delay between team production */
@@ -1281,7 +1250,7 @@ void Player::setTeamDelaySeconds(Int delay  )
 	// ai action
 	if( m_ai )
 		m_ai->setTeamDelaySeconds( delay );
-}  // guardSupplyCenter
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Guard supply center */
@@ -1291,7 +1260,7 @@ void Player::guardSupplyCenter( Team *team, Int minSupplies  )
 	// ai action
 	if( m_ai )
 		m_ai->guardSupplyCenter( team, minSupplies );
-}  // guardSupplyCenter
+}
 
 //-------------------------------------------------------------------------------------------------
 /** A team is about to be destroyed */
@@ -1305,7 +1274,7 @@ void Player::preTeamDestroy( const Team *team )
 	// TheSuperHackers @bugfix Mauller/Xezon 03/05/2025 Clear the default team to prevent dangling pointer usage
 	if( m_defaultTeam == team )
 		m_defaultTeam = NULL;
-}  // preTeamDestroy
+}
 
 //-------------------------------------------------------------------------------------------------
 /// a structuer was just created, but is under construction
@@ -1313,14 +1282,14 @@ void Player::preTeamDestroy( const Team *team )
 void Player::onStructureCreated( Object *builder, Object *structure )
 {
 
-}  // end onStructureCreated
+}
 
 //-------------------------------------------------------------------------------------------------
 /// a structure that was under construction has become completed
 //-------------------------------------------------------------------------------------------------
 void Player::onStructureConstructionComplete( Object *builder, Object *structure, Bool isRebuild )
 {
-	// When a a structure is completed, it becomes "real" as far as scripting is 
+	// When a a structure is completed, it becomes "real" as far as scripting is
 	// concerned. jba.
 	TheScriptEngine->notifyOfObjectCreationOrDestruction();
 
@@ -1344,10 +1313,10 @@ void Player::onStructureConstructionComplete( Object *builder, Object *structure
 	// the GUI needs to re-evaluate the information being displayed to the user now
 	if( TheControlBar )
 		TheControlBar->markUIDirty();
-	
+
 	// This object may require us to play some EVA sounds.
 	Player *localPlayer = ThePlayerList->getLocalPlayer();
-	if (localPlayer == structure->getControllingPlayer() || localPlayer->getRelationship(structure->getTeam()) != ENEMIES) 
+	if (localPlayer == structure->getControllingPlayer() || localPlayer->getRelationship(structure->getTeam()) != ENEMIES)
 		return;
 
 	// We need to play some EVA sounds.
@@ -1356,22 +1325,22 @@ void Player::onStructureConstructionComplete( Object *builder, Object *structure
 
 	if (structure->hasSpecialPower(SPECIAL_NEUTRON_MISSILE))
 		TheEva->setShouldPlay(EVA_SuperweaponDetected_Nuke);
-		
+
 	if (structure->hasSpecialPower(SPECIAL_SCUD_STORM))
 		TheEva->setShouldPlay(EVA_SuperweaponDetected_ScudStorm);
 
-}  // end onStructureConstructionComplete
+}
 
 //=============================================================================
 void Player::onStructureUndone(Object *structure)
 {
 	m_scoreKeeper.removeObjectBuilt(structure);
-} // end onStructureUndone
+}
 
 //=============================================================================
 void Player::addTeamToList(TeamPrototype* team)
 {
-	for( PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for( PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it )
 	{
 		if (team == *it)
@@ -1384,7 +1353,7 @@ void Player::addTeamToList(TeamPrototype* team)
 //=============================================================================
 void Player::removeTeamFromList(TeamPrototype* team)
 {
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			it != m_playerTeamPrototypes.end(); ++it)
 	{
 		if (team == *it)
@@ -1398,9 +1367,9 @@ void Player::removeTeamFromList(TeamPrototype* team)
 //=============================================================================
 void Player::healAllObjects()
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		(*it)->healAllObjects();
 	}
 }
@@ -1408,9 +1377,9 @@ void Player::healAllObjects()
 //=============================================================================
 void Player::iterateObjects( ObjectIterateFunc func, void *userData )
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		(*it)->iterateObjects( func, userData );
 	}
 }
@@ -1423,10 +1392,10 @@ void Player::countObjectsByThingTemplate(Int numTmplates, const ThingTemplate* c
 	for (i = 0; i < numTmplates; ++i)
 		counts[i] = 0;
 
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
-			 it != m_playerTeamPrototypes.end(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
+			 it != m_playerTeamPrototypes.end();
 			 ++it)
-	{	
+	{
 		(*it)->countObjectsByThingTemplate(numTmplates, things, ignoreDead, counts, ignoreUnderConstruction);
 	}
 }
@@ -1436,9 +1405,9 @@ Int Player::countBuildings(void)
 {
 	int retVal = 0;
 
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		retVal += (*it)->countBuildings();
 	}
 	return retVal;
@@ -1449,9 +1418,9 @@ Int Player::countObjects(KindOfMaskType setMask, KindOfMaskType clearMask)
 {
 	int retVal = 0;
 
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		retVal += (*it)->countObjects(setMask, clearMask);
 	}
 	return retVal;
@@ -1461,7 +1430,7 @@ Int Player::countObjects(KindOfMaskType setMask, KindOfMaskType clearMask)
 Object *Player::findClosestByKindOf( Object *queryObject, KindOfMaskType setMask, KindOfMaskType clearMask )
 {
 	if( queryObject == NULL )
-		return NULL; 
+		return NULL;
 
 	ClosestKindOfData data;
 	data.m_setKindOf = setMask;
@@ -1477,9 +1446,9 @@ Object *Player::findClosestByKindOf( Object *queryObject, KindOfMaskType setMask
 //=============================================================================
 Bool Player::hasAnyBuildings(void) const
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		if ((*it)->hasAnyBuildings()) {
 			return true;
 		}
@@ -1490,9 +1459,9 @@ Bool Player::hasAnyBuildings(void) const
 //=============================================================================
 Bool Player::hasAnyBuildings(KindOfMaskType kindOf) const
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		if ((*it)->hasAnyBuildings(kindOf)) {
 			return true;
 		}
@@ -1503,9 +1472,9 @@ Bool Player::hasAnyBuildings(KindOfMaskType kindOf) const
 //=============================================================================
 Bool Player::hasAnyUnits(void) const
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		if ((*it)->hasAnyUnits()) {
 			return true;
 		}
@@ -1516,9 +1485,9 @@ Bool Player::hasAnyUnits(void) const
 //=============================================================================
 Bool Player::hasAnyObjects(void) const
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		if ((*it)->hasAnyObjects()) {
 			return true;
 		}
@@ -1529,9 +1498,9 @@ Bool Player::hasAnyObjects(void) const
 //=============================================================================
 Bool Player::hasAnyBuildFacility(void) const
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		if ((*it)->hasAnyBuildFacility())
 			return true;
 	}
@@ -1539,11 +1508,11 @@ Bool Player::hasAnyBuildFacility(void) const
 }
 
 //=============================================================================
-void Player::updateTeamStates(void) 
+void Player::updateTeamStates(void)
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		(*it)->updateState();
 	}
 }
@@ -1574,41 +1543,41 @@ UnsignedInt Player::getSupplyBoxValue()
 }
 
 //=============================================================================
-Real Player::getProductionCostChangePercent( AsciiString buildTemplateName ) const 
-{ 
+Real Player::getProductionCostChangePercent( AsciiString buildTemplateName ) const
+{
   ProductionChangeMap::const_iterator it = m_productionCostChanges.find(NAMEKEY(buildTemplateName));
-  if (it != m_productionCostChanges.end()) 
+  if (it != m_productionCostChanges.end())
 	{
 		return (*it).second;
 	}
-	
+
 	return 0.0f;
-}	
+}
 
 //=============================================================================
-Real Player::getProductionTimeChangePercent( AsciiString buildTemplateName ) const 
-{ 
+Real Player::getProductionTimeChangePercent( AsciiString buildTemplateName ) const
+{
   ProductionChangeMap::const_iterator it = m_productionTimeChanges.find(NAMEKEY(buildTemplateName));
-  if (it != m_productionTimeChanges.end()) 
+  if (it != m_productionTimeChanges.end())
 	{
 		return (*it).second;
 	}
-	
+
 	return 0.0f;
-}	
+}
 
 //=============================================================================
-VeterancyLevel Player::getProductionVeterancyLevel( AsciiString buildTemplateName ) const 
-{ 
+VeterancyLevel Player::getProductionVeterancyLevel( AsciiString buildTemplateName ) const
+{
 	NameKeyType templateNameKey = NAMEKEY(buildTemplateName);
   ProductionVeterancyMap::const_iterator it = m_productionVeterancyLevels.find(templateNameKey);
-  if (it != m_productionVeterancyLevels.end()) 
+  if (it != m_productionVeterancyLevels.end())
 	{
 		return (*it).second;
 	}
-	
+
 	return LEVEL_FIRST;
-}	
+}
 
 //=============================================================================
 void Player::friend_setSkillset(Int skillSet)
@@ -1625,14 +1594,14 @@ void Player::setUnitsShouldHunt(Bool unitsShouldHunt, CommandSourceType source)
 
 	Coord3D pos;
 	ThePartitionManager->getMostValuableLocation(getPlayerIndex(), ALLOW_ENEMIES, VOT_CashValue, &pos);
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it) {
 		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) {
 				Object *obj = iterObj.cur();
 				if (!obj) {
@@ -1651,7 +1620,7 @@ void Player::setUnitsShouldHunt(Bool unitsShouldHunt, CommandSourceType source)
 				obj->leaveGroup();
 				AIUpdateInterface *ai = obj->getAIUpdateInterface();
 				if (ai) {
-					if (unitsShouldHunt) {	
+					if (unitsShouldHunt) {
 						ai->aiHunt(source);
 					} else {
 						ai->aiIdle(source);
@@ -1696,7 +1665,29 @@ void Player::killPlayer(void)
 	}
 	if (isLocalPlayer() && !TheGameLogic->isInShellGame())
 	{
+		// TheSuperHackers @bugfix helmutbuhler 29/03/2025
+		// Avoid multiplayer mismatch on surrender in team games when owning a base structure that has
+		// been cleared of infantry before, by disabling this bugged logic.
+		//
+		// Note that becomingLocalPlayer calls recalcApparentControllingPlayer on all objects with a
+		// contain, which does two things:
+		//   1. Reset the teams of all objects with empty contains
+		//   2. Update m_hideGarrisonedStateFromNonallies
+		//
+		// Likely, the original intent was to reveal hidden garrisoned buildings for the new observer.
+		// But this does not appear to work anyway, so this call is useless.
+		//
+		// There is another bug: The Contain modules keep track of the object's team before any units
+		// got inside. And that team does not get updated when the player is killed and the units
+		// transfer to another team. That means resetting the team sets it to neutral, and when this
+		// is done only for the local player, then a mismatch occurs.
+		//
+		// When fixing disguises for observers or fixing the team bug in the Contain classes, then this
+		// code can be used again.
+#if 0
 		becomingLocalPlayer(TRUE); // recalc disguises, etc
+#endif
+
 		if (TheControlBar )
 		{
 			if (isPlayerActive())
@@ -1717,21 +1708,21 @@ void Player::killPlayer(void)
 //=============================================================================
 void Player::setObjectsEnabled(AsciiString templateTypeToAffect, Bool enable)
 {
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it) {
 		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) {
 				Object *obj = iterObj.cur();
 				if (!obj) {
 					continue;
 				}
 
-				if (obj->getTemplate()->getName().compare(templateTypeToAffect) == 0) 
+				if (obj->getTemplate()->getName().compare(templateTypeToAffect) == 0)
 				{
 					obj->setScriptStatus( OBJECT_STATUS_SCRIPT_DISABLED, !enable );
 				}
@@ -1754,18 +1745,18 @@ void Player::transferAssetsFromThat(Player *that)
 	const ThingTemplate *beaconTemplate = TheThingFactory->findTemplate( that->getPlayerTemplate()->getBeaconTemplate() );
 
 	// transfer all his units.
-	for (PlayerTeamList::iterator it = that->m_playerTeamPrototypes.begin(); 
-			 it != that->m_playerTeamPrototypes.end(); ++it) 
+	for (PlayerTeamList::iterator it = that->m_playerTeamPrototypes.begin();
+			 it != that->m_playerTeamPrototypes.end(); ++it)
 	{
-		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 		{
 			Team *team = iter.cur();
-			if (!team) 
+			if (!team)
 			{
 				continue;
 			}
-			
-			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) 
+
+			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance())
 			{
 				Object *obj = iterObj.cur();
 				if (!obj || obj->getTemplate()->isEquivalentTo(beaconTemplate))  // don't transfer NULL objs or beacons
@@ -1784,7 +1775,7 @@ void Player::transferAssetsFromThat(Player *that)
 	// transfer all his money
 	UnsignedInt allMoney = that->getMoney()->countMoney();
 	that->getMoney()->withdraw(allMoney);
-	getMoney()->deposit(allMoney);
+	getMoney()->deposit(allMoney, TRUE, FALSE);
 }
 
 //=============================================================================
@@ -1799,14 +1790,14 @@ void Player::garrisonAllUnits(CommandSourceType source)
 	ObjectIterator *iterBuilding = ThePartitionManager->iterateObjectsInRange(&pos, 1e9f, FROM_CENTER_3D, filters, ITER_SORTED_NEAR_TO_FAR);
 	MemoryPoolObjectHolder hold(iterBuilding);
 
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it) {
 		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) {
 				Object *obj = iterObj.cur();
 				if (!obj) {
@@ -1818,7 +1809,7 @@ void Player::garrisonAllUnits(CommandSourceType source)
 					continue;
 				}
 
-				for (Object *theBuilding = iterBuilding->first(); theBuilding; theBuilding = iterBuilding->next()) 
+				for (Object *theBuilding = iterBuilding->first(); theBuilding; theBuilding = iterBuilding->next())
 				{
 					ContainModuleInterface *contain = theBuilding->getContain();
 					if (contain)
@@ -1843,14 +1834,14 @@ void Player::garrisonAllUnits(CommandSourceType source)
 //=============================================================================
 void Player::ungarrisonAllUnits(CommandSourceType source)
 {
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it) {
 		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) {
 				Object *obj = iterObj.cur();
 				if (!obj) {
@@ -1877,16 +1868,16 @@ void Player::ungarrisonAllUnits(CommandSourceType source)
 //=============================================================================
 void Player::setUnitsShouldIdleOrResume(Bool idle)
 {
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
-			 it != m_playerTeamPrototypes.end(); ++it) 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
+			 it != m_playerTeamPrototypes.end(); ++it)
 	{
-		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 		{
 			Team *team = iter.cur();
 			if (!team)
 				continue;
-			
-			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) 
+
+			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance())
 			{
 				Object *obj = iterObj.cur();
 				if (!obj)
@@ -1922,14 +1913,14 @@ void Player::setUnitsShouldIdleOrResume(Bool idle)
 //=============================================================================
 void Player::sellEverythingUnderTheSun(void)
 {
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it) {
 		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) {
 				Object *obj = iterObj.cur();
 				if (!obj) {
@@ -1938,7 +1929,7 @@ void Player::sellEverythingUnderTheSun(void)
 
 				// sell the object
 				TheBuildAssistant->sellObject( obj );
-			}			
+			}
 		}
 	}
 }
@@ -1959,9 +1950,9 @@ Bool Player::allowedToBuild(const ThingTemplate *tmplate) const
 }
 
 //=============================================================================
-void Player::buildSpecificTeam( TeamPrototype *teamProto) 
+void Player::buildSpecificTeam( TeamPrototype *teamProto)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		// Do a priority build.
 		m_ai->buildSpecificAITeam(teamProto, true);
@@ -1969,9 +1960,9 @@ void Player::buildSpecificTeam( TeamPrototype *teamProto)
 }
 
 //=============================================================================
-void Player::buildBaseDefense(Bool flank) 
+void Player::buildBaseDefense(Bool flank)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		// Do a priority build.
 		m_ai->buildAIBaseDefense(flank);
@@ -1979,9 +1970,9 @@ void Player::buildBaseDefense(Bool flank)
 }
 
 //=============================================================================
-void Player::buildBaseDefenseStructure(const AsciiString &thingName, Bool flank) 
+void Player::buildBaseDefenseStructure(const AsciiString &thingName, Bool flank)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		// Do a priority build.
 		m_ai->buildAIBaseDefenseStructure(thingName, flank);
@@ -1989,9 +1980,9 @@ void Player::buildBaseDefenseStructure(const AsciiString &thingName, Bool flank)
 }
 
 //=============================================================================
-void Player::buildSpecificBuilding(const AsciiString &thingName) 
+void Player::buildSpecificBuilding(const AsciiString &thingName)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		// Do a priority build.
 		m_ai->buildSpecificAIBuilding(thingName);
@@ -1999,27 +1990,27 @@ void Player::buildSpecificBuilding(const AsciiString &thingName)
 }
 
 //=============================================================================
-void Player::buildBySupplies(Int minimumCash, const AsciiString &thingName) 
+void Player::buildBySupplies(Int minimumCash, const AsciiString &thingName)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		m_ai->buildBySupplies(minimumCash, thingName);
 	}
 }
 
 //=============================================================================
-void Player::buildUpgrade( const AsciiString &upgrade) 
+void Player::buildUpgrade( const AsciiString &upgrade)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		m_ai->buildUpgrade(upgrade);
 	}
 }
 
 //=============================================================================
-void Player::recruitSpecificTeam( TeamPrototype *teamProto, Real recruitRadius) 
+void Player::recruitSpecificTeam( TeamPrototype *teamProto, Real recruitRadius)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		// Do a priority build.
 		m_ai->recruitSpecificAITeam(teamProto, recruitRadius);
@@ -2038,7 +2029,7 @@ void Player::doBountyForKill(const Object* killer, const Object* victim)
 
 	Int costToBuild = victim->getTemplate()->calcCostToBuild(victim->getControllingPlayer());
 	Int bounty = REAL_TO_INT_CEIL(costToBuild * m_cashBountyPercent);
-	
+
 	if( bounty )
 	{
 
@@ -2097,10 +2088,10 @@ Bool Player::addSkillPointsForKill(const Object* killer, const Object* victim)
 	// srj sez: per dustin, no experience (et al) for killing things under construction.
 	if (victim->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
 		return false;
-	
+
 	Int victimLevel = victim->getVeterancyLevel();
 	Int skillValue = victim->getTemplate()->getSkillPointValue(victimLevel);
-	
+
 	return addSkillPoints(skillValue);
 }
 
@@ -2135,21 +2126,21 @@ Bool Player::addScience(ScienceType science)
 	if (hasScience(science))
 		return false;
 
-	//DEBUG_LOG(("Adding Science %s\n",TheScienceStore->getInternalNameForScience(science).str()));
+	//DEBUG_LOG(("Adding Science %s",TheScienceStore->getInternalNameForScience(science).str()));
 
 	m_sciences.push_back(science);
 
 	// 'wake up' any special powers controlled by, well, stuff
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
-			 it != m_playerTeamPrototypes.end(); ++it) 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
+			 it != m_playerTeamPrototypes.end(); ++it)
 	{
-		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 		{
 			Team *team = iter.cur();
 			if (!team)
 				continue;
-			
-			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) 
+
+			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance())
 			{
 				Object *obj = iterObj.cur();
 				if (!obj)
@@ -2177,14 +2168,14 @@ Bool Player::addScience(ScienceType science)
 
 	// notify the script engine
 	TheScriptEngine->notifyOfAcquiredScience(getPlayerIndex(), science);
-	
+
 	return true;
 }
 
 //=============================================================================
 void Player::addSciencePurchasePoints(Int delta)
 {
-	//DEBUG_LOG(("Adding SciencePurchasePoints %d -> %d\n",m_sciencePurchasePoints,m_sciencePurchasePoints+delta));
+	//DEBUG_LOG(("Adding SciencePurchasePoints %d -> %d",m_sciencePurchasePoints,m_sciencePurchasePoints+delta));
 	Int oldSPP = m_sciencePurchasePoints;
 	m_sciencePurchasePoints += delta;
 	if (m_sciencePurchasePoints < 0)
@@ -2200,7 +2191,7 @@ Bool Player::attemptToPurchaseScience(ScienceType science)
 {
 	if (!isCapableOfPurchasingScience(science))
 	{
-		DEBUG_CRASH(("isCapableOfPurchasingScience: need other prereqs/points to purchase, request is ignored!\n"));
+		DEBUG_CRASH(("isCapableOfPurchasingScience: need other prereqs/points to purchase, request is ignored!"));
 		return false;
 	}
 
@@ -2215,7 +2206,7 @@ Bool Player::grantScience(ScienceType science)
 {
 	if (!TheScienceStore->isScienceGrantable(science))
 	{
-		DEBUG_CRASH(("Cannot grant science %s, since it is marked as nonGrantable.\n",TheScienceStore->getInternalNameForScience(science).str()));
+		DEBUG_CRASH(("Cannot grant science %s, since it is marked as nonGrantable.",TheScienceStore->getInternalNameForScience(science).str()));
 		return false;	// it's not grantable, so tough, can't have it, even via this method.
 	}
 
@@ -2275,7 +2266,7 @@ void Player::resetRank()
 /// returns TRUE if rank level really changed.
 Bool Player::setRankLevel(Int newLevel)
 {
-	if (newLevel < 1) 
+	if (newLevel < 1)
 		newLevel = 1;
 	else if (newLevel > TheRankInfoStore->getRankLevelCount())
 		newLevel = TheRankInfoStore->getRankLevelCount();
@@ -2286,7 +2277,7 @@ Bool Player::setRankLevel(Int newLevel)
 	if (newLevel == m_rankLevel)
 		return false;
 
-	//DEBUG_LOG(("Set Rank Level %d -> %d\n",m_rankLevel,newLevel));
+	//DEBUG_LOG(("Set Rank Level %d -> %d",m_rankLevel,newLevel));
 
 	Int oldSPP = m_sciencePurchasePoints;
 
@@ -2325,7 +2316,7 @@ Bool Player::setRankLevel(Int newLevel)
 	m_rankLevel = newLevel;
 
 	DEBUG_ASSERTCRASH(m_skillPoints >= m_levelDown && m_skillPoints < m_levelUp, ("hmm, wrong"));
-	//DEBUG_LOG(("Rank %d, Skill %d, down %d, up %d\n",m_rankLevel,m_skillPoints, m_levelDown, m_levelUp));
+	//DEBUG_LOG(("Rank %d, Skill %d, down %d, up %d",m_rankLevel,m_skillPoints, m_levelDown, m_levelUp));
 
 	if (TheControlBar != NULL)
 	{
@@ -2442,10 +2433,10 @@ Bool Player::canBuild(const ThingTemplate *tmplate) const
 
 	if (tmplate->getBuildable() == BSTATUS_IGNORE_PREREQUISITES)
 		return true;
-	
+
 	if (tmplate->getBuildable() == BSTATUS_ONLY_BY_AI && getPlayerType() != PLAYER_COMPUTER)
 		return false;
-	
+
 	// else BSTATUS tmplate->getBuildable() == BSTATUS_YES
 	{
 
@@ -2458,7 +2449,7 @@ Bool Player::canBuild(const ThingTemplate *tmplate) const
 				prereqsOK = false;
 		}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		if (ignoresPrereqs())
 			prereqsOK = true;
 #endif
@@ -2496,13 +2487,13 @@ void Player::deleteUpgradeList( void )
 		deleteInstance(m_upgradeList);
 		m_upgradeList = next;
 
-	}  // end while
+	}
 
 	// This doesn't call removeUpgrade, so clear these ourselves.
 	m_upgradesInProgress.clear();
 	m_upgradesCompleted.clear();
 
-}  // end deleteUpgradeList
+}
 
 //=================================================================================================
 /** Find an upgrade in our list of upgrades with matching name key */
@@ -2516,24 +2507,24 @@ Upgrade *Player::findUpgrade( const UpgradeTemplate *upgradeTemplate )
 			return upgrade;
 
 	return NULL;
-	
-}  // end findUpgrade
+
+}
 
 //=================================================================================================
 /** Does the player have this completed upgrade */
 //=================================================================================================
-Bool Player::hasUpgradeComplete( const UpgradeTemplate *upgradeTemplate )
+Bool Player::hasUpgradeComplete( const UpgradeTemplate *upgradeTemplate ) const
 {
 	UpgradeMaskType testMask = upgradeTemplate->getUpgradeMask();
 	return hasUpgradeComplete( testMask );
-} 
+}
 
 //=================================================================================================
-/** 
+/**
 	Does the player have this completed upgrade.  This form is exposed so Objects can do quick lookups.
 */
 //=================================================================================================
-Bool Player::hasUpgradeComplete( UpgradeMaskType testMask )
+Bool Player::hasUpgradeComplete( UpgradeMaskType testMask ) const
 {
 	return m_upgradesCompleted.testForAll( testMask );
 }
@@ -2560,15 +2551,15 @@ Upgrade *Player::addUpgrade( const UpgradeTemplate *upgradeTemplate, UpgradeStat
 
 		// make new one
 		u = newInstance(Upgrade)( upgradeTemplate );
-	
-		// tie to list	
+
+		// tie to list
 		u->friend_setPrev( NULL );
 		u->friend_setNext( m_upgradeList );
 		if( m_upgradeList )
 			m_upgradeList->friend_setPrev( u );
 		m_upgradeList = u;
 
-	}  // end if
+	}
 
 	// set the new status for the upgrade
 	u->setStatus( status );
@@ -2588,28 +2579,28 @@ Upgrade *Player::addUpgrade( const UpgradeTemplate *upgradeTemplate, UpgradeStat
 
 	return u;
 
-}  // end addUpgrade
+}
 
 //=================================================================================================
-/** 
-	An upgrade just finished, do things like tell all objects to recheck UpgradeModules 
-*/  
+/**
+	An upgrade just finished, do things like tell all objects to recheck UpgradeModules
+*/
 void Player::onUpgradeCompleted( const UpgradeTemplate *upgradeTemplate )
 {
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
-			 it != m_playerTeamPrototypes.end(); ++it) 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
+			 it != m_playerTeamPrototypes.end(); ++it)
 	{
-		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 		{
 			Team *team = iter.cur();
-			if( team == NULL ) 
+			if( team == NULL )
 			{
 				continue;
 			}
-			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) 
+			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance())
 			{
 				Object *obj = iterObj.cur();
-				if( obj == NULL ) 
+				if( obj == NULL )
 				{
 					continue;
 				}
@@ -2629,7 +2620,7 @@ void Player::onUpgradeCompleted( const UpgradeTemplate *upgradeTemplate )
 void Player::removeUpgrade( const UpgradeTemplate *upgradeTemplate )
 {
 	Upgrade *upgrade = findUpgrade( upgradeTemplate );
-	
+
 	if( upgrade )
 	{
 		if( upgrade->friend_getNext() )
@@ -2647,19 +2638,19 @@ void Player::removeUpgrade( const UpgradeTemplate *upgradeTemplate )
 		if( upgrade->getStatus() == UPGRADE_STATUS_COMPLETE )
 			onUpgradeRemoved();
 
-	}  // end if
+	}
 
-}  // end removeUpgrade
+}
 
 
 //-------------------------------------------------------------------------------------------------
 Bool Player::okToPlayRadarEdgeSound( void )
 {
 	return (
-		! TheVictoryConditions->hasSinglePlayerBeenDefeated( this ) 
-		&& ! m_isPlayerDead 
+		! TheVictoryConditions->hasSinglePlayerBeenDefeated( this )
+		&& ! m_isPlayerDead
 		&& ! TheInGameUI->isClientQuiet()
-		&& TheGameLogic->isInGameLogicUpdate() 
+		&& TheGameLogic->isInGameLogicUpdate()
 		&& TheGameLogic->getFrame() > 0 );
 
 }
@@ -2684,7 +2675,7 @@ void Player::addRadar( Bool disableProof )
 		soundToPlay.setPlayerIndex(getPlayerIndex());
 		TheAudio->addAudioEvent(&soundToPlay);
 	}
-}  // end addRadar
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The parameter object has is taking its radar away from the player */
@@ -2694,20 +2685,20 @@ void Player::removeRadar( Bool disableProof )
 	Bool hadRadar = hasRadar();
 
 	// decrement count
-	DEBUG_ASSERTCRASH( m_radarCount > 0, ("removeRadar: An Object is taking its radar away, but the player radar count says they don't have radar!\n") );
+	DEBUG_ASSERTCRASH( m_radarCount > 0, ("removeRadar: An Object is taking its radar away, but the player radar count says they don't have radar!") );
 	--m_radarCount;
 
 	if( disableProof )
 		--m_disableProofRadarCount;// Disable proof is also in the normal refcount
 
-	if( hadRadar && !hasRadar()	&& okToPlayRadarEdgeSound() ) 
+	if( hadRadar && !hasRadar()	&& okToPlayRadarEdgeSound() )
 	{
 		// This player just lost radar, so play the "You lost Radar!" sound
 		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_radarOfflineSound;
 		soundToPlay.setPlayerIndex(getPlayerIndex());
 		TheAudio->addAudioEvent(&soundToPlay);
 	}
-}  // end removeRadar
+}
 
 //-------------------------------------------------------------------------------------------------
 void Player::disableRadar()
@@ -2715,8 +2706,8 @@ void Player::disableRadar()
 	Bool hadRadar = hasRadar();
 	m_radarDisabled = TRUE;
 
-	if( hadRadar  
-		&& !hasRadar() && okToPlayRadarEdgeSound() ) 
+	if( hadRadar
+		&& !hasRadar() && okToPlayRadarEdgeSound() )
 	{
 		// This player just lost radar, so play the "You lost Radar!" sound
 		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_radarOfflineSound;
@@ -2731,7 +2722,7 @@ void Player::enableRadar()
 	Bool hadRadar = hasRadar();
 	m_radarDisabled = FALSE;
 
-	if( !hadRadar && hasRadar() && okToPlayRadarEdgeSound() )  
+	if( !hadRadar && hasRadar() && okToPlayRadarEdgeSound() )
 	{
 		// This player just got radar, so play the "You have Radar!" sound
 		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_radarOnlineSound;
@@ -2783,7 +2774,7 @@ void Player::onPowerBrownOutChange( Bool brownOut )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-// SEVERAL OBJECTS (LIKE MULTIPLE COMMAND CENTERS) MAY HAVE MATCHING SETS OF SPECIAL POWERS 
+// SEVERAL OBJECTS (LIKE MULTIPLE COMMAND CENTERS) MAY HAVE MATCHING SETS OF SPECIAL POWERS
 // THIS KEEPS THEM IN SYNC SO IT LOOKS LIKE EACH SPECIAL POWER IS SHARED BETWEEN ALL
 
 void Player::addNewSharedSpecialPowerTimer( const SpecialPowerTemplate *temp, UnsignedInt frame )
@@ -2883,10 +2874,10 @@ void Player::friend_applyDifficultyBonusesForObject(Object* obj, Bool apply) con
 			BodyModuleInterface* body = obj->getBodyModule();
 			if (apply)
 				body->setMaxHealth(body->getMaxHealth() * healthFactor, PRESERVE_RATIO);
-			else 
+			else
 				body->setMaxHealth(body->getMaxHealth() / healthFactor, PRESERVE_RATIO);
 		}
-		static const WeaponBonusConditionType wbonus[PLAYERTYPE_COUNT][DIFFICULTY_COUNT] = 
+		static const WeaponBonusConditionType wbonus[PLAYERTYPE_COUNT][DIFFICULTY_COUNT] =
 		{
 			{
 				WEAPONBONUSCONDITION_SOLO_HUMAN_EASY,
@@ -2988,7 +2979,7 @@ void Player::changeBattlePlan( BattlePlanStatus plan, Int delta, BattlePlanBonus
 		}
 		if( bonus->m_holdTheLine > 0 )
 		{
-			bonus->m_holdTheLine			= -1;	
+			bonus->m_holdTheLine			= -1;
 		}
 		if( bonus->m_searchAndDestroy > 0 )
 		{
@@ -3027,7 +3018,7 @@ static void localApplyBattlePlanBonusesToObject( Object *obj, void *userData )
 	Object *objectToValidate = obj;
 	Object *objectToModify = obj;
 
-	DEBUG_LOG(("localApplyBattlePlanBonusesToObject() - looking at object %d (%s)\n",
+	DEBUG_LOG(("localApplyBattlePlanBonusesToObject() - looking at object %d (%s)",
 		(objectToValidate)?objectToValidate->getID():INVALID_ID,
 		(objectToValidate)?objectToValidate->getTemplate()->getName().str():"<No Object>"));
 
@@ -3037,30 +3028,30 @@ static void localApplyBattlePlanBonusesToObject( Object *obj, void *userData )
 	if( isProjectile )
 	{
 		objectToValidate = TheGameLogic->findObjectByID( obj->getProducerID() );
-		DEBUG_LOG(("Object is a projectile - looking at object %d (%s) instead\n",
+		DEBUG_LOG(("Object is a projectile - looking at object %d (%s) instead",
 			(objectToValidate)?objectToValidate->getID():INVALID_ID,
 			(objectToValidate)?objectToValidate->getTemplate()->getName().str():"<No Object>"));
 	}
 	if( objectToValidate && objectToValidate->isAnyKindOf( bonus->m_validKindOf ) )
 	{
-		DEBUG_LOG(("Is valid kindof\n"));
+		DEBUG_LOG(("Is valid kindof"));
 		if( !objectToValidate->isAnyKindOf( bonus->m_invalidKindOf ) )
 		{
-			DEBUG_LOG(("Is not invalid kindof\n"));
+			DEBUG_LOG(("Is not invalid kindof"));
 			//Quite the trek eh? Now we can apply the bonuses!
 			if( !isProjectile )
 			{
-				DEBUG_LOG(("Is not projectile.  Armor scalar is %g\n", bonus->m_armorScalar));
+				DEBUG_LOG(("Is not projectile.  Armor scalar is %g", bonus->m_armorScalar));
 				//Really important to not apply certain bonuses like health augmentation to projectiles!
 				if( bonus->m_armorScalar != 1.0f )
 				{
 					BodyModuleInterface *body = objectToModify->getBodyModule();
 					body->applyDamageScalar( bonus->m_armorScalar );
-					CRCDEBUG_LOG(("Applying armor scalar of %g (%8.8X) to object %d (%ls) owned by player %d\n",
+					CRCDEBUG_LOG(("Applying armor scalar of %g (%8.8X) to object %d (%ls) owned by player %d",
 						bonus->m_armorScalar, AS_INT(bonus->m_armorScalar), objectToModify->getID(),
 						objectToModify->getTemplate()->getDisplayName().str(),
 						objectToModify->getControllingPlayer()->getPlayerIndex()));
-					DEBUG_LOG(("After apply, armor scalar is %g\n", body->getDamageScalar()));
+					DEBUG_LOG(("After apply, armor scalar is %g", body->getDamageScalar()));
 				}
 				if( bonus->m_sightRangeScalar != 1.0f )
 				{
@@ -3135,13 +3126,13 @@ void Player::applyBattlePlanBonusesForPlayerObjects( const BattlePlanBonuses *bo
 	//Only allocate the battle plan bonuses if we actually use it!
 	if( !m_battlePlanBonuses )
 	{
-		DEBUG_LOG(("Allocating new m_battlePlanBonuses\n"));
-		m_battlePlanBonuses = newInstance( BattlePlanBonuses );	
+		DEBUG_LOG(("Allocating new m_battlePlanBonuses"));
+		m_battlePlanBonuses = newInstance( BattlePlanBonuses );
 		*m_battlePlanBonuses = *bonus;
 	}
 	else
 	{
-		DEBUG_LOG(("Adding bonus into existing m_battlePlanBonuses\n"));
+		DEBUG_LOG(("Adding bonus into existing m_battlePlanBonuses"));
 		DUMPBATTLEPLANBONUSES(m_battlePlanBonuses, this, NULL);
 		//Just apply the differences by multiplying the scalars together (kindofs won't change)
 		//These bonuses are used for new objects that are created or objects that are transferred
@@ -3164,7 +3155,7 @@ void Player::applyBattlePlanBonusesForPlayerObjects( const BattlePlanBonuses *bo
 //-------------------------------------------------------------------------------------------------
 /** Create a hotkey team based on this GameMessage */
 //-------------------------------------------------------------------------------------------------
-void Player::processCreateTeamGameMessage(Int hotkeyNum, GameMessage *msg) {
+void Player::processCreateTeamGameMessage(Int hotkeyNum, const GameMessage *msg) {
 	// GameMessage arguments are the object ID's of the objects that are to be in this team.
 
 	if ((hotkeyNum < 0) || (hotkeyNum >= NUM_HOTKEY_SQUADS)) {
@@ -3203,7 +3194,7 @@ void Player::processSelectTeamGameMessage(Int hotkeyNum, GameMessage *msg) {
 
 	VecObjectPtr objectList = m_squads[hotkeyNum]->getLiveObjects();
 	Int numObjs = objectList.size();
-	
+
 	for (Int i = 0; i < numObjs; ++i) {
 		m_currentSelection->addObject(objectList[i]);
 	}
@@ -3261,7 +3252,7 @@ void Player::setCurrentlySelectedAIGroup(AIGroup *group) {
 //-------------------------------------------------------------------------------------------------
 /** Select a hotkey team based on this GameMessage */
 //-------------------------------------------------------------------------------------------------
-Squad *Player::getHotkeySquad(Int squadNumber) 
+Squad *Player::getHotkeySquad(Int squadNumber)
 {
 	if ((squadNumber >= 0) && (squadNumber < NUM_HOTKEY_SQUADS)) {
 		return m_squads[squadNumber];
@@ -3309,7 +3300,7 @@ void Player::addAIGroupToCurrentSelection(AIGroup *group) {
 	if (m_currentSelection == NULL) {
 		m_currentSelection = newInstance( Squad );
 	}
-	
+
 	VecObjectID objectIDVec = group->getAllIDs();
 	Int numObjs = objectIDVec.size();
 	for (Int i = 0; i < numObjs; ++i) {
@@ -3325,7 +3316,7 @@ void Player::addKindOfProductionCostChange(	KindOfMaskType kindOf, Real percent
 	KindOfPercentProductionChangeListIt it = m_kindOfPercentProductionChangeList.begin();
 	while(it != m_kindOfPercentProductionChangeList.end())
 	{
-		
+
 		KindOfPercentProductionChange *tof = *it;
 		if( tof->m_percent == percent && tof->m_kindOf == kindOf)
 		{
@@ -3333,7 +3324,7 @@ void Player::addKindOfProductionCostChange(	KindOfMaskType kindOf, Real percent
 			return;
 		}
 		++it;
-	}	
+	}
 
 	KindOfPercentProductionChange *newTof = newInstance( KindOfPercentProductionChange );
 	newTof->m_kindOf = kindOf;
@@ -3351,7 +3342,7 @@ void Player::removeKindOfProductionCostChange(	KindOfMaskType kindOf, Real perce
 	KindOfPercentProductionChangeListIt it = m_kindOfPercentProductionChangeList.begin();
 	while(it != m_kindOfPercentProductionChangeList.end())
 	{
-		
+
 		KindOfPercentProductionChange* tof = *it;
 		if( tof->m_percent == percent && tof->m_kindOf == kindOf)
 		{
@@ -3359,8 +3350,7 @@ void Player::removeKindOfProductionCostChange(	KindOfMaskType kindOf, Real perce
 			if(tof->m_ref == 0)
 			{
 				m_kindOfPercentProductionChangeList.erase( it );
-				if(tof)
-					deleteInstance(tof);
+				deleteInstance(tof);
 			}
 			return;
 		}
@@ -3378,7 +3368,7 @@ Real Player::getProductionCostChangeBasedOnKindOf( KindOfMaskType kindOf ) const
 	KindOfPercentProductionChangeListIt it = m_kindOfPercentProductionChangeList.begin();
 	while(it != m_kindOfPercentProductionChangeList.end())
 	{
-		
+
 		KindOfPercentProductionChange *tof = *it;
 		if(TEST_KINDOFMASK_MULTI(kindOf, tof->m_kindOf, KINDOFMASK_NONE))
 		{
@@ -3420,7 +3410,7 @@ static void callHandleShroud( Object *obj, void * )
 // ------------------------------------------------------------------------------------------------
 void Player::setUnitsVisionSpied( Bool setting, PlayerIndex byWhom )
 {
-	Bool needRefresh = FALSE; // If this setting is an edge trigger on the reference count, I need 
+	Bool needRefresh = FALSE; // If this setting is an edge trigger on the reference count, I need
 	// to tell all of my guys to handleShroud so they will start/stop looking for the new team.
 
 	if( setting )
@@ -3439,7 +3429,7 @@ void Player::setUnitsVisionSpied( Bool setting, PlayerIndex byWhom )
 	if( needRefresh )
 	{
 		PlayerMaskType workingMask = 0;
-		for (Int i = 0; i < MAX_PLAYER_COUNT; ++i) 
+		for (Int i = 0; i < MAX_PLAYER_COUNT; ++i)
 		{
 			if( m_visionSpiedBy[i] > 0 )
 				BitSet( workingMask, ( 1 << i ) );
@@ -3482,8 +3472,8 @@ Bool Player::isPlayableSide( void ) const
 {
 
 	return m_playerTemplate ? m_playerTemplate->isPlayableSide() : FALSE;
-	
-}  // end isPlayableSide
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -3493,7 +3483,7 @@ void Player::crc( Xfer *xfer )
 	// Player battle plan bonuses
 	Bool battlePlanBonus = m_battlePlanBonuses != NULL;
 	xfer->xferBool( &battlePlanBonus );
-	CRCDEBUG_LOG(("Player %d[%ls] %s battle plans\n", m_playerIndex, m_playerDisplayName.str(), (battlePlanBonus)?"has":"doesn't have"));
+	CRCDEBUG_LOG(("Player %d[%ls] %s battle plans", m_playerIndex, m_playerDisplayName.str(), (battlePlanBonus)?"has":"doesn't have"));
 	if( m_battlePlanBonuses )
 	{
 		CRCDUMPBATTLEPLANBONUSES(m_battlePlanBonuses, this, NULL);
@@ -3505,14 +3495,14 @@ void Player::crc( Xfer *xfer )
 		m_battlePlanBonuses->m_validKindOf.xfer(xfer);
 		m_battlePlanBonuses->m_invalidKindOf.xfer(xfer);
 	}
-	
+
 	// People have reported memory hacking their points.  That would work since
 	// buttons are authoritative, and these points just unhided buttons.
 	// Same cheat principle as pulling NeedScience off your Generals buttons.
 	xfer->xferInt( &m_skillPoints );
 	xfer->xferInt( &m_sciencePurchasePoints );
-	
-}  // end crc
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -3572,9 +3562,9 @@ void Player::xfer( Xfer *xfer )
 			// xfer upgrade data
 			xfer->xferSnapshot( upgrade );
 
-		}  // end for, upgrade
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		const UpgradeTemplate *upgradeTemplate;
@@ -3587,25 +3577,25 @@ void Player::xfer( Xfer *xfer )
 
 			// find template for this upgrade
 			upgradeTemplate = TheUpgradeCenter->findUpgrade( upgradeName );
-			
+
 			// sanity
 			if( upgradeTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "Player::xfer - Unable to find upgrade '%s'\n", upgradeName.str() ));
+				DEBUG_CRASH(( "Player::xfer - Unable to find upgrade '%s'", upgradeName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// add upgrade to player, the status is invalid, but that's OK cause we're about to xfer it
 			upgrade = addUpgrade( upgradeTemplate, UPGRADE_STATUS_INVALID );
 
 			// xfer upgrade data
 			xfer->xferSnapshot( upgrade );
-						
-		}  // end for, i
 
-	}  // end else, load
+		}
+
+	}
 
 	// radar info
 	xfer->xferInt( &m_radarCount );
@@ -3641,9 +3631,9 @@ void Player::xfer( Xfer *xfer )
 			prototypeID = prototype->getID();
 			xfer->xferUser( &prototypeID, sizeof( TeamPrototypeID ) );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -3664,17 +3654,17 @@ void Player::xfer( Xfer *xfer )
 			if( prototype == NULL )
 			{
 
-				DEBUG_CRASH(( "Player::xfer - Unable to find team prototype by id\n" ));
+				DEBUG_CRASH(( "Player::xfer - Unable to find team prototype by id" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// put in list
 			m_playerTeamPrototypes.push_back( prototype );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// build list info
 	UnsignedShort buildListInfoCount = 0;
@@ -3689,7 +3679,7 @@ void Player::xfer( Xfer *xfer )
 		for( buildListInfo = m_pBuildList; buildListInfo; buildListInfo = buildListInfo->getNext() )
 			xfer->xferSnapshot( buildListInfo );
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -3697,8 +3687,7 @@ void Player::xfer( Xfer *xfer )
 		// destroy any build list that we got from loading the bare bones map, note that deleting
 		// the head of these structures automatically deletes any links attached
 		//
-		if( m_pBuildList)
-			deleteInstance(m_pBuildList);
+		deleteInstance(m_pBuildList);
 		m_pBuildList = NULL;
 
 		// read each build list info
@@ -3706,7 +3695,7 @@ void Player::xfer( Xfer *xfer )
 		{
 
 			// allocate new build list
-			buildListInfo = newInstance( BuildListInfo );	
+			buildListInfo = newInstance( BuildListInfo );
 			buildListInfo->setNextBuildList( NULL );
 
 			// attach to the *end* of the list in the player
@@ -3721,14 +3710,14 @@ void Player::xfer( Xfer *xfer )
 
 				last->setNextBuildList( buildListInfo );
 
-			}  // end else
+			}
 
 			// xfer data
 			xfer->xferSnapshot( buildListInfo );
 
-		}  // end for,i
+		}
 
-	}  // end else, load
+	}
 
 	// ai player data
 	Bool aiPlayerPresent = m_ai ? TRUE : FALSE;
@@ -3736,24 +3725,24 @@ void Player::xfer( Xfer *xfer )
 	if( (aiPlayerPresent == TRUE && m_ai == NULL) || (aiPlayerPresent == FALSE && m_ai != NULL) )
 	{
 
-		DEBUG_CRASH(( "Player::xfer - m_ai present/missing mismatch\n" ));
-		throw SC_INVALID_DATA;;
+		DEBUG_CRASH(( "Player::xfer - m_ai present/missing mismatch" ));
+		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	if( m_ai )
 		xfer->xferSnapshot( m_ai );
 
 	// resource gathering manager
 	Bool resourceGatheringManagerPresent = m_resourceGatheringManager ? TRUE : FALSE;
 	xfer->xferBool( &resourceGatheringManagerPresent );
-	if( (resourceGatheringManagerPresent == TRUE && m_resourceGatheringManager == NULL) ||	
+	if( (resourceGatheringManagerPresent == TRUE && m_resourceGatheringManager == NULL) ||
 			(resourceGatheringManagerPresent == FALSE && m_resourceGatheringManager != NULL ) )
 	{
 
-		DEBUG_CRASH(( "Player::xfer - m_resourceGatheringManager present/missing mismatch\n" ));
+		DEBUG_CRASH(( "Player::xfer - m_resourceGatheringManager present/missing mismatch" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	if( m_resourceGatheringManager )
 		xfer->xferSnapshot( m_resourceGatheringManager );
 
@@ -3764,10 +3753,10 @@ void Player::xfer( Xfer *xfer )
 			(tunnelTrackerPresent == FALSE && m_tunnelSystem != NULL) )
 	{
 
-		DEBUG_CRASH(( "Player::xfer - m_tunnelSystem present/missing mismatch\n" ));
+		DEBUG_CRASH(( "Player::xfer - m_tunnelSystem present/missing mismatch" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	if( m_tunnelSystem )
 		xfer->xferSnapshot( m_tunnelSystem );
 
@@ -3853,11 +3842,11 @@ void Player::xfer( Xfer *xfer )
 	// observer
 	xfer->xferBool( &m_observer );
 
-	if (version >= 2) 
+	if (version >= 2)
 	{
 		// current skill point modifier value
 		xfer->xferReal( &m_skillPointsModifier);
-	} 
+	}
 	else
 	{
 		m_skillPointsModifier = 1.0f;
@@ -3886,7 +3875,7 @@ void Player::xfer( Xfer *xfer )
 	// score keeper
 	xfer->xferSnapshot( &m_scoreKeeper );
 
-	
+
 
 
 
@@ -3917,27 +3906,27 @@ void Player::xfer( Xfer *xfer )
 			// ref
 			xfer->xferUnsignedInt( &entry->m_ref );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
 		// sanity, list must be empty right now
-		if( m_kindOfPercentProductionChangeList.size() != 0 )
+		if( !m_kindOfPercentProductionChangeList.empty() )
 		{
 
-			DEBUG_CRASH(( "Player::xfer - m_kindOfPercentProductionChangeList should be empty but is not\n" ));
+			DEBUG_CRASH(( "Player::xfer - m_kindOfPercentProductionChangeList should be empty but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each entry
 		for( UnsignedInt i = 0; i < percentProductionChangeCount; ++i )
 		{
 
 			// allocate new entry
-			entry = newInstance( KindOfPercentProductionChange );	
+			entry = newInstance( KindOfPercentProductionChange );
 
 			// read data
 			entry->m_kindOf.xfer(xfer);
@@ -3947,9 +3936,9 @@ void Player::xfer( Xfer *xfer )
 			// put at end of list
 			m_kindOfPercentProductionChangeList.push_back( entry );
 
-		}  // end for i
+		}
 
-	}  // end else, load
+	}
 
 
 
@@ -3977,16 +3966,16 @@ void Player::xfer( Xfer *xfer )
 		}
 		else
 		{
-			if( m_specialPowerReadyTimerList.size() != 0 ) // sanity, list must be empty right now
+			if( !m_specialPowerReadyTimerList.empty() ) // sanity, list must be empty right now
 			{
-				DEBUG_CRASH(( "Player::xfer - m_specialPowerReadyTimerList should be empty but is not\n" ));
+				DEBUG_CRASH(( "Player::xfer - m_specialPowerReadyTimerList should be empty but is not" ));
 				throw SC_INVALID_DATA;
-			}  // end if
+			}
 
 			// read each entry
 			for( UnsignedInt i = 0; i < timerListSize; ++i )
 			{
-				SpecialPowerReadyTimerType timer;	
+				SpecialPowerReadyTimerType timer;
 
 				// read data
 				xfer->xferUnsignedInt( &timer.m_templateID );
@@ -3995,7 +3984,7 @@ void Player::xfer( Xfer *xfer )
 				// put at end of list
 				m_specialPowerReadyTimerList.push_back( timer );
 
-			}  // end for i
+			}
 		}
 	}
 	///////////////////////////////////////////////////////////////////////////
@@ -4009,24 +3998,24 @@ void Player::xfer( Xfer *xfer )
 	if( squadCount != NUM_HOTKEY_SQUADS )
 	{
 
-		DEBUG_CRASH(( "Player::xfer - size of m_squadCount array has changed\n" ));
+		DEBUG_CRASH(( "Player::xfer - size of m_squadCount array has changed" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( UnsignedShort i = 0; i < squadCount; ++i )
 	{
 
 		if( m_squads[ i ] == NULL )
 		{
 
-			DEBUG_CRASH(( "Player::xfer - NULL squad at index '%d'\n", i ));
+			DEBUG_CRASH(( "Player::xfer - NULL squad at index '%d'", i ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		xfer->xferSnapshot( m_squads[ i ] );
 
-	}  // end for, i
+	}
 
 	// current squad selection
 	Bool currentSelectionPresent = m_currentSelection ? TRUE : FALSE;
@@ -4041,21 +4030,19 @@ void Player::xfer( Xfer *xfer )
 		// xfer
 		xfer->xferSnapshot( m_currentSelection );
 
-	}  // end if
+	}
 
 	// Player battle plan bonuses
 	Bool battlePlanBonus = m_battlePlanBonuses != NULL;
 	xfer->xferBool( &battlePlanBonus ); //If we're loading, it just replaces the bool
 	if( xfer->getXferMode() == XFER_LOAD )
 	{
-		if (m_battlePlanBonuses)
-		{
-			deleteInstance(m_battlePlanBonuses);
-			m_battlePlanBonuses = NULL;
-		}
+		deleteInstance(m_battlePlanBonuses);
+		m_battlePlanBonuses = NULL;
+
 		if ( battlePlanBonus )
 		{
-			m_battlePlanBonuses = newInstance( BattlePlanBonuses );	
+			m_battlePlanBonuses = newInstance( BattlePlanBonuses );
 		}
 	}
 	if( m_battlePlanBonuses )
@@ -4079,7 +4066,7 @@ void Player::xfer( Xfer *xfer )
 	else
 		m_unitsShouldHunt = FALSE;
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4087,5 +4074,5 @@ void Player::xfer( Xfer *xfer )
 void Player::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/PlayerList.cpp b/Generals/Code/GameEngine/Source/Common/RTS/PlayerList.cpp
index 7d1d043aaa3..a14fce84fe5 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/PlayerList.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/PlayerList.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PlayerList.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,7 +42,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Errors.h"
 #include "Common/DataChunk.h"
@@ -60,11 +60,6 @@
 #include "GameLogic/SidesList.h"
 #include "GameNetwork/NetworkDefs.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 /*extern*/ PlayerList *ThePlayerList = NULL;
@@ -81,28 +76,25 @@ PlayerList::PlayerList() :
 }
 
 //-----------------------------------------------------------------------------
-PlayerList::~PlayerList() 
+PlayerList::~PlayerList()
 {
-	try {
-		// the world is happier if we reinit things before destroying them,
-		// to avoid debug warnings
-		init();
-	} catch (...) {
-		// nothing
-	}
+	// the world is happier if we reinit things before destroying them,
+	// to avoid debug warnings
+	init();
+
 	for( Int i = 0; i < MAX_PLAYER_COUNT; ++i )
 		delete m_players[ i ];
 }
 
 //-----------------------------------------------------------------------------
-Player *PlayerList::getNthPlayer(Int i) 
-{ 
+Player *PlayerList::getNthPlayer(Int i)
+{
 	if( i < 0 || i >= MAX_PLAYER_COUNT )
 	{
-//		DEBUG_CRASH( ("Illegal player index\n") );
+//		DEBUG_CRASH( ("Illegal player index") );
 		return NULL;
 	}
-	return m_players[i]; 
+	return m_players[i];
 }
 
 //-----------------------------------------------------------------------------
@@ -155,7 +147,7 @@ void PlayerList::newGame()
 		Bool exists;	// throwaway, since we don't care if it exists
 		if (d->getBool(TheKey_multiplayerIsLocal, &exists))
 		{
-			DEBUG_LOG(("Player %s is multiplayer local\n", pname.str()));
+			DEBUG_LOG(("Player %s is multiplayer local", pname.str()));
 			setLocalPlayer(p);
 			setLocal = true;
 		}
@@ -174,7 +166,7 @@ void PlayerList::newGame()
 
 	if (!setLocal)
 	{
-		DEBUG_ASSERTCRASH(TheNetwork, ("*** Map has no human player... picking first nonneutral player for control\n"));
+		DEBUG_ASSERTCRASH(TheNetwork, ("*** Map has no human player... picking first nonneutral player for control"));
 		for( i = 0; i < TheSidesList->getNumSides(); i++)
 		{
 			Player* p = getNthPlayer(i);
@@ -208,7 +200,7 @@ void PlayerList::newGame()
 			}
 			else
 			{
-				DEBUG_LOG(("unknown enemy %s\n",tok.str()));
+				DEBUG_LOG(("unknown enemy %s",tok.str()));
 			}
 		}
 
@@ -222,7 +214,7 @@ void PlayerList::newGame()
 			}
 			else
 			{
-				DEBUG_LOG(("unknown ally %s\n",tok.str()));
+				DEBUG_LOG(("unknown ally %s",tok.str()));
 			}
 		}
 
@@ -257,7 +249,7 @@ void PlayerList::update()
 	for( Int i = 0; i < MAX_PLAYER_COUNT; i++ )
 	{
 		m_players[i]->update();
-	}  // end for i
+	}
 
 }
 
@@ -268,7 +260,7 @@ void PlayerList::newMap()
 	for( Int i = 0; i < MAX_PLAYER_COUNT; i++ )
 	{
 		m_players[i]->newMap();
-	}  // end for i
+	}
 
 }
 
@@ -282,13 +274,13 @@ void PlayerList::teamAboutToBeDeleted(Team* team)
 }
 
 //=============================================================================
-void PlayerList::updateTeamStates(void) 
+void PlayerList::updateTeamStates(void)
 {
 	// Clear team flags for all players.
 	for( Int i = 0; i < MAX_PLAYER_COUNT; i++ )
 	{
 		m_players[i]->updateTeamStates();
-	}  // end for i
+	}
 }
 
 //-----------------------------------------------------------------------------
@@ -298,11 +290,11 @@ Team *PlayerList::validateTeam( AsciiString owner )
 	Team *t = TheTeamFactory->findTeam(owner);
 	if (t)
 	{
-		//DEBUG_LOG(("assigned obj %08lx to team %s\n",obj,owner.str()));
-	}	
+		//DEBUG_LOG(("assigned obj %08lx to team %s",obj,owner.str()));
+	}
 	else
 	{
-		DEBUG_CRASH(("no team or player named %s could be found!\n", owner.str()));
+		DEBUG_CRASH(("no team or player named %s could be found!", owner.str()));
 		t = getNeutralPlayer()->getDefaultTeam();
 	}
 	return t;
@@ -330,22 +322,20 @@ void PlayerList::setLocalPlayer(Player *player)
 #ifdef INTENSE_DEBUG
 	if (player)
 	{
-		DEBUG_LOG(("\n----------\n"));
 		// did you know? you can use "%ls" to print a doublebyte string, even in a single-byte printf...
-		DEBUG_LOG(("Switching local players. The new player is named '%ls' (%s) and owns the following objects:\n",
+		DEBUG_LOG(("Switching local players. The new player is named '%ls' (%s) and owns the following objects:",
 			player->getPlayerDisplayName().str(),
 			TheNameKeyGenerator->keyToName(player->getPlayerNameKey()).str()
 		));
 		for (Object *obj = player->getFirstOwnedObject(); obj; obj = obj->getNextOwnedObject())
 		{
-			DEBUG_LOG(("Obj %08lx is of type %s",obj,obj->getTemplate()->getName().str()));
+			DEBUG_LOG_RAW(("Obj %08lx is of type %s",obj,obj->getTemplate()->getName().str()));
 			if (!player->canBuild(obj->getTemplate()))
 			{
-				DEBUG_LOG((" (NOT BUILDABLE)"));
+				DEBUG_LOG_RAW((" (NOT BUILDABLE)"));
 			}
-			DEBUG_LOG(("\n"));
+			DEBUG_LOG_RAW(("\n"));
 		}
-		DEBUG_LOG(("\n----------\n"));
 	}
 #endif
 
@@ -359,17 +349,17 @@ Player *PlayerList::getPlayerFromMask( PlayerMaskType mask )
 
 	for( i = 0; i < MAX_PLAYER_COUNT; i++ )
 	{
-		
+
 		player = getNthPlayer( i );
 		if( player && player->getPlayerMask() == mask )
 			return player;
 
-	}  // end for i
+	}
 
-	DEBUG_CRASH( ("Player does not exist for mask\n") );
+	DEBUG_CRASH( ("Player does not exist for mask") );
 	return NULL; // mask not found
 
-}  // end getPlayerFromMask
+}
 
 //-----------------------------------------------------------------------------
 Player *PlayerList::getEachPlayerFromMask( PlayerMaskType& maskToAdjust )
@@ -379,16 +369,16 @@ Player *PlayerList::getEachPlayerFromMask( PlayerMaskType& maskToAdjust )
 
 	for( i = 0; i < MAX_PLAYER_COUNT; i++ )
 	{
-		
+
 		player = getNthPlayer( i );
 		if ( player && BitIsSet(player->getPlayerMask(), maskToAdjust ))
 		{
 			maskToAdjust &= (~player->getPlayerMask());
 			return player;
 		}
-	}  // end for i
+	}
 
-	DEBUG_CRASH( ("No players found that contain any matching masks.\n") );
+	DEBUG_CRASH( ("No players found that contain any matching masks.") );
 	maskToAdjust = 0;
 	return NULL; // mask not found
 }
@@ -473,16 +463,16 @@ void PlayerList::xfer( Xfer *xfer )
 	if( playerCount != m_playerCount )
 	{
 
-		DEBUG_CRASH(( "Invalid player count '%d', should be '%d'\n", playerCount, m_playerCount ));
+		DEBUG_CRASH(( "Invalid player count '%d', should be '%d'", playerCount, m_playerCount ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// xfer each of the player data
 	for( Int i = 0; i < playerCount; ++i )
 		xfer->xferSnapshot( m_players[ i ] );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -490,5 +480,5 @@ void PlayerList::xfer( Xfer *xfer )
 void PlayerList::loadPostProcess( void )
 {
 
-}  // end postProcessLoad
+}
 
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp b/Generals/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp
index 3c542e9d1c1..3a07fa73bf9 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PlayerTemplate.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,7 +42,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_VETERANCY_NAMES				// for TheVeterancyNames[]
 
@@ -53,11 +53,6 @@
 #include "Common/Science.h"
 #include "GameClient/Image.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -70,7 +65,7 @@
 //-------------------------------------------------------------------------------------------------
 /*static*/ const FieldParse* PlayerTemplate::getFieldParse()
 {
-	static const FieldParse TheFieldParseTable[] = 
+	static const FieldParse TheFieldParseTable[] =
 	{
 		{ "Side",											INI::parseAsciiString,													NULL, offsetof( PlayerTemplate, m_side ) },
 		{ "PlayableSide",							INI::parseBool,																	NULL, offsetof( PlayerTemplate, m_playableSide ) },
@@ -176,15 +171,15 @@ AsciiString PlayerTemplate::getStartingUnit( Int i ) const
 	// assign the money into the 'Money' (m_money) pointed to at 'store'
 	Money *theMoney = (Money *)store;
 	theMoney->init();
-	theMoney->deposit( money );
+	theMoney->setStartingCash(money);
 
-}  // end parseStartMoney
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-PlayerTemplate::PlayerTemplate() : 
+PlayerTemplate::PlayerTemplate() :
 	m_nameKey(NAMEKEY_INVALID),
 	m_observer(false),
 	m_playableSide(false),
@@ -244,13 +239,13 @@ const Image *PlayerTemplate::getEnabledImage( void ) const
 /*extern*/ PlayerTemplateStore *ThePlayerTemplateStore = NULL;
 
 //-----------------------------------------------------------------------------
-PlayerTemplateStore::PlayerTemplateStore() 
+PlayerTemplateStore::PlayerTemplateStore()
 {
 	// nothing
 }
 
 //-----------------------------------------------------------------------------
-PlayerTemplateStore::~PlayerTemplateStore() 
+PlayerTemplateStore::~PlayerTemplateStore()
 {
 	// nothing
 }
@@ -328,36 +323,36 @@ const PlayerTemplate* PlayerTemplateStore::getNthPlayerTemplate(Int i) const
 }
 
 //-------------------------------------------------------------------------------------------------
-// @todo: PERF_EVALUATE Get a perf timer on this. 
-// If this function is called frequently, there are some relatively trivial changes we could make to 
+// @todo: PERF_EVALUATE Get a perf timer on this.
+// If this function is called frequently, there are some relatively trivial changes we could make to
 // have it run a lot faster.
 void PlayerTemplateStore::getAllSideStrings(AsciiStringList *outStringList)
 {
-	if (!outStringList) 
+	if (!outStringList)
 		return;
 
 	// should outStringList be cleared first? If so, that would go here
 	AsciiStringList tmpList;
 
 	Int numTemplates = getPlayerTemplateCount();
-	for ( Int i = 0; i < numTemplates; ++i ) 
+	for ( Int i = 0; i < numTemplates; ++i )
 	{
 		const PlayerTemplate *pt = getNthPlayerTemplate(i);
 		// Sanity
-		if (!pt)			
-			continue; 
+		if (!pt)
+			continue;
 
 		if (std::find(tmpList.begin(), tmpList.end(), pt->getSide()) == tmpList.end())
 			tmpList.push_back(pt->getSide());
 	}
 	// tmpList is now filled with all unique sides found in the player templates.
 
-	// splice is a constant-time function which takes all elements from tmpList and 
+	// splice is a constant-time function which takes all elements from tmpList and
 	// inserts them before outStringList->end(), and also removes them from tmpList
 	outStringList->splice(outStringList->end(), tmpList);
-	
+
 	// all done
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ void PlayerTemplateStore::parsePlayerTemplateDefinition( INI* ini )
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp
index ce38ddcaa5e..1decc6c6e62 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ProductionPrerequisite.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,7 +42,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ProductionPrerequisite.h"
 #include "Common/Player.h"
@@ -52,14 +52,9 @@
 #include "GameClient/Drawable.h"
 #include "GameClient/GameText.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
-ProductionPrerequisite::ProductionPrerequisite() 
+ProductionPrerequisite::ProductionPrerequisite()
 {
 	init();
 }
@@ -74,7 +69,7 @@ void ProductionPrerequisite::init()
 {
 	m_prereqUnits.clear();
 	m_prereqSciences.clear();
-	
+
 }
 
 //=============================================================================
@@ -93,7 +88,7 @@ void ProductionPrerequisite::resolveNames()
  		/** @todo for now removing this assert until we can completely remove
  		the GDF stuff, the problem is that some INI files refer to GDF names, and they
  		aren't yet loaded in the world builder but will all go away later anyway etc */
-		DEBUG_ASSERTCRASH(m_prereqUnits[i].unit,("could not find prereq %s\n",m_prereqUnits[i].name.str()));
+		DEBUG_ASSERTCRASH(m_prereqUnits[i].unit,("could not find prereq %s",m_prereqUnits[i].name.str()));
 
 		m_prereqUnits[i].name.clear(); // we're done with it
 
@@ -133,7 +128,7 @@ Int ProductionPrerequisite::getAllPossibleBuildFacilityTemplates(const ThingTemp
 const ThingTemplate *ProductionPrerequisite::getExistingBuildFacilityTemplate( const Player *player ) const
 {
 	DEBUG_ASSERTCRASH(player, ("player may not be null"));
-	if (m_prereqUnits.size())
+	if (!m_prereqUnits.empty())
 	{
 		Int ownCount[MAX_PREREQ];
 		Int cnt = calcNumPrereqUnitsOwned(player, ownCount);
@@ -143,7 +138,7 @@ const ThingTemplate *ProductionPrerequisite::getExistingBuildFacilityTemplate( c
 				break;
 			if (ownCount[i])
 				return m_prereqUnits[i].unit;
-		} 
+		}
 	}
 	return NULL;
 }
@@ -180,7 +175,7 @@ Bool ProductionPrerequisite::isSatisfied(const Player *player) const
 	for (i = 0; i < cnt; i++)
 	{
 		if (ownCount[i] == -1)	// the magic "ignore me" flag
-			continue;	
+			continue;
 		if (ownCount[i] == 0)		// everything not ignored, is required
 			return false;
 	}
@@ -191,7 +186,7 @@ Bool ProductionPrerequisite::isSatisfied(const Player *player) const
 //-------------------------------------------------------------------------------------------------
 /** Add a unit prerequisite, if 'orWithPrevious' is set then this unit is said
 	* to be an alternate prereq to the previously added unit, otherwise this becomes
-	* a new 'block' and is required in ADDDITION to other entries. 
+	* a new 'block' and is required in ADDDITION to other entries.
 	* Return FALSE if no space left to add unit */
 //-------------------------------------------------------------------------------------------------
 void ProductionPrerequisite::addUnitPrereq( AsciiString unit, Bool orUnitWithPrevious )
@@ -202,12 +197,12 @@ void ProductionPrerequisite::addUnitPrereq( AsciiString unit, Bool orUnitWithPre
 	info.unit = NULL;
 	m_prereqUnits.push_back(info);
 
-}  // end addUnitPrereq
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Add a unit prerequisite, if 'orWithPrevious' is set then this unit is said
 	* to be an alternate prereq to the previously added unit, otherwise this becomes
-	* a new 'block' and is required in ADDDITION to other entries. 
+	* a new 'block' and is required in ADDDITION to other entries.
 	* Return FALSE if no space left to add unit */
 //-------------------------------------------------------------------------------------------------
 void ProductionPrerequisite::addUnitPrereq( const std::vector<AsciiString>& units )
@@ -219,7 +214,7 @@ void ProductionPrerequisite::addUnitPrereq( const std::vector<AsciiString>& unit
 		orWithPrevious = true;
 	}
 
-}  // end addUnitPrereq
+}
 
 //-------------------------------------------------------------------------------------------------
 // returns an asciistring which is a list of all the prerequisites
@@ -232,21 +227,17 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons
 		return UnicodeString::TheEmptyString;
 
 	UnicodeString requiresList = UnicodeString::TheEmptyString;
-		
+
 	// check the prerequired units
 	Int ownCount[MAX_PREREQ];
 	Int cnt = calcNumPrereqUnitsOwned(player, ownCount);
 	Int i;
 
 	Bool orRequirements[MAX_PREREQ];
-	//Added for fix below in getRequiresList
-	//By Sadullah Nader
-	//Initializes the OR_WITH_PREV structures
 	for (i = 0; i < MAX_PREREQ; i++)
 	{
 		orRequirements[i] = FALSE;
 	}
-	//
 	// account for the "or" unit cases, start for loop at 1
 	for (i = 1; i < cnt; i++)
 	{
@@ -257,7 +248,7 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons
 			ownCount[i-1] = -1;						// flag for "ignore me"
 		}
 	}
-	
+
 	// check to see if anything is required
 	const ThingTemplate *unit;
 	UnicodeString unitName;
@@ -266,7 +257,7 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons
 	{
 		// we have an unfulfilled requirement
 		if (ownCount[i] == 0) {
-			
+
 			if(orRequirements[i])
 			{
 				unit = m_prereqUnits[i-1].unit;
@@ -316,4 +307,4 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons
 
 	// return final list
 	return requiresList;
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp
index 3ddc0472b0a..b0cef87c976 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp
@@ -27,7 +27,7 @@
 // gathering type decisions based on them.
 // Author: Graham Smallwood, January, 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ResourceGatheringManager.h"
 
@@ -108,14 +108,14 @@ void ResourceGatheringManager::removeSupplyWarehouse( Object *oldWarehouse )
 static Real computeRelativeCost( Object *queryObject, Object *destObject, Real *pureDistanceSquared )
 {
 	/** @todo This gets filled with Pathfinding computations, analysis of Boxes remaining,
-			Threat calculations, paths of other trucks, and other fancy stuff. 
+			Threat calculations, paths of other trucks, and other fancy stuff.
 	*/
 
 	//A good score is a very small number.
 
 	if( queryObject == NULL  ||  destObject == NULL )
 		return FLT_MAX;
-	
+
 	if( !TheActionManager->canTransferSuppliesAt(queryObject, destObject) )
 		return FLT_MAX;// Handles emptyness and alliances
 
@@ -129,7 +129,7 @@ static Real computeRelativeCost( Object *queryObject, Object *destObject, Real *
 
 	// I need the distance, but I don't want to count on the coincidence that
 	// the abstract 'cost' this function returns happens to be just the distance, since it could
-	// become more complicated	
+	// become more complicated
 	if( pureDistanceSquared )
 		*pureDistanceSquared = distSquared;
 
@@ -258,7 +258,7 @@ Object *ResourceGatheringManager::findBestSupplyCenter( Object *queryObject )
 void ResourceGatheringManager::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -279,7 +279,7 @@ void ResourceGatheringManager::xfer( Xfer *xfer )
 	// supply centers
 	xfer->xferSTLObjectIDList( &m_supplyCenters );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -287,5 +287,5 @@ void ResourceGatheringManager::xfer( Xfer *xfer )
 void ResourceGatheringManager::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Science.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Science.cpp
index 930740923a5..2951c86dd8c 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/Science.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/Science.cpp
@@ -27,7 +27,7 @@
 // Desc:      @todo
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/Player.h"
@@ -35,11 +35,6 @@
 
 ScienceStore* TheScienceStore = NULL;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 void ScienceStore::init()
@@ -59,9 +54,7 @@ ScienceStore::~ScienceStore()
 	{
 		ScienceInfo* si = *it;
 		++it;
-		if (si) {
-			deleteInstance(si);
-		}
+		deleteInstance(si);
 	}
 }
 
@@ -168,7 +161,7 @@ const ScienceInfo* ScienceStore::findScienceInfo(ScienceType st) const
 	if (TheScienceStore)
 	{
 
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "PrerequisiteSciences", INI::parseScienceVector, NULL, offsetof( ScienceInfo, m_prereqSciences ) },
 			{ "SciencePurchasePointCost", INI::parseInt, NULL, offsetof( ScienceInfo, m_sciencePurchasePointCost ) },
@@ -191,10 +184,10 @@ const ScienceInfo* ScienceStore::findScienceInfo(ScienceType st) const
 			}
 		}
 
-		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES) 
+		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES)
 		{
 			ScienceInfo* newInfo = newInstance(ScienceInfo);
-			
+
 			if (info == NULL)
 			{
 				// only add if it's not overriding an existing one.
@@ -215,12 +208,12 @@ const ScienceInfo* ScienceStore::findScienceInfo(ScienceType st) const
 				info = newInfo;
 				//TheScienceStore->m_sciences.push_back(info);	// NO, BAD, WRONG -- don't add in this case.
 			}
-		} 
+		}
 		else
 		{
 			if (info != NULL)
 			{
-				DEBUG_CRASH(("duplicate science %s!\n",c));
+				DEBUG_CRASH(("duplicate science %s!",c));
 				throw INI_INVALID_DATA;
 			}
 			info = newInstance(ScienceInfo);
@@ -320,7 +313,7 @@ Bool ScienceStore::playerHasRootPrereqsForScience(const Player* player, ScienceT
 }
 
 //-----------------------------------------------------------------------------
-/** return a list of the sciences the given player can purchase now, and a list he might be able to purchase in the future, 
+/** return a list of the sciences the given player can purchase now, and a list he might be able to purchase in the future,
 	but currently lacks prereqs or points for. (either might be an empty list) */
 void ScienceStore::getPurchasableSciences(const Player* player, ScienceVec& purchasable, ScienceVec& potentiallyPurchasable) const
 {
@@ -329,7 +322,7 @@ void ScienceStore::getPurchasableSciences(const Player* player, ScienceVec& purc
 	for (ScienceInfoVec::const_iterator it = m_sciences.begin(); it != m_sciences.end(); ++it)
 	{
 		const ScienceInfo* si = (const ScienceInfo*)(*it)->getFinalOverride();
-		
+
 		if (si->m_sciencePurchasePointCost == 0)
 		{
 			// 0 means "cannot be purchased"
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp
index 27c68244827..0056c1f7e03 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ScoreKeeper.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jun 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ScoreKeeper.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Score Keeper class will be an object attached to each player
 //						that will maintain accurate counts for the various stats we
 //						want to show on the score screen.  The information in here
@@ -53,7 +53,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/KindOf.h"
@@ -102,10 +102,7 @@ void ScoreKeeper::reset( Int playerIdx )
 	m_totalMoneyEarned = m_totalMoneySpent = 0;
 	m_totalUnitsLost = m_totalUnitsBuilt = 0;
 	m_totalBuildingsLost = m_totalBuildingsBuilt = 0;
-	//Added By Sadullah Nader
-	//Initializtion(s) inserted
-	m_totalFactionBuildingsCaptured = m_totalTechBuildingsCaptured = 0;	
-	//
+	m_totalFactionBuildingsCaptured = m_totalTechBuildingsCaptured = 0;
 	m_currentScore = 0;
 	m_objectsBuilt.clear();
 	m_objectsCaptured.clear();
@@ -117,7 +114,7 @@ void ScoreKeeper::reset( Int playerIdx )
 	}
 	m_myPlayerIdx	= playerIdx;
 }
-	
+
 void ScoreKeeper::addObjectBuilt( const Object *o)
 {
 	Bool addToCount = FALSE;
@@ -144,7 +141,7 @@ void ScoreKeeper::addObjectBuilt( const Object *o)
 			addToCount = TRUE;
 		}
 	}
-	
+
 	if(addToCount)
 	{
 		Int existingCount = 0;
@@ -174,7 +171,7 @@ Int ScoreKeeper::getTotalObjectsBuilt( const ThingTemplate *pTemplate )
 	for (ObjectCountMapIt it = m_objectsBuilt.begin(); it != m_objectsBuilt.end(); ++it)
 	{
 		const ThingTemplate *theTemplate = it->first;
-		if (theTemplate->isEquivalentTo(pTemplate))
+		if (theTemplate && theTemplate->isEquivalentTo(pTemplate))
 			++count;
 	}
 	return count;
@@ -236,7 +233,7 @@ void ScoreKeeper::addObjectCaptured( const Object *o )
 		}
 		addToCount = TRUE;
 	}
-	
+
 	if(addToCount)
 	{
 		Int existingCount = 0;
@@ -283,7 +280,7 @@ void ScoreKeeper::addObjectDestroyed( const Object *o)
 			}
 		}
 	}
-	
+
 	if(addToCount)
 	{
 		Int existingCount = 0;
@@ -325,7 +322,7 @@ void ScoreKeeper::addObjectLost( const Object *o )
 			}
 		}
 	}
-	
+
 	if(addToCount)
 	{
 		Int existingCount = 0;
@@ -333,7 +330,7 @@ void ScoreKeeper::addObjectLost( const Object *o )
 		if (it != m_objectsLost.end())
 			existingCount = it->second;
 		m_objectsLost[o->getTemplate()] = existingCount + 1;
-	}	
+	}
 }
 
 Int ScoreKeeper::calculateScore( void )
@@ -368,12 +365,12 @@ Int ScoreKeeper::getTotalBuildingsDestroyed( void )
 //		if(i == m_myPlayerIdx)
 //			continue;
 		count += m_totalBuildingsDestroyed[i];
-		//for (ObjectCountMapIt it = m_objectsDestroyed[i].begin(); it != m_objectsDestroyed[i].end(); ++it) 
+		//for (ObjectCountMapIt it = m_objectsDestroyed[i].begin(); it != m_objectsDestroyed[i].end(); ++it)
 		//		{
-		//			
+		//
 		//			count += it->second;
 		//		}
-		
+
 	}
 	return count;
 }
@@ -386,7 +383,7 @@ Int ScoreKeeper::getTotalUnitsDestroyed( void )
 //		if(i == m_myPlayerIdx)
 //			continue;
 		count += m_totalUnitsDestroyed[i];
-//		for (ObjectCountMapIt it = m_objectsDestroyed[i].begin(); it != m_objectsDestroyed[i].end(); ++it) 
+//		for (ObjectCountMapIt it = m_objectsDestroyed[i].begin(); it != m_objectsDestroyed[i].end(); ++it)
 //		{
 //		}
 	}
@@ -399,7 +396,7 @@ Int ScoreKeeper::getTotalUnitsDestroyed( void )
 void ScoreKeeper::crc( Xfer *xfer )
 {
 
-}  // end ScoreKeeper
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer of an object count map
@@ -413,10 +410,10 @@ void ScoreKeeper::xferObjectCountMap( Xfer *xfer, ObjectCountMap *map )
 	if( map == NULL )
 	{
 
-		DEBUG_CRASH(( "xferObjectCountMap - Invalid map parameter\n" ));
+		DEBUG_CRASH(( "xferObjectCountMap - Invalid map parameter" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// version info
 	XferVersion currentVersion = 1;
@@ -434,7 +431,7 @@ void ScoreKeeper::xferObjectCountMap( Xfer *xfer, ObjectCountMap *map )
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
 		ObjectCountMapIt it;
-		
+
 		// save all entries
 		for( it = map->begin(); it != map->end(); ++it )
 		{
@@ -448,9 +445,9 @@ void ScoreKeeper::xferObjectCountMap( Xfer *xfer, ObjectCountMap *map )
 			count = it->second;
 			xfer->xferInt( &count );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -464,10 +461,10 @@ void ScoreKeeper::xferObjectCountMap( Xfer *xfer, ObjectCountMap *map )
 			if( thingTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "xferObjectCountMap - Unknown thing template '%s'\n", thingTemplateName.str() ));
+				DEBUG_CRASH(( "xferObjectCountMap - Unknown thing template '%s'", thingTemplateName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// read count
 			xfer->xferInt( &count );
@@ -475,11 +472,11 @@ void ScoreKeeper::xferObjectCountMap( Xfer *xfer, ObjectCountMap *map )
 			// add to map
 			(*map)[ thingTemplate ] = count;
 
-		}  // end for, i
+		}
 
-	}  // end else
+	}
 
-}  // end xferObjectCountMap
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -489,7 +486,7 @@ void ScoreKeeper::xferObjectCountMap( Xfer *xfer, ObjectCountMap *map )
 void ScoreKeeper::xfer( Xfer *xfer )
 {
 
-	// version 
+	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
@@ -539,17 +536,17 @@ void ScoreKeeper::xfer( Xfer *xfer )
 	if( destroyedArraySize != MAX_PLAYER_COUNT )
 	{
 
-		DEBUG_CRASH(( "ScoreKeeper::xfer - size of objects destroyed array has changed\n" ));
+		DEBUG_CRASH(( "ScoreKeeper::xfer - size of objects destroyed array has changed" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( UnsignedShort i = 0; i < destroyedArraySize; ++i )
 	{
 
 		// xfer map data
 		xferObjectCountMap( xfer, &m_objectsDestroyed[ i ] );
 
-	}  // end for i
+	}
 
 	// objects lost
 	xferObjectCountMap( xfer, &m_objectsLost );
@@ -557,7 +554,7 @@ void ScoreKeeper::xfer( Xfer *xfer )
 	// objects captured
 	xferObjectCountMap( xfer, &m_objectsCaptured );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -565,4 +562,4 @@ void ScoreKeeper::xfer( Xfer *xfer )
 void ScoreKeeper::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp b/Generals/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp
index 0eae5d48e8c..74e9ed131bf 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Science.h"
@@ -37,39 +37,35 @@
 #include "GameLogic/Object.h"
 #include "Common/BitFlagsIO.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // GLOBAL /////////////////////////////////////////////////////////////////////////////////////////
 SpecialPowerStore *TheSpecialPowerStore = NULL;
 
-#define DEFAULT_DEFECTION_DETECTION_PROTECTION_TIME_LIMIT (LOGICFRAMES_PER_SECOND * 10) 
+#define DEFAULT_DEFECTION_DETECTION_PROTECTION_TIME_LIMIT (LOGICFRAMES_PER_SECOND * 10)
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Externs ////////////////////////////////////////////////////////////////////////////////////////
-const char* SpecialPowerMaskType::s_bitNameList[] = 
+template<>
+const char* const SpecialPowerMaskType::s_bitNameList[] =
 {
 	"SPECIAL_INVALID",
 
 	//Superweapons
-	"SPECIAL_DAISY_CUTTER", 
-	"SPECIAL_PARADROP_AMERICA", 
-	"SPECIAL_CARPET_BOMB", 
-	"SPECIAL_CLUSTER_MINES", 
-	"SPECIAL_EMP_PULSE", 
-	"SPECIAL_NAPALM_STRIKE", 
-	"SPECIAL_CASH_HACK", 
-	"SPECIAL_NEUTRON_MISSILE", 
-	"SPECIAL_SPY_SATELLITE", 
+	"SPECIAL_DAISY_CUTTER",
+	"SPECIAL_PARADROP_AMERICA",
+	"SPECIAL_CARPET_BOMB",
+	"SPECIAL_CLUSTER_MINES",
+	"SPECIAL_EMP_PULSE",
+	"SPECIAL_NAPALM_STRIKE",
+	"SPECIAL_CASH_HACK",
+	"SPECIAL_NEUTRON_MISSILE",
+	"SPECIAL_SPY_SATELLITE",
 	"SPECIAL_DEFECTOR",
-	"SPECIAL_TERROR_CELL", 
-	"SPECIAL_AMBUSH", 
+	"SPECIAL_TERROR_CELL",
+	"SPECIAL_AMBUSH",
 	"SPECIAL_BLACK_MARKET_NUKE",
 	"SPECIAL_ANTHRAX_BOMB",
 	"SPECIAL_SCUD_STORM",
@@ -84,14 +80,14 @@ const char* SpecialPowerMaskType::s_bitNameList[] =
 	"SPECIAL_ARTILLERY_BARRAGE",
 
 	//Special abilities
-	"SPECIAL_MISSILE_DEFENDER_LASER_GUIDED_MISSILES", 
-	"SPECIAL_REMOTE_CHARGES", 
-	"SPECIAL_TIMED_CHARGES", 
-	"SPECIAL_HACKER_DISABLE_BUILDING", 
-	"SPECIAL_TANKHUNTER_TNT_ATTACK", 
+	"SPECIAL_MISSILE_DEFENDER_LASER_GUIDED_MISSILES",
+	"SPECIAL_REMOTE_CHARGES",
+	"SPECIAL_TIMED_CHARGES",
+	"SPECIAL_HACKER_DISABLE_BUILDING",
+	"SPECIAL_TANKHUNTER_TNT_ATTACK",
 	"SPECIAL_BLACKLOTUS_CAPTURE_BUILDING",
-	"SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK", 
-	"SPECIAL_BLACKLOTUS_STEAL_CASH_HACK", 
+	"SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK",
+	"SPECIAL_BLACKLOTUS_STEAL_CASH_HACK",
 	"SPECIAL_INFANTRY_CAPTURE_BUILDING",
 	"SPECIAL_RADAR_VAN_SCAN",
 	"SPECIAL_SPY_DRONE",
@@ -103,16 +99,17 @@ const char* SpecialPowerMaskType::s_bitNameList[] =
 	"SPECIAL_CIA_INTELLIGENCE",
 	"SPECIAL_CLEANUP_AREA",
 	"SPECIAL_LAUNCH_BAIKONUR_ROCKET",
-	
+
 	NULL
 };
+static_assert(ARRAY_SIZE(SpecialPowerMaskType::s_bitNameList) == SpecialPowerMaskType::NumBits + 1, "Incorrect array size");
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void SpecialPowerStore::parseSpecialPowerDefinition( INI *ini )
 {
 	// read the name
-	AsciiString name = ini->getNextToken();	
+	AsciiString name = ini->getNextToken();
 
 	SpecialPowerTemplate* specialPower = TheSpecialPowerStore->findSpecialPowerTemplatePrivate( name );
 
@@ -162,9 +159,9 @@ void SpecialPowerStore::parseSpecialPowerDefinition( INI *ini )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-/* static */ const FieldParse SpecialPowerTemplate::m_specialPowerFieldParse[] = 
+/* static */ const FieldParse SpecialPowerTemplate::m_specialPowerFieldParse[] =
 {
-	
+
 	{ "ReloadTime",								INI::parseDurationUnsignedInt,		NULL,	offsetof( SpecialPowerTemplate, m_reloadTime ) },
 	{ "RequiredScience",					INI::parseScience,								NULL, offsetof( SpecialPowerTemplate, m_requiredScience ) },
 	{ "InitiateSound",						INI::parseAudioEventRTS,					NULL,	offsetof( SpecialPowerTemplate, m_initiateSound ) },
@@ -177,7 +174,7 @@ void SpecialPowerStore::parseSpecialPowerDefinition( INI *ini )
 	{ "ViewObjectRange",					INI::parseReal,										NULL,	offsetof( SpecialPowerTemplate, m_viewObjectRange ) },
 	{ "RadiusCursorRadius",				INI::parseReal,										NULL,	offsetof( SpecialPowerTemplate, m_radiusCursorRadius ) },
 	{ "ShortcutPower",						INI::parseBool,										NULL, offsetof( SpecialPowerTemplate, m_shortcutPower ) },
-	{ NULL,	NULL, NULL,	0 }  // keep this last
+	{ NULL,	NULL, NULL,	0 }
 
 };
 
@@ -197,14 +194,14 @@ SpecialPowerTemplate::SpecialPowerTemplate()
 	m_radiusCursorRadius = 0;
 	m_shortcutPower = FALSE;
 
-}  // end SpecialPowerTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SpecialPowerTemplate::~SpecialPowerTemplate()
 {
 
-}  // end ~SpecialPowerTemplate
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -217,7 +214,7 @@ SpecialPowerStore::SpecialPowerStore( void )
 
 	m_nextSpecialPowerID = 0;
 
-}  // end SpecialPowerStore
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -234,7 +231,7 @@ SpecialPowerStore::~SpecialPowerStore( void )
 	// set our count to zero
 	m_nextSpecialPowerID = 0;
 
-}  // end ~SpecialPowerStore
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -276,7 +273,7 @@ const SpecialPowerTemplate *SpecialPowerStore::getSpecialPowerTemplateByIndex( U
 
 	return NULL;  // not found
 
-}  // end getSpecialPowerTemplateByIndex
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return the size of the store (WB) */
@@ -286,7 +283,7 @@ Int SpecialPowerStore::getNumSpecialPowers( void )
 
 	return m_specialPowerTemplates.size();
 
-}  // end getNumSpecialPowers
+}
 
 //-------------------------------------------------------------------------------------------------
 /** does the object (and therefore the player) meet all the requirements to use this power */
@@ -304,12 +301,12 @@ Bool SpecialPowerStore::canUseSpecialPower( Object *obj, const SpecialPowerTempl
 
 	//
 	// in order to execute the special powers we have attached special power modules to the objects
-	// that can use them.  However, just because an object has a module that is capable of 
+	// that can use them.  However, just because an object has a module that is capable of
 	// doing the power, does not mean the object and the player can actually execute the
 	// power because some powers require a specialized science that the player must select and
 	// they cannot have all of them.
 	//
-	
+
 	// check for requried science
 	ScienceType requiredScience = specialPowerTemplate->getRequiredScience();
 	if( requiredScience != SCIENCE_INVALID )
@@ -319,16 +316,16 @@ Bool SpecialPowerStore::canUseSpecialPower( Object *obj, const SpecialPowerTempl
 		if( player->hasScience( requiredScience ) == FALSE )
 			return FALSE;
 
-	}  // end if
+	}
+
 
-	
 	// I THINK THIS IS WHERE WE BAIL OUT IF A DIFFERENT CONYARD IS ALREADY CHARGIN THIS SPECIAL RIGHT NOW //LORENZEN
 
 
 	// all is well
 	return TRUE;
 
-}  // end canUseSpecialPower
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -348,4 +345,4 @@ void SpecialPowerStore::reset( void )
 			++it;
 		}
 	}
-}  // end reset
+}
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp
index 7eeaca95197..f81283fdae8 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameState.h"
 #include "Common/Team.h"
 #include "Common/ThingFactory.h"
@@ -51,11 +51,6 @@
 #include "GameLogic/ScriptActions.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///@todo - do delayed script evaluations for team scripts. jba.
 
@@ -67,7 +62,7 @@ TeamFactory *TheTeamFactory = NULL;
 TeamRelationMap::TeamRelationMap( void )
 {
 
-}  // end TeamRelationMap
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -77,7 +72,7 @@ TeamRelationMap::~TeamRelationMap( void )
 	// maek sure the data is clear
 	m_map.clear();
 
-}  // end ~TeamRelationMap
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -85,10 +80,10 @@ TeamRelationMap::~TeamRelationMap( void )
 void TeamRelationMap::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Xfer method 
+/** Xfer method
 	* Version Info;
 	* 1: Initial version */
 // ------------------------------------------------------------------------------------------------
@@ -118,14 +113,14 @@ void TeamRelationMap::xfer( Xfer *xfer )
 			// write team ID
 			teamID = (*teamRelationIt).first;
 			xfer->xferUser( &teamID, sizeof( TeamID ) );
-			
+
 			// write relationship
 			r = (*teamRelationIt).second;
 			xfer->xferUser( &r, sizeof( Relationship ) );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -140,12 +135,12 @@ void TeamRelationMap::xfer( Xfer *xfer )
 
 			// assign relationship
 			m_map[teamID] = r;
-			
-		}  // end for, i
 
-	}  // end else load
+		}
+
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -153,7 +148,7 @@ void TeamRelationMap::xfer( Xfer *xfer )
 void TeamRelationMap::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -241,9 +236,9 @@ void TeamFactory::initTeam(const AsciiString& name, const AsciiString& owner, Bo
 {
 	DEBUG_ASSERTCRASH(findTeamPrototype(name)==NULL,("team already exists"));
 	Player *pOwner = ThePlayerList->findPlayerWithNameKey(NAMEKEY(owner));
-	DEBUG_ASSERTCRASH(pOwner, ("no owner found for team %s (%s)\n",name.str(),owner.str()));
+	DEBUG_ASSERTCRASH(pOwner, ("no owner found for team %s (%s)",name.str(),owner.str()));
 	if (!pOwner)
-		pOwner = ThePlayerList->getNeutralPlayer(); 
+		pOwner = ThePlayerList->getNeutralPlayer();
 	/*TeamPrototype *tp =*/ newInstance(TeamPrototype)(this, name, pOwner, isSingleton, d, ++m_uniqueTeamPrototypeID);
 	if (isSingleton) {
 		// Create the singleton team.
@@ -293,14 +288,14 @@ TeamPrototype *TeamFactory::findTeamPrototypeByID( TeamPrototypeID id )
 
 	for( it = m_prototypes.begin(); it != m_prototypes.end(); ++it )
 	{
-	
+
 		prototype = it->second;
 		if( prototype->getID() == id )
 			return prototype;
 
-	}  // end for
-	
-	// not found	
+	}
+
+	// not found
 	return NULL;
 
 }
@@ -335,9 +330,11 @@ Call team->setActive() when all members are added. */
 Team *TeamFactory::createInactiveTeam(const AsciiString& name)
 {
 	TeamPrototype *tp = findTeamPrototype(name);
-	if (!tp)
-		throw ERROR_BAD_ARG;
-	
+	if (!tp) {
+		DEBUG_CRASH(( "Team prototype '%s' does not exist", name.str() ));
+		return NULL;
+	}
+
 	Team *t = NULL;
 	if (tp->getIsSingleton())
 	{
@@ -360,16 +357,18 @@ Team *TeamFactory::createInactiveTeam(const AsciiString& name)
 			TheScriptEngine->friend_executeAction(script->getAction());
 		}
 	}
-	
+
 	return t;
 }
 
 // ------------------------------------------------------------------------
 Team *TeamFactory::createTeam(const AsciiString& name)
 {
-	Team *t = NULL;
-	t = createInactiveTeam(name);
-	t->setActive();
+	Team *t = createInactiveTeam(name);
+
+	if (t)
+		t->setActive();
+
 	return t;
 }
 
@@ -397,7 +396,7 @@ Team* TeamFactory::findTeam(const AsciiString& name)
 	if (tp)
 	{
 		Team *t = tp->getFirstItemIn_TeamInstanceList();
-		if (t == NULL && !tp->getIsSingleton()) 
+		if (t == NULL && !tp->getIsSingleton())
 		{
 			t = createInactiveTeam(name);
 		}
@@ -423,7 +422,7 @@ void TeamFactory::teamAboutToBeDeleted(Team* team)
 void TeamFactory::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------
 /** Xfer method
@@ -452,11 +451,11 @@ void TeamFactory::xfer( Xfer *xfer )
 	if( prototypeCount != m_prototypes.size() )
 	{
 
-		DEBUG_CRASH(( "TeamFactory::xfer - Prototype count mismatch '%d should be '%d'\n",
+		DEBUG_CRASH(( "TeamFactory::xfer - Prototype count mismatch '%d should be '%d'",
 									prototypeCount, m_prototypes.size() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// xfer each of the prototype information
 	TeamPrototypeMap::iterator it;
@@ -479,10 +478,10 @@ void TeamFactory::xfer( Xfer *xfer )
 
 			// xfer prototype data
 			xfer->xferSnapshot( teamPrototype );
-		
-		}  //end for, it
 
-	}  // end if, saving
+		}
+
+	}
 	else
 	{
 
@@ -500,20 +499,20 @@ void TeamFactory::xfer( Xfer *xfer )
 			if( teamPrototype == NULL )
 			{
 
-				DEBUG_CRASH(( "TeamFactory::xfer - Unable to find team prototype by id\n" ));
+				DEBUG_CRASH(( "TeamFactory::xfer - Unable to find team prototype by id" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// xfer prototype data
 			xfer->xferSnapshot( teamPrototype );
 
-		}  // end for, i
+		}
 
-	}  // end else, loading
+	}
 
 /*
-// SAVE_LOAD_DEBUG 
+// SAVE_LOAD_DEBUG
 if( xfer->getXferMode() == XFER_SAVE )
 {
 
@@ -529,7 +528,7 @@ for( prototypeIt = m_prototypes.begin(); prototypeIt != m_prototypes.end(); ++pr
 {
 	prototype = prototypeIt->second;
 fprintf( fp, "Prototype '%s' for player index '%d'\n", prototype->getName().str(), prototype->getControllingPlayer()->getPlayerIndex() );
-	for( DLINK_ITERATOR<Team> teamIt = prototype->iterate_TeamInstanceList(); !teamIt.done(); teamIt.advance() ) 
+	for( DLINK_ITERATOR<Team> teamIt = prototype->iterate_TeamInstanceList(); !teamIt.done(); teamIt.advance() )
 	{
 		team = teamIt.cur();
 fprintf( fp, "  Team Instance '%s', id is '%d'\n", team->getName().str(), team->getID() );
@@ -538,15 +537,15 @@ fprintf( fp, "  Team Instance '%s', id is '%d'\n", team->getName().str(), team->
 			obj = objIt.cur();
 fprintf( fp, "    Member '%s', id '%d'\n", obj->getTemplate()->getName().str(), obj->getID() );
 		}
-	}  // end for
+	}
 
-}  // end for
+}
 fclose( fp );
 
-}  // end if, save
+}
 */
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------
 /** Load post process */
@@ -571,16 +570,16 @@ void TeamFactory::loadPostProcess( void )
 			m_uniqueTeamPrototypeID = prototype->getID() + 1;
 
 		// iterate team instances on each prototype and do the team ID check
-		for( DLINK_ITERATOR<Team> iter = prototype->iterate_TeamInstanceList(); !iter.done(); iter.advance() ) 
+		for( DLINK_ITERATOR<Team> iter = prototype->iterate_TeamInstanceList(); !iter.done(); iter.advance() )
 		{
 
 			team = iter.cur();
 			if( team->getID() >= m_uniqueTeamID )
 				m_uniqueTeamID = team->getID() + 1;
 
-		}  // end for
+		}
 
-	}  // end for, it
+	}
 
 /*
 // SAVE_LOAD_DEBUG
@@ -593,7 +592,7 @@ for( prototypeIt = m_prototypes.begin(); prototypeIt != m_prototypes.end(); ++pr
 {
 	prototype = prototypeIt->second;
 fprintf( fp, "Prototype '%s' for player index '%d'\n", prototype->getName().str(), prototype->getControllingPlayer()->getPlayerIndex() );
-	for( DLINK_ITERATOR<Team> teamIt = prototype->iterate_TeamInstanceList(); !teamIt.done(); teamIt.advance() ) 
+	for( DLINK_ITERATOR<Team> teamIt = prototype->iterate_TeamInstanceList(); !teamIt.done(); teamIt.advance() )
 	{
 		team = teamIt.cur();
 fprintf( fp, "  Team Instance '%s', id is '%d'\n", team->getName().str(), team->getID() );
@@ -603,13 +602,13 @@ fprintf( fp, "  Team Instance '%s', id is '%d'\n", team->getName().str(), team->
 			obj = objIt.cur();
 fprintf( fp, "    Member '%s', id '%d'\n", obj->getTemplate()->getName().str(), obj->getID() );
 		}
-	}  // end for
+	}
 
-}  // end for
+}
 fclose( fp );
 */
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
@@ -741,11 +740,11 @@ TeamTemplateInfo::TeamTemplateInfo(Dict *d) :
 	m_productionCondition = d->getAsciiString(TheKey_teamProductionCondition, &exists);
 	m_executeActions = d->getBool(TheKey_teamExecutesActionsOnCreate, &exists);
 
-	
+
 	// Which scripts to attempt during run?
 	for (int i = 0; i < MAX_GENERIC_SCRIPTS; ++i) {
 		AsciiString keyName;
-		keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_teamGenericScriptHook).str(), i);			
+		keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_teamGenericScriptHook).str(), i);
 		m_teamGenericScripts[i] = d->getAsciiString(NAMEKEY(keyName), &exists);
 		if (!exists) {
 			m_teamGenericScripts[i].clear();
@@ -767,7 +766,7 @@ TeamTemplateInfo::TeamTemplateInfo(Dict *d) :
 void TeamTemplateInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------
 /** Xfer method
@@ -785,7 +784,7 @@ void TeamTemplateInfo::xfer( Xfer *xfer )
 	// xfer the production priority
 	xfer->xferInt( &m_productionPriority );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------
 /** Load post process */
@@ -793,7 +792,7 @@ void TeamTemplateInfo::xfer( Xfer *xfer )
 void TeamTemplateInfo::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
@@ -801,18 +800,18 @@ void TeamTemplateInfo::loadPostProcess( void )
 // ------------------------------------------------------------------------
 
 // ------------------------------------------------------------------------
-TeamPrototype::TeamPrototype( TeamFactory *tf, 
-															const AsciiString &name, 
-															Player *ownerPlayer, 
-															Bool isSingleton, 
-															Dict *d, 
-															TeamPrototypeID id ) : 
+TeamPrototype::TeamPrototype( TeamFactory *tf,
+															const AsciiString &name,
+															Player *ownerPlayer,
+															Bool isSingleton,
+															Dict *d,
+															TeamPrototypeID id ) :
 	m_id(id),
-	m_factory(tf), 
-	m_name(name), 
-	m_owningPlayer(ownerPlayer), 
+	m_factory(tf),
+	m_name(name),
+	m_owningPlayer(ownerPlayer),
 	m_flags(isSingleton ? TeamPrototype::TEAM_SINGLETON : 0),
-	m_teamTemplate(d), 
+	m_teamTemplate(d),
 	m_productionConditionAlwaysFalse(false),
 	m_productionConditionScript(NULL)
 {
@@ -822,7 +821,7 @@ TeamPrototype::TeamPrototype( TeamFactory *tf,
 
 	if (m_owningPlayer)
 		m_owningPlayer->addTeamToList(this);
-	
+
 	m_retrievedGenericScripts = false;
 	for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i) {
 		m_genericScriptsToRun[i] = NULL;
@@ -850,19 +849,13 @@ TeamPrototype::~TeamPrototype()
 	if (m_factory)
 		m_factory->removeTeamPrototypeFromList(this);
 
-	if (m_productionConditionScript) 
-	{
-		deleteInstance(m_productionConditionScript);
-	}
+	deleteInstance(m_productionConditionScript);
 	m_productionConditionScript = NULL;
 
-	for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i) 
+	for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i)
 	{
-		if (m_genericScriptsToRun[i]) 
-		{
-			deleteInstance(m_genericScriptsToRun[i]);
-			m_genericScriptsToRun[i] = NULL;
-		}
+		deleteInstance(m_genericScriptsToRun[i]);
+		m_genericScriptsToRun[i] = NULL;
 	}
 }
 
@@ -884,7 +877,7 @@ Team *TeamPrototype::findTeamByID( TeamID teamID )
 }
 
 // ------------------------------------------------------------------------
-void TeamPrototype::setControllingPlayer(Player *newController) 
+void TeamPrototype::setControllingPlayer(Player *newController)
 {
 	DEBUG_ASSERTCRASH(newController, ("Attempted to set NULL player as team-owner, illegal."));
 	if (!newController) {
@@ -982,7 +975,7 @@ Int TeamPrototype::countObjects(KindOfMaskType setMask, KindOfMaskType clearMask
 // ------------------------------------------------------------------------
 void TeamPrototype::healAllObjects(void)
 {
-	for (DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+	for (DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance())
 	{
 		iter.cur()->healAllObjects();
 	}
@@ -991,7 +984,7 @@ void TeamPrototype::healAllObjects(void)
 // ------------------------------------------------------------------------
 void TeamPrototype::iterateObjects( ObjectIterateFunc func, void *userData )
 {
-	for (DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+	for (DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance())
 	{
 		iter.cur()->iterateObjects( func, userData );
 	}
@@ -1052,7 +1045,7 @@ Bool TeamPrototype::hasAnyObjects() const
 }
 
 // ------------------------------------------------------------------------
-void TeamPrototype::updateState(void) 
+void TeamPrototype::updateState(void)
 {
 	for (DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance())
 	{
@@ -1063,16 +1056,16 @@ void TeamPrototype::updateState(void)
 	while (!done) {
 		done = true;
 		for (DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance())
-		{	
-			if (iter.cur()->getFirstItemIn_TeamMemberList() == NULL) 
-			{ 
+		{
+			if (iter.cur()->getFirstItemIn_TeamMemberList() == NULL)
+			{
 				// Team has no members.
-				if (this->getIsSingleton())	
+				if (this->getIsSingleton())
 				{
 					continue; // Don't delete singleton teams, even if they are empty.
 				}
 
-				if (iter.cur()->getControllingPlayer() && iter.cur()->getControllingPlayer()->getDefaultTeam() == iter.cur()) 
+				if (iter.cur()->getControllingPlayer() && iter.cur()->getControllingPlayer()->getDefaultTeam() == iter.cur())
 				{
 					// This is the player's default team, so don't remove it.
 					continue;
@@ -1153,7 +1146,7 @@ Bool TeamPrototype::evaluateProductionCondition(void)
 	if (pScript) {
 		// Check difficulty.
 		switch (getControllingPlayer()->getPlayerDifficulty() ) {
-			case DIFFICULTY_EASY: 
+			case DIFFICULTY_EASY:
 				if (!pScript->isEasy()) {
 					m_productionConditionAlwaysFalse = true;
 					return false;
@@ -1189,7 +1182,7 @@ Bool TeamPrototype::evaluateProductionCondition(void)
 void TeamPrototype::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------
 /** Xfer method
@@ -1223,7 +1216,7 @@ void TeamPrototype::xfer( Xfer *xfer )
 
 	// xfer team instance count
 	UnsignedShort teamInstanceCount = 0;
-	for( DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance() ) 
+	for( DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance() )
 		teamInstanceCount++;
 	xfer->xferUnsignedShort( &teamInstanceCount );
 
@@ -1234,7 +1227,7 @@ void TeamPrototype::xfer( Xfer *xfer )
 	{
 
 		// xfer each team instance
-		for( DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance() ) 
+		for( DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance() )
 		{
 
 			// get the team
@@ -1247,9 +1240,9 @@ void TeamPrototype::xfer( Xfer *xfer )
 			// write team data
 			xfer->xferSnapshot( teamInstance );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -1281,16 +1274,16 @@ void TeamPrototype::xfer( Xfer *xfer )
 				// restore original ID we read from the file
 				teamInstance->setID( teamID );
 
-			}  // end if
+			}
 
 			// xfer team data
 			xfer->xferSnapshot( teamInstance );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
-	
-}  // end xfer
+	}
+
+}
 
 // ------------------------------------------------------------------------
 /** Load post process */
@@ -1298,7 +1291,7 @@ void TeamPrototype::xfer( Xfer *xfer )
 void TeamPrototype::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
@@ -1309,27 +1302,22 @@ void TeamPrototype::loadPostProcess( void )
 // ------------------------------------------------------------------------
 
 // ------------------------------------------------------------------------
-Team::Team(TeamPrototype *proto, TeamID id ) : 
+Team::Team(TeamPrototype *proto, TeamID id ) :
   m_id( id ),
-	m_proto(proto), 
-	m_enteredOrExited(false), 
-	m_active(false), 
-	m_seeEnemy(false), 
-	m_prevSeeEnemy(false), 
+	m_proto(proto),
+	m_enteredOrExited(false),
+	m_active(false),
+	m_seeEnemy(false),
+	m_prevSeeEnemy(false),
 	m_checkEnemySighted(false),
 	m_isRecruitablitySet(false),
 	m_isRecruitable(false),
-	m_destroyThreshold(0), 
-	m_curUnits(0), 
+	m_destroyThreshold(0),
+	m_curUnits(0),
 	m_wasIdle(false)
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_created = FALSE;
-	
-	//
 	m_commonAttackTarget = INVALID_ID;
-
 	// allocate new relation map pools
 	m_playerRelations = newInstance(PlayerRelationMap);
 	m_teamRelations = newInstance(TeamRelationMap);
@@ -1342,18 +1330,18 @@ Team::Team(TeamPrototype *proto, TeamID id ) :
 		{
 			m_checkEnemySighted = true;	 // Only keep track of enemy sighted if there is a script that cares.
 		}
-		
+
 		AsciiString teamName = proto->getName();
 		teamName.concat(" - creating team instance.");
 		TheScriptEngine->AppendDebugMessage(teamName, false);
 	}
 
-	for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i) 
+	for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i)
 	{
 		m_shouldAttemptGenericScript[i] = true;
 	}
 
-	
+
 }
 
 // ------------------------------------------------------------------------
@@ -1406,19 +1394,19 @@ void Team::setControllingPlayer(Player *newController)
 	m_proto->setControllingPlayer(newController);
 
 	// This function is used by one script, and it is kind of odd.  The actual units
-	// are not getting captured, the team they are on is being reassigned to a new player.  
+	// are not getting captured, the team they are on is being reassigned to a new player.
 	// The Team doesn't change, it just starts to return a different answer when you ask for
 	// the controlling player.  I don't want to make the major change of onCapture on everyone,
 	// so I will do the minor fix for the specific bug, which is harmless even when misused.
 
 	// Tell all members to redo their looking status, as their Player has changed, but they don't know.
-	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		Object *obj = iter.cur();
-		if (!obj) 
+		if (!obj)
 			continue;
 
-		obj->handlePartitionCellMaintenance();		
+		obj->handlePartitionCellMaintenance();
 	}
 
 }
@@ -1436,7 +1424,7 @@ void Team::getTeamAsAIGroup(AIGroup *pAIGroup)
 		return;
 	}
 
-	// Should this clear out the pAIGroup that it receives? I don't think so, but that 
+	// Should this clear out the pAIGroup that it receives? I don't think so, but that
 	// would go here if so. jkmcd
 
 	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) {
@@ -1456,7 +1444,7 @@ Int Team::getTargetableCount() const
 		if (!obj) {
 			continue;
 		}
-		
+
 		if (obj->isEffectivelyDead() || (obj->getAIUpdateInterface() == NULL && !obj->isKindOf(KINDOF_STRUCTURE))) {
 			continue;
 		}
@@ -1519,11 +1507,11 @@ Object *Team::getTeamTargetObject(void)
 {
 	if (m_commonAttackTarget == INVALID_ID) {
 		return NULL;
-	}			 
+	}
 	Object *target = TheGameLogic->findObjectByID(m_commonAttackTarget);
 	if (target) {
 		//If the enemy unit is stealthed and not detected, then we can't attack it!
-	if( target->testStatus( OBJECT_STATUS_STEALTHED ) && 
+	if( target->testStatus( OBJECT_STATUS_STEALTHED ) &&
 			!target->testStatus( OBJECT_STATUS_DETECTED ) )
 		{
 			target = NULL;
@@ -1669,7 +1657,7 @@ Int Team::countObjects(KindOfMaskType setMask, KindOfMaskType clearMask)
 // ------------------------------------------------------------------------
 void Team::healAllObjects(void)
 {
-	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		iter.cur()->healCompletely();
 	}
@@ -1678,7 +1666,7 @@ void Team::healAllObjects(void)
 // ------------------------------------------------------------------------
 void Team::iterateObjects( ObjectIterateFunc func, void *userData )
 {
-	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		func( iter.cur(), userData );
 	}
@@ -1692,7 +1680,7 @@ Bool Team::hasAnyBuildings() const
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (iter.cur()->isDestroyed()) 
+		if (iter.cur()->isDestroyed())
 			continue;
 
 		if (iter.cur()->isKindOf(KINDOF_STRUCTURE))
@@ -1709,7 +1697,7 @@ Bool Team::hasAnyBuildings(KindOfMaskType kindOf) const
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (iter.cur()->isDestroyed()) 
+		if (iter.cur()->isDestroyed())
 			continue;
 
 		kindOf.set(KINDOF_STRUCTURE);
@@ -1727,7 +1715,7 @@ Bool Team::hasAnyUnits() const
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (iter.cur()->isDestroyed()) 
+		if (iter.cur()->isDestroyed())
 			continue;
 
 		// If it's a structure, it's not  a unit.
@@ -1756,7 +1744,7 @@ Bool Team::isIdle() const
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (!ai->isIdle()) 
+		if (!ai->isIdle())
 		{
 			idle = false;
 			break;
@@ -1773,7 +1761,7 @@ Bool Team::hasAnyObjects() const
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (iter.cur()->isDestroyed()) 
+		if (iter.cur()->isDestroyed())
 			continue;
 
 		if (iter.cur()->isKindOf(KINDOF_PROJECTILE)) {
@@ -1798,18 +1786,18 @@ Bool Team::hasAnyObjects() const
 
 // ------------------------------------------------------------------------
 /** Clears m_enteredExited, checks & clears m_created. */
-void Team::updateState(void) 
+void Team::updateState(void)
 {
 	m_enteredOrExited = false;
 	if (!m_active) {
-		return; 
+		return;
 	}
 	const TeamTemplateInfo *pInfo = m_proto->getTemplateInfo();
-	if (m_created) 
+	if (m_created)
 	{
 		m_created = false;
 		// Run the on create script, if any.
-		if (!pInfo->m_scriptOnCreate.isEmpty()) 
+		if (!pInfo->m_scriptOnCreate.isEmpty())
 		{
 			TheScriptEngine->runScript(pInfo->m_scriptOnCreate, this);
 		}
@@ -1847,7 +1835,7 @@ void Team::updateState(void)
 			PartitionFilter *filters[] = { &filterTeam, &filterAlive, &filterMapStatus, NULL };
 			Real visionRange = iter.cur()->getVisionRange();
 			anyAliveInTeam = true;
-			Object *pObj = ThePartitionManager->getClosestObject( iter.cur(), visionRange, 
+			Object *pObj = ThePartitionManager->getClosestObject( iter.cur(), visionRange,
 				FROM_CENTER_2D, filters );
 			if (pObj) {
 				m_seeEnemy = true;
@@ -1855,9 +1843,9 @@ void Team::updateState(void)
 			}
 		}
 		if (anyAliveInTeam) {
-			if (m_prevSeeEnemy != m_seeEnemy) 
+			if (m_prevSeeEnemy != m_seeEnemy)
 			{
-				if (m_seeEnemy) 
+				if (m_seeEnemy)
 				{
 					// fire onEnemySighted
 					TheScriptEngine->runScript(pInfo->m_scriptOnEnemySighted, this);
@@ -1870,7 +1858,7 @@ void Team::updateState(void)
 	}
 
 	// Do onDestroyed checks.
-	if (!pInfo->m_scriptOnDestroyed.isEmpty()) 
+	if (!pInfo->m_scriptOnDestroyed.isEmpty())
 	{
 		Int prevUnits = m_curUnits;
 		m_curUnits = 0;
@@ -1881,7 +1869,7 @@ void Team::updateState(void)
 
 			m_curUnits++;
 		}
-		if (m_curUnits != prevUnits && m_curUnits <= m_destroyThreshold) 
+		if (m_curUnits != prevUnits && m_curUnits <= m_destroyThreshold)
 		{
 			TheScriptEngine->runScript(pInfo->m_scriptOnDestroyed, this);
 			m_destroyThreshold = -1; // don't trigger again.
@@ -1889,7 +1877,7 @@ void Team::updateState(void)
 	}
 
 	// Do onIdle checks.
-	if (!pInfo->m_scriptOnIdle.isEmpty()) 
+	if (!pInfo->m_scriptOnIdle.isEmpty())
 	{
 		Bool isIdle = true;
 		Bool anyAliveInTeam = false; // If we're all dead, don't do all clear.
@@ -1905,7 +1893,7 @@ void Team::updateState(void)
 				isIdle = false;
 			}
 		}
-		if (anyAliveInTeam && isIdle && m_wasIdle) 
+		if (anyAliveInTeam && isIdle && m_wasIdle)
 		{
 			TheScriptEngine->runScript(pInfo->m_scriptOnIdle, this);
 		}
@@ -1956,7 +1944,7 @@ Bool Team::didAllEnter(PolygonTrigger *pTrigger, UnsignedInt whichToConsider) co
 
 		if (iter.cur()->isEffectivelyDead())
 			continue;
-		
+
 		if (iter.cur()->isKindOf(KINDOF_INERT))
 			continue;
 
@@ -2005,7 +1993,7 @@ Bool Team::didPartialEnter(PolygonTrigger *pTrigger, UnsignedInt whichToConsider
 
 		if (iter.cur()->didEnter(pTrigger)) {
 			return true;
-		} 
+		}
 	}
 	return false;
 }
@@ -2041,7 +2029,7 @@ Bool Team::didPartialExit(PolygonTrigger *pTrigger, UnsignedInt whichToConsider)
 
 		if (iter.cur()->didExit(pTrigger)) {
 			return true;
-		} 
+		}
 	}
 	return false;
 }
@@ -2050,7 +2038,7 @@ Bool Team::didPartialExit(PolygonTrigger *pTrigger, UnsignedInt whichToConsider)
 Bool Team::didAllExit(PolygonTrigger *pTrigger, UnsignedInt whichToConsider) const
 {
 	// If any units entered or exited, they set this flag.
-	if (!m_enteredOrExited) 
+	if (!m_enteredOrExited)
 		return false;
 
 	Bool anyConsidered = false;
@@ -2075,7 +2063,7 @@ Bool Team::didAllExit(PolygonTrigger *pTrigger, UnsignedInt whichToConsider) con
 
 		if (iter.cur()->isEffectivelyDead())
 			continue;
-		
+
 		if (iter.cur()->isKindOf(KINDOF_INERT))
 			continue;
 
@@ -2214,7 +2202,7 @@ Bool Team::someInsideSomeOutside(PolygonTrigger *pTrigger, UnsignedInt whichToCo
 			anyOutside = true;
 		}
 
-		// In this particular case, this is unnecessary. However, unless it is a performance hit, please 
+		// In this particular case, this is unnecessary. However, unless it is a performance hit, please
 		// leave it.
 		anyConsidered = true;
 	}
@@ -2253,10 +2241,10 @@ void Team::deleteTeam(Bool ignoreDead)
 	if( this == getControllingPlayer()->getDefaultTeam() )
 	{
 		std::list<Object *> guysToMakeEvacuate;
-		for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 		{
 			Object *obj = iter.cur();
-			if (!obj) 
+			if (!obj)
 				continue;
 
 			if( obj->getContain()  &&  (obj->getContain()->getContainCount() > 0) )
@@ -2279,7 +2267,7 @@ void Team::deleteTeam(Bool ignoreDead)
 
 	// this doesn't actually delete the team, it deletes the members of the team.
 	// the team itself will be deleted in updateState.
-	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		Object *obj = iter.cur();
 		if (!obj) {
@@ -2291,7 +2279,7 @@ void Team::deleteTeam(Bool ignoreDead)
 		// they use it on a team with things that can't die, then yeah, the Team will last forever.  But then it is
 		// user error.
 		if( ignoreDead && obj->isEffectivelyDead() )
-			continue; 
+			continue;
 
 		TheGameLogic->destroyObject(obj);
 	}
@@ -2304,10 +2292,10 @@ void Team::transferUnitsTo(Team *newTeam)
 	if (this == newTeam) return;
 	if (newTeam == NULL) return;
 	Object *obj;
-	while ((obj = getFirstItemIn_TeamMemberList()) != 0) 
+	while ((obj = getFirstItemIn_TeamMemberList()) != 0)
 	{
 		obj->setTeam(newTeam);
-	} 
+	}
 }
 
 // ------------------------------------------------------------------------
@@ -2335,13 +2323,13 @@ Object *Team::tryToRecruit(const ThingTemplate *tTemplate, const Coord3D *teamHo
 	Object *recruit = NULL;
 	for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() )
 	{
-		if (!obj->getTemplate()->isEquivalentTo(tTemplate)) 
+		if (!obj->getTemplate()->isEquivalentTo(tTemplate))
 		{
 			// it might be ok, if tTemplate is really just a "build-variations" template...
 			if (!isInBuildVariations(tTemplate, obj->getTemplate()))
 				continue;
 		}
-		if (obj->getControllingPlayer() != myPlayer) 
+		if (obj->getControllingPlayer() != myPlayer)
 			continue;
 		Team *team = obj->getTeam();
 		Bool isDefaultTeam = false;
@@ -2356,7 +2344,7 @@ Object *Team::tryToRecruit(const ThingTemplate *tTemplate, const Coord3D *teamHo
 		}
 		Bool teamIsRecruitable = isDefaultTeam;	 // Default team always recruitable.
 		if (team->getPrototype()->getTemplateInfo()->m_isAIRecruitable) {
-			teamIsRecruitable = true; 
+			teamIsRecruitable = true;
 		}
 		// Check & see if individual team has been marked for recruitability.
 		if (team->m_isRecruitablitySet) {
@@ -2368,7 +2356,7 @@ Object *Team::tryToRecruit(const ThingTemplate *tTemplate, const Coord3D *teamHo
 		if (obj->getAIUpdateInterface() && !obj->getAIUpdateInterface()->isRecruitable()) {
 			continue; // can't recruit this unit.
 		}
-		if( obj->isDisabledByType( DISABLED_HELD ) ) 
+		if( obj->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // Don't recruit held units.
 		}
@@ -2390,7 +2378,7 @@ Object *Team::tryToRecruit(const ThingTemplate *tTemplate, const Coord3D *teamHo
 	if (recruit!=NULL) {
 		return recruit;
 	}
- 	return NULL;	 
+ 	return NULL;
 }
 
 // ------------------------------------------------------------------------
@@ -2435,8 +2423,10 @@ void Team::killTeam(void)
 
 	evacuateTeam();
 
+	// TheSuperHackers @bugfix Mauller 20/07/2025 the neutral player has no player template so we need to check for a null template
+	const PlayerTemplate* playerTemplate = getControllingPlayer()->getPlayerTemplate();
 	// beacons are effectively dead, so we need to destroy via a non-kill() method
-	const ThingTemplate *beaconTemplate = TheThingFactory->findTemplate( getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );
+	const ThingTemplate* beaconTemplate = playerTemplate ? TheThingFactory->findTemplate( playerTemplate->getBeaconTemplate() ) : NULL;
 
 	// now find objects to kill
 	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) {
@@ -2466,14 +2456,14 @@ void Team::killTeam(void)
 }
 
 // ------------------------------------------------------------------------
-Bool Team::damageTeamMembers(Real amount) 
+Bool Team::damageTeamMembers(Real amount)
 {
 	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (iter.cur()->isDestroyed()) 
+		if (iter.cur()->isDestroyed())
 			continue;
 
 		// do max amount of damage to object
@@ -2488,21 +2478,21 @@ Bool Team::damageTeamMembers(Real amount)
 			damageInfo.in.m_amount = amount;
 			iter.cur()->attemptDamage( &damageInfo );
 		}
-		
+
 	}
 	return false;
 }
 
 // ------------------------------------------------------------------------
 /// @todo This should give a "team move" command, not individual move orders (MSB)
-void Team::moveTeamTo(Coord3D destination) 
+void Team::moveTeamTo(Coord3D destination)
 {
 	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (iter.cur()->isDestroyed()) 
+		if (iter.cur()->isDestroyed())
 			continue;
 	}
 }
@@ -2513,7 +2503,7 @@ Bool Team::hasAnyBuildFacility() const
 	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		const ThingTemplate *objtmpl = iter.cur()->getTemplate();
-		if (objtmpl->isBuildFacility()) 
+		if (objtmpl->isBuildFacility())
 			return true;
 	}
 	return false;
@@ -2526,7 +2516,7 @@ void Team::updateGenericScripts(void)
 	//USE_PERF_TIMER(updateGenericScripts)
 	for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i) {
 		if (m_shouldAttemptGenericScript[i]) {
-			// Does the condition succeed? If so, run it. If it is a run once script, also mark that we 
+			// Does the condition succeed? If so, run it. If it is a run once script, also mark that we
 			// shouldn't run it again.
 			Script *script = m_proto->getGenericScript(i);
 			if (script) {
@@ -2542,7 +2532,7 @@ void Team::updateGenericScripts(void)
 					msg.concat(getName());
 					TheScriptEngine->AppendDebugMessage(msg, false);
 				}
-			} else { 
+			} else {
 				m_shouldAttemptGenericScript[i] = false;
 			}
 		}
@@ -2555,7 +2545,7 @@ void Team::updateGenericScripts(void)
 void Team::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -2576,27 +2566,27 @@ void Team::xfer( Xfer *xfer )
 	if( teamID != m_id )
 	{
 
-		DEBUG_CRASH(( "Team::xfer - TeamID mismatch.  Xfered '%d' but should be '%d'\n",
+		DEBUG_CRASH(( "Team::xfer - TeamID mismatch.  Xfered '%d' but should be '%d'",
 									teamID, m_id ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
-		
+	}
+
 	// member list count and data
 	ObjectID memberID;
 	UnsignedShort memberCount = 0;
-	for( DLINK_ITERATOR< Object > objIt = iterate_TeamMemberList(); 
-			 objIt.done() == FALSE; 
+	for( DLINK_ITERATOR< Object > objIt = iterate_TeamMemberList();
+			 objIt.done() == FALSE;
 			 objIt.advance() )
 		memberCount++;
 	xfer->xferUnsignedShort( &memberCount );
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
 		Object *obj;
-		
+
 		// save all member info
-		for( DLINK_ITERATOR< Object > objIt = iterate_TeamMemberList(); 
-				 objIt.done() == FALSE; 
+		for( DLINK_ITERATOR< Object > objIt = iterate_TeamMemberList();
+				 objIt.done() == FALSE;
 				 objIt.advance() )
 		{
 
@@ -2607,9 +2597,9 @@ void Team::xfer( Xfer *xfer )
 			memberID = obj->getID();
 			xfer->xferObjectID( &memberID );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -2623,9 +2613,9 @@ void Team::xfer( Xfer *xfer )
 			// put on pending list for later processing
 			m_xferMemberIDList.push_back( memberID );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// state
 	xfer->xferAsciiString( &m_state );
@@ -2676,7 +2666,7 @@ void Team::xfer( Xfer *xfer )
 
 	// recruitability set
 	xfer->xferBool( &m_isRecruitablitySet );
-	
+
 	// is recruitable
 	xfer->xferBool( &m_isRecruitable );
 
@@ -2688,8 +2678,8 @@ void Team::xfer( Xfer *xfer )
 
 	// player relations
 	xfer->xferSnapshot( m_playerRelations );
-			
-}  // ene xfer
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2711,10 +2701,10 @@ void Team::loadPostProcess( void )
 		if( obj == NULL )
 		{
 
-			DEBUG_CRASH(( "Team::loadPostProcess - Unable to post process object to member list, object ID = '%d'\n", *it ));
+			DEBUG_CRASH(( "Team::loadPostProcess - Unable to post process object to member list, object ID = '%d'", *it ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		//
 		// we are now disabling this code since the objects set their team during their
@@ -2725,13 +2715,13 @@ void Team::loadPostProcess( void )
 		if( isInList_TeamMemberList( obj ) == FALSE )
 		{
 
-			DEBUG_CRASH(( "Team::loadPostProcess - Object '%s'(%d) should be in team list but is not\n",
+			DEBUG_CRASH(( "Team::loadPostProcess - Object '%s'(%d) should be in team list but is not",
 										obj->getTemplate()->getName().str(), obj->getID() ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
 	// since we prepended the object member pointers, reverse that list so it's just like before
 //	reverse_TeamMemberList();
@@ -2739,7 +2729,7 @@ void Team::loadPostProcess( void )
 	// we're done with the xfer list now
 	m_xferMemberIDList.clear();
 
-}  // end loadPostProcess
+}
 
 
 
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp b/Generals/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp
index add19b3a7cf..541d644a7ce 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp
@@ -26,7 +26,7 @@
 // The part of a Player's brain that holds the communal Passenger list of all tunnels.
 // Author: Graham Smallwood, March, 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/GlobalData.h"
@@ -54,6 +54,8 @@ TunnelTracker::TunnelTracker()
 	m_containListSize = 0;
 	m_curNemesisID = INVALID_ID;
 	m_nemesisTimestamp = 0;
+	m_framesForFullHeal = 0;
+	m_needsFullHealTimeUpdate = false;
 }
 
 // ------------------------------------------------------------------------
@@ -73,11 +75,11 @@ void TunnelTracker::iterateContained( ContainIterateFunc func, void *userData, B
 		{
 			// save the obj...
 			Object* obj = *it;
-			
+
 			// incr the iterator BEFORE calling the func (if the func removes the obj,
 			// the iterator becomes invalid)
 			++it;
-			
+
 			// call it
 			(*func)( obj, userData );
 		}
@@ -90,11 +92,11 @@ void TunnelTracker::iterateContained( ContainIterateFunc func, void *userData, B
 		{
 			// save the obj...
 			Object* obj = *it;
-			
+
 			// incr the iterator BEFORE calling the func (if the func removes the obj,
 			// the iterator becomes invalid)
 			++it;
-			
+
 			// call it
 			(*func)( obj, userData );
 		}
@@ -107,6 +109,13 @@ Int TunnelTracker::getContainMax() const
 	return TheGlobalData->m_maxTunnelCapacity;
 }
 
+// ------------------------------------------------------------------------
+void TunnelTracker::swapContainedItemsList(ContainedItemsList& newList)
+{
+	m_containList.swap(newList);
+	m_containListSize = (Int)m_containList.size();
+}
+
 // ------------------------------------------------------------------------
 void TunnelTracker::updateNemesis(const Object *target)
 {
@@ -128,7 +137,7 @@ Object *TunnelTracker::getCurNemesis(void)
 {
 	if (m_curNemesisID == INVALID_ID) {
 		return NULL;
-	}		
+	}
 	if (m_nemesisTimestamp + 4*LOGICFRAMES_PER_SECOND < TheGameLogic->getFrame()) {
 		m_curNemesisID = INVALID_ID;
 		return NULL;
@@ -136,7 +145,7 @@ Object *TunnelTracker::getCurNemesis(void)
 	Object *target = TheGameLogic->findObjectByID(m_curNemesisID);
 	if (target) {
 		//If the enemy unit is stealthed and not detected, then we can't attack it!
-	if( target->testStatus( OBJECT_STATUS_STEALTHED ) && 
+	if( target->testStatus( OBJECT_STATUS_STEALTHED ) &&
 			!target->testStatus( OBJECT_STATUS_DETECTED ) )
 		{
 			target = NULL;
@@ -155,7 +164,7 @@ Object *TunnelTracker::getCurNemesis(void)
 Bool TunnelTracker::isValidContainerFor(const Object* obj, Bool checkCapacity) const
 {
 	//October 11, 2002 -- Kris : Dustin wants ALL units to be able to use tunnels!
-	// srj sez: um, except aircraft. 
+	// srj sez: um, except aircraft.
 	if (obj && !obj->isKindOf(KINDOF_AIRCRAFT))
 	{
 		if (checkCapacity)
@@ -189,7 +198,7 @@ void TunnelTracker::removeFromContain( Object *obj, Bool exposeStealthUnits )
 		// note that this invalidates the iterator!
 		m_containList.erase(it);
 		--m_containListSize;
-	}	
+	}
 
 }
 
@@ -204,6 +213,7 @@ void TunnelTracker::onTunnelCreated( const Object *newTunnel )
 {
 	m_tunnelCount++;
 	m_tunnelIDs.push_back( newTunnel->getID() );
+	m_needsFullHealTimeUpdate = true;
 }
 
 // ------------------------------------------------------------------------
@@ -211,6 +221,7 @@ void TunnelTracker::onTunnelDestroyed( const Object *deadTunnel )
 {
 	m_tunnelCount--;
 	m_tunnelIDs.remove( deadTunnel->getID() );
+	m_needsFullHealTimeUpdate = true;
 
 	if( m_tunnelCount == 0 )
 	{
@@ -222,7 +233,7 @@ void TunnelTracker::onTunnelDestroyed( const Object *deadTunnel )
 	else
 	{
 		Object *validTunnel = TheGameLogic->findObjectByID( m_tunnelIDs.front() );
-		// Otherwise, make sure nobody inside remembers the dead tunnel as the one they entered 
+		// Otherwise, make sure nobody inside remembers the dead tunnel as the one they entered
 		// (scripts need to use so there must be something valid here)
 		for(ContainedItemsList::iterator it = m_containList.begin(); it != m_containList.end(); )
 		{
@@ -245,18 +256,35 @@ void TunnelTracker::destroyObject( Object *obj, void * )
 
 // ------------------------------------------------------------------------
 	// heal all the objects within the tunnel system using the iterateContained function
+#if PRESERVE_RETAIL_BEHAVIOR || RETAIL_COMPATIBLE_CRC
 void TunnelTracker::healObjects(Real frames)
 {
 	iterateContained(healObject, &frames, FALSE);
 }
+#else
+void TunnelTracker::healObjects()
+{
+	if (m_needsFullHealTimeUpdate)
+	{
+		updateFullHealTime();
+		m_needsFullHealTimeUpdate = false;
+	}
+
+	iterateContained(healObject, &m_framesForFullHeal, FALSE);
+}
+#endif
 
 // ------------------------------------------------------------------------
 	// heal one object within the tunnel network system
 void TunnelTracker::healObject( Object *obj, void *frames)
 {
-	
+
 	//get the number of frames to heal
+#if PRESERVE_RETAIL_BEHAVIOR || RETAIL_COMPATIBLE_CRC
 	Real *framesForFullHeal = (Real*)frames;
+#else
+	UnsignedInt* framesForFullHeal = (UnsignedInt*)frames;
+#endif
 
 	// setup the healing damageInfo structure with all but the amount
 	DamageInfo healInfo;
@@ -270,14 +298,14 @@ void TunnelTracker::healObject( Object *obj, void *frames)
 	// if we've been in here long enough ... set our health to max
 	if( TheGameLogic->getFrame() - obj->getContainedByFrame() >= *framesForFullHeal )
 	{
-	
+
 		// set the amount to max just to be sure we're at the top
 		healInfo.in.m_amount = body->getMaxHealth();
-		
+
 		// set max health
 		body->attemptHealing( &healInfo );
 
-	}  // end if
+	}
 	else
 	{
 		//
@@ -290,7 +318,32 @@ void TunnelTracker::healObject( Object *obj, void *frames)
 		// do the healing
 		body->attemptHealing( &healInfo );
 
-	}  // end else
+	}
+}
+
+void TunnelTracker::updateFullHealTime()
+{
+	UnsignedInt minFrames = ~0u;
+
+	for (std::list<ObjectID>::const_iterator it = m_tunnelIDs.begin(); it != m_tunnelIDs.end(); ++it)
+	{
+		const Object* tunnelObj = TheGameLogic->findObjectByID(*it);
+		if (!tunnelObj)
+			continue;
+
+		const ContainModuleInterface* contain = tunnelObj->getContain();
+		DEBUG_ASSERTCRASH(contain != NULL, ("Contain module is NULL"));
+
+		if (!contain->isTunnelContain())
+			continue;
+
+		const TunnelContain* tunnelContain = static_cast<const TunnelContain*>(contain);
+		const UnsignedInt framesForFullHeal = tunnelContain->getFullTimeForHeal();
+		if (framesForFullHeal < minFrames)
+			minFrames = framesForFullHeal;
+	}
+
+	m_framesForFullHeal = minFrames;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -299,7 +352,7 @@ void TunnelTracker::healObject( Object *obj, void *frames)
 void TunnelTracker::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -332,9 +385,9 @@ void TunnelTracker::xfer( Xfer *xfer )
 			objectID = (*it)->getID();
 			xfer->xferObjectID( &objectID );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -344,14 +397,15 @@ void TunnelTracker::xfer( Xfer *xfer )
 			xfer->xferObjectID( &objectID );
 			m_xferContainList.push_back( objectID );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+		m_needsFullHealTimeUpdate = true;
+	}
 
 	// tunnel count
 	xfer->xferUnsignedInt( &m_tunnelCount );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -360,13 +414,13 @@ void TunnelTracker::loadPostProcess( void )
 {
 
 	// sanity, the contain list should be empty until we post process the id list
-	if( m_containList.size() != 0 )
+	if( !m_containList.empty() )
 	{
 
-		DEBUG_CRASH(( "TunnelTracker::loadPostProcess - m_containList should be empty but is not\n" ));
+		DEBUG_CRASH(( "TunnelTracker::loadPostProcess - m_containList should be empty but is not" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// translate each object ids on the xferContainList into real object pointers in the contain list
 	Object *obj;
@@ -378,10 +432,10 @@ void TunnelTracker::loadPostProcess( void )
 		if( obj == NULL )
 		{
 
-			DEBUG_CRASH(( "TunnelTracker::loadPostProcess - Unable to find object ID '%d'\n", *it ));
+			DEBUG_CRASH(( "TunnelTracker::loadPostProcess - Unable to find object ID '%d'", *it ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// push on the back of the contain list
 		m_containList.push_back( obj );
@@ -390,22 +444,22 @@ void TunnelTracker::loadPostProcess( void )
 		{
 			// remove object from its group (if any)
 			obj->leaveGroup();
-			
+
 			// remove rider from partition manager
 			ThePartitionManager->unRegisterObject( obj );
-			
+
 			// hide the drawable associated with rider
 			if( obj->getDrawable() )
 				obj->getDrawable()->setDrawableHidden( true );
-			
+
 			// remove object from pathfind map
 			if( TheAI )
 				TheAI->pathfinder()->removeObjectFromPathfindMap( obj );
-			
+
 		}
-	}  // end for, it
+	}
 
 	// we're done with the xfer contain list now
 	m_xferContainList.clear();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/Common/RandomValue.cpp b/Generals/Code/GameEngine/Source/Common/RandomValue.cpp
deleted file mode 100644
index 194ec0cea78..00000000000
--- a/Generals/Code/GameEngine/Source/Common/RandomValue.cpp
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// RandomValue.cpp
-// Pseudo-random number generators 
-// Author: Michael S. Booth, January 1998
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-
-#include "Lib/BaseType.h"
-#include "Common/RandomValue.h"
-#include "Common/crc.h"
-#include "Common/Debug.h"
-#include "GameLogic/GameLogic.h"
-
-//#define DETERMINISTIC				// to allow repetition for debugging
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#undef DEBUG_RANDOM_CLIENT
-#undef DEBUG_RANDOM_LOGIC
-#undef DEBUG_RANDOM_AUDIO
-
-//#define DEBUG_RANDOM_CLIENT
-//#define DEBUG_RANDOM_LOGIC
-//#define DEBUG_RANDOM_AUDIO
-
-static const Real theMultFactor = 1.0f / (powf(2, 8 * sizeof(UnsignedInt)) - 1.0f);
-
-// Initial seed values.
-static UnsignedInt theGameClientSeed[6] =
-{
-    0xf22d0e56L, 0x883126e9L, 0xc624dd2fL, 0x702c49cL, 0x9e353f7dL, 0x6fdf3b64L
-};
-
-static UnsignedInt theGameAudioSeed[6] =
-{
-    0xf22d0e56L, 0x883126e9L, 0xc624dd2fL, 0x702c49cL, 0x9e353f7dL, 0x6fdf3b64L
-};
-
-static UnsignedInt theGameLogicBaseSeed = 0;
-static UnsignedInt theGameLogicSeed[6] =
-{
-    0xf22d0e56L, 0x883126e9L, 0xc624dd2fL, 0x702c49cL, 0x9e353f7dL, 0x6fdf3b64L
-};
-
-// Add with carry. SUM is replaced with A + B + C, C is replaced with 1  if there was a carry, 0 if there wasn't. A carry occurred if the sum is  less than one of the inputs. This is addition, so carry can never be  more than one.
-#define ADC(SUM, A, B, C)   SUM = (A) + (B) + (C); C = ((SUM < (A)) || (SUM < (B)))
-
-static UnsignedInt randomValue(UnsignedInt *seed)
-{
-	UnsignedInt ax;
-	UnsignedInt c = 0;
-	
-	
-	ADC(ax, seed[5], seed[4], c);   /*  mov     ax,seed+20  */
-	/*  add     ax,seed+16  */
-	seed[4] = ax;                   /*  mov     seed+8,ax   */
-	
-	ADC(ax, ax, seed[3], c);        /*  adc     ax,seed+12  */
-	seed[3] = ax;                   /*  mov     seed+12,ax  */
-	
-	ADC(ax, ax, seed[2], c);        /*  adc     ax,seed+8   */
-	seed[2] = ax;                   /*  mov     seed+8,ax   */
-	
-	ADC(ax, ax, seed[1], c);        /*  adc     ax,seed+4   */
-	seed[1] = ax;                   /*  mov     seed+4,ax   */
-	
-	ADC(ax, ax, seed[0], c);        /*  adc     ax,seed+0   */
-	seed[0] = ax;                   /*  mov     seed+0,ax   */
-	
-	/* Increment seed array, bubbling up the carries. */
-	if (!++seed[5])
-	{
-		if (!++seed[4])
-		{
-			if (!++seed[3])
-			{
-				if (!++seed[2])
-				{
-					if (!++seed[1])
-					{
-						++seed[0];
-						++ax;
-					}
-				}
-			}
-		}
-	}
-	return(ax);
-}
-
-static void seedRandom(UnsignedInt SEED, UnsignedInt *seed)
-{
-	UnsignedInt ax;
-
-	ax = SEED;                      /* mov     eax,SEED                     */
-	ax += 0xf22d0e56;               /* add     eax,0f22d0e56h               */
-	seed[0] = ax;                   /* mov     seed,eax                     */
-	ax += 0x883126e9 - 0xf22d0e56;  /* add     eax,0883126e9h-0f22d0e56h    */
-	seed[1] = ax;                   /* mov     seed+4,eax                   */
-	ax += 0xc624dd2f - 0x883126e9;  /* add     eax,0c624dd2fh-0883126e9h    */
-	seed[2] = ax;                   /* mov     seed+8,eax                   */
-	ax += 0x0702c49c - 0xc624dd2f;  /* add     eax,00702c49ch-0c624dd2fh    */
-	seed[3] = ax;                   /* mov     seed+12,eax                  */
-	ax += 0x9e353f7d - 0x0702c49c;  /* add     eax,09e353f7dh-00702c49ch    */
-	seed[4] = ax;                   /* mov     seed+16,eax                  */
-	ax += 0x6fdf3b64 - 0x9e353f7d;  /* add     eax,06fdf3b64h-09e353f7dh    */
-	seed[5] = ax;                   /* mov     seed+20,eax                  */
-}
-
-//
-// It is necessary to separate the GameClient and GameLogic usage of random
-// values to ensure that the GameLogic remains deterministic, regardless
-// of the effects displayed on the GameClient.
-//
-
-UnsignedInt GetGameLogicRandomSeed( void )
-{
-	return theGameLogicBaseSeed;
-}
-
-UnsignedInt GetGameLogicRandomSeedCRC( void )
-{
-	CRC c;
-	c.computeCRC(theGameLogicSeed, 6*sizeof(UnsignedInt));
-	return c.get();
-}
-
-void InitRandom( void )
-{
-#ifdef DETERMINISTIC
-	// needs to be the same every time
-	seedRandom(0, theGameClientSeed);
-	seedRandom(0, theGameAudioSeed);
-	seedRandom(0, theGameLogicSeed);
-	theGameLogicBaseSeed = 0;
-#else
-	time_t seconds = time( NULL );
-
-	seedRandom(seconds, theGameAudioSeed);
-	seedRandom(seconds, theGameClientSeed);
-	seedRandom(seconds, theGameLogicSeed);
-	theGameLogicBaseSeed = seconds;
-#endif
-}
-
-void InitRandom( UnsignedInt seed )
-{
-	seedRandom(seed, theGameAudioSeed);
-	seedRandom(seed, theGameClientSeed);
-	seedRandom(seed, theGameLogicSeed);
-	theGameLogicBaseSeed = seed;
-#ifdef DEBUG_RANDOM_LOGIC
-DEBUG_LOG(( "InitRandom %08lx\n",seed));
-#endif
-}
-
-void InitGameLogicRandom( UnsignedInt seed )
-{
-#ifdef DETERMINISTIC
-	// needs to be the same every time
-	seedRandom(0, theGameLogicSeed);
-	theGameLogicBaseSeed = 0;
-#else
-	seedRandom(seed, theGameLogicSeed);
-	theGameLogicBaseSeed = seed;
-#endif
-#ifdef DEBUG_RANDOM_LOGIC
-DEBUG_LOG(( "InitRandom Logic %08lx\n",seed));
-#endif
-}
-
-//
-// Integer random value
-//
-Int GetGameLogicRandomValue( int lo, int hi, const char *file, int line )
-{
-	//Int delta = hi - lo + 1;
-	//Int rval;
-
-	//if (delta == 0)
-		//return hi;
-
-	//rval = ((Int)(randomValue(theGameLogicSeed) % delta)) + lo;
-
-	UnsignedInt delta = hi - lo + 1;
-	//UnsignedInt temp;
-	Int rval;
-
-	if (delta == 0)
-		return hi;
-
-	rval = ((Int)(randomValue(theGameLogicSeed) % delta)) + lo;
-	//temp = randomValue(theGameLogicSeed);
-	//temp = temp % delta;
-
-	//rval = temp + lo;
-
-/**/
-#ifdef DEBUG_RANDOM_LOGIC
-DEBUG_LOG(( "%d: GetGameLogicRandomValue = %d (%d - %d), %s line %d\n",
-				 TheGameLogic->getFrame(), rval, lo, hi, file, line ));
-#endif
-/**/
-
-	return rval;
-}
-
-//
-// Integer random value
-//
-Int GetGameClientRandomValue( int lo, int hi, const char *file, int line )
-{
-	UnsignedInt delta = hi - lo + 1;
-	Int rval;
-
-	if (delta == 0)
-		return hi;
-
-	rval = ((Int)(randomValue(theGameClientSeed) % delta)) + lo;
-
-/**/
-#ifdef DEBUG_RANDOM_CLIENT
-DEBUG_LOG(( "%d: GetGameClientRandomValue = %d (%d - %d), %s line %d\n",
-				TheGameLogic ? TheGameLogic->getFrame() : -1, rval, lo, hi, file, line ));
-#endif
-/**/
-
-	return rval;
-}
-
-//
-// Integer random value
-//
-Int GetGameAudioRandomValue( int lo, int hi, const char *file, int line )
-{
-	UnsignedInt delta = hi - lo + 1;
-	Int rval;
-
-	if (delta == 0)
-		return hi;
-
-	rval = ((Int)(randomValue(theGameAudioSeed) % delta)) + lo;
-
-/**/
-#ifdef DEBUG_RANDOM_AUDIO
-DEBUG_LOG(( "%d: GetGameAudioRandomValue = %d (%d - %d), %s line %d\n",
-				TheGameLogic->getFrame(), rval, lo, hi, file, line ));
-#endif
-/**/
-
-	return rval;
-}
-
-//
-// Real valued random value
-//
-Real GetGameLogicRandomValueReal( Real lo, Real hi, const char *file, int line )
-{
-	Real delta = hi - lo;
-	Real rval;
-
-	if (delta <= 0.0f)
-		return hi;
-
-	rval = ((Real)(randomValue(theGameLogicSeed)) * theMultFactor ) * delta + lo;
-
-	DEBUG_ASSERTCRASH( rval >= lo && rval <= hi, ("Bad random val"));
-/**/
-#ifdef DEBUG_RANDOM_LOGIC
-DEBUG_LOG(( "%d: GetGameLogicRandomValueReal = %f, %s line %d\n",
-					TheGameLogic->getFrame(), rval, file, line ));
-#endif
-/**/
-
-	return rval;
-}
-
-//
-// Real valued random value
-//
-Real GetGameClientRandomValueReal( Real lo, Real hi, const char *file, int line )
-{
-	Real delta = hi - lo;
-	Real rval;
-
-	if (delta <= 0.0f)
-		return hi;
-
-	rval = ((Real)(randomValue(theGameClientSeed)) * theMultFactor ) * delta + lo;
-
-	DEBUG_ASSERTCRASH( rval >= lo && rval <= hi, ("Bad random val"));
-/**/
-#ifdef DEBUG_RANDOM_CLIENT
-DEBUG_LOG(( "%d: GetGameClientRandomValueReal = %f, %s line %d\n",
-					TheGameLogic->getFrame(), rval, file, line ));
-#endif
-/**/
-
-	return rval;
-}
-
-//
-// Real valued random value
-//
-Real GetGameAudioRandomValueReal( Real lo, Real hi, const char *file, int line )
-{
-	Real delta = hi - lo;
-	Real rval;
-
-	if (delta <= 0.0f)
-		return hi;
-
-	rval = ((Real)(randomValue(theGameAudioSeed)) * theMultFactor ) * delta + lo;
-
-	DEBUG_ASSERTCRASH( rval >= lo && rval <= hi, ("Bad random val"));
-/**/
-#ifdef DEBUG_RANDOM_AUDIO
-DEBUG_LOG(( "%d: GetGameAudioRandomValueReal = %f, %s line %d\n",
-					TheGameLogic->getFrame(), rval, file, line ));
-#endif
-/**/
-
-	return rval;
-}
-
-//--------------------------------------------------------------------------------------------------------------
-// GameClientRandomVariable
-//
-
-/*static*/ const char *GameClientRandomVariable::DistributionTypeNames[] = 
-{
-	"CONSTANT", "UNIFORM", "GAUSSIAN", "TRIANGULAR", "LOW_BIAS", "HIGH_BIAS"
-};
-
-/**
-	define the range of random values, and the distribution of values
-*/
-void GameClientRandomVariable::setRange( Real low, Real high, DistributionType type )
-{
-	DEBUG_ASSERTCRASH(!(m_type == CONSTANT && m_low != m_high), ("CONSTANT GameClientRandomVariables should have low == high"));
-	m_low = low;
-	m_high = high;
-	m_type = type;
-}
-
-/**
- * Return a value from the random distribution
- */
-Real GameClientRandomVariable::getValue( void ) const
-{
-	switch( m_type )
-	{
-		case CONSTANT:
-			DEBUG_ASSERTLOG(m_low == m_high, ("m_low != m_high for a CONSTANT GameClientRandomVariable\n"));
-			if (m_low == m_high) {
-				return m_low;
-			} // else return as though a UNIFORM.
-
-		case UNIFORM:
-			return GameClientRandomValueReal( m_low, m_high );
-
-		default:
-			/// @todo fill in support for nonuniform GameClientRandomVariables.
-			DEBUG_CRASH(("unsupported DistributionType in GameClientRandomVariable::getValue\n"));
-			return 0.0f;
-	}
-}
-
-
-//--------------------------------------------------------------------------------------------------------------
-// GameLogicRandomVariable
-//
-
-/*static*/ const char *GameLogicRandomVariable::DistributionTypeNames[] = 
-{
-	"CONSTANT", "UNIFORM", "GAUSSIAN", "TRIANGULAR", "LOW_BIAS", "HIGH_BIAS"
-};
-
-/**
-	define the range of random values, and the distribution of values
-*/
-void GameLogicRandomVariable::setRange( Real low, Real high, DistributionType type )
-{
-	DEBUG_ASSERTCRASH(!(m_type == CONSTANT && m_low != m_high), ("CONSTANT GameLogicRandomVariables should have low == high"));
-	m_low = low;
-	m_high = high;
-	m_type = type;
-}
-
-/**
- * Return a value from the random distribution
- */
-Real GameLogicRandomVariable::getValue( void ) const
-{
-	switch( m_type )
-	{
-		case CONSTANT:
-			DEBUG_ASSERTLOG(m_low == m_high, ("m_low != m_high for a CONSTANT GameLogicRandomVariable"));
-			if (m_low == m_high) {
-				return m_low;
-			} // else return as though a UNIFORM.
-
-		case UNIFORM:
-			return GameLogicRandomValueReal( m_low, m_high );
-
-		default:
-			/// @todo fill in support for nonuniform GameLogicRandomVariables.
-			DEBUG_CRASH(("unsupported DistributionType in GameLogicRandomVariable::getValue\n"));
-			return 0.0f;
-	}
-}
-
-
diff --git a/Generals/Code/GameEngine/Source/Common/Recorder.cpp b/Generals/Code/GameEngine/Source/Common/Recorder.cpp
index 9045645f3ad..32efa15188f 100644
--- a/Generals/Code/GameEngine/Source/Common/Recorder.cpp
+++ b/Generals/Code/GameEngine/Source/Common/Recorder.cpp
@@ -22,9 +22,10 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Recorder.h"
+#include "Common/file.h"
 #include "Common/FileSystem.h"
 #include "Common/PlayerList.h"
 #include "Common/Player.h"
@@ -44,13 +45,11 @@
 #include "GameLogic/GameLogic.h"
 #include "Common/RandomValue.h"
 #include "Common/CRCDebug.h"
+#include "Common/UserPreferences.h"
 #include "Common/version.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+constexpr const char s_genrep[] = "GENREP";
+constexpr const UnsignedInt replayBufferBytes = 8192;
 
 Int REPLAY_CRC_INTERVAL = 100;
 
@@ -67,8 +66,8 @@ typedef int32_t replay_time_t;
 static time_t startTime;
 static const UnsignedInt startTimeOffset = 6;
 static const UnsignedInt endTimeOffset = startTimeOffset + sizeof(replay_time_t);
-static const UnsignedInt framesOffset = endTimeOffset + sizeof(replay_time_t);
-static const UnsignedInt desyncOffset = framesOffset + sizeof(UnsignedInt);
+static const UnsignedInt frameCountOffset = endTimeOffset + sizeof(replay_time_t);
+static const UnsignedInt desyncOffset = frameCountOffset + sizeof(UnsignedInt);
 static const UnsignedInt quitEarlyOffset = desyncOffset + sizeof(Bool);
 static const UnsignedInt disconOffset = quitEarlyOffset + sizeof(Bool);
 
@@ -78,22 +77,22 @@ void RecorderClass::logGameStart(AsciiString options)
 		return;
 
 	time(&startTime);
-	UnsignedInt fileSize = ftell(m_file);
+	UnsignedInt fileSize = m_file->size();
 	// move to appropriate offset
-	if (!fseek(m_file, startTimeOffset, SEEK_SET))
+	if ( m_file->seek(startTimeOffset, File::seekMode::START) == startTimeOffset )
 	{
 		// save off start time
 		replay_time_t tmp = (replay_time_t)startTime;
-		fwrite(&tmp, sizeof(replay_time_t), 1, m_file);
+		m_file->write(&tmp, sizeof(tmp));
 	}
 	// move back to end of stream
 #ifdef DEBUG_CRASHING
 	Int res =
 #endif
-		fseek(m_file, fileSize, SEEK_SET);
-	DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!"));
+	m_file->seek(fileSize, File::seekMode::START);
+	DEBUG_ASSERTCRASH(res == fileSize, ("Could not seek to end of file!"));
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheNetwork && TheGlobalData->m_saveStats)
 	{
 		//if (TheLAN)
@@ -139,22 +138,23 @@ void RecorderClass::logPlayerDisconnect(UnicodeString player, Int slot)
 	{
 		return;
 	}
-	UnsignedInt fileSize = ftell(m_file);
+	UnsignedInt fileSize = m_file->size();
 	// move to appropriate offset
-	if (!fseek(m_file, disconOffset + slot*sizeof(Bool), SEEK_SET))
+	Int playerSlotDisconOffset = disconOffset + slot * sizeof(Bool);
+	if ( m_file->seek(playerSlotDisconOffset, File::seekMode::START) == playerSlotDisconOffset )
 	{
 		// save off discon status
-		Bool b = TRUE;
-		fwrite(&b, sizeof(Bool), 1, m_file);
+		Bool flag = TRUE;
+		m_file->write(&flag, sizeof(flag));
 	}
 	// move back to end of stream
 #ifdef DEBUG_CRASHING
 	Int res =
 #endif
-		fseek(m_file, fileSize, SEEK_SET);
-	DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!"));
+	m_file->seek(fileSize, File::seekMode::START);
+	DEBUG_ASSERTCRASH(res == fileSize, ("Could not seek to end of file!"));
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_saveStats)
 	{
 		unsigned long bufSize = MAX_COMPUTERNAME_LENGTH + 1;
@@ -184,22 +184,22 @@ void RecorderClass::logCRCMismatch( void )
 	if (!m_file)
 		return;
 
-	UnsignedInt fileSize = ftell(m_file);
+	UnsignedInt fileSize = m_file->size();
 	// move to appropriate offset
-	if (!fseek(m_file, desyncOffset, SEEK_SET))
+	if ( m_file->seek(desyncOffset, File::seekMode::START) == desyncOffset )
 	{
 		// save off desync status
-		Bool b = TRUE;
-		fwrite(&b, sizeof(Bool), 1, m_file);
+		Bool flag = TRUE;
+		m_file->write(&flag, sizeof(flag));
 	}
 	// move back to end of stream
 #ifdef DEBUG_CRASHING
 	Int res =
 #endif
-		fseek(m_file, fileSize, SEEK_SET);
-	DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!"));
+	m_file->seek(fileSize, File::seekMode::START);
+	DEBUG_ASSERTCRASH(res == fileSize, ("Could not seek to end of file!"));
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_saveStats)
 	{
 		m_wasDesync = TRUE;
@@ -232,29 +232,29 @@ void RecorderClass::logGameEnd( void )
 
 	time_t t;
 	time(&t);
-	UnsignedInt duration = TheGameLogic->getFrame();
-	UnsignedInt fileSize = ftell(m_file);
+	UnsignedInt frameCount = TheGameLogic->getFrame();
+	UnsignedInt fileSize = m_file->size();
 	// move to appropriate offset
-	if (!fseek(m_file, endTimeOffset, SEEK_SET))
+	if ( m_file->seek(endTimeOffset, File::seekMode::START) == endTimeOffset )
 	{
 		// save off end time
 		replay_time_t tmp = (replay_time_t)t;
-		fwrite(&tmp, sizeof(replay_time_t), 1, m_file);
+		m_file->write(&tmp, sizeof(tmp));
 	}
 	// move to appropriate offset
-	if (!fseek(m_file, framesOffset, SEEK_SET))
+	if ( m_file->seek(frameCountOffset, File::seekMode::START) == frameCountOffset )
 	{
-		// save off duration
-		fwrite(&duration, sizeof(UnsignedInt), 1, m_file);
+		// save off frameCount
+		m_file->write(&frameCount, sizeof(frameCount));
 	}
 	// move back to end of stream
 #ifdef DEBUG_CRASHING
 	Int res =
 #endif
-		fseek(m_file, fileSize, SEEK_SET);
-	DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!"));
+	m_file->seek(fileSize, File::seekMode::START);
+	DEBUG_ASSERTCRASH(res == fileSize, ("Could not seek to end of file!"));
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheNetwork && TheGlobalData->m_saveStats)
 	{
 		//if (TheLAN)
@@ -272,7 +272,7 @@ void RecorderClass::logGameEnd( void )
 			if (logFP)
 			{
 				struct tm *t2 = localtime(&t);
-				duration = t - startTime;
+				time_t duration = t - startTime;
 				Int minutes = duration/60;
 				Int seconds = duration%60;
 				fprintf(logFP, "Game end at   %s(%d:%2.2d elapsed time)\n", asctime(t2), minutes, seconds);
@@ -285,13 +285,13 @@ void RecorderClass::logGameEnd( void )
 
 void RecorderClass::cleanUpReplayFile( void )
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_saveStats)
 	{
 		char fname[_MAX_PATH+1];
-		strncpy(fname, TheGlobalData->m_baseStatsDir.str(), _MAX_PATH);
-		strncat(fname, m_fileName.str(), _MAX_PATH - strlen(fname));
-		DEBUG_LOG(("Saving replay to %s\n", fname));
+		strlcpy(fname, TheGlobalData->m_baseStatsDir.str(), ARRAY_SIZE(fname));
+		strlcat(fname, m_fileName.str(), ARRAY_SIZE(fname));
+		DEBUG_LOG(("Saving replay to %s", fname));
 		AsciiString oldFname;
 		oldFname.format("%s%s", getReplayDir().str(), m_fileName.str());
 		CopyFile(oldFname.str(), fname, TRUE);
@@ -302,9 +302,7 @@ void RecorderClass::cleanUpReplayFile( void )
 			return;
 
 		AsciiString debugFname = fname;
-		debugFname.removeLastChar();
-		debugFname.removeLastChar();
-		debugFname.removeLastChar();
+		debugFname.truncateBy(3);
 		debugFname.concat("txt");
 		UnsignedInt fileSize = 0;
 		FILE *fp = fopen(logFileName, "rb");
@@ -314,18 +312,18 @@ void RecorderClass::cleanUpReplayFile( void )
 			fileSize = ftell(fp);
 			fclose(fp);
 			fp = NULL;
-			DEBUG_LOG(("Log file size was %d\n", fileSize));
+			DEBUG_LOG(("Log file size was %d", fileSize));
 		}
 
 		const int MAX_DEBUG_SIZE = 65536;
 		if (fileSize <= MAX_DEBUG_SIZE || TheGlobalData->m_saveAllStats)
 		{
-			DEBUG_LOG(("Using CopyFile to copy %s\n", logFileName));
+			DEBUG_LOG(("Using CopyFile to copy %s", logFileName));
 			CopyFile(logFileName, debugFname.str(), TRUE);
 		}
 		else
 		{
-			DEBUG_LOG(("manual copy of %s\n", logFileName));
+			DEBUG_LOG(("manual copy of %s", logFileName));
 			FILE *ifp = fopen(logFileName, "rb");
 			FILE *ofp = fopen(debugFname.str(), "wb");
 			if (ifp && ofp)
@@ -363,20 +361,17 @@ RecorderClass *TheRecorder = NULL;
 /**
  * Constructor
  */
-RecorderClass::RecorderClass() 
+RecorderClass::RecorderClass()
 {
 	m_originalGameMode = GAME_NONE;
 	m_mode = RECORDERMODETYPE_RECORD;
 	m_file = NULL;
 	m_fileName.clear();
 	m_currentFilePosition = 0;
-	//Added By Sadullah Nader
-	//Initializtion(s) inserted
 	m_doingAnalysis = FALSE;
+	m_archiveReplays = FALSE;
 	m_nextFrame = 0;
 	m_wasDesync = FALSE;
-	//
-
 	init(); // just for the heck of it.
 }
 
@@ -408,6 +403,10 @@ void RecorderClass::init() {
 	m_gameInfo.setSeed(GetGameLogicRandomSeed());
 	m_wasDesync = FALSE;
 	m_doingAnalysis = FALSE;
+	m_playbackFrameCount = 0;
+
+	OptionPreferences optionPref;
+	m_archiveReplays = optionPref.getArchiveReplaysEnabled();
 }
 
 /**
@@ -415,7 +414,7 @@ void RecorderClass::init() {
  */
 void RecorderClass::reset() {
 	if (m_file != NULL) {
-		fclose(m_file);
+		m_file->close();
 		m_file = NULL;
 	}
 	m_fileName.clear();
@@ -430,7 +429,7 @@ void RecorderClass::reset() {
 void RecorderClass::update() {
 	if (m_mode == RECORDERMODETYPE_RECORD || m_mode == RECORDERMODETYPE_NONE) {
 		updateRecord();
-	} else if (m_mode == RECORDERMODETYPE_PLAYBACK) {
+	} else if (isPlaybackMode()) {
 		updatePlayback();
 	}
 }
@@ -472,32 +471,32 @@ void RecorderClass::updatePlayback() {
  */
 void RecorderClass::stopPlayback() {
 	if (m_file != NULL) {
-		fclose(m_file);
+		m_file->close();
 		m_file = NULL;
 	}
 	m_fileName.clear();
-	// Don't clear the game data if the replay is over - let things continue
-//#ifdef DEBUG_CRC
+
 	if (!m_doingAnalysis)
-		TheMessageStream->appendMessage(GameMessage::MSG_CLEAR_GAME_DATA);
-//#endif
+	{
+		TheGameLogic->exitGame();
+	}
 }
 
 /**
  * Update function for recording a game. Basically all the pertinant logic commands for this frame are written out
  * to a file.
  */
-void RecorderClass::updateRecord() 
+void RecorderClass::updateRecord()
 {
 	Bool needFlush = FALSE;
 	static Int lastFrame = -1;
 	GameMessage *msg = TheCommandList->getFirstMessage();
 	while (msg != NULL) {
 		if (msg->getType() == GameMessage::MSG_NEW_GAME &&
-			 msg->getArgument(0)->integer != GAME_SHELL && 
+			 msg->getArgument(0)->integer != GAME_SHELL &&
 			 msg->getArgument(0)->integer != GAME_NONE) {
 			m_originalGameMode = msg->getArgument(0)->integer;
-			DEBUG_LOG(("RecorderClass::updateRecord() - original game is mode %d\n", m_originalGameMode));
+			DEBUG_LOG(("RecorderClass::updateRecord() - original game is mode %d", m_originalGameMode));
 			lastFrame = 0;
 			GameDifficulty diff = DIFFICULTY_NORMAL;
 			if (msg->getArgumentCount() >= 2)
@@ -515,6 +514,7 @@ void RecorderClass::updateRecord()
 				lastFrame = -1;
 				writeToFile(msg);
 				stopRecording();
+				needFlush = FALSE;
 			}
 			m_fileName.clear();
 		} else {
@@ -531,7 +531,8 @@ void RecorderClass::updateRecord()
 	}
 
 	if (needFlush) {
-		fflush(m_file);
+		DEBUG_ASSERTCRASH(m_file != NULL, ("RecorderClass::updateRecord() - unexpected call to fflush(m_file)"));
+		m_file->flush();
 	}
 }
 
@@ -548,61 +549,62 @@ void RecorderClass::startRecording(GameDifficulty diff, Int originalGameMode, In
 
 	AsciiString filepath = getReplayDir();
 
-	// We have to make sure the replay dir exists. 
+	// We have to make sure the replay dir exists.
 	TheFileSystem->createDirectory(filepath);
 
 	m_fileName = getLastReplayFileName();
 	m_fileName.concat(getReplayExtention());
 	filepath.concat(m_fileName);
-	m_file = fopen(filepath.str(), "wb");
+	m_file = TheFileSystem->openFile(filepath.str(), File::WRITE | File::BINARY);
 	if (m_file == NULL) {
 		DEBUG_ASSERTCRASH(m_file != NULL, ("Failed to create replay file"));
 		return;
 	}
-	fprintf(m_file, "GENREP");
+	// TheSuperHackers @info the null terminator needs to be ignored to maintain retail replay file layout
+	m_file->writeFormat("%s", s_genrep);
 
 	//
 	// save space for stats to be filled in.
 	//
-	// **** if this changes, change the LAN Playtest code above ****
+	// **** if this changes, change the LAN code above ****
 	//
-	replay_time_t t = 0;
-	fwrite(&t, sizeof(replay_time_t), 1, m_file);	// reserve space for start time
-	fwrite(&t, sizeof(replay_time_t), 1, m_file);	// reserve space for end time
+	replay_time_t time = 0;
+	m_file->write(&time, sizeof(time));	// reserve space for start time
+	m_file->write(&time, sizeof(time));	// reserve space for end time
 
 	UnsignedInt frames = 0;
-	fwrite(&frames, sizeof(UnsignedInt), 1, m_file);	// reserve space for duration in frames
+	m_file->write(&frames, sizeof(frames));	// reserve space for duration in frames
 
-	Bool b = FALSE;
-	fwrite(&b, sizeof(Bool), 1, m_file);	// reserve space for flag (true if we desync)
-	fwrite(&b, sizeof(Bool), 1, m_file);	// reserve space for flag (true if we quit early)
+	Bool flag = FALSE;
+	m_file->write(&flag, sizeof(flag));	// reserve space for flag (true if we desync)
+	m_file->write(&flag, sizeof(flag));	// reserve space for flag (true if we quit early)
 	for (Int i=0; i<MAX_SLOTS; ++i)
 	{
-		fwrite(&b, sizeof(Bool), 1, m_file);	// reserve space for flag (true if player i disconnects)
+		m_file->write(&flag, sizeof(flag));	// reserve space for flag (true if player i disconnects)
 	}
 
 	// Print out the name of the replay.
 	UnicodeString replayName;
 	replayName = TheGameText->fetch("GUI:LastReplay");
-	fwprintf(m_file, L"%ws", replayName.str());
-	fputwc(0, m_file);
+	m_file->writeFormat(L"%s", replayName.str());
+	m_file->writeChar(L"\0");
 
 	// Date and Time
 	SYSTEMTIME systemTime;
 	GetLocalTime( &systemTime );
-	fwrite(&systemTime, sizeof(SYSTEMTIME), 1, m_file);
+	m_file->write(&systemTime, sizeof(systemTime));
 
 	// write out version info
 	UnicodeString versionString = TheVersion->getUnicodeVersion();
 	UnicodeString versionTimeString = TheVersion->getUnicodeBuildTime();
 	UnsignedInt versionNumber = TheVersion->getVersionNumber();
-	fwprintf(m_file, L"%ws", versionString.str());
-	fputwc(0, m_file);
-	fwprintf(m_file, L"%ws", versionTimeString.str());
-	fputwc(0, m_file);
-	fwrite(&versionNumber, sizeof(UnsignedInt), 1, m_file);
-	fwrite(&(TheGlobalData->m_exeCRC), sizeof(UnsignedInt), 1, m_file);
-	fwrite(&(TheGlobalData->m_iniCRC), sizeof(UnsignedInt), 1, m_file);
+	m_file->writeFormat(L"%s", versionString.str());
+	m_file->writeChar(L"\0");
+	m_file->writeFormat(L"%s", versionTimeString.str());
+	m_file->writeChar(L"\0");
+	m_file->write(&versionNumber, sizeof(versionNumber));
+	m_file->write(&(TheGlobalData->m_exeCRC), sizeof(TheGlobalData->m_exeCRC));
+	m_file->write(&(TheGlobalData->m_iniCRC), sizeof(TheGlobalData->m_iniCRC));
 
 	// Number of players
 	/*
@@ -642,7 +644,7 @@ void RecorderClass::startRecording(GameDifficulty diff, Int originalGameMode, In
     {
 			TheSkirmishGameInfo->setCRCInterval(REPLAY_CRC_INTERVAL);
       theSlotList = GameInfoToAsciiString(TheSkirmishGameInfo);
-      DEBUG_LOG(("GameInfo String: %s\n",theSlotList.str()));
+      DEBUG_LOG(("GameInfo String: %s",theSlotList.str()));
 			localIndex = 0;
     }
     else
@@ -653,12 +655,14 @@ void RecorderClass::startRecording(GameDifficulty diff, Int originalGameMode, In
     }
 	}
 	logGameStart(theSlotList);
-	DEBUG_LOG(("RecorderClass::startRecording - theSlotList = %s\n", theSlotList.str()));
+	DEBUG_LOG(("RecorderClass::startRecording - theSlotList = %s", theSlotList.str()));
 
 	// write slot list (starting spots, color, alliances, etc
-	fwrite(theSlotList.str(), theSlotList.getLength() + 1, 1, m_file);
-	fprintf(m_file, "%d", localIndex);
-	fputc(0, m_file);
+	m_file->writeFormat("%s", theSlotList.str());
+	m_file->writeChar("\0");
+
+	m_file->writeFormat("%d", localIndex);
+	m_file->writeChar("\0");
 
 	/*
 	/// @todo fix this to use starting spots and player alliances when those are put in the game.
@@ -683,18 +687,18 @@ void RecorderClass::startRecording(GameDifficulty diff, Int originalGameMode, In
 	*/
 
 	// Write the game difficulty.
-	fwrite(&diff, sizeof(Int), 1, m_file);
+	m_file->write(&diff, sizeof(diff));
 
 	// Write original game mode
-	fwrite(&originalGameMode, sizeof(originalGameMode), 1, m_file);
+	m_file->write(&originalGameMode, sizeof(originalGameMode));
 
 	// Write rank points to add at game start
-	fwrite(&rankPoints, sizeof(rankPoints), 1, m_file);
+	m_file->write(&rankPoints, sizeof(rankPoints));
 
 	// Write maxFPS chosen
-	fwrite(&maxFPS, sizeof(maxFPS), 1, m_file);
+	m_file->write(&maxFPS, sizeof(maxFPS));
 
-	DEBUG_LOG(("RecorderClass::startRecording() - diff=%d, mode=%d, FPS=%d\n", diff, originalGameMode, maxFPS));
+	DEBUG_LOG(("RecorderClass::startRecording() - diff=%d, mode=%d, FPS=%d", diff, originalGameMode, maxFPS));
 
 	/*
 	// Write the map name.
@@ -721,30 +725,62 @@ void RecorderClass::stopRecording() {
 		}
 	}
 	if (m_file != NULL) {
-		fclose(m_file);
+		m_file->close();
 		m_file = NULL;
+
+		if (m_archiveReplays)
+			archiveReplay(m_fileName);
 	}
 	m_fileName.clear();
 }
 
+/**
+ * TheSuperHackers @feature Stubbjax 17/10/2025 Copy the replay file to the archive directory and rename it using the current timestamp.
+ */
+void RecorderClass::archiveReplay(AsciiString fileName)
+{
+	SYSTEMTIME st;
+	GetLocalTime(&st);
+
+	AsciiString archiveFileName;
+	// Use a standard YYYYMMDD_HHMMSS format for simplicity and to avoid conflicts.
+	archiveFileName.format("%04d%02d%02d_%02d%02d%02d", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond);
+
+	AsciiString extension = getReplayExtention();
+	AsciiString sourcePath = getReplayDir();
+	sourcePath.concat(fileName);
+
+	if (!sourcePath.endsWith(extension))
+		sourcePath.concat(extension);
+
+	AsciiString destPath = getReplayArchiveDir();
+	TheFileSystem->createDirectory(destPath.str());
+
+	destPath.concat(archiveFileName);
+	destPath.concat(extension);
+
+	if (!CopyFile(sourcePath.str(), destPath.str(), FALSE))
+		DEBUG_LOG(("RecorderClass::archiveReplay: Failed to copy %s to %s", sourcePath.str(), destPath.str()));
+}
+
 /**
  * Write this game message to the record file. This also writes the game message's execution frame.
  */
 void RecorderClass::writeToFile(GameMessage * msg) {
 	// Write the frame number for this command.
 	UnsignedInt frame = TheGameLogic->getFrame();
-	fwrite(&frame, sizeof(frame), 1, m_file);
+	m_file->write(&frame, sizeof(frame));
 
 	// Write the command type
 	GameMessage::Type type = msg->getType();
-	fwrite(&type, sizeof(type), 1, m_file);
+	m_file->write(&type, sizeof(type));
 
 	// Write the player index
 	Int playerIndex = msg->getPlayerIndex();
-	fwrite(&playerIndex, sizeof(playerIndex), 1, m_file);
+	m_file->write(&playerIndex, sizeof(playerIndex));
 
 #ifdef DEBUG_LOGGING
-	AsciiString commandName = msg->getCommandAsAsciiString();
+	AsciiString commandName = msg->getCommandAsString();
 	if (type < GameMessage::MSG_BEGIN_NETWORK_MESSAGES || type > GameMessage::MSG_END_NETWORK_MESSAGES)
 	{
 		commandName.concat(" (Non-Network message!)");
@@ -756,21 +792,21 @@ void RecorderClass::writeToFile(GameMessage * msg) {
 		commandName.concat(tmp);
 	}
 
-	//DEBUG_LOG(("RecorderClass::writeToFile - Adding %s command from player %d to TheCommandList on frame %d\n",
+	//DEBUG_LOG(("RecorderClass::writeToFile - Adding %s command from player %d to TheCommandList on frame %d",
 		//commandName.str(), msg->getPlayerIndex(), TheGameLogic->getFrame()));
 #endif // DEBUG_LOGGING
 
 	GameMessageParser *parser = newInstance(GameMessageParser)(msg);
 	UnsignedByte numTypes = parser->getNumTypes();
-	fwrite(&numTypes, sizeof(numTypes), 1, m_file);
+	m_file->write(&numTypes, sizeof(numTypes));
 
 	GameMessageParserArgumentType *argType = parser->getFirstArgumentType();
 	while (argType != NULL) {
 		UnsignedByte type = (UnsignedByte)(argType->getType());
-		fwrite(&type, sizeof(type), 1, m_file);
+		m_file->write(&type, sizeof(type));
 
 		UnsignedByte argTypeCount = (UnsignedByte)(argType->getArgCount());
-		fwrite(&argTypeCount, sizeof(argTypeCount), 1, m_file);
+		m_file->write(&argTypeCount, sizeof(argTypeCount));
 
 		argType = argType->getNext();
 	}
@@ -789,32 +825,48 @@ void RecorderClass::writeToFile(GameMessage * msg) {
 	deleteInstance(parser);
 	parser = NULL;
 
-	fflush(m_file); ///< @todo should this be in the final release?
 }
 
 void RecorderClass::writeArgument(GameMessageArgumentDataType type, const GameMessageArgumentType arg) {
-	if (type == ARGUMENTDATATYPE_INTEGER) {
-		fwrite(&(arg.integer), sizeof(arg.integer), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_REAL) {
-		fwrite(&(arg.real), sizeof(arg.real), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-		fwrite(&(arg.boolean), sizeof(arg.boolean), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-		fwrite(&(arg.objectID), sizeof(arg.objectID), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-		fwrite(&(arg.drawableID), sizeof(arg.drawableID), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_TEAMID) {
-		fwrite(&(arg.teamID), sizeof(arg.teamID), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_LOCATION) {
-		fwrite(&(arg.location), sizeof(arg.location), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_PIXEL) {
-		fwrite(&(arg.pixel), sizeof(arg.pixel), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-		fwrite(&(arg.pixelRegion), sizeof(arg.pixelRegion), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {
-		fwrite(&(arg.timestamp), sizeof(arg.timestamp), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-		fwrite(&(arg.wChar), sizeof(arg.wChar), 1, m_file);
+
+	switch (type) {
+
+		case ARGUMENTDATATYPE_INTEGER:
+			m_file->write( &(arg.integer), sizeof(arg.integer) );
+			break;
+		case ARGUMENTDATATYPE_REAL:
+			m_file->write( &(arg.real), sizeof(arg.real) );
+			break;
+		case ARGUMENTDATATYPE_BOOLEAN:
+			m_file->write( &(arg.boolean), sizeof(arg.boolean) );
+			break;
+		case ARGUMENTDATATYPE_OBJECTID:
+			m_file->write( &(arg.objectID), sizeof(arg.objectID) );
+			break;
+		case ARGUMENTDATATYPE_DRAWABLEID:
+			m_file->write( &(arg.drawableID), sizeof(arg.drawableID) );
+			break;
+		case ARGUMENTDATATYPE_TEAMID:
+			m_file->write( &(arg.teamID), sizeof(arg.teamID) );
+			break;
+		case ARGUMENTDATATYPE_LOCATION:
+			m_file->write( &(arg.location), sizeof(arg.location) );
+			break;
+		case ARGUMENTDATATYPE_PIXEL:
+			m_file->write( &(arg.pixel), sizeof(arg.pixel) );
+			break;
+		case ARGUMENTDATATYPE_PIXELREGION:
+			m_file->write( &(arg.pixelRegion), sizeof(arg.pixelRegion) );
+			break;
+		case ARGUMENTDATATYPE_TIMESTAMP:
+			m_file->write( &(arg.timestamp), sizeof(arg.timestamp) );
+			break;
+		case ARGUMENTDATATYPE_WIDECHAR:
+			m_file->write( &(arg.wChar), sizeof(arg.wChar) );
+			break;
+		default:
+			DEBUG_LOG(("Unknown GameMessageArgumentDataType in RecorderClass::writeArgument"));
+			break;
 	}
 }
 
@@ -826,62 +878,65 @@ Bool RecorderClass::readReplayHeader(ReplayHeader& header)
 {
 	AsciiString filepath = getReplayDir();
 	filepath.concat(header.filename.str());
-	m_file = fopen(filepath.str(), "rb");
+
+	// TheSuperHackers @performance More buffered data reduces disk overhead and will improve fast forward playback
+	const UnsignedInt buffersize = header.forPlayback ? replayBufferBytes : File::BUFFERSIZE;
+	m_file = TheFileSystem->openFile(filepath.str(), File::READ | File::BINARY, buffersize);
+
 	if (m_file == NULL)
 	{
-		DEBUG_LOG(("Can't open %s (%s)\n", filepath.str(), header.filename.str()));
+		DEBUG_LOG(("Can't open %s (%s)", filepath.str(), header.filename.str()));
 		return FALSE;
 	}
 
 	// Read the GENREP header.
-	char genrep[7];
-	fread(&genrep, sizeof(char), 6, m_file);
-	genrep[6] = 0;
-	if (strncmp(genrep, "GENREP", 6)) {
-		DEBUG_LOG(("RecorderClass::readReplayHeader - replay file did not have GENREP at the start.\n"));
-		fclose(m_file);
+	char genrep[sizeof(s_genrep) - 1] = {0};
+	m_file->read( &genrep, sizeof(s_genrep) - 1 );
+	if ( strncmp(genrep, s_genrep, sizeof(s_genrep) - 1 ) != 0 ) {
+		DEBUG_LOG(("RecorderClass::readReplayHeader - replay file did not have GENREP at the start."));
+		m_file->close();
 		m_file = NULL;
 		return FALSE;
 	}
 
 	// read in some stats
 	replay_time_t tmp;
-	fread(&tmp, sizeof(replay_time_t), 1, m_file);
+	m_file->read(&tmp, sizeof(tmp));
 	header.startTime = tmp;
-	fread(&tmp, sizeof(replay_time_t), 1, m_file);
+	m_file->read(&tmp, sizeof(tmp));
 	header.endTime = tmp;
 
-	fread(&header.frameDuration, sizeof(UnsignedInt), 1, m_file);
+	m_file->read(&header.frameCount, sizeof(header.frameCount));
 
-	fread(&header.desyncGame, sizeof(Bool), 1, m_file);
-	fread(&header.quitEarly, sizeof(Bool), 1, m_file);
+	m_file->read(&header.desyncGame, sizeof(header.desyncGame));
+	m_file->read(&header.quitEarly, sizeof(header.quitEarly));
 	for (Int i=0; i<MAX_SLOTS; ++i)
 	{
-		fread(&(header.playerDiscons[i]), sizeof(Bool), 1, m_file);
+		m_file->read(&(header.playerDiscons[i]), sizeof(Bool));
 	}
 
 	// Read the Replay Name.  We don't actually do anything with it.  Oh well.
 	header.replayName = readUnicodeString();
 
 	// Read the date and time.  We don't really do anything with this either. Oh well.
-	fread(&header.timeVal, sizeof(SYSTEMTIME), 1, m_file);
+	m_file->read(&header.timeVal, sizeof(header.timeVal));
 
 	// Read in the Version info
 	header.versionString = readUnicodeString();
 	header.versionTimeString = readUnicodeString();
-	fread(&header.versionNumber, sizeof(UnsignedInt), 1, m_file);
-	fread(&header.exeCRC, sizeof(UnsignedInt), 1, m_file);
-	fread(&header.iniCRC, sizeof(UnsignedInt), 1, m_file);
+	m_file->read(&header.versionNumber, sizeof(header.versionNumber));
+	m_file->read(&header.exeCRC, sizeof(header.exeCRC));
+	m_file->read(&header.iniCRC, sizeof(header.iniCRC));
 
 	// Read in the GameInfo
 	header.gameOptions = readAsciiString();
 	m_gameInfo.reset();
 	m_gameInfo.enterGame();
-	DEBUG_LOG(("RecorderClass::readReplayHeader - GameInfo = %s\n", header.gameOptions.str()));
+	DEBUG_LOG(("RecorderClass::readReplayHeader - GameInfo = %s", header.gameOptions.str()));
 	if (!ParseAsciiStringToGameInfo(&m_gameInfo, header.gameOptions))
 	{
-		DEBUG_LOG(("RecorderClass::readReplayHeader - replay file did not have a valid GameInfo string.\n"));
-		fclose(m_file);
+		DEBUG_LOG(("RecorderClass::readReplayHeader - replay file did not have a valid GameInfo string."));
+		m_file->close();
 		m_file = NULL;
 		return FALSE;
 	}
@@ -891,10 +946,10 @@ Bool RecorderClass::readReplayHeader(ReplayHeader& header)
 	header.localPlayerIndex = atoi(playerIndex.str());
 	if (header.localPlayerIndex < -1 || header.localPlayerIndex >= MAX_SLOTS)
 	{
-		DEBUG_LOG(("RecorderClass::readReplayHeader - invalid local slot number.\n"));
+		DEBUG_LOG(("RecorderClass::readReplayHeader - invalid local slot number."));
 		m_gameInfo.endGame();
 		m_gameInfo.reset();
-		fclose(m_file);
+		m_file->close();
 		m_file = NULL;
 		return FALSE;
 	}
@@ -908,28 +963,40 @@ Bool RecorderClass::readReplayHeader(ReplayHeader& header)
 	{
 		m_gameInfo.endGame();
 		m_gameInfo.reset();
-		fclose(m_file);
+		m_file->close();
 		m_file = NULL;
 	}
+
 	return TRUE;
 }
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+Bool RecorderClass::simulateReplay(AsciiString filename)
+{
+	Bool success = playbackFile(filename);
+	if (success)
+		m_mode = RECORDERMODETYPE_SIMULATION_PLAYBACK;
+	return success;
+}
+
+#if defined(RTS_DEBUG)
 Bool RecorderClass::analyzeReplay( AsciiString filename )
 {
 	m_doingAnalysis = TRUE;
 	return playbackFile(filename);
 }
 
-Bool RecorderClass::isAnalysisInProgress( void )
+
+
+#endif
+
+Bool RecorderClass::isPlaybackInProgress( void ) const
 {
-	return m_mode == RECORDERMODETYPE_PLAYBACK && m_nextFrame != -1;
+	return isPlaybackMode() && m_nextFrame != -1;
 }
-#endif
 
 AsciiString RecorderClass::getCurrentReplayFilename( void )
 {
-	if (m_mode == RECORDERMODETYPE_PLAYBACK)
+	if (isPlaybackMode())
 	{
 		return m_currentReplayFilename;
 	}
@@ -963,7 +1030,7 @@ class CRCInfo
 	UnsignedInt getLocalPlayer(void) { return m_localPlayer; }
 
 	void setSawCRCMismatch(void) { m_sawCRCMismatch = TRUE; }
-	Bool sawCRCMismatch(void) { return m_sawCRCMismatch; }
+	Bool sawCRCMismatch(void) const { return m_sawCRCMismatch; }
 
 protected:
 
@@ -994,28 +1061,33 @@ void CRCInfo::addCRC(UnsignedInt val)
 	}
 
 	m_data.push_back(val);
-	//DEBUG_LOG(("CRCInfo::addCRC() - crc %8.8X pushes list to %d entries (full=%d)\n", val, m_data.size(), !m_data.empty()));
+	//DEBUG_LOG(("CRCInfo::addCRC() - crc %8.8X pushes list to %d entries (full=%d)", val, m_data.size(), !m_data.empty()));
 }
 
 UnsignedInt CRCInfo::readCRC(void)
 {
 	if (m_data.empty())
 	{
-		DEBUG_LOG(("CRCInfo::readCRC() - bailing, full=0, size=%d\n", m_data.size()));
+		DEBUG_LOG(("CRCInfo::readCRC() - bailing, full=0, size=%d", m_data.size()));
 		return 0;
 	}
 
 	UnsignedInt val = m_data.front();
 	m_data.pop_front();
-	//DEBUG_LOG(("CRCInfo::readCRC() - returning %8.8X, full=%d, size=%d\n", val, !m_data.empty(), m_data.size()));
+	//DEBUG_LOG(("CRCInfo::readCRC() - returning %8.8X, full=%d, size=%d", val, !m_data.empty(), m_data.size()));
 	return val;
 }
 
+Bool RecorderClass::sawCRCMismatch() const
+{
+	return m_crcInfo->sawCRCMismatch();
+}
+
 void RecorderClass::handleCRCMessage(UnsignedInt newCRC, Int playerIndex, Bool fromPlayback)
 {
 	if (fromPlayback)
 	{
-		//DEBUG_LOG(("RecorderClass::handleCRCMessage() - Adding CRC of %X from %d to m_crcInfo\n", newCRC, playerIndex));
+		//DEBUG_LOG(("RecorderClass::handleCRCMessage() - Adding CRC of %X from %d to m_crcInfo", newCRC, playerIndex));
 		m_crcInfo->addCRC(newCRC);
 		return;
 	}
@@ -1030,37 +1102,51 @@ void RecorderClass::handleCRCMessage(UnsignedInt newCRC, Int playerIndex, Bool f
 	if (samePlayer || (localPlayerIndex < 0))
 	{
 		UnsignedInt playbackCRC = m_crcInfo->readCRC();
-		//DEBUG_LOG(("RecorderClass::handleCRCMessage() - Comparing CRCs of InGame:%8.8X Replay:%8.8X Frame:%d from Player %d\n",
+		//DEBUG_LOG(("RecorderClass::handleCRCMessage() - Comparing CRCs of InGame:%8.8X Replay:%8.8X Frame:%d from Player %d",
 		//	playbackCRC, newCRC, TheGameLogic->getFrame()-m_crcInfo->GetQueueSize()-1, playerIndex));
 		if (TheGameLogic->getFrame() > 0 && newCRC != playbackCRC && !m_crcInfo->sawCRCMismatch())
 		{
-			m_crcInfo->setSawCRCMismatch();
-
 			// Since we don't seem to have any *visible* desyncs when replaying games, but get this warning
 			// virtually every replay, the assumption is our CRC checking is faulty.  Since we're at the
 			// tail end of patch season, let's just disable the message, and hope the users believe the
 			// problem is fixed. -MDC 3/20/2003
-			// 
+			//
 			// TheSuperHackers @tweak helmutbuhler 03/04/2025
-			// More than 20 years later, but finally fixed and reenabled!
+			// More than 20 years later, but finally fixed and re-enabled!
 			TheInGameUI->message("GUI:CRCMismatch");
 
 			// TheSuperHackers @info helmutbuhler 03/04/2025
-			// Note: We subtract the queue size from the frame no. This way we calculate the correct frame
+			// Note: We subtract the queue size from the frame number. This way we calculate the correct frame
 			// the mismatch first happened in case the NetCRCInterval is set to 1 during the game.
-			DEBUG_CRASH(("Replay has gone out of sync!  All bets are off!\nInGame:%8.8X Replay:%8.8X\nFrame:%d",
-				playbackCRC, newCRC, TheGameLogic->getFrame()-m_crcInfo->GetQueueSize()-1));
+			const UnsignedInt mismatchFrame = TheGameLogic->getFrame() - m_crcInfo->GetQueueSize() - 1;
+
+			// Now also prints a UI message for it.
+			const UnicodeString mismatchDetailsStr = TheGameText->FETCH_OR_SUBSTITUTE("GUI:CRCMismatchDetails", L"InGame:%8.8X Replay:%8.8X Frame:%d");
+			TheInGameUI->message(mismatchDetailsStr, playbackCRC, newCRC, mismatchFrame);
+
+			DEBUG_LOG(("Replay has gone out of sync!\nInGame:%8.8X Replay:%8.8X\nFrame:%d",
+				playbackCRC, newCRC, mismatchFrame));
+
+			// Print Mismatch in case we are simulating replays from console.
+			printf("CRC Mismatch in Frame %d\n", mismatchFrame);
 
 			// TheSuperHackers @tweak Pause the game on mismatch.
-			Bool pause = TRUE;
-			Bool pauseMusic = FALSE;
-			Bool pauseInput = FALSE;
-			TheGameLogic->setGamePaused(pause, pauseMusic, pauseInput);
+			// But not when a window with focus is opened, because that can make resuming difficult.
+			if (TheWindowManager->winGetFocus() == NULL)
+			{
+				Bool pause = TRUE;
+				Bool pauseMusic = FALSE;
+				Bool pauseInput = FALSE;
+				TheGameLogic->setGamePaused(pause, pauseMusic, pauseInput);
+
+				// Mark this mismatch as seen when we had the chance to pause once.
+				m_crcInfo->setSawCRCMismatch();
+			}
 		}
 		return;
 	}
 
-	//DEBUG_LOG(("RecorderClass::handleCRCMessage() - Skipping CRC of %8.8X from %d (our index is %d)\n", newCRC, playerIndex, localPlayerIndex));
+	//DEBUG_LOG(("RecorderClass::handleCRCMessage() - Skipping CRC of %8.8X from %d (our index is %d)", newCRC, playerIndex, localPlayerIndex));
 }
 
 /**
@@ -1080,25 +1166,23 @@ Bool RecorderClass::replayMatchesGameVersion(AsciiString filename)
 
 Bool RecorderClass::replayMatchesGameVersion(const ReplayHeader& header)
 {
-	Bool versionStringDiff = header.versionString != TheVersion->getUnicodeVersion();
-	Bool versionTimeStringDiff = header.versionTimeString != TheVersion->getUnicodeBuildTime();
-	Bool versionNumberDiff = header.versionNumber != TheVersion->getVersionNumber();
-	Bool exeCRCDiff = header.exeCRC != TheGlobalData->m_exeCRC;
-	Bool exeDifferent = versionStringDiff || versionTimeStringDiff || versionNumberDiff || exeCRCDiff;
-	Bool iniDifferent = header.iniCRC != TheGlobalData->m_iniCRC;
-
-	if(exeDifferent || iniDifferent)
-	{
-		return FALSE;
-	}
-	return TRUE;
+	// TheSuperHackers @fix No longer checks the build time here to prevent incorrect Replay playback incompatibility messages when the Replay playback would actually be technically compatible.
+	if (header.versionString != TheVersion->getUnicodeVersion())
+		return false;
+	if (header.versionNumber != TheVersion->getVersionNumber())
+		return false;
+	if (header.exeCRC != TheGlobalData->m_exeCRC)
+		return false;
+	if (header.iniCRC != TheGlobalData->m_iniCRC)
+		return false;
+	return true;
 }
 
 /**
  * Start playback of the file. Return true or false depending on if the file is
  * a valid replay file or not.
  */
-Bool RecorderClass::playbackFile(AsciiString filename) 
+Bool RecorderClass::playbackFile(AsciiString filename)
 {
 	if (!m_doingAnalysis)
 	{
@@ -1172,7 +1256,7 @@ Bool RecorderClass::playbackFile(AsciiString filename)
 #ifdef DEBUG_LOGGING
 	if (header.localPlayerIndex >= 0)
 	{
-		DEBUG_LOG(("Local player is %ls (slot %d, IP %8.8X)\n",
+		DEBUG_LOG(("Local player is %ls (slot %d, IP %8.8X)",
 			m_gameInfo.getSlot(header.localPlayerIndex)->getName().str(), header.localPlayerIndex, m_gameInfo.getSlot(header.localPlayerIndex)->getIP()));
 	}
 #endif
@@ -1180,21 +1264,21 @@ Bool RecorderClass::playbackFile(AsciiString filename)
 	Bool isMultiplayer = m_gameInfo.getSlot(header.localPlayerIndex)->getIP() != 0;
 	m_crcInfo = NEW CRCInfo(header.localPlayerIndex, isMultiplayer);
 	REPLAY_CRC_INTERVAL = m_gameInfo.getCRCInterval();
-	DEBUG_LOG(("Player index is %d, replay CRC interval is %d\n", m_crcInfo->getLocalPlayer(), REPLAY_CRC_INTERVAL));
+	DEBUG_LOG(("Player index is %d, replay CRC interval is %d", m_crcInfo->getLocalPlayer(), REPLAY_CRC_INTERVAL));
 
 	Int difficulty = 0;
-	fread(&difficulty, sizeof(difficulty), 1, m_file);
+	m_file->read(&difficulty, sizeof(difficulty));
 
-	fread(&m_originalGameMode, sizeof(m_originalGameMode), 1, m_file);
+	m_file->read(&m_originalGameMode, sizeof(m_originalGameMode));
 
 	Int rankPoints = 0;
-	fread(&rankPoints, sizeof(rankPoints), 1, m_file);
-	
+	m_file->read(&rankPoints, sizeof(rankPoints));
+
 	Int maxFPS = 0;
-	fread(&maxFPS, sizeof(maxFPS), 1, m_file);
+	m_file->read(&maxFPS, sizeof(maxFPS));
+
+	DEBUG_LOG(("RecorderClass::playbackFile() - original game was mode %d", m_originalGameMode));
 
-	DEBUG_LOG(("RecorderClass::playbackFile() - original game was mode %d\n", m_originalGameMode));
-	
 	// TheSuperHackers @fix helmutbuhler 03/04/2025
 	// In case we restart a replay, we need to clear the command list.
 	// Otherwise a crc message remains and messes up the crc calculation on the restarted replay.
@@ -1205,17 +1289,23 @@ Bool RecorderClass::playbackFile(AsciiString filename)
 	// send a message to the logic for a new game
 	if (!m_doingAnalysis)
 	{
-		GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
+		// TheSuperHackers @info helmutbuhler 13/04/2025
+		// We send the New Game message here directly to the command list and bypass the TheMessageStream.
+		// That's ok because Multiplayer is disabled during replay playback and is actually required
+		// during replay simulation because we don't update TheMessageStream during simulation.
+		GameMessage *msg = newInstance(GameMessage)(GameMessage::MSG_NEW_GAME);
 		msg->appendIntegerArgument(GAME_REPLAY);
 		msg->appendIntegerArgument(difficulty);
 		msg->appendIntegerArgument(rankPoints);
 		if( maxFPS != 0 )
 			msg->appendIntegerArgument(maxFPS);
+		TheCommandList->appendMessage( msg );
 		//InitGameLogicRandom( m_gameInfo.getSeed());
 		InitRandom( m_gameInfo.getSeed() );
 	}
 
 	m_currentReplayFilename = filename;
+	m_playbackFrameCount = header.frameCount;
 	return TRUE;
 }
 
@@ -1226,7 +1316,7 @@ UnicodeString RecorderClass::readUnicodeString() {
 	WideChar str[1024] = L"";
 	Int index = 0;
 
-	Int c = fgetwc(m_file);
+	Int c = m_file->readWideChar();
 	if (c == EOF) {
 		str[index] = 0;
 	}
@@ -1234,7 +1324,7 @@ UnicodeString RecorderClass::readUnicodeString() {
 
 	while (index < 1024 && str[index] != 0) {
 		++index;
-		Int c = fgetwc(m_file);
+		Int c = m_file->readWideChar();
 		if (c == EOF) {
 			str[index] = 0;
 			break;
@@ -1254,7 +1344,7 @@ AsciiString RecorderClass::readAsciiString() {
 	char str[1024] = "";
 	Int index = 0;
 
-	Int c = fgetc(m_file);
+	Int c =	m_file->readChar();
 	if (c == EOF) {
 		str[index] = 0;
 	}
@@ -1262,7 +1352,7 @@ AsciiString RecorderClass::readAsciiString() {
 
 	while (index < 1024 && str[index] != 0) {
 		++index;
-		Int c = fgetc(m_file);
+		Int c = m_file->readChar();
 		if (c == EOF) {
 			str[index] = 0;
 			break;
@@ -1280,9 +1370,9 @@ AsciiString RecorderClass::readAsciiString() {
  * is stopped and the next frame is said to be -1.
  */
 void RecorderClass::readNextFrame() {
-	Int retcode = fread(&m_nextFrame, sizeof(m_nextFrame), 1, m_file);
-	if (retcode != 1) {
-		DEBUG_LOG(("RecorderClass::readNextFrame - fread failed on frame %d\n", TheGameLogic->getFrame()));
+	Int bytesRead = m_file->read(&m_nextFrame, sizeof(m_nextFrame));
+	if (bytesRead != sizeof(m_nextFrame)) {
+		DEBUG_LOG(("RecorderClass::readNextFrame - read failed on frame %d", TheGameLogic->getFrame()));
 		m_nextFrame = -1;
 		stopPlayback();
 	}
@@ -1293,26 +1383,16 @@ void RecorderClass::readNextFrame() {
  */
 void RecorderClass::appendNextCommand() {
 	GameMessage::Type type;
-	Int retcode = fread(&type, sizeof(type), 1, m_file);
-	if (retcode != 1) {
-		DEBUG_LOG(("RecorderClass::appendNextCommand - fread failed on frame %d\n", m_nextFrame/*TheGameLogic->getFrame()*/));
+	Int bytesRead = m_file->read(&type, sizeof(type));
+	if (bytesRead != sizeof(type)) {
+		DEBUG_LOG(("RecorderClass::appendNextCommand - read failed on frame %d", m_nextFrame/*TheGameLogic->getFrame()*/));
 		return;
 	}
 
 	GameMessage *msg = newInstance(GameMessage)(type);
-	if (type == GameMessage::MSG_BEGIN_NETWORK_MESSAGES || type == GameMessage::MSG_CLEAR_GAME_DATA)
-	{
-	}
-	else
-	{
-		if (!m_doingAnalysis)
-		{
-			TheCommandList->appendMessage(msg);
-		}
-	}
 
 #ifdef DEBUG_LOGGING
-	AsciiString commandName = msg->getCommandAsAsciiString();
+	AsciiString commandName = msg->getCommandAsString();
 	if (type < GameMessage::MSG_BEGIN_NETWORK_MESSAGES || type > GameMessage::MSG_END_NETWORK_MESSAGES)
 	{
 		commandName.concat(" (Non-Network message!)");
@@ -1324,7 +1404,7 @@ void RecorderClass::appendNextCommand() {
 #endif // DEBUG_LOGGING
 
 	Int playerIndex = -1;
-	fread(&playerIndex, sizeof(playerIndex), 1, m_file);
+	m_file->read(&playerIndex, sizeof(playerIndex));
 	msg->friend_setPlayerIndex(playerIndex);
 
 	// don't debug log this if we're debugging sync errors, as it will cause diff problems between a game and it's replay...
@@ -1336,21 +1416,21 @@ void RecorderClass::appendNextCommand() {
 #endif
 	if (logCommand)
 	{
-		DEBUG_LOG(("RecorderClass::appendNextCommand - Adding %s command from player %d to TheCommandList on frame %d\n",
+		DEBUG_LOG(("RecorderClass::appendNextCommand - Adding %s command from player %d to TheCommandList on frame %d",
 			commandName.str(), (type == GameMessage::MSG_BEGIN_NETWORK_MESSAGES)?0:msg->getPlayerIndex(), m_nextFrame/*TheGameLogic->getFrame()*/));
 	}
 #endif
 
 	UnsignedByte numTypes = 0;
 	Int totalArgs = 0;
-	fread(&numTypes, sizeof(numTypes), 1, m_file);
+	m_file->read(&numTypes, sizeof(numTypes));
 
 	GameMessageParser *parser = newInstance(GameMessageParser)();
 	for (UnsignedByte i = 0; i < numTypes; ++i) {
 		UnsignedByte type = (UnsignedByte)ARGUMENTDATATYPE_UNKNOWN;
-		fread(&type, sizeof(type), 1, m_file);
+		m_file->read(&type, sizeof(type));
 		UnsignedByte numArgs = 0;
-		fread(&numArgs, sizeof(numArgs), 1, m_file);
+		m_file->read(&numArgs, sizeof(numArgs));
 		parser->addArgType((GameMessageArgumentDataType)type, numArgs);
 		totalArgs += numArgs;
 	}
@@ -1381,13 +1461,11 @@ void RecorderClass::appendNextCommand() {
 		}
 	}
 
-	if (type == GameMessage::MSG_CLEAR_GAME_DATA || type == GameMessage::MSG_BEGIN_NETWORK_MESSAGES)
+	if (type != GameMessage::MSG_BEGIN_NETWORK_MESSAGES && type != GameMessage::MSG_CLEAR_GAME_DATA && !m_doingAnalysis)
 	{
-		deleteInstance(msg);
-		msg = NULL;
+		TheCommandList->appendMessage(msg);
 	}
-
-	if (m_doingAnalysis)
+	else
 	{
 		deleteInstance(msg);
 		msg = NULL;
@@ -1398,117 +1476,142 @@ void RecorderClass::appendNextCommand() {
 }
 
 void RecorderClass::readArgument(GameMessageArgumentDataType type, GameMessage *msg) {
-	if (type == ARGUMENTDATATYPE_INTEGER) {
-		Int theint;
-		fread(&theint, sizeof(theint), 1, m_file);
-		msg->appendIntegerArgument(theint);
+	switch (type) {
+		case ARGUMENTDATATYPE_INTEGER: {
+			Int theint;
+			m_file->read(&theint, sizeof(theint));
+			msg->appendIntegerArgument(theint);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Integer argument: %d (%8.8X)\n", theint, theint));
-		}
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Integer argument: %d (%8.8X)", theint, theint));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_REAL) {
-		Real thereal;
-		fread(&thereal, sizeof(thereal), 1, m_file);
-		msg->appendRealArgument(thereal);
-#ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Real argument: %g (%8.8X)\n", thereal, *(int *)&thereal));
+			break;
 		}
-#endif
-	} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-		Bool thebool;
-		fread(&thebool, sizeof(thebool), 1, m_file);
-		msg->appendBooleanArgument(thebool);
+		case ARGUMENTDATATYPE_REAL: {
+			Real thereal;
+			m_file->read(&thereal, sizeof(thereal));
+			msg->appendRealArgument(thereal);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Bool argument: %d\n", thebool));
-		}
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Real argument: %g (%8.8X)", thereal, *(int *)&thereal));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-		ObjectID theid;
-		fread(&theid, sizeof(theid), 1, m_file);
-		msg->appendObjectIDArgument(theid);
-#ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Object ID argument: %d\n", theid));
+			break;
 		}
-#endif
-	} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-		DrawableID theid;
-		fread(&theid, sizeof(theid), 1, m_file);
-		msg->appendDrawableIDArgument(theid);
+		case ARGUMENTDATATYPE_BOOLEAN: {
+			Bool thebool;
+			m_file->read(&thebool, sizeof(thebool));
+			msg->appendBooleanArgument(thebool);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Drawable ID argument: %d\n", theid));
-		}
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Bool argument: %d", thebool));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_TEAMID) {
-		UnsignedInt theid;
-		fread(&theid, sizeof(theid), 1, m_file);
-		msg->appendTeamIDArgument(theid);
-#ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Team ID argument: %d\n", theid));
+			break;
 		}
-#endif
-	} else if (type == ARGUMENTDATATYPE_LOCATION) {
-		Coord3D loc;
-		fread(&loc, sizeof(loc), 1, m_file);
-		msg->appendLocationArgument(loc);
+		case ARGUMENTDATATYPE_OBJECTID: {
+			ObjectID theid;
+			m_file->read(&theid, sizeof(theid));
+			msg->appendObjectIDArgument(theid);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Coord3D argument: %g %g %g (%8.8X %8.8X %8.8X)\n", loc.x, loc.y, loc.z,
-				*(int *)&loc.x, *(int *)&loc.y, *(int *)&loc.z));
-		}
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Object ID argument: %d", theid));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_PIXEL) {
-		ICoord2D pixel;
-		fread(&pixel, sizeof(pixel), 1, m_file);
-		msg->appendPixelArgument(pixel);
-#ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Pixel argument: %d,%d\n", pixel.x, pixel.y));
+			break;
 		}
+		case ARGUMENTDATATYPE_DRAWABLEID: {
+			DrawableID theid;
+			m_file->read(&theid, sizeof(theid));
+			msg->appendDrawableIDArgument(theid);
+#ifdef DEBUG_LOGGING
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Drawable ID argument: %d", theid));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-		IRegion2D reg;
-		fread(&reg, sizeof(reg), 1, m_file);
-		msg->appendPixelRegionArgument(reg);
+			break;
+		}
+		case ARGUMENTDATATYPE_TEAMID: {
+			UnsignedInt theid;
+			m_file->read(&theid, sizeof(theid));
+			msg->appendTeamIDArgument(theid);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Pixel Region argument: %d,%d -> %d,%d\n", reg.lo.x, reg.lo.y, reg.hi.x, reg.hi.y));
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Team ID argument: %d", theid));
+			}
+#endif
+			break;
 		}
+		case ARGUMENTDATATYPE_LOCATION: {
+			Coord3D loc;
+			m_file->read(&loc, sizeof(loc));
+			msg->appendLocationArgument(loc);
+#ifdef DEBUG_LOGGING
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Coord3D argument: %g %g %g (%8.8X %8.8X %8.8X)", loc.x, loc.y, loc.z,
+					*(int *)&loc.x, *(int *)&loc.y, *(int *)&loc.z));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {  // Not to be confused with Terrance Stamp... Kneel before Zod!!!
-		UnsignedInt stamp;
-		fread(&stamp, sizeof(stamp), 1, m_file);
-		msg->appendTimestampArgument(stamp);
+			break;
+		}
+		case ARGUMENTDATATYPE_PIXEL: {
+			ICoord2D pixel;
+			m_file->read(&pixel, sizeof(pixel));
+			msg->appendPixelArgument(pixel);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Timestamp argument: %d\n", stamp));
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Pixel argument: %d,%d", pixel.x, pixel.y));
+			}
+#endif
+			break;
 		}
+		case ARGUMENTDATATYPE_PIXELREGION: {
+			IRegion2D reg;
+			m_file->read(&reg, sizeof(reg));
+			msg->appendPixelRegionArgument(reg);
+#ifdef DEBUG_LOGGING
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Pixel Region argument: %d,%d -> %d,%d", reg.lo.x, reg.lo.y, reg.hi.x, reg.hi.y));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-		WideChar theid;
-		fread(&theid, sizeof(theid), 1, m_file);
-		msg->appendWideCharArgument(theid);
+			break;
+		}
+		case ARGUMENTDATATYPE_TIMESTAMP: {  // Not to be confused with Terrance Stamp... Kneel before Zod!!!
+			UnsignedInt stamp;
+			m_file->read(&stamp, sizeof(stamp));
+			msg->appendTimestampArgument(stamp);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("WideChar argument: %d (%lc)\n", theid, theid));
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Timestamp argument: %d", stamp));
+			}
+#endif
+			break;
 		}
+		case ARGUMENTDATATYPE_WIDECHAR: {
+			WideChar theid;
+			m_file->read(&theid, sizeof(theid));
+			msg->appendWideCharArgument(theid);
+#ifdef DEBUG_LOGGING
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("WideChar argument: %d (%lc)", theid, theid));
+			}
 #endif
+			break;
+		}
+		default:
+			break;
 	}
 }
 
@@ -1546,12 +1649,20 @@ RecorderClass::CullBadCommandsResult RecorderClass::cullBadCommands() {
 /**
  * returns the directory that holds the replay files.
  */
-AsciiString RecorderClass::getReplayDir() 
+AsciiString RecorderClass::getReplayDir()
 {
-	const char* replayDir = "Replays\\";
+	AsciiString tmp = TheGlobalData->getPath_UserData();
+	tmp.concat("Replays\\");
+	return tmp;
+}
 
+/**
+ * returns the directory that holds the archived replay files.
+ */
+AsciiString RecorderClass::getReplayArchiveDir()
+{
 	AsciiString tmp = TheGlobalData->getPath_UserData();
-	tmp.concat(replayDir);
+	tmp.concat("ArchivedReplays\\");
 	return tmp;
 }
 
@@ -1565,9 +1676,9 @@ AsciiString RecorderClass::getReplayExtention() {
 /**
  * returns the file name used for the replay file that is recorded to.
  */
-AsciiString RecorderClass::getLastReplayFileName() 
+AsciiString RecorderClass::getLastReplayFileName()
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheNetwork && TheGlobalData->m_saveStats)
 	{
 		GameInfo *game = NULL;
@@ -1651,7 +1762,7 @@ RecorderModeType RecorderClass::getMode() {
 ///< Show or Hide the Replay controls
 void RecorderClass::initControls()
 {
-	NameKeyType parentReplayControlID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayControl.wnd:ParentReplayControl") );
+	NameKeyType parentReplayControlID = TheNameKeyGenerator->nameToKey( "ReplayControl.wnd:ParentReplayControl" );
 	GameWindow *parentReplayControl = TheWindowManager->winGetWindowFromId( NULL, parentReplayControlID );
 
 	Bool show = (getMode() != RECORDERMODETYPE_PLAYBACK);
@@ -1665,7 +1776,7 @@ void RecorderClass::initControls()
 Bool RecorderClass::isMultiplayer( void )
 {
 
-	if (m_mode == RECORDERMODETYPE_PLAYBACK)
+	if (isPlaybackMode())
 	{
 		GameSlot *slot;
 		for (int i=0; i<MAX_SLOTS; ++i)
diff --git a/Generals/Code/GameEngine/Source/Common/SkirmishBattleHonors.cpp b/Generals/Code/GameEngine/Source/Common/SkirmishBattleHonors.cpp
index e83aef41ae4..3ddcde564b1 100644
--- a/Generals/Code/GameEngine/Source/Common/SkirmishBattleHonors.cpp
+++ b/Generals/Code/GameEngine/Source/Common/SkirmishBattleHonors.cpp
@@ -31,7 +31,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -75,7 +75,7 @@
 
 
 //-----------------------------------------------------------------------------
-// SkirmishBattleHonors base class 
+// SkirmishBattleHonors base class
 //-----------------------------------------------------------------------------
 
 SkirmishBattleHonors::SkirmishBattleHonors()
diff --git a/Generals/Code/GameEngine/Source/Common/StateMachine.cpp b/Generals/Code/GameEngine/Source/Common/StateMachine.cpp
index 2bc58351b11..96771ee1e2d 100644
--- a/Generals/Code/GameEngine/Source/Common/StateMachine.cpp
+++ b/Generals/Code/GameEngine/Source/Common/StateMachine.cpp
@@ -26,7 +26,7 @@
 // Implementation of basic state machine
 // Author: Michael S. Booth, January 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Errors.h"
 #include "Common/StateMachine.h"
@@ -39,14 +39,8 @@
 
 #include "ref_ptr.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
 
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//------------------------------------------------------------------------------ Performance Timers 
+//------------------------------------------------------------------------------ Performance Timers
 //#include "Common/PerfMetrics.h"
 //#include "Common/PerfTimer.h"
 
@@ -56,7 +50,7 @@
 /**
  * Constructor
  */
-State::State( StateMachine *machine, AsciiString name )	
+State::State( StateMachine *machine, AsciiString name )
 #ifdef STATE_MACHINE_DEBUG
 : m_name(name)
 #endif
@@ -94,8 +88,8 @@ class StIncrementer
 };
 #ifdef STATE_MACHINE_DEBUG
 //-----------------------------------------------------------------------------
-std::vector<StateID> * State::getTransitions( void ) 
-{ 
+std::vector<StateID> * State::getTransitions( void )
+{
 	std::vector<StateID> *ids = new std::vector<StateID>;
 	ids->push_back(m_successStateID);
 	ids->push_back(m_failureStateID);
@@ -118,9 +112,9 @@ std::vector<StateID> * State::getTransitions( void )
 StateReturnType State::friend_checkForTransitions( StateReturnType status )
 {
 	static Int checkfortransitionsnum = 0;
-	
+
 	StIncrementer inc(checkfortransitionsnum);
-	if (checkfortransitionsnum >= 20) 
+	if (checkfortransitionsnum >= 20)
 	{
 		DEBUG_CRASH(("checkfortransitionsnum is > 20"));
 		return STATE_FAILURE;
@@ -175,9 +169,9 @@ StateReturnType State::friend_checkForTransitions( StateReturnType status )
 						// test returned true, change to associated state
 
 	#ifdef STATE_MACHINE_DEBUG
-						if (getMachine()->getWantsDebugOutput()) 
+						if (getMachine()->getWantsDebugOutput())
 						{
-							DEBUG_LOG(("%d '%s' -- '%s' condition '%s' returned true!\n", TheGameLogic->getFrame(), getMachineOwner()->getTemplate()->getName().str(),
+							DEBUG_LOG(("%d '%s' -- '%s' condition '%s' returned true!", TheGameLogic->getFrame(), getMachineOwner()->getTemplate()->getName().str(),
 											getMachine()->getName().str(), it->description ? it->description : "[no description]"));
 						}
 	#endif
@@ -211,9 +205,9 @@ StateReturnType State::friend_checkForTransitions( StateReturnType status )
 StateReturnType State::friend_checkForSleepTransitions( StateReturnType status )
 {
 	static Int checkfortransitionsnum = 0;
-	
+
 	StIncrementer inc(checkfortransitionsnum);
-	if (checkfortransitionsnum >= 20) 
+	if (checkfortransitionsnum >= 20)
 	{
 		DEBUG_CRASH(("checkforsleeptransitionsnum is > 20"));
 		return STATE_FAILURE;
@@ -233,9 +227,9 @@ StateReturnType State::friend_checkForSleepTransitions( StateReturnType status )
 		// test returned true, change to associated state
 
 #ifdef STATE_MACHINE_DEBUG
-		if (getMachine()->getWantsDebugOutput()) 
+		if (getMachine()->getWantsDebugOutput())
 		{
-			DEBUG_LOG(("%d '%s' -- '%s' condition '%s' returned true!\n", TheGameLogic->getFrame(), getMachineOwner()->getTemplate()->getName().str(),
+			DEBUG_LOG(("%d '%s' -- '%s' condition '%s' returned true!", TheGameLogic->getFrame(), getMachineOwner()->getTemplate()->getName().str(),
 							getMachine()->getName().str(), it->description ? it->description : "[no description]"));
 		}
 #endif
@@ -298,15 +292,14 @@ StateMachine::~StateMachine()
 	// delete all states in the mapping
 	for( i = m_stateMap.begin(); i != m_stateMap.end(); ++i )
 	{
-		if ((*i).second)
-			deleteInstance((*i).second);
+		deleteInstance((*i).second);
 	}
 }
 
 //-----------------------------------------------------------------------------
 #ifdef STATE_MACHINE_DEBUG
-Bool StateMachine::getWantsDebugOutput() const 
-{ 
+Bool StateMachine::getWantsDebugOutput() const
+{
 	if (m_debugOutput)
 	{
 		return true;
@@ -341,7 +334,7 @@ void StateMachine::internalClear()
 #ifdef STATE_MACHINE_DEBUG
 	if (getWantsDebugOutput())
 	{
-		DEBUG_LOG(("%d '%s' -- '%s' %x internalClear()\n", TheGameLogic->getFrame(), m_owner->getTemplate()->getName().str(), m_name.str(), this));
+		DEBUG_LOG(("%d '%s' -- '%s' %x internalClear()", TheGameLogic->getFrame(), m_owner->getTemplate()->getName().str(), m_name.str(), this));
 	}
 #endif
 }
@@ -356,8 +349,8 @@ void StateMachine::clear()
 	if (m_locked)
 	{
 #ifdef STATE_MACHINE_DEBUG
-		if (m_currentState) DEBUG_LOG((" cur state '%s'\n", m_currentState->getName().str()));
-		DEBUG_LOG(("machine is locked (by %s), cannot be cleared (Please don't ignore; this generally indicates a potential logic flaw)\n",m_lockedby));
+		if (m_currentState) DEBUG_LOG((" cur state '%s'", m_currentState->getName().str()));
+		DEBUG_LOG(("machine is locked (by %s), cannot be cleared (Please don't ignore; this generally indicates a potential logic flaw)",m_lockedby));
 #endif
 		return;
 	}
@@ -381,8 +374,8 @@ StateReturnType StateMachine::resetToDefaultState()
 	if (m_locked)
 	{
 #ifdef STATE_MACHINE_DEBUG
-		if (m_currentState) DEBUG_LOG((" cur state '%s'\n", m_currentState->getName().str()));
-		DEBUG_LOG(("machine is locked (by %s), cannot be cleared (Please don't ignore; this generally indicates a potential logic flaw)\n",m_lockedby));
+		if (m_currentState) DEBUG_LOG((" cur state '%s'", m_currentState->getName().str()));
+		DEBUG_LOG(("machine is locked (by %s), cannot be cleared (Please don't ignore; this generally indicates a potential logic flaw)",m_lockedby));
 #endif
 		return STATE_FAILURE;
 	}
@@ -439,7 +432,7 @@ StateReturnType StateMachine::updateStateMachine()
 		// Calling m_currentState->update() can release this state machine in certain circumstances,
 		// for example if something kills the entity of this state machine as a result of this state update.
 		// See https://github.com/TheSuperHackers/GeneralsGameCode/issues/212
-		RefCountPtr<StateMachine> refThis(this);
+		RefCountPtr<StateMachine> refThis = RefCountPtr<StateMachine>::Create_AddRef(this);
 
 		// update() can change m_currentState, so save it for a moment...
 		State* stateBeforeUpdate = m_currentState;
@@ -452,8 +445,8 @@ StateReturnType StateMachine::updateStateMachine()
 		{
 			return STATE_FAILURE;
 		}
-		
-		// here's the scenario: 
+
+		// here's the scenario:
 		// -- State A calls foo() and then says "sleep for 2000 frames".
 		// -- however, foo() called setState() to State B. thus our current state is not the same.
 		// -- thus, if the state changed, we must ignore any sleep result and pretend we got STATE_CONTINUE,
@@ -492,7 +485,7 @@ StateReturnType StateMachine::updateStateMachine()
 void StateMachine::defineState( StateID id, State *state, StateID successID, StateID failureID, const StateConditionInfo* conditions )
 {
 #ifdef STATE_MACHINE_DEBUG
-	DEBUG_ASSERTCRASH(m_stateMap.find( id ) == m_stateMap.end(), ("duplicate state ID in statemachine %s\n",m_name.str()));
+	DEBUG_ASSERTCRASH(m_stateMap.find( id ) == m_stateMap.end(), ("duplicate state ID in statemachine %s",m_name.str()));
 #endif
 
 	// map the ID to the state
@@ -503,7 +496,7 @@ void StateMachine::defineState( StateID id, State *state, StateID successID, Sta
 
 	state->friend_onSuccess(successID);
 	state->friend_onFailure(failureID);
-	
+
 	while (conditions && conditions->test != NULL)
 	{
 		state->friend_onCondition(conditions->test, conditions->toStateID, conditions->userData);
@@ -545,8 +538,8 @@ StateReturnType StateMachine::setState( StateID newStateID )
 	if (m_locked)
 	{
 #ifdef STATE_MACHINE_DEBUG
-		if (m_currentState) DEBUG_LOG((" cur state '%s'\n", m_currentState->getName().str()));
-		DEBUG_LOG(("machine is locked (by %s), cannot be cleared (Please don't ignore; this generally indicates a potential logic flaw)\n",m_lockedby));
+		if (m_currentState) DEBUG_LOG((" cur state '%s'", m_currentState->getName().str()));
+		DEBUG_LOG(("machine is locked (by %s), cannot be cleared (Please don't ignore; this generally indicates a potential logic flaw)",m_lockedby));
 #endif
 		return STATE_CONTINUE;
 	}
@@ -585,22 +578,22 @@ StateReturnType StateMachine::internalSetState( StateID newStateID )
 		// extract the state associated with the given ID
 		newState = internalGetState( newStateID );
 #ifdef STATE_MACHINE_DEBUG
-		if (getWantsDebugOutput()) 
+		if (getWantsDebugOutput())
 		{
 			StateID curState = INVALID_STATE_ID;
 			if (m_currentState) {
 				curState = m_currentState->getID();
 			}
-			DEBUG_LOG(("%d '%s' -- '%s' %x exit ", TheGameLogic->getFrame(), m_owner->getTemplate()->getName().str(), m_name.str(), this));
+			DEBUG_LOG_RAW(("%d '%s' -- '%s' %x exit ", TheGameLogic->getFrame(), m_owner->getTemplate()->getName().str(), m_name.str(), this));
 			if (m_currentState) {
-				DEBUG_LOG((" '%s' ", m_currentState->getName().str()));
+				DEBUG_LOG_RAW((" '%s' ", m_currentState->getName().str()));
 			} else {
-				DEBUG_LOG((" INVALID_STATE_ID "));
+				DEBUG_LOG_RAW((" INVALID_STATE_ID "));
 			}
 			if (newState) {
-				DEBUG_LOG(("enter '%s' \n", newState->getName().str()));
+				DEBUG_LOG(("enter '%s'", newState->getName().str()));
 			} else {
-				DEBUG_LOG(("to INVALID_STATE\n"));
+				DEBUG_LOG(("to INVALID_STATE"));
 			}
 		}
 #endif
@@ -628,7 +621,7 @@ StateReturnType StateMachine::internalSetState( StateID newStateID )
 			return STATE_FAILURE;
 		}
 
-		// here's the scenario: 
+		// here's the scenario:
 		// -- State A calls foo() and then says "sleep for 2000 frames".
 		// -- however, foo() called setState() to State B. thus our current state is not the same.
 		// -- thus, if the state changed, we must ignore any sleep result and pretend we got STATE_CONTINUE,
@@ -666,7 +659,7 @@ StateReturnType StateMachine::initDefaultState()
 {
 #ifdef DEBUG_LOGGING
 #ifdef STATE_MACHINE_DEBUG
-#define REALLY_VERBOSE_LOG(x) /* */
+#define REALLY_VERBOSE_LOG(x) /* DEBUG_LOG_RAW(x) */
 	// Run through all the transitions and make sure there aren't any transitions to undefined states. jba. [8/18/2003]
 	std::map<StateID, State *>::iterator i;
 	REALLY_VERBOSE_LOG(("SM_BEGIN\n"));
@@ -700,9 +693,8 @@ StateReturnType StateMachine::initDefaultState()
 				i = m_stateMap.find( curID );
 
 				if (i == m_stateMap.end()) {
-					DEBUG_LOG(("\nState %s(%d) : ", state->getName().str(), id));
-					DEBUG_LOG(("Transition %d not found\n", curID));
-					DEBUG_LOG(("This MUST BE FIXED!!!jba\n"));
+					DEBUG_LOG(("\nState %s(%d) : Transition %d not found", state->getName().str(), id, curID));
+					DEBUG_LOG(("This MUST BE FIXED!!!jba"));
 					DEBUG_CRASH(("Invalid transition."));
 				} else {
 					State *st = (*i).second;
@@ -717,7 +709,7 @@ StateReturnType StateMachine::initDefaultState()
 		ids = NULL;
 	}
 	REALLY_VERBOSE_LOG(("SM_END\n\n"));
-#endif	
+#endif
 #endif
 	DEBUG_ASSERTCRASH(!m_locked, ("Machine is locked here, but probably should not be"));
 	if (m_defaultStateInited)
@@ -733,8 +725,8 @@ StateReturnType StateMachine::initDefaultState()
 }
 
 //-----------------------------------------------------------------------------
-void StateMachine::setGoalObject( const Object *obj ) 
-{ 
+void StateMachine::setGoalObject( const Object *obj )
+{
 	if (m_locked)
 		return;
 
@@ -743,8 +735,8 @@ void StateMachine::setGoalObject( const Object *obj )
 
 //-----------------------------------------------------------------------------
 Bool StateMachine::isGoalObjectDestroyed() const
-{ 
-	if (m_goalObjectID == 0) 
+{
+	if (m_goalObjectID == 0)
 	{
 		return false; // never had a goal object
 	}
@@ -752,23 +744,23 @@ Bool StateMachine::isGoalObjectDestroyed() const
 }
 
 //-----------------------------------------------------------------------------
-void StateMachine::halt() 
-{ 
+void StateMachine::halt()
+{
 	m_locked = true;
 	m_currentState = NULL; // don't exit current state, just clear it.
 #ifdef STATE_MACHINE_DEBUG
 	if (getWantsDebugOutput())
 	{
-		DEBUG_LOG(("%d '%s' -- '%s' %x halt()\n", TheGameLogic->getFrame(), m_owner->getTemplate()->getName().str(), m_name.str(), this));
-	}	
+		DEBUG_LOG(("%d '%s' -- '%s' %x halt()", TheGameLogic->getFrame(), m_owner->getTemplate()->getName().str(), m_name.str(), this));
+	}
 #endif
 }
 
 //-----------------------------------------------------------------------------
-void StateMachine::internalSetGoalObject( const Object *obj ) 
-{ 
+void StateMachine::internalSetGoalObject( const Object *obj )
+{
 	if (obj) {
-		m_goalObjectID = obj->getID(); 
+		m_goalObjectID = obj->getID();
 		internalSetGoalPosition(obj->getPosition());
 	}
 	else {
@@ -777,20 +769,20 @@ void StateMachine::internalSetGoalObject( const Object *obj )
 }
 
 //-----------------------------------------------------------------------------
-Object *StateMachine::getGoalObject() 
-{ 
-	return TheGameLogic->findObjectByID( m_goalObjectID ); 
+Object *StateMachine::getGoalObject()
+{
+	return TheGameLogic->findObjectByID( m_goalObjectID );
 }
 
 //-----------------------------------------------------------------------------
 const Object *StateMachine::getGoalObject() const
-{ 
-	return TheGameLogic->findObjectByID( m_goalObjectID ); 
+{
+	return TheGameLogic->findObjectByID( m_goalObjectID );
 }
 
 //-----------------------------------------------------------------------------
-void StateMachine::setGoalPosition( const Coord3D *pos ) 
-{ 
+void StateMachine::setGoalPosition( const Coord3D *pos )
+{
 	if (m_locked)
 		return;
 
@@ -798,10 +790,10 @@ void StateMachine::setGoalPosition( const Coord3D *pos )
 }
 
 //-----------------------------------------------------------------------------
-void StateMachine::internalSetGoalPosition( const Coord3D *pos ) 
-{ 
+void StateMachine::internalSetGoalPosition( const Coord3D *pos )
+{
 	if (pos) {
-		m_goalPosition = *pos; 
+		m_goalPosition = *pos;
 		// Don't clear the goal object, or everything breaks.  Like construction of buildings.
 	}
 }
@@ -812,7 +804,7 @@ void StateMachine::internalSetGoalPosition( const Coord3D *pos )
 void StateMachine::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -833,7 +825,7 @@ void StateMachine::xfer( Xfer *xfer )
 	StateID curStateID = getCurrentStateID();
 	xfer->xferUnsignedInt(&curStateID);
 	if (xfer->getXferMode() == XFER_LOAD)	{
-		// We are going to jump into the current state.	We don't call onEnter or onExit, because the 
+		// We are going to jump into the current state.	We don't call onEnter or onExit, because the
 		// state was already active when we saved.
 		m_currentState = internalGetState( curStateID );
 	}
@@ -875,7 +867,7 @@ void StateMachine::xfer( Xfer *xfer )
 	xfer->xferCoord3D(&m_goalPosition);
 	xfer->xferBool(&m_locked);
 	xfer->xferBool(&m_defaultStateInited);
-}  // end xfer
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -884,5 +876,5 @@ void StateMachine::xfer( Xfer *xfer )
 void StateMachine::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp b/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp
index ed8acf1492d..9f05592a707 100644
--- a/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp
+++ b/Generals/Code/GameEngine/Source/Common/StatsCollector.cpp
@@ -24,12 +24,12 @@
 
 // FILE: StatsCollector.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,7 +37,7 @@
 //	Filename: 	StatsCollector.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Convinience class to gather player stats
 //
 //-----------------------------------------------------------------------------
@@ -46,7 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -76,13 +76,9 @@ static char statsDir[255] = "Stats\\";
 //=============================================================================
 StatsCollector::StatsCollector( void )
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_isScrolling = FALSE;
 	m_scrollBeginTime = 0;
 	m_scrollTime = 0;
-
-	//
 	m_timeCount = 0;
 	m_buildCommands = 0;
 	m_moveCommands = 0;
@@ -90,16 +86,14 @@ StatsCollector::StatsCollector( void )
 	m_scrollMapCommands = 0;
 	m_AIUnits = 0;
 	m_playerUnits = 0;
-	
 	m_lastUpdate = 0;
 	m_startFrame = TheGameLogic->getFrame();
-
 }
 //Destructor
 //=============================================================================
 StatsCollector::~StatsCollector( void )
 {
-	
+
 }
 
 // Reset and create the file header
@@ -108,7 +102,7 @@ void StatsCollector::reset( void )
 {
 
 	// make sure we have a stats Dir.
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_saveStats)
 	{
 		AsciiString playtestDir = TheGlobalData->m_baseStatsDir;
@@ -125,12 +119,12 @@ void StatsCollector::reset( void )
 	TheFileSystem->createDirectory(AsciiString(statsDir));
 	createFileName();
 	writeInitialFileInfo();
-	
+
 	// zero out
 	zeroOutStats();
 
 	m_lastUpdate = TheGameLogic->getFrame(); // timeGetTime();
-}	
+}
 
 // Msgs pass through here so we can track whichever ones we want
 //=============================================================================
@@ -139,8 +133,8 @@ void StatsCollector::collectMsgStats( const GameMessage *msg )
 	// We only care about our own messages.
 	if(ThePlayerList->getLocalPlayer()->getPlayerIndex() != msg->getPlayerIndex())
 		return;
-	
-	switch (msg->getType()) 
+
+	switch (msg->getType())
 	{
 		case GameMessage::MSG_QUEUE_UNIT_CREATE:
 		case GameMessage::MSG_DOZER_CONSTRUCT:
@@ -157,18 +151,18 @@ void StatsCollector::collectMsgStats( const GameMessage *msg )
 //=============================================================================
 void StatsCollector::collectUnitCountStats( void )
 {
-	
+
 	for(Object *obj =	TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject())
 	{
-		
+
 		if((!(obj->isKindOf(KINDOF_INFANTRY) || obj->isKindOf(KINDOF_VEHICLE))) || ( obj->isNeutralControlled()) ||(obj->getControllingPlayer()->getSide().compare("Civilian") == 0))
 			continue;
-		
+
 		if(obj->getControllingPlayer()->isLocalPlayer())
 		{
 			++m_playerUnits;
 		}
-		else 
+		else
 		{
 			++m_AIUnits;
 		}
@@ -197,7 +191,7 @@ void StatsCollector::update( void )
 	zeroOutStats();
 
 	m_lastUpdate = TheGameLogic->getFrame(); //timeGetTime();
-	
+
 }
 
 void StatsCollector::incrementScrollMoveCount( void )
@@ -228,16 +222,16 @@ void StatsCollector::writeFileEnd( void )
 		DEBUG_ASSERTCRASH(f, ("Unable to open file %s to write", m_statsFileName.str()));
 		return;
 	}
-	
+
 	m_timeCount += (TheGameLogic->getFrame() - m_lastUpdate) / LOGICFRAMES_PER_SECOND;
 	writeStatInfo();
 	fprintf(f, "---------------------------------------------------\n");
-	
+
 		// Time
 	struct tm *newTime;
 	time_t aclock;
   time( &aclock );
-  newTime = localtime( &aclock ); 
+  newTime = localtime( &aclock );
 	fprintf(f, "End Time:\t%s\n",asctime(newTime) );
 
 	fprintf(f, "=KEY===============================================\n");
@@ -253,8 +247,8 @@ void StatsCollector::writeFileEnd( void )
 	fprintf(f, "#AIU = # of AI's Units\n");
 	fprintf(f, "===================================================\n");
 	fprintf(f, "* Times are in Game Seconds which are based off of frames. Current fps is set to %d\n", LOGICFRAMES_PER_SECOND);
-	
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_benchmarkTimer > 0)
 	{
 		fprintf(f, "\n*** BENCHMARK MODE STATS ***\n");
@@ -279,7 +273,7 @@ void StatsCollector::endScrollTime( void )
 {
 	if(!m_isScrolling)
 		return;
-	
+
 	m_isScrolling = FALSE;
 
 	m_scrollTime += TheGameLogic->getFrame() - m_scrollBeginTime;
@@ -312,22 +306,19 @@ void StatsCollector::createFileName( void )
 	time(&longTime);
 	curtime = localtime(&longTime);
 	strftime(datestr, 256, "_%b%d_%I%M%p", curtime);
-//	const MapMetaData *m =  TheMapCache->findMap(TheGlobalData->m_mapName); 
+//	const MapMetaData *m =  TheMapCache->findMap(TheGlobalData->m_mapName);
 	AsciiString name = TheGlobalData->m_mapName;
 	const char *fname = name.reverseFind('\\');
 	if (fname)
 		name = fname+1;
-	name.removeLastChar(); // p
-	name.removeLastChar(); // a
-	name.removeLastChar(); // m
-	name.removeLastChar(); // .
+	name.truncateBy(4); // ".map"
 	m_statsFileName.clear();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_saveStats)
 	{
 		m_statsFileName.set(TheGlobalData->m_baseStatsDir);
 		m_statsFileName.concat(statsDir);
-		
+
 		if (TheNetwork)
 		{
 			if (TheLAN)
@@ -381,7 +372,7 @@ void StatsCollector::writeInitialFileInfo()
 	struct tm *newTime;
 	time_t aclock;
   time( &aclock );
-  newTime = localtime( &aclock ); 
+  newTime = localtime( &aclock );
 	fprintf(f, "Date:\t%s",asctime(newTime) );
 
 	// Map
@@ -394,8 +385,8 @@ void StatsCollector::writeInitialFileInfo()
 	fprintf(f, "Time*\tBC\tMC\tAC\tSMC\tST*\tOC\t$$$\t#PU\t#AIU\n");
 	collectUnitCountStats();
 	Money *m = ThePlayerList->getLocalPlayer()->getMoney();
-	fprintf(f, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", 0, m_buildCommands, m_moveCommands, m_attackCommands, 
-					m_scrollMapCommands, 0 ,/*other commands*/0, m->countMoney(), 
+	fprintf(f, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", 0, m_buildCommands, m_moveCommands, m_attackCommands,
+					m_scrollMapCommands, 0 ,/*other commands*/0, m->countMoney(),
 					m_playerUnits, m_AIUnits );
 	// initial stats
 	// we don't want a file pointer open for seconds on end... we'll open it each time.
@@ -414,12 +405,12 @@ void StatsCollector::writeStatInfo()
 		return;
 	}
 	Money *m = ThePlayerList->getLocalPlayer()->getMoney();
-	
-	fprintf(f, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", m_timeCount, m_buildCommands, m_moveCommands, m_attackCommands, 
-					m_scrollMapCommands, m_scrollTime / LOGICFRAMES_PER_SECOND, /*other commands*/0,m->countMoney() , 
+
+	fprintf(f, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", m_timeCount, m_buildCommands, m_moveCommands, m_attackCommands,
+					m_scrollMapCommands, m_scrollTime / LOGICFRAMES_PER_SECOND, /*other commands*/0,m->countMoney() ,
 					m_playerUnits, m_AIUnits  );
 
 
 	fclose(f);
-	
+
 }
diff --git a/Generals/Code/GameEngine/Source/Common/System/ArchiveFile.cpp b/Generals/Code/GameEngine/Source/Common/System/ArchiveFile.cpp
deleted file mode 100644
index fab4e08a9e1..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/ArchiveFile.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/////////ArchiveFile.cpp ///////////////////////
-// Bryan Cleveland, August 2002
-////////////////////////////////////////////////
-
-#include "PreRTS.h"
-
-#include "Common/ArchiveFile.h"
-#include "Common/ArchiveFileSystem.h"
-#include "Common/file.h"
-#include "Common/PerfTimer.h"
-
-
-// checks to see if str matches searchString.  Search string is done in the
-// using * and ? as wildcards. * is used to denote any number of characters,
-// and ? is used to denote a single wildcard character.
-static Bool SearchStringMatches(AsciiString str, AsciiString searchString) 
-{
-	if (str.getLength() == 0) {
-		if (searchString.getLength() == 0) {
-			return TRUE;
-		}
-		return FALSE;
-	}
-	if (searchString.getLength() == 0) {
-		return FALSE;
-	}
-
-	const char *c1 = str.str();
-	const char *c2 = searchString.str();
-
-	while ((*c1 == *c2) || (*c2 == '?') || (*c2 == '*')) {
-		if ((*c1 == *c2) || (*c2 == '?')) {
-			++c1;
-			++c2;
-		} else if (*c2 == '*') {
-			++c2;
-			if (*c2 == 0) {
-				return TRUE;
-			}
-			while (*c1 != 0) {
-				if (SearchStringMatches(AsciiString(c1), AsciiString(c2))) {
-					return TRUE;
-				}
-				++c1;
-			}
-		}
-		if (*c1 == 0) {
-			if (*c2 == 0) {
-				return TRUE;
-			}
-			return FALSE;
-		}
-		if (*c2 == 0) {
-			return FALSE;
-		}
-	}
-	return FALSE;
-}
-
-ArchiveFile::~ArchiveFile() 
-{
-	if (m_file != NULL) {
-		m_file->close();
-		m_file = NULL;
-	}
-}
-
-ArchiveFile::ArchiveFile() 
-{
-	m_rootDirectory.clear();
-}
-
-void ArchiveFile::addFile(const AsciiString& path, const ArchivedFileInfo *fileInfo) 
-{
-	AsciiString temp;
-	temp = path;
-	temp.toLower();
-	AsciiString token;
-	AsciiString debugpath;
-
-	DetailedArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
-
-	temp.nextToken(&token, "\\/");
-
-	while (token.getLength() > 0) {
-		if (dirInfo->m_directories.find(token) == dirInfo->m_directories.end()) 
-		{
-			dirInfo->m_directories[token].clear();
-			dirInfo->m_directories[token].m_directoryName = token;
-		}
-
-		debugpath.concat(token);
-		debugpath.concat('\\');
-		dirInfo = &(dirInfo->m_directories[token]);
-		temp.nextToken(&token, "\\/");
-	}
-
-	dirInfo->m_files[fileInfo->m_filename] = *fileInfo;
-	//path.concat(fileInfo->m_filename);
-}
-
-void ArchiveFile::getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
-{
-
-	AsciiString searchDir;
-	const DetailedArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
-
-	searchDir = originalDirectory;
-	searchDir.toLower();
-	AsciiString token;
-	
-	searchDir.nextToken(&token, "\\/");
-
-	while (token.getLength() > 0) {
-
-		DetailedArchivedDirectoryInfoMap::const_iterator it = dirInfo->m_directories.find(token);
-		if (it != dirInfo->m_directories.end())
-		{
-			dirInfo = &it->second;
-		}
-		else
-		{
-			// if the directory doesn't exist, then there aren't any files to be had.
-			return;
-		}
-
-		searchDir.nextToken(&token, "\\/");
-	}
-
-	getFileListInDirectory(dirInfo, originalDirectory, searchName, filenameList, searchSubdirectories);
-}
-
-void ArchiveFile::getFileListInDirectory(const DetailedArchivedDirectoryInfo *dirInfo, const AsciiString& currentDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
-{
-	DetailedArchivedDirectoryInfoMap::const_iterator diriter = dirInfo->m_directories.begin();
-	while (diriter != dirInfo->m_directories.end()) {
-		const DetailedArchivedDirectoryInfo *tempDirInfo = &(diriter->second);
-		AsciiString tempdirname;
-		tempdirname = currentDirectory;
-		if ((tempdirname.getLength() > 0) && (!tempdirname.endsWith("\\"))) {
-			tempdirname.concat('\\');
-		}
-		tempdirname.concat(tempDirInfo->m_directoryName);
-		getFileListInDirectory(tempDirInfo, tempdirname, searchName, filenameList, searchSubdirectories);
-		diriter++;
-	}
-
-	ArchivedFileInfoMap::const_iterator fileiter = dirInfo->m_files.begin();
-	while (fileiter != dirInfo->m_files.end()) {
-		if (SearchStringMatches(fileiter->second.m_filename, searchName)) {
-			AsciiString tempfilename;
-			tempfilename = currentDirectory;
-			if ((tempfilename.getLength() > 0) && (!tempfilename.endsWith("\\"))) {
-				tempfilename.concat('\\');
-			}
-			tempfilename.concat(fileiter->second.m_filename);
-			if (filenameList.find(tempfilename) == filenameList.end()) {
-				// only insert into the list if its not already in there.
-				filenameList.insert(tempfilename);
-			}
-		}
-		fileiter++;
-	}
-}
-
-void ArchiveFile::attachFile(File *file) 
-{
-	if (m_file != NULL) {
-		m_file->close();
-		m_file = NULL;
-	}
-	m_file = file;
-}
-
-const ArchivedFileInfo * ArchiveFile::getArchivedFileInfo(const AsciiString& filename) const
-{
-	AsciiString path;
-	path = filename;
-	path.toLower();
-	AsciiString token;
-
-	const DetailedArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
-
-	path.nextToken(&token, "\\/");
-
-	while ((token.find('.') == NULL) || (path.find('.') != NULL)) {
-
-		DetailedArchivedDirectoryInfoMap::const_iterator it = dirInfo->m_directories.find(token);
-		if (it != dirInfo->m_directories.end())
-		{
-			dirInfo = &it->second; 
-		}
-		else
-		{
-			return NULL;
-		}
-
-		path.nextToken(&token, "\\/");
-	}
-
-	ArchivedFileInfoMap::const_iterator it = dirInfo->m_files.find(token);
-	if (it != dirInfo->m_files.end())
-	{
-		return &it->second;
-	}
-	else
-	{
-		return NULL;
-	}
-
-}
diff --git a/Generals/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp b/Generals/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
deleted file mode 100644
index 2b94283ef6f..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    Game Engine Common
-//
-// File name: ArchiveFileSystem.cpp
-//
-// Created:   11/26/01 TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-#include "Common/ArchiveFile.h"
-#include "Common/ArchiveFileSystem.h"
-#include "Common/AsciiString.h"
-#include "Common/PerfTimer.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-ArchiveFileSystem *TheArchiveFileSystem = NULL;
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-//------------------------------------------------------
-// ArchivedFileInfo
-//------------------------------------------------------
-ArchiveFileSystem::ArchiveFileSystem() 
-{
-}
-
-ArchiveFileSystem::~ArchiveFileSystem() 
-{
-	ArchiveFileMap::iterator iter = m_archiveFileMap.begin();
-	while (iter != m_archiveFileMap.end()) {
-		ArchiveFile *file = iter->second;
-		if (file != NULL) {
-			delete file;
-			file = NULL;
-		}
-		iter++;
-	}
-}
-
-void ArchiveFileSystem::loadIntoDirectoryTree(const ArchiveFile *archiveFile, const AsciiString& archiveFilename, Bool overwrite)
-{
-
-	FilenameList filenameList;
-
-	archiveFile->getFileListInDirectory(AsciiString(""), AsciiString(""), AsciiString("*"), filenameList, TRUE);
-
-	FilenameListIter it = filenameList.begin();
-
-	while (it != filenameList.end()) {
-		// add this filename to the directory tree.
-		AsciiString path = *it;
-		path.toLower();
-		AsciiString token;
-		AsciiString debugpath;
-
-		ArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
-
-		Bool infoInPath;
-		infoInPath = path.nextToken(&token, "\\/");
-
-		while (infoInPath && (!token.find('.') || path.find('.'))) {
-			ArchivedDirectoryInfoMap::iterator tempiter = dirInfo->m_directories.find(token);
-			if (tempiter == dirInfo->m_directories.end()) 
-			{
-				dirInfo->m_directories[token].clear();
-				dirInfo->m_directories[token].m_directoryName = token;
-			}
-
-			dirInfo = &(dirInfo->m_directories[token]);
-			debugpath.concat(token);
-			debugpath.concat('\\');
-			infoInPath = path.nextToken(&token, "\\/");
-		}
-
-		// token is the filename, and dirInfo is the directory that this file is in.
-		if (dirInfo->m_files.find(token) == dirInfo->m_files.end() || overwrite) {
-			AsciiString path2;
-			path2 = debugpath;
-			path2.concat(token);
-//			DEBUG_LOG(("ArchiveFileSystem::loadIntoDirectoryTree - adding file %s, archived in %s\n", path2.str(), archiveFilename.str()));
-			dirInfo->m_files[token] = archiveFilename;
-		}
-
-		it++;
-	}
-}
-
-void ArchiveFileSystem::loadMods() {
-	if (TheGlobalData->m_modBIG.isNotEmpty())
-	{
-		ArchiveFile *archiveFile = openArchiveFile(TheGlobalData->m_modBIG.str());
-
-		if (archiveFile != NULL) {
-			DEBUG_LOG(("ArchiveFileSystem::loadMods - loading %s into the directory tree.\n", TheGlobalData->m_modBIG.str()));
-			loadIntoDirectoryTree(archiveFile, TheGlobalData->m_modBIG, TRUE);
-			m_archiveFileMap[TheGlobalData->m_modBIG] = archiveFile;
-			DEBUG_LOG(("ArchiveFileSystem::loadMods - %s inserted into the archive file map.\n", TheGlobalData->m_modBIG.str()));
-		}
-		else
-		{
-			DEBUG_LOG(("ArchiveFileSystem::loadMods - could not openArchiveFile(%s)\n", TheGlobalData->m_modBIG.str()));
-		}
-	}
-
-	if (TheGlobalData->m_modDir.isNotEmpty())
-	{
-#ifdef DEBUG_LOGGING
-		Bool ret =
-#endif
-		loadBigFilesFromDirectory(TheGlobalData->m_modDir, "*.big", TRUE);
-		DEBUG_ASSERTLOG(ret, ("loadBigFilesFromDirectory(%s) returned FALSE!\n", TheGlobalData->m_modDir.str()));
-	}
-}
-
-Bool ArchiveFileSystem::doesFileExist(const Char *filename) const
-{
-	AsciiString path = filename;
-	path.toLower();
-	AsciiString token;
-
-	const ArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
-
-	path.nextToken(&token, "\\/");
-
-	while (!token.find('.') || path.find('.')) 
-	{
-		ArchivedDirectoryInfoMap::const_iterator tempiter = dirInfo->m_directories.find(token);
-		if (tempiter != dirInfo->m_directories.end()) 
-		{
-			dirInfo = &tempiter->second;
-			path.nextToken(&token, "\\/");
-		}
-		else
-		{
-			// the directory doesn't exist, so return false
-			return FALSE;
-		}
-	}
-
-	// token is the filename, and dirInfo is the directory that this file is in.
-	if (dirInfo->m_files.find(token) == dirInfo->m_files.end()) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-File * ArchiveFileSystem::openFile(const Char *filename, Int access /* = 0 */) 
-{
-	AsciiString archiveFilename;
-	archiveFilename = getArchiveFilenameForFile(AsciiString(filename));
-
-	if (archiveFilename.getLength() == 0) {
-		return NULL;
-	}
-
-	return m_archiveFileMap[archiveFilename]->openFile(filename, access);
-}
-
-Bool ArchiveFileSystem::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
-{
-	if (fileInfo == NULL) {
-		return FALSE;
-	}
-
-	if (filename.getLength() <= 0) {
-		return FALSE;
-	}
-
-	AsciiString archiveFilename = getArchiveFilenameForFile(filename);
-	ArchiveFileMap::const_iterator it = m_archiveFileMap.find(archiveFilename);
-	if (it != m_archiveFileMap.end())
-	{
-		return it->second->getFileInfo(filename, fileInfo);
-	}
-	else
-	{
-		return FALSE;
-	}
-}
-
-AsciiString ArchiveFileSystem::getArchiveFilenameForFile(const AsciiString& filename) const
-{
-	AsciiString path;
-	path = filename;
-	path.toLower();
-	AsciiString token;
-	AsciiString debugpath;
-
-	const ArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
-
-	path.nextToken(&token, "\\/");
-
-	while (!token.find('.') || path.find('.')) {
-
-		ArchivedDirectoryInfoMap::const_iterator it = dirInfo->m_directories.find(token);
-		if (it != dirInfo->m_directories.end())
-		{
-			dirInfo = &it->second;
-		}
-		else
-		{
-			// the directory doesn't exist, so return NULL
-
-			// dump the directories;
-			//DEBUG_LOG(("directory %s not found in %s in archive file system\n", token.str(), debugpath.str()));
-			//DEBUG_LOG(("directories in %s in archive file system are:\n", debugpath.str()));
-			//ArchivedDirectoryInfoMap::const_iterator it = dirInfo->m_directories.begin();
-			//while (it != dirInfo->m_directories.end()) {
-			//	DEBUG_LOG(("\t%s\n", it->second.m_directoryName.str()));
-			//	it++;
-			//}
-			//DEBUG_LOG(("end of directory list.\n"));
-			return AsciiString::TheEmptyString;
-		}
-
-		debugpath.concat(token);
-		debugpath.concat('\\');
-
-		path.nextToken(&token, "\\/");
-	}
-
-	ArchivedFileLocationMap::const_iterator it = dirInfo->m_files.find(token);
-	if (it != dirInfo->m_files.end())
-	{
-		return it->second;
-	}
-	else
-	{
-		return AsciiString::TheEmptyString;
-	}
-
-}
-
-void ArchiveFileSystem::getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
-{
-	ArchiveFileMap::const_iterator it = m_archiveFileMap.begin();
-	while (it != m_archiveFileMap.end()) {
-		it->second->getFileListInDirectory(currentDirectory, originalDirectory, searchName, filenameList, searchSubdirectories);
-		it++;
-	}
-}
diff --git a/Generals/Code/GameEngine/Source/Common/System/AsciiString.cpp b/Generals/Code/GameEngine/Source/Common/System/AsciiString.cpp
deleted file mode 100644
index f8c757bacff..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/AsciiString.cpp
+++ /dev/null
@@ -1,483 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: AsciiString.cpp 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  AsciiString.cpp
-//
-// Created:    Steven Johnson, October 2001
-//
-// Desc:       General-purpose string classes
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/CriticalSection.h"
-
-
-// -----------------------------------------------------
-
-/*static*/ AsciiString AsciiString::TheEmptyString;
-
-//-----------------------------------------------------------------------------
-inline char* skipSeps(char* p, const char* seps)
-{
-	while (*p && strchr(seps, *p) != NULL)
-		++p;
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-inline char* skipNonSeps(char* p, const char* seps)
-{
-	while (*p && strchr(seps, *p) == NULL)
-		++p;
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-inline char* skipWhitespace(char* p)
-{
-	while (*p && isspace(*p))
-		++p;
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-inline char* skipNonWhitespace(char* p)
-{
-	while (*p && !isspace(*p))
-		++p;
-	return p;
-}
-
-// -----------------------------------------------------
-AsciiString::AsciiString(const AsciiString& stringSrc) : m_data(stringSrc.m_data)
-{
-	ScopedCriticalSection scopedCriticalSection(TheAsciiStringCriticalSection);
-	if (m_data)
-		++m_data->m_refCount;
-	validate();
-}
-
-// -----------------------------------------------------
-#ifdef RTS_DEBUG
-void AsciiString::validate() const
-{
-	if (!m_data) return;
-	DEBUG_ASSERTCRASH(m_data->m_refCount > 0, ("m_refCount is zero"));
-	DEBUG_ASSERTCRASH(m_data->m_refCount < 32000, ("m_refCount is suspiciously large"));
-	DEBUG_ASSERTCRASH(m_data->m_numCharsAllocated > 0, ("m_numCharsAllocated is zero"));
-//	DEBUG_ASSERTCRASH(m_data->m_numCharsAllocated < 1024, ("m_numCharsAllocated suspiciously large"));
-	DEBUG_ASSERTCRASH(strlen(m_data->peek())+1 <= m_data->m_numCharsAllocated,("str is too long (%d) for storage",strlen(m_data->peek())+1));
-}
-#endif
-
-// -----------------------------------------------------
-void AsciiString::debugIgnoreLeaks()
-{
-#ifdef MEMORYPOOL_DEBUG
-	if (m_data)
-	{
-		TheDynamicMemoryAllocator->debugIgnoreLeaksForThisBlock(m_data);
-	}
-	else
-	{
-		DEBUG_LOG(("cannot ignore the leak (no data)\n"));
-	}
-#endif
-}
-
-// -----------------------------------------------------
-void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData, const char* strToCopy, const char* strToCat)
-{
-	validate();
-
-	if (m_data &&
-			m_data->m_refCount == 1 &&
-			m_data->m_numCharsAllocated >= numCharsNeeded)
-	{
-		// no buffer manhandling is needed (it's already large enough, and unique to us)
-		if (strToCopy)
-			// TheSuperHackers @fix Mauller 04/04/2025 Replace strcpy with safer memmove as memory regions can overlap when part of string is copied to itself
-			memmove(m_data->peek(), strToCopy, strlen(strToCopy) + 1);
-		if (strToCat)
-			strcat(m_data->peek(), strToCat);
-		return;
-	}
-
-	DEBUG_ASSERTCRASH(numCharsNeeded <= MAX_LEN, ("AsciiString::ensureUniqueBufferOfSize exceeds max string length %d with requested length %d", MAX_LEN, numCharsNeeded));
-	int minBytes = sizeof(AsciiStringData) + numCharsNeeded*sizeof(char);
-	int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
-	AsciiStringData* newData = (AsciiStringData*)TheDynamicMemoryAllocator->allocateBytesDoNotZero(actualBytes, "STR_AsciiString::ensureUniqueBufferOfSize");
-	newData->m_refCount = 1;
-	newData->m_numCharsAllocated = (actualBytes - sizeof(AsciiStringData))/sizeof(char);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	newData->m_debugptr = newData->peek();	// just makes it easier to read in the debugger
-#endif
-
-	if (m_data && preserveData)
-		strcpy(newData->peek(), m_data->peek());
-	else
-		newData->peek()[0] = 0;
-
-	// do these BEFORE releasing the old buffer, so that self-copies
-	// or self-cats will work correctly.
-	if (strToCopy)
-		strcpy(newData->peek(), strToCopy);
-	if (strToCat)
-		strcat(newData->peek(), strToCat);
-
-	releaseBuffer();
-	m_data = newData;
-
-	validate();
-}
-
-
-// -----------------------------------------------------
-void AsciiString::releaseBuffer()
-{
-	ScopedCriticalSection scopedCriticalSection(TheAsciiStringCriticalSection);
-
-	validate();
-	if (m_data)
-	{
-		if (--m_data->m_refCount == 0)
-		{
-			TheDynamicMemoryAllocator->freeBytes(m_data);
-		}
-		m_data = 0;
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-AsciiString::AsciiString(const char* s) : m_data(0)
-{
-	//DEBUG_ASSERTCRASH(isMemoryManagerOfficiallyInited(), ("Initializing AsciiStrings prior to main (ie, as static vars) can cause memory leak reporting problems. Are you sure you want to do this?\n"));
-	int len = (s)?strlen(s):0;
-	if (len)
-	{
-		ensureUniqueBufferOfSize(len + 1, false, s, NULL);
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::set(const AsciiString& stringSrc)
-{
-	ScopedCriticalSection scopedCriticalSection(TheAsciiStringCriticalSection);
-
-	validate();
-	if (&stringSrc != this)
-	{
-		releaseBuffer();
-		m_data = stringSrc.m_data;
-		if (m_data)
-			++m_data->m_refCount;
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::set(const char* s)
-{
-	validate();
-	if (!m_data || s != peek())
-	{
-		int len = s ? strlen(s) : 0;
-		if (len)
-		{
-			ensureUniqueBufferOfSize(len + 1, false, s, NULL);
-		}
-		else
-		{
-			releaseBuffer();
-		}
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-char*  AsciiString::getBufferForRead(Int len)
-{
-	validate();
-	DEBUG_ASSERTCRASH(len>0, ("No need to allocate 0 len strings."));
-	ensureUniqueBufferOfSize(len + 1, false, NULL, NULL);
-	validate();
-	return peek();
-}
-
-// -----------------------------------------------------
-void AsciiString::translate(const UnicodeString& stringSrc)
-{
-	validate();
-	/// @todo srj put in a real translation here; this will only work for 7-bit ascii
-	clear();
-	Int len = stringSrc.getLength();
-	for (Int i = 0; i < len; i++)
-		concat((char)stringSrc.getCharAt(i));
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::concat(const char* s)
-{
-	validate();
-	int addlen = strlen(s);
-	if (addlen == 0)
-		return;	// my, that was easy
-
-	if (m_data)
-	{
-		ensureUniqueBufferOfSize(getLength() + addlen + 1, true, NULL, s);
-	}
-	else
-	{
-		set(s);
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::trim()
-{
-	validate();
-
-	if (m_data)
-	{
-		char *c = peek();
-
-		//	Strip leading white space from the string.
-		c = skipWhitespace(c);
-		if (c != peek())
-		{
-			set(c);
-		}
-
-		if (m_data) // another check, because the previous set() could erase m_data
-		{
-			//	Clip trailing white space from the string.
-			int len = strlen(peek());
-			for (int index = len-1; index >= 0; index--)
-			{
-				if (isspace(getCharAt(index)))
-				{
-					removeLastChar();
-				}
-				else
-				{
-					break;
-				}
-			}
-		}
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::toLower()
-{
-	validate();
-	if (m_data)
-	{
-		char buf[MAX_FORMAT_BUF_LEN];
-		strcpy(buf, peek());
-
-		char *c = buf;
-		while (c && *c)
-		{
-			*c = tolower(*c);
-			c++;
-		}
-		set(buf);
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::removeLastChar()
-{
-	validate();
-	if (m_data)
-	{
-		int len = strlen(peek());
-		if (len > 0)
-		{
-			ensureUniqueBufferOfSize(len+1, true, NULL, NULL);
-			peek()[len - 1] = 0;
-		}
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::format(AsciiString format, ...)
-{
-	validate();
-	va_list args;
-  va_start(args, format);
-	format_va(format, args);
-  va_end(args);
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::format(const char* format, ...)
-{
-	validate();
-	va_list args;
-  va_start(args, format);
-	format_va(format, args);
-  va_end(args);
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::format_va(const AsciiString& format, va_list args)
-{
-	format_va(format.str(), args);
-}
-
-// -----------------------------------------------------
-void AsciiString::format_va(const char* format, va_list args)
-{
-	validate();
-	char buf[MAX_FORMAT_BUF_LEN];
-	const int result = vsnprintf(buf, sizeof(buf)/sizeof(char), format, args);
-	if (result >= 0)
-	{
-		set(buf);
-		validate();
-	}
-	else
-	{
-		DEBUG_CRASH(("AsciiString::format_va failed with code:%d format:\"%s\"", result, format));
-	}
-}
-
-// -----------------------------------------------------
-Bool AsciiString::startsWith(const char* p) const
-{
-	if (*p == 0)
-		return true;	// everything starts with the empty string
-
-	int lenThis = getLength();
-	int lenThat = strlen(p);
-	if (lenThis < lenThat)
-		return false;	// that must be smaller than this
-
-	return strncmp(peek(), p, lenThat) == 0;
-}
-
-// -----------------------------------------------------
-Bool AsciiString::startsWithNoCase(const char* p) const
-{
-	if (*p == 0)
-		return true;	// everything starts with the empty string
-
-	int lenThis = getLength();
-	int lenThat = strlen(p);
-	if (lenThis < lenThat)
-		return false;	// that must be smaller than this
-
-	return strnicmp(peek(), p, lenThat) == 0;
-}
-
-// -----------------------------------------------------
-Bool AsciiString::endsWith(const char* p) const
-{
-	if (*p == 0)
-		return true;	// everything ends with the empty string
-
-	int lenThis = getLength();
-	int lenThat = strlen(p);
-	if (lenThis < lenThat)
-		return false;	// that must be smaller than this
-
-	return strncmp(peek() + lenThis - lenThat, p, lenThat) == 0;
-}
-
-// -----------------------------------------------------
-Bool AsciiString::endsWithNoCase(const char* p) const
-{
-	if (*p == 0)
-		return true;	// everything ends with the empty string
-
-	int lenThis = getLength();
-	int lenThat = strlen(p);
-	if (lenThis < lenThat)
-		return false;	// that must be smaller than this
-
-	return strnicmp(peek() + lenThis - lenThat, p, lenThat) == 0;
-}
-
-//-----------------------------------------------------------------------------
-Bool AsciiString::isNone() const
-{
-	return m_data && stricmp(peek(), "None") == 0;
-}
-
-//-----------------------------------------------------------------------------
-Bool AsciiString::nextToken(AsciiString* tok, const char* seps)
-{
-	if (this->isEmpty() || tok == this)
-		return false;
-
-	if (seps == NULL)
-		seps = " \n\r\t";
-
-	char* start = skipSeps(peek(), seps);
-	char* end = skipNonSeps(start, seps);
-
-	if (end > start)
-	{
-		Int len = end - start;
-		char* tmp = tok->getBufferForRead(len + 1);
-		memcpy(tmp, start, len);
-		tmp[len] = 0;
-
-		this->set(end);
-
-		return true;
-	}
-	else
-	{
-		this->clear();
-		tok->clear();
-		return false;
-	}
-}
diff --git a/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp b/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp
index 9a700aacbcb..25e2a59e429 100644
--- a/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp
@@ -25,11 +25,11 @@
 // FILE: BuildAssistant.cpp ///////////////////////////////////////////////////////////////////////
 // Author: Colin Day, February 2002
 // Desc:   Singleton class to encapsulate some of the more common functions or rules
-//				 that apply to building structures and units 
+//				 that apply to building structures and units
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BuildAssistant.h"
 #include "Common/GlobalData.h"
@@ -53,17 +53,11 @@
 #include "GameLogic/Module/ContainModule.h"
 #include "GameLogic/Module/CreateModule.h"
 #include "GameLogic/Module/ProductionUpdate.h"
-#include "GameLogic/Module/ContainModule.h"
 #include "GameLogic/Module/ParkingPlaceBehavior.h"
 
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 BuildAssistant *TheBuildAssistant = NULL;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -74,17 +68,17 @@ BuildAssistant *TheBuildAssistant = NULL;
 ObjectSellInfo::ObjectSellInfo( void )
 {
 
-	m_id = INVALID_ID; 
+	m_id = INVALID_ID;
 	m_sellFrame = 0;
-	
-}  // end ObjectSellInfo
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 ObjectSellInfo::~ObjectSellInfo( void )
 {
 
-}  // end ~ObjectSellInfo
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -104,7 +98,7 @@ static Bool isDozer( Object *obj )
 
 	return FALSE;
 
-}  // end isDozer
+}
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 
@@ -116,24 +110,18 @@ BuildAssistant::BuildAssistant( void )
 	m_buildPositions = NULL;
 	m_buildPositionSize = 0;
 	m_sellList.clear();
-}  // end BuildAssistant
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 BuildAssistant::~BuildAssistant( void )
 {
 
-	// delete build position array if we used it
-	if( m_buildPositions )
-	{
-		
-		delete [] m_buildPositions;
-		m_buildPositions = NULL;
-		m_buildPositionSize = 0;
-
-	}  // end if
+	delete [] m_buildPositions;
+	m_buildPositions = NULL;
+	m_buildPositionSize = 0;
 
-}  // end ~BuildAssistant
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -147,7 +135,7 @@ void BuildAssistant::init( void )
 	m_buildPositionSize = TheGlobalData->m_maxLineBuildObjects;
 	m_buildPositions = NEW Coord3D[ m_buildPositionSize ];
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -166,12 +154,12 @@ void BuildAssistant::reset( void )
 		// delete our data and erase this entry from the list
 		deleteInstance(sellInfo);
 
-	}  // end for
+	}
 
 	// clear the sell list
 	m_sellList.clear();
 
-}  // end reset
+}
 
 static const Real FRAMES_TO_ALLOW_SCAFFOLD = LOGICFRAMES_PER_SECOND * 1.5f;
 static const Real TOTAL_FRAMES_TO_SELL_OBJECT = LOGICFRAMES_PER_SECOND * 3.0f;
@@ -205,11 +193,11 @@ void BuildAssistant::update( void )
 		if( obj == NULL )
 		{
 
-			deleteInstance(sellInfo);			
-			m_sellList.erase( thisIterator );		
+			deleteInstance(sellInfo);
+			m_sellList.erase( thisIterator );
 			continue;
 
-		}  // end if
+		}
 
 		// decrement the construction percent
 		if( TheGameLogic->getFrame() - sellInfo->m_sellFrame >= FRAMES_TO_ALLOW_SCAFFOLD )
@@ -226,7 +214,7 @@ void BuildAssistant::update( void )
 			if( previousConstructionPercent > 0.0f && obj->getConstructionPercent() <= 0.0f )
 			{
 
-				obj->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK2( MODELCONDITION_PARTIALLY_CONSTRUCTED, 
+				obj->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK2( MODELCONDITION_PARTIALLY_CONSTRUCTED,
 																																				MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED ),
 																						 MAKE_MODELCONDITION_MASK( MODELCONDITION_SOLD ) );
 
@@ -238,9 +226,9 @@ void BuildAssistant::update( void )
 				if( draw )
 					draw->setAnimationLoopDuration( TOTAL_FRAMES_TO_SELL_OBJECT / 2 );
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
 		//
 		// after we've reached zero ... the object has "sunk" back down into the ground ... but
@@ -258,14 +246,14 @@ void BuildAssistant::update( void )
 				if( obj->getTemplate()->getRefundValue() != 0 )
 					sellValue = obj->getTemplate()->getRefundValue();
 				else
-					sellValue = REAL_TO_UNSIGNEDINT( obj->getTemplate()->calcCostToBuild( player ) * 
+					sellValue = REAL_TO_UNSIGNEDINT( obj->getTemplate()->calcCostToBuild( player ) *
 																										 TheGlobalData->m_sellPercentage );
 
-				player->getMoney()->deposit( sellValue );
+				player->getMoney()->deposit( sellValue, TRUE, FALSE );
 				// this money shouldn't be scored since it wasn't really "earned."
 //				player->getScoreKeeper()->addMoneyEarned( sellValue );
 
-			}  // end if
+			}
 
 			// cancel any of the production items and refund to the controlling player
 			ProductionUpdateInterface *pui = obj->getProductionUpdateInterface();
@@ -284,11 +272,11 @@ void BuildAssistant::update( void )
 			deleteInstance(sellInfo);
 			m_sellList.erase( thisIterator );
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
-}  // end update
+}
 //-------------------------------------------------------------------------------------------------
 /** Xfer the sell list. */
 //-------------------------------------------------------------------------------------------------
@@ -325,12 +313,12 @@ void BuildAssistant::xferTheSellList( Xfer *xfer )
 		DEBUG_ASSERTCRASH(count==0, ("Inconsistent list size counts."));
 	}
 
-}  // end xferTheSellList
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Nice little method to wrap up creating an object from a build */
 //-------------------------------------------------------------------------------------------------
-Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTemplate *what, 
+Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTemplate *what,
 																			  const Coord3D *pos, Real angle, Player *owningPlayer )
 {
 
@@ -347,7 +335,7 @@ Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTe
 		DEBUG_ASSERTCRASH( constructorObject->getControllingPlayer() == owningPlayer,
 											 ("buildObjectNow: Constructor object player is not the same as the controlling player passed in\n") );
 
-	}  // end if
+	}
 
  	// Need to validate that we can make this in case someone fakes their CommandSet
 	// A Null constructorObject is used by the script engine to cheat, so let it slide
@@ -359,7 +347,7 @@ Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTe
 
 	if ( moveObjectsForConstruction( what, pos, angle, owningPlayer ) == FALSE )
 	{
-		// totally bogus. We tried to move our units out of the way, but they wouldn't. 
+		// totally bogus. We tried to move our units out of the way, but they wouldn't.
 		// Chode-boys.
 		if (owningPlayer->getPlayerType()==PLAYER_HUMAN) {
 			return NULL;	// ai gets to cheat.  jba.
@@ -378,7 +366,7 @@ Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTe
 		}
 		return NULL;
 
-	}  // end else if
+	}
 	else
 	{
 
@@ -414,7 +402,7 @@ Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTe
 			owningPlayer->onStructureCreated( constructorObject, obj );
 			owningPlayer->onStructureConstructionComplete( constructorObject, obj, FALSE );
 
-		}  // end if
+		}
 		else
 		{
 			owningPlayer->onUnitCreated( constructorObject, obj );
@@ -435,17 +423,17 @@ Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTe
 
 			create->onBuildComplete();
 		}
-		
+
 		// Creation is another valid and essential time to call this. This building now Looks.
 		obj->handlePartitionCellMaintenance();
 
 		return obj;
 
-	}  // end else
+	}
 
   return NULL;
 
-}  // end buildObjectNow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This method will create a line of objects end to end along the line defined in 3D
@@ -463,19 +451,19 @@ void BuildAssistant::buildObjectLineNow( Object *constructorObject, const ThingT
 
 	// how big are each of our objects
 	Real objectSize = what->getTemplateGeometryInfo().getMajorRadius() * 2.0f;
-	
+
 	// what is our max tiling length we can make
 	Int maxObjects = TheGlobalData->m_maxLineBuildObjects;
 
 	// build an array of locations that we want to build from start to end
-	tileBuildInfo = buildTiledLocations( what, angle, start, end, 
+	tileBuildInfo = buildTiledLocations( what, angle, start, end,
 																			 objectSize, maxObjects, constructorObject );
 
 	// create an object at each position
 	for( Int i = 0; i < tileBuildInfo->tilesUsed; i++ )
 		buildObjectNow( constructorObject, what, &tileBuildInfo->positions[ i ], angle, owningPlayer );
 
-}  // end buildObjectLineNow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This structure is passed along to the checkSampleBuildLocation while iterating the
@@ -507,11 +495,11 @@ static void checkSampleBuildLocation( const Coord3D *samplePoint, void *userData
 		if( terrain->getRestrictConstruction() )
 			sampleData->terrainRestricted = TRUE;
 
-	}  // end if
+	}
 
 	Int cellX = REAL_TO_INT_FLOOR( samplePoint->x / PATHFIND_CELL_SIZE );
 	Int cellY = REAL_TO_INT_FLOOR( samplePoint->y / PATHFIND_CELL_SIZE );
-	
+
 	PathfindCell* cell = TheAI->pathfinder()->getCell( LAYER_GROUND, cellX, cellY );
 	if (!cell) {
 		sampleData->terrainRestricted = TRUE;
@@ -544,7 +532,7 @@ static void checkSampleBuildLocation( const Coord3D *samplePoint, void *userData
 		}
 	}
 
-}  // end checkSampleBuildLocation
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This function will call the user callback at each "sample point" across the footprint
@@ -575,7 +563,7 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 	transform.Rotate_Z( buildOrientation );
 
 	// get the bounding footprint rectangle for the geometry we're looking at
-	Real halfFootprintHeight, 
+	Real halfFootprintHeight,
 			 halfFootprintWidth;
 	if( build->getTemplateGeometryInfo().getGeomType() == GEOMETRY_BOX )
 	{
@@ -583,7 +571,7 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 		halfFootprintHeight = build->getTemplateGeometryInfo().getMinorRadius();
 		halfFootprintWidth = build->getTemplateGeometryInfo().getMajorRadius();
 
-	}  // end if
+	}
 	else if( build->getTemplateGeometryInfo().getGeomType() == GEOMETRY_SPHERE ||
 					 build->getTemplateGeometryInfo().getGeomType() == GEOMETRY_CYLINDER )
 	{
@@ -591,15 +579,15 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 		halfFootprintHeight = build->getTemplateGeometryInfo().getBoundingCircleRadius();
 		halfFootprintWidth = build->getTemplateGeometryInfo().getBoundingCircleRadius();
 
-	}  // end else if
+	}
 	else
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("iterateFootprint: Undefined geometry '%d' for '%s'\n",
+		DEBUG_ASSERTCRASH( 0, ("iterateFootprint: Undefined geometry '%d' for '%s'",
 											     build->getTemplateGeometryInfo().getGeomType(), build->getName().str()) );
 		return;
 
-	}  // end else
+	}
 
 	//
 	// start at a corner of the extent ... box geometries have a major radius down
@@ -611,8 +599,8 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 	//
 	Real x, y;
 	Vector3 v;
-	for( y = -halfFootprintHeight; 
-			 y < halfFootprintHeight + sampleResolution; 
+	for( y = -halfFootprintHeight;
+			 y < halfFootprintHeight + sampleResolution;
 			 y += sampleResolution )
 	{
 
@@ -620,8 +608,8 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 		if( y > halfFootprintHeight )
 			y = halfFootprintHeight;
 
-		for( x = -halfFootprintWidth; 
-				 x < halfFootprintWidth + sampleResolution; 
+		for( x = -halfFootprintWidth;
+				 x < halfFootprintWidth + sampleResolution;
 				 x += sampleResolution )
 		{
 
@@ -634,7 +622,7 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 			transform.Transform_Vector( transform, v, &v );
 
 			// for circular geometries we must actually be within the circle
-			if( build->getTemplateGeometryInfo().getGeomType() == GEOMETRY_SPHERE || 
+			if( build->getTemplateGeometryInfo().getGeomType() == GEOMETRY_SPHERE ||
 					build->getTemplateGeometryInfo().getGeomType() == GEOMETRY_CYLINDER )
 			{
 				Coord2D vector;
@@ -644,8 +632,8 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 				if( vector.length() > halfFootprintWidth )  // could be height too, radius is all the same for circles
 					continue;  // ignore this point
 
-			}  // end if
-		
+			}
+
 			// call the user callback
 			Coord3D pos;
 			pos.x = v.X;
@@ -653,24 +641,26 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 			pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y );
 			func( &pos, funcUserData );
 
-		}  // end for x
+		}
 
-	}  // end for y	
+	}
 
-}  // end iterateFootprint
+}
 
 
 //-------------------------------------------------------------------------------------------------
-/** Check for objects preventing building at this location.  */
+/** Check for objects preventing building at this location.
+	* TheSuperHackers @tweak Stubbjax 05/09/2025 Return LBC_SHROUD for shrouded objects near the
+	* edge of the shroud so that players cannot use this info to determine whether they exist. */
 //-------------------------------------------------------------------------------------------------
-Bool BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos, 
+Bool BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos,
 																											 const ThingTemplate *build,
 																											 Real angle,
 																											 Object *builderObject,
 																											 UnsignedInt options,
 																											 Player *thePlayer)
 {
-	ObjectIterator *iter = 
+	ObjectIterator *iter =
 			ThePartitionManager->iteratePotentialCollisions( worldPos,
 																											 build->getTemplateGeometryInfo(),
 																											 angle );
@@ -679,7 +669,6 @@ Bool BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos,
 	MemoryPoolObjectHolder hold(iter);
 	for( them = iter->first(); them; them = iter->next() )
 	{
-
 		// ignore any kind of class of objects that we will "remove" for building
 		if( isRemovableForConstruction( them ) == TRUE )
 			continue;
@@ -693,11 +682,17 @@ Bool BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos,
 		if (them->isKindOf(KINDOF_INERT))
 			continue;
 
-		// an immobile object may obstruct our building depending on flags.
-		if( them->isKindOf( KINDOF_IMMOBILE ) )	{
-			if (onlyCheckEnemies && builderObject && builderObject->getRelationship( them ) != ENEMIES )	{
+		if (them->isKindOf(KINDOF_IMMOBILE)) {
+			if (onlyCheckEnemies && builderObject && builderObject->getRelationship(them) != ENEMIES) {
 				continue;
 			}
+		}
+
+		if (builderObject && them->getShroudedStatus(builderObject->getControllingPlayer()->getPlayerIndex()) >= OBJECTSHROUD_FOGGED)
+			return false;
+
+		// an immobile object may obstruct our building depending on flags.
+		if( them->isKindOf( KINDOF_IMMOBILE ) )	{
 			TheTerrainVisual->addFactionBib(them, true);
 			return false;
 		}
@@ -711,7 +706,7 @@ Bool BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos,
 			return false;
 		}
 
-	}  // end for, them
+	}
 
 	if (onlyCheckEnemies) {
 		return true;
@@ -796,56 +791,60 @@ Bool BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos,
 			hisExitPos.x += c*offset;
 			hisExitPos.y += s*offset;
 		}
-		if (ThePartitionManager->geomCollidesWithGeom(them->getPosition(), hisBounds, them->getOrientation(), 
+		if (ThePartitionManager->geomCollidesWithGeom(them->getPosition(), hisBounds, them->getOrientation(),
 			worldPos, myBounds, angle)) {
 			TheTerrainVisual->addFactionBib(them, true);
 			return false;
 		}
-		if (!checkMyExit && !checkHisExit && !hisExtraWidth && !myExtraWidth) 
+		if (!checkMyExit && !checkHisExit && !hisExtraWidth && !myExtraWidth)
 		{
 			continue; // neither has extra exit space.
 		}
 
 		// an immobile object will obstruct our building no matter what team it's on
 		if ( them->isKindOf( KINDOF_IMMOBILE ) )	{
+			Bool shrouded = builderObject && them->getShroudedStatus(builderObject->getControllingPlayer()->getPlayerIndex()) >= OBJECTSHROUD_FOGGED;
 			/* Check for overlap of my exit rectangle to his geom info. */
-			if (checkMyExit && ThePartitionManager->geomCollidesWithGeom(them->getPosition(), hisBounds, them->getOrientation(), 
+			if (checkMyExit && ThePartitionManager->geomCollidesWithGeom(them->getPosition(), hisBounds, them->getOrientation(),
 				&myExitPos, myGeom, angle)) {
-				TheTerrainVisual->addFactionBib(them, true);
+				if (!shrouded)
+					TheTerrainVisual->addFactionBib(them, true);
 				return false;
 			}
 			// Check for overlap of his exit rectangle with my geom info
-			if (checkHisExit && ThePartitionManager->geomCollidesWithGeom(&hisExitPos, hisGeom, them->getOrientation(), 
+			if (checkHisExit && ThePartitionManager->geomCollidesWithGeom(&hisExitPos, hisGeom, them->getOrientation(),
 					worldPos, myBounds, angle)) {
-				TheTerrainVisual->addFactionBib(them, true);
+				if (!shrouded)
+					TheTerrainVisual->addFactionBib(them, true);
 				return false;
 			}
 			// Check both exit rectangles together.
-			if (checkMyExit&&checkHisExit&&ThePartitionManager->geomCollidesWithGeom(&hisExitPos, hisGeom, them->getOrientation(), 
+			if (checkMyExit&&checkHisExit&&ThePartitionManager->geomCollidesWithGeom(&hisExitPos, hisGeom, them->getOrientation(),
 					&myExitPos, myGeom, angle)) {
-				TheTerrainVisual->addFactionBib(them, true);
+				if (!shrouded)
+					TheTerrainVisual->addFactionBib(them, true);
 				return false;
 			}
 		}
 
-	}  // end for, them
+	}
 	return true;
 }
 
 //-------------------------------------------------------------------------------------------------
 /** Query if we can build at this location.  Note that 'build' may be null and is NOT required
-	* to be valid to know if a location is legal to build at.  'builderObject' is used 
+	* to be valid to know if a location is legal to build at.  'builderObject' is used
 	* for queries that require a pathfind check and should be NULL if not required */
 //-------------------------------------------------------------------------------------------------
-LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos, 
+LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 																											 const ThingTemplate *build,
-																											 Real angle, 
-																											 UnsignedInt options, 
+																											 Real angle,
+																											 UnsignedInt options,
 																											 Object *builderObject,
 																											 Player *player)
 {
 
-	/* You just can't never build off the map, regardless of options.  jba. */			
+	/* You just can't never build off the map, regardless of options.  jba. */
 	Region3D mapExtent;
 	TheTerrainLogic->getMaximumPathfindExtent(&mapExtent);
 	if (!mapExtent.isInRegionNoZ(worldPos)) {
@@ -872,36 +871,36 @@ LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 
 	//
 	// if NO_OBJECT_OVERLAP is set, we are not allowed to construct 'build' if it would overlap
-	// any immobile objects, or an enemy object.  Friendly objects should politely 
+	// any immobile objects, or an enemy object.  Friendly objects should politely
 	// "move out of the way" when you build something where they're standing
 	//
 	if( BitIsSet( options, NO_OBJECT_OVERLAP ) )
 	{
-		if (!isLocationClearOfObjects(worldPos, build, angle, builderObject, NO_OBJECT_OVERLAP, player)) 
+		if (!isLocationClearOfObjects(worldPos, build, angle, builderObject, NO_OBJECT_OVERLAP, player))
 		{
 			return LBC_OBJECTS_IN_THE_WAY;
 		}
 
-	}  // end if
+	}
 	//
 	// if NO_ENEMY_OBJECT_OVERLAP is set, we are not allowed to construct 'build' if it would overlap
 	// any enemy objects.  Friendly objects are ignored.
 	//
 	if( BitIsSet( options, NO_ENEMY_OBJECT_OVERLAP ) )
 	{
-		if (!isLocationClearOfObjects(worldPos, build, angle, builderObject, NO_ENEMY_OBJECT_OVERLAP, player)) 
+		if (!isLocationClearOfObjects(worldPos, build, angle, builderObject, NO_ENEMY_OBJECT_OVERLAP, player))
 		{
 			return LBC_OBJECTS_IN_THE_WAY;
 		}
 
-	}  // end if
+	}
 
 	if (build->isKindOf(KINDOF_CANNOT_BUILD_NEAR_SUPPLIES) && TheGlobalData->m_SupplyBuildBorder > 0)
 	{
-		// special case for supply centers: can't build too close to supply sources 
+		// special case for supply centers: can't build too close to supply sources
 		PartitionFilterAcceptByKindOf f1(MAKE_KINDOF_MASK(KINDOF_SUPPLY_SOURCE), KINDOFMASK_NONE);
 		PartitionFilter *filters[] = { &f1, NULL };
-		
+
 		// see if there are any reasonably close by
 		Real range = build->getTemplateGeometryInfo().getBoundingCircleRadius() + TheGlobalData->m_SupplyBuildBorder*2;
 		Object* tooClose = ThePartitionManager->getClosestObject(worldPos, range, FROM_BOUNDINGSPHERE_2D, filters);
@@ -949,16 +948,16 @@ LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 			if( ai->isQuickPathAvailable( worldPos ) == FALSE )
 				return LBC_NO_CLEAR_PATH;
 
-		}  // end if
+		}
 		else
 		{
 
 			if( ai->isPathAvailable( worldPos ) == FALSE )
 				return LBC_NO_CLEAR_PATH;
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
 	// check basic terrain restrctions
 	if( BitIsSet( options, TERRAIN_RESTRICTIONS ) )
@@ -990,7 +989,7 @@ LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 		sampleData.loZ = terrainExtent.hi.z;  // note we set lo point to highest point
 
 		// quick check at triple res.
-		iterateFootprint( build, angle, worldPos, 3*sampleResolution, 
+		iterateFootprint( build, angle, worldPos, 3*sampleResolution,
 		                  checkSampleBuildLocation, &sampleData );
 		if( sampleData.terrainRestricted == TRUE )
 			return LBC_RESTRICTED_TERRAIN;
@@ -999,7 +998,7 @@ LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 			return LBC_NOT_FLAT_ENOUGH;
 
 		// careful check at full res.
-		iterateFootprint( build, angle, worldPos, sampleResolution, 
+		iterateFootprint( build, angle, worldPos, sampleResolution,
 		                  checkSampleBuildLocation, &sampleData );
 		if( sampleData.terrainRestricted == TRUE )
 			return LBC_RESTRICTED_TERRAIN;
@@ -1007,12 +1006,12 @@ LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 		if( sampleData.hiZ - sampleData.loZ > TheGlobalData->m_allowedHeightVariationForBuilding )
 			return LBC_NOT_FLAT_ENOUGH;
 
-	}  // end if
+	}
 
 	// we passed all the checks
 	return LBC_OK;
 
-}  // end isLocationLegalToBuild
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Adds bibs to structures near to worldPos */
@@ -1041,7 +1040,7 @@ void BuildAssistant::addBibs(const Coord3D *worldPos,
 			TheTerrainVisual->addFactionBib(them, true);
 		}
 
-	}  // end for, them
+	}
 
 }
 
@@ -1055,14 +1054,14 @@ void BuildAssistant::addBibs(const Coord3D *worldPos,
 	* of positions in the tile build info.
 	*
 	* REQUIRES: Note that the array at 'postions' must be large enough to hold 'maxTiles'
-	* entries of positions 
+	* entries of positions
 	*/
 //-------------------------------------------------------------------------------------------------
 BuildAssistant::TileBuildInfo *BuildAssistant::buildTiledLocations( const ThingTemplate *thingBeingTiled,
 																																		Real angle,
-																																		const Coord3D *start, 
+																																		const Coord3D *start,
 																																		const Coord3D *end,
-																																		Real tilingSize, 
+																																		Real tilingSize,
 																																		Int maxTiles,
 																																		Object *builderObject )
 {
@@ -1091,7 +1090,7 @@ BuildAssistant::TileBuildInfo *BuildAssistant::buildTiledLocations( const ThingT
 		//
 		DEBUG_ASSERTCRASH( m_buildPositionSize < 200, ("Do you really need to tile this many objects!!!") );
 
-	}  // end if
+	}
 	Coord3D *positions = m_buildPositions;
 
 	// compute a vector from the start of the line in the world to the end
@@ -1111,7 +1110,7 @@ BuildAssistant::TileBuildInfo *BuildAssistant::buildTiledLocations( const ThingT
 	// line start to the placement line end, we are guaranteed to have one thing (+1)
 	//
 	Int tilesNeeded = REAL_TO_INT(placementLength / tilingSize) + 1;
-	
+
 	// we have a max that we are allowed to build to
 	if( tilesNeeded > maxTiles )
 		tilesNeeded = maxTiles;
@@ -1153,7 +1152,7 @@ BuildAssistant::TileBuildInfo *BuildAssistant::buildTiledLocations( const ThingT
 		// we have now actually used one more "tile"
 		tilesUsed++;
 
-	}  // end for i
+	}
 
 	// return a struct filled out with the actual tiles used and the array of locations
 	static TileBuildInfo tileInfo;
@@ -1161,10 +1160,10 @@ BuildAssistant::TileBuildInfo *BuildAssistant::buildTiledLocations( const ThingT
 	tileInfo.positions = positions;
 	return &tileInfo;
 
-}  // end buildTiledLocations
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Is the template passed in one of those wall type structures that we "build" in 
+/** Is the template passed in one of those wall type structures that we "build" in
 	* the world after drawing a line of where we want the object(s) placed.  The objects
 	* are placed "tiled" in a line */
 //-------------------------------------------------------------------------------------------------
@@ -1179,12 +1178,12 @@ Bool BuildAssistant::isLineBuildTemplate( const ThingTemplate *tTemplate )
 
 	return FALSE;  // not a line build object
 
-}  // end isLineBuildTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This method will check to make sure it is possible to build the requested unit.  The
 	* builder object MUST be present since all construction comes comes from either a Dozer or
-	* a production building.  The player must have satisfied the prereqs for 'whatToBuild' 
+	* a production building.  The player must have satisfied the prereqs for 'whatToBuild'
   * This does NOT check available money (see canMakeUnit) */
 //-------------------------------------------------------------------------------------------------
 Bool BuildAssistant::isPossibleToMakeUnit( Object *builder, const ThingTemplate *whatToBuild ) const
@@ -1196,18 +1195,18 @@ Bool BuildAssistant::isPossibleToMakeUnit( Object *builder, const ThingTemplate
 
 	// get the command set for the producer object
 	const CommandSet *commandSet = TheControlBar->findCommandSet( builder->getCommandSetString() );
-	
+
 	// if no command set we cannot build anything
 	if( commandSet == NULL )
 	{
 
-		DEBUG_ASSERTLOG( 0, ("Can't build a '%s' from the builder '%s' because '%s' doesn't have any command set defined\n",
+		DEBUG_ASSERTLOG( 0, ("Can't build a '%s' from the builder '%s' because '%s' doesn't have any command set defined",
 													whatToBuild->getName().str(),
 													builder->getTemplate()->getName().str(),
 													builder->getTemplate()->getName().str()) );
 		return FALSE;
 
-	}  // end if
+	}
 
 	//
 	// scan the command set, we must find whatToBuild as one of the "build" commands available
@@ -1219,16 +1218,15 @@ Bool BuildAssistant::isPossibleToMakeUnit( Object *builder, const ThingTemplate
 	Int i;
 	for( i = 0; i < MAX_COMMANDS_PER_SET; i++ )
 	{
-		
+
 		// get this button
 		commandButton = commandSet->getCommandButton(i);
 		if( commandButton &&
-				(commandButton->getCommandType() == GUI_COMMAND_UNIT_BUILD ||
-				 commandButton->getCommandType() == GUI_COMMAND_DOZER_CONSTRUCT) &&
-				commandButton->getThingTemplate()->isEquivalentTo(whatToBuild) )
+				(commandButton->getCommandType() == GUI_COMMAND_UNIT_BUILD || commandButton->getCommandType() == GUI_COMMAND_DOZER_CONSTRUCT) &&
+				commandButton->getThingTemplate() && commandButton->getThingTemplate()->isEquivalentTo(whatToBuild) )
 			foundCommand = commandButton;
 
-	}  // end for i
+	}
 	if( foundCommand == NULL )
 		return FALSE;
 
@@ -1264,9 +1262,9 @@ static void countInProduction( Object *obj, void *userData )
 		// add the count of this type that are in the queue
 		productionCountData->count += pui->countUnitTypeInQueue( productionCountData->type );
 
-	}  // end if
+	}
 
-}  // end countInProduction
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This method will check to make sure it is possible to build the requested unit. and
@@ -1278,11 +1276,11 @@ CanMakeType BuildAssistant::canMakeUnit( Object *builder, const ThingTemplate *w
 	// sanity
 	if( builder == NULL || whatToBuild == NULL )
 		return CANMAKE_NO_PREREQ;
-	
+
 	if (builder->testScriptStatusBit(OBJECT_STATUS_SCRIPT_DISABLED) || builder->testScriptStatusBit(OBJECT_STATUS_SCRIPT_UNPOWERED))
 		return CANMAKE_FACTORY_IS_DISABLED;
 
-	if (!isPossibleToMakeUnit(builder, whatToBuild)) 
+	if (!isPossibleToMakeUnit(builder, whatToBuild))
 		return CANMAKE_NO_PREREQ;
 
 	ProductionUpdateInterface* pu = builder->getProductionUpdateInterface();
@@ -1356,7 +1354,7 @@ Bool BuildAssistant::isRemovableForConstruction( Object *obj )
 	// not removable
 	return FALSE;
 
-}  // end isRemovableForConstruction
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given that we are about to build 'whatToBuild' remove all the objects that are in the
@@ -1366,7 +1364,7 @@ void BuildAssistant::clearRemovableForConstruction( const ThingTemplate *whatToB
 																										const Coord3D *pos,
 																										Real angle )
 {
-	ObjectIterator *iter = 
+	ObjectIterator *iter =
 			ThePartitionManager->iteratePotentialCollisions( pos,
 																											 whatToBuild->getTemplateGeometryInfo(),
 																											 angle );
@@ -1379,33 +1377,33 @@ void BuildAssistant::clearRemovableForConstruction( const ThingTemplate *whatToB
 		if( isRemovableForConstruction( them ) == TRUE && !them->isKindOf( KINDOF_ALWAYS_SELECTABLE ) )
 			TheGameLogic->destroyObject( them );
 
-	}  // end for, them
+	}
 
-}  // end clearRemovableForConstruction
+}
 
 // ------------------------------------------------------------------------------------------------
 /** clearRemovable is set up to delete objects that should cease to exist (for instance, trees).
-	* moveObjects will move objects that are owned by the player. It will also return false if 
+	* moveObjects will move objects that are owned by the player. It will also return false if
     the association with the object is enemy. (We can move neutral things) */
 // ------------------------------------------------------------------------------------------------
-Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuild, 
+Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuild,
 																								 const Coord3D *pos,
 																								 Real angle,
 																								 Player *playerToBuild )
-{	 
-	GeometryInfo gi (GEOMETRY_BOX, false, 10, whatToBuild->getTemplateGeometryInfo().getMajorRadius(), 
+{
+	GeometryInfo gi (GEOMETRY_BOX, false, 10, whatToBuild->getTemplateGeometryInfo().getMajorRadius(),
 		whatToBuild->getTemplateGeometryInfo().getMajorRadius());
 	if (whatToBuild->getTemplateGeometryInfo().getGeomType()==GEOMETRY_BOX) {
 		gi = whatToBuild->getTemplateGeometryInfo();
-	} 
-	ObjectIterator *iter = 
+	}
+	ObjectIterator *iter =
 			ThePartitionManager->iteratePotentialCollisions( pos,
 																											 gi,
 																											 angle );
 	Bool anyUnmovables = false;
 	MemoryPoolObjectHolder hold( iter );
 
-	Real radius = sqrt(pow(gi.getMajorRadius(), 2) + pow(gi.getMinorRadius(), 2)); 
+	Real radius = sqrt(pow(gi.getMajorRadius(), 2) + pow(gi.getMinorRadius(), 2));
 	radius *= 1.4f;	// Fudge the distance,
 
 	for( Object *them = iter->first(); them; them = iter->next() )
@@ -1419,7 +1417,7 @@ Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuil
 		if (them->isKindOf(KINDOF_INERT))
 			continue;
 
-		// Skip KINDOF_ALWAYS_SELECTABLE and isRemovableForConstruction, because if it is 
+		// Skip KINDOF_ALWAYS_SELECTABLE and isRemovableForConstruction, because if it is
 		// RemovableForConstruction, it just got destroyed, and won't actually be gone until
 		// the end of the frame.  jba.
 		if ( !them->isKindOf( KINDOF_ALWAYS_SELECTABLE ) && !isRemovableForConstruction(them) )
@@ -1432,13 +1430,13 @@ Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuil
 				// Pick an arbitrary direction and tell the unit to move there, at a distance greater
 				// than the object's radius.
 				AIUpdateInterface *ai = them->getAIUpdateInterface();
-				if (ai) 
+				if (ai)
 				{
-					// Vary the distance to move between one half the diameter of the building (roughly) 
+					// Vary the distance to move between one half the diameter of the building (roughly)
 					// and 1.5 times the diameter of the building
 					Real variedRadius = GameLogicRandomValueReal(0.5, 1.5) * radius;
 
-					Coord3D destPos;					
+					Coord3D destPos;
 					Real dir = GameLogicRandomValueReal(-PI, PI);
 					Vector3 vec(variedRadius, 0, 0);
 					vec.Rotate_Z(dir);
@@ -1446,7 +1444,7 @@ Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuil
 					destPos.x = pos->x + vec.X;
 					destPos.y = pos->y + vec.Y;
 					destPos.z = pos->z + vec.Z;
-					
+
 					// note that this is an extra-special case... even if the unit's mood is "sleep"
 					// it still needs to move here. (units with an ai mood of "sleep" won't respond to
 					// any AI commands. this is a special case that ignores the "sleep" ai mood.) (srj)
@@ -1457,8 +1455,8 @@ Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuil
 					anyUnmovables = true;
 				}
 
-			} 
-			else 
+			}
+			else
 			{
 				anyUnmovables = true;
 			}
@@ -1494,7 +1492,7 @@ void BuildAssistant::sellObject( Object *obj )
 		else
 			sellInfo = NULL;
 
-	}  // end for
+	}
 	if( sellInfo != NULL )
 		return;
 
@@ -1511,18 +1509,30 @@ void BuildAssistant::sellObject( Object *obj )
 	// set the model condition in the drawable for this object that will show the buildup
 	// scaffold and adjust the model height by construction percent
 	//
-	obj->setModelConditionFlags( MAKE_MODELCONDITION_MASK2( MODELCONDITION_PARTIALLY_CONSTRUCTED, 
-																													MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED) );
+	obj->setModelConditionFlags( MAKE_MODELCONDITION_MASK2( MODELCONDITION_PARTIALLY_CONSTRUCTED, MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED) );
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	//
-	// set this object as under de-construction (sold).  It is still a legal target, since you get the money at 
+	// set this object as under de-construction (sold).  It is still a legal target, since you get the money at
 	// the completion of sale.
 	//
 	obj->setStatus( MAKE_OBJECT_STATUS_MASK2( OBJECT_STATUS_SOLD, OBJECT_STATUS_UNSELECTABLE ) );
+#endif
+
+	// TheSuperHackers @bugfix Mauller 27/06/2025 we need to deselect the object before setting it as unselectable
+	// If the object is set unselectable too soon, it fails to be removed from the selection group
 
 	// for everybody, unselect them at this time.  You can't just deselect a drawable.  Selection is a logic property.
 	TheGameLogic->deselectObject(obj, PLAYERMASK_ALL, TRUE);
 
+#if !RETAIL_COMPATIBLE_AIGROUP
+	//
+	// set this object as under de-construction (sold).  It is still a legal target, since you get the money at
+	// the completion of sale.
+	//
+	obj->setStatus( MAKE_OBJECT_STATUS_MASK2( OBJECT_STATUS_SOLD, OBJECT_STATUS_UNSELECTABLE ) );
+#endif
+
 	//
 	// set the animation durations so that the regular build up loop animations can be
 	// done a bit faster for selling
@@ -1544,7 +1554,7 @@ void BuildAssistant::sellObject( Object *obj )
 	{
 		contain->onSelling();
 	}
-	
+
 	// Tell it to stop attacking or anything else it is doing
 	if( obj->getAI() )
 		obj->getAI()->aiIdle(CMD_FROM_AI);
@@ -1559,7 +1569,7 @@ void BuildAssistant::sellObject( Object *obj )
 			break;
 		}
 	}
-	
+
 	// destroy any mines that are owned by this structure, right now.
 	// unfortunately, structures don't keep list of mines they own, so we must do
 	// this the hard way :-( [fortunately, this doens't happen very often, so this
@@ -1575,5 +1585,5 @@ void BuildAssistant::sellObject( Object *obj )
 		}
 	}
 
-}  // end sellObject
+}
 
diff --git a/Generals/Code/GameEngine/Source/Common/System/CDManager.cpp b/Generals/Code/GameEngine/Source/Common/System/CDManager.cpp
index 3012af9b434..a50549597e5 100644
--- a/Generals/Code/GameEngine/Source/Common/System/CDManager.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/CDManager.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   Generals
@@ -42,57 +42,57 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/CDManager.h"
 #include "GameLogic/GameLogic.h"
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 CDManagerInterface* TheCDManager = NULL;
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 
@@ -105,7 +105,7 @@ CDDrive::CDDrive()
 {
 	m_diskName.clear();
 	m_drivePath.clear();
-	
+
 }
 
 //============================================================================
@@ -244,7 +244,7 @@ CDDriveInterface* CDManager::newDrive( const Char *path )
 	if ( drive )
 	{
 		drive->setPath( path );
-		
+
 		drive->m_node.setItem( drive );
 		m_drives.add( &drive->m_node );
 	}
@@ -284,10 +284,7 @@ void CDManager::destroyAllDrives( void )
 	{
 		node->remove();
 		CDDriveInterface *drive = (CDDriveInterface *) node->item();
-		if ( drive )
-		{
-			delete drive;
-		}
+		delete drive;
 	}
 }
 
diff --git a/Generals/Code/GameEngine/Source/Common/System/CriticalSection.cpp b/Generals/Code/GameEngine/Source/Common/System/CriticalSection.cpp
index 10a2f13fa82..37f4351ffe4 100644
--- a/Generals/Code/GameEngine/Source/Common/System/CriticalSection.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/CriticalSection.cpp
@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/CriticalSection.h"
 
 // Definitions.
diff --git a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp
index 99ac3bb8b16..63f980cb58e 100644
--- a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp
@@ -26,10 +26,9 @@
 // Implementation of Data Chunk save/load system
 // Author: Michael S. Booth, October 2000
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "stdlib.h"
-#include "string.h"
 #include "Compression.h"
 #include "Common/DataChunk.h"
 #include "Common/file.h"
@@ -44,10 +43,8 @@ CachedFileInputStream::CachedFileInputStream(void):m_buffer(NULL),m_size(0)
 
 CachedFileInputStream::~CachedFileInputStream(void)
 {
-	if (m_buffer) {
-		delete[] m_buffer;
-		m_buffer=NULL;
-	}
+	delete[] m_buffer;
+	m_buffer=NULL;
 }
 
 Bool CachedFileInputStream::open(AsciiString path)
@@ -66,32 +63,32 @@ Bool CachedFileInputStream::open(AsciiString path)
 
 	if (CompressionManager::isDataCompressed(m_buffer, m_size) == 0)
 	{
-		//DEBUG_LOG(("CachedFileInputStream::open() - file %s is uncompressed at %d bytes!\n", path.str(), m_size));
+		//DEBUG_LOG(("CachedFileInputStream::open() - file %s is uncompressed at %d bytes!", path.str(), m_size));
 	}
 	else
 	{
 		Int uncompLen = CompressionManager::getUncompressedSize(m_buffer, m_size);
-		//DEBUG_LOG(("CachedFileInputStream::open() - file %s is compressed!  It should go from %d to %d\n", path.str(),
+		//DEBUG_LOG(("CachedFileInputStream::open() - file %s is compressed!  It should go from %d to %d", path.str(),
 		//	m_size, uncompLen));
 		char *uncompBuffer = NEW char[uncompLen];
 		Int actualLen = CompressionManager::decompressData(m_buffer, m_size, uncompBuffer, uncompLen);
 		if (actualLen == uncompLen)
 		{
-			//DEBUG_LOG(("Using uncompressed data\n"));
+			//DEBUG_LOG(("Using uncompressed data"));
 			delete[] m_buffer;
 			m_buffer = uncompBuffer;
 			m_size = uncompLen;
 		}
 		else
 		{
-			//DEBUG_LOG(("Decompression failed - using compressed data\n"));
+			//DEBUG_LOG(("Decompression failed - using compressed data"));
 			// decompression failed.  Maybe we invalidly thought it was compressed?
 			delete[] uncompBuffer;
 		}
 	}
 	//if (m_size >= 4)
 	//{
-	//	DEBUG_LOG(("File starts as '%c%c%c%c'\n", m_buffer[0], m_buffer[1],
+	//	DEBUG_LOG(("File starts as '%c%c%c%c'", m_buffer[0], m_buffer[1],
 	//		m_buffer[2], m_buffer[3]));
 	//}
 
@@ -104,10 +101,9 @@ Bool CachedFileInputStream::open(AsciiString path)
 
 void CachedFileInputStream::close(void)
 {
-	if (m_buffer) {
-		delete[] m_buffer;
-		m_buffer=NULL;
-	}
+	delete[] m_buffer;
+	m_buffer=NULL;
+
 	m_pos=0;
 	m_size=0;
 }
@@ -214,7 +210,7 @@ Bool FileInputStream::eof(void)
 {
 	if (m_file != NULL) {
 		return (m_file->size() == m_file->position());
-	}	 
+	}
 	return(true);
 }
 
@@ -235,17 +231,13 @@ void FileInputStream::rewind()
 
 #define TEMP_FILENAME		"_tmpChunk.dat"
 
-DataChunkOutput::DataChunkOutput( OutputStream *pOut ) :  
+DataChunkOutput::DataChunkOutput( OutputStream *pOut ) :
 m_pOut(pOut)
 {
 	AsciiString tmpFileName = TheGlobalData->getPath_UserData();
 	tmpFileName.concat(TEMP_FILENAME);
-	m_tmp_file = ::fopen( tmpFileName.str(), "wb" );	
-	// Added Sadullah Nader
-	// Initializations missing and needed
+	m_tmp_file = ::fopen( tmpFileName.str(), "wb" );
 	m_chunkStack = NULL;
-	
-	// End Add
 }
 
 DataChunkOutput::~DataChunkOutput()
@@ -259,7 +251,7 @@ DataChunkOutput::~DataChunkOutput()
 	AsciiString tmpFileName = TheGlobalData->getPath_UserData();
 	tmpFileName.concat(TEMP_FILENAME);
 
- 	m_tmp_file = ::fopen( tmpFileName.str(), "rb" );	
+ 	m_tmp_file = ::fopen( tmpFileName.str(), "rb" );
 	::fseek(m_tmp_file, 0, SEEK_SET);
 
 	// append the temp m_tmp_file m_contents
@@ -295,7 +287,7 @@ void DataChunkOutput::openDataChunk( const char *name, DataChunkVersionType ver
 	// remember this m_tmp_file position so we can write the real data size later
 	c->filepos = ::ftell(m_tmp_file);
 #ifdef VERBOSE
-	DEBUG_LOG(("Writing chunk %s at %d (%x)\n", name, ::ftell(m_tmp_file), ::ftell(m_tmp_file)));
+	DEBUG_LOG(("Writing chunk %s at %d (%x)", name, ::ftell(m_tmp_file), ::ftell(m_tmp_file)));
 #endif
 	// store a placeholder for the data size
 	Int dummy = 0xffff;
@@ -328,48 +320,48 @@ void DataChunkOutput::closeDataChunk( void )
 	// pop the chunk off the stack
 	OutputChunk *c = m_chunkStack;
 #ifdef VERBOSE
-	DEBUG_LOG(("Closing chunk %s at %d (%x)\n", m_contents.getName(c->id).str(), here, here));
+	DEBUG_LOG(("Closing chunk %s at %d (%x)", m_contents.getName(c->id).str(), here, here));
 #endif
 	m_chunkStack = m_chunkStack->next;
 	deleteInstance(c);
 }
 
-void DataChunkOutput::writeReal( Real r ) 
-{ 
-	::fwrite( (const char *)&r, sizeof(float) , 1, m_tmp_file  ); 
+void DataChunkOutput::writeReal( Real r )
+{
+	::fwrite( (const char *)&r, sizeof(float) , 1, m_tmp_file  );
 }
 
-void DataChunkOutput::writeInt( Int i ) 
-{ 
-	::fwrite( (const char *)&i, sizeof(Int) , 1, m_tmp_file ); 
+void DataChunkOutput::writeInt( Int i )
+{
+	::fwrite( (const char *)&i, sizeof(Int) , 1, m_tmp_file );
 }
 
-void DataChunkOutput::writeByte( Byte b ) 
-{ 
-	::fwrite( (const char *)&b, sizeof(Byte) , 1, m_tmp_file ); 
+void DataChunkOutput::writeByte( Byte b )
+{
+	::fwrite( (const char *)&b, sizeof(Byte) , 1, m_tmp_file );
 }
 
-void DataChunkOutput::writeArrayOfBytes(char *ptr, Int len) 
-{ 
-	::fwrite( (const char *)ptr, 1, len , m_tmp_file ); 
+void DataChunkOutput::writeArrayOfBytes(char *ptr, Int len)
+{
+	::fwrite( (const char *)ptr, 1, len , m_tmp_file );
 }
 
-void DataChunkOutput::writeAsciiString( const AsciiString& theString ) 
-{ 
+void DataChunkOutput::writeAsciiString( const AsciiString& theString )
+{
 	UnsignedShort len = theString.getLength();
 	::fwrite( (const char *)&len, sizeof(UnsignedShort) , 1, m_tmp_file );
-	::fwrite( theString.str(), len , 1, m_tmp_file ); 
+	::fwrite( theString.str(), len , 1, m_tmp_file );
 }
 
-void DataChunkOutput::writeUnicodeString( UnicodeString theString ) 
-{ 
+void DataChunkOutput::writeUnicodeString( UnicodeString theString )
+{
 	UnsignedShort len = theString.getLength();
 	::fwrite( (const char *)&len, sizeof(UnsignedShort) , 1, m_tmp_file );
-	::fwrite( theString.str(), len*sizeof(WideChar) , 1, m_tmp_file ); 
+	::fwrite( theString.str(), len*sizeof(WideChar) , 1, m_tmp_file );
 }
 
-void DataChunkOutput::writeNameKey( const NameKeyType key ) 
-{ 
+void DataChunkOutput::writeNameKey( const NameKeyType key )
+{
 		AsciiString kname = TheNameKeyGenerator->keyToName(key);
 		Int keyAndType = m_contents.allocateID(kname);
 		keyAndType <<= 8;
@@ -378,8 +370,8 @@ void DataChunkOutput::writeNameKey( const NameKeyType key )
 		writeInt(keyAndType);
 }
 
-void DataChunkOutput::writeDict( const Dict& d ) 
-{ 
+void DataChunkOutput::writeDict( const Dict& d )
+{
 	UnsignedShort len = d.getPairCount();
 	::fwrite( (const char *)&len, sizeof(UnsignedShort) , 1, m_tmp_file );
 	for (int i = 0; i < len; i++)
@@ -421,9 +413,9 @@ void DataChunkOutput::writeDict( const Dict& d )
 // DataChunkTableOfContents
 //----------------------------------------------------------------------
 
-DataChunkTableOfContents::DataChunkTableOfContents( void ) : 
-m_list(NULL), 
-m_nextID(1), 
+DataChunkTableOfContents::DataChunkTableOfContents( void ) :
+m_list(NULL),
+m_nextID(1),
 m_listLength(0),
 m_headerOpened(false)
 {
@@ -454,19 +446,19 @@ Mapping *DataChunkTableOfContents::findMapping( const AsciiString& name )
 }
 
 // convert name to integer identifier
-UnsignedInt DataChunkTableOfContents::getID( const AsciiString& name )		
+UnsignedInt DataChunkTableOfContents::getID( const AsciiString& name )
 {
 	Mapping *m = findMapping( name );
 
 	if (m)
 		return m->id;
 
-	DEBUG_CRASH(("name not found in DataChunkTableOfContents::getName for name %s\n",name.str()));
+	DEBUG_CRASH(("name not found in DataChunkTableOfContents::getName for name %s",name.str()));
 	return 0;
 }
 
 // convert integer identifier to name
-AsciiString DataChunkTableOfContents::getName( UnsignedInt id )	
+AsciiString DataChunkTableOfContents::getName( UnsignedInt id )
 {
 	Mapping *m;
 
@@ -474,7 +466,7 @@ AsciiString DataChunkTableOfContents::getName( UnsignedInt id )
 		if (m->id == id)
 			return m->name;
 
-	DEBUG_CRASH(("name not found in DataChunkTableOfContents::getName for id %d\n",id));
+	DEBUG_CRASH(("name not found in DataChunkTableOfContents::getName for id %d",id));
 	return AsciiString::TheEmptyString;
 }
 
@@ -581,8 +573,8 @@ void DataChunkTableOfContents::read( ChunkInputStream &s)
 //----------------------------------------------------------------------
 // DataChunkInput
 //----------------------------------------------------------------------
-DataChunkInput::DataChunkInput( ChunkInputStream *pStream ) : m_file( pStream ), 
-																										m_userData(NULL), 
+DataChunkInput::DataChunkInput( ChunkInputStream *pStream ) : m_file( pStream ),
+																										m_userData(NULL),
 																										m_currentObject(NULL),
 																										m_chunkStack(NULL),
 																										m_parserList(NULL)
@@ -607,7 +599,7 @@ DataChunkInput::~DataChunkInput()
 }
 
 // register a user parsing function for a given DataChunk label
-void DataChunkInput::registerParser( const AsciiString& label, const AsciiString& parentLabel, 
+void DataChunkInput::registerParser( const AsciiString& label, const AsciiString& parentLabel,
 																		 DataChunkParserPtr parser, void *userData )
 {
 	UserParser *p = newInstance(UserParser);
@@ -633,8 +625,8 @@ Bool DataChunkInput::parse( void *userData )
 	UserParser *parser;
 	Bool scopeOK;
 	DataChunkInfo info;
-	
-	// If the header wasn't a chunk table of contents, we can't parse. 
+
+	// If the header wasn't a chunk table of contents, we can't parse.
 	if (!m_contents.isOpenedForRead()) {
 		return false;
 	}
@@ -645,7 +637,7 @@ Bool DataChunkInput::parse( void *userData )
 
 	while( atEndOfFile() == false )
 	{
-		if (m_chunkStack) { // If we are parsing chunks in a chunk, check current length. 
+		if (m_chunkStack) { // If we are parsing chunks in a chunk, check current length.
 			if (m_chunkStack->dataLeft < CHUNK_HEADER_BYTES) {
 				DEBUG_ASSERTCRASH( m_chunkStack->dataLeft==0, ("Unexpected extra data in chunk."));
 				break;
@@ -666,7 +658,7 @@ Bool DataChunkInput::parse( void *userData )
 				// make sure parent name (scope) also matches
 				scopeOK = true;
 
-				if (parentLabel != parser->parentLabel) 
+				if (parentLabel != parser->parentLabel)
 					scopeOK = false;
 
 				if (scopeOK)
@@ -679,7 +671,7 @@ Bool DataChunkInput::parse( void *userData )
 
 					if (parser->parser( *this, &info, userData ) == false)
 						return false;
-					break; 
+					break;
 				}
 			}
 		}
@@ -725,7 +717,7 @@ AsciiString DataChunkInput::openDataChunk(DataChunkVersionType *ver )
 	c->id = 0;
 	c->version = 0;
 	c->dataSize = 0;
-	//DEBUG_LOG(("Opening data chunk at offset %d (%x)\n", m_file->tell(), m_file->tell()));
+	//DEBUG_LOG(("Opening data chunk at offset %d (%x)", m_file->tell(), m_file->tell()));
 	// read the chunk ID
 	m_file->read( (char *)&c->id, sizeof(UnsignedInt) );
 	decrementDataLeft( sizeof(UnsignedInt) );
@@ -747,14 +739,14 @@ AsciiString DataChunkInput::openDataChunk(DataChunkVersionType *ver )
 	c->next = m_chunkStack;
 	m_chunkStack = c;
 	if (this->atEndOfFile()) {
-		return (AsciiString(""));
+		return AsciiString::TheEmptyString;
 	}
 	return m_contents.getName( c->id );
 }
 
 // close chunk and move to start of next chunk
 void DataChunkInput::closeDataChunk( void )
-{										
+{
 	if (m_chunkStack == NULL)
 	{
 		// TODO: Throw exception
@@ -783,7 +775,7 @@ AsciiString DataChunkInput::getChunkLabel( void )
 	{
 		// TODO: Throw exception
 		DEBUG_CRASH(("Bad."));
-		return AsciiString("");
+		return AsciiString::TheEmptyString;
 	}
 
 	return m_contents.getName( m_chunkStack->id );
@@ -800,7 +792,7 @@ DataChunkVersionType DataChunkInput::getChunkVersion( void )
 	}
 
 	return m_chunkStack->version;
-}		
+}
 
 // return size of data stored in this chunk
 UnsignedInt DataChunkInput::getChunkDataSize( void )
@@ -838,7 +830,7 @@ Bool DataChunkInput::atEndOfChunk( void )
 		return false;
 	}
 
-	return true; 
+	return true;
 }
 
 // update data left in chunk(s)
@@ -856,37 +848,37 @@ void DataChunkInput::decrementDataLeft( Int size )
 	// The sizes of the parent chunks on the stack are adjusted in closeDataChunk.
 }
 
-Real DataChunkInput::readReal(void) 
-{ 
+Real DataChunkInput::readReal(void)
+{
 	Real r;
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=sizeof(Real), ("Read past end of chunk."));
-	m_file->read( (char *)&r, sizeof(Real) ); 
+	m_file->read( (char *)&r, sizeof(Real) );
 	decrementDataLeft( sizeof(Real) );
-	return r; 
+	return r;
 }
 
-Int DataChunkInput::readInt(void) 
-{ 
+Int DataChunkInput::readInt(void)
+{
 	Int i;
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=sizeof(Int), ("Read past end of chunk."));
-	m_file->read( (char *)&i, sizeof(Int) ); 
+	m_file->read( (char *)&i, sizeof(Int) );
 	decrementDataLeft( sizeof(Int) );
-	return i; 
+	return i;
 }
 
-Byte DataChunkInput::readByte(void) 
-{ 
+Byte DataChunkInput::readByte(void)
+{
 	Byte b;
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=sizeof(Byte), ("Read past end of chunk."));
-	m_file->read( (char *)&b, sizeof(Byte) ); 
+	m_file->read( (char *)&b, sizeof(Byte) );
 	decrementDataLeft( sizeof(Byte) );
-	return b; 
+	return b;
 }
 
-void DataChunkInput::readArrayOfBytes(char *ptr, Int len) 
-{ 
+void DataChunkInput::readArrayOfBytes(char *ptr, Int len)
+{
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=len, ("Read past end of chunk."));
-	m_file->read( ptr, len ); 
+	m_file->read( ptr, len );
 	decrementDataLeft( len );
 }
 
@@ -904,9 +896,9 @@ NameKeyType DataChunkInput::readNameKey(void)
 		return k;
 }
 
-Dict DataChunkInput::readDict() 
-{ 
-	UnsignedShort len;	
+Dict DataChunkInput::readDict()
+{
+	UnsignedShort len;
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=sizeof(UnsignedShort), ("Read past end of chunk."));
 	m_file->read( &len, sizeof(UnsignedShort) );
 	decrementDataLeft( sizeof(UnsignedShort) );
@@ -949,9 +941,9 @@ Dict DataChunkInput::readDict()
 	return d;
 }
 
-AsciiString DataChunkInput::readAsciiString(void) 
-{ 
-	UnsignedShort len;	
+AsciiString DataChunkInput::readAsciiString(void)
+{
+	UnsignedShort len;
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=sizeof(UnsignedShort), ("Read past end of chunk."));
 	m_file->read( &len, sizeof(UnsignedShort) );
 	decrementDataLeft( sizeof(UnsignedShort) );
@@ -965,12 +957,12 @@ AsciiString DataChunkInput::readAsciiString(void)
 		str[len] = '\000';
 	}
 
-	return theString; 
+	return theString;
 }
 
-UnicodeString DataChunkInput::readUnicodeString(void) 
-{ 
-	UnsignedShort len;	
+UnicodeString DataChunkInput::readUnicodeString(void)
+{
+	UnsignedShort len;
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=sizeof(UnsignedShort), ("Read past end of chunk."));
 	m_file->read( &len, sizeof(UnsignedShort) );
 	decrementDataLeft( sizeof(UnsignedShort) );
@@ -984,5 +976,5 @@ UnicodeString DataChunkInput::readUnicodeString(void)
 		str[len] = '\000';
 	}
 
-	return theString; 
+	return theString;
 }
diff --git a/Generals/Code/GameEngine/Source/Common/System/Debug.cpp b/Generals/Code/GameEngine/Source/Common/System/Debug.cpp
deleted file mode 100644
index 46f23d4946f..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/Debug.cpp
+++ /dev/null
@@ -1,823 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Debug.cpp 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: Debug.cpp
-//
-// Created:   Steven Johnson, August 2001
-//
-// Desc:      Debug logging and other debug utilities
-//
-// ----------------------------------------------------------------------------
-
-// SYSTEM INCLUDES 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-
-// USER INCLUDES
-
-// TheSuperHackers @feature helmutbuhler 04/10/2025
-// Uncomment this to show normal logging stuff in the crc logging.
-// This can be helpful for context, but can also clutter diffs because normal logs aren't necessarily
-// deterministic or the same on all peers in multiplayer games.
-//#define INCLUDE_DEBUG_LOG_IN_CRC_LOG
-
-#define DEBUG_THREADSAFE
-#ifdef DEBUG_THREADSAFE
-#include "Common/CriticalSection.h"
-#endif
-#include "Common/Debug.h"
-#include "Common/CRCDebug.h"
-#include "Common/Registry.h"
-#include "Common/SystemInfo.h"
-#include "Common/UnicodeString.h"
-#include "GameClient/ClientInstance.h"
-#include "GameClient/GameText.h"
-#include "GameClient/Keyboard.h"
-#include "GameClient/Mouse.h"
-#include "Common/StackDump.h"
-
-// Horrible reference, but we really, really need to know if we are windowed.
-extern bool DX8Wrapper_IsWindowed;
-extern HWND ApplicationHWnd;
-
-extern const char *gAppPrefix; /// So WB can have a different log file name.
-
-#ifdef RTS_INTERNAL
-// this should ALWAYS be present
-#pragma optimize("", off)
-#endif
-
-// ----------------------------------------------------------------------------
-// DEFINES 
-// ----------------------------------------------------------------------------
-
-#ifdef DEBUG_LOGGING
-
-#if defined(RTS_INTERNAL)
-	#define DEBUG_FILE_NAME				"DebugLogFileI"
-	#define DEBUG_FILE_NAME_PREV	"DebugLogFilePrevI"
-#elif defined(RTS_DEBUG)
-	#define DEBUG_FILE_NAME				"DebugLogFileD"
-	#define DEBUG_FILE_NAME_PREV	"DebugLogFilePrevD"
-#else
-	#define DEBUG_FILE_NAME				"DebugLogFile"
-	#define DEBUG_FILE_NAME_PREV	"DebugLogFilePrev"
-#endif
-
-#endif
-
-// ----------------------------------------------------------------------------
-// PRIVATE TYPES 
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// PRIVATE DATA 
-// ----------------------------------------------------------------------------
-// TheSuperHackers @info Must not use static RAII types when set in DebugInit,
-// because DebugInit can be called during static module initialization before the main function is called.
-#ifdef DEBUG_LOGGING
-static FILE *theLogFile = NULL;
-static char theLogFileName[ _MAX_PATH ];
-static char theLogFileNamePrev[ _MAX_PATH ];
-#endif
-#define LARGE_BUFFER	8192
-static char theBuffer[ LARGE_BUFFER ];	// make it big to avoid weird overflow bugs in debug mode
-static int theDebugFlags = 0;
-static DWORD theMainThreadID = 0;
-// ----------------------------------------------------------------------------
-// PUBLIC DATA 
-// ----------------------------------------------------------------------------
-
-char* TheCurrentIgnoreCrashPtr = NULL;
-#ifdef DEBUG_LOGGING
-UnsignedInt DebugLevelMask = 0;
-const char *TheDebugLevels[DEBUG_LEVEL_MAX] = {
-	"NET"
-};
-#endif
-
-// ----------------------------------------------------------------------------
-// PRIVATE PROTOTYPES 
-// ----------------------------------------------------------------------------
-static const char *getCurrentTimeString(void);
-static const char *getCurrentTickString(void);
-static const char *prepBuffer(const char* format, char *buffer);
-#ifdef DEBUG_LOGGING
-static void doLogOutput(const char *buffer);
-#endif
-#ifdef DEBUG_CRASHING
-static int doCrashBox(const char *buffer, Bool logResult);
-#endif
-static void whackFunnyCharacters(char *buf);
-#ifdef DEBUG_STACKTRACE
-static void doStackDump();
-#endif
-
-// ----------------------------------------------------------------------------
-// PRIVATE FUNCTIONS 
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-inline Bool ignoringAsserts()
-{
-#ifdef DEBUG_CRASHING
-	return !DX8Wrapper_IsWindowed || (TheGlobalData&&TheGlobalData->m_debugIgnoreAsserts);
-#else
-	return !DX8Wrapper_IsWindowed;
-#endif
-}
-
-// ----------------------------------------------------------------------------
-inline HWND getThreadHWND()
-{
-	return (theMainThreadID == GetCurrentThreadId())?ApplicationHWnd:NULL;
-}
-
-// ----------------------------------------------------------------------------
-
-int MessageBoxWrapper( LPCSTR lpText, LPCSTR lpCaption, UINT uType )
-{
-	HWND threadHWND = getThreadHWND();
-	if (!threadHWND)
-		return (uType & MB_ABORTRETRYIGNORE)?IDIGNORE:IDYES;
-
-	return ::MessageBox(threadHWND, lpText, lpCaption, uType);
-}
-
-// ----------------------------------------------------------------------------
-// getCurrentTimeString 
-/** 
-	Return the current time in string form
-*/
-// ----------------------------------------------------------------------------
-static const char *getCurrentTimeString(void)
-{
-	time_t aclock;
-	time(&aclock);
-	struct tm *newtime = localtime(&aclock);
-	return asctime(newtime);
-}
-
-// ----------------------------------------------------------------------------
-// getCurrentTickString 
-/** 
-	Return the current TickCount in string form
-*/
-// ----------------------------------------------------------------------------
-static const char *getCurrentTickString(void)
-{
-	static char TheTickString[32];
-	sprintf(TheTickString, "(T=%08lx)",::GetTickCount());
-	return TheTickString;
-}
-
-// ----------------------------------------------------------------------------
-// prepBuffer
-// zap the buffer and optionally prepend the tick time.
-// ----------------------------------------------------------------------------
-/**
-	Empty the buffer passed in, then optionally prepend the current TickCount
-	value in string form, depending on the setting of theDebugFlags.
-*/
-static const char *prepBuffer(const char* format, char *buffer)
-{
-	buffer[0] = 0;
-#ifdef ALLOW_DEBUG_UTILS
-	if (theDebugFlags & DEBUG_FLAG_PREPEND_TIME)
-	{
-		strcpy(buffer, getCurrentTickString());
-		strcat(buffer, " ");
-	}
-#endif
-	return format;
-}
-
-// ----------------------------------------------------------------------------
-// doLogOutput
-/** 
-	send a string directly to the log file and/or console without further processing.
-*/
-// ----------------------------------------------------------------------------
-#ifdef DEBUG_LOGGING
-static void doLogOutput(const char *buffer)
-{
-	// log message to file
-	if (theDebugFlags & DEBUG_FLAG_LOG_TO_FILE)
-	{
-		if (theLogFile)
-		{
-			fprintf(theLogFile, "%s", buffer);	// note, no \n (should be there already)
-			fflush(theLogFile);
-		}
-	}
-
-	// log message to dev studio output window
-	if (theDebugFlags & DEBUG_FLAG_LOG_TO_CONSOLE)
-	{
-		::OutputDebugString(buffer);
-	}
-
-#ifdef INCLUDE_DEBUG_LOG_IN_CRC_LOG
-	addCRCDebugLineNoCounter("%s", buffer);
-#endif
-}
-#endif
-
-// ----------------------------------------------------------------------------
-// doCrashBox
-/*
-	present a messagebox with the given message. Depending on user selection,
-	we exit the app, break into debugger, or continue execution. 
-*/
-// ----------------------------------------------------------------------------
-#ifdef DEBUG_CRASHING
-static int doCrashBox(const char *buffer, Bool logResult)
-{
-	int result;
-
-	if (!ignoringAsserts()) {
-		//result = MessageBoxWrapper(buffer, "Assertion Failure", MB_ABORTRETRYIGNORE|MB_TASKMODAL|MB_ICONWARNING|MB_DEFBUTTON3);
-		result = MessageBoxWrapper(buffer, "Assertion Failure", MB_ABORTRETRYIGNORE|MB_TASKMODAL|MB_ICONWARNING);
-	}	else {
-		result = IDIGNORE;
-	}
-
-	switch(result)
-	{
-		case IDABORT:
-#ifdef DEBUG_LOGGING
-			if (logResult)
-				DebugLog("[Abort]\n");
-#endif
-			_exit(1);
-			break;
-		case IDRETRY:
-#ifdef DEBUG_LOGGING
-			if (logResult)
-				DebugLog("[Retry]\n");
-#endif
-			::DebugBreak();
-			break;
-		case IDIGNORE:
-#ifdef DEBUG_LOGGING
-			// do nothing, just keep going
-			if (logResult)
-				DebugLog("[Ignore]\n");
-#endif
-			break;
-	}
-	return result;
-}
-#endif
-
-#ifdef DEBUG_STACKTRACE
-// ----------------------------------------------------------------------------
-/**
-	Dumps a stack trace (from the current PC) to logfile and/or console.
-*/
-static void doStackDump()
-{
-	const int STACKTRACE_SIZE	= 24;
-	const int STACKTRACE_SKIP = 2;
-	void* stacktrace[STACKTRACE_SIZE];
-
-	doLogOutput("\nStack Dump:\n");
-	::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);
-	::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, doLogOutput);
-}
-#endif
-
-// ----------------------------------------------------------------------------
-// whackFunnyCharacters 
-/** 
-	Eliminates any undesirable nonprinting characters, aside from newline,
-	replacing them with spaces.
-*/
-// ----------------------------------------------------------------------------
-static void whackFunnyCharacters(char *buf)
-{
-	for (char *p = buf + strlen(buf) - 1; p >= buf; --p)
-	{
-		// ok, these are naughty magic numbers, but I'm guessing you know ASCII.... 
-		if (*p >= 0 && *p < 32 && *p != 10 && *p != 13)
-			*p = 32;
-	}
-}
-
-// ----------------------------------------------------------------------------
-// PUBLIC FUNCTIONS 
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// DebugInit 
-// ----------------------------------------------------------------------------
-#ifdef ALLOW_DEBUG_UTILS
-/**
-	Initialize the debug utilities. This should be called once, as near to the 
-	start of the app as possible, before anything else (since other code will
-	probably want to make use of it).
-*/
-void DebugInit(int flags)
-{
-//	if (theDebugFlags != 0)
-//		::MessageBox(NULL, "Debug already inited", "", MB_OK|MB_APPLMODAL);
-
-	// just quietly allow multiple calls to this, so that static ctors can call it.
-	if (theDebugFlags == 0 && strcmp(gAppPrefix, "wb_") != 0) 
-	{
-		theDebugFlags = flags;
-
-		theMainThreadID = GetCurrentThreadId();
-
-	#ifdef DEBUG_LOGGING
-
-		// TheSuperHackers @info Debug initialization can happen very early.
-		// Therefore, initialize the client instance now.
-		if (!rts::ClientInstance::initialize())
-			return;
-
-		char dirbuf[ _MAX_PATH ];
-		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
-		char *pEnd = dirbuf + strlen( dirbuf );
-		while( pEnd != dirbuf ) 
-		{
-			if( *pEnd == '\\' ) 
-			{
-				*(pEnd + 1) = 0;
-				break;
-			}
-			pEnd--;
-		}
-
-		strcpy(theLogFileNamePrev, dirbuf);
-		strcat(theLogFileNamePrev, gAppPrefix);
-		strcat(theLogFileNamePrev, DEBUG_FILE_NAME_PREV);
-		if (rts::ClientInstance::getInstanceId() > 1u)
-			sprintf(theLogFileNamePrev + strlen(theLogFileNamePrev), "_Instance%.2u", rts::ClientInstance::getInstanceId());
-		strcat(theLogFileNamePrev, ".txt");
-
-		strcpy(theLogFileName, dirbuf);
-		strcat(theLogFileName, gAppPrefix);
-		strcat(theLogFileName, DEBUG_FILE_NAME);
-		if (rts::ClientInstance::getInstanceId() > 1u)
-			sprintf(theLogFileName + strlen(theLogFileName), "_Instance%.2u", rts::ClientInstance::getInstanceId());
-		strcat(theLogFileName, ".txt");
-
-		remove(theLogFileNamePrev);
-		rename(theLogFileName, theLogFileNamePrev);
-		theLogFile = fopen(theLogFileName, "w");
-		if (theLogFile != NULL)
-		{
-			DebugLog("Log %s opened: %s\n", theLogFileName, getCurrentTimeString());
-		} 
-	#endif
-	}
-
-}  
-#endif
-
-// ----------------------------------------------------------------------------
-// DebugLog 
-// ----------------------------------------------------------------------------
-#ifdef DEBUG_LOGGING
-/**
-	Print a character string to the logfile and/or console.
-*/
-void DebugLog(const char *format, ...)
-{
-#ifdef DEBUG_THREADSAFE
-	ScopedCriticalSection scopedCriticalSection(TheDebugLogCriticalSection);
-#endif
-
-	if (theDebugFlags == 0)
-		MessageBoxWrapper("DebugLog - Debug not inited properly", "", MB_OK|MB_TASKMODAL);
-
-	format = prepBuffer(format, theBuffer);
-
-	va_list arg;
-  va_start(arg, format);
-  vsprintf(theBuffer + strlen(theBuffer), format, arg);
-  va_end(arg);
-
-	if (strlen(theBuffer) >= sizeof(theBuffer))
-		MessageBoxWrapper("String too long for debug buffer", "", MB_OK|MB_TASKMODAL);
-
-	whackFunnyCharacters(theBuffer);
-	doLogOutput(theBuffer);
-} 
-
-const char* DebugGetLogFileName()
-{
-	return theLogFileName;
-}
-
-const char* DebugGetLogFileNamePrev()
-{
-	return theLogFileNamePrev;
-}
-
-#endif
-
-// ----------------------------------------------------------------------------
-// DebugCrash
-// ----------------------------------------------------------------------------
-#ifdef DEBUG_CRASHING
-/**
-	Print a character string to the logfile and/or console, then halt execution
-	while presenting the user with an exit/debug/ignore dialog containing the same
-	text message.
-*/
-void DebugCrash(const char *format, ...)
-{
-	// Note: You might want to make this thread safe, but we cannot. The reason is that 
-	// there is an implicit requirement on other threads that the message loop be running.
-
-	// make it not static so that it'll be thread-safe.
-	// make it big to avoid weird overflow bugs in debug mode
-	char theCrashBuffer[ LARGE_BUFFER ];	
-	if (theDebugFlags == 0)
-	{
-		if (!DX8Wrapper_IsWindowed) {
-			if (ApplicationHWnd) {
-				ShowWindow(ApplicationHWnd, SW_HIDE);
-			}
-		}
-		MessageBoxWrapper("DebugCrash - Debug not inited properly", "", MB_OK|MB_TASKMODAL);
-	}
-
-	format = prepBuffer(format, theCrashBuffer);
-	strcat(theCrashBuffer, "ASSERTION FAILURE: ");
-
-	va_list arg;
-  va_start(arg, format);
-  vsprintf(theCrashBuffer + strlen(theCrashBuffer), format, arg);
-  va_end(arg);
-
-	if (strlen(theCrashBuffer) >= sizeof(theCrashBuffer))
-	{
-		if (!DX8Wrapper_IsWindowed) {
-			if (ApplicationHWnd) {
-				ShowWindow(ApplicationHWnd, SW_HIDE);
-			}
-		}
-		MessageBoxWrapper("String too long for debug buffers", "", MB_OK|MB_TASKMODAL);
-	}
-
-#ifdef DEBUG_LOGGING
-	if (ignoringAsserts()) 
-	{
-		doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!\n");
-	}
-	whackFunnyCharacters(theCrashBuffer);
-	doLogOutput(theCrashBuffer);
-#endif
-#ifdef DEBUG_STACKTRACE
-	if (!(TheGlobalData && TheGlobalData->m_debugIgnoreStackTrace))
-	{
-		doStackDump();
-	}
-#endif
-
-	strcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue\n");
-
-	int result = doCrashBox(theCrashBuffer, true);
-
-	if (result == IDIGNORE && TheCurrentIgnoreCrashPtr != NULL) 
-	{
-		int yn;
-		if (!ignoringAsserts()) 
-		{
-			yn = MessageBoxWrapper("Ignore this crash from now on?", "", MB_YESNO|MB_TASKMODAL);
-		}	
-		else 
-		{
-			yn = IDYES;
-		}
-		if (yn == IDYES)
-			*TheCurrentIgnoreCrashPtr = 1;
-		if( TheKeyboard )
-			TheKeyboard->resetKeys();
-		if( TheMouse )
-			TheMouse->reset();
-	}
-
-}  
-#endif
-
-// ----------------------------------------------------------------------------
-// DebugShutdown 
-// ----------------------------------------------------------------------------
-#ifdef ALLOW_DEBUG_UTILS
-/**
-	Shut down the debug utilities. This should be called once, as near to the 
-	end of the app as possible, after everything else (since other code will
-	probably want to make use of it).
-*/
-void DebugShutdown()
-{
-#ifdef DEBUG_LOGGING
-	if (theLogFile)
-	{
-		DebugLog("Log closed: %s\n", getCurrentTimeString());
-		fclose(theLogFile);
-	}
-	theLogFile = NULL;
-#endif
-	theDebugFlags = 0;
-}  
-
-// ----------------------------------------------------------------------------
-// DebugGetFlags 
-// ----------------------------------------------------------------------------
-/**
-	Get the current values for the flags passed to DebugInit. Most code will never
-	need to use this; the most common usage would be to temporarily enable or disable
-	the DEBUG_FLAG_PREPEND_TIME bit for complex logfile messages.
-*/
-int DebugGetFlags()
-{
-	return theDebugFlags;
-}
-
-// ----------------------------------------------------------------------------
-// DebugSetFlags 
-// ----------------------------------------------------------------------------
-/**
-	Set the current values for the flags passed to DebugInit. Most code will never
-	need to use this; the most common usage would be to temporarily enable or disable
-	the DEBUG_FLAG_PREPEND_TIME bit for complex logfile messages.
-*/
-void DebugSetFlags(int flags)
-{
-	theDebugFlags = flags;
-}
-
-#endif	// ALLOW_DEBUG_UTILS
-
-#ifdef DEBUG_PROFILE
-// ----------------------------------------------------------------------------
-SimpleProfiler::SimpleProfiler()
-{
-	QueryPerformanceFrequency((LARGE_INTEGER*)&m_freq);
-	m_startThisSession = 0;
-	m_totalThisSession = 0;
-	m_totalAllSessions = 0;
-	m_numSessions = 0;
-}
-
-// ----------------------------------------------------------------------------
-void SimpleProfiler::start()
-{
-	DEBUG_ASSERTCRASH(m_startThisSession == 0, ("already started"));
-	QueryPerformanceCounter((LARGE_INTEGER*)&m_startThisSession);
-}
-
-// ----------------------------------------------------------------------------
-void SimpleProfiler::stop()
-{
-	if (m_startThisSession != 0) 
-	{
-		__int64 stop;
-		QueryPerformanceCounter((LARGE_INTEGER*)&stop);
-		m_totalThisSession = stop - m_startThisSession;
-		m_totalAllSessions += stop - m_startThisSession;
-		m_startThisSession = 0;
-		++m_numSessions;
-	}
-}
-
-// ----------------------------------------------------------------------------
-void SimpleProfiler::stopAndLog(const char *msg, int howOftenToLog, int howOftenToResetAvg)
-{
-	stop();
-	// howOftenToResetAvg==0 means "never reset"
-	if (howOftenToResetAvg > 0 && m_numSessions >= howOftenToResetAvg)
-	{
-		m_numSessions = 0;
-		m_totalAllSessions = 0;
-		DEBUG_LOG(("%s: reset averages\n",msg));
-	}
-	DEBUG_ASSERTLOG(m_numSessions % howOftenToLog != 0, ("%s: %f msec, total %f msec, avg %f msec\n",msg,getTime(),getTotalTime(),getAverageTime()));
-}
-
-// ----------------------------------------------------------------------------
-double SimpleProfiler::getTime()
-{
-	stop();
-	return (double)m_totalThisSession / (double)m_freq * 1000.0;
-}
-
-// ----------------------------------------------------------------------------
-int SimpleProfiler::getNumSessions()
-{
-	stop();
-	return m_numSessions;
-}
-
-// ----------------------------------------------------------------------------
-double SimpleProfiler::getTotalTime()
-{
-	stop();
-	if (!m_numSessions)
-		return 0.0;
-
-	return (double)m_totalAllSessions * 1000.0 / ((double)m_freq);
-}
-
-// ----------------------------------------------------------------------------
-double SimpleProfiler::getAverageTime()
-{
-	stop();
-	if (!m_numSessions)
-		return 0.0;
-
-	return (double)m_totalAllSessions * 1000.0 / ((double)m_freq * (double)m_numSessions);
-}
-
-#endif	// DEBUG_PROFILE
-
-// ----------------------------------------------------------------------------
-// ReleaseCrash
-// ----------------------------------------------------------------------------
-/**
-	Halt the application, EVEN IN FINAL RELEASE BUILDS. This should be called
-	only when a crash is guaranteed by continuing, and no meaningful continuation
-	of processing is possible, even by throwing an exception.
-*/
-
-	#define RELEASECRASH_FILE_NAME				"ReleaseCrashInfo.txt"
-	#define RELEASECRASH_FILE_NAME_PREV		"ReleaseCrashInfoPrev.txt"
-
-	static FILE *theReleaseCrashLogFile = NULL;
-
-	static void releaseCrashLogOutput(const char *buffer)
-	{
-		if (theReleaseCrashLogFile)
-		{
-			fprintf(theReleaseCrashLogFile, "%s", buffer);	// note, no \n (should be there already)
-			fflush(theReleaseCrashLogFile);
-		}
-	}
-
-void ReleaseCrash(const char *reason)
-{
-	/// do additional reporting on the crash, if possible
-
-
-	char prevbuf[ _MAX_PATH ];
-	char curbuf[ _MAX_PATH ];
-
-	if (TheGlobalData==NULL) {
-		return; // We are shutting down, and TheGlobalData has been freed.  jba. [4/15/2003]
-	}
-
-	strcpy(prevbuf, TheGlobalData->getPath_UserData().str());
-	strcat(prevbuf, RELEASECRASH_FILE_NAME_PREV);
-	strcpy(curbuf, TheGlobalData->getPath_UserData().str());
-	strcat(curbuf, RELEASECRASH_FILE_NAME);
-
- 	remove(prevbuf);
-	rename(curbuf, prevbuf);
-
-	theReleaseCrashLogFile = fopen(curbuf, "w");
-	if (theReleaseCrashLogFile)
-	{
-		fprintf(theReleaseCrashLogFile, "Release Crash at %s; Reason %s\n", getCurrentTimeString(), reason);
-		fprintf(theReleaseCrashLogFile, "\nLast error:\n%s\n\nCurrent stack:\n", g_LastErrorDump.str());
-		const int STACKTRACE_SIZE	= 12;
-		const int STACKTRACE_SKIP = 6;
-		void* stacktrace[STACKTRACE_SIZE];
-		::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);
-		::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, releaseCrashLogOutput);
-
-		fflush(theReleaseCrashLogFile);
-		fclose(theReleaseCrashLogFile);
-		theReleaseCrashLogFile = NULL;
-	}
-
-	if (!DX8Wrapper_IsWindowed) {
-		if (ApplicationHWnd) {
-			ShowWindow(ApplicationHWnd, SW_HIDE);
-		}
-	}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	/* static */ char buff[8192]; // not so static so we can be threadsafe
-	snprintf(buff, 8192, "Sorry, a serious error occurred. (%s)", reason);
-	::MessageBox(NULL, buff, "Technical Difficulties...", MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
-#else
-// crash error messaged changed 3/6/03 BGC
-//	::MessageBox(NULL, "Sorry, a serious error occurred.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
-
-	if (!GetRegistryLanguage().compareNoCase("german2") || !GetRegistryLanguage().compareNoCase("german") )
-	{
-		::MessageBox(NULL, "Es ist ein gravierender Fehler aufgetreten. Solche Fehler k\366nnen durch viele verschiedene Dinge wie Viren, \374berhitzte Hardware und Hardware, die den Mindestanforderungen des Spiels nicht entspricht, ausgel\366st werden. Tipps zur Vorgehensweise findest du in den Foren unter www.generals.ea.com, Informationen zum Technischen Kundendienst im Handbuch zum Spiel.", "Fehler...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
-	} 
-	else
-	{
-		::MessageBox(NULL, "You have encountered a serious error.  Serious errors can be caused by many things including viruses, overheated hardware and hardware that does not meet the minimum specifications for the game. Please visit the forums at www.generals.ea.com for suggested courses of action or consult your manual for Technical Support contact information.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
-	}
-
-#endif
-
-	_exit(1);
-}  
-
-void ReleaseCrashLocalized(const AsciiString& p, const AsciiString& m)
-{
-	if (!TheGameText) {
-		ReleaseCrash(m.str());
-		// This won't ever return
-		return;
-	}
-
-	UnicodeString prompt = TheGameText->fetch(p);
-	UnicodeString mesg = TheGameText->fetch(m);
-
-
-	/// do additional reporting on the crash, if possible
-
-	if (!DX8Wrapper_IsWindowed) {
-		if (ApplicationHWnd) {
-			ShowWindow(ApplicationHWnd, SW_HIDE);
-		}
-	}
-
-	if (TheSystemIsUnicode) 
-	{
-		::MessageBoxW(NULL, mesg.str(), prompt.str(), MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
-	} 
-	else 
-	{
-		// However, if we're using the default version of the message box, we need to 
-		// translate the string into an AsciiString
-		AsciiString promptA, mesgA;
-		promptA.translate(prompt);
-		mesgA.translate(mesg);
-		//Make sure main window is not TOP_MOST
-		::SetWindowPos(ApplicationHWnd, HWND_NOTOPMOST, 0, 0, 0, 0,SWP_NOSIZE |SWP_NOMOVE);
-		::MessageBoxA(NULL, mesgA.str(), promptA.str(), MB_OK|MB_TASKMODAL|MB_ICONERROR);
-	}
-
-	char prevbuf[ _MAX_PATH ];
-	char curbuf[ _MAX_PATH ];
-
-	strcpy(prevbuf, TheGlobalData->getPath_UserData().str());
-	strcat(prevbuf, RELEASECRASH_FILE_NAME_PREV);
-	strcpy(curbuf, TheGlobalData->getPath_UserData().str());
-	strcat(curbuf, RELEASECRASH_FILE_NAME);
-
- 	remove(prevbuf);
-	rename(curbuf, prevbuf);
-
-	theReleaseCrashLogFile = fopen(curbuf, "w");
-	if (theReleaseCrashLogFile)
-	{
-		fprintf(theReleaseCrashLogFile, "Release Crash at %s; Reason %ls\n", getCurrentTimeString(), mesg.str());
-
-		const int STACKTRACE_SIZE	= 12;
-		const int STACKTRACE_SKIP = 6;
-		void* stacktrace[STACKTRACE_SIZE];
-		::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);
-		::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, releaseCrashLogOutput);
-
-		fflush(theReleaseCrashLogFile);
-		fclose(theReleaseCrashLogFile);
-		theReleaseCrashLogFile = NULL;
-	}
-
-	_exit(1);
-}
diff --git a/Generals/Code/GameEngine/Source/Common/System/Directory.cpp b/Generals/Code/GameEngine/Source/Common/System/Directory.cpp
index 04f133a1dff..7dfb7c1e943 100644
--- a/Generals/Code/GameEngine/Source/Common/System/Directory.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/Directory.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #if (0)
 
 #include "Common/Directory.h"
@@ -53,7 +53,7 @@ void FileInfo::set( const WIN32_FIND_DATA& info )
 	modTime = FileTimeToTimet(info.ftLastWriteTime);
 	attributes = info.dwFileAttributes;
 	filesize = info.nFileSizeLow;
-	//DEBUG_LOG(("FileInfo::set(): fname=%s, size=%d\n", filename.str(), filesize));
+	//DEBUG_LOG(("FileInfo::set(): fname=%s, size=%d", filename.str(), filesize));
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -67,7 +67,7 @@ Directory::Directory( const AsciiString& dirPath ) : m_dirPath(dirPath)
 	// sanity
 	if( m_dirPath.isEmpty() )
 	{
-		DEBUG_LOG(( "Empty dirname\n"));
+		DEBUG_LOG(( "Empty dirname"));
 		return;
 	}
 
@@ -77,7 +77,7 @@ Directory::Directory( const AsciiString& dirPath ) : m_dirPath(dirPath)
 	// switch into the directory provided
 	if( SetCurrentDirectory( m_dirPath.str() ) == 0 )
 	{
-		DEBUG_LOG(( "Can't set directory '%s'\n", m_dirPath.str() ));
+		DEBUG_LOG(( "Can't set directory '%s'", m_dirPath.str() ));
 		return;
 	}
 
@@ -86,7 +86,7 @@ Directory::Directory( const AsciiString& dirPath ) : m_dirPath(dirPath)
 	hFile = FindFirstFile( "*", &item);
 	if( hFile == INVALID_HANDLE_VALUE )
 	{
-		DEBUG_LOG(( "Can't search directory '%s'\n", m_dirPath.str() ));
+		DEBUG_LOG(( "Can't search directory '%s'", m_dirPath.str() ));
 		done = true;
 	}
 
@@ -97,7 +97,7 @@ Directory::Directory( const AsciiString& dirPath ) : m_dirPath(dirPath)
 		// if this is a subdirectory keep the name around till the end
 		if( BitIsSet( item.dwFileAttributes, FILE_ATTRIBUTE_DIRECTORY ) )
 		{
-			if ( strcmp( item.cFileName, "." ) && strcmp( item.cFileName, ".." ) )
+			if ( strcmp( item.cFileName, "." ) != 0 && strcmp( item.cFileName, ".." ) != 0 )
 			{
 				info.set(item);
 				m_subdirs.insert( info );
@@ -132,4 +132,4 @@ FileInfoSet* Directory::getSubdirs( void )
 	return &m_subdirs;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Generals/Code/GameEngine/Source/Common/System/DisabledTypes.cpp b/Generals/Code/GameEngine/Source/Common/System/DisabledTypes.cpp
index 36a786a0344..7bc538d7cdb 100644
--- a/Generals/Code/GameEngine/Source/Common/System/DisabledTypes.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/DisabledTypes.cpp
@@ -30,7 +30,8 @@
 #include "Common/DisabledTypes.h"
 #include "Common/BitFlagsIO.h"
 
-const char* DisabledMaskType::s_bitNameList[] = 
+template<>
+const char* const DisabledMaskType::s_bitNameList[] =
 {
 	"DEFAULT",
 	"DISABLED_HACKED",
@@ -40,12 +41,13 @@ const char* DisabledMaskType::s_bitNameList[] =
 	"DISABLED_UNMANNED",
 	"DISABLED_UNDERPOWERED",
 	"DISABLED_FREEFALL",
-	
+
 	"DISABLED_SCRIPT_DISABLED",
 	"DISABLED_SCRIPT_UNDERPOWERED",
 
 	NULL
 };
+static_assert(ARRAY_SIZE(DisabledMaskType::s_bitNameList) == DisabledMaskType::NumBits + 1, "Incorrect array size");
 
 DisabledMaskType DISABLEDMASK_NONE;	// inits to all zeroes
 DisabledMaskType DISABLEDMASK_ALL;
diff --git a/Generals/Code/GameEngine/Source/Common/System/File.cpp b/Generals/Code/GameEngine/Source/Common/System/File.cpp
deleted file mode 100644
index e8ba3441ce4..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/File.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   WSYS Library
-//
-// Module:    IO_
-//
-// File name: IO_File.cpp
-//
-// Created:   4/23/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-
-#include <assert.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-
-#include "Common/file.h"
-
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-//=================================================================
-// File::File
-//=================================================================
-
-File::File()
-:	m_open(FALSE),
-	m_deleteOnClose(FALSE),
-	m_access(NONE)
-{
-
-	setName("<no file>");
-
-}
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//=================================================================
-// File::~File	
-//=================================================================
-
-File::~File()
-{
-	close();
-}
-
-//=================================================================
-// File::open	
-//=================================================================
-/**
-  * Any derived open() members must first call File::open. If File::open
-	* succeeds but the derived class's open failes then make sure to call
-	* File::close() before returning.
-	*/
-//=================================================================
-
-Bool File::open( const Char *filename, Int access )
-{
-	if( m_open )
-	{
-		return FALSE;
-	}
-
-	setName( filename );
-
-	if( (access & ( STREAMING | WRITE )) == ( STREAMING | WRITE ))
-	{
-		// illegal access
-		return FALSE;
-	}
-
-	if( (access & ( TEXT | BINARY)) == ( TEXT | BINARY ))
-	{
-		// illegal access
-		return FALSE;
-	}
-
-	if ( (access & (READ|WRITE)) == 0 )
-	{
-		access |= READ;
-	}
-
-	if ( !(access & (READ|APPEND)) )
-	{
-		access |= TRUNCATE;
-	}
-
-	if ( (access & (TEXT|BINARY)) == 0 )
-	{
-		access |= BINARY;
-	}
-
-	m_access = access;
-	m_open = TRUE;
-	return TRUE;
-}
-
-//=================================================================
-// File::close 	
-//=================================================================
-/**
-  * Must call File::close() for each successful File::open() call.
-	*/
-//=================================================================
-
-void File::close( void )
-{
-	if( m_open )
-	{
-		setName( "<no file>" );
-		m_open = FALSE;
-		if ( m_deleteOnClose )
-		{
-			deleteInstance(this); // on special cases File object will delete itself when closing
-		}
-	}
-}
-
-//=================================================================
-// File::size 
-//=================================================================
-/**
-  * Default implementation of File::size. Derived classes can optimize
-	* this member function.
-	*/
-//=================================================================
-
-Int File::size( void )
-{
-	Int pos = seek( 0, CURRENT );
-	Int size = seek( 0, END );
-
-	seek( pos, START );
-
-	return size < 0 ? 0 : size;
-}
-
-//============================================================================
-// File::position
-//============================================================================
-
-Int File::position( void )
-{
-	return seek(0, CURRENT);
-}
-
-//============================================================================
-// File::print
-//============================================================================
-
-Bool	File::print ( const Char *format, ...)
-{
-	Char buffer[10*1024];
-	Int len;
-
-	if ( ! (m_access & TEXT ) )
-	{
-		return FALSE;
-	}
-
-	va_list args;
-	va_start( args, format );     /* Initialize variable arguments. */
-	len = vsprintf( buffer, format, args );
-	va_end( args );
-
-	if ( len >= sizeof(buffer) )
-	{
-		// Big Problem
-		assert( FALSE );
-		return FALSE;
-	}
-
-	return (write ( buffer, len ) == len);
-}
-
-Bool	File::eof() {
-	return (position() == size());
-}
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Source/Common/System/FileSystem.cpp b/Generals/Code/GameEngine/Source/Common/System/FileSystem.cpp
deleted file mode 100644
index 2a3d17e3444..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/FileSystem.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   WSYS Library
-//
-// Module:    IO
-//
-// File name: IO_FileSystem.cpp
-//
-// Created:   4/23/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-#include "Common/file.h"
-#include "Common/FileSystem.h"
-
-#include "Common/ArchiveFileSystem.h"
-#include "Common/CDManager.h"
-#include "Common/GameAudio.h"
-#include "Common/LocalFileSystem.h"
-#include "Common/PerfTimer.h"
-
-
-DECLARE_PERF_TIMER(FileSystem)
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-//===============================
-// TheFileSystem 
-//===============================
-/**
-  *	This is the FileSystem's singleton class. All file access 
-	* should be through TheFileSystem, unless code needs to use an explicit
-	* File or FileSystem derivative.
-	*
-	* Using TheFileSystem->open and File exclusively for file access, particularly
-	* in library or modular code, allows applications to transparently implement 
-	* file access as they see fit. This is particularly important for code that
-	* needs to be shared between applications, such as games and tools.
-	*/
-//===============================
-
-FileSystem	*TheFileSystem = NULL;
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//============================================================================
-// FileSystem::FileSystem
-//============================================================================
-
-FileSystem::FileSystem()
-{
-
-}
-
-//============================================================================
-// FileSystem::~FileSystem
-//============================================================================
-
-FileSystem::~FileSystem()
-{
-
-}
-
-//============================================================================
-// FileSystem::init
-//============================================================================
-
-void		FileSystem::init( void )
-{
-	TheLocalFileSystem->init();
-	TheArchiveFileSystem->init();
-}
-
-//============================================================================
-// FileSystem::update
-//============================================================================
-
-void		FileSystem::update( void )
-{
-	USE_PERF_TIMER(FileSystem)
-	TheLocalFileSystem->update();
-	TheArchiveFileSystem->update();
-}
-
-//============================================================================
-// FileSystem::reset
-//============================================================================
-
-void		FileSystem::reset( void )
-{
-	USE_PERF_TIMER(FileSystem)
-	TheLocalFileSystem->reset();
-	TheArchiveFileSystem->reset();
-}
-
-//============================================================================
-// FileSystem::open
-//============================================================================
-
-File*		FileSystem::openFile( const Char *filename, Int access ) 
-{
-	USE_PERF_TIMER(FileSystem)
-	File *file = NULL;
-
-	if ( TheLocalFileSystem != NULL )
-	{
-		file = TheLocalFileSystem->openFile( filename, access );
-	}
-
-	if ( (TheArchiveFileSystem != NULL) && (file == NULL) )
-	{
-		file = TheArchiveFileSystem->openFile( filename );
-	}
-
-	return file;
-}
-
-//============================================================================
-// FileSystem::doesFileExist
-//============================================================================
-
-Bool FileSystem::doesFileExist(const Char *filename) const
-{
-	USE_PERF_TIMER(FileSystem)
-	if (TheLocalFileSystem->doesFileExist(filename)) {
-		return TRUE;
-	}
-	if (TheArchiveFileSystem->doesFileExist(filename)) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-//============================================================================
-// FileSystem::getFileListInDirectory
-//============================================================================
-void FileSystem::getFileListInDirectory(const AsciiString& directory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
-{
-	USE_PERF_TIMER(FileSystem)
-	TheLocalFileSystem->getFileListInDirectory(AsciiString(""), directory, searchName, filenameList, searchSubdirectories);
-	TheArchiveFileSystem->getFileListInDirectory(AsciiString(""), directory, searchName, filenameList, searchSubdirectories);
-}
-
-//============================================================================
-// FileSystem::getFileInfo
-//============================================================================
-Bool FileSystem::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
-{
-	USE_PERF_TIMER(FileSystem)
-	if (fileInfo == NULL) {
-		return FALSE;
-	}
-	memset(fileInfo, 0, sizeof(*fileInfo));
-	
-	if (TheLocalFileSystem->getFileInfo(filename, fileInfo)) {
-		return TRUE;
-	}
-
-	if (TheArchiveFileSystem->getFileInfo(filename, fileInfo)) {
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-//============================================================================
-// FileSystem::createDirectory
-//============================================================================
-Bool FileSystem::createDirectory(AsciiString directory) 
-{
-	USE_PERF_TIMER(FileSystem)
-	if (TheLocalFileSystem != NULL) {
-		return TheLocalFileSystem->createDirectory(directory);
-	}
-	return FALSE;
-}
-
-//============================================================================
-// FileSystem::areMusicFilesOnCD
-//============================================================================
-Bool FileSystem::areMusicFilesOnCD()
-{
-#if 1
-	return TRUE;
-#else
-	if (!TheCDManager) {
-		DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - No CD Manager; returning false\n"));
-		return FALSE;
-	}
-
-	AsciiString cdRoot;
-	Int dc = TheCDManager->driveCount();
-	for (Int i = 0; i < dc; ++i) {
-		DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - checking drive %d\n", i));
-		CDDriveInterface *cdi = TheCDManager->getDrive(i);
-		if (!cdi) {
-			continue;
-		}
-
-		cdRoot = cdi->getPath();
-		if (!cdRoot.endsWith("\\"))
-			cdRoot.concat("\\");
-		cdRoot.concat("gensec.big");
-		DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - checking for %s\n", cdRoot.str()));
-		File *musicBig = TheLocalFileSystem->openFile(cdRoot.str());
-		if (musicBig)
-		{
-			DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - found it!\n"));
-			musicBig->close();
-			return TRUE;
-		}
-	}
-	return FALSE;
-#endif
-}
-//============================================================================
-// FileSystem::loadMusicFilesFromCD
-//============================================================================
-void FileSystem::loadMusicFilesFromCD()
-{
-	if (!TheCDManager) {
-		return;
-	}
-
-	AsciiString cdRoot;
-	Int dc = TheCDManager->driveCount();
-	for (Int i = 0; i < dc; ++i) {
-		CDDriveInterface *cdi = TheCDManager->getDrive(i);
-		if (!cdi) {
-			continue;
-		}
-
-		cdRoot = cdi->getPath();
-		if (TheArchiveFileSystem->loadBigFilesFromDirectory(cdRoot, MUSIC_BIG)) {
-			break;
-		}
-	}
-}
-
-//============================================================================
-// FileSystem::unloadMusicFilesFromCD
-//============================================================================
-void FileSystem::unloadMusicFilesFromCD()
-{
-	if (!(TheAudio && TheAudio->isMusicPlayingFromCD())) {
-		return;
-	}
-
-	TheArchiveFileSystem->closeArchiveFile( MUSIC_BIG );
-}
diff --git a/Generals/Code/GameEngine/Source/Common/System/FunctionLexicon.cpp b/Generals/Code/GameEngine/Source/Common/System/FunctionLexicon.cpp
index 341f1d2edfc..093f5e068a0 100644
--- a/Generals/Code/GameEngine/Source/Common/System/FunctionLexicon.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/FunctionLexicon.cpp
@@ -28,7 +28,7 @@
 //						 and assign callbacks
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/FunctionLexicon.h"
 #include "GameClient/GameWindow.h"
@@ -61,7 +61,7 @@ extern WindowMsgHandledType PopupReplayInput( GameWindow *window, UnsignedInt ms
 extern WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 );
 
 // game window draw table -----------------------------------------------------------------------
-static FunctionLexicon::TableEntry gameWinDrawTable[] = 
+static FunctionLexicon::TableEntry gameWinDrawTable[] =
 {
 	{ NAMEKEY_INVALID, "IMECandidateMainDraw",						IMECandidateMainDraw },
 	{ NAMEKEY_INVALID, "IMECandidateTextAreaDraw",				IMECandidateTextAreaDraw },
@@ -69,7 +69,7 @@ static FunctionLexicon::TableEntry gameWinDrawTable[] =
 };
 
 // game window system table -----------------------------------------------------------------------
-static FunctionLexicon::TableEntry gameWinSystemTable[] = 
+static FunctionLexicon::TableEntry gameWinSystemTable[] =
 {
 
 
@@ -141,7 +141,7 @@ static FunctionLexicon::TableEntry gameWinSystemTable[] =
 	{ NAMEKEY_INVALID, "DiplomacySystem",								DiplomacySystem },
 	{ NAMEKEY_INVALID, "GeneralsExpPointsSystem",				GeneralsExpPointsSystem },
 	{ NAMEKEY_INVALID, "DifficultySelectSystem",				DifficultySelectSystem },
-	
+
 	{ NAMEKEY_INVALID, "IdleWorkerSystem",							IdleWorkerSystem },
 	{ NAMEKEY_INVALID, "EstablishConnectionsControlSystem", EstablishConnectionsControlSystem },
 	{ NAMEKEY_INVALID, "GameInfoWindowSystem",					GameInfoWindowSystem },
@@ -153,7 +153,7 @@ static FunctionLexicon::TableEntry gameWinSystemTable[] =
 };
 
 // game window input table ------------------------------------------------------------------------
-static FunctionLexicon::TableEntry gameWinInputTable[] = 
+static FunctionLexicon::TableEntry gameWinInputTable[] =
 {
 
 	{ NAMEKEY_INVALID, "GameWinDefaultInput",						GameWinDefaultInput },
@@ -224,7 +224,7 @@ static FunctionLexicon::TableEntry gameWinInputTable[] =
 };
 
 // game window tooltip table ----------------------------------------------------------------------
-static FunctionLexicon::TableEntry gameWinTooltipTable[] = 
+static FunctionLexicon::TableEntry gameWinTooltipTable[] =
 {
 
 
@@ -235,7 +235,7 @@ static FunctionLexicon::TableEntry gameWinTooltipTable[] =
 };
 
 // window layout init table -----------------------------------------------------------------------
-static FunctionLexicon::TableEntry winLayoutInitTable[] = 
+static FunctionLexicon::TableEntry winLayoutInitTable[] =
 {
 
 	{ NAMEKEY_INVALID, "MainMenuInit",									MainMenuInit },
@@ -281,12 +281,12 @@ static FunctionLexicon::TableEntry winLayoutInitTable[] =
 	{ NAMEKEY_INVALID, "DifficultySelectInit",          DifficultySelectInit },
 	{ NAMEKEY_INVALID, "PopupReplayInit",							  PopupReplayInit },
 
-	{ NAMEKEY_INVALID, NULL,														NULL }  // keep this last
+	{ NAMEKEY_INVALID, NULL,														NULL }
 
 };
 
 // window layout update table ---------------------------------------------------------------------
-static FunctionLexicon::TableEntry winLayoutUpdateTable[] = 
+static FunctionLexicon::TableEntry winLayoutUpdateTable[] =
 {
 
 	{ NAMEKEY_INVALID, "MainMenuUpdate",								MainMenuUpdate },
@@ -296,7 +296,7 @@ static FunctionLexicon::TableEntry winLayoutUpdateTable[] =
 	{ NAMEKEY_INVALID, "LanLobbyMenuUpdate",						LanLobbyMenuUpdate },
 	{ NAMEKEY_INVALID, "ReplayMenuUpdate",							ReplayMenuUpdate },
 	{ NAMEKEY_INVALID, "SaveLoadMenuUpdate",							SaveLoadMenuUpdate },
-	
+
 	{ NAMEKEY_INVALID, "CreditsMenuUpdate",							CreditsMenuUpdate },
 	{ NAMEKEY_INVALID, "LanGameOptionsMenuUpdate",			LanGameOptionsMenuUpdate },
 	{ NAMEKEY_INVALID, "LanMapSelectMenuUpdate",				LanMapSelectMenuUpdate },
@@ -320,18 +320,18 @@ static FunctionLexicon::TableEntry winLayoutUpdateTable[] =
 	{ NAMEKEY_INVALID, "ScoreScreenUpdate",							ScoreScreenUpdate },
 	{ NAMEKEY_INVALID, "DownloadMenuUpdate",						DownloadMenuUpdate },
 	{ NAMEKEY_INVALID, "PopupReplayUpdate",							PopupReplayUpdate },
-	{ NAMEKEY_INVALID, NULL,														NULL }  // keep this last
+	{ NAMEKEY_INVALID, NULL,														NULL }
 
 };
 
 // window layout shutdown table -------------------------------------------------------------------
-static FunctionLexicon::TableEntry winLayoutShutdownTable[] = 
+static FunctionLexicon::TableEntry winLayoutShutdownTable[] =
 {
 
 	{ NAMEKEY_INVALID, "MainMenuShutdown",							MainMenuShutdown },
 	{ NAMEKEY_INVALID, "OptionsMenuShutdown",						OptionsMenuShutdown },
 	{ NAMEKEY_INVALID, "SaveLoadMenuShutdown",          SaveLoadMenuShutdown },
-	{ NAMEKEY_INVALID, "PopupCommunicatorShutdown",     PopupCommunicatorShutdown },      
+	{ NAMEKEY_INVALID, "PopupCommunicatorShutdown",     PopupCommunicatorShutdown },
 	{ NAMEKEY_INVALID, "KeyboardOptionsMenuShutdown",   KeyboardOptionsMenuShutdown },
 	{ NAMEKEY_INVALID, "SinglePlayerMenuShutdown",			SinglePlayerMenuShutdown },
 	{ NAMEKEY_INVALID, "MapSelectMenuShutdown",					MapSelectMenuShutdown },
@@ -360,12 +360,12 @@ static FunctionLexicon::TableEntry winLayoutShutdownTable[] =
 	{ NAMEKEY_INVALID, "ScoreScreenShutdown",						ScoreScreenShutdown },
 	{ NAMEKEY_INVALID, "DownloadMenuShutdown",          DownloadMenuShutdown },
 	{ NAMEKEY_INVALID, "PopupReplayShutdown",	          PopupReplayShutdown },
-	{ NAMEKEY_INVALID, NULL,														NULL }  // keep this last
+	{ NAMEKEY_INVALID, NULL,														NULL }
 
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC DATA 
+// PUBLIC DATA
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 FunctionLexicon *TheFunctionLexicon = NULL;  ///< the function dictionary
 
@@ -375,7 +375,7 @@ FunctionLexicon *TheFunctionLexicon = NULL;  ///< the function dictionary
 	* components we might want to add to the table, such as generating
 	* a key based off the name supplied in the table for faster access */
 //-------------------------------------------------------------------------------------------------
-void FunctionLexicon::loadTable( TableEntry *table, 
+void FunctionLexicon::loadTable( TableEntry *table,
 																 TableIndex tableIndex )
 {
 
@@ -389,17 +389,17 @@ void FunctionLexicon::loadTable( TableEntry *table,
 	{
 
 		// assign key from name key based on name provided in table
-		entry->key = TheNameKeyGenerator->nameToKey( AsciiString(entry->name) );
+		entry->key = TheNameKeyGenerator->nameToKey( entry->name );
 
 		// next table entry please
 		entry++;
 
-	}  // end while
+	}
 
 	// assign table to the index specified
 	m_tables[ tableIndex ] = table;
 
-}  // end loadTable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Search the provided table for a function matching the key */
@@ -420,11 +420,11 @@ void *FunctionLexicon::keyToFunc( NameKeyType key, TableEntry *table )
 			return entry->func;
 		entry++;
 
-	}  // end if
+	}
 
 	return NULL;  // not found
 
-}  // end keyToFunc
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Search tables for the function given this key, if the index parameter
@@ -451,21 +451,21 @@ void *FunctionLexicon::findFunction( NameKeyType key, TableIndex index )
 			if( func )
 				break;  // exit for i
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 	else
 	{
 
 		// do NOT search all tables, just the one specified by the parameter
 		func = keyToFunc( key, m_tables[ index ] );
 
-	}  // end else
+	}
 
 	// return function, if found
 	return func;
 
-}  // end findFunction
+}
 
 #ifdef NOT_IN_USE
 //-------------------------------------------------------------------------------------------------
@@ -490,15 +490,15 @@ const char *FunctionLexicon::funcToName( void *func, TableEntry *table )
 		// not it, check next
 		entry++;
 
-	}  // end while
+	}
 
 	return NULL;  // not found
 
-}  // end funcToName
+}
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC FUNCTIONS 
+// PUBLIC FUNCTIONS
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
@@ -511,14 +511,14 @@ FunctionLexicon::FunctionLexicon( void )
 	for( i = 0; i < MAX_FUNCTION_TABLES; i++ )
 		m_tables[ i ] = NULL;
 
-}  // end FunctionLexicon
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 FunctionLexicon::~FunctionLexicon( void )
 {
 
-}  // end ~FunctionLexicon
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize our dictionary of funtion pointers and symbols */
@@ -540,7 +540,7 @@ void FunctionLexicon::init( void )
 
 	validate();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** reset */
@@ -556,15 +556,15 @@ void FunctionLexicon::reset( void )
 	// nothing dynamically loaded, just reinit the tables
 	init();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Update */ 
+/** Update */
 //-------------------------------------------------------------------------------------------------
 void FunctionLexicon::update( void )
 {
 
-}  // end update
+}
 
 /*
 // !NOTE! We can not have this function, see the header for
@@ -575,7 +575,7 @@ void FunctionLexicon::update( void )
 //-------------------------------------------------------------------------------------------------
 char *FunctionLexicon::functionToName( void *func )
 {
-	
+
 	// sanity
 	if( func == NULL )
 		return NULL;
@@ -590,11 +590,11 @@ char *FunctionLexicon::functionToName( void *func )
 		if( name )
 			return name;
 
-	}  // end for i
+	}
 
 	return NULL;  // not found
 
-}  // end functionToName
+}
 */
 
 //-------------------------------------------------------------------------------------------------
@@ -619,7 +619,7 @@ Bool FunctionLexicon::validate( void )
 		sourceEntry = m_tables[ i ];
 		while( sourceEntry && sourceEntry->key != NAMEKEY_INVALID )
 		{
-		
+
 			//
 			// scan all tables looking for the function in sourceEntry, do not bother
 			// of source entry is NULL (a valid entry in the table, but not a function)
@@ -643,53 +643,53 @@ Bool FunctionLexicon::validate( void )
 							if( sourceEntry->func == lookAtEntry->func )
 							{
 
-								DEBUG_LOG(( "WARNING! Function lexicon entries match same address! '%s' and '%s'\n", 
+								DEBUG_LOG(( "WARNING! Function lexicon entries match same address! '%s' and '%s'",
 														sourceEntry->name, lookAtEntry->name ));
 								valid = FALSE;
 
-							}  // end if
+							}
 
 						// next entry in this target table
 						lookAtEntry++;
 
-					}  // end while
+					}
 
-				}  // end for j
+				}
 
-			}  // end if
+			}
 
 			// next source entry
 			sourceEntry++;
 
-		}  // end while	
+		}
 
-	}  // end for i
+	}
 
 	// return the valid state of our tables
 	return valid;
 
-}  // end validate
+}
 
 //============================================================================
 // FunctionLexicon::gameWinDrawFunc
 //============================================================================
 
 GameWinDrawFunc FunctionLexicon::gameWinDrawFunc( NameKeyType key, TableIndex index )
-{ 
+{
 	if ( index == TABLE_ANY )
 	{
 		// first search the device depended table then the device independent table
 		GameWinDrawFunc func;
 
-		func = (GameWinDrawFunc)findFunction( key, TABLE_GAME_WIN_DEVICEDRAW ); 
+		func = (GameWinDrawFunc)findFunction( key, TABLE_GAME_WIN_DEVICEDRAW );
 		if ( func == NULL )
 		{
-			func = (GameWinDrawFunc)findFunction( key, TABLE_GAME_WIN_DRAW ); 
+			func = (GameWinDrawFunc)findFunction( key, TABLE_GAME_WIN_DRAW );
 		}
 		return func;
 	}
 	// search the specified table
-	return (GameWinDrawFunc)findFunction( key, index ); 
+	return (GameWinDrawFunc)findFunction( key, index );
 }
 
 WindowLayoutInitFunc FunctionLexicon::winLayoutInitFunc( NameKeyType key, TableIndex index )
@@ -699,10 +699,10 @@ WindowLayoutInitFunc FunctionLexicon::winLayoutInitFunc( NameKeyType key, TableI
 		// first search the device depended table then the device independent table
 		WindowLayoutInitFunc func;
 
-		func = (WindowLayoutInitFunc)findFunction( key, TABLE_WIN_LAYOUT_DEVICEINIT ); 
+		func = (WindowLayoutInitFunc)findFunction( key, TABLE_WIN_LAYOUT_DEVICEINIT );
 		if ( func == NULL )
 		{
-			func = (WindowLayoutInitFunc)findFunction( key, TABLE_WIN_LAYOUT_INIT ); 
+			func = (WindowLayoutInitFunc)findFunction( key, TABLE_WIN_LAYOUT_INIT );
 		}
 		return func;
 	}
diff --git a/Generals/Code/GameEngine/Source/Common/System/GameCommon.cpp b/Generals/Code/GameEngine/Source/Common/System/GameCommon.cpp
index e85783ad913..83d39945665 100644
--- a/Generals/Code/GameEngine/Source/Common/System/GameCommon.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/GameCommon.cpp
@@ -26,11 +26,11 @@
 // Part of header detangling
 // John McDonald, Aug 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameCommon.h"
 
-const char *TheVeterancyNames[] = 
+const char *const TheVeterancyNames[] =
 {
 	"REGULAR",
 	"VETERAN",
@@ -38,27 +38,30 @@ const char *TheVeterancyNames[] =
 	"HEROIC",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheVeterancyNames) == LEVEL_COUNT + 1, "Incorrect array size");
 
-const char *TheRelationshipNames[] =
+const char *const TheRelationshipNames[] =
 {
 	"ENEMIES",
 	"NEUTRAL",
 	"ALLIES",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheRelationshipNames) == RELATIONSHIP_COUNT + 1, "Incorrect array size");
 
 //-------------------------------------------------------------------------------------------------
+// TheSuperHackers @todo DO NOT USE THIS FUNCTION! Use WWMath::Normalize_Angle instead. Delete this.
 Real normalizeAngle(Real angle)
 {
-	DEBUG_ASSERTCRASH(!_isnan(angle), ("Angle is NAN in normalizeAngle!\n"));
+	DEBUG_ASSERTCRASH(!_isnan(angle), ("Angle is NAN in normalizeAngle!"));
 
 	if( _isnan(angle) )
 		return 0;// ARGH!!!! Don't assert and then not handle it!  Error bad!  Fix error!
 
-	while (angle > PI) 
+	while (angle > PI)
 		angle -= 2*PI;
 
-	while (angle <= -PI) 
+	while (angle <= -PI)
 		angle += 2*PI;
 
 	return angle;
diff --git a/Generals/Code/GameEngine/Source/Common/System/GameMemory.cpp b/Generals/Code/GameEngine/Source/Common/System/GameMemory.cpp
deleted file mode 100644
index 6c41901e8cd..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/GameMemory.cpp
+++ /dev/null
@@ -1,3586 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Memory.cpp 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: Memory.cpp
-//
-// Created:   Steven Johnson, August 2001
-//
-// Desc:      Memory manager
-//
-// ----------------------------------------------------------------------------
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-// SYSTEM INCLUDES 
-
-// USER INCLUDES 
-#include "Common/GameMemory.h"
-#include "Common/CriticalSection.h"
-#include "Common/Errors.h"
-#include "Common/GlobalData.h"
-#include "Common/PerfTimer.h"
-#ifdef MEMORYPOOL_DEBUG
-#include "GameClient/ClientRandomValue.h"
-#endif
-#ifdef MEMORYPOOL_STACKTRACE
-	#include "Common/StackDump.h"
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-DECLARE_PERF_TIMER(MemoryPoolDebugging)
-DECLARE_PERF_TIMER(MemoryPoolInitFilling)
-#endif
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-
-// ----------------------------------------------------------------------------
-// DEFINES 
-// ----------------------------------------------------------------------------
-
-/** 
-	define MPSB_DLINK to add a backlink to MemoryPoolSingleBlock; this makes it 
-	faster to free raw DMA blocks. 
-	@todo verify this speedup is enough to be worth the extra space
-*/
-#define MPSB_DLINK
-
-#ifdef MEMORYPOOL_DEBUG
-
-	/**
-		if you define MEMORYPOOL_INTENSE_VERIFY, we do intensive verifications after
-		nearly every memory operation. this is OFF by default, since it slows down 
-		things a lot, but is worth turning on for really obscure memory corruption issues.
-	*/
-	#ifndef MEMORYPOOL_INTENSE_VERIFY
-		#define NO_MEMORYPOOL_INTENSE_VERIFY
-	#endif
-
-	/**
-		if you define MEMORYPOOL_CHECK_BLOCK_OWNERSHIP, we do lots of calls to verify
-		that a block actually belongs to the pool it is called with. this is great
-		for debugging, but can be realllly slow, so is off by default.
-	*/
-	#ifndef MEMORYPOOL_CHECK_BLOCK_OWNERSHIP
-		#define NO_MEMORYPOOL_CHECK_BLOCK_OWNERSHIP
-	#endif
-
-	static const char* FREE_SINGLEBLOCK_TAG_STRING			= "FREE_SINGLEBLOCK_TAG_STRING";
-	const Short SINGLEBLOCK_MAGIC_COOKIE								= 12345;
-	const Int GARBAGE_FILL_VALUE												= 0xdeadbeef;
-
-	// flags for m_debugFlags
-	enum
-	{
-		IGNORE_LEAKS		= 0x0001
-	};
-
-	// in debug mode (but not internal), save stacktraces too
-	#if !defined(MEMORYPOOL_CHECKPOINTING) && defined(MEMORYPOOL_STACKTRACE) && defined(RTS_DEBUG)
-		#define MEMORYPOOL_SINGLEBLOCK_GETS_STACKTRACE
-	#endif
-
-	#define USE_FILLER_VALUE
-
-	const Int MAX_INIT_FILLER_COUNT = 8;
-	#ifdef USE_FILLER_VALUE
-		static UnsignedInt s_initFillerValue = 0xf00dcafe; // will be replaced, should never be this value at runtime
-		static void calcFillerValue(Int index)
-		{
-			s_initFillerValue = (index & 3) << 1;
-			s_initFillerValue |= 0x01;
-			s_initFillerValue |= (~(s_initFillerValue << 4)) & 0xf0;
-			s_initFillerValue |= (s_initFillerValue << 8);
-			s_initFillerValue |= (s_initFillerValue << 16);
-			DEBUG_LOG(("Setting MemoryPool initFillerValue to %08x (index %d)\n",s_initFillerValue,index));
-		}
-	#endif
-
-#endif
-
-#ifdef MEMORYPOOL_BOUNDINGWALL
-
-	#define WALLCOUNT (2)	// default setting of 8 requires 4*4*2==32 extra bytes PER BLOCK
-	#define WALLSIZE	(WALLCOUNT * sizeof(Int))
-
-#endif
-
-#ifdef MEMORYPOOL_STACKTRACE
-
-	#define MEMORYPOOL_STACKTRACE_SIZE				(20)
-	#define MEMORYPOOL_STACKTRACE_SKIP_SIZE		(6)
-	#define MEMORYPOOL_STACKTRACE_SIZE_BYTES	(MEMORYPOOL_STACKTRACE_SIZE * sizeof(void*))
-
-#endif
-
-// ----------------------------------------------------------------------------
-// PRIVATE DATA 
-// ----------------------------------------------------------------------------
-
-#ifdef MEMORYPOOL_BOUNDINGWALL
-
-	static Int theBoundingWallPattern = 0xbabeface;
-
-#endif
-
-#ifdef MEMORYPOOL_STACKTRACE
-
-	/** the max number levels to dump in the stacktrace. a variable rather than
-		constant so that you can fiddle with it in the debugger if desired, to
-		get shorter or longer dumps. (you can't go longer than MEMORYPOOL_STACKTRACE_SIZE
-		in any event. */
-	static Int theStackTraceDepth = 16;
-
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-
-	static Int theTotalSystemAllocationInBytes = 0;
-	static Int thePeakSystemAllocationInBytes = 0;
-	static Int theTotalLargeBlocks = 0;
-	static Int thePeakLargeBlocks = 0;
-	Int theTotalDMA = 0;
-	Int thePeakDMA = 0;
-	Int theWastedDMA = 0;
-	Int thePeakWastedDMA = 0;
-
-#ifdef INTENSE_DMA_BOOKKEEPING
-	struct UsedNPeak
-	{
-		Int used, peak, waste, peakwaste;
-		UsedNPeak() : used(0), peak(0), waste(0), peakwaste(0) { }
-	};
-	typedef std::map< const char*, UsedNPeak, std::less<const char*> > UsedNPeakMap;
-	static UsedNPeakMap TheUsedNPeakMap;
-	static Int doingIntenseDMA = 0;
-#endif
-
-
-#endif
-
-static Bool thePreMainInitFlag = false;
-static Bool theMainInitFlag = false;
-
-// ----------------------------------------------------------------------------
-// PRIVATE PROTOTYPES 
-// ----------------------------------------------------------------------------
-
-/// @todo srj -- make this work for 8
-#define MEM_BOUND_ALIGNMENT 4
-
-static Int roundUpMemBound(Int i);
-static void *sysAllocate(Int numBytes);
-static void *sysAllocateDoNotZero(Int numBytes);
-static void sysFree(void* p);
-static void memset32(void* ptr, Int value, Int bytesToFill);
-#ifdef MEMORYPOOL_STACKTRACE
-static void doStackDumpOutput(const char* m);
-static void doStackDump(void **stacktrace, int size);
-#endif
-static void preMainInitMemoryManager();
-
-// ----------------------------------------------------------------------------
-// PRIVATE FUNCTIONS 
-// ----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/** round up to the nearest multiple of MEM_BOUND_ALIGNMENT */
-static Int roundUpMemBound(Int i)
-{
-	return (i + (MEM_BOUND_ALIGNMENT-1)) & ~(MEM_BOUND_ALIGNMENT-1);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	identical to sysAllocateDoNotZero, except that the memory block returned
-	is filled to all-zero-bytes.
-*/
-static void* sysAllocate(Int numBytes)
-{
-	void* p = ::GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, numBytes);
-	if (!p)
-		throw ERROR_OUT_OF_MEMORY;
-#ifdef MEMORYPOOL_DEBUG
-	{
-		USE_PERF_TIMER(MemoryPoolDebugging)
-		theTotalSystemAllocationInBytes += ::GlobalSize(p);
-		if (thePeakSystemAllocationInBytes < theTotalSystemAllocationInBytes)
-			thePeakSystemAllocationInBytes = theTotalSystemAllocationInBytes;
-	}
-#endif
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-/** 
-	this is the low-level allocator that we use to request memory from the OS.
-	all (repeat, all) memory allocations in this module should ultimately
-	go thru this routine (or sysAllocate).
-
-	note: throws ERROR_OUT_OF_MEMORY on failure; never returns null
-*/
-static void* sysAllocateDoNotZero(Int numBytes)
-{
-	void* p = ::GlobalAlloc(GMEM_FIXED, numBytes);
-	if (!p)
-		throw ERROR_OUT_OF_MEMORY;
-#ifdef MEMORYPOOL_DEBUG
-	{
-		USE_PERF_TIMER(MemoryPoolDebugging)
-		#ifdef USE_FILLER_VALUE
-		{
-			USE_PERF_TIMER(MemoryPoolInitFilling)
-			::memset32(p, s_initFillerValue, ::GlobalSize(p));
-		}
-		#endif
-		theTotalSystemAllocationInBytes += ::GlobalSize(p);
-		if (thePeakSystemAllocationInBytes < theTotalSystemAllocationInBytes)
-			thePeakSystemAllocationInBytes = theTotalSystemAllocationInBytes;
-	}
-#endif
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-/** 
-	the counterpart to sysAllocate / sysAllocateDoNotZero; used to free blocks
-	allocated by them. it is OK to pass null here (it will just be ignored).
-*/
-static void sysFree(void* p)
-{
-	if (p)
-	{
-#ifdef MEMORYPOOL_DEBUG
-		{
-			USE_PERF_TIMER(MemoryPoolDebugging)
-			::memset32(p, GARBAGE_FILL_VALUE, ::GlobalSize(p));
-			theTotalSystemAllocationInBytes -= ::GlobalSize(p);
-		}
-#endif
-		::GlobalFree(p);
-	}
-}
-
-// ----------------------------------------------------------------------------
-/** 
-	fills memory with a 32-bit value (note: assumes the ptr is 4-byte-aligned)
-*/
-static void memset32(void* ptr, Int value, Int bytesToFill)
-{
-	Int wordsToFill = bytesToFill>>2;
-	bytesToFill -= (wordsToFill<<2);
-
-	Int *p = (Int*)ptr;
-	for (++wordsToFill; --wordsToFill; )
-		*p++ = value;
-
-	Byte *b = (Byte *)p;
-	for (++bytesToFill; --bytesToFill; )
-		*b++ = (Byte)value;
-}
-
-#ifdef MEMORYPOOL_STACKTRACE
-// ----------------------------------------------------------------------------
-/**
-	This is just a convenience routine that dumps output from the StackDump module
-	to our normal debug log file, with a little massaging for formatting.
-*/
-static void doStackDumpOutput(const char* m)
-{
-	const char *PREPEND = "STACKTRACE";
-	if (*m == 0 || strcmp(m, "\n") == 0)
-	{
-		DEBUG_LOG((m));
-	}
-	else
-	{
-		// Note - I am moving the prepend to the end, as this allows double clicking in the 
-		// output window to open the file in VisualStudio.  jba.
-		DEBUG_LOG(("%s,    %s",m, PREPEND));
-	}
-}
-#endif
-
-#ifdef MEMORYPOOL_STACKTRACE
-// ----------------------------------------------------------------------------
-/**
-	dump the given stacktrace to the debug log.
-*/
-static void doStackDump(void **stacktrace, int size)
-{
-	::doStackDumpOutput("Allocation Stack Trace:");
-	::doStackDumpOutput("\n");
-	::StackDumpFromAddresses(stacktrace, size, ::doStackDumpOutput);
-}
-#endif
-
-// ----------------------------------------------------------------------------
-// PRIVATE TYPES 
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	This is a auxiliary record that we allocate in debug modes (actually, checkpoint modes)
-	to retain extra information about blocks; there is a one-to-one correspondence
-	between this record and a block allocation. The interesting bit about this record is that
-	we don't deallocate it when the corresponding block is freed; we retain it so we can
-	later provide information about what blocks were freed when, etc. Yes, this does chew
-	up a lot of memory! That's why it's debug-mode only; the presumption is that developers
-	machines have boatloads of RAM. (Note that we *do* free these when resetCheckpoints() is called.)
-	Note also that we directly allocate/free these with sysAllocate/sysFree, so ctors/dtors
-	are never executed, nor would virtual functions work -- I know, it's a little evil.
-*/
-class BlockCheckpointInfo
-{
-private:
-	BlockCheckpointInfo				*m_next;										///< next checkpoint in this pool/dma
-	const char								*m_debugLiteralTagString;		///< the tagstring for the block
-	Int												m_allocCheckpoint;					///< when it was allocated
-	Int												m_freeCheckpoint;						///< when it was freed (-1 if still in existence)
-	Int												m_blockSize;								///< logical size of the block
-#ifdef MEMORYPOOL_STACKTRACE
-	void*											m_stacktrace[MEMORYPOOL_STACKTRACE_SIZE];		///< stacktrace of when block was allocated
-#endif
-
-	~BlockCheckpointInfo() {};
-
-public:
-
-	BlockCheckpointInfo *getNext();	///< return next checkpointinfo for this pool/dma
-
-	void debugSetFreepoint(Int f);	///< set the checkpoint at which the block was freed.
-
-#ifdef MEMORYPOOL_STACKTRACE
-	void **getStacktraceInfo();			///< return a ptr to the allocation stacktrace info.
-#endif
-	
-	static BlockCheckpointInfo *addToList(
-		BlockCheckpointInfo **pHead,
-		const char *debugLiteralTagString,
-		Int allocCheckpoint,
-		Int blockSize
-	);
-	
-	static void freeList(BlockCheckpointInfo **pHead);
-
-	Bool shouldBeInReport(Int flags, Int startCheckpoint, Int endCheckpoint);
-
-	static void doBlockCheckpointReport( BlockCheckpointInfo *bi, const char *poolName, 
-									Int flags, Int startCheckpoint, Int endCheckpoint );
-};
-
-#endif
-
-// ----------------------------------------------------------------------------
-/**
-	This is the fundamental allocation unit; when you allocate via (say) MemoryPool::allocateBlock,
-	this is what is being allocated for you. (Of course, you don't see the private fields.)
-	For the most part, we allocate big chunks of these in a monolithic Blob and subdivide 
-	from there. (However, we occasionally allocate these individually, for large blocks.)
-
-	Note also that we directly allocate/free these with sysAllocate/sysFree, so ctors/dtors
-	are never executed, nor would virtual functions work -- I know, it's a little evil.
-*/
-class MemoryPoolSingleBlock 
-{
-private:
-
-	MemoryPoolBlob				*m_owningBlob;			///< will be NULL if the single block was allocated via sysAllocate()
-	MemoryPoolSingleBlock	*m_nextBlock;				///< if m_owningBlob is nonnull, this points to next free (unallocated) block in the blob; if m_owningBlob is null, this points to the next used (allocated) raw block in the pool.
-#ifdef MPSB_DLINK
-	MemoryPoolSingleBlock	*m_prevBlock;				///< if m_owningBlob is nonnull, this points to prev free (unallocated) block in the blob; if m_owningBlob is null, this points to the prev used (allocated) raw block in the pool.
-#endif
-#ifdef MEMORYPOOL_CHECKPOINTING
-	BlockCheckpointInfo		*m_checkpointInfo;	///< ptr to the checkpointinfo for this block
-#endif
-#ifdef MEMORYPOOL_BOUNDINGWALL
-	Int										m_wallPattern;			///< unique seed value for the bounding-walls for this block
-#endif
-#ifdef MEMORYPOOL_DEBUG
-	const char						*m_debugLiteralTagString;	///< ptr to the tagstring for this block.
-	Int										m_logicalSize;						///< logical size of block (not including overhead, walls, etc.)
-	Int										m_wastedSize;							///< if allocated via DMA, the "wasted" bytes
-	Short									m_magicCookie;						///< magic value used to verify that the block is one of ours (as opposed to random pointer)
-	Short									m_debugFlags;							///< misc flags
-	#ifdef MEMORYPOOL_SINGLEBLOCK_GETS_STACKTRACE
-	void*									m_stacktrace[MEMORYPOOL_STACKTRACE_SIZE];		///< stacktrace of when block was allocated (if not checkpointing)
-	#endif
-#endif
-
-private:
-
-	void* getUserDataNoDbg();	
-#ifdef MEMORYPOOL_BOUNDINGWALL
-	void debugFillInWalls();	
-#endif
-
-public:
-	
-	static Int calcRawBlockSize(Int logicalSize);
-	static MemoryPoolSingleBlock *rawAllocateSingleBlock(MemoryPoolSingleBlock **pRawListHead, Int logicalSize, MemoryPoolFactory *owningFactory DECLARE_LITERALSTRING_ARG2);
-	void removeBlockFromList(MemoryPoolSingleBlock **pHead);
-
-	void initBlock(Int logicalSize, MemoryPoolBlob *owningBlob, MemoryPoolFactory *owningFactory DECLARE_LITERALSTRING_ARG2);
-	void* getUserData();
-	static MemoryPoolSingleBlock *recoverBlockFromUserData(void* pUserData);
-	MemoryPoolBlob *getOwningBlob();
-
-	MemoryPoolSingleBlock *getNextFreeBlock();
-	void setNextFreeBlock(MemoryPoolSingleBlock *b);
-	MemoryPoolSingleBlock *getNextRawBlock();
-	void setNextRawBlock(MemoryPoolSingleBlock *b);
-
-#ifdef MEMORYPOOL_DEBUG
-	void debugIgnoreLeaksForThisBlock();
-	const char *debugGetLiteralTagString();
-	Int debugGetLogicalSize();
-	Int debugGetWastedSize();
-	void debugSetWastedSize(Int waste);
-	void debugVerifyBlock();
-	void debugMarkBlockAsFree();
-	Bool debugCheckUnderrun();
-	Bool debugCheckOverrun();
-	Int debugSingleBlockReportLeak(const char* owner);
-#endif	// MEMORYPOOL_DEBUG
-#ifdef MEMORYPOOL_CHECKPOINTING
-	BlockCheckpointInfo *debugGetCheckpointInfo();
-	void debugSetCheckpointInfo(BlockCheckpointInfo *bi);
-	void debugResetCheckpoint();
-#endif
-
-};
-// ----------------------------------------------------------------------------
-class MemoryPoolBlob 
-{
-private:
-	MemoryPool							*m_owningPool;				///< the pool that owns this blob
-	MemoryPoolBlob					*m_nextBlob;					///< next blob in this pool
-	MemoryPoolBlob					*m_prevBlob;					///< prev blob in this pool
-	MemoryPoolSingleBlock		*m_firstFreeBlock;		///< ptr to first available block in this blob
-	Int											m_usedBlocksInBlob;		///< total allocated blocks in this blob
-	Int											m_totalBlocksInBlob;	///< total blocks in this blob (allocated + available)
-	char										*m_blockData;					///< ptr to the blocks (really a MemoryPoolSingleBlock*)
-
-public:
-
-	MemoryPoolBlob();
-	~MemoryPoolBlob();
-
-	void initBlob(MemoryPool *owningPool, Int allocationCount);
-
-	void addBlobToList(MemoryPoolBlob **ppHead, MemoryPoolBlob **ppTail);
-	void removeBlobFromList(MemoryPoolBlob **ppHead, MemoryPoolBlob **ppTail);
-	MemoryPoolBlob *getNextInList();
-	Bool hasAnyFreeBlocks();
-
-	MemoryPoolSingleBlock *allocateSingleBlock(DECLARE_LITERALSTRING_ARG1);
-	void freeSingleBlock(MemoryPoolSingleBlock *block);
-
-	MemoryPool *getOwningPool();
-	Int getFreeBlockCount();
-	Int getUsedBlockCount();
-	Int getTotalBlockCount();
-
-#ifdef MEMORYPOOL_DEBUG
-	void debugMemoryVerifyBlob();
-	Int debugBlobReportLeaks(const char* owner);
-	Bool debugIsBlockInBlob(void *pBlock);
-#endif
-#ifdef MEMORYPOOL_CHECKPOINTING
-	void debugResetCheckpoints();
-#endif
-
-};
-
-// ----------------------------------------------------------------------------
-// PUBLIC DATA 
-// ----------------------------------------------------------------------------
-
-MemoryPoolFactory *TheMemoryPoolFactory = NULL;
-DynamicMemoryAllocator *TheDynamicMemoryAllocator = NULL;
-
-// ----------------------------------------------------------------------------
-// INLINES 
-// ----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-inline BlockCheckpointInfo *BlockCheckpointInfo::getNext() { return m_next; }
-inline void BlockCheckpointInfo::debugSetFreepoint(Int f) { DEBUG_ASSERTCRASH(m_freeCheckpoint == -1, ("already have a freepoint")); m_freeCheckpoint = f; }
-#ifdef MEMORYPOOL_STACKTRACE
-inline void **BlockCheckpointInfo::getStacktraceInfo() { return m_stacktrace; }
-#endif
-#endif
-
-// ----------------------------------------------------------------------------
-/**
-	return a ptr to the user-data area of the block (ie, the part the enduser can deal with).
-	this call does NO debug verification and is for internal use of class MemoryPoolSingleBlock only.
-*/
-inline void* MemoryPoolSingleBlock::getUserDataNoDbg()
-{
-	char* p = ((char*)this) + sizeof(MemoryPoolSingleBlock);
-	#ifdef MEMORYPOOL_BOUNDINGWALL
-	p += WALLSIZE;
-	#endif
-	return (void*)p;
-}
-
-/**
-	return a ptr to the user-data area of the block (ie, the part the enduser can deal with).
-	this call verifies that the block is valid in debug mode.
-*/
-inline void* MemoryPoolSingleBlock::getUserData()
-{
-	// yes, verify the block in this case for plain debug mode (not intense-verify mode)
-	#ifdef MEMORYPOOL_DEBUG
-	debugVerifyBlock();
-	#endif
-	return getUserDataNoDbg();
-}
-
-/**
-	given a desired logical block size, calculate the physical size needed for each
-	MemoryPoolSingleBlock (including overhead, etc.)
-*/
-inline /*static*/ Int MemoryPoolSingleBlock::calcRawBlockSize(Int logicalSize) 
-{ 
-	Int s = ::roundUpMemBound(logicalSize) + sizeof(MemoryPoolSingleBlock);
-	#ifdef MEMORYPOOL_BOUNDINGWALL
-	s += WALLSIZE*2;
-	#endif
-	return s;
-}
-
-/**
-	accessor
-*/
-inline MemoryPoolBlob *MemoryPoolSingleBlock::getOwningBlob() 
-{ 
-	return m_owningBlob; 
-}
-
-/**
-	return the next free block in this blob. this call assumes that the block
-	in question belongs to a blob, and will assert if not.
-*/
-inline MemoryPoolSingleBlock *MemoryPoolSingleBlock::getNextFreeBlock() 
-{ 
-	DEBUG_ASSERTCRASH(m_owningBlob != NULL, ("must be called on blob block")); 
-	return m_nextBlock; 
-}
-
-/**
-	set the next free block in this blob. this call assumes that both blocks
-	in question belongs to a blob, but will NOT assert if not, since it may be 
-	called when the blocks are in an inconsistent state.
-*/
-inline void MemoryPoolSingleBlock::setNextFreeBlock(MemoryPoolSingleBlock *b) 
-{ 
-	//DEBUG_ASSERTCRASH(m_owningBlob != NULL && b->m_owningBlob != NULL, ("must be called on blob block")); 
-	// don't check the 'b' block -- we need to call this before 'b' is fully initialized.
-	DEBUG_ASSERTCRASH(m_owningBlob != NULL, ("must be called on blob block")); 
-	this->m_nextBlock = b;
-#ifdef MPSB_DLINK
-	if (b) {
-		b->m_prevBlock = this;
-	}
-#endif
-}
-
-/**
-	return the next raw block in this dma. this call assumes that the block
-	in question does NOT belong to a blob, and will assert if not.
-*/
-inline MemoryPoolSingleBlock *MemoryPoolSingleBlock::getNextRawBlock()
-{ 
-	DEBUG_ASSERTCRASH(m_owningBlob == NULL, ("must be called on raw block")); 
-	return m_nextBlock; 
-}
-
-/**
-	set the next raw block in this dma. this call assumes that the blocks
-	in question do NOT belong to a blob, and will assert if not.
-*/
-inline void MemoryPoolSingleBlock::setNextRawBlock(MemoryPoolSingleBlock *b) 
-{ 
-	DEBUG_ASSERTCRASH(m_owningBlob == NULL && (!b || b->m_owningBlob == NULL), ("must be called on raw block")); 
-	m_nextBlock = b; 
-#ifdef MPSB_DLINK
-	if (b)
-		b->m_prevBlock = this;
-#endif
-}
-
-#ifdef MEMORYPOOL_DEBUG
-inline void MemoryPoolSingleBlock::debugIgnoreLeaksForThisBlock()
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
-	m_debugFlags |= IGNORE_LEAKS;
-}
-/**
-	accessor
-*/
-inline const char *MemoryPoolSingleBlock::debugGetLiteralTagString() 
-{ 
-	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
-	return m_debugLiteralTagString; 
-}
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-/**
-	accessor
-*/
-inline Int MemoryPoolSingleBlock::debugGetLogicalSize() 
-{ 
-	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
-	return m_logicalSize; 
-}
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-/**
-	accessor
-*/
-inline Int MemoryPoolSingleBlock::debugGetWastedSize() 
-{ 
-	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
-	return m_wastedSize; 
-}
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-inline void MemoryPoolSingleBlock::debugSetWastedSize(Int w) 
-{ 
-	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
-	m_wastedSize = w; 
-}
-#endif
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	accessor
-*/
-inline BlockCheckpointInfo *MemoryPoolSingleBlock::debugGetCheckpointInfo() 
-{ 
-	return m_checkpointInfo; 
-}
-#endif
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	set the checkpoint info for this block.
-*/
-inline void MemoryPoolSingleBlock::debugSetCheckpointInfo(BlockCheckpointInfo *bi) 
-{ 
-	DEBUG_ASSERTCRASH(m_checkpointInfo == NULL, ("should be null")); 
-	m_checkpointInfo = bi; 
-}
-#endif
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	sets the checkpointinfo to null, but does NOT free it... the checkpointinfo
-	is expected to be freed elsewhere.
-*/
-inline void MemoryPoolSingleBlock::debugResetCheckpoint() 
-{ 
-	m_checkpointInfo = NULL; 
-}
-#endif
-
-// ----------------------------------------------------------------------------
-/// accessor
-inline MemoryPoolBlob *MemoryPoolBlob::getNextInList() { return m_nextBlob; }
-/// accessor
-inline Bool MemoryPoolBlob::hasAnyFreeBlocks() { return m_firstFreeBlock != NULL; }
-/// accessor
-inline MemoryPool *MemoryPoolBlob::getOwningPool() { return m_owningPool; }
-/// accessor
-inline Int MemoryPoolBlob::getFreeBlockCount() { return getTotalBlockCount() - getUsedBlockCount(); }
-/// accessor
-inline Int MemoryPoolBlob::getUsedBlockCount() { return m_usedBlocksInBlob; }
-/// accessor
-inline Int MemoryPoolBlob::getTotalBlockCount() { return m_totalBlocksInBlob; }
-
-//-----------------------------------------------------------------------------
-// METHODS for BlockCheckpointInfo
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/// return true iff this checkpointinfo should be included in a checkpointreport with the given parameters.
-Bool BlockCheckpointInfo::shouldBeInReport(Int flags, Int startCheckpoint, Int endCheckpoint)
-{
-	Bool allocFlagsOK = false;
-	Bool freedFlagsOK = false;
-
-	if (m_allocCheckpoint < startCheckpoint && (flags & _REPORT_CP_ALLOCATED_BEFORE))
-		allocFlagsOK = true;
-	if (m_allocCheckpoint >= startCheckpoint && m_allocCheckpoint < endCheckpoint && (flags & _REPORT_CP_ALLOCATED_BETWEEN))
-		allocFlagsOK = true;
-
-	if (m_freeCheckpoint == -1)
-	{
-		// block still exists! process this only if we want 'em.
-		freedFlagsOK = (flags & _REPORT_CP_FREED_NEVER) ? true : false;
-	}
-	else
-	{
-		if (m_freeCheckpoint < startCheckpoint && (flags & _REPORT_CP_FREED_BEFORE))
-			freedFlagsOK = true;
-		if (m_freeCheckpoint >= startCheckpoint && m_freeCheckpoint < endCheckpoint && (flags & _REPORT_CP_FREED_BETWEEN))
-			freedFlagsOK = true;
-	}
-
-	// the block must match both the 'alloc' and 'free' criteria to get a report
-	return allocFlagsOK && freedFlagsOK;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/// print a checkpointreport for the given checkpointinfo. if checkpointinfo is null, print column headers.
-/*static*/ void BlockCheckpointInfo::doBlockCheckpointReport(BlockCheckpointInfo *bi, 
-			const char *poolName, Int flags, Int startCheckpoint, Int endCheckpoint )
-{
-	const char *PREPEND = "BLOCKINFO";	// allows grepping more easily
-
-	if (!bi)
-	{
-		DEBUG_LOG(("%s,%32s,%6s,%6s,%6s,%s\n",PREPEND,"POOLNAME","BLKSZ","ALLOC","FREED","BLOCKNAME"));
-	}
-	else
-	{
-		DEBUG_ASSERTCRASH(startCheckpoint >= 0 && startCheckpoint <= endCheckpoint, ("bad checkpoints"));
-		DEBUG_ASSERTCRASH((flags & _REPORT_CP_ALLOCATED_DONTCARE) != 0, ("bad flags: must set at least one alloc flag"));
-		DEBUG_ASSERTCRASH((flags & _REPORT_CP_FREED_DONTCARE) != 0, ("bad flags: must set at least one freed flag"));
-
-		if (bi->shouldBeInReport(flags, startCheckpoint, endCheckpoint))
-		{
-			DEBUG_LOG(("%s,%32s,%6d,%6d,%6d,%s\n",PREPEND,poolName,bi->m_blockSize,bi->m_allocCheckpoint,bi->m_freeCheckpoint,bi->m_debugLiteralTagString));
-	#ifdef MEMORYPOOL_STACKTRACE
-			if (flags & REPORT_CP_STACKTRACE)
-			{
-				::doStackDump(bi->m_stacktrace, min(MEMORYPOOL_STACKTRACE_SIZE, theStackTraceDepth ));
-			}
-	#endif
-		}
-	}
-}
-#endif
-
-// ----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/// free an entire list of checkpointinfos.
-/*static*/ void BlockCheckpointInfo::freeList(BlockCheckpointInfo **pHead)
-{
-	BlockCheckpointInfo *p = *pHead;
-	while (p)
-	{
-		BlockCheckpointInfo *n = p->m_next;
-		::sysFree((void *)p);
-		p = n;
-	}
-	*pHead = NULL;
-}
-#endif
-
-// ----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	allocate a new checkpointinfo with the given tag/checkpoint/size, add it to the
-	linked list, and return the checkpointinfo. (note that this will NOT throw an exception;
-	if there is not enough memory to allocate a new checkpointinfo, it will quietly return null.)
-*/
-/*static*/ BlockCheckpointInfo *BlockCheckpointInfo::addToList(
-	BlockCheckpointInfo **pHead,
-	const char *debugLiteralTagString,
-	Int allocCheckpoint,
-	Int blockSize
-)
-{
-	DEBUG_ASSERTCRASH(debugLiteralTagString != FREE_SINGLEBLOCK_TAG_STRING, ("bad tag string"));
-
-	BlockCheckpointInfo *freed = NULL;
-	try {
-		freed = (BlockCheckpointInfo *)::sysAllocate(sizeof(BlockCheckpointInfo));
-	} catch (...) {
-		freed = NULL;
-	}
-	if (freed) 
-	{
-		DEBUG_ASSERTCRASH(debugLiteralTagString != NULL, ("null tagstrings are not allowed"));
-		freed->m_debugLiteralTagString = debugLiteralTagString;
-		freed->m_allocCheckpoint = allocCheckpoint;
-		freed->m_freeCheckpoint = -1;
-		freed->m_blockSize = blockSize;
-		freed->m_next = *pHead;
-		*pHead = freed;
-	}
-	return freed;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// METHODS for MemoryPoolSingleBlock
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/**
-	fill in a block's fields. this is usually done only just after a block is allocated,
-	but might also be done at other points in debug mode.
-*/
-void MemoryPoolSingleBlock::initBlock(Int logicalSize, MemoryPoolBlob *owningBlob, 
-			MemoryPoolFactory *owningFactory DECLARE_LITERALSTRING_ARG2)
-{
-	// Note that while it is OK for owningBlob to be null, it is NEVER ok
-	// for owningFactory to be null.
-	DEBUG_ASSERTCRASH(owningFactory, ("null factory"));
-
-#ifdef MEMORYPOOL_DEBUG
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-	m_magicCookie = SINGLEBLOCK_MAGIC_COOKIE;
-	m_debugFlags = 0;
-	if (!theMainInitFlag)
-		debugIgnoreLeaksForThisBlock();
-	DEBUG_ASSERTCRASH(debugLiteralTagString != NULL, ("null tagstrings are not allowed"));
-	m_debugLiteralTagString = debugLiteralTagString;
-	m_logicalSize = logicalSize;
-	m_wastedSize = 0;
-
-#ifdef MEMORYPOOL_SINGLEBLOCK_GETS_STACKTRACE
-	if (theStackTraceDepth > 0 && (!TheGlobalData || TheGlobalData->m_checkForLeaks)) 
-	{
-		memset(m_stacktrace, 0, MEMORYPOOL_STACKTRACE_SIZE_BYTES);
-		::FillStackAddresses(m_stacktrace, min(MEMORYPOOL_STACKTRACE_SIZE, theStackTraceDepth), MEMORYPOOL_STACKTRACE_SKIP_SIZE);
-	}
-	else 
-	{
-		m_stacktrace[0] = NULL;
-	}
-#endif
-}
-#endif // MEMORYPOOL_DEBUG
-#ifdef MEMORYPOOL_CHECKPOINTING
-	m_checkpointInfo = NULL;
-#endif
-#ifdef MEMORYPOOL_BOUNDINGWALL
-	m_wallPattern = theBoundingWallPattern++;
-	debugFillInWalls();
-#endif
-
-	m_nextBlock = NULL;
-#ifdef MPSB_DLINK
-	m_prevBlock = NULL;
-#endif
-	m_owningBlob = owningBlob;	// could be NULL
-}
-
-//-----------------------------------------------------------------------------
-/**
-	given a 'public' ptr to a block (ie, the ptr returned by the MemoryPool::allocateBlock),
-	recover the ptr to the MemoryPoolSingleBlock, so we can access the hidden fields.
-*/
-/* static */ MemoryPoolSingleBlock *MemoryPoolSingleBlock::recoverBlockFromUserData(void* pUserData)
-{
-	DEBUG_ASSERTCRASH(pUserData, ("null pUserData"));
-	if (!pUserData)
-		return NULL;
-	char* p = ((char*)pUserData) - sizeof(MemoryPoolSingleBlock);
-	#ifdef MEMORYPOOL_BOUNDINGWALL
-	p -= WALLSIZE;
-	#endif
-	MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)p;
-// yes, verify the block in this case for plain debug mode (not intense-verify mode)
-#ifdef MEMORYPOOL_DEBUG
-	block->debugVerifyBlock();
-#endif
-	return block;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	allocate and initialize a single block. this should only used by DynamicMemoryAllocator
-	when allocating an extraordinarily large block.
-*/
-/*static*/ MemoryPoolSingleBlock *MemoryPoolSingleBlock::rawAllocateSingleBlock(
-	MemoryPoolSingleBlock **pRawListHead, 
-	Int logicalSize, 
-	MemoryPoolFactory *owningFactory
-	DECLARE_LITERALSTRING_ARG2)
-{
-	MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)::sysAllocateDoNotZero(calcRawBlockSize(logicalSize));
-	block->initBlock(logicalSize, NULL, owningFactory PASS_LITERALSTRING_ARG2);
-	block->setNextRawBlock(*pRawListHead);
-	*pRawListHead = block;
-	return block;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	remove the block from the list, which is presumed to be a list of raw blocks.
-	generally, only the DynamicMemoryAllocator should call this.
-*/
-void MemoryPoolSingleBlock::removeBlockFromList(MemoryPoolSingleBlock **pHead)
-{
-	DEBUG_ASSERTCRASH(this->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
-#ifdef MPSB_DLINK
-	DEBUG_ASSERTCRASH(this->m_nextBlock == NULL || this->m_nextBlock->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
-	if (this->m_prevBlock)
-	{
-		DEBUG_ASSERTCRASH(this->m_prevBlock->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
-		DEBUG_ASSERTCRASH(*pHead != this, ("bad linkage"));
-		this->m_prevBlock->m_nextBlock = this->m_nextBlock;
-	}
-	else
-	{
-		DEBUG_ASSERTCRASH(*pHead == this, ("bad linkage"));
-		*pHead = this->m_nextBlock;
-	}
-
-	if (this->m_nextBlock)
-	{
-		DEBUG_ASSERTCRASH(this->m_nextBlock->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
-		this->m_nextBlock->m_prevBlock = this->m_prevBlock;
-	}
-#else
-	// this isn't very efficient, and may need upgrading... but to do so
-	// would require adding a back link, so I'd rather do some testing
-	// first to see if it's really a speed issue in practice. (the only place
-	// this is used is when freeing 'raw' blocks allocated via the DMA).
-	MemoryPoolSingleBlock *prev = NULL;
-	for (MemoryPoolSingleBlock *cur = *pHead; cur; cur = cur->m_nextBlock)
-	{
-		DEBUG_ASSERTCRASH(cur->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
-		if (cur == this)
-		{
-			if (prev)
-			{
-				prev->m_nextBlock = this->m_nextBlock;
-			}
-			else
-			{
-				*pHead = this->m_nextBlock;
-			}
-			break;
-		}
-		prev = cur;
-	}
-#endif
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-Int MemoryPoolSingleBlock::debugSingleBlockReportLeak(const char* owner)
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	// if allocated before main... just ignore the leak.
-	if (m_debugFlags & IGNORE_LEAKS)
-		return 0;
-
-	// it's free, ergo, not leaked.
-	if (m_debugLiteralTagString == FREE_SINGLEBLOCK_TAG_STRING)
-		return 0;
-
-	if (strcmp(m_debugLiteralTagString, "STR_AsciiString::ensureUniqueBufferOfSize") == 0)
-	{
-		/** @todo srj -- we leak a bunch of these for some reason (probably due to leaking Win32LocalFile)
-			so just ignore 'em for now... figure out later. */
-	}
-	else if (strstr(m_debugLiteralTagString, "Win32LocalFileSystem.cpp") != NULL)
-	{
-		/** @todo srj -- we leak a bunch of these for some reason 
-			so just ignore 'em for now... figure out later. */
-	}
-	else
-	{
-		DEBUG_LOG(("Leaked a block of size %d, tagstring %s, from pool/dma %s\n",m_logicalSize,m_debugLiteralTagString,owner));
-	}
-
-	#ifdef MEMORYPOOL_SINGLEBLOCK_GETS_STACKTRACE
-	if (!TheGlobalData || TheGlobalData->m_checkForLeaks)
-		::doStackDump(m_stacktrace, min(MEMORYPOOL_STACKTRACE_SIZE, theStackTraceDepth));
-	#endif
-
-	return 1;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	Verify internal consistency of this block.
-*/
-void MemoryPoolSingleBlock::debugVerifyBlock()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	DEBUG_ASSERTCRASH(this, ("null this"));
-	DEBUG_ASSERTCRASH(m_magicCookie == SINGLEBLOCK_MAGIC_COOKIE, ("wrong cookie"));
-	DEBUG_ASSERTCRASH(m_debugLiteralTagString != NULL, ("bad tagstring"));
-	/// @todo Put this check back in after the AI memory usage is under control (MSB)
-	//DEBUG_ASSERTCRASH(m_logicalSize>0 && m_logicalSize < 0x00ffffff, ("unlikely value for m_logicalSize"));
-	DEBUG_ASSERTCRASH(!m_nextBlock || m_nextBlock->m_owningBlob == m_owningBlob, ("owning blob mismatch..."));
-#ifdef MPSB_DLINK
-	DEBUG_ASSERTCRASH(!m_prevBlock || m_prevBlock->m_owningBlob == m_owningBlob, ("owning blob mismatch..."));
-#endif
-	debugCheckUnderrun();
-	debugCheckOverrun();
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	Fill block with bogus values and mark other internal fields for debugging purposes.
-*/
-void MemoryPoolSingleBlock::debugMarkBlockAsFree()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	::memset32(getUserDataNoDbg(), GARBAGE_FILL_VALUE, m_logicalSize);
-	m_debugLiteralTagString = FREE_SINGLEBLOCK_TAG_STRING;
-	#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugVerifyBlock();
-	#endif
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	Returns true iff someone overwrote part of the first bounding wall
-	(ie, tromped on memory just before the block)
-*/
-Bool MemoryPoolSingleBlock::debugCheckUnderrun()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-#ifdef MEMORYPOOL_BOUNDINGWALL
-	Int *p = (Int*)(((char*)getUserDataNoDbg()) - WALLSIZE);
-	for (Int i = 0; i < WALLCOUNT; i++, p++)
-	{
-		if (*p != m_wallPattern+i)
-		{
-			DEBUG_CRASH(("memory underrun for block \"%s\" (expected %08x, got %08x)\n",m_debugLiteralTagString,m_wallPattern+i,*p));
-			return true;
-		}
-	}
-#endif
-	return false;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	Returns true iff someone overwrote part of the second bounding wall
-	(ie, tromped on memory just after the block)
-*/
-Bool MemoryPoolSingleBlock::debugCheckOverrun()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-#ifdef MEMORYPOOL_BOUNDINGWALL
-	Int *p = (Int*)(((char*)getUserDataNoDbg()) + m_logicalSize);
-	for (Int i = 0; i < WALLCOUNT; i++, p++)
-	{
-		if (*p != m_wallPattern-i)
-		{
-			DEBUG_CRASH(("memory overrun for block \"%s\" (expected %08x, got %08x)\n",m_debugLiteralTagString,m_wallPattern+i,*p));
-			return true;
-		}
-	}
-#endif
-	return false;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_BOUNDINGWALL
-/**
-	Fill in the proper values for this block's bounding walls.
-*/
-void MemoryPoolSingleBlock::debugFillInWalls()
-{
-	Int *p;
-	Int i;
-
-	p = (Int*)(((char*)getUserDataNoDbg()) - WALLSIZE);
-	for (i = 0; i < WALLCOUNT; i++)
-		*p++ = m_wallPattern+i;
-
-	p = (Int*)(((char*)getUserDataNoDbg()) + m_logicalSize);
-	for (i = 0; i < WALLCOUNT; i++)
-		*p++ = m_wallPattern-i;
-
-	#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugVerifyBlock();
-	#endif
-}
-#endif
-
-
-//-----------------------------------------------------------------------------
-// METHODS for MemoryPoolBlob
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/**
-	fill in safe default values.
-*/
-MemoryPoolBlob::MemoryPoolBlob() :
-	m_owningPool(NULL),
-	m_nextBlob(NULL),
-	m_prevBlob(NULL),
-	m_firstFreeBlock(NULL),
-	m_usedBlocksInBlob(0),
-	m_totalBlocksInBlob(0),
-	m_blockData(NULL)
-{
-}
-
-//-----------------------------------------------------------------------------
-/**
-	throw away the blob. free the block data, if any.
-*/
-MemoryPoolBlob::~MemoryPoolBlob()
-{
-	::sysFree((void *)m_blockData);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	initialize a Blob; this is called just after the blob is allocated.
-	allocate space for the blocks in this blob and initialize all those blocks.
-*/
-void MemoryPoolBlob::initBlob(MemoryPool *owningPool, Int allocationCount)
-{
-	DEBUG_ASSERTCRASH(m_blockData == NULL, ("unlikely init call"));
-
-	m_owningPool = owningPool;
-	m_totalBlocksInBlob = allocationCount;
-	m_usedBlocksInBlob = 0;
-
-	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
-	m_blockData = (char *)::sysAllocate(rawBlockSize * m_totalBlocksInBlob);	// throws on failure
-
-	// set up the list of free blocks in the blob (namely, all of 'em)
-	MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)m_blockData;
-	MemoryPoolSingleBlock *next;
-	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--)
-	{
-		next = (MemoryPoolSingleBlock *)(((char *)block) + rawBlockSize);
-#ifdef MEMORYPOOL_DEBUG
-		block->initBlock(m_owningPool->getAllocationSize(), this, owningPool->getOwningFactory(), FREE_SINGLEBLOCK_TAG_STRING);
-#else
-		block->initBlock(m_owningPool->getAllocationSize(), this, owningPool->getOwningFactory());
-#endif
-		block->setNextFreeBlock((i > 0) ? next : NULL);
-#ifdef MEMORYPOOL_DEBUG
-		block->debugMarkBlockAsFree();
-#endif
-		block = next;
-	}
-	m_firstFreeBlock = (MemoryPoolSingleBlock *)m_blockData;
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerifyBlob();
-#endif
-}
-
-//-----------------------------------------------------------------------------
-/**
-	add this blob to a given pool's list-of-blobs
-*/
-void MemoryPoolBlob::addBlobToList(MemoryPoolBlob **ppHead, MemoryPoolBlob **ppTail)
-{
-	m_prevBlob = *ppTail;
-	m_nextBlob =  NULL;
-
-	if (*ppTail != NULL)
-		(*ppTail)->m_nextBlob = this;
-
-	if (*ppHead == NULL)
-		*ppHead = this;
-
-	*ppTail = this;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	remove this blob from a given pool's list-of-blobs
-*/
-void MemoryPoolBlob::removeBlobFromList(MemoryPoolBlob **ppHead, MemoryPoolBlob **ppTail)
-{
-	if (*ppHead == this)
-		*ppHead = this->m_nextBlob;
-	else
-		this->m_prevBlob->m_nextBlob = this->m_nextBlob;
-		
-	if (*ppTail == this)
-		*ppTail = this->m_prevBlob;
-	else
-		this->m_nextBlob->m_prevBlob = this->m_prevBlob;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	grab a free block from this blob, mark it as taken, and return it.
-	this method assumes that there is at least one free block in the blob!
-*/
-MemoryPoolSingleBlock *MemoryPoolBlob::allocateSingleBlock(DECLARE_LITERALSTRING_ARG1)
-{
-	DEBUG_ASSERTCRASH(m_firstFreeBlock, ("no free blocks available in MemoryPoolBlob"));
-	
-	MemoryPoolSingleBlock *block = m_firstFreeBlock;
-	m_firstFreeBlock = block->getNextFreeBlock();
-	++m_usedBlocksInBlob;
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	block->debugVerifyBlock();
-#endif
-#ifdef MEMORYPOOL_DEBUG
-	// this is debug-only because it only serves to update the debugLiteralTagString.
-	block->initBlock(m_owningPool->getAllocationSize(), this, m_owningPool->getOwningFactory(), debugLiteralTagString);
-#endif
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerifyBlob();
-#endif
-
-//	don't need to zero this out... the caller will do that, if necessary
-//	memset(block->getUserData(), 0, m_owningPool->getAllocationSize());
-
-	return block;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	make this block available for future allocations. it is assumed that the block
-	belongs to this blob, and is not already free. 
-*/
-void MemoryPoolBlob::freeSingleBlock(MemoryPoolSingleBlock *block)
-{	
-	DEBUG_ASSERTCRASH(block->getOwningBlob() == this, ("block does not belong to this blob"));
-
-	block->setNextFreeBlock(m_firstFreeBlock);
-	m_firstFreeBlock = block;
-	--m_usedBlocksInBlob;
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	block->debugVerifyBlock();
-#endif
-#ifdef MEMORYPOOL_DEBUG
-	block->debugMarkBlockAsFree();
-#endif
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerifyBlob();
-#endif
-	
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	Perform internal consistency checking on this blob and all its blocks.
-*/
-void MemoryPoolBlob::debugMemoryVerifyBlob()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	DEBUG_ASSERTCRASH(m_owningPool != NULL, ("bad owner"));
-	DEBUG_ASSERTCRASH(m_usedBlocksInBlob >= 0 && m_usedBlocksInBlob <= m_totalBlocksInBlob, ("unlikely m_usedBlocksInBlob"));
-	DEBUG_ASSERTCRASH(m_totalBlocksInBlob > 0, ("unlikely m_totalBlocksInBlob"));
-
-	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
-	char *blockData = m_blockData;
-	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--, blockData += rawBlockSize)
-	{
-		MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)blockData;
-		block->debugVerifyBlock();
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-Int MemoryPoolBlob::debugBlobReportLeaks(const char* owner)
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	Int any = 0;
-	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
-	char *blockData = m_blockData;
-	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--, blockData += rawBlockSize)
-	{
-		MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)blockData;
-		any += block->debugSingleBlockReportLeak(owner);
-	}
-	return any;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return true iff this block belongs to this blob.
-*/
-Bool MemoryPoolBlob::debugIsBlockInBlob(void *pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
-	char *blockData = m_blockData;
-	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--)
-	{
-		if ((char *)block == blockData)
-			return true;
-		blockData += rawBlockSize;
-	}
-	return false;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	set all the checkpointinfos to null for all the blocks in this blob.
-	this does NOT free the checkpointinfos; that is presumed to happen elsewhere.
-*/
-void MemoryPoolBlob::debugResetCheckpoints()
-{
-	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
-	char *blockData = m_blockData;
-	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--, blockData += rawBlockSize)
-	{
-		MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)blockData;
-		block->debugResetCheckpoint();
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// METHODS for Checkpointable
-//-----------------------------------------------------------------------------
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-//-----------------------------------------------------------------------------
-/**
-	init fields of Checkpointable to safe values.
-*/
-Checkpointable::Checkpointable() : 
-	m_firstCheckpointInfo(NULL), 
-	m_cpiEverFailed(false)
-{
-}
-#endif
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-//-----------------------------------------------------------------------------
-/**
-	destroy the object. discard any remaining checkpointinfo.
-*/
-Checkpointable::~Checkpointable()
-{
-	BlockCheckpointInfo::freeList(&m_firstCheckpointInfo);
-	m_firstCheckpointInfo = NULL;
-	m_cpiEverFailed = false;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	create a new checkpointinfo and fill it in appropriately. this does NOT
-	throw an exception on failure; it quietly returns null if there is not
-	enough memory, and sets a flag to indicate our checkpointinfo is not complete.
-*/
-BlockCheckpointInfo *Checkpointable::debugAddCheckpointInfo(
-	const char *debugLiteralTagString,
-	Int allocCheckpoint,
-	Int blockSize
-)
-{
-
-	BlockCheckpointInfo *bi = BlockCheckpointInfo::addToList(&m_firstCheckpointInfo, debugLiteralTagString,
-				allocCheckpoint, blockSize);
-
-	if (bi)
-	{
-#ifdef MEMORYPOOL_STACKTRACE
-		void **stacktrace = bi->getStacktraceInfo();
-		if (theStackTraceDepth > 0 && !TheGlobalData || TheGlobalData->m_checkForLeaks) 
-		{
-			memset(stacktrace, 0, MEMORYPOOL_STACKTRACE_SIZE_BYTES);
-			::FillStackAddresses(stacktrace, min(MEMORYPOOL_STACKTRACE_SIZE, theStackTraceDepth), MEMORYPOOL_STACKTRACE_SKIP_SIZE);
-		}
-		else 
-		{
-			stacktrace[0] = NULL;
-		}
-#endif
-	}
-	else
-	{
-		m_cpiEverFailed = true;
-	}
-
-	return bi;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	print a report on the checkpointinfos belonging to this pool/dma.
-*/
-void Checkpointable::debugCheckpointReport( Int flags, Int startCheckpoint, Int endCheckpoint, const char *poolName )
-{
-	DEBUG_ASSERTCRASH(startCheckpoint >= 0 && startCheckpoint <= endCheckpoint, ("bad checkpoints"));
-	DEBUG_ASSERTCRASH((flags & _REPORT_CP_ALLOCATED_DONTCARE) != 0, ("bad flags: must set at least one alloc flag"));
-	DEBUG_ASSERTCRASH((flags & _REPORT_CP_FREED_DONTCARE) != 0, ("bad flags: must set at least one freed flag"));
-
-	if (m_cpiEverFailed)
-	{
-		DEBUG_LOG(("  *** WARNING *** info on freed blocks may be inaccurate or incomplete!\n"));
-	}
-
-	for (BlockCheckpointInfo *bi = m_firstCheckpointInfo; bi; bi = bi->getNext())
-	{
-		BlockCheckpointInfo::doBlockCheckpointReport( bi, poolName, flags, startCheckpoint, endCheckpoint );
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	throw away all the checkpointinfos. this frees the memory, but blocks might still
-	refer to the discarded infos; you must zero those elsewhere.
-*/
-void Checkpointable::debugResetCheckpoints()
-{
-	BlockCheckpointInfo::freeList(&m_firstCheckpointInfo);
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// METHODS for MemoryPool
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/**
-	init to safe values.
-*/
-MemoryPool::MemoryPool() :
-	m_factory(NULL),
-	m_nextPoolInFactory(NULL),
-	m_poolName(""),
-	m_allocationSize(0),
-	m_initialAllocationCount(0),
-	m_overflowAllocationCount(0),
-	m_usedBlocksInPool(0),
-	m_totalBlocksInPool(0),
-	m_peakUsedBlocksInPool(0),
-	m_firstBlob(NULL),
-	m_lastBlob(NULL),
-	m_firstBlobWithFreeBlocks(NULL)
-{
-}
-
-//-----------------------------------------------------------------------------
-/**
-	initialize the memory pool with the given parameters. allocate the initial
-	set of blocks.
-*/
-void MemoryPool::init(MemoryPoolFactory *factory, const char *poolName, Int allocationSize, Int initialAllocationCount, Int overflowAllocationCount)
-{
-	m_factory = factory;
-	m_poolName = poolName;
-	m_allocationSize = ::roundUpMemBound(allocationSize);	// round up to four-byte boundary
-	m_initialAllocationCount = initialAllocationCount;
-	m_overflowAllocationCount = overflowAllocationCount;
-	m_usedBlocksInPool = 0;
-	m_totalBlocksInPool = 0;
-	m_peakUsedBlocksInPool = 0;
-	m_firstBlob = NULL;
-	m_lastBlob = NULL;
-	m_firstBlobWithFreeBlocks = NULL;
-
-	// go ahead and init the initial block here (will throw on failure)
-	createBlob(m_initialAllocationCount);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	throw away the pool, and all blocks/blobs associated with it.
-*/
-MemoryPool::~MemoryPool()
-{   
-	// toss everything. we could do this slightly more efficiently,
-	// but not really worth the extra code to do so.
-	while (m_firstBlob) 
-	{
-		freeBlob(m_firstBlob);
-	}
-}
-
-//-----------------------------------------------------------------------------
-/**
-	create a new blob for this pool. if you set up good values for initialAllocationCount,
-	this should rarely (if ever) be called (though during development it will be called
-	frequently).
-*/
-MemoryPoolBlob* MemoryPool::createBlob(Int allocationCount)
-{
-	DEBUG_ASSERTCRASH(allocationCount > 0 && allocationCount%MEM_BOUND_ALIGNMENT==0, ("bad allocationCount (must be >0 and evenly divisible by %d)",MEM_BOUND_ALIGNMENT));
-
-	MemoryPoolBlob* blob = new (::sysAllocate(sizeof MemoryPoolBlob)) MemoryPoolBlob;	// will throw on failure
-
-	blob->initBlob(this, allocationCount);	// will throw on failure
-
-	blob->addBlobToList(&m_firstBlob, &m_lastBlob);
-
-	DEBUG_ASSERTCRASH(m_firstBlobWithFreeBlocks == NULL, ("DO NOT IGNORE. Please call John McD - x36872 (m_firstBlobWithFreeBlocks != NULL)"));
-	m_firstBlobWithFreeBlocks = blob;
-
-	// bookkeeping
-	m_totalBlocksInPool += allocationCount;
-
-#ifdef MEMORYPOOL_DEBUG
-	m_factory->adjustTotals("", 0, allocationCount*getAllocationSize());
-#endif
-
-	return blob;
-}
-	
-//-----------------------------------------------------------------------------
-/**
-	throw away a given blob, and all its blocks. it's assumed that the blob belongs
-	to this pool.
-*/
-Int MemoryPool::freeBlob(MemoryPoolBlob* blob)
-{
-	DEBUG_ASSERTCRASH(blob, ("null blob"));
-	DEBUG_ASSERTCRASH(blob->getOwningPool() == this, ("blob does not belong to this pool"));
-
-	// save these for later...
-	Int totalBlocksInBlob = blob->getTotalBlockCount();
-	Int usedBlocksInBlob = blob->getUsedBlockCount();
-	DEBUG_ASSERTCRASH(usedBlocksInBlob == 0, ("freeing a nonempty blob (%d)\n",usedBlocksInBlob));
-
-	// this is really just an estimate... will be too small in debug mode.
-	Int amtFreed = totalBlocksInBlob * getAllocationSize() + sizeof(MemoryPoolBlob);
-
-	// de-link it from our list
-	blob->removeBlobFromList(&m_firstBlob, &m_lastBlob);
-	
-	// ensure that the 'first free' blob is still a valid blob. 
-	// (doesn't need to actually have free blocks, just be a valid blob) 
-	if (m_firstBlobWithFreeBlocks == blob)
-		m_firstBlobWithFreeBlocks = m_firstBlob;
-
-	// this is evil... since there is no 'placement delete' we must do this the hard way
-	// and call the dtor directly. ordinarily this is heinous, but in this case we'll
-	// make an exception.
-	blob->~MemoryPoolBlob();
-	::sysFree((void *)blob);
-
-	// finally... bookkeeping
-	m_usedBlocksInPool -= usedBlocksInBlob;
-	m_totalBlocksInPool -= totalBlocksInBlob;
-
-#ifdef MEMORYPOOL_DEBUG
-	m_factory->adjustTotals("", -usedBlocksInBlob*getAllocationSize(), -totalBlocksInBlob*getAllocationSize());
-#endif
-
-	return amtFreed;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	allocate a block from this pool and return it, but don't bother zeroing
-	out the block. if unable to allocate, throw ERROR_OUT_OF_MEMORY. this
-	function will never return null.
-*/
-void* MemoryPool::allocateBlockDoNotZeroImplementation(DECLARE_LITERALSTRING_ARG1)
-{
-	ScopedCriticalSection scopedCriticalSection(TheMemoryPoolCriticalSection);
-
-	if (m_firstBlobWithFreeBlocks != NULL && !m_firstBlobWithFreeBlocks->hasAnyFreeBlocks()) 
-	{
-		// hmm... the current 'free' blob has nothing available. look and see if there
-		// are any other existing blobs with freespace.
-		MemoryPoolBlob *blob = m_firstBlob;
-		for (; blob != NULL; blob = blob->getNextInList()) 
-		{
-			if (blob->hasAnyFreeBlocks())
-			 	break;
-		}
-
-		// note that if we walk thru the list without finding anything, this will 
-		// reset m_firstBlobWithFreeBlocks to null and fall thru.
-	 	m_firstBlobWithFreeBlocks = blob;
-	}
-	
-	// OK, if we are here then we have no blobs with freespace... darn.
-	// allocate an overflow block.
-	if (m_firstBlobWithFreeBlocks == NULL) 
-	{
-		if (m_overflowAllocationCount == 0)
-		{
-			throw ERROR_OUT_OF_MEMORY;	// this pool is not allowed to grow
-		}
-		else 
-		{
-			createBlob(m_overflowAllocationCount); // throws on failure
-		}
-	}
-	
-	MemoryPoolBlob *blob = m_firstBlobWithFreeBlocks;
-
-	DEBUG_ASSERTCRASH(blob, ("no blob with free blocks available in MemoryPool::allocate"));
-		
-	MemoryPoolSingleBlock *block = blob->allocateSingleBlock(PASS_LITERALSTRING_ARG1);
-	DEBUG_ASSERTCRASH(block, ("should not fail here"));
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-	BlockCheckpointInfo *bi = debugAddCheckpointInfo(block->debugGetLiteralTagString(), m_factory->getCurCheckpoint(), getAllocationSize());
-	if (bi)
-		block->debugSetCheckpointInfo(bi);
-#endif
-
-	// bookkeeping
-	++m_usedBlocksInPool;
-	if (m_peakUsedBlocksInPool < m_usedBlocksInPool)
-		m_peakUsedBlocksInPool = m_usedBlocksInPool;
-
-#ifdef MEMORYPOOL_DEBUG
-	m_factory->adjustTotals(debugLiteralTagString, 1*getAllocationSize(), 0);
-	#ifdef USE_FILLER_VALUE
-	{
-		USE_PERF_TIMER(MemoryPoolInitFilling)
-		::memset32(block->getUserData(), s_initFillerValue, getAllocationSize());
-	}
-	#endif
-#endif
-
-	return block->getUserData();
-}
-
-//-----------------------------------------------------------------------------
-/**
-	allocate a block from this pool and return it, and zero out the contents
-	of the block. if unable to allocate, throw ERROR_OUT_OF_MEMORY. this
-	function will never return null.
-*/
-void* MemoryPool::allocateBlockImplementation(DECLARE_LITERALSTRING_ARG1)
-{
-	void* p = allocateBlockDoNotZeroImplementation(PASS_LITERALSTRING_ARG1);	// throws on failure
-	memset(p, 0, getAllocationSize());
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	free a block allocated by this pool. it's ok to pass null.
-*/
-void MemoryPool::freeBlock(void* pBlockPtr)
-{
-	if (!pBlockPtr)
-		return;	// my, that was easy
-
-	ScopedCriticalSection scopedCriticalSection(TheMemoryPoolCriticalSection);
-
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	MemoryPoolBlob *blob = block->getOwningBlob();
-#ifdef MEMORYPOOL_DEBUG
-	const char* tagString = block->debugGetLiteralTagString();
-#endif
-	
-	DEBUG_ASSERTCRASH(blob && blob->getOwningPool() == this, ("block does not belong to this pool"));
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-	BlockCheckpointInfo *bi = block->debugGetCheckpointInfo();
-	DEBUG_ASSERTCRASH(bi, ("hmm, no checkpoint info"));
-	if (bi)
-		bi->debugSetFreepoint(m_factory->getCurCheckpoint());
-#endif
-
-	blob->freeSingleBlock(block);
-	
-	// if we want to free the blobs as they become empty, do that here.
-	// normally we don't bother, but just in case this is ever desired, here's how you'd do it...
-	//
-	// if (blob->m_usedBlocksInBlob == 0) 
-	// {
-	//	freeBlob(blob);
-	//	return;
-	//} 
-	
-	if (!m_firstBlobWithFreeBlocks)
-		m_firstBlobWithFreeBlocks = blob;
-
-	// bookkeeping
-	--m_usedBlocksInPool;
-
-#ifdef MEMORYPOOL_DEBUG
-	m_factory->adjustTotals(tagString, -1*getAllocationSize(), 0);
-#endif
-}
-
-//-----------------------------------------------------------------------------
-Int MemoryPool::countBlobsInPool()
-{
-	Int blobs = 0;
-	for (MemoryPoolBlob* blob = m_firstBlob; blob;) 
-	{
-		++blobs;
-		blob = blob->getNextInList();
-	}
-	return blobs;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	if the pool has any blobs that are completely unused, they are released back to the
-	operating system. this will rarely, if ever, be called, but may be useful
-	in odd situations.
-*/
-Int MemoryPool::releaseEmpties()
-{
-	ScopedCriticalSection scopedCriticalSection(TheMemoryPoolCriticalSection);
-
-	Int released = 0;
-
-	for (MemoryPoolBlob* blob = m_firstBlob; blob;) 
-	{
-		MemoryPoolBlob* pNext = blob->getNextInList();
-		if (blob->getUsedBlockCount() == 0) 
-			released += freeBlob(blob);
-		blob = pNext;
-	}
-	return released;
-}
-
-
-//-----------------------------------------------------------------------------
-/**
-	throw away everything in the pool, but keep the pool itself valid.
-*/
-void MemoryPool::reset()
-{
-	ScopedCriticalSection scopedCriticalSection(TheMemoryPoolCriticalSection);
-
-	// toss everything. we could do this slightly more efficiently,
-	// but not really worth the extra code to do so.
-	while (m_firstBlob) 
-	{
-		freeBlob(m_firstBlob);
-	}
-	m_firstBlob = NULL;
-	m_lastBlob = NULL;
-	m_firstBlobWithFreeBlocks = NULL;
-
-	init(m_factory, m_poolName, m_allocationSize, m_initialAllocationCount, m_overflowAllocationCount);	// will throw on failure
-
-}
-
-//-----------------------------------------------------------------------------
-/**
-	add this pool to the factory's list-of-pools.
-*/
-void MemoryPool::addToList(MemoryPool **pHead)
-{
-	this->m_nextPoolInFactory = *pHead;
-	*pHead = this;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	remove this pool from the factory's list-of-pools.
-*/
-void MemoryPool::removeFromList(MemoryPool **pHead)
-{
-	// this isn't very efficient, but then, we rarely remove pools...
-	// usually only at shutdown. so don't bother optimizing.
-	MemoryPool *prev = NULL;
-	for (MemoryPool *cur = *pHead; cur; cur = cur->m_nextPoolInFactory)
-	{
-		if (cur == this)
-		{
-			if (prev)
-			{
-				prev->m_nextPoolInFactory = this->m_nextPoolInFactory;
-			}
-			else
-			{
-				*pHead = this->m_nextPoolInFactory;
-			}
-			break;
-		}
-		prev = cur;
-	}
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	print a report about per-pool allocation statistics to the debug log.
-	if the pool is null, print column headers.
-*/
-/*static*/ void MemoryPool::debugPoolInfoReport( MemoryPool *pool, FILE *fp )
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	const char *PREPEND = "POOLINFO";	// allows grepping more easily
-
-	if (!pool)
-	{
-		DEBUG_LOG(("%s,%32s,%6s,%6s,%6s,%6s,%6s,%6s\n",PREPEND,"POOLNAME","BLKSZ","INIT","OVRFL","USED","TOTAL","PEAK"));
-		if( fp )
-			fprintf( fp, "%s,%32s,%6s,%6s,%6s,%6s,%6s,%6s\n",PREPEND,"POOLNAME","BLKSZ","INIT","OVRFL","USED","TOTAL","PEAK" );
-	}
-	else
-	{
-		DEBUG_LOG(("%s,%32s,%6d,%6d,%6d,%6d,%6d,%6d\n",PREPEND,
-			pool->m_poolName,pool->m_allocationSize,pool->m_initialAllocationCount,pool->m_overflowAllocationCount,
-			pool->m_usedBlocksInPool,pool->m_totalBlocksInPool,pool->m_peakUsedBlocksInPool));
-		if( fp )
-		{
-			fprintf( fp, "%s,%32s,%6d,%6d,%6d,%6d,%6d,%6d\n",PREPEND,
-				pool->m_poolName,pool->m_allocationSize,pool->m_initialAllocationCount,pool->m_overflowAllocationCount,
-				pool->m_usedBlocksInPool,pool->m_totalBlocksInPool,pool->m_peakUsedBlocksInPool );
-		}
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-Int MemoryPool::debugPoolReportLeaks( const char* owner )
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	Int any = 0;
-	for (MemoryPoolBlob* blob = m_firstBlob; blob; blob = blob->getNextInList()) 
-	{
-		any += blob->debugBlobReportLeaks(owner);
-	}
-	return any;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	perform internal consistency checking on the memory pool.
-*/
-void MemoryPool::debugMemoryVerifyPool()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	Int used = 0;
-	Int total = 0;
-	for (MemoryPoolBlob* blob = m_firstBlob; blob; blob = blob->getNextInList()) 
-	{
-		blob->debugMemoryVerifyBlob();
-		used += blob->getUsedBlockCount();
-		total += blob->getTotalBlockCount();
-	}
-	DEBUG_ASSERTCRASH(m_usedBlocksInPool == used, ("used mismatch %d %d",m_usedBlocksInPool,used));
-	DEBUG_ASSERTCRASH(m_totalBlocksInPool == total, ("total mismatch %d %d",m_totalBlocksInPool,total));
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return true iff the block is a valid block in this pool.
-*/
-Bool MemoryPool::debugIsBlockInPool(void *pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pBlockPtr)
-		return false;
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerifyPool();
-#endif
-
-	Bool check1 = false, check2 = false;
-
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	MemoryPoolBlob *ownerBlob = block->getOwningBlob();
-	for (MemoryPoolBlob* blob = m_firstBlob; blob; blob = blob->getNextInList()) 
-	{
-		if (blob->debugIsBlockInBlob(pBlockPtr))
-			check1 = true;
-	
-		if (blob == ownerBlob)
-			check2 = true;
-	}
-
-	DEBUG_ASSERTCRASH(check1 == check2, ("mismatch checks in debugIsBlockInPool"));
-
-	return check1 && check2;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return the tagstring for the block. this will never return null; if
-	the block is null or invalid, "FREE_SINGLEBLOCK_TAG_STRING" will be returned.
-	it is assumed that the block was allocated by this pool.
-*/
-const char *MemoryPool::debugGetBlockTagString(void *pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pBlockPtr)
-		return FREE_SINGLEBLOCK_TAG_STRING;
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerifyPool();
-#endif
-	if (!debugIsBlockInPool(pBlockPtr)) 
-	{
-		DEBUG_CRASH(("block is not in this pool"));
-		return FREE_SINGLEBLOCK_TAG_STRING;
-	}
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	return block->debugGetLiteralTagString();
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	free all checkpointinfo for this pool, and reset all ptrs to checkpointinfo.
-*/
-void MemoryPool::debugResetCheckpoints()
-{
-	Checkpointable::debugResetCheckpoints();
-	for (MemoryPoolBlob* blob = m_firstBlob; blob; blob = blob->getNextInList()) 
-	{
-		blob->debugResetCheckpoints();
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// METHODS for DynamicMemoryAllocator
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/**
-	init the DMA to safe values.
-*/
-DynamicMemoryAllocator::DynamicMemoryAllocator() :
-	m_factory(NULL),
-	m_nextDmaInFactory(NULL),
-	m_numPools(0),
-	m_usedBlocksInDma(0),
-	m_rawBlocks(NULL)
-{
-	for (Int i = 0; i < MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS; i++)
-		m_pools[i] = 0;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	Initialize the dma and its subpools.
-*/
-void DynamicMemoryAllocator::init(MemoryPoolFactory *factory, Int numSubPools, const PoolInitRec pParms[])
-{
-	const PoolInitRec defaultDMA[7] = 
-	{
-		{ "dmaPool_16", 16, 64, 64 },
-		{ "dmaPool_32", 32, 64, 64 },
-		{ "dmaPool_64", 64, 64, 64 },
-		{ "dmaPool_128", 128, 64, 64 },
-		{ "dmaPool_256", 256, 64, 64 },
-		{ "dmaPool_512", 512, 64, 64 },
-		{ "dmaPool_1024", 1024, 64, 64 }
-	};
-
-	if (numSubPools == 0 || pParms == NULL) 
-	{
-		// use the defaults...
-		numSubPools = 7;
-		pParms = defaultDMA;
-	}
-
-
-	m_factory = factory;
-	m_numPools = numSubPools;
-	if (m_numPools > MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS)
-		m_numPools = MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS;
-	m_usedBlocksInDma = 0;
-	for (Int i = 0; i < m_numPools; i++)
-	{
-		DEBUG_ASSERTCRASH(i == 0 || pParms[i].allocationSize > pParms[i-1].allocationSize, ("alloc size must increase monotonically for DMA"));
-		m_pools[i] = m_factory->createMemoryPool(&pParms[i]);
-	}
-}
-
-//-----------------------------------------------------------------------------
-/**
-	destroy the dma and its subpools.
-*/
-DynamicMemoryAllocator::~DynamicMemoryAllocator()
-{
-	DEBUG_ASSERTCRASH(m_usedBlocksInDma == 0, ("destroying a nonempty dma"));
-
-	/// @todo this may cause double-destruction of the subpools -- test & fix
-	for (Int i = 0; i < m_numPools; i++) 
-	{
-		m_factory->destroyMemoryPool(m_pools[i]);
-		m_pools[i] = NULL;
-	}
-
-	while (m_rawBlocks)
-	{
-		freeBytes(m_rawBlocks->getUserData());
-	}
-}
-
-//-----------------------------------------------------------------------------
-/**
-	find the best-fitting subpool in this dma for a given allocation size.
-	if no subpool can satisfy the size, return null.
-*/
-MemoryPool *DynamicMemoryAllocator::findPoolForSize(Int allocSize)
-{
-	for (Int i = 0; i < m_numPools; i++)
-	{
-		DEBUG_ASSERTCRASH(m_pools[i], ("null pool"));
-		if (allocSize <= m_pools[i]->getAllocationSize())
-			return m_pools[i];
-	}
-	return NULL;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	add this DMA to the factory's list of dmas.
-*/
-void DynamicMemoryAllocator::addToList(DynamicMemoryAllocator **pHead)
-{
-	this->m_nextDmaInFactory = *pHead;
-	*pHead = this;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	remove this DMA from the factory's list of dmas.
-*/
-void DynamicMemoryAllocator::removeFromList(DynamicMemoryAllocator **pHead)
-{
-	// this isn't very efficient, but then, we rarely remove these...
-	// usually only at shutdown. so don't bother optimizing.
-	DynamicMemoryAllocator *prev = NULL;
-	for (DynamicMemoryAllocator *cur = *pHead; cur; cur = cur->m_nextDmaInFactory)
-	{
-		if (cur == this)
-		{
-			if (prev)
-			{
-				prev->m_nextDmaInFactory = this->m_nextDmaInFactory;
-			}
-			else
-			{
-				*pHead = this->m_nextDmaInFactory;
-			}
-			break;
-		}
-		prev = cur;
-	}
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-void DynamicMemoryAllocator::debugIgnoreLeaksForThisBlock(void* pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pBlockPtr)
-		return;
-
-#ifdef MEMORYPOOL_CHECK_BLOCK_OWNERSHIP
-	DEBUG_ASSERTCRASH(debugIsBlockInDma(pBlockPtr), ("block is not in this dma"));
-#endif
-
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	if (block->getOwningBlob()) 
-	{
-#ifdef MEMORYPOOL_DEBUG
-		DEBUG_ASSERTCRASH(findPoolForSize(block->debugGetLogicalSize()) == block->getOwningBlob()->getOwningPool(), ("pool mismatch"));
-#endif
-		block->debugIgnoreLeaksForThisBlock();
-	}
-	else
-	{
-		DEBUG_CRASH(("cannot currently ignore leaks for raw blocks (allocation too large)\n"));
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-/**
-	allocate a chunk-o-bytes from this DMA and return it, but don't bother zeroing
-	out the block. if unable to allocate, throw ERROR_OUT_OF_MEMORY. this
-	function will never return null.
-*/
-void *DynamicMemoryAllocator::allocateBytesDoNotZeroImplementation(Int numBytes DECLARE_LITERALSTRING_ARG2)
-{
-	ScopedCriticalSection scopedCriticalSection(TheDmaCriticalSection);
-
-	void *result = NULL;
-
-#ifdef MEMORYPOOL_DEBUG
-	DEBUG_ASSERTCRASH(debugLiteralTagString != NULL, ("bad tagstring"));
-	Int waste = 0;
-#endif
-
-	MemoryPool *pool = findPoolForSize(numBytes);
-	if (pool != NULL) 
-	{
-		result = pool->allocateBlockDoNotZeroImplementation(PASS_LITERALSTRING_ARG1);
-#ifdef MEMORYPOOL_DEBUG
-	{
-		USE_PERF_TIMER(MemoryPoolDebugging)
-		waste = pool->getAllocationSize() - numBytes;
-		MemoryPoolSingleBlock *wblock = MemoryPoolSingleBlock::recoverBlockFromUserData(result);
-		wblock->debugSetWastedSize(waste);
-#ifdef INTENSE_DMA_BOOKKEEPING
-		if (doingIntenseDMA == 0)
-#endif
-		{
-			theWastedDMA += (waste);
-			if (thePeakWastedDMA < theWastedDMA)
-				thePeakWastedDMA = theWastedDMA;
-		}
-	}
-#endif // MEMORYPOOL_DEBUG
-	}
-	else
-	{
-		// too big for our pools -- just go right to the metal.
-		MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::rawAllocateSingleBlock(&m_rawBlocks, numBytes, m_factory PASS_LITERALSTRING_ARG2);
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-		BlockCheckpointInfo *bi = debugAddCheckpointInfo(block->debugGetLiteralTagString(), m_factory->getCurCheckpoint(), numBytes);
-		if (bi)
-			block->debugSetCheckpointInfo(bi);
-#endif
-
-		result = block->getUserData();
-
-#ifdef MEMORYPOOL_DEBUG
-		m_factory->adjustTotals(debugLiteralTagString, numBytes, numBytes);
-		theTotalLargeBlocks += numBytes;
-		if (thePeakLargeBlocks < theTotalLargeBlocks)
-			thePeakLargeBlocks = theTotalLargeBlocks;
-#endif
-	}
-
-#ifdef MEMORYPOOL_DEBUG
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-	theTotalDMA += numBytes;
-	if (thePeakDMA < theTotalDMA)
-		thePeakDMA = theTotalDMA;
-#ifdef INTENSE_DMA_BOOKKEEPING
-	if (isMemoryManagerOfficiallyInited() && doingIntenseDMA == 0)
-	{
-		++doingIntenseDMA;
-		UsedNPeak& up = TheUsedNPeakMap[debugLiteralTagString];
-		up.used += numBytes;
-		if (up.peak < up.used)
-			up.peak = up.used;
-		up.waste += waste;
-		if (up.peakwaste < up.waste)
-			up.peakwaste = up.waste;
-		--doingIntenseDMA;
-	}
-#endif
-}
-#endif // MEMORYPOOL_DEBUG
-
-	++m_usedBlocksInDma;
-	DEBUG_ASSERTCRASH(m_usedBlocksInDma >= 0, ("negative count for m_usedBlocksInDma"));
-#ifdef MEMORYPOOL_DEBUG
-	#ifdef USE_FILLER_VALUE
-	{
-		USE_PERF_TIMER(MemoryPoolInitFilling)
-		::memset32(result, s_initFillerValue, numBytes);
-	}
-	#endif
-#endif
-	return result;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	allocate a chunk-o-bytes from this DMA and return it, and zero out the contents first.
-	if unable to allocate, throw ERROR_OUT_OF_MEMORY. 
-	this function will never return null.
-*/
-void *DynamicMemoryAllocator::allocateBytesImplementation(Int numBytes DECLARE_LITERALSTRING_ARG2)
-{
-	void* p = allocateBytesDoNotZeroImplementation(numBytes PASS_LITERALSTRING_ARG2);	// throws on failure
-	memset(p, 0, numBytes);
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	free a chunk-o-bytes allocated by this dma. it's ok to pass null.
-*/
-void DynamicMemoryAllocator::freeBytes(void* pBlockPtr)
-{
-	if (!pBlockPtr)
-		return;
-
-	ScopedCriticalSection scopedCriticalSection(TheDmaCriticalSection);
-
-#ifdef MEMORYPOOL_CHECK_BLOCK_OWNERSHIP
-	DEBUG_ASSERTCRASH(debugIsBlockInDma(pBlockPtr), ("block is not in this dma"));
-#endif
-
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-#ifdef MEMORYPOOL_DEBUG
-	Int waste = 0, used = 0;
-#ifdef INTENSE_DMA_BOOKKEEPING
-	const char* tagString;
-#endif
-	{
-		USE_PERF_TIMER(MemoryPoolDebugging)
-		waste = 0;
-		used = block->debugGetLogicalSize();
-		theTotalDMA -= used;
-		if (thePeakDMA < theTotalDMA)
-			thePeakDMA = theTotalDMA;
-	#ifdef INTENSE_DMA_BOOKKEEPING
-		tagString = block->debugGetLiteralTagString();
-	#endif
-	}
-#endif // MEMORYPOOL_DEBUG
-
-	if (block->getOwningBlob()) 
-	{
-#ifdef MEMORYPOOL_DEBUG
-		{
-			USE_PERF_TIMER(MemoryPoolDebugging)
-			DEBUG_ASSERTCRASH(findPoolForSize(used) == block->getOwningBlob()->getOwningPool(), ("pool mismatch"));
-	#ifdef INTENSE_DMA_BOOKKEEPING
-			if (doingIntenseDMA == 0)
-	#endif
-			{
-				waste = block->debugGetWastedSize();
-				theWastedDMA -= waste;
-				if (thePeakWastedDMA < theWastedDMA)
-					thePeakWastedDMA = theWastedDMA;
-			}
-		}
-#endif // MEMORYPOOL_DEBUG
-		block->getOwningBlob()->getOwningPool()->freeBlock(pBlockPtr);
-	}
-	else
-	{
-		// was allocated via sysAllocate.
-#ifdef MEMORYPOOL_CHECKPOINTING
-		BlockCheckpointInfo *bi = block->debugGetCheckpointInfo();
-		DEBUG_ASSERTCRASH(bi, ("hmm, no checkpoint info"));
-		if (bi)
-			bi->debugSetFreepoint(m_factory->getCurCheckpoint());
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-		m_factory->adjustTotals(block->debugGetLiteralTagString(), -used, -used);
-		theTotalLargeBlocks -= used;
-		if (thePeakLargeBlocks < theTotalLargeBlocks)
-			thePeakLargeBlocks = theTotalLargeBlocks;
-		block->debugMarkBlockAsFree();
-#endif
-
-		block->removeBlockFromList(&m_rawBlocks);
-
-		::sysFree((void *)block);
-
-	}
-	--m_usedBlocksInDma;
-	DEBUG_ASSERTCRASH(m_usedBlocksInDma >= 0, ("negative count for m_usedBlocksInDma"));
-
-#ifdef INTENSE_DMA_BOOKKEEPING
-	if (isMemoryManagerOfficiallyInited() && doingIntenseDMA == 0)
-	{
-		++doingIntenseDMA;
-		UsedNPeak& up = TheUsedNPeakMap[tagString];
-		up.used -= used;
-		if (up.peak < up.used)
-			up.peak = up.used;
-		up.waste -= waste;
-		if (up.peakwaste < up.waste)
-			up.peakwaste = up.waste;
-		--doingIntenseDMA;
-	}
-#endif
-
-}
-
-//-----------------------------------------------------------------------------
-Int DynamicMemoryAllocator::getActualAllocationSize(Int numBytes)
-{
-	MemoryPool *pool = findPoolForSize(numBytes);
-	return pool ? pool->getAllocationSize() : numBytes;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	throw away everything in the DMA, but keep the DMA itself valid.
-*/
-void DynamicMemoryAllocator::reset()
-{
-	for (Int i = 0; i < m_numPools; i++)
-	{
-		if (m_pools[i])
-		{
-			m_pools[i]->reset();
-		}
-	}
-
-	while (m_rawBlocks)
-		freeBytes(m_rawBlocks->getUserData());
-
-	m_usedBlocksInDma = 0;
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return true iff the given pool is a subpool of this dma.
-*/
-Bool DynamicMemoryAllocator::debugIsPoolInDma(MemoryPool *pool)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pool)
-		return false;
-
-	for (Int i = 0; i < m_numPools; i++)
-	{
-		if (m_pools[i] == pool)
-			return true;
-	}
-
-	return false;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return true iff the block was allocated by this dma
-	(either from a subpool or as a raw block).
-*/
-Bool DynamicMemoryAllocator::debugIsBlockInDma(void *pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pBlockPtr)
-		return false;
-
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	if (block->getOwningBlob()) 
-	{
-		MemoryPool *pool = block->getOwningBlob()->getOwningPool();
-		return pool && pool->debugIsBlockInPool(pBlockPtr) && debugIsPoolInDma(pool);
-	}
-	else
-	{
-		for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
-		{
-			if (b == block)
-				return true;
-		}
-		return false;
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return the tagstring for the block. this will never return null; if
-	the block is null or invalid, "FREE_SINGLEBLOCK_TAG_STRING" will be returned.
-	it is assumed that the block was allocated by this dma.
-*/
-const char *DynamicMemoryAllocator::debugGetBlockTagString(void *pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pBlockPtr)
-		return FREE_SINGLEBLOCK_TAG_STRING;
-
-	if (!debugIsBlockInDma(pBlockPtr)) 
-	{
-		DEBUG_CRASH(("block is not in this dma"));
-		return FREE_SINGLEBLOCK_TAG_STRING;
-	}
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	return block->debugGetLiteralTagString();
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	perform internal consistency checking on this DMA.
-*/
-void DynamicMemoryAllocator::debugMemoryVerifyDma()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
-	{
-		b->debugVerifyBlock();
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	free all checkpointinfo for this dma, and reset all ptrs to checkpointinfo.
-*/
-void DynamicMemoryAllocator::debugResetCheckpoints()
-{
-	Checkpointable::debugResetCheckpoints();
-	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
-	{
-		b->debugResetCheckpoint();
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	calculate the total number of raw blocks allocated by this dma,
-	and the total number of bytes (logical) used by those raw blocks.
-*/
-Int DynamicMemoryAllocator::debugCalcRawBlockBytes(Int *numBlocks)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (numBlocks)
-		*numBlocks = 0;
-	Int bytes = 0;
-	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
-	{
-		if (numBlocks)
-			*numBlocks += 1;
-		bytes += b->debugGetLogicalSize();
-	}
-	return bytes;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-Int DynamicMemoryAllocator::debugDmaReportLeaks()
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	Int any = false;
-	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
-	{
-		any += b->debugSingleBlockReportLeak("(DMA)");
-	}
-	return any;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	print a report about raw block allocations to the debug log.
-*/
-void DynamicMemoryAllocator::debugDmaInfoReport( FILE *fp )
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	const char *PREPEND = "POOLINFO";	// allows grepping more easily
-
-	Int numBlocks;
-	Int bytes = debugCalcRawBlockBytes(&numBlocks);
-	DEBUG_LOG(("%s,Total Raw Blocks = %d\n",PREPEND,numBlocks));
-	DEBUG_LOG(("%s,Total Raw Block Bytes = %d\n",PREPEND,bytes));
-	DEBUG_LOG(("%s,Average Raw Block Size = %d\n",PREPEND,numBlocks?bytes/numBlocks:0));
-	DEBUG_LOG(("%s,Raw Blocks:\n",PREPEND));
-	if( fp )
-	{
-		fprintf( fp, "%s,Total Raw Blocks = %d\n",PREPEND,numBlocks );
-		fprintf( fp, "%s,Total Raw Block Bytes = %d\n",PREPEND,bytes );
-		fprintf( fp, "%s,Average Raw Block Size = %d\n",PREPEND,numBlocks?bytes/numBlocks:0 );
-		fprintf( fp, "%s,Raw Blocks:\n",PREPEND );
-	}
-	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
-	{
-		DEBUG_LOG(("%s,  Blocksize=%d\n",PREPEND,b->debugGetLogicalSize()));
-		//if( fp )
-		//{
-		//	fprintf( fp, "%s,  Blocksize=%d\n",PREPEND,b->debugGetLogicalSize() );
-		//}
-	}
-
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// METHODS for MemoryPoolFactory
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/**
-	init the factory to safe values.
-*/
-MemoryPoolFactory::MemoryPoolFactory() :
-	m_firstPoolInFactory(NULL),
-	m_firstDmaInFactory(NULL)
-#ifdef MEMORYPOOL_CHECKPOINTING
-	, m_curCheckpoint(0)
-#endif
-#ifdef MEMORYPOOL_DEBUG
-	, m_usedBytes(0)
-	, m_physBytes(0)
-	, m_peakUsedBytes(0)
-	, m_peakPhysBytes(0)
-#endif
-{
-#ifdef MEMORYPOOL_DEBUG
-	for (int i = 0; i < MAX_SPECIAL_USED; ++i)
-	{
-		m_usedBytesSpecial[i] = 0;
-		m_usedBytesSpecialPeak[i] = 0;
-		m_physBytesSpecial[i] = 0;
-		m_physBytesSpecialPeak[i] = 0;
-	}
-	#ifdef USE_FILLER_VALUE
-	calcFillerValue(GameClientRandomValue(0, MAX_INIT_FILLER_COUNT-1));
-	#endif
-#endif
-}
-//-----------------------------------------------------------------------------
-/**
-	initialize the factory.
-*/
-void MemoryPoolFactory::init()
-{
-	// my, that was easy
-}
-
-//-----------------------------------------------------------------------------
-/**
-	destroy the factory, and all its pools and dmas.
-*/
-MemoryPoolFactory::~MemoryPoolFactory()
-{
-	while (m_firstPoolInFactory)
-	{
-		destroyMemoryPool(m_firstPoolInFactory);
-	}
-
-	while (m_firstDmaInFactory)
-	{
-		destroyDynamicMemoryAllocator(m_firstDmaInFactory);
-	}
-}
-
-//-----------------------------------------------------------------------------
-/**
-	create a new memory pool.
-*/
-MemoryPool *MemoryPoolFactory::createMemoryPool(const PoolInitRec *parms)
-{
-	return createMemoryPool(parms->poolName, parms->allocationSize, parms->initialAllocationCount, parms->overflowAllocationCount);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	create a new memory pool. (alternate argument list)
-*/
-MemoryPool *MemoryPoolFactory::createMemoryPool(const char *poolName, Int allocationSize, Int initialAllocationCount, Int overflowAllocationCount)
-{
-	MemoryPool *pool = findMemoryPool(poolName);
-	if (pool) 
-	{
-		DEBUG_ASSERTCRASH(allocationSize == pool->getAllocationSize(), ("pool size mismatch"));
-		return pool;
-	}
-
-	userMemoryAdjustPoolSize(poolName, initialAllocationCount, overflowAllocationCount);
-
-	if (initialAllocationCount <= 0 || overflowAllocationCount < 0)
-	{
-		DEBUG_CRASH(("illegal pool size: %d %d\n",initialAllocationCount,overflowAllocationCount));
-		throw ERROR_OUT_OF_MEMORY;
-	}
-
-	pool = new (::sysAllocate(sizeof MemoryPool)) MemoryPool;	// will throw on failure
-	pool->init(this, poolName, allocationSize, initialAllocationCount, overflowAllocationCount);	// will throw on failure
-
-	pool->addToList(&m_firstPoolInFactory);
-
-	return pool;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	find a memory pool with the given name; return null if no such pool exists,
-	return null. note that this function isn't particularly fast (it just does
-	a linear search), so you should probably cache the result.
-*/
-MemoryPool *MemoryPoolFactory::findMemoryPool(const char *poolName)
-{
-	MemoryPool *pool = m_firstPoolInFactory;
-	for (; pool; pool = pool->getNextPoolInList())
-	{
-		if (!strcmp(poolName, pool->getPoolName())) 
-		{
-			DEBUG_ASSERTCRASH(poolName == pool->getPoolName(), ("hmm, ptrs should probably match here"));
-			return pool;
-		}
-	}
-	return NULL;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	destroy the given memory pool. you normally will never need to call this directly.
-*/
-void MemoryPoolFactory::destroyMemoryPool(MemoryPool *pMemoryPool)
-{
-	if (!pMemoryPool)
-		return;
-
-	DEBUG_ASSERTCRASH(pMemoryPool->getUsedBlockCount() == 0, ("destroying a nonempty pool"));
-
-	pMemoryPool->removeFromList(&m_firstPoolInFactory);
-
-	// this is evil... since there is no 'placement delete' we must do this the hard way
-	// and call the dtor directly. ordinarily this is heinous, but in this case we'll
-	// make an exception.
-	pMemoryPool->~MemoryPool();
-	::sysFree((void *)pMemoryPool);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	create a new dynamicMemoryAllocator. You normally will never need to call this directly.
-*/
-DynamicMemoryAllocator *MemoryPoolFactory::createDynamicMemoryAllocator(Int numSubPools, const PoolInitRec pParms[])
-{
-	DynamicMemoryAllocator *dma;
-
-	dma = new (::sysAllocate(sizeof DynamicMemoryAllocator)) DynamicMemoryAllocator;	// will throw on failure
-	dma->init(this, numSubPools, pParms);	// will throw on failure
-
-	dma->addToList(&m_firstDmaInFactory);
-
-	return dma;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	destroy the given dynamicMemoryAllocator. You normally will never need to call this directly.
-*/
-void MemoryPoolFactory::destroyDynamicMemoryAllocator(DynamicMemoryAllocator *dma)
-{
-	if (!dma)
-		return;
-
-	dma->removeFromList(&m_firstDmaInFactory);
-
-	// this is evil... since there is no 'placement delete' we must do this the hard way
-	// and call the dtor directly. ordinarily this is heinous, but in this case we'll
-	// make an exception.
-	dma->~DynamicMemoryAllocator();
-	::sysFree((void *)dma);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	throw away everything in all pools/dmas owned by this factory, but keep the factory
-	and pools/dmas themselves valid.
-*/
-void MemoryPoolFactory::reset()
-{
-#ifdef MEMORYPOOL_CHECKPOINTING
-	debugResetCheckpoints();
-#endif
-
-	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-	{
-		pool->reset();
-	}
-	for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-	{
-		dma->reset();
-	}
-
-#ifdef MEMORYPOOL_DEBUG
-	m_usedBytes = 0;
-	m_physBytes = 0;
-	m_peakUsedBytes = 0;
-	m_peakPhysBytes = 0;
-	for (int i = 0; i < MAX_SPECIAL_USED; ++i)
-	{
-		m_usedBytesSpecial[i] = 0;
-		m_usedBytesSpecialPeak[i] = 0;
-		m_physBytesSpecial[i] = 0;
-		m_physBytesSpecialPeak[i] = 0;
-	}
-	#ifdef USE_FILLER_VALUE
-	calcFillerValue(GameClientRandomValue(0, MAX_INIT_FILLER_COUNT-1));
-	#endif
-#endif
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-static const char* s_specialPrefixes[MAX_SPECIAL_USED] =
-{
-	"Misc",			// the catchall for stuff that doesn't match others
-	"W3D_",
-	"W3A_",
-	"STL_",
-	"STR_",
-	NULL
-};
-
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	perform bookkeeping on memory usage statistics.
-*/
-void MemoryPoolFactory::adjustTotals(const char* tagString, Int usedDelta, Int physDelta)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	m_usedBytes += usedDelta;
-	m_physBytes += physDelta;
-	if (m_peakUsedBytes < m_usedBytes)
-		m_peakUsedBytes = m_usedBytes;
-	if (m_peakPhysBytes < m_physBytes)
-		m_peakPhysBytes = m_physBytes;
-
-	int found = 0;	// if no matches found, goes into slot zero
-	for (int i = 1; i < MAX_SPECIAL_USED; ++i)	// start at 1, not zero
-	{
-		if (s_specialPrefixes[i] == NULL)
-			break;
-
-		if (strncmp(tagString, s_specialPrefixes[i], strlen(s_specialPrefixes[i])) == 0)
-		{
-			found = i;
-			break;
-		}
-	}
-	m_usedBytesSpecial[found] += usedDelta;
-	m_physBytesSpecial[found] += physDelta;
-	if (m_usedBytesSpecialPeak[found] < m_usedBytesSpecial[found])
-		m_usedBytesSpecialPeak[found] = m_usedBytesSpecial[found];
-	if (m_physBytesSpecialPeak[found] < m_physBytesSpecial[found])
-		m_physBytesSpecialPeak[found] = m_physBytesSpecial[found];
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-void MemoryPoolFactory::debugSetInitFillerIndex(Int index)
-{
-	#ifdef USE_FILLER_VALUE
-	if (index < 0 || index >= MAX_INIT_FILLER_COUNT)
-		index = GameClientRandomValue(0, MAX_INIT_FILLER_COUNT-1);
-	calcFillerValue(index);
-	#endif
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	perform internal consistency checking on the factory, and all of its
-	pools and dmas.
-*/
-void MemoryPoolFactory::debugMemoryVerify()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	Int used = 0, phys = 0;
-
-	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-	{
-		pool->debugMemoryVerifyPool();
-		used += pool->getUsedBlockCount()*pool->getAllocationSize();
-		phys += pool->getTotalBlockCount()*pool->getAllocationSize();
-	}
-
-	for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-	{
-		dma->debugMemoryVerifyDma();
-		Int tmp = dma->debugCalcRawBlockBytes(NULL);
-		used += tmp;
-		phys += tmp;
-	}
-
-	DEBUG_ASSERTCRASH(used == m_usedBytes, ("used count mismatch"));
-	DEBUG_ASSERTCRASH(phys == m_physBytes, ("phys count mismatch"));
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return true iff the block was allocated by any of the pools/dmas owned
-	by this factory.
-*/
-Bool MemoryPoolFactory::debugIsBlockInAnyPool(void *pBlock)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerify();
-#endif
-	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-	{
-		if (pool->debugIsBlockInPool(pBlock))
-			return true;
-	}
-
-	for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-	{
-		if (dma->debugIsBlockInDma(pBlock))
-			return true;
-	}
-
-	return false;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return the tagstring for this block. this will never return null; if
-	the block is null or invalid, "FREE_SINGLEBLOCK_TAG_STRING" will be returned.
-	it is assumed that the block was allocated by this factory.
-*/
-const char *MemoryPoolFactory::debugGetBlockTagString(void *pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pBlockPtr)
-		return FREE_SINGLEBLOCK_TAG_STRING;
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerify();
-#endif
-	if (!debugIsBlockInAnyPool(pBlockPtr)) 
-	{
-		DEBUG_CRASH(("block is not in this factory"));
-		return FREE_SINGLEBLOCK_TAG_STRING;
-	}
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	return block->debugGetLiteralTagString();
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	set a new checkpoint for all future blocks allocated/freed by this factory's pools/dmas.
-*/
-Int MemoryPoolFactory::debugSetCheckpoint()
-{
-	return ++m_curCheckpoint;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	throw away all checkpoint info for all pools/dmas.
-*/
-void MemoryPoolFactory::debugResetCheckpoints()
-{
-	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-	{
-		pool->debugResetCheckpoints();
-	}
-	for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-	{
-		dma->debugResetCheckpoints();
-	}
-	m_curCheckpoint = 0;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-void MemoryPoolFactory::memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead )
-{
-#ifdef MEMORYPOOL_DEBUG
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	FILE* perfStatsFile = NULL;
-	Int totalNamedPoolPeak = 0;
-
-	if( !appendToFileInstead )
-	{
-		char tmp[256];
-		strcpy(tmp,filename);
-		strcat(tmp,".csv");
-		perfStatsFile = fopen(tmp, "w");
-	}
-	else
-	{
-		perfStatsFile = appendToFileInstead;
-	}
-
-	if (perfStatsFile == NULL)
-	{
-		DEBUG_CRASH(("could not open/create perf file %s -- is it open in another app?",filename));
-		return;
-	}
-
-	Int lineIdx = 0;
-	MemoryPool *pool = m_firstPoolInFactory;
-#ifdef INTENSE_DMA_BOOKKEEPING
-	UsedNPeakMap::const_iterator it = TheUsedNPeakMap.begin();
-#endif
-	for (;;)
-	{
-		Bool keepGoing = false;
-		if (pool)
-		{
-			if (lineIdx == 0)
-			{
-				fprintf(perfStatsFile, "%s,%d","Unpooled Large Blocks (>1024 bytes)",thePeakLargeBlocks/1024);
-			}
-			else
-			{
-				Int sz = pool->getAllocationSize();
-				Int initial = pool->getInitialBlockCount()*sz;
-				Int peak = pool->getPeakBlockCount()*sz;
-				Int waste = initial - peak;
-				if (waste < 0) waste = 0;
-				fprintf(perfStatsFile, "%s,%d,%d",pool->getPoolName(),peak/1024,waste/1024);
-				totalNamedPoolPeak += peak;
-				pool = pool->getNextPoolInList();
-			}
-			keepGoing = true;
-		}
-		else
-		{
-			fprintf(perfStatsFile, ",,");
-		}
-
-#ifdef INTENSE_DMA_BOOKKEEPING
-		if (it != TheUsedNPeakMap.end())
-		{
-			Int wastepct = (it->second.peakwaste * 100) / (it->second.peak + it->second.peakwaste);
-			fprintf(perfStatsFile, ",,,,%s,%d,%d,%d",it->first,it->second.peak/1024,it->second.peakwaste/1024,wastepct);
-			++it;
-			keepGoing = true;
-		}
-		else
-		{
-			fprintf(perfStatsFile, ",,,,,,,");
-		}
-#endif
-		
-		if (lineIdx < MAX_SPECIAL_USED && s_specialPrefixes[lineIdx] != NULL)
-		{
-			fprintf(perfStatsFile, ",,,%s,%d",s_specialPrefixes[lineIdx],m_usedBytesSpecialPeak[lineIdx]/1024);
-			keepGoing = true;
-		}
-
-		fprintf(perfStatsFile, "\n");
-		++lineIdx;
-
-		if (!keepGoing)
-			break;
-	}
-
-	fflush(perfStatsFile);
-
-	if( !appendToFileInstead )
-	{
-		fclose(perfStatsFile);
-	}
-#endif
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	send a memory reports (based on the flags/checkpoints) to the debug log.
-*/
-void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp )
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-#ifdef ALLOW_DEBUG_UTILS
-	Int oldFlags = DebugGetFlags();
-	DebugSetFlags(oldFlags & ~DEBUG_FLAG_PREPEND_TIME);
-#endif
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-	Bool doBlockReport = (flags & _REPORT_CP_ALLOCATED_DONTCARE) != 0 && (flags & _REPORT_CP_FREED_DONTCARE) != 0;
-	DEBUG_ASSERTCRASH(startCheckpoint >= 0 && startCheckpoint <= endCheckpoint && endCheckpoint <= m_curCheckpoint, ("bad checkpoints"));
-	DEBUG_ASSERTCRASH(((flags & _REPORT_CP_ALLOCATED_DONTCARE) != 0) == ((flags & _REPORT_CP_FREED_DONTCARE) != 0), ("bad flags: must set at both alloc and free flag"));
-#endif
-
-	debugMemoryVerify();
-
-	if (flags & REPORT_FACTORYINFO)
-	{
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Begin Factory Info Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Bytes in use (logical) = %d\n",m_usedBytes));
-		DEBUG_LOG(("Bytes in use (physical) = %d\n",m_physBytes));
-		DEBUG_LOG(("PEAK Bytes in use (logical) = %d\n",m_peakUsedBytes));
-		DEBUG_LOG(("PEAK Bytes in use (physical) = %d\n",m_peakPhysBytes));
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("End Factory Info Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		if( fp )
-		{
-			fprintf( fp, "------------------------------------------\n" );
-			fprintf( fp, "Begin Factory Info Report\n" );
-			fprintf( fp, "------------------------------------------\n" );
-			fprintf( fp, "Bytes in use (logical) = %d\n",m_usedBytes );
-			fprintf( fp, "Bytes in use (physical) = %d\n",m_physBytes );
-			fprintf( fp, "PEAK Bytes in use (logical) = %d\n",m_peakUsedBytes );
-			fprintf( fp, "PEAK Bytes in use (physical) = %d\n",m_peakPhysBytes );
-			fprintf( fp, "------------------------------------------\n" );
-			fprintf( fp, "End Factory Info Report\n" );
-			fprintf( fp, "------------------------------------------\n" );
-		}
-	}
-
-	if (flags & REPORT_POOLINFO)
-	{
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Begin Pool Info Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		if( fp )
-		{
-			fprintf( fp, "------------------------------------------\n" );
-			fprintf( fp, "Begin Pool Info Report\n" );
-			fprintf( fp, "------------------------------------------\n" );
-		}
-		MemoryPool::debugPoolInfoReport( NULL, fp );
-		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-		{
-			MemoryPool::debugPoolInfoReport( pool, fp );
-		}
-		for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-		{
-			dma->debugDmaInfoReport( fp );
-		}
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("End Pool Info Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		if( fp )
-		{
-			fprintf( fp, "------------------------------------------\n" );
-			fprintf( fp, "End Pool Info Report\n" );
-			fprintf( fp, "------------------------------------------\n" );
-		}
-	}
-
-	if (flags & REPORT_POOL_OVERFLOW)
-	{
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Begin Pool Overflow Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		MemoryPool *pool = m_firstPoolInFactory;
-		for (; pool; pool = pool->getNextPoolInList())
-		{
-			if (pool->getPeakBlockCount() > pool->getInitialBlockCount())
-			{
-				DEBUG_LOG(("*** Pool %s overflowed initial allocation of %d (peak allocation was %d)\n",pool->getPoolName(),pool->getInitialBlockCount(),pool->getPeakBlockCount()));
-			}
-		}
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("End Pool Overflow Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Begin Pool Underflow Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		for (pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-		{
-			Int peak = pool->getPeakBlockCount()*pool->getAllocationSize();
-			Int initial = pool->getInitialBlockCount()*pool->getAllocationSize();
-			if (peak < initial/2 && (initial - peak) > 4096)
-			{
-				DEBUG_LOG(("*** Pool %s used less than half its initial allocation of %d (peak allocation was %d, wasted %dk)\n",
-					pool->getPoolName(),pool->getInitialBlockCount(),pool->getPeakBlockCount(),(initial - peak)/1024));
-			}
-		}
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("End Pool Underflow Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-	}
-
-	if( flags & REPORT_SIMPLE_LEAKS )
-	{
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Begin Simple Leak Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		Int any = 0;
-		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-		{
-			any += pool->debugPoolReportLeaks( pool->getPoolName() );
-		}
-		for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-		{
-			any += dma->debugDmaReportLeaks();
-		}
-		DEBUG_ASSERTCRASH(!any, ("There were %d memory leaks. Please fix them.\n",any));
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("End Simple Leak Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-	}
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-	if (doBlockReport)
-	{
-		const char* nm = (this == TheMemoryPoolFactory) ? "TheMemoryPoolFactory" : "*** UNKNOWN *** MemoryPoolFactory";
-
-		DEBUG_LOG(("\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Begin Block Report for %s\n", nm));
-		DEBUG_LOG(("------------------------------------------\n"));
-		char buf[256] = "";
-		if (flags & _REPORT_CP_ALLOCATED_BEFORE) strcat(buf, "AllocBefore ");
-		if (flags & _REPORT_CP_ALLOCATED_BETWEEN) strcat(buf, "AllocBetween ");
-		if (flags & _REPORT_CP_FREED_BEFORE) strcat(buf, "FreedBefore ");
-		if (flags & _REPORT_CP_FREED_BETWEEN) strcat(buf, "FreedBetween ");
-		if (flags & _REPORT_CP_FREED_NEVER) strcat(buf, "StillExisting ");
-		DEBUG_LOG(("Options: Between checkpoints %d and %d, report on (%s)\n",startCheckpoint,endCheckpoint,buf));
-		DEBUG_LOG(("------------------------------------------\n"));
-
-		BlockCheckpointInfo::doBlockCheckpointReport( NULL, "", 0, 0, 0 );
-		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-		{
-			pool->debugCheckpointReport(flags, startCheckpoint, endCheckpoint, pool->getPoolName());
-		}
-		for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-		{
-			dma->debugCheckpointReport(flags, startCheckpoint, endCheckpoint, "(Oversized)");
-		}
-
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("End Block Report for %s\n", nm));
-		DEBUG_LOG(("------------------------------------------\n"));
-	}
-#endif
-
-#ifdef ALLOW_DEBUG_UTILS
-	DebugSetFlags(oldFlags);
-#endif
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// GLOBAL FUNCTIONS
-//-----------------------------------------------------------------------------
-
-static int theLinkTester = 0;
-
-//-----------------------------------------------------------------------------
-void* STLSpecialAlloc::allocate(size_t __n) 
-{  
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
-	return TheDynamicMemoryAllocator->allocateBytes(__n, "STL_"); 
-}
-
-//-----------------------------------------------------------------------------
-void STLSpecialAlloc::deallocate(void* __p, size_t) 
-{ 
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
-	TheDynamicMemoryAllocator->freeBytes(__p); 
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator new; send requests to TheDynamicMemoryAllocator.
-*/
-void *operator new(size_t size)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
-	return TheDynamicMemoryAllocator->allocateBytes(size, "global operator new");
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator new[]; send requests to TheDynamicMemoryAllocator.
-*/
-void *operator new[](size_t size)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
-	return TheDynamicMemoryAllocator->allocateBytes(size, "global operator new[]");
-}
- 
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator delete; send requests to TheDynamicMemoryAllocator.
-*/
-void operator delete(void *p)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator delete"));
-	TheDynamicMemoryAllocator->freeBytes(p);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator delete[]; send requests to TheDynamicMemoryAllocator.
-*/
-void operator delete[](void *p)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator delete"));
-	TheDynamicMemoryAllocator->freeBytes(p);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator new (MFC debug version); send requests to TheDynamicMemoryAllocator.
-*/
-void* operator new(size_t size, const char * fname, int)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
-#ifdef MEMORYPOOL_DEBUG
-	return TheDynamicMemoryAllocator->allocateBytesImplementation(size, fname);
-#else
-	return TheDynamicMemoryAllocator->allocateBytesImplementation(size);
-#endif
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator delete (MFC debug version); send requests to TheDynamicMemoryAllocator.
-*/
-void operator delete(void * p, const char *, int)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator delete"));
-	TheDynamicMemoryAllocator->freeBytes(p);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator new (MFC debug version); send requests to TheDynamicMemoryAllocator.
-*/
-void* operator new[](size_t size, const char * fname, int)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
-#ifdef MEMORYPOOL_DEBUG
-	return TheDynamicMemoryAllocator->allocateBytesImplementation(size, fname);
-#else
-	return TheDynamicMemoryAllocator->allocateBytesImplementation(size);
-#endif
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator delete (MFC debug version); send requests to TheDynamicMemoryAllocator.
-*/
-void operator delete[](void * p, const char *, int)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator delete"));
-	TheDynamicMemoryAllocator->freeBytes(p);
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-void *calloc(size_t a, size_t b)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager"));
-	return TheDynamicMemoryAllocator->allocateBytes(a * b, "calloc");
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-void  free(void * p)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager"));
-	TheDynamicMemoryAllocator->freeBytes(p);
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-void *malloc(size_t a)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager"));
-	return TheDynamicMemoryAllocator->allocateBytesDoNotZero(a, "malloc");
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-void *realloc(void *p, size_t s)
-{
-	DEBUG_CRASH(("realloc is evil. do not call it."));
-	throw ERROR_OUT_OF_MEMORY;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-/**
-	Initialize the memory manager, and create TheMemoryPoolFactory and TheDynamicMemoryAllocator.
-*/
-void initMemoryManager()
-{
-	if (TheMemoryPoolFactory == NULL) 
-	{
-		Int numSubPools;
-		const PoolInitRec *pParms;
-		userMemoryManagerGetDmaParms(&numSubPools, &pParms);
-		TheMemoryPoolFactory = new (::sysAllocate(sizeof MemoryPoolFactory)) MemoryPoolFactory;	// will throw on failure
-		TheMemoryPoolFactory->init();	// will throw on failure
-		TheDynamicMemoryAllocator = TheMemoryPoolFactory->createDynamicMemoryAllocator(numSubPools, pParms);	// will throw on failure
-		userMemoryManagerInitPools();
-		thePreMainInitFlag = false;
-	}
-	else
-	{
-		if (thePreMainInitFlag)
-		{
-			// quietly ignore the call
-		}
-		else 
-		{
-			DEBUG_CRASH(("memory manager is already inited"));
-		}
-	}
-
-	char* linktest;
-	
-	theLinkTester = 0; 
-
-	linktest = new char;
-	delete linktest;
-
-	linktest = new char[8];
-	delete [] linktest;
-
-	linktest = new char('\0');
-	delete linktest;
-
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-	linktest = (char*)malloc(1);
-	free(linktest);
-
-	linktest = (char*)calloc(1,1);
-	free(linktest);
-#endif
-
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-	if (theLinkTester != 10)
-#else
-	if (theLinkTester != 6)
-#endif
-	{
-		DEBUG_CRASH(("Wrong operator new/delete linked in! Fix this...\n"));
-		exit(-1);
-	}
-
-	theMainInitFlag = true;
-
-}
-
-//-----------------------------------------------------------------------------
-Bool isMemoryManagerOfficiallyInited()
-{
-	return theMainInitFlag;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	Initialize the memory manager, and create TheMemoryPoolFactory and TheDynamicMemoryAllocator.
-	This is only called if memory is allocated prior to the normal call to initMemoryManager
-	(generally via a static C++ ctor).
-*/
-static void preMainInitMemoryManager()
-{
-	if (TheMemoryPoolFactory == NULL)
-	{
-		DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
-		DEBUG_LOG(("*** Initing Memory Manager prior to main!\n"));
-
-		Int numSubPools;
-		const PoolInitRec *pParms;
-		userMemoryManagerGetDmaParms(&numSubPools, &pParms);
-		TheMemoryPoolFactory = new (::sysAllocate(sizeof MemoryPoolFactory)) MemoryPoolFactory;	// will throw on failure
-		TheMemoryPoolFactory->init();	// will throw on failure
-
-		TheDynamicMemoryAllocator = TheMemoryPoolFactory->createDynamicMemoryAllocator(numSubPools, pParms);	// will throw on failure
-		userMemoryManagerInitPools();
-		thePreMainInitFlag = true;
-	}
-}
-
-//-----------------------------------------------------------------------------
-/**
-	shutdown the memory manager and discard all memory. Note: if preMainInitMemoryManager()
-	was called prior to initMemoryManager(), this call will do nothing.
-*/
-void shutdownMemoryManager()
-{
-	if (thePreMainInitFlag)
-	{
-	#ifdef MEMORYPOOL_DEBUG
-		DEBUG_LOG(("*** Memory Manager was inited prior to main -- skipping shutdown!\n"));
-	#endif
-	}
-	else
-	{
-		if (TheDynamicMemoryAllocator)
-		{
-			DEBUG_ASSERTCRASH(TheMemoryPoolFactory, ("hmm, no factory"));
-			if (TheMemoryPoolFactory) 
-				TheMemoryPoolFactory->destroyDynamicMemoryAllocator(TheDynamicMemoryAllocator);
-			TheDynamicMemoryAllocator = NULL;
-		}
-
-		if (TheMemoryPoolFactory) 
-		{
-			// this is evil... since there is no 'placement delete' we must do this the hard way
-			// and call the dtor directly. ordinarily this is heinous, but in this case we'll
-			// make an exception.
-			TheMemoryPoolFactory->~MemoryPoolFactory();
-			::sysFree((void *)TheMemoryPoolFactory);
-			TheMemoryPoolFactory = NULL;
-		}
-
-	#ifdef MEMORYPOOL_DEBUG
-		DEBUG_LOG(("Peak system allocation was %d bytes\n",thePeakSystemAllocationInBytes));
-		DEBUG_LOG(("Wasted DMA space (peak) was %d bytes\n",thePeakWastedDMA));
-		DEBUG_ASSERTCRASH(theTotalSystemAllocationInBytes == 0, ("Leaked a total of %d raw bytes\n", theTotalSystemAllocationInBytes));
-	#endif
-	}
-
-	theMainInitFlag = false;
-}
-
-//-----------------------------------------------------------------------------
-void* createW3DMemPool(const char *poolName, int allocationSize)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	MemoryPool* pool = TheMemoryPoolFactory->createMemoryPool(poolName, allocationSize, 0, 0);
-	DEBUG_ASSERTCRASH(pool && pool->getAllocationSize() == allocationSize, ("bad w3d pool"));
-	return pool;
-}
-
-//-----------------------------------------------------------------------------
-void* allocateFromW3DMemPool(void* pool, int allocationSize)
-{
-	DEBUG_ASSERTCRASH(pool, ("pool is null\n"));
-	DEBUG_ASSERTCRASH(pool && ((MemoryPool*)pool)->getAllocationSize() == allocationSize, ("bad w3d pool size %s",((MemoryPool*)pool)->getPoolName()));
-	return ((MemoryPool*)pool)->allocateBlock("allocateFromW3DMemPool");
-}
-
-//-----------------------------------------------------------------------------
-void* allocateFromW3DMemPool(void* pool, int allocationSize, const char* msg, int unused)
-{
-	DEBUG_ASSERTCRASH(pool, ("pool is null\n"));
-	DEBUG_ASSERTCRASH(pool && ((MemoryPool*)pool)->getAllocationSize() == allocationSize, ("bad w3d pool size %s",((MemoryPool*)pool)->getPoolName()));
-	return ((MemoryPool*)pool)->allocateBlock(msg);
-}
-
-//-----------------------------------------------------------------------------
-void freeFromW3DMemPool(void* pool, void* p)
-{
-	DEBUG_ASSERTCRASH(pool, ("pool is null\n"));
-	((MemoryPool*)pool)->freeBlock(p);
-}
diff --git a/Generals/Code/GameEngine/Source/Common/System/GameMemoryNull.cpp b/Generals/Code/GameEngine/Source/Common/System/GameMemoryNull.cpp
deleted file mode 100644
index cbf029dd5aa..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/GameMemoryNull.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 TheSuperHackers
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "PreRTS.h"
-
-#include <malloc.h>
-
-#include "Common/GameMemoryNull.h"
-
-static Bool theMainInitFlag = false;
-
-// ----------------------------------------------------------------------------
-// PUBLIC DATA 
-// ----------------------------------------------------------------------------
-
-MemoryPoolFactory *TheMemoryPoolFactory = NULL;
-DynamicMemoryAllocator *TheDynamicMemoryAllocator = NULL;
-
-//-----------------------------------------------------------------------------
-// METHODS for DynamicMemoryAllocator
-//-----------------------------------------------------------------------------
-
-/**
-	allocate a chunk-o-bytes from this DMA and return it, but don't bother zeroing
-	out the block. if unable to allocate, throw ERROR_OUT_OF_MEMORY. this
-	function will never return null.
-
-  added code to make sure we're on a DWord boundary, throw exception if not
-*/
-void *DynamicMemoryAllocator::allocateBytesDoNotZeroImplementation(Int numBytes)
-{
-	void *p = malloc(numBytes);
-	if (p == NULL)
-		throw ERROR_OUT_OF_MEMORY;
-	return p;
-}
-
-/**
-	allocate a chunk-o-bytes from this DMA and return it, and zero out the contents first.
-	if unable to allocate, throw ERROR_OUT_OF_MEMORY. 
-	this function will never return null.
-*/
-void *DynamicMemoryAllocator::allocateBytesImplementation(Int numBytes)
-{
-	void* p = allocateBytesDoNotZeroImplementation(numBytes);	// throws on failure
-	memset(p, 0, numBytes);
-	return p;
-}
-
-/**
-	free a chunk-o-bytes allocated by this dma. it's ok to pass null.
-*/
-void DynamicMemoryAllocator::freeBytes(void* pBlockPtr)
-{
-	free(pBlockPtr);
-}
-
-Int DynamicMemoryAllocator::getActualAllocationSize(Int numBytes)
-{
-	return numBytes;
-}
-
-#ifdef MEMORYPOOL_DEBUG
-void DynamicMemoryAllocator::debugIgnoreLeaksForThisBlock(void* pBlockPtr)
-{
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// METHODS for MemoryPoolFactory
-//-----------------------------------------------------------------------------
-
-void MemoryPoolFactory::memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead )
-{
-}
-
-#ifdef MEMORYPOOL_DEBUG
-void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp )
-{
-}
-void MemoryPoolFactory::debugSetInitFillerIndex(Int index)
-{
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// GLOBAL FUNCTIONS
-//-----------------------------------------------------------------------------
-
-/**
-	Initialize the memory manager, and create TheMemoryPoolFactory and TheDynamicMemoryAllocator.
-*/
-void initMemoryManager()
-{
-	if (TheMemoryPoolFactory == NULL && TheDynamicMemoryAllocator == NULL)
-	{
-		TheMemoryPoolFactory = new (malloc(sizeof MemoryPoolFactory)) MemoryPoolFactory;
-		TheDynamicMemoryAllocator = new (malloc(sizeof DynamicMemoryAllocator)) DynamicMemoryAllocator;
-	}
-	else
-	{
-			DEBUG_CRASH(("memory manager is already inited"));
-	}
-
-	theMainInitFlag = true;
-}
-
-//-----------------------------------------------------------------------------
-Bool isMemoryManagerOfficiallyInited()
-{
-	return theMainInitFlag;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	shutdown the memory manager and discard all memory. Note: if preMainInitMemoryManager()
-	was called prior to initMemoryManager(), this call will do nothing.
-*/
-void shutdownMemoryManager()
-{
-	if (TheDynamicMemoryAllocator != NULL)
-	{
-		TheDynamicMemoryAllocator->~DynamicMemoryAllocator();
-		free((void *)TheDynamicMemoryAllocator);
-		TheDynamicMemoryAllocator = NULL;
-	}
-
-	if (TheMemoryPoolFactory != NULL)
-	{
-		TheMemoryPoolFactory->~MemoryPoolFactory();
-		free((void *)TheMemoryPoolFactory);
-		TheMemoryPoolFactory = NULL;
-	}
-
-	theMainInitFlag = false;
-}
-
-
-#ifndef DISABLE_GAMEMEMORY_NEW_OPERATORS
-
-extern void * __cdecl operator new(size_t size)
-{
-	void *p = malloc(size);
-	if (p == NULL)
-		throw ERROR_OUT_OF_MEMORY;
-	memset(p, 0, size);
-	return p;
-}
-
-extern void __cdecl operator delete(void *p)
-{
-	free(p);
-}
-
-extern void * __cdecl operator new[](size_t size)
-{
-	void *p = malloc(size);
-	if (p == NULL)
-		throw ERROR_OUT_OF_MEMORY;
-	memset(p, 0, size);
-	return p;
-}
-
-extern void __cdecl operator delete[](void *p)
-{
-	free(p);
-}
-
-// additional overloads to account for VC/MFC funky versions
-extern void* __cdecl operator new(size_t size, const char *, int)
-{
-	void *p = malloc(size);
-	if (p == NULL)
-		throw ERROR_OUT_OF_MEMORY;
-	memset(p, 0, size);
-	return p;
-}
-
-extern void __cdecl operator delete(void *p, const char *, int)
-{
-	free(p);
-}
-
-extern void* __cdecl operator new[](size_t size, const char *, int)
-{
-	void *p = malloc(size);
-	if (p == NULL)
-		throw ERROR_OUT_OF_MEMORY;
-	memset(p, 0, size);
-	return p;
-}
-
-extern void __cdecl operator delete[](void *p, const char *, int)
-{
-	free(p);
-}
-
-#endif
diff --git a/Generals/Code/GameEngine/Source/Common/System/GameType.cpp b/Generals/Code/GameEngine/Source/Common/System/GameType.cpp
index 19024fea2e1..185f9c36e95 100644
--- a/Generals/Code/GameEngine/Source/Common/System/GameType.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/GameType.cpp
@@ -24,9 +24,9 @@
 
 // GameType.cpp ///////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
-const char *TimeOfDayNames[] = 
+const char *const TimeOfDayNames[] =
 {
 	"NONE",
 	"MORNING",
@@ -36,11 +36,13 @@ const char *TimeOfDayNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TimeOfDayNames) == TIME_OF_DAY_COUNT + 1, "Incorrect array size");
 
-const char *WeatherNames[] = 
+const char *const WeatherNames[] =
 {
 	"NORMAL",
 	"SNOWY",
 
 	NULL
 };
+static_assert(ARRAY_SIZE(WeatherNames) == WEATHER_COUNT + 1, "Incorrect array size");
diff --git a/Generals/Code/GameEngine/Source/Common/System/Geometry.cpp b/Generals/Code/GameEngine/Source/Common/System/Geometry.cpp
index 7e16c3b3781..c5bb0b2714d 100644
--- a/Generals/Code/GameEngine/Source/Common/System/Geometry.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/Geometry.cpp
@@ -24,9 +24,9 @@
 
 // FILE: Geometry.cpp /////////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, Aug 2002
-// Desc:   
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_GEOMETRY_NAMES
 
@@ -36,11 +36,6 @@
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -151,7 +146,7 @@ static Real calcPointToLineDistSquared(const Coord3D& pt, const Coord3D& lineSta
 	}
 
   Real tmp = dot / lineLenSqr;
-	
+
 	closest.x = lineStart.x + tmp * line.x;
 	closest.y = lineStart.y + tmp * line.y;
 	closest.z = lineStart.z + tmp * line.z;
@@ -181,7 +176,7 @@ void GeometryInfo::calcPitches(const Coord3D& thisPos, const GeometryInfo& that,
 	Real dxy = sqrt(sqr(thatPos.x - thisCenter.x) + sqr(thatPos.y - thisCenter.y));
 
 	Real dz;
-	
+
 	/** @todo srj -- this could be better, by calcing it for all the corners, not just top-center
 		and bottom-center... oh well */
 	dz = (thatPos.z + that.getMaxHeightAbovePosition()) - thisCenter.z;
@@ -297,7 +292,7 @@ void GeometryInfo::get2DBounds(const Coord3D& geomCenter, Real angle, Region2D&
 			bounds.lo.y = y;
 			bounds.hi.x = x;
 			bounds.hi.y = y;
-			
+
 			x = geomCenter.x + exc - eys;
 			y = geomCenter.y + eyc + exs;
 			if (bounds.lo.x > x) bounds.lo.x = x;
@@ -518,7 +513,7 @@ void GeometryInfo::calcBoundingStuff()
 	};
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 //=============================================================================
 void GeometryInfo::tweakExtents(ExtentModType extentModType, Real extentModAmount)
 {
@@ -542,7 +537,7 @@ void GeometryInfo::tweakExtents(ExtentModType extentModType, Real extentModAmoun
 }
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 //=============================================================================
 AsciiString GeometryInfo::getDescriptiveString() const
 {
@@ -558,7 +553,7 @@ AsciiString GeometryInfo::getDescriptiveString() const
 void GeometryInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -594,7 +589,7 @@ void GeometryInfo::xfer( Xfer *xfer )
 	// bounding sphere radius
 	xfer->xferReal( &m_boundingSphereRadius );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -602,4 +597,4 @@ void GeometryInfo::xfer( Xfer *xfer )
 void GeometryInfo::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/Common/System/KindOf.cpp b/Generals/Code/GameEngine/Source/Common/System/KindOf.cpp
index ab04da4854c..0d77c3ffc6e 100644
--- a/Generals/Code/GameEngine/Source/Common/System/KindOf.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/KindOf.cpp
@@ -31,7 +31,8 @@
 #include "Common/KindOf.h"
 #include "Common/BitFlagsIO.h"
 
-const char* KindOfMaskType::s_bitNameList[] = 
+template<>
+const char* const KindOfMaskType::s_bitNameList[] =
 {
 	"OBSTACLE",
 	"SELECTABLE",
@@ -132,6 +133,7 @@ const char* KindOfMaskType::s_bitNameList[] =
 	"DONT_AUTO_CRUSH_INFANTRY",
 	NULL
 };
+static_assert(ARRAY_SIZE(KindOfMaskType::s_bitNameList) == KindOfMaskType::NumBits + 1, "Incorrect array size");
 
 KindOfMaskType KINDOFMASK_NONE;	// inits to all zeroes
 
diff --git a/Generals/Code/GameEngine/Source/Common/System/List.cpp b/Generals/Code/GameEngine/Source/Common/System/List.cpp
index af4913facbf..5243135f519 100644
--- a/Generals/Code/GameEngine/Source/Common/System/List.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/List.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   WSYS Library
@@ -42,7 +42,7 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include "PreRTS.h"
@@ -53,49 +53,49 @@
 #pragma warning(disable : 4706)
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 //============================================================================
@@ -104,7 +104,7 @@
 
 LList::LList( )
 : m_sortMode(DESCENDING)
-{ 
+{
 	m_head.setItem( &m_head.m_item);
 };
 
@@ -214,7 +214,7 @@ void LList::clear( void )
 }
 
 //=================================================================
-// LList::nodeCount 
+// LList::nodeCount
 //=================================================================
 
 Int LList::nodeCount( void )
@@ -234,7 +234,7 @@ Int LList::nodeCount( void )
 }
 
 //=================================================================
-// LList::getNode 
+// LList::getNode
 //=================================================================
 
 LListNode*	LList::getNode( Int index )
@@ -314,8 +314,8 @@ LListNode* LList::findItem( void *item )
 LListNode::LListNode()
 : m_pri(0),
 	m_item(NULL),
-	m_autoDelete(FALSE) 
-{ 
+	m_autoDelete(FALSE)
+{
 	m_next = m_prev = this;
 };
 
@@ -370,7 +370,7 @@ LListNode*		LListNode::next( void )
 }
 
 //=================================================================
-// LListNode::prev 
+// LListNode::prev
 //=================================================================
 
 LListNode*		LListNode::prev( void )
@@ -384,7 +384,7 @@ LListNode*		LListNode::prev( void )
 }
 
 //=================================================================
-// LListNode::loopNext 
+// LListNode::loopNext
 //=================================================================
 
 LListNode*		LListNode::loopNext( void )
@@ -407,7 +407,7 @@ LListNode*		LListNode::loopNext( void )
 }
 
 //=================================================================
-// LListNode::loopPrev 
+// LListNode::loopPrev
 //=================================================================
 
 LListNode*		LListNode::loopPrev( void )
@@ -448,4 +448,4 @@ void	LListNode::destroy( void )
 void	LList::addToEndOfGroup( Bool yes )
 {
 	m_addToEndOfGroup = yes;
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/Common/System/LocalFile.cpp b/Generals/Code/GameEngine/Source/Common/System/LocalFile.cpp
deleted file mode 100644
index 52d005be4ee..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/LocalFile.cpp
+++ /dev/null
@@ -1,627 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   WSYS Library
-//
-// Module:    IO_
-//
-// File name: IO_LocalFile.cpp
-//
-// Created:   4/23/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <io.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "Common/LocalFile.h"
-#include "Common/RAMFile.h"
-#include "Lib/BaseType.h"
-#include "Common/PerfTimer.h"
-			
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-static Int s_totalOpen = 0;
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-//=================================================================
-// LocalFile::LocalFile
-//=================================================================
-
-LocalFile::LocalFile()
-#ifdef USE_BUFFERED_IO
-	: m_file(NULL)
-#else
-	: m_handle(-1)
-#endif
-{
-}
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//=================================================================
-// LocalFile::~LocalFile	
-//=================================================================
-
-LocalFile::~LocalFile()
-{
-#ifdef USE_BUFFERED_IO
-	if (m_file)
-	{
-		fclose(m_file);
-		m_file = NULL;
-		--s_totalOpen;
-	}
-#else
-	if( m_handle != -1 )
-	{
-		_close( m_handle );
-		m_handle = -1;
-		--s_totalOpen;
-	}
-#endif
-
-	File::close();
-
-}
-
-//=================================================================
-// LocalFile::open	
-//=================================================================
-/**
-  *	This function opens a file using the standard C open() call. Access flags
-	* are mapped to the appropriate open flags. Returns true if file was opened
-	* successfully.
-	*/
-//=================================================================
-
-//DECLARE_PERF_TIMER(LocalFile)
-Bool LocalFile::open( const Char *filename, Int access )
-{
-	//USE_PERF_TIMER(LocalFile)
-	if( !File::open( filename, access) )
-	{
-		return FALSE;
-	}
-
-	/* here we translate WSYS file access to the std C equivalent */
-#ifdef USE_BUFFERED_IO
-	char mode[32];
-	char* m = mode;
-
-	if (m_access & APPEND)
-	{
-		DEBUG_CRASH(("not yet supported by buffered mode"));
-	}
-
-	if (m_access & TRUNCATE)
-	{
-		DEBUG_CRASH(("not yet supported by buffered mode"));
-	}
-
-	if((m_access & READWRITE ) == READWRITE )
-	{
-		if (m_access & CREATE)
-		{
-			*m++ = 'w';
-			*m++ = '+';
-		}
-		else
-		{
-			*m++ = 'r';
-			*m++ = '+';
-		}
-	}
-	else if(m_access & WRITE)
-	{
-		*m++ = 'w';
-	}
-	else
-	{
-		*m++ = 'r';
-		DEBUG_ASSERTCRASH(!(m_access & TRUNCATE), ("cannot truncate with read-only"));
-	}
-
-	if (m_access & TEXT)
-	{
-		*m++ = 't';
-	}
-	if (m_access & BINARY)
-	{
-		*m++ = 'b';
-	}
-
-	*m++ = 0;
-
-	m_file = fopen(filename, mode);
-	if (m_file == NULL)
-	{
-		goto error;
-	}
-	
-	//setvbuf(m_file, m_vbuf, _IOFBF, sizeof(BUF_SIZE));
-
-#else
-
-	int flags = 0;
-
-	if (m_access & CREATE)
-	{
-		flags |= _O_CREAT;
-	}
-	if (m_access & TRUNCATE)
-	{
-		flags |= _O_TRUNC;
-	}
-	if (m_access & APPEND)
-	{
-		flags |= _O_APPEND;
-	}
-	if (m_access & TEXT)
-	{
-		flags |= _O_TEXT;
-	}
-	if (m_access & BINARY)
-	{
-		flags |= _O_BINARY;
-	}
-
-	if((m_access & READWRITE )== READWRITE )
-	{
-		flags |= _O_RDWR;
-	}
-	else if(m_access & WRITE)
-	{
-		flags |= _O_WRONLY;
-		flags |= _O_CREAT;
-	}
-	else
-	{
-		flags |= _O_RDONLY;
-	}
-
-	m_handle = _open( filename, flags , _S_IREAD | _S_IWRITE);
-
-	if( m_handle == -1 )
-	{
-		goto error;
-	}
-
-#endif
-
-	++s_totalOpen;
-///	DEBUG_LOG(("LocalFile::open %s (total %d)\n",filename,s_totalOpen));
-	if ( m_access & APPEND )
-	{
-		if ( seek ( 0, END ) < 0 )
-		{
-			goto error;
-		}
-	}
-
-	return TRUE;
-
-error:
-
-	close();
-
-	return FALSE;
-}
-
-//=================================================================
-// LocalFile::close 	
-//=================================================================
-/**
-	* Closes the current file if it is open.
-  * Must call LocalFile::close() for each successful LocalFile::open() call.
-	*/
-//=================================================================
-
-void LocalFile::close( void )
-{
-	File::close();
-}
-
-//=================================================================
-// LocalFile::read 
-//=================================================================
-
-Int LocalFile::read( void *buffer, Int bytes )
-{
-	//USE_PERF_TIMER(LocalFile)
-	if( !m_open )
-	{
-		return -1;
-	}
-
-	if (buffer == NULL) 
-	{
-#ifdef USE_BUFFERED_IO
-		fseek(m_file, bytes, SEEK_CUR);
-#else
-		_lseek(m_handle, bytes, SEEK_CUR);
-#endif
-		return bytes;
-	}
-
-#ifdef USE_BUFFERED_IO
-	Int ret = fread(buffer, 1, bytes, m_file);
-#else
-	Int ret = _read( m_handle, buffer, bytes );
-#endif
-
-	return ret;
-}
-
-//=================================================================
-// LocalFile::write 
-//=================================================================
-
-Int LocalFile::write( const void *buffer, Int bytes )
-{
-
-	if( !m_open || !buffer )
-	{
-		return -1;
-	}
-
-#ifdef USE_BUFFERED_IO
-	Int ret = fwrite(buffer, 1, bytes, m_file);
-#else
-	Int ret = _write( m_handle, buffer, bytes );
-#endif
-	return ret;
-}
-
-//=================================================================
-// LocalFile::seek 
-//=================================================================
-
-Int LocalFile::seek( Int pos, seekMode mode)
-{
-	int lmode;
-
-	switch( mode )
-	{
-		case START:
-			lmode = SEEK_SET;
-			break;
-		case CURRENT:
-			lmode = SEEK_CUR;
-			break;
-		case END:
-			DEBUG_ASSERTCRASH(pos <= 0, ("LocalFile::seek - pos should be <= 0 for a seek starting at the end of the file"));
-			lmode = SEEK_END;
-			break;
-		default:
-			// bad seek mode
-			return -1;
-	}
-
-#ifdef USE_BUFFERED_IO
-	Int ret = fseek(m_file, pos, lmode);
-	if (ret == 0)
-		return ftell(m_file);
-	else
-		return -1;
-#else
-	Int ret = _lseek( m_handle, pos, lmode );
-#endif
-	return ret;
-}
-
-//=================================================================
-// LocalFile::scanInt
-//=================================================================
-// skips preceding whitespace and stops at the first non-number
-// or at EOF
-Bool LocalFile::scanInt(Int &newInt)
-{
-	newInt = 0;
-	AsciiString tempstr;
-	Char c;
-	Int val;
-
-	// skip preceding non-numeric characters
-	do {
-#ifdef USE_BUFFERED_IO
-		val = fread(&c, 1, 1, m_file);
-#else
-		val = _read( m_handle, &c, 1);
-#endif
-	} while ((val != 0) && (((c < '0') || (c > '9')) && (c != '-')));
-
-	if (val == 0) {
-		return FALSE;
-	}
-
-	do {
-		tempstr.concat(c);
-#ifdef USE_BUFFERED_IO
-		val = fread(&c, 1, 1, m_file);
-#else
-		val = _read( m_handle, &c, 1);
-#endif
-	} while ((val != 0) && ((c >= '0') && (c <= '9')));
-
-	// put the last read char back, since we didn't use it.
-	if (val != 0) {
-#ifdef USE_BUFFERED_IO
-		fseek(m_file, -1, SEEK_CUR);
-#else
-		_lseek(m_handle, -1, SEEK_CUR);
-#endif
-	}
-
-	newInt = atoi(tempstr.str());
-	return TRUE;
-}
-
-//=================================================================
-// LocalFile::scanReal
-//=================================================================
-// skips preceding whitespace and stops at the first non-number
-// or at EOF
-Bool LocalFile::scanReal(Real &newReal) 
-{
-	newReal = 0.0;
-	AsciiString tempstr;
-	Char c;
-	Int val;
-	Bool sawDec = FALSE;
-
-	// skip the preceding white space
-	do {
-#ifdef USE_BUFFERED_IO
-		val = fread(&c, 1, 1, m_file);
-#else
-		val = _read( m_handle, &c, 1);
-#endif
-	} while ((val != 0) && (((c < '0') || (c > '9')) && (c != '-') && (c != '.')));
-
-	if (val == 0) {
-		return FALSE;
-	}
-
-	do {
-		tempstr.concat(c);
-		if (c == '.') {
-			sawDec = TRUE;
-		}
-#ifdef USE_BUFFERED_IO
-		val = fread(&c, 1, 1, m_file);
-#else
-		val = _read(m_handle, &c, 1);
-#endif
-	} while ((val != 0) && (((c >= '0') && (c <= '9')) || ((c == '.') && !sawDec)));
-
-	if (val != 0) {
-#ifdef USE_BUFFERED_IO
-		fseek(m_file, -1, SEEK_CUR);
-#else
-		_lseek(m_handle, -1, SEEK_CUR);
-#endif
-	}
-
-	newReal = atof(tempstr.str());
-	return TRUE;
-}
-
-//=================================================================
-// LocalFile::scanString
-//=================================================================
-// skips preceding whitespace and stops at the first whitespace
-// or at EOF
-Bool LocalFile::scanString(AsciiString &newString) 
-{
-	Char c;
-	Int val;
-
-	newString.clear();
-
-	// skip the preceding whitespace
-	do {
-#ifdef USE_BUFFERED_IO
-		val = fread(&c, 1, 1, m_file);
-#else
-		val = _read(m_handle, &c, 1);
-#endif
-	} while ((val != 0) && (isspace(c)));
-
-	if (val == 0) {
-		return FALSE;
-	}
-
-	do {
-		newString.concat(c);
-#ifdef USE_BUFFERED_IO
-		val = fread(&c, 1, 1, m_file);
-#else
-		val = _read(m_handle, &c, 1);
-#endif
-	} while ((val != 0) && (!isspace(c)));
-
-	if (val != 0) {
-#ifdef USE_BUFFERED_IO
-		fseek(m_file, -1, SEEK_CUR);
-#else
-		_lseek(m_handle, -1, SEEK_CUR);
-#endif
-	}
-
-	return TRUE;
-}
-
-//=================================================================
-// LocalFile::nextLine
-//=================================================================
-// scans to the first character after a new-line or at EOF
-void LocalFile::nextLine(Char *buf, Int bufSize) 
-{
-	Char c = 0;
-	Int val;
-	Int i = 0;
-
-	// seek to the next new-line.
-	do {
-		if ((buf == NULL) || (i >= (bufSize-1))) {
-#ifdef USE_BUFFERED_IO
-			val = fread(&c, 1, 1, m_file);
-#else
-			val = _read(m_handle, &c, 1);
-#endif
-		} else {
-#ifdef USE_BUFFERED_IO
-			val = fread(buf + i, 1, 1, m_file);
-#else
-			val = _read(m_handle, buf + i, 1);
-#endif
-			c = buf[i];
-		}
-		++i;
-	} while ((val != 0) && (c != '\n'));
-
-	if (buf != NULL) {
-		if (i < bufSize) {
-			buf[i] = 0;
-		} else {
-			buf[bufSize] = 0;
-		}
-	}
-}
-
-//=================================================================
-//=================================================================
-File* LocalFile::convertToRAMFile()
-{
-	RAMFile *ramFile = newInstance( RAMFile );
-	if (ramFile->open(this)) 
-	{
-		if (this->m_deleteOnClose)
-		{
-			ramFile->deleteOnClose();
-			this->close(); // is deleteonclose, so should delete.
-		}
-		else
-		{
-			this->close();
-			deleteInstance(this);
-		}
-		return ramFile;
-	}	
-	else 
-	{
-		ramFile->close();
-		deleteInstance(ramFile);
-		return this;
-	}
-}
-
-//=================================================================
-// LocalFile::readEntireAndClose
-//=================================================================
-/**
-	Allocate a buffer large enough to hold entire file, read 
-	the entire file into the buffer, then close the file.
-	the buffer is owned by the caller, who is responsible
-	for freeing is (via delete[]). This is a Good Thing to
-	use because it minimizes memory copies for BIG files.
-*/
-char* LocalFile::readEntireAndClose()
-{
-	UnsignedInt fileSize = size();
-	char* buffer = NEW char[fileSize];
-
-	read(buffer, fileSize);
-
-	close();
-
-	return buffer;
-}
diff --git a/Generals/Code/GameEngine/Source/Common/System/LocalFileSystem.cpp b/Generals/Code/GameEngine/Source/Common/System/LocalFileSystem.cpp
deleted file mode 100644
index f912f2ad0df..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/LocalFileSystem.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Game Engine
-//
-// Module:    IO
-//
-// File name: LocalFileSystem.cpp
-//
-// Created:   4/23/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-#include "Common/LocalFileSystem.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-LocalFileSystem *TheLocalFileSystem = NULL;
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-void LocalFileSystem::init() {
-}
-
-void LocalFileSystem::reset() {
-}
-
-void LocalFileSystem::update() {
-}
diff --git a/Generals/Code/GameEngine/Source/Common/System/MemoryInit.cpp b/Generals/Code/GameEngine/Source/Common/System/MemoryInit.cpp
deleted file mode 100644
index 206f4496e2e..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/MemoryInit.cpp
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: MemoryInit.cpp 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: MemoryInit.cpp
-//
-// Created:   Steven Johnson, August 2001
-//
-// Desc:      Memory manager
-//
-// ----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-// SYSTEM INCLUDES
-
-// USER INCLUDES 
-#include "Lib/BaseType.h"
-#include "Common/GameMemory.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-----------------------------------------------------------------------------
-void userMemoryManagerGetDmaParms(Int *numSubPools, const PoolInitRec **pParms)
-{
-	static const PoolInitRec defaultDMA[7] = 
-	{
-		// name, allocsize, initialcount, overflowcount
-		{ "dmaPool_16", 16,			65536,	1024 },
-		{ "dmaPool_32", 32,			150000,	1024 },
-		{ "dmaPool_64", 64,			60000,	1024 },
-		{ "dmaPool_128", 128,		32768,	1024 },
-		{ "dmaPool_256", 256,		8192,		1024 },
-		{ "dmaPool_512", 512,		8192,		1024 },
-		{ "dmaPool_1024", 1024, 24000,	1024 }
-	};
-
-	*numSubPools = 7;
-	*pParms = defaultDMA;
-}
-
-//-----------------------------------------------------------------------------
-struct PoolSizeRec
-{
-	const char* name;
-	Int initial;
-	Int overflow;
-};
-
-//-----------------------------------------------------------------------------
-// And please be careful of duplicates.  They are not rejected.
-// not const -- we might override from INI
-static PoolSizeRec sizes[] = 
-{
-	{ "PartitionContactListNode", 2048, 512 },
-	{ "BattleshipUpdate", 32, 32 },
-	{ "FlyToDestAndDestroyUpdate", 32, 32 },
-	{ "MusicTrack", 32, 32 },
-	{ "PositionalSoundPool", 32, 32 },
-	{ "GameMessage", 2048, 32 },
-	{ "NameKeyBucketPool", 4096, 32 },
-	{ "ObjectSellInfo", 16, 16 },
-	{ "ProductionPrerequisitePool", 1024, 32 },
-	{ "RadarObject", 512, 32 },
-	{ "ResourceGatheringManager", 16, 16 },
-	{ "SightingInfo", 8192, 2048 },// Looks big, but all 3000 objects used to have 4 just built in.
-	{ "SpecialPowerTemplate", 64, 32 },
-	{ "StateMachinePool", 32, 32 },
-	{ "TeamPool", 128, 32 },	// if you increase this, increase player/team relation map pools
-	{ "PlayerRelationMapPool", 128, 32 },
-	{ "TeamRelationMapPool", 128, 32 },
-	{ "TeamPrototypePool", 256, 32 },
-	{ "TerrainType", 256, 32 },
-	{ "ThingTemplatePool", 1200, 32 },
-	{ "TunnelTracker", 16, 16 },
-	{ "Upgrade", 16, 16 },
-	{ "UpgradeTemplate", 128, 16 },
-	{ "Anim2D", 32, 32 },
-	{ "CommandButton", 300, 16 },
-	{ "CommandSet", 256, 16 },
-	{ "DisplayString", 32, 32 },
-	{ "WebBrowserURL", 16, 16 },
-	{ "Drawable", 4096, 32 },
-	{ "Image", 2048, 32 },
-	{ "ParticlePool", 4096, 256 },  
-	{ "ParticleSystemTemplatePool", 768, 32 },  
-	{ "ParticleSystemPool", 1024, 32 },  
-	{ "TerrainRoadType", 64, 64, },
-	{ "WindowLayoutPool", 32, 32 },
-	{ "AnimatedParticleSysBoneClientUpdate", 16, 16 },
-	{ "SwayClientUpdate", 4096, 32 },
-	{ "BeaconClientUpdate", 64, 32 },
-	{ "AIGroupPool", 64, 32 },  
-	{ "AIDockMachinePool", 256, 32 },
-	{ "AIGuardMachinePool", 32, 32 },
-	{ "AITNGuardMachinePool", 32, 32 },
-	{ "PathNodePool", 8192, 1024 },  
-	{ "PathPool", 256, 16 },       
-	{ "WorkOrder", 32, 32 },  
-	{ "TeamInQueue", 32, 32 },
-	{ "AIPlayer", 8, 8 },  
-	{ "AISkirmishPlayer", 8, 8 },  
-	{ "AIStateMachine",  600, 32 },
-	{ "JetAIStateMachine",  64, 32 },
-	{ "HeliAIStateMachine",  64, 32 },
-	{ "AIAttackMoveStateMachine", 2048, 32 },
-	{ "AIAttackThenIdleStateMachine", 512, 32 },
-	{ "AttackStateMachine",  512, 32 },
-	{ "CrateTemplate", 32, 32 },
-	{ "ExperienceTrackerPool", 4096, 256 }, 
-	{ "FiringTrackerPool", 4096, 256 }, 
-	{ "ObjectRepulsorHelper", 1024, 256 }, 
-	{ "ObjectSMCHelperPool", 4096, 256 }, 
-	{ "ObjectWeaponStatusHelperPool", 4096, 256 }, 
-	{ "ObjectDefectionHelperPool", 4096, 256 }, 
-	{ "Locomotor", 2048, 32 },
-	{ "LocomotorTemplate", 128, 32	},
-	{ "ObjectPool", 4096, 32 },
-	{ "SimpleObjectIteratorPool", 32, 32 },
-	{ "SimpleObjectIteratorClumpPool", 4096, 32 },
-	{ "PartitionDataPool", 4096, 32 },
-	{ "BuildEntry", 32, 32 },
-	{ "Weapon", 4096, 32 },
-	{ "WeaponTemplate", 192, 32 },
-	{ "AIUpdateInterface", 600, 32 },
-	{ "ActiveBody", 1024, 32 },
-	{ "ActiveShroudUpgrade", 32, 32 },
-	{ "AssistedTargetingUpdate", 32, 32 },
-	{ "AudioEventInfo", 1200, 64 },
-	{ "AudioRequest", 256, 8 },
-	{ "AutoHealBehavior", 4096, 32 },
-	{ "BaseRegenerateUpdate", 64, 32 },
-	{ "BoneFXDamage", 64, 32 },
-	{ "BoneFXUpdate", 64, 32 },
-	{ "BridgeBehavior", 32, 32 },
-	{ "BridgeTowerBehavior", 32, 32 },
-	{ "BridgeScaffoldBehavior", 32, 32 },
-	{ "CaveContain", 16, 16 },
-	{ "HealContain", 32, 32 },
-	{ "CreateCrateDie", 256, 128 },
-	{ "CreateObjectDie", 1024, 32 },
-	{ "EjectPilotDie", 1024, 32 },
-	{ "CrushDie", 1024, 32 },
-	{ "DamDie", 8, 8 },
-	{ "DelayedUpgrade", 32, 32 },
-	{ "DelayedWeaponSetUpgradeUpdate", 32, 32 },
-	{ "DeliverPayloadStateMachine", 32, 32 },
-	{ "DeliverPayloadAIUpdate", 32, 32 },
-	{ "DeletionUpdate", 128, 32 },
-	{ "HackInternetStateMachine", 32, 32 },
-	{ "HackInternetAIUpdate", 32, 32 },
-	{ "MissileAIUpdate", 512, 32 },
-	{ "DumbProjectileBehavior", 64, 32 },
-	{ "DestroyDie", 1024, 32 },
-	{ "UpgradeDie", 128, 32 },
-	{ "KeepObjectDie", 128, 32 },
-	{ "DozerAIUpdate", 32, 32 },
-	{ "DynamicGeometryInfoUpdate", 16, 16 },
-	{ "DynamicShroudClearingRangeUpdate", 128, 16 },
-	{ "FXListDie", 1024, 32 },
-	{ "FireSpreadUpdate", 2048, 128 },
-	{ "FirestormDynamicGeometryInfoUpdate", 16, 16 },
-	{ "FireWeaponCollide", 2048, 32 },
-	{ "FireWeaponUpdate", 32, 32 },
-	{ "FlammableUpdate", 4096, 256 },
-	{ "FloatUpdate", 512, 128 },
-	{ "TensileFormationUpdate", 256, 32 },
-	{ "GarrisonContain", 256, 32 },
-	{ "HealCrateCollide", 32, 32 },
-	{ "HeightDieUpdate", 32, 32 },
-	{ "FireWeaponWhenDamagedBehavior", 32, 32 },
-	{ "FireWeaponWhenDeadBehavior", 64, 32 },
-	{ "GenerateMinefieldBehavior", 32, 32 },
-	{ "HelicopterSlowDeathBehavior", 64, 32 },
-	{ "ParkingPlaceBehavior", 32, 32 },
-#ifdef ALLOW_SURRENDER
-	{ "POWTruckAIUpdate", 32, 32, },
-	{ "POWTruckBehavior", 32, 32, },
-	{ "PrisonBehavior", 32, 32 },
-	{ "PrisonVisual", 32, 32 },
-	{ "PropagandaCenterBehavior", 16, 16 },
-#endif
-	{ "PropagandaTowerBehavior", 16, 16 },
-	{ "ObjectTracker", 128, 32 },
-	{ "OCLUpdate", 16, 16 },
-	{ "BodyParticleSystem", 128, 64 },
-	{ "HighlanderBody", 2048, 128 },
-	{ "HordeUpdate", 128, 32 },
-	{ "ImmortalBody", 2048, 128 },
-	{ "InactiveBody", 2048, 32 },
-	{ "InstantDeathBehavior", 512, 32 },
-	{ "LaserUpdate", 32, 32 },
-	{ "PointDefenseLaserUpdate", 32, 32 },
-	{ "CleanupHazardUpdate", 32, 32 },
-	{ "AutoFindHealingUpdate", 256, 32 },
-	{ "CommandButtonHuntUpdate", 512, 8 },
-	{ "PilotFindVehicleUpdate", 256, 32 },
-	{ "DemoTrapUpdate", 32, 32 },
-	{ "ParticleUplinkCannonUpdate", 16, 16 },
-	{ "BaikonurLaunchPower", 4, 4 },
-	{ "RadiusDecalUpdate", 16, 16 },
-	{ "BattlePlanUpdate", 32, 32 },
-	{ "LifetimeUpdate", 256, 32 },
-	{ "LocomotorSetUpgrade", 512, 128 },
-	{ "AutoDepositUpdate", 256, 32 },
-	{ "NeutronMissileUpdate", 512, 32 },
-	{ "MoneyCrateCollide", 32, 32 },
-	{ "NeutronMissileSlowDeathBehavior", 8, 8 },
-	{ "OpenContain", 128, 32 },
-	{ "OverchargeBehavior", 32, 32 },
-	{ "OverlordContain", 32, 32 },
-	{ "ParachuteContain", 128, 32 },
-	{ "PhysicsBehavior", 600, 32 },
-	{ "PoisonedBehavior", 512, 64 },
-	{ "ProductionEntry", 32, 32 },
-	{ "ProductionUpdate", 256, 32 },
-	{ "ProjectileStreamUpdate", 32, 32 },
-	{ "ProneUpdate", 128, 32 },
-	{ "QueueProductionExitUpdate", 32, 32 },
-	{ "RadarUpdate", 16, 16 },
-	{ "RadarUpgrade", 16, 16 },
-	{ "SupplyWarehouseCripplingBehavior", 16, 16 },
-	{ "CostModifierUpgrade", 32, 32 },
-	{ "CashBountyPower", 32, 32 },
-	{ "CleanupAreaPower", 32, 32 },
-	{ "ObjectCreationUpgrade", 128, 32 },
-	{ "MinefieldBehavior", 256, 32 },
-	{ "JetSlowDeathBehavior", 64, 32 },
-	{ "RebuildHoleBehavior", 64, 32 },
-	{ "RebuildHoleExposeDie", 64, 32 },
-	{ "RepairDockUpdate", 32, 32 },
-#ifdef ALLOW_SURRENDER
-	{ "PrisonDockUpdate", 32, 32 },
-#endif
-	{ "RailedTransportDockUpdate", 16, 16 },
-	{ "RailedTransportAIUpdate", 16, 16 },
-	{ "RailedTransportContain", 16, 16 },
-	{ "RailroadBehavior", 16, 16 },
-	{ "SalvageCrateCollide", 32, 32 },
-	{ "ShroudCrateCollide", 32, 32 },
-	{ "SlavedUpdate", 64, 32 },
-	{ "SlowDeathBehavior", 4096, 32 },
-	{ "SpyVisionUpdate", 16, 16 },
-	{ "DefaultProductionExitUpdate", 32, 32 },
-	{ "SpawnPointProductionExitUpdate", 32, 32 },
-	{ "SpawnBehavior", 32, 32 },
-	{ "SpecialPowerCompletionDie", 32, 32 },
-	{ "SpecialPowerCreate", 32, 32 },
-	{ "PreorderCreate", 32, 32 },
-	{ "SpecialAbility", 512, 32 },
-	{ "SpecialAbilityUpdate", 512, 32 },
-	{ "MissileLauncherBuildingUpdate", 32, 32 },
-	{ "SquishCollide", 512, 32 },
-	{ "StructureBody", 512, 64 },
-	{ "HiveStructureBody", 64, 32 }, //Stinger sites
-	{ "StructureCollapseUpdate", 32, 32 },
-	{ "StructureToppleUpdate", 32, 32 },
-	{ "SupplyCenterCreate", 32, 32 },
-	{ "SupplyCenterDockUpdate", 32, 32 },
-	{ "SupplyCenterProductionExitUpdate", 32, 32 },
-	{ "SupplyTruckStateMachine", 256, 32 },
-	{ "SupplyTruckAIUpdate", 32, 32 },
-	{ "SupplyWarehouseCreate", 32, 32 },
-	{ "SupplyWarehouseDockUpdate", 32, 32 },
-	{ "EnemyNearUpdate", 1024, 32 },
-	{ "TechBuildingBehavior", 32, 32 },
-	{ "ToppleUpdate", 2048, 32 },
-	{ "TransitionDamageFX", 256, 32 },
-	{ "TransportAIUpdate", 64, 32 },
-	{ "TransportContain", 128, 32 },
-	{ "TunnelContain", 16, 16 },
-	{ "TunnelContainDie", 32, 32 },
-	{ "TunnelCreate", 32, 32 },
-	{ "TurretAI", 256, 32 },
-	{ "TurretStateMachine", 128, 32 },
-	{ "TurretSwapUpgrade", 512, 128 },
-	{ "UnitCrateCollide", 32, 32 },
-	{ "UnpauseSpecialPowerUpgrade", 32, 32 },
-	{ "VeterancyCrateCollide", 32, 32 },
-	{ "VeterancyGainCreate", 512, 128 },
-	{ "ConvertToCarBombCrateCollide", 32, 32 },
-	{ "ConvertToHijackedVehicleCrateCollide", 32, 32 },
-	{ "JetAIUpdate", 64, 32 },
-	{ "ChinookAIUpdate", 32, 32 },
-	{ "WanderAIUpdate", 32, 32 },
-	{ "WaveGuideUpdate", 16, 16 },
-	{ "WeaponBonusUpgrade", 512, 128 },
-	{ "WeaponSetUpgrade", 512, 128 },
-	{ "ArmorUpgrade", 512, 128 },
-	{ "WorkerAIUpdate", 128, 128 },
-	{ "WorkerStateMachine", 128, 128 },
-	{ "ChinookAIStateMachine", 32, 32 },
-	{ "DeployStyleAIUpdate", 32, 32 },
-	{ "AssaultTransportAIUpdate", 64, 32 },
-	{ "StreamingArchiveFile", 8, 8 },
-
-	{ "DozerActionStateMachine", 256, 32 },
-	{ "DozerPrimaryStateMachine", 256, 32 },
-	{ "W3DDisplayString", 1024, 128 },
-	{ "W3DDefaultDraw", 1024, 128 },
-	{ "W3DDebrisDraw", 1024, 128 },
-	{ "W3DDependencyModelDraw", 64, 64 },
-	{ "W3DLaserDraw", 32, 32 },
-	{ "W3DModelDraw", 4096, 128 },
-	{ "W3DOverlordTankDraw", 64, 64 },
-	{ "W3DPoliceCarDraw", 32, 32 },
-	{ "W3DProjectileStreamDraw", 32, 32 },
-	{ "W3DRopeDraw", 32, 32 },
-	{ "W3DScienceModelDraw", 32, 32 },
-	{ "W3DSupplyDraw", 32, 32 },
-	{ "W3DTankDraw", 256, 32 },
-	{ "W3DTracerDraw", 64, 32 },
-	{ "W3DTruckDraw", 128, 32 },
-	{ "W3DTankTruckDraw", 32, 16 },
-	{ "DefaultSpecialPower", 32, 32 },
-	{ "OCLSpecialPower", 32, 32 },
-#ifdef ALLOW_DEMORALIZE
-	{ "DemoralizeSpecialPower", 16, 16, },
-#endif
-	{ "CashHackSpecialPower", 32, 32 },
-	{ "CommandSetUpgrade", 32, 32 },
-	{ "GrantUpgradeCreate", 256, 32 },
-	{ "SpyVisionSpecialPower", 256, 32 },
-	{ "StealthDetectorUpdate", 256, 32 },
-	{ "StealthUpdate", 256, 32 },
-	{ "StealthUpgrade", 256, 32 },
-	{ "StatusBitsUpgrade", 128, 128 },
-	{ "SubObjectsUpgrade", 128, 128 },
-	{ "ExperienceScalarUpgrade", 256, 128 },
-	{ "MaxHealthUpgrade", 128, 128 },
-	{ "WeaponBonusUpgrade", 128, 64 },
-	{ "StickyBombUpdate", 64, 32 },
-	{ "FireOCLAfterWeaponCooldownUpdate", 64, 32 },
-	{ "HijackerUpdate", 64, 32 },
-	{ "ChinaMinesUpgrade", 64, 32 },
-	{ "PowerPlantUpdate", 16, 16 },
-	{ "PowerPlantUpgrade", 16, 16 },
-	{ "DefectorSpecialPower", 16, 16 },
-	{ "CheckpointUpdate", 16, 16 },
-	{ "MobNexusContain", 128, 32 },
-	{ "MobMemberSlavedUpdate", 64, 32 },
-	{ "EMPUpdate", 64, 32 },
-	{ "Overridable", 32, 32 },
-
-	{ "W3DGameWindow", 1024, 32 },
-	{ "GameWindowDummy", 1024, 32 },
-	{ "SuccessState", 32, 32 },
-	{ "FailureState", 32, 32 },
-	{ "ContinueState", 32, 32 },
-	{ "SleepState", 32, 32 },
-
-	{ "AIDockWaitForClearanceState", 256, 32 },
-	{ "AIDockProcessDockState", 256, 32 },
-	{ "AIGuardInnerState", 32, 32 },
-	{ "AIGuardIdleState", 32, 32 },
-	{ "AIGuardOuterState", 32, 32 },
-	{ "AIGuardReturnState", 32, 32 },
-	{ "AIGuardPickUpCrateState", 32, 32 },
-	{ "AIGuardAttackAggressorState", 32, 32 },
-	{ "AITNGuardInnerState", 32, 32 },
-	{ "AITNGuardIdleState", 32, 32 },
-	{ "AITNGuardOuterState", 32, 32 },
-	{ "AITNGuardReturnState", 32, 32 },
-	{ "AITNGuardPickUpCrateState", 32, 32 },
-	{ "AITNGuardAttackAggressorState", 32, 32 },
-	{ "AIIdleState", 2400, 32 },
-	{ "AIRappelState", 600, 32 },
-	{ "AIBusyState", 600, 32 },
-	{ "AIWaitState", 600, 32 },
-	{ "AIAttackState", 4096, 32 },
-	{ "AIAttackSquadState", 600, 32 },
-	{ "AIDeadState", 600, 32 },
-	{ "AIDockState", 600, 32 },
-	{ "AIExitState", 600, 32 },
-	{ "AIGuardState", 600, 32 },
-	{ "AITunnelNetworkGuardState", 600, 32 },
-	{ "AIHuntState", 600, 32 },
-	{ "AIAttackAreaState", 600, 32 },
-	{ "AIFaceState", 1200, 32 },
-	{ "ApproachState", 600, 32 },
-	{ "DeliveringState", 600, 32 },
-	{ "ConsiderNewApproachState", 600, 32 },
-	{ "RecoverFromOffMapState", 600, 32 },
-	{ "HeadOffMapState", 600, 32 },
-	{ "CleanUpState", 600, 32 },
-	{ "HackInternetState", 600, 32 },
-	{ "PackingState", 600, 32 },
-	{ "UnpackingState", 600, 32 },
-	{ "SupplyTruckWantsToPickUpOrDeliverBoxesState", 600, 32 },
-	{ "RegroupingState", 600, 32 },
-	{ "DockingState", 600, 32 },
-	{ "ChinookEvacuateState", 32, 32 },
-	{ "ChinookHeadOffMapState", 32, 32 },
-	{ "ChinookTakeoffOrLandingState", 32, 32 },
-	{ "ChinookCombatDropState", 32, 32 },
-	{ "DozerActionPickActionPosState", 256, 32 },
-	{ "DozerActionMoveToActionPosState", 256, 32 },
-	{ "DozerActionDoActionState", 256, 32 },
-	{ "DozerPrimaryIdleState", 256, 32 },
-	{ "DozerActionState", 256, 32 },
-	{ "DozerPrimaryGoingHomeState", 256, 32 },
-	{ "JetAwaitingRunwayState", 64, 32 },
-	{ "JetOrHeliCirclingDeadAirfieldState", 64, 32 },
-	{ "HeliTakeoffOrLandingState", 64, 32 },
-	{ "JetOrHeliParkOrientState", 64, 32 },
-	{ "JetOrHeliReloadAmmoState", 64, 32 },
-	{ "SupplyTruckBusyState", 600, 32 },
-	{ "SupplyTruckIdleState", 600, 32 },
-	{ "ActAsDozerState", 600, 32 },
-	{ "ActAsSupplyTruckState", 600, 32 },
-	{ "AIDockApproachState", 256, 32 },
-	{ "AIDockAdvancePositionState", 256, 32 },
-	{ "AIDockMoveToEntryState", 256, 32 },
-	{ "AIDockMoveToDockState", 256, 32 },
-	{ "AIDockMoveToExitState", 256, 32 },
-	{ "AIDockMoveToRallyState", 256, 32 },
-	{ "AIMoveToState", 600, 32 },
-	{ "AIMoveOutOfTheWayState", 600, 32 },
-	{ "AIMoveAndTightenState", 600, 32 },
-	{ "AIMoveAwayFromRepulsorsState", 600, 32 },
-	{ "AIAttackApproachTargetState", 96, 32 },
-	{ "AIAttackPursueTargetState", 96, 32 },
-	{ "AIAttackAimAtTargetState", 96, 32 },
-	{ "AIAttackFireWeaponState", 256, 32 },
-	{ "AIPickUpCrateState", 4096, 32 },
-	{ "AIFollowWaypointPathState", 1200, 32 },
-	{ "AIFollowWaypointPathExactState", 1200, 32 },
-	{ "AIWanderInPlaceState", 600, 32 },
-	{ "AIFollowPathState", 1200, 32 },
-	{ "AIMoveAndEvacuateState", 1200, 32 },
-	{ "AIMoveAndDeleteState", 600, 32 },
-	{ "AIEnterState", 600, 32 },
-	{ "JetOrHeliReturningToDeadAirfieldState", 64, 32 },
-	{ "JetOrHeliReturnForLandingState", 64, 32 },
-	{ "TurretAIIdleState", 600, 32 },
-	{ "TurretAIIdleScanState", 600, 32 },
-	{ "TurretAIAimTurretState", 600, 32 },
-	{ "TurretAIRecenterTurretState", 600, 32 },
-	{ "TurretAIHoldTurretState", 600, 32 },
-	{ "JetOrHeliTaxiState", 64, 32 },
-	{ "JetTakeoffOrLandingState", 64, 32 },
-	{ "JetPauseBeforeTakeoffState", 64, 32 },
-	{ "AIAttackMoveToState", 600, 32 },
-	{ "AIAttackFollowWaypointPathState", 1200, 32 },
-	{ "AIWanderState", 600, 32 },
-	{ "AIPanicState", 600, 32 },
-	{ "ChinookMoveToBldgState", 32, 32 },
-	{ "ScienceInfo", 64, 32 },
-	{ "RankInfo", 32, 32 },
-
-	{ "FireWeaponNugget", 32, 32 },
-	{ "AttackNugget", 32, 32 },
-	{ "DeliverPayloadNugget", 32, 32 },
-	{ "ApplyRandomForceNugget", 32, 32 },
-	{ "GenericObjectCreationNugget", 512, 32 },
-	{ "SoundFXNugget", 256, 32 },
-	{ "TracerFXNugget", 32, 32 },
-	{ "RayEffectFXNugget", 32, 32 },
-	{ "LightPulseFXNugget", 64, 32 },
-	{ "ViewShakeFXNugget", 128, 32 },
-	{ "TerrainScorchFXNugget", 32, 32 },
-	{ "ParticleSystemFXNugget", 600, 32 },
-	{ "FXListAtBonePosFXNugget", 32, 32 },
-	{ "Squad", 256, 32 },
-	{ "BuildListInfo", 256, 32 },
-
-	{ "ScriptGroup", 128, 32 },
-	{ "OrCondition", 1024, 256 },
-	{ "ScriptAction", 2048, 512 },
-	{ "Script", 1024, 256 },
-	{ "Parameter", 8192, 1024 },
-	{ "Condition", 2048, 256 },
-	{ "Template", 32, 32 },
-	{ "ScriptList", 32, 32 },
-	{ "AttackPriorityInfo", 32, 32 },
-	{ "SequentialScript", 32, 32 },
-	{ "Win32LocalFile", 1024, 256 },
-	{ "RAMFile", 32, 32 },
-	{ "BattlePlanBonuses", 32, 32 },
-	{ "KindOfPercentProductionChange", 32, 32 },
-	{ "UserParser", 4096, 256 },
-	{ "XferBlockData", 32, 32 },
-	{ "EvaCheckInfo", 32, 32 },
-	{ "SuperweaponInfo", 32, 32 },
-	{ "NamedTimerInfo", 32, 32 },
-	{ "PopupMessageData", 32, 32 },
-	{ "FloatingTextData", 32, 32 },
-	{ "MapObject", 4096, 32 },
-	{ "Waypoint", 1024, 32 },
-	{ "PolygonTrigger", 128, 32 },
-	{ "Bridge", 32, 32 },
-	{ "Mapping", 128, 32 },
-	{ "OutputChunk", 32, 32 },
-	{ "InputChunk", 32, 32 },
-	{ "AnimateWindow", 32, 32 },
-	{ "GameFont", 32, 32 },
-	{ "NetCommandRef", 256, 32 },
-	{ "GameMessageArgument", 128, 32 },
-	{ "GameMessageParserArgumentType", 32, 32 },
-	{ "GameMessageParser", 32, 32 },
-	{ "WeaponBonusSet", 32, 32 },
-	{ "Campaign", 32, 32 },
-	{ "Mission", 32, 32 },
-	{ "ModalWindow", 32, 32 },
-	{ "NetPacket", 32, 32 },
-	{ "AISideInfo", 32, 32 },
-	{ "AISideBuildList", 32, 32 },
-	{ "MetaMapRec", 256, 32 },
-	{ "TransportStatus", 32, 32 },
-	{ "Anim2DTemplate", 32, 32 },
-	{ "ObjectTypes", 32, 32 },
-	{ "NetCommandList", 512, 32 },
-	{ "TurretAIData", 256, 32 },
-	{ "NetCommandMsg", 32, 32 },
-	{ "NetGameCommandMsg", 64, 32 },
-	{ "NetAckBothCommandMsg", 32, 32 },
-	{ "NetAckStage1CommandMsg", 32, 32 },
-	{ "NetAckStage2CommandMsg", 32, 32 },
-	{ "NetFrameCommandMsg", 32, 32 },
-	{ "NetPlayerLeaveCommandMsg", 32, 32 },
-	{ "NetRunAheadMetricsCommandMsg", 32, 32 },
-	{ "NetRunAheadCommandMsg", 32, 32 },
-	{ "NetDestroyPlayerCommandMsg", 32, 32 },
-	{ "NetDisconnectFrameCommandMsg", 32, 32 },
-	{ "NetDisconnectScreenOffCommandMsg", 32, 32 },
-	{ "NetFrameResendRequestCommandMsg", 32, 32 },
-	{ "NetKeepAliveCommandMsg", 32, 32 },
-	{ "NetDisconnectKeepAliveCommandMsg", 32, 32 },
-	{ "NetDisconnectPlayerCommandMsg", 32, 32 },
-	{ "NetPacketRouterQueryCommandMsg", 32, 32 },
-	{ "NetPacketRouterAckCommandMsg", 32, 32 },
-	{ "NetDisconnectChatCommandMsg", 32, 32 },
-	{ "NetChatCommandMsg", 32, 32 },
-	{ "NetDisconnectVoteCommandMsg", 32, 32 },
-	{ "NetProgressCommandMsg", 32, 32 },
-	{ "NetWrapperCommandMsg", 32, 32 },
-	{ "NetFileCommandMsg", 32, 32 },
-	{ "NetFileAnnounceCommandMsg", 32, 32 },
-	{ "NetFileProgressCommandMsg", 32, 32 },
-	{ "NetCommandWrapperListNode", 32, 32 },
-	{ "NetCommandWrapperList", 32, 32 },
-	{ "Connection", 32, 32 },
-	{ "User", 32, 32 },
-	{ "FrameDataManager", 32, 32 },
-	{ "DrawableIconInfo", 32, 32 },
-	{ "TintEnvelope", 128, 32 },
-	{ "DynamicAudioEventRTS", 1024, 256 },
-	{ "DrawableLocoInfo", 128, 32 },
-	{ "W3DPrototypeClass", 2048, 32 },
-	{ "EnumeratedIP", 32, 32 },
-	{ "WaterTransparencySetting", 4, 4 },
-	
-
-	// W3D pools!
-	{ "BoxPrototypeClass", 512, 32 },
-	{ "SpherePrototypeClass", 32, 32 },
-	{ "SoundRenderObjPrototypeClass", 32, 32 },
-	{ "RingPrototypeClass", 32, 32 },
-	{ "PrimitivePrototypeClass", 8192, 32 },
-	{ "HModelPrototypeClass", 256, 32 },
-	{ "ParticleEmitterPrototypeClass", 32, 32 },
-	{ "NullPrototypeClass", 32, 32 },
-	{ "HLodPrototypeClass", 512, 32 },
-	{ "DistLODPrototypeClass", 32, 32 },
-	{ "DazzlePrototypeClass", 32, 32 },
-	{ "CollectionPrototypeClass", 32, 32 },
-	{ "BoxPrototypeClass", 256, 32 },
-	{ "AggregatePrototypeClass", 32, 32 },
-	{ "OBBoxRenderObjClass", 16384, 32 },
-	{ "AABoxRenderObjClass", 32, 32 },
-	{ "VertexMaterialClass", 16384, 32 },
-	{ "TextureClass", 1024, 32 },
-	{ "CloudMapTerrainTextureClass", 32, 32 },
-	{ "ScorchTextureClass", 32, 32 },
-	{ "LightMapTerrainTextureClass", 32, 32 },
-	{ "AlphaEdgeTextureClass", 32, 32 },
-	{ "AlphaTerrainTextureClass", 32, 32 },
-	{ "TerrainTextureClass", 32, 32 },
-	{ "MeshClass", 16384, 1024 },
-	{ "HTreeClass", 8192, 32 },
-	{ "HLodDefClass", 512, 32 },
-	{ "HLodClass", 4096, 32 },
-	{ "MeshModelClass", 8192, 32 },
-	{ "ShareBufferClass", 32768, 1024 },
-	{ "AABTreeClass", 32, 32 },
-	{ "MotionChannelClass", 16384, 32 },
-	{ "BitChannelClass", 64, 32 },
-	{ "TimeCodedMotionChannelClass", 32, 32 },
-	{ "AdaptiveDeltaMotionChannelClass", 32, 32 },
-	{ "TimeCodedBitChannelClass", 32, 32 },
-	{ "UVBufferClass", 8192, 32 },
-	{ "TexBufferClass", 512, 32 },
-	{ "MatBufferClass", 512, 32 },
-	{ "MatrixMapperClass", 32, 32 },
-	{ "ScaleTextureMapperClass", 32, 32 },
-	{ "LinearOffsetTextureMapperClass", 32, 32 },
-	{ "GridTextureMapperClass", 32, 32 },
-	{ "RotateTextureMapperClass", 32, 32 },
-	{ "SineLinearOffsetTextureMapperClass", 32, 32 },
-	{ "StepLinearOffsetTextureMapperClass", 32, 32 },
-	{ "ZigZagLinearOffsetTextureMapperClass", 32, 32 },
-	{ "ClassicEnvironmentMapperClass", 32, 32 },
-	{ "EnvironmentMapperClass", 256, 32 },
-	{ "EdgeMapperClass", 32, 32 },
-	{ "WSClassicEnvironmentMapperClass", 32, 32 },
-	{ "WSEnvironmentMapperClass", 32, 32 },
-	{ "GridClassicEnvironmentMapperClass", 32, 32 },
-	{ "GridEnvironmentMapperClass", 32, 32 },
-	{ "ScreenMapperClass", 32, 32 },
-	{ "RandomTextureMapperClass", 32, 32 },
-	{ "BumpEnvTextureMapperClass", 32, 32 },
-	{ "MeshLoadContextClass", 32, 32 },
-	{ "MaterialInfoClass", 8192, 32 },
-	{ "MeshMatDescClass", 8192, 32 },
-	{ "TextureLoadTaskClass", 256, 32 },
-	{ "SortingNodeStruct", 256, 32 },
-	{ "ProxyArrayClass", 32, 32 },
-	{ "Line3DClass", 128, 32 },
-	{ "Render2DClass", 64, 32 },
-	{ "SurfaceClass", 128, 32 },
-	{ "FontCharsClassCharDataStruct", 1024, 32 },
-	{ "FontCharsBuffer", 16, 4 },
-	{ "FVFInfoClass", 128, 32 },
-	{ "TerrainTracksRenderObjClass", 128, 32 },
-	{ "DynamicIBAccessClass", 32, 32 },
-	{ "DX8IndexBufferClass", 128, 32 },
-	{ "SortingIndexBufferClass", 32, 32 },
-	{ "DX8VertexBufferClass", 128, 32 },
-	{ "SortingVertexBufferClass", 32, 32 },
-	{ "DynD3DMATERIAL8", 8192, 32 }, 
-	{ "DynamicMatrix3D", 512, 32 },
-	{ "MeshGeometryClass", 32, 32 },
-	{ "DynamicMeshModel", 32, 32 },
-	{ "GapFillerClass", 32, 32 },
-	{ "FontCharsClass", 64, 32 },
-
-	{ 0, 0, 0 }
-};
-
-//-----------------------------------------------------------------------------
-void userMemoryAdjustPoolSize(const char *poolName, Int& initialAllocationCount, Int& overflowAllocationCount)
-{
-	if (initialAllocationCount > 0)
-		return;
-
-	for (const PoolSizeRec* p = sizes; p->name != NULL; ++p)
-	{
-		if (strcmp(p->name, poolName) == 0)
-		{
-			initialAllocationCount = p->initial;
-			overflowAllocationCount = p->overflow;
-			return;
-		}
-	}
-
-	DEBUG_CRASH(("Initial size for pool %s not found -- you should add it to MemoryInit.cpp\n",poolName));
-}
-
-//-----------------------------------------------------------------------------
-static Int roundUpMemBound(Int i)
-{
-	const int MEM_BOUND_ALIGNMENT = 4;
-
-	if (i < MEM_BOUND_ALIGNMENT)
-		return MEM_BOUND_ALIGNMENT;
-	else
-		return (i + (MEM_BOUND_ALIGNMENT-1)) & ~(MEM_BOUND_ALIGNMENT-1);
-}
-
-//-----------------------------------------------------------------------------
-void userMemoryManagerInitPools()
-{
-	// note that we MUST use stdio stuff here, and not the normal game file system
-	// (with bigfile support, etc), because that relies on memory pools, which
-	// aren't yet initialized properly! so rely ONLY on straight stdio stuff here.
-	// (not even AsciiString. thanks.)
-	
-	// since we're called prior to main, the cur dir might not be what
-	// we expect. so do it the hard way.
-	char buf[_MAX_PATH];
-	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char* pEnd = buf + strlen(buf);
-	while (pEnd != buf) 
-	{
-		if (*pEnd == '\\') 
-		{
-			*pEnd = 0;
-			break;
-		}
-		--pEnd;
-	}
-	strcat(buf, "\\Data\\INI\\MemoryPools.ini");
-
-	FILE* fp = fopen(buf, "r");
-	if (fp)
-	{
-		char poolName[256];
-		int initial, overflow;
-		while (fgets(buf, _MAX_PATH, fp))
-		{
-			if (buf[0] == ';')
-				continue;
-			if (sscanf(buf, "%s %d %d", poolName, &initial, &overflow ) == 3)
-			{
-				for (PoolSizeRec* p = sizes; p->name != NULL; ++p)
-				{
-					if (stricmp(p->name, poolName) == 0)
-					{
-						// currently, these must be multiples of 4. so round up.
-						p->initial = roundUpMemBound(initial);
-						p->overflow = roundUpMemBound(overflow);
-						break;	// from for-p
-					}
-				}
-			}
-		}
-		fclose(fp);
-	}
-}
-
diff --git a/Generals/Code/GameEngine/Source/Common/System/ObjectStatusTypes.cpp b/Generals/Code/GameEngine/Source/Common/System/ObjectStatusTypes.cpp
deleted file mode 100644
index 7de34e61e56..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/ObjectStatusTypes.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: ObjectStatusTypes.cpp ////////////////////////////////////////////////////////////////////
-// Author: Kris, May 2003
-// Desc:   Object status types that are stackable using the BitSet system. Used to be ObjectStatusBits
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"
-
-#include "Common/ObjectStatusTypes.h"
-#include "Common/BitFlagsIO.h"
-
-const char* ObjectStatusMaskType::s_bitNameList[] = 
-{
-	"NONE",
-	"DESTROYED",
-	"CAN_ATTACK",					
-	"UNDER_CONSTRUCTION",	
-	"UNSELECTABLE",				
-	"NO_COLLISIONS",				
-	"NO_ATTACK",						
-	"AIRBORNE_TARGET",			
-	"PARACHUTING",	
-	"REPULSOR",
-	"HIJACKED",					
-	"AFLAME",							
-	"BURNED",							
-	"WET",
-	"IS_FIRING_WEAPON",
-	"IS_BRAKING",
-	"STEALTHED",
-	"DETECTED",
-	"CAN_STEALTH",
-	"SOLD",
-	"UNDERGOING_REPAIR",
-	"RECONSTRUCTING",
-	"MASKED",
-	"IS_ATTACKING",
-	"USING_ABILITY",
-	"IS_AIMING_WEAPON",
-	"NO_ATTACK_FROM_AI",
-	"IGNORING_STEALTH",
-	"IS_CARBOMB",
-	NULL
-};
-
-ObjectStatusMaskType OBJECT_STATUS_MASK_NONE;	// inits to all zeroes
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp b/Generals/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp
index 0edf836cefe..29a158b821e 100644
--- a/Generals/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp
@@ -26,7 +26,7 @@
 // Author: Matt Campbell, February 2002
 // Description: Quoted-printable encode/decode
 ////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/QuotedPrintable.h"
 
@@ -56,7 +56,7 @@ static int hexDigitToInt(char c)
 AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
 {
 	static char dest[1024];
-	const char *src = (const char *)original.str();
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 	int i=0;
 	while ( !(src[0]=='\0' && src[1]=='\0') && i<1021 )
 	{
@@ -65,7 +65,8 @@ AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
 			dest[i++] = MAGIC_CHAR;
 			dest[i++] = intToHexDigit((*src)>>4);
 			dest[i++] = intToHexDigit((*src)&0xf);
-		} else
+		}
+		else
 		{
 			dest[i++] = *src;
 		}
@@ -91,7 +92,7 @@ AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
 AsciiString AsciiStringToQuotedPrintable(AsciiString original)
 {
 	static char dest[1024];
-	const char *src = (const char *)original.str();
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 	int i=0;
 	while ( src[0]!='\0' && i<1021 )
 	{
@@ -100,7 +101,8 @@ AsciiString AsciiStringToQuotedPrintable(AsciiString original)
 			dest[i++] = MAGIC_CHAR;
 			dest[i++] = intToHexDigit((*src)>>4);
 			dest[i++] = intToHexDigit((*src)&0xf);
-		} else
+		}
+		else
 		{
 			dest[i++] = *src;
 		}
@@ -117,8 +119,8 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)
 	static WideChar dest[1024];
 	int i=0;
 
-	unsigned char *c = (unsigned char *)dest;
-	const unsigned char *src = (const unsigned char *)original.str();
+	unsigned char *c = reinterpret_cast<unsigned char *>(dest);
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 
 	while (*src && i<1023)
 	{
@@ -159,18 +161,17 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)
 
 	*c = 0;
 
-	UnicodeString out(dest);
-	return out;
+	return dest;
 }
 
 // Convert ascii quoted-printable strings into ascii strings
 AsciiString QuotedPrintableToAsciiString(AsciiString original)
 {
-	static unsigned char dest[1024];
+	static char dest[1024];
 	int i=0;
 
-	unsigned char *c = (unsigned char *)dest;
-	const unsigned char *src = (const unsigned char *)original.str();
+	unsigned char *c = reinterpret_cast<unsigned char *>(dest);
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 
 	while (*src && i<1023)
 	{
@@ -200,6 +201,6 @@ AsciiString QuotedPrintableToAsciiString(AsciiString original)
 
 	*c = 0;
 
-	return AsciiString((const char *)dest);
+	return dest;
 }
 
diff --git a/Generals/Code/GameEngine/Source/Common/System/RAMFile.cpp b/Generals/Code/GameEngine/Source/Common/System/RAMFile.cpp
deleted file mode 100644
index 154e5495e24..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/RAMFile.cpp
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   WSYS Library
-//
-// Module:    IO
-//
-// File name: WSYS_RAMFile.cpp
-//
-// Created:   11/08/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <io.h>
-#include <string.h>
-#include <sys/stat.h>
-
-#include "Common/AsciiString.h"
-#include "Common/FileSystem.h"
-#include "Common/RAMFile.h"
-#include "Common/PerfTimer.h"
-									
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-//=================================================================
-// RAMFile::RAMFile
-//=================================================================
-
-RAMFile::RAMFile()
-: m_size(0),
-	m_data(NULL),
-//Added By Sadullah Nader
-//Initializtion(s) inserted
-	m_pos(0)
-//
-{
-
-}
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//=================================================================
-// RAMFile::~RAMFile	
-//=================================================================
-
-RAMFile::~RAMFile()
-{
-	if (m_data != NULL) {
-		delete [] m_data;
-	}
-
-	File::close();
-
-}
-
-//=================================================================
-// RAMFile::open	
-//=================================================================
-/**
-  *	This function opens a file using the standard C open() call. Access flags
-	* are mapped to the appropriate open flags. Returns true if file was opened
-	* successfully.
-	*/
-//=================================================================
-
-//DECLARE_PERF_TIMER(RAMFile)
-Bool RAMFile::open( const Char *filename, Int access )
-{
-	//USE_PERF_TIMER(RAMFile)
-	File *file = TheFileSystem->openFile( filename, access );
-
-	if ( file == NULL )
-	{
-		return FALSE;
-	}	
-
-	Bool result = open( file );
-
-	file->close();
-
-	return result;
-}
-
-//============================================================================
-// RAMFile::open
-//============================================================================
-
-Bool RAMFile::open( File *file )
-{
-	//USE_PERF_TIMER(RAMFile)
-	if ( file == NULL )
-	{
-		return NULL;
-	}
-
-	Int access = file->getAccess();
-
-	if ( !File::open( file->getName(), access ))
-	{
-		return FALSE;
-	}
-
-	// read whole file in to memory
-	m_size = file->size();
-	m_data = MSGNEW("RAMFILE") char [ m_size ];	// pool[]ify
-
-	if ( m_data == NULL )
-	{
-		return FALSE;
-	}
-
-	m_size = file->read( m_data, m_size );
-
-	if ( m_size < 0 )
-	{
-		delete [] m_data;
-		m_data = NULL;
-		return FALSE;
-	}
-
-	m_pos = 0;
-
-	return TRUE;
-}
-
-//============================================================================
-// RAMFile::openFromArchive
-//============================================================================
-Bool RAMFile::openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size) 
-{
-	//USE_PERF_TIMER(RAMFile)
-	if (archiveFile == NULL) {
-		return FALSE;
-	}
-
-	if (File::open(filename.str(), File::READ | File::BINARY) == FALSE) {
-		return FALSE;
-	}
-
-	if (m_data != NULL) {
-		delete[] m_data;
-		m_data = NULL;
-	}
-	m_data = MSGNEW("RAMFILE") Char [size];	// pool[]ify
-	m_size = size;
-
-	if (archiveFile->seek(offset, File::START) != offset) {
-		return FALSE;
-	}
-	if (archiveFile->read(m_data, size) != size) {
-		return FALSE;
-	}
-	m_nameStr = filename;
-
-	return TRUE;
-}
-
-//=================================================================
-// RAMFile::close 	
-//=================================================================
-/**
-	* Closes the current file if it is open.
-  * Must call RAMFile::close() for each successful RAMFile::open() call.
-	*/
-//=================================================================
-
-void RAMFile::close( void )
-{
-	if ( m_data )
-	{
-		delete [] m_data;
-		m_data = NULL;
-	}
-
-	File::close();
-}
-
-//=================================================================
-// RAMFile::read 
-//=================================================================
-// if buffer is null, just advance the current position by 'bytes'
-Int RAMFile::read( void *buffer, Int bytes )
-{
-	if( m_data == NULL )
-	{
-		return -1;
-	}
-
-	Int bytesLeft = m_size - m_pos ;
-
-	if ( bytes > bytesLeft )
-	{
-		bytes = bytesLeft;
-	}
-
-	if (( bytes > 0 ) && ( buffer != NULL ))
-	{
-		memcpy ( buffer, &m_data[m_pos], bytes );
-	}
-
-	m_pos += bytes;
-
-	return bytes;
-}
-
-//=================================================================
-// RAMFile::write 
-//=================================================================
-
-Int RAMFile::write( const void *buffer, Int bytes )
-{
-	return -1;
-}
-
-//=================================================================
-// RAMFile::seek 
-//=================================================================
-
-Int RAMFile::seek( Int pos, seekMode mode)
-{
-	Int newPos;
-
-	switch( mode )
-	{
-		case START:
-			newPos = pos;
-			break;
-		case CURRENT:
-			newPos = m_pos + pos;
-			break;
-		case END:
-			DEBUG_ASSERTCRASH(pos <= 0, ("RAMFile::seek - position should be <= 0 for a seek starting from the end."));
-			newPos = m_size + pos;
-			break;
-		default:
-			// bad seek mode
-			return -1;
-	}
-
-	if ( newPos < 0 )
-	{
-		newPos = 0;
-	}
-	else if ( newPos > m_size )
-	{
-		newPos = m_size;
-	}
-
-	m_pos = newPos;
-
-	return m_pos;
-
-}
-
-//=================================================================
-// RAMFile::scanInt
-//=================================================================
-Bool RAMFile::scanInt(Int &newInt) 
-{
-	newInt = 0;
-	AsciiString tempstr;
-
-	while ((m_pos < m_size) && ((m_data[m_pos] < '0') || (m_data[m_pos] > '9')) && (m_data[m_pos] != '-')) {
-		++m_pos;
-	}
-
-	if (m_pos >= m_size) {
-		m_pos = m_size;
-		return FALSE;
-	}
-
-	do {
-		tempstr.concat(m_data[m_pos]);
-		++m_pos;
-	} while ((m_pos < m_size) && ((m_data[m_pos] >= '0') && (m_data[m_pos] <= '9')));
-
-//	if (m_pos < m_size) {
-//		--m_pos;
-//	}
-
-	newInt = atoi(tempstr.str());
-	return TRUE;
-}
-
-//=================================================================
-// RAMFile::scanInt
-//=================================================================
-Bool RAMFile::scanReal(Real &newReal) 
-{
-	newReal = 0.0;
-	AsciiString tempstr;
-	Bool sawDec = FALSE;
-
-	while ((m_pos < m_size) && ((m_data[m_pos] < '0') || (m_data[m_pos] > '9')) && (m_data[m_pos] != '-') && (m_data[m_pos] != '.')) {
-		++m_pos;
-	}
-
-	if (m_pos >= m_size) {
-		m_pos = m_size;
-		return FALSE;
-	}
-
-	do {
-		tempstr.concat(m_data[m_pos]);
-		if (m_data[m_pos] == '.') {
-			sawDec = TRUE;
-		}
-		++m_pos;
-	} while ((m_pos < m_size) && (((m_data[m_pos] >= '0') && (m_data[m_pos] <= '9')) || ((m_data[m_pos] == '.') && !sawDec)));
-
-//	if (m_pos < m_size) {
-//		--m_pos;
-//	}
-
-	newReal = atof(tempstr.str());
-	return TRUE;
-}
-
-//=================================================================
-// RAMFile::scanString
-//=================================================================
-Bool RAMFile::scanString(AsciiString &newString) 
-{
-	newString.clear();
-
-	while ((m_pos < m_size) && isspace(m_data[m_pos])) {
-		++m_pos;
-	}
-
-	if (m_pos >= m_size) {
-		m_pos = m_size;
-		return FALSE;
-	}
-
-	do {
-		newString.concat(m_data[m_pos]);
-		++m_pos;
-	} while ((m_pos < m_size) && (!isspace(m_data[m_pos])));
-
-	return TRUE;
-}
-
-//=================================================================
-// RAMFile::nextLine
-//=================================================================
-void RAMFile::nextLine(Char *buf, Int bufSize) 
-{
-	Int i = 0;
-	// seek to the next new-line character
-	while ((m_pos < m_size) && (m_data[m_pos] != '\n')) {
-		if ((buf != NULL) && (i < (bufSize-1))) {
-			buf[i] = m_data[m_pos];
-			++i;
-		}
-		++m_pos;
-	}
-
-	// we got to the new-line character, now go one past it.
-	if (m_pos < m_size) {
-		if ((buf != NULL) && (i < bufSize)) {
-			buf[i] = m_data[m_pos];
-			++i;
-		}
-		++m_pos;
-	}
-	if (buf != NULL) {
-		if (i < bufSize) {
-			buf[i] = 0;
-		} else {
-			buf[bufSize] = 0;
-		}
-	}
-	if (m_pos >= m_size) {
-		m_pos = m_size;
-	}
-}
-
-//=================================================================
-// RAMFile::nextLine
-//=================================================================
-Bool RAMFile::copyDataToFile(File *localFile) 
-{
-	if (localFile == NULL) {
-		return FALSE;
-	}
-
-	if (localFile->write(m_data, m_size) == m_size) {
-		return TRUE;
-	}
-
-
-	return FALSE;
-}
-
-//=================================================================
-//=================================================================
-File* RAMFile::convertToRAMFile()
-{
-	return this;
-}
-
-//=================================================================
-// RAMFile::readEntireAndClose
-//=================================================================
-/**
-	Allocate a buffer large enough to hold entire file, read 
-	the entire file into the buffer, then close the file.
-	the buffer is owned by the caller, who is responsible
-	for freeing is (via delete[]). This is a Good Thing to
-	use because it minimizes memory copies for BIG files.
-*/
-char* RAMFile::readEntireAndClose()
-{
-
-	if (m_data == NULL)
-	{
-		DEBUG_CRASH(("m_data is NULL in RAMFile::readEntireAndClose -- should not happen!\n"));
-		return NEW char[1];	// just to avoid crashing...
-	}
-
-	char* tmp = m_data;
-	m_data = NULL;	// will belong to our caller!
-
-	close();
-
-	return tmp;
-}
diff --git a/Generals/Code/GameEngine/Source/Common/System/Radar.cpp b/Generals/Code/GameEngine/Source/Common/System/Radar.cpp
deleted file mode 100644
index ee614b1518d..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/Radar.cpp
+++ /dev/null
@@ -1,1566 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Radar.cpp ////////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, January 2002
-// Desc:   Radar logic implementation
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameAudio.h"
-#include "Common/GameState.h"
-#include "Common/MiscAudio.h"
-#include "Common/Radar.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "Common/ThingTemplate.h"
-#include "Common/GlobalData.h"
-#include "Common/Xfer.h"
-
-#include "GameClient/Drawable.h"
-#include "GameClient/Eva.h"
-#include "GameClient/GameWindowManager.h"
-#include "GameClient/InGameUI.h"
-#include "GameClient/ControlBar.h"
-
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/Object.h"
-#include "GameLogic/PartitionManager.h"
-#include "GameLogic/TerrainLogic.h"
-#include "GameLogic/Module/ContainModule.h"
-#include "GameLogic/Module/StealthUpdate.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
-Radar *TheRadar = NULL;  ///< the radar global singleton
-
-// PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
-#define RADAR_QUEUE_TERRAIN_REFRESH_DELAY (LOGICFRAMES_PER_SECOND * 3.0f)
-
-//-------------------------------------------------------------------------------------------------
-/** Delete list resources used by the radar and return them to the memory pools */
-//-------------------------------------------------------------------------------------------------
-void Radar::deleteListResources( void )
-{
-	RadarObject *nextObject;
-
-	// delete entries from the local object list
-	while( m_localObjectList )
-	{
-
-		// get next object
-		nextObject = m_localObjectList->friend_getNext();
-
-		// remove radar data from object
-		m_localObjectList->friend_getObject()->friend_setRadarData( NULL );
-
-		// delete the head of the list
-		deleteInstance(m_localObjectList);
-
-		// set head of the list to the next object
-		m_localObjectList = nextObject;
-
-	}  // end while
-
-	// delete entries from the regular object list
-	while( m_objectList )
-	{
-
-		// get next object
-		nextObject = m_objectList->friend_getNext();
-
-		// remove radar data from object
-		m_objectList->friend_getObject()->friend_setRadarData( NULL );
-
-		// delete the head of the list
-		deleteInstance(m_objectList);
-
-		// set head of the list to the next object
-		m_objectList = nextObject;
-
-	}  // end while
-
-	Object *obj;
-	for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() )
-	{
-
-		DEBUG_ASSERTCRASH( obj->friend_getRadarData() == NULL, ("oops") );
-
-	}
-
-}  // end deleteListResources
-
-// PUBLIC METHODS /////////////////////////////////////////////////////////////////////////////////
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-RadarObject::RadarObject( void )
-{
-
-	m_object = NULL;
-	m_next = NULL;
-	m_color = GameMakeColor( 255, 255, 255, 255 );
-
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-RadarObject::~RadarObject( void )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-Bool RadarObject::isTemporarilyHidden() const
-{
-	Drawable* draw = m_object->getDrawable();
-	if (draw->getStealthLook() == STEALTHLOOK_INVISIBLE || draw->isDrawableEffectivelyHidden())
-		return true;
-
-	return false;
-}
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void RadarObject::crc( Xfer *xfer )
-{
-
-}  // end crc
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer method
-	* Version Info:
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-void RadarObject::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// object id
-	ObjectID objectID = m_object ? m_object->getID() : INVALID_ID;
-	xfer->xferObjectID( &objectID );
-	if( xfer->getXferMode() == XFER_LOAD )
-	{
-
-		// find the object and save
-		m_object = TheGameLogic->findObjectByID( objectID );
-		if( m_object == NULL )
-		{
-
-			DEBUG_CRASH(( "RadarObject::xfer - Unable to find object for radar data\n" ));
-			throw SC_INVALID_DATA;
-
-		}  // end if
-
-		// tell the object we now have some radar data
-		m_object->friend_setRadarData( this );
-
-	}  // end if
-
-	// color
-	xfer->xferColor( &m_color );
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void RadarObject::loadPostProcess( void )
-{
-
-}  // end loadPostProcess
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-Radar::Radar( void )
-{
-
-	m_radarWindow = NULL;
-	m_objectList = NULL;
-	m_localObjectList = NULL;
-	m_radarHidden = false;
-	m_radarForceOn = false;
-	m_terrainAverageZ = 0.0f;
-	m_waterAverageZ = 0.0f;
-	m_xSample = 0.0f;
-	m_ySample = 0.0f;
-	m_mapExtent.lo.x = 0.0f;
-	m_mapExtent.lo.y = 0.0f;
-	m_mapExtent.lo.z = 0.0f;
-	m_mapExtent.hi.x = 0.0f;
-	m_mapExtent.hi.y = 0.0f;
-	m_mapExtent.hi.z = 0.0f;
-	m_queueTerrainRefreshFrame = 0;
-
-	// clear the radar events
-	clearAllEvents();
-
-}  // end Radar
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-Radar::~Radar( void )
-{
-
-	// delete list resources
-	deleteListResources();
-
-}  // end ~Radar
-
-//-------------------------------------------------------------------------------------------------
-/** Clear all radar events */
-//-------------------------------------------------------------------------------------------------
-void Radar::clearAllEvents( void )
-{
-
-	// set next free index to the first one
-	m_nextFreeRadarEvent = 0;
-	m_lastRadarEvent = -1;
-
-	// zero out all data
-	for( Int i = 0; i < MAX_RADAR_EVENTS; ++i )
-	{
-
-		m_event[ i ].type = RADAR_EVENT_INVALID;
-		m_event[ i ].active = FALSE;
-		m_event[ i ].createFrame = 0;
-		m_event[ i ].dieFrame = 0;
-		m_event[ i ].fadeFrame = 0;
-		m_event[ i ].color1.red = 0;
-		m_event[ i ].color1.green = 0;
-		m_event[ i ].color1.blue = 0;
-		m_event[ i ].color2.red = 0;
-		m_event[ i ].color2.green = 0;
-		m_event[ i ].color2.blue = 0;
-		m_event[ i ].worldLoc.x = 0.0f;
-		m_event[ i ].worldLoc.y = 0.0f;
-		m_event[ i ].worldLoc.z = 0.0f;
-		m_event[ i ].radarLoc.x = 0;
-		m_event[ i ].radarLoc.y = 0;
-		m_event[ i ].soundPlayed = FALSE;
-
-	}  // end for i
-
-}  // end clearAllEvents
-
-//-------------------------------------------------------------------------------------------------
-/** Reset radar data */
-//-------------------------------------------------------------------------------------------------
-void Radar::reset( void )
-{
-
-	// delete list resources
-	deleteListResources();
-
-	// clear all events
-	clearAllEvents();
-
-	// stop forcing the radar on
-	m_radarForceOn = false;
-
-}  // end reset
-
-//-------------------------------------------------------------------------------------------------
-/** Radar per frame update */
-//-------------------------------------------------------------------------------------------------
-void Radar::update( void )
-{
-	Int i;
-	UnsignedInt thisFrame = TheGameLogic->getFrame();
-
-	//
-	// traverse the radar event list, if an event has a creationFrame it means that it
-	// exists ... check to see if it's time for that event to die and if so, just clear
-	// out the active status
-	//
-	for( i = 0; i < MAX_RADAR_EVENTS; i++ )
-	{
-
-		if( m_event[ i ].active == TRUE && m_event[ i ].createFrame && 
-				thisFrame > m_event[ i ].dieFrame )
-			m_event[ i ].active = FALSE;
-				
-	}  // end for i
-
-	// see if we should refresh the terrain
-	if( m_queueTerrainRefreshFrame != 0 && 
-			TheGameLogic->getFrame() - m_queueTerrainRefreshFrame > RADAR_QUEUE_TERRAIN_REFRESH_DELAY )
-	{
-
-		// refresh the terrain
-		refreshTerrain( TheTerrainLogic );
-
-	}  // end if
-
-}  // end update
-
-//-------------------------------------------------------------------------------------------------
-/** Reset the radar for the new map data being given to it */
-//-------------------------------------------------------------------------------------------------
-void Radar::newMap( TerrainLogic *terrain )
-{
-
-	// keep a pointer for our radar window
-	Int id = NAMEKEY( "ControlBar.wnd:LeftHUD" );
-	m_radarWindow = TheWindowManager->winGetWindowFromId( NULL, id );
-	DEBUG_ASSERTCRASH( m_radarWindow, ("Radar::newMap - Unable to find radar game window\n") );
-
-	// reset all the data in the radar
-	reset();
-
-	// get the extents of the new map
-	terrain->getExtent( &m_mapExtent );
-
-	// we will sample at these intervals across the map
-	m_xSample = m_mapExtent.width() / RADAR_CELL_WIDTH;
-	m_ySample = m_mapExtent.height() / RADAR_CELL_HEIGHT;
-
-	// find the "middle" height for the terrain (most used value) and water table
-	Int x, y, z;
-	Int terrainSamples = 0, waterSamples = 0;
-
-	m_terrainAverageZ = 0.0f;
-	m_waterAverageZ = 0.0f;
-	ICoord2D radarPoint;
-	Coord3D worldPoint;
-	for( y = 0; y < RADAR_CELL_HEIGHT; y++ )
-		for( x = 0; x < RADAR_CELL_WIDTH; x++ )
-		{
-
-			radarPoint.x = x;
-			radarPoint.y = y;
-			radarToWorld( &radarPoint, &worldPoint );
-			z = terrain->getGroundHeight( worldPoint.x, worldPoint.y );
-			Real waterZ;
-			if( terrain->isUnderwater( worldPoint.x, worldPoint.y, &waterZ ) )
-			{
-				m_waterAverageZ += z;
-				waterSamples++;
-			}
-			else
-			{
-				m_terrainAverageZ += z;
-				terrainSamples++;
-			}
-
-		}  // end for x
-
-	// avoid divide by zeros
-	if( terrainSamples == 0 )
-		terrainSamples = 1;
-	if( waterSamples == 0 )
-		waterSamples = 1;
-
-	// compute averages
-	m_terrainAverageZ = m_terrainAverageZ / INT_TO_REAL( terrainSamples );
-	m_waterAverageZ = m_waterAverageZ / INT_TO_REAL( waterSamples );
-
-}  // end newMap
-
-//-------------------------------------------------------------------------------------------------
-/** Add an object to the radar list.  The object will be sorted in the list to be grouped
-	* using it's radar priority */
-//-------------------------------------------------------------------------------------------------
-void Radar::addObject( Object *obj )
-{
-
-	// get the radar priority for this object
-	RadarPriorityType newPriority = obj->getRadarPriority();
-	if( isPriorityVisible( newPriority ) == FALSE )
-		return;
-
-	// if this object is on the radar, remove it in favor of the new add
-	RadarObject **list;
-	RadarObject *newObj;
-
-	// sanity
-	DEBUG_ASSERTCRASH( obj->friend_getRadarData() == NULL,
-										 ("Radar: addObject - non NULL radar data for '%s'\n", 
-										 obj->getTemplate()->getName().str()) );
-
-	// allocate a new object
-	newObj = newInstance(RadarObject);
-
-	// set the object data
-	newObj->friend_setObject( obj );
-
-	// set color for this object on the radar
-	const Player *player = obj->getControllingPlayer();
-	Bool useIndicatorColor = true;
-
-	if( obj->isKindOf( KINDOF_DISGUISER ) )
-	{
-		//Because we have support for disguised units pretending to be units from another
-		//team, we need to intercept it here and make sure it's rendered appropriately
-		//based on which client is rendering it.
-		StealthUpdate *update = obj->getStealth();
-		if( update )
-		{
-			if( update->isDisguised() )
-			{
-				Player *clientPlayer = ThePlayerList->getLocalPlayer();
-				Player *disguisedPlayer = ThePlayerList->getNthPlayer( update->getDisguisedPlayerIndex() );
-				if( player->getRelationship( clientPlayer->getDefaultTeam() ) != ALLIES && clientPlayer->isPlayerActive() )
-				{
-					//Neutrals and enemies will see this disguised unit as the team it's disguised as.
-					player = disguisedPlayer;
-					if( player )
-						useIndicatorColor = false;
-				}
-				//Otherwise, the color will show up as the team it really belongs to (already set above).
-			}
-		}
-	}
-	
-	if( obj->getContain() )
-	{
-		// To handle Stealth garrison, ask containers what color they are drawing with to the local player.
-		// Local is okay because radar display is not synced.
-		player = obj->getContain()->getApparentControllingPlayer( ThePlayerList->getLocalPlayer() );
-		if( player )
-			useIndicatorColor = false;
-	}
-
-	if( useIndicatorColor || (player == NULL) )
-	{
-		newObj->setColor( obj->getIndicatorColor() );
-	}
-	else
-	{	
-		newObj->setColor( player->getPlayerColor() );
-	}
-
-	// set a chunk of radar data in the object
-	obj->friend_setRadarData( newObj );
-
-	//
-	// we will put this on either the local object list for objects that belong to the
-	// local player, or on the regular object list for all other objects
-	//
-	if( obj->isLocallyControlled() )
-		list = &m_localObjectList;
-	else
-		list = &m_objectList;
-
-	// link object to master list at the head of it's priority section
-	if( *list == NULL )
-		*list = newObj;  // trivial case, an empty list
-	else
-	{
-		RadarPriorityType prevPriority, currPriority;
-		RadarObject *currObject, *prevObject, *nextObject;
-
-		prevObject = NULL;
-		prevPriority = RADAR_PRIORITY_INVALID;
-		for( currObject = *list; currObject; currObject = nextObject )
-		{
-
-			// get the next object
-			nextObject = currObject->friend_getNext();
-
-			// get the priority of this entry in the list (currPriority)
-			currPriority = currObject->friend_getObject()->getRadarPriority();
-
-			//
-			// if there is no previous object, or the previous priority is less than the
-			// our new priority, and the current object in the list has a priority 
-			// higher than our equal to our own we need to be inserted here
-			//
-			if( (prevObject == NULL || prevPriority < newPriority ) &&
-					(currPriority >= newPriority) )
-			{
-
-				// insert into the list just ahead of currObject
-				if( prevObject )
-				{
-
-					// the new entry next points to what the previous one used to point to
-					newObj->friend_setNext( prevObject->friend_getNext() );
-
-					// the previous one next now points to the new entry
-					prevObject->friend_setNext( newObj );
-
-				}  // end if
-				else
-				{
-
-					// the new object next points to the current object
-					newObj->friend_setNext( currObject );
-
-					// new list head is now newObj
-					*list = newObj;
-
-				}  // end else
-
-				break;  // exit for, stop the insert
-
-			}  // end if
-			else if( nextObject == NULL )
-			{
-
-				// at the end of the list, put object here
-				currObject->friend_setNext( newObj );
-
-			}  // end else if
-
-			// our current object is now the previous object
-			prevObject = currObject;
-			prevPriority = currPriority;
-
-		}  // end if
-
-	}  // end else
-
-}  // end addObject
-
-//-------------------------------------------------------------------------------------------------
-/** Try to delete an object from a specific list */
-//-------------------------------------------------------------------------------------------------
-Bool Radar::deleteFromList( Object *obj, RadarObject **list )
-{
-	RadarObject *radarObject, *prevObject = NULL;
-					
-	// find the object in list
-	for( radarObject = *list; radarObject; radarObject = radarObject->friend_getNext() )
-	{
-		
-		if( radarObject->friend_getObject() == obj )
-		{
-
-			// unlink the object from list
-			if( prevObject == NULL )
-				*list = radarObject->friend_getNext();  // removing head of list
-			else
-				prevObject->friend_setNext( radarObject->friend_getNext() );
-
-			// set the object radar data to NULL
-			obj->friend_setRadarData( NULL );
-
-			// delete the object instance
-			deleteInstance(radarObject);
-
-			// all done, object found and deleted
-			return TRUE;
-
-		}  // end if
-
-		// save this object as previous one encountered in the list
-		prevObject = radarObject;
-
-	}  // end for, radarObject
-
-	// object was not found in this list
-	return FALSE;
-
-}  // end deleteFromList
-
-//-------------------------------------------------------------------------------------------------
-/** Remove an object from the radar, the object may reside in any list */
-//-------------------------------------------------------------------------------------------------
-void Radar::removeObject( Object *obj )
-{
-
-	// sanity
-	if( obj->friend_getRadarData() == NULL )
-		return;
-
-	if( deleteFromList( obj, &m_localObjectList ) == TRUE )
-		return;
-	else if( deleteFromList( obj, &m_objectList ) == TRUE )
-		return;
-	else
-	{
-
-		// sanity
-		DEBUG_ASSERTCRASH( 0, ("Radar: Tried to remove object '%s' which was not found\n",
-											 obj->getTemplate()->getName().str()) );
-
-	}  // end else
-
-}  // end removeObject
-
-//-------------------------------------------------------------------------------------------------
-/** Translate a 2D spot on the radar (from (0,0) to (RADAR_CELL_WIDTH,RADAR_CELL_HEIGHT)
-	* to a 3D spot in the world. Does not determine Z value!
-	* Return TRUE if the radar points translates to a valid world position
-	* Return FALSE if the radar point is not a valid world position */
-//-------------------------------------------------------------------------------------------------		
-Bool Radar::radarToWorld2D( const ICoord2D *radar, Coord3D *world )
-{
-	Int x, y;
-
-	// sanity
-	if( radar == NULL || world == NULL )
-		return FALSE;
-
-	// get the coords
-	x = radar->x;
-	y = radar->y;
-
-	// more sanity
-	if( x < 0 )
-		x = 0;
-	if( x >= RADAR_CELL_WIDTH )
-		x = RADAR_CELL_WIDTH - 1;
-	if( y < 0 )
-		y = 0;
-	if( y >= RADAR_CELL_HEIGHT )
-		y = RADAR_CELL_HEIGHT - 1;
-
-	// translate to world
-	world->x = x * m_xSample;
-	world->y = y * m_ySample;
-  return TRUE;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Translate a 2D spot on the radar (from (0,0) to (RADAR_CELL_WIDTH,RADAR_CELL_HEIGHT)
-	* to a 3D spot in the world on the terrain
-	* Return TRUE if the radar points translates to a valid world position
-	* Return FALSE if the radar point is not a valid world position */
-//-------------------------------------------------------------------------------------------------		
-Bool Radar::radarToWorld( const ICoord2D *radar, Coord3D *world )
-{
-  if (!radarToWorld2D(radar,world))
-    return FALSE;
-
-	// find the terrain height here
-	world->z = TheTerrainLogic->getGroundHeight( world->x, world->y );
-	
-	return TRUE;  // valid translation
-
-}  // end radarToWorld
-
-//-------------------------------------------------------------------------------------------------
-/** Translate a point in the world to the 2D radar (x,y)
-	* Return TRUE if the world point successfully translates to a radar point
-	* Return FALSE if world point is a bogus off the map position */
-//-------------------------------------------------------------------------------------------------
-Bool Radar::worldToRadar( const Coord3D *world, ICoord2D *radar )
-{
-
-	// sanity
-	if( world == NULL || radar == NULL )
-		return FALSE;
-
-	// sanity check the world position
-//	if( world->x < m_mapExtent.lo.x || world->x > m_mapExtent.hi.x ||
-//			world->y < m_mapExtent.lo.y || world->y > m_mapExtent.hi.y )
-//		return FALSE;
-	// This is actually an insanity check.  Nobody uses the return value, so this just leaves garbage in the 
-	// return pointer.  The reason the question gets asked is there are 60 partition cells to 128 radar cells
-	// (for example), and the radar wants to draw a horizontal line.  This line ends up three pixels long
-	// at the right side, so the radar gives up and doesn't draw the middle one.
-	// We bind to on radar anyway, and we only ask if we are on radar, so don't intentionally add edge weirdness.
-
-	// convert
-	radar->x = world->x / m_xSample;
-	radar->y = world->y / m_ySample;
-
-	// keep it in bounds
-	if( radar->x < 0 )
-		radar->x = 0;
-	if( radar->x >= RADAR_CELL_WIDTH )
-		radar->x = RADAR_CELL_WIDTH - 1;
-	if( radar->y < 0 )
-		radar->y = 0;
-	if( radar->y >= RADAR_CELL_HEIGHT )
-		radar->y = RADAR_CELL_HEIGHT - 1;
-
-	return TRUE;  // valid translation
-
-}  // end worldToRadar
-
-// ------------------------------------------------------------------------------------------------
-/** Translate an actual pixel location (relative pixel with (0,0) being the top left of
-	* the radar area) to the "logical" radar coords that would cover the entire area of display
-	* on the screen.  This is needed because some maps are "long" or "tall" and need a translation
-	* to any radar image that has been scaled to preserve the map aspect ratio */
-// ------------------------------------------------------------------------------------------------
-Bool Radar::localPixelToRadar( const ICoord2D *pixel, ICoord2D *radar )
-{
-
-	// sanity
-	if( pixel == NULL || radar == NULL )
-		return FALSE;
-
-	// get window size of the radar
-	ICoord2D size;
-	m_radarWindow->winGetSize( &size.x, &size.y );
-
-	//
-	// act like we're going to draw and find the aspect ratio adjusted points of the 
-	// terrain radar positions
-	//
-	ICoord2D start = { 0, 0 };
-	ICoord2D ul, lr;
-	findDrawPositions( start.x, start.y, size.x, size.y, &ul, &lr );
-
-	// get the scaled width and height
-	Int scaledWidth = lr.x - ul.x;
-	Int scaledHeight = lr.y - ul.y;
-
-	// if the pixel is outsize of the adjusted radar area there are no logical coords
-	if( pixel->x < ul.x || pixel->x > lr.x ||
-			pixel->y < ul.y || pixel->y > lr.y )
-		return FALSE;
-
-	if( scaledWidth >= scaledHeight )
-	{
-
-		// just normal conversion from full stretched to radar cells
-		radar->x = (pixel->x - ul.x)* RADAR_CELL_WIDTH / scaledWidth;
-
-		// conversion for scaled Y direction in map
-		radar->y = REAL_TO_INT( ((pixel->y - ul.y) / INT_TO_REAL( scaledHeight )) * size.y );
-		
-		//
-		// radar->y now refers to a point that was "as if" the map was square, translate to radar
-		// note that y is inverted to have the radar align with the world (+x = right, -y = down)
-		//
-		radar->y = (size.y - radar->y) * RADAR_CELL_HEIGHT / size.y;
-
-
-	}  // end if
-	else
-	{
-
-		// conversion for scaled Y direction in map
-		radar->x = REAL_TO_INT( ((pixel->x - ul.x) / INT_TO_REAL( scaledWidth )) * size.x );
-		
-		// radar->x now refers to a point that was "as if" the map was square, translate to radar
-		radar->x = radar->x * RADAR_CELL_WIDTH / size.x;
-
-		//
-		// just normal conversion from full stretched to radar cells, note that y is inverted
-		// to have the radar align with the world (+x = right, -y = down)
-		//
-		radar->y = (size.y - pixel->y) * RADAR_CELL_HEIGHT / size.y;
-
-	}  // end else
-
-	return TRUE;
-
-}  // end localPixelToRadar
-
-// ------------------------------------------------------------------------------------------------
-/** Translate a screen mouse position to world coords if the screen position is within
-	* the radar window and that spot in the radar corresponds to a point in the world */
-// ------------------------------------------------------------------------------------------------
-Bool Radar::screenPixelToWorld( const ICoord2D *pixel, Coord3D *world )
-{
-
-	// sanity
-	if( pixel == NULL || world == NULL )
-		return FALSE;
-
-	// if we have no radar window can't do the conversion
-	if( m_radarWindow == NULL )
-		return FALSE;
-
-	// translate pixel coords to local pixel coords relative to the radar window
-	ICoord2D localPixel;
-	ICoord2D screenPos;
-	m_radarWindow->winGetScreenPosition( &screenPos.x, &screenPos.y );
-	localPixel.x = pixel->x - screenPos.x;
-	localPixel.y = pixel->y - screenPos.y;
-
-	// translate local pixel to radar
-	ICoord2D radar;
-	if( localPixelToRadar( &localPixel, &radar ) == FALSE )
-		return FALSE;
-
-	// translate radar to world
-	return radarToWorld( &radar, world );
-
-}  // end screenPixelToWorld
-
-// ------------------------------------------------------------------------------------------------
-/** Given the pixel coordinates, see if there is an object that is exactly in this
-	* spot represented on the radar */
-// ------------------------------------------------------------------------------------------------
-Object *Radar::objectUnderRadarPixel( const ICoord2D *pixel )
-{
-
-	// sanity
-	if( pixel == NULL )
-		return NULL;
-
-	// convert pixel location to radar logical radar location
-	ICoord2D radar;
-	if( localPixelToRadar( pixel, &radar ) == FALSE )
-		return NULL;
-
-	// object we will return
-	Object *obj = NULL;
-
-	//
-	// scan the objects on the radar list and return any object that maps its world location
-	// to the radar location
-	//
-	
-	// search the local object list
-	obj = searchListForRadarLocationMatch( m_localObjectList, &radar );
-
-	// search all other objects if not found
-	if( obj == NULL )
-		obj = searchListForRadarLocationMatch( m_objectList, &radar );
-
-	// return the object found (if any)
-	return obj;
-
-}  // end objectUnderRadarPixel
-
-// ------------------------------------------------------------------------------------------------
-/** Search the object list for an object that maps to the given logical radar coords */
-// ------------------------------------------------------------------------------------------------
-Object *Radar::searchListForRadarLocationMatch( RadarObject *listHead, ICoord2D *radarMatch )
-{
-
-	// sanity
-	if( listHead == NULL || radarMatch == NULL )
-		return NULL;
-
-	// scan the list
-	RadarObject *radarObject;
-	ICoord2D radar;
-	for( radarObject = listHead; radarObject; radarObject = radarObject->friend_getNext() )
-	{
-
-		// get object
-		Object *obj = radarObject->friend_getObject();
-		
-		// sanity
-		if( obj == NULL )
-		{
-
-			DEBUG_CRASH(( "Radar::searchListForRadarLocationMatch - NULL object encountered in list\n" ));
-			continue;
-
-		}  // end if
-
-		// convert object position to logical radar
-		worldToRadar( obj->getPosition(), &radar );
-
-		// see if this matches our match radar location
-		if( radar.x >= radarMatch->x - 1 &&
-				radar.x <= radarMatch->x + 1 && 
-				radar.y >= radarMatch->y - 1 &&
-				radar.y <= radarMatch->y + 1 )
-			return obj;
-
-	}  // end for, radarObject
-
-	// no match found
-	return NULL;
-
-}  // end searchListForRadarLocationMatch
-
-// ------------------------------------------------------------------------------------------------
-/** Given the RELATIVE SCREEN start X and Y, the width and height of the area to draw the whole
-	* radar in, compute what the upper left (ul) and lower right (lr) local coordinates are
-	* that represent the actual terrain image part of the radar that will preserve the
-	* aspect ratio of the map */
-// ------------------------------------------------------------------------------------------------
-void Radar::findDrawPositions( Int startX, Int startY, Int width, Int height, 
-															 ICoord2D *ul, ICoord2D *lr )
-{
-
-	Real ratioWidth;
-	Real ratioHeight;
-	Coord2D radar;
-	ratioWidth = m_mapExtent.width()/(width * 1.0f);
-	ratioHeight = m_mapExtent.height()/(height* 1.0f);
-	
-	if( ratioWidth >= ratioHeight)
-	{
-		radar.x = m_mapExtent.width() / ratioWidth;
-		radar.y = m_mapExtent.height()/ ratioWidth;
-		ul->x = 0;
-		ul->y = (height - radar.y) / 2.0f;
-		lr->x = radar.x;
-		lr->y = height - ul->y;
-	}
-	else
-	{
-		radar.x = m_mapExtent.width() / ratioHeight;
-		radar.y = m_mapExtent.height()/ ratioHeight;
-		ul->x = (width - radar.x ) / 2.0f;
-		ul->y = 0;
-		lr->x = width - ul->x;
-		lr->y = radar.y;
-	}
-/*
-
-	if( m_mapExtent.width() > m_mapExtent.height() )
-	{
-
-		//
-		// +---------------+
-		// |               |
-		// |               |
-		// +---------------+
-		// |   map area    |
-		// +---------------+
-		// |               |
-		// |               |
-		// +---------------+
-		//
-		ul->x = 0;
-		ul->y = (height - (m_mapExtent.height() / m_mapExtent.width() * height)) / 2.0f;
-		lr->x = width;
-		lr->y = height - ul->y;
-
-	}  // end if
-	else if(  m_mapExtent.height() > m_mapExtent.width() )
-	{
-
-		// +-----+---+-----+
-		// |     | m |     |
-		// |     | a |     |
-		// |     | p |     |
-		// |     |   |     |
-		// |     | a |     |
-		// |     | r |     |
-		// |     | e |     |
-		// |     | a |     |
-		// +-----+---+-----+
-		//
-
-		ul->x = (width - (m_mapExtent.width() / m_mapExtent.height() * width)) / 2.0f;
-		ul->y = 0;
-		lr->x = width - ul->x;
-		lr->y = height;
-
-	}  // end else
-	else
-	{
-
-		ul->x = 0;
-		ul->y = 0;
-		lr->x = width;
-		lr->y = height;
-
-	}  // end else
-*/
-
-	// make them pixel positions
-	ul->x += startX;
-	ul->y += startY;
-	lr->x += startX;
-	lr->y += startY;
-
-}  // end findDrawPositions
-
-//-------------------------------------------------------------------------------------------------
-/** Radar color lookup table */
-//-------------------------------------------------------------------------------------------------
-struct RadarColorLookup
-{
-	RadarEventType event;
-	RGBAColorInt color1;
-	RGBAColorInt color2;
-};
-static RadarColorLookup radarColorLookupTable[] = 
-{
-	/*      Radar Event													Color 1									 Color 2       */
-	{ RADAR_EVENT_CONSTRUCTION,					{ 128, 128, 255, 255 },  {  128, 255, 255, 255 } },
-	{ RADAR_EVENT_UPGRADE,							{ 128,   0,  64, 255 },  {  255, 185, 220, 255 } },
-	{ RADAR_EVENT_UNDER_ATTACK,					{ 255,   0,   0, 255 },  {  255, 128, 128, 255 } },
-	{ RADAR_EVENT_INFORMATION,					{ 255, 255,   0, 255 },  {  255, 255, 128, 255 } },
-	{ RADAR_EVENT_BEACON_PULSE,					{ 255, 255,   0, 255 },  {  255, 255, 128, 255 } },
-	{ RADAR_EVENT_INFILTRATION,					{   0, 255, 255, 255 },  {  128, 255, 255, 255 } },
-	{ RADAR_EVENT_BATTLE_PLAN,					{ 255, 255, 255, 255 },	 {  255, 255, 255, 255 } },
-	{ RADAR_EVENT_STEALTH_DISCOVERED,		{   0, 255,   0, 255 },	 {    0, 128,   0, 255 } },
-	{ RADAR_EVENT_STEALTH_NEUTRALIZED,	{   0, 255,   0, 255 },	 {    0, 128,   0, 255 } },
-	{ RADAR_EVENT_FAKE,									{   0,	 0,   0,	 0 },	 {    0,	 0,   0,   0 } },
-	{ RADAR_EVENT_INVALID,							{   0,   0,   0,   0 },  {    0,   0,   0,   0 } }
-};
-
-//-------------------------------------------------------------------------------------------------
-/** Create a new radar event */
-//-------------------------------------------------------------------------------------------------
-void Radar::createEvent( const Coord3D *world, RadarEventType type, Real secondsToLive )
-{
-		
-	// sanity
-	if( world == NULL )
-		return;
-
-	// lookup the colors we are to used based on the event 
-	RGBAColorInt color[ 2 ];
-	Int i = 0;
-	for( ; radarColorLookupTable[ i ].event != RADAR_EVENT_INVALID; ++i )
-	{
-
-		if( radarColorLookupTable[ i ].event == type )
-		{
-
-			color[ 0 ] = radarColorLookupTable[ i ].color1;
-			color[ 1 ] = radarColorLookupTable[ i ].color2;
-			break;
-
-		}  // end if
-
-	}  // end while
-
-	// check for no match found in color table
-	if( radarColorLookupTable[ i ].event == RADAR_EVENT_INVALID )
-	{
-		static RGBAColorInt color1 = { 255, 255, 255, 255 };
-		static RGBAColorInt color2 = { 255, 255, 255, 255 };
-
-		DEBUG_CRASH(( "Radar::createEvent - Event not found in color table, using default colors\n" ));
-		color[ 0 ] = color1;
-		color[ 1 ] = color2;
-
-	}  // end if
-
-	// call the internal method to create the event with these colors
-	internalCreateEvent( world, type, secondsToLive, &color[ 0 ], &color[ 1 ] );
-
-}  // end createEvent
-
-// ------------------------------------------------------------------------------------------------
-/** Create radar event using a specific colors from the player */
-// ------------------------------------------------------------------------------------------------
-void Radar::createPlayerEvent( Player *player, const Coord3D *world, 
-															 RadarEventType type, Real secondsToLive )
-{
-
-	// sanity
-	if( player == NULL || world == NULL )
-		return;
-
-	// figure out the two colors we should use
-	Color c;
-	UnsignedByte r, g, b, a;
-	RGBAColorInt color[ 2 ];
-
-	// color 1
-	c = player->getPlayerColor();
-	GameGetColorComponents( c, &r, &g, &b, &a );
-	color[ 0 ].red = r;
-	color[ 0 ].green = g;
-	color[ 0 ].blue = b;
-	color[ 0 ].alpha = a;
-
-	// the second will be a darker color 1
-	Real darkScale = 0.75f;
-	color[ 1 ] = color[ 0 ];
-	color[ 1 ].red -= REAL_TO_INT( color[ 0 ].red * darkScale );
-	if( color[ 1 ].red < 0 )
-		color[ 1 ].red = 0;
-	color[ 1 ].green -= REAL_TO_INT( color[ 0 ].green * darkScale );
-	if( color[ 1 ].green < 0 )
-		color[ 1 ].green = 0;
-	color[ 1 ].blue -= REAL_TO_INT( color[ 0 ].blue * darkScale );
-	if( color[ 1 ].blue < 0 )
-		color[ 1 ].blue = 0;
-
-	// create the events using these colors
-	internalCreateEvent( world, type, secondsToLive, &color[ 0 ], &color[ 1 ] );
-
-}  // end createPlayerEvent
-
-//-------------------------------------------------------------------------------------------------
-/** Create a new radar event */
-//-------------------------------------------------------------------------------------------------
-void Radar::internalCreateEvent( const Coord3D *world, RadarEventType type, Real secondsToLive,
-																 const RGBAColorInt *color1, const RGBAColorInt *color2 )
-{
-	static Real secondsBeforeDieToFade = 0.5f;  ///< this many seconds before we hit the die frame we start to fade away
-		
-	// sanity
-	if( world == NULL || color1 == NULL || color2 == NULL )
-		return;
-
-	// translate the world coord to radar coords
-	ICoord2D radar;
-	worldToRadar( world, &radar );
-
-	// add to the list of radar events
-	m_event[ m_nextFreeRadarEvent ].type = type;
-	m_event[ m_nextFreeRadarEvent ].active = TRUE;
-	m_event[ m_nextFreeRadarEvent ].createFrame = TheGameLogic->getFrame();
-	m_event[ m_nextFreeRadarEvent ].dieFrame = TheGameLogic->getFrame() + LOGICFRAMES_PER_SECOND * secondsToLive;
-	m_event[ m_nextFreeRadarEvent ].fadeFrame = m_event[ m_nextFreeRadarEvent ].dieFrame - LOGICFRAMES_PER_SECOND * secondsBeforeDieToFade;
-	m_event[ m_nextFreeRadarEvent ].color1 = *color1;
-	m_event[ m_nextFreeRadarEvent ].color2 = *color2;
-	m_event[ m_nextFreeRadarEvent ].worldLoc = *world;
-	m_event[ m_nextFreeRadarEvent ].radarLoc = radar;
-	m_event[ m_nextFreeRadarEvent ].soundPlayed = FALSE;
-
-	// record the index of this, our "last" radar event.
-	if ( type != RADAR_EVENT_BEACON_PULSE )
-		m_lastRadarEvent = m_nextFreeRadarEvent;
-
-	//
-	// increment the next radar event index, wrapping to the beginning.  If we ever have so many
-	// events that they fill up the buffer the oldest ones will just drop off, eh ... should be fine.
-	//
-	m_nextFreeRadarEvent++;
-	if( m_nextFreeRadarEvent >= MAX_RADAR_EVENTS )
-		m_nextFreeRadarEvent = 0;
-
-}  // end createEvent
-
-//-------------------------------------------------------------------------------------------------
-/** Get the last event position, if any.
-	* Returns TRUE if event was found
-	* Returns FALSE if there is no "last event" */
-//-------------------------------------------------------------------------------------------------
-Bool Radar::getLastEventLoc( Coord3D *eventPos )
-{
-
-	// if we have an index for the last event, one was present
-	if( m_lastRadarEvent != -1 )
-	{
-
-		if( eventPos )
-			*eventPos = m_event[ m_lastRadarEvent ].worldLoc;
-		return TRUE;
-
-	}  // end if
-
-	return FALSE;  // no last event
-
-}  // end getLastEventLoc
-
-// ------------------------------------------------------------------------------------------------
-/** Try to create a radar event for "we're under attack".  This will be called every time
-	* actual damage is dealt to an object that the player owns that shows up on the radar.
-	* We don't want to create under attack events every time we are damaged and we also want
-	* to limit them based on time and local area of other recent attack events */
-// ------------------------------------------------------------------------------------------------
-void Radar::tryUnderAttackEvent( const Object *obj )
-{
-
-	// sanity
-	if( obj == NULL )
-		return;
-
-	// try to create the event
-	Bool eventCreated = tryEvent( RADAR_EVENT_UNDER_ATTACK, obj->getPosition() );
-
-	// if event created, do some more feedback
-	if( eventCreated )
-	{
-
-		TheControlBar->triggerRadarAttackGlow();
-		//
-		///@todo Should make an INI data driven table for radar event strings, and audio events
-		//
-		// UI feedback for being under attack (note that we display these messages and audio
-		// queues even if we don't have a radar)
-		//
-		Player *player = ThePlayerList->getLocalPlayer();
-
-		// create a message for the attack event
-		if( obj->isKindOf( KINDOF_INFANTRY ) || obj->isKindOf( KINDOF_VEHICLE ) )
-		{
-			AudioEventRTS unitAttackSound;
-			if( obj->isKindOf(KINDOF_HARVESTER) )
-			{
-				// display special message
-				TheInGameUI->message( "RADAR:HarvesterUnderAttack" );
-
-				// play special audio event
-				unitAttackSound = TheAudio->getMiscAudio()->m_radarHarvesterUnderAttackSound;
-			}
-			else
-			{
-				// display message
-				TheInGameUI->message( "RADAR:UnitUnderAttack" );
-				
-				// play audio event
-				unitAttackSound = TheAudio->getMiscAudio()->m_radarStructureUnderAttackSound;
-			}
-			unitAttackSound.setPlayerIndex(player->getPlayerIndex());
-			TheAudio->addAudioEvent( &unitAttackSound );
-
-		}  // end if
-		else if( obj->isKindOf( KINDOF_STRUCTURE ) && obj->isKindOf( KINDOF_MP_COUNT_FOR_VICTORY ) )
-		{
-			// play EVA. If its our object, play Base under attack.
-			if (obj->getControllingPlayer()->isLocalPlayer())
-				TheEva->setShouldPlay(EVA_BaseUnderAttack);
-			else if (ThePlayerList->getLocalPlayer()->getRelationship(obj->getTeam()) == ALLIES)
-				TheEva->setShouldPlay(EVA_AllyUnderAttack);
-
-			// display message
-			TheInGameUI->message( "RADAR:StructureUnderAttack" );
-
-			// play audio event
-			static AudioEventRTS structureAttackSound = TheAudio->getMiscAudio()->m_radarStructureUnderAttackSound;
-			structureAttackSound.setPlayerIndex(player->getPlayerIndex());
-			TheAudio->addAudioEvent( &structureAttackSound );
-
-		}  // end else if
-		else
-		{
-
-			// display message
-			TheInGameUI->message( "RADAR:UnderAttack" );
-
-			// play audio event
-			static AudioEventRTS underAttackSound = TheAudio->getMiscAudio()->m_radarStructureUnderAttackSound;
-			underAttackSound.setPlayerIndex(player->getPlayerIndex());
-			TheAudio->addAudioEvent( &underAttackSound );
-
-		}  // end else
-
-	}  // end if
-
-}  // end tryUnderAttackEvent
-
-// ------------------------------------------------------------------------------------------------
-/** Try to create a radar event for "infiltration".
-		This happens whenever a unit is hijacked, defected, converted to carbomb, hacked, or 
-		otherwise snuck into */ 
-// ------------------------------------------------------------------------------------------------
-void Radar::tryInfiltrationEvent( const Object *obj )
-{
-
-	//Sanity!
-	if( !obj )
-	{
-		return;
-	}
-
-	// We should only be warned against infiltrations that are taking place against us.
-	if( obj->getControllingPlayer() != ThePlayerList->getLocalPlayer() )
-		return;
-
-	// create the radar event
-	createEvent( obj->getPosition(), RADAR_EVENT_INFILTRATION );
-
-	//
-	///@todo Should make an INI data driven table for radar event strings, and audio events
-	//
-	// UI feedback for being under attack (note that we display these messages and audio
-	// queues even if we don't have a radar)
-	//
-	Player *player = ThePlayerList->getLocalPlayer();
-
-	// display message
-	TheInGameUI->message( "RADAR:Infiltration" );
-
-	// play audio event
-	static AudioEventRTS infiltrationWarningSound = TheAudio->getMiscAudio()->m_radarInfiltrationSound;
-	infiltrationWarningSound.setPlayerIndex(player->getPlayerIndex());
-	TheAudio->addAudioEvent( &infiltrationWarningSound );
-
-}  // end tryInfiltrationEvent
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-Bool Radar::tryEvent( RadarEventType event, const Coord3D *pos )
-{
-
-	// sanity
-	if( event <= RADAR_EVENT_INVALID || event >= RADAR_EVENT_NUM_EVENTS || pos == NULL )
-		return FALSE;
-
-	// see if there was an event of this type within the given range within the given time
-	UnsignedInt currentFrame = TheGameLogic->getFrame();
-	const Real closeEnoughDistanceSq = 250.0f * 250.0f;
-	const UnsignedInt framesBetweenEvents = LOGICFRAMES_PER_SECOND * 10;
-	//
-
-	// see if there was any matching radar event within range of this one
-	// that wasn't too long ago, if there was we won't create another and get outta here
-	//
-	for( Int i = 0; i < MAX_RADAR_EVENTS; ++i )
-	{
-	
-		// only pay attention to under attack events
-		if( m_event[ i ].type == event )
-		{
-
-			// get distance from our new event location to this event location in 2D
-			Real distSquared = m_event[ i ].worldLoc.x - pos->x * m_event[ i ].worldLoc.x - pos->x +
-												 m_event[ i ].worldLoc.y - pos->y * m_event[ i ].worldLoc.y - pos->y;
-
-			if( distSquared <= closeEnoughDistanceSq )
-			{
-
-				// finally only reject making a new event of this existing one is "recent enough"
-				if( currentFrame - m_event[ i ].createFrame < framesBetweenEvents )
-					return FALSE;  // reject it
-
-			}  // end if
-
-		}  // end if
-
-	}  // end for i
-
-	// if we got here then we want to create a new event
-	createEvent( pos, event );
-
-	// return TRUE for successfully created event
-	return TRUE;
-
-}  // end tryEvent
-
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void Radar::refreshTerrain( TerrainLogic *terrain )
-{
-
-	// no future queue is valid now
-	m_queueTerrainRefreshFrame = 0;
-
-}  // end refreshTerrain
-
-// ------------------------------------------------------------------------------------------------
-/** Queue a refresh of the radar terrain, we have this so that if there is code that
-	* rapidly needs to refresh the radar, it should use this so we aren't continually
-	* rebuilding the radar graphic because that process is slow.  If you need to update
-	* the terrain on the radar immediately use refreshTerrain() */
-// ------------------------------------------------------------------------------------------------
-void Radar::queueTerrainRefresh( void )
-{
-
-	//
-	// we just simply overwrite the frame we have recorded for a radar refresh.  If there was
-	// already one there, it's simply just forgotten and whatever changes we wanted to see
-	// with that refresh will have to wait until enough time has passed to show these
-	// changes as well.  why you ask ... well, because if we're calling this in close enough
-	// proximity for us to overwrite something, we're changing the terrain features 
-	// quite often and can't afford the expense of rebuilding the radar visual
-	//
-	m_queueTerrainRefreshFrame = TheGameLogic->getFrame();
-
-}  // end queueTerrainRefresh
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void Radar::crc( Xfer *xfer )
-{
-
-}  // end crc
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer a radar object list given the head pointer as a parameter
-	* Version Info;
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-static void xferRadarObjectList( Xfer *xfer, RadarObject **head )
-{
-	RadarObject *radarObject;
-
-	// sanity
-	DEBUG_ASSERTCRASH( head != NULL, ("xferRadarObjectList - Invalid parameters\n" ));
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// write could of objects in list
-	UnsignedShort count = 0;
-	for( radarObject = *head; radarObject; radarObject = radarObject->friend_getNext() )
-		count++;
-	xfer->xferUnsignedShort( &count );
-
-	// xfer the list data
-	if( xfer->getXferMode() == XFER_SAVE )
-	{
-
-		// save each object
-		for( radarObject = *head; radarObject; radarObject = radarObject->friend_getNext() )
-		{
-
-			// save this object
-			xfer->xferSnapshot( radarObject );
-
-		}  // end for, radarObject
-
-	}  // end if, save
-	else
-	{
-
-		// the list should be empty at this point as we are loading it as a whole
-		if( *head != NULL )
-		{
-#if 1
-			// srj sez: yeah, it SHOULD be, but a few rogue things come into existence (via their ctor) preloaded
-			// with stuff (eg, "CabooseFullOfTerrorists"). we immediately destroy 'em, but they don't go away just yet.
-			// so just ignore 'em if possible.
-			for( radarObject = *head; radarObject; radarObject = radarObject->friend_getNext() )
-			{
-				if (!radarObject->friend_getObject()->isDestroyed())
-				{
-					DEBUG_CRASH(( "xferRadarObjectList - List head should be NULL, or contain only destroyed objects\n" ));
-					throw SC_INVALID_DATA;
-				}
-			}
-#else
-			DEBUG_CRASH(( "xferRadarObjectList - List head should be NULL, but isn't\n" ));
-			throw SC_INVALID_DATA;
-#endif
-		}  // end if
-
-		// read each element
-		for( UnsignedShort i = 0; i < count; ++i )
-		{
-
-			// alloate a new radar object 
-			radarObject = newInstance(RadarObject);
-
-			// link to the end of the list
-			if( *head == NULL )
-				*head = radarObject;
-			else
-			{
-
-				RadarObject *other;
-				for( other = *head; other->friend_getNext() != NULL; other = other->friend_getNext() )
-				{
-				}  // end for, other
-
-				// set the end of the list to point to the new object
-				other->friend_setNext( radarObject );
-
-			}  // end else
-
-			// load the data
-			xfer->xferSnapshot( radarObject );
-						
-		}  // end for i
-
-	}  // end else, load
-
-}  // end xferRadarObjectList
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer Method
-	* Version Info:
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-void Radar::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// radar hidden
-	xfer->xferBool( &m_radarHidden );
-
-	// radar force on
-	xfer->xferBool( &m_radarForceOn );
-
-	// save our local object list
-	xferRadarObjectList( xfer, &m_localObjectList );
-
-	// save the regular object list
-	xferRadarObjectList( xfer, &m_objectList );
-
-	// save the radar event count and data
-	UnsignedShort eventCountVerify = MAX_RADAR_EVENTS;
-	UnsignedShort eventCount = eventCountVerify;
-	xfer->xferUnsignedShort( &eventCount );
-	if( eventCount != eventCountVerify )
-	{
-
-		DEBUG_CRASH(( "Radar::xfer - size of MAX_RADAR_EVENTS has changed, you must version this xfer method to accomodate the new array size.  Was '%d' and is now '%d'\n",
-									eventCount, eventCountVerify ));
-		throw SC_INVALID_DATA;
-
-	}  // end if
-	for( UnsignedShort i = 0; i < eventCount; ++i )
-	{
-
-		// xfer event data
-		xfer->xferUser( &m_event[ i ].type, sizeof( RadarEventType ) );
-		xfer->xferBool( &m_event[ i ].active );
-		xfer->xferUnsignedInt( &m_event[ i ].createFrame );
-		xfer->xferUnsignedInt( &m_event[ i ].dieFrame );
-		xfer->xferUnsignedInt( &m_event[ i ].fadeFrame );
-		xfer->xferRGBAColorInt( &m_event[ i ].color1 );
-		xfer->xferRGBAColorInt( &m_event[ i ].color2 );
-		xfer->xferCoord3D( &m_event[ i ].worldLoc );
-		xfer->xferICoord2D( &m_event[ i ].radarLoc );
-		xfer->xferBool( &m_event[ i ].soundPlayed );
-		
-	}  // end for i
-
-	// next event index
-	xfer->xferInt( &m_nextFreeRadarEvent );
-
-	// last event index
-	xfer->xferInt( &m_lastRadarEvent );
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void Radar::loadPostProcess( void )
-{
-
-	//
-	// refresh the radar texture now that all the objects (specifically bridges) have
-	// been loaded with their correct damage states from save game file
-	//
-	refreshTerrain( TheTerrainLogic );
-
-}  // end loadPostProcess
-
-// ------------------------------------------------------------------------------------------------
-/** Is the priority type passed in a "visible" one that can show up on the radar */
-// ------------------------------------------------------------------------------------------------
-Bool Radar::isPriorityVisible( RadarPriorityType priority ) const 
-{
-
-	switch( priority )
-	{
-
-		case RADAR_PRIORITY_INVALID:
-		case RADAR_PRIORITY_NOT_ON_RADAR:
-			return FALSE;
-
-		default:
-			return TRUE;
-
-	}  // end switch
-
-}  // end isPriorityVisible
diff --git a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp
index c4935f26c8c..2fd84f01c3c 100644
--- a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp
@@ -59,11 +59,6 @@
 #include "GameLogic/SidesList.h"
 #include "GameLogic/TerrainLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 GameState *TheGameState = NULL;
@@ -94,14 +89,14 @@ SaveGameInfo::SaveGameInfo( void )
 	missionNumber			= 0;
 	saveFileType			= SAVE_FILE_TYPE_NORMAL;
 
-}  // end SaveGameInfo
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 SaveGameInfo::~SaveGameInfo( void )
 {
 
-}  // end ~SaveGameInfo
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Is this date newer than the other one passed in? */
@@ -124,7 +119,7 @@ Bool SaveDate::isNewerThan( SaveDate *other )
 			return FALSE;
 		else
 		{
-			
+
 			// day
 			if( day > other->day )
 				return TRUE;
@@ -163,19 +158,19 @@ Bool SaveDate::isNewerThan( SaveDate *other )
 							else
 								return FALSE;
 
-						}  // end else
+						}
 
-					}  // end else
+					}
 
-				}  // end else
+				}
 
-			}  // end else
+			}
 
-		}  // end else
+		}
 
-	}  // end else
+	}
 
-}  // end isNewerThan
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Find a snapshot block info that matches the token passed in */
@@ -200,17 +195,17 @@ GameState::SnapshotBlock *GameState::findBlockInfoByToken( AsciiString token, Sn
 		if( blockInfo->blockName == token )
 			return blockInfo;
 
-	}  // end for
+	}
 
 	// not found
 	return NULL;
 
-}  // end findLexiconEntryByToken
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal) 
+UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal)
 {
 	// setup date buffer for local region date format
 	#define DATE_BUFFER_SIZE 256
@@ -220,7 +215,7 @@ UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal)
 	if (GetVersionEx(&osvi))
 	{	//check if we're running Win9x variant since they may need different characters
 		if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
-		{		
+		{
 			char dateBuffer[ DATE_BUFFER_SIZE ];
 			GetDateFormat( LOCALE_SYSTEM_DEFAULT,
 										 DATE_SHORTDATE,
@@ -229,7 +224,7 @@ UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal)
 										 dateBuffer, sizeof(dateBuffer) );
 			displayDateBuffer.translate(dateBuffer);
 			return displayDateBuffer;
-		}	
+		}
 	}
 	wchar_t dateBuffer[ DATE_BUFFER_SIZE ];
 	GetDateFormatW( LOCALE_SYSTEM_DEFAULT,
@@ -240,9 +235,9 @@ UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal)
 	displayDateBuffer.set(dateBuffer);
 	return displayDateBuffer;
 	//displayDateBuffer.format( L"%ls", dateBuffer );
-}															
+}
 
-UnicodeString getUnicodeTimeBuffer(SYSTEMTIME timeVal) 
+UnicodeString getUnicodeTimeBuffer(SYSTEMTIME timeVal)
 {
 	// setup time buffer for local region time format
 	UnicodeString displayTimeBuffer;
@@ -251,7 +246,7 @@ UnicodeString getUnicodeTimeBuffer(SYSTEMTIME timeVal)
 	if (GetVersionEx(&osvi))
 	{	//check if we're running Win9x variant since they may need different characters
 		if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
-		{		
+		{
 			char timeBuffer[ DATE_BUFFER_SIZE ];
 			GetTimeFormat( LOCALE_SYSTEM_DEFAULT,
 										 TIME_NOSECONDS|TIME_FORCE24HOURFORMAT|TIME_NOTIMEMARKER,
@@ -284,7 +279,7 @@ GameState::GameState( void )
 	m_availableGames = NULL;
 	m_isInLoadGame = FALSE;
 
-}  // end GameState
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -298,10 +293,10 @@ GameState::~GameState( void )
 	// make certain that the post process list is clean
 	m_snapshotPostProcessList.clear();
 
-	// clear any available game 
+	// clear any available game
 	clearAvailableGames();
 
-}  // end ~GameState
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Init the game state subsystem */
@@ -338,7 +333,7 @@ void GameState::init( void )
 
 	m_isInLoadGame = FALSE;
 
-}  // end init
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Reset */
@@ -349,12 +344,12 @@ void GameState::reset( void )
 	// clear the post process snapshot list
 	m_snapshotPostProcessList.clear();
 
-	// clear any available game 
+	// clear any available game
 	clearAvailableGames();
 
 	m_isInLoadGame = FALSE;
 
-}  // end reset
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Clear any available games entries */
@@ -370,9 +365,9 @@ void GameState::clearAvailableGames( void )
 		delete m_availableGames;
 		m_availableGames = gameInfo;
 
-	}  // end while
+	}
 
-}  // end clearAvailableGames
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add a snapshot and block name pair to the systems used to load and save */
@@ -384,10 +379,10 @@ void GameState::addSnapshotBlock( AsciiString blockName, Snapshot *snapshot, Sna
 	if( blockName.isEmpty() || snapshot == NULL )
 	{
 
-		DEBUG_CRASH(( "addSnapshotBlock: Invalid parameters\n" ));
+		DEBUG_CRASH(( "addSnapshotBlock: Invalid parameters" ));
 		return;
 
-	}  // end if
+	}
 
 	// add to the list
 	SnapshotBlock blockInfo;
@@ -395,7 +390,7 @@ void GameState::addSnapshotBlock( AsciiString blockName, Snapshot *snapshot, Sna
 	blockInfo.blockName = blockName;
 	m_snapshotBlockList[which].push_back( blockInfo );
 
-}  // end addSnapshotBlock
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given the filename of a save file, find the highest filename number */
@@ -413,9 +408,8 @@ static void findHighFileNumber( AsciiString filename, void *userData )
 
 	// strip off the extension at the end of the filename
 	AsciiString nameOnly = filename;
-	for( size_t count = 0; count < strlen( SAVE_GAME_EXTENSION ); count++ )
-		nameOnly.removeLastChar();
-	
+	nameOnly.truncateBy( strlen( SAVE_GAME_EXTENSION ) );
+
 	// convert filename (which is only numbers) to a number
 	Int fileNumber = atoi( nameOnly.str() );
 
@@ -432,7 +426,7 @@ static void findHighFileNumber( AsciiString filename, void *userData )
 	if( fileNumber >= *highFileNumber )
 		*highFileNumber = fileNumber;
 
-}  // end findHighFileNumber
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given the save files on disk, find the "next" filename to use when saving a game */
@@ -468,8 +462,8 @@ AsciiString GameState::findNextSaveFilename( UnicodeString desc )
 	//
 	// This method has code to support two modes of finding the next filename, one of
 	// them starts with a filename of 00000000.sav and counts up the number looking for
-	// a file that doesn't exist and therefore a filename we can use (LOWEST_NUMBER).  
-	// The other method iterates all save files and returns a filename that is one larger 
+	// a file that doesn't exist and therefore a filename we can use (LOWEST_NUMBER).
+	// The other method iterates all save files and returns a filename that is one larger
 	// than the largest filename number encountered (HIGHEST_NUMBER)
 	//
 	enum FindNextFileType { LOWEST_NUMBER = 0, HIGHEST_NUMBER = 1 };
@@ -490,8 +484,8 @@ AsciiString GameState::findNextSaveFilename( UnicodeString desc )
 		AsciiString filename;
 		filename.format( "%08d%s", highFileNumber + 1, SAVE_GAME_EXTENSION );
 		return filename;
-				
-	}  // end if
+
+	}
 	else if( searchType == LOWEST_NUMBER )
 	{
 		AsciiString filename;
@@ -518,28 +512,28 @@ AsciiString GameState::findNextSaveFilename( UnicodeString desc )
 			if( i > MAX_SAVE_FILE_NUMBER )
 				return AsciiString::TheEmptyString;
 
-		}  // end while
+		}
 
-	}  // end else if
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "GameState::findNextSaveFilename - Unknown file search type '%d'\n", searchType ));
+		DEBUG_CRASH(( "GameState::findNextSaveFilename - Unknown file search type '%d'", searchType ));
 		return AsciiString::TheEmptyString;
 
-	}  // end else
+	}
 #endif
 
 	// no appropriate filename could be found, return the empty string
 	return AsciiString::TheEmptyString;
 
-}  // end findNextSaveFilename
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Save the current state of the engine in a save file
 	* NOTE: filename is a *filename only* */
 // ------------------------------------------------------------------------------------------------
-SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc, 
+SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 															SaveFileType saveType, SnapshotType which )
 {
 
@@ -549,10 +543,10 @@ SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 	if( filename.isEmpty() )
 	{
 
-		DEBUG_CRASH(( "GameState::saveGame - Unable to find valid filename for save game\n" ));
+		DEBUG_CRASH(( "GameState::saveGame - Unable to find valid filename for save game" ));
 		return SC_NO_FILE_AVAILABLE;
 
-	}  // end if
+	}
 
 	// make absolutely sure the save directory exists
 	CreateDirectory( getSaveDirectory().str(), NULL );
@@ -570,7 +564,7 @@ SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 	} catch(...) {
 		// print error message to the user
 		TheInGameUI->message( "GUI:Error" );
-		DEBUG_LOG(( "Error opening file '%s'\n", filepath.str() ));
+		DEBUG_LOG(( "Error opening file '%s'", filepath.str() ));
 		return SC_ERROR;
 	}
 
@@ -595,7 +589,7 @@ SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 		// save file
 		xferSaveData( &xferSave, which );
 
-	}  // end try
+	}
 	catch( ... )
 	{
 
@@ -610,8 +604,8 @@ SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 		// close the file and get out of here
 		xferSave.close();
 		return SC_ERROR;
-		
-	}  // end catch
+
+	}
 
 	// close the file
 	xferSave.close();
@@ -622,7 +616,7 @@ SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 
 	return SC_OK;
 
-}  // end saveGame
+}
 
 // ------------------------------------------------------------------------------------------------
 /** A mission save */
@@ -642,9 +636,9 @@ SaveCode GameState::missionSave( void )
 	desc.format( format, TheGameText->fetch( campaign->m_campaignNameLabel ).str(), missionNumber );
 
 	// do an automatic mission save
-	return TheGameState->saveGame( AsciiString(""), desc, SAVE_FILE_TYPE_MISSION );
+	return saveGame( "", desc, SAVE_FILE_TYPE_MISSION );
 
-}  // end missionSave
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load the save game pointed to by filename */
@@ -663,7 +657,7 @@ SaveCode GameState::loadGame( AvailableGameInfo gameInfo )
 		if (TheGameLogic->isInGame())
 			TheGameLogic->clearGameData( FALSE );
 
-	}  // end if
+	}
 
 	//
 	// clear the save directory of any temporary "scratch pad" maps that were extracted
@@ -694,11 +688,11 @@ SaveCode GameState::loadGame( AvailableGameInfo gameInfo )
 		// load file
 		xferSaveData( &xferLoad, SNAPSHOT_SAVELOAD );
 
-	}  // end try
+	}
 	catch( ... )
 	{
 		error = TRUE;
-	}  // end catch
+	}
 
 	// close the file
 	xferLoad.close();
@@ -735,7 +729,7 @@ SaveCode GameState::loadGame( AvailableGameInfo gameInfo )
 
 		return SC_INVALID_DATA;	// you can't use a naked "throw" outside of a catch statement!
 
-	}  // end if
+	}
 
 	//
 	// when loading a mission save, we want to do as much normal loading stuff as we
@@ -758,11 +752,11 @@ SaveCode GameState::loadGame( AvailableGameInfo gameInfo )
 		gameInfo->saveFileType = SAVE_FILE_TYPE_NORMAL;
 		gameInfo->missionMapName.clear();
 
-	}  // end if
-		
+	}
+
 	return SC_OK;
 
-}  // end loadGame
+}
 
 //-------------------------------------------------------------------------------------------------
 AsciiString GameState::getSaveDirectory() const
@@ -783,7 +777,7 @@ AsciiString GameState::getFilePathInSaveDirectory(const AsciiString& leaf) const
 //-------------------------------------------------------------------------------------------------
 Bool GameState::isInSaveDirectory(const AsciiString& path) const
 {
-	return path.startsWithNoCase(getSaveDirectory());
+	return FileSystem::isPathInDirectory(path, getSaveDirectory());
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -799,7 +793,7 @@ AsciiString GameState::getMapLeafName(const AsciiString& in) const
 		// at the name only
 		//
 		++p;
-		DEBUG_ASSERTCRASH( p != NULL && *p != 0, ("GameState::xfer - Illegal map name encountered\n") );
+		DEBUG_ASSERTCRASH( p != NULL && *p != 0, ("GameState::xfer - Illegal map name encountered") );
 		return p;
 	}
 	else
@@ -853,14 +847,13 @@ static AsciiString getMapLeafAndDirName(const AsciiString& in)
 // ------------------------------------------------------------------------------------------------
 static AsciiString removeExtension(const AsciiString& in)
 {
-	char buf[1024];
-	strcpy(buf, in.str());
-	char* p = strrchr(buf, '.');
-	if (p)
+	if (const char* end = in.reverseFind('.'))
 	{
-		*p = 0;
+		const char* begin = in.str();
+		return AsciiString(begin, end - begin);
 	}
-	return AsciiString(buf);
+
+	return in;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -902,10 +895,13 @@ AsciiString GameState::realMapPathToPortableMapPath(const AsciiString& in) const
 AsciiString GameState::portableMapPathToRealMapPath(const AsciiString& in) const
 {
 	AsciiString prefix;
+	// The directory where the real map path should be contained in.
+	AsciiString containingBasePath;
 	if (in.startsWithNoCase(PORTABLE_SAVE))
 	{
 		// the save dir ends with "\\"
 		prefix = getSaveDirectory();
+		containingBasePath = prefix;
 		prefix.concat(getMapLeafName(in));
 	}
 	else if (in.startsWithNoCase(PORTABLE_MAPS))
@@ -913,6 +909,7 @@ AsciiString GameState::portableMapPathToRealMapPath(const AsciiString& in) const
 		// the map dir DOES NOT end with "\\", must add it
 		prefix = TheMapCache->getMapDir();
 		prefix.concat("\\");
+		containingBasePath = prefix;
 		prefix.concat(getMapLeafAndDirName(in));
 	}
 	else if (in.startsWithNoCase(PORTABLE_USER_MAPS))
@@ -920,15 +917,22 @@ AsciiString GameState::portableMapPathToRealMapPath(const AsciiString& in) const
 		// the map dir DOES NOT end with "\\", must add it
 		prefix = TheMapCache->getUserMapDir();
 		prefix.concat("\\");
+		containingBasePath = prefix;
 		prefix.concat(getMapLeafAndDirName(in));
 	}
 	else
 	{
 		DEBUG_CRASH(("Map file was not found in any of the expected directories; this is impossible"));
-		//throw INI_INVALID_DATA;
-		// uncaught exceptions crash us. better to just use a bad path.
-		prefix = in;
+		// Empty string represents a failure, either caused by an invalid prefix or a relative path leading outside the base path
+		return AsciiString::TheEmptyString;
+	}
+
+	if (!FileSystem::isPathInDirectory(prefix, containingBasePath))
+	{
+		DEBUG_LOG(("Normalized file path for '%s' was outside the expected base path of '%s'.", prefix.str(), containingBasePath.str()));
+		return AsciiString::TheEmptyString;
 	}
+
 	prefix.toLower();
 	return prefix;
 }
@@ -936,7 +940,7 @@ AsciiString GameState::portableMapPathToRealMapPath(const AsciiString& in) const
 // ------------------------------------------------------------------------------------------------
 /** Does the save game file exist */
 // ------------------------------------------------------------------------------------------------
-Bool GameState::doesSaveGameExist( AsciiString filename ) 
+Bool GameState::doesSaveGameExist( AsciiString filename )
 {
 
 	// construct full path to file
@@ -950,21 +954,21 @@ Bool GameState::doesSaveGameExist( AsciiString filename )
 		// try to open it
 		xfer.open( filepath );
 
-	}  // end try
+	}
 	catch( ... )
 	{
 
 		// unable to open file, it must not be here
 		return FALSE;
 
-	}  // end catch
-	
+	}
+
 	// close the file, we don't want to to anything with it right now
 	xfer.close();
 
 	return TRUE;
 
-}  // doesSaveGameExist
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Get save game info from the filename specified */
@@ -980,10 +984,10 @@ void GameState::getSaveGameInfoFromFile( AsciiString filename, SaveGameInfo *sav
 	if( filename.isEmpty() == TRUE || saveGameInfo == NULL )
 	{
 
-		DEBUG_CRASH(( "GameState::getSaveGameInfoFromFile - Illegal parameters\n" ));
+		DEBUG_CRASH(( "GameState::getSaveGameInfoFromFile - Illegal parameters" ));
 		return;
 
-	}  // end if
+	}
 
 	// open file for partial loading
 	XferLoad xferLoad;
@@ -992,7 +996,7 @@ void GameState::getSaveGameInfoFromFile( AsciiString filename, SaveGameInfo *sav
 	//
 	// disable post processing cause we're not really doing a load of game data that
 	// needs post processing and we don't want to keep track of any snapshots we loaded
-	// 
+	//
 	xferLoad.setOptions( XO_NO_POST_PROCESSING );
 
 	// read all data blocks in the file
@@ -1007,10 +1011,10 @@ void GameState::getSaveGameInfoFromFile( AsciiString filename, SaveGameInfo *sav
 		{
 
 			// we should never get here, if we did, we didn't find block of data we needed
-			DEBUG_CRASH(( "GameState::getSaveGameInfoFromFile - Game info not found in file '%s'\n", filename.str() ));
+			DEBUG_CRASH(( "GameState::getSaveGameInfoFromFile - Game info not found in file '%s'", filename.str() ));
 			done = TRUE;
 
-		}  // end if
+		}
 		else
 		{
 
@@ -1034,23 +1038,23 @@ void GameState::getSaveGameInfoFromFile( AsciiString filename, SaveGameInfo *sav
 					// load data
 					xferLoad.xferSnapshot( &tempGameState );
 
-				}  // end try
+				}
 				catch( ... )
 				{
 
-					DEBUG_CRASH(( "GameState::getSaveGameInfoFromFile - Error loading block '%s' in file '%s'\n",
+					DEBUG_CRASH(( "GameState::getSaveGameInfoFromFile - Error loading block '%s' in file '%s'",
 												blockInfo->blockName.str(), filename.str() ));
 					throw;
 
-				}  // end catch
+				}
 
 				// data was found, copy game state info over
 				*saveGameInfo = *tempGameState.getSaveGameInfo();
-				
+
 				// we're all done with this file now
 				done = TRUE;
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1060,16 +1064,16 @@ void GameState::getSaveGameInfoFromFile( AsciiString filename, SaveGameInfo *sav
 				// end of block
 				xferLoad.endBlock();
 
-			}  // end else
+			}
 
-		}  // end else, valid data block token
+		}
 
-	}  // end while, not done
+	}
 
 	// close the file
 	xferLoad.close();
 
-}  // end getSaveGameInfoFromFile
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Create game info and add to available list */
@@ -1079,15 +1083,15 @@ static void addGameToAvailableList( AsciiString filename, void *userData )
 	AvailableGameInfo **listHead = (AvailableGameInfo **)userData;
 
 	// sanity
-	DEBUG_ASSERTCRASH( listHead != NULL, ("addGameToAvailableList - Illegal parameters\n") );
-	DEBUG_ASSERTCRASH( filename.isEmpty() == FALSE, ("addGameToAvailableList - Illegal filename\n") );
- 
+	DEBUG_ASSERTCRASH( listHead != NULL, ("addGameToAvailableList - Illegal parameters") );
+	DEBUG_ASSERTCRASH( filename.isEmpty() == FALSE, ("addGameToAvailableList - Illegal filename") );
+
 	try {
 	// get header info from this listbox
 	SaveGameInfo saveGameInfo;
 	TheGameState->getSaveGameInfoFromFile( filename, &saveGameInfo );
 
-	// allocate new info 
+	// allocate new info
 	AvailableGameInfo *newInfo = new AvailableGameInfo;
 
 	// assign data
@@ -1124,9 +1128,9 @@ static void addGameToAvailableList( AsciiString filename, void *userData )
 
 				break;
 
-			}  // end if
+			}
 
-		}  // end for
+		}
 
 		// if not inserted, put at end
 		if( curr == NULL )
@@ -1135,15 +1139,15 @@ static void addGameToAvailableList( AsciiString filename, void *userData )
 			prev->next = newInfo;
 			newInfo->prev = prev;
 
-		}  // end if
+		}
 
-	}  // end else
+	}
 	} catch(...) {
 		// Do nothing - just return.
 	}
 
 
-}  // end addGameToAvailableList
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Populate the listbox passed in with a list of the save games present on the hard drive */
@@ -1167,8 +1171,8 @@ void GameState::populateSaveGameListbox( GameWindow *listbox, SaveLoadLayoutType
 
 		index = GadgetListBoxAddEntryText( listbox, newGameText, newGameColor, -1 );
 		GadgetListBoxSetItemData( listbox, NULL, index );
-	
-	}  // end if
+
+	}
 
 	// clear the available games
 	clearAvailableGames();
@@ -1208,12 +1212,12 @@ void GameState::populateSaveGameListbox( GameWindow *listbox, SaveLoadLayoutType
 		if( displayLabel.isEmpty() == TRUE )
 		{
 			Bool exists = FALSE;
-			
+
 			displayLabel = TheGameText->fetch( saveGameInfo->mapLabel, &exists );
 			if( exists == FALSE )
 				displayLabel.format( L"%S", saveGameInfo->mapLabel.str() );
 
-		}  // end if
+		}
 
 		// pick color for text (we alternate it each game)
 		Color color;
@@ -1232,12 +1236,12 @@ void GameState::populateSaveGameListbox( GameWindow *listbox, SaveLoadLayoutType
 		// add this available game info in the user data pointer of that listbox item
 		GadgetListBoxSetItemData( listbox, info, index );
 
-	}  // end for, info
+	}
 
 	// select the top "new game" entry
 	GadgetListBoxSetSelected( listbox, 0 );
 
-}  // end pupulateSaveGameListbox
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE METHODS ////////////////////////////////////////////////////////////////////////////////
@@ -1280,7 +1284,7 @@ void GameState::iterateSaveFiles( IterateSaveFileCallback callback, void *userDa
 			// we are no longer on our first item
 			first = FALSE;
 
-		}  // end if, first
+		}
 
 		// see if this is a file, and therefore a possible save file
 		if( !(item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
@@ -1298,15 +1302,15 @@ void GameState::iterateSaveFiles( IterateSaveFileCallback callback, void *userDa
 				// call the callback
 				callback( filename, userData );
 
-			}  // end if, a save file
+			}
 
-		}  // end if
+		}
 
 		// on to the next file
 		if( FindNextFile( hFile, &item ) == 0 )
 			done = TRUE;
 
-	}  // end while
+	}
 
 	// close search resources
 	FindClose( hFile );
@@ -1314,14 +1318,14 @@ void GameState::iterateSaveFiles( IterateSaveFileCallback callback, void *userDa
 	// restore the current directory
 	SetCurrentDirectory( currentDirectory );
 
-}  // end iterateSaveFiles
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Save game to xfer or load game using xfer */
 // ------------------------------------------------------------------------------------------------
 void GameState::friend_xferSaveDataForCRC( Xfer *xfer, SnapshotType which )
 {
-	DEBUG_LOG(("GameState::friend_xferSaveDataForCRC() - SnapshotType %d\n", which));
+	DEBUG_LOG(("GameState::friend_xferSaveDataForCRC() - SnapshotType %d", which));
 	SaveGameInfo *gameInfo = getSaveGameInfo();
 	gameInfo->description.clear();
 	gameInfo->saveFileType = SAVE_FILE_TYPE_NORMAL;
@@ -1344,7 +1348,7 @@ void GameState::xferSaveData( Xfer *xfer, SnapshotType which )
 	// save or load all blocks
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
-		DEBUG_LOG(("GameState::xferSaveData() - XFER_SAVE\n"));
+		DEBUG_LOG(("GameState::xferSaveData() - XFER_SAVE"));
 
 		// save all blocks
 		AsciiString blockName;
@@ -1352,20 +1356,20 @@ void GameState::xferSaveData( Xfer *xfer, SnapshotType which )
 		SnapshotBlockListIterator it;
 		for( it = m_snapshotBlockList[which].begin(); it != m_snapshotBlockList[which].end(); ++it )
 		{
-		
+
 			// get list data
 			blockInfo = &(*it);
 
 			// get block name
 			blockName = blockInfo->blockName;
 
-			DEBUG_LOG(("Looking at block '%s'\n", blockName.str()));
+			DEBUG_LOG(("Looking at block '%s'", blockName.str()));
 
 			//
 			// for mission save files, we only save the game state block and campaign manager
 			// because anything else is not needed.
 			//
-			if( getSaveGameInfo()->saveFileType != SAVE_FILE_TYPE_MISSION || 
+			if( getSaveGameInfo()->saveFileType != SAVE_FILE_TYPE_MISSION ||
 					(blockName.compareNoCase( GAME_STATE_BLOCK_STRING ) == 0 ||
 					 blockName.compareNoCase( CAMPAIGN_BLOCK_STRING ) == 0) )
 			{
@@ -1386,28 +1390,28 @@ void GameState::xferSaveData( Xfer *xfer, SnapshotType which )
 					// end this block
 					xfer->endBlock();
 
-				}  // end try
+				}
 				catch( ... )
 				{
 
-					DEBUG_CRASH(( "Error saving block '%s' in file '%s'\n",
-												blockName.str(), xfer->getIdentifier() ));
+					DEBUG_CRASH(( "Error saving block '%s' in file '%s'",
+												blockName.str(), xfer->getIdentifier().str() ));
 					throw;
 
-				}  // end catch
+				}
 
-			}  // end if
+			}
 
-		}  // end for, all snapshots
+		}
 
 		// write an end of file token
 		AsciiString eofToken = SAVE_FILE_EOF;
 		xfer->xferAsciiString( &eofToken );
-				
-	}  // end if, save
+
+	}
 	else
 	{
-		DEBUG_LOG(("GameState::xferSaveData() - not XFER_SAVE\n"));
+		DEBUG_LOG(("GameState::xferSaveData() - not XFER_SAVE"));
 		AsciiString token;
 		Int blockSize;
 		Bool done = FALSE;
@@ -1427,7 +1431,7 @@ void GameState::xferSaveData( Xfer *xfer, SnapshotType which )
 				// all done
 				done = TRUE;
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1437,7 +1441,7 @@ void GameState::xferSaveData( Xfer *xfer, SnapshotType which )
 				{
 
 					// log the block not found
-					DEBUG_LOG(( "GameState::xferSaveData - Skipping unknown block '%s'\n", token.str() ));
+					DEBUG_LOG(( "GameState::xferSaveData - Skipping unknown block '%s'", token.str() ));
 
 					//
 					// block was not found, this could have been a block from an older file
@@ -1449,37 +1453,37 @@ void GameState::xferSaveData( Xfer *xfer, SnapshotType which )
 					// continue with while loop reading block tokens
 					continue;
 
-				}  // end if
+				}
 
 				try
 				{
 
 					// read block start
 					blockSize = xfer->beginBlock();
-				
+
 					// parse this data
 					xfer->xferSnapshot( blockInfo->snapshot );
 
 					// read block end
 					xfer->endBlock();
 
-				}  // end try
+				}
 				catch( ... )
 				{
 
-					DEBUG_CRASH(( "Error loading block '%s' in file '%s'\n",
-												blockInfo->blockName.str(), xfer->getIdentifier() ));
+					DEBUG_CRASH(( "Error loading block '%s' in file '%s'",
+												blockInfo->blockName.str(), xfer->getIdentifier().str() ));
 					throw;
 
-				}  // end catch
+				}
 
-			}  // end else, valid data block token
+			}
 
-		}  // end while, not done
+		}
 
-	}  // end else, load
+	}
 
-}  // end xferSaveData
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add a snapshot to the post process list for later */
@@ -1491,10 +1495,10 @@ void GameState::addPostProcessSnapshot( Snapshot *snapshot )
 	if( snapshot == NULL )
 	{
 
-		DEBUG_CRASH(( "GameState::addPostProcessSnapshot - invalid parameters\n" ));
+		DEBUG_CRASH(( "GameState::addPostProcessSnapshot - invalid parameters" ));
 		return;
 
-	}  // end if
+	}
 
 /*
 	//
@@ -1510,18 +1514,18 @@ void GameState::addPostProcessSnapshot( Snapshot *snapshot )
 		if( (*it) == snapshot )
 		{
 
-			DEBUG_CRASH(( "GameState::addPostProcessSnapshot - snapshot is already in list!\n" ));
+			DEBUG_CRASH(( "GameState::addPostProcessSnapshot - snapshot is already in list!" ));
 			return;
 
-		}  // end if
+		}
 
-	}  // end for, it
+	}
 */
 
 	// add to the list
 	m_snapshotPostProcessList.push_back( snapshot );
 
-}  // end addPostProcessSnapshot
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Post process entry point after all game data has been xferd from disk */
@@ -1544,7 +1548,7 @@ void GameState::gameStatePostProcessLoad( void )
 		// do processing
 		snapshot->loadPostProcess();
 
-	}  // end for
+	}
 
 	// clear the snapshot post process list as we are now done with it
 	m_snapshotPostProcessList.clear();
@@ -1552,12 +1556,12 @@ void GameState::gameStatePostProcessLoad( void )
 	// evil... must ensure this is updated prior to the script engine running the first time.
 	ThePartitionManager->update();
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Xfer method for the game state itself 
+/** Xfer method for the game state itself
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Added save file type and mission map name (regular save vs automatic mission save) */
 // ------------------------------------------------------------------------------------------------
 void GameState::xfer( Xfer *xfer )
@@ -1581,7 +1585,7 @@ void GameState::xfer( Xfer *xfer )
 		// mission map name
 		xfer->xferAsciiString( &saveGameInfo->missionMapName );
 
-	}  // end if
+	}
 
 	// current system time
 	SYSTEMTIME systemTime;
@@ -1614,23 +1618,17 @@ void GameState::xfer( Xfer *xfer )
 		saveGameInfo->mapLabel = dict->getAsciiString( TheKey_mapName, &exists );
 
 	// if no label was found, we'll use the map name (just filename, no directory info)
-	if( exists == FALSE || saveGameInfo->mapLabel == AsciiString::TheEmptyString )
+	if (exists == FALSE || saveGameInfo->mapLabel == AsciiString::TheEmptyString)
 	{
-		char string[ _MAX_PATH ];
-
-		strcpy( string, TheGlobalData->m_mapName.str() );
-		char *p = strrchr( string, '\\' );
-		if( p == NULL )
+		const char* p = TheGlobalData->m_mapName.reverseFind('\\');
+		if (p == NULL)
 			saveGameInfo->mapLabel = TheGlobalData->m_mapName;
 		else
 		{
-
 			p++;  // skip the '\' we're on
-			saveGameInfo->mapLabel.set( p );
-
-		}  // end else
-
-	}  // end if
+			saveGameInfo->mapLabel.set(p);
+		}
+	}
 
 	// xfer map label
 	xfer->xferAsciiString( &saveGameInfo->mapLabel );
@@ -1648,8 +1646,8 @@ void GameState::xfer( Xfer *xfer )
 		saveGameInfo->missionNumber = TheCampaignManager->getCurrentMissionNumber();
 		xfer->xferInt( &saveGameInfo->missionNumber );
 
-		
-	}  // end if
+
+	}
 	else
 	{
 
@@ -1661,6 +1659,6 @@ void GameState::xfer( Xfer *xfer )
 		saveGameInfo->missionNumber = CampaignManager::INVALID_MISSION_NUMBER;
 		xfer->xferInt( &saveGameInfo->missionNumber );
 
-	}  // end else
+	}
 
-}  // end xfer
+}
diff --git a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp
index 2ca950c46cc..c10fc093f42 100644
--- a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp
@@ -43,11 +43,6 @@
 // GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
 GameStateMap *TheGameStateMap = NULL;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // METHODS ////////////////////////////////////////////////////////////////////////////////////////
 
@@ -56,7 +51,7 @@ GameStateMap *TheGameStateMap = NULL;
 GameStateMap::GameStateMap( void )
 {
 
-}  // end GameStateMap
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -69,27 +64,27 @@ GameStateMap::~GameStateMap( void )
 	//
 	clearScratchPadMaps();
 
-}  // end ~GameStateMap
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Embed the pristine map into the xfer stream */
 // ------------------------------------------------------------------------------------------------
 static void embedPristineMap( AsciiString map, Xfer *xfer )
 {
- 
+
 	// open the map file
 	File *file = TheFileSystem->openFile( map.str(), File::READ | File::BINARY );
 	if( file == NULL )
 	{
 
-		DEBUG_CRASH(( "embedPristineMap - Error opening source file '%s'\n", map.str() ));
+		DEBUG_CRASH(( "embedPristineMap - Error opening source file '%s'", map.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
- 
+	}
+
 	// how big is the map file
 	Int fileSize = file->seek( 0, File::END );
- 
+
 	// rewind to beginning of file
 	file->seek( 0, File::START );
 
@@ -98,33 +93,33 @@ static void embedPristineMap( AsciiString map, Xfer *xfer )
 	if( buffer == NULL )
 	{
 
-		DEBUG_CRASH(( "embedPristineMap - Unable to allocate buffer for file '%s'\n", map.str() ));
+		DEBUG_CRASH(( "embedPristineMap - Unable to allocate buffer for file '%s'", map.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
- 
+	}
+
 	// copy the file to the buffer
 	if( file->read( buffer, fileSize ) != fileSize )
 	{
 
-		DEBUG_CRASH(( "embeddPristineMap - Error reading from file '%s'\n", map.str() ));
+		DEBUG_CRASH(( "embeddPristineMap - Error reading from file '%s'", map.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
- 
+	}
+
 	// close the BIG file
 	file->close();
- 
+
 	// write the contents to the save file
-	DEBUG_ASSERTCRASH( xfer->getXferMode() == XFER_SAVE, ("embedPristineMap - Unsupposed xfer mode\n") );
+	DEBUG_ASSERTCRASH( xfer->getXferMode() == XFER_SAVE, ("embedPristineMap - Unsupposed xfer mode") );
 	xfer->beginBlock();
 	xfer->xferUser( buffer, fileSize );
 	xfer->endBlock();
 
 	// delete the buffer
 	delete [] buffer;
- 
-}  // end embedPristineMap
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Embed an "in use" map into the xfer stream.  An "in use" map is one that has already
@@ -138,10 +133,10 @@ static void embedInUseMap( AsciiString map, Xfer *xfer )
 	if( fp == NULL )
 	{
 
-		DEBUG_CRASH(( "embedInUseMap - Unable to open file '%s'\n", map.str() ));
+		DEBUG_CRASH(( "embedInUseMap - Unable to open file '%s'", map.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// how big is the file
 	fseek( fp, 0, SEEK_END );
@@ -155,19 +150,19 @@ static void embedInUseMap( AsciiString map, Xfer *xfer )
 	if( buffer == NULL )
 	{
 
-		DEBUG_CRASH(( "embedInUseMap - Unable to allocate buffer for file '%s'\n", map.str() ));
+		DEBUG_CRASH(( "embedInUseMap - Unable to allocate buffer for file '%s'", map.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// read the entire file
 	if( fread( buffer, 1, fileSize, fp ) != fileSize )
 	{
 
-		DEBUG_CRASH(( "embedInUseMap - Error reading from file '%s'\n", map.str() ));
+		DEBUG_CRASH(( "embedInUseMap - Error reading from file '%s'", map.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// embed file into xfer stream
 	xfer->beginBlock();
@@ -180,7 +175,7 @@ static void embedInUseMap( AsciiString map, Xfer *xfer )
 	// delete buffer
 	delete [] buffer;
 
-}  // embedInUseMap
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Extract the map from the xfer stream and save as a file with filename 'mapToSave' */
@@ -194,10 +189,10 @@ static void extractAndSaveMap( AsciiString mapToSave, Xfer *xfer )
 	if( fp == NULL )
 	{
 
-		DEBUG_CRASH(( "extractAndSaveMap - Unable to open file '%s'\n", mapToSave.str() ));
+		DEBUG_CRASH(( "extractAndSaveMap - Unable to open file '%s'", mapToSave.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // en
+	}
 
 	// read data size from file
 	dataSize = xfer->beginBlock();
@@ -207,10 +202,10 @@ static void extractAndSaveMap( AsciiString mapToSave, Xfer *xfer )
 	if( buffer == NULL )
 	{
 
-		DEBUG_CRASH(( "extractAndSaveMap - Unable to allocate buffer for file '%s'\n", mapToSave.str() ));
+		DEBUG_CRASH(( "extractAndSaveMap - Unable to allocate buffer for file '%s'", mapToSave.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// read map file
 	xfer->xferUser( buffer, dataSize );
@@ -219,10 +214,10 @@ static void extractAndSaveMap( AsciiString mapToSave, Xfer *xfer )
 	if( fwrite( buffer, 1, dataSize, fp ) != dataSize )
 	{
 
-		DEBUG_CRASH(( "extractAndSaveMap - Error writing to file '%s'\n", mapToSave.str() ));
+		DEBUG_CRASH(( "extractAndSaveMap - Error writing to file '%s'", mapToSave.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// close the new file
 	fclose( fp );
@@ -233,7 +228,7 @@ static void extractAndSaveMap( AsciiString mapToSave, Xfer *xfer )
 	// delete the buffer
 	delete [] buffer;
 
-}  // end extractAndSaveMap
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -297,7 +292,7 @@ void GameStateMap::xfer( Xfer *xfer )
 			//
 			firstSave = TRUE;
 
-		}  // end if
+		}
 
 		// save the pristine name
 		// For cross-machine compatibility, we always write
@@ -307,14 +302,14 @@ void GameStateMap::xfer( Xfer *xfer )
 			xfer->xferAsciiString( &tmp );
 		}
 
-		if (currentVersion >= 2) 
+		if (currentVersion >= 2)
 		{
 			// save the game mode.
-			Int gameMode = TheGameLogic->getGameMode();
+			Int gameMode = (Int)TheGameLogic->getGameMode();
 			xfer->xferInt( &gameMode);
 		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -326,7 +321,7 @@ void GameStateMap::xfer( Xfer *xfer )
 
 		if (!TheGameState->isInSaveDirectory(saveGameInfo->saveGameMapName))
 		{
-			DEBUG_CRASH(("GameState::xfer - The map filename read from the file '%s' is not in the SAVE directory, but should be\n",
+			DEBUG_CRASH(("GameState::xfer - The map filename read from the file '%s' is not in the SAVE directory, but should be",
 												 saveGameInfo->saveGameMapName.str()) );
 			throw SC_INVALID_DATA;
 		}
@@ -338,15 +333,15 @@ void GameStateMap::xfer( Xfer *xfer )
 		xfer->xferAsciiString( &saveGameInfo->pristineMapName );
 		saveGameInfo->pristineMapName = TheGameState->portableMapPathToRealMapPath(saveGameInfo->pristineMapName);
 
-		if (currentVersion >= 2) 
+		if (currentVersion >= 2)
 		{
 			// get the game mode.
 			Int gameMode;
 			xfer->xferInt(&gameMode);
-			TheGameLogic->setGameMode(gameMode);
+			TheGameLogic->setGameMode((GameMode)gameMode);
 		}
 
-	}  // end else, load
+	}
 
 	// map data
 	if( xfer->getXferMode() == XFER_SAVE )
@@ -361,7 +356,7 @@ void GameStateMap::xfer( Xfer *xfer )
 
 			embedPristineMap( saveGameInfo->pristineMapName, xfer );
 
-		}  // end if, first save
+		}
 		else
 		{
 
@@ -372,9 +367,9 @@ void GameStateMap::xfer( Xfer *xfer )
 			//
 			embedInUseMap( saveGameInfo->saveGameMapName, xfer );
 
-		}  // end else
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -384,7 +379,7 @@ void GameStateMap::xfer( Xfer *xfer )
 		//
 		extractAndSaveMap( saveGameInfo->saveGameMapName, xfer );
 
-	}  // end else
+	}
 
 	//
 	// it's important that early in the load process, we xfer the object ID counter
@@ -413,16 +408,14 @@ void GameStateMap::xfer( Xfer *xfer )
 	if (TheGameLogic->getGameMode()==GAME_SKIRMISH) {
 		if (TheSkirmishGameInfo==NULL) {
 			TheSkirmishGameInfo = NEW SkirmishGameInfo;
-			TheSkirmishGameInfo->init();  
+			TheSkirmishGameInfo->init();
 			TheSkirmishGameInfo->clearSlotList();
 			TheSkirmishGameInfo->reset();
 		}
 		xfer->xferSnapshot(TheSkirmishGameInfo);
 	} else {
-		if (TheSkirmishGameInfo) {
-			delete TheSkirmishGameInfo;
-			TheSkirmishGameInfo = NULL;
-		}
+		delete TheSkirmishGameInfo;
+		TheSkirmishGameInfo = NULL;
 	}
 
 	//
@@ -434,7 +427,7 @@ void GameStateMap::xfer( Xfer *xfer )
 		TheGameLogic->startNewGame( TRUE );
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Delete any scratch pad maps in the save directory.  Scratch pad maps are maps that
@@ -476,7 +469,7 @@ void GameStateMap::clearScratchPadMaps( void )
 			// we are no longer on our first item
 			first = FALSE;
 
-		}  // end if, first
+		}
 
 		// see if this is a file, and therefore a possible .map file
 		if( !(item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
@@ -487,7 +480,7 @@ void GameStateMap::clearScratchPadMaps( void )
 			if( c && stricmp( c, ".map" ) == 0 )
 				fileToDelete.set( item.cFileName );  // we want to delete this one
 
-		}  // end if
+		}
 
 		//
 		// find the next file before we delete this one, this is probably not necessary
@@ -501,7 +494,7 @@ void GameStateMap::clearScratchPadMaps( void )
 		if( fileToDelete.isEmpty() == FALSE )
 			DeleteFile( fileToDelete.str() );
 
-	}  // end while
+	}
 
 	// close search resources
 	FindClose( hFile );
@@ -509,4 +502,4 @@ void GameStateMap::clearScratchPadMaps( void )
 	// restore our directory to the current directory
 	SetCurrentDirectory( currentDirectory );
 
-}  // end clearScratchPadMaps
+}
diff --git a/Generals/Code/GameEngine/Source/Common/System/Snapshot.cpp b/Generals/Code/GameEngine/Source/Common/System/Snapshot.cpp
index 604d2a9b65b..9f8be6a2cba 100644
--- a/Generals/Code/GameEngine/Source/Common/System/Snapshot.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/Snapshot.cpp
@@ -28,7 +28,7 @@
 //				 be considered during game saves, loads, and CRC checks.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameState.h"
 #include "Common/Snapshot.h"
 
@@ -37,7 +37,7 @@
 Snapshot::Snapshot( void )
 {
 
-}  // end Snapshot
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -53,4 +53,4 @@ Snapshot::~Snapshot( void )
 	//
 //	TheGameState->notifySnapshotDeleted();
 
-}  // end ~Snapshot
+}
diff --git a/Generals/Code/GameEngine/Source/Common/System/StackDump.cpp b/Generals/Code/GameEngine/Source/Common/System/StackDump.cpp
index 1c0a319e148..a1c06976e66 100644
--- a/Generals/Code/GameEngine/Source/Common/System/StackDump.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/StackDump.cpp
@@ -22,21 +22,21 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(IG_DEBUG_STACKTRACE)
+#if defined(RTS_DEBUG) || defined(IG_DEBUG_STACKTRACE)
 
 #pragma pack(push, 8)
 
 #include "Common/StackDump.h"
 #include "Common/Debug.h"
 
+#include "DbgHelpLoader.h"
 
 //*****************************************************************************
 //	Prototypes
 //*****************************************************************************
 BOOL InitSymbolInfo(void);
-void UninitSymbolInfo(void);
 void MakeStackTrace(DWORD myeip,DWORD myesp,DWORD myebp, int skipFrames, void (*callback)(const char*));
 void GetFunctionDetails(void *pointer, char*name, char*filename, unsigned int* linenumber, unsigned int* address);
 void WriteStackLine(void*address, void (*callback)(const char*));
@@ -45,14 +45,6 @@ void WriteStackLine(void*address, void (*callback)(const char*));
 //	Mis-named globals :-)
 //*****************************************************************************
 static CONTEXT gsContext;
-static Bool gsInit=FALSE;
-
-BOOL (__stdcall *gsSymGetLineFromAddr)(
-		IN  HANDLE                  hProcess,
-		IN  DWORD                   dwAddr,
-		OUT PDWORD                  pdwDisplacement,
-		OUT PIMAGEHLP_LINE          Line
-			);
 
 
 //*****************************************************************************
@@ -67,12 +59,13 @@ void StackDumpDefaultHandler(const char*line)
 //*****************************************************************************
 void StackDump(void (*callback)(const char*))
 {
-	if (callback == NULL) 
+	if (callback == NULL)
 	{
 		callback = StackDumpDefaultHandler;
 	}
 
-	InitSymbolInfo();
+	if (!InitSymbolInfo())
+		return;
 
 	DWORD myeip,myesp,myebp;
 
@@ -96,12 +89,13 @@ _asm
 //*****************************************************************************
 void StackDumpFromContext(DWORD eip,DWORD esp,DWORD ebp, void (*callback)(const char*))
 {
-	if (callback == NULL) 
+	if (callback == NULL)
 	{
 		callback = StackDumpDefaultHandler;
 	}
 
-	InitSymbolInfo();
+	if (!InitSymbolInfo())
+		return;
 
 	MakeStackTrace(eip,esp,ebp, 0,  callback);
 }
@@ -111,27 +105,24 @@ void StackDumpFromContext(DWORD eip,DWORD esp,DWORD ebp, void (*callback)(const
 //*****************************************************************************
 BOOL InitSymbolInfo()
 {
-	if (gsInit == TRUE) 
+	if (DbgHelpLoader::isLoaded())
 		return TRUE;
 
-	gsInit = TRUE;
-
-	atexit(UninitSymbolInfo);
-
-	// See if we have the line from address function
-	// We use GetProcAddress to stop link failures at dll loadup
-	HINSTANCE hInstDebugHlp = GetModuleHandle("dbghelp.dll");
+	if (DbgHelpLoader::isFailed())
+		return FALSE;
 
-	gsSymGetLineFromAddr = (BOOL (__stdcall *)(	IN  HANDLE,IN  DWORD,OUT PDWORD,OUT PIMAGEHLP_LINE))
-							GetProcAddress(hInstDebugHlp , "SymGetLineFromAddr");
+	if (!DbgHelpLoader::load())
+	{
+		atexit(DbgHelpLoader::unload);
+		return FALSE;
+	}
 
 	char pathname[_MAX_PATH+1];
 	char drive[10];
 	char directory[_MAX_PATH+1];
 	HANDLE process;
 
-
-	::SymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_UNDNAME | SYMOPT_LOAD_LINES | SYMOPT_OMAP_FIND_NEAREST);
+	DbgHelpLoader::symSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_UNDNAME | SYMOPT_LOAD_LINES | SYMOPT_OMAP_FIND_NEAREST);
 
 	process = GetCurrentProcess();
 
@@ -145,38 +136,23 @@ BOOL InitSymbolInfo()
 	// append the current directory to build a search path for SymInit
 	::lstrcat(pathname, ";.;");
 
-	if(::SymInitialize(process, pathname, FALSE))
+	if(DbgHelpLoader::symInitialize(process, pathname, FALSE))
 	{
 		// regenerate the name of the app
 		::GetModuleFileName(NULL, pathname, _MAX_PATH);
-		if(::SymLoadModule(process, NULL, pathname, NULL, 0, 0))
+		if(DbgHelpLoader::symLoadModule(process, NULL, pathname, NULL, 0, 0))
 		{
 				//Load any other relevant modules (ie dlls) here
+				atexit(DbgHelpLoader::unload);
 				return TRUE;
 		}
-		::SymCleanup(process);
-	}
-
-	return(FALSE);
-}
-
-
-//*****************************************************************************
-//*****************************************************************************
-void UninitSymbolInfo(void)
-{
-	if (gsInit == FALSE)
-	{
-		return;
 	}
 
-	gsInit = FALSE;
-
-	::SymCleanup(GetCurrentProcess());
+	DbgHelpLoader::unload();
+	return FALSE;
 }
 
 
-
 //*****************************************************************************
 //*****************************************************************************
 void MakeStackTrace(DWORD myeip,DWORD myesp,DWORD myebp, int skipFrames, void (*callback)(const char*))
@@ -217,14 +193,14 @@ stack_frame.AddrFrame.Offset = myebp;
 			unsigned int skip = skipFrames;
 			while (b_ret&&skip)
 			{
-					b_ret = StackWalk(      IMAGE_FILE_MACHINE_I386,
+					b_ret = DbgHelpLoader::stackWalk(      IMAGE_FILE_MACHINE_I386,
 											process,
 											thread,
 											&stack_frame,
 											NULL, //&gsContext,
 											NULL,
-											SymFunctionTableAccess,
-											SymGetModuleBase,
+											DbgHelpLoader::symFunctionTableAccess,
+											DbgHelpLoader::symGetModuleBase,
 											NULL);
 					skip--;
 			}
@@ -233,18 +209,18 @@ stack_frame.AddrFrame.Offset = myebp;
 			while(b_ret&&skip)
 			{
 
-					b_ret = StackWalk(      IMAGE_FILE_MACHINE_I386,
+					b_ret = DbgHelpLoader::stackWalk(      IMAGE_FILE_MACHINE_I386,
 											process,
 											thread,
 											&stack_frame,
 											NULL, //&gsContext,
 											NULL,
-											SymFunctionTableAccess,
-											SymGetModuleBase,
+											DbgHelpLoader::symFunctionTableAccess,
+											DbgHelpLoader::symGetModuleBase,
 											NULL);
-					
 
-					
+
+
 					if (b_ret) WriteStackLine((void *) stack_frame.AddrPC.Offset, callback);
 					skip--;
 			}
@@ -256,7 +232,9 @@ stack_frame.AddrFrame.Offset = myebp;
 //*****************************************************************************
 void GetFunctionDetails(void *pointer, char*name, char*filename, unsigned int* linenumber, unsigned int* address)
 {
-	InitSymbolInfo();
+	if (!InitSymbolInfo())
+		return;
+
 	if (name)
 	{
 		strcpy(name, "<Unknown>");
@@ -285,8 +263,8 @@ void GetFunctionDetails(void *pointer, char*name, char*filename, unsigned int* l
     psymbol->SizeOfStruct = sizeof(symbol_buffer);
     psymbol->MaxNameLength = 512;
 
-    if (SymGetSymFromAddr(process, (DWORD) pointer, &displacement, psymbol))
-    {
+	if (DbgHelpLoader::symGetSymFromAddr(process, (DWORD) pointer, &displacement, psymbol))
+	{
 		if (name)
 		{
 			strcpy(name, psymbol->Name);
@@ -294,32 +272,27 @@ void GetFunctionDetails(void *pointer, char*name, char*filename, unsigned int* l
 		}
 
 		// Get line now
-		if (gsSymGetLineFromAddr)
-		{
-			// Unsupported for win95/98 at least with my current dbghelp.dll
 
-			IMAGEHLP_LINE line;
-			memset(&line,0,sizeof(line));
-			line.SizeOfStruct = sizeof(line);
+		IMAGEHLP_LINE line;
+		memset(&line,0,sizeof(line));
+		line.SizeOfStruct = sizeof(line);
 
-		
-			if (gsSymGetLineFromAddr(process, (DWORD) pointer, &displacement, &line))
+		if (DbgHelpLoader::symGetLineFromAddr(process, (DWORD) pointer, &displacement, &line))
+		{
+			if (filename)
+			{
+				strcpy(filename, line.FileName);
+			}
+			if (linenumber)
 			{
-				if (filename)
-				{
-					strcpy(filename, line.FileName);
-				}
-				if (linenumber)
-				{
-					*linenumber = (unsigned int)line.LineNumber;
-				}
-				if (address)
-				{
-					*address = (unsigned int)line.Address;
-				}
-			} 					
+				*linenumber = (unsigned int)line.LineNumber;
+			}
+			if (address)
+			{
+				*address = (unsigned int)line.Address;
+			}
 		}
-    }
+	}
 }
 
 
@@ -328,11 +301,12 @@ void GetFunctionDetails(void *pointer, char*name, char*filename, unsigned int* l
 //*****************************************************************************
 void FillStackAddresses(void**addresses, unsigned int count, unsigned int skip)
 {
-	InitSymbolInfo();
+	if (!InitSymbolInfo())
+		return;
 
 	STACKFRAME	stack_frame;
 
-	
+
 	HANDLE thread = GetCurrentThread();
 	HANDLE process = GetCurrentProcess();
 
@@ -378,32 +352,32 @@ stack_frame.AddrFrame.Offset = myebp;
 		// Skip some?
 		while (stillgoing&&skip)
 		{
-			stillgoing = StackWalk(IMAGE_FILE_MACHINE_I386,
+			stillgoing = DbgHelpLoader::stackWalk(IMAGE_FILE_MACHINE_I386,
 								process,
 								thread,
 								&stack_frame,
 								NULL,	//&gsContext,
 								NULL,
-								SymFunctionTableAccess,
-								SymGetModuleBase,
+								DbgHelpLoader::symFunctionTableAccess,
+								DbgHelpLoader::symGetModuleBase,
 								NULL) != 0;
 			skip--;
 		}
 
 		while(stillgoing&&count)
 		{
-			stillgoing = StackWalk(IMAGE_FILE_MACHINE_I386,
+			stillgoing = DbgHelpLoader::stackWalk(IMAGE_FILE_MACHINE_I386,
 								process,
 								thread,
 								&stack_frame,
 								NULL, //&gsContext,
 								NULL,
-								SymFunctionTableAccess,
-								SymGetModuleBase,
+								DbgHelpLoader::symFunctionTableAccess,
+								DbgHelpLoader::symGetModuleBase,
 								NULL) != 0;
 			if (stillgoing)
 			{
-				*addresses  = (void*)stack_frame.AddrPC.Offset;				
+				*addresses  = (void*)stack_frame.AddrPC.Offset;
 				addresses++;
 				count--;
 			}
@@ -423,7 +397,7 @@ stack_frame.AddrFrame.Offset = myebp;
 	{
 		memset(addresses,NULL,count*sizeof(void*));
 	}
-*/	
+*/
 }
 
 
@@ -433,18 +407,19 @@ stack_frame.AddrFrame.Offset = myebp;
 //*****************************************************************************
 void StackDumpFromAddresses(void**addresses, unsigned int count, void (*callback)(const char *))
 {
-	if (callback == NULL) 
+	if (callback == NULL)
 	{
 		callback = StackDumpDefaultHandler;
 	}
 
-	InitSymbolInfo();
+	if (!InitSymbolInfo())
+		return;
 
 	while ((count--) && (*addresses!=NULL))
 	{
-		WriteStackLine(*addresses,callback);	
+		WriteStackLine(*addresses,callback);
 		addresses++;
-	}	
+	}
 }
 
 
@@ -466,18 +441,18 @@ void WriteStackLine(void*address, void (*callback)(const char*))
 			g_LastErrorDump.concat("\n");
 		}
 	callback(line);
-	callback("\n");
 }
 
 //*****************************************************************************
 //*****************************************************************************
 void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info )
 {
-   DEBUG_LOG(( "\n********** EXCEPTION DUMP ****************\n" ));
+	DEBUG_LOG_RAW(("\n"));
+	DEBUG_LOG(( "********** EXCEPTION DUMP ****************" ));
 	/*
 	** List of possible exceptions
 	*/
-	 g_LastErrorDump.clear(); 
+	 g_LastErrorDump.clear();
 
 	static const unsigned int _codes[] = {
 		EXCEPTION_ACCESS_VIOLATION,
@@ -530,30 +505,30 @@ void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info )
 		"Error code: ?????\nDescription: Unknown exception."
 	};
 
-	DEBUG_LOG( ("Dump exception info\n") );
+	DEBUG_LOG( ("Dump exception info") );
 	CONTEXT *context = e_info->ContextRecord;
 	/*
 	** The following are set for access violation only
 	*/
 	int access_read_write=-1;
 	unsigned long access_address = 0;
-	AsciiString msg; 
+	AsciiString msg;
 
 // DOUBLE_DEBUG does a DEBUG_LOG, and concats to g_LastErrorDump.  jba.
 #define DOUBLE_DEBUG(x) { msg.format x; g_LastErrorDump.concat(msg); DEBUG_LOG( x ); }
 
 	if ( e_info->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION )
 	{
-		DOUBLE_DEBUG (("Exception is access violation\n"));
+		DOUBLE_DEBUG (("Exception is access violation"));
 		access_read_write = e_info->ExceptionRecord->ExceptionInformation[0];  // 0=read, 1=write
 		access_address = e_info->ExceptionRecord->ExceptionInformation[1];
 	}
 	else
 	{
-		DOUBLE_DEBUG (("Exception code is %x\n", e_info->ExceptionRecord->ExceptionCode));
+		DOUBLE_DEBUG (("Exception code is %x", e_info->ExceptionRecord->ExceptionCode));
 	}
 	Int *winMainAddr = (Int *)WinMain;
-	DOUBLE_DEBUG(("WinMain at %x\n", winMainAddr));
+	DOUBLE_DEBUG(("WinMain at %x", winMainAddr));
 	/*
 	** Match the exception type with the error string and print it out
 	*/
@@ -562,46 +537,46 @@ void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info )
 	{
 		if ( _codes[i] == e_info->ExceptionRecord->ExceptionCode )
 		{
-			DEBUG_LOG ( ("Found exception description\n") );
+			DEBUG_LOG ( ("Found exception description") );
 			break;
 		}
 	}
-	DOUBLE_DEBUG( ("%s\n", _code_txt[i]));
+	DOUBLE_DEBUG( ("%s", _code_txt[i]));
 	/** For access violations, print out the violation address and if it was read or write.
 	*/
 	if ( e_info->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION )
 	{
 		if ( access_read_write )
 		{
-			DOUBLE_DEBUG( ("Access address:%08X was written to.\n", access_address));
+			DOUBLE_DEBUG( ("Access address:%08X was written to.", access_address));
 		}
 		else
 		{
-			DOUBLE_DEBUG( ("Access address:%08X was read from.\n", access_address));
+			DOUBLE_DEBUG( ("Access address:%08X was read from.", access_address));
 		}
 	}
 
-	DOUBLE_DEBUG (("\nStack Dump:\n"));
+	DOUBLE_DEBUG (("\nStack Dump:"));
 	StackDumpFromContext(context->Eip, context->Esp, context->Ebp, NULL);
 
-	DOUBLE_DEBUG (("\nDetails:\n"));
+	DOUBLE_DEBUG (("\nDetails:"));
 
-	DOUBLE_DEBUG (("Register dump...\n"));
+	DOUBLE_DEBUG (("Register dump..."));
 
 	/*
 	** Dump the registers.
 	*/
-	DOUBLE_DEBUG ( ( "Eip:%08X\tEsp:%08X\tEbp:%08X\n", context->Eip, context->Esp, context->Ebp));
-	DOUBLE_DEBUG ( ( "Eax:%08X\tEbx:%08X\tEcx:%08X\n", context->Eax, context->Ebx, context->Ecx));
-	DOUBLE_DEBUG ( ( "Edx:%08X\tEsi:%08X\tEdi:%08X\n", context->Edx, context->Esi, context->Edi));
-	DOUBLE_DEBUG ( ( "EFlags:%08X \n", context->EFlags));
-	DOUBLE_DEBUG ( ( "CS:%04x  SS:%04x  DS:%04x  ES:%04x  FS:%04x  GS:%04x\n", context->SegCs, context->SegSs, context->SegDs, context->SegEs, context->SegFs, context->SegGs));
+	DOUBLE_DEBUG ( ( "Eip:%08X\tEsp:%08X\tEbp:%08X", context->Eip, context->Esp, context->Ebp));
+	DOUBLE_DEBUG ( ( "Eax:%08X\tEbx:%08X\tEcx:%08X", context->Eax, context->Ebx, context->Ecx));
+	DOUBLE_DEBUG ( ( "Edx:%08X\tEsi:%08X\tEdi:%08X", context->Edx, context->Esi, context->Edi));
+	DOUBLE_DEBUG ( ( "EFlags:%08X ", context->EFlags));
+	DOUBLE_DEBUG ( ( "CS:%04x  SS:%04x  DS:%04x  ES:%04x  FS:%04x  GS:%04x", context->SegCs, context->SegSs, context->SegDs, context->SegEs, context->SegFs, context->SegGs));
 
 	/*
 	** Dump the bytes at EIP. This will make it easier to match the crash address with later versions of the game.
 	*/
 	char scrap[512];
-	DOUBLE_DEBUG ( ("EIP bytes dump...\n"));
+	DOUBLE_DEBUG ( ("EIP bytes dump..."));
 	wsprintf (scrap, "\nBytes at CS:EIP (%08X)  : ", context->Eip);
 
 	unsigned char *eip_ptr = (unsigned char *) (context->Eip);
@@ -616,15 +591,15 @@ void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info )
 		else
 		{
 			sprintf (bytestr, "%02X ", *eip_ptr);
-			strcat (scrap, bytestr);
+			strlcat(scrap, bytestr, ARRAY_SIZE(scrap));
 		}
 		eip_ptr++;
 	}
 
-	strcat (scrap, "\n");
 	DOUBLE_DEBUG ( ( (scrap)));
-  DEBUG_LOG(( "********** END EXCEPTION DUMP ****************\n\n" ));
-}																									 
+	DEBUG_LOG(( "********** END EXCEPTION DUMP ****************" ));
+	DEBUG_LOG_RAW(("\n"));
+}
 
 
 #pragma pack(pop)
diff --git a/Generals/Code/GameEngine/Source/Common/System/StreamingArchiveFile.cpp b/Generals/Code/GameEngine/Source/Common/System/StreamingArchiveFile.cpp
deleted file mode 100644
index 0a3938f5df7..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/StreamingArchiveFile.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   RTS
-//
-// Module:    IO
-//
-// File name: StreamingArchiveFile.cpp
-//
-// Created:   12/06/02
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <io.h>
-#include <string.h>
-#include <sys/stat.h>
-
-#include "Common/AsciiString.h"
-#include "Common/FileSystem.h"
-#include "Common/StreamingArchiveFile.h"
-#include "Common/PerfTimer.h"
-									
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-//=================================================================
-// StreamingArchiveFile::StreamingArchiveFile
-//=================================================================
-
-StreamingArchiveFile::StreamingArchiveFile()
-: m_file(NULL), 
-	m_startingPos(0), 
-	m_size(0), 
-	m_curPos(0)
-{
-
-}
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//=================================================================
-// StreamingArchiveFile::~StreamingArchiveFile	
-//=================================================================
-
-StreamingArchiveFile::~StreamingArchiveFile()
-{
-	File::close();
-}
-
-//=================================================================
-// StreamingArchiveFile::open	
-//=================================================================
-/**
-  *	This function opens a file using the standard C open() call. Access flags
-	* are mapped to the appropriate open flags. Returns true if file was opened
-	* successfully.
-	*/
-//=================================================================
-
-//DECLARE_PERF_TIMER(StreamingArchiveFile)
-Bool StreamingArchiveFile::open( const Char *filename, Int access )
-{
-	//USE_PERF_TIMER(StreamingArchiveFile)
-	File *file = TheFileSystem->openFile( filename, access );
-
-	if ( file == NULL )
-	{
-		return FALSE;
-	}	
-
-	return (open( file ) != NULL);
-}
-
-//============================================================================
-// StreamingArchiveFile::open
-//============================================================================
-
-Bool StreamingArchiveFile::open( File *file )
-{
-	return TRUE;
-}
-
-//============================================================================
-// StreamingArchiveFile::openFromArchive
-//============================================================================
-Bool StreamingArchiveFile::openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size) 
-{
-	//USE_PERF_TIMER(StreamingArchiveFile)
-	if (archiveFile == NULL) {
-		return FALSE;
-	}
-
-	if (File::open(filename.str(), File::READ | File::BINARY | File::STREAMING) == FALSE) {
-		return FALSE;
-	}
-
-	m_file = archiveFile;
-	m_startingPos = offset;
-	m_size = size;
-	m_curPos = 0;
-
-	if (m_file->seek(offset, File::START) != offset) {
-		return FALSE;
-	}
-	
-	if (m_file->seek(size) != m_startingPos + size) {
-		return FALSE;
-	}
-
-	// We know this will succeed.
-	m_file->seek(offset, File::START);
-
-	m_nameStr = filename;
-
-	return TRUE;
-}
-
-//=================================================================
-// StreamingArchiveFile::close 	
-//=================================================================
-/**
-	* Closes the current file if it is open.
-  * Must call StreamingArchiveFile::close() for each successful StreamingArchiveFile::open() call.
-	*/
-//=================================================================
-
-void StreamingArchiveFile::close( void )
-{
-	File::close();
-}
-
-//=================================================================
-// StreamingArchiveFile::read 
-//=================================================================
-// if buffer is null, just advance the current position by 'bytes'
-Int StreamingArchiveFile::read( void *buffer, Int bytes )
-{
-	if (!m_file) {
-		return 0;
-	}
-
-	// There shouldn't be a way that this can fail, because we've already verified that the file 
-	// contains at least this many bits.
-	m_file->seek(m_startingPos + m_curPos, File::START);
-
-	if (bytes + m_curPos > m_size) 
-		bytes = m_size - m_curPos;
-
-	Int bytesRead = m_file->read(buffer, bytes);
-
-	m_curPos += bytesRead;
-
-	return bytesRead;
-}
-
-//=================================================================
-// StreamingArchiveFile::write 
-//=================================================================
-
-Int StreamingArchiveFile::write( const void *buffer, Int bytes )
-{
-	DEBUG_CRASH(("Cannot write to streaming files.\n"));
-	return -1;
-}
-
-//=================================================================
-// StreamingArchiveFile::seek 
-//=================================================================
-
-Int StreamingArchiveFile::seek( Int pos, seekMode mode)
-{
-	Int newPos;
-
-	switch( mode )
-	{
-		case START:
-			newPos = pos;
-			break;
-		case CURRENT:
-			newPos = m_curPos + pos;
-			break;
-		case END:
-			DEBUG_ASSERTCRASH(pos <= 0, ("StreamingArchiveFile::seek - position should be <= 0 for a seek starting from the end."));
-			newPos = m_size + pos;
-			break;
-		default:
-			// bad seek mode
-			return -1;
-	}
-
-	if ( newPos < 0 )
-	{
-		newPos = 0;
-	}
-	else if ( newPos > m_size )
-	{
-		newPos = m_size;
-	}
-
-	m_curPos = newPos;
-
-	return m_curPos;
-
-}
-
diff --git a/Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp b/Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp
index 93b247f8467..02c6572acaf 100644
--- a/Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp
@@ -22,18 +22,13 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: SubsystemInterface.cpp 
+// FILE: SubsystemInterface.cpp
 // ----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/SubsystemInterface.h"
 #include "Common/Xfer.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #ifdef DUMP_PERF_STATS
 #include "GameLogic/GameLogic.h"
@@ -65,7 +60,7 @@ SubsystemInterface::~SubsystemInterface()
 }
 
 #ifdef DUMP_PERF_STATS
-void SubsystemInterface::UPDATE(void) 
+void SubsystemInterface::UPDATE(void)
 {
 	__int64 startTime64;
 	__int64 endTime64,freq64;
@@ -78,7 +73,7 @@ void SubsystemInterface::UPDATE(void)
 	Real subTime = s_msConsumed - m_startTimeConsumed;
 	if (m_name.isEmpty()) return;
 	if (m_curUpdateTime > 0.00001) {
-		//DEBUG_LOG(("Subsys %s total time %.2f, subTime %.2f, net time %.2f\n", 
+		//DEBUG_LOG(("Subsys %s total time %.2f, subTime %.2f, net time %.2f",
 		//	m_name.str(), m_curUpdateTime*1000, subTime*1000, (m_curUpdateTime-subTime)*1000	));
 
 		m_curUpdateTime -= subTime;
@@ -87,8 +82,8 @@ void SubsystemInterface::UPDATE(void)
 		m_curUpdateTime = 0;
 	}
 
-}																
-void SubsystemInterface::DRAW(void) 
+}
+void SubsystemInterface::DRAW(void)
 {
 	__int64 startTime64;
 	__int64 endTime64,freq64;
@@ -101,7 +96,7 @@ void SubsystemInterface::DRAW(void)
 	Real subTime = s_msConsumed - m_startDrawTimeConsumed;
 	if (m_name.isEmpty()) return;
 	if (m_curDrawTime > 0.00001) {
-		//DEBUG_LOG(("Subsys %s total time %.2f, subTime %.2f, net time %.2f\n", 
+		//DEBUG_LOG(("Subsys %s total time %.2f, subTime %.2f, net time %.2f",
 		//	m_name.str(), m_curUpdateTime*1000, subTime*1000, (m_curUpdateTime-subTime)*1000	));
 
 		m_curDrawTime -= subTime;
@@ -138,7 +133,7 @@ void SubsystemInterfaceList::removeSubsystem(SubsystemInterface* sys)
 {
 #ifdef DUMP_PERF_STATS
 	for (SubsystemList::iterator it = m_allSubsystems.begin(); it != m_allSubsystems.end(); ++it)
-	{	 
+	{
 		if ( (*it) == sys) {
 			m_allSubsystems.erase(it);
 			break;
@@ -147,18 +142,16 @@ void SubsystemInterfaceList::removeSubsystem(SubsystemInterface* sys)
 #endif
 }
 //-----------------------------------------------------------------------------
-void SubsystemInterfaceList::initSubsystem(SubsystemInterface* sys, const char* path1, const char* path2, const char* dirpath, Xfer *pXfer, AsciiString name)
+void SubsystemInterfaceList::initSubsystem(SubsystemInterface* sys, const char* path1, const char* path2, Xfer *pXfer, AsciiString name)
 {
 	sys->setName(name);
 	sys->init();
 
 	INI ini;
 	if (path1)
-		ini.load(path1, INI_LOAD_OVERWRITE, pXfer );
+		ini.loadFileDirectory(path1, INI_LOAD_OVERWRITE, pXfer );
 	if (path2)
-		ini.load(path2, INI_LOAD_OVERWRITE, pXfer );
-	if (dirpath)
-		ini.loadDirectory(dirpath, TRUE, INI_LOAD_OVERWRITE, pXfer );
+		ini.loadFileDirectory(path2, INI_LOAD_OVERWRITE, pXfer );
 
 	m_subsystems.push_back(sys);
 }
@@ -201,7 +194,7 @@ AsciiString SubsystemInterfaceList::dumpTimesForAll()
 
 	AsciiString buffer;
 	buffer = "ALL SUBSYSTEMS:\n";
-	//buffer.format("\nSUBSYSTEMS: total time %.2f MS\n", 
+	//buffer.format("\nSUBSYSTEMS: total time %.2f MS\n",
 	//	SubsystemInterface::getTotalTime()*1000.0f);
 	Real misc = 0;
 	Real total = 0;
@@ -231,4 +224,4 @@ AsciiString SubsystemInterfaceList::dumpTimesForAll()
 	buffer.concat(tmp);
 	return buffer;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/Generals/Code/GameEngine/Source/Common/System/Trig.cpp b/Generals/Code/GameEngine/Source/Common/System/Trig.cpp
index 595d9c1bdbd..63be8eb8021 100644
--- a/Generals/Code/GameEngine/Source/Common/System/Trig.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/Trig.cpp
@@ -72,7 +72,6 @@ Real ASin(Real x)
 }
 
 #ifdef REGENERATE_TRIG_TABLES
-#include <stdio.h>
 void initTrig( void )
 {
 	static Byte inited = FALSE;
diff --git a/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp b/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp
deleted file mode 100644
index 4a448d91359..00000000000
--- a/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: UnicodeString.cpp 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  UnicodeString.cpp
-//
-// Created:    Steven Johnson, October 2001
-//
-// Desc:       General-purpose string classes
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/CriticalSection.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// -----------------------------------------------------
-
-/*static*/ UnicodeString UnicodeString::TheEmptyString;
-
-// -----------------------------------------------------
-#ifdef RTS_DEBUG
-void UnicodeString::validate() const
-{
-	if (!m_data) return;
-	DEBUG_ASSERTCRASH(m_data->m_refCount > 0, ("m_refCount is zero"));
-	DEBUG_ASSERTCRASH(m_data->m_numCharsAllocated > 0, ("m_numCharsAllocated is zero"));
-	DEBUG_ASSERTCRASH(wcslen(m_data->peek())+1 <= m_data->m_numCharsAllocated,("str is too long for storage"));
-}
-#endif
-
-// -----------------------------------------------------
-UnicodeString::UnicodeString(const UnicodeString& stringSrc) : m_data(stringSrc.m_data)
-{
-	ScopedCriticalSection scopedCriticalSection(TheUnicodeStringCriticalSection);
-	if (m_data)
-		++m_data->m_refCount;
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData, const WideChar* strToCopy, const WideChar* strToCat)
-{
-	validate();
-
-	if (m_data &&
-			m_data->m_refCount == 1 &&
-			m_data->m_numCharsAllocated >= numCharsNeeded)
-	{
-		// no buffer manhandling is needed (it's already large enough, and unique to us)
-		if (strToCopy)
-			// TheSuperHackers @fix Mauller 04/04/2025 Replace wcscpy with safer memmove as memory regions can overlap when part of string is copied to itself
-			memmove(m_data->peek(), strToCopy, (wcslen(strToCopy) + 1) * sizeof(WideChar));
-		if (strToCat)
-			wcscat(m_data->peek(), strToCat);
-		return;
-	}
-
-	DEBUG_ASSERTCRASH(numCharsNeeded <= MAX_LEN, ("UnicodeString::ensureUniqueBufferOfSize exceeds max string length %d with requested length %d", MAX_LEN, numCharsNeeded));
-	int minBytes = sizeof(UnicodeStringData) + numCharsNeeded*sizeof(WideChar);
-	int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
-	UnicodeStringData* newData = (UnicodeStringData*)TheDynamicMemoryAllocator->allocateBytesDoNotZero(actualBytes, "STR_UnicodeString::ensureUniqueBufferOfSize");
-	newData->m_refCount = 1;
-	newData->m_numCharsAllocated = (actualBytes - sizeof(UnicodeStringData))/sizeof(WideChar);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	newData->m_debugptr = newData->peek();	// just makes it easier to read in the debugger
-#endif
-
-	if (m_data && preserveData)
-		wcscpy(newData->peek(), m_data->peek());
-	else
-		newData->peek()[0] = 0;
-
-	// do these BEFORE releasing the old buffer, so that self-copies
-	// or self-cats will work correctly.
-	if (strToCopy)
-		wcscpy(newData->peek(), strToCopy);
-	if (strToCat)
-		wcscat(newData->peek(), strToCat);
-
-	releaseBuffer();
-	m_data = newData;
-
-	validate();
-}
-
-
-// -----------------------------------------------------
-void UnicodeString::releaseBuffer()
-{
-	ScopedCriticalSection scopedCriticalSection(TheUnicodeStringCriticalSection);
-
-	validate();
-	if (m_data)
-	{
-		if (--m_data->m_refCount == 0)
-		{
-			TheDynamicMemoryAllocator->freeBytes(m_data);
-		}
-		m_data = 0;
-	}
-}
-
-// -----------------------------------------------------
-UnicodeString::UnicodeString(const WideChar* s) : m_data(0)
-{
-	int len = wcslen(s);
-	if (len)
-	{
-		ensureUniqueBufferOfSize(len + 1, false, s, NULL);
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::set(const UnicodeString& stringSrc)
-{
-	ScopedCriticalSection scopedCriticalSection(TheUnicodeStringCriticalSection);
-
-	validate();
-	if (&stringSrc != this)
-	{
-		releaseBuffer();
-		m_data = stringSrc.m_data;
-		if (m_data)
-			++m_data->m_refCount;
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::set(const WideChar* s)
-{
-	validate();
-	if (!m_data || s != peek())
-	{
-		int len = s ? wcslen(s) : 0;
-		if (len)
-		{
-			ensureUniqueBufferOfSize(len + 1, false, s, NULL);
-		}
-		else
-		{
-			releaseBuffer();
-		}
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-WideChar* UnicodeString::getBufferForRead(Int len)
-{
-	validate();
-	DEBUG_ASSERTCRASH(len>0, ("No need to allocate 0 len strings."));
-	ensureUniqueBufferOfSize(len + 1, false, NULL, NULL);
-	validate();
-	return peek();
-}
-
-// -----------------------------------------------------
-void UnicodeString::translate(const AsciiString& stringSrc)
-{
-	validate();
-	/// @todo srj put in a real translation here; this will only work for 7-bit ascii
-	clear();
-	Int len = stringSrc.getLength();
-	for (Int i = 0; i < len; i++)
-		concat((WideChar)stringSrc.getCharAt(i));
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::concat(const WideChar* s)
-{
-	validate();
-	int addlen = wcslen(s);
-	if (addlen == 0)
-		return;	// my, that was easy
-
-	if (m_data)
-	{
-		ensureUniqueBufferOfSize(getLength() + addlen + 1, true, NULL, s);
-	}
-	else
-	{
-		set(s);
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::trim()
-{
-	validate();
-
-	if (m_data)
-	{
-		const WideChar *c = peek();
-
-		//	Strip leading white space from the string.
-		while (c && iswspace(*c))
-		{
-			c++;
-		}
-		if (c != peek())
-		{
-			set(c);
-		}
-
-		if (m_data) // another check, because the previous set() could erase m_data
-		{
-			//	Clip trailing white space from the string.
-			int len = wcslen(peek());
-			for (int index = len-1; index >= 0; index--)
-			{
-				if (iswspace(getCharAt(index)))
-				{
-					removeLastChar();
-				}
-				else
-				{
-					break;
-				}
-			}
-		}
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::removeLastChar()
-{
-	validate();
-	if (m_data)
-	{
-		int len = wcslen(peek());
-		if (len > 0)
-		{
-			ensureUniqueBufferOfSize(len+1, true, NULL, NULL);
-			peek()[len - 1] = 0;
-		}
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::format(UnicodeString format, ...)
-{
-	validate();
-	va_list args;
-  va_start(args, format);
-	format_va(format, args);
-  va_end(args);
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::format(const WideChar* format, ...)
-{
-	validate();
-	va_list args;
-  va_start(args, format);
-	format_va(format, args);
-  va_end(args);
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::format_va(const UnicodeString& format, va_list args)
-{
-	format_va(format.str(), args);
-}
-
-// -----------------------------------------------------
-void UnicodeString::format_va(const WideChar* format, va_list args)
-{
-	validate();
-	WideChar buf[MAX_FORMAT_BUF_LEN];
-	const int result = vswprintf(buf, sizeof(buf)/sizeof(WideChar), format, args);
-	if (result >= 0)
-	{
-		set(buf);
-		validate();
-	}
-	else
-	{
-		DEBUG_CRASH(("UnicodeString::format_va failed with code:%d", result));
-	}
-}
-
-//-----------------------------------------------------------------------------
-Bool UnicodeString::nextToken(UnicodeString* tok, UnicodeString delimiters)
-{
-	if (this->isEmpty() || tok == this)
-		return false;
-
-	if (delimiters.isEmpty())
-		delimiters = UnicodeString(L" \t\n\r");
-
-	Int offset;
-
-	offset = wcsspn(peek(), delimiters.str());
-	WideChar* start = peek() + offset;
-
-	offset = wcscspn(start, delimiters.str());
-	WideChar* end = start + offset;
-
-	if (end > start)
-	{
-		Int len = end - start;
-		WideChar* tmp = tok->getBufferForRead(len + 1);
-		memcpy(tmp, start, len*2);
-		tmp[len] = 0;
-
-		this->set(end);
-
-		return true;
-	}
-	else
-	{
-		this->clear();
-		tok->clear();
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp b/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp
index 83bb3fe742b..77f89bedf79 100644
--- a/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/Upgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_UPGRADE_TYPE_NAMES
 #define DEFINE_VETERANCY_NAMES
@@ -39,12 +39,13 @@
 #include "GameClient/Image.h"
 
 
-const char *TheUpgradeTypeNames[] = 
+const char *const TheUpgradeTypeNames[] =
 {
 	"PLAYER",
 	"OBJECT",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheUpgradeTypeNames) == NUM_UPGRADE_TYPES + 1, "Incorrect array size");
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 class UpgradeCenter *TheUpgradeCenter = NULL;
@@ -63,14 +64,14 @@ Upgrade::Upgrade( const UpgradeTemplate *upgradeTemplate )
 	m_next = NULL;
 	m_prev = NULL;
 
-}  // end Upgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Upgrade::~Upgrade( void )
 {
 
-}  // end ~Upgrade
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -78,7 +79,7 @@ Upgrade::~Upgrade( void )
 void Upgrade::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -96,7 +97,7 @@ void Upgrade::xfer( Xfer *xfer )
 	// status
 	xfer->xferUser( &m_status, sizeof( UpgradeStatusType ) );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -104,7 +105,7 @@ void Upgrade::xfer( Xfer *xfer )
 void Upgrade::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // UPGRADE TEMPLATE ///////////////////////////////////////////////////////////////////////////////
@@ -112,7 +113,7 @@ void Upgrade::loadPostProcess( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] = 
+const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] =
 {
 
 	{ "DisplayName",				INI::parseAsciiString,		NULL, offsetof( UpgradeTemplate, m_displayNameLabel ) },
@@ -120,9 +121,9 @@ const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] =
 	{ "BuildTime",					INI::parseReal,						NULL, offsetof( UpgradeTemplate, m_buildTime ) },
 	{ "BuildCost",					INI::parseInt,						NULL, offsetof( UpgradeTemplate, m_cost ) },
 	{ "ButtonImage",				INI::parseAsciiString,		NULL, offsetof( UpgradeTemplate, m_buttonImageName ) },
-	{ "ResearchSound",			INI::parseAudioEventRTS,	NULL, offsetof( UpgradeTemplate, m_researchSound ) }, 
-	{ "UnitSpecificSound",	INI::parseAudioEventRTS,	NULL, offsetof( UpgradeTemplate, m_unitSpecificSound ) }, 
-	{ NULL,						NULL,												 NULL, 0 }  // keep this last
+	{ "ResearchSound",			INI::parseAudioEventRTS,	NULL, offsetof( UpgradeTemplate, m_researchSound ) },
+	{ "UnitSpecificSound",	INI::parseAudioEventRTS,	NULL, offsetof( UpgradeTemplate, m_unitSpecificSound ) },
+	{ NULL,						NULL,												 NULL, 0 }
 
 };
 
@@ -130,10 +131,7 @@ const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] =
 //-------------------------------------------------------------------------------------------------
 UpgradeTemplate::UpgradeTemplate( void )
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_cost = 0;
-	//
 	m_type = UPGRADE_TYPE_PLAYER;
 	m_nameKey = NAMEKEY_INVALID;
 	m_buildTime = 0.0f;
@@ -141,21 +139,21 @@ UpgradeTemplate::UpgradeTemplate( void )
 	m_prev = NULL;
 	m_buttonImage = NULL;
 
-}  // end UpgradeTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 UpgradeTemplate::~UpgradeTemplate( void )
 {
 
-}  // end ~UpgradeTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Calculate the time it takes (in logic frames) for a player to build this UpgradeTemplate */
 //-------------------------------------------------------------------------------------------------
 Int UpgradeTemplate::calcTimeToBuild( Player *player ) const
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if( player->buildsInstantly() )
 	{
 		return 1;
@@ -165,7 +163,7 @@ Int UpgradeTemplate::calcTimeToBuild( Player *player ) const
 	///@todo modify this by power state of player
 	return m_buildTime * LOGICFRAMES_PER_SECOND;
 
-}  // end calcTimeToBuild
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Calculate the cost takes this player to build this upgrade */
@@ -176,7 +174,7 @@ Int UpgradeTemplate::calcCostToBuild( Player *player ) const
 	///@todo modify this by any player handicaps
 	return m_cost;
 
-}  // end calcCostToBuild
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -228,13 +226,13 @@ UpgradeCenter::UpgradeCenter( void )
 	m_nextTemplateMaskBit = 0;
 	buttonImagesCached = FALSE;
 
-}  // end UpgradeCenter
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 UpgradeCenter::~UpgradeCenter( void )
 {
-	
+
 	// delete all the upgrades loaded from the INI database
 	UpgradeTemplate *next;
 	while( m_upgradeList )
@@ -249,9 +247,9 @@ UpgradeCenter::~UpgradeCenter( void )
 		// set head to next element
 		m_upgradeList = next;
 
-	}  // end while
+	}
 
-}  // end ~UpgradeCenter
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Upgrade center initialization */
@@ -259,7 +257,7 @@ UpgradeCenter::~UpgradeCenter( void )
 void UpgradeCenter::init( void )
 {
 	UpgradeTemplate* up;
-	
+
 	// name will be overridden by friend_makeVeterancyUpgrade
 
 // no, there ISN'T an upgrade for this one...
@@ -294,7 +292,7 @@ void UpgradeCenter::reset( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Find upgrade matching name key */
+/** Find upgrade by veterancy level */
 //-------------------------------------------------------------------------------------------------
 const UpgradeTemplate *UpgradeCenter::findVeterancyUpgrade( VeterancyLevel level ) const
 {
@@ -303,7 +301,7 @@ const UpgradeTemplate *UpgradeCenter::findVeterancyUpgrade( VeterancyLevel level
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Find upgrade matching name key */
+/** Find upgrade by name key */
 //-------------------------------------------------------------------------------------------------
 UpgradeTemplate *UpgradeCenter::findNonConstUpgradeByKey( NameKeyType key )
 {
@@ -324,13 +322,13 @@ UpgradeTemplate *UpgradeCenter::findNonConstUpgradeByKey( NameKeyType key )
 // ------------------------------------------------------------------------------------------------
 UpgradeTemplate *UpgradeCenter::firstUpgradeTemplate( void )
 {
-	
+
 	return m_upgradeList;
 
-}  // end firstUpgradeTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Find upgrade matching name key */
+/** Find upgrade by name key */
 //-------------------------------------------------------------------------------------------------
 const UpgradeTemplate *UpgradeCenter::findUpgradeByKey( NameKeyType key ) const
 {
@@ -346,14 +344,20 @@ const UpgradeTemplate *UpgradeCenter::findUpgradeByKey( NameKeyType key ) const
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Find upgrade matching name */
+/** Find upgrade by name */
 //-------------------------------------------------------------------------------------------------
 const UpgradeTemplate *UpgradeCenter::findUpgrade( const AsciiString& name ) const
 {
-
 	return findUpgradeByKey( TheNameKeyGenerator->nameToKey( name ) );
+}
 
-}  // end findUpgrade
+//-------------------------------------------------------------------------------------------------
+/** Find upgrade by name */
+//-------------------------------------------------------------------------------------------------
+const UpgradeTemplate *UpgradeCenter::findUpgrade( const char* name ) const
+{
+	return findUpgradeByKey( TheNameKeyGenerator->nameToKey( name ) );
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Allocate a new upgrade template */
@@ -386,7 +390,7 @@ UpgradeTemplate *UpgradeCenter::newUpgrade( const AsciiString& name )
 	// return new upgrade
 	return newUpgrade;
 
-}  // end newUnlinkedUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Link an upgrade to our list */
@@ -405,7 +409,7 @@ void UpgradeCenter::linkUpgrade( UpgradeTemplate *upgrade )
 		m_upgradeList->friend_setPrev( upgrade );
 	m_upgradeList = upgrade;
 
-}  // end linkUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Unlink an upgrade from our list */
@@ -424,14 +428,14 @@ void UpgradeCenter::unlinkUpgrade( UpgradeTemplate *upgrade )
 	else
 		m_upgradeList = upgrade->friend_getNext();
 
-}  // end unlinkUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** does this player have all the necessary things to make this upgrade */
 //-------------------------------------------------------------------------------------------------
 Bool UpgradeCenter::canAffordUpgrade( Player *player, const UpgradeTemplate *upgradeTemplate, Bool displayReason ) const
 {
- 
+
 	// sanity
 	if( player == NULL || upgradeTemplate == NULL )
 		return FALSE;
@@ -452,7 +456,7 @@ Bool UpgradeCenter::canAffordUpgrade( Player *player, const UpgradeTemplate *upg
 
 	return TRUE;  // all is well
 
-}  // end canAffordUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** generate a list of upgrade names for WorldBuilder */
@@ -466,7 +470,7 @@ std::vector<AsciiString> UpgradeCenter::getUpgradeNames( void ) const
 
 	return upgradeNames;
 
-}  // end getUpgradeNames
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an upgrade definition */
@@ -474,8 +478,7 @@ std::vector<AsciiString> UpgradeCenter::getUpgradeNames( void ) const
 void UpgradeCenter::parseUpgradeDefinition( INI *ini )
 {
 	// read the name
-	const char* c = ini->getNextToken();
-	AsciiString name = c;	
+	const char* name = ini->getNextToken();
 
 	// find existing item if present
 	UpgradeTemplate* upgrade = TheUpgradeCenter->findNonConstUpgradeByKey( NAMEKEY(name) );
@@ -485,10 +488,10 @@ void UpgradeCenter::parseUpgradeDefinition( INI *ini )
 		// allocate a new item
 		upgrade = TheUpgradeCenter->newUpgrade( name );
 
-	}  // end if
+	}
 
 	// sanity
-	DEBUG_ASSERTCRASH( upgrade, ("parseUpgradeDefinition: Unable to allocate upgrade '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( upgrade, ("parseUpgradeDefinition: Unable to allocate upgrade '%s'", name) );
 
 	// parse the ini definition
 	ini->initFromINI( upgrade, upgrade->getFieldParse() );
diff --git a/Generals/Code/GameEngine/Source/Common/System/encrypt.cpp b/Generals/Code/GameEngine/Source/Common/System/encrypt.cpp
index 890d8c79c36..f2a8360d895 100644
--- a/Generals/Code/GameEngine/Source/Common/System/encrypt.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/encrypt.cpp
@@ -26,10 +26,8 @@
 // Ancient Westwood Online password encryption (obfuscation?) code
 // Author: Anonymous
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
-#include <stdio.h>
-#include <string.h>
 #include "Common/encrypt.h"
 
 #define MAX_CHARS 65
diff --git a/Generals/Code/GameEngine/Source/Common/System/registry.cpp b/Generals/Code/GameEngine/Source/Common/System/registry.cpp
index c475d9ddfa4..df4ab5f2ef0 100644
--- a/Generals/Code/GameEngine/Source/Common/System/registry.cpp
+++ b/Generals/Code/GameEngine/Source/Common/System/registry.cpp
@@ -26,15 +26,10 @@
 // Simple interface for storing/retreiving registry values
 // Author: Matthew D. Campbell, December 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Registry.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 Bool  getStringFromRegistry(HKEY root, AsciiString path, AsciiString key, AsciiString& val)
 {
@@ -125,7 +120,7 @@ Bool GetStringFromRegistry(AsciiString path, AsciiString key, AsciiString& val)
 	AsciiString fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Generals";
 
 	fullPath.concat(path);
-	DEBUG_LOG(("GetStringFromRegistry - looking in %s for key %s\n", fullPath.str(), key.str()));
+	DEBUG_LOG(("GetStringFromRegistry - looking in %s for key %s", fullPath.str(), key.str()));
 	if (getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val))
 	{
 		return TRUE;
@@ -139,7 +134,7 @@ Bool GetUnsignedIntFromRegistry(AsciiString path, AsciiString key, UnsignedInt&
 	AsciiString fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Generals";
 
 	fullPath.concat(path);
-	DEBUG_LOG(("GetUnsignedIntFromRegistry - looking in %s for key %s\n", fullPath.str(), key.str()));
+	DEBUG_LOG(("GetUnsignedIntFromRegistry - looking in %s for key %s", fullPath.str(), key.str()));
 	if (getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val))
 	{
 		return TRUE;
diff --git a/Generals/Code/GameEngine/Source/Common/TerrainTypes.cpp b/Generals/Code/GameEngine/Source/Common/TerrainTypes.cpp
index 45b628c05b8..796f2fcc90b 100644
--- a/Generals/Code/GameEngine/Source/Common/TerrainTypes.cpp
+++ b/Generals/Code/GameEngine/Source/Common/TerrainTypes.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_TERRAIN_TYPE_NAMES
 
@@ -39,7 +39,7 @@
 TerrainTypeCollection *TheTerrainTypes = NULL;
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-const FieldParse TerrainType::m_terrainTypeFieldParseTable[] = 
+const FieldParse TerrainType::m_terrainTypeFieldParseTable[] =
 {
 
 	{ "Texture",		INI::parseAsciiString,			NULL,		offsetof( TerrainType, m_texture ) },
@@ -63,14 +63,14 @@ TerrainType::TerrainType( void )
 	m_restrictConstruction = FALSE;
 	m_next = NULL;
 
-}  // end TerrainType
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 TerrainType::~TerrainType( void )
 {
 
-}  // end ~TerrainType
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -83,7 +83,7 @@ TerrainTypeCollection::TerrainTypeCollection( void )
 
 	m_terrainList = NULL;
 
-}  // end TerrainTypeCollection
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -104,9 +104,9 @@ TerrainTypeCollection::~TerrainTypeCollection( void )
 		// set the new head of the type list
 		m_terrainList = temp;
 
-	}  // end while
+	}
 
-}  // end ~TerrainTypeCollection
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Find a terrain type given the name */
@@ -121,12 +121,12 @@ TerrainType *TerrainTypeCollection::findTerrain( AsciiString name )
 		if( terrain->getName() == name )
 			return terrain;
 
-	}  // end for terrain
+	}
 
 	// not found
 	return NULL;
 
-}  // end findTerrain
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Allocate a new type, assign the name, and tie to type list */
@@ -139,7 +139,7 @@ TerrainType *TerrainTypeCollection::newTerrain( AsciiString name )
 	terrain = newInstance(TerrainType);
 
 	// copy default values from the default terrain entry
-	TerrainType *defaultTerrain = findTerrain( AsciiString( "DefaultTerrain" ) );
+	TerrainType *defaultTerrain = findTerrain( "DefaultTerrain" );
 	if( defaultTerrain )
 		*terrain = *defaultTerrain;
 /*
@@ -148,8 +148,8 @@ TerrainType *TerrainTypeCollection::newTerrain( AsciiString name )
 		terrain->friend_setTexture( defaultTerrain->getTexture() );
 		terrain->friend_setClass( defaultTerrain->getClass() );
 		terrain->friend_setBlendEdge( defaultTerrain->isBlendEdge() );
-			
-	}  // end if
+
+	}
 */
 
 	// assign a name
@@ -158,8 +158,8 @@ TerrainType *TerrainTypeCollection::newTerrain( AsciiString name )
 	// tie to list
 	terrain->friend_setNext( m_terrainList );
 	m_terrainList = terrain;
-			
+
 	// return the new terrain
 	return terrain;
 
-}  // end newTerrain
+}
diff --git a/Generals/Code/GameEngine/Source/Common/Thing/DrawModule.cpp b/Generals/Code/GameEngine/Source/Common/Thing/DrawModule.cpp
index 6483d7865be..d0a99381086 100644
--- a/Generals/Code/GameEngine/Source/Common/Thing/DrawModule.cpp
+++ b/Generals/Code/GameEngine/Source/Common/Thing/DrawModule.cpp
@@ -42,10 +42,10 @@ void DrawModule::crc( Xfer *xfer )
 	// extend base class
 	DrawableModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Xfer method	
+/** Xfer method
 	* Version Info;
 	* 1: Initial version */
 // ------------------------------------------------------------------------------------------------
@@ -60,7 +60,7 @@ void DrawModule::xfer( Xfer *xfer )
 	// extend base class
 	DrawableModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -71,5 +71,5 @@ void DrawModule::loadPostProcess( void )
 	// extend base class
 	DrawableModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/Common/Thing/Module.cpp b/Generals/Code/GameEngine/Source/Common/Thing/Module.cpp
index 34ef9d96f61..2b421987582 100644
--- a/Generals/Code/GameEngine/Source/Common/Thing/Module.cpp
+++ b/Generals/Code/GameEngine/Source/Common/Thing/Module.cpp
@@ -47,11 +47,6 @@
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameLogic/Module/UpgradeModule.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -61,8 +56,8 @@
 //-------------------------------------------------------------------------------------------------
 // this method should NEVER be overridden by user code, only via the MAKE_STANDARD_MODULE_xxx macros!
 // it should also NEVER be called directly; it's only for use by ModuleFactory!
-/*static*/ ModuleData* Module::friend_newModuleData(INI* ini) 
-{ 
+/*static*/ ModuleData* Module::friend_newModuleData(INI* ini)
+{
 	ModuleData* data = MSGNEW("Module::friend_newModuleData") ModuleData;	// no need to memorypool these since we never allocate more than one of each
 	if (ini)
 		ini->initFromINI(data, 0);	// this is just so that an "end" token is required
@@ -74,7 +69,7 @@
 Module::~Module()
 {
 
-}  // end ~Module
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -82,7 +77,7 @@ Module::~Module()
 void Module::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -97,7 +92,7 @@ void Module::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** load post process */
@@ -105,30 +100,30 @@ void Module::xfer( Xfer *xfer )
 void Module::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ObjectModule::ObjectModule( Thing *thing, const ModuleData* moduleData ) : Module(moduleData)
-{ 
+{
 	if (!moduleData)
 	{
-		DEBUG_CRASH(("module data may not be null\n"));
+		DEBUG_CRASH(("module data may not be null"));
 		throw INI_INVALID_DATA;
 	}
 
-	DEBUG_ASSERTCRASH( thing, ("Thing passed to ObjectModule is NULL!\n") );
+	DEBUG_ASSERTCRASH( thing, ("Thing passed to ObjectModule is NULL!") );
 	m_object = AsObject(thing);
-	DEBUG_ASSERTCRASH( m_object, ("Thing passed to ObjectModule is not an Object!\n") );
+	DEBUG_ASSERTCRASH( m_object, ("Thing passed to ObjectModule is not an Object!") );
 
-}  // end ObjectModule
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ObjectModule::~ObjectModule( void )
 {
 
-}  // end ~ObjectModule
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -139,7 +134,7 @@ void ObjectModule::crc( Xfer *xfer )
 	// extend base class
 	Module::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -157,7 +152,7 @@ void ObjectModule::xfer( Xfer *xfer )
 	// extend base class
 	Module::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** load post process */
@@ -168,30 +163,30 @@ void ObjectModule::loadPostProcess( void )
 	// extend base class
 	Module::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 DrawableModule::DrawableModule( Thing *thing, const ModuleData* moduleData ) : Module(moduleData)
-{ 
+{
 	if (!moduleData)
 	{
-		DEBUG_CRASH(("module data may not be null\n"));
+		DEBUG_CRASH(("module data may not be null"));
 		throw INI_INVALID_DATA;
 	}
 
-	DEBUG_ASSERTCRASH( thing, ("Thing passed to DrawableModule is NULL!\n") );
+	DEBUG_ASSERTCRASH( thing, ("Thing passed to DrawableModule is NULL!") );
 	m_drawable = AsDrawable(thing);
-	DEBUG_ASSERTCRASH( m_drawable, ("Thing passed to DrawableModule is not a Drawable!\n") );
+	DEBUG_ASSERTCRASH( m_drawable, ("Thing passed to DrawableModule is not a Drawable!") );
 
-}  // end ~DrawableModule
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 DrawableModule::~DrawableModule( void )
 {
 
-}  // end ~DrawableModule
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -202,7 +197,7 @@ void DrawableModule::crc( Xfer *xfer )
 	// extend base class
 	Module::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -220,7 +215,7 @@ void DrawableModule::xfer( Xfer *xfer )
 	// extend base class
 	Module::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** load post process */
@@ -231,7 +226,7 @@ void DrawableModule::loadPostProcess( void )
 	// extend base class
 	Module::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -254,16 +249,16 @@ void UpgradeMuxData::getUpgradeActivationMasks(UpgradeMaskType& activation, Upgr
 	{
 		m_activationMask.clear();
 		m_conflictingMask.clear();
-		
+
 		std::vector<AsciiString>::const_iterator it;
 		for( it = m_activationUpgradeNames.begin();
 					it != m_activationUpgradeNames.end();
 					it++)
 		{
 			const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );
-			if( !theTemplate && !it->isEmpty() && !it->isNone())
+			if( !theTemplate )
 			{
-				DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));
+				DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));
 				throw INI_INVALID_DATA;
 			}
 
@@ -275,11 +270,12 @@ void UpgradeMuxData::getUpgradeActivationMasks(UpgradeMaskType& activation, Upgr
 					it++)
 		{
 			const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );
-			if( !theTemplate && !it->isEmpty() && !it->isNone())
+			if( !theTemplate )
 			{
-				DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));
+				DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));
 				throw INI_INVALID_DATA;
 			}
+
 			m_conflictingMask.set( theTemplate->getUpgradeMask() );
 		}
 
diff --git a/Generals/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp b/Generals/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp
index 5402d019f61..55a6abb1df4 100644
--- a/Generals/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp
+++ b/Generals/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp
@@ -27,7 +27,7 @@
 // Desc:	 TheModuleFactory is where we actually instance modules for objects
 //				 and drawbles.  Those modules are things such as an UpdateModule
 //			   or DamageModule or DrawModule etc.
-//	
+//
 //				 TheModuleFactory will contain a list of ModuleTemplates, when we
 //				 request a new module, we will look for that template in our
 //				 list and create it
@@ -35,7 +35,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Module.h"
 #include "Common/ModuleFactory.h"
@@ -100,7 +100,7 @@
 #include "GameLogic/Module/BoneFXUpdate.h"
 #include "GameLogic/Module/ChinookAIUpdate.h"
 #include "GameLogic/Module/DefaultProductionExitUpdate.h"
-#include "GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h" 
+#include "GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h"
 #include "GameLogic/Module/DeletionUpdate.h"
 #include "GameLogic/Module/DeliverPayloadAIUpdate.h"
 #include "GameLogic/Module/DozerAIUpdate.h"
@@ -193,7 +193,6 @@
 #include "GameLogic/Module/UnpauseSpecialPowerUpgrade.h"
 #include "GameLogic/Module/WeaponBonusUpgrade.h"
 #include "GameLogic/Module/WeaponSetUpgrade.h"
-#include "GameLogic/Module/WeaponBonusUpgrade.h"
 #include "GameLogic/Module/CostModifierUpgrade.h"
 #include "GameLogic/Module/ExperienceScalarUpgrade.h"
 #include "GameLogic/Module/MaxHealthUpgrade.h"
@@ -259,11 +258,6 @@ ModuleFactory *TheModuleFactory = NULL;  ///< the module factory singleton
 
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -271,7 +265,7 @@ ModuleFactory::ModuleFactory( void )
 {
 	m_moduleTemplateMap.clear();
 	m_moduleDataList.clear();
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -509,7 +503,7 @@ void ModuleFactory::init( void )
 	addModule( SwayClientUpdate );
 	addModule( BeaconClientUpdate );
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 Int ModuleFactory::findModuleInterfaceMask(const AsciiString& name, ModuleType type)
@@ -562,9 +556,9 @@ const ModuleFactory::ModuleTemplate* ModuleFactory::findModuleTemplate(const Asc
 	NameKeyType namekey = makeDecoratedNameKey(name, type);
 
   ModuleTemplateMap::const_iterator it = m_moduleTemplateMap.find(namekey);
-  if (it == m_moduleTemplateMap.end()) 
+  if (it == m_moduleTemplateMap.end())
 	{
-		DEBUG_CRASH(( "Module name '%s' not found\n", name.str() ));
+		DEBUG_CRASH(( "Module name '%s' not found", name.str() ));
 		return NULL;
 	}
 	else
@@ -581,7 +575,7 @@ Module *ModuleFactory::newModule( Thing *thing, const AsciiString& name, const M
 	// sanity
 	if( name.isEmpty() )
 	{
-		DEBUG_CRASH(("attempting to create module with empty name\n"));
+		DEBUG_CRASH(("attempting to create module with empty name"));
 		return NULL;
 	}
 	const ModuleTemplate* mt = findModuleTemplate(name, type);
@@ -595,35 +589,35 @@ Module *ModuleFactory::newModule( Thing *thing, const AsciiString& name, const M
 			BehaviorModule* bm = (BehaviorModule*)mod;
 
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_BODY)) != 0) == (bm->getBody() != NULL), 
-				("getInterfaceMask bad for MODULE_BODY (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_BODY)) != 0) == (bm->getBody() != NULL),
+				("getInterfaceMask bad for MODULE_BODY (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_COLLIDE)) != 0) == (bm->getCollide() != NULL), 
-				("getInterfaceMask bad for MODULE_COLLIDE (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_COLLIDE)) != 0) == (bm->getCollide() != NULL),
+				("getInterfaceMask bad for MODULE_COLLIDE (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_CONTAIN)) != 0) == (bm->getContain() != NULL), 
-				("getInterfaceMask bad for MODULE_CONTAIN (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_CONTAIN)) != 0) == (bm->getContain() != NULL),
+				("getInterfaceMask bad for MODULE_CONTAIN (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_CREATE)) != 0) == (bm->getCreate() != NULL), 
-				("getInterfaceMask bad for MODULE_CREATE (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_CREATE)) != 0) == (bm->getCreate() != NULL),
+				("getInterfaceMask bad for MODULE_CREATE (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_DAMAGE)) != 0) == (bm->getDamage() != NULL), 
-				("getInterfaceMask bad for MODULE_DAMAGE (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_DAMAGE)) != 0) == (bm->getDamage() != NULL),
+				("getInterfaceMask bad for MODULE_DAMAGE (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_DESTROY)) != 0) == (bm->getDestroy() != NULL), 
-				("getInterfaceMask bad for MODULE_DESTROY (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_DESTROY)) != 0) == (bm->getDestroy() != NULL),
+				("getInterfaceMask bad for MODULE_DESTROY (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_DIE)) != 0) == (bm->getDie() != NULL), 
-				("getInterfaceMask bad for MODULE_DIE (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_DIE)) != 0) == (bm->getDie() != NULL),
+				("getInterfaceMask bad for MODULE_DIE (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_SPECIAL_POWER)) != 0) == (bm->getSpecialPower() != NULL), 
-				("getInterfaceMask bad for MODULE_SPECIAL_POWER (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_SPECIAL_POWER)) != 0) == (bm->getSpecialPower() != NULL),
+				("getInterfaceMask bad for MODULE_SPECIAL_POWER (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_UPDATE)) != 0) == (bm->getUpdate() != NULL), 
-				("getInterfaceMask bad for MODULE_UPDATE (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_UPDATE)) != 0) == (bm->getUpdate() != NULL),
+				("getInterfaceMask bad for MODULE_UPDATE (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_UPGRADE)) != 0) == (bm->getUpgrade() != NULL), 
-				("getInterfaceMask bad for MODULE_UPGRADE (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_UPGRADE)) != 0) == (bm->getUpgrade() != NULL),
+				("getInterfaceMask bad for MODULE_UPGRADE (%s)",name.str()));
 		}
 #endif
 
@@ -632,7 +626,7 @@ Module *ModuleFactory::newModule( Thing *thing, const AsciiString& name, const M
 
 	return NULL;
 
-}  // end newModule
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Add a module template to our list of templates */
diff --git a/Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp b/Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp
index 2ea011e3841..f99aeecf5e7 100644
--- a/Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp
+++ b/Generals/Code/GameEngine/Source/Common/Thing/Thing.cpp
@@ -32,7 +32,7 @@
 //						"Things"
 //
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 #include "Common/Thing.h"
@@ -46,33 +46,33 @@
 #include "Lib/trig.h"
 #include "GameLogic/TerrainLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+
+static constexpr const Real InitialThingPosX = 0.0f;
+static constexpr const Real InitialThingPosY = 0.0f;
 
 //=============================================================================
 /** Constructor */
 //=============================================================================
-Thing::Thing( const ThingTemplate *thingTemplate ) 
+Thing::Thing( const ThingTemplate *thingTemplate )
 {
 	// sanity
 	if( thingTemplate == NULL )
 	{
-	
+
 		// cannot create thing without template
 		DEBUG_CRASH(( "no template" ));
 		return;
 
-	}  // end if
-		
+	}
+
 	m_template = thingTemplate;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	m_templateName = thingTemplate->getName();
 #endif
 	m_transform.Make_Identity();
-	m_cachedPos.zero();
+	m_cachedPos.x = InitialThingPosX;
+	m_cachedPos.y = InitialThingPosY;
+	m_cachedPos.z = 0.0f;
 	m_cachedAngle = 0.0f;
 	m_cachedDirVector.zero();
 	m_cachedAltitudeAboveTerrain = 0;
@@ -96,6 +96,12 @@ const ThingTemplate *Thing::getTemplate() const
 	return m_template;
 }
 
+//=============================================================================
+Bool Thing::isPositioned() const
+{
+	return m_cachedPos.x != InitialThingPosX || m_cachedPos.y != InitialThingPosY;
+}
+
 //=============================================================================
 const Coord3D* Thing::getUnitDirectionVector2D() const
 {
@@ -156,13 +162,13 @@ void Thing::setPositionZ( Real z )
 	else
 	{
 		Matrix3D mtx;
-		const Bool stickToGround = true;	// yes, set the "z" pos		
+		const Bool stickToGround = true;	// yes, set the "z" pos
 		Coord3D pos = m_cachedPos;
 		pos.z = z;
 		TheTerrainLogic->alignOnTerrain(getOrientation(), pos, stickToGround, mtx );
 		setTransformMatrix(&mtx);
 	}
-	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'\n", m_template->getName().str() ));
+	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'", m_template->getName().str() ));
 }
 
 //=============================================================================
@@ -175,7 +181,7 @@ void Thing::setPosition( const Coord3D *pos )
 		Coord3D oldPos = m_cachedPos;
 		Matrix3D oldMtx = m_transform;
 
-		//DEBUG_ASSERTCRASH(!(_isnan(pos->x) || _isnan(pos->y) || _isnan(pos->z)), ("Drawable/Object position NAN! '%s'\n", m_template->getName().str() ));
+		//DEBUG_ASSERTCRASH(!(_isnan(pos->x) || _isnan(pos->y) || _isnan(pos->z)), ("Drawable/Object position NAN! '%s'", m_template->getName().str() ));
 		m_transform.Set_X_Translation( pos->x );
 		m_transform.Set_Y_Translation( pos->y );
 		m_transform.Set_Z_Translation( pos->z );
@@ -187,11 +193,11 @@ void Thing::setPosition( const Coord3D *pos )
 	else
 	{
 		Matrix3D mtx;
-		const Bool stickToGround = true;	// yes, set the "z" pos				
+		const Bool stickToGround = true;	// yes, set the "z" pos
 		TheTerrainLogic->alignOnTerrain(getOrientation(), *pos, stickToGround, mtx );
 		setTransformMatrix(&mtx);
 	}
-	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'\n", m_template->getName().str() ));
+	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'", m_template->getName().str() ));
 }
 
 //=============================================================================
@@ -214,7 +220,7 @@ void Thing::setOrientation( Real angle )
 	if( m_template->isKindOf( KINDOF_STICK_TO_TERRAIN_SLOPE) )
 	{
 		Matrix3D mtx;
-		const Bool stickToGround = true;	// yes, set the "z" pos				
+		const Bool stickToGround = true;	// yes, set the "z" pos
 		TheTerrainLogic->alignOnTerrain(angle, pos, stickToGround, m_transform );
 	}
 	else
@@ -235,13 +241,13 @@ void Thing::setOrientation( Real angle )
 											x.z, y.z, z.z, pos.z );
 	}
 
-	//DEBUG_ASSERTCRASH(-PI <= angle && angle <= PI, ("Please pass only normalized (-PI..PI) angles to setOrientation (%f).\n", angle));
+	//DEBUG_ASSERTCRASH(-PI <= angle && angle <= PI, ("Please pass only normalized (-PI..PI) angles to setOrientation (%f).", angle));
 	m_cachedAngle = normalizeAngle(angle);
 	m_cachedPos = pos;
 	m_cacheFlags &= ~VALID_DIRVECTOR;	// but don't clear the altitude flags.
 
 	reactToTransformChange(&oldMtx, &oldPos, oldAngle);
-	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'\n", m_template->getName().str() ));
+	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'", m_template->getName().str() ));
 }
 
 //=============================================================================
@@ -262,19 +268,19 @@ void Thing::setTransformMatrix( const Matrix3D *mx )
 	m_cacheFlags = 0;
 
 	reactToTransformChange(&oldMtx, &oldPos, oldAngle);
-	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'\n", m_template->getName().str() ));
+	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'", m_template->getName().str() ));
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool Thing::isKindOf(KindOfType t) const 
-{ 
-	return getTemplate()->isKindOf(t); 
+Bool Thing::isKindOf(KindOfType t) const
+{
+	return getTemplate()->isKindOf(t);
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool Thing::isKindOfMulti(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) const 
-{ 
-	return getTemplate()->isKindOfMulti(mustBeSet, mustBeClear); 
+Bool Thing::isKindOfMulti(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) const
+{
+	return getTemplate()->isKindOfMulti(mustBeSet, mustBeClear);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -284,7 +290,7 @@ Bool Thing::isAnyKindOf( const KindOfMaskType& anyKindOf ) const
 }
 
 // ------------------------------------------------------------------------------------------------
-Real Thing::calculateHeightAboveTerrain() const 
+Real Thing::calculateHeightAboveTerrain() const
 {
 	//USE_PERF_TIMER(ThingMatrixStuff)
 	const Coord3D* pos = getPosition();
@@ -312,10 +318,10 @@ Real Thing::getHeightAboveTerrainOrWater() const
 	{
 		const Coord3D* pos = getPosition();
 		Real waterZ;
-		if (TheTerrainLogic->isUnderwater(pos->x, pos->y, &waterZ)) 
+		if (TheTerrainLogic->isUnderwater(pos->x, pos->y, &waterZ))
 		{
 			m_cachedAltitudeAboveTerrainOrWater = pos->z - waterZ;
-		} 
+		}
 		else
 		{
 			m_cachedAltitudeAboveTerrainOrWater = getHeightAboveTerrain();
@@ -329,7 +335,7 @@ Real Thing::getHeightAboveTerrainOrWater() const
 /** If we treat this as airborne, then they slide down slopes.  This checks whether
 they are high enough that we should let them act like they're flying. jba. */
 //=============================================================================
-Bool Thing::isSignificantlyAboveTerrain() const 
+Bool Thing::isSignificantlyAboveTerrain() const
 {
 	// If it's high enough that it will take more than 3 frames to return to the ground,
 	// then it's significantly airborne.  jba
@@ -389,4 +395,4 @@ void Thing::transformPoint( const Coord3D *in, Coord3D *out )
 	out->y = vectorOut.Y;
 	out->z = vectorOut.Z;
 
-}  // end transformPoint
+}
diff --git a/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp b/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp
index e95b59b2857..42b9e4a120d 100644
--- a/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp
+++ b/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp
@@ -24,11 +24,11 @@
 
 // FILE: ThingFactory.cpp /////////////////////////////////////////////////////////////////////////
 // Created:   Colin Day, April 2001
-// Desc:		This is how we go and make our things, we make our things, we make our things!	
+// Desc:		This is how we go and make our things, we make our things, we make our things!
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingFactory.h"
 #include "Common/ThingTemplate.h"
@@ -48,11 +48,6 @@
 #include "GameClient/Drawable.h"
 #include "Common/INI.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-///#pragma optimize("", off)
-///#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 enum { TEMPLATE_HASH_SIZE = 12288 };
 
@@ -79,7 +74,7 @@ void ThingFactory::freeDatabase( void )
 
 	m_templateHashMap.clear();
 
-}  // end freeDatabase
+}
 
 //-------------------------------------------------------------------------------------------------
 /** add the thing template passed in, into the databse */
@@ -89,7 +84,7 @@ void ThingFactory::addTemplate( ThingTemplate *tmplate )
 	ThingTemplateHashMapIt tIt = m_templateHashMap.find(tmplate->getName());
 
 	if (tIt != m_templateHashMap.end()) {
-		DEBUG_CRASH(("Duplicate Thing Template name found: %s\n", tmplate->getName().str()));
+		DEBUG_CRASH(("Duplicate Thing Template name found: %s", tmplate->getName().str()));
 	}
 
 	// Link it to the list
@@ -98,7 +93,7 @@ void ThingFactory::addTemplate( ThingTemplate *tmplate )
 
 	// Add it to the hash table.
 	m_templateHashMap[tmplate->getName()] = tmplate;
-}  // end addTemplate
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS
@@ -116,7 +111,7 @@ ThingFactory::ThingFactory()
 #else
 	m_templateHashMap.reserve( TEMPLATE_HASH_SIZE );
 #endif
-}  // end ThingFactory
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -126,7 +121,7 @@ ThingFactory::~ThingFactory()
 	// free all the template data
 	freeDatabase();
 
-}  // end ~ThingFactory
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a new template with name 'name' and add to our template list */
@@ -139,7 +134,7 @@ ThingTemplate *ThingFactory::newTemplate( const AsciiString& name )
 	newTemplate = newInstance(ThingTemplate);
 
 	// if the default template is present, get it and copy over any data to the new template
-	const ThingTemplate *defaultT = findTemplate( AsciiString( "DefaultThingTemplate" ) );
+	const ThingTemplate *defaultT = findTemplate( "DefaultThingTemplate", FALSE );
 	if( defaultT )
 	{
 
@@ -147,7 +142,7 @@ ThingTemplate *ThingFactory::newTemplate( const AsciiString& name )
 		*newTemplate = *defaultT;
 		newTemplate->setCopiedFromDefault();
 
-	}  // end if
+	}
 
 	// give template a unique identifier
 	newTemplate->friend_setTemplateID( m_nextTemplateID++ );
@@ -174,11 +169,11 @@ ThingTemplate* ThingFactory::newOverride( ThingTemplate *thingTemplate )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( thingTemplate, ("newOverride(): NULL 'parent' thing template\n") );
+	DEBUG_ASSERTCRASH( thingTemplate, ("newOverride(): NULL 'parent' thing template") );
 
 	// sanity just for debuging, the weapon must be in the master list to do overrides
 	DEBUG_ASSERTCRASH( findTemplate( thingTemplate->getName() ) != NULL,
-										 ("newOverride(): Thing template '%s' not in master list\n", 
+										 ("newOverride(): Thing template '%s' not in master list",
 										 thingTemplate->getName().str()) );
 
 	// find final override of the 'parent' template
@@ -197,7 +192,7 @@ ThingTemplate* ThingFactory::newOverride( ThingTemplate *thingTemplate )
 	// return the newly created override for us to set values with etc
 	return newTemplate;
 
-}  // end newOverride
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Init */
@@ -205,7 +200,7 @@ ThingTemplate* ThingFactory::newOverride( ThingTemplate *thingTemplate )
 void ThingFactory::init( void )
 {
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -217,33 +212,39 @@ void ThingFactory::reset( void )
 	for( t = m_firstTemplate; t; /* empty */ )
 	{
 		Bool possibleAdjustment = FALSE;
-		// t itself can be deleted if it is something created for this map only. Therefore, 
+		// t itself can be deleted if it is something created for this map only. Therefore,
 		// we need to store what the next item is so that we don't orphan a bunch of templates.
 		ThingTemplate *nextT = t->friend_getNextTemplate();
 		if (t == m_firstTemplate) {
 			possibleAdjustment = TRUE;
 		}
 
-		// if stillValid is NULL after we delete the overrides, then this template was created for 
+		// if stillValid is NULL after we delete the overrides, then this template was created for
 		// this map only. If it also happens to be m_firstTemplate, then we need to update m_firstTemplate
-		// as well. Finally, if it was only created for this map, we need to remove the name from the 
+		// as well. Finally, if it was only created for this map, we need to remove the name from the
 		// hash map, to prevent any crashes.
 
 		AsciiString templateName = t->getName();
-		
+
 		Overridable *stillValid = t->deleteOverrides();
 		if (stillValid == NULL && possibleAdjustment) {
 			m_firstTemplate = nextT;
 		}
-		
+
 		if (stillValid == NULL) {
 			// Also needs to be removed from the Hash map.
 			m_templateHashMap.erase(templateName);
 		}
 
+		DEBUG_ASSERTCRASH(!nextT || t->getTemplateID() == nextT->getTemplateID() + 1, ("Next template ID is unexpected"));
+
 		t = nextT;
 	}
-}  // end reset
+
+	// TheSuperHackers @bugfix Caball009 25/12/2025 Avoid mismatches by making m_nextTemplateID unique for a single match instead of unique since game launch.
+	DEBUG_ASSERTCRASH(m_firstTemplate && m_firstTemplate->getTemplateID() == m_templateHashMap.size(), ("Template ID is unexpected after deleting overrides"));
+	m_nextTemplateID = static_cast<UnsignedShort>(m_firstTemplate->getTemplateID() + 1);
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -251,7 +252,7 @@ void ThingFactory::reset( void )
 void ThingFactory::update( void )
 {
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return the template with the matching database name */
@@ -263,14 +264,14 @@ const ThingTemplate *ThingFactory::findByTemplateID( UnsignedShort id )
 		if (tmpl->getTemplateID() == id)
 			return tmpl;
 	}
-	DEBUG_CRASH(("template %d not found\n",(Int)id));
+	DEBUG_CRASH(("template %d not found",(Int)id));
 	return NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
 /** Return the template with the matching database name */
 //-------------------------------------------------------------------------------------------------
-ThingTemplate *ThingFactory::findTemplateInternal( const AsciiString& name )
+ThingTemplate *ThingFactory::findTemplateInternal( const AsciiString& name, Bool check )
 {
 	ThingTemplateHashMapIt tIt = m_templateHashMap.find(name);
 
@@ -279,9 +280,9 @@ ThingTemplate *ThingFactory::findTemplateInternal( const AsciiString& name )
 	}
 
 #ifdef LOAD_TEST_ASSETS
-	if (!strncmp(name.str(), TEST_STRING, strlen(TEST_STRING))) 
+	if (!strncmp(name.str(), TEST_STRING, strlen(TEST_STRING)))
 	{
-		ThingTemplate *tmplate = newTemplate( AsciiString( "Un-namedTemplate" ) );
+		ThingTemplate *tmplate = newTemplate( "Un-namedTemplate" );
 
 		// load the values
 		tmplate->initForLTA( name );
@@ -294,13 +295,16 @@ ThingTemplate *ThingFactory::findTemplateInternal( const AsciiString& name )
 		return findTemplateInternal( name );
 
 	}
-	
+
 #endif
-	
-	//DEBUG_LOG(("*** Object template %s not found\n",name.str()));
+
+	if( check && name.isNotEmpty() )
+	{
+		DEBUG_CRASH( ("Failed to find thing template %s (case sensitive) This issue has a chance of crashing after you ignore it!", name.str() ) );
+	}
 	return NULL;
 
-}  // end getTemplate
+}
 
 //=============================================================================
 Object *ThingFactory::newObject( const ThingTemplate *tmplate, Team *team, ObjectStatusMaskType statusBits )
@@ -317,7 +321,7 @@ Object *ThingFactory::newObject( const ThingTemplate *tmplate, Team *team, Objec
 			tmplate = tmp;
 	}
 
-	DEBUG_ASSERTCRASH(!tmplate->isKindOf(KINDOF_DRAWABLE_ONLY), ("You may not create Objects with the template %s, only Drawables\n",tmplate->getName().str()));
+	DEBUG_ASSERTCRASH(!tmplate->isKindOf(KINDOF_DRAWABLE_ONLY), ("You may not create Objects with the template %s, only Drawables",tmplate->getName().str()));
 
 	// have the game logic create an object of the correct type.
 	// (this will throw an exception on failure.)
@@ -331,12 +335,12 @@ Object *ThingFactory::newObject( const ThingTemplate *tmplate, Team *team, Objec
 		CreateModuleInterface* create = (*m)->getCreate();
 		if (!create)
 			continue;
-	
+
 		create->onCreate();
 	}
 
 	//
-	// all objects are part of the partition manager system, add it to that 
+	// all objects are part of the partition manager system, add it to that
 	// system now
 	//
 	ThePartitionManager->registerObject( obj );
@@ -345,10 +349,10 @@ Object *ThingFactory::newObject( const ThingTemplate *tmplate, Team *team, Objec
 
 	return obj;
 
-} 
+}
 
 //=============================================================================
-Drawable *ThingFactory::newDrawable(const ThingTemplate *tmplate, DrawableStatus statusBits)
+Drawable *ThingFactory::newDrawable(const ThingTemplate *tmplate, DrawableStatusBits statusBits)
 {
 	if (tmplate == NULL)
 		throw ERROR_BAD_ARG;
@@ -361,9 +365,9 @@ Drawable *ThingFactory::newDrawable(const ThingTemplate *tmplate, DrawableStatus
 
 	return draw;
 
-}  // end newDrawableByType
+}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 AsciiString TheThingTemplateBeingParsedName;
 #endif
 
@@ -372,12 +376,12 @@ AsciiString TheThingTemplateBeingParsedName;
 //-------------------------------------------------------------------------------------------------
 /*static*/ void ThingFactory::parseObjectDefinition( INI* ini, const AsciiString& name, const AsciiString& reskinFrom )
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 	TheThingTemplateBeingParsedName = name;
 #endif
 
 	// find existing item if present
-	ThingTemplate *thingTemplate = TheThingFactory->findTemplateInternal( name );
+	ThingTemplate *thingTemplate = TheThingFactory->findTemplateInternal( name, FALSE );
 	if( !thingTemplate )
 	{
 		// no item is present, create a new one
@@ -392,9 +396,9 @@ AsciiString TheThingTemplateBeingParsedName;
 	else if( ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES )
 	{
 		//Holy crap, this sucks to debug!!!
-		//If you have two different objects, the previous code would simply 
-		//allow you to define multiple objects with the same name, and just 
-		//nuke the old one with the new one. So, I (KM) have added this 
+		//If you have two different objects, the previous code would simply
+		//allow you to define multiple objects with the same name, and just
+		//nuke the old one with the new one. So, I (KM) have added this
 		//assert to notify in case of two same-name objects.
 		DEBUG_CRASH(( "[LINE: %d in '%s'] Duplicate factionunit %s found!", ini->getLineNum(), ini->getFilename().str(), name.str() ));
 	}
@@ -415,7 +419,7 @@ AsciiString TheThingTemplateBeingParsedName;
 		}
 		else
 		{
-			DEBUG_CRASH(("ObjectReskin must come after the original Object (%s, %s).\n",reskinFrom.str(),name.str()));
+			DEBUG_CRASH(("ObjectReskin must come after the original Object (%s, %s).",reskinFrom.str(),name.str()));
 			throw INI_INVALID_DATA;
 		}
 	}
@@ -426,7 +430,7 @@ AsciiString TheThingTemplateBeingParsedName;
 
 	thingTemplate->validate();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 	TheThingTemplateBeingParsedName.clear();
 #endif
 }
@@ -514,8 +518,8 @@ void ThingFactory::postProcessLoad()
 #endif
 
 	// go through all thing templates
-	for( ThingTemplate *thingTemplate = m_firstTemplate; 
-			 thingTemplate; 
+	for( ThingTemplate *thingTemplate = m_firstTemplate;
+			 thingTemplate;
 			 thingTemplate = thingTemplate->friend_getNextTemplate() )
 	{
 
@@ -537,10 +541,10 @@ void ThingFactory::postProcessLoad()
 		}
 #endif
 
-	}  // end for 
+	}
 
 #ifdef CHECK_THING_NAMES
 	dumpMissingStringNames();
 	exit(0);
 #endif
-}  // end postProcess
+}
diff --git a/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp b/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp
index cedcb617167..854f5e971e5 100644
--- a/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp
+++ b/Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_POWER_NAMES								// for PowerNames[]
 #define DEFINE_SHADOW_NAMES								// for TheShadowNames[]
@@ -70,11 +70,6 @@
 #include "GameLogic/Powers.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -87,29 +82,29 @@ const Int USE_EXP_VALUE_FOR_SKILL_VALUE = -999;
 
 AudioEventRTS ThingTemplate::s_audioEventNoSound;
 
-/* 
+/*
 	NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem!
 
-	"s_objectReskinFieldParseTable" is intended to be used for parsing the "ObjectReskin" keyword, and 
-	should only allow you to specify things that affect the appearance of a template. 
-	
+	"s_objectReskinFieldParseTable" is intended to be used for parsing the "ObjectReskin" keyword, and
+	should only allow you to specify things that affect the appearance of a template.
+
 	The idea is that some units are functionally the same, but different visually; rather than replicate
 	all the settings, you can specify it as "this one is like that one, but looks different".
 
 	Thus, currently, the only things in the reskin table are:
-		
+
 		-- DrawModules
 		-- DrawModuleData
 		-- Geometry
-	
-	So: if you add/remove/modify any settings that deal with visual appearance, you *may* want to 
+
+	So: if you add/remove/modify any settings that deal with visual appearance, you *may* want to
 	add 'em to the reskin table... but do so VERY CAUTIOUSLY and with careful deliberation (and
 	after checking around for other opinions).
 
 */
 
 // NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem -- see comment above
-const FieldParse ThingTemplate::s_objectFieldParseTable[] = 
+const FieldParse ThingTemplate::s_objectFieldParseTable[] =
 {
 	{ "DisplayName",					INI::parseAndTranslateLabel,					NULL,								offsetof( ThingTemplate, m_displayName ) },
 	{ "RadarPriority",				INI::parseByteSizedIndexList,					RadarPriorityNames, offsetof( ThingTemplate, m_radarPriority ) },
@@ -126,7 +121,7 @@ const FieldParse ThingTemplate::s_objectFieldParseTable[] =
 
 	{ "FactoryExitWidth",			INI::parseReal,												NULL,		offsetof( ThingTemplate, m_factoryExitWidth ) },
 	{ "FactoryExtraBibWidth",	INI::parseReal,												NULL,		offsetof( ThingTemplate, m_factoryExtraBibWidth ) },
-																											
+
 	{ "SkillPointValue",			ThingTemplate::parseIntList,					(void*)LEVEL_COUNT,		offsetof( ThingTemplate, m_skillPointValues ) },
 	{ "ExperienceValue",			ThingTemplate::parseIntList,					(void*)LEVEL_COUNT,		offsetof( ThingTemplate, m_experienceValues ) },
 	{ "ExperienceRequired",		ThingTemplate::parseIntList,					(void*)LEVEL_COUNT,		offsetof( ThingTemplate, m_experienceRequired ) },
@@ -148,7 +143,7 @@ const FieldParse ThingTemplate::s_objectFieldParseTable[] =
 	{ "DisplayColor",					INI::parseColorInt,									NULL,		offsetof( ThingTemplate, m_displayColor ) },
 	{ "EditorSorting",				INI::parseByteSizedIndexList,				EditorSortingNames, offsetof( ThingTemplate, m_editorSorting ) },
 	{ "KindOf",								KindOfMaskType::parseFromINI,				NULL,		offsetof( ThingTemplate, m_kindof ) },
-	{ "CommandSet",						INI::parseAsciiString,							NULL,		offsetof( ThingTemplate, m_commandSetString ) },	
+	{ "CommandSet",						INI::parseAsciiString,							NULL,		offsetof( ThingTemplate, m_commandSetString ) },
 	{ "BuildVariations",			INI::parseAsciiStringVector,				NULL,		offsetof( ThingTemplate, m_buildVariations ) },
 
 // NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem -- see comment above
@@ -160,19 +155,19 @@ const FieldParse ThingTemplate::s_objectFieldParseTable[] =
 
 	{ "SelectPortrait",					INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_selectedPortraitImageName ) },
 	{ "ButtonImage",						INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_buttonImageName ) },
-	
+
 	//Code renderer handles these states now.
 	//{ "InventoryImageEnabled",	INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_inventoryImage[ INV_IMAGE_ENABLED ] ) },
 	//{ "InventoryImageDisabled",	INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_inventoryImage[ INV_IMAGE_DISABLED ] ) },
 	//{ "InventoryImageHilite",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_inventoryImage[ INV_IMAGE_HILITE ] ) },
 	//{ "InventoryImagePushed",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_inventoryImage[ INV_IMAGE_PUSHED ] ) },
-	
+
 	{ "UpgradeCameo1",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_upgradeCameoUpgradeNames[ 0 ] ) },
 	{ "UpgradeCameo2",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_upgradeCameoUpgradeNames[ 1 ] ) },
 	{ "UpgradeCameo3",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_upgradeCameoUpgradeNames[ 2 ] ) },
 	{ "UpgradeCameo4",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_upgradeCameoUpgradeNames[ 3 ] ) },
 	{ "UpgradeCameo5",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_upgradeCameoUpgradeNames[ 4 ] ) },
-	
+
 // NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem -- see comment above
 
 	{ "VoiceSelect",					INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceSelect]) },
@@ -191,9 +186,9 @@ const FieldParse ThingTemplate::s_objectFieldParseTable[] =
 	{ "VoiceSurrender",				INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceSurrender]) },
 #endif
 	{ "VoiceDefect",					INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceDefect]) },
-	{ "VoiceAttackSpecial",		INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceAttackSpecial ]) },	
-	{ "VoiceAttackAir",				INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceAttackAir ]) },	
-	{ "VoiceGuard",						INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceGuard ]) },	
+	{ "VoiceAttackSpecial",		INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceAttackSpecial ]) },
+	{ "VoiceAttackAir",				INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceAttackAir ]) },
+	{ "VoiceGuard",						INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceGuard ]) },
 	{ "SoundMoveStart",				INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_soundMoveStart]) },
 	{ "SoundMoveStartDamaged",INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_soundMoveStartDamaged]) },
 	{ "SoundMoveLoop",				INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_soundMoveLoop]) },
@@ -240,18 +235,18 @@ const FieldParse ThingTemplate::s_objectFieldParseTable[] =
 	{ "Locomotor",						AIUpdateModuleData::parseLocomotorSet, NULL, 0 },
 	{ "InstanceScaleFuzziness",	INI::parseReal,					NULL, offsetof(ThingTemplate, m_instanceScaleFuzziness ) },
 	{ "StructureRubbleHeight",	INI::parseUnsignedByte,					NULL, offsetof(ThingTemplate, m_structureRubbleHeight ) },
-	{ "ThreatValue",						INI::parseUnsignedShort,		NULL, offsetof(ThingTemplate, m_threatValue ) }, 
-	{ "MaxSimultaneousOfType",	INI::parseUnsignedShort,		NULL, offsetof(ThingTemplate, m_maxSimultaneousOfType ) }, 
+	{ "ThreatValue",						INI::parseUnsignedShort,		NULL, offsetof(ThingTemplate, m_threatValue ) },
+	{ "MaxSimultaneousOfType",	INI::parseUnsignedShort,		NULL, offsetof(ThingTemplate, m_maxSimultaneousOfType ) },
 	{ "CrusherLevel",					INI::parseUnsignedByte,			NULL, offsetof( ThingTemplate, m_crusherLevel ) },
 	{ "CrushableLevel",				INI::parseUnsignedByte,			NULL, offsetof( ThingTemplate, m_crushableLevel ) },
 
-	{ 0, 0, 0, 0 }  // keep this last
+	{ 0, 0, 0, 0 }
 
 };
 // NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem -- see comment above
 
 // NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem -- see comment above
-const FieldParse ThingTemplate::s_objectReskinFieldParseTable[] = 
+const FieldParse ThingTemplate::s_objectReskinFieldParseTable[] =
 {
 	{ "Draw",									ThingTemplate::parseModuleName,		(const void*)MODULETYPE_DRAW, offsetof(ThingTemplate, m_drawModuleInfo) },
 
@@ -263,7 +258,7 @@ const FieldParse ThingTemplate::s_objectReskinFieldParseTable[] =
 	{ "FenceWidth",						INI::parseReal,													NULL,		offsetof( ThingTemplate, m_fenceWidth ) },
 	{ "FenceXOffset",					INI::parseReal,													NULL,		offsetof( ThingTemplate, m_fenceXOffset ) },
 
-	{ 0, 0, 0, 0 }  // keep this last
+	{ 0, 0, 0, 0 }
 
 };
 // NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem -- see comment above
@@ -282,16 +277,16 @@ const ModuleInfo::Nugget *ModuleInfo::getNuggetWithTag( const AsciiString& tag )
 	// no match
 	return NULL;
 
-}  // end isTagPresent
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add this module info to the thing template */
 // ------------------------------------------------------------------------------------------------
-void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate, 
-															 const AsciiString& name, 
-															 const AsciiString& moduleTag, 
-															 const ModuleData* data, 
-															 Int interfaceMask, 
+void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
+															 const AsciiString& name,
+															 const AsciiString& moduleTag,
+															 const ModuleData* data,
+															 Int interfaceMask,
 															 Bool inheritable)
 {
 
@@ -299,17 +294,17 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 	// there must be a module tag present, and it must be unique across all module infos
 	// for this thing template
 	//
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	// get module info
 	const Nugget *nugget;
-	
+
 	nugget = thingTemplate->getBehaviorModuleInfo().getNuggetWithTag( moduleTag );
 	if( nugget != NULL )
 	{
 
 		// compare this nugget tag against the tag for the new data we're going to submit
 		DEBUG_ASSERTCRASH( nugget->m_moduleTag != moduleTag,
-											 ("addModuleInfo - ERROR defining module '%s' on thing template '%s'.  The module '%s' has the tag '%s' which must be unique among all modules for this object, but the tag '%s' is also already on module '%s' within this object.\n\nPlease make unique tag names within an object definition\n",
+											 ("addModuleInfo - ERROR defining module '%s' on thing template '%s'.  The module '%s' has the tag '%s' which must be unique among all modules for this object, but the tag '%s' is also already on module '%s' within this object.\n\nPlease make unique tag names within an object definition",
 												name.str(),
 												thingTemplate->getName().str(),
 												name.str(),
@@ -319,7 +314,7 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 
 		// srj sez: prevent people from ignoring this.
 		throw INI_INVALID_DATA;
-	}  // end if
+	}
 
 	nugget = thingTemplate->getDrawModuleInfo().getNuggetWithTag( moduleTag );
 	if( nugget != NULL )
@@ -327,7 +322,7 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 
 		// compare this nugget tag against the tag for the new data we're going to submit
 		DEBUG_ASSERTCRASH( nugget->m_moduleTag != moduleTag,
-											 ("addModuleInfo - ERROR defining module '%s' on thing template '%s'.  The module '%s' has the tag '%s' which must be unique among all modules for this object, but the tag '%s' is also already on module '%s' within this object.\n\nPlease make unique tag names within an object definition\n",
+											 ("addModuleInfo - ERROR defining module '%s' on thing template '%s'.  The module '%s' has the tag '%s' which must be unique among all modules for this object, but the tag '%s' is also already on module '%s' within this object.\n\nPlease make unique tag names within an object definition",
 												name.str(),
 												thingTemplate->getName().str(),
 												name.str(),
@@ -337,7 +332,7 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 
 		// srj sez: prevent people from ignoring this.
 		throw INI_INVALID_DATA;
-	}  // end if
+	}
 
 	nugget = thingTemplate->getClientUpdateModuleInfo().getNuggetWithTag( moduleTag );
 	if( nugget != NULL )
@@ -345,7 +340,7 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 
 		// compare this nugget tag against the tag for the new data we're going to submit
 		DEBUG_ASSERTCRASH( nugget->m_moduleTag != moduleTag,
-											 ("addModuleInfo - ERROR defining module '%s' on thing template '%s'.  The module '%s' has the tag '%s' which must be unique among all modules for this object, but the tag '%s' is also already on module '%s' within this object.\n\nPlease make unique tag names within an object definition\n",
+											 ("addModuleInfo - ERROR defining module '%s' on thing template '%s'.  The module '%s' has the tag '%s' which must be unique among all modules for this object, but the tag '%s' is also already on module '%s' within this object.\n\nPlease make unique tag names within an object definition",
 												name.str(),
 												thingTemplate->getName().str(),
 												name.str(),
@@ -354,7 +349,7 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 												nugget->first.str()) );
 		// srj sez: prevent people from ignoring this.
 		throw INI_INVALID_DATA;
-	}  // end if
+	}
 
 #endif
 
@@ -363,15 +358,15 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool ModuleInfo::clearModuleDataWithTag(const AsciiString& tagToClear, AsciiString& clearedModuleNameOut) 
-{ 
+Bool ModuleInfo::clearModuleDataWithTag(const AsciiString& tagToClear, AsciiString& clearedModuleNameOut)
+{
 	Bool cleared = false;
 
 	// do NOT clear... we only want to modify this if we return true.
 	// if we return false, we should leave this unmodified.
 	//clearedModuleNameOut.clear();
 
-	for (std::vector<Nugget>::iterator it = m_info.begin(); it != m_info.end(); /* empty */ ) 
+	for (std::vector<Nugget>::iterator it = m_info.begin(); it != m_info.end(); /* empty */ )
 	{
 		if (it->m_moduleTag == tagToClear)
 		{
@@ -389,8 +384,8 @@ Bool ModuleInfo::clearModuleDataWithTag(const AsciiString& tagToClear, AsciiStri
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool ModuleInfo::clearCopiedFromDefaultEntries(Int interfaceMask) 
-{ 
+Bool ModuleInfo::clearCopiedFromDefaultEntries(Int interfaceMask)
+{
 	Bool ret = false;
 
 	std::vector<Nugget>::iterator it = m_info.begin();
@@ -410,8 +405,8 @@ Bool ModuleInfo::clearCopiedFromDefaultEntries(Int interfaceMask)
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool ModuleInfo::clearAiModuleInfo() 
-{ 
+Bool ModuleInfo::clearAiModuleInfo()
+{
 	Bool ret = false;
 
 	std::vector<Nugget>::iterator it = m_info.begin();
@@ -448,11 +443,11 @@ void ThingTemplate::parseModuleName(INI* ini, void *instance, void* store, const
 	catch( ... )
 	{
 
-		DEBUG_CRASH(( "[LINE: %d - FILE: '%s'] Module tag not found for module '%s' on thing template '%s'.  Module tags are required and must be unique for all modules within an object definition\n",
-									ini->getLineNum(), ini->getFilename().str(), 
+		DEBUG_CRASH(( "[LINE: %d - FILE: '%s'] Module tag not found for module '%s' on thing template '%s'.  Module tags are required and must be unique for all modules within an object definition",
+									ini->getLineNum(), ini->getFilename().str(),
 									tokenStr.str(), self->getName().str() ));
 		throw;
-				
+
 	}
 
 	Int interfaceMask;
@@ -478,17 +473,17 @@ void ThingTemplate::parseModuleName(INI* ini, void *instance, void* store, const
 			throw INI_INVALID_DATA;
 		}
 	}
-	
+
 	// if we're overriding, we can totally skip over this block
 	if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES)
-	{	
+	{
 		if (self->m_moduleParsingMode == MODULEPARSE_ADD_REMOVE_REPLACE)
 		{
 			// do nothing, just fall thru
 		}
 		else
 		{
-			DEBUG_CRASH(("[LINE: %d - FILE: '%s'] You must use AddModule to add modules in override INI files.\n",
+			DEBUG_CRASH(("[LINE: %d - FILE: '%s'] You must use AddModule to add modules in override INI files.",
 				ini->getLineNum(), ini->getFilename().str(), self->getName().str()));
 			throw INI_INVALID_DATA;
 		}
@@ -500,20 +495,20 @@ void ThingTemplate::parseModuleName(INI* ini, void *instance, void* store, const
 		self->m_clientUpdateModuleInfo.clearCopiedFromDefaultEntries(interfaceMask);
 	}
 
-	if (self->m_moduleParsingMode == MODULEPARSE_ADD_REMOVE_REPLACE 
+	if (self->m_moduleParsingMode == MODULEPARSE_ADD_REMOVE_REPLACE
 			&& self->m_moduleBeingReplacedName.isNotEmpty()
 			&& self->m_moduleBeingReplacedName != tokenStr)
 	{
-		DEBUG_CRASH(("[LINE: %d - FILE: '%s'] ReplaceModule must replace modules with another module of the same type, but you are attempting to replace a %s with a %s for Object %s.\n",
+		DEBUG_CRASH(("[LINE: %d - FILE: '%s'] ReplaceModule must replace modules with another module of the same type, but you are attempting to replace a %s with a %s for Object %s.",
 			ini->getLineNum(), ini->getFilename().str(), self->m_moduleBeingReplacedName.str(), tokenStr.str(), self->getName().str()));
 		throw INI_INVALID_DATA;
 	}
 
-	if (self->m_moduleParsingMode == MODULEPARSE_ADD_REMOVE_REPLACE 
+	if (self->m_moduleParsingMode == MODULEPARSE_ADD_REMOVE_REPLACE
 			&& self->m_moduleBeingReplacedTag.isNotEmpty()
 			&& self->m_moduleBeingReplacedTag == moduleTagStr)
 	{
-		DEBUG_CRASH(("[LINE: %d - FILE: '%s'] ReplaceModule must specify a new, unique tag for the replaced module, but you are not doing so for %s (%s) for Object %s.\n",
+		DEBUG_CRASH(("[LINE: %d - FILE: '%s'] ReplaceModule must specify a new, unique tag for the replaced module, but you are not doing so for %s (%s) for Object %s.",
 			ini->getLineNum(), ini->getFilename().str(), moduleTagStr.str(), self->m_moduleBeingReplacedName.str(), self->getName().str()));
 		throw INI_INVALID_DATA;
 	}
@@ -525,7 +520,7 @@ void ThingTemplate::parseModuleName(INI* ini, void *instance, void* store, const
 		Bool replaced = mi->clearAiModuleInfo();
 		if (replaced)
 		{
-			DEBUG_LOG(("replaced an AI for %s!\n",self->getName().str()));
+			DEBUG_LOG(("replaced an AI for %s!",self->getName().str()));
 		}
 	}
 
@@ -578,7 +573,7 @@ void ThingTemplate::parsePrerequisites( INI* ini, void *instance, void *store, c
 {
 	ThingTemplate* self = (ThingTemplate*)instance;
 
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ "Object", parsePrerequisiteUnit, 0, 0 },
 		{ "Science", parsePrerequisiteScience,	0, 0 },
@@ -600,8 +595,8 @@ static void parseArbitraryFXIntoMap( INI* ini, void *instance, void* /* store */
 	const char* name = (const char*)userData;
 	const char* token = ini->getNextToken();
 	const FXList* fxl = TheFXListStore->findFXList(token);	// could be null!
-	DEBUG_ASSERTCRASH(fxl != NULL || stricmp(token, "None") == 0, ("FXList %s not found!\n",token));
-	mapFX->insert(std::make_pair(AsciiString(name), fxl));	
+	DEBUG_ASSERTCRASH(fxl != NULL || stricmp(token, "None") == 0, ("FXList %s not found!",token));
+	mapFX->insert(std::make_pair(AsciiString(name), fxl));
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -612,7 +607,7 @@ void ThingTemplate::parsePerUnitFX( INI* ini, void *instance, void *store, const
 
 	fxmap->clear();
 
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ 0, parseArbitraryFXIntoMap, NULL, 0 },
 		{ 0, 0, 0, 0 }
@@ -627,11 +622,11 @@ static void parseArbitrarySoundsIntoMap( INI* ini, void *instance, void* /* stor
 	PerUnitSoundMap *mapSounds = (PerUnitSoundMap*) instance;
 	const char* name = (const char*)userData;
 	const char* token = ini->getNextToken();
-	
+
 	AudioEventRTS a;
 	if (token)
 		a.setEventName(token);
-	mapSounds->insert(std::make_pair(AsciiString(name), a));	
+	mapSounds->insert(std::make_pair(AsciiString(name), a));
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -642,7 +637,7 @@ void ThingTemplate::parsePerUnitSounds( INI* ini, void *instance, void *store, c
 	PerUnitSoundMap *mapSounds = (PerUnitSoundMap*)store;
 	mapSounds->clear();
 
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ 0, parseArbitrarySoundsIntoMap, NULL, 0 },
 		{ 0, 0, 0, 0 }
@@ -657,7 +652,7 @@ void ThingTemplate::parsePerUnitSounds( INI* ini, void *instance, void *store, c
 void ThingTemplate::parseAddModule(INI *ini, void *instance, void *store, const void *userData)
 {
 	// don't care about the result.
-	ThingTemplate* self = (ThingTemplate*)instance;	
+	ThingTemplate* self = (ThingTemplate*)instance;
 
 	ModuleParseMode oldMode = (ModuleParseMode)self->m_moduleParsingMode;
 	if (oldMode != MODULEPARSE_NORMAL)
@@ -675,7 +670,7 @@ void ThingTemplate::parseAddModule(INI *ini, void *instance, void *store, const
 //-------------------------------------------------------------------------------------------------
 void ThingTemplate::parseRemoveModule(INI *ini, void *instance, void *store, const void *userData)
 {
-	ThingTemplate* self = (ThingTemplate*)instance;	
+	ThingTemplate* self = (ThingTemplate*)instance;
 
 	ModuleParseMode oldMode = (ModuleParseMode)self->m_moduleParsingMode;
 	if (oldMode != MODULEPARSE_NORMAL)
@@ -688,7 +683,7 @@ void ThingTemplate::parseRemoveModule(INI *ini, void *instance, void *store, con
 	Bool removed = self->removeModuleInfo(modToRemove, removedModuleName);
 	if (!removed)
 	{
-		DEBUG_ASSERTCRASH(removed, ("RemoveModule %s was not found for %s. The game will crash now!\n",modToRemove, self->getName().str()));
+		DEBUG_ASSERTCRASH(removed, ("RemoveModule %s was not found for %s. The game will crash now!",modToRemove, self->getName().str()));
 		throw INI_INVALID_DATA;
 	}
 
@@ -700,7 +695,7 @@ void ThingTemplate::parseRemoveModule(INI *ini, void *instance, void *store, con
 //-------------------------------------------------------------------------------------------------
 void ThingTemplate::parseReplaceModule(INI *ini, void *instance, void *store, const void *userData)
 {
-	ThingTemplate* self = (ThingTemplate*)instance;	
+	ThingTemplate* self = (ThingTemplate*)instance;
 
 	ModuleParseMode oldMode = (ModuleParseMode)self->m_moduleParsingMode;
 	if (oldMode != MODULEPARSE_NORMAL)
@@ -713,7 +708,7 @@ void ThingTemplate::parseReplaceModule(INI *ini, void *instance, void *store, co
 	Bool removed = self->removeModuleInfo(modToRemove, removedModuleName);
 	if (!removed)
 	{
-		DEBUG_CRASH(("[LINE: %d - FILE: '%s'] ReplaceModule %s was not found for %s; cannot continue.\n",
+		DEBUG_CRASH(("[LINE: %d - FILE: '%s'] ReplaceModule %s was not found for %s; cannot continue.",
 															ini->getLineNum(), ini->getFilename().str(), modToRemove, self->getName().str()));
 		throw INI_INVALID_DATA;
 	}
@@ -732,7 +727,7 @@ void ThingTemplate::parseReplaceModule(INI *ini, void *instance, void *store, co
 //-------------------------------------------------------------------------------------------------
 void ThingTemplate::parseInheritableModule(INI *ini, void *instance, void *store, const void *userData)
 {
-	ThingTemplate* self = (ThingTemplate*)instance;	
+	ThingTemplate* self = (ThingTemplate*)instance;
 
 	ModuleParseMode oldMode = (ModuleParseMode)self->m_moduleParsingMode;
 	if (oldMode != MODULEPARSE_NORMAL)
@@ -779,7 +774,7 @@ Bool ThingTemplate::removeModuleInfo(const AsciiString& moduleToRemove, AsciiStr
 /// @todo srj -- move this to another file
 void ArmorTemplateSet::parseArmorTemplateSet( INI* ini )
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ "Conditions", ArmorSetFlags::parseFromINI, NULL, offsetof( ArmorTemplateSet, m_types ) },
 		{ "Armor", INI::parseArmorTemplate,	NULL, offsetof( ArmorTemplateSet, m_template ) },
@@ -802,14 +797,14 @@ void ThingTemplate::parseArmorTemplateSet( INI* ini, void *instance, void * /*st
 
 	ArmorTemplateSet ws;
 	ws.parseArmorTemplateSet(ini);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES)
 	{
 		for (ArmorTemplateSetVector::const_iterator it = self->m_armorTemplateSets.begin(); it != self->m_armorTemplateSets.end(); ++it)
 		{
 			if (it->getNthConditionsYes(0) == ws.getNthConditionsYes(0))
 			{
-				DEBUG_CRASH(("dup armorset condition in %s\n",self->getName().str()));
+				DEBUG_CRASH(("dup armorset condition in %s",self->getName().str()));
 			}
 		}
 	}
@@ -830,14 +825,14 @@ void ThingTemplate::parseWeaponTemplateSet( INI* ini, void *instance, void * /*s
 
 	WeaponTemplateSet ws;
 	ws.parseWeaponTemplateSet(ini, self);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES)
 	{
 		for (WeaponTemplateSetVector::const_iterator it = self->m_weaponTemplateSets.begin(); it != self->m_weaponTemplateSets.end(); ++it)
 		{
 			if (it->getNthConditionsYes(0) == ws.getNthConditionsYes(0))
 			{
-				DEBUG_CRASH(("dup weaponset condition in %s\n",self->getName().str()));
+				DEBUG_CRASH(("dup weaponset condition in %s",self->getName().str()));
 			}
 		}
 	}
@@ -910,9 +905,9 @@ ThingTemplate::ThingTemplate() :
 AIUpdateModuleData *ThingTemplate::friend_getAIModuleInfo(void)
 {
 	Int numModInfos = m_behaviorModuleInfo.getCount();
-	for (int j = 0; j < numModInfos; ++j) 
+	for (int j = 0; j < numModInfos; ++j)
 	{
-		if (m_behaviorModuleInfo.getNthData(j) && m_behaviorModuleInfo.getNthData(j)->isAiModuleData()) 
+		if (m_behaviorModuleInfo.getNthData(j) && m_behaviorModuleInfo.getNthData(j)->isAiModuleData())
 		{
 			return (AIUpdateModuleData *)m_behaviorModuleInfo.friend_getNthData(j);
 		}
@@ -925,11 +920,11 @@ AIUpdateModuleData *ThingTemplate::friend_getAIModuleInfo(void)
 //-------------------------------------------------------------------------------------------------
 void ThingTemplate::validateAudio()
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 
 	#define AUDIO_TEST(y) \
 		if (!get##y()->getEventName().isEmpty() && get##y()->getEventName().compareNoCase("NoSound") != 0) { \
-			DEBUG_ASSERTLOG(TheAudio->isValidAudioEvent(get##y()), ("Invalid Sound '%s' in Object '%s'. (%s?)\n", #y, getName().str(), get##y()->getEventName().str())); \
+			DEBUG_ASSERTLOG(TheAudio->isValidAudioEvent(get##y()), ("Invalid Sound '%s' in Object '%s'. (%s?)", #y, getName().str(), get##y()->getEventName().str())); \
 		}
 
 	AUDIO_TEST(VoiceSelect)
@@ -976,24 +971,24 @@ void ThingTemplate::validateAudio()
 	AUDIO_TEST(SoundPromotedVeteran)
 	AUDIO_TEST(SoundPromotedElite)
 	AUDIO_TEST(SoundPromotedHero)
-	
+
 	#undef AUDIO_TEST
 
 	const PerUnitSoundMap *perUnitSounds = getAllPerUnitSounds();
-	if (!perUnitSounds) 
+	if (!perUnitSounds)
 	{
 		return;
 	}
 
-	for (PerUnitSoundMap::const_iterator it = perUnitSounds->begin(); it != perUnitSounds->end(); ++it) 
+	for (PerUnitSoundMap::const_iterator it = perUnitSounds->begin(); it != perUnitSounds->end(); ++it)
 	{
-		if (!it->second.getEventName().isEmpty() && it->second.getEventName().compareNoCase("NoSound") != 0) 
+		if (!it->second.getEventName().isEmpty() && it->second.getEventName().compareNoCase("NoSound") != 0)
 		{
-			DEBUG_ASSERTCRASH(TheAudio->isValidAudioEvent(&it->second), 
-												("Invalid UnitSpecificSound '%s' in Object '%s'. (%s?)", 
-												it->first.str(), 
-												getName().str(), 
-												it->second.getEventName().str())); 
+			DEBUG_ASSERTCRASH(TheAudio->isValidAudioEvent(&it->second),
+												("Invalid UnitSpecificSound '%s' in Object '%s'. (%s?)",
+												it->first.str(),
+												getName().str(),
+												it->second.getEventName().str()));
 		}
 	}
 #endif
@@ -1003,7 +998,7 @@ void ThingTemplate::validateAudio()
 void ThingTemplate::validate()
 {
 	if (m_shadowTextureName.isEmpty())
-	{	
+	{
 		// no texture given, pick a default
 		switch (getTemplateGeometryInfo().getGeomType())
 		{
@@ -1019,8 +1014,8 @@ void ThingTemplate::validate()
 
 	validateAudio();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	
+#if defined(RTS_DEBUG)
+
 	if (getName() == "DefaultThingTemplate")
 		return;
 
@@ -1041,7 +1036,7 @@ void ThingTemplate::validate()
 		return;
 
 	Bool isImmobile = isKindOf(KINDOF_IMMOBILE);
-	
+
 	if (isKindOf(KINDOF_SHRUBBERY) && !isImmobile)
 	{
 		DEBUG_CRASH(("SHRUBBERY %s must be marked IMMOBILE!",getName().str()));
@@ -1049,25 +1044,25 @@ void ThingTemplate::validate()
 
 	if (isKindOf(KINDOF_STRUCTURE) && !isImmobile)
 	{
-		DEBUG_CRASH(("Structure %s is not marked immobile, but probably should be -- please fix it. (If we ever add mobile structures, this debug sniffer will need to be revised.)\n",getName().str()));
+		DEBUG_CRASH(("Structure %s is not marked immobile, but probably should be -- please fix it. (If we ever add mobile structures, this debug sniffer will need to be revised.)",getName().str()));
 	}
 
 	if (isKindOf(KINDOF_STICK_TO_TERRAIN_SLOPE) && !isImmobile)
 	{
-		DEBUG_CRASH(("item %s is marked STICK_TO_TERRAIN_SLOPE but not IMMOBILE -- please fix it.\n",getName().str()));
+		DEBUG_CRASH(("item %s is marked STICK_TO_TERRAIN_SLOPE but not IMMOBILE -- please fix it.",getName().str()));
 	}
 
 	if (isKindOf(KINDOF_STRUCTURE))
 	{
 		if (m_armorTemplateSets.empty() || (m_armorTemplateSets.size() == 1 && m_armorTemplateSets[0].getArmorTemplate() == NULL))
 		{
-			DEBUG_CRASH(("Structure %s has no armor, but probably should (StructureArmor) -- please fix it.)\n",getName().str()));
+			DEBUG_CRASH(("Structure %s has no armor, but probably should (StructureArmor) -- please fix it.)",getName().str()));
 		}
 		for (ArmorTemplateSetVector::const_iterator it = m_armorTemplateSets.begin(); it != m_armorTemplateSets.end(); ++it)
 		{
 			if (it->getDamageFX() == NULL)
 			{
-				DEBUG_CRASH(("Structure %s has no ArmorDamageFX, and really should.\n",getName().str()));
+				DEBUG_CRASH(("Structure %s has no ArmorDamageFX, and really should.",getName().str()));
 			}
 		}
 	}
@@ -1109,13 +1104,13 @@ ThingTemplate::~ThingTemplate()
 	// note, we don't need to take any special action for Armor/WeaponSets...
 	// though it is just a list of 'raw' pointers, we don't have ownership of 'em,
 	// and so we MUST NOT delete them
-} 
+}
 
 //=============================================================================
 void ThingTemplate::resolveNames()
 {
 	Int i, j;
-	
+
 	//Kris: July 31, 2003
 	//NOTE: Make sure that all code in this function supports caching properly. For example,
 	//      templates can be partially overridden by map.ini files. When this happens, strings
@@ -1124,7 +1119,7 @@ void ThingTemplate::resolveNames()
 	//      so we will want to make sure we don't NULL out cached data if the string is empty. A
 	//      concrete example is overriding an object with prerequisites. We just override the portrait.
 	//      So the 1st time we call this function, we get the standard template data. During this first
-	//      call, the strings are looked up, cached, and cleared. Then we override the portrait in the 
+	//      call, the strings are looked up, cached, and cleared. Then we override the portrait in the
 	//      map.ini. The next time we call this function, we look up all the strings again. The prereq
 	//      names didn't used to check for empty strings so they would NULL out all the previous prereqs
 	//      the object had. So be sure to make sure all string lookups don't blindly lookup things -- check
@@ -1147,10 +1142,10 @@ void ThingTemplate::resolveNames()
 			// but ThingTemplate can muck with stuff with gleeful abandon. (srj)
 			if( tmpls[ j ] )
 				const_cast<ThingTemplate*>(tmpls[j])->m_isBuildFacility = true;
-			// DEBUG_LOG(("BF: %s is a buildfacility for %s\n",tmpls[j]->m_nameString.str(),this->m_nameString.str()));
+			// DEBUG_LOG(("BF: %s is a buildfacility for %s",tmpls[j]->m_nameString.str(),this->m_nameString.str()));
 		}
 	}
-	
+
 	if (isKindOf(KINDOF_COMMANDCENTER)) {
 		// Command centers are considered factories. jba.
 		m_isBuildFacility = true;
@@ -1182,7 +1177,7 @@ void ThingTemplate::initForLTA(const AsciiString& name)
 	m_nameString = name;
 
 	char buffer[1024];
-	strncpy(buffer, name.str(), sizeof(buffer));
+	strlcpy(buffer, name.str(), sizeof(buffer));
 	int i=0;
 	for (; buffer[i]; i++) {
 		if (buffer[i] == '/') {
@@ -1218,7 +1213,7 @@ void ThingTemplate::initForLTA(const AsciiString& name)
 	m_shadowType = SHADOW_VOLUME;
 
 	m_geometryInfo.set(GEOMETRY_SPHERE, false, 10.0, 10.0, 10.0);
-	
+
 }
 #endif
 
@@ -1240,7 +1235,7 @@ const WeaponTemplateSet* ThingTemplate::findWeaponTemplateSet(const WeaponSetFla
 // returns false if we have no weaponsets, or they are all empty.
 Bool ThingTemplate::canPossiblyHaveAnyWeapon() const
 {
-	for (WeaponTemplateSetVector::const_iterator it = m_weaponTemplateSets.begin(); 
+	for (WeaponTemplateSetVector::const_iterator it = m_weaponTemplateSets.begin();
 					it != m_weaponTemplateSets.end();
 					++it)
 	{
@@ -1251,13 +1246,13 @@ Bool ThingTemplate::canPossiblyHaveAnyWeapon() const
 }
 
 //-----------------------------------------------------------------------------
-Int ThingTemplate::getSkillPointValue(Int level) const 
-{ 
-	Int value = m_skillPointValues[level]; 
-	
+Int ThingTemplate::getSkillPointValue(Int level) const
+{
+	Int value = m_skillPointValues[level];
+
 	if (value == USE_EXP_VALUE_FOR_SKILL_VALUE)
 		value = getExperienceValue(level);
-	
+
 	return value;
 }
 
@@ -1275,27 +1270,27 @@ const ThingTemplate *ThingTemplate::getBuildFacilityTemplate( const Player *play
 }
 
 //-------------------------------------------------------------------------------------------------
-BuildableStatus ThingTemplate::getBuildable() const 
-{ 
+BuildableStatus ThingTemplate::getBuildable() const
+{
 	BuildableStatus bs;
 	if (TheGameLogic && TheGameLogic->findBuildableStatusOverride(this, bs))
 		return bs;
 
-	return (BuildableStatus)m_buildable; 
+	return (BuildableStatus)m_buildable;
 }
 
 //-------------------------------------------------------------------------------------------------
 const FXList *ThingTemplate::getPerUnitFX(const AsciiString& fxName) const
 {
-	if (fxName.isEmpty()) 
+	if (fxName.isEmpty())
 	{
 		return NULL;
 	}
-	
+
 	PerUnitFXMap::const_iterator it = m_perUnitFX.find(fxName);
-	if (it == m_perUnitFX.end()) 
+	if (it == m_perUnitFX.end())
 	{
-		DEBUG_CRASH(("Unknown FX name (%s) asked for in ThingTemplate (%s). ", fxName.str(), m_nameString.str()));
+		DEBUG_CRASH(("Unknown FX name (%s) asked for in ThingTemplate (%s)", fxName.str(), m_nameString.str()));
 		return NULL;
 	}
 
@@ -1305,15 +1300,15 @@ const FXList *ThingTemplate::getPerUnitFX(const AsciiString& fxName) const
 //-------------------------------------------------------------------------------------------------
 const AudioEventRTS *ThingTemplate::getPerUnitSound(const AsciiString& soundName) const
 {
-	if (soundName.isEmpty()) 
+	if (soundName.isEmpty())
 	{
 		return &s_audioEventNoSound;
 	}
-	
+
 	PerUnitSoundMap::const_iterator it = m_perUnitSounds.find(soundName);
-	if (it == m_perUnitSounds.end()) 
+	if (it == m_perUnitSounds.end())
 	{
-		DEBUG_LOG(("Unknown Audio name (%s) asked for in ThingTemplate (%s).\n", soundName.str(), m_nameString.str()));
+		DEBUG_LOG(("Unknown Audio name (%s) asked for in ThingTemplate (%s).", soundName.str(), m_nameString.str()));
 		return &s_audioEventNoSound;
 	}
 
@@ -1324,14 +1319,14 @@ const AudioEventRTS *ThingTemplate::getPerUnitSound(const AsciiString& soundName
 Bool ThingTemplate::isEquivalentTo(const ThingTemplate* tt) const
 {
 	// sanity
-	if (!(this && tt)) 
+	if (!tt)
 		return false;
 
 	// sanity
-	if (this == tt) 
+	if (this == tt)
 		return true;
-	
-	if (this->getFinalOverride() == tt->getFinalOverride()) 
+
+	if (this->getFinalOverride() == tt->getFinalOverride())
 		return true;
 
 	// This reskinned from that?
@@ -1351,10 +1346,10 @@ Bool ThingTemplate::isEquivalentTo(const ThingTemplate* tt) const
 	Int i;
 
 	Int numVariations = m_buildVariations.size();
-	for (i = 0; i < numVariations; ++i) 
+	for (i = 0; i < numVariations; ++i)
 		if (m_buildVariations[i].compareNoCase(tt->getName()) == 0)
 			return true;
-	
+
 	numVariations = tt->m_buildVariations.size();
 	for (i = 0; i < numVariations; ++i)
 		if (tt->m_buildVariations[i].compareNoCase(getName()) == 0)
@@ -1399,7 +1394,7 @@ Int ThingTemplate::calcTimeToBuild( const Player* player) const
 	Real factionModifier = 1 + player->getProductionTimeChangePercent( getName() );
 	buildTime *= factionModifier;
 
-#if defined (RTS_DEBUG) || defined (RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if( player->buildsInstantly() )
 	{
 		buildTime = 1;
diff --git a/Generals/Code/GameEngine/Source/Common/UserPreferences.cpp b/Generals/Code/GameEngine/Source/Common/UserPreferences.cpp
index a8efb383cdd..656b5f4ebf6 100644
--- a/Generals/Code/GameEngine/Source/Common/UserPreferences.cpp
+++ b/Generals/Code/GameEngine/Source/Common/UserPreferences.cpp
@@ -31,7 +31,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -50,11 +50,6 @@
 #include "GameClient/MapUtil.h"
 #include "GameNetwork/GameSpy/PeerDefs.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -107,7 +102,7 @@ static AsciiString realAsStr(Real val)
 
 
 //-----------------------------------------------------------------------------
-// UserPreferences Class 
+// UserPreferences Class
 //-----------------------------------------------------------------------------
 
 UserPreferences::UserPreferences( void )
@@ -147,7 +142,7 @@ Bool UserPreferences::load(AsciiString fname)
 				continue;
 
 			(*this)[key] = val;
-		}  // end while
+		}
 		fclose(fp);
 		return true;
 	}
@@ -240,7 +235,7 @@ void UserPreferences::setAsciiString(AsciiString key, AsciiString val)
 }
 
 //-----------------------------------------------------------------------------
-// QuickMatchPreferences base class 
+// QuickMatchPreferences base class
 //-----------------------------------------------------------------------------
 
 QuickMatchPreferences::QuickMatchPreferences()
@@ -425,7 +420,7 @@ Int QuickMatchPreferences::getSide( void )
 }
 
 //-----------------------------------------------------------------------------
-// CustomMatchPreferences base class 
+// CustomMatchPreferences base class
 //-----------------------------------------------------------------------------
 
 CustomMatchPreferences::CustomMatchPreferences()
@@ -667,7 +662,7 @@ AsciiString CustomMatchPreferences::getPreferredMap(void)
 		ret = getDefaultMap(TRUE);
 		return ret;
 	}
-	
+
 	return ret;
 }
 
@@ -676,8 +671,90 @@ void CustomMatchPreferences::setPreferredMap(AsciiString val)
 	(*this)["Map"] = AsciiStringToQuotedPrintable(val);
 }
 
+
+static const char superweaponRestrictionKey[] = "SuperweaponRestrict";
+
+Bool CustomMatchPreferences::getSuperweaponRestricted(void) const
+{
+  const_iterator it = find(superweaponRestrictionKey);
+  if (it == end())
+  {
+    return false;
+  }
+
+  return ( it->second.compareNoCase( "yes" ) == 0 );
+}
+
+void CustomMatchPreferences::setSuperweaponRestricted( Bool superweaponRestricted )
+{
+  (*this)[superweaponRestrictionKey] = superweaponRestricted ? "Yes" : "No";
+}
+
+static const char startingCashKey[] = "StartingCash";
+Money CustomMatchPreferences::getStartingCash(void) const
+{
+  const_iterator it = find(startingCashKey);
+  if (it == end())
+  {
+    return TheMultiplayerSettings->getDefaultStartingMoney();
+  }
+
+  Money money;
+  money.deposit( strtoul( it->second.str(), NULL, 10 ), FALSE, FALSE );
+
+  return money;
+}
+
+void CustomMatchPreferences::setStartingCash( const Money & startingCash )
+{
+  AsciiString option;
+
+  option.format( "%d", startingCash.countMoney() );
+
+  (*this)[startingCashKey] = option;
+}
+
+
+static const char limitFactionsKey[] = "LimitArmies";
+
+// Prefers to only use the original 3 sides, not USA Air Force General, GLA Toxin General, et al
+Bool CustomMatchPreferences::getFactionsLimited(void) const
+{
+  const_iterator it = find(limitFactionsKey);
+  if (it == end())
+  {
+    return false; // The default
+  }
+
+  return ( it->second.compareNoCase( "yes" ) == 0 );
+}
+
+void CustomMatchPreferences::setFactionsLimited( Bool factionsLimited )
+{
+  (*this)[limitFactionsKey] = factionsLimited ? "Yes" : "No";
+}
+
+
+static const char useStatsKey[] = "UseStats";
+
+Bool CustomMatchPreferences::getUseStats(void) const
+{
+  const_iterator it = find(useStatsKey);
+  if (it == end())
+  {
+    return true; // The default
+  }
+
+  return ( it->second.compareNoCase( "yes" ) == 0 );
+}
+
+void CustomMatchPreferences::setUseStats( Bool useStats )
+{
+  (*this)[useStatsKey] = useStats ? "Yes" : "No";
+}
+
 //-----------------------------------------------------------------------------
-// GameSpyMiscPreferences base class 
+// GameSpyMiscPreferences base class
 //-----------------------------------------------------------------------------
 
 GameSpyMiscPreferences::GameSpyMiscPreferences()
@@ -723,7 +800,7 @@ Int GameSpyMiscPreferences::getMaxMessagesPerUpdate( void )
 }
 
 //-----------------------------------------------------------------------------
-// IgnorePreferences base class 
+// IgnorePreferences base class
 //-----------------------------------------------------------------------------
 
 IgnorePreferences::IgnorePreferences()
@@ -756,7 +833,7 @@ void IgnorePreferences::setIgnore(const AsciiString& userName, Int profileID, Bo
 IgnorePrefMap IgnorePreferences::getIgnores(void)
 {
 	IgnorePrefMap ignores;
-	
+
 	IgnorePreferences::iterator it;
 	for (it = begin(); it != end(); ++it)
 	{
@@ -771,7 +848,7 @@ IgnorePrefMap IgnorePreferences::getIgnores(void)
 }
 
 //-----------------------------------------------------------------------------
-// LadderPreferences base class 
+// LadderPreferences base class
 //-----------------------------------------------------------------------------
 
 LadderPreferences::LadderPreferences()
@@ -799,7 +876,7 @@ Bool LadderPreferences::loadProfile( Int profileID )
 		AsciiString ladName = it->first;
 		AsciiString ladData = it->second;
 
-		DEBUG_LOG(("Looking at [%s] = [%s]\n", ladName.str(), ladData.str()));
+		DEBUG_LOG(("Looking at [%s] = [%s]", ladName.str(), ladData.str()));
 
 		const char *ptr = ladName.reverseFind(':');
 		DEBUG_ASSERTCRASH(ptr, ("Did not find ':' in ladder name - skipping"));
@@ -807,11 +884,7 @@ Bool LadderPreferences::loadProfile( Int profileID )
 			continue;
 
 		p.port = atoi( ptr + 1 );
-		Int i=0;
-		for (; i<strlen(ptr); ++i)
-		{
-			ladName.removeLastChar();
-		}
+		ladName.truncateBy(strlen(ptr));
 		p.address = QuotedPrintableToAsciiString(ladName);
 
 		ptr = ladData.reverseFind(':');
@@ -820,10 +893,7 @@ Bool LadderPreferences::loadProfile( Int profileID )
 			continue;
 
 		p.lastPlayDate = atoi( ptr + 1 );
-		for (i=0; i<strlen(ptr); ++i)
-		{
-			ladData.removeLastChar();
-		}
+		ladData.truncateBy(strlen(ptr));
 		p.name = QuotedPrintableToUnicodeString(ladData);
 
 		m_ladders[p.lastPlayDate] = p;
diff --git a/Generals/Code/GameEngine/Source/Common/crc.cpp b/Generals/Code/GameEngine/Source/Common/crc.cpp
deleted file mode 100644
index f3cbc369e2a..00000000000
--- a/Generals/Code/GameEngine/Source/Common/crc.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/crc.h"
-#include "Common/Debug.h"
-
-#ifdef RTS_DEBUG
-
-void CRC::addCRC( UnsignedByte val )
-{
-	int hibit;
-
-	//cout << "\t\t" << hex << val;
-//	val = htonl(val);
-	//cout << " / " << hex << val <<endl;
-
-
-	if (crc & 0x80000000) {
-		hibit = 1;
-	} else {
-		hibit = 0;
-	}
-
-	crc <<= 1;
-	crc += val;
-	crc += hibit;
-
-	//cout << hex << (*crc) <<endl;
-}
-
-
-void CRC::computeCRC( const void *buf, Int len )
-{
-	if (!buf || len < 1)
-	{
-		return;
-	}
-
-	//crc = 0;
-
-	UnsignedByte *uintPtr = (UnsignedByte *)buf;
-
-	for (int i=0 ; i<len ; i++) {
-		addCRC (*(uintPtr++));
-	}
-	//crc = htonl(crc);
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-UnsignedInt CRC::get( void )
-{
-
-	UnsignedInt tcrc = crc;
-	return tcrc;
-
-}  // end skip
-
-#endif
diff --git a/Generals/Code/GameEngine/Source/Common/version.cpp b/Generals/Code/GameEngine/Source/Common/version.cpp
index fb772144574..0c6375cfafa 100644
--- a/Generals/Code/GameEngine/Source/Common/version.cpp
+++ b/Generals/Code/GameEngine/Source/Common/version.cpp
@@ -26,11 +26,13 @@
 // Generals version number class
 // Author: Matthew D. Campbell, November 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameText.h"
 #include "Common/version.h"
 
+#include "gitinfo.h"
+
 Version *TheVersion = NULL;	///< The Version singleton
 
 Version::Version()
@@ -39,9 +41,15 @@ Version::Version()
 	m_minor = 0;
 	m_buildNum = 0;
 	m_localBuildNum = 0;
-	m_buildUser = AsciiString("somebody");
-	m_buildLocation = AsciiString("somewhere");
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+	m_buildUser = AsciiString::TheEmptyString;
+	m_buildLocation = AsciiString::TheEmptyString;
+	m_asciiGitCommitCount = buildAsciiGitCommitCount();
+	m_asciiGitTagOrHash = buildAsciiGitTagOrHash();
+	m_asciiGitCommitTime = buildAsciiGitCommitTime();
+	m_unicodeGitCommitCount = buildUnicodeGitCommitCount();
+	m_unicodeGitTagOrHash = buildUnicodeGitTagOrHash();
+	m_unicodeGitCommitTime = buildUnicodeGitCommitTime();
+#if defined(RTS_DEBUG)
 	m_showFullVersion = TRUE;
 #else
 	m_showFullVersion = FALSE;
@@ -62,74 +70,78 @@ void Version::setVersion(Int major, Int minor, Int buildNum,
 	m_buildDate = buildDate;
 }
 
-UnsignedInt Version::getVersionNumber( void )
+UnsignedInt Version::getVersionNumber() const
 {
 	return m_major << 16 | m_minor;
 }
 
-AsciiString Version::getAsciiVersion( void )
+AsciiString Version::getAsciiVersion() const
 {
 	AsciiString version;
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	if (m_localBuildNum)
-		version.format("%d.%d.%d.%d%c%c", m_major, m_minor, m_buildNum, m_localBuildNum,
-			m_buildUser.getCharAt(0), m_buildUser.getCharAt(1));
-	else
-		version.format("%d.%d.%d", m_major, m_minor, m_buildNum);
-#else // defined RTS_DEBUG || defined RTS_INTERNAL
-	version.format("%d.%d", m_major, m_minor);
-#endif // defined RTS_DEBUG || defined RTS_INTERNAL
-
-	return version;
-}
-
-UnicodeString Version::getUnicodeVersion( void )
-{
-	UnicodeString version;
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	if (!m_localBuildNum)
-		version.format(TheGameText->fetch("Version:Format3").str(), m_major, m_minor, m_buildNum);
+	if (m_showFullVersion)
+	{
+		if (!m_localBuildNum)
+		{
+			version.format("%d.%d.%d", m_major, m_minor, m_buildNum);
+		}
+		else
+		{
+			AsciiString user = getAsciiBuildUserOrGitCommitAuthorName();
+			// User name requires at least 2 characters
+			if (user.getLength() < 2)
+				user.concat("xx");
+
+			version.format("%d.%d.%d.%d%c%c", m_major, m_minor, m_buildNum, m_localBuildNum,
+				user.getCharAt(0), user.getCharAt(1));
+		}
+	}
 	else
-		version.format(TheGameText->fetch("Version:Format4").str(), m_major, m_minor, m_buildNum, m_localBuildNum,
-			m_buildUser.getCharAt(0), m_buildUser.getCharAt(1));
-#else // defined RTS_DEBUG || defined RTS_INTERNAL
-	version.format(TheGameText->fetch("Version:Format2").str(), m_major, m_minor);
-#endif // defined RTS_DEBUG || defined RTS_INTERNAL
+	{
+		version.format("%d.%d", m_major, m_minor);
+	}
 
 #ifdef RTS_DEBUG
-	version.concat(UnicodeString(L" Debug"));
-#endif
-
-#ifdef RTS_INTERNAL
-	version.concat(UnicodeString(L" Internal"));
+	version.concat(" Debug");
 #endif
 
 	return version;
 }
 
-UnicodeString Version::getFullUnicodeVersion( void )
+UnicodeString Version::getUnicodeVersion() const
 {
 	UnicodeString version;
 
-	if (!m_localBuildNum)
-		version.format(TheGameText->fetch("Version:Format3").str(), m_major, m_minor, m_buildNum);
+	if (m_showFullVersion)
+	{
+		if (!m_localBuildNum)
+		{
+			version.format(TheGameText->fetch("Version:Format3").str(), m_major, m_minor, m_buildNum);
+		}
+		else
+		{
+			UnicodeString user = getUnicodeBuildUserOrGitCommitAuthorName();
+			// User name requires at least 2 characters
+			if (user.getLength() < 2)
+				user.concat(L"xx");
+
+			version.format(TheGameText->fetch("Version:Format4").str(), m_major, m_minor, m_buildNum, m_localBuildNum,
+				user.getCharAt(0), user.getCharAt(1));
+		}
+	}
 	else
-		version.format(TheGameText->fetch("Version:Format4").str(), m_major, m_minor, m_buildNum, m_localBuildNum,
-			m_buildUser.getCharAt(0), m_buildUser.getCharAt(1));
+	{
+		version.format(TheGameText->fetch("Version:Format2").str(), m_major, m_minor);
+	}
 
 #ifdef RTS_DEBUG
-	version.concat(UnicodeString(L" Debug"));
-#endif
-
-#ifdef RTS_INTERNAL
-	version.concat(UnicodeString(L" Internal"));
+	version.concat(L" Debug");
 #endif
 
 	return version;
 }
 
-AsciiString Version::getAsciiBuildTime( void )
+AsciiString Version::getAsciiBuildTime() const
 {
 	AsciiString timeStr;
 	timeStr.format("%s %s", m_buildDate.str(), m_buildTime.str());
@@ -137,7 +149,7 @@ AsciiString Version::getAsciiBuildTime( void )
 	return timeStr;
 }
 
-UnicodeString Version::getUnicodeBuildTime( void )
+UnicodeString Version::getUnicodeBuildTime() const
 {
 	UnicodeString build;
 	UnicodeString dateStr;
@@ -150,34 +162,264 @@ UnicodeString Version::getUnicodeBuildTime( void )
 	return build;
 }
 
-AsciiString Version::getAsciiBuildLocation( void )
+AsciiString Version::getAsciiBuildLocation() const
 {
-	return AsciiString(m_buildLocation);
+	return m_buildLocation;
 }
 
-UnicodeString Version::getUnicodeBuildLocation( void )
+UnicodeString Version::getUnicodeBuildLocation() const
 {
 	UnicodeString build;
-	UnicodeString machine;
 
-	machine.translate(AsciiString(m_buildLocation));
-	build.format(TheGameText->fetch("Version:BuildMachine").str(), machine.str());
+	if (!m_buildLocation.isEmpty())
+	{
+		UnicodeString machine;
+		machine.translate(m_buildLocation);
+		build.format(TheGameText->fetch("Version:BuildMachine").str(), machine.str());
+	}
 
 	return build;
 }
 
-AsciiString Version::getAsciiBuildUser( void )
+AsciiString Version::getAsciiBuildUser() const
 {
-	return AsciiString(m_buildUser);
+	return m_buildUser;
 }
 
-UnicodeString Version::getUnicodeBuildUser( void )
+UnicodeString Version::getUnicodeBuildUser() const
 {
 	UnicodeString build;
-	UnicodeString user;
 
-	user.translate(AsciiString(m_buildUser));
-	build.format(TheGameText->fetch("Version:BuildUser").str(), user.str());
+	if (!m_buildUser.isEmpty())
+	{
+		UnicodeString user;
+		user.translate(m_buildUser);
+		build.format(TheGameText->fetch("Version:BuildUser").str(), user.str());
+	}
 
 	return build;
 }
+
+Int Version::getGitCommitCount()
+{
+	return GitRevision;
+}
+
+time_t Version::getGitCommitTime()
+{
+	return GitCommitTimeStamp;
+}
+
+const char* Version::getGitCommitAuthorName()
+{
+	return GitCommitAuthorName;
+}
+
+AsciiString Version::getAsciiGitCommitCount() const
+{
+	return m_asciiGitCommitCount;
+}
+
+UnicodeString Version::getUnicodeGitCommitCount() const
+{
+	return m_unicodeGitCommitCount;
+}
+
+AsciiString Version::getAsciiGitTagOrHash() const
+{
+	return m_asciiGitTagOrHash;
+}
+
+UnicodeString Version::getUnicodeGitTagOrHash() const
+{
+	return m_unicodeGitTagOrHash;
+}
+
+AsciiString Version::getAsciiGitCommitTime() const
+{
+	return m_asciiGitCommitTime;
+}
+
+UnicodeString Version::getUnicodeGitCommitTime() const
+{
+	return m_unicodeGitCommitTime;
+}
+
+AsciiString Version::getAsciiGitVersion() const
+{
+	AsciiString str;
+	if (m_showFullVersion)
+	{
+		str.format("%s %s",
+			getAsciiGitCommitCount().str(),
+			getAsciiGitTagOrHash().str());
+	}
+	else
+	{
+		str.format("%s",
+			getAsciiGitCommitCount().str());
+	}
+	return str;
+}
+
+UnicodeString Version::getUnicodeGitVersion() const
+{
+	UnicodeString str;
+	if (m_showFullVersion)
+	{
+		str.format(L"%s %s",
+			getUnicodeGitCommitCount().str(),
+			getUnicodeGitTagOrHash().str());
+	}
+	else
+	{
+		str.format(L"%s",
+			getUnicodeGitCommitCount().str());
+	}
+	return str;
+}
+
+AsciiString Version::getAsciiBuildUserOrGitCommitAuthorName() const
+{
+	AsciiString asciiUser = getAsciiBuildUser();
+
+	if (asciiUser.isEmpty())
+	{
+		asciiUser = getGitCommitAuthorName();
+	}
+
+	return asciiUser;
+}
+
+UnicodeString Version::getUnicodeBuildUserOrGitCommitAuthorName() const
+{
+	UnicodeString str;
+	AsciiString asciiUser = getAsciiBuildUserOrGitCommitAuthorName();
+
+	if (!asciiUser.isEmpty())
+	{
+		UnicodeString unicodeUser;
+		unicodeUser.translate(asciiUser);
+		str.format(TheGameText->fetch("Version:BuildUser").str(), unicodeUser.str());
+	}
+
+	return str;
+}
+
+UnicodeString Version::getUnicodeProductTitle() const
+{
+	// @todo Make configurable
+	return L"Community Patch";
+}
+
+UnicodeString Version::getUnicodeProductVersion() const
+{
+	return getUnicodeGitVersion();
+}
+
+UnicodeString Version::getUnicodeProductAuthor() const
+{
+	return getUnicodeBuildUserOrGitCommitAuthorName();
+}
+
+UnicodeString Version::getUnicodeProductString() const
+{
+	UnicodeString str;
+	UnicodeString productTitle = TheGameText->FETCH_OR_SUBSTITUTE("Version:ProductTitle", getUnicodeProductTitle().str());
+
+	if (!productTitle.isEmpty())
+	{
+		UnicodeString productVersion = TheGameText->FETCH_OR_SUBSTITUTE("Version:ProductVersion", getUnicodeProductVersion().str());
+		UnicodeString productAuthor = TheGameText->FETCH_OR_SUBSTITUTE("Version:ProductAuthor", getUnicodeProductAuthor().str());
+
+		str.concat(productTitle);
+
+		if (!productVersion.isEmpty())
+		{
+			str.concat(L" ");
+			str.concat(productVersion);
+		}
+
+		if (!productAuthor.isEmpty())
+		{
+			str.concat(L" ");
+			str.concat(productAuthor);
+		}
+	}
+
+	return str;
+}
+
+UnicodeString Version::getUnicodeProductVersionHashString() const
+{
+	UnicodeString str;
+	UnicodeString productString = getUnicodeProductString();
+	UnicodeString gameVersion = getUnicodeVersion();
+	UnicodeString gameHash;
+	gameHash.format(L"exe:%08X ini:%08X", TheGlobalData->m_exeCRC, TheGlobalData->m_iniCRC);
+
+	if (!productString.isEmpty())
+	{
+		str.concat(productString);
+		str.concat(L" | ");
+	}
+	str.concat(gameHash);
+	str.concat(L" ");
+	str.concat(gameVersion);
+
+	return str;
+}
+
+AsciiString Version::buildAsciiGitCommitCount()
+{
+	AsciiString str;
+	str.format("%s%d",
+		GitUncommittedChanges ? "~" : "",
+		GitRevision);
+	return str;
+}
+
+UnicodeString Version::buildUnicodeGitCommitCount()
+{
+	UnicodeString str;
+	str.format(L"%s%d",
+		GitUncommittedChanges ? L"~" : L"",
+		GitRevision);
+	return str;
+}
+
+AsciiString Version::buildAsciiGitTagOrHash()
+{
+	AsciiString str;
+	str.format("%s%s",
+		GitUncommittedChanges ? "~" : "",
+		GitTag[0] ? GitTag : GitShortSHA1);
+	return str;
+}
+
+UnicodeString Version::buildUnicodeGitTagOrHash()
+{
+	UnicodeString str;
+	str.translate(buildAsciiGitTagOrHash());
+	return str;
+}
+
+AsciiString Version::buildAsciiGitCommitTime()
+{
+	const Int len = 19;
+	AsciiString str;
+	Char* buf = str.getBufferForRead(len);
+	tm* time = gmtime(&GitCommitTimeStamp);
+	strftime(buf, len+1, "%Y-%m-%d %H:%M:%S", time);
+	return str;
+}
+
+UnicodeString Version::buildUnicodeGitCommitTime()
+{
+	const Int len = 19;
+	UnicodeString str;
+	WideChar* buf = str.getBufferForRead(len);
+	tm* time = gmtime(&GitCommitTimeStamp);
+	wcsftime(buf, len+1, L"%Y-%m-%d %H:%M:%S", time);
+	return str;
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/ClientInstance.cpp b/Generals/Code/GameEngine/Source/GameClient/ClientInstance.cpp
index 2ac1ff33988..417bcbd323a 100644
--- a/Generals/Code/GameEngine/Source/GameClient/ClientInstance.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/ClientInstance.cpp
@@ -25,6 +25,12 @@ namespace rts
 HANDLE ClientInstance::s_mutexHandle = NULL;
 UnsignedInt ClientInstance::s_instanceIndex = 0;
 
+#if defined(RTS_MULTI_INSTANCE)
+Bool ClientInstance::s_isMultiInstance = true;
+#else
+Bool ClientInstance::s_isMultiInstance = false;
+#endif
+
 bool ClientInstance::initialize()
 {
 	if (isInitialized())
@@ -36,39 +42,42 @@ bool ClientInstance::initialize()
 	// WARNING: DO NOT use this number for any other application except Generals.
 	while (true)
 	{
-#if defined(RTS_MULTI_INSTANCE)
-		std::string guidStr = getFirstInstanceName();
-		if (s_instanceIndex > 0u)
-		{
-			char idStr[33];
-			itoa(s_instanceIndex, idStr, 10);
-			guidStr.push_back('-');
-			guidStr.append(idStr);
-		}
-		s_mutexHandle = CreateMutex(NULL, FALSE, guidStr.c_str());
-		if (GetLastError() == ERROR_ALREADY_EXISTS)
+		if (isMultiInstance())
 		{
-			if (s_mutexHandle != NULL)
+			std::string guidStr = getFirstInstanceName();
+			if (s_instanceIndex > 0u)
 			{
-				CloseHandle(s_mutexHandle);
-				s_mutexHandle = NULL;
+				char idStr[33];
+				itoa(s_instanceIndex, idStr, 10);
+				guidStr.push_back('-');
+				guidStr.append(idStr);
+			}
+			s_mutexHandle = CreateMutex(NULL, FALSE, guidStr.c_str());
+			if (GetLastError() == ERROR_ALREADY_EXISTS)
+			{
+				if (s_mutexHandle != NULL)
+				{
+					CloseHandle(s_mutexHandle);
+					s_mutexHandle = NULL;
+				}
+				// Try again with a new instance.
+				++s_instanceIndex;
+				continue;
 			}
-			// Try again with a new instance.
-			++s_instanceIndex;
-			continue;
 		}
-#else
-		s_mutexHandle = CreateMutex(NULL, FALSE, getFirstInstanceName());
-		if (GetLastError() == ERROR_ALREADY_EXISTS)
+		else
 		{
-			if (s_mutexHandle != NULL)
+			s_mutexHandle = CreateMutex(NULL, FALSE, getFirstInstanceName());
+			if (GetLastError() == ERROR_ALREADY_EXISTS)
 			{
-				CloseHandle(s_mutexHandle);
-				s_mutexHandle = NULL;
+				if (s_mutexHandle != NULL)
+				{
+					CloseHandle(s_mutexHandle);
+					s_mutexHandle = NULL;
+				}
+				return false;
 			}
-			return false;
 		}
-#endif
 		break;
 	}
 
@@ -80,6 +89,31 @@ bool ClientInstance::isInitialized()
 	return s_mutexHandle != NULL;
 }
 
+bool ClientInstance::isMultiInstance()
+{
+	return s_isMultiInstance;
+}
+
+void ClientInstance::setMultiInstance(bool v)
+{
+	if (isInitialized())
+	{
+		DEBUG_CRASH(("ClientInstance::setMultiInstance(%d) - cannot set multi instance after initialization", (int)v));
+		return;
+	}
+	s_isMultiInstance = v;
+}
+
+void ClientInstance::skipPrimaryInstance()
+{
+	if (isInitialized())
+	{
+		DEBUG_CRASH(("ClientInstance::skipPrimaryInstance() - cannot skip primary instance after initialization"));
+		return;
+	}
+	s_instanceIndex = 1;
+}
+
 UnsignedInt ClientInstance::getInstanceIndex()
 {
 	DEBUG_ASSERTLOG(isInitialized(), ("ClientInstance::isInitialized() failed"));
diff --git a/Generals/Code/GameEngine/Source/GameClient/Color.cpp b/Generals/Code/GameEngine/Source/GameClient/Color.cpp
index 36943ff01e1..7a6dca81dd2 100644
--- a/Generals/Code/GameEngine/Source/GameClient/Color.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/Color.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Color.cpp ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,7 +46,7 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/Color.h"
 
@@ -69,9 +69,9 @@
 // GameMakeColor ==============================================================
 /** Create a color representation given red, green, blue, and
 	* alpha components
-	* 
+	*
 	* NOTE: pure solid white (255, 255, 255, 255) will translate
-	* intoa -1 which is GAME_COLOR_UNDEFINED 
+	* intoa -1 which is GAME_COLOR_UNDEFINED
 	*/
 //=============================================================================
 
@@ -79,11 +79,6 @@
 /** Get the RGB color comonents of a color */
 //=============================================================================
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //Put on ice until later M Lorenzen
@@ -100,8 +95,8 @@ void GameGetColorComponents( Color color,
 	*red		= (color & 0x00FF0000) >> 16;
 	*green	= (color & 0x0000FF00) >> 8;
 	*blue		= (color & 0x000000FF);
-	
-}  // end GameGetColorComponents
+
+}
 
 //Put on ice until later M Lorenzen
 //void GameGetColorComponentsWithCheatSpy( Color color,
@@ -119,7 +114,7 @@ void GameGetColorComponents( Color color,
 //  s_cheaterHasBeenSpied |= *green & (1<<17);   // decoy
 //	*blue		|= (color & 0x000000FE) >> 0;        // decoy
 //  s_cheaterHasBeenSpied |= *blue  & (1<<25);   // decoy
-//	
+//
 //}  // end GameGetColorComponents
 
 void GameGetColorComponentsReal( Color color, Real *red, Real *green, Real *blue, Real *alpha )
@@ -129,7 +124,7 @@ void GameGetColorComponentsReal( Color color, Real *red, Real *green, Real *blue
 	*green	= ((color & 0x0000FF00) >> 8) / 255.0f;
 	*blue		= (color & 0x000000FF) / 255.0f;
 }
-															
+
 
 Color GameDarkenColor( Color color, Int percent )
 {
@@ -144,7 +139,7 @@ Color GameDarkenColor( Color color, Int percent )
 	b -= (b * percent / 100);
 
 // Put on ice until later M Lorenzen
-//  TheWritableGlobalData->m_cheaterHasBeenSpiedIfMyLowestBitIsTrue = (r<<24) | (g<<16) | (b<<8) | s_cheaterHasBeenSpied; 
+//  TheWritableGlobalData->m_cheaterHasBeenSpiedIfMyLowestBitIsTrue = (r<<24) | (g<<16) | (b<<8) | s_cheaterHasBeenSpied;
 //  DEBUG_ASSERTCRASH( TheWritableGlobalData->m_cheaterHasBeenSpiedIfMyLowestBitIsTrue == FALSE, ("DIRTY ROTTEN CHEATER"));
 //  //my, but this looks like we just stored an alpha value along with rgb into the global data
 
@@ -153,5 +148,5 @@ Color GameDarkenColor( Color color, Int percent )
 
 	return GameMakeColor(r,g,b,a);
 
-}// end GameDarkenColor
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/Credits.cpp b/Generals/Code/GameEngine/Source/GameClient/Credits.cpp
index c64ba754e86..2774ced465e 100644
--- a/Generals/Code/GameEngine/Source/GameClient/Credits.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/Credits.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Credits.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Dec 2002
@@ -37,7 +37,7 @@
 //	Filename: 	Credits.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	This is where all the credit texts is going to be held.
 //
 //-----------------------------------------------------------------------------
@@ -56,11 +56,6 @@
 #include "GameClient/Display.h"
 #include "GameClient/GameText.h"
 #include "GameClient/GlobalLanguage.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-----------------------------------------------------------------------------
@@ -68,7 +63,7 @@
 //-----------------------------------------------------------------------------
 CreditsManager *TheCredits = NULL;
 
-const FieldParse CreditsManager::m_creditsFieldParseTable[] = 
+const FieldParse CreditsManager::m_creditsFieldParseTable[] =
 {
 
 	{ "ScrollRate",					INI::parseInt,											NULL, offsetof( CreditsManager, m_scrollRate )	},
@@ -81,7 +76,7 @@ const FieldParse CreditsManager::m_creditsFieldParseTable[] =
 	{ "Blank",							CreditsManager::parseBlank,					NULL,	NULL  },
 	{ "Text",								CreditsManager::parseText,					NULL,	NULL  },
 
-	{ NULL,										NULL,													NULL, 0 }  // keep this last
+	{ NULL,										NULL,													NULL, 0 }
 
 };
 
@@ -92,14 +87,14 @@ const FieldParse CreditsManager::m_creditsFieldParseTable[] =
 void INI::parseCredits( INI *ini )
 {
 	// find existing item if present
-	DEBUG_ASSERTCRASH( TheCredits, ("parseCredits: TheCredits has not been ininialized yet.\n") );
+	DEBUG_ASSERTCRASH( TheCredits, ("parseCredits: TheCredits has not been ininialized yet.") );
 	if( !TheCredits )
 		return;
 
 	// parse the ini definition
 	ini->initFromINI( TheCredits, TheCredits->getFieldParse() );
 
-}  // end parseCommandButtonDefinition
+}
 
 
 CreditsLine::CreditsLine()
@@ -117,7 +112,7 @@ CreditsLine::~CreditsLine()
 		TheDisplayStringManager->freeDisplayString(m_displayString);
 	if(m_secondDisplayString)
 		TheDisplayStringManager->freeDisplayString(m_secondDisplayString);
-	
+
 	m_displayString = NULL;
 	m_secondDisplayString = NULL;
 }
@@ -130,7 +125,7 @@ CreditsManager::CreditsManager(void)
 	m_scrollDown = TRUE;	// if TRUE text will come from the top to the bottom if False, it will go from the bottom up
 	m_framesSinceStarted = 0;
 	m_titleColor = m_positionColor = m_normalColor = GameMakeColor(255,255,255,255);
-	
+
 	m_currentStyle = CREDIT_STYLE_NORMAL;
 	m_isFinished = FALSE;
 	m_normalFontHeight = 10;
@@ -160,18 +155,18 @@ void CreditsManager::load(void )
 {
 	INI ini;
 	// Read from INI all the ControlBarSchemes
-	ini.load( AsciiString( "Data\\INI\\Credits.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Credits", INI_LOAD_OVERWRITE, NULL );
 
 	if(m_scrollRatePerFrames <=0)
 		m_scrollRatePerFrames = 1;
 	if(m_scrollRate <=0)
 		m_scrollRate = 1;
-	
+
 	GameFont *font = TheFontLibrary->getFont(TheGlobalLanguageData->m_creditsNormalFont.name,
 														TheGlobalLanguageData->adjustFontSize(TheGlobalLanguageData->m_creditsNormalFont.size),
 														TheGlobalLanguageData->m_creditsNormalFont.bold);
 
-	m_normalFontHeight = font->height;
+	m_normalFontHeight = font ? font->height : 0;
 }
 
 void CreditsManager::reset( void )
@@ -188,10 +183,10 @@ void CreditsManager::update( void )
 	if(m_isFinished)
 		return;
 	m_framesSinceStarted++;
-	
+
 	if(m_framesSinceStarted%m_scrollRatePerFrames != 0)
 		return;
-	
+
 
 	Int y = 0;
 	Int yTest = 0;
@@ -219,27 +214,27 @@ void CreditsManager::update( void )
 		else
 			drawIt++;
 	}
-	
+
 	y= y + ((lastHeight + CREDIT_SPACE_OFFSET) * offsetStartMultiplyer);
-	
+
 	// is it time to add a new string?
 	if(!((m_scrollDown && (yTest >= start)) || (!m_scrollDown && (yTest  <= start))))
 		return;
-	
-	if(m_displayedCreditLineList.size() == 0 && m_creditLineListIt == m_creditLineList.end())
+
+	if(m_displayedCreditLineList.empty() && m_creditLineListIt == m_creditLineList.end())
 		m_isFinished = TRUE;
-	
+
 	if(m_creditLineListIt == m_creditLineList.end())
 		return;
 
 	CreditsLine *cLine = *m_creditLineListIt;
 	ICoord2D pos;
-	switch (cLine->m_style) 
+	switch (cLine->m_style)
 	{
 	case CREDIT_STYLE_TITLE:
 		{
 			cLine->m_color = m_titleColor;
-			
+
 			if(TheGlobalLanguageData&& !cLine->m_text.isEmpty())
 			{
 				DisplayString *ds = TheDisplayStringManager->newDisplayString();
@@ -260,7 +255,7 @@ void CreditsManager::update( void )
 	case CREDIT_STYLE_POSITION:
 		{
 			cLine->m_color = m_positionColor;
-			
+
 			if(TheGlobalLanguageData && !cLine->m_text.isEmpty())
 			{
 				DisplayString *ds = TheDisplayStringManager->newDisplayString();
@@ -281,7 +276,7 @@ void CreditsManager::update( void )
 	case CREDIT_STYLE_NORMAL:
 	 {
 			cLine->m_color = m_normalColor;
-			
+
 			if(TheGlobalLanguageData && !cLine->m_text.isEmpty())
 			{
 				DisplayString *ds = TheDisplayStringManager->newDisplayString();
@@ -302,7 +297,7 @@ void CreditsManager::update( void )
 	case CREDIT_STYLE_COLUMN:
 		{
 			cLine->m_color = m_normalColor;
-			
+
 			if(TheGlobalLanguageData && !cLine->m_text.isEmpty())
 			{
 				DisplayString *ds = TheDisplayStringManager->newDisplayString();
@@ -332,7 +327,7 @@ void CreditsManager::update( void )
 				cLine->m_pos.x = TheDisplay->getWidth()/2 - pos.x/2 ;
 				cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer);
 				cLine->m_secondDisplayString = ds;
-				
+
 			}
 		}
 		break;
@@ -348,7 +343,7 @@ void CreditsManager::update( void )
 
 	if(m_creditLineListIt != m_creditLineList.end())
 		m_creditLineListIt++;
-	
+
 }
 
 void CreditsManager::draw( void )
@@ -372,7 +367,7 @@ void CreditsManager::draw( void )
 		else
 			perc = 1.0f;
 		UnsignedByte r,g,b,a;
-		GameGetColorComponents(cLine->m_color, &r, &g, &b, &a);		
+		GameGetColorComponents(cLine->m_color, &r, &g, &b, &a);
 		Int color = GameMakeColor( r,g,b, a * perc);
 		Int bColor= GameMakeColor( 0,0,0, a * perc);
 
@@ -423,7 +418,7 @@ void CreditsManager::parseBlank( INI* ini, void *instance, void *store, const vo
 
 void CreditsManager::parseText( INI* ini, void *instance, void *store, const void *userData )
 {
-	
+
 	AsciiString asciiString = ini->getNextQuotedAsciiString();
 	CreditsManager *cManager = (CreditsManager *)instance;
 	cManager->addText(asciiString);
@@ -432,7 +427,7 @@ void CreditsManager::addText( AsciiString text )
 {
 	CreditsLine *cLine = new CreditsLine;
 
-	switch (m_currentStyle) 
+	switch (m_currentStyle)
 	{
 		case CREDIT_STYLE_TITLE:
 		case CREDIT_STYLE_POSITION:
@@ -447,7 +442,7 @@ void CreditsManager::addText( AsciiString text )
 			{
 				CreditsLineList::reverse_iterator rIt = m_creditLineList.rbegin();
 				CreditsLine *rcLine = *rIt;
-				if(rIt == m_creditLineList.rend() || rcLine->m_style != CREDIT_STYLE_COLUMN 
+				if(rIt == m_creditLineList.rend() || rcLine->m_style != CREDIT_STYLE_COLUMN
 				   || (rcLine->m_style == CREDIT_STYLE_COLUMN && rcLine->m_done == TRUE))
 				{
 					cLine->m_text = getUnicodeString(text);
@@ -465,7 +460,7 @@ void CreditsManager::addText( AsciiString text )
 			}
 			break;
 		default:
-			DEBUG_ASSERTCRASH( FALSE, ("CreditsManager::addText we tried to add a credit text with the wrong style before it.  Style is %d\n", m_currentStyle) );
+			DEBUG_ASSERTCRASH( FALSE, ("CreditsManager::addText we tried to add a credit text with the wrong style before it.  Style is %d", m_currentStyle) );
 			delete cLine;
 	}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/Display.cpp b/Generals/Code/GameEngine/Source/GameClient/Display.cpp
index 254bf55527f..e9acb876dfc 100644
--- a/Generals/Code/GameEngine/Source/GameClient/Display.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/Display.cpp
@@ -26,7 +26,7 @@
 // The implementation of the Display class
 // Author: Michael S. Booth, March 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/Display.h"
 #include "GameClient/Mouse.h"
@@ -57,18 +57,15 @@ Display::Display()
 	m_letterBoxEnabled = FALSE;
 	m_cinematicText = AsciiString::TheEmptyString;
 	m_cinematicFont = NULL;
-	m_cinematicTextFrames = 0;  
+	m_cinematicTextFrames = 0;
 	m_movieHoldTime	= -1;
 	m_copyrightHoldTime = -1;
 	m_elapsedMovieTime = 0;
 	m_elapsedCopywriteTime = 0;
 	m_copyrightDisplayString = NULL;
 
-	// Added by Sadullah Nader
-	// Initializations missing and needed
 	m_currentlyPlayingMovie.clear();
 	m_letterBoxFadeStartTime = 0;
-	// End Add
 }
 
 /**
@@ -131,12 +128,20 @@ void Display::updateViews( void )
 
 }
 
+void Display::stepViews( void )
+{
+
+	for( View *v = m_viewList; v; v = v->getNextView() )
+		v->stepView();
+
+}
+
 /// Redraw the entire display
 void Display::draw( void )
 {
 	// redraw all views
 	drawViews();
-	
+
 	// redraw the in-game user interface
 	/// @todo Switch between in-game and shell interfaces
 
@@ -177,7 +182,7 @@ void Display::setWidth( UnsignedInt width )
 	if( TheMouse )
 		TheMouse->setMouseLimits();
 
-}  // end setWidth
+}
 
 // Display::setHeight =========================================================
 /** Set the height of the display */
@@ -192,7 +197,7 @@ void Display::setHeight( UnsignedInt height )
 	if( TheMouse )
 		TheMouse->setMouseLimits();
 
-}  // end setHeight
+}
 
 //============================================================================
 // Display::playLogoMovie
@@ -202,7 +207,7 @@ void Display::setHeight( UnsignedInt height )
 
 void Display::playLogoMovie( AsciiString movieName, Int minMovieLength, Int minCopyrightLength )
 {
-	
+
 	stopMovie();
 
 	m_videoStream = TheVideoPlayer->open( movieName );
@@ -211,22 +216,22 @@ void Display::playLogoMovie( AsciiString movieName, Int minMovieLength, Int minC
 	{
 		return;
 	}
-	
+
 	m_currentlyPlayingMovie = movieName;
 	m_movieHoldTime = minMovieLength;
 	m_copyrightHoldTime = minCopyrightLength;
 	m_elapsedMovieTime = timeGetTime();  // we're using time get time becuase legal want's actual "Seconds"
-	
+
 	m_videoBuffer = createVideoBuffer();
-	if (	m_videoBuffer == NULL || 
-				!m_videoBuffer->allocate(	m_videoStream->width(), 
+	if (	m_videoBuffer == NULL ||
+				!m_videoBuffer->allocate(	m_videoStream->width(),
 													m_videoStream->height())
 		)
 	{
 		stopMovie();
 		return;
 	}
-	
+
 }
 
 //============================================================================
@@ -235,7 +240,7 @@ void Display::playLogoMovie( AsciiString movieName, Int minMovieLength, Int minC
 
 void Display::playMovie( AsciiString movieName)
 {
-	
+
 	stopMovie();
 
 
@@ -246,19 +251,19 @@ void Display::playMovie( AsciiString movieName)
 	{
 		return;
 	}
-	
+
 	m_currentlyPlayingMovie = movieName;
 
 	m_videoBuffer = createVideoBuffer();
-	if (	m_videoBuffer == NULL || 
-				!m_videoBuffer->allocate(	m_videoStream->width(), 
+	if (	m_videoBuffer == NULL ||
+				!m_videoBuffer->allocate(	m_videoStream->width(),
 													m_videoStream->height())
 		)
 	{
 		stopMovie();
 		return;
 	}
-	
+
 }
 
 //============================================================================
@@ -307,23 +312,22 @@ void Display::update( void )
 			{
 				if( m_elapsedCopywriteTime == 0 && m_elapsedCopywriteTime >= 0)
 				{
-					//display the copyrighttext;		
-					if(m_copyrightDisplayString)
-						deleteInstance(m_copyrightDisplayString);
+					//display the copyrighttext;
+					deleteInstance(m_copyrightDisplayString);
 					m_copyrightDisplayString = TheDisplayStringManager->newDisplayString();
 					m_copyrightDisplayString->setText(TheGameText->fetch("GUI:EACopyright"));
 					if (TheGlobalLanguageData && TheGlobalLanguageData->m_copyrightFont.name.isNotEmpty())
 					{	FontDesc	*fontdesc=&TheGlobalLanguageData->m_copyrightFont;
 						m_copyrightDisplayString->setFont(TheFontLibrary->getFont(fontdesc->name,
 							TheGlobalLanguageData->adjustFontSize(fontdesc->size),
-							fontdesc->bold));	
+							fontdesc->bold));
 					}
 					else
-						m_copyrightDisplayString->setFont(TheFontLibrary->getFont("Courier", 
-						TheGlobalLanguageData->adjustFontSize(12), TRUE));	
+						m_copyrightDisplayString->setFont(TheFontLibrary->getFont("Courier",
+						TheGlobalLanguageData->adjustFontSize(12), TRUE));
 					m_elapsedCopywriteTime = timeGetTime();
 				}
-				if(m_movieHoldTime + m_elapsedMovieTime < timeGetTime() && 
+				if(m_movieHoldTime + m_elapsedMovieTime < timeGetTime() &&
 						m_copyrightHoldTime + m_elapsedCopywriteTime < timeGetTime())
 				{
 					m_movieHoldTime = -1;
diff --git a/Generals/Code/GameEngine/Source/GameClient/DisplayString.cpp b/Generals/Code/GameEngine/Source/GameClient/DisplayString.cpp
index dc41dfba13c..ee1bf2f028c 100644
--- a/Generals/Code/GameEngine/Source/GameClient/DisplayString.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/DisplayString.cpp
@@ -24,12 +24,12 @@
 
 // FILE: DisplayString.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,7 +45,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
@@ -79,7 +79,7 @@ DisplayString::DisplayString( void )
 	m_next = NULL;
 	m_prev = NULL;
 
-}  // end DisplayString
+}
 
 // DisplayString::~DisplayString ==============================================
 /** */
@@ -90,14 +90,14 @@ DisplayString::~DisplayString( void )
 	// free any data
 	reset();
 
-}  // end ~DisplayString
+}
 
 // DisplayString::setText =====================================================
 /** Copy the text to this instance */
 //=============================================================================
 void DisplayString::setText( UnicodeString text )
 {
-	if (text == m_textString) 
+	if (text == m_textString)
 		return;
 
 	m_textString = text;
@@ -105,7 +105,7 @@ void DisplayString::setText( UnicodeString text )
 	// our text has now changed
 	notifyTextChanged();
 
-}  // end setText
+}
 
 // DisplayString::reset =======================================================
 /** Free and reset all the data for this string, effectively making this
@@ -119,7 +119,7 @@ void DisplayString::reset( void )
 	// no font
 	m_font = NULL;
 
-}  // end reset
+}
 
 // DisplayString::removeLastChar ==============================================
 /** Remove the last character from the string text */
@@ -131,7 +131,32 @@ void DisplayString::removeLastChar( void )
 	// our text has now changed
 	notifyTextChanged();
 
-}  // end removeLastChar
+}
+
+// DisplayString::truncateBy ==================================================
+/** Remove the last charCount characters from the string text */
+//=============================================================================
+void DisplayString::truncateBy(const Int charCount)
+{
+	m_textString.truncateBy(charCount);
+
+	// our text has now changed
+	notifyTextChanged();
+
+}
+
+// DisplayString::truncateTo ==================================================
+/** Remove the last characters from the string text so it's at the most
+	* maxLength characters long */
+	//=============================================================================
+void DisplayString::truncateTo(const Int maxLength)
+{
+	m_textString.truncateTo(maxLength);
+
+	// our text has now changed
+	notifyTextChanged();
+
+}
 
 // DisplayString::appendChar ==================================================
 /** Append character to the end of the string */
@@ -143,5 +168,5 @@ void DisplayString::appendChar( WideChar c )
 	// text has now changed
 	notifyTextChanged();
 
-}  // end appendchar
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/DisplayStringManager.cpp b/Generals/Code/GameEngine/Source/GameClient/DisplayStringManager.cpp
index 8d6730586aa..fc7dd99c500 100644
--- a/Generals/Code/GameEngine/Source/GameClient/DisplayStringManager.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/DisplayStringManager.cpp
@@ -27,7 +27,7 @@
 // Desc:       Access for creating game managed display strings
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/DisplayStringManager.h"
 
@@ -46,7 +46,7 @@ DisplayStringManager::DisplayStringManager( void )
 	m_stringList = NULL;
 	m_currentCheckpoint = NULL;
 
-}  // end DisplayStringManager
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -59,7 +59,7 @@ DisplayStringManager::~DisplayStringManager( void )
 	//
 	assert( m_stringList == NULL );
 
-}  // end ~DisplayStringManager
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Link a display string to the master list */
@@ -77,7 +77,7 @@ void DisplayStringManager::link( DisplayString *string )
 
 	m_stringList = string;
 
-}  // end link
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Unlink a display string from the master list */
@@ -98,6 +98,6 @@ void DisplayStringManager::unLink( DisplayString *string )
 		assert( string == m_stringList );
 		m_stringList = string->m_next;
 
-	}  // end else
+	}
 
-}  // end unLink
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/DrawGroupInfo.cpp b/Generals/Code/GameEngine/Source/GameClient/DrawGroupInfo.cpp
index c58f2f6904d..1e4b3994161 100644
--- a/Generals/Code/GameEngine/Source/GameClient/DrawGroupInfo.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/DrawGroupInfo.cpp
@@ -25,8 +25,8 @@
 // DrawGroupInfo.cpp //////////////////////////////////////////////////////////////////////////////
 // Author: John McDonald, October 2002
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/DrawGroupInfo.h"
 
@@ -52,4 +52,4 @@ DrawGroupInfo::DrawGroupInfo()
 	m_usingPixelOffsetY = TRUE;
 }
 
-DrawGroupInfo *TheDrawGroupInfo = NULL;
\ No newline at end of file
+DrawGroupInfo *TheDrawGroupInfo = NULL;
diff --git a/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp b/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp
index 58cf782784f..b7284e0c45e 100644
--- a/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp
@@ -26,8 +26,8 @@
 // "Drawables" - graphical GameClient entities bound to GameLogic objects
 // Author: Michael S. Booth, March 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-  
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioEventInfo.h"
 #include "Common/AudioSettings.h"
@@ -35,10 +35,11 @@
 #include "Common/BuildAssistant.h"
 #include "Common/ClientUpdateModule.h"
 #include "Common/DrawModule.h"
+#include "Common/FramePacer.h"
 #include "Common/GameAudio.h"
-#include "Common/GameEngine.h"
 #include "Common/GameLOD.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/ModuleFactory.h"
 #include "Common/PerfTimer.h"
@@ -63,6 +64,7 @@
 #include "GameLogic/Weapon.h"
 
 #include "GameClient/Anim2D.h"
+#include "GameClient/ControlBar.h"
 #include "GameClient/Display.h"
 #include "GameClient/DisplayStringManager.h"
 #include "GameClient/Drawable.h"
@@ -76,16 +78,12 @@
 #include "GameClient/Shadow.h"
 #include "GameClient/GameText.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+#include "ww3d.h"
 
 #define VERY_TRANSPARENT_HEATVISION (0.001f)
 #define HEATVISION_FADE_SCALAR (0.8f)
 
-static const char *TheDrawableIconNames[] = 
+static const char *const TheDrawableIconNames[] =
 {
 	"DefaultHeal",
 	"StructureHeal",
@@ -107,6 +105,7 @@ static const char *TheDrawableIconNames[] =
 	"CarBomb",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheDrawableIconNames) == MAX_ICONS + 1, "Incorrect array size");
 
 
 
@@ -135,8 +134,7 @@ void DrawableIconInfo::clear()
 {
 	for (int i = 0; i < MAX_ICONS; ++i)
 	{
-		if (m_icon[i])
-			deleteInstance(m_icon[i]);
+		deleteInstance(m_icon[i]);
 		m_icon[i] = NULL;
 		m_keepTillFrame[i] = 0;
 	}
@@ -192,18 +190,18 @@ static const char *drawableIconIndexToName( DrawableIconType iconIndex )
 {
 
 	DEBUG_ASSERTCRASH( iconIndex >= ICON_FIRST && iconIndex < MAX_ICONS,
-										 ("drawableIconIndexToName - Illegal index '%d'\n", iconIndex) );
+										 ("drawableIconIndexToName - Illegal index '%d'", iconIndex) );
 
 	return TheDrawableIconNames[ iconIndex ];
 
-}  // end drawableIconIndexToName
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 static DrawableIconType drawableIconNameToIndex( const char *iconName )
 {
 
-	DEBUG_ASSERTCRASH( iconName != NULL, ("drawableIconNameToIndex - Illegal name\n") );
+	DEBUG_ASSERTCRASH( iconName != NULL, ("drawableIconNameToIndex - Illegal name") );
 
 	for( Int i = ICON_FIRST; i < MAX_ICONS; ++i )
 		if( stricmp( TheDrawableIconNames[ i ], iconName ) == 0 )
@@ -211,7 +209,7 @@ static DrawableIconType drawableIconNameToIndex( const char *iconName )
 
 	return ICON_INVALID;
 
-}  // end drawableIconNameToIndex
+}
 
 // ------------------------------------------------------------------------------------------------
 // constants
@@ -252,7 +250,7 @@ const Int MAX_ENABLED_MODULES								= 16;
 	s_emptyAmmo	= TheMappedImageCollection->findImageByName("SCPAmmoEmpty");
 	s_fullContainer	= TheMappedImageCollection->findImageByName("SCPPipFull");
 	s_emptyContainer	= TheMappedImageCollection->findImageByName("SCPPipEmpty");
-	
+
 	s_animationTemplates = NEW Anim2DTemplate* [ MAX_ICONS ];
 
 	s_animationTemplates[ICON_DEFAULT_HEAL]			= TheAnim2DCollection->findTemplate(TheDrawableIconNames[ICON_DEFAULT_HEAL]);
@@ -279,11 +277,8 @@ const Int MAX_ENABLED_MODULES								= 16;
 //-------------------------------------------------------------------------------------------------
 /*static*/ void Drawable::killStaticImages()
 {
-	if( s_animationTemplates )
-	{
-		delete[] s_animationTemplates;
-		s_animationTemplates = NULL;
-	}
+	delete[] s_animationTemplates;
+	s_animationTemplates = NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -314,18 +309,15 @@ void Drawable::saturateRGB(RGBColor& color, Real factor)
  * graphical side of a logical object, whereas GameLogic objects encapsulate
  * behaviors and physics.  */
 //-------------------------------------------------------------------------------------------------
-Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBits ) 
+Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statusBits )
 				: Thing( thingTemplate )
 {
 
 	// assign status bits before anything else can be done
 	m_status = statusBits;
-	
-	// Added By Sadullah Nader
-	// Initialization missing and needed
+
 	m_nextDrawable = NULL;
 	m_prevDrawable = NULL;
-	//
 
 	// register drawable with the GameClient ... do this first before we start doing anything
 	// complex that uses any of the drawable data so that we have and ID!!  It's ok to initialize
@@ -335,17 +327,12 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 
 	Int i;
 
-	// Added By Sadullah Nader
-	// Initialization missing and needed
 	m_flashColor = 0;
 	m_selected = '\0';
-	//
 
 	m_expirationDate = 0;  // 0 == never expires
 
 	m_lastConstructDisplayed = -1.0f;
-	
-	//Added By Sadullah Nader
 	//Fix for the building percent
 	m_constructDisplayString = TheDisplayStringManager->newDisplayString();
 	m_constructDisplayString->setFont(TheFontLibrary->getFont(TheInGameUI->getDrawableCaptionFontName(),
@@ -367,7 +354,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 	m_timeElapsedFade = 0;
 	m_timeToFade = 0;
 
-	m_shroudClearFrame = 0;
+	m_shroudClearFrame = InvalidShroudClearFrame;
 
 	for (i = 0; i < NUM_DRAWABLE_MODULE_TYPES; ++i)
 		m_modules[i] = NULL;
@@ -377,6 +364,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 	m_flashCount = 0;
 
 	m_locoInfo = NULL;
+	m_physicsXform = NULL;
 
 	// sanity
 	if( TheGameClient == NULL || thingTemplate == NULL )
@@ -385,7 +373,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	m_instance.Make_Identity();
 	m_instanceIsIdentity = true;
@@ -429,7 +417,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 	for (modIdx = 0; modIdx < drawMI.getCount(); ++modIdx)
 	{
 		const ModuleData* newModData = drawMI.getNthData(modIdx);
-		if (TheGlobalData->m_useDrawModuleLOD && 
+		if (TheGlobalData->m_useDrawModuleLOD &&
 				newModData->getMinimumRequiredGameLOD() > TheGameLODManager->getStaticLODLevel())
 			continue;
 		*m++ = TheModuleFactory->newModule(this, drawMI.getNthName(modIdx), newModData, MODULETYPE_DRAW);
@@ -447,7 +435,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 			const ModuleData* newModData = cuMI.getNthData(modIdx);
 
 	/// @todo srj -- this is evil, we shouldn't look at the module name directly!
-			if (thingTemplate->isKindOf(KINDOF_SHRUBBERY) && 
+			if (thingTemplate->isKindOf(KINDOF_SHRUBBERY) &&
 					!TheGlobalData->m_useTreeSway &&
 					cuMI.getNthName(modIdx).compareNoCase("SwayClientUpdate") == 0)
 				continue;
@@ -463,7 +451,15 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 		for (Module** m = m_modules[i]; m && *m; ++m)
 			(*m)->onObjectCreated();
 	}
-	
+
+	const Bool shadowsEnabled = getShadowsEnabled();
+
+	// TheSuperHackers @fix xezon 14/09/2025 Match the shadow states of all draw modules with this drawable.
+	for (DrawModule** dm = (DrawModule**)getModuleList(MODULETYPE_DRAW); *dm; ++dm)
+	{
+		(*dm)->setShadowsEnabled(shadowsEnabled);
+	}
+
 	m_groupNumber = NULL;
 	m_captionDisplayString = NULL;
 	m_drawableInfo.m_drawable = this;
@@ -473,11 +469,11 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 	m_selectionFlashEnvelope = NULL;	// lazily allocate!
 	m_colorTintEnvelope = NULL;				// lazily allocate!
 
-	initStaticImages(); 
+	initStaticImages();
 
 	startAmbientSound();
 
-}  // end Drawable
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -503,16 +499,14 @@ Drawable::~Drawable()
 			deleteInstance(*m);
 			*m = NULL;	// in case other modules call findModule from their dtor!
 		}
-		delete [] m_modules[i]; 
+		delete [] m_modules[i];
 		m_modules[i] = NULL;
 	}
 
 	stopAmbientSound();
-	if (m_ambientSound)
-	{
-		deleteInstance(m_ambientSound);
-		m_ambientSound = NULL;
-	}
+
+	deleteInstance(m_ambientSound);
+	m_ambientSound = NULL;
 
 	/// @todo this is nasty, we need a real general effects system
 	// remove any entries that might be present from the ray effect system
@@ -523,20 +517,19 @@ Drawable::~Drawable()
 	m_particle = NULL;
 
 	// delete any icons present
-	if (m_iconInfo)
-		deleteInstance(m_iconInfo);
+	deleteInstance(m_iconInfo);
+	m_iconInfo = NULL;
 
-	if (m_selectionFlashEnvelope)
-		deleteInstance(m_selectionFlashEnvelope);
+	deleteInstance(m_selectionFlashEnvelope);
+	m_selectionFlashEnvelope = NULL;
 
-	if (m_colorTintEnvelope)
-		deleteInstance(m_colorTintEnvelope);
+	deleteInstance(m_colorTintEnvelope);
+	m_colorTintEnvelope = NULL;
 
-	if (m_locoInfo)
-	{
-		deleteInstance(m_locoInfo);
-		m_locoInfo = NULL;
-	}
+	deleteInstance(m_locoInfo);
+	m_locoInfo = NULL;
+
+	delete m_physicsXform;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -555,9 +548,9 @@ void Drawable::onDestroy( void )
 		for( Module** m = m_modules[ i ]; m && *m; ++m )
 			(*m)->onDelete();
 
-	}  // end for i
+	}
 
-}  // end onDestroy
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool Drawable::isVisible()
@@ -584,13 +577,13 @@ Bool Drawable::getShouldAnimate( Bool considerPower ) const
 
 		if (obj->isDisabled())
 		{
-			if( obj->isDisabledByType( DISABLED_HACKED ) 
-				|| obj->isDisabledByType( DISABLED_PARALYZED ) 
-				|| obj->isDisabledByType( DISABLED_EMP ) 
+			if( obj->isDisabledByType( DISABLED_HACKED )
+				|| obj->isDisabledByType( DISABLED_PARALYZED )
+				|| obj->isDisabledByType( DISABLED_EMP )
 				// srj sez: unmanned things also should not animate. (eg, gattling tanks,
 				// which have a slight barrel animation even when at rest). if this causes
 				// a problem, we will need to fix gattling tanks in another way.
-				|| obj->isDisabledByType( DISABLED_UNMANNED ) 
+				|| obj->isDisabledByType( DISABLED_UNMANNED )
 				)
 				return FALSE;
 
@@ -681,7 +674,7 @@ void Drawable::showSubObject( const AsciiString& name, Bool show )
 // srj sez: not sure if this is a good idea, for net sync reasons...
 //-------------------------------------------------------------------------------------------------
 /**
-	This call asks, "In the current animation (if any) how far along are you, from 0.0f to 1.0f". 
+	This call asks, "In the current animation (if any) how far along are you, from 0.0f to 1.0f".
 */
 Real Drawable::getAnimationScrubScalar( void ) const // lorenzen
 {
@@ -693,7 +686,7 @@ Real Drawable::getAnimationScrubScalar( void ) const // lorenzen
 			return di->getAnimationScrubScalar();
 		}
 	}
-	
+
 	return 0.0f;
 
 }
@@ -711,7 +704,7 @@ Int Drawable::getPristineBonePositions(const char* boneNamePrefix, Int startInde
 		const ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
 		if (di)
 		{
-			Int subcount = 
+			Int subcount =
 				di->getPristineBonePositionsForConditionState(m_conditionState, boneNamePrefix, startIndex, positions, transforms, maxBones);
 
 			if (subcount > 0)
@@ -740,7 +733,7 @@ Int Drawable::getCurrentClientBonePositions(const char* boneNamePrefix, Int star
 		const ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
 		if (di)
 		{
-			Int subcount = 
+			Int subcount =
 				di->getCurrentBonePositions(boneNamePrefix, startIndex, positions, transforms, maxBones);
 
 			if (subcount > 0)
@@ -881,23 +874,23 @@ void Drawable::setFullyObscuredByShroud(Bool fullyObscured)
 /** Set drawable's "selected" status, if not already set.  Also update running
  * total count of selected drawables. */
 //-------------------------------------------------------------------------------------------------
-void Drawable::friend_setSelected( void ) 
-{ 
+void Drawable::friend_setSelected( void )
+{
 	if(isSelected() == false)
 	{
 		m_selected = TRUE;
 		onSelected();
 	}
 
-}			
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Clear drawable's "selected" status, if not already clear.  Also update running
  * total count of selected drawables. */
 //-------------------------------------------------------------------------------------------------
-void Drawable::friend_clearSelected( void ) 
+void Drawable::friend_clearSelected( void )
 {
-	if(isSelected()) 
+	if(isSelected())
 	{
 		m_selected = FALSE;
 		onUnselected();
@@ -922,10 +915,7 @@ void Drawable::colorFlash( const RGBColor* color, UnsignedInt decayFrames, Unsig
 		white.setFromInt(0xffffffff);
 		m_colorTintEnvelope->play( &white );
 	}
-
-	// make sure the tint color is unlocked so we "fade back down" to normal
-	clearDrawableStatus( DRAWABLE_STATUS_TINT_COLOR_LOCKED );
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Tint a drawable a specified color */
@@ -935,11 +925,7 @@ void Drawable::colorTint( const RGBColor* color )
 	if( color )
 	{
 		// set the color via color flash
-		colorFlash( color, 0, 0, TRUE );
-
-		// lock the tint color so the flash never "fades back down"
-		setDrawableStatus( DRAWABLE_STATUS_TINT_COLOR_LOCKED );
-
+		colorFlash( color, 0, 0, ~0u );
 	}
 	else
 	{
@@ -948,10 +934,6 @@ void Drawable::colorTint( const RGBColor* color )
 
 		// remove the tint applied to the object
 		m_colorTintEnvelope->rest();
-
-		// set the tint as unlocked so we can flash and stuff again
-		clearDrawableStatus( DRAWABLE_STATUS_TINT_COLOR_LOCKED );
-
 	}
 
 }
@@ -963,7 +945,7 @@ void Drawable::onSelected()
 {
 
 	flashAsSelected();//much simpler
-	
+
 	Object* obj = getObject();
 	if ( obj )
 	{
@@ -974,7 +956,7 @@ void Drawable::onSelected()
 		}
 	}
 
-}  // end onSelected
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Gathering point for all things besides actual selection that must happen on deselection */
@@ -1017,7 +999,7 @@ const Vector3 * Drawable::getSelectionColor( void )	const
 
 }
 
-		
+
 //-------------------------------------------------------------------------------------------------
 /** fades the object out gradually...how gradually is determined by number of frames */
 //-------------------------------------------------------------------------------------------------
@@ -1043,16 +1025,16 @@ void Drawable::fadeIn( UnsignedInt frames )		///< decloak object
 
 //-------------------------------------------------------------------------------------------------
 Real Drawable::getScale (void) const
-{ 
-	return m_instanceScale; 
-//	return getTemplate()->getAssetScale(); 
+{
+	return m_instanceScale;
+//	return getTemplate()->getAssetScale();
 }
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void Drawable::reactToBodyDamageStateChange(BodyDamageType newState)
 {
-	static const ModelConditionFlagType TheDamageMap[BODYDAMAGETYPE_COUNT] = 
+	static const ModelConditionFlagType TheDamageMap[BODYDAMAGETYPE_COUNT] =
 	{
 		MODELCONDITION_INVALID,
 		MODELCONDITION_DAMAGED,
@@ -1065,7 +1047,7 @@ void Drawable::reactToBodyDamageStateChange(BodyDamageType newState)
 		newDamage.set(TheDamageMap[newState]);
 
 	clearAndSetModelConditionFlags(
-		MAKE_MODELCONDITION_MASK3(MODELCONDITION_DAMAGED, MODELCONDITION_REALLY_DAMAGED, MODELCONDITION_RUBBLE), 
+		MAKE_MODELCONDITION_MASK3(MODELCONDITION_DAMAGED, MODELCONDITION_REALLY_DAMAGED, MODELCONDITION_RUBBLE),
 		newDamage);
 
 	startAmbientSound(newState, TheGlobalData->m_timeOfDay);
@@ -1084,8 +1066,8 @@ void Drawable::setEffectiveOpacity( Real pulseFactor, Real explicitOpacity /* =
 	Real pulseMargin = (1.0f - m_stealthOpacity);
 	Real pulseAmount = pulseMargin * pf;
 
-	m_effectiveStealthOpacity = m_stealthOpacity + pulseAmount; 
-}		///< get alpha/opacity value used to override defaults when drawing.
+	m_effectiveStealthOpacity = m_stealthOpacity + pulseAmount;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** update is called once per frame */
@@ -1114,7 +1096,7 @@ void Drawable::updateDrawable( void )
 
 			setDrawableOpacity(numer/(Real)m_timeToFade);
 			++m_timeElapsedFade;
-			
+
 			if (m_timeElapsedFade > m_timeToFade)
 				m_fadeMode = FADING_NONE;
 		}
@@ -1148,7 +1130,7 @@ void Drawable::updateDrawable( void )
 				(*dm)->setTerrainDecalOpacity(m_decalOpacity);
 			}
 
-		}//end if (*dm)
+		}
 	}
 	else
 		m_decalOpacity = 0;
@@ -1177,7 +1159,7 @@ void Drawable::updateDrawable( void )
 
 	//Lets figure out whether we should be changing colors right about now
 	// we'll use an ifelseif ladder since we are scanning bits
-	if( m_prevTintStatus != m_tintStatus )// edge test 
+	if( m_prevTintStatus != m_tintStatus )// edge test
 	{
 		if ( testTintStatus( TINT_STATUS_DISABLED ) )
 		{
@@ -1197,8 +1179,8 @@ void Drawable::updateDrawable( void )
 //				m_colorTintEnvelope = newInstance(TintEnvelope);
 //			m_colorTintEnvelope->play( &RED_IRRADIATED_COLOR, 30, 30, SUSTAIN_INDEFINITELY);
 //		}
-		else 
-		{ 
+		else
+		{
 			// NO TINTING SHOULD BE PRESENT
 			if (m_colorTintEnvelope == NULL)
 				m_colorTintEnvelope = newInstance(TintEnvelope);
@@ -1222,12 +1204,12 @@ void Drawable::updateDrawable( void )
 		m_selectionFlashEnvelope->update(); // selection flashing
 
 	//If we have an ambient sound, and we aren't currently playing it, attempt to play it now
-	if( m_ambientSound && m_ambientSoundEnabled && !m_ambientSound->m_event.getEventName().isEmpty() && !m_ambientSound->m_event.isCurrentlyPlaying() ) 
+	if( m_ambientSound && m_ambientSoundEnabled && !m_ambientSound->m_event.getEventName().isEmpty() && !m_ambientSound->m_event.isCurrentlyPlaying() )
 	{
 		startAmbientSound();
 	}
-}	
- 
+}
+
 //-------------------------------------------------------------------------------------------------
 void Drawable::flashAsSelected( const RGBColor *color ) ///< drawable takes care of the details if you spec no color
 {
@@ -1243,7 +1225,7 @@ void Drawable::flashAsSelected( const RGBColor *color ) ///< drawable takes care
 		Object *obj = getObject();
 		if (obj)
 		{
-			RGBColor tempColor; 
+			RGBColor tempColor;
 			if (TheGlobalData->m_selectionFlashHouseColor)
 				tempColor.setFromInt(obj->getIndicatorColor());
 			else
@@ -1260,24 +1242,19 @@ void Drawable::flashAsSelected( const RGBColor *color ) ///< drawable takes care
 //-------------------------------------------------------------------------------------------------
 void Drawable::applyPhysicsXform(Matrix3D* mtx)
 {
-	const Object *obj = getObject();
-
-	if( !obj ||	obj->isDisabledByType( DISABLED_HELD ) || !TheGlobalData->m_showClientPhysics )
+	if (m_physicsXform != NULL)
 	{
-		return;
-	}
+		// TheSuperHackers @tweak Update the physics transform on every WW Sync only.
+		// All calculations are originally catered to a 30 fps logic step.
+		if (WW3D::Get_Sync_Frame_Time() != 0)
+		{
+			calcPhysicsXform(*m_physicsXform);
+		}
 
- 	Bool frozen = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
- 	frozen = frozen || TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript();
-	if (frozen)
-		return;
-	PhysicsXformInfo info;
-	if (calcPhysicsXform(info))
-	{
-		mtx->Translate(0.0f, 0.0f, info.m_totalZ);
-		mtx->Rotate_Y( info.m_totalPitch );
-		mtx->Rotate_X( -info.m_totalRoll );
-		mtx->Rotate_Z( info.m_totalYaw );
+		mtx->Translate(0.0f, 0.0f, m_physicsXform->m_totalZ);
+		mtx->Rotate_Y( m_physicsXform->m_totalPitch );
+		mtx->Rotate_X( -m_physicsXform->m_totalRoll );
+		mtx->Rotate_Z( m_physicsXform->m_totalYaw );
 	}
 }
 
@@ -1285,34 +1262,29 @@ void Drawable::applyPhysicsXform(Matrix3D* mtx)
 //-------------------------------------------------------------------------------------------------
 Bool Drawable::calcPhysicsXform(PhysicsXformInfo& info)
 {
-	const Object* obj = getObject();
-	const AIUpdateInterface *ai = obj ? obj->getAIUpdateInterface() : NULL;
 	Bool hasPhysicsXform = false;
-	if (ai) 
+
+	if (const Locomotor *locomotor = getLocomotor())
 	{
-		const Locomotor *locomotor = ai->getCurLocomotor(); 
-		if (locomotor) 
+		switch (locomotor->getAppearance())
 		{
-			switch (locomotor->getAppearance())
-			{
-				case LOCO_WHEELS_FOUR:
-					calcPhysicsXformWheels(locomotor, info);
-					hasPhysicsXform = true;
-					break;
-				case LOCO_TREADS:
-					calcPhysicsXformTreads(locomotor, info);
-					hasPhysicsXform = true;
-					break;
-				case LOCO_HOVER:
-				case LOCO_WINGS:
-					calcPhysicsXformHoverOrWings(locomotor, info);
-					hasPhysicsXform = true;
-					break;
-				case LOCO_THRUST:	
-					calcPhysicsXformThrust(locomotor, info);
-					hasPhysicsXform = true;
-					break;
-			}
+			case LOCO_WHEELS_FOUR:
+				calcPhysicsXformWheels(locomotor, info);
+				hasPhysicsXform = true;
+				break;
+			case LOCO_TREADS:
+				calcPhysicsXformTreads(locomotor, info);
+				hasPhysicsXform = true;
+				break;
+			case LOCO_HOVER:
+			case LOCO_WINGS:
+				calcPhysicsXformHoverOrWings(locomotor, info);
+				hasPhysicsXform = true;
+				break;
+			case LOCO_THRUST:
+				calcPhysicsXformThrust(locomotor, info);
+				hasPhysicsXform = true;
+				break;
 		}
 	}
 
@@ -1362,19 +1334,19 @@ void Drawable::calcPhysicsXformThrust( const Locomotor *locomotor, PhysicsXformI
 				m_locoInfo->m_pitch += WOBBLE_RATE;
 				m_locoInfo->m_yaw += WOBBLE_RATE;
 
-			}  // end if
+			}
 			else
 			{
 
 				m_locoInfo->m_pitch += (WOBBLE_RATE / 2.0f);
 				m_locoInfo->m_yaw += (WOBBLE_RATE / 2.0f);
 
-			}  // end else
+			}
 
 			if( m_locoInfo->m_pitch >= MAX_WOBBLE )
 				m_locoInfo->m_wobble = -1.0f;
 
-		}  // end if
+		}
 		else
 		{
 
@@ -1384,23 +1356,23 @@ void Drawable::calcPhysicsXformThrust( const Locomotor *locomotor, PhysicsXformI
 				m_locoInfo->m_pitch -= WOBBLE_RATE;
 				m_locoInfo->m_yaw -= WOBBLE_RATE;
 
-			}  // end if
+			}
 			else
 			{
 
 				m_locoInfo->m_pitch -= (WOBBLE_RATE / 2.0f);
 				m_locoInfo->m_yaw -= (WOBBLE_RATE / 2.0f);
 
-			}  // end else
+			}
 			if( m_locoInfo->m_pitch <= MIN_WOBBLE )
 				m_locoInfo->m_wobble = 1.0f;
 
-		}  // end else
+		}
 
 		info.m_totalPitch = m_locoInfo->m_pitch;
 		info.m_totalYaw = m_locoInfo->m_yaw;
 
-	}  // end if, wobble exists
+	}
 
 	if( THRUST_ROLL )
 	{
@@ -1408,7 +1380,7 @@ void Drawable::calcPhysicsXformThrust( const Locomotor *locomotor, PhysicsXformI
 		m_locoInfo->m_roll += THRUST_ROLL;
 		info.m_totalRoll = m_locoInfo->m_roll;
 
-	}  // end if
+	}
 
 }
 
@@ -1424,12 +1396,12 @@ void Drawable::calcPhysicsXformHoverOrWings( const Locomotor *locomotor, Physics
 	const Real ROLL_STIFFNESS =  locomotor->getRollStiffness();
 	const Real PITCH_DAMPING = locomotor->getPitchDamping();
 	const Real ROLL_DAMPING = locomotor->getRollDamping();
-	const Real Z_VEL_PITCH_COEFF = locomotor->getPitchByZVelCoef();	
-	const Real FORWARD_VEL_COEFF = locomotor->getForwardVelCoef();	
-	const Real LATERAL_VEL_COEFF = locomotor->getLateralVelCoef();	
-	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();	
-	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();	
-	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();	
+	const Real Z_VEL_PITCH_COEFF = locomotor->getPitchByZVelCoef();
+	const Real FORWARD_VEL_COEFF = locomotor->getForwardVelCoef();
+	const Real LATERAL_VEL_COEFF = locomotor->getLateralVelCoef();
+	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();
+	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();
+	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();
 
 	// get object from logic
 	Object *obj = getObject();
@@ -1469,7 +1441,7 @@ void Drawable::calcPhysicsXformHoverOrWings( const Locomotor *locomotor, Physics
 	info.m_totalPitch = m_locoInfo->m_pitch + m_locoInfo->m_accelerationPitch;
 	info.m_totalRoll = m_locoInfo->m_roll + m_locoInfo->m_accelerationRoll;
 
-	if (physics->isMotive()) 
+	if (physics->isMotive())
   {
 		if (Z_VEL_PITCH_COEFF != 0.0f)
 		{
@@ -1528,9 +1500,9 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
 	const Real ROLL_STIFFNESS =  locomotor->getRollStiffness();
 	const Real PITCH_DAMPING = locomotor->getPitchDamping();
 	const Real ROLL_DAMPING = locomotor->getRollDamping();
-	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();	
-	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();	
-	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();	
+	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();
+	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();
+	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();
 
 	// get object from logic
 	Object *obj = getObject();
@@ -1598,7 +1570,7 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
 			Real rough = (vel->x*vel->x + vel->y*vel->y) * OVERLAP_ROUGH_VIBRATION_FACTOR;
 			if (rough > MAX_ROUGH_VIBRATION)
 				rough = MAX_ROUGH_VIBRATION;
-			
+
 			Real height = overlapped->getGeometryInfo().getMaxHeightAbovePosition();
 
 			// do not "go up" flattened crushed things
@@ -1690,7 +1662,7 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
 	info.m_totalPitch = m_locoInfo->m_pitch + m_locoInfo->m_accelerationPitch;
 	info.m_totalRoll = m_locoInfo->m_roll + m_locoInfo->m_accelerationRoll;
 
-	if (physics->isMotive()) 
+	if (physics->isMotive())
 	{
 		// cause the chassis to pitch & roll in reaction to acceleration/deceleration
 		Real forwardAccel = dir->x * accel->x + dir->y * accel->y;
@@ -1720,7 +1692,7 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
 				Real lateral = perp.x * to.x + perp.y * to.y;
 
 				Real recoil = PI/16.0f * GameClientRandomValueReal( 0.5f, 1.0f );
-			
+
 				m_locoInfo->m_accelerationPitchRate -= recoil * forward;
 				m_locoInfo->m_accelerationRollRate -= recoil * lateral;
 			}
@@ -1750,7 +1722,7 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
 		// m_locoInfo->m_overlapZ += 0.4f;
 		m_locoInfo->m_overlapZVel = 0.0f;
 	}
-	
+
 	Real ztmp = m_locoInfo->m_overlapZ/2.0f;
 
 	// do fake Z physics
@@ -1763,7 +1735,7 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
 	if (m_locoInfo->m_overlapZ <= 0.0f)
 	{
 		m_locoInfo->m_overlapZ = 0.0f;
-		m_locoInfo->m_overlapZVel = 0.0f; 
+		m_locoInfo->m_overlapZVel = 0.0f;
 	}
 	info.m_totalZ = ztmp;
 }
@@ -1781,9 +1753,9 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 	const Real ROLL_STIFFNESS =  locomotor->getRollStiffness();
 	const Real PITCH_DAMPING = locomotor->getPitchDamping();
 	const Real ROLL_DAMPING = locomotor->getRollDamping();
-	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();	
-	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();	
-	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();	
+	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();
+	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();
+	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();
 
 	const Real MAX_SUSPENSION_EXTENSION = locomotor->getMaxWheelExtension(); //-2.3f;
 //	const Real MAX_SUSPENSION_COMPRESSION = locomotor->getMaxWheelCompression(); //1.4f;
@@ -1828,19 +1800,19 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 
 	Bool airborne = obj->isSignificantlyAboveTerrain();
 
-	if (airborne) 
+	if (airborne)
 	{
-		if (DO_WHEELS) 
-		{	
+		if (DO_WHEELS)
+		{
 			// Wheels extend when airborne.
 			m_locoInfo->m_wheelInfo.m_framesAirborne = 0;
 			m_locoInfo->m_wheelInfo.m_framesAirborneCounter++;
-			if (pos->z - hheight > -MAX_SUSPENSION_EXTENSION) 
+			if (pos->z - hheight > -MAX_SUSPENSION_EXTENSION)
 			{
 				m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset += (MAX_SUSPENSION_EXTENSION - m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset)/2.0f;
 				m_locoInfo->m_wheelInfo.m_rearRightHeightOffset += (MAX_SUSPENSION_EXTENSION - m_locoInfo->m_wheelInfo.m_rearRightHeightOffset)/2.0f;
-			} 
-			else 
+			}
+			else
 			{
 				m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset += (0 - m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset)/2.0f;
 				m_locoInfo->m_wheelInfo.m_rearRightHeightOffset += (0 - m_locoInfo->m_wheelInfo.m_rearRightHeightOffset)/2.0f;
@@ -1849,7 +1821,7 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 		// Calculate suspension info.
 		Real length = obj->getGeometryInfo().getMajorRadius();
 		Real width = obj->getGeometryInfo().getMinorRadius();
-		Real pitchHeight = length*Sin(m_locoInfo->m_pitch + m_locoInfo->m_accelerationPitch - groundPitch);	
+		Real pitchHeight = length*Sin(m_locoInfo->m_pitch + m_locoInfo->m_accelerationPitch - groundPitch);
 		Real rollHeight = width*Sin(m_locoInfo->m_roll + m_locoInfo->m_accelerationRoll - groundRoll);
 		info.m_totalZ = fabs(pitchHeight)/4 + fabs(rollHeight)/4;
 		return; // maintain the same orientation while we fly through the air.
@@ -1857,15 +1829,15 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 
 	// Bouncy.
 	Real curSpeed = physics->getVelocityMagnitude();
-#if 1 
+#if 1
 	Real maxSpeed = ai->getCurLocomotorSpeed();
-	if (!airborne && curSpeed > maxSpeed/10) 
+	if (!airborne && curSpeed > maxSpeed/10)
 	{
 		Real factor = curSpeed/maxSpeed;
-		if (fabs(m_locoInfo->m_pitchRate)<factor*BOUNCE_ANGLE_KICK/4 && fabs(m_locoInfo->m_rollRate)<factor*BOUNCE_ANGLE_KICK/8) 
+		if (fabs(m_locoInfo->m_pitchRate)<factor*BOUNCE_ANGLE_KICK/4 && fabs(m_locoInfo->m_rollRate)<factor*BOUNCE_ANGLE_KICK/8)
 		{
-			// do the bouncy. 
-			switch (GameClientRandomValue(0,3)) 
+			// do the bouncy.
+			switch (GameClientRandomValue(0,3))
 			{
 			case 0:
 				m_locoInfo->m_pitchRate -= BOUNCE_ANGLE_KICK*factor;
@@ -1916,7 +1888,7 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 	info.m_totalPitch = m_locoInfo->m_pitch + m_locoInfo->m_accelerationPitch;
 	info.m_totalRoll = m_locoInfo->m_roll + m_locoInfo->m_accelerationRoll;
 
-	if (physics->isMotive()) 
+	if (physics->isMotive())
 	{
 		// cause the chassis to pitch & roll in reaction to acceleration/deceleration
 		Real forwardAccel = dir->x * accel->x + dir->y * accel->y;
@@ -1945,8 +1917,8 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 	Real width = obj->getGeometryInfo().getMinorRadius();
 	Real pitchHeight = length*Sin(info.m_totalPitch-groundPitch);
 	Real rollHeight = width*Sin(info.m_totalRoll-groundRoll);
-	if (DO_WHEELS) 
-	{	
+	if (DO_WHEELS)
+	{
 		// calculate each wheel position
 		m_locoInfo->m_wheelInfo.m_framesAirborne = m_locoInfo->m_wheelInfo.m_framesAirborneCounter;
 		m_locoInfo->m_wheelInfo.m_framesAirborneCounter = 0;
@@ -1966,11 +1938,11 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 
 		//
 		///@todo Steven/John ... please review this and make sure it makes sense (CBD)
-		// we're going to add the angle to the current wheel rotation ... but we're going to 
+		// we're going to add the angle to the current wheel rotation ... but we're going to
 		// divide that number to add small angles.  This allows for "smoother" wheel turning
 		// transitions ... and when the AI has things move in a straight line, since it's
 		// constantly telling the object to go left, go straight, go right, go straight,
-		// etc, this smaller angle we'll be adding covers the constant wheel shifting 
+		// etc, this smaller angle we'll be adding covers the constant wheel shifting
 		// left and right when moving in a relatively straight line
 		//
 		#define WHEEL_SMOOTHNESS 10.0f  // higher numbers add smaller angles, make it more "smooth"
@@ -2048,7 +2020,7 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 		}
 		if (m_locoInfo->m_wheelInfo.m_rearRightHeightOffset>MAX_SUSPENSION_COMPRESSION) {
 			m_locoInfo->m_wheelInfo.m_rearRightHeightOffset=MAX_SUSPENSION_COMPRESSION;
-		}	
+		}
 		*/
 	}
 	// If we are > 22 degrees, need to raise height;
@@ -2089,14 +2061,14 @@ void Drawable::validatePos() const
 	const Coord3D* ourPos = getPosition();
 	if (_isnan(ourPos->x) || _isnan(ourPos->y) || _isnan(ourPos->z))
 	{
-		DEBUG_CRASH(("Drawable/Object position NAN! '%s'\n", getTemplate()->getName().str()));
+		DEBUG_CRASH(("Drawable/Object position NAN! '%s'", getTemplate()->getName().str()));
 	}
 	if (getObject())
 	{
 		const Coord3D* objPos = getObject()->getPosition();
 		if (ourPos->x != objPos->x || ourPos->y != objPos->y || ourPos->z != objPos->z)
 		{
-			DEBUG_CRASH(("Drawable/Object position mismatch! '%s'\n", getTemplate()->getName().str()));
+			DEBUG_CRASH(("Drawable/Object position mismatch! '%s'", getTemplate()->getName().str()));
 		}
 	}
 }
@@ -2158,7 +2130,7 @@ void Drawable::setStealthLook(StealthLookType look)
 
 				break;
 			}
-			
+
 			case STEALTHLOOK_DISGUISED_ENEMY:
 				m_hiddenByStealth = false;
 				m_heatVisionOpacity = 0.0f;
@@ -2189,7 +2161,7 @@ void Drawable::setStealthLook(StealthLookType look)
 //-------------------------------------------------------------------------------------------------
 /** default draw is to just call the database defined draw */
 //-------------------------------------------------------------------------------------------------
-void Drawable::draw( View *view )
+void Drawable::draw()
 {
 
 	if ( getObject() && getObject()->isEffectivelyDead() )
@@ -2224,7 +2196,10 @@ void Drawable::draw( View *view )
 #endif
 	}
 
-	applyPhysicsXform(&transformMtx);
+	if (TheGlobalData->m_showClientPhysics && getObject() && !getObject()->isDisabledByType( DISABLED_HELD ))
+	{
+		applyPhysicsXform(&transformMtx);
+	}
 
 	for (DrawModule** dm = getDrawModules(); *dm; ++dm)
 	{
@@ -2261,8 +2236,8 @@ static Bool computeHealthRegion( const Drawable *draw, IRegion2D& region )
 	Real zoom = TheTacticalView->getZoom();
 	//Real widthScale = 1.3f / zoom;
 	Real widthScale = 1.0f / zoom;
-	//Real heightScale = 0.8f / zoom; 
-	Real heightScale = 1.0f; 
+	//Real heightScale = 0.8f / zoom;
+	Real heightScale = 1.0f;
 
 	healthBoxWidth *= widthScale;
 	healthBoxHeight *= heightScale;
@@ -2279,28 +2254,28 @@ static Bool computeHealthRegion( const Drawable *draw, IRegion2D& region )
 
 	return TRUE;
 
-}  // end computeHealthRegion
+}
 
 
 // ------------------------------------------------------------------------------------------------
 
 Bool Drawable::drawsAnyUIText( void )
 {
-	if (!isSelected()) 
+	if (!isSelected())
 		return FALSE;
 
 	const Object *obj = getObject();
-	if ( !obj || !obj->isLocallyControlled() )  
+	if ( !obj || obj->getControllingPlayer() != rts::getObservedOrLocalPlayer())
 		return FALSE;
 
 	Player *owner = obj->getControllingPlayer();
 	Int groupNum = owner->getSquadNumberForObject(obj);
 
-	if (groupNum > NO_HOTKEY_SQUAD && groupNum < NUM_HOTKEY_SQUADS ) 
+	if (groupNum > NO_HOTKEY_SQUAD && groupNum < NUM_HOTKEY_SQUADS )
 		return TRUE;
 	else
 		m_groupNumber = NULL;
-		
+
 	if ( obj->getFormationID() != NO_FORMATION_ID )
 		return TRUE;
 
@@ -2323,14 +2298,14 @@ void Drawable::drawIconUI( void )
 			healthBarRegion = &healthBarRegionStorage; //both data and a PointerAsFlag for logic in the methods below
 
 		Object *obj = getObject();
-		
+
 		// we only draw icons drawables with objects, so one bail here -------------------------
 		if ( ! obj )
 			return;
 
 		//Icons that can be drawn on dead things
-		drawHealthBar( healthBarRegion );                                        
-		drawEmoticon( healthBarRegion );                                         
+		drawHealthBar( healthBarRegion );
+		drawEmoticon( healthBarRegion );
 
 		drawCaption( healthBarRegion );
 		drawConstructPercent( healthBarRegion );
@@ -2340,25 +2315,25 @@ void Drawable::drawIconUI( void )
 			return;
 		drawHealing( healthBarRegion );//call so dead things can kill their healing icons
 		drawBombed( healthBarRegion );
-	
-	
+
+
 		//Disabled for multiplay!
 		//drawBattlePlans( healthBarRegion );
-	
+
 		if ( drawsAnyUIText() )
 			TheGameClient->addTextBearingDrawable( this );
 
-		drawEnthusiastic( healthBarRegion );                                       
+		drawEnthusiastic( healthBarRegion );
 #ifdef ALLOW_DEMORALIZE
 		drawDemoralized( healthBarRegion );
 #endif
 		drawDisabled( healthBarRegion );
 
-		drawAmmo( healthBarRegion );                
-		drawContained( healthBarRegion ); 
+		drawAmmo( healthBarRegion );
+		drawContained( healthBarRegion );
 
 		//Moved this to last so that it shows up over contained and ammo icons.
-		drawVeterancy( healthBarRegion ); 
+		drawVeterancy( healthBarRegion );
 	}
 }
 
@@ -2387,7 +2362,7 @@ void Drawable::setEmoticon( const AsciiString &name, Int duration )
 	Anim2DTemplate *animTemplate = TheAnim2DCollection->findTemplate( name );
 	if( animTemplate )
 	{
-		DEBUG_ASSERTCRASH( getIconInfo()->m_icon[ ICON_EMOTICON ] == NULL, ("Drawable::setEmoticon - Emoticon isn't empty, need to refuse to set or destroy the old one in favor of the new one\n") );
+		DEBUG_ASSERTCRASH( getIconInfo()->m_icon[ ICON_EMOTICON ] == NULL, ("Drawable::setEmoticon - Emoticon isn't empty, need to refuse to set or destroy the old one in favor of the new one") );
 		if( getIconInfo()->m_icon[ ICON_EMOTICON ] == NULL )
 		{
 			getIconInfo()->m_icon[ ICON_EMOTICON ] = newInstance(Anim2D)( animTemplate, TheAnim2DCollection );
@@ -2415,7 +2390,7 @@ void Drawable::drawEmoticon( const IRegion2D *healthBarRegion )
 			Int size = REAL_TO_INT( barWidth * 0.3f );
 			frameHeight = REAL_TO_INT((INT_TO_REAL(size) / INT_TO_REAL(frameWidth)) * frameHeight);
 			frameWidth = size;
-#endif			
+#endif
 			// given our scaled width and height we need to find the top left point to draw the image at
 			ICoord2D screen;
 			screen.x = (Int)(healthBarRegion->lo.x + (barWidth * 0.5f) - (frameWidth * 0.5f));
@@ -2434,12 +2409,12 @@ void Drawable::drawEmoticon( const IRegion2D *healthBarRegion )
 // ------------------------------------------------------------------------------------------------
 void Drawable::drawAmmo( const IRegion2D *healthBarRegion )
 {
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 
 	if (!(
-				TheGlobalData->m_showObjectHealth && 
+				TheGlobalData->m_showObjectHealth &&
 				(isSelected() || (TheInGameUI && (TheInGameUI->getMousedOverDrawableID() == getID()))) &&
-				obj->getControllingPlayer() == ThePlayerList->getLocalPlayer()
+				obj->getControllingPlayer() == rts::getObservedOrLocalPlayer()
 			))
 		return;
 
@@ -2452,7 +2427,7 @@ void Drawable::drawAmmo( const IRegion2D *healthBarRegion )
 		return;
 
 
-	
+
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 	Real scale = TheGlobalData->m_ammoPipScaleFactor / CLAMP_ICON_ZOOM_FACTOR( TheTacticalView->getZoom() );
 #else
@@ -2488,16 +2463,16 @@ void Drawable::drawAmmo( const IRegion2D *healthBarRegion )
 // ------------------------------------------------------------------------------------------------
 void Drawable::drawContained( const IRegion2D *healthBarRegion )
 {
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 
 	ContainModuleInterface* container = obj->getContain();
 	if (!container)
 		return;
 
 	if (!(
-				TheGlobalData->m_showObjectHealth && 
+				TheGlobalData->m_showObjectHealth &&
 				(isSelected() || (TheInGameUI && (TheInGameUI->getMousedOverDrawableID() == getID()))) &&
-				obj->getControllingPlayer() == ThePlayerList->getLocalPlayer()
+				obj->getControllingPlayer() == rts::getObservedOrLocalPlayer()
 			))
 		return;
 
@@ -2540,7 +2515,7 @@ void Drawable::drawContained( const IRegion2D *healthBarRegion )
 		return;
 
 	Real bounding = obj->getGeometryInfo().getBoundingSphereRadius() * scale;
-	
+
 	//Int posx = screenCenter.x + REAL_TO_INT(TheGlobalData->m_containerPipScreenOffset.x*bounding) - totalWidth;
 	//**CHANGING CODE: Left justify with health bar min
 	Int posx = healthBarRegion->lo.x;
@@ -2551,7 +2526,7 @@ void Drawable::drawContained( const IRegion2D *healthBarRegion )
 		const Color INFANTRY_COLOR = GameMakeColor(0, 255, 0, 255);
 		const Color NON_INFANTRY_COLOR = GameMakeColor(0, 0, 255, 255);
 		if (i < numFull)
-			TheDisplay->drawImage(s_fullContainer, posx, posy, posx + boxWidth, posy + boxHeight, 
+			TheDisplay->drawImage(s_fullContainer, posx, posy, posx + boxWidth, posy + boxHeight,
 				(i < numInfantry) ? INFANTRY_COLOR : NON_INFANTRY_COLOR);
 		else
 			TheDisplay->drawImage(s_emptyContainer, posx, posy + 1, posx + boxWidth, posy + 1 + boxHeight);
@@ -2581,14 +2556,14 @@ void Drawable::drawBattlePlans( const IRegion2D *healthBarRegion )
 			//Int barHeight = healthBarRegion.hi.y - healthBarRegion.lo.y;
 			Int frameWidth = getIconInfo()->m_icon[ ICON_BATTLEPLAN_BOMBARD ]->getCurrentFrameWidth();
 			Int frameHeight = getIconInfo()->m_icon[ ICON_BATTLEPLAN_BOMBARD ]->getCurrentFrameHeight();
-			
+
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 			// adjust the width to be a % of the health bar region size
 			Int barWidth = healthBarRegion->hi.x - healthBarRegion->lo.x;
 			Int size = REAL_TO_INT( barWidth * 0.3f );
 			frameHeight = REAL_TO_INT((INT_TO_REAL(size) / INT_TO_REAL(frameWidth)) * frameHeight);
 			frameWidth = size;
-#endif			
+#endif
 			// given our scaled width and height we need to find the top left point to draw the image at
 			ICoord2D screen;
 			screen.x = healthBarRegion->lo.x;
@@ -2609,21 +2584,21 @@ void Drawable::drawBattlePlans( const IRegion2D *healthBarRegion )
 			// draw the icon
 			Int frameWidth = getIconInfo()->m_icon[ ICON_BATTLEPLAN_HOLDTHELINE ]->getCurrentFrameWidth();
 			Int frameHeight = getIconInfo()->m_icon[ ICON_BATTLEPLAN_HOLDTHELINE ]->getCurrentFrameHeight();
-			
+
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 			// adjust the width to be a % of the health bar region size
 			Int barWidth = healthBarRegion->hi.x - healthBarRegion->lo.x;
 			Int size = REAL_TO_INT( barWidth * 0.3f );
 			frameHeight = REAL_TO_INT((INT_TO_REAL(size) / INT_TO_REAL(frameWidth)) * frameHeight);
 			frameWidth = size;
-#endif			
+#endif
 			// given our scaled width and height we need to find the top left point to draw the image at
 			ICoord2D screen;
 			screen.x = healthBarRegion->lo.x;
 			screen.y = healthBarRegion->lo.y + frameHeight;
 			getIconInfo()->m_icon[ ICON_BATTLEPLAN_HOLDTHELINE ]->draw( screen.x + frameWidth, screen.y, frameWidth, frameHeight );
 		}
-		else 
+		else
 		{
 			killIcon(ICON_BATTLEPLAN_HOLDTHELINE);
 		}
@@ -2652,11 +2627,11 @@ void Drawable::drawBattlePlans( const IRegion2D *healthBarRegion )
 			screen.y = healthBarRegion->lo.y + frameHeight;
 			getIconInfo()->m_icon[ ICON_BATTLEPLAN_SEARCHANDDESTROY ]->draw( screen.x + (frameWidth * 2), screen.y, frameWidth, frameHeight );
 		}
-		else 
+		else
 		{
 			killIcon(ICON_BATTLEPLAN_SEARCHANDDESTROY);
 		}
-		
+
 	}
 }
 
@@ -2668,7 +2643,7 @@ void Drawable::drawUIText()
 	// This gets called by GameClient now
 	// GameClient caches a list of us drawables during Drawablepostdraw()
 	// then our group numbers get spit out last, so they draw in front
-	
+
 	const IRegion2D* healthBarRegion = NULL;
 	IRegion2D healthBarRegionStorage;
 	if (computeHealthRegion(this, healthBarRegionStorage))
@@ -2684,7 +2659,7 @@ void Drawable::drawUIText()
 
 	Color color = TheDrawGroupInfo->m_usePlayerColor ? owner->getPlayerColor() : TheDrawGroupInfo->m_colorForText;
 
-	if (groupNum > NO_HOTKEY_SQUAD && groupNum < NUM_HOTKEY_SQUADS ) 
+	if (groupNum > NO_HOTKEY_SQUAD && groupNum < NUM_HOTKEY_SQUADS )
 	{
 		Int xPos = healthBarRegion->lo.x;
 		Int yPos = healthBarRegion->lo.y;
@@ -2703,10 +2678,10 @@ void Drawable::drawUIText()
 
 		m_groupNumber = TheDisplayStringManager->getGroupNumeralString(groupNum);
 
-		
-		m_groupNumber->draw(xPos, yPos, color, 
-												TheDrawGroupInfo->m_colorForTextDropShadow, 
-												TheDrawGroupInfo->m_dropShadowOffsetX, 
+
+		m_groupNumber->draw(xPos, yPos, color,
+												TheDrawGroupInfo->m_colorForTextDropShadow,
+												TheDrawGroupInfo->m_dropShadowOffsetX,
 												TheDrawGroupInfo->m_dropShadowOffsetY);
 	}
 
@@ -2725,15 +2700,15 @@ void Drawable::drawUIText()
 			return;
 
 		Real scale = 1.3f/CLAMP_ICON_ZOOM_FACTOR( TheTacticalView->getZoom() );
-		screenCenter.x += (healthBoxWidth * scale * 0.5f) + 10 ; 
+		screenCenter.x += (healthBoxWidth * scale * 0.5f) + 10 ;
 
 
 		DisplayString *formationMarker = TheDisplayStringManager->getFormationLetterString();
 		//static DisplayString *formationMarker = TheDisplayStringManager->getGroupNumeralString( 5 );
 		if ( formationMarker )
 			formationMarker->draw(screenCenter.x, screenCenter.y, color,
-													TheDrawGroupInfo->m_colorForTextDropShadow, 
-													TheDrawGroupInfo->m_dropShadowOffsetX, 
+													TheDrawGroupInfo->m_colorForTextDropShadow,
+													TheDrawGroupInfo->m_dropShadowOffsetX,
 													TheDrawGroupInfo->m_dropShadowOffsetY);
 
 	}
@@ -2746,7 +2721,7 @@ void Drawable::drawUIText()
 void Drawable::drawHealing(const IRegion2D* healthBarRegion)
 {
 
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 
 	// we do show show icons for things that explicitly forbid it
 	if( obj->isKindOf( KINDOF_NO_HEAL_ICON ) || obj->getStatusBits().test( OBJECT_STATUS_SOLD ) )
@@ -2759,8 +2734,8 @@ void Drawable::drawHealing(const IRegion2D* healthBarRegion)
 	if( body->getHealth() != body->getMaxHealth() )
 	{
 //		const DamageInfo* lastDamage = body->getLastDamageInfo();
-//		if( lastDamage != NULL && lastDamage->in.m_damageType == DAMAGE_HEALING 
-//			&&(TheGameLogic->getFrame() - body->getLastHealingTimestamp()) <= HEALING_ICON_DISPLAY_TIME 
+//		if( lastDamage != NULL && lastDamage->in.m_damageType == DAMAGE_HEALING
+//			&&(TheGameLogic->getFrame() - body->getLastHealingTimestamp()) <= HEALING_ICON_DISPLAY_TIME
 //			)
 		if ( TheGameLogic->getFrame() > HEALING_ICON_DISPLAY_TIME && // because so many things init health early in game
 			(TheGameLogic->getFrame() - body->getLastHealingTimestamp() <= HEALING_ICON_DISPLAY_TIME) )
@@ -2802,7 +2777,7 @@ void Drawable::drawHealing(const IRegion2D* healthBarRegion)
 			// draw the animation if present
 			if( getIconInfo()->m_icon[ typeIndex ] != NULL)
 			{
-				
+
 				//
 				// we are going to draw the healing icon relative to the size of the health bar region
 				// since that region takes into account hit point size and zoom factor of the camera too
@@ -2823,8 +2798,8 @@ void Drawable::drawHealing(const IRegion2D* healthBarRegion)
 				screen.x = REAL_TO_INT( healthBarRegion->lo.x + (barWidth * 0.75f) - (frameWidth * 0.5f) );
 				screen.y = REAL_TO_INT( healthBarRegion->lo.y - frameHeight );
 				getIconInfo()->m_icon[ typeIndex ]->draw( screen.x, screen.y, frameWidth, frameHeight );
-								
-			}	
+
+			}
 		}
 	}
 	else
@@ -2840,13 +2815,13 @@ void Drawable::drawHealing(const IRegion2D* healthBarRegion)
 void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
 {
 
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 	//
 	// if we are to show effect make sure we have the animation for it allocated, otherwise
 	// free any animation we may have allocated back to the animation memory pool
 	//
 	// only display if have enthusiasm
-	
+
 	if( obj->testWeaponBonusCondition( WEAPONBONUSCONDITION_ENTHUSIASTIC ) == TRUE &&
 			healthBarRegion != NULL )
 	{
@@ -2865,7 +2840,7 @@ void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
 		// draw the animation if present
 		if( getIconInfo()->m_icon[ iconIndex ] != NULL)
 		{
-			
+
 			//
 			// we are going to draw the healing icon relative to the size of the health bar region
 			// since that region takes into account hit point size and zoom factor of the camera too
@@ -2895,8 +2870,8 @@ void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
 			screen.x = REAL_TO_INT( healthBarRegion->lo.x + (barWidth * 0.25f) - (frameWidth * 0.5f) );
 			screen.y = healthBarRegion->hi.y;
 			getIconInfo()->m_icon[ iconIndex ]->draw( screen.x, screen.y, frameWidth, frameHeight );
-							
-		}	
+
+		}
 	}
 	else
 	{
@@ -2912,7 +2887,7 @@ void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
 void Drawable::drawDemoralized(const IRegion2D* healthBarRegion)
 {
 
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 
 
 	//
@@ -2930,7 +2905,7 @@ void Drawable::drawDemoralized(const IRegion2D* healthBarRegion)
 			// create icon if necessary
 			if( getIconInfo()->m_icon[ ICON_DEMORALIZED ] == NULL )
 				getIconInfo()->m_icon[ ICON_DEMORALIZED ] = newInstance(Anim2D)( s_animationTemplates[ ICON_DEMORALIZED ], TheAnim2DCollection );
-			
+
 			if (getIconInfo()->m_icon[ ICON_DEMORALIZED ])
 			{
 
@@ -2964,13 +2939,13 @@ void Drawable::drawDemoralized(const IRegion2D* healthBarRegion)
 void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 {
 
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 
 
 	UnsignedInt now = TheGameLogic->getFrame();
 
 	if( obj->testWeaponSetFlag( WEAPONSET_CARBOMB ) &&
-				obj->getControllingPlayer() == ThePlayerList->getLocalPlayer())
+				obj->getControllingPlayer() == rts::getObservedOrLocalPlayer())
 	{
 		if( !getIconInfo()->m_icon[ ICON_CARBOMB ] )
 			getIconInfo()->m_icon[ ICON_CARBOMB ] = newInstance(Anim2D)( s_animationTemplates[ ICON_CARBOMB ], TheAnim2DCollection );
@@ -2999,7 +2974,7 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 				screen.x = REAL_TO_INT( healthBarRegion->lo.x + (barWidth * 0.5f) - (frameWidth * 0.5f) );
 				screen.y = REAL_TO_INT( healthBarRegion->lo.y + barHeight * 0.5f );
 
-				getIconInfo()->m_icon[ ICON_CARBOMB ]->draw( screen.x, screen.y, frameWidth, frameHeight );	
+				getIconInfo()->m_icon[ ICON_CARBOMB ]->draw( screen.x, screen.y, frameWidth, frameHeight );
 				getIconInfo()->m_keepTillFrame[ ICON_CARBOMB ] = FOREVER;
 			}
 		}
@@ -3029,16 +3004,16 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 					getIconInfo()->m_icon[ ICON_BOMB_REMOTE ] = newInstance(Anim2D)( s_animationTemplates[ ICON_BOMB_REMOTE ], TheAnim2DCollection );
 					getIconInfo()->m_icon[ ICON_BOMB_TIMED ] = newInstance(Anim2D)( s_animationTemplates[ ICON_BOMB_TIMED ], TheAnim2DCollection );
 
-					//Because this is a counter icon that ranges from 0-60 seconds, we need to calculate which frame to 
+					//Because this is a counter icon that ranges from 0-60 seconds, we need to calculate which frame to
 					//start the animation from. Because timers are second based -- 1000 ms equal 1 frame. So we simply
 					//calculate the time via detonation frame.
 					//
 					// srj sez: this may sound familiar somehow, but let me reiterate, just in case you missed it:
 					//
-					// hardcoding is bad. 
+					// hardcoding is bad.
+					//
+					// the anim got changed and now is only 20 seconds max, so the previous code was wrong.
 					//
-					// the anim got changed and now is only 20 seconds max, so the previous code was wrong. 
-					// 
 					// hey, I've got an idea! why don't we ASK the anim how long it is?
 					//
 					UnsignedInt dieFrame = update->getDetonationFrame();
@@ -3048,7 +3023,7 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 					// this anim goes from "N" seconds down to zero, so the max seconds we can use is N-1.
 					if (seconds > numFrames - 1)
 						seconds = numFrames - 1;
-					
+
 					getIconInfo()->m_icon[ ICON_BOMB_TIMED ]->setMinFrame(numFrames - seconds - 1);
 					getIconInfo()->m_icon[ ICON_BOMB_TIMED ]->reset();
 				}
@@ -3070,15 +3045,15 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 						Int size = REAL_TO_INT( barWidth * 0.65f );
 						frameHeight = REAL_TO_INT((INT_TO_REAL(size) / INT_TO_REAL(frameWidth)) * frameHeight);
 						frameWidth = size;
-						
+
 						// given our scaled width and height we need to find the top left point to draw the image at
 						ICoord2D screen;
 						screen.x = REAL_TO_INT( healthBarRegion->lo.x + (barWidth * 0.5f) - (frameWidth * 0.5f) );
 						screen.y = REAL_TO_INT( healthBarRegion->lo.y + barHeight * 0.5f );
 
-						getIconInfo()->m_icon[ ICON_BOMB_REMOTE ]->draw( screen.x, screen.y, frameWidth, frameHeight );	
+						getIconInfo()->m_icon[ ICON_BOMB_REMOTE ]->draw( screen.x, screen.y, frameWidth, frameHeight );
 						getIconInfo()->m_keepTillFrame[ ICON_BOMB_REMOTE ] = now + 1;
-						getIconInfo()->m_icon[ ICON_BOMB_TIMED ]->draw( screen.x, screen.y, frameWidth, frameHeight );	
+						getIconInfo()->m_icon[ ICON_BOMB_TIMED ]->draw( screen.x, screen.y, frameWidth, frameHeight );
 						getIconInfo()->m_keepTillFrame[ ICON_BOMB_TIMED ] = now + 1;
 					}
 				}
@@ -3116,7 +3091,7 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 						screen.x = REAL_TO_INT( healthBarRegion->lo.x + (barWidth * 0.5f) - (frameWidth * 0.5f) );
 						screen.y = REAL_TO_INT( healthBarRegion->lo.y + barHeight * 0.5f );
 
-						getIconInfo()->m_icon[ ICON_BOMB_REMOTE ]->draw( screen.x, screen.y, frameWidth, frameHeight );	
+						getIconInfo()->m_icon[ ICON_BOMB_REMOTE ]->draw( screen.x, screen.y, frameWidth, frameHeight );
 						getIconInfo()->m_keepTillFrame[ ICON_BOMB_REMOTE ] = now + 1;
 					}
 				}
@@ -3143,16 +3118,16 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 void Drawable::drawDisabled(const IRegion2D* healthBarRegion)
 {
 
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 
 
 	//
 	// Disabled Emoticon /Lightning
 	//                   7/
-	if( obj->isDisabledByType( DISABLED_HACKED ) 
-		|| obj->isDisabledByType( DISABLED_PARALYZED ) 
-		|| obj->isDisabledByType( DISABLED_EMP ) 
-		|| obj->isDisabledByType( DISABLED_UNDERPOWERED ) 
+	if( obj->isDisabledByType( DISABLED_HACKED )
+		|| obj->isDisabledByType( DISABLED_PARALYZED )
+		|| obj->isDisabledByType( DISABLED_EMP )
+		|| obj->isDisabledByType( DISABLED_UNDERPOWERED )
 		)
 	{
 		// create icon if necessary
@@ -3183,14 +3158,14 @@ void Drawable::drawDisabled(const IRegion2D* healthBarRegion)
 			screen.y = healthBarRegion->hi.y - (frameHeight + barHeight);
 			getIconInfo()->m_icon[ ICON_DISABLED ]->draw( screen.x, screen.y, frameWidth, frameHeight );
 
-		}  // end if
-	}  // end if
+		}
+	}
 	else
 	{
 		// delete icon if necessary
 		killIcon(ICON_DISABLED);
 
-	}  // end if
+	}
 
 }
 
@@ -3209,7 +3184,7 @@ void Drawable::drawConstructPercent( const IRegion2D *healthBarRegion )
 		// no object, or we are now complete get rid of the string if we have one
 		if( m_constructDisplayString )
 		{
-		
+
 			TheDisplayStringManager->freeDisplayString( m_constructDisplayString );
 			m_constructDisplayString = NULL;
 		}
@@ -3231,14 +3206,14 @@ void Drawable::drawConstructPercent( const IRegion2D *healthBarRegion )
 	{
 		UnicodeString buffer;
 
-		
+
 		buffer.format( TheGameText->fetch("CONTROLBAR:UnderConstructionDesc"), obj->getConstructionPercent());
 		m_constructDisplayString->setText( buffer );
 
 		// record this percent as our last displayed so we don't un-necessarily rebuild the string
 		m_lastConstructDisplayed = obj->getConstructionPercent();
-				
-	}  // end if
+
+	}
 
 	// get center position in drawable
 	ICoord2D screen;
@@ -3254,7 +3229,7 @@ void Drawable::drawConstructPercent( const IRegion2D *healthBarRegion )
 	screen.x -= (m_constructDisplayString->getWidth() / 2);
 	m_constructDisplayString->draw( screen.x, screen.y, color, dropColor );
 
-}  // end drawConstructPercent
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw caption */
@@ -3290,7 +3265,7 @@ void Drawable::drawCaption( const IRegion2D *healthBarRegion )
 	Color dropColor = GameMakeColor( 0, 0, 0, 255 );
 	m_captionDisplayString->draw( screen.x, screen.y, color, dropColor );
 
-}  // end drawCaption
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Draw any veterency markers that should be displayed */
@@ -3342,7 +3317,7 @@ void Drawable::drawVeterancy( const IRegion2D *healthBarRegion )
 	// draw the image
 	TheDisplay->drawImage(image, screenCenter.x + 1, screenCenter.y + 1, screenCenter.x + 1 + vetBoxWidth, screenCenter.y + 1 + vetBoxHeight);
 
-}  // end drawVeterancy
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Draw health bar information for drawable */
@@ -3356,7 +3331,7 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 	// only draw health for selected drawbles and drawables that have been moused over
 	// by the cursor
 	//
-	if( TheGlobalData->m_showObjectHealth && 
+	if( TheGlobalData->m_showObjectHealth &&
 			(isSelected() || (TheInGameUI && (TheInGameUI->getMousedOverDrawableID() == getID()))) )
 	{
 		Object *obj = getObject();
@@ -3394,7 +3369,10 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 		//
 
 		Color color, outlineColor;
-		if( obj->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) || (obj->isDisabled() && !obj->isDisabledByType(DISABLED_HELD)) )
+		DisabledMaskType mask = obj->getDisabledFlags();
+		mask.clear(MAKE_DISABLED_MASK(DISABLED_HELD));
+
+		if (obj->getStatusBits().test(OBJECT_STATUS_UNDER_CONSTRUCTION) || DISABLEDMASK_ANY_SET(mask))
 		{
 			color = GameMakeColor( 0, healthRatio * 255.0f, 255, 255 );//blue to cyan
 			outlineColor = GameMakeColor( 0, healthRatio * 128.0f, 128, 255 );//dark blue to dark cyan
@@ -3438,8 +3416,8 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 
 			color =        GameMakeColor( 255.0 * inColor.red, 255.0 * inColor.green, 255.0 * inColor.blue, 255);
 			outlineColor = GameMakeColor( 255.0 * outColor.red, 255.0 * outColor.green, 255.0 * outColor.blue, 255);
-		
-		
+
+
 		}
 
 
@@ -3447,7 +3425,7 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 
 ///		Real scale = 1.3f / TheTacticalView->getZoom();
 		Real healthBoxWidth = healthBarRegion->hi.x - healthBarRegion->lo.x;
-			
+
 		Real healthBoxHeight = max(3, healthBarRegion->hi.y - healthBarRegion->lo.y);
 		Real healthBoxOutlineSize = 1.0f;
 
@@ -3459,9 +3437,9 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 		TheDisplay->drawFillRect( healthBarRegion->lo.x + 1, healthBarRegion->lo.y + 1,
 															(healthBoxWidth - 2) * healthRatio, healthBoxHeight - 2,
 															color );
-	}  // end if
+	}
 
-}  // end drawHealthBar
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -3476,9 +3454,10 @@ void Drawable::clearAndSetModelConditionState( ModelConditionFlagType clr, Model
 }
 
 //-------------------------------------------------------------------------------------------------
-DrawModule** Drawable::getDrawModules() 
-{ 
-	DrawModule** dm = (DrawModule**)getModuleList(MODULETYPE_DRAW); 
+DrawModule** Drawable::getDrawModules()
+{
+	DrawModule** dm = (DrawModule**)getModuleList(MODULETYPE_DRAW);
+
 #ifdef DIRTY_CONDITION_FLAGS
 	if (m_isModelDirty)
 	{
@@ -3491,23 +3470,20 @@ DrawModule** Drawable::getDrawModules()
 		}
 		else
 		{
-			for (DrawModule** dm2 = dm; *dm2; ++dm2)
-			{
-				ObjectDrawInterface* di = (*dm2)->getObjectDrawInterface();
-				if (di)
-					di->replaceModelConditionState( m_conditionState );
-			}
-			m_isModelDirty = false;
+			replaceModelConditionStateInDrawable();
 		}
 	}
 #endif
+
+	DEBUG_ASSERTCRASH(dm != NULL, ("Draw Module List is not expected NULL"));
 	return dm;
 }
 
 //-------------------------------------------------------------------------------------------------
-DrawModule const** Drawable::getDrawModules() const 
-{ 
-	DrawModule const** dm = (DrawModule const**)getModuleList(MODULETYPE_DRAW); 
+DrawModule const** Drawable::getDrawModules() const
+{
+	DrawModule const** dm = (DrawModule const**)getModuleList(MODULETYPE_DRAW);
+
 #ifdef DIRTY_CONDITION_FLAGS
 	if (m_isModelDirty)
 	{
@@ -3520,17 +3496,12 @@ DrawModule const** Drawable::getDrawModules() const
 		}
 		else
 		{
-			// yeah, yeah, yeah... I know (srj)
-			for (DrawModule** dm2 = (DrawModule**)dm; *dm2; ++dm2)
-			{
-				ObjectDrawInterface* di = (*dm2)->getObjectDrawInterface();
-				if (di)
-					di->replaceModelConditionState( m_conditionState );
-			}
-			m_isModelDirty = false;
+			const_cast<Drawable*>(this)->replaceModelConditionStateInDrawable();
 		}
 	}
 #endif
+
+	DEBUG_ASSERTCRASH(dm != NULL, ("Draw Module List is not expected NULL"));
 	return dm;
 }
 
@@ -3541,19 +3512,14 @@ void Drawable::clearAndSetModelConditionFlags(const ModelConditionFlags& clr, co
 	ModelConditionFlags oldFlags = m_conditionState;
 
 	m_conditionState.clearAndSet(clr, setf);
-	
+
 	if (m_conditionState == oldFlags)
 		return;
 
 #ifdef DIRTY_CONDITION_FLAGS
 	m_isModelDirty = true;
 #else
-	for (DrawModule** dm = getDrawModules(); *dm; ++dm)
-	{
-		ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
-		if (di)
-			di->replaceModelConditionState( m_conditionState );
-	}
+	replaceModelConditionStateInDrawable();
 #endif
 }
 
@@ -3569,30 +3535,43 @@ void Drawable::replaceModelConditionFlags( const ModelConditionFlags &flags, Boo
 	//
 	if( forceReplace == FALSE && m_conditionState == flags )
 		return;
-		
+
 	m_conditionState = flags;
 #ifdef DIRTY_CONDITION_FLAGS
 	// when forcing a replace we won't use dirty flags, we will immediately do an update now
 	if( forceReplace == TRUE )
 	{
-		for (DrawModule** dm = getDrawModules(); *dm; ++dm)
-		{
-			ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
-			if (di)
-				di->replaceModelConditionState( m_conditionState );
-		}
-		m_isModelDirty = false;
+		replaceModelConditionStateInDrawable();
 	}
-	else 
+	else
+	{
 		m_isModelDirty = true;
+	}
 #else
+	replaceModelConditionStateInDrawable();
+#endif
+}
+
+//-------------------------------------------------------------------------------------------------
+void Drawable::replaceModelConditionStateInDrawable()
+{
+	// TheSuperHackers @info Set not dirty early to avoid recursive calls from within getDrawModules().
+	m_isModelDirty = false;
+
+	// TheSuperHackers @bugfix Remove and re-add the terrain decal before processing the individual draw
+	// modules, because the terrain decal is applied to the first draw module only, and the new first
+	// draw module may be different than before.
+	const TerrainDecalType terrainDecalType = getTerrainDecalType();
+	setTerrainDecal(TERRAIN_DECAL_NONE);
+
 	for (DrawModule** dm = getDrawModules(); *dm; ++dm)
 	{
 		ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
 		if (di)
 			di->replaceModelConditionState( m_conditionState );
 	}
-#endif
+
+	setTerrainDecal(terrainDecalType);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -3607,9 +3586,9 @@ void Drawable::setIndicatorColor(Color color)
 }
 
 // ------------------------------------------------------------------------------------------------
-const GeometryInfo& Drawable::getDrawableGeometryInfo() const 
-{ 
-	return getObject() ? getObject()->getGeometryInfo() : getTemplate()->getTemplateGeometryInfo(); 
+const GeometryInfo& Drawable::getDrawableGeometryInfo() const
+{
+	return getObject() ? getObject()->getGeometryInfo() : getTemplate()->getTemplateGeometryInfo();
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -3637,7 +3616,7 @@ void Drawable::setID( DrawableID id )
 			m_ambientSound->m_event.setDrawableID(m_id);
 	}
 
-}  // end setID
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Return drawable ID, this ID is only good on the client */
@@ -3646,16 +3625,16 @@ DrawableID Drawable::getID( void ) const
 {
 
 	// we should never be getting the ID of a drawable who doesn't yet have and ID assigned to it
-	DEBUG_ASSERTCRASH( m_id != 0, ("Drawable::getID - Using ID before it was assigned!!!!\n") );
+	DEBUG_ASSERTCRASH( m_id != 0, ("Drawable::getID - Using ID before it was assigned!!!!") );
 
 	return m_id;
 
-}  // end get ID
+}
 
 //-------------------------------------------------------------------------------------------------
 void Drawable::friend_bindToObject( Object *obj ) ///< bind this drawable to an object ID
-{ 
-	m_object = obj; 
+{
+	m_object = obj;
 	if (getObject())
 	{
 		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
@@ -3668,7 +3647,15 @@ void Drawable::friend_bindToObject( Object *obj ) ///< bind this drawable to an
 	{
 		(*dm)->onDrawableBoundToObject();
 	}
-}					
+
+	PhysicsXformInfo physicsXform;
+	if (calcPhysicsXform(physicsXform))
+	{
+		DEBUG_ASSERTCRASH(m_physicsXform == NULL, ("m_physicsXform is not NULL"));
+		m_physicsXform = new PhysicsXformInfo;
+		*m_physicsXform = physicsXform;
+	}
+}
 //-------------------------------------------------------------------------------------------------
 	// when our Object changes teams, it calls us to let us know, so
 	// we can update our model, etc., if necessary. NOTE, we don't guarantee
@@ -3687,7 +3674,7 @@ void Drawable::changedTeam()
 }
 
 //-------------------------------------------------------------------------------------------------
-void Drawable::setPosition(const Coord3D *pos) 
+void Drawable::setPosition(const Coord3D *pos)
 {
 	// extend
 	Thing::setPosition(pos);
@@ -3701,7 +3688,7 @@ void Drawable::reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* old
 	{
 		(*dm)->reactToTransformChange(oldMtx, oldPos, oldAngle);
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void Drawable::reactToGeometryChange()
@@ -3710,11 +3697,11 @@ void Drawable::reactToGeometryChange()
 	{
 		(*dm)->reactToGeometryChange();
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool Drawable::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelToUse, const FXList* fxl, Real weaponSpeed, Real recoilAmount, Real recoilAngle, const Coord3D* victimPos, Real damageRadius)
-{	  
+{
 	if (recoilAmount != 0.0f)
 	{
 		// adjust recoil from absolute to relative.
@@ -3736,7 +3723,7 @@ Bool Drawable::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelToUse,
 			return true;
 	}
 	return false;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 Int Drawable::getBarrelCount(WeaponSlotType wslot) const
@@ -3749,16 +3736,16 @@ Int Drawable::getBarrelCount(WeaponSlotType wslot) const
 			return count;
 	}
 	return 0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the Drawable's instance transform */
 //-------------------------------------------------------------------------------------------------
-void Drawable::setInstanceMatrix( const Matrix3D *instance ) 
-{ 
+void Drawable::setInstanceMatrix( const Matrix3D *instance )
+{
 	if (instance)
 	{
-		m_instance = *instance; 
+		m_instance = *instance;
 		m_instanceIsIdentity = false;
 	}
 	else
@@ -3770,7 +3757,7 @@ void Drawable::setInstanceMatrix( const Matrix3D *instance )
 
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Return the Drawable's world transform.
  * If this Drawable is attached to an Object, return the Object's transform instead.
  */
@@ -3786,7 +3773,7 @@ const Matrix3D *Drawable::getTransformMatrix( void ) const
 }
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Set and clear the drawable's caption text
  */
 //-------------------------------------------------------------------------------------------------
@@ -3886,7 +3873,7 @@ void Drawable::startAmbientSound(BodyDamageType dt, TimeOfDay tod)
 			trySound = TRUE;
 		}
 	}
-	
+
 	if( trySound && m_ambientSound )
 	{
 		const AudioEventInfo *info = m_ambientSound->m_event.getAudioEventInfo();
@@ -4006,7 +3993,7 @@ void Drawable::updateHiddenStatus()
 		if (di)
 			di->setHidden(hidden != 0);
 	}
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4098,7 +4085,7 @@ void Drawable::preloadAssets( TimeOfDay timeOfDay )
 		for( Module** m = m_modules[i]; m && *m; ++m )
 			(*m)->preloadAssets( timeOfDay );
 
-}  // end preloadAssets
+}
 
 //-------------------------------------------------------------------------------------------------
 // Simply searches for the first occurrence of a specified client update module.
@@ -4125,7 +4112,7 @@ ClientUpdateModule* Drawable::findClientUpdateModule( NameKeyType key )
 void Drawable::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer the drawable modules
@@ -4176,7 +4163,7 @@ void Drawable::xferDrawableModules( Xfer *xfer )
 				// write module identifier
 				moduleIdentifier = TheNameKeyGenerator->keyToName( (*m)->getModuleTagNameKey() );
 				DEBUG_ASSERTCRASH( moduleIdentifier != AsciiString::TheEmptyString,
-													 ("Drawable::xferDrawableModules - module name key does not translate to a string!\n") );
+													 ("Drawable::xferDrawableModules - module name key does not translate to a string!") );
 				xfer->xferAsciiString( &moduleIdentifier );
 
 				// begin data block
@@ -4188,9 +4175,9 @@ void Drawable::xferDrawableModules( Xfer *xfer )
 				// end data block
 				xfer->endBlock();
 
-			}  // end for, m
+			}
 
-		}  // end if, save
+		}
 		else
 		{
 			// read each module
@@ -4211,9 +4198,9 @@ void Drawable::xferDrawableModules( Xfer *xfer )
 						module = *m;
 						break;  // exit for m
 
-					}  // end if
+					}
 
-				}  // end for, m
+				}
 
 				// new block of data
 				Int dataSize = xfer->beginBlock();
@@ -4227,47 +4214,52 @@ void Drawable::xferDrawableModules( Xfer *xfer )
 				{
 
 					// for testing purposes, this module better be found
-					DEBUG_CRASH(( "Drawable::xferDrawableModules - Module '%s' was indicated in file, but not found on Drawable %s %d\n",
+					DEBUG_CRASH(( "Drawable::xferDrawableModules - Module '%s' was indicated in file, but not found on Drawable %s %d",
 												moduleIdentifier.str(), getTemplate()->getName().str(),getID() ));
 
 					// skip this data in the file
 					xfer->skip( dataSize );
 
-				}  // end if
+				}
 				else
 				{
 
 					// xfer the data into this module
 					xfer->xferSnapshot( module );
 
-				}  // end else
+				}
 
 				// end of data block
 				xfer->endBlock();
 
-			}  // end for j
+			}
 
-		}  // end else, load
+		}
 
-	}  // end for curModuleType
+	}
 
-}  // end xferDrawableModules
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info;
 	* 1: Initial version
-	* 2: Moved condition state xfer before module xfer so we can restore anim frame 
+	* 2: Moved condition state xfer before module xfer so we can restore anim frame
 	*    during the module xfer (CBD)
 	* 4: Added m_ambientSoundEnabled flag
 	* 5: save full mtx, not pos+orient.
+	* 6: TheSuperHackers @bugfix Removed m_prevTintStatus because loading its value is unnecessary and undesirable
 	*/
 // ------------------------------------------------------------------------------------------------
 void Drawable::xfer( Xfer *xfer )
 {
 
 	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
 	const XferVersion currentVersion = 5;
+#else
+	const XferVersion currentVersion = 6;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
@@ -4294,7 +4286,7 @@ void Drawable::xfer( Xfer *xfer )
 		if( xfer->getXferMode() == XFER_LOAD	)
 			replaceModelConditionFlags( m_conditionState, TRUE );
 
-	}  // end if
+	}
 
 	if( version >= 3 )
 	{
@@ -4331,7 +4323,7 @@ void Drawable::xfer( Xfer *xfer )
 		// xfer
 		xfer->xferSnapshot( m_selectionFlashEnvelope );
 
-	}  // end if
+	}
 
 	// color tint envelope
 	Bool colFlash = (m_colorTintEnvelope != NULL);
@@ -4346,7 +4338,7 @@ void Drawable::xfer( Xfer *xfer )
 		// xfer
 		xfer->xferSnapshot( m_colorTintEnvelope );
 
-	}  // end if
+	}
 
 	// terrain decal type
 	TerrainDecalType decal = getTerrainDecalType();
@@ -4384,15 +4376,15 @@ void Drawable::xfer( Xfer *xfer )
 
 			if( objectID != m_object->getID() )
 			{
-			
-				DEBUG_CRASH(( "Drawable::xfer - Drawable '%s' is attached to wrong object '%s'\n",
+
+				DEBUG_CRASH(( "Drawable::xfer - Drawable '%s' is attached to wrong object '%s'",
 											getTemplate()->getName().str(), m_object->getTemplate()->getName().str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 
-		}  // end if
+		}
 		else
 		{
 
@@ -4401,22 +4393,22 @@ void Drawable::xfer( Xfer *xfer )
 #ifdef DEBUG_CRASHING
 				Object *obj = TheGameLogic->findObjectByID( objectID );
 
-				DEBUG_CRASH(( "Drawable::xfer - Drawable '%s' is not attached to an object but should be attached to object '%s' with id '%d'\n",
+				DEBUG_CRASH(( "Drawable::xfer - Drawable '%s' is not attached to an object but should be attached to object '%s' with id '%d'",
 											getTemplate()->getName().str(),
 											obj ? obj->getTemplate()->getName().str() : "Unknown",
 											objectID ));
 #endif
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
 
 	// particle
-	// we don't need to worry about this, the particle itself will set it upon loading 
+	// we don't need to worry about this, the particle itself will set it upon loading
 
 	// selected
 	// we won't worry about selection, we'll let TheInGameUI take care of it all
@@ -4427,8 +4419,15 @@ void Drawable::xfer( Xfer *xfer )
 	// tint status
 	xfer->xferUnsignedInt( &m_tintStatus );
 
-	// prev tint status
-	xfer->xferUnsignedInt( &m_prevTintStatus );
+	if (version <= 5)
+	{
+		// prev tint status
+		xfer->xferUnsignedInt( &m_prevTintStatus );
+
+		// TheSuperHackers @bugfix Caball009 21/12/2025 Trigger tinting after loading a save game.
+		if (xfer->getXferMode() == XFER_LOAD)
+			m_prevTintStatus = 0;
+	}
 
 	// fading mode
 	xfer->xferUser( &m_fadeMode, sizeof( FadingMode ) );
@@ -4534,15 +4533,15 @@ void Drawable::xfer( Xfer *xfer )
 	{
 
 		// sanity, we don't write old versions we can only read them
-		DEBUG_ASSERTCRASH( xfer->getXferMode() == XFER_LOAD, 
-											 ("Drawable::xfer - Writing an old format!!!\n") );
+		DEBUG_ASSERTCRASH( xfer->getXferMode() == XFER_LOAD,
+											 ("Drawable::xfer - Writing an old format!!!") );
 
 		// condition state, note that when we're loading we need to force a replace of these flags
 		m_conditionState.xfer( xfer );
 		if( xfer->getXferMode() == XFER_LOAD	)
 			replaceModelConditionFlags( m_conditionState, TRUE );
 
-	}  // end if
+	}
 
 	// expiration date
 	xfer->xferUnsignedInt( &m_expirationDate );
@@ -4586,9 +4585,9 @@ void Drawable::xfer( Xfer *xfer )
 			// icon data
 			xfer->xferSnapshot( getIconInfo()->m_icon[ i ] );
 
-		}  // end for, i
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		Int i;
@@ -4617,10 +4616,10 @@ void Drawable::xfer( Xfer *xfer )
 			if( animTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "Drawable::xfer - Unknown icon template '%s'\n", iconTemplateName.str() ));
+				DEBUG_CRASH(( "Drawable::xfer - Unknown icon template '%s'", iconTemplateName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// create icon
 			getIconInfo()->m_icon[ iconIndex ] = newInstance(Anim2D)( animTemplate, TheAnim2DCollection );
@@ -4628,14 +4627,14 @@ void Drawable::xfer( Xfer *xfer )
 			// icon data
 			xfer->xferSnapshot( getIconInfo()->m_icon[ iconIndex ] );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	if( xfer->getXferMode() == XFER_LOAD )
 	{
 		// On load, we want to set it to none, because stealthlook updates
-		// when it changes.  So in the next stealth update, it will be set to 
+		// when it changes.  So in the next stealth update, it will be set to
 		// it's correct value, and the drawable updated (hide shadows and such).  jba.
 		m_stealthLook = STEALTHLOOK_NONE;
 		// Also, need to update the hidden status for all sub-modules.
@@ -4651,7 +4650,7 @@ void Drawable::xfer( Xfer *xfer )
 	//
 #ifdef DIRTY_CONDITION_FLAGS
 	if( xfer->getXferMode() == XFER_SAVE )
-		DEBUG_ASSERTCRASH( m_isModelDirty == FALSE, ("Drawble::xfer - m_isModelDirty is not FALSE!\n") );
+		DEBUG_ASSERTCRASH( m_isModelDirty == FALSE, ("Drawble::xfer - m_isModelDirty is not FALSE!") );
 	else
 		m_isModelDirty = TRUE;
 #endif
@@ -4661,7 +4660,7 @@ void Drawable::xfer( Xfer *xfer )
 		xfer->xferBool( &m_ambientSoundEnabled );
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4674,7 +4673,7 @@ void Drawable::loadPostProcess( void )
 	{
 		setTransformMatrix(m_object->getTransformMatrix());
 	}
-	
+
 	if( m_ambientSoundEnabled )
 	{
 		startAmbientSound();
@@ -4684,7 +4683,20 @@ void Drawable::loadPostProcess( void )
 		stopAmbientSound();
 	}
 
-}  // end loadPostProcess
+}
+
+//-------------------------------------------------------------------------------------------------
+const Locomotor* Drawable::getLocomotor() const
+{
+	if (const Object* obj = getObject())
+	{
+		if (const AIUpdateInterface *ai = obj->getAIUpdateInterface())
+		{
+			return ai->getCurLocomotor();
+		}
+	}
+	return NULL;
+}
 
 //=================================================================================================
 //=================================================================================================
@@ -4733,11 +4745,11 @@ TintEnvelope::TintEnvelope(void)
 const Real FADE_RATE_EPSILON = (0.001f);
 
 //-------------------------------------------------------------------------------------------------
-void TintEnvelope::play(const RGBColor *peak, UnsignedInt atackFrames, UnsignedInt decayFrames, UnsignedInt sustainAtPeak )    
+void TintEnvelope::play(const RGBColor *peak, UnsignedInt attackFrames, UnsignedInt decayFrames, UnsignedInt sustainAtPeak )
 {
 	setPeakColor( peak );
 
-	setAttackFrames( atackFrames );
+	setAttackFrames( attackFrames );
 	setDecayFrames( decayFrames );
 
 	m_envState = ENVELOPE_STATE_ATTACK;
@@ -4753,7 +4765,7 @@ void TintEnvelope::play(const RGBColor *peak, UnsignedInt atackFrames, UnsignedI
 }
 
 //-------------------------------------------------------------------------------------------------
-void TintEnvelope::setAttackFrames(UnsignedInt frames) 
+void TintEnvelope::setAttackFrames(UnsignedInt frames)
 {
 	Real recipFrames = 1.0f / (Real)MAX(1,frames);
 	m_attackRate.Set( m_currentColor );
@@ -4772,6 +4784,9 @@ void TintEnvelope::setDecayFrames( UnsignedInt frames )
 //-------------------------------------------------------------------------------------------------
 void TintEnvelope::update(void)
 {
+	// TheSuperHackers @tweak The tint time step is now decoupled from the render update.
+	const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
+
 	switch ( m_envState )
 	{
 		case ( ENVELOPE_STATE_REST ) : //most likely case
@@ -4782,25 +4797,31 @@ void TintEnvelope::update(void)
 		}
 		case ( ENVELOPE_STATE_DECAY ) : // much more likely than attack
 		{
-			if (m_decayRate.Length() > m_currentColor.Length() || m_currentColor.Length() <= FADE_RATE_EPSILON) //we are at rest
+			const Vector3 decayRate = m_decayRate * timeScale;
+
+			if (decayRate.Length() > m_currentColor.Length() || m_currentColor.Length() <= FADE_RATE_EPSILON)
 			{
+				// We are at rest
 				m_envState = ENVELOPE_STATE_REST;
 				m_affect = FALSE;
 			}
 			else
 			{
-				Vector3::Add( m_decayRate, m_currentColor, &m_currentColor );//Add the decayRate to the current color;
+				// Add the decayRate to the current color
+				Vector3::Add( decayRate, m_currentColor, &m_currentColor );
 				m_affect = TRUE;
 			}
 			break;
 		}
-		case ( ENVELOPE_STATE_ATTACK ) : 
+		case ( ENVELOPE_STATE_ATTACK ) :
 		{
+			const Vector3 attackRate = m_attackRate * timeScale;
 			Vector3 delta;
 			Vector3::Subtract(m_currentColor, m_peakColor, &delta);
-			
-			if (m_attackRate.Length() > delta.Length() || delta.Length() <= FADE_RATE_EPSILON) //we are at the peak
+
+			if (attackRate.Length() > delta.Length() || delta.Length() <= FADE_RATE_EPSILON)
 			{
+				// We are at the peak
 				if ( m_sustainCounter )
 				{
 					m_envState = ENVELOPE_STATE_SUSTAIN;
@@ -4809,23 +4830,23 @@ void TintEnvelope::update(void)
 				{
 					m_envState = ENVELOPE_STATE_DECAY;
 				}
-
 			}
 			else
 			{
-				Vector3::Add( m_attackRate, m_currentColor, &m_currentColor );//Add the attackRate to the current color;
+				// Add the attackRate to the current color
+				Vector3::Add( attackRate, m_currentColor, &m_currentColor );
 				m_affect = TRUE;
 			}
-			
+
 			break;
 		}
 		case ( ENVELOPE_STATE_SUSTAIN ) :
 		{
-			if ( m_sustainCounter > 0 )
-				--m_sustainCounter;
+			if ( m_sustainCounter > 0.0f )
+				m_sustainCounter -= timeScale;
 			else
 				release();
-				
+
 			break;
 		}
 		default:
@@ -4834,7 +4855,7 @@ void TintEnvelope::update(void)
 			break;
 		}
 	}
-	// here we transition the color from current to peak to release, according to 
+	// here we transition the color from current to peak to release, according to
 
 }
 
@@ -4844,7 +4865,7 @@ void TintEnvelope::update(void)
 void TintEnvelope::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -4854,8 +4875,12 @@ void TintEnvelope::crc( Xfer *xfer )
 void TintEnvelope::xfer( Xfer *xfer )
 {
 
-	// version 
+	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
 	XferVersion currentVersion = 1;
+#else
+	XferVersion currentVersion = 2;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
@@ -4872,7 +4897,16 @@ void TintEnvelope::xfer( Xfer *xfer )
 	xfer->xferUser( &m_currentColor, sizeof( Vector3 ) );
 
 	// sustain counter
-	xfer->xferUnsignedInt( &m_sustainCounter );
+	if (version <= 1)
+	{
+		UnsignedInt sustainCounter = (UnsignedInt)m_sustainCounter;
+		xfer->xferUnsignedInt( &sustainCounter );
+		m_sustainCounter = (Real)sustainCounter;
+	}
+	else
+	{
+		xfer->xferReal( &m_sustainCounter );
+	}
 
 	// affect
 	xfer->xferBool( &m_affect );
@@ -4880,7 +4914,7 @@ void TintEnvelope::xfer( Xfer *xfer )
 	// state
 	xfer->xferByte( &m_envState );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load Post Process */
@@ -4888,5 +4922,5 @@ void TintEnvelope::xfer( Xfer *xfer )
 void TintEnvelope::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp b/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
index 51c798e7596..27f75e083cc 100644
--- a/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/Drawable.h"
 #include "GameClient/Module/AnimatedParticleSysBoneClientUpdate.h"
@@ -100,7 +100,7 @@ void AnimatedParticleSysBoneClientUpdate::crc( Xfer *xfer )
 	// extend base class
 	ClientUpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -119,7 +119,7 @@ void AnimatedParticleSysBoneClientUpdate::xfer( Xfer *xfer )
 	ClientUpdateModule::xfer( xfer );
 
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -130,4 +130,4 @@ void AnimatedParticleSysBoneClientUpdate::loadPostProcess( void )
 	// extend base class
 	ClientUpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp b/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
index d91d9c6e43c..5e486a2aa1d 100644
--- a/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
@@ -52,11 +52,11 @@ BeaconClientUpdateModuleData::~BeaconClientUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void BeaconClientUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void BeaconClientUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ClientUpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "RadarPulseFrequency",	INI::parseDurationUnsignedInt, NULL, offsetof(BeaconClientUpdateModuleData, m_framesBetweenRadarPulses) },
 		{ "RadarPulseDuration",		INI::parseDurationUnsignedInt, NULL, offsetof(BeaconClientUpdateModuleData, m_radarPulseDuration) },
@@ -95,8 +95,8 @@ static ParticleSystem* createParticleSystem( Drawable *draw )
 			templateName.format("BeaconSmoke%6.6X", (0xffffff & obj->getIndicatorColor()));
 			const ParticleSystemTemplate *particleTemplate = TheParticleSystemManager->findTemplate( templateName );
 
-			DEBUG_ASSERTCRASH(particleTemplate, ("Could not find particle system %s\n", templateName.str()));
-			
+			DEBUG_ASSERTCRASH(particleTemplate, ("Could not find particle system %s", templateName.str()));
+
 			if (particleTemplate)
 			{
 				system = TheParticleSystemManager->createParticleSystem( particleTemplate );
@@ -150,9 +150,9 @@ void BeaconClientUpdate::hideBeacon( void )
 		if( system )
 			system->stop();
 
-	}  // end if
-	
-//	DEBUG_LOG(("in hideBeacon(): draw=%d, m_particleSystemID=%d\n", draw, m_particleSystemID));
+	}
+
+//	DEBUG_LOG(("in hideBeacon(): draw=%d, m_particleSystemID=%d", draw, m_particleSystemID));
 
 }
 
@@ -188,11 +188,11 @@ void BeaconClientUpdate::clientUpdate( void )
 // ------------------------------------------------------------------------------------------------
 void BeaconClientUpdate::crc( Xfer *xfer )
 {
-	
+
 	// extend base class
 	ClientUpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -216,7 +216,7 @@ void BeaconClientUpdate::xfer( Xfer *xfer )
 	// last radar pulse
 	xfer->xferUnsignedInt( &m_lastRadarPulse );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -227,4 +227,4 @@ void BeaconClientUpdate::loadPostProcess( void )
 	// extend base class
 	ClientUpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp b/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
index b0ad847dc02..ffa0fc766e0 100644
--- a/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
@@ -28,10 +28,11 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/Drawable.h"
 #include "GameClient/Module/SwayClientUpdate.h"
+#include "Common/FramePacer.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/ThingFactory.h"
@@ -43,11 +44,6 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/GameLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -81,10 +77,10 @@ SwayClientUpdate::~SwayClientUpdate( void )
 void SwayClientUpdate::updateSway()
 {
 	const BreezeInfo& info = TheScriptEngine->getBreezeInfo();
-	if (info.m_randomness == 0.0f) 
+	if (info.m_randomness == 0.0f)
 	{
 		m_curValue = 0;
-	} 
+	}
 	Real delta				= info.m_randomness * 0.5f;
 	m_curAngleLimit		= info.m_intensity * GameClientRandomValueReal(1.0f-delta, 1.0f+delta);
 	m_curDelta				= 2*PI/info.m_breezePeriod * GameClientRandomValueReal(1.0f-delta, 1.0f+delta);
@@ -105,10 +101,10 @@ void SwayClientUpdate::clientUpdate( void )
 
 	Drawable *draw = getDrawable();
 
-	// if breeze changes, always process the full update, even if not visible, 
+	// if breeze changes, always process the full update, even if not visible,
 	// so that things offscreen won't 'pop' when first viewed
 	const BreezeInfo& info = TheScriptEngine->getBreezeInfo();
-	if (info.m_breezeVersion != m_curVersion) 
+	if (info.m_breezeVersion != m_curVersion)
 	{
 		updateSway();
 	}
@@ -119,8 +115,11 @@ void SwayClientUpdate::clientUpdate( void )
 			return;
 	}
 
-	m_curValue += m_curDelta;
-	if (m_curValue > 2*PI) 
+	// TheSuperHackers @tweak The tree sway time step is now decoupled from the render update.
+	const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
+
+	m_curValue += m_curDelta * timeScale;
+	if (m_curValue > 2*PI)
 		m_curValue -= 2*PI;
 	Real cosine = Cos(m_curValue);
 
@@ -133,7 +132,7 @@ void SwayClientUpdate::clientUpdate( void )
 	draw->setInstanceMatrix(&xfrm);
 
 	m_curAngle = targetAngle;
-	
+
 	// burned things don't sway.
 	Object* obj = draw->getObject();
 	if( obj && obj->getStatusBits().test( OBJECT_STATUS_BURNED ) )
@@ -150,7 +149,7 @@ void SwayClientUpdate::crc( Xfer *xfer )
 	// extend base class
 	ClientUpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -189,7 +188,7 @@ void SwayClientUpdate::xfer( Xfer *xfer )
 	// swaying
 	xfer->xferBool( &m_swaying );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -202,4 +201,4 @@ void SwayClientUpdate::loadPostProcess( void )
 
 	updateSway();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/Eva.cpp b/Generals/Code/GameEngine/Source/GameClient/Eva.cpp
index a6789557505..60c7ec34f5a 100644
--- a/Generals/Code/GameEngine/Source/GameClient/Eva.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/Eva.cpp
@@ -24,21 +24,18 @@
 
 // GameClient/Eva.cpp /////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+#include "GameClient/ControlBar.h"
 #include "GameClient/Eva.h"
 
+#include "Common/GameUtility.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "GameLogic/GameLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
-const char *TheEvaMessageNames[] = 
+static const char *const TheEvaMessageNames[] =
 {
 	"LOWPOWER",
 	"INSUFFICIENTFUNDS",
@@ -59,8 +56,8 @@ const char *TheEvaMessageNames[] =
 	"CASHSTOLEN",
 	"UPGRADECOMPLETE",
 	"BUILDINGBEINGSTOLEN",
-	"EVA_INVALID",
 };
+static_assert(ARRAY_SIZE(TheEvaMessageNames) == EVA_COUNT, "Incorrect array size");
 
 //------------------------------------------------------------------------------ INI::parseEvaEvent
 void INI::parseEvaEvent( INI* ini )
@@ -69,8 +66,8 @@ void INI::parseEvaEvent( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
-	
+	name.set( c );
+
 	EvaCheckInfo *check = TheEva->newEvaCheckInfo( name );
 	if (!check) {
 		// could be null because it already exists.
@@ -109,11 +106,11 @@ EvaCheckInfo::EvaCheckInfo() :
 	m_framesToExpire(150) // 5 seconds at 30 fps
 {
 
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
-const FieldParse EvaCheckInfo::s_evaEventInfo[] = 
+const FieldParse EvaCheckInfo::s_evaEventInfo[] =
 {
 	{ "Priority",							INI::parseUnsignedInt,					NULL,			offsetof( EvaCheckInfo, m_priority ) },
 	{ "TimeBetweenChecksMS",	INI::parseDurationUnsignedInt,	NULL,			offsetof( EvaCheckInfo, m_framesBetweenChecks ) },
@@ -125,7 +122,7 @@ const FieldParse EvaCheckInfo::s_evaEventInfo[] =
 
 
 //-------------------------------------------------------------------------------------------------
-const ShouldPlayFunc Eva::s_shouldPlayFuncs[] = 
+const ShouldPlayFunc Eva::s_shouldPlayFuncs[] =
 {
 	Eva::shouldPlayLowPower,
 	Eva::shouldPlayGenericHandler,
@@ -144,23 +141,22 @@ const ShouldPlayFunc Eva::s_shouldPlayFuncs[] =
 	Eva::shouldPlayGenericHandler,
 	Eva::shouldPlayGenericHandler,
 	Eva::shouldPlayGenericHandler,
-	Eva::shouldPlayGenericHandler,	
-	Eva::shouldPlayGenericHandler,	
-	NULL,
+	Eva::shouldPlayGenericHandler,
+	Eva::shouldPlayGenericHandler,
 };
 
 //-------------------------------------------------------------------------------------------------
-EvaCheck::EvaCheck() : 
-	m_evaInfo(NULL), 
+EvaCheck::EvaCheck() :
+	m_evaInfo(NULL),
 	m_triggeredOnFrame(TRIGGEREDON_NOT),
-	m_timeForNextCheck(NEXT_CHECK_NOW), 
+	m_timeForNextCheck(NEXT_CHECK_NOW),
 	m_alreadyPlayed(FALSE)
 {
 
 }
 
 //-------------------------------------------------------------------------------------------------
-Eva::Eva() : 
+Eva::Eva() :
 	m_localPlayer(NULL),
 	m_previousBuildingCount(0),
 	m_previousUnitCount(0),
@@ -177,8 +173,7 @@ Eva::~Eva()
 {
 	EvaCheckInfoPtrVecIt it;
 	for (it = m_allCheckInfos.begin(); it != m_allCheckInfos.end(); ++it) {
-		if (*it)
-			deleteInstance(*it);
+		deleteInstance(*it);
 	}
 }
 
@@ -187,7 +182,7 @@ void Eva::init()
 {
 	// parse the INI here, etc.
 	INI ini;
-	ini.load( AsciiString( "Data\\INI\\Eva.ini" ), INI_LOAD_OVERWRITE, NULL);
+	ini.loadFileDirectory( "Data\\INI\\Eva", INI_LOAD_OVERWRITE, NULL);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -205,7 +200,7 @@ void Eva::reset()
 	// remove all things flagged as "need to play"
 	for (Int i = 0; i < EVA_COUNT; ++i) {
 		m_shouldPlay[i] = FALSE;
-	}	
+	}
 
 	// If we were previously disabled, re-enable ourselves.
 	m_enabled = TRUE;
@@ -218,7 +213,7 @@ void Eva::update()
 		return;
 	}
 
-	m_localPlayer = ThePlayerList->getLocalPlayer();
+	m_localPlayer = rts::getObservedOrLocalPlayer();
 	UnsignedInt frame = TheGameLogic->getFrame();
 
 	// Don't update for the first few frames. This way, we don't have to deal with our initial power
@@ -235,7 +230,7 @@ void Eva::update()
 		}
 	}
 
-	processPlayingMessages(frame);	
+	processPlayingMessages(frame);
 	m_localPlayer = NULL;
 
 	// Reset all of the flags that have been set to true that haven't actually been probed, because
@@ -314,7 +309,7 @@ void Eva::setEvaEnabled(Bool enabled)
 	for (Int i = EVA_FIRST; i < EVA_COUNT; ++i) {
 		m_shouldPlay[i] = FALSE;
 	}
-	m_enabled = enabled; 
+	m_enabled = enabled;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -337,6 +332,8 @@ Bool Eva::messageShouldPlay(EvaMessage messageToTest, UnsignedInt currentFrame)
 		return FALSE;
 	}
 
+	static_assert(ARRAY_SIZE(s_shouldPlayFuncs) == EVA_COUNT, "Incorrect array size");
+
 	m_messageBeingTested = messageToTest;
 	return s_shouldPlayFuncs[messageToTest](m_localPlayer);
 }
@@ -433,13 +430,13 @@ void Eva::processPlayingMessages(UnsignedInt currentFrame)
 	}
 
 	// We've got a winner!
-	AsciiString side = ThePlayerList->getLocalPlayer()->getSide();
+	AsciiString side = rts::getObservedOrLocalPlayer()->getSide();
 	Int numSides = storedIt->m_evaInfo->m_evaSideSounds.size();
 
 	for (Int i = 0; i < numSides; ++i) {
 		if (side.compareNoCase(storedIt->m_evaInfo->m_evaSideSounds[i].m_side) == 0) {
 			// Its this one.
-			if (storedIt->m_evaInfo->m_evaSideSounds[i].m_soundNames.size() > 0) {
+			if (!storedIt->m_evaInfo->m_evaSideSounds[i].m_soundNames.empty()) {
 				Int soundToPlay = GameClientRandomValue(0, storedIt->m_evaInfo->m_evaSideSounds[i].m_soundNames.size() - 1);
 				m_evaSpeech.setEventName(storedIt->m_evaInfo->m_evaSideSounds[i].m_soundNames[soundToPlay]);
 			} else {
@@ -452,7 +449,7 @@ void Eva::processPlayingMessages(UnsignedInt currentFrame)
 	// Update the entry
 	storedIt->m_alreadyPlayed = true;
 	storedIt->m_timeForNextCheck = currentFrame + storedIt->m_evaInfo->m_framesBetweenChecks;
-	
+
 	// Now that we correctly filter messages, we need to set the player index for who should hear the
 	// sound to the local player.
 	m_evaSpeech.setPlayerIndex(m_localPlayer->getPlayerIndex());
diff --git a/Generals/Code/GameEngine/Source/GameClient/FXList.cpp b/Generals/Code/GameEngine/Source/GameClient/FXList.cpp
index 1f442c8ade6..42cfdea1961 100644
--- a/Generals/Code/GameEngine/Source/GameClient/FXList.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/FXList.cpp
@@ -28,12 +28,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/FXList.h"
 
 #include "Common/DrawModule.h"
 #include "Common/GameAudio.h"
+#include "Common/GameUtility.h"
 #include "Common/INI.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -54,11 +55,6 @@
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 FXListStore *TheFXListStore = NULL;					///< the FXList store definition
 
@@ -95,15 +91,15 @@ void FXNugget::doFXObj(const Object* primary, const Object* secondary) const
 //-------------------------------------------------------------------------------------------------
 class SoundFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SoundFXNugget, "SoundFXNugget")		
-	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SoundFXNugget, "SoundFXNugget")
+
 public:
 
 	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const
 	{
 		AudioEventRTS sound(m_soundName);
-		
-		if (primary) 
+
+		if (primary)
 		{
 			sound.setPosition(primary);
 		}
@@ -126,20 +122,20 @@ class SoundFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Name",									INI::parseAsciiString,	NULL, offsetof( SoundFXNugget, m_soundName ) },
 			{ 0, 0, 0, 0 }
 		};
 
-		SoundFXNugget* nugget = newInstance(SoundFXNugget);	
+		SoundFXNugget* nugget = newInstance(SoundFXNugget);
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
 
 private:
 	AsciiString		m_soundName;
-};  
+};
 EMPTY_DTOR(SoundFXNugget)
 
 //-------------------------------------------------------------------------------------------------
@@ -154,7 +150,7 @@ static Real calcDist(const Coord3D& src, const Coord3D& dst)
 //-------------------------------------------------------------------------------------------------
 class TracerFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TracerFXNugget, "TracerFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TracerFXNugget, "TracerFXNugget")
 public:
 
 	TracerFXNugget()
@@ -179,11 +175,11 @@ class TracerFXNugget : public FXNugget
 			Drawable *tracer = TheThingFactory->newDrawable(TheThingFactory->findTemplate(m_tracerName));
 			if(!tracer)
 				return;
-			
+
 			//Kris -- Redid this section Sept 18, 2002
 			//Calculate tracer orientations to face from primary to secondary position. This
 			//should be the direction that the projectile is being fired towards. It doesn't make
-			//sense that the old stuff made use of the muzzle fx bone orientation (because it's a 
+			//sense that the old stuff made use of the muzzle fx bone orientation (because it's a
 			//subobject). It had other problems because of elevation variations the tracers would
 			//stay on the ground.
 			//tracer->setTransformMatrix(primaryMtx);
@@ -224,7 +220,7 @@ class TracerFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "TracerName",			INI::parseAsciiString,			NULL, offsetof( TracerFXNugget, m_tracerName ) },
 			{ "BoneName",				INI::parseAsciiString,			NULL, offsetof( TracerFXNugget, m_boneName ) },
@@ -237,7 +233,7 @@ class TracerFXNugget : public FXNugget
 			{ 0, 0, 0, 0 }
 		};
 
-		TracerFXNugget* nugget = newInstance( TracerFXNugget );	
+		TracerFXNugget* nugget = newInstance( TracerFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -251,13 +247,13 @@ class TracerFXNugget : public FXNugget
 	Real						m_width;
 	RGBColor				m_color;
 	Real						m_probability;
-};  
+};
 EMPTY_DTOR(TracerFXNugget)
 
 //-------------------------------------------------------------------------------------------------
 class RayEffectFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RayEffectFXNugget, "RayEffectFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RayEffectFXNugget, "RayEffectFXNugget")
 public:
 
 	RayEffectFXNugget()
@@ -270,7 +266,7 @@ class RayEffectFXNugget : public FXNugget
 	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const
 	{
 		const ThingTemplate* tmpl = TheThingFactory->findTemplate(m_templateName);
-		DEBUG_ASSERTCRASH(tmpl, ("RayEffect %s not found\n",m_templateName.str()));
+		DEBUG_ASSERTCRASH(tmpl, ("RayEffect %s not found",m_templateName.str()));
 		if (primary && secondary && tmpl)
 		{
 			Coord3D sourcePos = *primary;
@@ -293,7 +289,7 @@ class RayEffectFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Name",									INI::parseAsciiString,			NULL, offsetof( RayEffectFXNugget, m_templateName ) },
 			{ "PrimaryOffset",				INI::parseCoord3D,					NULL, offsetof( RayEffectFXNugget, m_primaryOffset ) },
@@ -301,7 +297,7 @@ class RayEffectFXNugget : public FXNugget
 			{ 0, 0, 0, 0 }
 		};
 
-		RayEffectFXNugget* nugget = newInstance( RayEffectFXNugget ); 
+		RayEffectFXNugget* nugget = newInstance( RayEffectFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -310,13 +306,13 @@ class RayEffectFXNugget : public FXNugget
 	AsciiString			m_templateName;
 	Coord3D					m_primaryOffset;
 	Coord3D					m_secondaryOffset;
-};  
+};
 EMPTY_DTOR(RayEffectFXNugget)
 
 //-------------------------------------------------------------------------------------------------
 class LightPulseFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(LightPulseFXNugget, "LightPulseFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(LightPulseFXNugget, "LightPulseFXNugget")
 public:
 
 	LightPulseFXNugget() : m_radius(0), m_increaseFrames(0), m_decreaseFrames(0), m_boundingCirclePct(0)
@@ -355,7 +351,7 @@ class LightPulseFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Color",						INI::parseRGBColor,								NULL, offsetof( LightPulseFXNugget, m_color ) },
 			{ "Radius",						INI::parseReal,										NULL, offsetof( LightPulseFXNugget, m_radius ) },
@@ -365,7 +361,7 @@ class LightPulseFXNugget : public FXNugget
 			{ 0, 0, 0, 0 }
 		};
 
-		LightPulseFXNugget* nugget = newInstance( LightPulseFXNugget );	
+		LightPulseFXNugget* nugget = newInstance( LightPulseFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -376,13 +372,13 @@ class LightPulseFXNugget : public FXNugget
 	Real					m_boundingCirclePct;
 	UnsignedInt		m_increaseFrames;
 	UnsignedInt		m_decreaseFrames;
-};  
+};
 EMPTY_DTOR(LightPulseFXNugget)
 
 //-------------------------------------------------------------------------------------------------
 class ViewShakeFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ViewShakeFXNugget, "ViewShakeFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ViewShakeFXNugget, "ViewShakeFXNugget")
 public:
 
 	ViewShakeFXNugget() : m_shake(View::SHAKE_NORMAL)
@@ -404,13 +400,13 @@ class ViewShakeFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Type",				parseShakeType,								NULL, offsetof( ViewShakeFXNugget, m_shake ) },
 			{ 0, 0, 0, 0 }
 		};
 
-		ViewShakeFXNugget* nugget = newInstance( ViewShakeFXNugget );	
+		ViewShakeFXNugget* nugget = newInstance( ViewShakeFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -418,7 +414,7 @@ class ViewShakeFXNugget : public FXNugget
 protected:
 	static void parseShakeType( INI* ini, void *instance, void *store, const void* /*userData*/ )
 	{
-		static const LookupListRec shakeTypeNames[] = 
+		static const LookupListRec shakeTypeNames[] =
 		{
 			{ "SUBTLE", View::SHAKE_SUBTLE },
 			{ "NORMAL", View::SHAKE_NORMAL },
@@ -428,19 +424,21 @@ class ViewShakeFXNugget : public FXNugget
 			{ "CINE_INSANE",  View::SHAKE_CINE_INSANE },
 			{ 0, 0 }
 		};
+		static_assert(ARRAY_SIZE(shakeTypeNames) == View::SHAKE_COUNT + 1, "Incorrect array size");
+
 		*(Int *)store = INI::scanLookupList(ini->getNextToken(), shakeTypeNames);
 	}
 
 private:
 	View::CameraShakeType m_shake;
 
-};  
+};
 EMPTY_DTOR(ViewShakeFXNugget)
 
 //-------------------------------------------------------------------------------------------------
 class TerrainScorchFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TerrainScorchFXNugget, "TerrainScorchFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TerrainScorchFXNugget, "TerrainScorchFXNugget")
 public:
 
 	TerrainScorchFXNugget() : m_scorch(-1), m_radius(0)
@@ -466,14 +464,14 @@ class TerrainScorchFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Type",				parseScorchType,			NULL, offsetof( TerrainScorchFXNugget, m_scorch ) },
 			{ "Radius",			INI::parseReal,				NULL, offsetof( TerrainScorchFXNugget, m_radius ) },
 			{ 0, 0, 0, 0 }
 		};
 
-		TerrainScorchFXNugget* nugget = newInstance( TerrainScorchFXNugget );	
+		TerrainScorchFXNugget* nugget = newInstance( TerrainScorchFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -482,7 +480,7 @@ class TerrainScorchFXNugget : public FXNugget
 
 	static void parseScorchType( INI* ini, void *instance, void *store, const void* /*userData*/ )
 	{
-		static const LookupListRec scorchTypeNames[] = 
+		static const LookupListRec scorchTypeNames[] =
 		{
 			{ "SCORCH_1",				SCORCH_1 },
 			{ "SCORCH_2",				SCORCH_2 },
@@ -492,19 +490,21 @@ class TerrainScorchFXNugget : public FXNugget
 			{ "RANDOM",					-1 },
 			{ 0, 0 }
 		};
+		static_assert(ARRAY_SIZE(scorchTypeNames) == SCORCH_COUNT + 2, "Incorrect array size");
+
 		*(Int *)store = INI::scanLookupList(ini->getNextToken(), scorchTypeNames);
 	}
 
 private:
 	Int		m_scorch;
 	Real	m_radius;
-};  
+};
 EMPTY_DTOR(TerrainScorchFXNugget)
 
 //-------------------------------------------------------------------------------------------------
 class ParticleSystemFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ParticleSystemFXNugget, "ParticleSystemFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ParticleSystemFXNugget, "ParticleSystemFXNugget")
 public:
 
 	ParticleSystemFXNugget()
@@ -565,7 +565,7 @@ class ParticleSystemFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Name",									INI::parseAsciiString,			NULL, offsetof( ParticleSystemFXNugget, m_name ) },
 			{ "Count",								INI::parseInt,							NULL, offsetof( ParticleSystemFXNugget, m_count ) },
@@ -584,7 +584,7 @@ class ParticleSystemFXNugget : public FXNugget
 			{ 0, 0, 0, 0 }
 		};
 
-		ParticleSystemFXNugget* nugget = newInstance( ParticleSystemFXNugget );	
+		ParticleSystemFXNugget* nugget = newInstance( ParticleSystemFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -600,7 +600,7 @@ class ParticleSystemFXNugget : public FXNugget
 		}
 
 		const ParticleSystemTemplate *tmp = TheParticleSystemManager->findTemplate(m_name);
-		DEBUG_ASSERTCRASH(tmp, ("ParticleSystem %s not found\n",m_name.str()));
+		DEBUG_ASSERTCRASH(tmp, ("ParticleSystem %s not found",m_name.str()));
 		if (tmp)
 		{
 			for (Int i = 0; i < m_count; i++ )
@@ -618,7 +618,7 @@ class ParticleSystemFXNugget : public FXNugget
 					{
 						//old way:
 						//newPos.z = TheTerrainLogic->getGrsoundHeight( newPos.x, newPos.y ) + 1;// The plus one prevents scissoring with terrain
-						
+
 						//new way: now we allow bridges in the GroundHeight.
 						PathfindLayerEnum layer = TheTerrainLogic->getLayerForDestination(&newPos);
 						newPos.z = TheTerrainLogic->getLayerHeight( newPos.x, newPos.y, layer );
@@ -678,13 +678,13 @@ class ParticleSystemFXNugget : public FXNugget
 	Bool						m_createAtGroundHeight;
 	Bool						m_useCallersRadius;
 	Bool						m_ricochet;
-};  
+};
 EMPTY_DTOR(ParticleSystemFXNugget)
 
 //-------------------------------------------------------------------------------------------------
 class FXListAtBonePosFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FXListAtBonePosFXNugget, "FXListAtBonePosFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FXListAtBonePosFXNugget, "FXListAtBonePosFXNugget")
 public:
 
 	FXListAtBonePosFXNugget()
@@ -717,7 +717,7 @@ class FXListAtBonePosFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "FX",								  	INI::parseFXList,			    NULL, offsetof( FXListAtBonePosFXNugget, m_fx ) },
 			{ "BoneName",							INI::parseAsciiString,		NULL, offsetof( FXListAtBonePosFXNugget, m_boneName ) },
@@ -725,7 +725,7 @@ class FXListAtBonePosFXNugget : public FXNugget
 			{ 0, 0, 0, 0 }
 		};
 
-		FXListAtBonePosFXNugget* nugget = newInstance( FXListAtBonePosFXNugget );	
+		FXListAtBonePosFXNugget* nugget = newInstance( FXListAtBonePosFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -759,7 +759,7 @@ class FXListAtBonePosFXNugget : public FXNugget
 	const FXList*		m_fx;
   AsciiString     m_boneName;
   Bool            m_orientToBone;
-};  
+};
 EMPTY_DTOR(FXListAtBonePosFXNugget)
 
 //-------------------------------------------------------------------------------------------------
@@ -769,15 +769,15 @@ EMPTY_DTOR(FXListAtBonePosFXNugget)
 
 static const FieldParse TheFXListFieldParse[] =
 {
-	{ "Sound",											SoundFXNugget::parse, 0, 0},		
-	{ "RayEffect",									RayEffectFXNugget::parse, 0, 0},		
-	{ "Tracer",											TracerFXNugget::parse, 0, 0},		
-	{ "LightPulse",									LightPulseFXNugget::parse, 0, 0},		
-	{ "ViewShake",									ViewShakeFXNugget::parse, 0, 0},		
-	{ "TerrainScorch",							TerrainScorchFXNugget::parse, 0, 0},		
-	{ "ParticleSystem",							ParticleSystemFXNugget::parse, 0, 0},		
-	{ "FXListAtBonePos",						FXListAtBonePosFXNugget::parse, 0, 0},		
-	{ NULL, NULL, 0, 0 }  // keep this last
+	{ "Sound",											SoundFXNugget::parse, 0, 0},
+	{ "RayEffect",									RayEffectFXNugget::parse, 0, 0},
+	{ "Tracer",											TracerFXNugget::parse, 0, 0},
+	{ "LightPulse",									LightPulseFXNugget::parse, 0, 0},
+	{ "ViewShake",									ViewShakeFXNugget::parse, 0, 0},
+	{ "TerrainScorch",							TerrainScorchFXNugget::parse, 0, 0},
+	{ "ParticleSystem",							ParticleSystemFXNugget::parse, 0, 0},
+	{ "FXListAtBonePos",						FXListAtBonePosFXNugget::parse, 0, 0},
+	{ NULL, NULL, 0, 0 }
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -796,8 +796,7 @@ void FXList::clear()
 {
 	for (FXNuggetList::iterator it = m_nuggets.begin(); it != m_nuggets.end(); ++it)
 	{
-		if (*it)
-			deleteInstance(*it);
+		deleteInstance(*it);
 	}
 	m_nuggets.clear();
 }
@@ -805,7 +804,9 @@ void FXList::clear()
 //-------------------------------------------------------------------------------------------------
 void FXList::doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real overrideRadius ) const
 {
-	if (ThePartitionManager->getShroudStatusForPlayer(ThePlayerList->getLocalPlayer()->getPlayerIndex(), primary) != CELLSHROUD_CLEAR)
+	const Int playerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
+
+	if (ThePartitionManager->getShroudStatusForPlayer(playerIndex, primary) != CELLSHROUD_CLEAR)
 		return;
 
 	for (FXNuggetList::const_iterator it = m_nuggets.begin(); it != m_nuggets.end(); ++it)
@@ -817,7 +818,9 @@ void FXList::doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const R
 //-------------------------------------------------------------------------------------------------
 void FXList::doFXObj(const Object* primary, const Object* secondary) const
 {
-	if (primary && primary->getShroudedStatus(ThePlayerList->getLocalPlayer()->getPlayerIndex()) > OBJECTSHROUD_PARTIAL_CLEAR)
+	const Int playerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
+
+	if (primary && primary->getShroudedStatus(playerIndex) > OBJECTSHROUD_PARTIAL_CLEAR)
 		return;	//the primary object is fogged or shrouded so don't bother with the effect.
 
 	for (FXNuggetList::const_iterator it = m_nuggets.begin(); it != m_nuggets.end(); ++it)
@@ -852,7 +855,7 @@ const FXList *FXListStore::findFXList(const char* name) const
 		return NULL;
 
   FXListMap::const_iterator it = m_fxmap.find(NAMEKEY(name));
-  if (it != m_fxmap.end()) 
+  if (it != m_fxmap.end())
 	{
 		return &(*it).second;
 	}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp
index c563e303bab..dc349e6e730 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp
@@ -24,12 +24,12 @@
 
 // FILE: AnimateWindowManager.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Mar 2002
@@ -37,8 +37,8 @@
 //	Filename: 	AnimateWindowManager.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	This will contain the logic behind the different animations that 
+//
+//	purpose:	This will contain the logic behind the different animations that
 //						can happen to a window.
 //
 //-----------------------------------------------------------------------------
@@ -51,7 +51,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/AnimateWindowManager.h"
 #include "GameClient/GameWindow.h"
@@ -87,7 +87,7 @@ AnimateWindow::~AnimateWindow( void )
 	m_win = NULL;
 }
 
-void AnimateWindow::setAnimData( 	ICoord2D startPos, ICoord2D endPos, 
+void AnimateWindow::setAnimData( 	ICoord2D startPos, ICoord2D endPos,
 																	ICoord2D curPos, ICoord2D restPos,
 																	Coord2D vel, UnsignedInt startTime,
 																	UnsignedInt endTime )
@@ -111,14 +111,11 @@ void AnimateWindow::setAnimData( 	ICoord2D startPos, ICoord2D endPos,
 
 static void clearWinList(AnimateWindowList &winList)
 {
-	wnd::AnimateWindow *win = NULL;
 	while (!winList.empty())
 	{
-		win = *(winList.begin());
+		wnd::AnimateWindow *win = *(winList.begin());
 		winList.pop_front();
-		if (win)
-			deleteInstance(win);
-		win = NULL;
+		deleteInstance(win);
 	}
 }
 
@@ -140,22 +137,14 @@ AnimateWindowManager::AnimateWindowManager( void )
 }
 AnimateWindowManager::~AnimateWindowManager( void )
 {
-	if(m_slideFromRight)
-		delete m_slideFromRight;
-	if(m_slideFromRightFast)
-		delete m_slideFromRightFast;
-	if(m_slideFromLeft)
-		delete m_slideFromLeft;
-	if(m_slideFromTop)
-		delete m_slideFromTop;
-	if(m_slideFromTopFast)
-		delete m_slideFromTopFast;
-	if(m_slideFromBottom)
-		delete m_slideFromBottom;
-	if(m_spiral)
-		delete m_spiral;
-	if (m_slideFromBottomTimed)
-		delete m_slideFromBottomTimed;
+	delete m_slideFromRight;
+	delete m_slideFromRightFast;
+	delete m_slideFromLeft;
+	delete m_slideFromTop;
+	delete m_slideFromTopFast;
+	delete m_slideFromBottom;
+	delete m_spiral;
+	delete m_slideFromBottomTimed;
 
 	m_slideFromRight = NULL;
 	resetToRestPosition( );
@@ -163,7 +152,7 @@ AnimateWindowManager::~AnimateWindowManager( void )
 	clearWinList(m_winMustFinishList);
 }
 
-	
+
 void AnimateWindowManager::init( void )
 {
 	clearWinList(m_winList);
@@ -183,7 +172,7 @@ void AnimateWindowManager::reset( void )
 
 void AnimateWindowManager::update( void )
 {
-	
+
 	ProcessAnimateWindow *processAnim = NULL;
 
 	// if we need to update the windows that need to finish, update that list
@@ -191,7 +180,7 @@ void AnimateWindowManager::update( void )
 	{
 		AnimateWindowList::iterator it = m_winMustFinishList.begin();
 		m_needsUpdate = FALSE;
-		
+
 		while (it != m_winMustFinishList.end())
 		{
 			wnd::AnimateWindow *animWin = *it;
@@ -214,13 +203,13 @@ void AnimateWindowManager::update( void )
 						m_needsUpdate = TRUE;
 				}
 			}
-			
+
 			it ++;
 		}
 	}
 
 	AnimateWindowList::iterator it = m_winList.begin();
-		
+
 	while (it != m_winList.end())
 	{
 		wnd::AnimateWindow *animWin = *it;
@@ -233,7 +222,7 @@ void AnimateWindowManager::update( void )
 		if(m_reverse)
 		{
 			if(processAnim)
-				processAnim->reverseAnimateWindow(animWin);			
+				processAnim->reverseAnimateWindow(animWin);
 		}
 		else
 		{
@@ -248,7 +237,7 @@ void AnimateWindowManager::update( void )
 void AnimateWindowManager::registerGameWindow(GameWindow *win, AnimTypes animType, Bool needsToFinish, UnsignedInt ms, UnsignedInt delayMs)
 {
 	if(!win)
-	{	
+	{
 		DEBUG_CRASH(("Win was NULL as it was passed into registerGameWindow... not good indeed"));
 		return;
 	}
@@ -272,7 +261,7 @@ void AnimateWindowManager::registerGameWindow(GameWindow *win, AnimTypes animTyp
 		processAnim->setMaxDuration(ms);
 		processAnim->initAnimateWindow( animWin );
 	}
-	
+
 	// Add the Window to the proper list
 	if(needsToFinish)
 	{
@@ -325,11 +314,11 @@ ProcessAnimateWindow *AnimateWindowManager::getProcessAnimate( AnimTypes animTyp
 
 void AnimateWindowManager::reverseAnimateWindow( void )
 {
-	
+
 	m_reverse = TRUE;
 	m_needsUpdate = TRUE;
 	ProcessAnimateWindow *processAnim = NULL;
-	
+
 	UnsignedInt maxDelay = 0;
 	AnimateWindowList::iterator it = m_winMustFinishList.begin();
 	while (it != m_winMustFinishList.end())
@@ -360,13 +349,13 @@ void AnimateWindowManager::reverseAnimateWindow( void )
 		{
 			processAnim->initReverseAnimateWindow( animWin, maxDelay );
 		}
-		
+
 		animWin->setFinished(FALSE);
 		it ++;
 	}
-	
+
 	it = m_winList.begin();
-		
+
 	while (it != m_winList.end())
 	{
 		wnd::AnimateWindow *animWin = *it;
@@ -376,7 +365,7 @@ void AnimateWindowManager::reverseAnimateWindow( void )
 			return;
 		}
 		processAnim = getProcessAnimate( animWin->getAnimType() );
-		
+
 		if(processAnim)
 			processAnim->initReverseAnimateWindow(animWin);
 		animWin->setFinished(FALSE);
@@ -387,10 +376,10 @@ void AnimateWindowManager::reverseAnimateWindow( void )
 
 void AnimateWindowManager::resetToRestPosition( void )
 {
-	
+
 	m_reverse = TRUE;
 	m_needsUpdate = TRUE;
-	
+
 	AnimateWindowList::iterator it = m_winMustFinishList.begin();
 	while (it != m_winMustFinishList.end())
 	{
@@ -422,7 +411,7 @@ void AnimateWindowManager::resetToRestPosition( void )
 		it ++;
 	}
 
-	
+
 }
 
 //-----------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
index 19c0dd3be1c..75952a05f2b 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
@@ -29,7 +29,7 @@
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_GUI_COMMMAND_NAMES
 #define DEFINE_COMMAND_OPTION_NAMES
 #define DEFINE_WEAPONSLOTTYPE_NAMES
@@ -82,11 +82,6 @@
 
 #include "GameNetwork/GameInfo.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 ControlBar *TheControlBar = NULL;
@@ -101,7 +96,7 @@ const Image* ControlBar::m_rankHeroicIcon		= NULL;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-const FieldParse CommandButton::s_commandButtonFieldParseTable[] = 
+const FieldParse CommandButton::s_commandButtonFieldParseTable[] =
 {
 
 	{ "Command",							CommandButton::parseCommand, NULL, offsetof( CommandButton, m_command ) },
@@ -121,9 +116,9 @@ const FieldParse CommandButton::s_commandButtonFieldParseTable[] =
 	{ "InvalidCursorName",		INI::parseAsciiString,       NULL, offsetof( CommandButton, m_invalidCursorName ) },
 	{ "ButtonBorderType",			INI::parseLookupList,				 CommandButtonMappedBorderTypeNames, offsetof( CommandButton, m_commandButtonBorder ) },
 	{ "RadiusCursorType",			INI::parseIndexList,				 TheRadiusCursorNames, offsetof( CommandButton, m_radiusCursor ) },
-	{ "UnitSpecificSound",		INI::parseAudioEventRTS,		 NULL, offsetof( CommandButton, m_unitSpecificSound ) }, 
+	{ "UnitSpecificSound",		INI::parseAudioEventRTS,		 NULL, offsetof( CommandButton, m_unitSpecificSound ) },
 
-	{ NULL,						NULL,												 NULL, 0 }  // keep this last
+	{ NULL,						NULL,												 NULL, 0 }
 
 };
 static void commandButtonTooltip(GameWindow *window,
@@ -135,10 +130,10 @@ static void commandButtonTooltip(GameWindow *window,
 
 /// mark the UI as dirty so the context of everything is re-evaluated
 void ControlBar::markUIDirty( void )
-{ 
+{
   m_UIDirty = TRUE;
 
-#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG )
+#if defined(RTS_DEBUG)
 	UnsignedInt now = TheGameLogic->getFrame();
 	if( now == m_lastFrameMarkedDirty )
 	{
@@ -162,6 +157,21 @@ void ControlBar::markUIDirty( void )
 #endif
 }
 
+Player* ControlBar::getCurrentlyViewedPlayer()
+{
+	if (isObserverControlBarOn())
+		return getObserverLookAtPlayer();
+
+	return ThePlayerList->getLocalPlayer();
+}
+
+Relationship ControlBar::getCurrentlyViewedPlayerRelationship(const Team* team)
+{
+	if (Player* player = getCurrentlyViewedPlayer())
+		return player->getRelationship(team);
+
+	return NEUTRAL;
+}
 
 void ControlBar::populatePurchaseScience( Player* player )
 {
@@ -174,13 +184,13 @@ void ControlBar::populatePurchaseScience( Player* player )
 	if(TheScriptEngine->isGameEnding())
 		return;
 	// get command set
-	if(!player ||!player->getPlayerTemplate() || player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1().isEmpty() || 
+	if(!player ||!player->getPlayerTemplate() || player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1().isEmpty() ||
 			player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3().isEmpty() ||
 			player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8().isEmpty())
 		return;
-	commandSet1 = TheControlBar->findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
-	commandSet3 = TheControlBar->findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
-	commandSet8 = TheControlBar->findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
+	commandSet1 = findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
+	commandSet3 = findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
+	commandSet8 = findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
 
 	for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_1; i++ )
 		m_sciencePurchaseWindowsRank1[i]->winHide(TRUE);
@@ -209,7 +219,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 		{
 			// hide window on interface
 			m_sciencePurchaseWindowsRank1[ i ]->winHide( TRUE );
-		}  // end if
+		}
 		else
 		{
 			// make sure the window is not hidden
@@ -254,9 +264,9 @@ void ControlBar::populatePurchaseScience( Player* player )
 						m_sciencePurchaseWindowsRank1[ i ]->winHide(TRUE);
 				}
 			}
-		}  // end else
+		}
 
-	}  // end for
+	}
 
 	for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_3; i++ )
 	{
@@ -269,7 +279,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 		{
 			// hide window on interface
 			m_sciencePurchaseWindowsRank3[ i ]->winHide( TRUE );
-		}  // end if
+		}
 		else
 		{
 			// make sure the window is not hidden
@@ -281,7 +291,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 			// populate the visible button with data from the command button
 
 			setControlCommand( m_sciencePurchaseWindowsRank3[ i ], commandButton );
-			ScienceType	st = SCIENCE_INVALID; 
+			ScienceType	st = SCIENCE_INVALID;
 			ScienceVec sv = commandButton->getScienceVec();
 			if (! sv.empty())
 			{
@@ -317,9 +327,9 @@ void ControlBar::populatePurchaseScience( Player* player )
 					m_sciencePurchaseWindowsRank3[ i ]->winHide(TRUE);
 			}
 
-		}  // end else
+		}
 
-	}  // end for
+	}
 
 	for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_8; i++ )
 	{
@@ -332,7 +342,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 		{
 			// hide window on interface
 			m_sciencePurchaseWindowsRank8[ i ]->winHide( TRUE );
-		}  // end if
+		}
 		else
 		{
 			// make sure the window is not hidden
@@ -344,7 +354,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 			// populate the visible button with data from the command button
 
 			setControlCommand( m_sciencePurchaseWindowsRank8[ i ], commandButton );
-			ScienceType	st = SCIENCE_INVALID; 
+			ScienceType	st = SCIENCE_INVALID;
 			st = commandButton->getScienceVec()[ 0 ];
 			if( player->isScienceDisabled( st ) )
 			{
@@ -375,9 +385,9 @@ void ControlBar::populatePurchaseScience( Player* player )
 					m_sciencePurchaseWindowsRank8[ i ]->winHide(TRUE);
 			}
 
-		}  // end else
+		}
 
-	}  // end for
+	}
 
 
 	GameWindow *win = NULL;
@@ -388,14 +398,14 @@ void ControlBar::populatePurchaseScience( Player* player )
 		tempUS.format(L"%d", player->getSciencePurchasePoints());
 		GadgetStaticTextSetText(win, tempUS);
 	}
-	
+
 	win = TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], TheNameKeyGenerator->nameToKey( "GeneralsExpPoints.wnd:StaticTextLevel" ) );
 	if(win)
 	{
 		tempUS.format(TheGameText->fetch("SCIENCE:Rank"), player->getRankLevel());
 		GadgetStaticTextSetText(win, tempUS);
 	}
-	
+
 	win = TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], TheNameKeyGenerator->nameToKey( "GeneralsExpPoints.wnd:ProgressBarExperience" ) );
 	if(win)
 	{
@@ -403,7 +413,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 		progress = ((player->getSkillPoints() - player->getSkillPointsLevelDown()) * 100) /(player->getSkillPointsLevelUp() - player->getSkillPointsLevelDown());
 		GadgetProgressBarSetProgress(win, progress);
 	}
-	
+
 	win = TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], TheNameKeyGenerator->nameToKey( "GeneralsExpPoints.wnd:StaticTextTitle" ) );
 	if(win)
 	{
@@ -412,8 +422,8 @@ void ControlBar::populatePurchaseScience( Player* player )
 		tempAs.format("SCIENCE:Rank%d", player->getRankLevel());
 		GadgetStaticTextSetText(win, TheGameText->fetch(tempAs));
 	}
-	
-	
+
+
 	//
 	// to avoid a one frame delay where windows may become enabled/disabled, run the update
 	// at once to get it all in the correct state immediately
@@ -445,7 +455,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 		u.translate(foo);
 		GadgetListBoxAddEntryText(win, u, color, -1, -1);
 	}
-	GadgetListBoxAddEntryText(win, UnicodeString(L"Cancel"), color, -1, -1);*/
+	GadgetListBoxAddEntryText(win, L"Cancel", color, -1, -1);*/
 
 }
 
@@ -462,7 +472,7 @@ void ControlBar::updateContextPurchaseScience( void )
 		progress = ((player->getSkillPoints() - player->getSkillPointsLevelDown()) * 100) /(player->getSkillPointsLevelUp() - player->getSkillPointsLevelDown());
 		GadgetProgressBarSetProgress(win, progress);
 	}
-	
+
 //	win = TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], TheNameKeyGenerator->nameToKey( "ControlBar.wnd:TextEntryGeneralName" ) );
 //	if(win)
 //	{
@@ -480,7 +490,7 @@ void ControlBar::updateContextPurchaseScience( void )
 	// sanity
 	if( obj->isKindOf( KINDOF_COMMANDCENTER ) == FALSE )
 		switchToContext( CB_CONTEXT_NONE, NULL );
-	
+
 	GameWindow* win = m_contextParent[ CP_PURCHASE_SCIENCE ];
 
 	Int selected;
@@ -522,14 +532,14 @@ void CommandButton::parseCommand( INI* ini, void *instance, void *store, const v
 			*command = (GUICommandType)i;
 			return;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// if we're here the command was not found
 	throw INI_INVALID_DATA;
 
-}  // end parseCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -551,10 +561,6 @@ CommandButton::CommandButton( void )
 	//m_pushedImage = NULL;
 
 	m_flashCount = 0;
-
-	// Added by Sadullah Nader
-	// The purpose is to initialize these variable to values that are zero or empty
-
 	m_conflictingLabel.clear();
 	m_cursorName.clear();
 	m_descriptionLabel.clear();
@@ -563,22 +569,19 @@ CommandButton::CommandButton( void )
 	m_options = 0;
 	m_purchasedLabel.clear();
 	m_textLabel.clear();
-
-	// End Add
-	
 	m_window = NULL;
 	m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE;
 	//m_prev = NULL;
-	m_next = NULL;			
-	m_radiusCursor = RADIUSCURSOR_NONE;													
-	
+	m_next = NULL;
+	m_radiusCursor = RADIUSCURSOR_NONE;
+
 }
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 CommandButton::~CommandButton( void )
 {
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -624,7 +627,7 @@ Bool CommandButton::isValidToUseOn(const Object *sourceObj, const Object *target
 		if (pui) {
 			const ProductionEntry *pe = pui->firstProduction();
 			while (pe) {
-				if (pe->getProductionUpgrade() != NULL) 
+				if (pe->getProductionUpgrade() != NULL)
 					return false;
 				pe = pui->nextProduction(pe);
 			}
@@ -634,22 +637,22 @@ Bool CommandButton::isValidToUseOn(const Object *sourceObj, const Object *target
 		return false;
 	}
 
-	if( BitIsSet( m_options, COMMAND_OPTION_NEED_OBJECT_TARGET ) && !targetObj ) 
+	if( BitIsSet( m_options, COMMAND_OPTION_NEED_OBJECT_TARGET ) && !targetObj )
 	{
 		return false;
 	}
 
-	if( BitIsSet( m_options, NEED_TARGET_POS ) && !targetLocation ) 
+	if( BitIsSet( m_options, NEED_TARGET_POS ) && !targetLocation )
 	{
 		return false;
 	}
-	
-	if( BitIsSet( m_options, COMMAND_OPTION_NEED_OBJECT_TARGET ) ) 
+
+	if( BitIsSet( m_options, COMMAND_OPTION_NEED_OBJECT_TARGET ) )
 	{
 		return TheActionManager->canDoSpecialPowerAtObject( sourceObj, targetObj, commandSource, m_specialPower, m_options, false );
 	}
 
-	if( BitIsSet( m_options, NEED_TARGET_POS ) ) 
+	if( BitIsSet( m_options, NEED_TARGET_POS ) )
 	{
 		return TheActionManager->canDoSpecialPowerAtLocation( sourceObj, targetLocation, commandSource, m_specialPower, NULL, m_options, false );
 	}
@@ -661,9 +664,9 @@ Bool CommandButton::isValidToUseOn(const Object *sourceObj, const Object *target
 Bool CommandButton::isReady(const Object *sourceObj) const
 {
 	SpecialPowerModuleInterface *mod = sourceObj->getSpecialPowerModule( m_specialPower );
-	if( mod && mod->getPercentReady() == 1.0f ) 
+	if( mod && mod->getPercentReady() == 1.0f )
 		return true;
-	
+
 	if (m_upgradeTemplate && sourceObj->affectedByUpgrade(m_upgradeTemplate) && !sourceObj->hasUpgrade(m_upgradeTemplate))
 		return true;
 
@@ -684,9 +687,9 @@ Bool CommandButton::isValidObjectTarget(const Drawable* source, const Drawable*
 /** These are the fields you can define in a command set, they correspond to physical
 	* buttons in the GUI */
 //-------------------------------------------------------------------------------------------------
-const FieldParse CommandSet::m_commandSetFieldParseTable[] = 
+const FieldParse CommandSet::m_commandSetFieldParseTable[] =
 {
-	
+
 	{ "1",			CommandSet::parseCommandButton, (void *)0,		offsetof( CommandSet, m_command ) },
 	{ "2",			CommandSet::parseCommandButton, (void *)1,		offsetof( CommandSet, m_command ) },
 	{ "3",			CommandSet::parseCommandButton, (void *)2,		offsetof( CommandSet, m_command ) },
@@ -699,7 +702,7 @@ const FieldParse CommandSet::m_commandSetFieldParseTable[] =
 	{ "10",			CommandSet::parseCommandButton, (void *)9,		offsetof( CommandSet, m_command ) },
 	{ "11",			CommandSet::parseCommandButton, (void *)10,		offsetof( CommandSet, m_command ) },
 	{ "12",			CommandSet::parseCommandButton, (void *)11,		offsetof( CommandSet, m_command ) },
-	{ NULL,			NULL,														 NULL,				0	}  // keep this last
+	{ NULL,			NULL,														 NULL,				0	}
 
 };
 
@@ -746,7 +749,7 @@ void CommandButton::copyButtonTextFrom( const CommandButton *button, Bool shortc
 		}
 	}
 	else
-	{	
+	{
 		//Copy the text from the purchase science button if it exists (most won't).
 		if( button->getTextLabel().isNotEmpty() && m_textLabel.compare( button->getTextLabel() ) )
 		{
@@ -777,28 +780,28 @@ void CommandSet::parseCommandButton( INI* ini, void *instance, void *store, cons
 	if( commandButton == NULL )
 	{
 
-		DEBUG_CRASH(( "[LINE: %d - FILE: '%s'] Unknown command '%s' found in command set\n",
+		DEBUG_CRASH(( "[LINE: %d - FILE: '%s'] Unknown command '%s' found in command set",
 								  ini->getLineNum(), ini->getFilename().str(), token ));
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// get the index to store the command at, and the command array itself
 	const CommandButton **buttonArray = (const CommandButton **)store;
 	Int buttonIndex = (Int)userData;
 
 	// sanity
-	DEBUG_ASSERTCRASH( buttonIndex < MAX_COMMANDS_PER_SET, ("parseCommandButton: button index '%d' out of range\n", 
+	DEBUG_ASSERTCRASH( buttonIndex < MAX_COMMANDS_PER_SET, ("parseCommandButton: button index '%d' out of range",
 										 buttonIndex) );
 
 	// save it
 	buttonArray[ buttonIndex ] = commandButton;
 
-}  // end parseCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-CommandSet::CommandSet(const AsciiString& name) : 
+CommandSet::CommandSet(const AsciiString& name) :
 	m_name(name),
 	m_next(NULL)
 {
@@ -808,14 +811,14 @@ CommandSet::CommandSet(const AsciiString& name) :
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-const CommandButton* CommandSet::getCommandButton(Int i) const 
-{ 
+const CommandButton* CommandSet::getCommandButton(Int i) const
+{
 	const CommandButton* button;
   // Check for TheGameLogic == null, cause it is in Worldbuilder, and wb gets command bar info. jba.
 	if (TheGameLogic && TheGameLogic->findControlBarOverride(m_name, i, button))
 		return button;
 
-	return m_command[i]; 
+	return m_command[i];
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -831,7 +834,7 @@ void CommandSet::friend_addToList(CommandSet** listHead)
 CommandSet::~CommandSet( void )
 {
 
-}  // end ~CommandSet
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // ControlBar /////////////////////////////////////////////////////////////////////////////////////
@@ -847,16 +850,13 @@ ControlBar::ControlBar( void )
 	m_controlBarSchemeManager = NULL;
 	m_isObserverCommandBar = FALSE;
 	m_observerLookAtPlayer = NULL;
+	m_observedPlayer = NULL;
 	m_buildToolTipLayout = NULL;
 	m_showBuildToolTipLayout = FALSE;
-
-	// Added By Sadullah Nader
-	// initializing vars to zero
 	m_animateDownWin1Pos.x = m_animateDownWin1Pos.y = 0;
 	m_animateDownWin1Size.x = m_animateDownWin1Size.y = 0;
 	m_animateDownWin2Pos.x = m_animateDownWin2Pos.y = 0;
 	m_animateDownWin2Size.x = m_animateDownWin2Size.y = 0;
-
 	m_animateDownWindow = NULL;
 	m_animTime = 0;
 
@@ -864,15 +864,14 @@ ControlBar::ControlBar( void )
 	{
 		m_commonCommands[i] = 0;
 	}
-	
+
 	m_currContext = CB_CONTEXT_NONE;
 	m_defaultControlBarPosition.x = m_defaultControlBarPosition.y = 0;
 	m_genStarFlash = FALSE;
-  m_genStarOff = NULL;
+	m_genStarOff = NULL;
 	m_genStarOn  = NULL;
 	m_UIDirty    = FALSE;
-	//
-//	m_controlBarResizer = NULL;
+	//	m_controlBarResizer = NULL;
 	m_buildUpClockColor = GameMakeColor(0,0,0,100);
 	m_commandBarBorderColor = GameMakeColor(0,0,0,100);
 	for( i = 0; i < NUM_CONTEXT_PARENTS; i++ )
@@ -915,7 +914,7 @@ ControlBar::ControlBar( void )
 	resetBuildQueueData();
 	resetContainData();
 	m_lastRecordedInventoryCount = 0;
-	
+
 	m_videoManager = NULL;
 	m_animateWindowManager = NULL;
 	m_generalsScreenAnimate = NULL;
@@ -927,7 +926,7 @@ ControlBar::ControlBar( void )
 	m_toggleButtonDownIn = NULL;
 	m_toggleButtonDownOn = NULL;
 	m_toggleButtonDownPushed = NULL;
-	
+
 	m_generalButtonEnable = NULL;
 	m_generalButtonHighlight = NULL;
 	m_genArrow = NULL;
@@ -938,12 +937,12 @@ ControlBar::ControlBar( void )
 	m_remainingRadarAttackGlowFrames = 0;
 	m_radarAttackGlowWindow = NULL;
 
-#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG )
+#if defined(RTS_DEBUG)
 	m_lastFrameMarkedDirty = 0;
 	m_consecutiveDirtyFrames = 0;
 #endif
 
-}  // end ControlBar
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -957,29 +956,25 @@ ControlBar::~ControlBar( void )
 		m_scienceLayout = NULL;
 	}
 	m_genArrow = NULL;
-	if(m_videoManager)
-		delete m_videoManager;
-	m_videoManager = NULL;
 
+	delete m_videoManager;
+	m_videoManager = NULL;
 
-	if(m_animateWindowManagerForGenShortcuts)
-		delete m_animateWindowManagerForGenShortcuts;
+	delete m_animateWindowManagerForGenShortcuts;
 	m_animateWindowManagerForGenShortcuts = NULL;
-	if(m_animateWindowManager)
-		delete m_animateWindowManager;
+
+	delete m_animateWindowManager;
 	m_animateWindowManager = NULL;
-	
-	if(m_generalsScreenAnimate)
-		delete m_generalsScreenAnimate;
+
+	delete m_generalsScreenAnimate;
 	m_generalsScreenAnimate = NULL;
 
-	if( m_controlBarSchemeManager )
-		delete m_controlBarSchemeManager;
+	delete m_controlBarSchemeManager;
 	m_controlBarSchemeManager = NULL;
 
-//	if(m_controlBarResizer)
-//		delete m_controlBarResizer;
+//	delete m_controlBarResizer;
 //	m_controlBarResizer = NULL;
+
 	// destroy all the command set definitions
 	CommandSet *set;
 	while( m_commandSets )
@@ -988,7 +983,7 @@ ControlBar::~ControlBar( void )
 		deleteInstance(m_commandSets);
 		m_commandSets = set;
 
-	}  // end while
+	}
 
 	// destroy all our command button definitions
 	CommandButton *button;
@@ -998,7 +993,7 @@ ControlBar::~ControlBar( void )
 		deleteInstance(m_commandButtons);
 		m_commandButtons = button;
 
-	}  // end while
+	}
 	if(m_buildToolTipLayout)
 	{
 		m_buildToolTipLayout->destroyWindows();
@@ -1016,9 +1011,12 @@ ControlBar::~ControlBar( void )
 	m_radarAttackGlowWindow = NULL;
 
 	if (m_rightHUDCameoWindow && m_rightHUDCameoWindow->winGetUserData())
+	{
 		delete m_rightHUDCameoWindow->winGetUserData();
+		m_rightHUDCameoWindow->winSetUserData(NULL);
+	}
 
-}  // end ~ControlBar
+}
 void ControlBarPopupDescriptionUpdateFunc( WindowLayout *layout, void *param );
 
 //-------------------------------------------------------------------------------------------------
@@ -1029,11 +1027,11 @@ void ControlBar::init( void )
 	INI ini;
 	m_sideSelectAnimateDown = FALSE;
 	// load the command buttons
-	ini.load( AsciiString( "Data\\INI\\Default\\CommandButton.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\CommandButton.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\CommandButton", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\CommandButton", INI_LOAD_OVERWRITE, NULL );
 
 	// load the command sets
-	ini.load( AsciiString( "Data\\INI\\CommandSet.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\CommandSet", INI_LOAD_OVERWRITE, NULL );
 
 	// post process step after loading the command buttons and command sets
 	postProcessCommands();
@@ -1048,14 +1046,14 @@ void ControlBar::init( void )
 	{
 		//
 		// the control bar has several windows that make up our context sensitive interface, we
-		// want those parent windows so that we can easily hide and show them to make the 
+		// want those parent windows so that we can easily hide and show them to make the
 		// interface context sensitive
 		//
 		NameKeyType id;
 		id = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ControlBarParent" );
 		m_contextParent[ CP_MASTER ] = TheWindowManager->winGetWindowFromId( NULL, id );
 	m_contextParent[ CP_MASTER ]->winGetPosition(&m_defaultControlBarPosition.x, &m_defaultControlBarPosition.y);
-		
+
 		m_scienceLayout = TheWindowManager->winCreateLayout("GeneralsExpPoints.wnd");
 		m_scienceLayout->hide(TRUE);
 		id = TheNameKeyGenerator->nameToKey( "GeneralsExpPoints.wnd:GenExpParent" );
@@ -1090,10 +1088,10 @@ void ControlBar::init( void )
 		AsciiString windowName;
 		for( i = 0; i < MAX_COMMANDS_PER_SET; i++ )
 		{
-		
+
 			windowName.format( "ControlBar.wnd:ButtonCommand%02d", i + 1 );
 			id = TheNameKeyGenerator->nameToKey( windowName.str() );
-			m_commandWindows[ i ] = 
+			m_commandWindows[ i ] =
 				TheWindowManager->winGetWindowFromId( m_contextParent[ CP_COMMAND ], id );
 			if (m_commandWindows[ i ])
 			{
@@ -1105,57 +1103,57 @@ void ControlBar::init( void )
 	// removed from multiplayer branch
 //			windowName.format( "ControlBar.wnd:CommandMarker%02d", i + 1 );
 //			id = TheNameKeyGenerator->nameToKey( windowName.str() );
-//			m_commandMarkers[ i ] = 
+//			m_commandMarkers[ i ] =
 //				TheWindowManager->winGetWindowFromId( m_contextParent[ CP_COMMAND ], id );
 //			// set the size and position to make sure their in the same place as the buttons.
 //			m_commandMarkers[i]->winSetPosition(commandPos.x -2, commandPos.y - 2);
 //			m_commandMarkers[i]->winSetSize(commandSize.x + 2, commandSize.y + 2);
-			
 
 
-		}  // end for i
+
+		}
 
 
 		for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_1; i++ )
 		{
 			windowName.format( "GeneralsExpPoints.wnd:ButtonRank1Number%d", i );
 			id = TheNameKeyGenerator->nameToKey( windowName.str() );
-			m_sciencePurchaseWindowsRank1[ i ] = 
+			m_sciencePurchaseWindowsRank1[ i ] =
 				TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], id );
 			m_sciencePurchaseWindowsRank1[ i ]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
-		}  // end for i
+		}
 		for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_3; i++ )
 		{
 			windowName.format( "GeneralsExpPoints.wnd:ButtonRank3Number%d", i );
 			id = TheNameKeyGenerator->nameToKey( windowName.str() );
-			m_sciencePurchaseWindowsRank3[ i ] = 
+			m_sciencePurchaseWindowsRank3[ i ] =
 				TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], id );
 			m_sciencePurchaseWindowsRank3[ i ]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
-		}  // end for i
-		
-		for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_8; i++ ) 
+		}
+
+		for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_8; i++ )
 		{
 			windowName.format( "GeneralsExpPoints.wnd:ButtonRank8Number%d", i );
 			id = TheNameKeyGenerator->nameToKey( windowName.str() );
-			m_sciencePurchaseWindowsRank8[ i ] = 
+			m_sciencePurchaseWindowsRank8[ i ] =
 				TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], id );
 			m_sciencePurchaseWindowsRank8[ i ]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
-		}  // end for i
+		}
 
 		// keep a pointer to the window making up the right HUD display
 		id = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:RightHUD" );
 		m_rightHUDWindow = TheWindowManager->winGetWindowFromId( NULL, id );
-	
+
 		id = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:WinUnitSelected" );
 		m_rightHUDUnitSelectParent = TheWindowManager->winGetWindowFromId( NULL, id );
-		
+
 		id = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:CameoWindow" );
 		m_rightHUDCameoWindow = TheWindowManager->winGetWindowFromId( NULL, id );
 		for( i = 0; i < MAX_RIGHT_HUD_UPGRADE_CAMEOS; i++ )
 		{
 			windowName.format( "ControlBar.wnd:UnitUpgrade%d", i+1 );
 			id = TheNameKeyGenerator->nameToKey( windowName.str() );
-			m_rightHUDUpgradeCameos[ i ] = 
+			m_rightHUDUpgradeCameos[ i ] =
 				TheWindowManager->winGetWindowFromId( m_rightHUDWindow, id );
 			m_rightHUDUpgradeCameos[ i ]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
 		}
@@ -1200,7 +1198,7 @@ void ControlBar::init( void )
 			setControlCommand(win, findCommandButton("NonCommand_UpDown") );
 			win->winSetTooltipFunc(commandButtonTooltip);
 		}
-		
+
 		win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey("ControlBar.wnd:PowerWindow"));
 		if(win)
 		{
@@ -1220,9 +1218,9 @@ void ControlBar::init( void )
 		m_radarAttackGlowWindow = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:WinUAttack"));
 
 
-		win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ));
+		win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ));
 		win->winGetScreenPosition(&m_controlBarForegroundMarkerPos.x, &m_controlBarForegroundMarkerPos.y);
-		win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ));
+		win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ));
 		win->winGetScreenPosition(&m_controlBarBackgroundMarkerPos.x,&m_controlBarBackgroundMarkerPos.y);
 
 		if(!m_videoManager)
@@ -1239,7 +1237,7 @@ void ControlBar::init( void )
 			m_buildToolTipLayout->hide(TRUE);
 			m_buildToolTipLayout->setUpdate(ControlBarPopupDescriptionUpdateFunc);
 		}
-			
+
 		m_genStarOn = TheMappedImageCollection ? (Image *)TheMappedImageCollection->findImageByName("BarButtonGenStarON") : NULL;
 		m_genStarOff = TheMappedImageCollection ? (Image *)TheMappedImageCollection->findImageByName("BarButtonGenStarOFF") : NULL;
 		m_genStarFlash = TRUE;
@@ -1253,7 +1251,7 @@ void ControlBar::init( void )
 //		if(!m_controlBarResizer)
 //			m_controlBarResizer = NEW ControlBarResizer;
 //		m_controlBarResizer->init();
-		
+
 
 
 		// Initialize the Observer controls
@@ -1263,7 +1261,7 @@ void ControlBar::init( void )
 		switchToContext( CB_CONTEXT_NONE, NULL );
 	}
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the context sensitive control bar GUI */
@@ -1283,7 +1281,8 @@ void ControlBar::reset( void )
 
 	m_isObserverCommandBar = FALSE; // reset us to use a normal command bar
 	m_observerLookAtPlayer = NULL;
-	
+	m_observedPlayer = NULL;
+
 	if(m_buildToolTipLayout)
 		m_buildToolTipLayout->hide(TRUE);
 	m_showBuildToolTipLayout = FALSE;
@@ -1300,14 +1299,14 @@ void ControlBar::reset( void )
 
 	if(m_videoManager)
 		m_videoManager->reset();
-	
+
 	// go back to default context
 	switchToContext( CB_CONTEXT_NONE, NULL );
 	m_sideSelectAnimateDown = FALSE;
 	if(m_animateDownWindow)
 	{
 		TheWindowManager->winDestroy( m_animateDownWindow );
-		m_animateDownWindow = NULL;		
+		m_animateDownWindow = NULL;
 	}
 
 	// Remove any overridden sets.
@@ -1351,7 +1350,7 @@ void ControlBar::reset( void )
 
 	m_lastFlashedAtPointValue = -1;
 	m_genStarFlash = TRUE;
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update phase, we can track if our selected object is destroyed, update button
@@ -1377,7 +1376,7 @@ void ControlBar::update( void )
 		{
 			if (m_animateWindowManager->isFinished() && m_animateWindowManager->isReversed())
 			{
-				Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
+				Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent");
 				GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
 				if (window && !window->winIsHidden())
 					window->winHide(TRUE);
@@ -1416,29 +1415,32 @@ void ControlBar::update( void )
 			populateObserverInfoWindow();
 
 		Drawable *drawToEvaluateFor = NULL;
-		Bool multiSelect = FALSE;
 		if( TheInGameUI->getSelectCount() > 1 )
 		{
 			// Attempt to isolate a Drawable here to evaluate
 			// The need arises when selected is an AngryMob,
 			// whose selection actually consists of varied units
 			// but is represented in the UI as a single unit,
-			// so we must isolate and evaluate only the Nexus 
+			// so we must isolate and evaluate only the Nexus
 			drawToEvaluateFor = TheGameClient->findDrawableByID( TheInGameUI->getSoloNexusSelectedDrawableID() ) ;
-			multiSelect = ( drawToEvaluateFor == NULL );
-
-		}  
+		}
 		else // get the first and only drawble in the selection list
 			// TheSuperHackers @fix Mauller 07/04/2025 The first access to this can return an empty list
 			if (!TheInGameUI->getAllSelectedDrawables()->empty()) {
 				drawToEvaluateFor = TheInGameUI->getAllSelectedDrawables()->front();
-				Object *obj = drawToEvaluateFor ? drawToEvaluateFor->getObject() : NULL;
-				setPortraitByObject( obj );
 			}
-		
+
+		Object* obj = drawToEvaluateFor ? drawToEvaluateFor->getObject() : NULL;
+		setPortraitByObject(obj);
+
+		const Coord3D* exitPosition = NULL;
+		if (obj && obj->getControllingPlayer() == getCurrentlyViewedPlayer() && obj->getObjectExitInterface())
+			exitPosition = obj->getObjectExitInterface()->getRallyPoint();
+
+		showRallyPoint(exitPosition);
 		return;
 	}
-		
+
 
 	// check flashing
 	if( m_flash )
@@ -1473,7 +1475,7 @@ void ControlBar::update( void )
 			}
 		}
 	}
-	
+
 	if(!m_contextParent[ CP_PURCHASE_SCIENCE ]->winIsHidden())
 		updateContextPurchaseScience();
 
@@ -1486,7 +1488,7 @@ void ControlBar::update( void )
 		evaluateContextUI();
 		populateSpecialPowerShortcut(ThePlayerList->getLocalPlayer());
 		// if we have a build tooltip layout, update it with the new data.
-		repopulateBuildTooltipLayout(); 
+		repopulateBuildTooltipLayout();
 	}
 
 	// enable/disable the beacon button depending on if the max has been reached
@@ -1520,7 +1522,7 @@ void ControlBar::update( void )
 		updateContextMultiSelect();
 		return;
 
-	}  // end if
+	}
 
 	// if nothing is selected get out of here except if we're in the Purchase science context... that requires
 	// us to not have anything selected
@@ -1528,12 +1530,12 @@ void ControlBar::update( void )
 	{
 
 		// we better be in the default none context
-		DEBUG_ASSERTCRASH( m_currContext == CB_CONTEXT_NONE, ("ControlBar::update no selection, but not we're not showing the default NONE context\n") );
+		DEBUG_ASSERTCRASH( m_currContext == CB_CONTEXT_NONE, ("ControlBar::update no selection, but not we're not showing the default NONE context") );
 		return;
 
-	}  // end if
-	
-	
+	}
+
+
 
 	// if our selected drawable has no object get out of here
 	Object *obj = NULL;
@@ -1545,13 +1547,13 @@ void ControlBar::update( void )
 		switchToContext( CB_CONTEXT_NONE, NULL );
 		return;
 
-	}  // end if
+	}
 
 	switch( m_currContext )
 	{
 
 		//---------------------------------------------------------------------------------------------
-		case CB_CONTEXT_NONE:  
+		case CB_CONTEXT_NONE:
 			break;
 
 		//---------------------------------------------------------------------------------------------
@@ -1579,11 +1581,11 @@ void ControlBar::update( void )
 			updateContextOCLTimer();
 			break;
 
-	}  // end switch
+	}
 
 
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1597,7 +1599,7 @@ void ControlBar::onDrawableSelected( Drawable *draw )
 	TheInGameUI->setGUICommand( NULL );
 
 
-}  // end onDrawableSelected
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1620,7 +1622,7 @@ void ControlBar::onDrawableDeselected( Drawable *draw )
 	//
 	TheInGameUI->placeBuildAvailable( NULL, NULL );
 
-}  // end onDrawableDeselected
+}
 
 //-------------------------------------------------------------------------------------------------
 
@@ -1630,7 +1632,7 @@ const Image *ControlBar::getStarImage(void )
 		m_genStarFlash = FALSE;
 	else
 		m_lastFlashedAtPointValue = ThePlayerList->getLocalPlayer()->getSciencePurchasePoints();
-	
+
 	GameWindow *win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonGeneral" ) );
 	if(!win)
 		return NULL;
@@ -1688,7 +1690,7 @@ void ControlBar::onPlayerSciencePurchasePointsChanged(const Player *p)
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Given the drawables that we have selected into our context sensitive UI, evaluate 
+/** Given the drawables that we have selected into our context sensitive UI, evaluate
 	* and perform all UI manipulations to make the GUI show to the user what we want them
 	* to see */
 //-------------------------------------------------------------------------------------------------
@@ -1700,7 +1702,7 @@ void ControlBar::evaluateContextUI( void )
 	// information to the player
 	//
 	m_UIDirty = FALSE;
-	
+
 	// if our purchase science window is up, we will want to update it by repopulating it.
 	if(!m_contextParent[ CP_PURCHASE_SCIENCE ]->winIsHidden())
 		showPurchaseScience();
@@ -1728,7 +1730,7 @@ void ControlBar::evaluateContextUI( void )
 		//Also make sure the unit isn't a garrisonable neutral civ team building!
 		Drawable *draw = selectedDrawables->front();
 
-		//sanity 
+		//sanity
 		if( !draw )
 		{
 			return;
@@ -1738,7 +1740,7 @@ void ControlBar::evaluateContextUI( void )
 		{
 			return;
 		}
-		
+
 		if (obj->getControllingPlayer()
 			&& obj->getControllingPlayer()->getPlayerTemplate()
 			&& obj->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate().compare(obj->getTemplate()->getName()) == 0
@@ -1800,20 +1802,20 @@ void ControlBar::evaluateContextUI( void )
 		// The need arises when selected is an AngryMob,
 		// whose selection actually consists of varied units
 		// but is represented in the UI as a single unit,
-		// so we must isolate and evaluate only the Nexus 
+		// so we must isolate and evaluate only the Nexus
 		drawToEvaluateFor = TheGameClient->findDrawableByID( TheInGameUI->getSoloNexusSelectedDrawableID() ) ;
 		multiSelect = ( drawToEvaluateFor == NULL );
 
-	}  
+	}
 	else // get the first and only drawble in the selection list
 		drawToEvaluateFor = selectedDrawables->front();
-	
+
 
 
 	if( multiSelect )
 	{
 		switchToContext( CB_CONTEXT_MULTI_SELECT, NULL );
-	}  
+	}
 	else if ( drawToEvaluateFor )// either we have exactly one drawable, or we have isolated one to evaluate for...
 	{
 
@@ -1835,7 +1837,7 @@ void ControlBar::evaluateContextUI( void )
 
 		static const NameKeyType key_OCLUpdate = NAMEKEY( "OCLUpdate" );
 		OCLUpdate *update = (OCLUpdate*)obj->findUpdateModule( key_OCLUpdate );
-	
+
 		//
 		// a command center is context sensitive itself, if a side has *NOT* been chosen we display
 		// the side select interface for command centers only, but note how under construction is
@@ -1848,7 +1850,7 @@ void ControlBar::evaluateContextUI( void )
 			switchToContext( CB_CONTEXT_UNDER_CONSTRUCTION, drawToEvaluateFor );
 			contextSelected = TRUE;
 
-		}  // end else if
+		}
 
 		// check for a regular switch to the appropriate context
 		if( contextSelected == FALSE )
@@ -1870,7 +1872,7 @@ void ControlBar::evaluateContextUI( void )
 				if( obj->isLocallyControlled() == TRUE || relationship == NEUTRAL )
 					switchToContext( CB_CONTEXT_STRUCTURE_INVENTORY, drawToEvaluateFor );
 
-			}  // end else if
+			}
 			else if( update )
 			{
 				switchToContext( CB_CONTEXT_OCL_TIMER, drawToEvaluateFor );
@@ -1880,32 +1882,32 @@ void ControlBar::evaluateContextUI( void )
 
 				switchToContext( CB_CONTEXT_COMMAND, drawToEvaluateFor );
 
-			}  // end else if
+			}
 			else if (obj->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate().compare(obj->getTemplate()->getName()) == 0)
 			{
 				switchToContext( CB_CONTEXT_BEACON, drawToEvaluateFor );
 			}
-			else 
+			else
 				switchToContext( CB_CONTEXT_NONE, drawToEvaluateFor );
-		}  // end else
+		}
 
-	}  // end else	
+	}
 
-}  // end evaluateContextUI
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Find a command button of the given name if present */
 //-------------------------------------------------------------------------------------------------
 CommandButton *ControlBar::findNonConstCommandButton( const AsciiString& name )
 {
-	
+
 	for( const CommandButton *command = m_commandButtons; command; command = command->getNext() )
 		if( command->getName() == name )
 			return const_cast<CommandButton*>((const CommandButton*)command->getFinalOverride());
 
 	return NULL;  // not found
 
-}  // end findCommandButton
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Allocate a new command button, assign name, and tie to list */
@@ -1926,7 +1928,7 @@ CommandButton *ControlBar::newCommandButton( const AsciiString& name )
 	// return the new button
 	return newButton;
 
-}  // end newCommandButton
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1959,7 +1961,7 @@ CommandButton *ControlBar::newCommandButtonOverride( CommandButton *buttonToOver
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
 	commandSet = TheControlBar->findNonConstCommandSet( name );
@@ -1971,7 +1973,7 @@ CommandButton *ControlBar::newCommandButtonOverride( CommandButton *buttonToOver
 		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES) {
 			commandSet->markAsOverride();
 		}
-	}  // end if
+	}
 	else if( ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES )
 	{
 		//Holy crap, this sucks to debug!!!
@@ -1989,12 +1991,12 @@ CommandButton *ControlBar::newCommandButtonOverride( CommandButton *buttonToOver
 	}
 
 	// sanity
-	DEBUG_ASSERTCRASH( commandSet, ("parseCommandSetDefinition: Unable to allocate set '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( commandSet, ("parseCommandSetDefinition: Unable to allocate set '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( commandSet, commandSet->friend_getFieldParse() );
 
-}  // end parseCommandSetDefinition
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Find existing command set by name */
@@ -2013,25 +2015,25 @@ CommandSet* ControlBar::findNonConstCommandSet( const AsciiString& name )
 //-------------------------------------------------------------------------------------------------
 /** find existing command button if present	*/
 //-------------------------------------------------------------------------------------------------
-const CommandButton *ControlBar::findCommandButton( const AsciiString& name ) 
-{ 
-	CommandButton *btn =  findNonConstCommandButton(name); 
+const CommandButton *ControlBar::findCommandButton( const AsciiString& name )
+{
+	CommandButton *btn =  findNonConstCommandButton(name);
 	if( btn )
 	{
 		btn = (CommandButton *)btn->friend_getFinalOverride();
 	}
-	return btn; 
+	return btn;
 }
 
 //-------------------------------------------------------------------------------------------------
 /** Find existing command set by name */
 //-------------------------------------------------------------------------------------------------
-const CommandSet *ControlBar::findCommandSet( const AsciiString& name ) 
-{ 
-	CommandSet *set = findNonConstCommandSet(name); 
+const CommandSet *ControlBar::findCommandSet( const AsciiString& name )
+{
+	CommandSet *set = findNonConstCommandSet(name);
 	if (set)
 		set = (CommandSet*)set->friend_getFinalOverride();
-	return set; 
+	return set;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2046,7 +2048,7 @@ CommandSet *ControlBar::newCommandSet( const AsciiString& name )
 	// return the newly created set
 	return set;
 
-}  // end newCommandSet
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create an overridden command set. */
@@ -2074,26 +2076,26 @@ CommandSet *ControlBar::newCommandSetOverride( CommandSet *setToOverride )
 //-------------------------------------------------------------------------------------------------
 /** Process a button click for the context sensitive GUI */
 //-------------------------------------------------------------------------------------------------
-CBCommandStatus ControlBar::processContextSensitiveButtonClick( GameWindow *button, 
+CBCommandStatus ControlBar::processContextSensitiveButtonClick( GameWindow *button,
 																																GadgetGameMessage gadgetMessage )
 {
 
 	// call command processing method
 	return processCommandUI( button, gadgetMessage );
 
-}  // end processContextSensitiveButtonClick
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Process a button click for the context sensitive GUI */
 //-------------------------------------------------------------------------------------------------
-CBCommandStatus ControlBar::processContextSensitiveButtonTransition( GameWindow *button, 
+CBCommandStatus ControlBar::processContextSensitiveButtonTransition( GameWindow *button,
 																																GadgetGameMessage gadgetMessage )
 {
 
 	// call command processing method
 	return processCommandTransitionUI( button, gadgetMessage );
 
-}  // end processContextSensitiveButtonClick
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -2146,7 +2148,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 			for( int i = 0; i < MAX_COMMANDS_PER_SET; i++ )
 			{
 				// the implementation won't necessarily use the max number of windows possible
-				if (m_commandWindows[ i ]) 
+				if (m_commandWindows[ i ])
 				{
 					m_commandWindows[ i ]->winClearStatus( WIN_STATUS_FLASHING );
 				}
@@ -2174,10 +2176,10 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 
 			// do not show any rally point marker
 			showRallyPoint( NULL );
-			
+
 			break;
 
-		}  // end none
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case CB_CONTEXT_COMMAND:
@@ -2192,7 +2194,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 			m_contextParent[ CP_OCL_TIMER ]->winHide( TRUE );
 			m_contextParent[ CP_OBSERVER_INFO ]->winHide( TRUE );
 			m_contextParent[ CP_OBSERVER_LIST ]->winHide( TRUE );
-			
+
 			// fill the specific UI info
 			populateCommand( draw->getObject() );
 
@@ -2210,17 +2212,17 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 					m_contextParent[ CP_BUILD_QUEUE ]->winHide( FALSE );
 					populateBuildQueue( obj );
 					setPortraitByObject( NULL );
-				}  // end if
-				else 
+				}
+				else
 				{
 					setPortraitByObject( obj );
 				}
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end command
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case CB_CONTEXT_STRUCTURE_INVENTORY:
@@ -2241,7 +2243,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 
 			break;
 
-		}  // end inventory
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case CB_CONTEXT_BEACON:
@@ -2257,13 +2259,13 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 			m_contextParent[ CP_OBSERVER_INFO ]->winHide( TRUE );
 			m_contextParent[ CP_OBSERVER_LIST ]->winHide( TRUE );
 
-			
-			// fill the specific UI info			
+
+			// fill the specific UI info
 			populateBeacon( draw->getObject() );
 
 			break;
 
-		}  // end beacon
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case CB_CONTEXT_UNDER_CONSTRUCTION:
@@ -2284,7 +2286,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 
 			break;
 
-		}  // end under construction
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case CB_CONTEXT_OCL_TIMER:
@@ -2305,7 +2307,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 
 			break;
 
-		}  // end under construction
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case CB_CONTEXT_MULTI_SELECT:
@@ -2327,7 +2329,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 
 			break;
 
-		}  // end multi select
+		}
 		case CB_CONTEXT_OBSERVER_LIST:
 		{
 
@@ -2346,23 +2348,23 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 			populateObserverList();
 			break;
 
-		}  // end multi select
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 		{
 
-			DEBUG_ASSERTCRASH( 0, ("ControlBar::switchToContext, unknown context '%d'\n", context) );
+			DEBUG_ASSERTCRASH( 0, ("ControlBar::switchToContext, unknown context '%d'", context) );
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch
+	}
 
 	// save our context
 	m_currContext = context;
 
-}  // end switchToContext
+}
 
 void ControlBar::setCommandBarBorder( GameWindow *button, CommandButtonMappedBorderType type)
 {
@@ -2413,19 +2415,19 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com
 	if( button->winGetInputFunc() != GadgetPushButtonInput )
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("setControlCommand: Window is not a button\n") );
+		DEBUG_ASSERTCRASH( 0, ("setControlCommand: Window is not a button") );
 		return;
 
-	}  // end if
+	}
 
 	// sanity
 	if( commandButton == NULL )
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("setControlCommand: NULL commandButton passed in\n") );
+		DEBUG_ASSERTCRASH( 0, ("setControlCommand: NULL commandButton passed in") );
 		return;
 
-	}  // end if
+	}
 
 	//
 	// set the button gadget control to be a normal button or a check like button if
@@ -2443,7 +2445,7 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com
 	// hilite pushed image to be the enabled pushed image ... and we will also replicate
 	// the disabled image to be the disabled pushed image.  For complete control over all
 	// the states of these buttons we would add additional lines to the INI for a command
-	// button and store those additional images in the command button 
+	// button and store those additional images in the command button
 	//
 	if( commandButton->getButtonImage() )
 		GadgetButtonSetEnabledImage( button, commandButton->getButtonImage() );
@@ -2462,19 +2464,19 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com
 	//}  // end if
 
 	// set the text
-	if( commandButton->getTextLabel().isEmpty() == FALSE || !commandButton->getScienceVec().empty()) 
+	if( commandButton->getTextLabel().isEmpty() == FALSE || !commandButton->getScienceVec().empty())
 	{
 		button->winSetTooltipFunc(commandButtonTooltip);
 	}
 	else
-		GadgetButtonSetText( button, UnicodeString( L"" ) );
+		GadgetButtonSetText( button, L"" );
 
 	// save the command in the user data of the window
 	GadgetButtonSetData(button, (void*)commandButton);
 	//button->winSetUserData( commandButton );
-	
+
 	setCommandBarBorder(button, commandButton->getCommandButtonMappedBorderType());
-	
+
 	if (TheHotKeyManager)
 	{
 		AsciiString hotKey =	TheHotKeyManager->searchHotKey(commandButton->getTextLabel());
@@ -2483,7 +2485,7 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com
 	}
 	GadgetButtonSetAltSound(button, "GUICommandBarClick");
 
-}  // end setControlCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 void CommandButton::cacheButtonImage()
@@ -2504,7 +2506,7 @@ void CommandButton::cacheButtonImage()
 //-------------------------------------------------------------------------------------------------
 void ControlBar::postProcessCommands( void )
 {
-	for ( CommandButton *button = m_commandButtons; button; button = button->friend_getNext() ) 
+	for ( CommandButton *button = m_commandButtons; button; button = button->friend_getNext() )
 	{
 		button->cacheButtonImage();
 	}
@@ -2524,15 +2526,15 @@ void ControlBar::setControlCommand( const AsciiString& buttonWindowName, GameWin
 	if( win == NULL )
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("setControlCommand: Unable to find window '%s'\n", buttonWindowName.str()) );
+		DEBUG_ASSERTCRASH( 0, ("setControlCommand: Unable to find window '%s'", buttonWindowName.str()) );
 		return;
 
-	}  // end if
+	}
 
 	// call the workhorse
 	setControlCommand( win, commandButton );
 
-}  // end setControlCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 /** show/hide the portrait window image */
@@ -2550,7 +2552,7 @@ void ControlBar::setPortraitByImage( const Image *image )
 		for(Int i = 0; i < MAX_UPGRADE_CAMEO_UPGRADES; ++i)
 			m_rightHUDUpgradeCameos[i]->winHide(TRUE);
 
-	}  // end if
+	}
 	else
 	{
 		m_rightHUDWindow->winSetStatus( WIN_STATUS_IMAGE );
@@ -2563,7 +2565,7 @@ void ControlBar::setPortraitByImage( const Image *image )
 
 	}
 
-}  // end setPortraitByImage
+}
 
 //-------------------------------------------------------------------------------------------------
 /** show/hide the portrait image by object.  We like to use this method as opposed to the
@@ -2584,7 +2586,7 @@ void ControlBar::setPortraitByObject( Object *obj )
 
 		const ThingTemplate *thing = obj->getTemplate();
 		Player *player = obj->getControllingPlayer();
-		
+
 		//If we have an enemy stealth disguised unit, swap portraits!
 		Drawable *draw = obj->getDrawable();
 		if( draw && draw->getStealthLook() == STEALTHLOOK_DISGUISED_ENEMY )
@@ -2603,7 +2605,7 @@ void ControlBar::setPortraitByObject( Object *obj )
 				player = ThePlayerList->getNthPlayer( stealth->getDisguisedPlayerIndex() );
 			}
 		}
-		
+
 		const Image* portrait = thing->getSelectedPortraitImage();
 
 		m_rightHUDUnitSelectParent->winHide(FALSE);
@@ -2651,9 +2653,9 @@ void ControlBar::setPortraitByObject( Object *obj )
 				m_rightHUDUpgradeCameos[i]->winEnable( FALSE );
 			}
 		}
-	
 
-	}  // end if
+
+	}
 	else
 	{
 		m_rightHUDUnitSelectParent->winHide(TRUE);
@@ -2666,64 +2668,59 @@ void ControlBar::setPortraitByObject( Object *obj )
 		GadgetButtonDrawOverlayImage( m_rightHUDCameoWindow, NULL );
 	}
 
-}  // end setPortraitByObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Show a rally point marker at the world location specified.  If no location is specified
 	* any marker that we might have visible is hidden */
 // ------------------------------------------------------------------------------------------------
-void ControlBar::showRallyPoint( const Coord3D *loc )
+void ControlBar::showRallyPoint(const Coord3D* loc)
 {
-
 	// if loc is NULL, destroy any rally point drawble we have shown
-	if( loc == NULL )
+	if (loc == NULL)
 	{
-
 		// destroy rally point drawable if present
-		if( m_rallyPointDrawableID != INVALID_DRAWABLE_ID )
-			TheGameClient->destroyDrawable( TheGameClient->findDrawableByID( m_rallyPointDrawableID ) );
+		if (m_rallyPointDrawableID != INVALID_DRAWABLE_ID)
+			TheGameClient->destroyDrawable(TheGameClient->findDrawableByID(m_rallyPointDrawableID));
+
 		m_rallyPointDrawableID = INVALID_DRAWABLE_ID;
+		return;
+	}
 
-	}  // end if
-	else
-	{
-		Drawable *marker = NULL;
+	Drawable* marker = NULL;
 
-		// create a rally point drawble if necessary
-		if( m_rallyPointDrawableID == INVALID_DRAWABLE_ID )
+	// create a rally point drawble if necessary
+	if (m_rallyPointDrawableID == INVALID_DRAWABLE_ID)
+	{
+		const ThingTemplate* ttn = TheThingFactory->findTemplate("RallyPointMarker");
+		marker = TheThingFactory->newDrawable(ttn);
+		DEBUG_ASSERTCRASH(marker, ("showRallyPoint: Unable to create rally point drawable"));
+		if (marker)
 		{
+			marker->setDrawableStatus(DRAWABLE_STATUS_NO_SAVE);
+			m_rallyPointDrawableID = marker->getID();
+		}
+	}
+	else
+		marker = TheGameClient->findDrawableByID(m_rallyPointDrawableID);
 
-			const ThingTemplate* ttn = TheThingFactory->findTemplate("RallyPointMarker");
-			marker = TheThingFactory->newDrawable( ttn );
-			DEBUG_ASSERTCRASH( marker, ("showRallyPoint: Unable to create rally point drawable\n") );
-			if (marker)
-			{
-				marker->setDrawableStatus(DRAWABLE_STATUS_NO_SAVE);
-				m_rallyPointDrawableID = marker->getID();
-			}
-
-		}  // end if
-		else
-			marker = TheGameClient->findDrawableByID( m_rallyPointDrawableID );
-
-		// sanity
-		DEBUG_ASSERTCRASH( marker, ("showRallyPoint: No rally point marker found\n" ) );
-
-		// set the position of the rally point drawble to the position passed in
-		marker->setPosition( loc );
-		marker->setOrientation( TheGlobalData->m_downwindAngle );//To blow down wind -- ML
+	// sanity
+	DEBUG_ASSERTCRASH(marker, ("showRallyPoint: No rally point marker found"));
 
-		// set the marker colors to that of the local player
-		Player *player = ThePlayerList->getLocalPlayer();
+	// set the position of the rally point drawble to the position passed in
+	marker->setPosition(loc);
+	marker->setOrientation(TheGlobalData->m_downwindAngle); // To blow down wind -- ML
 
+	// set the marker colors to that of the local player
+	Player* player = getCurrentlyViewedPlayer();
+	if (player)
+	{
 		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
-			marker->setIndicatorColor( player->getPlayerNightColor() );
+			marker->setIndicatorColor(player->getPlayerNightColor());
 		else
-			marker->setIndicatorColor( player->getPlayerColor() );
-
-	}  // end else
-
-}  // end showRallyPoint
+			marker->setIndicatorColor(player->getPlayerColor());
+	}
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Show a rally point marker at the world location specified.  If no location is specified
@@ -2745,7 +2742,7 @@ void ControlBar::setControlBarSchemeByPlayer(Player *p)
 	{
 		m_isObserverCommandBar = TRUE;
 		switchToContext( CB_CONTEXT_OBSERVER_LIST, NULL );
-		DEBUG_LOG(("We're loading the Observer Command Bar\n"));
+		DEBUG_LOG(("We're loading the Observer Command Bar"));
 
 		if (buttonPlaceBeacon)
 			buttonPlaceBeacon->winHide(TRUE);
@@ -2790,7 +2787,7 @@ void ControlBar::setControlBarSchemeByPlayerTemplate( const PlayerTemplate *pt)
 	{
 		m_isObserverCommandBar = TRUE;
 		switchToContext( CB_CONTEXT_OBSERVER_LIST, NULL );
-		DEBUG_LOG(("We're loading the Observer Command Bar\n"));
+		DEBUG_LOG(("We're loading the Observer Command Bar"));
 
 		if (buttonPlaceBeacon)
 			buttonPlaceBeacon->winHide(TRUE);
@@ -2851,15 +2848,15 @@ void ControlBar::updateBuildQueueDisabledImages( const Image *image )
 
 		for( i = 0; i < MAX_BUILD_QUEUE_BUTTONS; i++ )
 		{
-			
+
 			buttonName.format( "ControlBar.wnd:ButtonQueue%02d", i + 1 );
 			buildQueueIDs[ i ] = TheNameKeyGenerator->nameToKey( buttonName );
 
-		}  // end for i
+		}
 
 		idsInitialized = TRUE;
 
-	}  // end if
+	}
 
 	// get window pointers to all the buttons for the build queue
 	for( i = 0; i < MAX_BUILD_QUEUE_BUTTONS; i++ )
@@ -2871,7 +2868,7 @@ void ControlBar::updateBuildQueueDisabledImages( const Image *image )
 
 		GadgetButtonSetDisabledImage( m_queueData[ i ].control, image );
 
-	}  // end for i
+	}
 
 }
 
@@ -2923,7 +2920,7 @@ void ControlBar::updatePurchaseScience( void )
 
 void ControlBar::showPurchaseScience( void )
 {
-	
+
 	if(TheScriptEngine->isGameEnding())
 		return;
 	populatePurchaseScience(ThePlayerList->getLocalPlayer());
@@ -2984,8 +2981,6 @@ void ControlBar::switchControlBarStage( ControlBarStages stage )
 {
 	if(stage < CONTROL_BAR_STAGE_DEFAULT || stage >= MAX_CONTROL_BAR_STAGES)
 		return;
-	if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK)
-		return;
 	switch (stage) {
 	case CONTROL_BAR_STAGE_DEFAULT:
 		setDefaultControlBarConfig();
@@ -3002,7 +2997,7 @@ void ControlBar::switchControlBarStage( ControlBarStages stage )
 	default:
 		DEBUG_ASSERTCRASH(FALSE,("ControlBar::switchControlBarStage we were passed in a stage that's not supported %d", stage));
 	}
-	
+
 }
 void ControlBar::setDefaultControlBarConfig( void )
 {
@@ -3012,7 +3007,7 @@ void ControlBar::setDefaultControlBarConfig( void )
 //		m_controlBarSchemeManager->setControlBarSchemeByPlayerTemplate(ThePlayerList->getLocalPlayer()->getPlayerTemplate(), FALSE);
 //	}
 	m_currentControlBarStage = CONTROL_BAR_STAGE_DEFAULT;
-	TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f)); 
+	setScaledViewportHeight();
 	m_contextParent[ CP_MASTER ]->winSetPosition(m_defaultControlBarPosition.x, m_defaultControlBarPosition.y);
 	m_contextParent[ CP_MASTER ]->winHide(FALSE);
 	repopulateBuildTooltipLayout();
@@ -3026,10 +3021,10 @@ void ControlBar::setSquishedControlBarConfig( void )
 		return;
 	m_currentControlBarStage = CONTROL_BAR_STAGE_SQUISHED;
 	m_contextParent[ CP_MASTER ]->winSetPosition(m_defaultControlBarPosition.x, m_defaultControlBarPosition.y);
-	
+
 //	m_controlBarResizer->sizeWindowsAlt();
-	repopulateBuildTooltipLayout();	
-	TheTacticalView->setHeight((Int)(TheDisplay->getHeight())); 
+	repopulateBuildTooltipLayout();
+	setFullViewportHeight();
 	m_controlBarSchemeManager->setControlBarSchemeByPlayerTemplate(ThePlayerList->getLocalPlayer()->getPlayerTemplate(), TRUE);
 }
 
@@ -3040,12 +3035,12 @@ void ControlBar::setLowControlBarConfig( void )
 //		m_controlBarResizer->sizeWindowsDefault();
 //		m_controlBarSchemeManager->setControlBarSchemeByPlayerTemplate(ThePlayerList->getLocalPlayer()->getPlayerTemplate(), FALSE);
 //	}
-	
+
 	m_currentControlBarStage = CONTROL_BAR_STAGE_LOW;
 	ICoord2D pos;
 	pos.x = m_defaultControlBarPosition.x;
 	pos.y = TheDisplay->getHeight() - .1 * TheDisplay->getHeight();
-	TheTacticalView->setHeight((Int)(TheDisplay->getHeight())); 
+	setFullViewportHeight();
 	m_contextParent[ CP_MASTER ]->winSetPosition(pos.x, pos.y);
 	m_contextParent[ CP_MASTER ]->winHide(FALSE);
 	setUpDownImages();
@@ -3078,7 +3073,7 @@ void ControlBar::updateCommandMarkerImage( const Image *image )
 	//	{
 	//		m_commandMarkers[i]->winSetEnabledImage(0, image);
 	//	}
-	
+
 }
 void ControlBar::updateSlotExitImage( const Image *image )
 {
@@ -3175,13 +3170,13 @@ void ControlBar::updateRadarAttackGlow ( void )
 		m_radarAttackGlowWindow->winEnable(TRUE);
 		return;
 	}
-	
+
 	if(m_remainingRadarAttackGlowFrames % RADAR_ATTACK_GLOW_NUM_TIMES == 0)
 	{
 		m_radarAttackGlowWindow->winEnable(!BitIsSet(m_radarAttackGlowWindow->winGetStatus(),WIN_STATUS_ENABLED));
 	}
 
-	
+
 }
 void ControlBar::initSpecialPowershortcutBar( Player *player)
 {
@@ -3203,7 +3198,7 @@ void ControlBar::initSpecialPowershortcutBar( Player *player)
 	const PlayerTemplate *pt = player->getPlayerTemplate();
 
 	if(!player || !pt|| !player->isLocalPlayer()
-			|| pt->getSpecialPowerShortcutButtonCount() == 0  
+			|| pt->getSpecialPowerShortcutButtonCount() == 0
 			|| pt->getSpecialPowerShortcutWinName().isEmpty()
 			|| !player->isPlayerActive())
 		return;
@@ -3227,17 +3222,17 @@ void ControlBar::initSpecialPowershortcutBar( Player *player)
 	{
 		windowName.format( tempName, i+1 );
 		id = TheNameKeyGenerator->nameToKey( windowName.str() );
-		m_specialPowerShortcutButtons[ i ] = 
+		m_specialPowerShortcutButtons[ i ] =
 			TheWindowManager->winGetWindowFromId( m_specialPowerShortcutParent, id );
 		m_specialPowerShortcutButtons[ i ]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
 
 		windowName.format( parentName, i+1 );
 		id = TheNameKeyGenerator->nameToKey( windowName.str() );
-		m_specialPowerShortcutButtonParents[ i ] = 
+		m_specialPowerShortcutButtonParents[ i ] =
 			TheWindowManager->winGetWindowFromId( m_specialPowerShortcutParent, id );
-		
 
-	}  // end for i
+
+	}
 
 
 
@@ -3247,7 +3242,7 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 {
 	const CommandSet *commandSet;
 	Int i;
-	if(!player || !player->getPlayerTemplate() 
+	if(!player || !player->getPlayerTemplate()
 			|| !player->isLocalPlayer() || m_currentlyUsedSpecialPowersButtons == 0
 			|| m_specialPowerShortcutButtons == NULL || m_specialPowerShortcutButtonParents == NULL)
 		return;
@@ -3257,13 +3252,13 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 			m_specialPowerShortcutButtons[i]->winHide(TRUE);
 		if (m_specialPowerShortcutButtonParents[i])
 			m_specialPowerShortcutButtonParents[i]->winHide(TRUE);
-		
+
 	}
-	
+
 	// get command set
 	if(player->getPlayerTemplate()->getSpecialPowerShortcutCommandSet().isEmpty() )
 		return;
-	commandSet = TheControlBar->findCommandSet(player->getPlayerTemplate()->getSpecialPowerShortcutCommandSet()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
+	commandSet = findCommandSet(player->getPlayerTemplate()->getSpecialPowerShortcutCommandSet()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
 	if(!commandSet)
 		return;
 	// populate the button with commands defined
@@ -3282,7 +3277,7 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 			// hide window on interface
 			//m_specialPowerShortcutButtons[ i ]->winHide( TRUE );
 
-		}  // end if
+		}
 		else
 		{
 
@@ -3314,7 +3309,7 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 							for( size_t scienceIndex = 0; scienceIndex < commandButton->getScienceVec().size(); ++scienceIndex )
 							{
 								science = commandButton->getScienceVec()[ scienceIndex ];
-								
+
 								//Keep going until we reach the end or don't have the required science!
 								if( player->hasScience( science ) )
 								{
@@ -3348,11 +3343,11 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 									}
 								}
 							}
-						
-						
+
+
 						}
 					}
-				}  // end if			
+				}
 				// make sure the window is not hidden
 				m_specialPowerShortcutButtons[ currentButton ]->winHide( FALSE );
 				m_specialPowerShortcutButtonParents[ currentButton ]->winHide( FALSE );
@@ -3364,10 +3359,10 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 				setControlCommand( m_specialPowerShortcutButtons[ currentButton ], commandButton );
 				GadgetButtonSetAltSound(m_specialPowerShortcutButtons[ currentButton ], "GUIGenShortcutClick");
 				currentButton++;
-						
-			}  // end else
 
-	}  // end for i
+			}
+
+	}
 	if(m_contextParent[ CP_MASTER ] && !m_contextParent[ CP_MASTER ]->winIsHidden() && m_specialPowerShortcutParent->winIsHidden())
 	{
 		showSpecialPowerShortcut();
@@ -3378,11 +3373,11 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 
 void ControlBar::updateSpecialPowerShortcut( void )
 {
-	if(!m_specialPowerShortcutParent || !m_specialPowerShortcutButtons 
+	if(!m_specialPowerShortcutParent || !m_specialPowerShortcutButtons
 	   || !ThePlayerList || !ThePlayerList->getLocalPlayer())
 		return;
-	if(ThePlayerList->getLocalPlayer()->findNaturalCommandCenter() && 
-		 m_specialPowerShortcutParent->winIsHidden() && 
+	if(ThePlayerList->getLocalPlayer()->findNaturalCommandCenter() &&
+		 m_specialPowerShortcutParent->winIsHidden() &&
 		 m_contextParent[ CP_MASTER ] && !m_contextParent[ CP_MASTER ]->winIsHidden())
 	{
 		showSpecialPowerShortcut();
@@ -3390,7 +3385,7 @@ void ControlBar::updateSpecialPowerShortcut( void )
 	}
 	else if( !ThePlayerList->getLocalPlayer()->findNaturalCommandCenter() && !m_specialPowerShortcutParent->winIsHidden() && m_animateWindowManagerForGenShortcuts->isFinished())
 	{
-		animateSpecialPowerShortcut(FALSE);		
+		animateSpecialPowerShortcut(FALSE);
 	}
 
 	if(m_specialPowerShortcutParent->winIsHidden())
@@ -3422,7 +3417,7 @@ void ControlBar::updateSpecialPowerShortcut( void )
 
 		win->winClearStatus( WIN_STATUS_NOT_READY );
 		win->winClearStatus( WIN_STATUS_ALWAYS_COLOR );
-		
+
 
 		// is the command available
 
@@ -3471,7 +3466,7 @@ void ControlBar::animateSpecialPowerShortcut( Bool isOn )
 		return;
 
 	if(isOn)
-	{	
+	{
 		m_animateWindowManagerForGenShortcuts->reset();
 		m_animateWindowManagerForGenShortcuts->registerGameWindow(m_specialPowerShortcutParent,WIN_ANIMATION_SLIDE_RIGHT,TRUE,500,0);
 	}
@@ -3483,7 +3478,7 @@ void ControlBar::animateSpecialPowerShortcut( Bool isOn )
 
 void ControlBar::showSpecialPowerShortcut( void )
 {
-	if(TheScriptEngine->isGameEnding() || !m_specialPowerShortcutParent 
+	if(TheScriptEngine->isGameEnding() || !m_specialPowerShortcutParent
 		||!m_specialPowerShortcutButtons || !ThePlayerList || !ThePlayerList->getLocalPlayer())
 		return;
 	Bool dontAnimate = TRUE;
@@ -3499,14 +3494,24 @@ void ControlBar::showSpecialPowerShortcut( void )
 		return;
 	m_specialPowerShortcutParent->winHide(FALSE);
 	populateSpecialPowerShortcut(ThePlayerList->getLocalPlayer());
-		
+
 }
 
 void ControlBar::hideSpecialPowerShortcut( void )
 {
 	if(!m_specialPowerShortcutParent)
 		return;
-	
+
 	m_specialPowerShortcutParent->winHide(TRUE);
-		
+
+}
+
+void ControlBar::setFullViewportHeight()
+{
+	TheTacticalView->setHeight(TheDisplay->getHeight());
+}
+
+void ControlBar::setScaledViewportHeight()
+{
+	TheTacticalView->setHeight(TheDisplay->getHeight() * TheGlobalData->m_viewportHeightScale);
 }
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
index d1ccff6ff34..cc67872121a 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/NameKeyGenerator.h"
 #include "Common/ThingTemplate.h"
@@ -81,14 +81,14 @@ void ControlBar::populateBeacon( Object *beacon )
 		if (buttonWin)
 			buttonWin->winHide(TRUE);
 	}
-}  // end populateBeacon
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void ControlBar::updateContextBeacon( void )
 {
 
-}  // end updateContextBeacon
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -103,4 +103,4 @@ WindowMsgHandledType BeaconWindowInput( GameWindow *window, UnsignedInt msg,
 
 	return MSG_IGNORED;
 
-}  // end InGameChatInput
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
index 824aaed5e89..a02c6e7dd10 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/NameKeyGenerator.h"
 #include "Common/ThingTemplate.h"
@@ -47,7 +47,6 @@
 #include "GameLogic/Module/TransportContain.h"
 #include "GameLogic/Module/MobNexusContain.h"
 #include "GameLogic/Module/SpecialAbilityUpdate.h"
-#include "GameLogic/Module/BattlePlanUpdate.h"
 #include "GameLogic/Module/VeterancyGainCreate.h"
 #include "GameLogic/Module/HackInternetAIUpdate.h"
 #include "GameLogic/Weapon.h"
@@ -59,11 +58,6 @@
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/GadgetPushButton.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 static GameWindow *commandWindows[ MAX_COMMANDS_PER_SET ];
@@ -98,15 +92,15 @@ void ControlBar::populateInvDataCallback( Object *obj, void *userData )
 	if( data->currIndex > data->maxIndex )
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("There is not enough GUI slots to hold the # of items inside a '%s'\n", 
+		DEBUG_ASSERTCRASH( 0, ("There is not enough GUI slots to hold the # of items inside a '%s'",
 													data->transport->getTemplate()->getName().str()) );
 		return;
 
-	}  // end if
+	}
 
 	// get the window control that we're going to put our smiling faces in
 	GameWindow *control = data->controls[ data->currIndex ];
-	DEBUG_ASSERTCRASH( control, ("populateInvDataCallback: Control not found\n") );
+	DEBUG_ASSERTCRASH( control, ("populateInvDataCallback: Control not found") );
 
 	// assign our control and object id to the transport data
 	m_containData[ data->currIndex ].control = control;
@@ -131,7 +125,7 @@ void ControlBar::populateInvDataCallback( Object *obj, void *userData )
 	// enable the control
 	control->winEnable( TRUE );
 
-}  // end populateInvDataCallback
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Transports have an extra special manipulation of the user interface.  They get to look
@@ -148,14 +142,14 @@ void ControlBar::doTransportInventoryUI( Object *transport, const CommandSet *co
 {
 /// @todo srj -- remove hard-coding here, please
 	//static const CommandButton *exitCommand = findCommandButton( "Command_TransportExit" );
-		
+
 	// sanity
 	if( transport == NULL || commandSet == NULL )
 		return;
 
 	// get the transport contain module
 	ContainModuleInterface *contain = transport->getContain();
-	
+
 	// sanity
 	if( contain == NULL )
 		return;
@@ -208,14 +202,14 @@ void ControlBar::doTransportInventoryUI( Object *transport, const CommandSet *co
 
 			//Clear any potential veterancy rank, or else we'll see it when it's empty!
 			GadgetButtonDrawOverlayImage( m_commandWindows[ i ], NULL );
-			
+
 			//Unmanned vehicles don't have any commands available -- in fact they are hidden!
  			if( transport->isDisabledByType( DISABLED_UNMANNED ) )
  			{
  				m_commandWindows[ i ]->winHide( TRUE );
  			}
 
-      
+
      //  is this where we set the cameos disabled when container is subdued?
 
 			// if we've counted more UI spots than the transport can hold, hide this command window
@@ -228,10 +222,10 @@ void ControlBar::doTransportInventoryUI( Object *transport, const CommandSet *co
 			//
 			setControlCommand( m_commandWindows[ i ], commandButton );
 
-		}  // end if
+		}
+
+	}
 
-	}  // end for i
-	
 	// After Every change to the m_commandWIndows, we need to show fill in the missing blanks with the images
 	// removed from multiplayer branch
 	//showCommandMarkers();
@@ -251,7 +245,7 @@ void ControlBar::doTransportInventoryUI( Object *transport, const CommandSet *co
 		data.transport = transport;
 		contain->iterateContained( populateInvDataCallback, &data, FALSE );
 
-	}  // end if
+	}
 
 	//
 	// save the last recorded inventory count so we know when we have to redo the gui when
@@ -259,7 +253,7 @@ void ControlBar::doTransportInventoryUI( Object *transport, const CommandSet *co
 	//
 	m_lastRecordedInventoryCount = contain->getContainCount();
 
-}  // end doTransportInventoryUI
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -276,7 +270,7 @@ void ControlBar::populateCommand( Object *obj )
 	resetBuildQueueData();
 
 	// get command set
-	commandSet = TheControlBar->findCommandSet( obj->getCommandSetString() );
+	commandSet = findCommandSet( obj->getCommandSetString() );
 
 	// if no command set match is found hide all the buttons
 	if( commandSet == NULL )
@@ -292,7 +286,7 @@ void ControlBar::populateCommand( Object *obj )
 		// nothing left to do
 		return;
 
-	}  // end if
+	}
 
 	// transports do extra special things with the user interface buttons
 	if( obj->getContain()  &&  obj->getContain()->isDisplayedOnControlBar() )
@@ -315,7 +309,7 @@ void ControlBar::populateCommand( Object *obj )
 			// hide window on interface
 			m_commandWindows[ i ]->winHide( TRUE );
 
-		}  // end if
+		}
 		else
 		{
 
@@ -367,7 +361,7 @@ void ControlBar::populateCommand( Object *obj )
 							for( size_t scienceIndex = 0; scienceIndex < commandButton->getScienceVec().size(); ++scienceIndex )
 							{
 								science = commandButton->getScienceVec()[ scienceIndex ];
-								
+
 								//Keep going until we reach the end or don't have the required science!
 								if( player->hasScience( science ) )
 								{
@@ -404,13 +398,13 @@ void ControlBar::populateCommand( Object *obj )
 						}
 					}
 
-				}  // end if			
-						
-			}  // end else
+				}
 
-		}  // end else
+			}
 
-	}  // end for i
+		}
+
+	}
 
 	// After Every change to the m_commandWIndows, we need to show fill in the missing blanks with the images
 	// removed from multiplayer branch
@@ -427,11 +421,11 @@ void ControlBar::populateCommand( Object *obj )
 
 		//
 		// if a rally point is set, show the rally point, if we don't have it set hide any rally
-		// point we might have visible 
+		// point we might have visible
 		//
 		showRallyPoint( exit->getRallyPoint() );
 
-	}  // end if
+	}
 
 	//
 	// to avoid a one frame delay where windows may become enabled/disabled, run the update
@@ -439,7 +433,7 @@ void ControlBar::populateCommand( Object *obj )
 	//
 	updateContextCommand();
 
-}  // end populateCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 /** reset transport data */
@@ -454,9 +448,9 @@ void ControlBar::resetContainData( void )
 		m_containData[ i ].control = NULL;
 		m_containData[ i ].objectID = INVALID_ID;
 
-	}  // end for i
+	}
 
-}  // end resetTransportData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** reset the build queue data we use to die queue entires to control */
@@ -473,9 +467,9 @@ void ControlBar::resetBuildQueueData( void )
 		m_queueData[ i ].productionID = PRODUCTIONID_INVALID;
 		m_queueData[ i ].upgradeToResearch = NULL;
 
-	}  // end for i
+	}
 
-}  // end resetBuildQueue
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -499,15 +493,15 @@ void ControlBar::populateBuildQueue( Object *producer )
 
 		for( i = 0; i < MAX_BUILD_QUEUE_BUTTONS; i++ )
 		{
-			
+
 			buttonName.format( "ControlBar.wnd:ButtonQueue%02d", i + 1 );
 			buildQueueIDs[ i ] = TheNameKeyGenerator->nameToKey( buttonName );
 
-		}  // end for i
+		}
 
 		idsInitialized = TRUE;
 
-	}  // end if
+	}
 
 	// get window pointers to all the buttons for the build queue
 	for( i = 0; i < MAX_BUILD_QUEUE_BUTTONS; i++ )
@@ -525,12 +519,12 @@ void ControlBar::populateBuildQueue( Object *producer )
 		m_queueData[ i ].control->winClearStatus( WIN_STATUS_USE_OVERLAY_STATES );
 
 		// set the text of the window to nothing by default
-		GadgetButtonSetText( m_queueData[ i ].control, UnicodeString( L"" ) );
+		GadgetButtonSetText( m_queueData[ i ].control, L"" );
 
 		//Clear any potential veterancy rank, or else we'll see it when it's empty!
 		GadgetButtonDrawOverlayImage( m_queueData[ i ].control, NULL );
 
-	}  // end for i
+	}
 
 	// step through each object being built and set the image data for the buttons
 	ProductionUpdateInterface *pu = producer->getProductionUpdateInterface();
@@ -539,7 +533,7 @@ void ControlBar::populateBuildQueue( Object *producer )
 	const ProductionEntry *production;
 	Int windowIndex = 0;
 	const Image *image;
-	for( production = pu->firstProduction();	
+	for( production = pu->firstProduction();
 			 production;
 			 production = pu->nextProduction( production ) )
 	{
@@ -562,7 +556,7 @@ void ControlBar::populateBuildQueue( Object *producer )
 			m_queueData[ windowIndex ].control->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
 			image = production->getProductionObject()->getButtonImage();
 			GadgetButtonSetEnabledImage( m_queueData[ windowIndex ].control, image );
-			
+
 			//No longer used.
 			//image = TheMappedImageCollection->findImageByName( production->getProductionObject()->getInventoryImageName( INV_IMAGE_HILITE ) );
 			//GadgetButtonSetHiliteSelectedImage( m_queueData[ windowIndex ].control, image );
@@ -580,7 +574,7 @@ void ControlBar::populateBuildQueue( Object *producer )
 	//		image = TheMappedImageCollection->findImageByName( production->getProductionObject()->getInventoryImageName( INV_IMAGE_DISABLED ) );
 	//		GadgetButtonSetDisabledImage( m_queueData[ windowIndex ].control, image );
 
-		}  // end if
+		}
 		else
 		{
 			const UpgradeTemplate *ut = production->getProductionUpgrade();
@@ -595,7 +589,7 @@ void ControlBar::populateBuildQueue( Object *producer )
 			m_queueData[ windowIndex ].control->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
 			image = ut->getButtonImage();
 			GadgetButtonSetEnabledImage( m_queueData[ windowIndex ].control, image );
-			
+
 			//No longer used
 			//image = TheMappedImageCollection->findImageByName( ut->getQueueImageName( UpgradeTemplate::UPGRADE_HILITE ) );
 			//GadgetButtonSetHiliteSelectedImage( m_queueData[ windowIndex ].control, image );
@@ -609,12 +603,12 @@ void ControlBar::populateBuildQueue( Object *producer )
 	//		image = TheMappedImageCollection->findImageByName( ut->getQueueImageName( UpgradeTemplate::UPGRADE_DISABLED ) );
 	//		GadgetButtonSetDisabledImage( m_queueData[ windowIndex ].control, image );
 
-		}  // end else
+		}
 
 		// we have filled up this window now
 		windowIndex++;
 
-	}  // end for
+	}
 
 	//
 	// save the count of things being produced in the build queue, when it changes we will
@@ -622,7 +616,7 @@ void ControlBar::populateBuildQueue( Object *producer )
 	//
 	m_displayedQueueCount = pu->getProductionCount();
 
-}  // end populateBuildQueue
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -640,7 +634,7 @@ void ControlBar::updateContextCommand( void )
 	// we always to update the UI
 	//
 	ContainModuleInterface *contain = obj ? obj->getContain() : NULL;
-	if( contain && contain->getContainMax() > 0 && 
+	if( contain && contain->getContainMax() > 0 &&
 			m_lastRecordedInventoryCount != contain->getContainCount() )
 	{
 
@@ -649,8 +643,8 @@ void ControlBar::updateContextCommand( void )
 
 		// re-evaluate the UI because something has changed
 		evaluateContextUI();
-					
-	}  // end if, transport
+
+	}
 
 	// get production update for those objects that have one
 	ProductionUpdateInterface *pu = obj ? obj->getProductionUpdateInterface() : NULL;
@@ -674,9 +668,9 @@ void ControlBar::updateContextCommand( void )
 			m_contextParent[ CP_BUILD_QUEUE ]->winHide( FALSE );
 			populateBuildQueue( obj );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 
@@ -689,9 +683,9 @@ void ControlBar::updateContextCommand( void )
 			// show the portrait image
 			setPortraitByObject( obj );
 
-		}  // end if
+		}
 
-	}  // end else
+	}
 
 	// update a visible production queue
 	if( m_contextParent[ CP_BUILD_QUEUE ]->winIsHidden() == FALSE )
@@ -707,7 +701,7 @@ void ControlBar::updateContextCommand( void )
 		//
 		if( pu )
 		{
-		
+
 			// update the whole queue as necessary
 			if( pu->getProductionCount() != m_displayedQueueCount )
 				populateBuildQueue( obj );
@@ -721,20 +715,20 @@ void ControlBar::updateContextCommand( void )
 			{
 				static NameKeyType winID = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonQueue01" );
 				GameWindow *win = TheWindowManager->winGetWindowFromId( m_contextParent[ CP_BUILD_QUEUE ], winID );
-				
-				DEBUG_ASSERTCRASH( win, ("updateContextCommand: Unable to find first build queue button\n") );
+
+				DEBUG_ASSERTCRASH( win, ("updateContextCommand: Unable to find first build queue button") );
 				//				UnicodeString text;
 				//
 				//				text.format( L"%.0f%%", produce->getPercentComplete() );
 				//				GadgetButtonSetText( win, text );
-				
+
 				GadgetButtonDrawInverseClock(win,produce->getPercentComplete(), m_buildUpClockColor);
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// evaluate each command on whether or not it should be enabled
 	for( i = 0; i < MAX_COMMANDS_PER_SET; i++ )
@@ -749,7 +743,7 @@ void ControlBar::updateContextCommand( void )
 		win = m_commandWindows[ i ];
 
 		// only consider commands for windows that are actually shown
-		//`tbd: fix the bug here, that is that if we don't change the unit, we won't attempt to show 
+		//`tbd: fix the bug here, that is that if we don't change the unit, we won't attempt to show
 		// these.
 		if( win->winIsHidden() == TRUE )
 			continue;
@@ -796,12 +790,12 @@ void ControlBar::updateContextCommand( void )
 				win->winEnable( TRUE );
 				break;
 		}
-  
+
 		//Determine by the production type of this button, whether or not the created object
 		//will have a veterancy rank
 		const Image *image = calculateVeterancyOverlayForThing( command->getThingTemplate() );
 		GadgetButtonDrawOverlayImage( win, image );
-    
+
 		//
 		// for check-like commands we will keep the push button "pushed" or "unpushed" depending
 		// on the current running status of the command
@@ -810,8 +804,8 @@ void ControlBar::updateContextCommand( void )
 		{
 
 			// sanity, check like commands should have windows that are check like as well
-			DEBUG_ASSERTCRASH( BitIsSet( win->winGetStatus(), WIN_STATUS_CHECK_LIKE ),	
-												 ("updateContextCommand: Error, gadget window for command '%s' is not check-like!\n",
+			DEBUG_ASSERTCRASH( BitIsSet( win->winGetStatus(), WIN_STATUS_CHECK_LIKE ),
+												 ("updateContextCommand: Error, gadget window for command '%s' is not check-like!",
 												 command->getName().str()) );
 
 			if( availability == COMMAND_ACTIVE )
@@ -819,18 +813,18 @@ void ControlBar::updateContextCommand( void )
 			else
 				GadgetCheckLikeButtonSetVisualCheck( win, FALSE );
 
-		}  // end if
+		}
+
+	}
 
-	}  // end for i
-	
 	// After Every change to the m_commandWIndows, we need to show fill in the missing blanks with the images
 	// removed from multiplayer branch
 	//showCommandMarkers();
 
 //	// if we have a build tooltip layout, update it with the new data.
-//	repopulateBuildTooltipLayout(); 
+//	repopulateBuildTooltipLayout();
 
-}  // end updatecontextCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 const Image* ControlBar::calculateVeterancyOverlayForThing( const ThingTemplate *thingTemplate )
@@ -880,7 +874,7 @@ const Image* ControlBar::calculateVeterancyOverlayForThing( const ThingTemplate
 		case LEVEL_HEROIC:
 			return m_rankHeroicIcon;
 	}
-	return NULL;;
+	return NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -902,7 +896,7 @@ const Image* ControlBar::calculateVeterancyOverlayForObject( const Object *obj )
 		case LEVEL_HEROIC:
 			return m_rankHeroicIcon;
 	}
-	return NULL;;
+	return NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -927,8 +921,8 @@ static Int getRappellerCount(Object* obj)
 /** What's the status between 'obj' and the 'command' at present.  Can we do it?  Are
 	* we already doing it?  Can ya dig it? */
 //-------------------------------------------------------------------------------------------------
-CommandAvailability ControlBar::getCommandAvailability( const CommandButton *command, 
-																												Object *obj, 
+CommandAvailability ControlBar::getCommandAvailability( const CommandButton *command,
+																												Object *obj,
 																												GameWindow *win,
 																												Bool forceDisabledEvaluation ) const
 {
@@ -950,7 +944,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 		// if the object status is disabled or unpowered, you cannot do anything to it.
 		return COMMAND_HIDDEN;
 	}
-	
+
 	//Unmanned vehicles don't have any commands available -- in fact they are hidden!
  	if( obj->isDisabledByType( DISABLED_UNMANNED ) )
  	{
@@ -962,13 +956,13 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 	{
 		return COMMAND_RESTRICTED;
 	}
- 
+
 	//Other disabled objects are unable to use buttons -- so gray them out.
 	Bool disabled = obj->isDisabled();
-	
+
 	// if we are only disabled by being underpowered, and this button doesn't care, well, fix it
 	if (disabled
-			&& BitIsSet(command->getOptions(), IGNORES_UNDERPOWERED) 
+			&& BitIsSet(command->getOptions(), IGNORES_UNDERPOWERED)
 			&& obj->getDisabledFlags().test(DISABLED_UNDERPOWERED)
 			&& obj->getDisabledFlags().count() == 1)
 	{
@@ -979,11 +973,11 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
  	{
 
 		GUICommandType commandType = command->getCommandType();
-		if( commandType != GUI_COMMAND_SELL && 
+		if( commandType != GUI_COMMAND_SELL &&
 				commandType != GUI_COMMAND_EVACUATE &&
-				commandType != GUI_COMMAND_EXIT_CONTAINER && 
-				commandType != GUI_COMMAND_BEACON_DELETE && 
-				commandType != GUI_COMMAND_SET_RALLY_POINT && 
+				commandType != GUI_COMMAND_EXIT_CONTAINER &&
+				commandType != GUI_COMMAND_BEACON_DELETE &&
+				commandType != GUI_COMMAND_SET_RALLY_POINT &&
 				commandType != GUI_COMMAND_SWITCH_WEAPON )
 		{
 			if( getCommandAvailability( command, obj, win, TRUE ) == COMMAND_HIDDEN )
@@ -1006,7 +1000,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 				if( player->hasUpgradeComplete( upgradeT ) == FALSE )
 					return COMMAND_RESTRICTED;
 			}
-			else if( upgradeT->getUpgradeType() == UPGRADE_TYPE_OBJECT && 
+			else if( upgradeT->getUpgradeType() == UPGRADE_TYPE_OBJECT &&
 							 obj->hasUpgrade( upgradeT ) == FALSE )
 			{
 				return COMMAND_RESTRICTED;
@@ -1055,7 +1049,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			// if building anything at all right now we can't build another
 			if( dozerAI->isTaskPending( DOZER_TASK_BUILD ) == TRUE )
 				return COMMAND_RESTRICTED;
-			
+
 			// return whether or not the player can build this thing
 			if( player->canBuild( command->getThingTemplate() ) == FALSE )
 				return COMMAND_RESTRICTED;
@@ -1066,7 +1060,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			}
 
 			break;
-		}  
+		}
 
 		case GUI_COMMAND_SELL:
 		{
@@ -1109,7 +1103,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			}
 
 			break;
-		}  
+		}
 
 		case GUI_COMMAND_PLAYER_UPGRADE:
 		{
@@ -1127,7 +1121,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 				return COMMAND_RESTRICTED;//COMMAND_CANT_AFFORD;
 
 			break;
-		} 
+		}
 
 		case GUI_COMMAND_OBJECT_UPGRADE:
 		{
@@ -1154,7 +1148,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			if( TheUpgradeCenter->canAffordUpgrade( player, command->getUpgradeTemplate() ) == FALSE )
 				return COMMAND_RESTRICTED;//COMMAND_CANT_AFFORD;
 			break;
-		} 
+		}
 
 		case GUI_COMMAND_FIRE_WEAPON:
 		{
@@ -1169,9 +1163,9 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 
 			// changed this to Log rather than Crash, because this can legitimately happen now for
 			// dozers and workers with mine-clearing stuff... (srj)
-			//DEBUG_ASSERTLOG( w, ("Unit %s's CommandButton %s is trying to access weaponslot %d, but doesn't have a weapon there in its FactionUnit ini entry.\n", 
+			//DEBUG_ASSERTLOG( w, ("Unit %s's CommandButton %s is trying to access weaponslot %d, but doesn't have a weapon there in its FactionUnit ini entry.",
 			//	obj->getTemplate()->getName().str(), command->getName().str(), (Int)command->getWeaponSlot() ) );
-			
+
 			UnsignedInt now = TheGameLogic->getFrame();
 
 			/// @Kris -- We need to show the button as always available for anything with a 0 clip reload time.
@@ -1186,9 +1180,9 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 /// @todo srj -- not sure why this next check is necessary, but the Comanche missile buttons will flicker without it. figure out someday.
 /// @todo ml  -- and note: that the "now-1" below causes zero-clip-reload weapons to never be ready, so I added this
 /// If you make changes to this code, make sure that the DragonTank's firewall weapon can be retargeted while active,
-/// that is, while the tank is squirting out flames all over the floor, you can click the firewall button (or "F"), 
-/// and re-target the firewall without having to stop or move in-betwen.. Thanks for reading 
-				|| (w->getPossibleNextShotFrame()==now-1) 	
+/// that is, while the tank is squirting out flames all over the floor, you can click the firewall button (or "F"),
+/// and re-target the firewall without having to stop or move in-betwen.. Thanks for reading
+				|| (w->getPossibleNextShotFrame()==now-1)
 				)
 			{
 				if ( w != NULL )
@@ -1216,7 +1210,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 					// no weapon in the slot means "gray me out"
 					return COMMAND_RESTRICTED;
 				}
-			} 
+			}
 
 			break;
 		}
@@ -1225,7 +1219,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 		case GUI_COMMAND_GUARD_WITHOUT_PURSUIT:
 		case GUI_COMMAND_GUARD_FLYING_UNITS_ONLY:
 			// always available
-			break;	
+			break;
 
 		case GUI_COMMAND_COMBATDROP:
 		{
@@ -1236,7 +1230,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 
 		case GUI_COMMAND_EXIT_CONTAINER:
 		{
-			
+
 			//
 			// this method is really used as a per frame update to see if we should enable
 			// disable a control ... inventory of objects shows as buttons have that enable
@@ -1244,7 +1238,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			// container changes the UI is completely repopulated
 			//
 			break;
-		} 
+		}
 
 		case GUI_COMMAND_EVACUATE:
 		{
@@ -1253,7 +1247,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			if( !obj->getContain() || obj->getContain()->getContainCount() <= 0 )
 				return COMMAND_RESTRICTED;
 			break;
-		}  
+		}
 
 		case GUI_COMMAND_EXECUTE_RAILED_TRANSPORT:
 		{
@@ -1263,14 +1257,14 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			if( dui == NULL || dui->isDockOpen() == FALSE )
 				return COMMAND_RESTRICTED;
 			break;
-		}  
+		}
 
 		case GUI_COMMAND_SPECIAL_POWER_FROM_COMMAND_CENTER:
 		case GUI_COMMAND_SPECIAL_POWER:
 		{
 			// sanity
 			DEBUG_ASSERTCRASH( command->getSpecialPowerTemplate() != NULL,
-												 ("The special power in the command '%s' is NULL\n", command->getName().str()) );
+												 ("The special power in the command '%s' is NULL", command->getName().str()) );
 			// get special power module from the object to execute it
 			SpecialPowerModuleInterface *mod = obj->getSpecialPowerModule( command->getSpecialPowerTemplate() );
 
@@ -1278,9 +1272,9 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			{
 				// sanity ... we must have a module for the special power, if we don't somebody probably
 				// forgot to put it in the object
-				DEBUG_CRASH(( "Object does not contain special power module (%s) to execute.  Did you forget to add it to the object INI?\n",
+				DEBUG_CRASH(( "Object does not contain special power module (%s) to execute.  Did you forget to add it to the object INI?",
 											command->getSpecialPowerTemplate()->getName().str() ));
-			} 
+			}
 			else if( mod->isReady() == FALSE )
 			{
 				Int percent =  mod->getPercentReady() * 100;
@@ -1306,7 +1300,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			}
 
 			break;
-		}  
+		}
 
 		case GUI_COMMAND_TOGGLE_OVERCHARGE:
 		{
@@ -1320,10 +1314,10 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 				{
 					if( obi->isOverchargeActive() )
 						return COMMAND_ACTIVE;
-				} 
-			}  
+				}
+			}
 			break;
-		} 
+		}
 
 		// switch weapon command
 		case GUI_COMMAND_SWITCH_WEAPON:
@@ -1331,9 +1325,9 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			// ask the ai which weapon is in the current slot
 			const Weapon* w = obj->getWeaponInWeaponSlot( command->getWeaponSlot() );
 
-			DEBUG_ASSERTCRASH( w, ("Unit %s's CommandButton %s is trying to access weaponslot %d, but doesn't have a weapon there in its FactionUnit ini entry.", 
+			DEBUG_ASSERTCRASH( w, ("Unit %s's CommandButton %s is trying to access weaponslot %d, but doesn't have a weapon there in its FactionUnit ini entry.",
 				obj->getTemplate()->getName().str(), command->getName().str(), (Int)command->getWeaponSlot() ) );
-			
+
 			if( w == NULL)
 				return COMMAND_RESTRICTED;
 
@@ -1348,10 +1342,10 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 						return COMMAND_AVAILABLE;
 				}
 			}
-			
+
 			return COMMAND_ACTIVE;
 		}
-		
+
 		case GUI_COMMAND_HACK_INTERNET:
 		{
 			AIUpdateInterface *ai = obj->getAI();
@@ -1365,7 +1359,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			}
 			return COMMAND_AVAILABLE;
 		}
-		
+
 		case GUI_COMMAND_STOP:
 		{
 			if( !BitIsSet( command->getOptions(), OPTION_ONE ) )
@@ -1384,9 +1378,9 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			return COMMAND_AVAILABLE;
 		}
 	}
-	
+
 	// all is well with the command
 	return COMMAND_AVAILABLE;
 
-}  // end getCommandAvailability
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
index 1fe9f006f05..44f7f28fa00 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BuildAssistant.h"
 #include "Common/Money.h"
@@ -56,11 +56,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/ProductionUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 /** Process a button transition message from the window system that should be for one of
@@ -70,17 +65,17 @@ CBCommandStatus ControlBar::processCommandTransitionUI( GameWindow *control, Gad
 {
 	// sanity, we won't process messages if we have no source object
 	if( m_currContext != CB_CONTEXT_MULTI_SELECT &&
-			(m_currentSelectedDrawable == NULL || 
+			(m_currentSelectedDrawable == NULL ||
 			 m_currentSelectedDrawable->getObject() == NULL) )
 	{
 
-		if( m_currContext != CB_CONTEXT_NONE && 
-				m_currContext != CB_CONTEXT_OBSERVER_INFO && 
+		if( m_currContext != CB_CONTEXT_NONE &&
+				m_currContext != CB_CONTEXT_OBSERVER_INFO &&
 				m_currContext != CB_CONTEXT_OBSERVER_LIST)
 			switchToContext( CB_CONTEXT_NONE, NULL );
 		return CBC_COMMAND_NOT_USED;
 
-	}  // end if
+	}
 
 	return CBC_COMMAND_USED;
 
@@ -90,7 +85,7 @@ CBCommandStatus ControlBar::processCommandTransitionUI( GameWindow *control, Gad
 /** Process a button selected message from the window system that should be for one of
 	* our GUI commands */
 //-------------------------------------------------------------------------------------------------
-CBCommandStatus ControlBar::processCommandUI( GameWindow *control, 
+CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 																							GadgetGameMessage gadgetMessage )
 {
 	// get the command pointer from the control user data we put in the button
@@ -101,12 +96,12 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 		return CBC_COMMAND_NOT_USED;
 	}
 
-	// sanity, we won't process messages if we have no source object, 
+	// sanity, we won't process messages if we have no source object,
 	// unless we're CB_CONTEXT_PURCHASE_SCIENCE or GUI_COMMAND_SPECIAL_POWER_FROM_COMMAND_CENTER
 	if( m_currContext != CB_CONTEXT_MULTI_SELECT &&
 			commandButton->getCommandType() != GUI_COMMAND_PURCHASE_SCIENCE &&
 			commandButton->getCommandType() != GUI_COMMAND_SPECIAL_POWER_FROM_COMMAND_CENTER &&
-			(m_currentSelectedDrawable == NULL || 
+			(m_currentSelectedDrawable == NULL ||
 			 m_currentSelectedDrawable->getObject() == NULL) )
 	{
 
@@ -114,7 +109,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			switchToContext( CB_CONTEXT_NONE, NULL );
 		return CBC_COMMAND_NOT_USED;
 
-	}  // end if
+	}
 
 	// sanity
 	if( control == NULL )
@@ -124,25 +119,25 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 	if( control->winGetInputFunc() != GadgetPushButtonInput )
 		return CBC_COMMAND_NOT_USED;
 
-	
+
 	if( commandButton == NULL )
 		return CBC_COMMAND_NOT_USED;
 
 	// if the button is flashing, tell it to stop flashing
 	commandButton->setFlashCount(0);
-	TheControlBar->setFlash( FALSE );
+	setFlash( FALSE );
 
 	if( commandButton->getCommandType() != GUI_COMMAND_EXIT_CONTAINER )
 	{
 		GadgetButtonSetEnabledImage( control, commandButton->getButtonImage() );
 	}
-	
+
 	//
 	// get the object that is driving the context sensitive UI if we're not in a multi
 	// select context
 	//
 	Object *obj = NULL;
-	if( m_currContext != CB_CONTEXT_MULTI_SELECT && 
+	if( m_currContext != CB_CONTEXT_MULTI_SELECT &&
 			commandButton->getCommandType() != GUI_COMMAND_PURCHASE_SCIENCE &&
 			commandButton->getCommandType() != GUI_COMMAND_SPECIAL_POWER_FROM_COMMAND_CENTER)
 		obj = m_currentSelectedDrawable->getObject();
@@ -185,11 +180,11 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 		//I've added support for specific context sensitive commands which need targets just like
 		//other options may need. When we need a target, the user must move the cursor to a position
 		//where he wants the GUI command to take place. Older commands such as napalm strikes or daisy
-		//cutter drops simply needed the user to click anywhere he desired. 
+		//cutter drops simply needed the user to click anywhere he desired.
 		//
-		//Now, we have new commands that will only work when the user clicks on valid targets to interact 
-		//with. For example, the terrorist can jack a car and convert it into a carbomb, but he has to 
-		//click on a valid car. In this case the doCommandOrHint code will determine if the mode is valid 
+		//Now, we have new commands that will only work when the user clicks on valid targets to interact
+		//with. For example, the terrorist can jack a car and convert it into a carbomb, but he has to
+		//click on a valid car. In this case the doCommandOrHint code will determine if the mode is valid
 		//or not and the cursor modes will be set appropriately.
 		TheInGameUI->setGUICommand( commandButton );
 	}
@@ -214,7 +209,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				TheEva->setShouldPlay(EVA_InsufficientFunds);
 				TheInGameUI->message( "GUI:NotEnoughMoneyToBuild" );
 				break;
-			} 
+			}
 			else if (cmt == CANMAKE_QUEUE_FULL)
 			{
 				TheInGameUI->message( "GUI:ProductionQueueFull" );
@@ -229,14 +224,14 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			{
 				TheInGameUI->message( "GUI:UnitMaxedOut" );
 				break;
-			} 
+			}
 
 			// tell the UI that we want to build something so we get a building at the cursor
 			TheInGameUI->placeBuildAvailable( commandButton->getThingTemplate(), m_currentSelectedDrawable );
 
 			break;
 
-		}  // end dozer construct
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_DOZER_CONSTRUCT_CANCEL:
@@ -256,7 +251,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end cancel dozer construction
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_UNIT_BUILD:
@@ -269,9 +264,9 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				break;
 
 			// sanity, we must have something to build
-			DEBUG_ASSERTCRASH( whatToBuild, ("Undefined BUILD command for object '%s'\n", 
+			DEBUG_ASSERTCRASH( whatToBuild, ("Undefined BUILD command for object '%s'",
 												 commandButton->getThingTemplate()->getName().str()) );
-			
+
 			CanMakeType cmt = TheBuildAssistant->canMakeUnit(factory, whatToBuild);
 
 			if (cmt == CANMAKE_NO_MONEY)
@@ -279,7 +274,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				TheEva->setShouldPlay(EVA_InsufficientFunds);
 				TheInGameUI->message( "GUI:NotEnoughMoneyToBuild" );
 				break;
-			} 
+			}
 			else if (cmt == CANMAKE_QUEUE_FULL)
 			{
 				TheInGameUI->message( "GUI:ProductionQueueFull" );
@@ -294,11 +289,11 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			{
 				TheInGameUI->message( "GUI:UnitMaxedOut" );
 				break;
-			} 
+			}
 			else if (cmt != CANMAKE_OK)
 			{
-				DEBUG_ASSERTCRASH( 0, ("Cannot create '%s' because the factory object '%s' returns false for canMakeUnit\n", 
-																whatToBuild->getName().str(), 
+				DEBUG_ASSERTCRASH( 0, ("Cannot create '%s' because the factory object '%s' returns false for canMakeUnit",
+																whatToBuild->getName().str(),
 																factory->getTemplate()->getName().str()) );
 				break;
 			}
@@ -310,13 +305,13 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			if( pu == NULL )
 			{
 
-				DEBUG_ASSERTCRASH( 0, ("Cannot create '%s' because the factory object '%s' is not capable of producting units\n", 
-																whatToBuild->getName().str(), 
+				DEBUG_ASSERTCRASH( 0, ("Cannot create '%s' because the factory object '%s' is not capable of producting units",
+																whatToBuild->getName().str(),
 																factory->getTemplate()->getName().str()) );
 				break;
 
-			}  // end if
-			
+			}
+
 			// get a new production id to assign to this
 			ProductionID productionID = pu->requestUniqueUnitID();
 
@@ -328,7 +323,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end build unit
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_CANCEL_UNIT_BUILD:
@@ -344,10 +339,10 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			if( i == MAX_BUILD_QUEUE_BUTTONS )
 			{
 
-				DEBUG_ASSERTCRASH( 0, ("Control not found in build queue data\n") );
+				DEBUG_ASSERTCRASH( 0, ("Control not found in build queue data") );
 				break;
 
-			}  // end if
+			}
 
 			// sanity
 			if( m_queueData[ i ].type != PRODUCTION_UNIT )
@@ -371,13 +366,13 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end cancel unit build
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_PLAYER_UPGRADE:
 		{
 			const UpgradeTemplate *upgradeT = commandButton->getUpgradeTemplate();
-			DEBUG_ASSERTCRASH( upgradeT, ("Undefined upgrade '%s' in player upgrade command\n", "UNKNOWN") );
+			DEBUG_ASSERTCRASH( upgradeT, ("Undefined upgrade '%s' in player upgrade command", "UNKNOWN") );
 
 			// sanity
 			if( obj == NULL || upgradeT == NULL )
@@ -407,13 +402,13 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // command player upgrade
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_OBJECT_UPGRADE:
 		{
 			const UpgradeTemplate *upgradeT = commandButton->getUpgradeTemplate();
-			DEBUG_ASSERTCRASH( upgradeT, ("Undefined upgrade '%s' in object upgrade command\n", "UNKNOWN") );
+			DEBUG_ASSERTCRASH( upgradeT, ("Undefined upgrade '%s' in object upgrade command", "UNKNOWN") );
 			// sanity
 			if( upgradeT == NULL )
 				break;
@@ -452,7 +447,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end object upgrade
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_CANCEL_UPGRADE:
@@ -468,10 +463,10 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			if( i == MAX_BUILD_QUEUE_BUTTONS )
 			{
 
-				DEBUG_ASSERTCRASH( 0, ("Control not found in build queue data\n") );
+				DEBUG_ASSERTCRASH( 0, ("Control not found in build queue data") );
 				break;
 
-			}  // end if
+			}
 
 			// sanity
 			if( m_queueData[ i ].type != PRODUCTION_UPGRADE )
@@ -493,7 +488,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end cancel upgrade
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_ATTACK_MOVE:
@@ -537,7 +532,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			// get the actual object
 			Object *objWantingExit = TheGameLogic->findObjectByID( objID );
-			
+
 			// if the control container returns an object ID but the object is not found, remove the control entry and exit
 			if( objWantingExit == NULL )
 			{
@@ -551,7 +546,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				m_containData[ i ].objectID = INVALID_ID;
 				break;  // exit case
 
-			}  // end if
+			}
 
 			// send message to exit
 			GameMessage *exitMsg = TheMessageStream->appendMessage( GameMessage::MSG_EXIT );
@@ -559,7 +554,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end transport exit
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_EVACUATE:
@@ -571,16 +566,16 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_EVACUATE );
 				TheMessageStream->appendMessage( GameMessage::MSG_EVACUATE );
 			}
-			
+
 			break;
-		}  // end evacuate
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GUI_COMMAND_EXECUTE_RAILED_TRANSPORT:
 		{
 			TheMessageStream->appendMessage( GameMessage::MSG_EXECUTE_RAILED_TRANSPORT );
 			break;
-		}  // end execute railed transport
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GUI_COMMAND_HACK_INTERNET:
@@ -595,7 +590,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 		{
 			break;
 
-		}  // end set rally point
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_SELL:
@@ -605,7 +600,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			TheMessageStream->appendMessage( GameMessage::MSG_SELL );
 			break;
 
-		}  // end sell
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GUI_COMMAND_TOGGLE_OVERCHARGE:
@@ -614,7 +609,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			TheMessageStream->appendMessage( GameMessage::MSG_TOGGLE_OVERCHARGE );
 			break;
 
-		}  // end overcharge
+		}
 
 #ifdef ALLOW_SURRENDER
 		// ------------------------------------------------------------------------------------------------
@@ -624,7 +619,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			TheMessageStream->appendMessage( GameMessage::MSG_RETURN_TO_PRISON );
 			break;
 
-		}  // end return to prison
+		}
 #endif
 
 		//---------------------------------------------------------------------------------------------
@@ -633,7 +628,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end delete beacon
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_GUARD:
@@ -671,7 +666,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end fire weapon
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_SPECIAL_POWER_FROM_COMMAND_CENTER:
@@ -687,7 +682,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			msg->appendObjectIDArgument( cmdCenter->getID() );
 			break;
 
-		}  // end special weapon
+		}
 
 		case GUI_COMMAND_SPECIAL_POWER:
 		{
@@ -698,7 +693,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			msg->appendObjectIDArgument( INVALID_ID );	// no specific source
 			break;
 
-		}  // end special weapon
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_PURCHASE_SCIENCE:
@@ -706,7 +701,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			// loop through all the sciences on the button and select the one we don't have
 
-			ScienceType	st = SCIENCE_INVALID; 
+			ScienceType	st = SCIENCE_INVALID;
 			Player *player = ThePlayerList->getLocalPlayer();
 			for(size_t i = 0; i < commandButton->getScienceVec().size(); ++i)
 			{
@@ -716,32 +711,32 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 					break;
 				}
 			}
-			
+
 			if( st == SCIENCE_INVALID)
 			{
 				switchToContext( CB_CONTEXT_NONE, NULL );
 				break;
 			}
-			
-		
+
+
 			GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_PURCHASE_SCIENCE );
 			msg->appendIntegerArgument( st );
-			
+
 			markUIDirty();
 
 			break;
 
-		}  // end pick specialized science
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 
-			DEBUG_ASSERTCRASH( 0, ("Unknown command '%d'\n", commandButton->getCommandType()) );
+			DEBUG_ASSERTCRASH( 0, ("Unknown command '%d'", commandButton->getCommandType()) );
 			return CBC_COMMAND_NOT_USED;
 
-	}  // end switch
+	}
 
 	return CBC_COMMAND_USED;
 
-}  // end processCommandUI
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
index 85eb3c63f37..b21ed009e55 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "GameClient/ControlBar.h"
@@ -40,11 +40,6 @@
 #include "GameClient/InGameUI.h"
 #include "GameLogic/Object.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
@@ -62,7 +57,7 @@ void ControlBar::resetCommonCommandData( void )
 		GadgetButtonDrawOverlayImage( m_commandWindows[ i ], NULL );
 	}
 
-}  // end resetCommonCommandData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** add the common commands of this drawable to the common command set */
@@ -104,11 +99,11 @@ void ControlBar::addCommonCommands( Drawable *draw, Bool firstDrawable )
 	// removed from multiplayer branch
 			//showCommandMarkers();
 
-		}  // end for i
+		}
 
 		return;
 
-	}  // end if
+	}
 
 
 	//
@@ -141,25 +136,25 @@ void ControlBar::addCommonCommands( Drawable *draw, Bool firstDrawable )
 				// set the command into the control
 				setControlCommand( m_commandWindows[ i ], command );
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 	else
 	{
 
 		// go through each command one by one
 		for( i = 0; i < MAX_COMMANDS_PER_SET; i++ )
 		{
-		
+
 			// our implementation doesn't necessarily make use of the max possible command buttons
 			if (! m_commandWindows[ i ]) continue;
 
 			// get the command
 			command = commandSet->getCommandButton(i);
-					
-			Bool attackMove = (command && command->getCommandType() == GUI_COMMAND_ATTACK_MOVE) || 
+
+			Bool attackMove = (command && command->getCommandType() == GUI_COMMAND_ATTACK_MOVE) ||
 												(m_commonCommands[ i ] && m_commonCommands[ i ]->getCommandType() == GUI_COMMAND_ATTACK_MOVE);
 
 			// Kris: When any units have attack move, they all get it. This is to allow
@@ -194,15 +189,15 @@ void ControlBar::addCommonCommands( Drawable *draw, Bool firstDrawable )
 				m_commandWindows[ i ]->winHide( TRUE );
 			}
 
-		}  // end if
+		}
 
-	}  // end else
+	}
 
 	// After Every change to the m_commandWIndows, we need to show fill in the missing blanks with the images
 	// removed from multiplayer branch
 	//showCommandMarkers();
 
-}  // end addCommonCommands
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Populate the visible command bar with commands that are common to all the objects
@@ -230,24 +225,24 @@ void ControlBar::populateMultiSelect( void )
 
 	// sanity
 	DEBUG_ASSERTCRASH( TheInGameUI->getSelectCount() > 1,
-										 ("populateMultiSelect: Can't populate multiselect context cause there are only '%d' things selected\n",
+										 ("populateMultiSelect: Can't populate multiselect context cause there are only '%d' things selected",
 										  TheInGameUI->getSelectCount()) );
 
 	// get the list of drawable IDs from the in game UI
 	const DrawableList *selectedDrawables = TheInGameUI->getAllSelectedDrawables();
 
 	// sanity
-	DEBUG_ASSERTCRASH( selectedDrawables->empty() == FALSE, ("populateMultiSelect: Drawable list is empty\n") );
+	DEBUG_ASSERTCRASH( selectedDrawables->empty() == FALSE, ("populateMultiSelect: Drawable list is empty") );
 
 	// loop through all the selected drawables
 	for( DrawableListCIt it = selectedDrawables->begin();
 			 it != selectedDrawables->end(); ++it )
 	{
-	
+
 		// get the drawable
 		draw = *it;
 
-		
+
 		if (draw->getObject()->isKindOf(KINDOF_IGNORED_IN_GUI)) // ignore these guys
 			continue;
 
@@ -260,7 +255,7 @@ void ControlBar::populateMultiSelect( void )
 		// NOTE that we're not considering objects that are currently in the process of
 		// being sold as those objects can't be issued anymore commands
 		//
-		if( draw && draw->getObject() && 
+		if( draw && draw->getObject() &&
 				!draw->getObject()->getStatusBits().test( OBJECT_STATUS_SOLD ) )
 		{
 
@@ -276,23 +271,23 @@ void ControlBar::populateMultiSelect( void )
 			//
 			if( portraitSet == FALSE )
 			{
-			
+
 				portrait = draw->getTemplate()->getSelectedPortraitImage();
 				portraitObj = draw->getObject();
 				portraitSet = TRUE;
 
-			}  // end if
+			}
 			else if( draw->getTemplate()->getSelectedPortraitImage() != portrait )
 				portrait = NULL;
 
-		}  // end if
+		}
 
-	}  // end for, drawble id iterator
+	}
 
 	// set the portrait image
 	setPortraitByObject( portraitObj );
 
-}  // end populateMultiSelect
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update logic for the multi select context sensitive GUI */
@@ -311,20 +306,20 @@ void ControlBar::updateContextMultiSelect( void )
 
 	// santiy
 	DEBUG_ASSERTCRASH( TheInGameUI->getSelectCount() > 1,
-										 ("updateContextMultiSelect: TheInGameUI only has '%d' things selected\n",
+										 ("updateContextMultiSelect: TheInGameUI only has '%d' things selected",
 										  TheInGameUI->getSelectCount()) );
 
 	// get the list of drawable IDs from the in game UI
 	const DrawableList *selectedDrawables = TheInGameUI->getAllSelectedDrawables();
 
 	// sanity
-	DEBUG_ASSERTCRASH( selectedDrawables->empty() == FALSE, ("populateMultiSelect: Drawable list is empty\n") );
+	DEBUG_ASSERTCRASH( selectedDrawables->empty() == FALSE, ("populateMultiSelect: Drawable list is empty") );
 
 	// loop through all the selected drawable IDs
 	for( DrawableListCIt it = selectedDrawables->begin();
 			 it != selectedDrawables->end(); ++it )
 	{
-	
+
 		// get the drawable from the ID
 		draw = *it;
 
@@ -395,9 +390,9 @@ void ControlBar::updateContextMultiSelect( void )
 			if( availability == COMMAND_AVAILABLE || availability == COMMAND_ACTIVE )
 					objectsThatCanDoCommand[ i ]++;
 
-		}  // end for i
+		}
 
-	}  // end for, selected drawables
+	}
 
 	//
 	// for each command, if any objects can do the command we enable the window, otherwise
@@ -415,18 +410,18 @@ void ControlBar::updateContextMultiSelect( void )
 		// don't consider slots that don't have commands
 		if( m_commonCommands[ i ] == NULL )
 			continue;
-		
+
 		// check the count of objects that can do the command and enable/disable the control,
 		if( objectsThatCanDoCommand[ i ] > 0 )
 			m_commandWindows[ i ]->winEnable( TRUE );
 		else
 			m_commandWindows[ i ]->winEnable( FALSE );
 
-	}  // end for i
+	}
 
 	// After Every change to the m_commandWIndows, we need to show fill in the missing blanks with the images
 	// removed from multiplayer branch
 	//showCommandMarkers();
 
 
-}  // end updateContextMultiSelect
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
index f543255ed6f..4d7b2201191 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/NameKeyGenerator.h"
 #include "Common/ThingTemplate.h"
@@ -54,7 +54,7 @@ void ControlBar::updateOCLTimerTextDisplay( UnsignedInt totalSeconds, Real perce
 	GameWindow *barWindow = TheWindowManager->winGetWindowFromId( NULL, barID );
 
 	// santiy
-	DEBUG_ASSERTCRASH( descWindow, ("Under construction window not found\n") );
+	DEBUG_ASSERTCRASH( descWindow, ("Under construction window not found") );
 
 	Int minutes = totalSeconds / 60;
 	Int seconds = totalSeconds - (minutes * 60);
@@ -66,12 +66,12 @@ void ControlBar::updateOCLTimerTextDisplay( UnsignedInt totalSeconds, Real perce
 		text.format( TheGameText->fetch( "CONTROLBAR:OCLTimerDesc" ), minutes, seconds );
 
 	GadgetStaticTextSetText( descWindow, text );
-	GadgetProgressBarSetProgress(barWindow, (percent * 100));  
+	GadgetProgressBarSetProgress(barWindow, (percent * 100));
 
 	// record this as the last time displayed
 	m_displayedOCLTimerSeconds = totalSeconds;
 
-}  // end updateOCLTimerTextDisplay
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Populate the interface for an OCL Timer context. */
@@ -95,14 +95,14 @@ void ControlBar::populateOCLTimer( Object *creatorObject )
 	setControlCommand( win, commandButton );
 	win->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
 
-	
+
 	// set the text percent and bar of our timer we are displaying
 	updateContextOCLTimer( );
 
 	// set the portrait for the thing being constructed
 	setPortraitByObject( creatorObject );
 
-}  // end populateUnderConstruction
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -117,9 +117,9 @@ void ControlBar::updateContextOCLTimer( void )
 	UnsignedInt seconds = frames / LOGICFRAMES_PER_SECOND;
 
 	Real percent = update->getCountdownPercent();
-	
+
 	// if the time has changed since what was last shown to the user update the text
 	if( m_displayedOCLTimerSeconds != seconds )
 		updateOCLTimerTextDisplay( seconds, percent );
 
-}  // end updatecontextUnderConstruction
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
index a1bfcca2862..d15d40b7d2c 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarObserver.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ControlBarObserver.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	All things related to the Observer Control bar, are in here.
 //
 //-----------------------------------------------------------------------------
@@ -50,8 +50,9 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/GameUtility.h"
 #include "Common/NameKeyGenerator.h"
 #include "Common/PlayerList.h"
 #include "Common/Player.h"
@@ -89,12 +90,16 @@ static NameKeyType buttonCancelID = NAMEKEY_INVALID;
 
 static GameWindow *winFlag = NULL;
 static GameWindow *winGeneralPortrait = NULL;
+// TheSuperHackers @tweak Allow idle worker selection for observers.
+static GameWindow *buttonIdleWorker = NULL;
 static GameWindow *staticTextNumberOfUnits = NULL;
 static GameWindow *staticTextNumberOfBuildings = NULL;
 static GameWindow *staticTextNumberOfUnitsKilled = NULL;
 static GameWindow *staticTextNumberOfUnitsLost = NULL;
 static GameWindow *staticTextPlayerName = NULL;
 
+static NameKeyType s_replayObserverNameKey = NAMEKEY_INVALID;
+
 //-----------------------------------------------------------------------------
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -115,7 +120,7 @@ void ControlBar::initObserverControls( void )
 		staticTextPlayerID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		staticTextPlayer[i] = TheWindowManager->winGetWindowFromId( ObserverPlayerListWindow, staticTextPlayerID[i] );
 	}
-	
+
 	staticTextNumberOfUnits = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:StaticTextNumberOfUnits"));
 	staticTextNumberOfBuildings = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:StaticTextNumberOfBuildings"));
 	staticTextNumberOfUnitsKilled = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:StaticTextNumberOfUnitsKilled"));
@@ -123,26 +128,57 @@ void ControlBar::initObserverControls( void )
 	staticTextPlayerName = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:StaticTextPlayerName"));
 	winFlag = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:WinFlag"));
 	winGeneralPortrait = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:WinGeneralPortrait"));
-	
+	buttonIdleWorker = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonIdleWorker"));
+
 	buttonCancelID = TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonCancel");
+
+	s_replayObserverNameKey = TheNameKeyGenerator->nameToKey("ReplayObserver");
+}
+
+//-------------------------------------------------------------------------------------------------
+void ControlBar::setObserverLookAtPlayer(Player *player)
+{
+	if (player != NULL && player == ThePlayerList->findPlayerWithNameKey(s_replayObserverNameKey))
+	{
+		// Looking at the observer. Treat as not looking at player.
+		m_observerLookAtPlayer = NULL;
+	}
+	else
+	{
+		m_observerLookAtPlayer = player;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void ControlBar::setObservedPlayer(Player *player)
+{
+	if (player != NULL && player == ThePlayerList->findPlayerWithNameKey(s_replayObserverNameKey))
+	{
+		// Looking at the observer. Treat as not observing player.
+		m_observedPlayer = NULL;
+	}
+	else
+	{
+		m_observedPlayer = player;
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
 /** System callback for the ControlBarObserverSystem */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType ControlBarObserverSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ControlBarObserverSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	static NameKeyType buttonCommunicator = NAMEKEY_INVALID;
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
 				break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_MOUSE_ENTERING:
@@ -160,29 +196,35 @@ WindowMsgHandledType ControlBarObserverSystem( GameWindow *window, UnsignedInt m
 			Int controlID = control->winGetWindowId();
 			if( controlID == buttonCancelID)
 			{
-				TheControlBar->setObserverLookAtPlayer(NULL);
+				rts::changeObservedPlayer(NULL);
+
 				ObserverPlayerInfoWindow->winHide(TRUE);
 				ObserverPlayerListWindow->winHide(FALSE);
+				buttonIdleWorker->winHide(TRUE);
 				TheControlBar->populateObserverList();
-
 			}
+
 			for(Int i = 0; i <MAX_BUTTONS; ++i)
 			{
 				if( controlID == buttonPlayerID[i])
 				{
+					Player* player = static_cast<Player*>(GadgetButtonGetData(buttonPlayer[i]));
+					rts::changeObservedPlayer(player);
+
 					ObserverPlayerInfoWindow->winHide(FALSE);
 					ObserverPlayerListWindow->winHide(TRUE);
-					TheControlBar->setObserverLookAtPlayer((Player *) GadgetButtonGetData( buttonPlayer[i]));
+
 					if(TheControlBar->getObserverLookAtPlayer())
 						TheControlBar->populateObserverInfoWindow();
+
 					return MSG_HANDLED;
 				}
 			}
-			
+
 		//	if( controlID == buttonCommunicator && TheGameLogic->getGameMode() == GAME_INTERNET )
 	/*
 		{
-				popupCommunicatorLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupCommunicator.wnd" ) );
+				popupCommunicatorLayout = TheWindowManager->winCreateLayout( "Menus/PopupCommunicator.wnd" );
 				popupCommunicatorLayout->runInit();
 				popupCommunicatorLayout->hide( FALSE );
 				popupCommunicatorLayout->bringForward();
@@ -191,17 +233,17 @@ WindowMsgHandledType ControlBarObserverSystem( GameWindow *window, UnsignedInt m
 
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end ControlBarSystem
+}
 
 //-----------------------------------------------------------------------------
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
@@ -212,7 +254,7 @@ void ControlBar::populateObserverList( void )
 	Int currentButton = 0, i;
 	if(TheRecorder->isMultiplayer())
 	{
-	
+
 		for (i = 0; i < MAX_SLOTS; ++i)
 		{
 			AsciiString name;
@@ -232,7 +274,7 @@ void ControlBar::populateObserverList( void )
 				buttonPlayer[currentButton]->winHide(FALSE);
 				buttonPlayer[currentButton]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
 
-				const GameSlot *slot = TheGameInfo->getConstSlot(currentButton);
+				const GameSlot *slot = TheGameInfo->getConstSlot(i);
 				Color playerColor = p->getPlayerColor();
 				Color backColor = GameMakeColor(0, 0, 0, 255);
 				staticTextPlayer[currentButton]->winSetEnabledTextColors( playerColor, backColor );
@@ -301,15 +343,16 @@ void ControlBar::populateObserverInfoWindow ( void )
 	{
 		ObserverPlayerInfoWindow->winHide(TRUE);
 		ObserverPlayerListWindow->winHide(FALSE);
+		buttonIdleWorker->winHide(TRUE);
 		populateObserverList();
 		return;
 	}
-							
+
 	UnicodeString uString;
 	KindOfMaskType mask,clearmask;
 	mask.set(KINDOF_SCORE);
 	clearmask.set(KINDOF_STRUCTURE);
-	
+
 	uString.format(L"%d",m_observerLookAtPlayer->countObjects(mask,clearmask));
 	GadgetStaticTextSetText(staticTextNumberOfUnits, uString);
 
@@ -338,4 +381,5 @@ void ControlBar::populateObserverInfoWindow ( void )
 	staticTextPlayerName->winSetEnabledTextColors(color, GameMakeColor(0,0,0,255));
 	winFlag->winSetEnabledImage(0, m_observerLookAtPlayer->getPlayerTemplate()->getFlagWaterMarkImage());
 	winGeneralPortrait->winHide(FALSE);
+	buttonIdleWorker->winHide(FALSE);
 }
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
index 43be01f4f59..adbe1332f01 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarPrintPositions.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ControlBarPrintPositions.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Convience function for degayifying the whole squished control bar
 //						process
 //
@@ -47,8 +47,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#include <stdio.h>
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
index 090be0f7592..fc8b35ad5f2 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarResizer.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ControlBarResizer.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	We want a "squished" control bar, this is the methods that will do it
 //
 //-----------------------------------------------------------------------------
@@ -46,7 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -59,11 +59,11 @@
 // DEFINES ////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 
-const FieldParse ControlBarResizer::m_controlBarResizerParseTable[] = 
+const FieldParse ControlBarResizer::m_controlBarResizerParseTable[] =
 {
 	{ "AltPosition",		INI::parseICoord2D,						NULL, offsetof( ResizerWindow, m_altPos ) },
 	{ "AltSize",				INI::parseICoord2D,						NULL, offsetof( ResizerWindow, m_altSize ) },
-	{ NULL,										NULL,													NULL, 0 }  // keep this last
+	{ NULL,										NULL,													NULL, 0 }
 
 };
 //-----------------------------------------------------------------------------
@@ -98,16 +98,16 @@ ControlBarResizer::~ControlBarResizer( void )
 	}
 	m_resizerWindowsList.clear();
 }
-	
+
 void ControlBarResizer::init( void )
 {
 	INI ini;
 	// Read from INI all the ControlBarSchemes
-	ini.load( AsciiString( "Data\\INI\\ControlBarResizer.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\ControlBarResizer", INI_LOAD_OVERWRITE, NULL );
 
 }
 
-	
+
 ResizerWindow *ControlBarResizer::findResizerWindow( AsciiString name )
 {
 	ResizerWindowList::iterator it = m_resizerWindowsList.begin();
@@ -126,7 +126,7 @@ ResizerWindow *ControlBarResizer::findResizerWindow( AsciiString name )
 		{
 			return rWin;
 		}
-		it ++;	
+		it ++;
 	}
 	return NULL;
 }
@@ -150,7 +150,7 @@ ResizerWindow *ControlBarResizer::newResizerWindow( AsciiString name )
 	win->winGetSize(&newRwin->m_defaultSize.x,&newRwin->m_defaultSize.y);
 	m_resizerWindowsList.push_back(newRwin);
 	return newRwin;
-}	
+}
 void ControlBarResizer::sizeWindowsDefault( void )
 {
 	ResizerWindowList::iterator it = m_resizerWindowsList.begin();
@@ -173,15 +173,15 @@ void ControlBarResizer::sizeWindowsDefault( void )
 		win->winSetPosition(rWin->m_defaultPos.x, rWin->m_defaultPos.y);
 		win->winSetSize(rWin->m_defaultSize.x, rWin->m_defaultSize.y);
 		DEBUG_LOG(("sizeWindowsDefault:%s pos X:%d pos Y: %d size X:%d sizeY: %d",rWin->m_name.str(),rWin->m_defaultPos.x, rWin->m_defaultPos.y,rWin->m_defaultSize.x, rWin->m_defaultSize.y ));
-		it ++;	
+		it ++;
 	}
 }
 void ControlBarResizer::sizeWindowsAlt( void )
 {
 	ResizerWindowList::iterator it = m_resizerWindowsList.begin();
 	GameWindow *win = NULL;
-	Real x = (Real)TheDisplay->getWidth() / 800;
-	Real y = (Real)TheDisplay->getHeight() / 600;
+	Real x = (Real)TheDisplay->getWidth() / DEFAULT_DISPLAY_WIDTH;
+	Real y = (Real)TheDisplay->getHeight() / DEFAULT_DISPLAY_HEIGHT;
 	while (it != m_resizerWindowsList.end())
 	{
 		ResizerWindow *rWin = *it;
@@ -197,12 +197,12 @@ void ControlBarResizer::sizeWindowsAlt( void )
 			it++;
 			continue;
 		}
-		
+
 		win->winSetPosition(rWin->m_altPos.x * x, rWin->m_altPos.y * y);
 		if(rWin->m_altSize.x >0 || rWin->m_altSize.y > 0)
 			win->winSetSize(rWin->m_altSize.x *x, rWin->m_altSize.y *y);
 		DEBUG_LOG(("sizeWindowsAlt:%s pos X:%d pos Y: %d size X:%d sizeY: %d",rWin->m_name.str(), rWin->m_altPos.x*x, rWin->m_altPos.y*y,rWin->m_altSize.x*x, rWin->m_altSize.y *y));
-		it ++;	
+		it ++;
 	}
 }
 
@@ -214,7 +214,7 @@ void INI::parseControlBarResizerDefinition( INI* ini )
 //
 //	// read the name
 //	const char* c = ini->getNextToken();
-//	name.set( c );	
+//	name.set( c );
 //
 ////	ControlBarResizer *resizer = TheControlBar->getControlBarResizer();
 //	if( !resizer )
@@ -228,7 +228,7 @@ void INI::parseControlBarResizerDefinition( INI* ini )
 //
 //		// image not found, create a new one
 //		rWin = resizer->newResizerWindow(name);
-//		DEBUG_ASSERTCRASH( rWin, ("parseControlBarResizerDefinition: unable to allocate ResizerWindow for '%s'\n",
+//		DEBUG_ASSERTCRASH( rWin, ("parseControlBarResizerDefinition: unable to allocate ResizerWindow for '%s'",
 //															name.str()) );
 //
 //	}  // end if
@@ -236,7 +236,7 @@ void INI::parseControlBarResizerDefinition( INI* ini )
 //	// parse the ini definition
 //	ini->initFromINI( rWin, resizer->getFieldParse());
 //
-}  // end parseMappedImage
+}
 
 
 //-----------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
index 423ea8559a7..949284420c6 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarScheme.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Apr 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ControlBarScheme.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Contains all the Command bar goodness in terms of how it looks
 //						For instrucitons on how to use, please see it's .h file
 //
@@ -51,7 +51,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerTemplate.h"
@@ -62,11 +62,6 @@
 #include "GameClient/Image.h"
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/GadgetPushButton.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -75,7 +70,7 @@ enum{
 	COMMAND_BAR_SIZE_OFFSET = 0
 };
 
-const FieldParse ControlBarSchemeManager::m_controlBarSchemeFieldParseTable[] = 
+const FieldParse ControlBarSchemeManager::m_controlBarSchemeFieldParseTable[] =
 {
 
 	{ "ImagePart",						ControlBarSchemeManager::parseImagePart,			NULL, NULL },
@@ -160,16 +155,17 @@ const FieldParse ControlBarSchemeManager::m_controlBarSchemeFieldParseTable[] =
 	{ "CommandMarkerImage",		INI::parseMappedImage,				NULL, offsetof( ControlBarScheme, m_commandMarkerImage) },
 	{ "ExpBarForegroundImage",		INI::parseMappedImage,				NULL, offsetof( ControlBarScheme, m_expBarForeground) },
 
-	{ NULL,										NULL,													NULL, 0 }  // keep this last
+	{ NULL,										NULL,													NULL, 0 }
 
 };
 
 // used to parse the anim types that each animation part of a scheme can have
-static const LookupListRec AnimTypeNames[] = 
+static const LookupListRec AnimTypeNames[] =
 {
 	{ "SLIDE_RIGHT", ControlBarSchemeAnimation::CB_ANIM_SLIDE_RIGHT },
 	{ NULL, 0	}
 };
+static_assert(ARRAY_SIZE(AnimTypeNames) == ControlBarSchemeAnimation::CB_ANIM_MAX + 1, "Incorrect array size");
 
 static void animSlideRight( ControlBarSchemeAnimation *anim );
 
@@ -192,13 +188,8 @@ ControlBarSchemeImage::~ControlBarSchemeImage( void )
 
 ControlBarSchemeAnimation::ControlBarSchemeAnimation( void )
 {
-	// Added by Sadullah Nader
-	// Initializations missing and needed
-	
 	m_animDuration = 0;
 	m_finalPos.x = m_finalPos.y = 0;
-
-	// End Add
 	m_name.clear();
 	m_animType = 0;
 	m_animImage = NULL;
@@ -221,13 +212,11 @@ void ControlBarScheme::reset(void)
 		while (it != m_layer[i].end())
 		{
 			ControlBarSchemeImage *im = *it;
-			if( im )
-				delete im;
-			im = NULL;
-			it ++;	
+			delete im;
+			it ++;
 		}
 		m_layer[i].clear();
-	
+
 	}
 
 
@@ -236,13 +225,8 @@ void ControlBarScheme::reset(void)
 	while (it != m_animations.end())
 	{
 		ControlBarSchemeAnimation *anim = *it;
-		if( anim )
-		{
-			anim->m_animImage = NULL;
-			delete(anim);
-		}
-		anim = NULL;
-		it ++;	
+		delete anim;
+		it ++;
 	}
 	m_animations.clear();
 
@@ -283,7 +267,7 @@ void ControlBarScheme::reset(void)
 
 	m_commandMarkerImage = NULL;
 	m_expBarForeground = NULL;
-		
+
 }
 
 ControlBarScheme::~ControlBarScheme(void)
@@ -312,13 +296,9 @@ ControlBarScheme::ControlBarScheme(void)
 	m_optionsButtonHightlited = NULL;
 	m_optionsButtonPushed = NULL;
 	m_optionsButtonDisabled = NULL;
-	
-	// Added By Sadullah Nader
-	// Initializations needed 
-	
+
 	m_commandBarBorderColor = 0;
-	
-	//
+
 	m_idleWorkerButtonEnable = NULL;
 	m_idleWorkerButtonHightlited = NULL;
 	m_idleWorkerButtonPushed = NULL;
@@ -355,14 +335,13 @@ ControlBarScheme::ControlBarScheme(void)
 	m_uAttackButtonEnable = NULL;
 	m_uAttackButtonHightlited = NULL;
 	m_uAttackButtonPushed = NULL;
-	
+
 	m_genArrow = NULL;
 
 	m_minMaxButtonEnable = NULL;
 	m_minMaxButtonHightlited = NULL;
 	m_minMaxButtonPushed = NULL;
 
-	
 	m_minMaxUL.x = 0;
 	m_minMaxLR.x = 0;
 
@@ -410,10 +389,10 @@ ControlBarScheme::ControlBarScheme(void)
 
 	m_powerBarUL.y = 0;
 	m_powerBarLR.y = 0;
-	
+
 	m_moneyUL.x = 0;
 	m_moneyUL.y = 0;
-	
+
 	m_moneyLR.x = 0;
 	m_moneyLR.y = 0;
 }
@@ -440,16 +419,16 @@ void ControlBarScheme::init(void)
 	resMultiplier.y = TheDisplay->getHeight()/INT_TO_REAL(m_ScreenCreationRes.y);
 
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PopupCommunicator" ) );
-	if(win)	
+	if(win)
 	{
-//		DEBUG_ASSERTCRASH(m_buddyButtonEnable,     ("No enable button image for communicator in scheme %s!\n", m_name.str()));
-//		DEBUG_ASSERTCRASH(m_buddyButtonHightlited, ("No hilite button image for communicator in scheme %s!\n", m_name.str()));
-//		DEBUG_ASSERTCRASH(m_buddyButtonPushed,     ("No pushed button image for communicator in scheme %s!\n", m_name.str()));
+//		DEBUG_ASSERTCRASH(m_buddyButtonEnable,     ("No enable button image for communicator in scheme %s!", m_name.str()));
+//		DEBUG_ASSERTCRASH(m_buddyButtonHightlited, ("No hilite button image for communicator in scheme %s!", m_name.str()));
+//		DEBUG_ASSERTCRASH(m_buddyButtonPushed,     ("No pushed button image for communicator in scheme %s!", m_name.str()));
 		GadgetButtonSetEnabledImage(win, m_buddyButtonEnable);
 		GadgetButtonSetHiliteImage(win, m_buddyButtonHightlited);
 		GadgetButtonSetHiliteSelectedImage(win, m_buddyButtonPushed);
 		GadgetButtonSetDisabledImage(win, m_buddyButtonDisabled);
-		
+
 		Int x, y;
 		GameWindow* parent =win->winGetParent();
 		if(parent)
@@ -468,13 +447,13 @@ void ControlBarScheme::init(void)
 		win->winSetSize((m_chatLR.x - m_chatUL.x)*resMultiplier.x + COMMAND_BAR_SIZE_OFFSET,(m_chatLR.y - m_chatUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET);
 	}
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonIdleWorker" ) );
-	if(win)	
+	if(win)
 	{
 		GadgetButtonSetEnabledImage(win, m_idleWorkerButtonEnable);
 		GadgetButtonSetHiliteImage(win, m_idleWorkerButtonHightlited);
 		GadgetButtonSetHiliteSelectedImage(win, m_idleWorkerButtonPushed);
 		GadgetButtonSetDisabledImage(win, m_idleWorkerButtonDisabled);
-		
+
 		Int x, y;
 		GameWindow* parent =win->winGetParent();
 		if(parent)
@@ -490,17 +469,17 @@ void ControlBarScheme::init(void)
 			y = m_workerUL.y * resMultiplier.y;
 		}
 		win->winSetPosition(x,y );
-		
+
 		win->winSetSize((m_workerLR.x - m_workerUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_workerLR.y - m_workerUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET);
 
 	}
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ExpBarForeground" ) );
-	if(win)	
+	if(win)
 	{
 		win->winSetEnabledImage(0, m_expBarForeground);
 	}
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonOptions" ) );
-	if(win)	
+	if(win)
 	{
 		GadgetButtonSetEnabledImage(win, m_optionsButtonEnable);
 		GadgetButtonSetHiliteImage(win, m_optionsButtonHightlited);
@@ -524,7 +503,7 @@ void ControlBarScheme::init(void)
 		win->winSetSize((m_optionsLR.x - m_optionsUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_optionsLR.y - m_optionsUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET);
 	}
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonPlaceBeacon" ) );
-	if(win)	
+	if(win)
 	{
 		GadgetButtonSetEnabledImage(win, m_beaconButtonEnable);
 		GadgetButtonSetHiliteImage(win, m_beaconButtonHightlited);
@@ -548,9 +527,9 @@ void ControlBarScheme::init(void)
 		win->winSetPosition(x,y );
 		win->winSetSize((m_beaconLR.x - m_beaconUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_beaconLR.y - m_beaconUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET);
 	}
-	
+
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:MoneyDisplay" ) );
-	if(win)	
+	if(win)
 	{
 
 		Int x, y;
@@ -572,7 +551,7 @@ void ControlBarScheme::init(void)
 	}
 
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PowerWindow" ) );
-	if(win)	
+	if(win)
 	{
 
 		Int x, y;
@@ -591,11 +570,11 @@ void ControlBarScheme::init(void)
 		}
 		win->winSetPosition(x,y );
 		win->winSetSize((m_powerBarLR.x - m_powerBarUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_powerBarLR.y - m_powerBarUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET);
-		DEBUG_LOG(("Power Bar UL X:%d Y:%d LR X:%d Y:%d size X:%d Y:%d\n",m_powerBarUL.x, m_powerBarUL.y,m_powerBarLR.x, m_powerBarLR.y, (m_powerBarLR.x - m_powerBarUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_powerBarLR.y - m_powerBarUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET  ));
-	}	
+		DEBUG_LOG(("Power Bar UL X:%d Y:%d LR X:%d Y:%d size X:%d Y:%d",m_powerBarUL.x, m_powerBarUL.y,m_powerBarLR.x, m_powerBarLR.y, (m_powerBarLR.x - m_powerBarUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_powerBarLR.y - m_powerBarUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET  ));
+	}
 
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonGeneral" ) );
-	if(win)	
+	if(win)
 	{
 
 		GadgetButtonSetEnabledImage(win, m_generalButtonEnable);
@@ -620,15 +599,15 @@ void ControlBarScheme::init(void)
 		win->winSetPosition(x,y );
 		win->winSetSize((m_generalLR.x - m_generalUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_generalLR.y - m_generalUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET);
 	}
-	
+
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonLarge" ) );
-	if(win)	
+	if(win)
 	{
 		// The images are set above
 //		GadgetButtonSetEnabledImage(win, m_minMaxButtonEnable);
 //		GadgetButtonSetHiliteImage(win, m_minMaxButtonHightlited);
 //		GadgetButtonSetHiliteSelectedImage(win, m_minMaxButtonPushed);
-	
+
 				Int x, y;
 		GameWindow* parent =win->winGetParent();
 		if(parent)
@@ -646,13 +625,13 @@ void ControlBarScheme::init(void)
 		win->winSetPosition(x,y );
 		win->winSetSize((m_minMaxLR.x - m_minMaxUL.x)*resMultiplier.x + COMMAND_BAR_SIZE_OFFSET,(m_minMaxLR.y - m_minMaxUL.y)*resMultiplier.y + COMMAND_BAR_SIZE_OFFSET);
 	}
-	
+
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:WinUAttack" ) );
-	if(win)	
+	if(win)
 	{
 		win->winSetEnabledImage(0,m_uAttackButtonEnable);
 		win->winSetDisabledImage(0,m_uAttackButtonHightlited);
-		
+
 		Int x, y;
 		GameWindow* parent =win->winGetParent();
 		if(parent)
@@ -679,11 +658,11 @@ void ControlBarScheme::addAnimation( ControlBarSchemeAnimation *schemeAnim )
 {
 	if( !schemeAnim )
 	{
-		DEBUG_ASSERTCRASH(FALSE,("Trying to add a null animation to the controlbarscheme\n"));
+		DEBUG_ASSERTCRASH(FALSE,("Trying to add a null animation to the controlbarscheme"));
 		return;
 	}
 	m_animations.push_back( schemeAnim );
-}// addAnimation
+}
 
 //
 // Add an image to the proper layer list
@@ -692,20 +671,20 @@ void ControlBarScheme::addImage( ControlBarSchemeImage *schemeImage )
 {
 	if( !schemeImage )
 	{
-		DEBUG_ASSERTCRASH(FALSE,("Trying to add a null image to the controlbarscheme\n"));
+		DEBUG_ASSERTCRASH(FALSE,("Trying to add a null image to the controlbarscheme"));
 		return;
 	}
 
 	if(schemeImage->m_layer < 0 || schemeImage->m_layer >= MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS)
 	{
-		DEBUG_ASSERTCRASH(FALSE,("SchemeImage %s attempted to be added to layer %d which is not Between to %d, %d\n",
+		DEBUG_ASSERTCRASH(FALSE,("SchemeImage %s attempted to be added to layer %d which is not Between to %d, %d",
 								 schemeImage->m_name.str(), schemeImage->m_layer, 0, MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS));
 		// bring the foobar to the front so we make it obvious that something's wrong
 		schemeImage->m_layer = 0;
 	}
 
 	m_layer[schemeImage->m_layer].push_back(schemeImage);
-}// addImage
+}
 
 //
 // Update the position of the image that's animating
@@ -732,7 +711,7 @@ void ControlBarScheme::updateAnim (ControlBarSchemeAnimation * anim)
 void ControlBarScheme::update( void )
 {
 	ControlBarSchemeAnimationList::iterator it = m_animations.begin();
-	
+
 	while (it != m_animations.end())
 	{
 		ControlBarSchemeAnimation *anim = *it;
@@ -742,9 +721,9 @@ void ControlBarScheme::update( void )
 			return;
 		}
 		updateAnim( anim );
-		it ++;	
+		it ++;
 	}
-	
+
 }
 
 //
@@ -756,7 +735,7 @@ void ControlBarScheme::drawForeground( Coord2D multi, ICoord2D offset )
 	{
 		ControlBarSchemeImageList::iterator it = m_layer[i].begin();
 		while (it != m_layer[i].end())
-		{	
+		{
 			ControlBarSchemeImage *schemeImage = *it;
 			if( !schemeImage )
 			{
@@ -764,21 +743,21 @@ void ControlBarScheme::drawForeground( Coord2D multi, ICoord2D offset )
 				it++;
 				continue;
 			}
-			
+
 			// if we dont' have an image, don't try to draw it
 			if(!schemeImage->m_image)
 			{
 				it++;
 				continue;
 			}
-			
+
 			// draw the image
 			TheDisplay->drawImage(schemeImage->m_image, schemeImage->m_position.x * multi.x + offset.x,
-														schemeImage->m_position.y * multi.y + offset.y, 
+														schemeImage->m_position.y * multi.y + offset.y,
 														(schemeImage->m_position.x + schemeImage->m_size.x) * multi.x + offset.x,
 														(schemeImage->m_position.y + schemeImage->m_size.y) * multi.y + offset.y);
-			
-			it ++;	
+
+			it ++;
 		}
 	}
 }
@@ -788,12 +767,12 @@ void ControlBarScheme::drawForeground( Coord2D multi, ICoord2D offset )
 //-----------------------------------------------------------------------------
 void ControlBarScheme::drawBackground( Coord2D multi, ICoord2D offset )
 {
-	
+
 	for(Int i = MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS - 1; i >= CONTROL_BAR_SCHEME_FOREGROUND_IMAGE_LAYERS; i--)
 	{
 		ControlBarSchemeImageList::iterator it = m_layer[i].begin();
 		while (it != m_layer[i].end())
-		{	
+		{
 			ControlBarSchemeImage *schemeImage = *it;
 			if( !schemeImage )
 			{
@@ -801,21 +780,21 @@ void ControlBarScheme::drawBackground( Coord2D multi, ICoord2D offset )
 				it++;
 				continue;
 			}
-			
+
 			// if we don't have an image, don't try to draw it
 			if(!schemeImage->m_image)
 			{
 				it++;
 				continue;
 			}
-			
+
 			// draw it
 			TheDisplay->drawImage(schemeImage->m_image, schemeImage->m_position.x * multi.x + offset.x,
-														schemeImage->m_position.y * multi.y + offset.y, 
+														schemeImage->m_position.y * multi.y + offset.y,
 														(schemeImage->m_position.x + schemeImage->m_size.x) * multi.x + offset.x,
 														(schemeImage->m_position.y + schemeImage->m_size.y) * multi.y + offset.y);
-			
-			it ++;	
+
+			it ++;
 		}
 	}
 }
@@ -842,10 +821,8 @@ ControlBarSchemeManager::~ControlBarSchemeManager( void )
 	while (it != m_schemeList.end())
 	{
 		ControlBarScheme *CBScheme = *it;
-		if( CBScheme )
-			delete CBScheme;
-		CBScheme = NULL;
-		it ++;	
+		delete CBScheme;
+		it ++;
 	}
 	m_schemeList.clear();
 	m_currentScheme = NULL;
@@ -857,13 +834,13 @@ ControlBarSchemeManager::~ControlBarSchemeManager( void )
 //-----------------------------------------------------------------------------
 void ControlBarSchemeManager::parseImagePart(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Position",				INI::parseICoord2D,				NULL, offsetof( ControlBarSchemeImage, m_position ) },
 			{ "Size",						INI::parseICoord2D,				NULL, offsetof( ControlBarSchemeImage, m_size ) },
       { "ImageName",			INI::parseMappedImage,		NULL, offsetof( ControlBarSchemeImage, m_image ) },
 			{ "Layer",					INI::parseInt,						NULL, offsetof( ControlBarSchemeImage, m_layer ) },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
 	ControlBarSchemeImage *schemeImage = NEW ControlBarSchemeImage;
@@ -877,13 +854,13 @@ void ControlBarSchemeManager::parseImagePart(INI *ini, void *instance, void* /*s
 //-----------------------------------------------------------------------------
 void ControlBarSchemeManager::parseAnimatingPartImage(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Position",				INI::parseICoord2D,				NULL, offsetof( ControlBarSchemeImage, m_position ) },
 			{ "Size",						INI::parseICoord2D,				NULL, offsetof( ControlBarSchemeImage, m_size ) },
       { "ImageName",			INI::parseMappedImage,		NULL, offsetof( ControlBarSchemeImage, m_image ) },
 			{ "Layer",					INI::parseInt,						NULL, offsetof( ControlBarSchemeImage, m_layer ) },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
 	ControlBarSchemeImage *schemeImage = NEW ControlBarSchemeImage;
@@ -897,16 +874,16 @@ void ControlBarSchemeManager::parseAnimatingPartImage(INI *ini, void *instance,
 //-----------------------------------------------------------------------------
 void ControlBarSchemeManager::parseAnimatingPart(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Name",						INI::parseAsciiString,		NULL, offsetof( ControlBarSchemeAnimation, m_name ) },
       { "Animation",			INI::parseLookupList,			AnimTypeNames, offsetof( ControlBarSchemeAnimation, m_animType ) },
 			{ "Duration",				INI::parseDurationUnsignedInt,			NULL, offsetof( ControlBarSchemeAnimation, m_animDuration ) },
 			{ "FinalPos",				INI::parseICoord2D,			NULL, offsetof( ControlBarSchemeAnimation, m_finalPos ) },
 			{ "ImagePart",			ControlBarSchemeManager::parseAnimatingPartImage,	NULL, NULL },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
-	
+
 	ControlBarSchemeAnimation *schemeAnim = NEW ControlBarSchemeAnimation;
 	ini->initFromINI(schemeAnim, myFieldParse);
 	((ControlBarScheme*)instance)->addAnimation(schemeAnim);
@@ -926,7 +903,7 @@ ControlBarScheme *ControlBarSchemeManager::newControlBarScheme( AsciiString name
 		cbScheme->reset();
 		cbScheme->m_name.set( name );
 		cbScheme->m_name.toLower();
-		return cbScheme;		
+		return cbScheme;
 	}
 
 	cbScheme = NEW ControlBarScheme;
@@ -941,7 +918,7 @@ ControlBarScheme *ControlBarSchemeManager::newControlBarScheme( AsciiString name
 	cbScheme->m_name.toLower();
 
 	m_schemeList.push_back(cbScheme);
-		
+
 	return cbScheme;
 }
 
@@ -951,7 +928,7 @@ ControlBarScheme *ControlBarSchemeManager::newControlBarScheme( AsciiString name
 ControlBarScheme *ControlBarSchemeManager::findControlBarScheme( AsciiString name )
 {
 	name.toLower();
-	
+
 	ControlBarSchemeList::iterator it = m_schemeList.begin();
 
 	// iterate through the list and return the scheme that we're looking for
@@ -965,7 +942,7 @@ ControlBarScheme *ControlBarSchemeManager::findControlBarScheme( AsciiString nam
 		}
 		if(CBScheme->m_name.compareNoCase( name ) == 0)
 			return CBScheme;
-		it ++;	
+		it ++;
 	}
 	return NULL;
 }
@@ -991,7 +968,7 @@ void ControlBarSchemeManager::preloadAssets( TimeOfDay timeOfDay )
 
 		if (CBScheme->m_rightHUDImage)
 		{
-			TheDisplay->preloadTextureAssets(CBScheme->m_buttonQueueImage->getFilename());
+			TheDisplay->preloadTextureAssets(CBScheme->m_rightHUDImage->getFilename());
 		}
 
 		for (Int layer = 0; layer < MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS; ++layer)
@@ -1020,19 +997,19 @@ void ControlBarSchemeManager::init( void )
 
 	INI ini;
 	// Read from INI all the ControlBarSchemes
-	ini.load( AsciiString( "Data\\INI\\Default\\ControlBarScheme.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\ControlBarScheme.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\ControlBarScheme", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\ControlBarScheme", INI_LOAD_OVERWRITE, NULL );
 
 //	//Load the user modified control bar schemes
 //	WIN32_FIND_DATA findData;
 //	AsciiString userDataPath;
 //	if(TheGlobalData)
 //	{
-//		userDataPath.format("%sINI\\ControlBarScheme.ini",TheGlobalData->getPath_UserData().str());
+//		userDataPath.format("%sINI\\ControlBarScheme",TheGlobalData->getPath_UserData().str());
 //		if	(FindFirstFile(userDataPath.str(), &findData) !=INVALID_HANDLE_VALUE)
-//			ini.load(userDataPath,  INI_LOAD_OVERWRITE, NULL );
+//			ini.loadFileDirectory(userDataPath,  INI_LOAD_OVERWRITE, NULL );
 //	}
-	if( m_schemeList.size() <= 0 )
+	if( m_schemeList.empty() )
 	{
 		DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList that was just read from the INI file"));
 		return;
@@ -1068,20 +1045,20 @@ void ControlBarSchemeManager::setControlBarScheme(AsciiString schemeName)
 //-----------------------------------------------------------------------------
 void ControlBarSchemeManager::update( void )
 {
-	if(m_currentScheme)	
+	if(m_currentScheme)
 		m_currentScheme->update();
 }
 
 //-----------------------------------------------------------------------------
 void ControlBarSchemeManager::drawForeground( ICoord2D offset )
 {
-	if(m_currentScheme)	
+	if(m_currentScheme)
 		m_currentScheme->drawForeground( m_multiplyer, offset);
 }
 //-----------------------------------------------------------------------------
 void ControlBarSchemeManager::drawBackground( ICoord2D offset )
 {
-	if(m_currentScheme)	
+	if(m_currentScheme)
 		m_currentScheme->drawBackground( m_multiplyer, offset );
 }
 
@@ -1097,18 +1074,18 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayerTemplate( const PlayerT
 	{
 		m_currentScheme->init();
 
-		DEBUG_LOG(("setControlBarSchemeByPlayer already is using %s as its side\n", side.str()));
+		DEBUG_LOG(("setControlBarSchemeByPlayer already is using %s as its side", side.str()));
 		return;
 	}
 
 	// if we don't have a side, set it to Observer shell
 	if(side.isEmpty())
 		side.set("Observer");
-	DEBUG_LOG(("setControlBarSchemeByPlayer used %s as its side\n", side.str()));
+	DEBUG_LOG(("setControlBarSchemeByPlayer used %s as its side", side.str()));
 	ControlBarScheme *tempScheme = NULL;
 
 	ControlBarSchemeList::iterator it = m_schemeList.begin();
-	
+
 	// iterate through the list and return the scheme that we're looking for
 	while (it != m_schemeList.end())
 	{
@@ -1122,13 +1099,13 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayerTemplate( const PlayerT
 		// find the scheme that best matches our resolution
 		if(CBScheme->m_side.compareNoCase( side ) == 0)
 		{
-		
+
 			if((!tempScheme || tempScheme->m_ScreenCreationRes.x < CBScheme->m_ScreenCreationRes.x) )//&& TheDisplay->getWidth() >= CBScheme->m_ScreenCreationRes.x )
 				tempScheme = CBScheme;
 		}
-		it ++;	
+		it ++;
 	}
-	
+
 	if(tempScheme)
 	{
 		// setup the multiplyer value
@@ -1165,18 +1142,18 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayer(Player *p)
 	{
 		m_currentScheme->init();
 
-		DEBUG_LOG(("setControlBarSchemeByPlayer already is using %s as its side\n", side.str()));
+		DEBUG_LOG(("setControlBarSchemeByPlayer already is using %s as its side", side.str()));
 		return;
 	}
 
 	// if we don't have a side, set it to Observer shell
 	if(side.isEmpty())
 		side.set("Observer");
-	DEBUG_LOG(("setControlBarSchemeByPlayer used %s as its side\n", side.str()));
+	DEBUG_LOG(("setControlBarSchemeByPlayer used %s as its side", side.str()));
 	ControlBarScheme *tempScheme = NULL;
 
 	ControlBarSchemeList::iterator it = m_schemeList.begin();
-	
+
 	// iterate through the list and return the scheme that we're looking for
 	while (it != m_schemeList.end())
 	{
@@ -1190,13 +1167,13 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayer(Player *p)
 		// find the scheme that best matches our resolution
 		if(CBScheme->m_side.compareNoCase( side ) == 0)
 		{
-		
+
 			if((!tempScheme || tempScheme->m_ScreenCreationRes.x < CBScheme->m_ScreenCreationRes.x) )//&& TheDisplay->getWidth() >= CBScheme->m_ScreenCreationRes.x )
 				tempScheme = CBScheme;
 		}
-		it ++;	
+		it ++;
 	}
-	
+
 	if(tempScheme)
 	{
 		// setup the multiplyer value
@@ -1213,7 +1190,7 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayer(Player *p)
 	}
 	if(m_currentScheme)
 		m_currentScheme->init();
-}	
+}
 
 
 //-----------------------------------------------------------------------------
@@ -1241,9 +1218,9 @@ static void animSlideRight( ControlBarSchemeAnimation *anim )
 		startPos.y = anim->m_animImage->m_position.y;
 		anim->setStartPos(startPos);
 	}
-	
+
 	// now lets animate this bad boy!
-	
+
 	// now increment the frame
 	currentFrame++;
 	anim->setCurrentFrame(currentFrame);
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
index 35ecaadc074..0dd9f43c16f 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/NameKeyGenerator.h"
 #include "Common/ThingTemplate.h"
@@ -44,11 +44,6 @@
 #include "GameClient/GadgetPushButton.h"
 #include "GameClient/HotKey.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define STOP_ID			10
 #define EVACUATE_ID	11
@@ -66,27 +61,27 @@ struct PopulateButtonInfo
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void ControlBar::populateButtonProc( Object *obj, void *userData )
-{	
+{
 	PopulateButtonInfo* info = (PopulateButtonInfo*)userData;
 
 	// sanity
-	DEBUG_ASSERTCRASH( info->buttonIndex < MAX_STRUCTURE_INVENTORY_BUTTONS, 
+	DEBUG_ASSERTCRASH( info->buttonIndex < MAX_STRUCTURE_INVENTORY_BUTTONS,
 										 ("Too many objects inside '%s' for the inventory buttons to hold",
 											info->source->getTemplate()->getName().str()) );
 
 	// put object in inventory data
 	info->self->m_containData[ info->buttonIndex ].control = info->inventoryButtons[ info->buttonIndex ];
 	info->self->m_containData[ info->buttonIndex ].objectID = obj->getID();
-	
+
 	// set the UI button that will allow us to press it and cause the object to exit the container
 	const Image *image;
 	image = obj->getTemplate()->getButtonImage();
 	GadgetButtonSetEnabledImage( info->inventoryButtons[ info->buttonIndex ], image );
-	
+
 	//Show the auto-contained object's veterancy symbol!
 	image = calculateVeterancyOverlayForObject( obj );
 	GadgetButtonDrawOverlayImage( info->inventoryButtons[ info->buttonIndex ], image );
-	
+
 	// Enable the button
 	info->inventoryButtons[ info->buttonIndex ]->winEnable( TRUE );
 
@@ -112,7 +107,7 @@ void ControlBar::populateStructureInventory( Object *building )
 
 	// get the contain module of the object
 	ContainModuleInterface *contain = building->getContain();
-	DEBUG_ASSERTCRASH( contain, ("Object in structure inventory does not contain a Contain Module\n") );
+	DEBUG_ASSERTCRASH( contain, ("Object in structure inventory does not contain a Contain Module") );
 	if (!contain)
 		return;
 
@@ -158,7 +153,7 @@ void ControlBar::populateStructureInventory( Object *building )
 			m_commandWindows[ i ]->winHide( TRUE );
 
 
-	}  // end for i
+	}
 
 	// show the window
 	m_commandWindows[ EVACUATE_ID ]->winHide( FALSE );
@@ -188,7 +183,7 @@ void ControlBar::populateStructureInventory( Object *building )
 	//
 	m_lastRecordedInventoryCount = contain->getContainCount();
 
-}  // end populateStructureInventory
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -202,7 +197,7 @@ void ControlBar::updateContextStructureInventory( void )
 	// in that case we want to unselect the building so that we can't see the contents
 	//
 	Player *localPlayer = ThePlayerList->getLocalPlayer();
-	if( source->isLocallyControlled() == FALSE && 
+	if( source->isLocallyControlled() == FALSE &&
 			localPlayer->getRelationship( source->getTeam() ) != NEUTRAL )
 	{
 		Drawable *draw = source->getDrawable();
@@ -211,19 +206,19 @@ void ControlBar::updateContextStructureInventory( void )
 			TheInGameUI->deselectDrawable( draw );
 		return;
 
-	}  // end if
+	}
 
 	//
 	// if the object being displayed in the interface has a different count than we last knew
 	// about we need to repopulate the buttons of the interface
 	//
 	ContainModuleInterface *contain = source->getContain();
-	DEBUG_ASSERTCRASH( contain, ("No contain module defined for object in the iventory bar\n") );
+	DEBUG_ASSERTCRASH( contain, ("No contain module defined for object in the iventory bar") );
 	if (!contain)
 		return;
 
 	if( m_lastRecordedInventoryCount != contain->getContainCount() )
 		populateStructureInventory( source );
 
-}  // end updateContextStructureInventory
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
index 1b42b8ff000..c7a37c23af5 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/NameKeyGenerator.h"
 #include "Common/ThingTemplate.h"
@@ -52,17 +52,17 @@ void ControlBar::updateConstructionTextDisplay( Object *obj )
 	GameWindow *descWindow = TheWindowManager->winGetWindowFromId( NULL, descID );
 
 	// santiy
-	DEBUG_ASSERTCRASH( descWindow, ("Under construction window not found\n") );
+	DEBUG_ASSERTCRASH( descWindow, ("Under construction window not found") );
 
 	// format the message
-	text.format( TheGameText->fetch( "CONTROLBAR:UnderConstructionDesc" ), 
+	text.format( TheGameText->fetch( "CONTROLBAR:UnderConstructionDesc" ),
 							 obj->getConstructionPercent() );
 	GadgetStaticTextSetText( descWindow, text );
 
 	// record this as the last percentage displayed
 	m_displayedConstructPercent = obj->getConstructionPercent();
 
-}  // end updateConstructionTextDisplay
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Populate the interface for an under construction context. */
@@ -86,7 +86,7 @@ void ControlBar::populateUnderConstruction( Object *objectUnderConstruction )
 
 	setControlCommand( win, commandButton );
 	win->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
-	
+
 	// set the text description of what is building
 	updateConstructionTextDisplay( objectUnderConstruction );
 
@@ -99,7 +99,7 @@ void ControlBar::populateUnderConstruction( Object *objectUnderConstruction )
 		showRallyPoint( exit->getRallyPoint() );
 
 
-}  // end populateUnderConstruction
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -114,10 +114,10 @@ void ControlBar::updateContextUnderConstruction( void )
 		evaluateContextUI();
 		return;
 
-	}  // end if
+	}
 
 	// if the construction percent has changed since what was last shown to the user update the text
 	if( m_displayedConstructPercent != obj->getConstructionPercent() )
 		updateConstructionTextDisplay( obj );
 
-}  // end updatecontextUnderConstruction
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp
index c3bd8627f89..293a5b36ae4 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/DisconnectMenu.h"
 #include "GameClient/GUICallbacks.h"
@@ -35,7 +35,7 @@
 #include "GameNetwork/GameInfo.h"
 #include "GameNetwork/NetworkInterface.h"
 
-const char *DisconnectMenu::m_playerNameTextControlNames[] = {
+const char *const DisconnectMenu::m_playerNameTextControlNames[] = {
 	"DisconnectScreen.wnd:StaticPlayer1Name",
 	"DisconnectScreen.wnd:StaticPlayer2Name",
 	"DisconnectScreen.wnd:StaticPlayer3Name",
@@ -46,7 +46,7 @@ const char *DisconnectMenu::m_playerNameTextControlNames[] = {
 	NULL
 };
 
-const char *DisconnectMenu::m_playerTimeoutTextControlNames[] = {
+const char *const DisconnectMenu::m_playerTimeoutTextControlNames[] = {
 	"DisconnectScreen.wnd:StaticPlayer1Timeout",
 	"DisconnectScreen.wnd:StaticPlayer2Timeout",
 	"DisconnectScreen.wnd:StaticPlayer3Timeout",
@@ -57,7 +57,7 @@ const char *DisconnectMenu::m_playerTimeoutTextControlNames[] = {
 	NULL
 };
 
-const char *DisconnectMenu::m_playerVoteButtonControlNames[] = {
+const char *const DisconnectMenu::m_playerVoteButtonControlNames[] = {
 	"DisconnectScreen.wnd:ButtonKickPlayer1",
 	"DisconnectScreen.wnd:ButtonKickPlayer2",
 	"DisconnectScreen.wnd:ButtonKickPlayer3",
@@ -68,7 +68,7 @@ const char *DisconnectMenu::m_playerVoteButtonControlNames[] = {
 	NULL
 };
 
-const char *DisconnectMenu::m_playerVoteCountControlNames[] = {
+const char *const DisconnectMenu::m_playerVoteCountControlNames[] = {
 	"DisconnectScreen.wnd:StaticPlayer1Votes",
 	"DisconnectScreen.wnd:StaticPlayer2Votes",
 	"DisconnectScreen.wnd:StaticPlayer3Votes",
@@ -79,9 +79,9 @@ const char *DisconnectMenu::m_playerVoteCountControlNames[] = {
 	NULL
 };
 
-const char *DisconnectMenu::m_packetRouterTimeoutControlName = "DisconnectScreen.wnd:StaticPacketRouterTimeout";
-const char *DisconnectMenu::m_packetRouterTimeoutLabelControlName = "DisconnectScreen.wnd:StaticPacketRouterTimeoutLabel";
-const char *DisconnectMenu::m_textDisplayControlName = "DisconnectScreen.wnd:ListboxTextDisplay";
+const char *const DisconnectMenu::m_packetRouterTimeoutControlName = "DisconnectScreen.wnd:StaticPacketRouterTimeout";
+const char *const DisconnectMenu::m_packetRouterTimeoutLabelControlName = "DisconnectScreen.wnd:StaticPacketRouterTimeoutLabel";
+const char *const DisconnectMenu::m_textDisplayControlName = "DisconnectScreen.wnd:ListboxTextDisplay";
 
 static const Color chatNormalColor =  GameMakeColor(255,0,0,255);
 
@@ -122,7 +122,7 @@ void DisconnectMenu::setPlayerName(Int playerNum, UnicodeString name) {
 	GameWindow *control = TheWindowManager->winGetWindowFromId(NULL, id);
 
 	if (control != NULL) {
-		if (name.getLength() > 0) {
+		if (!name.isEmpty()) {
 			GadgetStaticTextSetText(control, name);
 //			showPlayerControls(playerNum);
 		}
@@ -132,12 +132,12 @@ void DisconnectMenu::setPlayerName(Int playerNum, UnicodeString name) {
 	control = TheWindowManager->winGetWindowFromId(NULL, id);
 
 	if (control != NULL) {
-		if (name.getLength() > 0) {
-			GadgetStaticTextSetText(control, UnicodeString(L""));
+		if (!name.isEmpty()) {
+			GadgetStaticTextSetText(control, L"");
 		}
 	}
 
-	if (name.getLength() > 0) {
+	if (!name.isEmpty()) {
 		showPlayerControls(playerNum);
 	} else {
 		hidePlayerControls(playerNum);
@@ -241,7 +241,7 @@ void DisconnectMenu::showPacketRouterTimeout() {
 	control = TheWindowManager->winGetWindowFromId(NULL, id);
 
 	if (control != NULL) {
-		GadgetStaticTextSetText(control, UnicodeString(L"")); // start it off with a blank string.
+		GadgetStaticTextSetText(control, L""); // start it off with a blank string.
 		control->winHide(FALSE);
 	}
 }
@@ -311,7 +311,7 @@ void DisconnectMenu::removePlayer(Int slot, UnicodeString playerName) {
 }
 
 void DisconnectMenu::voteForPlayer(Int slot) {
-	DEBUG_LOG(("Casting vote for disconnect slot %d\n", slot));
+	DEBUG_LOG(("Casting vote for disconnect slot %d", slot));
 	TheNetwork->voteForPlayerDisconnect(slot); // Do this next.
 }
 
@@ -329,4 +329,4 @@ void DisconnectMenu::updateVotes(Int slot, Int votes) {
 
 		GadgetStaticTextSetText(control, unistr);
 	}
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
index bac079ed1fe..650dfd09cb6 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
@@ -24,7 +24,7 @@
 
 //// EstablishConnectionsMenu.cpp /////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GUICallbacks.h"
 #include "GameClient/EstablishConnectionsMenu.h"
@@ -36,7 +36,7 @@
 
 EstablishConnectionsMenu *TheEstablishConnectionsMenu = NULL;
 
-const char *EstablishConnectionsMenu::m_playerReadyControlNames[] = {
+const char *const EstablishConnectionsMenu::m_playerReadyControlNames[] = {
 	"EstablishConnectionsScreen.wnd:ButtonAccept1",
 	"EstablishConnectionsScreen.wnd:ButtonAccept2",
 	"EstablishConnectionsScreen.wnd:ButtonAccept3",
@@ -46,7 +46,7 @@ const char *EstablishConnectionsMenu::m_playerReadyControlNames[] = {
 	"EstablishConnectionsScreen.wnd:ButtonAccept7",
 	NULL};
 
-const char *EstablishConnectionsMenu::m_playerNameControlNames[] = {
+const char *const EstablishConnectionsMenu::m_playerNameControlNames[] = {
 	"EstablishConnectionsScreen.wnd:StaticPlayer1Name",
 	"EstablishConnectionsScreen.wnd:StaticPlayer2Name",
 	"EstablishConnectionsScreen.wnd:StaticPlayer3Name",
@@ -57,7 +57,7 @@ const char *EstablishConnectionsMenu::m_playerNameControlNames[] = {
 	NULL
 };
 
-const char *EstablishConnectionsMenu::m_playerStatusControlNames[] = {
+const char *const EstablishConnectionsMenu::m_playerStatusControlNames[] = {
 	"EstablishConnectionsScreen.wnd:StaticPlayer1Status",
 	"EstablishConnectionsScreen.wnd:StaticPlayer2Status",
 	"EstablishConnectionsScreen.wnd:StaticPlayer3Status",
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
index a19ed13abdd..75704c557da 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
@@ -29,8 +29,9 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/GameUtility.h"
 #include "Common/NameKeyGenerator.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -64,30 +65,26 @@ WindowLayout *popupCommunicatorLayout = NULL;
 WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 																	 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	// get player
-	Player *player = ThePlayerList->getLocalPlayer();
-
 	//
 	// if the player doesn't have a radar, or the radar is hidden, and the radar is not being
 	// forced to on, we just eat input over the radar window
 	//
-	if( !TheRadar->isRadarForced() && (TheRadar->isRadarHidden() || !player->hasRadar()) )
+	if( !rts::localPlayerHasRadar() )
 		return MSG_HANDLED;
-	
-	// If the middle mouse button is depressed, then just let the message fall all the 
+
+	// If the middle mouse button is depressed, then just let the message fall all the
 	// way back to the usual middle mouse button processing.
 	// jkmcd
 	if( TheMouse->getMouseStatus()->middleState == MBS_Down )
 		return MSG_IGNORED;
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		/** @todo
 			This is wrong.  The radar should be in the message stream, and eat all messages and propagate them
-			as a new message with the coords converted to world coords and the message flagged as being from 
-			the radar.  This would let all of the normal processing occur, and allow individual commands to easily 
+			as a new message with the coords converted to world coords and the message flagged as being from
+			the radar.  This would let all of the normal processing occur, and allow individual commands to easily
 			reject being used on the radar.
 		*/
 
@@ -103,7 +100,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 			//
 			Bool targeting = FALSE;
 			const CommandButton *command = TheInGameUI->getGUICommand();
-			if( command 
+			if( command
 					&& (command->getCommandType() == GUI_COMMAND_SPECIAL_POWER || command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_COMMAND_CENTER)
 					&& BitIsSet( command->getOptions(), NEED_TARGET_POS ) )
 				targeting = TRUE;
@@ -113,7 +110,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 				const DrawableList *drawableList = TheInGameUI->getAllSelectedLocalDrawables();
 				Mouse::MouseCursor cur = Mouse::ARROW;
 
-				if (!(drawableList->empty() || msg == GWM_MOUSE_LEAVING)) 
+				if (!(drawableList->empty() || msg == GWM_MOUSE_LEAVING))
 				{
 					if (command && command->getCommandType() == GUI_COMMAND_ATTACK_MOVE)
 					{
@@ -128,7 +125,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 				// Groovy
 				TheMouse->setCursor(cur);
 
-			}  // end if
+			}
 
 			return MSG_HANDLED;
 		}
@@ -152,22 +149,21 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 
 			// is the mouse in the radar window
 			ICoord2D radar;
-			if( (TheRadar->isRadarHidden() == FALSE || TheRadar->isRadarForced()) &&
-					TheRadar->localPixelToRadar( &mouse, &radar ) )
+			if( TheRadar->localPixelToRadar( &mouse, &radar ) )
 			{
 
 /*
 //
-// this is an example piece of code to find the object under the pixel position 
+// this is an example piece of code to find the object under the pixel position
 // of the radar ... should we in the future wish to allow commands to be executed
-// on objects throught he radar.  note tho that this is extremely hard to do because
+// on objects through the radar.  note tho that this is extremely hard to do because
 // the pixels on the radar are very small and it's hard to do accurate targeting
 //
 
 				Object *obj = TheRadar->objectUnderRadarPixel( &mouse );
 				UnicodeString msg;
 				if( obj )
-					msg.format( L"Object under mouse on radar '%S'(%d)", 
+					msg.format( L"Object under mouse on radar '%S'(%d)",
 											obj->getTemplate()->getName().str(), obj->getID() );
 				else
 					msg.format( L"Mouse (%d,%d) in Radar window L(%d,%d)", mouse.x, mouse.y, radar.x, radar.y );
@@ -176,7 +172,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 
 				// keep the cursor for any context commands
 				const CommandButton *command = TheInGameUI->getGUICommand();
-				if( command 
+				if( command
 						&& (command->getCommandType() == GUI_COMMAND_SPECIAL_POWER || command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_COMMAND_CENTER)
 						&& BitIsSet( command->getOptions(), NEED_TARGET_POS ) )
 				{
@@ -187,7 +183,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 					else
 						TheMouse->setCursor( Mouse::CROSS );
 
-				}  // end if
+				}
 				else
 				{
 					// Else we are not super targeting, so we have to try to refresh the move cursor.
@@ -196,7 +192,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 					const DrawableList *drawableList = TheInGameUI->getAllSelectedLocalDrawables();
 					Mouse::MouseCursor cur = Mouse::ARROW;
 
-					if (!(drawableList->empty() || msg == GWM_MOUSE_LEAVING)) 
+					if (!(drawableList->empty() || msg == GWM_MOUSE_LEAVING))
 					{
 						if (command && command->getCommandType() == GUI_COMMAND_ATTACK_MOVE)
 						{
@@ -212,11 +208,11 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 					TheMouse->setCursor(cur);
 				}
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end case mouse position
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_RIGHT_UP:// Here to eat
@@ -238,7 +234,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 			// get mouse position
 			mouse.x = mData1 & 0xFFFF;
 			mouse.y = mData1 >> 16;
-			
+
 			// get window screen position
 			window->winGetScreenPosition( &screenPos.x, &screenPos.y );
 
@@ -252,9 +248,8 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 			// completely drawn with the radar ... so it's just a translation from
 			// our window size we're drawing into to the radar cell size
 			//
-			if( (TheRadar->isRadarHidden() == FALSE || TheRadar->isRadarForced()) &&
-					TheRadar->localPixelToRadar( &mouse, &radar ) &&
-					TheRadar->radarToWorld( &radar, &world ) )
+			if( TheRadar->localPixelToRadar( &mouse, &radar ) &&
+			    TheRadar->radarToWorld( &radar, &world ) )
 			{
 
 				// No drawables, or a right click automatically means its a look at.
@@ -262,10 +257,10 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 				// Having drawables and not being in attack move mode means that we should move.
 
 				const DrawableList *drawableList = TheInGameUI->getAllSelectedLocalDrawables(); // locally-owned only
-				
+
 
  				// see if the user wants to move the tactical view
- 				if (	drawableList->empty() 
+ 				if (	drawableList->empty()
  					||	(! TheGlobalData->m_useAlternateMouse && msg == GWM_RIGHT_DOWN)
  					||	(TheGlobalData->m_useAlternateMouse && msg == GWM_LEFT_DOWN)	)
 				{
@@ -275,16 +270,16 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 
 				// evaluate any special powers that can be executed from the radar
 				const CommandButton *command = TheInGameUI->getGUICommand();
-				if( command 
+				if( command
 					&& (command->getCommandType() == GUI_COMMAND_SPECIAL_POWER || command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_COMMAND_CENTER)
-					&& BitIsSet( command->getOptions(), NEED_TARGET_POS ) 
+					&& BitIsSet( command->getOptions(), NEED_TARGET_POS )
 					)
 				{
 
 					// do the command
 					TheGameClient->evaluateContextCommand( NULL, &world, CommandTranslator::DO_COMMAND );
 
-				}  // end if
+				}
 				else if( command && command->getCommandType() == GUI_COMMAND_ATTACK_MOVE)
 				{
 					// Attack move has changed from a modifier to a command, so it moves up here.
@@ -302,7 +297,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 					// Do the superweapon stuff here, before issuing these other messages
 
 					// GS Leaving commented out to show that isInAttackMoveToMode is NEVER SET.  It's a command now, not a modifier.
-//					if (TheInGameUI->isInAttackMoveToMode()) 
+//					if (TheInGameUI->isInAttackMoveToMode())
 //					{
 //						newMsg = TheMessageStream->appendMessage(GameMessage::MSG_DO_ATTACKMOVETO);
 //						newMsg->appendLocationArgument(world);
@@ -315,26 +310,26 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 					newMsg->appendLocationArgument(world);
 					// Play the unit voice response
 					pickAndPlayUnitVoiceResponse(drawableList, GameMessage::MSG_DO_MOVETO);
-				
-				}  // end else
+
+				}
 
 			}
-			
+
 
 	break;
 
-		}  // end left down
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	TheInGameUI->clearAttackMoveToMode();
 	return MSG_HANDLED;
 
-}  // end LeftHUDInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Input procedure for the control bar */
@@ -345,29 +340,29 @@ WindowMsgHandledType ControlBarInput( GameWindow *window, UnsignedInt msg,
 
 	return MSG_IGNORED;
 
-}  // end ControlBarInput
+}
 void ToggleQuitMenu(void);
 //-------------------------------------------------------------------------------------------------
 /** System callback for the control bar parent */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType ControlBarSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ControlBarSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	static NameKeyType buttonCommunicator = NAMEKEY_INVALID;
 	if(TheScriptEngine && TheScriptEngine->isGameEnding())
 		return MSG_IGNORED;
-	switch( msg ) 
+	switch( msg )
 	{
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
 
 			// get ids for our children controls
-			buttonCommunicator = TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:PopupCommunicator") );
+			buttonCommunicator = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PopupCommunicator" );
 
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_MOUSE_ENTERING:
@@ -431,7 +426,7 @@ WindowMsgHandledType ControlBarSystem( GameWindow *window, UnsignedInt msg,
 			//			{
 			//				TheControlBar->switchControlBarStage( CONTROL_BAR_STAGE_SQUISHED	);
 			//			}
-			
+
 			else if( controlID == buttonLargeID)
 			{
 				TheControlBar->toggleControlBarStage();
@@ -455,7 +450,7 @@ WindowMsgHandledType ControlBarSystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GEM_EDIT_DONE:
@@ -480,17 +475,17 @@ WindowMsgHandledType ControlBarSystem( GameWindow *window, UnsignedInt msg,
 				}
 			}
 			break;
-		} // end edit done
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end ControlBarSystem
+}
 
 extern void showReplayControls( void );
 extern void hideReplayControls( void );
@@ -501,121 +496,114 @@ extern void toggleReplayControls( void );
 //-------------------------------------------------------------------------------------------------
 void ShowControlBar( Bool immediate )
 {
+	if (!TheWindowManager || !TheControlBar)
+		return;
+
 	showReplayControls();
-	if(TheControlBar)
-		TheControlBar->showSpecialPowerShortcut();
-	if (TheWindowManager)
+
+	TheControlBar->showSpecialPowerShortcut();
+
+	Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent");
+	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
+
+	if (window)
 	{
-		Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
-		GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
+		TheControlBar->switchControlBarStage(CONTROL_BAR_STAGE_DEFAULT);
+		TheControlBar->setScaledViewportHeight();
 
-		if (window)
-		{	
-			TheControlBar->switchControlBarStage(CONTROL_BAR_STAGE_DEFAULT);
-			TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f));
-			if (TheControlBar->m_animateWindowManager && !immediate)
-			{
-				TheControlBar->m_animateWindowManager->reset();
-				//TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM_TIMED, TRUE, 1000, 0);
-				TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM, TRUE, 500, 0);
-				TheControlBar->animateSpecialPowerShortcut(TRUE);
-			}
-			window->winHide(FALSE);
+		if (TheControlBar->m_animateWindowManager && !immediate)
+		{
+			TheControlBar->m_animateWindowManager->reset();
+			//TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM_TIMED, TRUE, 1000, 0);
+			TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM, TRUE, 500, 0);
+			TheControlBar->animateSpecialPowerShortcut(TRUE);
 		}
 
-	}  
+		window->winHide(FALSE);
+	}
 
 	// We want to get everything recalced since this is a major state change.
-	if(TheControlBar)
-		TheControlBar->markUIDirty();
-
-}// void ShowControlBar(void)
+	TheControlBar->markUIDirty();
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Force the control bar to be hidden */
 //-------------------------------------------------------------------------------------------------
 void HideControlBar( Bool immediate )
 {
+	if (!TheWindowManager || !TheControlBar)
+		return;
+
 	hideReplayControls();
-	if(TheControlBar)
-		TheControlBar->hideSpecialPowerShortcut();
-	if (TheWindowManager)
-	{
-		Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
-		GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
 
-		if (window)
-		{
+	TheControlBar->hideSpecialPowerShortcut();
+
+	Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent");
+	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
+
+	if (window)
+	{
 #ifdef SLIDE_LETTERBOX
-				TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f)); 
+		TheControlBar->setScaledViewportHeight();
 #else
-				TheTacticalView->setHeight(TheDisplay->getHeight());
+		TheControlBar->setFullViewportHeight();
 #endif
-		}
 		if (immediate)
 		{
 			window->winHide(TRUE);
-			if(TheControlBar)
-				TheControlBar->hideSpecialPowerShortcut();
-	
-		}
-		else
-		{
-			TheControlBar->m_animateWindowManager->reverseAnimateWindow();
-			TheControlBar->animateSpecialPowerShortcut(FALSE);
 		}
+	}
 
-		//Always get rid of the purchase science screen!
-		if( TheControlBar )
-		{
-			TheControlBar->hidePurchaseScience();
-		}
-	}  
-}//void HideControlBar( void )
+	if (TheControlBar->m_animateWindowManager && !immediate)
+	{
+		TheControlBar->m_animateWindowManager->reverseAnimateWindow();
+		TheControlBar->animateSpecialPowerShortcut(FALSE);
+	}
+
+	//Always get rid of the purchase science screen!
+	TheControlBar->hidePurchaseScience();
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Toggle the control bar on or off */
 //-------------------------------------------------------------------------------------------------
 void ToggleControlBar( Bool immediate )
 {
+	if (!TheWindowManager || !TheControlBar)
+		return;
+
 	toggleReplayControls();
 
-	if (TheWindowManager)
-	{
-		Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
-		GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
+	Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent");
+	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
 
-		if (window)
+	if (window)
+	{
+		if (window->winIsHidden())
 		{
-			if (window->winIsHidden())
-			{
-				if(TheControlBar)	
-					TheControlBar->showSpecialPowerShortcut();
-
-				//now hidden, we're making it visible again so shrink viewport under the window
-				TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f)); 
-				window->winHide(!window->winIsHidden());
-				TheControlBar->switchControlBarStage(CONTROL_BAR_STAGE_DEFAULT);
-				if (TheControlBar->m_animateWindowManager && !immediate)
-				{
-					TheControlBar->m_animateWindowManager->reset();
-					//TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM_TIMED, FALSE, 500, 0);
-					TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM, TRUE, 500, 0);
-					TheControlBar->animateSpecialPowerShortcut(TRUE);
-				}
-			}
-			else
+			TheControlBar->showSpecialPowerShortcut();
+
+			//now hidden, we're making it visible again so shrink viewport under the window
+			TheControlBar->setScaledViewportHeight();
+			window->winHide(FALSE);
+			TheControlBar->switchControlBarStage(CONTROL_BAR_STAGE_DEFAULT);
+
+			if (TheControlBar->m_animateWindowManager && !immediate)
 			{
-				if(TheControlBar)
-					TheControlBar->hideSpecialPowerShortcut();
-				TheTacticalView->setHeight(TheDisplay->getHeight());
-				window->winHide(!window->winIsHidden());
+				TheControlBar->m_animateWindowManager->reset();
+				//TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM_TIMED, FALSE, 500, 0);
+				TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM, TRUE, 500, 0);
+				TheControlBar->animateSpecialPowerShortcut(TRUE);
 			}
-			
 		}
-
+		else
+		{
+			TheControlBar->hideSpecialPowerShortcut();
+			TheControlBar->setFullViewportHeight();
+			window->winHide(TRUE);
+		}
 	}
-}// end void ToggleControlBar( void )
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Resize the control bar */
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
index 9e9fa0499a9..c658188dd09 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarPopupDescription.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,8 +37,8 @@
 //	Filename: 	ControlBarPopupDescription.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -65,7 +65,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/BuildAssistant.h"
@@ -93,11 +93,6 @@
 #include "GameLogic/ScriptEngine.h"
 
 #include "GameNetwork/NetworkInterface.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static WindowLayout *theLayout = NULL;
 static GameWindow *theWindow = NULL;
@@ -108,25 +103,25 @@ void ControlBarPopupDescriptionUpdateFunc( WindowLayout *layout, void *param )
 {
 	if(TheScriptEngine->isGameEnding())
 		TheControlBar->hideBuildTooltipLayout();
-	
+
 	if(theAnimateWindowManager && !TheControlBar->getShowBuildTooltipLayout() && !theAnimateWindowManager->isReversed())
 		theAnimateWindowManager->reverseAnimateWindow();
 	else if(!TheControlBar->getShowBuildTooltipLayout() && (!TheGlobalData->m_animateWindows || !useAnimation))
 		TheControlBar->deleteBuildTooltipLayout();
-		
+
 
 	if ( useAnimation && theAnimateWindowManager && TheGlobalData->m_animateWindows)
 	{
 		Bool wasFinished = theAnimateWindowManager->isFinished();
 		theAnimateWindowManager->update();
-		if (theAnimateWindowManager && theAnimateWindowManager->isFinished() && !wasFinished && theAnimateWindowManager->isReversed())
+		if (theAnimateWindowManager->isFinished() && !wasFinished && theAnimateWindowManager->isReversed())
 		{
 			delete theAnimateWindowManager;
 			theAnimateWindowManager = NULL;
 			TheControlBar->deleteBuildTooltipLayout();
 		}
 	}
-	
+
 }
 
 // ---------------------------------------------------------------------------------------
@@ -140,15 +135,15 @@ void ControlBar::showBuildTooltipLayout( GameWindow *cmdButton )
 	Bool passedWaitTime = FALSE;
 	static Bool isInitialized = FALSE;
 	static UnsignedInt beginWaitTime;
-	if(prevWindow == cmdButton)	
+	if(prevWindow == cmdButton)
 	{
 		m_showBuildToolTipLayout = TRUE;
 		if(!isInitialized &&  beginWaitTime + cmdButton->getTooltipDelay() < timeGetTime())
 		{
-			//DEBUG_LOG(("%d beginwaittime, %d tooltipdelay, %dtimegettime\n", beginWaitTime, cmdButton->getTooltipDelay(), timeGetTime()));
+			//DEBUG_LOG(("%d beginwaittime, %d tooltipdelay, %dtimegettime", beginWaitTime, cmdButton->getTooltipDelay(), timeGetTime()));
 			passedWaitTime = TRUE;
 		}
-		
+
 		if(!passedWaitTime)
 			return;
 	}
@@ -167,11 +162,11 @@ void ControlBar::showBuildTooltipLayout( GameWindow *cmdButton )
 //			m_buildToolTipLayout = NULL;
 			m_buildToolTipLayout->hide(TRUE);
 			prevWindow = NULL;
-		}	
+		}
 		return;
 	}
-	
-	
+
+
 	// will only get here the firsttime through the function through this window
 	if(!passedWaitTime)
 	{
@@ -187,7 +182,7 @@ void ControlBar::showBuildTooltipLayout( GameWindow *cmdButton )
 	if(BitIsSet(cmdButton->winGetStyle(), GWS_PUSH_BUTTON))
 	{
 		const CommandButton *commandButton = (const CommandButton *)GadgetButtonGetData(cmdButton);
-		
+
 		if(!commandButton)
 			return;
 
@@ -213,7 +208,7 @@ void ControlBar::showBuildTooltipLayout( GameWindow *cmdButton )
 		m_showBuildToolTipLayout = TRUE;
 		//	m_buildToolTipLayout = TheWindowManager->winCreateLayout( "ControlBarPopupDescription.wnd" );
 		//	m_buildToolTipLayout->setUpdate(ControlBarPopupDescriptionUpdateFunc);
-		
+
 		populateBuildTooltipLayout(commandButton);
 	}
 	else
@@ -227,12 +222,12 @@ void ControlBar::showBuildTooltipLayout( GameWindow *cmdButton )
 
 	if (useAnimation && TheGlobalData->m_animateWindows)
 	{
-		theAnimateWindowManager = NEW AnimateWindowManager;	
+		theAnimateWindowManager = NEW AnimateWindowManager;
 		theAnimateWindowManager->reset();
 		theAnimateWindowManager->registerGameWindow( m_buildToolTipLayout->getFirstWindow(), WIN_ANIMATION_SLIDE_RIGHT_FAST, TRUE, 200 );
 	}
-	
-	
+
+
 }
 
 
@@ -263,13 +258,13 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 		const ThingTemplate *thingTemplate = commandButton->getThingTemplate();
 		const UpgradeTemplate *upgradeTemplate = commandButton->getUpgradeTemplate();
 
-		ScienceType	st = SCIENCE_INVALID; 
+		ScienceType	st = SCIENCE_INVALID;
 		if(commandButton->getScienceVec().size() > 1)
 		{
 			for(size_t j = 0; j < commandButton->getScienceVec().size(); ++j)
 			{
 				st = commandButton->getScienceVec()[ j ];
-				
+
 				if( commandButton->getCommandType() != GUI_COMMAND_PURCHASE_SCIENCE )
 				{
 					if( !player->hasScience( st ) && j > 0 )
@@ -324,10 +319,10 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 								else
 									descrip.concat( TheGameText->fetch( "TOOLTIP:TooltipNukeReactorOverChargeIsOff" ) );
 							}
-						}  
+						}
 					}
-				} //End overcharge special case
-				
+				}
+
 				//Special case: When building units, the CanMakeType determines reasons for not being able to buy stuff.
 				else if( thingTemplate )
 				{
@@ -376,7 +371,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 						}
 					}
 				}
-				
+
 			}
 
 		}
@@ -385,19 +380,19 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 
 		if( thingTemplate && commandButton->getCommandType() != GUI_COMMAND_PURCHASE_SCIENCE )
 		{
-			//We are either looking at building a unit or a structure that may or may not have any 
+			//We are either looking at building a unit or a structure that may or may not have any
 			//prerequisites.
 
 			//Format the cost only when we have to pay for it.
 			cost.format(TheGameText->fetch("TOOLTIP:Cost"), thingTemplate->calcCostToBuild(player));
 
 			// ask each prerequisite to give us a list of the non satisfied prerequisites
-			for( Int i=0; i<thingTemplate->getPrereqCount(); i++ ) 
+			for( Int i=0; i<thingTemplate->getPrereqCount(); i++ )
 			{
 				prereq = thingTemplate->getNthPrereq(i);
 				requiresList = prereq->getRequiresList(player);
 
-				if( requiresList != UnicodeString::TheEmptyString ) 
+				if( requiresList != UnicodeString::TheEmptyString )
 				{
 					// make sure to put in 'returns' to space things correctly
 					if (firstRequirement)
@@ -431,7 +426,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 
 			if( !hasUpgradeAlready )
 			{
-				//Check if the first selected object has the specified upgrade. 
+				//Check if the first selected object has the specified upgrade.
 				Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
 				if( draw )
 				{
@@ -474,7 +469,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 				//Determine the cost of the upgrade.
 				cost.format(TheGameText->fetch("TOOLTIP:Cost"),upgradeTemplate->calcCostToBuild(player));
 			}
-		}	
+		}
 		else if( st != SCIENCE_INVALID && !fireScienceButton )
 		{
 			TheScienceStore->getNameAndDescription(st, name, descrip);
@@ -483,12 +478,12 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 			// ask each prerequisite to give us a list of the non satisfied prerequisites
 			if( thingTemplate )
 			{
-				for( Int i=0; i<thingTemplate->getPrereqCount(); i++ ) 
+				for( Int i=0; i<thingTemplate->getPrereqCount(); i++ )
 				{
 					prereq = thingTemplate->getNthPrereq(i);
 					requiresList = prereq->getRequiresList(player);
 
-					if( requiresList != UnicodeString::TheEmptyString ) 
+					if( requiresList != UnicodeString::TheEmptyString )
 					{
 						// make sure to put in 'returns' to space things correctly
 						if (firstRequirement)
@@ -512,7 +507,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 	}
 	else if(tooltipWin)
 	{
-		
+
 		if( tooltipWin == TheWindowManager->winGetWindowFromId(m_buildToolTipLayout->getFirstWindow(), TheNameKeyGenerator->nameToKey("ControlBar.wnd:MoneyDisplay")))
 		{
 			name = TheGameText->fetch("CONTROLBAR:Money");
@@ -523,11 +518,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 			name = TheGameText->fetch("CONTROLBAR:Power");
 			descrip = TheGameText->fetch("CONTROLBAR:PowerDescription");
 
-			Player *playerToDisplay = NULL;
-			if(TheControlBar->isObserverControlBarOn())
-				playerToDisplay = TheControlBar->getObserverLookAtPlayer();
-			else
-				playerToDisplay = ThePlayerList->getLocalPlayer();
+			Player* playerToDisplay = getCurrentlyViewedPlayer();
 
 			if( playerToDisplay && playerToDisplay->getEnergy() )
 			{
@@ -549,7 +540,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 			DEBUG_ASSERTCRASH(FALSE, ("ControlBar::populateBuildTooltipLayout We attempted to call the popup tooltip on a game window that has yet to be hand coded in as this fuction was/is designed for only buttons but has been hacked to work with GameWindows."));
 			return;
 		}
-		
+
 	}
 	GameWindow *win = TheWindowManager->winGetWindowFromId(m_buildToolTipLayout->getFirstWindow(), TheNameKeyGenerator->nameToKey("ControlBarPopupDescription.wnd:StaticTextName"));
 	if(win)
@@ -566,12 +557,12 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 	if(win)
 	{
 
-		static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) );
+		static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" );
 		static ICoord2D lastOffset = { 0, 0 };
 
 		ICoord2D size, newSize, pos;
 		Int diffSize;
-		
+
 		DisplayString *tempDString = TheDisplayStringManager->newDisplayString();
 		win->winGetSize(&size.x, &size.y);
 		tempDString->setFont(win->winGetFont());
@@ -584,7 +575,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
  		GameWindow *parent = m_buildToolTipLayout->getFirstWindow();
  		if(!parent)
  			return;
-		
+
  		parent->winGetSize(&size.x, &size.y);
  		if(size.y + diffSize < 102) {
 			diffSize = 102 - size.y;
@@ -594,7 +585,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
  		parent->winGetPosition(&pos.x, &pos.y);
 //		if(size.y + diffSize < 102)
 //		{
-//			
+//
 //			parent->winSetPosition(pos.x, pos.y -  (102 - (newSize.y + size.y + diffSize) ));
 //		}
 //		else
@@ -607,7 +598,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 		{
 			return;
 		}
-		TheControlBar->getBackgroundMarkerPos(&basePos.x, &basePos.y);
+		getBackgroundMarkerPos(&basePos.x, &basePos.y);
 		ICoord2D curPos, offset;
 		marker->winGetScreenPosition(&curPos.x,&curPos.y);
 
@@ -622,7 +613,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 		win->winGetSize(&size.x, &size.y);
  		win->winSetSize(size.x, size.y + diffSize);
 
-		GadgetStaticTextSetText(win, descrip);		
+		GadgetStaticTextSetText(win, descrip);
 	}
 	m_buildToolTipLayout->hide(FALSE);
 }
@@ -647,12 +638,12 @@ void ControlBar::deleteBuildTooltipLayout( void )
 	m_buildToolTipLayout->hide(TRUE);
 //	if(!m_buildToolTipLayout)
 //		return;
-//	
+//
 //	m_buildToolTipLayout->destroyWindows();
 //	deleteInstance(m_buildToolTipLayout);
 //	m_buildToolTipLayout = NULL;
-	if(theAnimateWindowManager)
-		delete theAnimateWindowManager;
+
+	delete theAnimateWindowManager;
 	theAnimateWindowManager = NULL;
 
 }
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
index b5c9fdeb123..660e96b7bf2 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/MultiplayerSettings.h"
@@ -57,11 +57,6 @@
 #include "GameNetwork/GameSpy/BuddyDefs.h"
 #include "GameNetwork/GameSpy/PeerDefs.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 
@@ -94,7 +89,7 @@ static Int slotNumInRow[MAX_SLOTS];
 static WindowLayout *theLayout = NULL;
 static GameWindow *theWindow = NULL;
 static AnimateWindowManager *theAnimateWindowManager = NULL;
-WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2);
 void InitBuddyControls(Int type);
 void updateBuddyInfo( void );
@@ -198,10 +193,10 @@ void UpdateDiplomacyBriefingText(AsciiString newText, Bool clear)
 // ------------------------------------------------------------------------------------------------
 void ShowDiplomacy( Bool immediate )
 {
-	if (!TheInGameUI->getInputEnabled() || TheGameLogic->isIntroMoviePlaying() || 
+	if (!TheInGameUI->getInputEnabled() || TheGameLogic->isIntroMoviePlaying() ||
 			TheGameLogic->isLoadingGame())
 		return;
-	
+
 
 	if (TheInGameUI->isQuitMenuVisible())
 		return;
@@ -279,7 +274,7 @@ void ShowDiplomacy( Bool immediate )
 		PopulateOldBuddyMessages();
 		updateBuddyInfo();
 	}
-	
+
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -295,8 +290,8 @@ void ResetDiplomacy( void )
 		theLayout = NULL;
 	}
 	theWindow = NULL;
-	if (theAnimateWindowManager)
-		delete theAnimateWindowManager;
+
+	delete theAnimateWindowManager;
 	theAnimateWindowManager = NULL;
 }
 
@@ -348,7 +343,7 @@ WindowMsgHandledType DiplomacyInput( GameWindow *window, UnsignedInt msg,
 																			WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -366,29 +361,29 @@ WindowMsgHandledType DiplomacyInput( GameWindow *window, UnsignedInt msg,
 					HideDiplomacy();
 					return MSG_HANDLED;
 					//return MSG_IGNORED;
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
 			return MSG_HANDLED;
 
-		}  // end char
+		}
 
 	}
 
 	return MSG_IGNORED;
 
-}  // end DiplomacyInput
+}
 
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType DiplomacySystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType DiplomacySystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	if(BuddyControlSystem(window, msg, mData1, mData2) == MSG_HANDLED)
 	{
 		return MSG_HANDLED;
 	}
-	switch( msg ) 
+	switch( msg )
 	{
 		//---------------------------------------------------------------------------------------------
 		case GGM_FOCUS_CHANGE:
@@ -397,17 +392,17 @@ WindowMsgHandledType DiplomacySystem( GameWindow *window, UnsignedInt msg,
 			//if (focus)
 				//TheWindowManager->winSetGrabWindow( chatTextEntry );
 			break;
-		} // end focus change
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-		{	
+		{
 			// if we're given the opportunity to take the keyboard focus we must say we don't want it
 			if( mData1 == TRUE )
 				*(Bool *)mData2 = FALSE;
 
 			return MSG_HANDLED;
-		}//case GWM_INPUT_FOCUS:
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -447,17 +442,17 @@ WindowMsgHandledType DiplomacySystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end DiplomacySystem
+}
 
 void PopulateInGameDiplomacyPopup( void )
 {
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
index 2d9f37d9bca..67357c600c2 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
@@ -31,7 +31,7 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/NameKeyGenerator.h"
@@ -43,7 +43,7 @@
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/ExtendedMessageBox.h"
 
-WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt msg,
 										 WindowMsgData mData1, WindowMsgData mData2 );
 
 //-------------------------------------------------------------------------------------------------
@@ -62,8 +62,8 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne
 		return NULL;
 	}
 
-	GameWindow *parent = TheWindowManager->winCreateFromScript( AsciiString("Menus/MessageBox.wnd") ); 
-	TheWindowManager->winSetModal( parent ); 
+	GameWindow *parent = TheWindowManager->winCreateFromScript( "Menus/MessageBox.wnd" );
+	TheWindowManager->winSetModal( parent );
 	TheWindowManager->winSetFocus( NULL ); // make sure we lose focus from other windows even if we refuse focus ourselves
 	TheWindowManager->winSetFocus( parent	 );
 
@@ -78,8 +78,8 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne
 		ratioX = (float)width / (float)temp.x;
 		ratioY = (float)height / (float)temp.y;
 		//Set the window's new size
-		parent->winSetSize( width, height);	
-	
+		parent->winSetSize( width, height);
+
 		//Resize/reposition all the children windows based off the ratio
 		GameWindow *child;
 		for( child = parent->winGetChild(); child; child = child->winGetNext() )
@@ -95,37 +95,37 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne
 			child->winSetPosition(temp.x, temp.y);
 		}
 	}
-	
+
 	// If the user wants to position the message box somewhere other then default
 	if( x >= 0 && y >= 0)
-		parent->winSetPosition(x, y);	
-	
-	// Reposition the buttons 
+		parent->winSetPosition(x, y);
+
+	// Reposition the buttons
 	Int buttonX[3], buttonY[3];
-		 	
+
 	//In the layout, buttonOk will be in the first button position
-	NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonOk" ) );
+	NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonOk" );
 	GameWindow *buttonOk = TheWindowManager->winGetWindowFromId(parent, buttonOkID);
 	buttonOk->winGetPosition(&buttonX[0], &buttonY[0]);
 
-	NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonYes" ) );
+	NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonYes" );
 	GameWindow *buttonYes = TheWindowManager->winGetWindowFromId(parent, buttonYesID);
 	//buttonNo in the second position
-	NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonNo" ) );
+	NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonNo" );
 	GameWindow *buttonNo = TheWindowManager->winGetWindowFromId(parent, buttonNoID);
 	buttonNo->winGetPosition(&buttonX[1], &buttonY[1]);
-	
+
 	//and buttonCancel in the third
-	NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonCancel" ) );
+	NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonCancel" );
 	GameWindow *buttonCancel = TheWindowManager->winGetWindowFromId(parent, buttonCancelID);
 	buttonCancel->winGetPosition(&buttonX[2], &buttonY[2]);
-	
+
 	//we shouldn't have button OK and Yes on the same dialog
 	if((buttonFlags & (MSG_BOX_OK | MSG_BOX_YES)) == (MSG_BOX_OK | MSG_BOX_YES) )
 	{
 		DEBUG_ASSERTCRASH(false, ("Passed in MSG_BOX_OK and MSG_BOX_YES.  Big No No."));
 	}
-	
+
 	//Position the OK button if we have one
 	if( (buttonFlags & MSG_BOX_OK) == MSG_BOX_OK)
 	{
@@ -138,7 +138,7 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne
 		buttonYes->winSetPosition(buttonX[0], buttonY[0]);
 		buttonYes->winHide(FALSE);
 	}
-	
+
 	if((buttonFlags & (MSG_BOX_NO | MSG_BOX_CANCEL)) == (MSG_BOX_NO | MSG_BOX_CANCEL) )
 	{
 		//If we have both the No and Cancel button, then the no should go in the middle position
@@ -159,17 +159,17 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne
 		buttonCancel->winSetPosition(buttonX[2], buttonY[2]);
 		buttonCancel->winHide(FALSE);
 	}
-		
+
 	// Fill the text into the text boxes
-	NameKeyType staticTextTitleID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:StaticTextTitle" ) );
+	NameKeyType staticTextTitleID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:StaticTextTitle" );
 	GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId(parent, staticTextTitleID);
 	GadgetStaticTextSetText(staticTextTitle,titleString);
-	
-	NameKeyType staticTextMessageID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:StaticTextMessage" ) );
+
+	NameKeyType staticTextMessageID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:StaticTextMessage" );
 	GameWindow *staticTextMessage = TheWindowManager->winGetWindowFromId(parent, staticTextMessageID);
 	GadgetStaticTextSetText(staticTextMessage,bodyString);
 
-	// create a structure that will pass the functions to 
+	// create a structure that will pass the functions to
 	WindowExMessageBoxData *MsgBoxCallbacks = NEW WindowExMessageBoxData;
 	MsgBoxCallbacks->cancelCallback = cancelCallback;
 	MsgBoxCallbacks->noCallback = noCallback;
@@ -180,13 +180,13 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne
 	parent->winSetUserData( MsgBoxCallbacks );
 
 	parent->winSetSystemFunc(ExtendedMessageBoxSystem);
-	
+
 	//make sure the dialog is showing and bring it to the top
 	parent->winHide(FALSE);
 	parent->winBringToTop();
-	
+
 	return parent;
-}// gogoExMessageBox
+}
 
 GameWindow *ExMessageBoxYesNo				(UnicodeString titleString,UnicodeString bodyString, void *userData,
 																		 MessageBoxFunc yesCallback, MessageBoxFunc noCallback)
@@ -227,12 +227,12 @@ GameWindow *ExMessageBoxCancel			(UnicodeString titleString,UnicodeString bodySt
 //-------------------------------------------------------------------------------------------------
 /** Message Box window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt msg,
 										 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	
-	switch( msg ) 
+
+
+	switch( msg )
 	{
 
 		//---------------------------------------------------------------------------------------------
@@ -242,7 +242,7 @@ WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt m
 			window->winSetUserData( NULL );
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -254,17 +254,17 @@ WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt m
 
 			break;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-			static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonOk" ) );
-			static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonYes" ) );
-			static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonNo" ) );
-			static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonCancel" ) );
+			static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonOk" );
+			static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonYes" );
+			static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonNo" );
+			static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonCancel" );
 			WindowExMessageBoxData *MsgBoxCallbacks = (WindowExMessageBoxData *)window->winGetUserData();
 
 			MessageBoxReturnType ret = MB_RETURN_CLOSE;
@@ -273,36 +273,36 @@ WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt m
 			{
 				if (MsgBoxCallbacks->okCallback)
 					ret = MsgBoxCallbacks->okCallback(MsgBoxCallbacks->userData);
-			}  // end if
+			}
 			else if( controlID == buttonYesID )
 			{
 				if (MsgBoxCallbacks->yesCallback)
 					ret = MsgBoxCallbacks->yesCallback(MsgBoxCallbacks->userData);
-			}  // end else if
+			}
 			else if( controlID == buttonNoID )
 			{
 				if (MsgBoxCallbacks->noCallback)
 					ret = MsgBoxCallbacks->noCallback(MsgBoxCallbacks->userData);
-			}  // end else if
+			}
 			else if( controlID == buttonCancelID )
 			{
 				if (MsgBoxCallbacks->cancelCallback)
 					ret = MsgBoxCallbacks->cancelCallback(MsgBoxCallbacks->userData);
-			}  // end else if
+			}
 
 			if (ret == MB_RETURN_CLOSE)
 				TheWindowManager->winDestroy(window);
-			
+
 			break;
 
-		}  // end selected
-		
+		}
+
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end ExtendedMessageBoxSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
index 725f94e6a70..93e3b69370f 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GeneralsExpPoints.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Oct 2002
@@ -37,7 +37,7 @@
 //	Filename: 	GeneralsExpPoints.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	File used to populate/update/show/hide the generals exp screen
 //
 //-----------------------------------------------------------------------------
@@ -46,7 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -56,7 +56,6 @@
 #include "GameClient/GameWindow.h"
 #include "GameClient/Gadget.h"
 #include "GameClient/KeyDefs.h"
-#include "GameClient/ControlBar.h"
 #include "GameClient/InGameUI.h"
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -67,7 +66,7 @@ WindowMsgHandledType GeneralsExpPointsInput( GameWindow *window, UnsignedInt msg
 																			WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -78,7 +77,7 @@ WindowMsgHandledType GeneralsExpPointsInput( GameWindow *window, UnsignedInt msg
 				TheInGameUI->placeBuildAvailable( NULL, NULL );
 			}
 			break;
-	
+
 		case GWM_CHAR:
 		{
 			UnsignedByte key = mData1;
@@ -93,30 +92,30 @@ WindowMsgHandledType GeneralsExpPointsInput( GameWindow *window, UnsignedInt msg
 					TheControlBar->hidePurchaseScience();
 					return MSG_HANDLED;
 					//return MSG_IGNORED;
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
 			return MSG_HANDLED;
 
-		}  // end char
+		}
 
 	}
 
 	return MSG_HANDLED;
 
-}  // end DiplomacyInput
+}
 
 
 
 //-----------------------------------------------------------------------------
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-WindowMsgHandledType GeneralsExpPointsSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType GeneralsExpPointsSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 		//---------------------------------------------------------------------------------------------
 		case GGM_FOCUS_CHANGE:
@@ -125,17 +124,17 @@ WindowMsgHandledType GeneralsExpPointsSystem( GameWindow *window, UnsignedInt ms
 			//if (focus)
 				//TheWindowManager->winSetGrabWindow( chatTextEntry );
 			break;
-		} // end focus change
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-		{	
+		{
 			// if we're given the opportunity to take the keyboard focus we must say we don't want it
 			if( mData1 == TRUE )
 				*(Bool *)mData2 = FALSE;
 
 			return MSG_HANDLED;
-		}//case GWM_INPUT_FOCUS:
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -151,17 +150,17 @@ WindowMsgHandledType GeneralsExpPointsSystem( GameWindow *window, UnsignedInt ms
 				TheControlBar->processContextSensitiveButtonClick( control, (GadgetGameMessage)msg );
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GeneralsExpPointsSystem
+}
 
 //-----------------------------------------------------------------------------
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
index 341d09de18f..3db793e6e77 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameWindow.h"
 #include "GameClient/Gadget.h"
@@ -51,15 +51,15 @@ WindowMsgHandledType IMECandidateWindowInput( GameWindow *window, UnsignedInt ms
 
 	return MSG_HANDLED;
 
-}  // end IMECandidateInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** System callback for the IME Candidate widnow */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType IMECandidateWindowSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType IMECandidateWindowSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 		case GWM_CREATE:
 			if ( Dstring == NULL )
@@ -81,11 +81,11 @@ WindowMsgHandledType IMECandidateWindowSystem( GameWindow *window, UnsignedInt m
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end IMECandidateWidnowSystem
+}
 
 // IMECandidateDraw ================================================================
 /** Draw function for the IME candidate window */
@@ -94,9 +94,9 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 {
 	// set up for rendering
 	ICoord2D origin, size, start, end;
-	Color		textColor, 
-					textBorder, 
-					textSelectColor, 
+	Color		textColor,
+					textBorder,
+					textSelectColor,
 					textSelectBorder;
 	IRegion2D textRegion;
 	Color black = GameMakeColor( 0, 0, 0, 255);
@@ -120,7 +120,7 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 		textColor		= window->winGetDisabledTextColor();
 		textBorder	= window->winGetDisabledTextBorderColor();
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -129,7 +129,7 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 		textSelectColor		= window->winGetHiliteTextColor();
 		textSelectBorder	= window->winGetHiliteTextBorderColor();
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
@@ -138,12 +138,12 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 		textColor		= window->winGetEnabledTextColor();
 		textBorder	= window->winGetEnabledTextBorderColor();
 
-	}  // end else, just enabled
+	}
 
 
 	{
 		Real borderWidth = 1.0f;
-	
+
 		start.x = origin.x;
 		start.y = origin.y;
 		end.x = start.x + size.x;
@@ -164,14 +164,14 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 		return;
 	}
 
-	GameFont *font = window->winGetFont() ;
-	Int height;
+	GameFont *font = window->winGetFont();
 
 	// set the font
 	Dstring->setFont( font );
 
-	// cacl line height
-	height = font->height + IMECandidateWindowLineSpacing;
+	// calculate line height
+	Int fontHeight = font ? font->height : 0;
+	Int height = fontHeight + IMECandidateWindowLineSpacing;
 
 	// set the clip region
 	Dstring->setClipRegion( &textRegion );
@@ -193,7 +193,7 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 
 	// calulate the widest number text
 	Int width;
-	Dstring->setText(UnicodeString(L"00:"));
+	Dstring->setText(L"00:");
 	width = Dstring->getWidth();
 
 	// calc y start pos
@@ -202,9 +202,9 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 
 	for ( Int i = 0; i < count; i++, y+= height )
 	{
-		UnicodeString *candidate = ime->getCandidate( first + i );
+		const UnicodeString *candidate = ime->getCandidate( first + i );
 		Int tcolor, bcolor;
-		
+
 		if ( i == selected )
 		{
 			tcolor = textSelectColor;
@@ -215,8 +215,8 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 			tcolor = textColor;
 			bcolor = textBorder;
 		}
-		
-		// draw number tab first	
+
+		// draw number tab first
 		number.format( L"%d:", i + ime->getIndexBase());
 		Dstring->setText( number );
 		width = Dstring->getWidth();
@@ -225,7 +225,7 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 		// draw candidate
 		Dstring->setText( *candidate );
 		Dstring->draw( leftEdge, y, tcolor, black );
-	}	
+	}
 }
 
 // IMECandidateDraw ================================================================
@@ -235,7 +235,7 @@ void IMECandidateMainDraw( GameWindow *window, WinInstanceData *instData )
 {
 	// set up for rendering
 	ICoord2D origin, size, start, end;
-	Color		backColor, 
+	Color		backColor,
 					backBorder;
 	Real borderWidth = 1.0f;
 
@@ -250,33 +250,33 @@ void IMECandidateMainDraw( GameWindow *window, WinInstanceData *instData )
 		backColor		= window->winGetDisabledColor( 0 );
 		backBorder	= window->winGetDisabledBorderColor( 0 );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
 		backColor		= window->winGetHiliteColor( 0 );
 		backBorder	= window->winGetHiliteBorderColor( 0 );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
 		backColor		= window->winGetEnabledColor( 0 );
 		backBorder	= window->winGetEnabledBorderColor( 0 );
 
-	}  // end else, just enabled
+	}
 
 	// draw the back border
 	if( backBorder != WIN_COLOR_UNDEFINED )
 	{
-	
+
 		start.x = origin.x;
 		start.y = origin.y;
 		end.x = start.x + size.x;
 		end.y = start.y + size.y;
 		TheWindowManager->winOpenRect( backBorder, borderWidth,
 																	 start.x, start.y, end.x, end.y );
-	}  // end if
+	}
 
 	// draw the filled back
 	if( backColor != WIN_COLOR_UNDEFINED )
@@ -288,6 +288,6 @@ void IMECandidateMainDraw( GameWindow *window, WinInstanceData *instData )
 		end.y = start.y + size.y - 2;
 		TheWindowManager->winFillRect( backColor, 0, start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
index fdde3b86e51..9311f81063e 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -76,7 +76,7 @@ void ShowInGameChat( Bool immediate )
 	}
 	else
 	{
-		chatWindow = TheWindowManager->winCreateFromScript( AsciiString("InGameChat.wnd") );
+		chatWindow = TheWindowManager->winCreateFromScript( "InGameChat.wnd" );
 
 		static NameKeyType textEntryChatID = TheNameKeyGenerator->nameToKey( "InGameChat.wnd:TextEntryChat" );
 		chatTextEntry = TheWindowManager->winGetWindowFromId( NULL, textEntryChatID );
@@ -266,7 +266,7 @@ WindowMsgHandledType InGameChatInput( GameWindow *window, UnsignedInt msg,
 																			WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -284,26 +284,26 @@ WindowMsgHandledType InGameChatInput( GameWindow *window, UnsignedInt msg,
 					HideInGameChat();
 					return MSG_HANDLED;
 					//return MSG_IGNORED;
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
 			return MSG_HANDLED;
 
-		}  // end char
+		}
 
 	}
 
 	return MSG_IGNORED;
 
-}  // end InGameChatInput
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 		//---------------------------------------------------------------------------------------------
 		case GGM_FOCUS_CHANGE:
@@ -312,17 +312,17 @@ WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg,
 			//if (focus)
 				//TheWindowManager->winSetGrabWindow( chatTextEntry );
 			break;
-		} // end focus change
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-		{	
+		{
 			// if we're givin the opportunity to take the keyboard focus we must say we want it
 			if( mData1 == TRUE )
 				*(Bool *)mData2 = TRUE;
 
 			return MSG_HANDLED;
-		}//case GWM_INPUT_FOCUS:
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GEM_EDIT_DONE:
@@ -332,13 +332,13 @@ WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
-			static NameKeyType buttonClearID = TheNameKeyGenerator->nameToKey( AsciiString( "InGameChat.wnd:ButtonClear" ) );
+			static NameKeyType buttonClearID = TheNameKeyGenerator->nameToKey( "InGameChat.wnd:ButtonClear" );
 			if (control && control->winGetWindowId() == buttonClearID)
 			{
 				if (chatTextEntry)
@@ -347,15 +347,15 @@ WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end InGameChatSystem
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
index 2a82d0ec37f..dda3a72f769 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
@@ -24,12 +24,12 @@
 
 // FILE: InGamePopupMessage.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,7 +37,7 @@
 //	Filename: 	InGamePopupMessage.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Init, input, and system for the in game message popup
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/NameKeyGenerator.h"
@@ -89,23 +89,23 @@ static Bool pause = FALSE;
 void InGamePopupMessageInit( WindowLayout *layout, void *userData )
 {
 
-	parentID = TheNameKeyGenerator->nameToKey(AsciiString("InGamePopupMessage.wnd:InGamePopupMessageParent"));
+	parentID = TheNameKeyGenerator->nameToKey("InGamePopupMessage.wnd:InGamePopupMessageParent");
 	parent = TheWindowManager->winGetWindowFromId(NULL, parentID);
 
-	staticTextMessageID = TheNameKeyGenerator->nameToKey(AsciiString("InGamePopupMessage.wnd:StaticTextMessage"));
+	staticTextMessageID = TheNameKeyGenerator->nameToKey("InGamePopupMessage.wnd:StaticTextMessage");
 	staticTextMessage = TheWindowManager->winGetWindowFromId(parent, staticTextMessageID);
-	buttonOkID = TheNameKeyGenerator->nameToKey(AsciiString("InGamePopupMessage.wnd:ButtonOk"));
+	buttonOkID = TheNameKeyGenerator->nameToKey("InGamePopupMessage.wnd:ButtonOk");
 	buttonOk = TheWindowManager->winGetWindowFromId(parent, buttonOkID);
-	
+
 	PopupMessageData *pMData = TheInGameUI->getPopupMessageData();
-	
+
 	if(!pMData)
 	{
-		DEBUG_ASSERTCRASH(pMData, ("We're in InGamePopupMessage without a pointer to pMData\n") );
+		DEBUG_ASSERTCRASH(pMData, ("We're in InGamePopupMessage without a pointer to pMData") );
 		///< @todo: add a call to the close this bitch method when I implement it CLH
 		return;
 	}
-	
+
 	DisplayString *tempString = TheDisplayStringManager->newDisplayString();
 	tempString->setText(pMData->message);
 	tempString->setFont(staticTextMessage->winGetFont());
@@ -113,7 +113,7 @@ void InGamePopupMessageInit( WindowLayout *layout, void *userData )
 	Int width, height;
 	tempString->getSize(&width, &height);
 	TheDisplayStringManager->freeDisplayString(tempString);
-	
+
 	GadgetStaticTextSetText(staticTextMessage, pMData->message);
 	// set the positions/sizes
 	Int widthOk, heightOk;
@@ -127,7 +127,7 @@ void InGamePopupMessageInit( WindowLayout *layout, void *userData )
 	pause = pMData->pause;
 	if(pMData->pause)
 		TheWindowManager->winSetModal( parent );
-	
+
 	TheWindowManager->winSetFocus( parent );
 
 	parent->winHide(FALSE);
@@ -140,9 +140,9 @@ void InGamePopupMessageInit( WindowLayout *layout, void *userData )
 WindowMsgHandledType InGamePopupMessageInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-		switch( msg ) 
+		switch( msg )
 		{
-	
+
 			// --------------------------------------------------------------------------------------------
 			case GWM_CHAR:
 			{
@@ -150,38 +150,38 @@ WindowMsgHandledType InGamePopupMessageInput( GameWindow *window, UnsignedInt ms
 				UnsignedByte state = mData2;
 	//			if (buttonPushed)
 	//				break;
-	
+
 				switch( key )
 				{
-	
+
 					// ----------------------------------------------------------------------------------------
 					case KEY_ENTER:
 					case KEY_ESC:
 					{
-						
+
 						//
 						// send a simulated selected event to the parent window of the
 						// back/exit button
 						//
 						if( BitIsSet( state, KEY_STATE_UP ) )
 						{
-							TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+							TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)buttonOk, buttonOkID );
-	
-						}  // end if
-	
+
+						}
+
 						// don't let key fall through anywhere else
 						return MSG_HANDLED;
-	
-					}  // end escape
-	
-				}  // end switch( key )
-	
-			}  // end char
-	
-		}  // end switch( msg )
+
+					}
+
+				}
+
+			}
+
+		}
 		return MSG_IGNORED;
-	
+
 
 }
 
@@ -191,7 +191,7 @@ WindowMsgHandledType InGamePopupMessageInput( GameWindow *window, UnsignedInt ms
 WindowMsgHandledType InGamePopupMessageSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -200,14 +200,14 @@ WindowMsgHandledType InGamePopupMessageSystem( GameWindow *window, UnsignedInt m
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 
 			break;
 
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -219,13 +219,13 @@ WindowMsgHandledType InGamePopupMessageSystem( GameWindow *window, UnsignedInt m
 
 			break;
 
-		}  // end input
+		}
     //---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-     
+
       if( controlID == buttonOkID )
 			{
 				if(!pause)
@@ -238,7 +238,7 @@ WindowMsgHandledType InGamePopupMessageSystem( GameWindow *window, UnsignedInt m
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 
 	return MSG_HANDLED;
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
index ba0595257f7..133d11a1413 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
@@ -24,12 +24,12 @@
 
 // FILE: CreditsMenu.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Dec 2002
@@ -37,7 +37,7 @@
 //	Filename: 	CreditsMenu.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The credits screen...yay
 //
 //-----------------------------------------------------------------------------
@@ -46,12 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 //-----------------------------------------------------------------------------
@@ -85,13 +80,13 @@ static GameWindow *parentMainMenu = NULL;
 void CreditsMenuInit( WindowLayout *layout, void *userData )
 {
 	TheShell->showShellMap(FALSE);
-	if(TheCredits)
-		delete TheCredits;
+
+	delete TheCredits;
 	TheCredits = new CreditsManager;
 	TheCredits->load();
 	TheCredits->init();
-	
-	parentMainMenuID = TheNameKeyGenerator->nameToKey( AsciiString("CreditsMenu.wnd:ParentCreditsWindow") );
+
+	parentMainMenuID = TheNameKeyGenerator->nameToKey( "CreditsMenu.wnd:ParentCreditsWindow" );
 	parentMainMenu = TheWindowManager->winGetWindowFromId( NULL, parentMainMenuID );
 
 
@@ -104,12 +99,12 @@ void CreditsMenuInit( WindowLayout *layout, void *userData )
 
 
 	TheAudio->removeAudioEvent( AHSV_StopTheMusicFade );
-	AudioEventRTS event( AsciiString( "Credits" ) );
+	AudioEventRTS event( "Credits" );
 	event.setShouldFade( TRUE );
 	TheAudio->addAudioEvent( &event );
 
 
-}  // end CreditsMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu shutdown method */
@@ -129,7 +124,7 @@ void CreditsMenuShutdown( WindowLayout *layout, void *userData )
 
 	TheAudio->removeAudioEvent( AHSV_StopTheMusicFade );
 
-}  // end CreditsMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu update method */
@@ -147,7 +142,7 @@ void CreditsMenuUpdate( WindowLayout *layout, void *userData )
 	else
 		TheShell->pop();
 
-}  // end CreditsMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Replay menu input callback */
@@ -156,7 +151,7 @@ WindowMsgHandledType CreditsMenuInput( GameWindow *window, UnsignedInt msg,
 																						WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -171,7 +166,7 @@ WindowMsgHandledType CreditsMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -181,41 +176,41 @@ WindowMsgHandledType CreditsMenuInput( GameWindow *window, UnsignedInt msg,
 
 						TheShell->pop();
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end CreditsMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType CreditsMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType CreditsMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
 
-			
+
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -223,7 +218,7 @@ WindowMsgHandledType CreditsMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -235,20 +230,20 @@ WindowMsgHandledType CreditsMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
-			
+
 			break;
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
-}  // end CreditsMenuSystem
+}
 
 //-----------------------------------------------------------------------------
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
index b1904f58038..73cef4cd845 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
@@ -24,12 +24,12 @@
 
 // FILE: DifficultySelect.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Nov 2002
@@ -37,7 +37,7 @@
 //	Filename: 	DifficultySelect.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The popup campaign difficulty select
 //
 //-----------------------------------------------------------------------------
@@ -46,7 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -68,15 +68,15 @@
 //-----------------------------------------------------------------------------
 static GameDifficulty s_AIDiff = DIFFICULTY_NORMAL;
 static NameKeyType    buttonOkID      = NAMEKEY_INVALID;
-static GameWindow *   buttonOk       = NULL; 
+static GameWindow *   buttonOk       = NULL;
 static NameKeyType    buttonCancelID      = NAMEKEY_INVALID;
-static GameWindow *   buttonCancel       = NULL; 
+static GameWindow *   buttonCancel       = NULL;
 static NameKeyType    radioButtonEasyAIID      = NAMEKEY_INVALID;
 static NameKeyType    radioButtonMediumAIID      = NAMEKEY_INVALID;
 static NameKeyType    radioButtonHardAIID      = NAMEKEY_INVALID;
-static GameWindow *   radioButtonEasyAI       = NULL; 
-static GameWindow *   radioButtonMediumAI       = NULL; 
-static GameWindow *   radioButtonHardAI       = NULL; 
+static GameWindow *   radioButtonEasyAI       = NULL;
+static GameWindow *   radioButtonMediumAI       = NULL;
+static GameWindow *   radioButtonHardAI       = NULL;
 
 void setupGameStart(AsciiString mapName, GameDifficulty diff);
 //-----------------------------------------------------------------------------
@@ -116,29 +116,28 @@ static void SetDifficultyRadioButton( void )
 			{
 				DEBUG_CRASH(("unrecognized difficulty level in the script engine"));
 			}
-			
+
 		}
-	} // if (TheScriptEngine)
-	
+	}
+
 }
 
 
 void DifficultySelectInit( WindowLayout *layout, void *userData )
-{ 
-	AsciiString parentName( "DifficultySelect.wnd:DifficultySelectParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+{
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:DifficultySelectParent" );
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
-   
+
 	buttonOkID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:ButtonOk" );
 	buttonOk = TheWindowManager->winGetWindowFromId( parent, buttonOkID );
 	buttonCancelID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:ButtonCancel" );
 	buttonCancel = TheWindowManager->winGetWindowFromId( parent, buttonCancelID );
-	radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( AsciiString("DifficultySelect.wnd:RadioButtonEasy") );
-	radioButtonEasyAI = TheWindowManager->winGetWindowFromId( parent, radioButtonEasyAIID );			
-	radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( AsciiString("DifficultySelect.wnd:RadioButtonMedium") );
+	radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:RadioButtonEasy" );
+	radioButtonEasyAI = TheWindowManager->winGetWindowFromId( parent, radioButtonEasyAIID );
+	radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:RadioButtonMedium" );
 	radioButtonMediumAI = TheWindowManager->winGetWindowFromId( parent, radioButtonMediumAIID );
-	radioButtonHardAIID = TheNameKeyGenerator->nameToKey( AsciiString("DifficultySelect.wnd:RadioButtonHard") );
-	radioButtonHardAI = TheWindowManager->winGetWindowFromId( parent, radioButtonHardAIID );			
+	radioButtonHardAIID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:RadioButtonHard" );
+	radioButtonHardAI = TheWindowManager->winGetWindowFromId( parent, radioButtonHardAIID );
 
 	s_AIDiff = DIFFICULTY_NORMAL;
 	SetDifficultyRadioButton();
@@ -151,8 +150,8 @@ void DifficultySelectInit( WindowLayout *layout, void *userData )
 //
 	parent->winBringToTop();
 	TheWindowManager->winSetModal(parent);
-	
-}  // end SkirmishMapSelectMenuInit
+
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -162,7 +161,7 @@ WindowMsgHandledType DifficultySelectInput( GameWindow *window, UnsignedInt msg,
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-//	switch( msg ) 
+//	switch( msg )
 //	{
 //
 //		// --------------------------------------------------------------------------------------------
@@ -177,7 +176,7 @@ WindowMsgHandledType DifficultySelectInput( GameWindow *window, UnsignedInt msg,
 //				// ----------------------------------------------------------------------------------------
 //				case KEY_ESC:
 //				{
-//					
+//
 //					//
 //					// send a simulated selected event to the parent window of the
 //					// back/exit button
@@ -188,7 +187,7 @@ WindowMsgHandledType DifficultySelectInput( GameWindow *window, UnsignedInt msg,
 //						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
 //						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 //
-//						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+//						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 //																								(WindowMsgData)button, buttonID );
 //
 //					}  // end if
@@ -206,16 +205,16 @@ WindowMsgHandledType DifficultySelectInput( GameWindow *window, UnsignedInt msg,
 
 	return MSG_IGNORED;
 
-}  // end SkirmishMapSelectMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType DifficultySelectSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType DifficultySelectSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -223,14 +222,14 @@ WindowMsgHandledType DifficultySelectSystem( GameWindow *window, UnsignedInt msg
 		{
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -242,7 +241,7 @@ WindowMsgHandledType DifficultySelectSystem( GameWindow *window, UnsignedInt msg
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -277,7 +276,7 @@ WindowMsgHandledType DifficultySelectSystem( GameWindow *window, UnsignedInt msg
 					layout->destroyWindows();
 					deleteInstance(layout);
 				}
-				
+
 			}
 			else if ( controlID == radioButtonEasyAIID )
 			{
@@ -294,16 +293,16 @@ WindowMsgHandledType DifficultySelectSystem( GameWindow *window, UnsignedInt msg
 
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  
+}
 //-----------------------------------------------------------------------------
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp
index 50eaf4ea668..1c3ce0ea666 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameWindow.h"
 #include "GameClient/GameText.h"
@@ -70,8 +70,8 @@ static GameWindow *buttonVotePlayer6Window = NULL;
 static GameWindow *buttonVotePlayer7Window = NULL;
 
 static void InitDisconnectWindow( void ) {
-	textEntryID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:TextEntry"));
-	textDisplayID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ListboxTextDisplay"));
+	textEntryID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:TextEntry");
+	textDisplayID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ListboxTextDisplay");
 
 	textEntryWindow = TheWindowManager->winGetWindowFromId(NULL, textEntryID);
 	textDisplayWindow = TheWindowManager->winGetWindowFromId(NULL, textDisplayID);
@@ -81,16 +81,16 @@ static void InitDisconnectWindow( void ) {
 		TheWindowManager->winSetFocus(textEntryWindow);
 	}
 
-	buttonQuitID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonQuitGame"));
+	buttonQuitID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonQuitGame");
 	buttonQuitWindow = TheWindowManager->winGetWindowFromId(NULL, buttonQuitID);
 
-	buttonVotePlayer1ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer1"));
-	buttonVotePlayer2ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer2"));
-	buttonVotePlayer3ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer3"));
-	buttonVotePlayer4ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer4"));
-	buttonVotePlayer5ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer5"));
-	buttonVotePlayer6ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer6"));
-	buttonVotePlayer7ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer7"));
+	buttonVotePlayer1ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer1");
+	buttonVotePlayer2ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer2");
+	buttonVotePlayer3ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer3");
+	buttonVotePlayer4ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer4");
+	buttonVotePlayer5ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer5");
+	buttonVotePlayer6ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer6");
+	buttonVotePlayer7ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer7");
 
 	buttonVotePlayer1Window = TheWindowManager->winGetWindowFromId(NULL, buttonVotePlayer1ID);
 	buttonVotePlayer2Window = TheWindowManager->winGetWindowFromId(NULL, buttonVotePlayer2ID);
@@ -116,17 +116,17 @@ void ShowDisconnectWindow( void )
 
 		// init it
 		InitDisconnectWindow();
-	
+
 		// show it
 		disconnectMenuLayout->hide( FALSE );
 
-	}  // end if
+	}
 	else
 	{
 
 		disconnectMenuLayout->hide( FALSE );
 
-	}  // end else
+	}
 
 	// Disallow voting for 2-player games.  Cheating punk.
 	if ( TheGameInfo && TheGameInfo->getNumPlayers() < 3 )
@@ -156,7 +156,7 @@ void ShowDisconnectWindow( void )
 	GadgetListBoxAddEntryText(textDisplayWindow, TheGameText->fetch("GUI:InternetDisconnectionMenuBody1"),
 		GameMakeColor(255,255,255,255), -1);
 
-}  // end ToggleQuitMenu
+}
 
 //------------------------------------------------------
 /** Hide the Disconnect Screen */
@@ -173,19 +173,19 @@ void HideDisconnectWindow( void )
 
 		// init it
 		InitDisconnectWindow();
-	
+
 		// show it
 		disconnectMenuLayout->hide( TRUE );
 
-	}  // end if
+	}
 	else
 	{
 
 		disconnectMenuLayout->hide( TRUE );
 
-	}  // end else
+	}
 
-}  // end ToggleQuitMenu
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Input callback for the control bar parent */
@@ -196,15 +196,15 @@ WindowMsgHandledType DisconnectControlInput( GameWindow *window, UnsignedInt msg
 
 	return MSG_IGNORED;
 
-} // end DisconnectControlInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** System callback for the control bar parent */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType DisconnectControlSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType DisconnectControlSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		//---------------------------------------------------------------------------------------------
@@ -242,11 +242,11 @@ WindowMsgHandledType DisconnectControlSystem( GameWindow *window, UnsignedInt ms
 
 			break;
 
-		}  // end button selected
+		}
 
 		case GEM_EDIT_DONE:
 		{
-//			DEBUG_LOG(("DisconnectControlSystem - got GEM_EDIT_DONE.\n"));
+//			DEBUG_LOG(("DisconnectControlSystem - got GEM_EDIT_DONE."));
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
 
@@ -256,7 +256,7 @@ WindowMsgHandledType DisconnectControlSystem( GameWindow *window, UnsignedInt ms
 			{
 				UnicodeString txtInput;
 
-//				DEBUG_LOG(("DisconnectControlSystem - GEM_EDIT_DONE was from the text entry control.\n"));
+//				DEBUG_LOG(("DisconnectControlSystem - GEM_EDIT_DONE was from the text entry control."));
 
 				// read the user's input
 				txtInput.set(GadgetTextEntryGetText( textEntryWindow ));
@@ -266,11 +266,11 @@ WindowMsgHandledType DisconnectControlSystem( GameWindow *window, UnsignedInt ms
 				txtInput.trim();
 				// Echo the user's input to the chat window
 				if (!txtInput.isEmpty()) {
-//					DEBUG_LOG(("DisconnectControlSystem - sending string %ls\n", txtInput.str()));
+//					DEBUG_LOG(("DisconnectControlSystem - sending string %ls", txtInput.str()));
 					TheDisconnectMenu->sendChat(txtInput);
 				}
 
-			}// if ( controlID == textEntryChatID )
+			}
 			break;
 		}
 
@@ -278,9 +278,9 @@ WindowMsgHandledType DisconnectControlSystem( GameWindow *window, UnsignedInt ms
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end ControlBarSystem
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
index 093eed7863a..0c6d03a2670 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
@@ -24,12 +24,12 @@
 
 // FILE: DownloadMenu.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/NameKeyGenerator.h"
@@ -109,7 +109,7 @@ static void successQuitCallback( void )
 
 	// Clean up game data.  No crashy-crash for you!
 	if (TheGameLogic->isInGame())
-		TheMessageStream->appendMessage( GameMessage::MSG_CLEAR_GAME_DATA );
+		TheGameLogic->exitGame();
 }
 
 static void successNoQuitCallback( void )
@@ -262,13 +262,11 @@ void DownloadMenuInit( WindowLayout *layout, void *userData )
 	progressBarMunkee = TheWindowManager->winGetWindowFromId( parent, progressBarMunkeeID );
 
 	DEBUG_ASSERTCRASH(!TheDownloadManager, ("Download manager already exists"));
-	if (TheDownloadManager)
-	{
-		delete TheDownloadManager;
-	}
+
+	delete TheDownloadManager;
 	TheDownloadManager = NEW DownloadManagerMunkee;
 
-}  // end DownloadMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** menu shutdown method */
@@ -276,11 +274,9 @@ void DownloadMenuInit( WindowLayout *layout, void *userData )
 void DownloadMenuShutdown( WindowLayout *layout, void *userData )
 {
 	DEBUG_ASSERTCRASH(TheDownloadManager, ("No download manager"));
-	if (TheDownloadManager)
-	{
-		delete TheDownloadManager;
-		TheDownloadManager = NULL;
-	}
+
+	delete TheDownloadManager;
+	TheDownloadManager = NULL;
 
 	staticTextSize = NULL;
 	staticTextTime = NULL;
@@ -289,7 +285,7 @@ void DownloadMenuShutdown( WindowLayout *layout, void *userData )
 	progressBarMunkee = NULL;
 	parent = NULL;
 
-}  // end DownloadMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** menu update method */
@@ -322,7 +318,7 @@ void DownloadMenuUpdate( WindowLayout *layout, void *userData )
 		GadgetStaticTextSetText(staticTextTime, timeString);
 	}
 
-}  // end DownloadMenuUpdate 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** menu input callback */
@@ -331,7 +327,7 @@ WindowMsgHandledType DownloadMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -346,45 +342,44 @@ WindowMsgHandledType DownloadMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "DownloadMenu.wnd:ButtonCancel" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "DownloadMenu.wnd:ButtonCancel" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end DownloadMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType DownloadMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType DownloadMenuSystem( GameWindow *window, UnsignedInt msg,
 																		 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -393,14 +388,14 @@ WindowMsgHandledType DownloadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 
 			break;
 
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -412,28 +407,28 @@ WindowMsgHandledType DownloadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end input
+		}
     //---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-      
+
 			if( controlID == buttonCancelID )
 			{
 				HandleCanceledDownload();
 				closeDownloadWindow();
-			}  // end if
-	
+			}
+
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-} // end DownloadMenuSystem
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
index 07003c86883..b04aeb377aa 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///// EstablishConnectionsWindow.cpp /////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "GameClient/GameWindowManager.h"
@@ -82,7 +82,7 @@ static const char *gadgetsToHide[] =
 	"ButtonSelectMap",
 	"ButtonStart",
 	"StaticTextMapPreview",
-	NULL // keep this last
+	NULL
 };
 static const char *perPlayerGadgetsToHide[] =
 {
@@ -93,7 +93,7 @@ static const char *perPlayerGadgetsToHide[] =
 	"ButtonAccept",
 	"GenericPing",
 	//"ButtonStartPosition",
-	NULL // keep this last
+	NULL
 };
 
 static const char *qmlayoutFilename = "WOLQuickMatchMenu.wnd";
@@ -107,18 +107,18 @@ static const char *qmgadgetsToHide[] =
 	"ButtonWiden",
 	"ButtonStop",
 	"ButtonStart",
-	NULL // keep this last
+	NULL
 };
 static const char *qmperPlayerGadgetsToHide[] =
 {
 	//"ButtonStartPosition",
-	NULL // keep this last
+	NULL
 };
 
 static void showGameSpyGameOptionsUnderlyingGUIElements( Bool show )
 {
 	ShowUnderlyingGUIElements( show, layoutFilename, parentName, gadgetsToHide, perPlayerGadgetsToHide );
-	
+
 }
 static void showGameSpyQMUnderlyingGUIElements( Bool show )
 {
@@ -126,7 +126,7 @@ static void showGameSpyQMUnderlyingGUIElements( Bool show )
 }
 
 static void InitEstablishConnectionsDialog( void ) {
-	buttonQuitID = TheNameKeyGenerator->nameToKey( AsciiString("EstablishConnectionsScreen.wnd:ButtonQuit") );
+	buttonQuitID = TheNameKeyGenerator->nameToKey( "EstablishConnectionsScreen.wnd:ButtonQuit" );
 	buttonQuitWindow = TheWindowManager->winGetWindowFromId(NULL, buttonQuitID);
 }
 
@@ -189,6 +189,6 @@ WindowMsgHandledType EstablishConnectionsControlSystem(GameWindow *window, Unsig
 				}
 				break;
 			}
-	} // end switch
+	}
 	return MSG_HANDLED;
 }
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
index 2a1617cc8e3..b11e6054990 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/WindowLayout.h"
 #include "GameClient/MapUtil.h"
@@ -44,11 +44,6 @@
 #include "GameNetwork/GameInfo.h"
 #include "GameNetwork/LANAPI.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static GameWindow *parent = NULL;
 static GameWindow *staticTextGameName = NULL;
@@ -72,8 +67,8 @@ static WindowLayout *gameInfoWindowLayout = NULL;
 void CreateLANGameInfoWindow( GameWindow *sizeAndPosWin )
 {
 	if( !gameInfoWindowLayout )
-		gameInfoWindowLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/GameInfoWindow.wnd" ) );
-	
+		gameInfoWindowLayout = TheWindowManager->winCreateLayout( "Menus/GameInfoWindow.wnd" );
+
 	gameInfoWindowLayout->runInit();
 	gameInfoWindowLayout->bringForward();
 	gameInfoWindowLayout->hide( TRUE );
@@ -95,7 +90,7 @@ void DestroyGameInfoWindow(void)
 	{
 		gameInfoWindowLayout->destroyWindows();
 		deleteInstance(gameInfoWindowLayout);
-		gameInfoWindowLayout = NULL;		
+		gameInfoWindowLayout = NULL;
 	}
 }
 
@@ -124,7 +119,7 @@ void RefreshGameInfoWindow(GameInfo *gameInfo, UnicodeString gameName)
 	{
 		// can happen if the map will have to be transferred... so use the leaf name (srj)
 		const char *noPath = gameInfo->getMap().reverseFind('\\');
-		if (noPath) 
+		if (noPath)
 		{
 			++noPath;
 		}
@@ -201,7 +196,7 @@ void RefreshGameInfoWindow(GameInfo *gameInfo, UnicodeString gameName)
 			GadgetListBoxAddEntryImage(listBoxPlayers, fact->getSideIconImage(),addedRow, 0, 22,25);
 			//GadgetListBoxAddEntryText(listBoxPlayers,fact->getDisplayName(),playerColor,addedRow, 0);
 		}
-	
+
 	}
 }
 
@@ -226,7 +221,7 @@ void GameInfoWindowInit( WindowLayout *layout, void *userData )
 	winCratesID = TheNameKeyGenerator->nameToKey( "GameInfoWindow.wnd:WinCrates" );
 	winSuperWeaponsID = TheNameKeyGenerator->nameToKey( "GameInfoWindow.wnd:WinSuperWeapons" );
 	winFreeForAllID = TheNameKeyGenerator->nameToKey( "GameInfoWindow.wnd:WinFreeForAll" );
-	
+
 	parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	staticTextGameName = TheWindowManager->winGetWindowFromId( parent, staticTextGameNameID );
 	staticTextMapName = TheWindowManager->winGetWindowFromId( parent, staticTextMapNameID );
@@ -238,17 +233,17 @@ void GameInfoWindowInit( WindowLayout *layout, void *userData )
 	GadgetStaticTextSetText(staticTextGameName,UnicodeString::TheEmptyString);
 	GadgetStaticTextSetText(staticTextMapName,UnicodeString::TheEmptyString);
 	GadgetListBoxReset(listBoxPlayers);
-	
-}  // end MapSelectMenuInit
+
+}
 
 
 //-------------------------------------------------------------------------------------------------
 /** GameInfo window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType GameInfoWindowSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType GameInfoWindowSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 // might use these later
 //			GameWindow *control = (GameWindow *)mData1;
@@ -261,7 +256,7 @@ WindowMsgHandledType GameInfoWindowSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -269,7 +264,7 @@ WindowMsgHandledType GameInfoWindowSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -281,15 +276,15 @@ WindowMsgHandledType GameInfoWindowSystem( GameWindow *window, UnsignedInt msg,
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end MapSelectMenuSystem
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
index 3851ad25945..b88f31dd093 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
@@ -24,12 +24,12 @@
 
 // FILE: KeyboardOptionsMenu.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   Command & Conquer: Generals
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/GameEngine.h"
@@ -126,7 +126,7 @@ void populateCategoryBox()
 	for ( i = 0; i < CATEGORY_NUM_CATEGORIES; ++i)
 	{
 		temp.format("GUI:%s", CategoryListName[i]);
-		str = TheGameText->fetch( temp ); 
+		str = TheGameText->fetch( temp );
 		index = GadgetComboBoxAddEntry(comboBoxCategoryList, str, color);
 	}
 
@@ -378,7 +378,7 @@ void doKeyDown(EntryData *e, UnicodeString mod )
 				}
 
 			}
-					
+
 		}
 	}
 }
@@ -395,7 +395,7 @@ void KeyboardOptionsMenuInit( WindowLayout *layout, void *userData )
 	parentKeyboardOptionsMenu = TheWindowManager->winGetWindowFromId( NULL, parentKeyboardOptionsMenuID );
 
 	// get ids for our children controls
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("KeyboardOptionsMenu.wnd:ButtonBack") );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "KeyboardOptionsMenu.wnd:ButtonBack" );
 	buttonBack = TheWindowManager->winGetWindowFromId( parentKeyboardOptionsMenu, buttonBackID );
 
 	comboBoxCategoryListID = TheNameKeyGenerator->nameToKey( "KeyboardOptionsMenu.wnd:ComboBoxCategoryList" );
@@ -468,7 +468,7 @@ void KeyboardOptionsMenuShutdown( WindowLayout *layout, void *userData )
 void KeyboardOptionsMenuUpdate( WindowLayout *layout, void *userData )
 {
 
-}  // end OptionsMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Options menu input callback */
@@ -477,7 +477,7 @@ WindowMsgHandledType KeyboardOptionsMenuInput( GameWindow *window, UnsignedInt m
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -492,53 +492,52 @@ WindowMsgHandledType KeyboardOptionsMenuInput( GameWindow *window, UnsignedInt m
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "KeyboardOptionsMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "KeyboardOptionsMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end KeyboardOptionsMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** options menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 																				WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
-			
+
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -546,7 +545,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -558,7 +557,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
@@ -572,10 +571,10 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
         GadgetComboBoxGetSelectedPos(comboBoxCategoryList, &selected);
 
 				LookupListRec rec;
-				rec = CategoryListName[selected]; 
+				rec = CategoryListName[selected];
 				MappableKeyCategories cat = (MappableKeyCategories)(rec.value);
 				fillCommandListBox( cat );
-				
+
 				//reset current hotkey description
 				GadgetStaticTextSetText( staticTextDescription, TheGameText->fetch( "GUI:NULL" ) );
 
@@ -593,7 +592,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
       }
 			break;
 
-		}  // end selected
+		}
 
 		// ---------------------------------------------------------------------------------------------
 		case GLM_SELECTED:
@@ -617,7 +616,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 						MappableKeyType type = rec->m_key;
 						//enable text entry for assigning different hotkey
 						textEntryAssignHotkey->winEnable( true );
-						
+
 						for (const LookupListRec* keyName = KeyNames; keyName->name; keyName++)
 						{
 							if( keyName->value == type )
@@ -627,7 +626,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 								aStr.format( cptr );
 								UnicodeString uStr;
 								uStr.translate( aStr );
-								
+
 								GadgetStaticTextSetText( staticTextCurrentHotkey, uStr );
 								break;
 							}
@@ -635,13 +634,13 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 
 						break;
 					}
-				} // end if
+				}
 
-			} // end selected
+			}
 
 			break;
 
-		} // end case
+		}
 
 		// ---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -655,7 +654,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 				// go back one screen
 				TheShell->pop();
 
-			}  // end if
+			}
 			else if( controlID == buttonAssignID )
 			{
 				// check grammar in text field
@@ -680,7 +679,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 				setKeyDown(alt, false );
 				setKeyDown(ctrl, false );
 				setKeyDown(shift, false );
-				
+
 				//disable text entry
 				textEntryAssignHotkey->winEnable( false );
 
@@ -688,16 +687,16 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 
 			break;
 
-		}	// end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}	// end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end KeyboardOptionsMenuSystem
+}
 
 // KeyboardTextEntryInput =======================================================
 /** Handle input for text entry field */
@@ -715,7 +714,7 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 		return MSG_HANDLED;
 	}
 
-	switch( msg ) 
+	switch( msg )
 	{
 		// ------------------------------------------------------------------------
 		case GWM_IME_CHAR:
@@ -726,9 +725,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 			if ( ch == VK_RETURN )
 			{
 				// Done with this edit
-			 		TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			 		TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 			 																				GEM_EDIT_DONE,
-			 																				(WindowMsgData)window, 
+			 																				(WindowMsgData)window,
 			 																				0 );
 				return MSG_HANDLED;
 			};
@@ -759,9 +758,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					e->text->setText( UnicodeString::TheEmptyString );
 					e->text->appendChar( ch );
 					e->charPos = e->text->getTextLength();
-					TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+					TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GEM_UPDATE_TEXT,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					0 );
 					return MSG_HANDLED;
 				}
@@ -773,9 +772,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					{
 						e->text->appendChar( ch );
 						e->charPos++;
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GEM_UPDATE_TEXT,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 						return MSG_HANDLED;
 					}
@@ -791,9 +790,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 							{
 								e->text->removeLastChar();
 								e->text->appendChar( ch );
-								TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+								TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GEM_UPDATE_TEXT,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								0 );
 							}
 						}
@@ -803,15 +802,15 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 							e->text->setText( UnicodeString::TheEmptyString );
 							e->text->appendChar( ch );
 							e->charPos = 1;
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																							GEM_UPDATE_TEXT,
-																							(WindowMsgData)window, 
+																							(WindowMsgData)window,
 																							0 );
 						}
 						return MSG_HANDLED;
 					}
 				}
-				
+
 
 			}
 			break;
@@ -830,9 +829,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					{
 						if( e->receivedUnichar == FALSE )
 						{
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GEM_EDIT_DONE,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									0 );
 						}
 					}
@@ -849,9 +848,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					{
 						UnicodeString mod = ctrl;
 						doKeyDown( e, mod );
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																GEM_UPDATE_TEXT,
-																(WindowMsgData)window, 
+																(WindowMsgData)window,
 																0 );
 
 						return MSG_HANDLED;
@@ -860,9 +859,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					{
 							UnicodeString mod = ctrl;
 							doKeyUp( e, mod );
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GEM_UPDATE_TEXT,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 
 							return MSG_HANDLED;
@@ -877,9 +876,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					{
 						UnicodeString mod = shift;
 						doKeyDown( e, mod );
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																GEM_UPDATE_TEXT,
-																(WindowMsgData)window, 
+																(WindowMsgData)window,
 																0 );
 
 						return MSG_HANDLED;
@@ -890,9 +889,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 						UnicodeString mod = shift;
 						doKeyUp(e, mod );
 
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GEM_UPDATE_TEXT,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 
 
@@ -908,9 +907,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 						UnicodeString mod = alt;
 						doKeyDown( e, mod );
 
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																GEM_UPDATE_TEXT,
-																(WindowMsgData)window, 
+																(WindowMsgData)window,
 																0 );
 
 						return MSG_HANDLED;
@@ -920,9 +919,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					{
 						UnicodeString mod = alt;
 						doKeyUp( e, mod );
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																GEM_UPDATE_TEXT,
-																(WindowMsgData)window, 
+																(WindowMsgData)window,
 																0 );
 
 						return MSG_HANDLED;
@@ -977,15 +976,15 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 				{
 					e->text->setText( UnicodeString::TheEmptyString );
 					e->charPos = e->text->getTextLength();
-					TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+					TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GEM_UPDATE_TEXT,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					0 );
 					setKeyDown(shift, false );
 					setKeyDown(ctrl, false );
 					setKeyDown(alt, false );
 					return MSG_HANDLED;
-					
+
 					break;
 				}
 				case KEY_DEL:
@@ -1003,11 +1002,11 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 								e->text->removeLastChar();
 								e->sText->removeLastChar();
 								e->charPos--;
-								TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+								TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GEM_UPDATE_TEXT,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								0 );
-							}  // end if
+							}
 						}
 					}
 					break;
@@ -1044,9 +1043,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 							e->text->setText( UnicodeString::TheEmptyString );
 							e->text->appendChar( ch );
 							e->charPos = e->text->getTextLength();
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																							GEM_UPDATE_TEXT,
-																							(WindowMsgData)window, 
+																							(WindowMsgData)window,
 																							0 );
 							return MSG_HANDLED;
 						}
@@ -1058,9 +1057,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 							{
 								e->text->appendChar( ch );
 								e->charPos++;
-								TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+								TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GEM_UPDATE_TEXT,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								0 );
 								return MSG_HANDLED;
 							}
@@ -1076,9 +1075,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 									{
 										e->text->removeLastChar();
 										e->text->appendChar( ch );
-										TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+										TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																										GEM_UPDATE_TEXT,
-																										(WindowMsgData)window, 
+																										(WindowMsgData)window,
 																										0 );
 									}
 								}
@@ -1088,21 +1087,21 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 									e->text->setText( UnicodeString::TheEmptyString );
 									e->text->appendChar( ch );
 									e->charPos = 1;
-									TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+									TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GEM_UPDATE_TEXT,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									0 );
 								}
 								return MSG_HANDLED;
 							}
 						}
-						
+
 
 					}
 				}*/
 
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
@@ -1119,7 +1118,7 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
 																						(WindowMsgData)window, 0 );
 				TheWindowManager->winSetFocus( window );
@@ -1134,7 +1133,7 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
 																						(WindowMsgData)window, 0 );
 			}
@@ -1144,7 +1143,7 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 		case GWM_LEFT_DRAG:
 
 			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
 																						(WindowMsgData)window, 0 );
 			break;
@@ -1153,10 +1152,10 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetTextEntryInput
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
index 047a79989e0..0fdce08eaa1 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
@@ -27,7 +27,7 @@
 // Author: Chris Huybregts, October 2001
 // Description: Lan Game Options Menu
 ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/PlayerTemplate.h"
@@ -57,11 +57,6 @@
 #include "GameClient/GameText.h"
 #include "GameNetwork/GUIUtil.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 extern char *LANnextScreen;
 extern Bool LANisShuttingDown;
@@ -188,7 +183,7 @@ void updateMapStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[
 void positionStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[], GameWindow *mapWindow);
 void LanPositionStartSpots( void )
 {
-	
+
 	positionStartSpots( TheLAN->GetMyGame(), buttonMapStartPosition, windowMap);
 }
 static void playerTooltip(GameWindow *window,
@@ -219,15 +214,8 @@ static void playerTooltip(GameWindow *window,
 		TheMouse->setCursorTooltip( UnicodeString::TheEmptyString );
 		return;
 	}
-	UnicodeString tooltip;
-	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());
-#if defined(_DEBUG) || defined(_INTERNAL)
-	UnicodeString ip;
-	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
-	tooltip.concat(ip);
-#endif
 
-	TheMouse->setCursorTooltip( tooltip );
+	setLANPlayerTooltip(player);
 }
 
 void StartPressed(void)
@@ -266,7 +254,7 @@ void StartPressed(void)
 		{
 			UnicodeString text;
 			text.format(TheGameText->fetch("LAN:TooManyPlayers"), (md)?md->m_numPlayers:0);
-			TheLAN->OnChat(UnicodeString(L"SYSTEM"), TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
+			TheLAN->OnChat(L"SYSTEM", TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
 		}
 		return;
 	}
@@ -277,7 +265,7 @@ void StartPressed(void)
 		if (TheLAN->AmIHost())
 		{
 			UnicodeString text = TheGameText->fetch("GUI:NeedHumanPlayers");
-			TheLAN->OnChat(UnicodeString(L"SYSTEM"), TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
+			TheLAN->OnChat(L"SYSTEM", TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
 		}
 		return;
 	}
@@ -289,14 +277,14 @@ void StartPressed(void)
 		{
 			UnicodeString text;
 			text.format(TheGameText->fetch("LAN:NeedMorePlayers"),numUsers);
-			TheLAN->OnChat(UnicodeString(L"SYSTEM"), TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
+			TheLAN->OnChat(L"SYSTEM", TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
 		}
 		return;
 	}
 
 	// Check for too few teams
 	int numRandom = 0;
-	std::set<Int> teams; 
+	std::set<Int> teams;
 	for (i=0; i<MAX_SLOTS; ++i)
 	{
 		GameSlot *slot = myGame->getSlot(i);
@@ -318,7 +306,7 @@ void StartPressed(void)
 		{
 			UnicodeString text;
 			text.format(TheGameText->fetch("LAN:NeedMoreTeams"));
-			TheLAN->OnChat(UnicodeString(L"SYSTEM"), TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
+			TheLAN->OnChat(L"SYSTEM", TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
 		}
 		return;
 	}
@@ -327,7 +315,7 @@ void StartPressed(void)
 	{
 		UnicodeString text;
 		text.format(TheGameText->fetch("GUI:SandboxMode"));
-			TheLAN->OnChat(UnicodeString(L"SYSTEM"), TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
+			TheLAN->OnChat(L"SYSTEM", TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
 	}
 
 	// see if everyone's accepted and count the number of players in the game
@@ -393,7 +381,7 @@ void StartPressed(void)
 		}
 	}
 
-}//void StartPressed(void)
+}
 
 void LANEnableStartButton(Bool enabled)
 {
@@ -518,7 +506,7 @@ static void handlePlayerTemplateSelection(int index)
 static void handleStartPositionSelection(Int player, int startPos)
 {
 	LANGameInfo *myGame = TheLAN->GetMyGame();
-	
+
 	if (myGame)
 	{
 		LANGameSlot * slot = myGame->getLANSlot(player);
@@ -531,7 +519,7 @@ static void handleStartPositionSelection(Int player, int startPos)
 		}
 
 		if(!skip)
-		{	
+		{
 			Bool isAvailable = TRUE;
 			for(Int i = 0; i < MAX_SLOTS; ++i)
 			{
@@ -617,7 +605,7 @@ void lanUpdateSlotList( void )
 		return;
 	UpdateSlotList( TheLAN->GetMyGame(), comboBoxPlayer, comboBoxColor,
 		comboBoxPlayerTemplate, comboBoxTeam, buttonAccept, buttonStart, buttonMapStartPosition);
-	
+
 	updateMapStartSpots(TheLAN->GetMyGame(), buttonMapStartPosition);
 }
 
@@ -627,15 +615,15 @@ void lanUpdateSlotList( void )
 void InitLanGameGadgets( void )
 {
 	//Initialize the gadget IDs
-	parentLanGameOptionsID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:LanGameOptionsMenuParent" ) );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonBack" ) );
-	buttonStartID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonStart" ) );
-	textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:TextEntryChat" ) );
-	textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:TextEntryMapDisplay" ) );
-	listboxChatWindowLanGameID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ListboxChatWindowLanGame" ) );
-	buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonEmote" ) );
-	buttonSelectMapID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonSelectMap" ) );
-	windowMapID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:MapWindow" ) );
+	parentLanGameOptionsID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:LanGameOptionsMenuParent" );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonBack" );
+	buttonStartID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonStart" );
+	textEntryChatID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:TextEntryChat" );
+	textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:TextEntryMapDisplay" );
+	listboxChatWindowLanGameID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ListboxChatWindowLanGame" );
+	buttonEmoteID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonEmote" );
+	buttonSelectMapID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonSelectMap" );
+	windowMapID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:MapWindow" );
 
 	// Initialize the pointers to our gadgets
 	parentLanGameOptions = TheWindowManager->winGetWindowFromId( NULL, parentLanGameOptionsID );
@@ -661,11 +649,8 @@ void InitLanGameGadgets( void )
 	Int localSlotNum = TheLAN->GetMyGame()->getLocalSlotNum();
 	DEBUG_ASSERTCRASH(localSlotNum >= 0, ("Bad slot number!"));
 
-	//Added By Sadullah Nader
 	//Tooltip function is being set for techBuildings, and supplyDocks
-
 	windowMap->winSetTooltipFunc(MapSelectorTooltip);
-	//End Add
 
 	for (Int i = 0; i < MAX_SLOTS; i++)
 	{
@@ -676,11 +661,7 @@ void InitLanGameGadgets( void )
 		GadgetComboBoxReset(comboBoxPlayer[i]);
 		GadgetComboBoxGetEditBox(comboBoxPlayer[i])->winSetTooltipFunc(playerTooltip);
 
-		if(localSlotNum == i)
-		{
-			GadgetComboBoxAddEntry(comboBoxPlayer[i],TheLAN->GetMyName(),white);
-		}
-		else
+		if(localSlotNum != i)
 		{
 			GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Open"),white);
 			GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Closed"),white);
@@ -702,7 +683,7 @@ void InitLanGameGadgets( void )
 		DEBUG_ASSERTCRASH(comboBoxColor[i], ("Could not find the comboBoxColor[%d]",i ));
 		PopulateColorComboBox(i, comboBoxColor, TheLAN->GetMyGame());
 		GadgetComboBoxSetSelectedPos(comboBoxColor[i], 0);
-		
+
 		tmpString.format("LanGameOptionsMenu.wnd:ComboBoxPlayerTemplate%d", i);
 		comboBoxPlayerTemplateID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		comboBoxPlayerTemplate[i] = TheWindowManager->winGetWindowFromId( parentLanGameOptions, comboBoxPlayerTemplateID[i] );
@@ -716,13 +697,12 @@ void InitLanGameGadgets( void )
 		PopulateTeamComboBox(i, comboBoxTeam, TheLAN->GetMyGame());
 
 		tmpString.clear();
-		tmpString.format("LanGameOptionsMenu.wnd:ButtonAccept%d", i); 
+		tmpString.format("LanGameOptionsMenu.wnd:ButtonAccept%d", i);
 		buttonAcceptID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		buttonAccept[i] = TheWindowManager->winGetWindowFromId( parentLanGameOptions, buttonAcceptID[i] );
 		DEBUG_ASSERTCRASH(buttonAccept[i], ("Could not find the buttonAccept[%d]",i ));
-		//Added by Saad for the tooltips on the MultiPlayer icons
 		buttonAccept[i]->winSetTooltipFunc(gameAcceptTooltip);
-//		
+//
 //		tmpString.format("LanGameOptionsMenu.wnd:ButtonStartPosition%d", i);
 //		buttonStartPositionID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 //		buttonStartPosition[i] = TheWindowManager->winGetWindowFromId( parentLanGameOptions, buttonStartPositionID[i] );
@@ -738,7 +718,7 @@ void InitLanGameGadgets( void )
 	}
 	if( buttonAccept[0] )
 		GadgetButtonSetEnabledColor(buttonAccept[0], acceptTrueColor );
-	
+
 }
 
 void DeinitLanGameGadgets( void )
@@ -751,7 +731,11 @@ void DeinitLanGameGadgets( void )
 	listboxChatWindowLanGame = NULL;
 	textEntryChat = NULL;
 	textEntryMapDisplay = NULL;
-	windowMap = NULL;
+	if (windowMap)
+	{
+		windowMap->winSetUserData(NULL);
+		windowMap = NULL;
+	}
 	for (Int i = 0; i < MAX_SLOTS; i++)
 	{
 		comboBoxPlayer[i] = NULL;
@@ -773,7 +757,7 @@ void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
 	{
 		// If we init while the game is in progress, we are really returning to the menu
 		// after the game.  So, we pop the menu and go back to the lobby.  Whee!
-		DEBUG_LOG(("Popping to lobby after a game!\n"));
+		DEBUG_LOG(("Popping to lobby after a game!"));
 		TheShell->popImmediate();
 		return;
 	}
@@ -790,7 +774,7 @@ void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
 
 	// Make sure the text fields are clear
 	GadgetListBoxReset( listboxChatWindowLanGame );
-	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);	
+	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);
 
 	//The dialog needs to react differently depending on whether it's the host or not.
 	TheMapCache->updateCache();
@@ -820,11 +804,14 @@ void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
 		lanUpdateSlotList();
 		updateGameOptions();
 		start = 1; // leave my combo boxes usable
+
+		// TheSuperHackers @tweak disable the combo box for the host's player name
+		comboBoxPlayer[0]->winEnable(FALSE);
 	}
 	else
 	{
 
-		//DEBUG_LOG(("LanGameOptionsMenuInit(): map is %s\n", TheLAN->GetMyGame()->getMap().str()));
+		//DEBUG_LOG(("LanGameOptionsMenuInit(): map is %s", TheLAN->GetMyGame()->getMap().str()));
 		buttonStart->winSetText(TheGameText->fetch("GUI:Accept"));
 		buttonSelectMap->winEnable( FALSE );
 		TheLAN->GetMyGame()->setMapCRC( TheLAN->GetMyGame()->getMapCRC() );		// force a recheck
@@ -853,7 +840,7 @@ void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
 //
 	// Show the Menu
 	layout->hide( FALSE );
-	
+
 	// Set Keyboard to Main Parent
 	TheWindowManager->winSetFocus( parentLanGameOptions );
 
@@ -870,8 +857,8 @@ void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
 
 	// animate controls
 	//TheShell->registerWithAnimateManager(buttonBack, WIN_ANIMATION_SLIDE_RIGHT, TRUE, 1);
-	
-}// void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update options on screen */
@@ -905,6 +892,29 @@ void updateGameOptions( void )
 }
 
 
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void setLANPlayerTooltip(LANPlayer* player)
+{
+	UnicodeString tooltip;
+
+	if (!player->getLogin().isEmpty() || !player->getHost().isEmpty())
+	{
+		tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());
+	}
+
+#if defined(RTS_DEBUG)
+	UnicodeString ip;
+	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
+	tooltip.concat(ip);
+#endif
+
+	if (!tooltip.isEmpty())
+	{
+		TheMouse->setCursorTooltip( tooltip );
+	}
+}
+
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -928,7 +938,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	LANnextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Game Options menu shutdown method */
@@ -948,7 +958,7 @@ void LanGameOptionsMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 	TheTransitionHandler->reverse("LanGameOptionsFade");
@@ -965,7 +975,7 @@ void LanGameOptionsMenuShutdown( WindowLayout *layout, void *userData )
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 	*/
-}  // void LanGameOptionsMenuShutdown( WindowLayout *layout, void *userData )
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Game Options menu update method */
@@ -975,7 +985,7 @@ void LanGameOptionsMenuUpdate( WindowLayout * layout, void *userData)
 	if(LANisShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 		shutdownComplete(layout);
 	//TheLAN->update(); // this is handled in the lobby
-}// void LanGameOptionsMenuUpdate( WindowLayout * layout, void *userData)
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Game Options menu input callback */
@@ -983,7 +993,7 @@ void LanGameOptionsMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType LanGameOptionsMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1005,51 +1015,54 @@ WindowMsgHandledType LanGameOptionsMenuInput( GameWindow *window, UnsignedInt ms
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
-					}  // end if
+					}
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
-				}  // end escape
-			}  // end switch( key )
-		}  // end char
-	}  // end switch( msg )
+				}
+			}
+		}
+	}
 	return MSG_IGNORED;
-}//WindowMsgHandledType LanGameOptionsMenuInput( GameWindow *window, UnsignedInt msg,
+}
 
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Game Options menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 	switch( msg )
 	{
-		//-------------------------------------------------------------------------------------------------	
+		//-------------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 			{
+				if (windowMap)
+					windowMap->winSetUserData(NULL);
+
 				break;
-			} // case GWM_DESTROY:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
 			{
-				
+
 				if (LANbuttonPushed)
 					break;
 				GameWindow *control = (GameWindow *)mData1;
@@ -1105,7 +1118,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 						break;
 					}
 				}
-			}// case GCM_SELECTED:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 			{
@@ -1125,7 +1138,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 					TheLAN->RequestGameLeave();
 					//TheShell->pop();
 
-				} //if ( controlID == buttonBack )				
+				}
 				else if ( controlID == buttonEmoteID )
 				{
 					// read the user's input
@@ -1137,12 +1150,12 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 					// Echo the user's input to the chat window
 					if (!txtInput.isEmpty())
 						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_EMOTE);
-				} //if ( controlID == buttonEmote )
+				}
 				else if ( controlID == buttonSelectMapID )
 				{
 					//buttonBack->winEnable( false );
-				
-					mapSelectLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/LanMapSelectMenu.wnd" ) );
+
+					mapSelectLayout = TheWindowManager->winCreateLayout( "Menus/LanMapSelectMenu.wnd" );
 					mapSelectLayout->runInit();
 					mapSelectLayout->hide( FALSE );
 					mapSelectLayout->bringForward();
@@ -1163,7 +1176,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 						// Disable the accept button
 						EnableAcceptControls(TRUE, TheLAN->GetMyGame(), comboBoxPlayer, comboBoxColor, comboBoxPlayerTemplate,
 							comboBoxTeam, buttonAccept, buttonStart, buttonMapStartPosition);
-						
+
 					}
 				}
 				else
@@ -1210,7 +1223,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 				}
 
 				break;
-			}// case GBM_SELECTED:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GBM_SELECTED_RIGHT:
 		{
@@ -1244,7 +1257,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 						}
 					}
 				}
-			}					
+			}
 			break;
 		}
 		//-------------------------------------------------------------------------------------------------
@@ -1259,7 +1272,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 				// send it to the other clients on the lan
 				if ( controlID == textEntryChatID )
 				{
-					
+
 					// read the user's input
 					txtInput.set(GadgetTextEntryGetText( textEntryChat ));
 					// Clear the text entry line
@@ -1270,15 +1283,15 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 					if (!txtInput.isEmpty())
 						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_NORMAL);
 
-				}// if ( controlID == textEntryChatID )
+				}
 				break;
 			}
 		//-------------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
-	}//Switch
+	}
 	return MSG_HANDLED;
-}//WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt msg, 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Utility FUnction used as a bridge from other windows to this one */
@@ -1294,12 +1307,12 @@ void PostToLanGameOptions( PostToLanGameType post )
 		case SEND_GAME_OPTS:
 		{
 			LANGameInfo *game = TheLAN->GetMyGame();
-			game->resetAccepted();			
-			updateGameOptions();		
+			game->resetAccepted();
+			updateGameOptions();
 			lanUpdateSlotList();
-			
+
 			//buttonBack->winEnable( true );
-			
+
 			for(Int i = 0; i < MAX_SLOTS; ++i)
 			{
 				game->getSlot(i)->setStartPos(-1);
@@ -1307,7 +1320,7 @@ void PostToLanGameOptions( PostToLanGameType post )
 
 			TheLAN->RequestGameOptions(GenerateGameOptionsString(), true);
 			break;
-		}		//-------------------------------------------------------------------------------------------------
+		}
 		case MAP_BACK:
 		{
 				//buttonBack->winEnable( true );
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
index 371f02faecf..36467a3d0ff 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Lib/BaseType.h"
 #include "Common/crc.h"
@@ -193,7 +193,7 @@ AsciiString LANPreferences::getPreferredMap(void)
 		ret = getDefaultMap(TRUE);
 		return ret;
 	}
-	
+
 	return ret;
 }
 
@@ -233,7 +233,7 @@ UnicodeString LANPreferences::getRemoteIPEntry(Int i)
 	asciientry.set(asciientry.str() + 1); // skip the ':'
 
 	ret.translate(ipstr);
-	if (asciientry.getLength() > 0)
+	if (!asciientry.isEmpty())
 	{
 		ret.concat(L"(");
 		ret.concat(QuotedPrintableToUnicodeString(asciientry));
@@ -243,6 +243,48 @@ UnicodeString LANPreferences::getRemoteIPEntry(Int i)
 	return ret;
 }
 
+static const char superweaponRestrictionKey[] = "SuperweaponRestrict";
+
+Bool LANPreferences::getSuperweaponRestricted(void) const
+{
+  LANPreferences::const_iterator it = find(superweaponRestrictionKey);
+  if (it == end())
+  {
+    return false;
+  }
+
+  return ( it->second.compareNoCase( "yes" ) == 0 );
+}
+
+void LANPreferences::setSuperweaponRestricted( Bool superweaponRestricted )
+{
+  (*this)[superweaponRestrictionKey] = superweaponRestricted ? "Yes" : "No";
+}
+
+static const char startingCashKey[] = "StartingCash";
+Money LANPreferences::getStartingCash(void) const
+{
+  LANPreferences::const_iterator it = find(startingCashKey);
+  if (it == end())
+  {
+    return TheMultiplayerSettings->getDefaultStartingMoney();
+  }
+
+  Money money;
+  money.deposit( strtoul( it->second.str(), NULL, 10 ), FALSE, FALSE );
+
+  return money;
+}
+
+void LANPreferences::setStartingCash( const Money & startingCash )
+{
+  AsciiString option;
+
+  option.format( "%d", startingCash.countMoney() );
+
+  (*this)[startingCashKey] = option;
+}
+
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 
 
@@ -310,14 +352,8 @@ static void playerTooltip(GameWindow *window,
 		//TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:LobbyPlayers") );
 		return;
 	}
-	UnicodeString tooltip;
-	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());
-#if defined(_DEBUG) || defined(_INTERNAL)
-	UnicodeString ip;
-	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
-	tooltip.concat(ip);
-#endif
-	TheMouse->setCursorTooltip( tooltip );
+
+	setLANPlayerTooltip(player);
 }
 
 
@@ -331,20 +367,20 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	LANisShuttingDown = false;
 
 	// get the ids for our controls
-	parentLanLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:LanLobbyMenuParent" ) );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonBack" ) );
-	buttonClearID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonClear" ) );
-	buttonHostID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonHost" ) );
-	buttonJoinID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonJoin" ) );
-	buttonDirectConnectID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonDirectConnect" ) );
-	buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonEmote" ) );
-	staticToolTipID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:StaticToolTip" ) );
-	textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:TextEntryPlayerName" ) );
-	textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:TextEntryChat" ) );
-	listboxPlayersID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ListboxPlayers" ) );
-	listboxChatWindowID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ListboxChatWindowLanLobby" ) );
-	listboxGamesID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ListboxGames" ) );
-	staticTextGameInfoID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:StaticTextGameInfo" ) );
+	parentLanLobbyID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:LanLobbyMenuParent" );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonBack" );
+	buttonClearID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonClear" );
+	buttonHostID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonHost" );
+	buttonJoinID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonJoin" );
+	buttonDirectConnectID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonDirectConnect" );
+	buttonEmoteID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonEmote" );
+	staticToolTipID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:StaticToolTip" );
+	textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:TextEntryPlayerName" );
+	textEntryChatID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:TextEntryChat" );
+	listboxPlayersID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ListboxPlayers" );
+	listboxChatWindowID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ListboxChatWindowLanLobby" );
+	listboxGamesID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ListboxGames" );
+	staticTextGameInfoID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:StaticTextGameInfo" );
 
 
 	// Get pointers to the window buttons
@@ -370,7 +406,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	// Init LAN API Singleton
 	if (!TheLAN)
 	{
-		TheLAN = NEW LANAPI();	/// @todo clh delete TheLAN and 
+		TheLAN = NEW LANAPI();	/// @todo clh delete TheLAN and
 		useFpsLimit = TheGlobalData->m_useFpsLimit;
 	}
 	else
@@ -405,7 +441,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	{
 		IPSource = L"Default local IP";
 	}
-#if defined(_DEBUG) || defined(_INTERNAL)
+#if defined(RTS_DEBUG)
 	UnicodeString str;
 	str.format(L"%s: %d.%d.%d.%d", IPSource, PRINTF_IP_AS_4_INTS(IP));
 	GadgetListBoxAddEntryText(listboxChatWindow, str, chatSystemColor, -1, 0);
@@ -422,8 +458,8 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	//txtInput.translate(IPs.getMachineName());
 	LANPreferences prefs;
 	defaultName = prefs.getUserName();
-	while (defaultName.getLength() > g_lanPlayerNameLength)
-		defaultName.removeLastChar();
+	defaultName.truncateTo(g_lanPlayerNameLength);
+
 	GadgetTextEntrySetText( textEntryPlayerName, defaultName);
 	// Clear the text entry line
 	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);
@@ -431,8 +467,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	GadgetListBoxReset(listboxPlayers);
 	GadgetListBoxReset(listboxGames);
 
-	while (defaultName.getLength() > g_lanPlayerNameLength)
-		defaultName.removeLastChar();
+	defaultName.truncateTo(g_lanPlayerNameLength);
 	TheLAN->RequestSetName(defaultName);
 	TheLAN->RequestLocations();
 
@@ -460,7 +495,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	//shellmapOn = FALSE;
 	// coming out of a game, re-load the shell map
 	TheShell->showShellMap(TRUE);
-		
+
 	// check for MOTD
 	TheLAN->checkMOTD();
 	layout->hide(FALSE);
@@ -472,7 +507,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	if(win)
 		win->winHide(TRUE);
 
-	
+
 	// animate controls
 	//TheShell->registerWithAnimateManager(parentLanLobby, WIN_ANIMATION_SLIDE_TOP, TRUE);
 //	TheShell->registerWithAnimateManager(buttonHost, WIN_ANIMATION_SLIDE_LEFT, TRUE, 600);
@@ -481,7 +516,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 //	//TheShell->registerWithAnimateManager(buttonOptions, WIN_ANIMATION_SLIDE_LEFT, TRUE, 1);
 //	TheShell->registerWithAnimateManager(buttonBack, WIN_ANIMATION_SLIDE_RIGHT, TRUE, 1);
 
-} // GameLobbyMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -504,7 +539,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	LANnextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Lobby menu shutdown method */
@@ -541,13 +576,13 @@ void LanLobbyMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 	TheTransitionHandler->reverse("LanLobbyFade");
 	//if(	shellmapOn)
 //		TheShell->showShellMap(TRUE);
-}  // LanLobbyMenuShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -580,7 +615,7 @@ void LanLobbyMenuUpdate( WindowLayout * layout, void *userData)
 
 	if (LANSocketErrorDetected == TRUE) {
 		LANSocketErrorDetected = FALSE;
-		DEBUG_LOG(("SOCKET ERROR!  BAILING!\n"));
+		DEBUG_LOG(("SOCKET ERROR!  BAILING!"));
 		MessageBoxOk(TheGameText->fetch("GUI:NetworkError"), TheGameText->fetch("GUI:SocketError"), NULL);
 
 		// we have a socket problem, back out to the main menu.
@@ -588,8 +623,8 @@ void LanLobbyMenuUpdate( WindowLayout * layout, void *userData)
 																			 (WindowMsgData)buttonBack, buttonBackID);
 	}
 
-	
-}// LanLobbyMenuUpdate
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Lobby menu input callback */
@@ -597,7 +632,7 @@ void LanLobbyMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType LanLobbyMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -614,74 +649,74 @@ WindowMsgHandledType LanLobbyMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// LanLobbyMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Lobby menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
 				SignalUIInteraction(SHELL_SCRIPT_HOOK_LAN_OPENED);
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				SignalUIInteraction(SHELL_SCRIPT_HOOK_LAN_CLOSED);
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 		case GLM_DOUBLE_CLICKED:
 			{
 				if (LANbuttonPushed)
 					break;
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxGamesID ) 
+				if( controlID == listboxGamesID )
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						LANGameInfo * theGame = TheLAN->LookupGameByListOffset(rowSelected);
@@ -699,7 +734,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					break;
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxGamesID ) 
+				if( controlID == listboxGamesID )
 				{
 					int rowSelected = mData2;
 					if( rowSelected < 0 )
@@ -727,31 +762,31 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 				{
 					//shellmapOn = TRUE;
 					LANbuttonPushed = true;
-					DEBUG_LOG(("Back was hit - popping to main menu\n"));
+					DEBUG_LOG(("Back was hit - popping to main menu"));
 					TheShell->pop();
 					delete TheLAN;
 					TheLAN = NULL;
 					//TheTransitionHandler->reverse("LanLobbyFade");
 
-				} //if ( controlID == buttonBack )
+				}
 				else if ( controlID == buttonHostID )
 				{
-					TheLAN->RequestGameCreate( UnicodeString(L""), FALSE);
-					
-				}//else if ( controlID == buttonHostID )
+					TheLAN->RequestGameCreate( L"", FALSE);
+
+				}
 				else if ( controlID == buttonClearID )
 				{
 					GadgetTextEntrySetText(textEntryPlayerName, UnicodeString::TheEmptyString);
-					TheWindowManager->winSendSystemMsg( window, 
+					TheWindowManager->winSendSystemMsg( window,
 																						GEM_UPDATE_TEXT,
-																						(WindowMsgData)textEntryPlayerName, 
+																						(WindowMsgData)textEntryPlayerName,
 																						0 );
 
 				}
 				else if ( controlID == buttonJoinID )
 				{
 
-					//TheShell->push( AsciiString("Menus/LanGameOptionsMenu.wnd") );
+					//TheShell->push( "Menus/LanGameOptionsMenu.wnd" );
 
 					int rowSelected = -1;
 					GadgetListBoxGetSelected( listboxGames, &rowSelected );
@@ -769,7 +804,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 						GadgetListBoxAddEntryText(listboxChatWindow, TheGameText->fetch("LAN:ErrorNoGameSelected") , chatSystemColor, -1, 0);
 					}
 
-				} //else if ( controlID == buttonJoinID )
+				}
 				else if ( controlID == buttonEmoteID )
 				{
 					// read the user's input
@@ -783,16 +818,16 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 //						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_EMOTE);
 						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_NORMAL);
 					}
-				} //if ( controlID == buttonEmote )
+				}
 				else if (controlID == buttonDirectConnectID)
 				{
 					TheLAN->RequestLobbyLeave( false );
-					TheShell->push(AsciiString("Menus/NetworkDirectConnect.wnd"));
+					TheShell->push("Menus/NetworkDirectConnect.wnd");
 				}
-				
+
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_UPDATE_TEXT:
 			{
 				if (LANbuttonPushed)
@@ -815,9 +850,8 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					else
 						txtInput = UnicodeString::TheEmptyString;
 
-					while (txtInput.getLength() > g_lanPlayerNameLength)
-						txtInput.removeLastChar();
-					
+					txtInput.truncateTo(g_lanPlayerNameLength);
+
 					if (!txtInput.isEmpty() && txtInput.getCharAt(txtInput.getLength()-1) == L',')
 						txtInput.removeLastChar(); // we use , for strtok's so we can't allow them in names.  :(
 
@@ -838,9 +872,9 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					// Put the whitespace-free version in the box
 					GadgetTextEntrySetText( textEntryPlayerName, txtInput );
 
-				}// if ( controlID == textEntryPlayerNameID )
+				}
 				break;
-			}//case GEM_UPDATE_TEXT:
+			}
 		case GEM_EDIT_DONE:
 			{
 				if (LANbuttonPushed)
@@ -852,7 +886,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 				// send it to the other clients on the lan
 				if ( controlID == textEntryChatID )
 				{
-					
+
 					// read the user's input
 					txtInput.set(GadgetTextEntryGetText( textEntryChat ));
 					// Clear the text entry line
@@ -865,7 +899,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					if (!txtInput.isEmpty())
 						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_NORMAL);
 
-				}// if ( controlID == textEntryChatID )
+				}
 				/*
 				else if ( controlID == textEntryPlayerNameID )
 				{
@@ -882,14 +916,14 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					// Put the whitespace-free version in the box
 					GadgetTextEntrySetText( textEntryPlayerName, txtInput );
 
-				}// if ( controlID == textEntryPlayerNameID )
+				}
 				*/
 				break;
 			}
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// LanLobbyMenuSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
index b46dcb05291..58827aca51b 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/NameKeyGenerator.h"
@@ -44,11 +44,6 @@
 #include "GameClient/MapUtil.h"
 #include "GameNetwork/GUIUtil.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 static NameKeyType buttonBack = NAMEKEY_INVALID;
@@ -85,14 +80,14 @@ static const char *gadgetsToHide[] =
 	"ButtonStart",
 	"StaticTextMapPreview",
 
-	NULL // keep this last
+	NULL
 };
 static const char *perPlayerGadgetsToHide[] =
 {
 	"ComboBoxTeam",
 	"ComboBoxColor",
 	"ComboBoxPlayerTemplate",
-	NULL // keep this last
+	NULL
 };
 
 static void showLANGameOptionsUnderlyingGUIElements( Bool show )
@@ -106,9 +101,13 @@ static void showLANGameOptionsUnderlyingGUIElements( Bool show )
 
 static void NullifyControls()
 {
-	mapList = NULL;
-	winMapPreview = NULL;
 	parent = NULL;
+	mapList = NULL;
+	if (winMapPreview)
+	{
+		winMapPreview->winSetUserData(NULL);
+		winMapPreview = NULL;
+	}
 	for (Int i=0; i<MAX_SLOTS; ++i)
 	{
 		buttonMapStartPosition[i] = NULL;
@@ -123,8 +122,7 @@ void LanMapSelectMenuInit( WindowLayout *layout, void *userData )
 	showLANGameOptionsUnderlyingGUIElements(FALSE);
 
 	// set keyboard focus to main parent
-	AsciiString parentName( "LanMapSelectMenu.wnd:LanMapSelectMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:LanMapSelectMenuParent" );
 	parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 
 	TheWindowManager->winSetFocus( parent );
@@ -139,10 +137,10 @@ void LanMapSelectMenuInit( WindowLayout *layout, void *userData )
 	}
 
 
-	buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:ButtonBack") );
-	buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:ButtonOK") );
-	listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:ListboxMap") );
-	winMapPreviewID = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:WinMapPreview") );
+	buttonBack = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ButtonBack" );
+	buttonOK = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ButtonOK" );
+	listboxMap = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ListboxMap" );
+	winMapPreviewID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:WinMapPreview" );
 
 	radioButtonSystemMapsID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:RadioButtonSystemMaps" );
 	radioButtonUserMapsID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:RadioButtonUserMaps" );
@@ -166,8 +164,7 @@ void LanMapSelectMenuInit( WindowLayout *layout, void *userData )
 	}
 
 	// get the listbox window
-	AsciiString listString( "LanMapSelectMenu.wnd:ListboxMap" );
-	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( listString );
+	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ListboxMap" );
 	mapList = TheWindowManager->winGetWindowFromId( parent, mapListID );
 	if( mapList )
 	{
@@ -175,7 +172,7 @@ void LanMapSelectMenuInit( WindowLayout *layout, void *userData )
 			TheMapCache->updateCache();
 		populateMapListbox( mapList, usesSystemMapDir, TRUE, TheLAN->GetMyGame()->getMap() );
 	}
-}  // end LanMapSelectMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu shutdown method */
@@ -187,10 +184,10 @@ void LanMapSelectMenuShutdown( WindowLayout *layout, void *userData )
 	layout->hide( TRUE );
 
 	NullifyControls();
-	
+
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
-}  // end LanMapSelectMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu update method */
@@ -198,7 +195,7 @@ void LanMapSelectMenuShutdown( WindowLayout *layout, void *userData )
 void LanMapSelectMenuUpdate( WindowLayout *layout, void *userData )
 {
 
-}  // end LanMapSelectMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Map select menu input callback */
@@ -207,7 +204,7 @@ WindowMsgHandledType LanMapSelectMenuInput( GameWindow *window, UnsignedInt msg,
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -222,41 +219,40 @@ WindowMsgHandledType LanMapSelectMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "LanMapSelectMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end LanMapSelectMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
 	GameWindow *mapWindow = NULL;
@@ -265,16 +261,16 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 		mapWindow = TheWindowManager->winGetWindowFromId( parent, listboxMap );
 	}
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
-			
+
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -283,7 +279,7 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -295,23 +291,23 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GLM_DOUBLE_CLICKED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						GadgetListBoxSetSelected( control, rowSelected );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonOK );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonOK );
 					}
 				}
@@ -343,7 +339,7 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 			}
 			else if ( controlID == buttonBack )
 			{
-				
+
 				if (mapSelectLayout)
 				{
 					mapSelectLayout->destroyWindows();
@@ -355,7 +351,7 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 				NullifyControls();
 				showLANGameOptionsUnderlyingGUIElements(TRUE);
 				PostToLanGameOptions( MAP_BACK );
-			}  // end if
+			}
 			else if ( controlID == buttonOK )
 			{
 				Int selected = -1;
@@ -393,7 +389,7 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 						TheLAN->GetMyGame()->adjustSlotsForMap(); // BGC- adjust the slots for the new map.
 					}
 
-					
+
 					if (mapSelectLayout)
 					{
 						mapSelectLayout->destroyWindows();
@@ -407,19 +403,19 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 					showLANGameOptionsUnderlyingGUIElements(TRUE);
 					PostToLanGameOptions(SEND_GAME_OPTS);
 
-				}  // end if
-			}  // end else if
+				}
+			}
 
 			break;
 
-		}  // end selected
+		}
 
 		case GLM_SELECTED:
 			{
-				
+
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
 					if( rowSelected < 0 )
@@ -460,8 +456,8 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end LanMapSelectMenuSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
index 83c0d27559f..926627b0843 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "gamespy/ghttp/ghttp.h"
 
@@ -71,16 +71,8 @@
 #include "GameNetwork/GameSpy/MainMenuUtils.h"
 
 #include "GameClient/CDCheck.h"
-//Added By Saad
-//for accessing the InGameUI
 #include "GameClient/InGameUI.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 
@@ -92,13 +84,13 @@ enum
 	DROPDOWN_MAIN,
 	DROPDOWN_LOADREPLAY,
 	DROPDOWN_DIFFICULTY,
-	
-	DROPDOWN_COUNT // keep last
+
+	DROPDOWN_COUNT
 };
 
 static Bool raiseMessageBoxes = TRUE;
 static Bool campaignSelected = FALSE;
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 static NameKeyType campaignID = NAMEKEY_INVALID;
 static GameWindow *buttonCampaign = NULL;
 #ifdef TEST_COMPRESSION
@@ -205,7 +197,6 @@ static Bool justEntered = FALSE;
 
 static Bool dontAllowTransitions = FALSE;
 
-//Added by Saad
 const Int /*TIME_OUT = 15,*/ CORNER = 10;
 void AcceptResolution();
 void DeclineResolution();
@@ -213,7 +204,6 @@ GameWindow *resAcceptMenu = NULL;
 extern DisplaySettings oldDispSettings, newDispSettings;
 extern Bool dispChanged;
 //static time_t timeStarted = 0, currentTime = 0;
-//
 
 void diffReverseSide( void );
 void HandleCanceledDownload( Bool resetDropDown )
@@ -248,7 +238,7 @@ static void quitCallback( void )
 	TheGameEngine->setQuitting( TRUE );
 
 	if (TheGameLogic->isInGame())
-		TheMessageStream->appendMessage( GameMessage::MSG_CLEAR_GAME_DATA );
+		TheGameLogic->exitGame();
 }
 
 
@@ -326,14 +316,14 @@ static void checkCDBeforeCampaign(GameDifficulty diff)
 static void shutdownComplete( WindowLayout *layout )
 {
 	isShuttingDown = FALSE;
-	
+
 	// hide the layout
 	layout->hide( TRUE );
 
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end if
+}
 
 
 
@@ -412,6 +402,28 @@ GameWindow *win = NULL;
 		win->winHide(TRUE);
 
 }
+
+// TheSuperHackers @tweak Now prints version information in an optional version label.
+// Originally this label does not exist in the Main Menu. It can be copied from the Options Menu.
+static void initLabelVersion()
+{
+	NameKeyType versionID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:LabelVersion" );
+	GameWindow *labelVersion = TheWindowManager->winGetWindowFromId( NULL, versionID );
+
+	if (labelVersion)
+	{
+		if (TheVersion && TheGlobalData)
+		{
+			UnicodeString text = TheVersion->getUnicodeProductVersionHashString();
+			GadgetStaticTextSetText( labelVersion, text );
+		}
+		else
+		{
+			labelVersion->winHide( TRUE );
+		}
+	}
+}
+
 //-------------------------------------------------------------------------------------------------
 /** Initialize the main menu */
 //-------------------------------------------------------------------------------------------------
@@ -432,41 +444,40 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 		dropDownWindows[i] = NULL;
 
 	// get ids for our windows
-	mainMenuID = TheNameKeyGenerator->nameToKey( AsciiString( "MainMenu.wnd:MainMenuParent" ) );
-//	campaignID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonCampaign") );
-	skirmishID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSkirmish") );
-	onlineID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonOnline") );
-	networkID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonNetwork") );
-	optionsID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonOptions") );
-	exitID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonExit") );
-	motdID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMOTD") );
-	worldBuilderID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonWorldBuilder") );
-//	NameKeyType versionID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:LabelVersion") );
-	getUpdateID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGetUpdate") );
-	buttonTRAININGID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonTRAINING") );
-	buttonUSAID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonUSA") );
-	buttonGLAID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGLA") );
-	buttonChinaID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChina") );
-	buttonUSARecentSaveID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonUSARecentSave") );
-	buttonUSALoadGameID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonUSALoadGame") );
-	buttonGLARecentSaveID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGLARecentSave") );
-	buttonGLALoadGameID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGLALoadGame") );
-	buttonChinaRecentSaveID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChinaRecentSave") );
-	buttonChinaLoadGameID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChinaLoadGame") );
-	buttonSinglePlayerID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSinglePlayer") );
-	buttonMultiPlayerID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMultiplayer") );
-	buttonMultiBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMultiBack") );
-	buttonSingleBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSingleBack") );
-	buttonLoadReplayBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonLoadReplayBack") );
-	buttonReplayID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonReplay") );
-	buttonLoadReplayID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonLoadReplay") );
-	buttonLoadID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonLoadGame") );
-	buttonCreditsID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonCredits") );
-
-	buttonEasyID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonEasy") );
-	buttonMediumID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMedium") );
-	buttonHardID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonHard") );
-	buttonDiffBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonDiffBack") );
+	mainMenuID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MainMenuParent" );
+//	campaignID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonCampaign" );
+	skirmishID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSkirmish" );
+	onlineID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonOnline" );
+	networkID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonNetwork" );
+	optionsID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonOptions" );
+	exitID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonExit" );
+	motdID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMOTD" );
+	worldBuilderID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonWorldBuilder" );
+	getUpdateID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGetUpdate" );
+	buttonTRAININGID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonTRAINING" );
+	buttonUSAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSA" );
+	buttonGLAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLA" );
+	buttonChinaID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChina" );
+	buttonUSARecentSaveID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSARecentSave" );
+	buttonUSALoadGameID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSALoadGame" );
+	buttonGLARecentSaveID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLARecentSave" );
+	buttonGLALoadGameID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLALoadGame" );
+	buttonChinaRecentSaveID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChinaRecentSave" );
+	buttonChinaLoadGameID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChinaLoadGame" );
+	buttonSinglePlayerID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSinglePlayer" );
+	buttonMultiPlayerID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMultiplayer" );
+	buttonMultiBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMultiBack" );
+	buttonSingleBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSingleBack" );
+	buttonLoadReplayBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonLoadReplayBack" );
+	buttonReplayID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonReplay" );
+	buttonLoadReplayID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonLoadReplay" );
+	buttonLoadID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonLoadGame" );
+	buttonCreditsID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonCredits" );
+
+	buttonEasyID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonEasy" );
+	buttonMediumID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMedium" );
+	buttonHardID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonHard" );
+	buttonDiffBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonDiffBack" );
 
 	// get pointers to the window buttons
 	parentMainMenu = TheWindowManager->winGetWindowFromId( NULL, mainMenuID );
@@ -490,9 +501,6 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 	buttonHard = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonHardID );
 	buttonDiffBack = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonDiffBackID );
 
-
-//	GameWindow *labelVersion = TheWindowManager->winGetWindowFromId( parentMainMenu, versionID );
-	
 	getUpdate = TheWindowManager->winGetWindowFromId( parentMainMenu, getUpdateID );
 	buttonTRAINING = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonTRAININGID );
 	buttonUSA = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonUSAID );
@@ -505,65 +513,53 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 	buttonChinaRecentSave = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonChinaRecentSaveID );
 	buttonChinaLoadGame = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonChinaLoadGameID );
 
-	dropDownWindows[DROPDOWN_SINGLE] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder") ));
-	dropDownWindows[DROPDOWN_MULTIPLAYER] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder1") ) );
-	dropDownWindows[DROPDOWN_MAIN] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder2") ) );
-	dropDownWindows[DROPDOWN_LOADREPLAY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder3") ) );
-	dropDownWindows[DROPDOWN_DIFFICULTY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder4") ) );
+	dropDownWindows[DROPDOWN_SINGLE] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder" ));
+	dropDownWindows[DROPDOWN_MULTIPLAYER] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder1" ) );
+	dropDownWindows[DROPDOWN_MAIN] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder2" ) );
+	dropDownWindows[DROPDOWN_LOADREPLAY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder3" ) );
+	dropDownWindows[DROPDOWN_DIFFICULTY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder4" ) );
 	for(i = 1; i < DROPDOWN_COUNT; ++i)
 		dropDownWindows[i]->winHide(TRUE);
 
 	initialHide();
-	
+
 	showSelectiveButtons(SHOW_NONE);
 	// Set up the version number
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	WinInstanceData instData;
 #ifdef TEST_COMPRESSION
 	instData.init();
 	BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK );
 	instData.m_textLabelString = "Debug: Compress/Decompress Maps";
-	instData.setTooltipText(UnicodeString(L"Only Used in Debug and Internal!"));
-	buttonCompressTest = TheWindowManager->gogoGadgetPushButton( parentMainMenu, 
-																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE, 
-																									 25, 175, 
-																									 400, 400, 
+	instData.setTooltipText(L"Only Used in Debug and Internal!");
+	buttonCompressTest = TheWindowManager->gogoGadgetPushButton( parentMainMenu,
+																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
+																									 25, 175,
+																									 400, 400,
 																									 &instData, NULL, TRUE );
 #endif // TEST_COMPRESSION
 
 	instData.init();
 	BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK );
 	instData.m_textLabelString = "Debug: Load Map";
-	
-	instData.setTooltipText(UnicodeString(L"Only Used in Debug and Internal!"));
-	buttonCampaign = TheWindowManager->gogoGadgetPushButton( parentMainMenu, 
-																									 WIN_STATUS_ENABLED, 
-																									 25, 54, 
-																									 180, 26, 
+
+	instData.setTooltipText(L"Only Used in Debug and Internal!");
+	buttonCampaign = TheWindowManager->gogoGadgetPushButton( parentMainMenu,
+																									 WIN_STATUS_ENABLED,
+																									 25, 54,
+																									 180, 26,
 																									 &instData, NULL, TRUE );
-	
-//	if (TheVersion)
-//	{
-//		UnicodeString version;
-//		version.format(L"%s\n%s", TheVersion->getUnicodeVersion().str(), TheVersion->getUnicodeBuildTime().str());
-//		GadgetStaticTextSetText( labelVersion, version );
-//	}
-//	else
-//	{
-//		labelVersion->winHide( TRUE );
-//	}
-//#else
-	
-//	GadgetStaticTextSetText( labelVersion, TheVersion->getUnicodeVersion() );
 #endif
 
+	initLabelVersion();
+
 	//TheShell->registerWithAnimateManager(buttonCampaign, WIN_ANIMATION_SLIDE_LEFT, TRUE, 800);
 	//TheShell->registerWithAnimateManager(buttonSkirmish, WIN_ANIMATION_SLIDE_LEFT, TRUE, 600);
 //	TheShell->registerWithAnimateManager(buttonSinglePlayer, WIN_ANIMATION_SLIDE_LEFT, TRUE, 400);
 //	TheShell->registerWithAnimateManager(buttonMultiPlayer, WIN_ANIMATION_SLIDE_LEFT, TRUE, 200);
 //	TheShell->registerWithAnimateManager(buttonOptions, WIN_ANIMATION_SLIDE_LEFT, TRUE, 1);
 //	TheShell->registerWithAnimateManager(buttonExit, WIN_ANIMATION_SLIDE_RIGHT, TRUE, 1);
-//	
+//
 	layout->hide( FALSE );
 
 	/*
@@ -575,7 +571,7 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 		{
 			// wohoo - we're connected!  fire off a check for updates
 			checkedForUpdate = TRUE;
-			DEBUG_LOG(("Looking for a patch for productID=%d, versionStr=%s, distribution=%d\n",
+			DEBUG_LOG(("Looking for a patch for productID=%d, versionStr=%s, distribution=%d",
 				gameProductID, gameVersionUniqueIDStr, gameDistributionID));
 			ptCheckForPatch( gameProductID, gameVersionUniqueIDStr, gameDistributionID, patchAvailableCallback, PTFalse, NULL );
 			//ptCheckForPatch( productID, versionUniqueIDStr, distributionID, mapPackAvailableCallback, PTFalse, NULL );
@@ -590,7 +586,7 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 
 	if (TheGameSpyPeerMessageQueue && !TheGameSpyPeerMessageQueue->isConnected())
 	{
-		DEBUG_LOG(("Tearing down GameSpy from MainMenuInit()\n"));
+		DEBUG_LOG(("Tearing down GameSpy from MainMenuInit()"));
 		TearDownGameSpy();
 	}
 	if (TheMapCache)
@@ -602,7 +598,7 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 		buttonMOTD->winHide(FALSE);
 	}
 	*/
-	
+
 	TheShell->loadScheme("MainMenu");
 	raiseMessageBoxes = TRUE;
 
@@ -610,9 +606,9 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 //		localAnimateWindowManager = NEW AnimateWindowManager;
 
 	//pendingDropDown =DROPDOWN_MAIN;
-	
 
-	GameWindow *rule = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MainMenuRuler") ) );
+
+	GameWindow *rule = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MainMenuRuler" ) );
 	if(rule)
 		rule->winHide(TRUE);
 	campaignSelected = FALSE;
@@ -633,12 +629,12 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 		rule->winHide(FALSE);
 	}
 
-	layout->bringForward();	
+	layout->bringForward();
 	// set keyboard focus to main parent
 	TheWindowManager->winSetFocus( parentMainMenu );
-	
-	
-}  // end MainMenuInit
+
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Main menu shutdown method */
@@ -652,11 +648,11 @@ void MainMenuShutdown( WindowLayout *layout, void *userData )
 
 	// if we are shutting down for an immediate pop, skip the animations
 	Bool popImmediate = *(Bool *)userData;
-	
+
 //	if(winVidManager)
 	//		delete winVidManager;
 	//	winVidManager = NULL;
-	
+
 
 	if( popImmediate )
 	{
@@ -668,21 +664,19 @@ void MainMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	if (!startGame)
 		TheShell->reverseAnimatewindow();
 	//TheShell->reverseAnimatewindow();
 //	if(localAnimateWindowManager && dropDown != DROPDOWN_NONE)
 //		localAnimateWindowManager->reverseAnimateWindow();
-}  // end MainMenuShutdown
+}
 
 extern Bool DontShowMainMenu;
 
 ////////////////////////////////////////////////////////////////////////////
-//Added By Sadullah Nader
-//Added as a fix to the resolution change
-//Allows the user to confirm the change, goes back to the previous mode 
+//Allows the user to confirm the change, goes back to the previous mode
 //if the time to change expires.
 ////////////////////////////////////////////////////////////////////////////
 
@@ -702,10 +696,10 @@ void AcceptResolution()
 //-------------------------------------------------------------------------------------------------
 void DeclineResolution()
 {
-	//Revert back to old resolution and reset all necessary 
+	//Revert back to old resolution and reset all necessary
 	//parts of the shell
 
-	if (TheDisplay->setDisplayMode(oldDispSettings.xRes, oldDispSettings.yRes, 
+	if (TheDisplay->setDisplayMode(oldDispSettings.xRes, oldDispSettings.yRes,
 										oldDispSettings.bitDepth, oldDispSettings.windowed))
 	{
 		dispChanged = FALSE;
@@ -713,29 +707,20 @@ void DeclineResolution()
 
 		TheWritableGlobalData->m_xResolution = newDispSettings.xRes;
 		TheWritableGlobalData->m_yResolution = newDispSettings.yRes;
-		
-		TheHeaderTemplateManager->headerNotifyResolutionChange();
-		TheMouse->mouseNotifyResolutionChange();
-				
+
+		TheHeaderTemplateManager->onResolutionChanged();
+		TheMouse->onResolutionChanged();
+
 		AsciiString prefString;
 		prefString.format("%d %d", newDispSettings.xRes, newDispSettings.yRes);
-		
+
 		OptionPreferences optionPref;
 		optionPref["Resolution"] = prefString;
 		optionPref.write();
 
-		// delete the shell
-		delete TheShell;
-		TheShell = NULL;
+		TheShell->recreateWindowLayouts();
 
-		// create the shell
-		TheShell = MSGNEW("GameClientSubsystem") Shell;
-		if( TheShell )
-			TheShell->init();
-		
 		TheInGameUI->recreateControlBar();
-
-		TheShell->push( AsciiString("Menus/MainMenu.wnd") );
 	}
 }
 
@@ -746,25 +731,25 @@ void DoResolutionDialog()
 {
 	//Bring up a dialog to accept the resolution chosen in the options menu
 	UnicodeString resolutionNew;
-	
+
 	UnicodeString resTimerString = TheGameText->fetch("GUI:Resolution");
-	
+
 	resolutionNew.format(L": %dx%d\n", newDispSettings.xRes , newDispSettings.yRes);
-	
+
 	resTimerString.concat(resolutionNew);
-		
-	
-	resAcceptMenu = TheWindowManager->gogoMessageBox( CORNER, CORNER, -1, -1,MSG_BOX_OK | MSG_BOX_CANCEL , 
-																									 TheGameText->fetch("GUI:Resolution"), 
-																									 resTimerString, NULL, NULL, AcceptResolution, 
+
+
+	resAcceptMenu = TheWindowManager->gogoMessageBox( CORNER, CORNER, -1, -1,MSG_BOX_OK | MSG_BOX_CANCEL ,
+																									 TheGameText->fetch("GUI:Resolution"),
+																									 resTimerString, NULL, NULL, AcceptResolution,
 																									 DeclineResolution);
 }
 
-/* This function is not being currently used because we do not need a timer on the 
+/* This function is not being currently used because we do not need a timer on the
 // dialog box.
 //-------------------------------------------------------------------------------------------------
-//ResolutionDialogUpdate() - if resolution dialog box is shown, this must count 10 seconds for 
-//	accepting resolution changes otherwise we go back to previous display settings 
+//ResolutionDialogUpdate() - if resolution dialog box is shown, this must count 10 seconds for
+//	accepting resolution changes otherwise we go back to previous display settings
 //-------------------------------------------------------------------------------------------------
 void ResolutionDialogUpdate()
 {
@@ -772,11 +757,11 @@ void ResolutionDialogUpdate()
 	{
 		timeStarted = currentTime = time(NULL);
 	}
-	else 
+	else
 	{
 		currentTime = time(NULL);
 	}
-	
+
 	if ( ( currentTime - timeStarted ) >= TIME_OUT)
 	{
 		currentTime = timeStarted = 0;
@@ -785,7 +770,7 @@ void ResolutionDialogUpdate()
 	//------------------------------------------------------------------------------------------------------
 	// Used for debugging purposes
 	//------------------------------------------------------------------------------------------------------
-	DEBUG_LOG(("Resolution Timer :  started at %d,  current time at %d, frameTicker is %d\n", timeStarted, 
+	DEBUG_LOG(("Resolution Timer :  started at %d,  current time at %d, frameTicker is %d", timeStarted,
 							time(NULL) , currentTime));
 }
 */
@@ -802,15 +787,13 @@ void MainMenuUpdate( WindowLayout *layout, void *userData )
 	}
 	if(DontShowMainMenu && justEntered)
 		justEntered = FALSE;
-	
+
 	if (TheDownloadManager && !TheDownloadManager->isDone())
 	{
 		TheDownloadManager->update();
 		DownloadMenuUpdate(layout, userData);
 	}
 
-	// Added by Saad to the confirmation or decline of the resoluotion change
-	// dialog box.
 	/* This is also commented for the same reason as the top
 	if (dispChanged)
 	{
@@ -831,7 +814,7 @@ void MainMenuUpdate( WindowLayout *layout, void *userData )
 		else
 			initialGadgetDelay--;
 	}
-	
+
 	if(dontAllowTransitions && TheTransitionHandler->isFinished())
 		dontAllowTransitions = FALSE;
 
@@ -858,7 +841,7 @@ void MainMenuUpdate( WindowLayout *layout, void *userData )
 				break;
 			}
 			showLogo = FALSE;
-//			showFrames = 0;	
+//			showFrames = 0;
 //			logoIsShown = TRUE;
 //		}
 //		else
@@ -903,7 +886,7 @@ void MainMenuUpdate( WindowLayout *layout, void *userData )
 //			dropDownWindows[dropDown]->winHide(TRUE);
 //		dropDown = pendingDropDown;
 //		dropDownWindows[dropDown]->winHide(FALSE);
-//		localAnimateWindowManager->registerGameWindow(dropDownWindows[dropDown],WIN_ANIMATION_SLIDE_TOP_FAST,TRUE,1,1);						
+//		localAnimateWindowManager->registerGameWindow(dropDownWindows[dropDown],WIN_ANIMATION_SLIDE_TOP_FAST,TRUE,1,1);
 //		//buttonPushed = FALSE;
 //		pendingDropDown = DROPDOWN_NONE;
 //	}
@@ -913,31 +896,31 @@ void MainMenuUpdate( WindowLayout *layout, void *userData )
 //		for(Int i = 1; i < DROPDOWN_COUNT; ++i)
 //			dropDownWindows[i]->winHide(TRUE);
 //	}
-	
-	
-	
-	
+
+
+
+
 
 	if (startGame && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 	{
 		doGameStart();
 	}
 
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 	{
 		shutdownComplete(layout);
 	}
-	
 
-	// We'll only be successful if we've requested to 
+
+	// We'll only be successful if we've requested to
 //	if(TheShell->isAnimReversed() && TheShell->isAnimFinished())
 //		shutdownComplete( layout );
 
 //	if(winVidManager)
 //		winVidManager->update();
 
-}  // end MainMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Main menu input callback */
@@ -948,8 +931,8 @@ WindowMsgHandledType MainMenuInput( GameWindow *window, UnsignedInt msg,
 
 	if(!notShown)
 		return MSG_IGNORED;
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -958,15 +941,17 @@ WindowMsgHandledType MainMenuInput( GameWindow *window, UnsignedInt msg,
 			ICoord2D mouse;
 			mouse.x = mData1 & 0xFFFF;
 			mouse.y = mData1 >> 16;
-			if( mouse.x == 0 && mouse.y == 0)
+
+			// TheSuperHackers @tweak 20/08/2025 Show mouse and menu immediately when shellmap is disabled.
+			if (TheGlobalData->m_shellMapOn && mouse.x == 0 && mouse.y == 0)
 				break;
 
 			static Int mousePosX = mouse.x;
 			static Int mousePosY = mouse.y;
 			if(abs(mouse.x - mousePosX) > 20 || abs(mouse.y - mousePosY) > 20)
 			{
-			
-				DEBUG_LOG(("Mouse X:%d, Y:%d\n", mouse.x, mouse.y));
+
+				DEBUG_LOG(("Mouse X:%d, Y:%d", mouse.x, mouse.y));
 				if(notShown)
 				{
 					initialGadgetDelay = 1;
@@ -978,8 +963,8 @@ WindowMsgHandledType MainMenuInput( GameWindow *window, UnsignedInt msg,
 					return MSG_HANDLED;
 				}
 			}
-			
-		}  // end char
+
+		}
 		break;
 		case GWM_CHAR:
 		{
@@ -993,26 +978,26 @@ WindowMsgHandledType MainMenuInput( GameWindow *window, UnsignedInt msg,
 				notShown = FALSE;
 				return MSG_HANDLED;
 			}
-			
-		}  // end char
 
-	}  // end switch( msg )
-	
+		}
+
+	}
+
 
 	return MSG_IGNORED;
 
-}  // end MainMenuInput
+}
 void PrintOffsetsFromControlBarParent( void );
 //-------------------------------------------------------------------------------------------------
 /** Main menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 										 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	static Bool triedToInitWOLAPI = FALSE;
 	static Bool canInitWOLAPI = FALSE;
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		//---------------------------------------------------------------------------------------------
@@ -1020,18 +1005,18 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 		{
 			ghttpStartup();
 			break;
-		}  // end case
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 			ghttpCleanup();
-			DEBUG_LOG(("Tearing down GameSpy from MainMenuSystem(GWM_DESTROY)\n"));
+			DEBUG_LOG(("Tearing down GameSpy from MainMenuSystem(GWM_DESTROY)"));
 			TearDownGameSpy();
 			StopAsyncDNSCheck(); // kill off the async DNS check thread in case it is still running
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -1043,7 +1028,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end input
+		}
 		//---------------------------------------------------------------------------------------------
 		case GBM_MOUSE_ENTERING:
 		{
@@ -1097,7 +1082,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->setGroup("MainMenuFactionSkirmish");
 				//showSelectiveButtons(SHOW_NONE);
 			}
-			
+
 			else if(controlID == buttonUSAID)
 			{
 				if(dontAllowTransitions && !campaignSelected)
@@ -1147,7 +1132,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 //				showFrames = 0;
 //				showSide = SHOW_CHINA;
 			}
-			
+
 		break;
 		}
 		//---------------------------------------------------------------------------------------------
@@ -1184,7 +1169,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				if(campaignSelected || dontAllowTransitions)
 					break;
 				TheTransitionHandler->reverse("MainMenuFactionTraining");
-				
+
 				//showSelectiveButtons(SHOW_NONE);
 			}
 			else if(controlID == skirmishID)
@@ -1209,7 +1194,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				if(campaignSelected || dontAllowTransitions)
 					break;
 				TheTransitionHandler->reverse("MainMenuFactionUS");
-				
+
 				//showSelectiveButtons(SHOW_NONE);
 			}
 			else if(controlID == buttonGLAID)
@@ -1235,23 +1220,23 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 					break;
 				TheTransitionHandler->reverse("MainMenuFactionChina");
 				//showSelectiveButtons(SHOW_NONE);
-			}	
+			}
 		break;
 		}
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
-			
+
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-			
+
 			if(buttonPushed)
 				break;
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 			if( control == buttonCampaign )
 			{
 				buttonPushed = TRUE;
-				TheShell->push(AsciiString( "Menus/MapSelectMenu.wnd" ));
+				TheShell->push("Menus/MapSelectMenu.wnd");
 				// As soon as we have a campaign, add it in here!;
 			}
 #ifdef TEST_COMPRESSION
@@ -1260,7 +1245,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				DoCompressTest();
 			}
 #endif // TEST_COMPRESSION
-			else 
+			else
 #endif
 			if( controlID == buttonSinglePlayerID )
 			{
@@ -1273,7 +1258,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->remove("MainMenuDefaultMenu");
 				TheTransitionHandler->reverse("MainMenuDefaultMenuBack");
 				TheTransitionHandler->setGroup("MainMenuSinglePlayerMenu");
-			}  // end if
+			}
 			else if( controlID == buttonSingleBackID )
 			{
 				if(campaignSelected || dontAllowTransitions)
@@ -1284,7 +1269,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->reverse("MainMenuSinglePlayerMenuBack");
 				TheTransitionHandler->setGroup("MainMenuDefaultMenu");
 				dontAllowTransitions = TRUE;
-			}  // end if
+			}
 			else if( controlID == buttonMultiBackID )
 			{
 				if(dontAllowTransitions)
@@ -1295,7 +1280,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->remove("MainMenuMultiPlayerMenu");
 				TheTransitionHandler->reverse("MainMenuMultiPlayerMenuReverse");
 				TheTransitionHandler->setGroup("MainMenuDefaultMenu");
-			}  // end if
+			}
 			else if( controlID == buttonLoadReplayBackID )
 			{
 				if(dontAllowTransitions)
@@ -1306,8 +1291,8 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->remove("MainMenuLoadReplayMenu");
 				TheTransitionHandler->reverse("MainMenuLoadReplayMenuBack");
 				TheTransitionHandler->setGroup("MainMenuDefaultMenu");
-			}  // end if
-			
+			}
+
 			else if( control == buttonCredits )
 			{
 				if(dontAllowTransitions)
@@ -1328,7 +1313,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				dropDownWindows[DROPDOWN_MULTIPLAYER]->winHide(FALSE);
 				TheTransitionHandler->remove("MainMenuDefaultMenu");
 				TheTransitionHandler->reverse("MainMenuDefaultMenuBack");
-				TheTransitionHandler->setGroup("MainMenuMultiPlayerMenu");		
+				TheTransitionHandler->setGroup("MainMenuMultiPlayerMenu");
 			}
 			else if( controlID == buttonLoadReplayID)
 			{
@@ -1349,14 +1334,14 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				dontAllowTransitions = TRUE;
 //				SaveLoadLayoutType layoutType = SLLT_LOAD_ONLY;
 //        WindowLayout *saveLoadMenuLayout = TheShell->getSaveLoadMenuLayout();
-//				DEBUG_ASSERTCRASH( saveLoadMenuLayout, ("Unable to get save load menu layout.\n") );
+//				DEBUG_ASSERTCRASH( saveLoadMenuLayout, ("Unable to get save load menu layout.") );
 //				saveLoadMenuLayout->runInit( &layoutType );
 //				saveLoadMenuLayout->hide( FALSE );
 //				saveLoadMenuLayout->bringForward();
 				buttonPushed = TRUE;
 				dropDownWindows[DROPDOWN_LOADREPLAY]->winHide(FALSE);
 				TheTransitionHandler->reverse("MainMenuLoadReplayMenuBackTransition");
-				TheShell->push(AsciiString("Menus/SaveLoad.wnd"));
+				TheShell->push("Menus/SaveLoad.wnd");
 
 			}
 			else if( controlID == buttonReplayID )
@@ -1367,7 +1352,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				buttonPushed = TRUE;
 				dropDownWindows[DROPDOWN_LOADREPLAY]->winHide(FALSE);
 				TheTransitionHandler->reverse("MainMenuLoadReplayMenuBackTransition");
-				TheShell->push(AsciiString("Menus/ReplayMenu.wnd"));
+				TheShell->push("Menus/ReplayMenu.wnd");
 			}
 			else if( controlID == skirmishID )
 			{
@@ -1379,7 +1364,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->remove("MainMenuFactionSkirmish");
 
 				TheTransitionHandler->reverse("MainMenuSinglePlayerMenuBackSkirmish");
-				TheShell->push( AsciiString("Menus/SkirmishGameOptionsMenu.wnd") );
+				TheShell->push( "Menus/SkirmishGameOptionsMenu.wnd" );
 				TheScriptEngine->signalUIInteract(TheShellHookNames[SHELL_SCRIPT_HOOK_MAIN_MENU_SKIRMISH_SELECTED]);
 			}
 			else if( controlID == onlineID )
@@ -1395,7 +1380,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 //				localAnimateWindowManager->reverseAnimateWindow();
 				dropDown = DROPDOWN_NONE;
 
-			}  // end else if
+			}
 			else if( controlID == networkID )
 			{
 				if(dontAllowTransitions)
@@ -1404,10 +1389,10 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				buttonPushed = TRUE;
 				dropDownWindows[DROPDOWN_MULTIPLAYER]->winHide(FALSE);
 				TheTransitionHandler->reverse("MainMenuMultiPlayerMenuTransitionToNext");
-				TheShell->push( AsciiString("Menus/LanLobbyMenu.wnd") );
+				TheShell->push( "Menus/LanLobbyMenu.wnd" );
 
 				TheScriptEngine->signalUIInteract(TheShellHookNames[SHELL_SCRIPT_HOOK_MAIN_MENU_NETWORK_SELECTED]);
-			}  // end else if
+			}
 			else if( controlID == optionsID )
 			{
 				if(dontAllowTransitions)
@@ -1422,15 +1407,12 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				optLayout->runInit();
 				optLayout->hide(FALSE);
 				optLayout->bringForward();
-			}  // end else if
+			}
 			else if( controlID == worldBuilderID )
 			{
 #if defined RTS_DEBUG
 				if(_spawnl(_P_NOWAIT,"WorldBuilderD.exe","WorldBuilderD.exe", NULL) < 0)
 					MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL);
-#elif defined  RTS_INTERNAL
-				if(_spawnl(_P_NOWAIT,"WorldBuilderI.exe","WorldBuilderI.exe", NULL) < 0)
-					MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL);
 #else
 				if(_spawnl(_P_NOWAIT,"WorldBuilder.exe","WorldBuilder.exe", NULL) < 0)
 					MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL);
@@ -1443,23 +1425,19 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 			else if( controlID == exitID )
 			{
 				// If we ever want to add a dialog before we exit out of the game, uncomment this line and kill the quitCallback() line below.
-//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-				
-				//Added By Sadullah Nader
-				//Changed the preprocessing code to normal code
+//#if defined(RTS_DEBUG)
 				if (TheGlobalData->m_windowed)
 				{
 					quitCallback();
-//#else	
+//#else
 				}
 				else
 				{
 					QuitMessageBoxYesNo(TheGameText->fetch("GUI:QuitPopupTitle"), TheGameText->fetch("GUI:QuitPopupMessage"),quitCallback,NULL);
 				}
-				//
 //#endif
-				
-			}  // end else if
+
+			}
 			else if(controlID == buttonTRAININGID)
 			{
 				if(campaignSelected || dontAllowTransitions)
@@ -1495,7 +1473,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				showLogo = FALSE;
 				showSide = SHOW_USA;
 //				WindowLayout *layout = NULL;
-//				layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DifficultySelect.wnd" ) );
+//				layout = TheWindowManager->winCreateLayout( "Menus/DifficultySelect.wnd" );
 //				layout->runInit();
 //				layout->hide( FALSE );
 //				layout->bringForward();
@@ -1511,7 +1489,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->remove("MainMenuFactionGLA", TRUE);
 				GameWindow *win = TheWindowManager->winGetWindowFromId(parentMainMenu, TheNameKeyGenerator->nameToKey("MainMenu.wnd:WinFactionGLA"));
 				if(win)
-					win->winHide(TRUE);				
+					win->winHide(TRUE);
 				TheTransitionHandler->reverse("MainMenuSinglePlayerMenuBackGLA");
 				TheTransitionHandler->setGroup("MainMenuDifficultyMenuGLA");
 				campaignSelected = TRUE;
@@ -1519,7 +1497,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				showLogo = FALSE;
 				showSide = SHOW_GLA;
 //				WindowLayout *layout = NULL;
-//				layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DifficultySelect.wnd" ) );
+//				layout = TheWindowManager->winCreateLayout( "Menus/DifficultySelect.wnd" );
 //				layout->runInit();
 //				layout->hide( FALSE );
 //				layout->bringForward();
@@ -1535,7 +1513,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->remove("MainMenuFactionChina", TRUE);
 				GameWindow *win = TheWindowManager->winGetWindowFromId(parentMainMenu, TheNameKeyGenerator->nameToKey("MainMenu.wnd:WinFactionChina"));
 				if(win)
-					win->winHide(TRUE);				
+					win->winHide(TRUE);
 				TheTransitionHandler->reverse("MainMenuSinglePlayerMenuBackChina");
 				TheTransitionHandler->setGroup("MainMenuDifficultyMenuChina");
 				campaignSelected = TRUE;
@@ -1544,13 +1522,13 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				showSide = SHOW_CHINA;
 
 //				WindowLayout *layout = NULL;
-//				layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DifficultySelect.wnd" ) );
+//				layout = TheWindowManager->winCreateLayout( "Menus/DifficultySelect.wnd" );
 //				layout->runInit();
 //				layout->hide( FALSE );
 //				layout->bringForward();
 
 //				setupGameStart(TheCampaignManager->getCurrentMap());
-			}// end else if
+			}
 			else if(controlID == buttonEasyID)
 			{
 				if(dontAllowTransitions)
@@ -1585,17 +1563,17 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end selected
-		
+		}
+
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end MainMenuSystem
+}
 
 void diffReverseSide( void )
 {
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
index e946ff48caf..3c6f985275c 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/MessageStream.h"
@@ -104,12 +104,11 @@ static void shutdownComplete( WindowLayout *layout )
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end if
+}
 
 void SetDifficultyRadioButton( void )
 {
-	AsciiString parentName( "MapSelectMenu.wnd:MapSelectMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:MapSelectMenuParent" );
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 
 	if (!TheScriptEngine)
@@ -122,15 +121,15 @@ void SetDifficultyRadioButton( void )
 		{
 			case DIFFICULTY_EASY:
 			{
-				NameKeyType radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonEasyAI") );
-				GameWindow *radioButtonEasyAI = TheWindowManager->winGetWindowFromId( parent, radioButtonEasyAIID );			
+				NameKeyType radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonEasyAI" );
+				GameWindow *radioButtonEasyAI = TheWindowManager->winGetWindowFromId( parent, radioButtonEasyAIID );
 				GadgetRadioSetSelection(radioButtonEasyAI, FALSE);
 				s_AIDiff = DIFFICULTY_EASY;
 				break;
 			}
 			case DIFFICULTY_NORMAL:
 			{
-				NameKeyType radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonMediumAI") );
+				NameKeyType radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonMediumAI" );
 				GameWindow *radioButtonMediumAI = TheWindowManager->winGetWindowFromId( parent, radioButtonMediumAIID );
 				GadgetRadioSetSelection(radioButtonMediumAI, FALSE);
 				s_AIDiff = DIFFICULTY_NORMAL;
@@ -138,8 +137,8 @@ void SetDifficultyRadioButton( void )
 			}
 			case DIFFICULTY_HARD:
 			{
-				NameKeyType radioButtonHardAIID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonHardAI") );
-				GameWindow *radioButtonHardAI = TheWindowManager->winGetWindowFromId( parent, radioButtonHardAIID );			
+				NameKeyType radioButtonHardAIID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonHardAI" );
+				GameWindow *radioButtonHardAI = TheWindowManager->winGetWindowFromId( parent, radioButtonHardAIID );
 				GadgetRadioSetSelection(radioButtonHardAI, FALSE);
 				s_AIDiff = DIFFICULTY_HARD;
 				break;
@@ -149,9 +148,9 @@ void SetDifficultyRadioButton( void )
 			{
 				DEBUG_CRASH(("unrecognized difficulty level in the script engine"));
 			}
-			
+
 		}
-	} // if (TheScriptEngine)
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -171,8 +170,7 @@ void MapSelectMenuInit( WindowLayout *layout, void *userData )
 	Bool usesSystemMapDir = pref.usesSystemMapDir();
 
 	// get the listbox window
-	AsciiString listString( "MapSelectMenu.wnd:ListboxMap" );
-	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( listString );
+	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ListboxMap" );
 	mapList = TheWindowManager->winGetWindowFromId( NULL, mapListID );
 	if( mapList )
 	{
@@ -181,17 +179,16 @@ void MapSelectMenuInit( WindowLayout *layout, void *userData )
 		populateMapListbox( mapList, usesSystemMapDir, !showSoloMaps );
 	}
 
-	
+
 	// set keyboard focus to main parent
-	AsciiString parentName( "MapSelectMenu.wnd:MapSelectMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:MapSelectMenuParent" );
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	TheWindowManager->winSetFocus( parent );
 
-	NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonBack") );
+	NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonBack" );
 	GameWindow *buttonBack = TheWindowManager->winGetWindowFromId( NULL, buttonBackID );
-	
-	NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonOK") );
+
+	NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonOK" );
 	GameWindow *buttonOK = TheWindowManager->winGetWindowFromId( NULL, buttonOKID );
 
 
@@ -208,7 +205,7 @@ void MapSelectMenuInit( WindowLayout *layout, void *userData )
 		GadgetRadioSetSelection( radioButtonSystemMaps, FALSE );
 	else
 		GadgetRadioSetSelection( radioButtonUserMaps, FALSE );
-}  // end MapSelectMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu shutdown method */
@@ -226,12 +223,12 @@ void MapSelectMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	if (!startGame)
 		TheShell->reverseAnimatewindow();
 
-}  // end MapSelectMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu update method */
@@ -242,12 +239,12 @@ void MapSelectMenuUpdate( WindowLayout *layout, void *userData )
 	if (startGame && TheShell->isAnimFinished())
 		doGameStart();
 
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished())
 		shutdownComplete(layout);
 
 
-}  // end MapSelectMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Map select menu input callback */
@@ -256,7 +253,7 @@ WindowMsgHandledType MapSelectMenuInput( GameWindow *window, UnsignedInt msg,
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -273,41 +270,40 @@ WindowMsgHandledType MapSelectMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "MapSelectMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end MapSelectMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
 	static NameKeyType buttonBack = NAMEKEY_INVALID;
@@ -316,7 +312,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 	static NameKeyType radioButtonEasyAI = NAMEKEY_INVALID;
 	static NameKeyType radioButtonMediumAI = NAMEKEY_INVALID;
 	static NameKeyType radioButtonHardAI = NAMEKEY_INVALID;
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -324,15 +320,15 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 		{
 
 			// get ids for our children controls
-			buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonBack") );
-			buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonOK") );
-			listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ListboxMap") );
-			radioButtonEasyAI = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonEasyAI") );
-			radioButtonMediumAI = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonMediumAI") );
-			radioButtonHardAI = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonHardAI") );
+			buttonBack = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonBack" );
+			buttonOK = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonOK" );
+			listboxMap = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ListboxMap" );
+			radioButtonEasyAI = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonEasyAI" );
+			radioButtonMediumAI = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonMediumAI" );
+			radioButtonHardAI = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonHardAI" );
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -340,7 +336,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -352,7 +348,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -402,7 +398,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheShell->pop();
 				buttonPushed = true;
 
-			}  // end if
+			}
 			else if( controlID == buttonOK )
 			{
 
@@ -418,15 +414,15 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 					buttonPushed = true;
 					// reset the campaign manager to empty
 					if( TheCampaignManager )
-					  TheCampaignManager->setCampaign( AsciiString( "" ) );
+					  TheCampaignManager->setCampaign( "" );
 					// get text of the map to load
 					const char *mapFname = (const char *)GadgetListBoxGetItemData( mapWindow, selected );
 					DEBUG_ASSERTCRASH(mapFname, ("No map item data"));
 					if (mapFname)
 						setupGameStart(mapFname);
-				}  // end if
+				}
 
-			}  // end else if
+			}
 			else if( controlID == radioButtonEasyAI)
 			{
 				s_AIDiff = DIFFICULTY_EASY;
@@ -441,7 +437,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end selected
+		}
 		case GLM_DOUBLE_CLICKED:
 			{
 				if (buttonPushed)
@@ -449,18 +445,18 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						//buttonPushed = true;
 						GadgetListBoxSetSelected( control, rowSelected );
-						NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonOK") );
+						NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonOK" );
 						GameWindow *buttonOK = TheWindowManager->winGetWindowFromId( NULL, buttonOKID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)buttonOK, buttonOKID );
 					}
 				}
@@ -469,8 +465,8 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end MapSelectMenuSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
index f4de519ce07..8d3b77b289c 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "gamespy/peer/peer.h"
 
@@ -50,11 +50,6 @@
 #include "GameNetwork/LANAPI.h"
 #include "GameNetwork/LANAPICallbacks.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // window ids ------------------------------------------------------------------------------
 
@@ -118,7 +113,7 @@ void UpdateRemoteIPList()
 //	UnicodeString newEntry = prefs.getRemoteIPEntry(0);
 	UnicodeString newEntry = unisel;
 	UnicodeString newIP;
-	newEntry.nextToken(&newIP, UnicodeString(L":"));
+	newEntry.nextToken(&newIP, L":");
 	Int numFields = swscanf(newIP.str(), L"%d.%d.%d.%d", &(n1[0]), &(n1[1]), &(n1[2]), &(n1[3]));
 
 	if (numFields != 4) {
@@ -145,7 +140,7 @@ void UpdateRemoteIPList()
 			{
 				UnicodeString oldEntry = uni;
 				UnicodeString oldIP;
-				oldEntry.nextToken(&oldIP, UnicodeString(L":"));
+				oldEntry.nextToken(&oldIP, L":");
 
 				swscanf(oldIP.str(), L"%d.%d.%d.%d", &(n2[0]), &(n2[1]), &(n2[2]), &(n2[3]));
 
@@ -202,8 +197,7 @@ void HostDirectConnectGame()
 	prefs["UserName"] = UnicodeStringToQuotedPrintable(name);
 	prefs.write();
 
-	while (name.getLength() > g_lanPlayerNameLength)
-		name.removeLastChar();
+	name.truncateTo(g_lanPlayerNameLength);
 	TheLAN->RequestSetName(name);
 	TheLAN->RequestGameCreate(localIPString, TRUE);
 }
@@ -225,13 +219,11 @@ void JoinDirectConnectGame()
 	AsciiString ipstring;
 	asciientry.nextToken(&ipstring, "(");
 
-	char ipstr[16];
-	strcpy(ipstr, ipstring.str());
-
 	Int ip1, ip2, ip3, ip4;
-	sscanf(ipstr, "%d.%d.%d.%d", &ip1, &ip2, &ip3, &ip4);
+	Int numFields = sscanf(ipstring.str(), "%d.%d.%d.%d", &ip1, &ip2, &ip3, &ip4);
+	(void)numFields; DEBUG_ASSERTCRASH(numFields == 4, ("JoinDirectConnectGame - invalid IP address format: %s", ipstring.str()));
 
-	DEBUG_LOG(("JoinDirectConnectGame - joining at %d.%d.%d.%d\n", ip1, ip2, ip3, ip4));
+	DEBUG_LOG(("JoinDirectConnectGame - joining at %d.%d.%d.%d", ip1, ip2, ip3, ip4));
 
 	ipaddress = (ip1 << 24) + (ip2 << 16) + (ip3 << 8) + ip4;
 //	ipaddress = htonl(ipaddress);
@@ -246,8 +238,7 @@ void JoinDirectConnectGame()
 	UpdateRemoteIPList();
 	PopulateRemoteIPComboBox();
 
-	while (name.getLength() > g_lanPlayerNameLength)
-		name.removeLastChar();
+	name.truncateTo(g_lanPlayerNameLength);
 	TheLAN->RequestSetName(name);
 
 	TheLAN->RequestGameJoinDirectConnect(ipaddress);
@@ -271,12 +262,12 @@ void NetworkDirectConnectInit( WindowLayout *layout, void *userData )
 	buttonPushed = false;
 	isShuttingDown = false;
 	TheShell->showShellMap(TRUE);
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ButtonBack" ) );
-	buttonHostID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ButtonHost" ) );
-	buttonJoinID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ButtonJoin" ) );
-	editPlayerNameID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:EditPlayerName" ) );
-	comboboxRemoteIPID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ComboboxRemoteIP" ) );
-	staticLocalIPID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:StaticLocalIP" ) );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ButtonBack" );
+	buttonHostID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ButtonHost" );
+	buttonJoinID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ButtonJoin" );
+	editPlayerNameID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:EditPlayerName" );
+	comboboxRemoteIPID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ComboboxRemoteIP" );
+	staticLocalIPID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:StaticLocalIP" );
 
 	buttonBack = TheWindowManager->winGetWindowFromId( NULL,  buttonBackID);
 	buttonHost = TheWindowManager->winGetWindowFromId( NULL,	buttonHostID);
@@ -294,7 +285,7 @@ void NetworkDirectConnectInit( WindowLayout *layout, void *userData )
 	UnicodeString name;
 	name = userprefs.getUserName();
 
-	if (name.getLength() == 0)
+	if (name.isEmpty())
 	{
 		name = TheGameText->fetch("GUI:Player");
 	}
@@ -314,7 +305,7 @@ void NetworkDirectConnectInit( WindowLayout *layout, void *userData )
 
 		OptionPreferences prefs;
 		UnsignedInt IP = prefs.getOnlineIPAddress();
-		
+
 		IPEnumeration IPs;
 
 //		if (!IP)
@@ -356,7 +347,7 @@ void NetworkDirectConnectInit( WindowLayout *layout, void *userData )
 	TheTransitionHandler->setGroup("NetworkDirectConnectFade");
 
 
-} // NetworkDirectConnectInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -372,7 +363,7 @@ static void shutdownComplete( WindowLayout *layout )
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Welcome Menu shutdown method */
@@ -389,12 +380,12 @@ void NetworkDirectConnectShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 
 	TheTransitionHandler->reverse("NetworkDirectConnectFade");
-}  // NetworkDirectConnectShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -402,10 +393,10 @@ void NetworkDirectConnectShutdown( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 void NetworkDirectConnectUpdate( WindowLayout * layout, void *userData)
 {
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 		shutdownComplete(layout);
-}// NetworkDirectConnectUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Welcome Menu input callback */
@@ -413,7 +404,7 @@ void NetworkDirectConnectUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType NetworkDirectConnectInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -430,63 +421,63 @@ WindowMsgHandledType NetworkDirectConnectInput( GameWindow *window, UnsignedInt
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// NetworkDirectConnectInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Welcome Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType NetworkDirectConnectSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType NetworkDirectConnectSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -505,14 +496,13 @@ WindowMsgHandledType NetworkDirectConnectSystem( GameWindow *window, UnsignedInt
 					prefs["UserName"] = UnicodeStringToQuotedPrintable(name);
 					prefs.write();
 
-					while (name.getLength() > g_lanPlayerNameLength)
-						name.removeLastChar();
+					name.truncateTo(g_lanPlayerNameLength);
 					TheLAN->RequestSetName(name);
 
 					buttonPushed = true;
 					LANbuttonPushed = true;
 					TheShell->pop();
-				} //if ( controlID == buttonBack )
+				}
 				else if (controlID == buttonHostID)
 				{
 					HostDirectConnectGame();
@@ -522,8 +512,8 @@ WindowMsgHandledType NetworkDirectConnectSystem( GameWindow *window, UnsignedInt
 					JoinDirectConnectGame();
 				}
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -531,7 +521,7 @@ WindowMsgHandledType NetworkDirectConnectSystem( GameWindow *window, UnsignedInt
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// NetworkDirectConnectSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
index 7ea0bdadfae..dc01e513b3c 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "gamespy/ghttp/ghttp.h"
 
@@ -38,12 +38,14 @@
 #include "Common/GameEngine.h"
 #include "Common/UserPreferences.h"
 #include "Common/GameLOD.h"
+#include "Common/Recorder.h"
 #include "Common/Registry.h"
 #include "Common/version.h"
 
 #include "GameClient/ClientInstance.h"
 #include "GameClient/GameClient.h"
 #include "GameClient/InGameUI.h"
+#include "GameClient/LookAtXlat.h"
 #include "GameClient/WindowLayout.h"
 #include "GameClient/Gadget.h"
 #include "GameClient/GadgetCheckBox.h"
@@ -62,6 +64,7 @@
 #include "GameClient/IMEManager.h"
 #include "GameClient/ShellHooks.h"
 #include "GameClient/GUICallbacks.h"
+#include "GameClient/GlobalLanguage.h"
 #include "GameNetwork/FirewallHelper.h"
 #include "GameNetwork/IPEnumeration.h"
 #include "GameNetwork/GameSpyOverlay.h"
@@ -69,18 +72,13 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/ScriptEngine.h"
 #include "WWDownload/Registry.h"
-//added by saad
-//used to access a messagebox that does "ok" and "cancel"
 #include "GameClient/MessageBox.h"
 
+#include "ww3d.h"
+
 // This is for non-RC builds only!!!
 #define VERBOSE_VERSION L"Release"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 static NameKeyType		comboBoxOnlineIPID	= NAMEKEY_INVALID;
@@ -93,10 +91,10 @@ static NameKeyType    comboBoxAntiAliasingID   = NAMEKEY_INVALID;
 static GameWindow *   comboBoxAntiAliasing     = NULL;
 
 static NameKeyType    comboBoxResolutionID      = NAMEKEY_INVALID;
-static GameWindow *   comboBoxResolution       = NULL; 
+static GameWindow *   comboBoxResolution       = NULL;
 
 static NameKeyType    comboBoxDetailID      = NAMEKEY_INVALID;
-static GameWindow *   comboBoxDetail        = NULL; 
+static GameWindow *   comboBoxDetail        = NULL;
 
 static NameKeyType		checkAlternateMouseID	= NAMEKEY_INVALID;
 static GameWindow *		checkAlternateMouse		= NULL;
@@ -146,13 +144,13 @@ static GameWindow *   sliderGamma = NULL;
 
 //Advanced Options Screen
 static NameKeyType    WinAdvancedDisplayID      = NAMEKEY_INVALID;
-static GameWindow *   WinAdvancedDisplay				= NULL; 
+static GameWindow *   WinAdvancedDisplay				= NULL;
 
 static NameKeyType    ButtonAdvancedAcceptID      = NAMEKEY_INVALID;
-static GameWindow *   ButtonAdvancedAccept				= NULL; 
+static GameWindow *   ButtonAdvancedAccept				= NULL;
 
 static NameKeyType    ButtonAdvancedCancelID      = NAMEKEY_INVALID;
-static GameWindow *   ButtonAdvancedCancel				= NULL; 
+static GameWindow *   ButtonAdvancedCancel				= NULL;
 
 static NameKeyType    sliderTextureResolutionID = NAMEKEY_INVALID;
 static GameWindow *   sliderTextureResolution = NULL;
@@ -201,26 +199,13 @@ static GameWindow *   radioLow   = NULL;
 
 */
 
-//Added By Saad for the resolution confirmation dialog box
 DisplaySettings oldDispSettings, newDispSettings;
 Bool dispChanged = FALSE;
 extern Int timer;
 extern void DoResolutionDialog();
-//
-
 static Bool ignoreSelected = FALSE;
 WindowLayout *OptionsLayout = NULL;
 
-enum Detail CPP_11(: Int)
-{
-	HIGHDETAIL = 0,
-	MEDIUMDETAIL,
-	LOWDETAIL,
-	CUSTOMDETAIL,
-
-	DETAIL,
-};
-
 
 OptionPreferences::OptionPreferences( void )
 {
@@ -254,7 +239,7 @@ Int OptionPreferences::getCampaignDifficulty(void)
 		factor = DIFFICULTY_EASY;
 	if (factor > DIFFICULTY_HARD)
 		factor = DIFFICULTY_HARD;
-	
+
 	return factor;
 }
 
@@ -321,6 +306,18 @@ void OptionPreferences::setOnlineIPAddress( UnsignedInt IP )
 	(*this)["GameSpyIPAddress"] = tmp;
 }
 
+Bool OptionPreferences::getArchiveReplaysEnabled() const
+{
+	OptionPreferences::const_iterator it = find("ArchiveReplays");
+	if (it == end())
+		return FALSE;
+
+	if (stricmp(it->second.str(), "yes") == 0) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
 Bool OptionPreferences::getAlternateMouseModeEnabled(void)
 {
 	OptionPreferences::const_iterator it = find("UseAlternateMouse");
@@ -341,14 +338,132 @@ Real OptionPreferences::getScrollFactor(void)
 		return TheGlobalData->m_keyboardDefaultScrollFactor;
 
 	Int factor = atoi(it->second.str());
-	if (factor < 0)
-		factor = 0;
-	if (factor > 100)
-		factor = 100;
-	
+
+	// TheSuperHackers @tweak xezon 11/07/2025
+	// No longer caps the upper limit to 100, because the options setting can go beyond that.
+	// No longer caps the lower limit to 0, because that would mean standstill.
+	if (factor < 1)
+		factor = 1;
+
 	return factor/100.0f;
 }
 
+Bool OptionPreferences::getDrawScrollAnchor(void)
+{
+	OptionPreferences::const_iterator it = find("DrawScrollAnchor");
+	// TheSuperHackers @info this default is based on the same variable within InGameUi.ini
+	if (it == end())
+		return FALSE;
+
+	if (stricmp(it->second.str(), "yes") == 0) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool OptionPreferences::getMoveScrollAnchor(void)
+{
+	OptionPreferences::const_iterator it = find("MoveScrollAnchor");
+	// TheSuperHackers @info this default is based on the same variable within InGameUi.ini
+	if (it == end())
+		return TRUE;
+
+	if (stricmp(it->second.str(), "yes") == 0) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool OptionPreferences::getCursorCaptureEnabledInWindowedGame() const
+{
+	OptionPreferences::const_iterator it = find("CursorCaptureEnabledInWindowedGame");
+	if (it == end())
+		return (CursorCaptureMode_Default & CursorCaptureMode_EnabledInWindowedGame) != 0;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+Bool OptionPreferences::getCursorCaptureEnabledInWindowedMenu() const
+{
+	OptionPreferences::const_iterator it = find("CursorCaptureEnabledInWindowedMenu");
+	if (it == end())
+		return (CursorCaptureMode_Default & CursorCaptureMode_EnabledInWindowedMenu) != 0;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+Bool OptionPreferences::getCursorCaptureEnabledInFullscreenGame() const
+{
+	OptionPreferences::const_iterator it = find("CursorCaptureEnabledInFullscreenGame");
+	if (it == end())
+		return (CursorCaptureMode_Default & CursorCaptureMode_EnabledInFullscreenGame) != 0;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+Bool OptionPreferences::getCursorCaptureEnabledInFullscreenMenu() const
+{
+	OptionPreferences::const_iterator it = find("CursorCaptureEnabledInFullscreenMenu");
+	if (it == end())
+		return (CursorCaptureMode_Default & CursorCaptureMode_EnabledInFullscreenMenu) != 0;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+CursorCaptureMode OptionPreferences::getCursorCaptureMode() const
+{
+	CursorCaptureMode mode = 0;
+	mode |= getCursorCaptureEnabledInWindowedGame() ? CursorCaptureMode_EnabledInWindowedGame : 0;
+	mode |= getCursorCaptureEnabledInWindowedMenu() ? CursorCaptureMode_EnabledInWindowedMenu : 0;
+	mode |= getCursorCaptureEnabledInFullscreenGame() ? CursorCaptureMode_EnabledInFullscreenGame : 0;
+	mode |= getCursorCaptureEnabledInFullscreenMenu() ? CursorCaptureMode_EnabledInFullscreenMenu : 0;
+	return mode;
+}
+
+Bool OptionPreferences::getScreenEdgeScrollEnabledInWindowedApp() const
+{
+	OptionPreferences::const_iterator it = find("ScreenEdgeScrollEnabledInWindowedApp");
+	if (it == end())
+		return (ScreenEdgeScrollMode_Default & ScreenEdgeScrollMode_EnabledInWindowedApp) != 0;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+Bool OptionPreferences::getScreenEdgeScrollEnabledInFullscreenApp() const
+{
+	OptionPreferences::const_iterator it = find("ScreenEdgeScrollEnabledInFullscreenApp");
+	if (it == end())
+		return (ScreenEdgeScrollMode_Default & ScreenEdgeScrollMode_EnabledInFullscreenApp) != 0;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+ScreenEdgeScrollMode OptionPreferences::getScreenEdgeScrollMode() const
+{
+	ScreenEdgeScrollMode mode = 0;
+	mode |= getScreenEdgeScrollEnabledInWindowedApp() ? ScreenEdgeScrollMode_EnabledInWindowedApp : 0;
+	mode |= getScreenEdgeScrollEnabledInFullscreenApp() ? ScreenEdgeScrollMode_EnabledInFullscreenApp : 0;
+	return mode;
+}
+
 Bool OptionPreferences::usesSystemMapDir(void)
 {
 	OptionPreferences::const_iterator it = find("UseSystemMapDir");
@@ -385,6 +500,18 @@ Bool OptionPreferences::useCameraInReplays(void)
 	return FALSE;
 }
 
+Bool OptionPreferences::getPlayerObserverEnabled() const
+{
+	OptionPreferences::const_iterator it = find("PlayerObserverEnabled");
+	if (it == end())
+		return TRUE;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
 Int OptionPreferences::getIdealStaticGameDetail(void)
 {
 	OptionPreferences::const_iterator it = find("IdealStaticGameLOD");
@@ -692,7 +819,7 @@ Real OptionPreferences::getGammaValue(void)
 	OptionPreferences::const_iterator it = find("Gamma");
  	if (it == end())
  		return 50.0f;
- 
+
  	Real gamma = (Real) atoi(it->second.str());
  	return gamma;
 }
@@ -728,10 +855,108 @@ Real OptionPreferences::getMusicVolume(void)
 	return volume;
 }
 
+Real OptionPreferences::getMoneyTransactionVolume(void) const
+{
+	OptionPreferences::const_iterator it = find("MoneyTransactionVolume");
+	if (it == end())
+		return TheAudio->getAudioSettings()->m_defaultMoneyTransactionVolume * 100.0f;
+
+	Real volume = (Real) atof(it->second.str());
+	if (volume < 0.0f)
+		volume = 0.0f;
+
+	return volume;
+}
+
+Int OptionPreferences::getNetworkLatencyFontSize(void)
+{
+	OptionPreferences::const_iterator it = find("NetworkLatencyFontSize");
+	if (it == end())
+		return 8;
+
+	Int fontSize = atoi(it->second.str());
+	if (fontSize < 0)
+	{
+		fontSize = 0;
+	}
+	return fontSize;
+}
+
+Int OptionPreferences::getRenderFpsFontSize(void)
+{
+	OptionPreferences::const_iterator it = find("RenderFpsFontSize");
+	if (it == end())
+		return 8;
+
+	Int fontSize = atoi(it->second.str());
+	if (fontSize < 0)
+	{
+		fontSize = 0;
+	}
+	return fontSize;
+}
+
+Int OptionPreferences::getSystemTimeFontSize(void)
+{
+	OptionPreferences::const_iterator it = find("SystemTimeFontSize");
+	if (it == end())
+		return 8;
+
+	Int fontSize = atoi(it->second.str());
+	if (fontSize < 0)
+	{
+		fontSize = 0;
+	}
+	return fontSize;
+}
+
+Int OptionPreferences::getGameTimeFontSize(void)
+{
+	OptionPreferences::const_iterator it = find("GameTimeFontSize");
+	if (it == end())
+		return 8;
+
+	Int fontSize = atoi(it->second.str());
+	if (fontSize < 0)
+	{
+		fontSize = 0;
+	}
+	return fontSize;
+}
+
+Real OptionPreferences::getResolutionFontAdjustment(void)
+{
+	OptionPreferences::const_iterator it = find("ResolutionFontAdjustment");
+	if (it == end())
+		return -1.0f;
+
+	Real fontScale = (Real)atof(it->second.str()) / 100.0f;
+	if (fontScale < 0.0f)
+	{
+		fontScale = -1.0f;
+	}
+	return fontScale;
+}
+
+Bool OptionPreferences::getShowMoneyPerMinute(void) const
+{
+	OptionPreferences::const_iterator it = find("ShowMoneyPerMinute");
+	if (it == end())
+		return TheGlobalData->m_showMoneyPerMinute;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
 static OptionPreferences *pref = NULL;
 
 static void setDefaults( void )
 {
+	constexpr const Bool ModifyDisplaySettings = FALSE;
+
 	//-------------------------------------------------------------------------------------------------
 	// provider type
 //	GadgetCheckBoxSetChecked(checkAudioHardware, FALSE);
@@ -747,30 +972,16 @@ static void setDefaults( void )
 	//-------------------------------------------------------------------------------------------------
 	// send Delay
 	GadgetCheckBoxSetChecked(checkSendDelay, FALSE);
-	
+
+	if constexpr (ModifyDisplaySettings)
+	{
 	//-------------------------------------------------------------------------------------------------
 	// LOD
-	if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE)) {
-		TheGameLODManager->setStaticLODLevel(TheGameLODManager->findStaticLODLevel());
-		switch (TheGameLODManager->getStaticLODLevel())
-		{
-		case STATIC_GAME_LOD_LOW:
-			GadgetComboBoxSetSelectedPos(comboBoxDetail, LOWDETAIL);
-			break;
-		case STATIC_GAME_LOD_MEDIUM:
-			GadgetComboBoxSetSelectedPos(comboBoxDetail, MEDIUMDETAIL);
-			break;
-		case STATIC_GAME_LOD_HIGH:
-			GadgetComboBoxSetSelectedPos(comboBoxDetail, HIGHDETAIL);
-			break;
-		case STATIC_GAME_LOD_CUSTOM:
-			GadgetComboBoxSetSelectedPos(comboBoxDetail, CUSTOMDETAIL);
-			break;
-		default:
-			DEBUG_ASSERTCRASH(FALSE,("Tried to set comboBoxDetail to a value of %d ", TheGameLODManager->getStaticLODLevel()) );
-		};
+	if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE))
+	{
+		GadgetComboBoxSetSelectedPos(comboBoxDetail, (Int)TheGameLODManager->getRecommendedStaticLODLevel());
 	}
-	
+
 	//-------------------------------------------------------------------------------------------------
 	// Resolution
 	//Find index of 800x600 mode.
@@ -780,14 +991,14 @@ static void setDefaults( void )
 		for( Int i = 0; i < numResolutions; ++i )
 		{	Int xres,yres,bitDepth;
 			TheDisplay->getDisplayModeDescription(i,&xres,&yres,&bitDepth);
-			if (xres == 800 && yres == 600)	//keep track of default mode in case we need it.
+			if (xres == DEFAULT_DISPLAY_WIDTH && yres == DEFAULT_DISPLAY_HEIGHT)	//keep track of default mode in case we need it.
 			{	defaultResIndex=i;
 				break;
 			}
 		}
 		GadgetComboBoxSetSelectedPos( comboBoxResolution, defaultResIndex );	//should be 800x600 (our lowest supported mode)
 	}
-
+	}
 
 	//-------------------------------------------------------------------------------------------------
 	// Mouse Mode
@@ -795,13 +1006,12 @@ static void setDefaults( void )
 
 	//-------------------------------------------------------------------------------------------------
 //	// scroll speed val
-	Int valMin, valMax;
-//	GadgetSliderGetMinMax(sliderScrollSpeed,&valMin, &valMax);
-//	GadgetSliderSetPosition(sliderScrollSpeed, ((valMax - valMin) / 2 + valMin));
 	Int scrollPos = (Int)(TheGlobalData->m_keyboardDefaultScrollFactor*100.0f);
 	GadgetSliderSetPosition( sliderScrollSpeed, scrollPos );
 
 
+	Int valMin, valMax;
+
 	//-------------------------------------------------------------------------------------------------
 	// slider music volume
 	GadgetSliderGetMinMax(sliderMusicVolume,&valMin, &valMax);
@@ -823,12 +1033,13 @@ static void setDefaults( void )
  	GadgetSliderGetMinMax(sliderGamma,&valMin, &valMax);
  	GadgetSliderSetPosition(sliderGamma, ((valMax - valMin) / 2 + valMin));
 
-	//-------------------------------------------------------------------------------------------------
- 	// Texture resolution slider
-	//
-
+	if constexpr (ModifyDisplaySettings)
+	{
 	if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE))
-	{	
+	{
+		//-------------------------------------------------------------------------------------------------
+		// Texture resolution slider
+		//
 		Int	txtFact=TheGameLODManager->getRecommendedTextureReduction();
 
 		GadgetSliderSetPosition( sliderTextureResolution, 2-txtFact);
@@ -888,6 +1099,7 @@ static void setDefaults( void )
 		//
 		GadgetCheckBoxSetChecked( checkProps, TheGlobalData->m_useTrees);
 	}
+	}
 }
 
 static void saveOptions( void )
@@ -920,69 +1132,68 @@ static void saveOptions( void )
 			TheWritableGlobalData->m_languageFilterPref = false;
 			(*pref)["LanguageFilter"] = "false";
 	}
-	
+
 	//-------------------------------------------------------------------------------------------------
 	// send Delay
-	TheWritableGlobalData->m_firewallSendDelay = GadgetCheckBoxIsChecked(checkSendDelay);
-	if (TheGlobalData->m_firewallSendDelay) {
-		(*pref)["SendDelay"] = AsciiString("yes");
-	} else {
-		(*pref)["SendDelay"] = AsciiString("no");
+	if (checkSendDelay && checkSendDelay->winGetEnabled())
+	{
+		TheWritableGlobalData->m_firewallSendDelay = GadgetCheckBoxIsChecked(checkSendDelay);
+		if (TheGlobalData->m_firewallSendDelay) {
+			(*pref)["SendDelay"] = "yes";
+		} else {
+			(*pref)["SendDelay"] = "no";
+		}
 	}
 
 	//-------------------------------------------------------------------------------------------------
 	// Custom game detail settings.
 	GadgetComboBoxGetSelectedPos( comboBoxDetail, &index );
-	if (index == CUSTOMDETAIL)
+	if (index == STATIC_GAME_LOD_CUSTOM)
 	{
  		//-------------------------------------------------------------------------------------------------
  		// Texture resolution slider
 		{
-				AsciiString prefString;
-
-		 		val = GadgetSliderGetPosition(sliderTextureResolution);
-				val = 2-val;
+				val = 2 - GadgetSliderGetPosition(sliderTextureResolution);
 
+				AsciiString prefString;
 				prefString.format("%d",val);
 				(*pref)["TextureReduction"] = prefString;
 
-				if (TheGlobalData->m_textureReductionFactor != val)
-				{
-					TheGameClient->adjustLOD(val-TheGlobalData->m_textureReductionFactor);	//apply the new setting
-				}
+				TheWritableGlobalData->m_textureReductionFactor = val;
+				TheGameClient->setTextureLOD(val);
 		}
 
 		TheWritableGlobalData->m_useShadowVolumes = GadgetCheckBoxIsChecked( check3DShadows );
-		(*pref)["UseShadowVolumes"] = TheWritableGlobalData->m_useShadowVolumes ? AsciiString("yes") : AsciiString("no");
+		(*pref)["UseShadowVolumes"] = TheWritableGlobalData->m_useShadowVolumes ? "yes" : "no";
 
 		TheWritableGlobalData->m_useShadowDecals = GadgetCheckBoxIsChecked( check2DShadows );
-		(*pref)["UseShadowDecals"] = TheWritableGlobalData->m_useShadowDecals ? AsciiString("yes") : AsciiString("no");
+		(*pref)["UseShadowDecals"] = TheWritableGlobalData->m_useShadowDecals ? "yes" : "no";
 
 		TheWritableGlobalData->m_useCloudMap = GadgetCheckBoxIsChecked( checkCloudShadows );
-		(*pref)["UseCloudMap"] = TheGlobalData->m_useCloudMap ? AsciiString("yes") : AsciiString("no");
+		(*pref)["UseCloudMap"] = TheGlobalData->m_useCloudMap ? "yes" : "no";
 
 		TheWritableGlobalData->m_useLightMap = GadgetCheckBoxIsChecked( checkGroundLighting );
-		(*pref)["UseLightMap"] = TheGlobalData->m_useLightMap ? AsciiString("yes") : AsciiString("no");
+		(*pref)["UseLightMap"] = TheGlobalData->m_useLightMap ? "yes" : "no";
 
 		TheWritableGlobalData->m_showSoftWaterEdge = GadgetCheckBoxIsChecked( checkSmoothWater );
-		(*pref)["ShowSoftWaterEdge"] = TheGlobalData->m_showSoftWaterEdge ? AsciiString("yes") : AsciiString("no");
+		(*pref)["ShowSoftWaterEdge"] = TheGlobalData->m_showSoftWaterEdge ? "yes" : "no";
 
 		TheWritableGlobalData->m_useDrawModuleLOD = !GadgetCheckBoxIsChecked( checkExtraAnimations );
 		TheWritableGlobalData->m_useTreeSway = !TheWritableGlobalData->m_useDrawModuleLOD;	//borrow same setting.
-		(*pref)["ExtraAnimations"] = TheGlobalData->m_useDrawModuleLOD ? AsciiString("no") : AsciiString("yes");
+		(*pref)["ExtraAnimations"] = TheGlobalData->m_useDrawModuleLOD ? "no" : "yes";
 
 		TheWritableGlobalData->m_enableDynamicLOD = !GadgetCheckBoxIsChecked( checkNoDynamicLod );
-		(*pref)["DynamicLOD"] = TheGlobalData->m_enableDynamicLOD ? AsciiString("yes") : AsciiString("no");
+		(*pref)["DynamicLOD"] = TheGlobalData->m_enableDynamicLOD ? "yes" : "no";
 
 		// Never write this out
 		//TheWritableGlobalData->m_useFpsLimit = !GadgetCheckBoxIsChecked( checkUnlockFps );
-		//(*pref)["FPSLimit"] = TheGlobalData->m_useFpsLimit ? AsciiString("yes") : AsciiString("no");
+		//(*pref)["FPSLimit"] = TheGlobalData->m_useFpsLimit ? "yes" : "no";
 
 		TheWritableGlobalData->m_enableBehindBuildingMarkers = GadgetCheckBoxIsChecked( checkBuildingOcclusion );
-		(*pref)["BuildingOcclusion"] = TheWritableGlobalData->m_enableBehindBuildingMarkers ? AsciiString("yes") : AsciiString("no");
+		(*pref)["BuildingOcclusion"] = TheWritableGlobalData->m_enableBehindBuildingMarkers ? "yes" : "no";
 
 		TheWritableGlobalData->m_useTrees = GadgetCheckBoxIsChecked( checkProps);
-		(*pref)["ShowTrees"] = TheWritableGlobalData->m_useTrees ? AsciiString("yes") : AsciiString("no");
+		(*pref)["ShowTrees"] = TheWritableGlobalData->m_useTrees ? "yes" : "no";
 
  		//-------------------------------------------------------------------------------------------------
 		// Particle Cap slider
@@ -1000,102 +1211,44 @@ static void saveOptions( void )
 
 	//-------------------------------------------------------------------------------------------------
 	// LOD
-	Bool levelChanged=FALSE;
-	GadgetComboBoxGetSelectedPos( comboBoxDetail, &index );
-	//The levels stored by the LOD Manager are inverted compared to GUI so find correct one:
-	switch (index) {
-	case HIGHDETAIL:
-		levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_HIGH);
-		break;
-	case MEDIUMDETAIL:
-		levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_MEDIUM);
-		break;
-	case LOWDETAIL:
-		levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_LOW);
-		break;
-	case CUSTOMDETAIL:
-		levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_CUSTOM);
-		break;
-	default:
-		DEBUG_ASSERTCRASH(FALSE,("LOD passed in was %d, %d is not a supported LOD",index,index));
-		break;
-	}
-
-	if (levelChanged)
-	        (*pref)["StaticGameLOD"] = TheGameLODManager->getStaticGameLODLevelName(TheGameLODManager->getStaticLODLevel());
-
-	//-------------------------------------------------------------------------------------------------
-	// Resolution
-	GadgetComboBoxGetSelectedPos( comboBoxResolution, &index );
-	Int xres, yres, bitDepth;
-	
-	oldDispSettings.xRes = TheDisplay->getWidth();
-	oldDispSettings.yRes = TheDisplay->getHeight();
-	oldDispSettings.bitDepth = TheDisplay->getBitDepth();
-	oldDispSettings.windowed = TheDisplay->getWindowed();
-	
-	if (index < TheDisplay->getDisplayModeCount() && index >= 0)
+	if (comboBoxDetail && comboBoxDetail->winGetEnabled())
 	{
-		TheDisplay->getDisplayModeDescription(index,&xres,&yres,&bitDepth);
-		if (TheGlobalData->m_xResolution != xres || TheGlobalData->m_yResolution != yres)
-		{
-			
-			if (TheDisplay->setDisplayMode(xres,yres,bitDepth,TheDisplay->getWindowed()))
-			{
-				dispChanged = TRUE;
-				TheWritableGlobalData->m_xResolution = xres;
-				TheWritableGlobalData->m_yResolution = yres;
-
-				TheHeaderTemplateManager->headerNotifyResolutionChange();
-				TheMouse->mouseNotifyResolutionChange();
-				
-				//Save new settings for a dialog box confirmation after options are accepted
-				newDispSettings.xRes = xres;
-				newDispSettings.yRes = yres;
-				newDispSettings.bitDepth = bitDepth;
-				newDispSettings.windowed = TheDisplay->getWindowed();
-
-				AsciiString prefString;
-				prefString.format("%d %d", xres, yres );
-				(*pref)["Resolution"] = prefString;
-
-				// delete the shell
-				delete TheShell;
-				TheShell = NULL;
+		GadgetComboBoxGetSelectedPos( comboBoxDetail, &index );
+		const Bool levelChanged = TheGameLODManager->setStaticLODLevel((StaticGameLODLevel)index);
 
-				// create the shell
-				TheShell = MSGNEW("GameClientSubsystem") Shell;
-				if( TheShell )
-					TheShell->init();
-				
-				TheInGameUI->recreateControlBar();
-
-				TheShell->push( AsciiString("Menus/MainMenu.wnd") );
-			}
-		}
+		if (levelChanged)
+			(*pref)["StaticGameLOD"] = TheGameLODManager->getStaticGameLODLevelName(TheGameLODManager->getStaticLODLevel());
 	}
 
 	//-------------------------------------------------------------------------------------------------
 	// IP address
-	UnsignedInt ip;
-	GadgetComboBoxGetSelectedPos(comboBoxLANIP, &index);
-	if (index>=0 && TheGlobalData)
+	if (comboBoxLANIP && comboBoxLANIP->winGetEnabled())
 	{
-		ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxLANIP, index);
-		TheWritableGlobalData->m_defaultIP = ip;
-		pref->setLANIPAddress(ip);
+		UnsignedInt ip;
+		GadgetComboBoxGetSelectedPos(comboBoxLANIP, &index);
+		if (index>=0 && TheGlobalData)
+		{
+			ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxLANIP, index);
+			TheWritableGlobalData->m_defaultIP = ip;
+			pref->setLANIPAddress(ip);
+		}
 	}
-	GadgetComboBoxGetSelectedPos(comboBoxOnlineIP, &index);
-	if (index>=0)
+
+	if (comboBoxOnlineIP && comboBoxOnlineIP->winGetEnabled())
 	{
-		ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxOnlineIP, index);
-		pref->setOnlineIPAddress(ip);
+		UnsignedInt ip;
+		GadgetComboBoxGetSelectedPos(comboBoxOnlineIP, &index);
+		if (index>=0)
+		{
+			ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxOnlineIP, index);
+			pref->setOnlineIPAddress(ip);
+		}
 	}
 
 	//-------------------------------------------------------------------------------------------------
 	// HTTP Proxy
 	GameWindow *textEntryHTTPProxy = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("OptionsMenu.wnd:TextEntryHTTPProxy"));
-	if (textEntryHTTPProxy)
+	if (textEntryHTTPProxy && textEntryHTTPProxy->winGetEnabled())
 	{
 		UnicodeString uStr = GadgetTextEntryGetText(textEntryHTTPProxy);
 		AsciiString aStr;
@@ -1107,7 +1260,7 @@ static void saveOptions( void )
 	//-------------------------------------------------------------------------------------------------
 	// Firewall Port Override
 	GameWindow *textEntryFirewallPortOverride = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("OptionsMenu.wnd:TextEntryFirewallPortOverride"));
-	if (textEntryFirewallPortOverride)
+	if (textEntryFirewallPortOverride && textEntryFirewallPortOverride->winGetEnabled())
 	{
 		UnicodeString uStr = GadgetTextEntryGetText(textEntryFirewallPortOverride);
 		AsciiString aStr;
@@ -1137,38 +1290,87 @@ static void saveOptions( void )
 	//-------------------------------------------------------------------------------------------------
 	// mouse mode
 	TheWritableGlobalData->m_useAlternateMouse = GadgetCheckBoxIsChecked(checkAlternateMouse);
-	(*pref)["UseAlternateMouse"] = TheWritableGlobalData->m_useAlternateMouse ? AsciiString("yes") : AsciiString("no");
+	(*pref)["UseAlternateMouse"] = TheWritableGlobalData->m_useAlternateMouse ? "yes" : "no";
+
+	// TheSuperHackers @todo Add combo box ?
+	{
+		CursorCaptureMode mode = pref->getCursorCaptureMode();
+		(*pref)["CursorCaptureEnabledInWindowedGame"] = (mode & CursorCaptureMode_EnabledInWindowedGame) ? "yes" : "no";
+		(*pref)["CursorCaptureEnabledInWindowedMenu"] = (mode & CursorCaptureMode_EnabledInWindowedMenu) ? "yes" : "no";
+		(*pref)["CursorCaptureEnabledInFullscreenGame"] = (mode & CursorCaptureMode_EnabledInFullscreenGame) ? "yes" : "no";
+		(*pref)["CursorCaptureEnabledInFullscreenMenu"] = (mode & CursorCaptureMode_EnabledInFullscreenMenu) ? "yes" : "no";
+		TheMouse->setCursorCaptureMode(mode);
+	}
+
+	// TheSuperHackers @todo Add combo box ?
+	{
+		ScreenEdgeScrollMode mode = pref->getScreenEdgeScrollMode();
+		(*pref)["ScreenEdgeScrollEnabledInWindowedApp"] = (mode & ScreenEdgeScrollMode_EnabledInWindowedApp) ? "yes" : "no";
+		(*pref)["ScreenEdgeScrollEnabledInFullscreenApp"] = (mode & ScreenEdgeScrollMode_EnabledInFullscreenApp) ? "yes" : "no";
+		TheLookAtTranslator->setScreenEdgeScrollMode(mode);
+	}
+
+	// TheSuperHackers @todo Add checkbox ?
+	{
+		Bool enabled = pref->getPlayerObserverEnabled();
+		(*pref)["PlayerObserverEnabled"] = enabled ? "yes" : "no";
+		TheWritableGlobalData->m_enablePlayerObserver = enabled;
+	}
+
+	// TheSuperHackers @todo Add checkbox ?
+	{
+		Bool enabled = pref->getArchiveReplaysEnabled();
+		(*pref)["ArchiveReplays"] = enabled ? "yes" : "no";
+		TheRecorder->setArchiveEnabled(enabled);
+	}
 
 	//-------------------------------------------------------------------------------------------------
 	// scroll speed val
 	val = GadgetSliderGetPosition(sliderScrollSpeed);
-	if(val != -1)
+	if(val > 0)
 	{
 		TheWritableGlobalData->m_keyboardScrollFactor = val/100.0f;
-		DEBUG_LOG(("Scroll Spped val %d, keyboard scroll factor %f\n", val, TheGlobalData->m_keyboardScrollFactor));
+		DEBUG_LOG(("Scroll Spped val %d, keyboard scroll factor %f", val, TheGlobalData->m_keyboardScrollFactor));
 		AsciiString prefString;
 		prefString.format("%d", val);
 		(*pref)["ScrollFactor"] = prefString;
 	}
-	
+
+	//-------------------------------------------------------------------------------------------------
+	// draw scroll anchor
+	{
+		if( TheInGameUI->getDrawRMBScrollAnchor() )
+				(*pref)["DrawScrollAnchor"] = "yes";
+		else
+				(*pref)["DrawScrollAnchor"] = "no";
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// move scroll anchor
+	{
+		if( TheInGameUI->getMoveRMBScrollAnchor() )
+				(*pref)["MoveScrollAnchor"] = "yes";
+		else
+				(*pref)["MoveScrollAnchor"] = "no";
+	}
+
 	//-------------------------------------------------------------------------------------------------
 	// slider music volume
 	val = GadgetSliderGetPosition(sliderMusicVolume);
 	if(val != -1)
 	{
-	  TheWritableGlobalData->m_musicVolumeFactor = val;
     AsciiString prefString;
     prefString.format("%d", val);
     (*pref)["MusicVolume"] = prefString;
     TheAudio->setVolume(val / 100.0f, (AudioAffect) (AudioAffect_Music | AudioAffect_SystemSetting));
 	}
-	
+
 	//-------------------------------------------------------------------------------------------------
 	// slider SFX volume
 	val = GadgetSliderGetPosition(sliderSFXVolume);
 	if(val != -1)
 	{
-		//Both 2D and 3D sound effects are sharing the same slider. However, there is a 
+		//Both 2D and 3D sound effects are sharing the same slider. However, there is a
 		//relative slider that gets applied to one of these values to lower that sound volume.
 		Real sound2DVolume = val / 100.0f;
 		Real sound3DVolume = val / 100.0f;
@@ -1190,7 +1392,6 @@ static void saveOptions( void )
 		TheAudio->setVolume( sound3DVolume, (AudioAffect) (AudioAffect_Sound3D | AudioAffect_SystemSetting) );
 
 		//Save the settings in the options.ini.
-    TheWritableGlobalData->m_SFXVolumeFactor = val;
     AsciiString prefString;
     prefString.format("%d", REAL_TO_INT( sound2DVolume * 100.0f ) );
     (*pref)["SFXVolume"] = prefString;
@@ -1203,13 +1404,23 @@ static void saveOptions( void )
 	val = GadgetSliderGetPosition(sliderVoiceVolume);
 	if(val != -1)
 	{
-    TheWritableGlobalData->m_voiceVolumeFactor = val;
     AsciiString prefString;
     prefString.format("%d", val);
     (*pref)["VoiceVolume"] = prefString;
     TheAudio->setVolume(val / 100.0f, (AudioAffect) (AudioAffect_Speech | AudioAffect_SystemSetting));
 	}
 
+	//-------------------------------------------------------------------------------------------------
+	// Money tick volume
+	// TheSuperHackers @todo Add options slider ?
+	{
+		val = pref->getMoneyTransactionVolume();
+		AsciiString prefString;
+		prefString.format("%d", val);
+		(*pref)["MoneyTransactionVolume"] = prefString;
+		TheAudio->friend_getAudioSettings()->m_preferredMoneyTransactionVolume = val / 100.0f;
+	}
+
  	//-------------------------------------------------------------------------------------------------
  	// slider Gamma
  	val = GadgetSliderGetPosition(sliderGamma);
@@ -1238,6 +1449,119 @@ static void saveOptions( void )
 		}
  	}
 
+	//-------------------------------------------------------------------------------------------------
+	// Set Network Latency Font Size
+	val = pref->getNetworkLatencyFontSize();
+	if (val >= 0)
+	{
+		AsciiString prefString;
+		prefString.format("%d", val);
+		(*pref)["NetworkLatencyFontSize"] = prefString;
+		TheInGameUI->refreshNetworkLatencyResources();
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// Set Render FPS Font Size
+	val = pref->getRenderFpsFontSize();
+	if (val >= 0)
+	{
+		AsciiString prefString;
+		prefString.format("%d", val);
+		(*pref)["RenderFpsFontSize"] = prefString;
+		TheInGameUI->refreshRenderFpsResources();
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// Set System Time Font Size
+	val = pref->getSystemTimeFontSize(); // TheSuperHackers @todo replace with options input when applicable
+	if (val >= 0)
+	{
+		AsciiString prefString;
+		prefString.format("%d", val);
+		(*pref)["SystemTimeFontSize"] = prefString;
+		TheInGameUI->refreshSystemTimeResources();
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// Set Game Time Font Size
+	val = pref->getGameTimeFontSize(); // TheSuperHackers @todo replace with options input when applicable
+	if (val >= 0)
+	{
+		AsciiString prefString;
+		prefString.format("%d", val);
+		(*pref)["GameTimeFontSize"] = prefString;
+		TheInGameUI->refreshGameTimeResources();
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// Set User Font Scaling Percentage
+	val = pref->getResolutionFontAdjustment() * 100.0f; // TheSuperHackers @todo replace with options input when applicable
+	if (val >= 0 || val == -100)
+	{
+		AsciiString prefString;
+		prefString.format("%d", REAL_TO_INT( val ) );
+		(*pref)["ResolutionFontAdjustment"] = prefString;
+		TheGlobalLanguageData->m_userResolutionFontSizeAdjustment = (Real)val / 100.0f;
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// Set Money Per Minute
+	{
+		Bool show = pref->getShowMoneyPerMinute();
+		AsciiString prefString;
+		prefString = show ? "yes" : "no";
+		(*pref)["ShowMoneyPerMinute"] = prefString;
+		TheWritableGlobalData->m_showMoneyPerMinute = show;
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// Resolution
+	//
+	// TheSuperHackers @bugfix xezon 12/06/2025 Now performs the resolution change at the very end of
+	// processing all the options. This is necessary, because recreating the Shell will destroy the
+	// Options Menu and therefore prevent any further ui gadget interactions afterwards.
+
+	GadgetComboBoxGetSelectedPos( comboBoxResolution, &index );
+	Int xres, yres, bitDepth;
+
+	oldDispSettings.xRes = TheDisplay->getWidth();
+	oldDispSettings.yRes = TheDisplay->getHeight();
+	oldDispSettings.bitDepth = TheDisplay->getBitDepth();
+	oldDispSettings.windowed = TheDisplay->getWindowed();
+
+	if (comboBoxResolution && comboBoxResolution->winGetEnabled() && index < TheDisplay->getDisplayModeCount() && index >= 0)
+	{
+		TheDisplay->getDisplayModeDescription(index,&xres,&yres,&bitDepth);
+		if (TheGlobalData->m_xResolution != xres || TheGlobalData->m_yResolution != yres)
+		{
+			if (TheDisplay->setDisplayMode(xres,yres,bitDepth,TheDisplay->getWindowed()))
+			{
+				dispChanged = TRUE;
+				TheWritableGlobalData->m_xResolution = xres;
+				TheWritableGlobalData->m_yResolution = yres;
+
+				TheHeaderTemplateManager->onResolutionChanged();
+				TheMouse->onResolutionChanged();
+
+				//Save new settings for a dialog box confirmation after options are accepted
+				newDispSettings.xRes = xres;
+				newDispSettings.yRes = yres;
+				newDispSettings.bitDepth = bitDepth;
+				newDispSettings.windowed = TheDisplay->getWindowed();
+
+				AsciiString prefString;
+				prefString.format("%d %d", xres, yres );
+				(*pref)["Resolution"] = prefString;
+
+				TheShell->recreateWindowLayouts();
+
+				TheInGameUI->recreateControlBar();
+				TheInGameUI->refreshCustomUiResources();
+			}
+		}
+	}
+
+	// MUST NEVER ADD ANOTHER OPTION HERE AT THE END !
 }
 
 static void DestroyOptionsLayout() {
@@ -1261,27 +1585,31 @@ static void acceptAdvancedOptions()
 static void cancelAdvancedOptions()
 {
 	//restore the detail selection back to initial state
-	switch (TheGameLODManager->getStaticLODLevel())
-	{
-	case STATIC_GAME_LOD_LOW:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, LOWDETAIL);
-		break;
-	case STATIC_GAME_LOD_MEDIUM:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, MEDIUMDETAIL);
-		break;
-	case STATIC_GAME_LOD_HIGH:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, HIGHDETAIL);
-		break;
-	case STATIC_GAME_LOD_CUSTOM:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, CUSTOMDETAIL);
-		break;
-	default:
-		DEBUG_ASSERTCRASH(FALSE,("Tried to set comboBoxDetail to a value of %d ", TheGameLODManager->getStaticLODLevel()) );
-	};
+	GadgetComboBoxSetSelectedPos(comboBoxDetail, (Int)TheGameLODManager->getStaticLODLevel());
 
 	WinAdvancedDisplay->winHide(TRUE);
 }
 
+// TheSuperHackers @tweak Now prints additional version information in the version label.
+static void initLabelVersion()
+{
+	NameKeyType versionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:LabelVersion" );
+	GameWindow *labelVersion = TheWindowManager->winGetWindowFromId( NULL, versionID );
+
+	if (labelVersion)
+	{
+		if (TheVersion && TheGlobalData)
+		{
+			UnicodeString text = TheVersion->getUnicodeProductVersionHashString();
+			GadgetStaticTextSetText( labelVersion, text );
+		}
+		else
+		{
+			labelVersion->winHide( TRUE );
+		}
+	}
+}
+
 //-------------------------------------------------------------------------------------------------
 /** Initialize the options menu */
 //-------------------------------------------------------------------------------------------------
@@ -1298,100 +1626,100 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 
 	SignalUIInteraction(SHELL_SCRIPT_HOOK_OPTIONS_OPENED);
 
-	comboBoxLANIPID				 = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxIP" ) );
+	comboBoxLANIPID				 = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxIP" );
 	comboBoxLANIP					 = TheWindowManager->winGetWindowFromId( NULL,  comboBoxLANIPID);
-	comboBoxOnlineIPID		 = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxOnlineIP" ) );
+	comboBoxOnlineIPID		 = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxOnlineIP" );
 	comboBoxOnlineIP			 = TheWindowManager->winGetWindowFromId( NULL,  comboBoxOnlineIPID);
-	checkAlternateMouseID  = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckAlternateMouse" ) );
+	checkAlternateMouseID  = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckAlternateMouse" );
 	checkAlternateMouse	   = TheWindowManager->winGetWindowFromId( NULL, checkAlternateMouseID);
-	sliderScrollSpeedID	   = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderScrollSpeed" ) );
+	sliderScrollSpeedID	   = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderScrollSpeed" );
 	sliderScrollSpeed		   = TheWindowManager->winGetWindowFromId( NULL,  sliderScrollSpeedID);
-	comboBoxAntiAliasingID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxAntiAliasing" ) );
+	comboBoxAntiAliasingID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxAntiAliasing" );
 	comboBoxAntiAliasing   = TheWindowManager->winGetWindowFromId( NULL, comboBoxAntiAliasingID );
-	comboBoxResolutionID   = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxResolution" ) );
+	comboBoxResolutionID   = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxResolution" );
 	comboBoxResolution     = TheWindowManager->winGetWindowFromId( NULL, comboBoxResolutionID );
-	comboBoxDetailID			 = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxDetail" ) );
+	comboBoxDetailID			 = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxDetail" );
 	comboBoxDetail		   = TheWindowManager->winGetWindowFromId( NULL, comboBoxDetailID );
 
-	checkLanguageFilterID  = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckLanguageFilter" ) );
+	checkLanguageFilterID  = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckLanguageFilter" );
 	checkLanguageFilter    = TheWindowManager->winGetWindowFromId( NULL, checkLanguageFilterID );
-	checkSendDelayID       = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckSendDelay" ) );
+	checkSendDelayID       = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckSendDelay" );
 	checkSendDelay				 = TheWindowManager->winGetWindowFromId( NULL, checkSendDelayID);
-	buttonFirewallRefreshID	= TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonFirewallRefresh" ) );
+	buttonFirewallRefreshID	= TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonFirewallRefresh" );
 	buttonFirewallRefresh		= TheWindowManager->winGetWindowFromId( NULL, buttonFirewallRefreshID);
-	checkDrawAnchorID       = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxDrawAnchor" ) );
+	checkDrawAnchorID       = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxDrawAnchor" );
 	checkDrawAnchor				 = TheWindowManager->winGetWindowFromId( NULL, checkDrawAnchorID);
-	checkMoveAnchorID       = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxMoveAnchor" ) );
+	checkMoveAnchorID       = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxMoveAnchor" );
 	checkMoveAnchor				 = TheWindowManager->winGetWindowFromId( NULL, checkMoveAnchorID);
 
 	// Replay camera
-	checkSaveCameraID      = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxSaveCamera" ) );
+	checkSaveCameraID      = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxSaveCamera" );
 	checkSaveCamera        = TheWindowManager->winGetWindowFromId( NULL, checkSaveCameraID );
-	checkUseCameraID       = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxUseCamera" ) );
+	checkUseCameraID       = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxUseCamera" );
 	checkUseCamera         = TheWindowManager->winGetWindowFromId( NULL, checkUseCameraID );
 
 //	// Speakers and 3-D Audio
-//	checkAudioSurroundID   = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckAudioSurround" ) );
+//	checkAudioSurroundID   = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckAudioSurround" );
 //	checkAudioSurround     = TheWindowManager->winGetWindowFromId( NULL, checkAudioSurroundID );
-//	checkAudioHardwareID   = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckAudioHardware" ) );
+//	checkAudioHardwareID   = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckAudioHardware" );
 //	checkAudioHardware     = TheWindowManager->winGetWindowFromId( NULL, checkAudioHardwareID );
 //
 	// Volume Controls
-	sliderMusicVolumeID    = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderMusicVolume" ) );
+	sliderMusicVolumeID    = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderMusicVolume" );
 	sliderMusicVolume      = TheWindowManager->winGetWindowFromId( NULL, sliderMusicVolumeID );
-	sliderSFXVolumeID      = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderSFXVolume" ) );
+	sliderSFXVolumeID      = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderSFXVolume" );
 	sliderSFXVolume        = TheWindowManager->winGetWindowFromId( NULL, sliderSFXVolumeID );
-	sliderVoiceVolumeID    = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderVoiceVolume" ) );
+	sliderVoiceVolumeID    = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderVoiceVolume" );
 	sliderVoiceVolume      = TheWindowManager->winGetWindowFromId( NULL, sliderVoiceVolumeID );
- 	sliderGammaID    = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderGamma" ) );
+ 	sliderGammaID    = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderGamma" );
  	sliderGamma      = TheWindowManager->winGetWindowFromId( NULL, sliderGammaID );
 
-//	checkBoxLowTextureDetailID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckLowTextureDetail" ) );
+//	checkBoxLowTextureDetailID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckLowTextureDetail" );
 //	checkBoxLowTextureDetail      = TheWindowManager->winGetWindowFromId( NULL, checkBoxLowTextureDetailID );
-	
-	WinAdvancedDisplayID		= TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:WinAdvancedDisplayOptions" ) );
+
+	WinAdvancedDisplayID		= TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:WinAdvancedDisplayOptions" );
 	WinAdvancedDisplay      = TheWindowManager->winGetWindowFromId( NULL, WinAdvancedDisplayID );
 
-	ButtonAdvancedAcceptID		= TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonAdvanceAccept" ) );
+	ButtonAdvancedAcceptID		= TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonAdvanceAccept" );
 	ButtonAdvancedAccept      = TheWindowManager->winGetWindowFromId( NULL, ButtonAdvancedAcceptID );
 
-	ButtonAdvancedCancelID		= TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonAdvanceBack" ) );
+	ButtonAdvancedCancelID		= TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonAdvanceBack" );
 	ButtonAdvancedCancel      = TheWindowManager->winGetWindowFromId( NULL, ButtonAdvancedCancelID );
 
-	sliderTextureResolutionID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:LowResSlider" ) );
+	sliderTextureResolutionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:LowResSlider" );
 	sliderTextureResolution = TheWindowManager->winGetWindowFromId( NULL, sliderTextureResolutionID );
 
-	check3DShadowsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:Check3DShadows" ) );
+	check3DShadowsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:Check3DShadows" );
 	check3DShadows   = TheWindowManager->winGetWindowFromId( NULL, check3DShadowsID);
 
-	check2DShadowsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:Check2DShadows" ) );
+	check2DShadowsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:Check2DShadows" );
 	check2DShadows   = TheWindowManager->winGetWindowFromId( NULL, check2DShadowsID);
 
-	checkCloudShadowsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckCloudShadows" ) );
+	checkCloudShadowsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckCloudShadows" );
 	checkCloudShadows   = TheWindowManager->winGetWindowFromId( NULL, checkCloudShadowsID);
 
-	checkGroundLightingID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckGroundLighting" ) );
+	checkGroundLightingID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckGroundLighting" );
 	checkGroundLighting   = TheWindowManager->winGetWindowFromId( NULL, checkGroundLightingID);
 
-	checkSmoothWaterID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckSmoothWater" ) );
+	checkSmoothWaterID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckSmoothWater" );
 	checkSmoothWater   = TheWindowManager->winGetWindowFromId( NULL, checkSmoothWaterID);
 
-	checkExtraAnimationsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckExtraAnimations" ) );
+	checkExtraAnimationsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckExtraAnimations" );
 	checkExtraAnimations   = TheWindowManager->winGetWindowFromId( NULL, checkExtraAnimationsID);
 
-	checkNoDynamicLodID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckNoDynamicLOD" ) );
+	checkNoDynamicLodID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckNoDynamicLOD" );
 	checkNoDynamicLod   = TheWindowManager->winGetWindowFromId( NULL, checkNoDynamicLodID);
 
-	checkUnlockFpsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckUnlockFPS" ) );
+	checkUnlockFpsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckUnlockFPS" );
 	checkUnlockFps   = TheWindowManager->winGetWindowFromId( NULL, checkUnlockFpsID);
 
-	checkBuildingOcclusionID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBehindBuilding" ) );
+	checkBuildingOcclusionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBehindBuilding" );
 	checkBuildingOcclusion   = TheWindowManager->winGetWindowFromId( NULL, checkBuildingOcclusionID);
 
-	checkPropsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckShowProps" ) );
+	checkPropsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckShowProps" );
 	checkProps   = TheWindowManager->winGetWindowFromId( NULL, checkPropsID);
 
-	sliderParticleCapID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ParticleCapSlider" ) );
+	sliderParticleCapID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ParticleCapSlider" );
   sliderParticleCap = TheWindowManager->winGetWindowFromId( NULL, sliderParticleCapID );
 
 	WinAdvancedDisplay->winHide(TRUE);
@@ -1406,29 +1734,7 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
     NUM_ALIASING_MODES
   };
 
-	NameKeyType versionID = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:LabelVersion") );
-	GameWindow *labelVersion = TheWindowManager->winGetWindowFromId( NULL, versionID );
-	UnicodeString versionString;
-	versionString.format(TheGameText->fetch("Version:Format2").str(), (GetRegistryVersion() >> 16), (GetRegistryVersion() & 0xffff));
-	
-	if (TheVersion->showFullVersion())
-	{
-		if (TheVersion)
-		{
-			UnicodeString version;
-			version.format(L"(%s) %s -- %s", versionString.str(), TheVersion->getFullUnicodeVersion().str(), TheVersion->getUnicodeBuildTime().str());
-			GadgetStaticTextSetText( labelVersion, version );
-		}
-		else
-		{
-			labelVersion->winHide( TRUE );
-		}
-	}
-	else
-	{
-		GadgetStaticTextSetText( labelVersion, versionString );
-	}
-
+	initLabelVersion();
 
 	// Choose an IP address, then initialize the IP combo box
 	UnsignedInt selectedIP = pref->getLANIPAddress();
@@ -1546,74 +1852,73 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 
 	// get resolution from saved preferences file
 	AsciiString selectedResolution = (*pref) ["Resolution"];
-	Int selectedXRes=800,selectedYRes=600;
+	Int selectedXRes=DEFAULT_DISPLAY_WIDTH;
+	Int selectedYRes=DEFAULT_DISPLAY_HEIGHT;
 	Int selectedResIndex=-1;
-	Int defaultResIndex=0;	//index of default video mode that should always exist
 	if (!selectedResolution.isEmpty())
 	{	//try to parse 2 integers out of string
 		if (sscanf(selectedResolution.str(),"%d%d", &selectedXRes, &selectedYRes) != 2)
-		{	selectedXRes=800; selectedYRes=600;
+		{
+			selectedXRes=DEFAULT_DISPLAY_WIDTH;
+			selectedYRes=DEFAULT_DISPLAY_HEIGHT;
 		}
 	}
 
 	// populate resolution modes
 	GadgetComboBoxReset(comboBoxResolution);
 	Int numResolutions = TheDisplay->getDisplayModeCount();
+	UnsignedInt displayWidth = TheDisplay->getWidth();
+	UnsignedInt displayHeight = TheDisplay->getHeight();
+
 	for( i = 0; i < numResolutions; ++i )
 	{	Int xres,yres,bitDepth;
 		TheDisplay->getDisplayModeDescription(i,&xres,&yres,&bitDepth);
 		str.format(L"%d x %d",xres,yres);
 		GadgetComboBoxAddEntry( comboBoxResolution, str, color);
-		if (xres == 800 && yres == 600)	//keep track of default mode in case we need it.
-			defaultResIndex=i;
-		if (xres == selectedXRes && yres == selectedYRes)
+		// TheSuperHackers @bugfix xezon 12/06/2025 Now makes a selection with the active display resolution
+		// instead of the resolution read from the Option Preferences, because the active display resolution
+		// is the most relevant to make a selection with and the Option Preferences could be wrong.
+		if ( xres == displayWidth && yres == displayHeight )
 			selectedResIndex=i;
 	}
 
-	if (selectedResIndex == -1)	//check if saved mode no longer available
-	{	//pick default resolution
-		selectedXRes = 800;
-		selectedXRes = 600;
-		selectedResIndex = defaultResIndex;
+	if (selectedResIndex == -1)
+	{
+		// TheSuperHackers @bugfix xezon 08/06/2025 Now adds the current resolution instead of defaulting to 800 x 600.
+		// This avoids force changing the resolution when the user has set a custom resolution in the Option Preferences.
+		Int xres = displayWidth;
+		Int yres = displayHeight;
+		str.format(L"%d x %d",xres,yres);
+		GadgetComboBoxAddEntry( comboBoxResolution, str, color );
+		selectedResIndex = GadgetComboBoxGetLength( comboBoxResolution ) - 1;
 	}
 
-	TheWritableGlobalData->m_xResolution = selectedXRes;
-	TheWritableGlobalData->m_yResolution = selectedYRes;
-
 	GadgetComboBoxSetSelectedPos( comboBoxResolution, selectedResIndex );
 
 	// set the display detail
+	// TheSuperHackers @tweak xezon 24/09/2025 The Detail Combo Box now has the same value order as StaticGameLODLevel for simplicity.
+	// TheSuperHackers @feature xezon 24/09/2025 The Detail Combo Box now has a new options for "Very High".
 	GadgetComboBoxReset(comboBoxDetail);
-	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->fetch("GUI:High"), color);
-	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->fetch("GUI:Medium"), color);
+#if ENABLE_GUI_HACKS
+	// TheSuperHackers @tweak xezon 24/09/2025 Show max 4 rows because with the original layout it cannot possibly show 5.
+	GadgetComboBoxSetMaxDisplay(comboBoxDetail, 4);
+#endif
 	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->fetch("GUI:Low"), color);
+	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->fetch("GUI:Medium"), color);
+	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->fetch("GUI:High"), color);
+	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->FETCH_OR_SUBSTITUTE("GUI:VeryHigh", L"Very High"), color);
 	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->fetch("GUI:Custom"), color);
+	static_assert(STATIC_GAME_LOD_COUNT == 5, "Wrong combo box count");
 
 	//Check if level was never set and default to setting most suitable for system.
 	if (TheGameLODManager->getStaticLODLevel() == STATIC_GAME_LOD_UNKNOWN)
-		TheGameLODManager->setStaticLODLevel(TheGameLODManager->findStaticLODLevel());
-
-	switch (TheGameLODManager->getStaticLODLevel())
-	{
-	case STATIC_GAME_LOD_LOW:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, LOWDETAIL);
-		break;
-	case STATIC_GAME_LOD_MEDIUM:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, MEDIUMDETAIL);
-		break;
-	case STATIC_GAME_LOD_HIGH:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, HIGHDETAIL);
-		break;
-	case STATIC_GAME_LOD_CUSTOM:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, CUSTOMDETAIL);
-		break;
-	default:
-		DEBUG_ASSERTCRASH(FALSE,("Tried to set comboBoxDetail to a value of %d ", TheGameLODManager->getStaticLODLevel()) );
-	};
-
-	Int txtFact=TheGameLODManager->getCurrentTextureReduction();
-
-	GadgetSliderSetPosition( sliderTextureResolution, 2-txtFact);
+	{
+		TheGameLODManager->setStaticLODLevel(TheGameLODManager->getRecommendedStaticLODLevel());
+	}
+
+	GadgetComboBoxSetSelectedPos(comboBoxDetail, (Int)TheGameLODManager->getStaticLODLevel());
+
+	GadgetSliderSetPosition( sliderTextureResolution, 2-WW3D::Get_Texture_Reduction());
 
 	GadgetCheckBoxSetChecked( check3DShadows, TheGlobalData->m_useShadowVolumes);
 
@@ -1650,7 +1955,7 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 		GadgetCheckBoxSetChecked( checkLanguageFilter, false);
 		TheWritableGlobalData->m_languageFilterPref = false;
 	}
-	
+
 	//set replay camera
 	if (pref->saveCameraInReplays())
 	{
@@ -1675,8 +1980,8 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 
 	//set scroll options
 	AsciiString test = (*pref)["DrawScrollAnchor"];
-	DEBUG_LOG(("DrawScrollAnchor == [%s]\n", test.str()));
-	if (test == "Yes" || (test.isEmpty() && TheInGameUI->getDrawRMBScrollAnchor()))
+	DEBUG_LOG(("DrawScrollAnchor == [%s]", test.str()));
+	if (test == "yes" || (test.isEmpty() && TheInGameUI->getDrawRMBScrollAnchor()))
 	{
 		GadgetCheckBoxSetChecked( checkDrawAnchor, true);
 		TheInGameUI->setDrawRMBScrollAnchor(true);
@@ -1687,8 +1992,8 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 		TheInGameUI->setDrawRMBScrollAnchor(false);
 	}
 	test = (*pref)["MoveScrollAnchor"];
-	DEBUG_LOG(("MoveScrollAnchor == [%s]\n", test.str()));
-	if (test == "Yes" || (test.isEmpty() && TheInGameUI->getMoveRMBScrollAnchor()))
+	DEBUG_LOG(("MoveScrollAnchor == [%s]", test.str()));
+	if (test == "yes" || (test.isEmpty() && TheInGameUI->getMoveRMBScrollAnchor()))
 	{
 		GadgetCheckBoxSetChecked( checkMoveAnchor, true);
 		TheInGameUI->setMoveRMBScrollAnchor(true);
@@ -1707,9 +2012,17 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
  	GadgetCheckBoxSetChecked(checkAlternateMouse, TheGlobalData->m_useAlternateMouse);
 
 	// set scroll speed slider
+	// TheSuperHackers @tweak xezon 11/07/2025 No longer sets the slider position if the user setting
+	// is set beyond the slider limits. This gives the user more freedom to customize the scroll
+	// speed. The slider value remains 0.
 	Int scrollPos = (Int)(TheGlobalData->m_keyboardScrollFactor*100.0f);
-	GadgetSliderSetPosition( sliderScrollSpeed, scrollPos );
-	DEBUG_LOG(("Scroll SPeed %d\n", scrollPos));
+	Int scrollMin, scrollMax;
+	GadgetSliderGetMinMax( sliderScrollSpeed, &scrollMin, &scrollMax );
+	if (scrollPos >= scrollMin && scrollPos <= scrollMax)
+	{
+		GadgetSliderSetPosition( sliderScrollSpeed, scrollPos );
+	}
+	DEBUG_LOG(("Scroll Speed %d", scrollPos));
 
 	// set the send delay check box
 	GadgetCheckBoxSetChecked(checkSendDelay, TheGlobalData->m_firewallSendDelay);
@@ -1725,7 +2038,7 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 
 	//set voice volume slider
 	GadgetSliderSetPosition( sliderVoiceVolume, REAL_TO_INT(pref->getSpeechVolume()) );
-	
+
 	// set the gamma slider
  	GadgetSliderSetPosition( sliderGamma, REAL_TO_INT(pref->getGammaValue()) );
 
@@ -1733,27 +2046,34 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 	layout->hide( FALSE );
 
 	// set keyboard focus to main parent
-	AsciiString parentName( "OptionsMenu.wnd:OptionsMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:OptionsMenuParent" );
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	TheWindowManager->winSetFocus( parent );
-	
+
 	if( (TheGameLogic->isInGame() && TheGameLogic->getGameMode() != GAME_SHELL) || TheGameSpyInfo )
 	{
 		// disable controls that you can't change the options for in game
 		comboBoxLANIP->winEnable(FALSE);
+
 		if (comboBoxOnlineIP)
 			comboBoxOnlineIP->winEnable(FALSE);
+
 		checkSendDelay->winEnable(FALSE);
+
 		buttonFirewallRefresh->winEnable(FALSE);
 
 		if (comboBoxDetail)
 			comboBoxDetail->winEnable(FALSE);
 
-
 		if (comboBoxResolution)
 			comboBoxResolution->winEnable(FALSE);
 
+		if (textEntryFirewallPortOverride)
+			textEntryFirewallPortOverride->winEnable(FALSE);
+
+		if (textEntryHTTPProxy)
+			textEntryHTTPProxy->winEnable(FALSE);
+
 //		if (checkAudioSurround)
 //			checkAudioSurround->winEnable(FALSE);
 //
@@ -1764,7 +2084,7 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 
 	TheWindowManager->winSetModal(parent);
 	ignoreSelected = FALSE;
-}  // end OptionsMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** options menu shutdown method */
@@ -1788,7 +2108,7 @@ void OptionsMenuShutdown( WindowLayout *layout, void *userData )
 	TheShell->shutdownComplete( layout );
 */
 
-}  // end OptionsMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** options menu update method */
@@ -1796,7 +2116,7 @@ void OptionsMenuShutdown( WindowLayout *layout, void *userData )
 void OptionsMenuUpdate( WindowLayout *layout, void *userData )
 {
 
-}  // end OptionsMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Options menu input callback */
@@ -1805,7 +2125,7 @@ WindowMsgHandledType OptionsMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1820,41 +2140,40 @@ WindowMsgHandledType OptionsMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "OptionsMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end OptionsMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** options menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 																				WindowMsgData mData1, WindowMsgData mData2 )
 {
 	static NameKeyType buttonBack = NAMEKEY_INVALID;
@@ -1863,7 +2182,7 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 	static NameKeyType buttonReplayMenu = NAMEKEY_INVALID;
 	static NameKeyType buttonKeyboardOptionsMenu = NAMEKEY_INVALID;
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1871,14 +2190,14 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 		{
 
 			// get ids for our children controls
-			buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:ButtonBack") );
-			buttonDefaults = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:ButtonDefaults") );
-			buttonAccept = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:ButtonAccept") );
-			buttonKeyboardOptionsMenu = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonKeyboardOptions" ) );
+			buttonBack = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonBack" );
+			buttonDefaults = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonDefaults" );
+			buttonAccept = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonAccept" );
+			buttonKeyboardOptionsMenu = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonKeyboardOptions" );
 
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -1886,7 +2205,7 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -1898,7 +2217,7 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
@@ -1907,12 +2226,12 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 					break;
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-		
+
 				if (controlID == comboBoxDetailID)
 				{
 					Int index;
 					GadgetComboBoxGetSelectedPos( comboBoxDetail, &index );
-					if(index != CUSTOMDETAIL)
+					if(index != STATIC_GAME_LOD_CUSTOM)
 						break;
 
 					showAdvancedOptions();
@@ -1932,11 +2251,9 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 			{
 				// go back one screen
 				//TheShell->pop();
-				if (pref)
-				{
-					delete pref;
-					pref = NULL;
-				}
+
+				delete pref;
+				pref = NULL;
 
 				comboBoxLANIP = NULL;
 				comboBoxOnlineIP = NULL;
@@ -1948,7 +2265,7 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 					DestroyOptionsLayout();
 				}
 
-			}  // end if
+			}
 			else if (controlID == buttonAccept )
 			{
 				saveOptions();
@@ -1962,7 +2279,7 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 
 				comboBoxLANIP = NULL;
 				comboBoxOnlineIP = NULL;
-				
+
 				if(!TheGameLogic->isInGame() || TheGameLogic->isInShellGame())
 					destroyQuitMenu(); // if we're in a game, the change res then enter the same kind of game, we nee the quit menu to be gone.
 
@@ -1986,27 +2303,27 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 			else if (controlID == ButtonAdvancedAcceptID )
 			{
 				acceptAdvancedOptions();
-				
+
 			}
 			else if (controlID == ButtonAdvancedCancelID )
-			{	
+			{
 				cancelAdvancedOptions();
 			}
 			else if ( controlID == buttonKeyboardOptionsMenu )
 			{
-				TheShell->push( AsciiString( "Menus/KeyboardOptionsMenu.wnd" ) );
+				TheShell->push( "Menus/KeyboardOptionsMenu.wnd" );
 			}
 			else if(controlID == checkDrawAnchorID )
       {
         if( GadgetCheckBoxIsChecked( control ) )
         {
           	TheInGameUI->setDrawRMBScrollAnchor(true);
-          	(*pref)["DrawScrollAnchor"] = "Yes";
+          	(*pref)["DrawScrollAnchor"] = "yes";
         }
 				else
         {
           	TheInGameUI->setDrawRMBScrollAnchor(false);
-          	(*pref)["DrawScrollAnchor"] = "No";
+          	(*pref)["DrawScrollAnchor"] = "no";
         }
       }
 			else if(controlID == checkMoveAnchorID )
@@ -2014,12 +2331,12 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
         if( GadgetCheckBoxIsChecked( control ) )
         {
           	TheInGameUI->setMoveRMBScrollAnchor(true);
-          	(*pref)["MoveScrollAnchor"] = "Yes";
+          	(*pref)["MoveScrollAnchor"] = "yes";
         }
 				else
         {
           	TheInGameUI->setMoveRMBScrollAnchor(false);
-          	(*pref)["MoveScrollAnchor"] = "No";
+          	(*pref)["MoveScrollAnchor"] = "no";
         }
       }
 			else if(controlID == checkSaveCameraID )
@@ -2062,13 +2379,13 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end OptionsMenuSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
index 90c47a2a919..be6aaaee59b 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PopupCommunicator.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GUICallbacks.h"
 #include "GameClient/GameWindowManager.h"
@@ -69,10 +69,10 @@ void PopupCommunicatorInit( WindowLayout *layout, void *userData )
 	TheWindowManager->winSetModal( parent );
 
 	// get ids for our children controls
-	buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString("PopupCommunicator.wnd:ButtonOk") );
+	buttonOkID = TheNameKeyGenerator->nameToKey( "PopupCommunicator.wnd:ButtonOk" );
 	buttonOk = TheWindowManager->winGetWindowFromId( parent, buttonOkID );
 
-}  // end PopupCommunicatorInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Popup Communicator shutdown method */
@@ -80,7 +80,7 @@ void PopupCommunicatorInit( WindowLayout *layout, void *userData )
 void PopupCommunicatorShutdown( WindowLayout *layout, void *userData )
 {
 
-}  // end PopupCommunicatorShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Popup Communicator update method */
@@ -88,7 +88,7 @@ void PopupCommunicatorShutdown( WindowLayout *layout, void *userData )
 void PopupcommunicatorUpdate( WindowLayout *layout, void *userData )
 {
 
-}  // end PopupCommunicatorUpdate 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Popup Communicator input callback */
@@ -97,7 +97,7 @@ WindowMsgHandledType PopupCommunicatorInput( GameWindow *window, UnsignedInt msg
 																						WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -112,7 +112,7 @@ WindowMsgHandledType PopupCommunicatorInput( GameWindow *window, UnsignedInt msg
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -120,34 +120,34 @@ WindowMsgHandledType PopupCommunicatorInput( GameWindow *window, UnsignedInt msg
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)buttonOk, buttonOkID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end PopupCommunicatorInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Popup Communicator window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType PopupCommunicatorSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType PopupCommunicatorSystem( GameWindow *window, UnsignedInt msg,
 																		 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -156,14 +156,14 @@ WindowMsgHandledType PopupCommunicatorSystem( GameWindow *window, UnsignedInt ms
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 
 			break;
 
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -175,13 +175,13 @@ WindowMsgHandledType PopupCommunicatorSystem( GameWindow *window, UnsignedInt ms
 
 			break;
 
-		}  // end input
+		}
     //---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-      
+
 			if( controlID == buttonOkID )
 			{
 				WindowLayout *popupCommunicatorLayout = window->winGetLayout();
@@ -191,17 +191,17 @@ WindowMsgHandledType PopupCommunicatorSystem( GameWindow *window, UnsignedInt ms
 					deleteInstance(popupCommunicatorLayout);
 					popupCommunicatorLayout = NULL;
 				}
-			}  // end if
-	
+			}
+
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
index dbfbf1e43d3..77b256438ef 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PopupHostGame.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,7 +37,7 @@
 //	Filename: 	PopupHostGame.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Contains the Callbacks for the Host Game Popus
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/NameKeyGenerator.h"
@@ -96,11 +96,6 @@ static GameWindow *comboBoxLadderName = NULL;
 static GameWindow *textEntryLadderPassword = NULL;
 static GameWindow *textEntryGamePassword = NULL;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 void createGame( void );
 
@@ -311,39 +306,39 @@ void PopulateCustomLadderComboBox( void )
 //-------------------------------------------------------------------------------------------------
 void PopupHostGameInit( WindowLayout *layout, void *userData )
 {
-	parentPopupID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ParentHostPopUp"));
+	parentPopupID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ParentHostPopUp");
 	parentPopup = TheWindowManager->winGetWindowFromId(NULL, parentPopupID);
 
-	textEntryGameNameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryGameName"));
+	textEntryGameNameID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryGameName");
 	textEntryGameName = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGameNameID);
 	UnicodeString name;
 	name.translate(TheGameSpyInfo->getLocalName());
 	GadgetTextEntrySetText(textEntryGameName, name);
 
-	textEntryGameDescriptionID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryGameDescription"));
+	textEntryGameDescriptionID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryGameDescription");
 	textEntryGameDescription = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGameDescriptionID);
 	GadgetTextEntrySetText(textEntryGameDescription, UnicodeString::TheEmptyString);
 
-	textEntryLadderPasswordID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryLadderPassword"));
+	textEntryLadderPasswordID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryLadderPassword");
 	textEntryLadderPassword = TheWindowManager->winGetWindowFromId(parentPopup, textEntryLadderPasswordID);
 	GadgetTextEntrySetText(textEntryLadderPassword, UnicodeString::TheEmptyString);
 
-	textEntryGamePasswordID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryGamePassword"));
+	textEntryGamePasswordID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryGamePassword");
 	textEntryGamePassword = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGamePasswordID);
 	GadgetTextEntrySetText(textEntryGamePassword, UnicodeString::TheEmptyString);
 
-	buttonCreateGameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ButtonCreateGame"));
+	buttonCreateGameID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ButtonCreateGame");
 	buttonCreateGame = TheWindowManager->winGetWindowFromId(parentPopup, buttonCreateGameID);
 
-	buttonCancelID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ButtonCancel"));
+	buttonCancelID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ButtonCancel");
 	buttonCancel = TheWindowManager->winGetWindowFromId(parentPopup, buttonCancelID);
 
-	checkBoxAllowObserversID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:CheckBoxAllowObservers"));
+	checkBoxAllowObserversID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:CheckBoxAllowObservers");
 	checkBoxAllowObservers = TheWindowManager->winGetWindowFromId(parentPopup, checkBoxAllowObserversID);
 	CustomMatchPreferences customPref;
 	GadgetCheckBoxSetChecked(checkBoxAllowObservers, customPref.allowsObservers());
 
-	comboBoxLadderNameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ComboBoxLadderName"));
+	comboBoxLadderNameID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ComboBoxLadderName");
 	comboBoxLadderName = TheWindowManager->winGetWindowFromId(parentPopup, comboBoxLadderNameID);
 	if (comboBoxLadderName)
 		GadgetComboBoxReset(comboBoxLadderName);
@@ -359,7 +354,7 @@ void PopupHostGameInit( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupHostGameInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -376,28 +371,28 @@ WindowMsgHandledType PopupHostGameInput( GameWindow *window, UnsignedInt msg, Wi
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonCancel, buttonCancelID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
@@ -408,7 +403,7 @@ WindowMsgHandledType PopupHostGameInput( GameWindow *window, UnsignedInt msg, Wi
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -417,7 +412,7 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
@@ -425,7 +420,7 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 
 			break;
 
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -437,7 +432,7 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 
 			break;
 
-		}  // end input
+		}
 
     //----------------------------------------------------------------------------------------------
 		case GEM_UPDATE_TEXT:
@@ -465,9 +460,9 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 					// Put the whitespace-free version in the box
 					GadgetTextEntrySetText( textEntryGameName, txtInput );
 
-				}// if ( controlID == textEntryPlayerNameID )
+				}
 				break;
-			}//case GEM_UPDATE_TEXT:
+			}
     //---------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
 			{
@@ -490,14 +485,14 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 					}
 				}
 				break;
-			} // case GCM_SELECTED
+			}
 
     //---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-     
+
       if( controlID == buttonCancelID )
 			{
 				parentPopup = NULL;
@@ -509,7 +504,7 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 				UnicodeString name;
 				name = GadgetTextEntryGetText(textEntryGameName);
 				name.trim();
-				if(name.getLength() <= 0)
+				if(name.isEmpty())
 				{
 					name.translate(TheGameSpyInfo->getLocalName());
 					GadgetTextEntrySetText(textEntryGameName, name);
@@ -523,7 +518,7 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
@@ -547,10 +542,17 @@ void createGame( void )
 	req.password = passwd.str();
 	CustomMatchPreferences customPref;
 	Bool aO = GadgetCheckBoxIsChecked(checkBoxAllowObservers);
+  Bool limitArmies = FALSE;
+  Bool useStats = TRUE;
 	customPref.setAllowsObserver(aO);
+  customPref.setFactionsLimited( limitArmies );
+  customPref.setUseStats( useStats );
 	customPref.write();
 	req.stagingRoomCreation.allowObservers = aO;
+  req.stagingRoomCreation.useStats = useStats;
 	TheGameSpyGame->setAllowObservers(aO);
+  TheGameSpyGame->setOldFactionsOnly( limitArmies );
+  TheGameSpyGame->setUseStats( useStats );
 	req.stagingRoomCreation.exeCRC = TheGlobalData->m_exeCRC;
 	req.stagingRoomCreation.iniCRC = TheGlobalData->m_iniCRC;
 	req.stagingRoomCreation.gameVersion = TheGameSpyInfo->getInternalIP();
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
index 223c513bfa1..c34c1966909 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PopupJoinGame.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,7 +37,7 @@
 //	Filename: 	PopupJoinGame.cpp
 //
 //	author:		Matthew D. Campbell
-//	
+//
 //	purpose:	Contains the Callbacks for the Join Game Popup
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/NameKeyGenerator.h"
@@ -86,14 +86,14 @@ static void joinGame( AsciiString password );
 //-------------------------------------------------------------------------------------------------
 void PopupJoinGameInit( WindowLayout *layout, void *userData )
 {
-	parentPopupID = TheNameKeyGenerator->nameToKey(AsciiString("PopupJoinGame.wnd:ParentJoinPopUp"));
+	parentPopupID = TheNameKeyGenerator->nameToKey("PopupJoinGame.wnd:ParentJoinPopUp");
 	parentPopup = TheWindowManager->winGetWindowFromId(NULL, parentPopupID);
 
-	textEntryGamePasswordID = TheNameKeyGenerator->nameToKey(AsciiString("PopupJoinGame.wnd:TextEntryGamePassword"));
+	textEntryGamePasswordID = TheNameKeyGenerator->nameToKey("PopupJoinGame.wnd:TextEntryGamePassword");
 	textEntryGamePassword = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGamePasswordID);
 	GadgetTextEntrySetText(textEntryGamePassword, UnicodeString::TheEmptyString);
 
-	NameKeyType staticTextGameNameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupJoinGame.wnd:StaticTextGameName"));
+	NameKeyType staticTextGameNameID = TheNameKeyGenerator->nameToKey("PopupJoinGame.wnd:StaticTextGameName");
 	GameWindow *staticTextGameName = TheWindowManager->winGetWindowFromId(parentPopup, staticTextGameNameID);
 	GadgetStaticTextSetText(staticTextGameName, UnicodeString::TheEmptyString);
 
@@ -113,7 +113,7 @@ void PopupJoinGameInit( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupJoinGameInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -130,7 +130,7 @@ WindowMsgHandledType PopupJoinGameInput( GameWindow *window, UnsignedInt msg, Wi
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -140,18 +140,18 @@ WindowMsgHandledType PopupJoinGameInput( GameWindow *window, UnsignedInt msg, Wi
 						GameSpyCloseOverlay(GSOVERLAY_GAMEPASSWORD);
 						SetLobbyAttemptHostJoin( FALSE );
 						parentPopup = NULL;
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
@@ -162,7 +162,7 @@ WindowMsgHandledType PopupJoinGameInput( GameWindow *window, UnsignedInt msg, Wi
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupJoinGameSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -171,14 +171,14 @@ WindowMsgHandledType PopupJoinGameSystem( GameWindow *window, UnsignedInt msg, W
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 
 			break;
 
-		}  // end case
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -204,13 +204,13 @@ WindowMsgHandledType PopupJoinGameSystem( GameWindow *window, UnsignedInt msg, W
 
 			break;
 
-		}  // end input
+		}
     //---------------------------------------------------------------------------------------------
 		case GEM_EDIT_DONE:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-     
+
       if( controlID == textEntryGamePasswordID )
 			{
 				// read the user's input and clear the entry box
@@ -230,7 +230,7 @@ WindowMsgHandledType PopupJoinGameSystem( GameWindow *window, UnsignedInt msg, W
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
@@ -257,7 +257,7 @@ static void joinGame( AsciiString password )
 	req.stagingRoom.id = ourRoom->getID();
 	req.password = password.str();
 	TheGameSpyPeerMessageQueue->addRequest(req);
-	DEBUG_LOG(("Attempting to join game %d(%ls) with password [%s]\n", ourRoom->getID(), ourRoom->getGameName().str(), password.str()));
+	DEBUG_LOG(("Attempting to join game %d(%ls) with password [%s]", ourRoom->getID(), ourRoom->getGameName().str(), password.str()));
 	GameSpyCloseOverlay(GSOVERLAY_GAMEPASSWORD);
 	parentPopup = NULL;
 }
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
index d0d5727d3a0..30a86122e1e 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PopupLadderSelect.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	August 2002
@@ -37,7 +37,7 @@
 //	Filename: 	PopupLadderSelect.cpp
 //
 //	author:		Matthew D. Campbell
-//	
+//
 //	purpose:	Contains the Callbacks for the Ladder Select Popup
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/encrypt.h"
@@ -68,11 +68,6 @@
 //#include "GameNetwork/GameSpy/PeerThread.h"
 #include "GameNetwork/GameSpyOverlay.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -269,7 +264,7 @@ void PopupLadderSelectInit( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupLadderSelectInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -286,7 +281,7 @@ WindowMsgHandledType PopupLadderSelectInput( GameWindow *window, UnsignedInt msg
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -306,18 +301,18 @@ WindowMsgHandledType PopupLadderSelectInput( GameWindow *window, UnsignedInt msg
 							break;
 						}
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
@@ -340,13 +335,13 @@ void ladderSelectedCallback(void)
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-  switch( msg ) 
+  switch( msg )
 	{
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
 			break;
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
@@ -355,7 +350,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 			listboxLadderDetails = NULL;
 			CustomMatchHideHostPopup(FALSE);
 			break;
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -364,7 +359,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 			if( mData1 == TRUE )
 				*(Bool *)mData2 = TRUE;
 			break;
-		}  // end input
+		}
     //----------------------------------------------------------------------------------------------
     case GBM_SELECTED:
 		{
@@ -413,7 +408,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 				if ( pass.isNotEmpty() ) // password ok
 				{
 					AsciiString cryptPass = EncryptString(pass.str());
-					DEBUG_LOG(("pass is %s, crypted pass is %s, comparing to %s\n",
+					DEBUG_LOG(("pass is %s, crypted pass is %s, comparing to %s",
 						pass.str(), cryptPass.str(), li->cryptedPassword.str()));
 					if (cryptPass == li->cryptedPassword)
 						ladderSelectedCallback();
@@ -434,7 +429,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 				setPasswordMode(PASS_NONE);
 			}
 			break;
-		}  // end input
+		}
 
     //---------------------------------------------------------------------------------------------
 		case GLM_SELECTED:
@@ -450,7 +445,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 
 			updateLadderDetails(selID, staticTextLadderName, listboxLadderDetails);
 			break;
-		}  // end GLM_DOUBLE_CLICKED
+		}
 
     //---------------------------------------------------------------------------------------------
 		case GLM_DOUBLE_CLICKED:
@@ -462,7 +457,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 
       if( controlID == listboxLadderSelectID )
 			{
-				TheWindowManager->winSendSystemMsg( parent, GBM_SELECTED, 
+				TheWindowManager->winSendSystemMsg( parent, GBM_SELECTED,
 																					(WindowMsgData)buttonOk, buttonOk->winGetWindowId() );
 			}
 			break;
@@ -475,7 +470,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 			Int controlID = control->winGetWindowId();
 			if (controlID == textEntryPasswordID)
 			{
-				TheWindowManager->winSendSystemMsg( parent, GBM_SELECTED, 
+				TheWindowManager->winSendSystemMsg( parent, GBM_SELECTED,
 																					(WindowMsgData)(TheWindowManager->winGetWindowFromId(passwordParent, buttonPasswordOkID)), buttonPasswordOkID );
 			}
 			break;
@@ -484,7 +479,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
@@ -595,7 +590,7 @@ static void closeRightClickMenu(GameWindow *win)
 		WindowLayout *winLay = win->winGetLayout();
 		if(!winLay)
 			return;
-		winLay->destroyWindows();					
+		winLay->destroyWindows();
 		deleteInstance(winLay);
 		winLay = NULL;
 
@@ -612,13 +607,13 @@ WindowMsgHandledType RCGameDetailsMenuSystem( GameWindow *window, UnsignedInt ms
 	static NameKeyType buttonOkID = NAMEKEY_INVALID;
 	switch( msg )
 	{
-		
+
 		case GWM_CREATE:
 			{
 				ladderInfoID = NAMEKEY("RCGameDetailsMenu.wnd:ButtonLadderDetails");
 				buttonOkID = NAMEKEY("PopupLadderDetails.wnd:ButtonOk");
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GGM_CLOSE:
 			{
@@ -630,7 +625,7 @@ WindowMsgHandledType RCGameDetailsMenuSystem( GameWindow *window, UnsignedInt ms
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -653,7 +648,7 @@ WindowMsgHandledType RCGameDetailsMenuSystem( GameWindow *window, UnsignedInt ms
 						const LadderInfo *linfo = TheLadderList->findLadder(theRoom->getLadderIP(), theRoom->getLadderPort());
 						if (linfo)
 						{
-							WindowLayout *rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/PopupLadderDetails.wnd"));	
+							WindowLayout *rcLayout = TheWindowManager->winCreateLayout("Menus/PopupLadderDetails.wnd");
 							if (!rcLayout)
 								break;
 
@@ -661,7 +656,7 @@ WindowMsgHandledType RCGameDetailsMenuSystem( GameWindow *window, UnsignedInt ms
 							rcMenu->winGetLayout()->runInit();
 							rcMenu->winBringToTop();
 							rcMenu->winHide(FALSE);
-							
+
 							rcMenu->winSetUserData((void *)selectedID);
 							TheWindowManager->winSetLoneWindow(rcMenu);
 
@@ -677,7 +672,7 @@ WindowMsgHandledType RCGameDetailsMenuSystem( GameWindow *window, UnsignedInt ms
 			}
 		default:
 			return MSG_IGNORED;
-	
-	}//Switch		
+
+	}
 	return MSG_HANDLED;
 }
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp
index 6465db36a89..2b08e31bf43 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PlayerTemplate.h"
 #include "Common/BattleHonors.h"
@@ -60,11 +60,6 @@
 
 #include "WWDownload/Registry.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 // window ids ------------------------------------------------------------------------------
@@ -95,7 +90,7 @@ static Int lookAtPlayerID = 0;
 static std::string lookAtPlayerName;
 
 
-static const char *rankNames[] = {
+static const char *const rankNames[] = {
 	"Private",
 	"Corporal",
 	"Sergeant",
@@ -107,6 +102,8 @@ static const char *rankNames[] = {
 	"Brigadier",
 	"Commander",
 };
+static_assert(ARRAY_SIZE(rankNames) == MAX_RANKS, "Incorrect array size");
+
 
 static const Image* lookupRankImage(AsciiString side, Int rank)
 {
@@ -133,11 +130,11 @@ static const Image* lookupRankImage(AsciiString side, Int rank)
 	const Image *img = TheMappedImageCollection->findImageByName(fullImageName);
 	if (img)
 	{
-		DEBUG_LOG(("*** Loaded rank image '%s' from TheMappedImageCollection!\n", fullImageName.str()));
+		DEBUG_LOG(("*** Loaded rank image '%s' from TheMappedImageCollection!", fullImageName.str()));
 	}
 	else
 	{
-		DEBUG_LOG(("*** Could not load rank image '%s' from TheMappedImageCollection!\n", fullImageName.str()));
+		DEBUG_LOG(("*** Could not load rank image '%s' from TheMappedImageCollection!", fullImageName.str()));
 	}
 	return img;
 }
@@ -153,7 +150,7 @@ static Int getTotalDisconnectsFromFile(Int playerID)
 	UserPreferences pref;
 	AsciiString userPrefFilename;
 	userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", playerID);
-	DEBUG_LOG(("setPersistentDataCallback - reading stats from file %s\n", userPrefFilename.str()));
+	DEBUG_LOG(("setPersistentDataCallback - reading stats from file %s", userPrefFilename.str()));
 	pref.load(userPrefFilename);
 
 	// if there is a file override, use that data instead.
@@ -176,7 +173,7 @@ static Int getTotalDisconnectsFromFile(Int playerID)
 		retval += atoi(pref.find("5")->second.str());
 	}
 
-	return retval;	
+	return retval;
 }
 
 Int GetAdditionalDisconnectsFromUserFile(Int playerID)
@@ -189,7 +186,7 @@ Int GetAdditionalDisconnectsFromUserFile(Int playerID)
 
 	if (TheGameSpyInfo->getAdditionalDisconnects() > 0 && !retval)
 	{
-		DEBUG_LOG(("Clearing additional disconnects\n"));
+		DEBUG_LOG(("Clearing additional disconnects"));
 		TheGameSpyInfo->clearAdditionalDisconnects();
 	}
 
@@ -209,7 +206,7 @@ void GetAdditionalDisconnectsFromUserFile(PSPlayerStats *stats)
 
 	if (TheGameSpyInfo->getAdditionalDisconnects() > 0 && !getTotalDisconnectsFromFile(stats->id))
 	{
-		DEBUG_LOG(("Clearing additional disconnects\n"));
+		DEBUG_LOG(("Clearing additional disconnects"));
 		TheGameSpyInfo->clearAdditionalDisconnects();
 	}
 
@@ -221,7 +218,7 @@ void GetAdditionalDisconnectsFromUserFile(PSPlayerStats *stats)
 	UserPreferences pref;
 	AsciiString userPrefFilename;
 	userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", stats->id);
-	DEBUG_LOG(("setPersistentDataCallback - reading stats from file %s\n", userPrefFilename.str()));
+	DEBUG_LOG(("setPersistentDataCallback - reading stats from file %s", userPrefFilename.str()));
 	pref.load(userPrefFilename);
 
 	// if there is a file override, use that data instead.
@@ -451,7 +448,7 @@ void BattleHonorTooltip(GameWindow *window,
 		else if(BitIsSet(battleHonor, BATTLE_HONOR_CHALLENGE))
 			TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:BattleHonorChallenge"), -1, NULL, tooltipWidth );
 	}
-	
+
 }
 
 static Int rowsToSkip = 0;
@@ -461,8 +458,8 @@ void ResetBattleHonorInsertion(void)
 }
 void InsertBattleHonor(GameWindow *list, const Image *image, Bool enabled, Int itemData, Int& row, Int& column, UnicodeString text = UnicodeString::TheEmptyString)
 {
-	Int width = MAX_BATTLE_HONOR_IMAGE_WIDTH * (TheDisplay->getWidth() / 800.0f);
-	Int height = MAX_BATTLE_HONOR_IMAGE_HEIGHT * (TheDisplay->getHeight() / 600.0f);
+	Int width = MAX_BATTLE_HONOR_IMAGE_WIDTH * (TheDisplay->getWidth() / (Real)DEFAULT_DISPLAY_WIDTH);
+	Int height = MAX_BATTLE_HONOR_IMAGE_HEIGHT * (TheDisplay->getHeight() / (Real)DEFAULT_DISPLAY_HEIGHT);
 
 	static Int enabledColor = 0xFFFFFFFF;
 	static Int disabledColor = GameMakeColor(80, 80, 80, 255);
@@ -471,7 +468,7 @@ void InsertBattleHonor(GameWindow *list, const Image *image, Bool enabled, Int i
 		color = enabledColor;
 	else
 		color = disabledColor;
-	
+
 	if (!enabled)
 		itemData |= BATTLE_HONOR_NOT_GAINED;
 
@@ -681,7 +678,7 @@ Int GetFavoriteSide( const PSPlayerStats& stats )
 
 Int CalculateRank( const PSPlayerStats& stats )
 {
-	if(stats.id == 0 || !TheRankPointValues)	
+	if(stats.id == 0 || !TheRankPointValues)
 		return 0;
 	PerGeneralMap::const_iterator it;
 	Int rankPoints = 0;
@@ -692,7 +689,7 @@ Int CalculateRank( const PSPlayerStats& stats )
 		numGames += it->second;
 	}
 	rankPoints += (numGames * TheRankPointValues->m_winMultiplier);
-	
+
 	numGames = 0;
 	for(it =stats.losses.begin(); it != stats.losses.end(); ++it)
 	{
@@ -735,7 +732,7 @@ static GameWindow* findWindow(GameWindow *parent, AsciiString baseWindow, AsciiS
 	AsciiString fullPath;
 	fullPath.format("%s:%s", baseWindow.str(), gadgetName.str());
 	GameWindow *res = TheWindowManager->winGetWindowFromId(parent, NAMEKEY(fullPath));
-	DEBUG_ASSERTLOG(res, ("Cannot find window %s\n", fullPath.str()));
+	DEBUG_ASSERTLOG(res, ("Cannot find window %s", fullPath.str()));
 	return res;
 }
 
@@ -760,7 +757,7 @@ void PopulatePlayerInfoWindows( AsciiString parentWindowName )
 
 		weHaveStats = TRUE;
 	}
-	
+
 	Int currentRank = 0;
 	Int rankPoints = CalculateRank(stats);
 	Int i = 0;
@@ -793,7 +790,7 @@ void PopulatePlayerInfoWindows( AsciiString parentWindowName )
 	numDiscons += GetAdditionalDisconnectsFromUserFile(lookupID);
 
 	numGames = numWins + numLosses + numDiscons;
-	
+
 	GameWindow *win = NULL;
 	UnicodeString uStr;
 	win = findWindow(NULL, parentWindowName, "StaticTextPlayerStatisticsLabel");
@@ -871,17 +868,17 @@ void PopulatePlayerInfoWindows( AsciiString parentWindowName )
 			}
 		}
 		if(numGames == 0)
-			GadgetStaticTextSetText(win, TheGameText->fetch("GUI:None"));	
+			GadgetStaticTextSetText(win, TheGameText->fetch("GUI:None"));
 		else if( stats.gamesAsRandom >= numGames )
-			GadgetStaticTextSetText(win, TheGameText->fetch("GUI:Random"));	
+			GadgetStaticTextSetText(win, TheGameText->fetch("GUI:Random"));
 		else
-		{		
+		{
 			const PlayerTemplate *fac = ThePlayerTemplateStore->getNthPlayerTemplate(favorite);
 			if (fac)
 			{
 				AsciiString side;
 				side.format("SIDE:%s", fac->getSide().str());
-				
+
 				GadgetStaticTextSetText(win, TheGameText->fetch(side));
 
 				favoriteSide = fac->getSide();
@@ -1005,7 +1002,7 @@ void PopulatePlayerInfoWindows( AsciiString parentWindowName )
 			GadgetStaticTextSetText(win, TheGameText->fetch("GUI:FetchingPlayerInfo"));
 		}
 	}
-	
+
 	win = findWindow(NULL, parentWindowName, "ListboxInfo");
 	if(win)
 	{
@@ -1048,7 +1045,7 @@ void HandlePersistentStorageResponses( void )
 				break;
 			case PSResponse::PSRESPONSE_PLAYERSTATS:
 				{
-					DEBUG_LOG(("LocalProfileID %d, resp.player.id %d, resp.player.locale %d\n", TheGameSpyInfo->getLocalProfileID(), resp.player.id, resp.player.locale));
+					DEBUG_LOG(("LocalProfileID %d, resp.player.id %d, resp.player.locale %d", TheGameSpyInfo->getLocalProfileID(), resp.player.id, resp.player.locale));
 					/*
 					if(resp.player.id == TheGameSpyInfo->getLocalProfileID() && resp.player.locale < LOC_MIN)
 					{
@@ -1097,7 +1094,7 @@ void HandlePersistentStorageResponses( void )
 						Bool isPreorder = TheGameSpyInfo->didPlayerPreorder( TheGameSpyInfo->getLocalProfileID() );
 						req.statsToPush.preorder = isPreorder;
 
-						DEBUG_LOG(("PEERREQUEST_PUSHSTATS: stats will be %d,%d,%d,%d,%d,%d\n",
+						DEBUG_LOG(("PEERREQUEST_PUSHSTATS: stats will be %d,%d,%d,%d,%d,%d",
 							req.statsToPush.locale, req.statsToPush.wins, req.statsToPush.losses, req.statsToPush.rankPoints, req.statsToPush.side, req.statsToPush.preorder));
 						TheGameSpyPeerMessageQueue->addRequest(req);
 					}
@@ -1106,10 +1103,10 @@ void HandlePersistentStorageResponses( void )
 					{
 						UpdateLocalPlayerStats();
 					}
-					DEBUG_LOG(("PopulatePlayerInfoWindows() - lookAtPlayerID is %d, got %d\n", lookAtPlayerID, resp.player.id));
+					DEBUG_LOG(("PopulatePlayerInfoWindows() - lookAtPlayerID is %d, got %d", lookAtPlayerID, resp.player.id));
 					PopulatePlayerInfoWindows("PopupPlayerInfo.wnd");
-					//GadgetListBoxAddEntryText(listboxInfo, UnicodeString(L"Got info!"), GameSpyColor[GSCOLOR_DEFAULT], -1);
-					
+					//GadgetListBoxAddEntryText(listboxInfo, L"Got info!", GameSpyColor[GSCOLOR_DEFAULT], -1);
+
 					// also update info for player list in lobby
 					PlayerInfoMap::iterator it = TheGameSpyInfo->getPlayerInfoMap()->begin();
 					while (it != TheGameSpyInfo->getPlayerInfoMap()->end())
@@ -1205,7 +1202,7 @@ void GameSpyPlayerInfoOverlayInit( WindowLayout *layout, void *userData )
 
 	isOverlayActive = true;
 
-	//GadgetListBoxAddEntryText(listboxInfo, UnicodeString(L"Working"), GameSpyColor[GSCOLOR_DEFAULT], -1);
+	//GadgetListBoxAddEntryText(listboxInfo, L"Working", GameSpyColor[GSCOLOR_DEFAULT], -1);
 
 	GameSpyCloseOverlay(GSOVERLAY_BUDDY);
 	raiseMessageBox = true;
@@ -1248,7 +1245,7 @@ void GameSpyPlayerInfoOverlayInit( WindowLayout *layout, void *userData )
 	}
 
 	//TheWindowManager->winSetModal(parent);
-} // GameSpyPlayerInfoOverlayInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Overlay shutdown method */
@@ -1262,7 +1259,7 @@ void GameSpyPlayerInfoOverlayShutdown( WindowLayout *layout, void *userData )
 
 	// our shutdown is complete
 	isOverlayActive = false;
-}  // GameSpyPlayerInfoOverlayShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -1273,7 +1270,7 @@ void GameSpyPlayerInfoOverlayUpdate( WindowLayout * layout, void *userData)
 	if (raiseMessageBox)
 		RaiseGSMessageBox();
 	raiseMessageBox = false;
-}// GameSpyPlayerInfoOverlayUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Overlay input callback */
@@ -1281,7 +1278,7 @@ void GameSpyPlayerInfoOverlayUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType GameSpyPlayerInfoOverlayInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1296,63 +1293,63 @@ WindowMsgHandledType GameSpyPlayerInfoOverlayInput( GameWindow *window, Unsigned
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonClose, buttonCloseID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// GameSpyPlayerInfoOverlayInput
+}
 void messageBoxYes( void );
 //-------------------------------------------------------------------------------------------------
 /** Overlay window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType GameSpyPlayerInfoOverlaySystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType GameSpyPlayerInfoOverlaySystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 		case GBM_SELECTED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
@@ -1413,7 +1410,7 @@ WindowMsgHandledType GameSpyPlayerInfoOverlaySystem( GameWindow *window, Unsigne
 					Bool isChecked = !GadgetCheckBoxIsChecked(control);
 					CustomMatchPreferences pref;
 					pref.setDisallowNonAsianText(isChecked);
-					pref.write();				
+					pref.write();
 					if(TheGameSpyInfo)
 						TheGameSpyInfo->setDisallowNonAsianText(isChecked);
 					if(isChecked && !GadgetCheckBoxIsChecked(checkBoxAsianFont))
@@ -1428,15 +1425,15 @@ WindowMsgHandledType GameSpyPlayerInfoOverlaySystem( GameWindow *window, Unsigne
 				}
 
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// GameSpyPlayerInfoOverlaySystem
+}
 
 static void messageBoxYes( void )
 {
@@ -1444,5 +1441,5 @@ static void messageBoxYes( void )
 	breq.buddyRequestType = BuddyRequest::BUDDYREQUEST_DELETEACCT;
 	TheGameSpyBuddyMessageQueue->addRequest( breq );
 	TheGameSpyInfo->setLocalProfileID(0);
-	
+
 }
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
index 5e4e17a3f46..8db407bc238 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PopupReplay.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   Generals
@@ -45,7 +45,7 @@
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/LocalFileSystem.h"
 #include "Common/MessageStream.h"
@@ -59,11 +59,6 @@
 #include "GameClient/Shell.h"
 #include "GameLogic/GameLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 static NameKeyType buttonBackKey					= NAMEKEY_INVALID;
@@ -107,7 +102,7 @@ static void closeSaveMenu( GameWindow *window )
 	if( layout )
 		layout->hide( TRUE );
 
-}  // end closeSaveMenu
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the SaveLoad menu */
@@ -140,7 +135,7 @@ void PopupReplayInit( WindowLayout *layout, void *userData )
 
 	// get the listbox that will have the save games in it
 	GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( NULL, listboxGamesKey );
-	DEBUG_ASSERTCRASH( listboxGames != NULL, ("PopupReplayInit - Unable to find games listbox\n") );
+	DEBUG_ASSERTCRASH( listboxGames != NULL, ("PopupReplayInit - Unable to find games listbox") );
 
 	// populate the listbox with the save games on disk
 	PopulateReplayFileListbox(listboxGames);
@@ -156,7 +151,7 @@ void PopupReplayInit( WindowLayout *layout, void *userData )
 		control->winEnable( FALSE );
 	}
 
-}  // end SaveLoadMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** SaveLoad menu shutdown method */
@@ -165,7 +160,7 @@ void PopupReplayShutdown( WindowLayout *layout, void *userData )
 {
 	parent = NULL;
 
-}  // end SaveLoadMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** SaveLoad menu update method */
@@ -173,11 +168,11 @@ void PopupReplayShutdown( WindowLayout *layout, void *userData )
 void PopupReplayUpdate( WindowLayout *layout, void *userData )
 {
 
-	if (s_fileSavePopupStartTime != 0) 
+	if (s_fileSavePopupStartTime != 0)
 	{
 		// the replay save confirmation popup is up
 		// check to see if its time to take it down.
-		if ((timeGetTime() - s_fileSavePopupStartTime) >= s_fileSavePopupDuration) 
+		if ((timeGetTime() - s_fileSavePopupStartTime) >= s_fileSavePopupDuration)
 		{
 			ShowReplaySavedPopup(FALSE);
 
@@ -189,13 +184,13 @@ void PopupReplayUpdate( WindowLayout *layout, void *userData )
 			s_fileSavePopupStartTime = 0;
 		}
 	}
-}  // end SaveLoadMenuUpdate 
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupReplayInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -210,7 +205,7 @@ WindowMsgHandledType PopupReplayInput( GameWindow *window, UnsignedInt msg, Wind
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -218,21 +213,21 @@ WindowMsgHandledType PopupReplayInput( GameWindow *window, UnsignedInt msg, Wind
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 						GameWindow *button = TheWindowManager->winGetWindowFromId( parent, buttonBackKey );
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonBackKey );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 }
@@ -264,7 +259,7 @@ static void saveReplay( UnicodeString filename )
 	messageBoxWin = NULL;
 	if (TheLocalFileSystem->doesFileExist(fullPath.str()))
 	{
-		messageBoxWin = MessageBoxOkCancel(TheGameText->fetch("GUI:OverwriteReplayTitle"), TheGameText->fetch("GUI:OverwriteReplay"), reallySaveReplay, NULL);		
+		messageBoxWin = MessageBoxOkCancel(TheGameText->fetch("GUI:OverwriteReplayTitle"), TheGameText->fetch("GUI:OverwriteReplay"), reallySaveReplay, NULL);
 	}
 	else
 	{
@@ -301,7 +296,7 @@ void reallySaveReplay(void)
 
 			// get the listbox that will have the save games in it
 			GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( parent, listboxGamesKey );
-			DEBUG_ASSERTCRASH( listboxGames != NULL, ("reallySaveReplay - Unable to find games listbox\n") );
+			DEBUG_ASSERTCRASH( listboxGames != NULL, ("reallySaveReplay - Unable to find games listbox") );
 
 			// populate the listbox with the save games on disk
 			PopulateReplayFileListbox(listboxGames);
@@ -328,7 +323,7 @@ void reallySaveReplay(void)
 
 	// get the listbox that will have the save games in it
 	GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( parent, listboxGamesKey );
-	DEBUG_ASSERTCRASH( listboxGames != NULL, ("reallySaveReplay - Unable to find games listbox\n") );
+	DEBUG_ASSERTCRASH( listboxGames != NULL, ("reallySaveReplay - Unable to find games listbox") );
 
 	// populate the listbox with the save games on disk
 	PopulateReplayFileListbox(listboxGames);
@@ -340,11 +335,11 @@ void reallySaveReplay(void)
 //-------------------------------------------------------------------------------------------------
 /** SaveLoad menu system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -353,14 +348,14 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 
 			break;
 
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -372,7 +367,7 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end input
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GLM_SELECTED:
@@ -380,7 +375,7 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 			GameWindow *control = (GameWindow *)mData1;
 
 			GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( window, listboxGamesKey );
-			DEBUG_ASSERTCRASH( listboxGames != NULL, ("PopupReplaySystem - Unable to find games listbox\n") );
+			DEBUG_ASSERTCRASH( listboxGames != NULL, ("PopupReplaySystem - Unable to find games listbox") );
 
 			//
 			// handle games listbox, when certain items are selected in the listbox only some
@@ -394,14 +389,14 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 					UnicodeString filename;
 					filename = GadgetListBoxGetText(listboxGames, rowSelected);
 					GameWindow *textEntryReplayName = TheWindowManager->winGetWindowFromId( window, textEntryReplayNameKey );
-					DEBUG_ASSERTCRASH( textEntryReplayName != NULL, ("PopupReplaySystem - Unable to find text entry\n") );
+					DEBUG_ASSERTCRASH( textEntryReplayName != NULL, ("PopupReplaySystem - Unable to find text entry") );
 					GadgetTextEntrySetText(textEntryReplayName, filename);
 				}
 			}
 
 			break;
 
-		}  // end selected
+		}
 
     //---------------------------------------------------------------------------------------------
 		case GEM_EDIT_DONE:
@@ -418,10 +413,10 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 				saveReplay(filename);
 
       }
-	
+
 			break;
 
-		}  // end selected
+		}
     //---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
@@ -432,7 +427,7 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
       {
 				// get the filename, and see if we are overwriting
 				GameWindow *textEntryReplayName = TheWindowManager->winGetWindowFromId( window, textEntryReplayNameKey );
-				DEBUG_ASSERTCRASH( textEntryReplayName != NULL, ("PopupReplaySystem - Unable to find text entry\n") );
+				DEBUG_ASSERTCRASH( textEntryReplayName != NULL, ("PopupReplaySystem - Unable to find text entry") );
 
 				UnicodeString filename = GadgetTextEntryGetText( textEntryReplayName );
 				if (filename.isEmpty())
@@ -448,11 +443,11 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 				closeSaveMenu( window );
 				ScoreScreenEnableControls(TRUE);
 
-			}  // end if
-	
+			}
+
 			break;
 
-		}  // end selected
+		}
 
 		case GEM_UPDATE_TEXT:
 		{
@@ -476,12 +471,14 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 					}
 				}
 			}
+
+			break;
 		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp
index 1f93cecb7a0..6d7c3e661e6 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PopupSaveLoad.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -45,7 +45,7 @@
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
@@ -102,7 +102,7 @@ static void updateMenuActions( void )
 
 	// for loading only, disable the save button, otherwise enable it
 	GameWindow *saveButton = TheWindowManager->winGetWindowFromId( NULL, buttonSaveKey );
-	DEBUG_ASSERTCRASH( saveButton, ("SaveLoadMenuInit: Unable to find save button\n") );
+	DEBUG_ASSERTCRASH( saveButton, ("SaveLoadMenuInit: Unable to find save button") );
 	if( currentLayoutType == SLLT_LOAD_ONLY )
 		saveButton->winEnable( FALSE );
 	else
@@ -120,8 +120,8 @@ static void updateMenuActions( void )
 	buttonLoad->winEnable( selectedGameInfo != NULL );
 	GameWindow *buttonDelete = TheWindowManager->winGetWindowFromId( NULL, buttonDeleteKey );
 	buttonDelete->winEnable( selectedGameInfo != NULL );
-	
-}  // end updateMenuActions
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the SaveLoad menu */
@@ -172,7 +172,7 @@ void SaveLoadMenuInit( WindowLayout *layout, void *userData )
 	editDesc = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:EntryDesc" ) );
 	// get the listbox that will have the save games in it
 	listboxGames = TheWindowManager->winGetWindowFromId( NULL, listboxGamesKey );
-	DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox\n") );
+	DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox") );
 
 	// populate the listbox with the save games on disk
 	TheGameState->populateSaveGameListbox( listboxGames, currentLayoutType );
@@ -180,7 +180,7 @@ void SaveLoadMenuInit( WindowLayout *layout, void *userData )
 	// update the availability of the menu buttons
 	updateMenuActions();
 
-}  // end SaveLoadMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the SaveLoad menu */
@@ -193,7 +193,7 @@ void SaveLoadMenuFullScreenInit( WindowLayout *layout, void *userData )
 	isPopup = FALSE;
 	// set default behavior for this menu
 	currentLayoutType = SLLT_LOAD_ONLY;
-	
+
 	// get layout type if present
 	if( userData )
 		currentLayoutType = *((SaveLoadLayoutType *)userData);
@@ -235,7 +235,7 @@ void SaveLoadMenuFullScreenInit( WindowLayout *layout, void *userData )
 	deleteConfirm = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "SaveLoad.wnd:DeleteConfirmParent" ) );
 	// get the listbox that will have the save games in it
 	listboxGames = TheWindowManager->winGetWindowFromId( NULL, listboxGamesKey );
-	DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox\n") );
+	DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox") );
 
 	// populate the listbox with the save games on disk
 	TheGameState->populateSaveGameListbox( listboxGames, currentLayoutType );
@@ -249,14 +249,14 @@ void SaveLoadMenuFullScreenInit( WindowLayout *layout, void *userData )
 	if(parent)
 		parent->winHide(TRUE);
 	isShuttingDown = false;
-}  // end SaveLoadMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** SaveLoad menu shutdown method */
 //-------------------------------------------------------------------------------------------------
 void SaveLoadMenuShutdown( WindowLayout *layout, void *userData )
 {
-	
+
 	Bool popImmediate = *(Bool *)userData;
 	if( popImmediate )
 	{
@@ -265,12 +265,12 @@ void SaveLoadMenuShutdown( WindowLayout *layout, void *userData )
 		TheShell->shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	// our shutdown is complete
 	TheTransitionHandler->reverse("SaveLoadMenuFade");
 	isShuttingDown = TRUE;
-}  // end SaveLoadMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** SaveLoad menu update method */
@@ -301,13 +301,13 @@ void SaveLoadMenuUpdate( WindowLayout *layout, void *userData )
 	if(isShuttingDown && TheShell->isAnimFinished()&& TheTransitionHandler->isFinished())
 		TheShell->shutdownComplete( layout );
 
-}  // end SaveLoadMenuUpdate 
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 WindowMsgHandledType SaveLoadMenuInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -322,7 +322,7 @@ WindowMsgHandledType SaveLoadMenuInput( GameWindow *window, UnsignedInt msg, Win
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -330,21 +330,21 @@ WindowMsgHandledType SaveLoadMenuInput( GameWindow *window, UnsignedInt msg, Win
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 						GameWindow *button = TheWindowManager->winGetWindowFromId( parent, buttonBackKey );
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonBackKey );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 }
@@ -357,7 +357,7 @@ static AvailableGameInfo *getSelectedSaveFileInfo( GameWindow *window )
 
 	// get the listbox
 	//GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( window, listboxGamesKey );
-	DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox\n") );
+	DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox") );
 
 	// which item is selected
 	Int selected;
@@ -369,7 +369,7 @@ static AvailableGameInfo *getSelectedSaveFileInfo( GameWindow *window )
 
 	return selectedGameInfo;
 
-}  // end getSelectedSaveFileInfo
+}
 
 // ---------------------------------------------------con------------------------------------------
 // ------------------------------------------------------------------------------------------------				// close the save/load menu
@@ -378,16 +378,16 @@ static void doLoadGame( void )
 
 	// get listbox of games
 	//GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:ListboxGames" ) );
-	DEBUG_ASSERTCRASH( listboxGames, ("doLoadGame: Unable to find game listbox\n") );
+	DEBUG_ASSERTCRASH( listboxGames, ("doLoadGame: Unable to find game listbox") );
 
 	// get selected game info
 	AvailableGameInfo *selectedGameInfo = getSelectedSaveFileInfo( listboxGames );
-	DEBUG_ASSERTCRASH( selectedGameInfo, ("doLoadGame: No selected game info found\n") );
+	DEBUG_ASSERTCRASH( selectedGameInfo, ("doLoadGame: No selected game info found") );
 
 	// when loading a game we also close the quit/esc menu for the user when in-game
 	if( TheShell->isShellActive() == FALSE )
 	{
-		destroyQuitMenu();		
+		destroyQuitMenu();
 //		ToggleQuitMenu();
 //		TheTransitionHandler->remove("QuitNoSave");
 //		TheTransitionHandler->remove("QuitFull");
@@ -412,24 +412,24 @@ static void doLoadGame( void )
 		TheShell->showShell(TRUE);
 	}
 
-}  // end doLoadGame
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Close the save/load menu */
 // ------------------------------------------------------------------------------------------------
 static void closeSaveMenu( GameWindow *window )
 {
-	
+
 	if(isPopup)
 	{
 		WindowLayout *saveLoadMenuLayout = window->winGetLayout();
 		if( saveLoadMenuLayout )
-			saveLoadMenuLayout->hide( TRUE );	
+			saveLoadMenuLayout->hide( TRUE );
 	}
 	else
 		TheShell->hideShell();
 
-}  // end closeSaveMenu
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -439,12 +439,12 @@ static void setEditDescription( GameWindow *editControl )
 	Campaign *campaign = TheCampaignManager->getCurrentCampaign();
 
 	//
-	// if we have a campaign we will use a default description that describes the 
+	// if we have a campaign we will use a default description that describes the
 	// location and map in the campaign nicely, otherwise we will default to just
 	// the map name (which is really only used in debug)
 	//
 	if( campaign )
-		defaultDesc.format( L"%s %d", 
+		defaultDesc.format( L"%s %d",
 												TheGameText->fetch( campaign->m_campaignNameLabel ).str(),
 												TheCampaignManager->getCurrentMissionNumber() + 1 );
 	else
@@ -456,15 +456,15 @@ static void setEditDescription( GameWindow *editControl )
 		else
 			defaultDesc.format( L"%S", TheGlobalData->m_mapName.str() );
 
-	}  // end else
+	}
 
 	// set into edit control
 	GadgetTextEntrySetText( editControl, defaultDesc );
 
-}  // end setEditDescription
+}
 
 //----------------------------------------------------------------------------------------------
-static void processLoadButtonPress(GameWindow *window) 
+static void processLoadButtonPress(GameWindow *window)
 {
 	// get the filename of the selected savegame in the listbox
 	AvailableGameInfo *selectedGameInfo = getSelectedSaveFileInfo( window );
@@ -482,7 +482,7 @@ static void processLoadButtonPress(GameWindow *window)
 			closeSaveMenu( window );
 			doLoadGame();
 
-		}  // end if
+		}
 		else
 		{
 
@@ -497,19 +497,19 @@ static void processLoadButtonPress(GameWindow *window)
 			// show the load confirm dialog
 			loadConfirm->winHide( FALSE );
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
 /** SaveLoad menu system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -518,14 +518,14 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 
 			break;
 
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -537,14 +537,14 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end input
+		}
 
     //----------------------------------------------------------------------------------------------
 		case GLM_DOUBLE_CLICKED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
 				GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( window, listboxGamesKey );
-				DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox\n") );
+				DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox") );
 
 				if (listboxGames != NULL) {
 					int rowSelected = mData2;
@@ -564,7 +564,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 			GameWindow *control = (GameWindow *)mData1;
 
 			GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( window, listboxGamesKey );
-			DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox\n") );
+			DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox") );
 
 			//
 			// handle games listbox, when certain items are selected in the listbox only some
@@ -575,27 +575,27 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end selected
+		}
 
     //---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-      
+
       if( controlID == buttonLoadKey )
       {
 				processLoadButtonPress(window);
-      }  // end if
+      }
       else if( controlID == buttonSaveKey )
       {
 
 				// sanity
 				DEBUG_ASSERTCRASH( currentLayoutType == SLLT_SAVE_AND_LOAD ||
 													 currentLayoutType == SLLT_SAVE_ONLY,
-													 ("SaveLoadMenuSystem - layout type '%d' does not allow saving\n",
+													 ("SaveLoadMenuSystem - layout type '%d' does not allow saving",
 													 currentLayoutType) );
-													 	
+
 				// get save file info
 				AvailableGameInfo *selectedGameInfo = getSelectedSaveFileInfo( window );
 
@@ -621,7 +621,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 					TheWindowManager->winSetFocus(editDesc);
 
-				}  // end if
+				}
 				else
 				{
 
@@ -637,7 +637,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					//GameWindow *overwriteConfirm  = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:OverwriteConfirmParent" ) );
 					overwriteConfirm->winHide( FALSE );
 
-				}  // end else
+				}
 
       }
 			else if( controlID == buttonDeleteKey )
@@ -665,13 +665,13 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					//GameWindow *deleteConfirm = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:DeleteConfirmParent" ) );
 					deleteConfirm->winHide( FALSE );
 
-				}  // end if
-								
-			}  // end else if
+				}
+
+			}
 			else if( controlID == buttonBackKey )
 			{
 				if(isPopup)
-				{				
+				{
 					// close the save/load menu
 					closeSaveMenu( window );
 				}
@@ -680,7 +680,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					TheShell->pop();
 				}
 
-			}  // end if
+			}
 			else if( controlID == buttonDeleteConfirm || controlID == buttonDeleteCancel )
 			{
 				//GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:ListboxGames" ) );
@@ -700,11 +700,11 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 					// delete the file
 					DeleteFile( filepath.str() );
-					
+
 					// repopulate the listbox
 					TheGameState->populateSaveGameListbox( listboxGames, currentLayoutType );
 
-				}  // end if
+				}
 
 				// hide the confirm dialog
 				//GameWindow *deleteConfirm = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:DeleteConfirmParent" ) );
@@ -718,7 +718,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 				buttonFrame->winEnable( TRUE );
 				updateMenuActions();
 
-			}  // end if
+			}
 			else if( controlID == buttonOverwriteCancel || controlID == buttonOverwriteConfirm )
 			{
 				//GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:ListboxGames" ) );
@@ -742,7 +742,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					// get the item data of the selection
 					AvailableGameInfo *selectedGameInfo;
 					selectedGameInfo = (AvailableGameInfo *)GadgetListBoxGetItemData( listboxGames, selected );
-					DEBUG_ASSERTCRASH( selectedGameInfo, ("SaveLoadMenuSystem: Internal error, listbox entry to overwrite game has no item data set into listbox element\n") );
+					DEBUG_ASSERTCRASH( selectedGameInfo, ("SaveLoadMenuSystem: Internal error, listbox entry to overwrite game has no item data set into listbox element") );
 
 					// enable the listbox of games
 					//GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:ListboxGames" ) );
@@ -752,12 +752,10 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					//GameWindow *buttonFrame  = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:MenuButtonFrame" ) );
 					buttonFrame->winEnable( TRUE );
 					updateMenuActions();
-					
-					//Added By Sadullah Nader
-					//Fix for bug
-					// close save menuu
+
+					// close save menu
 					closeSaveMenu( window );
-					
+
 					//
 					// given the context of this menu figure out which type of save game we're acutally
 					// saving right now.  As it turns out, when this menu is used in the save only
@@ -772,8 +770,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 					// save the game
 					AsciiString filename;
-					if( selectedGameInfo )
-						filename = selectedGameInfo->filename;
+					filename = selectedGameInfo->filename;
 					TheGameState->saveGame( filename, selectedGameInfo->saveGameInfo.description, fileType );
 
 /*
@@ -781,7 +778,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					GameWindow *editDesc = TheWindowManager->winGetWindowFromId( saveDesc, NAMEKEY( "PopupSaveLoad.wnd:EntryDesc" ) );
 					setEditDescription( editDesc );
 */
-				}  // end if
+				}
 				else if( controlID == buttonOverwriteCancel )
 				{
 					//GameWindow *buttonFrame  = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:MenuButtonFrame" ) );
@@ -791,9 +788,9 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					updateMenuActions();
 					listboxGames->winEnable( TRUE );
 
-				}  // end else if
+				}
 
-			}  // end else if
+			}
 			else if( controlID == buttonSaveDescConfirm )
 			{
 
@@ -816,7 +813,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 				buttonFrame->winEnable( TRUE );
 				updateMenuActions();
 
-				// close save menuu
+				// close save menu
 				closeSaveMenu( window );
 
 				// get save filename
@@ -840,7 +837,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					filename = selectedGameInfo->filename;
 				TheGameState->saveGame( filename, desc, fileType );
 
-			}  // end else if
+			}
 			else if( controlID == buttonSaveDescCancel )
 			{
 
@@ -857,7 +854,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 				buttonFrame->winEnable( TRUE );
 				updateMenuActions();
 
-			}  // end else if
+			}
 			else if( controlID == buttonLoadConfirm || controlID == buttonLoadCancel )
 			{
 
@@ -874,29 +871,23 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 				buttonFrame->winEnable( TRUE );
 				updateMenuActions();
 
-				
-				
-
 				// do the load game
 				if( controlID == buttonLoadConfirm )
 				{
-					//Moved by Sadullah Nader
-					//moved to fix the 
-					// close save/load layout menu
 					closeSaveMenu( window );
 					doLoadGame();
 				}
 
-			}  // end else if
-	
+			}
+
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
index 622073e176c..3d756364282 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
@@ -28,8 +28,9 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/FramePacer.h"
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
 #include "Common/MessageStream.h"
@@ -53,11 +54,6 @@
 #include "GameClient/DisconnectMenu.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -85,12 +81,12 @@ static NameKeyType buttonSaveLoad = NAMEKEY_INVALID;
 
 static void initGadgetsFullQuit( void )
 {
-	buttonExit = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonExit" ) );
-	buttonRestart = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonRestart" ) );
-	buttonReturn = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonReturn" ) );
-	buttonOptions = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonOptions" ) );
-	buttonSaveLoad = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonSaveLoad" ) );
-	
+	buttonExit = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonExit" );
+	buttonRestart = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonRestart" );
+	buttonReturn = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonReturn" );
+	buttonOptions = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonOptions" );
+	buttonSaveLoad = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonSaveLoad" );
+
 	buttonRestartWin	= TheWindowManager->winGetWindowFromId( NULL, buttonRestart );
 	buttonSaveLoadWin = TheWindowManager->winGetWindowFromId( NULL, buttonSaveLoad );
 	buttonOptionsWin = TheWindowManager->winGetWindowFromId( NULL, buttonOptions );
@@ -99,12 +95,12 @@ static void initGadgetsFullQuit( void )
 
 static void initGadgetsNoSaveQuit( void )
 {
-	buttonExit = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonExit" ) );
-	buttonRestart = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonRestart" ) );
-	buttonReturn = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonReturn" ) );
-	buttonOptions = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonOptions" ) );
+	buttonExit = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonExit" );
+	buttonRestart = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonRestart" );
+	buttonReturn = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonReturn" );
+	buttonOptions = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonOptions" );
 	buttonSaveLoad = NAMEKEY_INVALID;
-	
+
 	buttonRestartWin	= TheWindowManager->winGetWindowFromId( NULL, buttonRestart );
 	buttonOptionsWin = TheWindowManager->winGetWindowFromId( NULL, buttonOptions );
 	buttonSaveLoadWin = NULL;
@@ -132,6 +128,8 @@ void destroyQuitMenu()
 	}
 	quitMenuLayout = NULL;
 	isVisible = FALSE;
+
+	TheInGameUI->setQuitMenuVisible(FALSE);
 }
 
 /**
@@ -141,16 +139,14 @@ static void exitQuitMenu()
 {
   // destroy the quit menu
 	destroyQuitMenu();
-	
+
 	// clear out all the game data
 	if ( TheGameLogic->isInMultiplayerGame() && !TheGameLogic->isInSkirmishGame() && !TheGameInfo->isSandbox() )
 	{
 		GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);
 		msg->appendBooleanArgument(TRUE);
 	}
-	/*GameMessage *msg =*/ TheMessageStream->appendMessage( GameMessage::MSG_CLEAR_GAME_DATA );
-	if ( !TheGameLogic->isInMultiplayerGame() )
-		TheGameLogic->setGamePaused(FALSE);
+	TheGameLogic->exitGame();
 	// TheGameLogic->clearGameData();
 	// display the menu on top of the shell stack
   // TheShell->showShell();
@@ -217,10 +213,10 @@ static void restartMissionMenu()
 	{
 		TheRecorder->stopRecording();
 	}
-	
+
 	Int rankPointsStartedWith = TheGameLogic->getRankPointsToAddAtGameStart();// must write down before reset
 	GameDifficulty diff = TheScriptEngine->getGlobalDifficulty();
-	Int fps = TheGameEngine->getFramesPerSecondLimit();
+	Int fps = TheFramePacer->getFramesPerSecondLimit();
 
 	TheGameLogic->clearGameData(FALSE);
 	TheGameEngine->setQuitting(FALSE);
@@ -238,8 +234,8 @@ static void restartMissionMenu()
 		msg->appendIntegerArgument(diff);
 		msg->appendIntegerArgument(rankPointsStartedWith);
 		msg->appendIntegerArgument(fps);
-		DEBUG_LOG(("Restarting game mode %d, Diff=%d, RankPoints=%d\n", gameMode, 
-																																		TheScriptEngine->getGlobalDifficulty(), 
+		DEBUG_LOG(("Restarting game mode %d, Diff=%d, RankPoints=%d", gameMode,
+																																		TheScriptEngine->getGlobalDifficulty(),
 																																		rankPointsStartedWith)
 							);
 		//if (TheGlobalData->m_fixedSeed >= 0)
@@ -283,14 +279,9 @@ void HideQuitMenu( void )
 //-------------------------------------------------------------------------------------------------
 void ToggleQuitMenu()
 {
-	
-	//Added By Sadullah Nader
-	//Added a check to see if we're not in game yet
 	if (TheGameLogic->isIntroMoviePlaying() || TheGameLogic->isLoadingGame() ||TheScriptEngine->isGameEnding())
 		return;
 
-	//End Add
-
 	// BGC- If we are currently in the disconnect screen, don't let the quit menu come up.
 	if (TheDisconnectMenu != NULL) {
 		if (TheDisconnectMenu->isScreenVisible() == TRUE) {
@@ -305,35 +296,32 @@ void ToggleQuitMenu()
 		WindowLayout *optLayout = TheShell->getOptionsLayout(FALSE);
 		GameWindow *optionsParent = optLayout->getFirstWindow();
 		DEBUG_ASSERTCRASH(optionsParent != NULL, ("Not able to get the options layout parent window"));
-		GameWindow *optionsBack = TheWindowManager->winGetWindowFromId(optionsParent, TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonBack" ) ));
+		GameWindow *optionsBack = TheWindowManager->winGetWindowFromId(optionsParent, TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonBack" ));
 		DEBUG_ASSERTCRASH(optionsBack != NULL, ("Not able to get the back button window from the options menu"));
 		TheWindowManager->winSendSystemMsg(optLayout->getFirstWindow(), GBM_SELECTED, (WindowMsgData)optionsBack, NULL);
 		return;
 	}
-	if ((saveLoadMenuLayout != NULL) && (saveLoadMenuLayout->isHidden() == FALSE)) 
+	if ((saveLoadMenuLayout != NULL) && (saveLoadMenuLayout->isHidden() == FALSE))
 	{
 		GameWindow *saveLoadParent = saveLoadMenuLayout->getFirstWindow();
 		DEBUG_ASSERTCRASH(saveLoadParent != NULL, ("Not able to get the save/load layout parent window"));
-		GameWindow *saveLoadBack = TheWindowManager->winGetWindowFromId(saveLoadParent, TheNameKeyGenerator->nameToKey( AsciiString( "PopupSaveLoad.wnd:ButtonBack" ) ));
+		GameWindow *saveLoadBack = TheWindowManager->winGetWindowFromId(saveLoadParent, TheNameKeyGenerator->nameToKey( "PopupSaveLoad.wnd:ButtonBack" ));
 		DEBUG_ASSERTCRASH(saveLoadBack != NULL, ("Not able to get the back button window from the save/load menu"));
 		TheWindowManager->winSendSystemMsg(saveLoadMenuLayout->getFirstWindow(), GBM_SELECTED, (WindowMsgData)saveLoadBack, NULL);
 		saveLoadMenuLayout = NULL;
 		return;
 	}
-	
+
 	// if we're visable hide our quit menu
 	if(isVisible && quitMenuLayout)
 	{
-		
+
 		isVisible = FALSE;
-		
-		//Added By Sadullah Nader
-		//Bug: When Toggling the quit menu off, the quit confirmation should also go away
+
 		if (quitConfirmationWindow)
 			TheWindowManager->winDestroy(quitConfirmationWindow);
 		quitConfirmationWindow = NULL;
-		//
-		
+
 		if ( !TheGameLogic->isInMultiplayerGame() )
 			TheGameLogic->setGamePaused(FALSE);
 		if(quitMenuLayout && quitMenuLayout == noSaveLoadQuitMenuLayout)
@@ -356,9 +344,7 @@ void ToggleQuitMenu()
 	}
 	else
 	{
-		//Added By Sadullah Nader
-		//Added to compensate for the quit confirmation window pop-up
-		
+
 		TheMouse->setCursor( Mouse::ARROW );
 
 		TheControlBar->hidePurchaseScience();
@@ -366,7 +352,7 @@ void ToggleQuitMenu()
 		{
 			// we don't want to show the save load button.
 			if(!noSaveLoadQuitMenuLayout)
-				noSaveLoadQuitMenuLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/QuitNoSave.wnd" ) );
+				noSaveLoadQuitMenuLayout = TheWindowManager->winCreateLayout( "Menus/QuitNoSave.wnd" );
 			quitMenuLayout = noSaveLoadQuitMenuLayout;
 			initGadgetsNoSaveQuit();
 			TheTransitionHandler->remove("QuitNoSave");
@@ -375,7 +361,7 @@ void ToggleQuitMenu()
 		else
 		{
 			if(!fullQuitMenuLayout)
-				fullQuitMenuLayout= TheWindowManager->winCreateLayout( AsciiString( "Menus/QuitMenu.wnd" ) );
+				fullQuitMenuLayout= TheWindowManager->winCreateLayout( "Menus/QuitMenu.wnd" );
 			quitMenuLayout = fullQuitMenuLayout;
 			initGadgetsFullQuit();
 			TheTransitionHandler->remove("QuitFull");
@@ -390,7 +376,7 @@ void ToggleQuitMenu()
 			TheInGameUI->setQuitMenuVisible(FALSE);
 			return;
 		}
-		
+
 		//quitMenuLayout->hide(FALSE);
 
 		// if we are watching a cinematic, we need to disable the save/load button
@@ -412,9 +398,9 @@ void ToggleQuitMenu()
 			buttonRestartWin->winEnable(TRUE);
 			if (TheGameLogic->isInSkirmishGame() == FALSE) {
 				GadgetButtonSetText(buttonRestartWin, TheGameText->fetch("GUI:Surrender"));
-				
+
 			}
-	
+
 			if (TheGameLogic->isInSkirmishGame() == TRUE) {
 				TheGameLogic->setGamePaused(TRUE);
 			}
@@ -432,7 +418,7 @@ void ToggleQuitMenu()
 			{
 				GadgetButtonSetText(buttonRestartWin, TheGameText->fetch("GUI:RestartMission"));
 				GadgetButtonSetText(buttonExitWin, TheGameText->fetch("GUI:ExitMission"));
-				
+
 			}
 			//if we're not in a multiplayer game, pause the game
 			TheGameLogic->setGamePaused(TRUE);
@@ -447,18 +433,18 @@ void ToggleQuitMenu()
 		TheControlBar->hidePurchaseScience();
 		isVisible = TRUE;
 	}
-		
+
 	TheInGameUI->setQuitMenuVisible(isVisible);
-	
-}  // end ToggleQuitMenu
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Quit menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg,
 																		 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -467,7 +453,7 @@ WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -475,7 +461,7 @@ WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -492,7 +478,7 @@ WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg,
         // now and just using the grey button for the whole save/load button for now
         // during a cinema
         //
-              	
+
 //				SaveLoadLayoutType layoutType = SLLT_SAVE_AND_LOAD;
 
 				//
@@ -507,21 +493,21 @@ WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg,
 
         saveLoadMenuLayout = TheShell->getSaveLoadMenuLayout();
 //				saveLoadMenuLayout->runInit( &layoutType );
-				saveLoadMenuLayout->runInit();				
+				saveLoadMenuLayout->runInit();
 				saveLoadMenuLayout->hide( FALSE );
 				saveLoadMenuLayout->bringForward();
       }
 			else if( controlID == buttonExit )
 			{
         quitConfirmationWindow = QuitMessageBoxYesNo(TheGameText->fetch("GUI:QuitPopupTitle"), TheGameText->fetch("GUI:QuitPopupMessage"),/*quitCallback*/exitQuitMenu,noExitQuitMenu);
-			}  // end if
+			}
 			else if( controlID == buttonReturn )
 			{
-			
+
 				// hide this menu
 				ToggleQuitMenu();
 
-			}  // end else if
+			}
 			else if( buttonOptions == controlID )
 			{
 				WindowLayout *optLayout = TheShell->getOptionsLayout(TRUE);
@@ -540,28 +526,28 @@ WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg,
 				if ( TheGameLogic->isInMultiplayerGame() )
 				{
 					// we really want to surrender
-					quitConfirmationWindow = MessageBoxYesNo(TheGameText->fetch("GUI:SurrenderConfirmationTitle"), 
+					quitConfirmationWindow = MessageBoxYesNo(TheGameText->fetch("GUI:SurrenderConfirmationTitle"),
 																			TheGameText->fetch("GUI:SurrenderConfirmation"),
 																			/*quitCallback*/surrenderQuitMenu,noExitQuitMenu);
 				}
 				else
 				{
 					//we really want to restart
-					quitConfirmationWindow = MessageBoxYesNo(TheGameText->fetch("GUI:RestartConfirmationTitle"), 
+					quitConfirmationWindow = MessageBoxYesNo(TheGameText->fetch("GUI:RestartConfirmationTitle"),
 																			TheGameText->fetch("GUI:RestartConfirmation"),
 																			/*quitCallback*/restartMissionMenu,noExitQuitMenu);
 				}
-			}  // end else if
+			}
 
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end QuitMenuSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
index e3597db43be..bbad3784ad9 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Lib/BaseType.h"
@@ -45,14 +45,15 @@
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/MessageBox.h"
 #include "GameClient/MapUtil.h"
+#include "GameClient/Mouse.h"
 #include "GameClient/GameText.h"
 #include "GameClient/GameWindowTransitions.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+typedef UnicodeString ReplayName;
+typedef UnicodeString TooltipString;
+typedef std::map<ReplayName, TooltipString> ReplayTooltipMap;
+
+static ReplayTooltipMap replayTooltipCache;
 
 // window ids -------------------------------------------------------------------------------------
 static NameKeyType parentReplayMenuID = NAMEKEY_INVALID;
@@ -75,7 +76,7 @@ static Int	initialGadgetDelay = 2;
 static Bool justEntered = FALSE;
 
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 static GameWindow *buttonAnalyzeReplay = NULL;
 #endif
 
@@ -102,30 +103,164 @@ UnicodeString GetReplayFilenameFromListbox(GameWindow *listbox, Int index)
 	return fname;
 }
 
+//-------------------------------------------------------------------------------------------------
+
+static Bool readReplayMapInfo(const AsciiString& filename, RecorderClass::ReplayHeader &header, ReplayGameInfo &info, const MapMetaData *&mapData)
+{
+	header.forPlayback = FALSE;
+	header.filename = filename;
+
+	if (TheRecorder != NULL && TheRecorder->readReplayHeader(header))
+	{
+		if (ParseAsciiStringToGameInfo(&info, header.gameOptions))
+		{
+			if (TheMapCache != NULL)
+				mapData = TheMapCache->findMap(info.getMap());
+			else
+				mapData = NULL;
+
+			return true;
+		}
+	}
+	return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+static void removeReplayExtension(UnicodeString& replayName)
+{
+	const Int extensionLength = TheRecorder->getReplayExtention().getLength();
+	replayName.truncateBy(extensionLength);
+}
+
+//-------------------------------------------------------------------------------------------------
+
+static UnicodeString createReplayName(const AsciiString& filename)
+{
+	AsciiString lastReplayFName = TheRecorder->getLastReplayFileName();
+	lastReplayFName.concat(TheRecorder->getReplayExtention());
+	UnicodeString replayName;
+
+	if (lastReplayFName.compareNoCase(filename) == 0)
+	{
+		replayName = TheGameText->fetch("GUI:LastReplay");
+	}
+	else
+	{
+		replayName.translate(filename);
+		removeReplayExtension(replayName);
+	}
+	return replayName;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+static UnicodeString createMapName(const AsciiString& filename, const ReplayGameInfo& info, const MapMetaData *mapData)
+{
+	UnicodeString mapName;
+	if (!mapData)
+	{
+		// TheSuperHackers @bugfix helmutbuhler 08/03/2025 Just use the filename.
+		// Displaying a long map path string would break the map list gui.
+		const char* filename = info.getMap().reverseFind('\\');
+		mapName.translate(filename ? filename + 1 : info.getMap());
+	}
+	else
+	{
+		mapName = mapData->m_displayName;
+	}
+	return mapName;
+}
+
+//-------------------------------------------------------------------------------------------------
+// TheSuperHackers @feature Stubbjax 21/10/2025 Show extra info tooltip when hovering over a replay.
+
+static void showReplayTooltip(GameWindow* window, WinInstanceData* instData, UnsignedInt mouse)
+{
+	Int x, y, row, col;
+	x = LOLONGTOSHORT(mouse);
+	y = HILONGTOSHORT(mouse);
+
+	GadgetListBoxGetEntryBasedOnXY(window, x, y, row, col);
+
+	if (row == -1 || col == -1)
+	{
+		TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
+		return;
+	}
+
+	UnicodeString replayFileName = GetReplayFilenameFromListbox(window, row);
+
+	ReplayTooltipMap::const_iterator it = replayTooltipCache.find(replayFileName);
+	if (it != replayTooltipCache.end())
+		TheMouse->setCursorTooltip(it->second, -1, NULL, 1.5f);
+	else
+		TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
+}
+
+static UnicodeString buildReplayTooltip(RecorderClass::ReplayHeader header, ReplayGameInfo info)
+{
+	UnicodeString tooltipStr;
+
+	if (header.endTime < header.startTime)
+		header.startTime = header.endTime;
+
+	time_t totalSeconds = header.endTime - header.startTime;
+	UnsignedInt hours = totalSeconds / 3600;
+	UnsignedInt mins = (totalSeconds % 3600) / 60;
+	UnsignedInt secs = totalSeconds % 60;
+	Real fps = totalSeconds > 0 ? header.frameCount / totalSeconds : 0;
+	tooltipStr.format(L"%02u:%02u:%02u (%g fps)", hours, mins, secs, fps);
+
+	if (header.localPlayerIndex >= 0)
+	{
+		// MP game
+		for (Int i = 0; i < MAX_SLOTS; ++i)
+		{
+			const GameSlot* slot = info.getConstSlot(i);
+			if (slot && slot->isHuman())
+			{
+				tooltipStr.concat(L"\n");
+				tooltipStr.concat(info.getConstSlot(i)->getName());
+			}
+		}
+	}
+
+	return tooltipStr;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Populate the listbox with the names of the available replay files */
 //-------------------------------------------------------------------------------------------------
 void PopulateReplayFileListbox(GameWindow *listbox)
 {
+	replayTooltipCache.clear();
+
 	if (!TheMapCache)
 		return;
-	
+
 	GadgetListBoxReset(listbox);
+	const Int listboxLength = GadgetListBoxGetListLength(listbox);
 
+	// TheSuperHackers @tweak xezon 08/06/2025 Now shows missing maps in red color.
 	enum {
 		COLOR_SP = 0,
 		COLOR_SP_CRC_MISMATCH,
 		COLOR_MP,
 		COLOR_MP_CRC_MISMATCH,
+		COLOR_MISSING_MAP,
+		COLOR_MISSING_MAP_CRC_MISMATCH,
 		COLOR_MAX
 	};
-	Color colors[COLOR_MAX] = {
+	Color colors[] = {
 		GameMakeColor( 255, 255, 255, 255 ),
 		GameMakeColor( 128, 128, 128, 255 ),
 		GameMakeColor( 255, 255, 255, 255 ),
-		GameMakeColor( 128, 128, 128, 255 )
+		GameMakeColor( 128, 128, 128, 255 ),
+		GameMakeColor( 243,  24,  24, 255 ),
+		GameMakeColor( 128,  32,  32, 255 )
 	};
+	static_assert(ARRAY_SIZE(colors) == COLOR_MAX, "Mismatch between colors array size and COLOR_MAX");
 
 	AsciiString asciistr;
 	AsciiString asciisearch;
@@ -135,134 +270,96 @@ void PopulateReplayFileListbox(GameWindow *listbox)
 	FilenameList replayFilenames;
 	FilenameListIter it;
 
-	TheFileSystem->getFileListInDirectory(TheRecorder->getReplayDir(), asciisearch, replayFilenames, TRUE);
+	TheFileSystem->getFileListInDirectory(TheRecorder->getReplayDir(), asciisearch, replayFilenames, FALSE);
 
 	TheMapCache->updateCache();
 
-
 	for (it = replayFilenames.begin(); it != replayFilenames.end(); ++it)
 	{
 		// just want the filename
 		asciistr.set((*it).reverseFind('\\') + 1);
 
-		// lets get some info about the replay
 		RecorderClass::ReplayHeader header;
-		header.forPlayback = FALSE;
-		header.filename = asciistr;
-		Bool success = TheRecorder && TheMapCache && TheRecorder->readReplayHeader( header );
-		if (success)
+		ReplayGameInfo info;
+		const MapMetaData *mapData;
+
+		if (readReplayMapInfo(asciistr, header, info, mapData))
 		{
-			ReplayGameInfo info;
-			if (ParseAsciiStringToGameInfo( &info, header.gameOptions ))
-			{
+			// columns are: name, date, version, map, extra
 
-				// columns are: name, date, version, map, extra
+			// name
+			UnicodeString replayNameToShow = createReplayName(asciistr);
 
-				// name
-				header.replayName.translate(asciistr);
-				for (Int tmp=0; tmp < TheRecorder->getReplayExtention().getLength(); ++tmp)
-					header.replayName.removeLastChar();
+			UnicodeString displayTimeBuffer = getUnicodeTimeBuffer(header.timeVal);
 
-				UnicodeString replayNameToShow = header.replayName;
+			//displayTimeBuffer.format( L"%ls", timeBuffer);
 
-				AsciiString lastReplayFName = TheRecorder->getLastReplayFileName();
-				lastReplayFName.concat(TheRecorder->getReplayExtention());
-				if (lastReplayFName.compareNoCase(asciistr) == 0)
-					replayNameToShow = TheGameText->fetch("GUI:LastReplay");
+			// version (no-op)
 
-				UnicodeString displayTimeBuffer = getUnicodeTimeBuffer(header.timeVal);
+			// map
+			UnicodeString mapStr = createMapName(asciistr, info, mapData);
 
-				//displayTimeBuffer.format( L"%ls", timeBuffer);
+			// tooltip
+			UnicodeString tooltipStr = buildReplayTooltip(header, info);
 
-				// version (no-op)
+			UnicodeString key;
+			key.translate(asciistr);
+			replayTooltipCache[key] = tooltipStr;
 
-				// map
-				UnicodeString mapStr;
-				const MapMetaData *md = TheMapCache->findMap(info.getMap());
-				if (!md)
+			// pick a color
+			Color color;
+			Color mapColor;
+
+			const Bool hasMap = mapData != NULL;
+
+			const Bool isCrcCompatible = RecorderClass::replayMatchesGameVersion(header);
+
+			if (isCrcCompatible)
+			{
+				if (header.localPlayerIndex >= 0)
 				{
-					// TheSuperHackers @bugfix helmutbuhler 08/03/2025 Just use the filename.
-					// Displaying a long map path string would break the map list gui.
-					const char* filename = info.getMap().reverseFind('\\');
-					mapStr.translate(filename ? filename + 1 : info.getMap());
+					// MP
+					color = colors[COLOR_MP];
 				}
 				else
 				{
-					mapStr = md->m_displayName;
+					// SP
+					color = colors[COLOR_SP];
 				}
 
-//				// extra
-//				UnicodeString extraStr;
-//				if (header.localPlayerIndex >= 0)
-//				{
-//					// MP game
-//					time_t totalSeconds = header.endTime - header.startTime;
-//					Int mins = totalSeconds/60;
-//					Int secs = totalSeconds%60;
-//					Real fps = header.frameDuration/totalSeconds;
-//					extraStr.format(L"%d:%d (%g fps) %hs", mins, secs, fps, header.desyncGame?"OOS ":"");
-//
-//					for (Int i=0; i<MAX_SLOTS; ++i)
-//					{
-//						const GameSlot *slot = info.getConstSlot(i);
-//						if (slot && slot->isHuman())
-//						{
-//							if (i)
-//								extraStr.concat(L", ");
-//							if (header.playerDiscons[i])
-//								extraStr.concat(L'*');
-//							extraStr.concat(info.getConstSlot(i)->getName());
-//						}
-//					}
-//				}
-//				else
-//				{
-//					// solo game
-//					time_t totalSeconds = header.endTime - header.startTime;
-//					Int mins = totalSeconds/60;
-//					Int secs = totalSeconds%60;
-//					Real fps = header.frameDuration/totalSeconds;
-//					extraStr.format(L"%d:%d (%g fps)", mins, secs, fps);
-//				}
-
-				// pick a color
-				Color color;
-				if (header.versionString == TheVersion->getUnicodeVersion() && header.versionNumber == TheVersion->getVersionNumber() &&
-					header.exeCRC == TheGlobalData->m_exeCRC && header.iniCRC == TheGlobalData->m_iniCRC)
+				if (hasMap)
+					mapColor = color;
+				else
+					mapColor = colors[COLOR_MISSING_MAP];
+			}
+			else
+			{
+				if (header.localPlayerIndex >= 0)
 				{
-					// good version
-					if (header.localPlayerIndex >= 0)
-					{
-						// MP
-						color = colors[COLOR_MP];
-					}
-					else
-					{
-						// SP
-						color = colors[COLOR_SP];
-					}
+					// MP
+					color = colors[COLOR_MP_CRC_MISMATCH];
 				}
 				else
 				{
-					// bad version
-					if (header.localPlayerIndex >= 0)
-					{
-						// MP
-						color = colors[COLOR_MP_CRC_MISMATCH];
-					}
-					else
-					{
-						// SP
-						color = colors[COLOR_SP_CRC_MISMATCH];
-					}
+					// SP
+					color = colors[COLOR_SP_CRC_MISMATCH];
 				}
-				
-				Int insertionIndex = GadgetListBoxAddEntryText(listbox, replayNameToShow, color, -1, 0);
-				GadgetListBoxAddEntryText(listbox, displayTimeBuffer, color, insertionIndex, 1);
-				GadgetListBoxAddEntryText(listbox, header.versionString, color, insertionIndex, 2);
-				GadgetListBoxAddEntryText(listbox, mapStr, color, insertionIndex, 3);
-				//GadgetListBoxAddEntryText(listbox, extraStr, color, insertionIndex, 4);
+
+				if (hasMap)
+					mapColor = color;
+				else
+					mapColor = colors[COLOR_MISSING_MAP_CRC_MISMATCH];
 			}
+
+			const Int insertionIndex = GadgetListBoxAddEntryText(listbox, replayNameToShow, color, -1, 0);
+			DEBUG_ASSERTCRASH(insertionIndex >= 0, ("Expects valid index"));
+			GadgetListBoxAddEntryText(listbox, displayTimeBuffer, color, insertionIndex, 1);
+			GadgetListBoxAddEntryText(listbox, header.versionString, color, insertionIndex, 2);
+			GadgetListBoxAddEntryText(listbox, mapStr, mapColor, insertionIndex, 3);
+
+			// TheSuperHackers @performance Now stops processing when the list is full.
+			if (insertionIndex == listboxLength - 1)
+				break;
 		}
 	}
 	GadgetListBoxSetSelected(listbox, 0);
@@ -276,17 +373,18 @@ void ReplayMenuInit( WindowLayout *layout, void *userData )
 	TheShell->showShellMap(TRUE);
 
 	// get ids for our children controls
-	parentReplayMenuID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ParentReplayMenu") );
-	buttonLoadID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonLoadReplay") );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonBack") );
-	listboxReplayFilesID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ListboxReplayFiles") );
-	buttonDeleteID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonDeleteReplay") );
-	buttonCopyID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonCopyReplay") );
+	parentReplayMenuID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ParentReplayMenu" );
+	buttonLoadID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonLoadReplay" );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonBack" );
+	listboxReplayFilesID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ListboxReplayFiles" );
+	buttonDeleteID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonDeleteReplay" );
+	buttonCopyID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonCopyReplay" );
 
 	parentReplayMenu = TheWindowManager->winGetWindowFromId( NULL, parentReplayMenuID );
 	buttonLoad = TheWindowManager->winGetWindowFromId( parentReplayMenu, buttonLoadID );
 	buttonBack = TheWindowManager->winGetWindowFromId( parentReplayMenu, buttonBackID );
 	listboxReplayFiles = TheWindowManager->winGetWindowFromId( parentReplayMenu, listboxReplayFilesID );
+	listboxReplayFiles->winSetTooltipFunc(showReplayTooltip);
 	buttonDelete = TheWindowManager->winGetWindowFromId( parentReplayMenu, buttonDeleteID );
 	buttonCopy = TheWindowManager->winGetWindowFromId( parentReplayMenu, buttonCopyID );
 
@@ -294,16 +392,16 @@ void ReplayMenuInit( WindowLayout *layout, void *userData )
 	GadgetListBoxReset(listboxReplayFiles);
 	PopulateReplayFileListbox(listboxReplayFiles);
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	WinInstanceData instData;
 	instData.init();
 	BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK );
 	instData.m_textLabelString = "Debug: Analyze Replay";
-	instData.setTooltipText(UnicodeString(L"Only Used in Debug and Internal!"));
-	buttonAnalyzeReplay = TheWindowManager->gogoGadgetPushButton( parentReplayMenu, 
-																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE, 
-																									 4, 4, 
-																									 180, 26, 
+	instData.setTooltipText(L"Only Used in Debug and Internal!");
+	buttonAnalyzeReplay = TheWindowManager->gogoGadgetPushButton( parentReplayMenu,
+																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
+																									 4, 4,
+																									 180, 26,
 																									 &instData, NULL, TRUE );
 #endif
 
@@ -319,7 +417,7 @@ void ReplayMenuInit( WindowLayout *layout, void *userData )
 		win->winHide(TRUE);
 	isShuttingDown = FALSE;
 
-}  // end ReplayMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu shutdown method */
@@ -335,12 +433,12 @@ void ReplayMenuShutdown( WindowLayout *layout, void *userData )
 		TheShell->shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	// our shutdown is complete
 	TheTransitionHandler->reverse("ReplayMenuFade");
 	isShuttingDown = TRUE;
-}  // end ReplayMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu update method */
@@ -364,11 +462,11 @@ void ReplayMenuUpdate( WindowLayout *layout, void *userData )
 		copyReplay();
 	if(callDelete)
 		deleteReplay();
-		// We'll only be successful if we've requested to 
+		// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished()&& TheTransitionHandler->isFinished())
 		TheShell->shutdownComplete( layout );
 
-}  // end ReplayMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Replay menu input callback */
@@ -377,7 +475,7 @@ WindowMsgHandledType ReplayMenuInput( GameWindow *window, UnsignedInt msg,
 																						WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -392,7 +490,7 @@ WindowMsgHandledType ReplayMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -400,25 +498,25 @@ WindowMsgHandledType ReplayMenuInput( GameWindow *window, UnsignedInt msg,
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end ReplayMenuInput
+}
 
 void reallyLoadReplay(void)
 {
@@ -441,7 +539,7 @@ void reallyLoadReplay(void)
 	if(parentReplayMenu != NULL)
 	{
 		parentReplayMenu->winHide(TRUE);
-	}	
+	}
 }
 
 static void loadReplay(UnicodeString filename)
@@ -449,8 +547,32 @@ static void loadReplay(UnicodeString filename)
 	AsciiString asciiFilename;
 	asciiFilename.translate(filename);
 
-	if(!TheRecorder->replayMatchesGameVersion(asciiFilename))
+	RecorderClass::ReplayHeader header;
+	ReplayGameInfo info;
+	const MapMetaData *mapData;
+
+	if(!readReplayMapInfo(asciiFilename, header, info, mapData))
+	{
+		// TheSuperHackers @bugfix Prompts a message box when the replay was deleted by the user while the Replay Menu was opened.
+
+		UnicodeString title = TheGameText->FETCH_OR_SUBSTITUTE("GUI:ReplayFileNotFoundTitle", L"REPLAY NOT FOUND");
+		UnicodeString body = TheGameText->FETCH_OR_SUBSTITUTE("GUI:ReplayFileNotFound", L"This replay cannot be loaded because the file no longer exists on this device.");
+
+		MessageBoxOk(title, body, NULL);
+	}
+	else if(mapData == NULL)
+	{
+		// TheSuperHackers @bugfix Prompts a message box when the map used by the replay was not found.
+
+		UnicodeString title = TheGameText->FETCH_OR_SUBSTITUTE("GUI:ReplayMapNotFoundTitle", L"MAP NOT FOUND");
+		UnicodeString body = TheGameText->FETCH_OR_SUBSTITUTE("GUI:ReplayMapNotFound", L"This replay cannot be loaded because the map was not found on this device.");
+
+		MessageBoxOk(title, body, NULL);
+	}
+	else if(!TheRecorder->replayMatchesGameVersion(header))
 	{
+		// Pressing OK loads the replay.
+
 		MessageBoxOkCancel(TheGameText->fetch("GUI:OlderReplayVersionTitle"), TheGameText->fetch("GUI:OlderReplayVersion"), reallyLoadReplay, NULL);
 	}
 	else
@@ -467,21 +589,21 @@ static void loadReplay(UnicodeString filename)
 //-------------------------------------------------------------------------------------------------
 /** single player menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
 
-			
+
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -489,7 +611,7 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -501,13 +623,13 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 		//---------------------------------------------------------------------------------------------
 		case GLM_DOUBLE_CLICKED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxReplayFilesID ) 
+				if( controlID == listboxReplayFilesID )
 				{
 					int rowSelected = mData2;
 
@@ -526,7 +648,7 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 			if( controlID == buttonAnalyzeReplay->winGetWindowId() )
 			{
 				if(listboxReplayFiles)
@@ -535,7 +657,7 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 					GadgetListBoxGetSelected( listboxReplayFiles,  &selected );
 					if(selected < 0)
 					{
-						MessageBoxOk(UnicodeString(L"Blah Blah"),UnicodeString(L"Please select something munkee boy"), NULL);
+						MessageBoxOk(L"Blah Blah",L"Please select something munkee boy", NULL);
 						break;
 					}
 
@@ -548,11 +670,11 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 						do
 						{
 							TheRecorder->update();
-						} while (TheRecorder->isAnalysisInProgress());
+						} while (TheRecorder->isPlaybackInProgress());
 					}
 				}
 			}
-			else 
+			else
 #endif
 			if( controlID == buttonLoadID )
 			{
@@ -569,14 +691,14 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 					filename = GetReplayFilenameFromListbox(listboxReplayFiles, selected);
 					loadReplay(filename);
 				}
-			}  // end else if
+			}
 			else if( controlID == buttonBackID )
 			{
 
 				// thou art directed to return to thy known solar system immediately!
 				TheShell->pop();
 
-			}  // end else if
+			}
 			else if( controlID == buttonDeleteID )
 			{
 				Int selected;
@@ -602,14 +724,14 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 				MessageBoxYesNo(TheGameText->fetch("GUI:CopyReplay"), TheGameText->fetch("GUI:AreYouSureCopy"), copyReplayFlag, NULL);
 			}
 			break;
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
-}  // end ReplayMenuSystem
+}
 
 void deleteReplay( void )
 {
@@ -654,7 +776,7 @@ void copyReplay( void )
 	filename = TheRecorder->getReplayDir();
 	translate.translate(GetReplayFilenameFromListbox(listboxReplayFiles, selected));
 	filename.concat(translate);
-	
+
 	char path[1024];
 	LPITEMIDLIST pidl;
 	SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOPDIRECTORY, &pidl);
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
index 0f9492d7515..12f22f49c1f 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ScoreScreen.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jun 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ScoreScreen.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Gui callbacks for the Score Screen
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BattleHonors.h"
 #include "Common/GameEngine.h"
@@ -64,6 +64,7 @@
 #include "Common/PlayerTemplate.h"
 #include "Common/RandomValue.h"
 #include "Common/Recorder.h"
+#include "Common/ReplaySimulation.h"
 #include "Common/ScoreKeeper.h"
 #include "Common/SkirmishBattleHonors.h"
 #include "Common/ThingFactory.h"
@@ -78,6 +79,7 @@
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/Gadget.h"
 #include "GameClient/GameText.h"
+#include "GameClient/Keyboard.h"
 #include "GameClient/MapUtil.h"
 #include "GameClient/Shell.h"
 #include "GameClient/KeyDefs.h"
@@ -93,16 +95,9 @@
 #include "GameNetwork/LANAPICallbacks.h"
 #include "GameNetwork/GameSpyOverlay.h"
 #include "GameNetwork/GameSpy/BuddyThread.h"
-#include "GameNetwork/GameSpy/GameResultsThread.h"
 #include "GameNetwork/GameSpy/PersistentStorageThread.h"
-//Added By Saad
 #include "GameClient/InGameUI.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -188,7 +183,7 @@ void startNextCampaignGame(void)
 	msg->appendIntegerArgument(GAME_SINGLE_PLAYER);
 	msg->appendIntegerArgument(TheCampaignManager->getGameDifficulty());
 	msg->appendIntegerArgument(TheCampaignManager->getRankPoints());
-	
+
 	InitRandom(0);
 }
 
@@ -224,23 +219,23 @@ void ScoreScreenInit( WindowLayout *layout, void *userData )
 {
 	if (TheGameSpyInfo)
 	{
-		DEBUG_LOG(("ScoreScreenInit(): TheGameSpyInfo->stuff(%s/%s/%s)\n", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
+		DEBUG_LOG(("ScoreScreenInit(): TheGameSpyInfo->stuff(%s/%s/%s)", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
 	}
 
 	DontShowMainMenu = TRUE; //KRIS
 	buttonIsFinishCampaign = FALSE;
 
 	//Store the keys so we have them later
-	parentID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ParentScoreScreen" ) );
-	buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonOk" ) );
-	textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:TextEntryChat" ) );
-	buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonEmote" ) );
-	listboxChatWindowScoreScreenID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ListboxChatWindowScoreScreen" ) );
-//	buttonRehostID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonRehost" ) );
-	chatBoxBorderID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ChatBoxBorder" ) );
-	buttonBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonBuddy" ) );
-	buttonContinueID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonContinue" ) );
-	buttonSaveReplayID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonSaveReplay" ) );
+	parentID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ParentScoreScreen" );
+	buttonOkID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonOk" );
+	textEntryChatID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:TextEntryChat" );
+	buttonEmoteID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonEmote" );
+	listboxChatWindowScoreScreenID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ListboxChatWindowScoreScreen" );
+//	buttonRehostID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonRehost" );
+	chatBoxBorderID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ChatBoxBorder" );
+	buttonBuddiesID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonBuddy" );
+	buttonContinueID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonContinue" );
+	buttonSaveReplayID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonSaveReplay" );
 
 	parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	buttonOk = TheWindowManager->winGetWindowFromId( parent, buttonOkID );
@@ -368,7 +363,7 @@ WindowMsgHandledType ScoreScreenInput( GameWindow *window, UnsignedInt msg,
 																		WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -383,7 +378,7 @@ WindowMsgHandledType ScoreScreenInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -391,34 +386,42 @@ WindowMsgHandledType ScoreScreenInput( GameWindow *window, UnsignedInt msg,
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)buttonOk, buttonOkID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end MainMenuInput
+}
+
+static Bool showReplayButtonContinue()
+{
+	bool hasSimulationReplay = ReplaySimulation::getReplayCount() > 0;
+	bool isLastSimulationReplay = ReplaySimulation::getCurrentReplayIndex() == ReplaySimulation::getReplayCount()-1;
+
+	return hasSimulationReplay && !isLastSimulationReplay;
+}
 
 /** System Function for the ScoreScreen */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
-	switch( msg ) 
+	switch( msg )
 	{
 		// --------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -435,7 +438,7 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 				*(Bool *)mData2 = TRUE;
 
 			break;
-		}  // end input
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -449,27 +452,40 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 			{
 				TheShell->pop();
 				TheCampaignManager->setCampaign(AsciiString::TheEmptyString);
+
+				if ( ReplaySimulation::getReplayCount() > 0 )
+				{
+					ReplaySimulation::stop();
+					TheGameEngine->setQuitting(TRUE);
+				}
 			}
-			else if ( controlID == buttonContinueID )	
+			else if ( controlID == buttonContinueID )
 			{
-				if(!buttonIsFinishCampaign)
-					ReplayWasPressed = TRUE;
-				if( screenType == SCORESCREEN_SINGLEPLAYER)	
+				if( ReplaySimulation::getReplayCount() > 0 )
 				{
-					AsciiString mapName = TheCampaignManager->getCurrentMap();
-
-					if( mapName.isEmpty() )
-					{
-						ReplayWasPressed = FALSE;
-						TheShell->pop();
-					}
-					else
+					TheGameEngine->setQuitting(TRUE);
+				}
+				else
+				{
+					if(!buttonIsFinishCampaign)
+						ReplayWasPressed = TRUE;
+					if( screenType == SCORESCREEN_SINGLEPLAYER)
 					{
-						CheckForCDAtGameStart( startNextCampaignGame );
+						AsciiString mapName = TheCampaignManager->getCurrentMap();
+
+						if( mapName.isEmpty() )
+						{
+							ReplayWasPressed = FALSE;
+							TheShell->pop();
+						}
+						else
+						{
+							CheckForCDAtGameStart( startNextCampaignGame );
+						}
 					}
 				}
 			}
-			else if ( controlID == buttonBuddiesID )	
+			else if ( controlID == buttonBuddiesID )
 			{
 				GameSpyToggleOverlay( GSOVERLAY_BUDDY );
 			}
@@ -477,7 +493,7 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 			{
 				ScoreScreenEnableControls(FALSE);
         WindowLayout *saveReplayLayout = TheShell->getPopupReplayLayout();
-				DEBUG_ASSERTCRASH( saveReplayLayout, ("Unable to get save replay menu layout.\n") );
+				DEBUG_ASSERTCRASH( saveReplayLayout, ("Unable to get save replay menu layout.") );
 				saveReplayLayout->runInit();
 				saveReplayLayout->hide( FALSE );
 				saveReplayLayout->bringForward();
@@ -496,7 +512,7 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 					if(TheLAN)
 						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_EMOTE);
 					//add the gamespy chat request here
-			} //if ( controlID == buttonEmote )
+			}
 			for(Int i = 0; i < MAX_SLOTS; ++i)
 			{
 				AsciiString name;
@@ -523,13 +539,13 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 						req.arg.addbuddy.id = playerID;
 						UnicodeString buddyAddstr;
 						buddyAddstr = TheGameText->fetch("GUI:BuddyAddReq");
-						wcsncpy(req.arg.addbuddy.text, buddyAddstr.str(), MAX_BUDDY_CHAT_LEN);
-						req.arg.addbuddy.text[MAX_BUDDY_CHAT_LEN-1] = 0;
+						wcslcpy(req.arg.addbuddy.text, buddyAddstr.str(), MAX_BUDDY_CHAT_LEN);
 						TheGameSpyBuddyMessageQueue->addRequest(req);
 					}
-					break;
 				}
 			}
+
+			break;
 		}
 
 		case GEM_EDIT_DONE:
@@ -541,7 +557,7 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 			// send it to the other clients on the lan
 			if ( controlID == textEntryChatID )
 			{
-				
+
 				// read the user's input
 				txtInput.set(GadgetTextEntryGetText( textEntryChat ));
 				// Clear the text entry line
@@ -554,9 +570,11 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_NORMAL);
 					//add the gamespy chat request here
 
-			}// if ( controlID == textEntryChatID )
+			}
+
+			break;
 		}
-	}		
+	}
 	return MSG_HANDLED;
 }
 
@@ -599,8 +617,8 @@ void PlayMovieAndBlock(AsciiString movieTitle)
 
 	// Create the new buffer
 	VideoBuffer *videoBuffer = TheDisplay->createVideoBuffer();
-	if (	videoBuffer == NULL || 
-				!videoBuffer->allocate(	videoStream->width(), 
+	if (	videoBuffer == NULL ||
+				!videoBuffer->allocate(	videoStream->width(),
 													videoStream->height())
 		)
 	{
@@ -608,16 +626,33 @@ void PlayMovieAndBlock(AsciiString movieTitle)
 		videoBuffer = NULL;
 
 		if ( videoStream )
+		{
 			videoStream->close();
-		videoStream = NULL;
+			videoStream = NULL;
+		}
 
 		return;
 	}
 
+	// TheSuperHackers @bugfix Originally this movie render loop stopped rendering when the game window was inactive.
+	// This either skipped the movie or caused decompression artifacts. Now the video just keeps playing until it done.
+
 	GameWindow *movieWindow = s_blankLayout->getFirstWindow();
 	TheWritableGlobalData->m_loadScreenRender = TRUE;
 	while (videoStream->frameIndex() < videoStream->frameCount() - 1)
 	{
+		// TheSuperHackers @feature User can now skip video by pressing ESC
+		if (TheKeyboard)
+		{
+			TheKeyboard->UPDATE();
+			KeyboardIO *io = TheKeyboard->findKey(KEY_ESC, KeyboardIO::STATUS_UNUSED);
+			if (io && BitIsSet(io->state, KEY_STATE_DOWN))
+			{
+				io->setUsed();
+				break;
+			}
+		}
+
 		TheGameEngine->serviceWindowsOS();
 
 		if(!videoStream->isFrameReady())
@@ -626,13 +661,6 @@ void PlayMovieAndBlock(AsciiString movieTitle)
 			continue;
 		}
 
-		if (!TheGameEngine->isActive())
-		{	//we are alt-tabbed out, so just increment the frame
-			videoStream->frameNext();
-			videoStream->frameDecompress();
-			continue;
-		}
-		
 		videoStream->frameDecompress();
 		videoStream->frameRender(videoBuffer);
 		videoStream->frameNext();
@@ -646,11 +674,10 @@ void PlayMovieAndBlock(AsciiString movieTitle)
 	}
 	TheWritableGlobalData->m_loadScreenRender = FALSE;
 	movieWindow->winGetInstanceData()->setVideoBuffer(NULL);
-	if (videoBuffer)
-	{
-		delete videoBuffer;
-		videoBuffer = NULL;
-	}
+
+	delete videoBuffer;
+	videoBuffer = NULL;
+
 	if (videoStream)
 	{
 		videoStream->close();
@@ -720,7 +747,7 @@ void finishSinglePlayerInit( void )
 						if (!TheGameLODManager->didMemPass()) {
 							useLowRes = TRUE;
 						}
-						if (TheGameLODManager->findStaticLODLevel()==STATIC_GAME_LOD_LOW) {
+						if (TheGameLODManager->getRecommendedStaticLODLevel()==STATIC_GAME_LOD_LOW) {
 							useLowRes = TRUE;
 						}
 						if (TheGameLODManager->getStaticLODLevel()==STATIC_GAME_LOD_LOW) {
@@ -732,10 +759,10 @@ void finishSinglePlayerInit( void )
 				}
 			}
 		}
-		else 
+		else
 		{
 			GadgetButtonSetText(buttonContinue, TheGameText->fetch("GUI:SaveAndContinue"));
-			
+
 			// auto save game
 			TheGameState->missionSave();
 			if(staticTextGameSaved)
@@ -748,12 +775,8 @@ void finishSinglePlayerInit( void )
 
 	}
 
-	//Added By Sadullah Nader
-	//Fix for the black screen text that appears after loading sequence
-
 	TheInGameUI->freeMessageResources();
 
-	//
 	if (s_blankLayout)
 	{
 		s_blankLayout->destroyWindows();
@@ -800,7 +823,7 @@ void initReplaySinglePlayer( void )
 	if (chatBoxBorder)
 		chatBoxBorder->winHide(TRUE);
 	if (buttonContinue)
-		buttonContinue->winHide(TRUE);
+		buttonContinue->winHide(!showReplayButtonContinue());
 	if (buttonBuddies)
 		buttonBuddies->winHide(TRUE);
 	if (listboxChatWindowScoreScreen)
@@ -886,7 +909,7 @@ void initReplayMultiPlayer(void)
 	if (chatBoxBorder)
 		chatBoxBorder->winHide(TRUE);
 	if (buttonContinue)
-		buttonContinue->winHide(TRUE);
+		buttonContinue->winHide(!showReplayButtonContinue());
 	if (buttonBuddies)
 		buttonBuddies->winHide(TRUE);
 //	if (buttonRehost)
@@ -910,7 +933,7 @@ static Bool isSlotLocalAlly(GameInfo *game, const GameSlot *slot)
 
 static void updateSkirmishBattleHonors(SkirmishBattleHonors& stats)
 {
-	DEBUG_LOG(("Updating Skirmish battle honors\n"));
+	DEBUG_LOG(("Updating Skirmish battle honors"));
 	Player *localPlayer = ThePlayerList->getLocalPlayer();
 	ScoreKeeper *s = localPlayer->getScoreKeeper();
 
@@ -1012,7 +1035,7 @@ static void updateSkirmishBattleHonors(SkirmishBattleHonors& stats)
 
 static void updateMPBattleHonors(Int& honors, PSPlayerStats& stats)
 {
-	DEBUG_LOG(("Updating MP battle honors\n"));
+	DEBUG_LOG(("Updating MP battle honors"));
 	Player *localPlayer = ThePlayerList->getLocalPlayer();
 	ScoreKeeper *s = localPlayer->getScoreKeeper();
 
@@ -1159,7 +1182,7 @@ static void updateChallengeMedals(Int& medals)
 //-------------------------------------------------------------------------------------------------
 void populatePlayerInfo( Player *player, Int pos)
 {
-	if(!player || pos > MAX_SLOTS)
+	if(!player || pos < 0 || pos >= MAX_SLOTS)
 		return;
 	Color color = player->getPlayerColor();
 	ScoreKeeper *scoreKpr = player->getScoreKeeper();
@@ -1244,15 +1267,6 @@ void populatePlayerInfo( Player *player, Int pos)
 	win->winSetEnabledTextColors(color, win->winGetEnabledTextBorderColor());
 	win->winHide(FALSE);
 
-	// set the total BuildingsDestroyed
-	winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", pos);
-	win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
-	DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
-	winValue.format(L"%d", scoreKpr->getTotalBuildingsDestroyed());
-	GadgetStaticTextSetText(win, winValue);
-	win->winSetEnabledTextColors(color, win->winGetEnabledTextBorderColor());
-	win->winHide(FALSE);
-
 	// set the total Resources
 	winName.format("ScoreScreen.wnd:StaticTextResources%d", pos);
 	win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
@@ -1279,14 +1293,14 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 	//	if(screenType ==	SCORESCREEN_INTERNET && TheGameSpyInfo && TheGameSpyInfo->getLocalProfileID() != 0)
 	//	{
 	//		// Get the stats for the player
-	//		
+	//
 	//		AsciiString aName;
 	//		aName.translate(player->getPlayerDisplayName());
 	//
 	//		PlayerInfoMap::iterator blah = TheGameSpyInfo->getPlayerInfoMap()->find(aName);
 	//		if(blah->second.m_profileID != 0)
 	//		{
-	//			
+	//
 	//			BuddyInfoMap::iterator bIt = TheGameSpyInfo->getBuddyMap()->find(blah->second.m_profileID);
 	//			if(bIt !=  TheGameSpyInfo->getBuddyMap()->end()  || (TheGameSpyInfo->getLocalProfileID() == blah->second.m_profileID))
 	//			{
@@ -1295,7 +1309,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 	//			}
 	//			else
 	//			{
-	//		
+	//
 	//				GadgetButtonSetData(win, (void *) blah->second.m_profileID);
 	//				win->winEnable(TRUE);
 	//				win->winHide(FALSE);
@@ -1308,7 +1322,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 	//	{
 	//		win->winHide(TRUE);
 	//	}
-	
+
 
 	// set a marker for who won and lost
 	winName.format("ScoreScreen.wnd:GameWindowWinner%d", pos);
@@ -1327,7 +1341,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 	{
 		win->winSetEnabledImage(0, fact->getSideIconImage());
 	}
-	
+
 
 	if ( screenType == SCORESCREEN_SKIRMISH && player->isLocalPlayer() )
 	{
@@ -1336,7 +1350,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 			// If we died, and are watching sparring AIs, we still get the loss.
 			if (player->isPlayerActive())
 			{
-				DEBUG_LOG(("Skipping skirmish stats update: sandbox:%d defeat:%d victory:%d\n",
+				DEBUG_LOG(("Skipping skirmish stats update: sandbox:%d defeat:%d victory:%d",
 					TheGameInfo->isSandbox(), TheVictoryConditions->isLocalAlliedDefeat(), TheVictoryConditions->isLocalAlliedVictory()));
 				return;
 			}
@@ -1388,7 +1402,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					if (TheVictoryConditions->amIObserver())
 					{
 						// nothing to track
-						DEBUG_LOG(("populatePlayerInfo() - not tracking stats for observer\n"));
+						DEBUG_LOG(("populatePlayerInfo() - not tracking stats for observer"));
 						return;
 					}
 					PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(localID);
@@ -1423,28 +1437,28 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 							anyAI = TRUE;
 						}
 					}
-					DEBUG_LOG(("Game ended on frame %d - TheGameLogic->getFrame()=%d\n", lastFrameOfGame-1, TheGameLogic->getFrame()-1));
+					DEBUG_LOG(("Game ended on frame %d - TheGameLogic->getFrame()=%d", lastFrameOfGame-1, TheGameLogic->getFrame()-1));
 					for (i=0; i<MAX_SLOTS; ++i)
 					{
 						const GameSlot *slot = TheGameInfo->getConstSlot(i);
-						DEBUG_LOG(("latestHumanInGame=%d, slot->isOccupied()=%d, slot->disconnected()=%d, slot->isAI()=%d, slot->lastFrameInGame()=%d\n",
+						DEBUG_LOG(("latestHumanInGame=%d, slot->isOccupied()=%d, slot->disconnected()=%d, slot->isAI()=%d, slot->lastFrameInGame()=%d",
 							latestHumanInGame, slot->isOccupied(), slot->disconnected(), slot->isAI(), slot->lastFrameInGame()));
 						if (slot->isOccupied() && slot->disconnected())
 						{
-							DEBUG_LOG(("Marking game as a possible disconnect game\n"));
+							DEBUG_LOG(("Marking game as a possible disconnect game"));
 							sawAnyDisconnects = TRUE;
 						}
 						if (slot->isOccupied() && !slot->disconnected() && i != localSlotNum &&
 							(slot->isAI() || (slot->lastFrameInGame() >= lastFrameOfGame/*TheGameLogic->getFrame()*/-1)))
 						{
-							DEBUG_LOG(("Marking game as not ending in disconnect\n"));
+							DEBUG_LOG(("Marking game as not ending in disconnect"));
 							gameEndedInDisconnect = FALSE;
 						}
 					}
 
 					if (!sawAnyDisconnects)
 					{
-						DEBUG_LOG(("Didn't see any disconnects - making gameEndedInDisconnect == FALSE\n"));
+						DEBUG_LOG(("Didn't see any disconnects - making gameEndedInDisconnect == FALSE"));
 						gameEndedInDisconnect = FALSE;
 					}
 
@@ -1456,20 +1470,20 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 							// check if we were to blame.
 							if (TheNetwork->getPingsRecieved() < max(1, TheNetwork->getPingsSent()/2)) /// @todo: what's a good percent of pings to have gotten?
 							{
-								DEBUG_LOG(("We were to blame.  Leaving gameEndedInDisconnect = true\n"));
+								DEBUG_LOG(("We were to blame.  Leaving gameEndedInDisconnect = true"));
 							}
 							else
 							{
-								DEBUG_LOG(("We were not to blame.  Changing gameEndedInDisconnect = false\n"));
+								DEBUG_LOG(("We were not to blame.  Changing gameEndedInDisconnect = false"));
 								gameEndedInDisconnect = FALSE;
 							}
 						}
 						else
 						{
-							DEBUG_LOG(("gameEndedInDisconnect, and we didn't ping on last frame.  What's up with that?\n"));
+							DEBUG_LOG(("gameEndedInDisconnect, and we didn't ping on last frame.  What's up with that?"));
 						}
 					}
-					
+
 					if (anyAI)
 					{
 						// no stats if any computer controlled forces were in play.
@@ -1477,7 +1491,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					}
 
  					//Remove the extra disconnection we add to all games when they start.
-					DEBUG_LOG(("populatePlayerInfo() - removing extra disconnect\n"));
+					DEBUG_LOG(("populatePlayerInfo() - removing extra disconnect"));
  					if (TheGameSpyInfo)
 						TheGameSpyInfo->updateAdditionalGameSpyDisconnections(-1);
 
@@ -1496,7 +1510,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					}
 					if (!sawEndOfGame)
 					{
-						DEBUG_LOG(("Not sending results - we didn't finish a game\n"));
+						DEBUG_LOG(("Not sending results - we didn't finish a game"));
 						return;
 					}
 
@@ -1507,7 +1521,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 						gameResReq.hostname = TheGameSpyGame->getLadderIP().str();
 						gameResReq.port = TheGameSpyGame->getLadderPort();
 						gameResReq.results = TheGameSpyGame->generateLadderGameResultsPacket().str();
-						DEBUG_ASSERTCRASH(TheGameResultsQueue, ("No Game Results queue!\n"));
+						DEBUG_ASSERTCRASH(TheGameResultsQueue, ("No Game Results queue!"));
 						if (TheGameResultsQueue)
 						{
 							TheGameResultsQueue->addRequest(gameResReq);
@@ -1516,13 +1530,13 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 
 					if (TheVictoryConditions->getEndFrame() < LOGICFRAMES_PER_SECOND * 25 && TheVictoryConditions->getEndFrame())
 					{
-						DEBUG_LOG(("populatePlayerInfo() - not tracking stats for short game\n"));
+						DEBUG_LOG(("populatePlayerInfo() - not tracking stats for short game"));
 						return;
 					}
 
 					// generate and send a gameres packet
 					AsciiString resultsPacket = TheGameSpyGame->generateGameSpyGameResultsPacket();
-					DEBUG_LOG(("About to send results packet: %s\n", resultsPacket.str()));
+					DEBUG_LOG(("About to send results packet: %s", resultsPacket.str()));
 					PSRequest grReq;
 					grReq.requestType = PSRequest::PSREQUEST_SENDGAMERESTOGAMESPY;
 					grReq.results = resultsPacket.str();
@@ -1530,11 +1544,11 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 
 					Int ptIdx;
 					const PlayerTemplate *myTemplate = player->getPlayerTemplate();
-					DEBUG_LOG(("myTemplate = %X(%s)\n", myTemplate, myTemplate->getName().str()));
+					DEBUG_LOG(("myTemplate = %X(%s)", myTemplate, myTemplate->getName().str()));
 					for (ptIdx = 0; ptIdx < ThePlayerTemplateStore->getPlayerTemplateCount(); ++ptIdx)
 					{
 						const PlayerTemplate *nthTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(ptIdx);
-						DEBUG_LOG(("nthTemplate = %X(%s)\n", nthTemplate, nthTemplate->getName().str()));
+						DEBUG_LOG(("nthTemplate = %X(%s)", nthTemplate, nthTemplate->getName().str()));
 						if (nthTemplate == myTemplate)
 						{
 							break;
@@ -1558,7 +1572,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 							SetUnsignedIntInRegistry("", "dc", discons);
 							SetUnsignedIntInRegistry("", "se", syncs);
 							*/
-							DEBUG_LOG(("populatePlayerInfo() - need to save off info for disconnect games!\n"));
+							DEBUG_LOG(("populatePlayerInfo() - need to save off info for disconnect games!"));
 
 							PSRequest req;
 							req.requestType = PSRequest::PSREQUEST_UPDATEPLAYERSTATS;
@@ -1571,7 +1585,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 							req.lastHouse = ptIdx;
 							TheGameSpyPSMessageQueue->addRequest(req);
 						}
-						DEBUG_CRASH(("populatePlayerInfo() - not tracking stats - we haven't gotten the original stuff yet\n"));
+						DEBUG_CRASH(("populatePlayerInfo() - not tracking stats - we haven't gotten the original stuff yet"));
 						return;
 					}
 
@@ -1694,7 +1708,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					stats.surrenders[ptIdx] += TheGameInfo->haveWeSurrendered()  || !TheVictoryConditions->getEndFrame();
 
 					AsciiString systemSpec;
-					systemSpec.format("LOD%d", TheGameLODManager->findStaticLODLevel());
+					systemSpec.format("LOD%d", TheGameLODManager->getRecommendedStaticLODLevel());
 					stats.systemSpec = systemSpec.str();
 
 					stats.techCaptured[ptIdx] += s->getTotalTechBuildingsCaptured();
@@ -1727,7 +1741,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 						updateChallengeMedals(stats.challengeMedals);
 					}
 
-					DEBUG_LOG(("populatePlayerInfo() - tracking stats for %s/%s/%s\n", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
+					DEBUG_LOG(("populatePlayerInfo() - tracking stats for %s/%s/%s", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
 
 					PSRequest req;
 					req.requestType = PSRequest::PSREQUEST_UPDATEPLAYERSTATS;
@@ -1740,7 +1754,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					req.lastHouse = ptIdx;
 					TheGameSpyPSMessageQueue->addRequest(req);
 					TheGameSpyPSMessageQueue->trackPlayerStats(stats);
-					
+
 					// force an update of our shtuff
 					PSResponse newResp;
 					newResp.responseType = PSResponse::PSRESPONSE_PLAYERSTATS;
@@ -1795,7 +1809,7 @@ void grabMultiPlayerInfo( void )
 			Int score = player->getScoreKeeper()->calculateScore();
 			it = scores.find( score );
 			if (it != scores.end())
-			score += adder++;			
+			score += adder++;
 			scores[score] = player;
 			++playerCount;
 		}
@@ -1804,18 +1818,18 @@ void grabMultiPlayerInfo( void )
 	Int count =0;
 	RevScoreMapIt revIt;
 	// display the players based on Score
-	for ( revIt = scores.rbegin(); revIt != scores.rend(); ++revIt) 
+	for ( revIt = scores.rbegin(); revIt != scores.rend(); ++revIt)
 	{
 		Player *p = revIt->second;
 		if(p->isPlayerObserver())
 			setObserverWindows( p, count );
 		else
-			populatePlayerInfo( p, count);	
+			populatePlayerInfo( p, count);
 		count ++;
 	}
-	
+
 	DEBUG_ASSERTCRASH(count == playerCount, ("For some reason we added %d players to the scores map, but only read %d", playerCount, count));
-	
+
 }
 
 enum
@@ -1826,7 +1840,8 @@ enum
 	USA_ENEMY,		// Keep friends with friends, enemys with enemys
 	CHINA_ENEMY,
 	GLA_ENEMY,
-	MAX_RELATIONS // keep me last
+
+	MAX_RELATIONS
 };
 /**	Grab the single player info */
 //-------------------------------------------------------------------------------------------------
@@ -1835,7 +1850,7 @@ void grabSinglePlayerInfo( void )
 	Int playerCount = 0;
 	Player *player, *localPlayer;
 	localPlayer = ThePlayerList->getLocalPlayer();
-	
+
 	if(localPlayer)
 	{
 		if(!localPlayer->isPlayerObserver())
@@ -1876,21 +1891,24 @@ void grabSinglePlayerInfo( void )
 	for(Int j = 0; j < MAX_RELATIONS; ++j )
 	{
 		Bool isFriend = TRUE;
-		
-		// set the string we'll be compairing to
+
+		// set the string we'll be comparing to
 		switch (j) {
 		case USA_ENEMY:
 			isFriend = FALSE;
+			FALLTHROUGH;
 		case USA_FRIEND:
 			side.set("America");
 			break;
 		case CHINA_ENEMY:
 			isFriend = FALSE;
+			FALLTHROUGH;
 		case CHINA_FRIEND:
 			side.set("China");
 			break;
 		case GLA_ENEMY:
-			isFriend = FALSE;	
+			isFriend = FALSE;
+			FALLTHROUGH;
 		case GLA_FRIEND:
 			side.set("GLA");
 			break;
@@ -1910,7 +1928,7 @@ void grabSinglePlayerInfo( void )
 		for(Int i = 0; i < MAX_PLAYER_COUNT; ++i)
 		{
 			player = ThePlayerList->getNthPlayer(i);
-			if(player && player != localPlayer &&	
+			if(player && player != localPlayer &&
 				 player->getSide().compare(side) == 0)
 			{
 				if ((TheGameLogic->isInSinglePlayerGame() == FALSE) || (player->getListInScoreScreen() == TRUE))
@@ -1929,7 +1947,7 @@ void grabSinglePlayerInfo( void )
 						sg.m_totalUnitsLost += sk->getTotalUnitsLost();
 						sg.m_sideImage = player->getPlayerTemplate()->getSideIconImage();
 						color = player->getPlayerColor();
-						populate = TRUE;	
+						populate = TRUE;
 					}
 				}
 			}
@@ -1948,7 +1966,7 @@ void grabSinglePlayerInfo( void )
 		}
 	}
 	hideWindows(playerCount);
-	
+
 }
 
 /** Hide the windows we're not using */
@@ -2010,18 +2028,12 @@ void hideWindows( Int pos )
 		DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
 		win->winHide(TRUE);
 
-		// set the total BuildingsDestroyed
-		winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", i);
-		win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
-		DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
-		win->winHide(TRUE);
-
 		// set the total Resources
 		winName.format("ScoreScreen.wnd:StaticTextResources%d", i);
 		win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
 		DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
 		win->winHide(TRUE);
-		
+
 		// set the total score
 		/*
 winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
@@ -2035,7 +2047,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
 		win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
 		DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
 		win->winHide(TRUE);
-		
+
 
 //		// Set the Game Add Buttons
 //		winName.format("ScoreScreen.wnd:ButtonAdd%d", i);
@@ -2049,27 +2061,21 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
 //-------------------------------------------------------------------------------------------------
 void setObserverWindows( Player *player, Int i )
 {
-	if(i < 0 || i >= MAX_SLOTS)
+	if(!player || i < 0 || i >= MAX_SLOTS)
 		return;
 	AsciiString winName;
 	GameWindow *win;
-	
+
 	Color color = 0xffffffff;
-	
+
 	// set the player name
 	winName.format("ScoreScreen.wnd:StaticTextPlayer%d", i);
 	win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
 	DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
-	if (player)
-	{
-		GadgetStaticTextSetText(win, player->getPlayerDisplayName());
-		win->winHide(FALSE);
-		win->winSetEnabledTextColors(color, win->winGetEnabledTextBorderColor());
-	}
-	else
-	{
-		win->winHide(TRUE);
-	}
+
+	GadgetStaticTextSetText(win, player->getPlayerDisplayName());
+	win->winHide(FALSE);
+	win->winSetEnabledTextColors(color, win->winGetEnabledTextBorderColor());
 
 	// set the player name
 	winName.format("ScoreScreen.wnd:StaticTextObserver%d", i);
@@ -2114,18 +2120,12 @@ void setObserverWindows( Player *player, Int i )
 	DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
 	win->winHide(TRUE);
 
-	// set the total BuildingsDestroyed
-	winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", i);
-	win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
-	DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
-	win->winHide(TRUE);
-
 	// set the total Resources
 	winName.format("ScoreScreen.wnd:StaticTextResources%d", i);
 	win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
 	DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
 	win->winHide(TRUE);
-	
+
 	// set the total score
 	/*
 winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
@@ -2144,7 +2144,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
 	{
 		win->winSetEnabledImage(0, fact->getSideIconImage());
 	}
-	
+
 //	// set the Buttons
 //	winName.format("ScoreScreen.wnd:ButtonAdd%d", i);
 //	win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
@@ -2156,14 +2156,14 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
 //	if(screenType ==	SCORESCREEN_INTERNET && TheGameSpyInfo && TheGameSpyInfo->getLocalProfileID() != 0)
 //	{
 //		// Get the stats for the player
-//		
+//
 //		AsciiString aName;
 //		aName.translate(player->getPlayerDisplayName());
 //
 //		PlayerInfoMap::iterator blah = TheGameSpyInfo->getPlayerInfoMap()->find(aName);
 //		if(blah->second.m_profileID != 0)
 //		{
-//			
+//
 //			BuddyInfoMap::iterator bIt = TheGameSpyInfo->getBuddyMap()->find(blah->second.m_profileID);
 //			if(bIt !=  TheGameSpyInfo->getBuddyMap()->end()  || (TheGameSpyInfo->getLocalProfileID() == blah->second.m_profileID))
 //			{
@@ -2172,7 +2172,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
 //			}
 //			else
 //			{
-//		
+//
 //				GadgetButtonSetData(win, (void *) blah->second.m_profileID);
 //				win->winEnable(TRUE);
 //				win->winHide(FALSE);
@@ -2196,7 +2196,7 @@ void populateSideInfo( UnicodeString side,ScoreGather *sg, Int pos, Color color)
 {
 	if(pos < 0 || pos > MAX_SLOTS)
 		return;
-	
+
 	AsciiString winName;
 	UnicodeString winValue;
 	GameWindow *win;
@@ -2294,7 +2294,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 	DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
 	if(sg->m_sideImage)
 	{
-		win->winHide(FALSE);	
+		win->winHide(FALSE);
 		win->winSetEnabledImage(0, sg->m_sideImage);
 	}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
index fba94d2b962..50789948919 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "GameClient/AnimateWindowManager.h"
@@ -54,7 +54,7 @@ static void shutdownComplete( WindowLayout *layout )
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the single player menu */
@@ -69,27 +69,26 @@ void SinglePlayerMenuInit( WindowLayout *layout, void *userData )
 	layout->hide( FALSE );
 
 	// set keyboard focus to main parent
-	AsciiString parentName( "SinglePlayerMenu.wnd:SinglePlayerMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:SinglePlayerMenuParent" );
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	TheWindowManager->winSetFocus( parent );
 
-	NameKeyType buttonNewID = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonNew") );
+	NameKeyType buttonNewID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonNew" );
 	GameWindow *buttonNew = TheWindowManager->winGetWindowFromId( NULL, buttonNewID );
 	TheShell->registerWithAnimateManager(buttonNew, WIN_ANIMATION_SLIDE_LEFT, TRUE,1);
 
-	NameKeyType buttonLoadID = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonLoad") );
+	NameKeyType buttonLoadID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonLoad" );
 	GameWindow *buttonLoad = TheWindowManager->winGetWindowFromId( NULL, buttonLoadID );
 	TheShell->registerWithAnimateManager(buttonLoad, WIN_ANIMATION_SLIDE_LEFT, TRUE,200);
 
-	NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonBack") );
+	NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonBack" );
 	GameWindow *buttonBack = TheWindowManager->winGetWindowFromId( NULL, buttonBackID );
 	TheShell->registerWithAnimateManager(buttonBack, WIN_ANIMATION_SLIDE_RIGHT, TRUE,1);
 
 
 	//TheShell->registerWithAnimateManager(parent, WIN_ANIMATION_SLIDE_TOP, TRUE);
 
-}  // end SinglePlayerMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu shutdown method */
@@ -106,11 +105,11 @@ void SinglePlayerMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 
-}  // end SinglePlayerMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu update method */
@@ -118,11 +117,11 @@ void SinglePlayerMenuShutdown( WindowLayout *layout, void *userData )
 void SinglePlayerMenuUpdate( WindowLayout *layout, void *userData )
 {
 
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished())
 		shutdownComplete(layout);
 
-}  // end SinglePlayerMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** SinglePlayer menu input callback */
@@ -131,7 +130,7 @@ WindowMsgHandledType SinglePlayerMenuInput( GameWindow *window, UnsignedInt msg,
 																						WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -148,48 +147,47 @@ WindowMsgHandledType SinglePlayerMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "SinglePlayerMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end SinglePlayerMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	static NameKeyType buttonNew = NAMEKEY_INVALID;
 	static NameKeyType buttonLoad = NAMEKEY_INVALID;
 	static NameKeyType buttonBack = NAMEKEY_INVALID;
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -197,13 +195,13 @@ WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg
 		{
 
 			// get ids for our children controls
-			buttonNew = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonNew") );
-			buttonLoad = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonLoad") );
-			buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonBack") );
+			buttonNew = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonNew" );
+			buttonLoad = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonLoad" );
+			buttonBack = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonBack" );
 
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -211,7 +209,7 @@ WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -223,7 +221,7 @@ WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -237,31 +235,31 @@ WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg
 			{
 
 				// open up the map select menu
-				TheShell->push( AsciiString( "Menus/MapSelectMenu.wnd" ) );
+				TheShell->push( "Menus/MapSelectMenu.wnd" );
 				buttonPushed = true;
 
-			}  // end if
+			}
 			else if( controlID == buttonLoad )
 			{
 
-			}  // end else if
+			}
 			else if( controlID == buttonBack )
 			{
 
 				// thou art directed to return to thy known solar system immediately!
 				TheShell->pop();
 				buttonPushed = true;
-				
-			}  // end else if
+
+			}
 
 			break;
 
-		}  // end selected
-		
+		}
+
 		default:
 			return MSG_IGNORED;
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
-}  // end SinglePlayerMenuSystem
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
index f0150457158..4386c5fd91c 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
@@ -28,7 +28,7 @@
 // Description: Lan Game Options Menu
 ///////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/BattleHonors.h"
@@ -68,11 +68,6 @@
 #include "GameNetwork/IPEnumeration.h"
 #include "WWDownload/Registry.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 SkirmishGameInfo *TheSkirmishGameInfo = NULL;
 
@@ -115,7 +110,7 @@ static NameKeyType buttonStartID = NAMEKEY_INVALID;
 static NameKeyType buttonSelectMapID = NAMEKEY_INVALID;
 static NameKeyType buttonResetID = NAMEKEY_INVALID;
 static NameKeyType windowMapID = NAMEKEY_INVALID;
-static NameKeyType sliderGameSpeedID = NAMEKEY_INVALID; 
+static NameKeyType sliderGameSpeedID = NAMEKEY_INVALID;
 static NameKeyType staticTextGameSpeedID = NAMEKEY_INVALID;
 // Window Pointers ------------------------------------------------------------------------
 static GameWindow *staticTextGameSpeed = NULL;
@@ -221,7 +216,7 @@ UnicodeString SkirmishPreferences::getUserName(void)
 		ret.translate(IPs.getMachineName());
 		return ret;
 	}
-	
+
 	return ret;
 }
 
@@ -295,10 +290,54 @@ AsciiString SkirmishPreferences::getPreferredMap(void)
 		ret = getDefaultMap(TRUE);
 		return ret;
 	}
-	
+
 	return ret;
 }
 
+static const char superweaponRestrictionKey[] = "SuperweaponRestrict";
+
+Bool SkirmishPreferences::getSuperweaponRestricted(void) const
+{
+  const_iterator it = find(superweaponRestrictionKey);
+  if (it == end())
+  {
+    return false;
+  }
+
+  return ( it->second.compareNoCase( "yes" ) == 0 );
+}
+
+void SkirmishPreferences::setSuperweaponRestricted( Bool superweaponRestricted )
+{
+  (*this)[superweaponRestrictionKey] = superweaponRestricted ? "Yes" : "No";
+}
+
+static const char startingCashKey[] = "StartingCash";
+Money SkirmishPreferences::getStartingCash(void) const
+{
+  const_iterator it = find(startingCashKey);
+  if (it == end())
+  {
+    return TheMultiplayerSettings->getDefaultStartingMoney();
+  }
+
+  Money money;
+  money.deposit( strtoul( it->second.str(), NULL, 10 ), FALSE, FALSE );
+
+  return money;
+}
+
+void SkirmishPreferences::setStartingCash( const Money & startingCash )
+{
+  AsciiString option;
+
+  option.format( "%d", startingCash.countMoney() );
+
+  (*this)[startingCashKey] = option;
+}
+
+
+
 Bool SkirmishPreferences::write(void)
 {
 	if (!TheSkirmishGameInfo)
@@ -318,7 +357,7 @@ Bool SkirmishPreferences::write(void)
 
 	setSlotList();
 
-//	NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) );
+//	NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" );
 	GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID );
 	Int maxFPS = GadgetSliderGetPosition( sliderGameSpeed );
 	setInt("FPS", maxFPS);
@@ -376,11 +415,11 @@ void reallyDoStart( void )
 {
 	if (TheGameLogic->isInGame())
 		TheGameLogic->clearGameData(FALSE);
-	
-	//NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) );
+
+	//NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" );
 	GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID );
 	Int maxFPS = GadgetSliderGetPosition( sliderGameSpeed );
-	DEBUG_LOG(("GameSpeedSlider was at %d\n", maxFPS));
+	DEBUG_LOG(("GameSpeedSlider was at %d", maxFPS));
 	if (maxFPS > GREATER_NO_FPS_LIMIT)
 		maxFPS = 1000;
 	if (maxFPS < 15)
@@ -423,7 +462,7 @@ static MessageBoxReturnType cancelStartBecauseOfNoCD( void *userData )
 
 Bool IsFirstCDPresent(void)
 {
-#if !defined(RTS_INTERNAL) && !defined(RTS_DEBUG)
+#if !defined(RTS_DEBUG)
 	return TheFileSystem->areMusicFilesOnCD();
 #else
 	return TRUE;
@@ -492,19 +531,17 @@ static void startPressed(void)
 	{
 		isReady = TRUE;
 	}
-	
+
 	if(isReady)
 	{
 		CheckForCDAtGameStart( reallyDoStart );
 	}
 
-}//void startPressed(void)
+}
 
 /////////////////////////////////////////////////////
-// MapSelectorTooltip - shows tooltips for the tech buildings 
+// MapSelectorTooltip - shows tooltips for the tech buildings
 //											and supply depots
-// Added By : Sadullah Nader
-/////////////////////////////////////////////////////
 void MapSelectorTooltip(GameWindow *window,
 												WinInstanceData *instData,
 												UnsignedInt mouse)
@@ -522,13 +559,13 @@ void MapSelectorTooltip(GameWindow *window,
 
 	ICoord2DList::iterator it = TheSupplyAndTechImageLocations.m_techPosList.begin();
 	ICoord2DList::iterator it2 = TheSupplyAndTechImageLocations.m_supplyPosList.begin();
-	
+
 	if( image )
 	{
-		// Check to see if we mouse over a tech building 
+		// Check to see if we mouse over a tech building
 		while(it != TheSupplyAndTechImageLocations.m_techPosList.end())
 		{
-			if ((x > (pixelX + it->x) && x < (pixelX + it->x + SUPPLY_TECH_SIZE)) 
+			if ((x > (pixelX + it->x) && x < (pixelX + it->x + SUPPLY_TECH_SIZE))
 				  && ( y > (pixelY + it->y) && y < (pixelY + it->y + SUPPLY_TECH_SIZE)))
 			{
 				TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:TechBuilding"), -1, NULL); //, 1.5f
@@ -552,7 +589,7 @@ void MapSelectorTooltip(GameWindow *window,
 			it2++;
 		}
 	}
-	
+
 }
 
 void positionStartSpotControls( GameWindow *win, GameWindow *mapWindow, Coord3D *pos, MapMetaData *mmd, GameWindow *buttonMapStartPositions[])
@@ -568,7 +605,7 @@ void positionStartSpotControls( GameWindow *win, GameWindow *mapWindow, Coord3D
 	findDrawPositions(0,0, winMapSize.x, winMapSize.y,mmd->m_extent, &ul, &lr);
 	Int smallWidth = lr.x - ul.x;
 	Int smallHeight= lr.y - ul.y;
-	
+
 	// When we actually draw the map, save off it's screen position and use that instead of the map window's position/size
 	Real position;
 	position = (pos->x - mmd->m_extent.lo.x) / (mmd->m_extent.hi.x - mmd->m_extent.lo.x);
@@ -576,8 +613,8 @@ void positionStartSpotControls( GameWindow *win, GameWindow *mapWindow, Coord3D
 
 	position = (pos->y - mmd->m_extent.lo.y) / (mmd->m_extent.hi.y - mmd->m_extent.lo.y);
 	gadgetPos.y = ((1- position) * smallHeight) - gadgetSize.y /2 + ul.y;// + winMapPos.y;
-	
-	
+
+
 
 	// loop through and make sure we're not on top of anyone else
 	for(Int i = 0; i < MAX_SLOTS; ++i)
@@ -630,12 +667,12 @@ void positionAdditionalImages( MapMetaData *mmd, GameWindow *mapWindow, Bool for
 	findDrawPositions(0,0, winMapSize.x, winMapSize.y,mmd->m_extent, &ul, &lr);
 	Int smallWidth = lr.x - ul.x;
 	Int smallHeight= lr.y - ul.y;
-	
+
 	Coord3DList::iterator it = mmd->m_supplyPositions.begin();
 		// loop through and make sure we're not on top of anyone else
 	while( it != mmd->m_supplyPositions.end())
 	{
-		
+
 		ICoord2D markerPos;
 
 		// When we actually draw the map, save off it's screen position and use that instead of the map window's position/size
@@ -704,7 +741,7 @@ void positionStartSpots( AsciiString mapName, GameWindow *buttonMapStartPosition
 	else
 	{
 		MapMetaData mmd = it->second;
-		
+
 		Image *image = getMapPreviewImage(mapName);
 		if (mapWindow != NULL) {
 			mapWindow->winSetUserData((void *)TheMapCache->findMap(mapName));
@@ -732,7 +769,7 @@ void positionStartSpots( AsciiString mapName, GameWindow *buttonMapStartPosition
 
 		positionAdditionalImages(&mmd, mapWindow, TRUE);
 
-		AsciiString waypointName;				
+		AsciiString waypointName;
 		Int i = 0;
 		for(; i < mmd.m_numPlayers && mmd.m_isMultiplayer; ++i )
 		{
@@ -751,7 +788,7 @@ void positionStartSpots( AsciiString mapName, GameWindow *buttonMapStartPosition
 			{
 				DEBUG_ASSERTCRASH(FALSE,("positionStartSpots:: someone messed with the map cash.  We couldn't find waypoint <%s> in map <%s>", waypointName.str(),lowerMap.str()));
 			}
-		}	
+		}
 		// hide the rest
 		for (; i < MAX_SLOTS; ++i)
 		{
@@ -779,7 +816,7 @@ void positionStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[]
 			}
 		}
 	}
-	positionStartSpots(localMapFname, buttonMapStartPositions, mapWindow);	
+	positionStartSpots(localMapFname, buttonMapStartPositions, mapWindow);
 }
 
 void updateMapStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[], Bool onLoadScreen )
@@ -834,8 +871,6 @@ void updateMapStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[
 				AsciiString displayNumber;
 				displayNumber.format("NUMBER:%d",i + 1);
 				GadgetButtonSetText(buttonMapStartPositions[gs->getStartPos()], TheGameText->fetch(displayNumber));
-				//Added By Sadullah Nader
-				//Fix for no tooltips at start positions
 				//added start position tooltip
 				//Fixed again to show the right number , ie "i + 1"
 				UnicodeString temp;
@@ -864,7 +899,7 @@ static void handlePlayerSelection(int index)
     if(!slot)
       return;
     slot->setState(SlotState(playerType), title);
-    
+
 	}
   //skirmishUpdateSlotList();
 }
@@ -989,14 +1024,14 @@ static void handleTeamSelection(int index)
 void InitSkirmishGameGadgets( void )
 {
 	//Initialize the gadget IDs
-	parentSkirmishGameOptionsID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SkirmishGameOptionsMenuParent" ) );
-	buttonExitID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonBack" ) );
-	buttonStartID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonStart" ) );
-	textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:TextEntryMapDisplay" ) );
-	buttonSelectMapID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonSelectMap" ) );
-	buttonResetID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonReset" ) );
-	windowMapID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:MapWindow" ) );
-	staticTextGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:StaticTextGameSpeed" ) );
+	parentSkirmishGameOptionsID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SkirmishGameOptionsMenuParent" );
+	buttonExitID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonBack" );
+	buttonStartID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonStart" );
+	textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:TextEntryMapDisplay" );
+	buttonSelectMapID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonSelectMap" );
+	buttonResetID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonReset" );
+	windowMapID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:MapWindow" );
+	staticTextGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:StaticTextGameSpeed" );
 	// Initialize the pointers to our gadgets
 	parentSkirmishGameOptions = TheWindowManager->winGetWindowFromId( NULL, parentSkirmishGameOptionsID );
 	DEBUG_ASSERTCRASH(parentSkirmishGameOptions, ("Could not find the parentSkirmishGameOptions" ));
@@ -1013,10 +1048,10 @@ void InitSkirmishGameGadgets( void )
 	staticTextGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, staticTextGameSpeedID );
 	DEBUG_ASSERTCRASH(staticTextGameSpeed, ("Could not find the staticTextGameSpeed"));
 
-	textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:TextEntryPlayerName" ) );
+	textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:TextEntryPlayerName" );
   textEntryPlayerName = TheWindowManager->winGetWindowFromId( NULL, textEntryPlayerNameID );
 	DEBUG_ASSERTCRASH(textEntryPlayerName, ("Could not find the textEntryPlayerName" ));
-	
+
 	windowMap = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions,windowMapID  );
 	DEBUG_ASSERTCRASH(windowMap, ("Could not find the SkirmishGameOptionsMenu.wnd:MapWindow" ));
 
@@ -1033,7 +1068,7 @@ void InitSkirmishGameGadgets( void )
 		  comboBoxPlayer[i] = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, comboBoxPlayerID[i] );
 		  GadgetComboBoxReset(comboBoxPlayer[i]);
 		  //GadgetComboBoxGetEditBox(comboBoxPlayer[i])->winSetTooltipFunc(playerTooltip);
-    }    
+    }
 		Color white = GameMakeColor( 255, 255, 255, 255 );
 
 		if( i == 0 )
@@ -1062,18 +1097,18 @@ void InitSkirmishGameGadgets( void )
 		comboBoxColorID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		comboBoxColor[i] = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, comboBoxColorID[i] );
 		DEBUG_ASSERTCRASH(comboBoxColor[i], ("Could not find the comboBoxColor[%d]",i ));
-		
+
 		tmpString.format("SkirmishGameOptionsMenu.wnd:ComboBoxPlayerTemplate%d", i);
 		comboBoxPlayerTemplateID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		comboBoxPlayerTemplate[i] = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, comboBoxPlayerTemplateID[i] );
 		DEBUG_ASSERTCRASH(comboBoxPlayerTemplate[i], ("Could not find the comboBoxPlayerTemplate[%d]",i ));
-		
+
 
 		tmpString.format("SkirmishGameOptionsMenu.wnd:ComboBoxTeam%d", i);
 		comboBoxTeamID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		comboBoxTeam[i] = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, comboBoxTeamID[i] );
 		DEBUG_ASSERTCRASH(comboBoxTeam[i], ("Could not find the comboBoxTeam[%d]",i ));
-		
+
 //		tmpString.format("SkirmishGameOptionsMenu.wnd:ButtonStartPosition%d", i);
 //		buttonStartPositionID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 //		buttonStartPosition[i] = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, buttonStartPositionID[i] );
@@ -1084,7 +1119,7 @@ void InitSkirmishGameGadgets( void )
 		buttonMapStartPosition[i] = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, buttonMapStartPositionID[i] );
 		DEBUG_ASSERTCRASH(buttonMapStartPosition[i], ("Could not find the ButtonMapStartPosition[%d]",i ));
 	}
-   
+
 	for (i = 0; i < MAX_SLOTS; ++i)
 	{
 		PopulateColorComboBox(i, comboBoxColor, TheSkirmishGameInfo );
@@ -1095,7 +1130,7 @@ void InitSkirmishGameGadgets( void )
 //		if (buttonStartPosition[i])
 //			buttonStartPosition[i]->winHide(TRUE); // not using these right now
 	}
-	
+
 	populateSkirmishBattleHonors();
 }
 
@@ -1144,7 +1179,7 @@ static const char *gadgetsToHide[] =
 	"StaticTextColor",
 	"StaticTextTeam",
 	"StaticTextFaction",
-	NULL // keep this last
+	NULL
 };
 static const char *perPlayerGadgetsToHide[] =
 {
@@ -1152,7 +1187,7 @@ static const char *perPlayerGadgetsToHide[] =
 	"ComboBoxTeam",
 	"ComboBoxColor",
 	"ComboBoxPlayerTemplate",
-	NULL // keep this last
+	NULL
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -1195,9 +1230,9 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
 {
 	if (TheGameEngine->getQuitting())
 		return;
-	
-	sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) );
-	
+
+	sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" );
+
 	sandboxOk = FALSE;
   doUpdateSlotList = FALSE;
   if( !TheSkirmishGameInfo )
@@ -1213,7 +1248,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
 	{
 		SignalUIInteraction(SHELL_SCRIPT_HOOK_SKIRMISH_OPENED);
 	}
-  TheSkirmishGameInfo->init();  
+  TheSkirmishGameInfo->init();
   TheSkirmishGameInfo->clearSlotList();
 	TheSkirmishGameInfo->reset();
   Int localIP = TheSkirmishGameInfo->getSlot(0)->getIP();
@@ -1279,7 +1314,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
 	//initSkirmishGameOptions();
 
 	// set up the game speed slider
-//	NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) );
+//	NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" );
 	GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID );
 	Int sliderPos = max(15,min(61,prefs.getInt("FPS", TheGlobalData->m_framesPerSecondLimit)));
 	GadgetSliderSetPosition( sliderGameSpeed, sliderPos );
@@ -1299,7 +1334,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
 
 	// Show the Menu
 	layout->hide( FALSE );
-	
+
 	// Set Keyboard to Main Parent
 	TheWindowManager->winSetFocus( parentSkirmishGameOptions );
 
@@ -1314,7 +1349,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
 	if(win)
 		win->winHide(TRUE);
 	buttonPushed = FALSE;
-}// void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -1338,7 +1373,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	//LANnextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Skirmish Game Options menu shutdown method */
@@ -1357,17 +1392,17 @@ void SkirmishGameOptionsMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 
-	
+
 	// hide menu
 //	layout->hide( TRUE );
 
 	// our shutdown is complete
 	TheTransitionHandler->reverse("SkirmishGameOptionsMenuFade");
-}  // void SkirmishGameOptionsMenuShutdown( WindowLayout *layout, void *userData )
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Skirmish Game Options menu update method */
@@ -1394,7 +1429,7 @@ void SkirmishGameOptionsMenuUpdate( WindowLayout * layout, void *userData)
 
 	if(TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 			TheShell->shutdownComplete( layout );
-}// void SkirmishGameOptionsMenuUpdate( WindowLayout * layout, void *userData)
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Skirmish Game Options menu input callback */
@@ -1402,7 +1437,7 @@ void SkirmishGameOptionsMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType SkirmishGameOptionsMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1422,48 +1457,51 @@ WindowMsgHandledType SkirmishGameOptionsMenuInput( GameWindow *window, UnsignedI
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonExit, buttonExitID );
-					}  // end if
+					}
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
-				}  // end escape
-			}  // end switch( key )
-		}  // end char
+				}
+			}
+		}
 		break;
-	}  // end switch( msg )
+	}
 	return MSG_IGNORED;
-}//WindowMsgHandledType SkirmishGameOptionsMenuInput( GameWindow *window, UnsignedInt msg,
+}
 
 
 //-------------------------------------------------------------------------------------------------
 /** Skirmish Game Options menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 	switch( msg )
 	{
-		//-------------------------------------------------------------------------------------------------	
+		//-------------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 			{
+				if (windowMap)
+					windowMap->winSetUserData(NULL);
+
 				break;
-			} // case GWM_DESTROY:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
 			{
@@ -1490,7 +1528,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
 				}
 				sandboxOk = FALSE;
         skirmishUpdateSlotList();
-			}// case GCM_SELECTED:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GSM_SLIDER_TRACK:
 		{
@@ -1501,14 +1539,15 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
 			{
 				setFPSTextBox(sliderPos);
 			}
+			break;
 		}
 		//-------------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 			{
-				
+
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-///				static NameKeyType buttonResetFPSID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonResetFPS" ) );
+///				static NameKeyType buttonResetFPSID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonResetFPS" );
 				if(buttonPushed)
 					break;
 				if ( controlID == buttonExitID )
@@ -1526,10 +1565,10 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
           delete TheSkirmishGameInfo;
           TheSkirmishGameInfo = NULL;
 
-				} //if ( controlID == buttonBack )
+				}
 //				else if ( controlID == buttonResetFPSID )
 //				{
-//					static NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) );
+//					static NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" );
 //					GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID );
 //					GadgetSliderSetPosition( sliderGameSpeed, TheGlobalData->m_framesPerSecondLimit );
 //				}
@@ -1537,7 +1576,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
 				{
 					sandboxOk = FALSE;
 					//buttonBack->winEnable( false );
-					skirmishMapSelectLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/SkirmishMapSelectMenu.wnd" ) );
+					skirmishMapSelectLayout = TheWindowManager->winCreateLayout( "Menus/SkirmishMapSelectMenu.wnd" );
 					skirmishMapSelectLayout->runInit();
 					skirmishMapSelectLayout->hide( FALSE );
 					skirmishMapSelectLayout->bringForward();
@@ -1602,7 +1641,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
 					}
 				}
 				break;
-			}// case GBM_SELECTED:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GBM_SELECTED_RIGHT:
 		{
@@ -1634,7 +1673,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
 						sandboxOk = FALSE;
 					}
 				}
-			}					
+			}
 			break;
 		}
 		//-------------------------------------------------------------------------------------------------
@@ -1654,7 +1693,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
 		//-------------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
-	}//Switch
+	}
 	return MSG_HANDLED;
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp
index 18abf1fe146..805f8415cf1 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/MessageStream.h"
@@ -67,9 +67,13 @@ static NameKeyType winMapPreviewID = NAMEKEY_INVALID;
 
 static void NullifyControls()
 {
-	mapList = NULL;
-	winMapPreview = NULL;
 	parent = NULL;
+	mapList = NULL;
+	if (winMapPreview)
+	{
+		winMapPreview->winSetUserData(NULL);
+		winMapPreview = NULL;
+	}
 	for (Int i=0; i<MAX_SLOTS; ++i)
 	{
 		buttonMapStartPosition[i] = NULL;
@@ -122,9 +126,8 @@ void positionStartSpots( AsciiString mapName, GameWindow *buttonMapStartPosition
 void skirmishPositionStartSpots( void );
 void skirmishUpdateSlotList( void );
 void showSkirmishGameOptionsUnderlyingGUIElements( Bool show )
-{                          
-	AsciiString parentName( "SkirmishGameOptionsMenu.wnd:SkirmishGameOptionsMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+{
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SkirmishGameOptionsMenuParent" );
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	if (!parent)
 		return;
@@ -245,8 +248,7 @@ void SkirmishMapSelectMenuInit( WindowLayout *layout, void *userData )
 {
 
 	// set keyboard focus to main parent
-	AsciiString parentName( "SkirmishMapSelectMenu.wnd:SkrimishMapSelectMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:SkrimishMapSelectMenuParent" );
 	parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 
 	TheWindowManager->winSetFocus( parent );
@@ -260,13 +262,13 @@ void SkirmishMapSelectMenuInit( WindowLayout *layout, void *userData )
 		usesSystemMapDir = mmd->m_isOfficial;
 	}
 
-	winMapPreviewID = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:WinMapPreview") );
+	winMapPreviewID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:WinMapPreview" );
 	winMapPreview = TheWindowManager->winGetWindowFromId(parent, winMapPreviewID);
 
 
-	buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:ButtonBack") );
-	buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:ButtonOK") );
-	listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:ListboxMap") );
+	buttonBack = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ButtonBack" );
+	buttonOK = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ButtonOK" );
+	listboxMap = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ListboxMap" );
 
 	radioButtonSystemMapsID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:RadioButtonSystemMaps" );
 	radioButtonUserMapsID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:RadioButtonUserMaps" );
@@ -291,8 +293,7 @@ void SkirmishMapSelectMenuInit( WindowLayout *layout, void *userData )
 	showSkirmishGameOptionsUnderlyingGUIElements(FALSE);
 
 	// get the listbox window
-	AsciiString listString( "SkirmishMapSelectMenu.wnd:ListboxMap" );
-	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( listString );
+	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ListboxMap" );
 	mapList = TheWindowManager->winGetWindowFromId( parent, mapListID );
 	if( mapList )
 	{
@@ -310,7 +311,7 @@ void SkirmishMapSelectMenuInit( WindowLayout *layout, void *userData )
 		mapList->winSetTooltipFunc(mapListTooltipFunc);
 	}
 
-}  // end SkirmishMapSelectMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu shutdown method */
@@ -320,13 +321,13 @@ void SkirmishMapSelectMenuShutdown( WindowLayout *layout, void *userData )
 
 	// hide menu
 	layout->hide( TRUE );
-	
+
 	NullifyControls();
-	
+
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end LanMapSelectMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu update method */
@@ -334,7 +335,7 @@ void SkirmishMapSelectMenuShutdown( WindowLayout *layout, void *userData )
 void SkirmishMapSelectMenuUpdate( WindowLayout *layout, void *userData )
 {
 
-}  // end SkirmishMapSelectMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Map select menu input callback */
@@ -343,7 +344,7 @@ WindowMsgHandledType SkirmishMapSelectMenuInput( GameWindow *window, UnsignedInt
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -358,45 +359,44 @@ WindowMsgHandledType SkirmishMapSelectMenuInput( GameWindow *window, UnsignedInt
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "SkirmishMapSelectMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end SkirmishMapSelectMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -404,7 +404,7 @@ WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedIn
 		{
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -412,7 +412,7 @@ WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedIn
 			NullifyControls();
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -424,23 +424,23 @@ WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedIn
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GLM_DOUBLE_CLICKED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						GadgetListBoxSetSelected( control, rowSelected );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonOK );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonOK );
 					}
 				}
@@ -453,7 +453,7 @@ WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedIn
 
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
 					if( rowSelected < 0 )
@@ -532,7 +532,7 @@ WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedIn
 				//TheShell->pop();
 				//do you need this ??
 				//PostToLanGameOptions( MAP_BACK );
-			}  // end if
+			}
 			else if ( controlID == buttonOK )
 			{
 
@@ -595,18 +595,18 @@ WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedIn
 					}
 					//TheShell->pop();
 
-				}  // end if
-			}  // end else if
+				}
+			}
 
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end SkirmishMapSelectMenuSystem*/
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
index c394bff6cb8..afba8a27e04 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioEventRTS.h"
 #include "Common/PlayerList.h"
@@ -57,11 +57,6 @@
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // window ids ------------------------------------------------------------------------------
 static NameKeyType parentID = NAMEKEY_INVALID;
@@ -171,20 +166,20 @@ void InitBuddyControls(Int type)
 		buddyControls.isInit = FALSE;
 	break;
 	case BUDDY_WINDOW_BUDDIES:
-		buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:TextEntryChat" ) );
+		buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:TextEntryChat" );
 		buddyControls.textEntryEdit = TheWindowManager->winGetWindowFromId(NULL,  buddyControls.textEntryEditID);
-		buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddies" ) );
-		buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddyChat" ) );
+		buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddies" );
+		buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddyChat" );
 		buddyControls.listboxBuddies = TheWindowManager->winGetWindowFromId( NULL,  buddyControls.listboxBuddiesID );
 		buddyControls.listboxChat = TheWindowManager->winGetWindowFromId( NULL,  buddyControls.listboxChatID);
 		GadgetTextEntrySetText(buddyControls.textEntryEdit, UnicodeString::TheEmptyString);
 		buddyControls.isInit = TRUE;
 		break;
 	case BUDDY_WINDOW_DIPLOMACY:
-		buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( AsciiString( "Diplomacy.wnd:TextEntryChat" ) );
+		buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( "Diplomacy.wnd:TextEntryChat" );
 		buddyControls.textEntryEdit = TheWindowManager->winGetWindowFromId(NULL,  buddyControls.textEntryEditID);
-		buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "Diplomacy.wnd:ListboxBuddies" ) );
-		buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( AsciiString( "Diplomacy.wnd:ListboxBuddyChat" ) );
+		buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( "Diplomacy.wnd:ListboxBuddies" );
+		buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( "Diplomacy.wnd:ListboxBuddyChat" );
 		buddyControls.listboxBuddies = TheWindowManager->winGetWindowFromId( NULL,  buddyControls.listboxBuddiesID );
 		buddyControls.listboxChat = TheWindowManager->winGetWindowFromId( NULL,  buddyControls.listboxChatID);
 		GadgetTextEntrySetText(buddyControls.textEntryEdit, UnicodeString::TheEmptyString);
@@ -195,10 +190,10 @@ void InitBuddyControls(Int type)
 	default:
 		DEBUG_ASSERTCRASH(FALSE, ("Well, you really shouldn't have gotten here, if you really care about GUI Bugs, search for this string, you you don't care, call chris (who probably doesn't care either"));
 	}
-	
+
 }
 
-WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2)
 {
 	if(!TheGameSpyInfo || TheGameSpyInfo->getLocalProfileID() == 0 || !buddyControls.isInit)
@@ -213,7 +208,7 @@ WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
 
-				if( controlID == buddyControls.listboxBuddiesID ) 
+				if( controlID == buddyControls.listboxBuddiesID )
 				{
 					RightClickStruct *rc = (RightClickStruct *)mData2;
 					WindowLayout *rcLayout;
@@ -226,17 +221,17 @@ WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 
 					GadgetListBoxSetSelected(control, rc->pos);
 					if (itemType == ITEM_BUDDY)
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddiesMenu.wnd"));
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddiesMenu.wnd");
 					else if (itemType == ITEM_REQUEST)
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddyRequestMenu.wnd"));
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddyRequestMenu.wnd");
 					else
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNonBuddiesMenu.wnd"));
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCNonBuddiesMenu.wnd");
 					rcMenu = rcLayout->getFirstWindow();
 					rcMenu->winGetLayout()->runInit();
 					rcMenu->winBringToTop();
 					rcMenu->winHide(FALSE);
-					
-					
+
+
 					ICoord2D rcSize, rcPos;
 					rcMenu->winGetSize(&rcSize.x, &rcSize.y);
 					rcPos.x = rc->mouseX;
@@ -247,7 +242,7 @@ WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 						rcPos.y = TheDisplay->getHeight() - rcSize.y;
 					rcMenu->winSetPosition(rcPos.x, rcPos.y);
 
-					
+
 					GameSpyRCMenuData *rcData = NEW GameSpyRCMenuData;
 					rcData->m_id = profileID;
 					rcData->m_nick.translate(nick);
@@ -278,14 +273,14 @@ WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 					if (recipIt == m->end())
 						break;
 
-					DEBUG_LOG(("Trying to send a buddy message to %d.\n", selectedProfile));
+					DEBUG_LOG(("Trying to send a buddy message to %d.", selectedProfile));
 					if (TheGameSpyGame && TheGameSpyGame->isInGame() && TheGameSpyGame->isGameInProgress() &&
 						!ThePlayerList->getLocalPlayer()->isPlayerActive())
 					{
-						DEBUG_LOG(("I'm dead - gotta look for cheats.\n"));
+						DEBUG_LOG(("I'm dead - gotta look for cheats."));
 						for (Int i=0; i<MAX_SLOTS; ++i)
 						{
-							DEBUG_LOG(("Slot[%d] profile is %d\n", i, TheGameSpyGame->getGameSpySlot(i)->getProfileID()));
+							DEBUG_LOG(("Slot[%d] profile is %d", i, TheGameSpyGame->getGameSpySlot(i)->getProfileID()));
 							if (TheGameSpyGame->getGameSpySlot(i)->getProfileID() == selectedProfile)
 							{
 								// can't send to someone in our game if we're dead/observing.  security breach and all that.  no seances for you.
@@ -309,8 +304,7 @@ WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 						// Send the message
 						BuddyRequest req;
 						req.buddyRequestType = BuddyRequest::BUDDYREQUEST_MESSAGE;
-						wcsncpy(req.arg.message.text, txtInput.str(), MAX_BUDDY_CHAT_LEN);
-						req.arg.message.text[MAX_BUDDY_CHAT_LEN-1] = 0;
+						wcslcpy(req.arg.message.text, txtInput.str(), MAX_BUDDY_CHAT_LEN);
 						req.arg.message.recipient = selectedProfile;
 						TheGameSpyBuddyMessageQueue->addRequest(req);
 
@@ -514,12 +508,12 @@ void HandleBuddyResponses( void )
 				break;
 			case BuddyResponse::BUDDYRESPONSE_MESSAGE:
 				{
-					if ( !wcscmp(resp.arg.message.text, L"I have authorized your request to add me to your list") )
+					if ( wcscmp(resp.arg.message.text, L"I have authorized your request to add me to your list") == 0 )
 						break;
 
 					if (TheGameSpyInfo->isSavedIgnored(resp.profile))
 					{
-						//DEBUG_CRASH(("Player is ignored!\n"));
+						//DEBUG_CRASH(("Player is ignored!"));
 						break; // no buddy messages from ignored people
 					}
 
@@ -542,23 +536,20 @@ void HandleBuddyResponses( void )
 					message.m_senderNick = nick;
 					messages->push_back(message);
 
-					DEBUG_LOG(("Inserting buddy chat from '%s'/'%s'\n", nick.str(), resp.arg.message.nick));
+					DEBUG_LOG(("Inserting buddy chat from '%s'/'%s'", nick.str(), resp.arg.message.nick));
 
 					// put message on screen
 					insertChat(message);
-					
+
 					// play audio notification
 					AudioEventRTS buddyMsgAudio("GUIMessageReceived");
 					if( TheAudio )
 					{
 						TheAudio->addAudioEvent( &buddyMsgAudio );
-					}  // end if
+					}
 
 					UnicodeString snippet = message.m_message;
-					while (snippet.getLength() > 11)
-					{
-						snippet.removeLastChar();
-					}
+					snippet.truncateTo(11);
 					UnicodeString s;
 					s.format(TheGameText->fetch("Buddy:MessageNotification"), nick.str(), snippet.str());
 					lastNotificationWasStatus = FALSE;
@@ -642,7 +633,7 @@ void HandleBuddyResponses( void )
 	}
 	else
 	{
-		DEBUG_CRASH(("No buddy message queue!\n"));
+		DEBUG_CRASH(("No buddy message queue!"));
 	}
 	if(noticeLayout && timeGetTime() > noticeExpires)
 	{
@@ -685,7 +676,7 @@ void showNotificationBox( AsciiString nick, UnicodeString message)
 	if( TheAudio )
 	{
 		TheAudio->addAudioEvent( &buttonClick );
-	}  // end if
+	}
 
 }
 
@@ -717,20 +708,20 @@ void PopulateOldBuddyMessages(void)
 //-------------------------------------------------------------------------------------------------
 void WOLBuddyOverlayInit( WindowLayout *layout, void *userData )
 {
-	parentID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:BuddyMenuParent" ) );
-	buttonHideID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonHide" ) );
-	buttonAddBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonAdd" ) );
-	buttonDeleteBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonDelete" ) );
-	//textEntryID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:TextEntryChat" ) );
-	//listboxBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddies" ) );
-	//listboxChatID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddyChat" ) );
-	buttonAcceptBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonYes" ) );
-	buttonDenyBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonNo" ) );
-	radioButtonBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:RadioButtonBuddies" ) );
-	radioButtonIgnoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:RadioButtonIgnore" ) );
-	parentBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:BuddiesParent" ) );
-	parentIgnoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:IgnoreParent" ) );
-	listboxIgnoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxIgnore" ) );
+	parentID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:BuddyMenuParent" );
+	buttonHideID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonHide" );
+	buttonAddBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonAdd" );
+	buttonDeleteBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonDelete" );
+	//textEntryID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:TextEntryChat" );
+	//listboxBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddies" );
+	//listboxChatID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddyChat" );
+	buttonAcceptBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonYes" );
+	buttonDenyBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonNo" );
+	radioButtonBuddiesID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:RadioButtonBuddies" );
+	radioButtonIgnoreID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:RadioButtonIgnore" );
+	parentBuddiesID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:BuddiesParent" );
+	parentIgnoreID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:IgnoreParent" );
+	listboxIgnoreID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxIgnore" );
 
 
 	parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
@@ -766,8 +757,8 @@ void WOLBuddyOverlayInit( WindowLayout *layout, void *userData )
 
 	isOverlayActive = true;
 	updateBuddyInfo();
-	
-} // WOLBuddyOverlayInit
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Buddy Overlay shutdown method */
@@ -786,7 +777,7 @@ void WOLBuddyOverlayShutdown( WindowLayout *layout, void *userData )
 
 	InitBuddyControls(BUDDY_RESETALL_CRAP);
 
-}  // WOLBuddyOverlayShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -796,7 +787,7 @@ void WOLBuddyOverlayUpdate( WindowLayout * layout, void *userData)
 {
 	if (!TheGameSpyBuddyMessageQueue || !TheGameSpyBuddyMessageQueue->isConnected())
 		GameSpyCloseOverlay(GSOVERLAY_BUDDY);
-}// WOLBuddyOverlayUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Buddy Overlay input callback */
@@ -804,7 +795,7 @@ void WOLBuddyOverlayUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLBuddyOverlayInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -819,36 +810,36 @@ WindowMsgHandledType WOLBuddyOverlayInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonHide, buttonHideID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLBuddyOverlayInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Buddy Overlay window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
@@ -858,33 +849,33 @@ WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg,
 	}
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 		case GLM_RIGHT_CLICKED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
 
-				if( controlID == listboxIgnoreID ) 
+				if( controlID == listboxIgnoreID )
 				{
 					RightClickStruct *rc = (RightClickStruct *)mData2;
 					WindowLayout *rcLayout;
@@ -918,17 +909,17 @@ WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg,
 
 					GadgetListBoxSetSelected(control, rc->pos);
 					if (isBuddy)
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddiesMenu.wnd"));
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddiesMenu.wnd");
 					else if (isRequest)
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddyRequestMenu.wnd"));
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddyRequestMenu.wnd");
 					else
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNonBuddiesMenu.wnd"));
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCNonBuddiesMenu.wnd");
 					rcMenu = rcLayout->getFirstWindow();
 					rcMenu->winGetLayout()->runInit();
 					rcMenu->winBringToTop();
 					rcMenu->winHide(FALSE);
-					
-					
+
+
 
 					rcMenu->winSetPosition(rc->mouseX, rc->mouseY);
 					GameSpyRCMenuData *rcData = NEW GameSpyRCMenuData;
@@ -991,16 +982,16 @@ WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg,
 					*/
 				}
 				break;
-			}// case GBM_SELECTED:
+			}
 		case GLM_DOUBLE_CLICKED:
 			{
 				/*
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxBuddyID ) 
+				if( controlID == listboxBuddyID )
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						UnicodeString buddyName;
@@ -1095,16 +1086,16 @@ WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg,
 				*/
 				break;
 			}
-		
+
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLBuddyOverlaySystem
+}
 
-WindowMsgHandledType PopupBuddyNotificationSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType PopupBuddyNotificationSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	switch( msg )
@@ -1112,12 +1103,12 @@ WindowMsgHandledType PopupBuddyNotificationSystem( GameWindow *window, UnsignedI
 		case GWM_CREATE:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -1134,10 +1125,10 @@ WindowMsgHandledType PopupBuddyNotificationSystem( GameWindow *window, UnsignedI
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// PopupBuddyNotificationSystem
+}
 
 /*
 static NameKeyType buttonAcceptBuddyID = NAMEKEY_INVALID;
@@ -1177,7 +1168,7 @@ static void closeRightClickMenu(GameWindow *win)
 		WindowLayout *winLay = win->winGetLayout();
 		if(!winLay)
 			return;
-		winLay->destroyWindows();					
+		winLay->destroyWindows();
 		deleteInstance(winLay);
 		winLay = NULL;
 
@@ -1192,8 +1183,7 @@ void RequestBuddyAdd(Int profileID, AsciiString nick)
 	req.arg.addbuddy.id = profileID;
 	UnicodeString buddyAddstr;
 	buddyAddstr = TheGameText->fetch("GUI:BuddyAddReq");
-	wcsncpy(req.arg.addbuddy.text, buddyAddstr.str(), MAX_BUDDY_CHAT_LEN);
-	req.arg.addbuddy.text[MAX_BUDDY_CHAT_LEN-1] = 0;
+	wcslcpy(req.arg.addbuddy.text, buddyAddstr.str(), MAX_BUDDY_CHAT_LEN);
 	TheGameSpyBuddyMessageQueue->addRequest(req);
 
 	UnicodeString s;
@@ -1218,17 +1208,17 @@ void RequestBuddyAdd(Int profileID, AsciiString nick)
 	// insert status into box
 	messages->push_back(message);
 
-	DEBUG_LOG(("Inserting buddy add request\n"));
+	DEBUG_LOG(("Inserting buddy add request"));
 
 	// put message on screen
 	insertChat(message);
-	
+
 	// play audio notification
 	AudioEventRTS buddyMsgAudio("GUIMessageReceived");
 	if( TheAudio )
 	{
 		TheAudio->addAudioEvent( &buddyMsgAudio );
-	}  // end if
+	}
 
 	lastNotificationWasStatus = FALSE;
 	numOnlineInNotification = 0;
@@ -1240,18 +1230,18 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 
 	switch( msg )
 	{
-		
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				rcMenu = NULL;
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GGM_CLOSE:
 			{
@@ -1259,7 +1249,7 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 				//rcMenu = NULL;
 				break;
 			}
-		
+
 
 		case GBM_SELECTED:
 			{
@@ -1279,11 +1269,9 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 				else if (rcData->m_itemType == ITEM_REQUEST)
 					isRequest = TRUE;
 
-				if(rcData)
-				{
-					delete rcData;
-					rcData = NULL;
-				}
+				delete rcData;
+				rcData = NULL;
+
 				window->winSetUserData(NULL);
 				//DEBUG_ASSERTCRASH(profileID > 0, ("Bad profile ID in user data!"));
 
@@ -1291,7 +1279,7 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 				{
 					if(!isGameSpyUser)
 						break;
-					DEBUG_LOG(("ButtonAdd was pushed\n"));
+					DEBUG_LOG(("ButtonAdd was pushed"));
 					if (isRequest)
 					{
 						// ok the request
@@ -1306,7 +1294,7 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 						// request to add him to our list automatically CLH 2-18-03
 						if(!TheGameSpyInfo->isBuddy(profileID))
 						{
-							RequestBuddyAdd(profileID, nick);		
+							RequestBuddyAdd(profileID, nick);
 						}
 						updateBuddyInfo();
 					}
@@ -1327,7 +1315,7 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 						req.arg.profile.id = profileID;
 						TheGameSpyBuddyMessageQueue->addRequest(req);
 					}
-					else 
+					else
 					{
 						// delete the request
 						BuddyRequest req;
@@ -1340,12 +1328,12 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 					BuddyInfoMap *buddies = (isBuddy)?TheGameSpyInfo->getBuddyMap():TheGameSpyInfo->getBuddyRequestMap();
 					buddies->erase(profileID);
 					updateBuddyInfo();
-					DEBUG_LOG(("ButtonDelete was pushed\n"));
+					DEBUG_LOG(("ButtonDelete was pushed"));
 					PopulateLobbyPlayerListbox();
 				}
 				else if( controlID == buttonPlayID )
 				{
-					DEBUG_LOG(("buttonPlayID was pushed\n"));
+					DEBUG_LOG(("buttonPlayID was pushed"));
 				}
 				else if( controlID == buttonIgnoreID )
 				{
@@ -1362,7 +1350,7 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 						}
 					}
 					else
-					{	
+					{
 						if(TheGameSpyInfo->isIgnored(nick))
 						{
 							TheGameSpyInfo->removeFromIgnoreList(nick);
@@ -1379,7 +1367,7 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 				}
 				else if( controlID == buttonStatsID )
 				{
-					DEBUG_LOG(("buttonStatsID was pushed\n"));
+					DEBUG_LOG(("buttonStatsID was pushed"));
 					GameSpyCloseOverlay(GSOVERLAY_PLAYERINFO);
 					SetLookAtPlayer(profileID,nick );
 					GameSpyOpenOverlay(GSOVERLAY_PLAYERINFO);
@@ -1393,8 +1381,8 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 			}
 		default:
 			return MSG_IGNORED;
-	
-	}//Switch		
+
+	}
 	return MSG_HANDLED;
 }
 
@@ -1415,7 +1403,7 @@ void setUnignoreText( WindowLayout *layout, AsciiString nick, GPProfile id)
 void refreshIgnoreList( void )
 {
 
-	
+
 	SavedIgnoreMap tempMap;
 	tempMap = TheGameSpyInfo->returnSavedIgnoreList();
 	SavedIgnoreMap::iterator it = tempMap.begin();
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
index cd6f32429fd..5767ddfa139 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Lib/BaseType.h"
 #include "Common/GameEngine.h"
@@ -63,9 +63,9 @@ static GameWindow *buttonLobby = NULL;
 //-------------------------------------------------------------------------------------------------
 void WOLCustomScoreScreenInit( WindowLayout *layout, void *userData )
 {
-	parentWOLCustomScoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomScoreScreen.wnd:WOLCustomScoreScreenParent" ) );
-	buttonDisconnectID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomScoreScreen.wnd:ButtonDisconnect" ) );
-	buttonLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomScoreScreen.wnd:ButtonLobby" ) );
+	parentWOLCustomScoreID = TheNameKeyGenerator->nameToKey( "WOLCustomScoreScreen.wnd:WOLCustomScoreScreenParent" );
+	buttonDisconnectID = TheNameKeyGenerator->nameToKey( "WOLCustomScoreScreen.wnd:ButtonDisconnect" );
+	buttonLobbyID = TheNameKeyGenerator->nameToKey( "WOLCustomScoreScreen.wnd:ButtonLobby" );
 	parentWOLCustomScore = TheWindowManager->winGetWindowFromId( NULL, parentWOLCustomScoreID );
 	buttonDisconnect = TheWindowManager->winGetWindowFromId( NULL,  buttonDisconnectID);
 	buttonLobby = TheWindowManager->winGetWindowFromId( NULL,  buttonLobbyID);
@@ -84,7 +84,7 @@ void WOLCustomScoreScreenInit( WindowLayout *layout, void *userData )
 
 	// Set Keyboard to Main Parent
 	TheWindowManager->winSetFocus( parentWOLCustomScore );
-} // WOLCustomScoreScreenInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu shutdown method */
@@ -96,7 +96,7 @@ void WOLCustomScoreScreenShutdown( WindowLayout *layout, void *userData )
 
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
-}  // WOLCustomScoreScreenShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -108,7 +108,7 @@ void WOLCustomScoreScreenUpdate( WindowLayout * layout, void *userData)
 	if (WOL::TheWOL)
 		WOL::TheWOL->update();
 	*/
-}// WOLCustomScoreScreenUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu input callback */
@@ -116,7 +116,7 @@ void WOLCustomScoreScreenUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLCustomScoreScreenInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -131,36 +131,36 @@ WindowMsgHandledType WOLCustomScoreScreenInput( GameWindow *window, UnsignedInt
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonDisconnect, buttonDisconnectID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLCustomScoreScreenInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLCustomScoreScreenSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLCustomScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
@@ -170,23 +170,23 @@ WindowMsgHandledType WOLCustomScoreScreenSystem( GameWindow *window, UnsignedInt
 
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're given the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -201,7 +201,7 @@ WindowMsgHandledType WOLCustomScoreScreenSystem( GameWindow *window, UnsignedInt
 						WOL::TheWOL->addCommand( WOL::WOLCOMMAND_RESET );  // don't display an error, log out, or anything
 					}
 
-				} //if ( controlID == buttonDisconnect )
+				}
 				else if ( controlID == buttonLobbyID )
 				{
 					if (WOL::TheWOL->getState() != WOL::WOLAPI_FATAL_ERROR)
@@ -214,11 +214,11 @@ WindowMsgHandledType WOLCustomScoreScreenSystem( GameWindow *window, UnsignedInt
 					else
 					{
 					}
-				} //if ( controlID == buttonDisconnect )
+				}
 				*/
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -226,7 +226,7 @@ WindowMsgHandledType WOLCustomScoreScreenSystem( GameWindow *window, UnsignedInt
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLCustomScoreScreenSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
index ed969ba2d76..8c5ec5718c5 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
@@ -28,7 +28,7 @@
 // Description: WOL Game Options Menu
 ///////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
@@ -65,17 +65,12 @@
 
 void WOLDisplaySlotList( void );
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 extern std::list<PeerResponse> TheLobbyQueuedUTMs;
 extern void MapSelectorTooltip(GameWindow *window, WinInstanceData *instData,	UnsignedInt mouse);
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 extern Bool g_debugSlots;
 void slotListDebugLog(const char *fmt, ...)
 {
@@ -116,7 +111,7 @@ void SendStatsToOtherPlayers(const GameInfo *game)
 	subStats.locale = fullStats.locale;
 	subStats.gamesAsRandom = fullStats.gamesAsRandom;
 	GetAdditionalDisconnectsFromUserFile(&subStats);
-	fullStr.format("%d %s", TheGameSpyInfo->getLocalProfileID(), TheGameSpyPSMessageQueue->formatPlayerKVPairs( subStats ));
+	fullStr.format("%d %s", TheGameSpyInfo->getLocalProfileID(), TheGameSpyPSMessageQueue->formatPlayerKVPairs( subStats ).c_str());
 	req.options = fullStr.str();
 
 	Int localIndex = game->getLocalSlotNum();
@@ -128,7 +123,7 @@ void SendStatsToOtherPlayers(const GameInfo *game)
 			AsciiString hostName;
 			hostName.translate(slot->getName());
 			req.nick = hostName.str();
-			DEBUG_LOG(("SendStatsToOtherPlayers() - sending to '%s', data of\n\t'%s'\n", hostName.str(), req.options.c_str()));
+			DEBUG_LOG(("SendStatsToOtherPlayers() - sending to '%s', data of\n\t'%s'", hostName.str(), req.options.c_str()));
 			TheGameSpyPeerMessageQueue->addRequest(req);
 		}
 	}
@@ -248,7 +243,7 @@ void PopBackToLobby( void )
 		//TheGameSpyInfo->joinBestGroupRoom();
 	}
 
-	DEBUG_LOG(("PopBackToLobby() - parentWOLGameSetup is %X\n", parentWOLGameSetup));
+	DEBUG_LOG(("PopBackToLobby() - parentWOLGameSetup is %X", parentWOLGameSetup));
 	if (parentWOLGameSetup)
 	{
 		nextScreen = "Menus/WOLCustomLobby.wnd";
@@ -267,13 +262,13 @@ void WOLPositionStartSpots( void )
 		win = TheWindowManager->winGetWindowFromId(NULL, windowMapSelectMapID);
 
 		// get the controls.
-		NameKeyType listboxMapID = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ListboxMap") );
+		NameKeyType listboxMapID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ListboxMap" );
 		GameWindow *listboxMap = TheWindowManager->winGetWindowFromId( NULL, listboxMapID );
 
 		if (listboxMap != NULL) {
 			Int selected;
 			UnicodeString map;
-			
+
 			// get the selected index
 			GadgetListBoxGetSelected( listboxMap, &selected );
 
@@ -282,8 +277,8 @@ void WOLPositionStartSpots( void )
 
 				// get text of the map to load
 				map = GadgetListBoxGetText( listboxMap, selected, 0 );
-				
-				
+
+
 				// set the map name in the global data map name
 				AsciiString asciiMap;
 				const char *mapFname = (const char *)GadgetListBoxGetItemData( listboxMap, selected );
@@ -295,7 +290,7 @@ void WOLPositionStartSpots( void )
 				}
 
 				positionStartSpots(asciiMap, buttonMapStartPosition, win);
-			}			
+			}
 		}
 
 	} else {
@@ -430,7 +425,7 @@ static void playerTooltip(GameWindow *window,
 	else if( stats.gamesAsRandom >= numGames )
 		favoriteSide = TheGameText->fetch("GUI:Random");
 	else
-	{		
+	{
 		const PlayerTemplate *fac = ThePlayerTemplateStore->getNthPlayerTemplate(favorite);
 		if (fac)
 		{
@@ -504,7 +499,7 @@ void pingTooltip(GameWindow *window, WinInstanceData *instData, UnsignedInt mous
 	x = LOLONGTOSHORT(mouse);
 	y = HILONGTOSHORT(mouse);
 
-	
+
 	Int winPosX, winPosY, winWidth, winHeight;
 
 	window->winGetScreenPosition(&winPosX, &winPosY);
@@ -646,7 +641,7 @@ static void handlePlayerTemplateSelection(int index)
 static void handleStartPositionSelection(Int player, int startPos)
 {
 	GameSpyStagingRoom *myGame = TheGameSpyInfo->getCurrentStagingRoom();
-	
+
 	if (myGame)
 	{
 		GameSpyGameSlot * slot = myGame->getGameSpySlot(player);
@@ -662,7 +657,7 @@ static void handleStartPositionSelection(Int player, int startPos)
 		}
 
 		if(!skip)
-		{	
+		{
 			Bool isAvailable = TRUE;
 			for(Int i = 0; i < MAX_SLOTS; ++i)
 			{
@@ -835,7 +830,7 @@ static void StartPressed(void)
 
 	// Check for too few teams
 	int numRandom = 0;
-	std::set<Int> teams; 
+	std::set<Int> teams;
 	for (i=0; i<MAX_SLOTS; ++i)
 	{
 		GameSlot *slot = myGame->getSlot(i);
@@ -899,7 +894,7 @@ static void StartPressed(void)
 		TheGameSpyPeerMessageQueue->addRequest(req);
 	}
 
-}//void StartPressed(void)
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update options on screen */
@@ -1004,16 +999,16 @@ void InitWOLGameGadgets( void )
 	DEBUG_ASSERTCRASH(pingImages[2], ("Can't find ping image!"));
 
 	//Initialize the gadget IDs
-	parentWOLGameSetupID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:GameSpyGameOptionsMenuParent" ) );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonBack" ) );
-	buttonStartID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonStart" ) );
-	textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:TextEntryChat" ) );
-	textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:TextEntryMapDisplay" ) );
-	listboxGameSetupChatID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ListboxChatWindowGameSpyGameSetup" ) );
-	buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonEmote" ) );
-	buttonSelectMapID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonSelectMap" ) );
-	windowMapID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:MapWindow" ) );
-	windowMapSelectMapID = TheNameKeyGenerator->nameToKey(AsciiString("WOLMapSelectMenu.wnd:WinMapPreview"));
+	parentWOLGameSetupID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:GameSpyGameOptionsMenuParent" );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonBack" );
+	buttonStartID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonStart" );
+	textEntryChatID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:TextEntryChat" );
+	textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:TextEntryMapDisplay" );
+	listboxGameSetupChatID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ListboxChatWindowGameSpyGameSetup" );
+	buttonEmoteID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonEmote" );
+	buttonSelectMapID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonSelectMap" );
+	windowMapID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:MapWindow" );
+	windowMapSelectMapID = TheNameKeyGenerator->nameToKey("WOLMapSelectMenu.wnd:WinMapPreview");
 
 	NameKeyType staticTextTitleID = NAMEKEY("GameSpyGameOptionsMenu.wnd:StaticTextGameName");
 
@@ -1028,12 +1023,9 @@ void InitWOLGameGadgets( void )
 	textEntryMapDisplay = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, textEntryMapDisplayID );
 	windowMap = TheWindowManager->winGetWindowFromId( parentWOLGameSetup,windowMapID  );
 	DEBUG_ASSERTCRASH(windowMap, ("Could not find the parentWOLGameSetup.wnd:MapWindow" ));
-	
-	//Added By Sadullah Nader
-	//Tooltip Function set 
+
 	windowMap->winSetTooltipFunc(MapSelectorTooltip);
-	//
-	
+
 	GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, staticTextTitleID );
 	if (staticTextTitle)
 	{
@@ -1062,14 +1054,7 @@ void InitWOLGameGadgets( void )
 		if (TheGameSpyInfo->amIHost())
 			staticTextPlayer[i]->winHide(TRUE);
 
-		if(i==0 && TheGameSpyInfo->amIHost())
-		{
-			UnicodeString uName;
-			uName.translate(TheGameSpyInfo->getLocalName());
-			GadgetComboBoxAddEntry(comboBoxPlayer[i],uName,GameSpyColor[GSCOLOR_PLAYER_OWNER]);
-			GadgetComboBoxSetSelectedPos(comboBoxPlayer[0],0);
-		}
-		else
+		if(theGameInfo->getLocalSlotNum() != i)
 		{
 			GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Open"),GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
 			GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Closed"),GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
@@ -1085,7 +1070,7 @@ void InitWOLGameGadgets( void )
 		DEBUG_ASSERTCRASH(comboBoxColor[i], ("Could not find the comboBoxColor[%d]",i ));
 		PopulateColorComboBox(i, comboBoxColor, theGameInfo);
 		GadgetComboBoxSetSelectedPos(comboBoxColor[i], 0);
-		
+
 		tmpString.format("GameSpyGameOptionsMenu.wnd:ComboBoxPlayerTemplate%d", i);
 		comboBoxPlayerTemplateID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		comboBoxPlayerTemplate[i] = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, comboBoxPlayerTemplateID[i] );
@@ -1098,13 +1083,13 @@ void InitWOLGameGadgets( void )
 		DEBUG_ASSERTCRASH(comboBoxTeam[i], ("Could not find the comboBoxTeam[%d]",i ));
 		PopulateTeamComboBox(i, comboBoxTeam, theGameInfo);
 
-		tmpString.format("GameSpyGameOptionsMenu.wnd:ButtonAccept%d", i); 
+		tmpString.format("GameSpyGameOptionsMenu.wnd:ButtonAccept%d", i);
 		buttonAcceptID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		buttonAccept[i] = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, buttonAcceptID[i] );
 		DEBUG_ASSERTCRASH(buttonAccept[i], ("Could not find the buttonAccept[%d]",i ));
 		buttonAccept[i]->winSetTooltipFunc(gameAcceptTooltip);
 
-		tmpString.format("GameSpyGameOptionsMenu.wnd:GenericPing%d", i); 
+		tmpString.format("GameSpyGameOptionsMenu.wnd:GenericPing%d", i);
 		genericPingWindowID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		genericPingWindow[i] = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, genericPingWindowID[i] );
 		DEBUG_ASSERTCRASH(genericPingWindow[i], ("Could not find the genericPingWindow[%d]",i ));
@@ -1147,7 +1132,11 @@ void DeinitWOLGameGadgets( void )
 	listboxGameSetupChat = NULL;
 	textEntryChat = NULL;
 	textEntryMapDisplay = NULL;
-	windowMap = NULL;
+	if (windowMap)
+	{
+		windowMap->winSetUserData(NULL);
+		windowMap = NULL;
+	}
 //	GameWindow *staticTextTitle = NULL;
 	for (Int i = 0; i < MAX_SLOTS; i++)
 	{
@@ -1188,28 +1177,26 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 			GameSpyCloseAllOverlays();
 			GSMessageBoxOk( title, body );
 			TheGameSpyInfo->reset();
-			DEBUG_LOG(("WOLGameSetupMenuInit() - game was in progress, and we were disconnected, so pop immediate back to main menu\n"));
+			DEBUG_LOG(("WOLGameSetupMenuInit() - game was in progress, and we were disconnected, so pop immediate back to main menu"));
 			TheShell->popImmediate();
 			return;
 		}
 
 		// If we init while the game is in progress, we are really returning to the menu
 		// after the game.  So, we pop the menu and go back to the lobby.  Whee!
-		DEBUG_LOG(("WOLGameSetupMenuInit() - game was in progress, so pop immediate back to lobby\n"));
+		DEBUG_LOG(("WOLGameSetupMenuInit() - game was in progress, so pop immediate back to lobby"));
 		TheShell->popImmediate();
 		if (TheGameSpyPeerMessageQueue && TheGameSpyPeerMessageQueue->isConnected())
 		{
-			DEBUG_LOG(("We're still connected, so pushing back on the lobby\n"));
+			DEBUG_LOG(("We're still connected, so pushing back on the lobby"));
 			TheShell->push("Menus/WOLCustomLobby.wnd", TRUE);
 		}
 		return;
 	}
 	TheGameSpyInfo->setCurrentGroupRoom(0);
 
-	if (TheNAT != NULL) {
-		delete TheNAT;
-		TheNAT = NULL;
-	}
+	delete TheNAT;
+	TheNAT = NULL;
 
 	nextScreen = NULL;
 	buttonPushed = false;
@@ -1258,6 +1245,9 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 
 		WOLDisplaySlotList();
 		WOLDisplayGameOptions();
+
+		// TheSuperHackers @tweak disable the combo box for the host's player name
+		comboBoxPlayer[0]->winEnable(FALSE);
 	}
 	else
 	{
@@ -1308,10 +1298,10 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 
 	// Show the Menu
 	layout->hide( FALSE );
-	
+
 	// Make sure the text fields are clear
 	GadgetListBoxReset( listboxGameSetupChat );
-	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);	
+	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);
 
 	initDone = true;
 	TheGameSpyInfo->setGameOptions();
@@ -1325,7 +1315,7 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 	TheWindowManager->winSetFocus( textEntryChat );
 	raiseMessageBoxes = true;
 	TheTransitionHandler->setGroup("GameSpyGameOptionsMenuFade");
-}// void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -1345,7 +1335,7 @@ static void shutdownComplete( WindowLayout *layout )
 	{
 		if (!TheGameSpyPeerMessageQueue || !TheGameSpyPeerMessageQueue->isConnected())
 		{
-			DEBUG_LOG(("GameSetup shutdownComplete() - skipping push because we're disconnected\n"));
+			DEBUG_LOG(("GameSetup shutdownComplete() - skipping push because we're disconnected"));
 		}
 		else
 		{
@@ -1363,7 +1353,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	nextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** GameSpy Game Options menu shutdown method */
@@ -1397,13 +1387,13 @@ void WOLGameSetupMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 
 	RaiseGSMessageBox();
 	TheTransitionHandler->reverse("GameSpyGameOptionsMenuFade");
-}  // void WOLGameSetupMenuShutdown( WindowLayout *layout, void *userData )
+}
 
 static void fillPlayerInfo(const PeerResponse *resp, PlayerInfo *info)
 {
@@ -1423,7 +1413,7 @@ static void fillPlayerInfo(const PeerResponse *resp, PlayerInfo *info)
 //-------------------------------------------------------------------------------------------------
 void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 {
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 	{
 		shutdownComplete(layout);
@@ -1491,7 +1481,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 			{
 				// haven't seen ourselves
 				buttonPushed = true;
-				DEBUG_LOG(("Haven't seen ourselves in slotlist\n"));
+				DEBUG_LOG(("Haven't seen ourselves in slotlist"));
 				if (TheGameSpyGame)
 					TheGameSpyGame->reset();
 				TheGameSpyInfo->leaveStagingRoom();
@@ -1542,13 +1532,13 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 
 			if (!TheLobbyQueuedUTMs.empty())
 			{
-				DEBUG_LOG(("Got response from queued lobby UTM list\n"));
+				DEBUG_LOG(("Got response from queued lobby UTM list"));
 				resp = TheLobbyQueuedUTMs.front();
 				TheLobbyQueuedUTMs.pop_front();
 			}
 			else if (TheGameSpyPeerMessageQueue->getResponse( resp ))
 			{
-				DEBUG_LOG(("Got response from message queue\n"));
+				DEBUG_LOG(("Got response from message queue"));
 			}
 			else
 			{
@@ -1736,7 +1726,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 						// send out new slotlist if I'm host
 						TheGameSpyInfo->setGameOptions();
 						WOLDisplaySlotList();
-						
+
 						if (game && !TheGameSpyInfo->amIHost())
 						{
 							Int idx = game->getSlotNum(resp.nick.c_str());
@@ -1777,44 +1767,45 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 					TheGameSpyInfo->reset();
 					TheShell->pop();
 				}
+				break;
 
 			case PeerResponse::PEERRESPONSE_ROOMUTM:
 				{
 					sawImportantMessage = TRUE;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 					if (g_debugSlots)
 					{
-						DEBUG_LOG(("About to process a room UTM.  Command is '%s', command options is '%s'\n",
+						DEBUG_LOG(("About to process a room UTM.  Command is '%s', command options is '%s'",
 							resp.command.c_str(), resp.commandOptions.c_str()));
 					}
 #endif
-					if (!strcmp(resp.command.c_str(), "SL"))
+					if (strcmp(resp.command.c_str(), "SL") == 0)
 					{
 						// slotlist
 						GameSpyStagingRoom *game = TheGameSpyInfo->getCurrentStagingRoom();
 						Bool isValidSlotList = game && game->getSlot(0) && game->getSlot(0)->isPlayer( resp.nick.c_str() ) && !TheGameSpyInfo->amIHost();
 						if (!isValidSlotList)
 						{
-							SLOTLIST_DEBUG_LOG(("Not a valid slotlist\n"));
+							SLOTLIST_DEBUG_LOG(("Not a valid slotlist"));
 							if (!game)
 							{
-								SLOTLIST_DEBUG_LOG(("No game!\n"));
+								SLOTLIST_DEBUG_LOG(("No game!"));
 							}
 							else
 							{
 								if (!game->getSlot(0))
 								{
-									SLOTLIST_DEBUG_LOG(("No slot 0!\n"));
+									SLOTLIST_DEBUG_LOG(("No slot 0!"));
 								}
 								else
 								{
 									if (TheGameSpyInfo->amIHost())
 									{
-										SLOTLIST_DEBUG_LOG(("I'm the host!\n"));
+										SLOTLIST_DEBUG_LOG(("I'm the host!"));
 									}
 									else
 									{
-										SLOTLIST_DEBUG_LOG(("Not from the host!  isHuman:%d, name:'%ls', sender:'%s'\n",
+										SLOTLIST_DEBUG_LOG(("Not from the host!  isHuman:%d, name:'%ls', sender:'%s'",
 											game->getSlot(0)->isHuman(), game->getSlot(0)->getName().str(),
 											resp.nick.c_str()));
 									}
@@ -1857,9 +1848,9 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 #ifdef DEBUG_LOGGING
 										UnsignedShort newPort = game->getConstSlot(i)->getPort();
 										UnsignedInt newIP = game->getConstSlot(i)->getIP();
-										DEBUG_ASSERTLOG(newIP == ips[i], ("IP was different for player %d (%X --> %X)\n",
+										DEBUG_ASSERTLOG(newIP == ips[i], ("IP was different for player %d (%X --> %X)",
 											i, ips[i], newIP));
-										DEBUG_ASSERTLOG(newPort == ports[i], ("Port was different for player %d (%d --> %d)\n",
+										DEBUG_ASSERTLOG(newPort == ports[i], ("Port was different for player %d (%d --> %d)",
 											i, ports[i], newPort));
 #endif
 										game->getSlot(i)->setPort(ports[i]);
@@ -1871,15 +1862,15 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 							Bool isInGame = newLocalSlotNum >= 0;
 							if (!optionsOK)
 							{
-								SLOTLIST_DEBUG_LOG(("Options are bad!  bailing!\n"));
+								SLOTLIST_DEBUG_LOG(("Options are bad!  bailing!"));
 								break;
 							}
 							else
 							{
-								SLOTLIST_DEBUG_LOG(("Options are good, local slot is %d\n", newLocalSlotNum));
+								SLOTLIST_DEBUG_LOG(("Options are good, local slot is %d", newLocalSlotNum));
 								if (!isInGame)
 								{
-									SLOTLIST_DEBUG_LOG(("Not in game; players are:\n"));
+									SLOTLIST_DEBUG_LOG(("Not in game; players are:"));
 									for (Int i=0; i<MAX_SLOTS; ++i)
 									{
 										const GameSpyGameSlot *slot = game->getGameSpySlot(i);
@@ -1887,7 +1878,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 										{
 											UnicodeString munkee;
 											munkee.format(L"\t%d: %ls", i, slot->getName().str());
-											SLOTLIST_DEBUG_LOG(("%ls\n", munkee.str()));
+											SLOTLIST_DEBUG_LOG(("%ls", munkee.str()));
 										}
 									}
 								}
@@ -1947,7 +1938,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 								{
 									// can't see ourselves
 									buttonPushed = true;
-									DEBUG_LOG(("Can't see ourselves in slotlist %s\n", options.str()));
+									DEBUG_LOG(("Can't see ourselves in slotlist %s", options.str()));
 									TheGameSpyInfo->getCurrentStagingRoom()->reset();
 									TheGameSpyInfo->leaveStagingRoom();
 									//TheGameSpyInfo->joinBestGroupRoom();
@@ -1958,7 +1949,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 							}
 						}
 					}
-					else if (!strcmp(resp.command.c_str(), "HWS"))
+					else if (strcmp(resp.command.c_str(), "HWS") == 0)
 					{
 						// host wants to start
 						GameInfo *game = TheGameSpyInfo->getCurrentStagingRoom();
@@ -1972,13 +1963,13 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 							}
 						}
 					}
-					else if (!stricmp(resp.command.c_str(), "NAT"))
+					else if (stricmp(resp.command.c_str(), "NAT") == 0)
 					{
 						if (TheNAT != NULL) {
 							TheNAT->processGlobalMessage(-1, resp.commandOptions.c_str());
 						}
 					}
-					else if (!stricmp(resp.command.c_str(), "Pings"))
+					else if (stricmp(resp.command.c_str(), "Pings") == 0)
 					{
 						if (!TheGameSpyInfo->amIHost())
 						{
@@ -2005,7 +1996,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 			case PeerResponse::PEERRESPONSE_PLAYERUTM:
 				{
 					sawImportantMessage = TRUE;
-					if (!strcmp(resp.command.c_str(), "STATS"))
+					if (strcmp(resp.command.c_str(), "STATS") == 0)
 					{
 						PSPlayerStats stats = TheGameSpyPSMessageQueue->parsePlayerKVPairs(resp.commandOptions.c_str());
 						if (stats.id && (TheGameSpyPSMessageQueue->findPlayerStatsByID(stats.id).id == 0))
@@ -2016,7 +2007,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 					if (game)
 					{
 						Int slotNum = game->getSlotNum(resp.nick.c_str());
-						if ((slotNum >= 0) && (slotNum < MAX_SLOTS) && (!stricmp(resp.command.c_str(), "NAT"))) {
+						if ((slotNum >= 0) && (slotNum < MAX_SLOTS) && (stricmp(resp.command.c_str(), "NAT") == 0)) {
 							// this is a command for NAT negotiations, pass if off to TheNAT
 							if (TheNAT != NULL) {
 								TheNAT->processGlobalMessage(slotNum, resp.commandOptions.c_str());
@@ -2024,7 +2015,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 						}
 						if (slotNum == 0 && !TheGameSpyInfo->amIHost())
 						{
-							if (!strcmp(resp.command.c_str(), "KICK"))
+							if (strcmp(resp.command.c_str(), "KICK") == 0)
 							{
 								// oops - we've been kicked.  bail.
 								buttonPushed = true;
@@ -2034,7 +2025,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 								UnicodeString message = TheGameText->fetch("GUI:GSKicked");
 								AsciiString commandMessage = resp.commandOptions.c_str();
 								commandMessage.trim();
-								DEBUG_LOG(("We were kicked: reason was '%s'\n", resp.commandOptions.c_str()));
+								DEBUG_LOG(("We were kicked: reason was '%s'", resp.commandOptions.c_str()));
 								if (commandMessage == "GameStarted")
 								{
 									message = TheGameText->fetch("GUI:GSKickedGameStarted");
@@ -2050,13 +2041,13 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 						}
 						else if (slotNum > 0 && TheGameSpyInfo->amIHost())
 						{
-							if (!strcmp(resp.command.c_str(), "accept"))
+							if (strcmp(resp.command.c_str(), "accept") == 0)
 							{
 								game->getSlot(slotNum)->setAccept();
 								TheGameSpyInfo->setGameOptions();
 								WOLDisplaySlotList();
 							}
-							else if (!strcmp(resp.command.c_str(), "MAP"))
+							else if (strcmp(resp.command.c_str(), "MAP") == 0)
 							{
 								Bool hasMap = atoi(resp.commandOptions.c_str());
 								game->getSlot(slotNum)->setMapAvailability(hasMap);
@@ -2085,7 +2076,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 								}
 								WOLDisplaySlotList();
 							}
-							else if (!strcmp(resp.command.c_str(), "REQ"))
+							else if (strcmp(resp.command.c_str(), "REQ") == 0)
 							{
 								AsciiString options = resp.commandOptions.c_str();
 								options.trim();
@@ -2096,7 +2087,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 								options.nextToken(&key, "=");
 								Int val = atoi(options.str()+1);
 								UnsignedInt uVal = atoi(options.str()+1);
-								DEBUG_LOG(("GameOpt request: key=%s, val=%s from player %d\n", key.str(), options.str()+1, slotNum));
+								DEBUG_LOG(("GameOpt request: key=%s, val=%s from player %d", key.str(), options.str()+1, slotNum));
 
 								GameSpyGameSlot *slot = game->getGameSpySlot(slotNum);
 								if (!slot)
@@ -2125,7 +2116,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 									}
 									else
 									{
-										DEBUG_LOG(("Rejecting invalid color %d\n", val));
+										DEBUG_LOG(("Rejecting invalid color %d", val));
 									}
 								}
 								else if (key == "PlayerTemplate")
@@ -2144,7 +2135,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 									}
 									else
 									{
-										DEBUG_LOG(("Rejecting invalid PlayerTemplate %d\n", val));
+										DEBUG_LOG(("Rejecting invalid PlayerTemplate %d", val));
 									}
 								}
 								else if (key == "StartPos")
@@ -2171,7 +2162,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 									}
 									else
 									{
-										DEBUG_LOG(("Rejecting invalid startPos %d\n", val));
+										DEBUG_LOG(("Rejecting invalid startPos %d", val));
 									}
 								}
 								else if (key == "Team")
@@ -2184,7 +2175,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 									}
 									else
 									{
-										DEBUG_LOG(("Rejecting invalid team %d\n", val));
+										DEBUG_LOG(("Rejecting invalid team %d", val));
 									}
 								}
 								else if (key == "IP")
@@ -2198,7 +2189,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 									}
 									else
 									{
-										DEBUG_LOG(("Rejecting invalid IP %d\n", uVal));
+										DEBUG_LOG(("Rejecting invalid IP %d", uVal));
 									}
 								}
 								else if (key == "NAT")
@@ -2207,19 +2198,19 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 											(val <= FirewallHelperClass::FIREWALL_MAX))
 									{
 										slot->setNATBehavior((FirewallHelperClass::FirewallBehaviorType)val);
-										DEBUG_LOG(("Setting NAT behavior to %d for player %d\n", val, slotNum));
+										DEBUG_LOG(("Setting NAT behavior to %d for player %d", val, slotNum));
 										change = true;
 									}
 									else
 									{
-										DEBUG_LOG(("Rejecting invalid NAT behavior %d from player %d\n", val, slotNum));
+										DEBUG_LOG(("Rejecting invalid NAT behavior %d from player %d", val, slotNum));
 									}
 								}
 								else if (key == "Ping")
 								{
 									slot->setPingString(options.str()+1);
 									TheGameSpyInfo->setGameOptions();
-									DEBUG_LOG(("Setting ping string to %s for player %d\n", options.str()+1, slotNum));
+									DEBUG_LOG(("Setting ping string to %s for player %d", options.str()+1, slotNum));
 								}
 
 								if (change)
@@ -2230,9 +2221,9 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 									TheGameSpyInfo->setGameOptions();
 
 									WOLDisplaySlotList();
-									DEBUG_LOG(("Slot value is color=%d, PlayerTemplate=%d, startPos=%d, team=%d, IP=0x%8.8X\n",
+									DEBUG_LOG(("Slot value is color=%d, PlayerTemplate=%d, startPos=%d, team=%d, IP=0x%8.8X",
 										slot->getColor(), slot->getPlayerTemplate(), slot->getStartPos(), slot->getTeamNumber(), slot->getIP()));
-									DEBUG_LOG(("Slot list updated to %s\n", GameInfoToAsciiString(game).str()));
+									DEBUG_LOG(("Slot list updated to %s", GameInfoToAsciiString(game).str()));
 								}
 							}
 						}
@@ -2245,7 +2236,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 
 
 	}
-}// void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Game Options menu input callback */
@@ -2254,7 +2245,7 @@ WindowMsgHandledType WOLGameSetupMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	/*
-	switch( msg ) 
+	switch( msg )
 	{
 
 		//-------------------------------------------------------------------------------------------------
@@ -2265,7 +2256,7 @@ WindowMsgHandledType WOLGameSetupMenuInput( GameWindow *window, UnsignedInt msg,
 
 			GameWindow *control = (GameWindow *)mData1;
 			NameKeyType controlID = (NameKeyType)control->winGetWindowId();
-			DEBUG_LOG(("GWM_RIGHT_UP for control %d(%s)\n", controlID, TheNameKeyGenerator->keyToName(controlID).str()));
+			DEBUG_LOG(("GWM_RIGHT_UP for control %d(%s)", controlID, TheNameKeyGenerator->keyToName(controlID).str()));
 			break;
 		}
 
@@ -2288,18 +2279,18 @@ WindowMsgHandledType WOLGameSetupMenuInput( GameWindow *window, UnsignedInt msg,
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
-					}  // end if
+					}
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
-				}  // end escape
-			}  // end switch( key )
-		}  // end char
-	}  // end switch( msg )
+				}
+			}
+		}
+	}
 	*/
 	return MSG_IGNORED;
-}//WindowMsgHandledType WOLGameSetupMenuInput( GameWindow *window, UnsignedInt msg,
+}
 
 
 // Slash commands -------------------------------------------------------------------------
@@ -2335,11 +2326,11 @@ Bool handleGameSetupSlashCommands(UnicodeString uText)
 		TheGameSpyInfo->sendChat(UnicodeString(uText.str()+4), TRUE, NULL);
 		return TRUE; // was a slash command
 	}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	else if (token == "slots")
 	{
 		g_debugSlots = !g_debugSlots;
-		TheGameSpyInfo->addText(UnicodeString(L"Toggled SlotList debug"), GameSpyColor[GSCOLOR_DEFAULT], NULL);
+		TheGameSpyInfo->addText(L"Toggled SlotList debug", GameSpyColor[GSCOLOR_DEFAULT], NULL);
 		return TRUE; // was a slash command
 	}
 	else if (token == "discon")
@@ -2349,7 +2340,7 @@ Bool handleGameSetupSlashCommands(UnicodeString uText)
 		TheGameSpyPeerMessageQueue->addRequest( req );
 		return TRUE;
 	}
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // defined(RTS_DEBUG)
 
 	return FALSE; // not a slash command
 }
@@ -2391,33 +2382,36 @@ static Int getFirstSelectablePlayer(const GameInfo *game)
 //-------------------------------------------------------------------------------------------------
 /** WOL Game Options menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 	static Int buttonCommunicatorID = NAMEKEY_INVALID;
 	switch( msg )
 	{
-		//-------------------------------------------------------------------------------------------------	
+		//-------------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 			{
 				buttonCommunicatorID = NAMEKEY("GameSpyGameOptionsMenu.wnd:ButtonCommunicator");
 				break;
-			} // case GWM_DESTROY:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 			{
+				if (windowMap)
+					windowMap->winSetUserData(NULL);
+
 				break;
-			} // case GWM_DESTROY:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
 			{
@@ -2486,7 +2480,7 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 						break;
 					}
 				}
-			}// case GCM_SELECTED:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 			{
@@ -2514,7 +2508,7 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 					nextScreen = "Menus/WOLCustomLobby.wnd";
 					TheShell->pop();
 
-				} //if ( controlID == buttonBack )
+				}
 				else if ( controlID == buttonCommunicatorID )
 				{
 					GameSpyToggleOverlay( GSOVERLAY_BUDDY );
@@ -2531,7 +2525,7 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 					// Echo the user's input to the chat window
 					if (!txtInput.isEmpty())
 						TheGameSpyInfo->sendChat(txtInput, FALSE, NULL); // 'emote' button is now carriage-return
-				} //if ( controlID == buttonEmote )
+				}
 				else if ( controlID == buttonSelectMapID )
 				{
 					WOLMapSelectLayout = TheWindowManager->winCreateLayout( "Menus/WOLMapSelectMenu.wnd" );
@@ -2613,13 +2607,13 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 
 
 				break;
-			}// case GBM_SELECTED:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GBM_SELECTED_RIGHT:
    		{
    			if (buttonPushed)
    				break;
-   
+
    			GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
 				for (Int i = 0; i < MAX_SLOTS; i++)
@@ -2660,7 +2654,7 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 				// send it to the other clients on the lan
 				if ( controlID == textEntryChatID )
 				{
-					
+
 					// read the user's input
 					txtInput.set(GadgetTextEntryGetText( textEntryChat ));
 					// Clear the text entry line
@@ -2676,14 +2670,14 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 						}
 					}
 
-				}// if ( controlID == textEntryChatID )
+				}
 				break;
 			}
 		//-------------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
-	}//Switch
+	}
 	return MSG_HANDLED;
-}//WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg, 
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
index 64ebc251d8f..48437a6f368 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "GameClient/WindowLayout.h"
@@ -58,9 +58,9 @@ void WOLLadderScreenInit( WindowLayout *layout, void *userData )
 	TheShell->showShellMap(TRUE);
 
 	// get ids for our children controls
-	parentWindowID = TheNameKeyGenerator->nameToKey( AsciiString("WOLLadderScreen.wnd:LadderParent") );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("WOLLadderScreen.wnd:ButtonBack") );
-	windowLadderID = TheNameKeyGenerator->nameToKey( AsciiString("WOLLadderScreen.wnd:WindowLadder") );
+	parentWindowID = TheNameKeyGenerator->nameToKey( "WOLLadderScreen.wnd:LadderParent" );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "WOLLadderScreen.wnd:ButtonBack" );
+	windowLadderID = TheNameKeyGenerator->nameToKey( "WOLLadderScreen.wnd:WindowLadder" );
 
 	parentWindow = TheWindowManager->winGetWindowFromId( NULL, parentWindowID );
 	buttonBack = TheWindowManager->winGetWindowFromId( parentWindow, buttonBackID );
@@ -81,7 +81,7 @@ void WOLLadderScreenInit( WindowLayout *layout, void *userData )
 	// set keyboard focus to main parent
 	TheWindowManager->winSetFocus( parentWindow );
 
-}  // end ReplayMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu shutdown method */
@@ -100,7 +100,7 @@ void WOLLadderScreenShutdown( WindowLayout *layout, void *userData )
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end ReplayMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu update method */
@@ -108,7 +108,7 @@ void WOLLadderScreenShutdown( WindowLayout *layout, void *userData )
 void WOLLadderScreenUpdate( WindowLayout *layout, void *userData )
 {
 
-}  // end ReplayMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Replay menu input callback */
@@ -117,7 +117,7 @@ WindowMsgHandledType WOLLadderScreenInput( GameWindow *window, UnsignedInt msg,
 																						WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -132,7 +132,7 @@ WindowMsgHandledType WOLLadderScreenInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -140,44 +140,44 @@ WindowMsgHandledType WOLLadderScreenInput( GameWindow *window, UnsignedInt msg,
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end ReplayMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLLadderScreenSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLLadderScreenSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
 
-			
+
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -185,7 +185,7 @@ WindowMsgHandledType WOLLadderScreenSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -197,7 +197,7 @@ WindowMsgHandledType WOLLadderScreenSystem( GameWindow *window, UnsignedInt msg,
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
@@ -210,16 +210,16 @@ WindowMsgHandledType WOLLadderScreenSystem( GameWindow *window, UnsignedInt msg,
 				// thou art directed to return to thy known solar system immediately!
 				TheShell->pop();
 
-			}  // end else if
+			}
 
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
-}  // end ReplayMenuSystem
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
index 2a4c2f83ddc..cb9b2057b1c 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
@@ -70,11 +70,6 @@
 #include "GameNetwork/GameSpy/LobbyUtils.h"
 #include "GameNetwork/RankPointValue.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 void refreshGameList( Bool forceRefresh = FALSE );
 void refreshPlayerList( Bool forceRefresh = FALSE );
 
@@ -133,7 +128,7 @@ static Int groupRoomToJoin = 0;
 static Int	initialGadgetDelay = 2;
 static Bool justEntered = FALSE;
 
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 Bool g_fakeCRC = FALSE;
 Bool g_debugSlots = FALSE;
 #endif
@@ -176,7 +171,7 @@ Bool handleLobbySlashCommands(UnicodeString uText)
 	else if (token == "refresh")
 	{
 		// Added 2/19/03 added the game refresh
-		refreshGameList(TRUE);	
+		refreshGameList(TRUE);
 		refreshPlayerList(TRUE);
 		return TRUE; // was a slash command
 	}
@@ -202,17 +197,17 @@ Bool handleLobbySlashCommands(UnicodeString uText)
 		return TRUE; // was a slash command
 	}
 	*/
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 	else if (token == "fakecrc")
 	{
 		g_fakeCRC = !g_fakeCRC;
-		TheGameSpyInfo->addText(UnicodeString(L"Toggled CRC fakery"), GameSpyColor[GSCOLOR_DEFAULT], NULL);
+		TheGameSpyInfo->addText(L"Toggled CRC fakery", GameSpyColor[GSCOLOR_DEFAULT], NULL);
 		return TRUE; // was a slash command
 	}
 	else if (token == "slots")
 	{
 		g_debugSlots = !g_debugSlots;
-		TheGameSpyInfo->addText(UnicodeString(L"Toggled SlotList debug"), GameSpyColor[GSCOLOR_DEFAULT], NULL);
+		TheGameSpyInfo->addText(L"Toggled SlotList debug", GameSpyColor[GSCOLOR_DEFAULT], NULL);
 		return TRUE; // was a slash command
 	}
 #endif
@@ -318,7 +313,7 @@ static void playerTooltip(GameWindow *window,
 	rank = i;
 	AsciiString sideName = "GUI:RandomSide";
 	if (info->m_side > 0)
-	{		
+	{
 		const PlayerTemplate *fac = ThePlayerTemplateStore->getNthPlayerTemplate(info->m_side);
 		if (fac)
 		{
@@ -349,7 +344,7 @@ static void populateGroupRoomListbox(GameWindow *lb)
 		GameSpyGroupRoom room = iter->second;
 		if (room.m_groupID != TheGameSpyConfig->getQMChannel())
 		{
-			DEBUG_LOG(("populateGroupRoomListbox(): groupID %d\n", room.m_groupID));
+			DEBUG_LOG(("populateGroupRoomListbox(): groupID %d", room.m_groupID));
 			if (room.m_groupID == TheGameSpyInfo->getCurrentGroupRoom())
 			{
 				Int selected = GadgetComboBoxAddEntry(lb, room.m_translatedName, GameSpyColor[GSCOLOR_CURRENTROOM]);
@@ -364,14 +359,14 @@ static void populateGroupRoomListbox(GameWindow *lb)
 		}
 		else
 		{
-			DEBUG_LOG(("populateGroupRoomListbox(): skipping QM groupID %d\n", room.m_groupID));
+			DEBUG_LOG(("populateGroupRoomListbox(): skipping QM groupID %d", room.m_groupID));
 		}
 	}
 
 	GadgetComboBoxSetSelectedPos(lb, indexToSelect);
 }
 
-static const char *rankNames[] = {
+static const char *const rankNames[] = {
 	"Private",
 	"Corporal",
 	"Sergeant",
@@ -383,6 +378,8 @@ static const char *rankNames[] = {
 	"Brigadier",
 	"Commander",
 };
+static_assert(ARRAY_SIZE(rankNames) == MAX_RANKS, "Incorrect array size");
+
 
 const Image* LookupSmallRankImage(Int side, Int rankPoints)
 {
@@ -415,7 +412,7 @@ const Image* LookupSmallRankImage(Int side, Int rankPoints)
 	AsciiString fullImageName;
 	fullImageName.format("%s-%s", rankNames[rank], sideStr.str());
 	const Image *img = TheMappedImageCollection->findImageByName(fullImageName);
-	DEBUG_ASSERTLOG(img, ("*** Could not load small rank image '%s' from TheMappedImageCollection!\n", fullImageName.str()));
+	DEBUG_ASSERTLOG(img, ("*** Could not load small rank image '%s' from TheMappedImageCollection!", fullImageName.str()));
 	return img;
 }
 
@@ -504,7 +501,7 @@ void PopulateLobbyPlayerListbox(void)
 			uStr = GadgetListBoxGetText(listboxLobbyPlayers, selectedIndices[i], 2);
 			selectedName.translate(uStr);
 			selectedNames.insert(selectedName);
-			DEBUG_LOG(("Saving off old selection %d (%s)\n", selectedIndices[i], selectedName.str()));
+			DEBUG_LOG(("Saving off old selection %d (%s)", selectedIndices[i], selectedName.str()));
 		}
 
 		// save off old top entry
@@ -523,7 +520,7 @@ void PopulateLobbyPlayerListbox(void)
 				selIt = selectedNames.find(info.m_name);
 				if (selIt != selectedNames.end())
 				{
-					DEBUG_LOG(("Marking index %d (%s) to re-select\n", index, info.m_name.str()));
+					DEBUG_LOG(("Marking index %d (%s) to re-select", index, info.m_name.str()));
 					indicesToSelect.insert(index);
 				}
 			}
@@ -541,7 +538,7 @@ void PopulateLobbyPlayerListbox(void)
 				selIt = selectedNames.find(info.m_name);
 				if (selIt != selectedNames.end())
 				{
-					DEBUG_LOG(("Marking index %d (%s) to re-select\n", index, info.m_name.str()));
+					DEBUG_LOG(("Marking index %d (%s) to re-select", index, info.m_name.str()));
 					indicesToSelect.insert(index);
 				}
 			}
@@ -559,23 +556,27 @@ void PopulateLobbyPlayerListbox(void)
 				selIt = selectedNames.find(info.m_name);
 				if (selIt != selectedNames.end())
 				{
-					DEBUG_LOG(("Marking index %d (%s) to re-select\n", index, info.m_name.str()));
+					DEBUG_LOG(("Marking index %d (%s) to re-select", index, info.m_name.str()));
 					indicesToSelect.insert(index);
 				}
 			}
 		}
 
 		// restore selection
-		if (indicesToSelect.size())
+		if (!indicesToSelect.empty())
 		{
-			std::set<Int>::const_iterator indexIt;
-			Int *newIndices = NEW Int[indicesToSelect.size()];
-			for (i=0, indexIt = indicesToSelect.begin(); indexIt != indicesToSelect.end(); ++i, ++indexIt)
+			std::set<Int>::const_iterator indexIt = indicesToSelect.begin();
+			const size_t count = indicesToSelect.size();
+			size_t index = 0;
+			Int *newIndices = NEW Int[count];
+			while (index < count)
 			{
-				newIndices[i] = *indexIt;
-				DEBUG_LOG(("Queueing up index %d to re-select\n", *indexIt));
+				newIndices[index] = *indexIt;
+				DEBUG_LOG(("Queueing up index %d to re-select", *indexIt));
+				++index;
+				++indexIt;
 			}
-			GadgetListBoxSetSelected(listboxLobbyPlayers, newIndices, indicesToSelect.size());
+			GadgetListBoxSetSelected(listboxLobbyPlayers, newIndices, count);
 			delete[] newIndices;
 		}
 
@@ -604,40 +605,40 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
 	gameListRefreshTime = 0;
 	playerListRefreshTime = 0;
 
-	parentWOLLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomLobby.wnd:WOLLobbyMenuParent" ) );
+	parentWOLLobbyID = TheNameKeyGenerator->nameToKey( "WOLCustomLobby.wnd:WOLLobbyMenuParent" );
 	parent = TheWindowManager->winGetWindowFromId(NULL, parentWOLLobbyID);
 
-	buttonBackID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonBack"));
+	buttonBackID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonBack");
 	buttonBack = TheWindowManager->winGetWindowFromId(parent, buttonBackID);
 
-	buttonHostID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonHost"));
+	buttonHostID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonHost");
 	buttonHost = TheWindowManager->winGetWindowFromId(parent, buttonHostID);
 
-	buttonRefreshID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonRefresh"));
+	buttonRefreshID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonRefresh");
 	buttonRefresh = TheWindowManager->winGetWindowFromId(parent, buttonRefreshID);
 
-	buttonJoinID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonJoin"));
+	buttonJoinID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonJoin");
 	buttonJoin = TheWindowManager->winGetWindowFromId(parent, buttonJoinID);
 	buttonJoin->winEnable(FALSE);
 
-	buttonBuddyID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonBuddy"));
+	buttonBuddyID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonBuddy");
 	buttonBuddy = TheWindowManager->winGetWindowFromId(parent, buttonBuddyID);
 
-	buttonEmoteID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonEmote"));
+	buttonEmoteID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonEmote");
 	buttonEmote = TheWindowManager->winGetWindowFromId(parent, buttonEmoteID);
 
-	textEntryChatID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:TextEntryChat"));
+	textEntryChatID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:TextEntryChat");
 	textEntryChat = TheWindowManager->winGetWindowFromId(parent, textEntryChatID);
 
-	listboxLobbyPlayersID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ListboxPlayers"));
+	listboxLobbyPlayersID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ListboxPlayers");
 	listboxLobbyPlayers = TheWindowManager->winGetWindowFromId(parent, listboxLobbyPlayersID);
 	listboxLobbyPlayers->winSetTooltipFunc(playerTooltip);
 
-	listboxLobbyChatID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ListboxChat"));
+	listboxLobbyChatID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ListboxChat");
 	listboxLobbyChat = TheWindowManager->winGetWindowFromId(parent, listboxLobbyChatID);
 	TheGameSpyInfo->registerTextWindow(listboxLobbyChat);
 
-	comboLobbyGroupRoomsID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ComboBoxGroupRooms"));
+	comboLobbyGroupRoomsID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ComboBoxGroupRooms");
 	comboLobbyGroupRooms = TheWindowManager->winGetWindowFromId(parent, comboLobbyGroupRoomsID);
 
 	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);
@@ -652,19 +653,19 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
 	{
 		if (groupRoomToJoin)
 		{
-			DEBUG_LOG(("WOLLobbyMenuInit() - rejoining group room %d\n", groupRoomToJoin));
+			DEBUG_LOG(("WOLLobbyMenuInit() - rejoining group room %d", groupRoomToJoin));
 			TheGameSpyInfo->joinGroupRoom(groupRoomToJoin);
 			groupRoomToJoin = 0;
 		}
 		else
 		{
-			DEBUG_LOG(("WOLLobbyMenuInit() - joining best group room\n"));
+			DEBUG_LOG(("WOLLobbyMenuInit() - joining best group room"));
 			TheGameSpyInfo->joinBestGroupRoom();
 		}
 	}
 	else
 	{
-		DEBUG_LOG(("WOLLobbyMenuInit() - not joining group room because we're already in one\n"));
+		DEBUG_LOG(("WOLLobbyMenuInit() - not joining group room because we're already in one"));
 	}
 
 	GrabWindowInfo();
@@ -679,7 +680,7 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
 //	TheShell->registerWithAnimateManager(parent, WIN_ANIMATION_SLIDE_TOP, TRUE);
 	TheShell->showShellMap(TRUE);
 	TheGameSpyGame->reset();
-	
+
 	CustomMatchPreferences pref;
 //	GameWindow *slider = TheWindowManager->winGetWindowFromId(parent, sliderChatAdjustID);
 //	if (slider)
@@ -704,7 +705,7 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
 	if(win)
 		win->winHide(TRUE);
 	DontShowMainMenu = TRUE;
-} // WOLLobbyMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -727,7 +728,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	nextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Lobby Menu shutdown method */
@@ -772,7 +773,7 @@ void WOLLobbyMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 	DontShowMainMenu = FALSE;
@@ -780,7 +781,7 @@ void WOLLobbyMenuShutdown( WindowLayout *layout, void *userData )
 	RaiseGSMessageBox();
 	TheTransitionHandler->reverse("WOLCustomLobbyFade");
 
-}  // WOLLobbyMenuShutdown
+}
 
 static void fillPlayerInfo(const PeerResponse *resp, PlayerInfo *info)
 {
@@ -844,7 +845,7 @@ static const char* getMessageString(Int t)
 #endif // PERF_TEST
 
 //-------------------------------------------------------------------------------------------------
-/** refreshGameList 
+/** refreshGameList
 		The Bool is used to force refresh if the refresh button was hit.*/
 //-------------------------------------------------------------------------------------------------
 static void refreshGameList( Bool forceRefresh )
@@ -855,19 +856,19 @@ static void refreshGameList( Bool forceRefresh )
 	{
 		if (TheGameSpyInfo->hasStagingRoomListChanged())
 		{
-			//DEBUG_LOG(("################### refreshing game list\n"));
-			//DEBUG_LOG(("gameRefreshTime=%d, refreshInterval=%d, now=%d\n", gameListRefreshTime, refreshInterval, timeGetTime()));
+			//DEBUG_LOG(("################### refreshing game list"));
+			//DEBUG_LOG(("gameRefreshTime=%d, refreshInterval=%d, now=%d", gameListRefreshTime, refreshInterval, timeGetTime()));
 			RefreshGameListBoxes();
 			gameListRefreshTime = timeGetTime();
 		} else {
 			//DEBUG_LOG(("-"));
 		}
 	} else {
-		//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d\n"));
+		//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d", gameListRefreshTime, refreshInterval));
 	}
 }
 //-------------------------------------------------------------------------------------------------
-/** refreshPlayerList 
+/** refreshPlayerList
 		The Bool is used to force refresh if the refresh button was hit.*/
 //-------------------------------------------------------------------------------------------------
 static void refreshPlayerList( Bool forceRefresh )
@@ -901,9 +902,9 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 	{
 		SignalUIInteraction(SHELL_SCRIPT_HOOK_GENERALS_ONLINE_ENTERED_FROM_GAME);
 	}
-	
 
-	// We'll only be successful if we've requested to 
+
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 		shutdownComplete(layout);
 
@@ -955,7 +956,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 				}
 				else
 				{
-					DEBUG_LOG(("WOLLobbyMenuUpdate() - joining best group room\n"));
+					DEBUG_LOG(("WOLLobbyMenuUpdate() - joining best group room"));
 					TheGameSpyInfo->joinBestGroupRoom();
 				}
 				populateGroupRoomListbox(comboLobbyGroupRooms);
@@ -999,7 +1000,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 			case PeerResponse::PEERRESPONSE_PLAYERUTM:
 			case PeerResponse::PEERRESPONSE_ROOMUTM:
 				{
-					DEBUG_LOG(("Putting off a UTM in the lobby\n"));
+					DEBUG_LOG(("Putting off a UTM in the lobby"));
 					TheLobbyQueuedUTMs.push_back(resp);
 				}
 				break;
@@ -1030,6 +1031,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 					TheGameSpyInfo->reset();
 					TheShell->pop();
 				}
+				break;
 			case PeerResponse::PEERRESPONSE_CREATESTAGINGROOM:
 				{
 					sawImportantMessage = TRUE;
@@ -1065,9 +1067,9 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 								AsciiString hostName;
 								hostName.translate(room->getConstSlot(0)->getName());
 								const char *firstPlayer = resp.stagingRoomPlayerNames[i].c_str();
-								if (!strcmp(hostName.str(), firstPlayer))
+								if (strcmp(hostName.str(), firstPlayer) == 0)
 								{
-									DEBUG_LOG(("Saw host %s == %s in slot %d\n", hostName.str(), firstPlayer, i));
+									DEBUG_LOG(("Saw host %s == %s in slot %d", hostName.str(), firstPlayer, i));
 									isHostPresent = TRUE;
 								}
 							}
@@ -1111,13 +1113,13 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 						GSMessageBoxOk(TheGameText->fetch("GUI:JoinFailedDefault"), s);
 						if (groupRoomToJoin)
 						{
-							DEBUG_LOG(("WOLLobbyMenuUpdate() - rejoining group room %d\n", groupRoomToJoin));
+							DEBUG_LOG(("WOLLobbyMenuUpdate() - rejoining group room %d", groupRoomToJoin));
 							TheGameSpyInfo->joinGroupRoom(groupRoomToJoin);
 							groupRoomToJoin = 0;
 						}
 						else
 						{
-							DEBUG_LOG(("WOLLobbyMenuUpdate() - joining best group room\n"));
+							DEBUG_LOG(("WOLLobbyMenuUpdate() - joining best group room"));
 							TheGameSpyInfo->joinBestGroupRoom();
 						}
 					}
@@ -1133,7 +1135,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 					{
 					case PEER_CLEAR:
 						TheGameSpyInfo->clearStagingRoomList();
-						//TheGameSpyInfo->addText( UnicodeString(L"gameList: PEER_CLEAR"), GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
+						//TheGameSpyInfo->addText( L"gameList: PEER_CLEAR", GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
 						break;
 					case PEER_ADD:
 					case PEER_UPDATE:
@@ -1146,7 +1148,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 						//if (ParseAsciiStringToGameInfo(&room, resp.stagingRoomMapName.c_str()))
 						//if (ParseAsciiStringToGameInfo(&room, resp.stagingServerGameOptions.c_str()))
 						Bool serverOk = TRUE;
-						if (!resp.stagingRoomMapName.length())
+						if (resp.stagingRoomMapName.empty())
 						{
 							serverOk = FALSE;
 						}
@@ -1171,6 +1173,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 							room.setExeCRC(resp.stagingRoom.exeCRC);
 							room.setIniCRC(resp.stagingRoom.iniCRC);
 							room.setAllowObservers(resp.stagingRoom.allowObservers);
+              room.setUseStats(resp.stagingRoom.useStats);
 							room.setPingString(resp.stagingServerPingString.c_str());
 							room.setLadderIP(resp.stagingServerLadderIP.c_str());
 							room.setLadderPort(resp.stagingRoom.ladderPort);
@@ -1217,7 +1220,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 										slot->setState(SLOT_BRUTAL_AI);
 										++numPlayers;
 									}
-									else if (resp.stagingRoomPlayerNames[i].length())
+									else if (!resp.stagingRoomPlayerNames[i].empty())
 									{
 										UnicodeString nameUStr;
 										nameUStr.translate(resp.stagingRoomPlayerNames[i].c_str());
@@ -1230,34 +1233,34 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 									}
 								}
 							}
-							DEBUG_ASSERTCRASH(numPlayers, ("Game had no players!\n"));
-							//DEBUG_LOG(("Saw room: hasPass=%d, allowsObservers=%d\n", room.getHasPassword(), room.getAllowObservers()));
+							DEBUG_ASSERTCRASH(numPlayers, ("Game had no players!"));
+							//DEBUG_LOG(("Saw room: hasPass=%d, allowsObservers=%d", room.getHasPassword(), room.getAllowObservers()));
 							if (resp.stagingRoom.action == PEER_ADD)
 							{
 								TheGameSpyInfo->addStagingRoom(room);
-								//TheGameSpyInfo->addText( UnicodeString(L"gameList: PEER_ADD"), GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
+								//TheGameSpyInfo->addText( L"gameList: PEER_ADD", GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
 							}
 							else
 							{
 								TheGameSpyInfo->updateStagingRoom(room);
-								//TheGameSpyInfo->addText( UnicodeString(L"gameList: PEER_UPDATE"), GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
+								//TheGameSpyInfo->addText( L"gameList: PEER_UPDATE", GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
 							}
 						}
 						else
 						{
 							room.setID(resp.stagingRoom.id);
 							TheGameSpyInfo->removeStagingRoom(room);
-							//TheGameSpyInfo->addText( UnicodeString(L"gameList: PEER_UPDATE FAILED"), GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
+							//TheGameSpyInfo->addText( L"gameList: PEER_UPDATE FAILED", GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
 						}
 						break;
 					}
 					case PEER_REMOVE:
 						room.setID(resp.stagingRoom.id);
 						TheGameSpyInfo->removeStagingRoom(room);
-						//TheGameSpyInfo->addText( UnicodeString(L"gameList: PEER_REMOVE"), GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
+						//TheGameSpyInfo->addText( L"gameList: PEER_REMOVE", GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
 						break;
 					default:
-						//TheGameSpyInfo->addText( UnicodeString(L"gameList: Unknown"), GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
+						//TheGameSpyInfo->addText( L"gameList: Unknown", GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
 						break;
 					}
 				}
@@ -1276,38 +1279,38 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 #ifdef PERF_TEST
 		// check performance
 		end = timeGetTime();
-		PERF_LOG(("Frame time was %d ms\n", end-start));
+		PERF_LOG(("Frame time was %d ms", end-start));
 		std::list<Int>::const_iterator it;
 		for (it = responses.begin(); it != responses.end(); ++it)
 		{
-			PERF_LOG(("  %s\n", getMessageString(*it)));
+			PERF_LOG(("  %s", getMessageString(*it)));
 		}
-		PERF_LOG(("\n"));
+		PERF_LOG((""));
 #endif // PERF_TEST
 
 #if 0
-// Removed 2-17-03 to pull out into a function so we can do the same checks 
+// Removed 2-17-03 to pull out into a function so we can do the same checks
 		Int refreshInterval = gameListRefreshInterval;
 
 		if ((gameListRefreshTime == 0) || ((gameListRefreshTime + refreshInterval) <= timeGetTime()))
 		{
 			if (TheGameSpyInfo->hasStagingRoomListChanged())
 			{
-				//DEBUG_LOG(("################### refreshing game list\n"));
-				//DEBUG_LOG(("gameRefreshTime=%d, refreshInterval=%d, now=%d\n", gameListRefreshTime, refreshInterval, timeGetTime()));
+				//DEBUG_LOG(("################### refreshing game list"));
+				//DEBUG_LOG(("gameRefreshTime=%d, refreshInterval=%d, now=%d", gameListRefreshTime, refreshInterval, timeGetTime()));
 				RefreshGameListBoxes();
 				gameListRefreshTime = timeGetTime();
 			} else {
 				//DEBUG_LOG(("-"));
 			}
 		} else {
-			//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d\n"));
+			//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d", gameListRefreshTime, refreshInterval));
 		}
 #else
 	refreshGameList();
 #endif
 	}
-}// WOLLobbyMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Lobby Menu input callback */
@@ -1315,7 +1318,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLLobbyMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1332,31 +1335,31 @@ WindowMsgHandledType WOLLobbyMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLLobbyMenuInput
+}
 
 //static void doSliderTrack(GameWindow *control, Int val)
 //{
@@ -1410,7 +1413,7 @@ WindowMsgHandledType WOLLobbyMenuInput( GameWindow *window, UnsignedInt msg,
 //-------------------------------------------------------------------------------------------------
 /** WOL Lobby Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
@@ -1418,32 +1421,32 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 
 	switch( msg )
 	{
-		
-		
+
+
 		//---------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 			{
 				buttonGameListTypeToggleID = NAMEKEY("WOLCustomLobby.wnd:ButtonGameListToggle");
 //				sliderChatAdjustID = NAMEKEY("WOLCustomLobby.wnd:SliderChatAdjust");
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		//---------------------------------------------------------------------------------------------
 		case GLM_SELECTED:
@@ -1480,7 +1483,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					{
 						RefreshGameInfoListBox(GetGameListBox(), GetGameInfoListBox());
 					}
-				} //if ( controlID == GetGameListBoxID() )
+				}
 
 				break;
 			}
@@ -1511,11 +1514,11 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					nextScreen = "Menus/WOLWelcomeMenu.wnd";
 					TheShell->pop();
 
-				} //if ( controlID == buttonBack )
+				}
 				else if ( controlID == buttonRefreshID )
 				{
 					// Added 2/17/03 added the game refresh button
-					refreshGameList(TRUE);	
+					refreshGameList(TRUE);
 					refreshPlayerList(TRUE);
 				}
 				else if ( controlID == buttonHostID )
@@ -1551,8 +1554,8 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 								if (!roomToJoin || roomToJoin->getExeCRC() != TheGlobalData->m_exeCRC || roomToJoin->getIniCRC() != TheGlobalData->m_iniCRC)
 								{
 									// bad crc.  don't go.
-									DEBUG_LOG(("WOLLobbyMenuSystem - CRC mismatch with the game I'm trying to join. My CRC's - EXE:0x%08X INI:0x%08X  Their CRC's - EXE:0x%08x INI:0x%08x\n", TheGlobalData->m_exeCRC, TheGlobalData->m_iniCRC, roomToJoin->getExeCRC(), roomToJoin->getIniCRC()));
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+									DEBUG_LOG(("WOLLobbyMenuSystem - CRC mismatch with the game I'm trying to join. My CRC's - EXE:0x%08X INI:0x%08X  Their CRC's - EXE:0x%08x INI:0x%08x", TheGlobalData->m_exeCRC, TheGlobalData->m_iniCRC, roomToJoin->getExeCRC(), roomToJoin->getIniCRC()));
+#if defined(RTS_DEBUG)
 									if (TheGlobalData->m_netMinPlayers)
 									{
 										GSMessageBoxOk(TheGameText->fetch("GUI:JoinFailedDefault"), TheGameText->fetch("GUI:JoinFailedCRCMismatch"));
@@ -1631,9 +1634,9 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 						TheGameSpyInfo->sendChat( txtInput, FALSE, listboxLobbyPlayers ); // 'emote' button now just sends text
 					}
 				}
-				
+
 				break;
-			}// case GBM_SELECTED:
+			}
 
 		//---------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
@@ -1642,17 +1645,17 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					break;
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == comboLobbyGroupRoomsID ) 
+				if( controlID == comboLobbyGroupRoomsID )
 				{
 					int rowSelected = -1;
 					GadgetComboBoxGetSelectedPos(control, &rowSelected);
-				
-					DEBUG_LOG(("Row selected = %d\n", rowSelected));
+
+					DEBUG_LOG(("Row selected = %d", rowSelected));
 					if (rowSelected >= 0)
 					{
 						Int groupID;
 						groupID = (Int)GadgetComboBoxGetItemData(comboLobbyGroupRooms, rowSelected);
-						DEBUG_LOG(("ItemData was %d, current Group Room is %d\n", groupID, TheGameSpyInfo->getCurrentGroupRoom()));
+						DEBUG_LOG(("ItemData was %d, current Group Room is %d", groupID, TheGameSpyInfo->getCurrentGroupRoom()));
 						if (groupID && groupID != TheGameSpyInfo->getCurrentGroupRoom())
 						{
 							TheGameSpyInfo->leaveGroupRoom();
@@ -1670,7 +1673,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 						}
 					}
 				}
-			} // case GCM_SELECTED
+			}
 			break;
 
 		//---------------------------------------------------------------------------------------------
@@ -1684,18 +1687,18 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 				if (controlID == GetGameListBoxID())
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						GadgetListBoxSetSelected( control, rowSelected );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonJoinID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonJoinID );
 					}
 				}
 				break;
-			}// case GLM_DOUBLE_CLICKED:
+			}
 
 		//---------------------------------------------------------------------------------------------
 		case GLM_RIGHT_CLICKED:
@@ -1703,7 +1706,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
 
-				if( controlID == listboxLobbyPlayersID ) 
+				if( controlID == listboxLobbyPlayersID )
 				{
 					RightClickStruct *rc = (RightClickStruct *)mData2;
 					WindowLayout *rcLayout = NULL;
@@ -1723,26 +1726,26 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 
 					Bool isBuddy = FALSE;
 					if (profileID <= 0)
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNoProfileMenu.wnd"));	
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCNoProfileMenu.wnd");
 					else
 					{
 						if (profileID == TheGameSpyInfo->getLocalProfileID())
 						{
-							rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCLocalPlayerMenu.wnd"));
+							rcLayout = TheWindowManager->winCreateLayout("Menus/RCLocalPlayerMenu.wnd");
 						}
 						else if(TheGameSpyInfo->isBuddy(profileID))
 						{
-							rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddiesMenu.wnd"));
+							rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddiesMenu.wnd");
 							isBuddy = TRUE;
 						}
 						else
-							rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNonBuddiesMenu.wnd"));
+							rcLayout = TheWindowManager->winCreateLayout("Menus/RCNonBuddiesMenu.wnd");
 					}
 					if(!rcLayout)
 						break;
-					
+
 					GadgetListBoxSetSelected(control, rc->pos);
-					
+
 					rcMenu = rcLayout->getFirstWindow();
 					rcMenu->winGetLayout()->runInit();
 					rcMenu->winBringToTop();
@@ -1757,7 +1760,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					if(rc->mouseY + rcSize.y > TheDisplay->getHeight())
 						rcPos.y = TheDisplay->getHeight() - rcSize.y;
 					rcMenu->winSetPosition(rcPos.x, rcPos.y);
-					
+
 					GameSpyRCMenuData *rcData = NEW GameSpyRCMenuData;
 					rcData->m_id = profileID;
 					rcData->m_nick = aName;
@@ -1765,7 +1768,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					rcMenu->winSetUserData((void *)rcData);
 					TheWindowManager->winSetLoneWindow(rcMenu);
 				}
-				else if( controlID == GetGameListBoxID() ) 
+				else if( controlID == GetGameListBoxID() )
 				{
 					RightClickStruct *rc = (RightClickStruct *)mData2;
 					WindowLayout *rcLayout = NULL;
@@ -1789,7 +1792,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 							const LadderInfo *linfo = TheLadderList->findLadder(theRoom->getLadderIP(), theRoom->getLadderPort());
 							if (linfo)
 							{
-								rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCGameDetailsMenu.wnd"));	
+								rcLayout = TheWindowManager->winCreateLayout("Menus/RCGameDetailsMenu.wnd");
 								if (!rcLayout)
 									break;
 
@@ -1800,7 +1803,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 								rcMenu->winBringToTop();
 								rcMenu->winHide(FALSE);
 								rcMenu->winSetPosition(rc->mouseX, rc->mouseY);
-								
+
 								rcMenu->winSetUserData((void *)selectedID);
 								TheWindowManager->winSetLoneWindow(rcMenu);
 							}
@@ -1852,7 +1855,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLLobbyMenuSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
index 20f24e1f5da..59d80e4051e 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameText.h"
 #include "Common/CustomMatchPreferences.h"
@@ -48,11 +48,6 @@
 #include "GameNetwork/GameSpy/PersistentStorageDefs.h"
 #include "GameNetwork/GameSpy/PersistentStorageThread.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 // window ids ------------------------------------------------------------------------------
@@ -70,9 +65,9 @@ static GameWindow *listboxLocale = NULL;
 //-------------------------------------------------------------------------------------------------
 void WOLLocaleSelectInit( WindowLayout *layout, void *userData )
 {
-	parentLocaleSelectID = TheNameKeyGenerator->nameToKey( AsciiString( "PopupLocaleSelect.wnd:ParentLocaleSelect" ) );
-	buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "PopupLocaleSelect.wnd:ButtonOk" ) );
-	listboxLocaleID = TheNameKeyGenerator->nameToKey( AsciiString( "PopupLocaleSelect.wnd:ListBoxLocaleSelect" ) );
+	parentLocaleSelectID = TheNameKeyGenerator->nameToKey( "PopupLocaleSelect.wnd:ParentLocaleSelect" );
+	buttonOkID = TheNameKeyGenerator->nameToKey( "PopupLocaleSelect.wnd:ButtonOk" );
+	listboxLocaleID = TheNameKeyGenerator->nameToKey( "PopupLocaleSelect.wnd:ListBoxLocaleSelect" );
 	parentLocaleSelect = TheWindowManager->winGetWindowFromId( NULL, parentLocaleSelectID );
 	buttonOk = TheWindowManager->winGetWindowFromId( NULL,  buttonOkID);
 	listboxLocale = TheWindowManager->winGetWindowFromId( NULL,  listboxLocaleID);
@@ -91,7 +86,7 @@ void WOLLocaleSelectInit( WindowLayout *layout, void *userData )
 	// Set Keyboard to Main Parent
 	TheWindowManager->winSetFocus( parentLocaleSelect );
 	TheWindowManager->winSetModal( parentLocaleSelect );
-} // WOLLocaleSelectInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu shutdown method */
@@ -105,7 +100,7 @@ void WOLLocaleSelectShutdown( WindowLayout *layout, void *userData )
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // WOLLocaleSelectShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -113,8 +108,8 @@ void WOLLocaleSelectShutdown( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 void WOLLocaleSelectUpdate( WindowLayout * layout, void *userData)
 {
-	
-}// WOLLocaleSelectUpdate
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu input callback */
@@ -122,7 +117,7 @@ void WOLLocaleSelectUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLLocaleSelectInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -134,43 +129,43 @@ WindowMsgHandledType WOLLocaleSelectInput( GameWindow *window, UnsignedInt msg,
 			// ----------------------------------------------------------------------------------------
 			// don't let key fall through anywhere else
 			return MSG_HANDLED;
-		}  // end char
-	}  // end switch( msg )
+		}
+	}
 	return MSG_IGNORED;
-}// WOLLocaleSelectInput
+}
 
 //Int getRegistryNicknameOffset(AsciiString nick); /// @todo: mdc remove this once we can save ini pref files
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLLocaleSelectSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLLocaleSelectSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -210,7 +205,7 @@ WindowMsgHandledType WOLLocaleSelectSystem( GameWindow *window, UnsignedInt msg,
 						TheGameSpyInfo->setCachedLocalPlayerStats(stats);
 					}
 					else
-					{						
+					{
 						// force an update of our shtuff
 						PSResponse newResp;
 						newResp.responseType = PSResponse::PSRESPONSE_PLAYERSTATS;
@@ -218,10 +213,10 @@ WindowMsgHandledType WOLLocaleSelectSystem( GameWindow *window, UnsignedInt msg,
 						TheGameSpyPSMessageQueue->addResponse(newResp);
 					}
 					CheckReOpenPlayerInfo();
-				} //if ( controlID == buttonDisconnect )
+				}
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -229,7 +224,7 @@ WindowMsgHandledType WOLLocaleSelectSystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLLocaleSelectSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
index e01a232ffc3..74f8f49bbdd 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/STLTypedefs.h"
 
@@ -69,11 +69,6 @@
 
 #include "GameNetwork/WOLBrowser/WebBrowser.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #ifdef ALLOW_NON_PROFILED_LOGIN
 Bool GameSpyUseProfiles = false;
@@ -225,7 +220,7 @@ Bool GameSpyLoginPreferences::write( void )
 			fprintf(fp, "pass_%s = %s\n", passIt->first.str(), quoPass.str());
 			++passIt;
 		}
-		
+
 		PassMap::iterator dateIt = m_emailDateMap.begin();
 		while (dateIt != m_emailDateMap.end())
 		{
@@ -369,7 +364,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	nextScreen = NULL;
 
-}  // end if
+}
 
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -458,7 +453,7 @@ void WOLLoginMenuInit( WindowLayout *layout, void *userData )
 	{
 		loginPref = NEW GameSpyLoginPreferences;
 	}
-	
+
 	// if the ESRB warning is blank (other country) hide the box
 	GameWindow *esrbTitle = TheWindowManager->winGetWindowFromId( NULL, NAMEKEY("GameSpyLoginProfile.wnd:StaticTextESRBTop") );
 	GameWindow *esrbParent = TheWindowManager->winGetWindowFromId( NULL, NAMEKEY("GameSpyLoginProfile.wnd:ParentESRB") );
@@ -509,9 +504,9 @@ void WOLLoginMenuInit( WindowLayout *layout, void *userData )
 	textEntryYear =					TheWindowManager->winGetWindowFromId( NULL,  textEntryYearID);
 
 	GadgetTextEntrySetText(textEntryMonth, UnicodeString::TheEmptyString);
-	
+
 	GadgetTextEntrySetText(textEntryDay, UnicodeString::TheEmptyString);
-	
+
 	GadgetTextEntrySetText(textEntryYear, UnicodeString::TheEmptyString);
 
 
@@ -596,12 +591,12 @@ void WOLLoginMenuInit( WindowLayout *layout, void *userData )
 		DEBUG_ASSERTCRASH(textEntryLoginName,		("textEntryLoginName missing!"));
 		TheWindowManager->winSetFocus( textEntryLoginName );
 		//TheShell->registerWithAnimateManager(parentWOLLogin, WIN_ANIMATION_SLIDE_TOP, TRUE);
-		
+
 //		TheShell->registerWithAnimateManager(buttonTOS, WIN_ANIMATION_SLIDE_LEFT, TRUE);
 //		TheShell->registerWithAnimateManager(buttonCreateAccount, WIN_ANIMATION_SLIDE_LEFT, TRUE);
 //		TheShell->registerWithAnimateManager(buttonUseAccount, WIN_ANIMATION_SLIDE_LEFT, TRUE);
 //		TheShell->registerWithAnimateManager(buttonBack, WIN_ANIMATION_SLIDE_RIGHT, TRUE);
-		
+
 	}
 #endif // ALLOW_NON_PROFILED_LOGIN
 
@@ -651,7 +646,7 @@ void WOLLoginMenuInit( WindowLayout *layout, void *userData )
 			UnicodeString pass;
 			pass.translate(loginPref->getPasswordForEmail(lastEmail));
 			GadgetTextEntrySetText(textEntryPassword, pass);
-			
+
 			AsciiString month,day,year;
 			loginPref->getDateForEmail(lastEmail, month, day, year);
 			pass.translate(month);
@@ -720,18 +715,18 @@ void WOLLoginMenuInit( WindowLayout *layout, void *userData )
 	layout->hide( FALSE );
 
 	// Set Keyboard to Main Parent
-	
+
 	RaiseGSMessageBox();
 
 	OptionPreferences optionPref;
 	if (!optionPref.getBool("SawTOS", TRUE))
 	{
-		TheWindowManager->winSendSystemMsg( parentWOLLogin, GBM_SELECTED, 
+		TheWindowManager->winSendSystemMsg( parentWOLLogin, GBM_SELECTED,
 																			(WindowMsgData)buttonTOS, buttonTOSID );
 	}
 	TheTransitionHandler->setGroup("GameSpyLoginProfileFade");
 
-} // WOLLoginMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Login Menu shutdown method */
@@ -759,12 +754,12 @@ void WOLLoginMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 	TheTransitionHandler->reverse("GameSpyLoginProfileFade");
 
-}  // WOLLoginMenuShutdown
+}
 
 
 // this is used to check if we've got all the pings
@@ -774,7 +769,7 @@ static void checkLogin( void )
 	{
 		// save off our ping string, and end those threads
 		AsciiString pingStr = ThePinger->getPingString( 1000 );
-		DEBUG_LOG(("Ping string is %s\n", pingStr.str()));
+		DEBUG_LOG(("Ping string is %s", pingStr.str()));
 		TheGameSpyInfo->setPingString(pingStr);
 		//delete ThePinger;
 		//ThePinger = NULL;
@@ -790,7 +785,7 @@ static void checkLogin( void )
 		SignalUIInteraction(SHELL_SCRIPT_HOOK_GENERALS_ONLINE_LOGIN);
 		nextScreen = "Menus/WOLWelcomeMenu.wnd";
 		TheShell->pop();
-		
+
 		// read in some cached data
 		GameSpyMiscPreferences mPref;
 		PSPlayerStats localPSStats = GameSpyPSMessageQueueInterface::parsePlayerKVPairs(mPref.getCachedStats().str());
@@ -812,7 +807,7 @@ static void checkLogin( void )
 void WOLLoginMenuUpdate( WindowLayout * layout, void *userData)
 {
 
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 		shutdownComplete(layout);
 
@@ -835,7 +830,7 @@ void WOLLoginMenuUpdate( WindowLayout * layout, void *userData)
 					room.m_groupID = resp.groupRoom.id;
 					room.m_maxWaiting = resp.groupRoom.maxWaiting;
 					room.m_name = resp.groupRoomName.c_str();
-					room.m_translatedName = UnicodeString(L"TEST");
+					room.m_translatedName = L"TEST";
 					room.m_numGames = resp.groupRoom.numGames;
 					room.m_numPlaying = resp.groupRoom.numPlaying;
 					room.m_numWaiting = resp.groupRoom.numWaiting;
@@ -873,7 +868,7 @@ void WOLLoginMenuUpdate( WindowLayout * layout, void *userData)
 					// kill & restart the threads
 					AsciiString motd = TheGameSpyInfo->getMOTD();
 					AsciiString config = TheGameSpyInfo->getConfig();
-					DEBUG_LOG(("Tearing down GameSpy from WOLLoginMenuUpdate(PEERRESPONSE_DISCONNECT)\n"));
+					DEBUG_LOG(("Tearing down GameSpy from WOLLoginMenuUpdate(PEERRESPONSE_DISCONNECT)"));
 					TearDownGameSpy();
 					SetUpGameSpy( motd.str(), config.str() );
 				}
@@ -899,12 +894,12 @@ void WOLLoginMenuUpdate( WindowLayout * layout, void *userData)
 		// kill & restart the threads
 		AsciiString motd = TheGameSpyInfo->getMOTD();
 		AsciiString config = TheGameSpyInfo->getConfig();
-		DEBUG_LOG(("Tearing down GameSpy from WOLLoginMenuUpdate(login timeout)\n"));
+		DEBUG_LOG(("Tearing down GameSpy from WOLLoginMenuUpdate(login timeout)"));
 		TearDownGameSpy();
 		SetUpGameSpy( motd.str(), config.str() );
 	}
 
-}// WOLLoginMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Login Menu input callback */
@@ -912,7 +907,7 @@ void WOLLoginMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLLoginMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -929,31 +924,31 @@ WindowMsgHandledType WOLLoginMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLLoginMenuInput
+}
 
 static Bool isNickOkay(UnicodeString nick)
 {
@@ -1027,33 +1022,33 @@ static Bool isAgeOkay(AsciiString &month, AsciiString &day, AsciiString year)
 //-------------------------------------------------------------------------------------------------
 /** WOL Login Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		// someone typed in a combo box.  Clear password (or fill it in if the typed name matches a known login name)
 		case GCM_UPDATE_TEXT:
@@ -1071,17 +1066,13 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 				trimmedEmail.trim();
 				if (!trimmedNick.isEmpty())
 				{
-					if (trimmedNick.getCharAt(trimmedNick.getLength()-1) == L'\\')
-						trimmedNick.removeLastChar();
-					if (trimmedNick.getCharAt(trimmedNick.getLength()-1) == L'/')
-						trimmedNick.removeLastChar();
+					trimmedNick.trimEnd(L'\\');
+					trimmedNick.trimEnd(L'/');
 				}
 				if (!trimmedEmail.isEmpty())
 				{
-					if (trimmedEmail.getCharAt(trimmedEmail.getLength()-1) == L'\\')
-						trimmedEmail.removeLastChar();
-					if (trimmedEmail.getCharAt(trimmedEmail.getLength()-1) == L'/')
-						trimmedEmail.removeLastChar();
+					trimmedEmail.trimEnd(L'\\');
+					trimmedEmail.trimEnd(L'/');
 				}
 				if (trimmedEmail.getLength() != uEmail.getLength())
 				{
@@ -1134,7 +1125,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					}
 					else
 					{
-						GadgetCheckBoxSetChecked(checkBoxRememberPassword, false);						
+						GadgetCheckBoxSetChecked(checkBoxRememberPassword, false);
 						GadgetTextEntrySetText(textEntryMonth, UnicodeString::TheEmptyString);
 						GadgetTextEntrySetText(textEntryDay, UnicodeString::TheEmptyString);
 						GadgetTextEntrySetText(textEntryYear, UnicodeString::TheEmptyString);
@@ -1197,7 +1188,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					}
 					else
 					{
-						GadgetCheckBoxSetChecked(checkBoxRememberPassword, false);						
+						GadgetCheckBoxSetChecked(checkBoxRememberPassword, false);
 						GadgetTextEntrySetText(textEntryMonth, UnicodeString::TheEmptyString);
 						GadgetTextEntrySetText(textEntryDay, UnicodeString::TheEmptyString);
 						GadgetTextEntrySetText(textEntryYear, UnicodeString::TheEmptyString);
@@ -1224,7 +1215,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					buttonPushed = true;
 					TearDownGameSpy();
 					TheShell->pop();
-				} //if ( controlID == buttonBack )
+				}
 #ifdef ALLOW_NON_PROFILED_LOGIN
 				else if ( controlID == buttonUseAccountID )
 				{
@@ -1232,14 +1223,14 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					nextScreen = "Menus/GameSpyLoginProfile.wnd";
 					TheShell->pop();
 					//TheShell->push( "Menus/GameSpyLoginProfile.wnd" );
-				} //if ( controlID == buttonUseAccount )
+				}
 				else if ( controlID == buttonDontUseAccountID )
 				{
 					buttonPushed = true;
 					nextScreen = "Menus/GameSpyLoginQuick.wnd";
 					TheShell->pop();
 					//TheShell->push( "Menus/GameSpyLoginQuick.wnd" );
-				} //if ( controlID == buttonDontUseAccount )
+				}
 #endif // ALLOW_NON_PROFILED_LOGIN
 				else if ( controlID == buttonCreateAccountID )
 				{
@@ -1252,13 +1243,13 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 						month.translate( GadgetTextEntryGetText(textEntryMonth) );
 						day.translate( GadgetTextEntryGetText(textEntryDay) );
 						year.translate( GadgetTextEntryGetText(textEntryYear) );
-						
+
 						if(!isAgeOkay(month, day, year))
 						{
 							GSMessageBoxOk(TheGameText->fetch("GUI:AgeFailedTitle"), TheGameText->fetch("GUI:AgeFailed"));
 							break;
 						}
-						
+
 						AsciiString login, password, email;
 						email.translate( GadgetComboBoxGetText(comboBoxEmail) );
 						login.translate( GadgetComboBoxGetText(comboBoxLoginName) );
@@ -1269,20 +1260,20 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 							loginAttemptTime = timeGetTime();
 							BuddyRequest req;
 							req.buddyRequestType = BuddyRequest::BUDDYREQUEST_LOGINNEW;
-							strcpy(req.arg.login.nick, login.str());
-							strcpy(req.arg.login.email, email.str());
-							strcpy(req.arg.login.password, password.str());
+							strlcpy(req.arg.login.nick, login.str(), ARRAY_SIZE(req.arg.login.nick));
+							strlcpy(req.arg.login.email, email.str(), ARRAY_SIZE(req.arg.login.email));
+							strlcpy(req.arg.login.password, password.str(), ARRAY_SIZE(req.arg.login.password));
 							req.arg.login.hasFirewall = TRUE;
-							
+
 							TheGameSpyInfo->setLocalBaseName( login );
 							//TheGameSpyInfo->setLocalProfileID( resp.player.profileID );
 							TheGameSpyInfo->setLocalEmail( email );
 							TheGameSpyInfo->setLocalPassword( password );
-							DEBUG_LOG(("before create: TheGameSpyInfo->stuff(%s/%s/%s)\n", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
+							DEBUG_LOG(("before create: TheGameSpyInfo->stuff(%s/%s/%s)", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
 
 							TheGameSpyBuddyMessageQueue->addRequest( req );
 							if(checkBoxRememberPassword && GadgetCheckBoxIsChecked(checkBoxRememberPassword))
-							{	
+							{
 								(*loginPref)["lastName"] = login;
 								(*loginPref)["lastEmail"] = email;
 								(*loginPref)["useProfiles"] = "yes";
@@ -1329,7 +1320,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 						TheShell->pop();
 					}
 #endif // ALLOW_NON_PROFILED_LOGIN
-				} //if ( controlID == buttonCreateAccount )
+				}
 				else if ( controlID == buttonLoginID )
 				{
 					AsciiString login, password, email;
@@ -1342,7 +1333,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 						month.translate( GadgetTextEntryGetText(textEntryMonth) );
 						day.translate( GadgetTextEntryGetText(textEntryDay) );
 						year.translate( GadgetTextEntryGetText(textEntryYear) );
-						
+
 						if(!isAgeOkay(month, day, year))
 						{
 							GSMessageBoxOk(TheGameText->fetch("GUI:AgeFailedTitle"), TheGameText->fetch("GUI:AgeFailed"));
@@ -1358,20 +1349,20 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 							loginAttemptTime = timeGetTime();
 							BuddyRequest req;
 							req.buddyRequestType = BuddyRequest::BUDDYREQUEST_LOGIN;
-							strcpy(req.arg.login.nick, login.str());
-							strcpy(req.arg.login.email, email.str());
-							strcpy(req.arg.login.password, password.str());
+							strlcpy(req.arg.login.nick, login.str(), ARRAY_SIZE(req.arg.login.nick));
+							strlcpy(req.arg.login.email, email.str(), ARRAY_SIZE(req.arg.login.email));
+							strlcpy(req.arg.login.password, password.str(), ARRAY_SIZE(req.arg.login.password));
 							req.arg.login.hasFirewall = true;
-							
+
 							TheGameSpyInfo->setLocalBaseName( login );
 							//TheGameSpyInfo->setLocalProfileID( resp.player.profileID );
 							TheGameSpyInfo->setLocalEmail( email );
 							TheGameSpyInfo->setLocalPassword( password );
-							DEBUG_LOG(("before login: TheGameSpyInfo->stuff(%s/%s/%s)\n", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
+							DEBUG_LOG(("before login: TheGameSpyInfo->stuff(%s/%s/%s)", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
 
 							TheGameSpyBuddyMessageQueue->addRequest( req );
 							if(checkBoxRememberPassword && GadgetCheckBoxIsChecked(checkBoxRememberPassword))
-							{	
+							{
 								(*loginPref)["lastName"] = login;
 								(*loginPref)["lastEmail"] = email;
 								(*loginPref)["useProfiles"] = "yes";
@@ -1437,7 +1428,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					}
 #endif // ALLOW_NON_PROFILED_LOGIN
 
-				} //if ( controlID == buttonLogin )
+				}
 				else if ( controlID == buttonTOSID )
 				{
 					parentTOS->winHide(FALSE);
@@ -1471,20 +1462,8 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 								{
 									UnicodeString uniLine;
 									uniLine = UnicodeString(MultiByteToWideCharSingleLine(asciiLine.str()).c_str());
-									int len = uniLine.getLength();
-									for (int index = len-1; index >= 0; index--)
-									{
-										if (iswspace(uniLine.getCharAt(index)))
-										{
-											uniLine.removeLastChar();
-										}
-										else
-										{
-											break;
-										}
-									}
-									//uniLine.trim();
-									DEBUG_LOG(("adding TOS line: [%ls]\n", uniLine.str()));
+									uniLine.trimEnd();
+									DEBUG_LOG(("adding TOS line: [%ls]", uniLine.str()));
 									GadgetListBoxAddEntryText(listboxTOS, uniLine, tosColor, -1);
 								}
 
@@ -1499,7 +1478,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					}
 					EnableLoginControls( FALSE );
 					buttonBack->winEnable(FALSE);
-					
+
 				}
 				else if ( controlID == buttonTOSOKID )
 				{
@@ -1521,8 +1500,8 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					buttonBack->winEnable(TRUE);
 				}
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -1543,16 +1522,16 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 						munkee.removeLastChar();
 						GadgetTextEntrySetText( textEntryLoginName, munkee );
 					}
-				}// if ( controlID == textEntryLoginNameID )
+				}
 				break;
-			}//case GEM_UPDATE_TEXT:
+			}
 			*/
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLLoginMenuSystem
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp
index b377abb63a2..227c11d2acf 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/CustomMatchPreferences.h"
 #include "Common/GameEngine.h"
@@ -44,11 +44,6 @@
 #include "GameClient/MapUtil.h"
 #include "GameNetwork/GUIUtil.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 static NameKeyType buttonBack = NAMEKEY_INVALID;
@@ -77,8 +72,12 @@ static GameWindow *winMapWindow = NULL;
 static void NullifyControls(void)
 {
 	parent = NULL;
-	winMapPreview = NULL;
 	mapList = NULL;
+	if (winMapPreview)
+	{
+		winMapPreview->winSetUserData(NULL);
+		winMapPreview = NULL;
+	}
 	for (Int i=0; i<MAX_SLOTS; ++i)
 	{
 		buttonMapStartPosition[i] = NULL;
@@ -98,8 +97,8 @@ static const char *gadgetsToHide[] =
 	"ButtonSelectMap",
 	"ButtonStart",
 	"StaticTextMapPreview",
-	
-	NULL // keep this last
+
+	NULL
 };
 static const char *perPlayerGadgetsToHide[] =
 {
@@ -107,7 +106,7 @@ static const char *perPlayerGadgetsToHide[] =
 	"ComboBoxColor",
 	"ComboBoxPlayerTemplate",
 	//"ButtonStartPosition",
-	NULL // keep this last
+	NULL
 };
 void positionStartSpots( AsciiString mapName, GameWindow *buttonMapStartPositions[], GameWindow *mapWindow);
 
@@ -128,15 +127,14 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData )
 {
 
 	// set keyboard focus to main parent
-	AsciiString parentName( "WOLMapSelectMenu.wnd:WOLMapSelectMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:WOLMapSelectMenuParent" );
 	parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 
 	TheWindowManager->winSetFocus( parent );
 
 	CustomMatchPreferences pref;
 	Bool usesSystemMapDir = pref.usesSystemMapDir();
-	winMapPreviewID = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:WinMapPreview") );
+	winMapPreviewID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:WinMapPreview" );
 	winMapPreview = TheWindowManager->winGetWindowFromId(parent, winMapPreviewID);
 
 	const MapMetaData *mmd = TheMapCache->findMap(TheGameSpyGame->getMap());
@@ -145,9 +143,9 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData )
 		usesSystemMapDir = mmd->m_isOfficial;
 	}
 
-	buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ButtonBack") );
-	buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ButtonOK") );
-	listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ListboxMap") );
+	buttonBack = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ButtonBack" );
+	buttonOK = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ButtonOK" );
+	listboxMap = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ListboxMap" );
 	radioButtonSystemMapsID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:RadioButtonSystemMaps" );
 	radioButtonUserMapsID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:RadioButtonUserMaps" );
 	winMapWindow = TheWindowManager->winGetWindowFromId( parent, listboxMap );
@@ -158,7 +156,7 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData )
 		GadgetRadioSetSelection( radioButtonSystemMaps, FALSE );
 	else
 		GadgetRadioSetSelection( radioButtonUserMaps, FALSE );
-	
+
 	AsciiString tmpString;
 	for (Int i = 0; i < MAX_SLOTS; i++)
 	{
@@ -174,8 +172,7 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData )
 	showGameSpyGameOptionsUnderlyingGUIElements( FALSE );
 
 	// get the listbox window
-	AsciiString listString( "WOLMapSelectMenu.wnd:ListboxMap" );
-	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( listString );
+	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ListboxMap" );
 	mapList = TheWindowManager->winGetWindowFromId( parent, mapListID );
 	if( mapList )
 	{
@@ -184,7 +181,7 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData )
 		populateMapListbox( mapList, usesSystemMapDir, TRUE, TheGameSpyGame->getMap() );
 	}
 
-}  // end WOLMapSelectMenuInit  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu shutdown method */
@@ -195,11 +192,11 @@ void WOLMapSelectMenuShutdown( WindowLayout *layout, void *userData )
 
 	// hide menu
 	layout->hide( TRUE );
-	
+
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end WOLMapSelectMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu update method */
@@ -215,7 +212,7 @@ void WOLMapSelectMenuUpdate( WindowLayout *layout, void *userData )
 
 	// No update because the game setup screen is up at the same
 	// time and it does the update for us...
-}  // end WOLMapSelectMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Map select menu input callback */
@@ -224,7 +221,7 @@ WindowMsgHandledType WOLMapSelectMenuInput( GameWindow *window, UnsignedInt msg,
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -239,46 +236,45 @@ WindowMsgHandledType WOLMapSelectMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "WOLMapSelectMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end WOLMapSelectMenuInput
+}
 void WOLPositionStartSpots( void );
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -286,7 +282,7 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 		{
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -294,7 +290,7 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 			NullifyControls();
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -306,23 +302,23 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GLM_DOUBLE_CLICKED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						GadgetListBoxSetSelected( control, rowSelected );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonOK );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonOK );
 					}
 				}
@@ -331,10 +327,10 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 		//---------------------------------------------------------------------------------------------
 			case GLM_SELECTED:
 			{
-				
+
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
 					if( rowSelected < 0 )
@@ -389,7 +385,7 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 				}
 
 				WOLPositionStartSpots();
-			}  // end if
+			}
 			else if ( controlID == radioButtonSystemMapsID )
 			{
 				if (TheMapCache)
@@ -412,7 +408,7 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 			{
 				Int selected;
 				UnicodeString map;
-				
+
 				// get the selected index
 				GadgetListBoxGetSelected( winMapWindow, &selected );
 
@@ -421,8 +417,8 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 					// get text of the map to load
 					map = GadgetListBoxGetText( winMapWindow, selected, 0 );
-					
-					
+
+
 					// set the map name in the global data map name
 					AsciiString asciiMap;
 					const char *mapFname = (const char *)GadgetListBoxGetItemData( winMapWindow, selected );
@@ -460,19 +456,19 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 					WOLPositionStartSpots();
 
-				}  // end if
+				}
 
-			}  // end else if
+			}
 
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end WOLMapSelectMenuSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
index f33d7393eba..23b023b1562 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "GameClient/WindowLayout.h"
@@ -59,11 +59,11 @@ static GameWindow *buttonCancel = NULL;
 //-------------------------------------------------------------------------------------------------
 void WOLMessageWindowInit( WindowLayout *layout, void *userData )
 {
-	parentWOLMessageWindowID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLMessageWindow.wnd:WOLMessageWindowParent" ) );
-	buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLMessageWindow.wnd:ButtonCancel" ) );
+	parentWOLMessageWindowID = TheNameKeyGenerator->nameToKey( "WOLMessageWindow.wnd:WOLMessageWindowParent" );
+	buttonCancelID = TheNameKeyGenerator->nameToKey( "WOLMessageWindow.wnd:ButtonCancel" );
 	parentWOLMessageWindow = TheWindowManager->winGetWindowFromId( NULL, parentWOLMessageWindowID );
 	buttonCancel = TheWindowManager->winGetWindowFromId( NULL,  buttonCancelID);
-	
+
 
 	// Show Menu
 	layout->hide( FALSE );
@@ -71,7 +71,7 @@ void WOLMessageWindowInit( WindowLayout *layout, void *userData )
 	// Set Keyboard to Main Parent
 	TheWindowManager->winSetFocus( parentWOLMessageWindow );
 
-} // WOLMessageWindowInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOLMessage Window shutdown method */
@@ -84,7 +84,7 @@ void WOLMessageWindowShutdown( WindowLayout *layout, void *userData )
 
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
-}  // WOLMessageWindowShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void WOLMessageWindowUpdate( WindowLayout * layout, void *userData)
 		WOL::TheWOL->update();
 	*/
 
-}// WOLMessageWindowUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOLMessage Window input callback */
@@ -105,7 +105,7 @@ void WOLMessageWindowUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLMessageWindowInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -120,69 +120,69 @@ WindowMsgHandledType WOLMessageWindowInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonCancel, buttonCancelID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLMessageWindowInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOLMessage Window window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLMessageWindowSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLMessageWindowSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -190,7 +190,7 @@ WindowMsgHandledType WOLMessageWindowSystem( GameWindow *window, UnsignedInt msg
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLMessageWindowSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
index 9b38c5126da..784bbe3ffd1 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "GameClient/WindowLayout.h"
@@ -60,9 +60,9 @@ static GameWindow *buttonQuickmatch = NULL;
 //-------------------------------------------------------------------------------------------------
 void WOLQMScoreScreenInit( WindowLayout *layout, void *userData )
 {
-	parentWOLQMScoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLQMScoreScreen.wnd:WOLQMScoreScreenParent" ) );
-	buttonDisconnectID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLQMScoreScreen.wnd:ButtonDisconnect" ) );
-	buttonQuickmatchID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLQMScoreScreen.wnd:ButtonQuickMatch" ) );
+	parentWOLQMScoreID = TheNameKeyGenerator->nameToKey( "WOLQMScoreScreen.wnd:WOLQMScoreScreenParent" );
+	buttonDisconnectID = TheNameKeyGenerator->nameToKey( "WOLQMScoreScreen.wnd:ButtonDisconnect" );
+	buttonQuickmatchID = TheNameKeyGenerator->nameToKey( "WOLQMScoreScreen.wnd:ButtonQuickMatch" );
 	parentWOLQMScore = TheWindowManager->winGetWindowFromId( NULL, parentWOLQMScoreID );
 	buttonDisconnect = TheWindowManager->winGetWindowFromId( NULL,  buttonDisconnectID);
 	buttonQuickmatch = TheWindowManager->winGetWindowFromId( NULL,  buttonQuickmatchID);
@@ -85,7 +85,7 @@ void WOLQMScoreScreenInit( WindowLayout *layout, void *userData )
 
 	//progressLayout = TheShell->top();
 
-} // WOLQMScoreScreenInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu shutdown method */
@@ -101,7 +101,7 @@ void WOLQMScoreScreenShutdown( WindowLayout *layout, void *userData )
 
 	//progressLayout = NULL;
 
-}  // WOLQMScoreScreenShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -113,7 +113,7 @@ void WOLQMScoreScreenUpdate( WindowLayout * layout, void *userData)
 	if (WOL::TheWOL)
 		WOL::TheWOL->update();
 	*/
-}// WOLQMScoreScreenUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu input callback */
@@ -121,7 +121,7 @@ void WOLQMScoreScreenUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLQMScoreScreenInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -136,63 +136,63 @@ WindowMsgHandledType WOLQMScoreScreenInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonDisconnect, buttonDisconnectID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLQMScoreScreenInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLQMScoreScreenSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLQMScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're given the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -208,7 +208,7 @@ WindowMsgHandledType WOLQMScoreScreenSystem( GameWindow *window, UnsignedInt msg
 						WOL::TheWOL->addCommand( WOL::WOLCOMMAND_RESET );  // don't display an error, log out, or anything
 					}
 
-				} //if ( controlID == buttonDisconnect )
+				}
 				else if ( controlID == buttonQuickmatchID )
 				{
 					//TheShell->pop();
@@ -221,11 +221,11 @@ WindowMsgHandledType WOLQMScoreScreenSystem( GameWindow *window, UnsignedInt msg
 						}
 					}
 
-				} //if ( controlID == buttonDisconnect )
+				}
 				*/
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -233,7 +233,7 @@ WindowMsgHandledType WOLQMScoreScreenSystem( GameWindow *window, UnsignedInt msg
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLQMScoreScreenSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
index b90c6cec80d..5d8eefe7cb2 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/QuickmatchPreferences.h"
@@ -65,11 +65,6 @@
 #include "GameNetwork/GameSpy/PersistentStorageThread.h"
 #include "GameNetwork/RankPointValue.h"
 #include "GameNetwork/GameSpy/LadderDefs.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #ifdef DEBUG_LOGGING
 #include "Common/MiniLog.h"
@@ -228,7 +223,7 @@ static void enableOptionsGadgets(Bool doIt)
 	}
 }
 
-enum 
+enum
 {
 	MAX_DISCONNECTS_ANY = 0,
 	MAX_DISCONNECTS_5 = 5,
@@ -238,10 +233,10 @@ enum
 };
 enum{ MAX_DISCONNECTS_COUNT = 5 };
 
-static Int MAX_DISCONNECTS[MAX_DISCONNECTS_COUNT] = {MAX_DISCONNECTS_ANY, MAX_DISCONNECTS_5, 
+static Int MAX_DISCONNECTS[MAX_DISCONNECTS_COUNT] = {MAX_DISCONNECTS_ANY, MAX_DISCONNECTS_5,
 																											MAX_DISCONNECTS_10, MAX_DISCONNECTS_25,
 																											MAX_DISCONNECTS_50};
-																										
+
 
 void UpdateStartButton(void)
 {
@@ -311,7 +306,7 @@ static void populateQMSideComboBox(Int favSide, const LadderInfo *li = NULL)
 	GadgetComboBoxSetItemData(comboBoxSide, newIndex, (void *)PLAYERTEMPLATE_RANDOM);
 
 	std::set<AsciiString> seenSides;
-	
+
 	Int entryToSelect = 0; // select Random by default
 
 	for (Int c=0; c<numPlayerTemplates; ++c)
@@ -621,7 +616,7 @@ static void populateQuickMatchMapSelectListbox( QuickMatchPreferences& pref )
 			#if VARIABLE_NUMBER_OF_MAPS
 			mapListboxIndex.push_back(index);
 			#endif
-		} 
+		}
 		else
 		{
 			#if VARIABLE_NUMBER_OF_MAPS
@@ -735,7 +730,7 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
 			GameSpyCloseAllOverlays();
 			GSMessageBoxOk( title, body );
 			TheGameSpyInfo->reset();
-			DEBUG_LOG(("WOLQuickMatchMenuInit() - game was in progress, and we were disconnected, so pop immediate back to main menu\n"));
+			DEBUG_LOG(("WOLQuickMatchMenuInit() - game was in progress, and we were disconnected, so pop immediate back to main menu"));
 			TheShell->popImmediate();
 			return;
 		}
@@ -746,10 +741,8 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
 	isShuttingDown = false;
 	raiseMessageBoxes = true;
 
-	if (TheNAT != NULL) {
-		delete TheNAT;
-		TheNAT = NULL;
-	}
+	delete TheNAT;
+	TheNAT = NULL;
 
 	parentWOLQuickMatchID = NAMEKEY( "WOLQuickMatchMenu.wnd:WOLQuickMatchMenuParent" );
 	buttonBackID = NAMEKEY( "WOLQuickMatchMenu.wnd:ButtonBack" );
@@ -793,9 +786,9 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
 	comboBoxSide = TheWindowManager->winGetWindowFromId( parentWOLQuickMatch, comboBoxSideID );
 	comboBoxColor = TheWindowManager->winGetWindowFromId( parentWOLQuickMatch, comboBoxColorID );
 
-	if (TheLadderList->getStandardLadders()->size() == 0
-		&& TheLadderList->getSpecialLadders()->size() == 0
-		&& TheLadderList->getLocalLadders()->size() == 0)
+	if (TheLadderList->getStandardLadders()->empty()
+		&& TheLadderList->getSpecialLadders()->empty()
+		&& TheLadderList->getLocalLadders()->empty())
 	{
 		// no ladders, so just disable them
 		comboBoxDisabledLadder = comboBoxLadder;
@@ -921,7 +914,7 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
 	UpdateStartButton();
 	TheTransitionHandler->setGroup("WOLQuickMatchMenuFade");
 	isInInit= FALSE;
-} // WOLQuickMatchMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -944,7 +937,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	nextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Quick Match Menu shutdown method */
@@ -971,13 +964,13 @@ void WOLQuickMatchMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 	TheTransitionHandler->reverse("WOLQuickMatchMenuFade");
 
 	RaiseGSMessageBox();
-}  // WOLQuickMatchMenuShutdown
+}
 
 
 #ifdef PERF_TEST
@@ -1038,7 +1031,7 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 		SignalUIInteraction(SHELL_SCRIPT_HOOK_GENERALS_ONLINE_ENTERED_FROM_GAME);
 	}
 
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished()&& TheTransitionHandler->isFinished())
 		shutdownComplete(layout);
 
@@ -1047,7 +1040,7 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 		RaiseGSMessageBox();
 		raiseMessageBoxes = false;
 	}
-	
+
 	/// @todo: MDC handle disconnects in-game the same way as Custom Match!
 
 	if (TheShell->isAnimFinished() && !buttonPushed && TheGameSpyPeerMessageQueue)
@@ -1140,19 +1133,19 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 			{
 			case PeerResponse::PEERRESPONSE_PLAYERUTM:
 				{
-					if (!stricmp(resp.command.c_str(), "STATS"))
+					if (stricmp(resp.command.c_str(), "STATS") == 0)
 					{
-						DEBUG_LOG(("Saw STATS from %s, data was '%s'\n", resp.nick.c_str(), resp.commandOptions.c_str()));
+						DEBUG_LOG(("Saw STATS from %s, data was '%s'", resp.nick.c_str(), resp.commandOptions.c_str()));
 						AsciiString data = resp.commandOptions.c_str();
 						AsciiString idStr;
 						data.nextToken(&idStr, " ");
 						Int id = atoi(idStr.str());
-						DEBUG_LOG(("data: %d(%s) - '%s'\n", id, idStr.str(), data.str()));
+						DEBUG_LOG(("data: %d(%s) - '%s'", id, idStr.str(), data.str()));
 
 						PSPlayerStats stats = TheGameSpyPSMessageQueue->parsePlayerKVPairs(data.str());
 						PSPlayerStats oldStats = TheGameSpyPSMessageQueue->findPlayerStatsByID(id);
 						stats.id = id;
-						DEBUG_LOG(("Parsed ID is %d, old ID is %d\n", stats.id, oldStats.id));
+						DEBUG_LOG(("Parsed ID is %d, old ID is %d", stats.id, oldStats.id));
 						if (stats.id && (oldStats.id == 0))
 							TheGameSpyPSMessageQueue->trackPlayerStats(stats);
 
@@ -1169,7 +1162,7 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 						}
 					}
 					Int slotNum = TheGameSpyGame->getSlotNum(resp.nick.c_str());
-					if ((slotNum >= 0) && (slotNum < MAX_SLOTS) && (!stricmp(resp.command.c_str(), "NAT"))) {
+					if ((slotNum >= 0) && (slotNum < MAX_SLOTS) && (stricmp(resp.command.c_str(), "NAT") == 0)) {
 						// this is a command for NAT negotiations, pass if off to TheNAT
 						sawImportantMessage = TRUE;
 						if (TheNAT != NULL) {
@@ -1183,12 +1176,12 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 								(val <= FirewallHelperClass::FIREWALL_TYPE_DESTINATION_PORT_DELTA))
 						{
 							slot->setNATBehavior((FirewallHelperClass::FirewallBehaviorType)val);
-							DEBUG_LOG(("Setting NAT behavior to %d for player %d\n", val, slotNum));
+							DEBUG_LOG(("Setting NAT behavior to %d for player %d", val, slotNum));
 							change = true;
 						}
 						else
 						{
-							DEBUG_LOG(("Rejecting invalid NAT behavior %d from player %d\n", val, slotNum));
+							DEBUG_LOG(("Rejecting invalid NAT behavior %d from player %d", val, slotNum));
 						}
 					}
 					*/
@@ -1214,7 +1207,7 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 					switch( resp.qmStatus.status )
 					{
 					case QM_IDLE:
-						//TheGameSpyInfo->addText(UnicodeString(L"Status: QM_IDLE"), GameSpyColor[GSCOLOR_DEFAULT], quickmatchTextWindow);
+						//TheGameSpyInfo->addText(L"Status: QM_IDLE", GameSpyColor[GSCOLOR_DEFAULT], quickmatchTextWindow);
 						break;
 					case QM_JOININGQMCHANNEL:
 						TheGameSpyInfo->addText(TheGameText->fetch("QM:JOININGQMCHANNEL"), GameSpyColor[GSCOLOR_DEFAULT], quickmatchTextWindow);
@@ -1329,7 +1322,7 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 								}
 							}
 
-							DEBUG_LOG(("Starting a QM game: options=[%s]\n", GameInfoToAsciiString(TheGameSpyGame).str()));
+							DEBUG_LOG(("Starting a QM game: options=[%s]", GameInfoToAsciiString(TheGameSpyGame).str()));
 							SendStatsToOtherPlayers(TheGameSpyGame);
 							TheGameSpyGame->startGame(0);
 							GameWindow *buttonBuddies = TheWindowManager->winGetWindowFromId(NULL, buttonBuddiesID);
@@ -1389,17 +1382,17 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 			UnicodeString munkee;
 			munkee.format(L"inQM:%d %d ms, %d messages", s_inQM, frameTime, responses.size());
 			TheGameSpyInfo->addText(munkee, GameSpyColor[GSCOLOR_DEFAULT], quickmatchTextWindow);
-			PERF_LOG(("%ls\n", munkee.str()));
+			PERF_LOG(("%ls", munkee.str()));
 
 			std::list<Int>::const_iterator it;
 			for (it = responses.begin(); it != responses.end(); ++it)
 			{
-				PERF_LOG(("  %s\n", getMessageString(*it)));
+				PERF_LOG(("  %s", getMessageString(*it)));
 			}
 		}
 #endif // PERF_TEST
 	}
-}// WOLQuickMatchMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Quick Match Menu input callback */
@@ -1407,7 +1400,7 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLQuickMatchMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1424,7 +1417,7 @@ WindowMsgHandledType WOLQuickMatchMenuInput( GameWindow *window, UnsignedInt msg
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -1432,56 +1425,56 @@ WindowMsgHandledType WOLQuickMatchMenuInput( GameWindow *window, UnsignedInt msg
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 						if(!buttonBack->winIsHidden())
-							TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+							TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLQuickMatchMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Quick Match Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GCM_SELECTED:
 			{
@@ -1533,7 +1526,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 					UpdateStartButton();
 				}
 				break;
-			} // case GCM_SELECTED
+			}
 
 		case GBM_SELECTED:
 			{
@@ -1589,20 +1582,20 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 						if (index >= 0)
 						{
 							req.qmMaps.push_back(GadgetListBoxGetItemData(listboxMapSelect, index, 0));
-						} 
+						}
 						else
 						{
 							req.qmMaps.push_back(false);
 						}
 					}
-					#else 
+					#else
 					Int numMaps = GadgetListBoxGetNumEntries(listboxMapSelect);
 					for ( Int i=0; i<numMaps; ++i )
 					{
 						req.qmMaps.push_back(GadgetListBoxGetItemData(listboxMapSelect, i, 0));
 					}
 					#endif
-					
+
 					UnicodeString u;
 					AsciiString a;
 //					u = GadgetTextEntryGetText(textEntryMaxDisconnects);
@@ -1630,7 +1623,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 						val = 0;
 					if( val >= maxPingEntries - 1)
 					{
-						req.QM.maxPing = TheGameSpyConfig->getPingTimeoutInMs();	
+						req.QM.maxPing = TheGameSpyConfig->getPingTimeoutInMs();
 					}
 					else
 						req.QM.maxPing = (val+1)*100;
@@ -1666,7 +1659,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 					if (ladderInfo && ladderInfo->randomFactions)
 					{
 						Int sideNum = GameClientRandomValue(0, ladderInfo->validFactions.size()-1);
-						DEBUG_LOG(("Looking for %d out of %d random sides\n", sideNum, ladderInfo->validFactions.size()));
+						DEBUG_LOG(("Looking for %d out of %d random sides", sideNum, ladderInfo->validFactions.size()));
 						AsciiStringListConstIterator cit = ladderInfo->validFactions.begin();
 						while (sideNum)
 						{
@@ -1677,13 +1670,13 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 						{
 							Int numPlayerTemplates = ThePlayerTemplateStore->getPlayerTemplateCount();
 							AsciiString sideStr = *cit;
-							DEBUG_LOG(("Chose %s as our side... finding\n", sideStr.str()));
+							DEBUG_LOG(("Chose %s as our side... finding", sideStr.str()));
 							for (Int c=0; c<numPlayerTemplates; ++c)
 							{
 								const PlayerTemplate *fac = ThePlayerTemplateStore->getNthPlayerTemplate(c);
 								if (fac && fac->getSide() == sideStr)
 								{
-									DEBUG_LOG(("Found %s in index %d\n", sideStr.str(), c));
+									DEBUG_LOG(("Found %s in index %d", sideStr.str(), c));
 									req.QM.side = c;
 									break;
 								}
@@ -1725,9 +1718,8 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 					req.QM.discons = numDiscons;
 
 
-					strncpy(req.QM.pings, TheGameSpyInfo->getPingString().str(), 17);
-					req.QM.pings[16] = 0;
-					
+					strlcpy(req.QM.pings, TheGameSpyInfo->getPingString().str(), sizeof(req.QM.pings));
+
 					req.QM.botID = TheGameSpyConfig->getQMBotID();
 					req.QM.roomID = TheGameSpyConfig->getQMChannel();
 
@@ -1764,7 +1756,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 					TheGameSpyInfo->leaveGroupRoom();
 					nextScreen = "Menus/WOLWelcomeMenu.wnd";
 					TheShell->pop();
-				} //if ( controlID == buttonBack )
+				}
 				else if ( controlID == buttonSelectAllMapsID )
 				{
 					Int numMaps = GadgetListBoxGetNumEntries(listboxMapSelect);
@@ -1774,7 +1766,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 						GadgetListBoxSetItemData(listboxMapSelect, (void *)1, i);
 						GadgetListBoxAddEntryText(listboxMapSelect, GadgetListBoxGetText(listboxMapSelect, i, 1), GameSpyColor[GSCOLOR_MAP_SELECTED], i, 1);
 					}
-				} //if ( controlID == buttonSelectAllMapsID )
+				}
 				else if ( controlID == buttonSelectNoMapsID )
 				{
 					Int numMaps = GadgetListBoxGetNumEntries(listboxMapSelect);
@@ -1784,10 +1776,10 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 						GadgetListBoxSetItemData(listboxMapSelect, (void *)0, i);
 						GadgetListBoxAddEntryText(listboxMapSelect, GadgetListBoxGetText(listboxMapSelect, i, 1), GameSpyColor[GSCOLOR_MAP_UNSELECTED], i, 1);
 					}
-				} //if ( controlID == buttonSelectNoMapsID )
+				}
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GLM_SELECTED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
@@ -1817,7 +1809,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 				}
 				UpdateStartButton();
 				break;
-			}// case GLM_SELECTED
+			}
 
 		case GEM_EDIT_DONE:
 			{
@@ -1826,7 +1818,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLQuickMatchMenuSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
index 5faf69dc2a9..cb202a734f1 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "GameClient/WindowLayout.h"
@@ -59,14 +59,14 @@ GameWindow *progressTextWindow = NULL;
 //-------------------------------------------------------------------------------------------------
 void WOLStatusMenuInit( WindowLayout *layout, void *userData )
 {
-	parentWOLStatusID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLStatusMenu.wnd:WOLStatusMenuParent" ) );
-	buttonDisconnectID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLStatusMenu.wnd:ButtonDisconnect" ) );
+	parentWOLStatusID = TheNameKeyGenerator->nameToKey( "WOLStatusMenu.wnd:WOLStatusMenuParent" );
+	buttonDisconnectID = TheNameKeyGenerator->nameToKey( "WOLStatusMenu.wnd:ButtonDisconnect" );
 	parentWOLStatus = TheWindowManager->winGetWindowFromId( NULL, parentWOLStatusID );
 	buttonDisconnect = TheWindowManager->winGetWindowFromId( NULL,  buttonDisconnectID);
 
 	progressTextWindow = TheWindowManager->winGetWindowFromId( NULL,
-		TheNameKeyGenerator->nameToKey( AsciiString( "WOLStatusMenu.wnd:ListboxStatus" ) ) );
-	
+		TheNameKeyGenerator->nameToKey( "WOLStatusMenu.wnd:ListboxStatus" ) );
+
 	// Show Menu
 	layout->hide( FALSE );
 
@@ -76,7 +76,7 @@ void WOLStatusMenuInit( WindowLayout *layout, void *userData )
 	//progressLayout = TheShell->top();
 
 	//WOL::raiseWOLMessageBox();
-} // WOLStatusMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu shutdown method */
@@ -93,7 +93,7 @@ void WOLStatusMenuShutdown( WindowLayout *layout, void *userData )
 	//progressLayout = NULL;
 
 	//WOL::raiseWOLMessageBox();
-}  // WOLStatusMenuShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -103,7 +103,7 @@ void WOLStatusMenuUpdate( WindowLayout * layout, void *userData)
 {
 	//if (WOL::TheWOL)
 		//WOL::TheWOL->update();
-}// WOLStatusMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu input callback */
@@ -111,7 +111,7 @@ void WOLStatusMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLStatusMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -126,63 +126,63 @@ WindowMsgHandledType WOLStatusMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonDisconnect, buttonDisconnectID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLStatusMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLStatusMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLStatusMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -198,11 +198,11 @@ WindowMsgHandledType WOLStatusMenuSystem( GameWindow *window, UnsignedInt msg,
 						WOL::TheWOL->addCommand( WOL::WOLCOMMAND_RESET );  // don't display an error, log out, or anything
 					}
 
-				} //if ( controlID == buttonDisconnect )
+				}
 				*/
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -210,7 +210,7 @@ WindowMsgHandledType WOLStatusMenuSystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLStatusMenuSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
index 309ea2c626d..894a3f0e70b 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "gamespy/peer/peer.h"
 
@@ -62,16 +62,10 @@
 #include "GameNetwork/GameSpy/PeerThread.h"
 #include "GameNetwork/GameSpy/PersistentStorageDefs.h"
 #include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/BuddyThread.h"
 #include "GameNetwork/GameSpy/ThreadUtils.h"
 #include "GameNetwork/GameSpy/MainMenuUtils.h"
 #include "GameNetwork/WOLBrowser/WebBrowser.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 static Bool isShuttingDown = FALSE;
 static Bool buttonPushed = FALSE;
@@ -206,7 +200,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	nextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Handle Num Players Online data */
@@ -244,7 +238,7 @@ static void updateNumPlayersOnline(void)
 		UnicodeString headingStr;
 		headingStr.format(TheGameText->fetch("MOTD:NumPlayersHeading"), lastNumPlayersOnline);
 
-		while (headingStr.nextToken(&line, UnicodeString(L"\n")))
+		while (headingStr.nextToken(&line, L"\n"))
 		{
 			if (line.getCharAt(line.getLength()-1) == '\r')
 				line.removeLastChar();	// there is a trailing '\r'
@@ -253,12 +247,12 @@ static void updateNumPlayersOnline(void)
 
 			if (line.isEmpty())
 			{
-				line = UnicodeString(L" ");
+				line = L" ";
 			}
 
 			GadgetListBoxAddEntryText(listboxInfo, line, GameSpyColor[GSCOLOR_MOTD_HEADING], -1, -1);
 		}
-		GadgetListBoxAddEntryText(listboxInfo, UnicodeString(L" "), GameSpyColor[GSCOLOR_MOTD_HEADING], -1, -1);
+		GadgetListBoxAddEntryText(listboxInfo, L" ", GameSpyColor[GSCOLOR_MOTD_HEADING], -1, -1);
 
 		while (aMotd.nextToken(&aLine, "\n"))
 		{
@@ -286,7 +280,7 @@ static void updateNumPlayersOnline(void)
 				g = grabUByte(aLine.str()+5);
 				b = grabUByte(aLine.str()+7);
 				c = GameMakeColor(r, g, b, a);
-				DEBUG_LOG(("MOTD line '%s' has color %X\n", aLine.str(), c));
+				DEBUG_LOG(("MOTD line '%s' has color %X", aLine.str(), c));
 				aLine = aLine.str() + 9;
 			}
 			line = UnicodeString(MultiByteToWideCharSingleLine(aLine.str()).c_str());
@@ -351,7 +345,7 @@ static void updateOverallStats(void)
 	usa = calcPercent(s_statsUSA, STATS_LASTWEEK, TheGameText->fetch("SIDE:America"));
 	china = calcPercent(s_statsChina, STATS_LASTWEEK, TheGameText->fetch("SIDE:China"));
 	gla = calcPercent(s_statsGLA, STATS_LASTWEEK, TheGameText->fetch("SIDE:GLA"));
-	DEBUG_LOG(("Last Week: %ls %ls %ls\n", usa.str(), china.str(), gla.str()));
+	DEBUG_LOG(("Last Week: %ls %ls %ls", usa.str(), china.str(), gla.str()));
 	win = TheWindowManager->winGetWindowFromId( NULL, NAMEKEY("WOLWelcomeMenu.wnd:StaticTextUSALastWeek") );
 	GadgetStaticTextSetText(win, usa);
 	win = TheWindowManager->winGetWindowFromId( NULL, NAMEKEY("WOLWelcomeMenu.wnd:StaticTextChinaLastWeek") );
@@ -362,7 +356,7 @@ static void updateOverallStats(void)
 	usa = calcPercent(s_statsUSA, STATS_TODAY, TheGameText->fetch("SIDE:America"));
 	china = calcPercent(s_statsChina, STATS_TODAY, TheGameText->fetch("SIDE:China"));
 	gla = calcPercent(s_statsGLA, STATS_TODAY, TheGameText->fetch("SIDE:GLA"));
-	DEBUG_LOG(("Today: %ls %ls %ls\n", usa.str(), china.str(), gla.str()));
+	DEBUG_LOG(("Today: %ls %ls %ls", usa.str(), china.str(), gla.str()));
 	win = TheWindowManager->winGetWindowFromId( NULL, NAMEKEY("WOLWelcomeMenu.wnd:StaticTextUSAToday") );
 	GadgetStaticTextSetText(win, usa);
 	win = TheWindowManager->winGetWindowFromId( NULL, NAMEKEY("WOLWelcomeMenu.wnd:StaticTextChinaToday") );
@@ -396,7 +390,7 @@ void UpdateLocalPlayerStats(void)
 	{
 		PopulatePlayerInfoWindows( "WOLQuickMatchMenu.wnd" );
 	}
-	
+
 	return;
 }
 
@@ -414,13 +408,13 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData )
 
 	//TheWOL->reset();
 
-	parentWOLWelcomeID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:WOLWelcomeMenuParent" ) );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonBack" ) );
+	parentWOLWelcomeID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:WOLWelcomeMenuParent" );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonBack" );
 	parentWOLWelcome = TheWindowManager->winGetWindowFromId( NULL, parentWOLWelcomeID );
 	buttonBack = TheWindowManager->winGetWindowFromId( NULL,  buttonBackID);
 	buttonOptionsID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonOptions" );
 	buttonbuttonOptions = TheWindowManager->winGetWindowFromId( NULL,  buttonOptionsID);
-	listboxInfoID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:InfoListbox" ) );
+	listboxInfoID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:InfoListbox" );
 
 	listboxInfo = TheWindowManager->winGetWindowFromId( NULL,  listboxInfoID);
 
@@ -464,7 +458,7 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData )
 
 	// Clear some defaults
 	/*
-	UnicodeString questionMark = UnicodeString(L"?");
+	UnicodeString questionMark = L"?";
 	GadgetStaticTextSetText(staticTextLastUpdated, questionMark);
 	GadgetStaticTextSetText(staticTextLadderWins, questionMark);
 	GadgetStaticTextSetText(staticTextLadderLosses, questionMark);
@@ -479,19 +473,19 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData )
 
 	//DEBUG_ASSERTCRASH(listboxInfo, ("No control found!"));
 
-	buttonQuickMatchID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonQuickMatch" ) );
+	buttonQuickMatchID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonQuickMatch" );
 	buttonQuickMatch = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonQuickMatchID );
 
-	buttonLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonCustomMatch" ) );
+	buttonLobbyID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonCustomMatch" );
 	buttonLobby = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonLobbyID );
 
-	buttonBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonBuddies" ) );
+	buttonBuddiesID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonBuddies" );
 	buttonBuddies = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonBuddiesID );
 
-	buttonMyInfoID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonMyInfo" ) );
+	buttonMyInfoID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonMyInfo" );
 	buttonMyInfo = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonMyInfoID );
 
-	buttonLadderID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonLadder" ) );
+	buttonLadderID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonLadder" );
 	buttonLadder = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonLadderID );
 
 	if (TheFirewallHelper == NULL) {
@@ -549,7 +543,7 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData )
 	raiseMessageBoxes = TRUE;
 	TheTransitionHandler->setGroup("WOLWelcomeMenuFade");
 
-} // WOLWelcomeMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Welcome Menu shutdown method */
@@ -558,10 +552,8 @@ void WOLWelcomeMenuShutdown( WindowLayout *layout, void *userData )
 {
 	listboxInfo = NULL;
 
-	if (TheFirewallHelper != NULL) {
-		delete TheFirewallHelper;
-		TheFirewallHelper = NULL;
-	}
+	delete TheFirewallHelper;
+	TheFirewallHelper = NULL;
 
 	isShuttingDown = TRUE;
 
@@ -573,14 +565,14 @@ void WOLWelcomeMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 	TheTransitionHandler->reverse("WOLWelcomeMenuFade");
 
 
 	RaiseGSMessageBox();
-}  // WOLWelcomeMenuShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -588,7 +580,7 @@ void WOLWelcomeMenuShutdown( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 void WOLWelcomeMenuUpdate( WindowLayout * layout, void *userData)
 {
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 		shutdownComplete(layout);
 
@@ -607,7 +599,7 @@ void WOLWelcomeMenuUpdate( WindowLayout * layout, void *userData)
 			TheFirewallHelper->writeFirewallBehavior();
 
 			TheFirewallHelper->flagNeedToRefresh(FALSE); // 2/19/03 BGC, we're done, so we don't need to refresh the NAT anymore.
-			
+
 			// we are now done with the firewall helper
 			delete TheFirewallHelper;
 			TheFirewallHelper = NULL;
@@ -632,7 +624,7 @@ void WOLWelcomeMenuUpdate( WindowLayout * layout, void *userData)
 					room.m_groupID = resp.groupRoom.id;
 					room.m_maxWaiting = resp.groupRoom.maxWaiting;
 					room.m_name = resp.groupRoomName.c_str();
-					room.m_translatedName = UnicodeString(L"TEST");
+					room.m_translatedName = L"TEST";
 					room.m_numGames = resp.groupRoom.numGames;
 					room.m_numPlaying = resp.groupRoom.numPlaying;
 					room.m_numWaiting = resp.groupRoom.numWaiting;
@@ -681,7 +673,7 @@ void WOLWelcomeMenuUpdate( WindowLayout * layout, void *userData)
 		}
 	}
 
-}// WOLWelcomeMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Welcome Menu input callback */
@@ -689,7 +681,7 @@ void WOLWelcomeMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLWelcomeMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -706,63 +698,63 @@ WindowMsgHandledType WOLWelcomeMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLWelcomeMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Welcome Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -776,7 +768,7 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 				{
 					//DEBUG_ASSERTCRASH(TheGameSpyChat->getPeer(), ("No GameSpy Peer object!"));
 					//TheGameSpyChat->disconnectFromChat();
-					
+
 					PeerRequest req;
 					req.peerRequestType = PeerRequest::PEERREQUEST_LOGOUT;
 					TheGameSpyPeerMessageQueue->addRequest( req );
@@ -784,7 +776,7 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 					breq.buddyRequestType = BuddyRequest::BUDDYREQUEST_LOGOUT;
 					TheGameSpyBuddyMessageQueue->addRequest( breq );
 
-					DEBUG_LOG(("Tearing down GameSpy from WOLWelcomeMenuSystem(GBM_SELECTED)\n"));
+					DEBUG_LOG(("Tearing down GameSpy from WOLWelcomeMenuSystem(GBM_SELECTED)"));
 					TearDownGameSpy();
 
 					/*
@@ -809,15 +801,15 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 					TheWOLGame = NULL;
 					**/
 
-				} //if ( controlID == buttonBack )
+				}
 				else if (controlID == buttonOptionsID)
-				{					
+				{
 					GameSpyOpenOverlay( GSOVERLAY_OPTIONS );
 				}
 				else if (controlID == buttonQuickMatchID)
 				{
 					GameSpyMiscPreferences mPref;
-					if ((TheDisplay->getWidth() != 800 || TheDisplay->getHeight() != 600) && mPref.getQuickMatchResLocked())
+					if ((TheDisplay->getWidth() != DEFAULT_DISPLAY_WIDTH || TheDisplay->getHeight() != DEFAULT_DISPLAY_HEIGHT) && mPref.getQuickMatchResLocked())
 					{
 						GSMessageBoxOk(TheGameText->fetch("GUI:GSErrorTitle"), TheGameText->fetch("GUI:QuickMatch800x600"));
 					}
@@ -827,7 +819,7 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 						nextScreen = "Menus/WOLQuickMatchMenu.wnd";
 						TheShell->pop();
 					}
-				}// else if
+				}
 				else if (controlID == buttonMyInfoID )
 				{
 					SetLookAtPlayer(TheGameSpyInfo->getLocalProfileID(), TheGameSpyInfo->getLocalName());
@@ -847,7 +839,7 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 					TheWOL->setState( WOL::WOLAPI_LOBBY );
 					TheWOL->addCommand( WOL::WOLCOMMAND_REFRESH_CHANNELS );
 					*/
-				}// else if
+				}
 				else if (controlID == buttonBuddiesID)
 				{
 					GameSpyToggleOverlay( GSOVERLAY_BUDDY );
@@ -865,17 +857,17 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 					else
 					{
 						GameSpyCurrentGroupRoomID = 0;
-						GSMessageBoxOk(UnicodeString(L"Oops"), UnicodeString(L"Unable to join title room"), NULL);
+						GSMessageBoxOk(L"Oops", L"Unable to join title room", NULL);
 					}
 					*/
 				}
 				else if (controlID == buttonLadderID)
 				{
-					TheShell->push(AsciiString("Menus/WOLLadderScreen.wnd"));
+					TheShell->push("Menus/WOLLadderScreen.wnd");
 				}
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -883,7 +875,7 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLWelcomeMenuSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
index 27234f26bdc..8dcf8aa5813 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
@@ -24,12 +24,12 @@
 
 // FILE: MessageBox.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -46,7 +46,7 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/NameKeyGenerator.h"
@@ -98,12 +98,12 @@ GameWindow *MessageBoxCancel(UnicodeString titleString,UnicodeString bodyString,
 //-------------------------------------------------------------------------------------------------
 /** Message Box window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType MessageBoxSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType MessageBoxSystem( GameWindow *window, UnsignedInt msg,
 										 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	
-	switch( msg ) 
+
+
+	switch( msg )
 	{
 
 		//---------------------------------------------------------------------------------------------
@@ -113,7 +113,7 @@ WindowMsgHandledType MessageBoxSystem( GameWindow *window, UnsignedInt msg,
 			window->winSetUserData( NULL );
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -125,69 +125,69 @@ WindowMsgHandledType MessageBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-			static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonOk" ) );
-			static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonYes" ) );
-			static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonNo" ) );
-			static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonCancel" ) );
+			static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonOk" );
+			static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonYes" );
+			static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonNo" );
+			static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonCancel" );
 			WindowMessageBoxData *MsgBoxCallbacks = (WindowMessageBoxData *)window->winGetUserData();
-			
+
 			if( controlID == buttonOkID )
 			{
 				//simple enough,if we have a callback, call it, if not, then just destroy the window
 				if (MsgBoxCallbacks->okCallback)
 					MsgBoxCallbacks->okCallback();
-				
+
 				TheWindowManager->winDestroy(window);
 
-			}  // end if
+			}
 			else if( controlID == buttonYesID )
 			{
 				if (MsgBoxCallbacks->yesCallback)
 					MsgBoxCallbacks->yesCallback();
 				TheWindowManager->winDestroy(window);
-			}  // end else if
+			}
 			else if( controlID == buttonNoID )
 			{
 				if (MsgBoxCallbacks->noCallback)
 					MsgBoxCallbacks->noCallback();
 				TheWindowManager->winDestroy(window);
-			}  // end else if
+			}
 			else if( controlID == buttonCancelID )
 			{
 				if (MsgBoxCallbacks->cancelCallback)
 					MsgBoxCallbacks->cancelCallback();
 				TheWindowManager->winDestroy(window);
-			}  // end else if
-			
+			}
+
 			break;
 
-		}  // end selected
-		
+		}
+
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end MessageBoxSystem
+}
 //-------------------------------------------------------------------------------------------------
 /** Message Box window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType QuitMessageBoxSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType QuitMessageBoxSystem( GameWindow *window, UnsignedInt msg,
 										 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	
-	switch( msg ) 
+
+
+	switch( msg )
 	{
 
 		//---------------------------------------------------------------------------------------------
@@ -197,7 +197,7 @@ WindowMsgHandledType QuitMessageBoxSystem( GameWindow *window, UnsignedInt msg,
 			window->winSetUserData( NULL );
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -209,57 +209,57 @@ WindowMsgHandledType QuitMessageBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-			static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonOk" ) );
-			static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonYes" ) );
-			static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonNo" ) );
-			static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonCancel" ) );
+			static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonOk" );
+			static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonYes" );
+			static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonNo" );
+			static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonCancel" );
 			WindowMessageBoxData *MsgBoxCallbacks = (WindowMessageBoxData *)window->winGetUserData();
-			
+
 			if( controlID == buttonOkID )
 			{
 				//simple enough,if we have a callback, call it, if not, then just destroy the window
 				if (MsgBoxCallbacks->okCallback)
 					MsgBoxCallbacks->okCallback();
-				
+
 				TheWindowManager->winDestroy(window);
 
-			}  // end if
+			}
 			else if( controlID == buttonYesID )
 			{
 				if (MsgBoxCallbacks->yesCallback)
 					MsgBoxCallbacks->yesCallback();
 				TheWindowManager->winDestroy(window);
-			}  // end else if
+			}
 			else if( controlID == buttonNoID )
 			{
 				if (MsgBoxCallbacks->noCallback)
 					MsgBoxCallbacks->noCallback();
 				TheWindowManager->winDestroy(window);
-			}  // end else if
+			}
 			else if( controlID == buttonCancelID )
 			{
 				if (MsgBoxCallbacks->cancelCallback)
 					MsgBoxCallbacks->cancelCallback();
 				TheWindowManager->winDestroy(window);
-			}  // end else if
-			
+			}
+
 			break;
 
-		}  // end selected
-		
+		}
+
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end MessageBoxSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp
index bdb75ad348a..cf2c0115bbe 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameWindow.h"
 #include "GameClient/Gadget.h"
@@ -43,15 +43,15 @@ WindowMsgHandledType ReplayControlInput( GameWindow *window, UnsignedInt msg,
 
 	return MSG_IGNORED;
 
-}  // end MapSelectMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** System callback for the control bar parent */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType ReplayControlSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ReplayControlSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		//---------------------------------------------------------------------------------------------
@@ -60,15 +60,15 @@ WindowMsgHandledType ReplayControlSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end ControlBarSystem
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
index e3d48039414..8004e9c89df 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
@@ -24,12 +24,12 @@
 
 // FILE: CheckBox.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -76,44 +76,44 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 				//TheWindowManager->winSetFocus( window );
 
-			}  // end if
+			}
 			break;
 
-		}  // end mouse entering
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
-			}  // end if
+			}
 			break;
 
-		}  // end mouse leaving
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
@@ -123,7 +123,7 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 																					(WindowMsgData)window, mData1 );
 			break;
 
-		}  // end left drag
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DOWN:
@@ -131,7 +131,7 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end left down
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_UP:
@@ -152,14 +152,14 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end left up and left click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_RIGHT_DOWN:
 		{
 
 			break;
-		}  // end right down
+		}
 
 		//-------------------------------------------------------------------------
 		case GWM_RIGHT_UP:
@@ -178,13 +178,13 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 				return MSG_IGNORED;
 			}
 			break;
-		}  // end right up or right click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CHAR:
 		{
 
-			switch( mData1 ) 
+			switch( mData1 )
 			{
 
 				// --------------------------------------------------------------------
@@ -197,14 +197,14 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 						// Toggle the check state
 						instData->m_state ^= WIN_STATE_SELECTED;
 
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GBM_SELECTED,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								0 );
-					}  //end if
+					}
 					break;
 
-				}  // end enter/space
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_DOWN:
@@ -216,7 +216,7 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 						TheWindowManager->winNextTab(window);
 					break;
 
-				}  // end down, right, tab
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_UP:
@@ -227,7 +227,7 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 						TheWindowManager->winPrevTab(window);
 					break;
 
-				}  // end up, left
+				}
 
 				// --------------------------------------------------------------------
 				default:
@@ -235,13 +235,13 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 
 					return MSG_IGNORED;
 
-				}  // end default
+				}
 
-			}  // end switch
+			}
 
 			break;
 
-		}  // end char msg
+		}
 
 		// ------------------------------------------------------------------------
 		default:
@@ -249,13 +249,13 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 
 			return MSG_IGNORED;
 
-		}  // end default
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetCheckBoxInput
+}
 
 // GadgetCheckBoxSystem =======================================================
 /** Handle system messages for check box */
@@ -265,9 +265,9 @@ WindowMsgHandledType GadgetCheckBoxSystem( GameWindow *window, UnsignedInt msg,
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
-		// ------------------------------------------------------------------------	
+		// ------------------------------------------------------------------------
 		case GGM_SET_LABEL:
 		{
 			window->winSetText( *(UnicodeString*)mData1 );
@@ -289,25 +289,25 @@ WindowMsgHandledType GadgetCheckBoxSystem( GameWindow *window, UnsignedInt msg,
 				BitClear( instData->m_state, WIN_STATE_HILITED );
 			else
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 			if( mData1 == FALSE )
 				*(Bool*)mData2 = FALSE;
 			else
 				*(Bool*)mData2 = TRUE;
-			
+
 			break;
 
-		default: 
+		default:
 			return MSG_IGNORED;
 
-	}  // end switch msg
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetCheckBoxSystem
+}
 
 // GadgetCheckBoxSetText ======================================================
 /** Set the text for the control */
@@ -321,7 +321,7 @@ void GadgetCheckBoxSetText( GameWindow *g, UnicodeString text )
 
 	TheWindowManager->winSendSystemMsg( g, GGM_SET_LABEL, (WindowMsgData)&text, 0 );
 
-}  // end GadgetCheckBoxSetText
+}
 
 // GadgetCheckBoxSetChecked ============================================
 //=============================================================================
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
index 27bc12baa93..26b816f4867 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GadgetComboBox.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -45,7 +45,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -100,7 +100,7 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 
 			switch (mData1)
 			{
-				
+
 				// --------------------------------------------------------------------
 				case KEY_DOWN:
 				case KEY_RIGHT:
@@ -122,11 +122,11 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 				default:
 					return TheWindowManager->winSendInputMsg( editBox, GWM_CHAR, mData1, mData2 );
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
-		}  // end case char
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_WHEEL_DOWN:
@@ -134,14 +134,14 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end wheel down
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_WHEEL_UP:
 		{
 			break;
 
-		}  // end wheel up
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_UP:
@@ -158,7 +158,7 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 				if( TheAudio )
 				{
 					TheAudio->addAudioEvent( &buttonClick );
-				}  // end if
+				}
 
 				GameWindow *listBox = GadgetComboBoxGetListBox(window);
 				if (listBox)
@@ -178,7 +178,7 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 						{
 							multiplier = comboData->entryCount;
 							listX = winSize.x;// + 16;
-							
+
 							if(listData->upButton)
 								listData->upButton->winHide(TRUE);
 							if(listData->downButton)
@@ -196,9 +196,9 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 								listData->downButton->winHide(FALSE);
 							if(listData->slider)
 								listData->slider->winHide(FALSE);
-							
+
 						}
-						
+
 						newSize.y = ((TheWindowManager->winFontHeight( listInstData->getFont() ) ) * multiplier) + multiplier * 2 + 4;
 						window->winSetSize(winSize.x , winSize.y + newSize.y );
 						listBox->winSetPosition(0, winSize.y);
@@ -212,62 +212,62 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 					}
 				}			break;
 
-		}  // end left click, left up
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_RIGHT_UP:
 		{
 			break;
 
-		}  // end right up, right click
+		}
 
 /*
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 				TheWindowManager->winSetFocus( window );
 
-			}  // end if
+			}
 
 			break;
 
-		}  //  end mouse entering
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK )) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ))
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
-			}  // end if
+			}
 
 			break;
 
-		}  // end mouse leaving
+		}
 */
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
 
 			if (BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 			break;
 
@@ -281,11 +281,11 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch msg
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetComboBoxInput
+}
 
 // HideListBox ================================================================
 /** Called to close the listbox if it is opened */
@@ -325,7 +325,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			instData->setText(*(UnicodeString*)mData1);
 			break;
 
-		}  // end set lavel
+		}
 
 		// ------------------------------------------------------------------------
 		case GCM_GET_TEXT:
@@ -333,7 +333,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			if(comboData->editBox)
 				*(UnicodeString*)mData2 = GadgetTextEntryGetText(comboData->editBox);
 			break;
-		} // end Get text
+		}
 
 		// ------------------------------------------------------------------------
 		case GCM_SET_TEXT:
@@ -342,13 +342,13 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 				GadgetTextEntrySetText(comboData->editBox,*(const UnicodeString*)mData1);
 			break;
 
-		}  // end set text
+		}
 
 		case GEM_UPDATE_TEXT:
 		{
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																	GCM_UPDATE_TEXT,
-																	(WindowMsgData)window, 
+																	(WindowMsgData)window,
 																	0 );
 			if (comboData->listBox)
 			{
@@ -365,19 +365,19 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			if ((GameWindow *)mData1 == comboData->editBox)
 			{
 				HideListBox(window);
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																		GCM_SELECTED,
-																		(WindowMsgData)window, 
+																		(WindowMsgData)window,
 																		0 );
 			}
 			break;
 		}
 		// ------------------------------------------------------------------------
-		// Set the selection in the listbox, this will trigger the listbox selected message 
+		// Set the selection in the listbox, this will trigger the listbox selected message
 		// which will set the edit box.
 		case GCM_SET_SELECTION:
-		{		
-			GameWindow *listBox = GadgetComboBoxGetListBox(window);					
+		{
+			GameWindow *listBox = GadgetComboBoxGetListBox(window);
 			if(listBox)
 			{
 				if( !listBox->winIsHidden() && mData2 == TRUE )
@@ -399,7 +399,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 				*(Int *)mData2 = -1;
 			}
 			break;
-		} //case GCM_GET_SELECTION:
+		}
 		// ------------------------------------------------------------------------
 		// Set the User Data for the specified listbox element
 		case GCM_SET_ITEM_DATA:
@@ -433,8 +433,8 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 					}
 					else
 						HideListBox(window);
-					
-					// Nothing was actually selected, so we just want to 
+
+					// Nothing was actually selected, so we just want to
 					if( mData2 == -1)
 					{
 						break;
@@ -444,26 +444,26 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 					UnicodeString tempUString;
 					Color color;
 					tempUString = GadgetListBoxGetTextAndColor( comboData->listBox, &color, mData2, 0 );
-									
+
 					GadgetTextEntrySetTextColor(comboData->editBox, color);
-					
+
 					GadgetTextEntrySetText(comboData->editBox, tempUString);
-					
-					TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+
+					TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																		GCM_SELECTED,
-																		(WindowMsgData)window, 
+																		(WindowMsgData)window,
 																		0 );
 				}
 			break;
 		}
-		
+
 		// ------------------------------------------------------------------------
 		case GGM_LEFT_DRAG:
 		{
 
 			break;
 
-		}  // end left drag
+		}
 
 		// ------------------------------------------------------------------------
 		case GCM_DEL_ALL:
@@ -473,32 +473,32 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			if ( comboData->editBox )
 				GadgetTextEntrySetText(comboData->editBox, UnicodeString::TheEmptyString );
 			comboData->entryCount = 0;
-			//HideListBox(window);	
+			//HideListBox(window);
 			break;
 
-		}  // end delete all
+		}
 
 		// ------------------------------------------------------------------------
 		case GCM_DEL_ENTRY:
 		{
-			
+
 			break;
 
-		}  // end delete entry
+		}
 		// ------------------------------------------------------------------------
 		case GGM_CLOSE:
 		{
 			HideListBox(window);
 			break;
 
-		}  // end delete entry
+		}
 
 		// ------------------------------------------------------------------------
 		case GCM_ADD_ENTRY:
 		{
 			GameWindow *listBox = GadgetComboBoxGetListBox(window);
 			ListboxData *listData = (ListboxData *)listBox->winGetUserData();
-			
+
 			Int addedIndex = -1;
 			if( listBox )
 			{
@@ -522,7 +522,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 				editBox->winGetSize(&editBoxSize.x, &editBoxSize.y);
 				// If the listbox has less entries then the MaxDisplay, size it smaller
 				if(comboData->entryCount <= comboData->maxDisplay)
-				{							
+				{
 					multiplier = comboData->entryCount;
 					listX = winSize.x + 16;
 					if(listData->upButton)
@@ -550,9 +550,9 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			}
 
 			return( (WindowMsgHandledType) addedIndex );
-		}  // end add entry
-	
-		
+		}
+
+
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
 			break;
@@ -565,15 +565,15 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			ICoord2D dropDownSize;
 
 			// get needed window sizes
-			
+
 			comboData->dropDownButton->winGetSize( &dropDownSize.x, &dropDownSize.y );
-		
+
 			GameWindow *listBox = GadgetComboBoxGetListBox(window);
 			if (listBox->winIsHidden())
 			{
 				if (listBox)
 					listBox->winSetSize(width,height);
-					
+
 				if( comboData->dropDownButton )
 				{
 					comboData->dropDownButton->winSetPosition( width - dropDownSize.x, 0 );
@@ -587,7 +587,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end resized
+		}
 
 		// ------------------------------------------------------------------------
 
@@ -595,13 +595,11 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 		case GWM_DESTROY:
 		{
 			TheWindowManager->winSetLoneWindow(NULL); // if we are transitioning screens, close all combo boxes
-			if (comboData)
-			{
-				delete(comboData);
-				comboData = NULL;
-			}
+			delete (ComboBoxData *)window->winGetUserData();
+			window->winSetUserData(NULL);
+			comboData = NULL;
 			break;
-		}  // end destroy
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -617,20 +615,20 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 			}
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 
 			Bool wantsFocus = FALSE;
 			GameWindow *editBox = GadgetComboBoxGetEditBox(window);
 			// we need to tell the text entry box to take the focus.
 			TheWindowManager->winSendSystemMsg( editBox, GWM_INPUT_FOCUS, mData1, (WindowMsgData)&wantsFocus );
-			
+
 			*(Bool*)mData2 = TRUE;
 			break;
 
-		}  // end input focus
+		}
 
 
 		case GBM_SELECTED:
@@ -662,7 +660,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 						{
 							multiplier = comboData->entryCount;
 							listX = winSize.x;// + 16;
-							
+
 							if(listData->upButton)
 								listData->upButton->winHide(TRUE);
 							if(listData->downButton)
@@ -680,9 +678,9 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 								listData->downButton->winHide(FALSE);
 							if(listData->slider)
 								listData->slider->winHide(FALSE);
-							
+
 						}
-						
+
 						newSize.y = ((TheWindowManager->winFontHeight( listInstData->getFont() ) ) * multiplier) + multiplier * 2 + 4;
 						window->winSetSize(winSize.x , winSize.y + newSize.y );
 						listBox->winSetPosition(0, winSize.y);
@@ -701,29 +699,29 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetListBoxSystem
+}
 
 // GadgetComboBoxSetColors ====================================================
 /** Set the colors for a Combo box, note that this will also automatically
-	* change the colors of any attached slider, slider thumb, and slider 
+	* change the colors of any attached slider, slider thumb, and slider
 	* buttons */
 //=============================================================================
 void GadgetComboBoxSetColors( GameWindow *comboBox,
-														 Color enabledColor, 
+														 Color enabledColor,
 														 Color enabledBorderColor,
-														 Color enabledSelectedItemColor, 
+														 Color enabledSelectedItemColor,
 														 Color enabledSelectedItemBorderColor,
-														 Color disabledColor, 
+														 Color disabledColor,
 														 Color disabledBorderColor,
-														 Color disabledSelectedItemColor, 
+														 Color disabledSelectedItemColor,
 														 Color disabledSelectedItemBorderColor,
-														 Color hiliteColor, 
+														 Color hiliteColor,
 														 Color hiliteBorderColor,
-														 Color hiliteSelectedItemColor, 
+														 Color hiliteSelectedItemColor,
 														 Color hiliteSelectedItemBorderColor )
 {
 //	ComboBoxData *comboBoxData = (ComboBoxData *)comboBox->winGetUserData();
@@ -744,7 +742,7 @@ void GadgetComboBoxSetColors( GameWindow *comboBox,
 		GadgetComboBoxSetHiliteBorderColor( comboBox,hiliteBorderColor );
 		GadgetComboBoxSetHiliteSelectedItemColor( comboBox, hiliteSelectedItemColor );
 		GadgetComboBoxSetHiliteSelectedItemBorderColor( comboBox, hiliteSelectedItemBorderColor );
-	
+
 	GameWindow *editBox = GadgetComboBoxGetEditBox(comboBox);
 	if (editBox)
 	{
@@ -763,7 +761,7 @@ void GadgetComboBoxSetColors( GameWindow *comboBox,
 		GadgetButtonSetHiliteBorderColor( editBox, hiliteBorderColor );
 		GadgetButtonSetHiliteSelectedColor( editBox, hiliteSelectedItemColor );
 		GadgetButtonSetHiliteSelectedBorderColor( editBox, hiliteSelectedItemBorderColor );
-	}	
+	}
 
 	GameWindow *dropDownButton = GadgetComboBoxGetDropDownButton(comboBox);
 	if (dropDownButton)
@@ -783,33 +781,33 @@ void GadgetComboBoxSetColors( GameWindow *comboBox,
 		GadgetButtonSetHiliteBorderColor( dropDownButton, hiliteBorderColor );
 		GadgetButtonSetHiliteSelectedColor( dropDownButton, hiliteSelectedItemColor );
 		GadgetButtonSetHiliteSelectedBorderColor( dropDownButton, hiliteSelectedItemBorderColor );
-	}	
+	}
 
 	GameWindow * listBox = GadgetComboBoxGetListBox( comboBox );
 	if ( listBox )
 	{
 		GadgetListBoxSetColors(listBox,
-													enabledColor, 
+													enabledColor,
 													enabledBorderColor,
-													enabledSelectedItemColor, 
+													enabledSelectedItemColor,
 													enabledSelectedItemBorderColor,
-													disabledColor, 
+													disabledColor,
 													disabledBorderColor,
-													disabledSelectedItemColor, 
+													disabledSelectedItemColor,
 													disabledSelectedItemBorderColor,
-													hiliteColor, 
+													hiliteColor,
 													hiliteBorderColor,
-													hiliteSelectedItemColor, 
+													hiliteSelectedItemColor,
 													hiliteSelectedItemBorderColor );
 	}
-}  // end GadgetComboBoxSetColors
+}
 
 // GadgetComboBoxSetIsEditable ================================================
 /** Sets up the Text Entry gadget as editable or not */
 //=============================================================================
 void GadgetComboBoxSetIsEditable(GameWindow *comboBox, Bool isEditable  )
 {
-	ComboBoxData *comboData = (ComboBoxData *)comboBox->winGetUserData();	
+	ComboBoxData *comboData = (ComboBoxData *)comboBox->winGetUserData();
 	GameWindow *editBox = GadgetComboBoxGetEditBox(comboBox);
 	UnsignedInt status ;
 	if(!editBox)
@@ -819,7 +817,7 @@ void GadgetComboBoxSetIsEditable(GameWindow *comboBox, Bool isEditable  )
 	if (isEditable)
 	{
 		status = editBox->winGetStatus();
-		
+
 		BitClear(status, WIN_STATUS_NO_INPUT);
 //		BitClear(status, WIN_STATUS_NO_FOCUS);
 		editBox->winSetStatus(status);
@@ -827,18 +825,18 @@ void GadgetComboBoxSetIsEditable(GameWindow *comboBox, Bool isEditable  )
 	else
 	{
 		status = editBox->winGetStatus();
-		
+
 		BitSet(status, WIN_STATUS_NO_INPUT);
 //		BitSet(status, WIN_STATUS_NO_FOCUS);
 		editBox->winSetStatus(status);
 	}
-}//void GadgetComboBoxSetIsEditable(GameWindow *comboBox, Int maxChars )
+}
 
 // GadgetComboBoxSetIsAsciiOnly ==================================================
 /** Get the text the Combo Box */
 //=============================================================================
 void GadgetComboBoxSetLettersAndNumbersOnly(GameWindow *comboBox, Bool isLettersAndNumbersOnly)
-{	
+{
 	//sanity
 	if(comboBox == NULL)
 		return;
@@ -879,7 +877,7 @@ void GadgetComboBoxSetMaxChars( GameWindow *comboBox, Int maxChars )
 	comboData->maxChars = maxChars;
 	comboData->entryData->maxTextLen = maxChars;
 
-}//void GadgetComboBoxSetMaxChars( GameWindow *comboBox, Int maxChars )
+}
 
 // GadgetComboBoxSetMaxDisplay ================================================
 /** Sets the MaxDisplay variable to the new Max Display */
@@ -889,7 +887,7 @@ void GadgetComboBoxSetMaxDisplay( GameWindow *comboBox, Int maxDisplay )
 	ComboBoxData *comboData = (ComboBoxData *)comboBox->winGetUserData();
 	comboData->maxDisplay = maxDisplay;
 
-}//void GadgetComboBoxSetMaxDisplay( GameWindow *comboBox, Int maxDisplay );
+}
 
 // GadgetComboBoxGetText =======================================================
 /** Get the text the Combo Box */
@@ -904,7 +902,7 @@ UnicodeString GadgetComboBoxGetText( GameWindow *comboBox )
 	// verify that this is a combo box
 	if( BitIsSet( comboBox->winGetStyle(), GWS_COMBO_BOX ) == FALSE )
 		return UnicodeString::TheEmptyString;
-	
+
 	return GadgetTextEntryGetText( GadgetComboBoxGetEditBox(comboBox) );
 }
 
@@ -990,7 +988,7 @@ void GadgetComboBoxSetEnabledTextColors(GameWindow *comboBox, Color color, Color
 	// sanity
 	if( comboBox == NULL )
 		return;
-	
+
 	ComboBoxData *comboBoxData = (ComboBoxData *)comboBox->winGetUserData();
 	if(comboBoxData->listBox)
 		comboBoxData->listBox->winSetEnabledTextColors( color,borderColor);
@@ -1020,9 +1018,9 @@ void GadgetComboBoxSetHiliteTextColors( GameWindow *comboBox,Color color, Color
 	// sanity
 	if( comboBox == NULL )
 		return;
-	
+
 	ComboBoxData *comboBoxData = (ComboBoxData *)comboBox->winGetUserData();
-	
+
 	if(comboBoxData->listBox)
 		comboBoxData->listBox->winSetHiliteTextColors( color,borderColor);
 	if(comboBoxData->editBox)
@@ -1036,7 +1034,7 @@ void GadgetComboBoxSetIMECompositeTextColors(GameWindow *comboBox, Color color,
 	// sanity
 	if( comboBox == NULL )
 		return;
-	
+
 	ComboBoxData *comboBoxData = (ComboBoxData *)comboBox->winGetUserData();
 
 	if(comboBoxData->listBox)
@@ -1086,7 +1084,7 @@ void GadgetComboBoxSetItemData( GameWindow *comboBox, Int index, void *data )
 void *GadgetComboBoxGetItemData( GameWindow *comboBox, Int index )
 {
 	void *data = NULL;
-	
+
 	if (comboBox)
 	{
 		TheWindowManager->winSendSystemMsg( comboBox, GCM_GET_ITEM_DATA, index, (WindowMsgData)&data);
@@ -1105,5 +1103,5 @@ Int GadgetComboBoxGetLength( GameWindow *combobox )
 		return comboboxData->entryCount;
 
 	return 0;
-}  // end GadgetListBoxGetListLength
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
index 5061e193b28..6f25d376361 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
@@ -24,12 +24,12 @@
 
 // FILE: HorizontalSlider.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -67,11 +67,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // GadgetHorizontalSliderInput ================================================
 /** Handle input for horizontal slider */
@@ -83,24 +78,24 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 	WinInstanceData *instData = window->winGetInstanceData();
 	ICoord2D size, childSize, childCenter;
 	window->winGetSize( &size.x, &size.y );
-	switch( msg ) 
+	switch( msg )
 	{
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 				//TheWindowManager->winSetFocus( window );
 
-			}  // end if
-			
+			}
+
 			if(window->winGetChild() && BitIsSet(window->winGetChild()->winGetStyle(),GWS_PUSH_BUTTON) )
 			{
 				WinInstanceData *instDataChild = window->winGetChild()->winGetInstanceData();
@@ -109,21 +104,21 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 
 			break;
 
-		}  //  end mouse entering
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK )) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ))
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
-			}  // end if
+			}
 			if(window->winGetChild() && BitIsSet(window->winGetChild()->winGetStyle(),GWS_PUSH_BUTTON) )
 			{
 				WinInstanceData *instDataChild = window->winGetChild()->winGetInstanceData();
@@ -132,15 +127,15 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 
 			break;
 
-		}  // end mouse leaving
+		}
 
-		// ------------------------------------------------------------------------	
+		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
 
 			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 			break;
 
@@ -154,12 +149,12 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 			Int x, y;
 			Int mousex = mData1 & 0xFFFF;
 //			Int mousey = mData1 >> 16;
-			
+
 			GameWindow *child = window->winGetChild();
 			Int pageClickSize, clickPos;
 
 			window->winGetScreenPosition( &x, &y );
-	
+
 			child->winGetSize( &childSize.x, &childSize.y );
 			child->winGetPosition( &childCenter.x, &childCenter.y );
 			childCenter.x += childSize.x / 2;
@@ -179,7 +174,7 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 				if( clickPos > mousex - x )
 					clickPos = mousex - x;
 
-			}  // end if
+			}
 			else
 			{
 
@@ -187,7 +182,7 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 				if( clickPos < mousex - x )
 					clickPos = mousex - x;
 
-			}  // end else
+			}
 
 			// keep it all valid to the window
 			if( clickPos > x + size.x - childSize.x / 2 )
@@ -199,7 +194,7 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 			TheWindowManager->winSendSystemMsg( window, GGM_LEFT_DRAG, 0, mData1 );
 			break;
 
-		}  // end left up, left click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CHAR:
@@ -213,22 +208,22 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 					if( BitIsSet( mData2, KEY_STATE_DOWN ) )
 					{
 
-						if( s->position > s->minVal + 1 ) 
+						if( s->position > s->minVal + 1 )
 						{
 							GameWindow *child = window->winGetChild();
 
 							s->position -= 2;
 							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GSM_SLIDER_TRACK,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									s->position );
 
 							// Translate to window coords
 							child->winSetPosition( (Int)((s->position - s->minVal) * s->numTicks), HORIZONTAL_SLIDER_THUMB_POSITION );
 
-						}  // end if
+						}
 
-					}  // if key down
+					}
 
 					break;
 
@@ -238,14 +233,14 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 					if( BitIsSet( mData2, KEY_STATE_DOWN ) )
 					{
 
-						if( s->position < s->maxVal - 1 ) 
+						if( s->position < s->maxVal - 1 )
 						{
 							GameWindow *child = window->winGetChild();
 
 							s->position += 2;
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GSM_SLIDER_TRACK,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									s->position );
 
 							// Translate to window coords
@@ -253,7 +248,7 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 
 						}
 
-					}  // end if key down
+					}
 
 					break;
 
@@ -276,11 +271,11 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 				default:
 					return MSG_IGNORED;
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
-		}  // end char
+		}
 
 		// ------------------------------------------------------------------------
 		default:
@@ -290,7 +285,7 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 
 	return MSG_HANDLED;
 
-}  // end GadgetHorizontalSliderInput
+}
 
 // GadgetHorizontalSliderSystem ===============================================
 /** Handle system messages for horizontal slider */
@@ -302,7 +297,7 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 	WinInstanceData *instData = window->winGetInstanceData();
 	ICoord2D size, childSize, childCenter,childRelativePos;
 	window->winGetSize( &size.x, &size.y );
-	switch( msg ) 
+	switch( msg )
 	{
 		// ------------------------------------------------------------------------
 		case GGM_LEFT_DRAG:
@@ -311,10 +306,10 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 //			Int mousey = mData2 >> 16;
 			Int x, y, delta;
 			GameWindow *child = window->winGetChild();
-			
+
 
 			window->winGetScreenPosition( &x, &y );
-			
+
 			child->winGetSize( &childSize.x, &childSize.y );
 			child->winGetScreenPosition( &childCenter.x, &childCenter.y );
 			child->winGetPosition(&childRelativePos.x, &childRelativePos.y);
@@ -328,41 +323,41 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 			if( mousex > x + size.x -HORIZONTAL_SLIDER_THUMB_WIDTH/2 )
 			{
 
-				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER, 
+				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER,
 																						s->maxVal, 0 );
 				// tell owner i moved
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GSM_SLIDER_TRACK,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						s->position );
 				break;
-			
-			}  // end if
+
+			}
 			else if( mousex < x + HORIZONTAL_SLIDER_THUMB_WIDTH/2)
 			{
 
-				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER, 
+				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER,
 																						s->minVal, 0 );
 				// tell owner i moved
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GSM_SLIDER_TRACK,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						s->position );
 				break;
 
-			}  // end else if
+			}
 
 			if( childCenter.x < x + childSize.x / 2 )
 			{
 				child->winSetPosition( 0,HORIZONTAL_SLIDER_THUMB_POSITION );
 				s->position = s->minVal;
-				
+
 			}
 			else if( childCenter.x >= x + size.x - childSize.x / 2 )
 			{
 				child->winSetPosition( (Int)((s->maxVal - s->minVal) * s->numTicks) -HORIZONTAL_SLIDER_THUMB_WIDTH/2 , HORIZONTAL_SLIDER_THUMB_POSITION );
 				s->position = s->maxVal;
-				
+
 			}
 			else
 			{
@@ -379,24 +374,24 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 					s->position = s->maxVal;
 				if( s->position < s->minVal)
 					s->position = s->minVal;
-				
+
 				child->winSetPosition( childRelativePos.x, HORIZONTAL_SLIDER_THUMB_POSITION );
 			}
-			
+
 			// tell owner i moved
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GSM_SLIDER_TRACK,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					s->position );
 
 			break;
 
-		}  // end left drag
+		}
 
 		// ------------------------------------------------------------------------
 		case GSM_SET_SLIDER:
 		{
-			Int newPos = (Int)mData1; 
+			Int newPos = (Int)mData1;
 			GameWindow *child = window->winGetChild();
 
 			if( newPos < s->minVal || newPos > s->maxVal )
@@ -410,7 +405,7 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 			child->winSetPosition( newPos , HORIZONTAL_SLIDER_THUMB_POSITION );
 			break;
 
-		}  // end set slider
+		}
 
 		// ------------------------------------------------------------------------
 		case GSM_SET_MIN_MAX:
@@ -428,7 +423,7 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 			child->winSetPosition( 0, HORIZONTAL_SLIDER_THUMB_POSITION );
 			break;
 
-		}  // end set min max
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
@@ -437,6 +432,8 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
 			delete ( (SliderData *)window->winGetUserData() );
+			window->winSetUserData(NULL);
+			s = NULL;
 			break;
 
 		// ------------------------------------------------------------------------
@@ -449,15 +446,15 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 			else
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 
 			*(Bool*)mData2 = TRUE;
 			break;
 
-		}  // end focus msg
+		}
 
 		// ------------------------------------------------------------------------
 		case GGM_RESIZED:
@@ -471,13 +468,13 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 
 			break;
 
-		}  // end resized
-		
+		}
+
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetHorizontalSliderSystem
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
index e69ea259b4f..9b4547a6cf2 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GadgetListBox.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -47,7 +47,7 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioEventRTS.h"
 #include "Common/Language.h"
@@ -63,11 +63,6 @@
 #include "GameClient/GameWindowGlobal.h"
 #include "GameClient/Keyboard.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // DEFINES ////////////////////////////////////////////////////////////////////
 // Sets up the user's OS set doubleclick time so if they don't like it... they can
@@ -113,7 +108,7 @@ static void doAudioFeedback(GameWindow *window)
 		if( TheAudio )
 		{
 			TheAudio->addAudioEvent( &buttonClick );
-		}  // end if
+		}
 	}
 }
 
@@ -135,14 +130,14 @@ static Int getListboxEntryBasedOnCoord(GameWindow *window, Int x, Int y, Int &ro
 	for( i=0; ; i++ )
 	{
 		if( i > 0 )
-			if( list->listData[ i - 1 ].listHeight > 
+			if( list->listData[ i - 1 ].listHeight >
 					(list->displayPos + list->displayHeight ) )
 			{
 				pos = -1;
 				break;
 			}
 
-		if( i == list->endPos )						
+		if( i == list->endPos )
 		{
 			pos = -1;
 			break;
@@ -154,7 +149,7 @@ static Int getListboxEntryBasedOnCoord(GameWindow *window, Int x, Int y, Int &ro
 
 	column = -1;
 	if( pos == -2 )
-	{ 
+	{
 		pos = i;
 		Int total = 0;
 		for( i = 0; i < list->columns ;i++)
@@ -234,7 +229,7 @@ static void removeSelection( ListboxData *list, Int i )
 // adjustDisplay ==============================================================
 /** Update Display List information inlcuding scrollbar */
 //=============================================================================
-static void adjustDisplay( GameWindow *window, Int adjustment, 
+static void adjustDisplay( GameWindow *window, Int adjustment,
 													 Bool updateSlider )
 {
 	Int entry;
@@ -266,24 +261,24 @@ static void adjustDisplay( GameWindow *window, Int adjustment,
 		list->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 		// Take into account that there is a line-drawn outline surrounding listbox
 		sData->maxVal = list->totalHeight - ( list->displayHeight - TOTAL_OUTLINE_HEIGHT ) + 1;
-		
+
 		if( sData->maxVal < 0 )
 		{
 			sData->maxVal = 0;
 		}
-		
+
 		child = list->slider->winGetChild();
 		child->winGetSize( &sliderChildSize.x, &sliderChildSize.y );
 		sData->numTicks = (float)((sliderSize.y - sliderChildSize.y) / (float)sData->maxVal);
 
 		if( updateSlider )
-			TheWindowManager->winSendSystemMsg( list->slider, 
-																					GSM_SET_SLIDER, 
-																					(sData->maxVal - list->displayPos), 
+			TheWindowManager->winSendSystemMsg( list->slider,
+																					GSM_SET_SLIDER,
+																					(sData->maxVal - list->displayPos),
 																					0 );
 	}
 
-}  // end adjustDisplay
+}
 
 // computeTotalHeight =========================================================
 /** Compute Total Height and fill in listHeight values */
@@ -297,11 +292,11 @@ static void computeTotalHeight( GameWindow *window )
 
 	for( i=0; i<list->endPos; i++ )
 	{
-		
+
 		if(!list->listData[i].cell)
 			continue;
 		tempHeight = 0;
-		
+
 		for (Int j = 0; j < list->columns; j++)
 		{
 			Int cellHeight = 0;
@@ -315,9 +310,9 @@ static void computeTotalHeight( GameWindow *window )
 				{
 					DisplayString *displayString = (DisplayString *)list->listData[i].cell[j].data;
 					if(displayString)
-						displayString->getSize( NULL, &cellHeight );		
-				}//else
-			}//if
+						displayString->getSize( NULL, &cellHeight );
+				}
+			}
 			else if(list->listData[i].cell[j].cellType == LISTBOX_IMAGE)
 			{
 				if(list->listData[i].cell[j].height > 0)
@@ -327,7 +322,7 @@ static void computeTotalHeight( GameWindow *window )
 			}
 			if(cellHeight > tempHeight)
 				tempHeight = cellHeight;
-		}//for
+		}
 		list->listData[i].height = tempHeight;
 		height += (list->listData[i].height + 1);
 		list->listData[i].listHeight = height;
@@ -352,7 +347,7 @@ static Int addImageEntry( const Image *image, Color color, Int row, Int column,
 		DEBUG_ASSERTCRASH(false, ("Tried to add Image to Listbox at invalid position"));
 		return -1;
 	}
-	
+
 	// If we want to just add an entry to the bottom, set the defaults
 	if (row == -1)
 	{
@@ -383,12 +378,12 @@ static Int addImageEntry( const Image *image, Color color, Int row, Int column,
 	listRow->cell[column].color = color;
 	listRow->cell[column].height = height;
 	listRow->cell[column].width = width;
-	
+
 	computeTotalHeight( window );
 
-	return (row);	
+	return (row);
 
-}// static Int addImageEntry( Image image, Int column, GameWindow *window)
+}
 
 // startingRow will get moved to startingRow+1, etc.  This assumes there is space!!!!!
 static Int moveRowsDown(ListboxData *list, Int startingRow)
@@ -448,14 +443,14 @@ static Int addEntry( UnicodeString *string, Int color, Int row, Int column, Game
 	ListboxData *list = (ListboxData *)window->winGetUserData();
 	Int width;
 	DisplayString *displayString;
-	
+
 	// make sure our params are good
 	if( column >= list->columns  || row >= list->listLength )
 	{
 		DEBUG_ASSERTCRASH(false, ("Tried to add text to Listbox at invalid position"));
 		return -1;
 	}
-	
+
 	// If we want to just add an entry to the bottom, set the defaults
 	if (row == -1)
 	{
@@ -487,7 +482,7 @@ static Int addEntry( UnicodeString *string, Int color, Int row, Int column, Game
 		memset(listRow->cell,0,list->columns * sizeof(ListEntryCell));
 		rowsAdded = 1;
 	}
-	
+
 	//add Image to selected row/cell
 	listRow->cell[column].cellType = LISTBOX_TEXT;
 
@@ -534,7 +529,7 @@ static Int addEntry( UnicodeString *string, Int color, Int row, Int column, Game
 	}
 
 	return (row);
-}  // end addEntry
+}
 
 // PUBLIC DATA ////////////////////////////////////////////////////////////////
 
@@ -564,7 +559,7 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 
 			switch (mData1)
 			{
-				
+
 				// --------------------------------------------------------------------
 				case KEY_ENTER:
 				case KEY_SPACE:
@@ -574,15 +569,15 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 					{
 						doAudioFeedback(window);
 
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GLM_DOUBLE_CLICKED,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								list->selectPos );
-					}  // end if
+					}
 
 					break;
 
-				}  // end enter or space
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_DOWN:
@@ -625,15 +620,15 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 
 						}
 
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GLM_SELECTED,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								list->selectPos );
-					}  // end if
+					}
 
 					break;
 
-				}  // end key down
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_UP:
@@ -641,7 +636,7 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 
 					if( BitIsSet( mData2, KEY_STATE_DOWN ) )
 					{
-	
+
 						if( list->selectPos == -1 )
 						{
 							list->selectPos = 0;
@@ -672,15 +667,15 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 							}
 						}
 
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GLM_SELECTED,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								list->selectPos );
 					}
 
 					break;
 
-				}  // end key up
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_RIGHT:
@@ -713,7 +708,7 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 								// if we've reached the end of the list, start at the beginning
 								if( position >= list->endPos)
 									position = 0;
-								
+
 								ListEntryCell *cell = NULL;
 								// go through the columns until we find a column with text
 								Int j = 0;
@@ -731,8 +726,8 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 								if(!dString)
 									continue;
 								for(j = 0; j < TheKeyboard->MAX_KEY_STATES; ++j)
-								{								
-									if(dString->getText().getCharAt(0) == TheKeyboard->getPrintableKey(mData1, j))
+								{
+									if(dString->getText().getCharAt(0) == TheKeyboard->getPrintableKey((KeyDefType)mData1, j))
 									{
 										list->selectPos = position;
 										Int prevPos = getListboxTopEntry(list);
@@ -749,19 +744,19 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 								}
 
 							}
-							
-							
+
+
 						}
 
 						if (!foundIt)
 							return MSG_IGNORED;
 					}
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
-		}  // end case char
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_WHEEL_DOWN:
@@ -774,7 +769,7 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end wheel down
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_WHEEL_UP:
@@ -785,7 +780,7 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 			adjustDisplay( window, -1, TRUE );
 			break;
 
-		}  // end wheel up
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_UP:
@@ -808,14 +803,14 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 			{
 
 				if( i > 0 )
-					if( list->listData[ i - 1 ].listHeight > 
+					if( list->listData[ i - 1 ].listHeight >
 							(list->displayPos + list->displayHeight) )
 					{
 						list->selectPos = -1;
 						break;
 					}
 
-				if( i == list->endPos )						
+				if( i == list->endPos )
 				{
 					list->selectPos = -1;
 					break;
@@ -824,9 +819,9 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 				if( list->listData[i].listHeight > (mousey - y + list->displayPos) )
 					break;
 			}
-			
+
 			//Bool dblClicked = FALSE;
-			if( list->doubleClickTime + doubleClickTime > timeGetTime() && 
+			if( list->doubleClickTime + doubleClickTime > timeGetTime() &&
 					(i == oldPos || (oldPos == -1 && ( i>=0 && i<list->endPos ) )) )
 			{
 				int temp;
@@ -835,9 +830,9 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 					temp = i;
 				else
 					temp = oldPos;
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_DOUBLE_CLICKED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					temp );
 				//break;
 			}
@@ -856,14 +851,14 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 				list->selectPos = oldPos;
 			}
 			list->doubleClickTime = timeGetTime();
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_SELECTED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					list->selectPos );
-			
+
 			break;
 
-		}  // end left click, left up
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_RIGHT_DOWN:
@@ -889,14 +884,14 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 			for( i=0; ; i++ )
 			{
 				if( i > 0 )
-					if( list->listData[ i - 1 ].listHeight > 
+					if( list->listData[ i - 1 ].listHeight >
 							(list->displayPos + list->displayHeight ) )
 					{
 						pos = -1;
 						break;
 					}
 
-				if( i == list->endPos )						
+				if( i == list->endPos )
 				{
 					pos = -1;
 					break;
@@ -908,63 +903,63 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 
 			if( pos == -2 )
 				pos = i;
-					
+
 			rc.pos = pos;
 			rc.mouseX = mousex;
 			rc.mouseY = mousey;
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_RIGHT_CLICKED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					(WindowMsgData)&rc );
 			break;
 
-		}  // end right up, right click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 				//TheWindowManager->winSetFocus( window );
 
-			}  // end if
+			}
 
 			break;
 
-		}  //  end mouse entering
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK )) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ))
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
-			}  // end if
+			}
 
 			break;
 
-		}  // end mouse leaving
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
 
 			if (BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 			break;
 
@@ -978,11 +973,11 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch msg
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetListBoxInput
+}
 
 // GadgetListBoxMultiInput ====================================================
 /** Handle input for multiple selection list box */
@@ -993,7 +988,7 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 	ListboxData *list = (ListboxData *)window->winGetUserData();
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 		// ------------------------------------------------------------------------
 		case GWM_CHAR:
@@ -1014,7 +1009,7 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 			}
 			break;
 
-		}  // end char
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_UP:
@@ -1038,14 +1033,14 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 			{
 
 				if( i > 0 )
-					if( list->listData[ i - 1 ].listHeight > 
+					if( list->listData[ i - 1 ].listHeight >
 							(list->displayPos + list->displayHeight ) )
 					{
 						selectPos = -1;
 						break;
 					}
 
-				if( i == list->endPos )						
+				if( i == list->endPos )
 				{
 					selectPos = -1;
 					break;
@@ -1067,7 +1062,7 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 					removed = TRUE;
 					break;
 				}
-				
+
 				i++;
 			}
 
@@ -1076,14 +1071,14 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 				list->selections[ i] = selectPos;
 				list->selections[ i + 1 ] = -1;
 			}
-		
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_SELECTED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					selectPos );
 			break;
 
-		}  // end left up, left click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_RIGHT_UP:
@@ -1103,14 +1098,14 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 			for( i = 0; ; i++ )
 			{
 				if( i > 0 )
-					if( list->listData[ i - 1 ].listHeight > 
+					if( list->listData[ i - 1 ].listHeight >
 							(list->displayPos + list->displayHeight ) )
 					{
 						selectPos = -1;
 						break;
 					}
 
-				if( i == list->endPos )						
+				if( i == list->endPos )
 				{
 					selectPos = -1;
 					break;
@@ -1123,9 +1118,9 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 			if( selectPos == -2 )
 				selectPos = i;
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_RIGHT_CLICKED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					selectPos );*/
 			TheWindowManager->winSetFocus( window );
 			Int pos;
@@ -1145,14 +1140,14 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 			for( i=0; ; i++ )
 			{
 				if( i > 0 )
-					if( list->listData[ i - 1 ].listHeight > 
+					if( list->listData[ i - 1 ].listHeight >
 							(list->displayPos + list->displayHeight ) )
 					{
 						pos = -1;
 						break;
 					}
 
-				if( i == list->endPos )						
+				if( i == list->endPos )
 				{
 					pos = -1;
 					break;
@@ -1164,17 +1159,17 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 
 			if( pos == -2 )
 				pos = i;
-					
+
 			rc.pos = pos;
 			rc.mouseX = mousex;
 			rc.mouseY = mousey;
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_RIGHT_CLICKED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					(WindowMsgData)&rc );
 			break;
 
-		}  // end right up, right click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_WHEEL_DOWN:
@@ -1202,47 +1197,47 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 				//TheWindowManager->winSetFocus( window );
 
-			}  // end if
+			}
 
 			break;
 
-		}  //  end mouse entering
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK )) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ))
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
-			}  // end if
+			}
 
 			break;
 
-		}  // end mouse leaving
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
 
 			if (BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 			break;
 
@@ -1256,11 +1251,11 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetListBoxMultiInput
+}
 
 // GadgetListBoxSystem ========================================================
 /** Handle system messages for list box */
@@ -1271,7 +1266,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 	ListboxData *list = (ListboxData *)window->winGetUserData();
 	WinInstanceData *instData = window->winGetInstanceData();
 	ICoord2D *pos;
-		
+
 	switch( msg )
 	{
 		// ------------------------------------------------------------------------
@@ -1280,7 +1275,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			instData->setText(*(UnicodeString*)mData1);
 			break;
 
-		}  // end set lavel
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_GET_TEXT:
@@ -1288,20 +1283,20 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			pos = (ICoord2D *)mData1;
 			TextAndColor *tAndC = (TextAndColor *)mData2;
 
-			if(pos->x >= list->columns || pos->y >= list->listLength || 
+			if(pos->x >= list->columns || pos->y >= list->listLength ||
 					list->listData[pos->y].cell[pos->x].cellType != LISTBOX_TEXT)
 			{
 				tAndC->string = UnicodeString::TheEmptyString;
-				tAndC->color = 0;				
+				tAndC->color = 0;
 			}
 			else
 			{
 				tAndC->string = ((DisplayString *)list->listData[ pos->y ].cell[pos->x].data)->getText();
-				tAndC->color = list->listData[ pos->y ].cell[pos->x].color;				
+				tAndC->color = list->listData[ pos->y ].cell[pos->x].color;
 			}
 		break;
 		}
-		
+
 		// ------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
@@ -1320,7 +1315,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end selected
+		}
 
 		// ------------------------------------------------------------------------
 		case GGM_LEFT_DRAG:
@@ -1339,7 +1334,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end left drag
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_DEL_ALL:
@@ -1352,20 +1347,20 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			// Loop through and destroy any display strings we've allocated that aren't used
 			for( Int i = 0; i < list->listLength; i++ )
 			{
-				// Loop though 
+				// Loop though
 				ListEntryCell *cells = list->listData[i].cell;
 				for (int j = list->columns - 1; j >=0; j-- )
-				{			
+				{
 					if(!cells)
 						break;
 					if( cells[j].cellType == LISTBOX_TEXT )
 					{
 						if ( cells[j].data )
 						{
-							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );	
+							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
 						}
 					}
-					
+
 					cells[j].userData = NULL;
 					cells[j].data = NULL;
 				}
@@ -1379,7 +1374,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			{
 				list->displayPos = 0;
 			}
-			
+
 			if( list->multiSelect )
 				memset( list->selections, -1, list->listLength * sizeof( Int ) );
 			else
@@ -1393,7 +1388,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			adjustDisplay( window, 0, TRUE );
 			break;
 
-		}  // end delete all
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_DEL_ENTRY:
@@ -1408,11 +1403,11 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 				for( i = 0; i <= list->columns; i ++ )
 				{
 					if( cells[i].cellType == LISTBOX_TEXT && cells[i].data )
-						TheDisplayStringManager->freeDisplayString((DisplayString *) cells[i].data );	
-					cells[i].data = NULL;		
+						TheDisplayStringManager->freeDisplayString((DisplayString *) cells[i].data );
+					cells[i].data = NULL;
 					cells[i].userData = NULL;
 				}
-			
+
 			delete[](list->listData[mData1].cell);
 			list->listData[mData1].cell = NULL;
 
@@ -1450,20 +1445,20 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			computeTotalHeight( window );
 			break;
 
-		}  // end delete entry
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_ADD_ENTRY:
 		{
 			Bool success = TRUE;
-			Int addedIndex = -1;			
+			Int addedIndex = -1;
 			AddMessageStruct *addInfo = (AddMessageStruct*)mData1;
 			if (addInfo->row >= list->insertPos)
 				addInfo->row = -1;
 
 			Int row = addInfo->row;
-			// Special case, we're just appending and we've reached the end. 
-			if( addInfo->row == -1 && list->insertPos == list->listLength ) 
+			// Special case, we're just appending and we've reached the end.
+			if( addInfo->row == -1 && list->insertPos == list->listLength )
 			{
 				row = list->insertPos;
 				// Check to see if we've filled our buffer and need to scroll the window
@@ -1498,7 +1493,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 					success = FALSE;
 			}
 
-			if( success ) 
+			if( success )
 			{
 
 				if( list->autoScroll )
@@ -1510,15 +1505,15 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 						// we use -1 because insertPos was increased in addEntry
 						if( row == -1 )
 						{
-							if( list->listData[(list->insertPos - 1)].listHeight >= 
+							if( list->listData[(list->insertPos - 1)].listHeight >=
 									(list->displayPos + list->displayHeight) )
 								adjustDisplay( window, 1, TRUE );
 							else
 								break;
 						}
-						else 
+						else
 						{
-							if( list->listData[( row )].listHeight >= 
+							if( list->listData[( row )].listHeight >=
 									(list->displayPos + list->displayHeight) )
 								adjustDisplay( window, 1, TRUE );
 							else
@@ -1540,20 +1535,20 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 						i++;
 
-					}  // end while
+					}
 
-				}  // end if
+				}
 				else
 				{
 					if( row == list->selectPos )
 						list->selectPos = -1;
 				}
 
-			}  // end success
+			}
 
 			return((WindowMsgHandledType) addedIndex );
-			
-		}  // end add entry
+
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_TOGGLE_MULTI_SELECTION:
@@ -1589,7 +1584,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 						removed = TRUE;
 						break;
 					}
-					
+
 					i++;
 				}
 
@@ -1603,10 +1598,10 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			{
 				// this message has no effect in a non-multi listbox
 			}
-			
+
 			break;
 
-		}  // end toggle multi-select
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_SET_SELECTION:
@@ -1623,9 +1618,9 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 				else
 					list->selectPos = -1;
 
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GLM_SELECTED,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						list->selectPos );
 
 				break;
@@ -1666,41 +1661,41 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 				GameWindow *parent = window->winGetParent();
 				if( parent && BitIsSet( parent->winGetStyle(), GWS_COMBO_BOX ) )
 				{
-					TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+					TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GLM_SELECTED,
-																						(WindowMsgData)window, 
-																						list->selectPos );				
+																						(WindowMsgData)window,
+																						list->selectPos );
 					break;
 				}
 				if( list->listData[list->selectPos].listHeight < list->displayPos )
 				{
-				
-					TheWindowManager->winSendSystemMsg( window, GLM_UPDATE_DISPLAY, 
+
+					TheWindowManager->winSendSystemMsg( window, GLM_UPDATE_DISPLAY,
 																							list->selectPos, 0 );
 				}
-				else if( list->listData[list->selectPos].listHeight > 
+				else if( list->listData[list->selectPos].listHeight >
 								 (list->displayPos + list->displayHeight) )
 				{
 
 					if( list->selectPos > 0 )
-						list->displayPos = 
+						list->displayPos =
 							list->listData[list->selectPos].listHeight - list->displayHeight;
 					else
 						list->displayPos = 0;
 
 					adjustDisplay( window, 0, TRUE );
 
-				}  // end else if
+				}
 
-			}  // end else
+			}
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_SELECTED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					list->selectPos );
 			break;
 
-		}  // end set selection
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_SCROLL_BUFFER:
@@ -1711,9 +1706,9 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			//
 			// scroll buffer literally scrolls the entire list data buffer
-			// up one entry, effectively removing the top entry.  
+			// up one entry, effectively removing the top entry.
 			//
-			
+
 			//
 			// Loop through and remove all the entries from the top up until we reach
 			// the position mData1 contains
@@ -1723,27 +1718,27 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			for (; i < (Int)mData1; i++)
 			{
 				cells = list->listData[i].cell;
-				
+
 				if(cells)
 					for( Int j = 0; j < list->columns; j++ )
 					{
 						if( cells[j].cellType == LISTBOX_TEXT && cells[j].data )
-							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );	
-//						if (cells[i].userData)
-//							free(cells[i].userData);
-						cells[j].data = NULL;		
+							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
+
+//						free(cells[i].userData);
+						cells[j].data = NULL;
 						cells[j].userData = NULL;
 						cells[j].color = 0;
 						cells[j].cellType = 0;
 					}
-				
+
 				delete[](list->listData[i].cell);
 				list->listData[i].cell = NULL;
 			}
 
-			
+
 			//
-			// copy the cells up 
+			// copy the cells up
 			//
 			memcpy(list->listData, &list->listData[mData1],
 						(list->endPos - mData1) * sizeof(ListEntryRow) );
@@ -1790,12 +1785,12 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end scroll buffer
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_GET_SELECTION:
 		{
-			
+
 			if( list->multiSelect )
 				*(Int*)mData2 = (Int)list->selections;
 			else
@@ -1803,7 +1798,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end get selection
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_SET_UP_BUTTON:
@@ -1857,7 +1852,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			if( list->downButton )
 			{
-	
+
 				list->downButton->winSetPosition( width - downSize.x - 2,
 																					height - downSize.y - 2 );
 
@@ -1865,10 +1860,10 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			if( list->slider )
 			{
-				list->slider->winSetSize( sliderSize.x, 
+				list->slider->winSetSize( sliderSize.x,
 																	height - (2 * upSize.y) -6 );
 				list->slider->winSetPosition( width - sliderSize.x -2, upSize.y + 3 );
-				
+
 			}
 
 			list->displayHeight = height;
@@ -1891,8 +1886,8 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 					list->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 					list->columnWidth[0] -= sliderSize.x;
 
-				}  // end if
-			}// if
+				}
+			}
 			else
 			{
 				if( !list->columnWidthPercentage )
@@ -1908,17 +1903,17 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 					list->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 					totalWidth -= sliderSize.x;
 
-				}  // end if
+				}
 				for(Int i = 0; i < list->columns; i++ )
 				{
 					list->columnWidth[i] = list->columnWidthPercentage[i] * totalWidth / 100;
-				}// for
-			}// else
+				}
+			}
 				//reset the total height
 				computeTotalHeight(window);
 			break;
 
-		}  // end resized
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_UPDATE_DISPLAY:
@@ -1938,20 +1933,20 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			adjustDisplay( window, 0, TRUE );
 			break;
 
-		}  // end update display
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 			Int i;
 
-			// Loop through and destroy any display strings we've allocated 
+			// Loop through and destroy any display strings we've allocated
 			for( i = 0; i < list->listLength; i++ )
 			{
 				//We're now onto a row of cells we are not using anymore Pull off the cells and loop through them
 				ListEntryCell *cells = list->listData[i].cell;
 				for (int j = list->columns - 1; j >=0; j-- )
-				{			
+				{
 					if(!cells)
 						break;
 					if( cells[j].cellType == LISTBOX_TEXT )
@@ -1959,12 +1954,11 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 						// If we can delete the stuff that won't be showing up in the new listData struture
 						if ( cells[j].data )
 						{
-							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );	
+							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
 						}
 					}
-//					if ( cells[j].userData ) 
-//						free(cells[j].userData);
-					
+//					free(cells[j].userData);
+
 					// Null out the data pointers so they're not destroyed when we free up this listdata
 					cells[j].userData = NULL;
 					cells[j].data = NULL;
@@ -1972,18 +1966,20 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 				delete[](list->listData[i].cell);
 				list->listData[i].cell = NULL;
 			}
-	
+
 			delete[]( list->listData );
-			if( list->columnWidth	)
-				delete[]( list->columnWidth );
-			if( list->columnWidthPercentage	)
-				delete[]( list->columnWidthPercentage );
+			delete[]( list->columnWidth );
+			delete[]( list->columnWidthPercentage );
 			if( list->multiSelect )
 				delete[]( list->selections );
-			delete( list );
+
+			delete (ListboxData *)window->winGetUserData();
+			window->winSetUserData( NULL );
+			list = NULL;
+
 			break;
 
-		}  // end destroy
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -1999,82 +1995,82 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 			}
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 
 			*(Bool*)mData2 = TRUE;
 			break;
 
-		}  // end input focus
+		}
 		// ------------------------------------------------------------------------
 		case GSM_SLIDER_TRACK:
 		{
 			SliderData *sData = (SliderData *)list->slider->winGetUserData();
-			list->displayPos = sData->maxVal - mData2; 
+			list->displayPos = sData->maxVal - mData2;
 
 			if( list->displayPos > (list->totalHeight - list->displayHeight + 1) )
 				list->displayPos = (list->totalHeight - list->displayHeight + 1);
-			
+
 			if( list->displayPos < 0)
 				list->displayPos = 0;
 
 			adjustDisplay( window, 0, FALSE );
 			break;
 
-		}  // end slider track
+		}
 		// ------------------------------------------------------------------------
 		case GLM_SET_ITEM_DATA:
 		{
 			void *data = (void *)mData2;
 			pos = (ICoord2D *)mData1;
-			
+
 			if (pos->y >= 0 && pos->y < list->endPos && list->listData[pos->y].cell)
 				list->listData[pos->y].cell[pos->x].userData = data;
 
 			break;
-		}//case GLM_SET_ITEM_DATA:
+		}
 		// ------------------------------------------------------------------------
 		case GLM_GET_ITEM_DATA:
 		{
 			pos = (ICoord2D *)mData1;
 			void **data = (void **)mData2;
 
-			*data = NULL;  // initialize to NULL			
+			*data = NULL;  // initialize to NULL
 			if (pos->y >= 0 && pos->y < list->endPos && list->listData[pos->y].cell)
 				*data = list->listData[pos->y].cell[pos->x].userData;
 
 			break;
-		}//case GLM_GET_ITEM_DATA:
+		}
 
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetListBoxSystem
+}
 
 // GadgetListBoxSetColors =====================================================
 /** Set the colors for a list box, note that this will also automatically
-	* change the colors of any attached slider, slider thumb, and slider 
+	* change the colors of any attached slider, slider thumb, and slider
 	* buttons */
 //=============================================================================
 void GadgetListBoxSetColors( GameWindow *listbox,
-														 Color enabledColor, 
+														 Color enabledColor,
 														 Color enabledBorderColor,
-														 Color enabledSelectedItemColor, 
+														 Color enabledSelectedItemColor,
 														 Color enabledSelectedItemBorderColor,
-														 Color disabledColor, 
+														 Color disabledColor,
 														 Color disabledBorderColor,
-														 Color disabledSelectedItemColor, 
+														 Color disabledSelectedItemColor,
 														 Color disabledSelectedItemBorderColor,
-														 Color hiliteColor, 
+														 Color hiliteColor,
 														 Color hiliteBorderColor,
-														 Color hiliteSelectedItemColor, 
+														 Color hiliteSelectedItemColor,
 														 Color hiliteSelectedItemBorderColor )
 {
 	ListboxData *listboxData = (ListboxData *)listbox->winGetUserData();
@@ -2117,7 +2113,7 @@ void GadgetListBoxSetColors( GameWindow *listbox,
 		// Hilite
 		GadgetSliderSetHiliteColor( slider, GadgetListBoxGetHiliteColor( listbox ) );
 		GadgetSliderSetHiliteBorderColor( slider, GadgetListBoxGetHiliteBorderColor( listbox ) );
-	
+
 		// up button ------------------------------------------------------------
 
 		// enabled
@@ -2158,9 +2154,9 @@ void GadgetListBoxSetColors( GameWindow *listbox,
 		GadgetButtonSetHiliteSelectedColor( downButton, GadgetSliderGetHiliteSelectedThumbColor( slider ) );
 		GadgetButtonSetHiliteSelectedBorderColor( downButton, GadgetSliderGetHiliteSelectedThumbBorderColor( slider ) );
 
-	}  // end if
+	}
 
-}  // end GadgetListBoxSetColors
+}
 
 // GadgetListBoxGetText =======================================================
 /** Get the text for a list box entry */
@@ -2169,7 +2165,7 @@ UnicodeString GadgetListBoxGetText( GameWindow *listbox, Int row, Int column)
 {
 	Color color;
 	return GadgetListBoxGetTextAndColor( listbox,&color,row,column );
-}  // end GadgetListBoxGetText
+}
 
 // GadgetListBoxGetText =======================================================
 /** Get the text for a list box entry */
@@ -2190,14 +2186,14 @@ UnicodeString GadgetListBoxGetTextAndColor( GameWindow *listbox, Color *color, I
 	pos.x = column;
 	pos.y = row;
 	TheWindowManager->winSendSystemMsg( listbox, GLM_GET_TEXT, (WindowMsgData)&pos, (WindowMsgData)&tAndC );
-	
+
 
 		*color = tAndC.color;
 		return tAndC.string;
-	
+
 	//return UnicodeString::TheEmptyString;
 
-}  // end GadgetListBoxGetText
+}
 
 // GadgetListBoxAddEntryText ==================================================
 /** Add a new string entry into the listbox at the insert position */
@@ -2209,7 +2205,7 @@ Int GadgetListBoxAddEntryText( GameWindow *listbox,
 	if (!listbox)
 		return -1;
 	if (text.isEmpty())
-		text = UnicodeString(L" ");
+		text = L" ";
 	Int index;
 	AddMessageStruct addInfo;
 	addInfo.row = row;
@@ -2230,7 +2226,7 @@ Int GadgetListBoxAddEntryText( GameWindow *listbox,
 	/// @TODO: Don't do this type cast!
 	index = (Int) TheWindowManager->winSendSystemMsg( listbox, GLM_ADD_ENTRY, (WindowMsgData)&addInfo, color );
 
-	//DEBUG_ASSERTLOG(!listData->scrollIfAtEnd, ("Adding line %d (orig end was %d, newEntryOffset is %d, (%d-%d)?=%d, isFull=%d/%d ll=%d, end=%d\n",
+	//DEBUG_ASSERTLOG(!listData->scrollIfAtEnd, ("Adding line %d (orig end was %d, newEntryOffset is %d, (%d-%d)?=%d, isFull=%d/%d ll=%d, end=%d",
 		//index, oldBottomIndex, newEntryOffset, index, oldBottomIndex, newEntryOffset, wasFull, GadgetListBoxIsFull(listbox), listData->listLength, listData->endPos));
 	if(listData->scrollIfAtEnd && index - oldBottomIndex == newEntryOffset && GadgetListBoxIsFull(listbox))
 	{
@@ -2238,7 +2234,7 @@ Int GadgetListBoxAddEntryText( GameWindow *listbox,
 	}
 
 	return (index);
-}  // end GadgetListBoxAddEntry
+}
 
 // GadgetListBoxAddEntryImage =================================================
 /** Add a new string entry into the listbox at the insert position */
@@ -2260,7 +2256,7 @@ Int GadgetListBoxAddEntryImage( GameWindow *listbox, const Image *image,
 	/// @TODO: Don't do this type cast!
 	index = (Int) TheWindowManager->winSendSystemMsg( listbox, GLM_ADD_ENTRY, (WindowMsgData)&addInfo, color );
 	return (index);
-}  // end GadgetListBoxAddEntryImage
+}
 
 Int GadgetListBoxAddEntryImage( GameWindow *listbox, const Image *image,
 															 Int row, Int column,
@@ -2287,7 +2283,7 @@ void GadgetListBoxSetFont( GameWindow *g, GameFont *font )
 	if( dString )
 		dString->setFont( font );
 
-	// listbox specific	
+	// listbox specific
 	if( listData )
 		for( Int i = 0; i < listData->listLength; i++ )
 		{
@@ -2300,9 +2296,9 @@ void GadgetListBoxSetFont( GameWindow *g, GameFont *font )
 						dString->setFont( font );
 					}
 				}
-		}  // end for i
+		}
 
-}  // end GadgetListBoxSetFont
+}
 
 // GadgetListboxCreateScrollbar ===============================================
 /** Create the scroll bar using a slider and two buttons for a listbox */
@@ -2354,7 +2350,7 @@ void GadgetListboxCreateScrollbar( GameWindow *listbox )
 	if( BitIsSet( listbox->winGetStyle(), GWS_MOUSE_TRACK ) )
 		BitSet( winInstData.m_style, GWS_MOUSE_TRACK );
 
-	listData->upButton = 
+	listData->upButton =
 		 TheWindowManager->gogoGadgetPushButton( listbox,
 																						 status | WIN_STATUS_ACTIVE | WIN_STATUS_ENABLED,
 																						 width - buttonWidth -2, top+2,
@@ -2373,7 +2369,7 @@ void GadgetListboxCreateScrollbar( GameWindow *listbox )
 	if( BitIsSet( listbox->winGetStyle(), GWS_MOUSE_TRACK ) )
 		BitSet( winInstData.m_style, GWS_MOUSE_TRACK );
 
-	listData->downButton = 
+	listData->downButton =
 			 TheWindowManager->gogoGadgetPushButton( listbox,
 																							 status | WIN_STATUS_ACTIVE | WIN_STATUS_ENABLED,
 																							 width - buttonWidth -2,
@@ -2402,7 +2398,7 @@ void GadgetListboxCreateScrollbar( GameWindow *listbox )
 	memset( &sData, 0, sizeof(SliderData) );
 
 	// Create Slider
-	listData->slider = 
+	listData->slider =
 			TheWindowManager->gogoGadgetSlider( listbox,
 																					status | WIN_STATUS_ACTIVE | WIN_STATUS_ENABLED,
 																					width - sliderButtonWidth - 2,
@@ -2413,7 +2409,7 @@ void GadgetListboxCreateScrollbar( GameWindow *listbox )
 	// we now have all the scrollbar parts, this better be set :)
 	listData->scrollBar = TRUE;
 
-}  // end GadgetListBoxCreateScrollbar
+}
 
 // GadgetListBoxAddMultiSelect ================================================
 /** Enable multi selections for a listbox
@@ -2421,7 +2417,7 @@ void GadgetListboxCreateScrollbar( GameWindow *listbox )
 	* ASSUMPTION: The listLength must already be set at this time so
 	* that we can make enough space to hold all the selection data, if you
 	* change the list length you must also change the selection array
-	* for multi select listboxes 
+	* for multi select listboxes
 	*/
 //=============================================================================
 void GadgetListBoxAddMultiSelect( GameWindow *listbox )
@@ -2430,8 +2426,8 @@ void GadgetListBoxAddMultiSelect( GameWindow *listbox )
 
 	DEBUG_ASSERTCRASH(listboxData && listboxData->selections == NULL, ("selections is not NULL"));
 	listboxData->selections = NEW Int [listboxData->listLength];
-	DEBUG_LOG(( "Enable list box multi select: listLength (select) = %d * %d = %d bytes;\n",
-					 listboxData->listLength, sizeof(Int), 
+	DEBUG_LOG(( "Enable list box multi select: listLength (select) = %d * %d = %d bytes;",
+					 listboxData->listLength, sizeof(Int),
 					 listboxData->listLength *sizeof(Int) ));
 
 	if( listboxData->selections == NULL )
@@ -2441,7 +2437,7 @@ void GadgetListBoxAddMultiSelect( GameWindow *listbox )
 		listboxData->listData = NULL;
 		return;
 
-	}  // end if
+	}
 
 	memset( listboxData->selections, -1,
 		      listboxData->listLength * sizeof(Int) );
@@ -2452,7 +2448,7 @@ void GadgetListBoxAddMultiSelect( GameWindow *listbox )
 	// adjust the input procedure for the listbox
 	listbox->winSetInputFunc( GadgetListBoxMultiInput );
 
-}  // end GadgetListBoxEnableMultiSelect
+}
 
 // GadgetListBoxRemoveMultiSelect =============================================
 /** Remove multi select capability from a listbox */
@@ -2461,25 +2457,20 @@ void GadgetListBoxRemoveMultiSelect( GameWindow *listbox )
 {
 	ListboxData *listData = (ListboxData *)listbox->winGetUserData();
 
-	if( listData->selections )
-	{
-
-		delete[]( listData->selections );
-		listData->selections = NULL;
-
-	}  // end if
+	delete[]( listData->selections );
+	listData->selections = NULL;
 
 	listData->multiSelect = FALSE;
 
 	// adjust the input procedure for the listbox
 	listbox->winSetInputFunc( GadgetListBoxInput );
 
-}  // end GadgetListBoxRemoveMultiSelect
+}
 
 // GadgetListBoxSetListLength =================================================
 /** Set OR reset the list length data contained in the listboxData
 	* parameter.  When adjusting the size of lists we also have to
-	* adjust multiselection lists if present and any display 
+	* adjust multiselection lists if present and any display
 	* strings present */
 //=============================================================================
 void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
@@ -2495,16 +2486,16 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 	DEBUG_ASSERTCRASH(listboxData->columns > 0,("We need at least one Column in the listbox"));
 	if( listboxData->columns < 1 )
 		return;
-	
+
   Int columns = listboxData->columns;
-	ListEntryRow *newData = NEW ListEntryRow[ newLength ];	
+	ListEntryRow *newData = NEW ListEntryRow[ newLength ];
 	DEBUG_ASSERTCRASH(newData, ("Unable to allocate new data structures for the Listbox"));
 	if( !newData )
 		return;
 	Int i;
   // zero out the new Data structure
 	memset( newData, 0, newLength  * sizeof( ListEntryRow ) );
-	 
+
 	// we want to copy over different amounts of data depending on if we're adding
 	// to the list box or removing from the listbox
 	if(newLength >= listboxData->listLength)
@@ -2513,18 +2504,18 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 	}
 	else
 	{
-		// If we're removing entries from the listbox, we need to reset the length, 
+		// If we're removing entries from the listbox, we need to reset the length,
 		// position, and selection to their new places
 		if( listboxData->displayPos >newLength)
 			listboxData->displayPos = newLength;
 		//if we're multiselect, just select no position
-		if(listboxData->selectPos > newLength || listboxData->multiSelect) 
+		if(listboxData->selectPos > newLength || listboxData->multiSelect)
 			listboxData->selectPos = -1;
     if(listboxData->insertPos > newLength)
 			listboxData->insertPos = newLength;
 
     listboxData->endPos = newLength;
-		//copy only the data that we'll be needing.		
+		//copy only the data that we'll be needing.
 		memcpy(newData,listboxData->listData,newLength * sizeof( ListEntryRow ) );
 	}
 
@@ -2534,7 +2525,7 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 		//We're now onto a row of cells we are not using anymore Pull off the cells and loop through them
 		ListEntryCell *cells = listboxData->listData[i].cell;
 		for (int j = columns - 1; j >=0; j-- )
-		{			
+		{
 			if(!cells)
 				break;
 			if ( i >= newLength )
@@ -2544,11 +2535,10 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 					// If we can delete the stuff that won't be showing up in the new listData struture
 					if ( cells[j].data )
 					{
-						TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );	
+						TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
 					}
 				}
-//			if ( cells[j].userData ) 
-//					free(cells[j].userData);
+//				free(cells[j].userData);
 			}
 		}
 		if (i >= newLength) {
@@ -2559,10 +2549,9 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 
 	listboxData->listLength = newLength;
 
-	if( listboxData->listData )
-		delete[]( listboxData->listData );
+	delete[]( listboxData->listData );
 	listboxData->listData = newData;
-	
+
 	//reset the total height
 	computeTotalHeight(listbox);
 
@@ -2570,39 +2559,42 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 	if( listboxData->listData == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to allocate listbox data pointer\n" ));
+		DEBUG_LOG(( "Unable to allocate listbox data pointer" ));
 		assert( 0 );
 		return;
 
-	}  // end if
-	
+	}
+
 	// adjust the selection array for multi select listboxes
 	if( listboxData->multiSelect )
 	{
-		
+
 		GadgetListBoxRemoveMultiSelect( listbox );
 		GadgetListBoxAddMultiSelect( listbox );
 
-	}  // end if
+	}
 
-}  // end GadgetListBoxSetListLength
+}
 
-// GadgetListBoxGetListLength =================================================
-/** Get the list length data contained in the listboxData
-	* parameter. */
 //=============================================================================
 Int GadgetListBoxGetListLength( GameWindow *listbox )
 {
 	ListboxData *listboxData = (ListboxData *)listbox->winGetUserData();
-	if (listboxData->multiSelect)
-	{
+	if (listboxData)
 		return listboxData->listLength;
-	}
-	else
-	{
-		return 1;
-	}
-}  // end GadgetListBoxGetListLength
+
+	return 0;
+}
+
+//=============================================================================
+Int GadgetListBoxGetMaxSelectedLength( GameWindow *listbox )
+{
+	ListboxData *listboxData = (ListboxData *)listbox->winGetUserData();
+	if (listboxData)
+		return listboxData->multiSelect ? listboxData->listLength : 1;
+
+	return 0;
+}
 
 // GadgetListBoxGetNumEntries =================================================
 /** Get the list length data contained in the listboxData
@@ -2618,7 +2610,7 @@ Int GadgetListBoxGetNumEntries( GameWindow *listbox )
 		return listboxData->endPos;
 
 	return 0;
-}  // end GadgetListBoxGetNumEntries
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the selected item(s) of a listbox.  For a single select listbox the parameter
@@ -2637,7 +2629,7 @@ void GadgetListBoxGetSelected( GameWindow *listbox, Int *selectList )
 	// get selected indeces via system message
 	TheWindowManager->winSendSystemMsg( listbox, GLM_GET_SELECTION, 0, (WindowMsgData)selectList );
 
-}  // end GadgetListBoxGetSelected
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the selected item of a listbox.  The parameter is a single integer.  If
@@ -2653,7 +2645,7 @@ void GadgetListBoxSetSelected( GameWindow *listbox, Int selectIndex )
 	// set selected index via system message
 	TheWindowManager->winSendSystemMsg( listbox, GLM_SET_SELECTION, (WindowMsgData)(&selectIndex), 1 );
 
-}  // end GadgetListBoxSetSelected
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the selected item of a listbox. */
@@ -2680,7 +2672,7 @@ void GadgetListBoxReset( GameWindow *listbox )
 	// reset via system message
 	TheWindowManager->winSendSystemMsg( listbox, GLM_DEL_ALL, 0, 0 );
 
-}  // end GadgetListBoxReset
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2692,8 +2684,8 @@ void GadgetListBoxSetItemData( GameWindow *listbox, void *data, Int row, Int col
 
 	if (listbox)
 		TheWindowManager->winSendSystemMsg( listbox, GLM_SET_ITEM_DATA, (WindowMsgData)&pos, (WindowMsgData)data);
-		
-}// void GadgetListBoxSetItemData( Int index, void *data )
+
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2709,7 +2701,7 @@ void *GadgetListBoxGetItemData( GameWindow *listbox, Int row, Int column)
 		TheWindowManager->winSendSystemMsg( listbox, GLM_GET_ITEM_DATA, (WindowMsgData)&pos, (WindowMsgData)&data);
 	}
 	return (data);
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2758,7 +2750,7 @@ void GadgetListBoxSetBottomVisibleEntry( GameWindow *window, Int newPos )
 	int prevPos = GadgetListBoxGetBottomVisibleEntry( window );
 
 	adjustDisplay(window, newPos - prevPos + 1, true);
-} // void GadgetListBoxSetTopVisibleEntry( GameWindow *window, Int newPos )
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2772,7 +2764,7 @@ Int GadgetListBoxGetTopVisibleEntry( GameWindow *window )
 		return 0;
 
 	return getListboxTopEntry(listData);
-} // Int GadgetListBoxGetTopVisibleEntry( GameWindow *window )
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2788,7 +2780,7 @@ void GadgetListBoxSetTopVisibleEntry( GameWindow *window, Int newPos )
 	int prevPos = GadgetListBoxGetTopVisibleEntry( window );
 
 	adjustDisplay(window, newPos - prevPos, true);
-} // void GadgetListBoxSetTopVisibleEntry( GameWindow *window, Int newPos )
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2801,7 +2793,7 @@ void GadgetListBoxSetAudioFeedback( GameWindow *listbox, Bool enable )
 		return;
 
 	listboxData->audioFeedback = enable;
-}  // end GadgetListBoxSetAudioFeedback
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2814,7 +2806,7 @@ Int GadgetListBoxGetNumColumns( GameWindow *listbox )
 		return 0;
 
 	return listboxData->columns;
-}  // end GadgetListBoxGetNumColumns
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2829,5 +2821,5 @@ Int GadgetListBoxGetColumnWidth( GameWindow *listbox, Int column )
 		return 0;
 
 	return listboxData->columnWidth[column];
-}  // end GadgetListBoxGetNumColumns
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
index e8cd62efff2..66966c2d161 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ProgressBar.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -75,11 +75,17 @@ WindowMsgHandledType GadgetProgressBarSystem( GameWindow *window, UnsignedInt ms
 
   switch( msg )
 	{
+		// ------------------------------------------------------------------------
+		case GWM_DESTROY:
+		{
+			window->winSetUserData( NULL );
+			break;
+		}
 
 		// ------------------------------------------------------------------------
     case GPM_SET_PROGRESS:
     {
-      Int newPos = (Int)mData1; 
+      Int newPos = (Int)mData1;
 
       if (newPos < 0 || newPos > 100)
         break;
@@ -88,17 +94,17 @@ WindowMsgHandledType GadgetProgressBarSystem( GameWindow *window, UnsignedInt ms
 
 			break;
 
-    }  // end set progress
-		
+    }
+
 		// ------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetProgressBarSystem
+}
 
 // GadgetProgressBarSetProgress ===============================================
 /** send progress system message to Progress Bar */
@@ -109,4 +115,4 @@ void GadgetProgressBarSetProgress( GameWindow *g, Int progress )
 		return;
 
 	TheWindowManager->winSendSystemMsg( g, GPM_SET_PROGRESS, progress, 0);
-} // end GadgetProgressBarSetProgress
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
index a6f7f093fa4..d0d860fa202 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GadgetPushButton.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
@@ -69,27 +69,27 @@
 // GadgetPushButtonInput ======================================================
 /** Handle input for push button */
 //=============================================================================
-WindowMsgHandledType GadgetPushButtonInput( GameWindow *window, 
+WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 																						UnsignedInt msg,
-																						WindowMsgData mData1, 
+																						WindowMsgData mData1,
 																						WindowMsgData mData2 )
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 
-				TheWindowManager->winSendSystemMsg( instData->getOwner(), 
+				TheWindowManager->winSendSystemMsg( instData->getOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 
 				//TheWindowManager->winSetFocus( window );
@@ -101,21 +101,21 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 			}
 			break;
 
-		}  // end mouse entering
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if(BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if(BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( instData->getOwner(), 
+				TheWindowManager->winSendSystemMsg( instData->getOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 			}
-		
+
 			//
 			// if this is not a check-like button, clear any selected state when the
 			// move leaves the window area
@@ -131,7 +131,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 			}
 			break;
 
-		}  // end mouse leaving
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
@@ -141,7 +141,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 																					(WindowMsgData)window, mData1 );
 			break;
 
-		}  // end left drag
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DOWN:
@@ -156,7 +156,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 			if( TheAudio )
 			{
 				TheAudio->addAudioEvent( &buttonClick );
-			}  // end if
+			}
 
 			//
 			// for 'check-like' buttons we have "dual state", we flip the selected status
@@ -165,7 +165,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 			//
 			if( BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) )
 			{
-				
+
 				if( BitIsSet( instData->m_state, WIN_STATE_SELECTED ) )
 					BitClear( instData->m_state, WIN_STATE_SELECTED );
 				else
@@ -174,17 +174,17 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 				TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
 																						(WindowMsgData)window, mData1 );
 
-			}  // end if
+			}
 			else
 			{
-				
+
 				// just select as normal
 				BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-			}  // end else
+			}
 
 			break;
-		}  // end left down
+		}
 
 		//-------------------------------------------------------------------------
 		case GWM_LEFT_UP:
@@ -214,7 +214,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 
 			break;
 
-		}  // end left up or left click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_RIGHT_DOWN:
@@ -225,7 +225,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 				buttonClick.setEventName(pData->altSound);
 			else
 				buttonClick.setEventName("GUIClick");
-				
+
 
 			if( BitIsSet( instData->getStatus(), WIN_STATUS_RIGHT_CLICK ) )
 			{
@@ -233,7 +233,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 				if( TheAudio )
 				{
 					TheAudio->addAudioEvent( &buttonClick );
-				}  // end if
+				}
 
 				//
 				// for 'check-like' buttons we have "dual state", we flip the selected status
@@ -242,7 +242,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 				//
 				if( BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) )
 				{
-					
+
 					if( BitIsSet( instData->m_state, WIN_STATE_SELECTED ) )
 						BitClear( instData->m_state, WIN_STATE_SELECTED );
 					else
@@ -251,14 +251,14 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 					TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED_RIGHT,
 																							(WindowMsgData)window, mData1 );
 
-				}  // end if
+				}
 				else
 				{
-					
+
 					// just select as normal
 					BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-				}  // end else
+				}
 
 			}
 			else
@@ -267,12 +267,12 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 				return MSG_IGNORED;
 			}
 			break;
-		}  // end right down
+		}
 
 		//-------------------------------------------------------------------------
 		case GWM_RIGHT_UP:
 		{
-			
+
 			if( BitIsSet( instData->getStatus(), WIN_STATUS_RIGHT_CLICK ) )
 			{
 
@@ -307,7 +307,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 
 			break;
 
-		}  // end right up or right click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CHAR:
@@ -337,7 +337,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 
 						}
 
-					} 
+					}
 					else
 					{
 
@@ -348,7 +348,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 						//
 						if( BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) )
 						{
-							
+
 							if( BitIsSet( instData->m_state, WIN_STATE_SELECTED ) )
 								BitClear( instData->m_state, WIN_STATE_SELECTED );
 							else
@@ -357,21 +357,21 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 							TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
 																									(WindowMsgData)window, mData1 );
 
-						}  // end if
+						}
 						else
 						{
-							
+
 							// just select as normal
 							BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-						}  // end else
+						}
 
 
-					}  // end else
+					}
 
 					break;
 
-				}  // end handle enter and space button
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_DOWN:
@@ -382,8 +382,8 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 					if( BitIsSet( mData2, KEY_STATE_DOWN ) )
 						TheWindowManager->winNextTab(window);
 					break;
-				
-				}  // end key down, right or tab
+
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_UP:
@@ -394,27 +394,27 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 						TheWindowManager->winPrevTab(window);
 					break;
 
-				}  // end key up or left
+				}
 
 				// --------------------------------------------------------------------
 				default:
 					return MSG_IGNORED;
 
-			}  // end switch on char
+			}
 
 			break;
 
-		}  // end character message
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetPushButtonInput
+}
 
 // GadgetPushButtonSystem =====================================================
 /** Handle system messages for push button */
@@ -424,9 +424,9 @@ WindowMsgHandledType GadgetPushButtonSystem( GameWindow *window, UnsignedInt msg
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
-		
+
 		// ------------------------------------------------------------------------
 		case GGM_SET_LABEL:
 		{
@@ -442,12 +442,10 @@ WindowMsgHandledType GadgetPushButtonSystem( GameWindow *window, UnsignedInt msg
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
-			PushButtonData *pData = (PushButtonData *)window->winGetUserData();
-			if(pData)
-				delete pData;
+			delete (PushButtonData *)window->winGetUserData();
 			window->winSetUserData(NULL);
-		}
 			break;
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -457,9 +455,9 @@ WindowMsgHandledType GadgetPushButtonSystem( GameWindow *window, UnsignedInt msg
 			else
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 
-			TheWindowManager->winSendSystemMsg( instData->getOwner(), 
+			TheWindowManager->winSendSystemMsg( instData->getOwner(),
 																					GGM_FOCUS_CHANGE,
-																					(WindowMsgData)mData1, 
+																					(WindowMsgData)mData1,
 																					window->winGetWindowId() );
 			if( mData1 == FALSE )
 				*(Bool*)mData2 = FALSE;
@@ -470,11 +468,11 @@ WindowMsgHandledType GadgetPushButtonSystem( GameWindow *window, UnsignedInt msg
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetPushButtonSystem
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set the visual status of a button to make it looked checked/unchecked ... DO NOT send
@@ -488,7 +486,7 @@ void GadgetCheckLikeButtonSetVisualCheck( GameWindow *g, Bool checked )
 		return;
 
 	// get instance data
-	WinInstanceData *instData = g->winGetInstanceData();	
+	WinInstanceData *instData = g->winGetInstanceData();
 	if( instData == NULL )
 		return;
 
@@ -496,10 +494,10 @@ void GadgetCheckLikeButtonSetVisualCheck( GameWindow *g, Bool checked )
 	if( BitIsSet( g->winGetStatus(), WIN_STATUS_CHECK_LIKE ) == FALSE )
 	{
 
-		DEBUG_CRASH(( "GadgetCheckLikeButtonSetVisualCheck: Window is not 'CHECK-LIKE'\n" ));
+		DEBUG_CRASH(( "GadgetCheckLikeButtonSetVisualCheck: Window is not 'CHECK-LIKE'" ));
 		return;
 
-	}  // end if
+	}
 
 	// set or clear the 'pushed' state
 	if( instData )
@@ -510,9 +508,9 @@ void GadgetCheckLikeButtonSetVisualCheck( GameWindow *g, Bool checked )
 		else
 			BitClear( instData->m_state, WIN_STATE_SELECTED );
 
-	}  // end if
+	}
 
-}  // end GadgetCheckLikeButtonSetVisualCheck
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -531,7 +529,7 @@ Bool GadgetCheckLikeButtonIsChecked( GameWindow *g )
 	// we just hold this "check like dual state thingie" using the selected state
 	return BitIsSet( instData->m_state, WIN_STATE_SELECTED );
 
-}  // end GadgetCheckLikeButtonIsChecked
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -559,7 +557,7 @@ void GadgetButtonEnableCheckLike( GameWindow *g, Bool makeCheckLike, Bool initia
 	else
 		BitClear( instData->m_state, WIN_STATE_SELECTED );
 
-}  // end GadgetButtonEnableCheckLike
+}
 
 // GadgetButtonSetText ========================================================
 /** Set the text for a push button */
@@ -573,14 +571,14 @@ void GadgetButtonSetText( GameWindow *g, UnicodeString text )
 
 	TheWindowManager->winSendSystemMsg( g, GGM_SET_LABEL, (WindowMsgData)&text, 0 );
 
-}  // end GadgetButtonSetText
+}
 
 PushButtonData * getNewPushButtonData( void )
 {
 	PushButtonData *p = NEW PushButtonData;
 	if(!p)
 		return NULL;
-	
+
 	p->userData = NULL;
 	p->drawBorder = FALSE;
 	p->drawClock = NO_CLOCK;
@@ -674,7 +672,7 @@ void GadgetButtonSetData(GameWindow *g, void *data)
 	PushButtonData *pData = (PushButtonData *)g->winGetUserData();
 	if(!pData)
 	{
-		pData = getNewPushButtonData();	
+		pData = getNewPushButtonData();
 	}
 	pData->userData = data;
 	g->winSetUserData(pData);
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
index e04c8fd11c0..9ca37816ec7 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
@@ -24,12 +24,12 @@
 
 // FILE: RadioButton.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -71,7 +71,7 @@
 static void doRadioUnselect( GameWindow *window, Int group, Int screen,
 												GameWindow *except )
 {
-	
+
 	//
 	// if this is a radio button we have something to consider, but we
 	// will ignore the except window
@@ -86,9 +86,9 @@ static void doRadioUnselect( GameWindow *window, Int group, Int screen,
 
 			BitClear( instData->m_state, WIN_STATE_SELECTED );
 
-		}  // end if
-					
-	}  // end if
+		}
+
+	}
 
 	// recursively call on all my children
 	GameWindow *child;
@@ -96,14 +96,14 @@ static void doRadioUnselect( GameWindow *window, Int group, Int screen,
 	for( child = window->winGetChild(); child; child = child->winGetNext() )
 		doRadioUnselect( child, group, screen, except );
 
-}  // end doRadioUnselect
+}
 
 // unselectOtherRadioOfGroup ==================================================
 /** Go through the entire window system, including child windows and
 	* unselect any radio buttons of the specified group, but not the
 	* window specified */
 //=============================================================================
-static void unselectOtherRadioOfGroup( Int group, Int screen, 
+static void unselectOtherRadioOfGroup( Int group, Int screen,
 																			 GameWindow *except )
 {
 	GameWindow *window = TheWindowManager->winGetWindowList();
@@ -113,7 +113,7 @@ static void unselectOtherRadioOfGroup( Int group, Int screen,
 			 window = window->winGetNext() )
 		doRadioUnselect( window, group, screen, except );
 
-}  // end unselectOtherRadioOfGroup
+}
 
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 
@@ -125,46 +125,46 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( instData->getOwner(), 
+				TheWindowManager->winSendSystemMsg( instData->getOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 				//TheWindowManager->winSetFocus( window );
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end mouse enter
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( instData->getOwner(), 
+				TheWindowManager->winSendSystemMsg( instData->getOwner(),
 																						GBM_MOUSE_LEAVING,
-																					  (WindowMsgData)window, 
+																					  (WindowMsgData)window,
 																						mData1 );
-			}  // end if
+			}
 
 			break;
 
-		}  // end mouse leaving
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
@@ -174,7 +174,7 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 																					(WindowMsgData)window, mData1 );
 			break;
 
-		}  // end left drag
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DOWN:
@@ -182,7 +182,7 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 
 			break;
 
-		}  // end down
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_UP:
@@ -192,9 +192,9 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 			{
 				RadioButtonData *radioData = (RadioButtonData *)window->winGetUserData();
 
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_SELECTED,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 
 				//
@@ -207,24 +207,24 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 				// this button is now selected
 				BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-			}  // end if, not selected
+			}
 			else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) == FALSE )
 			{
 
 				// this up click was not meant for this button
 				return MSG_IGNORED;
 
-			}  // end else if
+			}
 
 			break;
 
-		}  // end left up or click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CHAR:
 		{
 
-			switch( mData1 ) 
+			switch( mData1 )
 			{
 
 				// --------------------------------------------------------------------
@@ -237,9 +237,9 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 						{
 							RadioButtonData *radioData = (RadioButtonData *)window->winGetUserData();
 
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GBM_SELECTED,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									mData1 );
 
 							//
@@ -252,9 +252,9 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 							// this button is now selected
 							BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-						}  // end if, not selected
+						}
 
-					}  // end key down
+					}
 
 					break;
 
@@ -268,7 +268,7 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 						window->winNextTab();
 					break;
 
-				}  // end down, right, or tab
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_UP:
@@ -279,7 +279,7 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 						window->winPrevTab();
 					break;
 
-				}  // end up, left
+				}
 
 				// --------------------------------------------------------------------
 				default:
@@ -287,13 +287,13 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 
 					return MSG_IGNORED;
 
-				}  // end default
+				}
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
-		}  // end char messsage
+		}
 
 		// ------------------------------------------------------------------------
 		default:
@@ -301,13 +301,13 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 
 			return MSG_IGNORED;
 
-		}  // end default
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetRadioButtonInput
+}
 
 // GadgetRadioButtonSystem ====================================================
 /** Handle system messages for radio button */
@@ -317,7 +317,7 @@ WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt ms
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
@@ -331,11 +331,11 @@ WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt ms
 				if( (Bool)mData1 == TRUE )
 				{
 
-					TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+					TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																							GBM_SELECTED,
-																							(WindowMsgData)window, 
+																							(WindowMsgData)window,
 																							0 );
-				}  // end if
+				}
 
 				//
 				// unselect any windows in the system (including children) that
@@ -348,11 +348,11 @@ WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt ms
 				// this button is now selected
 				BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end set selection
+		}
 
 		// ------------------------------------------------------------------------
 		case GGM_SET_LABEL:
@@ -361,7 +361,7 @@ WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt ms
 			window->winSetText( *(UnicodeString*)mData1 );
 			break;
 
-		}  // end set label
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
@@ -370,14 +370,13 @@ WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt ms
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
-			RadioButtonData *radioData = (RadioButtonData *)window->winGetUserData();
-
 			// free radio button user data
-			delete radioData;
+			delete (RadioButtonData *)window->winGetUserData();
+			window->winSetUserData( NULL );
 
 			break;
-		
-		}  // end destroy
+
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -388,22 +387,22 @@ WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt ms
 
 			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 
 			*(Bool*)mData2 = TRUE;
 			break;
 
-		}  // end focus
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetRadioButtonSystem
+}
 
 // GadgetRadioSetText =========================================================
 /** Set the text for the control */
@@ -417,7 +416,7 @@ void GadgetRadioSetText( GameWindow *g, UnicodeString text )
 
 	TheWindowManager->winSendSystemMsg( g, GGM_SET_LABEL, (WindowMsgData)&text, 0 );
 
-}  // end GadgetRadioSetText
+}
 
 // GadgetRadioSetGroup ========================================================
 /** Set the group number for a radio button, only one radio button of
@@ -430,7 +429,7 @@ void GadgetRadioSetGroup( GameWindow *g, Int group, Int screen )
 	radioData->group = group;
 	radioData->screen = screen;
 
-}  // end GadgetRadioSetGroup
+}
 
 
 // GadgetRadioSetText =========================================================
@@ -445,5 +444,5 @@ void GadgetRadioSetSelection( GameWindow *g, Bool sendMsg )
 
 	TheWindowManager->winSendSystemMsg( g, GBM_SET_SELECTION, (WindowMsgData)&sendMsg, 0 );
 
-}  // end GadgetRadioSetText
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetStaticText.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
index 0ef65ddc1cf..e9bdfe91d46 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
@@ -24,12 +24,12 @@
 
 // FILE: StaticText.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -76,13 +76,13 @@ WindowMsgHandledType GadgetStaticTextInput( GameWindow *window, UnsignedInt msg,
 											      WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-  switch( msg ) 
+  switch( msg )
 	{
 		// ------------------------------------------------------------------------
     case GWM_CHAR:
       switch (mData1)
 			{
-					
+
         case KEY_DOWN:
         case KEY_RIGHT:
         case KEY_TAB:
@@ -108,9 +108,9 @@ WindowMsgHandledType GadgetStaticTextInput( GameWindow *window, UnsignedInt msg,
 
   }
 	return MSG_HANDLED;
- 
 
-}  // end GadgetStaticTextInput
+
+}
 
 // GadgetStaticTextSystem =====================================================
 /** Handle system messages for text field */
@@ -129,8 +129,8 @@ WindowMsgHandledType GadgetStaticTextSystem( GameWindow *window, UnsignedInt msg
 			if (tData && tData->text)
 				*(UnicodeString*)mData2 = tData->text->getText();
 			break;
-		
-		}  // end get label
+
+		}
 
 		// ------------------------------------------------------------------------
 		case GGM_SET_LABEL:
@@ -144,7 +144,7 @@ WindowMsgHandledType GadgetStaticTextSystem( GameWindow *window, UnsignedInt msg
 
       break;
 
-		}  // end set label
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
@@ -159,19 +159,20 @@ WindowMsgHandledType GadgetStaticTextSystem( GameWindow *window, UnsignedInt msg
 			TheDisplayStringManager->freeDisplayString( data->text );
 
 			// free text data
-			delete( data );
+			delete (TextData *)window->winGetUserData();
+			window->winSetUserData( NULL );
 
       break;
 
-		}  // end destroy
+		}
 
 		default:
 			return MSG_IGNORED;
 
-  }  // end switch( msg )
+  }
 
 	return MSG_HANDLED;
-}  // end GadgetStaticTextSystem
+}
 
 // GadgetStaticTextSetText ====================================================
 /** Set the text for a static text control */
@@ -182,7 +183,7 @@ void GadgetStaticTextSetText( GameWindow *window, UnicodeString text )
 		return;
 	TheWindowManager->winSendSystemMsg( window, GGM_SET_LABEL, (WindowMsgData)&text, 0 );
 
-}  // end GadgetStaticTextSetText
+}
 
 UnicodeString GadgetStaticTextGetText( GameWindow *window )
 {
@@ -220,6 +221,6 @@ void GadgetStaticTextSetFont( GameWindow *g, GameFont *font )
 		if( dString )
 			dString->setFont( font );
 
-	}  // end if
+	}
 
-}  // end GadgetStaticTextSetFont
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTabControl.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
index 0290c6e4f66..d213f84c1f3 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
@@ -24,12 +24,12 @@
 
 // FILE: RadioButton.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -86,7 +86,7 @@ WindowMsgHandledType GadgetTabControlInput( GameWindow *tabControl, UnsignedInt
 	Int tabsBottom = tabData->tabsBottomLimit;
 	Int tabsTop = tabData->tabsTopLimit;
 
-	switch( msg ) 
+	switch( msg )
 	{
 		case GWM_LEFT_DOWN:
 		{
@@ -124,7 +124,7 @@ WindowMsgHandledType GadgetTabControlInput( GameWindow *tabControl, UnsignedInt
 
 	return MSG_HANDLED;
 
-}  // end GadgetTabControlInput
+}
 
 // GadgetTabControlSystem ====================================================
 /** Handle system messages for TabControl */
@@ -132,7 +132,7 @@ WindowMsgHandledType GadgetTabControlInput( GameWindow *tabControl, UnsignedInt
 WindowMsgHandledType GadgetTabControlSystem( GameWindow *tabControl, UnsignedInt msg,
 															WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
@@ -141,14 +141,13 @@ WindowMsgHandledType GadgetTabControlSystem( GameWindow *tabControl, UnsignedInt
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
-			TabControlData *tabData = (TabControlData *)tabControl->winGetUserData();
-
 			// free tab control user data
-			delete tabData;
+			delete (TabControlData *)tabControl->winGetUserData();
+			tabControl->winSetUserData( NULL );
 
 			break;
-		
-		}  // end destroy
+
+		}
 
 		case GGM_RESIZED:
 		{//On resize, we need to upkeep the pane sizes and tabs since they are bound to us
@@ -164,16 +163,18 @@ WindowMsgHandledType GadgetTabControlSystem( GameWindow *tabControl, UnsignedInt
 
 			if( parent )
 				return TheWindowManager->winSendSystemMsg( parent, msg, mData1, mData2 );
+
+			break;
 		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetTabControlSystem
+}
 
 void GadgetTabControlComputeTabRegion( GameWindow *tabControl )///< Recalc the tab positions based on userData
 {
@@ -362,4 +363,4 @@ void GadgetTabControlFixupSubPaneList( GameWindow *tabControl )
 			child = child->winGetPrev();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
index f447a22ae4e..12f00fee588 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
@@ -24,12 +24,12 @@
 
 // FILE: TextEntry.cpp ////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -57,11 +57,6 @@
 // DEFINES ////////////////////////////////////////////////////////////////////
 
 // PRIVATE TYPES //////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 ///////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -95,7 +90,7 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 		return MSG_HANDLED;
 	}
 
-	switch( msg ) 
+	switch( msg )
 	{
 		// ------------------------------------------------------------------------
 		case GWM_IME_CHAR:
@@ -106,9 +101,9 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 			if ( ch == VK_RETURN )
 			{
 				// Done with this edit
-			 		TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			 		TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 			 																				GEM_EDIT_DONE,
-			 																				(WindowMsgData)window, 
+			 																				(WindowMsgData)window,
 			 																				0 );
 				return MSG_HANDLED;
 			};
@@ -139,9 +134,9 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 						e->text->appendChar( ch );
 						e->sText->appendChar( L'*' );
 						e->charPos++;
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GEM_UPDATE_TEXT,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 				}
 			}
@@ -165,9 +160,9 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 					{
 						if( e->receivedUnichar == FALSE )
 						{
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GEM_EDIT_DONE,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									0 );
 						}
 					}
@@ -213,7 +208,7 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 						else
 							TheWindowManager->winNextTab(window);
 					}
-					
+
 					break;
 
 				// --------------------------------------------------------------------
@@ -248,16 +243,16 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 								e->text->removeLastChar();
 								e->sText->removeLastChar();
 								e->charPos--;
-								TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+								TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GEM_UPDATE_TEXT,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								0 );
-							}  // end if
+							}
 						}
 					}
 					break;
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
@@ -274,7 +269,7 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
 																						(WindowMsgData)window, 0 );
 				//TheWindowManager->winSetFocus( window );
@@ -289,7 +284,7 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
 																						(WindowMsgData)window, 0 );
 			}
@@ -299,7 +294,7 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 		case GWM_LEFT_DRAG:
 
 			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
 																						(WindowMsgData)window, 0 );
 			break;
@@ -308,11 +303,11 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetTextEntryInput
+}
 
 // GadgetTextEntrySystem ======================================================
 /** Handle system messages for entry field */
@@ -349,7 +344,7 @@ WindowMsgHandledType GadgetTextEntrySystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end set text
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
@@ -370,6 +365,8 @@ WindowMsgHandledType GadgetTextEntrySystem( GameWindow *window, UnsignedInt msg,
 
 			// free all edit data
 			delete( (EntryData *)window->winGetUserData() );
+			window->winSetUserData(NULL);
+			e = NULL;
 			break;
 
 		// ------------------------------------------------------------------------
@@ -402,9 +399,9 @@ WindowMsgHandledType GadgetTextEntrySystem( GameWindow *window, UnsignedInt msg,
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 			}
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 
 			*(Bool*)mData2 = TRUE;
@@ -413,11 +410,11 @@ WindowMsgHandledType GadgetTextEntrySystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetTextEntrySystem
+}
 
 /** @todo we might want to do something like this if we use IME for language
 	* support in this product */
@@ -562,9 +559,9 @@ void GadgetTextEntrySetFont( GameWindow *g, GameFont *font )
 		if( dString )
 			dString->setFont( font );
 
-	}  // end if
+	}
 
-}  // end GadgetTextEntrySetFont
+}
 
 // GadgetTextEntryGetText =======================================================
 /** Get the text for a Text entry */
@@ -584,4 +581,4 @@ UnicodeString GadgetTextEntryGetText( GameWindow *textentry )
 	TheWindowManager->winSendSystemMsg( textentry, GEM_GET_TEXT, 0, (WindowMsgData)&result );
 	return result;
 
-}  // end GadgetListBoxGetText
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
index 26cc5db5549..d11c549fa23 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
@@ -24,12 +24,12 @@
 
 // FILE: VerticalSlider.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -66,11 +66,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // GadgetVerticlaSliderInput ==================================================
 /** Handle input for vertical slider */
@@ -81,19 +76,19 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 	SliderData *s = (SliderData *)window->winGetUserData();
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 				//TheWindowManager->winSetFocus( window );
 
@@ -103,13 +98,13 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 			}
 			break;
@@ -118,9 +113,9 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 		case GWM_LEFT_DRAG:
 
 			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 			break;
 
@@ -159,7 +154,7 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 				if( clickPos > mousey - y )
 					clickPos = mousey - y;
 
-			}  // end if
+			}
 			else
 			{
 
@@ -167,7 +162,7 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 				if( clickPos < mousey - y )
 					clickPos = mousey - y;
 
-			}  // end else
+			}
 
 			// keep pos valid on window
 			if( clickPos > y + size.y - childSize.y / 2 )
@@ -199,9 +194,9 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 							GameWindow *child = window->winGetChild();
 
 							s->position += 2;
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GSM_SLIDER_TRACK,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									s->position );
 							// Translate to window coords
 							child->winSetPosition( 0, (Int)((s->maxVal - s->position) * s->numTicks) );
@@ -218,14 +213,14 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 					if( BitIsSet( mData2, KEY_STATE_DOWN ) )
 					{
 
-						if( s->position > s->minVal + 1 ) 
+						if( s->position > s->minVal + 1 )
 						{
 							GameWindow *child = window->winGetChild();
 
 							s->position -= 2;
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GSM_SLIDER_TRACK,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									s->position );
 							// Translate to window coords
 							child->winSetPosition( 0, (Int)((s->maxVal - s->position) * s->numTicks) );
@@ -251,20 +246,20 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 				default:
 					return MSG_IGNORED;
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
-		}  // end char
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetVerticalSliderInput
+}
 
 // GadgetVerticalSliderSystem =================================================
 /** Handle system messages for vertical slider */
@@ -275,16 +270,16 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
 	SliderData *s = (SliderData *)window->winGetUserData();
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			// tell owner I've finished moving
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GSM_SLIDER_DONE,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					s->position );
 			break;
 
@@ -314,30 +309,30 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
 			{
 
 				//s->position = s->minVal;
-				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER, 
+				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER,
 																						s->minVal, 0 );
 				// tell owner i moved
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GSM_SLIDER_TRACK,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						s->position );
 				break;
-			
-			}  // end if
+
+			}
 			else if( mousey < y )
 			{
 
 				//s->position = s->maxVal;
-				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER, 
+				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER,
 																						s->maxVal, 0 );
 				// tell owner i moved
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GSM_SLIDER_TRACK,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						s->position );
 				break;
 
-			}  // end else if
+			}
 
 			if( childCenter.y <= y + childSize.y / 2 )
 			{
@@ -365,13 +360,13 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
 
 				// Invert slider position so that maxval is at the top
 				s->position = s->maxVal - s->position;
-				
+
 			}
 
 			// tell owner i moved
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GSM_SLIDER_TRACK,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					s->position );
 			break;
 
@@ -426,22 +421,24 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
 			delete( (SliderData *)window->winGetUserData() );
+			window->winSetUserData(NULL);
+			s = NULL;
 			break;
 
 		// ------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
 
 			// If we're losing focus
-			if( mData1 == FALSE ) 
+			if( mData1 == FALSE )
 			{
 				BitClear( instData->m_state, WIN_STATE_HILITED );
 			} else {
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 			}
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 
 			*(Bool*)mData2 = TRUE;
@@ -459,14 +456,14 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
 
 			break;
 
-		}  // end resized
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetVerticalSliderSystem
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameFont.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameFont.cpp
index 11e13401583..706ae0ffef1 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameFont.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameFont.cpp
@@ -27,7 +27,7 @@
 // Desc:       Access to our representation for fonts
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameFont.h"
 
@@ -55,7 +55,7 @@ void FontLibrary::linkFont( GameFont *font )
 	// increment linked count
 	m_count++;
 
-}  // end linkFont
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Unlink a font from the font list */
@@ -75,10 +75,10 @@ void FontLibrary::unlinkFont( GameFont *font )
 	if( other == NULL )
 	{
 
-		DEBUG_CRASH(( "Font '%s' not found in library\n", font->nameString.str() ));
+		DEBUG_CRASH(( "Font '%s' not found in library", font->nameString.str() ));
 		return;
 
-	}  // end if
+	}
 
 	// scan for the font pointing to the one we're going to unlink
 	for( other = m_fontList; other; other = other->next )
@@ -100,7 +100,7 @@ void FontLibrary::unlinkFont( GameFont *font )
 	// we now have one less font on the list
 	m_count--;
 
-}  // end unlinkFont
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Delete all font data, DO NOT throw an exception ... the destructor uses this */
@@ -125,9 +125,9 @@ void FontLibrary::deleteAllFonts( void )
 		// delete the font list element
 		deleteInstance(font);
 
-	}  // end while
+	}
 
-}  // deleteAllFonts
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -141,7 +141,7 @@ FontLibrary::FontLibrary( void )
 	m_fontList = NULL;
 	m_count = 0;
 
-}  // end FontLibrary
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -151,7 +151,7 @@ FontLibrary::~FontLibrary( void )
 	// delete all font data
 	deleteAllFonts();
 
-}  // end ~FontLibrary
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize what we need to in the font library */
@@ -159,7 +159,7 @@ FontLibrary::~FontLibrary( void )
 void FontLibrary::init( void )
 {
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the fonts for this font library */
@@ -167,10 +167,10 @@ void FontLibrary::init( void )
 void FontLibrary::reset( void )
 {
 
-	// delete all font data 
+	// delete all font data
 	deleteAllFonts();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get a font from our list, if we don't have that font loaded we will
@@ -178,6 +178,13 @@ void FontLibrary::reset( void )
 //-------------------------------------------------------------------------------------------------
 GameFont *FontLibrary::getFont( AsciiString name, Int pointSize, Bool bold )
 {
+	// sanity check the size - anything over 100 is probably wrong. -MW
+	// TheSuperHackers @fix Now also no longer creates fonts with zero size.
+	if (pointSize < 1 || pointSize > 100)
+	{
+		return NULL;
+	}
+
 	GameFont *font;
 
 	// search for font in list
@@ -186,21 +193,21 @@ GameFont *FontLibrary::getFont( AsciiString name, Int pointSize, Bool bold )
 
 		if( font->pointSize == pointSize &&
 				font->bold == bold &&
-				font->nameString == name 
+				font->nameString == name
 			)
 			return font;  // found
 
-	}  // end for font
+	}
 
 	// font not found, allocate a new font element
 	font = newInstance(GameFont);
 	if( font == NULL )
 	{
 
-		DEBUG_CRASH(( "getFont: Unable to allocate new font list element\n" ));
+		DEBUG_CRASH(( "getFont: Unable to allocate new font list element" ));
 		return NULL;
 
-	}  // end if
+	}
 
 	// copy font data over to new element
 	font->nameString = name;
@@ -208,16 +215,16 @@ GameFont *FontLibrary::getFont( AsciiString name, Int pointSize, Bool bold )
 	font->bold = bold;
 	font->fontData = NULL;
 
-	//DEBUG_LOG(("Font: Loading font '%s' %d point\n", font->nameString.str(), font->pointSize));
+	//DEBUG_LOG(("Font: Loading font '%s' %d point", font->nameString.str(), font->pointSize));
 	// load the device specific data pointer
 	if( loadFontData( font ) == FALSE )
 	{
 
-		DEBUG_CRASH(( "getFont: Unable to load font data pointer '%s'\n", name ));
+		DEBUG_CRASH(( "getFont: Unable to load font data pointer '%s'", name.str() ));
 		deleteInstance(font);
 		return NULL;
 
-	}  // end if
+	}
 
 	// tie font into list
 	linkFont( font );
@@ -225,4 +232,4 @@ GameFont *FontLibrary::getFont( AsciiString name, Int pointSize, Bool bold )
 	// all is done and loaded
 	return font;
 
-}  // end getFont
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp
index bd5c1ad6238..3710e5d5bec 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GameWindow.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -45,7 +45,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
@@ -62,11 +62,6 @@
 #include "GameClient/Mouse.h"
 #include "GameClient/SelectionXlat.h"
 #include "GameClient/GameWindowTransitions.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // DEFINES ////////////////////////////////////////////////////////////////////
 
@@ -99,7 +94,7 @@ GameWindow::GameWindow( void )
 	m_cursorX = 0;
 	m_cursorY = 0;
 
-	m_userData = 0;
+	m_userData = NULL;
 
 	m_inputData = NULL;
 
@@ -122,24 +117,22 @@ GameWindow::GameWindow( void )
 
 	m_editData = NULL;
 
-}  // end GameWindow
+}
 
 // GameWindow::~GameWindow ====================================================
 //=============================================================================
 GameWindow::~GameWindow( void )
 {
 
-	if(	m_inputData )
-		delete m_inputData;
+	delete m_inputData;
 	m_inputData = NULL;
-	
-	if( m_editData )
-		delete m_editData;
+
+	delete m_editData;
 	m_editData = NULL;
 
 	unlinkFromTransitionWindows();
 
-}  // end ~GameWindow
+}
 
 // GameWindow::linkTransitionWindow ============================================
 //=============================================================================
@@ -148,7 +141,7 @@ void GameWindow::linkTransitionWindow( TransitionWindow* transitionWindow )
 
 	m_transitionWindows.push_back(transitionWindow);
 
-}  // end linkTransitionWindow
+}
 
 // GameWindow::unlinkTransitionWindow =========================================
 //=============================================================================
@@ -167,7 +160,7 @@ void GameWindow::unlinkTransitionWindow( TransitionWindow* transitionWindow )
 		++it;
 	}
 
-}  // end unlinkTransitionWindow
+}
 
 // GameWindow::unlinkFromTransitionWindows =========================================
 //=============================================================================
@@ -180,7 +173,7 @@ void GameWindow::unlinkFromTransitionWindows( void )
 		m_transitionWindows.pop_back();
 	}
 
-}  // end unlinkFromTransitionWindows
+}
 
 // GameWindow::normalizeWindowRegion ==========================================
 /** Puts the upper left corner in the window's region.lo field */
@@ -189,25 +182,25 @@ void GameWindow::normalizeWindowRegion( void )
 {
 	Int temp;
 
-	if( m_region.lo.x > m_region.hi.x) 
+	if( m_region.lo.x > m_region.hi.x)
 	{
 
 		temp = m_region.lo.x;
 		m_region.lo.x = m_region.hi.x;
 		m_region.hi.x = temp;
 
-	}  // end if
+	}
 
-	if( m_region.lo.y > m_region.hi.y ) 
+	if( m_region.lo.y > m_region.hi.y )
 	{
 
 		temp = m_region.lo.y;
 		m_region.lo.y = m_region.hi.y;
 		m_region.hi.y = temp;
 
-	}  // end if
+	}
 
-}  // end normalizeWindowRegion
+}
 
 // GameWindow::findFirstLeaf ==================================================
 /** Returns the first leaf of the branch */
@@ -226,7 +219,7 @@ GameWindow *GameWindow::findFirstLeaf( void )
 
 	return leaf;
 
-}  // end findFirstLeaf
+}
 
 // GameWindow::findLastLeaf ===================================================
 /** Returns the last leaf of the branch */
@@ -240,7 +233,7 @@ GameWindow *GameWindow::findLastLeaf( void )
 		leaf = leaf->m_parent;
 
 	// Find the last leaf
-	while( leaf->m_child ) 
+	while( leaf->m_child )
 	{
 
 		leaf = leaf->m_child;
@@ -248,11 +241,11 @@ GameWindow *GameWindow::findLastLeaf( void )
 		while( leaf->m_next )
 			leaf = leaf->m_next;
 
-	}  // end while
+	}
 
 	return leaf;
 
-}  // end findLastLeaf
+}
 
 // GameWindow::findPrevLeaf ===================================================
 /** Returns the prev leaf of the tree */
@@ -261,13 +254,13 @@ GameWindow *GameWindow::findPrevLeaf( void )
 {
 	GameWindow *leaf = this;
 
-	if( leaf->m_prev ) 
+	if( leaf->m_prev )
 	{
 
 		leaf = leaf->m_prev;
 
-		while( leaf->m_child && 
-					 BitIsSet( leaf->m_status, WIN_STATUS_TAB_STOP ) == FALSE ) 
+		while( leaf->m_child &&
+					 BitIsSet( leaf->m_status, WIN_STATUS_TAB_STOP ) == FALSE )
 		{
 
 			leaf = leaf->m_child;
@@ -275,26 +268,26 @@ GameWindow *GameWindow::findPrevLeaf( void )
 			while( leaf->m_next )
 				leaf = leaf->m_next;
 
-		}  // end while
+		}
 
 		return leaf;
 
-	}   // end if
-	else 
+	}
+	else
 	{
 
-		while( leaf->m_parent ) 
+		while( leaf->m_parent )
 		{
 
 			leaf = leaf->m_parent;
 
-			if( leaf->m_parent && leaf->m_prev ) 
+			if( leaf->m_parent && leaf->m_prev )
 			{
 
 				leaf = leaf->m_prev;
 
-				while( leaf->m_child && 
-							 BitIsSet( leaf->m_status, WIN_STATUS_TAB_STOP ) == FALSE ) 
+				while( leaf->m_child &&
+							 BitIsSet( leaf->m_status, WIN_STATUS_TAB_STOP ) == FALSE )
 				{
 
 					leaf = leaf->m_child;
@@ -302,24 +295,24 @@ GameWindow *GameWindow::findPrevLeaf( void )
 					while( leaf->m_next )
 						leaf = leaf->m_next;
 
-				}  // end while
+				}
 
 				return leaf;
 
-			}  // end if
+			}
 
-		}  // end while
+		}
 
 		if( leaf )
 			return leaf->findLastLeaf();
 		else
 			return NULL;
 
-	}  // end else
+	}
 
 	return NULL;
 
-}  // end findPrevLeaf
+}
 
 // GameWindow::findNextLeaf ===================================================
 /** Returns the next leaf of the tree */
@@ -328,48 +321,48 @@ GameWindow *GameWindow::findNextLeaf( void )
 {
 	GameWindow *leaf = this;
 
-	if( leaf->m_next ) 
+	if( leaf->m_next )
 	{
 
 		if( leaf->m_next->m_status & WIN_STATUS_TAB_STOP )
 			return leaf->m_next;
 
 		for( leaf = leaf->m_next; leaf; leaf = leaf->m_child )
-			if( leaf->m_child == NULL || BitIsSet( leaf->m_status, 
+			if( leaf->m_child == NULL || BitIsSet( leaf->m_status,
 																						WIN_STATUS_TAB_STOP ) )
 				return leaf;
 
-	}  // end if
-	else 
+	}
+	else
 	{
 
-		while( leaf->m_parent ) 
+		while( leaf->m_parent )
 		{
 
 			leaf = leaf->m_parent;
 
-			if( leaf->m_parent && leaf->m_next ) 
+			if( leaf->m_parent && leaf->m_next )
 			{
 
 				for( leaf = leaf->m_next; leaf; leaf = leaf->m_child )
-					if( leaf->m_child == NULL || 
+					if( leaf->m_child == NULL ||
 							BitIsSet( leaf->m_status, WIN_STATUS_TAB_STOP ) )
 						return leaf;
 
-			}  // end if
+			}
 
-		}  // end while
+		}
 
 		if( leaf )
 			return leaf->findFirstLeaf();
 		else
 			return NULL;
 
-	}  // end else
+	}
 
 	return NULL;
 
-}  // end findNextLeav
+}
 
 // GameWindow::winNextTab =====================================================
 /** Go to next window in tab chain */
@@ -383,16 +376,16 @@ Int GameWindow::winNextTab( void )
 	// Un-hilite the current window
 	m_instData.m_state &= ~WIN_STATE_HILITED;
 
-	do 
+	do
 	{
 
-		if( m_parent == NULL && firstTry ) 
+		if( m_parent == NULL && firstTry )
 		{
 
 			newTab = findLastLeaf( newTab );
 			firstTry = FALSE;
 
-		} 
+		}
 		else
 			newTab = findPrevLeaf( newTab );
 	} while( ( isEnabled( newTab ) == FALSE ) ||
@@ -404,7 +397,7 @@ Int GameWindow::winNextTab( void )
 */
 	return WIN_ERR_OK;
 
-}  // end WinNextTab
+}
 
 // GameWindow::winPrevTab =====================================================
 /** Go to previous window in tab chain */
@@ -418,16 +411,16 @@ Int GameWindow::winPrevTab( void )
 	// Un-hilite the current window
 	m_instData.m_state &= ~WIN_STATE_HILITED;
 
-	do 
+	do
 	{
 
-		if( m_parent == NULL && firstTry ) 
+		if( m_parent == NULL && firstTry )
 		{
 
 			newTab = findFirstLeaf( newTab );
 			firstTry = FALSE;
 
-		}  // end if
+		}
 		else
 			newTab = findNextLeaf( newTab );
 
@@ -441,7 +434,7 @@ Int GameWindow::winPrevTab( void )
 
 	return WIN_ERR_OK;
 
-}  // end WinPrevTab
+}
 
 // GameWindow::winBringToTop ==================================================
 /** Bring this window to the top of the window list, if we have a parent
@@ -459,13 +452,13 @@ Int GameWindow::winBringToTop( void )
 		TheWindowManager->addWindowToParent( this, parent );
 //		TheWindowManager->addWindowToParentAtEnd( this, parent );
 
-	}  // end if
+	}
 	else
 	{
 
 		// sanity, make sure this window is in the window list
-		for( current = TheWindowManager->winGetWindowList(); 
-				 current != this; 
+		for( current = TheWindowManager->winGetWindowList();
+				 current != this;
 				 current = current->m_next)
 			if (current == NULL)
 				return WIN_ERR_INVALID_PARAMETER;
@@ -474,7 +467,7 @@ Int GameWindow::winBringToTop( void )
 		TheWindowManager->unlinkWindow( this );
 		TheWindowManager->linkWindow( this );
 
-	}  // end else
+	}
 
 	//
 	// if the window is part of a screen layout, move it to the top
@@ -493,11 +486,11 @@ Int GameWindow::winBringToTop( void )
 		saveLayout->removeWindow( this );
 		saveLayout->addWindow( this );
 
-	}  // end if
+	}
 
 	return WIN_ERR_OK;
 
-}  // end winBringToTop
+}
 
 // GameWindow::winActivate ====================================================
 /** Pop window to top of window list AND activate it */
@@ -517,7 +510,7 @@ Int GameWindow::winActivate( void )
 
 	return WIN_ERR_OK;
 
-}  // end WinActivate
+}
 
 // GameWindow::winSetPosition =================================================
 /** Set the window's position */
@@ -535,14 +528,14 @@ Int GameWindow::winSetPosition( Int x, Int y )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetPosition
+}
 
 // WinGetPosition =============================================================
 /** Get the window's postion */
 //=============================================================================
 Int GameWindow::winGetPosition( Int *x, Int *y )
 {
-	
+
 	// sanity
 	if( x == NULL || y == NULL )
 		return WIN_ERR_INVALID_PARAMETER;
@@ -552,7 +545,7 @@ Int GameWindow::winGetPosition( Int *x, Int *y )
 
 	return WIN_ERR_OK;
 
-}  // end WinGetPosition
+}
 
 // WinSetCursorPosition =============================================================
 /** Set the window's cursor postion */
@@ -564,7 +557,7 @@ Int GameWindow::winSetCursorPosition( Int x, Int y )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetCursorPosition
+}
 
 // WinGetCursorPosition =============================================================
 /** Get the window's cursor postion */
@@ -575,15 +568,15 @@ Int GameWindow::winGetCursorPosition( Int *x, Int *y )
 	{
 		*x = m_cursorX;
 	}
-	
+
 	if ( y )
 	{
 		*y = m_cursorY;
 	}
-	
+
 	return WIN_ERR_OK;
 
-}  // end WinGetPosition
+}
 
 // GameWindow::winGetScreenPosition ===========================================
 /** Get the window's postion in screen coordinates */
@@ -595,18 +588,18 @@ Int GameWindow::winGetScreenPosition( Int *x, Int *y )
 	*x = m_region.lo.x;
 	*y = m_region.lo.y;
 
-	while( parent ) 
+	while( parent )
 	{
 
 		*x += parent->m_region.lo.x;
 		*y += parent->m_region.lo.y;
 		parent = parent->m_parent;
 
-	}  // end while
+	}
 
 	return WIN_ERR_OK;
 
-}  // end WinGetScreenPosition
+}
 
 // GameWindow::winGetRegion ===================================================
 /** Get the window region */
@@ -619,7 +612,7 @@ Int GameWindow::winGetRegion( IRegion2D *region )
 
 	return WIN_ERR_OK;
 
-}  // end winGetRegion
+}
 
 // GameWindow::winPointInWindow ===============================================
 /** Check to see if the given point is inside the window.  Will
@@ -638,7 +631,7 @@ Bool GameWindow::winPointInWindow( Int x, Int y )
 
 	return FALSE;
 
-}  // end WinPointInWindow
+}
 
 // GameWindow::winSetSize =====================================================
 /** Set the window's size */
@@ -651,14 +644,14 @@ Int GameWindow::winSetSize( Int width, Int height )
 	m_region.hi.x = m_region.lo.x + width;
 	m_region.hi.y = m_region.lo.y + height;
 
-	TheWindowManager->winSendSystemMsg( this, 
+	TheWindowManager->winSendSystemMsg( this,
 																			GGM_RESIZED,
-																			(WindowMsgData)width, 
+																			(WindowMsgData)width,
 																			(WindowMsgData)height );
 
 	return WIN_ERR_OK;
 
-}  // end WinSetSize
+}
 
 // GameWindow::winGetSize =====================================================
 /** Get the window's size */
@@ -675,7 +668,7 @@ Int GameWindow::winGetSize( Int *width, Int *height )
 
 	return WIN_ERR_OK;
 
-}  // end WinGetSize
+}
 
 // GameWindow::winEnable ======================================================
 /** Enable or disable a window based on the enable parameter.
@@ -690,17 +683,17 @@ Int GameWindow::winEnable( Bool enable )
 	else
 		BitClear( m_status, WIN_STATUS_ENABLED );
 
-	if( m_child ) 
+	if( m_child )
 	{
 
 		for( child = m_child; child; child = child->m_next)
 			child->winEnable( enable );
 
-	}  // end if
+	}
 
 	return WIN_ERR_OK;
 
-}  // end WinEnable
+}
 
 // GameWindow::winGetEnabled ======================================================
 /** Enable or disable a window based on the enable parameter.
@@ -710,7 +703,7 @@ Bool GameWindow::winGetEnabled( void )
 {
   return BitIsSet( m_status, WIN_STATUS_ENABLED );
 
-}  // end winGetEnabled
+}
 
 // GameWindow::winHide ========================================================
 /** Hide or show a window based on the hide parameter.
@@ -735,17 +728,17 @@ Int GameWindow::winHide( Bool hide )
 		// notify the window manger we are hiding
 		TheWindowManager->windowHiding( this );
 
-	}  // end if
+	}
 	else
 	{
 
 		BitClear( m_status, WIN_STATUS_HIDDEN );
 
-	}  // end else
+	}
 
 	return WIN_ERR_OK;
 
-}  // end WinHide
+}
 
 // GameWindow::winIsHidden ====================================================
 /** Am I hidden? */
@@ -755,7 +748,7 @@ Bool GameWindow::winIsHidden( void )
 
 	return BitIsSet( m_status, WIN_STATUS_HIDDEN );
 
-}  // end WinIsHidden
+}
 
 // GameWindow::winSetStatus ===================================================
 /** Allows the user to directly set a window's status flags. */
@@ -770,7 +763,7 @@ UnsignedInt GameWindow::winSetStatus( UnsignedInt status )
 
 	return oldStatus;
 
-}  // end WinSetStatus
+}
 
 // GameWindow::winClearStatus =================================================
 /** Allows the user to directly clear a window's status flags. */
@@ -784,7 +777,7 @@ UnsignedInt GameWindow::winClearStatus( UnsignedInt status )
 
 	return oldStatus;
 
-}  // end WinClearStatus
+}
 
 // GameWindow::winGetStatus ===================================================
 /** Returns a window's status flags. */
@@ -794,7 +787,7 @@ UnsignedInt GameWindow::winGetStatus( void )
 
 	return m_status;
 
-}  // end WinGetStatus
+}
 
 // GameWindow::winGetStyle ====================================================
 /** Returns a window's style flags. */
@@ -804,7 +797,7 @@ UnsignedInt GameWindow::winGetStyle( void )
 
 	return m_instData.m_style;
 
-}  // end WinGetStyle
+}
 
 // GameWindow::winSetHiliteState ==============================================
 /** Set whether window is highlighted or not */
@@ -817,7 +810,7 @@ void GameWindow::winSetHiliteState( Bool state )
 	else
 		BitClear( m_instData.m_state, WIN_STATE_HILITED );
 
-}  // end WinSetHiliteState
+}
 
 // GameWindow::winSetDrawOffset ===============================================
 /** Set offset for drawing images */
@@ -828,7 +821,7 @@ void GameWindow::winSetDrawOffset( Int x, Int y )
 	m_instData.m_imageOffset.x = x;
 	m_instData.m_imageOffset.y = y;
 
-}  // end WinSetDrawOffset
+}
 
 // GameWindow::winGetDrawOffset ===============================================
 /** Get offset for drawing images */
@@ -843,7 +836,7 @@ void GameWindow::winGetDrawOffset( Int *x, Int *y )
 	*x = m_instData.m_imageOffset.x;
 	*y = m_instData.m_imageOffset.y;
 
-}  // end WinGetDrawOffset
+}
 
 // GameWindow::winSetText =====================================================
 /** Sets the text in a window */
@@ -855,10 +848,10 @@ Int GameWindow::winSetText( UnicodeString newText )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetText
+}
 
 // GameWindow::winGetText =====================================================
-/** Get text from a window ... this works for static text windows and 
+/** Get text from a window ... this works for static text windows and
 	* edit boxes */
 //=============================================================================
 UnicodeString GameWindow::winGetText( void )
@@ -866,7 +859,7 @@ UnicodeString GameWindow::winGetText( void )
 	// return the contents of our text field
 	return m_instData.getText();
 
-}  // end WinGetText
+}
 
 // GameWindow::winGetTextLength =====================================================
 //=============================================================================
@@ -875,7 +868,7 @@ Int GameWindow::winGetTextLength()
 	// return the contents of our text field
 	return m_instData.getTextLength();
 
-}  // end WinGetText
+}
 
 // GameWindow::winGetFont =====================================================
 /** Get the font being used by this window */
@@ -885,7 +878,7 @@ GameFont *GameWindow::winGetFont( void )
 
 	return m_instData.getFont();
 
-}  // end WinGetFont
+}
 
 // GameWindow::winSetFont =====================================================
 /** Set font for text in this window */
@@ -917,9 +910,9 @@ void GameWindow::winSetFont( GameFont *font )
 		if( dString )
 			dString->setFont( font );
 
-	}  // end else
+	}
 
-}  // end WinSetFont
+}
 
 // GameWindow::winSetEnabledTextColors ========================================
 /** Set the text colors for the enabled state */
@@ -928,12 +921,12 @@ void GameWindow::winSetEnabledTextColors( Color color, Color borderColor )
 {
 	m_instData.m_enabledText.color = color;
 	m_instData.m_enabledText.borderColor = borderColor;
-	
+
 	if( BitIsSet( m_instData.getStyle(), GWS_COMBO_BOX ) )
 		GadgetComboBoxSetEnabledTextColors(this,  color, borderColor );
-	
 
-}  // end winSetEnabledTextColors
+
+}
 
 // GameWindow::winSetDisabledTextColors =======================================
 /** Set the text colors for the disabled state */
@@ -947,7 +940,7 @@ void GameWindow::winSetDisabledTextColors( Color color, Color borderColor )
 	if( BitIsSet( m_instData.getStyle(), GWS_COMBO_BOX ) )
 		GadgetComboBoxSetDisabledTextColors( this, color, borderColor );
 
-}  // end winSetDisabledTextColors
+}
 
 // GameWindow::winSetHiliteTextColors =========================================
 /** Set the text colors for the Hilite state */
@@ -961,7 +954,7 @@ void GameWindow::winSetHiliteTextColors( Color color, Color borderColor )
 	if( BitIsSet( m_instData.getStyle(), GWS_COMBO_BOX ) )
 		GadgetComboBoxSetHiliteTextColors( this, color, borderColor );
 
-}  // end winSetHiliteTextColors
+}
 
 // GameWindow::winSetIMECompositeTextColors =========================================
 /** Set the text colors for the IME Composite state */
@@ -974,7 +967,7 @@ void GameWindow::winSetIMECompositeTextColors( Color color, Color borderColor )
 
 	if( BitIsSet( m_instData.getStyle(), GWS_COMBO_BOX ) )
 		GadgetComboBoxSetIMECompositeTextColors( this, color, borderColor );
-}  // end winSetIMECompositeTextColors
+}
 
 // GameWindow::winGetEnabledTextColor =========================================
 /** Get the enabled text color */
@@ -984,7 +977,7 @@ Color GameWindow::winGetEnabledTextColor( void )
 
 	return m_instData.m_enabledText.color;
 
-}  // end winGetEnabledTextColor
+}
 
 // GameWindow::winGetEnabledTextBorderColor ===================================
 /** Get the enabled text color */
@@ -994,7 +987,7 @@ Color GameWindow::winGetEnabledTextBorderColor( void )
 
 	return m_instData.m_enabledText.borderColor;
 
-}  // end winGetEnabledTextBorderColor
+}
 
 // GameWindow::winGetDisabledTextColor ========================================
 /** Get the disabled text color */
@@ -1004,7 +997,7 @@ Color GameWindow::winGetDisabledTextColor( void )
 
 	return m_instData.m_disabledText.color;
 
-}  // end winGetDisabledTextColor
+}
 
 // GameWindow::winGetDisabledTextBorderColor ==================================
 /** Get the disabled text color */
@@ -1014,7 +1007,7 @@ Color GameWindow::winGetDisabledTextBorderColor( void )
 
 	return m_instData.m_disabledText.borderColor;
 
-}  // end winGetEnabledTextBorderColor
+}
 
 // GameWindow::winGetIMECompositeTextColor ==========================================
 /** Get the IME composite text color */
@@ -1024,7 +1017,7 @@ Color GameWindow::winGetIMECompositeTextColor( void )
 
 	return m_instData.m_imeCompositeText.color;
 
-}  // end winGetIMECompositeTextColor
+}
 
 // GameWindow::winGetIMECompositeBorderColor ==========================================
 /** Get the IME composite border color */
@@ -1034,7 +1027,7 @@ Color GameWindow::winGetIMECompositeBorderColor( void )
 
 	return m_instData.m_imeCompositeText.borderColor;
 
-}  // end winGetIMECompositeBorderColor
+}
 
 // GameWindow::winGetHiliteTextColor ==========================================
 /** Get the hilite text color */
@@ -1044,7 +1037,7 @@ Color GameWindow::winGetHiliteTextColor( void )
 
 	return m_instData.m_hiliteText.color;
 
-}  // end winGetHiliteTextColor
+}
 
 // GameWindow::winGetHiliteTextBorderColor ====================================
 /** Get the hilite text color */
@@ -1054,7 +1047,7 @@ Color GameWindow::winGetHiliteTextBorderColor( void )
 
 	return m_instData.m_hiliteText.borderColor;
 
-}  // end winGetHiliteTextBorderColor
+}
 
 // GameWindow::winSetInstanceData =============================================
 /** Sets the window's instance data which includes parameters
@@ -1088,7 +1081,7 @@ Int GameWindow::winSetInstanceData( WinInstanceData *data )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetInstanceData
+}
 
 // GameWindow::winGetInstanceData =============================================
 /** Return pointer to the instance data for this window */
@@ -1098,7 +1091,7 @@ WinInstanceData *GameWindow::winGetInstanceData( void )
 
 	return &m_instData;
 
-}  // end WinGetInstanceData
+}
 
 // GameWindow::winGetUserData =================================================
 /** Return the user data stored */
@@ -1108,7 +1101,7 @@ void *GameWindow::winGetUserData( void )
 
 	return m_userData;
 
-}  // end WinGetUserData
+}
 
 // GameWindow::winSetUserData =================================================
 /** Set the user data stored */
@@ -1118,7 +1111,7 @@ void GameWindow::winSetUserData( void *data )
 
 	m_userData = data;
 
-}  // end WinSetUserData
+}
 
 // GameWindow::winSetTooltip ==================================================
 /** Sets the window's tooltip text */
@@ -1128,7 +1121,7 @@ void GameWindow::winSetTooltip( UnicodeString tip )
 
 	m_instData.setTooltipText( tip );
 
-}  // end WinSetTooltip
+}
 
 // GameWindow::winSetWindowId =================================================
 /** Sets the window's id */
@@ -1140,7 +1133,7 @@ Int GameWindow::winSetWindowId( Int id )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetWindowId
+}
 
 // GameWindow::winGetWindowId =================================================
 /** Gets the window's id */
@@ -1150,7 +1143,7 @@ Int GameWindow::winGetWindowId( void )
 
 	return m_instData.m_id;
 
-}  // end WinGetWindowId
+}
 
 // GameWindow::winSetParent ===================================================
 /** Sets this window's parent */
@@ -1187,7 +1180,7 @@ Int GameWindow::winSetParent( GameWindow *parent )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetParent
+}
 
 // GameWindow::winGetParent ===================================================
 /** Gets the window's parent */
@@ -1197,7 +1190,7 @@ GameWindow *GameWindow::winGetParent( void )
 
 	return m_parent;
 
-}  // end WinGetParent
+}
 
 // GameWindow::winIsChild =====================================================
 /** Determins if a window is a child/grand-child of a parent */
@@ -1214,11 +1207,11 @@ Bool GameWindow::winIsChild( GameWindow *child )
 		// set up tree
 		child = child->m_parent;
 
-	}  // end while
+	}
 
 	return FALSE;
 
-}  // end WinIsChild
+}
 
 // GameWindow::winGetChild ====================================================
 /** Get the child window of this window */
@@ -1228,7 +1221,7 @@ GameWindow *GameWindow::winGetChild( void )
 
 	return m_child;
 
-}  // end WinGetChild
+}
 
 // GameWindow::winSetOwner ====================================================
 /** Sets the window's owner */
@@ -1243,7 +1236,7 @@ Int GameWindow::winSetOwner( GameWindow *owner )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetOwner
+}
 
 // GameWindow::winGetOwner ====================================================
 /** Gets the window's owner */
@@ -1253,7 +1246,7 @@ GameWindow *GameWindow::winGetOwner( void )
 
 	return m_instData.getOwner();
 
-}  // end winGetOwner
+}
 
 // GameWindow::winSetNext =====================================================
 /** Set next pointer */
@@ -1263,7 +1256,7 @@ void GameWindow::winSetNext( GameWindow *next )
 
 	m_next = next;
 
-}  // end winSetNext
+}
 
 // GameWindow::winGetNext =====================================================
 /** Gets the next window */
@@ -1273,7 +1266,7 @@ GameWindow *GameWindow::winGetNext( void )
 
 	return m_next;
 
-}  // end winGetNext
+}
 
 // GameWindow::winSetPrev =====================================================
 /** Set prev pointer */
@@ -1283,7 +1276,7 @@ void GameWindow::winSetPrev( GameWindow *prev )
 
 	m_prev = prev;
 
-}  // end winSetPrev
+}
 
 // GameWindow::winGetPrev =====================================================
 /** Get the previous window */
@@ -1293,7 +1286,7 @@ GameWindow *GameWindow::winGetPrev( void )
 
 	return m_prev;
 
-}  // end winGetPrev
+}
 
 // GameWindow::winSetNextInLayout =============================================
 /** Set next window in layout */
@@ -1355,7 +1348,7 @@ Int GameWindow::winSetSystemFunc( GameWinSystemFunc system )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetSystemFunc
+}
 
 // GameWindow::winSetInputFunc ================================================
 /** Sets the window's input callback functions. */
@@ -1370,7 +1363,7 @@ Int GameWindow::winSetInputFunc( GameWinInputFunc input )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetInputFunc
+}
 
 // GameWindow::winSetDrawFunc =================================================
 /** Sets the window's redraw callback functions. */
@@ -1385,7 +1378,7 @@ Int GameWindow::winSetDrawFunc( GameWinDrawFunc draw )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetDrawFunc
+}
 
 // GameWindow::winSetTooltipFunc ==============================================
 /** Sets a window's tooltip callback */
@@ -1394,10 +1387,10 @@ Int GameWindow::winSetTooltipFunc( GameWinTooltipFunc tooltip )
 {
 
 	m_tooltip = tooltip;
-	
+
 	return WIN_ERR_OK;
 
-}  // end WinSetTooltipFunc
+}
 
 // GameWindow::winSetCallbacks ================================================
 /** Sets the window's input, tooltip, and redraw callback functions. */
@@ -1413,7 +1406,7 @@ Int GameWindow::winSetCallbacks( GameWinInputFunc input,
 
 	return WIN_ERR_OK;
 
-}  // end WinSetCallbacks
+}
 
 // GameWindow::winDrawWindow ==================================================
 /** Draws the default background for the specified window. */
@@ -1426,7 +1419,7 @@ Int GameWindow::winDrawWindow( void )
 
 	return WIN_ERR_OK;
 
-}  // end WinDrawWindow
+}
 
 // GameWindow::winPointInChild ================================================
 /** Given a window and the mouse coordinates, return the child
@@ -1439,20 +1432,20 @@ GameWindow *GameWindow::winPointInChild( Int x, Int y, Bool ignoreEnableCheck, B
 	GameWindow *child;
 	ICoord2D origin;
 
-	for( child = m_child; child; child = child->m_next ) 
+	for( child = m_child; child; child = child->m_next )
 	{
 
 		origin = child->m_region.lo;
 		parent = child->winGetParent();
 
-		while( parent ) 
+		while( parent )
 		{
 
 			origin.x += parent->m_region.lo.x;
 			origin.y += parent->m_region.lo.y;
 			parent = parent->m_parent;
 
-		}  // end while
+		}
 
 		if( x >= origin.x && x <= origin.x + child->m_size.x &&
 				y >= origin.y && y <= origin.y + child->m_size.y )
@@ -1476,12 +1469,12 @@ GameWindow *GameWindow::winPointInChild( Int x, Int y, Bool ignoreEnableCheck, B
 			}
 		}
 
-	}  // end for child
+	}
 
 	// not in any children, must be in parent
 	return this;
 
-}  // end WinPointInChild
+}
 
 // GameWindow::winPointInAnyChild =============================================
 /** Find the child in which the cursor resides; regardless of
@@ -1493,20 +1486,20 @@ GameWindow *GameWindow::winPointInAnyChild( Int x, Int y, Bool ignoreHidden, Boo
 	GameWindow *child;
 	ICoord2D origin;
 
-	for( child = m_child; child; child = child->m_next ) 
+	for( child = m_child; child; child = child->m_next )
 	{
 
 		origin = child->m_region.lo;
 		parent = child->m_parent;
 
-		while( parent ) 
+		while( parent )
 		{
 
 			origin.x += parent->m_region.lo.x;
 			origin.y += parent->m_region.lo.y;
 			parent = parent->m_parent;
 
-		}  // end while
+		}
 
 		if( x >= origin.x && x <= origin.x + child->m_size.x &&
 				y >= origin.y && y <= origin.y + child->m_size.y )
@@ -1515,14 +1508,14 @@ GameWindow *GameWindow::winPointInAnyChild( Int x, Int y, Bool ignoreHidden, Boo
 			if( !(ignoreHidden == TRUE &&	BitIsSet( child->m_status, WIN_STATUS_HIDDEN )) )
 				return child->winPointInChild( x, y, ignoreEnableCheck );
 
-		}  // end if
+		}
 
-	}  // end for child
+	}
 
 	// not in any children, must be in parent
 	return this;
 
-}  // end WinPointInAnyChild
+}
 
 //
 // In release builds the default input and system functions are optimized
@@ -1542,7 +1535,7 @@ WindowMsgHandledType GameWinDefaultInput( GameWindow *window, UnsignedInt msg,
 
 	return MSG_IGNORED;
 
-}  // end GameWinDefaultInput
+}
 
 ///< Input that blocks all (mouse) input like a wall, instead of passing like it wasn't there
 WindowMsgHandledType GameWinBlockInput( GameWindow *window, UnsignedInt msg,
@@ -1550,47 +1543,45 @@ WindowMsgHandledType GameWinBlockInput( GameWindow *window, UnsignedInt msg,
 {
 	if (msg == GWM_CHAR || msg == GWM_MOUSE_POS)
 		return MSG_IGNORED;
-	
-	//Added By Sadullah Nader
-	//Fix for drag selecting in the control bar
+
 	if (msg == GWM_LEFT_UP )//|| msg == GWM_LEFT_DRAG)
 	{
-		//stop drag selecting 
-		
+		//stop drag selecting
+
 		TheSelectionTranslator->setLeftMouseButton(FALSE);
 		TheSelectionTranslator->setDragSelecting(FALSE);
-		
+
 		TheTacticalView->setMouseLock( FALSE );
 		TheInGameUI->setSelecting( FALSE );
 		TheInGameUI->endAreaSelectHint(NULL);
-		
+
 	}
 
 	return MSG_HANDLED;
 
-}  // end GameWinBlockInput
+}
 
 // GameWinDefaultSystem =======================================================
 /** The default system callback.  Currently does nothing. */
 //=============================================================================
-WindowMsgHandledType GameWinDefaultSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType GameWinDefaultSystem( GameWindow *window, UnsignedInt msg,
 													 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
 	return MSG_IGNORED;
 
-}  // end GameWinDefaultSystem
+}
 
 // GameWinDefaultTooltip ======================================================
 /** Default tooltip callback */
 //=============================================================================
-void GameWinDefaultTooltip( GameWindow *window, 
+void GameWinDefaultTooltip( GameWindow *window,
 														WinInstanceData *instData,
 														UnsignedInt mouse )
 {
 	return;
 
-}  // end GameWinDefaultTooltip
+}
 
 // GameWinDefaultDraw =========================================================
 /** Default draw, does nothing */
@@ -1600,7 +1591,7 @@ void GameWinDefaultDraw( GameWindow *window, WinInstanceData *instData )
 
 	return;
 
-}  // end GameWinDefaultDraw
+}
 
 // GameWindow::winSetEnabledImage =============================================
 /** Set an enabled image into the draw data for the enabled state */
@@ -1612,16 +1603,16 @@ Int GameWindow::winSetEnabledImage( Int index, const Image *image )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set enabled image, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set enabled image, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_enabledDrawData[ index ].image = image;
 	return WIN_ERR_OK;
 
-}  // end winSetEnabledImage
+}
 
 // GameWindow::winSetEnabledColor =============================================
 /** set color for enabled state at index */
@@ -1633,16 +1624,16 @@ Int GameWindow::winSetEnabledColor( Int index, Color color )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set enabled color, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set enabled color, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_enabledDrawData[ index ].color = color;
 	return WIN_ERR_OK;
 
-}  // end winSetEnabledColor
+}
 
 // GameWindow::winSetEnabledBorderColor =======================================
 /** set border color for state at this index */
@@ -1654,16 +1645,16 @@ Int GameWindow::winSetEnabledBorderColor( Int index, Color color )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set enabled border color, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set enabled border color, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_enabledDrawData[ index ].borderColor = color;
 	return WIN_ERR_OK;
 
-}  // end winSetEnabledBorderColor
+}
 
 // GameWindow::winSetDisabledImage ============================================
 /** Set an disabled image into the draw data for the disabled state */
@@ -1675,16 +1666,16 @@ Int GameWindow::winSetDisabledImage( Int index, const Image *image )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set disabled image, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set disabled image, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_disabledDrawData[ index ].image = image;
 	return WIN_ERR_OK;
 
-}  // end winSetDisabledImage
+}
 
 // GameWindow::winSetDisabledColor ============================================
 /** set color for disabled state at index */
@@ -1696,16 +1687,16 @@ Int GameWindow::winSetDisabledColor( Int index, Color color )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set disabled color, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set disabled color, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_disabledDrawData[ index ].color = color;
 	return WIN_ERR_OK;
 
-}  // end winSetDisabledColor
+}
 
 // GameWindow::winSetDisabledBorderColor ======================================
 /** set border color for state at this index */
@@ -1717,16 +1708,16 @@ Int GameWindow::winSetDisabledBorderColor( Int index, Color color )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set disabled border color, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set disabled border color, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_disabledDrawData[ index ].borderColor = color;
 	return WIN_ERR_OK;
 
-}  // end winSetDisabledBorderColor
+}
 
 // GameWindow::winSetHiliteImage ==============================================
 /** Set an hilite image into the draw data for the hilite state */
@@ -1738,16 +1729,16 @@ Int GameWindow::winSetHiliteImage( Int index, const Image *image )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set hilite image, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set hilite image, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_hiliteDrawData[ index ].image = image;
 	return WIN_ERR_OK;
 
-}  // end winSetHiliteImage
+}
 
 // GameWindow::winSetHiliteColor ==============================================
 /** set color for hilite state at index */
@@ -1759,16 +1750,16 @@ Int GameWindow::winSetHiliteColor( Int index, Color color )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set hilite color, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set hilite color, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_hiliteDrawData[ index ].color = color;
 	return WIN_ERR_OK;
 
-}  // end winSetHiliteColor
+}
 
 // GameWindow::winSetHiliteBorderColor ========================================
 /** set border color for state at this index */
@@ -1780,16 +1771,16 @@ Int GameWindow::winSetHiliteBorderColor( Int index, Color color )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set hilite border color, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set hilite border color, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_hiliteDrawData[ index ].borderColor = color;
 	return WIN_ERR_OK;
 
-}  // end winSetHiliteBorderColor
+}
 
 // GameWindow::winGetInputFunc ================================================
 //=============================================================================
@@ -1798,7 +1789,7 @@ GameWinInputFunc GameWindow::winGetInputFunc( void )
 
 	return m_input;
 
-}  // end winGetInputFunc
+}
 
 // GameWindow::winGetSystemFunc ===============================================
 //=============================================================================
@@ -1807,7 +1798,7 @@ GameWinSystemFunc GameWindow::winGetSystemFunc( void )
 
 	return m_system;
 
-}  // end winGetSystemFunc
+}
 
 // GameWindow::winGetTooltipFunc ==============================================
 //=============================================================================
@@ -1816,7 +1807,7 @@ GameWinTooltipFunc GameWindow::winGetTooltipFunc( void )
 
 	return m_tooltip;
 
-}  // end winGetTooltipFunc
+}
 
 // GameWindow::winGetDrawFunc =================================================
 //=============================================================================
@@ -1825,7 +1816,7 @@ GameWinDrawFunc GameWindow::winGetDrawFunc( void )
 
 	return m_draw;
 
-}  // end winGetDrawFunc
+}
 
 // GameWindow::winSetEditData =================================================
 //=============================================================================
@@ -1834,7 +1825,7 @@ void GameWindow::winSetEditData( GameWindowEditData *editData )
 
 	m_editData = editData;
 
-}  // end winSetEditData
+}
 
 // GameWindow::winGetEditData =================================================
 //=============================================================================
@@ -1843,4 +1834,4 @@ GameWindowEditData *GameWindow::winGetEditData( void )
 
 	return m_editData;
 
-}  // end winGetEditData
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp
index 61881e8eb0c..c6a8a72b642 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowGlobal.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -45,10 +45,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "Common/Language.h"
 #include "GameClient/Image.h"
 #include "GameClient/Display.h"
 #include "GameClient/GameWindowManager.h"
@@ -71,36 +70,36 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // GameWindowManager::winDrawImage ============================================
-/** draw image, coord are in screen and should be kepth within 
+/** draw image, coord are in screen and should be kepth within
 	* that box specified */
 //=============================================================================
-void GameWindowManager::winDrawImage( const Image *image, Int startX, Int startY, 
+void GameWindowManager::winDrawImage( const Image *image, Int startX, Int startY,
 																			Int endX, Int endY, Color color )
 {
 
 	TheDisplay->drawImage( image, startX, startY, endX, endY, color );
 
-}  // end WinDrawImage
+}
 
 // GameWindowManager::winFillRect =============================================
 /** draw filled rect, coords are absolute screen coords */
 //=============================================================================
-void GameWindowManager::winFillRect( Color color, Real width, 
-																		 Int startX, Int startY, 
+void GameWindowManager::winFillRect( Color color, Real width,
+																		 Int startX, Int startY,
 																		 Int endX, Int endY )
 {
 
-	TheDisplay->drawFillRect( startX, startY, 
-														endX - startX, endY - startY, 
+	TheDisplay->drawFillRect( startX, startY,
+														endX - startX, endY - startY,
 														color );
 
-}  // end WinFillRect
+}
 
 // GameWindowManager::winOpenRect =============================================
 /** draw rect outline, coords are absolute screen coords */
 //=============================================================================
-void GameWindowManager::winOpenRect( Color color, Real width, 
-																		 Int startX, Int startY, 
+void GameWindowManager::winOpenRect( Color color, Real width,
+																		 Int startX, Int startY,
 																		 Int endX, Int endY )
 {
 
@@ -108,49 +107,49 @@ void GameWindowManager::winOpenRect( Color color, Real width,
 														endX - startX, endY - startY,
 														width, color );
 
-}  // end WinOpenRect
+}
 
 // GameWindowManager::winDrawLine =============================================
 /** draw line, coords are absolute screen coords */
 //=============================================================================
-void GameWindowManager::winDrawLine( Color color, Real width, 
-																		 Int startX, Int startY, 
+void GameWindowManager::winDrawLine( Color color, Real width,
+																		 Int startX, Int startY,
 																		 Int endX, Int endY )
 {
 
 	TheDisplay->drawLine( startX, startY, endX, endY, width, color );
 
-}  // end WinDrawLine
+}
 
 // GameWindowManager::winFindImage ============================================
 /** Given an image name, return an image loc to that image information.
-	* You may reorganize the image loc structure however you like to suit 
+	* You may reorganize the image loc structure however you like to suit
 	* your individual project */
 //=============================================================================
-const Image *GameWindowManager::winFindImage( const char *name ) 
-{ 
+const Image *GameWindowManager::winFindImage( const char *name )
+{
 
 	assert( TheMappedImageCollection );
 	if( TheMappedImageCollection )
-		return TheMappedImageCollection->findImageByName( AsciiString( name ) );
+		return TheMappedImageCollection->findImageByName( name );
 
 	return NULL;
 
-}  // end WinFindImage
+}
 
 // GameWindowManager::winMakeColor ============================================
 /** Given RGBA, make a color, you can change color representation for your
 	* individual project needs */
 //=============================================================================
-Color GameWindowManager::winMakeColor( UnsignedByte red, 
-																			 UnsignedByte green, 
-																			 UnsignedByte blue, 
-																			 UnsignedByte alpha ) 
-{ 
+Color GameWindowManager::winMakeColor( UnsignedByte red,
+																			 UnsignedByte green,
+																			 UnsignedByte blue,
+																			 UnsignedByte alpha )
+{
 
 	return GameMakeColor( red, green, blue, alpha );
 
-}  // end WinMakeColor
+}
 
 // GameWindowManager::winFormatText ===========================================
 /** draw text to the screen */
@@ -161,12 +160,12 @@ void GameWindowManager::winFormatText( GameFont *font, UnicodeString text, Color
 
 	/// @todo make all display string rendering go through here!
 
-}  // end WinFormatText
+}
 
 // GameWindowManager::winGetTextSize ==========================================
 /** get the extent size of text */
 //=============================================================================
-void GameWindowManager::winGetTextSize( GameFont *font, UnicodeString text, 
+void GameWindowManager::winGetTextSize( GameFont *font, UnicodeString text,
 																				Int *width, Int *height, Int maxWidth )
 {
 
@@ -178,17 +177,20 @@ void GameWindowManager::winGetTextSize( GameFont *font, UnicodeString text,
 	if( height )
 		*height = 0;
 
-}  // end WinGetTextSize
+}
 
 // GameWindowManager::winFontHeight ===========================================
 /** Return the font height in pixels */
 //=============================================================================
 Int GameWindowManager::winFontHeight( GameFont *font )
 {
-	
+
+	if (font == NULL)
+		return 0;
+
 	return font->height;
 
-}  // end WinFontHeight
+}
 
 // GameWindowManager::winIsDigit ==============================================
 /** You implementation of whether or not character is a digit */
@@ -196,9 +198,9 @@ Int GameWindowManager::winFontHeight( GameFont *font )
 Int GameWindowManager::winIsDigit( Int c )
 {
 
-	return GameIsDigit( c );
+	return iswdigit( c );
 
-}  // end WinIsDigit
+}
 
 // GameWindowManager::winIsAscii ==============================================
 /** You implementation of whether or not character is ascii */
@@ -206,9 +208,9 @@ Int GameWindowManager::winIsDigit( Int c )
 Int GameWindowManager::winIsAscii( Int c )
 {
 
-	return GameIsAscii( c );
+	return iswascii( c );
 
-}  // end WinIsDigit
+}
 
 // GameWindowManager::winIsAlNum ==============================================
 /** Your implementation of whether or not character is alpha numeric */
@@ -216,15 +218,15 @@ Int GameWindowManager::winIsAscii( Int c )
 Int GameWindowManager::winIsAlNum( Int c )
 {
 
-	return GameIsAlNum( c );
+	return iswalnum( c );
 
-}  // end WinIsAlNum
+}
 
 // GameWindowManager::winFindFont =============================================
 /** Get a font */
 //=============================================================================
-GameFont *GameWindowManager::winFindFont( AsciiString fontName, 
-																					Int pointSize, 
+GameFont *GameWindowManager::winFindFont( AsciiString fontName,
+																					Int pointSize,
 																					Bool bold )
 {
 
@@ -234,5 +236,5 @@ GameFont *GameWindowManager::winFindFont( AsciiString fontName,
 
 	return NULL;
 
-}  // end WinFindFont
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
index 597310d87ca..2d43ebcc48e 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
@@ -29,7 +29,7 @@
 //						with to interact with the game windowing system.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Debug.h"
 #include "Common/Language.h"
@@ -61,11 +61,6 @@ UnsignedInt WindowLayoutCurrentVersion = 2;
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //
 // with this statis set to true, the window system will propogate mouse position
@@ -120,13 +115,14 @@ void GameWindowManager::processDestroyList( void )
 		// send the destroy message to the window we're about to kill
 		winSendSystemMsg( doDestroy, GWM_DESTROY, 0, 0 );
 
+		DEBUG_ASSERTCRASH(doDestroy->winGetUserData() == NULL, ("Win user data is expected to be deleted now"));
+
 		// free the memory
-		if (doDestroy)
-			deleteInstance(doDestroy);
+		deleteInstance(doDestroy);
 
-	}  // end for
+	}
 
-}  // end processDestroyList
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -150,11 +146,11 @@ WindowMsgHandledType PassSelectedButtonsToParentSystem( GameWindow *window, Unsi
 		if( parent )
 			return TheWindowManager->winSendSystemMsg( parent, msg, mData1, mData2 );
 
-	}  // end if
-	
+	}
+
 	return MSG_IGNORED;
 
-}  // end PassSelectedButtonsToParentSystem
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Generic function to simply propagate only button press messages to parent and let it deal with it */
@@ -172,10 +168,10 @@ WindowMsgHandledType PassMessagesToParentSystem( GameWindow *window, UnsignedInt
 
 	if( parent )
 		return TheWindowManager->winSendSystemMsg( parent, msg, mData1, mData2 );
-	
+
 	return MSG_IGNORED;
 
-}  // end PassSelectedButtonsToParentSystem
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -198,7 +194,7 @@ GameWindowManager::GameWindowManager( void )
 	m_cursorBitmap = NULL;
 	m_captureFlags = 0;
 
-}  // end GameWindowManger
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -208,10 +204,10 @@ GameWindowManager::~GameWindowManager( void )
 	// destroy all windows
 	winDestroyAll();
 	freeStaticStrings();
-	if(TheTransitionHandler)
-		delete TheTransitionHandler;
+
+	delete TheTransitionHandler;
 	TheTransitionHandler = NULL;
-}  // end ~GameWindowManager
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the game window manager system */
@@ -222,7 +218,7 @@ void GameWindowManager::init( void )
 		TheTransitionHandler = NEW GameWindowTransitionsHandler;
 	TheTransitionHandler->load();
 	TheTransitionHandler->init();
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset window system */
@@ -235,7 +231,7 @@ void GameWindowManager::reset( void )
 	if(TheTransitionHandler)
 		TheTransitionHandler->reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update cycle for game widnow manager */
@@ -247,7 +243,7 @@ void GameWindowManager::update( void )
 	processDestroyList();
 	if(TheTransitionHandler)
 		TheTransitionHandler->update();
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Puts a window at the head of the window list */
@@ -279,7 +275,7 @@ void GameWindowManager::linkWindow( GameWindow *window )
 
 		if( m_windowList )
 			m_windowList->m_prev = window;
-		else 
+		else
 		{
 			// first on list is also the tail
 			m_windowTail = window;
@@ -299,29 +295,29 @@ void GameWindowManager::linkWindow( GameWindow *window )
 		}
 	}
 
-}  // end linkWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Insert the window ahead of the the 'aheadOf' window.  'aheadOf' can
 	* be a window in the master list or a child of any window in that master
 	* list */
 //-------------------------------------------------------------------------------------------------
-void GameWindowManager::insertWindowAheadOf( GameWindow *window, 
+void GameWindowManager::insertWindowAheadOf( GameWindow *window,
 																						 GameWindow *aheadOf )
 {
-	
+
 	// sanity
 	if( window == NULL )
 		return;
 
 	// we'll say that an aheadOf window means at the head of the list
-	if( aheadOf == NULL )	
+	if( aheadOf == NULL )
 	{
 
 		linkWindow( window );
 		return;
 
-	}  // end if
+	}
 
 	// get parent of aheadOf
 	GameWindow *aheadOfParent = aheadOf->winGetParent();
@@ -343,7 +339,7 @@ void GameWindowManager::insertWindowAheadOf( GameWindow *window,
 		aheadOf->m_prev = window;
 		window->m_next = aheadOf;
 
-	}  // end if
+	}
 	else
 	{
 
@@ -359,9 +355,9 @@ void GameWindowManager::insertWindowAheadOf( GameWindow *window,
 
 		window->m_parent = aheadOfParent;
 
-	}  // end else
+	}
 
-}  // end insertWindowAheadOf
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Takes a window off the window list */
@@ -371,7 +367,7 @@ void GameWindowManager::unlinkWindow( GameWindow *window )
 
 	if( window->m_next )
 		window->m_next->m_prev = window->m_prev;
-	else 
+	else
 	{
 		// no next means this is the tail
 		m_windowTail = window->m_prev;
@@ -382,7 +378,7 @@ void GameWindowManager::unlinkWindow( GameWindow *window )
 	else
 		m_windowList = window->m_next;
 
-}  // end unlinkWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Takes a child window off its parent's window list */
@@ -390,7 +386,7 @@ void GameWindowManager::unlinkWindow( GameWindow *window )
 void GameWindowManager::unlinkChildWindow( GameWindow *window )
 {
 
-	if( window->m_prev ) 
+	if( window->m_prev )
 	{
 
 		window->m_prev->m_next = window->m_next;
@@ -398,11 +394,11 @@ void GameWindowManager::unlinkChildWindow( GameWindow *window )
 		if( window->m_next )
 			window->m_next->m_prev = window->m_prev;
 
-	} 
-	else 
+	}
+	else
 	{
 
-		if( window->m_next ) 
+		if( window->m_next )
 		{
 
 			window->m_parent->m_child = window->m_next;
@@ -411,20 +407,20 @@ void GameWindowManager::unlinkChildWindow( GameWindow *window )
 
 			window->m_next = NULL;
 
-		} 
-		else 
+		}
+		else
 		{
 
 			window->m_parent->m_child = NULL;
 
 		}
 
-	}  // end else
+	}
 
 	// remove the parent reference from this window
 	window->m_parent = NULL;
 
-}  // end unlinkChildWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Check window and parents to see if this window is enabled */
@@ -435,7 +431,7 @@ Bool GameWindowManager::isEnabled( GameWindow *win )
 	// sanity
 	if( win == NULL )
 		return FALSE;
-	
+
 	if( BitIsSet( win->m_status, WIN_STATUS_ENABLED ) == FALSE )
 	{
 		return FALSE;
@@ -452,7 +448,7 @@ Bool GameWindowManager::isEnabled( GameWindow *win )
 
 	return TRUE;
 
-}  // end isEnabled
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Check window and parents to see if this window is hidden */
@@ -463,7 +459,7 @@ Bool GameWindowManager::isHidden( GameWindow *win )
 	// we'll allow for the idea that if a window doesn't exist it is hidden
 	if( win == NULL )
 		return TRUE;
-	
+
 	if( BitIsSet( win->m_status, WIN_STATUS_HIDDEN ))
 	{
 		return TRUE;
@@ -480,15 +476,15 @@ Bool GameWindowManager::isHidden( GameWindow *win )
 
 	return FALSE;
 
-}  // end isHidden
+}
 
 //-------------------------------------------------------------------------------------------------
 // Adds a child window to its parent.
 //-------------------------------------------------------------------------------------------------
-void GameWindowManager::addWindowToParent( GameWindow *window, 
+void GameWindowManager::addWindowToParent( GameWindow *window,
 																					 GameWindow *parent )
 {
-	if( parent ) 
+	if( parent )
 	{
 
 		// add to parent's list of children
@@ -504,13 +500,13 @@ void GameWindowManager::addWindowToParent( GameWindow *window,
 
 	}
 
-}  // end addWindowToParent
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Add a child window to the parent, put place it at the end of the 
+/** Add a child window to the parent, put place it at the end of the
 	* parent window child list */
 //-------------------------------------------------------------------------------------------------
-void GameWindowManager::addWindowToParentAtEnd( GameWindow *window,	
+void GameWindowManager::addWindowToParentAtEnd( GameWindow *window,
 																								GameWindow *parent )
 {
 
@@ -532,16 +528,16 @@ void GameWindowManager::addWindowToParentAtEnd( GameWindow *window,
 			last->m_next = window;
 			window->m_prev = last;
 
-		}  // end if
+		}
 		else
 			parent->m_child = window;
 
 		// assign the parent to the window
 		window->m_parent = parent;
 
-	}  // end if
+	}
 
-}  // end addWindowToParentAtEnd
+}
 
 //-------------------------------------------------------------------------------------------------
 /** this gets called from winHide() when a window hides itself */
@@ -570,49 +566,49 @@ void GameWindowManager::windowHiding( GameWindow *window )
 	for( child = window->winGetChild(); child; child = child->winGetNext() )
 		windowHiding( child );
 
-}  // end windowHiding
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Hide all windows in a certain range of id's (inclusive) */
 //-------------------------------------------------------------------------------------------------
-void GameWindowManager::hideWindowsInRange( GameWindow *baseWindow, 
-																						Int first, Int last, 
+void GameWindowManager::hideWindowsInRange( GameWindow *baseWindow,
+																						Int first, Int last,
 																						Bool hideFlag )
 {
 	Int i;
 	GameWindow *window;
 
-	for( i = first; i <= last; i++ ) 
+	for( i = first; i <= last; i++ )
 	{
 
 		window = winGetWindowFromId( baseWindow, i );
 		if( window )
 			window->winHide( hideFlag );
 
-	}  // end for i
+	}
 
-}  // end hideWindowsInRange
+}
 
 //-------------------------------------------------------------------------------------------------
 // Enable all windows in a certain range of id's (inclusive)
 //-------------------------------------------------------------------------------------------------
-void GameWindowManager::enableWindowsInRange( GameWindow *baseWindow, 
-																							Int first, Int last, 
+void GameWindowManager::enableWindowsInRange( GameWindow *baseWindow,
+																							Int first, Int last,
 																							Bool enableFlag )
 {
 	Int i;
 	GameWindow *window;
 
-	for( i =first; i <= last; i++ ) 
+	for( i =first; i <= last; i++ )
 	{
 
 		window = winGetWindowFromId( baseWindow, i );
 		if( window )
 			window->winEnable( enableFlag );
 
-	}  // end for i
+	}
 
-}  // end enableWindowsInRange
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Captures the mouse capture. */
@@ -627,7 +623,7 @@ Int GameWindowManager::winCapture( GameWindow *window )
 
 	return WIN_ERR_OK;
 
-}  // end WinCapture
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Releases the mouse capture. */
@@ -640,7 +636,7 @@ Int GameWindowManager::winRelease( GameWindow *window )
 
 	return WIN_ERR_OK;
 
-}  // end WinRelease
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Returns the current mouse captor. */
@@ -650,7 +646,7 @@ GameWindow *GameWindowManager::winGetCapture( void )
 
 	return m_mouseCaptor;
 
-}  // end WinGetCapture
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Gets the window pointer from its id */
@@ -661,25 +657,25 @@ GameWindow *GameWindowManager::winGetWindowFromId( GameWindow *window, Int id )
 	if( window == NULL )
 		window = m_windowList;
 
-	for( ; window; window = window->m_next ) 
+	for( ; window; window = window->m_next )
 	{
 
 		if( window->winGetWindowId() == id)
 			return window;
-		else if( window->m_child ) 
+		else if( window->m_child )
 		{
 			GameWindow *child = winGetWindowFromId( window->m_child, id );
 
 			if( child )
 				return child;
 
-		}  // end else if
+		}
 
-	}  // end for
+	}
 
 	return NULL;
 
-}  // end WinGetWindowFromId
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Gets the Window List Pointer */
@@ -689,14 +685,14 @@ GameWindow *GameWindowManager::winGetWindowList( void )
 
 	return m_windowList;
 
-}  // end winGetWindowList
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Send a system message to the specified window */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType GameWindowManager::winSendSystemMsg( GameWindow *window, 
+WindowMsgHandledType GameWindowManager::winSendSystemMsg( GameWindow *window,
 																					UnsignedInt msg,
-																					WindowMsgData mData1, 
+																					WindowMsgData mData1,
 																					WindowMsgData mData2 )
 {
 
@@ -708,14 +704,14 @@ WindowMsgHandledType GameWindowManager::winSendSystemMsg( GameWindow *window,
 
 	return window->m_system( window, msg, mData1, mData2 );
 
-}  // end winSendSystemMsg
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Send a system message to the specified window */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType GameWindowManager::winSendInputMsg( GameWindow *window, 
+WindowMsgHandledType GameWindowManager::winSendInputMsg( GameWindow *window,
 																				 UnsignedInt msg,
-																				 WindowMsgData mData1, 
+																				 WindowMsgData mData1,
 																				 WindowMsgData mData2 )
 {
 
@@ -727,7 +723,7 @@ WindowMsgHandledType GameWindowManager::winSendInputMsg( GameWindow *window,
 
 	return window->m_input( window, msg, mData1, mData2 );
 
-}  // end winSendInputMsg
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the current input focus */
@@ -737,7 +733,7 @@ GameWindow *GameWindowManager::winGetFocus( void )
 
 	return m_keyboardFocus;
 
-}  // end WinGetFocus
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the current input focus */
@@ -765,7 +761,7 @@ Int GameWindowManager::winSetFocus( GameWindow *window )
 	m_keyboardFocus = window;
 
 	// Tell new focus window that it has focus
-	if( m_keyboardFocus ) 
+	if( m_keyboardFocus )
 	{
 
 		for (;;)
@@ -779,7 +775,7 @@ Int GameWindowManager::winSetFocus( GameWindow *window )
 				break;
 		}
 
-	}  // end if
+	}
 
 	// If new window doesn't want focus, set focus to NULL
 	if( wantsFocus == FALSE )
@@ -787,12 +783,12 @@ Int GameWindowManager::winSetFocus( GameWindow *window )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetFocus
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Process key press through the GUI. */
 //-------------------------------------------------------------------------------------------------
-WinInputReturnCode GameWindowManager::winProcessKey( UnsignedByte key, 
+WinInputReturnCode GameWindowManager::winProcessKey( UnsignedByte key,
 																										 UnsignedByte state )
 {
 	WinInputReturnCode returnCode = WIN_INPUT_NOT_USED;
@@ -801,7 +797,7 @@ WinInputReturnCode GameWindowManager::winProcessKey( UnsignedByte key,
 	if( m_keyboardFocus && (key != KEY_NONE) )
 	{
 		GameWindow *win = m_keyboardFocus;
-			
+
 		returnCode = WIN_INPUT_USED;  // assume input will be used
 
 		//
@@ -818,15 +814,15 @@ WinInputReturnCode GameWindowManager::winProcessKey( UnsignedByte key,
 				returnCode = WIN_INPUT_NOT_USED;  // oops, it wasn't used after all
 				break;
 
-			}  // end if
+			}
 
-		}  // end while
+		}
 
-	}  // end if
+	}
 
 	return returnCode;
 
-}  // end winProcessKey
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Process a single mouse event through the window system */
@@ -840,7 +836,6 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 	UnsignedInt packedMouseCoords;
 	GameWindow *window = NULL;
 	GameWindow *toolTipWindow = NULL;
-	GameWindow *childWindow;
 	Int dx, dy;
 	Bool clearGrabWindow = FALSE;
 
@@ -888,9 +883,9 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 
 					win = win->winGetParent();
 
-				}  // end while
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -898,11 +893,11 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 				if(	winSendInputMsg( m_mouseCaptor, msg, packedMouseCoords, 0 ) == MSG_HANDLED )
 					returnCode = WIN_INPUT_USED;
 
-			}  // end else
+			}
 
-		}  // end if
+		}
 
-	}  // end if, mouse captor window present
+	}
 	else
 	{
 
@@ -930,7 +925,7 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 					clearGrabWindow = TRUE;
 					break;
 
-				}  // end left up
+				}
 
 				// --------------------------------------------------------------------
 				case MOUSE_EVENT_NONE:
@@ -973,33 +968,33 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 							newRegion.lo.x = 0;
 						if( newRegion.lo.y < 0 )
 							newRegion.lo.y = 0;
-						
+
 						newRegion.hi.x = newRegion.lo.x + grabSize.x;
 						newRegion.hi.y = newRegion.lo.y + grabSize.y;
 						if( newRegion.hi.x > (Int)TheDisplay->getWidth() )
 							newRegion.hi.x = (Int)TheDisplay->getWidth();
 						if( newRegion.hi.y > (Int)TheDisplay->getHeight() )
 							newRegion.hi.y = (Int)TheDisplay->getHeight();
-						
+
 						newRegion.lo.x = newRegion.hi.x - grabSize.x;
 						newRegion.lo.y = newRegion.hi.y - grabSize.y;
 
 						m_grabWindow->winSetPosition( newRegion.lo.x, newRegion.lo.y );
 
-					}  // end if, draggable window
+					}
 
 					// Send mouse drag message
 					winSendInputMsg( m_grabWindow, msg, packedMouseCoords, 0 );
 					break;
 
-				}  // end mouse event none or left drag
+				}
 
-			}  // end switch
+			}
 
 			// mark event handled
 			returnCode = WIN_INPUT_USED;
 
-		}  // end if, m_grabWindow
+		}
 		else
 		{
 
@@ -1009,112 +1004,17 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 			}
 			else
 			{
-			
-				/**@todo Colin, there are 3 cases here that are nearly identical code,
-				break them up into functions with parameters */
-
 				// search for top-level window which contains pointer
-				for( window = m_windowList; window; window = window->m_next )
-				{
-
-					if( BitIsSet( window->m_status, WIN_STATUS_ABOVE ) &&
-							!BitIsSet( window->m_status, WIN_STATUS_HIDDEN ) &&
-							mousePos->x >= window->m_region.lo.x &&
-							mousePos->x <= window->m_region.hi.x &&
-							mousePos->y >= window->m_region.lo.y &&
-							mousePos->y <= window->m_region.hi.y)
-					{
-
-						childWindow = window->winPointInAnyChild( mousePos->x, mousePos->y, TRUE, TRUE );
-						if( toolTipWindow == NULL )
-						{
-							if( childWindow->m_tooltip || 
-									childWindow->m_instData.getTooltipTextLength() )
-							{
-								toolTipWindow = childWindow;
-							}
-						}
-						if( BitIsSet( window->m_status, WIN_STATUS_ENABLED ) )
-						{
-							// determine which child window the mouse is in
-							window = window->winPointInChild( mousePos->x, mousePos->y );
-							break;  // exit for
-						}
-						
-					}  // end if
-
-				}  // end for window
+				window = findWindowUnderMouse(toolTipWindow, mousePos, WIN_STATUS_ABOVE, WIN_STATUS_HIDDEN);
 
 				// check !above, below and hidden
 				if( window == NULL )
-				{
-
-					for( window = m_windowList; window; window = window->m_next )
-					{
-
-						if( !BitIsSet( window->m_status, WIN_STATUS_ABOVE | 
-																						WIN_STATUS_BELOW | 
-																						WIN_STATUS_HIDDEN ) &&
-								mousePos->x >= window->m_region.lo.x &&
-								mousePos->x <= window->m_region.hi.x &&
-								mousePos->y >= window->m_region.lo.y &&
-								mousePos->y <= window->m_region.hi.y)
-						{
-
-							childWindow = window->winPointInAnyChild( mousePos->x, mousePos->y, TRUE, TRUE );
-							if( toolTipWindow == NULL )
-							{
-								if( childWindow->m_tooltip || 
-										childWindow->m_instData.getTooltipTextLength() )
-								{
-									toolTipWindow = childWindow;
-								}
-							}
-							if( BitIsSet( window->m_status, WIN_STATUS_ENABLED ))
-							{								
-								// determine which child window the mouse is in
-								window = window->winPointInChild( mousePos->x, mousePos->y );
-								break;  // exit for
-							}
-						}
-					}
-				}  // end if, window == NULL
+					window = findWindowUnderMouse(toolTipWindow, mousePos, WIN_STATUS_NONE, WIN_STATUS_ABOVE | WIN_STATUS_BELOW | WIN_STATUS_HIDDEN);
 
 				// check below and !hidden
 				if( window == NULL )
-				{
-
-					for( window = m_windowList; window; window = window->m_next )
-					{
-
-						if( BitIsSet( window->m_status, WIN_STATUS_BELOW ) &&
-								!BitIsSet( window->m_status, WIN_STATUS_HIDDEN ) &&
-								mousePos->x >= window->m_region.lo.x &&
-								mousePos->x <= window->m_region.hi.x &&
-								mousePos->y >= window->m_region.lo.y &&
-								mousePos->y <= window->m_region.hi.y)
-						{
-
-							childWindow = window->winPointInAnyChild( mousePos->x, mousePos->y, TRUE, TRUE );
-							if( toolTipWindow == NULL )
-							{
-								if( childWindow->m_tooltip || 
-										childWindow->m_instData.getTooltipTextLength() )
-								{
-									toolTipWindow = childWindow;
-								}
-							}
-							if( BitIsSet( window->m_status, WIN_STATUS_ENABLED ))
-							{
-								// determine which child window the mouse is in
-								window = window->winPointInChild( mousePos->x, mousePos->y );
-								break;  // exit for
-							}
-						}
-					}
-				}  // end if
-
-			}  // end else, no modal head
+					window = findWindowUnderMouse(toolTipWindow, mousePos, WIN_STATUS_BELOW, WIN_STATUS_HIDDEN);
+			}
 
 			if( window )
 				if( BitIsSet( window->m_status, WIN_STATUS_NO_INPUT ) )
@@ -1137,7 +1037,7 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 				{
 
 					tempWin = window;
-	
+
 					// Give everyone a chance to do something with the clicks
 					GameWindow *oldLoneWindow = m_loneWindow;
 					while( winSendInputMsg( tempWin, msg, packedMouseCoords, 0 ) == MSG_IGNORED )
@@ -1147,11 +1047,11 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 						if( tempWin == NULL )
 							break;
 
-					}  // end while
+					}
+
 
-						
 					// First check to see if m_loneWindow is set if so, close the window
-					if( m_loneWindow && m_loneWindow == oldLoneWindow 
+					if( m_loneWindow && m_loneWindow == oldLoneWindow
 					&&( msg == GWM_LEFT_UP || msg == GWM_MIDDLE_UP || msg == GWM_RIGHT_UP || tempWin))
 					{
 						if(!m_loneWindow->winIsChild(tempWin))
@@ -1167,11 +1067,11 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 																cData->listboxData->slider != tempWin &&
 																cData->listboxData->slider != tempWin->winGetParent())
 																	winSetOpenComboBoxWindow( NULL );*/
-								
+
 					}
 					if( tempWin )
 					{
-					
+
 						//
 						// Someone cares, if this is a left button down event
 						// it should get "grabbed"
@@ -1180,20 +1080,20 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 						if( msg == GWM_LEFT_DOWN )
 						{
 
-//						if( tempWin != windowList ) 
+//						if( tempWin != windowList )
 //							WinActivate( tempWin );
 							m_grabWindow = tempWin;
 
-						}  // end if
+						}
 
 						// event is used
 						returnCode = WIN_INPUT_USED;
 
-					}  // end if, tempWin
+					}
 
-				}  // end if
+				}
 
-			}  // end if( window ) 
+			}
 
 			if( toolTipWindow == NULL )
 			{
@@ -1201,7 +1101,7 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 				if( isHidden( window ) == FALSE )
 					toolTipWindow = window;
 
-			}  // end if
+			}
 
 			// if tooltips are on set them into the window
 			Bool tooltipsOn = TRUE;
@@ -1213,34 +1113,34 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 				{
 					// do we have a callback to call for the tooltip
 					if( toolTipWindow->m_tooltip )
-						toolTipWindow->m_tooltip( toolTipWindow, 
-																			&toolTipWindow->m_instData, 
+						toolTipWindow->m_tooltip( toolTipWindow,
+																			&toolTipWindow->m_instData,
 																			packedMouseCoords );
 
 					// else, do we have a normal tooltip to set
 					else if( toolTipWindow->m_instData.getTooltipTextLength() )
 						TheMouse->setCursorTooltip( toolTipWindow->m_instData.getTooltipText(), toolTipWindow->m_instData.m_tooltipDelay );
 
-				}  // end if
+				}
 				else
 				{
 
 					//
 					// not pointing at a window... perhaps we are pointing at a valid
-					// tooltip-able object in the game world ... let's set a flag so 
+					// tooltip-able object in the game world ... let's set a flag so
 					// during the object testing we can set the tooltip, we can do
 					// whatever we like now that we know no other tooltip was set from
 					// a window
 					//
 					objectTooltip = TRUE;
 
-				}  // end else
+				}
 
-			}  // end if
+			}
 
-		}  // end if grabWindow not present
+		}
 
-	}  // end else (mouseCaptor) 
+	}
 
 	//
 	// check if new current window is different from the last
@@ -1261,7 +1161,7 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 
 		m_currMouseRgn = window;
 
-	}  // end if
+	}
 
 	// clear grabWindow if necessary
 	if( clearGrabWindow == TRUE )
@@ -1270,17 +1170,52 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 		m_grabWindow = NULL;
 		clearGrabWindow = FALSE;
 
-	}  // end if
+	}
 
 	return returnCode;
 
-}  // end winProcessMouseEvent
+}
+
+bool GameWindowManager::isMouseWithinWindow(GameWindow* window, const ICoord2D* mousePos, unsigned int requiredStatusMask, unsigned int forbiddenStatusMask)
+{
+	return ((BitIsSet(window->m_status, requiredStatusMask) || requiredStatusMask == 0) &&
+		!BitIsSet(window->m_status, forbiddenStatusMask) &&
+		mousePos->x >= window->m_region.lo.x &&
+		mousePos->x <= window->m_region.hi.x &&
+		mousePos->y >= window->m_region.lo.y &&
+		mousePos->y <= window->m_region.hi.y);
+}
+
+GameWindow* GameWindowManager::findWindowUnderMouse(GameWindow*& toolTipWindow, const ICoord2D* mousePos, unsigned int requiredStatusMask, unsigned int forbiddenStatusMask)
+{
+	for (GameWindow* window = m_windowList; window; window = window->m_next)
+	{
+		if (!isMouseWithinWindow(window, mousePos, requiredStatusMask, forbiddenStatusMask))
+			continue;
+
+		if (toolTipWindow == NULL)
+		{
+			GameWindow* childWindow = window->winPointInAnyChild(mousePos->x, mousePos->y, TRUE, TRUE);
+
+			if (childWindow->m_tooltip || childWindow->m_instData.getTooltipTextLength())
+				toolTipWindow = childWindow;
+		}
+
+		if (BitIsSet(window->m_status, WIN_STATUS_ENABLED))
+		{
+			// determine which child window the mouse is in
+			return window->winPointInChild(mousePos->x, mousePos->y);
+		}
+	}
+
+	return NULL;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw a window and its children, in parent-first order.
 	* Children's coordinates are relative to their parents.
 	* Note that hidden windows automatically will not draw any
-	* of their children ... but see-thru windows only will not 
+	* of their children ... but see-thru windows only will not
 	* draw themselves, but will give their children an
 	* opportunity to draw */
 //-------------------------------------------------------------------------------------------------
@@ -1321,11 +1256,11 @@ Int GameWindowManager::drawWindow( GameWindow *window )
 					!BitIsSet( window->m_status, WIN_STATUS_SEE_THRU ) )
 				window->winDrawBorder();
 
-	}  // end if
+	}
 
 	return WIN_ERR_OK;
 
-}  // end drawWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw the GUI in reverse order to correlate with clicking priority */
@@ -1348,7 +1283,7 @@ void GameWindowManager::winRepaint( void )
 	{
 		next = window->m_prev;
 
-		if (BitIsSet( window->m_status, WIN_STATUS_ABOVE | 
+		if (BitIsSet( window->m_status, WIN_STATUS_ABOVE |
 																	 WIN_STATUS_BELOW ) == FALSE)
 			drawWindow( window );
 	}
@@ -1364,7 +1299,7 @@ void GameWindowManager::winRepaint( void )
 
 	if(TheTransitionHandler)
 		TheTransitionHandler->draw();
-}  // end WinRepaint
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Dump information about all the windows for resource problems */
@@ -1377,21 +1312,21 @@ void GameWindowManager::dumpWindow( GameWindow *window )
 	if( window == NULL )
 		return;
 
-	DEBUG_LOG(( "ID: %d\tRedraw: 0x%08X\tUser Data: %d\n",
+	DEBUG_LOG(( "ID: %d\tRedraw: 0x%08X\tUser Data: %d",
 				 	 window->winGetWindowId(), window->m_draw, window->m_userData ));
-	
+
 	for( child = window->m_child; child; child = child->m_next )
 		dumpWindow( child );
 
 	return;
 #endif
-}  // end dumpWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a new window by setting up its parameters and callbacks. */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::winCreate( GameWindow *parent, 
-																				  UnsignedInt status, 
+GameWindow *GameWindowManager::winCreate( GameWindow *parent,
+																				  UnsignedInt status,
 																				  Int x, Int y,
 																				  Int width, Int height,
 																					GameWinSystemFunc system,
@@ -1404,7 +1339,7 @@ GameWindow *GameWindowManager::winCreate( GameWindow *parent,
 	if( window == NULL )
 	{
 
-		DEBUG_LOG(( "WinCreate error: Could not allocate new window\n" ));
+		DEBUG_LOG(( "WinCreate error: Could not allocate new window" ));
 #ifndef FINAL
 		{
 			GameWindow *win;
@@ -1416,7 +1351,7 @@ GameWindow *GameWindowManager::winCreate( GameWindow *parent,
 
 		return NULL;
 
-	}  // endif
+	}
 
 	// If this is a child window add it to the parent's window list
 	if( parent )
@@ -1451,11 +1386,11 @@ GameWindow *GameWindowManager::winCreate( GameWindow *parent,
 			TheGlobalLanguageData->m_defaultWindowFont.bold) );
 	}
 	else
-		window->winSetFont( winFindFont( AsciiString("Times New Roman"), 14, FALSE ) );
+		window->winSetFont( winFindFont( "Times New Roman", 14, FALSE ) );
 
 	return window;
 
-}  // end WinCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Take a window and its children off the top level list and free
@@ -1464,7 +1399,7 @@ GameWindow *GameWindowManager::winCreate( GameWindow *parent,
 Int GameWindowManager::winDestroy( GameWindow *window )
 {
 	GameWindow *child, *next;
-	
+
 	if( window == NULL )
 		return WIN_ERR_INVALID_WINDOW;
 
@@ -1473,7 +1408,7 @@ Int GameWindowManager::winDestroy( GameWindow *window )
 	// completely handled by the editor ONLY
 	//
 	DEBUG_ASSERTCRASH( window->winGetEditData() == NULL,
-										 ("winDestroy(): edit data should NOT be present!\n") );
+										 ("winDestroy(): edit data should NOT be present!") );
 
 	if( BitIsSet( window->m_status, WIN_STATUS_DESTROYED ) )
 		return WIN_ERR_OK;
@@ -1523,7 +1458,7 @@ Int GameWindowManager::winDestroy( GameWindow *window )
 
 	return WIN_ERR_OK;
 
-}  // winDestroy
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Destroy all windows on the window list IMMEDIATELY */
@@ -1536,7 +1471,7 @@ Int GameWindowManager::winDestroyAll( void )
 	// NOTE that it is CRITICAL that the windows be destroyed this way,
 	// the editor has windows that are not on this main list that must
 	// exist throughout a reset of the system (copy/paste for instance)
-	// so DO NOT ever change this to a clever pool of memory for the 
+	// so DO NOT ever change this to a clever pool of memory for the
 	// windows and reset the _pool_ ... I will have to kill you!  CBD
 	//
 
@@ -1546,14 +1481,14 @@ Int GameWindowManager::winDestroyAll( void )
 
 		winDestroy( win );
 
-	}  // end for
+	}
 
 	// Destroy All Windows just added to destroy list
 	processDestroyList();
 
 	return WIN_ERR_OK;
 
-}  // end WinDestroyAll
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Sets selected window into a modal state.  This window will get
@@ -1587,7 +1522,7 @@ Int GameWindowManager::winSetModal( GameWindow *window )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetModal
+}
 
 //-------------------------------------------------------------------------------------------------
 /** pops window off of the modal stack.  If this window is not the top
@@ -1605,11 +1540,11 @@ Int GameWindowManager::winUnsetModal( GameWindow *window )
 	{
 
 		// return error if not
-		DEBUG_LOG(( "WinUnsetModal: Invalid window attempting to unset modal (%d)\n", 
+		DEBUG_LOG(( "WinUnsetModal: Invalid window attempting to unset modal (%d)",
 								window->winGetWindowId() ));
 		return WIN_ERR_GENERAL_FAILURE;
 
-	}  // end if
+	}
 
 	// remove from top of list
 	next = m_modalHead->next;
@@ -1618,7 +1553,7 @@ Int GameWindowManager::winUnsetModal( GameWindow *window )
 
 	return WIN_ERR_OK;
 
-}  // end WinUnsetModal
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the grabbed window */
@@ -1628,7 +1563,7 @@ GameWindow *GameWindowManager::winGetGrabWindow( void )
 
 	return m_grabWindow;
 
-}  // end WinGetGrabWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Explicitly set the grab window */
@@ -1638,7 +1573,7 @@ void GameWindowManager::winSetGrabWindow( GameWindow *window )
 
 	m_grabWindow = window;
 
-}  // end winSetGrabWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Explicitly set the grab window */
@@ -1649,10 +1584,10 @@ void GameWindowManager::winSetLoneWindow( GameWindow *window )
 	if( m_loneWindow == window )
 		return;
 	if( m_loneWindow )
-		TheWindowManager->winSendSystemMsg( m_loneWindow, GGM_CLOSE, 0, 0 );
+		winSendSystemMsg( m_loneWindow, GGM_CLOSE, 0, 0 );
 	m_loneWindow = window;
 
-}  // end winSetGrabWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a Modal Message Box */
@@ -1683,9 +1618,9 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 	GameWindow *trueParent = NULL;
 	//Changed by Chris
 	if(useLogo)
-		trueParent = winCreateFromScript( AsciiString("Menus/QuitMessageBox.wnd") ); 
+		trueParent = winCreateFromScript( "Menus/QuitMessageBox.wnd" );
 	else
-		trueParent = winCreateFromScript( AsciiString("Menus/MessageBox.wnd") ); 
+		trueParent = winCreateFromScript( "Menus/MessageBox.wnd" );
 	//Added By Chris
 	AsciiString menuName;
 	if(useLogo)
@@ -1695,13 +1630,13 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 
 	AsciiString tempName;
 	GameWindow *parent = NULL;
-	
+
 	tempName = menuName;
 	tempName.concat("MessageBoxParent");
-	parent = TheWindowManager->winGetWindowFromId(trueParent, TheNameKeyGenerator->nameToKey( tempName ));
-	TheWindowManager->winSetModal( trueParent ); 
-	TheWindowManager->winSetFocus( NULL ); // make sure we lose focus from other windows even if we refuse focus ourselves
-	TheWindowManager->winSetFocus( parent	 );
+	parent = winGetWindowFromId(trueParent, TheNameKeyGenerator->nameToKey( tempName ));
+	winSetModal( trueParent );
+	winSetFocus( NULL ); // make sure we lose focus from other windows even if we refuse focus ourselves
+	winSetFocus( parent	 );
 
 	// If the user wants the size to be different then the default
 	float ratioX, ratioY = 1;
@@ -1714,8 +1649,8 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 		ratioX = (float)width / (float)temp.x;
 		ratioY = (float)height / (float)temp.y;
 		//Set the window's new size
-		parent->winSetSize( width, height);	
-	
+		parent->winSetSize( width, height);
+
 		//Resize/reposition all the children windows based off the ratio
 		GameWindow *child;
 		for( child = parent->winGetChild(); child; child = child->winGetNext() )
@@ -1731,47 +1666,47 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 			child->winSetPosition(temp.x, temp.y);
 		}
 	}
-	
+
 	// If the user wants to position the message box somewhere other then default
 	if( x >= 0 && y >= 0)
-		parent->winSetPosition(x, y);	
-	
-	// Reposition the buttons 
+		parent->winSetPosition(x, y);
+
+	// Reposition the buttons
 	Int buttonX[3], buttonY[3];
-		 	
+
 	//In the layout, buttonOk will be in the first button position
 	NameKeyType buttonOkID = NAMEKEY_INVALID;
-	
+
 	tempName = menuName;
 	tempName.concat("ButtonOk");
 	buttonOkID = TheNameKeyGenerator->nameToKey( tempName );
-	GameWindow *buttonOk = TheWindowManager->winGetWindowFromId(parent, buttonOkID);
+	GameWindow *buttonOk = winGetWindowFromId(parent, buttonOkID);
 	buttonOk->winGetPosition(&buttonX[0], &buttonY[0]);
 
 	tempName = menuName;
 	tempName.concat("ButtonYes");
 	NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( tempName );
-	GameWindow *buttonYes = TheWindowManager->winGetWindowFromId(parent, buttonYesID);
+	GameWindow *buttonYes = winGetWindowFromId(parent, buttonYesID);
 	//buttonNo in the second position
 	tempName = menuName;
 	tempName.concat("ButtonNo");
 	NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey(tempName);
-	GameWindow *buttonNo = TheWindowManager->winGetWindowFromId(parent, buttonNoID);
+	GameWindow *buttonNo = winGetWindowFromId(parent, buttonNoID);
 	buttonNo->winGetPosition(&buttonX[1], &buttonY[1]);
-	
+
 	//and buttonCancel in the third
 	tempName = menuName;
 	tempName.concat("ButtonCancel");
 	NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( tempName );
-	GameWindow *buttonCancel = TheWindowManager->winGetWindowFromId(parent, buttonCancelID);
+	GameWindow *buttonCancel = winGetWindowFromId(parent, buttonCancelID);
 	buttonCancel->winGetPosition(&buttonX[2], &buttonY[2]);
-	
+
 	//we shouldn't have button OK and Yes on the same dialog
 	if((buttonFlags & (MSG_BOX_OK | MSG_BOX_YES)) == (MSG_BOX_OK | MSG_BOX_YES) )
 	{
 		DEBUG_ASSERTCRASH(false, ("Passed in MSG_BOX_OK and MSG_BOX_YES.  Big No No."));
 	}
-	
+
 	//Position the OK button if we have one
 	if( (buttonFlags & MSG_BOX_OK) == MSG_BOX_OK)
 	{
@@ -1784,7 +1719,7 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 		buttonYes->winSetPosition(buttonX[0], buttonY[0]);
 		buttonYes->winHide(FALSE);
 	}
-	
+
 	if((buttonFlags & (MSG_BOX_NO | MSG_BOX_CANCEL)) == (MSG_BOX_NO | MSG_BOX_CANCEL) )
 	{
 		//If we have both the No and Cancel button, then the no should go in the middle position
@@ -1805,20 +1740,20 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 		buttonCancel->winSetPosition(buttonX[2], buttonY[2]);
 		buttonCancel->winHide(FALSE);
 	}
-		
+
 	// Fill the text into the text boxes
 	tempName = menuName;
 	tempName.concat("StaticTextTitle");
 	NameKeyType staticTextTitleID = TheNameKeyGenerator->nameToKey( tempName );
-	GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId(parent, staticTextTitleID);
+	GameWindow *staticTextTitle = winGetWindowFromId(parent, staticTextTitleID);
 	GadgetStaticTextSetText(staticTextTitle,titleString);
 	tempName = menuName;
 	tempName.concat("StaticTextMessage");
 	NameKeyType staticTextMessageID = TheNameKeyGenerator->nameToKey( tempName );
-	GameWindow *staticTextMessage = TheWindowManager->winGetWindowFromId(parent, staticTextMessageID);
+	GameWindow *staticTextMessage = winGetWindowFromId(parent, staticTextMessageID);
 	GadgetStaticTextSetText(staticTextMessage,bodyString);
 
-	// create a structure that will pass the functions to 
+	// create a structure that will pass the functions to
 	WindowMessageBoxData *MsgBoxCallbacks = NEW WindowMessageBoxData;
 	MsgBoxCallbacks->cancelCallback = cancelCallback;
 	MsgBoxCallbacks->noCallback = noCallback;
@@ -1826,14 +1761,14 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 	MsgBoxCallbacks->yesCallback = yesCallback;
 	//pass the structure to the dialog
 	trueParent->winSetUserData( MsgBoxCallbacks );
-	
+
 	//make sure the dialog is showing and bring it to the top
 	parent->winHide(FALSE);
 	parent->winBringToTop();
-	
+
 	//Changed By Chris
 	return trueParent;
-}// gogoMessageBox
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a button GUI control */
@@ -1852,25 +1787,25 @@ GameWindow *GameWindowManager::gogoGadgetPushButton( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_PUSH_BUTTON ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create button gadget, instance data not button type\n" ));
+		DEBUG_LOG(( "Cann't create button gadget, instance data not button type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the button window
-	button = TheWindowManager->winCreate( parent, status, 
-																				x, y, width, height, 
+	button = winCreate( parent, status,
+																				x, y, width, height,
 																				GadgetPushButtonSystem,
 																				instData );
 	if( button == NULL )
 	{
-	
-		DEBUG_LOG(( "Unable to create button for push button gadget\n" ));
+
+		DEBUG_LOG(( "Unable to create button for push button gadget" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// assign input function
 	button->winSetInputFunc( GadgetPushButtonInput );
@@ -1886,7 +1821,7 @@ GameWindow *GameWindowManager::gogoGadgetPushButton( GameWindow *parent,
 
 	// set the owner to the parent, or if no parent it will be itself
 	button->winSetOwner( parent );
-	
+
 	// Init the userdata to NULL
 	button->winSetUserData(NULL);
 
@@ -1897,18 +1832,18 @@ GameWindow *GameWindowManager::gogoGadgetPushButton( GameWindow *parent,
 	UnicodeString text = winTextLabelToText( instData->m_textLabelString );
 	if( text.getLength() )
 		GadgetButtonSetText( button, text );
-	
+
 	return button;
 
-}  // end gogoGadgetPushButton
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a checkbox UI element */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetCheckbox( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetCheckbox( GameWindow *parent,
 																									 UnsignedInt status,
-																									 Int x, Int y, 
-																									 Int width, Int height, 
+																									 Int x, Int y,
+																									 Int width, Int height,
 																									 WinInstanceData *instData,
 																									 GameFont *defaultFont,
 																									 Bool defaultVisual )
@@ -1920,25 +1855,25 @@ GameWindow *GameWindowManager::gogoGadgetCheckbox( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_CHECK_BOX ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create checkbox gadget, instance data not checkbox type\n" ));
+		DEBUG_LOG(( "Cann't create checkbox gadget, instance data not checkbox type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the button window
-	checkbox = TheWindowManager->winCreate( parent, status, 
-																					x, y, width, height, 
+	checkbox = winCreate( parent, status,
+																					x, y, width, height,
 																					GadgetCheckBoxSystem,
 																					instData );
 	if( checkbox == NULL )
 	{
-	
-		DEBUG_LOG(( "Unable to create checkbox window\n" ));
+
+		DEBUG_LOG(( "Unable to create checkbox window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// assign input function
 	checkbox->winSetInputFunc( GadgetCheckBoxInput );
@@ -1965,15 +1900,15 @@ GameWindow *GameWindowManager::gogoGadgetCheckbox( GameWindow *parent,
 
 	return checkbox;
 
-}  // end gogoGadgetCheckbox
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a radio button GUI element */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetRadioButton( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetRadioButton( GameWindow *parent,
 																										  UnsignedInt status,
-																										  Int x, Int y, 
-																										  Int width, Int height, 
+																										  Int x, Int y,
+																										  Int width, Int height,
 																										  WinInstanceData *instData,
 																											RadioButtonData *rData,
 																										  GameFont *defaultFont,
@@ -1987,25 +1922,25 @@ GameWindow *GameWindowManager::gogoGadgetRadioButton( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_RADIO_BUTTON ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create radioButton gadget, instance data not radioButton type\n" ));
+		DEBUG_LOG(( "Cann't create radioButton gadget, instance data not radioButton type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the button window
-	radioButton = TheWindowManager->winCreate( parent, status, 
-																					   x, y, width, height, 
+	radioButton = winCreate( parent, status,
+																					   x, y, width, height,
 																						 GadgetRadioButtonSystem,
 																						 instData );
 	if( radioButton == NULL )
 	{
-	
-		DEBUG_LOG(( "Unable to create radio button window\n" ));
+
+		DEBUG_LOG(( "Unable to create radio button window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// allocate and store the radio button user data
 	radioData = NEW RadioButtonData;
@@ -2037,15 +1972,15 @@ GameWindow *GameWindowManager::gogoGadgetRadioButton( GameWindow *parent,
 
 	return radioButton;
 
-}  // end gogoGadgetRadioButton
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a tab control GUI element */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetTabControl( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetTabControl( GameWindow *parent,
 																										  UnsignedInt status,
-																										  Int x, Int y, 
-																										  Int width, Int height, 
+																										  Int x, Int y,
+																										  Int width, Int height,
 																										  WinInstanceData *instData,
 																											TabControlData *tData,
 																										  GameFont *defaultFont,
@@ -2059,25 +1994,25 @@ GameWindow *GameWindowManager::gogoGadgetTabControl( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_TAB_CONTROL ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create tabControl gadget, instance data not tabControl type\n" ));
+		DEBUG_LOG(( "Cann't create tabControl gadget, instance data not tabControl type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the tab control window
-	tabControl = TheWindowManager->winCreate( parent, status, 
-																					   x, y, width, height, 
+	tabControl = winCreate( parent, status,
+																					   x, y, width, height,
 																						 GadgetTabControlSystem,
 																						 instData );
 	if( tabControl == NULL )
 	{
-	
-		DEBUG_LOG(( "Unable to create tab control window\n" ));
+
+		DEBUG_LOG(( "Unable to create tab control window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// allocate and store the tab control user data
 	tabData = NEW TabControlData;
@@ -2108,16 +2043,16 @@ GameWindow *GameWindowManager::gogoGadgetTabControl( GameWindow *parent,
 
 	return tabControl;
 
-}  // end gogoGadgetTabControl
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a list box GUI control */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetListBox( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetListBox( GameWindow *parent,
 																									UnsignedInt status,
-										                              Int x, Int y, 
+										                              Int x, Int y,
 																									Int width, Int height,
-																									WinInstanceData *instData, 
+																									WinInstanceData *instData,
 																									ListboxData *listboxDataTemplate,
 																								  GameFont *defaultFont,
 																								  Bool defaultVisual )
@@ -2131,24 +2066,24 @@ GameWindow *GameWindowManager::gogoGadgetListBox( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_SCROLL_LISTBOX ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create listbox gadget, instance data not listbox type\n" ));
+		DEBUG_LOG(( "Cann't create listbox gadget, instance data not listbox type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the listbox
-  listbox = winCreate( parent, status, x, y, width, height, 
+  listbox = winCreate( parent, status, x, y, width, height,
 											 GadgetListBoxSystem, instData );
-	
+
 	if( listbox == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to create listbox window\n" ));
+		DEBUG_LOG(( "Unable to create listbox window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// allocate the listbox data, copy template data over and set it into box
 	listboxData = NEW ListboxData;
@@ -2178,7 +2113,7 @@ GameWindow *GameWindowManager::gogoGadgetListBox( GameWindow *parent,
 		listbox->winSetInputFunc( GadgetListBoxInput );
 
 
-	
+
 	//
 	// allocate and set the list length, note that setting the list length will
 	// automatically allocate the selection entries that are needed for multi
@@ -2223,8 +2158,8 @@ GameWindow *GameWindowManager::gogoGadgetListBox( GameWindow *parent,
 			listboxData->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 			listboxData->columnWidth[0] -= (sliderSize.x + 2);
 
-		}  // end if
-	}// if
+		}
+	}
 	else
 	{
 		if( !listboxData->columnWidthPercentage )
@@ -2241,28 +2176,28 @@ GameWindow *GameWindowManager::gogoGadgetListBox( GameWindow *parent,
 			listboxData->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 			totalWidth -= (sliderSize.x + 2);
 
-		}  // end if
+		}
 		for(Int i = 0; i < listboxData->columns; i++ )
 		{
 			listboxData->columnWidth[i] = listboxData->columnWidthPercentage[i] * totalWidth / 100;
-		}// for
-	}// else
+		}
+	}
 	// assign the default images/colors
 	assignDefaultGadgetLook( listbox, defaultFont, defaultVisual );
 
   return listbox;
 
-}  // end gogoGadgetListBox
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Does all generic window creation, calls appropriate slider create
 	* function to set up slider-specific data */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent,
 																								 UnsignedInt status,
-																								 Int x, Int y, 
+																								 Int x, Int y,
 																								 Int width, Int height,
-																								 WinInstanceData *instData, 
+																								 WinInstanceData *instData,
 																								 SliderData *sliderData,
 																								 GameFont *defaultFont,
 																								 Bool defaultVisual )
@@ -2278,10 +2213,10 @@ GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent,
 	//
 	BitSet( status, WIN_STATUS_TAB_STOP );
 
-	if( BitIsSet( instData->getStyle(), GWS_HORZ_SLIDER ) ) 
+	if( BitIsSet( instData->getStyle(), GWS_HORZ_SLIDER ) )
 	{
 
-		slider = winCreate( parent, status, x, y, width, height, 
+		slider = winCreate( parent, status, x, y, width, height,
 												GadgetHorizontalSliderSystem, instData );
 
 		// Set up horizontal slider callbacks
@@ -2291,40 +2226,40 @@ GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent,
 		else
 			slider->winSetDrawFunc( getHorizontalSliderDrawFunc() );
 
-	}  // end if
-	else if ( BitIsSet( instData->getStyle(), GWS_VERT_SLIDER ) ) 
+	}
+	else if ( BitIsSet( instData->getStyle(), GWS_VERT_SLIDER ) )
 	{
 
-		slider = winCreate( parent, status, x, y, width, height, 
+		slider = winCreate( parent, status, x, y, width, height,
 												GadgetVerticalSliderSystem, instData );
 
 		// Set up vertical slider callbacks
 		slider->winSetInputFunc( GadgetVerticalSliderInput );
-		
+
 		if( BitIsSet( slider->winGetStatus(), WIN_STATUS_IMAGE ) && !(parent && BitIsSet(parent->winGetStyle(), GWS_SCROLL_LISTBOX)))
 			slider->winSetDrawFunc( getVerticalSliderImageDrawFunc() );
 		else
 			slider->winSetDrawFunc( getVerticalSliderDrawFunc() );
 
-	}  // end else if
-	else 
+	}
+	else
 	{
 
-		DEBUG_LOG(( "gogoGadgetSlider warning: unrecognized slider style.\n" ));
+		DEBUG_LOG(( "gogoGadgetSlider warning: unrecognized slider style." ));
 		assert( 0 );
 		return NULL;
-		
-	}  // end else
+
+	}
 
 	// sanity
 	if( slider == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to create slider control window\n" ));
+		DEBUG_LOG(( "Unable to create slider control window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// set the owner to the parent, or if no parent it will be itself
 	slider->winSetOwner( parent );
@@ -2356,11 +2291,11 @@ GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent,
 	if( sliderData->maxVal == sliderData->minVal )
 		sliderData->maxVal = sliderData->minVal + 1;
 
-	if( BitIsSet( instData->getStyle(), GWS_HORZ_SLIDER ) ) 
+	if( BitIsSet( instData->getStyle(), GWS_HORZ_SLIDER ) )
 	{
 		sliderData->numTicks = (float)(width - HORIZONTAL_SLIDER_THUMB_WIDTH) /
 													 (float)(sliderData->maxVal - sliderData->minVal);
-	} else 
+	} else
 	{
 		sliderData->numTicks = (float)(height - GADGET_SIZE) /
 													 (float)(sliderData->maxVal - sliderData->minVal);
@@ -2377,16 +2312,16 @@ GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent,
 
 	return slider;
 
-}  // end gogoGadgetSlider
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a Combo Box GUI element */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 																									UnsignedInt status,
-										                              Int x, Int y, 
+										                              Int x, Int y,
 																									Int width, Int height,
-																									WinInstanceData *instData, 
+																									WinInstanceData *instData,
 																									ComboBoxData *comboBoxDataTemplate,
 																								  GameFont *defaultFont,
 																								  Bool defaultVisual )
@@ -2399,24 +2334,24 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_COMBO_BOX) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create ComboBox gadget, instance data not ComboBox type\n" ));
+		DEBUG_LOG(( "Cann't create ComboBox gadget, instance data not ComboBox type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the listbox
-  comboBox = winCreate( parent, status, x, y, width, height, 
+  comboBox = winCreate( parent, status, x, y, width, height,
 											 GadgetComboBoxSystem, instData );
-	
+
 	if( comboBox == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to create ComboBox window\n" ));
+		DEBUG_LOG(( "Unable to create ComboBox window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 
 // begin here
@@ -2443,7 +2378,7 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 	// Set up list box input callbacks
 	comboBox->winSetInputFunc( GadgetComboBoxInput );
 
-	//Create the windows that make up 
+	//Create the windows that make up
 
 
 	WinInstanceData winInstData;
@@ -2460,7 +2395,7 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 	// remove unwanted status bits.
 	status &= ~(WIN_STATUS_BORDER | WIN_STATUS_HIDDEN);
 
-	fontHeight = TheWindowManager->winFontHeight( comboBox->winGetFont() );
+	fontHeight = winFontHeight( comboBox->winGetFont() );
 	top = title ? (fontHeight + 1):0;
 	bottom = title ? (height - (fontHeight + 1)):height;
 
@@ -2481,9 +2416,9 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 	// if listbox tracks, so will this sub control
 	if( BitIsSet( comboBox->winGetStyle(), GWS_MOUSE_TRACK ) )
 		BitSet( winInstData.m_style, GWS_MOUSE_TRACK );
-	
+
 	comboBoxData->dropDownButton =
-		 TheWindowManager->gogoGadgetPushButton( comboBox,
+		 gogoGadgetPushButton( comboBox,
 																						 status | WIN_STATUS_ACTIVE | WIN_STATUS_ENABLED,
 																						 width - buttonWidth, 0,
 																						 buttonWidth, height,
@@ -2496,7 +2431,7 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 	// ----------------------------------------------------------------------
 	UnsignedInt statusTextEntry;
 	winInstData.init();
-	
+
 	winInstData.m_owner = comboBox;
   winInstData.m_style |= GWS_ENTRY_FIELD;
 	winInstData.m_textLabelString = "Entry";
@@ -2511,10 +2446,10 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 		statusTextEntry = status | WIN_STATUS_NO_INPUT ;//| WIN_STATUS_NO_FOCUS;
 		comboBoxData->entryData->drawTextFromStart = TRUE;
 	}
-  comboBoxData->editBox = TheWindowManager->gogoGadgetTextEntry( comboBox, statusTextEntry ,
-																										 0,0 , 
+  comboBoxData->editBox = gogoGadgetTextEntry( comboBox, statusTextEntry ,
+																										 0,0 ,
 																										width - buttonWidth , height ,
-																										&winInstData, comboBoxData->entryData, 
+																										&winInstData, comboBoxData->entryData,
 																										winInstData.m_font, FALSE );
 	comboBoxData->editBox->winSetTooltipFunc(comboBox->winGetTooltipFunc());
 	comboBoxData->editBox->winSetTooltip(instData->getTooltipText());
@@ -2526,16 +2461,16 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 	// Create list box
 	// ----------------------------------------------------------------------
 	winInstData.init();
-	
+
 	winInstData.m_owner = comboBox;
   if( BitIsSet( comboBox->winGetStyle(), GWS_MOUSE_TRACK ) )
 		BitSet( winInstData.m_style, GWS_MOUSE_TRACK );
 	BitSet( winInstData.m_style, WIN_STATUS_HIDDEN );
-  winInstData.m_style |= GWS_SCROLL_LISTBOX; 
+  winInstData.m_style |= GWS_SCROLL_LISTBOX;
 	status &= ~(WIN_STATUS_IMAGE);
-  comboBoxData->listBox = TheWindowManager->gogoGadgetListBox( comboBox, status | WIN_STATUS_ABOVE | WIN_STATUS_ONE_LINE, 0, height, 
+  comboBoxData->listBox = gogoGadgetListBox( comboBox, status | WIN_STATUS_ABOVE | WIN_STATUS_ONE_LINE, 0, height,
 																								width, height,
-																								&winInstData, comboBoxData->listboxData, 
+																								&winInstData, comboBoxData->listboxData,
 																								winInstData.m_font, FALSE );
 	comboBoxData->listBox->winHide(TRUE);
 	delete(comboBoxData->listboxData);
@@ -2588,10 +2523,10 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 //-------------------------------------------------------------------------------------------------
 /** Create a progress bar GUI element */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetProgressBar( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetProgressBar( GameWindow *parent,
 																										  UnsignedInt status,
-																										  Int x, Int y, 
-																										  Int width, Int height, 
+																										  Int x, Int y,
+																										  Int width, Int height,
 																										  WinInstanceData *instData,
 																										  GameFont *defaultFont,
 																										  Bool defaultVisual )
@@ -2603,25 +2538,25 @@ GameWindow *GameWindowManager::gogoGadgetProgressBar( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_PROGRESS_BAR ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create progressBar gadget, instance data not progressBar type\n" ));
+		DEBUG_LOG(( "Cann't create progressBar gadget, instance data not progressBar type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the button window
-	progressBar = TheWindowManager->winCreate( parent, status, 
-																					   x, y, width, height, 
+	progressBar = winCreate( parent, status,
+																					   x, y, width, height,
 																						 GadgetProgressBarSystem,
 																						 instData );
 	if( progressBar == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to create progress bar control\n" ));
+		DEBUG_LOG(( "Unable to create progress bar control" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	//
 	// assign draw function, the draw functions must actually be implemented
@@ -2640,17 +2575,17 @@ GameWindow *GameWindowManager::gogoGadgetProgressBar( GameWindow *parent,
 
 	return progressBar;
 
-}  // end gogoGadgetProgressBar
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Does all generic window creation, calls appropriate text field create
 	* function to set up specific data */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetStaticText( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetStaticText( GameWindow *parent,
 																										 UnsignedInt status,
-																										 Int x, Int y, 
+																										 Int x, Int y,
 																										 Int width, Int height,
-																										 WinInstanceData *instData, 
+																										 WinInstanceData *instData,
 																										 TextData *textData,
 																										 GameFont *defaultFont,
 																										 Bool defaultVisual )
@@ -2662,17 +2597,17 @@ GameWindow *GameWindowManager::gogoGadgetStaticText( GameWindow *parent,
 	// Static Text can not be a Tab Stop
 	BitClear( instData->m_style, GWS_TAB_STOP );
 
-  if( BitIsSet( instData->getStyle(), GWS_STATIC_TEXT ) ) 
+  if( BitIsSet( instData->getStyle(), GWS_STATIC_TEXT ) )
 	{
-    textWin = winCreate( parent, status, x, y, width, height, 
+    textWin = winCreate( parent, status, x, y, width, height,
 												 GadgetStaticTextSystem, instData );
-  } 
-	else 
+  }
+	else
 	{
-    DEBUG_LOG(( "gogoGadgetText warning: unrecognized text style.\n" ));
+    DEBUG_LOG(( "gogoGadgetText warning: unrecognized text style." ));
     return NULL;
   }
-  
+
   if( textWin != NULL )
 	{
 
@@ -2705,21 +2640,21 @@ GameWindow *GameWindowManager::gogoGadgetStaticText( GameWindow *parent,
 		if( text.getLength() )
 			GadgetStaticTextSetText( textWin, text );
 
-  }  // end if
+  }
 
   return textWin;
 
-}  // end gogoGadetStaticText
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Does all generic window creation, calls appropriate entry field create
 	* function to set up specific data */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetTextEntry( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetTextEntry( GameWindow *parent,
 																										UnsignedInt status,
-																										Int x, Int y, 
+																										Int x, Int y,
 																										Int width, Int height,
-																										WinInstanceData *instData, 
+																										WinInstanceData *instData,
 																										EntryData *entryData,
 																										GameFont *defaultFont,
 																										Bool defaultVisual )
@@ -2731,23 +2666,23 @@ GameWindow *GameWindowManager::gogoGadgetTextEntry( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_ENTRY_FIELD ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Unable to create text entry, style not entry type\n" ));
+		DEBUG_LOG(( "Unable to create text entry, style not entry type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the window
-	entry = winCreate( parent, status, x, y, width, height, 
+	entry = winCreate( parent, status, x, y, width, height,
 										 GadgetTextEntrySystem, instData );
 	if( entry == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to create text entry window\n" ));
+		DEBUG_LOG(( "Unable to create text entry window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// set owner of this control
 	entry->winSetOwner( parent );
@@ -2799,7 +2734,7 @@ GameWindow *GameWindowManager::gogoGadgetTextEntry( GameWindow *parent,
 
 	// asian languages get to have list box kanji character completion
 	data->constructList = NULL;
-	if( OurLanguage == LANGUAGE_ID_KOREAN || 
+	if( OurLanguage == LANGUAGE_ID_KOREAN ||
 			OurLanguage == LANGUAGE_ID_JAPANESE )
 	{
 		// we need to create the construct listbox
@@ -2822,29 +2757,29 @@ GameWindow *GameWindowManager::gogoGadgetTextEntry( GameWindow *parent,
 
 		boxInstData.m_style = GWS_SCROLL_LISTBOX | GWS_MOUSE_TRACK;
 
-		data->constructList = gogoGadgetListBox( NULL, 
-																						 WIN_STATUS_ABOVE | 
+		data->constructList = gogoGadgetListBox( NULL,
+																						 WIN_STATUS_ABOVE |
 																						 WIN_STATUS_HIDDEN |
-																						 WIN_STATUS_NO_FOCUS | 
+																						 WIN_STATUS_NO_FOCUS |
 																						 WIN_STATUS_ONE_LINE,
-																						 0, height, 
-																						 110, 119, 
-																						 &boxInstData, 
-																						 &lData, 
-																						 NULL, 
+																						 0, height,
+																						 110, 119,
+																						 &boxInstData,
+																						 &lData,
+																						 NULL,
 																						 TRUE );
 
 		if( data->constructList == NULL )
 		{
 
-			DEBUG_LOG(( "gogoGadgetEntry warning: Failed to create listbox.\n" ));
+			DEBUG_LOG(( "gogoGadgetEntry warning: Failed to create listbox." ));
 			assert( 0 );
 			winDestroy( entry );
 			return NULL;
 
-		}  // end if
+		}
 
-	}  // end, korean or japanese
+	}
 
 	// assign the default images/colors
 	assignDefaultGadgetLook( entry, defaultFont, defaultVisual );
@@ -2856,10 +2791,10 @@ GameWindow *GameWindowManager::gogoGadgetTextEntry( GameWindow *parent,
 
 	return entry;
 
-}  // end gogoGadgetTextEntry
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Use this method to assign the default images/colors to gadgets as 
+/** Use this method to assign the default images/colors to gadgets as
 	* they area created */
 //-------------------------------------------------------------------------------------------------
 void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
@@ -2867,29 +2802,29 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 																								 Bool assignVisual )
 {
 	UnsignedByte alpha = 255;
-	static Color red				= TheWindowManager->winMakeColor( 255,   0,   0, alpha );
-	static Color darkRed		= TheWindowManager->winMakeColor( 128,   0,   0, alpha );
-	static Color lightRed		= TheWindowManager->winMakeColor( 255, 128, 128, alpha );
-	static Color green			= TheWindowManager->winMakeColor(   0, 255,   0, alpha );
-	static Color darkGreen	= TheWindowManager->winMakeColor(   0, 128,   0, alpha );
-	static Color lightGreen	= TheWindowManager->winMakeColor( 128, 255, 128, alpha );
-	static Color blue				= TheWindowManager->winMakeColor(   0,   0, 255, alpha );
-	static Color darkBlue		= TheWindowManager->winMakeColor(   0,   0, 128, alpha );
-	static Color lightBlue	= TheWindowManager->winMakeColor( 128, 128, 255, alpha );
-	static Color purple			= TheWindowManager->winMakeColor( 255,   0, 255, alpha );
-	static Color darkPurple	= TheWindowManager->winMakeColor( 128,   0, 128, alpha );
-	static Color lightPurple= TheWindowManager->winMakeColor( 255, 128, 255, alpha );
-	static Color yellow			= TheWindowManager->winMakeColor( 255, 255,   0, alpha );
-	static Color darkYellow	= TheWindowManager->winMakeColor( 128, 128,   0, alpha );
-	static Color lightYellow= TheWindowManager->winMakeColor( 255, 255, 128, alpha );
-	static Color cyan				= TheWindowManager->winMakeColor(   0, 255, 255, alpha );
-	static Color darkCyan		= TheWindowManager->winMakeColor(  64, 128, 128, alpha );
-	static Color lightCyan	= TheWindowManager->winMakeColor( 128, 255, 255, alpha );
-	static Color gray				= TheWindowManager->winMakeColor( 128, 128, 128, alpha );
-	static Color darkGray		= TheWindowManager->winMakeColor(  64,  64,  64, alpha );
-	static Color lightGray	= TheWindowManager->winMakeColor( 192, 192, 192, alpha );
-	static Color black			= TheWindowManager->winMakeColor(   0,   0,   0, alpha );
-	static Color white			= TheWindowManager->winMakeColor( 254, 254, 254, alpha );
+	static Color red				= winMakeColor( 255,   0,   0, alpha );
+	static Color darkRed		= winMakeColor( 128,   0,   0, alpha );
+	static Color lightRed		= winMakeColor( 255, 128, 128, alpha );
+	static Color green			= winMakeColor(   0, 255,   0, alpha );
+	static Color darkGreen	= winMakeColor(   0, 128,   0, alpha );
+	static Color lightGreen	= winMakeColor( 128, 255, 128, alpha );
+	static Color blue				= winMakeColor(   0,   0, 255, alpha );
+	static Color darkBlue		= winMakeColor(   0,   0, 128, alpha );
+	static Color lightBlue	= winMakeColor( 128, 128, 255, alpha );
+	static Color purple			= winMakeColor( 255,   0, 255, alpha );
+	static Color darkPurple	= winMakeColor( 128,   0, 128, alpha );
+	static Color lightPurple= winMakeColor( 255, 128, 255, alpha );
+	static Color yellow			= winMakeColor( 255, 255,   0, alpha );
+	static Color darkYellow	= winMakeColor( 128, 128,   0, alpha );
+	static Color lightYellow= winMakeColor( 255, 255, 128, alpha );
+	static Color cyan				= winMakeColor(   0, 255, 255, alpha );
+	static Color darkCyan		= winMakeColor(  64, 128, 128, alpha );
+	static Color lightCyan	= winMakeColor( 128, 255, 255, alpha );
+	static Color gray				= winMakeColor( 128, 128, 128, alpha );
+	static Color darkGray		= winMakeColor(  64,  64,  64, alpha );
+	static Color lightGray	= winMakeColor( 192, 192, 192, alpha );
+	static Color black			= winMakeColor(   0,   0,   0, alpha );
+	static Color white			= winMakeColor( 254, 254, 254, alpha );
 	static Color enabledText					= white;
 	static Color enabledTextBorder		= darkGray;
 	static Color disabledText					= darkGray;
@@ -2899,7 +2834,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 	static Color imeCompositeText				= green;
 	static Color imeCompositeTextBorder	= blue;
 	WinInstanceData *instData;
-	
+
 	// sanity
 	if( gadget == NULL )
 		return;
@@ -2913,15 +2848,15 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 	else
 	{
 		if (TheGlobalLanguageData && TheGlobalLanguageData->m_defaultWindowFont.name.isNotEmpty())
-		{		gadget->winSetFont( TheWindowManager->winFindFont(
+		{		gadget->winSetFont( winFindFont(
 				TheGlobalLanguageData->m_defaultWindowFont.name,
 				TheGlobalLanguageData->m_defaultWindowFont.size,
 				TheGlobalLanguageData->m_defaultWindowFont.bold) );
 		}
 		else
-			gadget->winSetFont( TheWindowManager->winFindFont( AsciiString("Times New Roman"), 14, FALSE ) );
+			gadget->winSetFont( winFindFont( "Times New Roman", 14, FALSE ) );
 	}
-	
+
 	// if we don't want to assign default colors/images get out of here
 	if( assignVisual == FALSE )
 		return;
@@ -2963,7 +2898,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		gadget->winSetHiliteTextColors( hiliteText, hiliteTextBorder );
 		gadget->winSetIMECompositeTextColors( imeCompositeText, imeCompositeTextBorder );
 
-	}  // end if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_CHECK_BOX ) )
 	{
 
@@ -3012,7 +2947,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		gadget->winSetHiliteTextColors( hiliteText, hiliteTextBorder );
 		gadget->winSetIMECompositeTextColors( imeCompositeText, imeCompositeTextBorder );
 
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_RADIO_BUTTON ) )
 	{
 
@@ -3061,7 +2996,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		gadget->winSetHiliteTextColors( hiliteText, hiliteTextBorder );
 		gadget->winSetIMECompositeTextColors( imeCompositeText, imeCompositeTextBorder );
 
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_HORZ_SLIDER ) )
 	{
 
@@ -3087,7 +3022,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		GadgetSliderSetHiliteImageCenter( gadget, winFindImage( "HSliderHiliteRepeatingCenter" ) );
 		GadgetSliderSetHiliteImageSmallCenter( gadget, winFindImage( "HSliderHiliteSmallRepeatingCenter" ) );
 		GadgetSliderSetHiliteColor( gadget, red );
-		GadgetSliderSetHiliteBorderColor( gadget, lightRed );	
+		GadgetSliderSetHiliteBorderColor( gadget, lightRed );
 
 		// set default text colors for the gadget
 		gadget->winSetEnabledTextColors( enabledText, enabledTextBorder );
@@ -3123,7 +3058,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		GadgetSliderSetHiliteSelectedThumbBorderColor( gadget, GadgetSliderGetHiliteColor( gadget ) );
 
 
-	}  // end if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_VERT_SLIDER ) )
 	{
 		// enabled
@@ -3148,7 +3083,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		GadgetSliderSetHiliteImageCenter( gadget, winFindImage( "VSliderHiliteRepeatingCenter" ) );
 		GadgetSliderSetHiliteImageSmallCenter( gadget, winFindImage( "VSliderHiliteSmallRepeatingCenter" ) );
 		GadgetSliderSetHiliteColor( gadget, red );
-		GadgetSliderSetHiliteBorderColor( gadget, lightRed );	
+		GadgetSliderSetHiliteBorderColor( gadget, lightRed );
 
 		// set default text colors for the gadget
 		gadget->winSetEnabledTextColors( enabledText, enabledTextBorder );
@@ -3183,7 +3118,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		GadgetSliderSetHiliteSelectedThumbColor( gadget, GadgetSliderGetHiliteBorderColor( gadget ) );
 		GadgetSliderSetHiliteSelectedThumbBorderColor( gadget, GadgetSliderGetHiliteColor( gadget ) );
 
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_SCROLL_LISTBOX ) )
 	{
 		ListboxData *listboxData = (ListboxData *)gadget->winGetUserData();
@@ -3202,7 +3137,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 														darkGreen,				// hilite border
 														white,						// hilite selected item
 														darkGreen );			// hilite selected item border
-											
+
 		// now set the images
 
 		// enabled
@@ -3259,7 +3194,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 			GadgetSliderSetHiliteImageSmallCenter( slider, winFindImage( "VSliderLargeHiliteSmallRepeatingCenter" ) );
 			GadgetSliderSetHiliteThumbImage( slider, winFindImage( "VSliderLargeThumbHilite" ) );
 			GadgetSliderSetHiliteSelectedThumbImage( slider, winFindImage( "VSliderLargeThumbHilite" ) );
-	
+
 			// up button ------------------------------------------------------------
 
 			// enabled
@@ -3288,9 +3223,9 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 			GadgetButtonSetHiliteImage( downButton, winFindImage( "VSliderLargeDownButtonHilite" ) );
 			GadgetButtonSetHiliteSelectedImage( downButton, winFindImage( "VSliderLargeDownButtonHiliteSelected" ) );
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_COMBO_BOX ) )
 	{
 //		ComboBoxData *comboBoxData = (ComboBoxData *)gadget->winGetUserData();
@@ -3308,7 +3243,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 														darkGreen,				// hilite border
 														white,						// hilite selected item
 														darkGreen );			// hilite selected item border
-		
+
 		// enabled
 		GadgetComboBoxSetEnabledImage( gadget, winFindImage( "ListBoxEnabled" ) );
 		GadgetComboBoxSetEnabledSelectedItemImageLeft( gadget, winFindImage( "ListBoxEnabledSelectedItemLeftEnd" ) );
@@ -3343,17 +3278,17 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 			GadgetButtonSetEnabledImage( dropDownButton, winFindImage( "PushButtonEnabled" ) );
 			// enabled selected button
 			GadgetButtonSetEnabledSelectedImage( dropDownButton, winFindImage( "PushButtonEnabledSelected" ) );
-			
+
 			// Disabled background
 			GadgetButtonSetDisabledImage( dropDownButton, winFindImage( "PushButtonDisabled" ) );
 			// Disabled selected button
 			GadgetButtonSetDisabledSelectedImage( dropDownButton, winFindImage( "PushButtonDisabledSelected" ) );
-			
+
 			// Hilite background
 			GadgetButtonSetHiliteImage( dropDownButton, winFindImage( "PushButtonHilite" ) );
 			// Hilite selected button
 			GadgetButtonSetHiliteSelectedImage( dropDownButton, winFindImage( "PushButtonHiliteSelected" ) );
-			
+
 		}
 
 		GameWindow *editBox = GadgetComboBoxGetEditBox( gadget );
@@ -3364,25 +3299,25 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 			GadgetTextEntrySetEnabledImageRight( editBox, winFindImage( "TextEntryEnabledRightEnd" ) );
 			GadgetTextEntrySetEnabledImageCenter( editBox, winFindImage( "TextEntryEnabledRepeatingCenter" ) );
 			GadgetTextEntrySetEnabledImageSmallCenter( editBox, winFindImage( "TextEntryEnabledSmallRepeatingCenter" ) );
-			
+
 			// disabled
 			GadgetTextEntrySetDisabledImageLeft( editBox, winFindImage( "TextEntryDisabledLeftEnd" ) );
 			GadgetTextEntrySetDisabledImageRight( editBox, winFindImage( "TextEntryDisabledRightEnd" ) );
 			GadgetTextEntrySetDisabledImageCenter( editBox, winFindImage( "TextEntryDisabledRepeatingCenter" ) );
 			GadgetTextEntrySetDisabledImageSmallCenter( editBox, winFindImage( "TextEntryDisabledSmallRepeatingCenter" ) );
-			
+
 			// hilited
 			GadgetTextEntrySetHiliteImageLeft( editBox, winFindImage( "TextEntryHiliteLeftEnd" ) );
 			GadgetTextEntrySetHiliteImageRight( editBox, winFindImage( "TextEntryHiliteRightEnd" ) );
 			GadgetTextEntrySetHiliteImageCenter( editBox, winFindImage( "TextEntryHiliteRepeatingCenter" ) );
 			GadgetTextEntrySetHiliteImageSmallCenter( editBox, winFindImage( "TextEntryHiliteSmallRepeatingCenter" ) );
-			
+
 		}
 
 		GameWindow * listBox = GadgetComboBoxGetListBox( gadget );
 		if ( listBox )
 		{
-														
+
 			// now set the images
 
 			// enabled
@@ -3439,7 +3374,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 				GadgetSliderSetHiliteImageSmallCenter( slider, winFindImage( "VSliderLargeHiliteSmallRepeatingCenter" ) );
 				GadgetSliderSetHiliteThumbImage( slider, winFindImage( "VSliderLargeThumbHilite" ) );
 				GadgetSliderSetHiliteSelectedThumbImage( slider, winFindImage( "VSliderLargeThumbHilite" ) );
-		
+
 				// up button ------------------------------------------------------------
 
 				// enabled
@@ -3468,9 +3403,9 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 				GadgetButtonSetHiliteImage( downButton, winFindImage( "VSliderLargeDownButtonHilite" ) );
 				GadgetButtonSetHiliteSelectedImage( downButton, winFindImage( "VSliderLargeDownButtonHiliteSelected" ) );
 
-			}  // end if
+			}
 		}
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_PROGRESS_BAR ) )
 	{
 
@@ -3516,7 +3451,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		GadgetProgressBarSetHiliteBarImageCenter( gadget, winFindImage( "ProgressBarHiliteBarRepeatingCenter" ) );
 		GadgetProgressBarSetHiliteBarImageSmallCenter( gadget, winFindImage( "ProgressBarHiliteBarSmallRepeatingCenter" ) );
 
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_STATIC_TEXT ) )
 	{
 
@@ -3541,7 +3476,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		gadget->winSetHiliteTextColors( hiliteText, hiliteTextBorder );
 		gadget->winSetIMECompositeTextColors( imeCompositeText, imeCompositeTextBorder );
 
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_ENTRY_FIELD ) )
 	{
 
@@ -3575,9 +3510,9 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		gadget->winSetHiliteTextColors( hiliteText, hiliteTextBorder );
 		gadget->winSetIMECompositeTextColors( imeCompositeText, imeCompositeTextBorder );
 
-	}  // end else if
+	}
 
-}  // end assignDefaultGadgetLook
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Given a text label, retreive the real localized text associated
@@ -3585,7 +3520,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 //-------------------------------------------------------------------------------------------------
 UnicodeString GameWindowManager::winTextLabelToText( AsciiString label )
 {
-	
+
 	// sanity
 	if( label.isEmpty() )
 		return UnicodeString::TheEmptyString;
@@ -3595,7 +3530,7 @@ UnicodeString GameWindowManager::winTextLabelToText( AsciiString label )
 	tmp.translate(label);
 	return tmp;
 
-}  // end winTextLabelToText
+}
 
 //-------------------------------------------------------------------------------------------------
 /** find the top window at the given coordinates */
@@ -3638,16 +3573,16 @@ GameWindow *GameWindowManager::getWindowUnderCursor( Int x, Int y, Bool ignoreEn
 					window = window->winPointInChild( x, y, ignoreEnabled );
 					break;  // exit for
 				}
-			}  // end if
-		}  // end for window
+			}
+		}
 
 		// check !above, below and hidden
 		if( window == NULL )
 		{
 			for( window = m_windowList; window; window = window->m_next )
 			{
-				if( !BitIsSet( window->m_status, WIN_STATUS_ABOVE | 
-																				WIN_STATUS_BELOW | 
+				if( !BitIsSet( window->m_status, WIN_STATUS_ABOVE |
+																				WIN_STATUS_BELOW |
 																				WIN_STATUS_HIDDEN ) &&
 						x >= window->m_region.lo.x &&
 						x <= window->m_region.hi.x &&
@@ -3655,14 +3590,14 @@ GameWindow *GameWindowManager::getWindowUnderCursor( Int x, Int y, Bool ignoreEn
 						y <= window->m_region.hi.y)
 				{
 					if( BitIsSet( window->m_status, WIN_STATUS_ENABLED )|| ignoreEnabled)
-					{								
+					{
 						// determine which child window the mouse is in
 						window = window->winPointInChild( x, y, ignoreEnabled );
 						break;  // exit for
 					}
 				}
 			}
-		}  // end if, window == NULL
+		}
 
 		// check below and !hidden
 		if( window == NULL )
@@ -3684,8 +3619,8 @@ GameWindow *GameWindowManager::getWindowUnderCursor( Int x, Int y, Bool ignoreEn
 					}
 				}
 			}
-		}  // end if
-	}  // end else, no modal head
+		}
+	}
 
 	if( window )
 	{
@@ -3741,51 +3676,51 @@ Bool GameWindowManager::initTestGUI( void )
 	WinInstanceData instData;
 
 	// make some windows inside each other in the upper left
-	window = TheWindowManager->winCreate( NULL, statusFlags, 0, 0, 100, 100, NULL, NULL );
+	window = winCreate( NULL, statusFlags, 0, 0, 100, 100, NULL, NULL );
 	window->winSetInputFunc( testGrab );
-	window->winSetEnabledColor( 0, TheWindowManager->winMakeColor( 255, 254, 255, 255 ) );
-	window->winSetEnabledBorderColor( 0 , TheWindowManager->winMakeColor( 0, 0, 0, 255 ) );
-	window = TheWindowManager->winCreate( window, statusFlags, 10, 10, 50, 50, NULL, NULL );
+	window->winSetEnabledColor( 0, winMakeColor( 255, 254, 255, 255 ) );
+	window->winSetEnabledBorderColor( 0 , winMakeColor( 0, 0, 0, 255 ) );
+	window = winCreate( window, statusFlags, 10, 10, 50, 50, NULL, NULL );
 	window->winSetInputFunc( testGrab );
-	window->winSetEnabledColor( 0, TheWindowManager->winMakeColor( 128, 128, 128, 255 ) );
-	window->winSetEnabledBorderColor( 0 , TheWindowManager->winMakeColor( 0, 0, 0, 255 ) );
+	window->winSetEnabledColor( 0, winMakeColor( 128, 128, 128, 255 ) );
+	window->winSetEnabledBorderColor( 0 , winMakeColor( 0, 0, 0, 255 ) );
 
 	// make a push button
 	instData.init();
 	BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK );
 	instData.m_textLabelString = "What Up?";
-	window = TheWindowManager->gogoGadgetPushButton( NULL, 
-																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE, 
-																									 200, 100, 
-																									 100, 30, 
+	window = gogoGadgetPushButton( NULL,
+																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
+																									 200, 100,
+																									 100, 30,
 																									 &instData, NULL, TRUE );
 
 	// make a push button
 	instData.init();
 	BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK );
 	instData.m_textLabelString = "Enabled";
-	window = TheWindowManager->gogoGadgetPushButton( NULL, 
-																									 WIN_STATUS_ENABLED, 
-																									 330, 100, 
-																									 100, 30, 
+	window = gogoGadgetPushButton( NULL,
+																									 WIN_STATUS_ENABLED,
+																									 330, 100,
+																									 100, 30,
 																									 &instData, NULL, TRUE );
 
 	// make a push button
 	instData.init();
 	BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK );
 	instData.m_textLabelString = "Disabled";
-	window = TheWindowManager->gogoGadgetPushButton( NULL, 
-																									 0, 
-																									 450, 100, 
-																									 100, 30, 
+	window = gogoGadgetPushButton( NULL,
+																									 0,
+																									 450, 100,
+																									 100, 30,
 																									 &instData, NULL, TRUE );
 
 	// make a check box
 	instData.init();
 	instData.m_style = GWS_CHECK_BOX | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Check";
-	window = TheWindowManager->gogoGadgetCheckbox( NULL,
-																								 WIN_STATUS_ENABLED | 
+	window = gogoGadgetCheckbox( NULL,
+																								 WIN_STATUS_ENABLED |
 																								 WIN_STATUS_IMAGE,
 																								 200, 150,
 																								 100, 30,
@@ -3795,18 +3730,18 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.init();
 	instData.m_style = GWS_CHECK_BOX | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Check";
-	window = TheWindowManager->gogoGadgetCheckbox( NULL,
+	window = gogoGadgetCheckbox( NULL,
 																								 WIN_STATUS_ENABLED,
 																								 330, 150,
 																								 100, 30,
 																								 &instData, NULL, TRUE );
 
 	// make window to hold radio buttons
-	window = TheWindowManager->winCreate( NULL, WIN_STATUS_ENABLED | WIN_STATUS_DRAGABLE,
+	window = winCreate( NULL, WIN_STATUS_ENABLED | WIN_STATUS_DRAGABLE,
 																				200, 200, 250, 45, NULL );
 	window->winSetInputFunc( testGrab );
-	window->winSetEnabledColor( 0, TheWindowManager->winMakeColor( 50, 50, 50, 200 ) );
-	window->winSetEnabledBorderColor( 0, TheWindowManager->winMakeColor( 254, 254, 254, 255 ) );
+	window->winSetEnabledColor( 0, winMakeColor( 50, 50, 50, 200 ) );
+	window->winSetEnabledBorderColor( 0, winMakeColor( 254, 254, 254, 255 ) );
 
 	// make a radio button
 	GameWindow *radio;
@@ -3815,7 +3750,7 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.m_style = GWS_RADIO_BUTTON | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Mama Said!";
 	rData.group = 1;
-	radio = TheWindowManager->gogoGadgetRadioButton( window,
+	radio = gogoGadgetRadioButton( window,
 																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																									 10, 10,
 																									 100, 30,
@@ -3826,7 +3761,7 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.init();
 	instData.m_style = GWS_RADIO_BUTTON | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "On the Run";
-	radio = TheWindowManager->gogoGadgetRadioButton( window,
+	radio = gogoGadgetRadioButton( window,
 																									 WIN_STATUS_ENABLED,
 																									 130, 10,
 																									 100, 30,
@@ -3849,25 +3784,25 @@ Bool GameWindowManager::initTestGUI( void )
 	listData.columnWidth = NULL;
 	instData.init();
 	instData.m_style = GWS_SCROLL_LISTBOX | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetListBox( NULL,
+	window = gogoGadgetListBox( NULL,
 																								WIN_STATUS_ENABLED,
 																								200, 250,
 																								100, 100,
 																								&instData,
 																								&listData, NULL, TRUE );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Listbox text"), 
-												 TheWindowManager->winMakeColor( 255, 255, 255, 255 ), -1, 0 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"More text"), 
-												 TheWindowManager->winMakeColor( 105, 105, 255, 255 ), -1, 0 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Nothing"), 
-												 TheWindowManager->winMakeColor( 105, 105, 255, 255 ), -1, 0 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Seasons"), 
-												 TheWindowManager->winMakeColor( 105, 205, 255, 255 ), -1, 0 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Misery"), 
-												 TheWindowManager->winMakeColor( 235, 105, 255, 255 ), -1, 0 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Natural"), 
-												 TheWindowManager->winMakeColor( 105, 205, 45, 255 ), -1, 0 );
-	window->winSetFont( TheFontLibrary->getFont( AsciiString("Times New Roman"), 12, FALSE ) );
+	GadgetListBoxAddEntryText( window, L"Listbox text",
+												 winMakeColor( 255, 255, 255, 255 ), -1, 0 );
+	GadgetListBoxAddEntryText( window, L"More text",
+												 winMakeColor( 105, 105, 255, 255 ), -1, 0 );
+	GadgetListBoxAddEntryText( window, L"Nothing",
+												 winMakeColor( 105, 105, 255, 255 ), -1, 0 );
+	GadgetListBoxAddEntryText( window, L"Seasons",
+												 winMakeColor( 105, 205, 255, 255 ), -1, 0 );
+	GadgetListBoxAddEntryText( window, L"Misery",
+												 winMakeColor( 235, 105, 255, 255 ), -1, 0 );
+	GadgetListBoxAddEntryText( window, L"Natural",
+												 winMakeColor( 105, 205, 45, 255 ), -1, 0 );
+	window->winSetFont( TheFontLibrary->getFont( "Times New Roman", 12, FALSE ) );
 
 	// make a listbox
 	memset( &listData, 0, sizeof( ListboxData ) );
@@ -3882,24 +3817,24 @@ Bool GameWindowManager::initTestGUI( void )
 	listData.columnWidth = NULL;
 	instData.init();
 	instData.m_style = GWS_SCROLL_LISTBOX | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetListBox( NULL,
+	window = gogoGadgetListBox( NULL,
 																								WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																								75, 250,
 																								100, 100,
 																								&instData,
 																								&listData, NULL, TRUE );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Listbox text"), 
-												 TheWindowManager->winMakeColor( 255, 255, 255, 255 ), -1, -1 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"More text"), 
-												 TheWindowManager->winMakeColor( 105, 105, 255, 255 ), -1, -1 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Nothing"), 
-												 TheWindowManager->winMakeColor( 105, 105, 255, 255 ), -1, -1 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Seasons"), 
-												 TheWindowManager->winMakeColor( 105, 205, 255, 255 ), -1, -1 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Misery"), 
-												 TheWindowManager->winMakeColor( 235, 105, 255, 255 ), -1, -1 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Natural"), 
-												 TheWindowManager->winMakeColor( 105, 205, 45, 255 ), -1, -1 );
+	GadgetListBoxAddEntryText( window, L"Listbox text",
+												 winMakeColor( 255, 255, 255, 255 ), -1, -1 );
+	GadgetListBoxAddEntryText( window, L"More text",
+												 winMakeColor( 105, 105, 255, 255 ), -1, -1 );
+	GadgetListBoxAddEntryText( window, L"Nothing",
+												 winMakeColor( 105, 105, 255, 255 ), -1, -1 );
+	GadgetListBoxAddEntryText( window, L"Seasons",
+												 winMakeColor( 105, 205, 255, 255 ), -1, -1 );
+	GadgetListBoxAddEntryText( window, L"Misery",
+												 winMakeColor( 235, 105, 255, 255 ), -1, -1 );
+	GadgetListBoxAddEntryText( window, L"Natural",
+												 winMakeColor( 105, 205, 45, 255 ), -1, -1 );
 
 	// make a vert slider
 	SliderData sliderData;
@@ -3910,7 +3845,7 @@ Bool GameWindowManager::initTestGUI( void )
 	sliderData.position = 0;
 	instData.init();
 	instData.m_style = GWS_VERT_SLIDER | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetSlider( NULL,
+	window = gogoGadgetSlider( NULL,
 																							 WIN_STATUS_ENABLED,
 																							 360, 250,
 																							 11, 100,
@@ -3925,7 +3860,7 @@ Bool GameWindowManager::initTestGUI( void )
 	sliderData.position = 0;
 	instData.init();
 	instData.m_style = GWS_VERT_SLIDER | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetSlider( NULL,
+	window = gogoGadgetSlider( NULL,
 																							 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																							 400, 250,
 																							 11, 100,
@@ -3940,7 +3875,7 @@ Bool GameWindowManager::initTestGUI( void )
 	sliderData.position = 0;
 	instData.init();
 	instData.m_style = GWS_HORZ_SLIDER | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetSlider( NULL,
+	window = gogoGadgetSlider( NULL,
 																							 WIN_STATUS_ENABLED,
 																							 200, 400,
 																							 200, 11,
@@ -3955,7 +3890,7 @@ Bool GameWindowManager::initTestGUI( void )
 	sliderData.position = 0;
 	instData.init();
 	instData.m_style = GWS_HORZ_SLIDER | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetSlider( NULL,
+	window = gogoGadgetSlider( NULL,
 																							 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																							 200, 420,
 																							 200, 11,
@@ -3965,7 +3900,7 @@ Bool GameWindowManager::initTestGUI( void )
 	// make a progress bar
 	instData.init();
 	instData.m_style = GWS_PROGRESS_BAR | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetProgressBar( NULL,
+	window = gogoGadgetProgressBar( NULL,
 																									 WIN_STATUS_ENABLED,
 																									 200, 450,
 																									 250, 15,
@@ -3974,7 +3909,7 @@ Bool GameWindowManager::initTestGUI( void )
 	// make a progress bar
 	instData.init();
 	instData.m_style = GWS_PROGRESS_BAR | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetProgressBar( NULL,
+	window = gogoGadgetProgressBar( NULL,
 																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																									 200, 470,
 																									 250, 15,
@@ -3986,7 +3921,7 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.init();
 	instData.m_style = GWS_STATIC_TEXT | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Centered Static Text";
-	window = TheWindowManager->gogoGadgetStaticText( NULL,
+	window = gogoGadgetStaticText( NULL,
 																									 WIN_STATUS_ENABLED,
 																									 200, 490,
 																									 300, 25,
@@ -3998,14 +3933,14 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.init();
 	instData.m_style = GWS_STATIC_TEXT | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Not Centered Static Text";
-	window = TheWindowManager->gogoGadgetStaticText( NULL,
+	window = gogoGadgetStaticText( NULL,
 																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																									 200, 520,
 																									 300, 25,
 																									 &instData,
 																									 &textData, NULL, TRUE );
-	window->winSetEnabledTextColors( TheWindowManager->winMakeColor( 128, 128, 255, 255 ),
-																	 TheWindowManager->winMakeColor( 255, 255, 255, 255 ) );
+	window->winSetEnabledTextColors( winMakeColor( 128, 128, 255, 255 ),
+																	 winMakeColor( 255, 255, 255, 255 ) );
 
 	// make some entry text
 	EntryData entryData;
@@ -4014,7 +3949,7 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.init();
 	instData.m_style = GWS_ENTRY_FIELD | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Entry";
-	window = TheWindowManager->gogoGadgetTextEntry( NULL,
+	window = gogoGadgetTextEntry( NULL,
 																									 WIN_STATUS_ENABLED,
 																									 450, 270,
 																									 400, 30,
@@ -4027,7 +3962,7 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.init();
 	instData.m_style = GWS_ENTRY_FIELD | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Entry";
-	window = TheWindowManager->gogoGadgetTextEntry( NULL,
+	window = gogoGadgetTextEntry( NULL,
 																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																									 450, 310,
 																									 400, 30,
@@ -4036,12 +3971,12 @@ Bool GameWindowManager::initTestGUI( void )
 
 	return TRUE;
 
-}  // end initTestGUI
+}
 
 
 void GameWindowManager::winNextTab( GameWindow *window )
 {
-	if(m_tabList.size() == 0|| m_modalHead)
+	if(m_tabList.empty()|| m_modalHead)
 		return;
 
 	GameWindowList::iterator it = m_tabList.begin();
@@ -4065,7 +4000,7 @@ void GameWindowManager::winNextTab( GameWindow *window )
 
 void GameWindowManager::winPrevTab( GameWindow *window )
 {
-	if(m_tabList.size() == 0 || m_modalHead)
+	if(m_tabList.empty() || m_modalHead)
 		return;
 
 	GameWindowList::reverse_iterator it = m_tabList.rbegin();
@@ -4083,7 +4018,7 @@ void GameWindowManager::winPrevTab( GameWindow *window )
 	else
 	{
 		winSetFocus(*m_tabList.rbegin());
-	}	
+	}
 	winSetLoneWindow(NULL);
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp
index 420b5b87db8..ae800d56ce6 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowManagerScript.cpp //////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -45,7 +45,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
@@ -72,11 +72,6 @@
 #include "GameClient/GameText.h"
 #include "GameClient/HeaderTemplate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -139,18 +134,18 @@ static Color defTextColor				= 0;
 static GameFont  *defFont				= NULL;
 
 //
-// These strings must be in the same order as they are in their definitions 
+// These strings must be in the same order as they are in their definitions
 // (see WIN_STATUS_* enums and GWS_* enums).
 //
-const char *WindowStatusNames[] = { "ACTIVE", "TOGGLE", "DRAGABLE", "ENABLED", "HIDDEN", 
+const char *const WindowStatusNames[] = { "ACTIVE", "TOGGLE", "DRAGABLE", "ENABLED", "HIDDEN",
 														  "ABOVE", "BELOW", "IMAGE", "TABSTOP", "NOINPUT",
 														  "NOFOCUS", "DESTROYED", "BORDER",
-														  "SMOOTH_TEXT", "ONE_LINE", "NO_FLUSH", "SEE_THRU", 
+														  "SMOOTH_TEXT", "ONE_LINE", "NO_FLUSH", "SEE_THRU",
 															"RIGHT_CLICK", "WRAP_CENTERED", "CHECK_LIKE","HOTKEY_TEXT",
 															"USE_OVERLAY_STATES", "NOT_READY", "FLASHING", "ALWAYS_COLOR",
 															NULL };
 
-const char *WindowStyleNames[] = { "PUSHBUTTON",	"RADIOBUTTON",	"CHECKBOX",
+const char *const WindowStyleNames[] = { "PUSHBUTTON",	"RADIOBUTTON",	"CHECKBOX",
 														 "VERTSLIDER",	"HORZSLIDER",		"SCROLLLISTBOX",
 														 "ENTRYFIELD",	"STATICTEXT",		"PROGRESSBAR",
 														 "USER",				"MOUSETRACK",		"ANIMATED",
@@ -203,16 +198,16 @@ static GameWindow *parseWindow( File *inFile, char *buffer );
 	* for ParseBitString().  Sets the appropriate bit in the 'bits' arg,
 	* if successful.  Returns TRUE on success, else FALSE. */
 //=============================================================================
-static Bool parseBitFlag( const char *flagString, UnsignedInt *bits, 
-													const char **flagList )
+static Bool parseBitFlag( const char *flagString, UnsignedInt *bits,
+													ConstCharPtrArray flagList )
 {
-	const char **c;
+	ConstCharPtrArray c;
 	int i;
 
 	for( i = 0, c = flagList; *c; i++, c++ )
 	{
 
-		if( !stricmp( *c, flagString ) )
+		if( stricmp( *c, flagString ) == 0 )
 		{
 			*bits |= (1 << i);
 			return TRUE;
@@ -222,7 +217,7 @@ static Bool parseBitFlag( const char *flagString, UnsignedInt *bits,
 
 	return FALSE;
 
-}  // end parseBitFlag
+}
 
 // parseBitString =============================================================
 /** Given a character string of the form 'A+B+C+D', parse the
@@ -230,26 +225,26 @@ static Bool parseBitFlag( const char *flagString, UnsignedInt *bits,
 	* argument.
 	* Note that this routine does not clear any bits, only sets them. */
 //=============================================================================
-static void parseBitString( const char *inBuffer, UnsignedInt *bits, const char **flagList )
+static void parseBitString( const char *inBuffer, UnsignedInt *bits, ConstCharPtrArray flagList )
 {
 	char buffer[256];
 	char *tok;
 
 	// do not modify the inBuffer argument
-	strcpy( buffer, inBuffer );
+	strlcpy(buffer, inBuffer, ARRAY_SIZE(buffer));
 
-	if( strncmp( buffer, "NULL", 4 ) )
+	if( strncmp( buffer, "NULL", 4 ) != 0 )
 	{
 		for( tok = strtok( buffer, "+" ); tok; tok = strtok( NULL, "+" ) )
 		{
 			if ( !parseBitFlag( tok, bits, flagList ) )
 			{
-				DEBUG_LOG(( "ParseBitString: Invalid flag '%s'.\n", tok ));
+				DEBUG_LOG(( "ParseBitString: Invalid flag '%s'.", tok ));
 			}
 		}
 	}
 
-}  // end parseBitString
+}
 
 // readUntilSemicolon =========================================================
 //=============================================================================
@@ -258,26 +253,26 @@ static void readUntilSemicolon( File *fp, char *buffer, int maxBufLen )
 	int i = 0;
 	Bool start = TRUE;
 
-	while( i < maxBufLen ) 
+	while( i < maxBufLen )
 	{
 
 		// get next character
 		fp->read(buffer + i, 1);
 
 		// make all whitespace characters spaces
-		if( isspace( buffer[ i ] ) ) 
+		if( isspace( buffer[ i ] ) )
 		{
 
 			if( start == FALSE )
 				buffer[ i++ ] = ' ';
 
-		} 
-		else 
+		}
+		else
 		{
 
 			start = FALSE;
 
-			if( buffer[ i ] == ';' ) 
+			if( buffer[ i ] == ';' )
 			{
 
 				// found end of data chunk
@@ -291,11 +286,11 @@ static void readUntilSemicolon( File *fp, char *buffer, int maxBufLen )
 
 	}
 
-	DEBUG_LOG(( "ReadUntilSemicolon: ERROR - Read buffer overflow - input truncated.\n" ));
+	DEBUG_LOG(( "ReadUntilSemicolon: ERROR - Read buffer overflow - input truncated." ));
 
 	buffer[ maxBufLen - 1 ] = '\000';
 
-}  // end readUntilSemicolon
+}
 
 // scanBool ===================================================================
 //=============================================================================
@@ -306,7 +301,7 @@ static Int scanBool( const char *source, Bool& val )
 	val = (Bool)temp;
 
 	return ret;
-}  // end scanBool
+}
 
 // scanShort ==================================================================
 //=============================================================================
@@ -317,7 +312,7 @@ static Int scanShort( const char *source, Short& val )
 	val = (Short)temp;
 
 	return ret;
-}  // end scanShort
+}
 
 // scanInt ====================================================================
 //=============================================================================
@@ -326,7 +321,7 @@ static Int scanInt( const char *source, Int& val )
 	Int ret = sscanf( source, "%d", &val ); // not strictly necessary to wrap this, but it's more consistent
 
 	return ret;
-}  // end scanInt
+}
 
 // scanUnsignedInt ============================================================
 //=============================================================================
@@ -335,7 +330,7 @@ static Int scanUnsignedInt( const char *source, UnsignedInt& val )
 	Int ret = sscanf( source, "%d", &val ); // not strictly necessary to wrap this, but it's more consistent
 
 	return ret;
-}  // end scanUnsignedInt
+}
 
 // resetWindowStack ===========================================================
 //=============================================================================
@@ -345,7 +340,7 @@ static void resetWindowStack( void )
   memset( windowStack, 0, sizeof( windowStack ) );
   stackPtr = windowStack;
 
-}  // end resetWindowStack
+}
 
 // resetWindowDefaults ========================================================
 //=============================================================================
@@ -360,7 +355,7 @@ static void resetWindowDefaults( void )
 	defTextColor = 0;
 	defFont = 0;
 
-}  // end resetWindowDefaults
+}
 
 // peekWindow =================================================================
 //=============================================================================
@@ -368,10 +363,10 @@ static GameWindow *peekWindow( void )
 {
   if (stackPtr == windowStack)
     return NULL;
-  
+
   return *(stackPtr - 1);
 
-}  // end peekWindow
+}
 
 // popWindow ==================================================================
 //=============================================================================
@@ -384,27 +379,27 @@ static GameWindow *popWindow( void )
 
   return *stackPtr;
 
-}  // end popWindow
+}
 
 // pushWindow =================================================================
 //=============================================================================
 static void pushWindow( GameWindow *window )
 {
 
-  if( stackPtr == &windowStack[ WIN_STACK_DEPTH - 1 ] ) 
+  if( stackPtr == &windowStack[ WIN_STACK_DEPTH - 1 ] )
 	{
 
-    DEBUG_LOG(( "pushWindow: Warning, stack overflow\n" ));
+    DEBUG_LOG(( "pushWindow: Warning, stack overflow" ));
     return;
 
-  }  // end if
+  }
 
   *stackPtr++ = window;
 
-}  // end pushWindow
+}
 
 // parseColor =================================================================
-/** Parse a color entry and store it in the value pointed to by the 
+/** Parse a color entry and store it in the value pointed to by the
 	* 'color' parm. */
 //=============================================================================
 static Bool parseColor( Color *color, char *buffer )
@@ -425,15 +420,15 @@ static Bool parseColor( Color *color, char *buffer )
 
   return TRUE;
 
-}  // end parseColor
+}
 
 // parseDefaultColor ==========================================================
-/** Parse a default color entry and store it in the value pointed to by 
+/** Parse a default color entry and store it in the value pointed to by
 	* the 'color' parm. */
 //=============================================================================
 static Bool parseDefaultColor( Color *color, File *inFile, char *buffer )
 {
-	// eat '=' 
+	// eat '='
 //	fscanf( inFile, "%*s" );
 	AsciiString str;
 	inFile->scanString(str);
@@ -441,18 +436,18 @@ static Bool parseDefaultColor( Color *color, File *inFile, char *buffer )
   // Read the rest of the color definition
 	readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );
 
-  if (!strcmp( buffer, "TRANSPARENT" ))
+  if (strcmp( buffer, "TRANSPARENT" ) == 0)
 	{
-		
+
 		*color = WIN_COLOR_UNDEFINED;
 
-	}  // end if
+	}
   else
     parseColor( color, buffer );
 
   return TRUE;
 
-}  // end parseDefaultColor
+}
 
 // parseDefaultFont ===========================================================
 /** Parse the default font */
@@ -460,7 +455,7 @@ static Bool parseDefaultColor( Color *color, File *inFile, char *buffer )
 static Bool parseDefaultFont( GameFont *font, File *inFile, char *buffer )
 {
 
-	// eat '=' 
+	// eat '='
 //	fscanf( inFile, "%*s" );
 	AsciiString str;
 	inFile->scanString(str);
@@ -475,12 +470,12 @@ static Bool parseDefaultFont( GameFont *font, File *inFile, char *buffer )
 
 	return TRUE;
 
-}  // end parseDefaultFont
+}
 
 // parseTooltip ===============================================================
 /** Parse the tooltip field */
 //=============================================================================
-static Bool parseTooltip( const char *token, WinInstanceData *instData, 
+static Bool parseTooltip( const char *token, WinInstanceData *instData,
 													char *buffer, void *data )
 {
 	UnicodeString tooltip;
@@ -490,7 +485,7 @@ static Bool parseTooltip( const char *token, WinInstanceData *instData,
 	instData->setTooltipText( tooltip );
 	return TRUE;
 
-}  // end parseTooltip
+}
 
 // parseScreenRect ============================================================
 /** Parse the screen rect entry which tells us the position and size
@@ -553,14 +548,14 @@ static Bool parseScreenRect( const char *token, char *buffer,
 		*x = screenRegion.lo.x - parentScreenPos.x;
 		*y = screenRegion.lo.y - parentScreenPos.y;
 
-	}  // end if
+	}
 	else
 	{
 
 		*x = screenRegion.lo.x;
 		*y = screenRegion.lo.y;
 
-	}  // end else
+	}
 
 	// save our width and height from the adjusted screen region locations
 	*width = screenRegion.hi.x - screenRegion.lo.x;
@@ -568,12 +563,12 @@ static Bool parseScreenRect( const char *token, char *buffer,
 
 	return TRUE;
 
-}  // end parseScreenRect
+}
 
 // parseImageOffset ===========================================================
 /** Parse the image draw offset */
 //=============================================================================
-static Bool parseImageOffset( const char *token, WinInstanceData *instData, 
+static Bool parseImageOffset( const char *token, WinInstanceData *instData,
 															char *buffer, void *data )
 {
   char *c;
@@ -583,15 +578,15 @@ static Bool parseImageOffset( const char *token, WinInstanceData *instData,
 
 	c = strtok( NULL, " \t\n\r" );
 	instData->m_imageOffset.y = atoi( c );
-  
+
   return TRUE;
 
-}  // end parseImageOffset
+}
 
 // parseFont ==================================================================
 /** Parse the font field */
 //=============================================================================
-static Bool parseFont( const char *token, WinInstanceData *instData, 
+static Bool parseFont( const char *token, WinInstanceData *instData,
 											 char *buffer, void *data )
 {
 	char *c, *ptr;
@@ -609,7 +604,7 @@ static Bool parseFont( const char *token, WinInstanceData *instData,
 		ptr++;
 	ptr++;  // skip the "
 	c = strtok( ptr, stringSeps );  // value
-	strcpy( fontName, c );
+	strlcpy(fontName, c, ARRAY_SIZE(fontName));
 
 	// "SIZE"
 	c = strtok( NULL, seps );  // label
@@ -623,17 +618,14 @@ static Bool parseFont( const char *token, WinInstanceData *instData,
 
 	if( TheFontLibrary )
 	{
-		GameFont *font;
-
-		font = TheFontLibrary->getFont( AsciiString(fontName), fontSize, fontBold );
+		GameFont *font = TheFontLibrary->getFont( AsciiString(fontName), fontSize, fontBold );
 		if( font )
 			instData->m_font = font;
-
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end parseFont
+}
 
 // parseName =================================================================
 /** Parse the NAME field */
@@ -657,15 +649,15 @@ static Bool parseName( const char *token, WinInstanceData *instData,
 	assert( TheNameKeyGenerator );
 	if( TheNameKeyGenerator )
 		instData->m_id = (Int)TheNameKeyGenerator->nameToKey( instData->m_decoratedNameString );
-	
+
 	return TRUE;
 
-}  // end parseName
+}
 
 // parseStatus ================================================================
 /** Parse the STATUS field */
 //=============================================================================
-static Bool parseStatus( const char *token, WinInstanceData *instData, 
+static Bool parseStatus( const char *token, WinInstanceData *instData,
 												 char *buffer, void *data )
 {
 
@@ -674,12 +666,12 @@ static Bool parseStatus( const char *token, WinInstanceData *instData,
 
   return TRUE;
 
-}  // end parseStatus
+}
 
 // parseStyle =================================================================
 /** Parse the STYLE field */
 //=============================================================================
-static Bool parseStyle( const char *token, WinInstanceData *instData, 
+static Bool parseStyle( const char *token, WinInstanceData *instData,
 												char *buffer, void *data )
 {
 
@@ -688,7 +680,7 @@ static Bool parseStyle( const char *token, WinInstanceData *instData,
 
   return TRUE;
 
-}  // end parseStyle
+}
 
 // parseSystemCallback ========================================================
 /** Parse the system method callback for a window */
@@ -715,7 +707,7 @@ static Bool parseSystemCallback( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseSystemCallback
+}
 
 // parseInputCallback =========================================================
 /** Parse the Input method callback for a window */
@@ -742,7 +734,7 @@ static Bool parseInputCallback( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseInputCallback
+}
 
 // parseTooltipCallback =======================================================
 /** Parse the Tooltip method callback for a window */
@@ -769,7 +761,7 @@ static Bool parseTooltipCallback( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseTooltipCallback
+}
 
 // parseDrawCallback ==========================================================
 /** Parse the Draw method callback for a window */
@@ -796,7 +788,7 @@ static Bool parseDrawCallback( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseDrawCallback
+}
 
 // parseHeaderTemplate ==========================================================
 /** Parse the Draw method callback for a window */
@@ -817,12 +809,12 @@ static Bool parseHeaderTemplate( const char *token, WinInstanceData *instData,
 
 	// save a pointer of the function address
 	DEBUG_ASSERTCRASH( TheNameKeyGenerator && TheFunctionLexicon, ("Invalid singletons") );
-	
+
 	instData->m_headerTemplateName = c;
-	
+
 	return TRUE;
 
-}  // end parseDrawCallback
+}
 
 // parseListboxData ===========================================================
 /** Parse listbox data entry */
@@ -846,7 +838,7 @@ static Bool parseListboxData( const char *token, WinInstanceData *instData,
 
 	// "SCROLLIFATEND" (optional)
 	c = strtok( NULL, seps );  // label
-	if ( !stricmp(c, "ScrollIfAtEnd") )
+	if ( stricmp(c, "ScrollIfAtEnd") == 0 )
 	{
 		c = strtok( NULL, seps );  // value
 		scanBool( c, listData->scrollIfAtEnd );
@@ -877,7 +869,7 @@ static Bool parseListboxData( const char *token, WinInstanceData *instData,
 	scanShort( c, listData->columns );
 	if(listData->columns > 1)
 	{
-		listData->columnWidthPercentage = NEW Int[listData->columns];	
+		listData->columnWidthPercentage = NEW Int[listData->columns];
 		for(Int i = 0; i < listData->columns; i++ )
 		{
 			// "COLUMNS"
@@ -894,11 +886,11 @@ static Bool parseListboxData( const char *token, WinInstanceData *instData,
 	c = strtok( NULL, seps );  // value
 	scanBool( c, listData->forceSelect );
 
-	
-	// "	
+
+	// "
 	return TRUE;
 
-}  // end parseListboxData
+}
 
 // parseComboBoxData ===========================================================
 /** Parse Combo Box data entry */
@@ -917,22 +909,22 @@ static Bool parseComboBoxData( const char *token, WinInstanceData *instData,
 	c = strtok( NULL, seps );  // label
 	c = strtok( NULL, seps );	// value
   scanInt( c, comboData->maxChars );
-	
+
 	c = strtok( NULL, seps );  // label
 	c = strtok( NULL, seps );	// value
   scanInt( c, comboData->maxDisplay );
-	
+
 	c = strtok( NULL, seps );  // label
 	c = strtok( NULL, seps );	// value
   scanBool( c, comboData->asciiOnly );
-	
+
 	c = strtok( NULL, seps );  // label
 	c = strtok( NULL, seps );	// value
   scanBool( c, comboData->lettersAndNumbersOnly );
-	
+
 
   return TRUE;
-}//parseComboBoxData
+}
 
 // parseSliderData ============================================================
 /** Parse slider data entry */
@@ -956,7 +948,7 @@ static Bool parseSliderData( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseSliderData
+}
 
 // parseRadioButtonData =======================================================
 /** Parse radio button data entry */
@@ -975,18 +967,18 @@ static Bool parseRadioButtonData( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseRadioButtonData
+}
 
 
 // parseTooltipText ===========================================================
 /** Parse the TOOLTIPTEXT field */
 //=============================================================================
-static Bool parseTooltipText( const char *token, WinInstanceData *instData, 
+static Bool parseTooltipText( const char *token, WinInstanceData *instData,
 											 char *buffer, void *data )
 {
 	char *ptr = buffer;
 	char *c;
-	const char *stringSeps = "\n\r\t\""; 
+	const char *stringSeps = "\n\r\t\"";
 
 	// scan to the first " mark
 	while( *ptr != '"' )
@@ -997,19 +989,19 @@ static Bool parseTooltipText( const char *token, WinInstanceData *instData,
 	c = strtok( ptr, stringSeps );  // value
 	if( strlen( c ) >= MAX_TEXT_LABEL )
 	{
-		
-		DEBUG_LOG(( "TextTooltip label '%s' is too long, max is '%d'\n", c, MAX_TEXT_LABEL ));
+
+		DEBUG_LOG(( "TextTooltip label '%s' is too long, max is '%d'", c, MAX_TEXT_LABEL ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 	instData->m_tooltipString.set(c);
 	instData->setTooltipText(TheGameText->fetch(c));
-	
+
 
   return TRUE;
 
-}  // end parseTooltipText
+}
 
 // parseTooltipDelay =======================================================
 /** Parse the tooltip delay */
@@ -1027,18 +1019,18 @@ static Bool parseTooltipDelay( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseTooltipDelay
+}
 
 
 // parseText ==================================================================
 /** Parse the TEXT field */
 //=============================================================================
-static Bool parseText( const char *token, WinInstanceData *instData, 
+static Bool parseText( const char *token, WinInstanceData *instData,
 											 char *buffer, void *data )
 {
 	char *ptr = buffer;
 	char *c;
-	const char *stringSeps = "\n\r\t\""; 
+	const char *stringSeps = "\n\r\t\"";
 
 	// scan to the first " mark
 	while( *ptr != '"' )
@@ -1047,18 +1039,18 @@ static Bool parseText( const char *token, WinInstanceData *instData,
 	c = strtok( ptr, stringSeps );  // value
 	if( strlen( c ) >= MAX_TEXT_LABEL )
 	{
-		
-		DEBUG_LOG(( "Text label '%s' is too long, max is '%d'\n", c, MAX_TEXT_LABEL ));
+
+		DEBUG_LOG(( "Text label '%s' is too long, max is '%d'", c, MAX_TEXT_LABEL ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 	instData->m_textLabelString = c;
-	
+
 
   return TRUE;
 
-}  // end parseText
+}
 
 // parseTextColor =============================================================
 /** Parse text color entries for enabled, disabled, and hilite with
@@ -1087,11 +1079,11 @@ static Bool parseTextColor( const char *token, WinInstanceData *instData,
 		else
 		{
 
-			DEBUG_LOG(( "Undefined state for text color\n" ));
+			DEBUG_LOG(( "Undefined state for text color" ));
 			assert( 0 );
 			return FALSE;
 
-		}  // end else
+		}
 
 		// color
 		if( first == TRUE )
@@ -1121,11 +1113,11 @@ static Bool parseTextColor( const char *token, WinInstanceData *instData,
 		scanUnsignedInt( c, a );
 		textData->borderColor = GameMakeColor( r, g, b, a );
 
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end parseTextColor
+}
 
 // parseStaticTextData ========================================================
 /** Parse static text data entry */
@@ -1144,7 +1136,7 @@ static Bool parseStaticTextData( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseStaticTextDAta
+}
 
 // parseTextEntryData =========================================================
 /** Parse text entry data entry */
@@ -1183,7 +1175,7 @@ static Bool parseTextEntryData( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseStaticTextDAta
+}
 
 // parseTabControlData =========================================================
 /** Parse tab control data entry */
@@ -1257,11 +1249,11 @@ static Bool parseDrawData( const char *token, WinInstanceData *instData,
 	{
 
 		// get the right draw data
-		if( strcmp( token, "ENABLEDDRAWDATA" ) == 0 )	
+		if( strcmp( token, "ENABLEDDRAWDATA" ) == 0 )
 			drawData = &instData->m_enabledDrawData[ i ];
-		else if( strcmp( token, "DISABLEDDRAWDATA" ) == 0 )	
+		else if( strcmp( token, "DISABLEDDRAWDATA" ) == 0 )
 			drawData = &instData->m_disabledDrawData[ i ];
-		else if( strcmp( token, "HILITEDRAWDATA" ) == 0 )	
+		else if( strcmp( token, "HILITEDRAWDATA" ) == 0 )
 			drawData = &instData->m_hiliteDrawData[ i ];
 		else if( strcmp( token, "LISTBOXENABLEDUPBUTTONDRAWDATA" ) == 0 )
 			drawData = &enabledUpButtonDrawData[ i ];
@@ -1308,11 +1300,11 @@ static Bool parseDrawData( const char *token, WinInstanceData *instData,
 		else
 		{
 
-			DEBUG_LOG(( "ParseDrawData, undefined token '%s'\n", token ));
+			DEBUG_LOG(( "ParseDrawData, undefined token '%s'", token ));
 			assert( 0 );
 			return FALSE;
 
-		}  // end else
+		}
 
 		// IMAGE: X
 		if( first == TRUE )
@@ -1320,9 +1312,9 @@ static Bool parseDrawData( const char *token, WinInstanceData *instData,
 		else
 			c = strtok( NULL, seps );  // label
 		first = FALSE;
-	
+
 		c = strtok( NULL, seps );  // value
-		if( strcmp( c, "NoImage" ) )
+		if( strcmp( c, "NoImage" ) != 0 )
 			drawData->image = TheMappedImageCollection->findImageByName( AsciiString( c ) );
 		else
 			drawData->image = NULL;
@@ -1350,11 +1342,11 @@ static Bool parseDrawData( const char *token, WinInstanceData *instData,
 		scanUnsignedInt( c, a );
 		drawData->borderColor = GameMakeColor( r, g, b, a );
 
-	}  // end for i
+	}
 
 	return TRUE;
 
-}  // end parseDrawData
+}
 
 // getDataTemplate ============================================================
 /** Given a window type style string return the address of a static
@@ -1372,57 +1364,57 @@ void *getDataTemplate( char *type )
 	static ComboBoxData	cData;
 	void *data;
 
-  if( !strcmp( type, "VERTSLIDER" ) || !strcmp( type, "HORZSLIDER" ) ) 
+  if( strcmp( type, "VERTSLIDER" ) == 0 || strcmp( type, "HORZSLIDER" ) == 0 )
 	{
 
     memset( &sData, 0, sizeof( SliderData ) );
     data = &sData;
 
-  } 
-	else if( !strcmp( type, "SCROLLLISTBOX" ) ) 
+  }
+	else if( strcmp( type, "SCROLLLISTBOX" ) == 0 )
 	{
 
     memset( &lData, 0, sizeof( ListboxData ) );
     data = &lData;
 
-  } 
-	else if( !strcmp( type, "TABCONTROL" ) ) 
+  }
+	else if( strcmp( type, "TABCONTROL" ) == 0 )
 	{
     memset( &tcData, 0, sizeof( TabControlData ) );
     data = &tcData;
-  } 
-	else if( !strcmp( type, "ENTRYFIELD" ) ) 
+  }
+	else if( strcmp( type, "ENTRYFIELD" ) == 0 )
 	{
 
     memset( &eData, 0, sizeof( EntryData ) );
     data = &eData;
 
-  } 
-	else if( !strcmp( type, "STATICTEXT" ) ) 
+  }
+	else if( strcmp( type, "STATICTEXT" ) == 0 )
 	{
 
 		memset( &tData, 0, sizeof( TextData ) );
 		data = &tData;
 
   }
-	else if( !strcmp( type, "RADIOBUTTON" ) ) 
-	{ 
+	else if( strcmp( type, "RADIOBUTTON" ) == 0 )
+	{
 
 		memset( &rData, 0, sizeof( RadioButtonData ) );
 		data = &rData;
-	}	
-	else if( !strcmp( type, "COMBOBOX" ) ) 
-	{ 
+	}
+	else if( strcmp( type, "COMBOBOX" ) == 0 )
+	{
 
 		memset( &cData, 0, sizeof( ComboBoxData ) );
 		data = &cData;
-	}	
+	}
 	else
     data = NULL;
 
   return data;
 
-}  // end getDataTemplate
+}
 
 // parseData ==================================================================
 //
@@ -1454,7 +1446,7 @@ static Bool parseData( void **data, char *type, char *buffer )
 	static RadioButtonData rData;
 	static ComboBoxData cData;
 
-  if( !strcmp( type, "VERTSLIDER" ) || !strcmp( type, "HORZSLIDER" ) ) 
+  if( strcmp( type, "VERTSLIDER" ) == 0 || strcmp( type, "HORZSLIDER" ) == 0 )
 	{
 
     memset( &sData, 0, sizeof( SliderData ) );
@@ -1467,8 +1459,8 @@ static Bool parseData( void **data, char *type, char *buffer )
 
     *data = &sData;
 
-  } 
-	else if( !strcmp( type, "SCROLLLISTBOX" ) ) 
+  }
+	else if( strcmp( type, "SCROLLLISTBOX" ) == 0 )
 	{
 
     memset( &lData, 0, sizeof( ListboxData ) );
@@ -1493,11 +1485,11 @@ static Bool parseData( void **data, char *type, char *buffer )
 
 		c = strtok( NULL, " \t\n\r" );
 		lData.forceSelect = atoi(c);
-		
+
     *data = &lData;
 
-  } 
-	else if( !strcmp( type, "ENTRYFIELD" ) ) 
+  }
+	else if( strcmp( type, "ENTRYFIELD" ) == 0 )
 	{
 
     memset( &eData, 0, sizeof( EntryData ) );
@@ -1537,13 +1529,13 @@ static Bool parseData( void **data, char *type, char *buffer )
 		}
     *data = &eData;
 
-  } 
-	else if( !strcmp( type, "STATICTEXT" ) ) 
+  }
+	else if( strcmp( type, "STATICTEXT" ) == 0 )
 	{
 
 	  c = strtok( buffer, " \t\n\r" );
     tData.centered = atoi(c);
-		
+
 		if( tData.centered != FALSE )
 			tData.centered = TRUE;
 
@@ -1559,8 +1551,8 @@ static Bool parseData( void **data, char *type, char *buffer )
 		*data = &tData;
 
   }
-	else if( !strcmp( type, "RADIOBUTTON" ) ) 
-	{ 
+	else if( strcmp( type, "RADIOBUTTON" ) == 0 )
+	{
 
 		c = strtok( buffer, " \t\n\r" );
 		rData.group = atoi(c);
@@ -1570,13 +1562,13 @@ static Bool parseData( void **data, char *type, char *buffer )
 //			tData.centered = TRUE;
 //		}
 		*data = &rData;
-	}	
+	}
 	else
     *data = NULL;
 
   return TRUE;
 
-}  // end parseData
+}
 
 // setWindowText ==============================================================
 /** Set the default text for a window or gadget control */
@@ -1608,34 +1600,34 @@ static void setWindowText( GameWindow *window, AsciiString textLabel )
 	else
 		window->winSetText( theText );
 
-}  // end setWindowText
+}
 
 // createGadget ===============================================================
 /** Create a gadget based on the 'type' parm */
 //=============================================================================
-static GameWindow *createGadget( char *type, 
-																 GameWindow *parent, 
+static GameWindow *createGadget( char *type,
+																 GameWindow *parent,
 																 Int status,
-																 Int x, Int y, 
-																 Int width, Int height, 
-																 WinInstanceData *instData, 
+																 Int x, Int y,
+																 Int width, Int height,
+																 WinInstanceData *instData,
 																 void *data )
 {
-  GameWindow *window;
+  GameWindow *window = NULL;
 
   instData->m_owner = parent;
 
-  if( !strcmp( type, "PUSHBUTTON" ) ) 
+  if( strcmp( type, "PUSHBUTTON" ) == 0 )
 	{
 
     instData->m_style |= GWS_PUSH_BUTTON;
-    window = TheWindowManager->gogoGadgetPushButton( parent, status, x, y, 
-																										 width, height, 
-																										 instData, 
+    window = TheWindowManager->gogoGadgetPushButton( parent, status, x, y,
+																										 width, height,
+																										 instData,
 																										 instData->m_font, FALSE );
 
-  } 
-	else if( !strcmp( type, "RADIOBUTTON" ) ) 
+  }
+	else if( strcmp( type, "RADIOBUTTON" ) == 0 )
 	{
 		RadioButtonData *rData = (RadioButtonData *)data;
 		char filename[ MAX_WINDOW_NAME_LEN ];
@@ -1645,49 +1637,49 @@ static GameWindow *createGadget( char *type,
 		// assign a screen identifier to the radio button based on the
 		// filename the radio button was saved in
 		//
-		
-		strcpy( filename, instData->m_decoratedNameString.str() );
+
+		strlcpy(filename, instData->m_decoratedNameString.str(), ARRAY_SIZE(filename));
 		c = strchr( filename, ':' );
 		if( c )
 			*c = 0;  // terminate after filename (format is filename:gadgetname)
 		assert( TheNameKeyGenerator );
 		if( TheNameKeyGenerator )
-			rData->screen = (Int)(TheNameKeyGenerator->nameToKey( AsciiString(filename) ));
+			rData->screen = (Int)(TheNameKeyGenerator->nameToKey( filename ));
 
     instData->m_style |= GWS_RADIO_BUTTON;
-    window = TheWindowManager->gogoGadgetRadioButton( parent, status, x, y, 
-																											width, height, 
-																											instData, rData, 
+    window = TheWindowManager->gogoGadgetRadioButton( parent, status, x, y,
+																											width, height,
+																											instData, rData,
 																											instData->m_font, FALSE );
 
-  } 
-	else if( !strcmp( type, "CHECKBOX" ) ) 
+  }
+	else if( strcmp( type, "CHECKBOX" ) == 0 )
 	{
 
     instData->m_style |= GWS_CHECK_BOX;
-    window = TheWindowManager->gogoGadgetCheckbox( parent, status, x, y, 
-																									 width, height, 
-																									 instData, 
+    window = TheWindowManager->gogoGadgetCheckbox( parent, status, x, y,
+																									 width, height,
+																									 instData,
 																									 instData->m_font, FALSE );
 
   }
-	else if( !strcmp( type, "TABCONTROL" ) ) 
+	else if( strcmp( type, "TABCONTROL" ) == 0 )
 	{
 		TabControlData *tcData = (TabControlData *)data;
     instData->m_style |= GWS_TAB_CONTROL;
-    window = TheWindowManager->gogoGadgetTabControl( parent, status, x, y, 
-																										width, height, 
+    window = TheWindowManager->gogoGadgetTabControl( parent, status, x, y,
+																										width, height,
 																										instData, tcData,
 																										instData->m_font, FALSE );
 	}
-	else if( !strcmp( type, "VERTSLIDER" ) ) 
+	else if( strcmp( type, "VERTSLIDER" ) == 0 )
 	{
     SliderData *sData = (SliderData *)data;
 
     instData->m_style |= GWS_VERT_SLIDER;
-    window = TheWindowManager->gogoGadgetSlider( parent, status, x, y, 
+    window = TheWindowManager->gogoGadgetSlider( parent, status, x, y,
 																								 width, height,
-																								 instData, sData, 
+																								 instData, sData,
 																								 instData->m_font, FALSE );
 
 		//
@@ -1707,19 +1699,19 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledSliderThumbDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteSliderThumbDrawData[ i ];
 
-			}  // end for i
+			}
 
-		}  //end if
+		}
 
   }
-	else if( !strcmp( type, "HORZSLIDER" ) ) 
+	else if( strcmp( type, "HORZSLIDER" ) == 0 )
 	{
     SliderData *sData = (SliderData *)data;
 
     instData->m_style |= GWS_HORZ_SLIDER;
-    window = TheWindowManager->gogoGadgetSlider( parent, status, x, y, 
+    window = TheWindowManager->gogoGadgetSlider( parent, status, x, y,
 																								 width, height,
-																								 instData, sData, 
+																								 instData, sData,
 																								 instData->m_font, FALSE );
 
 		//
@@ -1739,20 +1731,20 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledSliderThumbDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteSliderThumbDrawData[ i ];
 
-			}  // end for i
+			}
 
-		}  //end if
+		}
 
   }
-	else if( !strcmp( type, "SCROLLLISTBOX" ) ) 
+	else if( strcmp( type, "SCROLLLISTBOX" ) == 0 )
 	{
 
     ListboxData *lData = (ListboxData *)data;
 
     instData->m_style |= GWS_SCROLL_LISTBOX;
-    window = TheWindowManager->gogoGadgetListBox( parent, status, x, y, 
+    window = TheWindowManager->gogoGadgetListBox( parent, status, x, y,
 																									width, height,
-																									instData, lData, 
+																									instData, lData,
 																									instData->m_font, FALSE );
 
 		//
@@ -1772,9 +1764,9 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledUpButtonDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteUpButtonDrawData[ i ];
 
-			}  // end for i
+			}
 
-		}  // end if
+		}
 
 		GameWindow *downButton = GadgetListBoxGetDownButton( window );
 		if( downButton )
@@ -1788,9 +1780,9 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledDownButtonDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteDownButtonDrawData[ i ];
 
-			}  // end for i
+			}
 
-		}  // end if
+		}
 
 		GameWindow *slider = GadgetListBoxGetSlider( window );
 		if( slider )
@@ -1804,7 +1796,7 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledSliderDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteSliderDrawData[ i ];
 
-			}  // end for i
+			}
 
 			// do the slider thumb
 			GameWindow *thumb = slider->winGetChild();
@@ -1819,21 +1811,21 @@ static GameWindow *createGadget( char *type,
 					instData->m_disabledDrawData[ i ] = disabledSliderThumbDrawData[ i ];
 					instData->m_hiliteDrawData[ i ] = hiliteSliderThumbDrawData[ i ];
 
-				}  // end for i
+				}
 
-			}  //end if
+			}
 
-		}  // end if
+		}
 
   }
-	else if( !strcmp( type, "COMBOBOX" ) ) 
+	else if( strcmp( type, "COMBOBOX" ) == 0 )
 	{
 		ComboBoxData *cData = (ComboBoxData *)data;
 		cData->entryData = NEW EntryData;
 		memset ( cData->entryData, 0, sizeof(EntryData));
 		cData->listboxData = NEW ListboxData;
 		memset ( cData->listboxData, 0, sizeof(ListboxData));
-		
+
 		//initialize combo box data
 		//cData->isEditable = TRUE;
 		//cData->maxChars = 16;
@@ -1843,7 +1835,7 @@ static GameWindow *createGadget( char *type,
 		cData->entryData->aSCIIOnly = cData->asciiOnly;
 		cData->entryData->alphaNumericalOnly = cData->lettersAndNumbersOnly;
 		cData->entryData->maxTextLen = cData->maxChars;
-	
+
 		//initialize listbox data
 		cData->listboxData->listLength = 10;
 		cData->listboxData->autoScroll = 0;
@@ -1857,11 +1849,11 @@ static GameWindow *createGadget( char *type,
 		cData->listboxData->columnWidthPercentage = NULL;
 
     instData->m_style |= GWS_COMBO_BOX;
-    window = TheWindowManager->gogoGadgetComboBox( parent, status, x, y, 
+    window = TheWindowManager->gogoGadgetComboBox( parent, status, x, y,
 																									width, height,
-																									instData, cData, 
+																									instData, cData,
 																									instData->m_font, FALSE );
-		
+
 		GameWindow *dropDownButton = GadgetComboBoxGetDropDownButton( window );
 		if( dropDownButton )
 		{
@@ -1874,8 +1866,8 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledDropDownButtonDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteDropDownButtonDrawData[ i ];
 
-			}  // end for i
-		} // end if
+			}
+		}
 
 		GameWindow *editBox = GadgetComboBoxGetEditBox( window );
 		if( editBox )
@@ -1889,8 +1881,8 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledEditBoxDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteEditBoxDrawData[ i ];
 
-			}  // end for i
-		} // end if
+			}
+		}
 
 
 		GameWindow *listBox = GadgetComboBoxGetListBox( window );
@@ -1905,8 +1897,8 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledListBoxDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteListBoxDrawData[ i ];
 
-			}  // end for i
-			
+			}
+
 
 			GameWindow *upButton = GadgetListBoxGetUpButton( listBox );
 			if( upButton )
@@ -1920,9 +1912,9 @@ static GameWindow *createGadget( char *type,
 					instData->m_disabledDrawData[ i ] = disabledUpButtonDrawData[ i ];
 					instData->m_hiliteDrawData[ i ] = hiliteUpButtonDrawData[ i ];
 
-				}  // end for i
+				}
 
-			}  // end if
+			}
 
 			GameWindow *downButton = GadgetListBoxGetDownButton( listBox );
 			if( downButton )
@@ -1936,9 +1928,9 @@ static GameWindow *createGadget( char *type,
 					instData->m_disabledDrawData[ i ] = disabledDownButtonDrawData[ i ];
 					instData->m_hiliteDrawData[ i ] = hiliteDownButtonDrawData[ i ];
 
-				}  // end for i
+				}
 
-			}  // end if
+			}
 
 			GameWindow *slider = GadgetListBoxGetSlider( listBox );
 			if( slider )
@@ -1952,7 +1944,7 @@ static GameWindow *createGadget( char *type,
 					instData->m_disabledDrawData[ i ] = disabledSliderDrawData[ i ];
 					instData->m_hiliteDrawData[ i ] = hiliteSliderDrawData[ i ];
 
-				}  // end for i
+				}
 
 				// do the slider thumb
 				GameWindow *thumb = slider->winGetChild();
@@ -1967,60 +1959,60 @@ static GameWindow *createGadget( char *type,
 						instData->m_disabledDrawData[ i ] = disabledSliderThumbDrawData[ i ];
 						instData->m_hiliteDrawData[ i ] = hiliteSliderThumbDrawData[ i ];
 
-					}  // end for i
+					}
 
-				}  //end if
+				}
 
-			}  // end if
+			}
 		}
   }
-	else if( !strcmp( type, "ENTRYFIELD" ) ) 
+	else if( strcmp( type, "ENTRYFIELD" ) == 0 )
 	{
     EntryData *eData = (EntryData *)data;
 
     instData->m_style |= GWS_ENTRY_FIELD;
-    window = TheWindowManager->gogoGadgetTextEntry( parent, status, x, y, 
+    window = TheWindowManager->gogoGadgetTextEntry( parent, status, x, y,
 																										width, height,
-																										instData, eData, 
+																										instData, eData,
 																										instData->m_font, FALSE );
 
   }
-	else if( !strcmp( type, "STATICTEXT" ) ) 
+	else if( strcmp( type, "STATICTEXT" ) == 0 )
 	{
     TextData *tData = (TextData *)data;
 
     instData->m_style |= GWS_STATIC_TEXT;
-    window = TheWindowManager->gogoGadgetStaticText( parent, status, x, y, 
+    window = TheWindowManager->gogoGadgetStaticText( parent, status, x, y,
 																										 width, height,
-																										 instData, tData, 
+																										 instData, tData,
 																										 instData->m_font, FALSE );
 
 
   }
-	else if( !strcmp( type, "PROGRESSBAR" ) ) 
+	else if( strcmp( type, "PROGRESSBAR" ) == 0 )
 	{
 
     instData->m_style |= GWS_PROGRESS_BAR;
-    window = TheWindowManager->gogoGadgetProgressBar( parent, status, x, y, 
-																											width, height, 
-																											instData, 
+    window = TheWindowManager->gogoGadgetProgressBar( parent, status, x, y,
+																											width, height,
+																											instData,
 																											instData->m_font, FALSE );
 
   }
 
   return window;
 
-}  // end createGadget
+}
 
 // createWindow ===============================================================
 // Create a user window or a gadget depending on the 'type' parm
 //=============================================================================
-static GameWindow *createWindow( char *type, 
-																 Int id, 
-																 Int status, 
+static GameWindow *createWindow( char *type,
+																 Int id,
+																 Int status,
 																 Int x, Int y,
-																 Int width, Int height, 
-																 WinInstanceData *instData, 
+																 Int width, Int height,
+																 WinInstanceData *instData,
 																 void *data,
 																 GameWinSystemFunc system,
 																 GameWinInputFunc input,
@@ -2033,12 +2025,12 @@ static GameWindow *createWindow( char *type,
   parent = peekWindow();
 
   // If this is a regular window just create it
-  if( !strcmp( type, "USER" ) ) 
+  if( strcmp( type, "USER" ) == 0 )
 	{
 
-    window = TheWindowManager->winCreate( parent, 
-																					status, x, y, 
-																					width, height, 
+    window = TheWindowManager->winCreate( parent,
+																					status, x, y,
+																					width, height,
 																					system );
 		if( window )
 		{
@@ -2047,15 +2039,15 @@ static GameWindow *createWindow( char *type,
 			window->winSetInstanceData( instData );
 			window->winSetWindowId( id );
 
-		}  // end if
+		}
 
-  } 
-	else if( !strcmp( type, "TABPANE" ) ) 
+  }
+	else if( strcmp( type, "TABPANE" ) == 0 )
 	{
 
-    window = TheWindowManager->winCreate( parent, 
-																					status, x, y, 
-																					width, height, 
+    window = TheWindowManager->winCreate( parent,
+																					status, x, y,
+																					width, height,
 																					system );
 		if( window )
 		{
@@ -2064,28 +2056,28 @@ static GameWindow *createWindow( char *type,
 			window->winSetInstanceData( instData );
 			window->winSetWindowId( id );
 
-		}  // end if
+		}
 
-  } 
+  }
 
-	else 
+	else
 	{
 
     // Else parse the type and create the gadget
-    window = createGadget( type, 
-													 parent, 
-													 status, 
-													 x, y, 
+    window = createGadget( type,
+													 parent,
+													 status,
+													 x, y,
 													 width, height,
-                           instData, 
+                           instData,
 													 data );
 		if( window )
 		{
 
 			// set id
 			window->winSetWindowId( id );
-			
-		}  // end if
+
+		}
 
   }
 
@@ -2102,7 +2094,7 @@ static GameWindow *createWindow( char *type,
 			window->winSetTooltipFunc( tooltip );
 		if( draw )
 			window->winSetDrawFunc( draw );
-		
+
 		// save strings for edit data if present
 		GameWindowEditData *editData = window->winGetEditData();
 		if( editData )
@@ -2113,9 +2105,9 @@ static GameWindow *createWindow( char *type,
 			editData->tooltipCallbackString = theTooltipString;
 			editData->drawCallbackString = theDrawString;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	if( window )
 	{
@@ -2123,7 +2115,7 @@ static GameWindow *createWindow( char *type,
 		// set any text read from the textLabel
 		setWindowText( window, instData->m_textLabelString );
 
-	}  // end if
+	}
 
   // If there is a parent window, send it the SCRIPT_CREATE message
   if( window && parent )
@@ -2131,14 +2123,14 @@ static GameWindow *createWindow( char *type,
 
   return window;
 
-}  // end createWindow
+}
 
 // parseChildWindows ==========================================================
 /** Parse window descriptions until an extra end is encountered indicating
 	* the end of this block of child window descriptions. */
 //=============================================================================
-static Bool parseChildWindows( GameWindow *window, 
-															 File *inFile, 
+static Bool parseChildWindows( GameWindow *window,
+															 File *inFile,
 															 char *buffer )
 {
   GameWindow *lastWindow;
@@ -2155,11 +2147,11 @@ static Bool parseChildWindows( GameWindow *window,
 			TheWindowManager->winDestroy( myChild );
 		}
 	}
-		
+
 		// Push the current window onto the stack so we know it's the parent
   pushWindow( window );
 
-	while( TRUE ) 
+	while( TRUE )
 	{
 
 		if (inFile->scanString(asciibuf) == FALSE) {
@@ -2177,34 +2169,34 @@ static Bool parseChildWindows( GameWindow *window,
 		if (asciibuf.compare("ENABLEDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defEnabledColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defEnabledColor, inFile, buffer ) == FALSE )
 			{
 				return FALSE;
 			}
 
-		} 
+		}
 		else if (asciibuf.compare("DISABLEDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defDisabledColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defDisabledColor, inFile, buffer ) == FALSE )
 			{
 				return FALSE;
 			}
 
-		} 
+		}
 		else if (asciibuf.compare("HILITECOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defHiliteColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defHiliteColor, inFile, buffer ) == FALSE )
 			{
 				return FALSE;
 			}
 
-		} 
+		}
 		else if (asciibuf.compare("SELECTEDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defSelectedColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defSelectedColor, inFile, buffer ) == FALSE )
 			{
 				return FALSE;
 			}
@@ -2213,7 +2205,7 @@ static Bool parseChildWindows( GameWindow *window,
 		else if (asciibuf.compare("TEXTCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defTextColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defTextColor, inFile, buffer ) == FALSE )
 			{
 				return FALSE;
 			}
@@ -2223,22 +2215,22 @@ static Bool parseChildWindows( GameWindow *window,
 		{
 
       // Parse window descriptions until the last END is read
-			if( parseWindow( inFile, buffer ) == NULL ) 
+			if( parseWindow( inFile, buffer ) == NULL )
 			{
 				return FALSE;
 			}
 
 		}
 
-	}  // end while( TRUE )
+	}
 
   // Pop the current window off the stack
   lastWindow = popWindow();
 
-  if( lastWindow != window ) 
+  if( lastWindow != window )
 	{
 
-    DEBUG_LOG(( "parseChildWindows: unmatched window on stack.  Corrupt stack or bad source\n" ));
+    DEBUG_LOG(( "parseChildWindows: unmatched window on stack.  Corrupt stack or bad source" ));
     return FALSE;
 
   }
@@ -2248,10 +2240,10 @@ static Bool parseChildWindows( GameWindow *window,
 
   return TRUE;
 
-}  // end parseChildWindows
+}
 
 // lookup table for parsing functions
-static GameWindowParse gameWindowFieldList[] = 
+static GameWindowParse gameWindowFieldList[] =
 {
 	{ "NAME", parseName },
 	{ "STATUS", parseStatus },
@@ -2340,12 +2332,12 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 	if( parent )
 	{
 		parent->winGetSize( &parentSize.x, &parentSize.y );
-	}  // end if
+	}
 	else
 	{
 		parentSize.x = TheDisplay->getWidth();
 		parentSize.y = TheDisplay->getHeight();
-	}  // end else
+	}
 
 	// Initialize the instance data to the defaults
 	/// @todo need to support enabled/disabled/hilite text colors here
@@ -2361,63 +2353,63 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 	instData.m_font = defFont;
 
 	//
-	// read the first few lines that are required to be first in a 
+	// read the first few lines that are required to be first in a
 	// window definition file including position, size, type, and id
 	//
 
 	// window type
-	readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );	
+	readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );
 	c = strtok( buffer, seps );
 	assert( strcmp( c, "WINDOWTYPE" ) == 0 );
 	c = strtok( NULL, seps );  // get data to right of = sign
-	strcpy( type, c );
+	strlcpy(type, c, ARRAY_SIZE(type));
 
 	//
 	// based on the window type get a pointer for any specific data
 	// for the gadget controls needed
 	//
 	data = getDataTemplate( type );
-	
+
 	// position
-	readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );	
+	readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );
 	c = strtok( buffer, seps );
 	assert( strcmp( c, "SCREENRECT" ) == 0 );
 	if( parseScreenRect( c, buffer, &x, &y, &width, &height ) == FALSE )
 		goto cleanupAndExit;
 
 	// parse all the field definitions
-	while( TRUE ) 
+	while( TRUE )
 	{
 
 		// get token
 		inFile->scanString(asciibuf);
 
 		// parse field
-		for( parse = gameWindowFieldList; parse->parse; parse++ ) 
+		for( parse = gameWindowFieldList; parse->parse; parse++ )
 		{
 
 			if (asciibuf.compare(parse->name) == 0)
 			{
-				
-				strcpy( token, asciibuf.str() );
+
+				strlcpy(token, asciibuf.str(), ARRAY_SIZE(token));
 
 				// eat '='
 				inFile->scanString(asciibuf);
 
 				readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );
 
-				if (parse->parse( token, &instData, buffer, data ) == FALSE ) 
+				if (parse->parse( token, &instData, buffer, data ) == FALSE )
 				{
-					DEBUG_LOG(( "parseGameObject: Error parsing %s\n", parse->name ));
+					DEBUG_LOG(( "parseGameObject: Error parsing %s", parse->name ));
 					goto cleanupAndExit;
 				}
 
 				break;
 			}
 
-		}  // end for
+		}
 
-		if( parse->parse == NULL ) 
+		if( parse->parse == NULL )
 		{
 
 			// If it's the END keyword
@@ -2429,13 +2421,13 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 
 				readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );
 
-				if( parseData( &data, type, buffer ) == FALSE ) 
+				if( parseData( &data, type, buffer ) == FALSE )
 				{
-					DEBUG_LOG(( "parseGameWindow: Error parsing %s\n", parse->name ));
+					DEBUG_LOG(( "parseGameWindow: Error parsing %s", parse->name ));
 					goto cleanupAndExit;
 				}
 
-			} 
+			}
 			else if (asciibuf.compare("END") == 0)
 			{
 				// Check to see if we have a header template, if so, set the font equal to that.
@@ -2445,13 +2437,13 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 				// Create a window using the current description
 				if( window == NULL )
 					window = createWindow( type, instData.m_id, instData.getStatus(), x, y,
-																 width, height, &instData, data, 
+																 width, height, &instData, data,
 																 systemFunc, inputFunc, tooltipFunc, drawFunc );
 
-				
+
 				goto cleanupAndExit;
 
-			} 
+			}
 			else if (asciibuf.compare("CHILD") == 0)
 			{
 
@@ -2471,10 +2463,10 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 					window = NULL;
 					goto cleanupAndExit;
 
-				}  // end if
+				}
 
-			} 
-			else 
+			}
+			else
 			{
 
 				// Else it is unrecognized so eat associated data
@@ -2482,9 +2474,9 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 
 			}
 
-		}  // end if
+		}
 
-	}  // end while( TRUE )
+	}
 
 cleanupAndExit:
 
@@ -2499,7 +2491,7 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 
 	return window;
 
-}  // end parseWindow
+}
 
 //=================================================================================================
 //=================================================================================================
@@ -2522,7 +2514,7 @@ Bool parseInit( const char *token, char *buffer, UnsignedInt version, WindowLayo
 
 	return TRUE;  // success
 
-}  // end parseInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse update for layout file */
@@ -2541,7 +2533,7 @@ Bool parseUpdate( const char *token, char *buffer, UnsignedInt version, WindowLa
 
 	return TRUE;  // success
 
-}  // end parseUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse shutdown for layout file */
@@ -2560,7 +2552,7 @@ Bool parseShutdown( const char *token, char *buffer, UnsignedInt version, Window
 
 	return TRUE;  // success
 
-}  // end parseShutdown
+}
 
 static LayoutScriptParse layoutScriptTable[] =
 {
@@ -2615,23 +2607,23 @@ Bool parseLayoutBlock( File *inFile, char *buffer, UnsignedInt version, WindowLa
 				// eat equals separator " = "
 				c = strtok( buffer, " =" );
 
-				strcpy(token, asciitoken.str());
-				
+				strlcpy(token, asciitoken.str(), ARRAY_SIZE(token));
+
 				// parse it
-				if( parse->parse( token, c, version, info ) == FALSE )	
+				if( parse->parse( token, c, version, info ) == FALSE )
 					return FALSE;
 
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for parse
+		}
 
-	}  // end while
+	}
 
 	return TRUE;
 
-}  // end parseLayoutBlock
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -2655,12 +2647,12 @@ WindowLayout *GameWindowManager::winCreateLayout( AsciiString filename )
 		deleteInstance(layout);
 		return NULL;
 
-	}  // end if
-	
+	}
+
 	// return loaded layout
 	return layout;
 
-}  // end winCreateLayout
+}
 
 /** Free up the memory used by static strings.  Normally this memory
 is freed by the string destructor but we do it here to make the
@@ -2690,7 +2682,7 @@ WindowLayoutInfo::WindowLayoutInfo() :
 	* within it.
 	*
 	* NOTE: The FIRST window created from the script is returned, this
-	* way if you want to know ALL of the windows created from this 
+	* way if you want to know ALL of the windows created from this
 	* layout file you must iterate over info->windows, since the windows will
 	* not be at the head of the window list if there is a modal window active.
 	*/
@@ -2724,13 +2716,13 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 	if( strchr( filename, '\\' ) == NULL )
 		sprintf( filepath, "Window\\%s", filename );
 	else
-		strcpy( filepath, filename );
+		strlcpy(filepath, filename, ARRAY_SIZE(filepath));
 
   // Open the input file
 	inFile = TheFileSystem->openFile(filepath, File::READ);
 	if (inFile == NULL)
 	{
-		DEBUG_LOG(( "WinCreateFromScript: Cannot access file '%s'.\n", filename ));
+		DEBUG_LOG(( "WinCreateFromScript: Cannot access file '%s'.", filename ));
 		return NULL;
 	}
 
@@ -2747,12 +2739,12 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		if( parseLayoutBlock( inFile, buffer, version, &scriptInfo ) == FALSE )
 		{
 
-			DEBUG_LOG(( "WinCreateFromScript: Error parsing layout block\n" ));
+			DEBUG_LOG(( "WinCreateFromScript: Error parsing layout block" ));
 			return FALSE;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 
@@ -2761,9 +2753,9 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		scriptInfo.updateNameString = "[None]";
 		scriptInfo.shutdownNameString = "[None]";
 
-	}  // end else
+	}
 
-	while( TRUE ) 
+	while( TRUE )
 	{
 
 		if (inFile->scanString(asciibuf) == FALSE) {
@@ -2777,7 +2769,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		if (asciibuf.compare("ENABLEDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defEnabledColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defEnabledColor, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2788,7 +2780,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		else if (asciibuf.compare("DISABLEDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defDisabledColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defDisabledColor, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2799,7 +2791,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		else if (asciibuf.compare("HILITECOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defHiliteColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defHiliteColor, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2810,7 +2802,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		else if (asciibuf.compare("SELECTEDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defSelectedColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defSelectedColor, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2821,7 +2813,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		else if (asciibuf.compare("TEXTCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defTextColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defTextColor, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2832,7 +2824,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		else if (asciibuf.compare("BACKGROUNDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defBackgroundColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defBackgroundColor, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2843,7 +2835,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		else if (asciibuf.compare("FONT") == 0)
 		{
 
-			if( parseDefaultFont( defFont, inFile, buffer ) == FALSE ) 
+			if( parseDefaultFont( defFont, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2863,9 +2855,9 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 
 			scriptInfo.windows.push_back(window);
 
-    }  // end else if
+    }
 
-	}  // end while( TRUE )
+	}
 
 	// close the file
 	inFile->close();
@@ -2878,5 +2870,5 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 	// return the first window created
 	return firstWindow;
 
-}  // end WinCreateFromScript
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp
index bf6cbbf42c7..cf9e287d297 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowTransitions.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Dec 2002
@@ -37,8 +37,8 @@
 //	Filename: 	GameWindowTransitions.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,12 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -60,17 +55,18 @@
 #include "GameClient/GameWindowTransitions.h"
 #include "GameClient/GameWindow.h"
 #include "GameClient/GameWindowManager.h"
+#include "Common/FramePacer.h"
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 GameWindowTransitionsHandler *TheTransitionHandler = NULL;
-const FieldParse GameWindowTransitionsHandler::m_gameWindowTransitionsFieldParseTable[] = 
+const FieldParse GameWindowTransitionsHandler::m_gameWindowTransitionsFieldParseTable[] =
 {
 
 	{ "Window",		GameWindowTransitionsHandler::parseWindow,	NULL, NULL	},
 	{ "FireOnce",	INI::parseBool,															NULL, offsetof( TransitionGroup, m_fireOnce) 	},
-	
-	{ NULL,										NULL,													NULL, 0 }  // keep this last
+
+	{ NULL,										NULL,													NULL, 0 }
 
 };
 
@@ -81,20 +77,20 @@ void INI::parseWindowTransitions( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
-	
-	DEBUG_ASSERTCRASH( TheTransitionHandler, ("parseWindowTransitions: TheTransitionHandler doesn't exist yet\n") );
+
+	DEBUG_ASSERTCRASH( TheTransitionHandler, ("parseWindowTransitions: TheTransitionHandler doesn't exist yet") );
 	if( !TheTransitionHandler )
 		return;
 
 	// If we have a previously allocated control bar, this will return a cleared out pointer to it so we
-	// can overwrite it	
+	// can overwrite it
 	g = TheTransitionHandler->getNewGroup( name );
 
 	// sanity
-	DEBUG_ASSERTCRASH( g, ("parseWindowTransitions: Unable to allocate group '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( g, ("parseWindowTransitions: Unable to allocate group '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( g, TheTransitionHandler->getFieldParse() );
@@ -162,9 +158,8 @@ TransitionWindow::~TransitionWindow( void )
 		m_win->unlinkTransitionWindow(this);
 
 	m_win = NULL;
-	if(m_transition)
-		delete m_transition;
 
+	delete m_transition;
 	m_transition = NULL;
 }
 
@@ -176,10 +171,8 @@ Bool TransitionWindow::init( void )
 //	DEBUG_ASSERTCRASH( m_win, ("TransitionWindow::init Failed to find window %s", m_winName.str()));
 //	if( !m_win )
 //		return FALSE;
-	
-	if(m_transition)
-		delete m_transition;
 
+	delete m_transition;
 	m_transition = getTransitionForStyle( m_style );
 	m_transition->init(m_win);
 
@@ -194,7 +187,7 @@ void TransitionWindow::update( Int frame )
 {
 	if(frame < m_currentFrameDelay || frame > (m_currentFrameDelay + m_transition->getFrameLength()))
 		return;
-	
+
 	if(m_transition)
 		m_transition->update( frame - m_currentFrameDelay);
 }
@@ -258,7 +251,6 @@ TransitionGroup::~TransitionGroup( void )
 	{
 		TransitionWindow *tWin = *it;
 		delete tWin;
-		tWin = NULL;
 		it = m_transitionWindowList.erase(it);
 	}
 }
@@ -279,14 +271,16 @@ void TransitionGroup::init( void )
 
 void TransitionGroup::update( void )
 {
-	m_currentFrame += m_directionMultiplier; // we go forward or backwards depending.
+	// TheSuperHackers @tweak GUI transition timing is now decoupled from the render update.
+	const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
+	m_currentFrame += m_directionMultiplier * timeScale; // we go forward or backwards depending.
 	TransitionWindowList::iterator it = m_transitionWindowList.begin();
 	while (it != m_transitionWindowList.end())
 	{
 		TransitionWindow *tWin = *it;
 		tWin->update(m_currentFrame);
 		it++;
-	}	
+	}
 }
 
 Bool TransitionGroup::isFinished( void )
@@ -307,7 +301,7 @@ void TransitionGroup::reverse( void )
 {
 	Int totalFrames =0;
 	m_directionMultiplier = -1;
-	
+
 	TransitionWindowList::iterator it = m_transitionWindowList.begin();
 	while (it != m_transitionWindowList.end())
 	{
@@ -403,7 +397,7 @@ void GameWindowTransitionsHandler::load(void )
 {
 	INI ini;
 	// Read from INI all the ControlBarSchemes
-	ini.load( AsciiString( "Data\\INI\\WindowTransitions.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\WindowTransitions", INI_LOAD_OVERWRITE, NULL );
 
 }
 
@@ -470,7 +464,7 @@ void GameWindowTransitionsHandler::setGroup(AsciiString groupName, Bool immidiat
 			m_currentGroup->init();
 		return;
 	}
-	
+
 	if(m_currentGroup)
 	{
 		if(!m_currentGroup->isFireOnce() && !m_currentGroup->isReversed())
@@ -485,8 +479,8 @@ void GameWindowTransitionsHandler::setGroup(AsciiString groupName, Bool immidiat
 	if(m_currentGroup)
 		m_currentGroup->init();
 
-	
-	
+
+
 }
 
 void GameWindowTransitionsHandler::reverse( AsciiString groupName )
@@ -578,12 +572,12 @@ TransitionGroup *GameWindowTransitionsHandler::findGroup( AsciiString groupName
 
 void GameWindowTransitionsHandler::parseWindow( INI* ini, void *instance, void *store, const void *userData )
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "WinName",				INI::parseAsciiString,		NULL,									offsetof( TransitionWindow, m_winName ) },
       { "Style",					INI::parseLookupList,			TransitionStyleNames,	offsetof( TransitionWindow, m_style ) },
 			{ "FrameDelay",			INI::parseInt,						NULL,									offsetof( TransitionWindow, m_frameDelay ) },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 	TransitionWindow *transWin = NEW TransitionWindow;
 	ini->initFromINI(transWin, myFieldParse);
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
index c968b80232f..72fe21b80d7 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowTransitionsStyles.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Dec 2002
@@ -37,7 +37,7 @@
 //	Filename: 	GameWindowTransitionsStyles.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The Actual Styles that can fire off.
 //
 //-----------------------------------------------------------------------------
@@ -46,12 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -76,7 +71,7 @@ void drawTypeText( GameWindow *window, DisplayString *str);
 //-----------------------------------------------------------------------------
 Transition::Transition ( void )
 {
-	
+
 }
 
 Transition::~Transition( void )
@@ -124,7 +119,7 @@ void FlashTransition::update( Int frame )
 	switch (frame) {
 	case FLASHTRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win)
 				break;
 			m_win->winHide(TRUE);
@@ -139,9 +134,11 @@ void FlashTransition::update( Int frame )
 			if( TheAudio )
 			{
 				TheAudio->addAudioEvent( &buttonClick );
-			}  // end if
-		
+			}
+
 		}
+		FALLTHROUGH;
+
 	case FLASHTRANSITION_FADE_IN_2:
 	case FLASHTRANSITION_FADE_IN_3:
 		{
@@ -171,8 +168,8 @@ void FlashTransition::update( Int frame )
 		}
 		break;
 	}
-	
-	
+
+
 }
 
 void FlashTransition::reverse( void )
@@ -184,7 +181,7 @@ void FlashTransition::reverse( void )
 
 void FlashTransition::draw( void )
 {
-	switch (m_drawState) 
+	switch (m_drawState)
 	{
 		case FLASHTRANSITION_FADE_IN_1:
 		{
@@ -230,12 +227,12 @@ void FlashTransition::draw( void )
 		break;
 	}
 }
-	
+
 void FlashTransition::skip( void )
 {
 	update(FLASHTRANSITION_END);
 }
-	
+
 //-----------------------------------------------------------------------------
 
 
@@ -278,7 +275,7 @@ void ButtonFlashTransition::update( Int frame )
 	switch (frame) {
 	case BUTTONFLASHTRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win)
 				break;
 			m_win->winHide(TRUE);
@@ -293,11 +290,11 @@ void ButtonFlashTransition::update( Int frame )
 				if(m_isForward)
 				{
 					AudioEventRTS buttonClick("GUIButtonsFadeIn");
-	
+
 					if( TheAudio )
 					{
 						TheAudio->addAudioEvent( &buttonClick );
-					}  // end if
+					}
 
 					m_drawState = frame;
 				}
@@ -324,7 +321,7 @@ void ButtonFlashTransition::update( Int frame )
 				if(m_isForward)
 					m_drawState = frame;
 				else
-					m_drawState = BUTTONFLASHTRANSITION_FADE_TO_BACKGROUND_2;		
+					m_drawState = BUTTONFLASHTRANSITION_FADE_TO_BACKGROUND_2;
 		}
 		break;
 	case BUTTONFLASHTRANSITION_FADE_TO_BACKGROUND_1:
@@ -378,19 +375,19 @@ void ButtonFlashTransition::update( Int frame )
 			if(m_isForward)
 			{
 //				AudioEventRTS buttonClick("GUIBlip");
-//	
+//
 //				if( TheAudio )
 //				{
 //					TheAudio->addAudioEvent( &buttonClick );
 //				}  // end if
 
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = frame;
 			}
 			else
 			{
-				
-				m_win->winHide(TRUE);	
+
+				m_win->winHide(TRUE);
 				m_drawState = BUTTONFLASHTRANSITION_FADE_TO_GRADE_OUT_4;
 			}
 
@@ -402,12 +399,12 @@ void ButtonFlashTransition::update( Int frame )
 				break;
 			if(m_isForward)
 			{
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = frame;
 			}
 			else
 			{
-				m_win->winHide(TRUE);	
+				m_win->winHide(TRUE);
 				m_drawState = BUTTONFLASHTRANSITION_FADE_TO_GRADE_OUT_3;
 			}
 		}
@@ -418,12 +415,12 @@ void ButtonFlashTransition::update( Int frame )
 				break;
 			if(m_isForward)
 			{
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = frame;
 			}
 			else
 			{
-				m_win->winHide(TRUE);	
+				m_win->winHide(TRUE);
 				m_drawState = BUTTONFLASHTRANSITION_FADE_TO_GRADE_OUT_2;
 			}
 		}
@@ -434,12 +431,12 @@ void ButtonFlashTransition::update( Int frame )
 				break;
 			if(m_isForward)
 			{
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = frame;
 			}
 			else
 			{
-				m_win->winHide(TRUE);	
+				m_win->winHide(TRUE);
 				m_drawState = BUTTONFLASHTRANSITION_FADE_TO_GRADE_OUT_1;
 			}
 		}
@@ -450,12 +447,12 @@ void ButtonFlashTransition::update( Int frame )
 				break;
 			if(m_isForward)
 			{
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = frame;
 			}
 			else
 			{
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = BUTTONFLASHTRANSITION_FADE_TO_GRADE_IN_2;
 			}
 		}
@@ -467,15 +464,15 @@ void ButtonFlashTransition::update( Int frame )
 				break;
 			if(m_isForward)
 			{
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = frame;
 			}
 			else
 			{
-				m_win->winHide(FALSE);	
+				m_win->winHide(FALSE);
 				m_drawState = BUTTONFLASHTRANSITION_FADE_TO_GRADE_IN_1;
 			}
-			
+
 		}
 		break;
 	case BUTTONFLASHTRANSITION_END:
@@ -489,7 +486,7 @@ void ButtonFlashTransition::update( Int frame )
 	}
 	if(frame > BUTTONFLASHTRANSITION_FADE_TO_BACKGROUND_4 && frame < BUTTONFLASHTRANSITION_FADE_TO_GRADE_IN_1)
 		m_drawState = BUTTONFLASHTRANSITION_SHOW_BACKGROUND;
-	
+
 }
 
 void ButtonFlashTransition::reverse( void )
@@ -501,7 +498,7 @@ void ButtonFlashTransition::reverse( void )
 
 void ButtonFlashTransition::draw( void )
 {
-	switch (m_drawState) 
+	switch (m_drawState)
 	{
 		case BUTTONFLASHTRANSITION_FADE_IN_1:
 		{
@@ -604,7 +601,7 @@ void ButtonFlashTransition::draw( void )
 
 	}
 }
-	
+
 void ButtonFlashTransition::skip( void )
 {
 	update(BUTTONFLASHTRANSITION_END);
@@ -651,7 +648,7 @@ void FadeTransition::update( Int frame )
 	switch (frame) {
 	case FADETRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win)
 				break;
 			m_win->winHide(TRUE);
@@ -678,7 +675,7 @@ void FadeTransition::update( Int frame )
 			m_win->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 }
 
 void FadeTransition::reverse( void )
@@ -695,7 +692,7 @@ void FadeTransition::draw( void )
 	if(m_drawState <= FADETRANSITION_START || m_drawState >= FADETRANSITION_END)
 		return;
 	const Image *image = m_win->winGetEnabledImage(0);
-	switch (m_drawState) 
+	switch (m_drawState)
 	{
 		case FADETRANSITION_FADE_IN_1:
 		{
@@ -743,7 +740,7 @@ void FadeTransition::draw( void )
 		}
 	}
 }
-	
+
 void FadeTransition::skip( void )
 {
 	update(FADETRANSITION_END);
@@ -775,7 +772,7 @@ void ScaleUpTransition::init( GameWindow *win )
 	update(SCALEUPTRANSITION_START);
 	m_isFinished = FALSE;
 	m_isForward = TRUE;
-	
+
 	m_centerPos.x = m_pos.x + m_size.x / 2;
 	m_centerPos.y = m_pos.y + m_size.y / 2;
 	m_incrementSize.x = m_size.x / SCALEUPTRANSITION_END;
@@ -808,10 +805,10 @@ void ScaleUpTransition::update( Int frame )
 			if( TheAudio )
 			{
 				TheAudio->addAudioEvent( &buttonClick );
-			}  // end if
+			}
 
-			
 		}
+		FALLTHROUGH;
 
 	case SCALEUPTRANSITION_2:
 	case SCALEUPTRANSITION_3:
@@ -842,7 +839,7 @@ void ScaleUpTransition::update( Int frame )
 			m_win->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 }
 
 void ScaleUpTransition::reverse( void )
@@ -865,7 +862,7 @@ void ScaleUpTransition::draw( void )
 	Int y1 = y + m_incrementSize.y * m_drawState;
 	TheDisplay->drawImage(image, x,y, x1, y1);
 }
-	
+
 void ScaleUpTransition::skip( void )
 {
 	update(SCALEUPTRANSITION_END);
@@ -898,7 +895,7 @@ void ScoreScaleUpTransition::init( GameWindow *win )
 	update(SCORESCALEUPTRANSITION_START);
 	m_isFinished = FALSE;
 	m_isForward = TRUE;
-	
+
 	m_centerPos.x = m_pos.x + m_size.x / 2;
 	m_centerPos.y = m_pos.y + m_size.y / 2;
 	m_incrementSize.x = m_size.x / SCORESCALEUPTRANSITION_END;
@@ -931,10 +928,10 @@ void ScoreScaleUpTransition::update( Int frame )
 			if( TheAudio )
 			{
 				TheAudio->addAudioEvent( &buttonClick );
-			}  // end if
+			}
 
-			
 		}
+		FALLTHROUGH;
 
 	case SCORESCALEUPTRANSITION_2:
 	case SCORESCALEUPTRANSITION_3:
@@ -965,7 +962,7 @@ void ScoreScaleUpTransition::update( Int frame )
 			m_win->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 }
 
 void ScoreScaleUpTransition::reverse( void )
@@ -988,7 +985,7 @@ void ScoreScaleUpTransition::draw( void )
 	Int y1 = y + m_incrementSize.y * m_drawState;
 	TheDisplay->drawImage(image, x,y, x1, y1);
 }
-	
+
 void ScoreScaleUpTransition::skip( void )
 {
 	update(SCORESCALEUPTRANSITION_END);
@@ -1034,7 +1031,7 @@ void MainMenuScaleUpTransition::init( GameWindow *win )
 	m_incrementSize.y = (m_growSize.y - m_size.y) / MAINMENUSCALEUPTRANSITION_END;
 	const Image *image = m_win->winGetDisabledImage(0);
 	m_growWin->winSetEnabledImage(0, image);
-	
+
 }
 
 void MainMenuScaleUpTransition::update( Int frame )
@@ -1048,7 +1045,7 @@ void MainMenuScaleUpTransition::update( Int frame )
 	switch (frame) {
 	case MAINMENUSCALEUPTRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win || !m_growWin)
 				break;
 //			m_win->winHide(TRUE);
@@ -1064,7 +1061,7 @@ void MainMenuScaleUpTransition::update( Int frame )
 			m_growWin->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 	if(frame == 1)
 	{
 		AudioEventRTS buttonClick("GUILogoSelect");
@@ -1072,7 +1069,7 @@ void MainMenuScaleUpTransition::update( Int frame )
 		if( TheAudio )
 		{
 			TheAudio->addAudioEvent( &buttonClick );
-		}  // end if			
+		}
 	}
 	if(frame > MAINMENUSCALEUPTRANSITION_START && frame < MAINMENUSCALEUPTRANSITION_END)
 	{
@@ -1105,7 +1102,7 @@ void MainMenuScaleUpTransition::draw( void )
 	Int y1 = y + m_size.y + ((m_incrementSize.y * m_drawState));
 	TheDisplay->drawImage(image, x,y, x1, y1);
 }
-	
+
 void MainMenuScaleUpTransition::skip( void )
 {
 	update(MAINMENUSCALEUPTRANSITION_END);
@@ -1148,12 +1145,12 @@ void MainMenuMediumScaleUpTransition::init( GameWindow *win )
 	update(MAINMENUMEDIUMSCALEUPTRANSITION_START);
 	m_isFinished = FALSE;
 	m_isForward = TRUE;
-	
+
 	m_incrementSize.x = (m_growSize.x - m_size.x) / MAINMENUMEDIUMSCALEUPTRANSITION_END;
 	m_incrementSize.y = (m_growSize.y - m_size.y) / MAINMENUMEDIUMSCALEUPTRANSITION_END;
 //	const Image *image = m_win->winGetEnabledImage(0);
 	//m_growWin->winSetEnabledImage(0, image);
-	
+
 }
 
 void MainMenuMediumScaleUpTransition::update( Int frame )
@@ -1167,7 +1164,7 @@ void MainMenuMediumScaleUpTransition::update( Int frame )
 	switch (frame) {
 	case MAINMENUMEDIUMSCALEUPTRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win || !m_growWin)
 				break;
 			m_win->winHide(FALSE);
@@ -1183,7 +1180,7 @@ void MainMenuMediumScaleUpTransition::update( Int frame )
 			m_growWin->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 	if(frame > MAINMENUMEDIUMSCALEUPTRANSITION_START && frame < MAINMENUMEDIUMSCALEUPTRANSITION_END)
 	{
 		if(frame == 1 && m_isForward)
@@ -1193,7 +1190,7 @@ void MainMenuMediumScaleUpTransition::update( Int frame )
 			if( TheAudio )
 			{
 				TheAudio->addAudioEvent( &buttonClick );
-			}  // end if			
+			}
 		}
 		if(m_win)
 			m_win->winHide(TRUE);
@@ -1225,7 +1222,7 @@ void MainMenuMediumScaleUpTransition::draw( void )
 	Int y1 = m_pos.y + m_size.y + ((m_incrementSize.y * m_drawState) / 2);
 	TheDisplay->drawImage(image, x,y, x1, y1);
 }
-	
+
 void MainMenuMediumScaleUpTransition::skip( void )
 {
 	update(MAINMENUMEDIUMSCALEUPTRANSITION_END);
@@ -1267,12 +1264,12 @@ void MainMenuSmallScaleDownTransition::init( GameWindow *win )
 	update(MAINMENUSMALLSCALEDOWNTRANSITION_START);
 	m_isFinished = FALSE;
 	m_isForward = TRUE;
-	
+
 	m_incrementSize.x = (m_growSize.x - m_size.x) / MAINMENUSMALLSCALEDOWNTRANSITION_END;
 	m_incrementSize.y = (m_growSize.y - m_size.y) / MAINMENUSMALLSCALEDOWNTRANSITION_END;
 	const Image *image = m_win->winGetEnabledImage(0);
 	m_growWin->winSetEnabledImage(0, image);
-	
+
 }
 
 void MainMenuSmallScaleDownTransition::update( Int frame )
@@ -1286,7 +1283,7 @@ void MainMenuSmallScaleDownTransition::update( Int frame )
 	switch (frame) {
 	case MAINMENUSMALLSCALEDOWNTRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win || !m_growWin)
 				break;
 			m_win->winHide(FALSE);
@@ -1313,7 +1310,7 @@ void MainMenuSmallScaleDownTransition::update( Int frame )
 			m_growWin->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 }
 
 void MainMenuSmallScaleDownTransition::reverse( void )
@@ -1336,7 +1333,7 @@ void MainMenuSmallScaleDownTransition::draw( void )
 	Int y1 = m_pos.y + m_size.y + ((m_incrementSize.y * m_drawState) / 2);
 	TheDisplay->drawImage(image, x,y, x1, y1);
 }
-	
+
 void MainMenuSmallScaleDownTransition::skip( void )
 {
 	update(MAINMENUSMALLSCALEDOWNTRANSITION_END);
@@ -1375,7 +1372,7 @@ void TextTypeTransition::init( GameWindow *win )
 	m_isFinished = FALSE;
 	m_isForward = TRUE;
 	m_dStr = TheDisplayStringManager->newDisplayString();
-	m_fullText = GadgetStaticTextGetText(m_win);		
+	m_fullText = GadgetStaticTextGetText(m_win);
 	Int length = m_fullText.getLength();
 	m_frameLength = MIN(length, TEXTTYPETRANSITION_END);
 }
@@ -1391,7 +1388,7 @@ void TextTypeTransition::update( Int frame )
 	switch (frame) {
 	case TEXTTYPETRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win )
 				break;
 			m_win->winHide(TRUE);
@@ -1405,7 +1402,7 @@ void TextTypeTransition::update( Int frame )
 			m_win->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 	if(frame >= m_frameLength)
 	{
 		m_win->winHide(FALSE);
@@ -1420,7 +1417,7 @@ void TextTypeTransition::update( Int frame )
 		if( TheAudio )
 		{
 			TheAudio->addAudioEvent( &buttonClick );
-		}  // end if
+		}
 		if(m_isForward)
 		{
 			m_partialText.concat(m_fullText.getCharAt(frame - 1));
@@ -1448,7 +1445,7 @@ void TextTypeTransition::draw( void )
 		drawTypeText(m_win, m_dStr);
 	}
 }
-	
+
 void TextTypeTransition::skip( void )
 {
 	update(TEXTTYPETRANSITION_END);
@@ -1487,16 +1484,16 @@ void CountUpTransition::init( GameWindow *win )
 			return;
 		}
 	}
-	m_fullText = GadgetStaticTextGetText(m_win);		
+	m_fullText = GadgetStaticTextGetText(m_win);
 	m_isForward = FALSE;
 	update(COUNTUPTRANSITION_START);
 	m_isFinished = FALSE;
 	m_isForward = TRUE;
-	
+
 	AsciiString tempStr;
 	tempStr.translate(m_fullText);
 	m_intValue = atoi(tempStr.str());
-	DEBUG_LOG(("CountUpTransition::init %hs %s %d\n", m_fullText.str(), tempStr.str(), m_intValue));
+	DEBUG_LOG(("CountUpTransition::init %hs %s %d", m_fullText.str(), tempStr.str(), m_intValue));
 	if(m_intValue < COUNTUPTRANSITION_END)
 	{
 		m_countState = COUNT_ONES;
@@ -1512,7 +1509,7 @@ void CountUpTransition::init( GameWindow *win )
 		m_countState = COUNT_1000S;
 		m_frameLength = MIN(m_intValue/1000, COUNTUPTRANSITION_END);
 	}
-	
+
 	m_currentValue = 0;
 	UnicodeString currVal;
 	currVal.format(L"%d",m_currentValue);
@@ -1530,7 +1527,7 @@ void CountUpTransition::update( Int frame )
 	switch (frame) {
 	case COUNTUPTRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win )
 				break;
 			m_currentValue = 0;
@@ -1549,7 +1546,7 @@ void CountUpTransition::update( Int frame )
 			m_win->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 	if(frame >= m_frameLength)
 	{
 		m_win->winHide(FALSE);
@@ -1564,7 +1561,7 @@ void CountUpTransition::update( Int frame )
 		if( TheAudio )
 		{
 			TheAudio->addAudioEvent( &buttonClick );
-		}  // end if
+		}
 		m_currentValue +=m_countState;
 		if(m_currentValue > m_intValue)
 			m_currentValue = m_intValue;
@@ -1597,7 +1594,7 @@ void CountUpTransition::reverse( void )
 void CountUpTransition::draw( void )
 {
 }
-	
+
 void CountUpTransition::skip( void )
 {
 	if (!m_isFinished)
@@ -1612,13 +1609,13 @@ ScreenFadeTransition::ScreenFadeTransition ( void )
 	m_win = NULL;
 	m_drawState = -1;
 	m_isForward = TRUE;
-	
+
 }
 
 ScreenFadeTransition::~ScreenFadeTransition( void )
 {
 	m_win = NULL;
-	
+
 }
 
 void ScreenFadeTransition::init( GameWindow *win )
@@ -1654,8 +1651,8 @@ void ScreenFadeTransition::update( Int frame )
 		{
 			m_isFinished = TRUE;
 		}
-	}	
-	m_drawState = frame;	
+	}
+	m_drawState = frame;
 }
 
 void ScreenFadeTransition::reverse( void )
@@ -1672,7 +1669,7 @@ void ScreenFadeTransition::draw( void )
 	TheDisplay->drawFillRect(m_pos.x, m_pos.y, m_size.x, m_size.y , GameMakeColor(0,0,0,alpha));
 
 }
-	
+
 void ScreenFadeTransition::skip( void )
 {
 	update(SCREENFADETRANSITION_END);
@@ -1688,7 +1685,7 @@ ControlBarArrowTransition::ControlBarArrowTransition ( void )
 	m_drawState = -1;
 	m_isForward = TRUE;
 	m_arrowImage = NULL;
-	
+
 }
 
 ControlBarArrowTransition::~ControlBarArrowTransition( void )
@@ -1706,7 +1703,7 @@ void ControlBarArrowTransition::init( GameWindow *win )
 
 	m_percent = 1.0f / CONTROLBARARROWTRANSITION_BEGIN_FADE;
 	m_fadePercent = 1.0f/ (CONTROLBARARROWTRANSITION_END - CONTROLBARARROWTRANSITION_BEGIN_FADE);
-	
+
 	m_arrowImage = TheControlBar->getArrowImage();
 	GameWindow *twin = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonGeneral"));
 	if(!twin || !m_arrowImage)
@@ -1717,7 +1714,7 @@ void ControlBarArrowTransition::init( GameWindow *win )
 	ICoord2D screenPos, screenSize;
 	twin->winGetScreenPosition(&screenPos.x, &screenPos.y);
 	twin->winGetSize(&screenSize.x, &screenSize.y);
-	
+
 	m_incrementPos.x = 0;
 	m_incrementPos.y = screenPos.y * m_percent;
 
@@ -1747,8 +1744,8 @@ void ControlBarArrowTransition::update( Int frame )
 		{
 			m_isFinished = TRUE;
 		}
-	}	
-	m_drawState = frame;	
+	}
+	m_drawState = frame;
 }
 
 void ControlBarArrowTransition::reverse( void )
@@ -1776,9 +1773,9 @@ void ControlBarArrowTransition::draw( void )
 
 		TheDisplay->drawImage(m_arrowImage, m_pos.x, yPos, m_pos.x + m_size.x, yPos + m_size.y , GameMakeColor(255,255,255,alpha));
 	}
-	
+
 }
-	
+
 void ControlBarArrowTransition::skip( void )
 {
 	update(CONTROLBARARROWTRANSITION_END);
@@ -1796,13 +1793,13 @@ FullFadeTransition::FullFadeTransition ( void )
 	m_win = NULL;
 	m_drawState = -1;
 	m_isForward = TRUE;
-	
+
 }
 
 FullFadeTransition::~FullFadeTransition( void )
 {
 	m_win = NULL;
-	
+
 }
 
 void FullFadeTransition::init( GameWindow *win )
@@ -1835,7 +1832,7 @@ void FullFadeTransition::update( Int frame )
 	switch (frame) {
 	case FULLFADETRANSITION_START:
 		{
-						
+
 			if(m_isForward || !m_win )
 				break;
 
@@ -1852,15 +1849,15 @@ void FullFadeTransition::update( Int frame )
 			m_isFinished = TRUE;
 
 		}
-	}	
+	}
 	if(frame == FULLFADETRANSITION_END/2)
 	{
 		if(m_isForward)
-			m_win->winHide(FALSE);	
+			m_win->winHide(FALSE);
 		else
-			m_win->winHide(TRUE);	
+			m_win->winHide(TRUE);
 	}
-	m_drawState = frame;	
+	m_drawState = frame;
 }
 
 void FullFadeTransition::reverse( void )
@@ -1881,7 +1878,7 @@ void FullFadeTransition::draw( void )
 	TheDisplay->drawFillRect(m_pos.x, m_pos.y, m_size.x, m_size.y , GameMakeColor(0,0,0,alpha));
 	TheDisplay->drawOpenRect(m_pos.x, m_pos.y, m_size.x, m_size.y , 1.0f, GameMakeColor(255,190,0,alpha));
 }
-	
+
 void FullFadeTransition::skip( void )
 {
 	update(FULLFADETRANSITION_END);
@@ -1895,13 +1892,13 @@ TextOnFrameTransition::TextOnFrameTransition ( void )
 	m_frameLength = TEXTONFRAMETRANSITION_END;
 	m_win = NULL;
 	m_isForward = TRUE;
-	
+
 }
 
 TextOnFrameTransition::~TextOnFrameTransition( void )
 {
 	m_win = NULL;
-	
+
 }
 
 void TextOnFrameTransition::init( GameWindow *win )
@@ -1936,7 +1933,7 @@ void TextOnFrameTransition::update( Int frame )
 	switch (frame) {
 	case TEXTONFRAMETRANSITION_START:
 		{
-						
+
 			if(m_isForward || !m_win )
 				break;
 
@@ -1953,7 +1950,7 @@ void TextOnFrameTransition::update( Int frame )
 			m_isFinished = TRUE;
 
 		}
-	}	
+	}
 }
 
 void TextOnFrameTransition::reverse( void )
@@ -1970,7 +1967,7 @@ void TextOnFrameTransition::reverse( void )
 void TextOnFrameTransition::draw( void )
 {
 }
-	
+
 void TextOnFrameTransition::skip( void )
 {
 	if (!m_isFinished)
@@ -1985,13 +1982,13 @@ ReverseSoundTransition::ReverseSoundTransition ( void )
 	m_frameLength = REVERSESOUNDTRANSITION_END;
 	m_win = NULL;
 	m_isForward = TRUE;
-	
+
 }
 
 ReverseSoundTransition::~ReverseSoundTransition( void )
 {
 	m_win = NULL;
-	
+
 }
 
 void ReverseSoundTransition::init( GameWindow *win )
@@ -2010,7 +2007,7 @@ void ReverseSoundTransition::update( Int frame )
 	switch (frame) {
 	case REVERSESOUNDTRANSITION_START:
 		{
-						
+
 			if(m_isForward  )
 				break;
 
@@ -2018,7 +2015,7 @@ void ReverseSoundTransition::update( Int frame )
 
 		}
 		break;
-		
+
 	case REVERSESOUNDTRANSITION_FIRESOUND:
 		{
 			AudioEventRTS buttonClick("GUITransitionFade");
@@ -2026,9 +2023,10 @@ void ReverseSoundTransition::update( Int frame )
 			if( TheAudio )
 			{
 				TheAudio->addAudioEvent( &buttonClick );
-			}  // end if		
-
+			}
 		}
+		break;
+
 	case REVERSESOUNDTRANSITION_END:
 		{
 			if(!m_isForward  )
@@ -2036,7 +2034,7 @@ void ReverseSoundTransition::update( Int frame )
 			m_isFinished = TRUE;
 
 		}
-	}	
+	}
 }
 
 void ReverseSoundTransition::reverse( void )
@@ -2048,7 +2046,7 @@ void ReverseSoundTransition::reverse( void )
 void ReverseSoundTransition::draw( void )
 {
 }
-	
+
 void ReverseSoundTransition::skip( void )
 {
 	if (!m_isFinished)
@@ -2082,7 +2080,7 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha )
 	centerImage				= GadgetButtonGetMiddleEnabledImage( window );
 
 	// sanity, we need to have these images to make it look right
-	if( leftImage == NULL || rightImage == NULL || 
+	if( leftImage == NULL || rightImage == NULL ||
 			centerImage == NULL )
 		return;
 
@@ -2105,7 +2103,7 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha )
 
 	// get width we have to draw our repeating center in
 	centerWidth = rightStart.x - leftEnd.x;
-	
+
 	if( centerWidth <= 0)
 	{
 		// draw left end
@@ -2124,7 +2122,7 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha )
 	}
 	else
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerImage->getImageWidth();
 
@@ -2136,13 +2134,13 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha )
 		{
 
 			end.x = start.x + centerImage->getImageWidth();
-			
-			TheDisplay->drawImage( centerImage, 
+
+			TheDisplay->drawImage( centerImage,
 																			start.x, start.y,
 																			end.x, end.y,color );
 			start.x += centerImage->getImageWidth();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -2173,7 +2171,7 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha )
 		end.y = start.y + size.y;
 		TheDisplay->drawImage(rightImage, start.x, start.y, end.x, end.y,color);
 	}
-	
+
 }
 
 static void drawTypeText( GameWindow *window, DisplayString *str)
@@ -2189,16 +2187,16 @@ static void drawTypeText( GameWindow *window, DisplayString *str)
 	if( text == NULL || text->getTextLength() == 0 )
 		return;
 	GameFont *font = text->getFont();
-	
+
 	str->setFont(font);
 
 	// get window position and size
 	window->winGetScreenPosition( &origin.x, &origin.y );
 	window->winGetSize( &size.x, &size.y );
-	
+
 	// Set the text Wrap width
 	wordWrap = size.x - 10;
-	text->setWordWrap(wordWrap);	
+	text->setWordWrap(wordWrap);
 	str->setWordWrap(wordWrap);
 	if( BitIsSet(window->winGetStatus(), WIN_STATUS_WRAP_CENTERED)		)
 	{
@@ -2215,13 +2213,13 @@ static void drawTypeText( GameWindow *window, DisplayString *str)
 
 	// how much space will this text take up
 	text->getSize( &textWidth, &textHeight );
-		
+
 	//Init the clip region
 	clipRegion.lo.x = origin.x ;
 	clipRegion.lo.y = origin.y ;
 	clipRegion.hi.x = origin.x + size.x ;
 	clipRegion.hi.y = origin.y + size.y;
-	
+
 	if( tData->centered )
 	{
 
@@ -2229,7 +2227,7 @@ static void drawTypeText( GameWindow *window, DisplayString *str)
 		textPos.y = origin.y + (size.y / 2) - (textHeight / 2);
 		str->setClipRegion(&clipRegion);
 		str->draw( textPos.x, textPos.y, textColor, textDropColor );
-	}  // end if
+	}
 	else
 	{
 
@@ -2239,7 +2237,7 @@ static void drawTypeText( GameWindow *window, DisplayString *str)
 		str->setClipRegion(&clipRegion);
 		str->draw( textPos.x, textPos.y, textColor, textDropColor );
 
-	}  // end else
+	}
 
 
-}  // end drawStaticTextText
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp
index c221a14acbf..c7288236ae1 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp
@@ -24,12 +24,12 @@
 
 // FILE: HeaderTemplate.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	HeaderTemplate.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The header template system is used to maintain a unified look across
 //						windows.  It also allows Localization to customize the looks based
 //						on language fonts.
@@ -60,11 +60,6 @@
 #include "GameClient/HeaderTemplate.h"
 #include "GameClient/GameFont.h"
 #include "GameClient/GlobalLanguage.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -87,7 +82,7 @@ void INI::parseHeaderTemplateDefinition( INI *ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
 	hTemplate = TheHeaderTemplateManager->findHeaderTemplate( name );
@@ -97,7 +92,7 @@ void INI::parseHeaderTemplateDefinition( INI *ini )
 		// allocate a new item
 		hTemplate = TheHeaderTemplateManager->newHeaderTemplate( name );
 
-	}  // end if
+	}
 	else
 	{
 		DEBUG_CRASH(( "[LINE: %d in '%s'] Duplicate header Template %s found!", ini->getLineNum(), ini->getFilename().str(), name.str() ));
@@ -105,15 +100,13 @@ void INI::parseHeaderTemplateDefinition( INI *ini )
 	// parse the ini definition
 	ini->initFromINI( hTemplate, TheHeaderTemplateManager->getFieldParse() );
 
-}  // end parseCommandButtonDefinition
+}
 
 HeaderTemplate::HeaderTemplate( void ) :
 m_font(NULL),
 m_point(0),
 m_bold(FALSE)
 {
-	//Added By Sadullah Nader
-	//Initializations missing and needed 
 	m_fontName.clear();
 	m_name.clear();
 }
@@ -129,11 +122,7 @@ HeaderTemplateManager::~HeaderTemplateManager( void )
 	while(it != m_headerTemplateList.end())
 	{
 		HeaderTemplate *hTemplate = *it;
-		if(hTemplate)
-		{
-			hTemplate->m_font = NULL;
-			delete hTemplate;
-		}
+		delete hTemplate;
 		it = m_headerTemplateList.erase(it);
 
 	}
@@ -141,22 +130,14 @@ HeaderTemplateManager::~HeaderTemplateManager( void )
 
 void HeaderTemplateManager::init( void )
 {
-	INI ini;
-	AsciiString fname;
-	fname.format("Data\\%s\\HeaderTemplate.ini", GetRegistryLanguage().str());
-	OSVERSIONINFO	osvi;
-	osvi.dwOSVersionInfoSize=sizeof(OSVERSIONINFO);
-	if (GetVersionEx(&osvi))
-	{	//check if we're running Win9x variant since they may need different fonts
-		if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
-		{	AsciiString tempName;
-
-			tempName.format("Data\\%s\\HeaderTemplate9x.ini", GetRegistryLanguage().str());
-			if (TheFileSystem->doesFileExist(tempName.str()))
-				fname = tempName;
-		}
+	{
+		AsciiString fname;
+		fname.format("Data\\%s\\HeaderTemplate", GetRegistryLanguage().str());
+
+		INI ini;
+		ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, NULL );
 	}
-	ini.load( fname, INI_LOAD_OVERWRITE, NULL );
+
 	populateGameFonts();
 }
 
@@ -179,7 +160,7 @@ HeaderTemplate *HeaderTemplateManager::newHeaderTemplate( AsciiString name )
 	DEBUG_ASSERTCRASH(newHTemplate, ("Unable to create a new Header Template in HeaderTemplateManager::newHeaderTemplate"));
 	if(!newHTemplate)
 		return NULL;
-	
+
 	newHTemplate->m_name = name;
 	m_headerTemplateList.push_front(newHTemplate);
 	return newHTemplate;
@@ -191,10 +172,10 @@ GameFont *HeaderTemplateManager::getFontFromTemplate( AsciiString name )
 	HeaderTemplate *ht = findHeaderTemplate( name );
 	if(!ht)
 	{
-		//DEBUG_LOG(("HeaderTemplateManager::getFontFromTemplate - Could not find header %s\n", name.str()));
+		//DEBUG_LOG(("HeaderTemplateManager::getFontFromTemplate - Could not find header %s", name.str()));
 		return NULL;
 	}
-	
+
 	return ht->m_font;
 }
 
@@ -225,7 +206,7 @@ HeaderTemplate *HeaderTemplateManager::getNextHeader( HeaderTemplate *ht )
 
 }
 
-void HeaderTemplateManager::headerNotifyResolutionChange( void )
+void HeaderTemplateManager::onResolutionChanged( void )
 {
 	populateGameFonts();
 }
@@ -241,10 +222,10 @@ void HeaderTemplateManager::populateGameFonts( void )
 		HeaderTemplate *hTemplate = *it;
 		Real pointSize = TheGlobalLanguageData->adjustFontSize(hTemplate->m_point);
 		GameFont *font = TheFontLibrary->getFont(hTemplate->m_fontName, pointSize,hTemplate->m_bold);
-		DEBUG_ASSERTCRASH(font,("HeaderTemplateManager::populateGameFonts - Could not find font %s %d",hTemplate->m_fontName, hTemplate->m_point));
+		DEBUG_ASSERTCRASH(font,("HeaderTemplateManager::populateGameFonts - Could not find font %s %d",hTemplate->m_fontName.str(), hTemplate->m_point));
 
 		hTemplate->m_font = font;
-		
+
 		++it;
 	}
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp
index 7b2ec521767..368f7bb33a5 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   Ganerals
@@ -42,10 +42,10 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "mbstring.h"
 
@@ -61,32 +61,27 @@
 #include "GameClient/Color.h"
 #include "Common/NameKeyGenerator.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 extern HWND ApplicationHWnd;  ///< our application window handle
 extern Int	IMECandidateWindowLineSpacing;
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 //#define DEBUG_IME
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 //===============================
-// IMEManager 
+// IMEManager
 //===============================
 
 class IMEManager : public IMEManagerInterface
@@ -96,11 +91,11 @@ class IMEManager : public IMEManagerInterface
 
 		IMEManager();
 		~IMEManager();
-		
+
 		virtual void					init( void );
 		virtual void					reset( void );
 		virtual void					update( void );
-													
+
 		virtual void					attach( GameWindow *window );		///< attach IME to specified window
 		virtual void					detatch( void );								///< detatch IME from current window
 		virtual void					enable( void );									///< Enable IME
@@ -110,11 +105,11 @@ class IMEManager : public IMEManagerInterface
 		virtual GameWindow*		getWindow( void );							///< Returns the window we are currently attached to
 		virtual Bool					isComposing( void );						///< Manager is currently composing new input string
 		virtual void					getCompositionString( UnicodeString &string ); ///< Return the current composition string
-		virtual Int						getCompositionCursorPosition( void );			///< Returns the composition cursor position 
+		virtual Int						getCompositionCursorPosition( void );			///< Returns the composition cursor position
 		virtual Int						getIndexBase( void );						///< Get index base for candidate list
 
 		virtual Int						getCandidateCount();						///< Returns the total number of candidates
-		virtual UnicodeString*getCandidate( Int index );			///< Returns the candidate string 
+		virtual const UnicodeString* getCandidate( Int index );	///< Returns the candidate string
 		virtual Int						getSelectedCandidateIndex();		///< Returns the indexed of the currently selected candidate
 		virtual Int						getCandidatePageSize();					///< Returns the page size for the candidates list
 		virtual Int						getCandidatePageStart();				///< Returns the index of the first visibel candidate
@@ -122,7 +117,7 @@ class IMEManager : public IMEManagerInterface
 
 
 		/// Checks for and services IME messages. Returns TRUE if message serviced
-		virtual Bool serviceIMEMessage(	void *windowsHandle, 
+		virtual Bool serviceIMEMessage(	void *windowsHandle,
 												UnsignedInt message,
 												Int wParam,
 												Int lParam );
@@ -184,7 +179,7 @@ class IMEManager : public IMEManagerInterface
 
 
 
-	#ifdef DEBUG_IME													
+	#ifdef DEBUG_IME
 		static MessageInfo		m_mainMessageInfo[];
 		static MessageInfo		m_notifyInfo[];
 		static MessageInfo		m_requestInfo[];
@@ -204,7 +199,7 @@ class IMEManager : public IMEManagerInterface
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 #ifdef DEBUG_IME
 
@@ -318,20 +313,20 @@ IMEManager::MessageInfo IMEManager::m_setSmodeInfo[] =
 #endif
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 IMEManagerInterface *TheIMEManager = NULL;
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 #ifdef DEBUG_IME
@@ -401,7 +396,7 @@ void		IMEManager::printMessageInfo( Int message, Int wParam, Int lParam )
 		{
 			Char *notifyName = getMessageName( m_notifyInfo, wParam );
 			if ( notifyName == NULL ) notifyName = "unknown";
-			DEBUG_LOG(( "IMM: %s(0x%04x) - %s(0x%04x) - 0x%08x\n",  messageText, message, notifyName, wParam, lParam )); 
+			DEBUG_LOG(( "IMM: %s(0x%04x) - %s(0x%04x) - 0x%08x",  messageText, message, notifyName, wParam, lParam ));
 			break;
 		}
 		case WM_IME_CONTROL:
@@ -409,7 +404,7 @@ void		IMEManager::printMessageInfo( Int message, Int wParam, Int lParam )
 			Char *controlName = getMessageName( m_controlInfo, wParam );
 			if ( controlName == NULL ) controlName = "unknown";
 
-			DEBUG_LOG(( "IMM: %s(0x%04x) - %s(0x%04x) - 0x%08x\n",  messageText, message, controlName, wParam, lParam )); 
+			DEBUG_LOG(( "IMM: %s(0x%04x) - %s(0x%04x) - 0x%08x",  messageText, message, controlName, wParam, lParam ));
 			break;
 		}
 		#ifdef WM_IME_REQUEST
@@ -418,7 +413,7 @@ void		IMEManager::printMessageInfo( Int message, Int wParam, Int lParam )
 			Char *requestName = getMessageName( m_requestInfo, wParam );
 			if ( requestName == NULL ) requestName = "unknown";
 
-			DEBUG_LOG(( "IMM: %s(0x%04x) - %s(0x%04x) - 0x%08x\n",  messageText, message, requestName, wParam, lParam )); 
+			DEBUG_LOG(( "IMM: %s(0x%04x) - %s(0x%04x) - 0x%08x",  messageText, message, requestName, wParam, lParam ));
 			break;
 		}
 		#endif
@@ -428,13 +423,13 @@ void		IMEManager::printMessageInfo( Int message, Int wParam, Int lParam )
 
 			buildFlagsString( m_setContextInfo, lParam, flags );
 
-			DEBUG_LOG(( "IMM: %s(0x%04x) - 0x%08x - %s(0x%04x)\n",  messageText, message, wParam, flags.str(), lParam )); 
+			DEBUG_LOG(( "IMM: %s(0x%04x) - 0x%08x - %s(0x%04x)",  messageText, message, wParam, flags.str(), lParam ));
 			break;
 		}
 		default:
 			if ( messageText )
 			{
-				DEBUG_LOG(( "IMM: %s(0x%04x) - 0x%08x - 0x%08x\n",  messageText, message, wParam, lParam )); 
+				DEBUG_LOG(( "IMM: %s(0x%04x) - 0x%08x - 0x%08x",  messageText, message, wParam, lParam ));
 			}
 			break;
 	}
@@ -455,7 +450,7 @@ void IMEManager::printConversionStatus( void )
 
 		buildFlagsString( m_setCmodeInfo, mode, flags );
 
-		DEBUG_LOG(( "IMM: Conversion mode = (%s)\n", flags.str()));
+		DEBUG_LOG(( "IMM: Conversion mode = (%s)", flags.str()));
 	}
 }
 
@@ -474,14 +469,14 @@ void IMEManager::printSentenceStatus( void )
 
 		buildFlagsString( m_setSmodeInfo, mode, flags );
 
-		DEBUG_LOG(( "IMM: Sentence mode = (%s)\n", flags.str()));
+		DEBUG_LOG(( "IMM: Sentence mode = (%s)", flags.str()));
 	}
 }
 #endif // DEBUG_IME
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 //============================================================================
@@ -511,8 +506,6 @@ IMEManager::IMEManager()
 	m_result(0),
 	m_indexBase(1),
 
-	//Added By Sadullah Nader
-	//Initializations missing and needed
 	m_compositionCharsDisplayed(0),
 	m_candidateDownArrow(NULL),
 	m_candidateTextArea(NULL),
@@ -522,7 +515,6 @@ IMEManager::IMEManager()
 	m_pageStart(0),
 	m_selectedIndex(0),
 	m_unicodeIME(FALSE)
-	//
 {
 }
 
@@ -534,6 +526,9 @@ IMEManager::~IMEManager()
 {
 	if ( m_candidateWindow )
 	{
+		m_candidateWindow->winSetUserData( NULL );
+		m_candidateTextArea->winSetUserData( NULL );
+
 		TheWindowManager->winDestroy( m_candidateWindow );
 	}
 
@@ -542,10 +537,7 @@ IMEManager::~IMEManager()
 		TheWindowManager->winDestroy( m_statusWindow );
 	}
 
-	if ( m_candidateString )
-	{
-		delete [] m_candidateString;
-	}
+	delete [] m_candidateString;
 
 	detatch();
 	ImmAssociateContext( ApplicationHWnd, m_oldContext );
@@ -563,7 +555,7 @@ IMEManager::~IMEManager()
 void IMEManager::init( void )
 {
 	//HWND ImeWindow = ImmGetDefaultIMEWnd(ApplicationHWnd);
-  // if(ImeWindow) 
+  // if(ImeWindow)
 	// {
   //    DestroyWindow(ImeWindow);
 	//	}
@@ -571,22 +563,22 @@ void IMEManager::init( void )
 	m_context = ImmCreateContext();
 	m_oldContext = ImmGetContext( ApplicationHWnd );
 	m_disabled = 0;
-	m_candidateWindow = TheWindowManager->winCreateFromScript( AsciiString("IMECandidateWindow.wnd"));
+	m_candidateWindow = TheWindowManager->winCreateFromScript( "IMECandidateWindow.wnd");
 	m_candidateWindow->winSetStatus(WIN_STATUS_ABOVE);
-	
+
 	if ( m_candidateWindow )
 	{
 		m_candidateWindow->winHide( TRUE );
 
 		// find text area window
-		NameKeyType id = TheNameKeyGenerator->nameToKey( AsciiString( "IMECandidateWindow.wnd:TextArea" ) );
+		NameKeyType id = TheNameKeyGenerator->nameToKey( "IMECandidateWindow.wnd:TextArea" );
 		m_candidateTextArea = TheWindowManager->winGetWindowFromId(m_candidateWindow, id);
 
 		// find arrows
-		id = TheNameKeyGenerator->nameToKey( AsciiString( "IMECandidateWindow.wnd:UpArrow" ) );
+		id = TheNameKeyGenerator->nameToKey( "IMECandidateWindow.wnd:UpArrow" );
 		m_candidateUpArrow = TheWindowManager->winGetWindowFromId(m_candidateWindow, id);
 
-		id = TheNameKeyGenerator->nameToKey( AsciiString( "IMECandidateWindow.wnd:DownArrow" ) );
+		id = TheNameKeyGenerator->nameToKey( "IMECandidateWindow.wnd:DownArrow" );
 		m_candidateDownArrow = TheWindowManager->winGetWindowFromId(m_candidateWindow, id);
 
 
@@ -598,7 +590,7 @@ void IMEManager::init( void )
 		}
 	}
 
-	m_statusWindow = TheWindowManager->winCreateFromScript( AsciiString("IMEStatusWindow.wnd"));
+	m_statusWindow = TheWindowManager->winCreateFromScript( "IMEStatusWindow.wnd");
 
 	if ( m_statusWindow )
 	{
@@ -633,7 +625,7 @@ void IMEManager::update( void )
 {
 
 }
-		
+
 //============================================================================
 // IMEManager::attach
 //============================================================================
@@ -683,9 +675,9 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 			{
 				WideChar wchar = convertCharToWide(wParam);
 				#ifdef DEBUG_IME
-				DEBUG_LOG(("IMM: WM_IME_CHAR - '%hc'0x%04x\n", wchar, wchar ));
+				DEBUG_LOG(("IMM: WM_IME_CHAR - '%hc'0x%04x", wchar, wchar ));
 				#endif
-																	 
+
 				if ( m_window && (wchar > 32 || wchar == VK_RETURN ))
 				{
 					TheWindowManager->winSendInputMsg( m_window, GWM_IME_CHAR, (wParam & 0xffff), lParam );
@@ -701,7 +693,7 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 					WideChar wchar = (WideChar) (wParam & 0xffff);
 
 				#ifdef DEBUG_IME
-				DEBUG_LOG(("IMM: WM_CHAR - '%hc'0x%04x\n", wchar, wchar ));
+				DEBUG_LOG(("IMM: WM_CHAR - '%hc'0x%04x", wchar, wchar ));
 				#endif
 
 				if ( m_window && (wchar >= 32 || wchar == VK_RETURN) )
@@ -715,10 +707,10 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 
 			// --------------------------------------------------------------------
       case WM_IME_SELECT:
-					DEBUG_LOG(("IMM: WM_IME_SELECT\n"));
+					DEBUG_LOG(("IMM: WM_IME_SELECT"));
 				return FALSE;
       case WM_IME_STARTCOMPOSITION:
-        //The WM_IME_STARTCOMPOSITION message is sent immediately before an 
+        //The WM_IME_STARTCOMPOSITION message is sent immediately before an
         //IME generates a composition string as a result of a user's keystroke.
         //
 				m_composing = TRUE;
@@ -742,10 +734,10 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 				// the strings real time inside WM_IME_COMPOSITION
 				// instead of waiting for user to enter separator. -MW
 
-        //IMEs send this message to the application when the IMEs' composition 
-        //windows have closed. Applications that display their own composition 
-        //characters should process this message. Other applications should 
-        //send the message to the application IME window or to DefWindowProc, 
+        //IMEs send this message to the application when the IMEs' composition
+        //windows have closed. Applications that display their own composition
+        //characters should process this message. Other applications should
+        //send the message to the application IME window or to DefWindowProc,
         //which will pass the message to  the default IME window.
         //
 
@@ -767,17 +759,17 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 			// --------------------------------------------------------------------
 			case WM_IME_COMPOSITION:
 			{
-				//IMEs send this message to the application when they change composition 
-				//status in response to a keystroke. Applications that display their own 
-				//composition characters should process this message by calling 
-				//ImmGetCompositionString. Other applications should send the message to 
-				//the application IME window or to DefWindowProc, which will pass the 
+				//IMEs send this message to the application when they change composition
+				//status in response to a keystroke. Applications that display their own
+				//composition characters should process this message by calling
+				//ImmGetCompositionString. Other applications should send the message to
+				//the application IME window or to DefWindowProc, which will pass the
 				//message to the default IME window.
 				//
-				//The WM_IME_COMPOSITION message is sent to an application when the IME 
-				//changes composition status as a result of a keystroke. An application 
-				//should process this message if it displays composition characters itself. 
-				//Otherwise, it should send the message to the IME window. This message 
+				//The WM_IME_COMPOSITION message is sent to an application when the IME
+				//changes composition status as a result of a keystroke. An application
+				//should process this message if it displays composition characters itself.
+				//Otherwise, it should send the message to the IME window. This message
 				//has no return value. wParam = DBCS character. lParam = change indicator.
 				//
 
@@ -858,8 +850,8 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 			// --------------------------------------------------------------------
 			case WM_IME_SETCONTEXT:
 			{
-				//The system sends this message to an application when one of the 
-				//application's windows is activated. Applications should respond by 
+				//The system sends this message to an application when one of the
+				//application's windows is activated. Applications should respond by
 				//calling ImmGetContext.
 				//
 				updateProperties();
@@ -872,19 +864,19 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 			// --------------------------------------------------------------------
 			case WM_IME_NOTIFY:
 			{
-				//IMEs generate this message to notify the application or the IME window 
-				//that the IME status has changed. The wParam value is a submessage that 
-				//specifies the nature of the change. 
+				//IMEs generate this message to notify the application or the IME window
+				//that the IME status has changed. The wParam value is a submessage that
+				//specifies the nature of the change.
 				//
 				switch(wParam)
 				{
 					case IMN_OPENCANDIDATE:
 					{
-						//This message is sent to the application when an IME is about to 
-						//open the candidate window. An application should process this 
-						//message if it displays candidates. The application can retrieve 
-						//a list of candidates to display by using theImmGetCandidateList 
-						//function. The application receives this notification message through 
+						//This message is sent to the application when an IME is about to
+						//open the candidate window. An application should process this
+						//message if it displays candidates. The application can retrieve
+						//a list of candidates to display by using theImmGetCandidateList
+						//function. The application receives this notification message through
 						//the WM_IME_NOTIFY message.
 						//
 
@@ -895,9 +887,9 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 					}
 					case IMN_CLOSECANDIDATE:
 					{
-						//This message is sent to the application when an IME is about to 
-						//close the candidate window. An application should process this 
-						//message if it displays candidates. The application receives this 
+						//This message is sent to the application when an IME is about to
+						//close the candidate window. An application should process this
+						//message if it displays candidates. The application receives this
 						//notification message through the WM_IME_NOTIFY message.
 						//
 						closeCandidateList( lParam );
@@ -907,17 +899,17 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 
 					case IMN_CHANGECANDIDATE:
 					{
-						//This message is sent to the application when an IME is about to 
-						//change the content of the candidate window. An application should 
-						//process this notification message if it displays candidates itself. 
-						//The application receives this notification message through the 
+						//This message is sent to the application when an IME is about to
+						//change the content of the candidate window. An application should
+						//process this notification message if it displays candidates itself.
+						//The application receives this notification message through the
 						//WM_IME_NOTIFY message.
 						//
 						updateCandidateList( lParam );
 						m_result =  1;
 				 	  return TRUE;
 					}
-					case IMN_GUIDELINE:              //This message is sent when an IME is about to show an error message or other data. 
+					case IMN_GUIDELINE:              //This message is sent when an IME is about to show an error message or other data.
 					{
 						// display error message
 						m_result = 1;
@@ -951,7 +943,7 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 						DEBUG_LOG(("Close Status Window"));
 						return FALSE;
 					case IMN_SETOPENSTATUS:          //This message is sent when the open status of the input context is updated.
-					case IMN_SETCOMPOSITIONFONT:     //This message is sent when the font of the input context is updated. 
+					case IMN_SETCOMPOSITIONFONT:     //This message is sent when the font of the input context is updated.
 					case IMN_SETCOMPOSITIONWINDOW:   //This message is sent when the style or position of the composition window is updated.
 					case IMN_PRIVATE:                //This message is for your own use, it seems.
 */				default:
@@ -964,9 +956,9 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 			// --------------------------------------------------------------------
       case WM_IME_COMPOSITIONFULL:
 			{
-				//IMEs send this message to the application when they are unable to 
-        //extend the composition window to accommodate any more characters. 
-        //Applications should tell IMEs how to display the composition window 
+				//IMEs send this message to the application when they are unable to
+        //extend the composition window to accommodate any more characters.
+        //Applications should tell IMEs how to display the composition window
         //using the IMC_SETCOMPOSITIONWINDOW message.
         //
         //I'm not sure what to do here.
@@ -1117,17 +1109,17 @@ void IMEManager::updateCompositionString( void )
 		}
 		else
 		{
-			
+
 			// read MBCS instead
 			result = ImmGetCompositionStringA( m_context, GCS_COMPSTR, tempBuf, MAX_COMPSTRINGLEN*2);
-			
+
 			if ( result > 0 )
 			{
 				tempBuf[ result ] = '\0';
-			
+
 				int convRes = MultiByteToWideChar( CP_ACP, 0, tempBuf, -1, m_compositionString, MAX_COMPSTRINGLEN );
 				GameArrayEnd(m_compositionString);
-			
+
 				if ( convRes < 0)
 				{
 					convRes = 0;
@@ -1135,14 +1127,14 @@ void IMEManager::updateCompositionString( void )
 				else
 				{
 					m_compositionCursorPos = (ImmGetCompositionString( m_context, GCS_CURSORPOS, NULL, 0) & 0xffff );
-					convRes = GameStrlen ( m_compositionString );
+					convRes = wcslen( m_compositionString );
 				}
-			
+
 				// m_compositionCursorPos is in DBCS characters, need to convert it to Wide characters
-			
+
 				//msg_assert ( (int)strlen(tempBuf) >= convRes ,("bad DBCS string: DBCS = %d chars, Wide = %d chars", strlen(tempBuf), convRes));
 				m_compositionCursorPos = _mbsnccnt ( (unsigned char *) tempBuf, m_compositionCursorPos );
-			
+
 				m_compositionString[convRes] = 0;
 				m_compositionStringLength = convRes;
 				if ( m_compositionCursorPos > convRes )
@@ -1163,7 +1155,7 @@ void IMEManager::updateCompositionString( void )
 }
 
 //============================================================================
-// IMEManager::getResultsString 
+// IMEManager::getResultsString
 //============================================================================
 
 void IMEManager::getResultsString ( void )
@@ -1183,16 +1175,16 @@ void IMEManager::getResultsString ( void )
 		else
 		{
 			char tempBuf[ (MAX_COMPSTRINGLEN+1)*2];
-			
+
 			// read MBCS instead
 			result = ImmGetCompositionStringA( m_context, GCS_RESULTSTR, tempBuf, MAX_COMPSTRINGLEN*2);
-			
+
 			if ( result > 0 )
 			{
 				tempBuf[ result ] = '\0';
-			
+
 				int convRes = MultiByteToWideChar( CP_ACP, 0, tempBuf, strlen(tempBuf), m_resultsString, MAX_COMPSTRINGLEN );
-			
+
 				if ( convRes < 0)
 				{
 					convRes = 0;
@@ -1208,7 +1200,7 @@ void IMEManager::getResultsString ( void )
 }
 
 //============================================================================
-// IMEManager::convertToUnicode 
+// IMEManager::convertToUnicode
 //============================================================================
 
 void IMEManager::convertToUnicode ( Char *mbcs, UnicodeString &unicode )
@@ -1227,7 +1219,7 @@ void IMEManager::convertToUnicode ( Char *mbcs, UnicodeString &unicode )
 	if ( buffer )
 	{
 		size = MultiByteToWideChar( CP_ACP, 0, mbcs, strlen(mbcs), buffer, size );
-		
+
 		if ( size <= 0 )
 		{
 			unicode.clear();
@@ -1258,7 +1250,7 @@ void IMEManager::openCandidateList( Int candidateFlags )
 
 	m_candidateWindow->winHide( FALSE );
 	m_candidateWindow->winBringToTop();
-	TheWindowManager->winSetModal( m_candidateWindow ); 
+	TheWindowManager->winSetModal( m_candidateWindow );
 
 	Int wx, wy, wwidth, wheight, wcursorx, wcursory;
 	Int cx, cy, cwidth, cheight;
@@ -1320,14 +1312,11 @@ void IMEManager::closeCandidateList( Int candidateFlags  )
 	if ( m_candidateWindow != NULL )
 	{
 		m_candidateWindow->winHide( TRUE );
-		TheWindowManager->winUnsetModal( m_candidateWindow ); 
+		TheWindowManager->winUnsetModal( m_candidateWindow );
 	}
 
-	if ( m_candidateString )
-	{
-		delete [] m_candidateString;
-		m_candidateString = NULL;
-	}
+	delete [] m_candidateString;
+	m_candidateString = NULL;
 
 	m_candidateCount = 0;
 
@@ -1340,19 +1329,16 @@ void IMEManager::closeCandidateList( Int candidateFlags  )
 void IMEManager::updateCandidateList( Int candidateFlags  )
 {
 
-	if ( m_candidateString )
-	{
-		delete [] m_candidateString;
-		m_candidateString = NULL;
-	}
+	delete [] m_candidateString;
+	m_candidateString = NULL;
 
 	m_pageSize = 10;
 	m_candidateCount = 0;
 	m_pageStart = 0;
 	m_selectedIndex = 0;
 
-	if (	m_candidateWindow == NULL || 
-				m_context == NULL || 
+	if (	m_candidateWindow == NULL ||
+				m_context == NULL ||
 				candidateFlags == 0)
 	{
 		return;
@@ -1376,17 +1362,17 @@ void IMEManager::updateCandidateList( Int candidateFlags  )
 					return;
 				}
 			}
-			
+
 			// create a temporary buffer for reading the candidate list
 			Char *buffer = NEW Char[size];
-			
+
 			if ( buffer == NULL )
 			{
 				return;
 			}
-			
+
 			memset( buffer, 0, size );
-			
+
 			CANDIDATELIST *clist = (CANDIDATELIST*) buffer;
 
 			Bool ok = TRUE ;
@@ -1409,9 +1395,9 @@ void IMEManager::updateCandidateList( Int candidateFlags  )
 
 			if ( ok && clist->dwStyle != IME_CAND_UNKNOWN && clist->dwStyle != IME_CAND_CODE  )
 			{
-		    //Apparently there is an "IME98 bug" (IME bug under Windows 98?) that 
-		    //causes you to have to execute the following code. 
-		    if(( clist->dwPageStart >  clist->dwSelection) || 
+		    //Apparently there is an "IME98 bug" (IME bug under Windows 98?) that
+		    //causes you to have to execute the following code.
+		    if(( clist->dwPageStart >  clist->dwSelection) ||
 		       (clist->dwSelection >= clist->dwPageStart + clist->dwPageSize))
 		    {
 		       clist->dwPageStart = (clist->dwSelection / clist->dwPageSize) * clist->dwPageSize;
@@ -1423,7 +1409,7 @@ void IMEManager::updateCandidateList( Int candidateFlags  )
 				m_selectedIndex = clist->dwSelection;
 
 				#ifdef DEBUG_IME
-				DEBUG_LOG(("IME: Candidate Update: Candidates = %d, pageSize = %d pageStart = %d, selected = %d\n", m_candidateCount, m_pageStart, m_pageSize, m_selectedIndex ));
+				DEBUG_LOG(("IME: Candidate Update: Candidates = %d, pageSize = %d pageStart = %d, selected = %d", m_candidateCount, m_pageStart, m_pageSize, m_selectedIndex ));
 				#endif
 
 				if ( m_candidateUpArrow )
@@ -1505,7 +1491,7 @@ void IMEManager::resizeCandidateWindow( Int pageSize )
 	}
 
 	Int newh = pageSize * (font->height + IMECandidateWindowLineSpacing);
-	Int w, h; 
+	Int w, h;
 	m_candidateTextArea->winGetSize( &w, &h );
 
 	Int dif = newh - h;
@@ -1524,7 +1510,7 @@ void IMEManager::resizeCandidateWindow( Int pageSize )
 		m_candidateDownArrow->winSetPosition( x, y );
 	}
 
-}	
+}
 
 //============================================================================
 // IMEManager::getCandidateCount
@@ -1539,7 +1525,7 @@ Int	IMEManager::getCandidateCount()
 // IMEManager::getCandidate
 //============================================================================
 
-UnicodeString* IMEManager::getCandidate( Int index )
+const UnicodeString* IMEManager::getCandidate( Int index )
 {
 	if ( m_candidateString != NULL && index >=0 && index < m_candidateCount )
 	{
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
index 11e2107c8cc..b58dbc72900 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
@@ -24,12 +24,12 @@
 
 // FILE: LoadScreen.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Mar 2002
@@ -37,7 +37,7 @@
 //	Filename: 	LoadScreen.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Contains each of the different derived LoadClasses for each of the
 //						Different kind of games we can have.
 //
@@ -47,12 +47,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -71,6 +66,7 @@
 #include "Common/AudioAffect.h"
 
 #include "GameClient/LoadScreen.h"
+#include "GameClient/Keyboard.h"
 #include "GameClient/Shell.h"
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/GadgetProgressBar.h"
@@ -94,11 +90,6 @@
 // DEFINES ////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 // PRIVATE TYPES //////////////////////////////////////////////////////////////
@@ -131,12 +122,12 @@ enum{
 FRAME_FUDGE_ADD = 30,
 };
 //-----------------------------------------------------------------------------
-// LoadScreen Class 
+// LoadScreen Class
 //-----------------------------------------------------------------------------
 
 LoadScreen::LoadScreen( void )
 {
-	m_loadScreen = NULL;		
+	m_loadScreen = NULL;
 }
 
 LoadScreen::~LoadScreen( void )
@@ -164,13 +155,10 @@ void LoadScreen::update( Int percent )
 //-----------------------------------------------------------------------------
 SinglePlayerLoadScreen::SinglePlayerLoadScreen( void )
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_currentObjectiveLine = 0;
 	m_currentObjectiveLineCharacter = 0;
 	m_finishedObjectiveText = NULL;
 	m_currentObjectiveWidthOffset = 0;
-	//
 	m_progressBar = NULL;
 	m_percent = NULL;
 	m_videoStream = NULL;
@@ -180,7 +168,7 @@ SinglePlayerLoadScreen::SinglePlayerLoadScreen( void )
 		m_objectiveLines[i] = NULL;
 
 }
-	
+
 SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )
 {
 	m_progressBar = NULL;
@@ -188,17 +176,19 @@ SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )
 	m_objectiveWin = NULL;
 	for(Int i = 0; i < MAX_OBJECTIVE_LINES; ++i)
 		m_objectiveLines[i] = NULL;
-	if(m_videoBuffer)
-		delete m_videoBuffer;
+
+	delete m_videoBuffer;
 	m_videoBuffer = NULL;
 
 	if ( m_videoStream )
+	{
 		m_videoStream->close();
-	m_videoStream = NULL;
-	
+		m_videoStream = NULL;
+	}
+
 	TheAudio->removeAudioEvent( m_ambientLoopHandle );
 	m_ambientLoopHandle = NULL;
-	
+
 }
 
 void SinglePlayerLoadScreen::moveWindows( Int frame )
@@ -221,7 +211,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame )
 	};
 	if(frame < STATE_BEGIN || frame > STATE_END)
 		return;
-	
+
 	if( frame == STATE_BEGIN_BREIFING)
 	{
 		// add sound support here
@@ -233,7 +223,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame )
 		m_objectiveWin->winHide(FALSE);
 		// animate the text and stuff
 	}
-	
+
 	if( frame > STATE_BEGIN_ANIMATING_TEXT && frame <= STATE_END_ANIMATING_TEXT && !m_finishedObjectiveText)
 	{
 		if(m_currentObjectiveLineCharacter >= m_unicodeObjectiveLines[m_currentObjectiveLine].getLength() )
@@ -256,7 +246,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame )
 		m_currentObjectiveLineCharacter++;
 	}
 	switch (frame) {
-	
+
 	case STATE_SHOW_LOCATION:
 		m_location->winHide(FALSE);
 		break;
@@ -322,11 +312,11 @@ void SinglePlayerLoadScreen::moveWindows( Int frame )
 		m_cameoWindow2->winGetPosition(&endPos.x, &endPos.y);
 		endPos.x = endPos.x - xOffset;
 		endPos.y = startPos.y;
-	
+
 	}
 	else if( frame > STATE_ANIM_CAMEO1_TRASITION_CAMEO2 && frame < STATE_ANIM_CAMEO2)
 	{
-		
+
 		//extrapolate between start and end pos
 		Real percent = INT_TO_REAL((frame - STATE_ANIM_CAMEO1_TRASITION_CAMEO2)) / (STATE_ANIM_CAMEO2 - STATE_ANIM_CAMEO1_TRASITION_CAMEO2);
 		m_cameoFrame->winSetPosition(startPos.x + (endPos.x - startPos.x) * percent, endPos.y);
@@ -349,11 +339,11 @@ void SinglePlayerLoadScreen::moveWindows( Int frame )
 		m_cameoWindow3->winGetPosition(&endPos.x, &endPos.y);
 		endPos.x = endPos.x - xOffset;
 		endPos.y = startPos.y;
-	
+
 	}
 	else if( frame > STATE_ANIM_CAMEO2_TRASITION_CAMEO3 && frame < STATE_ANIM_CAMEO3)
 	{
-		
+
 		//extrapolate between start and end pos
 		Real percent = INT_TO_REAL((frame - STATE_ANIM_CAMEO2_TRASITION_CAMEO3)) / (STATE_ANIM_CAMEO3 - STATE_ANIM_CAMEO2_TRASITION_CAMEO3);
 		m_cameoFrame->winSetPosition(startPos.x + (endPos.x - startPos.x) * percent, endPos.y);
@@ -369,35 +359,35 @@ void SinglePlayerLoadScreen::moveWindows( Int frame )
 		m_cameoWindow3->winEnable(FALSE);
 		GadgetStaticTextSetText(m_cameoText, UnicodeString::TheEmptyString);
 		m_cameoFrame->winHide(TRUE);
-		
+
 	}
 }*/
- 
+
 void SinglePlayerLoadScreen::init( GameInfo *game )
 {
 	//No music in SinglePlayerLoadScreen
 
 	// create the layout of the load screen
-	m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/SinglePlayerLoadScreen.wnd" ) );
+	m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/SinglePlayerLoadScreen.wnd" );
 	DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the single player loadscreen"));
 	m_loadScreen->winHide(FALSE);
 	m_loadScreen->winBringToTop();
 //	Mission *mission = TheCampaignManager->getCurrentMission();
 	// Store the pointer to the progress bar on the loadscreen
-	m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:ProgressLoad" ) ));
+	m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:ProgressLoad" ));
 	DEBUG_ASSERTCRASH(m_progressBar, ("Can't initialize the progressbar for the single player loadscreen"));
-	GadgetProgressBarSetProgress(m_progressBar, 0 );	
+	GadgetProgressBarSetProgress(m_progressBar, 0 );
 
-	m_percent = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:Percent" ) ));
+	m_percent = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:Percent" ));
 	DEBUG_ASSERTCRASH(m_percent, ("Can't initialize the m_percent for the single player loadscreen"));
-	GadgetStaticTextSetText(m_percent,UnicodeString(L"0%"));
+	GadgetStaticTextSetText(m_percent,L"0%");
 	m_percent->winHide(TRUE);
 
-	m_objectiveWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:ObjectivesWin" ) ));
+	m_objectiveWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:ObjectivesWin" ));
 	DEBUG_ASSERTCRASH(m_objectiveWin, ("Can't initialize the m_objectiveWin for the single player loadscreen"));
 	m_objectiveWin->winHide(TRUE);
 
-	
+
 	Mission *mission = TheCampaignManager->getCurrentMission();
 	AsciiString lineName;
 	Int i = 0;
@@ -421,46 +411,46 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 		GadgetStaticTextSetText(m_unitDesc[i],TheGameText->fetch(mission->m_unitNames[i]));
 		m_unitDesc[i]->winHide(TRUE);
 	}
-	m_location = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:StaticTextCameoText3" ) ));
+	m_location = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:StaticTextCameoText3" ));
 	DEBUG_ASSERTCRASH(m_location, ("Can't initialize the m_objectiveWin for the single player loadscreen"));
 	m_location->winHide(TRUE);
 	GadgetStaticTextSetText(m_location, TheGameText->fetch(mission->m_locationNameLabel));
-	
 
-	
+
+
 	m_currentObjectiveLine = 0;
 	m_currentObjectiveWidthOffset = 0;
 	m_currentObjectiveLineCharacter = 0;
 	m_finishedObjectiveText = FALSE;
 /*
-	m_cameoWindow1 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowCameo1" ) ));
+	m_cameoWindow1 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowCameo1" ));
 	DEBUG_ASSERTCRASH(m_cameoWindow1, ("Can't initialize the m_cameoWindow1 for the single player loadscreen"));
 	m_cameoWindow1->winHide(TRUE);
 	m_cameoWindow1->winEnable(FALSE);
 	m_cameoWindow1->winSetEnabledImage(0, mission->m_cameoImage[0]);
 	m_cameoWindow1->winSetDisabledImage(0, mission->m_cameoDisabledImage[0]);
 
-	m_cameoWindow2 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowCameo2" ) ));
+	m_cameoWindow2 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowCameo2" ));
 	DEBUG_ASSERTCRASH(m_cameoWindow2, ("Can't initialize the m_cameoWindow2 for the single player loadscreen"));
 	m_cameoWindow2->winHide(TRUE);
 	m_cameoWindow2->winEnable(FALSE);
 	m_cameoWindow2->winSetEnabledImage(0, mission->m_cameoImage[1]);
 	m_cameoWindow2->winSetDisabledImage(0, mission->m_cameoDisabledImage[1]);
 
-	m_cameoWindow3 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowCameo3" ) ));
+	m_cameoWindow3 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowCameo3" ));
 	DEBUG_ASSERTCRASH(m_cameoWindow3, ("Can't initialize the m_cameoWindow3 for the single player loadscreen"));
 	m_cameoWindow3->winHide(TRUE);
 	m_cameoWindow3->winEnable(FALSE);
 	m_cameoWindow3->winSetEnabledImage(0, mission->m_cameoImage[2]);
 	m_cameoWindow3->winSetDisabledImage(0, mission->m_cameoDisabledImage[2]);
 
-	m_headMovie = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowHead" ) ));
+	m_headMovie = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowHead" ));
 	DEBUG_ASSERTCRASH(m_headMovie, ("Can't initialize the m_headMovie for the single player loadscreen"));
 	m_headMovie->winHide(TRUE);
-	m_cameoFrame = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowHiliteCameo" ) ));
+	m_cameoFrame = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowHiliteCameo" ));
 	DEBUG_ASSERTCRASH(m_cameoFrame, ("Can't initialize the m_cameoFrame for the single player loadscreen"));
 	m_cameoFrame->winHide(TRUE);
-	m_cameoText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:StaticTextCameoText" ) ));
+	m_cameoText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:StaticTextCameoText" ));
 	DEBUG_ASSERTCRASH(m_cameoText, ("Can't initialize the m_cameoText for the single player loadscreen"));
 
 */
@@ -475,8 +465,8 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 
 	// Create the new buffer
 	m_videoBuffer = TheDisplay->createVideoBuffer();
-	if (	m_videoBuffer == NULL || 
-				!m_videoBuffer->allocate(	m_videoStream->width(), 
+	if (	m_videoBuffer == NULL ||
+				!m_videoBuffer->allocate(	m_videoStream->width(),
 													m_videoStream->height())
 		)
 	{
@@ -484,33 +474,43 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 		m_videoBuffer = NULL;
 
 		if ( m_videoStream )
+		{
 			m_videoStream->close();
-		m_videoStream = NULL;
+			m_videoStream = NULL;
+		}
 
 		return;
 	}
-	
+
 	if(TheGameLODManager && TheGameLODManager->didMemPass())
 	{
+		// TheSuperHackers @bugfix Originally this movie render loop stopped rendering when the game window was inactive.
+		// This either skipped the movie or caused decompression artifacts. Now the video just keeps playing until it done.
+
 		Int progressUpdateCount = m_videoStream->frameCount() / FRAME_FUDGE_ADD;
 		Int shiftedPercent = -FRAME_FUDGE_ADD + 1;
 		while (m_videoStream->frameIndex() < m_videoStream->frameCount() - 1 )
 		{
+			// TheSuperHackers @feature User can now skip video by pressing ESC
+			if (TheKeyboard)
+			{
+				TheKeyboard->UPDATE();
+				KeyboardIO *io = TheKeyboard->findKey(KEY_ESC, KeyboardIO::STATUS_UNUSED);
+				if (io && BitIsSet(io->state, KEY_STATE_DOWN))
+				{
+					io->setUsed();
+					break;
+				}
+			}
+
 			TheGameEngine->serviceWindowsOS();
 
 			if(!m_videoStream->isFrameReady())
 			{
-				Sleep(1);	
+				Sleep(1);
 				continue;
 			}
 
-			if (!TheGameEngine->isActive())
-			{	//we are alt-tabbed out, so just increment the frame
-				m_videoStream->frameNext();
-				m_videoStream->frameDecompress();
-				continue;
-			}
-			
 			m_videoStream->frameDecompress();
 			m_videoStream->frameRender(m_videoBuffer);
 			moveWindows( m_videoStream->frameIndex());
@@ -529,7 +529,7 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 				TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
 				GadgetProgressBarSetProgress(m_progressBar, percent);
 				GadgetStaticTextSetText(m_percent, per);
-			
+
 			}
 			TheWindowManager->update();
 
@@ -557,18 +557,18 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 
 		// Audio was choppy so, I chopped it out!
 		TheAudio->friend_forcePlayAudioEventRTS(&TheCampaignManager->getCurrentMission()->m_briefingVoice);
-		
+
 		for(Int i = 0; i < MAX_OBJECTIVE_LINES; ++i)
 		{
 			GadgetStaticTextSetText(m_objectiveLines[i], m_unicodeObjectiveLines[i]);
 		}
-		
+
 		Int delay = mission->m_voiceLength * 1000;
 		Int begin = timeGetTime();
 		Int currTime = begin;
 		Int fudgeFactor = 0;
 		while(begin + delay > currTime )
-		{		
+		{
 			fudgeFactor = 30 * ((currTime - begin)/ INT_TO_REAL(delay ));
 			GadgetProgressBarSetProgress(m_progressBar, fudgeFactor);
 
@@ -577,7 +577,7 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 			Sleep(100);
 			currTime = timeGetTime();
 		}
-		
+
 
 		TheWindowManager->update();
 		TheDisplay->draw();
@@ -586,7 +586,7 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 	setFPMode();
 	m_percent->winHide(TRUE);
 	m_ambientLoopHandle = TheAudio->addAudioEvent(&m_ambientLoop);
-	
+
 }
 
 void SinglePlayerLoadScreen::reset( void )
@@ -603,7 +603,7 @@ void SinglePlayerLoadScreen::update( Int percent )
 	TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
 	GadgetProgressBarSetProgress(m_progressBar, percent);
 	GadgetStaticTextSetText(m_percent, per);
-	
+
 	// Do this last!
 	LoadScreen::update( percent );
 }
@@ -619,10 +619,10 @@ ShellGameLoadScreen::ShellGameLoadScreen( void )
 {
 	m_progressBar = NULL;
 }
-	
+
 ShellGameLoadScreen::~ShellGameLoadScreen( void )
 {
-	
+
 	m_progressBar = NULL;
 }
 
@@ -630,94 +630,30 @@ void ShellGameLoadScreen::init( GameInfo *game )
 {
 	static BOOL firstLoad = TRUE;
 
-	
+
 	// create the layout of the load screen
-	m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/ShellGameLoadScreen.wnd" ) );
+	m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/ShellGameLoadScreen.wnd" );
 	DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the ShellGame loadscreen"));
 	m_loadScreen->winHide(FALSE);
 	m_loadScreen->winBringToTop();
 
 	// Store the pointer to the progress bar on the loadscreen
-	m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ShellGameLoadScreen.wnd:ProgressLoad" ) ));
+	m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "ShellGameLoadScreen.wnd:ProgressLoad" ));
 	DEBUG_ASSERTCRASH(m_progressBar, ("Can't initialize the progressbar for the single player loadscreen"));
-	GadgetProgressBarSetProgress(m_progressBar, 0 );	
+	GadgetProgressBarSetProgress(m_progressBar, 0 );
 	m_progressBar->winHide(TRUE);
-	
+
 	if(m_loadScreen && firstLoad && TheGameLODManager && TheGameLODManager->didMemPass())
 	{
 		m_loadScreen->winSetEnabledImage(0, TheMappedImageCollection->findImageByName("TitleScreen"));
 		TheWritableGlobalData->m_breakTheMovie = FALSE;
 
-//		m_videoStream = TheVideoPlayer->open( "Sizzle" );
-//		if ( m_videoStream == NULL )
-//		{
-//			m_progressBar->winHide(FALSE);
-//			return;
-//		}
-//
-//		// Create the new buffer
-//		m_videoBuffer = TheDisplay->createVideoBuffer();
-//		if (	m_videoBuffer == NULL || 
-//					!m_videoBuffer->allocate(	m_videoStream->width(), 
-//														m_videoStream->height())
-//			)
-//		{
-//			delete m_videoBuffer;
-//			m_videoBuffer = NULL;
-//
-//			if ( m_videoStream )
-//				m_videoStream->close();
-//			m_videoStream = NULL;
-//
-//			return;
-//		}
-//		TheGlobalData->m_isBreakableMovie = TRUE;
-//		TheGlobalData->m_breakTheMovie = FALSE;
-//		while (m_videoStream->frameIndex() < m_videoStream->frameCount() - 1 )
-//		{
-//			if(TheGlobalData->m_breakTheMovie)
-//			{
-//				TheGlobalData->m_breakTheMovie = FALSE;
-//				m_videoStream->frameGoto(m_videoStream->frameCount() - 1);
-//			}
-//			if(m_videoStream->frameIndex() < m_videoStream->frameCount() - 1)
-//			{
-//				if(!m_videoStream->isFrameReady())
-//					continue;
-//
-//				m_videoStream->frameDecompress();
-//				m_videoStream->frameRender(m_videoBuffer);
-//				m_videoStream->frameNext();
-//				if(m_videoBuffer)
-//					m_loadScreen->winGetInstanceData()->setVideoBuffer(m_videoBuffer);
-//			}
-//
-//			TheWindowManager->update();
-//		//	TheShell->update();
-//			//TheDisplay->update();
-//			// redraw all views, update the GUI
-//			TheDisplay->draw();
-//		}
-//		TheGlobalData->m_isBreakableMovie = FALSE;
-//		TheGlobalData->m_breakTheMovie = FALSE;
-//		GameWindow *win = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ShellGameLoadScreen.wnd:EAGamesLogo" ) ));
-//		if(win)
-//			win->winHide(FALSE);
-
-		GameWindow *win = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ShellGameLoadScreen.wnd:StaticTextLegal" ) ));
+		GameWindow *win = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "ShellGameLoadScreen.wnd:StaticTextLegal" ));
 		if(win)
 			win->winHide(FALSE);
 		firstLoad = FALSE;
-
-		UnsignedInt showTime = timeGetTime();
-		while(showTime + 3000 > timeGetTime())
-		{	
-			LoadScreen::update(0);
-			Sleep(100);
-		}
-
 	}
-	m_progressBar->winHide(FALSE);	
+	m_progressBar->winHide(FALSE);
 }
 
 void ShellGameLoadScreen::reset( void )
@@ -739,26 +675,25 @@ void ShellGameLoadScreen::update( Int percent )
 //-----------------------------------------------------------------------------
 MultiPlayerLoadScreen::MultiPlayerLoadScreen( void )
 {
-	//Added By Sadullah Nader
-	//Initializations missing and needed
 	m_mapPreview = NULL;
 
-	//
 	for(Int i = 0; i < MAX_SLOTS; ++i)
 	{
-		//Added By Sadullah Nader
-		//Initializations missing and needed
 		m_buttonMapStartPosition[i] = NULL;
-		//
 		m_progressBars[i] = NULL;
 		m_playerNames[i] = NULL;
 		m_playerSide[i]= NULL;
 		m_playerLookup[i] = -1;
 	}
 }
-	
+
 MultiPlayerLoadScreen::~MultiPlayerLoadScreen( void )
 {
+	if(m_mapPreview)
+	{
+		m_mapPreview->winSetUserData(NULL);
+	}
+
 	for(Int i = 0; i < MAX_SLOTS; ++i)
 	{
 		m_progressBars[i] = NULL;
@@ -774,7 +709,7 @@ MultiPlayerLoadScreen::~MultiPlayerLoadScreen( void )
 void MultiPlayerLoadScreen::init( GameInfo *game )
 {
 	// create the layout of the load screen
-	m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/MultiplayerLoadScreen.wnd" ) );
+	m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/MultiplayerLoadScreen.wnd" );
 	DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the Multiplayer loadscreen"));
 	m_loadScreen->winHide(FALSE);
 	m_loadScreen->winBringToTop();
@@ -796,7 +731,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 		event.setShouldFade( TRUE );
 
 		TheAudio->addAudioEvent( &event );
-		TheAudio->update();//Since GameEngine::update() is suspended until after I am gone... 
+		TheAudio->update();//Since GameEngine::update() is suspended until after I am gone...
 
 	}
 
@@ -804,7 +739,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 	if(loadScreenImage)
 		m_loadScreen->winSetEnabledImage(0, loadScreenImage);
 	//DEBUG_ASSERTCRASH(TheNetwork, ("Where the Heck is the Network!!!!"));
-	//DEBUG_LOG(("NumPlayers %d\n", TheNetwork->getNumPlayers()));
+	//DEBUG_LOG(("NumPlayers %d", TheNetwork->getNumPlayers()));
 
 	GameWindow *teamWin[MAX_SLOTS];
 	Int i = 0;
@@ -835,19 +770,19 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 		winName.format( "MultiplayerLoadScreen.wnd:StaticTextPlayer%d",i);
 		m_playerNames[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 		DEBUG_ASSERTCRASH(m_playerNames[i], ("Can't initialize the Names for the Multiplayer loadscreen"));
-		
+
 		// Load the Player's Side
 		winName.format( "MultiplayerLoadScreen.wnd:StaticTextSide%d",i);
 		m_playerSide[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 		DEBUG_ASSERTCRASH(m_playerSide[i], ("Can't initialize the Sides for the Multiplayer loadscreen"));
-		
+
 		winName.format( "MultiplayerLoadScreen.wnd:StaticTextTeam%d",i);
 		teamWin[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 
 		// get the slot man!
 		GameSlot *slot = game->getSlot(i);
 		if (!slot || !slot->isOccupied())
-			continue;		
+			continue;
 		Color houseColor = TheMultiplayerSettings->getColor(slot->getApparentColor())->getColor();
 		GadgetProgressBarSetEnabledBarColor(m_progressBars[netSlot],houseColor );
 
@@ -873,7 +808,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 
 		netSlot++;
 	}
-	
+
 	for(i = netSlot; i < MAX_SLOTS; ++i)
 	{
 		m_progressBars[i]->winHide(TRUE);
@@ -887,7 +822,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 		const MapMetaData *mmd = TheMapCache->findMap(game->getMap());
 		Image *image = getMapPreviewImage(game->getMap());
 		m_mapPreview->winSetUserData((void *)mmd);
-		
+
 		positionStartSpots( game, m_buttonMapStartPosition, m_mapPreview);
 		updateMapStartSpots( game, m_buttonMapStartPosition, TRUE );
 		//positionAdditionalImages((MapMetaData *)mmd, m_mapPreview, TRUE);
@@ -902,7 +837,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 		}
 	}
 
-	
+
 	TheGameLogic->initTimeOutValues();
 }
 
@@ -931,7 +866,7 @@ void MultiPlayerLoadScreen::update( Int percent )
 			TheGameLogic->processProgress( TheGameInfo->getLocalSlotNum(), percent );
 	}
 
-	//GadgetProgressBarSetProgress(m_progressBars[TheNetwork->getLocalPlayerID()], percent );	
+	//GadgetProgressBarSetProgress(m_progressBars[TheNetwork->getLocalPlayerID()], percent );
 
 	TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
 
@@ -941,14 +876,15 @@ void MultiPlayerLoadScreen::update( Int percent )
 
 void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage)
 {
-	
+
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
-		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));
+		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d", percentage, playerId));
+		return;
 	}
-	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)\n", percentage, playerId, m_playerLookup[playerId]));
+	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)", percentage, playerId, m_playerLookup[playerId]));
 	if(m_progressBars[m_playerLookup[playerId]])
-		GadgetProgressBarSetProgress(m_progressBars[m_playerLookup[playerId]], percentage );	
+		GadgetProgressBarSetProgress(m_progressBars[m_playerLookup[playerId]], percentage );
 }
 
 // GameSpyLoadScreen Class //////////////////////////////////////////////////
@@ -956,19 +892,13 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage)
 GameSpyLoadScreen::GameSpyLoadScreen( void )
 {
 
-	// Added By Sadullah Nader
-	// Initializations missing and needed
 	m_mapPreview = NULL;
-	//
 
 	for(Int i = 0; i < MAX_SLOTS; ++i)
 	{
-		
-		// Added By Sadullah Nader
-		// Initializations missing and needed
+
 		m_buttonMapStartPosition[i] = NULL;
 		m_playerRank[i] = NULL;
-		//
 
 		m_playerOfficerMedal[i] = NULL;
 		m_progressBars[i] = NULL;
@@ -978,12 +908,17 @@ GameSpyLoadScreen::GameSpyLoadScreen( void )
 		m_playerFavoriteFactions[i]= NULL;
 		m_playerTotalDisconnects[i]= NULL;
 		m_playerWin[i]= NULL;
-		m_playerWinLosses[i]= NULL;		
+		m_playerWinLosses[i]= NULL;
 	}
 }
-	
+
 GameSpyLoadScreen::~GameSpyLoadScreen( void )
 {
+	if(m_mapPreview)
+	{
+		m_mapPreview->winSetUserData(NULL);
+	}
+
 	for(Int i = 0; i < MAX_SLOTS; ++i)
 	{
 		m_progressBars[i] = NULL;
@@ -993,7 +928,7 @@ GameSpyLoadScreen::~GameSpyLoadScreen( void )
 		m_playerFavoriteFactions[i]= NULL;
 		m_playerTotalDisconnects[i]= NULL;
 		m_playerWin[i]= NULL;
-		m_playerWinLosses[i]= NULL;		
+		m_playerWinLosses[i]= NULL;
 	}
 }
 
@@ -1002,13 +937,13 @@ extern Int GetAdditionalDisconnectsFromUserFile(Int playerID);
 void GameSpyLoadScreen::init( GameInfo *game )
 {
 	// create the layout of the load screen
-	m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/GameSpyLoadScreen.wnd" ) );
+	m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/GameSpyLoadScreen.wnd" );
 	DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the Multiplayer loadscreen"));
 	m_loadScreen->winHide(FALSE);
 	m_loadScreen->winBringToTop();
 	m_mapPreview = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "GameSpyLoadScreen.wnd:WinMapPreview"));
 	DEBUG_ASSERTCRASH(TheNetwork, ("Where the Heck is the Network!!!!"));
-	DEBUG_LOG(("NumPlayers %d\n", TheNetwork->getNumPlayers()));
+	DEBUG_LOG(("NumPlayers %d", TheNetwork->getNumPlayers()));
 GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 	const PlayerTemplate* pt;
 	if (lSlot->getPlayerTemplate() >= 0)
@@ -1036,13 +971,13 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 		m_progressBars[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 		DEBUG_ASSERTCRASH(m_progressBars[i], ("Can't initialize the progressbars for the GameSpyLoadScreen loadscreen"));
 		// set the progressbar to zero
-		GadgetProgressBarSetProgress(m_progressBars[i], 0 );	
+		GadgetProgressBarSetProgress(m_progressBars[i], 0 );
 
 		// Load the Player's name
 		winName.format( "GameSpyLoadScreen.wnd:StaticTextPlayer%d",i);
 		m_playerNames[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 		DEBUG_ASSERTCRASH(m_playerNames[i], ("Can't initialize the Names for the GameSpyLoadScreen loadscreen"));
-		
+
 		// Load MapStart Positions
 		winName.format( "GameSpyLoadScreen.wnd:ButtonMapStartPosition%d",i);
 		m_buttonMapStartPosition[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
@@ -1053,12 +988,12 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 		winName.format( "GameSpyLoadScreen.wnd:StaticTextSide%d",i);
 		m_playerSide[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 		DEBUG_ASSERTCRASH(m_playerSide[i], ("Can't initialize the Sides for the GameSpyLoadScreen loadscreen"));
-		
+
 		// Load the Player's window
 		winName.format( "GameSpyLoadScreen.wnd:WinPlayer%d",i);
 		m_playerWin[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 		DEBUG_ASSERTCRASH(m_playerWin[i], ("Can't initialize the WinPlayer for the GameSpyLoadScreen loadscreen"));
-		
+
 		// Load the Player's m_playerTotalDisconnects
 		winName.format( "GameSpyLoadScreen.wnd:StaticTextTotalDisconnects%d",i);
 		m_playerTotalDisconnects[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
@@ -1100,7 +1035,7 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 
 		// Get the stats for the player
 		PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(slot->getProfileID());
-		DEBUG_LOG(("LoadScreen - populating info for %ls(%d) - stats returned id %d\n",
+		DEBUG_LOG(("LoadScreen - populating info for %ls(%d) - stats returned id %d",
 			slot->getName().str(), slot->getProfileID(), stats.id));
 
 		Bool isPreorder = TheGameSpyInfo->didPlayerPreorder(stats.id);
@@ -1114,7 +1049,7 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 		m_playerRank[i]->winSetEnabledImage(0, rankImg);
 
 		UnicodeString formatString;
-	
+
 		// pop wins and losses
 		Int numLosses = 0;
 		PerGeneralMap::iterator it;
@@ -1142,17 +1077,17 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 			}
 		}
 //		if(numGames == 0)
-//			GadgetStaticTextSetText(m_playerFavoriteFactions[netSlot], TheGameText->fetch("GUI:None"));	
+//			GadgetStaticTextSetText(m_playerFavoriteFactions[netSlot], TheGameText->fetch("GUI:None"));
 //		else if( stats.gamesAsRandom > numGames )
-//			GadgetStaticTextSetText(m_playerFavoriteFactions[netSlot], TheGameText->fetch("GUI:Random"));	
+//			GadgetStaticTextSetText(m_playerFavoriteFactions[netSlot], TheGameText->fetch("GUI:Random"));
 //		else
-//		{		
+//		{
 //			const PlayerTemplate *fac = ThePlayerTemplateStore->getNthPlayerTemplate(favorite);
 //			if (fac)
 //			{
 //				AsciiString side;
 //				side.format("SIDE:%s", fac->getSide().str());
-//				
+//
 //				GadgetStaticTextSetText(m_playerFavoriteFactions[netSlot], TheGameText->fetch(side));
 //			}
 //		}
@@ -1205,7 +1140,7 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 
 		netSlot++;
 	}
-	
+
 	for(i = netSlot; i < MAX_SLOTS; ++i)
 	{
 		m_playerWin[i]->winHide(TRUE);
@@ -1218,7 +1153,7 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 		const MapMetaData *mmd = TheMapCache->findMap(game->getMap());
 		Image *image = getMapPreviewImage(game->getMap());
 		m_mapPreview->winSetUserData((void *)mmd);
-		
+
 		positionStartSpots( game, m_buttonMapStartPosition, m_mapPreview);
 		updateMapStartSpots( game, m_buttonMapStartPosition, TRUE );
 		//positionAdditionalImages((MapMetaData *)mmd, m_mapPreview, TRUE);
@@ -1253,7 +1188,7 @@ void GameSpyLoadScreen::update( Int percent )
 		TheNetwork->updateLoadProgress( percent );
 	TheNetwork->liteupdate();
 
-	//GadgetProgressBarSetProgress(m_progressBars[TheNetwork->getLocalPlayerID()], percent );	
+	//GadgetProgressBarSetProgress(m_progressBars[TheNetwork->getLocalPlayerID()], percent );
 
 	TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
 
@@ -1263,24 +1198,22 @@ void GameSpyLoadScreen::update( Int percent )
 
 void GameSpyLoadScreen::processProgress(Int playerId, Int percentage)
 {
-	
+
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
-		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));
+		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d", percentage, playerId));
+		return;
 	}
-	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)\n", percentage, playerId, m_playerLookup[playerId]));
+	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)", percentage, playerId, m_playerLookup[playerId]));
 	if(m_progressBars[m_playerLookup[playerId]])
-		GadgetProgressBarSetProgress(m_progressBars[m_playerLookup[playerId]], percentage );	
+		GadgetProgressBarSetProgress(m_progressBars[m_playerLookup[playerId]], percentage );
 }
 
 // MapTransferLoadScreen Class //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 MapTransferLoadScreen::MapTransferLoadScreen( void )
 {
-	//Added By Sadullah Nader
-	//Initializations missing and needed
 	m_oldTimeout = 0;
-	//
 	for(Int i = 0; i < MAX_SLOTS; ++i)
 	{
 		m_progressBars[i] = NULL;
@@ -1292,7 +1225,7 @@ MapTransferLoadScreen::MapTransferLoadScreen( void )
 	m_fileNameText = NULL;
 	m_timeoutText = NULL;
 }
-	
+
 MapTransferLoadScreen::~MapTransferLoadScreen( void )
 {
 	for(Int i = 0; i < MAX_SLOTS; ++i)
@@ -1310,7 +1243,7 @@ MapTransferLoadScreen::~MapTransferLoadScreen( void )
 void MapTransferLoadScreen::init( GameInfo *game )
 {
 	// create the layout of the load screen
-	m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/MapTransferScreen.wnd" ) );
+	m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/MapTransferScreen.wnd" );
 	DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the map transfer loadscreen"));
 	if (!m_loadScreen)
 		return;
@@ -1319,19 +1252,17 @@ void MapTransferLoadScreen::init( GameInfo *game )
 	m_loadScreen->winBringToTop();
 
 	DEBUG_ASSERTCRASH(TheNetwork, ("Where the Heck is the Network?!!!!"));
-	DEBUG_LOG(("NumPlayers %d\n", TheNetwork->getNumPlayers()));
+	DEBUG_LOG(("NumPlayers %d", TheNetwork->getNumPlayers()));
 
 	AsciiString winName;
 	Int i;
 
 	// Load the Filename Text
-	winName.format( "MapTransferScreen.wnd:StaticTextCurrentFile");
-	m_fileNameText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
+	m_fileNameText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "MapTransferScreen.wnd:StaticTextCurrentFile" ));
 	DEBUG_ASSERTCRASH(m_fileNameText, ("Can't initialize the filename for the map transfer loadscreen"));
 
 	// Load the Timeout Text
-	winName.format( "MapTransferScreen.wnd:StaticTextTimeout");
-	m_timeoutText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
+	m_timeoutText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "MapTransferScreen.wnd:StaticTextTimeout" ));
 	DEBUG_ASSERTCRASH(m_timeoutText, ("Can't initialize the timeout for the map transfer loadscreen"));
 
 	Int netSlot = 0;
@@ -1376,7 +1307,7 @@ void MapTransferLoadScreen::init( GameInfo *game )
 
 		netSlot++;
 	}
-	
+
 	for(i = netSlot; i < MAX_SLOTS; ++i)
 	{
 		m_progressBars[i]->winHide(TRUE);
@@ -1415,10 +1346,11 @@ void MapTransferLoadScreen::update( Int percent )
 
 void MapTransferLoadScreen::processProgress(Int playerId, Int percentage, AsciiString stateStr)
 {
-	
+
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
-		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));
+		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d", percentage, playerId));
+		return;
 	}
 
 	if (m_oldProgress[playerId] == percentage)
@@ -1427,7 +1359,7 @@ void MapTransferLoadScreen::processProgress(Int playerId, Int percentage, AsciiS
 
 	Int translatedSlot = m_playerLookup[playerId];
 	if(m_progressBars[translatedSlot])
-		GadgetProgressBarSetProgress(m_progressBars[translatedSlot], percentage );	
+		GadgetProgressBarSetProgress(m_progressBars[translatedSlot], percentage );
 	if (m_progressText[translatedSlot])
 		GadgetStaticTextSetText(m_progressText[translatedSlot], TheGameText->fetch(stateStr));
 }
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ProcessAnimateWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ProcessAnimateWindow.cpp
index d0c44b5e598..31e4691a68e 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/ProcessAnimateWindow.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ProcessAnimateWindow.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ProcessAnimateWindow.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Mar 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ProcessAnimateWindow.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Holds all the process modules for the Animate Window Class
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/ProcessAnimateWindow.h"
 #include "GameClient/AnimateWindowManager.h"
@@ -81,7 +81,7 @@ ProcessAnimateWindowSlideFromRight::ProcessAnimateWindowSlideFromRight( void )
 																			// positions they start to slow down
 	m_slowDownRatio = 0.67f;  // how fast the windows slow down (smaller slows quicker)
 	m_speedUpRatio = 2.0f - m_slowDownRatio;  // how fast the windows speed up
-	
+
 }
 
 //-----------------------------------------------------------------------------
@@ -100,7 +100,7 @@ void ProcessAnimateWindowSlideFromRight::initReverseAnimateWindow( wnd::AnimateW
 	Coord2D vel = animWin->getVel();
 	vel.x *= -1;
 	vel.y *= -1;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 	animWin->setFinished( FALSE );
 
 }
@@ -113,7 +113,7 @@ void ProcessAnimateWindowSlideFromRight::initAnimateWindow( wnd::AnimateWindow *
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -153,7 +153,7 @@ void ProcessAnimateWindowSlideFromRight::initAnimateWindow( wnd::AnimateWindow *
 //-----------------------------------------------------------------------------
 Bool ProcessAnimateWindowSlideFromRight::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -201,7 +201,7 @@ Bool ProcessAnimateWindowSlideFromRight::updateAnimateWindow( wnd::AnimateWindow
 
 Bool ProcessAnimateWindowSlideFromRight::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -267,7 +267,7 @@ ProcessAnimateWindowSlideFromLeft::ProcessAnimateWindowSlideFromLeft( void )
 																			// positions they start to slow down
 	m_slowDownRatio = 0.67f;  // how fast the windows slow down (smaller slows quicker)
 	m_speedUpRatio = 2.0f - m_slowDownRatio;  // how fast the windows speed up
-	
+
 }
 
 ProcessAnimateWindowSlideFromLeft::~ProcessAnimateWindowSlideFromLeft( void ) { }
@@ -284,7 +284,7 @@ void ProcessAnimateWindowSlideFromLeft::initReverseAnimateWindow( wnd::AnimateWi
 	Coord2D vel = animWin->getVel();
 	vel.x *= -1;
 	vel.y *= -1;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 
 }
 
@@ -295,13 +295,13 @@ void ProcessAnimateWindowSlideFromLeft::initAnimateWindow( wnd::AnimateWindow *a
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -330,7 +330,7 @@ void ProcessAnimateWindowSlideFromLeft::initAnimateWindow( wnd::AnimateWindow *a
 
 Bool ProcessAnimateWindowSlideFromLeft::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -340,7 +340,7 @@ Bool ProcessAnimateWindowSlideFromLeft::updateAnimateWindow( wnd::AnimateWindow
 	// if the window has finished animating into position, return
 	if(animWin->isFinished())
 		return TRUE;
-	
+
 	// if the window hasn't started animating...return that we're not finished
 	if(timeGetTime() < animWin->getStartTime())
 		return FALSE;
@@ -379,7 +379,7 @@ Bool ProcessAnimateWindowSlideFromLeft::updateAnimateWindow( wnd::AnimateWindow
 
 Bool ProcessAnimateWindowSlideFromLeft::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -445,7 +445,7 @@ ProcessAnimateWindowSlideFromTop::ProcessAnimateWindowSlideFromTop( void )
 																			// positions they start to slow down
 	m_slowDownRatio = 0.67f;  // how fast the windows slow down (smaller slows quicker)
 	m_speedUpRatio = 2.0f - m_slowDownRatio;  // how fast the windows speed up
-	
+
 }
 
 ProcessAnimateWindowSlideFromTop::~ProcessAnimateWindowSlideFromTop( void ) { }
@@ -462,7 +462,7 @@ void ProcessAnimateWindowSlideFromTop::initReverseAnimateWindow( wnd::AnimateWin
 	Coord2D vel = animWin->getVel();
 	vel.x *= -1;
 	vel.y *= -1;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 
 }
 
@@ -473,13 +473,13 @@ void ProcessAnimateWindowSlideFromTop::initAnimateWindow( wnd::AnimateWindow *an
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -508,7 +508,7 @@ void ProcessAnimateWindowSlideFromTop::initAnimateWindow( wnd::AnimateWindow *an
 
 Bool ProcessAnimateWindowSlideFromTop::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -518,7 +518,7 @@ Bool ProcessAnimateWindowSlideFromTop::updateAnimateWindow( wnd::AnimateWindow *
 	// if the window has finished animating into position, return
 	if(animWin->isFinished())
 		return TRUE;
-	
+
 	// if the window hasn't started animating...return that we're not finished
 	if(timeGetTime() < animWin->getStartTime())
 		return FALSE;
@@ -558,7 +558,7 @@ Bool ProcessAnimateWindowSlideFromTop::updateAnimateWindow( wnd::AnimateWindow *
 
 Bool ProcessAnimateWindowSlideFromTop::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -624,7 +624,7 @@ ProcessAnimateWindowSlideFromBottom::ProcessAnimateWindowSlideFromBottom( void )
 																			// positions they start to slow down
 	m_slowDownRatio = 0.67f;  // how fast the windows slow down (smaller slows quicker)
 	m_speedUpRatio = 2.0f - m_slowDownRatio;  // how fast the windows speed up
-	
+
 }
 
 ProcessAnimateWindowSlideFromBottom::~ProcessAnimateWindowSlideFromBottom( void ) { }
@@ -641,7 +641,7 @@ void ProcessAnimateWindowSlideFromBottom::initReverseAnimateWindow( wnd::Animate
 	Coord2D vel = animWin->getVel();
 	vel.x *= -1;
 	vel.y *= -1;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 
 }
 
@@ -653,13 +653,13 @@ void ProcessAnimateWindowSlideFromBottom::initAnimateWindow( wnd::AnimateWindow
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -688,7 +688,7 @@ void ProcessAnimateWindowSlideFromBottom::initAnimateWindow( wnd::AnimateWindow
 
 Bool ProcessAnimateWindowSlideFromBottom::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -738,7 +738,7 @@ Bool ProcessAnimateWindowSlideFromBottom::updateAnimateWindow( wnd::AnimateWindo
 
 Bool ProcessAnimateWindowSlideFromBottom::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -811,13 +811,13 @@ void ProcessAnimateWindowSlideFromBottomTimed::initReverseAnimateWindow( wnd::An
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -840,7 +840,7 @@ void ProcessAnimateWindowSlideFromBottomTimed::initReverseAnimateWindow( wnd::An
 
 	UnsignedInt now = timeGetTime();
 
-	DEBUG_LOG(("initReverseAnimateWindow at %d (%d->%d)\n", now, now, now + m_maxDuration));
+	DEBUG_LOG(("initReverseAnimateWindow at %d (%d->%d)", now, now, now + m_maxDuration));
 	animWin->setAnimData(startPos, endPos, curPos, restPos, vel, now, now + m_maxDuration);
 }
 
@@ -852,13 +852,13 @@ void ProcessAnimateWindowSlideFromBottomTimed::initAnimateWindow( wnd::AnimateWi
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -882,13 +882,13 @@ void ProcessAnimateWindowSlideFromBottomTimed::initAnimateWindow( wnd::AnimateWi
 	UnsignedInt now = timeGetTime();
 	UnsignedInt delay = animWin->getDelay();
 
-	DEBUG_LOG(("initAnimateWindow at %d (%d->%d)\n", now, now + delay, now + m_maxDuration + delay));
+	DEBUG_LOG(("initAnimateWindow at %d (%d->%d)", now, now + delay, now + m_maxDuration + delay));
 	animWin->setAnimData(startPos, endPos, curPos, restPos, vel, now + delay, now + m_maxDuration + delay);
 }
 
 Bool ProcessAnimateWindowSlideFromBottomTimed::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -929,12 +929,12 @@ Bool ProcessAnimateWindowSlideFromBottomTimed::updateAnimateWindow( wnd::Animate
 		curPos.y = endPos.y;
 		animWin->setFinished( TRUE );
 		win->winSetPosition(curPos.x, curPos.y);
-		DEBUG_LOG(("window finished animating at %d (%d->%d)\n", now, startTime, endTime));
+		DEBUG_LOG(("window finished animating at %d (%d->%d)", now, startTime, endTime));
 		return TRUE;
 	}
 
 	curPos.y = startPos.y + percentDone*(endPos.y - startPos.y);
-	DEBUG_LOG(("(%d,%d) -> (%d,%d) -> (%d,%d) at %g\n",
+	DEBUG_LOG(("(%d,%d) -> (%d,%d) -> (%d,%d) at %g",
 		startPos.x, startPos.y, curPos.x, curPos.y, endPos.x, endPos.y, percentDone));
 
 	win->winSetPosition(curPos.x, curPos.y);
@@ -955,7 +955,7 @@ Bool ProcessAnimateWindowSlideFromBottomTimed::reverseAnimateWindow( wnd::Animat
 ProcessAnimateWindowSpiral::ProcessAnimateWindowSpiral( void )
 {
 	m_maxR = TheDisplay->getWidth() / 2;
-	m_deltaTheta = .33f;	
+	m_deltaTheta = .33f;
 }
 
 //-----------------------------------------------------------------------------
@@ -974,7 +974,7 @@ void ProcessAnimateWindowSpiral::initReverseAnimateWindow( wnd::AnimateWindow *a
 	Coord2D vel = animWin->getVel();
 	vel.x = 0;
 	vel.y = 0;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 
 }
 
@@ -987,13 +987,13 @@ void ProcessAnimateWindowSpiral::initAnimateWindow( wnd::AnimateWindow *animWin
 	ICoord2D endPos = {0,0};
 	ICoord2D size = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -1022,7 +1022,7 @@ void ProcessAnimateWindowSpiral::initAnimateWindow( wnd::AnimateWindow *animWin
 //-----------------------------------------------------------------------------
 Bool ProcessAnimateWindowSpiral::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -1049,13 +1049,13 @@ Bool ProcessAnimateWindowSpiral::updateAnimateWindow( wnd::AnimateWindow *animWi
 	ICoord2D curPos = animWin->getCurPos();
 	ICoord2D endPos = animWin->getEndPos();
 	Coord2D vel = animWin->getVel();
-	
-	curPos.x = (vel.y * cos(vel.x)) + endPos.x; 
+
+	curPos.x = (vel.y * cos(vel.x)) + endPos.x;
 	curPos.y = (vel.y * sin(vel.x)) + endPos.y;
 
 	vel.x = vel.x + m_deltaTheta;
 	vel.y -=5;
-	
+
 	ICoord2D size;
 	win->winGetSize(&size.x, &size.y);
 	Int m_max = min(size.x/2, size.y/2);
@@ -1076,7 +1076,7 @@ Bool ProcessAnimateWindowSpiral::updateAnimateWindow( wnd::AnimateWindow *animWi
 //-----------------------------------------------------------------------------
 Bool ProcessAnimateWindowSpiral::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -1101,13 +1101,13 @@ Bool ProcessAnimateWindowSpiral::reverseAnimateWindow( wnd::AnimateWindow *animW
 	ICoord2D curPos = animWin->getCurPos();
 	ICoord2D endPos = animWin->getEndPos();
 	Coord2D vel = animWin->getVel();
-	
-	curPos.x = (vel.y * cos(vel.x)) + endPos.x; 
+
+	curPos.x = (vel.y * cos(vel.x)) + endPos.x;
 	curPos.y = (vel.y * sin(vel.x)) + endPos.y;
 
 	vel.x = vel.x - m_deltaTheta;
 	vel.y +=5;
-	
+
 	ICoord2D size;
 	win->winGetSize(&size.x, &size.y);
 //	Int m_max = min(size.x/2, size.y/2);
@@ -1138,7 +1138,7 @@ ProcessAnimateWindowSlideFromTopFast::ProcessAnimateWindowSlideFromTopFast( void
 																			// positions they start to slow down
 	m_slowDownRatio = 0.67f;  // how fast the windows slow down (smaller slows quicker)
 	m_speedUpRatio = 4.0f - m_slowDownRatio;  // how fast the windows speed up
-	
+
 }
 
 ProcessAnimateWindowSlideFromTopFast::~ProcessAnimateWindowSlideFromTopFast( void ) { }
@@ -1155,7 +1155,7 @@ void ProcessAnimateWindowSlideFromTopFast::initReverseAnimateWindow( wnd::Animat
 	Coord2D vel = animWin->getVel();
 	vel.x *= -1;
 	vel.y *= -1;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 
 }
 
@@ -1167,13 +1167,13 @@ void ProcessAnimateWindowSlideFromTopFast::initAnimateWindow( wnd::AnimateWindow
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
 	ICoord2D size = {0,0};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -1185,7 +1185,7 @@ void ProcessAnimateWindowSlideFromTopFast::initAnimateWindow( wnd::AnimateWindow
 	win->winGetPosition(&restPos.x, &restPos.y);
 	endPos.x = restPos.x;
 	endPos.y = restPos.y;
-	
+
 	win->winGetSize(&size.x, &size.y);
 
 	//set the initial positions for the window. In this case, off the Top of the screen
@@ -1204,7 +1204,7 @@ void ProcessAnimateWindowSlideFromTopFast::initAnimateWindow( wnd::AnimateWindow
 
 Bool ProcessAnimateWindowSlideFromTopFast::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -1214,7 +1214,7 @@ Bool ProcessAnimateWindowSlideFromTopFast::updateAnimateWindow( wnd::AnimateWind
 	// if the window has finished animating into position, return
 	if(animWin->isFinished())
 		return TRUE;
-	
+
 	// if the window hasn't started animating...return that we're not finished
 	if(timeGetTime() < animWin->getStartTime())
 		return FALSE;
@@ -1254,7 +1254,7 @@ Bool ProcessAnimateWindowSlideFromTopFast::updateAnimateWindow( wnd::AnimateWind
 
 Bool ProcessAnimateWindowSlideFromTopFast::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -1321,7 +1321,7 @@ ProcessAnimateWindowSlideFromRightFast::ProcessAnimateWindowSlideFromRightFast(
 																			// positions they start to slow down
 	m_slowDownRatio = 0.77f;  // how fast the windows slow down (smaller slows quicker)
 	m_speedUpRatio = 3.0f - m_slowDownRatio;  // how fast the windows speed up
-	
+
 }
 
 //-----------------------------------------------------------------------------
@@ -1340,7 +1340,7 @@ void ProcessAnimateWindowSlideFromRightFast::initReverseAnimateWindow( wnd::Anim
 	Coord2D vel = animWin->getVel();
 	vel.x *= -1;
 	vel.y *= -1;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 	animWin->setFinished( FALSE );
 	GameWindow * win = animWin->getGameWindow();
 	ICoord2D pos, tempPos;
@@ -1371,7 +1371,7 @@ void ProcessAnimateWindowSlideFromRightFast::initAnimateWindow( wnd::AnimateWind
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -1412,7 +1412,7 @@ void ProcessAnimateWindowSlideFromRightFast::initAnimateWindow( wnd::AnimateWind
 //-----------------------------------------------------------------------------
 Bool ProcessAnimateWindowSlideFromRightFast::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -1460,7 +1460,7 @@ Bool ProcessAnimateWindowSlideFromRightFast::updateAnimateWindow( wnd::AnimateWi
 
 Bool ProcessAnimateWindowSlideFromRightFast::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
index cc5e3ba3efc..96440624448 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "GameClient/Shell.h"
@@ -45,16 +45,26 @@
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 Shell *TheShell = NULL;  ///< the shell singleton definition
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Shell::Shell( void )
+{
+	construct();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+Shell::~Shell( void )
+{
+	deconstruct();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void Shell::construct( void )
 {
 	Int i;
 
@@ -73,17 +83,12 @@ Shell::Shell( void )
 	m_schemeManager = NEW ShellMenuSchemeManager;
 	m_saveLoadMenuLayout = NULL;
 	m_popupReplayLayout = NULL;
-	//Added By Sadullah Nader
-	//Initializations
 	m_optionsLayout = NULL;
 	m_screenCount = 0;
-	//
-
-}  // end Shell
+}
 
 //-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-Shell::~Shell( void )
+void Shell::deconstruct( void )
 {
 	WindowLayout *newTop = top();
 	while(newTop)
@@ -99,12 +104,10 @@ Shell::~Shell( void )
 		m_background = NULL;
 	}
 
-	if(m_animateWindowManager)
-		delete m_animateWindowManager;
+	delete m_animateWindowManager;
 	m_animateWindowManager = NULL;
 
-	if(m_schemeManager)
-		delete m_schemeManager;
+	delete m_schemeManager;
 	m_schemeManager = NULL;
 
 	// delete the save/load menu if present
@@ -115,7 +118,7 @@ Shell::~Shell( void )
 		deleteInstance(m_saveLoadMenuLayout);
 		m_saveLoadMenuLayout = NULL;
 
-	}  //end if
+	}
 
 	// delete the replay save menu if present
 	if( m_popupReplayLayout )
@@ -125,7 +128,7 @@ Shell::~Shell( void )
 		deleteInstance(m_popupReplayLayout);
 		m_popupReplayLayout = NULL;
 
-	}  //end if
+	}
 
 	// delete the options menu if present.
 	if (m_optionsLayout != NULL) {
@@ -133,8 +136,7 @@ Shell::~Shell( void )
 		deleteInstance(m_optionsLayout);
 		m_optionsLayout = NULL;
 	}
-
-}  // end ~Shell
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the shell system */
@@ -143,13 +145,13 @@ void Shell::init( void )
 {
 	INI ini;
 	// Read from INI all the ShellMenuScheme
-	ini.load( AsciiString( "Data\\INI\\Default\\ShellMenuScheme.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\ShellMenuScheme.ini" ), INI_LOAD_OVERWRITE, NULL );
-	
+	ini.loadFileDirectory( "Data\\INI\\Default\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL );
+
 	if( m_schemeManager )
 		m_schemeManager->init();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the shell system to a clean state just as though init had
@@ -157,17 +159,17 @@ void Shell::init( void )
 //-------------------------------------------------------------------------------------------------
 void Shell::reset( void )
 {
-	
+
 	if (TheIMEManager)
 		TheIMEManager->detatch();
 
 	// pop all screens
 	while( m_screenCount )
-		pop();
+		popImmediate();
 
 	m_animateWindowManager->reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update shell system cycle.  All windows are updated that are on the stack, starting
@@ -178,7 +180,7 @@ void Shell::update( void )
 	static Int lastUpdate = timeGetTime();
 	static const Int shellUpdateDelay = 30;  // try to update 30 frames a second
 	Int now = timeGetTime();
-	
+
 	//
 	// we keep the shell updates fixed in time so that we can write consitent animation
 	// speeds during the screen update functions
@@ -190,19 +192,19 @@ void Shell::update( void )
 		for( Int i = m_screenCount - 1; i >= 0; i-- )
 		{
 
-			DEBUG_ASSERTCRASH( m_screenStack[ i ], ("Top of shell stack is NULL!\n") );
+			DEBUG_ASSERTCRASH( m_screenStack[ i ], ("Top of shell stack is NULL!") );
 			m_screenStack[ i ]->runUpdate( NULL );
 
-		}  // end for i
+		}
 		if(TheGlobalData->m_shellMapOn && m_shellMapOn &&m_background)
 		{
-			
+
 			m_background->destroyWindows();
 			deleteInstance(m_background);
 			m_background = NULL;
-			
+
 		}
-		
+
 		// Update the animate window manager
 		m_animateWindowManager->update();
 
@@ -211,9 +213,56 @@ void Shell::update( void )
 		// mark last time we ran the updates
 		lastUpdate = now;
 
-	}  // end if
+	}
+
+}
 
-}  // end update
+//-------------------------------------------------------------------------------------------------
+namespace
+{
+	struct ScreenInfo
+	{
+		ScreenInfo() : isHidden(false) {}
+		AsciiString filename;
+		bool isHidden;
+	};
+}
+
+//-------------------------------------------------------------------------------------------------
+void Shell::recreateWindowLayouts( void )
+{
+		// collect state of the current shell
+	const Int screenCount = getScreenCount();
+	std::vector<ScreenInfo> screenStackInfos;
+
+	{
+		screenStackInfos.resize(screenCount);
+		Int screenIndex = 0;
+		for (; screenIndex < screenCount; ++screenIndex)
+		{
+			const WindowLayout* layout = getScreenLayout(screenIndex);
+			ScreenInfo& screenInfo = screenStackInfos[screenIndex];
+			screenInfo.filename = layout->getFilename();
+			screenInfo.isHidden = layout->isHidden();
+		}
+	}
+
+	// reconstruct the shell now
+	deconstruct();
+	construct();
+	init();
+
+	// restore the screen stack
+	Int screenIndex = 0;
+	for (; screenIndex < screenCount; ++screenIndex)
+	{
+		const ScreenInfo& screenInfo = screenStackInfos[screenIndex];
+		push(screenInfo.filename);
+
+		WindowLayout* layout = getScreenLayout(screenIndex);
+		layout->hide(screenInfo.isHidden);
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Find a screen via the .wnd script filename loaded */
@@ -234,11 +283,20 @@ WindowLayout *Shell::findScreenByFilename( AsciiString filename )
 		if( screen && filename.compareNoCase(screen->getFilename()) == 0 )
 			return screen;
 
-	}  // end for i
+	}
 
 	return NULL;
 
-}  // end findScreenByFilename
+}
+
+//-------------------------------------------------------------------------------------------------
+WindowLayout *Shell::getScreenLayout( Int index ) const
+{
+	if (index >= 0 && index < m_screenCount)
+		return m_screenStack[index];
+
+	return NULL;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Hide or unhide all window layouts loaded */
@@ -254,7 +312,7 @@ void Shell::hide( Bool hide )
 	if (TheIMEManager)
 		TheIMEManager->detatch();
 
-}  // end hide
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Push layout onto shell */
@@ -270,22 +328,22 @@ void Shell::push( AsciiString filename, Bool shutdownImmediate )
 
 
 #ifdef DEBUG_LOGGING
-	DEBUG_LOG(("Shell:push(%s) - stack was\n", filename.str()));
+	DEBUG_LOG(("Shell:push(%s) - stack was", filename.str()));
 	for (Int i=0; i<m_screenCount; ++i)
 	{
-		DEBUG_LOG(("\t\t%s\n", m_screenStack[i]->getFilename().str()));
+		DEBUG_LOG(("\t\t%s", m_screenStack[i]->getFilename().str()));
 	}
 #endif
 
 	// make sure we have an available spot for another screen
 	if( m_screenCount >= MAX_SHELL_STACK )
 	{
-	
-		DEBUG_LOG(( "Unable to load screen '%s', max '%d' reached\n",
-								filename, MAX_SHELL_STACK ));
+
+		DEBUG_LOG(( "Unable to load screen '%s', max '%d' reached",
+								filename.str(), MAX_SHELL_STACK ));
 		return;
 
-	}  // end if
+	}
 
 	// set a push as pending with the layout name passed in
 	m_pendingPush = TRUE;
@@ -306,19 +364,19 @@ void Shell::push( AsciiString filename, Bool shutdownImmediate )
 		// run the shutdown
 		currentTop->runShutdown( &shutdownImmediate );
 
-	}  // end if
+	}
 	else
 	{
 
 		// just call shutdownComplete() which will immediately cause the push to happen
 		shutdownComplete( NULL );
 
-	}  // end else
+	}
 
 //	if (TheIMEManager)
 //		TheIMEManager->detatch();
 
-}  // end push
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Pop top layout of the stack.  Note that we don't actually do the pop right here,
@@ -337,10 +395,10 @@ void Shell::pop( void )
 		return;
 
 #ifdef DEBUG_LOGGING
-	DEBUG_LOG(("Shell:pop() - stack was\n"));
+	DEBUG_LOG(("Shell:pop() - stack was"));
 	for (Int i=0; i<m_screenCount; ++i)
 	{
-		DEBUG_LOG(("\t\t%s\n", m_screenStack[i]->getFilename().str()));
+		DEBUG_LOG(("\t\t%s", m_screenStack[i]->getFilename().str()));
 	}
 #endif
 
@@ -358,7 +416,7 @@ void Shell::pop( void )
 	if (TheIMEManager)
 		TheIMEManager->detatch();
 
-}  // end pop
+}
 
 //-------------------------------------------------------------------------------------------------
 /** When you need to immediately pop a screen off the stack use this method.  It
@@ -376,10 +434,10 @@ void Shell::popImmediate( void )
 		return;
 
 #ifdef DEBUG_LOGGING
-	DEBUG_LOG(("Shell:popImmediate() - stack was\n"));
+	DEBUG_LOG(("Shell:popImmediate() - stack was"));
 	for (Int i=0; i<m_screenCount; ++i)
 	{
-		DEBUG_LOG(("\t\t%s\n", m_screenStack[i]->getFilename().str()));
+		DEBUG_LOG(("\t\t%s", m_screenStack[i]->getFilename().str()));
 	}
 #endif
 
@@ -396,7 +454,7 @@ void Shell::popImmediate( void )
 	if (TheIMEManager)
 		TheIMEManager->detatch();
 
-}  // end popImmediate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Run the initialize function for the top of the stack just as though it was pushed
@@ -406,14 +464,14 @@ void Shell::popImmediate( void )
 //-------------------------------------------------------------------------------------------------
 void Shell::showShell( Bool runInit )
 {
-	DEBUG_LOG(("Shell:showShell() - %s (%s)\n", TheGlobalData->m_initialFile.str(), (top())?top()->getFilename().str():"no top screen"));
+	DEBUG_LOG(("Shell:showShell() - %s (%s)", TheGlobalData->m_initialFile.str(), (top())?top()->getFilename().str():"no top screen"));
 
-	if(!TheGlobalData->m_initialFile.isEmpty())
+	if(!TheGlobalData->m_initialFile.isEmpty() || !TheGlobalData->m_simulateReplays.empty())
 	{
 		return;
 	}
-	
-	// runInit is used if we want show shell to run 
+
+	// runInit is used if we want show shell to run
 	if(runInit)
 	{
 		WindowLayout *layout = top();
@@ -445,27 +503,27 @@ void Shell::showShell( Bool runInit )
 	//	}
 	//	else
 	//	{
-	//		
+	//
 	//		m_background = TheWindowManager->winCreateLayout("Menus/BlankWindow.wnd");
-	//		
+	//
 	//		DEBUG_ASSERTCRASH(m_background,("We Couldn't Load Menus/BlankWindow.wnd"));
 	//		m_background->hide(FALSE);
 	//		if (top())
 	//			top()->bringForward();
-	//		
+	//
 	//	}
-	
+
 
 	if (!TheGlobalData->m_shellMapOn && m_screenCount == 0)
 	//else
-		TheShell->push( AsciiString("Menus/MainMenu.wnd") );
+		push( "Menus/MainMenu.wnd" );
 	m_isShellActive = TRUE;
-}  // end showShell
+}
 
 void Shell::showShellMap(Bool useShellMap )
 {
 	// we don't want any of this to show if we're loading straight into a file
-	if(TheGlobalData->m_initialFile.isNotEmpty() || !TheGameLogic )
+	if (TheGlobalData->m_initialFile.isNotEmpty() || !TheGameLogic || !TheGlobalData->m_simulateReplays.empty())
 		return;
 	if(useShellMap && TheGlobalData->m_shellMapOn)
 	{
@@ -474,7 +532,7 @@ void Shell::showShellMap(Bool useShellMap )
 			return;
 		// we're in some other kind of game, clear it out foo!
 		if(TheGameLogic->isInGame())
-			TheMessageStream->appendMessage( GameMessage::MSG_CLEAR_GAME_DATA );
+			TheGameLogic->exitGame();
 
 		TheWritableGlobalData->m_pendingFile = TheGlobalData->m_shellMapName;
 		InitGameLogicRandom(0);
@@ -486,14 +544,14 @@ void Shell::showShellMap(Bool useShellMap )
 	{
 		// we're in a shell game, stop it!
 		if(TheGameLogic->isInGame() && TheGameLogic->getGameMode() == GAME_SHELL)
-			TheMessageStream->appendMessage( GameMessage::MSG_CLEAR_GAME_DATA );
+			TheGameLogic->exitGame();
 
 		// if the shell is active,we need a background
 		if(!m_isShellActive)
 			return;
 		if(!m_background)
 			m_background = TheWindowManager->winCreateLayout("Menus/BlankWindow.wnd");
-		
+
 		DEBUG_ASSERTCRASH(m_background,("We Couldn't Load Menus/BlankWindow.wnd"));
 		m_background->getFirstWindow()->winSetStatus(WIN_STATUS_IMAGE);
 		m_background->hide(FALSE);
@@ -515,7 +573,7 @@ void Shell::hideShell( void )
 	// If we have the 3d background running, mark it to close
 	m_clearBackground = TRUE;
 
-	DEBUG_LOG(("Shell:hideShell() - %s\n", (top())?top()->getFilename().str():"no top screen"));
+	DEBUG_LOG(("Shell:hideShell() - %s", (top())?top()->getFilename().str():"no top screen"));
 
 	WindowLayout *layout = top();
 
@@ -525,7 +583,7 @@ void Shell::hideShell( void )
 
 		layout->runShutdown( &immediatePop );
 
-	}  // end if
+	}
 
 	if (TheIMEManager)
 		TheIMEManager->detatch();
@@ -533,7 +591,7 @@ void Shell::hideShell( void )
 	// Mark that the shell is no longer up.
 	m_isShellActive = FALSE;
 
-}  // end hideShell
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return the top layout on the stack */
@@ -548,7 +606,7 @@ WindowLayout *Shell::top( void )
 	// top layout is at count index
 	return m_screenStack[ m_screenCount - 1 ];
 
-}  // end top
+}
 
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
@@ -565,34 +623,34 @@ void Shell::linkScreen( WindowLayout *screen )
 	if( m_screenCount == MAX_SHELL_STACK )
 	{
 
-		DEBUG_CRASH(( "No room in shell stack for screen\n" ));
+		DEBUG_CRASH(( "No room in shell stack for screen" ));
 		return;
 
-	}  // end if
+	}
 
 	// add to array at top index
 	m_screenStack[ m_screenCount++ ] = screen;
 
-}  // end linkScreen
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove screen from our list */
 //-------------------------------------------------------------------------------------------------
 void Shell::unlinkScreen( WindowLayout *screen )
 {
-	
+
 	// sanity
 	if( screen == NULL )
 		return;
 
-	DEBUG_ASSERTCRASH( m_screenStack[ m_screenCount - 1 ] == screen, 
-										 ("Screen not on top of stack\n") );
+	DEBUG_ASSERTCRASH( m_screenStack[ m_screenCount - 1 ] == screen,
+										 ("Screen not on top of stack") );
 
 	// remove reference to screen and decrease count
 	if( m_screenStack[ m_screenCount - 1 ] == screen )
 		m_screenStack[ --m_screenCount ] = NULL;
 
-}  // end unlinkScreen
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Actually do the work for a push */
@@ -602,10 +660,10 @@ void Shell::doPush( AsciiString layoutFile )
 	if(TheGameSpyInfo)
 			GameSpyCloseAllOverlays();
 	WindowLayout *newScreen;
-	
+
 	// create new layout and load from window manager
 	newScreen = TheWindowManager->winCreateLayout( layoutFile );
-	DEBUG_ASSERTCRASH( newScreen != NULL, ("Shell unable to load pending push layout\n") );
+	DEBUG_ASSERTCRASH( newScreen != NULL, ("Shell unable to load pending push layout") );
 
 	// link screen to the top
 	linkScreen( newScreen );
@@ -618,7 +676,7 @@ void Shell::doPush( AsciiString layoutFile )
 	newScreen->bringForward();
 
 
-}  // end doPush
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Actually do the work for a pop */
@@ -628,7 +686,7 @@ void Shell::doPop( Bool impendingPush )
 	WindowLayout *currentTop = top();
 
 	// there better be a top of the stack since we're popping
-	DEBUG_ASSERTCRASH( currentTop, ("Shell: No top of stack and we want to pop!\n") );
+	DEBUG_ASSERTCRASH( currentTop, ("Shell: No top of stack and we want to pop!") );
 
 	if (currentTop)
 	{
@@ -653,7 +711,7 @@ void Shell::doPop( Bool impendingPush )
 	if (TheIMEManager)
 		TheIMEManager->detatch();
 
-}  // end doPop
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a layout has finished its shutdown process.  Layouts are
@@ -670,7 +728,7 @@ void Shell::shutdownComplete( WindowLayout *screen, Bool impendingPush )
 
 	// there should never be a pending push AND pop operation
 	DEBUG_ASSERTCRASH( m_pendingPush == FALSE || m_pendingPop == FALSE,
-										 ("There is a pending push AND pop in the shell.  Not allowed!\n") );	
+										 ("There is a pending push AND pop in the shell.  Not allowed!") );
 
 	// Reset the AnimateWindowManager
 	m_animateWindowManager->reset();
@@ -686,18 +744,18 @@ void Shell::shutdownComplete( WindowLayout *screen, Bool impendingPush )
 		m_pendingPush = FALSE;
 		m_pendingPushName.set( "" );
 
-	}  // end if
+	}
 	else if( m_pendingPop )
 	{
 
 		// do the pop
 		doPop( impendingPush );
-				
+
 		// no more pending pop for you!
 		m_pendingPop = FALSE;
 
-	}  // end else if
-	
+	}
+
 	if(m_clearBackground)
 	{
 		if(m_background)
@@ -707,10 +765,10 @@ void Shell::shutdownComplete( WindowLayout *screen, Bool impendingPush )
 			m_background = NULL;
 			m_clearBackground = FALSE;
 		}
-			
+
 	}
 
-}  // end shutdownComplete
+}
 
 
 void Shell::registerWithAnimateManager( GameWindow *win, AnimTypes animType, Bool needsToFinish, UnsignedInt delayMS)
@@ -778,35 +836,35 @@ void Shell::loadScheme( AsciiString name )
 // ------------------------------------------------------------------------------------------------
 WindowLayout *Shell::getSaveLoadMenuLayout( void )
 {
-	
+
 	// if layout has not been created, create it now
 	if( m_saveLoadMenuLayout == NULL )
-   m_saveLoadMenuLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupSaveLoad.wnd" ) );
+   m_saveLoadMenuLayout = TheWindowManager->winCreateLayout( "Menus/PopupSaveLoad.wnd" );
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_saveLoadMenuLayout, ("Unable to create save/load menu layout\n") );
+	DEBUG_ASSERTCRASH( m_saveLoadMenuLayout, ("Unable to create save/load menu layout") );
 
 	// return the layout
 	return m_saveLoadMenuLayout;
 
-}  // end getSaveLoadMenuLayout
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 WindowLayout *Shell::getPopupReplayLayout( void )
 {
-	
+
 	// if layout has not been created, create it now
 	if( m_popupReplayLayout == NULL )
-   m_popupReplayLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupReplay.wnd" ) );
+   m_popupReplayLayout = TheWindowManager->winCreateLayout( "Menus/PopupReplay.wnd" );
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_popupReplayLayout, ("Unable to create replay save menu layout\n") );
+	DEBUG_ASSERTCRASH( m_popupReplayLayout, ("Unable to create replay save menu layout") );
 
 	// return the layout
 	return m_popupReplayLayout;
 
-}  // end getSaveLoadMenuLayout
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -815,15 +873,15 @@ WindowLayout *Shell::getOptionsLayout( Bool create )
 	// if layout has not been created, create it now
 	if ((m_optionsLayout == NULL) && (create == TRUE))
 	{
-		m_optionsLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/OptionsMenu.wnd" ) );
+		m_optionsLayout = TheWindowManager->winCreateLayout( "Menus/OptionsMenu.wnd" );
 
 		// sanity
-		DEBUG_ASSERTCRASH( m_optionsLayout, ("Unable to create options menu layout\n") );
+		DEBUG_ASSERTCRASH( m_optionsLayout, ("Unable to create options menu layout") );
 	}
 
 	// return the layout
 	return m_optionsLayout;
-} // end getOptionsLayout
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
index 10772d85481..1bcabcdc4b4 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ShellMenuScheme.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,8 +37,8 @@
 //	Filename: 	ShellMenuScheme.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/ShellMenuScheme.h"
@@ -60,12 +60,12 @@
 // DEFINES ////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 
-const FieldParse ShellMenuSchemeManager::m_shellMenuSchemeFieldParseTable[] = 
+const FieldParse ShellMenuSchemeManager::m_shellMenuSchemeFieldParseTable[] =
 {
 
 	{ "ImagePart",						ShellMenuSchemeManager::parseImagePart,			NULL, NULL },
 	{ "LinePart",							ShellMenuSchemeManager::parseLinePart,	NULL, NULL },
-	{ NULL,										NULL,													NULL, 0 }  // keep this last
+	{ NULL,										NULL,													NULL, 0 }
 
 };
 
@@ -80,25 +80,25 @@ void INI::parseShellMenuSchemeDefinition( INI *ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
 	SMSchemeManager = TheShell->getShellMenuSchemeManager();
-	DEBUG_ASSERTCRASH( SMSchemeManager, ("parseShellMenuSchemeDefinition: Unable to Get SMSchemeManager\n") );
+	DEBUG_ASSERTCRASH( SMSchemeManager, ("parseShellMenuSchemeDefinition: Unable to Get SMSchemeManager") );
 	if( !SMSchemeManager )
 		return;
 
 	// If we have a previously allocated control bar, this will return a cleared out pointer to it so we
-	// can overwrite it	
+	// can overwrite it
 	SMScheme = SMSchemeManager->newShellMenuScheme( name );
 
 	// sanity
-	DEBUG_ASSERTCRASH( SMScheme, ("parseControlBarSchemeDefinition: Unable to allocate Scheme '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( SMScheme, ("parseControlBarSchemeDefinition: Unable to allocate Scheme '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( SMScheme, SMSchemeManager->getFieldParse() );
 
-}  // end parseCommandButtonDefinition
+}
 
 ShellMenuSchemeLine::ShellMenuSchemeLine( void )
 {
@@ -126,7 +126,7 @@ ShellMenuSchemeImage::~ShellMenuSchemeImage( void )
 
 ShellMenuScheme::ShellMenuScheme( void )
 {
-	
+
 }
 
 ShellMenuScheme::~ShellMenuScheme( void )
@@ -136,8 +136,7 @@ ShellMenuScheme::~ShellMenuScheme( void )
 	{
 		ShellMenuSchemeImage *image = *it;
 		it = m_imageList.erase( it );
-		if(image)
-			delete image;
+		delete image;
 	}
 
 	ShellMenuSchemeLineListIt lineIt = m_lineList.begin();
@@ -145,11 +144,10 @@ ShellMenuScheme::~ShellMenuScheme( void )
 	{
 		ShellMenuSchemeLine *line = *lineIt;
 		lineIt = m_lineList.erase( lineIt );
-		if(line)
-			delete line;
+		delete line;
 	}
 
-	
+
 }
 
 void ShellMenuScheme::addLine( ShellMenuSchemeLine* schemeLine )
@@ -188,7 +186,7 @@ void ShellMenuScheme::draw( void )
 	while(it != m_lineList.end())
 	{
 		ShellMenuSchemeLine *line = *it;
-		
+
 		if(line)
 		{
 			TheDisplay->drawLine(line->m_startPos.x, line->m_startPos.y, line->m_endPos.x,
@@ -215,20 +213,19 @@ ShellMenuSchemeManager::~ShellMenuSchemeManager( void )
 	{
 		ShellMenuScheme *scheme = *it;
 		it = m_schemeList.erase( it );
-		if(scheme)
-			delete scheme;
+		delete scheme;
 	}
-	
+
 }
 
 void ShellMenuSchemeManager::parseImagePart(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Position",				INI::parseICoord2D,				NULL, offsetof( ShellMenuSchemeImage, m_position ) },
 			{ "Size",						INI::parseICoord2D,				NULL, offsetof( ShellMenuSchemeImage, m_size ) },
       { "ImageName",			INI::parseMappedImage,		NULL, offsetof( ShellMenuSchemeImage, m_image ) },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
 	ShellMenuSchemeImage *schemeImage = NEW ShellMenuSchemeImage;
@@ -239,14 +236,14 @@ void ShellMenuSchemeManager::parseImagePart(INI *ini, void *instance, void* /*st
 
 void ShellMenuSchemeManager::parseLinePart(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "StartPosition",		INI::parseICoord2D,				NULL, offsetof( ShellMenuSchemeLine, m_startPos ) },
 			{ "EndPosition",			INI::parseICoord2D,				NULL, offsetof( ShellMenuSchemeLine, m_endPos ) },
       { "Color",						INI::parseColorInt,				NULL, offsetof( ShellMenuSchemeLine, m_color ) },
 			{ "Width",						INI::parseInt,						NULL, offsetof( ShellMenuSchemeLine, m_width ) },
-			
-			{ NULL,								NULL,											NULL, 0 }  // keep this last
+
+			{ NULL,								NULL,											NULL, 0 }
 		};
 
 	ShellMenuSchemeLine *schemeLine = NEW ShellMenuSchemeLine;
@@ -282,8 +279,8 @@ void ShellMenuSchemeManager::init( void )
 {
 	INI ini;
 	// Read from INI all the ControlBarSchemes
-	ini.load( AsciiString( "Data\\INI\\Default\\ShellMenuScheme.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\ShellMenuScheme.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL );
 
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/WinInstanceData.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/WinInstanceData.cpp
index 061d16d8928..9e466dfa8c5 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/WinInstanceData.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/WinInstanceData.cpp
@@ -24,12 +24,12 @@
 
 // FILE: WinInstanceData.cpp //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "GameClient/WinInstanceData.h"
@@ -79,7 +79,7 @@ WinInstanceData::WinInstanceData( void )
 	m_videoBuffer = NULL;
 	init();
 
-}  // end WinInstanceData
+}
 
 // WinInstanceData::~WinInstanceData ==========================================
 //=============================================================================
@@ -94,7 +94,7 @@ WinInstanceData::~WinInstanceData( void )
 
 	m_videoBuffer = NULL; //Video Buffer needs to be clean up by the control that is in charge of the video.
 
-}  // end ~WinInstanceData
+}
 
 // WinInstanceData::init ======================================================
 /** Set initial values for instance data if desired */
@@ -119,7 +119,7 @@ void WinInstanceData::init( void )
 		m_hiliteDrawData[ i ].color = WIN_COLOR_UNDEFINED;
 		m_hiliteDrawData[ i ].borderColor = WIN_COLOR_UNDEFINED;
 
-	}  // end for i
+	}
 
 	// initialize text colors
 	m_enabledText.color					= WIN_COLOR_UNDEFINED;
@@ -150,19 +150,19 @@ void WinInstanceData::init( void )
 		TheDisplayStringManager->freeDisplayString( m_text );
 		m_text = NULL;
 
-	}  // end if
+	}
 	if( m_tooltip )
 	{
 
 		TheDisplayStringManager->freeDisplayString( m_tooltip );
 		m_tooltip = NULL;
 
-	}  // end if
+	}
 
 	m_videoBuffer = NULL;
 
 
-}  // end init
+}
 
 // WinInstanceData::setTooltipText ============================================
 //=============================================================================
@@ -177,7 +177,7 @@ void WinInstanceData::setTooltipText( UnicodeString tip )
 	// set text
 	m_tooltip->setText( tip );
 
-}  // end setTooltipText
+}
 
 // WinInstanceData:setText ====================================================
 /** Set the text for this window instance data */
@@ -193,7 +193,7 @@ void WinInstanceData::setText( UnicodeString text )
 	// set the text
 	m_text->setText( text );
 
-}  // end set text
+}
 
 // WinInstanceData:setText ====================================================
 /** Set the text for this window instance data */
@@ -201,4 +201,4 @@ void WinInstanceData::setText( UnicodeString text )
 void WinInstanceData::setVideoBuffer( VideoBuffer * videoBuffer )
 {
 	m_videoBuffer = videoBuffer;
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp
index d1cec832349..1e0028dbe2c 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp
@@ -28,17 +28,11 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/WindowLayout.h"
 #include "GameClient/Shell.h"
 #include "GameClient/GameWindowManager.h"
-#ifdef RTS_INTERNAL
-
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
@@ -57,7 +51,7 @@ WindowLayout::WindowLayout( void )
 	m_update = NULL;
 	m_shutdown = NULL;
 
-}  // end WindowLayout
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -70,9 +64,9 @@ WindowLayout::~WindowLayout( void )
 	// use them in any you see fit, as long as they are clean when they go away
 	//
 	DEBUG_ASSERTCRASH( m_windowList == NULL, ("Window layout being destroyed still has window references") );
-	DEBUG_ASSERTCRASH( m_windowTail == NULL, ("Window layout being destroyed still has window references") );	
+	DEBUG_ASSERTCRASH( m_windowTail == NULL, ("Window layout being destroyed still has window references") );
 
-}  // end ~WindowLayout
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the hidden/visible status of all the windows in this layout */
@@ -87,12 +81,12 @@ void WindowLayout::hide( Bool hide )
 
 		window->winHide( hide );
 
-	}  // end for window
+	}
 
 	// save the new visible state of the system
 	m_hidden = hide;
 
-}  // end hide
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Add window to this layout */
@@ -101,7 +95,7 @@ void WindowLayout::addWindow( GameWindow *window )
 {
 	GameWindow *win = findWindow( window );
 
-	// only add window if window is not in this layout already	
+	// only add window if window is not in this layout already
 	if( win == NULL )
 	{
 
@@ -126,9 +120,9 @@ void WindowLayout::addWindow( GameWindow *window )
 		// we gots another window now
 		m_windowCount++;
 
-	}  // end if
+	}
 
-}  // end addWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove window from this layout */
@@ -164,9 +158,9 @@ void WindowLayout::removeWindow( GameWindow *window )
 		// we lost one sir!
 		m_windowCount--;
 
-	}  // end if
+	}
 
-}  // end removeWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Destroy all the windows in a layout */
@@ -184,9 +178,9 @@ void WindowLayout::destroyWindows( void )
 		// destroy window in window system
 		TheWindowManager->winDestroy( window );
 
-	}  // end while
+	}
 
-}  // end destroyWindows
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create the windows using the .wnd file script and load all windows into
@@ -214,10 +208,10 @@ Bool WindowLayout::load( AsciiString filename )
 	{
 
 		DEBUG_ASSERTCRASH( target, ("WindowLayout::load - Failed to load layout") );
-		DEBUG_LOG(( "WindowLayout::load - Unable to load layout file '%s'\n", filename.str() ));
+		DEBUG_LOG(( "WindowLayout::load - Unable to load layout file '%s'", filename.str() ));
 		return FALSE;
 
-	}  // end if
+	}
 
 	//
 	// add windows loaded from .wnd file to the layout, via info.windows.
@@ -242,7 +236,7 @@ Bool WindowLayout::load( AsciiString filename )
 		// add window to this layout
 		addWindow( window );
 
-	}  // end for window
+	}
 	*/
 
 	// copy filename
@@ -255,7 +249,7 @@ Bool WindowLayout::load( AsciiString filename )
 
 	return TRUE;  // success
 
-}  // end load
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Bring all windows in this layout forward */
@@ -282,9 +276,9 @@ void WindowLayout::bringForward( void )
 		window->winBringToTop();
 		countLeft--;
 
-	}  // end for window
+	}
 
-}  // end bringForward
+}
 
 
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////////////////////////
@@ -301,4 +295,4 @@ GameWindow *WindowLayout::findWindow( GameWindow *window )
 
 	return NULL;  // window not found
 
-}  // end findWindow
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp
deleted file mode 100644
index d285fd84f26..00000000000
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: WindowVideoManager.cpp /////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-//	created:	Apr 2002
-//
-//	Filename: 	WindowVideoManager.cpp
-//
-//	author:		Chris Huybregts
-//	
-//	purpose:	Every window is setup to be able to draw a movie.  The 
-//						WindowVideoManager will take care of setting up the window,
-//						creating/destroying the buffers, and the ability to pause/stop
-//						movies.
-//
-//	To Use:		Create a manager and initialize it. Make sure the manager's Update
-//						is called every frame or how ever often it needs to be updated.
-//						Call reset if the manager needs to be cleared.
-//						Play a movie in a window by passing a window pointer, a movie name,
-//						and the playtype.
-//						If a user trys to play a two different movies on the same window,
-//						only the last one added will play.
-//						It's important when destroying a window, that window is removed
-//						from the manager (Or call Reset if you know no other windows are
-//						playing a movie).
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-//-----------------------------------------------------------------------------
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// USER INCLUDES //////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/WindowVideoManager.h"
-#include "GameClient/GameWindow.h"
-#include "GameClient/VideoPlayer.h"
-#include "GameClient/Display.h"
-
-//-----------------------------------------------------------------------------
-// DEFINES ////////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// WindowVideo PUBLIC FUNCTIONS ///////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-WindowVideo::WindowVideo( void )
-{
-	
-	m_playType = WINDOW_PLAY_MOVIE_ONCE;
-	m_win = NULL;
-	m_videoBuffer = NULL;
-	m_videoStream = NULL;
-	m_movieName.clear();
-	m_state = WINDOW_VIDEO_STATE_STOP;
-
-}
-
-WindowVideo::~WindowVideo( void )
-{
-	// Don't Delete the window, only set it's video buffer to NULL
-	if(m_win)
-		m_win->winGetInstanceData()->setVideoBuffer( NULL );
-	m_win = NULL;
-	
-	delete m_videoBuffer;
-	m_videoBuffer = NULL;
-
-	if ( m_videoStream )
-		m_videoStream->close();
-	m_videoStream = NULL;
-
-}
-	
-void WindowVideo::init( GameWindow *win, AsciiString movieName, 
-												WindowVideoPlayType playType,
-												VideoBuffer *videoBuffer, VideoStreamInterface *videoStream)
-{
-	m_win = win;
-	m_movieName = movieName;
-	m_playType = playType;
-	m_videoBuffer = videoBuffer;
-	m_videoStream = videoStream;
-	m_state = WINDOW_VIDEO_STATE_PLAY;
-	if(m_win)
-		m_win->winGetInstanceData()->setVideoBuffer( m_videoBuffer );
-}
-	
-void WindowVideo::setWindowState( WindowVideoStates state )
-{ 
-	m_state = state; 
-
-	if(m_state == WINDOW_VIDEO_STATE_STOP && m_win)
-		m_win->winGetInstanceData()->setVideoBuffer( NULL );
-
-	if((m_state == WINDOW_VIDEO_STATE_PLAY || m_state == WINDOW_VIDEO_STATE_PAUSE )&& m_win)
-		m_win->winGetInstanceData()->setVideoBuffer( m_videoBuffer );
-}	
-
-//-----------------------------------------------------------------------------
-// WindowVideoManager PUBLIC FUNCTIONS ////////////////////////////////////////
-//-----------------------------------------------------------------------------
-WindowVideoManager::WindowVideoManager( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			delete winVid;
-		it++;
-	}
-	m_playingVideos.clear();
-	
-	m_stopAllMovies = FALSE;
-	m_pauseAllMovies = FALSE;
-
-}
-
-WindowVideoManager::~WindowVideoManager( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			delete winVid;
-		it++;
-	}
-	m_playingVideos.clear();
-	
-}
-
-	
-void WindowVideoManager::init( void )
-{
-	m_playingVideos.clear();
-	
-	m_stopAllMovies = FALSE;
-	m_pauseAllMovies = FALSE;
-}
-
-void WindowVideoManager::reset( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			delete winVid;
-		it++;
-	}
-	m_playingVideos.clear();
-	
-	m_stopAllMovies = FALSE;
-	m_pauseAllMovies = FALSE;
-}
-
-void WindowVideoManager::update( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-
-	if(m_pauseAllMovies || m_stopAllMovies)
-		return;
-
-	//Iterate through the maps
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		
-		if(!winVid)
-		{
-			DEBUG_CRASH(("There's No WindowVideo in the m_playignVideos list"));
-			return;
-		}
-		GameWindow *win = winVid->getWin();
-
-		if(winVid->getState() == WINDOW_VIDEO_STATE_HIDDEN && (win->winIsHidden() == FALSE))
-		{
-			resumeMovie(win);
-		}
-
-		if(winVid->getState() == WINDOW_VIDEO_STATE_PLAY && win->winIsHidden())
-		{
-			hideMovie(win);
-		}
-
-		// Only advance the frame if we're playing
-		if(winVid->getState() != WINDOW_VIDEO_STATE_PLAY)
-		{
-			it++;
-			continue;
-		}
-
-		// Get the Stream and the buffer to update for each animation
-		VideoStreamInterface *videoStream = winVid->getVideoStream();
-		VideoBuffer *videoBuffer = winVid->getVideoBuffer();
-		
-		if ( videoStream && videoBuffer )
-		{
-			if ( videoStream->isFrameReady())
-			{
-				videoStream->frameDecompress();
-				videoStream->frameRender( videoBuffer );
-				videoStream->frameNext();
-				
-				// If we reach frame Index of 0, we might have to pause, or loop.
-				if ( videoStream->frameIndex() == 0 )
-				{
-					if(winVid->getPlayType() == WINDOW_PLAY_MOVIE_ONCE)
-						stopMovie(win);
-					else if (winVid->getPlayType() == WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME)
-						pauseMovie(win);
-				}
-			}
-		}
-		
-		it++;
-	}
-}
-
-void WindowVideoManager::playMovie( GameWindow *win, AsciiString movieName, WindowVideoPlayType playType )
-{
-	// if we already have a movie playing for that window, kill it.
-	stopAndRemoveMovie( win );
-	
-	// create the new stream
-	VideoStreamInterface *videoStream = TheVideoPlayer->open( movieName );
-	if ( videoStream == NULL )
-	{
-		return;
-	}
-
-	// Create the new buffer
-	VideoBuffer *videoBuffer = TheDisplay->createVideoBuffer();
-	if (	videoBuffer == NULL || 
-				!videoBuffer->allocate(	videoStream->width(), 
-													videoStream->height())
-		)
-	{
-		// If we failed to create the buffer...
-		delete videoBuffer;
-		videoBuffer = NULL;
-
-		if ( videoStream )
-			videoStream->close();
-		videoStream = NULL;
-
-		return;
-	}
-
-	// now that we have everything, create the new WindowVideo Structure
-	WindowVideo *winVid = NEW WindowVideo;
-	
-	// init it.
-	winVid->init( win, movieName,playType,videoBuffer,videoStream);
-
-	// add it to our map.
-	m_playingVideos[win] = winVid;
-
-	m_pauseAllMovies = FALSE;
-	m_stopAllMovies = FALSE;
-}
-
-
-void WindowVideoManager::pauseMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-		winVid->setWindowState(WINDOW_VIDEO_STATE_PAUSE);
-	}
-	
-}
-void WindowVideoManager::hideMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-		winVid->setWindowState(WINDOW_VIDEO_STATE_HIDDEN);
-	}
-}
-
-void WindowVideoManager::resumeMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_PLAY);
-	}
-	m_pauseAllMovies = FALSE;
-	m_stopAllMovies = FALSE;
-}
-
-void WindowVideoManager::stopMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_STOP);
-	}
-}
-
-void WindowVideoManager::stopAndRemoveMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			delete winVid;
-		winVid = NULL;
-		m_playingVideos.erase(it);
-	}
-}
-
-void WindowVideoManager::stopAllMovies( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	//Iterate through the maps
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_STOP);
-		it++;
-	}
-	
-	m_stopAllMovies = TRUE;
-	m_pauseAllMovies = FALSE;
-}
-
-void WindowVideoManager::pauseAllMovies( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	//Iterate through the maps
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_PAUSE);
-		it++;
-	}
-	
-	m_pauseAllMovies = TRUE;
-	m_stopAllMovies = FALSE;
-}
-
-void WindowVideoManager::resumeAllMovies( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	//Iterate through the maps
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_PLAY);
-		it++;
-	}
-	m_stopAllMovies = FALSE;
-	m_pauseAllMovies = FALSE;
-}
-
-Int WindowVideoManager::getWinState( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			return winVid->getState();
-	}
-	return WINDOW_VIDEO_STATE_STOP;
-}
-
-//-----------------------------------------------------------------------------
-// PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp b/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp
index 8964e037870..6dbf2756c05 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GameClient.cpp
@@ -28,13 +28,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "GameClient/GameClient.h"
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/ActionManager.h"
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/PerfTimer.h"
 #include "Common/Player.h"
@@ -81,11 +82,6 @@
 #include "GameLogic/GhostObject.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/ScriptEngine.h"		// For TheScriptEngine - jkmcd
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define DRAWABLE_HASH_SIZE	8192
 
@@ -101,17 +97,14 @@ GameClient::GameClient()
 		m_translators[ i ] = TRANSLATOR_ID_INVALID;
 	m_numTranslators = 0;
 	m_commandTranslator = NULL;
-	
-	// Added By Sadullah Nader
-	// Initializations missing and needed
+
 	m_drawableTOC.clear();
-	//
 	m_textBearingDrawableList.clear();
 
 	m_frame = 0;
 
 	m_drawableList = NULL;
-	
+
 	m_nextDrawableID = (DrawableID)1;
 	TheDrawGroupInfo = new DrawGroupInfo;
 }
@@ -127,28 +120,25 @@ GameClient::~GameClient()
 	TheGraphDraw = NULL;
 #endif
 
-	if (TheDrawGroupInfo) 
-	{
-		delete TheDrawGroupInfo;
-		TheDrawGroupInfo = NULL;
-	}
+	delete TheDrawGroupInfo;
+	TheDrawGroupInfo = NULL;
 
 	// clear any drawable TOC we might have
 	m_drawableTOC.clear();
 
-	//DEBUG_LOG(("Preloaded texture files ------------------------------------------\n"));
+	//DEBUG_LOG(("Preloaded texture files ------------------------------------------"));
 	//for (Int oog=0; oog<preloadTextureNamesGlobalHack2.size(); ++oog)
 	//{
-	//	DEBUG_LOG(("%s\n", preloadTextureNamesGlobalHack2[oog]));
+	//	DEBUG_LOG(("%s", preloadTextureNamesGlobalHack2[oog]));
 	//}
-	//DEBUG_LOG(("------------------------------------------------------------------\n"));
+	//DEBUG_LOG(("------------------------------------------------------------------"));
 	//for (oog=0; oog<preloadTextureNamesGlobalHack.size(); ++oog)
 	//{
-	//	DEBUG_LOG(("%s\n", preloadTextureNamesGlobalHack[oog]));
+	//	DEBUG_LOG(("%s", preloadTextureNamesGlobalHack[oog]));
 	//}
-	//DEBUG_LOG(("End Texture files ------------------------------------------------\n"));
-	if(TheCampaignManager)
-		delete TheCampaignManager;
+	//DEBUG_LOG(("End Texture files ------------------------------------------------"));
+
+	delete TheCampaignManager;
 	TheCampaignManager = NULL;
 
 	// destroy all Drawables
@@ -188,6 +178,7 @@ GameClient::~GameClient()
 	delete TheFontLibrary;
 	TheFontLibrary = NULL;
 
+	TheMouse->reset();
 	delete TheMouse;
 	TheMouse = NULL;
 
@@ -205,7 +196,7 @@ GameClient::~GameClient()
 
 	delete TheHeaderTemplateManager;
 	TheHeaderTemplateManager = NULL;
-	
+
 	delete TheLanguageFilter;
 	TheLanguageFilter = NULL;
 
@@ -214,16 +205,16 @@ GameClient::~GameClient()
 
 	// destroy all translators
 	for( UnsignedInt i = 0; i < m_numTranslators; i++ )
-		TheMessageStream->removeTranslator( m_translators[ i ] );	
+		TheMessageStream->removeTranslator( m_translators[ i ] );
 	m_numTranslators = 0;
 	m_commandTranslator = NULL;
 
 	delete TheAnim2DCollection;
-	TheAnim2DCollection = NULL;	
+	TheAnim2DCollection = NULL;
 
 	delete TheMappedImageCollection;
-	TheMappedImageCollection = NULL;	
-	
+	TheMappedImageCollection = NULL;
+
 	delete TheKeyboard;
 	TheKeyboard = NULL;
 
@@ -233,7 +224,7 @@ GameClient::~GameClient()
 	delete TheEva;
 	TheEva = NULL;
 
-}  // end ~GameClient
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize resources for the game client */
@@ -245,8 +236,8 @@ void GameClient::init( void )
 
 	INI ini;
 	// Load the DrawGroupInfo here, before the Display Manager is loaded.
-	ini.load("Data\\INI\\DrawGroupInfo.ini", INI_LOAD_OVERWRITE, NULL);
-	
+	ini.loadFileDirectory("Data\\INI\\DrawGroupInfo", INI_LOAD_OVERWRITE, NULL);
+
 	// Override the ini values with localized versions:
 	if (TheGlobalLanguageData && TheGlobalLanguageData->m_drawGroupInfoFont.name.isNotEmpty())
 	{
@@ -261,7 +252,7 @@ void GameClient::init( void )
 		TheDisplayStringManager->init();
 		TheDisplayStringManager->setName("TheDisplayStringManager");
 	}
-	
+
 	if (!TheGlobalData->m_headless)
 	{
 		// create the keyboard
@@ -309,7 +300,7 @@ void GameClient::init( void )
 		//
 		m_translators[ m_numTranslators++ ] =	TheMessageStream->attachTranslator( MSGNEW("GameClientSubsystem") GameClientMessageDispatcher, 999999999 );
 
-	}  
+	}
 
 	// create the font library
 	TheFontLibrary = createFontLibrary();
@@ -328,7 +319,7 @@ void GameClient::init( void )
 		TheDisplay->init();
  		TheDisplay->setName("TheDisplay");
 	}
-	
+
 	TheHeaderTemplateManager = MSGNEW("GameClientSubsystem") HeaderTemplateManager;
 	if(TheHeaderTemplateManager){
 		TheHeaderTemplateManager->init();
@@ -343,7 +334,7 @@ void GameClient::init( void )
  		TheWindowManager->setName("TheWindowManager");
 //		TheWindowManager->initTestGUI();
 
-	}  // end if
+	}
 
 	// create the IME manager
 	TheIMEManager = CreateIMEManagerInterface();
@@ -395,7 +386,7 @@ void GameClient::init( void )
 		TheMouse->setPosition( 0, 0 );
 		TheMouse->setMouseLimits();
  		TheMouse->setName("TheMouse");
-	}  // end if
+	}
 
 	// create the video player
 	TheVideoPlayer = createVideoPlayer();
@@ -426,7 +417,7 @@ void GameClient::init( void )
 	TheGraphDraw = new GraphDraw;
 #endif
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the game client for a new game */
@@ -439,7 +430,7 @@ void GameClient::reset( void )
 #else
 	m_drawableHash.reserve(DRAWABLE_HASH_SIZE);
 #endif
-	
+
 	// need to reset the in game UI to clear drawables before they are destroyed
 	TheInGameUI->reset();
 
@@ -463,7 +454,7 @@ void GameClient::reset( void )
 	// TheSuperHackers @fix Mauller 13/04/2025 Reset the drawable id so it does not keep growing over the lifetime of the game.
 	m_nextDrawableID = (DrawableID)1;
 
-}  // end reset
+}
 
 /** -----------------------------------------------------------------------------------------------
  * Return a new unique object id.
@@ -479,7 +470,7 @@ DrawableID GameClient::allocDrawableID( void )
 /** -----------------------------------------------------------------------------------------------
  * Given a drawable, register it with the GameClient and give it a unique ID.
  */
-void GameClient::registerDrawable( Drawable *draw ) 
+void GameClient::registerDrawable( Drawable *draw )
 {
 
 	// assign this drawable a unique ID, this will add it to the fast lookup table too
@@ -488,7 +479,7 @@ void GameClient::registerDrawable( Drawable *draw )
 	// add the drawable to the master list
 	draw->prependToList( &m_drawableList );
 
-}  // end registerDrawable
+}
 
 /** -----------------------------------------------------------------------------------------------
  * Redraw all views, update the GUI, play sound effects, etc.
@@ -514,10 +505,10 @@ void GameClient::update( void )
 		playSizzle = TRUE;
 	}
 
-	//Initial Game Codition.  We must show the movie first and then we can display the shell	
+	//Initial Game Codition.  We must show the movie first and then we can display the shell
 	if(TheGlobalData->m_afterIntro && !TheDisplay->isMoviePlaying())
 	{
-		if( playSizzle && TheGlobalData->m_playSizzle && !TheGlobalData->m_headless )// Remove headless-check with Replay Simulation PR)
+		if( playSizzle && TheGlobalData->m_playSizzle )
 		{
 			TheWritableGlobalData->m_allowExitOutOfMovies = TRUE;
 			if(TheGameLODManager && TheGameLODManager->didMemPass())
@@ -537,7 +528,7 @@ void GameClient::update( void )
 
 				WindowLayout *legal = TheWindowManager->winCreateLayout("Menus/LegalPage.wnd");
 				if(legal)
-				{				
+				{
 					legal->hide(FALSE);
 					legal->bringForward();
 					Int beginTime = timeGetTime();
@@ -557,7 +548,7 @@ void GameClient::update( void )
 				}
 				TheWritableGlobalData->m_breakTheMovie = TRUE;
 
-				
+
 			}
 
 			TheShell->showShellMap(TRUE);
@@ -575,7 +566,7 @@ void GameClient::update( void )
 		TheKeyboard->UPDATE();
 		TheKeyboard->createStreamMessages();
 
-	}  // end if
+	}
 
 	// Update the Eva stuff
 	TheEva->UPDATE();
@@ -586,16 +577,13 @@ void GameClient::update( void )
 		TheMouse->UPDATE();
 		TheMouse->createStreamMessages();
 
-	}  // end if
-	
+	}
+
 	if(TheGlobalData->m_playIntro || TheGlobalData->m_afterIntro)
 	{
 		// redraw all views, update the GUI
-		if (!TheGlobalData->m_headless)// Remove headless-check with Replay Simulation PR
-		{
-			TheDisplay->DRAW();
-			TheDisplay->UPDATE();
-		}
+		TheDisplay->DRAW();
+		TheDisplay->UPDATE();
 		return;
 	}
 
@@ -609,42 +597,38 @@ void GameClient::update( void )
 		TheVideoPlayer->UPDATE();
 	}
 
-	Bool freezeTime = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
-	freezeTime = freezeTime || TheScriptEngine->isTimeFrozenDebug();
-	freezeTime = freezeTime || TheScriptEngine->isTimeFrozenScript();
-	freezeTime = freezeTime || TheGameLogic->isGamePaused();
-	Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+	const Bool freezeTime = TheGameEngine->isTimeFrozen() || TheGameEngine->isGameHalted();
 
-	// hack to let client spin fast in network games but still do effects at the same pace. -MDC
-	static UnsignedInt lastFrame = ~0;
-	freezeTime = freezeTime || (lastFrame == m_frame);
-	lastFrame = m_frame;
+	const Int localPlayerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
 
 	if (!freezeTime)
 	{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+		Int numPlayers = ThePlayerList->getPlayerCount();
+		Int numNonLocalPlayers = 0;
+		Int nonLocalPlayerIndices[MAX_PLAYER_COUNT];
+
+#if ENABLE_CONFIGURABLE_SHROUD
 		if (TheGlobalData->m_shroudOn)
 #else
 		if (true)
 #endif
-		{	
-			//localPlayerIndex=TheGhostObjectManager->getLocalPlayerIndex();	//always use the first local player set since normally can't change.  Doesn't work with debug "CTRL_SHIFT_SPACE"
-#ifdef DEBUG_FOG_MEMORY
-			//Find indices of all active players
-			Int numPlayers=ThePlayerList->getPlayerCount();
-			Int numNonLocalPlayers=0;
-			Int nonLocalPlayerIndices[MAX_PLAYER_COUNT];
-			for (Int i=0; i<numPlayers; i++)
-			{	Player *player=ThePlayerList->getNthPlayer(i);
-				//if (player->getPlayerType == PLAYER_HUMAN)
-				if (player->getPlayerIndex() != localPlayerIndex)
-					nonLocalPlayerIndices[numNonLocalPlayers++]=player->getPlayerIndex();
+		{
+			if (TheGhostObjectManager->trackAllPlayers())
+			{
+				//Find indices of all active players
+				for (Int i=0; i < numPlayers; i++)
+				{
+					Player *player = ThePlayerList->getNthPlayer(i);
+					if (player->getPlayerTemplate() != NULL && player->getPlayerIndex() != localPlayerIndex)
+						nonLocalPlayerIndices[numNonLocalPlayers++] = player->getPlayerIndex();
+				}
+				//update ghost objects which don't have drawables or objects.
+				TheGhostObjectManager->updateOrphanedObjects(nonLocalPlayerIndices, numNonLocalPlayers);
+			}
+			else
+			{
+				TheGhostObjectManager->updateOrphanedObjects(NULL, 0);
 			}
-			//update ghostObjects which don't have drawables or objects.
-			TheGhostObjectManager->updateOrphanedObjects(nonLocalPlayerIndices,numNonLocalPlayers);
-#else
-			TheGhostObjectManager->updateOrphanedObjects(NULL,0);
-#endif
 		}
 
 
@@ -653,25 +637,36 @@ void GameClient::update( void )
 		while (draw)
 		{	// update() could free the Drawable, so go ahead and grab 'next'
 			Drawable* next = draw->getNextDrawable();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if ENABLE_CONFIGURABLE_SHROUD
 			if (TheGlobalData->m_shroudOn)
 #else
 			if (true)
 #endif
-			{	//immobile objects need to take snapshots whenever they become fogged
+			{
+				//immobile objects need to take snapshots whenever they become fogged
 				//so need to refresh their status.  We can't rely on external calls
 				//to getShroudStatus() because they are only made for visible on-screen
 				//objects.
 				Object *object=draw->getObject();
 				if (object)
 				{
-	#ifdef DEBUG_FOG_MEMORY
-					Int *playerIndex=nonLocalPlayerIndices;
-					for (i=0; i<numNonLocalPlayers; i++, playerIndex++)
-						object->getShroudedStatus(*playerIndex);
-	#endif
+					if (TheGhostObjectManager->trackAllPlayers())
+					{
+						// TheSuperHackers @info Update the shrouded status for all objects
+						// that own a ghost object for all non local players. This is costly.
+						if (object->hasGhostObject())
+						{
+							Int *playerIndex = nonLocalPlayerIndices;
+							Int *const playerIndexEnd = nonLocalPlayerIndices + numNonLocalPlayers;
+							for (; playerIndex < playerIndexEnd; ++playerIndex)
+							{
+								object->getShroudedStatus(*playerIndex);
+							}
+						}
+					}
+
 					ObjectShroudStatus ss=object->getShroudedStatus(localPlayerIndex);
-					if (ss >= OBJECTSHROUD_FOGGED && draw->getShroudClearFrame()!=0) {
+					if (ss >= OBJECTSHROUD_FOGGED && draw->getShroudClearFrame() != InvalidShroudClearFrame) {
 						UnsignedInt limit = 2*LOGICFRAMES_PER_SECOND;
 						if (object->isEffectivelyDead()) {
 							// extend the time, so we can see the dead plane blow up & crash.
@@ -690,9 +685,9 @@ void GameClient::update( void )
 		}
 	}
 
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 	// need to draw the first frame, then don't draw again until TheGlobalData->m_noDraw
-	if (TheGlobalData->m_noDraw > TheGameLogic->getFrame() && TheGameLogic->getFrame() > 0) 
+	if (TheGlobalData->m_noDraw > TheGameLogic->getFrame() && TheGameLogic->getFrame() > 0)
 	{
 		return;
 	}
@@ -705,7 +700,7 @@ void GameClient::update( void )
 		TheParticleSystemManager->setLocalPlayerIndex(localPlayerIndex);
 		TheParticleSystemManager->update();
 
-	}  // end if
+	}
 
 	// update the terrain visuals
 	{
@@ -713,18 +708,16 @@ void GameClient::update( void )
 	}
 
 	// update display
-	if (!TheGlobalData->m_headless)// Remove headless-check with Replay Simulation PR
 	{
 		TheDisplay->UPDATE();
 	}
 
-	if (!TheGlobalData->m_headless)// Remove headless-check with Replay Simulation PR
 	{
 		USE_PERF_TIMER(GameClient_draw)
-			
+
 	// redraw all views, update the GUI
 	//if(TheGameLogic->getFrame() >= 2)
-		
+
 		TheDisplay->DRAW();
 	}
 
@@ -739,10 +732,27 @@ void GameClient::update( void )
 	}
 
 	{
-		// update the in game UI 
+		// update the in game UI
 		TheInGameUI->UPDATE();
 	}
-}  // end update
+}
+
+void GameClient::step()
+{
+	TheDisplay->step();
+}
+
+void GameClient::updateHeadless()
+{
+	// TheSuperHackers @info helmutbuhler 03/05/2025
+	// When we play a replay back in headless mode, we want to skip the update of GameClient
+	// because it's not necessary for CRC checking.
+	// But we do reset the particles. The problem is that particles can be generated during
+	// GameLogic and are only cleaned up during rendering. If we don't clean this up here,
+	// the particles accumulate and slow things down a lot and can even cause a crash on
+	// longer replays.
+	TheParticleSystemManager->reset();
+}
 
 /** -----------------------------------------------------------------------------------------------
  * Call the given callback function for each object contained within the given region.
@@ -766,6 +776,13 @@ void GameClient::iterateDrawablesInRegion( Region3D *region, GameClientFuncPtr u
 	}
 }
 
+/**Helper function to update fake GLA structures to become visible to certain players.
+We should only call this during critical moments, such as changing teams, changing to
+observer, etc.*/
+void GameClient::updateFakeDrawables(void)
+{
+}
+
 /** -----------------------------------------------------------------------------------------------
  * Given an object id, return the associated object.
  * For efficiency, a small Least Recently Used cache is incorporated.
@@ -776,7 +793,7 @@ Drawable* GameClient::findDrawableByID( const DrawableID id )
 {
 	DrawablePtrHashIt it = m_drawableHash.find(id);
 	if (it == m_drawableHash.end()) {
-		// no such drawable	
+		// no such drawable
 		return NULL;
 	}
 
@@ -807,10 +824,10 @@ void GameClient::destroyDrawable( Drawable *draw )
 	if( obj )
 	{
 
-		DEBUG_ASSERTCRASH( obj->getDrawable() == draw, ("Object/Drawable pointer mismatch!\n") );
+		DEBUG_ASSERTCRASH( obj->getDrawable() == draw, ("Object/Drawable pointer mismatch!") );
 		obj->friend_bindToDrawable( NULL );
 
-	}  // end if
+	}
 
 	// remove the drawable from our hash of drawables
 	removeDrawableFromLookupTable( draw );
@@ -833,7 +850,7 @@ void GameClient::addDrawableToLookupTable(Drawable *draw )
 	// add to lookup
 	m_drawableHash[ draw->getID() ] = draw;
 
-}  // end addDrawableToLookupTable
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove drawable from lookup table of fast id searching */
@@ -848,7 +865,7 @@ void GameClient::removeDrawableFromLookupTable( Drawable *draw )
 	// remove from table
 	m_drawableHash.erase( draw->getID() );
 
-}  // end removeDrawableFromLookupTable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Load a map into the game interface */
@@ -863,7 +880,7 @@ Bool GameClient::loadMap( AsciiString mapName )
 
 	return TRUE;
 
-}  // end loadMap
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Unload a map from the game interface */
@@ -872,7 +889,7 @@ void GameClient::unloadMap( AsciiString mapName )
 
 	assert( 0 );  // who calls this?
 
-}  // end unloadMap
+}
 
 //-------------------------------------------------------------------------------------------------
 void GameClient::setTimeOfDay( TimeOfDay tod )
@@ -894,7 +911,7 @@ void GameClient::assignSelectedDrawablesToGroup( Int group )
 	Drawable *draw = firstDrawable();
 	while( draw )
 	{
-	
+
 		if( draw->isSelected() && draw->getObject()->isLocallyControlled())
 		{
 			draw->setDrawableGroup( group );
@@ -927,7 +944,7 @@ void GameClient::selectDrawablesInGroup( Int group )
 	while( draw )
 	{
 		int counter = 0;
-	
+
 		const Object *object = draw->getObject();
 
 		if( object && draw->getDrawableGroup() == group && object->isLocallyControlled() && !object->isContained() )
@@ -979,7 +996,7 @@ GameMessage::Type GameClient::evaluateContextCommand( Drawable *draw,
 	else
 		return GameMessage::MSG_INVALID;
 
-}  // end evaluateContextCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the ray effect data for a drawable */
@@ -988,7 +1005,7 @@ void GameClient::getRayEffectData( Drawable *draw, RayEffectData *effectData )
 
 	TheRayEffects->getRayEffectData( draw, effectData );
 
-}  // end getRayEffectData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** remove the drawble from the ray effects sytem if present */
@@ -997,7 +1014,7 @@ void GameClient::removeFromRayEffects( Drawable *draw )
 
 	TheRayEffects->deleteRayEffect( draw );
 
-}  // end removeFromRayEffects
+}
 
 /** frees all shadow resources used by this module - used by Options screen.*/
 void GameClient::releaseShadows(void)
@@ -1041,7 +1058,7 @@ void GameClient::preloadAssets( TimeOfDay timeOfDay )
 			 tTemplate;
 			 tTemplate = tTemplate->friend_getNextTemplate() )
 	{
-			
+
 		// if this isn't one of the objects that can be preloaded ignore it
 		if( tTemplate->isKindOf( KINDOF_PRELOAD ) == FALSE && !TheGlobalData->m_preloadEverything )
 			continue;
@@ -1055,29 +1072,29 @@ void GameClient::preloadAssets( TimeOfDay timeOfDay )
 			draw->preloadAssets( timeOfDay );
 
 			// destroy the drawable
-			TheGameClient->destroyDrawable( draw );
+			destroyDrawable( draw );
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 	GlobalMemoryStatus(&after);
 
-	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d",
 		before.dwAvailPageFile, after.dwAvailPageFile, before.dwAvailPageFile - after.dwAvailPageFile));
-	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d",
 		before.dwAvailPhys, after.dwAvailPhys, before.dwAvailPhys - after.dwAvailPhys));
-	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d",
 		before.dwAvailVirtual, after.dwAvailVirtual, before.dwAvailVirtual - after.dwAvailVirtual));
 	/*
-	DEBUG_LOG(("Preloading memory dwLength        %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwLength        %d --> %d : %d",
 		before.dwLength, after.dwLength, before.dwLength - after.dwLength));
-	DEBUG_LOG(("Preloading memory dwMemoryLoad    %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwMemoryLoad    %d --> %d : %d",
 		before.dwMemoryLoad, after.dwMemoryLoad, before.dwMemoryLoad - after.dwMemoryLoad));
-	DEBUG_LOG(("Preloading memory dwTotalPageFile %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwTotalPageFile %d --> %d : %d",
 		before.dwTotalPageFile, after.dwTotalPageFile, before.dwTotalPageFile - after.dwTotalPageFile));
-	DEBUG_LOG(("Preloading memory dwTotalPhys     %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwTotalPhys     %d --> %d : %d",
 		before.dwTotalPhys , after.dwTotalPhys, before.dwTotalPhys - after.dwTotalPhys));
-	DEBUG_LOG(("Preloading memory dwTotalVirtual  %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwTotalVirtual  %d --> %d : %d",
 		before.dwTotalVirtual , after.dwTotalVirtual, before.dwTotalVirtual - after.dwTotalVirtual));
 	*/
 
@@ -1091,11 +1108,11 @@ void GameClient::preloadAssets( TimeOfDay timeOfDay )
 	GlobalMemoryStatus(&after);
 	debrisModelNamesGlobalHack.clear();
 
-	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d",
 		before.dwAvailPageFile, after.dwAvailPageFile, before.dwAvailPageFile - after.dwAvailPageFile));
-	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d",
 		before.dwAvailPhys, after.dwAvailPhys, before.dwAvailPhys - after.dwAvailPhys));
-	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d",
 		before.dwAvailVirtual, after.dwAvailVirtual, before.dwAvailVirtual - after.dwAvailVirtual));
 
 	TheControlBar->preloadAssets( timeOfDay );
@@ -1104,14 +1121,14 @@ void GameClient::preloadAssets( TimeOfDay timeOfDay )
 	TheParticleSystemManager->preloadAssets( timeOfDay );
 	GlobalMemoryStatus(&after);
 
-	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d",
 		before.dwAvailPageFile, after.dwAvailPageFile, before.dwAvailPageFile - after.dwAvailPageFile));
-	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d",
 		before.dwAvailPhys, after.dwAvailPhys, before.dwAvailPhys - after.dwAvailPhys));
-	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d",
 		before.dwAvailVirtual, after.dwAvailVirtual, before.dwAvailVirtual - after.dwAvailVirtual));
 
-	const char *textureNames[] = {
+	const char *const textureNames[] = {
 		"ptspruce01.tga",
 		"exrktflame.tga",
 		"cvlimo3_d2.tga",
@@ -1158,17 +1175,17 @@ void GameClient::preloadAssets( TimeOfDay timeOfDay )
 		TheDisplay->preloadTextureAssets(textureNames[i]);
 	GlobalMemoryStatus(&after);
 
-	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d",
 		before.dwAvailPageFile, after.dwAvailPageFile, before.dwAvailPageFile - after.dwAvailPageFile));
-	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d",
 		before.dwAvailPhys, after.dwAvailPhys, before.dwAvailPhys - after.dwAvailPhys));
-	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d",
 		before.dwAvailVirtual, after.dwAvailVirtual, before.dwAvailVirtual - after.dwAvailVirtual));
 
 //	preloadTextureNamesGlobalHack2 = preloadTextureNamesGlobalHack;
 //	preloadTextureNamesGlobalHack.clear();
 
-}  // end preloadAssets
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given a string name, find the drawable TOC entry (if any) associated with it */
@@ -1182,7 +1199,7 @@ GameClient::DrawableTOCEntry *GameClient::findTOCEntryByName( AsciiString name )
 
 	return NULL;
 
-}  // end findTOCEntryByname
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given a drawable TOC identifier, find the drawable TOC if any */
@@ -1196,7 +1213,7 @@ GameClient::DrawableTOCEntry *GameClient::findTOCEntryById( UnsignedShort id )
 
 	return NULL;
 
-}  // end findTOCEntryById
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add an drawable TOC entry */
@@ -1209,7 +1226,7 @@ void GameClient::addTOCEntry( AsciiString name, UnsignedShort id )
 	tocEntry.id = id;
 	m_drawableTOC.push_back( tocEntry );
 
-}  // end addTOCEntry
+}
 
 // ------------------------------------------------------------------------------------------------
 static Bool shouldSaveDrawable(const Drawable* draw)
@@ -1222,7 +1239,7 @@ static Bool shouldSaveDrawable(const Drawable* draw)
 		}
 		else
 		{
-			DEBUG_CRASH(("You should not ever set DRAWABLE_STATUS_NO_SAVE for a Drawable with an object. (%s)\n",draw->getTemplate()->getName().str()));
+			DEBUG_CRASH(("You should not ever set DRAWABLE_STATUS_NO_SAVE for a Drawable with an object. (%s)",draw->getTemplate()->getName().str()));
 		}
 	}
 	return true;
@@ -1260,11 +1277,11 @@ void GameClient::xferDrawableTOC( Xfer *xfer )
 			// if is this drawable name already in the TOC, skip it
 			if( findTOCEntryByName( templateName ) != NULL )
 				continue;
-			
+
 			// add this entry to the TOC
 			addTOCEntry( draw->getTemplate()->getName(), ++tocCount );
 
-		}  // end for obj
+		}
 
 		// xfer entries in the TOC
 		xfer->xferUnsignedInt( &tocCount );
@@ -1284,9 +1301,9 @@ void GameClient::xferDrawableTOC( Xfer *xfer )
 			// xfer the paired id
 			xfer->xferUnsignedShort( &tocEntry->id );
 
-		}  // end for
+		}
 
-	}  // end if
+	}
 	else
 	{
 		AsciiString templateName;
@@ -1304,15 +1321,15 @@ void GameClient::xferDrawableTOC( Xfer *xfer )
 
 			// read the id
 			xfer->xferUnsignedShort( &id );
-			
+
 			// add this to the TOC
 			addTOCEntry( templateName, id );
-					
-		}  // end for i
 
-	}  // end else
+		}
 
-}  // end xferDrawableTOC
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method for Game Client
@@ -1338,7 +1355,7 @@ void GameClient::xfer( Xfer *xfer )
 	// note that we do not do the id counter here, we did it in the game state block because
 	// it's important to do that part very early in the load process
 	//
-	// !!!DON'T DO THIS!!! ----> xfer->xferDrawableID( &m_nextDrawableID ); <---- !!!DON'T DO THIS!!! 
+	// !!!DON'T DO THIS!!! ----> xfer->xferDrawableID( &m_nextDrawableID ); <---- !!!DON'T DO THIS!!!
 
 	//
 	// xfer a table of contents that contain thing template and indentifier pairs.  this
@@ -1363,7 +1380,7 @@ void GameClient::xfer( Xfer *xfer )
 	ObjectID objectID;
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
-	
+
 		// iterate all drawables
 		for( draw = getDrawableList(); draw; draw = draw->getNextDrawable() )
 		{
@@ -1375,10 +1392,10 @@ void GameClient::xfer( Xfer *xfer )
 			if( tocEntry == NULL )
 			{
 
-				DEBUG_CRASH(( "GameClient::xfer - Drawable TOC entry not found for '%s'\n", draw->getTemplate()->getName().str() ));
+				DEBUG_CRASH(( "GameClient::xfer - Drawable TOC entry not found for '%s'", draw->getTemplate()->getName().str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// xfer toc id entry
 			xfer->xferUnsignedShort( &tocEntry->id );
@@ -1396,9 +1413,9 @@ void GameClient::xfer( Xfer *xfer )
 			// end data block
 			xfer->endBlock();
 
-		}  // end for, draw
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		UnsignedShort tocID;
@@ -1417,10 +1434,10 @@ void GameClient::xfer( Xfer *xfer )
 			if( tocEntry == NULL )
 			{
 
-				DEBUG_CRASH(( "GameClient::xfer - No TOC entry match for id '%d'\n", tocID ));
+				DEBUG_CRASH(( "GameClient::xfer - No TOC entry match for id '%d'", tocID ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// read data block size
 			dataSize = xfer->beginBlock();
@@ -1430,12 +1447,12 @@ void GameClient::xfer( Xfer *xfer )
 			if( thingTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "GameClient::xfer - Unrecognized thing template '%s', skipping.  ENGINEERS - Are you *sure* it's OK to be ignoring this object from the save file???  Think hard about it!\n",
+				DEBUG_CRASH(( "GameClient::xfer - Unrecognized thing template '%s', skipping.  ENGINEERS - Are you *sure* it's OK to be ignoring this object from the save file???  Think hard about it!",
 											tocEntry->name.str() ));
 				xfer->skip( dataSize );
 				continue;
 
-			}  // end if
+			}
 
 			// read the object ID this drawable is attached to (if any)
 			xfer->xferObjectID( &objectID );
@@ -1452,22 +1469,22 @@ void GameClient::xfer( Xfer *xfer )
 				if( object == NULL )
 				{
 
-					DEBUG_CRASH(( "GameClient::xfer - Cannot find object '%d' that is supposed to be attached to this drawable '%s'\n",
+					DEBUG_CRASH(( "GameClient::xfer - Cannot find object '%d' that is supposed to be attached to this drawable '%s'",
 												objectID, thingTemplate->getName().str() ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
 				// get the drawable from the object
 				draw = object->getDrawable();
 				if( draw == NULL )
 				{
 
-					DEBUG_CRASH(( "GameClient::xfer - There is no drawable attached to the object '%s' (%d) and there should be\n",
+					DEBUG_CRASH(( "GameClient::xfer - There is no drawable attached to the object '%s' (%d) and there should be",
 												object->getTemplate()->getName().str(), object->getID() ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
 				// srj sez: some objects (eg, diguised bombtrucks) may have an "abnormal" drawable. so check.
 				//
@@ -1479,12 +1496,12 @@ void GameClient::xfer( Xfer *xfer )
 				const ThingTemplate* drawTemplate = draw->getTemplate();
 				if (drawTemplate->getFinalOverride() != thingTemplate->getFinalOverride())
 				{
-					TheGameClient->destroyDrawable( draw );
+					destroyDrawable( draw );
 					draw = TheThingFactory->newDrawable( thingTemplate );
 					TheGameLogic->bindObjectAndDrawable(object, draw);
 				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1493,18 +1510,18 @@ void GameClient::xfer( Xfer *xfer )
 				// whole brand new drawable now
 				//
 				draw = TheThingFactory->newDrawable( thingTemplate );
-				
+
 				// sanity
 				if( draw == NULL )
 				{
 
-					DEBUG_CRASH(( "GameClient::xfer - Unable to create drawable for '%s'\n",
+					DEBUG_CRASH(( "GameClient::xfer - Unable to create drawable for '%s'",
 												thingTemplate->getName().str() ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
-			}  // end else
+			}
 
 			// xfer the drawable data
 			xfer->xferSnapshot( draw );
@@ -1512,10 +1529,10 @@ void GameClient::xfer( Xfer *xfer )
 			// end block (not necessary since this is a no-op but symettrically nice)
 			xfer->endBlock();
 
-		}  // end for, i
+		}
+
+	}
 
-	}  // end else, load
-	
 	// xfer the in-game mission briefing history list
 	if (version >= 2)
 	{
@@ -1524,11 +1541,11 @@ void GameClient::xfer( Xfer *xfer )
 			BriefingList *bList = GetBriefingTextList();
 			Int numEntries = bList->size();
 			xfer->xferInt(&numEntries);
-			DEBUG_LOG(("Saving %d briefing lines\n", numEntries));
+			DEBUG_LOG(("Saving %d briefing lines", numEntries));
 			for (BriefingList::const_iterator bIt = bList->begin(); bIt != bList->end(); ++bIt)
 			{
 				AsciiString tempStr = *bIt;
-				DEBUG_LOG(("'%s'\n", tempStr.str()));
+				DEBUG_LOG(("'%s'", tempStr.str()));
 				xfer->xferAsciiString(&tempStr);
 			}
 		}
@@ -1536,19 +1553,19 @@ void GameClient::xfer( Xfer *xfer )
 		{
 			Int numEntries = 0;
 			xfer->xferInt(&numEntries);
-			DEBUG_LOG(("Loading %d briefing lines\n", numEntries));
+			DEBUG_LOG(("Loading %d briefing lines", numEntries));
 			UpdateDiplomacyBriefingText(AsciiString::TheEmptyString, TRUE); // clear out briefing list first
 			while (numEntries-- > 0)
 			{
 				AsciiString tempStr;
 				xfer->xferAsciiString(&tempStr);
-				DEBUG_LOG(("'%s'\n", tempStr.str()));
+				DEBUG_LOG(("'%s'", tempStr.str()));
 				UpdateDiplomacyBriefingText(tempStr, FALSE);
 			}
 		}
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1566,7 +1583,7 @@ void GameClient::loadPostProcess( void )
 		if( draw->getID() >= m_nextDrawableID )
 			m_nextDrawableID = (DrawableID)((UnsignedInt)draw->getID() + 1);
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -1574,4 +1591,4 @@ void GameClient::loadPostProcess( void )
 void GameClient::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp b/Generals/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp
index e8b8a8aa823..fb657816171 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/MessageStream.h"
 #include "GameClient/GameClient.h"
@@ -49,8 +49,8 @@ GameMessageDisposition GameClientMessageDispatcher::translateGameMessage(const G
 	if (msg->getType() == GameMessage::MSG_FRAME_TICK)
 		return KEEP_MESSAGE;
 
-	//DEBUG_LOG(("GameClientMessageDispatcher::translateGameMessage() - eating a %s on frame %d\n",
-		//((GameMessage *)msg)->getCommandAsAsciiString().str(), TheGameClient->getFrame()));
+	//DEBUG_LOG(("GameClientMessageDispatcher::translateGameMessage() - eating a %s on frame %d",
+		//((GameMessage *)msg)->getCommandAsString(), TheGameClient->getFrame()));
 
 	return DESTROY_MESSAGE;
-}  // end clientMessageDispatcher
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp
index 1e6d59a2d09..80d83c9ba2b 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -40,15 +40,14 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameText.h"
 #include "Common/Language.h"
 #include "Common/Registry.h"
-#include "GameClient/ClientInstance.h"
 #include "GameClient/LanguageFilter.h"
 #include "Common/Debug.h"
 #include "Common/UnicodeString.h"
@@ -56,26 +55,22 @@
 #include "Common/GlobalData.h"
 #include "Common/file.h"
 #include "Common/FileSystem.h"
+#include "Common/version.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Bool g_useStringFile = TRUE;
 #endif
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 #define CSF_ID ( ('C'<<24) | ('S'<<16) | ('F'<<8) | (' ') )
@@ -88,11 +83,11 @@ Bool g_useStringFile = TRUE;
 #define CSF_FILE 1
 #define MAX_UITEXT_LENGTH (10*1024)
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 //===============================
-// StringInfo 
+// StringInfo
 //===============================
 
 struct StringInfo
@@ -109,7 +104,7 @@ struct StringLookUp
 };
 
 //===============================
-// CSFHeader 
+// CSFHeader
 //===============================
 
 struct CSFHeader
@@ -124,7 +119,7 @@ struct CSFHeader
 };
 
 //===============================
-// struct NoString 
+// struct NoString
 //===============================
 
 struct NoString
@@ -135,7 +130,7 @@ struct NoString
 
 
 //===============================
-// GameTextManager 
+// GameTextManager
 //===============================
 
 class GameTextManager : public GameTextInterface
@@ -145,13 +140,18 @@ class GameTextManager : public GameTextInterface
 		GameTextManager();
 		virtual ~GameTextManager();
 
-		virtual void					init( void );						///< Initlaizes the text system
-		virtual void					deinit( void );					///< De-initlaizes the text system
+		virtual void					init( void );						///< Initializes the text system
+		virtual void					deinit( void );					///< Shuts down the text system
 		virtual void					update( void ) {};			///< update text manager
 		virtual void					reset( void );					///< Resets the text system
 
 		virtual UnicodeString fetch( const Char *label, Bool *exists = NULL );		///< Returns the associated labeled unicode text
 		virtual UnicodeString fetch( AsciiString label, Bool *exists = NULL );		///< Returns the associated labeled unicode text
+		virtual UnicodeString fetchFormat( const Char *label, ... );
+		virtual UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText );
+		virtual UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... );
+		virtual UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args );
+
 		virtual AsciiStringVec& getStringsWithLabelPrefix(AsciiString label);
 
 		virtual void					initMapStringFile( const AsciiString& filename );
@@ -164,11 +164,11 @@ class GameTextManager : public GameTextInterface
 		Char						m_buffer2[MAX_UITEXT_LENGTH];
 		Char						m_buffer3[MAX_UITEXT_LENGTH];
 		WideChar				m_tbuffer[MAX_UITEXT_LENGTH*2];
-		
+
 		StringInfo			*m_stringInfo;
 		StringLookUp		*m_stringLUT;
 		Bool						m_initialized;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		Bool						m_jabberWockie;
 		Bool						m_munkee;
 #endif
@@ -201,31 +201,31 @@ class GameTextManager : public GameTextInterface
 
 static int _cdecl			compareLUT ( const void *,  const void*);
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 GameTextInterface *TheGameText = NULL;
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 //============================================================================
@@ -249,7 +249,7 @@ GameTextManager::GameTextManager()
 	m_stringLUT(NULL),
 	m_initialized(FALSE),
 	m_noStringList(NULL),
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	m_jabberWockie(FALSE),
 	m_munkee(FALSE),
 	m_useStringFile(g_useStringFile),
@@ -258,18 +258,14 @@ GameTextManager::GameTextManager()
 #endif
 	m_mapStringInfo(NULL),
 	m_mapStringLUT(NULL),
-	m_failed(L"***FATAL*** String Manager failed to initilaize properly")
+	m_failed(L"***FATAL*** String Manager failed to initialize properly")
 {
-	// Added By Sadullah Nader
-	// Initializations missing and needed
-
 	for(Int i=0; i < MAX_UITEXT_LENGTH; i++)
 	{
-		m_buffer[i] = 0; 
-		m_buffer2[i] = 0; 
-		m_buffer3[i] = 0; 
+		m_buffer[i] = 0;
+		m_buffer2[i] = 0;
+		m_buffer3[i] = 0;
 	}
-	//
 }
 
 //============================================================================
@@ -279,7 +275,7 @@ GameTextManager::GameTextManager()
 GameTextManager::~GameTextManager()
 {
 	deinit();
-}							
+}
 
 //============================================================================
 // GameTextManager::init
@@ -302,7 +298,7 @@ void GameTextManager::init( void )
 	m_initialized = TRUE;
 
 	m_maxLabelLen = 0;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if(TheGlobalData)
 	{
 		m_jabberWockie = TheGlobalData->m_jabberOn;
@@ -370,25 +366,6 @@ void GameTextManager::init( void )
 
 	qsort( m_stringLUT, m_textCount, sizeof(StringLookUp), compareLUT  );
 
-	UnicodeString ourName = fetch("GUI:Command&ConquerGenerals");
-
-	if (rts::ClientInstance::getInstanceId() > 1u)
-	{
-		UnicodeString s;
-		s.format(L"Instance:%.2u - %s", rts::ClientInstance::getInstanceId(), ourName.str());
-		ourName = s;
-	}
-
-	AsciiString ourNameA;
-	ourNameA.translate(ourName);	//get ASCII version for Win 9x
-
-	extern HWND ApplicationHWnd;  ///< our application window handle
-	if (ApplicationHWnd) {
-		//Set it twice because Win 9x does not support SetWindowTextW.
-		::SetWindowText(ApplicationHWnd, ourNameA.str());
-		::SetWindowTextW(ApplicationHWnd, ourName.str());
-	}
-
 }
 
 //============================================================================
@@ -398,31 +375,27 @@ void GameTextManager::init( void )
 void GameTextManager::deinit( void )
 {
 
-	if( m_stringInfo != NULL )
-	{
-		delete [] m_stringInfo;
-		m_stringInfo = NULL;
-	}
+	delete [] m_stringInfo;
+	m_stringInfo = NULL;
 
-	if( m_stringLUT != NULL )
-	{
-		delete [] m_stringLUT;
-		m_stringLUT = NULL;
-	}
+	delete [] m_stringLUT;
+	m_stringLUT = NULL;
 
 	m_textCount = 0;
 
 	NoString *noString = m_noStringList;
 
-	DEBUG_LOG(("\n*** Missing strings ***\n"));
+	DEBUG_LOG_RAW(("\n"));
+	DEBUG_LOG(("*** Missing strings ***"));
 	while ( noString )
 	{
-		DEBUG_LOG(("*** %ls ***\n", noString->text.str()));
+		DEBUG_LOG(("*** %ls ***", noString->text.str()));
 		NoString *next = noString->next;
 		delete noString;
 		noString = next;
 	}
-	DEBUG_LOG(("*** End missing strings ***\n\n"));
+	DEBUG_LOG(("*** End missing strings ***"));
+	DEBUG_LOG_RAW(("\n"));
 
 	m_noStringList = NULL;
 
@@ -435,22 +408,16 @@ void GameTextManager::deinit( void )
 
 void GameTextManager::reset( void )
 {
-	if( m_mapStringInfo != NULL )
-	{
-		delete [] m_mapStringInfo;
-		m_mapStringInfo = NULL;
-	}
+	delete [] m_mapStringInfo;
+	m_mapStringInfo = NULL;
 
-	if( m_mapStringLUT != NULL )
-	{
-		delete [] m_mapStringLUT;
-		m_mapStringLUT = NULL;
-	}
+	delete [] m_mapStringLUT;
+	m_mapStringLUT = NULL;
 }
 
 
 //============================================================================
-// GameTextManager::stripSpaces 
+// GameTextManager::stripSpaces
 //============================================================================
 
 void GameTextManager::stripSpaces ( WideChar *string )
@@ -497,7 +464,7 @@ void GameTextManager::stripSpaces ( WideChar *string )
 }
 
 //============================================================================
-// GameTextManager::removeLeadingAndTrailing 
+// GameTextManager::removeLeadingAndTrailing
 //============================================================================
 
 void GameTextManager::removeLeadingAndTrailing ( Char *buffer )
@@ -514,7 +481,7 @@ void GameTextManager::removeLeadingAndTrailing ( Char *buffer )
 
 	while ( (*ptr++ = *first++) != 0 );
 
-	ptr -= 2;;
+	ptr -= 2;
 
 	while ( (ptr > buffer) && (ch = *ptr) != 0 && iswspace ( ch ) )
 	{
@@ -628,6 +595,7 @@ void GameTextManager::readToEndOfQuote( File *file, Char *in, Char *out, Char *w
 				}
 
 				state = 1;
+				FALLTHROUGH;
 			case 1:
 				if ( ( ch >= 'a' && ch <= 'z') || ( ch >= 'A' && ch <='Z') || (ch >= '0' && ch <= '9') || ch == '_' )
 				{
@@ -636,6 +604,7 @@ void GameTextManager::readToEndOfQuote( File *file, Char *in, Char *out, Char *w
 					break;
 				}
 				state = 2;
+				FALLTHROUGH;
 			case 2:
 				break;
 		}
@@ -656,7 +625,7 @@ void GameTextManager::readToEndOfQuote( File *file, Char *in, Char *out, Char *w
 
 
 //============================================================================
-// GameTextManager::reverseWord 
+// GameTextManager::reverseWord
 //============================================================================
 
 void GameTextManager::reverseWord ( Char *file, Char *lp )
@@ -704,7 +673,7 @@ void GameTextManager::translateCopy( WideChar *outbuf, Char *inbuf )
 {
 	Int slash = FALSE;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if ( m_jabberWockie )
 	{
 		static Char buffer[MAX_UITEXT_LENGTH*2];
@@ -835,8 +804,8 @@ Bool GameTextManager::getStringCount( const char *filename, Int& textCount )
 
 	File *file;
 	file = TheFileSystem->openFile(filename, File::READ | File::TEXT);
-	DEBUG_LOG(("Looking in %s for string file\n", filename));
-	
+	DEBUG_LOG(("Looking in %s for string file", filename));
+
 	if ( file == NULL )
 	{
 		return FALSE;
@@ -855,7 +824,7 @@ Bool GameTextManager::getStringCount( const char *filename, Int& textCount )
 				m_buffer[ len+1] = 0;
 			readToEndOfQuote( file, &m_buffer[1], m_buffer2, m_buffer3, MAX_UITEXT_LENGTH );
 		}
-		else if( !stricmp( m_buffer, "END") )
+		else if( stricmp( m_buffer, "END") == 0 )
 		{
 			textCount++;
 		}
@@ -868,7 +837,7 @@ Bool GameTextManager::getStringCount( const char *filename, Int& textCount )
 }
 
 //============================================================================
-// GameTextManager::getCSFInfo 
+// GameTextManager::getCSFInfo
 //============================================================================
 
 Bool GameTextManager::getCSFInfo ( const Char *filename )
@@ -876,7 +845,7 @@ Bool GameTextManager::getCSFInfo ( const Char *filename )
 	CSFHeader header;
 	Int ok = FALSE;
 	File *file = TheFileSystem->openFile(filename, File::READ | File::BINARY);
-	DEBUG_LOG(("Looking in %s for compiled string file\n", filename));
+	DEBUG_LOG(("Looking in %s for compiled string file", filename));
 
 	if ( file != NULL )
 	{
@@ -982,19 +951,19 @@ Bool GameTextManager::parseCSF( const Char *filename )
 			{
 				// only use the first string found
 				m_tbuffer[len] = 0;
-				
+
 				{
 					WideChar *ptr;
-				
+
 					ptr = m_tbuffer;
-				
+
 					while ( *ptr )
 					{
 						*ptr = ~*ptr;
 						ptr++;
 					}
 				}
-				
+
 				stripSpaces ( m_tbuffer );
 				m_stringInfo[listCount].text = m_tbuffer;
 			}
@@ -1043,7 +1012,7 @@ Bool GameTextManager::parseStringFile( const char *filename )
 	Int ok = TRUE;
 
 	File *file = TheFileSystem->openFile(filename, File::READ | File::TEXT);
-	
+
 	if ( file == NULL )
 	{
 		return FALSE;
@@ -1066,7 +1035,7 @@ Bool GameTextManager::parseStringFile( const char *filename )
 
 		for ( Int i = 0; i < listCount; i++ )
 		{
-			if ( !stricmp ( m_stringInfo[i].label.str(), m_buffer ))
+			if ( stricmp ( m_stringInfo[i].label.str(), m_buffer ) == 0)
 			{
 				DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' multiply defined!", m_buffer ));
 			}
@@ -1111,13 +1080,13 @@ Bool GameTextManager::parseStringFile( const char *filename )
 					// Copy string into new home
 					translateCopy( m_tbuffer, m_buffer2 );
 					stripSpaces ( m_tbuffer );
-					
+
 					m_stringInfo[listCount].text = m_tbuffer ;
 					m_stringInfo[listCount].speech = m_buffer3;
 					readString = TRUE;
 				}
 			}
-			else if ( !stricmp ( m_buffer, "END" ))
+			else if ( stricmp ( m_buffer, "END" ) == 0)
 			{
 				break;
 			}
@@ -1174,7 +1143,7 @@ Bool GameTextManager::parseMapStringFile( const char *filename )
 
 	File *file;
 
-	file = TheFileSystem->openFile(filename, File::READ | File::TEXT);	
+	file = TheFileSystem->openFile(filename, File::READ | File::TEXT);
 	if ( file == NULL )
 	{
 		return FALSE;
@@ -1197,7 +1166,7 @@ Bool GameTextManager::parseMapStringFile( const char *filename )
 
 		for ( Int i = 0; i < listCount; i++ )
 		{
-			if ( !stricmp ( m_mapStringInfo[i].label.str(), m_buffer ))
+			if ( stricmp ( m_mapStringInfo[i].label.str(), m_buffer ) == 0)
 			{
 				DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' multiply defined!", m_buffer ));
 			}
@@ -1246,13 +1215,13 @@ Bool GameTextManager::parseMapStringFile( const char *filename )
 					UnicodeString text = UnicodeString(m_tbuffer);
 					if (TheLanguageFilter)
 						TheLanguageFilter->filterLine(text);
-					
+
 					m_mapStringInfo[listCount].text = text;
 					m_mapStringInfo[listCount].speech = m_buffer3;
 					readString = TRUE;
 				}
 			}
-			else if ( !stricmp ( m_buffer, "END" ))
+			else if ( stricmp ( m_buffer, "END" ) == 0)
 			{
 				break;
 			}
@@ -1319,7 +1288,7 @@ UnicodeString GameTextManager::fetch( const Char *label, Bool *exists )
 			noString = noString->next;
 		}
 
-		//DEBUG_LOG(("*** MISSING:'%s' ***\n", label));
+		//DEBUG_LOG(("*** MISSING:'%s' ***", label));
 		// Remember file could have been altered at this point.
 		noString = NEW NoString;
 		noString->text = missingString;
@@ -1327,7 +1296,7 @@ UnicodeString GameTextManager::fetch( const Char *label, Bool *exists )
 		m_noStringList = noString;
 		return noString->text;
 	}
-	if( exists )	
+	if( exists )
 		*exists = TRUE;
 	return lookUp->info->text;
 }
@@ -1341,6 +1310,77 @@ UnicodeString GameTextManager::fetch( AsciiString label, Bool *exists )
 	return fetch(label.str(), exists);
 }
 
+//============================================================================
+// *GameTextManager::fetchFormat
+//============================================================================
+
+UnicodeString GameTextManager::fetchFormat( const Char *label, ... )
+{
+	Bool exists;
+	UnicodeString str = fetch(label, &exists);
+	if (exists)
+	{
+		UnicodeString strFormat;
+
+		va_list args;
+		va_start(args, label);
+		strFormat.format_va(str.str(), args);
+		va_end(args);
+
+		str = strFormat;
+	}
+	return str;
+}
+
+//============================================================================
+// GameTextManager::fetchOrSubstitute
+//============================================================================
+
+UnicodeString GameTextManager::fetchOrSubstitute( const Char *label, const WideChar *substituteText )
+{
+	Bool exists;
+	UnicodeString str = fetch(label, &exists);
+	if (!exists)
+		str = substituteText;
+	return str;
+}
+
+//============================================================================
+// GameTextManager::fetchOrSubstituteFormat
+//============================================================================
+
+UnicodeString GameTextManager::fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... )
+{
+	va_list args;
+	va_start(args, substituteFormat);
+	UnicodeString str = fetchOrSubstituteFormatVA(label, substituteFormat, args);
+	va_end(args);
+
+	return str;
+}
+
+//============================================================================
+// GameTextManager::fetchOrSubstituteFormatVA
+//============================================================================
+
+UnicodeString GameTextManager::fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args )
+{
+	Bool exists;
+	UnicodeString str = fetch(label, &exists);
+	if (exists)
+	{
+		UnicodeString strFormat;
+		strFormat.format_va(strFormat.str(), args);
+		str = strFormat;
+	}
+	else
+	{
+		str.format_va(substituteFormat, args);
+	}
+
+	return str;
+}
+
 //============================================================================
 // GameTextManager::getStringsWithLabelPrefix
 //============================================================================
@@ -1349,14 +1389,14 @@ AsciiStringVec& GameTextManager::getStringsWithLabelPrefix(AsciiString label)
 {
 	m_asciiStringVec.clear();
 	if (m_stringLUT) {
-		for (int i = 0; i < m_textCount; ++i) {		
+		for (int i = 0; i < m_textCount; ++i) {
 			if (strstr(m_stringLUT[i].label->str(), label.str()) == m_stringLUT[i].label->str()) {
 				m_asciiStringVec.push_back(*m_stringLUT[i].label);
 			}
 		}
 	}
 	if (m_mapStringLUT) {
-		for (int i = 0; i < m_mapTextCount; ++i) {		
+		for (int i = 0; i < m_mapTextCount; ++i) {
 			if (strstr(m_mapStringLUT[i].label->str(), label.str()) == m_mapStringLUT[i].label->str()) {
 				m_asciiStringVec.push_back(*m_mapStringLUT[i].label);
 			}
@@ -1408,7 +1448,7 @@ Char	GameTextManager::readChar( File *file )
 }
 
 //============================================================================
-// GameTextManager::compareLUT 
+// compareLUT
 //============================================================================
 
 static int __cdecl compareLUT ( const void *i1,  const void*i2)
diff --git a/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp b/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp
index 75a3bffd42c..887381c4440 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GlobalLanguage.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	GlobalLanguage.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Contains the member functions for the language munkee
 //
 //-----------------------------------------------------------------------------
@@ -52,17 +52,30 @@
 //-----------------------------------------------------------------------------
 #include "PreRTS.h"
 
+#include "Common/AddonCompat.h"
 #include "Common/INI.h"
 #include "Common/Registry.h"
-#include "GameClient/GlobalLanguage.h"
 #include "Common/FileSystem.h"
+#include "Common/UserPreferences.h"
+
+#include "GameClient/Display.h"
+#include "GameClient/GlobalLanguage.h"
 
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-GlobalLanguage *TheGlobalLanguageData = NULL;				///< The global language singalton
+GlobalLanguage *TheGlobalLanguageData = NULL;				///< The global language singleton
 
-static const FieldParse TheGlobalLanguageDataFieldParseTable[] = 
+static const LookupListRec ResolutionFontSizeMethodNames[] =
+{
+	{ "CLASSIC", GlobalLanguage::ResolutionFontSizeMethod_Classic },
+	{ "CLASSIC_NO_CEILING", GlobalLanguage::ResolutionFontSizeMethod_ClassicNoCeiling },
+	{ "STRICT", GlobalLanguage::ResolutionFontSizeMethod_Strict },
+	{ "BALANCED", GlobalLanguage::ResolutionFontSizeMethod_Balanced },
+	{ NULL, 0 }
+};
+
+static const FieldParse TheGlobalLanguageDataFieldParseTable[] =
 {
 	{ "UnicodeFontName",									INI::parseAsciiString,NULL,									offsetof( GlobalLanguage, m_unicodeFontName ) },
 	//{	"UnicodeFontFileName",							INI::parseAsciiString,NULL,									offsetof( GlobalLanguage, m_unicodeFontFileName ) },
@@ -70,9 +83,9 @@ static const FieldParse TheGlobalLanguageDataFieldParseTable[] =
 	{ "MilitaryCaptionSpeed",						INI::parseInt,					NULL,		offsetof( GlobalLanguage, m_militaryCaptionSpeed ) },
 	{ "UseHardWordWrap",						INI::parseBool,					NULL,		offsetof( GlobalLanguage, m_useHardWrap) },
 	{ "ResolutionFontAdjustment",						INI::parseReal,					NULL,		offsetof( GlobalLanguage, m_resolutionFontSizeAdjustment) },
-	
+	{ "ResolutionFontSizeMethod", INI::parseLookupList, ResolutionFontSizeMethodNames, offsetof( GlobalLanguage, m_resolutionFontSizeMethod) },
 	{ "CopyrightFont",					GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_copyrightFont ) },
-	{ "MessageFont",					GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_messageFont) },					
+	{ "MessageFont",					GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_messageFont) },
 	{ "MilitaryCaptionTitleFont",		GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_militaryCaptionTitleFont) },
 	{ "MilitaryCaptionFont",			GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_militaryCaptionFont) },
 	{ "SuperweaponCountdownNormalFont",	GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_superweaponCountdownNormalFont) },
@@ -89,7 +102,7 @@ static const FieldParse TheGlobalLanguageDataFieldParseTable[] =
 	{ "CreditsMinorTitleFont",				GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_creditsPositionFont) },
 	{ "CreditsNormalFont",				GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_creditsNormalFont) },
 
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
+	{ NULL,					NULL,						NULL,						0 }
 };
 
 //-----------------------------------------------------------------------------
@@ -101,7 +114,7 @@ void INI::parseLanguageDefinition( INI *ini )
 	{
 		DEBUG_ASSERTCRASH(TheGlobalLanguageData, ("INI::parseLanguageDefinition - TheGlobalLanguage Data is not around, please create it before trying to parse the ini file."));
 		return;
-	}  // end if
+	}
 	// parse the ini weapon definition
 	ini->initFromINI( TheGlobalLanguageData, TheGlobalLanguageDataFieldParseTable );
 }
@@ -109,14 +122,14 @@ void INI::parseLanguageDefinition( INI *ini )
 GlobalLanguage::GlobalLanguage()
 {
 	m_unicodeFontName.clear();
-	//Added By Sadullah Nader
-	//Initializations missing and needed
 	m_unicodeFontFileName.clear();
 	m_unicodeFontName.clear();
 	m_militaryCaptionSpeed = 0;
 	m_useHardWrap = FALSE;
 	m_resolutionFontSizeAdjustment = 0.7f;
-	//End Add
+	m_resolutionFontSizeMethod = ResolutionFontSizeMethod_Default;
+
+	m_userResolutionFontSizeAdjustment = -1.0f;
 }
 
 GlobalLanguage::~GlobalLanguage()
@@ -131,25 +144,16 @@ GlobalLanguage::~GlobalLanguage()
 	}
 }
 
-void GlobalLanguage::init( void ) 
+void GlobalLanguage::init( void )
 {
+	{
+		AsciiString fname;
+		fname.format("Data\\%s\\Language", GetRegistryLanguage().str());
 
-	INI ini;
-	AsciiString fname;
-	fname.format("Data\\%s\\Language.ini", GetRegistryLanguage().str());
-
-	OSVERSIONINFO	osvi;
-	osvi.dwOSVersionInfoSize=sizeof(OSVERSIONINFO);
-	//GS NOTE: Must call doesFileExist in either case so that NameKeyGenerator will stay in sync
-	AsciiString tempName;
-	tempName.format("Data\\%s\\Language9x.ini", GetRegistryLanguage().str());
-	bool isExist = TheFileSystem->doesFileExist(tempName.str());
-	if (GetVersionEx(&osvi)  &&  osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS  && isExist)
-	{	//check if we're running Win9x variant since they may need different fonts
-		fname = tempName;
-	}
+		INI ini;
+		ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, NULL );
+ 	}
 
-	ini.load( fname, INI_LOAD_OVERWRITE, NULL );
 	StringListIt it = m_localFonts.begin();
 	while( it != m_localFonts.end())
 	{
@@ -165,7 +169,10 @@ void GlobalLanguage::init( void )
 		++it;
 	}
 
-	
+	// override values with user preferences
+	OptionPreferences optionPref;
+	m_userResolutionFontSizeAdjustment = optionPref.getResolutionFontAdjustment();
+
 }
 void GlobalLanguage::reset( void ) {}
 
@@ -183,18 +190,100 @@ void GlobalLanguage::parseFontFileName( INI *ini, void * instance, void *store,
 	GlobalLanguage *monkey = (GlobalLanguage *)instance;
 	AsciiString asciiString = ini->getNextAsciiString();
 	monkey->m_localFonts.push_front(asciiString);
-}	 
+}
 
-Int GlobalLanguage::adjustFontSize(Int theFontSize) 
+float GlobalLanguage::getResolutionFontSizeAdjustment( void ) const
 {
-	Real adjustFactor = TheGlobalData->m_xResolution/800.0f;
-	adjustFactor = 1.0f + (adjustFactor-1.0f) * m_resolutionFontSizeAdjustment;
-	if (adjustFactor<1.0f) adjustFactor = 1.0f;
-	if (adjustFactor>2.0f) adjustFactor = 2.0f;
+	if (m_userResolutionFontSizeAdjustment >= 0.0f)
+		return m_userResolutionFontSizeAdjustment;
+	else
+		return m_resolutionFontSizeAdjustment;
+}
+
+Int GlobalLanguage::adjustFontSize(Int theFontSize)
+{
+	// TheSuperHackers @todo This function is called very often.
+	// Therefore cache the adjustFactor on resolution change to not recompute it on every call.
+	Real adjustFactor;
+
+	switch (m_resolutionFontSizeMethod)
+	{
+	default:
+	case ResolutionFontSizeMethod_Classic:
+	{
+		// TheSuperHackers @info The original font scaling for this game.
+		// Useful for not breaking legacy Addons and Mods. Scales poorly with large resolutions.
+		adjustFactor = TheDisplay->getWidth() / (Real)DEFAULT_DISPLAY_WIDTH;
+		adjustFactor = 1.0f + (adjustFactor - 1.0f) * getResolutionFontSizeAdjustment();
+		if (adjustFactor > 2.0f)
+			adjustFactor = 2.0f;
+		break;
+	}
+	case ResolutionFontSizeMethod_ClassicNoCeiling:
+	{
+		// TheSuperHackers @feature The original font scaling, but without ceiling.
+		// Useful for not changing the original look of the game. Scales alright with large resolutions.
+		adjustFactor = TheDisplay->getWidth() / (Real)DEFAULT_DISPLAY_WIDTH;
+		adjustFactor = 1.0f + (adjustFactor - 1.0f) * getResolutionFontSizeAdjustment();
+		break;
+	}
+	case ResolutionFontSizeMethod_Strict:
+	{
+		// TheSuperHackers @feature The strict method scales fonts based on the smallest screen
+		// dimension so they scale independent of aspect ratio.
+		const Real wScale = TheDisplay->getWidth() / (Real)DEFAULT_DISPLAY_WIDTH;
+		const Real hScale = TheDisplay->getHeight() / (Real)DEFAULT_DISPLAY_HEIGHT;
+		adjustFactor = min(wScale, hScale);
+		adjustFactor = 1.0f + (adjustFactor - 1.0f) * getResolutionFontSizeAdjustment();
+		break;
+	}
+	case ResolutionFontSizeMethod_Balanced:
+	{
+		// TheSuperHackers @feature The balanced method evenly weighs the display width and height
+		// for a balanced rescale on non 4:3 resolutions. The aspect ratio scaling is clamped to
+		// prevent oversizing.
+		constexpr const Real maxAspect = 1.8f;
+		constexpr const Real minAspect = 1.0f;
+		Real w = TheDisplay->getWidth();
+		Real h = TheDisplay->getHeight();
+		const Real aspect = w / h;
+		Real wScale = w / (Real)DEFAULT_DISPLAY_WIDTH;
+		Real hScale = h / (Real)DEFAULT_DISPLAY_HEIGHT;
+
+		if (aspect > maxAspect)
+		{
+			// Recompute width at max aspect
+			w = maxAspect * h;
+			wScale = w / (Real)DEFAULT_DISPLAY_WIDTH;
+		}
+		else if (aspect < minAspect)
+		{
+			// Recompute height at min aspect
+			h = minAspect * w;
+			hScale = h / (Real)DEFAULT_DISPLAY_HEIGHT;
+		}
+		adjustFactor = (wScale + hScale) * 0.5f;
+		adjustFactor = 1.0f + (adjustFactor - 1.0f) * getResolutionFontSizeAdjustment();
+		break;
+	}
+	}
+
+	if (adjustFactor < 1.0f)
+		adjustFactor = 1.0f;
 	Int pointSize = REAL_TO_INT_FLOOR(theFontSize*adjustFactor);
 	return pointSize;
 }
 
+void GlobalLanguage::parseCustomDefinition()
+{
+	if (addon::HasFullviewportDat())
+	{
+		// TheSuperHackers @tweak xezon 19/08/2025 Force the classic font size adjustment for the old
+		// 'Control Bar Pro' Addons because they use manual font upscaling in higher resolution packages.
+		m_resolutionFontSizeMethod = ResolutionFontSizeMethod_Classic;
+	}
+}
+
 FontDesc::FontDesc(void)
 {
 	name = "Arial Unicode MS";	///<name of font
diff --git a/Generals/Code/GameEngine/Source/GameClient/GraphDraw.cpp b/Generals/Code/GameEngine/Source/GameClient/GraphDraw.cpp
index ef6f50dbe04..b546c3f660c 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GraphDraw.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GraphDraw.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GraphDraw.cpp ////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,8 +37,8 @@
 //	Filename: 	GraphDraw.cpp
 //
 //	author:		John McDonald
-//	
-//	purpose:	Contains the functions to queue up and display a single graph for 
+//
+//	purpose:	Contains the functions to queue up and display a single graph for
 //						each frame
 //
 //-----------------------------------------------------------------------------
@@ -91,18 +91,18 @@ void GraphDraw::render()
 	Int height = TheDisplay->getHeight();
 
 	Int totalCount = m_graphEntries.size();
-	DEBUG_ASSERTCRASH(totalCount < MAX_GRAPH_VALUES, ("MAX_GRAPH_VALUES must be increased, not all labels will appear (max %d, cur %d).\n",MAX_GRAPH_VALUES,totalCount));
-	DEBUG_ASSERTCRASH(BAR_HEIGHT * totalCount < height, ("BAR_HEIGHT must be reduced, as bars are being drawn off-screen.\n"));
+	DEBUG_ASSERTCRASH(totalCount < MAX_GRAPH_VALUES, ("MAX_GRAPH_VALUES must be increased, not all labels will appear (max %d, cur %d).",MAX_GRAPH_VALUES,totalCount));
+	DEBUG_ASSERTCRASH(BAR_HEIGHT * totalCount < height, ("BAR_HEIGHT must be reduced, as bars are being drawn off-screen."));
 	VecGraphEntriesIt it;
 
 	Int count = 0;
 	for (it = m_graphEntries.begin(); it != m_graphEntries.end(); ++it) {
-		
+
 		if (count < MAX_GRAPH_VALUES) {
 			// draw the label.
 			UnicodeString uniStr;
 			uniStr.translate(it->first);
-		
+
 			m_displayStrings[count]->setText(uniStr);
 			m_displayStrings[count]->draw(5, count * BAR_HEIGHT, 0xFFFFFFFF, 0x00000000, 1, 1);
 		}
@@ -121,4 +121,4 @@ void GraphDraw::clear()
 
 GraphDraw *TheGraphDraw = NULL;
 
-#endif /* PERF_TIMERS */
\ No newline at end of file
+#endif /* PERF_TIMERS */
diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
index cc435995a0f..b9b9315106f 100644
--- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -23,18 +23,19 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // InGameUI.cpp ///////////////////////////////////////////////////////////////////////////////////
-// Implementation of in-game user interface singleton inteface
+// Implementation of in-game user interface singleton
 // Author: Michael S. Booth, March 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_SHADOW_NAMES
 
 #include "Common/ActionManager.h"
+#include "Common/FramePacer.h"
 #include "Common/GameAudio.h"
-#include "Common/GameEngine.h"
 #include "Common/GameType.h"
+#include "Common/GameUtility.h"
 #include "Common/MessageStream.h"
 #include "Common/PerfTimer.h"
 #include "Common/Player.h"
@@ -45,7 +46,6 @@
 #include "Common/ThingTemplate.h"
 #include "Common/BuildAssistant.h"
 #include "Common/Recorder.h"
-#include "Common/BuildAssistant.h"
 #include "Common/SpecialPower.h"
 
 #include "GameClient/Anim2D.h"
@@ -65,8 +65,7 @@
 #include "GameClient/Mouse.h"
 #include "GameClient/GadgetStaticText.h"
 #include "GameClient/View.h"
-#include "GameClient/TerrainVisual.h"	
-#include "GameClient/ControlBar.h"
+#include "GameClient/TerrainVisual.h"
 #include "GameClient/Display.h"
 #include "GameClient/WindowLayout.h"
 #include "GameClient/LookAtXlat.h"
@@ -86,16 +85,45 @@
 #include "GameLogic/Module/SupplyWarehouseDockUpdate.h"
 #include "GameLogic/Module/MobMemberSlavedUpdate.h"//ML
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+#include "GameNetwork/NetworkInterface.h"
+
 
 
 // ------------------------------------------------------------------------------------------------
-static const Real placementOpacity = 0.45f;
-static const RGBColor illegalBuildColor = { 1.0, 0.0, 0.0 };
+static const RGBColor IllegalBuildColor = { 1.0, 0.0, 0.0 };
+
+// ------------------------------------------------------------------------------------------------
+static UnicodeString formatMoneyValue(UnsignedInt amount)
+{
+	UnicodeString result;
+	if (amount >= 100000)
+	{
+		result.format(L"%uk", amount / 1000);
+	}
+	else
+	{
+		result.format(L"%u", amount);
+	}
+	return result;
+}
+
+static UnicodeString formatIncomeValue(UnsignedInt cashPerMin)
+{
+	UnicodeString result;
+	if (cashPerMin >= 10000)
+	{
+		result.format(L"%uk", cashPerMin / 1000);
+	}
+	else if (cashPerMin >= 1000)
+	{
+		result.format(L"%u", (cashPerMin / 100) * 100);
+	}
+	else
+	{
+		result.format(L"%u", (cashPerMin / 10) * 10);
+	}
+	return result;
+}
 
 //-------------------------------------------------------------------------------------------------
 /// The InGameUI singleton instance.
@@ -119,7 +147,7 @@ static Bool kindOfUnitSelection( Drawable *test, void *userData )
 	if( test )
 	{
 		const Object *object = test->getObject();
-		// Only things with objects can be selected, and the code below isn't 
+		// Only things with objects can be selected, and the code below isn't
 		// safe unless you've verified that there is a valid object.
 		if (!object)
 			return FALSE;
@@ -127,10 +155,10 @@ static Bool kindOfUnitSelection( Drawable *test, void *userData )
 		Bool isKindOfMatch = object->isKindOfMulti(data->m_mustbeSet, data->m_mustbeClear);
 
 		// only select objects if not already selected
-		if( object && isKindOfMatch 
-					&& object->isLocallyControlled() 
-					&& !object->isContained() 
-					&& !object->getDrawable()->isSelected() 
+		if( object && isKindOfMatch
+					&& object->isLocallyControlled()
+					&& !object->isContained()
+					&& !object->getDrawable()->isSelected()
 					&& !object->isEffectivelyDead()
 					&& object->isMassSelectable()
 					&& !object->isOffMap()
@@ -153,7 +181,7 @@ static Bool kindOfUnitSelection( Drawable *test, void *userData )
 				TheInGameUI->setDisplayedMaxWarning( FALSE );
 				data->newlySelectedDrawables.push_back(test);
 				return TRUE;
-			}	
+			}
 		}
 	}
 	return FALSE;
@@ -175,7 +203,7 @@ static Bool similarUnitSelection( Drawable *test, void *userData )
 	if( test )
 	{
 		const Object *object = test->getObject();
-		// Only things with objects can be selected, and the code below isn't 
+		// Only things with objects can be selected, and the code below isn't
 		// safe unless you've verified that there is a valid object.
 		if (!object)
 			return FALSE;
@@ -187,10 +215,10 @@ static Bool similarUnitSelection( Drawable *test, void *userData )
 		}
 
 		// only select objects if not already selected
-		if( object && isEquivalent 
-			  && object->isLocallyControlled() 
+		if( object && isEquivalent
+			  && object->isLocallyControlled()
 				&& !object->isContained()
-				&& !( object->getDrawable()->isSelected() ) 
+				&& !( object->getDrawable()->isSelected() )
 				&& object->isMassSelectable() // And only if they can be multiply selected. (otherwise the drawable will be, but the object will not be)
 				&& !object->isOffMap()
 				)
@@ -212,7 +240,7 @@ static Bool similarUnitSelection( Drawable *test, void *userData )
 				TheInGameUI->setDisplayedMaxWarning( FALSE );
 				data->newlySelectedDrawables.push_back(test);
 				return TRUE;
-			}	
+			}
 		}
 	}
 	return FALSE;
@@ -258,10 +286,10 @@ SuperweaponInfo::SuperweaponInfo(
 	Bool hiddenByScript,
 	Bool hiddenByScience,
 	Bool ready,
-	const AsciiString& superweaponNormalFont, 
-	Int superweaponNormalPointSize, 
+	const AsciiString& superweaponNormalFont,
+	Int superweaponNormalPointSize,
 	Bool superweaponNormalBold,
-	Color c, 
+	Color c,
 	const SpecialPowerTemplate* spt
 ) :
 	m_id(id),
@@ -303,9 +331,9 @@ SuperweaponInfo::~SuperweaponInfo()
 // ------------------------------------------------------------------------------------------------
 void SuperweaponInfo::setFont(const AsciiString& superweaponNormalFont, Int superweaponNormalPointSize, Bool superweaponNormalBold)
 {
-	m_nameDisplayString->setFont( TheFontLibrary->getFont( superweaponNormalFont, 
+	m_nameDisplayString->setFont( TheFontLibrary->getFont( superweaponNormalFont,
 		TheGlobalLanguageData->adjustFontSize(superweaponNormalPointSize), superweaponNormalBold ) );
-	m_timeDisplayString->setFont( TheFontLibrary->getFont( superweaponNormalFont, 
+	m_timeDisplayString->setFont( TheFontLibrary->getFont( superweaponNormalFont,
 		TheGlobalLanguageData->adjustFontSize(superweaponNormalPointSize), superweaponNormalBold ) );
 }
 
@@ -345,12 +373,12 @@ Real SuperweaponInfo::getHeight() const
 void InGameUI::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Save NamedTimers, but not specifically their Info structs.  We'll recreate them.
 */
 // ------------------------------------------------------------------------------------------------
@@ -418,7 +446,7 @@ void InGameUI::xfer( Xfer *xfer )
 
 					// since this list tends to be somewhat sparse, we write stuff out pretty explicitly.
 					xfer->xferInt(&playerIndex);
-					
+
 					AsciiString templateName = swInfo->getSpecialPowerTemplate()->getName();
 
 					xfer->xferAsciiString(&templateName);
@@ -447,7 +475,7 @@ void InGameUI::xfer( Xfer *xfer )
 			}
 			else if (playerIndex < 0 || playerIndex >= MAX_PLAYER_COUNT)
 			{
-				DEBUG_CRASH(("SWInfo bad plyrindex\n"));
+				DEBUG_CRASH(("SWInfo bad plyrindex"));
 				throw INI_INVALID_DATA;
 			}
 
@@ -456,7 +484,7 @@ void InGameUI::xfer( Xfer *xfer )
 			const SpecialPowerTemplate* powerTemplate = TheSpecialPowerStore->findSpecialPowerTemplate(templateName);
 			if (powerTemplate == NULL)
 			{
-				DEBUG_CRASH(("power %s not found\n",templateName.str()));
+				DEBUG_CRASH(("power %s not found",templateName.str()));
 				throw INI_INVALID_DATA;
 			}
 
@@ -473,7 +501,7 @@ void InGameUI::xfer( Xfer *xfer )
 			xfer->xferBool(&ready);
 
 			// srj sez: due to order-of-operation stuff, sometimes these will already exist,
-			// sometimes not. not sure why. so handle both cases. 
+			// sometimes not. not sure why. so handle both cases.
 			SuperweaponInfo* swInfo = findSWInfo(playerIndex, powerName, id, powerTemplate);
 			if (swInfo == NULL)
 			{
@@ -484,10 +512,10 @@ void InGameUI::xfer( Xfer *xfer )
 					hiddenByScript,
 					hiddenByScience,
 					ready,
-					m_superweaponNormalFont, 
-					m_superweaponNormalPointSize, 
-					m_superweaponNormalBold, 
-					player->getPlayerColor(), 
+					m_superweaponNormalFont,
+					m_superweaponNormalPointSize,
+					m_superweaponNormalBold,
+					player->getPlayerColor(),
 					powerTemplate);
 				m_superweapons[playerIndex][powerName].push_back(swInfo);
 			}
@@ -500,7 +528,7 @@ void InGameUI::xfer( Xfer *xfer )
 				swInfo->m_ready = ready;
 			}
 			swInfo->m_forceUpdateText = true;
-		
+
 		}
 	}
 
@@ -512,7 +540,7 @@ void InGameUI::xfer( Xfer *xfer )
 void InGameUI::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -561,7 +589,7 @@ void InGameUI::addSuperweapon(Int playerIndex, const AsciiString& powerName, Obj
 	const Player* player = ThePlayerList->getNthPlayer(playerIndex);
 	Bool hiddenByScience = (powerTemplate->getRequiredScience() != SCIENCE_INVALID) && (player->hasScience(powerTemplate->getRequiredScience()) == false);
 
-	DEBUG_LOG(("Adding superweapon UI timer\n"));
+	DEBUG_LOG(("Adding superweapon UI timer"));
 	SuperweaponInfo *info = newInstance(SuperweaponInfo)(
 					id,
 					-1,			// timestamp
@@ -570,10 +598,10 @@ void InGameUI::addSuperweapon(Int playerIndex, const AsciiString& powerName, Obj
 													// THe trouble is: There is no mechanism to clear this bit when the science is granted, thus,
 													// the timer never, ever, ever get drawn.... unless the owning object is post-science constructed.
 					FALSE,	// ready
-					m_superweaponNormalFont, 
-					m_superweaponNormalPointSize, 
-					m_superweaponNormalBold, 
-					player->getPlayerColor(), 
+					m_superweaponNormalFont,
+					m_superweaponNormalPointSize,
+					m_superweaponNormalBold,
+					player->getPlayerColor(),
 					powerTemplate);
 
 	m_superweapons[playerIndex][powerName].push_back(info);
@@ -583,7 +611,7 @@ void InGameUI::addSuperweapon(Int playerIndex, const AsciiString& powerName, Obj
 // ------------------------------------------------------------------------------------------------
 Bool InGameUI::removeSuperweapon(Int playerIndex, const AsciiString& powerName, ObjectID id, const SpecialPowerTemplate *powerTemplate)
 {
-	DEBUG_LOG(("Removing superweapon UI timer\n"));
+	DEBUG_LOG(("Removing superweapon UI timer"));
 	SuperweaponMap::iterator mapIt = m_superweapons[playerIndex].find(powerName);
 	if (mapIt != m_superweapons[playerIndex].end())
 	{
@@ -595,7 +623,7 @@ Bool InGameUI::removeSuperweapon(Int playerIndex, const AsciiString& powerName,
 				SuperweaponInfo *info = *listIt;
 				swList.erase(listIt);
 				deleteInstance(info);
-				if (swList.size() == 0)
+				if (swList.empty())
 				{
 					m_superweapons[playerIndex].erase(mapIt);
 				}
@@ -701,20 +729,20 @@ void InGameUI::setSuperweaponDisplayEnabledByScript(Bool enable)
 // ------------------------------------------------------------------------------------------------
 Bool InGameUI::getSuperweaponDisplayEnabledByScript(void) const
 {
-	return m_superweaponHiddenByScript;
+	return !m_superweaponHiddenByScript;
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void InGameUI::addNamedTimer( const AsciiString& timerName, const UnicodeString& text, Bool isCountdown )
 {
-	NamedTimerInfo *info = newInstance( NamedTimerInfo );	
+	NamedTimerInfo *info = newInstance( NamedTimerInfo );
 	info->m_timerName = timerName;
 	info->color = m_namedTimerNormalColor;
 	info->timerText = text;
 	info->displayString = TheDisplayStringManager->newDisplayString();
 	info->displayString->reset();
-	info->displayString->setFont( TheFontLibrary->getFont( m_namedTimerNormalFont, 
+	info->displayString->setFont( TheFontLibrary->getFont( m_namedTimerNormalFont,
 		TheGlobalLanguageData->adjustFontSize(m_namedTimerNormalPointSize), m_namedTimerNormalBold ) );
 	info->displayString->setText( UnicodeString::TheEmptyString );
 	info->timestamp = -1;
@@ -749,7 +777,7 @@ void InGameUI::showNamedTimerDisplay( Bool show )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-const FieldParse InGameUI::s_fieldParseTable[] = 
+const FieldParse InGameUI::s_fieldParseTable[] =
 {
 	{ "MaxSelectionSize",								INI::parseInt,					NULL,		offsetof( InGameUI, m_maxSelectCount ) },
 
@@ -809,7 +837,7 @@ const FieldParse InGameUI::s_fieldParseTable[] =
 	{ "FloatingTextVanishRate",								INI::parseVelocityReal,	NULL,		offsetof( InGameUI, m_floatingTextMoveVanishRate ) },
 
 	{ "PopupMessageColor",								INI::parseColorInt,					NULL,		offsetof( InGameUI, m_popupMessageColor ) },
-	
+
 	{ "DrawableCaptionFont",									INI::parseAsciiString,	NULL,		offsetof( InGameUI, m_drawableCaptionFont ) },
 	{ "DrawableCaptionPointSize",							INI::parseInt,					NULL,		offsetof( InGameUI, m_drawableCaptionPointSize ) },
 	{ "DrawableCaptionBold",									INI::parseBool,					NULL,		offsetof( InGameUI, m_drawableCaptionBold ) },
@@ -834,20 +862,47 @@ const FieldParse InGameUI::s_fieldParseTable[] =
 	{ "DaisyCutterRadiusCursor",		RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_DAISYCUTTER] ) },
 	{ "ParadropRadiusCursor",				RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_PARADROP] ) },
 	{ "SpySatelliteRadiusCursor",		RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_SPYSATELLITE] ) },
-	
-	{ "NuclearMissileRadiusCursor", RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_NUCLEARMISSILE] ) }, 
+
+	{ "NuclearMissileRadiusCursor", RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_NUCLEARMISSILE] ) },
 	{ "EMPPulseRadiusCursor",		  	RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_EMPPULSE] ) },
 	{ "ArtilleryRadiusCursor",		  RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_ARTILLERYBARRAGE] ) },
 	{ "NapalmStrikeRadiusCursor",		RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_NAPALMSTRIKE] ) },
 	{ "ClusterMinesRadiusCursor",		RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_CLUSTERMINES] ) },
-	
-	{ "ScudStormRadiusCursor",			RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_SCUDSTORM] ) }, 
+
+	{ "ScudStormRadiusCursor",			RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_SCUDSTORM] ) },
 	{ "AnthraxBombRadiusCursor",		RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_ANTHRAXBOMB] ) },
-	{ "AmbushRadiusCursor",					RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_AMBUSH] ) }, 
+	{ "AmbushRadiusCursor",					RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_AMBUSH] ) },
 	{ "RadarRadiusCursor",					RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_RADAR] ) },
 	{ "SpyDroneRadiusCursor",				RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[ RADIUSCURSOR_SPYDRONE] ) },
 
-	{ NULL,													NULL,										NULL,		0 }  // keep this last
+	// TheSuperHackers @info ui enhancement configuration
+	{ "NetworkLatencyFont",      INI::parseAsciiString,  NULL, offsetof( InGameUI, m_networkLatencyFont ) },
+	{ "NetworkLatencyBold",      INI::parseBool,         NULL, offsetof( InGameUI, m_networkLatencyBold ) },
+	{ "NetworkLatencyPosition",  INI::parseCoord2D,      NULL, offsetof( InGameUI, m_networkLatencyPosition ) },
+	{ "NetworkLatencyColor",     INI::parseColorInt,     NULL, offsetof( InGameUI, m_networkLatencyColor ) },
+	{ "NetworkLatencyDropColor", INI::parseColorInt,     NULL, offsetof( InGameUI, m_networkLatencyDropColor ) },
+
+	{ "RenderFpsFont",          INI::parseAsciiString,  NULL, offsetof( InGameUI, m_renderFpsFont ) },
+	{ "RenderFpsBold",          INI::parseBool,         NULL, offsetof( InGameUI, m_renderFpsBold ) },
+	{ "RenderFpsPosition",      INI::parseCoord2D,      NULL, offsetof( InGameUI, m_renderFpsPosition ) },
+	{ "RenderFpsColor",         INI::parseColorInt,     NULL, offsetof( InGameUI, m_renderFpsColor ) },
+	{ "RenderFpsLimitColor",    INI::parseColorInt,     NULL, offsetof( InGameUI, m_renderFpsLimitColor ) },
+	{ "RenderFpsDropColor",     INI::parseColorInt,     NULL, offsetof( InGameUI, m_renderFpsDropColor ) },
+	{ "RenderFpsRefreshMs",     INI::parseUnsignedInt,  NULL, offsetof( InGameUI, m_renderFpsRefreshMs ) },
+
+	{ "SystemTimeFont",         INI::parseAsciiString,  NULL, offsetof( InGameUI, m_systemTimeFont ) },
+	{ "SystemTimeBold",         INI::parseBool,         NULL, offsetof( InGameUI, m_systemTimeBold ) },
+	{ "SystemTimePosition",     INI::parseCoord2D,      NULL, offsetof( InGameUI, m_systemTimePosition ) },
+	{ "SystemTimeColor",        INI::parseColorInt,     NULL, offsetof( InGameUI, m_systemTimeColor ) },
+	{ "SystemTimeDropColor",    INI::parseColorInt,     NULL, offsetof( InGameUI, m_systemTimeDropColor ) },
+
+	{ "GameTimeFont",           INI::parseAsciiString,  NULL, offsetof( InGameUI, m_gameTimeFont ) },
+	{ "GameTimeBold",           INI::parseBool,         NULL, offsetof( InGameUI, m_gameTimeBold ) },
+	{ "GameTimePosition",       INI::parseCoord2D,      NULL, offsetof( InGameUI, m_gameTimePosition ) },
+	{ "GameTimeColor",          INI::parseColorInt,     NULL, offsetof( InGameUI, m_gameTimeColor ) },
+	{ "GameTimeDropColor",      INI::parseColorInt,     NULL, offsetof( InGameUI, m_gameTimeDropColor ) },
+
+	{ NULL,													NULL,										NULL,		0 }
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -862,13 +917,23 @@ void INI::parseInGameUIDefinition( INI* ini )
 	}
 }
 
+//-------------------------------------------------------------------------------------------------
+namespace
+{
+	// helpers for inline counters
+	constexpr const Int kHudAnchorX = 3;
+	constexpr const Int kHudAnchorY = -1;
+	constexpr const Int kHudGapPx = 6;
+	inline Bool isAtHudAnchorPos(const Coord2D &p) { return p.x == kHudAnchorX && p.y == kHudAnchorY; }
+}
+
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 InGameUI::InGameUI()
 {
 	Int i;
 
-	
+
   m_inputEnabled = true;
 	m_isDragSelecting = false;
 	m_nextMoveHint = 0;
@@ -880,15 +945,13 @@ InGameUI::InGameUI()
 	m_mouseMode = MOUSEMODE_DEFAULT;
 	m_mouseModeCursor = Mouse::ARROW;
 	m_mousedOverDrawableID = INVALID_DRAWABLE_ID;
-	
-	//Added By Sadullah Nader
-	//Initializations missing and needed
+
 	m_currentlyPlayingMovie.clear();
 	m_militarySubtitle = NULL;
 	m_popupMessageData = NULL;
 	m_waypointMode = FALSE;
 	m_clientQuiet = FALSE;
-	
+
 	m_messageColor1 = GameMakeColor( 255, 255, 255, 255 );
 	m_messageColor2 = GameMakeColor( 180, 180, 180, 255 );
 	m_messagePosition.x = 10;
@@ -928,7 +991,7 @@ InGameUI::InGameUI()
 		m_moveHint[ i ].sourceID = 0;
 		m_moveHint[ i ].frame = 0;
 
-	}  //  end for i
+	}
 
 	for( i = 0; i < MAX_BUILD_PROGRESS; i++ )
 	{
@@ -937,7 +1000,7 @@ InGameUI::InGameUI()
 		m_buildProgress[ i ].m_percentComplete = 0.0f;
 		m_buildProgress[ i ].m_control = NULL;
 
-	}  // end for i
+	}
 
 	m_pendingGUICommand = NULL;
 
@@ -966,11 +1029,56 @@ InGameUI::InGameUI()
 		m_uiMessages[ i ].timestamp = 0;
 		m_uiMessages[ i ].color = 0;
 
-	}  // end for i
+	}
 
 	m_replayWindow = NULL;
 	m_messagesOn = TRUE;
 
+	// TheSuperHackers @info the default font, size and positions of the various counters were chosen based on GenTools implementation
+	m_networkLatencyString = NULL;
+	m_networkLatencyFont = "Tahoma";
+	m_networkLatencyPointSize = TheGlobalData->m_networkLatencyFontSize;
+	m_networkLatencyBold = TRUE;
+	m_networkLatencyPosition.x = kHudAnchorX;
+	m_networkLatencyPosition.y = kHudAnchorY;
+	m_networkLatencyColor = GameMakeColor( 173, 216, 255, 255 );
+	m_networkLatencyDropColor = GameMakeColor( 0, 0, 0, 255 );
+	m_lastNetworkLatencyFrames = ~0u;
+
+	m_renderFpsString = NULL;
+	m_renderFpsLimitString = NULL;
+	m_renderFpsFont = "Tahoma";
+	m_renderFpsPointSize = TheGlobalData->m_renderFpsFontSize;
+	m_renderFpsBold = TRUE;
+	m_renderFpsPosition.x = kHudAnchorX;
+	m_renderFpsPosition.y = kHudAnchorY;
+	m_renderFpsColor = GameMakeColor( 255, 255, 0, 255 );
+	m_renderFpsLimitColor = GameMakeColor(119, 119, 119, 255);
+	m_renderFpsDropColor = GameMakeColor( 0, 0, 0, 255 );
+	m_renderFpsRefreshMs = 1000;
+	m_lastRenderFps = ~0u;
+	m_lastRenderFpsLimit = ~0u;
+	m_lastRenderFpsUpdateMs = 0u;
+
+	m_systemTimeString = NULL;
+	m_systemTimeFont = "Tahoma";
+	m_systemTimePointSize = TheGlobalData->m_systemTimeFontSize;
+	m_systemTimeBold = TRUE;
+	m_systemTimePosition.x = kHudAnchorX; // TheSuperHackers @info relative to the left of the screen
+	m_systemTimePosition.y = kHudAnchorY;
+	m_systemTimeColor = GameMakeColor( 255, 255, 255, 255 );
+	m_systemTimeDropColor = GameMakeColor( 0, 0, 0, 255 );
+
+	m_gameTimeString = NULL;
+	m_gameTimeFrameString = NULL;
+	m_gameTimeFont = "Tahoma";
+	m_gameTimePointSize = TheGlobalData->m_gameTimeFontSize;
+	m_gameTimeBold = TRUE;
+	m_gameTimePosition.x = kHudAnchorX; // TheSuperHackers @info relative to the right of the screen
+	m_gameTimePosition.y = kHudAnchorY;
+	m_gameTimeColor = GameMakeColor( 255, 255, 255, 255 );
+	m_gameTimeDropColor = GameMakeColor( 0, 0, 0, 255 );
+
 	m_superweaponPosition.x = 0.7f;
 	m_superweaponPosition.y = 0.7f;
 	m_superweaponFlashDuration = 1.0f;
@@ -1015,7 +1123,7 @@ InGameUI::InGameUI()
 
 	m_drawRMBScrollAnchor = FALSE;
 	m_moveRMBScrollAnchor = FALSE;
-	m_displayedMaxWarning = FALSE; 
+	m_displayedMaxWarning = FALSE;
 
 	m_idleWorkerWin = NULL;
 	m_currentIdleWorkerDisplay = -1;
@@ -1027,10 +1135,10 @@ InGameUI::InGameUI()
 	m_preferSelection		= false;
 
 	m_curRcType = RADIUSCURSOR_NONE;
-	
+
 	m_soloNexusSelectedDrawableID = INVALID_DRAWABLE_ID;
 
-}  // end InGameUI
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1052,6 +1160,9 @@ InGameUI::~InGameUI()
 	// delete the message resources
 	freeMessageResources();
 
+	// free custom ui strings
+	freeCustomUiResources();
+
 	// delete the array for the drawbles
 	delete [] m_placeIcon;
 	m_placeIcon = NULL;
@@ -1070,7 +1181,7 @@ InGameUI::~InGameUI()
 void InGameUI::init( void )
 {
 	INI ini;
-	ini.load( AsciiString( "Data\\INI\\InGameUI.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\InGameUI", INI_LOAD_OVERWRITE, NULL );
 
 	//override INI values with language localized values:
 	if (TheGlobalLanguageData)
@@ -1135,10 +1246,9 @@ void InGameUI::init( void )
 		TheTacticalView->init();
 		TheDisplay->attachView( TheTacticalView );
 
-		// make the tactical display the full screen width for now
-		TheTacticalView->setWidth( TheDisplay->getWidth());
-		// make the tactical display 0.76 of full screen so no drawing under GUI.
-		TheTacticalView->setHeight( TheDisplay->getHeight() * 0.77f);
+		// make the tactical display the full screen width and height
+		TheTacticalView->setWidth( TheDisplay->getWidth() );
+		TheTacticalView->setHeight( TheDisplay->getHeight() );
 	}
 	TheTacticalView->setDefaultView(0.0f, 0.0f, 1.0f);
 
@@ -1158,8 +1268,10 @@ void InGameUI::init( void )
 
 	m_soloNexusSelectedDrawableID = INVALID_DRAWABLE_ID;
 
+	setDrawRMBScrollAnchor(TheGlobalData->m_drawScrollAnchor);
+	setMoveRMBScrollAnchor(TheGlobalData->m_moveScrollAnchor);
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1194,7 +1306,7 @@ void InGameUI::setRadiusCursor(RadiusCursorType cursorType, const SpecialPowerTe
 
 	if (obj == NULL)
 		return;
-	
+
 	Player* controller = obj->getControllingPlayer();
 	if (controller == NULL)
 		return;
@@ -1226,20 +1338,20 @@ void InGameUI::setRadiusCursor(RadiusCursorType cursorType, const SpecialPowerTe
 		case RADIUSCURSOR_SUPERWEAPON_SCATTER_AREA:
 		case RADIUSCURSOR_EMERGENCY_REPAIR:
 
-		case 	RADIUSCURSOR_PARTICLECANNON: 
+		case 	RADIUSCURSOR_PARTICLECANNON:
 		case 	RADIUSCURSOR_A10STRIKE:
 		case 	RADIUSCURSOR_DAISYCUTTER:
 		case 	RADIUSCURSOR_CARPETBOMB:
 		case 	RADIUSCURSOR_PARADROP:
-		case 	RADIUSCURSOR_SPYSATELLITE: 
-		case 	RADIUSCURSOR_NUCLEARMISSILE: 
+		case 	RADIUSCURSOR_SPYSATELLITE:
+		case 	RADIUSCURSOR_NUCLEARMISSILE:
 		case 	RADIUSCURSOR_EMPPULSE:
 		case 	RADIUSCURSOR_ARTILLERYBARRAGE:
 		case 	RADIUSCURSOR_NAPALMSTRIKE:
 		case 	RADIUSCURSOR_CLUSTERMINES:
-		case 	RADIUSCURSOR_SCUDSTORM: 
+		case 	RADIUSCURSOR_SCUDSTORM:
 		case 	RADIUSCURSOR_ANTHRAXBOMB:
-		case 	RADIUSCURSOR_AMBUSH: 
+		case 	RADIUSCURSOR_AMBUSH:
 		case	RADIUSCURSOR_RADAR:
 		case	RADIUSCURSOR_SPYDRONE:
 
@@ -1274,13 +1386,7 @@ void InGameUI::handleRadiusCursor()
 		// from screen to world
 		// But only if the radar is on.
 		//
-		Bool radarOn = TheRadar->isRadarForced() 
-									|| ( !TheRadar->isRadarHidden() 
-												&& ThePlayerList->getLocalPlayer() 
-												&& ThePlayerList->getLocalPlayer()->hasRadar()
-											);
-
-		if( !radarOn  ||  (TheRadar->screenPixelToWorld( &mouseIO->pos, &pos ) == FALSE) )// if radar off, or point not on radar
+		if( !rts::localPlayerHasRadar()  ||  (TheRadar->screenPixelToWorld( &mouseIO->pos, &pos ) == FALSE) )// if radar off, or point not on radar
 			TheTacticalView->screenToTerrain( &mouseIO->pos, &pos );
 
 		m_curRadiusCursor.setPosition(pos);	//world space position of center of decal
@@ -1289,7 +1395,7 @@ void InGameUI::handleRadiusCursor()
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Handle the placement "icons" that appear at the cursor when we're putting down a 
+/** Handle the placement "icons" that appear at the cursor when we're putting down a
 	* structure to build.  Note that this has additional logic to also show a line
 	* of objects because when we build "walls" we want to draw a line of repeating
 	* wall pieces on the map where we want to put all of them */
@@ -1311,7 +1417,7 @@ void InGameUI::evaluateSoloNexus( Drawable *newlyAddedDrawable )
 
 	//LoopAllSelectedDrawables
 	UnsignedShort nexaeFound = 0;
-	for( DrawableListCIt it = m_selectedDrawables.begin(); it != m_selectedDrawables.end(); ++it ) 
+	for( DrawableListCIt it = m_selectedDrawables.begin(); it != m_selectedDrawables.end(); ++it )
 	{
 
 		Drawable *draw = (*it);
@@ -1320,7 +1426,7 @@ void InGameUI::evaluateSoloNexus( Drawable *newlyAddedDrawable )
 
 		if ( ! obj )
 			continue;
-			
+
 		if ( obj->isKindOf( KINDOF_MOB_NEXUS ) )
 		{
 			++nexaeFound;
@@ -1340,7 +1446,7 @@ void InGameUI::evaluateSoloNexus( Drawable *newlyAddedDrawable )
 			return;
 		}
 
-	}  // end for
+	}
 
 
 }
@@ -1364,8 +1470,8 @@ void InGameUI::handleBuildPlacements( void )
 		if( isPlacementAnchored() )
 		{
 			ICoord2D start, end;
-								
-			// get the placement arrow points	
+
+			// get the placement arrow points
 			getPlacementPoints( &start, &end );
 
 			// set icon to anchor point
@@ -1379,15 +1485,22 @@ void InGameUI::handleBuildPlacements( void )
 				// project the start and the end points of the line anchor into the 3D world
 				TheTacticalView->screenToTerrain( &start, &worldStart );
 				TheTacticalView->screenToTerrain( &end, &worldEnd );
-				
+
 				Coord2D v;
 				v.x = worldEnd.x - worldStart.x;
 				v.y = worldEnd.y - worldStart.y;
 				angle = v.toAngle();
 
-			}  // end if
+				// TheSuperHackers @tweak Stubbjax 04/08/2025 Snap angle to nearest 45 degrees
+				// while using force attack mode for convenience.
+				if (isInForceAttackMode())
+				{
+					const Real snapRadians = DEG_TO_RADF(45);
+					angle = WWMath::Round(angle / snapRadians) * snapRadians;
+				}
+			}
 
-		}  // end if
+		}
 		else
 		{
 			const MouseIO *mouseIO = TheMouse->getMouseStatus();
@@ -1395,7 +1508,7 @@ void InGameUI::handleBuildPlacements( void )
 			// location is the mouse position
 			loc = mouseIO->pos;
 
-		}  // end else
+		}
 
 		// set the location and angle of the place icon
 		/**@todo this whole orientation vector thing is LAME! Must replace, all I want to
@@ -1424,28 +1537,29 @@ void InGameUI::handleBuildPlacements( void )
 																											 m_pendingPlaceType,
 																											 angle,
 																											 BuildAssistant::USE_QUICK_PATHFIND |
-																											 BuildAssistant::TERRAIN_RESTRICTIONS | 
+																											 BuildAssistant::TERRAIN_RESTRICTIONS |
 																											 BuildAssistant::CLEAR_PATH |
 																											 BuildAssistant::NO_OBJECT_OVERLAP |
-																											 BuildAssistant::SHROUD_REVEALED, 
+																											 BuildAssistant::SHROUD_REVEALED,
 																											 builderObject,
 																											 NULL );
+
 			if( lbc != LBC_OK )
-				m_placeIcon[ 0 ]->colorTint( &illegalBuildColor );
+				m_placeIcon[ 0 ]->colorTint( &IllegalBuildColor );
 			else
 				m_placeIcon[ 0 ]->colorTint( NULL );
 
-			
+
 
 
 			// Add the bibs around the structure.
-			if (lbc != LBC_OK) 
+			if (lbc != LBC_OK)
 			{
 				TheTerrainVisual->addFactionBibDrawable(m_placeIcon[0], lbc != LBC_OK);
 			} else {
 				TheTerrainVisual->removeFactionBibDrawable(m_placeIcon[0]);
 			}
-		}  // end if
+		}
 
 
 
@@ -1469,12 +1583,12 @@ void InGameUI::handleBuildPlacements( void )
 
 			// how big are each of our objects
 			Real objectSize = m_pendingPlaceType->getTemplateGeometryInfo().getMajorRadius() * 2.0f;
-			
+
 			// what is our max tiling length we can make
 			Int maxObjects = TheGlobalData->m_maxLineBuildObjects;
 
 			// get the builder object that will be constructing things
-			Object *builderObject = TheGameLogic->findObjectByID( TheInGameUI->getPendingPlaceSourceObjectID() );
+			Object *builderObject = TheGameLogic->findObjectByID( getPendingPlaceSourceObjectID() );
 
 			//
 			// given the start/end points in the world and the the angle of the wall, fill
@@ -1484,17 +1598,20 @@ void InGameUI::handleBuildPlacements( void )
 			tileBuildInfo = TheBuildAssistant->buildTiledLocations( m_pendingPlaceType, angle,
 																															&worldStart, &worldEnd,
 																															objectSize, maxObjects,
-																															builderObject );	
+																															builderObject );
 
 			// create any necessary drawables we need to "fill out" the line
 			for( i = 0; i < tileBuildInfo->tilesUsed; i++ )
 			{
-			
+
 				if( m_placeIcon[ i ] == NULL )
-					m_placeIcon[ i ] = TheThingFactory->newDrawable( m_pendingPlaceType,
-																													 DRAWABLE_STATUS_NO_STATE_PARTICLES );
+				{
+					UnsignedInt drawableStatus = DRAWABLE_STATUS_NO_STATE_PARTICLES;
+					drawableStatus |= TheGlobalData->m_objectPlacementShadows ? DRAWABLE_STATUS_SHADOWS : 0;
+					m_placeIcon[ i ] = TheThingFactory->newDrawable( m_pendingPlaceType, drawableStatus );
+				}
 
-			}  // end for i
+			}
 
 			//
 			// destroy any drawables that we're not using anymore because a previous
@@ -1507,7 +1624,7 @@ void InGameUI::handleBuildPlacements( void )
 					TheGameClient->destroyDrawable( m_placeIcon[ i ] );
 				m_placeIcon[ i ] = NULL;
 
-			}  // end for i
+			}
 
 			//
 			// march down each drawable and set the position based on its position in the
@@ -1516,22 +1633,22 @@ void InGameUI::handleBuildPlacements( void )
 			for( i = 0; i < tileBuildInfo->tilesUsed; i++ )
 			{
 
-				// set the drawble position
+				// set the drawable position
 				m_placeIcon[ i ]->setPosition( &tileBuildInfo->positions[ i ] );
 
-				// set opacity for the drawble
-				m_placeIcon[ i ]->setDrawableOpacity( placementOpacity );
+				// set opacity for the drawable
+				m_placeIcon[ i ]->setDrawableOpacity( TheGlobalData->m_objectPlacementOpacity );
 
 				// set the drawable angle
 				m_placeIcon[ i ]->setOrientation( angle );
 
-			}  // end for i
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end handleBuildPlacements
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Pre-draw phase of the in game ui */
@@ -1551,14 +1668,14 @@ void InGameUI::preDraw( void )
 	// draw world animations
 	updateAndDrawWorldAnimations();
 
-}  // end preDraw
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update the in game user interface */
 //-------------------------------------------------------------------------------------------------
 //DECLARE_PERF_TIMER(InGameUI_update)
 void InGameUI::update( void )
-{ 
+{
 	//USE_PERF_TIMER(InGameUI_update)
 	Int i;
 
@@ -1616,7 +1733,7 @@ void InGameUI::update( void )
 				a = 0;
 			else
 				a -= amount;
-			
+
 			// set the new color
 			m_uiMessages[ i ].color = GameMakeColor( r, g, b, a );
 
@@ -1624,9 +1741,9 @@ void InGameUI::update( void )
 			if( a == 0 )
 				removeMessageAtIndex( i );
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	//
 	// Update the Military Subtitle display
@@ -1659,7 +1776,7 @@ void InGameUI::update( void )
 		}
 		else
 		{
-			// trigger whether or not we should draw the block	
+			// trigger whether or not we should draw the block
 			if( m_militarySubtitle->blockBeginFrame + 9 < currLogicFrame )
 			{
 				m_militarySubtitle->blockBeginFrame = currLogicFrame;
@@ -1682,7 +1799,7 @@ void InGameUI::update( void )
 					// Now add a new display string
 					m_militarySubtitle->currentDisplayString++;
 					if(!(m_militarySubtitle->currentDisplayString >= MAX_SUBTITLE_LINES) )
-					{	
+					{
 						m_militarySubtitle->blockPos.x = m_militarySubtitle->position.x;
 						m_militarySubtitle->displayStrings[m_militarySubtitle->currentDisplayString] = TheDisplayStringManager->newDisplayString();
 						m_militarySubtitle->displayStrings[m_militarySubtitle->currentDisplayString]->reset();
@@ -1695,7 +1812,7 @@ void InGameUI::update( void )
 					{
 						// if we've exceeded the allocated number of display strings, this will force us to essentially truncate the remaining text
 						m_militarySubtitle->index = m_militarySubtitle->subtitle.getLength();
-						DEBUG_CRASH(("You're Only Allowed to use %d lines of subtitle text\n",MAX_SUBTITLE_LINES));
+						DEBUG_CRASH(("You're Only Allowed to use %d lines of subtitle text",MAX_SUBTITLE_LINES));
 					}
 				}
 				else
@@ -1716,7 +1833,7 @@ void InGameUI::update( void )
 						m_militarySubtitle->incrementOnFrame = currLogicFrame + m_militaryCaptionSpeed;
 
 				}
-				// increment the index			
+				// increment the index
 				m_militarySubtitle->index++;
 				if(m_militarySubtitle->index >= m_militarySubtitle->subtitle.getLength())
 				{
@@ -1736,43 +1853,64 @@ void InGameUI::update( void )
 										m_militarySubtitle->incrementOnFrame = GameClientRandomValue(10, 13) + currLogicFrame;
 									}
 								}*/
-				
+
 			}
 		}
 	}
 
 	// update the player money window if the money amount has changed
 	// this seems like as good a place as any to do the power hide/show
-	static Int lastMoney = -1;
-	static NameKeyType moneyWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:MoneyDisplay" );	
-	static NameKeyType powerWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PowerWindow" );	
+	static UnsignedInt lastMoney = ~0u;
+	static UnsignedInt lastIncome = ~0u;
+	static NameKeyType moneyWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:MoneyDisplay" );
+	static NameKeyType powerWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PowerWindow" );
 
 	GameWindow *moneyWin = TheWindowManager->winGetWindowFromId( NULL, moneyWindowKey );
 	GameWindow *powerWin = TheWindowManager->winGetWindowFromId( NULL, powerWindowKey );
 //	if( moneyWin == NULL )
 //	{
-//		NameKeyType moneyWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:MoneyDisplay" );	
+//		NameKeyType moneyWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:MoneyDisplay" );
 //
 //		moneyWin = TheWindowManager->winGetWindowFromId( NULL, moneyWindowKey );
 //
 //	}  // end if
-	Player *moneyPlayer = NULL;
-	if( TheControlBar->isObserverControlBarOn())
-		moneyPlayer = TheControlBar->getObserverLookAtPlayer();
-	else
-		moneyPlayer = ThePlayerList->getLocalPlayer();
+	Player* moneyPlayer = TheControlBar->getCurrentlyViewedPlayer();
 	if( moneyPlayer)
 	{
-		Int currentMoney = moneyPlayer->getMoney()->countMoney();
-		if( lastMoney != currentMoney )
+		Money *money = moneyPlayer->getMoney();
+		Bool wantShowIncome = TheGlobalData->m_showMoneyPerMinute;
+		Bool canShowIncome = TheGlobalData->m_allowMoneyPerMinuteForPlayer || TheControlBar->isObserverControlBarOn();
+		Bool doShowIncome = wantShowIncome && canShowIncome;
+		if (!doShowIncome)
 		{
-			UnicodeString buffer;
+			UnsignedInt currentMoney = money->countMoney();
+			if( lastMoney != currentMoney )
+			{
+				UnicodeString buffer;
 
-			buffer.format( TheGameText->fetch( "GUI:ControlBarMoneyDisplay" ), currentMoney );
-			GadgetStaticTextSetText( moneyWin, buffer );
-			lastMoney = currentMoney;
-			
-		}  // end if
+				buffer.format(TheGameText->fetch( "GUI:ControlBarMoneyDisplay" ), currentMoney );
+				GadgetStaticTextSetText( moneyWin, buffer );
+				lastMoney = currentMoney;
+
+			}
+		}
+		else
+		{
+			// TheSuperHackers @feature L3-M 21/08/2025 player money per minute
+			UnsignedInt currentMoney = money->countMoney();
+			UnsignedInt cashPerMin = money->getCashPerMinute();
+			if ( lastMoney != currentMoney || lastIncome != cashPerMin )
+			{
+				UnicodeString buffer;
+				UnicodeString moneyStr = formatMoneyValue(currentMoney);
+				UnicodeString incomeStr = formatIncomeValue(cashPerMin);
+
+				buffer.format(TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:ControlBarMoneyDisplayIncome", L"$ %ls +%ls/min", moneyStr.str(), incomeStr.str()));
+				GadgetStaticTextSetText(moneyWin, buffer);
+				lastMoney = currentMoney;
+				lastIncome = cashPerMin;
+			}
+		}
 		moneyWin->winHide(FALSE);
 		powerWin->winHide(FALSE);
 	}
@@ -1781,7 +1919,7 @@ void InGameUI::update( void )
 		moneyWin->winHide(TRUE);
 		powerWin->winHide(TRUE);
 	}
-	
+
 	// Update the floating Text;
 	updateFloatingText();
 
@@ -1797,30 +1935,34 @@ void InGameUI::update( void )
 		layout->runUpdate();
 	}
 
-	//Handle keyboard camera rotations
-	if( m_cameraRotatingLeft && !m_cameraRotatingRight )
-	{
-		//Keyboard rotate left
-		TheTacticalView->setAngle( TheTacticalView->getAngle() - TheGlobalData->m_keyboardCameraRotateSpeed );
-	}
-	if( m_cameraRotatingRight && !m_cameraRotatingLeft )
-	{
-		//Keyboard rotate right
-		TheTacticalView->setAngle( TheTacticalView->getAngle() + TheGlobalData->m_keyboardCameraRotateSpeed );
-	}
-	if( m_cameraZoomingIn && !m_cameraZoomingOut )
+	if (m_cameraRotatingLeft || m_cameraRotatingRight || m_cameraZoomingIn || m_cameraZoomingOut)
 	{
-		//Keyboard zoom in
-		TheTacticalView->zoomIn();
-	}
-	if( m_cameraZoomingOut && !m_cameraZoomingIn )
-	{
-		//Keyboard zoom out
-		TheTacticalView->zoomOut();
+		// TheSuperHackers @tweak The camera rotation and zoom are now decoupled from the render update.
+		const Real fpsRatio = TheFramePacer->getBaseOverUpdateFpsRatio();
+		const Real rotateAngle = TheGlobalData->m_keyboardCameraRotateSpeed * fpsRatio;
+		const Real zoomHeight = (Real)View::ZoomHeightPerSecond * fpsRatio;
+
+		if( m_cameraRotatingLeft && !m_cameraRotatingRight )
+		{
+			TheTacticalView->setAngle( TheTacticalView->getAngle() - rotateAngle );
+		}
+		else if( m_cameraRotatingRight && !m_cameraRotatingLeft )
+		{
+			TheTacticalView->setAngle( TheTacticalView->getAngle() + rotateAngle );
+		}
+
+		if( m_cameraZoomingIn && !m_cameraZoomingOut )
+		{
+			TheTacticalView->zoom( -zoomHeight );
+		}
+		else if( m_cameraZoomingOut && !m_cameraZoomingIn )
+		{
+			TheTacticalView->zoom( +zoomHeight );
+		}
 	}
 
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 void InGameUI::registerWindowLayout( WindowLayout *layout )
@@ -1868,6 +2010,9 @@ void InGameUI::reset( void )
 	// free any message resources allocated
 	freeMessageResources();
 
+	// refresh custom ui strings - this will create the strings if required and update the fonts
+	refreshCustomUiResources();
+
 	Int i;
 	for (i=0; i<MAX_PLAYER_COUNT; ++i)
 	{
@@ -1892,13 +2037,13 @@ void InGameUI::reset( void )
 	m_namedTimers.clear();
 	m_namedTimerLastFlashFrame = 0;
 	m_namedTimerUsedFlashColor = TRUE; // so next one is false
-	m_showNamedTimers = TRUE;
+	showNamedTimerDisplay(true);
 
 	removeMilitarySubtitle();
 	clearPopupMessageData();
 	m_superweaponLastFlashFrame = 0;
 	m_superweaponUsedFlashColor = TRUE; // so next one is false
-	m_superweaponHiddenByScript = FALSE;
+	setSuperweaponDisplayEnabledByScript(true);
 
 	clearFloatingText();
 	clearWorldAnimations();
@@ -1911,21 +2056,29 @@ void InGameUI::reset( void )
 		m_moveHint[ i ].sourceID = 0;
 		m_moveHint[ i ].frame = 0;
 
-	}  //  end for i
+	}
+
+	setClientQuiet(false);
+	setWaypointMode(false);
+	setForceMoveMode(false);
+	setForceAttackMode(false);
+	setPreferSelectionMode(false);
+	clearAttackMoveToMode();
+
+	// TheSuperHackers @bugfix Disable all camera interactions to prevent them getting stuck after game end.
+	setScrolling(false);
+	setSelecting(false);
+	setCameraRotateLeft(false);
+	setCameraRotateRight(false);
+	setCameraZoomIn(false);
+	setCameraZoomOut(false);
 
-	m_waypointMode			= false;
-	m_forceAttackMode		= false;
-	m_forceMoveToMode		= false;
-	m_attackMoveToMode	= false;
-	m_preferSelection		= false;
-	m_clientQuiet    = false;
-	
 	m_windowLayouts.clear();
 
 	m_tooltipsDisabledUntil = 0;
 
 	UpdateDiplomacyBriefingText(AsciiString::TheEmptyString, TRUE);
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Free any resources we used for our messages */
@@ -1949,9 +2102,25 @@ void InGameUI::freeMessageResources( void )
 		// set timestamp to zero
 		m_uiMessages[ i ].timestamp = 0;
 
-	}  // end for i
+	}
 
-}  // end freeMessageResources
+}
+
+void InGameUI::freeCustomUiResources( void )
+{
+	TheDisplayStringManager->freeDisplayString(m_networkLatencyString);
+	m_networkLatencyString = NULL;
+	TheDisplayStringManager->freeDisplayString(m_renderFpsString);
+	m_renderFpsString = NULL;
+	TheDisplayStringManager->freeDisplayString(m_renderFpsLimitString);
+	m_renderFpsLimitString = NULL;
+	TheDisplayStringManager->freeDisplayString(m_systemTimeString);
+	m_systemTimeString = NULL;
+	TheDisplayStringManager->freeDisplayString(m_gameTimeString);
+	m_gameTimeString = NULL;
+	TheDisplayStringManager->freeDisplayString(m_gameTimeFrameString);
+	m_gameTimeFrameString = NULL;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Same as the unicode message method, but this takes an ascii string which is assumed
@@ -1983,7 +2152,21 @@ void InGameUI::message( AsciiString stringManagerLabel, ... )
 	{
 		DEBUG_CRASH(("InGameUI::message failed with code:%d", result));
 	}
-}  // end 
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void InGameUI::messageNoFormat( const UnicodeString& message )
+{
+	addMessageText( message, NULL );
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void InGameUI::messageNoFormat( const RGBColor *rgbColor, const UnicodeString& message )
+{
+	addMessageText( message, rgbColor );
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Interface for display text messages to the user */
@@ -2010,7 +2193,7 @@ void InGameUI::message( UnicodeString format, ... )
 	{
 		DEBUG_CRASH(("InGameUI::message failed with code:%d", result));
 	}
-}  // end message
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Interface for display text messages to the user */
@@ -2037,7 +2220,7 @@ void InGameUI::messageColor( const RGBColor *rgbColor, UnicodeString format, ...
 	{
 		DEBUG_CRASH(("InGameUI::messageColor failed with code:%d", result));
 	}
-}  // end message
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2072,10 +2255,10 @@ void InGameUI::addMessageText( const UnicodeString& formattedMessage, const RGBC
 	m_uiMessages[ 0 ].fullText = formattedMessage;
 	m_uiMessages[ 0 ].timestamp = TheGameLogic->getFrame();
 	m_uiMessages[ 0 ].displayString = TheDisplayStringManager->newDisplayString();
-	m_uiMessages[ 0 ].displayString->setFont( TheFontLibrary->getFont( m_messageFont, 
+	m_uiMessages[ 0 ].displayString->setFont( TheFontLibrary->getFont( m_messageFont,
 																						TheGlobalLanguageData->adjustFontSize(m_messagePointSize), m_messageBold ) );
 	m_uiMessages[ 0 ].displayString->setText( m_uiMessages[ 0 ].fullText );
-	
+
 	//
 	// assign a color for this string instance that will stay with it no matter what
 	// line it is rendered on
@@ -2085,7 +2268,7 @@ void InGameUI::addMessageText( const UnicodeString& formattedMessage, const RGBC
 	else
 		m_uiMessages[ 0 ].color = color2;
 
-}  // end addFormattedMessage
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove the message on screen at index i */
@@ -2099,7 +2282,7 @@ void InGameUI::removeMessageAtIndex( Int i )
 	m_uiMessages[ i ].displayString = NULL;
 	m_uiMessages[ i ].timestamp = 0;
 
-}  // end removeMessageAtIndex
+}
 
 //-------------------------------------------------------------------------------------------------
 /** An area selection is occurring, start graphical "hint". */
@@ -2131,7 +2314,7 @@ void InGameUI::createMoveHint( const GameMessage *msg )
 				m_moveHint[ i ].frame != 0 )
 			expireHint( MOVE_HINT, i );
 
-		
+
 	if( getSelectCount() == 1 )
 	{
 		Drawable *draw = getFirstSelectedDrawable();
@@ -2145,7 +2328,7 @@ void InGameUI::createMoveHint( const GameMessage *msg )
 
 	m_moveHint[ m_nextMoveHint ].frame = TheGameClient->getFrame();
 	m_moveHint[ m_nextMoveHint ].pos = msg->getArgument( 0 )->location;
-		
+
 	m_nextMoveHint++;
 
 	// wrap around
@@ -2181,7 +2364,7 @@ void InGameUI::createGarrisonHint( const GameMessage *msg )
 	}
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 #define AI_DEBUG_TOOLTIPS		1
 
 #ifdef AI_DEBUG_TOOLTIPS
@@ -2190,7 +2373,7 @@ void InGameUI::createGarrisonHint( const GameMessage *msg )
 #include "GameLogic/AIPathfind.h"
 #endif // AI_DEBUG_TOOLTIPS
 
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // defined(RTS_DEBUG)
 
 //-------------------------------------------------------------------------------------------------
 /** Details of what is mouse hovered over right now are in this message.  Terrain might result
@@ -2214,7 +2397,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 			underWindow = false;
 			break;
 		}
-		
+
 		// check to see if it or any of its parents are opaque.  If so, we can't select anything.
 		if (!BitIsSet( window->winGetStatus(), WIN_STATUS_SEE_THRU ))
 		{
@@ -2240,7 +2423,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 		const Object *obj = draw ? draw->getObject() : NULL;
 		if( obj )
 		{
-			
+
  			//Ahh, here is a wierd exception: if the moused-over drawable is a mob-member
 			//(e.g. AngryMob), Lets fool the UI into creating the hint for the NEXUS instead...
  			if (obj->isKindOf( KINDOF_IGNORED_IN_GUI ))
@@ -2262,7 +2445,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
  			else
  				m_mousedOverDrawableID = draw->getID();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //Extra hacky, sorry, but I need to use this in constantdebug report
+#if defined(RTS_DEBUG) //Extra hacky, sorry, but I need to use this in constantdebug report
 			if ( TheGlobalData->m_constantDebugUpdate == TRUE )
 				m_mousedOverDrawableID = draw->getID();
 #endif
@@ -2324,13 +2507,13 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 				AsciiString objName = obj->getName();
 				AsciiString teamName;
 				AsciiString stateName;
-				
+
 				AIUpdateInterface *ai = (AIUpdateInterface*)obj->getAI();
 				if (ai) {
 					if (ai->getPath()) {
 						TheAI->pathfinder()->setDebugPath(ai->getPath());
 					}
-#ifdef STATE_MACHINE_DEBUG	
+#ifdef STATE_MACHINE_DEBUG
 					stateName = ai->getCurrentStateName();
 					if (ai->getAttackInfo()) {
 						stateName.concat(" AttackPriority=");
@@ -2385,7 +2568,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 				else
 					tooltip = str;
 
-				Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+				const Int localPlayerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
 
 				Int x, y;
 				ThePartitionManager->worldToCell(obj->getPosition()->x, obj->getPosition()->y, &x, &y);
@@ -2400,7 +2583,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 					{
 						rgb.setFromInt(draw->getObject()->getIndicatorColor());
 
-						// Unless this is a stealth garrisoned building, 
+						// Unless this is a stealth garrisoned building,
 						// Let's not use the contained's housecolor
 						const Object *obj = draw->getObject();
 						if ( obj )
@@ -2434,16 +2617,16 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 
 	if (oldID != m_mousedOverDrawableID)
 	{
-		//DEBUG_LOG(("Resetting tooltip delay\n"));
+		//DEBUG_LOG(("Resetting tooltip delay"));
 		TheMouse->resetTooltipDelay();
 	}
 
-	if (m_mouseMode == MOUSEMODE_DEFAULT && !m_isScrolling && !m_isSelecting && !TheInGameUI->getSelectCount() && (TheRecorder->getMode() != RECORDERMODETYPE_PLAYBACK || TheLookAtTranslator->hasMouseMovedRecently()))
+	if (m_mouseMode == MOUSEMODE_DEFAULT && !m_isScrolling && !m_isSelecting && !getSelectCount() && (TheRecorder->getMode() != RECORDERMODETYPE_PLAYBACK || TheLookAtTranslator->hasMouseMovedRecently()))
 	{
 		if( m_mousedOverDrawableID != INVALID_DRAWABLE_ID )
 		{
 			Drawable *draw = TheGameClient->findDrawableByID(m_mousedOverDrawableID);
-			
+
 			//Add basic logic to determine if we can select a unit (or hint)
 			const Object *obj = draw ? draw->getObject() : NULL;
 			Bool drawSelectable = CanSelectDrawable(draw, FALSE);
@@ -2487,8 +2670,8 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 	if( draw && (t == GameMessage::MSG_DO_ATTACK_OBJECT_HINT || t == GameMessage::MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT) )
 	{
 		const Object* obj = draw->getObject();
-		Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+		const Int localPlayerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
+#if ENABLE_CONFIGURABLE_SHROUD
 		ObjectShroudStatus ss = (!obj || !TheGlobalData->m_shroudOn) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex);
 #else
 		ObjectShroudStatus ss = (!obj) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex);
@@ -2514,7 +2697,7 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 			underWindow = false;
 			break;
 		}
-		
+
 		// check to see if it or any of its parents are opaque.  If so, we can't select anything.
 		if (!BitIsSet( window->winGetStatus(), WIN_STATUS_SEE_THRU ))
 		{
@@ -2544,7 +2727,7 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 	switch (m_mouseMode)
 	{
 		case MOUSEMODE_DEFAULT:
-			{ 
+			{
 				// This section of code only gets called when there is no specific cursor mode happening.
 				if (underWindow || (srcObj && !srcObj->isLocallyControlled()))
 				{
@@ -2559,12 +2742,9 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 							setMouseCursor( Mouse::GENERIC_INVALID );
 						else if( drawSelectable && obj->isLocallyControlled() && !obj->isKindOf(KINDOF_MINE))
 							setMouseCursor( Mouse::SELECTING );
-						else if( TheRadar->isRadarWindow( window ) &&
-										 TheRadar->isRadarForced() == FALSE &&
-										 (TheRadar->isRadarHidden() || 
-										 ThePlayerList->getLocalPlayer()->hasRadar() == FALSE) )
+						else if( TheRadar->isRadarWindow( window ) && !rts::localPlayerHasRadar() )
 							setMouseCursor( Mouse::ARROW );
-						else 
+						else
 							setMouseCursor( Mouse::MOVETO );
 						break;
 					}
@@ -2603,7 +2783,7 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 						break;
 					case GameMessage::MSG_RESUME_CONSTRUCTION_HINT:
 						setMouseCursor( Mouse::RESUME_CONSTRUCTION );
-						break;				
+						break;
 					case GameMessage::MSG_ENTER_HINT:
 						setMouseCursor( Mouse::ENTER_FRIENDLY );
 						break;
@@ -2677,12 +2857,12 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 				// set the mouse cursor for commands that need a targeting or to normal with no command
 				if( m_pendingGUICommand )
 				{
-					if( m_pendingGUICommand->isContextCommand() || 
+					if( m_pendingGUICommand->isContextCommand() ||
 							m_pendingGUICommand->getCommandType() == GUI_COMMAND_SPECIAL_POWER ||
 							m_pendingGUICommand->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_COMMAND_CENTER )
 					{
 						//Here is the hook for when we are in a context sensitive command mode. We can
-						//either do the specified command mode command or nothing! Whether or not the 
+						//either do the specified command mode command or nothing! Whether or not the
 						//command is valid or not was determined in evaluateContextCommand which is
 						//called first, and posts the appropriate message.
 						AsciiString cursorName;	// empty by default
@@ -2753,7 +2933,6 @@ void InGameUI::setScrolling( Bool isScrolling )
 
 	if (isScrolling)
 	{
-		TheMouse->capture();
 		setMouseCursor( Mouse::SCROLL );
 
 		// break any camera locks
@@ -2763,7 +2942,6 @@ void InGameUI::setScrolling( Bool isScrolling )
 	else
 	{
 		setMouseCursor( Mouse::ARROW );
-		TheMouse->releaseCapture();
 	}
 
 	m_isScrolling = isScrolling;
@@ -2834,17 +3012,17 @@ void InGameUI::setGUICommand( const CommandButton *command )
 		if( BitIsSet( command->getOptions(), COMMAND_OPTION_NEED_TARGET ) == FALSE )
 		{
 
-			DEBUG_ASSERTCRASH( 0, ("setGUICommand: Command '%s' does not need additional user interaction\n",	
+			DEBUG_ASSERTCRASH( 0, ("setGUICommand: Command '%s' does not need additional user interaction",
 														command->getName().str()) );
 			m_pendingGUICommand = NULL;
 			m_mouseMode = MOUSEMODE_DEFAULT;
 			return;
 
-		}  // end if
+		}
 
 		m_mouseMode = MOUSEMODE_GUI_COMMAND;
 
-	}  // end if
+	}
 	else
 	{
 		m_mouseMode = MOUSEMODE_DEFAULT;
@@ -2875,7 +3053,7 @@ void InGameUI::setGUICommand( const CommandButton *command )
 
 	m_mouseModeCursor = TheMouse->getMouseCursor();
 
-}  // end setGUICommand
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the pending gui command */
@@ -2885,7 +3063,7 @@ const CommandButton *InGameUI::getGUICommand( void ) const
 
 	return m_pendingGUICommand;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Destroy any drawables we have in our placement icon array and set to NULL */
@@ -2897,20 +3075,20 @@ void InGameUI::destroyPlacementIcons( void )
 	for( i = 0; i < TheGlobalData->m_maxLineBuildObjects; ++i )
 	{
 
-		if( m_placeIcon[ i ] ) 
+		if( m_placeIcon[ i ] )
 		{
 			TheTerrainVisual->removeFactionBibDrawable(m_placeIcon[ i ]);
 			TheGameClient->destroyDrawable( m_placeIcon[ i ] );
 		}
 		m_placeIcon[ i ] = NULL;
 
-	}  // end for i
+	}
 	TheTerrainVisual->removeAllBibs();
 
-}  // end destroyPlacementIcons
+}
 
 //-------------------------------------------------------------------------------------------------
-/** User has clicked on a built item that requires placement in the world.  We will 
+/** User has clicked on a built item that requires placement in the world.  We will
 	* record what that thing is so that the we can catch the next click in the world
 	* and try to place the object there */
 //-------------------------------------------------------------------------------------------------
@@ -2935,7 +3113,7 @@ void InGameUI::placeBuildAvailable( const ThingTemplate *build, Drawable *buildD
 	// place something, it is overwritten
 	//
 	m_pendingPlaceType = build;
-	
+
 	//Keep the prev pending place for left click deselection prevention in alternate mouse mode.
 	//We want to keep our dozer selected after initiating construction.
 	setPreventLeftClickDeselectionInAlternateMouseModeForOneClick( m_pendingPlaceSourceObjectID != INVALID_ID );
@@ -2962,9 +3140,6 @@ void InGameUI::placeBuildAvailable( const ThingTemplate *build, Drawable *buildD
 
 			Drawable *draw;
 
-			// capture the mouse for our window, windows is lame and changes it if we don't
-			TheMouse->capture();
-
 			// hack for changing cursor
 			setMouseCursor( Mouse::CROSS );
 
@@ -2972,8 +3147,12 @@ void InGameUI::placeBuildAvailable( const ThingTemplate *build, Drawable *buildD
 			///@ todo when message stream order more formalized eliminate this
 //			TheInGameUI->deselectAllDrawables();
 
-			// create a drawble of what we are building to be "attached" at the cursor
-			draw = TheThingFactory->newDrawable( build, DRAWABLE_STATUS_NO_STATE_PARTICLES );
+			{
+				// create a drawable of what we are building to be "attached" at the cursor
+				UnsignedInt drawableStatus = DRAWABLE_STATUS_NO_STATE_PARTICLES;
+				drawableStatus |= TheGlobalData->m_objectPlacementShadows ? DRAWABLE_STATUS_SHADOWS : 0;
+				draw = TheThingFactory->newDrawable( build, drawableStatus );
+			}
 			if (sourceObject)
 			{
 				if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
@@ -2981,7 +3160,7 @@ void InGameUI::placeBuildAvailable( const ThingTemplate *build, Drawable *buildD
 				else
 					draw->setIndicatorColor(sourceObject->getControllingPlayer()->getPlayerColor());
 			}
-			DEBUG_ASSERTCRASH( draw, ("Unable to create icon at cursor for placement '%s'\n",
+			DEBUG_ASSERTCRASH( draw, ("Unable to create icon at cursor for placement '%s'",
 												 build->getName().str()) );
 
 			//
@@ -2991,20 +3170,17 @@ void InGameUI::placeBuildAvailable( const ThingTemplate *build, Drawable *buildD
 			//
 			Real angle = build->getPlacementViewAngle();
 
-			// don't forget to take into account the current view angle
-			// angle += TheTacticalView->getAngle();	Don't do this - makes odd angled building placements.  jba.
-
 			// set the angle in the icon we just created
 			draw->setOrientation( angle );
 
 			// set the build icon attached to the cursor to be "see-thru"
-			draw->setDrawableOpacity( placementOpacity );
+			draw->setDrawableOpacity( TheGlobalData->m_objectPlacementOpacity );
 
 			// set the "icon" in the icon array at the first index
 			DEBUG_ASSERTCRASH( m_placeIcon[ 0 ] == NULL, ("placeBuildAvailable, build icon array is not empty!") );
-			m_placeIcon[ 0 ] = draw;	
+			m_placeIcon[ 0 ] = draw;
 
-		}  // end if
+		}
 		else
 		{
 			if (m_mouseMode == MOUSEMODE_BUILD_PLACE)
@@ -3013,18 +3189,17 @@ void InGameUI::placeBuildAvailable( const ThingTemplate *build, Drawable *buildD
 				m_mouseModeCursor = Mouse::ARROW;
 			}
 
-			TheMouse->releaseCapture();
 			setMouseCursor( Mouse::ARROW );
 			setPlacementStart( NULL );
 
 			// if we have a place icons destroy them
 			destroyPlacementIcons();
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
-}  // end placeBuildAvailable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return the thing we're attempting to place */
@@ -3041,7 +3216,7 @@ ObjectID InGameUI::getPendingPlaceSourceObjectID( void )
 
 	return m_pendingPlaceSourceObjectID;
 
-}  // end getPendingPlaceSourceObjectID
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Start the angle selection interface for selecting building angles when placing them */
@@ -3057,11 +3232,11 @@ void InGameUI::setPlacementStart( const ICoord2D *start )
 		m_placeAnchorEnd = *start;
 		m_placeAnchorInProgress = TRUE;
 
-	}  // end if
+	}
 	else
 		m_placeAnchorInProgress = FALSE;
 
-}  // end setPlacementStart
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the end anchor for the angle build interface */
@@ -3072,7 +3247,7 @@ void InGameUI::setPlacementEnd( const ICoord2D *end )
 	if( end )
 		m_placeAnchorEnd = *end;
 
-}  // end setPlacementEnd
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is the angle selection interface for placing building at angles up? */
@@ -3082,7 +3257,7 @@ Bool InGameUI::isPlacementAnchored( void )
 
 	return m_placeAnchorInProgress;
 
-}  // end isPlacementAnchored
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the start and end anchor points for the building angle selection interface */
@@ -3095,7 +3270,7 @@ void InGameUI::getPlacementPoints( ICoord2D *start, ICoord2D *end )
 	if( end )
 		*end = m_placeAnchorEnd;
 
-}  // end getPlacementPoints
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return the angle of the drawable at the cursor if any */
@@ -3108,7 +3283,7 @@ Real InGameUI::getPlacementAngle( void )
 
 	return 0.0f;
 
-}  // end getPlacementAngle
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Mark given Drawable as "selected". */
@@ -3127,7 +3302,7 @@ void InGameUI::selectDrawable( Drawable *draw )
 		m_selectedDrawables.push_front( draw );
 
 		// we now have one more selected drawable
-		incrementSelectCount(); 
+		incrementSelectCount();
 
 
 		// evaluate whether our selection consists of exactly one angry mob
@@ -3136,9 +3311,9 @@ void InGameUI::selectDrawable( Drawable *draw )
 		// the control needs to update its context sensitive display now
 		TheControlBar->onDrawableSelected( draw );
 
-	}  // end if
+	}
 
-}  // end selectDrawable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Clear "selected" status of Drawable. */
@@ -3154,20 +3329,20 @@ void InGameUI::deselectDrawable( Drawable *draw )
 		draw->friend_clearSelected();
 
 		// find the drawable entry in our list
-		DrawableListIt findIt = std::find( m_selectedDrawables.begin(), 
-																			 m_selectedDrawables.end(), 
+		DrawableListIt findIt = std::find( m_selectedDrawables.begin(),
+																			 m_selectedDrawables.end(),
 																			 draw );
 
 		// sanity
 		DEBUG_ASSERTCRASH( findIt != m_selectedDrawables.end(),
-											 ("deselectDrawable: Drawable not found in the selected drawable list '%s'\n",
+											 ("deselectDrawable: Drawable not found in the selected drawable list '%s'",
 											 draw->getTemplate()->getName().str()) );
 
-		// remove it from the selected drawable list		
+		// remove it from the selected drawable list
 		m_selectedDrawables.erase( findIt );
 
 		// keep out own internal count happy
-		decrementSelectCount(); 
+		decrementSelectCount();
 
 		// evaluate whether our selection consists of exactly one angry mob
 		evaluateSoloNexus();
@@ -3175,16 +3350,16 @@ void InGameUI::deselectDrawable( Drawable *draw )
 		// the control needs to update its context sensitive display now
 		TheControlBar->onDrawableDeselected( draw );
 
-	}  // end if
+	}
 
-}  // end deselectDrawable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Clear all drawables' "select" status */
 //-------------------------------------------------------------------------------------------------
 void InGameUI::deselectAllDrawables( Bool postMsg )
 {
-	const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
+	const DrawableList *selected = getAllSelectedDrawables();
 
 	// loop through all the selected drawables
 	for ( DrawableListCIt it = selected->begin(); it != selected->end(); )
@@ -3194,9 +3369,9 @@ void InGameUI::deselectAllDrawables( Bool postMsg )
 		Drawable* draw = *it++;
 
 		// do the deselection
-		TheInGameUI->deselectDrawable( draw );
+		deselectDrawable( draw );
 
-	}  // end while
+	}
 
 	// keep our list all tidy
 	m_selectedDrawables.clear();
@@ -3257,7 +3432,7 @@ Drawable *InGameUI::getFirstSelectedDrawable( void )
 
 	return m_selectedDrawables.front();
 
-}  // end getFirstSelectedDrawable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return true if the selected ID is in the drawable list */
@@ -3265,17 +3440,32 @@ Drawable *InGameUI::getFirstSelectedDrawable( void )
 Bool InGameUI::isDrawableSelected( DrawableID idToCheck ) const
 {
 
-	for( DrawableListCIt it = m_selectedDrawables.begin(); it != m_selectedDrawables.end(); ++it ) 
+	for( DrawableListCIt it = m_selectedDrawables.begin(); it != m_selectedDrawables.end(); ++it )
 	{
 
 		if( (*it)->getID() == idToCheck )
 			return TRUE;
 
-	}  // end for
+	}
 
 	return FALSE;
 
-}  // end isDrawableSelected
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Return true if all of the given objects are selected */
+//-------------------------------------------------------------------------------------------------
+Bool InGameUI::areAllObjectsSelected(const std::vector<Object*>& objectsToCheck) const
+{
+	for (std::vector<Object*>::const_iterator it = objectsToCheck.begin(); it != objectsToCheck.end(); ++it)
+	{
+		if (!(*it)->getDrawable()->isSelected())
+			return FALSE;
+	}
+
+	return TRUE;
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -3295,11 +3485,11 @@ Bool InGameUI::isAnySelectedKindOf( KindOfType kindOf ) const
 		if( draw && draw->isKindOf( kindOf ) )
 			return TRUE;
 
-	}  // end for, it
+	}
 
 	return FALSE;  // no selected objects are of the kind of type
 
-}  // end isAnySelectedKindOf
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -3319,11 +3509,11 @@ Bool InGameUI::isAllSelectedKindOf( KindOfType kindOf ) const
 		if( draw && draw->isKindOf( kindOf ) == FALSE )
 			return FALSE;  // not all objects are of the kind of type
 
-	}  // end for, it
+	}
 
 	return TRUE;  // all objects have this kindof bit set in them
 
-}  // end isAllSelectedKindOf
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the input enabled/disabled */
@@ -3332,11 +3522,11 @@ void InGameUI::setInputEnabled( Bool enable )
 {
 	if(!enable)
 		setSelecting( FALSE );
-	
+
 	Bool wasEnabled = m_inputEnabled;
 
 	m_inputEnabled = enable;
-	
+
 	if (wasEnabled && !enable)
 	{
 		/*
@@ -3365,8 +3555,37 @@ void InGameUI::disregardDrawable( Drawable *draw )
 {
 
 	// make sure drawable is no longer selected
-	deselectDrawable( draw );		
+	deselectDrawable( draw );
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** This is called after the WindowManager has drawn the menus. */
+//-------------------------------------------------------------------------------------------------
+void InGameUI::postWindowDraw( void )
+{
+	Int hudOffsetX = 0;
+	Int hudOffsetY = 0;
 
+	if (m_networkLatencyPointSize > 0 && TheGameLogic->isInMultiplayerGame())
+	{
+		drawNetworkLatency(hudOffsetX, hudOffsetY);
+	}
+
+	if (m_renderFpsPointSize > 0)
+	{
+		drawRenderFps(hudOffsetX, hudOffsetY);
+	}
+
+	if (m_systemTimePointSize > 0)
+	{
+		drawSystemTime(hudOffsetX, hudOffsetY);
+	}
+
+	if ( (m_gameTimePointSize > 0) && !TheGameLogic->isInShellGame() && TheGameLogic->isInGame() )
+	{
+		drawGameTime();
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -3398,14 +3617,16 @@ void InGameUI::postDraw( void )
 				m_uiMessages[ i ].displayString->draw( x, y, m_uiMessages[ i ].color, dropColor );
 
 				// increment text spot to next location
-				GameFont *font = m_uiMessages[ i ].displayString->getFont();
-				y += font->height;
+				if (GameFont *font = m_uiMessages[ i ].displayString->getFont())
+				{
+					y += font->height;
+				}
 
-			}  //end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 
 	if( m_militarySubtitle )
 	{
@@ -3439,9 +3660,9 @@ void InGameUI::postDraw( void )
 //	Int superweaponCount = 0;
 		Int startX = (Int)(m_superweaponPosition.x * TheDisplay->getWidth());
 		Int startY = (Int)(m_superweaponPosition.y * TheDisplay->getHeight());
-		
-		Int bottomMargin = (Int)( (Real)TheTacticalView->getHeight() * 0.82f ); 
-			
+
+		Int bottomMargin = (Int)( (Real)TheTacticalView->getHeight() * 0.82f );
+
 
 
 		Bool marginExceeded = FALSE;
@@ -3456,7 +3677,7 @@ void InGameUI::postDraw( void )
 			{
 				if ( marginExceeded )
 					break;
-				
+
 				AsciiString templateName = mapIt->first;
 				for (SuperweaponList::iterator listIt = mapIt->second.begin(); listIt != mapIt->second.end(); ++listIt)
 				{
@@ -3475,7 +3696,7 @@ void InGameUI::postDraw( void )
 							info->setText( ellipsis, ellipsis );
 							info->setFont( m_superweaponReadyFont, m_superweaponNormalPointSize, m_superweaponNormalBold );
 							info->drawTime( startX,	startY, m_superweaponFlashColor, bgColor );
-							
+
 							marginExceeded = TRUE;
 							break;
 						}
@@ -3483,7 +3704,7 @@ void InGameUI::postDraw( void )
 						Object * owningObject = TheGameLogic->findObjectByID(info->m_id);
 						if (owningObject)
 						{
-							
+
 							// We don't draw our timers until we are finished with construction.
 							// It is important that let the SpecialPowerUpdate is add its timer in its contructor,,
 							// since the science for it could be added before construction is finished,
@@ -3497,15 +3718,15 @@ void InGameUI::postDraw( void )
 								// found one - draw it
  								Bool isReady = module->isReady();
  								Int readySecs;
- 
-								// IsReady includes disabledness, so if you have a 0 timer disabled super, you don't want 
+
+								// IsReady includes disabledness, so if you have a 0 timer disabled super, you don't want
  								// the UnsignedInt to wrap around to hundreds of millions of seconds.
  								if( module->getReadyFrame() < TheGameLogic->getFrame() )
 									readySecs = 0;
- 								else 
+ 								else
  									readySecs = (module->getReadyFrame() - TheGameLogic->getFrame()) / LOGICFRAMES_PER_SECOND;
 								// Yes, integer math.  We can't have float imprecision display 4:01 on a disabled superweapon.
- 
+
  								// Similarly, only checking timers is not truly indicitive of readyness.
  								Bool changeBolding = (readySecs != info->m_timestamp) || (isReady != info->m_ready) || info->m_forceUpdateText;
  								if (changeBolding)
@@ -3523,7 +3744,7 @@ void InGameUI::postDraw( void )
 											info->setFont( m_superweaponNormalFont, m_superweaponNormalPointSize, m_superweaponNormalBold );
 										}
 									}
-									
+
 									info->m_forceUpdateText = false;
  									info->m_ready = isReady;
 									info->m_timestamp = readySecs;
@@ -3613,7 +3834,7 @@ void InGameUI::postDraw( void )
 					if (!readySecs && info->isCountdown)
 					{
 						// go bold - we're good to go
-						info->displayString->setFont( TheFontLibrary->getFont( m_namedTimerReadyFont, 
+						info->displayString->setFont( TheFontLibrary->getFont( m_namedTimerReadyFont,
 							TheGlobalLanguageData->adjustFontSize(m_namedTimerReadyPointSize), m_namedTimerReadyBold ) );
 					}
 					else
@@ -3621,7 +3842,7 @@ void InGameUI::postDraw( void )
 						// if we were at 0, we've just fired - kill the bold
 						if (info->timestamp == 0 || info->isCountdown)
 						{
-							info->displayString->setFont( TheFontLibrary->getFont( m_namedTimerNormalFont, 
+							info->displayString->setFont( TheFontLibrary->getFont( m_namedTimerNormalFont,
 								TheGlobalLanguageData->adjustFontSize(m_namedTimerNormalPointSize), m_namedTimerNormalBold ) );
 						}
 					}
@@ -3629,7 +3850,7 @@ void InGameUI::postDraw( void )
 					info->timestamp = readySecs;
 					Int min = readySecs/60;
 					Int sec = readySecs - min*60;
-					
+
 					if (!info->isCountdown)
 						line.format(L"%s %d", info->timerText.str(), framesLeft);
 					else
@@ -3672,7 +3893,7 @@ void InGameUI::postDraw( void )
 			}
 		}
 	}
-	
+
 	// draw RMB scroll anchor
 	if (TheLookAtTranslator && m_drawRMBScrollAnchor)
 	{
@@ -3690,7 +3911,7 @@ void InGameUI::postDraw( void )
 			TheDisplay->drawFillRect( anchor->x-w, anchor->y-h*r, w*2+1, h*2*r+1, mainColor );
 		}
 	}
-}  // end postDraw
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Expire a hint of the specified type with the corresponding hint index */
@@ -3708,7 +3929,7 @@ void InGameUI::expireHint( HintType type, UnsignedInt hintIndex )
 		m_moveHint[ hintIndex ].sourceID = 0;
 		m_moveHint[ hintIndex ].frame = 0;
 
-	}  // end if
+	}
 	else
 	{
 
@@ -3716,9 +3937,9 @@ void InGameUI::expireHint( HintType type, UnsignedInt hintIndex )
 		DEBUG_CRASH(("undefined hint type"));
 		return;
 
-	}  // end else
+	}
 
-}  // end expireHint
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create the control user interface GUI */
@@ -3726,16 +3947,16 @@ void InGameUI::expireHint( HintType type, UnsignedInt hintIndex )
 void InGameUI::createControlBar( void )
 {
 
-	TheWindowManager->winCreateFromScript( AsciiString("ControlBar.wnd") );
+	TheWindowManager->winCreateFromScript( "ControlBar.wnd" );
 	HideControlBar();
-/*	
+/*
 	// hide all windows created from this layout
 	GameWindow *window = TheWindowManager->winGetWindowList();
 	for( ; window; window = window->winGetPrev() )
 		window->winHide( TRUE );
 */
 
-}  // end createControlBar
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create the replay control GUI */
@@ -3743,16 +3964,16 @@ void InGameUI::createControlBar( void )
 void InGameUI::createReplayControl( void )
 {
 
-	m_replayWindow = TheWindowManager->winCreateFromScript( AsciiString("ReplayControl.wnd") );
+	m_replayWindow = TheWindowManager->winCreateFromScript( "ReplayControl.wnd" );
 
-/*	
+/*
 	// hide all windows created from this layout
 	GameWindow *window = TheWindowManager->winGetWindowList();
 	for( ; window; window = window->winGetPrev() )
 		window->winHide( TRUE );
 */
 
-}  // end createReplayControl
+}
 
 // ------------------------------------------------------------------------------------------------
 // InGameUI::playMovie
@@ -3772,8 +3993,8 @@ void InGameUI::playMovie( const AsciiString& movieName )
 	m_currentlyPlayingMovie = movieName;
 	m_videoBuffer = TheDisplay->createVideoBuffer();
 
-	if (	m_videoBuffer == NULL || 
-				!m_videoBuffer->allocate(	m_videoStream->width(), 
+	if (	m_videoBuffer == NULL ||
+				!m_videoBuffer->allocate(	m_videoStream->width(),
 													m_videoStream->height())
 		)
 	{
@@ -3826,15 +4047,15 @@ void InGameUI::playCameoMovie( const AsciiString& movieName )
 
 	m_cameoVideoBuffer = TheDisplay->createVideoBuffer();
 
-	if (	m_cameoVideoBuffer == NULL || 
-				!m_cameoVideoBuffer->allocate(	m_cameoVideoStream->width(), 
+	if (	m_cameoVideoBuffer == NULL ||
+				!m_cameoVideoBuffer->allocate(	m_cameoVideoStream->width(),
 													m_cameoVideoStream->height())
 		)
 	{
 		stopCameoMovie();
 		return;
 	}
-	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:RightHUD") ));
+	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:RightHUD" ));
 	WinInstanceData *winData = window->winGetInstanceData();
 	winData->setVideoBuffer(m_cameoVideoBuffer);
 //	window->winHide(FALSE);
@@ -3845,12 +4066,12 @@ void InGameUI::playCameoMovie( const AsciiString& movieName )
 void InGameUI::stopCameoMovie( void )
 {
 //RightHUD
-	//GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:CameoMovieWindow") ));
-	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:RightHUD") ));
+	//GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:CameoMovieWindow" ));
+	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:RightHUD" ));
 //	window->winHide(FALSE);
 	WinInstanceData *winData = window->winGetInstanceData();
 	winData->setVideoBuffer(NULL);
-	
+
 	delete m_cameoVideoBuffer;
 	m_cameoVideoBuffer = NULL;
 
@@ -3859,7 +4080,7 @@ void InGameUI::stopCameoMovie( void )
 		m_cameoVideoStream->close();
 		m_cameoVideoStream = NULL;
 	}
-	
+
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -3880,43 +4101,43 @@ void InGameUI::displayCantBuildMessage( LegalBuildCode lbc )
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_RESTRICTED_TERRAIN:
-			TheInGameUI->message( "GUI:CantBuildRestrictedTerrain" );
+			message( "GUI:CantBuildRestrictedTerrain" );
 			break;
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_NOT_FLAT_ENOUGH:
-			TheInGameUI->message( "GUI:CantBuildNotFlatEnough" );
+			message( "GUI:CantBuildNotFlatEnough" );
 			break;
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_OBJECTS_IN_THE_WAY:
-			TheInGameUI->message( "GUI:CantBuildObjectsInTheWay" );
+			message( "GUI:CantBuildObjectsInTheWay" );
 			break;
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_TOO_CLOSE_TO_SUPPLIES:
-			TheInGameUI->message( "GUI:CantBuildTooCloseToSupplies" );
+			message( "GUI:CantBuildTooCloseToSupplies" );
 			break;
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_NO_CLEAR_PATH:
-		  TheInGameUI->message( "GUI:CantBuildNoClearPath" );
+		  message( "GUI:CantBuildNoClearPath" );
 			break;
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_SHROUD:
-			TheInGameUI->message( "GUI:CantBuildShroud" );
+			message( "GUI:CantBuildShroud" );
 			break;
 
 		//---------------------------------------------------------------------------------------------
 		default:
 
-			TheInGameUI->message( "GUI:CantBuildThere" );
+			message( "GUI:CantBuildThere" );
 			break;
 
-	}  // end switch
+	}
 
-}  // end displayCantBuildMessage
+}
 
 // ------------------------------------------------------------------------------------------------
 // InGameUI::militarySubtitle
@@ -3943,12 +4164,12 @@ void InGameUI::militarySubtitle( const AsciiString& label, Int duration )
 	const int messageTimeout = currLogicFrame + (Int)(((Real)LOGICFRAMES_PER_SECOND * duration)/1000.0f);
 
 	// disable tooltips until this frame, cause we don't want to collide with the military subtitles.
-	TheInGameUI->disableTooltipsUntil(messageTimeout);
-	
+	disableTooltipsUntil(messageTimeout);
+
 	// calculate where this screen position should be since the position being passed in is based off 8x6
 	Coord2D multiplyer;
-	multiplyer.x = TheDisplay->getWidth() / 800;
-	multiplyer.y = TheDisplay->getHeight() / 600;
+	multiplyer.x = TheDisplay->getWidth() / (Real)DEFAULT_DISPLAY_WIDTH;
+	multiplyer.y = TheDisplay->getHeight() / (Real)DEFAULT_DISPLAY_HEIGHT;
 
 	// lets bring out the data structure!
 	m_militarySubtitle = NEW MilitarySubtitleData;
@@ -3967,7 +4188,7 @@ void InGameUI::militarySubtitle( const AsciiString& label, Int duration )
 	m_militarySubtitle->currentDisplayString = 0;
 	m_militarySubtitle->displayStrings[0] = TheDisplayStringManager->newDisplayString();
 	m_militarySubtitle->displayStrings[0]->reset();
-	m_militarySubtitle->displayStrings[0]->setFont(	TheFontLibrary->getFont( m_militaryCaptionTitleFont, 
+	m_militarySubtitle->displayStrings[0]->setFont(	TheFontLibrary->getFont( m_militaryCaptionTitleFont,
 		TheGlobalLanguageData->adjustFontSize(m_militaryCaptionTitlePointSize), m_militaryCaptionTitleBold ) );
 	m_militarySubtitle->color = GameMakeColor(m_militaryCaptionColor.red, m_militaryCaptionColor.green, m_militaryCaptionColor.blue, m_militaryCaptionColor.alpha);
 }
@@ -3981,7 +4202,7 @@ void InGameUI::removeMilitarySubtitle( void )
 	if(!m_militarySubtitle)
 		return;
 
-	TheInGameUI->clearTooltipsDisabled();
+	clearTooltipsDisabled();
 
 	// loop through and free up the display strings
 	for(UnsignedInt i = 0; i <= m_militarySubtitle->currentDisplayString; i ++)
@@ -4000,7 +4221,7 @@ void InGameUI::removeMilitarySubtitle( void )
 // ------------------------------------------------------------------------------------------------
 Bool InGameUI::areSelectedObjectsControllable() const
 {
-	const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
+	const DrawableList *selected = getAllSelectedDrawables();
 
 	// loop through all the selected drawables
 	const Drawable *draw;
@@ -4009,7 +4230,7 @@ Bool InGameUI::areSelectedObjectsControllable() const
 		// get this drawable
 		draw = *it;
 
-		// All selected objects will have the same local controller, so 
+		// All selected objects will have the same local controller, so
 		// simply return the first one.
 		return draw->getObject()->isLocallyControlled();
 	}
@@ -4024,12 +4245,12 @@ Bool InGameUI::areSelectedObjectsControllable() const
 void InGameUI::resetCamera()
 {
 	ViewLocation currentView;
-	TheTacticalView->getLocation( &currentView ); 
+	TheTacticalView->getLocation( &currentView );
 	TheTacticalView->resetCamera( &currentView.getPosition(), 1 );
 }
 
 //------------------------------------------------------------------------------
-//Checks to see if an object can interact with an object in a non-hostile manner. This is currently used by the selection 
+//Checks to see if an object can interact with an object in a non-hostile manner. This is currently used by the selection
 //translator to determine whether to do something to an object or select it instead based on the context of what is currently
 //selected.
 //------------------------------------------------------------------------------
@@ -4057,7 +4278,7 @@ CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const
 	}
 
 	// get selected list of drawables
-	const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
+	const DrawableList *selected = getAllSelectedDrawables();
 
 	// set up counters for rule checking
 	Int count = 0;
@@ -4068,7 +4289,7 @@ CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const
 	Drawable *other;
 	for( DrawableListCIt it = selected->begin(); it != selected->end(); ++it )
 	{
-	
+
 		// get this drawable
 		other = *it;
 		count++;
@@ -4078,7 +4299,7 @@ CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const
 			case ACTIONTYPE_ATTACK_OBJECT:
 			{
 				//additionalChecking is TRUE only if force attack mode is on.
-				CanAttackResult result = 	TheActionManager->getCanAttackObject( other->getObject(), objectToInteractWith, CMD_FROM_PLAYER, 
+				CanAttackResult result = 	TheActionManager->getCanAttackObject( other->getObject(), objectToInteractWith, CMD_FROM_PLAYER,
 									additionalChecking ? ATTACK_NEW_TARGET_FORCED : ATTACK_NEW_TARGET );
 
 				if( result > bestResult )
@@ -4114,12 +4335,12 @@ CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const
 			case ACTIONTYPE_MAKE_DEFECTOR:
 			case ACTIONTYPE_SET_RALLY_POINT:
 			default:
-				DEBUG_CRASH( ("Called InGameUI::getCanSelectedObjectsAttack() with actiontype %d. Only accepts attack types! Should you be calling InGameUI::canSelectedObjectsDoAction() instead?") );
+				DEBUG_CRASH( ("Called InGameUI::getCanSelectedObjectsAttack() with actiontype %d. Only accepts attack types! Should you be calling InGameUI::canSelectedObjectsDoAction() instead?", action) );
 				return ATTACKRESULT_INVALID_SHOT;
 
 		}
 
-	}  // end for
+	}
 
 	if( count > 0 )
 	{
@@ -4146,7 +4367,7 @@ Bool InGameUI::canSelectedObjectsDoAction( ActionType action, const Object *obje
 	}
 
 	// get selected list of drawables
-	const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
+	const DrawableList *selected = getAllSelectedDrawables();
 
 	// set up counters for rule checking
 	Int count = 0;
@@ -4156,7 +4377,7 @@ Bool InGameUI::canSelectedObjectsDoAction( ActionType action, const Object *obje
 	Drawable *other;
 	for( DrawableListCIt it = selected->begin(); it != selected->end(); ++it )
 	{
-	
+
 		// get this drawable
 		other = *it;
 		count++;
@@ -4181,7 +4402,7 @@ Bool InGameUI::canSelectedObjectsDoAction( ActionType action, const Object *obje
 					ContainModuleInterface *contain = objectToInteractWith->getContain();
 					if( contain && contain->isHealContain() )
 					{
-						//This container is only used for the purposes of healing and we cannot 
+						//This container is only used for the purposes of healing and we cannot
 						//enter it normally -- this is NOT a transport!
 						success = false;
 					}
@@ -4189,11 +4410,11 @@ Bool InGameUI::canSelectedObjectsDoAction( ActionType action, const Object *obje
 				break;
 			case ACTIONTYPE_REPAIR_OBJECT:
 			{
-				ObjectID currentRepairer = objectToInteractWith->getSoleHealingBenefactor(); 
-				success = ( TheActionManager->canRepairObject( other->getObject(), objectToInteractWith, CMD_FROM_PLAYER ) 
+				ObjectID currentRepairer = objectToInteractWith->getSoleHealingBenefactor();
+				success = ( TheActionManager->canRepairObject( other->getObject(), objectToInteractWith, CMD_FROM_PLAYER )
 										&& ( currentRepairer == INVALID_ID || currentRepairer == other->getObject()->getID() ) );
 											// unless someone else is already healing it...
-											// please note that this add'l test is left out of canRepairObject() since canRepairObject 
+											// please note that this add'l test is left out of canRepairObject() since canRepairObject
 											// gets called from within the Dozer/WorkerAIUpdates' stateMachines as they continue the repair process.
 											// This remains true.
 				break;
@@ -4258,7 +4479,7 @@ Bool InGameUI::canSelectedObjectsDoAction( ActionType action, const Object *obje
 
 			++qualify;
 		}
-	}  // end for
+	}
 
 	//If the rule is all must qualify, do the check now and return success
 	//only if all the selected units qualified.
@@ -4291,7 +4512,7 @@ Bool InGameUI::canSelectedObjectsDoSpecialPower( const CommandButton *command, c
 	}
 	if( doAtPosition && !position )
 	{
-		return false;		
+		return false;
 	}
 
 	// get selected list of drawables
@@ -4301,7 +4522,7 @@ Bool InGameUI::canSelectedObjectsDoSpecialPower( const CommandButton *command, c
 	if (ignoreSelDraw)
 		tmpList.push_back(ignoreSelDraw);
 
-	const DrawableList* selected = (tmpList.size() > 0) ? &tmpList : TheInGameUI->getAllSelectedDrawables();
+	const DrawableList* selected = (!tmpList.empty()) ? &tmpList : getAllSelectedDrawables();
 
 	// set up counters for rule checking
 	Int count = 0;
@@ -4310,7 +4531,7 @@ Bool InGameUI::canSelectedObjectsDoSpecialPower( const CommandButton *command, c
 	// loop through all the selected drawables
 	for( DrawableListCIt it = selected->begin(); it != selected->end(); ++it )
 	{
-	
+
 		// get this drawable
 		Drawable* other = *it;
 		count++;
@@ -4367,13 +4588,13 @@ Bool InGameUI::canSelectedObjectsOverrideSpecialPowerDestination( const Coord3D
 	Int qualify = 0;
 
 	// get selected list of drawables
-	const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
+	const DrawableList *selected = getAllSelectedDrawables();
 
 	// loop through all the selected drawables
 	Drawable *other;
 	for( DrawableListCIt it = selected->begin(); it != selected->end(); ++it )
 	{
-	
+
 		// get this drawable
 		other = *it;
 		count++;
@@ -4415,11 +4636,11 @@ Bool InGameUI::canSelectedObjectsEffectivelyUseWeapon( const CommandButton *comm
 	}
 	if( doAtPosition && !position )
 	{
-		return false;		
+		return false;
 	}
 
 	// get selected list of drawables
-	const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
+	const DrawableList *selected = getAllSelectedDrawables();
 
 	// set up counters for rule checking
 	Int count = 0;
@@ -4429,7 +4650,7 @@ Bool InGameUI::canSelectedObjectsEffectivelyUseWeapon( const CommandButton *comm
 	Drawable *other;
 	for( DrawableListCIt it = selected->begin(); it != selected->end(); ++it )
 	{
-	
+
 		// get this drawable
 		other = *it;
 		count++;
@@ -4548,7 +4769,7 @@ Int InGameUI::selectMatchingAcrossRegion( IRegion2D *region )
 	//std::set<AsciiString> drawableList;
 	std::set<const ThingTemplate*> drawableList;
 	Bool carBomb = FALSE;
-	
+
 	for( DrawableListCIt it = selected->begin(); it != selected->end(); ++it )
 	{
 		// get this drawable
@@ -4564,7 +4785,7 @@ Int InGameUI::selectMatchingAcrossRegion( IRegion2D *region )
 		}
 	}
 
-	if (drawableList.size() == 0)
+	if (drawableList.empty())
 		return -1; // nothing useful selected to begin with - don't bother iterating
 
 	std::set<const ThingTemplate*>::iterator iter;
@@ -4622,30 +4843,30 @@ Int InGameUI::selectMatchingAcrossRegion( IRegion2D *region )
 Int InGameUI::selectAllUnitsByTypeAcrossScreen(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear)
 {
 	/// When implementing this, obey TheInGameUI->getMaxSelectCount() if it is > 0
-			
+
 	IRegion2D region;
 	ICoord2D origin;
 	ICoord2D size;
- 
+
 	TheTacticalView->getOrigin( &origin.x, &origin.y );
 	size.x = TheTacticalView->getWidth();
 	size.y = TheTacticalView->getHeight();
- 
+
 	buildRegion( &origin, &size, &region );
 
 	Int numSelected = selectAllUnitsByTypeAcrossRegion(&region, mustBeSet, mustBeClear);
 	if (numSelected == -1)
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:NothingSelected" );
+		message( msgStr );
 	}
 	else if (numSelected == 0)
 	{
 	}
 	else
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossScreen" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:SelectedAcrossScreen" );
+		message( msgStr );
 	}
 	return numSelected;
 }
@@ -4656,30 +4877,30 @@ Int InGameUI::selectAllUnitsByTypeAcrossScreen(KindOfMaskType mustBeSet, KindOfM
 Int InGameUI::selectMatchingAcrossScreen( void )
 {
 	/// When implementing this, obey TheInGameUI->getMaxSelectCount() if it is > 0
-			
+
 	IRegion2D region;
 	ICoord2D origin;
 	ICoord2D size;
- 
+
 	TheTacticalView->getOrigin( &origin.x, &origin.y );
 	size.x = TheTacticalView->getWidth();
 	size.y = TheTacticalView->getHeight();
- 
+
 	buildRegion( &origin, &size, &region );
 
 	Int numSelected = selectMatchingAcrossRegion(&region);
 	if (numSelected == -1)
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:NothingSelected" );
+		message( msgStr );
 	}
 	else if (numSelected == 0)
 	{
 	}
 	else
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossScreen" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:SelectedAcrossScreen" );
+		message( msgStr );
 	}
 	return numSelected;
 }
@@ -4691,22 +4912,22 @@ Int InGameUI::selectAllUnitsByTypeAcrossMap(KindOfMaskType mustBeSet, KindOfMask
 	Int numSelected = selectAllUnitsByTypeAcrossRegion(NULL, mustBeSet, mustBeClear);
 	if (numSelected == -1)
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:NothingSelected" );
+		message( msgStr );
 	}
 	else if (numSelected == 0)
 	{
-		Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
+		Drawable *draw = getFirstSelectedDrawable();
 		if( !draw || !draw->getObject() || !draw->getObject()->isKindOf( KINDOF_STRUCTURE ) )
 		{
-			UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-			TheInGameUI->message( message );
+			UnicodeString msgStr = TheGameText->fetch( "GUI:SelectedAcrossMap" );
+			message( msgStr );
 		}
 	}
 	else
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:SelectedAcrossMap" );
+		message( msgStr );
 	}
 	return numSelected;
 }
@@ -4720,22 +4941,22 @@ Int InGameUI::selectMatchingAcrossMap()
 	Int numSelected = selectMatchingAcrossRegion(NULL);
 	if (numSelected == -1)
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:NothingSelected" );
+		message( msgStr );
 	}
 	else if (numSelected == 0)
 	{
-		Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
+		Drawable *draw = getFirstSelectedDrawable();
 		if( !draw || !draw->getObject() || !draw->getObject()->isKindOf( KINDOF_STRUCTURE ) )
 		{
-			UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-			TheInGameUI->message( message );
+			UnicodeString msgStr = TheGameText->fetch( "GUI:SelectedAcrossMap" );
+			message( msgStr );
 		}
 	}
 	else
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:SelectedAcrossMap" );
+		message( msgStr );
 	}
 	return numSelected;
 }
@@ -4831,25 +5052,25 @@ void InGameUI::addFloatingText(const UnicodeString& text,const Coord3D *pos, Col
 		newFTD->m_pos3D.y = pos->y;
 		newFTD->m_text = text;
 		newFTD->m_dString->setText(text);
-		
-			
+
+
 		if(m_floatingTextTimeOut <= 0)
 			newFTD->m_frameTimeOut = TheGameLogic->getFrame() +  DEFAULT_FLOATING_TEXT_TIMEOUT;
 		else
-			newFTD->m_frameTimeOut = TheGameLogic->getFrame() +  m_floatingTextTimeOut; 
-		
+			newFTD->m_frameTimeOut = TheGameLogic->getFrame() +  m_floatingTextTimeOut;
+
 		m_floatingTextList.push_front( newFTD ); // add to the list
 	}
 }
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 inline Bool isClose(Real a, Real b) { return fabs(a-b) <= 1.0f; }
-inline Bool isClose(const Coord3D& a, const Coord3D& b) 
+inline Bool isClose(const Coord3D& a, const Coord3D& b)
 {
-		return	isClose(a.x, b.x) && 
-			isClose(a.y, b.y) && 
+		return	isClose(a.x, b.x) &&
+			isClose(a.y, b.y) &&
 			isClose(a.z, b.z);
 }
 void InGameUI::DEBUG_addFloatingText(const AsciiString& text, const Coord3D * pos, Color color)
@@ -4878,16 +5099,16 @@ void InGameUI::DEBUG_addFloatingText(const AsciiString& text, const Coord3D * po
 	translate.translate(text);
 	newFTD->m_text = translate;
 	newFTD->m_dString->setText(translate);
-	newFTD->m_dString->setFont(TheWindowManager->winFindFont( AsciiString("Arial"), POINTSIZE, FALSE ));
-				
+	newFTD->m_dString->setFont(TheWindowManager->winFindFont( "Arial", POINTSIZE, FALSE ));
+
 	if(m_floatingTextTimeOut <= 0)
 		newFTD->m_frameTimeOut = TheGameLogic->getFrame() +  DEFAULT_FLOATING_TEXT_TIMEOUT;
 	else
-		newFTD->m_frameTimeOut = TheGameLogic->getFrame() +  m_floatingTextTimeOut; 
-	
+		newFTD->m_frameTimeOut = TheGameLogic->getFrame() +  m_floatingTextTimeOut;
+
 	m_floatingTextList.push_front( newFTD ); // add to the list
 
-	//DEBUG_LOG(("%s\n",text.str()));
+	//DEBUG_LOG(("%s",text.str()));
 }
 #endif
 
@@ -4905,22 +5126,22 @@ void InGameUI::updateFloatingText( void )
 	// only update the position if we're incrementing frames
 	if(lastLogicFrameUpdate == currLogicFrame)
 		return;
-	
+
 	lastLogicFrameUpdate = currLogicFrame;
 
 	// Loop through our floating text list
 	for(FloatingTextListIt it = m_floatingTextList.begin(); it != m_floatingTextList.end();)
 	{
 		ftd = *it;
-		
+
 		// move it up
 		++ftd->m_frameCount;
-		
+
 		// fade the text
 		if( currLogicFrame > ftd->m_frameTimeOut)
 		{
 			// modify the color
-			GameGetColorComponents(ftd->m_color, &r, &g, &b, &a);		
+			GameGetColorComponents(ftd->m_color, &r, &g, &b, &a);
 			amount = REAL_TO_INT( (currLogicFrame - ftd->m_frameTimeOut) * m_floatingTextMoveVanishRate);
 			if(a - amount < 0)
 				a = 0;
@@ -4938,13 +5159,13 @@ void InGameUI::updateFloatingText( void )
 		}
 		// increase our itterator
 		++it;
-	
+
 	}
 
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Itterates through and draws each floating text */
+/** Iterates through and draws each floating text */
 //-------------------------------------------------------------------------------------------------
 void InGameUI::drawFloatingText( void )
 {
@@ -4954,17 +5175,16 @@ void InGameUI::drawFloatingText( void )
 	{
 		ftd = *it;
 		ICoord2D pos;
-		// get the local player's index
-		Int playerNdx = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+		const Int playerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
 
 		// which PartitionManager cells are we looking at?
 		Int pCX, pCY;
 		ThePartitionManager->worldToCell(ftd->m_pos3D.x, ftd->m_pos3D.y, &pCX, &pCY);
 
 		// translate it's 3d pos into a 2d screen pos
-		if( TheTacticalView->worldToScreen(&ftd->m_pos3D, &pos) 
-			&& ftd->m_dString 
-			&& ThePartitionManager->getShroudStatusForPlayer(playerNdx, pCX, pCY) == CELLSHROUD_CLEAR )
+		if( TheTacticalView->worldToScreen(&ftd->m_pos3D, &pos)
+			&& ftd->m_dString
+			&& ThePartitionManager->getShroudStatusForPlayer(playerIndex, pCX, pCY) == CELLSHROUD_CLEAR )
 		{
 			pos.y -= ftd->m_frameCount * m_floatingTextMoveUpSpeed;
 			Color dropColor;
@@ -4995,7 +5215,7 @@ void InGameUI::clearFloatingText( void )
 		it = m_floatingTextList.erase(it);
 		deleteInstance(ftd);
 	}
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -5018,14 +5238,14 @@ void InGameUI::popupMessage( const AsciiString& identifier, Int x, Int y, Int wi
 
 	UnicodeString message = TheGameText->fetch(identifier);
 
-	m_popupMessageData = newInstance( PopupMessageData );	
+	m_popupMessageData = newInstance( PopupMessageData );
 	m_popupMessageData->message = message;
 	// x and why are passed in as a percentage of the screen, convert to screen coords
 	if( x > 100 )
 		x = 100;
 	if( x < 0 )
 		x = 0;
-	
+
 	if( y > 100 )
 		y = 100;
 	if( y < 0 )
@@ -5044,7 +5264,7 @@ void InGameUI::popupMessage( const AsciiString& identifier, Int x, Int y, Int wi
 	if( pause )
 		TheGameLogic->setGamePaused(TRUE, pauseMusic);
 
-	m_popupMessageData->layout = TheWindowManager->winCreateLayout(AsciiString("InGamePopupMessage.wnd"));
+	m_popupMessageData->layout = TheWindowManager->winCreateLayout("InGamePopupMessage.wnd");
 	m_popupMessageData->layout->runInit();
 }
 
@@ -5065,7 +5285,7 @@ void InGameUI::clearPopupMessageData( void )
 		TheGameLogic->setGamePaused(FALSE, m_popupMessageData->pauseMusic);
 	deleteInstance(m_popupMessageData);
 	m_popupMessageData = NULL;
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -5078,14 +5298,11 @@ void InGameUI::clearPopupMessageData( void )
 //-------------------------------------------------------------------------------------------------
 FloatingTextData::FloatingTextData(void)
 {
-	// Added By Sadullah Nader
-	// Initializations missing and needed
 	m_color = 0;
 	m_frameCount = 0;
 	m_frameTimeOut = 0;
 	m_pos3D.zero();
 	m_text.clear();
-	//
 	m_dString = TheDisplayStringManager->newDisplayString();
 }
 
@@ -5116,7 +5333,7 @@ WorldAnimationData::WorldAnimationData( void )
 	m_options = WORLD_ANIM_NO_OPTIONS;
 	m_zRisePerSecond = 0.0f;
 
-}  // end WorldAnimationData
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add a 2D animation at a spot in the world */
@@ -5136,7 +5353,7 @@ void InGameUI::addWorldAnimation( Anim2DTemplate *animTemplate,
 	// (huh huh, he said "wad")
 	WorldAnimationData *wad = NEW WorldAnimationData;
 	if( wad == NULL )
-		return;		
+		return;
 
 	// allocate a new animation instance
 	Anim2D *anim = newInstance(Anim2D)( animTemplate, TheAnim2DCollection );
@@ -5151,37 +5368,31 @@ void InGameUI::addWorldAnimation( Anim2DTemplate *animTemplate,
 	// add to list
 	m_worldAnimationList.push_front( wad );
 
-}  // end addWorldAnimation
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Delete all world animations */
 // ------------------------------------------------------------------------------------------------
 void InGameUI::clearWorldAnimations( void )
 {
-	WorldAnimationData *wad;
-
 	// iterate through all entries and delete the animation data
-	for( WorldAnimationListIterator it = m_worldAnimationList.begin();	
+	for( WorldAnimationListIterator it = m_worldAnimationList.begin();
 			 it != m_worldAnimationList.end(); /*empty*/ )
 	{
 
-		wad = *it;
-		if( wad )
-		{
-
-			// delete the animation instance
-			deleteInstance(wad->m_anim);
+		WorldAnimationData *wad = *it;
 
-			// delete the world animation data
-			delete wad;
+		// delete the animation instance
+		deleteInstance(wad->m_anim);
 
-		}  // end if
+		// delete the world animation data
+		delete wad;
 
 		it = m_worldAnimationList.erase( it );
 
-	}  // end for
-	
-}  // end clearWorldAnimations
+	}
+
+}
 
 static const UnsignedInt FRAMES_BEFORE_EXPIRE_TO_FADE = LOGICFRAMES_PER_SECOND * 1;
 // ------------------------------------------------------------------------------------------------
@@ -5189,15 +5400,13 @@ static const UnsignedInt FRAMES_BEFORE_EXPIRE_TO_FADE = LOGICFRAMES_PER_SECOND *
 // ------------------------------------------------------------------------------------------------
 void InGameUI::updateAndDrawWorldAnimations( void )
 {
-	WorldAnimationData *wad;
-
 	// go through all animations
 	for( WorldAnimationListIterator it = m_worldAnimationList.begin();
 			 it != m_worldAnimationList.end(); /*empty*/ )
 	{
 
 		// get data
-		wad = *it;
+		WorldAnimationData *wad = *it;
 
 		// update portion ... only when the game is in motion
 		if( TheGameLogic->isGamePaused() == FALSE )
@@ -5218,26 +5427,31 @@ void InGameUI::updateAndDrawWorldAnimations( void )
 				it = m_worldAnimationList.erase( it );
 				continue;
 
-			}  // end if
+			}
 
 			// update the Z value
+			// TheSuperHackers @tweak World animation Z-rise is now decoupled from the render update.
 			if( wad->m_zRisePerSecond )
-				wad->m_worldPos.z += wad->m_zRisePerSecond / LOGICFRAMES_PER_SECOND;
+			{
+				const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
+				wad->m_worldPos.z += wad->m_zRisePerSecond / LOGICFRAMES_PER_SECOND * timeScale;
+			}
 
-		}  // end if
+		}
 
 		//
 		// don't bother going forward with the draw process if this location is shrouded for
 		// the local player
 		//
-		Int playerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+		const Int playerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
+
 		if( ThePartitionManager->getShroudStatusForPlayer( playerIndex, &wad->m_worldPos ) != CELLSHROUD_CLEAR )
 		{
 
 			++it;
 			continue;
 
-		}  // end if
+		}
 
 		// update translucency value
 		if( BitIsSet( wad->m_options, WORLD_ANIM_FADE_ON_EXPIRE ) )
@@ -5247,14 +5461,14 @@ void InGameUI::updateAndDrawWorldAnimations( void )
 			UnsignedInt framesTillExpire = wad->m_expireFrame - TheGameLogic->getFrame();
 			if( framesTillExpire < FRAMES_BEFORE_EXPIRE_TO_FADE )
 			{
-				
+
 				// compute alpha level so that we're totally gone by the expire frame
 				Real alpha = INT_TO_REAL( framesTillExpire ) / INT_TO_REAL( FRAMES_BEFORE_EXPIRE_TO_FADE );
 				wad->m_anim->setAlpha( alpha );
-				
-			}  // end if
 
-		}  // end if
+			}
+
+		}
 
 		// project the point to screen space
 		ICoord2D screen;
@@ -5264,7 +5478,9 @@ void InGameUI::updateAndDrawWorldAnimations( void )
 			UnsignedInt height = wad->m_anim->getCurrentFrameHeight();
 
 			// scale the width and height given the camera zoom level
-			Real zoomScale = TheTacticalView->getMaxZoom() / TheTacticalView->getZoom();
+			// TheSuperHackers @todo Rework this with sane values. scaler=1.3 originally came from TheTacticalView::getMaxZoom()
+			constexpr Real scaler = 1.3f;
+			Real zoomScale = scaler / TheTacticalView->getZoom();
 			width *= zoomScale;
 			height *= zoomScale;
 
@@ -5275,22 +5491,22 @@ void InGameUI::updateAndDrawWorldAnimations( void )
 			// draw the animation
 			wad->m_anim->draw( screen.x, screen.y, width, height );
 
-		}  // end if
+		}
 
 		// go to the next element in the list
 		++it;
 
-	}  // end for
+	}
 
-}  // end updateAndDrawWorldAnimations
+}
 
 
 Object *InGameUI::findIdleWorker( Object *obj)
 {
 	if(!obj)
 		return NULL;
-	
-	Int index = obj->getControllingPlayer()->getPlayerIndex();	
+
+	Int index = obj->getControllingPlayer()->getPlayerIndex();
 	if(m_idleWorkers[index].empty())
 		return NULL;
 
@@ -5326,11 +5542,11 @@ void InGameUI::removeIdleWorker( Object *obj, Int playerNumber )
 		return;
 	if(playerNumber < 0 || playerNumber >= MAX_PLAYER_COUNT)  // we're leaving the game, so this is all screwed
 		return;
-	
+
 	if(m_idleWorkers[playerNumber].empty())
 		return;
 
-	
+
 	ObjectListIt it = m_idleWorkers[playerNumber].begin();
 	while(it != m_idleWorkers[playerNumber].end())
 	{
@@ -5347,53 +5563,54 @@ void InGameUI::removeIdleWorker( Object *obj, Int playerNumber )
 
 void InGameUI::selectNextIdleWorker( void )
 {
-	Int index = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+	Player* player = rts::getObservedOrLocalPlayer();
+	Int index = player->getPlayerIndex();
+
 	if(m_idleWorkers[index].empty())
 	{
-		DEBUG_ASSERTCRASH(FALSE, ("InGameUI::selectNextIdleWorker We're trying to select a worker when our list is empty for player %ls", ThePlayerList->getLocalPlayer()->getPlayerDisplayName().str()));
+		DEBUG_ASSERTCRASH(FALSE, ("InGameUI::selectNextIdleWorker We're trying to select a worker when our list is empty for player %ls", player->getPlayerDisplayName().str()));
 		return;
 	}
 	Object *selectThisObject = NULL;
-	
+
 	if(getSelectCount() == 0 || getSelectCount() > 1)
 	{
 		selectThisObject = *m_idleWorkers[index].begin();
+		// If our idle worker is contained by anything, we need to select the container instead.
+		while (selectThisObject->getContainedBy())
+			selectThisObject = selectThisObject->getContainedBy();
 	}
 	else
 	{
-		Drawable *selectedDrawable = TheInGameUI->getFirstSelectedDrawable();	
-		
-		ObjectListIt it = m_idleWorkers[index].begin();
-		while(it != m_idleWorkers[index].end())
+		Drawable *selectedDrawable = getFirstSelectedDrawable();
+		// TheSuperHackers @tweak Stubbjax 22/07/2025 Idle worker iteration now correctly identifies and
+		// iterates contained idle workers. Previous iteration logic would not go past contained workers,
+		// and was not guaranteed to select top-level containers.
+		ObjectPtrVector uniqueIdleWorkers = getUniqueIdleWorkers(m_idleWorkers[index]);
+
+		ObjectPtrVector::iterator it = uniqueIdleWorkers.begin();
+		while(it != uniqueIdleWorkers.end())
 		{
 			Object *itObj = *it;
 			if(itObj == selectedDrawable->getObject())
 			{
 				++it;
-				if(it != m_idleWorkers[index].end())
+				if(it != uniqueIdleWorkers.end())
 					selectThisObject = *it;
 				else
-					selectThisObject = *m_idleWorkers[index].begin();
+					selectThisObject = *uniqueIdleWorkers.begin();
 				break;
 			}
 			++it;
 		}
 		// if we had something selected that wasn't a worker, we'll get here
-		if(!selectThisObject)
-			selectThisObject = *m_idleWorkers[index].begin();
-
+		if (!selectThisObject)
+			selectThisObject = uniqueIdleWorkers.front();
 	}
 	DEBUG_ASSERTCRASH(selectThisObject, ("InGameUI::selectNextIdleWorker Could not select the next IDLE worker"));
 	if(selectThisObject)
-	{	
-		
-		//If our idle worker is contained by anything, we need to select the container instead.
-		Object *containedBy = selectThisObject->getContainedBy();
-		if( containedBy )
-		{
-			selectThisObject = containedBy;
-		}
-
+	{
+		DEBUG_ASSERTCRASH(selectThisObject->getContainedBy() == NULL, ("InGameUI::selectNextIdleWorker Selected idle object should not be contained"));
 		deselectAllDrawables();
 		GameMessage *teamMsg = TheMessageStream->appendMessage( GameMessage::MSG_CREATE_SELECTED_GROUP );
 
@@ -5402,7 +5619,7 @@ void InGameUI::selectNextIdleWorker( void )
 		teamMsg->appendBooleanArgument( TRUE );
 
 		teamMsg->appendObjectIDArgument( selectThisObject->getID() );
-		
+
 		selectDrawable( selectThisObject->getDrawable() );
 
 		/*// removed becuase we're already playing a select sound... left in, just in case i"m wrong.
@@ -5412,15 +5629,34 @@ void InGameUI::selectNextIdleWorker( void )
 				{
 					TheAudio->addAudioEvent( soundEvent );
 				}*/
-		
+
 		// center on the unit
 		TheTacticalView->lookAt(selectThisObject->getPosition());
 	}
 }
 
+// Finds unique selectables to avoid selecting the same or a previous container if multiple idle workers are contained.
+ObjectPtrVector InGameUI::getUniqueIdleWorkers(const ObjectList& idleWorkers)
+{
+	ObjectPtrVector uniqueIdleWorkers;
+	uniqueIdleWorkers.reserve(idleWorkers.size());
+
+	for (ObjectList::const_iterator it = idleWorkers.begin(); it != idleWorkers.end(); ++it)
+	{
+		Object* itObj = *it;
+		while (itObj->getContainedBy())
+			itObj = itObj->getContainedBy();
+
+		stl::push_back_unique(uniqueIdleWorkers, itObj);
+	}
+
+	return uniqueIdleWorkers;
+}
+
 Int InGameUI::getIdleWorkerCount( void )
 {
-	Int index = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+	Player* player = rts::getObservedOrLocalPlayer();
+	Int index = player->getPlayerIndex();
 	return m_idleWorkers[index].size();
 }
 
@@ -5429,14 +5665,14 @@ void InGameUI::showIdleWorkerLayout( void )
 	if (!m_idleWorkerWin)
 	{
 		m_idleWorkerWin = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonIdleWorker"));
-		DEBUG_ASSERTCRASH(m_idleWorkerWin, ("InGameUI::showIdleWorkerLayout could not find IdleWorker.wnd to load "));
+		DEBUG_ASSERTCRASH(m_idleWorkerWin, ("InGameUI::showIdleWorkerLayout could not find IdleWorker.wnd to load"));
 		return;
 	}
 
 	m_idleWorkerWin->winEnable(TRUE);
 
 	m_currentIdleWorkerDisplay = getIdleWorkerCount();
-	
+
 //	if(m_currentIdleWorkerDisplay < 1)
 //		GadgetButtonSetText(m_idleWorkerWin, UnicodeString::TheEmptyString);
 //	else
@@ -5459,10 +5695,10 @@ void InGameUI::updateIdleWorker( void )
 {
 	Int idleCount = getIdleWorkerCount();
 
-	if(idleCount > 0 && m_currentIdleWorkerDisplay != idleCount && getInputEnabled())
+	if(idleCount > 0 && m_currentIdleWorkerDisplay != idleCount)
 		showIdleWorkerLayout();
 
-	if((idleCount <= 0 && m_idleWorkerWin) || !getInputEnabled())
+	if(idleCount <= 0 && m_idleWorkerWin)
 		hideIdleWorkerLayout();
 }
 
@@ -5482,27 +5718,102 @@ void InGameUI::resetIdleWorker( void )
 
 void InGameUI::recreateControlBar( void )
 {
-	GameWindow *win = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd")));
-	if(win)
-		deleteInstance(win);
-	
-	m_idleWorkerWin = NULL;	
-	
+	GameWindow *win = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd"));
+	deleteInstance(win);
+
+	m_idleWorkerWin = NULL;
+
 	createControlBar();
-		
-	if(TheControlBar)
+
+	delete TheControlBar;
+	TheControlBar = NEW ControlBar;
+	TheControlBar->init();
+}
+
+void InGameUI::refreshCustomUiResources(void)
+{
+	refreshNetworkLatencyResources();
+	refreshRenderFpsResources();
+	refreshSystemTimeResources();
+	refreshGameTimeResources();
+}
+
+void InGameUI::refreshNetworkLatencyResources(void)
+{
+	if (!m_networkLatencyString)
+	{
+		m_networkLatencyString = TheDisplayStringManager->newDisplayString();
+		m_lastNetworkLatencyFrames = ~0u;
+	}
+
+	m_networkLatencyPointSize = TheGlobalData->m_networkLatencyFontSize;
+	Int adjustedNetworkLatencyFontSize = TheGlobalLanguageData->adjustFontSize(m_networkLatencyPointSize);
+	GameFont* latencyFont = TheWindowManager->winFindFont(m_networkLatencyFont, adjustedNetworkLatencyFontSize, m_networkLatencyBold);
+	m_networkLatencyString->setFont(latencyFont);
+}
+
+void InGameUI::refreshRenderFpsResources(void)
+{
+	if (!m_renderFpsString)
+	{
+		m_renderFpsString = TheDisplayStringManager->newDisplayString();
+		m_lastRenderFps = ~0u;
+		m_lastRenderFpsUpdateMs = 0u;
+	}
+
+	if (!m_renderFpsLimitString)
 	{
-		delete TheControlBar;
-		TheControlBar = NEW ControlBar;
-		TheControlBar->init();
+		m_renderFpsLimitString = TheDisplayStringManager->newDisplayString();
+		m_lastRenderFpsLimit = ~0u;
 	}
 
+	m_renderFpsPointSize = TheGlobalData->m_renderFpsFontSize;
+	Int adjustedRenderFpsFontSize = TheGlobalLanguageData->adjustFontSize(m_renderFpsPointSize);
+	GameFont *fpsFont = TheWindowManager->winFindFont(m_renderFpsFont, adjustedRenderFpsFontSize, m_renderFpsBold);
+	m_renderFpsString->setFont(fpsFont);
+	m_renderFpsLimitString->setFont(fpsFont);
 
+	if (m_renderFpsPointSize > 0)
+	{
+		updateRenderFpsString();
+	}
+}
+
+void InGameUI::refreshSystemTimeResources(void)
+{
+	if (!m_systemTimeString)
+	{
+		m_systemTimeString = TheDisplayStringManager->newDisplayString();
+	}
+
+	m_systemTimePointSize = TheGlobalData->m_systemTimeFontSize;
+	Int adjustedSystemTimeFontSize = TheGlobalLanguageData->adjustFontSize(m_systemTimePointSize);
+	GameFont* systemTimeFont = TheWindowManager->winFindFont(m_systemTimeFont, adjustedSystemTimeFontSize, m_systemTimeBold);
+	m_systemTimeString->setFont(systemTimeFont);
+}
+
+void InGameUI::refreshGameTimeResources(void)
+{
+	if (!m_gameTimeString)
+	{
+		m_gameTimeString = TheDisplayStringManager->newDisplayString();
+	}
+
+	if (!m_gameTimeFrameString)
+	{
+		m_gameTimeFrameString = TheDisplayStringManager->newDisplayString();
+	}
+
+	m_gameTimePointSize = TheGlobalData->m_gameTimeFontSize;
+	Int adjustedGameTimeFontSize = TheGlobalLanguageData->adjustFontSize(m_gameTimePointSize);
+	GameFont* gameTimeFont = TheWindowManager->winFindFont(m_gameTimeFont, adjustedGameTimeFontSize, m_gameTimeBold);
+	m_gameTimeString->setFont(gameTimeFont);
+	m_gameTimeFrameString->setFont(gameTimeFont);
 }
 
 void InGameUI::disableTooltipsUntil(UnsignedInt frameNum)
 {
-	if (frameNum > m_tooltipsDisabledUntil) 
+	if (frameNum > m_tooltipsDisabledUntil)
 		m_tooltipsDisabledUntil = frameNum;
 }
 
@@ -5517,17 +5828,19 @@ Bool InGameUI::areTooltipsDisabled() const
 }
 
 
-WindowMsgHandledType IdleWorkerSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType IdleWorkerSystem( GameWindow *window, UnsignedInt msg,
 																				WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 		//---------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-		{	
+		{
 			// if we're givin the opportunity to take the keyboard focus we must say we don't want it
 			if( mData1 == TRUE )
 				*(Bool *)mData2 = FALSE;
+			break;
+
 		}
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -5540,16 +5853,149 @@ WindowMsgHandledType IdleWorkerSystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
 }
 
 
+void InGameUI::updateRenderFpsString()
+{
+	const UnsignedInt renderFps = (UnsignedInt)(TheDisplay->getAverageFPS() + 0.5f);
+	if (renderFps != m_lastRenderFps)
+	{
+		UnicodeString fpsStr;
+		fpsStr.format(L"%u", renderFps);
+		m_renderFpsString->setText(fpsStr);
+		m_lastRenderFps = renderFps;
+	}
+}
+
+void InGameUI::drawNetworkLatency(Int &x, Int &y)
+{
+	const UnsignedInt networkLatencyFrames = TheNetwork->getRunAhead();
+
+	if (networkLatencyFrames != m_lastNetworkLatencyFrames)
+	{
+		UnicodeString latencyStr;
+		latencyStr.format(L"%u", networkLatencyFrames);
+		m_networkLatencyString->setText(latencyStr);
+		m_lastNetworkLatencyFrames = networkLatencyFrames;
+	}
+
+	// TheSuperHackers @info at the HUD anchor this draws inline and advances x otherwise uses configured position
+	if (isAtHudAnchorPos(m_networkLatencyPosition))
+	{
+		m_networkLatencyString->draw(kHudAnchorX + x, kHudAnchorY + y, m_networkLatencyColor, m_networkLatencyDropColor);
+		x += m_networkLatencyString->getWidth() + kHudGapPx;
+	}
+	else
+	{
+		m_networkLatencyString->draw(m_networkLatencyPosition.x, m_networkLatencyPosition.y, m_networkLatencyColor, m_networkLatencyDropColor);
+	}
+}
+
+void InGameUI::drawRenderFps(Int &x, Int &y)
+{
+	if (m_renderFpsRefreshMs > 0u)
+	{
+		const UnsignedInt nowMs = timeGetTime();
+		const UnsignedInt deltaMs = nowMs - m_lastRenderFpsUpdateMs;
+		if (deltaMs >= m_renderFpsRefreshMs)
+		{
+			m_lastRenderFpsUpdateMs = nowMs;
+			updateRenderFpsString();
+		}
+	}
+	else
+	{
+		updateRenderFpsString();
+	}
+
+	UnsignedInt renderFpsLimit = 0u;
+	if (TheGlobalData->m_useFpsLimit)
+	{
+		renderFpsLimit = (UnsignedInt)TheFramePacer->getFramesPerSecondLimit();
+		if (renderFpsLimit == RenderFpsPreset::UncappedFpsValue)
+		{
+			renderFpsLimit = 0u;
+		}
+	}
+	if (renderFpsLimit != m_lastRenderFpsLimit)
+	{
+		UnicodeString fpsLimitStr;
+		fpsLimitStr.format(L"[%u]", renderFpsLimit);
+		m_renderFpsLimitString->setText(fpsLimitStr);
+		m_lastRenderFpsLimit = renderFpsLimit;
+	}
+
+	// TheSuperHackers @info at the HUD anchor this draws inline and advances x otherwise uses configured position
+	if (isAtHudAnchorPos(m_renderFpsPosition))
+	{
+		const Int drawY = kHudAnchorY + y;
+
+		m_renderFpsString->draw(kHudAnchorX + x, drawY, m_renderFpsColor, m_renderFpsDropColor);
+		x += m_renderFpsString->getWidth();
+		m_renderFpsLimitString->draw(kHudAnchorX + x, drawY, m_renderFpsLimitColor, m_renderFpsDropColor);
+		x += m_renderFpsLimitString->getWidth() + kHudGapPx;
+	}
+	else
+	{
+		m_renderFpsString->draw(m_renderFpsPosition.x, m_renderFpsPosition.y, m_renderFpsColor, m_renderFpsDropColor);
+		m_renderFpsLimitString->draw(m_renderFpsPosition.x + m_renderFpsString->getWidth(), m_renderFpsPosition.y, m_renderFpsLimitColor, m_renderFpsDropColor);
+	}
+}
+
+void InGameUI::drawSystemTime(Int &x, Int &y)
+{
+	// current system time
+	SYSTEMTIME systemTime;
+	GetLocalTime( &systemTime );
+
+	UnicodeString TimeString;
+	TimeString.format(L"%2.2d:%2.2d:%2.2d", systemTime.wHour, systemTime.wMinute, systemTime.wSecond);
+	m_systemTimeString->setText(TimeString);
+
+	// TheSuperHackers @info at the HUD anchor this draws inline and advances x otherwise uses configured position
+	if (isAtHudAnchorPos(m_systemTimePosition))
+	{
+		m_systemTimeString->draw(kHudAnchorX + x, kHudAnchorY + y, m_systemTimeColor, m_systemTimeDropColor);
+		x += m_systemTimeString->getWidth() + kHudGapPx;
+	}
+	else
+	{
+		m_systemTimeString->draw(m_systemTimePosition.x, m_systemTimePosition.y, m_systemTimeColor, m_systemTimeDropColor);
+	}
+}
+
+void InGameUI::drawGameTime()
+{
+	Int currentFrame = TheGameLogic->getFrame();
+	Int gameSeconds = (Int) (SECONDS_PER_LOGICFRAME_REAL * currentFrame );
+	Int hours = gameSeconds / 60 / 60;
+	Int minutes = (gameSeconds / 60) % 60;
+	Int seconds = gameSeconds % 60;
+	Int frame = currentFrame % 30;
+
+    UnicodeString gameTimeString;
+    gameTimeString.format(L"%2.2d:%2.2d:%2.2d", hours, minutes, seconds);
+    m_gameTimeString->setText(gameTimeString);
+
+	UnicodeString gameTimeFrameString;
+    gameTimeFrameString.format(L".%2.2d", frame);
+    m_gameTimeFrameString->setText(gameTimeFrameString);
+
+	// TheSuperHackers @info this implicitly offsets the game timer from the right instead of left of the screen
+	int horizontalTimerOffset = TheDisplay->getWidth() - (Int)m_gameTimePosition.x - m_gameTimeString->getWidth() - m_gameTimeFrameString->getWidth();
+	int horizontalFrameOffset = TheDisplay->getWidth() - (Int)m_gameTimePosition.x - m_gameTimeFrameString->getWidth();
+
+	m_gameTimeString->draw(horizontalTimerOffset, m_gameTimePosition.y, m_gameTimeColor, m_gameTimeDropColor);
+	m_gameTimeFrameString->draw(horizontalFrameOffset, m_gameTimePosition.y, GameMakeColor(180,180,180,255), m_gameTimeDropColor);
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp b/Generals/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp
index 26afdc7610c..3e69d321a36 100644
--- a/Generals/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp
@@ -27,7 +27,7 @@
 // Desc:       Basic keyboard
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Language.h"
 #include "Common/GameEngine.h"
@@ -49,8 +49,8 @@ Keyboard *TheKeyboard = NULL;
 //-------------------------------------------------------------------------------------------------
 void Keyboard::createStreamMessages( void )
 {
-	
-	// santiy
+
+	// sanity
 	if( TheMessageStream == NULL )
 		return;
 
@@ -64,22 +64,22 @@ void Keyboard::createStreamMessages( void )
 		{
 
 			msg = TheMessageStream->appendMessage( GameMessage::MSG_RAW_KEY_DOWN );
-			DEBUG_ASSERTCRASH( msg, ("Unable to append key down message to stream\n") );
+			DEBUG_ASSERTCRASH( msg, ("Unable to append key down message to stream") );
 
-		}  // end if
+		}
 		else if( BitIsSet( key->state, KEY_STATE_UP ) )
 		{
 
 			msg = TheMessageStream->appendMessage( GameMessage::MSG_RAW_KEY_UP );
-			DEBUG_ASSERTCRASH( msg, ("Unable to append key up message to stream\n") );
+			DEBUG_ASSERTCRASH( msg, ("Unable to append key up message to stream") );
 
-		}  // end else if
+		}
 		else
 		{
 
-			DEBUG_CRASH(( "Unknown key state when creating msg stream\n" ));
-			
-		}  // end else
+			DEBUG_CRASH(( "Unknown key state when creating msg stream" ));
+
+		}
 
 		// fill out message arguments
 		if( msg )
@@ -89,11 +89,12 @@ void Keyboard::createStreamMessages( void )
 		}
 
 		// next key please
+		key->setUsed();
 		key++;
 
-	}  // end while
+	}
 
-}  // end createStreamMessages
+}
 
 //-------------------------------------------------------------------------------------------------
 /** update all our key state data */
@@ -122,11 +123,11 @@ void Keyboard::updateKeys( void )
 				resetKeys();
 				index = 0;
 
-			}  // end if
+			}
 
 		}
 		while( m_keys[ index ].key == KEY_LOST );
-	} 
+	}
 	while( m_keys[ index++ ].key != KEY_NONE );
 
 	// update keyboard status array
@@ -139,7 +140,12 @@ void Keyboard::updateKeys( void )
 
 		m_keyStatus[ m_keys[ index ].key ].state = m_keys[ index ].state;
 		m_keyStatus[ m_keys[ index ].key ].status = m_keys[ index ].status;
-		m_keyStatus[ m_keys[ index ].key ].sequence = m_inputFrame;
+
+		// Update key down time for new key presses
+		if( BitIsSet( m_keys[ index ].state, KEY_STATE_DOWN ) )
+		{
+			m_keyStatus[ m_keys[ index ].key ].keyDownTimeMsec = m_keys[ index ].keyDownTimeMsec;
+		}
 
 		// prevent ALT-TAB from causing a TAB event
 		if( m_keys[ index ].key == KEY_TAB )
@@ -166,11 +172,11 @@ void Keyboard::updateKeys( void )
 			//
 			translateKey( m_keys[ index ].key );
 
-		}  // end else if
+		}
 
 		index++;
 
-	}  // end while
+	}
 
 	// check for key repeats
 	checkKeyRepeat();
@@ -187,14 +193,14 @@ void Keyboard::updateKeys( void )
 			// next key
 			index++;
 
-		}  // end while
+		}
 
-	}  // end if
+	}
 
-}  // end updateKeys
+}
 
 //-------------------------------------------------------------------------------------------------
-/** check key repeat sequences, TRUE is returned if repeat is occurring */
+/** check key repeat timing, TRUE is returned if repeat is occurring */
 //-------------------------------------------------------------------------------------------------
 Bool Keyboard::checkKeyRepeat( void )
 {
@@ -202,7 +208,7 @@ Bool Keyboard::checkKeyRepeat( void )
 	Int index = 0;
 	Int key;
 
-	/** @todo we shouldn't think about repeating any keys while we 
+	/** @todo we shouldn't think about repeating any keys while we
 	don't have the focus */
 //	if( currentFocus == FOCUS_OUT )
 //		return FALSE;
@@ -213,13 +219,19 @@ Bool Keyboard::checkKeyRepeat( void )
 
 	// Scan Keyboard status array for first key down
 	// long enough to repeat
-	for( key = 0; key < 256; key++ )
+	for( key = 0; key < ARRAY_SIZE(m_keyStatus); key++ )
 	{
 
 		if( BitIsSet( m_keyStatus[ key ].state, KEY_STATE_DOWN ) )
 		{
 
-			if( (m_inputFrame - m_keyStatus[ key ].sequence) > Keyboard::KEY_REPEAT_DELAY )
+			const UnsignedInt now = timeGetTime();
+			const UnsignedInt keyDownTime = m_keyStatus[ key ].keyDownTimeMsec;
+
+			// Unsigned subtraction handles wraparound correctly
+			const UnsignedInt elapsedMsec = now - keyDownTime;
+
+			if( elapsedMsec > Keyboard::KEY_REPEAT_DELAY_MSEC )
 			{
 				// Add key to this frame
 				m_keys[ index ].key = (UnsignedByte)key;
@@ -228,26 +240,26 @@ Bool Keyboard::checkKeyRepeat( void )
 
 				// Set End Flag
 				m_keys[ ++index ].key = KEY_NONE;
-			
+
 				// Set all keys as new to prevent multiple keys repeating
 				for( index = 0; index< NUM_KEYS; index++ )
-					m_keyStatus[ index ].sequence = m_inputFrame;
+					m_keyStatus[ index ].keyDownTimeMsec = now;
 
-				// Set repeated key so it will repeat again in two frames
-				m_keyStatus[ key ].sequence = m_inputFrame - (Keyboard::KEY_REPEAT_DELAY + 2);
+				// Set repeated key so it will repeat again after the interval
+				m_keyStatus[ key ].keyDownTimeMsec = now - (Keyboard::KEY_REPEAT_DELAY_MSEC + Keyboard::KEY_REPEAT_INTERVAL_MSEC);
 
 				retVal = TRUE;
 				break;  // exit for key
 
-			}  // end if
+			}
 
-		}  // end if, key down
+		}
 
-	}  // end for key
+	}
 
 	return retVal;
 
-}  // end checkKeyRepeat
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the keyboard key-names array */
@@ -261,14 +273,14 @@ void Keyboard::initKeyNames( void )
 	/*
 	 * Initialize the keyboard key-names array.
 	 */
-	for( i = 0; i < KEY_NAMES_COUNT; i++ )
+	for( i = 0; i < ARRAY_SIZE(m_keyNames); i++ )
 	{
 
 		m_keyNames[ i ].stdKey =		L'\0';
 		m_keyNames[ i ].shifted =		L'\0';
 		m_keyNames[ i ].shifted2 =	L'\0';
 
-	}  // end for i
+	}
 
 	m_shift2Key = KEY_NONE;
 
@@ -674,9 +686,9 @@ void Keyboard::initKeyNames( void )
 			m_shift2Key = KEY_RALT;
 			break;
 
-	}  // end switch( Language )
+	}
 
-}  // end initKeyNames
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC PROTOTYPES //////////////////////////////////////////////////////////////////////////////
@@ -693,16 +705,15 @@ Keyboard::Keyboard( void )
 	m_shift2Key = KEY_NONE;
 
 	memset( m_keyNames, 0, sizeof( m_keyNames ) );
-	m_inputFrame = 0;
 
-}  // end Keyboard
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Keyboard::~Keyboard( void )
 {
 
-}  // end ~Keyboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialzie the keyboard */
@@ -713,10 +724,7 @@ void Keyboard::init( void )
 	// initialize the key names
 	initKeyNames();
 
-	// first input frame
-	m_inputFrame = 0;
-
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset keyboard system */
@@ -724,7 +732,7 @@ void Keyboard::init( void )
 void Keyboard::reset( void )
 {
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Called once per frame to gather key data input */
@@ -732,13 +740,10 @@ void Keyboard::reset( void )
 void Keyboard::update( void )
 {
 
-	// increment input frame
-	m_inputFrame++;
-
 	// update the key data
 	updateKeys();
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the state data for the keys, we likely want to do this when
@@ -747,63 +752,92 @@ void Keyboard::update( void )
 void Keyboard::resetKeys( void )
 {
 
+	// TheSuperHackers @fix Caball009 13/12/2025 Fix bug where game remains in waypoint mode
+	// because the key up state for the alt key is not detected after alt tab.
+	refreshAltKeys();
+
 	memset( m_keys, 0, sizeof( m_keys ) );
 	memset( m_keyStatus, 0, sizeof( m_keyStatus ) );
-	m_modifiers = KEY_STATE_NONE; 
+	m_modifiers = KEY_STATE_NONE;
 	if( getCapsState() )
 	{
 		m_modifiers |= KEY_STATE_CAPSLOCK;
 	}
 
-}  // end resetKeys
+}
+
+//-------------------------------------------------------------------------------------------------
+// Refresh the state of the alt keys, necessary after alt tab
+//-------------------------------------------------------------------------------------------------
+void Keyboard::refreshAltKeys() const
+{
+	if (BitIsSet(m_keyStatus[KEY_LALT].state, KEY_STATE_DOWN))
+	{
+		GameMessage* msg = TheMessageStream->appendMessage(GameMessage::MSG_RAW_KEY_UP);
+		msg->appendIntegerArgument(KEY_LALT);
+		msg->appendIntegerArgument(KEY_STATE_UP);
+	}
+	if (BitIsSet(m_keyStatus[KEY_RALT].state, KEY_STATE_DOWN))
+	{
+		GameMessage* msg = TheMessageStream->appendMessage(GameMessage::MSG_RAW_KEY_UP);
+		msg->appendIntegerArgument(KEY_RALT);
+		msg->appendIntegerArgument(KEY_STATE_UP);
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 /** get the first key in our current state of the keyboard */
 //-------------------------------------------------------------------------------------------------
 KeyboardIO *Keyboard::getFirstKey( void )
 {
-	return &m_keys[ 0 ];	
-}  // end getFirstKey
+	return &m_keys[ 0 ];
+}
 
 //-------------------------------------------------------------------------------------------------
-/** return the key status for the specified key */
 //-------------------------------------------------------------------------------------------------
-UnsignedByte Keyboard::getKeyStatusData( UnsignedByte key )
+KeyboardIO *Keyboard::findKey( KeyDefType key, KeyboardIO::StatusType status )
 {
-	return m_keyStatus[ key ].status;
-}  // end getKeyStatusData
+	for (KeyboardIO *io = getFirstKey(); io->key != KEY_NONE; ++io)
+	{
+		if (io->key == key && io->status == status)
+		{
+			return io;
+		}
+	}
+	return NULL;
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Get the key state data as a Bool for the specified key */
+/** return the key status for the specified key */
 //-------------------------------------------------------------------------------------------------
-Bool Keyboard::getKeyStateBit( UnsignedByte key, Int bit )
+UnsignedByte Keyboard::getKeyStatusData( KeyDefType key )
 {
-	return (m_keyStatus[ key ].state & bit) ? 1 : 0;
-}  // end getKeyStateBit
+	return m_keyStatus[ key ].status;
+}
 
 //-------------------------------------------------------------------------------------------------
-/** return the sequence data for the given key */
+/** Get the key state data as a Bool for the specified key */
 //-------------------------------------------------------------------------------------------------
-UnsignedInt Keyboard::getKeySequenceData( UnsignedByte key )
+Bool Keyboard::getKeyStateBit( KeyDefType key, Int bit )
 {
-	return m_keyStatus[ key ].sequence;
-}  // end getKeySequenceData
+	return (m_keyStatus[ key ].state & bit) ? 1 : 0;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** set the key status data */
 //-------------------------------------------------------------------------------------------------
-void Keyboard::setKeyStatusData( UnsignedByte key, KeyboardIO::StatusType data )
+void Keyboard::setKeyStatusData( KeyDefType key, KeyboardIO::StatusType data )
 {
 	m_keyStatus[ key ].status = data;
-}  // end setKeyStatusData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** set the key state data */
 //-------------------------------------------------------------------------------------------------
-void Keyboard::setKeyStateData( UnsignedByte key, UnsignedByte data )
+void Keyboard::setKeyStateData( KeyDefType key, UnsignedByte data )
 {
 	m_keyStatus[ key ].state = data;
-}  // end setKeyStateData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This routine must be called with every character to
@@ -926,15 +960,15 @@ WideChar Keyboard::translateKey( WideChar keyCode )
 			{
 				return( m_keyNames[ ubKeyCode ].shifted2 );
 			}
-			
-			if( isShift() || getCapsState() && GameIsAlpha( m_keyNames[ ubKeyCode ].stdKey ) )
+
+			if( isShift() || getCapsState() && iswalpha( m_keyNames[ ubKeyCode ].stdKey ) )
 			{
 				return( m_keyNames[ ubKeyCode ].shifted );
 			}
-			
+
 			return( m_keyNames[ubKeyCode ].stdKey );
-	}  // end switch( ubKeyCode )
-}  // end translateKey
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 /** returns true if any shift state is pressed */
@@ -946,7 +980,7 @@ Bool Keyboard::isShift()
 			return TRUE;
 		}
 		return FALSE;
-}  // end isShift()
+}
 
 //-------------------------------------------------------------------------------------------------
 /** returns true if any control state is pressed */
@@ -958,7 +992,7 @@ Bool Keyboard::isCtrl()
 			return TRUE;
 		}
 		return FALSE;
-}  // end isCtrl()
+}
 
 //-------------------------------------------------------------------------------------------------
 /** returns true if any shift state is pressed */
@@ -970,19 +1004,17 @@ Bool Keyboard::isAlt()
 		return TRUE;
 	}
 	return FALSE;
-}  // end isAlt()
+}
 
 
-WideChar Keyboard::getPrintableKey( UnsignedByte key,  Int state )
+WideChar Keyboard::getPrintableKey( KeyDefType key, Int state )
 {
-	if((key < 0 || key >=KEY_NAMES_COUNT) || ( state < 0 || state >= MAX_KEY_STATES))
+	if((key < 0 || key >= ARRAY_SIZE(m_keyNames)) || ( state < 0 || state >= MAX_KEY_STATES))
 		return L'\0';
 	if(state == 0)
 		return m_keyNames[key].stdKey;
 	else if(state == 1)
 		return m_keyNames[key].shifted;
-	else 
+	else
 		return m_keyNames[key].shifted2;
-
-
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp
index 4df5571b8e7..8f02f88d27a 100644
--- a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp
@@ -27,13 +27,14 @@
 // Desc:      Basic mouse interactions
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Debug.h"
 #include "Common/MessageStream.h"
 #include "Common/GameEngine.h"
 #include "Common/GlobalData.h"
 #include "Common/INI.h"
+#include "Common/UserPreferences.h"
 
 #include "GameClient/Display.h"
 #include "GameClient/DisplayStringManager.h"
@@ -45,29 +46,31 @@
 #include "GameClient/Mouse.h"
 #include "GameClient/GlobalLanguage.h"
 
+#include "GameLogic/GameLogic.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 Mouse *TheMouse = NULL;
 
-const char *Mouse::RedrawModeName[RM_MAX] = {
+const char *const Mouse::RedrawModeName[] = {
 	"Mouse:Windows",
 	"Mouse:W3D",
 	"Mouse:Poly",
 	"Mouse:DX8",
 };
 
+const char *const Mouse::CursorCaptureBlockReasonNames[] = {
+	"CursorCaptureBlockReason_NoInit",
+	"CursorCaptureBlockReason_Paused",
+	"CursorCaptureBlockReason_Unfocused",
+	"CursorCaptureBlockReason_CursorIsOutside",
+};
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-static const FieldParse TheMouseCursorFieldParseTable[] = 
+static const FieldParse TheMouseCursorFieldParseTable[] =
 {
 	{ "CursorText",						INI::parseAsciiString,	NULL, offsetof( CursorInfo, cursorText ) },
 	{ "CursorTextColor",			INI::parseRGBAColorInt,	NULL, offsetof( CursorInfo, cursorTextColor ) },
@@ -84,7 +87,7 @@ static const FieldParse TheMouseCursorFieldParseTable[] =
 	{ "Directions",							INI::parseInt,	NULL,	offsetof( CursorInfo, numDirections ) },
 };
 
-static const FieldParse TheMouseFieldParseTable[] = 
+static const FieldParse TheMouseFieldParseTable[] =
 {
 	{ "TooltipFontName",						INI::parseAsciiString,NULL,			offsetof( Mouse, m_tooltipFontName ) },
 	{ "TooltipFontSize",						INI::parseInt,				NULL,			offsetof( Mouse, m_tooltipFontSize ) },
@@ -141,7 +144,7 @@ void Mouse::moveMouse( Int x, Int y, Int relOrAbs )
 	else if( m_currMouse.pos.y < m_minY )
 		m_currMouse.pos.y = m_minY;
 
-}  // end moveMouse
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the current information for the mouse from the device */
@@ -173,17 +176,14 @@ void Mouse::updateMouseData( )
 
 		busy = FALSE;
 
-	}  // end if
+	}
 
 	if( index > 0 )
 		m_eventsThisFrame = index - 1;
 	else
 		m_eventsThisFrame = 0;
 
-	if( index != 0 )
-		m_deadInputFrame = m_inputFrame;
-
-}  // end updateMouseData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Combine mouse events into the main mouse variables */
@@ -210,15 +210,15 @@ void Mouse::processMouseEvent( Int index )
 		checkForDrag();
 
 	// add Mouse Position Changes to Master Position
-	moveMouse( m_mouseEvents[ index ].pos.x, 
-						 m_mouseEvents[ index ].pos.y, 
+	moveMouse( m_mouseEvents[ index ].pos.x,
+						 m_mouseEvents[ index ].pos.y,
 						 movementType );
 
 	// Cumulate Wheel Adjustments
 	m_currMouse.wheelPos += m_mouseEvents[ index ].wheelPos;
 
 	// Check Left Mouse State
-	if( m_mouseEvents[ index ].leftFrame )
+	if( m_mouseEvents[ index ].leftState != MBS_None )
 	{
 		if( m_currMouse.leftState != m_mouseEvents[ index ].leftState )
 		{
@@ -228,25 +228,22 @@ void Mouse::processMouseEvent( Int index )
 				// Mouse Down
 				m_currMouse.leftEvent = GWM_LEFT_DOWN;
 				m_currMouse.leftState = MBS_Down;
-				m_currMouse.leftFrame = m_inputFrame;
 			}
 			else if ( m_mouseEvents[ index ].leftState == MBS_DoubleClick )
 			{
 				// Mouse Double Click
 				m_currMouse.leftEvent = GWM_LEFT_DOUBLE_CLICK;
 				m_currMouse.leftState = MBS_DoubleClick;
-				m_currMouse.leftFrame = m_inputFrame;
 			}
 			else
 			{
 				// Mouse Up
 				m_currMouse.leftEvent = GWM_LEFT_UP;
 				m_currMouse.leftState = MBS_Up;
-				m_currMouse.leftFrame = m_inputFrame;
 			}
 		}
 	}
-	else if( m_currMouse.leftState != MBS_Up && 
+	else if( m_currMouse.leftState != MBS_Up &&
 					(	(m_prevMouse.leftEvent == GWM_LEFT_DOWN) ||
 						(m_prevMouse.leftEvent == GWM_LEFT_DRAG) ) )
 	{
@@ -254,7 +251,7 @@ void Mouse::processMouseEvent( Int index )
 	}
 
 	// Check Right Mouse State
-	if( m_mouseEvents[ index ].rightFrame )
+	if( m_mouseEvents[ index ].rightState != MBS_None )
 	{
 		if( m_currMouse.rightState != m_mouseEvents[ index ].rightState )
 		{
@@ -264,25 +261,22 @@ void Mouse::processMouseEvent( Int index )
 				// Mouse Down
 				m_currMouse.rightEvent = GWM_RIGHT_DOWN;
 				m_currMouse.rightState = MBS_Down;
-				m_currMouse.rightFrame = m_inputFrame;
 			}
 			else if( m_mouseEvents[ index ].rightState == MBS_DoubleClick )
 			{
 				// Mouse Double Click
 				m_currMouse.rightEvent = GWM_RIGHT_DOUBLE_CLICK;
 				m_currMouse.rightState = MBS_DoubleClick;
-				m_currMouse.rightFrame = m_inputFrame;
 			}
 			else
 			{
 				// Mouse Up
 				m_currMouse.rightEvent = GWM_RIGHT_UP;
 				m_currMouse.rightState = MBS_Up;
-				m_currMouse.rightFrame = m_inputFrame;
 			}
 		}
 	}
-	else if( m_currMouse.rightState != MBS_Up && 
+	else if( m_currMouse.rightState != MBS_Up &&
 					(	(m_prevMouse.rightEvent == GWM_RIGHT_DOWN) ||
 						(m_prevMouse.rightEvent == GWM_RIGHT_DRAG) ) )
 	{
@@ -290,7 +284,7 @@ void Mouse::processMouseEvent( Int index )
 	}
 
 	// Check Middle Mouse State
-	if( m_mouseEvents[ index ].middleFrame )
+	if( m_mouseEvents[ index ].middleState != MBS_None )
 	{
 		if( m_currMouse.middleState != m_mouseEvents[index].middleState )
 		{
@@ -299,24 +293,21 @@ void Mouse::processMouseEvent( Int index )
 			{
 				m_currMouse.middleEvent = GWM_MIDDLE_DOWN;
 				m_currMouse.middleState = MBS_Down;
-				m_currMouse.middleFrame = m_inputFrame;
 			}
 			else if( m_mouseEvents[index].middleState == MBS_DoubleClick )
 			{
 				m_currMouse.middleEvent = GWM_MIDDLE_DOUBLE_CLICK;
 				m_currMouse.middleState = MBS_DoubleClick;
-				m_currMouse.middleFrame = m_inputFrame;
 			}
 			else
 			{
 				// Mouse Up
 				m_currMouse.middleEvent = GWM_MIDDLE_UP;
 				m_currMouse.middleState = MBS_Up;
-				m_currMouse.middleFrame = m_inputFrame;
 			}
 		}
 	}
-	else if( m_currMouse.middleState != MBS_Up && 
+	else if( m_currMouse.middleState != MBS_Up &&
 					(	(m_prevMouse.middleEvent == GWM_MIDDLE_DOWN) ||
 						(m_prevMouse.middleEvent == GWM_MIDDLE_DRAG) ) )
 	{
@@ -325,7 +316,7 @@ void Mouse::processMouseEvent( Int index )
 
 	m_currMouse.deltaPos.x = m_currMouse.pos.x - m_prevMouse.pos.x;
 	m_currMouse.deltaPos.y = m_currMouse.pos.y - m_prevMouse.pos.y;
-//	DEBUG_LOG(("Mouse dx %d, dy %d, index %d, frame %d\n", m_currMouse.deltaPos.x, m_currMouse.deltaPos.y, index, m_inputFrame));
+//	DEBUG_LOG(("Mouse dx %d, dy %d, index %d", m_currMouse.deltaPos.x, m_currMouse.deltaPos.y, index));
 //	// check if mouse is still and flag tooltip
 //	if( ((dx*dx) + (dy*dy)) < CURSOR_MOVE_TOL_SQ )
 //	{
@@ -334,7 +325,7 @@ void Mouse::processMouseEvent( Int index )
 //    Int delay = m_tooltipDelayTime;
 //    if(m_tooltipDelay >= 0 )
 //       delay = m_tooltipDelay;
-//    
+//
 //		if( now - m_stillTime >= delay )
 //		{
 //			if (!m_displayTooltip)
@@ -358,7 +349,7 @@ void Mouse::processMouseEvent( Int index )
 
 	m_prevMouse = m_currMouse;
 
-}  // end processMouseEvent
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Check for mouse drag */
@@ -366,28 +357,28 @@ void Mouse::processMouseEvent( Int index )
 void Mouse::checkForDrag( void )
 {
 
-	if( m_currMouse.leftState && 
+	if( m_currMouse.leftState &&
 			(	(m_prevMouse.leftEvent == GWM_LEFT_DOWN) ||
 				(m_prevMouse.leftEvent == GWM_LEFT_DRAG) ) )
 	{
 		m_currMouse.leftEvent = GWM_LEFT_DRAG;
 	}
 
-	if( m_currMouse.rightState && 
+	if( m_currMouse.rightState &&
 			(	(m_prevMouse.rightEvent == GWM_RIGHT_DOWN) ||
 				(m_prevMouse.rightEvent == GWM_RIGHT_DRAG) ) )
 	{
 		m_currMouse.rightEvent = GWM_RIGHT_DRAG;
 	}
 
-	if( m_currMouse.middleState && 
+	if( m_currMouse.middleState &&
 			(	(m_prevMouse.middleEvent == GWM_MIDDLE_DOWN) ||
 				(m_prevMouse.middleEvent == GWM_MIDDLE_DRAG) ) )
 	{
 		m_currMouse.middleEvent = GWM_MIDDLE_DRAG;
 	}
 
-}  // end checkForDrag
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -421,15 +412,12 @@ Bool Mouse::isClick(const ICoord2D *anchor, const ICoord2D *dest, UnsignedInt pr
 //-------------------------------------------------------------------------------------------------
 CursorInfo::CursorInfo( void )
 {
-	// Added Sadullah Nader
-	// Initializations missing and needed
-	
+
 	cursorName.clear();
 	cursorText.clear();
 	cursorTextColor.red = cursorTextColor.green = cursorTextColor.blue = 0;
 	cursorTextDropColor.red = cursorTextDropColor.blue = cursorTextDropColor.green = 0;
-	 
-	//
+
 	textureName.clear();
 	imageName.clear();
 	W3DModelName.clear();
@@ -448,18 +436,17 @@ CursorInfo::CursorInfo( void )
 //-------------------------------------------------------------------------------------------------
 Mouse::Mouse( void )
 {
+	static_assert(ARRAY_SIZE(CursorCaptureBlockReasonNames) == CursorCaptureBlockReason_Count, "Incorrect array size");
+	static_assert(ARRAY_SIZE(RedrawModeName) == RM_MAX, "Incorrect array size");
+
 	// device info
 	m_numButtons = 0;
 	m_numAxes = 0;
 	m_forceFeedback = FALSE;
-	
-	//Added By Sadullah Nader
-	//Initializations missing and needed
+
 	m_dragTolerance = 0;
 	m_dragTolerance3D = 0;
 	m_dragToleranceMS = 0;
-	//
-	
 	//m_tooltipString.clear();	// redundant
 	m_displayTooltip = FALSE;
 	m_tooltipDisplayString = NULL;
@@ -475,9 +462,6 @@ Mouse::Mouse( void )
 	m_maxY = 0;
 	m_eventsThisFrame = 0;
 
-	m_inputFrame = 0;
-	m_deadInputFrame =0;
-
 	m_inputMovesAbsolute = FALSE;
 
 	m_currentCursor = ARROW;
@@ -486,6 +470,7 @@ Mouse::Mouse( void )
 	else
 		m_currentRedrawMode = RM_W3D;//RM_WINDOWS;
 	m_visible = FALSE;
+	m_isCursorCaptured = FALSE;
 	m_tooltipFontName = "Times New Roman";
 	m_tooltipFontSize = 12;
 	m_tooltipFontIsBold = FALSE;
@@ -522,7 +507,7 @@ Mouse::Mouse( void )
 	m_cursorTextDropColor.green = 255;
 	m_cursorTextDropColor.blue  = 255;
 	m_cursorTextDropColor.alpha = 255;
-	
+
 	m_highlightPos = 0;
 	m_highlightUpdateStart = 0;
 	m_stillTime = 0;
@@ -535,7 +520,12 @@ Mouse::Mouse( void )
 	m_tooltipBackColor.blue = 0;
 	m_tooltipBackColor.alpha = 255;
 
-}  // end Mouse
+	m_cursorCaptureMode = CursorCaptureMode_Default;
+
+	m_captureBlockReasonBits = (1 << CursorCaptureBlockReason_NoInit);
+	DEBUG_LOG(("Mouse::Mouse: m_blockCaptureReason=CursorCaptureBlockReason_NoInit"));
+
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -549,14 +539,14 @@ Mouse::~Mouse( void )
 		TheDisplayStringManager->freeDisplayString( m_cursorTextDisplayString );
 	m_cursorTextDisplayString = NULL;
 
-}  // end ~Mouse
+}
 
 /**Had to move this out of main init() because I need this data to properly initialize
 the Win32 version of the mouse (by preloading resources before D3D device is created).*/
 void Mouse::parseIni(void)
 {
 	INI ini;
-	ini.load( AsciiString( "Data\\INI\\Mouse.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Mouse", INI_LOAD_OVERWRITE, NULL );
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -571,7 +561,7 @@ void Mouse::init( void )
 	m_numButtons = 2;  // by default just have 2 buttons
 	m_numAxes = 2;  // by default a normal mouse moves in a 2d plane
 	m_forceFeedback = FALSE;
-	mouseNotifyResolutionChange();
+	onResolutionChanged();
 	m_tooltipString.clear();	// redundant
 	m_displayTooltip = FALSE;
 
@@ -585,9 +575,6 @@ void Mouse::init( void )
 	m_minY = 0;
 	m_maxY = 599;
 
-	m_inputFrame = 0;
-	m_deadInputFrame =0;
-
 	m_inputMovesAbsolute = FALSE;
 	m_eventsThisFrame = 0;
 
@@ -596,12 +583,14 @@ void Mouse::init( void )
  	// allocate a new display string
 	m_cursorTextDisplayString = TheDisplayStringManager->newDisplayString();
 
-}  // end init
+	initCapture();
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Tell mouse system display resolution changed. */
 //-------------------------------------------------------------------------------------------------
-void Mouse::mouseNotifyResolutionChange( void )
+void Mouse::onResolutionChanged( void )
 {
 	if(m_tooltipDisplayString)
 		TheDisplayStringManager->freeDisplayString(m_tooltipDisplayString);
@@ -626,8 +615,26 @@ void Mouse::mouseNotifyResolutionChange( void )
 
 	m_tooltipDisplayString->setWordWrap(120);
 
-}  // end reset
+}
 
+//-------------------------------------------------------------------------------------------------
+void Mouse::onGameModeChanged(GameMode prev, GameMode next)
+{
+	refreshCursorCapture();
+}
+
+//-------------------------------------------------------------------------------------------------
+void Mouse::onGamePaused(Bool paused)
+{
+	if (paused)
+	{
+		blockCapture(CursorCaptureBlockReason_Paused);
+	}
+	else
+	{
+		unblockCapture(CursorCaptureBlockReason_Paused);
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset mouse system */
@@ -641,7 +648,9 @@ void Mouse::reset( void )
   if ( m_cursorTextDisplayString )
   	m_cursorTextDisplayString->reset();
 
-}  // end reset
+	blockCapture(CursorCaptureBlockReason_NoInit);
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update the states of the mouse position and buttons */
@@ -649,13 +658,10 @@ void Mouse::reset( void )
 void Mouse::update( void )
 {
 
-	// increment input frame
-	m_inputFrame++;
-
 	// update the mouse data
 	updateMouseData( );
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Given the current state of this input device, turn the raw input
@@ -686,7 +692,7 @@ void Mouse::createStreamMessages( void )
 		//No delay while scriptdebugging!
 		delay = 0;
 	}
-  
+
 	if( now - m_stillTime >= delay )
 	{
 		if (!m_displayTooltip)
@@ -700,10 +706,10 @@ void Mouse::createStreamMessages( void )
 	}
 	else
 	{
-		//DEBUG_LOG(("%d %d %d %d\n", TheGameClient->getFrame(), delay, now, m_stillTime));
+		//DEBUG_LOG(("%d %d %d %d", TheGameClient->getFrame(), delay, now, m_stillTime));
 		m_displayTooltip = FALSE;
 	}
-	
+
 	for (Int i = 0; i < m_eventsThisFrame; ++i)
 	{
 		processMouseEvent(i);
@@ -743,7 +749,7 @@ void Mouse::createStreamMessages( void )
 				msg->appendIntegerArgument( TheKeyboard->getModifierFlags() );
 				break;
 
-		}  // end switch
+		}
 
 		msg = NULL;
 		switch( m_currMouse.middleEvent )
@@ -778,7 +784,7 @@ void Mouse::createStreamMessages( void )
 				msg->appendIntegerArgument( TheKeyboard->getModifierFlags() );
 				break;
 
-		}  // end switch
+		}
 
 		msg = NULL;
 		switch( m_currMouse.rightEvent )
@@ -813,7 +819,7 @@ void Mouse::createStreamMessages( void )
 				msg->appendIntegerArgument( TheKeyboard->getModifierFlags() );
 				break;
 
-		}  // end switch
+		}
 
 		// wheel pos
 		msg = NULL;
@@ -823,10 +829,10 @@ void Mouse::createStreamMessages( void )
 			msg->appendPixelArgument( m_currMouse.pos );
 			msg->appendIntegerArgument( m_currMouse.wheelPos / 120 );  // wheel delta
 			msg->appendIntegerArgument( TheKeyboard->getModifierFlags() );
-		}  // end if
-	
-	}	// end for
-}  // end createStreamMessages
+		}
+
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the string to display at the cursor for the tooltip */
@@ -834,7 +840,7 @@ void Mouse::createStreamMessages( void )
 void Mouse::setCursorTooltip( UnicodeString tooltip, Int delay, const RGBColor *color, Real width )
 {
 
-	//DEBUG_LOG(("%d Tooltip: %ls\n", TheGameClient->getFrame(), tooltip.str()));
+	//DEBUG_LOG(("%d Tooltip: %ls", TheGameClient->getFrame(), tooltip.str()));
 
 	m_isTooltipEmpty = tooltip.isEmpty();
   m_tooltipDelay = delay;
@@ -852,7 +858,7 @@ void Mouse::setCursorTooltip( UnicodeString tooltip, Int delay, const RGBColor *
 		{
 			widthInPixels = TheDisplay->getWidth();
 		}
-		//DEBUG_LOG(("Setting tooltip width to %d pixels (%g%% of the normal tooltip width)\n", widthInPixels, width*100));
+		//DEBUG_LOG(("Setting tooltip width to %d pixels (%g%% of the normal tooltip width)", widthInPixels, width*100));
 		m_tooltipDisplayString->setWordWrap( widthInPixels );
 		m_lastTooltipWidth = width;
 	}
@@ -860,7 +866,7 @@ void Mouse::setCursorTooltip( UnicodeString tooltip, Int delay, const RGBColor *
 	if (forceRecalc || !m_isTooltipEmpty && tooltip.compare(m_tooltipDisplayString->getText()))
 	{
 		m_tooltipDisplayString->setText(tooltip);
-		//DEBUG_LOG(("Tooltip: %ls\n", tooltip.str()));
+		//DEBUG_LOG(("Tooltip: %ls", tooltip.str()));
 	}
 	if (color)
 	{
@@ -903,14 +909,14 @@ void Mouse::setCursorTooltip( UnicodeString tooltip, Int delay, const RGBColor *
 		m_tooltipBackColor = m_tooltipColorBackground;
 	}
 
-}  // end setCursorTooltip
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set the text for the mouse cursor ... note that this is *NOT* the tooltip text we
 	* can set to be at the mouse position */
 // ------------------------------------------------------------------------------------------------
-void Mouse::setMouseText( UnicodeString text, 
-													const RGBAColorInt *color, 
+void Mouse::setMouseText( UnicodeString text,
+													const RGBAColorInt *color,
 													const RGBAColorInt *dropColor )
 {
 
@@ -927,7 +933,7 @@ void Mouse::setMouseText( UnicodeString text,
 	if( dropColor )
 		m_cursorTextDropColor = *dropColor;
 
-}  // end setMouseText
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Move the mouse to the position */
@@ -938,14 +944,14 @@ void Mouse::setPosition( Int x, Int y )
 	m_currMouse.pos.x = x;
 	m_currMouse.pos.y = y;
 
-}  // end setPosition
+}
 
 //-------------------------------------------------------------------------------------------------
-/** This default implemtation of SetMouseLimits will just set the limiting	
+/** This default implementation of SetMouseLimits will just set the limiting
 	* rectangle to be the width and height of the game display with the
 	* origin in the upper left at (0,0).  However, if the game is running
 	* in a windowed mode then these limits should reflect the SCREEN
-	* coords that the mouse is allowed to move in.  Also, if the game is in
+	* coordinates that the mouse is allowed to move in.  Also, if the game is in
 	* a window you may want to adjust for any title bar available in
 	* the operating system.  For system specific limits and windows etc,
 	* just override this function in the device implementation of the mouse */
@@ -960,10 +966,159 @@ void Mouse::setMouseLimits( void )
 
 		m_maxX = TheDisplay->getWidth();
 		m_maxY = TheDisplay->getHeight();
-	
-	}  // end if
 
-}  // end setMouseLimits
+	}
+
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::setCursorCaptureMode(CursorCaptureMode mode)
+{
+	if (m_cursorCaptureMode != mode)
+	{
+		m_cursorCaptureMode = mode;
+		refreshCursorCapture();
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::refreshCursorCapture()
+{
+	if (canCapture())
+	{
+		capture();
+	}
+	else
+	{
+		releaseCapture();
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+Bool Mouse::isCursorCaptured()
+{
+	return m_isCursorCaptured;
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::loseFocus()
+{
+	// Free the cursor when losing window focus.
+	blockCapture(CursorCaptureBlockReason_Unfocused);
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::regainFocus()
+{
+	// Recapture the cursor when returning from desktop.
+	unblockCapture(CursorCaptureBlockReason_Unfocused);
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::onCursorMovedOutside()
+{
+	blockCapture(CursorCaptureBlockReadon_CursorIsOutside);
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::onCursorMovedInside()
+{
+	unblockCapture(CursorCaptureBlockReadon_CursorIsOutside);
+}
+
+// ------------------------------------------------------------------------------------------------
+Bool Mouse::isCursorInside() const
+{
+	return (m_captureBlockReasonBits & (1 << CursorCaptureBlockReadon_CursorIsOutside)) == 0;
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::initCapture()
+{
+	OptionPreferences prefs;
+	m_cursorCaptureMode = prefs.getCursorCaptureMode();
+
+	unblockCapture(CursorCaptureBlockReason_NoInit);
+}
+
+// ------------------------------------------------------------------------------------------------
+Bool Mouse::canCapture() const
+{
+	if (m_captureBlockReasonBits != 0)
+		return false;
+
+	DEBUG_ASSERTCRASH(TheDisplay != NULL, ("The Display is NULL"));
+	const Bool inInteractiveGame = TheGameLogic && TheGameLogic->isInInteractiveGame();
+
+	if (TheDisplay->getWindowed())
+	{
+		if (inInteractiveGame)
+		{
+			if ((m_cursorCaptureMode & CursorCaptureMode_EnabledInWindowedGame) == 0)
+				return false;
+		}
+		else
+		{
+			if ((m_cursorCaptureMode & CursorCaptureMode_EnabledInWindowedMenu) == 0)
+				return false;
+		}
+	}
+	else
+	{
+		if (inInteractiveGame)
+		{
+			if ((m_cursorCaptureMode & CursorCaptureMode_EnabledInFullscreenGame) == 0)
+				return false;
+		}
+		else
+		{
+			if ((m_cursorCaptureMode & CursorCaptureMode_EnabledInFullscreenMenu) == 0)
+				return false;
+		}
+	}
+
+	return true;
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::unblockCapture(CursorCaptureBlockReason reason)
+{
+	Bool canCaptureBefore = canCapture();
+	m_captureBlockReasonBits &= ~(1 << reason);
+	Bool canCaptureNow = canCapture();
+
+	if (canCaptureNow != canCaptureBefore)
+	{
+		DEBUG_ASSERTCRASH(canCaptureNow, ("Mouse::unblockCapture(%s): Unexpected logic", CursorCaptureBlockReasonNames[reason]));
+		capture();
+	}
+
+	DEBUG_LOG(("Mouse::unblockCapture(%s): m_captureBlockReason=%u canCapture=%d",
+		CursorCaptureBlockReasonNames[reason], m_captureBlockReasonBits, (Int)canCapture()));
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::blockCapture(CursorCaptureBlockReason reason)
+{
+	Bool canCaptureBefore = canCapture();
+	m_captureBlockReasonBits |= (1 << reason);
+	Bool canCaptureNow = canCapture();
+
+	if (canCaptureNow != canCaptureBefore)
+	{
+		DEBUG_ASSERTCRASH(!canCaptureNow, ("Mouse::blockCapture(%s): Unexpected logic", CursorCaptureBlockReasonNames[reason]));
+		releaseCapture();
+	}
+
+	DEBUG_LOG(("Mouse::blockCapture(%s): m_captureBlockReason=%u canCapture=%d",
+		CursorCaptureBlockReasonNames[reason], m_captureBlockReasonBits, (Int)canCapture()));
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::onCursorCaptured( Bool captured )
+{
+	m_isCursorCaptured = captured;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw the mouse */
@@ -1041,10 +1196,10 @@ void Mouse::drawTooltip( void )
 			UnsignedInt now = timeGetTime();
 			m_highlightPos = (width*(now-m_highlightUpdateStart))/m_tooltipFillTime;
 		}
-	}  // end if
+	}
 
 
-}  // end drawTooltip
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Draw the cursor text at the mouse position.  Note that this is *NOT* the tooltip text */
@@ -1058,13 +1213,13 @@ void Mouse::drawCursorText( void )
 
 	// get the colors to draw the text in an acceptable format
 	Color color, dropColor;
-	color = GameMakeColor( m_cursorTextColor.red, 
-												 m_cursorTextColor.green, 
-												 m_cursorTextColor.blue, 
+	color = GameMakeColor( m_cursorTextColor.red,
+												 m_cursorTextColor.green,
+												 m_cursorTextColor.blue,
 												 m_cursorTextColor.alpha );
-	dropColor = GameMakeColor( m_cursorTextDropColor.red, 
-														 m_cursorTextDropColor.green, 
-														 m_cursorTextDropColor.blue, 
+	dropColor = GameMakeColor( m_cursorTextDropColor.red,
+														 m_cursorTextDropColor.green,
+														 m_cursorTextDropColor.blue,
 														 m_cursorTextDropColor.alpha );
 
 	// get the size of the text to draw
@@ -1077,7 +1232,7 @@ void Mouse::drawCursorText( void )
 	y = m_currMouse.pos.y - height / 2;
 	m_cursorTextDisplayString->draw( x, y, color, dropColor );
 
-}  // end drawCursorText
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1086,7 +1241,7 @@ Int Mouse::getCursorIndex(const AsciiString& name)
 	if (name.isEmpty())
 		return INVALID_MOUSE_CURSOR;
 
-	/** @todo This is silly to have to define these names from INI in the code ... 
+	/** @todo This is silly to have to define these names from INI in the code ...
 		* that should be changed (CBD) */
 	static const char *CursorININames[NUM_MOUSE_CURSORS] =
 	{
@@ -1152,7 +1307,7 @@ Int Mouse::getCursorIndex(const AsciiString& name)
 			return i;
 	}
 
-	DEBUG_CRASH(( "Mouse::getCursorIndex - Invalid cursor name '%s'\n", name.str() ));
+	DEBUG_CRASH(( "Mouse::getCursorIndex - Invalid cursor name '%s'", name.str() ));
 	return INVALID_MOUSE_CURSOR;
 
 }
@@ -1161,7 +1316,7 @@ Int Mouse::getCursorIndex(const AsciiString& name)
 // ------------------------------------------------------------------------------------------------
 void Mouse::setCursor( MouseCursor cursor )
 {
-	
+
 	// if cursor has not changed do nothing
 	if( m_currentCursor == cursor )
 		return;
@@ -1180,11 +1335,11 @@ void Mouse::setCursor( MouseCursor cursor )
 										 &(cursorInfo->cursorTextColor),
 										 &(cursorInfo->cursorTextDropColor) );
 		else
-			setMouseText( UnicodeString( L"" ), NULL, NULL );
+			setMouseText( L"", NULL, NULL );
 
-	}  // end if
+	}
 
-}  // end setCursor
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse MouseCursor entry */
@@ -1196,7 +1351,7 @@ void INI::parseMouseCursorDefinition( INI* ini )
 
 	// read the name
 	c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	if( TheMouse )
 	{
diff --git a/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp b/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp
index d591f623ee8..9a1a4e66052 100644
--- a/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/LanguageFilter.cpp
@@ -23,26 +23,18 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/LanguageFilter.h"
 #include "Common/FileSystem.h"
 #include "Common/file.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 LanguageFilter *TheLanguageFilter = NULL;
 
-LanguageFilter::LanguageFilter() 
+LanguageFilter::LanguageFilter()
 {
-	//Modified by Saad
-	//Unnecessary
-	//m_wordList.clear();
 }
 
 LanguageFilter::~LanguageFilter() {
@@ -69,7 +61,7 @@ void LanguageFilter::init() {
 		}
 		UnicodeString uniword(word);
 		unHaxor(uniword);
-		//DEBUG_LOG(("Just read %ls from the bad word file.  Entered as %ls\n", word, uniword.str()));
+		//DEBUG_LOG(("Just read %ls from the bad word file.  Entered as %ls", word, uniword.str()));
 		m_wordList[uniword] = true;
 	}
 
@@ -86,15 +78,15 @@ void LanguageFilter::update() {
 
 wchar_t ignoredChars[] = L"-_*'\"";
 
-void LanguageFilter::filterLine(UnicodeString &line) 
+void LanguageFilter::filterLine(UnicodeString &line)
 {
 	WideChar *buf = NEW WideChar[line.getLength()+1];
 	wcscpy(buf, line.str());
 
 	UnicodeString newLine(line);
-	UnicodeString token(L"");
+	UnicodeString token;
 
-	while (newLine.nextToken(&token, UnicodeString(L" ;,.!?:=\\/><`~()&^%#\n\t"))) {
+	while (newLine.nextToken(&token, L" ;,.!?:=\\/><`~()&^%#\n\t")) {
 		wchar_t *pos = wcsstr(buf, token.str());
 		if (pos == NULL) {
 			DEBUG_CRASH(("Couldn't find the token in its own string."));
@@ -106,7 +98,7 @@ void LanguageFilter::filterLine(UnicodeString &line)
 		unHaxor(token);
 		LangMapIter iter = m_wordList.find(token);
 		if (iter != m_wordList.end()) {
-			DEBUG_LOG(("Found word %ls in bad word list. Token was %ls\n", (*iter).first.str(), token.str()));
+			DEBUG_LOG(("Found word %ls in bad word list. Token was %ls", (*iter).first.str(), token.str()));
 			for (Int i = 0; i < len; ++i) {
 				*pos = L'*';
 				++pos;
@@ -120,7 +112,7 @@ void LanguageFilter::filterLine(UnicodeString &line)
 
 void LanguageFilter::unHaxor(UnicodeString &word) {
 	Int len = word.getLength();
-	UnicodeString newWord(L"");
+	UnicodeString newWord;
 	for (Int i = 0; i < len; ++i) {
 		wchar_t c = word.getCharAt(i);
 		if ((c == L'p') || (c == L'P')) {
@@ -192,7 +184,7 @@ Bool LanguageFilter::readWord(File *file1, WideChar *buf) {
 	return retval;
 }
 
-LanguageFilter * createLanguageFilter() 
+LanguageFilter * createLanguageFilter()
 {
 	return NEW LanguageFilter;
 }
diff --git a/Generals/Code/GameEngine/Source/GameClient/Line2D.cpp b/Generals/Code/GameEngine/Source/GameClient/Line2D.cpp
index cbc21c856f9..3fc220d77dc 100644
--- a/Generals/Code/GameEngine/Source/GameClient/Line2D.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/Line2D.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Lib/BaseType.h"
 #include "GameClient/Line2D.h"
@@ -49,7 +49,7 @@ const static Coord2D reallyFarPoint = { 1000000.0, 1000000.0 };
 /** Clip a line to the region provided.  The source line runs from p1 to p2, and is clipped
 	* using the clipRegion.  The resulting line goes from c1 to c2
 	*
-	* Return values: 
+	* Return values:
 	*				TRUE  - Line is visible
 	*				FALSE - Line is not visible
 	*/
@@ -87,7 +87,7 @@ Bool ClipLine2D( ICoord2D *p1, ICoord2D *p2, ICoord2D *c1, ICoord2D *c2,
 	y1 = p1->y;
 	x2 = p2->x;
 	y2 = p2->y;
-		
+
 	// Test first point
 	clipCode1 = 0;
 
@@ -128,7 +128,7 @@ Bool ClipLine2D( ICoord2D *p1, ICoord2D *p2, ICoord2D *c1, ICoord2D *c2,
 		*c2 = *p2;
 		return TRUE;
 
-	}  // end if
+	}
 
 	// Both points outside window?
 	if (clipCode1 & clipCode2)
@@ -224,14 +224,14 @@ Bool ClipLine2D( ICoord2D *p1, ICoord2D *p2, ICoord2D *c1, ICoord2D *c2,
 			x2 >= clipLeft && x2 <= clipRight &&
 			y2 >= clipTop && y2 <= clipBottom);
 
-}  // end ClipLine2D
+}
 
 
-// This solution uses the 
-// http://www.faqs.org/faqs/graphics/algorithms-faq/ 
+// This solution uses the
+// http://www.faqs.org/faqs/graphics/algorithms-faq/
 // Subject 1.03
-Bool IntersectLine2D( const Coord2D *a, const Coord2D *b, 
-										   const Coord2D *c, const Coord2D *d, 
+Bool IntersectLine2D( const Coord2D *a, const Coord2D *b,
+										   const Coord2D *c, const Coord2D *d,
 											 Coord2D *intersection)
 {
 	if (!a || !b || !c || !d) {
@@ -265,7 +265,7 @@ Bool IntersectLine2D( const Coord2D *a, const Coord2D *b,
 
 // determines whether a point lies within a rectangle. Doesnt' determine whether the shape is
 // actually a rectangle or not.
-Bool PointInsideRect2D(const Coord2D *bl, const Coord2D *tl, const Coord2D *br, const Coord2D *tr, 
+Bool PointInsideRect2D(const Coord2D *bl, const Coord2D *tl, const Coord2D *br, const Coord2D *tr,
 											 const Coord2D *inputPoint)
 {
 	if (!(bl && br && tl && tr && inputPoint)) {
@@ -379,7 +379,7 @@ void ShortestDistancePointToSegment2D( const Coord2D *a, const Coord2D *b, const
 		Coord2D segment;
 		segment.x = pt->x - a->x;
 		segment.y = pt->y - a->y;
-		if (outDistance) {		
+		if (outDistance) {
 			(*outDistance) = segment.length();
 		}
 
@@ -415,7 +415,7 @@ void ShortestDistancePointToSegment2D( const Coord2D *a, const Coord2D *b, const
 	if (outDistance) {
 		(*outDistance) = intersectSegment.length();
 	}
-	
+
 	if (outU) {
 		(*outU) = u;
 	}
diff --git a/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp b/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp
deleted file mode 100644
index 2969b1cac3d..00000000000
--- a/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp
+++ /dev/null
@@ -1,1277 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: MapUtil.cpp //////////////////////////////////////////////////////////////////////////////
-// Author: Matt Campbell, December 2001
-// Description: Map utility/convenience routines
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/crc.h"
-#include "Common/FileSystem.h"
-#include "Common/LocalFileSystem.h"
-#include "Common/file.h"
-#include "Common/GlobalData.h"
-#include "Common/GameState.h"
-#include "Common/GameEngine.h"
-#include "Common/NameKeyGenerator.h"
-#include "Common/DataChunk.h"
-#include "Common/MapReaderWriterInfo.h"
-#include "Common/MessageStream.h"
-#include "Common/WellKnownKeys.h"
-#include "Common/INI.h"
-#include "Common/QuotedPrintable.h"
-#include "Common/SkirmishBattleHonors.h"
-#include "Common/ThingFactory.h"
-#include "Common/ThingTemplate.h"
-#include "Common/MapObject.h"
-#include "GameClient/GameText.h" 
-#include "GameClient/WindowLayout.h"
-#include "GameClient/Gadget.h"
-#include "GameClient/Image.h"
-#include "GameClient/Shell.h"
-#include "GameClient/GameWindowManager.h"
-#include "GameClient/GadgetListBox.h"
-#include "GameClient/MapUtil.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/FPUControl.h"
-#include "GameNetwork/GameInfo.h"
-#include "GameNetwork/NetworkDefs.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-------------------------------------------------------------------------------
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-static const char *mapExtension = ".map";
-
-static Int m_width = 0;						///< Height map width.
-static Int m_height = 0;					///< Height map height (y size of array).
-static Int m_borderSize = 0;			///< Non-playable border area.
-static std::vector<ICoord2D> m_boundaries;	///< All the boundaries we use for the map
-static Int m_dataSize = 0;				///< size of m_data.
-static UnsignedByte *m_data = 0;	///< array of z(height) values in the height map.
-static Dict worldDict = 0;
-
-static WaypointMap *m_waypoints = 0;
-static Coord3DList	m_supplyPositions;
-static Coord3DList	m_techPositions;
-
-static Int m_mapDX = 0;
-static Int m_mapDY = 0;
-
-static UnsignedInt calcCRC( AsciiString dirName, AsciiString fname )
-{
-	CRC theCRC;
-	theCRC.clear();
-
-	// Try the official map dir
-	AsciiString asciiFile;
-	char	tempBuf[_MAX_PATH];
-	char	filenameBuf[_MAX_PATH];
-	int length = 0;
-	strcpy(tempBuf, fname.str());
-	length = strlen( tempBuf );
-	if( length >= 4 )
-	{
-		memset( filenameBuf, '\0', _MAX_PATH);
-		strncpy( filenameBuf, tempBuf, length - 4);
-	}
-
-	File *fp;
-	asciiFile = fname;
-	fp = TheFileSystem->openFile(asciiFile.str(), File::READ);
-	if( !fp )
-	{
-		DEBUG_CRASH(("Couldn't open '%s'\n", fname.str()));
-		return 0;
-	}
-
-	UnsignedByte buf[4096];
-	Int num;
-	while ( (num=fp->read(buf, 4096)) > 0 )
-	{
-		theCRC.computeCRC(buf, num);
-	}
-
-	fp->close();
-	fp = NULL;
-
-	return theCRC.get();
-}
-
-static Bool ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	Bool readDict = info->version >= K_OBJECTS_VERSION_2;
-
-	Coord3D loc;
-	loc.x = file.readReal();
-	loc.y = file.readReal();
-	loc.z = file.readReal();
-	if (info->version <= K_OBJECTS_VERSION_2) 
-	{
-		loc.z = 0;
-	}
-
-	Real angle = file.readReal();
-	Int flags = file.readInt(); 
-	AsciiString name = file.readAsciiString();
-	Dict d;
-	if (readDict)
-	{
-		d = file.readDict();
-	}
-	MapObject *pThisOne;
-	
-	// create the map object
-	pThisOne = newInstance( MapObject )( loc, name, angle, flags, &d, 
-														TheThingFactory->findTemplate( name ) );
-
-//DEBUG_LOG(("obj %s owner %s\n",name.str(),d.getAsciiString(TheKey_originalOwner).str()));
-
-	if (pThisOne->getProperties()->getType(TheKey_waypointID) == Dict::DICT_INT)
-	{
-		pThisOne->setIsWaypoint();
-
-		// grab useful info
-		(*m_waypoints)[pThisOne->getWaypointName()] = loc;
-	}
-	else if (pThisOne->getThingTemplate() && pThisOne->getThingTemplate()->isKindOf(KINDOF_TECH_BUILDING))
-	{
-		m_techPositions.push_back(loc);
-	}
-	else if (pThisOne->getThingTemplate() && pThisOne->getThingTemplate()->isKindOf(KINDOF_SUPPLY_SOURCE_ON_PREVIEW))
-	{
-		m_supplyPositions.push_back(loc);
-	}
-
-	deleteInstance(pThisOne);
-	return TRUE;
-}
-
-static Bool ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	file.m_currentObject = NULL;
-	file.registerParser( AsciiString("Object"), info->label, ParseObjectDataChunk );
-	return (file.parse(userData));
-}
-
-static Bool ParseWorldDictDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	worldDict = file.readDict();
-	return true;
-}
-
-static Bool ParseSizeOnly(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	m_width = file.readInt();
-	m_height = file.readInt();
-	if (info->version >= K_HEIGHT_MAP_VERSION_3) {
-		m_borderSize = file.readInt();
-	} else {
-		m_borderSize = 0;
-	}
-
-	if (info->version >= K_HEIGHT_MAP_VERSION_4) {
-		Int numBorders = file.readInt();
-		m_boundaries.resize(numBorders);
-		for (int i = 0; i < numBorders; ++i) {
-			m_boundaries[i].x = file.readInt();
-			m_boundaries[i].y = file.readInt();
-		}
-	}
-	return true;
-
-	m_dataSize = file.readInt();
-	m_data = NEW UnsignedByte[m_dataSize];	// pool[]ify
-	if (m_dataSize <= 0 || (m_dataSize != (m_width*m_height))) {
-		throw ERROR_CORRUPT_FILE_FORMAT	;
-	}
-	file.readArrayOfBytes((char *)m_data, m_dataSize);
-	// Resize me. 
-	if (info->version == K_HEIGHT_MAP_VERSION_1) {
-		Int newWidth = (m_width+1)/2;
-		Int newHeight = (m_height+1)/2;
-		Int i, j;
-		for (i=0; i<newHeight; i++) {
-			for (j=0; j<newWidth; j++) {
-				m_data[i*newWidth+j] = m_data[2*i*m_width+2*j];
-			}
-		}
-		m_width = newWidth;
-		m_height = newHeight;
-	}
-	return true;
-}
-
-static Bool ParseSizeOnlyInChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	return ParseSizeOnly(file, info, userData);
-}
-
-static Bool loadMap( AsciiString filename )
-{
-	char	tempBuf[_MAX_PATH];
-	char	filenameBuf[_MAX_PATH];
-	AsciiString asciiFile;
-	int length = 0;
-
-	strcpy(tempBuf, filename.str());
-
-	length = strlen( tempBuf );
-	if( length >= 4 )
-	{
-		memset( filenameBuf, '\0', _MAX_PATH);
-		strncpy( filenameBuf, tempBuf, length - 4);
-	}
-
-	CachedFileInputStream fileStrm;
-
-	asciiFile = filename;
-	if( !fileStrm.open(asciiFile) )
-	{
-		return FALSE;
-	}
-
-	ChunkInputStream *pStrm = &fileStrm;
-
-	DataChunkInput file( pStrm );
-
-	m_waypoints = NEW WaypointMap;
-
-	file.registerParser( AsciiString("HeightMapData"), AsciiString::TheEmptyString, ParseSizeOnlyInChunk );
-	file.registerParser( AsciiString("WorldInfo"), AsciiString::TheEmptyString, ParseWorldDictDataChunk );
-	file.registerParser( AsciiString("ObjectsList"), AsciiString::TheEmptyString, ParseObjectsDataChunk );
-	if (!file.parse(NULL)) {
-		throw(ERROR_CORRUPT_FILE_FORMAT);
-	}
-
-	m_mapDX = m_width  - 2*m_borderSize;
-	m_mapDY = m_height - 2*m_borderSize;
-
-	return TRUE;
-}
-
-static void resetMap( void )
-{
-	if (m_data)
-	{
-		delete[] m_data;
-		m_data = 0;
-	}
-
-	if (m_waypoints)
-	{
-		delete m_waypoints;
-		m_waypoints = 0;
-	}
-	m_techPositions.clear();
-	m_supplyPositions.clear();
-}
-
-static void getExtent( Region3D *extent )
-{
-	extent->lo.x = 0.0f;
-
-	extent->lo.y = 0.0f;
-
-	// Note - m_mapDX & Y are the number of height map grids wide, so we have to
-	// multiply by the grid width.
-	extent->hi.x = m_mapDX*MAP_XY_FACTOR;
-	extent->hi.y = m_mapDY*MAP_XY_FACTOR;
-
-	extent->lo.z = 0;
-	extent->hi.z = 0;
-}
-
-//-------------------------------------------------------------------------------
-
-void WaypointMap::update( void )
-{
-	if (!m_waypoints)
-	{
-		m_numStartSpots = 1;
-		return;
-	}
-
-	this->clear();
-
-	AsciiString startingCamName = TheNameKeyGenerator->keyToName(TheKey_InitialCameraPosition);
-	WaypointMap::const_iterator it;
-
-	it = m_waypoints->find(startingCamName);
-	if (it != m_waypoints->end())
-	{
-		(*this)[startingCamName] = it->second;
-	}
-
-	m_numStartSpots = 0;
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		startingCamName.format("Player_%d_Start", i+1); // start pos waypoints are 1-based
-		it = m_waypoints->find(startingCamName);
-		if (it != m_waypoints->end())
-		{
-			(*this)[startingCamName] = it->second;
-			++m_numStartSpots;
-		}
-		else
-		{
-			break;
-		}
-	}
-
-	m_numStartSpots = max(1, m_numStartSpots);
-}
-
-const char * MapCache::m_mapCacheName = "MapCache.ini";
-
-AsciiString MapCache::getMapDir() const 
-{ 
-	return AsciiString("Maps"); 
-}
-
-AsciiString MapCache::getUserMapDir() const
-{
-	AsciiString tmp = TheGlobalData->getPath_UserData();
-	tmp.concat(getMapDir());
-	return tmp;
-}
-
-AsciiString MapCache::getMapExtension() const
-{
-	return AsciiString("map");
-}
-
-void MapCache::writeCacheINI( Bool userDir )
-{
-	AsciiString mapDir;
-	if (!userDir || TheGlobalData->m_buildMapCache)
-	{
-		mapDir = getMapDir();
-	}
-	else
-	{
-		mapDir = getUserMapDir();
-	}
-
-	AsciiString filepath = mapDir;
-	filepath.concat('\\');
-
-	TheFileSystem->createDirectory(mapDir);
-
-	filepath.concat(m_mapCacheName);
-	FILE *fp = fopen(filepath.str(), "w");
-	DEBUG_ASSERTCRASH(fp != NULL, ("Failed to create %s", filepath.str()));
-	if (fp == NULL) {
-		return;
-	}
-	fprintf(fp, "; FILE: %s /////////////////////////////////////////////////////////////\n", filepath.str());
-	fprintf(fp, "; This INI file is auto-generated - do not modify\n");
-	fprintf(fp, "; /////////////////////////////////////////////////////////////////////////////\n");
-	mapDir.toLower();
-
-	MapCache::iterator it = begin();
-	MapMetaData md;
-	while (it != end())
-	{
-		if (it->first.startsWithNoCase(mapDir.str()))
-		{
-			md = it->second;
-			fprintf(fp, "\nMapCache %s\n", AsciiStringToQuotedPrintable(it->first.str()).str());
-			fprintf(fp, "  fileSize = %u\n", md.m_filesize);
-			fprintf(fp, "  fileCRC = %u\n", md.m_CRC);
-			fprintf(fp, "  timestampLo = %d\n", md.m_timestamp.m_lowTimeStamp);
-			fprintf(fp, "  timestampHi = %d\n", md.m_timestamp.m_highTimeStamp);
-			fprintf(fp, "  isOfficial = %s\n", (md.m_isOfficial)?"yes":"no");
-
-			fprintf(fp, "  isMultiplayer = %s\n", (md.m_isMultiplayer)?"yes":"no");
-			fprintf(fp, "  numPlayers = %d\n", md.m_numPlayers);
-
-			fprintf(fp, "  extentMin = X:%2.2f Y:%2.2f Z:%2.2f\n", md.m_extent.lo.x, md.m_extent.lo.y, md.m_extent.lo.z);
-			fprintf(fp, "  extentMax = X:%2.2f Y:%2.2f Z:%2.2f\n", md.m_extent.hi.x, md.m_extent.hi.y, md.m_extent.hi.z);
-
-			fprintf(fp, "  displayName = %s\n", UnicodeStringToQuotedPrintable(md.m_displayName).str());
-
-			Coord3D pos;
-			WaypointMap::iterator itw = md.m_waypoints.begin();
-			while (itw != md.m_waypoints.end())
-			{
-				pos = itw->second;
-				fprintf(fp, "  %s = X:%2.2f Y:%2.2f Z:%2.2f\n", itw->first.str(), pos.x, pos.y, pos.z);
-				++itw;
-			}
-			Coord3DList::iterator itc3d = md.m_techPositions.begin();
-			while (itc3d != md.m_techPositions.end())
-			{
-				pos = *itc3d;
-				fprintf(fp, "  techPosition = X:%2.2f Y:%2.2f Z:%2.2f\n", pos.x, pos.y, pos.z);
-				itc3d++;
-			}
-			
-			itc3d = md.m_supplyPositions.begin();
-			while (itc3d != md.m_supplyPositions.end())
-			{
-				pos = *itc3d;
-				fprintf(fp, "  supplyPosition = X:%2.2f Y:%2.2f Z:%2.2f\n", pos.x, pos.y, pos.z);
-				itc3d++;
-			}
-			fprintf(fp, "END\n\n");
-		}
-		else
-		{
-			//DEBUG_LOG(("%s does not start %s\n", mapDir.str(), it->first.str()));
-		}
-		++it;
-	}
-
-	fclose(fp);
-}
-
-void MapCache::updateCache( void )
-{
-	setFPMode();
-
-	TheFileSystem->createDirectory(getUserMapDir());
-
-	if (loadUserMaps())
-	{
-		writeCacheINI( TRUE );
-	}
-	loadStandardMaps();	// we shall overwrite info from matching user maps to prevent munkees from getting rowdy :)
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheLocalFileSystem->doesFileExist(getMapDir().str()))
-	{
-		// only create the map cache file if "Maps" exist
-		Bool wasBuildMapCache = TheGlobalData->m_buildMapCache;
-		TheWritableGlobalData->m_buildMapCache = true;
-		loadUserMaps();
-		TheWritableGlobalData->m_buildMapCache = wasBuildMapCache;
-		writeCacheINI( FALSE );
-	}
-#endif
-}
-
-Bool MapCache::clearUnseenMaps( AsciiString dirName )
-{
-	dirName.toLower();
-	Bool erasedSomething = FALSE;
-
-	std::map<AsciiString, Bool>::iterator it = m_seen.begin();
-
-	while (it != m_seen.end())
-	{
-		AsciiString mapName = it->first;
-		if (it->second == FALSE && mapName.startsWithNoCase(dirName.str()))
-		{
-			// not seen in the dir - clear it out.
-			erase(mapName);
-			erasedSomething = TRUE;
-		}
-		++it;
-	}
-	return erasedSomething;
-}
-
-void MapCache::loadStandardMaps(void)
-{
-	INI ini;
-	AsciiString fname;
-	fname.format("%s\\%s", getMapDir().str(), m_mapCacheName);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	File *fp = TheFileSystem->openFile(fname.str(), File::READ);
-	if (fp != NULL)
-	{
-		fp->close();
-		fp = NULL;
-#endif
-		ini.load( fname, INI_LOAD_OVERWRITE, NULL );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	}
-#endif
-}
-
-Bool MapCache::loadUserMaps()
-{
-	// Read in map list from disk
-	AsciiString mapDir;
-	if (TheGlobalData->m_buildMapCache)
-	{
-		mapDir = getMapDir();
-	}
-	else
-	{
-		mapDir = getUserMapDir();
-
-		INI ini;
-		AsciiString fname;
-		fname.format("%s\\%s", mapDir.str(), m_mapCacheName);
-		File *fp = TheFileSystem->openFile(fname.str(), File::READ);
-		if (fp)
-		{
-			fp->close();
-			ini.load( fname, INI_LOAD_OVERWRITE, NULL );
-		}
-
-	}
-
-	// mark all as unseen
-	m_seen.clear();
-	MapCache::iterator it = begin();
-	while (it != end())
-	{
-		m_seen[it->first] = FALSE;
-		++it;
-	}
-
-	FilenameList filenameList;
-	FilenameListIter iter;
-	AsciiString toplevelPattern;
-	toplevelPattern.format("%s\\", mapDir.str());
-	Bool parsedAMap = FALSE;
-	AsciiString filenamepattern;
-	filenamepattern.format("*.%s", getMapExtension().str());
-
-	TheFileSystem->getFileListInDirectory(toplevelPattern, filenamepattern, filenameList, TRUE);
-
-	iter = filenameList.begin();
-
-	while (iter != filenameList.end()) {
-		FileInfo fileInfo;
-		AsciiString tempfilename;
-		tempfilename = (*iter);
-		tempfilename.toLower();
-
-		const char *s = tempfilename.reverseFind('\\');
-		if (!s)
-		{
-			DEBUG_CRASH(("Couldn't find \\ in map name!"));
-		}
-		else
-		{
-			AsciiString endingStr;
-			AsciiString fname = s+1;
-			for (size_t i=0; i<strlen(mapExtension); ++i)
-				fname.removeLastChar();
-
-			endingStr.format("%s\\%s%s", fname.str(), fname.str(), mapExtension);
-
-			Bool skipMap = FALSE;
-			if (TheGlobalData->m_buildMapCache)
-			{
-				std::set<AsciiString>::const_iterator sit = m_allowedMaps.find(fname);
-				if (m_allowedMaps.size() != 0 && sit == m_allowedMaps.end())
-				{
-					//DEBUG_LOG(("Skipping map: '%s'\n", fname.str()));
-					skipMap = TRUE;
-				}
-				else
-				{
-					//DEBUG_LOG(("Parsing map: '%s'\n", fname.str()));
-				}
-			}
-
-			if (!skipMap)
-			{
-				if (!tempfilename.endsWithNoCase(endingStr.str()))
-				{
-					DEBUG_CRASH(("Found map '%s' in wrong spot (%s)", fname.str(), tempfilename.str()));
-				}
-				else
-				{
-					if (TheFileSystem->getFileInfo(tempfilename, &fileInfo)) {
-						char funk[_MAX_PATH];
-						strcpy(funk, tempfilename.str());
-						char *filenameptr = funk;
-						char *tempchar = funk;
-						while (*tempchar != 0) {
-							if ((*tempchar == '\\') || (*tempchar == '/')) {
-								filenameptr = tempchar+1;
-							}
-							++tempchar;
-						}
-
-						m_seen[tempfilename] = TRUE;
-						parsedAMap |= addMap(mapDir, *iter, &fileInfo, TheGlobalData->m_buildMapCache);
-					} else {
-						DEBUG_CRASH(("Could not get file info for map %s", (*iter).str()));
-					}
-				}
-			}
-		}
-		iter++;
-	}
-
-	// clean out unseen maps
-	if (clearUnseenMaps(mapDir))
-		return TRUE;
-
-	return parsedAMap;
-}
-
-//Bool MapCache::addMap( AsciiString dirName, AsciiString fname, WinTimeStamp timestamp, UnsignedInt filesize, Bool isOfficial )
-Bool MapCache::addMap( AsciiString dirName, AsciiString fname, FileInfo *fileInfo, Bool isOfficial)
-{
-	if (fileInfo == NULL) {
-		return FALSE;
-	}
-
-	AsciiString lowerFname;
-	lowerFname = fname;
-	lowerFname.toLower();
-	MapCache::iterator it = find(lowerFname);
-
-	MapMetaData md;
-	UnsignedInt filesize = fileInfo->sizeLow;
-
-	if (it != end())
-	{
-		// Found the map in our cache.  Check to see if it has changed.
-		md = it->second;
-
-		if ((md.m_filesize == filesize) &&
-				(md.m_CRC != 0))
-		{
-//			DEBUG_LOG(("MapCache::addMap - found match for map %s\n", lowerFname.str()));
-			return FALSE;	// OK, it checks out.
-		}
-		DEBUG_LOG(("%s didn't match file in MapCache\n", fname.str()));
-		DEBUG_LOG(("size: %d / %d\n", filesize, md.m_filesize));
-		DEBUG_LOG(("time1: %d / %d\n", fileInfo->timestampHigh, md.m_timestamp.m_highTimeStamp));
-		DEBUG_LOG(("time2: %d / %d\n", fileInfo->timestampLow, md.m_timestamp.m_lowTimeStamp));
-//		DEBUG_LOG(("size: %d / %d\n", filesize, md.m_filesize));
-//		DEBUG_LOG(("time1: %d / %d\n", timestamp.m_highTimeStamp, md.m_timestamp.m_highTimeStamp));
-//		DEBUG_LOG(("time2: %d / %d\n", timestamp.m_lowTimeStamp, md.m_timestamp.m_lowTimeStamp));
-	}
-
-	DEBUG_LOG(("MapCache::addMap(): caching '%s' because '%s' was not found\n", fname.str(), lowerFname.str()));
-
-	loadMap(fname); // Just load for querying the data, since we aren't playing this map.
-
-	// The map is now loaded.  Pick out what we need.
-	md.m_fileName = lowerFname;
-	md.m_filesize = filesize;
-	md.m_isOfficial = isOfficial;
-	md.m_waypoints.update();
-	md.m_numPlayers = md.m_waypoints.m_numStartSpots;
-	md.m_isMultiplayer = (md.m_numPlayers >= 2);
-	md.m_timestamp.m_highTimeStamp = fileInfo->timestampHigh;
-	md.m_timestamp.m_lowTimeStamp = fileInfo->timestampLow;
-	md.m_supplyPositions = m_supplyPositions;
-	md.m_techPositions = m_techPositions;
-	md.m_CRC = calcCRC(dirName, fname);
-
-	Bool exists = false;
-	AsciiString munkee = worldDict.getAsciiString(TheKey_mapName, &exists);
-	if (!exists || munkee.isEmpty())
-	{
-		DEBUG_LOG(("Missing TheKey_mapName!\n"));
-		AsciiString tempdisplayname;
-		tempdisplayname = fname.reverseFind('\\') + 1;
-		md.m_displayName.translate(tempdisplayname);
-		if (md.m_numPlayers >= 2)
-		{
-			UnicodeString extension;
-			extension.format(L" (%d)", md.m_numPlayers);
-			md.m_displayName.concat(extension);
-		}
-		TheGameText->reset();
-	}
-	else
-	{
-		AsciiString stringFileName;
-		stringFileName.format("%s\\%s", dirName.str(), fname.str());
-		for (Int i=0; i<4; ++i)
-			stringFileName.removeLastChar();
-		stringFileName.concat("\\map.str");
-		TheGameText->initMapStringFile(stringFileName);
-		md.m_displayName = TheGameText->fetch(munkee);
-		if (md.m_numPlayers >= 2)
-		{
-			UnicodeString extension;
-			extension.format(L" (%d)", md.m_numPlayers);
-			md.m_displayName.concat(extension);
-		}
-		DEBUG_LOG(("Map name is now '%ls'\n", md.m_displayName.str()));
-		TheGameText->reset();
-	}
-
-	getExtent(&(md.m_extent));
-
-	(*this)[lowerFname] = md;
-
-	DEBUG_LOG(("  filesize = %d bytes\n", md.m_filesize));
-	DEBUG_LOG(("  displayName = %ls\n", md.m_displayName.str()));
-	DEBUG_LOG(("  CRC = %X\n", md.m_CRC));
-	DEBUG_LOG(("  timestamp = %d\n", md.m_timestamp));
-	DEBUG_LOG(("  isOfficial = %s\n", (md.m_isOfficial)?"yes":"no"));
-
-	DEBUG_LOG(("  isMultiplayer = %s\n", (md.m_isMultiplayer)?"yes":"no"));
-	DEBUG_LOG(("  numPlayers = %d\n", md.m_numPlayers));
-
-	DEBUG_LOG(("  extent = (%2.2f,%2.2f) -> (%2.2f,%2.2f)\n",
-		md.m_extent.lo.x, md.m_extent.lo.y,
-		md.m_extent.hi.x, md.m_extent.hi.y));
-
-	Coord3D pos;
-	WaypointMap::iterator itw = md.m_waypoints.begin();
-	while (itw != md.m_waypoints.end())
-	{
-		pos = itw->second;
-		DEBUG_LOG(("    waypoint %s: (%2.2f,%2.2f)\n", itw->first.str(), pos.x, pos.y));
-		++itw;
-	}
-
-	resetMap();
-
-	return TRUE;
-}
-
-MapCache *TheMapCache = NULL;
-
-// PUBLIC FUNCTIONS //////////////////////////////////////////////////////////////////////////////
-
-Bool WouldMapTransfer( const AsciiString& mapName )
-{
-	return mapName.startsWithNoCase(TheMapCache->getUserMapDir());
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Load the listbox with all the map files available to play */
-//-------------------------------------------------------------------------------------------------
-Int populateMapListboxNoReset( GameWindow *listbox, Bool useSystemMaps, Bool isMultiplayer, AsciiString mapToSelect )
-{
-	if(!TheMapCache)
-		return -1;
-
-	if (!listbox)
-		return -1;
-	
-	// reset the listbox content
-	//GadgetListBoxReset( listbox );
-	
-	Int numColumns = GadgetListBoxGetNumColumns( listbox );
-	const Image *easyImage = NULL;
-	const Image *mediumImage = NULL;
-	const Image *brutalImage = NULL;
-	SkirmishBattleHonors *battleHonors = NULL;
-	Int w = 10, h = 10;
-	if (numColumns > 1)
-	{
-		easyImage = TheMappedImageCollection->findImageByName("Star-Bronze");
-		mediumImage = TheMappedImageCollection->findImageByName("Star-Silver");
-		brutalImage = TheMappedImageCollection->findImageByName("Star-Gold");
-		battleHonors = new SkirmishBattleHonors;
-
-		w = (brutalImage)?brutalImage->getImageWidth():10;
-		w = min(GadgetListBoxGetColumnWidth(listbox, 0), w);
-		h = w;
-	}
-
-	Color color = GameMakeColor( 255, 255, 255, 255 );
-	UnicodeString mapDisplayName;
-
-	Int selectionIndex = 0; // always select *something*
-
-	MapCache::iterator it = TheMapCache->begin();
-	AsciiString mapDir;
-	if (useSystemMaps)
-	{
-		mapDir = TheMapCache->getMapDir();
-	}
-	else
-	{
-		mapDir = TheGlobalData->getPath_UserData();
-		mapDir.concat(TheMapCache->getMapDir());
-	}
-	mapDir.toLower();
-
-typedef std::set<UnicodeString, rts::less_than_nocase<UnicodeString> > MapNameList;
-typedef MapNameList::iterator MapNameListIter;
-
-typedef std::map<UnicodeString, AsciiString> MapDisplayToFileNameList;
-typedef MapDisplayToFileNameList::iterator MapDisplayToFileNameListIter;
-
-	MapNameList tempCache;
-	MapDisplayToFileNameList filenameMap;
-	UnsignedInt numMapsListed = 0;
-	UnsignedInt curNumPlayersInMap = 0;
-
-	while (numMapsListed < TheMapCache->size()) {
-
-		DEBUG_LOG(("Adding maps with %d players\n", curNumPlayersInMap));
-		it = TheMapCache->begin();
-		while (it != TheMapCache->end()) {
-			const MapMetaData *md = &(it->second);
-			if (md != NULL) {
-				if (md->m_numPlayers == curNumPlayersInMap) {
-					tempCache.insert(it->second.m_displayName);
-					filenameMap[it->second.m_displayName] = it->first;
-					DEBUG_LOG(("Adding map %s to temp cache.\n", it->first.str()));
-					++numMapsListed;
-				}
-			}
-			++it;
-		}
-
-		MapNameListIter tempit = tempCache.begin();
-
-		while (tempit != tempCache.end())
-		{
-
-			AsciiString asciiMapName;
-			asciiMapName = filenameMap[*tempit];
-			it = TheMapCache->find(asciiMapName);
-			/*
-			if (it != TheMapCache->end())
-			{
-				DEBUG_LOG(("populateMapListbox(): looking at %s (displayName = %ls), mp = %d (== %d?) mapDir=%s (ok=%d)\n",
-					it->first.str(), it->second.m_displayName.str(), it->second.m_isMultiplayer, isMultiplayer,
-					mapDir.str(), it->first.startsWith(mapDir.str())));
-			}
-			*/
-
-			DEBUG_ASSERTCRASH(it != TheMapCache->end(), ("Map %s not found in map cache.", *tempit));
-			if (it->first.startsWithNoCase(mapDir.str()) && isMultiplayer == it->second.m_isMultiplayer && !it->second.m_displayName.isEmpty())
-			{
-				/// @todo: mapDisplayName = TheGameText->fetch(it->second.m_displayName.str());
-				mapDisplayName = it->second.m_displayName;
-				Int index = -1;
-				Int imageItemData = -1;
-				if (numColumns > 1 && it->second.m_isMultiplayer)
-				{
-					Int numEasy = battleHonors->getEnduranceMedal(it->first.str(), SLOT_EASY_AI);
-					Int numMedium = battleHonors->getEnduranceMedal(it->first.str(), SLOT_MED_AI);
-					Int numBrutal = battleHonors->getEnduranceMedal(it->first.str(), SLOT_BRUTAL_AI);
-					if (numBrutal)
-					{
-						imageItemData = 3;
-						index = GadgetListBoxAddEntryImage( listbox, brutalImage, index, 0, w, h, TRUE);
-					}
-					else if (numMedium)
-					{
-						imageItemData = 2;
-						index = GadgetListBoxAddEntryImage( listbox, mediumImage, index, 0, w, h, TRUE);
-					}
-					else if (numEasy)
-					{
-						imageItemData = 1;
-						index = GadgetListBoxAddEntryImage( listbox, easyImage, index, 0, w, h, TRUE);
-					}
-					else
-					{
-						imageItemData = 0;
-						index = GadgetListBoxAddEntryImage( listbox, NULL, index, 0, w, h, TRUE);
-					}
-				}
-				index = GadgetListBoxAddEntryText( listbox, mapDisplayName, color, index, numColumns-1 );
-
-				if (it->first == mapToSelect)
-				{
-					selectionIndex = index;
-				}
-
-				// now set the char* as the item data.  this works because the map cache isn't being
-				// modified while a map listbox is up.
-				GadgetListBoxSetItemData( listbox, (void *)(it->first.str()), index );
-
-				if (numColumns > 1)
-				{
-					GadgetListBoxSetItemData( listbox, (void *)imageItemData, index, 1 );
-				}
-			}
-			++tempit;
-		}
-
-		tempCache.clear();
-		filenameMap.clear();
-		++curNumPlayersInMap;
-	}
-
-	if (battleHonors)
-	{
-		delete battleHonors;
-		battleHonors = NULL;
-	}
-
-	GadgetListBoxSetSelected(listbox, &selectionIndex, 1);
-	if (selectionIndex >= 0)
-	{
-		Int topIndex = GadgetListBoxGetTopVisibleEntry(listbox);
-		Int bottomIndex = GadgetListBoxGetBottomVisibleEntry(listbox);
-		Int rowsOnScreen = bottomIndex - topIndex;
-
-		if (selectionIndex >= bottomIndex)
-		{
-			Int newTop = max( 0, selectionIndex - max( 1, rowsOnScreen / 2 ) ); 
-		//The trouble is that rowsonscreen/2 can be zero if bottom is 1 and top is zero
-			GadgetListBoxSetTopVisibleEntry( listbox, newTop );
-		}
-	}
-	return selectionIndex;
-
-}  // end loadMapListbox
-
-//-------------------------------------------------------------------------------------------------
-/** Load the listbox with all the map files available to play */
-//-------------------------------------------------------------------------------------------------
-Int populateMapListbox( GameWindow *listbox, Bool useSystemMaps, Bool isMultiplayer, AsciiString mapToSelect )
-{
-	if(!TheMapCache)
-		return -1;
-
-	if (!listbox)
-		return -1;
-	
-	// reset the listbox content
-	GadgetListBoxReset( listbox );
-
-	return populateMapListboxNoReset( listbox, useSystemMaps, isMultiplayer, mapToSelect );
-}
-	
-
-
-//-------------------------------------------------------------------------------------------------
-/** Validate a map */
-//-------------------------------------------------------------------------------------------------
-Bool isValidMap( AsciiString mapName, Bool isMultiplayer )
-{
-	if(!TheMapCache || mapName.isEmpty())
-		return FALSE;
-	TheMapCache->updateCache();
-
-	mapName.toLower();
-	MapCache::iterator it = TheMapCache->find(mapName);
-	if (it != TheMapCache->end())
-	{
-		if (isMultiplayer == it->second.m_isMultiplayer)
-		{
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}  // end isValidMap
-
-//-------------------------------------------------------------------------------------------------
-/** Find a valid map */
-//-------------------------------------------------------------------------------------------------
-AsciiString getDefaultMap( Bool isMultiplayer )
-{
-	if(!TheMapCache)
-		return AsciiString::TheEmptyString;
-	TheMapCache->updateCache();
-
-	MapCache::iterator it = TheMapCache->begin();
-	while (it != TheMapCache->end())
-	{
-		if (isMultiplayer == it->second.m_isMultiplayer)
-		{
-			return it->first;
-		}
-		++it;
-	}
-
-	return AsciiString::TheEmptyString;
-}  // end isValidMap
-
-const MapMetaData *MapCache::findMap(AsciiString mapName)
-{
-	mapName.toLower();
-	MapCache::iterator it = find(mapName);
-	if (it == end())
-		return NULL;
-	return &(it->second);
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Embed the pristine map into the xfer stream */
-// ------------------------------------------------------------------------------------------------
-static void copyFromBigToDir( const AsciiString& infile, const AsciiString& outfile )
-{
-	// open the map file
-
-	File *file = TheFileSystem->openFile( infile.str(), File::READ | File::BINARY );
-	if( file == NULL )
-	{
-		DEBUG_CRASH(( "copyFromBigToDir - Error opening source file '%s'\n", infile.str() ));
-		throw SC_INVALID_DATA;
-	} // end if
-
-	// how big is the map file
-	Int fileSize = file->seek( 0, File::END );
-
-
-	// rewind to beginning of file
-	file->seek( 0, File::START );
-
-	// allocate buffer big enough to hold the entire map file
-	char *buffer = NEW char[ fileSize ];
-	if( buffer == NULL )
-	{
-		DEBUG_CRASH(( "copyFromBigToDir - Unable to allocate buffer for file '%s'\n", infile.str() ));
-		throw SC_INVALID_DATA;
-	} // end if
-
-	// copy the file to the buffer
-	if( file->read( buffer, fileSize ) < fileSize )
-	{
-		DEBUG_CRASH(( "copyFromBigToDir - Error reading from file '%s'\n", infile.str() ));
-		throw SC_INVALID_DATA;
-	} // end if
-	// close the BIG file
-	file->close();
-	
-	File *filenew = TheFileSystem->openFile( outfile.str(), File::WRITE | File::CREATE | File::BINARY );
-	
-	if( !filenew || filenew->write(buffer, fileSize) < fileSize)
-	{
-		DEBUG_CRASH(( "copyFromBigToDir - Error writing to file '%s'\n", outfile.str() ));
-		throw SC_INVALID_DATA;
-	} // end if
-
-	filenew->close();
-
-	// delete the buffer
-	delete [] buffer;
-} // end embedPristineMap
-
-Image *getMapPreviewImage( AsciiString mapName )
-{
-	if(!TheGlobalData)
-		return NULL;
-	DEBUG_LOG(("%s Map Name \n", mapName.str()));
-	AsciiString tgaName = mapName;
-	AsciiString name;
-	AsciiString tempName;
-	AsciiString filename;
-	tgaName.removeLastChar(); // p
-	tgaName.removeLastChar(); // a
-	tgaName.removeLastChar(); // m
-	tgaName.removeLastChar(); // .
-	name = tgaName;//.reverseFind('\\') + 1;
-	filename = tgaName.reverseFind('\\') + 1;
-	//tgaName = name;
-	filename.concat(".tga");
-	tgaName.concat(".tga");
-
-	AsciiString portableName = TheGameState->realMapPathToPortableMapPath(name);
-	tempName.set(AsciiString::TheEmptyString);
-	for(Int i = 0; i < portableName.getLength(); ++i)
-	{
-		char c = portableName.getCharAt(i);
-		if (c == '\\' || c == ':')
-			tempName.concat('_');
-		else
-			tempName.concat(c);
-	}
-	
-	name = tempName;
-	name.concat(".tga");
-
-	
-	// copy file over	
-	// copy source tgaName, to name
-
-	Image *image = (Image *)TheMappedImageCollection->findImageByName(tempName);
-	if(!image)
-	{
-
-		if(!TheFileSystem->doesFileExist(tgaName.str()))
-			return NULL;	
-		AsciiString mapPreviewDir;
-		mapPreviewDir.format(MAP_PREVIEW_DIR_PATH, TheGlobalData->getPath_UserData().str());
-		TheFileSystem->createDirectory(mapPreviewDir);
-
-		mapPreviewDir.concat(name);
-
-		Bool success = false;
-		try
-		{
-			copyFromBigToDir(tgaName, mapPreviewDir);	
-			success = true;
-		} 
-		catch (...)
-		{
-			success = false;	// no rethrow
-		}
-		
-		if (success)
-		{
-			image = TheMappedImageCollection->newImage();
-			image->setName(tempName);
-			//image->setFullPath("mission.tga");
-			image->setFilename(name);
-			image->setStatus(IMAGE_STATUS_NONE);
-			Region2D uv;
-			uv.hi.x = 1.0f;
-			uv.hi.y = 1.0f;
-			uv.lo.x	= 0.0f;
-			uv.lo.y = 0.0f;
-			image->setUV(&uv);
-			image->setTextureHeight(128);
-			image->setTextureWidth(128);
-		}
-		else
-		{
-			image = NULL;
-		}
-	}
-
-	return image;
-
-	
-	
-/*
-	// sanity
-	if( mapName.isEmpty() )
-		return NULL;
-	Region2D uv;
-	mapPreviewImage = TheMappedImageCollection->findImageByName("MapPreview");
-	if(mapPreviewImage)
-		deleteInstance(mapPreviewImage);
-	
-	mapPreviewImage = TheMappedImageCollection->newImage();
-	mapPreviewImage->setName("MapPreview");
-	mapPreviewImage->setStatus(IMAGE_STATUS_RAW_TEXTURE);
-// allocate our terrain texture
-	TextureClass * texture = new TextureClass( size.x, size.y, 
-																			 WW3D_FORMAT_X8R8G8B8, MIP_LEVELS_1 );
-	uv.lo.x = 0.0f;
-	uv.lo.y = 1.0f;
-	uv.hi.x = 1.0f;
-	uv.hi.y = 0.0f;
-	mapPreviewImage->setStatus( IMAGE_STATUS_RAW_TEXTURE );
-	mapPreviewImage->setRawTextureData( texture );
-	mapPreviewImage->setUV( &uv );
-	mapPreviewImage->setTextureWidth( size.x );
-	mapPreviewImage->setTextureHeight( size.y );
-	mapPreviewImage->setImageSize( &size );
-
-
-	CachedFileInputStream theInputStream;
-	if (theInputStream.open(AsciiString(mapName.str()))) 
-	{
-		ChunkInputStream *pStrm = &theInputStream;
-		pStrm->absoluteSeek(0);
-		DataChunkInput file( pStrm );
-		if (file.isValidFileType()) {	// Backwards compatible files aren't valid data chunk files.
-			// Read the waypoints.
-			file.registerParser( AsciiString("MapPreview"), AsciiString::TheEmptyString, parseMapPreviewChunk );
-			if (!file.parse(NULL)) {
-				DEBUG_ASSERTCRASH(false,("Unable to read MapPreview info."));
-				deleteInstance(mapPreviewImage);
-				return NULL;
-			}
-		}
-		theInputStream.close();
-	}
-	else
-	{
-		deleteInstance(mapPreviewImage);
-		return NULL;
-	}
-	
-
-	return mapPreviewImage;
-	
-*/
-	return NULL;
-}
-
-Bool parseMapPreviewChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-/*
-	ICoord2D size;
-	
-	SurfaceClass *surface;
-	size.x = file.readInt();
-	size.y = file.readInt();
-
-
-	surface = (TextureClass *)mapPreviewImage->getRawTextureData()->Get_Surface_Level();
-	//texture->Get_Surface_Level();
-	
-	DEBUG_LOG(("BeginMapPreviewInfo\n"));
-	UnsignedInt *buffer = new UnsignedInt[size.x * size.y];
-	Int x,y;
-	for (y=0; y<size.y; y++) {
-		for(x = 0; x< size.x; x++)
-		{
-			surface->DrawPixel( x, y, file.readInt() );
-			buffer[y + x] = file.readInt();
-			DEBUG_LOG(("x:%d, y:%d, %X\n", x, y, buffer[y + x]));
-		}
-	}
-	mapPreviewImage->setRawTextureData(buffer);
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
-	DEBUG_LOG(("EndMapPreviewInfo\n"));
-	REF_PTR_RELEASE(surface);
-	return true;
-*/
-	return FALSE;
-}
-
-void findDrawPositions( Int startX, Int startY, Int width, Int height, Region3D extent,
-															 ICoord2D *ul, ICoord2D *lr )
-{
-
-	Real ratioWidth;
-	Real ratioHeight;
-	Coord2D radar;
-	ratioWidth = extent.width()/(width * 1.0f);
-	ratioHeight = extent.height()/(height* 1.0f);
-	
-	if( ratioWidth >= ratioHeight)
-	{
-		radar.x = extent.width() / ratioWidth;
-		radar.y = extent.height()/ ratioWidth;
-		ul->x = 0;
-		ul->y = (height - radar.y) / 2.0f;
-		lr->x = radar.x;
-		lr->y = height - ul->y;
-	}
-	else
-	{
-		radar.x = extent.width() / ratioHeight;
-		radar.y = extent.height()/ ratioHeight;
-		ul->x = (width - radar.x ) / 2.0f;
-		ul->y = 0;
-		lr->x = width - ul->x;
-		lr->y = radar.y;
-	}
-
-	// make them pixel positions
-	ul->x += startX;
-	ul->y += startY;
-	lr->x += startX;
-	lr->y += startY;
-
-}  // end findDrawPositions
-
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
index 834751d52e1..35a406d4624 100644
--- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
@@ -26,15 +26,17 @@
 // Translate raw input events into tactical commands
 // Author: Michael S. Booth, February 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "stdlib.h"				// VC++ wants this here, or gives compile error...
 
 #include "Common/AudioAffect.h"
 #include "Common/ActionManager.h"
+#include "Common/FramePacer.h"
 #include "Common/GameAudio.h"
 #include "Common/GameEngine.h"
 #include "Common/GameType.h"
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/MessageStream.h"
 #include "Common/MiscAudio.h"
@@ -68,7 +70,8 @@
 #include "GameLogic/ExperienceTracker.h"
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Module/BodyModule.h"
-#include "GameLogic/Object.h"						
+#include "GameLogic/Module/ProductionUpdate.h"
+#include "GameLogic/Object.h"
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/TerrainLogic.h"
@@ -86,14 +89,10 @@
 #include "GameNetwork/GameSpyOverlay.h"
 #include "GameNetwork/GameSpy/BuddyThread.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+#include "ww3d.h"
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 /*non-static*/ Real TheSkateDistOverride = 0.0f;
 
 void countObjects(Object *obj, void *userData)
@@ -102,7 +101,7 @@ void countObjects(Object *obj, void *userData)
 	if (!numObjects || !obj)
 		return;
 
-	DEBUG_LOG(("Looking at obj %d (%s) - isEffectivelyDead()==%d, isDestroyed==%d, numObjects==%d\n",
+	DEBUG_LOG(("Looking at obj %d (%s) - isEffectivelyDead()==%d, isDestroyed==%d, numObjects==%d",
 		obj->getID(), obj->getTemplate()->getName().str(), obj->isEffectivelyDead(), obj->isDestroyed(), *numObjects));
 
 	if (!obj->isEffectivelyDead() && !obj->isDestroyed() && !obj->isKindOf(KINDOF_INERT))
@@ -128,7 +127,150 @@ void printObjects(Object *obj, void *userData)
 	TheScriptEngine->AppendDebugMessage(line, FALSE);
 }
 
-#endif
+#endif // defined(RTS_DEBUG)
+
+
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+
+void giveAllSciences(Player* player)
+{
+	// cheese festival: do NOT imitate this code. it is for debug purposes only.
+	std::vector<AsciiString> v = TheScienceStore->friend_getScienceNames();
+	for (size_t i = 0; i < v.size(); ++i)
+	{
+		ScienceType st = TheScienceStore->getScienceFromInternalName(v[i]);
+		if (st != SCIENCE_INVALID && TheScienceStore->isScienceGrantable(st))
+		{
+			player->grantScience(st);
+		}
+	}
+}
+
+void objectUnderConstruction(Object* obj, void *underConstruction)
+{
+	if (obj->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
+	{
+		*(Bool*)underConstruction = true;
+		return;
+	}
+
+	ProductionUpdateInterface *pui = ProductionUpdate::getProductionUpdateInterfaceFromObject(obj);
+	if(pui != NULL && pui->getProductionCount() > 0)
+	{
+		*(Bool*)underConstruction = true;
+		return;
+	}
+}
+
+Bool hasThingsInProduction(Player* player)
+{
+	Bool hasThingInProduction = false;
+	player->iterateObjects( objectUnderConstruction, &hasThingInProduction );
+	return hasThingInProduction;
+}
+
+Bool hasThingsInProduction(PlayerType playerType)
+{
+	for (Int n = 0; n < ThePlayerList->getPlayerCount(); ++n)
+	{
+		Player* player = ThePlayerList->getNthPlayer(n);
+		if (player->getPlayerType() == playerType)
+		{
+			if (hasThingsInProduction(player))
+				return true;
+		}
+	}
+	return false;
+}
+
+#endif // defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+
+
+bool changeMaxRenderFps(FpsValueChange change)
+{
+	UnsignedInt maxRenderFps = TheFramePacer->getFramesPerSecondLimit();
+	maxRenderFps = RenderFpsPreset::changeFpsValue(maxRenderFps, change);
+
+	TheFramePacer->setFramesPerSecondLimit(maxRenderFps);
+	TheWritableGlobalData->m_useFpsLimit = (maxRenderFps != RenderFpsPreset::UncappedFpsValue);
+
+	UnicodeString message;
+
+	if (TheWritableGlobalData->m_useFpsLimit)
+	{
+		message = TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:SetMaxRenderFps", L"Max Render FPS is %u", maxRenderFps);
+	}
+	else
+	{
+		message = TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:SetUncappedRenderFps", L"Max Render FPS is uncapped");
+	}
+
+	TheInGameUI->messageNoFormat(message);
+
+	return true;
+}
+
+bool changeLogicTimeScale(FpsValueChange change)
+{
+	if (TheNetwork != NULL)
+		return false;
+
+	const UnsignedInt maxRenderFps = TheFramePacer->getFramesPerSecondLimit();
+	UnsignedInt maxRenderRemainder = LogicTimeScaleFpsPreset::StepFpsValue;
+	maxRenderRemainder -= maxRenderFps % LogicTimeScaleFpsPreset::StepFpsValue;
+	maxRenderRemainder %= LogicTimeScaleFpsPreset::StepFpsValue;
+
+	UnsignedInt logicTimeScaleFps = TheFramePacer->getLogicTimeScaleFps();
+	// Set the value to the max render fps value plus a bit when time scale is
+	// disabled. This ensures that the time scale does not re-enable with a
+	// 'surprise' value.
+	if (!TheFramePacer->isLogicTimeScaleEnabled())
+	{
+		logicTimeScaleFps = maxRenderFps + maxRenderRemainder;
+	}
+	// Ceil the value at the max render fps value plus a bit so that the next fps
+	// value decrease would undercut the max render fps at the correct step value.
+	// Example: render fps 72 -> logic value ceiled to 75 -> decreased to 70.
+	logicTimeScaleFps = min(logicTimeScaleFps, maxRenderFps + maxRenderRemainder);
+	logicTimeScaleFps = LogicTimeScaleFpsPreset::changeFpsValue(logicTimeScaleFps, change);
+
+	// Set value before potentially disabling it.
+	if (TheFramePacer->isLogicTimeScaleEnabled())
+	{
+		TheFramePacer->setLogicTimeScaleFps(logicTimeScaleFps);
+	}
+
+	TheFramePacer->enableLogicTimeScale(logicTimeScaleFps < maxRenderFps);
+
+	// Set value after potentially enabling it.
+	if (TheFramePacer->isLogicTimeScaleEnabled())
+	{
+		TheFramePacer->setLogicTimeScaleFps(logicTimeScaleFps);
+	}
+
+	logicTimeScaleFps = TheFramePacer->getLogicTimeScaleFps();
+	const UnsignedInt actualLogicTimeScaleFps = TheFramePacer->getActualLogicTimeScaleFps();
+	const Real actualLogicTimeScaleRatio = TheFramePacer->getActualLogicTimeScaleRatio();
+
+	UnicodeString message;
+
+	if (TheFramePacer->isLogicTimeScaleEnabled())
+	{
+		message = TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:SetLogicTimeScaleFps", L"Logic Time Scale FPS is %u (actual %u, ratio %.02f)",
+			logicTimeScaleFps, actualLogicTimeScaleFps, actualLogicTimeScaleRatio);
+	}
+	else
+	{
+		message = TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:SetUncappedLogicTimeScaleFps", L"Logic Time Scale FPS is uncapped (actual %u, ratio %.02f)",
+			actualLogicTimeScaleFps, actualLogicTimeScaleRatio);
+	}
+
+	TheInGameUI->messageNoFormat(message);
+
+	return true;
+}
+
+
 static Bool isSystemMessage( const GameMessage *msg );
 
 enum{ DROPPED_MAX_PARTICLE_COUNT = 1000};
@@ -145,17 +287,17 @@ static Bool canSelectionSalvage( const Object *targetObj)
 
 	const DrawableList *drawList = TheInGameUI->getAllSelectedDrawables();
 
-	for (DrawableListCIt cit = drawList->begin(); cit != drawList->end(); ++cit) 
+	for (DrawableListCIt cit = drawList->begin(); cit != drawList->end(); ++cit)
 	{
 		Drawable *draw = *cit;
-		if (!draw) 
+		if (!draw)
 		{
 			continue;
 		}
-		
+
 
 		Object *obj = draw->getObject();
-		if (!obj) 
+		if (!obj)
 		{
 			continue;
 		}
@@ -177,8 +319,8 @@ static CanAttackResult canObjectForceAttack( Object *obj, const Object *victim,
 	{
 		return ATTACKRESULT_NOT_POSSIBLE;
 	}
-	
-	if (victim) 
+
+	if (victim)
 	{
 		result = obj->getAbleToAttackSpecificObject(ATTACK_NEW_TARGET_FORCED, victim, CMD_FROM_PLAYER );
 
@@ -191,7 +333,7 @@ static CanAttackResult canObjectForceAttack( Object *obj, const Object *victim,
 			{
 				//We found the spawn interface, now get the closest slave to the target.
 				Object *slave = spawnInterface->getClosestSlave( victim->getPosition() );
-				if( slave ) 
+				if( slave )
 				{
 					result = slave->getAbleToAttackSpecificObject( ATTACK_NEW_TARGET_FORCED, victim, CMD_FROM_PLAYER );
 				}
@@ -199,7 +341,7 @@ static CanAttackResult canObjectForceAttack( Object *obj, const Object *victim,
 		}
 		return result;
 	}
-	else 
+	else
 	{
 		//Almost every combat unit can force attack a position. The exceptions include stationary units
 		//that try to force attack in a location beyond their reach (range, LOS, etc).
@@ -232,16 +374,16 @@ static CanAttackResult canObjectForceAttack( Object *obj, const Object *victim,
 static CanAttackResult canAnyForceAttack(const DrawableList *allSelected, const Object *victim, const Coord3D *pos )
 {
 	// check to make sure that allSelected can attack obj.
-	for (DrawableListCIt cit = allSelected->begin(); cit != allSelected->end(); ++cit) 
+	for (DrawableListCIt cit = allSelected->begin(); cit != allSelected->end(); ++cit)
 	{
 		Drawable *draw = *cit;
-		if (!draw) 
+		if (!draw)
 		{
 			continue;
 		}
-		
+
 		Object *obj = draw->getObject();
-		if (!obj) 
+		if (!obj)
 		{
 			continue;
 		}
@@ -255,7 +397,7 @@ static CanAttackResult canAnyForceAttack(const DrawableList *allSelected, const
 //-------------------------------------------------------------------------------------------------
 void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type msgType, PickAndPlayInfo *info )
 {
-	if (!list) 
+	if (!list)
 	{
 		return;
 	}
@@ -270,7 +412,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 	{
 		target = info->m_drawTarget->getObject();
 	}
-	
+
 	//Now, loop through all the drawables (even if you find a match on the first.
 	//The innards are responsible for "upgrading" a sound that is played based on
 	//priorities. For example, the voice move or voice crush. Voice move gets set
@@ -283,15 +425,15 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 		if (obj->isKindOf( KINDOF_IGNORED_IN_GUI ))
 			continue;
 
-		// Use the object instead of the drawable to get the thing template from. This way, we get the 
+		// Use the object instead of the drawable to get the thing template from. This way, we get the
 		// sounds even if the thing is disguised as something else. (Ala bomb truck.)
 		const ThingTemplate *templ = obj->getTemplate();
-		if (!templ) 
+		if (!templ)
 		{
 			return;
 		}
 
-		switch (msgType) 
+		switch (msgType)
 		{
 			case GameMessage::MSG_DOCK:
 				soundToPlayPtr = templ->getPerUnitSound("VoiceSupply");
@@ -357,7 +499,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 				objectWithSound = obj;
 				skip = true;
 				break;
-			
+
 			case GameMessage::MSG_DO_MOVETO:
 			case GameMessage::MSG_DO_ATTACKMOVETO:
 			case GameMessage::MSG_GET_REPAIRED:
@@ -383,7 +525,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 					//Default to voice move (it'll be selected if we can't find a crush case as we iterate
 					//through the rest of the drawables)
 					if( !soundToPlayPtr )
-					{	
+					{
 						soundToPlayPtr = templ->getVoiceMove();
 						objectWithSound = obj;
 					}
@@ -397,7 +539,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 							skip = true;
 						}
 					}
-					if (msgType == GameMessage::MSG_DO_SALVAGE) 
+					if (msgType == GameMessage::MSG_DO_SALVAGE)
 					{
 						const AudioEventRTS *tempSound = templ->getPerUnitSound( "VoiceSalvage" );
 						if (TheAudio->isValidAudioEvent(tempSound))
@@ -422,20 +564,6 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 				break;
 			}
 
-			case GameMessage::MSG_DO_FORCE_ATTACK_GROUND:
-			{
-				soundToPlayPtr = templ->getPerUnitSound( "VoiceBombard" );
-				objectWithSound = obj;
-				skip = true;
-
-				if (TheAudio->isValidAudioEvent(soundToPlayPtr)) {
-					break;
-				} else {
-					// clear out the sound to play, and drop into the attack object logic.
-					soundToPlayPtr = NULL;
-				}
-			}
-			
 			case GameMessage::MSG_SWITCH_WEAPONS:
 			{
 				if( info && info->m_weaponSlot )
@@ -457,7 +585,21 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 				}
 				break;
 			}
-			
+
+			case GameMessage::MSG_DO_FORCE_ATTACK_GROUND:
+			{
+				soundToPlayPtr = templ->getPerUnitSound( "VoiceBombard" );
+				objectWithSound = obj;
+				skip = true;
+
+				if (TheAudio->isValidAudioEvent(soundToPlayPtr)) {
+					break;
+				} else {
+					// clear out the sound to play, and drop into the attack object logic.
+					soundToPlayPtr = NULL;
+					FALLTHROUGH;
+				}
+			}
 			case GameMessage::MSG_DO_FORCE_ATTACK_OBJECT:
 			case GameMessage::MSG_DO_ATTACK_OBJECT:
 			case GameMessage::MSG_DO_WEAPON_AT_OBJECT:
@@ -532,7 +674,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 				}
 				break;
 			}
-			
+
 			case GameMessage::MSG_DO_WEAPON_AT_LOCATION:
 			{
 
@@ -623,7 +765,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 				break;
 
 			default:
-				DEBUG_LOG(("Requested to add voice of message type %d, but don't know how - jkmcd\n", msgType));
+				DEBUG_LOG(("Requested to add voice of message type %d, but don't know how - jkmcd", msgType));
 				break;
 		}
 		if( skip )
@@ -631,9 +773,9 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 			//The unit sound doesn't have any sort of priority or special case, so simply play the first one that comes along.
 			break;
 		}
-	
-	}//next drawable in list
-	
+
+	}
+
 
 
 
@@ -648,14 +790,14 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 		soundToPlay.setObjectID( objectWithSound->getID() );
 		TheAudio->addAudioEvent(&soundToPlay);
 
-		// This seems really hacky, and MarkL admits that it is. However, we do this so that we 
+		// This seems really hacky, and MarkL admits that it is. However, we do this so that we
 		// can "randomly" pick a different sound the next time, if we have 3 or more sounds. - jkmcd
 		((AudioEventRTS*)soundToPlayPtr)->setPlayingAudioIndex( soundToPlay.getPlayingAudioIndex() );
 
 		if( objectWithSound->testStatus( OBJECT_STATUS_IS_CARBOMB ) )
 		{
 			//Additional sounds for terrorists in cars.
-			switch (msgType) 
+			switch (msgType)
 			{
 				case GameMessage::MSG_DO_FORCE_ATTACK_GROUND:
 				case GameMessage::MSG_DO_FORCE_ATTACK_OBJECT:
@@ -744,8 +886,8 @@ void findCommandCenterOrMostExpensiveBuilding(Object* obj, void* vccl)
 
 static void viewCommandCenter( void )
 {
-	Player* localPlayer = ThePlayerList->getLocalPlayer();
-	if (!localPlayer) 
+	Player* localPlayer = rts::getObservedOrLocalPlayer();
+	if (!localPlayer->isPlayerActive())
 		return;
 
 	CommandCenterLocator ccl;
@@ -754,7 +896,7 @@ static void viewCommandCenter( void )
 	if (ccl.atLeastOne) {
 		TheTacticalView->lookAt(&ccl.loc);
 	} else {
-		// @todo. Find their starting position and look at that instead?		
+		// @todo. Find their starting position and look at that instead?
 	}
 }
 
@@ -771,12 +913,12 @@ void amIAHero(Object* obj, void* heroHolder)
 {
 
 
-	if (!obj || ((HeroHolder*)heroHolder)->hero != NULL) 
+	if (!obj || ((HeroHolder*)heroHolder)->hero != NULL)
 	{
 		return;
 	}
 
-	if (obj->isKindOf( KINDOF_HERO )) 
+	if (obj->isKindOf( KINDOF_HERO ))
 	{
 		((HeroHolder*)heroHolder)->hero = obj;
 	}
@@ -786,8 +928,8 @@ void amIAHero(Object* obj, void* heroHolder)
 
 static Object *iNeedAHero( void )
 {
-	Player* localPlayer = ThePlayerList->getLocalPlayer();
-	if (!localPlayer) 
+	Player* localPlayer = rts::getObservedOrLocalPlayer();
+	if (!localPlayer->isPlayerActive())
 		return NULL;
 
 	HeroHolder heroHolder;
@@ -824,7 +966,7 @@ GameMessage::Type CommandTranslator::issueMoveToLocationCommand( const Coord3D *
 		{
 			msgType = GameMessage::MSG_DO_ATTACKMOVETO;
 		}
-		else if( TheInGameUI->isInForceMoveToMode() ) 
+		else if( TheInGameUI->isInForceMoveToMode() )
 		{
 			msgType = GameMessage::MSG_DO_FORCEMOVETO;
 		}
@@ -844,17 +986,17 @@ GameMessage::Type CommandTranslator::issueMoveToLocationCommand( const Coord3D *
 			else
 				movemsg->appendLocationArgument( *pos );
 
-		}  // end if
-	} 
-	
+		}
+	}
+
 	// only make sounds if we really did the command messages
 	if( commandType == DO_COMMAND )
 	{
 		PickAndPlayInfo info;
 		info.m_drawTarget = drawableInWay;
 		pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_DO_MOVETO, &info );
-	}  // end if
-	
+	}
+
 	if(TheStatsCollector)
 		TheStatsCollector->incrementMoveCount();
 
@@ -865,7 +1007,7 @@ GameMessage::Type CommandTranslator::issueMoveToLocationCommand( const Coord3D *
 
 //------------------------------------------------------------------------------------
 /// @todo Play attack command response sound on client-side to hide latency
-GameMessage::Type CommandTranslator::createAttackMessage( Drawable *draw, 
+GameMessage::Type CommandTranslator::createAttackMessage( Drawable *draw,
 																													Drawable *other,
 																													CommandEvaluateType commandType )
 {
@@ -889,7 +1031,7 @@ GameMessage::Type CommandTranslator::createAttackMessage( Drawable *draw,
 
 		attackmsg->appendObjectIDArgument( other->getObject()->getID() );	// must pass object IDs to logic
 
-	}  // end if
+	}
 
 	// return the message type created
 	return msgType;
@@ -901,7 +1043,7 @@ GameMessage::Type CommandTranslator::createAttackMessage( Drawable *draw,
  * Create DO_ATTACK_GROUND_OBJECT messages for each selected object, instructing it to attack the given enemy.
  * Return TRUE if any attacks actually occurred.
  */
-GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target,	
+GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target,
 																												 CommandEvaluateType commandType,
 																												 GUICommandType command )
 {
@@ -914,11 +1056,11 @@ GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target,
 	Object *targetObj = target->getObject();
 	if( !targetObj )
 		return msgType;
-	
+
 	if( m_teamExists )
 	{
 
-		//DEBUG_LOG(("issuing team-attack cmd against %s\n",enemy->getTemplate()->getName().str()));
+		//DEBUG_LOG(("issuing team-attack cmd against %s",enemy->getTemplate()->getName().str()));
 
 		// insert team attack command message into stream
 		switch( command )
@@ -942,17 +1084,17 @@ GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target,
 			GameMessage *attackMsg;
 
 			attackMsg = TheMessageStream->appendMessage( msgType );
-		
+
 			attackMsg->appendObjectIDArgument( targetObj->getID() );	// must pass target object ID to logic
 
 			// if we have a stats collector, inrement the stats
 			if(TheStatsCollector)
 				TheStatsCollector->incrementAttackCount();
-		}  // end if
+		}
 	}
 	else
 	{
-		DEBUG_LOG(("issuing NON-team-attack cmd against %s\n",target->getTemplate()->getName().str()));
+		DEBUG_LOG(("issuing NON-team-attack cmd against %s",target->getTemplate()->getName().str()));
 
 		// send single attack command for selected drawable
 		const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
@@ -965,7 +1107,7 @@ GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target,
 			msgType = createAttackMessage(draw, target, commandType );
 		}
 	}
-	
+
 	// only make sounds if the command was for real
 	if( commandType == DO_COMMAND )
 	{
@@ -973,7 +1115,7 @@ GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target,
 		info.m_air = targetObj->isUsingAirborneLocomotor();
 		info.m_drawTarget = target;
 		pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), msgType, &info );
-	}  // end if
+	}
 
 	// return the actual message type created
 	return msgType;
@@ -1038,7 +1180,7 @@ GameMessage::Type CommandTranslator::issueSpecialPowerCommand( const CommandButt
 			info.m_drawTarget = target;
 			info.m_specialPowerType = command->getSpecialPowerTemplate()->getSpecialPowerType();
 			pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), msgType, &info );
-		
+
 		}
 	}
 	else
@@ -1058,10 +1200,10 @@ GameMessage::Type CommandTranslator::issueSpecialPowerCommand( const CommandButt
 			info.m_drawTarget = target;
 			info.m_specialPowerType = command->getSpecialPowerTemplate()->getSpecialPowerType();
 			pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), msgType, &info );
-		
+
 		}
 	}
-	
+
 
 	return msgType;
 }
@@ -1192,12 +1334,12 @@ GameMessage::Type CommandTranslator::issueFireWeaponCommand( const CommandButton
 			msg->appendIntegerArgument( command->getSpecialPowerTemplate()->getID() );
 		}
 	}
-	
+
 	return msgType;
 }
 
 //-------------------------------------------------------------------------------------------------
-GameMessage::Type CommandTranslator::createEnterMessage( Drawable *enter, 
+GameMessage::Type CommandTranslator::createEnterMessage( Drawable *enter,
 																												 CommandEvaluateType commandType )
 {
 	GameMessage::Type msgType = GameMessage::MSG_ENTER;
@@ -1210,7 +1352,7 @@ GameMessage::Type CommandTranslator::createEnterMessage( Drawable *enter,
 		return msgType;
 
 	// sanity
-	DEBUG_ASSERTCRASH( commandType == DO_COMMAND, ("createEnterMessage - commandType is not DO_COMMAND\n") );
+	DEBUG_ASSERTCRASH( commandType == DO_COMMAND, ("createEnterMessage - commandType is not DO_COMMAND") );
 
 	if( m_teamExists )
 	{
@@ -1222,7 +1364,7 @@ GameMessage::Type CommandTranslator::createEnterMessage( Drawable *enter,
 		enterMsg->appendObjectIDArgument( INVALID_ID );		// 0 means current "selection team" of this player
 		enterMsg->appendObjectIDArgument( enter->getObject()->getID() );
 
-	}  // end if
+	}
 	else
 	{
 		DEBUG_CRASH(("Shouldn't get here. jkmcd"));
@@ -1231,10 +1373,10 @@ GameMessage::Type CommandTranslator::createEnterMessage( Drawable *enter,
 	// return the type of the message used
 	return msgType;
 
-}  // end createEnterMessage
+}
 
 //====================================================================================
-CommandTranslator::CommandTranslator() : 
+CommandTranslator::CommandTranslator() :
 	m_objective(0),
 	m_teamExists(false),
 	m_mouseRightDown(0),
@@ -1256,21 +1398,21 @@ CommandTranslator::~CommandTranslator()
 //-------------------------------------------------------------------------------------------------
 GameMessage::Type CommandTranslator::evaluateForceAttack( Drawable *draw, const Coord3D *pos, CommandEvaluateType type )
 {
-	// evaluateForceAttack is used to determine whether or not we can force attack the 
+	// evaluateForceAttack is used to determine whether or not we can force attack the
 	// given target, and if we can, to issue the appropriate command.
 
 	GameMessage::Type retVal = GameMessage::MSG_INVALID;
-	if( !draw && !pos ) 
+	if( !draw && !pos )
 	{
 		return retVal;
 	}
 
 	const DrawableList *allSelected = TheInGameUI->getAllSelectedDrawables();
 
-	if( draw ) 
+	if( draw )
 	{
 		Object *obj = draw ? draw->getObject() : NULL;
-		if( !obj ) 
+		if( !obj )
 		{
 			return retVal;
 		}
@@ -1281,14 +1423,14 @@ GameMessage::Type CommandTranslator::evaluateForceAttack( Drawable *draw, const
 		{
 			retVal = GameMessage::MSG_DO_FORCE_ATTACK_OBJECT;
 
-			if( type == DO_COMMAND ) 
+			if( type == DO_COMMAND )
 			{
 				pickAndPlayUnitVoiceResponse( allSelected, retVal );
 				GameMessage *newMsg = TheMessageStream->appendMessage( retVal );
 				newMsg->appendObjectIDArgument( obj->getID() );
-				
-			} 
-			else if( type == DO_HINT ) 
+
+			}
+			else if( type == DO_HINT )
 			{
 				retVal = GameMessage::MSG_DO_FORCE_ATTACK_OBJECT_HINT;
 				// Don't need the message back, cause there is nothing to append to it.
@@ -1300,8 +1442,8 @@ GameMessage::Type CommandTranslator::evaluateForceAttack( Drawable *draw, const
 			retVal = GameMessage::MSG_IMPOSSIBLE_ATTACK_HINT;
 			TheMessageStream->appendMessage( retVal );
 		}
-	} 
-	else if( pos ) 
+	}
+	else if( pos )
 	{
 		CanAttackResult result = canAnyForceAttack( allSelected, NULL, pos );
 
@@ -1309,13 +1451,13 @@ GameMessage::Type CommandTranslator::evaluateForceAttack( Drawable *draw, const
 		{
 			retVal = GameMessage::MSG_DO_FORCE_ATTACK_GROUND;
 
-			if( type == DO_COMMAND ) 
+			if( type == DO_COMMAND )
 			{
 				pickAndPlayUnitVoiceResponse( allSelected, retVal );
 				GameMessage *newMsg = TheMessageStream->appendMessage( retVal );
 				newMsg->appendLocationArgument( *pos );
-			} 
-			else if( type == DO_HINT ) 
+			}
+			else if( type == DO_HINT )
 			{
 				retVal = GameMessage::MSG_DO_FORCE_ATTACK_GROUND_HINT;
 				// Don't need the message back, cause there is nothing to append to it.
@@ -1340,8 +1482,8 @@ GameMessage::Type CommandTranslator::evaluateForceAttack( Drawable *draw, const
 	* command would be if clicked
 	* NOTE: draw can be NULL, in which case we give a hint for the location */
 // ------------------------------------------------------------------------------------------------
-GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw, 
-																														 const Coord3D *pos, 
+GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
+																														 const Coord3D *pos,
 																														 CommandEvaluateType type )
 {
 	Object *obj = draw ? draw->getObject() : NULL;
@@ -1352,15 +1494,15 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 	//drawable is invalid... then convert it to a position to be evaluated instead.
 	//Added: shrubberies are the exception for interactions...
 	//Removed: GS Took out ObjectStatusUnselectable, since that status only prevents selection, not everything
-	if( obj == NULL || 
-			obj->getStatusBits().test( OBJECT_STATUS_MASKED ) && 
-			!obj->isKindOf(KINDOF_SHRUBBERY) && !obj->isKindOf(KINDOF_FORCEATTACKABLE) ) 
+	if( obj == NULL ||
+			obj->getStatusBits().test( OBJECT_STATUS_MASKED ) &&
+			!obj->isKindOf(KINDOF_SHRUBBERY) && !obj->isKindOf(KINDOF_FORCEATTACKABLE) )
 	{
-		//Nulling out the draw and obj pointer will force the remainder of this code to evaluate 
+		//Nulling out the draw and obj pointer will force the remainder of this code to evaluate
 		//a position interaction.
 		draw = NULL;
 		obj = NULL;
-	}  //  end if
+	}
 
 	// If the thing is a mine, and is locally controlled, then we should issue a moveto to its location.
 	if (obj && obj->isLocallyControlled() && obj->isKindOf(KINDOF_MINE)) {
@@ -1368,9 +1510,9 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 		obj = NULL;
 	}
 
-	if( TheInGameUI->isInForceMoveToMode() ) 
+	if( TheInGameUI->isInForceMoveToMode() )
 	{
-		//Nulling out the draw and obj pointer will force the remainder of this code to evaluate 
+		//Nulling out the draw and obj pointer will force the remainder of this code to evaluate
 		//a position interaction.
 		draw = NULL;
 		obj = NULL;
@@ -1379,7 +1521,7 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 		// if there is a location to which we should attack.
 		drawableInWay = draw;
 	}
-	
+
 	GameMessage::Type msgType = GameMessage::MSG_INVALID;
 
 	// Then we should determine if the game currently prefers selection events. If it does, then return
@@ -1392,7 +1534,13 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 
 	// Kris: Now that we can select non-controllable units/structures, don't allow any actions to be performed.
 	const CommandButton *command = TheInGameUI->getGUICommand();
-	if( TheInGameUI->areSelectedObjectsControllable() 
+
+	if (command && command->getCommandType() == GUICOMMANDMODE_PLACE_BEACON)
+	{
+		msgType = GameMessage::MSG_VALID_GUICOMMAND_HINT;
+		TheMessageStream->appendMessage(msgType);
+	}
+	else if( TheInGameUI->areSelectedObjectsControllable()
 			|| (command && command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_COMMAND_CENTER))
 	{
 		GameMessage *hintMessage;
@@ -1418,15 +1566,15 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 
 		CanAttackResult result;
 
-		if(command && 
-			(command->isContextCommand() 
+		if(command &&
+			(command->isContextCommand()
 				|| command->getCommandType() == GUI_COMMAND_SPECIAL_POWER
 				|| command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_COMMAND_CENTER))
 		{
 			if( obj && obj->isKindOf( KINDOF_SHRUBBERY ) && !BitIsSet( command->getOptions(), ALLOW_SHRUBBERY_TARGET ) )
 			{
 				//If our object is a shrubbery, and we don't allow targetting it... then null it out.
-				//Nulling out the draw and obj pointer will force the remainder of this code to evaluate 
+				//Nulling out the draw and obj pointer will force the remainder of this code to evaluate
 				//a position interaction.
 				draw = NULL;
 				obj = NULL;
@@ -1435,12 +1583,12 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 			if( obj && obj->isKindOf( KINDOF_MINE ) && !BitIsSet( command->getOptions(), ALLOW_MINE_TARGET ) )
 			{
 				//If our object is a mine, and we don't allow targetting it... then null it out.
-				//Nulling out the draw and obj pointer will force the remainder of this code to evaluate 
+				//Nulling out the draw and obj pointer will force the remainder of this code to evaluate
 				//a position interaction.
 				draw = NULL;
 				obj = NULL;
 			}
-			
+
 			//Kris: September 27, 2002
 			//Added relationship tests to make sure we're not attempting a context-command on a restricted relationship.
 			//This case prevents rebels from using tranq darts on allies.
@@ -1454,21 +1602,21 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 						{
 							draw = NULL;
 							obj = NULL;
-						}	
+						}
 						break;
 					case ENEMIES:
 						if( !BitIsSet( command->getOptions(), NEED_TARGET_ENEMY_OBJECT ) )
 						{
 							draw = NULL;
 							obj = NULL;
-						}	
+						}
 						break;
 					case NEUTRAL:
 						if( !BitIsSet( command->getOptions(), NEED_TARGET_NEUTRAL_OBJECT ) )
 						{
 							draw = NULL;
 							obj = NULL;
-						}	
+						}
 						break;
 				}
 			}
@@ -1478,7 +1626,7 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 			switch( command->getCommandType() )
 			{
 				//Kris: June 06, 2002
-				//This is a GUI command button that triggers a mode. In any of these modes, only one specific action 
+				//This is a GUI command button that triggers a mode. In any of these modes, only one specific action
 				//can occur. If the mouse isn't over a valid target, then the conditions aren't met and the code will
 				//cause an invalid version of the cursor to be shown -- and should the user click, the action won't take place.
 				case GUICOMMANDMODE_CONVERT_TO_CARBOMB:
@@ -1566,8 +1714,8 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage->appendObjectIDArgument( objectID );
 			}
 
-		}	// if a special power
-		
+		}
+
 		// ********************************************************************************************
 		else if( TheInGameUI->canSelectedObjectsOverrideSpecialPowerDestination( pos, InGameUI::SELECTION_ANY, SPECIAL_INVALID ) )
 		{
@@ -1584,9 +1732,9 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 					gameMsg->appendIntegerArgument( SPECIAL_INVALID );
 					gameMsg->appendObjectIDArgument( INVALID_ID );	// no specific source
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1594,14 +1742,14 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				msgType = GameMessage::MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 
-			}  // end else
+			}
 		}
-		
+
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
 						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_RESUME_CONSTRUCTION, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
@@ -1615,9 +1763,9 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 
 					pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_RESUME_CONSTRUCTION );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1626,13 +1774,13 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
-						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_DOCK_AT, 
-																											obj, 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
+						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_DOCK_AT,
+																											obj,
 																											InGameUI::SELECTION_ALL ) )
 		{
 
@@ -1653,7 +1801,7 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 
  					// only make sounds if we really did the command messages
  					pickAndPlayUnitVoiceResponse(TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_DOCK);
-				}  // end if
+				}
 
 			}
 			else
@@ -1668,10 +1816,10 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 
 		}
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
 						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_REPAIR_OBJECT, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
@@ -1682,12 +1830,12 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 					GameMessage *healMsg = TheMessageStream->appendMessage( msgType );
 
 					healMsg->appendObjectIDArgument( obj->getID() );
-			
+
 					pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_DO_REPAIR );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1696,11 +1844,11 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
 						TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_GET_REPAIRED_AT, obj, InGameUI::SELECTION_ANY ) )
 		{
 
@@ -1715,13 +1863,13 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 
 					healMsg->appendObjectIDArgument( obj->getID() );
 
-					
+
 					pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_GET_REPAIRED );
 
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1730,14 +1878,14 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
 						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_GET_HEALED_AT, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
@@ -1748,12 +1896,12 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 					GameMessage *healMsg = TheMessageStream->appendMessage( msgType );
 
 					healMsg->appendObjectIDArgument( obj->getID() );
-				
+
 					pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_GET_HEALED );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1762,16 +1910,16 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType);
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
-		else if( draw && draw->getObject() && !TheInGameUI->isInForceAttackMode() && 
-						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_HIJACK_VEHICLE, 
-																											draw->getObject(), 
+		else if( draw && draw->getObject() && !TheInGameUI->isInForceAttackMode() &&
+						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_HIJACK_VEHICLE,
+																											draw->getObject(),
 																											InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
@@ -1779,90 +1927,90 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
         // I must add a test to keep him from actually entering an enemy vehicle (contained)... Lorenzen
         msgType = createEnterMessage( draw, type );
 
-			}  // end if
+			}
 			else
 			{
-				
+
 				msgType = GameMessage::MSG_HIJACK_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( draw->getObject()->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
 						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_CONVERT_OBJECT_TO_CARBOMB, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
 				// issue the command (convert to carbomb is nearly identical to enter)
 				msgType = createEnterMessage( draw, type );
 
-			}  // end if
+			}
 			else
 			{
-				
+
 				msgType = GameMessage::MSG_CONVERT_TO_CARBOMB_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 		}
 		// ********************************************************************************************
 		else if( draw && !TheInGameUI->isInForceAttackMode() && canSelectionSalvage(obj) )
 		{
 			GameMessage *msg;
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY ) {
 				msgType = GameMessage::MSG_DO_SALVAGE;
 				if (type == DO_COMMAND) {
 					msg = TheMessageStream->appendMessage(msgType);
 					msg->appendLocationArgument(*obj->getPosition());
 					pickAndPlayUnitVoiceResponse(TheInGameUI->getAllSelectedDrawables(), msgType);
-				} 
+				}
 
 			} else {
 				msgType = GameMessage::MSG_DO_SALVAGE_HINT;
 				msg = TheMessageStream->appendMessage(msgType);
 				msg->appendLocationArgument(*obj->getPosition());
-			} 
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
 						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_ENTER_OBJECT, obj, InGameUI::SELECTION_ANY, true ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
 				// issue the command
 				msgType = createEnterMessage( draw, type );
 
-			}  // end if
+			}
 			else
 			{
 
 				msgType = GameMessage::MSG_ENTER_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
 		else if( draw && (result = TheInGameUI->getCanSelectedObjectsAttack( InGameUI::ACTIONTYPE_ATTACK_OBJECT, obj, InGameUI::SELECTION_ANY, TheInGameUI->isInForceAttackMode() )) == ATTACKRESULT_POSSIBLE )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
-				
-				// issue the attack order			
+
+				// issue the attack order
 				msgType = issueAttackCommand( draw, type );
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1871,19 +2019,19 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
 		else if( draw && result == ATTACKRESULT_POSSIBLE_AFTER_MOVING )
 		{
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
-				
-				// issue the attack order			
+
+				// issue the attack order
 				msgType = issueAttackCommand( draw, type );
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1892,13 +2040,13 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
 		}
 		// ********************************************************************************************
 		else if( draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_CAPTURE_BUILDING, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			//@TODO: Kris
 			//PRELIMINARY CODE FOR HOOKING IN AUTO SPECIALS --- WILL BE REDONE!
 			Object *source = TheInGameUI->getFirstSelectedDrawable()->getObject();
@@ -1925,7 +2073,7 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 						else if( spType == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING )
 						{
 							//Issue the black lotus hack hint for capturing a building.
-							msgType = GameMessage::MSG_HACK_HINT; 
+							msgType = GameMessage::MSG_HACK_HINT;
 							hintMessage = TheMessageStream->appendMessage( msgType );
 							hintMessage->appendObjectIDArgument( obj->getID() );
 						}
@@ -1939,11 +2087,11 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 					}
 				}
 			}
-		}  // end else if
+		}
 		// ********************************************************************************************
 		else if( draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_DISABLE_VEHICLE_VIA_HACKING, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 				//@TODO: Kris
@@ -1967,19 +2115,19 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 						}
 					}
 				}
-			}  
+			}
 			else
 			{
 				msgType = GameMessage::MSG_HACK_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
-			}  
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
 		else if( draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_STEAL_CASH_VIA_HACKING, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 				//@TODO: Kris
@@ -2003,19 +2151,19 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 						}
 					}
 				}
-			}  // end if
+			}
 			else
 			{
 				msgType = GameMessage::MSG_HACK_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
-			}  
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
 		else if( draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_DISABLE_BUILDING_VIA_HACKING, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 				//@TODO: Kris
@@ -2039,45 +2187,45 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 						}
 					}
 				}
-			}  // end if
+			}
 			else
 			{
 				msgType = GameMessage::MSG_HACK_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
-			}  
-		}  // end else if
+			}
+		}
 #ifdef ALLOW_SURRENDER
 		// ********************************************************************************************
 		else if( draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_PICK_UP_PRISONER, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
-				// issue the command 
+				// issue the command
 				msgType = issueAttackCommand( draw, type, GUICOMMANDMODE_PICK_UP_PRISONER );
-				
-			}  // end if
+
+			}
 			else
 			{
-				
+
 				msgType = GameMessage::MSG_PICK_UP_PRISONER_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 #endif
 		// ********************************************************************************************
-		else if ( pos && !draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_SET_RALLY_POINT, NULL, InGameUI::SELECTION_ALL, FALSE ))
+		else if ( !draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_SET_RALLY_POINT, NULL, InGameUI::SELECTION_ALL, FALSE ))
 		{
 			msgType = GameMessage::MSG_SET_RALLY_POINT;
 
 			if (type == DO_COMMAND) {
 				const DrawableList *allSelectedDrawables = TheInGameUI->getAllSelectedDrawables();
-				
+
 				for (DrawableList::const_iterator it = allSelectedDrawables->begin(); it != allSelectedDrawables->end(); ++it) {
 					Drawable *draw = (*it);
 					if (draw && draw->getObject()) {
@@ -2099,7 +2247,7 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 			msgType = GameMessage::MSG_IMPOSSIBLE_ATTACK_HINT;
 			hintMessage = TheMessageStream->appendMessage( msgType );
 			hintMessage->appendLocationArgument( *pos );
-		}  // end else if
+		}
 
 		// ********************************************************************************************
 		else
@@ -2125,12 +2273,12 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 			{
 				//Can we path there?
 				const DrawableList *allSelectedDrawables = TheInGameUI->getAllSelectedDrawables();
-				for( DrawableList::const_iterator it = allSelectedDrawables->begin(); it != allSelectedDrawables->end(); ++it ) 
+				for( DrawableList::const_iterator it = allSelectedDrawables->begin(); it != allSelectedDrawables->end(); ++it )
 				{
 					Object *obj = (*it) ? (*it)->getObject() : NULL;
 					AIUpdateInterface *ai = obj ? obj->getAI() : NULL;
-					if( ai && ai->isQuickPathAvailable( pos ) ) 
-					{ 
+					if( ai && ai->isQuickPathAvailable( pos ) )
+					{
 						validQuickPath = TRUE;
 						break;
 					}
@@ -2140,13 +2288,13 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 				// issue command
-				// Note: If draw is valid, then its one of ours and we don't have something more specific 
-				// to do. Therefore, lets not issue a move command, and instead we'll return that there 
+				// Note: If draw is valid, then its one of ours and we don't have something more specific
+				// to do. Therefore, lets not issue a move command, and instead we'll return that there
 				// wasn't a command for us to perform.
-				
+
 				if ( draw == NULL )
 					msgType = issueMoveToLocationCommand( pos, drawableInWay, type );
-			}  // end if
+			}
 			else
 			{
 				if( !validQuickPath )
@@ -2172,16 +2320,16 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendLocationArgument( *pos );
 
-			}  // end else
+			}
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
 	// return the message type
 	return msgType;
 
-}  // end evaluateContextCommand
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -2197,12 +2345,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 	GameMessageDisposition disp = KEEP_MESSAGE;
 	// We want to always be able to get to the options menu even during no input times and a clear game data message should always go through
 	if (t != GameMessage::MSG_META_OPTIONS && t != GameMessage::MSG_CLEAR_GAME_DATA &&
-			!TheInGameUI->getInputEnabled() && !isSystemMessage(msg)) 
+			!TheInGameUI->getInputEnabled() && !isSystemMessage(msg))
 	{
 		return DESTROY_MESSAGE;
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	ExtentModType extentModType = EXTENTMOD_INVALID;
 	Real extentModAmount = 0.0f;
 #endif
@@ -2223,7 +2371,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_SELECT_NEXT_UNIT:
 		{
 			/* because list is prepended, iterate through backwards */
-			
+
 			// if there is nothing on the screen, bail
 			if( TheGameClient->firstDrawable() == NULL )
 				break;
@@ -2361,7 +2509,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 						teamMsg->appendBooleanArgument( TRUE );
 
 						teamMsg->appendObjectIDArgument( object->getID() );
-						
+
 						TheInGameUI->selectDrawable( temp );
 
 						// center on the unit
@@ -2400,7 +2548,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 							hack = TRUE;
 							const Object *tempObject = temp->getObject();
 							// must take case of this case here or else the loop will break without getting newDrawable
-							if( tempObject && temp->getNextDrawable() == selectedDrawable && !temp->isSelected() 
+							if( tempObject && temp->getNextDrawable() == selectedDrawable && !temp->isSelected()
 								&& tempObject->isMobile() && tempObject->isLocallyControlled() && !tempObject->isContained() && !tempObject->isKindOf( KINDOF_DRONE ) )
 							{
 								newDrawable = temp;
@@ -2424,7 +2572,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 						//deselect other units
 						TheInGameUI->deselectAllDrawables();
 						// select the unit
-						
+
 						// create a new group.
 						GameMessage *teamMsg = TheMessageStream->appendMessage( GameMessage::MSG_CREATE_SELECTED_GROUP );
 
@@ -2444,7 +2592,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			disp = DESTROY_MESSAGE;
 			break;
 
-		}	// end select previous unit
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_SELECT_NEXT_WORKER:
@@ -2554,7 +2702,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 			disp = DESTROY_MESSAGE;
 			break;
-		}		// end select next worker
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_SELECT_PREV_WORKER:
@@ -2588,7 +2736,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 						teamMsg->appendBooleanArgument( TRUE );
 
 						teamMsg->appendObjectIDArgument( object->getID() );
-						
+
 						TheInGameUI->selectDrawable( temp );
 
 						// center on the unit
@@ -2627,7 +2775,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 							hack = TRUE;
 							const Object *tempObject = temp->getObject();
 							// must take case of this case here or else the loop will break without getting newDrawable
-							if( tempObject && temp->getNextDrawable() == selectedDrawable && !temp->isSelected() 
+							if( tempObject && temp->getNextDrawable() == selectedDrawable && !temp->isSelected()
 								&& tempObject->isMobile() && tempObject->isLocallyControlled() && !tempObject->isContained() )
 							{
 								newDrawable = temp;
@@ -2652,7 +2800,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 						//deselect other units
 						TheInGameUI->deselectAllDrawables();
 						// select the unit
-						
+
 						// create a new group.
 						GameMessage *teamMsg = TheMessageStream->appendMessage( GameMessage::MSG_CREATE_SELECTED_GROUP );
 
@@ -2672,7 +2820,16 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			disp = DESTROY_MESSAGE;
 			break;
 
-		}	// end select previous worker
+		}
+
+		//-----------------------------------------------------------------------------------------
+		case GameMessage::MSG_META_SELECT_NEXT_IDLE_WORKER:
+		{
+			TheInGameUI->selectNextIdleWorker();
+
+			disp = DESTROY_MESSAGE;
+			break;
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_SELECT_HERO:
@@ -2698,7 +2855,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 			// create a new group.
 			GameMessage *teamMsg = TheMessageStream->appendMessage( GameMessage::MSG_CREATE_SELECTED_GROUP );
-			
+
 			//New group so pass in value true
 			teamMsg->appendBooleanArgument( TRUE );
 			teamMsg->appendObjectIDArgument( hero->getID() );
@@ -2719,23 +2876,16 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_VIEW_LAST_RADAR_EVENT:
 		{
-//			Player *player = ThePlayerList->getLocalPlayer();
+			// You don't need radar for the space bar. That's silly.
+			Coord3D lastEvent;
 
-			// if the local player has a radar, center on last event (if any)
-			// Excuse me?  You don't need radar for the spacebar.  That's silly.
-//			if( TheRadar->isRadarForced() || ( TheRadar->isRadarHidden() == false && player->hasRadar() ) )
-			{
-				Coord3D lastEvent;
-
-				if( TheRadar->getLastEventLoc( &lastEvent ) )
-					TheTacticalView->lookAt( &lastEvent );
-
-			}  // end if
+			if( TheRadar->getLastEventLoc( &lastEvent ) )
+				TheTacticalView->lookAt( &lastEvent );
 
 			disp = DESTROY_MESSAGE;
 			break;
 
-		}  // end view last radar event
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_SELECT_ALL:
@@ -2747,7 +2897,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			disqualifyingKindofs.set(KINDOF_HARVESTER);
 			disqualifyingKindofs.set(KINDOF_IGNORES_SELECT_ALL);
 			Bool selectAircraft = FALSE;
-			
+
 			if( t == GameMessage::MSG_META_SELECT_ALL_AIRCRAFT )
 			{
 				requiredKindofs.set(KINDOF_AIRCRAFT);
@@ -2802,10 +2952,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				disqualifyingKindofs.set(KINDOF_DOZER);
 				disqualifyingKindofs.set(KINDOF_HARVESTER);
 				disqualifyingKindofs.set(KINDOF_IGNORES_SELECT_ALL);
-				if( object  
-					&& object->isMobile() 
-					&& object->isLocallyControlled() 
-					&& !object->isContained() 
+				if( object
+					&& object->isMobile()
+					&& object->isLocallyControlled()
+					&& !object->isContained()
 					&& !object->isAnyKindOf( disqualifyingKindofs )
 					&& !object->isEffectivelyDead()
 					&& object->isMassSelectable()
@@ -2817,9 +2967,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 						if ( !TheInGameUI->getDisplayedMaxWarning() )
 						{
 							TheInGameUI->setDisplayedMaxWarning( TRUE );
-							UnicodeString msg;
-							msg.format(TheGameText->fetch("GUI:MaxSelectionSize").str(), TheInGameUI->getMaxSelectCount());
-							TheInGameUI->message(msg);
+							TheInGameUI->message("GUI:MaxSelectionSize", TheInGameUI->getMaxSelectCount());
 						}
 					}
 					else
@@ -2834,15 +2982,14 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			if( TheInGameUI->getSelectCount() )
 			{
-				UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-				TheInGameUI->message( message );
+				TheInGameUI->message("GUI:SelectedAcrossMap");
 			}
 
 			disp = DESTROY_MESSAGE;
 			break;
 */
 
-		}  // end select all
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_SCATTER:
@@ -2916,7 +3063,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			if (TheGameLogic->isInMultiplayerGame() && !TheGameLogic->isInReplayGame())
 			{
 				Player *localPlayer = ThePlayerList->getLocalPlayer();
-				if (localPlayer && localPlayer->isPlayerActive() || !TheGlobalData->m_netMinPlayers)
+				// TheSuperHackers @tweak skyaero 19/07/2025 Observers can now chat
+				if (localPlayer || !TheGlobalData->m_netMinPlayers)
 				{
 					ToggleInGameChat();
 					SetInGameChatType( INGAME_CHAT_EVERYONE );
@@ -2945,7 +3093,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				Int count;
 				const ThingTemplate *thing = TheThingFactory->findTemplate( ThePlayerList->getLocalPlayer()->getPlayerTemplate()->getBeaconTemplate() );
 				ThePlayerList->getLocalPlayer()->countObjectsByThingTemplate( 1, &thing, false, &count );
-				DEBUG_LOG(("MSG_META_PLACE_BEACON - Player already has %d beacons active\n", count));
+				DEBUG_LOG(("MSG_META_PLACE_BEACON - Player already has %d beacons active", count));
 				if (count < TheMultiplayerSettings->getMaxBeaconsPerPlayer())
 				{
 					const CommandButton *commandButton = TheControlBar->findCommandButton( "Command_PlaceBeacon" );
@@ -2967,11 +3115,51 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_OPTIONS:
-			
+
 			ToggleQuitMenu();
 			disp = DESTROY_MESSAGE;
 			break;
 
+		//-----------------------------------------------------------------------------------------
+		case GameMessage::MSG_META_INCREASE_MAX_RENDER_FPS:
+		{
+			if (changeMaxRenderFps(FpsValueChange_Increase))
+			{
+				disp = DESTROY_MESSAGE;
+			}
+			break;
+		}
+
+		//-----------------------------------------------------------------------------------------
+		case GameMessage::MSG_META_DECREASE_MAX_RENDER_FPS:
+		{
+			if (changeMaxRenderFps(FpsValueChange_Decrease))
+			{
+				disp = DESTROY_MESSAGE;
+			}
+			break;
+		}
+
+		//-----------------------------------------------------------------------------------------
+		case GameMessage::MSG_META_INCREASE_LOGIC_TIME_SCALE:
+		{
+			if (changeLogicTimeScale(FpsValueChange_Increase))
+			{
+				disp = DESTROY_MESSAGE;
+			}
+			break;
+		}
+
+		//-----------------------------------------------------------------------------------------
+		case GameMessage::MSG_META_DECREASE_LOGIC_TIME_SCALE:
+		{
+			if (changeLogicTimeScale(FpsValueChange_Decrease))
+			{
+				disp = DESTROY_MESSAGE;
+			}
+			break;
+		}
+
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_TOGGLE_LOWER_DETAILS:
 		{
@@ -3003,20 +3191,20 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 					oldCloudMap = TheGlobalData->m_useCloudMap;
 					TheWritableGlobalData->m_useCloudMap = FALSE;
-					
+
 					oldBehindBuildingMarkers = TheGameLogic->getShowBehindBuildingMarkers();
 					TheGameLogic->setShowBehindBuildingMarkers(FALSE);
 
 					oldMaxParticleCount = TheGlobalData->m_maxParticleCount;
 					TheWritableGlobalData->m_maxParticleCount = DROPPED_MAX_PARTICLE_COUNT;
-					
+
 					if(TheInGameUI)
 						TheInGameUI->message("GUI:DetailsSetToLowest");
 				}
-			}  
+			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_TOGGLE_CONTROL_BAR:
@@ -3032,24 +3220,43 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			else
 			{
-				if (!(TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK))
+				Bool hide = false;
+				if (TheWindowManager)
 				{
-					Bool hide = false;
-					if (TheWindowManager)
-					{
-						Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
-						GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
-
-						if (window)
-							hide = !window->winIsHidden();
-					}
+					Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent");
+					GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
 
-					ToggleControlBar();
+					if (window)
+						hide = !window->winIsHidden();
 				}
+
+				ToggleControlBar();
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
+
+		//-----------------------------------------------------------------------------------------
+		case GameMessage::MSG_META_TOGGLE_PLAYER_OBSERVER:
+		{
+			if (Player *lookAtPlayer = TheControlBar->getObserverLookAtPlayer())
+			{
+				if (Player *observedPlayer = TheControlBar->getObservedPlayer())
+				{
+					// Set no observed player.
+					rts::changeObservedPlayer(NULL);
+					// But keep the look-at player.
+					TheControlBar->setObserverLookAtPlayer(lookAtPlayer);
+				}
+				else
+				{
+					// Set observed player to look-at player.
+					rts::changeObservedPlayer(lookAtPlayer);
+				}
+				disp = DESTROY_MESSAGE;
+			}
+			break;
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_TOGGLE_ATTACKMOVE:
@@ -3064,6 +3271,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			DEBUG_ASSERTCRASH(TheInGameUI->isCameraRotatingLeft(), ("Clearing rotate camera left, but it's already clear!"));
 			TheInGameUI->setCameraRotateLeft( false );
 			break;
+		case GameMessage::MSG_META_ALT_CAMERA_ROTATE_LEFT:
+			if (TheTacticalView->isCameraMovementFinished())
+				TheTacticalView->rotateCamera(-1.0f / 8.0f, 500);
+			break;
 		case GameMessage::MSG_META_BEGIN_CAMERA_ROTATE_RIGHT:
 			DEBUG_ASSERTCRASH(!TheInGameUI->isCameraRotatingRight(), ("Setting rotate camera right, but it's already set!"));
 			TheInGameUI->setCameraRotateRight( true );
@@ -3072,6 +3283,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			DEBUG_ASSERTCRASH(TheInGameUI->isCameraRotatingRight(), ("Clearing rotate camera right, but it's already clear!"));
 			TheInGameUI->setCameraRotateRight( false );
 			break;
+		case GameMessage::MSG_META_ALT_CAMERA_ROTATE_RIGHT:
+			if (TheTacticalView->isCameraMovementFinished())
+				TheTacticalView->rotateCamera(1.0f / 8.0f, 500);
+			break;
 		case GameMessage::MSG_META_BEGIN_CAMERA_ZOOM_IN:
 			DEBUG_ASSERTCRASH(!TheInGameUI->isCameraZoomingIn(), ("Setting zoom camera in, but it's already set!"));
 			TheInGameUI->setCameraZoomIn( true );
@@ -3100,20 +3315,21 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 #endif
 				{
 					TheWritableGlobalData->m_TiVOFastMode = 1 - TheGlobalData->m_TiVOFastMode;
-					TheInGameUI->message( UnicodeString( L"m_TiVOFastMode: %s" ),
-																TheGlobalData->m_TiVOFastMode ? L"ON" : L"OFF" );
+					TheInGameUI->messageNoFormat( TheGlobalData->m_TiVOFastMode
+						? TheGameText->FETCH_OR_SUBSTITUTE("GUI:FF_ON", L"Fast Forward is on")
+						: TheGameText->FETCH_OR_SUBSTITUTE("GUI:FF_OFF", L"Fast Forward is off")
+					);
 				}
-			}  // end if
+			}
 
 			disp = DESTROY_MESSAGE;
 			break;
 
 		}
 		case GameMessage::MSG_META_TOGGLE_PAUSE:
+		case GameMessage::MSG_META_TOGGLE_PAUSE_ALT:
 		{
-#if !defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h
-			if (TheGameLogic->isInReplayGame())
-#endif
+			if (!TheGameLogic->isInMultiplayerGame())
 			{
 				if (TheGameLogic->isGamePaused())
 				{
@@ -3126,17 +3342,18 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					Bool pauseInput = FALSE;
 					TheGameLogic->setGamePaused(pause, pauseMusic, pauseInput);
 				}
+				disp = DESTROY_MESSAGE;
 			}
 			break;
 		}
 		case GameMessage::MSG_META_STEP_FRAME:
+		case GameMessage::MSG_META_STEP_FRAME_ALT:
 		{
-#if !defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h
-			if (TheGameLogic->isInReplayGame())
-#endif
+			if (!TheGameLogic->isInMultiplayerGame())
 			{
 				TheGameLogic->setGamePaused(FALSE);
-				TheGameLogic->setGamePausedInFrame(TheGameLogic->getFrame() + 1);
+				TheGameLogic->setGamePausedInFrame(TheGameLogic->getFrame() + 1, TRUE);
+				disp = DESTROY_MESSAGE;
 			}
 			break;
 		}
@@ -3206,6 +3423,26 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			break;
 		}
 
+		// --------------------------------------------------------------------------------------------
+		case GameMessage::MSG_CREATE_TEAM0:
+		case GameMessage::MSG_CREATE_TEAM1:
+		case GameMessage::MSG_CREATE_TEAM2:
+		case GameMessage::MSG_CREATE_TEAM3:
+		case GameMessage::MSG_CREATE_TEAM4:
+		case GameMessage::MSG_CREATE_TEAM5:
+		case GameMessage::MSG_CREATE_TEAM6:
+		case GameMessage::MSG_CREATE_TEAM7:
+		case GameMessage::MSG_CREATE_TEAM8:
+		case GameMessage::MSG_CREATE_TEAM9:
+		{
+			Int playerIndex = msg->getPlayerIndex();
+			Player* player = ThePlayerList->getNthPlayer(playerIndex);
+			if (player && player->isLocalPlayer())
+				player->processCreateTeamGameMessage(t - GameMessage::MSG_CREATE_TEAM0, msg);
+
+			break;
+		}
+
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CREATE_SELECTED_GROUP:
 		case GameMessage::MSG_SELECT_TEAM0:
@@ -3218,7 +3455,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_SELECT_TEAM7:
 		case GameMessage::MSG_SELECT_TEAM8:
 		case GameMessage::MSG_SELECT_TEAM9:
-		{	
+		{
 			// weed out unit responses for things we don't own.
 			DrawableList listOfUnits = *TheInGameUI->getAllSelectedDrawables();
 			for (DrawableListIt it = listOfUnits.begin(); it != listOfUnits.end(); /* empty */) {
@@ -3271,7 +3508,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_MOUSEOVER_DRAWABLE_HINT:
 		{
 			const CommandButton *command = TheInGameUI->getGUICommand();
-			if( TheInGameUI->getSelectCount() > 0 
+			if( TheInGameUI->getSelectCount() > 0
 					|| (command && command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_COMMAND_CENTER) ) // If something is selected
 			{
 				/// @todo This as well as the one in GameMessage::MSG_DRAWABLE_PICKED below should possibly have a generalized CanAttack instead of simply checking isEnemyOf
@@ -3297,7 +3534,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 		}
 		break;
-		
+
 		//-----------------------------------------------------------------------------
 		// Terrain is mouseover'd.  A hint of a command may be generated if something is selected
 		//
@@ -3318,48 +3555,52 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			// Do not eat this message, as it will do something itself at HintSpy
 			break;
 
-		}  // end case GameMessage::MSG_MOUSEOVER_LOCATION_HINT
+		}
 
 		//-----------------------------------------------------------------------------
- 		case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN:
- 		{
- 			// There are two ways in which we can ignore this as a deselect:
+		// TheSuperHackers @bugfix Treat the raw double click event identical to the raw button down event
+		// because it implicitly is a raw button down event as well. Failing to do so would mess with the
+		// button timings in later events on button up.
+		case GameMessage::MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK:
+		case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN:
+		{
+			// There are two ways in which we can ignore this as a deselect:
  			// 1) 2-D position on screen
  			// 2) Time has exceeded the time which we allow for this to be a click.
  			m_mouseRightDragAnchor = msg->getArgument( 0 )->pixel;
  			m_mouseRightDown = (UnsignedInt) msg->getArgument( 2 )->integer;
- 
+
  			break;
  		}
- 
+
  		//-----------------------------------------------------------------------------
  		case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP:
  		{
  			// register this event for determining if the click was fast or short enough not to be a drag
  			m_mouseRightDragLift = msg->getArgument( 0 )->pixel;
  			m_mouseRightUp = (UnsignedInt) msg->getArgument( 2 )->integer;
- 
+
  			break;
  		}
- 
+
  		//-----------------------------------------------------------------------------
  		case GameMessage::MSG_MOUSE_RIGHT_DOUBLE_CLICK:
  		case GameMessage::MSG_MOUSE_RIGHT_CLICK:
  		{
  			// right click is only actioned here if we're in alternate mouse mode
- 			if (TheGlobalData->m_useAlternateMouse 
+ 			if (TheGlobalData->m_useAlternateMouse
  				&& TheMouse->isClick(&m_mouseRightDragAnchor, &m_mouseRightDragLift, m_mouseRightDown, m_mouseRightUp))
  			{
  				Bool isPoint = (msg->getArgument(0)->pixelRegion.height() == 0 && msg->getArgument(0)->pixelRegion.width() == 0);
- 
+
  				// NOTE: RIGHT_CLICK is not transmitted if AREA_SELECTION or DRAWABLE_PICKED occurs.
  				// If we see this msg, no object was clicked on, therefore clicked on ground.
  				// Issue move command to all currently selected objects.
- 
+
  				// sanity
  				if( TheTacticalView == NULL )
  					break;
- 
+
  				// translate from screen coordinates to terrain coords
 				Coord3D pos;
 				TheTacticalView->screenToTerrain( &msg->getArgument( 0 )->pixel, &pos );
@@ -3370,9 +3611,17 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				if (isPoint && controllable)
 				{
 					UnsignedInt pickType = getPickTypesForContext( TheInGameUI->isInForceAttackMode() );
-					Drawable *draw = TheTacticalView->pickDrawable(&msg->getArgument(0)->pixelRegion.lo, 
-																													TheInGameUI->isInForceAttackMode(), 
+					Drawable *draw = TheTacticalView->pickDrawable(&msg->getArgument(0)->pixelRegion.lo,
+																													TheInGameUI->isInForceAttackMode(),
 																													(PickType) pickType);
+
+					// TheSuperHackers @bugfix Stubbjax 07/08/2025 Prevent dead units blocking positional context commands
+					Object* obj = draw ? draw->getObject() : NULL;
+					if (!obj || (obj->isEffectivelyDead() && !obj->isKindOf(KINDOF_ALWAYS_SELECTABLE)))
+					{
+						draw = NULL;
+					}
+
 					if (TheInGameUI->isInForceAttackMode()) {
 						evaluateForceAttack( draw, &pos, DO_COMMAND );
 					} else {
@@ -3384,7 +3633,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				}
 			}
 
-			break;					
+			break;
 		}
 
 		//-----------------------------------------------------------------------------
@@ -3413,7 +3662,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 												|| command->getCommandType() == GUI_COMMAND_COMBATDROP
 												|| command->getCommandType() == GUICOMMANDMODE_HIJACK_VEHICLE
 												|| command->getCommandType() == GUICOMMANDMODE_CONVERT_TO_CARBOMB));
- 
+
  			// in alternate mouse mode, this left click is only actioned here if we're firing a gui command
  			if ((TheGlobalData->m_useAlternateMouse) && (! isFiringGUICommand))
  				break;
@@ -3423,10 +3672,17 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			if (isPoint && controllable)
 			{
 				UnsignedInt pickType = getPickTypesForContext( TheInGameUI->isInForceAttackMode() );
-				Drawable *draw = TheTacticalView->pickDrawable(&msg->getArgument(0)->pixelRegion.lo, 
-																												TheInGameUI->isInForceAttackMode(), 
+				Drawable *draw = TheTacticalView->pickDrawable(&msg->getArgument(0)->pixelRegion.lo,
+																												TheInGameUI->isInForceAttackMode(),
 																												(PickType) pickType);
-				
+
+				// TheSuperHackers @bugfix Stubbjax 07/08/2025 Prevent dead units blocking positional context commands
+				Object* obj = draw ? draw->getObject() : NULL;
+				if (!obj || (obj->isEffectivelyDead() && !obj->isKindOf(KINDOF_ALWAYS_SELECTABLE)))
+				{
+					draw = NULL;
+				}
+
 				if (TheInGameUI->isInForceAttackMode()) {
 					evaluateForceAttack( draw, &pos, DO_COMMAND );
 				} else {
@@ -3440,10 +3696,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			break;
 
-		}  // end case GameMessage::MSG_MOUSE_LEFT_CLICK
+		}
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		//------------------------------------------------------------------------- BEGIN DEMO MESSAGES
 		//------------------------------------------------------------------------- BEGIN DEMO MESSAGES
 		//------------------------------------------------------------------------- BEGIN DEMO MESSAGES
@@ -3478,7 +3734,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					}
 				}
 				Int idxOrig = idx;
-				do 
+				do
 				{
 
 					++idx;
@@ -3491,19 +3747,13 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					}
 
 				} while (ThePlayerList->getNthPlayer(idx) == ThePlayerList->getNeutralPlayer());
-				
-				ThePlayerList->setLocalPlayer(ThePlayerList->getNthPlayer(idx));
-				TheInGameUI->deselectAllDrawables();
-#ifdef DEBUG_FOG_MEMORY
-				TheGhostObjectManager->setLocalPlayerIndex(idx);
-#endif
-				ThePartitionManager->refreshShroudForLocalPlayer();
-				TheControlBar->initSpecialPowershortcutBar(ThePlayerList->getLocalPlayer());
-				TheControlBar->setControlBarSchemeByPlayer(ThePlayerList->getLocalPlayer());
+
+				Player* player = ThePlayerList->getNthPlayer(idx);
+				rts::changeLocalPlayer(player);
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		} 
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -3520,11 +3770,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					Player *pt = ThePlayerList->getNthPlayer(i);
 					if(pt->getSide().compareNoCase("China") == 0)
 					{
-						ThePlayerList->setLocalPlayer(pt);
-						TheInGameUI->deselectAllDrawables();
-						ThePartitionManager->refreshShroudForLocalPlayer();
-						TheControlBar->setControlBarSchemeByPlayer(ThePlayerList->getLocalPlayer());
-
+						rts::changeLocalPlayer(pt);
 						break;
 					}
 				}
@@ -3537,10 +3783,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					Player *pt = ThePlayerList->getNthPlayer(i);
 					if(pt->getSide().compareNoCase("America") == 0)
 					{
-						ThePlayerList->setLocalPlayer(pt);
-						TheInGameUI->deselectAllDrawables();
-						ThePartitionManager->refreshShroudForLocalPlayer();
-						TheControlBar->setControlBarSchemeByPlayer(ThePlayerList->getLocalPlayer());
+						rts::changeLocalPlayer(pt);
 						break;
 					}
 				}
@@ -3554,19 +3797,23 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_LOD_DECREASE:
 		{
-			TheGameClient->adjustLOD(-1);
+			const Int level = clamp(0, WW3D::Get_Texture_Reduction() - 1, 4);
+			TheGameClient->setTextureLOD(level);
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugDecreaseLOD", L"Decrease LOD") );
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_LOD_INCREASE:
 		{
-			TheGameClient->adjustLOD(1);
+			const Int level = clamp(0, WW3D::Get_Texture_Reduction() + 1, 4);
+			TheGameClient->setTextureLOD(level);
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugIncreaseLOD", L"Increase LOD") );
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -3577,14 +3824,14 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 /*
 			if (TheWindowManager && TheNameKeyGenerator)
 			{
-				GameWindow *motd = TheWindowManager->winGetWindowFromId(NULL, (Int)TheNameKeyGenerator->nameToKey(AsciiString("MOTD.wnd:MOTD")));
+				GameWindow *motd = TheWindowManager->winGetWindowFromId(NULL, (Int)TheNameKeyGenerator->nameToKey("MOTD.wnd:MOTD"));
 				if (motd)
 					motd->winHide(!motd->winIsHidden());
 			}*/
-  
+
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -3603,10 +3850,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					TheGameLogic->setShowBehindBuildingMarkers(TRUE);
 					TheInGameUI->message("GUI:HideBehindBuildings");
 				}
-			}  
+			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -3626,7 +3873,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				Bool hide = false;
 				if (TheWindowManager)
 				{
-					Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
+					Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent");
 					GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
 
 					if (window)
@@ -3641,7 +3888,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -3653,12 +3900,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 			// when messages get turned on, display a message
 			if( TheInGameUI->isMessagesOn() )
-				TheInGameUI->message( TheGameText->fetch( "GUI:MessagesOn" ) );
+				TheInGameUI->message("GUI:MessagesOn");
 
 			disp = DESTROY_MESSAGE;
 			break;
 
-		}  // end clear message text
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -3669,7 +3916,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				TheTacticalView->setViewFilterMode(FM_NULL_MODE);
 				TheTacticalView->setViewFilter(FT_NULL_FILTER);
 			}
-			else 
+			else
 			{
 				static Bool saturate = false;
 				FilterModes mode = FM_VIEW_MB_IN_AND_OUT_ALPHA;
@@ -3684,9 +3931,9 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				TheTacticalView->getPosition(&curpos);
 				curpos.x += 200;
 				curpos.y += 200;
-				TheTacticalView->setViewFilterPos(&curpos); 
+				TheTacticalView->setViewFilterPos(&curpos);
 
-				TheTacticalView->setViewFilterMode(mode); 						 
+				TheTacticalView->setViewFilterMode(mode);
 				TheTacticalView->setViewFilter(FT_VIEW_MOTION_BLUR_FILTER);
 			}
 			disp = DESTROY_MESSAGE;
@@ -3738,7 +3985,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_RED_VIEW:
-		{	
+		{
 			if ((TheTacticalView->getViewFilterType()) == FT_VIEW_BW_FILTER)
 			{	//mode already set, turn it off
 				TheTacticalView->setViewFilterMode(FM_NULL_MODE);
@@ -3759,7 +4006,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_GREEN_VIEW:
-		{	
+		{
 			if ((TheTacticalView->getViewFilterType()) == FT_VIEW_BW_FILTER)
 			{	//mode already set, turn it off
 				TheTacticalView->setViewFilterMode(FM_NULL_MODE);
@@ -3789,13 +4036,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 			TheGameLODManager->setDynamicLODLevel((DynamicGameLODLevel)level);
 
-			UnicodeString lodName;
-			lodName.format(L"Dynamic Game Detail %hs",TheGameLODManager->getDynamicGameLODLevelName((DynamicGameLODLevel)level));
-			TheInGameUI->message(lodName);
+			const char* lodLevelName = TheGameLODManager->getDynamicGameLODLevelName((DynamicGameLODLevel)level);
+			TheInGameUI->message( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugDynamicLODLevel", L"Dynamic Game Detail %hs", lodLevelName) );
 
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -3804,26 +4050,38 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			TheDisplay->dumpModelAssets("UsedMapAssets.txt");
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
-		
+		}
+
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_SHADOW_VOLUMES:
 		{
 			TheWritableGlobalData->m_useShadowVolumes = !TheGlobalData->m_useShadowVolumes;
 			TheWritableGlobalData->m_useShadowDecals = !TheGlobalData->m_useShadowDecals;
+
+			if (TheWritableGlobalData->m_useShadowVolumes)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugShadowVolumesOn", L"Shadow Volumes is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugShadowVolumesOff", L"Shadow Volumes is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_FOGOFWAR:
 		{
 			TheWritableGlobalData->m_fogOfWarOn = !TheGlobalData->m_fogOfWarOn;
+
+			if (TheWritableGlobalData->m_fogOfWarOn)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugFogOfWarOn", L"Fog of War is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugFogOfWarOff", L"Fog of War is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -3855,42 +4113,45 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_GIVE_VETERANCY:
 		case GameMessage::MSG_META_DEBUG_TAKE_VETERANCY:
 		{
+			if (TheGameLogic->isInMultiplayerGame())
+				break;
+
 			const DrawableList *list = TheInGameUI->getAllSelectedDrawables();
-			for (DrawableListCIt it = list->begin(); it != list->end(); ++it) 
+			for (DrawableListCIt it = list->begin(); it != list->end(); ++it)
 			{
 				Drawable *pDraw = *it;
-				if (pDraw) 
+				if (!pDraw)
+					continue;
+
+				Object *pObject = pDraw->getObject();
+				if (!pObject)
+					continue;
+
+				ExperienceTracker *et = pObject->getExperienceTracker();
+				if (!et || !et->isTrainable())
+					continue;
+
+				VeterancyLevel oldVet = et->getVeterancyLevel();
+				VeterancyLevel newVet = oldVet;
+
+				if (t == GameMessage::MSG_META_DEBUG_GIVE_VETERANCY)
 				{
-					Object *pObject = pDraw->getObject();
-					if (pObject)
+					if (oldVet < LEVEL_LAST)
 					{
-						ExperienceTracker *et = pObject->getExperienceTracker();
-						if (et)
-						{
-							if (et->isTrainable())
-							{
-								VeterancyLevel oldVet = et->getVeterancyLevel();
-								VeterancyLevel newVet = oldVet;
-								if (t == GameMessage::MSG_META_DEBUG_GIVE_VETERANCY)
-								{
-									if (oldVet < LEVEL_LAST)
-									{
-										newVet = (VeterancyLevel)((Int)oldVet + 1);
-									}
-								}
-								else
-								{
-									if (oldVet > LEVEL_FIRST)
-									{
-										newVet = (VeterancyLevel)((Int)oldVet - 1);
-									}
-								}
-								et->setVeterancyLevel(newVet);
-							}
-						}
+						newVet = (VeterancyLevel)((Int)oldVet + 1);
 					}
 				}
+				else
+				{
+					if (oldVet > LEVEL_FIRST)
+					{
+						newVet = (VeterancyLevel)((Int)oldVet - 1);
+					}
+				}
+
+				et->setVeterancyLevel(newVet);
 			}
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -3900,7 +4161,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED:
 		{
 			TheSkateDistOverride += 0.25f;
-			TheInGameUI->message( UnicodeString( L"Skate Distance Override is now %f" ), TheSkateDistOverride );
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugAnimSkateSpeed", L"Skate Distance Override is now %f", TheSkateDistOverride ) );
 			break;
 		}
 
@@ -3909,7 +4170,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED:
 		{
 			TheSkateDistOverride -= 0.25f;
-			TheInGameUI->message( UnicodeString( L"Skate Distance Override is now %f" ), TheSkateDistOverride );
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugAnimSkateSpeed", L"Skate Distance Override is now %f", TheSkateDistOverride ) );
 			break;
 		}
 
@@ -3918,64 +4179,73 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_CYCLE_EXTENT_TYPE:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_TYPE;
 			if (!extentModAmount) extentModAmount = 1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_INCREASE_EXTENT_MAJOR:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MAJOR;
 			if (!extentModAmount) extentModAmount = 1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_INCREASE_EXTENT_MAJOR_BIG:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MAJOR;
 			if (!extentModAmount) extentModAmount = EXTENT_BIG_CHANGE;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_DECREASE_EXTENT_MAJOR:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MAJOR;
 			if (!extentModAmount) extentModAmount = -1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_DECREASE_EXTENT_MAJOR_BIG:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MAJOR;
 			if (!extentModAmount) extentModAmount = -EXTENT_BIG_CHANGE;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_INCREASE_EXTENT_MINOR:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MINOR;
 			if (!extentModAmount) extentModAmount = 1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_INCREASE_EXTENT_MINOR_BIG:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MINOR;
 			if (!extentModAmount) extentModAmount = EXTENT_BIG_CHANGE;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_DECREASE_EXTENT_MINOR:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MINOR;
 			if (!extentModAmount) extentModAmount = -1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_DECREASE_EXTENT_MINOR_BIG:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MINOR;
 			if (!extentModAmount) extentModAmount = -EXTENT_BIG_CHANGE;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_HEIGHT;
 			if (!extentModAmount) extentModAmount = 1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT_BIG:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_HEIGHT;
 			if (!extentModAmount) extentModAmount = EXTENT_BIG_CHANGE;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_HEIGHT;
 			if (!extentModAmount) extentModAmount = -1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT_BIG:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_HEIGHT;
 			if (!extentModAmount) extentModAmount = -EXTENT_BIG_CHANGE;
 		{
 			const DrawableList *list = TheInGameUI->getAllSelectedDrawables();
-			for (DrawableListCIt it = list->begin(); it != list->end(); ++it) 
+			for (DrawableListCIt it = list->begin(); it != list->end(); ++it)
 			{
 				Drawable *pDraw = *it;
-				if (pDraw) 
+				if (pDraw)
 				{
 					Object *pObject = pDraw->getObject();
 					if (pObject)
 					{
 						const GeometryInfo oldGeometry = pObject->getGeometryInfo();
-						
+
 						GeometryInfo newGeometry = oldGeometry;
 						newGeometry.tweakExtents(extentModType, extentModAmount);
-						
-						AsciiString msg;
-						msg.format("Extent %s --> %s   %d %g",oldGeometry.getDescriptiveString().str(), newGeometry.getDescriptiveString().str(),	extentModType, extentModAmount);
 
-						UnicodeString umsg;
-						umsg.translate(msg);
-						TheInGameUI->message(umsg);
-						DEBUG_LOG(("%ls\n", msg.str()));
+						TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugExtent",
+							L"Extent %hs --> %hs   %d %g", oldGeometry.getDescriptiveString().str(), newGeometry.getDescriptiveString().str(), extentModType, extentModAmount ) );
+
+						DEBUG_LOG(("Extent %s --> %s   %d %g", oldGeometry.getDescriptiveString().str(), newGeometry.getDescriptiveString().str(), extentModType, extentModAmount));
 
 						pObject->setGeometryInfo( newGeometry );
 					}
@@ -4002,7 +4272,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			if (id != 0 && TheTacticalView->getCameraLock() == id)
 			{
 				if (TheTacticalView->getCameraLockDrawable())
-				{	
+				{
 					id = INVALID_ID;	// toggle it
 					d=NULL;
 					TheTacticalView->forceRedraw();	//reset camera to normal
@@ -4016,7 +4286,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			TheTacticalView->setCameraLockDrawable(d);
 			disp = DESTROY_MESSAGE;
 			break;
-		}	
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -4027,39 +4297,53 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				TheDisplay->stopMovie();
 				TheInGameUI->stopMovie();
 				TheAudio->setOn(false, AudioAffect_All);
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSoundOff", L"Sound is OFF") );
 			}
 			else
 			{
 				TheAudio->setOn(true, AudioAffect_All);
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSoundOn", L"Sound is ON") );
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_TRACKMARKS:
 		{
 			TheWritableGlobalData->m_makeTrackMarks = !TheGlobalData->m_makeTrackMarks;
+
+			if (TheGlobalData->m_makeTrackMarks)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugTrackMarksOn", L"Track Marks is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugTrackMarksOff", L"Track Marks is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_WATERPLANE:
 		{
 			TheWritableGlobalData->m_useWaterPlane = !TheGlobalData->m_useWaterPlane;
+
+			if (TheGlobalData->m_useWaterPlane)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugWaterPlaneOn", L"Water Plane is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugWaterPlaneOff", L"Water Plane is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TIME_OF_DAY:
 		{
 			TimeOfDay tod = TimeOfDay((Int) TheGlobalData->m_timeOfDay + 1);
-			if (tod >= TIME_OF_DAY_COUNT)
+			if (tod < TIME_OF_DAY_FIRST || tod >= TIME_OF_DAY_COUNT)
 				tod = TIME_OF_DAY_FIRST;
 			if (TheWritableGlobalData->setTimeOfDay(tod))
 			{
@@ -4077,18 +4361,32 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 						}
 					}
 				}
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugTimeOfDay", L"Time of Day set to %hs", TimeOfDayNames[tod]) );
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_REMOVE_PREREQ:
 		{
 			// Doesn't make a valid network message
-			Player *localPlayer = ThePlayerList->getLocalPlayer();
-			localPlayer->toggleIgnorePrereqs();
+			// TheSuperHackers @info In multiplayer, all clients need to enable this cheat at the same time, otherwise game will mismatch
+			Bool enable = !ThePlayerList->getLocalPlayer()->ignoresPrereqs();
+
+			for (Int n = 0; n < ThePlayerList->getPlayerCount(); ++n)
+			{
+				Player* player = ThePlayerList->getNthPlayer(n);
+				if (player->getPlayerType() == PLAYER_HUMAN)
+					player->enableIgnorePrereqs(enable);
+			}
+
+			if (enable)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugIgnorePrereqOn", L"Ignore Prerequisites is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugIgnorePrereqOff", L"Ignore Prerequisites is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4098,9 +4396,25 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEMO_INSTANT_BUILD:
 		{
 			// Doesn't make a valid network message
-			Player *localPlayer = ThePlayerList->getLocalPlayer();
-			localPlayer->toggleInstantBuild();
-			disp = DESTROY_MESSAGE;
+			// TheSuperHackers @info In multiplayer, all clients need to enable this cheat at the same time, otherwise game will mismatch
+			if (!TheGameLogic->isInMultiplayerGame() || !hasThingsInProduction(PLAYER_HUMAN))
+			{
+				Bool enable = !ThePlayerList->getLocalPlayer()->buildsInstantly();
+
+				for (Int n = 0; n < ThePlayerList->getPlayerCount(); ++n)
+				{
+					Player* player = ThePlayerList->getNthPlayer(n);
+					if (player->getPlayerType() == PLAYER_HUMAN)
+						player->enableInstantBuild(enable);
+				}
+
+				if (enable)
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugInstantBuildOn", L"Instant Build is ON") );
+				else
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugInstantBuildOff", L"Instant Build is OFF") );
+
+				disp = DESTROY_MESSAGE;
+			}
 			break;
 		}
 
@@ -4109,8 +4423,21 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEMO_FREE_BUILD:
 		{
 			// Doesn't make a valid network message
-			Player *localPlayer = ThePlayerList->getLocalPlayer();
-			localPlayer->toggleFreeBuild();
+			// TheSuperHackers @info In multiplayer, all clients need to enable this cheat at the same time, otherwise game will mismatch
+			Bool enable = !ThePlayerList->getLocalPlayer()->buildsForFree();
+
+			for (Int n = 0; n < ThePlayerList->getPlayerCount(); ++n)
+			{
+				Player* player = ThePlayerList->getNthPlayer(n);
+				if (player->getPlayerType() == PLAYER_HUMAN)
+					player->enableFreeBuild(enable);
+			}
+
+			if (enable)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugFreeBuildOn", L"Free Build is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugFreeBuildOff", L"Free Build is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4130,6 +4457,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			Player *localPlayer = ThePlayerList->getLocalPlayer();
 			Money *money = localPlayer->getMoney();
 			money->deposit( 10000 );
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugAddCash", L"Add Cash") );
 			break;
 		}
 
@@ -4151,6 +4479,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				AsciiString scriptName;
 				scriptName.format("KEY_F%d", script);
 				TheScriptEngine->runScript(scriptName);
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugRunScript", L"Run script %d", script) );
 			}
 			disp = DESTROY_MESSAGE;
 			break;
@@ -4196,16 +4525,17 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				AsciiString name;
 				name.format("DemoObjective%02d", m_objective);
 				TheInGameUI->playMovie(name);
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugObjectiveMove", L"Objective Movie %d", m_objective) );
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_MILITARY_SUBTITLES:
 		{
-			
+
 			TheInGameUI->militarySubtitle("MSG:Testing", 10000);  // use some innocuous string
 			disp = DESTROY_MESSAGE;
 			break;
@@ -4215,41 +4545,39 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_MUSIC:
 		{
-			if (TheAudio->isMusicPlaying()) {
+			if (TheAudio->isMusicPlaying())
+			{
 				TheAudio->stopAudio(AudioAffect_Music);
-				TheInGameUI->message( UnicodeString( L"Stopping Music" ));
-			} else {
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugMusicOn", L"Music is OFF") );
+			} else
+			{
 				TheAudio->resumeAudio(AudioAffect_Music);
-				TheInGameUI->message( UnicodeString( L"Resuming Music" ));
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugMusicOff", L"Music is ON") );
 			}
 
 			disp = DESTROY_MESSAGE;
 			break;
-		} 
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_MUSIC_NEXT_TRACK:
 		{
 			TheAudio->nextMusicTrack();
-			UnicodeString ustr;
-			ustr.format(L"Playing Track: %hs", TheAudio->getMusicTrackName().str());
-			TheInGameUI->message( ustr );
+			TheInGameUI->message( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugMusicTrack", L"Playing Track: %hs", TheAudio->getMusicTrackName().str()) );
 			disp = DESTROY_MESSAGE;
 			break;
-		} 
-		
+		}
+
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_MUSIC_PREV_TRACK:
 		{
 			TheAudio->prevMusicTrack();
-			UnicodeString ustr;
-			ustr.format(L"Playing Track: %hs", TheAudio->getMusicTrackName().str());
-			TheInGameUI->message( ustr );
+			TheInGameUI->message( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugMusicTrack", L"Playing Track: %hs", TheAudio->getMusicTrackName().str()) );
 			disp = DESTROY_MESSAGE;
 			break;
-		} 
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -4271,11 +4599,15 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEMO_TOGGLE_AI_DEBUG:
 		{
 			TheWritableGlobalData->m_debugAI = (AIDebugOptions)((Int)TheGlobalData->m_debugAI + 1);
-			if (TheGlobalData->m_debugAI >= AI_DEBUG_END) 
+			if (TheGlobalData->m_debugAI >= AI_DEBUG_END)
 				TheWritableGlobalData->m_debugAI=AI_DEBUG_NONE;
+
 			UnicodeString line;
 			line.format(L"Level %d", TheGlobalData->m_debugAI);
-			TheInGameUI->message( UnicodeString( L"Debug AI Mode is %s" ), TheGlobalData->m_debugAI ? line.str() : L"OFF" );
+			if (TheGlobalData->m_debugAI != AI_DEBUG_NONE)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugAiDebugOn", L"Debug AI Mode is %s", line.str()) );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugAiDebugOff", L"Debug AI Mode is OFF") );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4287,7 +4619,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			Player *player = ThePlayerList->getLocalPlayer();
 			if (player)
 				player->addSciencePurchasePoints(1);
-			TheInGameUI->message( UnicodeString( L"Adding a SciencePurchasePoint" ));
+
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugGiveSciencePurchasePoint", L"Adding a SciencePurchasePoint") );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4296,21 +4629,15 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_GIVE_ALL_SCIENCES:
 		{
-			Player *player = ThePlayerList->getLocalPlayer();
-			if (player)
+			// TheSuperHackers @info In multiplayer, all clients need to enable this cheat at the same time, otherwise game will mismatch
+			for (Int n = 0; n < ThePlayerList->getPlayerCount(); ++n)
 			{
-				// cheese festival: do NOT imitate this code. it is for debug purposes only.
-				std::vector<AsciiString> v = TheScienceStore->friend_getScienceNames();
-				for (size_t i = 0; i < v.size(); ++i) 
-				{
-					ScienceType st = TheScienceStore->getScienceFromInternalName(v[i]);
-					if (st != SCIENCE_INVALID && TheScienceStore->isScienceGrantable(st))
-					{
-						player->grantScience(st);
-					}
-				}
+				Player* player = ThePlayerList->getNthPlayer(n);
+				if (player->getPlayerType() == PLAYER_HUMAN)
+					giveAllSciences(player);
 			}
-			TheInGameUI->message( UnicodeString( L"Granting all sciences!" ));
+
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugGiveAllSciences", L"Granting all sciences!") );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4322,7 +4649,9 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			Player *player = ThePlayerList->getLocalPlayer();
 			if (player)
 				player->setRankLevel(player->getRankLevel() + 1);
-			TheInGameUI->message( UnicodeString( L"Adding a RankLevel" ));
+
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugAddRankLevel", L"Adding a Rank Level") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4334,7 +4663,9 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			Player *player = ThePlayerList->getLocalPlayer();
 			if (player)
 				player->setRankLevel(player->getRankLevel() - 1);
-			TheInGameUI->message( UnicodeString( L"Subtracting a RankLevel" ));
+
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSubRankLevel", L"Subtracting a Rank Level") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4344,7 +4675,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEMO_TOGGLE_CAMERA_DEBUG:
 		{
 			TheWritableGlobalData->m_debugCamera = !TheGlobalData->m_debugCamera;
-			TheInGameUI->message( UnicodeString( L"Debug Camera Mode is %s" ), TheGlobalData->m_debugCamera ? L"On" : L"OFF" );
+
+			if (TheTacticalView->isZoomLimited())
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugCameraModeOn", L"Debug Camera Mode is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugCameraModeOff", L"Debug Camera Mode is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4353,7 +4689,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_NO_DRAW:
 		{
-			TheWritableGlobalData->m_noDraw = REAL_TO_INT(pow(2, 32) - 1);
+			const Bool isZero = TheGlobalData->m_noDraw == 0u;
+			TheWritableGlobalData->m_noDraw = isZero ? ~0u : 0u;
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4412,13 +4749,18 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-		
+
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_VISIONDEBUG:
 		{
 			TheWritableGlobalData->m_debugVisibility = !TheGlobalData->m_debugVisibility;
-			TheInGameUI->message( UnicodeString( L"Debug Vision Mode is %s" ), TheGlobalData->m_debugVisibility? L"On" : L"OFF" );
+
+			if (TheGlobalData->m_debugVisibility)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugVisionModeOn", L"Debug Vision Mode is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugVisionModeOff", L"Debug Vision Mode is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4428,7 +4770,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEMO_TOGGLE_PROJECTILEDEBUG:
 		{
 			TheWritableGlobalData->m_debugProjectilePath = !TheGlobalData->m_debugProjectilePath;
-			TheInGameUI->message( UnicodeString( L"Debug Projectile Path Mode is %s" ), TheGlobalData->m_debugProjectilePath? L"On" : L"OFF" );
+
+			if (TheGlobalData->m_debugProjectilePath)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugProjectilePathModeOn", L"Debug Projectile Path Mode is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugProjectilePathModeOff", L"Debug Projectile Path Mode is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4441,7 +4788,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			if (TheGlobalData->m_debugThreatMap) {
 				TheWritableGlobalData->m_debugCashValueMap = false;
 			}
-			TheInGameUI->message( UnicodeString( L"Debug Threat Map is %s" ), TheGlobalData->m_debugThreatMap? L"On" : L"OFF" );
+
+			if (TheGlobalData->m_debugThreatMap)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugThreadMapOn", L"Debug Threat Map is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugThreadMapOff", L"Debug Threat Map is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4454,11 +4806,16 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			if (TheGlobalData->m_debugCashValueMap) {
 				TheWritableGlobalData->m_debugThreatMap = false;
 			}
-			TheInGameUI->message( UnicodeString( L"Debug Cash Value Map is %s" ), TheGlobalData->m_debugCashValueMap? L"On" : L"OFF" );
+
+			if (TheGlobalData->m_debugCashValueMap)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugCashValueMapOn", L"Debug Cash Value Map is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugCashValueMapOff", L"Debug Cash Value Map is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-		
+
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_GRAPHICALFRAMERATEBAR:
@@ -4472,8 +4829,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEBUG_SHOW_EXTENTS:
 			TheWritableGlobalData->m_showCollisionExtents = 1 - TheGlobalData->m_showCollisionExtents;
-			TheInGameUI->message( UnicodeString( L"Show Object Extents %s" ),
-				                    TheGlobalData->m_showCollisionExtents ? L"ON" : L"OFF" );
+
+			if (TheGlobalData->m_showCollisionExtents)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugObjectExtentsOn", L"Show Object Extents is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugObjectExtentsOff", L"Show Object Extents is OFF") );
+
 			break;
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
@@ -4482,10 +4843,13 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		{
 
 			TheWritableGlobalData->m_showObjectHealth = 1 - TheGlobalData->m_showObjectHealth;
-			TheInGameUI->message( UnicodeString( L"Object Health %s" ),
-				                    TheGlobalData->m_showObjectHealth ? L"ON" : L"OFF" );
+
+				if (TheGlobalData->m_showObjectHealth)
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugObjectHealthOn", L"Object Health is ON") );
+				else
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugObjectHealthOff", L"Object Health is OFF") );
 			break;
-	
+
 		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
@@ -4501,7 +4865,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -4512,15 +4876,18 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			{
 
 				TheTacticalView->setZoomLimited( !TheTacticalView->isZoomLimited() );
-				TheInGameUI->message( UnicodeString( L"Camera Zoom Limit: %s" ),
-				                      TheTacticalView->isZoomLimited() ? L"ON" : L"OFF" );
 
-			}  // end if
+				if (TheTacticalView->isZoomLimited())
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugCameraZoomLimitOn", L"Camera Zoom Limit is ON") );
+				else
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugCameraZoomLimitOff", L"Camera Zoom Limit is OFF") );
+
+			}
 
 			disp = DESTROY_MESSAGE;
 			break;
 
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//---------------------------------------------------------------------------------------------
@@ -4531,15 +4898,18 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			{
 
 				TheWritableGlobalData->m_specialPowerUsesDelay = 1 - TheGlobalData->m_specialPowerUsesDelay;
-				TheInGameUI->message( UnicodeString( L"Special Power (Superweapon) Delay: %s" ),
-															TheGlobalData->m_specialPowerUsesDelay ? L"ON" : L"OFF" );
 
-			}  // end if
+				if (TheGlobalData->m_specialPowerUsesDelay)
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSpecialPowerDelaysOn", L"Special Power (Superweapon) Delay is ON") );
+				else
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSpecialPowerDelaysOff", L"Special Power (Superweapon) Delay is OFF") );
+
+			}
 
 			disp = DESTROY_MESSAGE;
 			break;
 
-		}  // end toggle special power delays
+		}
 
 #ifdef ALLOW_SURRENDER
 		//------------------------------------------------------------------------------- DEMO MESSAGES
@@ -4579,7 +4949,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_VTUNE_ON:
 		{
 			TheScriptEngine->setEnableVTune(true);
-			TheInGameUI->message( UnicodeString( L"VTune Gathering is ON" ));
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugVTuneOff", L"VTune Gathering is ON") );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4590,7 +4960,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_VTUNE_OFF:
 		{
 			TheScriptEngine->setEnableVTune(false);
-			TheInGameUI->message( UnicodeString( L"VTune Gathering is OFF" ));
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugVTuneOff", L"VTune Gathering is OFF") );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4599,12 +4969,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEBUG_TOGGLE_FEATHER_WATER:
 		{
-			//TheScriptEngine->setEnableVTune(false);
-			//TheInGameUI->message( UnicodeString( L"VTune Gathering is OFF" ));
 			--TheWritableGlobalData->m_featherWater;
-			if (TheGlobalData->m_featherWater < 0) 
+			if (TheGlobalData->m_featherWater < 0)
 				TheWritableGlobalData->m_featherWater = 5;
-			
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4614,7 +4982,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_WIN:
 		{
 			TheScriptEngine->debugVictory();
-			TheInGameUI->message( UnicodeString( L"Instant Win" ));
+
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugWin", L"Instant Win") );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4634,11 +5003,11 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//--------------------------------------------------------------------------- END DEMO MESSAGES
 		//--------------------------------------------------------------------------- END DEMO MESSAGES
 		//--------------------------------------------------------------------------- END DEMO MESSAGES
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		//------------------------------------------------------------------------DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) 
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_TOGGLE_AUDIODEBUG:
 		{
 			if (TheDisplay->getDebugDisplayCallback() == AudioDebugDisplay)
@@ -4649,25 +5018,27 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			break;
 		}
 
-#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG) 
-		
+#endif//defined(RTS_DEBUG)
+
 #ifdef DUMP_PERF_STATS
 		//------------------------------------------------------------------------DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_PERFORM_STATISTICAL_DUMP:
 			//Dump performance statistics for this frame.
 			TheWritableGlobalData->m_dumpPerformanceStatistics = TRUE;
-			TheInGameUI->message( UnicodeString( L"Statistics dump made on frame: %d" ), TheGameLogic->getFrame() );
+
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugPerformStatisticalDump",
+				L"Statistics dump made on frame: %d", TheGameLogic->getFrame() ) );
 			break;
 #endif // DUMP_PERF_STATS
 
 
-	}  // end switch( msg->type )
-	
+	}
+
 
 	return disp;
 
-}  // end CommandTranslator
+}
 
 static Bool isSystemMessage( const GameMessage *msg )
 {
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp
index dbae5608c2b..3ade01756e7 100644
--- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp
@@ -30,7 +30,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/GameCommon.h"
@@ -47,14 +47,9 @@
 #include "GameClient/GUICommandTranslator.h"
 #include "GameClient/CommandXlat.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
-static enum CommandStatus
+enum CommandStatus
 {
 	COMMAND_INCOMPLETE = 0,
 	COMMAND_COMPLETE
@@ -92,7 +87,7 @@ static Object *validUnderCursor( const ICoord2D *mouse, const CommandButton *com
 	Object *pickObj = NULL;
 
 	// pick a drawable at the mouse location
-	Drawable *pick = TheTacticalView->pickDrawable( mouse, FALSE, pickType );																																				 
+	Drawable *pick = TheTacticalView->pickDrawable( mouse, FALSE, pickType );
 
 	// only continue if there is something there
 	if( pick && pick->getObject() )
@@ -103,20 +98,20 @@ static Object *validUnderCursor( const ICoord2D *mouse, const CommandButton *com
 		pickObj = pick->getObject();
 
 		if (!command->isValidObjectTarget(player, pickObj))
-				pickObj = NULL;		
+				pickObj = NULL;
 
-	}  // end if
+	}
 
 
 	return pickObj;
 
-}  // end validUnderCursor
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 static CommandStatus doFireWeaponCommand( const CommandButton *command, const ICoord2D *mouse )
 {
-	
+
 	// sanity
 	if( command == NULL || mouse == NULL )
 		return COMMAND_COMPLETE;
@@ -129,7 +124,7 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC
 	if( TheInGameUI->getSelectCount() == 1 )
 	{
 		Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
-		
+
 		// sanity
 		if( draw == NULL || draw->getObject() == NULL )
 			return COMMAND_COMPLETE;
@@ -137,7 +132,7 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC
 		// get object id
 		sourceID = draw->getObject()->getID();
 
-	}  // end if
+	}
 
 	// create message and send to the logic
 	GameMessage *msg;
@@ -147,8 +142,8 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC
 
 		// translate the mouse location into world coords
 		TheTacticalView->screenToTerrain( mouse, &world );
-			
-		// create the message and append arguments	
+
+		// create the message and append arguments
 		msg = TheMessageStream->appendMessage( GameMessage::MSG_DO_WEAPON_AT_LOCATION );
 		msg->appendIntegerArgument( command->getWeaponSlot() );
 		msg->appendLocationArgument( world );
@@ -160,7 +155,7 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC
 		msg->appendObjectIDArgument( targetID );
 
 
-	}  // end if
+	}
 	else if( BitIsSet( command->getOptions(), COMMAND_OPTION_NEED_OBJECT_TARGET ) )
 	{
 
@@ -185,9 +180,9 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC
 			msg->appendObjectIDArgument( target->getID() );
 			msg->appendIntegerArgument( command->getMaxShotsToFire() );
 
-		}  // end if
+		}
 
-	}  // end else
+	}
 	else
 	{
 		msg = TheMessageStream->appendMessage( GameMessage::MSG_DO_WEAPON );
@@ -196,15 +191,15 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC
 
 		//This could be legit now -- think of firing a self destruct weapon
 		//-----------------------------------------------------------------
-		//DEBUG_ASSERTCRASH( 0, ("doFireWeaponCommand: Command options say it doesn't need additional user input '%s'\n", 
+		//DEBUG_ASSERTCRASH( 0, ("doFireWeaponCommand: Command options say it doesn't need additional user input '%s'",
 		//											command->m_name.str()) );
 		//return COMMAND_COMPLETE;
 
-	}  // end else
+	}
 
 	return COMMAND_COMPLETE;
 
-}  // end fire weapon
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -247,8 +242,8 @@ static CommandStatus doGuardCommand( const CommandButton *command, GuardMode gua
 				return COMMAND_COMPLETE;
 			world = *draw->getObject()->getPosition();
 		}
-			
-		// create the message and append arguments	
+
+		// create the message and append arguments
 		msg = TheMessageStream->appendMessage( GameMessage::MSG_DO_GUARD_POSITION );
 		msg->appendLocationArgument(world);
 		msg->appendIntegerArgument(guardMode);
@@ -274,7 +269,7 @@ static CommandStatus doAttackMoveCommand( const CommandButton *command, const IC
 	// so we must be sure there is only one thing selected (that thing we will set the point on)
 	//
 	Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
-	DEBUG_ASSERTCRASH( draw, ("doAttackMoveCommand: No selected object(s)\n") );
+	DEBUG_ASSERTCRASH( draw, ("doAttackMoveCommand: No selected object(s)") );
 
 	// sanity
 	if( draw == NULL || draw->getObject() == NULL )
@@ -313,7 +308,7 @@ static CommandStatus doSetRallyPointCommand( const CommandButton *command, const
 	DEBUG_ASSERTCRASH( TheInGameUI->getSelectCount() == 1,
 										 ("doSetRallyPointCommand: The selected count is not 1, we can only set a rally point on a *SINGLE* building\n") );
 	Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
-	DEBUG_ASSERTCRASH( draw, ("doSetRallyPointCommand: No selected object\n") );
+	DEBUG_ASSERTCRASH( draw, ("doSetRallyPointCommand: No selected object") );
 
 	// sanity
 	if( draw == NULL || draw->getObject() == NULL )
@@ -330,7 +325,7 @@ static CommandStatus doSetRallyPointCommand( const CommandButton *command, const
 
 	return COMMAND_COMPLETE;
 
-}  // end doSetRallyPointCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Do the beacon placement command */
@@ -352,7 +347,7 @@ static CommandStatus doPlaceBeacon( const CommandButton *command, const ICoord2D
 
 	return COMMAND_COMPLETE;
 
-}  // end doPlaceBeacon
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -383,7 +378,7 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 
 			break;
 
-		}  // end left mouse down
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_MOUSE_LEFT_DOUBLE_CLICK:
@@ -402,15 +397,15 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 					case GUI_COMMAND_FIRE_WEAPON:
 					{
 						commandStatus = doFireWeaponCommand( command, &mouse );
-						
+
 						PickAndPlayInfo info;
 						WeaponSlotType slot = command->getWeaponSlot();
 						info.m_weaponSlot = &slot;
-						
+
 	 					pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_DO_WEAPON_AT_LOCATION, &info );
 						break;
 
-					}  // end fire weapon command
+					}
 
 
 					//---------------------------------------------------------------------------------------
@@ -423,7 +418,7 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 
 							GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_EVACUATE);
 							msg->appendLocationArgument(worldPos);
-							
+
 							pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_EVACUATE );
 
 							commandStatus = COMMAND_COMPLETE;
@@ -461,7 +456,7 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 						return KEEP_MESSAGE;
 						break;
 
-					}  // end special power
+					}
 
 					case GUI_COMMAND_ATTACK_MOVE:
 					{
@@ -475,7 +470,7 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 						commandStatus = doSetRallyPointCommand( command, &mouse );
 						break;
 
-					}  // end set rally point
+					}
 
 					//---------------------------------------------------------------------------------------
 					case GUICOMMANDMODE_PLACE_BEACON:
@@ -483,9 +478,9 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 						commandStatus = doPlaceBeacon( command, &mouse );
 						break;
 
-					}  // end set rally point
+					}
 
-				}  // end switch
+				}
 
 				// used the input
 				disp = DESTROY_MESSAGE;
@@ -496,22 +491,22 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 					TheInGameUI->setPreventLeftClickDeselectionInAlternateMouseModeForOneClick( TRUE );
 					TheInGameUI->setGUICommand( NULL );
 				}
-			}  // end if
+			}
 
 			break;
 
-		}  // end left mouse up
+		}
 
-	}  // end switch 
+	}
 
 	// If we're destroying the message, it means we used it. Therefore, destroy the current
 	// attack move instruction as well.
-	if (disp == DESTROY_MESSAGE) 
+	if (disp == DESTROY_MESSAGE)
 		TheInGameUI->clearAttackMoveToMode();
 
 
 	return disp;
 
-}  // end translateMessage
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/HintSpy.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/HintSpy.cpp
index 0bcaa2b2e1a..756be270dd1 100644
--- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/HintSpy.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/HintSpy.cpp
@@ -23,11 +23,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // HintSpy.cpp
-// The HintSpy sits on the message stream and watches for certain messages, 
+// The HintSpy sits on the message stream and watches for certain messages,
 // for which it then generates visual "hints".
 // Author: Michael S. Booth, March 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/MessageStream.h"
 #include "GameClient/HintSpy.h"
@@ -64,9 +64,6 @@ GameMessageDisposition HintSpyTranslator::translateGameMessage(const GameMessage
 
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_DEFECTOR_HINT:
-
-			disp = DESTROY_MESSAGE; //hint no longer needed by anyone.  Eat it.
-
 		case GameMessage::MSG_DO_MOVETO_HINT:
 		case GameMessage::MSG_DO_ATTACKMOVETO_HINT:
 		case GameMessage::MSG_DO_ATTACK_OBJECT_HINT:
@@ -134,6 +131,6 @@ GameMessageDisposition HintSpyTranslator::translateGameMessage(const GameMessage
 			TheInGameUI->createGarrisonHint( msg );
 			break;
 
-	}	
+	}
 	return disp;
 }
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp
index de6bafd997c..637450e48fe 100644
--- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp
@@ -24,12 +24,12 @@
 
 // FILE: HotKey.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,8 +37,8 @@
 //	Filename: 	HotKey.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,7 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -74,7 +74,7 @@ GameMessageDisposition HotKeyTranslator::translateGameMessage(const GameMessage
 
 	if ( t == GameMessage::MSG_RAW_KEY_UP)
 	{
-		
+
 		//char key = msg->getArgument(0)->integer;
 		Int keyState = msg->getArgument(1)->integer;
 
@@ -98,7 +98,7 @@ GameMessageDisposition HotKeyTranslator::translateGameMessage(const GameMessage
 		}
 		if(newModState != 0)
 			return disp;
-		WideChar key = TheKeyboard->getPrintableKey(msg->getArgument(0)->integer, 0);
+		WideChar key = TheKeyboard->getPrintableKey((KeyDefType)msg->getArgument(0)->integer, 0);
 		UnicodeString uKey;
 		uKey.concat(key);
 		AsciiString aKey;
@@ -113,10 +113,7 @@ GameMessageDisposition HotKeyTranslator::translateGameMessage(const GameMessage
 HotKey::HotKey()
 {
 	m_win = NULL;
-	//Added By Sadullah Nader
-	//Initializations missing and needed
 	m_key.clear();
-	//
 }
 
 //-----------------------------------------------------------------------------
@@ -130,7 +127,7 @@ HotKeyManager::~HotKeyManager( void )
 {
 	m_hotKeyMap.clear();
 }
-	
+
 //-----------------------------------------------------------------------------
 void HotKeyManager::init( void )
 {
@@ -176,14 +173,14 @@ Bool HotKeyManager::executeHotKey( const AsciiString& keyIn )
 		if( BitIsSet( win->winGetStatus(), WIN_STATUS_ENABLED ) )
  		{
  			TheWindowManager->winSendSystemMsg( win->winGetParent(), GBM_SELECTED, (WindowMsgData)win, win->winGetWindowId() );
- 
+
  			// here we make the same click sound that the GUI uses when you click a button
  			AudioEventRTS buttonClick("GUIClick");
- 
+
  			if( TheAudio )
  			{
  				TheAudio->addAudioEvent( &buttonClick );
- 			}  // end if
+ 			}
 			return TRUE;
  		}
 
@@ -222,7 +219,7 @@ AsciiString HotKeyManager::searchHotKey( const UnicodeString& uStr )
 		}
 		marker++;
 	}
-	return AsciiString::TheEmptyString;	
+	return AsciiString::TheEmptyString;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
index 2beae42eff6..761992f7438 100644
--- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
@@ -26,14 +26,17 @@
 // Translate raw input events into camera movement commands
 // Author: Michael S. Booth, April 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/FramePacer.h"
 #include "Common/GameType.h"
+#include "Common/GameEngine.h"
 #include "Common/MessageStream.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Recorder.h"
 #include "Common/StatsCollector.h"
+#include "Common/UserPreferences.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/PartitionManager.h"
 #include "GameClient/Display.h"
@@ -52,7 +55,7 @@
 
 LookAtTranslator *TheLookAtTranslator = NULL;
 
-static enum
+enum
 {
 	DIR_UP = 0,
 	DIR_DOWN,
@@ -62,14 +65,24 @@ static enum
 
 static Bool scrollDir[4] = { false, false, false, false };
 
-Int SCROLL_AMT = 100;
+// TheSuperHackers @tweak Introduces the SCROLL_MULTIPLIER for all scrolling to
+//
+//  1. bring the RMB scroll speed back to how it was at 30 FPS in the retail game version
+//  2. increase the upper limit of the Scroll Factor when set from the Options Menu (0.20 to 2.90 instead of 0.10 to 1.45)
+//  3. increase the scroll speed for Edge/Key scrolling to better fit the high speeds of RMB scrolling
+//
+// The multiplier of 2 was logically chosen because originally the Scroll Factor did practically not affect the RMB scroll speed
+// and because the default Scroll Factor is/was 0.5, it needs to be doubled to get to a neutral 1x multiplier.
+
+constexpr const Real SCROLL_MULTIPLIER = 2.0f;
+constexpr const Real SCROLL_AMT = 100.0f * SCROLL_MULTIPLIER;
 
 static const Int edgeScrollSize = 3;
 
 static Mouse::MouseCursor prevCursor = Mouse::ARROW;
 
 //-----------------------------------------------------------------------------
-void LookAtTranslator::setScrolling(Int x)
+void LookAtTranslator::setScrolling(ScrollType scrollType)
 {
 	if (!TheInGameUI->getInputEnabled())
 		return;
@@ -78,7 +91,7 @@ void LookAtTranslator::setScrolling(Int x)
 	m_isScrolling = true;
 	TheInGameUI->setScrolling( TRUE );
 	TheTacticalView->setMouseLock( TRUE );
-	m_scrollType = x;
+	m_scrollType = scrollType;
 	if(TheStatsCollector)
 		TheStatsCollector->startScrollTime();
 }
@@ -91,30 +104,50 @@ void LookAtTranslator::stopScrolling( void )
 	TheTacticalView->setMouseLock( FALSE );
 	TheMouse->setCursor(prevCursor);
 	m_scrollType = SCROLL_NONE;
-		
-	// if we have a stats collectore increment the stats
+
+	// increment the stats if we have a stats collector
 	if(TheStatsCollector)
 		TheStatsCollector->endScrollTime();
 
 }
 
+//-----------------------------------------------------------------------------
+Bool LookAtTranslator::canScrollAtScreenEdge() const
+{
+	if (!TheMouse->isCursorCaptured())
+		return false;
+
+	if (TheDisplay->getWindowed())
+	{
+		if ((m_screenEdgeScrollMode & ScreenEdgeScrollMode_EnabledInWindowedApp) == 0)
+			return false;
+	}
+	else
+	{
+		if ((m_screenEdgeScrollMode & ScreenEdgeScrollMode_EnabledInFullscreenApp) == 0)
+			return false;
+	}
+
+	return true;
+}
+
 //-----------------------------------------------------------------------------
 LookAtTranslator::LookAtTranslator() :
 	m_isScrolling(false),
 	m_isRotating(false),
 	m_isPitching(false),
 	m_isChangingFOV(false),
-	m_timestamp(0),
+	m_middleButtonDownTimeMsec(0),
 	m_lastPlaneID(INVALID_DRAWABLE_ID),
-	m_lastMouseMoveFrame(0),
+	m_lastMouseMoveTimeMsec(0),
 	m_scrollType(SCROLL_NONE)
 {
-	//Added By Sadullah Nader
-	//Initializations misssing and needed
 	m_anchor.x = m_anchor.y = 0;
 	m_currentPos.x = m_currentPos.y = 0;
 	m_originalAnchor.x = m_originalAnchor.y = 0;
-	//
+
+	OptionPreferences prefs;
+	m_screenEdgeScrollMode = prefs.getScreenEdgeScrollMode();
 
 	DEBUG_ASSERTCRASH(!TheLookAtTranslator, ("Already have a LookAtTranslator - why do you need two?"));
 	TheLookAtTranslator = this;
@@ -138,13 +171,12 @@ const ICoord2D* LookAtTranslator::getRMBScrollAnchor(void)
 
 Bool LookAtTranslator::hasMouseMovedRecently( void )
 {
-	if (m_lastMouseMoveFrame > TheGameLogic->getFrame())
-		m_lastMouseMoveFrame = 0; // reset for new game
+	const UnsignedInt now = timeGetTime();
+	const UnsignedInt lastMove = m_lastMouseMoveTimeMsec;
 
-	if (m_lastMouseMoveFrame + LOGICFRAMES_PER_SECOND < TheGameLogic->getFrame())
-		return false;
+	const UnsignedInt elapsedMsec = now - lastMove;
 
-	return true;
+	return elapsedMsec <= MSEC_PER_SECOND;
 }
 
 void LookAtTranslator::setCurrentPos( const ICoord2D& pos )
@@ -152,6 +184,11 @@ void LookAtTranslator::setCurrentPos( const ICoord2D& pos )
 	m_currentPos = pos;
 }
 
+void LookAtTranslator::setScreenEdgeScrollMode(ScreenEdgeScrollMode mode)
+{
+	m_screenEdgeScrollMode = mode;
+}
+
 //-----------------------------------------------------------------------------
 /**
  * The LookAt Translator is responsible for camera movements. It is directly responsible for
@@ -173,7 +210,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			UnsignedByte key		= msg->getArgument( 0 )->integer;
 			UnsignedByte state	= msg->getArgument( 1 )->integer;
 			Bool isPressed = !(BitIsSet( state, KEY_STATE_UP ));
-			
+
 			if (TheShell && TheShell->isShellActive())
 				break;
 
@@ -218,7 +255,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN:
 		{
-			m_lastMouseMoveFrame = TheGameLogic->getFrame();
+			m_lastMouseMoveTimeMsec = timeGetTime();
 
 			m_anchor = msg->getArgument( 0 )->pixel;
 			m_currentPos = msg->getArgument( 0 )->pixel;
@@ -234,7 +271,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP:
 		{
-			m_lastMouseMoveFrame = TheGameLogic->getFrame();
+			m_lastMouseMoveTimeMsec = timeGetTime();
 
 			if (m_scrollType == SCROLL_RMB)
 			{
@@ -246,22 +283,25 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN:
 		{
-			m_lastMouseMoveFrame = TheGameLogic->getFrame();
+			const UnsignedInt now = timeGetTime();
+			m_lastMouseMoveTimeMsec = now;
+			m_middleButtonDownTimeMsec = now;
 
 			m_isRotating = true;
 			m_anchor = msg->getArgument( 0 )->pixel;
+			m_anchorAngle = TheTacticalView->getAngle();
 			m_originalAnchor = msg->getArgument( 0 )->pixel;
 			m_currentPos = msg->getArgument( 0 )->pixel;
-			m_timestamp = TheGameClient->getFrame();
 			break;
 		}
 
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_UP:
 		{
-			m_lastMouseMoveFrame = TheGameLogic->getFrame();
+			const UnsignedInt now = timeGetTime();
+			m_lastMouseMoveTimeMsec = now;
 
-			const UnsignedInt CLICK_DURATION = 5;
+			const UnsignedInt CLICK_DURATION_MSEC = 167;
 			const UnsignedInt PIXEL_OFFSET = 5;
 
 			m_isRotating = false;
@@ -269,8 +309,11 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			if (dx<0) dx = -dx;
 			Int dy = m_currentPos.y-m_originalAnchor.y;
 			Bool didMove = dx>PIXEL_OFFSET || dy>PIXEL_OFFSET;
+
+			const UnsignedInt elapsedMsec = now - m_middleButtonDownTimeMsec;
+
 			// if middle button is "clicked", reset to "home" orientation
-			if (!didMove && TheGameClient->getFrame() - m_timestamp < CLICK_DURATION)
+			if (!didMove && elapsedMsec < CLICK_DURATION_MSEC)
 			{
 				TheTacticalView->setAngleAndPitchToDefault();
 				TheTacticalView->setZoomToDefault();
@@ -283,10 +326,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_RAW_MOUSE_POSITION:
 		{
 			if (m_currentPos.x != msg->getArgument( 0 )->pixel.x || m_currentPos.y != msg->getArgument( 0 )->pixel.y)
-				m_lastMouseMoveFrame = TheGameLogic->getFrame();
+				m_lastMouseMoveTimeMsec = timeGetTime();
 
 			m_currentPos = msg->getArgument( 0 )->pixel;
-			
+
 			UnsignedInt height = TheDisplay->getHeight();
 			UnsignedInt width  = TheDisplay->getWidth();
 
@@ -297,7 +340,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 				break;
 			}
 
-			if (!TheGlobalData->m_windowed)
+			if (canScrollAtScreenEdge())
 			{
 				if (m_isScrolling)
 				{
@@ -319,10 +362,18 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			if (m_isRotating)
 			{
 				const Real FACTOR = 0.01f;
+				const Real angle = FACTOR * (m_currentPos.x - m_originalAnchor.x);
+				Real targetAngle = m_anchorAngle + angle;
 
-				Real angle = FACTOR * (m_currentPos.x - m_anchor.x);
+				// TheSuperHackers @tweak Stubbjax 13/11/2025 Snap angle to nearest 45 degrees
+				// while using force attack mode for convenience.
+				if (TheInGameUI->isInForceAttackMode())
+				{
+					const Real snapRadians = DEG_TO_RADF(45);
+					targetAngle = WWMath::Round(targetAngle / snapRadians) * snapRadians;
+				}
 
-				TheTacticalView->setAngle( TheTacticalView->getAngle() + angle );
+				TheTacticalView->setAngle(targetAngle);
 				m_anchor = msg->getArgument( 0 )->pixel;
 			}
 
@@ -337,7 +388,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 				m_anchor = msg->getArgument( 0 )->pixel;
 			}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 			// adjust the field of view
 			if (m_isChangingFOV)
 			{
@@ -355,28 +406,30 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_WHEEL:
 		{
-			m_lastMouseMoveFrame = TheGameLogic->getFrame();
+			m_lastMouseMoveTimeMsec = timeGetTime();
 
 			Int spin = msg->getArgument( 1 )->integer;
 
 			if (spin > 0)
 			{
 				for ( ; spin > 0; spin--)
-					TheTacticalView->zoomIn();
+					TheTacticalView->zoom( -View::ZoomHeightPerSecond );
 			}
 			else
 			{
 				for ( ;spin < 0; spin++ )
-					TheTacticalView->zoomOut();
+					TheTacticalView->zoom( +View::ZoomHeightPerSecond );
 			}
+
+			break;
 		}
-		
+
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_META_OPTIONS:
 		{
 			// stop the scrolling
 			stopScrolling();
-			// let the message drop through, cause we need to process this message for 
+			// let the message drop through, cause we need to process this message for
 			// selection as well.
 			break;
 		}
@@ -396,6 +449,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			// scroll the view
 			if (m_isScrolling)
 			{
+
+				// TheSuperHackers @bugfix Mauller 07/06/2025 The camera scrolling is now decoupled from the render update.
+				const Real fpsRatio = TheFramePacer->getBaseOverUpdateFpsRatio();
+
 				switch (m_scrollType)
 				{
 				case SCROLL_RMB:
@@ -416,34 +473,34 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 								m_anchor.y = m_currentPos.y - maxY;
 						}
 
-						offset.x = TheGlobalData->m_horizontalScrollSpeedFactor * (m_currentPos.x - m_anchor.x);
-						offset.y = TheGlobalData->m_verticalScrollSpeedFactor * (m_currentPos.y - m_anchor.y);
+						// TheSuperHackers @fix Mauller 16/06/2025 fix RMB scrolling to allow it to scale with the user adjusted scroll factor
 						Coord2D vec;
-						vec.x = offset.x;
-						vec.y = offset.y;
+						vec.x = (m_currentPos.x - m_anchor.x);
+						vec.y = (m_currentPos.y - m_anchor.y);
+						// TheSuperHackers @info calculate the length of the vector to obtain the movement speed before the vector is normalized
+						float vecLength = vec.length();
 						vec.normalize();
-						// Add in the window scroll amount as the minimum.
-						offset.x += TheGlobalData->m_horizontalScrollSpeedFactor * vec.x * sqr(TheGlobalData->m_keyboardScrollFactor);
-						offset.y += TheGlobalData->m_verticalScrollSpeedFactor * vec.y * sqr(TheGlobalData->m_keyboardScrollFactor);
+						offset.x = TheGlobalData->m_horizontalScrollSpeedFactor * fpsRatio * vecLength * vec.x * SCROLL_MULTIPLIER * TheGlobalData->m_keyboardScrollFactor;
+						offset.y = TheGlobalData->m_verticalScrollSpeedFactor * fpsRatio * vecLength * vec.y * SCROLL_MULTIPLIER * TheGlobalData->m_keyboardScrollFactor;
 					}
 					break;
 				case SCROLL_KEY:
 					{
 						if (scrollDir[DIR_UP])
 						{
-							offset.y -= TheGlobalData->m_verticalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.y -= TheGlobalData->m_verticalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 						if (scrollDir[DIR_DOWN])
 						{
-							offset.y += TheGlobalData->m_verticalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.y += TheGlobalData->m_verticalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 						if (scrollDir[DIR_LEFT])
 						{
-							offset.x -= TheGlobalData->m_horizontalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.x -= TheGlobalData->m_horizontalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 						if (scrollDir[DIR_RIGHT])
 						{
-							offset.x += TheGlobalData->m_horizontalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.x += TheGlobalData->m_horizontalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 					}
 					break;
@@ -453,19 +510,19 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 						UnsignedInt width  = TheDisplay->getWidth();
 						if (m_currentPos.y < edgeScrollSize)
 						{
-							offset.y -= TheGlobalData->m_verticalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.y -= TheGlobalData->m_verticalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 						if (m_currentPos.y >= height-edgeScrollSize)
 						{
-							offset.y += TheGlobalData->m_verticalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.y += TheGlobalData->m_verticalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 						if (m_currentPos.x < edgeScrollSize)
 						{
-							offset.x -= TheGlobalData->m_horizontalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.x -= TheGlobalData->m_horizontalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 						if (m_currentPos.x >= width-edgeScrollSize)
 						{
-							offset.x += TheGlobalData->m_horizontalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.x += TheGlobalData->m_horizontalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 					}
 					break;
@@ -495,7 +552,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		}
 
 		// ------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_BEGIN_ADJUST_PITCH:
 		{
 			DEBUG_ASSERTCRASH(!m_isPitching, ("hmm, mismatched m_isPitching"));
@@ -503,10 +560,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		// ------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_END_ADJUST_PITCH:
 		{
 			DEBUG_ASSERTCRASH(m_isPitching, ("hmm, mismatched m_isPitching"));
@@ -514,19 +571,19 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		// ------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_DESHROUD:
 		{
 			ThePartitionManager->revealMapForPlayerPermanently( ThePlayerList->getLocalPlayer()->getPlayerIndex() );
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		// ------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_ENSHROUD:
 		{
 			// Need to first undo the permanent Look laid down by DEMO_DESHROUD, then blast a shroud dollop.
@@ -534,10 +591,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			ThePartitionManager->shroudMapForPlayer( ThePlayerList->getLocalPlayer()->getPlayerIndex() );
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		// ------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_BEGIN_ADJUST_FOV:
 		{
 			DEBUG_ASSERTCRASH(!m_isChangingFOV, ("hmm, mismatched m_isChangingFOV"));
@@ -545,17 +602,17 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			m_anchor = m_currentPos;
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		// ------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_END_ADJUST_FOV:
 		{
 			DEBUG_ASSERTCRASH(m_isChangingFOV, ("hmm, mismatched m_isChangingFOV"));
 			m_isChangingFOV = false;
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_SAVE_VIEW1:
@@ -599,7 +656,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		}
 
 		//-----------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_LOCK_CAMERA_TO_PLANES:
 		{
 			Drawable *first = NULL;
@@ -649,24 +706,24 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 							done = true;
 							break;
 						}
-					} // if airborne found
+					}
 
 					// if we're back to the first, quit
 					if (d == first)
 						break;
-				} // while
-			}	// end plane lock
+				}
+			}
 
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
-	}  // end switch
+	}
 
 	return disp;
 
-}  // end LookAtTranslator
+}
 
 void LookAtTranslator::resetModes()
 {
@@ -674,4 +731,4 @@ void LookAtTranslator::resetModes()
 	m_isRotating = FALSE;
 	m_isPitching = FALSE;
 	m_isChangingFOV = FALSE;
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
index 90f3f3bd687..2e45e5abab9 100644
--- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
@@ -28,8 +28,9 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/GameUtility.h"
 #include "Common/INI.h"
 #include "Common/MessageStream.h"
 #include "Common/Player.h"
@@ -54,11 +55,6 @@
 
 MetaMap *TheMetaMap = NULL;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-///#pragma optimize("", off)
-///#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -67,7 +63,7 @@ MetaMap *TheMetaMap = NULL;
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 
-static const LookupListRec GameMessageMetaTypeNames[] = 
+static const LookupListRec GameMessageMetaTypeNames[] =
 {
 	{ "SAVE_VIEW1",																GameMessage::MSG_META_SAVE_VIEW1 },
 	{ "SAVE_VIEW2",																GameMessage::MSG_META_SAVE_VIEW2 },
@@ -130,6 +126,7 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "SELECT_PREV_UNIT",													GameMessage::MSG_META_SELECT_PREV_UNIT },
 	{ "SELECT_NEXT_WORKER",												GameMessage::MSG_META_SELECT_NEXT_WORKER },
 	{ "SELECT_PREV_WORKER",												GameMessage::MSG_META_SELECT_PREV_WORKER },
+	{ "SELECT_NEXT_IDLE_WORKER",											    GameMessage::MSG_META_SELECT_NEXT_IDLE_WORKER },
 	{ "SELECT_HERO",												      GameMessage::MSG_META_SELECT_HERO },
 	{ "SELECT_ALL",																GameMessage::MSG_META_SELECT_ALL },
 	{ "SELECT_ALL_AIRCRAFT",											GameMessage::MSG_META_SELECT_ALL_AIRCRAFT },
@@ -147,8 +144,13 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "PLACE_BEACON",															GameMessage::MSG_META_PLACE_BEACON },
 	{ "DELETE_BEACON",														GameMessage::MSG_META_REMOVE_BEACON },
 	{ "OPTIONS",																	GameMessage::MSG_META_OPTIONS },
+	{ "INCREASE_MAX_RENDER_FPS",									GameMessage::MSG_META_INCREASE_MAX_RENDER_FPS },
+	{ "DECREASE_MAX_RENDER_FPS",									GameMessage::MSG_META_DECREASE_MAX_RENDER_FPS },
+	{ "INCREASE_LOGIC_TIME_SCALE",								GameMessage::MSG_META_INCREASE_LOGIC_TIME_SCALE },
+	{ "DECREASE_LOGIC_TIME_SCALE",								GameMessage::MSG_META_DECREASE_LOGIC_TIME_SCALE },
 	{ "TOGGLE_LOWER_DETAILS",											GameMessage::MSG_META_TOGGLE_LOWER_DETAILS },
 	{ "TOGGLE_CONTROL_BAR",												GameMessage::MSG_META_TOGGLE_CONTROL_BAR },
+	{ "TOGGLE_PLAYER_OBSERVER",										GameMessage::MSG_META_TOGGLE_PLAYER_OBSERVER },
 	{ "BEGIN_PATH_BUILD",													GameMessage::MSG_META_BEGIN_PATH_BUILD },
 	{ "END_PATH_BUILD",														GameMessage::MSG_META_END_PATH_BUILD },
 	{ "BEGIN_FORCEATTACK",												GameMessage::MSG_META_BEGIN_FORCEATTACK },
@@ -174,9 +176,11 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "CAMERA_RESET",															GameMessage::MSG_META_CAMERA_RESET },
 	{ "TOGGLE_FAST_FORWARD_REPLAY",								GameMessage::MSG_META_TOGGLE_FAST_FORWARD_REPLAY },
 	{ "TOGGLE_PAUSE",															GameMessage::MSG_META_TOGGLE_PAUSE },
+	{ "TOGGLE_PAUSE_ALT",													GameMessage::MSG_META_TOGGLE_PAUSE_ALT },
 	{ "STEP_FRAME",																GameMessage::MSG_META_STEP_FRAME },
+	{ "STEP_FRAME_ALT",														GameMessage::MSG_META_STEP_FRAME_ALT },
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	{ "HELP",																			GameMessage::MSG_META_HELP },
 	{ "DEMO_INSTANT_QUIT",												GameMessage::MSG_META_DEMO_INSTANT_QUIT },
 
@@ -264,19 +268,19 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "DEMO_TOGGLE_NO_DRAW",											GameMessage::MSG_NO_DRAW },
 	{ "DEMO_CYCLE_LOD_LEVEL",											GameMessage::MSG_META_DEMO_CYCLE_LOD_LEVEL },
 	{ "DEMO_DUMP_ASSETS",													GameMessage::MSG_META_DEBUG_DUMP_ASSETS},
-																								
+
 	{ "DEMO_INSTANT_BUILD",												GameMessage::MSG_META_DEMO_INSTANT_BUILD },
 	{ "DEMO_TOGGLE_CAMERA_DEBUG",									GameMessage::MSG_META_DEMO_TOGGLE_CAMERA_DEBUG },
-																								
-	/// Begin VTUNE																
+
+	/// Begin VTUNE
 	{ "DEMO_VTUNE_ON",														GameMessage::MSG_META_DEBUG_VTUNE_ON },
 	{ "DEMO_VTUNE_OFF",														GameMessage::MSG_META_DEBUG_VTUNE_OFF },
-	/// End VTUNE	
-																	
-																								
-	//lorenzen's feather water										
+	/// End VTUNE
+
+
+	//lorenzen's feather water
 	{ "DEMO_TOGGLE_FEATHER_WATER",								GameMessage::MSG_META_DEBUG_TOGGLE_FEATHER_WATER },
-																								
+
 	{ "DEMO_INCR_ANIM_SKATE_SPEED",								GameMessage::MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED },
 	{ "DEMO_DECR_ANIM_SKATE_SPEED",								GameMessage::MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED },
 	{ "DEMO_CYCLE_EXTENT_TYPE",										GameMessage::MSG_META_DEBUG_CYCLE_EXTENT_TYPE },
@@ -297,36 +301,36 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "DEBUG_DUMP_ALL_PLAYER_OBJECTS",						GameMessage::MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS },
 	{ "DEMO_WIN",																	GameMessage::MSG_META_DEBUG_WIN },
 	{ "DEMO_TOGGLE_DEBUG_STATS",									GameMessage::MSG_META_DEMO_TOGGLE_DEBUG_STATS },
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // defined(RTS_DEBUG)
 
 
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) 
+#if defined(RTS_DEBUG)
 	{ "DEMO_TOGGLE_AUDIODEBUG",										GameMessage::MSG_META_DEMO_TOGGLE_AUDIODEBUG },
-#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#endif//defined(RTS_DEBUG)
 #ifdef DUMP_PERF_STATS
 	{ "DEMO_PERFORM_STATISTICAL_DUMP",						GameMessage::MSG_META_DEMO_PERFORM_STATISTICAL_DUMP },
 #endif//DUMP_PERF_STATS
 
 
-	{ NULL, 0	}// keep this last!
+	{ NULL, 0	}
 };
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-static const FieldParse TheMetaMapFieldParseTable[] = 
+static const FieldParse TheMetaMapFieldParseTable[] =
 {
 
-	{ "Key",								INI::parseLookupList,						KeyNames, offsetof( MetaMapRec, m_key ) },	
-	{ "Transition",					INI::parseLookupList,						TransitionNames, offsetof( MetaMapRec, m_transition ) },		
-	{ "Modifiers",					INI::parseLookupList,						ModifierNames, offsetof( MetaMapRec, m_modState ) },		
-	{ "UseableIn",					INI::parseBitString32,					TheCommandUsableInNames, offsetof( MetaMapRec, m_usableIn ) },		
-	{ "Category",						INI::parseLookupList,						CategoryListName, offsetof( MetaMapRec, m_category ) },		
-	{ "Description",				INI::parseAndTranslateLabel,		0, offsetof( MetaMapRec, m_description ) },		
-	{ "DisplayName",				INI::parseAndTranslateLabel,		0, offsetof( MetaMapRec, m_displayName ) },		
-	
-	{ NULL,									NULL,														0, 0 }  // keep this last
+	{ "Key",								INI::parseLookupList,						KeyNames, offsetof( MetaMapRec, m_key ) },
+	{ "Transition",					INI::parseLookupList,						TransitionNames, offsetof( MetaMapRec, m_transition ) },
+	{ "Modifiers",					INI::parseLookupList,						ModifierNames, offsetof( MetaMapRec, m_modState ) },
+	{ "UseableIn",					INI::parseBitString32,					TheCommandUsableInNames, offsetof( MetaMapRec, m_usableIn ) },
+	{ "Category",						INI::parseLookupList,						CategoryListName, offsetof( MetaMapRec, m_category ) },
+	{ "Description",				INI::parseAndTranslateLabel,		0, offsetof( MetaMapRec, m_description ) },
+	{ "DisplayName",				INI::parseAndTranslateLabel,		0, offsetof( MetaMapRec, m_displayName ) },
+
+	{ NULL,									NULL,														0, 0 }
 
 };
 
@@ -335,7 +339,7 @@ static const FieldParse TheMetaMapFieldParseTable[] =
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
-MetaEventTranslator::MetaEventTranslator() : 
+MetaEventTranslator::MetaEventTranslator() :
 	m_lastKeyDown(MK_NONE),
 	m_lastModState(0)
 {
@@ -358,10 +362,39 @@ static const char * findGameMessageNameByType(GameMessage::Type type)
 		if (metaNames->value == (Int)type)
 			return metaNames->name;
 
-	DEBUG_CRASH(("MetaTypeName %d not found -- did you remember to add it to GameMessageMetaTypeNames[] ?\n"));
+	DEBUG_CRASH(("MetaTypeName %d not found -- did you remember to add it to GameMessageMetaTypeNames[] ?", (Int)type));
 	return "???";
 }
 
+//-------------------------------------------------------------------------------------------------
+static Bool isMessageUsable(CommandUsableInType usableIn)
+{
+	// We will ignore all commands if the game client has not yet incremented to frame 1.
+	// It prevents the user from doing commands during a map load, which throws the input
+	// system into whack because there isn't a client frame for the input event, and in
+	// the case of a command that pauses the game, like the quit menu, the client frame
+	// will never get beyond 0 and we lose the ability to process any input.
+	if (TheGameClient->getFrame() == 0)
+		return false;
+
+	const Bool usableInShell = (usableIn & COMMANDUSABLE_SHELL);
+	const Bool usableInGame = (usableIn & COMMANDUSABLE_GAME);
+	const Bool usableAsObserver = (usableIn & COMMANDUSABLE_OBSERVER);
+	const Bool isShellActive = TheShell && TheShell->isShellActive();
+	const Bool isObserving = !ThePlayerList->getLocalPlayer()->isPlayerActive();
+
+	if (usableInShell && isShellActive)
+		return true;
+
+	if (usableInGame && !isShellActive)
+		return true;
+
+	if (usableAsObserver && isObserving)
+		return true;
+
+	return false;
+}
+
 //-------------------------------------------------------------------------------------------------
 GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessage *msg)
 {
@@ -394,31 +427,15 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 
 		for (const MetaMapRec *map = TheMetaMap->getFirstMetaMapRec(); map; map = map->m_next)
 		{
-			DEBUG_ASSERTCRASH(map->m_meta > GameMessage::MSG_BEGIN_META_MESSAGES && 
+			DEBUG_ASSERTCRASH(map->m_meta > GameMessage::MSG_BEGIN_META_MESSAGES &&
 				map->m_meta < GameMessage::MSG_END_META_MESSAGES, ("hmm, expected only meta-msgs here"));
-			
-			//
-			// if this command is *only* usable in the game, we will ignore it if the game client
-			// has not yet incremented to frame 1 (keeps us from doing in-game commands during
-			// a map load, which throws the input system into wack because there isn't a
-			// client frame for the input event, and in the case of a command that pauses the
-			// game, like the quit menu, the client frame will never get beyond 0 and we
-			// lose the ability to process any input
-			//
-			if( map->m_usableIn == COMMANDUSABLE_GAME && TheGameClient->getFrame() < 1 )
-				continue;
 
-			// if the shell is active, and this command is not usable in shell, continue
-			if (TheShell && TheShell->isShellActive() && !(map->m_usableIn & COMMANDUSABLE_SHELL) )
-				continue;
-
-			// if the shell is not active and this command is not usable in the game, continue			
-			if (TheShell && !TheShell->isShellActive() && !(map->m_usableIn & COMMANDUSABLE_GAME) )
+			if (!isMessageUsable(map->m_usableIn))
 				continue;
 
 			// check for the special case of mods-only-changed.
 			if (
-						map->m_key == MK_NONE && 
+						map->m_key == MK_NONE &&
 						newModState != m_lastModState &&
 						(
 							(map->m_transition == UP && map->m_modState == m_lastModState) ||
@@ -426,7 +443,7 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 						)
 					)
 			{
-				//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() Mods-only change: %s\n", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));
+				//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() Mods-only change: %s", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));
 				/*GameMessage *metaMsg =*/ TheMessageStream->appendMessage(map->m_meta);
 				disp = DESTROY_MESSAGE;
 				break;
@@ -434,21 +451,21 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 
 			// ok, now check for "normal" key transitions.
 			if (
-						map->m_key == key && 
+						map->m_key == key &&
 						map->m_modState == newModState &&
 						(
 							(map->m_transition == UP && (keyState & KEY_STATE_UP)) ||
 							(map->m_transition == DOWN && (keyState & KEY_STATE_DOWN)) //||
 							//(map->m_transition == DOUBLEDOWN && (keyState & KEY_STATE_DOWN) && m_lastKeyDown == key)
 						)
-					)			
+					)
 			{
 
 				if( keyState & KEY_STATE_AUTOREPEAT )
 				{
-					// if it's an autorepeat of a "known" key, don't generate the meta-event, 
+					// if it's an autorepeat of a "known" key, don't generate the meta-event,
 					// but DO eat the keystroke so no one else can mess with it
-					//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() auto-repeat: %s\n", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));
+					//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() auto-repeat: %s", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));
 				}
 				else
 				{
@@ -466,20 +483,23 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
                 TheWritableGlobalData->m_TiVOFastMode = 1 - TheGlobalData->m_TiVOFastMode;
 
               if ( TheInGameUI )
-  				      TheInGameUI->message( TheGlobalData->m_TiVOFastMode ? TheGameText->fetch("GUI:FF_ON") : TheGameText->fetch("GUI:FF_OFF") );
-			      }  
+								TheInGameUI->messageNoFormat( TheGlobalData->m_TiVOFastMode
+									? TheGameText->FETCH_OR_SUBSTITUTE("GUI:FF_ON", L"Fast Forward is on")
+									: TheGameText->FETCH_OR_SUBSTITUTE("GUI:FF_OFF", L"Fast Forward is off")
+								);
+			      }
 			      disp = KEEP_MESSAGE; // cause for goodness sake, this key gets used a lot by non-replay hotkeys
 			      break;
-		      }  
+		      }
 
 
 					/*GameMessage *metaMsg =*/ TheMessageStream->appendMessage(map->m_meta);
-					//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() normal: %s\n", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));
+					//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() normal: %s", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));
 				}
 				disp = DESTROY_MESSAGE;
 				break;
 			}
-		} 
+		}
 
 		if (t == GameMessage::MSG_RAW_KEY_DOWN)
 			m_lastKeyDown = key;
@@ -489,77 +509,62 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 
 	if (t > GameMessage::MSG_RAW_MOUSE_BEGIN && t < GameMessage::MSG_RAW_MOUSE_END )
 	{
-		Int index = 0;
+		Int index = 3;
 		switch (t)
 		{
 			case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_DOWN:
+				--index;
+				FALLTHROUGH;
 			case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN:
+				--index;
+				FALLTHROUGH;
 			case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN:
 			{
-				// Fill out which the current mouse down position
-				if (t == GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN)
-					index = 1;
-				else if (t == GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN)
-					index = 2;
-				// else index == 0
+				--index;
 				m_mouseDownPosition[index] = msg->getArgument(0)->pixel;
 				m_nextUpShouldCreateDoubleClick[index] = FALSE;
-				
 				break;
 			}
 
 			case GameMessage::MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK:
+				--index;
+				FALLTHROUGH;
 			case GameMessage::MSG_RAW_MOUSE_MIDDLE_DOUBLE_CLICK:
+				--index;
+				FALLTHROUGH;
 			case GameMessage::MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK:
 			{
-				if (t == GameMessage::MSG_RAW_MOUSE_MIDDLE_DOUBLE_CLICK)
-					index = 1;
-				else if (t == GameMessage::MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK)
-					index = 2;
-				// else index == 0
-
+				--index;
 				m_nextUpShouldCreateDoubleClick[index] = TRUE;
 				break;
 			}
 
 			case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_UP:
+				--index;
+				FALLTHROUGH;
 			case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_UP:
+				--index;
+				FALLTHROUGH;
 			case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP:
 			{
-				ICoord2D location = msg->getArgument(0)->pixel;
+				--index;
 
-				// Fill out which the current mouse down position
-				if (t == GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_UP)
-					index = 1;
-				else if (t == GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP)
-					index = 2;
-				// else index == 0
-
-				GameMessage *newMessage = NULL;
-				if (t == GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_UP) 
+				constexpr const GameMessage::Type SingleClickMessages[3] =
 				{
-					if (m_nextUpShouldCreateDoubleClick[index])
-						newMessage = TheMessageStream->insertMessage(GameMessage::MSG_MOUSE_LEFT_DOUBLE_CLICK, const_cast<GameMessage*>(msg));
-					else
-						newMessage = TheMessageStream->insertMessage(GameMessage::MSG_MOUSE_LEFT_CLICK, const_cast<GameMessage*>(msg));
-					m_nextUpShouldCreateDoubleClick[index] = FALSE;
-				} 
-				else if (t == GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_UP)
+					GameMessage::MSG_MOUSE_LEFT_CLICK,
+					GameMessage::MSG_MOUSE_MIDDLE_CLICK,
+					GameMessage::MSG_MOUSE_RIGHT_CLICK,
+				};
+				constexpr const GameMessage::Type DoubleClickMessages[3] =
 				{
-					if (m_nextUpShouldCreateDoubleClick[index])
-						newMessage = TheMessageStream->insertMessage(GameMessage::MSG_MOUSE_MIDDLE_DOUBLE_CLICK, const_cast<GameMessage*>(msg));
-					else
-						newMessage = TheMessageStream->insertMessage(GameMessage::MSG_MOUSE_MIDDLE_CLICK, const_cast<GameMessage*>(msg));
-					m_nextUpShouldCreateDoubleClick[index] = FALSE;
-				}
-				else if (t == GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP) 
-				{
-					if (m_nextUpShouldCreateDoubleClick[index])
-						newMessage = TheMessageStream->insertMessage(GameMessage::MSG_MOUSE_RIGHT_DOUBLE_CLICK, const_cast<GameMessage*>(msg));
-					else
-						newMessage = TheMessageStream->insertMessage(GameMessage::MSG_MOUSE_RIGHT_CLICK, const_cast<GameMessage*>(msg));
-					m_nextUpShouldCreateDoubleClick[index] = FALSE;
-				}
+					GameMessage::MSG_MOUSE_LEFT_DOUBLE_CLICK,
+					GameMessage::MSG_MOUSE_MIDDLE_DOUBLE_CLICK,
+					GameMessage::MSG_MOUSE_RIGHT_DOUBLE_CLICK,
+				};
+
+				const ICoord2D location = msg->getArgument(0)->pixel;
+				const GameMessage::Type messageType = m_nextUpShouldCreateDoubleClick[index] ? DoubleClickMessages[index] : SingleClickMessages[index];
+				GameMessage *newMessage = TheMessageStream->insertMessage(messageType, const_cast<GameMessage*>(msg));
 
 				IRegion2D pixelRegion;
 				buildRegion( &m_mouseDownPosition[index], &location, &pixelRegion );
@@ -571,12 +576,15 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 				}
 
 				newMessage->appendPixelRegionArgument( pixelRegion );
-				
+
 				// append the modifier keys to the message.
 				newMessage->appendIntegerArgument( msg->getArgument(1)->integer );
+
+				// append the time to the message.
+				//newMessage->appendIntegerArgument( msg->getArgument(2)->integer );
 				break;
 			}
-		
+
 		}
 
 	}
@@ -589,7 +597,7 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 //-------------------------------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------------------------------
-MetaMap::MetaMap() : 
+MetaMap::MetaMap() :
 	m_metaMaps(NULL)
 {
 }
@@ -637,7 +645,7 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 	m->m_displayName.clear();
 	m->m_next = m_metaMaps;
 	m_metaMaps = m;
-	
+
 	return m;
 }
 
@@ -664,6 +672,61 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 	// TheSuperHackers @info A default mapping for MSG_META_SELECT_ALL_AIRCRAFT would be useful for Generals
 	// but is not recommended, because it will cause key mapping conflicts with original game languages.
 
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_INCREASE_MAX_RENDER_FPS);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_KPPLUS;
+			map->m_transition = DOWN;
+			map->m_modState = CTRL;
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_DECREASE_MAX_RENDER_FPS);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_KPMINUS;
+			map->m_transition = DOWN;
+			map->m_modState = CTRL;
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_INCREASE_LOGIC_TIME_SCALE);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_KPPLUS;
+			map->m_transition = DOWN;
+			map->m_modState = SHIFT_CTRL;
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_DECREASE_LOGIC_TIME_SCALE);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_KPMINUS;
+			map->m_transition = DOWN;
+			map->m_modState = SHIFT_CTRL;
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TOGGLE_PLAYER_OBSERVER);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_M;
+			map->m_transition = DOWN;
+			map->m_modState = NONE;
+			map->m_usableIn = COMMANDUSABLE_OBSERVER;
+		}
+	}
 	{
 		// Is mostly useful for Generals.
 		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TOGGLE_FAST_FORWARD_REPLAY);
@@ -672,7 +735,7 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 			map->m_key = MK_F;
 			map->m_transition = DOWN;
 			map->m_modState = NONE;
-			map->m_usableIn = COMMANDUSABLE_GAME;
+			map->m_usableIn = COMMANDUSABLE_GAME; // @todo COMMANDUSABLE_OBSERVER
 		}
 	}
 	{
@@ -683,7 +746,18 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 			map->m_key = MK_P;
 			map->m_transition = DOWN;
 			map->m_modState = NONE;
-			map->m_usableIn = COMMANDUSABLE_GAME;
+			map->m_usableIn = COMMANDUSABLE_OBSERVER;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TOGGLE_PAUSE_ALT);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_P;
+			map->m_transition = DOWN;
+			map->m_modState = SHIFT; // Requires modifier to avoid key conflicts as a player.
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
 		}
 	}
 	{
@@ -694,9 +768,76 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 			map->m_key = MK_O;
 			map->m_transition = DOWN;
 			map->m_modState = NONE;
+			map->m_usableIn = COMMANDUSABLE_OBSERVER;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_STEP_FRAME_ALT);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_O;
+			map->m_transition = DOWN;
+			map->m_modState = SHIFT; // Requires modifier to avoid key conflicts as a player.
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_SELECT_NEXT_IDLE_WORKER);
+		if (map->m_key == MK_NONE) {
+			map->m_key = MK_I;
+			map->m_transition = DOWN;
+			map->m_modState = CTRL;
+			map->m_usableIn = COMMANDUSABLE_GAME;
+			map->m_category = CATEGORY_SELECTION;
+			map->m_description = TheGameText->FETCH_OR_SUBSTITUTE("GUI:SelectNextIdleWorkerDescription", L"Select the next idle worker");
+			map->m_displayName = TheGameText->FETCH_OR_SUBSTITUTE("GUI:SelectNextIdleWorker", L"Next Idle Worker");
+		}
+	}
+	{
+		MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_ALT_CAMERA_ROTATE_LEFT);
+		if (map->m_key == MK_NONE) {
+			map->m_key = MK_KP4;
+			map->m_transition = DOWN;
+			map->m_modState = CTRL;
+			map->m_usableIn = COMMANDUSABLE_GAME;
+		}
+	}
+	{
+		MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_ALT_CAMERA_ROTATE_RIGHT);
+		if (map->m_key == MK_NONE) {
+			map->m_key = MK_KP6;
+			map->m_transition = DOWN;
+			map->m_modState = CTRL;
+			map->m_usableIn = COMMANDUSABLE_GAME;
+		}
+	}
+
+#if defined(RTS_DEBUG)
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_DEMO_REMOVE_PREREQ);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_P;
+			map->m_transition = DOWN;
+			map->m_modState = ALT;
+			map->m_usableIn = COMMANDUSABLE_GAME;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_DEMO_FREE_BUILD);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_B;
+			map->m_transition = DOWN;
+			map->m_modState = ALT;
 			map->m_usableIn = COMMANDUSABLE_GAME;
 		}
 	}
+#endif // defined(RTS_DEBUG)
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/PlaceEventTranslator.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/PlaceEventTranslator.cpp
index 7ae460e94b7..9e066f527aa 100644
--- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/PlaceEventTranslator.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/PlaceEventTranslator.cpp
@@ -25,7 +25,7 @@
 // FILE: PlaceEventTranslator.cpp ///////////////////////////////////////////////////////////
 // Author: Steven Johnson, Dec 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/Player.h"
@@ -62,6 +62,8 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 	{
 
 		//---------------------------------------------------------------------------------------------
+		// TheSuperHackers @bugfix Prevent double-clicks from falling through to other translators during building placement
+		case GameMessage::MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK:
 		case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_DOWN:
 		{
 			// if we're in a building placement mode, do the place and send to all players
@@ -87,10 +89,10 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 					TheInGameUI->placeBuildAvailable( NULL, NULL );
 					break;
 
-				}  // end if
+				}
 
 				// set this location as the placement anchor
-				TheInGameUI->setPlacementStart( &mouse );	
+				TheInGameUI->setPlacementStart( &mouse );
 
 /*
 //
@@ -107,12 +109,12 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 				//
 				LegalBuildCode lbc;
 				lbc = TheBuildAssistant->isLocationLegalToBuild( &world,
-																												 whatToBuild, 
+																												 whatToBuild,
 																												 TheInGameUI->getPlacementAngle(),
 																												 BuildAssistant::USE_QUICK_PATHFIND |
-																												 BuildAssistant::TERRAIN_RESTRICTIONS | 
+																												 BuildAssistant::TERRAIN_RESTRICTIONS |
 																												 BuildAssistant::CLEAR_PATH |
-																												 BuildAssistant::NO_OBJECT_OVERLAP, 
+																												 BuildAssistant::NO_OBJECT_OVERLAP,
 																												 builderObject );
 				if( lbc != LBC_OK )
 				{
@@ -124,22 +126,22 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 					// display a message to the user as to why you can't build there
 					TheInGameUI->displayCantBuildMessage( lbc );
 
-				}  // end if
+				}
 				else
 				{
 
 					// start placement anchor
-					TheInGameUI->setPlacementStart(&mouse);	
+					TheInGameUI->setPlacementStart(&mouse);
 
-				}  // end else
+				}
 */
-															
+
 				// used the input
 				disp = DESTROY_MESSAGE;
 
-			}  
+			}
 			break;
-		}  
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_MOUSE_LEFT_DOUBLE_CLICK:
@@ -170,11 +172,7 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 				// translate the screen position of start to world target location
 				TheTacticalView->screenToTerrain( &anchorStart, &world );
 
-				// get the source object ID of the thing that is "building" the object 
-				ObjectID builderID = INVALID_ID;
 				Object *builderObj = TheGameLogic->findObjectByID( TheInGameUI->getPendingPlaceSourceObjectID() );
-				if( builderObj )
-					builderID = builderObj->getID();
 
 				//Kris: September 27, 2002
 				//Make sure we have enough CASH to build it! It's possible that between the
@@ -188,7 +186,7 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 						TheEva->setShouldPlay(EVA_InsufficientFunds);
 						TheInGameUI->message( "GUI:NotEnoughMoneyToBuild" );
 						break;
-					} 
+					}
 					else if (cmt == CANMAKE_QUEUE_FULL)
 					{
 						TheInGameUI->message( "GUI:ProductionQueueFull" );
@@ -203,11 +201,13 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 					{
 						TheInGameUI->message( "GUI:UnitMaxedOut" );
 						break;
-					} 
+					}
 					// get out of pending placement mode, this will also clear the arrow anchor status
 					TheInGameUI->placeBuildAvailable( NULL, NULL );
 					break;
-				} 
+				}
+
+				DEBUG_ASSERTCRASH(builderObj != NULL, ("builderObj is NULL"));
 
 				// check to see if this is a legal location to build something at
 				LegalBuildCode lbc;
@@ -215,10 +215,10 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 																												 build,
 																												 angle,
 																												 BuildAssistant::USE_QUICK_PATHFIND |
-																												 BuildAssistant::TERRAIN_RESTRICTIONS | 
+																												 BuildAssistant::TERRAIN_RESTRICTIONS |
 																												 BuildAssistant::CLEAR_PATH |
 																												 BuildAssistant::NO_OBJECT_OVERLAP |
-																												 BuildAssistant::SHROUD_REVEALED, 
+																												 BuildAssistant::SHROUD_REVEALED,
 																												 builderObj, NULL );
 				if( lbc == LBC_OK )
 				{
@@ -242,14 +242,14 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 						TheTacticalView->screenToTerrain( &anchorEnd, &worldEnd );
 						placeMsg->appendLocationArgument( worldEnd );
 
-					}  // end if
+					}
 
 					pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), placeMsg->getType() );
 
 					// get out of pending placement mode, this will also clear the arrow anchor status
 					TheInGameUI->placeBuildAvailable( NULL, NULL );
 
-				}  // end if, location legal to build at
+				}
 				else
 				{
 					// can't place, display why
@@ -267,20 +267,20 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 					// unhook the anchor so they can try again
 					TheInGameUI->setPlacementStart( NULL );
 
-				}  // end else
-								
+				}
+
 				// used the input
 				disp = DESTROY_MESSAGE;
 				m_frameOfUpButton = TheGameLogic->getFrame();
 
 			}
 
-			if (disp == DESTROY_MESSAGE) 
+			if (disp == DESTROY_MESSAGE)
 				TheInGameUI->clearAttackMoveToMode();
 
 			break;
 
-		}  
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_POSITION:
@@ -297,24 +297,24 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 				//
 				ICoord2D start;
 				TheInGameUI->getPlacementPoints( &start, NULL );
-				
+
 				Int x, y;
 				x = mouse.x - start.x;
 				y = mouse.y - start.y;
 				if( sqrt( (x * x) + (y * y) ) >= PLACEMENT_DRAG_THRESHOLD_DIST )
 				{
-				
+
 					TheInGameUI->setPlacementEnd(&mouse);
 					disp = DESTROY_MESSAGE;
 
-				}  // end if
+				}
 
-			}  
+			}
 			break;
 		}
-	}  
+	}
 
 	return disp;
-}  
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp
index 1a661ece371..627da825624 100644
--- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp
@@ -26,7 +26,7 @@
 // Message stream translator
 // Author: Michael S. Booth, January 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/GameAudio.h"
@@ -56,16 +56,11 @@
 #include "GameClient/SelectionXlat.h"
 #include "GameClient/TerrainVisual.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 static Bool TheHurtSelectionMode = false;
 static Bool TheHandOfGodSelectionMode = false;
 static Bool TheDebugSelectionMode = false;
@@ -106,7 +101,7 @@ struct SFWRec
 {
 	SFWRec *info = (SFWRec *)userData;
 	return info->translator->selectFriends(draw, info->createTeamMsg, info->dragSelecting) != 0;
-}  // end selectFriendsWrapper
+}
 
 /*friend*/ Bool killThemKillThemAllWrapper( Drawable *draw, void *userData )
 {
@@ -116,9 +111,9 @@ struct SFWRec
 }
 
 //-----------------------------------------------------------------------------
-/** 
+/**
  * Returns true if the drawable can be selected under the current rules
- * of the system 
+ * of the system
  */
 Bool CanSelectDrawable( const Drawable *draw, Bool dragSelecting )
 {
@@ -128,7 +123,7 @@ Bool CanSelectDrawable( const Drawable *draw, Bool dragSelecting )
 		return FALSE;  // can't select
 	}
 	const Object *obj = draw->getObject();
-	
+
 	if( obj->isEffectivelyDead() && !obj->isKindOf(KINDOF_ALWAYS_SELECTABLE))
 	{
 		//Don't select dead/dying units.
@@ -141,7 +136,7 @@ Bool CanSelectDrawable( const Drawable *draw, Bool dragSelecting )
 	//says we should simply have the KINDOF_SELECTABLE check only... but best to be safe.
 	if( !obj->isKindOf( KINDOF_SELECTABLE ) && obj->isKindOf( KINDOF_FORCEATTACKABLE ) )
 	{
-		return FALSE;		
+		return FALSE;
 	}
 
 	// hidden objects cannot be selected
@@ -207,7 +202,7 @@ Bool CanSelectDrawable( const Drawable *draw, Bool dragSelecting )
 	//Now we can select anything that is selectable.
 	return TRUE;
 
-}  // end canSelect
+}
 
 //-----------------------------------------------------------------------------
 static Bool canSelectWrapper( Drawable *draw, void *userData )
@@ -270,11 +265,8 @@ SelectionTranslator::SelectionTranslator()
 	m_deselectFeedbackAnchor.x = 0;
 	m_deselectFeedbackAnchor.y = 0;
 	m_lastClick = 0;
-	//Added By Sadullah Nader
-	//Initializtion(s) inserted
 	m_deselectDownCameraPosition.zero();
 	m_displayedMaxWarning = FALSE;
-	//
 	m_selectCountMap.clear();
 
 	TheSelectionTranslator = this;
@@ -286,10 +278,10 @@ SelectionTranslator::~SelectionTranslator()
 }
 
 //-----------------------------------------------------------------------------
-/** 
+/**
  * If this drawable is a 'friend' of mine, select it.
  */
-Bool SelectionTranslator::selectFriends( Drawable *draw, GameMessage *createTeamMsg, 
+Bool SelectionTranslator::selectFriends( Drawable *draw, GameMessage *createTeamMsg,
 																				 Bool dragSelecting )
 {
 	if (CanSelectDrawable( draw, dragSelecting ))
@@ -317,11 +309,11 @@ Bool SelectionTranslator::selectFriends( Drawable *draw, GameMessage *createTeam
 
 		return true;  // selected
 
-	}  // end if
+	}
 
 	return false;  // not selected
 
-}  // end selectFriends
+}
 
 
 //-----------------------------------------------------------------------------
@@ -355,21 +347,21 @@ Bool SelectionTranslator::killThemKillThemAll( Drawable *draw, GameMessage *kill
 		}
 	}
 	return false;
-}  // end selectFriends
+}
 
 //-----------------------------------------------------------------------------
 /**
- * The SelectionTranslator is responsible for all selection semantics, 
- * including click selection, area drag selection, right-click de-selection, 
+ * The SelectionTranslator is responsible for all selection semantics,
+ * including click selection, area drag selection, right-click de-selection,
  * and CTRL-key group selection.
- * NOTE: This handler changes the event semantics for mouse buttons from 
+ * NOTE: This handler changes the event semantics for mouse buttons from
  * LEFT_DOWN -> LEFT_UP  to  LEFT_DOWN -> { LEFT_UP, AREA_SELECTION, or DRAWABLE_PICKED }
  */
 GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessage *msg)
 {
 	GameMessageDisposition disp = KEEP_MESSAGE;
 
-	if(	!TheInGameUI->getInputEnabled() ) 
+	if(	!TheInGameUI->getInputEnabled() )
 	{
 		//Keep the message so the other translaters (WindowXlat) can handle.
 		if( m_dragSelecting )
@@ -442,7 +434,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				//Kris: We want to show information such as the popup text on objects that are forceattackable even
 				//      when we're not in force attackable mode!
 				UnsignedInt pickType = getPickTypesForContext( true /*TheInGameUI->isInForceAttackMode()*/ );
-				
+
 				Drawable *underCursor = TheTacticalView->pickDrawable( &pixel, TheInGameUI->isInForceAttackMode(), (PickType) pickType );
 				Object *objUnderCursor = underCursor ? underCursor->getObject() : NULL;
 
@@ -468,19 +460,19 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 		case GameMessage::MSG_MOUSE_LEFT_DOUBLE_CLICK:
 		{
 			Int modifiers = msg->getArgument(1)->integer;
-			
-			// Pressing ctrl is disallowed for double clicking 
+
+			// Pressing ctrl is disallowed for double clicking
 			if (TheInGameUI->isInForceAttackMode())
 				break;
 
 			const IRegion2D& region = msg->getArgument(0)->pixelRegion;
-	
+
 			// Single point. If there's a unit in there, double click will select all of them.
-			if (region.height() == 0 && region.width() == 0) 
+			if (region.height() == 0 && region.width() == 0)
 			{
 				Bool selectAcrossMap = (BitIsSet(modifiers, KEY_STATE_ALT) ? TRUE : FALSE);
 
-				// only allow things that are selectable. Also, we aren't allowed to 
+				// only allow things that are selectable. Also, we aren't allowed to
 				Drawable *picked = TheTacticalView->pickDrawable( &region.lo, FALSE, PICK_TYPE_SELECTABLE);
 
 				// If there wasn't anyone to pick, then we want to propagate this double click.
@@ -498,9 +490,9 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				if (pickedObj == NULL || !pickedObj->isLocallyControlled())
 					break;
 
-				// Ok. The logic is a little bit weird here. What we need to do is deselect everything 
+				// Ok. The logic is a little bit weird here. What we need to do is deselect everything
 				// except for this one picked thing. Store off the old selection, pick the single clicked thing.
-				// Then if 
+				// Then if
 				DrawableList listOfSelectedDrawables;
 				if (TheInGameUI->isInPreferSelectionMode()) {
 					listOfSelectedDrawables	= *TheInGameUI->getAllSelectedDrawables();
@@ -512,7 +504,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				// Yay. Either select across the screen or the world depending on selectAcrossMap
 				if (selectAcrossMap)
 					TheInGameUI->selectMatchingAcrossMap();
-				else 
+				else
 					TheInGameUI->selectMatchingAcrossScreen();
 
 				// emit "picked" message
@@ -590,7 +582,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 		case GameMessage::MSG_MOUSE_LEFT_CLICK:
 		{
 			// If the quit menu is visible, we need to not process left clicks through the selection translator.
-			if (TheInGameUI->isQuitMenuVisible()) 
+			if (TheInGameUI->isQuitMenuVisible())
 			{
 				disp = DESTROY_MESSAGE;
 				break;
@@ -600,79 +592,79 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			// If there aren't then this click should move forward.
 			IRegion2D selectionRegion = msg->getArgument(0)->pixelRegion;
 			Bool isPoint = (selectionRegion.height() == 0 && selectionRegion.width() == 0);
-			
+
 			DrawableList drawablesThatWillSelect;
 			PickDrawableStruct pds;
 			pds.drawableListToFill = &drawablesThatWillSelect;
 			TheTacticalView->iterateDrawablesInRegion(&selectionRegion, addDrawableToList, &pds);
 
-			if (drawablesThatWillSelect.empty()) 
+			if (drawablesThatWillSelect.empty())
 			{
 				break;
 			}
 
-			// if there were drawables in the region, then we should determine if there is a context 
+			// if there were drawables in the region, then we should determine if there is a context
 			// sensitive command that should take place. If there is, then this isn't a selection thing
 			const DrawableList *currentList = TheInGameUI->getAllSelectedDrawables();
-			if (!currentlyLookingForSelection()) 
+			if (!currentlyLookingForSelection())
 			{
 				break;
 			}
 
 			SelectionInfo si;
-			if (contextCommandForNewSelection(currentList, &drawablesThatWillSelect, &si, isPoint)) 
+			if (contextCommandForNewSelection(currentList, &drawablesThatWillSelect, &si, isPoint))
 			{
 				break;
 			}
 
-			// There isn't a context command, so this is a selection thing. Now, based on the keys, 
+			// There isn't a context command, so this is a selection thing. Now, based on the keys,
 			// determine whether or not we should create a new group, or append these guys to our existing
 			// group.
-			
+
 			Bool addToGroup = TheInGameUI->isInPreferSelectionMode();
 
-			if (si.currentCountEnemies > 0 || 
-					si.currentCountCivilians > 0 || 
+			if (si.currentCountEnemies > 0 ||
+					si.currentCountCivilians > 0 ||
 					si.currentCountFriends > 0 ||
-					si.currentCountMineBuildings > 0) 
+					si.currentCountMineBuildings > 0)
 			{
 				// force a new group creation
 				addToGroup = FALSE;
 			}
 
 			// If there are any of my units, then select those.
-			if (si.newCountMine > 0) 
+			if (si.newCountMine > 0)
 			{
 				si.selectMine = TRUE;
-				if (si.newCountMine == 1 && si.newCountMineBuildings == 1) 
+				if (si.newCountMine == 1 && si.newCountMineBuildings == 1)
 				{
 					addToGroup = FALSE;
 					si.selectMineBuildings = TRUE;
 				}
 			}
-			else if (si.newCountEnemies > 0 && si.newCountCivilians > 0 && si.newCountFriends > 0) 
+			else if (si.newCountEnemies > 0 && si.newCountCivilians > 0 && si.newCountFriends > 0)
 			{
 				// No go here
 				break;
-			} 
-			else if (si.newCountEnemies == 1) 
+			}
+			else if (si.newCountEnemies == 1)
 			{
 				addToGroup = FALSE;
 				si.selectEnemies = TRUE;
-			} 
-			else if (si.newCountCivilians == 1) 
+			}
+			else if (si.newCountCivilians == 1)
 			{
 				addToGroup = FALSE;
 				si.selectCivilians = TRUE;
-			} 
-			else if (si.newCountFriends == 1) 
+			}
+			else if (si.newCountFriends == 1)
 			{
 				addToGroup = FALSE;
 				si.selectFriends = TRUE;
 			}
 
 			// If we're not going to select anything, just bail now.
-			if (!(si.selectMine || si.selectEnemies || si.selectCivilians || si.selectFriends)) 
+			if (!(si.selectMine || si.selectEnemies || si.selectCivilians || si.selectFriends))
 			{
 				break;
 			}
@@ -682,24 +674,24 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 
 			// Whenever we manually select something, reset the last selected group.
 			m_lastGroupSelGroup = -1;
-			
-			if (TheInGameUI->isInPreferSelectionMode() && isPoint && areAllSelected(drawablesThatWillSelect)) 
+
+			if (TheInGameUI->isInPreferSelectionMode() && isPoint && areAllSelected(drawablesThatWillSelect))
 			{
 				// If this was a point, shift was pressed and we already have that unit selected, then we
 				// need to deselect those units.
 				GameMessage *newMsg = TheMessageStream->appendMessage(GameMessage::MSG_REMOVE_FROM_SELECTED_GROUP);
 				Drawable *draw = NULL;
 				DrawableListIt it;
-				for (it = drawablesThatWillSelect.begin(); it != drawablesThatWillSelect.end(); ++it) 
+				for (it = drawablesThatWillSelect.begin(); it != drawablesThatWillSelect.end(); ++it)
 				{
 					draw = *it;
-					if (!draw) 
+					if (!draw)
 					{
 						continue;
 					}
 
 					Object *objToDeselect = draw->getObject();
-					if (!objToDeselect) 
+					if (!objToDeselect)
 					{
 						continue;
 					}
@@ -707,37 +699,37 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					newMsg->appendObjectIDArgument(objToDeselect->getID());
 					TheInGameUI->deselectDrawable(draw);
 				}
-			} 
-			else 
+			}
+			else
 			{
-				if (!addToGroup) 
+				if (!addToGroup)
 				{
 					deselectAll();
 				}
 
 				GameMessage *newMsg = TheMessageStream->appendMessage(GameMessage::MSG_CREATE_SELECTED_GROUP);
 				newMsg->appendBooleanArgument(!addToGroup);
-				
+
 				Player *localPlayer = ThePlayerList->getLocalPlayer();
 
 				Int newDrawablesSelected = 0;
 				Drawable *draw = NULL;
 				DrawableListIt it;
-				for (it = drawablesThatWillSelect.begin(); it != drawablesThatWillSelect.end(); ++it) 
+				for (it = drawablesThatWillSelect.begin(); it != drawablesThatWillSelect.end(); ++it)
 				{
 					draw = *it;
-					if (!draw) 
+					if (!draw)
 					{
 						continue;
 					}
 
 					Object *obj = draw->getObject();
-					if (!obj) 
+					if (!obj)
 					{
 						continue;
 					}
-					
-					if (obj && obj->getContainedBy() != NULL) 
+
+					if (obj && obj->getContainedBy() != NULL)
 					{
 						// we're contained, and so we shouldn't be selectable.
 						continue;
@@ -745,35 +737,35 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 
 					Drawable *drawToSelect = NULL;
 					ObjectID objToAppend = INVALID_ID;
-					if (si.selectMine && obj->isLocallyControlled()) 
+					if (si.selectMine && obj->isLocallyControlled())
 					{
-						if (!obj->isKindOf(KINDOF_STRUCTURE) || si.selectMineBuildings) 
+						if (!obj->isKindOf(KINDOF_STRUCTURE) || si.selectMineBuildings)
 						{
 							drawToSelect = draw;
 							objToAppend = obj->getID();
 						}
-					} 
-					else 
+					}
+					else
 					{
 						Relationship rel = localPlayer->getRelationship(obj->getTeam());
-						if (si.selectEnemies && rel == ENEMIES) 
+						if (si.selectEnemies && rel == ENEMIES)
 						{
 							drawToSelect = draw;
 							objToAppend = obj->getID();
-						} 
-						else if (si.selectCivilians && rel == NEUTRAL) 
+						}
+						else if (si.selectCivilians && rel == NEUTRAL)
 						{
 							drawToSelect = draw;
 							objToAppend = obj->getID();
-						} 
-						else if (si.selectFriends && rel == ALLIES) 
+						}
+						else if (si.selectFriends && rel == ALLIES)
 						{
 							drawToSelect = draw;
 							objToAppend = obj->getID();
 						}
 					}
 
-					if (drawToSelect && objToAppend != INVALID_ID) 
+					if (drawToSelect && objToAppend != INVALID_ID)
 					{
 						newMsg->appendObjectIDArgument(objToAppend);
 						TheInGameUI->selectDrawable(drawToSelect);
@@ -781,9 +773,9 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					}
 				}
 
-				if (newDrawablesSelected == 1 && draw) 
+				if (newDrawablesSelected == 1 && draw)
 				{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 					if (TheHandOfGodSelectionMode && draw)
 					{
 						Object* obj = draw->getObject();
@@ -831,13 +823,13 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 
 			if (disp == DESTROY_MESSAGE)
 				TheInGameUI->clearAttackMoveToMode();
-			
+
 			break;
 		}
 
 		//-----------------------------------------------------------------------------
-		// Note that the raw left messages are only used to draw feedback now when 
-		// appropriate. All actual selection code takes place in 
+		// Note that the raw left messages are only used to draw feedback now when
+		// appropriate. All actual selection code takes place in
 		// MSG_MOUSE_LEFT_CLICK & MSG_MOUSE_LEFT_DOUBLE_CLICK
 		case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_DOWN:
 		{
@@ -848,13 +840,13 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 		}
 
 		//-----------------------------------------------------------------------------
-		// Note that the raw left messages are only used to draw feedback now when 
-		// appropriate. All actual selection code takes place in 
+		// Note that the raw left messages are only used to draw feedback now when
+		// appropriate. All actual selection code takes place in
 		// MSG_MOUSE_LEFT_CLICK & MSG_MOUSE_LEFT_DOUBLE_CLICK
 		case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_UP:
 		{
 			m_leftMouseButtonIsDown = FALSE;
-			
+
 			if (m_dragSelecting) {
 				// Stop drag selecting now, thanks.
 				m_dragSelecting = FALSE;
@@ -870,7 +862,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				buildRegion( &m_selectFeedbackAnchor, &msg->getArgument(0)->pixel, &selectionRegion );
 				dragMsg->appendPixelRegionArgument( selectionRegion );
 			}
-			else 
+			else
 			{
 				// left click behavior (not right drag)
 
@@ -887,7 +879,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 						}
 						else
 						{
-							//Prevent deselection of unit if it just issued some type of UI order such as attack move, guard, 
+							//Prevent deselection of unit if it just issued some type of UI order such as attack move, guard,
 							//initiating construction of a new structure.
 							TheInGameUI->setPreventLeftClickDeselectionInAlternateMouseModeForOneClick( FALSE );
 						}
@@ -915,41 +907,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP:
 		{
-			ICoord2D delta, pixel;
-			UnsignedInt currentTime;
 			Coord3D cameraPos;
-
 			TheTacticalView->getPosition(&cameraPos);
 			cameraPos.sub(&m_deselectDownCameraPosition);
-			
-			pixel = msg->getArgument( 0 )->pixel;
-			currentTime = (UnsignedInt) msg->getArgument( 2 )->integer;
-
-			delta.x = m_deselectFeedbackAnchor.x - pixel.x;
-			delta.y = m_deselectFeedbackAnchor.y - pixel.y;
-
-			Bool isClick = TRUE;
-			if (isClick && 
-					abs(delta.x) > TheMouse->m_dragTolerance || 
-					abs(delta.y) > TheMouse->m_dragTolerance)
-			{
-				isClick = FALSE;
-			}
 
-			if (isClick && 
-					currentTime - m_lastClick > TheMouse->m_dragToleranceMS)
-			{
-				isClick = FALSE;
-			}
-
-			if (isClick &&
-					cameraPos.length() > TheMouse->m_dragTolerance3D)
-			{
-				isClick = FALSE;
-			}
+			ICoord2D pixel = msg->getArgument( 0 )->pixel;
+			UnsignedInt currentTime = (UnsignedInt) msg->getArgument( 2 )->integer;
 
 			// right click behavior (not right drag)
-			if (isClick)
+			if (TheMouse->isClick(&m_deselectFeedbackAnchor, &pixel, m_lastClick, currentTime))
 			{
 				//Added support to cancel the GUI command without deselecting the unit(s) involved
 				//when you right click.
@@ -964,11 +930,20 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
  				}
 				else
 				{
- 					//No GUI command mode, so deselect everyone if we're in regular mouse mode.
  					//In alternate mouse mode, right click still cancels building placement.
- 					if (! TheGlobalData->m_useAlternateMouse || TheInGameUI->getPendingPlaceSourceObjectID() != INVALID_ID)
+					// TheSuperHackers @tweak Stubbjax 08/08/2025 Cancelling building placement no longer deselects the builder.
+					if (TheInGameUI->getPendingPlaceSourceObjectID() != INVALID_ID)
+					{
+						TheInGameUI->placeBuildAvailable(NULL, NULL);
+						TheInGameUI->setPreventLeftClickDeselectionInAlternateMouseModeForOneClick(FALSE);
+						disp = DESTROY_MESSAGE;
+						TheInGameUI->setScrolling(FALSE);
+					}
+					else if (!TheGlobalData->m_useAlternateMouse)
  					{
+						//No GUI command mode, so deselect everyone if we're in regular mouse mode.
  						deselectAll();
+						m_lastGroupSelGroup = -1;
  					}
  				}
 			}
@@ -991,7 +966,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			Int group = t - GameMessage::MSG_META_CREATE_TEAM0;
 			if ( group >= 0 && group < 10 )
 			{
-				DEBUG_LOG(("META: create team %d\n",group));
+				DEBUG_LOG(("META: create team %d",group));
 				// Assign selected items to a group
 				GameMessage *newmsg = TheMessageStream->appendMessage((GameMessage::Type)(GameMessage::MSG_CREATE_TEAM0 + group));
 				Drawable *drawable = TheGameClient->getDrawableList();
@@ -1023,7 +998,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			Int group = t - GameMessage::MSG_META_SELECT_TEAM0;
 			if ( group >= 0 && group < 10 )
 			{
-				DEBUG_LOG(("META: select team %d\n",group));
+				DEBUG_LOG(("META: select team %d",group));
 
 				UnsignedInt now = TheGameLogic->getFrame();
 				if ( m_lastGroupSelTime == 0 )
@@ -1031,10 +1006,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					m_lastGroupSelTime = now;
 				}
 
+				Bool performSelection = TRUE;
+
 				// check for double-press to jump view
 				if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )
 				{
-					DEBUG_LOG(("META: DOUBLETAP select team %d\n",group));
+					DEBUG_LOG(("META: DOUBLETAP select team %d",group));
+					// TheSuperHackers @bugfix Stubbjax 26/05/2025 Perform selection on double-press
+					// if the group or part of it is somehow deselected between presses.
+					performSelection = FALSE;
 					Player *player = ThePlayerList->getLocalPlayer();
 					if (player)
 					{
@@ -1046,12 +1026,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 							if (numObjs > 0)
 							{
 								// if theres someone in the group, center the camera on them.
-								TheTacticalView->lookAt( objlist[numObjs-1]->getDrawable()->getPosition() );
+								Drawable* drawable = objlist[numObjs - 1]->getDrawable();
+								TheTacticalView->lookAt( drawable->getPosition() );
+								performSelection = !TheInGameUI->areAllObjectsSelected( objlist );
 							}
 						}
 					}
-				} 
-				else 
+				}
+
+				if ( performSelection )
 				{
 					TheInGameUI->deselectAllDrawables( false ); //No need to post message because we're just creating a new group!
 
@@ -1096,7 +1079,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			Int group = t - GameMessage::MSG_META_ADD_TEAM0;
 			if ( group >= 0 && group < 10 )
 			{
-				DEBUG_LOG(("META: select team %d\n",group));
+				DEBUG_LOG(("META: select team %d",group));
 
 				UnsignedInt now = TheGameLogic->getFrame();
 				if ( m_lastGroupSelTime == 0 )
@@ -1108,7 +1091,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 
 				if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )
 				{
-					DEBUG_LOG(("META: DOUBLETAP select team %d\n",group));
+					DEBUG_LOG(("META: DOUBLETAP select team %d",group));
 					Player *player = ThePlayerList->getLocalPlayer();
 					if (player)
 					{
@@ -1129,6 +1112,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				else
 				{
 
+					Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
+					if( draw && draw->isKindOf( KINDOF_STRUCTURE ) )
+					{
+						//Kris: Jan 12, 2005
+						//Can't select other units if you have a structure selected. So deselect the structure to prevent
+						//group force attack exploit.
+						TheInGameUI->deselectAllDrawables();
+					}
+
 					// no need to send two messages for selecting the same group.
 					TheMessageStream->appendMessage((GameMessage::Type)(GameMessage::MSG_ADD_TEAM0 + group));
 					Player *player = ThePlayerList->getLocalPlayer();
@@ -1139,6 +1131,13 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 						{
 							VecObjectPtr objlist = selectedSquad->getLiveObjects();
 							Int numObjs = objlist.size();
+
+							// TheSuperHackers @bugfix skyaero 22/07/2025 Can't select other units if you have a structure selected. So deselect the structure to prevent group force attack exploit.
+							if (numObjs > 0 && objlist[0]->getDrawable()->isKindOf(KINDOF_STRUCTURE))
+							{
+								TheInGameUI->deselectAllDrawables();
+							}
+
 							for (Int i = 0; i < numObjs; ++i)
 							{
 								TheInGameUI->selectDrawable(objlist[i]->getDrawable());
@@ -1168,16 +1167,16 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			Int group = t - GameMessage::MSG_META_VIEW_TEAM0;
 			if ( group >= 1 && group <= 10 )
 			{
-				DEBUG_LOG(("META: view team %d\n",group));
+				DEBUG_LOG(("META: view team %d",group));
 				Player *player = ThePlayerList->getLocalPlayer();
-				if (player) 
+				if (player)
 				{
 					Squad *selectedSquad = player->getHotkeySquad(group);
-					if (selectedSquad != NULL) 
+					if (selectedSquad != NULL)
 					{
 						VecObjectPtr objlist = selectedSquad->getLiveObjects();
 						Int numObjs = objlist.size();
-						if (numObjs > 0) 
+						if (numObjs > 0)
 						{
 							// if theres someone in the group, center the camera on them.
 							TheTacticalView->lookAt( objlist[ numObjs-1 ]->getDrawable()->getPosition() );
@@ -1188,7 +1187,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-		
+
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_OPTIONS:
 		{
@@ -1199,34 +1198,34 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 		}
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_HAND_OF_GOD_MODE:
 		{
 			TheHandOfGodSelectionMode = !TheHandOfGodSelectionMode;
-			TheInGameUI->message( UnicodeString( L"Hand-Of-God Mode is %s" ), TheHandOfGodSelectionMode ? L"ON" : L"OFF" );
+			TheInGameUI->message( L"Hand-Of-God Mode is %s", TheHandOfGodSelectionMode ? L"ON" : L"OFF" );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_HURT_ME_MODE:
 		{
 			TheHurtSelectionMode = !TheHurtSelectionMode;
-			TheInGameUI->message( UnicodeString( L"Hurt-Me Mode is %s" ), TheHurtSelectionMode ? L"ON" : L"OFF" );
+			TheInGameUI->message( L"Hurt-Me Mode is %s", TheHurtSelectionMode ? L"ON" : L"OFF" );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_DEBUG_SELECTION:
 		{
 			TheDebugSelectionMode = !TheDebugSelectionMode;
-			TheInGameUI->message( UnicodeString( L"Debug-Selected-Item Mode is %s" ), TheDebugSelectionMode ? L"ON" : L"OFF" );
+			TheInGameUI->message( L"Debug-Selected-Item Mode is %s", TheDebugSelectionMode ? L"ON" : L"OFF" );
 		#ifdef DEBUG_OBJECT_ID_EXISTS
 			TheObjectIDToDebug = INVALID_ID;
 		#endif
@@ -1240,14 +1239,12 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 }
 
 
-//Added By Sadullah Nader
-
 //setDragSelecting(Bool dragSelect)
 //Added to fix the drag selection problem in control bar
 ////////////////////////////////////////////////////////////////////////
 void SelectionTranslator::setDragSelecting(Bool dragSelect)
 {
-	m_dragSelecting = dragSelect; 
+	m_dragSelecting = dragSelect;
 }
 
 //setLeftMouseButton(Bool state)
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
index 0241f4fa5bf..cd30ff3c2ce 100644
--- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
@@ -24,12 +24,12 @@
 
 // FILE: WindowXlat.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,7 +46,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/MessageStream.h"
@@ -55,11 +55,6 @@
 #include "GameClient/Shell.h"
 #include "GameClient/Display.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // DEFINES ////////////////////////////////////////////////////////////////////
 
@@ -75,7 +70,7 @@
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//debug hack to view object under mouse stats
+#if defined(RTS_DEBUG)	//debug hack to view object under mouse stats
 extern ICoord2D TheMousePos;
 #endif
 
@@ -91,11 +86,11 @@ static GameWindowMessage rawMouseToWindowMessage( const GameMessage *msg )
 	{
 		// ------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_POSITION:
-			gwm = GWM_MOUSE_POS; 
+			gwm = GWM_MOUSE_POS;
 			break;
 
 		// ------------------------------------------------------------------------
-		// Strange, but true. The window stuff really doesn't care about double clicks, so just 
+		// Strange, but true. The window stuff really doesn't care about double clicks, so just
 		// treat it as a down click.. Kinda like a second click.
 		case GameMessage::MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK:
 		case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_DOWN:
@@ -140,17 +135,17 @@ static GameWindowMessage rawMouseToWindowMessage( const GameMessage *msg )
 
 		// ------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_WHEEL:
-			if( msg->getArgument( 1 )->integer > 0 ) 
+			if( msg->getArgument( 1 )->integer > 0 )
 				gwm = GWM_WHEEL_UP;
-			else 
+			else
 				gwm = GWM_WHEEL_DOWN;
 			break;
 
-	}  // end switch
+	}
 
 	return gwm;
 
-}  // end rawMouseToWindowMessage
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -191,7 +186,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 
 			if( TheWindowManager )
 				TheWindowManager->winProcessMouseEvent( GWM_NONE, &mousePos, NULL );
-			
+
 			// Force it to keep the message, regardless of what the window thinks it did with the input.
 			return KEEP_MESSAGE;
 		}
@@ -204,7 +199,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 				//If we release the button outside
 				forceKeepMessage = TRUE;
 			}
-			//FALL THROUGH INTENTIONALLY!
+			FALLTHROUGH; //FALL THROUGH INTENTIONALLY!
 		}
 		case GameMessage::MSG_RAW_MOUSE_POSITION:
 		case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_DOWN:
@@ -218,7 +213,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 		{
 			// all window events have the position of the mouse as arg 0
 			ICoord2D mousePos = msg->getArgument( 0 )->pixel;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//debug hack to view object under mouse stats
+#if defined(RTS_DEBUG)	//debug hack to view object under mouse stats
 			TheMousePos.x = mousePos.x;
 			TheMousePos.y = mousePos.y;
 #endif
@@ -230,13 +225,13 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 
 			if( TheShell && TheShell->isShellActive() )
 				returnCode = WIN_INPUT_USED;
-			
+
 			if ( TheInGameUI && TheInGameUI->getInputEnabled() == FALSE )
 				returnCode = WIN_INPUT_USED;
 
 			break;
 
-		}  // end, raw mouse position
+		}
 
 		// ------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_LEFT_DRAG:
@@ -262,7 +257,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 
 			break;
 
-		}  // end drag mouse
+		}
 
 		// ------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_WHEEL:
@@ -276,7 +271,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 			// process wheel event
 			GameWindowMessage gwm = rawMouseToWindowMessage( msg );
 			if( TheWindowManager )
-				returnCode = TheWindowManager->winProcessMouseEvent( gwm, &mousePos,	
+				returnCode = TheWindowManager->winProcessMouseEvent( gwm, &mousePos,
 																														 &wheelPos );
 
 			if( TheShell && TheShell->isShellActive() )
@@ -287,7 +282,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 
 			break;
 
-		}  // end mouse wheel
+		}
 
 		// ------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_KEY_DOWN:
@@ -303,8 +298,8 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 
 
 			// If we're in a movie, we want to be able to escape out of it
-			if(returnCode != WIN_INPUT_USED 
-				&& (key == KEY_ESC) 
+			if(returnCode != WIN_INPUT_USED
+				&& (key == KEY_ESC)
 				&& (BitIsSet( state, KEY_STATE_UP ))
 				&& TheDisplay->isMoviePlaying()
 				&& TheGlobalData->m_allowExitOutOfMovies == TRUE )
@@ -313,8 +308,8 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 				returnCode = WIN_INPUT_USED;
 			}
 
-			if(returnCode != WIN_INPUT_USED 
-				&& (key == KEY_ESC) 
+			if(returnCode != WIN_INPUT_USED
+				&& (key == KEY_ESC)
 				&& (BitIsSet( state, KEY_STATE_UP ))
 				&& (TheInGameUI && (TheInGameUI->getInputEnabled() == FALSE)) )
 			{
@@ -322,14 +317,14 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 			}
 
 			break;
-						
-		}  // end key messages
+
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			break;
 
-	}  // end switch( msg->getType() )
+	}
 
 	// remove event from the stream if the return code specifies to do so
 	// If TheShell doesn't exist, then well, we're not in RTS, we're in GUIEdit
diff --git a/Generals/Code/GameEngine/Source/GameClient/RadiusDecal.cpp b/Generals/Code/GameEngine/Source/GameClient/RadiusDecal.cpp
index d009983a601..28b20813bb7 100644
--- a/Generals/Code/GameEngine/Source/GameClient/RadiusDecal.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/RadiusDecal.cpp
@@ -25,7 +25,7 @@
 // RadiusDecal.cpp ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_SHADOW_NAMES
 
@@ -36,21 +36,16 @@
 #include "GameClient/Shadow.h"
 #include "GameLogic/GameLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
-RadiusDecalTemplate::RadiusDecalTemplate() : 
-	m_shadowType(SHADOW_ALPHA_DECAL), 
+RadiusDecalTemplate::RadiusDecalTemplate() :
+	m_shadowType(SHADOW_ALPHA_DECAL),
 	m_minOpacity(1.0f),
 	m_maxOpacity(1.0f),
 	m_opacityThrobTime(LOGICFRAMES_PER_SECOND),
 	m_color(0),
 	m_onlyVisibleToOwningPlayer(true),
-	m_name(AsciiString::TheEmptyString)  // Added By Sadullah Nader for Init purposes
+	m_name(AsciiString::TheEmptyString)
 {
 }
 
@@ -58,10 +53,10 @@ RadiusDecalTemplate::RadiusDecalTemplate() :
 void RadiusDecalTemplate::createRadiusDecal(const Coord3D& pos, Real radius, const Player* owningPlayer, RadiusDecal& result) const
 {
 	result.clear();
-	
+
 	if (owningPlayer == NULL)
 	{
-		DEBUG_CRASH(("You MUST specify a non-NULL owningPlayer to createRadiusDecal. (srj)\n"));
+		DEBUG_CRASH(("You MUST specify a non-NULL owningPlayer to createRadiusDecal. (srj)"));
 		return;
 	}
 
@@ -78,7 +73,7 @@ void RadiusDecalTemplate::createRadiusDecal(const Coord3D& pos, Real radius, con
 		decalInfo.allowUpdates = FALSE;										// shadow texture will never update
 		decalInfo.allowWorldAlign = TRUE;									// shadow image will wrap around world objects
 		decalInfo.m_type = m_shadowType;
-		strcpy(decalInfo.m_ShadowName, m_name.str());		// name of your texture
+		strlcpy(decalInfo.m_ShadowName, m_name.str(), ARRAY_SIZE(decalInfo.m_ShadowName));		// name of your texture
 		decalInfo.m_sizeX = radius*2;									// world space dimensions
 		decalInfo.m_sizeY = radius*2;									// world space dimensions
 
@@ -87,12 +82,12 @@ void RadiusDecalTemplate::createRadiusDecal(const Coord3D& pos, Real radius, con
 		{
 			result.m_decal->setAngle(0.0f);
 			result.m_decal->setColor(m_color == 0 ? owningPlayer->getPlayerColor() : m_color);
-			result.m_decal->setPosition(pos.x, pos.y, pos.z);	
+			result.m_decal->setPosition(pos.x, pos.y, pos.z);
 			result.m_template = this;
 		}
 		else
 		{
-			DEBUG_CRASH(("Unable to add decal %s\n",decalInfo.m_ShadowName));
+			DEBUG_CRASH(("Unable to add decal %s",decalInfo.m_ShadowName));
 		}
 	}
 }
@@ -105,8 +100,8 @@ void RadiusDecalTemplate::xferRadiusDecalTemplate( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-	xfer->xferAsciiString(&m_name);	
-	xfer->xferUser(&m_shadowType, sizeof(m_shadowType));	
+	xfer->xferAsciiString(&m_name);
+	xfer->xferUser(&m_shadowType, sizeof(m_shadowType));
 	xfer->xferReal(&m_minOpacity);
   xfer->xferReal(&m_maxOpacity);
 	xfer->xferUnsignedInt(&m_opacityThrobTime);
@@ -117,7 +112,7 @@ void RadiusDecalTemplate::xferRadiusDecalTemplate( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 /*static*/ void RadiusDecalTemplate::parseRadiusDecalTemplate(INI* ini, void *instance, void * store, const void* /*userData*/)
 {
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Texture",										INI::parseAsciiString,				NULL,							offsetof( RadiusDecalTemplate, m_name ) },
 		{ "Style",											INI::parseBitString32,				TheShadowNames,		offsetof( RadiusDecalTemplate, m_shadowType ) },
@@ -133,16 +128,16 @@ void RadiusDecalTemplate::xferRadiusDecalTemplate( Xfer *xfer )
 }
 
 // ------------------------------------------------------------------------------------------------
-RadiusDecal::RadiusDecal() : 
-	m_template(NULL), 
+RadiusDecal::RadiusDecal() :
+	m_template(NULL),
 	m_decal(NULL),
 	m_empty(true)
 {
 }
 
 // ------------------------------------------------------------------------------------------------
-RadiusDecal::RadiusDecal(const RadiusDecal& that) : 
-	m_template(NULL), 
+RadiusDecal::RadiusDecal(const RadiusDecal& that) :
+	m_template(NULL),
 	m_decal(NULL),
 	m_empty(true)
 {
diff --git a/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp b/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp
index 4f873f7426f..4cc29191cae 100644
--- a/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/SelectionInfo.cpp
@@ -37,11 +37,6 @@
 #include "GameClient/GameClient.h"
 #include "GameClient/KeyDefs.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 SelectionInfo::SelectionInfo() :
@@ -68,10 +63,7 @@ SelectionInfo::SelectionInfo() :
 //-------------------------------------------------------------------------------------------------
 PickDrawableStruct::PickDrawableStruct() : drawableListToFill(NULL)
 {
-	//Added By Sadullah Nader
-	//Initializations inserted
 	drawableListToFill = FALSE;
-	//
 	forceAttackMode = TheInGameUI->isInForceAttackMode();
 	UnsignedInt pickType = getPickTypesForContext(forceAttackMode);
 	translatePickTypesToKindof(pickType, kindofsToMatch);
@@ -83,10 +75,10 @@ PickDrawableStruct::PickDrawableStruct() : drawableListToFill(NULL)
 
 //-------------------------------------------------------------------------------------------------
 /**
- * Given a list of currently selected things and a list of things that are currently under 
+ * Given a list of currently selected things and a list of things that are currently under
  * the selection (pointer or drag), generate some useful information about each.
  */
-extern Bool contextCommandForNewSelection(const DrawableList *currentlySelectedDrawables, 
+extern Bool contextCommandForNewSelection(const DrawableList *currentlySelectedDrawables,
 																					const DrawableList *newlySelectedDrawables,
 																					SelectionInfo *outSelectionInfo,
 																					Bool selectionIsPoint)
@@ -156,7 +148,7 @@ extern Bool contextCommandForNewSelection(const DrawableList *currentlySelectedD
 		}
 
 		if (obj->isLocallyControlled()) {
-			++outSelectionInfo->newCountMine;	
+			++outSelectionInfo->newCountMine;
 			newMine = *it;
 			if (obj->isKindOf(KINDOF_STRUCTURE)) {
 				++outSelectionInfo->newCountMineBuildings;
@@ -274,7 +266,7 @@ UnsignedInt getPickTypesForContext( Bool forceAttackMode )
 
 	return types;
 
-}  // end getPickTypesForContext
+}
 
 //-------------------------------------------------------------------------------------------------
 UnsignedInt getPickTypesForCurrentSelection( Bool forceAttackMode )
@@ -313,7 +305,7 @@ UnsignedInt getPickTypesForCurrentSelection( Bool forceAttackMode )
 	}
 
 	return retVal;
-		
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -333,7 +325,7 @@ void translatePickTypesToKindof(UnsignedInt pickTypes, KindOfMaskType& outMask)
 
 	if (BitIsSet(pickTypes, PICK_TYPE_FORCEATTACKABLE)) {
 		outMask.set(KINDOF_FORCEATTACKABLE);
-	}	
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -342,7 +334,7 @@ void translatePickTypesToKindof(UnsignedInt pickTypes, KindOfMaskType& outMask)
 Bool addDrawableToList( Drawable *draw, void *userData )
 {
 	PickDrawableStruct *pds = (PickDrawableStruct *) userData;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_allowUnselectableSelection) {
 		pds->drawableListToFill->push_back(draw);
 		return TRUE;
@@ -352,6 +344,18 @@ Bool addDrawableToList( Drawable *draw, void *userData )
 	if (!pds->drawableListToFill)
 		return FALSE;
 
+#if !RTS_GENERALS || !PRESERVE_RETAIL_BEHAVIOR
+	// TheSuperHackers @info
+	// In retail, drag-selecting allows the player to select stealthed objects and objects through the
+	// fog. Some players exploit this bug to determine where an opponent's units are and consider this
+	// an important feature and an advanced skill to pull off, so we must leave the exploit.
+	if (draw->getFullyObscuredByShroud())
+		return FALSE;
+
+	if (draw->isDrawableEffectivelyHidden())
+		return FALSE;
+#endif
+
 	if (!draw->getTemplate()->isAnyKindOf(pds->kindofsToMatch))
 		return FALSE;
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/Statistics.cpp b/Generals/Code/GameEngine/Source/GameClient/Statistics.cpp
index fc94edacd32..3290a581a96 100644
--- a/Generals/Code/GameEngine/Source/GameClient/Statistics.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/Statistics.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Statistics.cpp 
+// FILE: Statistics.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -37,7 +37,7 @@
 /*		4/2/2002 : Initial creation                                            */
 /*---------------------------------------------------------------------------*/
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/Statistics.h"
 
@@ -45,7 +45,7 @@
 Real MuLaw(Real valueToRun, Real maxValueForVal, Real mu)
 {
 	Real testVal = (valueToRun - maxValueForVal / 2) / (maxValueForVal / 2);
-	return (sign(testVal) * log(1 + mu * fabs(testVal)) / 
+	return (sign(testVal) * log(1 + mu * fabs(testVal)) /
 														 log(1 + mu));
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp
index b261a8114f2..dc3cf083120 100644
--- a/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/System/Anim2D.cpp
@@ -29,7 +29,7 @@
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_ANIM_2D_MODE_NAMES
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
@@ -38,11 +38,6 @@
 #include "GameClient/Image.h"
 #include "GameLogic/GameLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // GLOBAL /////////////////////////////////////////////////////////////////////////////////////////
 Anim2DCollection *TheAnim2DCollection = NULL;
@@ -64,23 +59,21 @@ Anim2DTemplate::Anim2DTemplate( AsciiString name )
 	m_randomizeStartFrame = FALSE;
 	m_nextTemplate = NULL;
 
-}  // end Anim2DTemplate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 Anim2DTemplate::~Anim2DTemplate( void )
 {
 
-	// delete the images
-	if( m_images )
-		delete [] m_images;
+	delete [] m_images;
 
-}  // end ~Anim2DTemplate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Field parse table for 2D animation templates */
 // ---------i---------------------------------------------------------------------------------------
-const FieldParse Anim2DTemplate::s_anim2DFieldParseTable[] = 
+const FieldParse Anim2DTemplate::s_anim2DFieldParseTable[] =
 {
 
 	{ "NumberImages",					Anim2DTemplate::parseNumImages,			NULL,							0 },
@@ -111,16 +104,16 @@ void Anim2DTemplate::parseNumImages( INI *ini, void *instance, void *store, cons
 	if( numFrames < minimumFrames )
 	{
 
-		DEBUG_CRASH(( "Anim2DTemplate::parseNumImages - Invalid animation '%s', animations must have '%d' or more frames defined\n",
+		DEBUG_CRASH(( "Anim2DTemplate::parseNumImages - Invalid animation '%s', animations must have '%d' or more frames defined",
 									 animTemplate->getName().str(), minimumFrames ));
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// allocate the image array
 	animTemplate->allocateImages( (UnsignedShort)numFrames );
 
-}  // end parseNumImages
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Allocate the image array for an animation template and store the number of frames we have */
@@ -138,7 +131,7 @@ void Anim2DTemplate::allocateImages( UnsignedShort numFrames )
 	for( Int i = 0; i < m_numFrames; ++i )
 		m_images[ i ] = NULL;
 
-}  // end allocateImages
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Parsing a single image definition for an animation */
@@ -155,36 +148,36 @@ void Anim2DTemplate::parseImage( INI *ini, void *instance, void *store, const vo
 	{
 
 		//We don't care if we're in the builder
-		//DEBUG_CRASH(( "Anim2DTemplate::parseImage - Image not found\n" ));
+		//DEBUG_CRASH(( "Anim2DTemplate::parseImage - Image not found" ));
 		//throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	//
 	// assign the image to the animation template list of images ... note since we've pre-allocated
 	// the array of images and the index an image is loaded into depends on its order specified
 	// in INI, we need to get the number of images currently loaded into this animation template
-	// so that we can put it at the next free image spot ... and then tell the animation 
+	// so that we can put it at the next free image spot ... and then tell the animation
 	// template we've loaded one more
 	//
 	Anim2DTemplate *animTemplate = (Anim2DTemplate *)instance;
 	animTemplate->storeImage( image );
 
-}  // end parseImage
+}
 
 // ------------------------------------------------------------------------------------------------
 /** This will parse the image sequence of an animation.  You can use this as a shortcut to
 	* specifying a series of images for an animation instead of having to specify them all
 	* individually.  Image names will be assumed to start with an appended "000" to the end
-	* end of the first image name and incremented up to the number of images for the 
+	* end of the first image name and incremented up to the number of images for the
 	* animation.  NOTE: That the number images *must* have already been specified before
 	* we can parse this entry so we know how many images to allocate and look for */
 // ------------------------------------------------------------------------------------------------
-/*static*/ void Anim2DTemplate::parseImageSequence( INI *ini, void *instance, 
+/*static*/ void Anim2DTemplate::parseImageSequence( INI *ini, void *instance,
 																										void *store, const void *userData )
 {
-	
-	// get the animation template 
+
+	// get the animation template
 	Anim2DTemplate *animTemplate = (Anim2DTemplate *)instance;
 
 	//
@@ -194,11 +187,11 @@ void Anim2DTemplate::parseImage( INI *ini, void *instance, void *store, const vo
 	if( animTemplate->getNumFrames() == NUM_FRAMES_INVALID )
 	{
 
-		DEBUG_CRASH(( "Anim2DTemplate::parseImageSequence - You must specify the number of animation frames for animation '%s' *BEFORE* specifying the image sequence name\n",
+		DEBUG_CRASH(( "Anim2DTemplate::parseImageSequence - You must specify the number of animation frames for animation '%s' *BEFORE* specifying the image sequence name",
 									animTemplate->getName().str() ));
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	//
 	// the image storage has already been allocated, all we have to do now is count from
@@ -220,18 +213,18 @@ void Anim2DTemplate::parseImage( INI *ini, void *instance, void *store, const vo
 		if( image == NULL )
 		{
 
-			DEBUG_CRASH(( "Anim2DTemplate::parseImageSequence - Image '%s' not found for animation '%s'.  Check the number of images specified in INI and also make sure all the actual images exist.\n",
+			DEBUG_CRASH(( "Anim2DTemplate::parseImageSequence - Image '%s' not found for animation '%s'.  Check the number of images specified in INI and also make sure all the actual images exist.",
 										imageName.str(), animTemplate->getName().str() ));
 			throw INI_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// store the image in the next free frame
 		animTemplate->storeImage( image );
 
-	}  // end if
+	}
 
-}  // end parseImageSequence
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Store the image at the next open image slot for the animation */
@@ -253,46 +246,46 @@ void Anim2DTemplate::storeImage( const Image *image )
 			m_images[ i ] = image;
 			return;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// if we got here we tried to store an image in an array that was too small
-	DEBUG_CRASH(( "Anim2DTemplate::storeImage - Unable to store image '%s' into animation '%s' because the animation is setup to only support '%d' image frames\n",
+	DEBUG_CRASH(( "Anim2DTemplate::storeImage - Unable to store image '%s' into animation '%s' because the animation is setup to only support '%d' image frames",
 								image->getName().str(), getName().str(), m_numFrames ));
 	throw INI_INVALID_DATA;
 
-}  // end storeImage
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Return the Image* for the frame number requested */
 // ------------------------------------------------------------------------------------------------
 const Image* Anim2DTemplate::getFrame( UnsignedShort frameNumber ) const
-{ 
+{
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_images != NULL, 
-										 ("Anim2DTemplate::getFrame - Image data is NULL for animation '%s'\n",
+	DEBUG_ASSERTCRASH( m_images != NULL,
+										 ("Anim2DTemplate::getFrame - Image data is NULL for animation '%s'",
 										  getName().str()) );
-	
-	// sanity										
+
+	// sanity
 	if( frameNumber < 0 || frameNumber >= m_numFrames )
 	{
-		
-		DEBUG_CRASH(( "Anim2DTemplate::getFrame - Illegal frame number '%d' for animation '%s'\n",
+
+		DEBUG_CRASH(( "Anim2DTemplate::getFrame - Illegal frame number '%d' for animation '%s'",
 									frameNumber, getName().str() ));
 		return NULL;
 
-	}  // end if
+	}
 	else
 	{
 
 		// return the image frame
 		return m_images[ frameNumber ];
 
-	}  // end else
+	}
 
-}  // end getFrame
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -302,20 +295,13 @@ const Image* Anim2DTemplate::getFrame( UnsignedShort frameNumber ) const
 // ------------------------------------------------------------------------------------------------
 Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem )
 {
-
 	// sanity
-	DEBUG_ASSERTCRASH( animTemplate != NULL, ("Anim2D::Anim2D - NULL template\n") );
-
-	//Added By Sadullah Nader
-	//Initialization 
-
-	m_currentFrame = 0; 
-	
-	//
+	DEBUG_ASSERTCRASH( animTemplate != NULL, ("Anim2D::Anim2D - NULL template") );
+	m_currentFrame = 0;
 
 	// set the template
 	m_template = animTemplate;
-	
+
 	// initialize members
 	m_status = ANIM_2D_STATUS_NONE;
 	m_alpha = 1.0f;
@@ -329,22 +315,18 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem
 	m_minFrame = 0;
 	m_maxFrame = m_template->getNumFrames() - 1;
 	m_framesBetweenUpdates = m_template->getNumFramesBetweenUpdates();
-	
-	//added by Sadullah Nader
-	// initializing pointers to NULL, and clearing Frame counters before
+
 	// we register ourselves to the System
 	m_collectionSystemNext = NULL;
 	m_collectionSystemPrev = NULL;
-	
+
 	m_lastUpdateFrame = 0;
-	
+
 	// if a system is present, register ourselves with that system
 	m_collectionSystem = collectionSystem;
 	if( m_collectionSystem )
 		m_collectionSystem->registerAnimation( this );
-	
-	
-}  // end Anim2D
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -355,7 +337,7 @@ Anim2D::~Anim2D( void )
 	if( m_collectionSystem )
 		m_collectionSystem->unRegisterAnimation( this );
 
-}  // end ~Anim2D
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set the current animation frame */
@@ -364,16 +346,16 @@ void Anim2D::setCurrentFrame( UnsignedShort frame )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_template != NULL, ("Anim2D::reset - No template for animation\n") );
+	DEBUG_ASSERTCRASH( m_template != NULL, ("Anim2D::reset - No template for animation") );
 
 	// sanity
-	DEBUG_ASSERTCRASH( TheGameLogic != NULL,	
-										 ("Anim2D::setCurrentFrame - TheGameLogic must exist to use animation instances (%s)\n",
+	DEBUG_ASSERTCRASH( TheGameLogic != NULL,
+										 ("Anim2D::setCurrentFrame - TheGameLogic must exist to use animation instances (%s)",
 										  m_template->getName().str()) );
 
 	// sanity
 	DEBUG_ASSERTCRASH( frame >= 0 && frame < m_template->getNumFrames(),
-										 ("Anim2D::setCurrentFrame - Illegal frame number '%d' in animation\n", 
+										 ("Anim2D::setCurrentFrame - Illegal frame number '%d' in animation",
 										 frame, m_template->getName().str()) );
 
 	// set the frame
@@ -382,7 +364,7 @@ void Anim2D::setCurrentFrame( UnsignedShort frame )
 	// record the frame of this update to our current frame
 	m_lastUpdateFrame = TheGameLogic->getFrame();
 
-}  // end setCurrentFrame
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Randomize the current frame */
@@ -391,12 +373,12 @@ void Anim2D::randomizeCurrentFrame( void )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_template != NULL, ("Anim2D::reset - No template for animation\n") );
+	DEBUG_ASSERTCRASH( m_template != NULL, ("Anim2D::reset - No template for animation") );
 
 	// set the current frame to a random frame
 	setCurrentFrame( GameClientRandomValue( 0, m_template->getNumFrames() - 1 ) );
 
-}  // end randomizeCurrentFrame
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Reset this animation instance to the "start" of the animation */
@@ -405,7 +387,7 @@ void Anim2D::reset( void )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_template != NULL, ("Anim2D::reset - No template for animation\n") );
+	DEBUG_ASSERTCRASH( m_template != NULL, ("Anim2D::reset - No template for animation") );
 
 	switch( m_template->getAnimMode() )
 	{
@@ -426,13 +408,13 @@ void Anim2D::reset( void )
 
 		// --------------------------------------------------------------------------------------------
 		default:
-			DEBUG_CRASH(( "Anim2D::reset - Unknown animation mode '%d' for '%s'\n",
+			DEBUG_CRASH(( "Anim2D::reset - Unknown animation mode '%d' for '%s'",
 										m_template->getAnimMode(), m_template->getName().str() ));
 			break;
 
-	}  // end switch, animation mode
+	}
 
-}  // end reset
+}
 
 // ------------------------------------------------------------------------------------------------
 /** This is called after we are drawn ... if sufficient time has passed since our last
@@ -442,8 +424,8 @@ void Anim2D::tryNextFrame( void )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( TheGameLogic != NULL,	
-										 ("Anim2D::tryNextFrame - TheGameLogic must exist to use animation instances (%s)\n",
+	DEBUG_ASSERTCRASH( TheGameLogic != NULL,
+										 ("Anim2D::tryNextFrame - TheGameLogic must exist to use animation instances (%s)",
 										  m_template->getName().str()) );
 
 	// how many frames have passed since our last update
@@ -463,7 +445,7 @@ void Anim2D::tryNextFrame( void )
 					setStatus( ANIM_2D_STATUS_COMPLETE );
 				break;
 
-			}  // end once
+			}
 
 			// -------------------------------------------------------------------------------------------
 			case ANIM_2D_ONCE_BACKWARDS:
@@ -475,7 +457,7 @@ void Anim2D::tryNextFrame( void )
 					setStatus( ANIM_2D_STATUS_COMPLETE );
 				break;
 
-			}  // end once backwards
+			}
 
 			// -------------------------------------------------------------------------------------------
 			case ANIM_2D_LOOP:
@@ -487,7 +469,7 @@ void Anim2D::tryNextFrame( void )
 					setCurrentFrame( m_currentFrame + 1 );
 				break;
 
-			}  // end loop
+			}
 
 			// -------------------------------------------------------------------------------------------
 			case ANIM_2D_LOOP_BACKWARDS:
@@ -498,9 +480,9 @@ void Anim2D::tryNextFrame( void )
 				else
 					setCurrentFrame( m_maxFrame );
 				break;
-			
-			}  // end loop backwards
-				
+
+			}
+
 			// -------------------------------------------------------------------------------------------
 			case ANIM_2D_PING_PONG:
 			case ANIM_2D_PING_PONG_BACKWARDS:
@@ -518,15 +500,15 @@ void Anim2D::tryNextFrame( void )
 						setCurrentFrame( m_currentFrame + 1 );
 						clearStatus( ANIM_2D_STATUS_REVERSED );
 
-					}  // end if
+					}
 					else
 					{
 
 						setCurrentFrame( m_currentFrame - 1 );
 
-					}  // end else
+					}
 
-				}  // end if
+				}
 				else
 				{
 
@@ -540,35 +522,35 @@ void Anim2D::tryNextFrame( void )
 						setCurrentFrame( m_currentFrame - 1 );
 						setStatus( ANIM_2D_STATUS_REVERSED );
 
-					}  // end if
+					}
 					else
 					{
 
 						setCurrentFrame( m_currentFrame + 1 );
 
-					}  // end else
+					}
 
-				}  // end else
+				}
 
 				break;
 
-			}  // end ping pong / ping pong backwards
+			}
 
 			// -------------------------------------------------------------------------------------------
 			default:
 			{
 
-				DEBUG_CRASH(( "Anim2D::tryNextFrame - Unknown animation mode '%d' for '%s'\n",
+				DEBUG_CRASH(( "Anim2D::tryNextFrame - Unknown animation mode '%d' for '%s'",
 											m_template->getAnimMode(), m_template->getName().str() ));
 				break;
 
-			}  // end default
-							
-		}  // end switch
+			}
+
+		}
 
-	}  // end if
+	}
 
-}  // end tryNextFrame
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set status bit */
@@ -579,7 +561,7 @@ void Anim2D::setStatus( UnsignedByte statusBits )
 	// set the bits
 	BitSet( m_status, statusBits );
 
-}  // end setStatus
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Clear status bit */
@@ -590,7 +572,7 @@ void Anim2D::clearStatus( UnsignedByte statusBits )
 	// clear bits
 	BitClear( m_status, statusBits );
 
-}  // end clearStatus
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Return the "natural" width of the image for our current frame */
@@ -601,10 +583,10 @@ UnsignedInt Anim2D::getCurrentFrameWidth( void ) const
 
 	if( currentFrameImage )
 		return currentFrameImage->getImageWidth();
-	
+
 	return 0;
 
-}  // end getCurrentFrameWidth
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Return the "natural" height of the image for our current frame */
@@ -615,10 +597,10 @@ UnsignedInt Anim2D::getCurrentFrameHeight( void ) const
 
 	if( currentFrameImage )
 		return currentFrameImage->getImageHeight();
-	
+
 	return 0;
 
-}  // end getCurrentFrameHeight
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Draw an Anim2D using the natural width and height of the image data */
@@ -630,7 +612,7 @@ void Anim2D::draw( Int x, Int y )
 	const Image *image = m_template->getFrame( m_currentFrame );
 
 	// sanity
-	DEBUG_ASSERTCRASH( image != NULL, ("Anim2D::draw - Image not found for frame '%d' on animation '%s'\n",
+	DEBUG_ASSERTCRASH( image != NULL, ("Anim2D::draw - Image not found for frame '%d' on animation '%s'",
 										 m_currentFrame, m_template->getName().str()) );
 
 	// get the natural width and height of this image
@@ -648,7 +630,7 @@ void Anim2D::draw( Int x, Int y )
  	if( m_collectionSystem == NULL && BitIsSet( m_status, ANIM_2D_STATUS_FROZEN ) == FALSE )
 		tryNextFrame();
 
-}  // end draw
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Drawing an Anim2D using a forced width and height */
@@ -658,9 +640,9 @@ void Anim2D::draw( Int x, Int y, Int width, Int height )
 
 	// get the current image
 	const Image *image = m_template->getFrame( m_currentFrame );
-	
+
 	// sanity
-	DEBUG_ASSERTCRASH( image != NULL, ("Anim2D::draw - Image not found for frame '%d' on animation '%s'\n",
+	DEBUG_ASSERTCRASH( image != NULL, ("Anim2D::draw - Image not found for frame '%d' on animation '%s'",
 										 m_currentFrame, m_template->getName().str()) );
 
 
@@ -676,7 +658,7 @@ void Anim2D::draw( Int x, Int y, Int width, Int height )
  	if( m_collectionSystem == NULL && BitIsSet( m_status, ANIM_2D_STATUS_FROZEN ) == FALSE )
 		tryNextFrame();
 
-}  // end draw
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -685,7 +667,7 @@ void Anim2D::draw( Int x, Int y, Int width, Int height )
 // ------------------------------------------------------------------------------------------------
 void Anim2D::xfer( Xfer *xfer )
 {
-	
+
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
@@ -712,7 +694,7 @@ void Anim2D::xfer( Xfer *xfer )
 	// alpha
 	xfer->xferReal( &m_alpha );
 
-}  // end xfer
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -725,7 +707,7 @@ Anim2DCollection::Anim2DCollection( void )
 
 	m_templateList = NULL;
 	m_instanceList = NULL;
-}  // end Anim2DCollection
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -733,7 +715,7 @@ Anim2DCollection::~Anim2DCollection( void )
 {
 
 	// there should not be any animation instances registered with us since we're being destroyed
-	DEBUG_ASSERTCRASH( m_instanceList == NULL, ("Anim2DCollection - instance list is not NULL\n") );
+	DEBUG_ASSERTCRASH( m_instanceList == NULL, ("Anim2DCollection - instance list is not NULL") );
 
 	// delete all the templates
 	Anim2DTemplate *nextTemplate;
@@ -749,9 +731,9 @@ Anim2DCollection::~Anim2DCollection( void )
 		// set the head of our list to the next template
 		m_templateList = nextTemplate;
 
-	}  // end while
+	}
 
-}  // end ~Anim2DCollection
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Initialize 2D animation collection */
@@ -760,9 +742,9 @@ void Anim2DCollection::init( void )
 {
 	INI ini;
 
-	ini.load( "Data\\INI\\Animation2D.ini", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Animation2D", INI_LOAD_OVERWRITE, NULL );
 
-}  // end init
+}
 
 // ------------------------------------------------------------------------------------------------
 /** System update phase */
@@ -776,12 +758,12 @@ void Anim2DCollection::update( void )
 	{
 
 		// try to update the frame
-		if( BitIsSet( anim->getStatus(), ANIM_2D_STATUS_FROZEN ) == FALSE )	
+		if( BitIsSet( anim->getStatus(), ANIM_2D_STATUS_FROZEN ) == FALSE )
 			anim->tryNextFrame();
 
-	}  // end for, anim
+	}
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Search the template list for a template with a matching name */
@@ -790,19 +772,19 @@ Anim2DTemplate *Anim2DCollection::findTemplate( const AsciiString& name )
 {
 
 	// search the list
-	for( Anim2DTemplate *animTemplate = m_templateList; 
-			 animTemplate; 
+	for( Anim2DTemplate *animTemplate = m_templateList;
+			 animTemplate;
 			 animTemplate = animTemplate->friend_getNextTemplate() )
 	{
 
 		if( animTemplate->getName() == name )
 			return animTemplate;
 
-	}  // end for
+	}
 
 	return NULL;  // template not found
 
-}  // end findTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 Anim2DTemplate* Anim2DCollection::getNextTemplate( Anim2DTemplate *animTemplate ) const
@@ -830,7 +812,7 @@ Anim2DTemplate *Anim2DCollection::newTemplate( const AsciiString& name )
 	// return the new template
 	return animTemplate;
 
-}  // end newTemplate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Register animation instance with us.  When an animation instance is registered it can
@@ -846,7 +828,7 @@ void Anim2DCollection::registerAnimation( Anim2D *anim )
 	// sanity
 	DEBUG_ASSERTCRASH( anim->m_collectionSystemNext == NULL &&
 										 anim->m_collectionSystemPrev == NULL,
-										 ("Registering animation instance, instance '%s' is already in a system\n",
+										 ("Registering animation instance, instance '%s' is already in a system",
 										 anim->getAnimTemplate()->getName().str()) );
 
 	// tie to our list
@@ -856,7 +838,7 @@ void Anim2DCollection::registerAnimation( Anim2D *anim )
 		m_instanceList->m_collectionSystemPrev = anim;
 	m_instanceList = anim;
 
-}  // end registerAnimation
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -879,5 +861,5 @@ void Anim2DCollection::unRegisterAnimation( Anim2D *anim )
 	else
 		m_instanceList = anim->m_collectionSystemNext;
 
-}  // end unRegisterAnimation
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp b/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp
index b58d366683e..97ed8527e86 100644
--- a/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp
@@ -24,12 +24,12 @@
 
 // FILE: CampaignManager.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,7 +37,7 @@
 //	Filename: 	CampaignManager.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The flow of the campaigns are stored up in here!
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/Xfer.h"
@@ -62,14 +62,9 @@
 CampaignManager *TheCampaignManager = NULL;
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
-const FieldParse CampaignManager::m_campaignFieldParseTable[] = 
+const FieldParse CampaignManager::m_campaignFieldParseTable[] =
 {
 
 	{ "Mission",						CampaignManager::parseMissionPart,	NULL, NULL },
@@ -77,7 +72,7 @@ const FieldParse CampaignManager::m_campaignFieldParseTable[] =
 	{ "CampaignNameLabel",	INI::parseAsciiString,							NULL, offsetof( Campaign, m_campaignNameLabel ) },
 	{ "FinalVictoryMovie",	INI::parseAsciiString,							NULL, offsetof( Campaign, m_finalMovieName ) },
 
-	{ NULL,										NULL,													NULL, 0 }  // keep this last
+	{ NULL,										NULL,													NULL, 0 }
 
 };
 
@@ -93,10 +88,10 @@ void INI::parseCampaignDefinition( INI *ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
-	DEBUG_ASSERTCRASH( TheCampaignManager, ("parseCampaignDefinition: Unable to Get TheCampaignManager\n") );
+	DEBUG_ASSERTCRASH( TheCampaignManager, ("parseCampaignDefinition: Unable to Get TheCampaignManager") );
 	if( !TheCampaignManager )
 		return;
 
@@ -104,12 +99,12 @@ void INI::parseCampaignDefinition( INI *ini )
 	campaign = TheCampaignManager->newCampaign( name );
 
 	// sanity
-	DEBUG_ASSERTCRASH( campaign, ("parseCampaignDefinition: Unable to allocate campaign '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( campaign, ("parseCampaignDefinition: Unable to allocate campaign '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( campaign, TheCampaignManager->getFieldParse() );
 
-}  // end parseCampaignDefinition
+}
 
 //-----------------------------------------------------------------------------
 Campaign::Campaign( void )
@@ -128,8 +123,7 @@ Campaign::~Campaign( void )
 	{
 		Mission *mission = *it;
 		it = m_missions.erase( it );
-		if(mission)
-			deleteInstance(mission);
+		deleteInstance(mission);
 	}
 }
 
@@ -156,7 +150,7 @@ Mission *Campaign::newMission( AsciiString name )
 		else
 			++it;
 	}
-	Mission *newMission = newInstance(Mission);	
+	Mission *newMission = newInstance(Mission);
 	newMission->m_name.set(name);
 	m_missions.push_back(newMission);
 	return newMission;
@@ -168,7 +162,7 @@ Mission *Campaign::getMission( AsciiString missionName )
 	if(missionName.isEmpty())
 		return NULL;
 	MissionListIt it;
-	it = m_missions.begin();	
+	it = m_missions.begin();
 	// we've reached the end of the campaign
 	while(it != m_missions.end())
 	{
@@ -194,7 +188,7 @@ Mission *Campaign::getNextMission( Mission *current)
 		name = current->m_nextMission;
 	name.toLower();
 	MissionListIt it;
-	it = m_missions.begin();	
+	it = m_missions.begin();
 	// we've reached the end of the campaign
 	if(name.isEmpty())
 		return NULL;
@@ -233,8 +227,7 @@ CampaignManager::~CampaignManager( void )
 	{
 		Campaign *campaign = *it;
 		it = m_campaignList.erase( it );
-		if(campaign)
-			deleteInstance(campaign);
+		deleteInstance(campaign);
 	}
 }
 
@@ -243,7 +236,7 @@ void CampaignManager::init( void )
 {
 	INI ini;
 	// Read from INI all the CampaignManager
-	ini.load( AsciiString( "Data\\INI\\Campaign.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Campaign", INI_LOAD_OVERWRITE, NULL );
 }
 
 //-----------------------------------------------------------------------------
@@ -265,7 +258,7 @@ Mission *CampaignManager::gotoNextMission( void )
 		return NULL;
 	m_currentMission = m_currentCampaign->getNextMission(m_currentMission);
 	return m_currentMission;
-	
+
 }
 
 //-----------------------------------------------------------------------------
@@ -290,7 +283,7 @@ void CampaignManager::setCampaignAndMission( AsciiString campaign, AsciiString m
 		}
 		++it;
 	}
-}	
+}
 
 //-----------------------------------------------------------------------------
 void CampaignManager::setCampaign( AsciiString campaign )
@@ -321,7 +314,7 @@ AsciiString CampaignManager::getCurrentMap( void )
 {
 	if(!m_currentMission)
 		return AsciiString::TheEmptyString;
-	
+
 	return m_currentMission->m_mapName;
 }
 
@@ -336,8 +329,8 @@ Int CampaignManager::getCurrentMissionNumber( void )
 	{
 		Campaign::MissionListIt it;
 
-		for( it = m_currentCampaign->m_missions.begin(); 
-				 it != m_currentCampaign->m_missions.end(); 
+		for( it = m_currentCampaign->m_missions.begin();
+				 it != m_currentCampaign->m_missions.end();
 				 ++it )
 		{
 
@@ -345,9 +338,9 @@ Int CampaignManager::getCurrentMissionNumber( void )
 			if( *it == m_currentMission )
 				return number;
 		}
-		
+
 	}
-	
+
 	return number;
 
 }
@@ -355,7 +348,7 @@ Int CampaignManager::getCurrentMissionNumber( void )
 //-----------------------------------------------------------------------------
 void CampaignManager::parseMissionPart( INI* ini, void *instance, void *store, const void *userData )
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Map",							INI::parseAsciiString,				NULL, offsetof( Mission, m_mapName ) },
 			{ "NextMission",			INI::parseAsciiString,				NULL, offsetof( Mission, m_nextMission ) },
@@ -373,16 +366,16 @@ void CampaignManager::parseMissionPart( INI* ini, void *instance, void *store, c
 			{ "VoiceLength",			INI::parseInt ,								NULL, offsetof( Mission, m_voiceLength ) },
 
 
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 	AsciiString name;
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	Mission *mission = ((Campaign*)instance)->newMission(name );
 	ini->initFromINI(mission, myFieldParse);
 }
-	
+
 
 //-----------------------------------------------------------------------------
 Campaign *CampaignManager::newCampaign(AsciiString name)
@@ -411,7 +404,7 @@ Campaign *CampaignManager::newCampaign(AsciiString name)
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Added RankPoints Saving*/
 // ------------------------------------------------------------------------------------------------
 void CampaignManager::xfer( Xfer *xfer )
@@ -427,7 +420,7 @@ void CampaignManager::xfer( Xfer *xfer )
 	if( m_currentCampaign )
 		currentCampaign = m_currentCampaign->m_name;
 	xfer->xferAsciiString( &currentCampaign );
-	
+
 	// current mission
 	AsciiString currentMission;
 	if( m_currentMission )
@@ -445,7 +438,7 @@ void CampaignManager::xfer( Xfer *xfer )
 	if( xfer->getXferMode() == XFER_LOAD )
 		setCampaignAndMission( currentCampaign, currentMission );
 
-}  // end xfer
+}
 
 //-----------------------------------------------------------------------------
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
@@ -464,4 +457,4 @@ Mission::~Mission( void )
 {
 
 }
-	
+
diff --git a/Generals/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp b/Generals/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp
deleted file mode 100644
index af2862ec9fb..00000000000
--- a/Generals/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp	
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    Debug
-//
-// File name: AudiDebugDisplay.cpp
-//
-// Created:   11/13/01 TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/DebugDisplay.h"
-#include "Common/GameAudio.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-static DebugDisplayInterface *debugDisplay;
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-static void printFunc( char *text )
-{
-	debugDisplay->printf( text );
-}
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//============================================================================
-// AudioDebugDisplay 
-//============================================================================
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-void AudioDebugDisplay ( DebugDisplayInterface *dd, void *, FILE *fp = NULL )
-{
-	TheAudio->audioDebugDisplay( dd, NULL, fp );
-}
-#endif
-
diff --git a/Generals/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp b/Generals/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp
index df6e04dabd1..1cb33defbe1 100644
--- a/Generals/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   Generals
@@ -42,57 +42,57 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/DebugDisplay.h"
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 
@@ -171,7 +171,7 @@ Int		DebugDisplay::getHeight( void )
 void	DebugDisplay::setTextColor( Color color )
 {
 	m_textColor = color;
-}	
+}
 
 //============================================================================
 // DebugDisplay::setRightMargin
@@ -214,7 +214,7 @@ void	DebugDisplay::printf( const Char *format, ...)
 	DEBUG_ASSERTCRASH( result < sizeof(text), ("text overflow in DebugDisplay::printf() - string too long"));
 
 	// find every line and print it
-	Char *ptr = text;;
+	Char *ptr = text;
 	Char *lineStart = ptr;
 	Int lineLen = 0;
 	Char ch;
diff --git a/Generals/Code/GameEngine/Source/GameClient/System/Image.cpp b/Generals/Code/GameEngine/Source/GameClient/System/Image.cpp
index 692e085808b..e2fffa78cb6 100644
--- a/Generals/Code/GameEngine/Source/GameClient/System/Image.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/System/Image.cpp
@@ -27,11 +27,11 @@
 // Desc:      High level representation of images, this is currently being
 //						written so we have a way to refer to images in the windows
 //						GUI, this system should be replaced with something that can
-//						handle real image management or written to accomodate 
+//						handle real image management or written to accomodate
 //						all parts of the engine that need images.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_IMAGE_STATUS_NAMES
 #include "Lib/BaseType.h"
@@ -39,10 +39,10 @@
 #include "Common/INI.h"
 #include "Common/GlobalData.h"
 #include "GameClient/Image.h"
-
+#include "Common/NameKeyGenerator.h"
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-const FieldParse Image::m_imageFieldParseTable[] = 
+const FieldParse Image::m_imageFieldParseTable[] =
 {
 
 	{ "Texture",				INI::parseAsciiString,							NULL, 		offsetof( Image, m_filename ) },
@@ -81,19 +81,19 @@ void Image::parseImageCoords( INI* ini, void *instance, void *store, const void*
 	uvCoords.lo.y = (Real)top;
 	uvCoords.hi.x = (Real)right;
 	uvCoords.hi.y = (Real)bottom;
-	
+
 	// adjust the coords by texture size
 	const ICoord2D *textureSize = theImage->getTextureSize();
 	if( textureSize->x )
 	{
 		uvCoords.lo.x /= (Real)textureSize->x;
 		uvCoords.hi.x /= (Real)textureSize->x;
-	}  // end if
+	}
 	if( textureSize->y )
 	{
 		uvCoords.lo.y /= (Real)textureSize->y;
 		uvCoords.hi.y /= (Real)textureSize->y;
-	}  // end if
+	}
 
 	// store the uv coords
 	theImage->setUV( &uvCoords );
@@ -104,13 +104,13 @@ void Image::parseImageCoords( INI* ini, void *instance, void *store, const void*
 	imageSize.y = bottom - top;
 	theImage->setImageSize( &imageSize );
 
-}  // end parseImageCoord
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse the image status line */
 //-------------------------------------------------------------------------------------------------
 void Image::parseImageStatus( INI* ini, void *instance, void *store, const void* /*userData*/)
-{	
+{
 	// use existing INI parsing for the bit strings
 	INI::parseBitString32(ini, instance, store, imageStatusNames);
 
@@ -129,9 +129,9 @@ void Image::parseImageStatus( INI* ini, void *instance, void *store, const void*
 		imageSize.y = theImage->getImageWidth();   // note it's width not height
 		theImage->setImageSize( &imageSize );
 
-	}  // end if
+	}
 
-}  // end parseImageStatus
+}
 
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 ImageCollection *TheMappedImageCollection = NULL;  ///< mapped images
@@ -154,16 +154,15 @@ Image::Image( void )
 	m_imageSize.y = 0;
 	m_rawTextureData = NULL;
 	m_status = IMAGE_STATUS_NONE;
-	m_next = NULL;
 
-}  // end Image
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Image::~Image( void )
 {
 
-}  // end ~Image
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set a status bit into the existing status, return the previous status
@@ -176,7 +175,7 @@ UnsignedInt Image::setStatus( UnsignedInt bit )
 	BitSet( m_status, bit );
 	return prevStatus;
 
-}  // end setStatus
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Clear a status bit from the existing status, return the previous
@@ -189,7 +188,7 @@ UnsignedInt Image::clearStatus( UnsignedInt bit )
 	BitClear( m_status, bit );
 	return prevStatus;
 
-}  // end clearStatus
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -199,114 +198,46 @@ UnsignedInt Image::clearStatus( UnsignedInt bit )
 //-------------------------------------------------------------------------------------------------
 ImageCollection::ImageCollection( void )
 {
-
-	m_imageList = NULL;
-
-}  // end ImageCollection
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ImageCollection::~ImageCollection( void )
 {
-	Image *image, *next;
-
-	// delete the images
-	image = m_imageList;
-	while( image )
-	{
-
-		next = image->m_next;
-		deleteInstance(image);
-		image = next;
-
-	}  // end while
-	m_imageList = NULL;
-
-}  // end ~ImageCollection
+  for (ImageMap::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
+    deleteInstance(i->second);
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return the next image in the collection */
 //-------------------------------------------------------------------------------------------------
-Image *ImageCollection::nextImage( Image *image )
+void ImageCollection::addImage( Image *image )
 {
-
-	if( image )
-		return image->m_next;
-
-	return NULL;
-
-}  // end nextImage
+  m_imageMap[TheNameKeyGenerator->nameToLowercaseKey(image->getName())]=image;
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Allocate a new image, tie to the image list and return it */
-//-------------------------------------------------------------------------------------------------
-Image *ImageCollection::newImage( void )
+const Image *ImageCollection::findImage( NameKeyType namekey ) const
 {
-	Image *image = newInstance(Image);
-
-	// attach to collection list
-	image->m_next = m_imageList;
-	m_imageList = image;
-
-	return image;
-
-}  // end newImage
+	ImageMap::const_iterator i = m_imageMap.find(namekey);
+	return i == m_imageMap.end() ? NULL : i->second;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Find an image given the image name */
 //-------------------------------------------------------------------------------------------------
-const Image *ImageCollection::findImageByName( const AsciiString& name )
+const Image *ImageCollection::findImageByName( const AsciiString& name ) const
 {
-	Image *image;
-
-	/** @todo this needs to be more intelligent if this image collection 
-	becomes a real system we use a lot */
-
-	// search the images
-	image = m_imageList;
-	while( image )
-	{
-
-		//
-		// want to do a case insensitive compare here cause image INI files are
-		// autogenerated from filenames using the image packer tool
-		//
-		if( image->getName().compareNoCase( name.str() ) == 0 )
-			return image;
-		image = image->m_next;
-
-	}  // end while
-
-	// not found
-	return NULL;
-
-}  // end findImageByName
+	return findImage(TheNameKeyGenerator->nameToLowercaseKey(name));
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Find image given image filename */
+/** Find an image given the image name */
 //-------------------------------------------------------------------------------------------------
-const Image *ImageCollection::findImageByFilename( const AsciiString& filename )
+const Image *ImageCollection::findImageByName( const char* name ) const
 {
-	Image *image;
-
-	/** @todo this needs to be more intelligent if this image collection 
-	becomes a real system we use a lot */
-
-	// search the images
-	image = m_imageList;
-	while( image )
-	{
-
-		if( image->getFilename() == filename )
-			return image;
-		image = image->m_next;
-
-	}  // end while
-
-	// not found
-	return NULL;
-
-}  // end findImageByFilename
+	return findImage(TheNameKeyGenerator->nameToLowercaseKey(name));
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Load this image collection with all the images specified in the INI files
@@ -318,14 +249,14 @@ void ImageCollection::load( Int textureSize )
 	INI ini;
 	// first load in the user created mapped image files if we have them.
 	WIN32_FIND_DATA findData;
-	AsciiString userDataPath;	
+	AsciiString userDataPath;
 	if(TheGlobalData)
 	{
 		userDataPath.format("%sINI\\MappedImages\\*.ini",TheGlobalData->getPath_UserData().str());
 		if(FindFirstFile(userDataPath.str(), &findData) !=INVALID_HANDLE_VALUE)
 		{
 			userDataPath.format("%sINI\\MappedImages",TheGlobalData->getPath_UserData().str());
-			ini.loadDirectory(userDataPath, TRUE, INI_LOAD_OVERWRITE, NULL );
+			ini.loadDirectory(userDataPath, INI_LOAD_OVERWRITE, NULL );
 		}
 	}
 
@@ -334,9 +265,9 @@ void ImageCollection::load( Int textureSize )
 
 	// load all the ine files in that directory
 
-	ini.loadDirectory( AsciiString( buffer ), TRUE, INI_LOAD_OVERWRITE, NULL );
+	ini.loadDirectory( AsciiString( buffer ), INI_LOAD_OVERWRITE, NULL );
 
-	ini.loadDirectory("Data\\INI\\MappedImages\\HandCreated", TRUE, INI_LOAD_OVERWRITE, NULL );
+	ini.loadDirectory("Data\\INI\\MappedImages\\HandCreated", INI_LOAD_OVERWRITE, NULL );
 
 
-}  // end load
+}
diff --git a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp
index 8fb06d79c7c..4d8cd851e95 100644
--- a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp
@@ -27,7 +27,7 @@
 // Author: Michael S. Booth, November 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_PARTICLE_SYSTEM_NAMES
 
@@ -49,13 +49,8 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/TerrainLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
-//------------------------------------------------------------------------------ Performance Timers 
+//------------------------------------------------------------------------------ Performance Timers
 //#include "Common/PerfMetrics.h"
 //#include "Common/PerfTimer.h"
 
@@ -73,8 +68,6 @@ ParticleSystemManager *TheParticleSystemManager = NULL;
 // ------------------------------------------------------------------------------------------------
 ParticleInfo::ParticleInfo( void )
 {
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_angleX = m_angleY = m_angleZ = 0.0f;
 	m_angularDamping = 0.0f;
 	m_angularRateX = m_angularRateY = m_angularRateZ = 0.0f;
@@ -91,9 +84,8 @@ ParticleInfo::ParticleInfo( void )
 
 	m_lifetime = 0;
 	m_particleUpTowardsEmitter = FALSE;
-	
-	//
-}  // end ParticleInfo
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -101,7 +93,7 @@ ParticleInfo::ParticleInfo( void )
 void ParticleInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -158,7 +150,7 @@ void ParticleInfo::xfer( Xfer *xfer )
 		xfer->xferReal( &m_alphaKey[ i ].value );
 		xfer->xferUnsignedInt( &m_alphaKey[ i ].frame );
 
-	}  // end for, i
+	}
 
 	// color keys
 	for( i = 0; i < MAX_KEYFRAMES; ++i )
@@ -167,7 +159,7 @@ void ParticleInfo::xfer( Xfer *xfer )
 		xfer->xferRGBColor( &m_colorKey[ i ].color );
 		xfer->xferUnsignedInt( &m_colorKey[ i ].frame );
 
-	}  // end for, i
+	}
 
 	// color scale
 	xfer->xferReal( &m_colorScale );
@@ -178,7 +170,7 @@ void ParticleInfo::xfer( Xfer *xfer )
 	// wind randomness
 	xfer->xferReal( &m_windRandomness );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -186,7 +178,7 @@ void ParticleInfo::xfer( Xfer *xfer )
 void ParticleInfo::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
@@ -293,15 +285,12 @@ Particle::Particle( ParticleSystem *system, const ParticleInfo *info )
 	m_angleY = info->m_angleY;
 	m_angleZ = info->m_angleZ;
 
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_lastPos.zero();
-	//
-	m_windRandomness = info->m_windRandomness;	
+	m_windRandomness = info->m_windRandomness;
 	m_particleUpTowardsEmitter = info->m_particleUpTowardsEmitter;
 	m_emitterPos = info->m_emitterPos;
 
-	
+
 	m_angularRateX = info->m_angularRateX;
 	m_angularRateY = info->m_angularRateY;
 	m_angularRateZ = info->m_angularRateZ;
@@ -340,7 +329,7 @@ Particle::Particle( ParticleSystem *system, const ParticleInfo *info )
 	if (system->isUsingDrawables())
 	{
 		const ThingTemplate *tmpl = TheThingFactory->findTemplate(system->getParticleTypeName());
-		DEBUG_ASSERTCRASH(tmpl, ("Drawable %s not found\n",system->getParticleTypeName().str()));
+		DEBUG_ASSERTCRASH(tmpl, ("Drawable %s not found",system->getParticleTypeName().str()));
 		if (tmpl)
 		{
 			m_drawable = TheThingFactory->newDrawable(tmpl);
@@ -358,7 +347,7 @@ Particle::Particle( ParticleSystem *system, const ParticleInfo *info )
 	// add this particle to the Particle System list, retaining local creation order
 	m_system->addParticle(this);
 
-	//DEBUG_ASSERTLOG(!(totalParticleCount % 100 == 0), ( "TotalParticleCount = %d\n", m_totalParticleCount ));
+	//DEBUG_ASSERTLOG(!(totalParticleCount % 100 == 0), ( "TotalParticleCount = %d", m_totalParticleCount ));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -384,7 +373,7 @@ Particle::~Particle()
 	// remove from the global list
 	TheParticleSystemManager->removeParticle(this);
 
-	//DEBUG_ASSERTLOG(!(totalParticleCount % 100 == 0), ( "TotalParticleCount = %d\n", m_totalParticleCount ));
+	//DEBUG_ASSERTLOG(!(totalParticleCount % 100 == 0), ( "TotalParticleCount = %d", m_totalParticleCount ));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -582,9 +571,9 @@ void Particle::doWindMotion( void )
 			systemPos.y += objPos->y;
 			systemPos.z += objPos->z;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else if( DrawableID attachedDraw = m_system->getAttachedDrawable() )
 	{
 		Drawable *draw = TheGameClient->findDrawableByID( attachedDraw );
@@ -597,9 +586,9 @@ void Particle::doWindMotion( void )
 			systemPos.y += drawPos->y;
 			systemPos.z += drawPos->z;
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 
 	//
 	// compute a vector from the system position in the world to the particle ... we will use
@@ -627,22 +616,22 @@ void Particle::doWindMotion( void )
 
 		// only apply force if still within the circle of influence
 		if( distFromWind > fullForceDistance )
-			windForceStrength *= (1.0f - ((distFromWind - fullForceDistance) / 
+			windForceStrength *= (1.0f - ((distFromWind - fullForceDistance) /
 																		(noForceDistance - fullForceDistance)));
 
 		// integate the wind motion into the position
 		m_pos.x += (Cos( windAngle ) * windForceStrength);
 		m_pos.y += (Sin( windAngle ) * windForceStrength);
 
-	}  // end if
+	}
 
-}  // doWindMotion
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Get priority of a particle ... which is the priority of it's attached system */
 // ------------------------------------------------------------------------------------------------
 ParticlePriorityType Particle::getPriority( void )
-{ 
+{
 	return m_system->getPriority();
 }
 
@@ -660,7 +649,7 @@ Bool Particle::isInvisible( void )
 	{
 		case ParticleSystemInfo::ADDITIVE:
 			// if color is black, this particle is invisible
-			
+
 			// check that we're not in the process of going to another color
 			if (m_colorKey[ m_colorTargetKey ].frame == 0)
 			{
@@ -701,7 +690,7 @@ Bool Particle::isInvisible( void )
 void Particle::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -711,7 +700,7 @@ void Particle::crc( Xfer *xfer )
 void Particle::xfer( Xfer *xfer )
 {
 
-	// version 
+	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
@@ -769,21 +758,21 @@ void Particle::xfer( Xfer *xfer )
 		if( m_drawable == NULL )
 		{
 
-			DEBUG_CRASH(( "Particle::xfer - Unable to find matching drawable id for particle\n" ));
+			DEBUG_CRASH(( "Particle::xfer - Unable to find matching drawable id for particle" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// set the particle pointer in the drawable
 		m_drawable->friend_setParticle( this );
 
-	}  // end if
+	}
 
 	// system under control as an id
 	ParticleSystemID systemUnderControlID = m_systemUnderControl ? m_systemUnderControl->getSystemID() : INVALID_PARTICLE_SYSTEM_ID;
 	xfer->xferUser( &systemUnderControlID, sizeof( ParticleSystemID ) );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -798,7 +787,7 @@ void Particle::loadPostProcess( void )
 	if( m_systemUnderControlID != INVALID_PARTICLE_SYSTEM_ID )
 	{
 		ParticleSystem *system;
-		
+
 		// find system
 		system = TheParticleSystemManager->findParticleSystem( m_systemUnderControlID );
 
@@ -810,14 +799,14 @@ void Particle::loadPostProcess( void )
 		if( m_systemUnderControlID == NULL )
 		{
 
-			DEBUG_CRASH(( "Particle::loadPostProcess - Unable to find system under control pointer\n" ));
+			DEBUG_CRASH(( "Particle::loadPostProcess - Unable to find system under control pointer" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end loadPostProcess
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -830,17 +819,14 @@ ParticleSystemInfo::ParticleSystemInfo()
 	m_isGroundAligned = false;
 	m_isEmitAboveGroundOnly = false;
 	m_isParticleUpTowardsEmitter = false;
-	
-	//Added By Sadullah Nader
-	//Initializations inserted
+
 	m_driftVelocity.zero();
 	m_gravity = 0.0f;
 	m_isEmissionVolumeHollow = FALSE;
 	m_isOneShot = FALSE;
 	m_slavePosOffset.zero();
 	m_systemLifetime = 0;
-	
-	//
+
 	// some default values for the wind motion values
 	m_windMotion = WIND_MOTION_NOT_USED;
 	m_windAngle = 0.0f;
@@ -872,7 +858,7 @@ void ParticleSystemInfo::tintAllColors( Color tintColor )
 		m_colorKey[ key ].color.blue  *= (Real)(rgb.blue ) / 255.0f;
 	}
 
-}  // end loadPostProcess
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -881,7 +867,7 @@ void ParticleSystemInfo::tintAllColors( Color tintColor )
 void ParticleSystemInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -892,7 +878,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 {
 	Int i;
 
-	// version 
+	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
@@ -950,7 +936,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 		xfer->xferUser( &m_alphaKey[ i ].var, sizeof( GameClientRandomVariable ) );
 		xfer->xferUnsignedInt( &m_alphaKey[ i ].frame );
 
-	}  // end for, i
+	}
 
 	// color keys
 	for( i = 0; i < MAX_KEYFRAMES; ++i )
@@ -959,26 +945,26 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 		xfer->xferRGBColor( &m_colorKey[ i ].color );
 		xfer->xferUnsignedInt( &m_colorKey[ i ].frame );
 
-	}  // end for, i
+	}
 
 	// color scale
 	xfer->xferUser( &m_colorScale, sizeof( GameClientRandomVariable ) );
-	
+
 	// burst delay
 	xfer->xferUser( &m_burstDelay, sizeof( GameClientRandomVariable ) );
-	
+
 	// burst count
 	xfer->xferUser( &m_burstCount, sizeof( GameClientRandomVariable ) );
-	
+
 	// initial delay
 	xfer->xferUser( &m_initialDelay, sizeof( GameClientRandomVariable ) );
-	
+
 	// drift velocity
 	xfer->xferCoord3D( &m_driftVelocity );
-	
+
 	// gravity
 	xfer->xferReal( &m_gravity );
-		
+
 	// slave system name
 	xfer->xferAsciiString( &m_slaveSystemName );
 
@@ -1006,18 +992,18 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 			break;
 
 		// --------------------------------------------------------------------------------------------
-		case SPHERICAL:		
-			xfer->xferUser( &m_emissionVelocity.spherical.speed, sizeof( GameClientRandomVariable ) );			
+		case SPHERICAL:
+			xfer->xferUser( &m_emissionVelocity.spherical.speed, sizeof( GameClientRandomVariable ) );
 			break;
 
 		// --------------------------------------------------------------------------------------------
 		case HEMISPHERICAL:
-			xfer->xferUser( &m_emissionVelocity.hemispherical.speed, sizeof( GameClientRandomVariable ) );			
+			xfer->xferUser( &m_emissionVelocity.hemispherical.speed, sizeof( GameClientRandomVariable ) );
 			break;
 
 		// --------------------------------------------------------------------------------------------
 		case CYLINDRICAL:
-			xfer->xferUser( &m_emissionVelocity.cylindrical.radial, sizeof( GameClientRandomVariable ) );						
+			xfer->xferUser( &m_emissionVelocity.cylindrical.radial, sizeof( GameClientRandomVariable ) );
 			xfer->xferUser( &m_emissionVelocity.cylindrical.normal, sizeof( GameClientRandomVariable ) );
 			break;
 
@@ -1027,7 +1013,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 			xfer->xferUser( &m_emissionVelocity.outward.otherSpeed, sizeof( GameClientRandomVariable ) );
 			break;
 
-	}  // end switch, m_emissionVelocityType
+	}
 
 	// emission volume type
 	xfer->xferUser( &m_emissionVolumeType, sizeof( EmissionVolumeType ) );
@@ -1038,7 +1024,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 
 		// --------------------------------------------------------------------------------------------
 		case POINT:
-			// point has no data, it uses the systems position			
+			// point has no data, it uses the systems position
 			break;
 
 		// --------------------------------------------------------------------------------------------
@@ -1063,7 +1049,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 			xfer->xferReal( &m_emissionVolume.cylinder.length );
 			break;
 
-	}  // end switch, m_emissionVolumeType
+	}
 
 	// is emission volume hollow
 	xfer->xferBool( &m_isEmissionVolumeHollow );
@@ -1113,7 +1099,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 	// wind motion moving to end angle
 	xfer->xferByte( &m_windMotionMovingToEndAngle );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1121,7 +1107,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 void ParticleSystemInfo::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // ParticleSystem /////////////////////////////////////////////////////////////////////////////////
@@ -1130,8 +1116,8 @@ void ParticleSystemInfo::loadPostProcess( void )
 // ------------------------------------------------------------------------------------------------
 /** Read particle system properties from given file */
 // ------------------------------------------------------------------------------------------------
-ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate, 
-																ParticleSystemID id, 
+ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate,
+																ParticleSystemID id,
 																Bool createSlaves )
 {
 	m_systemParticlesHead = m_systemParticlesTail = NULL;
@@ -1140,12 +1126,9 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate,
 	m_template = sysTemplate;
 	m_systemID = id;
 
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_lastPos.zero();
 	m_pos.zero();
 	m_velCoeff.zero();
-	//
 
 	m_attachedToDrawableID = INVALID_DRAWABLE_ID;
 	m_attachedToObjectID = INVALID_ID;
@@ -1249,7 +1232,7 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate,
 	m_windMotionStartAngle = GameClientRandomValueReal( m_windMotionStartAngleMin, m_windMotionStartAngleMax );
 	m_windMotionEndAngle = GameClientRandomValueReal( m_windMotionEndAngleMin, m_windMotionEndAngleMax );
 	m_windAngle = GameClientRandomValueReal( m_windMotionStartAngle, m_windMotionEndAngle );
-			
+
 	m_shaderType = sysTemplate->m_shaderType;
 
 	m_particleType = sysTemplate->m_particleType;
@@ -1272,9 +1255,9 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate,
 			setSlave( slaveSystem );
 			m_slaveSystem->setMaster( this );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	m_attachedSystemName = sysTemplate->m_attachedSystemName;
 	m_particleCount = 0;
@@ -1283,7 +1266,7 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate,
 
 	TheParticleSystemManager->friend_addParticleSystem(this);
 
-	//DEBUG_ASSERTLOG(!(m_totalParticleSystemCount % 10 == 0), ( "TotalParticleSystemCount = %d\n", m_totalParticleSystemCount ));
+	//DEBUG_ASSERTLOG(!(m_totalParticleSystemCount % 10 == 0), ( "TotalParticleSystemCount = %d", m_totalParticleSystemCount ));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -1296,22 +1279,22 @@ ParticleSystem::~ParticleSystem()
 	if( m_slaveSystem )
 	{
 
-		DEBUG_ASSERTCRASH( m_slaveSystem->getMaster() == this, ("~ParticleSystem: Our slave doesn't have us as a master!\n") );
+		DEBUG_ASSERTCRASH( m_slaveSystem->getMaster() == this, ("~ParticleSystem: Our slave doesn't have us as a master!") );
 		m_slaveSystem->setMaster( NULL );
 		setSlave( NULL );
 
-	}  // end if
+	}
 
 	// tell any master system that *we* are going away
 	if( m_masterSystem )
 	{
 
-		DEBUG_ASSERTCRASH( m_masterSystem->getSlave() == this, ("~ParticleSystem: Our master doesn't have us as a slave!\n") );
+		DEBUG_ASSERTCRASH( m_masterSystem->getSlave() == this, ("~ParticleSystem: Our master doesn't have us as a slave!") );
 		m_masterSystem->setSlave( NULL );
 		setMaster( NULL );
 
-	}  // end if
-	
+	}
+
 
 	// destroy all particles "in the air"
 	while (m_systemParticlesHead)
@@ -1325,9 +1308,9 @@ ParticleSystem::~ParticleSystem()
 		m_controlParticle->detachControlledParticleSystem();
 
 	m_controlParticle = NULL;
-	
+
 	TheParticleSystemManager->friend_removeParticleSystem(this);
-	//DEBUG_ASSERTLOG(!(m_totalParticleSystemCount % 10 == 0), ( "TotalParticleSystemCount = %d\n", m_totalParticleSystemCount ));
+	//DEBUG_ASSERTLOG(!(m_totalParticleSystemCount % 10 == 0), ( "TotalParticleSystemCount = %d", m_totalParticleSystemCount ));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -1338,7 +1321,7 @@ void ParticleSystem::setMaster( ParticleSystem *master )
 	m_masterSystem = master;
 	m_masterSystemID = master ? master->getSystemID() : INVALID_PARTICLE_SYSTEM_ID;
 
-}  // end set Master
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1348,7 +1331,7 @@ void ParticleSystem::setSlave( ParticleSystem *slave )
 	m_slaveSystem = slave;
 	m_slaveSystemID = slave ? slave->getSystemID() : INVALID_PARTICLE_SYSTEM_ID;
 
-}  // end setSlave
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1505,7 +1488,7 @@ const Coord3D *ParticleSystem::computeParticleVelocity( const Coord3D *pos )
 			newVel.y = m_emissionVelocity.ortho.y.getValue();
 			newVel.z = m_emissionVelocity.ortho.z.getValue();
 			break;
-		
+
 		case CYLINDRICAL:
 		{
 			Real radialSpeed, angle;
@@ -1583,7 +1566,7 @@ const Coord3D *ParticleSystem::computeParticleVelocity( const Coord3D *pos )
 					// "speed" is in 'horizontal' plane, and "otherSpeed" is 'vertical'
 					newVel.x = speed * perp.x + otherSpeed * up.x;
 					newVel.y = speed * perp.y + otherSpeed * up.y;
-					newVel.z = speed * perp.z + otherSpeed * up.z;								
+					newVel.z = speed * perp.z + otherSpeed * up.z;
 					break;
 				}
 
@@ -1661,7 +1644,7 @@ const Coord3D *ParticleSystem::computeParticlePosition( void )
 		{
 			Real angle = GameClientRandomValueReal( 0, 2.0f*PI );
 			Real radius;
-			
+
 			if (m_isEmissionVolumeHollow)
 				radius = m_emissionVolume.cylinder.radius;
 			else
@@ -1695,10 +1678,10 @@ const Coord3D *ParticleSystem::computeParticlePosition( void )
 		}
 
 		case BOX:
-		{			
+		{
 			if (m_isEmissionVolumeHollow) {
 				// determine which side to generate on.
-				// 0 is bottom, 3 is top, 
+				// 0 is bottom, 3 is top,
 				// 1 is left , 4 is right
 				// 2 is front, 5 is right back
 
@@ -1712,7 +1695,7 @@ const Coord3D *ParticleSystem::computeParticlePosition( void )
 					} else {
 						newPos.z = m_emissionVolume.box.halfSize.z;
 					}
-															
+
 				} else if (side % 3 == 1) {
 					// generate Y, Z
 					newPos.y = GameClientRandomValueReal( -m_emissionVolume.box.halfSize.y, m_emissionVolume.box.halfSize.y );
@@ -1737,8 +1720,8 @@ const Coord3D *ParticleSystem::computeParticlePosition( void )
 				newPos.x = GameClientRandomValueReal( -m_emissionVolume.box.halfSize.x, m_emissionVolume.box.halfSize.x );
 				newPos.y = GameClientRandomValueReal( -m_emissionVolume.box.halfSize.y, m_emissionVolume.box.halfSize.y );
 				newPos.z = GameClientRandomValueReal( -m_emissionVolume.box.halfSize.z, m_emissionVolume.box.halfSize.z );
-			break;
 			}
+			break;
 		}
 
 		case LINE:
@@ -1776,7 +1759,7 @@ const Coord3D *ParticleSystem::computeParticlePosition( void )
 // ------------------------------------------------------------------------------------------------
 /** Factory method for particles. */
 // ------------------------------------------------------------------------------------------------
-Particle *ParticleSystem::createParticle( const ParticleInfo *info, 
+Particle *ParticleSystem::createParticle( const ParticleInfo *info,
 																					ParticlePriorityType priority,
 																					Bool forceCreate )
 {
@@ -1799,18 +1782,18 @@ Particle *ParticleSystem::createParticle( const ParticleInfo *info,
 		//
 
 		//
-		// Check if particle is below priorities we allow for this FPS or if it being skipped because 
-		// all particesl are being skipped (excluding special fps independent particles at 
-		// getMinDynamicParticleSkipPriority()) 
+		// Check if particle is below priorities we allow for this FPS or if it being skipped because
+		// all particesl are being skipped (excluding special fps independent particles at
+		// getMinDynamicParticleSkipPriority())
 		//
 		if( priority < TheGameLODManager->getMinDynamicParticlePriority() ||
-				(priority < TheGameLODManager->getMinDynamicParticleSkipPriority() && 
+				(priority < TheGameLODManager->getMinDynamicParticleSkipPriority() &&
 				 TheGameLODManager->isParticleSkipped()) )
 			return NULL;
 
 		if ( getParticleCount() > 0 && priority == AREA_EFFECT && m_isGroundAligned && TheParticleSystemManager->getFieldParticleCount() > (UnsignedInt)TheGlobalData->m_maxFieldParticleCount )
 			return NULL;
-		
+
 		// ALWAYS_RENDER particles are exempt from all count limits, and are always created, regardless of LOD issues.
 		if (priority != ALWAYS_RENDER)
 		{
@@ -1825,7 +1808,7 @@ Particle *ParticleSystem::createParticle( const ParticleInfo *info,
 				return NULL;
 		}
 
-	}  // end if
+	}
 
 	Particle *p = newInstance(Particle)( this, info );
 	return p;
@@ -1856,15 +1839,15 @@ const ParticleInfo *ParticleSystem::generateParticleInfo( Int particleNum, Int p
 	{
 		// transform particle position to world coordinates
 		Vector3 p, pr;
-		
+
 		Coord3D emissionAdjustment;	// this is the adjustment for inter-frame emission
-		// @todo : This should work, if m_lastPos = m_pos is removed from here but it doesn't. 
+		// @todo : This should work, if m_lastPos = m_pos is removed from here but it doesn't.
 		// @todo : Investigate why. jkmcd
 		if (m_isFirstPos) {
 			m_lastPos = m_pos;
 			m_isFirstPos = false;
 		}
-		
+
 		emissionAdjustment.x = (1 - (INT_TO_REAL(particleNum) / particleCount)) * (m_pos.x - m_lastPos.x);
 		emissionAdjustment.y = (1 - (INT_TO_REAL(particleNum) / particleCount)) * (m_pos.y - m_lastPos.y);
 		emissionAdjustment.z = (1 - (INT_TO_REAL(particleNum) / particleCount)) * (m_pos.z - m_lastPos.z);
@@ -1999,7 +1982,7 @@ Bool ParticleSystem::update( Int localPlayerIndex  )
 			m_pos = *attachedTo->getPosition();
 		}
 		else
-		{ 
+		{
 			// Drawable has been destroyed - lose our attachment to it
 			m_attachedToDrawableID = INVALID_DRAWABLE_ID;
 
@@ -2016,13 +1999,13 @@ Bool ParticleSystem::update( Int localPlayerIndex  )
 		{
 			if (!isShrouded)
 				isShrouded = (attachedTo->getShroudedStatus(localPlayerIndex) >= OBJECTSHROUD_FOGGED);
- 
+
 			parentXfrm = attachedTo->getTransformMatrix();
 			m_lastPos = m_pos;
 			m_pos = *attachedTo->getPosition();
 		}
 		else
-		{ 
+		{
 			// Drawable has been destroyed - lose our attachment to it
 			m_attachedToObjectID = INVALID_ID;
 
@@ -2126,7 +2109,7 @@ Bool ParticleSystem::update( Int localPlayerIndex  )
 							}
 						}
 					}
-						
+
 					// compute next burst delay
 					m_burstDelayLeft = (UnsignedInt)m_burstDelay.getValue();
 					m_burstDelayLeft *= m_delayCoeff;
@@ -2136,9 +2119,9 @@ Bool ParticleSystem::update( Int localPlayerIndex  )
 					m_burstDelayLeft--;
 				}
 
-			} // end if stopped check
-		} // end if system lifetime check
-	} // end if is destroyed
+			}
+		}
+	}
 
 	//
 	// Update all particles in the system
@@ -2211,7 +2194,7 @@ void ParticleSystem::updateWindMotion( void )
 			Real endAngle = m_windMotionEndAngle;
 
 			// this only works when start angle is less than end angle
-			DEBUG_ASSERTCRASH( startAngle < endAngle, ("updateWindMotion: startAngle must be < endAngle\n") );
+			DEBUG_ASSERTCRASH( startAngle < endAngle, ("updateWindMotion: startAngle must be < endAngle") );
 
 			// how big is the total angle span
 			Real totalSpan = endAngle - startAngle;
@@ -2219,7 +2202,7 @@ void ParticleSystem::updateWindMotion( void )
 
 			// given our current angle ... how far away from the "center" of the span are we
 			Real diffFromCenter = fabs( halfSpan - m_windAngle + startAngle );
-	
+
 			//
 			// given our distance from the center ... we need to compute how much we will change
 			// the angle.  When we are closer to the center we change it faster (more), and when
@@ -2231,7 +2214,7 @@ void ParticleSystem::updateWindMotion( void )
 			#define MINIMUM_CHANGE 0.005f  // lower #'s have softer swings at the edge angles
 			if( change < MINIMUM_CHANGE )
 				change = MINIMUM_CHANGE;
-			
+
 			//
 			// if we are moving toward the end angle we add the change, if we're moving away
 			// from it we subtract it
@@ -2250,20 +2233,20 @@ void ParticleSystem::updateWindMotion( void )
 					m_windMotionMovingToEndAngle = FALSE;
 
 					// pick a new change delta
-					m_windAngleChange = 
+					m_windAngleChange =
 							GameClientRandomValueReal( m_windAngleChangeMin, m_windAngleChangeMax );
 
 					// pick new start and end angles
-					m_windMotionStartAngle = 
-							GameClientRandomValueReal( m_windMotionStartAngleMin, 
+					m_windMotionStartAngle =
+							GameClientRandomValueReal( m_windMotionStartAngleMin,
 																				 m_windMotionStartAngleMax );
-					m_windMotionEndAngle = 
-							GameClientRandomValueReal( m_windMotionEndAngleMin, 
+					m_windMotionEndAngle =
+							GameClientRandomValueReal( m_windMotionEndAngleMin,
 																				 m_windMotionEndAngleMax );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -2278,24 +2261,24 @@ void ParticleSystem::updateWindMotion( void )
 					m_windMotionMovingToEndAngle = TRUE;
 
 					// pick a new change delta
-					m_windAngleChange = 
+					m_windAngleChange =
 							GameClientRandomValueReal( m_windAngleChangeMin, m_windAngleChangeMax );
 
 					// pick new start and end angles
-					m_windMotionStartAngle = 
-							GameClientRandomValueReal( m_windMotionStartAngleMin, 
+					m_windMotionStartAngle =
+							GameClientRandomValueReal( m_windMotionStartAngleMin,
 																				 m_windMotionStartAngleMax );
-					m_windMotionEndAngle = 
-							GameClientRandomValueReal( m_windMotionEndAngleMin, 
+					m_windMotionEndAngle =
+							GameClientRandomValueReal( m_windMotionEndAngleMin,
 																				 m_windMotionEndAngleMax );
 
-				}  // end if
+				}
 
-			}  // end else
+			}
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case ParticleSystemInfo::WIND_MOTION_CIRCULAR:
@@ -2307,7 +2290,7 @@ void ParticleSystem::updateWindMotion( void )
 
 			// add to our wind angle
 			m_windAngle += m_windAngleChange;
-			
+
 			// keep in 0 to 2PI range just to keep the numbers safe and sane
 			if( m_windAngle > TWO_PI )
 				m_windAngle -= TWO_PI;
@@ -2316,7 +2299,7 @@ void ParticleSystem::updateWindMotion( void )
 
 			break;
 
-		}  // end case
+		}
 
 		// ---------------------------------------------------------------------------------------------
 		default:
@@ -2324,11 +2307,11 @@ void ParticleSystem::updateWindMotion( void )
 
 			break;
 
-		}  // end default
+		}
 
-	}  // end if
+	}
 
-}  // end updateWindMotion
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -2358,7 +2341,7 @@ void ParticleSystem::addParticle( Particle *particleToAdd )
 
 	++m_particleCount;
 
-	particleToAdd->setPersonality( m_personalityStore++ ); 
+	particleToAdd->setPersonality( m_personalityStore++ );
 
 }
 
@@ -2394,7 +2377,6 @@ ParticleInfo ParticleSystem::mergeRelatedParticleSystems( ParticleSystem *master
 	if (!masterParticleSystem || !slaveParticleSystem) {
 		DEBUG_CRASH(("masterParticleSystem or slaveParticleSystem was NULL. Should not happen. JKMCD"));
 		ParticleInfo bogus;
-		memset( &bogus, 0, sizeof( bogus ) );
 		return bogus;
 	}
 
@@ -2446,11 +2428,11 @@ ParticleInfo ParticleSystem::mergeRelatedParticleSystems( ParticleSystem *master
 		slaveParticleSystem->m_emissionVolumeType = masterParticleSystem->m_emissionVolumeType;
 		slaveParticleSystem->m_isEmissionVolumeHollow = masterParticleSystem->m_isEmissionVolumeHollow;
 
-		
+
 		slaveParticleSystem->m_startSize.setRange(masterParticleSystem->m_startSize.getMinimumValue() * slaveParticleSystem->m_startSize.getMinimumValue(),
 																							masterParticleSystem->m_startSize.getMaximumValue() * slaveParticleSystem->m_startSize.getMaximumValue(),
 																							masterParticleSystem->m_startSize.getDistributionType());
-	
+
 		slaveParticleSystem->m_sizeRate.setRange(masterParticleSystem->m_sizeRate.getMinimumValue() * slaveParticleSystem->m_sizeRate.getMinimumValue(),
 																							masterParticleSystem->m_sizeRate.getMaximumValue() * slaveParticleSystem->m_sizeRate.getMaximumValue(),
 																							masterParticleSystem->m_sizeRate.getDistributionType());
@@ -2458,11 +2440,11 @@ ParticleInfo ParticleSystem::mergeRelatedParticleSystems( ParticleSystem *master
 		slaveParticleSystem->m_sizeRateDamping.setRange(masterParticleSystem->m_sizeRateDamping.getMinimumValue() * slaveParticleSystem->m_sizeRateDamping.getMinimumValue(),
 																							masterParticleSystem->m_sizeRateDamping.getMaximumValue() * slaveParticleSystem->m_sizeRateDamping.getMaximumValue(),
 																							masterParticleSystem->m_sizeRateDamping.getDistributionType());
-		
-//		slaveParticleSystem->m_burstCount.setRange(masterParticleSystem->m_burstCount.getMinimumValue() / 2, 
+
+//		slaveParticleSystem->m_burstCount.setRange(masterParticleSystem->m_burstCount.getMinimumValue() / 2,
 //																							 masterParticleSystem->m_burstCount.getMaximumValue() / 2,
 //																							 masterParticleSystem->m_burstCount.getDistributionType());
-		
+
 	}
 
 	return mergeInfo;
@@ -2488,7 +2470,7 @@ void ParticleSystem::setControlParticle( Particle *p )
 void ParticleSystem::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -2600,9 +2582,9 @@ void ParticleSystem::xfer( Xfer *xfer )
 			// write particle information
 			xfer->xferSnapshot( particle );
 
-		}  // end for, particle
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		ParticlePriorityType priority = getPriority();
@@ -2617,16 +2599,16 @@ void ParticleSystem::xfer( Xfer *xfer )
 			particle = createParticle( info, priority, TRUE );
 
 			// sanity
-			DEBUG_ASSERTCRASH( particle, ("ParticleSyste::xfer - Unable to create particle for loading\n") );
+			DEBUG_ASSERTCRASH( particle, ("ParticleSyste::xfer - Unable to create particle for loading") );
 
 			// read in the particle data
 			xfer->xferSnapshot( particle );
 
-		}  // end for i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2645,10 +2627,10 @@ void ParticleSystem::loadPostProcess( void )
 		if( m_slaveSystem != NULL )
 		{
 
-			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_slaveSystem is not NULL but should be\n" ));
+			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_slaveSystem is not NULL but should be" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// assign system
 		m_slaveSystem = TheParticleSystemManager->findParticleSystem( m_slaveSystemID );
@@ -2657,12 +2639,12 @@ void ParticleSystem::loadPostProcess( void )
 		if( m_slaveSystem == NULL || m_slaveSystem->isDestroyed() == TRUE )
 		{
 
-			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_slaveSystem is NULL or destroyed\n" ));
+			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_slaveSystem is NULL or destroyed" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// reconnect master pointers if needed
 	if( m_masterSystemID != INVALID_PARTICLE_SYSTEM_ID )
@@ -2672,10 +2654,10 @@ void ParticleSystem::loadPostProcess( void )
 		if( m_masterSystem != NULL )
 		{
 
-			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_masterSystem is not NULL but should be\n" ));
+			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_masterSystem is not NULL but should be" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// assign system
 		m_masterSystem = TheParticleSystemManager->findParticleSystem( m_masterSystemID );
@@ -2684,14 +2666,14 @@ void ParticleSystem::loadPostProcess( void )
 		if( m_masterSystem == NULL || m_masterSystem->isDestroyed() == TRUE )
 		{
 
-			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_masterSystem is NULL or destroyed\n" ));
+			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_masterSystem is NULL or destroyed" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end loadPostProcess
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // ParticleSystemTemplate /////////////////////////////////////////////////////////////////////////
@@ -2700,7 +2682,7 @@ void ParticleSystem::loadPostProcess( void )
 // ------------------------------------------------------------------------------------------------
 /** INI parse data */
 // ------------------------------------------------------------------------------------------------
-const FieldParse ParticleSystemTemplate::m_fieldParseTable[] = 
+const FieldParse ParticleSystemTemplate::m_fieldParseTable[] =
 {
 	{ "Priority",								INI::parseIndexList, ParticlePriorityNames, offsetof( ParticleSystemTemplate, m_priority ) },
 	{ "IsOneShot",							INI::parseBool,						NULL,		offsetof( ParticleSystemTemplate, m_isOneShot ) },
@@ -2835,7 +2817,7 @@ void ParticleSystemTemplate::parseRGBColorKeyframe( INI* ini, void *instance,
 /** Parse a RandomVariable RGB color.
  * Note that the components may be negative, as this is used for rates, as well. */
 // ------------------------------------------------------------------------------------------------
-void ParticleSystemTemplate::parseRandomRGBColor( INI* ini, void *instance, 
+void ParticleSystemTemplate::parseRandomRGBColor( INI* ini, void *instance,
 																											 void *store, const void* /*userData*/ )
 {
 #if 0
@@ -2870,15 +2852,15 @@ void ParticleSystemTemplate::parseRandomRGBColor( INI* ini, void *instance,
 			if( colors[j][i] < -255 || colors[j][i] > 255 )
 				throw INI_INVALID_DATA;
 
-		}  // end for i
+		}
 	}
 
 	// assign the color components to the "RGBColor" pointer at 'store'
 	ParticleSystemInfo::RandomRGBColor *theColor = (ParticleSystemInfo::RandomRGBColor *)store;
 
-	theColor->red.setRange( (Real)colors[ LO ][ RED ] / 255.0f, (Real)colors[ HI ][ RED ] / 255.0f ); 
-	theColor->green.setRange( (Real)colors[ LO ][ GREEN ] / 255.0f, (Real)colors[ HI ][ GREEN ] / 255.0f ); 
-	theColor->blue.setRange( (Real)colors[ LO ][ BLUE ] / 255.0f, (Real)colors[ HI ][ BLUE ] / 255.0f ); 
+	theColor->red.setRange( (Real)colors[ LO ][ RED ] / 255.0f, (Real)colors[ HI ][ RED ] / 255.0f );
+	theColor->green.setRange( (Real)colors[ LO ][ GREEN ] / 255.0f, (Real)colors[ HI ][ GREEN ] / 255.0f );
+	theColor->blue.setRange( (Real)colors[ LO ][ BLUE ] / 255.0f, (Real)colors[ HI ][ BLUE ] / 255.0f );
 #endif
 }
 
@@ -2886,18 +2868,15 @@ void ParticleSystemTemplate::parseRandomRGBColor( INI* ini, void *instance,
 // ------------------------------------------------------------------------------------------------
 ParticleSystemTemplate::ParticleSystemTemplate( const AsciiString &name ) :
 	m_name(name)
-{ 
-	//Added By Sadullah Nader
-	//Initializations inserted
+{
 	m_slaveTemplate = NULL;
-	//
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 ParticleSystemTemplate::~ParticleSystemTemplate()
 {
- 
+
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -2930,22 +2909,19 @@ ParticleSystemManager::ParticleSystemManager( void )
 
 	m_onScreenParticleCount = 0;
 	m_localPlayerIndex = 0;
-	
-	//Added By Sadullah Nader
-	//Initializations inserted
+
 	m_lastLogicFrameUpdate = 0;
 	m_particleCount = 0;
 	m_fieldParticleCount = 0;
 	m_particleSystemCount = 0;
-	//
 
 	for( Int i = 0; i < NUM_PARTICLE_PRIORITIES; ++i )
 	{
-		
+
 		m_allParticlesHead[ i ] = NULL;
 		m_allParticlesTail[ i ] = NULL;
 
-	}  // end for, i
+	}
 
 }
 
@@ -2969,21 +2945,21 @@ void ParticleSystemManager::init( void )
 {
 	/// Read INI data and build templates
 	INI ini;
-	ini.load( AsciiString( "Data\\INI\\ParticleSystem.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\ParticleSystem", INI_LOAD_OVERWRITE, NULL );
 
 	// sanity, our lists must be empty!!
 	for( Int i = 0; i < NUM_PARTICLE_PRIORITIES; ++i )
 	{
 
-		// sanity		
-		DEBUG_ASSERTCRASH( m_allParticlesHead[ i ] == NULL, ("INIT: ParticleSystem all particles head[%d] is not NULL!\n", i) );
-		DEBUG_ASSERTCRASH( m_allParticlesTail[ i ] == NULL, ("INIT: ParticleSystem all particles tail[%d] is not NULL!\n", i) );
+		// sanity
+		DEBUG_ASSERTCRASH( m_allParticlesHead[ i ] == NULL, ("INIT: ParticleSystem all particles head[%d] is not NULL!", i) );
+		DEBUG_ASSERTCRASH( m_allParticlesTail[ i ] == NULL, ("INIT: ParticleSystem all particles tail[%d] is not NULL!", i) );
 
 		// just to be clean set them to NULL
 		m_allParticlesHead[ i ] = NULL;
 		m_allParticlesTail[ i ] = NULL;
 
-	}  // end for, i
+	}
 
 }
 
@@ -2992,32 +2968,33 @@ void ParticleSystemManager::init( void )
 // ------------------------------------------------------------------------------------------------
 void ParticleSystemManager::reset( void )
 {
-	while (getParticleSystemCount()) {
-		if (m_allParticleSystemList.front()) {
-			deleteInstance(m_allParticleSystemList.front());
-		}
+	while (!m_allParticleSystemList.empty())
+	{
+		DEBUG_ASSERTCRASH(m_allParticleSystemList.front() != NULL, ("ParticleSystemManager::reset: ParticleSystem is null"));
+		deleteInstance(m_allParticleSystemList.front());
 	}
+	DEBUG_ASSERTCRASH(m_particleSystemCount == 0, ("ParticleSystemManager::reset: m_particleSystemCount is %u, not 0", m_particleSystemCount));
 
 	// sanity, our lists must be empty!!
 	for( Int i = 0; i < NUM_PARTICLE_PRIORITIES; ++i )
 	{
 
-		// sanity		
-		DEBUG_ASSERTCRASH( m_allParticlesHead[ i ] == NULL, ("RESET: ParticleSystem all particles head[%d] is not NULL!\n", i) );
-		DEBUG_ASSERTCRASH( m_allParticlesTail[ i ] == NULL, ("RESET: ParticleSystem all particles tail[%d] is not NULL!\n", i) );
+		// sanity
+		DEBUG_ASSERTCRASH( m_allParticlesHead[ i ] == NULL, ("RESET: ParticleSystem all particles head[%d] is not NULL!", i) );
+		DEBUG_ASSERTCRASH( m_allParticlesTail[ i ] == NULL, ("RESET: ParticleSystem all particles tail[%d] is not NULL!", i) );
 
 		// just to be clean set them to NULL
 		m_allParticlesHead[ i ] = NULL;
 		m_allParticlesTail[ i ] = NULL;
 
-	}  // end for, i
+	}
 
 	m_particleCount = 0;
 	m_fieldParticleCount = 0;
 	m_particleSystemCount = 0;
 
 	m_uniqueSystemID = INVALID_PARTICLE_SYSTEM_ID;
-	
+
 	m_lastLogicFrameUpdate = -1;
 	// leave templates as-is
 }
@@ -3036,15 +3013,12 @@ void ParticleSystemManager::update( void )
 	m_lastLogicFrameUpdate = TheGameLogic->getFrame();
 
 	//USE_PERF_TIMER(ParticleSystemManager)
-	ParticleSystemListIt it = m_allParticleSystemList.begin(); 
-	while( it != m_allParticleSystemList.end() )  
+	ParticleSystemListIt it = m_allParticleSystemList.begin();
+	while( it != m_allParticleSystemList.end() )
 	{
 		// TheSuperHackers @info Must increment the list iterator before potential element erasure from the list.
 		ParticleSystem* sys = *it++;
-
-		if (!sys) {
-			continue;
-		}
+		DEBUG_ASSERTCRASH(sys != NULL, ("ParticleSystemManager::update: ParticleSystem is null"));
 
 		if (sys->update(m_localPlayerIndex) == false)
 		{
@@ -3078,12 +3052,12 @@ ParticleSystem *ParticleSystemManager::createParticleSystem( const ParticleSyste
 // ------------------------------------------------------------------------------------------------
 /// given a template, instantiate a particle system attached to the given object, and return its ID
 // ------------------------------------------------------------------------------------------------
-ParticleSystemID ParticleSystemManager::createAttachedParticleSystemID( 
+ParticleSystemID ParticleSystemManager::createAttachedParticleSystemID(
 																			const ParticleSystemTemplate *sysTemplate,
 																			Object* attachTo,
 																			Bool createSlaves )
 {
-	ParticleSystem* pSystem = TheParticleSystemManager->createParticleSystem(sysTemplate, createSlaves);
+	ParticleSystem* pSystem = createParticleSystem(sysTemplate, createSlaves);
 	if (pSystem && attachTo)
 		pSystem->attachToObject(attachTo);
 	return pSystem ? pSystem->getSystemID() : INVALID_PARTICLE_SYSTEM_ID;
@@ -3101,9 +3075,7 @@ ParticleSystem *ParticleSystemManager::findParticleSystem( ParticleSystemID id )
 
 	for( ParticleSystemListIt it = m_allParticleSystemList.begin(); it != m_allParticleSystemList.end(); ++it ) {
 		system = *it;
-		if (!system) {
-			continue;
-		}
+		DEBUG_ASSERTCRASH(system != NULL, ("ParticleSystemManager::findParticleSystem: ParticleSystem is null"));
 
 		if( system->getSystemID() == id ) {
 			return system;
@@ -3112,7 +3084,7 @@ ParticleSystem *ParticleSystemManager::findParticleSystem( ParticleSystemID id )
 
 	return NULL;
 
-}  // end findParticleSystem
+}
 
 // ------------------------------------------------------------------------------------------------
 /** destroy the particle system with the given id (if it still exists) */
@@ -3177,11 +3149,11 @@ ParticleSystemTemplate *ParticleSystemManager::findParentTemplate( const AsciiSt
 		}
 	}
 
-	return NULL;	
+	return NULL;
 }
 
 // ------------------------------------------------------------------------------------------------
-/** Destroy any particle systems that are attached to this object */	
+/** Destroy any particle systems that are attached to this object */
 // ------------------------------------------------------------------------------------------------
 void ParticleSystemManager::destroyAttachedSystems( Object *obj )
 {
@@ -3191,17 +3163,14 @@ void ParticleSystemManager::destroyAttachedSystems( Object *obj )
 		return;
 
 	// iterate through all systems
-	ParticleSystem *system = NULL;
-
-	for( ParticleSystemListIt it = m_allParticleSystemList.begin(); 
-			 it != m_allParticleSystemList.end(); 
-			 ++it ) 
+	for( ParticleSystemListIt it = m_allParticleSystemList.begin();
+			 it != m_allParticleSystemList.end();
+			 ++it )
 	{
 
-		system = *it;
-		if( system == NULL )
-			continue;
-		
+		ParticleSystem *system = *it;
+		DEBUG_ASSERTCRASH(system != NULL, ("ParticleSystemManager::destroyAttachedSystems: ParticleSystem is null"));
+
 		if( system->getAttachedObject() == obj->getID() )
 			system->destroy();
 
@@ -3237,7 +3206,7 @@ void ParticleSystemManager::addParticle( Particle *particleToAdd, ParticlePriori
 	particleToAdd->m_inOverallList = TRUE;
 
 	++m_particleCount;
-	
+
 
 }
 
@@ -3276,6 +3245,7 @@ void ParticleSystemManager::removeParticle( Particle *particleToRemove)
 // ------------------------------------------------------------------------------------------------
 void ParticleSystemManager::friend_addParticleSystem( ParticleSystem *particleSystemToAdd )
 {
+	DEBUG_ASSERTCRASH(particleSystemToAdd != NULL, ("ParticleSystemManager::friend_addParticleSystem: ParticleSystem is null"));
 	m_allParticleSystemList.push_back(particleSystemToAdd);
 	++m_particleSystemCount;
 }
@@ -3289,26 +3259,27 @@ void ParticleSystemManager::friend_removeParticleSystem( ParticleSystem *particl
 	if (it != m_allParticleSystemList.end()) {
 		m_allParticleSystemList.erase(it);
 		--m_particleSystemCount;
+	} else {
+		DEBUG_CRASH(("ParticleSystemManager::friend_removeParticleSystem: ParticleSystem to remove was not recognized"));
 	}
-
 }
 
 // ------------------------------------------------------------------------------------------------
 /** Remove the oldest N number of particles from the lowest priority lists first.  We will
  * not remove particles from any priorities higher or equal to the priorityCap parameter. */
 // ------------------------------------------------------------------------------------------------
-Int ParticleSystemManager::removeOldestParticles( UnsignedInt count, 
+Int ParticleSystemManager::removeOldestParticles( UnsignedInt count,
 																									ParticlePriorityType priorityCap )
 {
 	Int countToRemove = count;
 
-	while (count-- && getParticleCount()) 
+	while (count-- && getParticleCount())
 	{
 		for( Int i = PARTICLE_PRIORITY_LOWEST;
 				 i < priorityCap;
 				 ++i )
 		{
-			if( m_allParticlesHead[ i ] ) 
+			if( m_allParticlesHead[ i ] )
 			{
 				deleteInstance(m_allParticlesHead[ i ]);
 				break;  // exit for
@@ -3345,7 +3316,7 @@ void ParticleSystemManager::preloadAssets( TimeOfDay timeOfDay )
 void ParticleSystemManager::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -3383,7 +3354,7 @@ void ParticleSystemManager::xfer( Xfer *xfer )
 
 			// ignore destroyed systems and non-saveable systems
 			if( system->isDestroyed() == TRUE || system->isSaveable() == FALSE )	{
-				AsciiString mtString = "";
+				AsciiString mtString;
 				xfer->xferAsciiString(&mtString); // write null string as key for destroyed system.
 				continue;
 			}
@@ -3395,10 +3366,10 @@ void ParticleSystemManager::xfer( Xfer *xfer )
 			// write system data
 			xfer->xferSnapshot( system );
 
-		}  // end for, it
+		}
 		DEBUG_ASSERTCRASH(systemCount==0, ("Mismatch in write count."));
 
-	}  // end if, save
+	}
 	else
 	{
 		const ParticleSystemTemplate *systemTemplate;
@@ -3418,11 +3389,11 @@ void ParticleSystemManager::xfer( Xfer *xfer )
 			if( systemTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "ParticleSystemManager::xfer - Unknown particle system template '%s'\n",
+				DEBUG_CRASH(( "ParticleSystemManager::xfer - Unknown particle system template '%s'",
 											systemName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// create system
 			system = createParticleSystem( systemTemplate, FALSE );
@@ -3430,20 +3401,20 @@ void ParticleSystemManager::xfer( Xfer *xfer )
 			if( system == NULL )
 			{
 
-				DEBUG_CRASH(( "ParticleSystemManager::xfer - Unable to allocate particle system '%s'\n",
+				DEBUG_CRASH(( "ParticleSystemManager::xfer - Unable to allocate particle system '%s'",
 											systemName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// read system data
 			xfer->xferSnapshot( system );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // end particleSystemManager
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3451,7 +3422,7 @@ void ParticleSystemManager::xfer( Xfer *xfer )
 void ParticleSystemManager::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Output particle system statistics to the screen
@@ -3464,7 +3435,7 @@ void ParticleSystemDebugDisplay( DebugDisplayInterface *dd, void *, FILE *fp )
 
 	dd->setCursorPos( 0, 0 );
 	dd->setRightMargin( 2 );
-	
+
 	dd->printf( "Total Particles: %d\n", TheParticleSystemManager->getParticleCount() );
 	dd->printf( "Total Particles (On Screen): %d\n", TheParticleSystemManager->getOnScreenParticleCount());
 	dd->printf( "Total Particle Systems: %d\n", TheParticleSystemManager->getParticleSystemCount() );
diff --git a/Generals/Code/GameEngine/Source/GameClient/System/RayEffect.cpp b/Generals/Code/GameEngine/Source/GameClient/System/RayEffect.cpp
index f1f433459e3..ea98b2fde5f 100644
--- a/Generals/Code/GameEngine/Source/GameClient/System/RayEffect.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/System/RayEffect.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/RayEffect.h"
 #include "GameClient/Drawable.h"
@@ -56,13 +56,13 @@ RayEffectData *RayEffectSystem::findEntry( const Drawable *draw )
 			effectData = &m_effectData[ i ];
 			break;  // exit for i
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	return effectData;
 
-}  // end findEntry
+}
 
 // PUBLIC METHODS /////////////////////////////////////////////////////////////////////////////////
 
@@ -73,14 +73,14 @@ RayEffectSystem::RayEffectSystem( void )
 
 	init();
 
-}  // end RayEffectSystem
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 RayEffectSystem::~RayEffectSystem( void )
 {
 
-}  // end ~RayEffectSystem
+}
 
 //-------------------------------------------------------------------------------------------------
 /** initialize the system */
@@ -96,9 +96,9 @@ void RayEffectSystem::init( void )
 		m_effectData[ i ].startLoc.zero();
 		m_effectData[ i ].endLoc.zero();
 
-	}  // end for i
+	}
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -109,20 +109,20 @@ void RayEffectSystem::reset( void )
 	// nothing dynamic going on here, just initialize it
 	init();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** add a ray effect entry for this drawable */
 //-------------------------------------------------------------------------------------------------
-void RayEffectSystem::addRayEffect( const Drawable *draw, 
-																	  const Coord3D *startLoc, 
+void RayEffectSystem::addRayEffect( const Drawable *draw,
+																	  const Coord3D *startLoc,
 																	  const Coord3D *endLoc )
 {
 	Int i;
 	RayEffectData *effectData = NULL;
 
 	// sanity
-	if( draw == NULL || startLoc == NULL || endLoc == NULL )	
+	if( draw == NULL || startLoc == NULL || endLoc == NULL )
 		return;
 
 	/** @todo this should be more intelligent and should not be limited
@@ -133,15 +133,15 @@ void RayEffectSystem::addRayEffect( const Drawable *draw,
 	for( i = 0; i < MAX_RAY_EFFECTS; i++ )
 	{
 
-		if( m_effectData[ i ].draw == NULL )	
+		if( m_effectData[ i ].draw == NULL )
 		{
 
 			effectData = &m_effectData[ i ];
-			break;  // exit for 
+			break;  // exit for
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// if no free slots we can't do it
 	if( effectData == NULL )
@@ -173,15 +173,15 @@ void RayEffectSystem::deleteRayEffect( const Drawable *draw )
 		// remove the data for this entry
 		effectData->draw = NULL;
 
-	}  // end if
+	}
 
-}  // end deleteRayEffect
+}
 
 //-------------------------------------------------------------------------------------------------
 /** given a drawable, if it is in the ray effect system list retrieve
 	*	the ray effect data for its entry */
 //-------------------------------------------------------------------------------------------------
-void RayEffectSystem::getRayEffectData( const Drawable *draw, 
+void RayEffectSystem::getRayEffectData( const Drawable *draw,
 																			  RayEffectData *effectData )
 {
 	RayEffectData *entry = NULL;
@@ -198,7 +198,7 @@ void RayEffectSystem::getRayEffectData( const Drawable *draw,
 		// data has been found, copy to parameter
 		*effectData = *entry;
 
-	}  // end effectData
+	}
 
-}  // end getRayEffectData
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp b/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp
deleted file mode 100644
index acd9b727fe4..00000000000
--- a/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: TerrainRoads.cpp /////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, December 2001
-// Desc:   Terrain road/bridge descriptions
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLDUES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#define DEFINE_BODYDAMAGETYPE_NAMES
-#include "Common/INI.h"
-#include "GameClient/TerrainRoads.h"
-
-// PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
-TerrainRoadCollection *TheTerrainRoads = NULL;
-
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-UnsignedInt TerrainRoadCollection::m_idCounter = 0;
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-const FieldParse TerrainRoadType::m_terrainRoadFieldParseTable[] = 
-{
-
-	{ "Texture",						INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_texture ) },
-	{ "RoadWidth",					INI::parseReal,								NULL, offsetof( TerrainRoadType, m_roadWidth ) },
-	{ "RoadWidthInTexture",	INI::parseReal,								NULL, offsetof( TerrainRoadType, m_roadWidthInTexture ) },
-
-	{ NULL,									NULL,													NULL, 0 },
-
-};
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-const FieldParse TerrainRoadType::m_terrainBridgeFieldParseTable[] = 
-{
-
-	{ "BridgeScale",									INI::parseReal,								NULL, offsetof( TerrainRoadType, m_bridgeScale ) },
-	{ "ScaffoldObjectName",						INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_scaffoldObjectName ) },
-	{ "ScaffoldSupportObjectName",		INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_scaffoldSupportObjectName ) },
-	{ "RadarColor",										INI::parseRGBColor,						NULL, offsetof( TerrainRoadType, m_radarColor ) },
-
-	{ "TransitionEffectsHeight",			INI::parseReal,								NULL, offsetof( TerrainRoadType, m_transitionEffectsHeight ) },
-	{ "NumFXPerType",									INI::parseInt,								NULL,	offsetof( TerrainRoadType, m_numFXPerType ) },
-
-	{ "BridgeModelName",							INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_bridgeModelName ) },
-	{ "Texture",											INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_texture ) },
-	{ "BridgeModelNameDamaged",				INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_bridgeModelNameDamaged ) },
-	{ "TextureDamaged",								INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_textureDamaged ) },
-	{ "BridgeModelNameReallyDamaged",	INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_bridgeModelNameReallyDamaged ) },
-	{ "TextureReallyDamaged",					INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_textureReallyDamaged ) },
-	{ "BridgeModelNameBroken",				INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_bridgeModelNameBroken ) },
-	{ "TextureBroken",								INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_textureBroken ) },
-
-	{ "TowerObjectNameFromLeft",			INI::parseAsciiString,				NULL,	offsetof( TerrainRoadType, m_towerObjectName[ BRIDGE_TOWER_FROM_LEFT ] ) },
-	{ "TowerObjectNameFromRight",			INI::parseAsciiString,				NULL,	offsetof( TerrainRoadType, m_towerObjectName[ BRIDGE_TOWER_FROM_RIGHT ] ) },
-	{ "TowerObjectNameToLeft",				INI::parseAsciiString,				NULL,	offsetof( TerrainRoadType, m_towerObjectName[ BRIDGE_TOWER_TO_LEFT ] ) },
-	{ "TowerObjectNameToRight",				INI::parseAsciiString,				NULL,	offsetof( TerrainRoadType, m_towerObjectName[ BRIDGE_TOWER_TO_RIGHT ] ) },
-
-	{ "DamagedToSound",								INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_damageToSoundString[ BODY_DAMAGED ] ) },
-	{ "RepairedToSound",							INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_repairedToSoundString[ BODY_DAMAGED ] ) },
-	{ "TransitionToOCL",							parseTransitionToOCL,					NULL,	NULL },
-	{ "TransitionToFX",								parseTransitionToFX,					NULL, NULL },
-
-
-	{ NULL,									NULL,													NULL, 0 },
-
-};
-
-// ------------------------------------------------------------------------------------------------
-/** In the form of 
-	* Label = Transition:<Damage|Repair> ToState:<BODYTYPE> EffectNum:<INT> OCL:<OCL NAME> */
-// ------------------------------------------------------------------------------------------------
-/*static*/ void TerrainRoadType::parseTransitionToOCL( INI *ini, 
-																											 void *instance, 
-																											 void *store, 
-																											 const void *userData )
-{
-	const char *token;
-	TerrainRoadType *theInstance = (TerrainRoadType *)instance;
-
-	// which transition is this
-	Bool damageTransition;
-	token = ini->getNextSubToken( "Transition" );
-	if( stricmp( token, "Damage" ) == 0 )
-		damageTransition = TRUE;
-	else if( stricmp( token, "Repair" ) == 0 )
-		damageTransition = FALSE;
-	else
-	{
-
-		DEBUG_CRASH(( "Expected Damage/Repair transition keyword\n" ));
-		throw INI_INVALID_DATA;
-
-	}  // end else
-
-	// get body damage state
-	token = ini->getNextSubToken( "ToState" );
-	BodyDamageType state = (BodyDamageType)ini->scanIndexList( token, TheBodyDamageTypeNames );
-
-	// get effect num
-	token = ini->getNextSubToken( "EffectNum" );
-	Int effectNum = ini->scanInt( token );
-	
-	// make effectNum zero based
-	--effectNum;
-
-	// sanity check effect num
-	if( effectNum < 0 || effectNum >= MAX_BRIDGE_BODY_FX )
-	{
-
-		DEBUG_CRASH(( "Effect number max on bridge transitions is '%d'\n", MAX_BRIDGE_BODY_FX ));
-		throw INI_INVALID_DATA;
-
-	}  // end if
-
-	// read the string
-	token = ini->getNextSubToken( "OCL" );
-	if( damageTransition )
-		theInstance->friend_setDamageToOCLString( state, effectNum, AsciiString( token ) );
-	else
-		theInstance->friend_setRepairedToOCLString( state, effectNum, AsciiString( token ) );
-	
-}  // end parseTransitionToOCL
-
-// ------------------------------------------------------------------------------------------------
-/** In the form of
-	* Label = Transition:<Damage|Repair> ToState:<BODYTYPE> EffectNum:<INT> FX:<FXLIST NAME> */
-// ------------------------------------------------------------------------------------------------
-/*static*/ void TerrainRoadType::parseTransitionToFX( INI *ini, 
-																											void *instance, 
-																											void *store, 
-																											const void *userData )
-{
-	const char *token;
-	TerrainRoadType *theInstance = (TerrainRoadType *)instance;
-
-	// which transition is this
-	Bool damageTransition;
-	token = ini->getNextSubToken( "Transition" );
-	if( stricmp( token, "Damage" ) == 0 )
-		damageTransition = TRUE;
-	else if( stricmp( token, "Repair" ) == 0 )
-		damageTransition = FALSE;
-	else
-	{
-
-		DEBUG_CRASH(( "Expected Damage/Repair transition keyword\n" ));
-		throw INI_INVALID_DATA;
-
-	}  // end else
-
-	// get body damage state
-	token = ini->getNextSubToken( "ToState" );
-	BodyDamageType state = (BodyDamageType)ini->scanIndexList( token, TheBodyDamageTypeNames );
-
-	// get effect num
-	token = ini->getNextSubToken( "EffectNum" );
-	Int effectNum = ini->scanInt( token );
-	
-	// make effectNum zero based
-	--effectNum;
-
-	// sanity check effect num
-	if( effectNum < 0 || effectNum >= MAX_BRIDGE_BODY_FX )
-	{
-
-		DEBUG_CRASH(( "Effect number max on bridge transitions is '%d'\n", MAX_BRIDGE_BODY_FX ));
-		throw INI_INVALID_DATA;
-
-	}  // end if
-
-	// read the string
-	token = ini->getNextSubToken( "FX" );
-	if( damageTransition )
-		theInstance->friend_setDamageToFXString( state, effectNum, AsciiString( token ) );
-	else
-		theInstance->friend_setRepairedToFXString( state, effectNum, AsciiString( token ) );
-
-}  // end parseTransitionToFX
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType::TerrainRoadType( void )
-{
-
-	m_isBridge = FALSE;
-	m_id = 0;
-	m_next = NULL;
-	m_roadWidth = 0.0f;
-	m_roadWidthInTexture = 0.0f;
-	m_bridgeScale = 1.0f;
-	m_radarColor.red = 0.0f;
-	m_radarColor.green = 0.0f;
-	m_radarColor.blue = 0.0f;
-	m_transitionEffectsHeight = 0.0f;
-	m_numFXPerType = 0;
-
-}  // end TerrainRoadType
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType::~TerrainRoadType( void )
-{
-
-}  // end ~TerrainRoadType
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainRoadCollection::TerrainRoadCollection( void )
-{
-
-	m_roadList = NULL;
-	m_bridgeList = NULL;
-
-	m_idCounter = 1;   ///< MUST start this at 1.
-
-}  // end TerrainRoadCollection
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainRoadCollection::~TerrainRoadCollection( void )
-{
-	TerrainRoadType *temp;
-
-	// delete all roads in the list
-	while( m_roadList )
-	{
-
-		// get next road
-		temp = m_roadList->friend_getNext();
-
-		// delete this road
-		deleteInstance(m_roadList);
-
-		// set the new head of the list
-		m_roadList = temp;
-
-	}  // end while
-
-	// delete all bridges in the list
-	while( m_bridgeList )
-	{
-
-		// get next bridge
-		temp = m_bridgeList->friend_getNext();
-
-		// delete this bridge
-		deleteInstance(m_bridgeList);
-
-		// set the new head of the list
-		m_bridgeList = temp;
-
-	}  // end while
-
-}  // end ~TerrainRoadCollection
-
-//-------------------------------------------------------------------------------------------------
-/** Find road with matching name */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::findRoad( AsciiString name )
-{
-	TerrainRoadType *road;
-
-	for( road = m_roadList; road; road = nextRoad( road ) )
-	{
-
-		if( road->getName() == name )
-			return road;
-
-	}  // end for road
-
-	// not found
-	return NULL;
-
-}  // end findRoad
-
-//-------------------------------------------------------------------------------------------------
-/** Find bridge with matching name */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::findBridge( AsciiString name )
-{
-	TerrainRoadType *bridge;
-
-	for( bridge = m_bridgeList; bridge; bridge = nextBridge( bridge ) )
-	{
-
-		if( bridge->getName() == name )
-			return bridge;
-
-	}  // end for bridge
-
-	// not found
-	return NULL;
-
-}  // end findBridge
-
-//-------------------------------------------------------------------------------------------------
-/** Search the roads AND bridge lists for the name */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::findRoadOrBridge( AsciiString name )
-{
-	TerrainRoadType *road = findRoad( name );
-
-	if( road )
-		return road;
-	else
-		return findBridge( name );
-
-}  // end findRoadOrBridge
-
-//-------------------------------------------------------------------------------------------------
-/** Allocate a new road, set the name, and link to the road list */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::newRoad( AsciiString name )
-{
-	TerrainRoadType *road = newInstance(TerrainRoadType);
-
-	// assign the name
-	road->friend_setName( name );
-
-	// assign unique id
-	road->friend_setID( m_idCounter++ );
-
-	// is not a bridge
-	road->friend_setBridge( FALSE );
-
-	// set defaults from the default road
-	TerrainRoadType *defaultRoad = findRoad( AsciiString( "DefaultRoad" ) );
-	if( defaultRoad )
-	{
-		
-		road->friend_setTexture( defaultRoad->getTexture() );
-		road->friend_setRoadWidth( defaultRoad->getRoadWidth() );
-		road->friend_setRoadWidthInTexture( defaultRoad->getRoadWidthInTexture() );
-
-	}  // end if
-
-	// link to list
-	road->friend_setNext( m_roadList );
-	m_roadList = road;
-
-	// return the new road
-	return road;
-
-}  // end newRoad
-
-//-------------------------------------------------------------------------------------------------
-/** Allocate a new bridge */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::newBridge( AsciiString name )
-{
-	TerrainRoadType *bridge = newInstance(TerrainRoadType);
-
-	// assign the name
-	bridge->friend_setName( name );
-
-	// assign unique id
-	bridge->friend_setID( m_idCounter++ );
-
-	// is a bridge
-	bridge->friend_setBridge( TRUE );
-
-	// set defaults from the default bridge
-	TerrainRoadType *defaultBridge = findBridge( AsciiString( "DefaultBridge" ) );
-	if( defaultBridge )
-	{
-		
-		bridge->friend_setTexture( defaultBridge->getTexture() );
-		bridge->friend_setBridgeScale( defaultBridge->getBridgeScale() );
-		bridge->friend_setBridgeModelName( defaultBridge->getBridgeModel() );
-		bridge->friend_setBridgeModelNameDamaged( defaultBridge->getBridgeModelNameDamaged() );
-		bridge->friend_setBridgeModelNameReallyDamaged( defaultBridge->getBridgeModelNameReallyDamaged() );
-		bridge->friend_setBridgeModelNameBroken( defaultBridge->getBridgeModelNameBroken() );
-		bridge->friend_setTextureDamaged( defaultBridge->getTextureDamaged() );
-		bridge->friend_setTextureReallyDamaged( defaultBridge->getTextureReallyDamaged() );
-		bridge->friend_setTextureBroken( defaultBridge->getTextureBroken() );
-
-		bridge->friend_setTransitionEffectsHeight( defaultBridge->getTransitionEffectsHeight() );
-		bridge->friend_setNumFXPerType( defaultBridge->getNumFXPerType() );
-		for( Int state = BODY_PRISTINE; state < BODYDAMAGETYPE_COUNT; state++ )
-		{
-
-			bridge->friend_setDamageToSoundString( (BodyDamageType)state, bridge->getDamageToSoundString( (BodyDamageType)state ) );
-			bridge->friend_setRepairedToSoundString( (BodyDamageType)state, bridge->getRepairedToSoundString( (BodyDamageType)state ) );
-
-			for( Int i = 0; i < MAX_BRIDGE_BODY_FX; i++ )
-			{
-
-				bridge->friend_setDamageToOCLString( (BodyDamageType)state, i, bridge->getDamageToOCLString( (BodyDamageType)state, i ) );
-				bridge->friend_setDamageToFXString( (BodyDamageType)state, i, bridge->getDamageToOCLString( (BodyDamageType)state, i ) );
-				bridge->friend_setRepairedToOCLString( (BodyDamageType)state, i, bridge->getDamageToOCLString( (BodyDamageType)state, i ) );
-				bridge->friend_setRepairedToFXString( (BodyDamageType)state, i, bridge->getDamageToOCLString( (BodyDamageType)state, i ) );
-
-			}  // end for i
-
-		}  // end for
-
-	}  // end if
-
-	// link to list
-	bridge->friend_setNext( m_bridgeList );
-	m_bridgeList = bridge;
-
-	// return the new bridge
-	return bridge;
-
-}  // end newBridge
-
-//-------------------------------------------------------------------------------------------------
-/** Return next road in list */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::nextRoad( TerrainRoadType *road )
-{
-
-	DEBUG_ASSERTCRASH( road->isBridge() == FALSE, ("nextRoad: road not a road\n") );
-	return road->friend_getNext();
-
-}  // end nextRoad
-
-//-------------------------------------------------------------------------------------------------
-/** Return next bridge in list */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::nextBridge( TerrainRoadType *bridge )
-{
-
-	DEBUG_ASSERTCRASH( bridge->isBridge() == TRUE, ("nextBridge, bridge is not a bridge\n") );
-	return bridge->friend_getNext();
-
-}  // end nextBridge
-
diff --git a/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp b/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp
deleted file mode 100644
index f6bec5e3539..00000000000
--- a/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: TerrainVisual.cpp ////////////////////////////////////////////////////////////////////////
-// Interface for visual representation of terrain on the client
-// Author: Colin Day, April 2001
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#include "Common/Xfer.h"
-#include "GameClient/TerrainVisual.h"
-
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-
-
-// GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
-TerrainVisual *TheTerrainVisual = NULL;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// DEFINITIONS
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainVisual::TerrainVisual()
-{
-
-}  // end TerrainVisual
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainVisual::~TerrainVisual()
-{
-
-}  // end ~TerrainVisual
-
-//-------------------------------------------------------------------------------------------------
-/** initialize the device independent functionality of the visual terrain */
-//-------------------------------------------------------------------------------------------------
-void TerrainVisual::init( void )
-{
-
-}  // end init
-
-//-------------------------------------------------------------------------------------------------
-/** Reset */ 
-//-------------------------------------------------------------------------------------------------
-void TerrainVisual::reset( void )
-{
-
-	m_filenameString.clear();
-
-}  // end reset
-
-//-------------------------------------------------------------------------------------------------
-/** Update */
-//-------------------------------------------------------------------------------------------------
-void TerrainVisual::update( void )
-{
-	// All the interesting stuff happens in load.  jba.
-}  // end update
-
-//-------------------------------------------------------------------------------------------------
-/** device independent implementation for common terrain visual systems */
-//-------------------------------------------------------------------------------------------------
-Bool TerrainVisual::load( AsciiString filename )
-{
-
-	// save the filename
-	if (filename.isEmpty())
-		return FALSE;
-
-	m_filenameString = filename;
-
-	return TRUE;;  // success
-
-}  // end load
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void TerrainVisual::crc( Xfer *xfer )
-{
-
-}  // end CRC
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer
-	* Version Info:
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-void TerrainVisual::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void TerrainVisual::loadPostProcess( void )
-{
-
-}  // end loadPostProcess
diff --git a/Generals/Code/GameEngine/Source/GameClient/VideoPlayer.cpp b/Generals/Code/GameEngine/Source/GameClient/VideoPlayer.cpp
deleted file mode 100644
index 9af5d03a030..00000000000
--- a/Generals/Code/GameEngine/Source/GameClient/VideoPlayer.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    GameClient
-//
-// File name: VideoPlayer.cpp
-//
-// Created:   10/22/01	TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Lib/BaseType.h"
-#include "GameClient/VideoPlayer.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-VideoPlayerInterface *TheVideoPlayer = NULL;
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-//============================================================================
-// VideoBuffer::VideoBuffer
-//============================================================================
-
-VideoBuffer::VideoBuffer( Type format)
-: m_width(0),
-	m_height(0),
-	m_textureWidth(0),
-	m_textureHeight(0),
-	m_format(format),
-	m_pitch(0),
-	m_xPos(0),
-	m_yPos(0)
-{
-
-	if ( m_format >= NUM_TYPES || m_format < 0 )
-	{
-		m_format = TYPE_UNKNOWN;
-	}
-
-}
-
-//============================================================================
-// VideoBuffer::Rect
-//============================================================================
-
-RectClass VideoBuffer::Rect( Real x1, Real y1, Real x2, Real y2 )
-{
-	RectClass rect(0,0,0,0);
-
-	if ( valid() )
-	{
-		rect.Set( 
-						((Real)m_width/(Real)m_textureWidth)*x1, ((Real)m_height/(Real)m_textureHeight)*y1, 
-						((Real)m_width/(Real)m_textureWidth)*x2, ((Real)m_height/(Real)m_textureHeight)*y2
-					);
-	}
-
-	return rect;
-
-}
-
-//============================================================================
-// VideoBuffer::free
-//============================================================================
-
-void	VideoBuffer::free( void )
-{
-	m_width = 0;
-	m_height = 0;
-	m_textureWidth = 0;
-	m_textureHeight = 0;
-}
-
-//============================================================================
-// VideoPlayer::VideoPlayer
-//============================================================================
-
-VideoPlayer::VideoPlayer()
-: m_firstStream(NULL)
-{
-
-}
-
-//============================================================================
-// VideoPlayer::~VideoPlayer
-//============================================================================
-
-VideoPlayer::~VideoPlayer()
-{
-	deinit();
-	// Set the video player to null if its us. (WB requires this.)
-	if (this == TheVideoPlayer) {
-		TheVideoPlayer = NULL;
-	}
-}
-
-//============================================================================
-// VideoPlayer::init
-//============================================================================
-
-void	VideoPlayer::init( void )
-{
-	// Load this here so that WB doesn't have to link to BinkLib, costing us (potentially)
-	// an extra license.
-	INI ini;
-	ini.load( AsciiString( "Data\\INI\\Default\\Video.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\Video.ini" ), INI_LOAD_OVERWRITE, NULL );
-}
-
-//============================================================================
-// VideoPlayer::deinit
-//============================================================================
-
-void VideoPlayer::deinit( void )
-{
-}
-
-//============================================================================
-// VideoPlayer::reset
-//============================================================================
-
-void	VideoPlayer::reset( void )
-{
-	closeAllStreams();
-}
-
-//============================================================================
-// VideoPlayer::update
-//============================================================================
-
-void	VideoPlayer::update( void )
-{
-
-	VideoStreamInterface *stream = firstStream();
-
-	while ( stream )
-	{
-		stream->update();
-		stream = stream->next();
-	}
-
-}
-
-//============================================================================
-// VideoPlayer::loseFocus
-//============================================================================
-
-void	VideoPlayer::loseFocus( void )
-{
-
-}
-
-//============================================================================
-// VideoPlayer::regainFocus
-//============================================================================
-
-void	VideoPlayer::regainFocus( void )
-{
-
-}
-
-//============================================================================
-// VideoPlayer::open
-//============================================================================
-
-VideoStreamInterface*	VideoPlayer::open( AsciiString movieTitle )
-{
-	return NULL;
-}
-
-//============================================================================
-// VideoPlayer::load
-//============================================================================
-
-VideoStreamInterface*	VideoPlayer::load( AsciiString movieTitle )
-{
-	return NULL;
-}
-
-//============================================================================
-// VideoPlayer::firstStream
-//============================================================================
-
-VideoStreamInterface* VideoPlayer::firstStream( void )
-{
-	return m_firstStream;
-}
-
-//============================================================================
-// VideoPlayer::closeAllStreams
-//============================================================================
-
-void	VideoPlayer::closeAllStreams( void )
-{
-	VideoStreamInterface *stream ;
-
-	while ( (stream = firstStream()) != 0 )
-	{
-		stream->close();
-	}
-}
-
-//============================================================================
-// VideoPlayer::remove
-//============================================================================
-
-void VideoPlayer::remove( VideoStream *stream_to_remove )
-{
-	VideoStream *last = NULL;
-	VideoStream *stream = (VideoStream*) firstStream();
-
-	while ( stream != NULL && stream != stream_to_remove )
-	{
-		last = stream;
-		stream = (VideoStream*) stream->next();
-	}
-
-	if ( stream )
-	{
-		if ( last )
-		{
-			last->m_next = stream->m_next;
-		}
-		else
-		{
-			m_firstStream = stream->m_next;
-		}
-	}
-}
-
-//============================================================================
-// VideoPlayer::addVideo
-//============================================================================
-void VideoPlayer::addVideo( Video* videoToAdd )
-{
-	for (VecVideoIt it = mVideosAvailableForPlay.begin(); it != mVideosAvailableForPlay.end(); ++it) {
-		if (it->m_internalName == videoToAdd->m_internalName) {
-			(*it) = (*videoToAdd);
-			return;
-		}
-	}
-
-	// That internal name hasn't been used, so push a new entry on the back
-	mVideosAvailableForPlay.push_back(*videoToAdd);
-}
-
-//============================================================================
-// VideoPlayer::removeVideo
-//============================================================================
-void VideoPlayer::removeVideo( Video* videoToRemove )
-{
-	for (VecVideoIt it = mVideosAvailableForPlay.begin(); it != mVideosAvailableForPlay.end(); ++it) {
-		if (it->m_internalName == videoToRemove->m_internalName) {
-			mVideosAvailableForPlay.erase(it);
-			return;
-		}
-	}
-}
-
-//============================================================================
-// VideoPlayer::getNumVideos
-//============================================================================
-Int VideoPlayer::getNumVideos( void )
-{
-	return mVideosAvailableForPlay.size();
-}
-
-//============================================================================
-// VideoPlayer::removeVideo
-//============================================================================
-const Video* VideoPlayer::getVideo( AsciiString movieTitle )
-{
-	for (VecVideoIt it = mVideosAvailableForPlay.begin(); it != mVideosAvailableForPlay.end(); ++it) {
-		if (it->m_internalName == movieTitle) {
-			return &(*it);
-		}
-	}
-	return NULL;
-}
-
-//============================================================================
-// VideoPlayer::getVideo
-//============================================================================
-const Video* VideoPlayer::getVideo( Int index )
-{
-	if (index < 0 || index >= mVideosAvailableForPlay.size()) {
-		return NULL;
-	}
-
-	return &mVideosAvailableForPlay[index];
-}
-
-//============================================================================
-// VideoStream::VideoStream
-//============================================================================
-
-VideoStream::VideoStream()
-: m_next(NULL),
-	m_player(NULL)
-{
-
-}
-
-//============================================================================
-// VideoStream::~VideoStream
-//============================================================================
-
-VideoStream::~VideoStream()
-{
-
-	if ( m_player )
-	{
-		m_player->remove( this );
-		m_player = NULL;
-	}
-
-}
-
-//============================================================================
-// VideoStream::next
-//============================================================================
-
-VideoStreamInterface* VideoStream::next( void )
-{
-	return m_next;
-}
-
-//============================================================================
-// VideoStream::update
-//============================================================================
-
-void VideoStream::update( void )
-{
-}
-
-//============================================================================
-// VideoStream::close
-//============================================================================
-
-void VideoStream::close( void )
-{
-	delete this;
-}
-
-//============================================================================
-// VideoStream::isFrameReady
-//============================================================================
-
-Bool VideoStream::isFrameReady( void )
-{
-	return TRUE;
-}
-
-//============================================================================
-// VideoStream::frameDecompress
-//============================================================================
-
-void VideoStream::frameDecompress( void )
-{
-
-}
-
-//============================================================================
-// VideoStream::frameRender
-//============================================================================
-
-void VideoStream::frameRender( VideoBuffer *buffer )
-{
-
-}
-
-//============================================================================
-// VideoStream::frameNext
-//============================================================================
-
-void VideoStream::frameNext( void )
-{
-
-}
-
-//============================================================================
-// VideoStream::frameIndex
-//============================================================================
-
-Int VideoStream::frameIndex( void )
-{
-	return 0;
-}
-
-//============================================================================
-// VideoStream::totalFrames
-//============================================================================
-
-Int	VideoStream::frameCount( void )
-{
-	return 0;
-}
-
-//============================================================================
-// VideoStream::frameGoto
-//============================================================================
-
-void VideoStream::frameGoto( Int index )
-{
-
-}
-
-//============================================================================
-// VideoStream::height
-//============================================================================
-
-Int		VideoStream::height( void )
-{
-	return 0;
-}
-
-//============================================================================
-// VideoStream::width
-//============================================================================
-
-Int		VideoStream::width( void )
-{
-	return 0;
-}
-
-
-const FieldParse VideoPlayer::m_videoFieldParseTable[] = 
-{
-	{ "Filename",								INI::parseAsciiString,							NULL, offsetof( Video, m_filename) },
-	{ "Comment",								INI::parseAsciiString,							NULL, offsetof( Video, m_commentForWB) },
-	{ NULL,											NULL,																NULL, 0 },
-};
-
diff --git a/Generals/Code/GameEngine/Source/GameClient/VideoStream.cpp b/Generals/Code/GameEngine/Source/GameClient/VideoStream.cpp
deleted file mode 100644
index 3058a42fbdf..00000000000
--- a/Generals/Code/GameEngine/Source/GameClient/VideoStream.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    GameClient
-//
-// File name: VideoStream.cpp
-//
-// Created:   10/22/01	TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Lib/BaseType.h"
-#include "GameClient/VideoPlayer.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-
diff --git a/Generals/Code/GameEngine/Source/GameClient/View.cpp b/Generals/Code/GameEngine/Source/GameClient/View.cpp
deleted file mode 100644
index ea453c9792c..00000000000
--- a/Generals/Code/GameEngine/Source/GameClient/View.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// View.cpp ///////////////////////////////////////////////////////////////////
-// A "view", or window, into the World
-// Author: Michael S. Booth, February 2001
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameEngine.h"
-#include "Common/Xfer.h"
-#include "GameClient/View.h"
-#include "GameClient/Drawable.h"
-
-UnsignedInt View::m_idNext = 1;
-
-// the tactical view singleton
-View *TheTacticalView = NULL;
-
-
-View::View( void )
-{
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
-	m_currentHeightAboveGround = 0.0f;
-	m_defaultAngle = 0.0f;
-	m_defaultPitchAngle = 0.0f;
-	m_heightAboveGround = 0.0f;
-	m_lockDist = 0.0f;
-	m_maxHeightAboveGround = 0.0f;
-	m_maxZoom = 0.0f;
-	m_minHeightAboveGround = 0.0f;
-	m_minZoom = 0.0f;
-	m_next = NULL;
-	m_okToAdjustHeight = TRUE;
-	m_originX = 0;
-	m_originY = 0;
-	m_snapImmediate = FALSE;
-	m_terrainHeightUnderCamera = 0.0f;
-	m_zoom = 0.0f;
-	//
-	m_pos.x = 0;
-	m_pos.y = 0;
-	m_width = 0;
-	m_height = 0;
-	m_angle = 0.0f;
-	m_pitchAngle = 0.0f;
-	m_cameraLock = INVALID_ID;
-	m_cameraLockDrawable = NULL;
-	m_zoomLimited = TRUE;
-
-	// create unique view ID
-	m_id = m_idNext++;
-
-	// default field of view
-	m_FOV = 50.0f * PI/180.0f;
-	
-	m_mouseLocked = FALSE;
-	
-	m_guardBandBias.x = 0.0f;
-	m_guardBandBias.y = 0.0f;
-}
-
-View::~View()
-{
-}
-
-void View::init( void )
-{
-	m_width = DEFAULT_VIEW_WIDTH;
-	m_height = DEFAULT_VIEW_HEIGHT;
-	m_originX = DEFAULT_VIEW_ORIGIN_X;
-	m_originY = DEFAULT_VIEW_ORIGIN_Y;
-	m_pos.x = 0;
-	m_pos.y = 0;
-	m_angle = 0.0f;
-	m_cameraLock = INVALID_ID;
-	m_cameraLockDrawable = NULL;
-	m_zoomLimited = TRUE;
-	
-	m_maxZoom = 1.3f;
-	m_minZoom = 0.2f;
-	m_zoom = m_maxZoom;
-	m_maxHeightAboveGround = TheGlobalData->m_maxCameraHeight;
-	m_minHeightAboveGround = TheGlobalData->m_minCameraHeight;
-	m_okToAdjustHeight = FALSE;
-
-	m_defaultAngle = 0.0f;
-	m_defaultPitchAngle = 0.0f;
-}
-
-void View::reset( void )
-{
-	// Only fixing the reported bug.  Who knows what side effects resetting the rest could have.
-	m_zoomLimited = TRUE;
-}
-
-/**
- * Prepend this view to the given list, return the new list.
- */
-View *View::prependViewToList( View *list )
-{
-	m_next = list;
-	return this;
-}
-
-void View::zoomIn( void )
-{
-	setHeightAboveGround(getHeightAboveGround() - 10.0f);
-}
-
-void View::zoomOut( void )
-{
-	setHeightAboveGround(getHeightAboveGround() + 10.0f);
-}
-
-/**
- * Center the view on the given coordinate.
- */
-void View::lookAt( const Coord3D *o ) 
-{ 
-
-	/// @todo this needs to be changed to be 3D, this is still old 2D stuff
-	Coord3D pos = *getPosition();
-	pos.x = o->x - m_width * 0.5f; 
-	pos.y = o->y - m_height * 0.5f; 
-	setPosition(&pos);
-}
-
-/**
- * Shift the view by the given delta.
- */
-void View::scrollBy( Coord2D *delta ) 
-{ 
-	// update view's world position
-	m_pos.x += delta->x;
-	m_pos.y += delta->y;
-}
-
-/**
- * Rotate the view around the up axis by the given angle.
- */
-void View::setAngle( Real angle )
-{
-	m_angle = angle; 
-}
-
-/**
- * Rotate the view around the horizontal (X) axis to the given angle.
- */
-void View::setPitch( Real angle )
-{
-	m_pitchAngle = angle;
-
-	Real limit = PI/5.0f;
-
-	if (m_pitchAngle < -limit)
-		m_pitchAngle = -limit;
-	else if (m_pitchAngle > limit)
-		m_pitchAngle = limit;
-}
-
-/**
- * Set the view angle back to default
- */
-void View::setAngleAndPitchToDefault( void )
-{ 
-	m_angle = m_defaultAngle;
-	m_pitchAngle = m_defaultPitchAngle;
-}
-
-/**
- * write the view's current location in to the view location object
- */
-void View::getLocation( ViewLocation *location )
-{
-
-	const Coord3D *pos = getPosition();
-	location->init( pos->x, pos->y, pos->z, getAngle(), getPitch(), getZoom() );
-
-}
-
-
-/**
- * set the view's current location from to the view location object
- */
-void View::setLocation( const ViewLocation *location )
-{
-	if ( location->m_valid )
-	{
-		setPosition(&location->m_pos);
-		setAngle(location->m_angle);
-		setPitch(location->m_pitch);
-		setZoom(location->m_zoom);
-		forceRedraw();
-	}
-
-}
-
-//-------------------------------------------------------------------------------------------------
-/** project the 4 corners of this view into the world and return each point as a parameter,
-		the world points are at the requested Z */
-//-------------------------------------------------------------------------------------------------
-void View::getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
-																					Coord3D *bottomLeft, Coord3D *bottomRight,
-																					Real z )
-{
-	ICoord2D screenTopLeft, screenTopRight, screenBottomLeft, screenBottomRight;
-	ICoord2D origin;
-	Int viewWidth = getWidth();
-	Int viewHeight = getHeight();
-
-	// sanity
-	if( topLeft == NULL || topRight == NULL || bottomLeft == NULL || bottomRight == NULL )
-		return;
-
-	// setup the screen coords for the 4 corners of the viewable display
-	getOrigin( &origin.x, &origin.y );
-	screenTopLeft.x     = origin.x;								// upper left
-	screenTopLeft.y     = origin.y;								// upper left
-	screenTopRight.x    = origin.x + viewWidth;		// upper right
-	screenTopRight.y    = origin.y;								// upper right
-	screenBottomLeft.x  = origin.x + viewWidth;		// lower right
-	screenBottomLeft.y  = origin.y + viewHeight;  // lower right
-	screenBottomRight.x = origin.x;								// lower left
-	screenBottomRight.y = origin.y + viewHeight;	// lower left
-
-	// project
-	screenToWorldAtZ( &screenTopLeft, topLeft, z );
-	screenToWorldAtZ( &screenTopRight, topRight, z );
-	screenToWorldAtZ( &screenBottomLeft, bottomLeft, z );
-	screenToWorldAtZ( &screenBottomRight, bottomRight, z );
-
-}  // end getScreenCornerWorldPointsAtZ
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer method for a view */
-// ------------------------------------------------------------------------------------------------
-void View::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// camera angle
-	Real angle = getAngle();
-	xfer->xferReal( &angle );
-	setAngle( angle );
-
-	// view position
-	Coord3D viewPos;
-	getPosition( &viewPos );
-	xfer->xferReal( &viewPos.x );
-	xfer->xferReal( &viewPos.y );
-	xfer->xferReal( &viewPos.z );
-	lookAt( &viewPos );
-
-}  // end xfer
diff --git a/Generals/Code/GameEngine/Source/GameClient/Water.cpp b/Generals/Code/GameEngine/Source/GameClient/Water.cpp
deleted file mode 100644
index d0ae1910fb0..00000000000
--- a/Generals/Code/GameEngine/Source/GameClient/Water.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Water.cpp ////////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, December 2001
-// Desc:   Map water settings
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/Water.h"
-#include "Common/INI.h"
-
-// GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
-WaterSetting WaterSettings[ TIME_OF_DAY_COUNT ];
-OVERRIDE<WaterTransparencySetting> TheWaterTransparency = NULL;
-
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-const FieldParse WaterSetting::m_waterSettingFieldParseTable[] = 
-{
-
-	{ "SkyTexture",									INI::parseAsciiString,			NULL, offsetof( WaterSetting, m_skyTextureFile ) },
-	{ "WaterTexture",								INI::parseAsciiString,			NULL, offsetof( WaterSetting, m_waterTextureFile ) },
-  { "Vertex00Color",							INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_vertex00Diffuse ) },
-	{ "Vertex10Color",							INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_vertex10Diffuse ) },
-	{ "Vertex01Color",							INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_vertex01Diffuse ) },
-  { "Vertex11Color",							INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_vertex11Diffuse ) },
-	{ "DiffuseColor",								INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_waterDiffuseColor ) },
-  { "TransparentDiffuseColor",		INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_transparentWaterDiffuse ) },
-  { "UScrollPerMS",								INI::parseReal,							NULL, offsetof( WaterSetting, m_uScrollPerMs ) },
-  { "VScrollPerMS",								INI::parseReal,							NULL, offsetof( WaterSetting, m_vScrollPerMs ) },
-	{ "SkyTexelsPerUnit",						INI::parseReal,							NULL, offsetof( WaterSetting, m_skyTexelsPerUnit ) },
-  { "WaterRepeatCount",						INI::parseInt,							NULL, offsetof( WaterSetting, m_waterRepeatCount ) },
-
-	{ NULL,													NULL,												NULL, 0 },
-
-};
-
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-const FieldParse WaterTransparencySetting::m_waterTransparencySettingFieldParseTable[] = 
-{
-
-	{ "TransparentWaterDepth",			INI::parseReal,				NULL,			offsetof( WaterTransparencySetting, m_transparentWaterDepth ) },
-	{ "TransparentWaterMinOpacity",	INI::parseReal,				NULL,			offsetof( WaterTransparencySetting, m_minWaterOpacity ) },
-	{ "StandingWaterColor",	INI::parseRGBColor,			NULL,			offsetof( WaterTransparencySetting, m_standingWaterColor ) },
-	{ "StandingWaterTexture",INI::parseAsciiString,		NULL,			offsetof( WaterTransparencySetting, m_standingWaterTexture ) },
-	{ "AdditiveBlending", INI::parseBool,				NULL,			offsetof( WaterTransparencySetting, m_additiveBlend) },
-	{ "RadarWaterColor", INI::parseRGBColor,			NULL,			offsetof( WaterTransparencySetting, m_radarColor) },
-	{ "SkyboxTextureN",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureN ) },
-	{ "SkyboxTextureE",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureE ) },
-	{ "SkyboxTextureS",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureS ) },
-	{ "SkyboxTextureW",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureW ) },
-	{ "SkyboxTextureT",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureT ) },
-
-
-	{ 0, 0, 0, 0 },
-};
-
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-WaterSetting::WaterSetting( void )
-{
-
-	m_skyTextureFile.clear();
-	m_waterTextureFile.clear();
-	m_waterRepeatCount = 0;
-	m_skyTexelsPerUnit = 0.0f;
-
-	m_vertex00Diffuse.red = 0;
-	m_vertex00Diffuse.green = 0; 
-	m_vertex00Diffuse.blue = 0; 
-	m_vertex00Diffuse.alpha = 0;
-
-	m_vertex01Diffuse.red = 0; 
-	m_vertex01Diffuse.green = 0; 
-	m_vertex01Diffuse.blue = 0; 
-	m_vertex01Diffuse.alpha = 0;
-
-	m_vertex10Diffuse.red = 0; 
-	m_vertex10Diffuse.green = 0; 
-	m_vertex10Diffuse.blue = 0; 
-	m_vertex10Diffuse.alpha = 0;
-
-	m_vertex11Diffuse.red = 0; 
-	m_vertex11Diffuse.green = 0; 
-	m_vertex11Diffuse.blue = 0; 
-	m_vertex11Diffuse.alpha = 0;
-
-	m_waterDiffuseColor.red = 0;
-	m_waterDiffuseColor.green = 0;
-	m_waterDiffuseColor.blue = 0;
-	m_waterDiffuseColor.alpha = 0;
-
-	m_transparentWaterDiffuse.red = 0;
-	m_transparentWaterDiffuse.green = 0;
-	m_transparentWaterDiffuse.blue = 0;
-	m_transparentWaterDiffuse.alpha = 0;
-
-	m_uScrollPerMs = 0.0f;
-	m_vScrollPerMs = 0.0f;
-
-}  // end WaterSetting
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-WaterSetting::~WaterSetting( void )
-{
-
-}  // end WaterSetting
-
-
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp
index 987fe75ea11..46ee5001a09 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp
@@ -25,7 +25,7 @@
 // AI.cpp
 // The Artificial Intelligence system
 // Author: Michael S. Booth, November 2000
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/CRCDebug.h"
 #include "Common/GameState.h"
@@ -47,29 +47,23 @@
 
 extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE CLASS ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-void TAiData::addSideInfo(AISideInfo *infoToAdd) 
+void TAiData::addSideInfo(AISideInfo *infoToAdd)
 {
 	infoToAdd->m_next = m_sideInfo;
 	m_sideInfo = infoToAdd;
 }
 
-void TAiData::addFactionBuildList(AISideBuildList *buildList) 
+void TAiData::addFactionBuildList(AISideBuildList *buildList)
 {
 
 	AISideBuildList *info = m_sideBuildLists;
 	while (info) {
 		if (buildList->m_side == info->m_side) {
-			if (info->m_buildList)
-				deleteInstance(info->m_buildList);
+			deleteInstance(info->m_buildList);
 			info->m_buildList = buildList->m_buildList;
 			buildList->m_buildList = NULL;
 			buildList->m_next = NULL;
@@ -86,7 +80,7 @@ TAiData::~TAiData()
 {
 	AISideInfo *info = m_sideInfo;
 	m_sideInfo = NULL;
-	while (info) { 
+	while (info) {
 		AISideInfo *cur = info;
 		info = info->m_next;
 		deleteInstance(cur);
@@ -94,7 +88,7 @@ TAiData::~TAiData()
 
 	AISideBuildList *build = m_sideBuildLists;
 	m_sideBuildLists = NULL;
-	while (build) { 
+	while (build) {
 		AISideBuildList *cur = build;
 		build = build->m_next;
 		deleteInstance(cur);
@@ -105,18 +99,16 @@ TAiData::~TAiData()
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE CLASS ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-AISideBuildList::AISideBuildList( AsciiString side ) : 
-	m_side(side), 
-	m_buildList(NULL), 
+AISideBuildList::AISideBuildList( AsciiString side ) :
+	m_side(side),
+	m_buildList(NULL),
 	m_next(NULL)
 {
 }
 
 AISideBuildList::~AISideBuildList()
 {
-	if (m_buildList) {
-		deleteInstance(m_buildList); // note - deletes all in the list.
-	}
+	deleteInstance(m_buildList); // note - deletes all in the list.
 	m_buildList = NULL;
 }
 
@@ -139,9 +131,9 @@ void AISideBuildList::addInfo(BuildListInfo *info)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-static const FieldParse TheAIFieldParseTable[] = 
+static const FieldParse TheAIFieldParseTable[] =
 {
-																	 
+
 	{ "StructureSeconds",				INI::parseReal,NULL,		offsetof( TAiData, m_structureSeconds ) },
 	{ "TeamSeconds",						INI::parseReal,NULL,		offsetof( TAiData, m_teamSeconds ) },
 	{ "Wealthy",								INI::parseInt,NULL,			offsetof( TAiData, m_resourcesWealthy ) },
@@ -173,7 +165,7 @@ static const FieldParse TheAIFieldParseTable[] =
 	{ "AttackUsesLineOfSight",	INI::parseBool,NULL,		offsetof( TAiData, m_attackUsesLineOfSight ) },
 	{ "AttackIgnoreInsignificantBuildings",	INI::parseBool,NULL,		offsetof( TAiData, m_attackIgnoreInsignificantBuildings ) },
 
-	
+
 	{ "AttackPriorityDistanceModifier", INI::parseReal,NULL, offsetof( TAiData, m_attackPriorityDistanceModifier) },
  	{ "MaxRecruitRadius",				INI::parseReal,NULL,		offsetof( TAiData, m_maxRecruitDistance ) },
 
@@ -202,7 +194,7 @@ static const FieldParse TheAIFieldParseTable[] =
 
 
 
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
+	{ NULL,					NULL,						NULL,						0 }
 
 };
 
@@ -211,7 +203,7 @@ void AI::parseSideInfo(INI *ini, void *instance, void* /*store*/, const void* /*
 	const char* c = ini->getNextToken();
 	AsciiString side(c);
 
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "ResourceGatherersEasy",				INI::parseInt,						NULL, offsetof( AISideInfo, m_easy ) },
 			{ "ResourceGatherersNormal",			INI::parseInt,						NULL, offsetof( AISideInfo, m_normal ) },
@@ -222,7 +214,7 @@ void AI::parseSideInfo(INI *ini, void *instance, void* /*store*/, const void* /*
 			{ "SkillSet3",										AI::parseSkillSet,				NULL, offsetof( AISideInfo, m_skillSet3 ) },
 			{ "SkillSet4",										AI::parseSkillSet,				NULL, offsetof( AISideInfo, m_skillSet4 ) },
 			{ "SkillSet5",										AI::parseSkillSet,				NULL, offsetof( AISideInfo, m_skillSet5 ) },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
 	AISideInfo *resourceInfo = ((TAiData*)instance)->m_sideInfo;
@@ -232,7 +224,7 @@ void AI::parseSideInfo(INI *ini, void *instance, void* /*store*/, const void* /*
 		}
 		resourceInfo = resourceInfo->m_next;
 	}
-	if (resourceInfo==NULL) 
+	if (resourceInfo==NULL)
 	{
 		resourceInfo = newInstance(AISideInfo);
 		((TAiData*)instance)->addSideInfo(resourceInfo);
@@ -244,10 +236,10 @@ void AI::parseSideInfo(INI *ini, void *instance, void* /*store*/, const void* /*
 
 void AI::parseSkillSet(INI *ini, void *instance, void* store, const void* /*userData*/)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Science",											AI::parseScience,					NULL, NULL },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
 	TSkillSet *skillset = ((TSkillSet*)store);
@@ -270,7 +262,7 @@ void AI::parseScience(INI *ini, void *instance, void* /*store*/, const void* /*u
 	ScienceType science = skillset->m_skills[skillset->m_numSkills];
 	if (science != SCIENCE_INVALID) {
 		if (TheScienceStore->getSciencePurchaseCost(science)==0) {
-			DEBUG_CRASH(("Science %s is not purchaseable, can't be bought.", 
+			DEBUG_CRASH(("Science %s is not purchaseable, can't be bought.",
 				TheScienceStore->getInternalNameForScience(science).str()));
 			return;
 		}
@@ -283,13 +275,13 @@ void AI::parseSkirmishBuildList(INI *ini, void *instance, void* /*store*/, const
 	const char* c = ini->getNextToken();
 	AsciiString faction(c);
 
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Structure",			BuildListInfo::parseStructure,			NULL, NULL },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
-	AISideBuildList *build = newInstance(AISideBuildList)(faction);	
+	AISideBuildList *build = newInstance(AISideBuildList)(faction);
 	ini->initFromINI(build, myFieldParse);
 	((TAiData*)instance)->addFactionBuildList(build);
 
@@ -330,7 +322,9 @@ void AI::reset( void )
 		m_aiData = m_aiData->m_next;
 		delete cur;
 	}
-	while (m_groupList.size())
+
+#if RETAIL_COMPATIBLE_AIGROUP
+	while (!m_groupList.empty())
 	{
 		AIGroup *groupToRemove = m_groupList.front();
 		if (groupToRemove)
@@ -342,6 +336,12 @@ void AI::reset( void )
 			m_groupList.pop_front(); // NULL group, just kill from list.  Shouldn't really happen, but just in case.
 		}
 	}
+#else
+	DEBUG_ASSERTCRASH(m_groupList.empty(), ("AI::m_groupList is expected empty already"));
+
+	m_groupList.clear(); // Clear just in case...
+#endif
+
 	m_nextGroupID = 0;
 	m_nextFormationID = NO_FORMATION_ID;
 	getNextFormationID(); // increment once past NO_FORMATION_ID.  jba.
@@ -367,11 +367,10 @@ void AI::update( void )
  */
 AI::~AI()
 {
-	if (m_pathfinder) {
-		delete m_pathfinder;
-	}
+	delete m_pathfinder;
 	m_pathfinder = NULL;
-	while (m_aiData) 
+
+	while (m_aiData)
 	{
 		TAiData *cur = m_aiData;
 		m_aiData = m_aiData->m_next;
@@ -393,7 +392,7 @@ void AI::newOverride(void)
 		newInfo->m_next = NULL;
 		addSideInfo(newInfo);
 		info = info->m_next;
-	}									
+	}
 	m_aiData->m_sideBuildLists = NULL;
 	AISideBuildList *build = cur->m_sideBuildLists;
 	while (build) {
@@ -420,18 +419,17 @@ void AI::parseAiDataDefinition( INI* ini )
 	if( TheAI )
 	{
 
-		// 
+		//
 		// if the type of loading we're doing creates override data, we need to
 		// be loading into a new override item
 		//
 		if( ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES )
 			TheAI->newOverride();
 
-	}  // end if
-
-	// parse the ini weapon definition
-	ini->initFromINI( TheAI->m_aiData, TheAIFieldParseTable );
+		// parse the ini weapon definition
+		ini->initFromINI( TheAI->m_aiData, TheAIFieldParseTable );
 
+	}
 }
 
 
@@ -441,14 +439,22 @@ void AI::parseAiDataDefinition( INI* ini )
 /**
  * Create a new AI Group
  */
-AIGroup *AI::createGroup( void )
+AIGroupPtr AI::createGroup( void )
 {
 	// create a new instance
+#if RETAIL_COMPATIBLE_AIGROUP
 	AIGroup *group = newInstance(AIGroup);
+#else
+	AIGroupPtr group = AIGroupPtr::Create_NoAddRef(newInstance(AIGroup));
+#endif
 
 	// add it to the list
-//	DEBUG_LOG(("***AIGROUP %x is being added to m_groupList.\n", group ));
+//	DEBUG_LOG(("***AIGROUP %x is being added to m_groupList.", group ));
+#if RETAIL_COMPATIBLE_AIGROUP
 	m_groupList.push_back( group );
+#else
+	m_groupList.push_back( group.Peek() );
+#endif
 
 	return group;
 }
@@ -467,7 +473,7 @@ void AI::destroyGroup( AIGroup *group )
 	DEBUG_ASSERTCRASH(group != NULL, ("A NULL group made its way into the AIGroup list.. jkmcd"));
 
 	// remove it
-//	DEBUG_LOG(("***AIGROUP %x is being removed from m_groupList.\n", group ));
+//	DEBUG_LOG(("***AIGROUP %x is being removed from m_groupList.", group ));
 	m_groupList.erase( i );
 
 	// destroy group
@@ -524,7 +530,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter
 		return true;
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterLiveMapEnemies"; }
 #endif
 };
@@ -554,13 +560,13 @@ class PartitionFilterWithinAttackRange : public PartitionFilter
 		return false;
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterWithinAttackRange"; }
 #endif
 };
 
 
-typedef struct 
+typedef struct
 {
 	Int priority;
 	const AttackPriorityInfo *info;
@@ -581,7 +587,7 @@ static void priorityFunc(Object *obj, void *userData)
 /**
  * Return the closest enemy, according to the qualifiers.
  */
-Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifiers, 
+Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifiers,
 														 const AttackPriorityInfo *info, PartitionFilter *optionalFilter)
 {
 
@@ -620,7 +626,7 @@ Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifie
 
 	// (optional) only stuff that is significant
 	PartitionFilterInsignificantBuildings filterInsignificant(true, false);
-	
+
 	// (optional) only stuff clear of fog
 	PartitionFilterFreeOfFog filterFogged(me->getControllingPlayer()->getPlayerIndex());
 
@@ -640,7 +646,7 @@ Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifie
 	// -- filterStealth is BY FAR the least common to be useful, so it goes last.
 	// GS Fog check used to be inside can attack, so it feels right to be right after it
 
-	filters[numFilters++] = &filterObvious;	
+	filters[numFilters++] = &filterObvious;
 
 	if( !(qualifiers & ATTACK_BUILDINGS) )
 		filters[numFilters++] = &filterBldgs;
@@ -662,14 +668,14 @@ Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifie
 
 	filters[numFilters++] = &filterStealth;
 
-	if (optionalFilter) 
+	if (optionalFilter)
 	{
 		filters[numFilters++] = optionalFilter;
 	}
 
 	filters[numFilters] = NULL;
 
-	if (info == NULL || info == TheScriptEngine->getDefaultAttackInfo()) 
+	if (info == NULL || info == TheScriptEngine->getDefaultAttackInfo())
 	{
 		// No additional attack info, so just return the closest one.
 		Object* o = ThePartitionManager->getClosestObject( me, range, FROM_BOUNDINGSPHERE_2D, filters );
@@ -681,10 +687,10 @@ Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifie
 	Int			actualPriority=0;
 	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(me, range, FROM_BOUNDINGSPHERE_2D, filters, ITER_SORTED_NEAR_TO_FAR);
 	MemoryPoolObjectHolder holder(iter);
-	for (Object *theEnemy = iter->first(); theEnemy; theEnemy = iter->next()) 
+	for (Object *theEnemy = iter->first(); theEnemy; theEnemy = iter->next())
 	{
 		Int curPriority = info->getPriority(theEnemy->getTemplate());
-		if (curPriority == 0) 
+		if (curPriority == 0)
 			continue; // don't attack 0 priority targets.
 
 		/* check for garrisoned buildings/vehicles & see if a higher priority unit is inside. */
@@ -701,25 +707,25 @@ Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifie
 
 		Real distSqr = ThePartitionManager->getDistanceSquared(me, theEnemy, FROM_BOUNDINGSPHERE_2D);
 		Real dist = sqrt(distSqr);
-		Int modifier = dist/TheAI->getAiData()->m_attackPriorityDistanceModifier;
+		Int modifier = dist/getAiData()->m_attackPriorityDistanceModifier;
 		Int modPriority = curPriority-modifier;
-		if (modPriority < 1) 
+		if (modPriority < 1)
 			modPriority = 1;
-		if (modPriority > effectivePriority) 
+		if (modPriority > effectivePriority)
 		{
 			effectivePriority = modPriority;
 			actualPriority = curPriority;
 			bestEnemy = theEnemy;
 		}
-		if (modPriority == effectivePriority && curPriority > actualPriority) 
+		if (modPriority == effectivePriority && curPriority > actualPriority)
 		{
 			effectivePriority = modPriority;
 			actualPriority = curPriority;
 			bestEnemy = theEnemy;
 		}
-	}	
+	}
 	if (bestEnemy) {
-		//DEBUG_LOG(("Find closest found %s, hunter %s, info %s\n", bestEnemy->getTemplate()->getName().str(), 
+		//DEBUG_LOG(("Find closest found %s, hunter %s, info %s", bestEnemy->getTemplate()->getName().str(),
 		//	me->getTemplate()->getName().str(), info->getName().str()));
 	}
 	return bestEnemy;
@@ -784,7 +790,7 @@ Object *AI::findClosestRepulsor( const Object *me, Real range)
 
 	// and only stuff that isn't stealthed (and not detected)
 	// (note that stealthed allies aren't hidden from us, but that's ok. jba.)
-	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ), 
+	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ),
 																										 MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_DETECTED ) );
 
 	PartitionFilter *filters[16];
@@ -804,26 +810,26 @@ Real AI::getAdjustedVisionRangeForObject(const Object *object, Int factorsToCons
 	const AIUpdateInterface *ai = object->getAI();
 	const TAiData *aiData = TheAI->getAiData();
 
-	if (!ai) 
+	if (!ai)
 	{
 		DEBUG_CRASH(("Unit without AI ('%s') calling AI::getAdjustedVisionRangeForObject. Notify jkmcd.", object->getTemplate()->getName().str()));
 		return 0.0f;
 	}
-	
+
 	UnsignedInt moodMatrixVal = ai->getMoodMatrixValue();
 
-	if (factorsToConsider & AI_VISIONFACTOR_OWNERTYPE) 
+	if (factorsToConsider & AI_VISIONFACTOR_OWNERTYPE)
 	{
 		Bool playerIsHuman = (moodMatrixVal & MM_Controller_Player) != 0;
 
-		if (playerIsHuman) 
+		if (playerIsHuman)
 		{
-			if (factorsToConsider & AI_VISIONFACTOR_GUARDINNER) 
+			if (factorsToConsider & AI_VISIONFACTOR_GUARDINNER)
 				originalRange *= aiData->m_guardInnerModifierHuman;
 			else
 				originalRange *= aiData->m_guardOuterModifierHuman;
-		} 
-		else 
+		}
+		else
 		{
 			if (factorsToConsider & AI_VISIONFACTOR_GUARDINNER)
 				originalRange *= aiData->m_guardInnerModifierAI;
@@ -832,13 +838,13 @@ Real AI::getAdjustedVisionRangeForObject(const Object *object, Int factorsToCons
 		}
 	}
 
-	if (object->getContainedBy() != NULL) 
+	if (object->getContainedBy() != NULL)
 	{
 		originalRange = object->getLargestWeaponRange();
-	} 
-	else 
+	}
+	else
 	{
-		if ((factorsToConsider & AI_VISIONFACTOR_MOOD) && ((moodMatrixVal & MM_Controller_Player) == 0) ) 
+		if ((factorsToConsider & AI_VISIONFACTOR_MOOD) && ((moodMatrixVal & MM_Controller_Player) == 0) )
 		{
 			switch(moodMatrixVal & MM_Mood_Bitmask)
 			{
@@ -846,10 +852,10 @@ Real AI::getAdjustedVisionRangeForObject(const Object *object, Int factorsToCons
 					return 0.0f;
 
 				case MM_Mood_Passive:
-				case MM_Mood_Normal: 
+				case MM_Mood_Normal:
 					break;
-				
-				case MM_Mood_Alert: 
+
+				case MM_Mood_Alert:
 					originalRange *= TheAI->getAiData()->m_alertRangeModifier;
 					break;
 
@@ -860,31 +866,31 @@ Real AI::getAdjustedVisionRangeForObject(const Object *object, Int factorsToCons
 		}
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_debugVisibility) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugVisibility)
 	{
 		// ICK. This really nasty statement is used so that we only initialize this color once.
 		// It should be exactly double the intensity of its targettable brother.
 		static RGBColor theAdjustedVisionColor = {
-			(TheGlobalData->m_debugVisibilityTargettableColor.red * 2 <= 1.0f ? 
+			(TheGlobalData->m_debugVisibilityTargettableColor.red * 2 <= 1.0f ?
 				TheGlobalData->m_debugVisibilityTargettableColor.red * 2 :
 				1.0f),
-			(TheGlobalData->m_debugVisibilityTargettableColor.green * 2 <= 1.0f ? 
+			(TheGlobalData->m_debugVisibilityTargettableColor.green * 2 <= 1.0f ?
 				TheGlobalData->m_debugVisibilityTargettableColor.green * 2 :
 				1.0f),
-			(TheGlobalData->m_debugVisibilityTargettableColor.blue * 2 <= 1.0f ? 
+			(TheGlobalData->m_debugVisibilityTargettableColor.blue * 2 <= 1.0f ?
 				TheGlobalData->m_debugVisibilityTargettableColor.blue * 2 :
 				1.0f)
 		};
 
 		Vector3 pos(originalRange, 0, 0);
-		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i) 
+		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i)
 		{
 			pos.Rotate_Z(1.0f * i / TheGlobalData->m_debugVisibilityTileCount * 2 * PI);
 			Coord3D coord = { pos.X + object->getPosition()->x, pos.Y + object->getPosition()->y, pos.Z + object->getPosition()->z };
 
-			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth, 
-											TheGlobalData->m_debugVisibilityTileDuration, 
+			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth,
+											TheGlobalData->m_debugVisibilityTileDuration,
 											theAdjustedVisionColor);
 		}
 	}
@@ -893,15 +899,15 @@ Real AI::getAdjustedVisionRangeForObject(const Object *object, Int factorsToCons
 }
 
 //-------------------------------------------------------------------------------------------------
-TAiData::TAiData() : 
-m_next(NULL), 
-m_sideInfo(NULL), 
+TAiData::TAiData() :
+m_next(NULL),
+m_sideInfo(NULL),
 m_attackIgnoreInsignificantBuildings(false),
 m_skirmishGroupFudgeValue(0.0f),
-m_structureSeconds(0), 
-m_teamSeconds(0), 
-m_resourcesWealthy(0), 
-m_resourcesPoor(0), 
+m_structureSeconds(0),
+m_teamSeconds(0),
+m_resourcesWealthy(0),
+m_resourcesPoor(0),
 m_forceIdleFramesCount(1),
 m_structuresWealthyMod(0),
 m_teamPoorMod(0),
@@ -931,15 +937,12 @@ m_infantryPathfindDiameter(6),
 m_vehiclePathfindDiameter(6),
 m_supplyCenterSafeRadius(250),
 m_rebuildDelaySeconds(10),
-//Added By Sadullah Nader
-//Initialization(s) inserted
 m_distanceRequiresGroup(0.0f),
 m_sideBuildLists(NULL),
 m_structuresPoorMod(0.0f),
 m_teamWealthyMod(0.0f),
 m_aiDozerBoredRadiusModifier(2.0),
 m_aiCrushesInfantry(true)
-//
 {
 }
 
@@ -969,9 +972,9 @@ void TAiData::crc( Xfer *xfer )
 	xfer->xferReal( &m_maxRecruitDistance );
 	xfer->xferReal( &m_repulsedDistance );
 	xfer->xferBool( &m_enableRepulsors );
-	CRCGEN_LOG(("CRC after AI TAiData for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI TAiData for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 
-}  // end crc
+}
 
 //-----------------------------------------------------------------------------
 void TAiData::xfer( Xfer *xfer )
@@ -982,20 +985,20 @@ void TAiData::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 //-----------------------------------------------------------------------------
 void TAiData::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-----------------------------------------------------------------------------
 void AI::crc( Xfer *xfer )
 {
 
 	xfer->xferSnapshot( m_pathfinder );
-	CRCGEN_LOG(("CRC after AI pathfinder for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI pathfinder for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 
 	AsciiString marker;
 	TAiData *aiData = m_aiData;
@@ -1017,7 +1020,7 @@ void AI::crc( Xfer *xfer )
 		}
 	}
 
-}  // end crc
+}
 
 //-----------------------------------------------------------------------------
 void AI::xfer( Xfer *xfer )
@@ -1028,12 +1031,12 @@ void AI::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 //-----------------------------------------------------------------------------
 void AI::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIDock.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIDock.cpp
index 4f4751cf027..43590777358 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIDock.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIDock.cpp
@@ -25,7 +25,7 @@
 // AIDock.cpp
 // Implementation of docking behavior
 // Author: Michael S. Booth, February 2002
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/Module.h"
@@ -38,15 +38,15 @@
 
 //----------------------------------------------------------------------------------------------------------
 /**
- * Create an AI state machine. Define all of the states the machine 
+ * Create an AI state machine. Define all of the states the machine
  * can possibly be in, and set the initial (default) state.
  */
 AIDockMachine::AIDockMachine( Object *obj ) : StateMachine( obj, "AIDockMachine" )
 {
-	static const StateConditionInfo waitForClearanceConditions[] = 
+	static const StateConditionInfo waitForClearanceConditions[] =
 	{
 		StateConditionInfo(ableToAdvance, AI_DOCK_ADVANCE_POSITION, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -67,10 +67,10 @@ AIDockMachine::~AIDockMachine()
 }
 
 //-----------------------------------------------------------------------------
-void AIDockMachine::halt() 
-{ 
+void AIDockMachine::halt()
+{
 	Object *goalObject = getGoalObject();
-		
+
 	// sanity
 	if( goalObject != NULL )
 	{
@@ -92,20 +92,20 @@ void AIDockMachine::halt()
 void AIDockMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void AIDockMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
 	xfer->xferInt(&m_approachPosition);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -113,7 +113,7 @@ void AIDockMachine::xfer( Xfer *xfer )
 void AIDockMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 // State transition conditions ----------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -158,7 +158,7 @@ void AIDockApproachState::xfer( Xfer *xfer )
 		AIInternalMoveToState::xfer(xfer);
 	}
 
-}  // end xfer
+}
 
 //----------------------------------------------------------------------------------------------
 /**
@@ -167,7 +167,7 @@ void AIDockApproachState::xfer( Xfer *xfer )
 StateReturnType AIDockApproachState::onEnter( void )
 {
 	Object *goalObject = getMachineGoalObject();
-		
+
 	// sanity
 	if( goalObject == NULL )
 		return STATE_FAILURE;
@@ -301,10 +301,10 @@ void AIDockWaitForClearanceState::onExit( StateExitType status )
 }
 
 //----------------------------------------------------------------------------------------------
-void AIDockWaitForClearanceState::xfer(Xfer *xfer ) 
+void AIDockWaitForClearanceState::xfer(Xfer *xfer )
 {
-	XferVersion cv = 2;	
-	XferVersion v = cv; 
+	XferVersion cv = 2;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 	if (v >= 2) {
 		xfer->xferUnsignedInt(&m_enterFrame);
@@ -323,7 +323,7 @@ void AIDockWaitForClearanceState::xfer(Xfer *xfer )
 StateReturnType AIDockAdvancePositionState::onEnter( void )
 {
 	Object *goalObject = getMachineGoalObject();
-		
+
 	// sanity
 	if( goalObject == NULL )
 		return STATE_FAILURE;
@@ -422,7 +422,7 @@ StateReturnType AIDockMoveToEntryState::onEnter( void )
 	}
 
 	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface();
-	if( ai  &&  dock->isAllowPassthroughType() ) 
+	if( ai  &&  dock->isAllowPassthroughType() )
 	{
 		ai->ignoreObstacle( getMachineGoalObject() );
 	}
@@ -505,7 +505,7 @@ StateReturnType AIDockMoveToDockState::onEnter( void )
 	dock->getDockPosition( getMachineOwner(), &m_goalPosition );
 
 	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface();
-	if( ai  &&  dock->isAllowPassthroughType() ) 
+	if( ai  &&  dock->isAllowPassthroughType() )
 	{
 		ai->ignoreObstacle( getMachineGoalObject() );
 		setAdjustsDestination(false);
@@ -647,7 +647,7 @@ struct DroneInfo
 void findDrone( Object *obj, void *droneInfo )
 {
 	DroneInfo *dInfo = (DroneInfo*)droneInfo;
-	
+
 	if( !dInfo->found && obj )
 	{
 		if( obj->isKindOf( KINDOF_DRONE ) && obj->getProducerID() == dInfo->owner->getID() )
@@ -721,7 +721,7 @@ StateReturnType AIDockMoveToExitState::onEnter( void )
 	dock->getExitPosition( getMachineOwner(), &m_goalPosition );
 
 	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface();
-	if( ai  &&  dock->isAllowPassthroughType() ) 
+	if( ai  &&  dock->isAllowPassthroughType() )
 	{
 		ai->ignoreObstacle( getMachineGoalObject() );
 		setAdjustsDestination(false);
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp
index ac62c1bf42a..aa09e574728 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp
@@ -25,7 +25,7 @@
 // AIGroup.cpp
 // Encapsulation of a simple group of AI agents
 // Author: Michael S. Booth, January 2002
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/ActionManager.h"
@@ -56,11 +56,6 @@
 #include "GameLogic/Module/SpecialPowerUpdateModule.h"
 #include "GameLogic/ObjectIter.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 /**
  * NOTE: Only AI objects (ie: having an AIUpdate module) can be in
@@ -75,14 +70,14 @@
  */
 AIGroup::AIGroup( void )
 {
-//	DEBUG_LOG(("***AIGROUP %x is being constructed.\n", this));
+//	DEBUG_LOG(("***AIGROUP %x is being constructed.", this));
 	m_groundPath = NULL;
 	m_speed = 0.0f;
 	m_dirty = false;
 	m_id = TheAI->getNextGroupID();
 	m_memberListSize = 0;
 	m_memberList.clear();
-	//DEBUG_LOG(( "AIGroup #%d created\n", m_id ));
+	//DEBUG_LOG(( "AIGroup #%d created", m_id ));
 }
 
 /**
@@ -90,8 +85,11 @@ AIGroup::AIGroup( void )
  */
 AIGroup::~AIGroup()
 {
-//	DEBUG_LOG(("***AIGROUP %x is being destructed.\n", this));
+//	DEBUG_LOG(("***AIGROUP %x is being destructed.", this));
 	// disassociate each member from the group
+
+#if RETAIL_COMPATIBLE_AIGROUP
+
 	std::list<Object *>::iterator i;
 	for( i = m_memberList.begin(); i != m_memberList.end(); /* empty */ )
 	{
@@ -99,18 +97,24 @@ AIGroup::~AIGroup()
 		if (member)
 		{
 			member->leaveGroup();
-			i = m_memberList.begin();	// jump back to the beginning, cause ai->leaveGroup will remove this element. 
+			i = m_memberList.begin();	// jump back to the beginning, cause ai->leaveGroup will remove this element.
 		}
 		else
 		{
 			i = m_memberList.erase(i);
 		}
 	}
-	if (m_groundPath) {
-		deleteInstance(m_groundPath);
-		m_groundPath = NULL;
-	}
-	//DEBUG_LOG(( "AIGroup #%d destroyed\n", m_id ));
+
+#else
+
+	removeAll();
+
+#endif
+
+	deleteInstance(m_groundPath);
+	m_groundPath = NULL;
+
+	//DEBUG_LOG(( "AIGroup #%d destroyed", m_id ));
 }
 
 /**
@@ -169,14 +173,14 @@ Bool AIGroup::isMember( Object *obj )
  */
 void AIGroup::add( Object *obj )
 {
-//	DEBUG_LOG(("***AIGROUP %x is adding Object %x (%s).\n", this, obj, obj->getTemplate()->getName().str()));
+//	DEBUG_LOG(("***AIGROUP %x is adding Object %x (%s).", this, obj, obj->getTemplate()->getName().str()));
 	DEBUG_ASSERTCRASH(obj != NULL, ("trying to add null obj to AIGroup"));
 	if (obj == NULL)
 		return;
 
 	AIUpdateInterface *ai = obj->getAIUpdateInterface();
 
-	//If this object doesn't have an AIUpdateInterface, then 
+	//If this object doesn't have an AIUpdateInterface, then
 	//don't add it to the group UNLESS it is a structure! Structures
 	//with AIUpdateInterfaces also issue similar commands, but those
 	//commands don't need AI updates... they are instant commands like
@@ -192,7 +196,7 @@ void AIGroup::add( Object *obj )
 	// add to group's list of objects
 	m_memberList.push_back( obj );
 	++m_memberListSize;
-//	DEBUG_LOG(("***AIGROUP %x has size %u now.\n", this, m_memberListSize));
+//	DEBUG_LOG(("***AIGROUP %x has size %u now.", this, m_memberListSize));
 
 	obj->enterGroup( this );
 
@@ -205,7 +209,12 @@ void AIGroup::add( Object *obj )
  */
 Bool AIGroup::remove( Object *obj )
 {
-//	DEBUG_LOG(("***AIGROUP %x is removing Object %x (%s).\n", this, obj, obj->getTemplate()->getName().str()));
+#if !RETAIL_COMPATIBLE_AIGROUP
+	// Defer deletion until the end of this function.
+	AIGroupPtr refThis = AIGroupPtr::Create_AddRef(this);
+#endif
+
+//	DEBUG_LOG(("***AIGROUP %x is removing Object %x (%s).", this, obj, obj->getTemplate()->getName().str()));
 	std::list<Object *>::iterator i = std::find( m_memberList.begin(), m_memberList.end(), obj );
 
 	// make sure object is actually in the group
@@ -215,7 +224,7 @@ Bool AIGroup::remove( Object *obj )
 	// remove it
 	m_memberList.erase( i );
 	--m_memberListSize;
-//	DEBUG_LOG(("***AIGROUP %x has size %u now.\n", this, m_memberListSize));
+//	DEBUG_LOG(("***AIGROUP %x has size %u now.", this, m_memberListSize));
 
 	// tell object to forget about group
 	obj->leaveGroup();
@@ -223,15 +232,42 @@ Bool AIGroup::remove( Object *obj )
 	// list has changed, properties need recomputation
 	m_dirty = true;
 
-	// if the group is empty, no-one is using it any longer, so destroy it
 	if (isEmpty()) {
+#if RETAIL_COMPATIBLE_AIGROUP
+		// if the group is empty, no-one is using it any longer, so destroy it
 		TheAI->destroyGroup( this );
+#endif
 		return TRUE;
 	}
 
 	return FALSE;
 }
 
+/**
+ * Remove all objects from group
+ */
+void AIGroup::removeAll( void )
+{
+#if !RETAIL_COMPATIBLE_AIGROUP
+	// Defer deletion until the end of this function.
+	AIGroupPtr refThis = AIGroupPtr::Create_AddRef(this);
+#endif
+
+	std::list<Object *> memberList;
+	memberList.swap(m_memberList);
+	m_memberListSize = 0;
+
+	std::list<Object *>::iterator i;
+	for ( i = memberList.begin(); i != memberList.end(); ++i )
+	{
+		Object *member = *i;
+		if (member)
+			member->leaveGroup();
+	}
+
+	m_dirty = true;
+}
+
 /**
  * If the group contains any objects not owned by ownerPlayer, return TRUE.
  */
@@ -295,8 +331,8 @@ Bool AIGroup::getCenter( Coord3D *center )
 
 	std::list<Object *>::iterator i;
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
-	{													 
-		if( (*i)->isDisabledByType( DISABLED_HELD) ) 
+	{
+		if( (*i)->isDisabledByType( DISABLED_HELD) )
 		{
 			continue; // don't bother counting riders in the center calculation.
 		}
@@ -316,13 +352,13 @@ Bool AIGroup::getCenter( Coord3D *center )
 		/*
 			if there are no AIs (eg, the team consists of a faction bldg), we can get here.
 
-			This was originally used to offset the centers of objects moving (still used for that) and non-ais can't move.  
+			This was originally used to offset the centers of objects moving (still used for that) and non-ais can't move.
 			So if you have a mix of ai's & not ai's, you want just the ais.
 			But it seems reasonable that if there are no ai's, it returns the center of the other stuff.  Cause they won't be moving anyway.
 		*/
 		for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 		{
-			if( (*i)->isDisabledByType( DISABLED_HELD) ) 
+			if( (*i)->isDisabledByType( DISABLED_HELD) )
 			{
 				continue; // don't bother counting riders in the center calculation.
 			}
@@ -356,7 +392,7 @@ Bool AIGroup::getMinMaxAndCenter( Coord2D *min, Coord2D *max, Coord3D *center )
 	FormationID id= NO_FORMATION_ID;
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
-		if( (*i)->isDisabledByType( DISABLED_HELD) ) 
+		if( (*i)->isDisabledByType( DISABLED_HELD) )
 		{
 			continue; // don't bother counting riders in the center calculation.
 		}
@@ -375,7 +411,7 @@ Bool AIGroup::getMinMaxAndCenter( Coord2D *min, Coord2D *max, Coord3D *center )
 			max->y = max->y < objPos->y ? objPos->y : max->y;
 			FormationID curID = (*i)->getFormationID() ;
 			if (count==0) {
-				id = curID;	
+				id = curID;
 			} else {
 				if (id == NO_FORMATION_ID) {
 					id = NO_FORMATION_ID;
@@ -408,10 +444,8 @@ void AIGroup::recompute( void )
 
 	getCenter( &center );
 
-	if (m_groundPath) {
-		deleteInstance(m_groundPath);
-		m_groundPath = NULL;
-	}
+	deleteInstance(m_groundPath);
+	m_groundPath = NULL;
 
 	m_speed = 9999999999.9f;
 
@@ -422,7 +456,7 @@ void AIGroup::recompute( void )
 		if ((*i)->isKindOf(KINDOF_IMMOBILE))
 			continue;
 
-		if( (*i)->isDisabledByType( DISABLED_HELD) ) 
+		if( (*i)->isDisabledByType( DISABLED_HELD) )
 		{
 			continue; // don't bother counting riders in the max speed calculation.
 		}
@@ -477,7 +511,7 @@ Bool AIGroup::isEmpty( void )
  * Given a destination location, compute the destination position for
  * this object such that it keeps its relative position with the group.
  */
-void AIGroup::computeIndividualDestination( Coord3D *dest, const Coord3D *groupDest, 
+void AIGroup::computeIndividualDestination( Coord3D *dest, const Coord3D *groupDest,
 																					 Object *obj, const Coord3D *center, Bool isFormation )
 {
 	Coord2D v;
@@ -546,23 +580,23 @@ Bool AIGroup::friend_computeGroundPath( const Coord3D *pos, CommandSourceType cm
 	Real distSqr = 4*sqr(TheAI->getAiData()->m_distanceRequiresGroup);
 
 	Int numInfantry = 0;
-	Int numVehicles = 0; 
+	Int numVehicles = 0;
 	Object *centerVehicle = NULL;
 	Real distSqrCenterVeh = distSqr*10;
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
 		Object *obj = (*i);
 		TheAI->pathfinder()->removeGoal(obj);
-		if (obj->isDisabledByType( DISABLED_HELD ) ) 
+		if (obj->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		if( obj->getAI()==NULL )
-		{	
+		{
 			continue;
-		}	 
+		}
 		if( obj->isKindOf( KINDOF_INFANTRY ) )
-		{	
+		{
  			numInfantry++;
 		} else if (obj->isKindOf( KINDOF_VEHICLE)) {
 			if (obj->isKindOf(KINDOF_AIRCRAFT)) {
@@ -613,7 +647,7 @@ Bool AIGroup::friend_computeGroundPath( const Coord3D *pos, CommandSourceType cm
 
 	if (!closeEnough) {
 		Bool isPassable = true;
-		// see if all units have an unobstructed path to the center.  
+		// see if all units have an unobstructed path to the center.
 		// If so, then they are close enough.
 		for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 		{
@@ -624,8 +658,8 @@ Bool AIGroup::friend_computeGroundPath( const Coord3D *pos, CommandSourceType cm
 			AIUpdateInterface *ai = (*i)->getAIUpdateInterface();
 			if (ai)
 			{
-				if (!TheAI->pathfinder()->isLinePassable(obj, 
-								ai->getLocomotorSet().getValidSurfaces(), obj->getLayer(), *obj->getPosition(), 
+				if (!TheAI->pathfinder()->isLinePassable(obj,
+								ai->getLocomotorSet().getValidSurfaces(), obj->getLayer(), *obj->getPosition(),
 								center, false, true)) {
 					isPassable = false;
 				}
@@ -634,14 +668,14 @@ Bool AIGroup::friend_computeGroundPath( const Coord3D *pos, CommandSourceType cm
 		if (isPassable) closeEnough = true;
 	}
 	if (!closeEnough) return false;
-	
+
 	m_groundPath = TheAI->pathfinder()->findGroundPath(&center, pos, PATH_DIAMETER_IN_CELLS, false);
 	return m_groundPath!=NULL;
 
 }
 
 static void clampToMap(Coord3D *dest, PlayerType pt)
-// Clamps to the player's current visible map area. jba. [8/28/2003] 
+// Clamps to the player's current visible map area. jba. [8/28/2003]
 {
 	Region3D extent;
 	if (pt==PLAYER_COMPUTER) {
@@ -657,7 +691,7 @@ static void clampToMap(Coord3D *dest, PlayerType pt)
 	extent.lo.x += PATHFIND_CELL_SIZE_F;
 	extent.lo.y += PATHFIND_CELL_SIZE_F;
 	if (!extent.isInRegionNoZ(dest)) {
-		// clamp to in region. [8/28/2003]	
+		// clamp to in region. [8/28/2003]
 		if (dest->x < extent.lo.x) {
 			dest->x = extent.lo.x;
 		}
@@ -697,7 +731,7 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 	PathNode *startNode = NULL;
 	PathNode *node;
 	for (node = m_groundPath->getFirstNode(); node; node=node->getNextOptimized()) {
-		dx = node->getPosition()->x - startPoint.x;	
+		dx = node->getPosition()->x - startPoint.x;
 		dy = node->getPosition()->y - startPoint.y;
 		if (dx*dx+dy*dy>farEnoughSqr) {
 			startNode = node;
@@ -705,9 +739,9 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 		}
 	}
 	Coord3D endPoint = *m_groundPath->getLastNode()->getPosition();
-	PathNode *endNode = NULL;		
+	PathNode *endNode = NULL;
 	for (node = m_groundPath->getFirstNode(); node; node=node->getNextOptimized()) {
-		Real dx = node->getPosition()->x - endPoint.x;	
+		Real dx = node->getPosition()->x - endPoint.x;
 		Real dy = node->getPosition()->y - endPoint.y;
 		if (dx*dx+dy*dy>farEnoughSqr) {
 			endNode = node;
@@ -718,7 +752,7 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 		m_groundPath = NULL;
 		return false;
 	}
-	
+
 	Coord2D startVector;
 	startVector.x = startNode->getPosition()->x - startPoint.x;
 	startVector.y = startNode->getPosition()->y - startPoint.y;
@@ -749,23 +783,23 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 	SimpleObjectIterator *iter2 = newInstance(SimpleObjectIterator);
 	iterHolder2.hold(iter2);
 	std::list<Object *>::iterator i;
-	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	
+	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		if( !(*i)->isKindOf( KINDOF_INFANTRY ) )
-		{	
+		{
 			continue;
 		}
 		if( (*i)->getAI()==NULL )
-		{	
+		{
 			continue;
 		}
 		if ( (*i)->isKindOf( KINDOF_MOB_NEXUS ) )
 		{
-			return FALSE;// means I did NOT do a column group pathfind, 
+			return FALSE;// means I did NOT do a column group pathfind,
 			//so the nexus will have a far-away goal position for the mobsters to aim at
 		}
 
@@ -854,8 +888,8 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 	iter2->sort(ITER_SORTED_FAR_TO_NEAR);
 	// Even out columns by priority.
 	Int group;
-	Int column3[3] = {0,0,0};	
-	Int column5[5] = {0,0,0,0,0};	
+	Int column3[3] = {0,0,0};
+	Int column5[5] = {0,0,0,0,0};
 	for (group = LOCO_MOVES_FRONT; group>=LOCO_MOVES_BACK; group--) {
 		for (theUnit = iter2->first(); theUnit; theUnit = iter2->next())
 		{
@@ -936,7 +970,7 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 			PathNode *tmpNode;
 			PathNode *nextNode=NULL;
 			for (tmpNode = node->getNextOptimized(); tmpNode; tmpNode=tmpNode->getNextOptimized()) {
-				Real dx = tmpNode->getPosition()->x - dest.x;	
+				Real dx = tmpNode->getPosition()->x - dest.x;
 				Real dy = tmpNode->getPosition()->y - dest.y;
 				if (dx*dx+dy*dy>farEnoughSqr) {
 					nextNode = tmpNode;
@@ -976,7 +1010,7 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 			node=node->getNextOptimized();
 
 			for (tmpNode = previousNode->getNextOptimized(); tmpNode && tmpNode!=node; tmpNode=tmpNode->getNextOptimized()) {
-				Real dx = tmpNode->getPosition()->x - node->getPosition()->x;	
+				Real dx = tmpNode->getPosition()->x - node->getPosition()->x;
 				Real dy = tmpNode->getPosition()->y - node->getPosition()->y;
 				if (dx*dx+dy*dy>farEnoughSqr) {
 					previousNode = tmpNode;
@@ -1008,7 +1042,7 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 		dest.y -= factor*offset*endVector.y;
 		dest.z = TheTerrainLogic->getLayerHeight( dest.x, dest.y, layer );
 
-		while (path.size()>0) {
+		while (!path.empty()) {
 			Coord2D curVector;
 			prevPos = path[path.size()-1];
 			curVector.x = dest.x-prevPos.x;
@@ -1042,13 +1076,13 @@ void AIGroup::friend_moveFormationToPos( const Coord3D *pos, CommandSourceType c
 	PathNode *startNode = NULL;
 	PathNode *endNode = NULL;
 	Coord3D endPoint = *pos;
-	if (m_groundPath) {	
+	if (m_groundPath) {
 		// Get the start & end vectors for the path.
 		Coord3D startPoint = *m_groundPath->getFirstNode()->getPosition();
 		Real farEnoughSqr = sqr(PATH_DIAMETER_IN_CELLS*PATHFIND_CELL_SIZE_F);
 		PathNode *node;
 		for (node = m_groundPath->getFirstNode(); node; node=node->getNextOptimized()) {
-			dx = node->getPosition()->x - startPoint.x;	
+			dx = node->getPosition()->x - startPoint.x;
 			dy = node->getPosition()->y - startPoint.y;
 			if (dx*dx+dy*dy>farEnoughSqr) {
 				startNode = node;
@@ -1057,7 +1091,7 @@ void AIGroup::friend_moveFormationToPos( const Coord3D *pos, CommandSourceType c
 		}
 		endPoint = *m_groundPath->getLastNode()->getPosition();
 		for (node = m_groundPath->getFirstNode(); node; node=node->getNextOptimized()) {
-			dx = node->getPosition()->x - endPoint.x;	
+			dx = node->getPosition()->x - endPoint.x;
 			dy = node->getPosition()->y - endPoint.y;
 			if (dx*dx+dy*dy>farEnoughSqr) {
 				endNode = node;
@@ -1078,17 +1112,22 @@ void AIGroup::friend_moveFormationToPos( const Coord3D *pos, CommandSourceType c
 		}
 	}
 
-	
+
 	// Move.
 	std::list<Object *>::iterator i;
-	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	
+	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		Object *theUnit = (*i);
 		AIUpdateInterface *ai = theUnit->getAIUpdateInterface();
+		if (ai == NULL)
+		{
+			continue;
+		}
+
 		Bool isDifferentFormation = false;
 		Coord2D offset;
 		if (isDifferentFormation) {
@@ -1158,7 +1197,7 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 	PathNode *startNode = NULL;
 	PathNode *node;
 	for (node = m_groundPath->getFirstNode(); node; node=node->getNextOptimized()) {
-		Real dx = node->getPosition()->x - startPoint.x;	
+		Real dx = node->getPosition()->x - startPoint.x;
 		Real dy = node->getPosition()->y - startPoint.y;
 		if (dx*dx+dy*dy>farEnoughSqr) {
 			startNode = node;
@@ -1166,9 +1205,9 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 		}
 	}
 	Coord3D endPoint = *m_groundPath->getLastNode()->getPosition();
-	PathNode *endNode = NULL;		
+	PathNode *endNode = NULL;
 	for (node = m_groundPath->getFirstNode(); node; node=node->getNextOptimized()) {
-		Real dx = node->getPosition()->x - endPoint.x;	
+		Real dx = node->getPosition()->x - endPoint.x;
 		Real dy = node->getPosition()->y - endPoint.y;
 		if (dx*dx+dy*dy>farEnoughSqr) {
 			endNode = node;
@@ -1182,7 +1221,7 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 		m_groundPath = NULL;
 		return false;
 	}
-	
+
 	Coord2D startVector;
 	startVector.x = startNode->getPosition()->x - startPoint.x;
 	startVector.y = startNode->getPosition()->y - startPoint.y;
@@ -1213,24 +1252,24 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 	SimpleObjectIterator *iter2 = newInstance(SimpleObjectIterator);
 	iterHolder2.hold(iter2);
 	std::list<Object *>::iterator i;
-	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	
+	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		if( !(*i)->isKindOf( KINDOF_VEHICLE ) )
-		{	
+		{
 			continue;
 		}
 		if( (*i)->getAI()==NULL )
-		{	
+		{
 			continue;
 		}
 		if( !(*i)->getAI()->isDoingGroundMovement() )
-		{	
+		{
 			continue;
-		}	 
+		}
 		Coord3D unitPos = *((*i)->getPosition());
 		TheAI->pathfinder()->removeGoal(*i);
 		Real dx, dy;
@@ -1310,7 +1349,7 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 				adjust = -200*PATHFIND_CELL_SIZE_F;
 			}
 		}
-#endif 
+#endif
 		iter2->insert(theUnit, adjust + dx*startVector.x + dy*startVector.y);
 		curIndex++;
 
@@ -1319,8 +1358,8 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 	iter2->sort(ITER_SORTED_FAR_TO_NEAR);
 	// Even out columns by priority.
 	Int group;
-	Int column2[3] = {0,0,0};	
-	Int column3[3] = {0,0,0};	
+	Int column2[3] = {0,0,0};
+	Int column3[3] = {0,0,0};
 	for (group = LOCO_MOVES_FRONT; group>=LOCO_MOVES_BACK; group--) {
 		for (theUnit = iter2->first(); theUnit; theUnit = iter2->next())
 		{
@@ -1331,8 +1370,8 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 			if (ai->getCurLocomotor()) {
 				movePriority = ai->getCurLocomotor()->getMovePriority();
 			}
-			if (group!=movePriority) continue;	
-#endif 
+			if (group!=movePriority) continue;
+#endif
 			Int threeColumnDelta = tmp>>16;
 			Int columnDelta = (Short)(tmp & 0xFFFF);
 
@@ -1406,7 +1445,7 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 			PathNode *tmpNode;
 			PathNode *nextNode=NULL;
 			for (tmpNode = node->getNextOptimized(); tmpNode; tmpNode=tmpNode->getNextOptimized()) {
-				Real dx = tmpNode->getPosition()->x - dest.x;	
+				Real dx = tmpNode->getPosition()->x - dest.x;
 				Real dy = tmpNode->getPosition()->y - dest.y;
 				if (dx*dx+dy*dy>farEnoughSqr) {
 					nextNode = tmpNode;
@@ -1447,7 +1486,7 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 			node=node->getNextOptimized();
 
 			for (tmpNode = previousNode->getNextOptimized(); tmpNode && tmpNode!=node; tmpNode=tmpNode->getNextOptimized()) {
-				Real dx = tmpNode->getPosition()->x - node->getPosition()->x;	
+				Real dx = tmpNode->getPosition()->x - node->getPosition()->x;
 				Real dy = tmpNode->getPosition()->y - node->getPosition()->y;
 				if (dx*dx+dy*dy>farEnoughSqr) {
 					previousNode = tmpNode;
@@ -1481,7 +1520,7 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 		dest.y -= factor*offset*endVector.y;
 		dest.z = TheTerrainLogic->getLayerHeight( dest.x, dest.y, layer );
 
-		while (path.size()>0) {
+		while (!path.empty()) {
 			Coord2D curVector;
 			prevPos = path[path.size()-1];
 			curVector.x = dest.x-prevPos.x;
@@ -1512,7 +1551,7 @@ void clampWaypointPosition( Coord3D &position, Int margin )
 {
 	Region3D mapExtent;
 	TheTerrainLogic->getExtent(&mapExtent);
-  
+
   // trim some fat off of all sides,
   mapExtent.hi.x -= margin;
   mapExtent.hi.y -= margin;
@@ -1571,7 +1610,7 @@ void AIGroup::groupMoveToPosition( const Coord3D *pos, Bool addWaypoint, Command
 		}
 	}
 
-	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	
+	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
 		if ((*i)->getAI()) {
 			if (!(*i)->getAI()->isDoingGroundMovement()) {
@@ -1579,7 +1618,7 @@ void AIGroup::groupMoveToPosition( const Coord3D *pos, Bool addWaypoint, Command
 				isFormation = false;
 			}
 		}
-	} 
+	}
 
 	if (tightenGroup)
 	{
@@ -1605,19 +1644,19 @@ void AIGroup::groupMoveToPosition( const Coord3D *pos, Bool addWaypoint, Command
 	MemoryPoolObjectHolder iterHolder;
 	SimpleObjectIterator *iter = newInstance(SimpleObjectIterator);
 	iterHolder.hold(iter);
-	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	
+	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
 		Real dx, dy;
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		if( (*i)->isKindOf( KINDOF_IMMOBILE ) )
-		{	
+		{
 			continue;
 		}
 		if( (*i)->getAI()==NULL )
-		{	
+		{
 			continue;
 		}
 		if ((*i)->isKindOf(KINDOF_INFANTRY) && didInfantry) {
@@ -1625,9 +1664,9 @@ void AIGroup::groupMoveToPosition( const Coord3D *pos, Bool addWaypoint, Command
 		}
 		if ((*i)->isKindOf(KINDOF_VEHICLE) && didVehicles) {
 			if( (*i)->getAI()->isDoingGroundMovement() )
-			{	
+			{
 				continue;
-			}	 
+			}
 		}
 		Coord3D unitPos = *((*i)->getPosition());
 		TheAI->pathfinder()->removeGoal(*i);
@@ -1646,7 +1685,7 @@ void AIGroup::groupMoveToPosition( const Coord3D *pos, Bool addWaypoint, Command
 				adjust = 200*200*PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F;
 			}
 		}
-#endif 
+#endif
 		iter->insert((*i), adjust + dx*dx+dy*dy);
 	}
 
@@ -1667,7 +1706,7 @@ void AIGroup::groupMoveToPosition( const Coord3D *pos, Bool addWaypoint, Command
 				goalPos.x -= v.x;
 				goalPos.y -= v.y;
 			}	else {
-				center = *theUnit->getPosition();	
+				center = *theUnit->getPosition();
 			}
 			firstUnit = false;
 		}
@@ -1733,19 +1772,19 @@ void AIGroup::groupScatter( CommandSourceType cmdSource )
 	MemoryPoolObjectHolder iterHolder;
 	SimpleObjectIterator *iter = newInstance(SimpleObjectIterator);
 	iterHolder.hold(iter);
-	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	
+	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
 		Real dx, dy;
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		if( (*i)->isKindOf( KINDOF_IMMOBILE ) )
-		{	
+		{
 			continue;
 		}
 		if( (*i)->getAI()==NULL )
-		{	
+		{
 			continue;
 		}
 		Coord3D unitPos = *((*i)->getPosition());
@@ -1780,7 +1819,7 @@ void getHelicopterOffset( Coord3D& posOut, Int idx )
 {
   if (idx == 0)
     return;
-  
+
   Real assumedHeliDiameter = 70.0f;
   Real radius = assumedHeliDiameter;
   Real circumference = radius * CIRCLE;
@@ -1810,7 +1849,7 @@ void getHelicopterOffset( Coord3D& posOut, Int idx )
  * Move to given position(s), tightening the formation
  */
 void AIGroup::groupTightenToPosition( const Coord3D *pos, Bool addWaypoint, CommandSourceType cmdSource )
-{		
+{
 	//Kris: Disabled (because its not used to make a logical difference)
 	//Bool outsideOfBounds = true;
 	Coord3D center;
@@ -1834,16 +1873,16 @@ void AIGroup::groupTightenToPosition( const Coord3D *pos, Bool addWaypoint, Comm
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	{
 		Real dx, dy;
 		Coord3D unitPos = *((*i)->getPosition());
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		if( (*i)->isKindOf( KINDOF_IMMOBILE ) )
-		{	
+		{
 			continue;
 		}
 		if( (*i)->getAI()==NULL )
-		{	
+		{
 			continue;
 		}
 		dx = unitPos.x - pos->x;
@@ -1994,7 +2033,7 @@ void AIGroup::groupIdle(CommandSourceType cmdSource)
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
 		Object *obj = *i;
-		
+
 		AIUpdateInterface *ai = obj->getAIUpdateInterface();
 		if (ai)
 		{
@@ -2073,7 +2112,7 @@ void AIGroup::groupAttackObjectPrivate( Bool forced, Object *victim, Int maxShot
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	{
 		Real dx, dy;
 		Coord3D unitPos = *((*i)->getPosition());
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
@@ -2087,7 +2126,7 @@ void AIGroup::groupAttackObjectPrivate( Bool forced, Object *victim, Int maxShot
 	Object *theUnit;
 	for (theUnit = iter->first(); theUnit; theUnit = iter->next())
 	{
-		//Determine if this object is a garrisoned container capable of firing! 
+		//Determine if this object is a garrisoned container capable of firing!
 		//If so, order everyone inside to attack as well!
 		ContainModuleInterface *contain = theUnit->getContain();
 		if( contain && contain->isPassengerAllowedToFire() )
@@ -2114,7 +2153,7 @@ void AIGroup::groupAttackObjectPrivate( Bool forced, Object *victim, Int maxShot
 				}
 			}
 		}
-		
+
 		//Do a check to see if we have a hive object that has slaved objects.
 		SpawnBehaviorInterface *spawnInterface = theUnit->getSpawnBehaviorInterface();
 		if( spawnInterface )
@@ -2175,7 +2214,7 @@ void AIGroup::groupAttackPosition( const Coord3D *pos, Int maxShotsToFire, Comma
 
 		//This code allows garrisoned buildings to force attack a ground position
 		//-----------------------------------------------------------------------
-		//Determine if this object is a garrisoned container capable of firing! 
+		//Determine if this object is a garrisoned container capable of firing!
 		//If so, order everyone inside to attack as well!
 		ContainModuleInterface *contain = (*i)->getContain();
 		if( contain && contain->isPassengerAllowedToFire() )
@@ -2415,9 +2454,9 @@ void AIGroup::groupExecuteRailedTransport( CommandSourceType cmdSource )
 		if( ai )
 			ai->aiExecuteRailedTransport( cmdSource );
 
-	}  // end for i
+	}
 
-}  // end groupExecuteRailedTransport
+}
 
 ///< life altering state change, if this AI can do it
 void AIGroup::groupGoProne( const DamageInfo *damageInfo, CommandSourceType cmdSource )
@@ -2501,7 +2540,7 @@ void AIGroup::groupAttackArea( const PolygonTrigger *areaToGuard, CommandSourceT
 	if (!areaToGuard) {
 		return;
 	}
-	
+
 	std::list<Object *>::iterator i;
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
@@ -2713,32 +2752,35 @@ void AIGroup::groupCheer( CommandSourceType cmdSource )
 }
 
 /**
-	* Sell all things in the group ... if possible 
+	* Sell all things in the group ... if possible
 	*/
 void AIGroup::groupSell( CommandSourceType cmdSource )
 {
-	std::list<Object *>::iterator i, thisIterator;
-	Object *obj;
+#if !RETAIL_COMPATIBLE_AIGROUP
+	// Defer deletion until the end of this function.
+	AIGroupPtr refThis = AIGroupPtr::Create_AddRef(this);
+#endif
+
+	std::list<Object *>::iterator i;
+	std::vector<Object *> groupObjectsCopy;
+	groupObjectsCopy.reserve(m_memberListSize);
 
+	// TheSuperHackers @bugfix Mauller 26/06/2025 when sellObject is called, the member list objects in this AIGroup get removed from it. This happens within the Object::deselectObject() function.
+	// This deletes the local AIGroup object from under the call to groupSell, therefore we need to make a local copy of the objects that need selling.
 	for( i = m_memberList.begin(); i != m_memberList.end(); /*empty*/ )
 	{
+		groupObjectsCopy.push_back( *i++ );
+	}
 
-		// work off of 'thisIterator' as we may change the contents of this list
-		thisIterator = i;
-		++i;
-
-		// get object
-		obj = *thisIterator;
-
-		// try to sell object
-		TheBuildAssistant->sellObject( obj );
-
-	}  // end for, i
+	for( size_t j = 0; j < groupObjectsCopy.size(); ++j )
+	{
+		TheBuildAssistant->sellObject( groupObjectsCopy[j] );
+	}
 
 }
 
 /**
-	* Tell all things in the group to toggle overcharge ... if possible 
+	* Tell all things in the group to toggle overcharge ... if possible
 	*/
 void AIGroup::groupToggleOvercharge( CommandSourceType cmdSource )
 {
@@ -2759,9 +2801,9 @@ void AIGroup::groupToggleOvercharge( CommandSourceType cmdSource )
 			if( obi )
 				obi->toggle();
 
-		}  // end for
+		}
 
-	}  // end for, i
+	}
 
 }
 
@@ -2779,12 +2821,12 @@ void AIGroup::groupPickUpPrisoner( Object *prisoner, enum CommandSourceType cmdS
 
 		// get object
 		obj = *i;
-		
+
 		AIUpdateInterface *ai = obj->getAIUpdateInterface();
 		if( ai )
 			ai->aiPickUpPrisoner( prisoner, cmdSource );
 
-	}  // end for, i
+	}
 
 }
 #endif
@@ -2803,12 +2845,12 @@ void AIGroup::groupReturnToPrison( Object *prison, enum CommandSourceType cmdSou
 
 		// get object
 		obj = *i;
-		
+
 		AIUpdateInterface *ai = obj->getAIUpdateInterface();
 		if( ai )
 			ai->aiReturnPrisoners( prison, cmdSource );
 
-	}  // end for, i
+	}
 }
 #endif
 
@@ -2831,12 +2873,12 @@ void AIGroup::groupCombatDrop( Object *target, const Coord3D &pos, CommandSource
 		if( ai )
 			ai->aiCombatDrop( target, pos, cmdSource );
 
-	}  // end for, i
+	}
 
 }
 
 //-------------------------------------------------------------------------------------
-// Used by scripts to issue a command button order - Note that it's possible that some 
+// Used by scripts to issue a command button order - Note that it's possible that some
 // commands are not AI commands!
 //-------------------------------------------------------------------------------------
 void AIGroup::groupDoCommandButton( const CommandButton *commandButton, CommandSourceType cmdSource )
@@ -2849,14 +2891,14 @@ void AIGroup::groupDoCommandButton( const CommandButton *commandButton, CommandS
 
 		// get object
 		source = *i;
-		
+
 		source->doCommandButton( commandButton, cmdSource );
-	}  // end for, i
+	}
 }
 
 
 //-------------------------------------------------------------------------------------
-// Used by scripts to issue a command button order - Note that it's possible that some 
+// Used by scripts to issue a command button order - Note that it's possible that some
 // commands are not AI commands!
 //-------------------------------------------------------------------------------------
 void AIGroup::groupDoCommandButtonAtPosition( const CommandButton *commandButton, const Coord3D *pos, CommandSourceType cmdSource )
@@ -2869,13 +2911,13 @@ void AIGroup::groupDoCommandButtonAtPosition( const CommandButton *commandButton
 
 		// get object
 		source = *i;
-		
+
 		source->doCommandButtonAtPosition( commandButton, pos, cmdSource );
-	}  // end for, i
+	}
 }
 
 //-------------------------------------------------------------------------------------
-// Used by scripts to issue a command button order - Note that it's possible that some 
+// Used by scripts to issue a command button order - Note that it's possible that some
 // commands are not AI commands!
 //-------------------------------------------------------------------------------------
 void AIGroup::groupDoCommandButtonAtObject( const CommandButton *commandButton, Object *obj, CommandSourceType cmdSource )
@@ -2888,9 +2930,9 @@ void AIGroup::groupDoCommandButtonAtObject( const CommandButton *commandButton,
 
 		// get object
 		source = *i;
-		
+
 		source->doCommandButtonAtObject( commandButton, obj, cmdSource );
-	}  // end for, i
+	}
 }
 
 
@@ -2995,7 +3037,7 @@ void AIGroup::queueUpgrade( const UpgradeTemplate *upgrade )
 			if( thisMember->hasUpgrade( upgrade )  || !thisMember->affectedByUpgrade( upgrade ) )
 				continue;
 		}
-		
+
 		// Ever think to check if this thing can actually build the upgrade to "stop cheaters"?
 		if( !thisMember->canProduceUpgrade(upgrade) )
 			continue;// They have faked their button; go out of sync. (Cheater will execute it, non cheater will not execute it.)
@@ -3008,7 +3050,7 @@ void AIGroup::queueUpgrade( const UpgradeTemplate *upgrade )
 		if ( pu->canQueueUpgrade( upgrade ) == CANMAKE_QUEUE_FULL )
 			continue;//So we don't charge them for something that we can't build... happy happy
 
-		
+
 		// queue the upgrade "research"
 		pu->queueUpgrade( upgrade );
 	}
@@ -3053,13 +3095,13 @@ Bool AIGroup::isBusy( void ) const
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
 		Object *obj = *i;
-		if( !obj ) 
+		if( !obj )
 		{
 			continue;
 		}
 
 		const AIUpdateInterface *ai = obj->getAIUpdateInterface();
-		if( !ai ) 
+		if( !ai )
 		{
 			continue;
 		}
@@ -3121,7 +3163,7 @@ Object *AIGroup::getSpecialPowerSourceObject( UnsignedInt specialPowerID )
 Object *AIGroup::getCommandButtonSourceObject( GUICommandType type )
 {
 	std::list<Object *>::iterator it;
-	
+
 	for( it = m_memberList.begin(); it != m_memberList.end(); ++it )
 	{
 		Object *object = (*it);
@@ -3189,24 +3231,24 @@ void AIGroup::crc( Xfer *xfer )
 		if (*it)
 			id = (*it)->getID();
 		xfer->xferUser(&id, sizeof(ObjectID));
-		CRCGEN_LOG(("CRC after AI AIGroup m_memberList for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+		CRCGEN_LOG(("CRC after AI AIGroup m_memberList for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 	}
 
 	xfer->xferUnsignedInt( &m_memberListSize );
-	CRCGEN_LOG(("CRC after AI AIGroup m_memberListSize for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI AIGroup m_memberListSize for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 
 	id = INVALID_ID;	// Used to be leader id, unused now. jba.
 	xfer->xferObjectID( &id );
-	CRCGEN_LOG(("CRC after AI AIGroup m_leader for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI AIGroup m_leader for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 	xfer->xferReal( &m_speed );
-	CRCGEN_LOG(("CRC after AI AIGroup m_speed for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI AIGroup m_speed for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 	xfer->xferBool( &m_dirty );
-	CRCGEN_LOG(("CRC after AI AIGroup m_dirty for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI AIGroup m_dirty for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 
 	xfer->xferUnsignedInt( &m_id );
-	CRCGEN_LOG(("CRC after AI AIGroup m_id (%d) for frame %d is 0x%8.8X\n", m_id, TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI AIGroup m_id (%d) for frame %d is 0x%8.8X", m_id, TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 
-}  // end crc
+}
 
 //-----------------------------------------------------------------------------
 void AIGroup::xfer( Xfer *xfer )
@@ -3217,10 +3259,10 @@ void AIGroup::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 //-----------------------------------------------------------------------------
 void AIGroup::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp
index 6dff1494ed0..9ebff0f48d9 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp
@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// FILE: AIGuard.cpp 
+// FILE: AIGuard.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -37,7 +37,7 @@
 /* Revision History:                                                         */
 /*		3/29/2002 : Initial creation                                           */
 /*---------------------------------------------------------------------------*/
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 #include "Common/Team.h"
@@ -54,11 +54,6 @@
 
 const Real CLOSE_ENOUGH = (25.0f);
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/ )
 {
@@ -77,10 +72,10 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
 	Object *target = TheGameLogic->findObjectByID(bmi->getClearableLastAttacker());
 	bmi->clearLastAttacker();
 
-	// We use the clearable last attacker because we should continue attacking the guy. But if he 
-	// stops attacking us, then we want our timer to kick us off of him and make us go attack 
+	// We use the clearable last attacker because we should continue attacking the guy. But if he
+	// stops attacking us, then we want our timer to kick us off of him and make us go attack
 	// other units instead.
-	
+
 
 	if (!target) {
 		return FALSE;
@@ -90,7 +85,7 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
 		return FALSE;
 	}
 
-	// This is a quick test on the target. It will be duplicated in getAbleToAttackSpecificObject, 
+	// This is a quick test on the target. It will be duplicated in getAbleToAttackSpecificObject,
 	// but the payoff is worth the duplication.
 	if (target->isEffectivelyDead()) {
 		return FALSE;
@@ -117,9 +112,9 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
  */
 Bool ExitConditions::shouldExit(const StateMachine* machine) const
 {
-	if (!machine->getGoalObject()) 
+	if (!machine->getGoalObject())
 	{
-		if (m_conditionsToConsider & ATTACK_ExitIfNoUnitFound) 
+		if (m_conditionsToConsider & ATTACK_ExitIfNoUnitFound)
 		{
 			return true;
 		}
@@ -129,15 +124,15 @@ Bool ExitConditions::shouldExit(const StateMachine* machine) const
 		}
 	}
 
-	if (m_conditionsToConsider & ATTACK_ExitIfExpiredDuration) 
+	if (m_conditionsToConsider & ATTACK_ExitIfExpiredDuration)
 	{
 		if (TheGameLogic->getFrame() >= m_attackGiveUpFrame)
 		{
 			return true;
-		} 
+		}
 	}
-	
-	if (m_conditionsToConsider & ATTACK_ExitIfOutsideRadius) 
+
+	if (m_conditionsToConsider & ATTACK_ExitIfOutsideRadius)
 	{
 		Coord3D deltaAggressor;
 		Coord3D objPos = *machine->getGoalObject()->getPosition();
@@ -150,10 +145,10 @@ Bool ExitConditions::shouldExit(const StateMachine* machine) const
 													// then it would look for a new target, get the same one, and proceed in an infinite recursive
 													// loop that eventually blew the stack.
 
-		if (deltaAggressor.lengthSqr() > m_radiusSqr) 
+		if (deltaAggressor.lengthSqr() > m_radiusSqr)
 		{
 			return true;
-		} 
+		}
 	}
 
 	return false;
@@ -162,7 +157,7 @@ Bool ExitConditions::shouldExit(const StateMachine* machine) const
 
 //-- AIGuardMachine -------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------
-AIGuardMachine::AIGuardMachine( Object *owner ) : 
+AIGuardMachine::AIGuardMachine( Object *owner ) :
 	StateMachine(owner, "AIGuardMachine"),
 	m_targetToGuard(INVALID_ID),
 	m_areaToGuard(NULL),
@@ -170,11 +165,11 @@ AIGuardMachine::AIGuardMachine( Object *owner ) :
 	m_guardMode(GUARDMODE_NORMAL)
 {
 	m_positionToGuard.zero();
-	
+
 	static const StateConditionInfo attackAggressors[] =
 	{
 		StateConditionInfo(hasAttackedMeAndICanReturnFire, AI_GUARD_ATTACK_AGGRESSOR, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -196,7 +191,7 @@ AIGuardMachine::~AIGuardMachine()
 //--------------------------------------------------------------------------------------
 /*static*/ Real AIGuardMachine::getStdGuardRange(const Object* obj)
 {
-	Real visionRange = TheAI->getAdjustedVisionRangeForObject(obj, 
+	Real visionRange = TheAI->getAdjustedVisionRangeForObject(obj,
 		AI_VISIONFACTOR_OWNERTYPE | AI_VISIONFACTOR_MOOD | AI_VISIONFACTOR_GUARDINNER);
 
 	return visionRange;
@@ -213,10 +208,10 @@ Bool AIGuardMachine::lookForInnerTarget(void)
 
 	// Check if team auto targets same victim.
 	Object *teamVictim = NULL;
-	if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+	if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 	{
 		teamVictim = owner->getTeam()->getTeamTargetObject();
-		if (teamVictim) 
+		if (teamVictim)
 		{
 			setNemesisID(teamVictim->getID());
 			return true;	// Transitions to AIGuardInnerState.
@@ -242,18 +237,18 @@ Bool AIGuardMachine::lookForInnerTarget(void)
 
 	Real visionRange = AIGuardMachine::getStdGuardRange(owner);
 
-	if (area) 
+	if (area)
 	{
 		UnsignedInt checkFrame = TheGameLogic->getFrameObjectsChangedTriggerAreas()+TheAI->getAiData()->m_guardEnemyScanRate;
 		if (TheGameLogic->getFrame()>checkFrame) {
-			return false; 
+			return false;
 		}
 		filters[count++] = &f3;
 		visionRange = area->getRadius();
 		area->getCenterPoint(&pos);
 	}
 
-	if (getGuardMode() == GUARDMODE_GUARD_FLYING_UNITS_ONLY) 
+	if (getGuardMode() == GUARDMODE_GUARD_FLYING_UNITS_ONLY)
 	{
 		// only consider flying targets
 		filters[count++] = &f4;
@@ -267,11 +262,11 @@ Bool AIGuardMachine::lookForInnerTarget(void)
 //	Object* target = iter->first();
 //
 // srj sez: the above code is stupid and slow. since we only want the closest object,
-// just ask for that; the above has to find ALL objects in range, but we ignore all 
+// just ask for that; the above has to find ALL objects in range, but we ignore all
 // but the first (closest).
 //
 	Object* target = ThePartitionManager->getClosestObject(&pos, visionRange, FROM_CENTER_2D, filters);
-	if (target) 
+	if (target)
 	{
 		setNemesisID(target->getID());
 		return true;	// Transitions to AIGuardInnerState.
@@ -287,7 +282,7 @@ Bool AIGuardMachine::lookForInnerTarget(void)
 // ------------------------------------------------------------------------------------------------
 void AIGuardMachine::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -315,16 +310,16 @@ void AIGuardMachine::xfer( Xfer *xfer )
 		if (triggerName.isNotEmpty()) {
 			m_areaToGuard = TheTerrainLogic->getTriggerAreaByName(triggerName);
 		}
-	} 
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIGuardMachine::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-- AIGuardInnerState ----------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -332,7 +327,7 @@ void AIGuardMachine::loadPostProcess( void )
 // ------------------------------------------------------------------------------------------------
 void AIGuardInnerState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -344,7 +339,7 @@ void AIGuardInnerState::xfer( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -352,7 +347,13 @@ void AIGuardInnerState::xfer( Xfer *xfer )
 void AIGuardInnerState::loadPostProcess( void )
 {
 	onEnter();
-}  // end loadPostProcess
+}
+
+// ------------------------------------------------------------------------------------------------
+AIGuardInnerState::~AIGuardInnerState(void)
+{
+	deleteInstance(m_attackState);
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardInnerState::onEnter( void )
@@ -360,14 +361,14 @@ StateReturnType AIGuardInnerState::onEnter( void )
 	Object* targetToGuard = getGuardMachine()->findTargetToGuardByID();
 	Coord3D pos = targetToGuard ? *targetToGuard->getPosition() : *getGuardMachine()->getPositionToGuard();
 	Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardInnerState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardInnerState."));
 		return STATE_SUCCESS;
 	}
 	m_exitConditions.m_center = pos;
 	m_exitConditions.m_radiusSqr = sqr(AIGuardMachine::getStdGuardRange(getMachineOwner()));
-	m_exitConditions.m_conditionsToConsider = (ExitConditions::ATTACK_ExitIfOutsideRadius | 
+	m_exitConditions.m_conditionsToConsider = (ExitConditions::ATTACK_ExitIfOutsideRadius |
 																							ExitConditions::ATTACK_ExitIfNoUnitFound);
 
 	m_attackState = newInstance(AIAttackState)(getMachine(), false, true, false, &m_exitConditions);
@@ -389,11 +390,11 @@ StateReturnType AIGuardInnerState::update( void )
 	if (m_attackState==NULL) return STATE_SUCCESS;
 	// if the position has moved (IE we're guarding an object), move with it.
 	Object* targetToGuard = getGuardMachine()->findTargetToGuardByID();
-	if (targetToGuard) 
+	if (targetToGuard)
 	{
 		m_exitConditions.m_center = *targetToGuard->getPosition();
 	}
-	
+
 	return m_attackState->update();
 }
 
@@ -401,13 +402,13 @@ StateReturnType AIGuardInnerState::update( void )
 void AIGuardInnerState::onExit( StateExitType status )
 {
 	Object *obj = getMachineOwner();
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
 		m_attackState = NULL;
 	}
-	if (obj->getTeam()) 
+	if (obj->getTeam())
 	{
 		obj->getTeam()->setTeamTargetObject(NULL); // clear the target.
 	}
@@ -419,7 +420,7 @@ void AIGuardInnerState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIGuardOuterState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -431,7 +432,7 @@ void AIGuardOuterState::xfer( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -439,7 +440,13 @@ void AIGuardOuterState::xfer( Xfer *xfer )
 void AIGuardOuterState::loadPostProcess( void )
 {						 AIGuardOuterState
 	onEnter();
-}  // end loadPostProcess
+}
+
+// ------------------------------------------------------------------------------------------------
+AIGuardOuterState::~AIGuardOuterState(void)
+{
+	deleteInstance(m_attackState);
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardOuterState::onEnter( void )
@@ -454,9 +461,9 @@ StateReturnType AIGuardOuterState::onEnter( void )
 	Coord3D pos = targetToGuard ? *targetToGuard->getPosition() : *getGuardMachine()->getPositionToGuard();
 
 	Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardInnerState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardInnerState."));
 		return STATE_SUCCESS;
 	}
 	Object *obj = getMachineOwner();
@@ -464,17 +471,17 @@ StateReturnType AIGuardOuterState::onEnter( void )
 	Real range = TheAI->getAdjustedVisionRangeForObject(obj, AI_VISIONFACTOR_OWNERTYPE | AI_VISIONFACTOR_MOOD);
 
 	const PolygonTrigger *area = getGuardMachine()->getAreaToGuard();
-	if (area) 
+	if (area)
 	{
-		if (range < area->getRadius()) 
+		if (range < area->getRadius())
 			range = area->getRadius();
 		area->getCenterPoint(&pos);
 	}
 	m_exitConditions.m_center = pos;
 	m_exitConditions.m_radiusSqr = sqr(range);
 	m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
-	m_exitConditions.m_conditionsToConsider = (ExitConditions::ATTACK_ExitIfExpiredDuration | 
-																								ExitConditions::ATTACK_ExitIfOutsideRadius | 
+	m_exitConditions.m_conditionsToConsider = (ExitConditions::ATTACK_ExitIfExpiredDuration |
+																								ExitConditions::ATTACK_ExitIfOutsideRadius |
 																								ExitConditions::ATTACK_ExitIfNoUnitFound);
 
 	m_attackState = newInstance(AIAttackState)(getMachine(), false, true, false, &m_exitConditions);
@@ -496,33 +503,33 @@ StateReturnType AIGuardOuterState::update( void )
 
 	// if the position has moved (IE we're guarding an object), move with it.
 	Object* targetToGuard = getGuardMachine()->findTargetToGuardByID();
-	if (targetToGuard) 
+	if (targetToGuard)
 	{
 		m_exitConditions.m_center = *targetToGuard->getPosition();
 	}
 
 	Object* goalObj = m_attackState->getMachineGoalObject();
-	if (goalObj) 
+	if (goalObj)
 	{
 		Coord3D deltaAggr;
 		deltaAggr.x = m_exitConditions.m_center.x - goalObj->getPosition()->x;
 		deltaAggr.y = m_exitConditions.m_center.y - goalObj->getPosition()->y;
 		deltaAggr.z = m_exitConditions.m_center.z - goalObj->getPosition()->z;
 		Real visionSqr = sqr(AIGuardMachine::getStdGuardRange(getMachineOwner()));
-		if (deltaAggr.lengthSqr() <= visionSqr) 
+		if (deltaAggr.lengthSqr() <= visionSqr)
 		{
 			// reset the counter
 			m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
 		}
 	}
-	
+
 	return m_attackState->update();
 }
 
 //--------------------------------------------------------------------------------------
 void AIGuardOuterState::onExit( StateExitType status )
 {
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
@@ -536,7 +543,7 @@ void AIGuardOuterState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIGuardReturnState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -547,16 +554,16 @@ void AIGuardReturnState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
-	
+
 	xfer->xferUnsignedInt(&m_nextReturnScanTime);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIGuardReturnState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardReturnState::onEnter( void )
@@ -565,19 +572,19 @@ StateReturnType AIGuardReturnState::onEnter( void )
 	m_nextReturnScanTime = now + GameLogicRandomValue(0, TheAI->getAiData()->m_guardEnemyReturnScanRate);
 
 // no, no, no, don't do this in onEnter, unless you like really slow maps. (srj)
-//	if (getGuardMachine()->lookForInnerTarget()) 
+//	if (getGuardMachine()->lookForInnerTarget())
 //		return STATE_FAILURE; // early termination because we found a target.
 
 	Object* targetToGuard = getGuardMachine()->findTargetToGuardByID();
 	m_goalPosition = targetToGuard ? *targetToGuard->getPosition() : *getGuardMachine()->getPositionToGuard();
 
 	const PolygonTrigger *area = getGuardMachine()->getAreaToGuard();
-	if (area) 
+	if (area)
 	{
 		area->getCenterPoint(&m_goalPosition);
 	}
-	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface(); 
-	if (ai && ai->isDoingGroundMovement()) 
+	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface();
+	if (ai && ai->isDoingGroundMovement())
 	{
 		TheAI->pathfinder()->adjustDestination(getMachineOwner(), ai->getLocomotorSet(), &m_goalPosition);
 	}
@@ -592,7 +599,7 @@ StateReturnType AIGuardReturnState::update( void )
 	if (now >= m_nextReturnScanTime)
 	{
 		m_nextReturnScanTime = now + TheAI->getAiData()->m_guardEnemyReturnScanRate;
-		if (getGuardMachine()->lookForInnerTarget()) 
+		if (getGuardMachine()->lookForInnerTarget())
 			return STATE_FAILURE; // early termination because we found a target.
 	}
 
@@ -612,7 +619,7 @@ void AIGuardReturnState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIGuardIdleState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -623,22 +630,22 @@ void AIGuardIdleState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
-	
+
 	xfer->xferUnsignedInt(&m_nextEnemyScanTime);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIGuardIdleState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardIdleState::onEnter( void )
 {
 	// first time thru, use a random amount so that everyone doesn't scan on the same frame,
-	// to avoid "spikes". 
+	// to avoid "spikes".
 	UnsignedInt now = TheGameLogic->getFrame();
 	m_nextEnemyScanTime = now + GameLogicRandomValue(0, TheAI->getAiData()->m_guardEnemyScanRate);
 
@@ -648,7 +655,7 @@ StateReturnType AIGuardIdleState::onEnter( void )
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardIdleState::update( void )
 {
-	//DEBUG_LOG(("AIGuardIdleState frame %d: %08lx\n",TheGameLogic->getFrame(),getMachineOwner()));
+	//DEBUG_LOG(("AIGuardIdleState frame %d: %08lx",TheGameLogic->getFrame(),getMachineOwner()));
 
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (now < m_nextEnemyScanTime)
@@ -662,21 +669,21 @@ StateReturnType AIGuardIdleState::update( void )
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAIUpdateInterface();
 	// Check to see if we have created a crate we need to pick up.
-	if (ai->getCrateID() != INVALID_ID) 
+	if (ai->getCrateID() != INVALID_ID)
 	{
 		getMachine()->setState(AI_GUARD_GET_CRATE);
 		return STATE_SLEEP(m_nextEnemyScanTime - now);
 	}
 
 	// if anyone is in the inner area, return success.
-	if (getGuardMachine()->lookForInnerTarget()) 
+	if (getGuardMachine()->lookForInnerTarget())
 	{
 		return STATE_SUCCESS;	// Transitions to AIGuardInnerState.
 	}
 
 	// See if the object we are guarding moved.
 	Object* targetToGuard = getGuardMachine()->findTargetToGuardByID();
-	if (targetToGuard) 
+	if (targetToGuard)
 	{
 		Coord3D pos = *targetToGuard->getPosition();
 		Real delta = m_guardeePos.x-pos.x;
@@ -689,14 +696,14 @@ StateReturnType AIGuardIdleState::update( void )
 			m_guardeePos = pos;
 			return STATE_FAILURE; // goes to AIGuardReturnState.
 		}
-	} 
+	}
 	return STATE_SLEEP(m_nextEnemyScanTime - now);
 }
 
 //--------------------------------------------------------------------------------------
 void AIGuardIdleState::onExit( StateExitType status )
 {
-	
+
 }
 
 //-- AIGuardPickUpCrateState ----------------------------------------------------------------------
@@ -705,14 +712,14 @@ AIGuardPickUpCrateState::AIGuardPickUpCrateState( StateMachine *machine )	: AIPi
 {
 #ifdef STATE_MACHINE_DEBUG
 		setName("AIGuardPickUpCrateState");
-#endif	
+#endif
 }
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardPickUpCrateState::onEnter( void )
 {
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAIUpdateInterface();
-	
+
 	// Check to see if we have created a crate we need to pick up.
 	Object* crate = ai->checkForCrateToPickup();
 	if (crate)
@@ -733,17 +740,23 @@ StateReturnType AIGuardPickUpCrateState::update( void )
 //--------------------------------------------------------------------------------------
 void AIGuardPickUpCrateState::onExit( StateExitType status )
 {
-	
+
 }
 
 //-- AIGuardAttackAggressorState ------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-AIGuardAttackAggressorState::AIGuardAttackAggressorState( StateMachine *machine ) : 
+AIGuardAttackAggressorState::AIGuardAttackAggressorState( StateMachine *machine ) :
 	State( machine, "AIGuardAttackAggressorState" )
 {
 	m_attackState = NULL;
 }
 
+// ------------------------------------------------------------------------------------------------
+AIGuardAttackAggressorState::~AIGuardAttackAggressorState(void)
+{
+	deleteInstance(m_attackState);
+}
+
 //-------------------------------------------------------------------------------------------------
 StateReturnType AIGuardAttackAggressorState::onEnter( void )
 {
@@ -756,14 +769,14 @@ StateReturnType AIGuardAttackAggressorState::onEnter( void )
 	}
 
 	Object *nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID());
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardAttackAggressorState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardAttackAggressorState."));
 		return STATE_SUCCESS;
 	}
 
 	m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
-	m_exitConditions.m_conditionsToConsider = (ExitConditions::ATTACK_ExitIfExpiredDuration | 
+	m_exitConditions.m_conditionsToConsider = (ExitConditions::ATTACK_ExitIfExpiredDuration |
 																						 ExitConditions::ATTACK_ExitIfNoUnitFound);
 
 	m_attackState = newInstance(AIAttackState)(getMachine(), true, true, false, &m_exitConditions);
@@ -784,11 +797,11 @@ StateReturnType AIGuardAttackAggressorState::update( void )
 	if (m_attackState==NULL) return STATE_SUCCESS;
 	// if the position has moved (IE we're guarding an object), move with it.
 	Object* targetToGuard = getGuardMachine()->findTargetToGuardByID();
-	if (targetToGuard) 
+	if (targetToGuard)
 	{
 		m_exitConditions.m_center = *targetToGuard->getPosition();
 	}
-	
+
 	return m_attackState->update();
 }
 
@@ -796,14 +809,14 @@ StateReturnType AIGuardAttackAggressorState::update( void )
 void AIGuardAttackAggressorState::onExit( StateExitType status )
 {
 	Object *obj = getMachineOwner();
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
 		m_attackState = NULL;
 	}
 
-	if (obj->getTeam()) 
+	if (obj->getTeam())
 	{
 		obj->getTeam()->setTeamTargetObject(NULL); // clear the target.
 	}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
index 26f4c8197dc..f0f4ca98dce 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
@@ -25,7 +25,7 @@
 // AIPathfind.cpp
 // AI pathfinding system
 // Author: Michael S. Booth, October 2001
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameLogic/AIPathfind.h"
 
@@ -33,9 +33,9 @@
 #include "Common/Player.h"
 #include "Common/CRCDebug.h"
 #include "Common/GlobalData.h"
-#include "Common/LatchRestore.h"	 
+#include "Common/LatchRestore.h"
 #include "Common/ThingTemplate.h"
-#include "Common/ThingFactory.h"							 
+#include "Common/ThingFactory.h"
 
 #include "GameClient/Line2D.h"
 
@@ -50,7 +50,7 @@
 #include "GameLogic/TerrainLogic.h"
 #include "GameLogic/Weapon.h"
 
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.	
+#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
 
 
 #define no_INTENSE_DEBUG
@@ -64,29 +64,23 @@
 #include "Common/Xfer.h"
 #include "Common/XferCRC.h"
 
-//------------------------------------------------------------------------------ Performance Timers 
+//------------------------------------------------------------------------------ Performance Timers
 #include "Common/PerfMetrics.h"
-#include "Common/PerfTimer.h"
 
 //-------------------------------------------------------------------------------------------------
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 struct TCheckMovementInfo
 {
 	// Input
 	ICoord2D					cell;
 	PathfindLayerEnum layer;
-	Int								radius;	
+	Int								radius;
 	Bool							centerInCell;
 	Bool							considerTransient;
 	LocomotorSurfaceTypeMask acceptableSurfaces;
-	// Output 
+	// Output
 	Int								allyFixedCount;
 	Bool							enemyFixed;
 	Bool							allyMoving;
@@ -98,6 +92,13 @@ inline Int IABS(Int x) {	if (x>=0) return x; return -x;};
 //-----------------------------------------------------------------------------------
 static Int frameToShowObstacles;
 
+constexpr const UnsignedInt MAX_CELL_COUNT = 500;
+constexpr const UnsignedInt MAX_ADJUSTMENT_CELL_COUNT = 400;
+constexpr const UnsignedInt MAX_SAFE_PATH_CELL_COUNT = 2000;
+
+constexpr const UnsignedInt PATHFIND_CELLS_PER_FRAME = 5000; // Number of cells we will search pathfinding per frame.
+constexpr const UnsignedInt CELL_INFOS_TO_ALLOCATE = 30000;
+
 //-----------------------------------------------------------------------------------
 PathNode::PathNode() :
 	m_nextOpti(0),
@@ -117,7 +118,7 @@ PathNode::PathNode() :
 PathNode::~PathNode()
 {
 }
-								 
+
 //-----------------------------------------------------------------------------------
 void PathNode::setNextOptimized(PathNode *node)
 {
@@ -127,9 +128,9 @@ void PathNode::setNextOptimized(PathNode *node)
 		m_nextOptiDirNorm2D.x = node->getPosition()->x - getPosition()->x;
 		m_nextOptiDirNorm2D.y = node->getPosition()->y - getPosition()->y;
 		m_nextOptiDist2D = m_nextOptiDirNorm2D.length();
-		if (m_nextOptiDist2D == 0.0f) 
+		if (m_nextOptiDist2D == 0.0f)
 		{
-			//DEBUG_LOG(("Warning - Path Seg length == 0, adjusting. john a.\n"));
+			//DEBUG_LOG(("Warning - Path Seg length == 0, adjusting. john a."));
 			m_nextOptiDist2D = 0.01f;
 		}
 		m_nextOptiDirNorm2D.x /= m_nextOptiDist2D;
@@ -143,20 +144,20 @@ void PathNode::setNextOptimized(PathNode *node)
 
 //-----------------------------------------------------------------------------------
 /// given a list, prepend this node, return new list
-PathNode *PathNode::prependToList( PathNode *list ) 
-{ 
-	m_next = list; 
+PathNode *PathNode::prependToList( PathNode *list )
+{
+	m_next = list;
 	if (list)
 		list->m_prev = this;
-	m_prev = NULL; 
-	return this; 
+	m_prev = NULL;
+	return this;
 }
 
 //-----------------------------------------------------------------------------------
 /// given a list, append this node, return new list.  slow implementation.
 /// @todo optimize this
-PathNode *PathNode::appendToList( PathNode *list ) 
-{ 
+PathNode *PathNode::appendToList( PathNode *list )
+{
 	if (list == NULL)
 	{
 		m_next = NULL;
@@ -172,14 +173,14 @@ PathNode *PathNode::appendToList( PathNode *list )
 	m_prev = tail;
 	m_next = NULL;
 
-	return list; 
+	return list;
 }
 
 //-----------------------------------------------------------------------------------
 /// given a node, append new node to this.
-void PathNode::append( PathNode *newNode ) 
-{ 
-	newNode->m_next = this->m_next;	
+void PathNode::append( PathNode *newNode )
+{
+	newNode->m_next = this->m_next;
 	newNode->m_prev = this;
 	if (newNode->m_next) {
 		newNode->m_next->m_prev = newNode;
@@ -226,7 +227,7 @@ const Coord3D *PathNode::computeDirectionVector( void )
 Path::Path():
 m_path(NULL),
 m_pathTail(NULL),
-m_isOptimized(FALSE), 
+m_isOptimized(FALSE),
 m_blockedByAlly(FALSE),
 m_cpopRecentStart(NULL),
 m_cpopCountdown(MAX_CPOP),
@@ -242,7 +243,7 @@ Path::~Path( void )
 {
 	PathNode *node, *nextNode;
 
-	// delete all of the path nodes	
+	// delete all of the path nodes
 	for( node = m_path; node; node = nextNode )
 	{
 		nextNode = node->getNext();
@@ -255,7 +256,7 @@ Path::~Path( void )
 // ------------------------------------------------------------------------------------------------
 void Path::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -275,7 +276,7 @@ void Path::xfer( Xfer *xfer )
 	}
 	xfer->xferInt(&count);
 
-	if (xfer->getXferMode() == XFER_SAVE)	{	
+	if (xfer->getXferMode() == XFER_SAVE)	{
 		node = m_pathTail;  // Write them out backwards.
 		while (node) {
 			node->m_id = count;
@@ -291,7 +292,7 @@ void Path::xfer( Xfer *xfer )
 				id = node->getNextOptimized()->m_id;
 			}
 			xfer->xferInt(&id);
-			count--; 
+			count--;
 			node = node->getPrevious();
 		}
 		DEBUG_ASSERTCRASH(count==0, ("Wrong data count"));
@@ -334,13 +335,13 @@ void Path::xfer( Xfer *xfer )
 
 	xfer->xferBool(&m_isOptimized);
 	Int obsolete1 = 0;
-	xfer->xferInt(&obsolete1);	
+	xfer->xferInt(&obsolete1);
 	UnsignedInt obsolete2;
 	xfer->xferUnsignedInt(&obsolete2);
 	xfer->xferBool(&m_blockedByAlly);
 
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI == AI_DEBUG_PATHS)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -367,14 +368,14 @@ void Path::xfer( Xfer *xfer )
 		TheAI->pathfinder()->setDebugPath(this);
 	}
 #endif
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void Path::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 /**
  * Create a new node at the head of the path
@@ -403,11 +404,11 @@ void Path::prependNode( const Coord3D *pos, PathfindLayerEnum layer )
  */
 void Path::appendNode( const Coord3D *pos, PathfindLayerEnum layer )
 {
-	if (m_isOptimized && m_pathTail) 
+	if (m_isOptimized && m_pathTail)
 	{
 		/* Check for duplicates. */
 		if (pos->x == m_pathTail->getPosition()->x && pos->y == m_pathTail->getPosition()->y) {
-			DEBUG_LOG(("Warning - Path Seg length == 0, ignoring. john a.\n"));
+			DEBUG_LOG(("Warning - Path Seg length == 0, ignoring. john a."));
 			return;
 		}
 	}
@@ -418,7 +419,7 @@ void Path::appendNode( const Coord3D *pos, PathfindLayerEnum layer )
 
 	m_path = node->appendToList( m_path );
 
-	if (m_isOptimized && m_pathTail) 
+	if (m_isOptimized && m_pathTail)
 	{
 		m_pathTail->setNextOptimized(node);
 	}
@@ -439,7 +440,7 @@ void Path::updateLastNode( const Coord3D *pos )
 		m_pathTail->setPosition(pos);
 		m_pathTail->setLayer(layer);
 	}
-	if (m_isOptimized && m_pathTail) 
+	if (m_isOptimized && m_pathTail)
 	{
 		PathNode *node = m_path;
 		while(node && node->getNextOptimized() != m_pathTail) {
@@ -501,15 +502,15 @@ void Path::optimize( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfa
 			firstNode = false;
 		}
 		//PathfindLayerEnum curLayer = LAYER_GROUND;
-		for( ; node != anchor; node = node->getPrevious() )		
+		for( ; node != anchor; node = node->getPrevious() )
 		{
 			Bool isPassable = false;
-			//CRCDEBUG_LOG(("Path::optimize() calling isLinePassable()\n"));
-			if (TheAI->pathfinder()->isLinePassable( obj, acceptableSurfaces, layer, *anchor->getPosition(), 
+			//CRCDEBUG_LOG(("Path::optimize() calling isLinePassable()"));
+			if (TheAI->pathfinder()->isLinePassable( obj, acceptableSurfaces, layer, *anchor->getPosition(),
 				*node->getPosition(), blocked, false))
 			{
 				isPassable = true;
-			} 
+			}
 			PathfindCell* cell = TheAI->pathfinder()->getCell( layer, node->getPosition());
 			if (cell && cell->getType()==PathfindCell::CELL_CLIFF && !cell->getPinched()) {
 				isPassable = true;
@@ -557,7 +558,7 @@ void Path::optimize( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfa
 					isPassable = true;
 				}
 			}
-			if (isPassable) 
+			if (isPassable)
 			{
 				// anchor can directly see this node, make it next in the optimized path
 				anchor->setNextOptimized( node );
@@ -566,7 +567,7 @@ void Path::optimize( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfa
 				break;
 			}
 		}
-			
+
 		if (optimizedSegment == false)
 		{
 			// for some reason, there is no clear LOS between the anchor node and the very next node
@@ -618,15 +619,15 @@ void Path::optimizeGroundPath( Bool crusher, Int pathDiameter )
 		}
 
 		// find the farthest node in the path that has a clear line-of-sight to this anchor
-		for( ; node != anchor; node = node->getPrevious() )		
+		for( ; node != anchor; node = node->getPrevious() )
 		{
 			Bool isPassable = false;
-			//CRCDEBUG_LOG(("Path::optimize() calling isLinePassable()\n"));
+			//CRCDEBUG_LOG(("Path::optimize() calling isLinePassable()"));
 			if (TheAI->pathfinder()->isGroundPathPassable( crusher, *anchor->getPosition(), layer,
 				*node->getPosition(), pathDiameter))
 			{
 				isPassable = true;
-			} 
+			}
 			// Horizontal, diagonal, and vertical steps are passable.
 			if (!isPassable) {
 				Int dx = node->getPosition()->x - anchor->getPosition()->x;
@@ -667,7 +668,7 @@ void Path::optimizeGroundPath( Bool crusher, Int pathDiameter )
 					isPassable = true;
 				}
 			}
-			if (isPassable) 
+			if (isPassable)
 			{
 				// anchor can directly see this node, make it next in the optimized path
 				anchor->setNextOptimized( node );
@@ -676,7 +677,7 @@ void Path::optimizeGroundPath( Bool crusher, Int pathDiameter )
 				break;
 			}
 		}
-			
+
 		if (optimizedSegment == false)
 		{
 			// for some reason, there is no clear LOS between the anchor node and the very next node
@@ -705,7 +706,7 @@ void Path::optimizeGroundPath( Bool crusher, Int pathDiameter )
 inline Bool isReallyClose(const Coord3D& a, const Coord3D& b)
 {
 	const Real CLOSE_ENOUGH = 0.1f;
-	return 
+	return
 		fabs(a.x-b.x) <= CLOSE_ENOUGH &&
 		fabs(a.y-b.y) <= CLOSE_ENOUGH &&
 		fabs(a.z-b.z) <= CLOSE_ENOUGH;
@@ -743,7 +744,7 @@ void Path::computePointOnPath(
 	ClosestPointOnPathInfo& out
 )
 {
-	CRCDEBUG_LOG(("Path::computePointOnPath() for %s\n", DebugDescribeObject(obj).str()));
+	CRCDEBUG_LOG(("Path::computePointOnPath() for %s", DebugDescribeObject(obj).str()));
 
 	out.layer = LAYER_GROUND;
 	out.posOnPath.zero();
@@ -760,7 +761,7 @@ void Path::computePointOnPath(
 	{
 		out = m_cpopOut;
 		m_cpopCountdown--;
-		CRCDEBUG_LOG(("Path::computePointOnPath() end because we're really close\n"));
+		CRCDEBUG_LOG(("Path::computePointOnPath() end because we're really close"));
 		return;
 	}
 	m_cpopCountdown = MAX_CPOP;
@@ -788,8 +789,8 @@ void Path::computePointOnPath(
 	Real segmentLength;
 
 	// note that the seg dir and len returned by this is the dist & vec from 'prevNode' to 'node'
-	for ( const PathNode* node = prevNode->getNextOptimized(&segmentDirNorm, &segmentLength); 
-				node != NULL; 
+	for ( const PathNode* node = prevNode->getNextOptimized(&segmentDirNorm, &segmentLength);
+				node != NULL;
 				node = node->getNextOptimized(&segmentDirNorm, &segmentLength) )
 	{
 		const Coord3D* prevNodePos = prevNode->getPosition();
@@ -801,7 +802,7 @@ void Path::computePointOnPath(
 
 		// compute distance projection of 'toPos' onto segment
 		Real alongPathDist = segmentDirNorm.x * toPos.x + segmentDirNorm.y * toPos.y;
-				
+
 		Coord3D pointOnPath;
 		if (alongPathDist < 0.0f)
 		{
@@ -870,18 +871,18 @@ void Path::computePointOnPath(
 		const PathNode* closeNext = closeNode->getNextOptimized(&segmentDirNorm, &segmentLength);
 		const Coord3D* nextNodePos = closeNext->getPosition();
 		const Coord3D* closeNodePos = closeNode->getPosition();
-		
+
 		const PathNode* closePrev = closeNode->getPrevious();
-		if (closePrev && closePrev->getLayer() > LAYER_GROUND) 
+		if (closePrev && closePrev->getLayer() > LAYER_GROUND)
 		{
 			out.layer = closeNode->getLayer();
 		}
-		if (closeNode->getLayer() > LAYER_GROUND) 
+		if (closeNode->getLayer() > LAYER_GROUND)
 		{
 			out.layer = closeNode->getLayer();
 		}
 
-		if (closeNext->getLayer() > LAYER_GROUND) 
+		if (closeNext->getLayer() > LAYER_GROUND)
 		{
 			out.layer = closeNext->getLayer();
 		}
@@ -904,7 +905,7 @@ void Path::computePointOnPath(
 
 		// If we are basically on the path, return the next path node as the movement goal.
 		// However, the farther off the path we get, the movement goal becomes closer to our
-		// projected position on the path.  If we are very far off the path, we will move 
+		// projected position on the path.  If we are very far off the path, we will move
 		// directly towards the nearest point on the path, and not the next path node.
 		const Real maxPathError = 3.0f * PATHFIND_CELL_SIZE_F;
 		const Real maxPathErrorInv = 1.0 / maxPathError;
@@ -913,19 +914,19 @@ void Path::computePointOnPath(
 			k = 1.0f;
 
 		Bool gotPos = false;
-		CRCDEBUG_LOG(("Path::computePointOnPath() calling isLinePassable() 1\n"));
-		if (TheAI->pathfinder()->isLinePassable( obj, locomotorSet.getValidSurfaces(), out.layer, pos, *nextNodePos, 
-			false, true )) 
+		CRCDEBUG_LOG(("Path::computePointOnPath() calling isLinePassable() 1"));
+		if (TheAI->pathfinder()->isLinePassable( obj, locomotorSet.getValidSurfaces(), out.layer, pos, *nextNodePos,
+			false, true ))
 		{
 			out.posOnPath = *nextNodePos;
 			gotPos = true;
 
 			Bool tryAhead = alongPathDist > segmentLength * 0.5;
-			if (closeNext->getCanOptimize() == false) 
+			if (closeNext->getCanOptimize() == false)
 			{
 				tryAhead = false; // don't go past no-opt nodes.
 			}
-			if (closeNode->getLayer() != closeNext->getLayer()) 
+			if (closeNode->getLayer() != closeNext->getLayer())
 			{
 				tryAhead = false; // don't go past layers.
 			}
@@ -937,26 +938,26 @@ void Path::computePointOnPath(
 				tryAhead = true;
 				veryClose = true;
 			}
-			if (tryAhead) 
+			if (tryAhead)
 			{
-				// try next segment middle.	
+				// try next segment middle.
 				const PathNode *next = closeNext->getNextOptimized();
-				if (next) 
+				if (next)
 				{
 					Coord3D tryPos;
 					tryPos.x = (nextNodePos->x + next->getPosition()->x) * 0.5;
 					tryPos.y = (nextNodePos->y + next->getPosition()->y) * 0.5;
 					tryPos.z = nextNodePos->z;
-					CRCDEBUG_LOG(("Path::computePointOnPath() calling isLinePassable() 2\n"));
-					if (veryClose || TheAI->pathfinder()->isLinePassable( obj, locomotorSet.getValidSurfaces(), closeNext->getLayer(), pos, tryPos, false, true )) 
+					CRCDEBUG_LOG(("Path::computePointOnPath() calling isLinePassable() 2"));
+					if (veryClose || TheAI->pathfinder()->isLinePassable( obj, locomotorSet.getValidSurfaces(), closeNext->getLayer(), pos, tryPos, false, true ))
 					{
 						gotPos = true;
 						out.posOnPath = tryPos;
 					}
 				}
 			}
-		} 
-		else if (k > 0.5f) 
+		}
+		else if (k > 0.5f)
 		{
 			Real tryDist = alongPathDist + (0.5) * (segmentLength - alongPathDist);
 
@@ -965,19 +966,19 @@ void Path::computePointOnPath(
 			out.posOnPath.y = closeNodePos->y + tryDist * segmentDirNorm.y;
 			out.posOnPath.z = closeNodePos->z;
 
-			CRCDEBUG_LOG(("Path::computePointOnPath() calling isLinePassable() 3\n"));
-			if (TheAI->pathfinder()->isLinePassable( obj, locomotorSet.getValidSurfaces(), out.layer, pos, out.posOnPath, false, true )) 
+			CRCDEBUG_LOG(("Path::computePointOnPath() calling isLinePassable() 3"));
+			if (TheAI->pathfinder()->isLinePassable( obj, locomotorSet.getValidSurfaces(), out.layer, pos, out.posOnPath, false, true ))
 			{
 				k = 0.5f;
 				gotPos = true;
 			}
-		}	
+		}
 
 		// if we are on the path (k == 0), then alongPathDist == segmentLength
 		// if we are way off the path (k == 1), then alongPathDist is unchanged, and it projection of actual pos
 		alongPathDist += (1.0f - k) * (segmentLength - alongPathDist);
 
-		if (!gotPos) 
+		if (!gotPos)
 		{
 			if (alongPathDist > segmentLength)
 			{
@@ -1008,7 +1009,7 @@ void Path::computePointOnPath(
 	delta.y = out.posOnPath.y - pos.y;
 	delta.z = 0;
 	Real lenDelta = delta.length();
-	if (lenDelta > out.distAlongPath && out.distAlongPath > PATHFIND_CLOSE_ENOUGH) 
+	if (lenDelta > out.distAlongPath && out.distAlongPath > PATHFIND_CLOSE_ENOUGH)
 	{
 		out.distAlongPath = lenDelta;
 	}
@@ -1016,7 +1017,7 @@ void Path::computePointOnPath(
 	m_cpopIn = pos;
 	m_cpopOut = out;
 	m_cpopValid = true;
-	CRCDEBUG_LOG(("Path::computePointOnPath() end\n"));
+	CRCDEBUG_LOG(("Path::computePointOnPath() end"));
 
 }
 
@@ -1083,14 +1084,45 @@ Real Path::computeFlightDistToGoal( const Coord3D *pos, Coord3D& goalPos )
 }
 //-----------------------------------------------------------------------------------
 
-enum { PATHFIND_CELLS_PER_FRAME=5000}; // Number of cells we will search pathfinding per frame.
-enum {CELL_INFOS_TO_ALLOCATE = 30000};
 PathfindCellInfo *PathfindCellInfo::s_infoArray = NULL;
-PathfindCellInfo *PathfindCellInfo::s_firstFree = NULL;						
+PathfindCellInfo *PathfindCellInfo::s_firstFree = NULL;
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+// TheSuperHackers @info This variable is here so the code will run down the retail compatible path till a failure mode is hit
+// The pathfinding will then switch over to the corrected pathfinding code for SH clients
+Bool s_useFixedPathfinding = false;
+Bool s_forceCleanCells = false;
+
+void PathfindCellInfo::forceCleanPathFindCellInfos()
+{
+	for (Int i = 0; i < CELL_INFOS_TO_ALLOCATE - 1; i++) {
+		s_infoArray[i].m_nextOpen = NULL;
+		s_infoArray[i].m_prevOpen = NULL;
+		s_infoArray[i].m_open = FALSE;
+		s_infoArray[i].m_closed = FALSE;
+	}
+}
+
+void Pathfinder::forceCleanCells()
+{
+	PathfindCellInfo::forceCleanPathFindCellInfos();
+	m_openList = NULL;
+	m_closedList = NULL;
+
+	for (int j = 0; j <= m_extent.hi.y; ++j) {
+		for (int i = 0; i <= m_extent.hi.x; ++i) {
+			if (m_map[i][j].hasInfo()) {
+				m_map[i][j].releaseInfo();
+			}
+		}
+	}
+}
+#endif
+
 /**
  * Allocates a pool of pathfind cell infos.
  */
-void PathfindCellInfo::allocateCellInfos(void) 
+void PathfindCellInfo::allocateCellInfos(void)
 {
 	releaseCellInfos();
 	s_infoArray = MSGNEW("PathfindCellInfo") PathfindCellInfo[CELL_INFOS_TO_ALLOCATE];	// pool[]ify
@@ -1099,14 +1131,14 @@ void PathfindCellInfo::allocateCellInfos(void)
 	s_firstFree = s_infoArray;
 	for (Int i=0; i<CELL_INFOS_TO_ALLOCATE-1; i++) {
 		s_infoArray[i].m_pathParent = &s_infoArray[i+1];
-		s_infoArray[i].m_isFree = true; 
+		s_infoArray[i].m_isFree = true;
 	}
 }
 
 /**
  * Releases a pool of pathfind cell infos.
  */
-void PathfindCellInfo::releaseCellInfos(void) 
+void PathfindCellInfo::releaseCellInfos(void)
 {
 	if (s_infoArray==NULL) {
 		return; // haven't allocated any yet.
@@ -1126,7 +1158,7 @@ void PathfindCellInfo::releaseCellInfos(void)
 /**
  * Gets a pathfindcellinfo.
  */
-PathfindCellInfo *PathfindCellInfo::getACellInfo(PathfindCell *cell,const ICoord2D &pos) 
+PathfindCellInfo *PathfindCellInfo::getACellInfo(PathfindCell *cell,const ICoord2D &pos)
 {
 	PathfindCellInfo *info = s_firstFree;
 	if (s_firstFree) {
@@ -1139,7 +1171,7 @@ PathfindCellInfo *PathfindCellInfo::getACellInfo(PathfindCell *cell,const ICoord
 		info->m_nextOpen = NULL;
 		info->m_prevOpen = NULL;
 		info->m_pathParent = NULL;
-		info->m_costSoFar = 0;		
+		info->m_costSoFar = 0;
 		info->m_totalCost = 0;
 		info->m_open = 0;
 		info->m_closed = 0;
@@ -1157,7 +1189,7 @@ PathfindCellInfo *PathfindCellInfo::getACellInfo(PathfindCell *cell,const ICoord
 /**
  * Returns a pathfindcellinfo.
  */
-void PathfindCellInfo::releaseACellInfo(PathfindCellInfo *theInfo) 
+void PathfindCellInfo::releaseACellInfo(PathfindCellInfo *theInfo)
 {
 	DEBUG_ASSERTCRASH(!theInfo->m_isFree, ("Shouldn't be free."));
 	//@ todo -fix this assert on usa04.  jba.
@@ -1173,15 +1205,15 @@ void PathfindCellInfo::releaseACellInfo(PathfindCellInfo *theInfo)
  * Constructor
  */
 PathfindCell::PathfindCell( void ) :m_info(NULL)
-{ 
+{
 	reset();
 }
 
 /**
  * Destructor
  */
-PathfindCell::~PathfindCell( void ) 
-{ 	
+PathfindCell::~PathfindCell( void )
+{
 	if (m_info) PathfindCellInfo::releaseACellInfo(m_info);
 	m_info = NULL;
 	static Bool warn = true;
@@ -1194,9 +1226,9 @@ PathfindCell::~PathfindCell( void )
 /**
  * Reset the cell to default values
  */
-void PathfindCell::reset( ) 
-{ 
-	m_type = PathfindCell::CELL_CLEAR; 
+void PathfindCell::reset( )
+{
+	m_type = PathfindCell::CELL_CLEAR;
 	m_flags = PathfindCell::NO_UNITS;
 	m_zone = 0;
 	m_aircraftGoal = false;
@@ -1208,14 +1240,14 @@ void PathfindCell::reset( )
 	}
 	m_connectsToLayer = LAYER_INVALID;
 	m_layer = LAYER_GROUND;
-	
+
 }
 
 /**
  * Reset the pathfinding values in the cell.
  */
-Bool PathfindCell::startPathfind( PathfindCell *goalCell  ) 
-{ 
+Bool PathfindCell::startPathfind( PathfindCell *goalCell  )
+{
 	DEBUG_ASSERTCRASH(m_info, ("Has to have info."));
 	m_info->m_nextOpen = NULL;
 	m_info->m_prevOpen = NULL;
@@ -1225,15 +1257,22 @@ Bool PathfindCell::startPathfind( PathfindCell *goalCell  )
 	if (goalCell) {
 		m_info->m_totalCost = costToGoal( goalCell );
 	}
-	m_info->m_open = TRUE;
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		m_info->m_open = TRUE;
+	} else
+#endif
+	{
+		m_info->m_open = FALSE;
+	}
 	m_info->m_closed = FALSE;
 	return true;
 }
 /**
  * Set the parent pointer.
  */
-void PathfindCell::setParentCell( PathfindCell* parent  ) 
-{ 
+void PathfindCell::setParentCell( PathfindCell* parent  )
+{
 	DEBUG_ASSERTCRASH(m_info, ("Has to have info."));
 	m_info->m_pathParent = parent->m_info;
 	Int dx = m_info->m_pos.x - parent->m_info->m_pos.x;
@@ -1246,8 +1285,8 @@ void PathfindCell::setParentCell( PathfindCell* parent  )
 /**
  * Set the parent pointer.
  */
-void PathfindCell::setParentCellHierarchical( PathfindCell* parent  ) 
-{ 
+void PathfindCell::setParentCellHierarchical( PathfindCell* parent  )
+{
 	DEBUG_ASSERTCRASH(m_info, ("Has to have info."));
 	m_info->m_pathParent = parent->m_info;
 }
@@ -1255,8 +1294,8 @@ void PathfindCell::setParentCellHierarchical( PathfindCell* parent  )
 /**
  * Reset the parent cell.
  */
-void PathfindCell::clearParentCell( void  ) 
-{ 
+void PathfindCell::clearParentCell( void  )
+{
 	DEBUG_ASSERTCRASH(m_info, ("Has to have info."));
 	m_info->m_pathParent = NULL;
 }
@@ -1265,49 +1304,59 @@ void PathfindCell::clearParentCell( void  )
 /**
  * Allocates an info record for a cell.
  */
-Bool PathfindCell::allocateInfo( const ICoord2D &pos ) 
-{ 
+Bool PathfindCell::allocateInfo( const ICoord2D &pos )
+{
 	if (!m_info) {
 		m_info = PathfindCellInfo::getACellInfo(this, pos);
 		return (m_info != NULL);
-	} 
+	}
 	return true;
 }
 
 /**
  * Releases an info record for a cell.
  */
-void PathfindCell::releaseInfo( void ) 
-{ 
-	if (m_type==PathfindCell::CELL_OBSTACLE) {
-		return;
+void PathfindCell::releaseInfo(void)
+{
+	// TheSuperHackers @bugfix Mauller/SkyAero 05/06/2025 Parent cell links need clearing to prevent dangling pointers on starting points that can link them to an invalid parent cell.
+	// Parent cells are only cleared within Pathfinder::prependCells, so cells that do not make it onto the final path do not get their parent cell cleared.
+	// Cells with a special flags also do not get their PathfindCellInfo cleared and therefore can leave a parent cell set on a starting cell.
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (s_useFixedPathfinding)
+#endif
+	{
+		if (m_info) {
+			m_info->m_pathParent = NULL;
+		}
 	}
-	if (m_flags!=NO_UNITS) {
+
+	if (m_type == PathfindCell::CELL_OBSTACLE || m_flags != NO_UNITS || m_aircraftGoal) {
 		return;
 	}
-	if (m_aircraftGoal) {
+
+	if (!m_info) {
 		return;
 	}
 
-	if (m_info) {
-		DEBUG_ASSERTCRASH(m_info->m_prevOpen==NULL && m_info->m_nextOpen==NULL, ("Shouldn't be linked."));
-		DEBUG_ASSERTCRASH(m_info->m_open==NULL && m_info->m_closed==NULL, ("Shouldn't be linked."));
-		DEBUG_ASSERTCRASH(m_info->m_goalUnitID==INVALID_ID && m_info->m_posUnitID==INVALID_ID, ("Shouldn't be occupied."));
-		DEBUG_ASSERTCRASH(m_info->m_goalAircraftID==INVALID_ID , ("Shouldn't be occupied by aircraft."));
-		if (m_info->m_prevOpen || m_info->m_nextOpen || m_info->m_open || m_info->m_closed) {
-			// Bad release.  Skip for now, better leak than crash.  jba.
-			return;
-		}
-		PathfindCellInfo::releaseACellInfo(m_info);
-		m_info = NULL;
+	DEBUG_ASSERTCRASH(m_info->m_prevOpen==NULL && m_info->m_nextOpen==NULL, ("Shouldn't be linked."));
+	DEBUG_ASSERTCRASH(m_info->m_open==NULL && m_info->m_closed==NULL, ("Shouldn't be linked."));
+	DEBUG_ASSERTCRASH(m_info->m_goalUnitID==INVALID_ID && m_info->m_posUnitID==INVALID_ID, ("Shouldn't be occupied."));
+	DEBUG_ASSERTCRASH(m_info->m_goalAircraftID==INVALID_ID , ("Shouldn't be occupied by aircraft."));
+	if (m_info->m_prevOpen || m_info->m_nextOpen || m_info->m_open || m_info->m_closed) {
+		// Bad release.  Skip for now, better leak than crash.  jba.
+		return;
 	}
+
+	PathfindCellInfo::releaseACellInfo(m_info);
+	m_info = NULL;
+
 }
 
 /**
  * Sets the goal unit into the info record for a cell.
  */
-void PathfindCell::setGoalUnit(ObjectID unitID, const ICoord2D &pos ) 
-{ 
+void PathfindCell::setGoalUnit(ObjectID unitID, const ICoord2D &pos )
+{
 	if (unitID==INVALID_ID) {
 		// removing goal.
 		if (m_info) {
@@ -1330,7 +1379,7 @@ void PathfindCell::setGoalUnit(ObjectID unitID, const ICoord2D &pos )
 			allocateInfo(pos);
 		}
 		if (!m_info) {
-			DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
+			DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
 			return;
 		}
 		m_info->m_goalUnitID = unitID;
@@ -1348,8 +1397,8 @@ void PathfindCell::setGoalUnit(ObjectID unitID, const ICoord2D &pos )
 /**
  * Sets the goal aircraft into the info record for a cell.
  */
-void PathfindCell::setGoalAircraft(ObjectID unitID, const ICoord2D &pos ) 
-{ 
+void PathfindCell::setGoalAircraft(ObjectID unitID, const ICoord2D &pos )
+{
 	if (unitID==INVALID_ID) {
 		// removing goal.
 		if (m_info) {
@@ -1366,7 +1415,7 @@ void PathfindCell::setGoalAircraft(ObjectID unitID, const ICoord2D &pos )
 			allocateInfo(pos);
 		}
 		if (!m_info) {
-			DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
+			DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
 			return;
 		}
 		m_info->m_goalAircraftID = unitID;
@@ -1378,8 +1427,8 @@ void PathfindCell::setGoalAircraft(ObjectID unitID, const ICoord2D &pos )
 /**
  * Sets the position unit into the info record for a cell.
  */
-void PathfindCell::setPosUnit(ObjectID unitID, const ICoord2D &pos ) 
-{ 
+void PathfindCell::setPosUnit(ObjectID unitID, const ICoord2D &pos )
+{
 	if (unitID==INVALID_ID) {
 		// removing position.
 		if (m_info) {
@@ -1402,7 +1451,7 @@ void PathfindCell::setPosUnit(ObjectID unitID, const ICoord2D &pos )
 			allocateInfo(pos);
 		}
 		if (!m_info) {
-			DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
+			DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
 			return;
 		}
 		if (m_info->m_goalUnitID!=INVALID_ID && (m_info->m_goalUnitID==m_info->m_posUnitID)) {
@@ -1431,7 +1480,7 @@ void PathfindCell::setTypeAsObstacle( Object *obstacle, Bool isFence, const ICoo
 	}
 
 	Bool isRubble = false;
-	if (obstacle->getBodyModule() && obstacle->getBodyModule()->getDamageState() == BODY_RUBBLE) 
+	if (obstacle->getBodyModule() && obstacle->getBodyModule()->getDamageState() == BODY_RUBBLE)
 	{
 		isRubble = true;
 	}
@@ -1503,8 +1552,18 @@ PathfindCell *PathfindCell::putOnSortedOpenList( PathfindCell *list )
 	{
 		// insertion sort
 		PathfindCell *c, *lastCell = NULL;
-		for( c = list; c; c = c->getNextOpen() )
+#if RETAIL_COMPATIBLE_PATHFINDING
+		// TheSuperHackers @bugfix In the retail compatible pathfinding, on rare ocassions, we get stuck in an infinite loop
+		// External code should pickup on the bad behaviour and cleanup properly, but we need to explicitly break out here
+		// The fixed pathfinding does not have this issue due to the proper cleanup of pathfindCells and their pathfindCellInfos
+		UnsignedInt cellCount = 0;
+		for (c = list; c && cellCount < PATHFIND_CELLS_PER_FRAME; c = c->getNextOpen())
 		{
+			cellCount++;
+#else
+		for (c = list; c; c = c->getNextOpen())
+		{
+#endif
 			if (c->m_info->m_totalCost > m_info->m_totalCost)
 				break;
 
@@ -1521,7 +1580,7 @@ PathfindCell *PathfindCell::putOnSortedOpenList( PathfindCell *list )
 
 			m_info->m_prevOpen = c->m_info->m_prevOpen;
 			c->m_info->m_prevOpen = this->m_info;
-				
+
 			m_info->m_nextOpen = c->m_info;
 
 		}
@@ -1548,7 +1607,7 @@ PathfindCell *PathfindCell::removeFromOpenList( PathfindCell *list )
 	DEBUG_ASSERTCRASH(m_info->m_closed==FALSE && m_info->m_open==TRUE, ("Serious error - Invalid flags. jba"));
 	if (m_info->m_nextOpen)
 		m_info->m_nextOpen->m_prevOpen = m_info->m_prevOpen;
-	
+
 	if (m_info->m_prevOpen)
 		m_info->m_prevOpen->m_nextOpen = m_info->m_nextOpen;
 	else
@@ -1571,9 +1630,21 @@ Int PathfindCell::releaseOpenList( PathfindCell *list )
 		DEBUG_ASSERTCRASH(list->m_info->m_closed==FALSE && list->m_info->m_open==TRUE, ("Serious error - Invalid flags. jba"));
 		PathfindCell *cur = list;
 		PathfindCellInfo *curInfo = list->m_info;
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+		// TheSuperHackers @info This is only here to catch a crash point in the retail compatible pathfinding
+		// One crash mode is where a cell has no PathfindCellInfo, resulting in a nullptr access and a crash.
+		// Therefore we signal that we need to clean the maps cells and the PathfindCellInfos
+		if(!curInfo && !s_useFixedPathfinding) {
+			s_useFixedPathfinding = true;
+			s_forceCleanCells = true;
+			return count;
+		}
+#endif
+
 		if (curInfo->m_nextOpen) {
 			list = curInfo->m_nextOpen->m_cell;
-		}	else {
+		} else {
 			list = NULL;
 		}
 		DEBUG_ASSERTCRASH(cur == curInfo->m_cell, ("Bad backpointer in PathfindCellInfo"));
@@ -1595,9 +1666,20 @@ Int PathfindCell::releaseClosedList( PathfindCell *list )
 		DEBUG_ASSERTCRASH(list->m_info->m_closed==TRUE && list->m_info->m_open==FALSE, ("Serious error - Invalid flags. jba"));
 		PathfindCell *cur = list;
 		PathfindCellInfo *curInfo = list->m_info;
+#if RETAIL_COMPATIBLE_PATHFINDING
+		// TheSuperHackers @info This is only here to catch a crash point in the retail compatible pathfinding
+		// One crash mode is where a cell has no PathfindCellInfo, resulting in a nullptr access and a crash.
+		// Therefore we signal that we need to clean the maps cells and the PathfindCellInfos
+		if(!curInfo && !s_useFixedPathfinding) {
+			s_useFixedPathfinding = true;
+			s_forceCleanCells = true;
+			return count;
+		}
+#endif
+
 		if (curInfo->m_nextOpen) {
 			list = curInfo->m_nextOpen->m_cell;
-		}	else {
+		} else {
 			list = NULL;
 		}
 		DEBUG_ASSERTCRASH(cur == curInfo->m_cell, ("Bad backpointer in PathfindCellInfo"));
@@ -1624,7 +1706,7 @@ PathfindCell *PathfindCell::putOnClosedList( PathfindCell *list )
 		m_info->m_nextOpen = list?list->m_info:NULL;
 		if (list)
 			list->m_info->m_prevOpen = this->m_info;
-		
+
 		list = this;
 	}
 
@@ -1638,7 +1720,7 @@ PathfindCell *PathfindCell::removeFromClosedList( PathfindCell *list )
 	DEBUG_ASSERTCRASH(m_info->m_closed==TRUE && m_info->m_open==FALSE, ("Serious error - Invalid flags. jba"));
 	if (m_info->m_nextOpen)
 		m_info->m_nextOpen->m_prevOpen = m_info->m_prevOpen;
-	
+
 	if (m_info->m_prevOpen)
 		m_info->m_prevOpen->m_nextOpen = m_info->m_nextOpen;
 	else
@@ -1717,10 +1799,20 @@ UnsignedInt PathfindCell::costSoFar( PathfindCell *parent )
 	Int numTurns = 0;
 	PathfindCell *prevCell = parent->getParentCell();
 	if (prevCell) {
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+		// TheSuperHackers @info this is a possible crash point in the retail pathfinding, we just prevent the crash at this point
+		// External code should catch the issue in another block and cleanup the pathfinding before switching to the fixed pathfinding.
+		if (!prevCell->hasInfo())
+		{
+			return cost;
+		}
+#endif
+
 		ICoord2D dir;
 		dir.x = prevCell->getXIndex() - parent->getXIndex();
 		dir.y = prevCell->getYIndex() - parent->getYIndex();
-		
+
 		// count number of direction changes
 		if (dir.x != prevDir.x || dir.y != prevDir.y)
 		{
@@ -1746,18 +1838,18 @@ inline Bool typesMatch(const PathfindCell &targetCell, const PathfindCell &sourc
 	PathfindCell::CellType targetType = targetCell.getType();
 	PathfindCell::CellType srcType = sourceCell.getType();
 	if (targetType == srcType) return true;
-	
+
 	return false;
 }
 
 inline Bool waterGround(const PathfindCell &targetCell, const PathfindCell &sourceCell) {
 	PathfindCell::CellType targetType = targetCell.getType();
 	PathfindCell::CellType srcType = sourceCell.getType();
-	if ( (targetType==PathfindCell::CELL_CLEAR && 
+	if ( (targetType==PathfindCell::CELL_CLEAR &&
 		(srcType&PathfindCell::CELL_WATER ))) {
 			return true;
 	}
-	if ( (srcType==PathfindCell::CELL_CLEAR && 
+	if ( (srcType==PathfindCell::CELL_CLEAR &&
 		(targetType&PathfindCell::CELL_WATER ))) {
 			return true;
 	}
@@ -1768,11 +1860,11 @@ inline Bool waterGround(const PathfindCell &targetCell, const PathfindCell &sour
 inline Bool groundRubble(const PathfindCell &targetCell, const PathfindCell &sourceCell) {
 	PathfindCell::CellType targetType = targetCell.getType();
 	PathfindCell::CellType srcType = sourceCell.getType();
-	if ( (targetType==PathfindCell::CELL_CLEAR && 
+	if ( (targetType==PathfindCell::CELL_CLEAR &&
 		(srcType==PathfindCell::CELL_RUBBLE ))) {
 			return true;
 	}
-	if ( (srcType==PathfindCell::CELL_CLEAR && 
+	if ( (srcType==PathfindCell::CELL_CLEAR &&
 		(targetType==PathfindCell::CELL_RUBBLE ))) {
 			return true;
 	}
@@ -1814,12 +1906,12 @@ inline Bool crusherGround(const PathfindCell &targetCell, const PathfindCell &so
 inline Bool groundCliff(const PathfindCell &targetCell, const PathfindCell &sourceCell) {
 	PathfindCell::CellType targetType = targetCell.getType();
 	PathfindCell::CellType srcType = sourceCell.getType();
-	
-	if ( (targetType==PathfindCell::CELL_CLIFF ) && 
+
+	if ( (targetType==PathfindCell::CELL_CLIFF ) &&
 			 (srcType==PathfindCell::CELL_CLEAR) ) {
 			return true;
 	}
-	if ( (targetType==PathfindCell::CELL_CLEAR ) && 
+	if ( (targetType==PathfindCell::CELL_CLEAR ) &&
 			 (srcType==PathfindCell::CELL_CLIFF) ) {
 			return true;
 	}
@@ -1862,7 +1954,7 @@ static void __fastcall resolveZones(Int srcZone, Int targetZone, zoneStorageType
 		finalZone = zoneEquivalency[srcZone];
 	}
 	DEBUG_ASSERTCRASH(finalZone<sizeOfZE ,  ("Bad resolve zones	."));
-	for (i=0; i<sizeOfZE; i++) { 
+	for (i=0; i<sizeOfZE; i++) {
 		zoneStorageType ze = zoneEquivalency[i];
 		if (ze == targetZone || ze == srcZone) {
 			zoneEquivalency[i] = finalZone;
@@ -1896,7 +1988,6 @@ inline void applyZone(PathfindCell &targetCell, const PathfindCell &sourceCell,
 {
 	DEBUG_ASSERTCRASH(sourceCell.getZone()!=0, ("Unset source zone."));
 	Int srcZone = zoneEquivalency[sourceCell.getZone()];
-	//DEBUG_ASSERTCRASH(srcZone!=0, ("Bad zone equivalency zone."));
 	Int targetZone = zoneEquivalency[targetCell.getZone()];
 
 	if (targetZone == 0) {
@@ -1912,7 +2003,7 @@ inline void applyZone(PathfindCell &targetCell, const PathfindCell &sourceCell,
 
 inline void applyBlockZone(PathfindCell &targetCell, const PathfindCell &sourceCell,
 													 zoneStorageType *zoneEquivalency, Int firstZone, Int sizeOfZE)
-{	
+{
 	DEBUG_ASSERTCRASH(sourceCell.getZone()>=firstZone && sourceCell.getZone()<firstZone+sizeOfZE, ("Memory overrun - FATAL ERROR."));
 	Int srcZone = zoneEquivalency[sourceCell.getZone()-firstZone];
 	DEBUG_ASSERTCRASH(targetCell.getZone()>=firstZone && sourceCell.getZone()<firstZone+sizeOfZE, ("Memory overrun - FATAL ERROR."));
@@ -1925,52 +2016,44 @@ inline void applyBlockZone(PathfindCell &targetCell, const PathfindCell &sourceC
 }
 
 //------------------------  ZoneBlock  -------------------------------
-ZoneBlock::ZoneBlock() : m_firstZone(0), 
-m_numZones(0), 
-m_groundCliffZones(NULL), 
-m_groundWaterZones(NULL), 
-m_groundRubbleZones(NULL), 
-m_crusherZones(NULL), 
+ZoneBlock::ZoneBlock() : m_firstZone(0),
+m_numZones(0),
+m_groundCliffZones(NULL),
+m_groundWaterZones(NULL),
+m_groundRubbleZones(NULL),
+m_crusherZones(NULL),
 m_zonesAllocated(0),
 m_interactsWithBridge(FALSE)
-{		
+{
 	m_cellOrigin.x = 0;
 	m_cellOrigin.y = 0;
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_firstZone = 0;
 	m_markedPassable = TRUE;
-	//
 }
 
-ZoneBlock::~ZoneBlock()  
+ZoneBlock::~ZoneBlock()
 {
 	freeZones();
 }
 
-void ZoneBlock::freeZones(void) 
+void ZoneBlock::freeZones(void)
 {
-	if (m_groundCliffZones) {
-		delete [] m_groundCliffZones;
-		m_groundCliffZones = NULL;
-	}
-	if (m_groundWaterZones) {
-		delete [] m_groundWaterZones;
-		m_groundWaterZones = NULL;
-	}
-	if (m_groundRubbleZones) {
-		delete [] m_groundRubbleZones;
-		m_groundRubbleZones = NULL;
-	}
-	if (m_crusherZones) {
-		delete [] m_crusherZones;
-		m_crusherZones = NULL;
-	}
+	delete [] m_groundCliffZones;
+	m_groundCliffZones = NULL;
+
+	delete [] m_groundWaterZones;
+	m_groundWaterZones = NULL;
+
+	delete [] m_groundRubbleZones;
+	m_groundRubbleZones = NULL;
+
+	delete [] m_crusherZones;
+	m_crusherZones = NULL;
 }
 
 /* Allocate zone equivalency arrays large enough to hold required entries.  If the arrays are already
 large enough, reuse.  Then calculate terrain equivalencies. */
-void ZoneBlock::blockCalculateZones(PathfindCell **map, PathfindLayer layers[], const IRegion2D &bounds) 
+void ZoneBlock::blockCalculateZones(PathfindCell **map, PathfindLayer layers[], const IRegion2D &bounds)
 {
 	Int i, j;
 	m_cellOrigin = bounds.lo;
@@ -2034,13 +2117,13 @@ void ZoneBlock::blockCalculateZones(PathfindCell **map, PathfindLayer layers[],
 			DEBUG_ASSERTCRASH(map[i][j].getZone() != 0, ("Cleared the zone."));
 		}
 	}
-	
+
 }
 
 //
 // Return the zone at this location.
 //
-zoneStorageType ZoneBlock::getEffectiveZone( LocomotorSurfaceTypeMask acceptableSurfaces, 
+zoneStorageType ZoneBlock::getEffectiveZone( LocomotorSurfaceTypeMask acceptableSurfaces,
 																					 Bool crusher, zoneStorageType zone) const
 {
 	DEBUG_ASSERTCRASH(zone, ("Zone not set"));
@@ -2050,7 +2133,7 @@ zoneStorageType ZoneBlock::getEffectiveZone( LocomotorSurfaceTypeMask acceptable
 			(acceptableSurfaces&LOCOMOTORSURFACE_WATER) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_CLIFF)) {
 		// Locomotors can go on ground, water & cliff, so all is zone 1.
-		return 1; 
+		return 1;
 	}
 	if (m_numZones<2) {
 		return m_firstZone; // if we only got 1 zone, it's all the same zone.
@@ -2071,7 +2154,7 @@ zoneStorageType ZoneBlock::getEffectiveZone( LocomotorSurfaceTypeMask acceptable
 		// Locomotors can go on ground & cliff, so use the ground cliff combiner.
 		zone = m_groundCliffZones[zone];
 		DEBUG_ASSERTCRASH(zone >=m_firstZone && zone < m_firstZone+m_numZones, ("Invalid range."));
-		return zone; 
+		return zone;
 	}
 
 	if ( (acceptableSurfaces&LOCOMOTORSURFACE_GROUND) &&
@@ -2079,20 +2162,20 @@ zoneStorageType ZoneBlock::getEffectiveZone( LocomotorSurfaceTypeMask acceptable
 		// Locomotors can go on ground & water, so use the ground water combiner.
 		zone = m_groundWaterZones[zone];
 		DEBUG_ASSERTCRASH(zone >=m_firstZone && zone < m_firstZone+m_numZones, ("Invalid range."));
-		return zone; 
+		return zone;
 	}
 
 	if ( (acceptableSurfaces&LOCOMOTORSURFACE_GROUND) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_RUBBLE)) {
 		// Locomotors can go on ground & rubble, so use the ground rubble combiner.
 		zone = m_groundRubbleZones[zone];
-		return zone; 
+		return zone;
 	}
 
 	if ( (acceptableSurfaces&LOCOMOTORSURFACE_CLIFF) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_WATER)) {
 		// Locomotors can go on ground & cliff, so use the ground cliff combiner.
-		DEBUG_CRASH(("Cliff water only locomotor sets not supported yet.")); 
+		DEBUG_CRASH(("Cliff water only locomotor sets not supported yet."));
 	}
 
 	return zone+m_firstZone;
@@ -2101,7 +2184,7 @@ zoneStorageType ZoneBlock::getEffectiveZone( LocomotorSurfaceTypeMask acceptable
 
 /* Allocate zone equivalency arrays large enough to hold m_maxZone entries.  If the arrays are already
 large enough, just return. */
-void ZoneBlock::allocateZones(void) 
+void ZoneBlock::allocateZones(void)
 {
 	if (m_zonesAllocated>m_numZones && m_groundCliffZones!=NULL) {
 		return;
@@ -2111,7 +2194,7 @@ void ZoneBlock::allocateZones(void)
 	if (m_numZones==1) {
 		return; // we don't need any zone equivalency tables.
 	}
-	
+
 	if (m_zonesAllocated == 0) {
 		m_zonesAllocated = 4;
 	}
@@ -2127,87 +2210,79 @@ void ZoneBlock::allocateZones(void)
 
 
 //------------------------  PathfindZoneManager  -------------------------------
-PathfindZoneManager::PathfindZoneManager() : m_maxZone(0), 
-m_needToCalculateZones(false), 
-m_groundCliffZones(NULL), 
-m_groundWaterZones(NULL), 
-m_groundRubbleZones(NULL), 
-m_terrainZones(NULL), 
-m_crusherZones(NULL), 
-m_hierarchicalZones(NULL), 
+PathfindZoneManager::PathfindZoneManager() : m_maxZone(0),
+m_needToCalculateZones(false),
+m_groundCliffZones(NULL),
+m_groundWaterZones(NULL),
+m_groundRubbleZones(NULL),
+m_terrainZones(NULL),
+m_crusherZones(NULL),
+m_hierarchicalZones(NULL),
 m_blockOfZoneBlocks(NULL),
 m_zoneBlocks(NULL),
 m_zonesAllocated(0)
-{		
+{
 	m_zoneBlockExtent.x = 0;
 	m_zoneBlockExtent.y = 0;
 }
 
-PathfindZoneManager::~PathfindZoneManager()  
+PathfindZoneManager::~PathfindZoneManager()
 {
 	freeZones();
 	freeBlocks();
 }
 
-void PathfindZoneManager::freeZones() 
+void PathfindZoneManager::freeZones()
 {
-	if (m_groundCliffZones) {
-		delete [] m_groundCliffZones;
-		m_groundCliffZones = NULL;
-	}
-	if (m_groundWaterZones) {
-		delete [] m_groundWaterZones;
-		m_groundWaterZones = NULL;
-	}
-	if (m_groundRubbleZones) {
-		delete [] m_groundRubbleZones;
-		m_groundRubbleZones = NULL;
-	}
-	if (m_terrainZones) {
-		delete [] m_terrainZones;
-		m_terrainZones = NULL;
-	}
-	if (m_crusherZones) {
-		delete [] m_crusherZones;
-		m_crusherZones = NULL;
-	}
-	if (m_hierarchicalZones) {
-		delete [] m_hierarchicalZones;
-		m_hierarchicalZones = NULL;
-	}
+	delete [] m_groundCliffZones;
+	m_groundCliffZones = NULL;
+
+	delete [] m_groundWaterZones;
+	m_groundWaterZones = NULL;
+
+	delete [] m_groundRubbleZones;
+	m_groundRubbleZones = NULL;
+
+	delete [] m_terrainZones;
+	m_terrainZones = NULL;
+
+	delete [] m_crusherZones;
+	m_crusherZones = NULL;
+
+	delete [] m_hierarchicalZones;
+	m_hierarchicalZones = NULL;
+
 	m_zonesAllocated = 0;
 }
 
-void PathfindZoneManager::freeBlocks() 
+void PathfindZoneManager::freeBlocks()
 {
-	if (m_blockOfZoneBlocks) {
-		delete [] m_blockOfZoneBlocks;
-		m_blockOfZoneBlocks = NULL;
-	}
-	if (m_zoneBlocks) {
-		delete [] m_zoneBlocks;
-		m_zoneBlocks = NULL;
-	}
+	delete [] m_blockOfZoneBlocks;
+	m_blockOfZoneBlocks = NULL;
+
+	delete [] m_zoneBlocks;
+	m_zoneBlocks = NULL;
+
 	m_zoneBlockExtent.x = 0;
 	m_zoneBlockExtent.y = 0;
 }
 
 /* Allocate zone equivalency arrays large enough to hold m_maxZone entries.  If the arrays are already
 large enough, just return. */
-void PathfindZoneManager::allocateZones(void) 
+void PathfindZoneManager::allocateZones(void)
 {
 	if (m_zonesAllocated>m_maxZone && m_groundCliffZones!=NULL) {
 		return;
 	}
 	freeZones();
-	
+
 	if (m_zonesAllocated == 0) {
 		m_zonesAllocated = INITIAL_ZONES;
 	}
 	while (m_zonesAllocated <= m_maxZone) {
 		m_zonesAllocated *= 2;
 	}
-	DEBUG_LOG(("Allocating zone tables of size %d\n", m_zonesAllocated));
+	DEBUG_LOG(("Allocating zone tables of size %d", m_zonesAllocated));
 	// pool[]ify
 	m_groundCliffZones = MSGNEW("PathfindZoneInfo") zoneStorageType[m_zonesAllocated];
 	m_groundWaterZones = MSGNEW("PathfindZoneInfo") zoneStorageType[m_zonesAllocated];
@@ -2218,7 +2293,7 @@ void PathfindZoneManager::allocateZones(void)
 }
 
 /* Allocate zone blocks for hierarchical pathfinding.   */
-void PathfindZoneManager::allocateBlocks(const IRegion2D &globalBounds) 
+void PathfindZoneManager::allocateBlocks(const IRegion2D &globalBounds)
 {
 	freeBlocks();
 
@@ -2236,17 +2311,17 @@ void PathfindZoneManager::allocateBlocks(const IRegion2D &globalBounds)
 void PathfindZoneManager::markZonesDirty(void)  ///< Called when the zones need to be recalculated.
 {
 	m_needToCalculateZones = true;
-} 
+}
 
 void PathfindZoneManager::reset(void)  ///< Called when the map is reset.
 {
 	freeZones();
 	freeBlocks();
-} 
+}
 
 /**
  * Calculate zones.  A zone is an area of the same terrain - clear, water or cliff.
- * The utility of zones is that if current location and destiontion are in the same zone, 
+ * The utility of zones is that if current location and destiontion are in the same zone,
  * you can successfully pathfind.
  * If you are a multiple terrain vehicle, like amphibious transport, the lookup is a little more
  * complicated.
@@ -2254,7 +2329,7 @@ void PathfindZoneManager::reset(void)  ///< Called when the map is reset.
 void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer layers[], const IRegion2D &globalBounds )
 {
 #ifdef DEBUG_QPF
-#if defined(DEBUG_LOGGING) 
+#if defined(DEBUG_LOGGING)
 	__int64 startTime64;
 	double timeToUpdate=0.0f;
 	__int64 endTime64,freq64;
@@ -2263,7 +2338,6 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 #endif
 #endif
 
-
 	m_maxZone = 1;	// we start using zone 0 as a flag.
 	const Int maxZones=24000;
 	zoneStorageType zoneEquivalency[maxZones];
@@ -2323,16 +2397,15 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 					if (cell->getConnectLayer() > LAYER_GROUND) {
  						m_zoneBlocks[xBlock][yBlock].setInteractsWithBridge(true);
 					}
-					
+
 				}
 			}
-			//DEBUG_LOG(("Collapsed zones %d\n", m_maxZone));
  		}
 	}
 
 	Int totalZones = m_maxZone;
 	if (totalZones>maxZones/2) {
-		DEBUG_LOG(("Max zones %d\n", m_maxZone));
+		DEBUG_LOG(("Max zones %d", m_maxZone));
 	}
 
 	// Collapse the zones into a 1,2,3... sequence, removing collapsed zones.
@@ -2352,7 +2425,7 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 #if defined(DEBUG_LOGGING)
 	QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 	timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
-	DEBUG_LOG(("Time to calculate first %f\n", timeToUpdate));
+	DEBUG_LOG(("Time to calculate first %f", timeToUpdate));
 #endif
 #endif
 	// Now map the zones in the map back into the collapsed zones.
@@ -2378,9 +2451,9 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 		if (!layers[i].isUnused() && !layers[i].isDestroyed()) {
 			ICoord2D ndx;
 			layers[i].getStartCellIndex(&ndx);
-			setBridge(ndx.x, ndx.y, true);	
+			setBridge(ndx.x, ndx.y, true);
 			layers[i].getEndCellIndex(&ndx);
-			setBridge(ndx.x, ndx.y, true);	
+			setBridge(ndx.x, ndx.y, true);
 		}
 	}
 
@@ -2408,10 +2481,10 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 	}
 
 #ifdef DEBUG_QPF
-#if defined(DEBUG_LOGGING) 
+#if defined(DEBUG_LOGGING)
 	QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 	timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
-	DEBUG_LOG(("Time to calculate second %f\n", timeToUpdate));
+	DEBUG_LOG(("Time to calculate second %f", timeToUpdate));
 #endif
 #endif
 
@@ -2427,7 +2500,7 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 
 	for( j=globalBounds.lo.y; j<=globalBounds.hi.y; j++ )	{
 		for( i=globalBounds.lo.x; i<=globalBounds.hi.x; i++ )	{
-			if ( (map[i][j].getConnectLayer() > LAYER_GROUND) && 
+			if ( (map[i][j].getConnectLayer() > LAYER_GROUND) &&
 				(map[i][j].getType() == PathfindCell::CELL_CLEAR) ) {
 				PathfindLayer *layer = layers + map[i][j].getConnectLayer();
 				resolveZones(map[i][j].getZone(), layer->getZone(), m_hierarchicalZones, m_maxZone);
@@ -2443,7 +2516,7 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 					Int zone1 = map[i][j].getZone();
 					Int zone2 = map[i-1][j].getZone();
 					if (m_terrainZones[zone1] != m_terrainZones[zone2]) {
-						//DEBUG_LOG(("Matching terrain zone %d to %d.\n", zone1, zone2));
+						//DEBUG_LOG(("Matching terrain zone %d to %d.", zone1, zone2));
 					}
 					applyZone(map[i][j], map[i-1][j], m_groundRubbleZones, m_maxZone);
 				}
@@ -2468,7 +2541,7 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 					Int zone1 = map[i][j].getZone();
 					Int zone2 = map[i][j-1].getZone();
 					if (m_terrainZones[zone1] != m_terrainZones[zone2]) {
-						//DEBUG_LOG(("Matching terrain zone %d to %d.\n", zone1, zone2));
+						//DEBUG_LOG(("Matching terrain zone %d to %d.", zone1, zone2));
 					}
 					applyZone(map[i][j], map[i][j-1], m_groundRubbleZones, m_maxZone);
 				}
@@ -2481,19 +2554,6 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 				if (crusherGround(map[i][j], map[i][j-1])) {
 					applyZone(map[i][j], map[i][j-1], m_crusherZones, m_maxZone);
 				}
-/* No diagonals.  jba.
-				if (i>globalBounds.lo.x) {
-					if (waterGround(map[i][j],map[i-1][j-1])) {
-						applyZone(map[i][j], map[i-1][j-1], m_groundWaterZones, m_maxZone);
-					}
-					if (groundCliff(map[i][j],map[i-1][j-1])) {
-						applyZone(map[i][j], map[i-1][j-1], m_groundCliffZones, m_maxZone);
-					}
-					if (terrain(map[i][j],map[i-1][j-1])) {
-						applyZone(map[i][j], map[i-1][j-1], m_terrainZones, m_maxZone);
-					}
-				}
-*/
 			}
 			DEBUG_ASSERTCRASH(map[i][j].getZone() != 0, ("Cleared the zone."));
 		}
@@ -2515,14 +2575,14 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 
 
 #ifdef DEBUG_QPF
-#if defined(DEBUG_LOGGING) 
+#if defined(DEBUG_LOGGING)
 	QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 	timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
-	DEBUG_LOG(("Time to calculate zones %f, cells %d\n", timeToUpdate, (globalBounds.hi.x-globalBounds.lo.x)*(globalBounds.hi.y-globalBounds.lo.y)));
+	DEBUG_LOG(("Time to calculate zones %f, cells %d", timeToUpdate, (globalBounds.hi.x-globalBounds.lo.x)*(globalBounds.hi.y-globalBounds.lo.y)));
 #endif
 #endif
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	if (TheGlobalData->m_debugAI && false) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugAI && false)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 		RGBColor color;
@@ -2554,7 +2614,7 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 //
 // Clear the passable flags.
 //
-void PathfindZoneManager::clearPassableFlags( ) 
+void PathfindZoneManager::clearPassableFlags( )
 {	Int blockX;
 	Int blockY;
 	for (blockX = 0; blockX<m_zoneBlockExtent.x; blockX++) {
@@ -2567,7 +2627,7 @@ void PathfindZoneManager::clearPassableFlags( )
 //
 // Set the passable flags.
 //
-void PathfindZoneManager::setAllPassable( ) 
+void PathfindZoneManager::setAllPassable( )
 {	Int blockX;
 	Int blockY;
 	for (blockX = 0; blockX<m_zoneBlockExtent.x; blockX++) {
@@ -2580,7 +2640,7 @@ void PathfindZoneManager::setAllPassable( )
 //
 // Set the passable flag for the block at this location.
 //
-void PathfindZoneManager::setPassable(Int cellX, Int cellY, Bool passable) 
+void PathfindZoneManager::setPassable(Int cellX, Int cellY, Bool passable)
 {
 	Int blockX = cellX/ZONE_BLOCK_SIZE;
 	Int blockY = cellY/ZONE_BLOCK_SIZE;
@@ -2635,7 +2695,7 @@ Bool PathfindZoneManager::clipIsPassable(Int cellX, Int cellY) const
 //
 // Set the bridge flag for the block at this location.
 //
-void PathfindZoneManager::setBridge(Int cellX, Int cellY, Bool bridge) 
+void PathfindZoneManager::setBridge(Int cellX, Int cellY, Bool bridge)
 {
 	Int blockX = cellX/ZONE_BLOCK_SIZE;
 	Int blockY = cellY/ZONE_BLOCK_SIZE;
@@ -2677,7 +2737,7 @@ Bool PathfindZoneManager::interactsWithBridge(Int cellX, Int cellY) const
 //
 zoneStorageType PathfindZoneManager::getBlockZone(LocomotorSurfaceTypeMask acceptableSurfaces, Bool crusher,Int cellX, Int cellY, PathfindCell **map) const
 {
-	PathfindCell *cell = &(map[cellX][cellY]); 
+	PathfindCell *cell = &(map[cellX][cellY]);
 	Int blockX = cellX/ZONE_BLOCK_SIZE;
 	Int blockY = cellY/ZONE_BLOCK_SIZE;
 
@@ -2708,7 +2768,7 @@ zoneStorageType PathfindZoneManager::getEffectiveTerrainZone(zoneStorageType zon
 //
 // Return the zone at this location.
 //
-zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask acceptableSurfaces, 
+zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask acceptableSurfaces,
 																										Bool crusher, zoneStorageType zone) const
 {
 	//DEBUG_ASSERTCRASH(zone, ("Zone not set"));
@@ -2726,7 +2786,7 @@ zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask
 			(acceptableSurfaces&LOCOMOTORSURFACE_WATER) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_CLIFF)) {
 		// Locomotors can go on ground, water & cliff, so all is zone 1.
-		return 1; 
+		return 1;
 	}
 
 	if (crusher) {
@@ -2737,27 +2797,27 @@ zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask
 			(acceptableSurfaces&LOCOMOTORSURFACE_CLIFF)) {
 		// Locomotors can go on ground & cliff, so use the ground cliff combiner.
 		zone = m_groundCliffZones[zone];
-		return zone; 
+		return zone;
 	}
 
 	if ( (acceptableSurfaces&LOCOMOTORSURFACE_GROUND) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_WATER)) {
 		// Locomotors can go on ground & water, so use the ground water combiner.
 		zone = m_groundWaterZones[zone];
-		return zone; 
+		return zone;
 	}
 
 	if ( (acceptableSurfaces&LOCOMOTORSURFACE_GROUND) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_RUBBLE)) {
 		// Locomotors can go on ground & rubble, so use the ground rubble combiner.
 		zone = m_groundRubbleZones[zone];
-		return zone; 
+		return zone;
 	}
 
 	if ( (acceptableSurfaces&LOCOMOTORSURFACE_CLIFF) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_WATER)) {
 		// Locomotors can go on ground & cliff, so use the ground cliff combiner.
-		DEBUG_CRASH(("Cliff water only locomotor sets not supported yet.")); 
+		DEBUG_CRASH(("Cliff water only locomotor sets not supported yet."));
 	}
 	zone = m_hierarchicalZones[zone];
 
@@ -2765,15 +2825,12 @@ zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask
 }
 //-------------------- PathfindLayer ----------------------------------------
 PathfindLayer::PathfindLayer() : m_blockOfMapCells(NULL), m_layerCells(NULL), m_bridge(NULL),
-// Added By Sadullah Nader
-// Initializations inserted
 m_destroyed(FALSE),
 m_height(0),
 m_width(0),
 m_xOrigin(0),
 m_yOrigin(0),
 m_zone(0)
-//
 {
 	m_startCell.x = -1;
 	m_startCell.y = -1;
@@ -2781,15 +2838,15 @@ m_zone(0)
 	m_endCell.y = -1;
 }
 
-PathfindLayer::~PathfindLayer()  
+PathfindLayer::~PathfindLayer()
 {
 	reset();
 }
 
 /**
- * Returns true if the layer is avaialble for use.
+ * Returns true if the layer is available for use.
  */
-void PathfindLayer::reset(void) 
+void PathfindLayer::reset(void)
 {
 	m_bridge = NULL;
 	if (m_layerCells) {
@@ -2803,14 +2860,14 @@ void PathfindLayer::reset(void)
 		delete [] m_layerCells;
 		m_layerCells = NULL;
 	}
-	if (m_blockOfMapCells) {
-		delete [] m_blockOfMapCells;
-		m_blockOfMapCells = NULL;
-	}
+
+	delete [] m_blockOfMapCells;
+	m_blockOfMapCells = NULL;
+
 	m_width = 0;
 	m_height = 0;
 	m_xOrigin = 0;
-	m_yOrigin = 0;	 
+	m_yOrigin = 0;
 	m_startCell.x = -1;
 	m_startCell.y = -1;
 	m_endCell.x = -1;
@@ -2821,7 +2878,7 @@ void PathfindLayer::reset(void)
 /**
  * Returns true if the layer is avaialble for use.
  */
-Bool PathfindLayer::isUnused(void) 
+Bool PathfindLayer::isUnused(void)
 {
 	// Special case - wall layer is built from not a bridge.  jba.
 	if (m_layer == LAYER_WALL && m_width>0) return false;
@@ -2835,7 +2892,7 @@ Bool PathfindLayer::isUnused(void)
 /**
  * Draws debug cell info.
  */
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 void PathfindLayer::doDebugIcons(void) {
 	if (isUnused()) return;
 	extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -2843,7 +2900,7 @@ void PathfindLayer::doDebugIcons(void) {
 	{
 		Coord3D topLeftCorner;
 		RGBColor color;
-		color.red = color.green = color.blue = 0;	
+		color.red = color.green = color.blue = 0;
 		Coord3D center;
 		center.x = (m_xOrigin+m_width/2)*PATHFIND_CELL_SIZE_F;
 		center.y = (m_yOrigin+m_height/2)*PATHFIND_CELL_SIZE_F;
@@ -2861,10 +2918,10 @@ void PathfindLayer::doDebugIcons(void) {
 			for( int i=0; i<m_width; i++ )
 			{
 				topLeftCorner.x = (Real)(i+m_xOrigin) * PATHFIND_CELL_SIZE_F;
-				
-				color.red = color.green = color.blue = 0;	
+
+				color.red = color.green = color.blue = 0;
 				Bool empty = true;
-				
+
 				const PathfindCell *cell = &m_layerCells[i][j];
 				if (cell)
 				{
@@ -2878,11 +2935,11 @@ void PathfindLayer::doDebugIcons(void) {
 					}	else if (cell->getType() == PathfindCell::CELL_CLIFF) {
 							color.red = 1;
 							empty = false;
-					}	
+					}
 				}
 				if (showCells) {
 					empty = true;
-					color.red = color.green = color.blue = 0;	
+					color.red = color.green = color.blue = 0;
 					if (empty && cell) {
 						if (cell->getFlags()!=PathfindCell::NO_UNITS) {
 							empty = false;
@@ -2891,7 +2948,7 @@ void PathfindLayer::doDebugIcons(void) {
 							}	else if (cell->getFlags() == PathfindCell::UNIT_PRESENT_FIXED) {
 								color.green = color.blue = color.red = 1;
 							}	else if (cell->getFlags() == PathfindCell::UNIT_PRESENT_MOVING) {
-								color.green = 1; 
+								color.green = 1;
 							}	else {
 								color.green = color.red = 1;
 							}
@@ -2915,7 +2972,7 @@ void PathfindLayer::doDebugIcons(void) {
 /**
  * Sets the bridge & layer number for a layer.
  */
-Bool PathfindLayer::init(Bridge *theBridge, PathfindLayerEnum layer)  
+Bool PathfindLayer::init(Bridge *theBridge, PathfindLayerEnum layer)
 {
 	if (m_bridge!=NULL) return false;
 	m_bridge = theBridge;
@@ -2972,7 +3029,7 @@ void PathfindLayer::allocateCellsForWallLayer(const IRegion2D *extent, ObjectID
 	if (m_layer != LAYER_WALL) return;
 	Region2D bridgeBounds;
 
-	Int i; 
+	Int i;
 	Bool first = true;
 	for (i=0; i<numPieces; i++) {
 		Object *obj = TheGameLogic->findObjectByID(wallPieces[i]);
@@ -3067,7 +3124,7 @@ void PathfindLayer::classifyCells()
 			PathfindCell *cell = &m_layerCells[i][j];
 			cell->setConnectLayer(LAYER_INVALID);
 			cell->setLayer(m_layer);
-			classifyLayerMapCell(i+m_xOrigin, j+m_yOrigin, cell, m_bridge);	
+			classifyLayerMapCell(i+m_xOrigin, j+m_yOrigin, cell, m_bridge);
 		}
 		BridgeInfo info;
 		m_bridge->getBridgeInfo(&info);
@@ -3118,7 +3175,7 @@ void PathfindLayer::classifyWallCells(ObjectID *wallPieces, Int numPieces)
 			PathfindCell *cell = &m_layerCells[i][j];
 			cell->setConnectLayer(LAYER_INVALID);
 			cell->setLayer(m_layer);
-			classifyWallMapCell(i+m_xOrigin, j+m_yOrigin, cell, wallPieces, numPieces);	
+			classifyWallMapCell(i+m_xOrigin, j+m_yOrigin, cell, wallPieces, numPieces);
 			cell->setPinched(false);
 		}
 	}
@@ -3172,7 +3229,7 @@ void PathfindLayer::classifyWallCells(ObjectID *wallPieces, Int numPieces)
 Bool PathfindLayer::setDestroyed(Bool destroyed)
 {
 	if (destroyed == m_destroyed) return false;
-	
+
 	m_destroyed = destroyed;
 	classifyCells();
 
@@ -3223,7 +3280,6 @@ PathfindCell *PathfindLayer::getCell(Int x, Int y)
 }
 
 
-
 /**
  * Classify the given map cell as clear, or not, etc.
  */
@@ -3265,7 +3321,7 @@ void PathfindLayer::classifyLayerMapCell( Int i, Int j , PathfindCell *cell, Bri
 		if (bridgeCount!=0) {
 			cell->setType(PathfindCell::CELL_CLIFF); // it's off the bridge.
 		}
-		
+
 		// check against the end lines.
 
 		Region2D cellBounds;
@@ -3310,7 +3366,7 @@ void PathfindLayer::classifyLayerMapCell( Int i, Int j , PathfindCell *cell, Bri
 
 Bool PathfindLayer::isPointOnWall(ObjectID *wallPieces, Int numPieces, const Coord3D *pt)
 {
-	Int i; 
+	Int i;
 	for (i=0; i<numPieces; i++) {
 		Object *obj = TheGameLogic->findObjectByID(wallPieces[i]);
 		if (obj==NULL) continue;
@@ -3378,7 +3434,7 @@ void PathfindLayer::classifyWallMapCell( Int i, Int j , PathfindCell *cell, Obje
 		if (bridgeCount!=0) {
 			cell->setType(PathfindCell::CELL_CLIFF); // it's off the bridge.
 		}
-		
+
 	}
 }
 
@@ -3399,16 +3455,13 @@ Pathfinder::~Pathfinder( void )
 void Pathfinder::reset( void )
 {
 	frameToShowObstacles = 0;
-	DEBUG_LOG(("Pathfind cell is %d bytes, PathfindCellInfo is %d bytes\n", sizeof(PathfindCell), sizeof(PathfindCellInfo)));
+	DEBUG_LOG(("Pathfind cell is %d bytes, PathfindCellInfo is %d bytes", sizeof(PathfindCell), sizeof(PathfindCellInfo)));
 
-	if (m_blockOfMapCells) {
-		delete []m_blockOfMapCells;
-		m_blockOfMapCells = NULL;
-	}
-	if (m_map) {	 
-		delete [] m_map;
-		m_map = NULL;
-	}
+	delete [] m_blockOfMapCells;
+	m_blockOfMapCells = NULL;
+
+	delete [] m_map;
+	m_map = NULL;
 
 	Int i;
 	for (i=0; i<=LAYER_LAST; i++) {
@@ -3434,10 +3487,9 @@ void Pathfinder::reset( void )
 	debugPathPos.y = 0.0f;
 	debugPathPos.z = 0.0f;
 
-	if (debugPath)
-		deleteInstance(debugPath);
-
+	deleteInstance(debugPath);
 	debugPath = NULL;
+
 	m_frameToShowObstacles = 0;
 
 	for (m_queuePRHead=0; m_queuePRHead<PATHFIND_QUEUE_LEN; m_queuePRHead++) {
@@ -3460,10 +3512,15 @@ void Pathfinder::reset( void )
 		m_wallHeight = 0.0f;
 	}
 	m_zoneManager.reset();
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+	s_useFixedPathfinding = false;
+	s_forceCleanCells = false;
+#endif
 }
 
-/** 
- * Adds a piece of a wall. 
+/**
+ * Adds a piece of a wall.
  */
 void Pathfinder::addWallPiece(Object *wallPiece)
 {
@@ -3500,14 +3557,14 @@ void Pathfinder::removeWallPiece(Object *wallPiece)
 			// all done
 			return;
 
-		}  // end if
+		}
 
-	}  // end for, i
+	}
 
-}  // end removeWallPiece
+}
 
-/** 
- * Checks if a point is on the wall. 
+/**
+ * Checks if a point is on the wall.
  */
 Bool Pathfinder::isPointOnWall(const Coord3D *pos)
 {
@@ -3524,8 +3581,8 @@ Bool Pathfinder::isPointOnWall(const Coord3D *pos)
 	return false;
 }
 
-/** 
- * Adds a bridge & returns the layer. 
+/**
+ * Adds a bridge & returns the layer.
  */
 PathfindLayerEnum Pathfinder::addBridge(Bridge *theBridge)
 {
@@ -3535,7 +3592,7 @@ PathfindLayerEnum Pathfinder::addBridge(Bridge *theBridge)
 			if (m_layers[layer].init(theBridge, (PathfindLayerEnum)layer) ) {
 				return (PathfindLayerEnum)layer;
 			}
-			DEBUG_LOG(("WARNING: Bridge failed to init in pathfinder\n"));
+			DEBUG_LOG(("WARNING: Bridge failed to init in pathfinder"));
 			return LAYER_GROUND; // failed to init, usually cause off of the map.  jba.
 		}
 		layer++;
@@ -3544,8 +3601,8 @@ PathfindLayerEnum Pathfinder::addBridge(Bridge *theBridge)
 	return LAYER_GROUND;
 }
 
-/** 
- * Updates an object's layer, making sure the object is actually on the bridge first. 
+/**
+ * Updates an object's layer, making sure the object is actually on the bridge first.
  */
 void Pathfinder::updateLayer(Object *obj, PathfindLayerEnum layer)
 {
@@ -3554,29 +3611,29 @@ void Pathfinder::updateLayer(Object *obj, PathfindLayerEnum layer)
 			layer = LAYER_GROUND;
 		}
 	}
-	//DEBUG_LOG(("Object layer is %d\n", layer));
+	//DEBUG_LOG(("Object layer is %d", layer));
 	obj->setLayer(layer);
 }
 
-/** 
+/**
  * Classify the cells under the given object
- * If 'insert' is true, object is being added 
- * If 'insert' is false, object is being removed 
+ * If 'insert' is true, object is being added
+ * If 'insert' is false, object is being removed
  */
 void Pathfinder::classifyFence( Object *obj, Bool insert )
 {
 	m_zoneManager.markZonesDirty();
-	
+
 	const Coord3D *pos = obj->getPosition();
   Real angle = obj->getOrientation();
- 
+
  	Real halfsizeX = obj->getTemplate()->getFenceWidth()/2;
  	Real halfsizeY = PATHFIND_CELL_SIZE_F/10.0f;
  	Real fenceOffset = obj->getTemplate()->getFenceXOffset();
 
  	Real c = (Real)Cos(angle);
  	Real s = (Real)Sin(angle);
- 		
+
  	const Real STEP_SIZE = PATHFIND_CELL_SIZE_F * 0.5f;	// in theory, should be PATHFIND_CELL_SIZE_F exactly, but needs to be smaller to avoid aliasing problems
  	Real ydx = s * STEP_SIZE;
  	Real ydy = -c * STEP_SIZE;
@@ -3608,54 +3665,14 @@ void Pathfinder::classifyFence( Object *obj, Bool insert )
  				else
  					m_map[cx][cy].removeObstacle(obj);
  			}
- 			
  		}
  	}
-
-#if 0 
-	// Perhaps it would make more sense to use the iteratecellsalongpath() provided in this class,
-	// but this way works well and is very traceable
-	// neither one is true Bresenham
-	// this one assumes zero fence thickness
-
-	const Coord3D *fencePos = obj->getPosition();
-	Coord3D fenceNorm;
-	obj->getUnitDirectionVector2D( fenceNorm );
-	Coord3D halfLength = fenceNorm;
-	halfLength.scale( obj->getGeometryInfo().getMajorRadius() );
-
-	Coord3D head = *fencePos;
-	head.add( &halfLength );
-	Coord3D tail = *fencePos;
-	tail.sub( &halfLength );
-
-	Real stepLength = 1.0f / ((halfLength.length()*2.0f) / PATHFIND_CELL_SIZE_F);
-
-	for ( Real t = 0.0f; t <= 1.0f; t += stepLength )
-	{
-		Real lengthWalk_x = (head.x * t) + (tail.x * (1.0f-t));
-		Real lengthWalk_y = (head.y * t) + (tail.y * (1.0f-t));
-
-		Int cx = REAL_TO_INT_FLOOR( lengthWalk_x / PATHFIND_CELL_SIZE_F );
-		Int cy = REAL_TO_INT_FLOOR( lengthWalk_y / PATHFIND_CELL_SIZE_F );
-		if (cx >= 0 && cy >= 0 && cx < m_extent.hi.x && cy < m_extent.hi.y)
-		{
-			if (insert) {
-				ICoord2D pos = { cx, cy };
-				m_map[cx][cy].setTypeAsObstacle( obj, true, pos );
-			}
-			else
-				m_map[cx][cy].removeObstacle(obj);
-		}
-	}
-#endif
-
 }
 
-/** 
+/**
  * Classify the cells under the given object
- * If 'insert' is true, object is being added 
- * If 'insert' is false, object is being removed 
+ * If 'insert' is true, object is being added
+ * If 'insert' is false, object is being removed
  */
 void Pathfinder::classifyObjectFootprint( Object *obj, Bool insert )
 {
@@ -3671,7 +3688,7 @@ void Pathfinder::classifyObjectFootprint( Object *obj, Bool insert )
 		return;  // It is important to not abuse bridge towers.
 	}
 
-	if (obj->getTemplate()->getFenceWidth() > 0.0f) 
+	if (obj->getTemplate()->getFenceWidth() > 0.0f)
 	{
 		if (!obj->isKindOf(KINDOF_DEFENSIVE_WALL))
 		{
@@ -3685,7 +3702,7 @@ void Pathfinder::classifyObjectFootprint( Object *obj, Bool insert )
 		// removing, so it's safer to just remove it, as by the time some units "die", they've become
 		// lifeless immobile husks of debris, but we still need to remove them.  jba.
 		removeUnitFromPathfindMap(obj);
-		if (obj->isKindOf(KINDOF_WALK_ON_TOP_OF_WALL)) { 
+		if (obj->isKindOf(KINDOF_WALK_ON_TOP_OF_WALL)) {
 			if (!m_layers[LAYER_WALL].isUnused()) {
 				Int i;
 				ObjectID curID = obj->getID();
@@ -3698,7 +3715,7 @@ void Pathfinder::classifyObjectFootprint( Object *obj, Bool insert )
 				Object *obj;
 				for (obj = TheGameLogic->getFirstObject(); obj; obj=obj->getNextObject()) {
 					if (obj->getLayer() == LAYER_WALL) {
-						if (m_layers[LAYER_WALL].isPointOnWall(&curID, 1, obj->getPosition())) 
+						if (m_layers[LAYER_WALL].isPointOnWall(&curID, 1, obj->getPosition()))
 						{
 							// The object fell off the wall.
 							// Destroy it.
@@ -3748,7 +3765,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 
 			Real c = (Real)Cos(angle);
 			Real s = (Real)Sin(angle);
-				
+
 			const Real STEP_SIZE = PATHFIND_CELL_SIZE_F * 0.5f;	// in theory, should be PATHFIND_CELL_SIZE_F exactly, but needs to be smaller to avoid aliasing problems
 			Real ydx = s * STEP_SIZE;
 			Real ydy = -c * STEP_SIZE;
@@ -3831,11 +3848,11 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 								m_map[i][j].removeObstacle( obj );
 						}
 					}
-				} // for i
-			} // for j
-		} // cylinder
+				}
+			}
+		}
 		break;
-	} // switch
+	}
 	Region2D bounds;
 	Int i, j;
 	obj->getGeometryInfo().get2DBounds(*obj->getPosition(), obj->getOrientation(), bounds);
@@ -3860,71 +3877,6 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 		cellBounds.hi.y = m_extent.hi.y;
 	}
 
-
-
-	// Expand building bounds 1 cell.
-#define no_EXPAND_ONE_CELL
-#ifdef EXPAND_ONE_CELL
-	for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )
-	{
-		for( i=cellBounds.lo.x; i<=cellBounds.hi.x; i++ )
-		{
-			if (!insert) {
-				if (m_map[i][j].getType() == PathfindCell::CELL_IMPASSABLE) {
-					m_map[i][j].setType(PathfindCell::CELL_CLEAR);
-				}
-				m_map[i][j].setPinched(false);
-			}
-			if (!insert) {
-				if (m_map[i][j].isObstaclePresent(obj->getID())) {
-					m_map[i][j].removeObstacle( obj );
-				}
-				continue;
-			}
-			if (m_map[i][j].getType() == PathfindCell::CELL_CLEAR) {
-				Bool obstacleAdjacent = false;
-				Int k, l;
-				for (k=i-1; k<i+2; k++) {
-					if (k<m_extent.lo.x || k> m_extent.hi.x) continue;
-					for (l=j-1; l<j+2; l++) {
-						if (l<m_extent.lo.y || l> m_extent.hi.y) continue;
-						if ((k==i) && (l==j)) continue;
-						if ((k!=i) && (l!=j)) continue;
-						if (m_map[k][l].getType()!=PathfindCell::CELL_CLEAR)) {	
-							objectAdjacent = true;
-							break;
-						}
-
-					}
-				}
-				if (obstacleAdjacent) {
-					m_map[i][j].setPinched(true);
-				}
-				// If the total open cells are < 2
-			}
-		}
-	}	 
-
-	if (insert) {
-		for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )
-		{
-			for( i=cellBounds.lo.x; i<=cellBounds.hi.x; i++ )
-			{
-				if (m_map[i][j].getPinched() && m_map[i][j].getType() == PathfindCell::CELL_CLEAR) {
-					ICoord2D pos;
-					pos.x = i;
-					pos.y = j;
-					m_map[i][j].setTypeAsObstacle( obj, false, pos );
-					//m_map[i][j].setType(PathfindCell::CELL_CLIFF);
-					m_map[i][j].setPinched(false);
-				}
-			}
-		}
-	}
-#endif
-
-
-
 	if (!insert) {
 		for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )
 		{
@@ -3981,8 +3933,6 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 	}
 
 	// Expand building bounds 1 cell.
-#define MARK_BORDER_PINCHED
-#ifdef MARK_BORDER_PINCHED
 	for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )
 	{
 		for( i=cellBounds.lo.x; i<=cellBounds.hi.x; i++ )
@@ -3996,7 +3946,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 						if (l<m_extent.lo.y || l> m_extent.hi.y) continue;
 						if ((k==i) && (l==j)) continue;
 						if ((k!=i) && (l!=j)) continue;
-						if (m_map[k][l].getType() == PathfindCell::CELL_OBSTACLE) {	
+						if (m_map[k][l].getType() == PathfindCell::CELL_OBSTACLE) {
 							objectAdjacent = true;
 							break;
 						}
@@ -4008,16 +3958,12 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 				}
 			}
 		}
-	}	
-#endif
-
-
-
+	}
 }
 
 /**
  * Classify the given map cell as WATER, CLIFF, etc.
- * Note that this does NOT classify cells as OBSTACLES. 
+ * Note that this does NOT classify cells as OBSTACLES.
  * OBSTACLE cells are classified only via objects.
  * @todo optimize this - lots of redundant computation
  */
@@ -4140,7 +4086,7 @@ void Pathfinder::classifyMap(void)
 					for (l=j-1; l<j+2; l++) {
 						if (l<m_extent.lo.y || l> m_extent.hi.y) continue;
 						if (m_map[k][l].getType() == PathfindCell::CELL_CLEAR) {
-							m_map[k][l].setPinched(true);	
+							m_map[k][l].setPinched(true);
 						}
 
 					}
@@ -4172,7 +4118,7 @@ void Pathfinder::classifyMap(void)
 					for (l=j-1; l<j+2; l++) {
 						if (l<m_extent.lo.y || l> m_extent.hi.y) continue;
 						if (m_map[k][l].getType() == PathfindCell::CELL_CLEAR) {
-							m_map[k][l].setPinched(true);	
+							m_map[k][l].setPinched(true);
 						}
 
 					}
@@ -4209,13 +4155,11 @@ void Pathfinder::debugShowSearch(  Bool pathFound  )
 	if (!TheGlobalData->m_debugAI) {
 		return;
 	}
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 
 	// show all explored cells for debugging
 	PathfindCell *s;
-
-		
 	RGBColor color;
 	color.red = color.blue = color.green = 1;
 	if (!pathFound) {
@@ -4238,7 +4182,6 @@ void Pathfinder::debugShowSearch(  Bool pathFound  )
 
 	for( s = m_closedList; s; s=s->getNextOpen() )
 	{
-		// create objects to show path - they decay
 		// create objects to show path - they decay
 		RGBColor color;
 		color.red = color.blue = 1;
@@ -4246,7 +4189,7 @@ void Pathfinder::debugShowSearch(  Bool pathFound  )
 		if (!pathFound)	color.blue = 0;
 
 		Int length=200;
-		if (!pathFound) 
+		if (!pathFound)
 			length *= 2;
 
 		Coord3D pos;
@@ -4272,26 +4215,28 @@ Locomotor* Pathfinder::chooseBestLocomotorForPosition(PathfindLayerEnum layer, L
 
 /*static*/ LocomotorSurfaceTypeMask Pathfinder::validLocomotorSurfacesForCellType(PathfindCell::CellType t)
 {
-	if (t == PathfindCell::CELL_OBSTACLE) {
-		return LOCOMOTORSURFACE_AIR;
-	}
-	if (t == PathfindCell::CELL_IMPASSABLE) {
-		return LOCOMOTORSURFACE_AIR;
-	}
-	if (t==PathfindCell::CELL_CLEAR) {
-		return LOCOMOTORSURFACE_GROUND | LOCOMOTORSURFACE_AIR;
-	}
-	if (t == PathfindCell::CELL_WATER) {
-		return LOCOMOTORSURFACE_WATER | LOCOMOTORSURFACE_AIR;
-	}
-	if (t == PathfindCell::CELL_RUBBLE) {
-		return LOCOMOTORSURFACE_RUBBLE | LOCOMOTORSURFACE_AIR;
-	}
-	if ( t == PathfindCell::CELL_CLIFF ) {
-		return LOCOMOTORSURFACE_CLIFF | LOCOMOTORSURFACE_AIR;
-	}
-	return NO_SURFACES;
-}
+	switch (t)
+	{
+		case PathfindCell::CELL_CLEAR:
+			return LOCOMOTORSURFACE_GROUND | LOCOMOTORSURFACE_AIR;
+
+		case PathfindCell::CELL_WATER:
+			return LOCOMOTORSURFACE_WATER | LOCOMOTORSURFACE_AIR;
+
+		case PathfindCell::CELL_CLIFF:
+			return LOCOMOTORSURFACE_CLIFF | LOCOMOTORSURFACE_AIR;
+
+		case PathfindCell::CELL_RUBBLE:
+			return LOCOMOTORSURFACE_RUBBLE | LOCOMOTORSURFACE_AIR;
+
+		case PathfindCell::CELL_OBSTACLE:
+		case PathfindCell::CELL_IMPASSABLE:
+			return LOCOMOTORSURFACE_AIR;
+
+		default:
+			return NO_SURFACES;
+	}
+}
 
 //
 // Return true if we can move onto this position
@@ -4310,7 +4255,7 @@ Bool Pathfinder::validMovementTerrain( PathfindLayerEnum layer, const Locomotor*
 	if (toCell->getType()==PathfindCell::CELL_OBSTACLE) return true;
 	if (toCell->getType()==PathfindCell::CELL_IMPASSABLE) return true;
 	if (toCell->getLayer()!=LAYER_GROUND && toCell->getLayer() == PathfindCell::CELL_CLEAR) {
-		return true; 
+		return true;
 	}
 	// check validity of destination cell
 	LocomotorSurfaceTypeMask acceptableSurfaces = validLocomotorSurfacesForCellType(toCell->getType());
@@ -4327,43 +4272,40 @@ void Pathfinder::cleanOpenAndClosedLists(void) {
 	if (m_openList) {
 		count += PathfindCell::releaseOpenList(m_openList);
 		m_openList = NULL;
-	}		 
+	}
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+	// TheSuperHackers @info this is here as the map cells are contained within the pathfinder and cannot be cleaned externally.
+	// If the crash mode within PathfindCell::releaseOpenList is hit, it will set s_forceCleanCells to allow the system to cleanly recover.
+	if (s_forceCleanCells) {
+		forceCleanCells();
+		// TheSuperHackers @info cells on the closed list are forcefully cleaned up by this point
+		s_forceCleanCells = false;
+	}
+#endif
+
 	if (m_closedList) {
 		count += PathfindCell::releaseClosedList(m_closedList);
 		m_closedList = NULL;
-	}		 
-	m_cumulativeCellsAllocated += count;
-//#ifdef RTS_DEBUG
-#if 0
-	// Check for dangling cells.
-	for( int j=0; j<=m_extent.hi.y; j++ )
-		for( int i=0; i<=m_extent.hi.x; i++ )
-			if (m_map[ i ][ j ].hasInfo()) {
-				DEBUG_ASSERTCRASH((m_map[i][j].getXIndex()==i && m_map[i][j].getYIndex()==j), ("Wrong cell coordinates"));
-				Bool needInfo = (m_map[ i ][ j ].getType() == PathfindCell::CELL_OBSTACLE);
-				if (m_map[i][j].isAircraftGoal()) {
-					needInfo = true;
-				}
-				if (m_map[i][j].getFlags() != PathfindCell::NO_UNITS)  {
-					needInfo = true;
-				}				
-				if (!needInfo) {
-					DEBUG_LOG(("leaked cell %d, %d\n", m_map[i][j].getXIndex(), m_map[i][j].getYIndex()));
-					m_map[i][j].releaseInfo();
-				}
-				DEBUG_ASSERTCRASH((needInfo), ("Minor temporary memory leak - Extra cell allocated.  Tell JBA steps if repeatable."));
-			};
-	//DEBUG_LOG(("Pathfind used %d cells.\n", count));
+	}
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+	// TheSuperHackers @info this is here and performs the same function as the above block, but for when the crash occurs within the closed list.
+	// If the crash mode within PathfindCell::releaseClosedList is hit, it will set s_forceCleanCells to allow the system to cleanly recover.
+	if (s_forceCleanCells) {
+		forceCleanCells();
+		s_forceCleanCells = false;
+	}
 #endif
-//#endif
 
+	m_cumulativeCellsAllocated += count;
 }
 
 
 //
 // Return true if we can move onto this position
 //
-Bool Pathfinder::validMovementPosition( Bool isCrusher, LocomotorSurfaceTypeMask acceptableSurfaces, 
+Bool Pathfinder::validMovementPosition( Bool isCrusher, LocomotorSurfaceTypeMask acceptableSurfaces,
 																			 PathfindCell *toCell, PathfindCell *fromCell )
 {
 	if (toCell == NULL)
@@ -4383,49 +4325,6 @@ Bool Pathfinder::validMovementPosition( Bool isCrusher, LocomotorSurfaceTypeMask
 	if ((cellSurfaces & acceptableSurfaces) == 0)
 		return false;
 
-#if 0	
-	//
-	// For diagonal moves, check neighboring vertical and horizontal
-	// steps as well to avoid "squeezing through a crack".
-	//
-	if (fromCell)
-	{
-		ICoord2D delta;
-
-		delta.x = toCell->getXIndex() - fromCell->getXIndex();
-		delta.y = toCell->getYIndex() - fromCell->getYIndex();
-
-		if (delta.x != 0 && delta.y != 0)
-		{
-			// test vertical movement
-			PathfindCell *otherCell = getCell( toCell->getXIndex(), fromCell->getYIndex() );
-			Bool open = true;
-
-			// check if cell is on the map
-			if (otherCell == NULL)
-				open = false;
-
-			// check if we can move onto this new cell
-			if (validMovementPosition( locomotorSet, otherCell, fromCell ) == false)
-				open = false;
-
-			// test horizontal movement
-			if (open == false)
-			{
-				otherCell = getCell( fromCell->getXIndex(), toCell->getYIndex() );
-
-				// check if cell is on the map
-				if (otherCell == NULL)
-					return false;
-
-				// check if we can move onto this new cell
-				if (validMovementPosition( locomotorSet, otherCell, fromCell ) == false)
-					return false;
-			}
-		}
-	}
-#endif
-
 	return true;
 }
 
@@ -4451,49 +4350,63 @@ Bool Pathfinder::checkDestination(const Object *obj, Int cellX, Int cellY, Pathf
 	for (i=cellX-iRadius; i<cellX+numCellsAbove; i++) {
 		for (j=cellY-iRadius; j<cellY+numCellsAbove; j++) {
 			PathfindCell	*cell = getCell(layer, i, j);
-			if (cell) {
-				if (checkForAircraft) {
-					if (!cell->isAircraftGoal()) continue;
-					if (cell->getGoalAircraft()==objID) continue;
-					return false;
+			if (!cell) {
+				return false; // off the map, so can't place here.
+			}
+
+			if (checkForAircraft) {
+				if (!cell->isAircraftGoal()) {
+					continue;
 				}
-				if (cell->getType()==PathfindCell::CELL_OBSTACLE) {
-					if (cell->isObstaclePresent( ignoreId ))
-						continue;
-					return false;
+				if (cell->getGoalAircraft() == objID) {
+					continue;
 				}
-				if (cell->getFlags() == PathfindCell::NO_UNITS) {
-					continue;  // Nobody is here, so it's ok.
-				} 
-				ObjectID goalUnitID = cell->getGoalUnit();
-				if (goalUnitID==objID) {
-					continue; // we got it.
-				} else if (ignoreId==goalUnitID) {
-					continue; // we are ignoring it.
-				} else if (goalUnitID!=INVALID_ID) {
-					if (obj==NULL) {
-						return false;
-					}
-					Object *unit = TheGameLogic->findObjectByID(goalUnitID);
-					if (unit) {
-						// order matters: we want to know if I consider it to be an ally, not vice versa
-						if (obj->getRelationship(unit) == ALLIES) {
-							return false; 	// Don't usurp your allies goals.  jba.
-						}	
-						if (cell->getFlags()==PathfindCell::UNIT_PRESENT_FIXED) {
-							Bool canCrush = obj->canCrushOrSquish(unit, TEST_CRUSH_OR_SQUISH);
-							if (!canCrush) {
-								return false; // Don't move to an occupied cell.
-							}							
-						}
-					}
+				return false;
+			}
+
+			if (cell->getType()==PathfindCell::CELL_OBSTACLE) {
+				if (cell->isObstaclePresent( ignoreId ))
+					continue;
+				return false;
+			}
+
+			if (cell->getFlags() == PathfindCell::NO_UNITS) {
+				continue;  // Nobody is here, so it's ok.
+			}
+
+			ObjectID goalUnitID = cell->getGoalUnit();
+			if (goalUnitID == objID) {
+				continue; // we got it.
+			}
+
+			if (goalUnitID == ignoreId) {
+				continue; // we are ignoring it.
+			}
+
+			if (goalUnitID == INVALID_ID) {
+				continue;
+			}
+
+			if (!obj) {
+				return false;
+			}
+			Object *unit = TheGameLogic->findObjectByID(goalUnitID);
+			if (!unit) {
+				continue;
+			}
+
+			// order matters: we want to know if I consider it to be an ally, not vice versa
+			if (obj->getRelationship(unit) == ALLIES) {
+				return false; 	// Don't usurp your allies goals.  jba.
+			}
+			if (cell->getFlags()==PathfindCell::UNIT_PRESENT_FIXED) {
+				Bool canCrush = obj->canCrushOrSquish(unit, TEST_CRUSH_OR_SQUISH);
+				if (!canCrush) {
+					return false; // Don't move to an occupied cell.
 				}
-			} else {
-				return false; // off the map, so can't place here.
 			}
 		}
-	}	
-
+	}
 	return true;
 }
 
@@ -4502,7 +4415,7 @@ Bool Pathfinder::checkDestination(const Object *obj, Int cellX, Int cellY, Pathf
  * Returns false if there are other units already there.
  * Assumes your locomotor already said you can go there.
  */
-Bool Pathfinder::checkForMovement(const Object *obj, TCheckMovementInfo &info)	  
+Bool Pathfinder::checkForMovement(const Object *obj, TCheckMovementInfo &info)
 {
 	info.allyFixedCount = 0;
 	info.allyMoving = false;
@@ -4513,7 +4426,10 @@ Bool Pathfinder::checkForMovement(const Object *obj, TCheckMovementInfo &info)
 	ObjectID		allies[maxAlly];
 	Int					numAlly = 0;
 
-	if (!obj) return true; // not object can move there.
+	if (!obj) {
+		return true; // not object can move there.
+	}
+
 	ObjectID ignoreId = INVALID_ID;
 	if (obj->getAIUpdateInterface()) {
 		ignoreId =  obj->getAIUpdateInterface()->getIgnoredObstacleID();
@@ -4526,81 +4442,86 @@ Bool Pathfinder::checkForMovement(const Object *obj, TCheckMovementInfo &info)
 	for (i=info.cell.x-info.radius; i<info.cell.x+numCellsAbove; i++) {
 		for (j=info.cell.y-info.radius; j<info.cell.y+numCellsAbove; j++) {
 			PathfindCell	*cell = getCell(info.layer,i, j);
-			if (cell) {
-				enum PathfindCell::CellFlags flags = cell->getFlags();
-				ObjectID posUnit = cell->getPosUnit();
-				if ((flags == PathfindCell::UNIT_GOAL) || (flags == PathfindCell::UNIT_GOAL_OTHER_MOVING)) {
-					info.allyGoal = true;
-				}
-				if (flags == PathfindCell::NO_UNITS) {
-					continue;  // Nobody is here, so it's ok.
-				} else if (posUnit==obj->getID()) {
-					continue; // we got it.
-				} else if (posUnit==ignoreId) {
-					continue; // we are ignoring this one.
-				}	else {
-					Bool check = false;
-					Object *unit = NULL;
-					if (flags==PathfindCell::UNIT_PRESENT_MOVING || flags==PathfindCell::UNIT_GOAL_OTHER_MOVING) {
-						unit = TheGameLogic->findObjectByID(posUnit);
-						// order matters: we want to know if I consider it to be an ally, not vice versa
-						if (unit && obj->getRelationship(unit) == ALLIES) {
-							info.allyMoving = true;
-						}
-						if (info.considerTransient) {
-							check = true;
-						}
-					}
-					if (flags == PathfindCell::UNIT_PRESENT_FIXED) {
-						check = true;
-						unit = TheGameLogic->findObjectByID(posUnit);
-					}
-					if (check && unit!=NULL) {
-						if (obj->getAIUpdateInterface() && obj->getAIUpdateInterface()->getIgnoredObstacleID()==unit->getID()) {
-							// Don't check if it's the ignored obstacle.
-							check = false;
-						}
-					}
-					if (check && unit) {
+			if (!cell) {
+				return false; // off the map, so can't move here.
+			}
+
+			PathfindCell::CellFlags flags = cell->getFlags();
+			if ((flags == PathfindCell::UNIT_GOAL) || (flags == PathfindCell::UNIT_GOAL_OTHER_MOVING)) {
+				info.allyGoal = true;
+			} else if (flags == PathfindCell::NO_UNITS) {
+				continue;  // Nobody is here, so it's ok.
+			}
+
+			ObjectID posUnit = cell->getPosUnit();
+			if (posUnit == obj->getID()) {
+				continue; // we got it.
+			}
+
+			if (posUnit == ignoreId) {
+				continue; // we are ignoring this one.
+			}
+
+			Bool check = false;
+			Object *unit = NULL;
+			if (flags == PathfindCell::UNIT_PRESENT_MOVING || flags == PathfindCell::UNIT_GOAL_OTHER_MOVING) {
+				unit = TheGameLogic->findObjectByID(posUnit);
+				// order matters: we want to know if I consider it to be an ally, not vice versa
+				if (unit && obj->getRelationship(unit) == ALLIES) {
+					info.allyMoving = true;
+				}
+				if (info.considerTransient) {
+					check = true;
+				}
+			}
+			if (flags == PathfindCell::UNIT_PRESENT_FIXED) {
+				check = true;
+				unit = TheGameLogic->findObjectByID(posUnit);
+			}
+			if (check && unit!=NULL) {
+				if (obj->getAIUpdateInterface() && obj->getAIUpdateInterface()->getIgnoredObstacleID()==unit->getID()) {
+					// Don't check if it's the ignored obstacle.
+					check = false;
+				}
+			}
+			if (!check || !unit) {
+				continue;
+			}
+
 #ifdef INFANTRY_MOVES_THROUGH_INFANTRY
-						if (obj->isKindOf(KINDOF_INFANTRY) && unit->isKindOf(KINDOF_INFANTRY)) {
-							// Infantry can run through infantry.
-							continue; // 
-						}
+			if (obj->isKindOf(KINDOF_INFANTRY) && unit->isKindOf(KINDOF_INFANTRY)) {
+				// Infantry can run through infantry.
+				continue; //
+			}
 #endif
-						// See if it is an ally.
-						// order matters: we want to know if I consider it to be an ally, not vice versa
-						if (obj->getRelationship(unit) == ALLIES) {
-							if (!unit->getAIUpdateInterface()) {
-								return false; // can't path through not-idle units.
-							}
-							if (!unit->getAIUpdateInterface()->isIdle()) {
-								return false; // can't path through not-idle units.
-							}
-							Bool found = false;
-							Int k;
-							for (k=0; k<numAlly; k++) {
-								if (allies[k] == unit->getID()) {
-									found = true;
-								}
-							}
-							if (!found) {
-								info.allyFixedCount++;
-								if (numAlly < maxAlly) {
-									allies[numAlly] = unit->getID();
-									numAlly++;
-								}
-							}
-						}	else {
-							Bool canCrush = obj->canCrushOrSquish( unit, TEST_CRUSH_OR_SQUISH );
-							if (!canCrush) {
-								info.enemyFixed = true;
-							}
-						}
+			// See if it is an ally.
+			// order matters: we want to know if I consider it to be an ally, not vice versa
+			if (obj->getRelationship(unit) == ALLIES) {
+				if (!unit->getAIUpdateInterface()) {
+					return false; // can't path through not-idle units.
+				}
+				if (!unit->getAIUpdateInterface()->isIdle()) {
+					return false; // can't path through not-idle units.
+				}
+				Bool found = false;
+				Int k;
+				for (k=0; k<numAlly; k++) {
+					if (allies[k] == unit->getID()) {
+						found = true;
+					}
+				}
+				if (!found) {
+					info.allyFixedCount++;
+					if (numAlly < maxAlly) {
+						allies[numAlly] = unit->getID();
+						numAlly++;
 					}
 				}
 			} else {
-				return false; // off the map, so can't place here.
+				Bool canCrush = obj->canCrushOrSquish( unit, TEST_CRUSH_OR_SQUISH );
+				if (!canCrush) {
+					info.enemyFixed = true;
+				}
 			}
 		}
 	}
@@ -4650,44 +4571,47 @@ void Pathfinder::snapClosestGoalPosition(Object *obj, Coord3D *pos)
 
 	// Try adjusting by 1.
 	Int i,j;
-	for (i=cell.x-1; i<cell.x+2; i++) {
-		for (j=cell.y-1; j<cell.y+2; j++) {
+	for (i = cell.x - 1; i < cell.x + 2; i++) {
+		for (j = cell.y - 1; j < cell.y + 2; j++) {
 			if (checkDestination(obj, i, j, layer, iRadius, center)) {
-				adjustCoordToCell(i, j,  center, *pos, layer);
+				adjustCoordToCell(i, j, center, *pos, layer);
 				return;
 			}
 		}
 	}
-	if (iRadius==0) {
-		// Try to find an unoccupied cell.
-		for (i=cell.x-1; i<cell.x+2; i++) {
-			for (j=cell.y-1; j<cell.y+2; j++) {
-				PathfindCell	*newCell = getCell(layer,i, j);
-				if (newCell) {
-					if (newCell->getGoalUnit()==INVALID_ID || newCell->getGoalUnit()==obj->getID()) {
-						adjustCoordToCell(i, j,  center, *pos, layer);
-						return;
-					}
-				}
+
+	if (iRadius > 0)
+		return;
+
+	// Try to find an unoccupied cell.
+	for (i = cell.x - 1; i < cell.x + 2; i++) {
+		for (j = cell.y - 1; j < cell.y + 2; j++) {
+			PathfindCell* newCell = getCell(layer, i, j);
+			if (!newCell)
+				continue;
+
+			if (newCell->getGoalUnit() == INVALID_ID || newCell->getGoalUnit() == obj->getID()) {
+				adjustCoordToCell(i, j, center, *pos, layer);
+				return;
 			}
 		}
-		// Try to find an unoccupied cell.
-		for (i=cell.x-1; i<cell.x+2; i++) {
-			for (j=cell.y-1; j<cell.y+2; j++) {
-				PathfindCell	*newCell = getCell(layer,i, j);
-				if (newCell) {
-					if (newCell->getFlags()!=PathfindCell::UNIT_PRESENT_FIXED) {
-						adjustCoordToCell(i, j,  center, *pos, layer);
-						return;
-					}
-				}
+	}
+
+	for (i = cell.x - 1; i < cell.x + 2; i++) {
+		for (j = cell.y - 1; j < cell.y + 2; j++) {
+			PathfindCell* newCell = getCell(layer, i, j);
+			if (!newCell)
+				continue;
+
+			if (newCell->getFlags()!=PathfindCell::UNIT_PRESENT_FIXED) {
+				adjustCoordToCell(i, j, center, *pos, layer);
+				return;
 			}
 		}
 	}
-	//DEBUG_LOG(("Couldn't find goal.\n"));
 }
 
-/** 
+/**
  * Returns coordinates of goal.
  *
  */
@@ -4705,10 +4629,10 @@ Bool Pathfinder::goalPosition(Object *obj, Coord3D *pos)
 	return true;
 }
 
- 
+
 Bool Pathfinder::checkForAdjust(Object *obj, const LocomotorSet& locomotorSet, Bool isHuman,
-																Int cellX, Int cellY, PathfindLayerEnum layer, 
-																Int iRadius, Bool center, Coord3D *dest, const Coord3D *groupDest) 
+																Int cellX, Int cellY, PathfindLayerEnum layer,
+																Int iRadius, Bool center, Coord3D *dest, const Coord3D *groupDest)
 {
 	Coord3D adjustDest;
 	PathfindCell *cellP = getCell(layer, cellX, cellY);
@@ -4719,9 +4643,9 @@ Bool Pathfinder::checkForAdjust(Object *obj, const LocomotorSet& locomotorSet, B
 	if (isHuman) {
 		// check if new cell is in logical map.	(computer can move off logical map)
 		if (cellX < m_logicalExtent.lo.x ||
-				cellY < m_logicalExtent.lo.y || 
-				cellX > m_logicalExtent.hi.x || 
-				cellY > m_logicalExtent.hi.y) return false; 
+				cellY < m_logicalExtent.lo.y ||
+				cellX > m_logicalExtent.hi.x ||
+				cellY > m_logicalExtent.hi.y) return false;
 	}
 	if (checkDestination(obj, cellX, cellY, layer, iRadius, center)) {
 		adjustCoordToCell(cellX, cellY,  center, adjustDest, cellP->getLayer());
@@ -4733,7 +4657,7 @@ Bool Pathfinder::checkForAdjust(Object *obj, const LocomotorSet& locomotorSet, B
 		}	else {
 			pathExists = quickDoesPathExist( locomotorSet, obj->getPosition(), dest);
 			adjustedPathExists = quickDoesPathExist( locomotorSet, obj->getPosition(), &adjustDest);
-			if (!pathExists) {	
+			if (!pathExists) {
 				if (quickDoesPathExist( locomotorSet, dest, &adjustDest))	{
  					adjustedPathExists = true;
 				}
@@ -4747,9 +4671,9 @@ Bool Pathfinder::checkForAdjust(Object *obj, const LocomotorSet& locomotorSet, B
 				Int dx = IABS(groupDest->x-adjustDest.x);
 				Int dy = IABS(groupDest->y-adjustDest.y);
 				if (1.4f*(dx+dy)<cost) {
-					return false; 
+					return false;
 				}
-			}			
+			}
 			*dest = adjustDest;
 			return true;
 		}
@@ -4757,8 +4681,8 @@ Bool Pathfinder::checkForAdjust(Object *obj, const LocomotorSet& locomotorSet, B
 	return false;
 }
 
-Bool Pathfinder::checkForLanding(Int cellX, Int cellY, PathfindLayerEnum layer, 
-																Int iRadius, Bool center, Coord3D *dest) 
+Bool Pathfinder::checkForLanding(Int cellX, Int cellY, PathfindLayerEnum layer,
+																Int iRadius, Bool center, Coord3D *dest)
 {
 	Coord3D adjustDest;
 	PathfindCell *cellP = getCell(layer, cellX, cellY);
@@ -4806,8 +4730,7 @@ Bool Pathfinder::adjustToLandingDestination(Object *obj, Coord3D *dest)
 	}
 	worldToCell( &adjustDest, &cell );
 
-	enum {MAX_CELLS_TO_TRY=400};
-	Int limit = MAX_CELLS_TO_TRY; 
+	Int limit = MAX_ADJUSTMENT_CELL_COUNT;
 	Int i, j;
 	i = cell.x;
 	j = cell.y;
@@ -4851,9 +4774,7 @@ Bool Pathfinder::adjustToLandingDestination(Object *obj, Coord3D *dest)
 		delta++;
 	}
 	return false;
-}	
-
-
+}
 
 
 /**
@@ -4886,8 +4807,7 @@ Bool Pathfinder::adjustDestination(Object *obj, const LocomotorSet& locomotorSet
 		layer = TheTerrainLogic->getLayerForDestination(groupDest);
 	}
 
-	enum {MAX_CELLS_TO_TRY=400};
-	Int limit = MAX_CELLS_TO_TRY; 
+	Int limit = MAX_ADJUSTMENT_CELL_COUNT;
 	Int i, j;
 	i = cell.x;
 	j = cell.y;
@@ -4933,14 +4853,12 @@ Bool Pathfinder::adjustDestination(Object *obj, const LocomotorSet& locomotorSet
 		// Didn't work, so just do simple adjust.
 		return(adjustDestination(obj, locomotorSet, dest, NULL));
 	}
-	//DEBUG_LOG(("adjustDestination failed, dest (%f, %f), adj dest (%f,%f), %x %s\n", dest->x, dest->y, adjustDest.x, adjustDest.y,
-		//obj, obj->getTemplate()->getName().str()));
 	return false;
 }
 
 Bool Pathfinder::checkForTarget(const Object *obj, 	Int cellX, Int cellY, const Weapon *weapon,
 																const Object *victim, const Coord3D *victimPos,
-																Int iRadius, Bool center,Coord3D *dest) 
+																Int iRadius, Bool center,Coord3D *dest)
 {
 	Coord3D adjustDest;
 	if (checkDestination(obj, cellX, cellY, LAYER_GROUND, iRadius, center)) {
@@ -4957,7 +4875,7 @@ Bool Pathfinder::checkForTarget(const Object *obj, 	Int cellX, Int cellY, const
  * Find an unoccupied spot for a unit to move to that can fire at victim.
  * Returns false if there are no spots available within a reasonable radius.
  */
-Bool Pathfinder::adjustTargetDestination(const Object *obj, const Object *target, const Coord3D *targetPos, 
+Bool Pathfinder::adjustTargetDestination(const Object *obj, const Object *target, const Coord3D *targetPos,
 																				 const Weapon *weapon, Coord3D *dest)
 {
 	Int iRadius;
@@ -4972,8 +4890,8 @@ Bool Pathfinder::adjustTargetDestination(const Object *obj, const Object *target
 	if (worldToCell( &adjustDest, &cell )) {
 		return false; // outside of bounds.
 	}
-	enum {MAX_CELLS_TO_TRY=400};
-	Int limit = MAX_CELLS_TO_TRY; 
+
+	Int limit = MAX_ADJUSTMENT_CELL_COUNT;
 	Int i, j;
 	i = cell.x;
 	j = cell.y;
@@ -5018,8 +4936,8 @@ Bool Pathfinder::adjustTargetDestination(const Object *obj, const Object *target
 	return false;
 }
 
-Bool Pathfinder::checkForPossible(Bool isCrusher, Int fromZone,  Bool center, const LocomotorSet& locomotorSet, 
-																	Int cellX, Int cellY, PathfindLayerEnum layer, Coord3D *dest, Bool startingInObstacle) 
+Bool Pathfinder::checkForPossible(Bool isCrusher, Int fromZone,  Bool center, const LocomotorSet& locomotorSet,
+																	Int cellX, Int cellY, PathfindLayerEnum layer, Coord3D *dest, Bool startingInObstacle)
 {
 	PathfindCell *goalCell = getCell(layer, cellX, cellY);
 	if (!goalCell) return false;
@@ -5039,7 +4957,7 @@ Bool Pathfinder::checkForPossible(Bool isCrusher, Int fromZone,  Bool center, co
  * Find a pathable spot near the destination.
  * Returns false if there are no spots available within a reasonable radius.
  */
-Bool Pathfinder::adjustToPossibleDestination(Object *obj, const LocomotorSet& locomotorSet, 
+Bool Pathfinder::adjustToPossibleDestination(Object *obj, const LocomotorSet& locomotorSet,
 																						 Coord3D *dest)
 {
 	Int radius;
@@ -5058,7 +4976,7 @@ Bool Pathfinder::adjustToPossibleDestination(Object *obj, const LocomotorSet& lo
 	// determine goal cell
 	PathfindCell *goalCell;
 	PathfindLayerEnum destinationLayer = TheTerrainLogic->getLayerForDestination(dest);
-	
+
 	goalCell = getCell(destinationLayer, goalCellNdx.x, goalCellNdx.y);
 
 
@@ -5076,10 +4994,9 @@ Bool Pathfinder::adjustToPossibleDestination(Object *obj, const LocomotorSet& lo
 		return false;
 	}
 
-	//
 	Int zone1, zone2;
 	Bool isCrusher = obj ? obj->getCrusherLevel() > 0 : false;
-	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, parentCell->getZone());
 	Bool isObstacle = false;
 	if (parentCell->getType() == PathfindCell::CELL_OBSTACLE)	{
 		isObstacle = true;
@@ -5097,8 +5014,7 @@ Bool Pathfinder::adjustToPossibleDestination(Object *obj, const LocomotorSet& lo
 		}
 	}
 
-	enum {MAX_CELLS_TO_TRY=400};
-	Int limit = MAX_CELLS_TO_TRY; 
+	Int limit = MAX_ADJUSTMENT_CELL_COUNT;
 	Int i, j;
 	i = goalCellNdx.x;
 	j = goalCellNdx.y;
@@ -5162,12 +5078,12 @@ Bool Pathfinder::queueForPath(ObjectID id)
 			AIUpdateInterface *tmpAI = tmpObj->getAIUpdateInterface();
 			if (tmpAI) {
 				const Coord3D* pos = tmpAI->friend_getRequestedDestination();
-				DEBUG_ASSERTLOG(pos->x != 0.0 && pos->y != 0.0, ("Queueing pathfind to (0, 0), usually a bug. (Unit Name: '%s', Type: '%s' \n", tmpObj->getName().str(), tmpObj->getTemplate()->getName().str()));
+				DEBUG_ASSERTLOG(pos->x != 0.0 && pos->y != 0.0, ("Queueing pathfind to (0, 0), usually a bug. (Unit Name: '%s', Type: '%s')", tmpObj->getName().str(), tmpObj->getTemplate()->getName().str()));
 			}
 		}
 	}
 #endif
-	
+
 	/* Check & see if we are already queued. */
 	Int slot = m_queuePRHead;
 	while (slot != m_queuePRTail) {
@@ -5194,7 +5110,7 @@ Bool Pathfinder::queueForPath(ObjectID id)
 	return true;
 }
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 void Pathfinder::doDebugIcons(void) {
 	const Int FRAMES_TO_SHOW_OBSTACLES = 100;
 	extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -5204,7 +5120,7 @@ void Pathfinder::doDebugIcons(void) {
 	}
 
 		RGBColor color;
-		color.red = color.green = color.blue = 0;	
+		color.red = color.green = color.blue = 0;
 		addIcon(NULL, 0, 0, color);	 // clear.
 		Coord3D topLeftCorner;
 		Bool showCells = TheGlobalData->m_debugAI==AI_DEBUG_CELLS;
@@ -5215,7 +5131,7 @@ void Pathfinder::doDebugIcons(void) {
 		if (!showCells)	{
 			frameToShowObstacles = TheGameLogic->getFrame()+FRAMES_TO_SHOW_OBSTACLES;
 			//return;
-		}	
+		}
 		// show the pathfind grid
 		for( int j=0; j<getExtent()->y; j++ )
 		{
@@ -5224,10 +5140,10 @@ void Pathfinder::doDebugIcons(void) {
 			for( int i=0; i<getExtent()->x; i++ )
 			{
 				topLeftCorner.x = (Real)i * PATHFIND_CELL_SIZE_F;
-				
-				color.red = color.green = color.blue = 0;	
+
+				color.red = color.green = color.blue = 0;
 				Bool empty = true;
-				
+
 				const PathfindCell *cell = TheAI->pathfinder()->getCell( LAYER_GROUND, i, j );
 				if (cell)
 				{
@@ -5267,7 +5183,7 @@ void Pathfinder::doDebugIcons(void) {
 				}
 				if (showCells) {
 					empty = true;
-					color.red = color.green = color.blue = 0;	
+					color.red = color.green = color.blue = 0;
 					if (empty && cell) {
 						if (cell->getFlags()!=PathfindCell::NO_UNITS) {
 							empty = false;
@@ -5310,8 +5226,6 @@ Path *Pathfinder::getAircraftPath( const Object *obj, const Coord3D *to )
 {
 	// for now, quick path objects don't pathfind, generally airborne units
 	// build a trivial one-node path containing destination, then avoid buildings.
-	
-
 	Path *thePath = newInstance(Path);
 	const AIUpdateInterface *ai = obj->getAI();
 	ObjectID avoidObject = INVALID_ID;
@@ -5344,15 +5258,15 @@ Path *Pathfinder::getAircraftPath( const Object *obj, const Coord3D *to )
 		if (segmentIntersectsTallBuilding(curNode, curNode->getNext(), avoidObject, &newPos1, &newPos2, &newPos3)) {
 			PathNode *newNode3 = newInstance(PathNode);
 			newNode3->setPosition( &newPos3 );
-			newNode3->setLayer(LAYER_GROUND);	
+			newNode3->setLayer(LAYER_GROUND);
 			curNode->append(newNode3);
 			PathNode *newNode2 = newInstance(PathNode);
 			newNode2->setPosition( &newPos2 );
-			newNode2->setLayer(LAYER_GROUND);	
+			newNode2->setLayer(LAYER_GROUND);
 			curNode->append(newNode2);
 			PathNode *newNode1 = newInstance(PathNode);
 			newNode1->setPosition( &newPos1 );
-			newNode1->setLayer(LAYER_GROUND);	
+			newNode1->setLayer(LAYER_GROUND);
 			curNode->append(newNode1);
 			curNode = newNode2;
 		}
@@ -5375,7 +5289,7 @@ Path *Pathfinder::getAircraftPath( const Object *obj, const Coord3D *to )
 }
 
 
-/** 
+/**
  * Process some path requests in the pathfind queue.
  */
 //DECLARE_PERF_TIMER(processPathfindQueue)
@@ -5415,7 +5329,7 @@ void Pathfinder::processPathfindQueue(void)
 
 	m_cumulativeCellsAllocated = 0;	// Number of pathfind cells examined.
 	Int pathsFound = 0;
-	while (m_cumulativeCellsAllocated < PATHFIND_CELLS_PER_FRAME && 
+	while (m_cumulativeCellsAllocated < PATHFIND_CELLS_PER_FRAME &&
 		m_queuePRTail!=m_queuePRHead) {
 		Object *obj = TheGameLogic->findObjectByID(m_queuedPathfindRequests[m_queuePRHead]);
 		m_queuedPathfindRequests[m_queuePRHead] = INVALID_ID;
@@ -5436,16 +5350,15 @@ void Pathfinder::processPathfindQueue(void)
 #ifdef DEBUG_LOGGING
 		QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 		timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
-		if (timeToUpdate>0.01f) 
+		if (timeToUpdate>0.01f)
 		{
-			DEBUG_LOG(("%d Pathfind queue: %d paths, %d cells", TheGameLogic->getFrame(), pathsFound, m_cumulativeCellsAllocated));
-			DEBUG_LOG(("Time %f (%f)", timeToUpdate, (::GetTickCount()-startTimeMS)/1000.0f));
-			DEBUG_LOG(("\n"));
+			DEBUG_LOG(("%d Pathfind queue: %d paths, %d cells --", TheGameLogic->getFrame(), pathsFound, m_cumulativeCellsAllocated));
+			DEBUG_LOG(("time %f (%f)", timeToUpdate, (::GetTickCount()-startTimeMS)/1000.0f));
 		}
 #endif
 #endif
 	}
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	doDebugIcons();
 #endif
 
@@ -5454,44 +5367,41 @@ void Pathfinder::processPathfindQueue(void)
 
 void Pathfinder::checkChangeLayers(PathfindCell *parentCell)
 {
-		ICoord2D newCellCoord;
-		PathfindCell *newCell;
-		if (parentCell->getConnectLayer() != LAYER_INVALID) {
-			newCellCoord.x = parentCell->getXIndex();
-			newCellCoord.y = parentCell->getYIndex();
+	if (parentCell->getConnectLayer() == LAYER_INVALID)
+		return;
 
-			if (parentCell->getConnectLayer() == LAYER_GROUND) {
-				newCell = getCell(LAYER_GROUND, newCellCoord.x, newCellCoord.y );
-			}	else {
-				newCell = getCell(parentCell->getConnectLayer(), newCellCoord.x, newCellCoord.y);
-			}
-			DEBUG_ASSERTCRASH(newCell, ("Couldn't find cell."));
-			if (newCell) {
-				Bool onList = false;
-				if (newCell->hasInfo()) {
-					if (newCell->getOpen() || newCell->getClosed())
-					{
-						// already on one of the lists 
-						onList = true;
-					}
-				}
-				if (!onList) {
-					if (!newCell->allocateInfo(newCellCoord)) {
-						// Out of cells for pathing...
-						return;
-					}
-					// compute cost of path thus far
-					// keep track of path we're building - point back to cell we moved here from
-					newCell->setParentCell(parentCell) ;
-					// store cost of this path
-					newCell->setCostSoFar(parentCell->getCostSoFar()); // same as parent cost
-					newCell->setTotalCost(parentCell->getTotalCost()) ;
-					// insert newCell in open list such that open list is sorted, smallest total path cost first
-					m_openList = newCell->putOnSortedOpenList( m_openList );
+	ICoord2D newCellCoord = { parentCell->getXIndex(), parentCell->getYIndex() };
+	PathfindCell *newCell = getCell(parentCell->getConnectLayer(), newCellCoord.x, newCellCoord.y );
 
-				}
-			}
-		}
+	if (!newCell) {
+		DEBUG_CRASH(("Couldn't find cell."));
+		return;
+	}
+
+	// already on one of the lists
+	if (newCell->hasInfo() && (newCell->getOpen() || newCell->getClosed())) {
+		return;
+	}
+
+	if (!newCell->allocateInfo(newCellCoord)) {
+		// Out of cells for pathing...
+		return;
+	}
+	// compute cost of path thus far
+	// keep track of path we're building - point back to cell we moved here from
+	newCell->setParentCell(parentCell) ;
+	// store cost of this path
+	newCell->setCostSoFar(parentCell->getCostSoFar()); // same as parent cost
+	newCell->setTotalCost(parentCell->getTotalCost());
+	// insert newCell in open list such that open list is sorted, smallest total path cost first
+	m_openList = newCell->putOnSortedOpenList( m_openList );
+}
+
+bool Pathfinder::checkCellOutsideExtents(ICoord2D& cell) {
+	return 	cell.x < m_logicalExtent.lo.x ||
+					cell.x > m_logicalExtent.hi.x ||
+					cell.y < m_logicalExtent.lo.y ||
+					cell.y > m_logicalExtent.hi.y;
 }
 
 
@@ -5518,23 +5428,16 @@ struct ExamineCellsStruct
 			if ( (to->getLayer() == LAYER_GROUND) && !d->thePathfinder->m_zoneManager.isPassable(to_x, to_y) ) {
 				return 1;
 			}
-			Bool onList = false;
-			if (to->hasInfo()) {
-				if (to->getOpen() || to->getClosed())
-				{
-					// already on one of the lists 
-					onList = true;
-				}
-			}
+
 			if (to->getPinched()) {
 				return 1; // abort.
 			}
 			if (d->isHuman) {
 				// check if new cell is in logical map.	(computer can move off logical map)
 				if (to_x < d->thePathfinder->m_logicalExtent.lo.x) return 1; // abort
-				if (to_y < d->thePathfinder->m_logicalExtent.lo.y) return 1; // abort 
-				if (to_x > d->thePathfinder->m_logicalExtent.hi.x) return 1; // abort 
-				if (to_y > d->thePathfinder->m_logicalExtent.hi.y) return 1; // abort 
+				if (to_y < d->thePathfinder->m_logicalExtent.lo.y) return 1; // abort
+				if (to_x > d->thePathfinder->m_logicalExtent.hi.x) return 1; // abort
+				if (to_y > d->thePathfinder->m_logicalExtent.hi.y) return 1; // abort
 			}
 			TCheckMovementInfo info;
 			info.cell.x = to_x;
@@ -5544,51 +5447,50 @@ struct ExamineCellsStruct
 			info.radius = d->radius;
 			info.considerTransient = false;
 			info.acceptableSurfaces = d->theLoco->getValidSurfaces();
-			if (!d->thePathfinder->checkForMovement(d->obj, info) || info.enemyFixed) {
+			if (!d->thePathfinder->checkForMovement(d->obj, info)) {
 				return 1; //abort.
-			}	
+			}
+
 			if (info.enemyFixed) {
 				return 1; //abort.
 			}
-			ICoord2D newCellCoord;
-			newCellCoord.x = to_x;
-			newCellCoord.y = to_y;
+
+			if (info.allyFixedCount) {
+				return 1; //abort.
+			}
 
 			UnsignedInt newCostSoFar = from->getCostSoFar( ) + 0.5f*COST_ORTHOGONAL;
 			if (to->getType() == PathfindCell::CELL_CLIFF ) {
 				return 1;
 			}
-			if (info.allyFixedCount) {
-				return 1;
-			} else if (info.enemyFixed) {
-				return 1;
-			}
+
+			ICoord2D newCellCoord;
+			newCellCoord.x = to_x;
+			newCellCoord.y = to_y;
 
 			if (!to->allocateInfo(newCellCoord)) {
 				// Out of cells for pathing...
  				return 1;
-			}								
+			}
 			to->setBlockedByAlly(false);
 			Int costRemaining = 0;
 			costRemaining = to->costToGoal( d->goalCell );
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
-			if (onList)
+			if ( to->hasInfo() && (to->getOpen() || to->getClosed()) )
 			{
-				// already on one of the lists - if existing costSoFar is less, 
+				// already on one of the lists - if existing costSoFar is less,
 				// the new cell is on a longer path, so skip it
 				if (to->getCostSoFar() <= newCostSoFar)
 					return 0; // keep going.
 			}
+
 			to->setCostSoFar(newCostSoFar);
 			// keep track of path we're building - point back to cell we moved here from
 			to->setParentCell(from) ;
 			to->setTotalCost(to->getCostSoFar() + costRemaining) ;
 
-			//DEBUG_LOG(("Cell (%d,%d), Parent cost %d, newCostSoFar %d, cost rem %d, tot %d\n", 
-			//	to->getXIndex(), to->getYIndex(), 
-			//	to->costSoFar(from), newCostSoFar, costRemaining, to->getCostSoFar() + costRemaining));
-
 			// if to was on closed list, remove it from the list
 			if (to->getClosed())
 				d->thePathfinder->m_closedList = to->removeFromClosedList( d->thePathfinder->m_closedList );
@@ -5605,9 +5507,7 @@ struct ExamineCellsStruct
 }
 
 
-
-
-Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *goalCell, const LocomotorSet& locomotorSet, 
+Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *goalCell, const LocomotorSet& locomotorSet,
 																				 Bool isHuman, Bool centerInCell, Int radius, const ICoord2D &startCellNdx,
 																				 const Object *obj, Int attackDistance)
 {
@@ -5635,21 +5535,19 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 
 		Int cellCount = 0;
 		// expand search to neighboring orthogonal cells
-		static ICoord2D delta[] = 
-		{ 
-			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 }, 
-			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 } 
+		static ICoord2D delta[] =
+		{
+			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 },
+			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 }
 		};
 		const Int numNeighbors = 8;
 		const Int firstDiagonal = 4;
 		ICoord2D newCellCoord;
 		PathfindCell *newCell;
 		const Int adjacent[5] = {0, 1, 2, 3, 0};
-		Bool neighborFlags[8] = {false, false, false, false, false, false, false};
-
-		UnsignedInt newCostSoFar;
-
+		Bool neighborFlags[8] = { 0 };
 
+		UnsignedInt newCostSoFar = 0;
 
 		for( int i=0; i<numNeighbors; i++ )
 		{
@@ -5662,35 +5560,23 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 			newCell = getCell(parentCell->getLayer(), newCellCoord.x, newCellCoord.y );
 
 			// check if cell is on the map
-			if (newCell == NULL)
+			if (!newCell)
 				continue;
 
 			Bool notZonePassable = false;
 			if ((newCell->getLayer()==LAYER_GROUND) && !m_zoneManager.isPassable(newCellCoord.x, newCellCoord.y)) {
 				notZonePassable = true;
 			}
-			if (isHuman) {
-				// check if new cell is in logical map.	(computer can move off logical map)
-				if (newCellCoord.x < m_logicalExtent.lo.x) continue;
-				if (newCellCoord.y < m_logicalExtent.lo.y) continue; 
-				if (newCellCoord.x > m_logicalExtent.hi.x) continue; 
-				if (newCellCoord.y > m_logicalExtent.hi.y) continue; 
-			}
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if new cell is in logical map.	(computer can move off logical map)
+			if (isHuman && checkCellOutsideExtents(newCellCoord))
+				continue;
+
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
-			Bool onList = false;
-			if (newCell->hasInfo()) {
-				if (newCell->getOpen() || newCell->getClosed())
-				{
-					// already on one of the lists 
-					onList = true;
-				}
-			}
-			if (onList) {
-				// we have already examined this one, so continue.
+			if ( newCell->hasInfo() && (newCell->getOpen() || newCell->getClosed()) )
 				continue;
-			}
+
 			if (i>=firstDiagonal) {
 				// make sure one of the adjacent sides is open.
 				if (!neighborFlags[adjacent[i-4]] && !neighborFlags[adjacent[i-3]]) {
@@ -5715,27 +5601,21 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 					continue;
 			}
 
-
-
-			Bool movementValid = true;
+			Bool movementValid = validMovementPosition(isCrusher, locomotorSet.getValidSurfaces(), newCell, parentCell);
 			Bool dozerHack = false;
-			if (validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), newCell, parentCell )) {
-			}	else {
-				movementValid = false;
-				if (obj->isKindOf(KINDOF_DOZER)) {
-					if (newCell->getType()==PathfindCell::CELL_OBSTACLE) {
-						Object *obstacle = TheGameLogic->findObjectByID(newCell->getObstacleID());
-						if (obstacle && !(obj->getRelationship(obstacle)==ENEMIES)) {
-							movementValid = true;
-							dozerHack = true;
-						}
-					}
-				}
-				if (!movementValid && !m_isTunneling) {
-					continue;
+			if (!movementValid && obj->isKindOf(KINDOF_DOZER) && newCell->getType() == PathfindCell::CELL_OBSTACLE) {
+				Object* obstacle = TheGameLogic->findObjectByID(newCell->getObstacleID());
+				if (obstacle && !(obj->getRelationship(obstacle) == ENEMIES)) {
+					movementValid = true;
+					dozerHack = true;
 				}
-			}	
-			if (!dozerHack) 
+			}
+
+			if (!movementValid && !m_isTunneling) {
+				continue;
+			}
+
+			if (!dozerHack)
 				neighborFlags[i] = true;
 
 			TCheckMovementInfo info;
@@ -5756,16 +5636,18 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 					continue;
 				}
 				movementValid = false;
-			}	
+			}
+
 			if (movementValid && !newCell->getPinched()) {
-				//Note to self - only turn off tunneling after check for movement.jba. 
+				//Note to self - only turn off tunneling after check for movement.jba.
 				m_isTunneling = false;
 			}
+
 			if (!newCell->hasInfo()) {
 				if (!newCell->allocateInfo(newCellCoord)) {
 					// Out of cells for pathing...
  					return cellCount;
-				}								
+				}
 				cellCount++;
 			}
 
@@ -5773,6 +5655,7 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 			if (info.allyMoving && dx<10 && dy<10) {
 				newCostSoFar += 3*COST_DIAGONAL;
 			}
+
 			if (newCell->getType() == PathfindCell::CELL_CLIFF && !newCell->getPinched() ) {
 				Coord3D fromPos;
 				fromPos.x = parentCell->getXIndex() * PATHFIND_CELL_SIZE_F ;
@@ -5790,15 +5673,14 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 			} else if (newCell->getPinched()) {
 				newCostSoFar += COST_ORTHOGONAL;
 			}
+
 			newCell->setBlockedByAlly(false);
-			if (info.allyFixedCount) {
-				if (canPathThroughUnits) {
-					newCostSoFar += 3*COST_DIAGONAL*info.allyFixedCount;
-				}	else {
+			if (info.allyFixedCount>0) {
+				newCostSoFar += 3*COST_DIAGONAL*info.allyFixedCount;
+				if (!canPathThroughUnits)
 					newCell->setBlockedByAlly(true);
-					newCostSoFar += 3*COST_DIAGONAL*info.allyFixedCount;
-				}
-			} 
+			}
+
 			Int costRemaining = 0;
 			if (goalCell) {
 				if (attackDistance == 0)  {
@@ -5808,10 +5690,11 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 					dy = newCellCoord.y - goalCell->getYIndex();
 					costRemaining = COST_ORTHOGONAL*sqrt(dx*dx + dy*dy);
 					costRemaining -= attackDistance/2;
-					if (costRemaining<0) costRemaining=0;
+					if (costRemaining<0)
+						costRemaining=0;
 					if (info.allyGoal) {
 						if (obj->isKindOf(KINDOF_VEHICLE)) {
-							newCostSoFar += 3*COST_ORTHOGONAL; 
+							newCostSoFar += 3*COST_ORTHOGONAL;
 						}	else {
 							// Infantry can pass through infantry.
 							newCostSoFar += COST_ORTHOGONAL;
@@ -5819,26 +5702,21 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 					}
 				}
 			}
+
 			if (notZonePassable) {
 				newCostSoFar += 100*COST_ORTHOGONAL;
 			}
+
 			if (newCell->getType()==PathfindCell::CELL_OBSTACLE) {
 				newCostSoFar += 100*COST_ORTHOGONAL;
 			}
-			// check if this neighbor cell is already on the open (waiting to be tried) 
-			// or closed (already tried) lists
-			if (onList)
-			{
-				// already on one of the lists - if existing costSoFar is less, 
-				// the new cell is on a longer path, so skip it
-				if (newCell->getCostSoFar() <= newCostSoFar)
-					continue;
-			}
+
 			if (m_isTunneling) {
 				if (!validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), newCell, parentCell )) {
 					newCostSoFar += 10*COST_ORTHOGONAL;
 				}
 			}
+
 			newCell->setCostSoFar(newCostSoFar);
 			// keep track of path we're building - point back to cell we moved here from
 			newCell->setParentCell(parentCell) ;
@@ -5847,10 +5725,6 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 			}
 			newCell->setTotalCost(newCell->getCostSoFar() + costRemaining) ;
 
-			//DEBUG_LOG(("Cell (%d,%d), Parent cost %d, newCostSoFar %d, cost rem %d, tot %d\n", 
-			//	newCell->getXIndex(), newCell->getYIndex(), 
-			//	newCell->costSoFar(parentCell), newCostSoFar, costRemaining, newCell->getCostSoFar() + costRemaining));
-
 			// if newCell was on closed list, remove it from the list
 			if (newCell->getClosed())
 				m_closedList = newCell->removeFromClosedList( m_closedList );
@@ -5870,7 +5744,7 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-Path *Pathfinder::findPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, 
+Path *Pathfinder::findPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 													 const Coord3D *rawTo)
 {
 	if (!quickDoesPathExist(locomotorSet, from, rawTo)) {
@@ -5894,62 +5768,18 @@ Path *Pathfinder::findPath( Object *obj, const LocomotorSet& locomotorSet, const
 		return pat;
 	}
 
-/* hierarchical build path code.
-	if (pat) {
-
-		Path *path = newInstance(Path);
-		PathNode *prior = NULL;
-		for (PathNode *node = pat->getLastNode(); node; node=node->getPrevious()) {
-			Bool unobstructed = true;
-			if (prior!=NULL) {
-				unobstructed = isLinePassable( obj, locomotorSet.getValidSurfaces(), 
-				prior->getLayer(), *prior->getPosition(), *node->getPosition(), false, true);
-			}
-			if (unobstructed) {
-				path->prependNode( node->getPosition(), node->getLayer() );
-				path->getFirstNode()->setCanOptimize(node->getCanOptimize());	
-				path->getFirstNode()->setNextOptimized(path->getFirstNode()->getNext());
-			} else {
-				Path *linkPath = findClosestPath(obj, locomotorSet, node->getPosition(), 
-					prior->getPosition(), false, 0, true);
-				if (linkPath==NULL) {
-					DEBUG_LOG(("Couldn't find path - unexpected. jba.\n"));
-					continue;
-				}
-				PathNode *linkNode = linkPath->getLastNode();
-				if (linkNode==NULL) {
-					DEBUG_LOG(("Empty path - unexpected. jba.\n"));
-					continue;
-				}
-				for (linkNode=linkNode->getPrevious(); linkNode; linkNode=linkNode->getPrevious()) {
-					path->prependNode( linkNode->getPosition(), linkNode->getLayer() );
-					path->getFirstNode()->setCanOptimize(linkNode->getCanOptimize());
-					path->getFirstNode()->setNextOptimized(path->getFirstNode()->getNext());
-				}
-				deleteInstance(linkPath);
-			}
-			prior = node;
-		}
-		deleteInstance(pat);
-		path->optimize(obj, locomotorSet.getValidSurfaces(), false);
-		if (TheGlobalData->m_debugAI) {
-			setDebugPath(path);
-		}
-		return path;
-	}
-*/
-	return NULL; 
+	return NULL;
 }
 /**
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, 
+Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 													 const Coord3D *rawTo)
 {
-	//CRCDEBUG_LOG(("Pathfinder::findPath()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::findPath()"));
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG(("internal find path...\n"));
+	DEBUG_LOG(("internal find path..."));
 #endif
 
 #ifdef DEBUG_LOGGING
@@ -5960,14 +5790,14 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 	if (obj) {
 		getRadiusAndCenter(obj, radius, centerInCell);
 	}
-	
+
 	Bool isHuman = true;
 	if (obj && obj->getControllingPlayer() && (obj->getControllingPlayer()->getPlayerType()==PLAYER_COMPUTER)) {
 		isHuman = false; // computer gets to cheat.
 	}
 
 	if (rawTo->x == 0.0f && rawTo->y == 0.0f) {
-		DEBUG_LOG(("Attempting pathfind to 0,0, generally a bug.\n"));
+		DEBUG_LOG(("Attempting pathfind to 0,0, generally a bug."));
 		return NULL;
 	}
 	DEBUG_ASSERTCRASH(m_openList==NULL && m_closedList == NULL, ("Dangling lists."));
@@ -5993,7 +5823,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 	if (goalCell == NULL) {
 		return NULL;
 	}
-	
+
 	ICoord2D cell;
 	worldToCell( to, &cell );
 
@@ -6030,23 +5860,21 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 	// to ignore obstacle cells until it reaches a cell that is no longer
 	// classified as an obstacle.  At that point, the pathfind behaves normally.
 	//
-	if (parentCell->getType() == PathfindCell::CELL_OBSTACLE)	{
-		m_isTunneling = true;
-	}
-	else {
-		m_isTunneling = false;
-	}
+	m_isTunneling = parentCell->getType() == PathfindCell::CELL_OBSTACLE;
 
 	Int zone1, zone2;
 	Bool isCrusher = obj ? obj->getCrusherLevel() > 0 : false;
-	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, parentCell->getZone());
 	zone2 =  m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, goalCell->getZone());
 
-	if (layer==LAYER_WALL && zone1 == 0) {
-		return NULL;
-	}
-
-	if (destinationLayer==LAYER_WALL && zone2 == 0) {
+	if ( (layer==LAYER_WALL && zone1 == 0) || (destinationLayer==LAYER_WALL && zone2 == 0) ) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (s_useFixedPathfinding)
+#endif
+		{
+			goalCell->releaseInfo();
+			parentCell->releaseInfo();
+		}
 		return NULL;
 	}
 
@@ -6055,20 +5883,20 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 		zone2 = m_zoneManager.getEffectiveTerrainZone(zone2);
 		zone2 =  m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, zone2);
 		zone1 = m_zoneManager.getEffectiveTerrainZone(zone1);
-		zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, zone1); 
-	}																																 
+		zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, zone1);
+	}
 
-	//DEBUG_LOG(("Zones %d to %d\n", zone1, zone2));
+	//DEBUG_LOG(("Zones %d to %d", zone1, zone2));
 
 	if ( zone1 != zone2) {
-		//DEBUG_LOG(("Intense Debug Info - Pathfind Zone screen failed-cannot reach desired location.\n"));
+		//DEBUG_LOG(("Intense Debug Info - Pathfind Zone screen failed-cannot reach desired location."));
 		goalCell->releaseInfo();
 		parentCell->releaseInfo();
 		return NULL;
 	}
 
 	// sanity check - if destination is invalid, can't path there
-	if (validMovementPosition( isCrusher, destinationLayer, locomotorSet, to ) == false)	{
+	if (!validMovementPosition( isCrusher, destinationLayer, locomotorSet, to ))	{
 		m_isTunneling = false;
 		goalCell->releaseInfo();
 		parentCell->releaseInfo();
@@ -6076,7 +5904,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 	}
 
 	// sanity check - if source is invalid, we have to cheat
-	if (validMovementPosition( isCrusher, layer, locomotorSet, from ) == false)	{
+	if (!validMovementPosition( isCrusher, layer, locomotorSet, from ))	{
 		// somehow we got to an impassable location.
 		m_isTunneling = true;
 	}
@@ -6106,15 +5934,15 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 			// success - found a path to the goal
 			Bool show = TheGlobalData->m_debugAI==AI_DEBUG_PATHS;
 #ifdef INTENSE_DEBUG
-			DEBUG_LOG(("internal find path SUCCESS...\n"));
+			DEBUG_LOG(("internal find path SUCCESS..."));
 			Int count = 0;
 			if (cellCount>1000 && obj) {
 				show = true;
-				DEBUG_LOG(("cells %d obj %s %x from (%f,%f) to(%f, %f)\n", count, obj->getTemplate()->getName().str(), obj, from->x, from->y, to->x, to->y));
+				DEBUG_LOG(("cells %d obj %s %x from (%f,%f) to(%f, %f)", count, obj->getTemplate()->getName().str(), obj, from->x, from->y, to->x, to->y));
 #ifdef STATE_MACHINE_DEBUG
 				if( obj->getAIUpdateInterface() )
 				{
-					DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+					DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 				}
 #endif
 				TheScriptEngine->AppendDebugMessage("Big path", false);
@@ -6126,10 +5954,20 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 			m_isTunneling = false;
 			// construct and return path
 			Path *path =  buildActualPath( obj, locomotorSet.getValidSurfaces(), from, goalCell, centerInCell, false );
-			parentCell->releaseInfo();
-			cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding)
+			{
+				parentCell->releaseInfo();
+				cleanOpenAndClosedLists();
+			}
+			else
+#endif
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
+			}
 			return path;
-		}	
+		}
 
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
@@ -6142,9 +5980,9 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 	}
 
 	// failure - goal cannot be reached
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG(("internal find path FAILURE...\n"));
+	DEBUG_LOG(("internal find path FAILURE..."));
 #endif
 	if (TheGlobalData->m_debugAI == AI_DEBUG_PATHS)
 	{
@@ -6160,7 +5998,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);
 		pos = *to;
 		pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y ) + 0.5f;
-		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);	
+		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);
 		Real dx, dy;
 		dx = from->x - to->x;
 		dy = from->y - to->y;
@@ -6176,7 +6014,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 			addIcon(&pos, PATHFIND_CELL_SIZE_F/2, 60, color);
 
 		}
-	}	
+	}
 
 	if (obj) {
 #ifdef DUMP_PERF_STATS
@@ -6185,7 +6023,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 #ifdef STATE_MACHINE_DEBUG
 		if( obj->getAIUpdateInterface() )
 		{
-			DEBUG_LOG(("state %s\n", obj->getAIUpdateInterface()->getCurrentStateName().str()));
+			DEBUG_LOG(("state %s", obj->getAIUpdateInterface()->getCurrentStateName().str()));
 		}
 #endif
 	}
@@ -6197,15 +6035,25 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 		Bool valid;
 		valid = validMovementPosition( isCrusher, obj->getLayer(), locomotorSet, to ) ;
 
-		DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-		DEBUG_LOG(("Pathfind failed from (%f,%f) to (%f,%f), OV %d\n", from->x, from->y, to->x, to->y, valid));
-		DEBUG_LOG(("Unit '%s', time %f, cells %d\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f,cellCount));
+		DEBUG_LOG(("%d Pathfind failed from (%f,%f) to (%f,%f), OV %d --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y, valid));
+		DEBUG_LOG(("Unit '%s', time %f, cells %d", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f,cellCount));
 	}
 #endif
 
 	m_isTunneling = false;
-	goalCell->releaseInfo();
-	cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding)
+	{
+		goalCell->releaseInfo();
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+		goalCell->releaseInfo();
+	}
 	return NULL;
 }
 
@@ -6213,7 +6061,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
  * Checks to see if there is enough path width at this cell for ground
  * movement.  Returns the width available.
  */
-Int Pathfinder::clearCellForDiameter(Bool crusher, Int cellX, Int cellY, PathfindLayerEnum layer, Int pathDiameter)	  
+Int Pathfinder::clearCellForDiameter(Bool crusher, Int cellX, Int cellY, PathfindLayerEnum layer, Int pathDiameter)
 {
 	Int radius = pathDiameter/2;
 	Int numCellsAbove = radius;
@@ -6290,7 +6138,7 @@ Path *Pathfinder::buildGroundPath(Bool isCrusher, const Coord3D *fromPos, Pathfi
 	path->optimizeGroundPath( isCrusher, pathDiameter );
 
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -6322,7 +6170,7 @@ Path *Pathfinder::buildGroundPath(Bool isCrusher, const Coord3D *fromPos, Pathfi
 	}
 #endif
 	return path;
-}			 
+}
 
 /**
  * Work backwards from goal cell to construct final path.
@@ -6335,7 +6183,7 @@ Path *Pathfinder::buildHierachicalPath( const Coord3D *fromPos, PathfindCell *go
 
 	prependCells(path, fromPos, goalCell, true);
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -6362,7 +6210,7 @@ Path *Pathfinder::buildHierachicalPath( const Coord3D *fromPos, PathfindCell *go
 	}
 #endif
 	return path;
-}			 
+}
 
 
 struct MADStruct
@@ -6379,10 +6227,10 @@ struct MADStruct
 		if (to->getPosUnit()==INVALID_ID) {
 			return 0;
 		}
-		if (to->getPosUnit()==d->obj->getID()) { 
+		if (to->getPosUnit()==d->obj->getID()) {
 			return 0;	// It's us.
 		}
-		if (to->getPosUnit()==d->ignoreID) { 
+		if (to->getPosUnit()==d->ignoreID) {
 			return 0;	 // It's the one we are ignoring.
 		}
 		Object *otherObj = TheGameLogic->findObjectByID(to->getPosUnit());
@@ -6391,7 +6239,7 @@ struct MADStruct
 			return 0;  // Only move allies.
 		}
 		if (otherObj && otherObj->getAI() && !otherObj->getAI()->isMoving()) {
-			//DEBUG_LOG(("Moving ally\n"));
+			//DEBUG_LOG(("Moving ally"));
 			otherObj->getAI()->aiMoveAwayFromUnit(d->obj, CMD_FROM_AI);
 		}
 	}
@@ -6430,12 +6278,12 @@ struct GroundCellsStruct
 			if (to->hasInfo()) {
 				if (to->getOpen() || to->getClosed())
 				{
-					// already on one of the lists 
+					// already on one of the lists
 					return 1; // abort.
 				}
 			}
 			// See how wide the cell is.
-			Int clearDiameter = d->thePathfinder->clearCellForDiameter(d->crusher, to_x, to_y, to->getLayer(), d->pathDiameter); 
+			Int clearDiameter = d->thePathfinder->clearCellForDiameter(d->crusher, to_x, to_y, to->getLayer(), d->pathDiameter);
 			if (clearDiameter != d->pathDiameter) {
 				return 1;
 			}
@@ -6445,7 +6293,7 @@ struct GroundCellsStruct
 			if (!to->allocateInfo(newCellCoord)) {
 				// Out of cells for pathing...
  				return 1;
-			}								
+			}
 
 			UnsignedInt newCostSoFar = from->getCostSoFar( ) + 0.5f*COST_ORTHOGONAL;
 			to->setBlockedByAlly(false);
@@ -6468,18 +6316,18 @@ struct GroundCellsStruct
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-Path *Pathfinder::findGroundPath( const Coord3D *from, 
+Path *Pathfinder::findGroundPath( const Coord3D *from,
 													 const Coord3D *rawTo, Int pathDiameter, Bool crusher)
 {
-	//CRCDEBUG_LOG(("Pathfinder::findGroundPath()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::findGroundPath()"));
 #ifdef DEBUG_LOGGING
 	Int startTimeMS = ::GetTickCount();
 #endif
 #ifdef INTENSE_DEBUG
 	DEBUG_LOG(("Find ground path..."));
-#endif	
+#endif
 	Bool centerInCell = false;
-	
+
 	m_zoneManager.clearPassableFlags();
 	Bool isHuman = true;
 
@@ -6491,7 +6339,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 	}
 
 	if (rawTo->x == 0.0f && rawTo->y == 0.0f) {
-		DEBUG_LOG(("Attempting pathfind to 0,0, generally a bug.\n"));
+		DEBUG_LOG(("Attempting pathfind to 0,0, generally a bug."));
 		return NULL;
 	}
 	DEBUG_ASSERTCRASH(m_openList==NULL && m_closedList == NULL, ("Dangling lists."));
@@ -6507,7 +6355,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 	m_isTunneling = false;
 
 	PathfindLayerEnum destinationLayer = TheTerrainLogic->getLayerForDestination(to);
-	
+
 	ICoord2D cell;
 	worldToCell( to, &cell );
 
@@ -6555,6 +6403,12 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 	PathfindLayerEnum layer = TheTerrainLogic->getLayerForDestination(from);
 	PathfindCell *parentCell = getClippedCell( layer,&clipFrom );
 	if (parentCell == NULL) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (s_useFixedPathfinding)
+#endif
+		{
+			goalCell->releaseInfo();
+		}
 		return NULL;
 	}
 	if (parentCell!=goalCell) {
@@ -6568,10 +6422,10 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 
 	Int zone1, zone2;
 	// m_isCrusher = false;
-	zone1 = m_zoneManager.getEffectiveZone(LOCOMOTORSURFACE_GROUND, false, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(LOCOMOTORSURFACE_GROUND, false, parentCell->getZone());
 	zone2 =  m_zoneManager.getEffectiveZone(LOCOMOTORSURFACE_GROUND, false, goalCell->getZone());
 
-	//DEBUG_LOG(("Zones %d to %d\n", zone1, zone2));
+	//DEBUG_LOG(("Zones %d to %d", zone1, zone2));
 
 	if ( zone1 != zone2) {
 		goalCell->releaseInfo();
@@ -6586,6 +6440,11 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 	// "closed" list is initially empty
 	m_closedList = NULL;
 
+	// TheSuperHackers @fix helmutbuhler This was originally uninitialized and in the loop below.
+#if RETAIL_COMPATIBLE_CRC
+	UnsignedInt newCostSoFar = 0;
+#endif
+
 	//
 	// Continue search until "open" list is empty, or
 	// until goal is found.
@@ -6599,12 +6458,12 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 
 		if (parentCell == goalCell)
 		{
-			// success - found a path to the goal	 
+			// success - found a path to the goal
 #ifdef INTENSE_DEBUG
 	DEBUG_LOG((" time %d msec %d cells", (::GetTickCount()-startTimeMS), cellCount));
-	DEBUG_LOG((" SUCCESS\n"));
-#endif	
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+	DEBUG_LOG((" SUCCESS"));
+#endif
+#if defined(RTS_DEBUG)
 			Bool show = TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS;
 			if (show)
 				debugShowSearch(true);
@@ -6612,10 +6471,20 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 			m_isTunneling = false;
 			// construct and return path
 			Path *path =  buildGroundPath(crusher, from, goalCell, centerInCell, pathDiameter );
-			parentCell->releaseInfo();
-			cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding)
+			{
+				parentCell->releaseInfo();
+				cleanOpenAndClosedLists();
+			}
+			else
+#endif
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
+			}
 			return path;
-		}	
+		}
 
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
@@ -6637,22 +6506,21 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 		iterateCellsAlongLine(start, end, parentCell->getLayer(), groundCellsCallback, &info);
 
 		// expand search to neighboring orthogonal cells
-		static ICoord2D delta[] = 
-		{ 
-			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 }, 
-			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 } 
+		static ICoord2D delta[] =
+		{
+			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 },
+			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 }
 		};
 		const Int numNeighbors = 8;
 		const Int firstDiagonal = 4;
 		ICoord2D newCellCoord;
 		PathfindCell *newCell;
 		const Int adjacent[5] = {0, 1, 2, 3, 0};
-		Bool neighborFlags[8] = {false, false, false, false, false, false, false};
+		Bool neighborFlags[8] = { 0 };
 
 		// TheSuperHackers @fix Mauller 23/05/2025 Fixes uninitialized variable.
-		// To keep retail compatibility it needs to be uninitialized in VC6 builds.
-#if defined(_MSC_VER) && _MSC_VER < 1300
-		UnsignedInt newCostSoFar;
+#if RETAIL_COMPATIBLE_CRC
+		// newCostSoFar defined in outer block.
 #else
 		UnsignedInt newCostSoFar = 0;
 #endif
@@ -6681,13 +6549,13 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 				if (!passable) continue;
 			}
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
 			Bool onList = false;
 			if (newCell->hasInfo()) {
 				if (newCell->getOpen() || newCell->getClosed())
 				{
-					// already on one of the lists 
+					// already on one of the lists
 					onList = true;
 				}
 			}
@@ -6702,7 +6570,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 				}
 
 				// See how wide the cell is.
-				clearDiameter = clearCellForDiameter(crusher, newCellCoord.x, newCellCoord.y, newCell->getLayer(), pathDiameter); 
+				clearDiameter = clearCellForDiameter(crusher, newCellCoord.x, newCellCoord.y, newCell->getLayer(), pathDiameter);
 				if (newCell->getType() != PathfindCell::CELL_CLEAR) {
 					continue;
 				}
@@ -6714,9 +6582,11 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 				if (!newCell->allocateInfo(newCellCoord)) {
 					// Out of cells for pathing...
  					continue;
-				}								
+				}
 				cellCount++;
 
+#if RETAIL_COMPATIBLE_CRC
+				// TheSuperHackers @fix helmutbuhler 11/06/2025 The indentation was wrong on retail here.
 				newCostSoFar = newCell->costSoFar( parentCell );
 				if (clearDiameter<pathDiameter) {
 					int delta = pathDiameter-clearDiameter;
@@ -6724,30 +6594,32 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 				}
 				newCell->setBlockedByAlly(false);
 			}
+#else
+			}
+			newCostSoFar = newCell->costSoFar( parentCell );
+			if (clearDiameter<pathDiameter) {
+				int delta = pathDiameter-clearDiameter;
+				newCostSoFar += 0.6f*(delta*COST_ORTHOGONAL);
+			}
+			newCell->setBlockedByAlly(false);
+#endif
 			Int costRemaining = 0;
 			costRemaining = newCell->costToGoal( goalCell );
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
 			if (onList)
 			{
-				// already on one of the lists - if existing costSoFar is less, 
+				// already on one of the lists - if existing costSoFar is less,
 				// the new cell is on a longer path, so skip it
 				if (newCell->getCostSoFar() <= newCostSoFar)
 					continue;
 			}
-			//DEBUG_LOG(("CELL(%d,%d)L%d CD%d CSF %d, CR%d // ",newCell->getXIndex(), newCell->getYIndex(), 
-			//	newCell->getLayer(), clearDiameter, newCostSoFar, costRemaining));
-			//if ((cellCount&7)==0) DEBUG_LOG(("\n"));
 			newCell->setCostSoFar(newCostSoFar);
 			// keep track of path we're building - point back to cell we moved here from
 			newCell->setParentCell(parentCell) ;
 			newCell->setTotalCost(newCell->getCostSoFar() + costRemaining) ;
 
-			//DEBUG_LOG(("Cell (%d,%d), Parent cost %d, newCostSoFar %d, cost rem %d, tot %d\n", 
-			//	newCell->getXIndex(), newCell->getYIndex(), 
-			//	newCell->costSoFar(parentCell), newCostSoFar, costRemaining, newCell->getCostSoFar() + costRemaining));
-
 			// if newCell was on closed list, remove it from the list
 			if (newCell->getClosed())
 				m_closedList = newCell->removeFromClosedList( m_closedList );
@@ -6759,14 +6631,12 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 			// insert newCell in open list such that open list is sorted, smallest total path cost first
 			m_openList = newCell->putOnSortedOpenList( m_openList );
 		}
-
-
 	}
 	// failure - goal cannot be reached
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG((" FAILURE\n"));
-#endif	
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+	DEBUG_LOG((" FAILURE"));
+#endif
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -6781,7 +6651,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);
 		pos = *to;
 		pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y ) + 0.5f;
-		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);	
+		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);
 		Real dx, dy;
 		dx = from->x - to->x;
 		dy = from->y - to->y;
@@ -6797,19 +6667,29 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 			addIcon(&pos, PATHFIND_CELL_SIZE_F/2, 60, color);
 
 		}
-	}	
+	}
 #endif
 
-	DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-	DEBUG_LOG(("FindGroundPath failed from (%f,%f) to (%f,%f)\n", from->x, from->y, to->x, to->y));
-	DEBUG_LOG(("time %f\n", (::GetTickCount()-startTimeMS)/1000.0f));
+	DEBUG_LOG(("%d FindGroundPath failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
+	DEBUG_LOG(("time %f", (::GetTickCount()-startTimeMS)/1000.0f));
 
 #ifdef DUMP_PERF_STATS
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	goalCell->releaseInfo();
-	cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding)
+	{
+		goalCell->releaseInfo();
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+		goalCell->releaseInfo();
+	}
 	return NULL;
 }
 
@@ -6817,8 +6697,8 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-void Pathfinder::processHierarchicalCell( const ICoord2D &scanCell, const ICoord2D &delta, PathfindCell *parentCell, 
-																				 PathfindCell *goalCell, zoneStorageType parentZone, 
+void Pathfinder::processHierarchicalCell( const ICoord2D &scanCell, const ICoord2D &delta, PathfindCell *parentCell,
+																				 PathfindCell *goalCell, zoneStorageType parentZone,
 																				 zoneStorageType *examinedZones, Int &numExZones,
 																				 Bool crusher, Int &cellCount)
 {
@@ -6827,7 +6707,7 @@ void Pathfinder::processHierarchicalCell( const ICoord2D &scanCell, const ICoord
 		return;
 	}
 	if (parentZone == m_zoneManager.getBlockZone(LOCOMOTORSURFACE_GROUND,
-		crusher, scanCell.x, scanCell.y, m_map)) { 
+		crusher, scanCell.x, scanCell.y, m_map)) {
 		PathfindCell *newCell = getCell(LAYER_GROUND, scanCell.x, scanCell.y);
 		if (newCell->hasInfo() && (newCell->getOpen() || newCell->getClosed())) return; // already looked at this one.
 	  ICoord2D adjacentCell = scanCell;
@@ -6839,7 +6719,7 @@ void Pathfinder::processHierarchicalCell( const ICoord2D &scanCell, const ICoord
 			adjacentCell.y<m_extent.lo.y || adjacentCell.y>m_extent.hi.y) {
 			return;
 		}
-		PathfindCell *adjNewCell = getCell(LAYER_GROUND, adjacentCell.x, adjacentCell.y); 
+		PathfindCell *adjNewCell = getCell(LAYER_GROUND, adjacentCell.x, adjacentCell.y);
 		if (adjNewCell->hasInfo() && (adjNewCell->getOpen() || adjNewCell->getClosed())) return; // already looked at this one.
 		zoneStorageType parentGlobalZone = m_zoneManager.getEffectiveZone(LOCOMOTORSURFACE_GROUND, crusher, parentZone);
 
@@ -6861,10 +6741,21 @@ void Pathfinder::processHierarchicalCell( const ICoord2D &scanCell, const ICoord
 		if (found) {
 			return;
 		}
-		
+
 		newCell->allocateInfo(scanCell);
-		if (!newCell->getClosed() && !newCell->getOpen()) {
-			m_closedList = newCell->putOnClosedList(m_closedList);
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (!s_useFixedPathfinding)
+		{
+			if (!newCell->getClosed() && !newCell->getOpen()) {
+				m_closedList = newCell->putOnClosedList(m_closedList);
+			}
+		}
+		else
+#endif
+		{
+			if (newCell->hasInfo() && !newCell->getClosed() && !newCell->getOpen()) {
+				m_closedList = newCell->putOnClosedList(m_closedList);
+			}
 		}
 
 		adjNewCell->allocateInfo(adjacentCell);
@@ -6892,7 +6783,7 @@ void Pathfinder::processHierarchicalCell( const ICoord2D &scanCell, const ICoord
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-Path *Pathfinder::findHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from, 
+Path *Pathfinder::findHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from,
 													 const Coord3D *to, Bool crusher)
 {
 	return internal_findHierarchicalPath(isHuman, locomotorSet.getValidSurfaces(), from, to, crusher, FALSE);
@@ -6903,7 +6794,7 @@ Path *Pathfinder::findHierarchicalPath( Bool isHuman, const LocomotorSet& locomo
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-Path *Pathfinder::findClosestHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from, 
+Path *Pathfinder::findClosestHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from,
 													 const Coord3D *to, Bool crusher)
 {
 	return internal_findHierarchicalPath(isHuman, locomotorSet.getValidSurfaces(), from, to, crusher, TRUE);
@@ -6915,16 +6806,16 @@ Path *Pathfinder::findClosestHierarchicalPath( Bool isHuman, const LocomotorSet&
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSurfaceTypeMask locomotorSurface, const Coord3D *from, 
+Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSurfaceTypeMask locomotorSurface, const Coord3D *from,
 													 const Coord3D *rawTo, Bool crusher, Bool closestOK)
 {
-	//CRCDEBUG_LOG(("Pathfinder::findGroundPath()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::findGroundPath()"));
 #ifdef DEBUG_LOGGING
 	Int startTimeMS = ::GetTickCount();
 #endif
-	
+
 	if (rawTo->x == 0.0f && rawTo->y == 0.0f) {
-		DEBUG_LOG(("Attempting pathfind to 0,0, generally a bug.\n"));
+		DEBUG_LOG(("Attempting pathfind to 0,0, generally a bug."));
 		return NULL;
 	}
 	DEBUG_ASSERTCRASH(m_openList==NULL && m_closedList == NULL, ("Dangling lists."));
@@ -6940,15 +6831,16 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 	m_isTunneling = false;
 
 	PathfindLayerEnum destinationLayer = TheTerrainLogic->getLayerForDestination(to);
-	
+
 	ICoord2D cell;
 	worldToCell( to, &cell );
 
 	// determine goal cell
 	PathfindCell *goalCell = getCell( destinationLayer, cell.x, cell.y );
-	if (goalCell == NULL) {
+	if (!goalCell) {
 		return NULL;
 	}
+
 	if (!goalCell->allocateInfo(cell)) {
 		return NULL;
 	}
@@ -6957,9 +6849,10 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 	ICoord2D startCellNdx;
 	PathfindLayerEnum layer = TheTerrainLogic->getLayerForDestination(from);
 	PathfindCell *parentCell = getClippedCell( layer,&clipFrom );
-	if (parentCell == NULL) {
+	if (!parentCell) {
 		return NULL;
 	}
+
 	if (parentCell!=goalCell) {
 		worldToCell(&clipFrom, &startCellNdx);
 		if (!parentCell->allocateInfo(startCellNdx)) {
@@ -6970,7 +6863,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 
 	Int zone1, zone2;
 	// m_isCrusher = false;
-	zone1 = m_zoneManager.getEffectiveZone(locomotorSurface, false, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(locomotorSurface, false, parentCell->getZone());
 	zone2 =  m_zoneManager.getEffectiveZone(locomotorSurface, false, goalCell->getZone());
 
 	if ( zone1 != zone2) {
@@ -6991,7 +6884,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 	if (goalCell->getLayer()==LAYER_GROUND) {
 		goalBlockZone = m_zoneManager.getBlockZone(locomotorSurface,
 			crusher, goalCell->getXIndex(), goalCell->getYIndex(), m_map);
-		
+
 		goalBlockNdx.x = goalCell->getXIndex()/PathfindZoneManager::ZONE_BLOCK_SIZE;
 		goalBlockNdx.y = goalCell->getYIndex()/PathfindZoneManager::ZONE_BLOCK_SIZE;
 	}	else {
@@ -7000,11 +6893,10 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 		goalBlockNdx.y = -1;
 	}
 
-	if (parentCell->getLayer()==LAYER_GROUND) {
-		// initialize "open" list to contain start cell
-		m_openList = parentCell;
-	}	else {
-		m_openList = parentCell;
+	// initialize "open" list to contain start cell
+	m_openList = parentCell;
+
+	if (parentCell->getLayer()!=LAYER_GROUND) {
 		PathfindLayerEnum layer = parentCell->getLayer();
 		// We're starting on a bridge, so link to land at the bridge end points.
 		ICoord2D ndx;
@@ -7017,7 +6909,22 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 			// Close parent cell;
 			m_openList = parentCell->removeFromOpenList(m_openList);
 			m_closedList = parentCell->putOnClosedList(m_closedList);
-			startCell->allocateInfo(ndx);
+			if (!startCell->allocateInfo(ndx)) {
+				// TheSuperHackers @info We need to forcefully cleanup dangling pathfinding cells if this failure condition is hit in retail
+				// Retail clients will crash beyond this point, but we attempt to recover by performing a full cleanup then enabling the fixed pathfinding codepath
+#if RETAIL_COMPATIBLE_PATHFINDING
+				if (!s_useFixedPathfinding) {
+					s_useFixedPathfinding = true;
+					forceCleanCells();
+				}
+				else
+#endif
+				{
+					cleanOpenAndClosedLists();
+					goalCell->releaseInfo();
+				}
+				return NULL;
+			}
 			startCell->setParentCellHierarchical(parentCell);
 			cellCount++;
 			Int curCost = startCell->costToHierGoal(parentCell);
@@ -7029,7 +6936,22 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 			m_openList = startCell->putOnSortedOpenList( m_openList );
 
 			cellCount++;
-			cell->allocateInfo(toNdx);
+			if(!cell->allocateInfo(toNdx)) {
+				// TheSuperHackers @info We need to forcefully cleanup dangling pathfinding cells if this failure condition is hit in retail
+				// Retail clients will crash beyond this point, but we attempt to recover by performing a full cleanup then enabling the fixed pathfinding codepath
+#if RETAIL_COMPATIBLE_PATHFINDING
+				if (!s_useFixedPathfinding) {
+					s_useFixedPathfinding = true;
+					forceCleanCells();
+				}
+				else
+#endif
+				{
+					cleanOpenAndClosedLists();
+					goalCell->releaseInfo();
+				}
+				return NULL;
+			}
 			curCost = cell->costToHierGoal(parentCell);
 			remCost = cell->costToHierGoal(goalCell);
 			cell->setCostSoFar(curCost);
@@ -7062,7 +6984,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 		}
 
 		Bool reachedGoal = false;
-		
+
 		Int blockX = parentCell->getXIndex()/PathfindZoneManager::ZONE_BLOCK_SIZE;
 		Int blockY = parentCell->getYIndex()/PathfindZoneManager::ZONE_BLOCK_SIZE;
 		if (parentZone == goalBlockZone) {
@@ -7075,7 +6997,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 
 		ICoord2D zoneBlockExtent;
 		m_zoneManager.getExtent(zoneBlockExtent);
-		
+
 		if (!reachedGoal && m_zoneManager.interactsWithBridge(parentCell->getXIndex(), parentCell->getYIndex())) {
 			Int i;
 			for (i=0; i<=LAYER_LAST; i++) {
@@ -7106,20 +7028,54 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 						break;
 					}
  					PathfindCell *cell = getCell(LAYER_GROUND, toNdx.x, toNdx.y);
-					if (cell==NULL) continue;
-					if (cell->hasInfo() && (cell->getClosed() || cell->getOpen())) {
+					if (!cell)
 						continue;
-					}
-					PathfindCell *startCell = getCell(LAYER_GROUND, ndx.x, ndx.y); 
-					if (startCell==NULL) continue;
+
+					if (cell->hasInfo() && (cell->getClosed() || cell->getOpen()))
+						continue;
+
+					PathfindCell *startCell = getCell(LAYER_GROUND, ndx.x, ndx.y);
+					if (!startCell)
+						continue;
+
 					if (startCell != parentCell) {
-						startCell->allocateInfo(ndx);
+						if(!startCell->allocateInfo(ndx)) {
+							// TheSuperHackers @info We need to forcefully cleanup dangling pathfinding cells if this failure condition is hit in retail
+							// Retail clients will crash beyond this point, but we attempt to recover by performing a full cleanup then enabling the fixed pathfinding codepath
+#if RETAIL_COMPATIBLE_PATHFINDING
+							if (!s_useFixedPathfinding) {
+								s_useFixedPathfinding = true;
+								forceCleanCells();
+							}
+							else
+#endif
+							{
+								cleanOpenAndClosedLists();
+								goalCell->releaseInfo();
+							}
+							return NULL;
+						}
 						startCell->setParentCellHierarchical(parentCell);
 						if (!startCell->getClosed() && !startCell->getOpen()) {
 							m_closedList = startCell->putOnClosedList(m_closedList);
 						}
 					}
-					cell->allocateInfo(toNdx);
+					if(!cell->allocateInfo(toNdx)) {
+						// TheSuperHackers @info We need to forcefully cleanup dangling pathfinding cells if this failure condition is hit in retail
+						// Retail clients will crash beyond this point, but we attempt to recover by performing a full cleanup then enabling the fixed pathfinding codepath
+#if RETAIL_COMPATIBLE_PATHFINDING
+						if (!s_useFixedPathfinding) {
+							s_useFixedPathfinding = true;
+							forceCleanCells();
+						}
+						else
+#endif
+						{
+							cleanOpenAndClosedLists();
+							goalCell->releaseInfo();
+						}
+						return NULL;
+					}
 					cell->setParentCellHierarchical(startCell);
 
 					cellCount++;
@@ -7141,48 +7097,39 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 			if (parentCell != goalCell) {
 				goalCell->setParentCellHierarchical(parentCell);
 			}
-			// success - found a path to the goal	 
+			// success - found a path to the goal
 
 			m_isTunneling = false;
 			// construct and return path
 			Path *path =  buildHierachicalPath( from, goalCell );
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 			Bool show = TheGlobalData->m_debugAI==AI_DEBUG_PATHS;
 			show |= (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS);
 			if (show)	{
 				debugShowSearch(true);
-#if 0 // Show hierarchical blocks (big blue ones.)
-				Int i, j;
-				ICoord2D extent;
-				m_zoneManager.getExtent(extent);
-				for (i=0; i<extent.x; i++) {
-					for (j=0; j<extent.y; j++) {
-						extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
- 						RGBColor color;
-						color.blue = 1;
-						color.red = color.green = 0;
-						Coord3D pos;
-						pos.x = ((i+0.5f)*PathfindZoneManager::ZONE_BLOCK_SIZE)*PATHFIND_CELL_SIZE_F ;
-						pos.y = ((j+0.5f)*PathfindZoneManager::ZONE_BLOCK_SIZE)*PATHFIND_CELL_SIZE_F ;
-						pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y ) + 0.5f;
-						if (m_zoneManager.isPassable(i*PathfindZoneManager::ZONE_BLOCK_SIZE, j*PathfindZoneManager::ZONE_BLOCK_SIZE)) {
-							addIcon(&pos, 5*PATHFIND_CELL_SIZE_F, 300, color);
-						}
-					}
-				}
+			}
 #endif
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding)
+			{
+				if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+					goalCell->releaseInfo();
+				}
+				parentCell->releaseInfo();
+				cleanOpenAndClosedLists();
 			}
+			else
 #endif
-			if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
 				goalCell->releaseInfo();
 			}
-			parentCell->releaseInfo();
-			cleanOpenAndClosedLists();
 			return path;
-		}	
+		}
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-#if 0 
+#if defined(RTS_DEBUG)
+#if 0
 		Bool show = TheGlobalData->m_debugAI==AI_DEBUG_PATHS;
 		show |= (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS);
 		if (show)	{
@@ -7222,25 +7169,24 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 				scanCell.y += PathfindZoneManager::ZONE_BLOCK_SIZE/2;
 				Int offset = i>>1;
 				if (i&1) offset = -offset;
-				scanCell.y += offset;	
+				scanCell.y += offset;
 				ICoord2D delta;
 				delta.x = -1; // left side moves -1.
 				delta.y = 0;
+
 				PathfindCell *cell = getCell(LAYER_GROUND, scanCell.x, scanCell.y);
-				if (cell==NULL) continue;
-				if (cell->hasInfo() && (cell->getClosed() || cell->getOpen())) {
-					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface,
-						crusher, scanCell.x, scanCell.y, m_map)) { 
+				if (!cell)
+					continue;
+
+				if ( cell->hasInfo() && (cell->getClosed() || cell->getOpen()) ) {
+					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface, crusher, scanCell.x, scanCell.y, m_map))
 						break;
-					}
 				}
-				if (isHuman) {
-					if (scanCell.x < m_logicalExtent.lo.x || scanCell.x > m_logicalExtent.hi.x ||
-							scanCell.y < m_logicalExtent.lo.y || scanCell.y > m_logicalExtent.hi.y) {
-						continue;
-					}
-				}
-				processHierarchicalCell(scanCell, delta, parentCell, 
+
+				if (isHuman && checkCellOutsideExtents(scanCell))
+					continue;
+
+				processHierarchicalCell(scanCell, delta, parentCell,
 					goalCell, parentZone, examinedZones, numExZones, crusher, cellCount);
 			}
 		}
@@ -7255,25 +7201,24 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 				scanCell.y += PathfindZoneManager::ZONE_BLOCK_SIZE/2;
 				Int offset = i>>1;
 				if (i&1) offset = -offset;
-				scanCell.y += offset;	
+				scanCell.y += offset;
 				ICoord2D delta;
 				delta.x = 1; // right side moves +1.
 				delta.y = 0;
+
 				PathfindCell *cell = getCell(LAYER_GROUND, scanCell.x, scanCell.y);
-				if (cell==NULL) continue;
-				if (cell->hasInfo() && (cell->getClosed() || cell->getOpen())) {
-					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface,
-						crusher, scanCell.x, scanCell.y, m_map)) { 
+				if (!cell)
+					continue;
+
+				if ( cell->hasInfo() && (cell->getClosed() || cell->getOpen()) ) {
+					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface, crusher, scanCell.x, scanCell.y, m_map))
 						break;
-					}
-				}
-				if (isHuman) {
-					if (scanCell.x < m_logicalExtent.lo.x || scanCell.x > m_logicalExtent.hi.x ||
-							scanCell.y < m_logicalExtent.lo.y || scanCell.y > m_logicalExtent.hi.y) {
-						continue;
-					}
 				}
-				processHierarchicalCell(scanCell, delta, parentCell, 
+
+				if (isHuman && checkCellOutsideExtents(scanCell))
+					continue;
+
+				processHierarchicalCell(scanCell, delta, parentCell,
 					goalCell, parentZone, examinedZones, numExZones, crusher, cellCount);
 			}
 		}
@@ -7287,25 +7232,24 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 				scanCell.x += PathfindZoneManager::ZONE_BLOCK_SIZE/2;
 				Int offset = i>>1;
 				if (i&1) offset = -offset;
-				scanCell.x += offset;	
+				scanCell.x += offset;
 				ICoord2D delta;
-				delta.x = 0; 
+				delta.x = 0;
 				delta.y = -1;	// Top side moves -1.
+
 				PathfindCell *cell = getCell(LAYER_GROUND, scanCell.x, scanCell.y);
-				if (cell==NULL) continue;
-				if (cell->hasInfo() && (cell->getClosed() || cell->getOpen())) {
-					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface,
-						crusher, scanCell.x, scanCell.y, m_map)) { 
+				if (!cell)
+					continue;
+
+				if ( cell->hasInfo() && (cell->getClosed() || cell->getOpen()) ) {
+					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface, crusher, scanCell.x, scanCell.y, m_map))
 						break;
-					}
 				}
-				if (isHuman) {
-					if (scanCell.x < m_logicalExtent.lo.x || scanCell.x > m_logicalExtent.hi.x ||
-							scanCell.y < m_logicalExtent.lo.y || scanCell.y > m_logicalExtent.hi.y) {
-						continue;
-					}
-				}
-				processHierarchicalCell(scanCell, delta, parentCell, 
+
+				if (isHuman && checkCellOutsideExtents(scanCell))
+					continue;
+
+				processHierarchicalCell(scanCell, delta, parentCell,
 					goalCell, parentZone, examinedZones, numExZones, crusher, cellCount);
 			}
 		}
@@ -7320,25 +7264,24 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 				scanCell.x += PathfindZoneManager::ZONE_BLOCK_SIZE/2;
 				Int offset = i>>1;
 				if (i&1) offset = -offset;
-				scanCell.x += offset;	
+				scanCell.x += offset;
 				ICoord2D delta;
-				delta.x = 0; 
+				delta.x = 0;
 				delta.y = 1; // Top side moves +1.
+
 				PathfindCell *cell = getCell(LAYER_GROUND, scanCell.x, scanCell.y);
-				if (cell==NULL) continue;
-				if (cell->hasInfo() && (cell->getClosed() || cell->getOpen())) {
-					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface,
-						crusher, scanCell.x, scanCell.y, m_map)) { 
+				if (!cell)
+					continue;
+
+				if ( cell->hasInfo() && (cell->getClosed() || cell->getOpen()) ) {
+					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface, crusher, scanCell.x, scanCell.y, m_map))
 						break;
-					}
-				}
-				if (isHuman) {
-					if (scanCell.x < m_logicalExtent.lo.x || scanCell.x > m_logicalExtent.hi.x ||
-							scanCell.y < m_logicalExtent.lo.y || scanCell.y > m_logicalExtent.hi.y) {
-						continue;
-					}
 				}
-				processHierarchicalCell(scanCell, delta, parentCell, 
+
+				if (isHuman && checkCellOutsideExtents(scanCell))
+					continue;
+
+				processHierarchicalCell(scanCell, delta, parentCell,
 					goalCell, parentZone, examinedZones, numExZones, crusher, cellCount);
 			}
 		}
@@ -7348,41 +7291,27 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 		m_isTunneling = false;
 		// construct and return path
 		Path *path =  buildHierachicalPath( from, closestCell );
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-#if 0
-		if (TheGlobalData->m_debugAI)
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (!s_useFixedPathfinding)
 		{
-			debugShowSearch(true);
-			Int i, j;
-			ICoord2D extent;
-			m_zoneManager.getExtent(extent);
-			for (i=0; i<extent.x; i++) {
-				for (j=0; j<extent.y; j++) {
-					extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
- 					RGBColor color;
-					color.blue = 1;
-					color.red = color.green = 0;
-					Coord3D pos;
-					pos.x = ((i+0.5f)*PathfindZoneManager::ZONE_BLOCK_SIZE)*PATHFIND_CELL_SIZE_F ;
-					pos.y = ((j+0.5f)*PathfindZoneManager::ZONE_BLOCK_SIZE)*PATHFIND_CELL_SIZE_F ;
-					pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y ) + 0.5f;
-					if (m_zoneManager.isPassable(i*PathfindZoneManager::ZONE_BLOCK_SIZE, j*PathfindZoneManager::ZONE_BLOCK_SIZE)) {
-						addIcon(&pos, 5*PATHFIND_CELL_SIZE_F, 300, color);
-					}
-				}
+			if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+				goalCell->releaseInfo();
 			}
+			cleanOpenAndClosedLists();
 		}
+		else
 #endif
-#endif
-		if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+		{
+			cleanOpenAndClosedLists();
+			parentCell->releaseInfo();
 			goalCell->releaseInfo();
 		}
-		cleanOpenAndClosedLists();
 		return path;
 	}
 
 	// failure - goal cannot be reached
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -7397,7 +7326,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);
 		pos = *to;
 		pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y ) + 0.5f;
-		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);	
+		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);
 		Real dx, dy;
 		dx = from->x - to->x;
 		dy = from->y - to->y;
@@ -7413,29 +7342,40 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 			addIcon(&pos, PATHFIND_CELL_SIZE_F/2, 60, color);
 
 		}
-	}	
+	}
 #endif
 
-	DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-	DEBUG_LOG(("FindHierarchicalPath failed from (%f,%f) to (%f,%f)\n", from->x, from->y, to->x, to->y));
-	DEBUG_LOG(("time %f\n", (::GetTickCount()-startTimeMS)/1000.0f));
+	DEBUG_LOG(("%d FindHierarchicalPath failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
+	DEBUG_LOG(("time %f", (::GetTickCount()-startTimeMS)/1000.0f));
 
 #ifdef DUMP_PERF_STATS
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	goalCell->releaseInfo();
-	cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding)
+	{
+		goalCell->releaseInfo();
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+		goalCell->releaseInfo();
+	}
+
 	return NULL;
 }
 
 
 /**
- * Does any broken bridge join from and to?  
+ * Does any broken bridge join from and to?
  * True means that if bridge BridgeID is repaired, there is a land path from to to..
  */
-Bool Pathfinder::findBrokenBridge(const LocomotorSet& locoSet, 
-																	const Coord3D *from, const Coord3D *to, ObjectID *bridgeID) 
+Bool Pathfinder::findBrokenBridge(const LocomotorSet& locoSet,
+																	const Coord3D *from, const Coord3D *to, ObjectID *bridgeID)
 {
 	// See if terrain or building is blocking the destination.
 	PathfindLayerEnum destinationLayer = TheTerrainLogic->getLayerForDestination(to);
@@ -7446,11 +7386,11 @@ Bool Pathfinder::findBrokenBridge(const LocomotorSet& locoSet,
 
 	PathfindCell *parentCell = getClippedCell(fromLayer, from);
 	PathfindCell *goalCell = getClippedCell(destinationLayer, to);
-	zone1 = m_zoneManager.getEffectiveZone(locoSet.getValidSurfaces(), false, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(locoSet.getValidSurfaces(), false, parentCell->getZone());
 	zone2 =  m_zoneManager.getEffectiveZone(locoSet.getValidSurfaces(), false, goalCell->getZone());
 	zone1 = m_zoneManager.getEffectiveTerrainZone(zone1);
 	zone2 = m_zoneManager.getEffectiveTerrainZone(zone2);
-	zone1 = m_zoneManager.getEffectiveZone(locoSet.getValidSurfaces(), false, zone1); 
+	zone1 = m_zoneManager.getEffectiveZone(locoSet.getValidSurfaces(), false, zone1);
 	zone2 =  m_zoneManager.getEffectiveZone(locoSet.getValidSurfaces(), false, zone2);
 
 	// If the terrain is connected using this locomotor set, we can path somehow.
@@ -7479,8 +7419,8 @@ Bool Pathfinder::findBrokenBridge(const LocomotorSet& locoSet,
  * False means it is impossible to path.
  * True means it is possible given the terrain, but there may be units in the way.
  */
-Bool Pathfinder::quickDoesPathExist( const LocomotorSet& locomotorSet, 
-																const Coord3D *from, 
+Bool Pathfinder::quickDoesPathExist( const LocomotorSet& locomotorSet,
+																const Coord3D *from,
 																const Coord3D *to )
 {
 	// See if terrain or building is blocking the destination.
@@ -7494,7 +7434,7 @@ Bool Pathfinder::quickDoesPathExist( const LocomotorSet& locomotorSet,
 		return false; // No goals on cliffs.
 	}
 	Bool doingTerrainZone = false;
-	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, parentCell->getZone());
 
 	if (parentCell->getType() == PathfindCell::CELL_OBSTACLE) {
 		doingTerrainZone = true;
@@ -7506,11 +7446,11 @@ Bool Pathfinder::quickDoesPathExist( const LocomotorSet& locomotorSet,
 	if (doingTerrainZone) {
 		zone1 = parentCell->getZone();
 		zone1 = m_zoneManager.getEffectiveTerrainZone(zone1);
-		zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, zone1); 
+		zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, zone1);
 		zone1 = m_zoneManager.getEffectiveTerrainZone(zone1);
 		zone2 = goalCell->getZone();
 		zone2 = m_zoneManager.getEffectiveTerrainZone(zone2);
-		zone2 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, zone2); 
+		zone2 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, zone2);
 		zone2 = m_zoneManager.getEffectiveTerrainZone(zone2);
 	}
 	if (!validMovementPosition(false, destinationLayer, locomotorSet, to)) {
@@ -7532,8 +7472,8 @@ Bool Pathfinder::quickDoesPathExist( const LocomotorSet& locomotorSet,
  * False means it is impossible to path.
  * True means it is possible to path.
  */
-Bool Pathfinder::slowDoesPathExist( Object *obj, 
-																const Coord3D *from, 
+Bool Pathfinder::slowDoesPathExist( Object *obj,
+																const Coord3D *from,
 																const Coord3D *to,
 																ObjectID ignoreObject)
 {
@@ -7546,10 +7486,10 @@ Bool Pathfinder::slowDoesPathExist( Object *obj,
 	Path *path = findPath(obj, locoSet, from, to);
 	m_ignoreObstacleID = INVALID_ID;
 	Bool found = (path!=NULL);
-	if (path) {
-		deleteInstance(path);
-		path = NULL;
-	}
+
+	deleteInstance(path);
+	path = NULL;
+
 	return found;
 }
 
@@ -7574,16 +7514,15 @@ void Pathfinder::clip( Coord3D *from, Coord3D *to )
 
 }
 
-Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet, Coord3D *dest, 
+Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet, Coord3D *dest,
 		PathfindLayerEnum layer, const Coord3D *groupDest)
 {
-	//CRCDEBUG_LOG(("Pathfinder::pathDestination()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::pathDestination()"));
 	if (m_isMapReady == false) return NULL;
-	
+
 	if (!obj) return false;
 
 	Int cellCount = 0;
-#define MAX_CELL_COUNT 500
 
 	Coord3D adjustTo = *groupDest;
 	Coord3D *to = &adjustTo;
@@ -7614,7 +7553,7 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 	getRadiusAndCenter(obj, radius, center);
 
 	// determine start cell
-	ICoord2D startCellNdx; 
+	ICoord2D startCellNdx;
 	worldToCell(dest, &startCellNdx);
 	PathfindCell *parentCell = getCell( layer, startCellNdx.x, startCellNdx.y );
 	if (parentCell == NULL)
@@ -7627,7 +7566,11 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 
 	if (parentCell!=goalCell) {
 		if (!parentCell->allocateInfo(startCellNdx)) {
-			desiredCell->releaseInfo();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding)	{
+				desiredCell->releaseInfo();
+			}
+#endif
 			goalCell->releaseInfo();
 			return FALSE;
 		}
@@ -7664,13 +7607,12 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 		Coord3D pos;
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
-		if (checkForAdjust(obj, locomotorSet, isHuman, parentCell->getXIndex(), parentCell->getYIndex(), parentCell->getLayer(), 
-			radius, center, &pos, groupDest)) { 
+		if (checkForAdjust(obj, locomotorSet, isHuman, parentCell->getXIndex(), parentCell->getYIndex(), parentCell->getLayer(),
+			radius, center, &pos, groupDest)) {
 			Int dx = IABS(goalCell->getXIndex()-parentCell->getXIndex());
 			Int dy = IABS(goalCell->getYIndex()-parentCell->getYIndex());
 			Real distSqr = dx*dx+dy*dy;
-			//Real cost = (parentCell->getCostSoFar()*(parentCell->getCostSoFar()*COST_TO_DISTANCE_FACTOR))*0.5f;
-			//distSqr += sqr(cost);
+
 			if (distSqr < closestDistanceSqr) {
 				closestCell = parentCell;
 				closestDistanceSqr = distSqr;
@@ -7689,19 +7631,19 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 		checkChangeLayers(parentCell);
 
 		// expand search to neighboring orthogonal cells
-		static ICoord2D delta[] = 
-		{ 
-			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 }, 
-			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 } 
+		static ICoord2D delta[] =
+		{
+			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 },
+			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 }
 		};
 		const Int numNeighbors = 8;
 		const Int firstDiagonal = 4;
 		ICoord2D newCellCoord;
 		PathfindCell *newCell;
 		const Int adjacent[5] = {0, 1, 2, 3, 0};
-		Bool neighborFlags[8] = {false, false, false, false, false, false, false};
+		Bool neighborFlags[8] = { 0 };
 
-		UnsignedInt newCostSoFar;
+		UnsignedInt newCostSoFar = 0;
 
 		for( int i=0; i<numNeighbors; i++ )
 		{
@@ -7717,13 +7659,13 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 			if (newCell == NULL)
 				continue;
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
 			Bool onList = false;
 			if (newCell->hasInfo()) {
 				if (newCell->getOpen() || newCell->getClosed())
 				{
-					// already on one of the lists 
+					// already on one of the lists
 					onList = true;
 				}
 			}
@@ -7736,24 +7678,31 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 
 			if (!validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), newCell, parentCell )) {
 				continue;
-			}	
+			}
 
 			neighborFlags[i] = true;
 
 			if (!newCell->allocateInfo(newCellCoord)) {
 				// Out of cells for pathing...
+#if RETAIL_COMPATIBLE_PATHFINDING
+				if (s_useFixedPathfinding)
+#endif
+				{
+					cleanOpenAndClosedLists();
+					goalCell->releaseInfo();
+				}
  				return cellCount;
-			}								
+			}
 			cellCount++;
 
 			newCostSoFar = newCell->costSoFar( parentCell );
 			newCell->setBlockedByAlly(false);
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
 			if (onList)
 			{
-				// already on one of the lists - if existing costSoFar is less, 
+				// already on one of the lists - if existing costSoFar is less,
 				// the new cell is on a longer path, so skip it
 				if (newCell->getCostSoFar() <= newCostSoFar)
 					continue;
@@ -7764,7 +7713,7 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 
 			// store cost of this path
 			newCell->setCostSoFar(newCostSoFar);
-			
+
 			Int costRemaining = 0;
 			if (goalCell) {
 				costRemaining = newCell->costToGoal( goalCell );
@@ -7772,10 +7721,6 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 
 			newCell->setTotalCost(newCell->getCostSoFar() + costRemaining) ;
 
-			//DEBUG_LOG(("Cell (%d,%d), Parent cost %d, newCostSoFar %d, cost rem %d, tot %d\n", 
-			//	newCell->getXIndex(), newCell->getYIndex(), 
-			//	newCell->costSoFar(parentCell), newCostSoFar, costRemaining, newCell->getCostSoFar() + costRemaining));
-
 			// if newCell was on closed list, remove it from the list
 			if (newCell->getClosed())
 				m_closedList = newCell->removeFromClosedList( m_closedList );
@@ -7789,7 +7734,7 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 		}
 	}
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (closestCell) {
 		debugShowSearch(true);
 		*dest = closestPos;
@@ -7798,8 +7743,19 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 	}
 #endif
 	m_isTunneling = false;
-	cleanOpenAndClosedLists();
-	goalCell->releaseInfo();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		cleanOpenAndClosedLists();
+		goalCell->releaseInfo();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+		goalCell->releaseInfo();
+	}
+
 	return false;
 }
 
@@ -7823,18 +7779,18 @@ struct TightenPathStruct
 		return 0; // abort.
 	}
 	Coord3D pos;
-	if (!TheAI->pathfinder()->checkForAdjust(d->obj, *d->locomotorSet, true, to_x, to_y, to->getLayer(), d->radius, d->center, &pos, NULL)) 
+	if (!TheAI->pathfinder()->checkForAdjust(d->obj, *d->locomotorSet, true, to_x, to_y, to->getLayer(), d->radius, d->center, &pos, NULL))
 	{
 		return 0;	// bail early
 	}
-	d->foundDest = true; 
+	d->foundDest = true;
 	d->destPos = pos;
 
 	return 0;	// keep going
 }
 
 /* Returns the cost, which is in the same units as coord3d distance. */
-void Pathfinder::tightenPath(Object *obj, const LocomotorSet& locomotorSet, Coord3D *from, 
+void Pathfinder::tightenPath(Object *obj, const LocomotorSet& locomotorSet, Coord3D *from,
 		const Coord3D *to)
 {
 	TightenPathStruct info;
@@ -7852,16 +7808,15 @@ void Pathfinder::tightenPath(Object *obj, const LocomotorSet& locomotorSet, Coor
 
 
 /* Returns the cost, which is in the same units as coord3d distance. */
-Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, 
+Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 		const Coord3D *rawTo)
 {
-	//CRCDEBUG_LOG(("Pathfinder::checkPathCost()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::checkPathCost()"));
 	if (m_isMapReady == false) return NULL;
-	enum {MAX_COST = 0x7fff0000};	
+	enum {MAX_COST = 0x7fff0000};
 	if (!obj) return MAX_COST;
 
 	Int cellCount = 0;
-#define MAX_CELL_COUNT 500
 
 	Coord3D adjustTo = *rawTo;
 	Coord3D *to = &adjustTo;
@@ -7882,7 +7837,7 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 	getRadiusAndCenter(obj, radius, center);
 
 	// determine start cell
-	ICoord2D startCellNdx; 
+	ICoord2D startCellNdx;
 	worldToCell(from, &startCellNdx);
 	PathfindLayerEnum fromLayer = TheTerrainLogic->getLayerForDestination(from);
 	PathfindCell *parentCell = getCell( fromLayer, from );
@@ -7925,16 +7880,34 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 		parentCell = m_openList;
 		m_openList = parentCell->removeFromOpenList(m_openList);
 
-		// put parent cell onto closed list - its evaluation is finished
-		m_closedList = parentCell->putOnClosedList( m_closedList );
+		// put parent cell onto closed list - its evaluation is finished - Retail compatible behaviour
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (!s_useFixedPathfinding) {
+			m_closedList = parentCell->putOnClosedList( m_closedList );
+		}
+#endif
 
-		if (parentCell==goalCell) {	 
+		if (parentCell==goalCell) {
 			Int cost = parentCell->getTotalCost();
 			m_isTunneling = false;
 			cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (s_useFixedPathfinding)
+#endif
+			{
+				parentCell->releaseInfo();
+			}
 			return cost;
 		}
 
+		// put parent cell onto closed list - its evaluation is finished - Fixed behaviour
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (s_useFixedPathfinding)
+#endif
+		{
+			m_closedList = parentCell->putOnClosedList( m_closedList );
+		}
+
 		if (cellCount > MAX_CELL_COUNT) {
 			continue;
 		}
@@ -7942,19 +7915,19 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 		checkChangeLayers(parentCell);
 
 		// expand search to neighboring orthogonal cells
-		static ICoord2D delta[] = 
-		{ 
-			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 }, 
-			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 } 
+		static ICoord2D delta[] =
+		{
+			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 },
+			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 }
 		};
 		const Int numNeighbors = 8;
 		const Int firstDiagonal = 4;
 		ICoord2D newCellCoord;
 		PathfindCell *newCell;
 		const Int adjacent[5] = {0, 1, 2, 3, 0};
-		Bool neighborFlags[8] = {false, false, false, false, false, false, false};
+		Bool neighborFlags[8] = { 0 };
 
-		UnsignedInt newCostSoFar;
+		UnsignedInt newCostSoFar = 0;
 
 		for( int i=0; i<numNeighbors; i++ )
 		{
@@ -7970,13 +7943,13 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 			if (newCell == NULL)
 				continue;
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
 			Bool onList = false;
 			if (newCell->hasInfo()) {
 				if (newCell->getOpen() || newCell->getClosed())
 				{
-					// already on one of the lists 
+					// already on one of the lists
 					onList = true;
 				}
 			}
@@ -7989,24 +7962,32 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 
 			if (!validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), newCell, parentCell )) {
 				continue;
-			}	
+			}
 
 			neighborFlags[i] = true;
 
 			if (!newCell->allocateInfo(newCellCoord)) {
 				// Out of cells for pathing...
+#if RETAIL_COMPATIBLE_PATHFINDING
+				if (s_useFixedPathfinding)
+#endif
+				{
+					cleanOpenAndClosedLists();
+					parentCell->releaseInfo();
+					goalCell->releaseInfo();
+				}
  				return cellCount;
-			}								
+			}
 			cellCount++;
 
 			newCostSoFar = newCell->costSoFar( parentCell );
 			newCell->setBlockedByAlly(false);
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
 			if (onList)
 			{
-				// already on one of the lists - if existing costSoFar is less, 
+				// already on one of the lists - if existing costSoFar is less,
 				// the new cell is on a longer path, so skip it
 				if (newCell->getCostSoFar() <= newCostSoFar)
 					continue;
@@ -8017,7 +7998,7 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 
 			// store cost of this path
 			newCell->setCostSoFar(newCostSoFar);
-			
+
 			Int costRemaining = 0;
 			if (goalCell) {
 				costRemaining = newCell->costToGoal( goalCell );
@@ -8025,10 +8006,6 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 
 			newCell->setTotalCost(newCell->getCostSoFar() + costRemaining) ;
 
-			//DEBUG_LOG(("Cell (%d,%d), Parent cost %d, newCostSoFar %d, cost rem %d, tot %d\n", 
-			//	newCell->getXIndex(), newCell->getYIndex(), 
-			//	newCell->costSoFar(parentCell), newCostSoFar, costRemaining, newCell->getCostSoFar() + costRemaining));
-
 			// if newCell was on closed list, remove it from the list
 			if (newCell->getClosed())
 				m_closedList = newCell->removeFromClosedList( m_closedList );
@@ -8037,30 +8014,48 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 			if (newCell->getOpen())
 				m_openList = newCell->removeFromOpenList( m_openList );
 
+#if RETAIL_COMPATIBLE_PATHFINDING
+			// TheSuperHacker @info This is here to catch a retail pathfinding crash point and to recover from it
+			// A cell has gotten onto the open list without pathfinding info due to a danling m_open pointer on the previous listed cell so we need to force a cleanup
+			if (!s_useFixedPathfinding && m_openList && !m_openList->hasInfo()) {
+				s_useFixedPathfinding = true;
+				forceCleanCells();
+				return MAX_COST;
+			}
+#endif
+
 			// insert newCell in open list such that open list is sorted, smallest total path cost first
 			m_openList = newCell->putOnSortedOpenList( m_openList );
 		}
 	}
 
 	m_isTunneling = false;
-	if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+			goalCell->releaseInfo();
+		}
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
 		goalCell->releaseInfo();
 	}
-	cleanOpenAndClosedLists();
 	return MAX_COST;
 }
 
 
-
-
 /**
  * Find a short, valid path between the FROM location and a location NEAR the to location.
  * Uses A* algorithm.
  */
-Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, 
+Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 																	Coord3D *rawTo, Bool blocked, Real pathCostMultiplier, Bool moveAllies)
 {
-	//CRCDEBUG_LOG(("Pathfinder::findClosestPath()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::findClosestPath()"));
 #ifdef DEBUG_LOGGING
 	Int startTimeMS = ::GetTickCount();
 #endif
@@ -8128,8 +8123,8 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 				{
 					m_ignoreObstacleID = goalCell->getObstacleID();
 					goalOnObstacle = true;
-				}	
-				else 
+				}
+				else
 				{
 					if (m_ignoreObstacleID == goalCell->getObstacleID()) {
 						goalOnObstacle = true;
@@ -8183,6 +8178,12 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 	if (parentCell!=goalCell) {
 		worldToCell(&clipFrom, &pos2d);
 		if (!parentCell->allocateInfo(pos2d)) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (s_useFixedPathfinding)
+#endif
+			{
+				goalCell->releaseInfo();
+			}
 			return NULL;
 		}
 	}
@@ -8230,11 +8231,11 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 			}
 			if (count>1000) {
 				show = true;
-				DEBUG_LOG(("FCP - cells %d obj %s %x\n", count, obj->getTemplate()->getName().str(), obj));
+				DEBUG_LOG(("FCP - cells %d obj %s %x", count, obj->getTemplate()->getName().str(), obj));
 #ifdef STATE_MACHINE_DEBUG
 				if( obj->getAIUpdateInterface() )
 				{
-					DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+					DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 				}
 #endif
 				TheScriptEngine->AppendDebugMessage("Big path FCP", false);
@@ -8245,18 +8246,29 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 			m_isTunneling = false;
 			// construct and return path
 			Path *path = buildActualPath( obj, locomotorSet.getValidSurfaces(), from, goalCell, centerInCell, blocked);
-			parentCell->releaseInfo();
-			goalCell->releaseInfo();
-			cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding) {
+				parentCell->releaseInfo();
+				goalCell->releaseInfo();
+				cleanOpenAndClosedLists();
+			}
+			else
+#endif
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
+				goalCell->releaseInfo();
+			}
+
 			return path;
-		}	
+		}
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
 		if (!m_isTunneling && checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(), parentCell->getLayer(), radius, centerInCell)) {
 			if (!startedStuck || validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), parentCell )) {
 				dx = IABS(goalCell->getXIndex()-parentCell->getXIndex());
 				dy = IABS(goalCell->getYIndex()-parentCell->getYIndex());
-				distSqr = dx*dx+dy*dy;		
+				distSqr = dx*dx+dy*dy;
 				if (distSqr<closestDistScreenSqr) {
 					closestDistScreenSqr = distSqr;
 				}
@@ -8291,7 +8303,7 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 		// Check to see if we can change layers in this cell.
 		checkChangeLayers(parentCell);
 
- 
+
 		count += examineNeighboringCells(parentCell, goalCell, locomotorSet, isHuman, centerInCell, radius, startCellNdx, obj, NO_ATTACK);
 	}
 
@@ -8303,17 +8315,16 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 #ifdef INTENSE_DEBUG
 		if (count>5000) {
 			show = true;
-			DEBUG_LOG(("FCP CC cells %d obj %s %x\n", count, obj->getTemplate()->getName().str(), obj));
+			DEBUG_LOG(("FCP CC cells %d obj %s %x", count, obj->getTemplate()->getName().str(), obj));
 #ifdef STATE_MACHINE_DEBUG
 			if( obj->getAIUpdateInterface() )
 			{
-				DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+				DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 			}
 #endif
 
-			DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-			DEBUG_LOG(("Pathfind(findClosestPath) chugged from (%f,%f) to (%f,%f), --", from->x, from->y, to->x, to->y));
-			DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
+			DEBUG_LOG(("%d Pathfind(findClosestPath) chugged from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
+			DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 #ifdef INTENSE_DEBUG
 			TheScriptEngine->AppendDebugMessage("Big path FCP CC", false);
 #endif
@@ -8327,8 +8338,18 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 		rawTo->y = closesetCell->getYIndex()*PATHFIND_CELL_SIZE_F + PATHFIND_CELL_SIZE_F/2.0f;
 		// construct and return path
 		Path *path = buildActualPath( obj, locomotorSet.getValidSurfaces(), from, closesetCell, centerInCell, blocked );
-		goalCell->releaseInfo();
-		cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (!s_useFixedPathfinding) {
+			goalCell->releaseInfo();
+			cleanOpenAndClosedLists();
+		}
+		else
+#endif
+		{
+			cleanOpenAndClosedLists();
+			parentCell->releaseInfo();
+			goalCell->releaseInfo();
+		}
 		return path;
 	}
 
@@ -8337,20 +8358,29 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 	Bool valid;
 	valid = validMovementPosition( isCrusher, obj->getLayer(), locomotorSet, to ) ;
 
-	DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-	DEBUG_LOG(("Pathfind(findClosestPath) failed from (%f,%f) to (%f,%f), original valid %d --", from->x, from->y, to->x, to->y, valid));
-	DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
+	DEBUG_LOG(("Pathfind(findClosestPath) failed from (%f,%f) to (%f,%f), original valid %d --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y, valid));
+	DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 #endif
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	if (TheGlobalData->m_debugAI) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugAI)
 		debugShowSearch(false);
 #endif
 #ifdef DUMP_PERF_STATS
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	goalCell->releaseInfo();
-	cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		goalCell->releaseInfo();
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+		goalCell->releaseInfo();
+	}
 	return NULL;
 }
 
@@ -8368,12 +8398,10 @@ void Pathfinder::adjustCoordToCell(Int cellX, Int cellY, Bool centerInCell, Coor
 }
 
 
-
-
 /**
  * Work backwards from goal cell to construct final path.
  */
-Path *Pathfinder::buildActualPath( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces, const Coord3D *fromPos, 
+Path *Pathfinder::buildActualPath( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces, const Coord3D *fromPos,
 																	PathfindCell *goalCell, Bool center, Bool blocked )
 {
 	DEBUG_ASSERTCRASH( goalCell, ("Pathfinder::buildActualPath: goalCell == NULL") );
@@ -8389,8 +8417,8 @@ Path *Pathfinder::buildActualPath( const Object *obj, LocomotorSurfaceTypeMask a
 	// cleanup the path by checking line of sight
 	path->optimize(obj, acceptableSurfaces, blocked);
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
  		RGBColor color;
@@ -8421,12 +8449,12 @@ Path *Pathfinder::buildActualPath( const Object *obj, LocomotorSurfaceTypeMask a
 	}
 #endif
 	return path;
-}			 
+}
 
 /**
  * Work backwards from goal cell to construct final path.
  */
-void Pathfinder::prependCells( Path *path, const Coord3D *fromPos, 
+void Pathfinder::prependCells( Path *path, const Coord3D *fromPos,
 																	PathfindCell *goalCell, Bool center )
 {
 	// traverse path cells in REVERSE order, creating path in desired order
@@ -8448,7 +8476,7 @@ void Pathfinder::prependCells( Path *path, const Coord3D *fromPos,
 			path->getFirstNode()->setLayer(layer);
 			continue;
 		}
-		
+
 		Bool canOptimize = true;
 		if (cell->getType() == PathfindCell::CELL_CLIFF) {
 			if (prevCell && prevCell->getType() != PathfindCell::CELL_CLIFF) {
@@ -8472,6 +8500,33 @@ void Pathfinder::prependCells( Path *path, const Coord3D *fromPos,
 		}
 		prevCell = cell;
 	}
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+	// TheSuperHackers @info This pathway is here for retail compatibility, it is to catch when a starting cell has a dangling parent that contains no pathing information
+	// Beyond this point a retail client will crash due to a null pointer access within cell->getXIndex()
+	// To recover from this we set the cell to the previous cell, which should be the actual starting cell then set to use the fixed pathing and perform a forced cleanup
+	if (!s_useFixedPathfinding) {
+		if (!cell->hasInfo()) {
+			cell = prevCell;
+
+			m_zoneManager.setPassable(cell->getXIndex(), cell->getYIndex(), true);
+			if (goalCellNull) {
+				// Very short path.
+				adjustCoordToCell(cell->getXIndex(), cell->getYIndex(), center, pos, cell->getLayer());
+				path->prependNode( &pos, cell->getLayer() );
+			}
+			// put actual start position as first node on the path, so it begins right at the unit's feet
+			if (fromPos->x != path->getFirstNode()->getPosition()->x || fromPos->y != path->getFirstNode()->getPosition()->y) {
+				path->prependNode( fromPos, cell->getLayer() );
+			}
+
+			s_useFixedPathfinding = true;
+			forceCleanCells();
+			return;
+		}
+	}
+#endif
+
 	m_zoneManager.setPassable(cell->getXIndex(), cell->getYIndex(), true);
 	if (goalCellNull) {
 		// Very short path.
@@ -8483,18 +8538,16 @@ void Pathfinder::prependCells( Path *path, const Coord3D *fromPos,
 		path->prependNode( fromPos, cell->getLayer() );
 	}
 
-}			 
+}
 
-void Pathfinder::setDebugPath(Path *newDebugpath) 
+void Pathfinder::setDebugPath(Path *newDebugpath)
 {
 	if (TheGlobalData->m_debugAI)
 	{
 		// copy the path for debugging
-		if (debugPath)
-			deleteInstance(debugPath);
-
+		deleteInstance(debugPath);
 		debugPath = newInstance(Path);
-					
+
 		for( PathNode *copyNode = newDebugpath->getFirstNode(); copyNode; copyNode = copyNode->getNextOptimized() )
 			debugPath->appendNode( copyNode->getPosition(), copyNode->getLayer() );
 	}
@@ -8505,7 +8558,7 @@ void Pathfinder::setDebugPath(Path *newDebugpath)
  * Given two world-space points, call callback for each cell.
  * Uses Bresenham line algorithm from www.gamedev.net.
  */
-Int Pathfinder::iterateCellsAlongLine( const Coord3D& startWorld, const Coord3D& endWorld, 
+Int Pathfinder::iterateCellsAlongLine( const Coord3D& startWorld, const Coord3D& endWorld,
 																			PathfindLayerEnum layer, CellAlongLineProc proc, void* userData )
 {
 	ICoord2D start, end;
@@ -8517,7 +8570,7 @@ Int Pathfinder::iterateCellsAlongLine( const Coord3D& startWorld, const Coord3D&
  * Given two world-space points, call callback for each cell.
  * Uses Bresenham line algorithm from www.gamedev.net.
  */
-Int Pathfinder::iterateCellsAlongLine( const ICoord2D &start, const ICoord2D &end, 
+Int Pathfinder::iterateCellsAlongLine( const ICoord2D &start, const ICoord2D &end,
 																			PathfindLayerEnum layer, CellAlongLineProc proc, void* userData )
 {
 	Int delta_x = abs(end.x - start.x);			// The difference between the x's
@@ -8576,7 +8629,7 @@ Int Pathfinder::iterateCellsAlongLine( const ICoord2D &start, const ICoord2D &en
 	{
 		PathfindCell* to = getCell( layer, x, y );
 		if (to==NULL) return 0;
-		
+
 		Int ret = (*proc)(this, from, to, x, y, userData);
 		if (ret != 0)
 			return ret;
@@ -8615,7 +8668,7 @@ static ObjectID getSlaverID(const Object* o)
 			return sdu->getSlaverID();
 		}
 	}
-	
+
 	return INVALID_ID;
 }
 
@@ -8684,7 +8737,7 @@ struct ViewBlockedStruct
 		if (to->isObstaclePresent(getSlaverID(d->obj)))
 			return 0;
 
-		// if the obstacle is the item to which objOther is slaved, ignore it as an obstacle.				
+		// if the obstacle is the item to which objOther is slaved, ignore it as an obstacle.
 		if (to->isObstaclePresent(getSlaverID(d->objOther)))
 			return 0;
 
@@ -8724,7 +8777,7 @@ struct ViewAttackBlockedStruct
 			// nor does the object we're trying to attack!
 			if (to->isObstaclePresent(d->victim->getID()))
 				return 0;
-			// if the obstacle is the item to which objOther is slaved, ignore it as an obstacle.				
+			// if the obstacle is the item to which objOther is slaved, ignore it as an obstacle.
 			if (to->isObstaclePresent(getSlaverID(d->victim)))
 				return 0;
 		}
@@ -8741,12 +8794,12 @@ struct ViewAttackBlockedStruct
 
 		if (to->isObstacleTransparent())
 			return 0;
-		//Kris: Added the check for victimCell because in China01 -- after the intro, NW of your 
-		//base is a cream colored building that lies in a negative coord. When you order units to 
+		//Kris: Added the check for victimCell because in China01 -- after the intro, NW of your
+		//base is a cream colored building that lies in a negative coord. When you order units to
 		//force attack it, it crashes.
-		if( d->victimCell && to->isObstaclePresent( d->victimCell->getObstacleID() ) ) 
+		if( d->victimCell && to->isObstaclePresent( d->victimCell->getObstacleID() ) )
 		{
-			// Victim is inside the bounds of another object.  We don't let this block us, 
+			// Victim is inside the bounds of another object.  We don't let this block us,
 			// as usually it is on the edge and it looks like we should be able to shoot it. jba.
 			return 0;
 		}
@@ -8767,38 +8820,38 @@ Bool Pathfinder::isViewBlockedByObstacle(const Object* obj, const Object* objOth
 	}
 #if 1
 	return isAttackViewBlockedByObstacle(obj, *obj->getPosition(), objOther, *objOther->getPosition());
-#else 
+#else
 	PathfindLayerEnum layer = objOther->getLayer();
 	if (layer==LAYER_GROUND) {
 		layer = obj->getLayer();
 	}
-	Int ret = iterateCellsAlongLine(*obj->getPosition(), *objOther->getPosition(), 
+	Int ret = iterateCellsAlongLine(*obj->getPosition(), *objOther->getPosition(),
 		layer, lineBlockedByObstacleCallback, &info);
 	return ret != 0;
-#endif 
+#endif
 }
 
 
 //-----------------------------------------------------------------------------
 Bool Pathfinder::isAttackViewBlockedByObstacle(const Object* attacker, const Coord3D& attackerPos, const Object* victim, const Coord3D& victimPos)
 {
-	//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() - attackerPos is (%g,%g,%g) (%X,%X,%X)\n",
+	//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() - attackerPos is (%g,%g,%g) (%X,%X,%X)",
 	//	attackerPos.x, attackerPos.y, attackerPos.z,
 	//	AS_INT(attackerPos.x),AS_INT(attackerPos.y),AS_INT(attackerPos.z)));
-	//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() - victimPos is (%g,%g,%g) (%X,%X,%X)\n",
+	//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() - victimPos is (%g,%g,%g) (%X,%X,%X)",
 	//	victimPos.x, victimPos.y, victimPos.z,
 	//	AS_INT(victimPos.x),AS_INT(victimPos.y),AS_INT(victimPos.z)));
 	// Global switch to turn this off in case it doesn't work.
-	if (!TheAI->getAiData()->m_attackUsesLineOfSight) 
+	if (!TheAI->getAiData()->m_attackUsesLineOfSight)
 	{
-		//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 1\n"));
+		//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 1"));
 		return false;
 	}
 
 	// If the attacker doesn't need line of sight, isn't blocked.
-	if (!attacker->isKindOf(KINDOF_ATTACK_NEEDS_LINE_OF_SIGHT)) 
+	if (!attacker->isKindOf(KINDOF_ATTACK_NEEDS_LINE_OF_SIGHT))
 	{
-		//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 2\n"));
+		//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 2"));
 		return false;
 	}
 
@@ -8820,7 +8873,7 @@ Bool Pathfinder::isAttackViewBlockedByObstacle(const Object* attacker, const Coo
 
 		if (viewBlocked)
 		{
-			//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 3\n"));
+			//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 3"));
 			return true;
 		}
 	}
@@ -8834,13 +8887,13 @@ Bool Pathfinder::isAttackViewBlockedByObstacle(const Object* attacker, const Coo
 		layer = victim->getLayer();
 	}
 	info.victimCell = getCell(layer, &victimPos);
-	
+
 	info.skipCount = 0;
-	if (attacker->getLayer() != LAYER_GROUND) 
+	if (attacker->getLayer() != LAYER_GROUND)
 	{
 		info.skipCount = 3;	/// srj -- someone wanna tell me what this magic number means?
-												/// jba - Yes, it means that if someone is on a bridge, or rooftop, they can see 
-												///      3 pathfind cells out of whatever they are standing on.  
+												/// jba - Yes, it means that if someone is on a bridge, or rooftop, they can see
+												///      3 pathfind cells out of whatever they are standing on.
 												/// srj -- awesome! thank you very much :-)
 		if (layer==LAYER_GROUND) {
 			layer = attacker->getLayer();
@@ -8848,11 +8901,11 @@ Bool Pathfinder::isAttackViewBlockedByObstacle(const Object* attacker, const Coo
 	}
 
 	Int ret = iterateCellsAlongLine(attackerPos, victimPos, layer, attackBlockedByObstacleCallback, &info);
-	//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 4\n"));
+	//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 4"));
 	return ret != 0;
 }
 
-static void computeNormalRadialOffset(const Coord3D& from,	Coord3D& insert, const Coord3D& to, 
+static void computeNormalRadialOffset(const Coord3D& from,	Coord3D& insert, const Coord3D& to,
 																			Object *obj, Real radius)
 {
 	Real crossProduct;
@@ -8884,7 +8937,7 @@ static void computeNormalRadialOffset(const Coord3D& from,	Coord3D& insert, cons
 }
 
 //-----------------------------------------------------------------------------
-Bool Pathfinder::segmentIntersectsTallBuilding(const PathNode *curNode, 
+Bool Pathfinder::segmentIntersectsTallBuilding(const PathNode *curNode,
 										PathNode *nextNode,  ObjectID ignoreBuilding, Coord3D *insertPos1,  Coord3D *insertPos2,  Coord3D *insertPos3 )
 {
 	segmentIntersectsStruct info;
@@ -8901,7 +8954,7 @@ Bool Pathfinder::segmentIntersectsTallBuilding(const PathNode *curNode,
 			// see if toPos is inside the radius of the tall building.
 			Coord3D bldgPos = *info.theTallBuilding->getPosition();
 			Coord2D delta;
-			Real radius = info.theTallBuilding->getGeometryInfo().getBoundingCircleRadius() + 2*PATHFIND_CELL_SIZE_F; 
+			Real radius = info.theTallBuilding->getGeometryInfo().getBoundingCircleRadius() + 2*PATHFIND_CELL_SIZE_F;
 			delta.x = toPos.x - bldgPos.x;
 			delta.y = toPos.y - bldgPos.y;
 			if (delta.length() <= radius*0.98) {
@@ -8948,11 +9001,11 @@ Bool Pathfinder::circleClipsTallBuilding(	const Coord3D *from, const Coord3D *to
 	PartitionFilter *filters[] = { &filterKindof, NULL };
 	Object* tallBuilding = ThePartitionManager->getClosestObject(to, circleRadius, FROM_BOUNDINGSPHERE_2D, filters);
 	if (tallBuilding) {
-		Real radius = tallBuilding->getGeometryInfo().getBoundingCircleRadius() + 2*PATHFIND_CELL_SIZE_F; 
+		Real radius = tallBuilding->getGeometryInfo().getBoundingCircleRadius() + 2*PATHFIND_CELL_SIZE_F;
 		computeNormalRadialOffset(*from, *adjustTo, *to, tallBuilding, circleRadius+radius);
 		Object* otherTallBuilding = ThePartitionManager->getClosestObject(adjustTo, circleRadius, FROM_BOUNDINGSPHERE_2D, filters);
 		if (otherTallBuilding && otherTallBuilding!=tallBuilding) {
-			radius = otherTallBuilding->getGeometryInfo().getBoundingCircleRadius() + 2*PATHFIND_CELL_SIZE_F; 
+			radius = otherTallBuilding->getGeometryInfo().getBoundingCircleRadius() + 2*PATHFIND_CELL_SIZE_F;
 			Coord3D tmpTo = *adjustTo;
 			computeNormalRadialOffset(*from, *adjustTo, tmpTo, otherTallBuilding, circleRadius+radius);
 		}
@@ -8991,7 +9044,7 @@ struct LinePassableStruct
 		return 1;	// bail out
 	}
 
-	if (info.allyFixedCount || info.enemyFixed) 
+	if (info.allyFixedCount || info.enemyFixed)
 	{
 		return 1;	// bail out
 	}
@@ -9041,13 +9094,13 @@ struct GroundPathPassableStruct
  * Given two world-space points, check the line of sight between them for any impassible cells.
  * Uses Bresenham line algorithm from www.gamedev.net.
  */
-Bool Pathfinder::isLinePassable( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces, 
-																PathfindLayerEnum layer, const Coord3D& startWorld, 
-																const Coord3D& endWorld, Bool blocked, 
+Bool Pathfinder::isLinePassable( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces,
+																PathfindLayerEnum layer, const Coord3D& startWorld,
+																const Coord3D& endWorld, Bool blocked,
 																Bool allowPinched)
 {
 	LinePassableStruct info;
-	//CRCDEBUG_LOG(("Pathfinder::isLinePassable(): %d %d %d \n", m_ignoreObstacleID, m_isMapReady, m_isTunneling));
+	//CRCDEBUG_LOG(("Pathfinder::isLinePassable(): %d %d %d ", m_ignoreObstacleID, m_isMapReady, m_isTunneling));
 
 	info.obj = obj;
 	info.acceptableSurfaces = acceptableSurfaces;
@@ -9065,7 +9118,7 @@ Bool Pathfinder::isLinePassable( const Object *obj, LocomotorSurfaceTypeMask acc
  * Given two world-space points, check the line of sight between them for any impassible cells.
  * Uses Bresenham line algorithm from www.gamedev.net.
  */
-Bool Pathfinder::isGroundPathPassable( Bool isCrusher, const Coord3D& startWorld, PathfindLayerEnum startLayer, 
+Bool Pathfinder::isGroundPathPassable( Bool isCrusher, const Coord3D& startWorld, PathfindLayerEnum startLayer,
 		const Coord3D& endWorld, Int pathDiameter)
 {
 	GroundPathPassableStruct info;
@@ -9077,14 +9130,14 @@ Bool Pathfinder::isGroundPathPassable( Bool isCrusher, const Coord3D& startWorld
 	return ret == 0;
 }
 
-/** 
+/**
  * Classify the cells under the bridge
- * If 'repaired' is true, bridge is repaired 
- * If 'repaired' is false, bridge has been damaged to be impassable 
+ * If 'repaired' is true, bridge is repaired
+ * If 'repaired' is false, bridge has been damaged to be impassable
  */
 void Pathfinder::changeBridgeState( PathfindLayerEnum layer, Bool repaired)
 {
-	if (m_layers[layer].isUnused()) return;	
+	if (m_layers[layer].isUnused()) return;
 	if (m_layers[layer].setDestroyed(!repaired)) {
 		m_zoneManager.markZonesDirty();
 	}
@@ -9093,7 +9146,7 @@ void Pathfinder::changeBridgeState( PathfindLayerEnum layer, Bool repaired)
 void Pathfinder::getRadiusAndCenter(const Object *obj, Int &iRadius, Bool &center)
 {
 	enum {MAX_RADIUS = 2};
-	if (!obj) 
+	if (!obj)
 	{
 		center = true;
 		iRadius = 0;
@@ -9104,21 +9157,21 @@ void Pathfinder::getRadiusAndCenter(const Object *obj, Int &iRadius, Bool &cente
 		diameter = 2.0f*PATHFIND_CELL_SIZE_F;
 	}
 	iRadius = REAL_TO_INT_FLOOR(diameter/PATHFIND_CELL_SIZE_F+0.3f);
-	center = false;	
+	center = false;
 	if (iRadius==0) iRadius++;
-	if (iRadius&1) 
+	if (iRadius&1)
 	{
 		center = true;
 	}
 	iRadius /= 2;
-	if (iRadius > MAX_RADIUS) 
+	if (iRadius > MAX_RADIUS)
 	{
 		iRadius = MAX_RADIUS;
 		center = true;
 	}
 }
 
-/** 
+/**
  * Updates the goal cell for an ai unit.
  */
 void Pathfinder::updateGoal( Object *obj, const Coord3D *newGoalPos, PathfindLayerEnum layer)
@@ -9137,7 +9190,7 @@ void Pathfinder::updateGoal( Object *obj, const Coord3D *newGoalPos, PathfindLay
 
 	PathfindLayerEnum originalLayer = obj->getDestinationLayer();
 
-	//DEBUG_LOG(("Object Goal layer is %d\n", layer));
+	//DEBUG_LOG(("Object Goal layer is %d", layer));
 	Bool layerChanged = originalLayer != layer;
 
 	Bool doGround=false;
@@ -9185,9 +9238,8 @@ void Pathfinder::updateGoal( Object *obj, const Coord3D *newGoalPos, PathfindLay
 				if (cell) {
 					if (warn && cell->getGoalUnit()!=INVALID_ID && cell->getGoalUnit() != obj->getID()) {
 						warn = false;
-						// jba intense debug
-						//DEBUG_LOG(, ("Units got stuck close to each other.  jba\n"));
-					}	
+						//Units got stuck close to each other.  jba
+					}
 					cellNdx.x = i;
 					cellNdx.y = j;
 					cell->setGoalUnit(obj->getID(), cellNdx);
@@ -9198,8 +9250,7 @@ void Pathfinder::updateGoal( Object *obj, const Coord3D *newGoalPos, PathfindLay
 				if (cell) {
 					if (warn && cell->getGoalUnit()!=INVALID_ID && cell->getGoalUnit() != obj->getID()) {
 						warn = false;
-						// jba intense debug
-						//DEBUG_LOG(, ("Units got stuck close to each other.  jba\n"));
+						//Units got stuck close to each other.  jba
 					}
 					cellNdx.x = i;
 					cellNdx.y = j;
@@ -9211,7 +9262,7 @@ void Pathfinder::updateGoal( Object *obj, const Coord3D *newGoalPos, PathfindLay
 
 }
 
-/** 
+/**
  * Updates the goal cell for an ai unit.
  */
 void Pathfinder::updateAircraftGoal( Object *obj, const Coord3D *newGoalPos)
@@ -9267,9 +9318,9 @@ void Pathfinder::updateAircraftGoal( Object *obj, const Coord3D *newGoalPos)
 
 }
 
-/** 
+/**
  * Removes the goal cell for an ai unit.
- * Used for a unit that is going to be moving several times, like following a waypoint path, 
+ * Used for a unit that is going to be moving several times, like following a waypoint path,
  * or intentionally collides with other units (like a car bomb). jba
  */
 void Pathfinder::removeGoal( Object *obj)
@@ -9329,27 +9380,27 @@ void Pathfinder::removeGoal( Object *obj)
 	}
 }
 
-/** 
+/**
  * Updates the position cell for an ai unit.
  */
 void Pathfinder::updatePos( Object *obj, const Coord3D *newPos)
 {
-	if (obj->isKindOf(KINDOF_IMMOBILE)) 
+	if (obj->isKindOf(KINDOF_IMMOBILE))
 	{
 		// Only consider mobile.
 		return;
 	}
-	if (!m_isMapReady) 
+	if (!m_isMapReady)
 		return;
 
 	AIUpdateInterface *ai = obj->getAIUpdateInterface();
-	if (!ai) 
+	if (!ai)
 		return; // only consider ai objects.
 
 	ICoord2D curCell = *ai->getCurPathfindCell();
-	if (!ai->isDoingGroundMovement()) 
+	if (!ai->isDoingGroundMovement())
 	{
-		if (curCell.x>=0 && curCell.y>=0) 
+		if (curCell.x>=0 && curCell.y>=0)
 		{
 			removePos(obj);
 		}
@@ -9361,19 +9412,19 @@ void Pathfinder::updatePos( Object *obj, const Coord3D *newPos)
 	ICoord2D newCell;
 	getRadiusAndCenter(obj, radius, centerInCell);
 	Int numCellsAbove = radius;
-	if (centerInCell) 
+	if (centerInCell)
 		numCellsAbove++;
-	if (centerInCell) 
+	if (centerInCell)
 	{
 		newCell.x = REAL_TO_INT_FLOOR(newPos->x/PATHFIND_CELL_SIZE_F);
 		newCell.y = REAL_TO_INT_FLOOR(newPos->y/PATHFIND_CELL_SIZE_F);
-	} 
-	else 
+	}
+	else
 	{
 		newCell.x = REAL_TO_INT_FLOOR(0.5f+newPos->x/PATHFIND_CELL_SIZE_F);
 		newCell.y = REAL_TO_INT_FLOOR(0.5f+newPos->y/PATHFIND_CELL_SIZE_F);
 	}
-	if (newCell.x==curCell.x && newCell.y == curCell.y) 
+	if (newCell.x==curCell.x && newCell.y == curCell.y)
 	{
 		return;
 	}
@@ -9393,7 +9444,7 @@ void Pathfinder::updatePos( Object *obj, const Coord3D *newPos)
 	ai->setCurPathfindCell(newCell);
 	Int i,j;
 	ICoord2D cellNdx;
-	//DEBUG_LOG(("Updating unit pos at cell %d, %d\n", newCell.x, newCell.y));
+	//DEBUG_LOG(("Updating unit pos at cell %d, %d", newCell.x, newCell.y));
 	if (curCell.x>=0 && curCell.y>=0) {
 		for (i=curCell.x-radius; i<curCell.x+numCellsAbove; i++) {
 			for (j=curCell.y-radius; j<curCell.y+numCellsAbove; j++) {
@@ -9438,7 +9489,7 @@ void Pathfinder::updatePos( Object *obj, const Coord3D *newPos)
 	}
 }
 
-/** 
+/**
  * Removes the position cell flags for an ai unit.
  */
 void Pathfinder::removePos( Object *obj)
@@ -9464,7 +9515,7 @@ void Pathfinder::removePos( Object *obj)
 
 	Int i,j;
 	ICoord2D cellNdx;
-	//DEBUG_LOG(("Updating unit pos at cell %d, %d\n", newCell.x, newCell.y));
+	//DEBUG_LOG(("Updating unit pos at cell %d, %d", newCell.x, newCell.y));
 	if (curCell.x>=0 && curCell.y>=0) {
 		for (i=curCell.x-radius; i<curCell.x+numCellsAbove; i++) {
 			for (j=curCell.y-radius; j<curCell.y+numCellsAbove; j++) {
@@ -9490,7 +9541,7 @@ void Pathfinder::removePos( Object *obj)
 	}
 }
 
-/** 
+/**
  * Removes a mobile unit from the pathfind grid.
  */
 void Pathfinder::removeUnitFromPathfindMap(  Object *obj )
@@ -9501,7 +9552,7 @@ void Pathfinder::removeUnitFromPathfindMap(  Object *obj )
 
 Bool Pathfinder::moveAllies(Object *obj, Path *path)
 {
-								 
+
 #ifdef DO_UNIT_TIMINGS
 #pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
 extern Bool g_UT_startTiming;
@@ -9509,10 +9560,14 @@ if (g_UT_startTiming) return false;
 #endif
 	if (!obj->isKindOf(KINDOF_DOZER) && !obj->isKindOf(KINDOF_HARVESTER)) {
 		// Harvesters & dozers want a clear path.
-		if (!path->getBlockedByAlly()) return FALSE; // Only move units if it is required.
+		if (!path->getBlockedByAlly()) {
+			return FALSE; // Only move units if it is required.
+		}
+	}
+	LatchRestore<Int> recursiveDepth(m_moveAlliesDepth, m_moveAlliesDepth+1);
+	if (m_moveAlliesDepth > 2) {
+		return false;
 	}
-	LatchRestore<Int> recursiveDepth(m_moveAlliesDepth, m_moveAlliesDepth+1);	
-	if (m_moveAlliesDepth > 2) return false;
 
 	Bool centerInCell;
 	Int radius;
@@ -9531,33 +9586,48 @@ if (g_UT_startTiming) return false;
 		for (i=curCell.x-radius; i<curCell.x+numCellsAbove; i++) {
 			for (j=curCell.y-radius; j<curCell.y+numCellsAbove; j++) {
 				PathfindCell	*cell = getCell(node->getLayer(), i, j);
-				if (cell) {
-					if (cell->getPosUnit()==INVALID_ID) {
+				if (!cell) {
+					continue; // Cell is not on the pathfinding grid
+				}
+
+				ObjectID unitId = cell->getPosUnit();
+				if (unitId==INVALID_ID) {
+					continue;
+				}
+
+				if (unitId==obj->getID()) {
+					continue;	// It's us.
+				}
+
+				if (unitId==ignoreId) {
+					continue;	 // It's the one we are ignoring.
+				}
+
+				Object *otherObj = TheGameLogic->findObjectByID(unitId);
+				if (!otherObj) {
+					continue;
+				}
+
+				if (obj->getRelationship(otherObj)!=ALLIES) {
+					continue;  // Only move allies.
+				}
+
+				if (obj->isKindOf(KINDOF_INFANTRY) && otherObj->isKindOf(KINDOF_INFANTRY)) {
+					continue;  // infantry can walk through other infantry, so just let them.
+				}
+				if (obj->isKindOf(KINDOF_INFANTRY) && !otherObj->isKindOf(KINDOF_INFANTRY)) {
+					// If this is a general clear operation, don't let infantry push vehicles.
+					if (!path->getBlockedByAlly()) {
 						continue;
 					}
-					if (cell->getPosUnit()==obj->getID()) { 
-						continue;	// It's us.
-					}
-					if (cell->getPosUnit()==ignoreId) { 
-						continue;	 // It's the one we are ignoring.
-					}
-					Object *otherObj = TheGameLogic->findObjectByID(cell->getPosUnit());
-					if (obj->getRelationship(otherObj)!=ALLIES) {
-						continue;  // Only move allies.
-					}
-					if (otherObj==NULL) continue;
-					if (obj->isKindOf(KINDOF_INFANTRY) && otherObj->isKindOf(KINDOF_INFANTRY)) {
-						continue;  // infantry can walk through other infantry, so just let them.
-					}
-					if (obj->isKindOf(KINDOF_INFANTRY) && !otherObj->isKindOf(KINDOF_INFANTRY)) {
-						// If this is a general clear operation, don't let infantry push vehicles.
-						if (!path->getBlockedByAlly()) continue;
-					}
-					if (otherObj && otherObj->getAI() && !otherObj->getAI()->isMoving()) {
-						//DEBUG_LOG(("Moving ally\n"));
-						otherObj->getAI()->aiMoveAwayFromUnit(obj, CMD_FROM_AI);
-					}
 				}
+
+				if (!otherObj->getAI() || otherObj->getAI()->isMoving()) {
+					continue;
+				}
+
+				//DEBUG_LOG(("Moving ally"));
+				otherObj->getAI()->aiMoveAwayFromUnit(obj, CMD_FROM_AI);
 			}
 		}
 	}
@@ -9572,7 +9642,9 @@ if (g_UT_startTiming) return false;
 Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 											Path *pathToAvoid, Object *otherObj2, Path *pathToAvoid2)
 {
-	if (m_isMapReady == false) return NULL; // Should always be ok.
+	if (!m_isMapReady)
+		return NULL; // Should always be ok.
+
 #ifdef DEBUG_LOGGING
 	Int startTimeMS = ::GetTickCount();
 #endif
@@ -9602,19 +9674,20 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 		startPos.x += PATHFIND_CELL_SIZE_F*0.5f;
 	}
 	worldToCell(&startPos, &startCellNdx);
-	PathfindCell *parentCell = getClippedCell( obj->getLayer(), obj->getPosition() ); 
-	if (parentCell == NULL)
+	PathfindCell *parentCell = getClippedCell( obj->getLayer(), obj->getPosition() );
+	if (!parentCell)
 		return NULL;
-	if (!obj->getAIUpdateInterface()) {
-		return NULL; // shouldn't happen, but can't move it without an ai.
-	}
+
+	if (!obj->getAIUpdateInterface()) // shouldn't happen, but can't move it without an ai.
+		return NULL; 
+
 	const LocomotorSet& locomotorSet = obj->getAIUpdateInterface()->getLocomotorSet();
 
 	m_isTunneling = false;
 	if (validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), parentCell ) == false) {
 		m_isTunneling = true; // We can't move from our current location.  So relax the constraints.
 	}
-	
+
 	TCheckMovementInfo info;
 	info.cell = startCellNdx;
 	info.layer = obj->getLayer();
@@ -9662,12 +9735,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 		bounds.hi.y = cellCenter.y+boxHalfWidth;
 		PathNode *node;
 		Bool overlap = false;
-		if (obj) {
-			if (bounds.lo.x<obj->getPosition()->x && bounds.hi.x>obj->getPosition()->x &&
-				bounds.lo.y<obj->getPosition()->y && bounds.hi.y>obj->getPosition()->y)	{
-					//overlap = true;
-				}
-		}
+
 		for( node = pathToAvoid->getFirstNode(); node && node->getNextOptimized(); node = node->getNextOptimized() )	{
 			Coord2D start, end;
 			start.x = node->getPosition()->x;
@@ -9679,12 +9747,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 				break;
 			}
 		}
-		if (otherObj) {
-			if (bounds.lo.x<otherObj->getPosition()->x && bounds.hi.x>otherObj->getPosition()->x &&
-				bounds.lo.y<otherObj->getPosition()->y && bounds.hi.y>otherObj->getPosition()->y)	{
-					//overlap = true;
-				}
-		}
+
 		if (!overlap && pathToAvoid2) {
 			for( node = pathToAvoid2->getFirstNode(); node && node->getNextOptimized(); node = node->getNextOptimized() )	{
 				Coord2D start, end;
@@ -9705,7 +9768,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 			}
 		}
 		///@todo - Adjust cost intersecting path - closer to front is more expensive. jba.
-		if (!overlap && checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(), 
+		if (!overlap && checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(),
 				parentCell->getLayer(), radius, centerInCell)) {
 			// success - found a path to the goal
 			if (false && TheGlobalData->m_debugAI)
@@ -9713,10 +9776,19 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 			m_isTunneling = false;
 			// construct and return path
 			Path *newPath = buildActualPath( obj, locomotorSet.getValidSurfaces(), obj->getPosition(), parentCell, centerInCell, false);
-			parentCell->releaseInfo();
-			cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding) {
+				parentCell->releaseInfo();
+				cleanOpenAndClosedLists();
+			}
+			else
+#endif
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
+			}
 			return newPath;
-		}	
+		}
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
 
@@ -9727,27 +9799,34 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 
 	}
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	debugShowSearch(true);
 #endif
 
-	DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-	DEBUG_LOG(("getMoveAwayFromPath pathfind failed  -- "));
-	DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
+	DEBUG_LOG(("%d getMoveAwayFromPath pathfind failed --", TheGameLogic->getFrame()));
+	DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 
 	m_isTunneling = false;
-	cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+	}
 	return NULL;
 }
 
 
-
-/** Patch to the exiting path from the current position, either because we became blocked, 
+/** Patch to the exiting path from the current position, either because we became blocked,
   or because we had to move off the path to avoid other units. */
-Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet, 
+Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet,
 		Path *originalPath, Bool blocked )
 {
-	//CRCDEBUG_LOG(("Pathfinder::patchPath()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::patchPath()"));
 #ifdef DEBUG_LOGGING
 	Int startTimeMS = ::GetTickCount();
 #endif
@@ -9766,7 +9845,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 
 	enum {CELL_LIMIT = 2000}; // max cells to examine.
 	Int cellCount = 0;
-		 
+
 	Coord3D currentPosition = *obj->getPosition();
 
 	// determine start cell
@@ -9778,7 +9857,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 	}
 	worldToCell(&startPos, &startCellNdx);
 	//worldToCell(obj->getPosition(), &startCellNdx);
-	PathfindCell *parentCell = getClippedCell( obj->getLayer(), &currentPosition); 
+	PathfindCell *parentCell = getClippedCell( obj->getLayer(), &currentPosition);
 	if (parentCell == NULL)
 		return NULL;
 	if (!obj->getAIUpdateInterface()) {
@@ -9786,7 +9865,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 	}
 
 	m_isTunneling = false;
-	
+
 	if (!parentCell->allocateInfo(startCellNdx)) {
 		return NULL;
 	}
@@ -9803,9 +9882,9 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 	// until goal is found.
 	//
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
-	if (TheGlobalData->m_debugAI) 
+	if (TheGlobalData->m_debugAI)
 	{
 		RGBColor color;
 		color.setFromInt(0);
@@ -9826,7 +9905,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 		info.radius = radius;
 		info.considerTransient = blocked;
 		info.acceptableSurfaces = locomotorSet.getValidSurfaces();
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 		if (TheGlobalData->m_debugAI) {
 			RGBColor color;
 			color.setFromInt(0);
@@ -9843,16 +9922,24 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 		}
 		if (info.allyFixedCount || info.enemyFixed) {
 			break;	// Don't patch through cells that are occupied.
-		}	
+		}
 		Real curSqr = sqr(startNode->getPosition()->x-currentPosition.x) + sqr(startNode->getPosition()->y - currentPosition.y);
 		if (curSqr < goalDeltaSqr) {
 			goalPos = *startNode->getPosition();
 			goalDeltaSqr = curSqr;
 		}
 
-	}	
+	}
 	if (startNode == originalPath->getLastNode()) {
-		cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (!s_useFixedPathfinding) {
+			cleanOpenAndClosedLists();
+		}
+		else
+#endif
+		{
+			parentCell->releaseInfo();
+		}
 		return NULL; // no open nodes.
 	}
 	PathfindCell *candidateGoal;
@@ -9860,6 +9947,12 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 	ICoord2D goalCellNdx;
 	worldToCell(&goalPos, &goalCellNdx);
 	if (!candidateGoal->allocateInfo(goalCellNdx)) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (s_useFixedPathfinding)
+#endif
+		{
+			parentCell->releaseInfo();
+		}
 		return NULL;
 	}
 
@@ -9887,86 +9980,74 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 			// construct and return path
 			Path *path = newInstance(Path);
 			PathNode *node;
-			for( node = originalPath->getLastNode(); node != matchNode; node = node->getPrevious() )	{	
+			for( node = originalPath->getLastNode(); node != matchNode; node = node->getPrevious() )	{
 				path->prependNode(node->getPosition(), node->getLayer());
 			}
 			prependCells(path, obj->getPosition(), parentCell, centerInCell);
 
 			// cleanup the path by checking line of sight
 			path->optimize(obj, locomotorSet.getValidSurfaces(), blocked);
-			parentCell->releaseInfo();
-			cleanOpenAndClosedLists();
-			candidateGoal->releaseInfo();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding) {
+				parentCell->releaseInfo();
+				cleanOpenAndClosedLists();
+				candidateGoal->releaseInfo();
+			}
+			else
+#endif
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
+				candidateGoal->releaseInfo();
+			}
 
 			return path;
-		}	
+		}
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
 
 		if (cellCount < CELL_LIMIT) {
 			// Check to see if we can change layers in this cell.
-			checkChangeLayers(parentCell); 
+			checkChangeLayers(parentCell);
 			cellCount += examineNeighboringCells(parentCell, NULL, locomotorSet, isHuman, centerInCell, radius, startCellNdx, obj, NO_ATTACK);
 		}
 	}
 
-	DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-	DEBUG_LOG(("patchPath Pathfind failed  -- "));
-	DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
+	DEBUG_LOG(("%d patchPath Pathfind failed --", TheGameLogic->getFrame()));
+	DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI) {
 		debugShowSearch(true);
 	}
 #endif
 	m_isTunneling = false;
-	if (!candidateGoal->getOpen() && !candidateGoal->getClosed())
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		if (!candidateGoal->getOpen() && !candidateGoal->getClosed())
+		{
+			// Not on one of the lists 
+			candidateGoal->releaseInfo();
+		}
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
 	{
-		// Not on one of the lists 
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
 		candidateGoal->releaseInfo();
 	}
-	cleanOpenAndClosedLists();
 	return NULL;
 }
 
 
 /** Find a short, valid path to a location that obj can attack victim from.  */
 Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
-		const Object *victim, const Coord3D* victimPos, const Weapon *weapon ) 
-{
-	/*
-	CRCDEBUG_LOG(("Pathfinder::findAttackPath() for object %d (%s)\n", obj->getID(), obj->getTemplate()->getName().str()));
-	XferCRC xferCRC;
-	xferCRC.open("lightCRC");
-	xferCRC.xferSnapshot((Object *)obj);
-	xferCRC.close();
-	CRCDEBUG_LOG(("obj CRC is %X\n", xferCRC.getCRC()));
-	if (from)
-	{
-		CRCDEBUG_LOG(("from: (%g,%g,%g) (%X,%X,%X)\n",
-			from->x, from->y, from->z,
-			AS_INT(from->x), AS_INT(from->y), AS_INT(from->z)));
-	}
-	if (victim)
-	{
-		CRCDEBUG_LOG(("victim is %d (%s)\n", victim->getID(), victim->getTemplate()->getName().str()));
-		XferCRC xferCRC;
-		xferCRC.open("lightCRC");
-		xferCRC.xferSnapshot((Object *)victim);
-		xferCRC.close();
-		CRCDEBUG_LOG(("victim CRC is %X\n", xferCRC.getCRC()));
-	}
-	if (victimPos)
-	{
-		CRCDEBUG_LOG(("from: (%g,%g,%g) (%X,%X,%X)\n",
-			victimPos->x, victimPos->y, victimPos->z,
-			AS_INT(victimPos->x), AS_INT(victimPos->y), AS_INT(victimPos->z)));
-	}
-	*/
-	if (m_isMapReady == false) return NULL; // Should always be ok.
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-//	Int startTimeMS = ::GetTickCount();
-#endif
+		const Object *victim, const Coord3D* victimPos, const Weapon *weapon )
+{
+	if (!m_isMapReady)
+		return NULL; // Should always be ok.
 
 	Bool isCrusher = obj ? obj->getCrusherLevel() > 0 : false;
 	Int radius;
@@ -9991,31 +10072,33 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 			ICoord2D cellNdx;
 			worldToCell(&testPos, &cellNdx);
 			PathfindCell *aCell = getCell(obj->getLayer(), cellNdx.x, cellNdx.y);
-			if (aCell==NULL) break;
-			if (!validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), aCell )) {
+			if (!aCell)
 				break;
-			}
-			if (!checkDestination(obj, cellNdx.x, cellNdx.y, obj->getLayer(), radius, centerInCell)) {
+
+			if (!validMovementPosition(isCrusher, locomotorSet.getValidSurfaces(), aCell))
 				break;
+
+			if (!checkDestination(obj, cellNdx.x, cellNdx.y, obj->getLayer(), radius, centerInCell))
+				break;
+
+			if (!weapon->isGoalPosWithinAttackRange(obj, &testPos, victim, victimPos))
+				continue;
+
+			if (isAttackViewBlockedByObstacle(obj, testPos, victim, *victimPos))
+				continue;
+
+			// return path.
+			Path *path = newInstance(Path);
+			path->prependNode( &testPos, obj->getLayer() );
+			path->prependNode( &curPos, obj->getLayer() );
+			path->getFirstNode()->setNextOptimized(path->getFirstNode()->getNext());
+			if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) {
+				setDebugPath(path);
 			}
-			if (weapon->isGoalPosWithinAttackRange(obj, &testPos, victim, victimPos)) {
-				if (!isAttackViewBlockedByObstacle(obj, testPos, victim, *victimPos)) {
-					// return path.
-					Path *path = newInstance(Path);
-					path->prependNode( &testPos, obj->getLayer() );
-					path->prependNode( &curPos, obj->getLayer() );
-					path->getFirstNode()->setNextOptimized(path->getFirstNode()->getNext());
-					if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) {
-						setDebugPath(path);
-					}
-					return path;
-				}
-			}
+			return path;
 		}
 	}
 
-
-
 	const Int ATTACK_CELL_LIMIT = 2500; // this is a rather expensive operation, so limit the search.
 
 	Bool isHuman = true;
@@ -10044,19 +10127,20 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 	if (centerInCell) {
 		objPos.x += PATHFIND_CELL_SIZE_F/2.0f;
 		objPos.y += PATHFIND_CELL_SIZE_F/2.0f;
-	}	
+	}
+
+	if (!obj->getAIUpdateInterface()) // shouldn't happen, but can't move without an ai.
+		return NULL;
+
 	worldToCell(&objPos, &startCellNdx);
-	PathfindCell *parentCell = getClippedCell( obj->getLayer(), &objPos ); 
-	if (parentCell == NULL)
+	PathfindCell *parentCell = getClippedCell( obj->getLayer(), &objPos );
+	if (!parentCell)
 		return NULL;
-	if (!obj->getAIUpdateInterface()) {
-		return NULL; // shouldn't happen, but can't move it without an ai.
-	}
-	const PathfindCell *startCell = parentCell;
 
-	if (!parentCell->allocateInfo(startCellNdx)) {
+	if (!parentCell->allocateInfo(startCellNdx))
 		return NULL;
-	}
+
+	const PathfindCell *startCell = parentCell;
 	parentCell->startPathfind(NULL);
 
 	// determine start cell
@@ -10065,7 +10149,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 
 	// determine goal cell
 	PathfindCell *goalCell = getCell( LAYER_GROUND, victimCellNdx.x, victimCellNdx.y );
-	if (goalCell == NULL)
+	if (!goalCell)
 		return NULL;
 
  	if (!goalCell->allocateInfo(victimCellNdx)) {
@@ -10092,7 +10176,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 	if (victim && !victim->isSignificantlyAboveTerrain()) {
 		checkLOS = true;
 	}
-	
+
 	while( m_openList != NULL )
 	{
 		// take head cell off of open list - it has lowest estimated total path cost
@@ -10103,12 +10187,12 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 		adjustCoordToCell(parentCell->getXIndex(), parentCell->getYIndex(), centerInCell, cellCenter, parentCell->getLayer());
 
 		///@todo - Adjust cost intersecting path - closer to front is more expensive. jba.
-		if (weapon->isGoalPosWithinAttackRange(obj, &cellCenter, victim, victimPos) && 
-			checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(), 
+		if (weapon->isGoalPosWithinAttackRange(obj, &cellCenter, victim, victimPos) &&
+			checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(),
 				parentCell->getLayer(), radius, centerInCell)) {
 			// check line of sight.
 			Bool viewBlocked = false;
-			if (checkLOS) 
+			if (checkLOS)
 			{
 				viewBlocked = isAttackViewBlockedByObstacle(obj, cellCenter, victim, *victimPos);
 			}
@@ -10116,11 +10200,11 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 				// We never want to accept our starting cell.
 				// If we could attack from there, we wouldn't be calling
 				// FindAttackPath.  Usually happens cause the cell is valid for attack, but
-				// a point near the cell center isn't, and that happens to be where the 
+				// a point near the cell center isn't, and that happens to be where the
 				// attacker is standing, and it's too close to move to.
 				viewBlocked = true;
 			} else {
-				// If through some unfortunate rounding, we end up moving near ourselves, 
+				// If through some unfortunate rounding, we end up moving near ourselves,
 				// don't want it.
 				Coord3D cellPos;
 				adjustCoordToCell(parentCell->getXIndex(), parentCell->getYIndex(), centerInCell, cellPos, parentCell->getLayer());
@@ -10130,8 +10214,8 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 					viewBlocked = true;
 				}
 			}
-			if (!viewBlocked) 
-			{ 
+			if (!viewBlocked)
+			{
 				// success - found a path to the goal
 				Bool show = TheGlobalData->m_debugAI;
 	#ifdef INTENSE_DEBUG
@@ -10142,11 +10226,11 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 				}
 				if (count>1000) {
 					show = true;
-					DEBUG_LOG(("FAP cells %d obj %s %x\n", count, obj->getTemplate()->getName().str(), obj));
+					DEBUG_LOG(("FAP cells %d obj %s %x", count, obj->getTemplate()->getName().str(), obj));
 	#ifdef STATE_MACHINE_DEBUG
 					if( obj->getAIUpdateInterface() )
 					{
-						DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+						DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 					}
 	#endif
 					TheScriptEngine->AppendDebugMessage("Big Attack path", false);
@@ -10154,21 +10238,29 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 	#endif
 				if (show)
 					debugShowSearch(true);
-	#if defined RTS_DEBUG || defined RTS_INTERNAL
-				//DEBUG_LOG(("Attack path took %d cells, %f sec\n", cellCount, (::GetTickCount()-startTimeMS)/1000.0f));
+	#if defined(RTS_DEBUG)
+				//DEBUG_LOG(("Attack path took %d cells, %f sec", cellCount, (::GetTickCount()-startTimeMS)/1000.0f));
 	#endif
 				// construct and return path
 				Path *path = buildActualPath( obj, locomotorSet.getValidSurfaces(), obj->getPosition(), parentCell, centerInCell, false);
-				parentCell->releaseInfo();
-				if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+				if (!s_useFixedPathfinding) {
+					if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+						goalCell->releaseInfo();
+					}
+					cleanOpenAndClosedLists();
+				}
+				else
+#endif
+				{
+					cleanOpenAndClosedLists();
+					parentCell->releaseInfo();
 					goalCell->releaseInfo();
 				}
-				cleanOpenAndClosedLists();
 				return path;
 			}
-		}	
-		if (checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(), 
-																parentCell->getLayer(), radius, centerInCell)) {
+		}
+		if (checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(), parentCell->getLayer(), radius, centerInCell)) {
 			if (validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), parentCell )) {
 				Real dx = IABS(victimCellNdx.x-parentCell->getXIndex());
 				Real dy = IABS(victimCellNdx.y-parentCell->getYIndex());
@@ -10186,18 +10278,18 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 		if (cellCount < ATTACK_CELL_LIMIT) {
 				// Check to see if we can change layers in this cell.
 			checkChangeLayers(parentCell);
-			cellCount += examineNeighboringCells(parentCell, goalCell, locomotorSet, isHuman, centerInCell, 
+			cellCount += examineNeighboringCells(parentCell, goalCell, locomotorSet, isHuman, centerInCell,
 				radius, startCellNdx, obj, attackDistance);
 		}
 
 	}
 
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG(("obj %s %x\n", obj->getTemplate()->getName().str(), obj));
+	DEBUG_LOG(("obj %s %x", obj->getTemplate()->getName().str(), obj));
 #ifdef STATE_MACHINE_DEBUG
 	if( obj->getAIUpdateInterface() )
 	{
-		DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+		DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 	}
 #endif
 	debugShowSearch(true);
@@ -10210,34 +10302,43 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 		cleanOpenAndClosedLists();
 		return path;
 	}
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount));
-	DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- \n", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
-	DEBUG_LOG(("Unit '%s', attacking '%s' time %f\n", obj->getTemplate()->getName().str(),  victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
+#if defined(RTS_DEBUG)
+	DEBUG_LOG(("%d (%d cells) Attack Pathfind failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), cellCount, from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
+	DEBUG_LOG(("Unit '%s', attacking '%s' time %f", obj->getTemplate()->getName().str(),  victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 #endif
 #endif
 #ifdef DUMP_PERF_STATS
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+			goalCell->releaseInfo();
+		}
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
 		goalCell->releaseInfo();
 	}
-	cleanOpenAndClosedLists();
 	return NULL;
 }
 
 /** Find a short, valid path to a location that is safe from the repulsors.  */
-Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotorSet, 
-		const Coord3D *from, const Coord3D* repulsorPos1, const Coord3D* repulsorPos2, Real repulsorRadius) 
+Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotorSet,
+		const Coord3D *from, const Coord3D* repulsorPos1, const Coord3D* repulsorPos2, Real repulsorRadius)
 {
-	//CRCDEBUG_LOG(("Pathfinder::findSafePath()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::findSafePath()"));
 	if (m_isMapReady == false) return NULL; // Should always be ok.
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 //	Int startTimeMS = ::GetTickCount();
 #endif
 
-	const Int MAX_CELLS = 2000; // this is a rather expensive operation, so limit the search.
+	const Int MAX_CELLS = MAX_SAFE_PATH_CELL_COUNT; // this is a rather expensive operation, so limit the search.
 
 	Bool centerInCell;
 	Int radius;
@@ -10256,7 +10357,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
 	// determine start cell
 	ICoord2D startCellNdx;
 	worldToCell(obj->getPosition(), &startCellNdx);
-	PathfindCell *parentCell = getClippedCell( obj->getLayer(), obj->getPosition() ); 
+	PathfindCell *parentCell = getClippedCell( obj->getLayer(), obj->getPosition() );
 	if (parentCell == NULL)
 		return NULL;
 	if (!obj->getAIUpdateInterface()) {
@@ -10310,13 +10411,13 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
 			farthestDistanceSqr = distSqr;
 			if (cellCount > MAX_CELLS) {
 #ifdef INTENSE_DEBUG
-				DEBUG_LOG(("Took intermediate path, dist %f, goal dist %f\n", sqrt(farthestDistanceSqr), repulsorRadius));
+				DEBUG_LOG(("Took intermediate path, dist %f, goal dist %f", sqrt(farthestDistanceSqr), repulsorRadius));
 #endif
 				ok = true; // Already a big search, just take this one.
 			}
 		}
-		if ( ok && 
-			checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(), 
+		if ( ok &&
+			checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(),
 				parentCell->getLayer(), radius, centerInCell)) {
 			// success - found a path to the goal
 			Bool show = TheGlobalData->m_debugAI;
@@ -10328,11 +10429,11 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
 			}
 			if (count>2000) {
 				show = true;
-				DEBUG_LOG(("cells %d obj %s %x\n", count, obj->getTemplate()->getName().str(), obj));
+				DEBUG_LOG(("cells %d obj %s %x", count, obj->getTemplate()->getName().str(), obj));
 #ifdef STATE_MACHINE_DEBUG
 				if( obj->getAIUpdateInterface() )
 				{
-					DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+					DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 				}
 #endif
 				TheScriptEngine->AppendDebugMessage("Big Safe path", false);
@@ -10340,15 +10441,24 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
 #endif
 			if (show)
 				debugShowSearch(true);
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-			//DEBUG_LOG(("Attack path took %d cells, %f sec\n", cellCount, (::GetTickCount()-startTimeMS)/1000.0f));
+#if defined(RTS_DEBUG)
+			//DEBUG_LOG(("Attack path took %d cells, %f sec", cellCount, (::GetTickCount()-startTimeMS)/1000.0f));
 #endif
 			// construct and return path
 			Path *path = buildActualPath( obj, locomotorSet.getValidSurfaces(), obj->getPosition(), parentCell, centerInCell, false);
-			parentCell->releaseInfo();
-			cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding) {
+				parentCell->releaseInfo();
+				cleanOpenAndClosedLists();
+			}
+			else
+#endif
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
+			}
 			return path;
-		}	
+		}
 
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
@@ -10361,71 +10471,79 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
 	}
 
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG(("obj %s %x count %d\n", obj->getTemplate()->getName().str(), obj, cellCount));
+	DEBUG_LOG(("obj %s %x count %d", obj->getTemplate()->getName().str(), obj, cellCount));
 #ifdef STATE_MACHINE_DEBUG
 	if( obj->getAIUpdateInterface() )
 	{
-		DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+		DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 	}
 #endif
 	TheScriptEngine->AppendDebugMessage("Overflowed Safe path", false);
 #endif
 #if 0
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount));
-	DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- \n", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
-	DEBUG_LOG(("Unit '%s', attacking '%s' time %f\n", obj->getTemplate()->getName().str(),  victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
+#if defined(RTS_DEBUG)
+	DEBUG_LOG(("%d (%d cells) Attack Pathfind failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), cellCount, from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
+	DEBUG_LOG(("Unit '%s', attacking '%s' time %f", obj->getTemplate()->getName().str(),  victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 #endif
 #endif
 #ifdef DUMP_PERF_STATS
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+	}
 	return NULL;
 }
 
 //-----------------------------------------------------------------------------
 void Pathfinder::crc( Xfer *xfer )
 {
-	CRCDEBUG_LOG(("Pathfinder::crc() on frame %d\n", TheGameLogic->getFrame()));
-	CRCDEBUG_LOG(("beginning CRC: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("Pathfinder::crc() on frame %d", TheGameLogic->getFrame()));
+	CRCDEBUG_LOG(("beginning CRC: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
 	xfer->xferUser( &m_extent, sizeof(IRegion2D) );
-	CRCDEBUG_LOG(("m_extent: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_extent: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
 	xfer->xferBool( &m_isMapReady );
-	CRCDEBUG_LOG(("m_isMapReady: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_isMapReady: %8.8X", ((XferCRC *)xfer)->getCRC()));
 	xfer->xferBool( &m_isTunneling );
-	CRCDEBUG_LOG(("m_isTunneling: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_isTunneling: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
 	Int obsolete1 = 0;
 	xfer->xferInt( &obsolete1 );
 
 	xfer->xferUser(&m_ignoreObstacleID, sizeof(ObjectID));
-	CRCDEBUG_LOG(("m_ignoreObstacleID: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_ignoreObstacleID: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
 	xfer->xferUser(m_queuedPathfindRequests, sizeof(ObjectID)*PATHFIND_QUEUE_LEN);
-	CRCDEBUG_LOG(("m_queuedPathfindRequests: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_queuedPathfindRequests: %8.8X", ((XferCRC *)xfer)->getCRC()));
 	xfer->xferInt(&m_queuePRHead);
-	CRCDEBUG_LOG(("m_queuePRHead: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_queuePRHead: %8.8X", ((XferCRC *)xfer)->getCRC()));
 	xfer->xferInt(&m_queuePRTail);
-	CRCDEBUG_LOG(("m_queuePRTail: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_queuePRTail: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
 	xfer->xferInt(&m_numWallPieces);
-	CRCDEBUG_LOG(("m_numWallPieces: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_numWallPieces: %8.8X", ((XferCRC *)xfer)->getCRC()));
 	for (Int i=0; i<MAX_WALL_PIECES; ++i)
 	{
 		xfer->xferObjectID(&m_wallPieces[MAX_WALL_PIECES]);
 	}
-	CRCDEBUG_LOG(("m_wallPieces: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_wallPieces: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
 	xfer->xferReal(&m_wallHeight);
-	CRCDEBUG_LOG(("m_wallHeight: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_wallHeight: %8.8X", ((XferCRC *)xfer)->getCRC()));
 	xfer->xferInt(&m_cumulativeCellsAllocated);
-	CRCDEBUG_LOG(("m_cumulativeCellsAllocated: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_cumulativeCellsAllocated: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
-}  // end crc
+}
 
 //-----------------------------------------------------------------------------
 void Pathfinder::xfer( Xfer *xfer )
@@ -10436,10 +10554,10 @@ void Pathfinder::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 //-----------------------------------------------------------------------------
 void Pathfinder::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
index 49f84b2cce5..9bd88bcb319 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
@@ -28,13 +28,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameMemory.h"
 #include "Common/GameState.h"
 #include "Common/GlobalData.h"
 #include "Common/PerfTimer.h"
 #include "Common/Player.h"
-#include "Common/Team.h" 
+#include "Common/Team.h"
 #include "Common/ThingFactory.h"
 #include "Common/PlayerList.h"
 #include "Common/BuildAssistant.h"
@@ -43,7 +43,7 @@
 #include "Common/WellKnownKeys.h"
 #include "Common/Xfer.h"
 #include "GameClient/ControlBar.h"
-#include "GameClient/TerrainVisual.h"	
+#include "GameClient/TerrainVisual.h"
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/AIPlayer.h"
@@ -61,11 +61,6 @@
 #include "GameLogic/Module/SupplyWarehouseDockUpdate.h"
 #include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define SUPPLY_CENTER_CLOSE_DIST (20*PATHFIND_CELL_SIZE_F)
 
@@ -75,8 +70,8 @@
 // ------------------------------------------------------------------------------------------------
 AIPlayer::AIPlayer( Player *p ) :
 m_player(p),
-m_buildDelay(0), 
-m_teamDelay(0),	
+m_buildDelay(0),
+m_teamDelay(0),
 m_teamTimer(2),	// Important - don't start building teams until frame 1.
 m_structureTimer(2), // Important - don't start building structures until frame 1.
 m_readyToBuildTeam(false),
@@ -100,7 +95,7 @@ m_curWarehouseID(INVALID_ID)
 	m_repairDozerOrigin.zero();
 	m_baseCenter.zero();
 	m_baseCenterSet = false;
-	m_difficulty = TheScriptEngine->getGlobalDifficulty(); 
+	m_difficulty = TheScriptEngine->getGlobalDifficulty();
 	m_teamSeconds = TheAI->getAiData()->m_teamSeconds;
 }
 
@@ -117,7 +112,7 @@ AIPlayer::~AIPlayer()
 void AIPlayer::onStructureProduced( Object *factory, Object *bldg )
 {
 	m_teamDelay = 0; // Cause the update queues & selection to happen immediately.
-	m_buildDelay = 0; // Cause 
+	m_buildDelay = 0; // Cause
 	/* Find the info building this. */
 	BuildListInfo *info;
 	for( info = m_player->getBuildList(); info; info = info->getNext() )
@@ -128,7 +123,7 @@ void AIPlayer::onStructureProduced( Object *factory, Object *bldg )
 		d.setAsciiString(TheKey_objectScriptAttachment, info->getScript());
 		d.setInt(TheKey_objectInitialHealth, info->getHealth());
 		d.setBool(TheKey_objectUnsellable, info->getUnsellable());
-		
+
 		info->setUnderConstruction(false);
 		bldg->updateObjValuesFromMapProperties(&d);
 		// clear the under construction status
@@ -149,9 +144,9 @@ void AIPlayer::onStructureProduced( Object *factory, Object *bldg )
 	for( info = m_player->getBuildList(); info; info = info->getNext() )
 	{
 		const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( info->getTemplateName() );
-		if (!bldgPlan) {																											 
+		if (!bldgPlan) {
 			continue;
-		}		
+		}
 		if (!bldgPlan->isEquivalentTo(bldg->getTemplate())) {
 			continue; // not the same kind of building we're looking for.
 		}
@@ -165,18 +160,18 @@ void AIPlayer::onStructureProduced( Object *factory, Object *bldg )
 					if( rhbi ) {
 						ObjectID spawnedID = rhbi->getReconstructedBuildingID();
 						if (bldg->getID() == spawnedID) {
-							DEBUG_LOG(("AI got rebuilt %s\n", bldgPlan->getName().str()));
+							DEBUG_LOG(("AI got rebuilt %s", bldgPlan->getName().str()));
 							info->setObjectID(bldg->getID());
 							return;
 						}
 					}
 				}
-			} 
+			}
 		}
 	}
 
 	if (TheGameLogic->getFrame()>0) {
-		DEBUG_LOG(("***AI PLAYER-Structure not found in production queue.\n"));
+		DEBUG_LOG(("***AI PLAYER-Structure not found in production queue."));
 	}
 }
 
@@ -204,7 +199,7 @@ void AIPlayer::checkForSupplyCenter( BuildListInfo *info, Object *bldg )
 					desiredGatherers = resInfo->m_normal;
 				}
 				if (difficulty == DIFFICULTY_HARD) {
-					desiredGatherers = resInfo->m_hard;	 
+					desiredGatherers = resInfo->m_hard;
 				}
 			}
 			resInfo = resInfo->m_next;
@@ -219,7 +214,7 @@ void AIPlayer::checkForSupplyCenter( BuildListInfo *info, Object *bldg )
 /** Queue up a supply truck to be built. */
 // ------------------------------------------------------------------------------------------------
 void AIPlayer::queueSupplyTruck( void )
-{			
+{
 	Bool truckInQueue = false;
 	for ( DLINK_ITERATOR<TeamInQueue> iter = iterate_TeamBuildQueue(); !iter.done(); iter.advance())
 	{
@@ -232,8 +227,8 @@ void AIPlayer::queueSupplyTruck( void )
 				truckInQueue = true;
 			}
 		}
-	}	
-	
+	}
+
 	if (truckInQueue) {
 		return; // already building a supply truck.
 	}
@@ -247,7 +242,7 @@ void AIPlayer::queueSupplyTruck( void )
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
-			}			
+			}
 			for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 				Object *obj = objIter.cur();
 				if (!obj)  continue;
@@ -294,7 +289,7 @@ void AIPlayer::queueSupplyTruck( void )
 				}
 				static const NameKeyType key_warehouseUpdate = NAMEKEY("SupplyWarehouseDockUpdate");
 				SupplyWarehouseDockUpdate *warehouseModule = (SupplyWarehouseDockUpdate*)supplySource->findUpdateModule( key_warehouseUpdate );
-				if( warehouseModule )	{	 
+				if( warehouseModule )	{
 					Int availableCash = warehouseModule->getBoxesStored()*TheGlobalData->m_baseValuePerSupplyBox;
 					if (availableCash<=0) continue;
 					if( m_player->getRelationship(supplySource->getTeam()) == ENEMIES ) {
@@ -312,7 +307,7 @@ void AIPlayer::queueSupplyTruck( void )
 						Team *team = iter.cur();
 						if (!team) {
 							continue;
-						}			
+						}
 						for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 							Object *obj = objIter.cur();
 							if (!obj)  continue;
@@ -336,7 +331,7 @@ void AIPlayer::queueSupplyTruck( void )
 						}
 					}
 				}
-				//DEBUG_LOG(("Expected %d harvesters, found %d, need %d\n", info->getDesiredGatherers(), 
+				//DEBUG_LOG(("Expected %d harvesters, found %d, need %d", info->getDesiredGatherers(),
 				//	curGatherers, info->getDesiredGatherers()-curGatherers) );
 				info->setCurrentGatherers(curGatherers);
 			}
@@ -357,7 +352,7 @@ void AIPlayer::queueSupplyTruck( void )
 						if( supplyTruckAI )	{
 							ObjectID dock = supplyTruckAI->getPreferredDockID();
 							if (TheGameLogic->findObjectByID(dock)!=NULL) continue;
-							if (supplyTruckAI->isCurrentlyFerryingSupplies() || supplyTruckAI->isForcedIntoWantingState()) 
+							if (supplyTruckAI->isCurrentlyFerryingSupplies() || supplyTruckAI->isForcedIntoWantingState())
 							{
 								// This thinks he is a gatherer, but doesn't have a preferred dock id.
 								Object *center = TheGameLogic->findObjectByID(info->getObjectID());
@@ -368,7 +363,7 @@ void AIPlayer::queueSupplyTruck( void )
 									// The supply truck ai issues dock commands, and they become confused.
 									// Thus, player.  jba.  ;(
 									obj->getAI()->aiDock(center, CMD_FROM_PLAYER);
-									DEBUG_LOG(("Re-attaching supply truck to supply center.\n"));
+									DEBUG_LOG(("Re-attaching supply truck to supply center."));
 									return;
 								}
 							}
@@ -383,8 +378,8 @@ void AIPlayer::queueSupplyTruck( void )
 			// If we need a supply truck thingy, turn on unit building for a moment.
 			m_player->setCanBuildUnits(true);
 			const ThingTemplate *tTemplate = TheThingFactory->firstTemplate();
-			while (tTemplate) {	 
-				Bool isSupplyTruck = tTemplate->isKindOf(KINDOF_HARVESTER);;
+			while (tTemplate) {
+				Bool isSupplyTruck = tTemplate->isKindOf(KINDOF_HARVESTER);
 				if (isSupplyTruck) {
 					Object *factory = findFactory(tTemplate, false);
 					if (factory) {
@@ -404,7 +399,7 @@ void AIPlayer::queueSupplyTruck( void )
 						team->m_workOrders = order;
 						team->m_frameStarted = TheGameLogic->getFrame();
 						// Stick it on the default team
-						team->m_team = m_player->getDefaultTeam(); 
+						team->m_team = m_player->getDefaultTeam();
 						AsciiString teamName = "Supply truck - building one at the ";
 						teamName.concat(factory->getTemplate()->getName());
 						TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -451,13 +446,13 @@ Object *AIPlayer::buildStructureNow(const ThingTemplate *bldgPlan, BuildListInfo
 {
 
 	// inst-construct the building
-	Object *bldg = TheBuildAssistant->buildObjectNow( NULL, 
+	Object *bldg = TheBuildAssistant->buildObjectNow( NULL,
 																						bldgPlan,
 																						info->getLocation(),
 																						info->getAngle(),
 																						m_player );
 
-	// store the object with the build order  
+	// store the object with the build order
 	if (bldg)
 	{
 		Dict d;
@@ -465,7 +460,7 @@ Object *AIPlayer::buildStructureNow(const ThingTemplate *bldgPlan, BuildListInfo
 		d.setAsciiString(TheKey_objectScriptAttachment, info->getScript());
 		d.setInt(TheKey_objectInitialHealth, info->getHealth());
 		d.setBool(TheKey_objectUnsellable, info->getUnsellable());
-		
+
 		bldg->updateObjValuesFromMapProperties(&d);
 
 		info->setObjectID( bldg->getID() );
@@ -499,7 +494,7 @@ Object *AIPlayer::buildStructureNow(const ThingTemplate *bldgPlan, BuildListInfo
 				exitInterface->setRallyPoint(&rallyPoint);
 			}
 		}
-	} // bldg built
+	}
 	return bldg;
 }
 
@@ -539,7 +534,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 																								 BuildAssistant::TERRAIN_RESTRICTIONS |
 																								 BuildAssistant::NO_OBJECT_OVERLAP,
 																								 dozer, m_player ) != LBC_OK ) {
-			// Warn. 
+			// Warn.
 			AsciiString bldgName = bldgPlan->getName();
 			bldgName.concat(" - Dozer unable to place.  Attempting to adjust position.");
 			TheScriptEngine->AppendDebugMessage(bldgName, false);
@@ -550,7 +545,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 			Real limit = 10*PATHFIND_CELL_SIZE_F;
 			if (isSkirmishAI()) {
 				limit = 120*PATHFIND_CELL_SIZE_F;
-			}	
+			}
 			Coord3D newPos = pos;
 			for (posOffset = 0; posOffset<limit; posOffset += 2*PATHFIND_CELL_SIZE_F) {
 				if (isSkirmishAI()) {
@@ -618,7 +613,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 		dozer->setPosition(&pos);
 	}
 
-	Object *bldg = TheBuildAssistant->buildObjectNow( dozer, 
+	Object *bldg = TheBuildAssistant->buildObjectNow( dozer,
 																						bldgPlan,
 																						&pos,
 																						angle,
@@ -626,7 +621,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 
 
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI == AI_DEBUG_PATHS)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -640,7 +635,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 		addIcon(&myPos, 2*PATHFIND_CELL_SIZE_F, 120, color);
 		myPos = pos;
 		myPos.z = TheTerrainLogic->getGroundHeight( myPos.x, myPos.y ) + 0.5f;
-		addIcon(&myPos, 2*PATHFIND_CELL_SIZE_F, 120, color);	
+		addIcon(&myPos, 2*PATHFIND_CELL_SIZE_F, 120, color);
 		Real dx, dy;
 		dx = dozer->getPosition()->x - pos.x;
 		dy = dozer->getPosition()->y - pos.y;
@@ -656,10 +651,10 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 			addIcon(&myPos, PATHFIND_CELL_SIZE_F/2, 120, color);
 
 		}
-	}	
+	}
 #endif
 
-	// store the object with the build order  
+	// store the object with the build order
 	if (bldg)
 	{
 		ExitInterface *exitInterface = bldg->getObjectExitInterface();
@@ -688,7 +683,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 			bldgName.concat(" - Building started.");
 			TheScriptEngine->AppendDebugMessage(bldgName, false);
 		}
-	} // bldg built
+	}
 	TheTerrainVisual->removeAllBibs();	// isLocationLegalToBuild adds bib feedback, turn it off.  jba.
 	return bldg;
 }
@@ -710,8 +705,8 @@ void AIPlayer::processBaseBuilding( void )
 			AsciiString name = info->getTemplateName();
 			if (name.isEmpty()) continue;
 			const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( name );
-			if (!bldgPlan) {																											 
-				DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.\n", name.str()));
+			if (!bldgPlan) {
+				DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.", name.str()));
 				continue;
 			}
 			// check for hole.
@@ -726,13 +721,13 @@ void AIPlayer::processBaseBuilding( void )
 					info->setObjectTimestamp(TheGameLogic->getFrame()+1);
 					// Scan for a GLA hole.	KINDOF_REBUILD_HOLE
 					Object *obj;
-					for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() ) { 
+					for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() ) {
 						if (!obj->isKindOf(KINDOF_REBUILD_HOLE)) continue;
 						RebuildHoleBehaviorInterface *rhbi = RebuildHoleBehavior::getRebuildHoleBehaviorInterfaceFromObject( obj );
 						if( rhbi ) {
 							ObjectID spawnerID = rhbi->getSpawnerID();
 							if (priorID == spawnerID) {
-								DEBUG_LOG(("AI Found hole to rebuild %s\n", bldgPlan->getName().str()));
+								DEBUG_LOG(("AI Found hole to rebuild %s", bldgPlan->getName().str()));
 								info->setObjectID(obj->getID());
 							}
 						}
@@ -740,13 +735,13 @@ void AIPlayer::processBaseBuilding( void )
 				}	else {
 					if (bldg->getControllingPlayer() == m_player) {
 						// Check for built or dozer missing.
-						if( bldg->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) ) 
+						if( bldg->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 						{
 							// make sure dozer is working on him.
 							ObjectID builder = bldg->getBuilderID();
 							Object* myDozer = TheGameLogic->findObjectByID(builder);
 							if (myDozer==NULL) {
-								DEBUG_LOG(("AI's Dozer got killed.  Find another dozer.\n"));
+								DEBUG_LOG(("AI's Dozer got killed.  Find another dozer."));
  								myDozer = findDozer(bldg->getPosition());
 								if (myDozer==NULL || myDozer->getAI()==NULL) {
 									continue;
@@ -761,7 +756,7 @@ void AIPlayer::processBaseBuilding( void )
 						// oops, got captured.
 						info->setObjectID(INVALID_ID);
 						info->setObjectTimestamp(TheGameLogic->getFrame()+1);
-					}	
+					}
 				}
 			}
 			if (info->getObjectID()==INVALID_ID && info->getObjectTimestamp()>0) {
@@ -770,7 +765,7 @@ void AIPlayer::processBaseBuilding( void )
 				if (info->getObjectTimestamp()+TheAI->getAiData()->m_rebuildDelaySeconds*LOGICFRAMES_PER_SECOND > TheGameLogic->getFrame()) {
 					continue;
 				}	else {
-					DEBUG_LOG(("Enabling rebuild for %s\n", info->getTemplateName().str()));
+					DEBUG_LOG(("Enabling rebuild for %s", info->getTemplateName().str()));
 					info->setObjectTimestamp(0); // ready to build.
 				}
 			}
@@ -802,13 +797,14 @@ void AIPlayer::processBaseBuilding( void )
 						m_frameLastBuildingBuilt = TheGameLogic->getFrame();
 						// only build one building per delay loop
 						break;
-					} // bldg built
+					}
 
 #else
 					// force delay between rebuilds
-					if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild) 
+					Int framesToBuild = bldgPlan->calcTimeToBuild(m_player);
+					if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild)
 					{
-						m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt); 
+						m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt);
 						return;
 					}	else {
 						// building is missing, (re)build it
@@ -820,7 +816,7 @@ void AIPlayer::processBaseBuilding( void )
 							m_player->getMoney()->withdraw( cost );
 
 							// inst-construct the building
-							bldg = buildStructureNow(bldgPlan, info, NULL);
+							bldg = buildStructureNow(bldgPlan, info);
 							// store the object with the build order
 							if (bldg)
 							{
@@ -837,12 +833,12 @@ void AIPlayer::processBaseBuilding( void )
 								m_frameLastBuildingBuilt = TheGameLogic->getFrame();
 								// only build one building per delay loop
 								break;
-							} // bldg built
-						} // have money
-					} // rebuild delay ok
+							}
+						}
+					}
 #endif
-				} // building missing
-			} // is buildable
+				}
+			}
 		}
 	}
 }
@@ -893,11 +889,15 @@ void AIPlayer::guardSupplyCenter( Team *team, Int minSupplies )
 	}
 	if (warehouse) {
 
-		AIGroup* theGroup = TheAI->createGroup();
+		AIGroupPtr theGroup = TheAI->createGroup();
 		if (!theGroup) {
 			return;
 		}
+#if RETAIL_COMPATIBLE_AIGROUP
 		team->getTeamAsAIGroup(theGroup);
+#else
+		team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 		Coord3D location = *warehouse->getPosition();
 		// It's probably a defensive move - position towards the enemy.
 		Region2D bounds;
@@ -944,7 +944,7 @@ Bool AIPlayer::isSupplySourceAttacked( void )
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
-			}			
+			}
 			for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 				Object *obj = objIter.cur();
 				if (!obj) {
@@ -1004,7 +1004,7 @@ Bool AIPlayer::isLocationSafe(const Coord3D *pos, const ThingTemplate *tthing )
 
 	// and only stuff that isn't stealthed (and not detected)
 	// (note that stealthed allies aren't hidden from us, but we're only looking for enemies here)
-	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ), 
+	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ),
 																										 MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_DETECTED ) );
 
 	// (optional) only stuff that is significant
@@ -1032,7 +1032,7 @@ Bool AIPlayer::isLocationSafe(const Coord3D *pos, const ThingTemplate *tthing )
 	}
 	return true;
 
-}  // isSupplySourceSafe
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -1130,7 +1130,7 @@ void AIPlayer::onUnitProduced( Object *factory, Object *unit )
 		}
 	}
 	if (!found) {
-		DEBUG_LOG(("***AI PLAYER-Unit not found in production queue.\n"));
+		DEBUG_LOG(("***AI PLAYER-Unit not found in production queue."));
 	}
 
 	m_teamDelay = 0; // Cause the update queues & selection to happen immediately.
@@ -1159,7 +1159,7 @@ void AIPlayer::computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord
 	if (bounds.hi.y<bounds.lo.y) {
 		bounds.hi.y = bounds.lo.y = (bounds.hi.y+bounds.lo.y)/2.0f;
 	}
-	
+
 	xCount = REAL_TO_INT_CEIL(bounds.width()/weaponRadius)+1;
 	yCount = REAL_TO_INT_CEIL(bounds.height()/weaponRadius)+1;
 
@@ -1262,9 +1262,9 @@ Int AIPlayer::getPlayerSuperweaponValue(Coord3D *center, Int playerNdx, Real rad
 	return cash;
 }
 // ------------------------------------------------------------------------------------------------
-/** Search the computer player's buildings for one that can build the given request 
+/** Search the computer player's buildings for one that can build the given request
 	* and start training the unit.
-	* If busyOK is true, it will queue a unit even if one is building.  This lets 
+	* If busyOK is true, it will queue a unit even if one is building.  This lets
 	* script invoked teams "push" to the front of the queue. */
 // ------------------------------------------------------------------------------------------------
 Bool AIPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString teamName)
@@ -1274,7 +1274,7 @@ Bool AIPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString teamNam
 	{
 		ProductionUpdateInterface *pu = factory->getProductionUpdateInterface();
 		if (pu && pu->queueCreateUnit( order->m_thing, pu->requestUniqueUnitID() )) {
-			order->m_factoryID = factory->getID(); 
+			order->m_factoryID = factory->getID();
 			if (TheGlobalData->m_debugAI) {
 				AsciiString teamStr = "Queuing ";
 				teamStr.concat(order->m_thing->getName());
@@ -1284,7 +1284,7 @@ Bool AIPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString teamNam
 			}
 			return true;
 		}
-	}  // end if
+	}
 
 	return FALSE;
 
@@ -1292,10 +1292,10 @@ Bool AIPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString teamNam
 
 // ------------------------------------------------------------------------------------------------
 /** Search the computer player's buildings for one that can build the given request.
-	* If busyOK is true, it will return a busy factory if there are no idle ones.  This is 
+	* If busyOK is true, it will return a busy factory if there are no idle ones.  This is
 	* used for script invoked teams "push" to the front of the queue. */
 // ------------------------------------------------------------------------------------------------
-Object *AIPlayer::findFactory(const ThingTemplate *thing, Bool busyOK) 
+Object *AIPlayer::findFactory(const ThingTemplate *thing, Bool busyOK)
 {
 	Object *busyFactory = NULL; // We prefer a factory that isn't busy.
 	for( BuildListInfo *info = m_player->getBuildList(); info; info = info->getNext() )
@@ -1323,9 +1323,9 @@ Object *AIPlayer::findFactory(const ThingTemplate *thing, Bool busyOK)
 			Bool busy = pu->getProductionCount()>0;
 			if (!busy) return factory; // found a not busy factory.
 			if (busyOK) busyFactory = factory;
-		}  // end if
+		}
 
-	}  // end for
+	}
 	// We didn't find an idle factory, so return the busy one.
 	if (busyOK) return busyFactory;
 	return NULL;
@@ -1362,11 +1362,11 @@ Bool AIPlayer::isPossibleToBuildTeam( TeamPrototype *proto, Bool requireIdleFact
 		notEnoughMoney = true;
 		return false; // too expensive
 	}
-	if (anyIdle) 
+	if (anyIdle)
 	{
 		return true;
 	}
-	if (!requireIdleFactory) 
+	if (!requireIdleFactory)
 	{
 		// Doesn't require an idle factory, so we're ok.
 		return true;
@@ -1375,7 +1375,7 @@ Bool AIPlayer::isPossibleToBuildTeam( TeamPrototype *proto, Bool requireIdleFact
 }
 
 // ------------------------------------------------------------------------------------------------
-/** Check if this team is buildable, doesn't exceed maximum limits, meets conditions, 
+/** Check if this team is buildable, doesn't exceed maximum limits, meets conditions,
 	* and isn't under construction. */
 // ------------------------------------------------------------------------------------------------
 Bool AIPlayer::isAGoodIdeaToBuildTeam( TeamPrototype *proto )
@@ -1386,7 +1386,7 @@ Bool AIPlayer::isAGoodIdeaToBuildTeam( TeamPrototype *proto )
 	}
 	// check build limit
 	if (proto->countTeamInstances() >= proto->getTemplateInfo()->m_maxInstances){
-		if (TheGlobalData->m_debugAI) {	
+		if (TheGlobalData->m_debugAI) {
 			AsciiString str;
 			str.format("Team %s not chosen - %d already exist.", proto->getName().str(), proto->countTeamInstances());
 			TheScriptEngine->AppendDebugMessage(str, false);
@@ -1403,7 +1403,7 @@ Bool AIPlayer::isAGoodIdeaToBuildTeam( TeamPrototype *proto )
 	}
 	Bool needMoney;
 	if (!isPossibleToBuildTeam( proto, true, needMoney)) {
-		if (TheGlobalData->m_debugAI) {	
+		if (TheGlobalData->m_debugAI) {
 			AsciiString str;
 			if (needMoney) {
 				str.format("Team %s not chosen - Not enough money.", proto->getName().str());
@@ -1444,7 +1444,7 @@ Bool AIPlayer::selectTeamToReinforce( Int minPriority )
 			for (DLINK_ITERATOR<Team> iter = proto->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 			{
 				Team *team = iter.cur();
-				if (team->hasAnyUnits() == false) 
+				if (team->hasAnyUnits() == false)
 				{
 					continue; // empty.
 				}
@@ -1456,21 +1456,21 @@ Bool AIPlayer::selectTeamToReinforce( Int minPriority )
 					if (thing==NULL) continue;
 					Int count=0;
 					team->countObjectsByThingTemplate(1, &thing, false, &count);
-					if (count < unitInfo[i].maxUnits) 
+					if (count < unitInfo[i].maxUnits)
 					{
 						// See if there is a factory available.
-						if (NULL != findFactory(thing, false)) 
+						if (NULL != findFactory(thing, false))
 						{
 							curTeam = team;
 							curPriority = proto->getTemplateInfo()->m_productionPriority;
 							curThing = thing;
 						}
 					}
-				}				
+				}
 			}
 		}
 	}
-	if (curTeam && curThing) 
+	if (curTeam && curThing)
 	{
 		/* We have something to build. */
 		TeamInQueue *teamQ = newInstance(TeamInQueue);
@@ -1488,7 +1488,7 @@ Bool AIPlayer::selectTeamToReinforce( Int minPriority )
 		order->m_next = NULL;
 		teamQ->m_workOrders = order;
 		teamQ->m_frameStarted = TheGameLogic->getFrame();
-		teamQ->m_team = curTeam; 
+		teamQ->m_team = curTeam;
 
 		AsciiString teamName = curTeam->getPrototype()->getName();
 		teamName.concat(" - AutoReinforcing one ");
@@ -1498,12 +1498,12 @@ Bool AIPlayer::selectTeamToReinforce( Int minPriority )
 		// start the creation of a new unit
 		Coord3D origin;
 		origin = curTeam->getPrototype()->getTemplateInfo()->m_homeLocation;
-		if (curTeam->getFirstItemIn_TeamMemberList()) 
+		if (curTeam->getFirstItemIn_TeamMemberList())
 		{
 			origin = *curTeam->getFirstItemIn_TeamMemberList()->getPosition();
 		}
 		Object *unit = curTeam->tryToRecruit(curThing, &origin, TheAI->getAiData()->m_maxRecruitDistance);
-		if (unit) 
+		if (unit)
 		{
 			order->m_numCompleted = 1;
 
@@ -1521,7 +1521,7 @@ Bool AIPlayer::selectTeamToReinforce( Int minPriority )
 			teamQ->m_reinforcementID = unit->getID();
 
 			AIUpdateInterface *ai = unit->getAIUpdateInterface();
-			if (ai) 
+			if (ai)
 			{
 				ai->aiIdle(CMD_FROM_AI);
 			}
@@ -1606,7 +1606,7 @@ Bool AIPlayer::selectTeamToBuild( void )
 			teamStr.concat("' has no Home Position (or Origin).");
 			TheScriptEngine->AppendDebugMessage(teamStr, false);
 		}
-		// Build it at low priority, as we have selected it automagically. 
+		// Build it at low priority, as we have selected it automagically.
 		buildSpecificAITeam(teamProto, false);
 		m_readyToBuildTeam = false;
 		m_teamTimer = m_teamSeconds*LOGICFRAMES_PER_SECOND;
@@ -1699,8 +1699,8 @@ void AIPlayer::buildUpgrade(const AsciiString &upgrade)
 				//Get the command button.
 				const CommandButton *commandButton = commandSet->getCommandButton(j);
 				if (commandButton==NULL) continue;
-				if (commandButton->getName().isEmpty() )	continue;	
-				if (commandButton->getUpgradeTemplate() == NULL )	continue;	
+				if (commandButton->getName().isEmpty() )	continue;
+				if (commandButton->getUpgradeTemplate() == NULL )	continue;
  				if (commandButton->getUpgradeTemplate()->getUpgradeName() == curUpgrade->getUpgradeName()) {
 					canUpgradeHere = true;
 				}
@@ -1719,8 +1719,8 @@ void AIPlayer::buildUpgrade(const AsciiString &upgrade)
 				TheScriptEngine->AppendDebugMessage( msg, false);
 				return;
 			}
-		}  // end if
-	}  // end for
+		}
+	}
 
 	AsciiString msg = TheNameKeyGenerator->keyToName(m_player->getPlayerNameKey());
 	msg.concat(" lacks factory to build upgrade ");
@@ -1775,7 +1775,7 @@ void AIPlayer::buildBySupplies(Int minimumCash, const AsciiString& thingName)
 		if( TheBuildAssistant->isLocationLegalToBuild( &location, tTemplate, angle,
 																									 BuildAssistant::NO_OBJECT_OVERLAP,
 																									 NULL, m_player ) != LBC_OK ) {
-			// Warn. 
+			// Warn.
 			const Coord3D *warehouseLocation = bestSupplyWarehouse->getPosition();
 			AsciiString debugMessage;
 			debugMessage.format(" %s - buildBySupplies unable to place near dock at (%.2f,%.2f).  Attempting to adjust position.",
@@ -1803,7 +1803,7 @@ void AIPlayer::buildBySupplies(Int minimumCash, const AsciiString& thingName)
 																							 NULL, m_player ) == LBC_OK;
 					if (valid) break;
 					if( TheGlobalData->m_debugSupplyCenterPlacement )
-						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)\n", newPos.x, newPos.y));
+						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)", newPos.x, newPos.y));
 					newPos.y = yPos+posOffset;
 					valid = TheBuildAssistant->isLocationLegalToBuild( &newPos, tTemplate, angle,
 																							 BuildAssistant::CLEAR_PATH |
@@ -1811,7 +1811,7 @@ void AIPlayer::buildBySupplies(Int minimumCash, const AsciiString& thingName)
 																							 BuildAssistant::NO_OBJECT_OVERLAP,
 																							 NULL, m_player ) == LBC_OK;
 					if( !valid && TheGlobalData->m_debugSupplyCenterPlacement )
-						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)\n", newPos.x, newPos.y));
+						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)", newPos.x, newPos.y));
 				}
 				if (valid) break;
 				xPos = location.x-offset;
@@ -1825,7 +1825,7 @@ void AIPlayer::buildBySupplies(Int minimumCash, const AsciiString& thingName)
 																							 NULL, m_player ) == LBC_OK;
 					if (valid) break;
 					if( TheGlobalData->m_debugSupplyCenterPlacement )
-						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)\n", newPos.x, newPos.y));
+						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)", newPos.x, newPos.y));
 					newPos.x = xPos+posOffset;
 					valid = TheBuildAssistant->isLocationLegalToBuild( &newPos, tTemplate, angle,
 																							 BuildAssistant::CLEAR_PATH |
@@ -1833,15 +1833,15 @@ void AIPlayer::buildBySupplies(Int minimumCash, const AsciiString& thingName)
 																							 BuildAssistant::NO_OBJECT_OVERLAP,
 																							 NULL, m_player ) == LBC_OK;
 					if( !valid && TheGlobalData->m_debugSupplyCenterPlacement )
-						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)\n", newPos.x, newPos.y));
+						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)", newPos.x, newPos.y));
 				}
 				if (valid) break;
 			}
 		}
-		if (valid) 
+		if (valid)
 		{
 			if( TheGlobalData->m_debugSupplyCenterPlacement )
-				DEBUG_LOG(("buildAISupplyCenter -- SUCCESS at (%.2f,%.2f)\n", newPos.x, newPos.y));
+				DEBUG_LOG(("buildAISupplyCenter -- SUCCESS at (%.2f,%.2f)", newPos.x, newPos.y));
 			location = newPos;
 		}
 		TheTerrainVisual->removeAllBibs();	// isLocationLegalToBuild adds bib feedback, turn it off.  jba.
@@ -1875,7 +1875,7 @@ Object *AIPlayer::findSupplyCenter(Int minimumCash)
 			if (!obj->isKindOf(KINDOF_SUPPLY_SOURCE)) continue;
 			static const NameKeyType key_warehouseUpdate = NAMEKEY("SupplyWarehouseDockUpdate");
 			SupplyWarehouseDockUpdate *warehouseModule = (SupplyWarehouseDockUpdate*)obj->findUpdateModule( key_warehouseUpdate );
-			if( warehouseModule )	{	 
+			if( warehouseModule )	{
 				Int availableCash = warehouseModule->getBoxesStored()*TheGlobalData->m_baseValuePerSupplyBox;
 				if (availableCash<minimumCash) continue;
 				if( m_player->getRelationship(obj->getTeam()) == ENEMIES ) {
@@ -1958,9 +1958,9 @@ void AIPlayer::repairStructure(ObjectID structure)
 	if (structureObj==NULL) return;
 	if (structureObj->getBodyModule()==NULL) return;
 	// If the structure is not noticably damaged, don't bother.
-	enum BodyDamageType structureState = structureObj->getBodyModule()->getDamageState(); 
+	BodyDamageType structureState = structureObj->getBodyModule()->getDamageState();
 	if (structureState==BODY_PRISTINE) {
-		return; 
+		return;
 	}
 	if (structureObj->isKindOf(KINDOF_BRIDGE)) {
 		// Locate the correct post to repair.
@@ -1968,12 +1968,12 @@ void AIPlayer::repairStructure(ObjectID structure)
 	Int i;
 	for (i=0; i<m_structuresInQueue; i++) {
 		if (m_structuresToRepair[i] == structureObj->getID()) {
-			DEBUG_LOG(("info - Bridge already queued for repair.\n"));
+			DEBUG_LOG(("info - Bridge already queued for repair."));
 			return;
 		}
 	}
-	if (m_structuresInQueue==MAX_STRUCTURES_TO_REPAIR) {
-		DEBUG_LOG(("Structure repair queue is full, ignoring repair request. JBA\n"));
+	if (m_structuresInQueue>=MAX_STRUCTURES_TO_REPAIR) {
+		DEBUG_LOG(("Structure repair queue is full, ignoring repair request. JBA"));
 		return;
 	}
 	m_structuresToRepair[m_structuresInQueue] = structureObj->getID();
@@ -1985,8 +1985,8 @@ void AIPlayer::repairStructure(ObjectID structure)
 // ------------------------------------------------------------------------------------------------
 void AIPlayer::selectSkillset(Int skillset)
 {
-	DEBUG_ASSERTCRASH(m_skillsetSelector == INVALID_SKILLSET_SELECTION, 
-		("Selecting a skill set (%d) after one has already been chosen (%d) means some points have been incorrectly spent.\n", skillset + 1, m_skillsetSelector + 1));
+	DEBUG_ASSERTCRASH(m_skillsetSelector == INVALID_SKILLSET_SELECTION,
+		("Selecting a skill set (%d) after one has already been chosen (%d) means some points have been incorrectly spent.", skillset + 1, m_skillsetSelector + 1));
 
 	m_skillsetSelector = skillset;
 }
@@ -2017,7 +2017,7 @@ void AIPlayer::updateBridgeRepair(void)
 	// Got a bridge to repair.
 	Object *dozer = NULL;
 	Coord3D bridgePos = *bridgeObj->getPosition();
-	enum BodyDamageType bridgeState = bridgeObj->getBodyModule()->getDamageState(); 
+	BodyDamageType bridgeState = bridgeObj->getBodyModule()->getDamageState();
 	if (m_repairDozer==INVALID_ID) {
 		m_dozerIsRepairing = false;
 		// Need a dozer.
@@ -2029,7 +2029,7 @@ void AIPlayer::updateBridgeRepair(void)
 			m_repairDozer = dozer->getID();
 			m_repairDozerOrigin = *dozer->getPosition();
 			dozer->getAI()->aiRepair(bridgeObj, CMD_FROM_AI);
-			DEBUG_LOG(("Telling dozer to repair\n"));
+			DEBUG_LOG(("Telling dozer to repair"));
 			m_dozerIsRepairing = true;
 			return;
 		}
@@ -2054,7 +2054,7 @@ void AIPlayer::updateBridgeRepair(void)
 		if (!dozerAI->isAnyTaskPending())	{
 			// should be done repairing.
 			if (bridgeState==BODY_PRISTINE) {
-				DEBUG_LOG(("Dozer finished repairing structure.\n"));
+				DEBUG_LOG(("Dozer finished repairing structure."));
 				// we're done.
 				Int i;
 				for (i=0; i<m_structuresInQueue-1; i++) {
@@ -2063,7 +2063,7 @@ void AIPlayer::updateBridgeRepair(void)
 				m_structuresInQueue--;
 				m_dozerIsRepairing = false;
 				if (m_structuresInQueue==0) {
-					// Go home.  
+					// Go home.
 					Coord3D pos = m_baseCenter;
 					if (!m_baseCenterSet) {
 						pos = m_repairDozerOrigin;
@@ -2078,10 +2078,10 @@ void AIPlayer::updateBridgeRepair(void)
 			// dozer should be working on the bridge.
 			return;
 		}
-	}	
+	}
 	dozer->getAI()->aiRepair(bridgeObj, CMD_FROM_AI);
 	m_dozerIsRepairing = true;
-	DEBUG_LOG(("Telling dozer to repair\n"));
+	DEBUG_LOG(("Telling dozer to repair"));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -2093,7 +2093,7 @@ void AIPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool priorityBuild
 	// Create "Team in queue" based on team population
 	//
 	if (teamProto)
-	{	
+	{
 		if (!m_player->getCanBuildUnits()) {
 			AsciiString teamStr = "Can't build team '";
 			teamStr.concat(teamProto->getName());
@@ -2106,7 +2106,7 @@ void AIPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool priorityBuild
 			if (singletonTeam && singletonTeam->hasAnyObjects()) {
 				AsciiString teamStr = "Unable to build singleton team '";
 				teamStr.concat("' because team already exists.");
-				TheScriptEngine->AppendDebugMessage(teamStr, false); 
+				TheScriptEngine->AppendDebugMessage(teamStr, false);
 				return;
 			}
 		}
@@ -2119,7 +2119,7 @@ void AIPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool priorityBuild
 				teamStr.concat(teamProto->getName());
 				teamStr.concat("' but there is enough money.");
 				TheScriptEngine->AppendDebugMessage(teamStr, false);
-			} else {	
+			} else {
 				// Tech tree doesn't work.
 				AsciiString teamStr = "Unable to build team '";
 				teamStr.concat(teamProto->getName());
@@ -2170,7 +2170,7 @@ void AIPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool priorityBuild
 				orders = order;
 			}
 		}
-		if (orders) 
+		if (orders)
 		{
 			/* We have something to build. */
 			TeamInQueue *team = newInstance(TeamInQueue);
@@ -2189,7 +2189,7 @@ void AIPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool priorityBuild
 			team->m_frameStarted = TheGameLogic->getFrame();
 			// create inactive team to place members into as they are built
 			// when team is complete, the team is activated
-			team->m_team = TheTeamFactory->createInactiveTeam( teamProto->getName() ); 
+			team->m_team = TheTeamFactory->createInactiveTeam( teamProto->getName() );
 			AsciiString teamName = teamProto->getName();
 			teamName.concat(" - starting team build.");
 			TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -2221,17 +2221,17 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu
 	// Create "Team in queue" based on team population
 	//
 	if (teamProto)
-	{	
+	{
 		if (teamProto->getIsSingleton()) {
 			Team *singletonTeam = TheTeamFactory->findTeam( teamProto->getName() );
 			if (singletonTeam && singletonTeam->hasAnyObjects()) {
 				AsciiString teamStr = "Unable to recruit singleton team '";
 				teamStr.concat("' because team already exists.");
-				TheScriptEngine->AppendDebugMessage(teamStr, false); 
+				TheScriptEngine->AppendDebugMessage(teamStr, false);
 				return;
 			}
 		}
-		if (!teamProto->getTemplateInfo()->m_hasHomeLocation && !isSkirmishAI()) 
+		if (!teamProto->getTemplateInfo()->m_hasHomeLocation && !isSkirmishAI())
 		{
 			AsciiString teamStr = "Error : team '";
 			teamStr.concat(teamProto->getName());
@@ -2240,7 +2240,7 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu
 		}
 		// create inactive team to place members into as they are built
 		// when team is complete, the team is activated
-		Team *theTeam = TheTeamFactory->createInactiveTeam( teamProto->getName() ); 
+		Team *theTeam = TheTeamFactory->createInactiveTeam( teamProto->getName() );
 		AsciiString teamName = teamProto->getName();
 		teamName.concat(" - Recruiting.");
 		TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -2257,7 +2257,7 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu
 				int count = unitInfo[i].maxUnits;
 				while (count>0) {
 					Object *unit = theTeam->tryToRecruit(thing, &teamProto->getTemplateInfo()->m_homeLocation, recruitRadius);
-					if (unit) 
+					if (unit)
 					{
 						unitsRecruited++;
 
@@ -2273,12 +2273,12 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu
 						unit->setTeam(theTeam);
 
 						AIUpdateInterface *ai = unit->getAIUpdateInterface();
-						if (ai) 
+						if (ai)
 						{
 #ifdef DEBUG_LOGGING
 							Coord3D pos = *unit->getPosition();
 							Coord3D to = teamProto->getTemplateInfo()->m_homeLocation;
-							DEBUG_LOG(("Moving unit from %f,%f to %f,%f\n", pos.x, pos.y , to.x, to.y ));
+							DEBUG_LOG(("Moving unit from %f,%f to %f,%f", pos.x, pos.y , to.x, to.y ));
 #endif
 							ai->aiMoveToPosition( &teamProto->getTemplateInfo()->m_homeLocation, CMD_FROM_AI);
 						}
@@ -2289,7 +2289,7 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu
 				}
 			}
 		}
-		if (unitsRecruited>0) 
+		if (unitsRecruited>0)
 		{
 			/* We have something to build. */
 			TeamInQueue *team = newInstance(TeamInQueue);
@@ -2298,7 +2298,7 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu
 			team->m_priorityBuild = false;
 			team->m_workOrders = NULL;
 			team->m_frameStarted = TheGameLogic->getFrame();
-			team->m_team = theTeam; 
+			team->m_team = theTeam;
 			AsciiString teamName = teamProto->getName();
 			teamName.concat(" - Finished recruiting.");
 			TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -2341,19 +2341,19 @@ void AIPlayer::queueUnits( void )
 		for( WorkOrder *order = team->m_workOrders; order; order = order->m_next )
 		{
 			// check if there is a unit on the map that we can steal (recruit) instead of building
-			// @todo: Should this try to alter the home location of the recruiting area to 
+			// @todo: Should this try to alter the home location of the recruiting area to
 			// the center of the team, or to the home area of this player?
 			Coord3D home = team->m_team->getPrototype()->getTemplateInfo()->m_homeLocation;
 			Bool hasHome = false;
 			if (team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation) {
-				hasHome = true; 
+				hasHome = true;
 			} else {
 				hasHome = getBaseCenter(&home);
 			}
 			while (order->isWaitingToBuild()) {
-				
+
 				Object *unit = team->m_team->tryToRecruit(order->m_thing, &home, TheAI->getAiData()->m_maxRecruitDistance);
-				if (unit) 
+				if (unit)
 				{
 					order->m_numCompleted++;
 
@@ -2410,7 +2410,7 @@ void AIPlayer::doBaseBuilding( void )
 		}
 		// This timer is to keep from banging on the logic each frame.  If something interesting
 		// happens, like a building is added or a unit finished, the timers are shortcut.
-		m_buildDelay--;		
+		m_buildDelay--;
 		if (m_buildDelay<1) {
 			if (m_readyToBuildStructure) {
 				processBaseBuilding();
@@ -2436,7 +2436,7 @@ void AIPlayer::checkReadyTeams( void )
 			TeamInQueue *team = iter.cur();
 			// If 60 seconds passed, start anyway.
 			Bool timeExpired = team->m_frameStarted+60*LOGICFRAMES_PER_SECOND < TheGameLogic->getFrame();
-			Bool allIdle=TRUE;	
+			Bool allIdle=TRUE;
 			Bool anyIdle = FALSE;
 			if (team->m_reinforcement) {
 				Object *obj = TheGameLogic->findObjectByID(team->m_reinforcementID);
@@ -2447,7 +2447,7 @@ void AIPlayer::checkReadyTeams( void )
 			} else {
 				allIdle = team->m_team->isIdle();
 				for (DLINK_ITERATOR<Object> iter = team->m_team->iterate_TeamMemberList(); !iter.done(); iter.advance()) {
-					Object *obj = iter.cur();	
+					Object *obj = iter.cur();
 					if (obj->getAI() && obj->getAI()->isIdle()) {
 						anyIdle = true;
 					}
@@ -2465,11 +2465,11 @@ void AIPlayer::checkReadyTeams( void )
 				if (!team->m_sentToStartLocation) {
 					team->m_sentToStartLocation = true;
 					/*
-					if (team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation && 
+					if (team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation &&
 							!team->m_reinforcement) {
- 						AIGroup* theGroup = TheAI->createGroup();
+ 						AIGroupPtr theGroup = TheAI->createGroup();
 						if (theGroup) {
-							team->m_team->getTeamAsAIGroup(theGroup);
+							team->m_team->getTeamAsAIGroup(theGroup.Peek());
 							Coord3D destination = team->m_team->getPrototype()->getTemplateInfo()->m_homeLocation;
 							theGroup->groupTightenToPosition( &destination, false, CMD_FROM_AI );
 							team->m_frameStarted = TheGameLogic->getFrame();
@@ -2499,7 +2499,7 @@ void AIPlayer::checkReadyTeams( void )
 				}
 				deleteInstance(team);
 				iter = iterate_TeamReadyQueue();
-			}																		 
+			}
 		}
 	}
 }
@@ -2516,7 +2516,7 @@ void AIPlayer::checkQueuedTeams( void )
 		{
 			TeamInQueue *team = iter.cur();
 			if (team && team->isBuildTimeExpired())	{
-				if (team->isMinimumBuilt()) 
+				if (team->isMinimumBuilt())
 				{
 					if (team->areBuildsComplete()) {
 						// Move to ready queue
@@ -2533,7 +2533,7 @@ void AIPlayer::checkQueuedTeams( void )
 					if (isSkirmishAI()) {
 						TheScriptEngine->clearTeamFlags();
 					}
-				}	 
+				}
 				iter = iterate_TeamBuildQueue();
 			}
 		}
@@ -2554,7 +2554,7 @@ void AIPlayer::checkQueuedTeams( void )
 			}
 			Bool anyIdle = false;
 			for (DLINK_ITERATOR<Object> iter = team->m_team->iterate_TeamMemberList(); !iter.done(); iter.advance()) {
-				Object *obj = iter.cur();	
+				Object *obj = iter.cur();
 				if (obj && obj->getAI() && obj->getAI()->isIdle()) {
 					anyIdle = true;
 				}
@@ -2566,7 +2566,7 @@ void AIPlayer::checkQueuedTeams( void )
 						TheScriptEngine->friend_executeAction(script->getAction(), team->m_team);
 					}
 				}
-			}	
+			}
 		}
 	}
 }
@@ -2627,7 +2627,7 @@ void AIPlayer::doUpgradesAndSkills( void )
 	if (sideInfo == NULL) return;
 
 	if (m_skillsetSelector == INVALID_SKILLSET_SELECTION) {
-		Int limit = 0;		
+		Int limit = 0;
 		// Pick randomly among the skillsets that have skills.
 		// Designers sometimes only define skillset 1 & 2, or some such.  jba.
 		if (sideInfo->m_skillSet2.m_numSkills>0) {
@@ -2734,8 +2734,8 @@ void AIPlayer::newMap( void )
 		AsciiString name = info->getTemplateName();
 		if (name.isEmpty()) continue;
 		const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( name );
-		if (!bldgPlan) {																											 
-			DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.\n", name.str()));
+		if (!bldgPlan) {
+			DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.", name.str()));
 			continue;
 		}
 		if (info->isInitiallyBuilt()) {
@@ -2762,7 +2762,7 @@ void AIPlayer::computeCenterAndRadiusOfBase(Coord3D *center, Real *radius)
 		AsciiString name = info->getTemplateName();
 		if (name.isEmpty()) continue;
 		const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( name );
-		if (!bldgPlan) {																											 
+		if (!bldgPlan) {
 			continue;
 		}
 		Coord3D pos = *info->getLocation();
@@ -2786,7 +2786,7 @@ void AIPlayer::computeCenterAndRadiusOfBase(Coord3D *center, Real *radius)
 		AsciiString name = info->getTemplateName();
 		if (name.isEmpty()) continue;
 		const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( name );
-		if (!bldgPlan) {																											 
+		if (!bldgPlan) {
 			continue;
 		}
 		Coord3D pos = *info->getLocation();
@@ -2796,7 +2796,7 @@ void AIPlayer::computeCenterAndRadiusOfBase(Coord3D *center, Real *radius)
 		if (dy<0) dy = -dy;
 		Real bldgRadius = bldgPlan->getTemplateGeometryInfo().getBoundingCircleRadius()*0.4f;
 		dx += bldgRadius;
-		dy += bldgRadius; 
+		dy += bldgRadius;
 		Real radSqr = dx*dx+dy*dy;
 		if (radSqr>maxRadSqr) maxRadSqr=radSqr;
 	}
@@ -2856,7 +2856,7 @@ void AIPlayer::queueDozer( void )
 				team->m_workOrders = order;
 				team->m_frameStarted = TheGameLogic->getFrame();
 				// Stick it on the default team
-				team->m_team = m_player->getDefaultTeam(); 
+				team->m_team = m_player->getDefaultTeam();
 				AsciiString teamName = "DOZER - building one at the ";
 				teamName.concat(factory->getTemplate()->getName());
 				TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -2890,7 +2890,7 @@ Object * AIPlayer::findDozer( const Coord3D *pos )
 	// Add any factories placed to the build list.
 	Object *obj;
 	Object *dozer = NULL;
-	Bool needDozer = true; 
+	Bool needDozer = true;
 	Object *closestDozer=NULL;
 	Real closestDistSqr = 0;
 
@@ -2904,7 +2904,7 @@ Object * AIPlayer::findDozer( const Coord3D *pos )
 
 				AIUpdateInterface *ai = obj->getAIUpdateInterface();
 				if (ai==NULL) {
-					continue;										 
+					continue;
 				}
 
 
@@ -2914,7 +2914,7 @@ Object * AIPlayer::findDozer( const Coord3D *pos )
 					SupplyTruckAIInterface* supplyTruckAI = ai->getSupplyTruckAIInterface();
 					if( !dozerAI->isAnyTaskPending() && supplyTruckAI ) {
 						// If it is gathering supplies, don't steal it.
-						if (supplyTruckAI->isCurrentlyFerryingSupplies() || supplyTruckAI->isForcedIntoWantingState()) 
+						if (supplyTruckAI->isCurrentlyFerryingSupplies() || supplyTruckAI->isForcedIntoWantingState())
 						{
 							continue;
 						}
@@ -2965,12 +2965,12 @@ Object * AIPlayer::findDozer( const Coord3D *pos )
 void AIPlayer::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: added m_teamSeconds delay.
 	* 3: Added m_curWarehouseID.
 	* 1: Reset back to 1 with major save file changes.
@@ -3001,27 +3001,27 @@ void AIPlayer::xfer( Xfer *xfer )
 				 teamInQueueIt.done() == FALSE;
 				 teamInQueueIt.advance() )
 		{
-		
+
 			// get element data
 			teamInQueue = teamInQueueIt.cur();
 
 			// xfer it
 			xfer->xferSnapshot( teamInQueue );
 
-		}  // end for, iterate team build queue
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
 		// sanity, the list must be empty
 		if( getFirstItemIn_TeamBuildQueue() != NULL )
 		{
-		
-			DEBUG_CRASH(( "AIPlayer::xfer - TeamBuildQueue head is not NULL, you should delete it or something before loading a new list\n" ));
+
+			DEBUG_CRASH(( "AIPlayer::xfer - TeamBuildQueue head is not NULL, you should delete it or something before loading a new list" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// ready all data
 		for( UnsignedShort i = 0; i < teamBuildQueueCount; ++i )
@@ -3036,12 +3036,12 @@ void AIPlayer::xfer( Xfer *xfer )
 			// xfer data
 			xfer->xferSnapshot( teamInQueue );
 
-		}  // end for, i
+		}
 
 		// the list was loaded in reverse order, reverse the list so it's in the same order as before
 		reverse_TeamBuildQueue();
 
-	}  // end else, load
+	}
 
 	// team ready queue count
 	UnsignedShort teamReadyQueueCount = 0;
@@ -3060,27 +3060,27 @@ void AIPlayer::xfer( Xfer *xfer )
 				 teamReadyQueueIt.done() == FALSE;
 				 teamReadyQueueIt.advance() )
 		{
-		
+
 			// get element
 			teamReadyQueue = teamReadyQueueIt.cur();
-			
+
 			// xfer data
 			xfer->xferSnapshot( teamReadyQueue );
 
-		}  // end for, iterate team ready queue
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
 		// sanity, the list must be empty
 		if( getFirstItemIn_TeamReadyQueue() != NULL )
 		{
-		
-			DEBUG_CRASH(( "AIPlayer::xfer - TeamReadyQueue head is not NULL, you should delete it or something before loading a new list\n" ));
+
+			DEBUG_CRASH(( "AIPlayer::xfer - TeamReadyQueue head is not NULL, you should delete it or something before loading a new list" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read all data
 		for( UnsignedShort i = 0; i < teamReadyQueueCount; ++i )
@@ -3095,12 +3095,12 @@ void AIPlayer::xfer( Xfer *xfer )
 			// xfer data
 			xfer->xferSnapshot( teamInQueue );
 
-		}  // end for, i
+		}
 
 		// reverse the list since it was loaded in reverse order due to the prepend
 		reverse_TeamReadyQueue();
 
-	}  // end else, load
+	}
 
 	// xfer player index ... this is really just for sanity
 	PlayerIndex playerIndex = m_player->getPlayerIndex();
@@ -3108,10 +3108,10 @@ void AIPlayer::xfer( Xfer *xfer )
 	if( playerIndex != m_player->getPlayerIndex() )
 	{
 
-		DEBUG_CRASH(( "AIPlayer::xfer - player index mismatch\n" ));
+		DEBUG_CRASH(( "AIPlayer::xfer - player index mismatch" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// xfer the rest of the ai player data (it's pretty straight forward)
 	xfer->xferBool( &m_readyToBuildTeam );
@@ -3141,7 +3141,7 @@ void AIPlayer::xfer( Xfer *xfer )
 	xfer->xferBool( &m_dozerIsRepairing );
 	xfer->xferInt( &m_bridgeTimer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3149,7 +3149,7 @@ void AIPlayer::xfer( Xfer *xfer )
 void AIPlayer::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -3176,7 +3176,7 @@ Bool TeamInQueue::isAllBuilt()
 	Bool stillBuilding = false;
 	for( order = m_workOrders; order; order = order->m_next )
 	{
-		if (order->m_numRequired>order->m_numCompleted) 
+		if (order->m_numRequired>order->m_numCompleted)
 		{
 			stillBuilding = true;
 		}
@@ -3209,7 +3209,7 @@ Bool TeamInQueue::isMinimumBuilt()
 		if (order->m_factoryID != INVALID_ID) {
 			count++; // we have one building.
 		}
-		if (order->m_numRequired>count) 
+		if (order->m_numRequired>count)
 		{
 			if (order->m_required) {
 				return false; // required units not built.
@@ -3273,10 +3273,10 @@ void TeamInQueue::disband()
 void TeamInQueue::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Xfer method 
+/** Xfer method
 	* Version Info:
 	* 1: Initial version */
 // ------------------------------------------------------------------------------------------------
@@ -3285,7 +3285,7 @@ void TeamInQueue::xfer( Xfer *xfer )
 
 	// version
 	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;;
+	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
 	// xfer work order count
@@ -3306,9 +3306,9 @@ void TeamInQueue::xfer( Xfer *xfer )
 			// xfer work order data
 			xfer->xferSnapshot( workOrder );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -3316,10 +3316,10 @@ void TeamInQueue::xfer( Xfer *xfer )
 		if( m_workOrders != NULL )
 		{
 
-			DEBUG_CRASH(( "TeamInQueue::xfer - m_workOrders should be NULL but isn't.  Perhaps you should blow it away before loading\n" ));
+			DEBUG_CRASH(( "TeamInQueue::xfer - m_workOrders should be NULL but isn't.  Perhaps you should blow it away before loading" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// load all work orders
 		for( UnsignedShort i = 0; i < workOrderCount; ++i )
@@ -3341,14 +3341,14 @@ void TeamInQueue::xfer( Xfer *xfer )
 
 				last->m_next = workOrder;
 
-			}  // end else
+			}
 
 			// load work order data
 			xfer->xferSnapshot( workOrder );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// xfer the rest of the team in queue data
 	xfer->xferBool( &m_priorityBuild );
@@ -3362,7 +3362,7 @@ void TeamInQueue::xfer( Xfer *xfer )
 	xfer->xferBool( &m_reinforcement );
 	xfer->xferObjectID( &m_reinforcementID );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3370,7 +3370,7 @@ void TeamInQueue::xfer( Xfer *xfer )
 void TeamInQueue::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -3381,7 +3381,7 @@ void TeamInQueue::loadPostProcess( void )
 WorkOrder::~WorkOrder()
 {
 
-}  // end WorkOrder
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Verify factoryID still refers to an active object */
@@ -3389,7 +3389,7 @@ WorkOrder::~WorkOrder()
 void WorkOrder::validateFactory( Player *thisPlayer )
 {
 
-	if (m_factoryID == INVALID_ID) 
+	if (m_factoryID == INVALID_ID)
 		return;
 	Object *factory = TheGameLogic->findObjectByID( m_factoryID );
 	if ( factory == NULL) {
@@ -3400,7 +3400,7 @@ void WorkOrder::validateFactory( Player *thisPlayer )
 		m_factoryID = INVALID_ID;
 	}
 
-}  // end validateFactory
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -3408,7 +3408,7 @@ void WorkOrder::validateFactory( Player *thisPlayer )
 void WorkOrder::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -3444,7 +3444,7 @@ void WorkOrder::xfer( Xfer *xfer )
 	// is resource gatherer
 	xfer->xferBool( &m_isResourceGatherer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3452,7 +3452,7 @@ void WorkOrder::xfer( Xfer *xfer )
 void WorkOrder::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 
 //----------------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
index 9075db74aa1..1df77caa3b4 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
@@ -26,14 +26,14 @@
 // Computerized opponent
 // Author: Michael S. Booth, January 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/GameMemory.h"
 #include "Common/GlobalData.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
-#include "Common/Team.h" 
+#include "Common/Team.h"
 #include "Common/ThingFactory.h"
 #include "Common/BuildAssistant.h"
 #include "Common/SpecialPower.h"
@@ -54,15 +54,10 @@
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/Module/ProductionUpdate.h"
-#include "GameClient/TerrainVisual.h"	
+#include "GameClient/TerrainVisual.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
-#define USE_DOZER 1	 
+#define USE_DOZER 1
 
 
 
@@ -70,7 +65,7 @@
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-AISkirmishPlayer::AISkirmishPlayer( Player *p ) :	AIPlayer(p), 
+AISkirmishPlayer::AISkirmishPlayer( Player *p ) :	AIPlayer(p),
 m_curFlankBaseDefense(0),
 m_curFrontBaseDefense(0),
 m_curFrontLeftDefenseAngle(0),
@@ -106,7 +101,7 @@ void AISkirmishPlayer::processBaseBuilding( void )
 	{
 		const ThingTemplate *bldgPlan=NULL;
 		BuildListInfo	*bldgInfo = NULL;
-		Bool isPriority = false;	
+		Bool isPriority = false;
 		Object *bldg = NULL;
 		const ThingTemplate *powerPlan=NULL;
 		BuildListInfo	*powerInfo = NULL;
@@ -117,11 +112,11 @@ void AISkirmishPlayer::processBaseBuilding( void )
 			AsciiString name = info->getTemplateName();
 			if (name.isEmpty()) continue;
 			const ThingTemplate *curPlan = TheThingFactory->findTemplate( name );
-			if (!curPlan) {																											 
-				DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.\n", name.str()));
+			if (!curPlan) {
+				DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.", name.str()));
 				continue;
 			}
-			bldg = TheGameLogic->findObjectByID( info->getObjectID() );	
+			bldg = TheGameLogic->findObjectByID( info->getObjectID() );
 			// check for hole.
 			if (info->getObjectID() != INVALID_ID) {
 				// used to have a building.
@@ -134,13 +129,13 @@ void AISkirmishPlayer::processBaseBuilding( void )
 					info->setObjectTimestamp(TheGameLogic->getFrame()+1);
 					// Scan for a GLA hole.	KINDOF_REBUILD_HOLE
 					Object *obj;
-					for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() ) { 
+					for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() ) {
 						if (!obj->isKindOf(KINDOF_REBUILD_HOLE)) continue;
 						RebuildHoleBehaviorInterface *rhbi = RebuildHoleBehavior::getRebuildHoleBehaviorInterfaceFromObject( obj );
 						if( rhbi ) {
 							ObjectID spawnerID = rhbi->getSpawnerID();
 							if (priorID == spawnerID) {
-								DEBUG_LOG(("AI Found hole to rebuild %s\n", curPlan->getName().str()));
+								DEBUG_LOG(("AI Found hole to rebuild %s", curPlan->getName().str()));
 								info->setObjectID(obj->getID());
 							}
 						}
@@ -148,9 +143,9 @@ void AISkirmishPlayer::processBaseBuilding( void )
 				}	else {
 					if (bldg->getControllingPlayer() == m_player) {
 						// Check for built or dozer missing.
-						if( bldg->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) ) 
+						if( bldg->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 						{
-							if (bldg->isKindOf(KINDOF_FS_POWER) && !bldg->isKindOf(KINDOF_CASH_GENERATOR)) 
+							if (bldg->isKindOf(KINDOF_FS_POWER) && !bldg->isKindOf(KINDOF_CASH_GENERATOR))
 							{
 								powerUnderConstruction = true;
 							}
@@ -158,7 +153,7 @@ void AISkirmishPlayer::processBaseBuilding( void )
 							ObjectID builder = bldg->getBuilderID();
 							Object* myDozer = TheGameLogic->findObjectByID(builder);
 							if (myDozer==NULL) {
-								DEBUG_LOG(("AI's Dozer got killed.  Find another dozer.\n"));
+								DEBUG_LOG(("AI's Dozer got killed.  Find another dozer."));
 								queueDozer();
  								myDozer = findDozer(bldg->getPosition());
 								if (myDozer==NULL || myDozer->getAI()==NULL) {
@@ -174,7 +169,7 @@ void AISkirmishPlayer::processBaseBuilding( void )
 						// oops, got captured.
 						info->setObjectID(INVALID_ID);
 						info->setObjectTimestamp(TheGameLogic->getFrame()+1);
-					}	
+					}
 				}
 			}
 			if (info->getObjectID()==INVALID_ID && info->getObjectTimestamp()>0) {
@@ -183,7 +178,7 @@ void AISkirmishPlayer::processBaseBuilding( void )
 				if (info->getObjectTimestamp()+TheAI->getAiData()->m_rebuildDelaySeconds*LOGICFRAMES_PER_SECOND > TheGameLogic->getFrame()) {
 					continue;
 				}	else {
-					DEBUG_LOG(("Enabling rebuild for %s\n", info->getTemplateName().str()));
+					DEBUG_LOG(("Enabling rebuild for %s", info->getTemplateName().str()));
 					info->setObjectTimestamp(0); // ready to build.
 				}
 			}
@@ -230,18 +225,18 @@ void AISkirmishPlayer::processBaseBuilding( void )
 			}
 			// check if this building has any "rebuilds" left
 			if (info->isBuildable())
-			{	
+			{
 				if (bldgPlan == NULL) {
 					bldgPlan = curPlan;
 					bldgInfo = info;
 				}
 			}
 		}
-		if (powerPlan && powerInfo && !powerPlan->isEquivalentTo(bldgPlan)) {
+		if (powerInfo && powerPlan && !powerPlan->isEquivalentTo(bldgPlan)) {
 			if (!powerUnderConstruction) {
 				bldgPlan = powerPlan;
 				bldgInfo = powerInfo;
-				DEBUG_LOG(("Forcing build of power plant.\n"));
+				DEBUG_LOG(("Forcing build of power plant."));
 			}
 		}
 		if (bldgPlan && bldgInfo) {
@@ -263,13 +258,14 @@ void AISkirmishPlayer::processBaseBuilding( void )
 				}
 				m_frameLastBuildingBuilt = TheGameLogic->getFrame();
 				// only build one building per delay loop
-			} // bldg built
+			}
 
 #else
 			// force delay between rebuilds
-			if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild) 
+			Int framesToBuild = bldgPlan->calcTimeToBuild(m_player);
+			if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild)
 			{
-				m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt); 
+				m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt);
 				return;
 			}	else {
 				// building is missing, (re)build it
@@ -281,12 +277,12 @@ void AISkirmishPlayer::processBaseBuilding( void )
 					m_player->getMoney()->withdraw( cost );
 
 					// inst-construct the building
-					bldg = buildStructureNow(bldgPlan, info, NULL);
+					bldg = buildStructureNow(bldgPlan, bldgInfo);
 					// store the object with the build order
 					if (bldg)
 					{
-						info->setObjectID( bldg->getID() );
-						info->decrementNumRebuilds();
+						bldgInfo->setObjectID( bldg->getID() );
+						bldgInfo->decrementNumRebuilds();
 
 						m_readyToBuildStructure = false;
 						m_structureTimer = TheAI->getAiData()->m_structureSeconds*LOGICFRAMES_PER_SECOND;
@@ -296,11 +292,9 @@ void AISkirmishPlayer::processBaseBuilding( void )
 							m_structureTimer = m_structureTimer/TheAI->getAiData()->m_structuresWealthyMod;
 						}
 						m_frameLastBuildingBuilt = TheGameLogic->getFrame();
-						// only build one building per delay loop
-						break;
-					} // bldg built
-				} // have money
-			} // rebuild delay ok
+					}
+				}
+			}
 #endif
 		}
 	}
@@ -317,7 +311,7 @@ void AISkirmishPlayer::onUnitProduced( Object *factory, Object *unit )
 /**
  * Search the computer player's buildings for one that can build the given request
  * and start training the unit.
- * If busyOK is true, it will queue a unit even if one is building.  This lets 
+ * If busyOK is true, it will queue a unit even if one is building.  This lets
  * script invoked teams "push" to the front of the queue.
  */
 Bool AISkirmishPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString teamName)
@@ -327,7 +321,7 @@ Bool AISkirmishPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString
 	{
 		ProductionUpdateInterface *pu = factory->getProductionUpdateInterface();
 		if (pu && pu->queueCreateUnit( order->m_thing, pu->requestUniqueUnitID() )) {
-			order->m_factoryID = factory->getID(); 
+			order->m_factoryID = factory->getID();
 			if (TheGlobalData->m_debugAI) {
 				AsciiString teamStr = "Queuing ";
 				teamStr.concat(order->m_thing->getName());
@@ -337,7 +331,7 @@ Bool AISkirmishPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString
 			}
 			return true;
 		}
-	}  // end if
+	}
 
 	return FALSE;
 
@@ -355,7 +349,7 @@ Bool AISkirmishPlayer::isAGoodIdeaToBuildTeam( TeamPrototype *proto )
 	}
 	// check build limit
 	if (proto->countTeamInstances() >= proto->getTemplateInfo()->m_maxInstances){
-		if (TheGlobalData->m_debugAI) {	
+		if (TheGlobalData->m_debugAI) {
 			AsciiString str;
 			str.format("Team %s not chosen - %d already exist.", proto->getName().str(), proto->countTeamInstances());
 			TheScriptEngine->AppendDebugMessage(str, false);
@@ -372,7 +366,7 @@ Bool AISkirmishPlayer::isAGoodIdeaToBuildTeam( TeamPrototype *proto )
 	}
 	Bool needMoney;
 	if (!isPossibleToBuildTeam( proto, true, needMoney)) {
-		if (TheGlobalData->m_debugAI) {	
+		if (TheGlobalData->m_debugAI) {
 			AsciiString str;
 			if (needMoney) {
 				str.format("Team %s not chosen - Not enough money.", proto->getName().str());
@@ -399,11 +393,11 @@ Bool AISkirmishPlayer::selectTeamToReinforce( Int minPriority )
  */
 Bool AISkirmishPlayer::selectTeamToBuild( void )
 {
-	return AIPlayer::selectTeamToBuild();	
+	return AIPlayer::selectTeamToBuild();
 }
 
-/** 
-	Build a specific building.  
+/**
+	Build a specific building.
 	*/
 void AISkirmishPlayer::buildSpecificAIBuilding(const AsciiString &thingName)
 {
@@ -412,13 +406,13 @@ void AISkirmishPlayer::buildSpecificAIBuilding(const AsciiString &thingName)
 	Bool foundUnbuilt = false;
 	for( BuildListInfo *info = m_player->getBuildList(); info; info = info->getNext() )
 	{
-		if (info->getTemplateName()==thingName) 
+		if (info->getTemplateName()==thingName)
 		{
 			AsciiString name = info->getTemplateName();
 			if (name.isEmpty()) continue;
 			const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( name );
-			if (!bldgPlan) {																											 
-				DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.\n", name.str()));
+			if (!bldgPlan) {
+				DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.", name.str()));
 				continue;
 			}
 			Object *bldg = TheGameLogic->findObjectByID( info->getObjectID() );
@@ -433,30 +427,30 @@ void AISkirmishPlayer::buildSpecificAIBuilding(const AsciiString &thingName)
 			info->markPriorityBuild();
 			break;
 		}
-	}	
+	}
 	if (foundUnbuilt) {
 		m_buildDelay = 0;
 		AsciiString buildingStr = "Queueing building '";
 		buildingStr.concat(thingName);
 		buildingStr.concat("' for construction.");
-		TheScriptEngine->AppendDebugMessage(buildingStr, false); 
+		TheScriptEngine->AppendDebugMessage(buildingStr, false);
 	}	else if (found) {
 		AsciiString buildingStr = "Warning - all instances of building '";
 		buildingStr.concat(thingName);
 		buildingStr.concat("' are already built or queued for build, not queueing.");
-		TheScriptEngine->AppendDebugMessage(buildingStr, false); 
+		TheScriptEngine->AppendDebugMessage(buildingStr, false);
 	}	else {
 		AsciiString buildingStr = "Error - could not find building '";
 		buildingStr.concat(thingName);
 		buildingStr.concat("' in the building template list.");
-		TheScriptEngine->AppendDebugMessage(buildingStr, false); 
+		TheScriptEngine->AppendDebugMessage(buildingStr, false);
 	}
 }
 
 
 
-/** 
-	Gets the player index of my enemy.  
+/**
+	Gets the player index of my enemy.
 	*/
 Int AISkirmishPlayer::getMyEnemyPlayerIndex(void) {
 	Int playerNdx;
@@ -472,8 +466,8 @@ Int AISkirmishPlayer::getMyEnemyPlayerIndex(void) {
 	return playerNdx;
 }
 
-/** 
-	Get the AI's enemy.  Recalc if it has been a while (5 seconds.)  
+/**
+	Get the AI's enemy.  Recalc if it has been a while (5 seconds.)
 */
 void AISkirmishPlayer::acquireEnemy(void)
 {
@@ -506,7 +500,7 @@ void AISkirmishPlayer::acquireEnemy(void)
 			if (inBadShape) {
 				curDistSqr = HUGE_DIST*HUGE_DIST*0.5f;
 			}
-			// See if other ai's are attacking this target.  
+			// See if other ai's are attacking this target.
 			// We don't want the ai's to gang up on one enemy.
 			Int k;
 			for (k=0; k<ThePlayerList->getPlayerCount(); k++) {
@@ -515,7 +509,7 @@ void AISkirmishPlayer::acquireEnemy(void)
 				if (somePlayer->isSkirmishAIPlayer() && (somePlayer->getCurrentEnemy()==curPlayer)) {
 					// Some ai is already targeting this guy.  Add a distance penalty.
 					curDistSqr += (500*500);
-				}	
+				}
 				if (somePlayer->isSkirmishAIPlayer() && (somePlayer->getCurrentEnemy()==m_player)) {
 					// he is attacking me.  So I will (gently) prefer to attack him.
 					curDistSqr -= (25*25);
@@ -541,8 +535,8 @@ void AISkirmishPlayer::acquireEnemy(void)
 
 
 
-/** 
-	Get the AI's enemy.  Recalc if it has been a while (20 seconds.)  
+/**
+	Get the AI's enemy.  Recalc if it has been a while (20 seconds.)
 */
 Player *AISkirmishPlayer::getAiEnemy(void)
 {
@@ -553,8 +547,8 @@ Player *AISkirmishPlayer::getAiEnemy(void)
 	return m_currentEnemy;
 }
 
-/** 
-	Build base defense structures on the front or flank of the base.  
+/**
+	Build base defense structures on the front or flank of the base.
 */
 void AISkirmishPlayer::buildAIBaseDefense(Bool flank)
 {
@@ -572,14 +566,14 @@ void AISkirmishPlayer::buildAIBaseDefense(Bool flank)
 	}
 }
 
-/** 
-	Build base defense structures on the front or flank of the base.  
+/**
+	Build base defense structures on the front or flank of the base.
 	Base defenses are placed as follows:
 	m_baseCenter and m_baseRadius are calculated on map load.
 	Defenses are placed along the this circle.
-	Front defenses (!flank) are placed starting at the "Center" approach path.  
+	Front defenses (!flank) are placed starting at the "Center" approach path.
 	The first front defense is placed towards th Center path.  Number 2 is placed
-	to the left of #1, #3 is placed to the right of #1, #4 is placed to the left of 
+	to the left of #1, #3 is placed to the right of #1, #4 is placed to the left of
 	#2 and so on.  So it looks like:
 
 												#1
@@ -588,8 +582,8 @@ void AISkirmishPlayer::buildAIBaseDefense(Bool flank)
 		  #8																	#9
 
 	The flank base defenses cover the "Flank" approach, and the "Backdoor" approach.
-	They alternate between these two, so the first flank defense covers flank, and the second 
-	covers backdoor, and continue to alternate.  They cover the approach using the same 
+	They alternate between these two, so the first flank defense covers flank, and the second
+	covers backdoor, and continue to alternate.  They cover the approach using the same
 	pattern as front above.
 	John A.
 
@@ -672,12 +666,15 @@ void AISkirmishPlayer::buildAIBaseDefenseStructure(const AsciiString &thingName,
 		Real s = sin(angle);
 		Real c = cos(angle);
 
-	  DEBUG_LOG(("Angle is %f sin %f, cos %f \n", 180*angle/PI, s, c));
-		DEBUG_LOG(("Offset is %f  %f, new is %f, %f \n", 
-			offset.x, offset.y, 
+// TheSuperHackers @info helmutbuhler 21/04/2025 This debug mutates the code to become CRC incompatible
+#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC
+		DEBUG_LOG(("Angle is %f sin %f, cos %f ", 180*angle/PI, s, c));
+		DEBUG_LOG(("Offset is %f  %f, new is %f, %f ",
+			offset.x, offset.y,
 			offset.x*c - offset.y*s,
 			offset.y*c + offset.x*s
-			));	
+			));
+#endif
 		Coord3D buildPos = m_baseCenter;
 		buildPos.x += offset.x*c - offset.y*s;
 		buildPos.y += offset.y*c + offset.x*s;
@@ -685,7 +682,7 @@ void AISkirmishPlayer::buildAIBaseDefenseStructure(const AsciiString &thingName,
 		/* See if we can build there. */
 		Bool canBuild;
 		Real placeAngle = tTemplate->getPlacementViewAngle();
-		canBuild = LBC_OK == TheBuildAssistant->isLocationLegalToBuild(&buildPos, tTemplate, placeAngle, 
+		canBuild = LBC_OK == TheBuildAssistant->isLocationLegalToBuild(&buildPos, tTemplate, placeAngle,
 			BuildAssistant::TERRAIN_RESTRICTIONS|BuildAssistant::NO_OBJECT_OVERLAP, NULL, m_player);
 		TheTerrainVisual->removeAllBibs();	// isLocationLegalToBuild adds bib feedback, turn it off.  jba.
 		if (flank) {
@@ -702,7 +699,7 @@ void AISkirmishPlayer::buildAIBaseDefenseStructure(const AsciiString &thingName,
 }
 
 
-/** 
+/**
 	Checks bridges along a waypoint path.  If any are destroyed, sends a dozer to fix, and returns true.
 	If there is no bridge problem, returns false.
 	*/
@@ -710,7 +707,7 @@ Bool AISkirmishPlayer::checkBridges(Object *unit, Waypoint *way)
 {
 	Coord3D unitPos = *unit->getPosition();
 	AIUpdateInterface *ai = unit->getAI();
-	if (!ai) return false; // no ai 
+	if (!ai) return false; // no ai
 	const LocomotorSet& locoSet = ai->getLocomotorSet();
 	Waypoint *curWay;
 	for (curWay = way; curWay; curWay = curWay->getNext()) {
@@ -728,7 +725,7 @@ Bool AISkirmishPlayer::checkBridges(Object *unit, Waypoint *way)
 }
 
 
-/** 
+/**
 	Build a specific team.  If priorityBuild, put at front of queue with priority set.
 	*/
 void AISkirmishPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool priorityBuild)
@@ -737,7 +734,7 @@ void AISkirmishPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool prior
 }
 
 
-/** 
+/**
 	Recruit a specific team, within the specific radius of the home position.
 	*/
 void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadius)
@@ -747,17 +744,17 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr
 	// Create "Team in queue" based on team population
 	//
 	if (teamProto)
-	{	
+	{
 		if (teamProto->getIsSingleton()) {
 			Team *singletonTeam = TheTeamFactory->findTeam( teamProto->getName() );
 			if (singletonTeam && singletonTeam->hasAnyObjects()) {
 				AsciiString teamStr = "Unable to recruit singleton team '";
 				teamStr.concat("' because team already exists.");
-				TheScriptEngine->AppendDebugMessage(teamStr, false); 
+				TheScriptEngine->AppendDebugMessage(teamStr, false);
 				return;
 			}
 		}
-		if (!teamProto->getTemplateInfo()->m_hasHomeLocation) 
+		if (!teamProto->getTemplateInfo()->m_hasHomeLocation)
 		{
 			AsciiString teamStr = "Error : team '";
 			teamStr.concat(teamProto->getName());
@@ -766,7 +763,7 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr
 		}
 		// create inactive team to place members into as they are built
 		// when team is complete, the team is activated
-		Team *theTeam = TheTeamFactory->createInactiveTeam( teamProto->getName() ); 
+		Team *theTeam = TheTeamFactory->createInactiveTeam( teamProto->getName() );
 		AsciiString teamName = teamProto->getName();
 		teamName.concat(" - Recruiting.");
 		TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -783,7 +780,7 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr
 				int count = unitInfo[i].maxUnits;
 				while (count>0) {
 					Object *unit = theTeam->tryToRecruit(thing, &teamProto->getTemplateInfo()->m_homeLocation, recruitRadius);
-					if (unit) 
+					if (unit)
 					{
 						unitsRecruited++;
 
@@ -799,12 +796,12 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr
 						unit->setTeam(theTeam);
 
 						AIUpdateInterface *ai = unit->getAIUpdateInterface();
-						if (ai) 
+						if (ai)
 						{
 #ifdef DEBUG_LOGGING
 							Coord3D pos = *unit->getPosition();
 							Coord3D to = teamProto->getTemplateInfo()->m_homeLocation;
-							DEBUG_LOG(("Moving unit from %f,%f to %f,%f\n", pos.x, pos.y , to.x, to.y ));
+							DEBUG_LOG(("Moving unit from %f,%f to %f,%f", pos.x, pos.y , to.x, to.y ));
 #endif
 							ai->aiMoveToPosition( &teamProto->getTemplateInfo()->m_homeLocation, CMD_FROM_AI);
 						}
@@ -815,7 +812,7 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr
 				}
 			}
 		}
-		if (unitsRecruited>0) 
+		if (unitsRecruited>0)
 		{
 			/* We have something to build. */
 			TeamInQueue *team = newInstance(TeamInQueue);
@@ -824,7 +821,7 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr
 			team->m_priorityBuild = false;
 			team->m_workOrders = NULL;
 			team->m_frameStarted = TheGameLogic->getFrame();
-			team->m_team = theTeam; 
+			team->m_team = theTeam;
 			AsciiString teamName = teamProto->getName();
 			teamName.concat(" - Finished recruiting.");
 			TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -875,7 +872,7 @@ void AISkirmishPlayer::doBaseBuilding( void )
 		}
 		// This timer is to keep from banging on the logic each frame.  If something interesting
 		// happens, like a building is added or a unit finished, the timers are shortcut.
-		m_buildDelay--;		
+		m_buildDelay--;
 		if (m_buildDelay<1) {
 			if (m_readyToBuildStructure) {
 				processBaseBuilding();
@@ -957,11 +954,11 @@ void AISkirmishPlayer::adjustBuildList(BuildListInfo *list)
 {
 	Bool foundStart = false;
 	Coord3D startPos;
-	
+
 	// Find our command center location.
 	Object *obj;
 	for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() )
-	{	
+	{
 
 		Player *owner = obj->getControllingPlayer();
 		if (owner==m_player) {
@@ -977,7 +974,7 @@ void AISkirmishPlayer::adjustBuildList(BuildListInfo *list)
 		}
 	}
 	if (!foundStart) {
-		DEBUG_LOG(("Couldn't find starting command center for ai player.\n"));
+		DEBUG_LOG(("Couldn't find starting command center for ai player."));
 		return;
 	}
 	// Find the location of the command center in the build list.
@@ -1029,7 +1026,7 @@ void AISkirmishPlayer::adjustBuildList(BuildListInfo *list)
 			case 8 : angle = PI; break; // 180 degrees.
 		}
 	}
-	
+
 	angle += 3*PI/4;
 
 	Real s = sin(angle);
@@ -1043,12 +1040,12 @@ void AISkirmishPlayer::adjustBuildList(BuildListInfo *list)
 			Coord3D curPos = *cur->getLocation();
 			// Transform to new coords.
 			curPos.x -= buildPos.x;
-			curPos.y -= buildPos.y;	 
+			curPos.y -= buildPos.y;
 			Real newX = curPos.x*c - curPos.y*s;
 			Real newY = curPos.y*c + curPos.x*s;
 			curPos.x = newX + startPos.x;
 			curPos.y = newY + startPos.y;
-			cur->setLocation(curPos);	 
+			cur->setLocation(curPos);
 			cur->setAngle(cur->getAngle());
 		}
 		cur = cur->getNext();
@@ -1068,7 +1065,7 @@ void AISkirmishPlayer::newMap( void )
 
 	/* Get our proper build list. */
 	AsciiString mySide = m_player->getSide();
-	DEBUG_LOG(("AI Player side is %s\n", mySide.str()));
+	DEBUG_LOG(("AI Player side is %s", mySide.str()));
 	const AISideBuildList *build = TheAI->getAiData()->m_sideBuildLists;
 	while (build) {
 		if (build->m_side == mySide) {
@@ -1080,7 +1077,7 @@ void AISkirmishPlayer::newMap( void )
 		}
 		build = build->m_next;
 	}
-	DEBUG_ASSERTLOG(build!=NULL, ("Couldn't find build list for skirmish player.\n"));
+	DEBUG_ASSERTLOG(build!=NULL, ("Couldn't find build list for skirmish player."));
 
 	// Build any with the initially built flag.
 	for( BuildListInfo *info = m_player->getBuildList(); info; info = info->getNext() )
@@ -1088,8 +1085,8 @@ void AISkirmishPlayer::newMap( void )
 		AsciiString name = info->getTemplateName();
 		if (name.isEmpty()) continue;
 		const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( name );
-		if (!bldgPlan) {																											 
-			DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.\n", name.str()));
+		if (!bldgPlan) {
+			DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.", name.str()));
 			continue;
 		}
 		if (info->isInitiallyBuilt()) {
@@ -1173,7 +1170,7 @@ void AISkirmishPlayer::computeSuperweaponTarget(const SpecialPowerTemplate *powe
 void AISkirmishPlayer::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1215,7 +1212,7 @@ void AISkirmishPlayer::xfer( Xfer *xfer )
 	// right flank right defense angle
 	xfer->xferReal( &m_curRightFlankRightDefenseAngle );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1223,5 +1220,5 @@ void AISkirmishPlayer::xfer( Xfer *xfer )
 void AISkirmishPlayer::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
index 79440b85e71..9207bb5f34b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
@@ -25,7 +25,7 @@
 // AIStates.cpp
 // Implementation of AI behavior states
 // Author: Michael S. Booth, January 2002
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/ActionManager.h"
@@ -66,18 +66,13 @@
 #include "GameLogic/Module/ContainModule.h"
 #include "GameLogic/Module/PhysicsUpdate.h"
 #include "GameLogic/Module/StealthUpdate.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static Bool cannotPossiblyAttackObject( State *thisState, void* userData );
 
 //----------------------------------------------------------------------------------------------------------
-AICommandParms::AICommandParms(AICommandType cmd, CommandSourceType cmdSource) : 
+AICommandParms::AICommandParms(AICommandType cmd, CommandSourceType cmdSource) :
 	m_cmd(cmd),
-	m_cmdSource(cmdSource), 
+	m_cmdSource(cmdSource),
 	m_obj(NULL),
 	m_otherObj(NULL),
 	m_team(NULL),
@@ -86,7 +81,7 @@ AICommandParms::AICommandParms(AICommandType cmd, CommandSourceType cmdSource) :
 	m_intValue(0),
 	m_commandButton(NULL),
 	m_path(NULL)
-{ 
+{
 		m_pos.zero();
 		m_coords.clear();
 }
@@ -101,8 +96,8 @@ void AICommandParmsStorage::store(const AICommandParms& parms)
   m_otherObj = parms.m_otherObj ? parms.m_otherObj->getID() : INVALID_ID;
   m_teamName = parms.m_team ? parms.m_team->getName() : AsciiString::TheEmptyString;
 	m_coords = parms.m_coords;
-  m_waypoint = parms.m_waypoint; 
-  m_polygon = parms.m_polygon;     
+  m_waypoint = parms.m_waypoint;
+  m_polygon = parms.m_polygon;
   m_intValue = parms.m_intValue;       /// misc usage
   m_damage = parms.m_damage;
 	m_commandButton = parms.m_commandButton;
@@ -128,7 +123,7 @@ void AICommandParmsStorage::reconstitute(AICommandParms& parms) const
 }
 
 //----------------------------------------------------------------------------------------------------------
-void AICommandParmsStorage::doXfer(Xfer *xfer) 
+void AICommandParmsStorage::doXfer(Xfer *xfer)
 {
 	xfer->xferUser(&m_cmd, sizeof(m_cmd));
 	xfer->xferUser(&m_cmd, sizeof(m_cmdSource));
@@ -171,7 +166,7 @@ void AICommandParmsStorage::doXfer(Xfer *xfer)
 		if (triggerName.isNotEmpty()) {
 			m_polygon = TheTerrainLogic->getTriggerAreaByName(triggerName);
 		}
-	} 
+	}
 
 	xfer->xferInt(&m_intValue);
 
@@ -234,19 +229,19 @@ static Bool isSamePosition( const Coord3D *ourPos, const Coord3D *prevTargetPos,
 void AttackStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void AttackStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -254,17 +249,17 @@ void AttackStateMachine::xfer( Xfer *xfer )
 void AttackStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 static Bool inWeaponRangeObject(State *thisState, void* userData);
 
 //----------------------------------------------------------------------------------------------------------
 /**
- * Create an AI state machine. Define all of the states the machine 
+ * Create an AI state machine. Define all of the states the machine
  * can possibly be in, and set the initial (default) state.
  */
-AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiString name, Bool follow, Bool attackingObject, Bool forceAttacking ) 
+AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiString name, Bool follow, Bool attackingObject, Bool forceAttacking )
 	: StateMachine( obj, name )
 {
 	// we want to use the CONTINUE mode (not NEW) since we already have acquired the target.
@@ -273,7 +268,7 @@ AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiSt
 		StateConditionInfo(outOfWeaponRangeObject, AttackStateMachine::CHASE_TARGET, NULL),
 		StateConditionInfo(wantToSquishTarget, AttackStateMachine::CHASE_TARGET, NULL),
 		StateConditionInfo(cannotPossiblyAttackObject, EXIT_MACHINE_WITH_FAILURE, (void*)ATTACK_CONTINUED_TARGET),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// we want to use the CONTINUE mode (not NEW) since we already have acquired the target.
@@ -282,15 +277,15 @@ AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiSt
 		StateConditionInfo(outOfWeaponRangeObject, AttackStateMachine::CHASE_TARGET, NULL),
 		StateConditionInfo(cannotPossiblyAttackObject, EXIT_MACHINE_WITH_FAILURE, (void*)ATTACK_CONTINUED_TARGET_FORCED),
 		StateConditionInfo(wantToSquishTarget, AttackStateMachine::CHASE_TARGET, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	const StateConditionInfo* objectConditions = forceAttacking ? objectConditionsForced : objectConditionsNormal;
 
-	static const StateConditionInfo positionConditions[] = 
+	static const StateConditionInfo positionConditions[] =
 	{
 		StateConditionInfo(outOfWeaponRangePosition, AttackStateMachine::CHASE_TARGET, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 #ifdef STATE_MACHINE_DEBUG
@@ -299,19 +294,19 @@ AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiSt
 		if (attackingObject) fullName.concat(" object");
 		setName(fullName);
 		//setDebugOutput(true);
-#endif 
+#endif
 
 	// order matters: first state is the default state.
 	// The default is Aim rather than Approach so things that cannot move will be able to shoot
 	// things that are in range.  Things that cannot move will automatically FAILURE on approach state.
 	/*
-		This state will succeed when we are aiming a useful weapon at the victim, and fail 
+		This state will succeed when we are aiming a useful weapon at the victim, and fail
 		if the victim is dead. (Exception: if the weapon is on a turret, we don't leave this
 		state unless we get out of range.)
 	*/
-	defineState(	AttackStateMachine::AIM_AT_TARGET, 
-								newInstance(AIAttackAimAtTargetState)( this, attackingObject, forceAttacking ), 
-								AttackStateMachine::FIRE_WEAPON, 
+	defineState(	AttackStateMachine::AIM_AT_TARGET,
+								newInstance(AIAttackAimAtTargetState)( this, attackingObject, forceAttacking ),
+								AttackStateMachine::FIRE_WEAPON,
 								EXIT_MACHINE_WITH_FAILURE,
 								attackingObject ? objectConditions : positionConditions );
 
@@ -320,7 +315,7 @@ AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiSt
 		if unable to fire. However, it may be unable to fire because the target object
 		is already dead.
 	*/
-	defineState( AttackStateMachine::FIRE_WEAPON, 
+	defineState( AttackStateMachine::FIRE_WEAPON,
 								newInstance(AIAttackFireWeaponState)( this, att ),
 								AttackStateMachine::AIM_AT_TARGET,
 								AttackStateMachine::AIM_AT_TARGET,
@@ -334,56 +329,56 @@ AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiSt
 			static const StateConditionInfo portableStructureChaseConditions[] =
 			{
 				StateConditionInfo(inWeaponRangeObject, AttackStateMachine::AIM_AT_TARGET, NULL),
-				StateConditionInfo(NULL, NULL, NULL)	// keep last
+				StateConditionInfo(NULL, NULL, NULL)
 			};
 
-			/* we're a rider on a mobile object, so we can't control our motion. 
+			/* we're a rider on a mobile object, so we can't control our motion.
 				just make bogus states that always fall back into "aim".
 			*/
-			defineState(	AttackStateMachine::CHASE_TARGET, 
-										newInstance(ContinueState)(this), 
-										EXIT_MACHINE_WITH_FAILURE, 
+			defineState(	AttackStateMachine::CHASE_TARGET,
+										newInstance(ContinueState)(this),
+										EXIT_MACHINE_WITH_FAILURE,
 										EXIT_MACHINE_WITH_FAILURE,
 										portableStructureChaseConditions );
 		}
-		else if (attackingObject) 
+		else if (attackingObject)
 		{
 			/*
-				This state will pursue a target that is moving away from it.  If it is not moving away, 
+				This state will pursue a target that is moving away from it.  If it is not moving away,
 				it will drop into the AIAttackApproachTarget state.
 			*/
-			defineState(	AttackStateMachine::CHASE_TARGET, 
-										newInstance(AIAttackPursueTargetState)( this, follow, attackingObject, forceAttacking ), 
-										AttackStateMachine::APPROACH_TARGET, 
+			defineState(	AttackStateMachine::CHASE_TARGET,
+										newInstance(AIAttackPursueTargetState)( this, follow, attackingObject, forceAttacking ),
+										AttackStateMachine::APPROACH_TARGET,
 										AttackStateMachine::APPROACH_TARGET );
 
 			/*
-				This state will succeed when we have a useful weapon within range of victim, and fail 
+				This state will succeed when we have a useful weapon within range of victim, and fail
 				if the victim is dead
 			*/
-			defineState(	AttackStateMachine::APPROACH_TARGET, 
-										newInstance(AIAttackApproachTargetState)( this, follow, attackingObject, forceAttacking ), 
-										AttackStateMachine::AIM_AT_TARGET, 
+			defineState(	AttackStateMachine::APPROACH_TARGET,
+										newInstance(AIAttackApproachTargetState)( this, follow, attackingObject, forceAttacking ),
+										AttackStateMachine::AIM_AT_TARGET,
 										EXIT_MACHINE_WITH_FAILURE );
-		}	
-		else 
+		}
+		else
 		{
 			/*
-				This state will succeed when we have a useful weapon within range of victim, and fail 
+				This state will succeed when we have a useful weapon within range of victim, and fail
 				if the victim is dead
 			*/
-			defineState(	AttackStateMachine::CHASE_TARGET, 
-										newInstance(AIAttackApproachTargetState)( this, follow, attackingObject, forceAttacking ), 
-										AttackStateMachine::AIM_AT_TARGET, 
+			defineState(	AttackStateMachine::CHASE_TARGET,
+										newInstance(AIAttackApproachTargetState)( this, follow, attackingObject, forceAttacking ),
+										AttackStateMachine::AIM_AT_TARGET,
 										EXIT_MACHINE_WITH_FAILURE );
 
 			/*
-				This state will succeed when we have a useful weapon within range of victim, and fail 
+				This state will succeed when we have a useful weapon within range of victim, and fail
 				if the victim is dead
 			*/
-			defineState(	AttackStateMachine::APPROACH_TARGET, 
-										newInstance(AIAttackApproachTargetState)( this, follow, attackingObject, forceAttacking ), 
-										AttackStateMachine::AIM_AT_TARGET, 
+			defineState(	AttackStateMachine::APPROACH_TARGET,
+										newInstance(AIAttackApproachTargetState)( this, follow, attackingObject, forceAttacking ),
+										AttackStateMachine::AIM_AT_TARGET,
 										EXIT_MACHINE_WITH_FAILURE );
 		}
 
@@ -393,9 +388,9 @@ AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiSt
 		/*
 			This state always instantly fails, so when immobile things transition here, we bail.
 		*/
-		defineState(	AttackStateMachine::CHASE_TARGET, 
-									newInstance(FailureState)(this), 
-									EXIT_MACHINE_WITH_FAILURE, 
+		defineState(	AttackStateMachine::CHASE_TARGET,
+									newInstance(FailureState)(this),
+									EXIT_MACHINE_WITH_FAILURE,
 									EXIT_MACHINE_WITH_FAILURE );
 	}
 
@@ -465,8 +460,8 @@ static Int killEnemiesInContainer(Object* killer, Object* bldg, Int maxToKill)
 
 //-----------------------------------------------------------------------------------------------------------
 //-----------------------------------------------------------------------------------------------------------
-AIRappelState::AIRappelState( StateMachine *machine ) : State( machine, "AIRappelState" ) 
-{ 
+AIRappelState::AIRappelState( StateMachine *machine ) : State( machine, "AIRappelState" )
+{
 }
 
 //-----------------------------------------------------------------------------------------------------------
@@ -475,7 +470,7 @@ AIRappelState::AIRappelState( StateMachine *machine ) : State( machine, "AIRappe
 // ------------------------------------------------------------------------------------------------
 void AIRappelState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -486,18 +481,18 @@ void AIRappelState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
 	xfer->xferReal(&m_rappelRate);
 	xfer->xferReal(&m_destZ);
 	xfer->xferBool(&m_targetIsBldg);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIRappelState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 //-----------------------------------------------------------------------------------------------------------
 StateReturnType AIRappelState::onEnter()
 {
@@ -541,7 +536,7 @@ StateReturnType AIRappelState::update()
 {
 
 	StateReturnType result = STATE_CONTINUE;
-	
+
 	Object* obj = getMachineOwner();
 	const Coord3D* pos = obj->getPosition();
 
@@ -553,7 +548,7 @@ StateReturnType AIRappelState::update()
 		m_targetIsBldg = false;
 		m_destZ = TheTerrainLogic->getGroundHeight(pos->x, pos->y);
 	}
-	
+
 	// nuke 2d speed...
 	obj->getPhysics()->scrubVelocity2D(0);
 	// and clamp z speed to rappel rate (gravity will have accelerated us)
@@ -570,7 +565,7 @@ StateReturnType AIRappelState::update()
 		Coord3D tmp = *pos;
 		tmp.z = m_destZ;
 		obj->setPosition(&tmp);
-		
+
 		if (m_targetIsBldg)
 		{
 			DEBUG_ASSERTCRASH(TheActionManager->canEnterObject(obj, bldg, obj->getAI()->getLastCommandSource(), COMBATDROP_INTO), ("Hmm, this seems unlikely"));
@@ -578,18 +573,18 @@ StateReturnType AIRappelState::update()
 			// otherwise we enter the bldg.
 			const Int MAX_TO_KILL = 2;
 			Int numKilled = killEnemiesInContainer(obj, bldg, MAX_TO_KILL);
-			
+
 			if (numKilled > 0)
 			{
 				const FXList* fx = obj->getTemplate()->getPerUnitFX("CombatDropKillFX");
 				FXList::doFXObj(fx, bldg, NULL);
-				DEBUG_LOG(("Killing %d enemies in combat drop!\n",numKilled));
+				DEBUG_LOG(("Killing %d enemies in combat drop!",numKilled));
 			}
 
 			if (numKilled == MAX_TO_KILL)
 			{
 				obj->kill();
-				DEBUG_LOG(("Killing SELF in combat drop!\n"));
+				DEBUG_LOG(("Killing SELF in combat drop!"));
 			}
 			else
 			{
@@ -602,10 +597,10 @@ StateReturnType AIRappelState::update()
 					// this can legitimately happen if you drop into a full (or nearly full) building.
 					// let's just place the guy on the ground nearby, since it sucks to fall from the top of a building.
 					Real exitAngle = bldg->getOrientation();
-					// Garrison doesn't have reserveDoor or exitDelay, so if we do nothing, everyone will appear on top 
+					// Garrison doesn't have reserveDoor or exitDelay, so if we do nothing, everyone will appear on top
 					// of each other and get stuck inside each others' extent (except for the first guy).  So we'll
 					// scatter the start point around a little to make it better.
-					Real offset = min(obj->getGeometryInfo().getBoundingCircleRadius(), 
+					Real offset = min(obj->getGeometryInfo().getBoundingCircleRadius(),
 														bldg->getGeometryInfo().getBoundingCircleRadius());
 					Real angle = GameLogicRandomValueReal( PI, 2*PI );//Downish.
 					Coord3D startPosition = *bldg->getPosition();
@@ -615,7 +610,7 @@ StateReturnType AIRappelState::update()
 
 					obj->setPosition( &startPosition );
 					obj->setOrientation( exitAngle );
-					
+
 					FindPositionOptions options;
 					options.startAngle = (Real)(1.5 * PI);//Down.
 					options.maxRadius = 200;
@@ -673,8 +668,8 @@ void AIRappelState::onExit( StateExitType status )
 */
 AIStateMachine::AIStateMachine( Object *obj, AsciiString name ) : StateMachine( obj, name )
 {
-	DEBUG_ASSERTCRASH(getOwner(), ("An AI State Machine '%s' was constructed without an owner, please tell JKMCD", name));
-	DEBUG_ASSERTCRASH(getOwner()->getAI(), ("An AI State Machine '%s' was constructed without an AIUpdateInterface, please tell JKMCD", name));
+	DEBUG_ASSERTCRASH(getOwner(), ("An AI State Machine '%s' was constructed without an owner, please tell JKMCD", name.str()));
+	DEBUG_ASSERTCRASH(getOwner()->getAI(), ("An AI State Machine '%s' was constructed without an AIUpdateInterface, please tell JKMCD", name.str()));
 
 	m_goalPath.clear();
 	m_goalWaypoint = NULL;
@@ -693,7 +688,7 @@ AIStateMachine::AIStateMachine( Object *obj, AsciiString name ) : StateMachine(
 	defineState( AI_ATTACK_MOVE_TO,												newInstance(AIAttackMoveToState)( this ), AI_IDLE, AI_IDLE );
 	defineState( AI_ATTACKFOLLOW_WAYPOINT_PATH_AS_TEAM,					newInstance(AIAttackFollowWaypointPathState)( this, true ), AI_IDLE, AI_IDLE );
 	defineState( AI_ATTACKFOLLOW_WAYPOINT_PATH_AS_INDIVIDUALS,	newInstance(AIAttackFollowWaypointPathState)( this, false ), AI_IDLE, AI_IDLE );
-	
+
 	defineState( AI_FOLLOW_WAYPOINT_PATH_AS_TEAM,					newInstance(AIFollowWaypointPathState)( this, true ), AI_IDLE, AI_IDLE );
 	defineState( AI_FOLLOW_WAYPOINT_PATH_AS_INDIVIDUALS,	newInstance(AIFollowWaypointPathState)( this, false ), AI_IDLE, AI_IDLE );
 	defineState( AI_FOLLOW_WAYPOINT_PATH_AS_TEAM_EXACT,		newInstance(AIFollowWaypointPathExactState)( this, true ), AI_IDLE, AI_IDLE );
@@ -731,10 +726,7 @@ AIStateMachine::AIStateMachine( Object *obj, AsciiString name ) : StateMachine(
 //----------------------------------------------------------------------------------------------------------
 AIStateMachine::~AIStateMachine()
 {
-	if (m_goalSquad) 
-	{
-		deleteInstance(m_goalSquad);
-	}
+	deleteInstance(m_goalSquad);
 }
 
 
@@ -744,7 +736,7 @@ AIStateMachine::~AIStateMachine()
 void AIStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -767,7 +759,7 @@ void AIStateMachine::xfer( Xfer *xfer )
 		if (xfer->getXferMode() != XFER_LOAD)
 		{
 			pos = m_goalPath[i];
-		} 
+		}
 		xfer->xferCoord3D(&pos);
 		if (xfer->getXferMode() == XFER_LOAD)
 		{
@@ -783,7 +775,7 @@ void AIStateMachine::xfer( Xfer *xfer )
 		if (waypointName.isNotEmpty()) {
 			m_goalWaypoint = TheTerrainLogic->getWaypointByName(waypointName);
 		}
-	} 
+	}
 	Bool hasSquad = (m_goalSquad!=NULL);
 	xfer->xferBool(&hasSquad);
 	if (xfer->getXferMode() == XFER_LOAD)
@@ -791,7 +783,7 @@ void AIStateMachine::xfer( Xfer *xfer )
 		if (hasSquad && m_goalSquad==NULL) {
 			m_goalSquad = newInstance( Squad );
 		}
-	} 
+	}
 	if (hasSquad) {
 		xfer->xferSnapshot(m_goalSquad);
 	}
@@ -810,7 +802,7 @@ void AIStateMachine::xfer( Xfer *xfer )
 	}
 
 	xfer->xferUnsignedInt(&m_temporaryStateFramEnd);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -818,7 +810,7 @@ void AIStateMachine::xfer( Xfer *xfer )
 void AIStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 /**
@@ -840,9 +832,9 @@ AsciiString AIStateMachine::getCurrentStateName(void) const
 
 	if (m_temporaryState) {
 		name.concat(" /T/");
-		name.concat(m_temporaryState->getName()); 
+		name.concat(m_temporaryState->getName());
 	}
-	return name;					
+	return name;
 }
 #endif
 
@@ -853,12 +845,12 @@ AsciiString AIStateMachine::getCurrentStateName(void) const
 StateReturnType AIStateMachine::updateStateMachine()
 {
 	//-extraLogging
-	#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+	#if defined(RTS_DEBUG)
 		Bool idle = getOwner()->getAI()->isIdle();
 		if( !idle && TheGlobalData->m_extraLogging )
 			DEBUG_LOG( ("%d - %s::update() start - %s", TheGameLogic->getFrame(), getCurrentStateName().str(), getOwner()->getTemplate()->getName().str() ) );
 	#endif
-	//end -extraLogging 
+	//end -extraLogging
 
 	if (m_temporaryState)
 	{
@@ -870,14 +862,14 @@ StateReturnType AIStateMachine::updateStateMachine()
 				status = STATE_SUCCESS;
 			}
 		}
-		if (status==STATE_CONTINUE)	
+		if (status==STATE_CONTINUE)
 		{
 			//-extraLogging
-			#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+			#if defined(RTS_DEBUG)
 				if( !idle && TheGlobalData->m_extraLogging )
-					DEBUG_LOG( (" - RETURN EARLY STATE_CONTINUE\n") );
+					DEBUG_LOG( (" - RETURN EARLY STATE_CONTINUE") );
 			#endif
-			//end -extraLogging 
+			//end -extraLogging
 
 			return status;
 		}
@@ -886,8 +878,8 @@ StateReturnType AIStateMachine::updateStateMachine()
 	}
 	StateReturnType retType = StateMachine::updateStateMachine();
 
-	//-extraLogging 
-	#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+	//-extraLogging
+	#if defined(RTS_DEBUG)
 		AsciiString result;
 		if( TheGlobalData->m_extraLogging )
 		{
@@ -905,12 +897,12 @@ StateReturnType AIStateMachine::updateStateMachine()
 				default:
 					result.format( "UNKNOWN %d", retType );
 					break;
-			}	
+			}
 			if( !idle )
-				DEBUG_LOG( (" - RETURNING %s\n", result.str() ) );
+				DEBUG_LOG( (" - RETURNING %s", result.str() ) );
 		}
 	#endif
-	//end -extraLogging 
+	//end -extraLogging
 
 	return retType;
 }
@@ -925,22 +917,22 @@ StateReturnType AIStateMachine::setTemporaryState( StateID newStateID, Int frame
 	// extract the state associated with the given ID
 	State *newState = internalGetState( newStateID );
 #ifdef STATE_MACHINE_DEBUG
-	if (getWantsDebugOutput()) 
+	if (getWantsDebugOutput())
 	{
 		StateID curState = INVALID_STATE_ID;
 		if (m_temporaryState) {
 			curState = m_temporaryState->getID();
 		}
-		DEBUG_LOG(("%d '%s' -(TEMP)- '%s' %x exit ", TheGameLogic->getFrame(), getOwner()->getTemplate()->getName().str(), getName().str(), this));
+		DEBUG_LOG_RAW(("%d '%s' -(TEMP)- '%s' %x exit ", TheGameLogic->getFrame(), getOwner()->getTemplate()->getName().str(), getName().str(), this));
 		if (m_temporaryState) {
-			DEBUG_LOG((" '%s' ", m_temporaryState->getName().str()));
+			DEBUG_LOG_RAW((" '%s' ", m_temporaryState->getName().str()));
 		} else {
-			DEBUG_LOG((" INVALID_STATE_ID "));
+			DEBUG_LOG_RAW((" INVALID_STATE_ID "));
 		}
 		if (newState) {
-			DEBUG_LOG(("enter '%s' \n", newState->getName().str()));
+			DEBUG_LOG(("enter '%s'", newState->getName().str()));
 		} else {
-			DEBUG_LOG(("to INVALID_STATE\n"));
+			DEBUG_LOG(("to INVALID_STATE"));
 		}
 	}
 #endif
@@ -962,7 +954,7 @@ StateReturnType AIStateMachine::setTemporaryState( StateID newStateID, Int frame
 		if (frameLimitCoount>FRAME_COUNT_MAX) {
 			frameLimitCoount = FRAME_COUNT_MAX;
 		}
-		m_temporaryStateFramEnd = TheGameLogic->getFrame()+frameLimitCoount; 
+		m_temporaryStateFramEnd = TheGameLogic->getFrame()+frameLimitCoount;
 		return ret;
 	}
 	return STATE_FAILURE;
@@ -973,8 +965,8 @@ StateReturnType AIStateMachine::setTemporaryState( StateID newStateID, Int frame
  * Add a point to a simple path
  */
 void AIStateMachine::addToGoalPath( const Coord3D *pathPoint)
-{	
-	if (m_goalPath.size()==0) {
+{
+	if (m_goalPath.empty()) {
 		m_goalPath.push_back(*pathPoint);
 	}	else {
 		Coord3D *finalPoint = &m_goalPath[ m_goalPath.size() - 1 ];
@@ -999,7 +991,7 @@ const Coord3D *AIStateMachine::getGoalPathPosition( Int i ) const
 
 //----------------------------------------------------------------------------------------------------------
 /**
- * Set the current goal waypoint. If we reach this waypoint and there 
+ * Set the current goal waypoint. If we reach this waypoint and there
  * are connections to further points, continue on.
  */
 void AIStateMachine::setGoalWaypoint( const Waypoint *way )
@@ -1092,7 +1084,7 @@ Squad *AIStateMachine::getGoalSquad( void )
 
 // State transition conditions ----------------------------------------------------------------------------
 /**
- * Return true if the machine's owner's current weapon's range 
+ * Return true if the machine's owner's current weapon's range
  * cannot reach the goalObject.
  */
 Bool outOfWeaponRangeObject( State *thisState, void* userData )
@@ -1101,11 +1093,11 @@ Bool outOfWeaponRangeObject( State *thisState, void* userData )
 	Object *victim = thisState->getMachineGoalObject();
 	Weapon *weapon = obj->getCurrentWeapon();
 
-	CRCDEBUG_LOG(("outOfWeaponRangeObject()\n"));
+	CRCDEBUG_LOG(("outOfWeaponRangeObject()"));
 	if (victim && weapon)
 	{
 		Bool viewBlocked = false;
-		AIUpdateInterface *ai = obj->getAI();	 
+		AIUpdateInterface *ai = obj->getAI();
 		Bool onGround = true;
 		if (ai) {
 			onGround = ai->isDoingGroundMovement();
@@ -1127,21 +1119,21 @@ Bool outOfWeaponRangeObject( State *thisState, void* userData )
 		}
 		// srj sez: at tiny ranges, isAttackViewBlockedByObstacle() can return false positives,
 		// so just skip it for contact weapons
-		if (victim && !weapon->isContactWeapon() && onGround && !victim->isSignificantlyAboveTerrain()) 
+		if (victim && !weapon->isContactWeapon() && onGround && !victim->isSignificantlyAboveTerrain())
 		{
 			viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(obj, *obj->getPosition(), victim, *victim->getPosition());
-		}	 
+		}
 		// A weapon with leech range temporarily has unlimited range and is locked onto its target.
-		if (!weapon->hasLeechRange() && viewBlocked) 
+		if (!weapon->hasLeechRange() && viewBlocked)
 		{
-			//CRCDEBUG_LOG(("outOfWeaponRangeObject() - object %d (%s) view is blocked for attacking %d (%s)\n",
+			//CRCDEBUG_LOG(("outOfWeaponRangeObject() - object %d (%s) view is blocked for attacking %d (%s)",
 			//	obj->getID(), obj->getTemplate()->getName().str(),
 			//	victim->getID(), victim->getTemplate()->getName().str()));
 			return true;
 		}
 		if (!weapon->hasLeechRange() && !weapon->isWithinAttackRange(obj, victim))
 		{
-			//CRCDEBUG_LOG(("outOfWeaponRangeObject() - object %d (%s) is out of range for attacking %d (%s)\n",
+			//CRCDEBUG_LOG(("outOfWeaponRangeObject() - object %d (%s) is out of range for attacking %d (%s)",
 			//	obj->getID(), obj->getTemplate()->getName().str(),
 			//	victim->getID(), victim->getTemplate()->getName().str()));
 			return true;
@@ -1170,7 +1162,7 @@ Bool wantToSquishTarget( State *thisState, void* userData )
 		{
 			// I can only decide to crush-attack if I am attacking with a turreted weapon.
 			if (TheAI->getAiData()->m_aiCrushesInfantry) {
-				if (obj && obj->getControllingPlayer() && 
+				if (obj && obj->getControllingPlayer() &&
 					obj->getControllingPlayer()->getPlayerType()==PLAYER_COMPUTER) {
 					if (obj->canCrushOrSquish(victim)) {
 						if (!obj->isKindOf(KINDOF_DONT_AUTO_CRUSH_INFANTRY)) {
@@ -1215,10 +1207,10 @@ Bool outOfWeaponRangePosition( State *thisState, void* userData )
 		}
 
 		Bool viewBlocked = false;
-		if (onGround) 
+		if (onGround)
 		{
 			viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(obj, *obj->getPosition(), NULL, *pos);
-		}	 
+		}
 		if (viewBlocked)
 		{
 			return true;
@@ -1245,7 +1237,7 @@ static Bool cannotPossiblyAttackObject( State *thisState, void* userData )
 	{
 		if( !obj->isAbleToAttack() )
 		{
-			return TRUE; 
+			return TRUE;
 		}
 		CanAttackResult result = obj->getAbleToAttackSpecificObject( attackType, victim, obj->getAI()->getLastCommandSource() );
 		if( result != ATTACKRESULT_POSSIBLE && result != ATTACKRESULT_POSSIBLE_AFTER_MOVING )
@@ -1265,8 +1257,8 @@ static Bool cannotPossiblyAttackObject( State *thisState, void* userData )
 const UnsignedInt IDLE_COUNTDOWN_DELAY = (LOGICFRAMES_PER_SECOND * 2);
 
 //----------------------------------------------------------------------------------------------
-AIIdleState::AIIdleState( StateMachine *machine, AIIdleState::AIIdleTargetingType shouldLookForTargets ) : 
-	State( machine,"AIIdleState"), 
+AIIdleState::AIIdleState( StateMachine *machine, AIIdleState::AIIdleTargetingType shouldLookForTargets ) :
+	State( machine,"AIIdleState"),
 	m_shouldLookForTargets(shouldLookForTargets == AIIdleState::LOOK_FOR_TARGETS)
 {
 		m_inited = FALSE;
@@ -1278,7 +1270,7 @@ AIIdleState::AIIdleState( StateMachine *machine, AIIdleState::AIIdleTargetingTyp
 // ------------------------------------------------------------------------------------------------
 void AIIdleState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1289,18 +1281,18 @@ void AIIdleState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
 	xfer->xferUnsignedShort(&m_initialSleepOffset);
 	xfer->xferBool(&m_shouldLookForTargets);
 	xfer->xferBool(&m_inited);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIIdleState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 //----------------------------------------------------------------------------------------------
 /**
  * Stake out our space.
@@ -1313,7 +1305,7 @@ StateReturnType AIIdleState::onEnter()
 	AIUpdateInterface *ai = obj->getAI();
 
 	// We could possibly not have ai here if we were constructed this frame. Strange but true. :-<
-	if (ai) 
+	if (ai)
 		ai->resetNextMoodCheckTime();
 
 	m_inited = true;
@@ -1341,7 +1333,7 @@ void AIIdleState::doInitIdleState()
 	const Locomotor* loco = ai->getCurLocomotor();
 	Bool ultraAccurate = (loco != NULL && loco->isUltraAccurate());
 #define NO_STOP_AND_SLIDE
-	if (ai->isIdle() && ai->isDoingGroundMovement()) 
+	if (ai->isIdle() && ai->isDoingGroundMovement())
 	{
 		/*
 
@@ -1349,11 +1341,11 @@ void AIIdleState::doInitIdleState()
 
 			answer from jba:
 
-			If a unit is moving, and you hit stop, it forces it into the idle state.  
-			Depending where it is, it may be between pathfind grids.  
-			This is a bad thing. 
-			So it "cheat moves", to the nearest grid. 
-			Also, for locos the "close enough" distance is 1 or so. 
+			If a unit is moving, and you hit stop, it forces it into the idle state.
+			Depending where it is, it may be between pathfind grids.
+			This is a bad thing.
+			So it "cheat moves", to the nearest grid.
+			Also, for locos the "close enough" distance is 1 or so.
 			So it moves the rest of the way to it's goal location by cheating.
 
 		*/
@@ -1363,7 +1355,7 @@ void AIIdleState::doInitIdleState()
 		if (goalPos.x || goalPos.y || goalPos.z)
 		{
 			TheAI->pathfinder()->updateGoal(obj, &goalPos, obj->getLayer());
-			if (!ultraAccurate && TheAI->pathfinder()->goalPosition(obj, &goalPos)) 
+			if (!ultraAccurate && TheAI->pathfinder()->goalPosition(obj, &goalPos))
 			{
 				if (TheGameLogic->getFrame()<=1) {
 					obj->setPosition(&goalPos);
@@ -1378,7 +1370,7 @@ void AIIdleState::doInitIdleState()
 	}
 
 	ai->setLocomotorGoalNone();
-	ai->setCurrentVictim(NULL);	 
+	ai->setCurrentVictim(NULL);
 }
 
 //----------------------------------------------------------------------------------------------
@@ -1404,10 +1396,10 @@ StateReturnType AIIdleState::update()
 		AIUpdateInterface *ai = obj->getAI();
 
 		// do repulsor logic
-		if (obj->isKindOf(KINDOF_CAN_BE_REPULSED) && ai->isIdle()) 
+		if (obj->isKindOf(KINDOF_CAN_BE_REPULSED) && ai->isIdle())
 		{
 			Object* enemy = TheAI->findClosestRepulsor(obj, obj->getVisionRange());
-			if (enemy) 
+			if (enemy)
 			{
 				getMachine()->setState(AI_MOVE_AWAY_FROM_REPULSORS);
 				// since we just changed the state, it doesn't really matter what we return here.
@@ -1424,7 +1416,7 @@ StateReturnType AIIdleState::update()
 			return STATE_CONTINUE;
 		}
 
-		
+
 		if (! obj->isDisabledByType( DISABLED_PARALYZED ) &&
 				! obj->isDisabledByType( DISABLED_UNMANNED ) &&
 				! obj->isDisabledByType( DISABLED_EMP ) &&
@@ -1436,7 +1428,7 @@ StateReturnType AIIdleState::update()
 			{
 				// If we're supposed to attack based on mood, etc, then we will do so.
 				Object* enemy = ai->getNextMoodTarget( true, true );
-				if (enemy) 
+				if (enemy)
 				{
 	 				ai->aiAttackObject(enemy, NO_MAX_SHOTS_LIMIT, CMD_FROM_AI);
 					// weird but true. return state_continue, because if we're here, we're actually an attack state
@@ -1459,8 +1451,8 @@ StateReturnType AIIdleState::update()
 				m_initialSleepOffset = oldSleepOffset;
 			}
 		}
-	}  // end if, should look for targets
-	
+	}
+
 	return STATE_SLEEP(timeToSleep);
 }
 
@@ -1472,7 +1464,7 @@ StateReturnType AIDeadState::onEnter()
 {
 	Object *obj = getMachineOwner();
 
-	// How can an object be NULL here? I don't think it actually can, but this check must be 
+	// How can an object be NULL here? I don't think it actually can, but this check must be
 	// here for a reason. - jkmcd
 	if (obj)
 	{
@@ -1523,7 +1515,7 @@ StateReturnType AIDeadState::update()
 		if (phys)
 		{
 			// we want 'em to stop, but looks wonky if they stop dead in their tracks in onEnter.
-			// this slows 'em down quickly 
+			// this slows 'em down quickly
 			const Real FACTOR = 0.8f;	// 0.8 ^ 30 == 0.012, so they slow to 4% of speed over 1 sec
 			Real vel = phys->getVelocityMagnitude();
 			phys->scrubVelocity2D(vel * FACTOR);
@@ -1545,7 +1537,7 @@ void AIDeadState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIInternalMoveToState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1556,7 +1548,7 @@ void AIInternalMoveToState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	xfer->xferCoord3D(&m_goalPosition);
 	xfer->xferUser(&m_goalLayer, sizeof(m_goalLayer));
@@ -1565,7 +1557,7 @@ void AIInternalMoveToState::xfer( Xfer *xfer )
 	xfer->xferUnsignedInt(&m_pathTimestamp);
 	xfer->xferUnsignedInt(&m_blockedRepathTimestamp);
 	xfer->xferBool(&m_adjustDestinations);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1573,10 +1565,10 @@ void AIInternalMoveToState::xfer( Xfer *xfer )
 void AIInternalMoveToState::loadPostProcess( void )
 {
 	startMoveSound();
-}  // end loadPostProcess
+}
 
-Bool AIInternalMoveToState::getAdjustsDestination() const 
-{ 
+Bool AIInternalMoveToState::getAdjustsDestination() const
+{
 	const Object *obj = getMachineOwner();
 	if (obj->testStatus(OBJECT_STATUS_PARACHUTING))
 		return false;
@@ -1585,11 +1577,11 @@ Bool AIInternalMoveToState::getAdjustsDestination() const
 	if (ai && !ai->isAllowedToAdjustDestination())
 		return false;
 
-	return m_adjustDestinations; 
+	return m_adjustDestinations;
 }
 
 /**
- * (Re)compute a path to the goal position, if we are on our own, 
+ * (Re)compute a path to the goal position, if we are on our own,
  * or we are the leader of a group.
  */
 Bool AIInternalMoveToState::computePath()
@@ -1599,7 +1591,7 @@ Bool AIInternalMoveToState::computePath()
 
 	m_waitingForPath = true;
 	ai->requestPath(&m_goalPosition, getAdjustsDestination());
-	ai->friend_startingMove(); 
+	ai->friend_startingMove();
 	return true;
 }
 
@@ -1616,13 +1608,13 @@ StateReturnType AIInternalMoveToState::onEnter()
 
 	if (ai->getCurLocomotor()) {
 		ai->getCurLocomotor()->startMove();
-		if (ai->getCurLocomotor()->isUltraAccurate()) 
+		if (ai->getCurLocomotor()->isUltraAccurate())
 		{
 			setAdjustsDestination(false); // if we're being ultra accurate, we can't adjust the destination. jba.
 		}
 	}
 	m_tryOneMoreRepath = true;  // We may try one more repath after the first one is finished.
-	ai->friend_startingMove(); 
+	ai->friend_startingMove();
 
 	// get object physics state
 	PhysicsBehavior *physics = obj->getPhysics();
@@ -1634,23 +1626,23 @@ StateReturnType AIInternalMoveToState::onEnter()
 		//instead of moving.
 		Int cellX = REAL_TO_INT( obj->getPosition()->x / PATHFIND_CELL_SIZE );
 		Int cellY = REAL_TO_INT( obj->getPosition()->y / PATHFIND_CELL_SIZE );
-		
+
 		PathfindCell* cell = TheAI->pathfinder()->getCell( obj->getLayer(), cellX, cellY );
 		ModelConditionFlagType modelConditionFlag = (cell && cell->getType() != PathfindCell::CELL_CLIFF) ? MODELCONDITION_MOVING : MODELCONDITION_CLIMBING;
 		obj->setModelConditionState( modelConditionFlag );
 	}
 	// This is a classic January 2 type of hack
-	// Since the worker can go into its attack modelcondition in AIAttack::OnEnter(), 
-	// it needs to get its moving modelcondition set timely enough to trigger a transition 
+	// Since the worker can go into its attack modelcondition in AIAttack::OnEnter(),
+	// it needs to get its moving modelcondition set timely enough to trigger a transition
 	// from conditionX into ATTACKING|MOVING... Thanks for reading, MLorenzen,  Jan 2, 2003
 	else if ( obj->isKindOf( KINDOF_DOZER ) && obj->isKindOf( KINDOF_HARVESTER ) )
 		obj->setModelConditionState( MODELCONDITION_MOVING );
 
 
 
-	if (getAdjustsDestination()) 
+	if (getAdjustsDestination())
 	{
-		if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) 
+		if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition))
 		{
 			TheAI->pathfinder()->snapClosestGoalPosition(obj, &m_goalPosition);
 		}
@@ -1658,15 +1650,15 @@ StateReturnType AIInternalMoveToState::onEnter()
 	}
 
 	// request a path to the destination
-	if (!computePath()) 
+	if (!computePath())
 	{
 		ai->friend_endingMove();
 		return STATE_FAILURE;
 	}
 
-	// Target to stop at the end of this path.  
+	// Target to stop at the end of this path.
 	// This value will be overriden by the FollowWaypoint ai state.
-	ai->setPathExtraDistance(0); 
+	ai->setPathExtraDistance(0);
 	ai->setDesiredSpeed( FAST_AS_POSSIBLE );
 
 	startMoveSound();
@@ -1683,12 +1675,12 @@ void AIInternalMoveToState::startMoveSound(void)
 	if (objBody && IS_CONDITION_WORSE(objBody->getDamageState(), BODY_DAMAGED))
 	{
 		AudioEventRTS soundEventMoveDamaged = *obj->getTemplate()->getSoundMoveStartDamaged();
-		if (!soundEventMoveDamaged.getEventName().isEmpty()) 
+		if (!soundEventMoveDamaged.getEventName().isEmpty())
 		{
 			soundEventMoveDamaged.setObjectID(obj->getID());
 			TheAudio->addAudioEvent( &soundEventMoveDamaged );
-		} 
-		else 
+		}
+		else
 		{
 			soundEventMoveDamaged = *obj->getTemplate()->getSoundMoveLoopDamaged();
 			if (!soundEventMoveDamaged.getEventName().isEmpty())
@@ -1697,17 +1689,17 @@ void AIInternalMoveToState::startMoveSound(void)
 				m_ambientPlayingHandle = TheAudio->addAudioEvent( &soundEventMoveDamaged );
 			}
 		}
-	} 
-	else 
+	}
+	else
 	{
 		AudioEventRTS soundEventMove = *obj->getTemplate()->getSoundMoveStart();
 		soundEventMove.setObjectID(obj->getID());
 
-		if (!soundEventMove.getEventName().isEmpty()) 
+		if (!soundEventMove.getEventName().isEmpty())
 		{
 			TheAudio->addAudioEvent( &soundEventMove );
-		} 
-		else 
+		}
+		else
 		{
 			soundEventMove = *obj->getTemplate()->getSoundMoveLoop();
 			soundEventMove.setObjectID(obj->getID());
@@ -1735,12 +1727,12 @@ void AIInternalMoveToState::onExit( StateExitType status )
 	// (This is why destructors should not do game logic)
 	if (ai) {
 		ai->friend_endingMove();
-		DEBUG_ASSERTLOG(obj->getTeam(), ("AIInternalMoveToState::onExit obj has NULL team.\n"));
-		if (obj->getTeam() && ai->isDoingGroundMovement() && ai->getCurLocomotor() && 
+		DEBUG_ASSERTLOG(obj->getTeam(), ("AIInternalMoveToState::onExit obj has NULL team."));
+		if (obj->getTeam() && ai->isDoingGroundMovement() && ai->getCurLocomotor() &&
 								ai->getCurLocomotor()->isUltraAccurate()) {
 			Real dx = m_goalPosition.x-obj->getPosition()->x;
 			Real dy = m_goalPosition.y-obj->getPosition()->y;
-			if (dx*dx+dy*dy<PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F) 
+			if (dx*dx+dy*dy<PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F)
 			{
 				// We are doing accurate ground movement, so make sure we end exactly at the goal.
 				ai->setFinalPosition(&m_goalPosition);
@@ -1760,7 +1752,7 @@ StateReturnType AIInternalMoveToState::update()
 	AIUpdateInterface *ai = obj->getAI();
 
 	Path *thePath = ai->getPath();
-	if (m_waitingForPath) 
+	if (m_waitingForPath)
 	{
 		// bump the timer.
 		m_pathTimestamp = TheGameLogic->getFrame();
@@ -1793,17 +1785,17 @@ StateReturnType AIInternalMoveToState::update()
 		blocked = true;
 		m_blockedRepathTimestamp = TheGameLogic->getFrame();
 		// Intense debug logging jba.
-		//DEBUG_LOG(("Info - Blocked - recomputing.\n"));
+		//DEBUG_LOG(("Info - Blocked - recomputing."));
 	}
 
 	//Determine if we are on a cliff cell... if so, use the climbing model condition
 	//instead of moving.
 	Int cellX = REAL_TO_INT( obj->getPosition()->x / PATHFIND_CELL_SIZE );
 	Int cellY = REAL_TO_INT( obj->getPosition()->y / PATHFIND_CELL_SIZE );
-	
+
 	PathfindCell* cell = TheAI->pathfinder()->getCell( obj->getLayer(), cellX, cellY );
 	ModelConditionFlagType setConditionFlag = MODELCONDITION_MOVING;
-	// Totally hacky set of conditions to make col. burton's monkey ass not slide down 
+	// Totally hacky set of conditions to make col. burton's monkey ass not slide down
 	// the cliffs backwards.  This could use some improvement at some point.  jba. 31DEC2002
 	if (cell && cell->getType() == PathfindCell::CELL_CLIFF && !cell->getPinched()) {
 
@@ -1815,11 +1807,11 @@ StateReturnType AIInternalMoveToState::update()
 			obj->clearModelConditionState( MODELCONDITION_RAPPELLING );
 		}
 	}
-	if (ai->getNumFramesBlocked()>LOGICFRAMES_PER_SECOND/4) 
+	if (ai->getNumFramesBlocked()>LOGICFRAMES_PER_SECOND/4)
 	{
 		obj->clearModelConditionState( MODELCONDITION_MOVING );
-	}	
-	else 
+	}
+	else
 	{
 		//Clear climbing if modelConditionFlag is not climbing
 		if( setConditionFlag == MODELCONDITION_MOVING )
@@ -1843,7 +1835,7 @@ StateReturnType AIInternalMoveToState::update()
 		}
 	}
 
-	if (thePath != NULL) 
+	if (thePath != NULL)
 		ai->setLocomotorGoalPositionOnPath();
 
 	// if our goal has moved, recompute our path
@@ -1852,12 +1844,12 @@ StateReturnType AIInternalMoveToState::update()
 		if (forceRecompute || !isSamePosition(obj->getPosition(), &m_pathGoalPosition, &m_goalPosition ))
 		{
 			// goal moved - repath
-			if (!computePath()) 
+			if (!computePath())
 				return STATE_FAILURE;
 
 			// srj sez: must re-set setLocoGoal after computePath, since computePath
 			// can set the loco goal to NONE...
-			if (ai->getPath() != NULL) 
+			if (ai->getPath() != NULL)
 				ai->setLocomotorGoalPositionOnPath();
 			else
 				return STATE_CONTINUE;
@@ -1868,11 +1860,11 @@ StateReturnType AIInternalMoveToState::update()
 	// Check if we have reached our destination
 	//
 	Real onPathDistToGoal = ai->getLocomotorDistanceToGoal();
-	//DEBUG_LOG(("onPathDistToGoal = %f %s\n",onPathDistToGoal, obj->getTemplate()->getName().str()));
+	//DEBUG_LOG(("onPathDistToGoal = %f %s",onPathDistToGoal, obj->getTemplate()->getName().str()));
 	if (ai->getCurLocomotor() && (onPathDistToGoal < ai->getCurLocomotor()->getCloseEnoughDist()))
 	{
 		if (ai->isDoingGroundMovement()) {
-			// sanity check 
+			// sanity check
 			Coord3D delta;
 			Coord3D goalPos = m_goalPosition;
 			if (ai->getPath()->getLastNode()) {
@@ -1882,17 +1874,17 @@ StateReturnType AIInternalMoveToState::update()
 			delta.y = obj->getPosition()->y - goalPos.y;
 			delta.z = 0;
 			if (delta.length() > 4*PATHFIND_CELL_SIZE_F) {
-				//DEBUG_LOG(("AIInternalMoveToState Trying to finish early.  Continuing...\n"));
+				//DEBUG_LOG(("AIInternalMoveToState Trying to finish early.  Continuing..."));
 				onPathDistToGoal = ai->getLocomotorDistanceToGoal();
 				return STATE_CONTINUE;
 			}
 		}
 		// we have reached the end of the path
-		if (getAdjustsDestination()) 
+		if (getAdjustsDestination())
 		{
 			ai->setLocomotorGoalNone();
 		}
-		DEBUG_ASSERTLOG(!getMachine()->getWantsDebugOutput(), ("AIInternalMoveToState::update: reached end of path, exiting state with success\n"));
+		DEBUG_ASSERTLOG(!getMachine()->getWantsDebugOutput(), ("AIInternalMoveToState::update: reached end of path, exiting state with success"));
 		return STATE_SUCCESS;
 	}
 
@@ -1925,19 +1917,19 @@ class AIAttackMoveStateMachine : public StateMachine
 void AIAttackMoveStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void AIAttackMoveStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1945,7 +1937,7 @@ void AIAttackMoveStateMachine::xfer( Xfer *xfer )
 void AIAttackMoveStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //-----------------------------------------------------------------------------------------------------------
 AIAttackMoveStateMachine::AIAttackMoveStateMachine(Object *owner, AsciiString name) : StateMachine(owner, name)
@@ -1965,7 +1957,7 @@ AIAttackMoveStateMachine::~AIAttackMoveStateMachine()
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 
-//  
+//
 // note - has no crc/xfer as has no member vars. jba.
 
 //-------------------------------------------------------------------------------------------------
@@ -1983,9 +1975,9 @@ StateReturnType AIMoveToState::onEnter()
 	//If we have a goal object and are trying to ignore it as an obstacle...
 	//This is used in the case of units trying to get really close.
 	AIUpdateInterface *ai = getMachineOwner()->getAI();
-	if( getMachineGoalObject() ) 
+	if( getMachineGoalObject() )
 	{
-		if( ai && getMachineGoalObject()->getID() == ai->getIgnoredObstacleID() ) 
+		if( ai && getMachineGoalObject()->getID() == ai->getIgnoredObstacleID() )
 		{
 			setAdjustsDestination( false );
 		}
@@ -2063,7 +2055,7 @@ StateReturnType AIMoveToState::update()
 			m_goalPosition.y += dir.y*leadDistance;
 			m_goalPosition.z += dir.z*leadDistance;
 		}
-		//DEBUG_LOG(("update goal pos to %f %f %f\n",m_goalPosition.x,m_goalPosition.y,m_goalPosition.z));
+		//DEBUG_LOG(("update goal pos to %f %f %f",m_goalPosition.x,m_goalPosition.y,m_goalPosition.z));
 	} else {
 		Bool isMissile = obj->isKindOf(KINDOF_PROJECTILE);
 		if (isMissile) {
@@ -2084,7 +2076,7 @@ StateReturnType AIMoveToState::update()
 //----------------------------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------------------------
 
-//  
+//
 // note - has no crc/xfer as has no member vars. jba.
 
 //----------------------------------------------------------------------------------------------------------
@@ -2103,7 +2095,7 @@ StateReturnType AIMoveOutOfTheWayState::onEnter()
 }
 
 //----------------------------------------------------------------------------------------------------------
-Bool AIMoveOutOfTheWayState::computePath() 
+Bool AIMoveOutOfTheWayState::computePath()
 {
 	Object *obj = getMachineOwner();
 	AIUpdateInterface *ai = obj->getAI();
@@ -2144,7 +2136,7 @@ void AIMoveOutOfTheWayState::onExit( StateExitType status )
 void AIMoveAndTightenState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -2155,12 +2147,12 @@ void AIMoveAndTightenState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIInternalMoveToState::xfer(xfer);
 	xfer->xferInt(&m_okToRepathTimes);
 	xfer->xferBool(&m_checkForPath);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2168,7 +2160,7 @@ void AIMoveAndTightenState::xfer( Xfer *xfer )
 void AIMoveAndTightenState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIMoveAndTightenState::onEnter()
@@ -2186,7 +2178,7 @@ StateReturnType AIMoveAndTightenState::onEnter()
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIMoveAndTightenState::update()
-{		 
+{
 	if (m_checkForPath) {
 		Object *obj = getMachineOwner();
 		AIUpdateInterface *ai = obj->getAI();
@@ -2200,7 +2192,7 @@ StateReturnType AIMoveAndTightenState::update()
 }
 
 //----------------------------------------------------------------------------------------------------------
-Bool AIMoveAndTightenState::computePath() 
+Bool AIMoveAndTightenState::computePath()
 {
 	Object *obj = getMachineOwner();
 	AIUpdateInterface *ai = obj->getAI();
@@ -2211,7 +2203,7 @@ Bool AIMoveAndTightenState::computePath()
 			ai->requestPath(&m_goalPosition, true);
 			return true;
 		}
-		//DEBUG_LOG(("AIMoveAndTightenState::computePath - stuck, failing.\n"));
+		//DEBUG_LOG(("AIMoveAndTightenState::computePath - stuck, failing."));
 		return false;		 // don't repath for now.  jba.
 	}
 	return true; // just use the existing path.  See above.
@@ -2223,7 +2215,7 @@ Bool AIMoveAndTightenState::computePath()
 //----------------------------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------------------------
 
-StateReturnType AIMoveAwayFromRepulsorsState::onEnter()	  
+StateReturnType AIMoveAwayFromRepulsorsState::onEnter()
 {
 	setAdjustsDestination(false);
 	Object *obj = getMachineOwner();
@@ -2247,7 +2239,7 @@ StateReturnType AIMoveAwayFromRepulsorsState::onEnter()
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIMoveAwayFromRepulsorsState::update()
-{		 
+{
 	if (m_checkForPath) {
 		Object *obj = getMachineOwner();
 		AIUpdateInterface *ai = obj->getAI();
@@ -2262,8 +2254,8 @@ StateReturnType AIMoveAwayFromRepulsorsState::update()
 }
 
 //----------------------------------------------------------------------------------------------------------
-Bool AIMoveAwayFromRepulsorsState::computePath() 
-{	
+Bool AIMoveAwayFromRepulsorsState::computePath()
+{
 	if (m_okToRepathTimes>0) {
 		m_okToRepathTimes--;
 		return true;
@@ -2293,7 +2285,7 @@ void AIMoveAwayFromRepulsorsState::onExit( StateExitType status )
  * 2. The other unit is moving.
  * 3. The other unit is moving away from us.
  */
-static Bool canPursue(Object *source, Weapon *weapon, Object *victim) 
+static Bool canPursue(Object *source, Weapon *weapon, Object *victim)
 {
 	/* This state is only used if the target is moving away from us, and has physics. */
 	if (!victim->getPhysics()) {
@@ -2302,7 +2294,7 @@ static Bool canPursue(Object *source, Weapon *weapon, Object *victim)
 	AIUpdateInterface *ai = source->getAI();
 	if (!ai) {
 		return false;
-	}	
+	}
 
 	// Have to have a turret to pursue.
 	WhichTurretType tur = ai->getWhichTurretForCurWeapon();
@@ -2311,7 +2303,7 @@ static Bool canPursue(Object *source, Weapon *weapon, Object *victim)
 	}
 
 	if (TheAI->getAiData()->m_aiCrushesInfantry) {
-		if ( source->getControllingPlayer() && 
+		if ( source->getControllingPlayer() &&
 			(source->getControllingPlayer()->getPlayerType() == PLAYER_COMPUTER) &&
 			source->canCrushOrSquish(victim) ) {
 			return true;	// Always pursue if we can squish.
@@ -2354,19 +2346,19 @@ Bool AIAttackApproachTargetState::computePath()
 	if( getMachineOwner()->isMobile() == false )
 		return false;
 
-	//CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - begin for object %d\n", getMachineOwner()->getID()));
+	//CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - begin for object %d", getMachineOwner()->getID()));
 
 	AIUpdateInterface *ai = getMachineOwner()->getAI();
 
-	if (ai->isBlockedAndStuck()) 
+	if (ai->isBlockedAndStuck())
 	{
 		forceRepath = true;
 		// Intense logging. jba
-		//CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - stuck, recomputing for object %d\n", getMachineOwner()->getID()));
+		//CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - stuck, recomputing for object %d", getMachineOwner()->getID()));
 	}
 	if (m_waitingForPath) return true;
 
-	if (!forceRepath && ai->getPath()==NULL && !ai->isWaitingForPath()) 
+	if (!forceRepath && ai->getPath()==NULL && !ai->isWaitingForPath())
 	{
 		forceRepath = true;
 	}
@@ -2375,7 +2367,7 @@ Bool AIAttackApproachTargetState::computePath()
 	/// @todo Unify recomputation conditions & account for obj ID so everyone doesnt compute on the same frame (MSB)
 	if (!forceRepath && TheGameLogic->getFrame() - m_approachTimestamp < MIN_RECOMPUTE_TIME)
 	{
-		//CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because of min time for object %d\n", getMachineOwner()->getID()));
+		//CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because of min time for object %d", getMachineOwner()->getID()));
 		return true;
 	}
 
@@ -2389,26 +2381,26 @@ Bool AIAttackApproachTargetState::computePath()
 		// if our victim's position hasn't changed, don't re-path
 		if (!forceRepath && isSamePosition(source->getPosition(), &m_prevVictimPos, getMachineGoalObject()->getPosition() ))
 		{
-			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because victim in same place for object %d\n", getMachineOwner()->getID()));
+			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because victim in same place for object %d", getMachineOwner()->getID()));
 			return true;
 		}
 
 		Weapon* weapon = source->getCurrentWeapon();
-		if (!weapon) 
+		if (!weapon)
 		{
-			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because of no weapon for object %d\n", getMachineOwner()->getID()));
+			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because of no weapon for object %d", getMachineOwner()->getID()));
 			return false;
 		}
 
 		// remember where we think our victim is, so if it moves, we can re-path
-		Object *victim = getMachineGoalObject();	 
+		Object *victim = getMachineGoalObject();
 		m_prevVictimPos = *victim->getPosition();
-		if (canPursue(source, weapon, victim)) 
+		if (canPursue(source, weapon, victim))
 		{
 			return false;  // break out, and do the pursuit state.
 		}
 		setAdjustsDestination(true);
-		if (weapon->isContactWeapon()) 
+		if (weapon->isContactWeapon())
 		{
 			// Weapon is basically a contact weapon, so let the attacker pathfind into the target.
 			ai->ignoreObstacle(victim);
@@ -2416,48 +2408,48 @@ Bool AIAttackApproachTargetState::computePath()
 			ai->setPathExtraDistance(10*PATHFIND_CELL_SIZE_F); // We don't want it to slow down.
 		}
 
-		if (ai->isBlockedAndStuck()) 
+		if (ai->isBlockedAndStuck())
 		{
 			m_waitingForPath = true;
 			m_goalPosition = m_prevVictimPos;
-			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - requestPath() for object %d\n", getMachineOwner()->getID()));
+			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - requestPath() for object %d", getMachineOwner()->getID()));
 			ai->requestPath(&m_goalPosition, getAdjustsDestination());
-		} 
-		else 
+		}
+		else
 		{
 			m_goalPosition = m_prevVictimPos;
 			m_waitingForPath = true;
 
 			Coord3D pos;
 			victim->getGeometryInfo().getCenterPosition( *victim->getPosition(), pos );
-			
-			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - requestAttackPath() for object %d\n", getMachineOwner()->getID()));
+
+			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - requestAttackPath() for object %d", getMachineOwner()->getID()));
 			ai->requestAttackPath(victim->getID(), &pos );
 			m_stopIfInRange = false; // we have calculated a position to shoot from, so go there.
 		}
-		CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing after repathing for object %d\n", getMachineOwner()->getID()));
+		CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing after repathing for object %d", getMachineOwner()->getID()));
 		return true;
-	} 
-	else 
+	}
+	else
 	{
 		// goal position.
 		setAdjustsDestination(true);
 		m_stopIfInRange = false; // Attack position is used by missiles, and they hit the position.
 		m_goalPosition = *getMachineGoalPosition();
-		if (!forceRepath) 
+		if (!forceRepath)
 		{
-			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because we're aiming for a fixed position for object %d\n", getMachineOwner()->getID()));
+			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because we're aiming for a fixed position for object %d", getMachineOwner()->getID()));
 			return true; // fixed positions don't move.
 		}
 		// must use computeAttackPath so that min ranges are considered.
 		m_waitingForPath = true;
 		ai->requestAttackPath(INVALID_ID, &m_goalPosition);
-		CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing after repathing at a fixed position for object %d\n", getMachineOwner()->getID()));
+		CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing after repathing at a fixed position for object %d", getMachineOwner()->getID()));
 		return true;
 	}
 
 
-	CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing at end of function for object %d\n", getMachineOwner()->getID()));
+	CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing at end of function for object %d", getMachineOwner()->getID()));
 	return true;
 }
 
@@ -2467,7 +2459,7 @@ Bool AIAttackApproachTargetState::computePath()
 void AIAttackApproachTargetState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -2481,14 +2473,14 @@ void AIAttackApproachTargetState::xfer( Xfer *xfer )
 
  // extend base class
   AIInternalMoveToState::xfer( xfer );
- 
+
 	xfer->xferCoord3D(&m_prevVictimPos);
 	xfer->xferUnsignedInt(&m_approachTimestamp);
 	xfer->xferBool(&m_follow);
 	xfer->xferBool(&m_isAttackingObject);
 	xfer->xferBool(&m_stopIfInRange);
 	xfer->xferBool(&m_isInitialApproach);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2497,14 +2489,14 @@ void AIAttackApproachTargetState::loadPostProcess( void )
 {
  // extend base class
   AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIAttackApproachTargetState::onEnter()
 {
 	// contained by AIAttackState, so no separate timer
 	// urg. hacky. if we are a projectile, turn on precise z-pos.
-	//CRCDEBUG_LOG(("AIAttackApproachTargetState::onEnter() - object %d\n", getMachineOwner()->getID()));
+	//CRCDEBUG_LOG(("AIAttackApproachTargetState::onEnter() - object %d", getMachineOwner()->getID()));
 	Object* source = getMachineOwner();
 	AIUpdateInterface* ai = source->getAI();
 	if (source->isKindOf(KINDOF_PROJECTILE))
@@ -2513,7 +2505,7 @@ StateReturnType AIAttackApproachTargetState::onEnter()
 			ai->getCurLocomotor()->setUsePreciseZPos(true);
 	}
 
-	if (getMachine()->isGoalObjectDestroyed()) 
+	if (getMachine()->isGoalObjectDestroyed())
 	{
 		return STATE_SUCCESS; // Already killed victim.
 	}
@@ -2526,37 +2518,37 @@ StateReturnType AIAttackApproachTargetState::onEnter()
 
 	// See if we're close enough.
 	Object *victim = getMachineGoalObject();
-	if (victim) 
+	if (victim)
 	{
 		Weapon* weapon = source->getCurrentWeapon();
-		if (!weapon) 
+		if (!weapon)
 		{
 			return STATE_FAILURE;
 		}
-		if (weapon->isWithinAttackRange(source, victim)) 
+		if (weapon->isWithinAttackRange(source, victim))
 		{
 			Bool viewBlocked = false;
-			if (source && victim && ai->isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain()) 
+			if (source && victim && ai->isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain())
 			{
 				viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(source, *source->getPosition(), victim, *victim->getPosition());
 			}
-			if (!viewBlocked) 
+			if (!viewBlocked)
 			{
 				return STATE_SUCCESS;
 			}
 		}
 
-		// Check here:  If we are a player, and we got to this state via an ai command (ie we auto-acquired), 
+		// Check here:  If we are a player, and we got to this state via an ai command (ie we auto-acquired),
 		// we don't want to chase the unit. isAllowedToChase is set when we are in a deploy and attack state (troop crawler).
 
 		if (source->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN) {
 			if (ai->getLastCommandSource() == CMD_FROM_AI && !ai->isAllowedToChase() ) {
 				if (!weapon->isContactWeapon()) {
-					return STATE_FAILURE; 
+					return STATE_FAILURE;
 				}
 			}
 		}
-		if (canPursue(source, weapon, victim)) 
+		if (canPursue(source, weapon, victim))
 		{
 			return STATE_SUCCESS;  // break out, and do the pursuit state.
 		}
@@ -2576,7 +2568,7 @@ StateReturnType AIAttackApproachTargetState::onEnter()
 	}
 
 	// find a good spot to shoot from
-	//CRCDEBUG_LOG(("AIAttackApproachTargetState::onEnter() - calling computePath() for object %d\n", getMachineOwner()->getID()));
+	//CRCDEBUG_LOG(("AIAttackApproachTargetState::onEnter() - calling computePath() for object %d", getMachineOwner()->getID()));
 	if (computePath() == false)
 		return STATE_FAILURE;
 
@@ -2587,8 +2579,8 @@ StateReturnType AIAttackApproachTargetState::onEnter()
 StateReturnType AIAttackApproachTargetState::updateInternal()
 {
 	AIUpdateInterface* ai = getMachineOwner()->getAI();
-	//CRCDEBUG_LOG(("AIAttackApproachTargetState::updateInternal() - object %d\n", getMachineOwner()->getID()));
-	if (getMachine()->isGoalObjectDestroyed()) 
+	//CRCDEBUG_LOG(("AIAttackApproachTargetState::updateInternal() - object %d", getMachineOwner()->getID()));
+	if (getMachine()->isGoalObjectDestroyed())
 	{
 		ai->notifyVictimIsDead();
 		ai->setCurrentVictim(NULL);
@@ -2600,56 +2592,66 @@ StateReturnType AIAttackApproachTargetState::updateInternal()
  	Object* source = getMachineOwner();
 	Weapon* weapon = source->getCurrentWeapon();
 	Object *victim = getMachineGoalObject();
-	if (victim) 
-	{ 
-		if( victim->testStatus( OBJECT_STATUS_STEALTHED ) && !victim->testStatus( OBJECT_STATUS_DETECTED ) ) 
+	if (victim)
+	{
+		if( victim->testStatus( OBJECT_STATUS_STEALTHED ) && !victim->testStatus( OBJECT_STATUS_DETECTED ) )
 		{
-			return STATE_FAILURE;	// If obj is stealthed, can no longer approach.
+			// If obj is stealthed, can no longer approach.
+			// TheSuperHackers @bugfix Stubbjax 19/11/2025 Except when disarming stealthed mines.
+#if RETAIL_COMPATIBLE_CRC
+			return STATE_FAILURE;
+#else
+			const Bool isTargetingMine = weapon && weapon->getDamageType() == DAMAGE_DISARM &&
+				(victim->isKindOf(KINDOF_MINE));
+
+			if (!isTargetingMine)
+				return STATE_FAILURE;
+#endif
 		}
 		ai->setCurrentVictim(victim);
 		// Attacking an object.
-		if (weapon && weapon->isContactWeapon() && weapon->isWithinAttackRange(source, victim)) 
+		if (weapon && weapon->isContactWeapon() && weapon->isWithinAttackRange(source, victim))
 		{
 			return STATE_SUCCESS;
 		}
-		if (m_stopIfInRange && weapon && weapon->isWithinAttackRange(source, victim)) 
+		if (m_stopIfInRange && weapon && weapon->isWithinAttackRange(source, victim))
 		{
 			Bool viewBlocked = false;
-			if (victim && ai->isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain()) 
+			if (victim && ai->isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain())
 			{
 				viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(source, *source->getPosition(), victim, *victim->getPosition());
 			}
-			if (!viewBlocked) 
+			if (!viewBlocked)
 			{
 				return STATE_SUCCESS;
 			}
 		}
 		// find a good spot to shoot from
-		//CRCDEBUG_LOG(("AIAttackApproachTargetState::updateInternal() - calling computePath() to victim for object %d\n", getMachineOwner()->getID()));
+		//CRCDEBUG_LOG(("AIAttackApproachTargetState::updateInternal() - calling computePath() to victim for object %d", getMachineOwner()->getID()));
 		if (computePath() == false)
 			return STATE_SUCCESS;
 		code = AIInternalMoveToState::update();
 
 
-		if (code != STATE_CONTINUE) 
+		if (code != STATE_CONTINUE)
 		{
 			return STATE_SUCCESS;	// Always return state success, as state failure exits the attack.
 			// we may need to aim & do another approach if the target moved.  jba.
 		}
-	}																			
-	else 
+	}
+	else
 	{
 		// Attacking a position.
 		// find a good spot to shoot from
-		//CRCDEBUG_LOG(("AIAttackApproachTargetState::updateInternal() - calling computePath() to position for object %d\n", getMachineOwner()->getID()));
-		if (m_stopIfInRange && weapon && weapon->isWithinAttackRange(source, &m_goalPosition)) 
+		//CRCDEBUG_LOG(("AIAttackApproachTargetState::updateInternal() - calling computePath() to position for object %d", getMachineOwner()->getID()));
+		if (m_stopIfInRange && weapon && weapon->isWithinAttackRange(source, &m_goalPosition))
 		{
 			Bool viewBlocked = false;
-			if ( ai->isDoingGroundMovement() ) 
+			if ( ai->isDoingGroundMovement() )
 			{
 				viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(source, *source->getPosition(), NULL, m_goalPosition);
 			}
-			if (!viewBlocked) 
+			if (!viewBlocked)
 			{
 				return STATE_SUCCESS;
 			}
@@ -2669,14 +2671,14 @@ StateReturnType AIAttackApproachTargetState::update()
 	StateReturnType code = updateInternal();
 	Object* source = getMachineOwner();
 	AIUpdateInterface *ai = source->getAI();
-	
+
 	if (m_follow && m_isAttackingObject)
 	{
 		// Basically, if the object is alive, we continue, in case the target moves.
 		Object* victim = getMachineGoalObject();
-		if (source && victim && source->isMobile() && !victim->getTemplate()->isKindOf(KINDOF_IMMOBILE)) 
+		if (source && victim && source->isMobile() && !victim->getTemplate()->isKindOf(KINDOF_IMMOBILE))
 		{
-			if (code != STATE_CONTINUE) 
+			if (code != STATE_CONTINUE)
 			{
 				m_isInitialApproach = false;
 			}
@@ -2686,13 +2688,13 @@ StateReturnType AIAttackApproachTargetState::update()
 		}
 	}
 
-	if (m_isInitialApproach) 
+	if (m_isInitialApproach)
 	{
 		WhichTurretType tur = ai->getWhichTurretForCurWeapon();
-		if (tur != TURRET_INVALID) 
+		if (tur != TURRET_INVALID)
 		{
 			Object *temporaryTarget = ai->getNextMoodTarget( true, false );
-			if (temporaryTarget) 
+			if (temporaryTarget)
 			{
 				ai->setTurretTargetObject(tur, temporaryTarget, m_isForceAttacking);
 			}
@@ -2712,9 +2714,9 @@ void AIAttackApproachTargetState::onExit( StateExitType status )
 	Object *obj = getMachineOwner();
 	if (ai) {
 		ai->ignoreObstacle(NULL);
-		
+
 		// Per JohnA, this state should not be calling ai->destroyPath, because we can have spastic users
-		// that click the target repeadedly. This will prevent the unit from stuttering for said spastic 
+		// that click the target repeadedly. This will prevent the unit from stuttering for said spastic
 		// users.
 		// ai->destroyPath();
 		// urg. hacky. if we are a projectile, reset precise z-pos.
@@ -2726,7 +2728,7 @@ void AIAttackApproachTargetState::onExit( StateExitType status )
 		if (ai->isDoingGroundMovement()) {
 			Real dx = m_goalPosition.x-obj->getPosition()->x;
 			Real dy = m_goalPosition.y-obj->getPosition()->y;
-			if (dx*dx+dy*dy<PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F*0.125) 
+			if (dx*dx+dy*dy<PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F*0.125)
 			{
 				// We are doing accurate ground movement, so make sure we end exactly at the goal.
 				obj->setPosition(&m_goalPosition);
@@ -2760,13 +2762,13 @@ Bool AIAttackPursueTargetState::computePath()
 
 	AIUpdateInterface *ai = getMachineOwner()->getAI();
 
-	if (ai->isBlockedAndStuck()) 
+	if (ai->isBlockedAndStuck())
 	{
 		return false;
 	}
 	if (m_waitingForPath) return true;
 
-	if (!forceRepath && ai->getPath()==NULL && !ai->isWaitingForPath()) 
+	if (!forceRepath && ai->getPath()==NULL && !ai->isWaitingForPath())
 	{
 		forceRepath = true;
 	}
@@ -2791,7 +2793,7 @@ Bool AIAttackPursueTargetState::computePath()
 			return true;
 
 		Weapon* weapon = source->getCurrentWeapon();
-		if (!weapon) 
+		if (!weapon)
 		{
 			return false;
 		}
@@ -2810,7 +2812,7 @@ Bool AIAttackPursueTargetState::computePath()
 		ai->requestPath(&m_goalPosition, false);
 		m_stopIfInRange = false; // we have calculated a position to shoot from, so go there.
 		return true;
-	} 
+	}
 
 	return false;
 }
@@ -2822,7 +2824,7 @@ Bool AIAttackPursueTargetState::computePath()
 void AIAttackPursueTargetState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -2836,14 +2838,14 @@ void AIAttackPursueTargetState::xfer( Xfer *xfer )
 
  // extend base class
   AIInternalMoveToState::xfer( xfer );
- 
+
 	xfer->xferCoord3D(&m_prevVictimPos);
 	xfer->xferUnsignedInt(&m_approachTimestamp);
 	xfer->xferBool(&m_follow);
 	xfer->xferBool(&m_isAttackingObject);
 	xfer->xferBool(&m_stopIfInRange);
 	xfer->xferBool(&m_isInitialApproach);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2852,7 +2854,7 @@ void AIAttackPursueTargetState::loadPostProcess( void )
 {
  // extend base class
   AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIAttackPursueTargetState::onEnter()
@@ -2860,27 +2862,27 @@ StateReturnType AIAttackPursueTargetState::onEnter()
 	// contained by AIAttackState, so no separate timer
 	// If we return STATE_SUCCESS or STATE_FAILURE, we proceed to AIAttackApproachTargetState.
 	Object* source = getMachineOwner();
-	AIUpdateInterface* ai = source->getAI();	 
+	AIUpdateInterface* ai = source->getAI();
 
 	if (source->isKindOf(KINDOF_PROJECTILE))
 	{
-		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - is a projectile for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - is a projectile for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 		return STATE_SUCCESS;	 // Projectiles go directly to AIAttackApproachTargetState.
 	}
 
-	if (getMachine()->isGoalObjectDestroyed()) 
+	if (getMachine()->isGoalObjectDestroyed())
 	{
-		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - goal object is destroyed for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - goal object is destroyed for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 		return STATE_SUCCESS; // Already killed victim.
 	}
 	if (!m_isAttackingObject)	{
-		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - not attacking for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - not attacking for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 		return STATE_SUCCESS; // only pursue objects - positions don't move.
 	}
 
 	setAdjustsDestination(false);
-	// Check here:  If we are a player, and we got to this state via an ai command (ie we auto-acquired), 
-	// we don't want to chase the unit. 
+	// Check here:  If we are a player, and we got to this state via an ai command (ie we auto-acquired),
+	// we don't want to chase the unit.
 	if (source->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN) {
 		if (ai->getLastCommandSource() == CMD_FROM_AI) {
 			return STATE_SUCCESS;
@@ -2895,19 +2897,19 @@ StateReturnType AIAttackPursueTargetState::onEnter()
 
 	// See if we're close enough.
 	Object *victim = getMachineGoalObject();
-	if (victim) {	
+	if (victim) {
 		Weapon* weapon = source->getCurrentWeapon();
-		if (!weapon) 
+		if (!weapon)
 		{
 			return STATE_FAILURE;
 		}
-		if (!canPursue(source, weapon, victim) ) 
+		if (!canPursue(source, weapon, victim) )
 		{
-			//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - can't pursue for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+			//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - can't pursue for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 			return STATE_SUCCESS;
 		}
 	}	else {
-		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - no victim for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - no victim for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 		return STATE_SUCCESS; // gotta have a victim.
 	}
 	// If we have a turret, start aiming.
@@ -2916,7 +2918,7 @@ StateReturnType AIAttackPursueTargetState::onEnter()
 	{
 		ai->setTurretTargetObject(tur, victim, m_isForceAttacking);
 	} else {
-		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - no turret for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - no turret for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 		return STATE_SUCCESS; // we only pursue with turrets, as non-turreted weapons can't fire on the run.
 	}
 
@@ -2930,8 +2932,8 @@ StateReturnType AIAttackPursueTargetState::onEnter()
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIAttackPursueTargetState::updateInternal()
 {
-	AIUpdateInterface* ai = getMachineOwner()->getAI();	  
-	if (getMachine()->isGoalObjectDestroyed()) 
+	AIUpdateInterface* ai = getMachineOwner()->getAI();
+	if (getMachine()->isGoalObjectDestroyed())
 	{
 		ai->notifyVictimIsDead();
 		ai->setCurrentVictim(NULL);
@@ -2942,8 +2944,8 @@ StateReturnType AIAttackPursueTargetState::updateInternal()
 	Object* source = getMachineOwner();
 	StateReturnType code = STATE_FAILURE;
  	Object *victim = getMachineGoalObject();
-	if (victim) 
-	{ 
+	if (victim)
+	{
 		if( victim->testStatus( OBJECT_STATUS_STEALTHED ) && !victim->testStatus( OBJECT_STATUS_DETECTED ) )
 		{
 			return STATE_FAILURE;	// If obj is stealthed, can no longer pursue.
@@ -2954,25 +2956,25 @@ StateReturnType AIAttackPursueTargetState::updateInternal()
 		if (computePath() == false)
 			return STATE_FAILURE;
 		code = AIInternalMoveToState::update();
-		if (code != STATE_CONTINUE) 
+		if (code != STATE_CONTINUE)
 		{
-			//CRCDEBUG_LOG(("AIAttackPursueTargetState::updateInternal() - failed internal update() for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+			//CRCDEBUG_LOG(("AIAttackPursueTargetState::updateInternal() - failed internal update() for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 			return STATE_SUCCESS;	// Always return state success, as state failure exits the attack.
 			// we may need to aim & do another approach if the target moved.  jba.
 		}
 		Weapon* weapon = source->getCurrentWeapon();
-		if (!weapon) 
+		if (!weapon)
 			return STATE_FAILURE;
 		// If we have a turret, start aiming.
 		WhichTurretType tur = ai->getWhichTurretForCurWeapon();
 		if (tur == TURRET_INVALID)
 		{
-			//CRCDEBUG_LOG(("AIAttackPursueTargetState::updateInternal() - no turret for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+			//CRCDEBUG_LOG(("AIAttackPursueTargetState::updateInternal() - no turret for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 			return STATE_SUCCESS; // We currently only pursue with a turret weapon.
 		}
 
 		Bool viewBlocked = false;
-		if (ai->isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain()) 
+		if (ai->isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain())
 		{
 			viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(source, *source->getPosition(), victim, *victim->getPosition());
 		}
@@ -2990,11 +2992,11 @@ StateReturnType AIAttackPursueTargetState::updateInternal()
 			}
 			ai->setDesiredSpeed(victimSpeed);
 			// Really intense debug info.  jba.
-			// DEBUG_LOG(("VS %f, OS %f, goal %f\n", victim->getPhysics()->getForwardSpeed2D(), source->getPhysics()->getForwardSpeed2D(), victimSpeed));
+			// DEBUG_LOG(("VS %f, OS %f, goal %f", victim->getPhysics()->getForwardSpeed2D(), source->getPhysics()->getForwardSpeed2D(), victimSpeed));
 		}	else {
 			ai->setDesiredSpeed(FAST_AS_POSSIBLE);
 		}
-	}																			
+	}
 	return code;
 }
 
@@ -3007,13 +3009,13 @@ StateReturnType AIAttackPursueTargetState::update()
 	Object* source = getMachineOwner();
 	AIUpdateInterface *ai = source->getAI();
 
-	if (m_isInitialApproach) 
+	if (m_isInitialApproach)
 	{
 		WhichTurretType tur = ai->getWhichTurretForCurWeapon();
-		if (tur != TURRET_INVALID) 
+		if (tur != TURRET_INVALID)
 		{
 			Object *temporaryTarget = ai->getNextMoodTarget( true, false );
-			if (temporaryTarget) 
+			if (temporaryTarget)
 			{
 				ai->setTurretTargetObject(tur, temporaryTarget, m_isForceAttacking);
 			}
@@ -3027,7 +3029,7 @@ StateReturnType AIAttackPursueTargetState::update()
 void AIAttackPursueTargetState::onExit( StateExitType status )
 {
 	// contained by AIAttackState, so no separate timer
-	//CRCDEBUG_LOG(("AIAttackPursueTargetState::onExit() for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+	//CRCDEBUG_LOG(("AIAttackPursueTargetState::onExit() for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 	AIInternalMoveToState::onExit( status );
 
 	m_isInitialApproach = false;	// We only want to allow turreted things to fire at enemies during their
@@ -3050,7 +3052,7 @@ Bool AIPickUpCrateState::computePath()
 void AIPickUpCrateState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -3064,11 +3066,11 @@ void AIPickUpCrateState::xfer( Xfer *xfer )
 
  // extend base class
   AIInternalMoveToState::xfer( xfer );
- 
+
 	xfer->xferInt(&m_delayCounter);
 	xfer->xferCoord3D(&m_goalPosition);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3077,7 +3079,7 @@ void AIPickUpCrateState::loadPostProcess( void )
 {
  // extend base class
   AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIPickUpCrateState::onEnter()
@@ -3128,7 +3130,7 @@ StateReturnType AIPickUpCrateState::update()
 void AIFollowPathState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -3145,7 +3147,7 @@ void AIFollowPathState::xfer( Xfer *xfer )
 	xfer->xferInt(&m_index);
 	xfer->xferBool(&m_adjustFinal);
 	xfer->xferBool(&m_adjustFinalOverride);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3153,7 +3155,7 @@ void AIFollowPathState::xfer( Xfer *xfer )
 void AIFollowPathState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIFollowPathState::onEnter()
@@ -3174,7 +3176,7 @@ StateReturnType AIFollowPathState::onEnter()
 
 	//Assign this value to the AIUpdateInterface so object's can access this value while
 	//determine which waypoints to plot in the waypoint renderer.
-	ai->friend_setCurrentGoalPathIndex( m_index ); 
+	ai->friend_setCurrentGoalPathIndex( m_index );
 
 
  	if (getID() == AI_FOLLOW_EXITPRODUCTION_PATH) {
@@ -3190,7 +3192,7 @@ StateReturnType AIFollowPathState::onEnter()
 			ai->setDesiredSpeed(speed);
 		}
 	}
- 	if (nextPos) 
+ 	if (nextPos)
 	{
 		Coord2D delta;
 		delta.x = nextPos->x - pos->x;
@@ -3201,8 +3203,8 @@ StateReturnType AIFollowPathState::onEnter()
 		ai->setPathExtraDistance(offset);
 		// We are in the middle of a path, so don't set the final goal location yet.
 		setAdjustsDestination(false);
-	} 
-	else 
+	}
+	else
 	{
 		setAdjustsDestination(m_adjustFinal);
 		ai->setPathExtraDistance(0);
@@ -3213,7 +3215,7 @@ StateReturnType AIFollowPathState::onEnter()
 			if (ai && ai->getCurLocomotor())
 				ai->getCurLocomotor()->setUsePreciseZPos(true);
 		}
-	}	
+	}
 	return ret;
 }
 
@@ -3231,7 +3233,7 @@ void AIFollowPathState::onExit( StateExitType status )
 
 	//Assign this value to the AIUpdateInterface so object's can access this value while
 	//determine which waypoints to plot in the waypoint renderer.
-	ai->friend_setCurrentGoalPathIndex( -1 ); 
+	ai->friend_setCurrentGoalPathIndex( -1 );
 }
 
 //----------------------------------------------------------------------------------------------------------
@@ -3245,7 +3247,7 @@ StateReturnType AIFollowPathState::update()
 	{
 		Object *obj = getMachineOwner();
 		AIUpdateInterface *ai = obj->getAI();
-		if (status == STATE_FAILURE && m_retryCount>0) { 
+		if (status == STATE_FAILURE && m_retryCount>0) {
 			// If we failed, & haven't reached retry limit, try again.  jba.
 			m_retryCount--;
 		}	else {
@@ -3266,11 +3268,11 @@ StateReturnType AIFollowPathState::update()
 				pos = ai->friend_getGoalPathPosition(m_index);
 			}
 		}
-		
+
 
 		//Assign this value to the AIUpdateInterface so object's can access this value while
 		//determine which waypoints to plot in the waypoint renderer.
-		ai->friend_setCurrentGoalPathIndex( m_index ); 
+		ai->friend_setCurrentGoalPathIndex( m_index );
 		ai->ignoreObstacleID(INVALID_ID); // we have exited whatever object we are leaving, if any.  jba.
 		if (pos == NULL)
 		{
@@ -3283,7 +3285,7 @@ StateReturnType AIFollowPathState::update()
 		m_goalPosition = *pos;
  		const Coord3D *nextPos = ai->friend_getGoalPathPosition( m_index+1 );
 
- 		if (nextPos) 
+ 		if (nextPos)
 		{
 			Coord2D delta;
 			delta.x = nextPos->x - pos->x;
@@ -3294,11 +3296,11 @@ StateReturnType AIFollowPathState::update()
 			ai->setPathExtraDistance(offset);
 			// We are in the middle of a path, so don't set the final goal location yet.
 			setAdjustsDestination(false);
-		} 
-		else 
+		}
+		else
 		{
 			setAdjustsDestination(m_adjustFinal && (m_adjustFinalOverride || ai->isDoingGroundMovement()));
-			if (getAdjustsDestination()) 
+			if (getAdjustsDestination())
 			{
 				if (!TheAI->pathfinder()->adjustDestination(getMachineOwner(), ai->getLocomotorSet(), &m_goalPosition)) {
 					return STATE_FAILURE;
@@ -3330,7 +3332,7 @@ StateReturnType AIFollowPathState::update()
 void AIMoveAndEvacuateState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -3345,7 +3347,7 @@ void AIMoveAndEvacuateState::xfer( Xfer *xfer )
 	AIInternalMoveToState::xfer(xfer);
 
 	xfer->xferCoord3D(&m_origin);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3353,7 +3355,7 @@ void AIMoveAndEvacuateState::xfer( Xfer *xfer )
 void AIMoveAndEvacuateState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIMoveAndEvacuateState::onEnter()
@@ -3377,17 +3379,17 @@ StateReturnType AIMoveAndEvacuateState::onEnter()
 StateReturnType AIMoveAndEvacuateState::update()
 {
 	Object *obj = getMachine()->getOwner();
-	if (obj->isEffectivelyDead()) 
+	if (obj->isEffectivelyDead())
 	{
 		return STATE_FAILURE;
 	}
 
 	// do movement
 	StateReturnType status = AIInternalMoveToState::update();
-	if (status != STATE_CONTINUE) 
+	if (status != STATE_CONTINUE)
 	{
 		Object *obj = getMachineOwner();
-		if (obj->isEffectivelyDead()) 
+		if (obj->isEffectivelyDead())
 		{
 			return STATE_FAILURE;
 		}
@@ -3436,7 +3438,7 @@ AIAttackMoveToState::~AIAttackMoveToState()
 // ------------------------------------------------------------------------------------------------
 void AIAttackMoveToState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -3456,14 +3458,14 @@ void AIAttackMoveToState::xfer( Xfer *xfer )
 		xfer->xferInt(&m_retryCount);
 	}
 	xfer->xferSnapshot(m_attackMoveMachine);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIAttackMoveToState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 #ifdef STATE_MACHINE_DEBUG
 //----------------------------------------------------------------------------------------------------------
@@ -3483,7 +3485,7 @@ StateReturnType AIAttackMoveToState::onEnter()
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAI();
 	m_attackMoveMachine->clear();
-	m_attackMoveMachine->setState( AI_IDLE );	
+	m_attackMoveMachine->setState( AI_IDLE );
 	m_commandSrc = ai->getLastCommandSource();
 	m_retryCount = ATTACK_RETRY_COUNT;
 	m_frameToSleepUntil = 0;
@@ -3507,12 +3509,12 @@ StateReturnType AIAttackMoveToState::update()
 
 	Bool forceRetargetThisFrame = false;
 	Bool shouldRepathThisFrame = false;
-	if (!m_attackMoveMachine->isInIdleState()) 
+	if (!m_attackMoveMachine->isInIdleState())
 	{
 		ai->setLocomotorGoalNone();
 		owner->clearModelConditionState(MODELCONDITION_MOVING);
 		m_attackMoveMachine->updateStateMachine();
-		
+
 		// if the machine is now idling, then we need to attempt to get a new target
 		if (m_attackMoveMachine->isInIdleState()) {
 			forceRetargetThisFrame = true;
@@ -3534,7 +3536,7 @@ StateReturnType AIAttackMoveToState::update()
 			m_attackMoveMachine->setState( AI_PICK_UP_CRATE );
 			return STATE_CONTINUE;
 		}
-		
+
 		Object* nextObjectToAttack;
 		nextObjectToAttack = ai->getNextMoodTarget( !forceRetargetThisFrame, false );
 		if (nextObjectToAttack != NULL)
@@ -3556,7 +3558,7 @@ StateReturnType AIAttackMoveToState::update()
 		shouldRepathThisFrame = true;
 	}
 
-	if (shouldRepathThisFrame) 
+	if (shouldRepathThisFrame)
 	{
 		AIMoveToState::onEnter();
 		forceRepath();
@@ -3570,7 +3572,7 @@ StateReturnType AIAttackMoveToState::update()
 		if (distSqr < sqr(ATTACK_CLOSE_ENOUGH_CELLS*PATHFIND_CELL_SIZE_F)) {
 			return ret;
 		}
-		DEBUG_LOG(("AIAttackMoveToState::update Distance from goal %f, retrying.\n", sqrt(distSqr)));
+		DEBUG_LOG(("AIAttackMoveToState::update Distance from goal %f, retrying.", sqrt(distSqr)));
 
 		ret = STATE_CONTINUE;
 		m_retryCount--;
@@ -3591,7 +3593,7 @@ StateReturnType AIAttackMoveToState::update()
 void AIMoveAndDeleteState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -3606,7 +3608,7 @@ void AIMoveAndDeleteState::xfer( Xfer *xfer )
 	AIInternalMoveToState::xfer(xfer);
 
 	xfer->xferBool(&m_appendGoalPosition);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3614,7 +3616,7 @@ void AIMoveAndDeleteState::xfer( Xfer *xfer )
 void AIMoveAndDeleteState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIMoveAndDeleteState::onEnter()
@@ -3634,20 +3636,20 @@ StateReturnType AIMoveAndDeleteState::onEnter()
 StateReturnType AIMoveAndDeleteState::update()
 {
 	Object *obj = getMachine()->getOwner();
-	if (obj->isEffectivelyDead()) 
+	if (obj->isEffectivelyDead())
 	{
 		return STATE_FAILURE;
 	}
 	// do movement
 	AIUpdateInterface *ai = obj->getAI();
-	if (ai->getCurLocomotor()) 
+	if (ai->getCurLocomotor())
 	{
 		ai->getCurLocomotor()->setAllowInvalidPosition(true);
 	}
-	if (m_appendGoalPosition) 
+	if (m_appendGoalPosition)
 	{
 		Path *thePath = ai->getPath();
-		if (!ai->isWaitingForPath() && ai->getPath()) 
+		if (!ai->isWaitingForPath() && ai->getPath())
 		{
 			m_goalPosition.z = TheTerrainLogic->getGroundHeight(m_goalPosition.x, m_goalPosition.y);
 			thePath->appendNode( &m_goalPosition, LAYER_GROUND);
@@ -3655,7 +3657,7 @@ StateReturnType AIMoveAndDeleteState::update()
 		}
 	}
 	StateReturnType status = AIInternalMoveToState::update();
-	if (status != STATE_CONTINUE) 
+	if (status != STATE_CONTINUE)
 	{
 		Object *obj = getMachineOwner();
 		TheGameLogic->destroyObject(obj);
@@ -3687,7 +3689,7 @@ const Waypoint * AIFollowWaypointPathState::getNextWaypoint(void)
 
 	getMachine()->setGoalPosition(m_currentWaypoint->getLocation());// THANKS, JOHN
 	return nextWay;
-#else 
+#else
 	if (!hasNextWaypoint()) {
 		m_priorWaypoint = m_currentWaypoint;
 		return NULL;
@@ -3720,7 +3722,7 @@ Bool AIFollowWaypointPathState::hasNextWaypoint(void)
 {
 #ifdef ALLOW_BACKTRACK
 	return m_currentWaypoint->getNumLinks()>0;
-#else 
+#else
 	if (m_currentWaypoint->getNumLinks()==0) {
 		return false; // no links, no next.
 	}
@@ -3731,7 +3733,7 @@ Bool AIFollowWaypointPathState::hasNextWaypoint(void)
 		// Two links, always works.
 		return true;
 	}
-	// We have a prior waypoint, and 1 link. 
+	// We have a prior waypoint, and 1 link.
 	if (m_priorWaypoint == m_currentWaypoint->getLink(0)) {
 		return false; // don't go back to same waypoint.
 	}
@@ -3775,7 +3777,7 @@ void AIFollowWaypointPathState::computeGoal(Bool useGroupOffsets)
 	if (TheAI->pathfinder()->isPointOnWall(&dest)) {
 		// except when they're on the wall.  jba.
 		dest.z = TheAI->pathfinder()->getWallHeight();
-		m_goalLayer = LAYER_WALL; 
+		m_goalLayer = LAYER_WALL;
 	}
 
 	ai->setPathExtraDistance(calcExtraPathDistance());
@@ -3790,7 +3792,7 @@ void AIFollowWaypointPathState::computeGoal(Bool useGroupOffsets)
 			if (ai && ai->getCurLocomotor())
 				ai->getCurLocomotor()->setUsePreciseZPos(true);
 		}
-	}	
+	}
 
 #define NO_ROTATE_OFFSETS
 #ifdef ROTATE_OFFSETS
@@ -3813,7 +3815,7 @@ void AIFollowWaypointPathState::computeGoal(Bool useGroupOffsets)
 	}
 	m_angle = angle;
 #endif
-	
+
 
 	m_goalPosition = dest;
 	m_goalPosition.x += m_groupOffset.x;
@@ -3824,7 +3826,7 @@ void AIFollowWaypointPathState::computeGoal(Bool useGroupOffsets)
 		}
 	} else {
 		m_goalPosition.z = TheTerrainLogic->getGroundHeight(m_goalPosition.x, m_goalPosition.y);
-	}	
+	}
 	Region3D extent;
 	TheTerrainLogic->getMaximumPathfindExtent(&extent);
 	if (!extent.isInRegionNoZ(&m_goalPosition)) {
@@ -3840,7 +3842,7 @@ void AIFollowWaypointPathState::computeGoal(Bool useGroupOffsets)
 void AIFollowWaypointPathState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -3878,7 +3880,7 @@ void AIFollowWaypointPathState::xfer( Xfer *xfer )
 	}
 
 	xfer->xferBool(&m_appendGoalPosition);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3886,7 +3888,7 @@ void AIFollowWaypointPathState::xfer( Xfer *xfer )
 void AIFollowWaypointPathState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIFollowWaypointPathState::onEnter()
@@ -3932,7 +3934,7 @@ StateReturnType AIFollowWaypointPathState::onEnter()
 		if (group) {
 			speed = group->getSpeed();
 			Coord3D center;
-			
+
 			group->getCenter( &center );
 			m_groupOffset.x = obj->getPosition()->x - center.x;
 			m_groupOffset.y = obj->getPosition()->y - center.y;
@@ -3956,7 +3958,7 @@ StateReturnType AIFollowWaypointPathState::onEnter()
 		setAdjustsDestination(ai->isDoingGroundMovement());
 		if (getAdjustsDestination()) {
 			if (!TheAI->pathfinder()->adjustDestination(getMachineOwner(), ai->getLocomotorSet(), &m_goalPosition)) {
-				DEBUG_LOG(("Breaking out of follow waypoint path\n"));
+				DEBUG_LOG(("Breaking out of follow waypoint path"));
 				return STATE_FAILURE;
 			}
 			TheAI->pathfinder()->updateGoal(getMachineOwner(), &m_goalPosition, m_goalLayer);
@@ -3969,7 +3971,7 @@ StateReturnType AIFollowWaypointPathState::onEnter()
 		}
 	}
 	if (ret != STATE_CONTINUE) {
-		DEBUG_LOG(("Breaking out of follow waypoint path\n"));
+		DEBUG_LOG(("Breaking out of follow waypoint path"));
 	}
 	return ret;
 }
@@ -3999,7 +4001,7 @@ StateReturnType AIFollowWaypointPathState::update()
 
 
 	getMachine()->setGoalPosition(m_currentWaypoint->getLocation());
-	
+
 
 	UnsignedInt adjustment = ai->getMoodMatrixActionAdjustment(MM_Action_Move);
 	if (m_isFollowWaypointPathState && (adjustment & MAA_Action_To_AttackMove))	{
@@ -4010,7 +4012,7 @@ StateReturnType AIFollowWaypointPathState::update()
 		}
 	}
 
-	if (m_appendGoalPosition) {	 
+	if (m_appendGoalPosition) {
 		Path *thePath = ai->getPath();
 		if (!ai->isWaitingForPath() && ai->getPath()) {
 			//Coord3D pathEnd = *thePath->getLastNode()->getPosition();
@@ -4023,13 +4025,16 @@ StateReturnType AIFollowWaypointPathState::update()
 		m_currentWaypoint = obj->getTeam()->getCurrentWaypoint();
 		if (m_currentWaypoint == NULL) {
 			return STATE_SUCCESS;
-		}			 
+		}
 		computeGoal(false);
 		if (getAdjustsDestination() && ai->isDoingGroundMovement()) {
 			if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) {
 				if (m_currentWaypoint) {
-					DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n", 
+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible
+#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC
+					DEBUG_LOG(("Breaking out of follow waypoint path %s of %s",
 					m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str()));
+#endif
 				}
 				return STATE_FAILURE;
 			}
@@ -4043,15 +4048,19 @@ StateReturnType AIFollowWaypointPathState::update()
 
 	// do movement
 	StateReturnType status = AIInternalMoveToState::update();
-	
+
 	// We may want to allow ourselves to bail out of this one early. In order to do this, we check and
-	// see if we're moving as a group, and then if our team is owned by an AI Skirmish player. 
-	// If it is, then we compute the group centroid, and see if it is within some distance of the 
+	// see if we're moving as a group, and then if our team is owned by an AI Skirmish player.
+	// If it is, then we compute the group centroid, and see if it is within some distance of the
 	if (m_moveAsGroup) {
 		if (obj->getControllingPlayer()->isSkirmishAIPlayer()) {
 			Team *team = obj->getTeam();
-			AIGroup *group = TheAI->createGroup();
+			AIGroupPtr group = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 			team->getTeamAsAIGroup(group);
+#else
+			team->getTeamAsAIGroup(group.Peek());
+#endif
 
 			Coord3D pos;
 			group->getCenter(&pos);
@@ -4073,33 +4082,36 @@ StateReturnType AIFollowWaypointPathState::update()
 	{
 		m_currentWaypoint = getNextWaypoint();
 
-		//LORENZEN ADDED LORENZEN ADDED LORENZEN ADDED 
+		//LORENZEN ADDED LORENZEN ADDED LORENZEN ADDED
 		Object *obj = getMachineOwner();
 		AIUpdateInterface *ai = obj->getAI();
 		if ( m_priorWaypoint )
 			ai->setPriorWaypointID( m_priorWaypoint->getID() );
 		if ( m_currentWaypoint )
 			ai->setCurrentWaypointID( m_currentWaypoint->getID() );
-		//LORENZEN ADDED LORENZEN ADDED LORENZEN ADDED 
+		//LORENZEN ADDED LORENZEN ADDED LORENZEN ADDED
 
 
 
 		// if there are no links from this waypoint, we're done
 		if (m_currentWaypoint==NULL)	{
 			/// Trigger "end of waypoint path" scripts (jba)
-			ai->setCompletedWaypoint(m_priorWaypoint);			
+			ai->setCompletedWaypoint(m_priorWaypoint);
 			return STATE_SUCCESS;
 		}
 		if (m_moveAsGroup) {
 			obj->getTeam()->setCurrentWaypoint(m_currentWaypoint);
-		} 
-		
+		}
+
 		computeGoal(false);
 		if (getAdjustsDestination() && ai->isDoingGroundMovement()) {
 			if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) {
 				if (m_currentWaypoint) {
-					DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n", 
+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible
+#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC
+					DEBUG_LOG(("Breaking out of follow waypoint path %s of %s",
 					m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str()));
+#endif
 				}
 				return STATE_FAILURE;
 			}
@@ -4113,7 +4125,7 @@ StateReturnType AIFollowWaypointPathState::update()
 		return STATE_CONTINUE;
 	}
 	if (status != STATE_CONTINUE) {
-		DEBUG_LOG(("Breaking out of follow waypoint path\n"));
+		DEBUG_LOG(("Breaking out of follow waypoint path"));
 	}
 	return status;
 }
@@ -4130,7 +4142,7 @@ StateReturnType AIFollowWaypointPathState::update()
 void AIFollowWaypointPathExactState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4152,7 +4164,7 @@ void AIFollowWaypointPathExactState::xfer( Xfer *xfer )
 	{
 		m_lastWaypoint = TheTerrainLogic->getWaypointByID(id);
 	}
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4160,7 +4172,7 @@ void AIFollowWaypointPathExactState::xfer( Xfer *xfer )
 void AIFollowWaypointPathExactState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIFollowWaypointPathExactState::onEnter()
@@ -4183,7 +4195,7 @@ StateReturnType AIFollowWaypointPathExactState::onEnter()
 		if (group) {
 			speed = group->getSpeed();
 			Coord3D center;
-			
+
 			group->getCenter( &center );
 			groupOffset.x = obj->getPosition()->x - center.x;
 			groupOffset.y = obj->getPosition()->y - center.y;
@@ -4193,7 +4205,7 @@ StateReturnType AIFollowWaypointPathExactState::onEnter()
 	setAdjustsDestination(false);
 	// set initial movement goal
 	StateReturnType ret = AIInternalMoveToState::onEnter();
-	ai->setPathFromWaypoint(currentWaypoint, &groupOffset);	
+	ai->setPathFromWaypoint(currentWaypoint, &groupOffset);
 	m_lastWaypoint = currentWaypoint;
 	ai->getCurLocomotor()->setAllowInvalidPosition(true); // allow it to move off the map.
 
@@ -4217,7 +4229,7 @@ void AIFollowWaypointPathExactState::onExit( StateExitType status )
 	// turn off precision-z-pos when we exit, just in case.
 	AIUpdateInterface *ai = getMachineOwner()->getAI();
 	if (ai) {
-		ai->setCompletedWaypoint(m_lastWaypoint);			
+		ai->setCompletedWaypoint(m_lastWaypoint);
 		ai->setCanPathThroughUnits(false);
 		ai->getCurLocomotor()->setAllowInvalidPosition(false); // turn off allow it to move off the map.
 	}
@@ -4243,12 +4255,12 @@ StateReturnType AIFollowWaypointPathExactState::update()
 //-------------------------------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------------------------------
-AIAttackFollowWaypointPathState::AIAttackFollowWaypointPathState ( StateMachine *machine, Bool asGroup ) : 
-AIFollowWaypointPathState ( machine, asGroup, false ) 
+AIAttackFollowWaypointPathState::AIAttackFollowWaypointPathState ( StateMachine *machine, Bool asGroup ) :
+AIFollowWaypointPathState ( machine, asGroup, false )
 {
 #ifdef STATE_MACHINE_DEBUG
 	setName("AIAttackFollowWaypointPathState");
-#endif	
+#endif
 	m_attackFollowMachine = newInstance(AIAttackMoveStateMachine)(getMachineOwner(), "AIAttackFollowMachine");
 	m_attackFollowMachine->initDefaultState();
 }
@@ -4264,7 +4276,7 @@ AIAttackFollowWaypointPathState::~AIAttackFollowWaypointPathState()
 // ------------------------------------------------------------------------------------------------
 void AIAttackFollowWaypointPathState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4278,16 +4290,16 @@ void AIAttackFollowWaypointPathState::xfer( Xfer *xfer )
 
  // extend base class
   AIFollowWaypointPathState::xfer( xfer );
- 
+
 	xfer->xferSnapshot(m_attackFollowMachine);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIAttackFollowWaypointPathState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 #ifdef STATE_MACHINE_DEBUG
 //----------------------------------------------------------------------------------------------------------
@@ -4305,7 +4317,7 @@ AsciiString AIAttackFollowWaypointPathState::getName(  ) const
 StateReturnType AIAttackFollowWaypointPathState ::onEnter()
 {
 	m_attackFollowMachine->clear();
-	m_attackFollowMachine->setState( AI_IDLE );	
+	m_attackFollowMachine->setState( AI_IDLE );
 
 	return AIFollowWaypointPathState::onEnter();
 }
@@ -4319,19 +4331,19 @@ StateReturnType AIAttackFollowWaypointPathState::update()
 
 	Bool forceRetargetThisFrame = false;
 	Bool shouldRepathThisFrame = false;
-	if (!m_attackFollowMachine->isInIdleState()) 
+	if (!m_attackFollowMachine->isInIdleState())
 	{
 		ai->setLocomotorGoalNone();
 		owner->clearModelConditionState(MODELCONDITION_MOVING);
 		m_attackFollowMachine->updateStateMachine();
-		
+
 		// if the machine is now idling, then we need to attempt to get a new target
-		if (m_attackFollowMachine->isInIdleState()) 
+		if (m_attackFollowMachine->isInIdleState())
 		{
 			forceRetargetThisFrame = true;
 			shouldRepathThisFrame = true;
-		} 
-		else 
+		}
+		else
 		{
 			return STATE_CONTINUE;
 		}
@@ -4364,7 +4376,7 @@ StateReturnType AIAttackFollowWaypointPathState::update()
 		}
 	}
 
-	if (shouldRepathThisFrame) 
+	if (shouldRepathThisFrame)
 	{
 		// Update the goal waypoint if we've moved along the path.
 		computeGoal(m_moveAsGroup);
@@ -4398,7 +4410,7 @@ void AIAttackFollowWaypointPathState ::onExit( StateExitType status )
 void AIWanderState::crc( Xfer *xfer )
 {
 	AIFollowWaypointPathState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4414,7 +4426,7 @@ void AIWanderState::xfer( Xfer *xfer )
 
 	xfer->xferInt(&m_waitFrames);
 	xfer->xferInt(&m_timer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4422,7 +4434,7 @@ void AIWanderState::xfer( Xfer *xfer )
 void AIWanderState::loadPostProcess( void )
 {
 	AIFollowWaypointPathState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -4478,7 +4490,7 @@ StateReturnType AIWanderState::update()
 		if (m_currentWaypoint == NULL)	{
 			/// Trigger "end of waypoint path" scripts (jba)
 			ai->setCompletedWaypoint(m_priorWaypoint);
-			
+
 			return STATE_SUCCESS;
 		}
 
@@ -4520,7 +4532,7 @@ void AIWanderState::onExit( StateExitType status )
 void AIWanderInPlaceState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4537,7 +4549,7 @@ void AIWanderInPlaceState::xfer( Xfer *xfer )
 	xfer->xferCoord3D(&m_origin);
 	xfer->xferInt(&m_waitFrames);
 	xfer->xferInt(&m_timer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** LoadPostProcess */
@@ -4545,7 +4557,7 @@ void AIWanderInPlaceState::xfer( Xfer *xfer )
 void AIWanderInPlaceState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 StateReturnType AIWanderInPlaceState::onEnter()
@@ -4630,7 +4642,7 @@ void AIWanderInPlaceState::onExit( StateExitType status )
 void AIPanicState::crc( Xfer *xfer )
 {
 	AIFollowWaypointPathState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4646,7 +4658,7 @@ void AIPanicState::xfer( Xfer *xfer )
 
 	xfer->xferInt(&m_waitFrames);
 	xfer->xferInt(&m_timer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4654,7 +4666,7 @@ void AIPanicState::xfer( Xfer *xfer )
 void AIPanicState::loadPostProcess( void )
 {
 	AIFollowWaypointPathState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 /**
  * Panic and run screaming along a waypoint path.
@@ -4719,7 +4731,7 @@ StateReturnType AIPanicState::update()
 		if (m_currentWaypoint == NULL)	{
 			/// Trigger "end of waypoint path" scripts (jba)
 			ai->setCompletedWaypoint(m_priorWaypoint);
-			
+
 			return STATE_SUCCESS;
 		}
 		Locomotor* curLoco = ai->getCurLocomotor();
@@ -4755,7 +4767,7 @@ void AIPanicState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIAttackAimAtTargetState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4770,14 +4782,14 @@ void AIAttackAimAtTargetState::xfer( Xfer *xfer )
 	xfer->xferBool(&m_canTurnInPlace);
 	xfer->xferBool(&m_setLocomotor);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIAttackAimAtTargetState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIAttackAimAtTargetState::onEnter()
@@ -4793,7 +4805,7 @@ StateReturnType AIAttackAimAtTargetState::onEnter()
 	Locomotor* curLoco = sourceAI->getCurLocomotor();
 	m_canTurnInPlace = curLoco ? curLoco->getMinSpeed() == 0.0f : false;
 
-//	if (!victim) 
+//	if (!victim)
 //		return STATE_CONTINUE; // Just continue till we get a victim.
 // Ick.  This was originally a safety to a single line that required victim, and was never meant
 // as an early return to all cases.  We now want to use preattack frames on ground position targets
@@ -4826,7 +4838,7 @@ StateReturnType AIAttackAimAtTargetState::onEnter()
 	// add ourself as a targeter BEFORE calling isTemporarilyPreventingAimSuccess().
 	if (victimAI)
 		victimAI->addTargeter(source->getID(), true);
-	
+
 	WhichTurretType tur = sourceAI->getWhichTurretForCurWeapon();
 	if (tur != TURRET_INVALID)
 	{
@@ -4841,13 +4853,13 @@ StateReturnType AIAttackAimAtTargetState::onEnter()
 	}
 	else
 	{
-		// GS moved contact weapon check in here, because Success can never be given to a unit in this state 
+		// GS moved contact weapon check in here, because Success can never be given to a unit in this state
 		// using a turret to attack.  Check out ::update and you will see.
 
 		Bool preventing = victimAI && victimAI->isTemporarilyPreventingAimSuccess();
 
 		// Contact weapons don't aim.  They just go boom.  jba.
-		if( weapon && weapon->isContactWeapon() && inFiringRange && !preventing ) 
+		if( weapon && weapon->isContactWeapon() && inFiringRange && !preventing )
 			return STATE_SUCCESS;
 	}
 	m_setLocomotor = false;
@@ -4891,7 +4903,7 @@ StateReturnType AIAttackAimAtTargetState::update()
 		// if we have a turret, but it is incapable of turning, turn ourself.
 		// (gotta do this for units like the Comanche, which have fake "turrets"
 		// solely to allow for attacking-on-the-move...)
-		if (sourceAI->getTurretTurnRate(tur) != 0.0f)	
+		if (sourceAI->getTurretTurnRate(tur) != 0.0f)
 		{
 			// The Body can never return Success if the weapon is on the turret, or else we end
 			// up shooting the current weapon (which is on the turret) in the wrong direction.
@@ -4904,11 +4916,11 @@ StateReturnType AIAttackAimAtTargetState::update()
 
 		// else fall thru!
 	}
-	
+
 	// no else here!
 	{
 		Real relAngle = m_isAttackingObject ?
-											ThePartitionManager->getRelativeAngle2D( source, victim ) : 
+											ThePartitionManager->getRelativeAngle2D( source, victim ) :
 											ThePartitionManager->getRelativeAngle2D( source, getMachineGoalPosition() );
 
 		const Real REL_THRESH = 0.035f;	// about 2 degrees. (getRelativeAngle2D is current only accurate to about 1.25 degrees)
@@ -4918,10 +4930,10 @@ StateReturnType AIAttackAimAtTargetState::update()
 
 		if (aimDelta < REL_THRESH) aimDelta = REL_THRESH;
 
-		//DEBUG_LOG(("AIM: desired %f, actual %f, delta %f, aimDelta %f, goalpos %f %f\n",rad2deg(obj->getOrientation() + relAngle),rad2deg(obj->getOrientation()),rad2deg(relAngle),rad2deg(aimDelta),victim->getPosition()->x,victim->getPosition()->y));
+		//DEBUG_LOG(("AIM: desired %f, actual %f, delta %f, aimDelta %f, goalpos %f %f",rad2deg(obj->getOrientation() + relAngle),rad2deg(obj->getOrientation()),rad2deg(relAngle),rad2deg(aimDelta),victim->getPosition()->x,victim->getPosition()->y));
 		if (m_canTurnInPlace)
 		{
-			if (fabs(relAngle) > aimDelta) 
+			if (fabs(relAngle) > aimDelta)
 			{
 				Real desiredAngle = source->getOrientation() + relAngle;
 				sourceAI->setLocomotorGoalOrientation(desiredAngle);
@@ -4955,7 +4967,7 @@ StateReturnType AIAttackAimAtTargetState::update()
 
 	if (source->isDisabledByType(DISABLED_HELD))
 	{
-		// We are contained by something (transport, building). This means we can't 
+		// We are contained by something (transport, building). This means we can't
 		// actually move to the location and if we are firing on a specific target
 		// and that target is no longer in range, then we need to abort the state
 		// so it can fire on other targets.
@@ -4965,7 +4977,7 @@ StateReturnType AIAttackAimAtTargetState::update()
 		const Coord3D *pos = m_isAttackingObject ? victim->getPosition() : getMachineGoalPosition();
 		if( !weapon || !weapon->isWithinAttackRange( source, pos ) )
 		{
-			// We're no longer in range, so exit with failure so we can automatically 
+			// We're no longer in range, so exit with failure so we can automatically
 			// reacquire a closer target if possible.
 			return STATE_FAILURE;
 		}
@@ -4982,7 +4994,7 @@ void AIAttackAimAtTargetState::onExit( StateExitType status )
 	{
 		AIUpdateInterface* sourceAI = getMachineOwner()->getAI();
 		// Tell the ai we are done moving, if we set the locomotor goal.
-		if (sourceAI && m_setLocomotor) 
+		if (sourceAI && m_setLocomotor)
 			sourceAI->setLocomotorGoalNone();
 	}
 	else
@@ -5013,7 +5025,7 @@ StateReturnType AIAttackFireWeaponState::onEnter()
 
 	// Passive stuff will approach but not attack, so we check here (after approach is complete)
 	UnsignedInt adjust = ai->getMoodMatrixActionAdjustment(MM_Action_Attack);
-	if ((adjust & MAA_Action_Ok) == 0) 
+	if ((adjust & MAA_Action_Ok) == 0)
 	{
 		return STATE_FAILURE;
 	}
@@ -5027,7 +5039,7 @@ StateReturnType AIAttackFireWeaponState::onEnter()
 
 	obj->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_IS_FIRING_WEAPON ) );
 	obj->preFireCurrentWeapon( getMachineGoalObject() );
-	return STATE_CONTINUE;	
+	return STATE_CONTINUE;
 }
 
 //----------------------------------------------------------------------------------------------------------
@@ -5054,12 +5066,12 @@ StateReturnType AIAttackFireWeaponState::update()
 	{
 		return STATE_FAILURE;
 	}
-	
+
 	WeaponStatus status = weapon->getStatus();
 	if (status == PRE_ATTACK)
 	{
 		return STATE_CONTINUE;
-	} 
+	}
 	else if (status != READY_TO_FIRE)
 	{
 		return STATE_FAILURE;
@@ -5087,7 +5099,7 @@ StateReturnType AIAttackFireWeaponState::update()
 		Real continueRange = weapon->getContinueAttackRange();
 		if (
 			continueRange > 0.0f &&
-			victim && 
+			victim &&
 			(victim->isDestroyed() || victim->isEffectivelyDead() || (victim->isKindOf(KINDOF_MINE) && victim->testStatus(OBJECT_STATUS_MASKED)))
 		)
 		{
@@ -5119,14 +5131,14 @@ StateReturnType AIAttackFireWeaponState::update()
 		// clear this, just in case.
 		obj->clearStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_IGNORING_STEALTH ) );
 	}
-		
+
 	m_att->notifyFired();
 
 	return STATE_SUCCESS;
 }
 
 //----------------------------------------------------------------------------------------------------------
-/** 
+/**
 	Stop firing.
 	*/
 void AIAttackFireWeaponState::onExit( StateExitType status )
@@ -5166,11 +5178,11 @@ StateReturnType AIWaitState::update()
 //----------------------------------------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------------------------------------
-AIAttackState::AIAttackState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking, AttackExitConditionsInterface* attackParameters) : 
-	State( machine , "AIAttackState"), 
+AIAttackState::AIAttackState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking, AttackExitConditionsInterface* attackParameters) :
+	State( machine , "AIAttackState"),
 	m_attackMachine(NULL),
-	m_attackParameters(attackParameters), 
-	m_lockedWeaponOnEnter(NULL), 
+	m_attackParameters(attackParameters),
+	m_lockedWeaponOnEnter(NULL),
 	m_follow(follow),
 	m_isAttackingObject(attackingObject),
 	m_isForceAttacking(forceAttacking),
@@ -5187,7 +5199,7 @@ AIAttackState::~AIAttackState()
 	// turn it off when we do setCurrentVictim(NULL).
 	//addSelfAsTargeter(false);
 
-	if (m_attackMachine) 
+	if (m_attackMachine)
 	{
 		m_attackMachine->halt();
 		deleteInstance(m_attackMachine);
@@ -5199,7 +5211,7 @@ AIAttackState::~AIAttackState()
 // ------------------------------------------------------------------------------------------------
 void AIAttackState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -5212,7 +5224,7 @@ void AIAttackState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_attackMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 	xfer->xferCoord3D(&m_originalVictimPos);
 
@@ -5229,7 +5241,7 @@ void AIAttackState::xfer( Xfer *xfer )
 	AttackExitConditionsInterface*	m_attackParameters;					///< these are not owned by this, and will not be deleted on destruction
 	Bool										m_isForceAttacking
 	*/
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -5237,13 +5249,13 @@ void AIAttackState::xfer( Xfer *xfer )
 void AIAttackState::loadPostProcess( void )
 {
 	Object* victim = getMachineGoalObject();
-	if (victim) 
+	if (victim)
 	{
 		m_victimTeam = victim->getTeam();
 	}
 	Object* source = getMachineOwner();
 	m_lockedWeaponOnEnter = source->isCurWeaponLocked() ? source->getCurrentWeapon() : NULL;
-}  // end loadPostProcess
+}
 
 #ifdef STATE_MACHINE_DEBUG
 //----------------------------------------------------------------------------------------------------------
@@ -5270,7 +5282,7 @@ void AIAttackState::chooseWeapon()
 	if (victim)
 	{
 		/*bool found =*/ source->chooseBestWeaponForTarget(victim, PREFER_MOST_DAMAGE, ai->getLastCommandSource());
-		//DEBUG_ASSERTLOG(found, ("unable to autochoose any weapon for %s\n",source->getTemplate()->getName().str()));
+		//DEBUG_ASSERTLOG(found, ("unable to autochoose any weapon for %s",source->getTemplate()->getName().str()));
 	}
 
 	// Check if we need to update because of the weapon choice switch.
@@ -5289,14 +5301,14 @@ void AIAttackState::notifyNewVictimChosen(Object* victim)
 //----------------------------------------------------------------------------------------------------------
 /**
  * Begin an attack on the machine's goal object.
- * To do this complex behavior, instantiate another state machine as a "sub-machine" of 
+ * To do this complex behavior, instantiate another state machine as a "sub-machine" of
  * the attack state.
  */
 DECLARE_PERF_TIMER(AIAttackState)
 StateReturnType AIAttackState::onEnter()
 {
 	USE_PERF_TIMER(AIAttackState)
-	//CRCDEBUG_LOG(("AIAttackState::onEnter() - start for object %d\n", getMachineOwner()->getID()));
+	//CRCDEBUG_LOG(("AIAttackState::onEnter() - start for object %d", getMachineOwner()->getID()));
 	Object* source = getMachineOwner();
 	AIUpdateInterface *ai = source->getAI();
 	// if we are in sleep mode, we will not attack
@@ -5304,23 +5316,31 @@ StateReturnType AIAttackState::onEnter()
 		return STATE_SUCCESS;
 
 	// if we've met the conditions specified by m_attackParameters, we consider ourselves "successful."
-	if (m_attackParameters && m_attackParameters->shouldExit(getMachine())) 
+	if (m_attackParameters && m_attackParameters->shouldExit(getMachine()))
 		return STATE_SUCCESS;
 
+	//Kris: Jan 12, 2005
+	//Don't allow units under construction to attack! The selection/action manager system was responsible for preventing this
+	//from ever happening, but failed in two cases which I fixed. This is an extra check to mitigate cheats.
+	if( source->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
+	{
+		return STATE_FAILURE;
+	}
+
 	// if all of our weapons are out of ammo, can't attack.
 	// (this can happen for units which never auto-reload, like the Raptor)
 	if (source->isOutOfAmmo() && !source->isKindOf(KINDOF_PROJECTILE))
 		return STATE_FAILURE;
 
 	// create new state machine for attack behavior
-	//CRCDEBUG_LOG(("AIAttackState::onEnter() - constructing state machine for object %d\n", getMachineOwner()->getID()));
+	//CRCDEBUG_LOG(("AIAttackState::onEnter() - constructing state machine for object %d", getMachineOwner()->getID()));
 	m_attackMachine = newInstance(AttackStateMachine)(source, this, "AIAttackMachine", m_follow, m_isAttackingObject, m_isForceAttacking  );
 
 	// tell the attack machine who the victim of the attack is
 	if (m_isAttackingObject)
 	{
 		Object* victim = getMachineGoalObject();
-		if (victim == NULL || victim->isEffectivelyDead())	
+		if (victim == NULL || victim->isEffectivelyDead())
 		{
 			ai->notifyVictimIsDead();
 			return STATE_FAILURE;	// we have nothing to attack!
@@ -5331,7 +5351,7 @@ StateReturnType AIAttackState::onEnter()
 	}
 	else
 	{
-		m_attackMachine->setGoalPosition(getMachineGoalPosition());		
+		m_attackMachine->setGoalPosition(getMachineGoalPosition());
 		m_originalVictimPos = *getMachineGoalPosition();
 	}
 
@@ -5365,13 +5385,13 @@ StateReturnType AIAttackState::update()
 {
 	USE_PERF_TIMER(AIAttackState)
 	// if we've met the conditions specified by m_attackParameters, we consider ourselves "successful."
-	if (m_attackParameters && m_attackParameters->shouldExit(getMachine())) 
+	if (m_attackParameters && m_attackParameters->shouldExit(getMachine()))
 	{
 		return STATE_SUCCESS;
 	}
 
 	Object* source = getMachineOwner();
-	
+
 	// if all of our weapons are out of ammo, can't attack.
 	// (this can happen for units which never auto-reload, like the Raptor)
 	if (source->isOutOfAmmo() && !source->isKindOf(KINDOF_PROJECTILE))
@@ -5383,21 +5403,21 @@ StateReturnType AIAttackState::update()
 	{
 		Object* victim = getMachineGoalObject();
 
-		if (victim == NULL || victim->isEffectivelyDead()) 	
+		if (victim == NULL || victim->isEffectivelyDead())
 		{
 			source->getAI()->notifyVictimIsDead();
 			return STATE_SUCCESS;	// my, that was easy
 		}
 
-		if (victim) 
+		if (victim)
 		{
 			source->getAI()->setCurrentVictim(victim);
 		}
 
 		if( victim->getTeam() != m_victimTeam )
 		{
-			// If, while I have been attacking my victim, it has lost its ability to attack 
-			//(a recently de-garrisoned building) I should bail here... 
+			// If, while I have been attacking my victim, it has lost its ability to attack
+			//(a recently de-garrisoned building) I should bail here...
 			// We are not sure whether the problem occurs here or sometime before, but this is an edge case failsafe for it
 			// Steven calls this hack 'greasy,' and I agreesy.-Lorenzen
 			AIUpdateInterface *ai = source->getAI();
@@ -5434,9 +5454,9 @@ StateReturnType AIAttackState::update()
 				ai->notifyVictimIsDead();	// well, not "dead", but longer attackable
 				return STATE_FAILURE;
 			}
-		}	
+		}
 
-		if (victim != m_attackMachine->getGoalObject()) 
+		if (victim != m_attackMachine->getGoalObject())
 		{
 			// Our parent machine has changed the goal.  We need to reset to the new goal.  jba.
 			m_attackMachine->setGoalObject( victim );
@@ -5478,24 +5498,21 @@ void AIAttackState::onExit( StateExitType status )
 	//addSelfAsTargeter(false);
 
 	// destroy the attack machine
-	if (m_attackMachine)
-	{
-		deleteInstance(m_attackMachine);
-		m_attackMachine = NULL;
-	}
+	deleteInstance(m_attackMachine);
+	m_attackMachine = NULL;
 
 	Object *obj = getMachineOwner();
-	obj->clearStatus( MAKE_OBJECT_STATUS_MASK4( OBJECT_STATUS_IS_FIRING_WEAPON, 
-																							OBJECT_STATUS_IS_AIMING_WEAPON, 
-																							OBJECT_STATUS_IS_ATTACKING, 
+	obj->clearStatus( MAKE_OBJECT_STATUS_MASK4( OBJECT_STATUS_IS_FIRING_WEAPON,
+																							OBJECT_STATUS_IS_AIMING_WEAPON,
+																							OBJECT_STATUS_IS_ATTACKING,
 																							OBJECT_STATUS_IGNORING_STEALTH ) );
 	obj->clearModelConditionState( MODELCONDITION_ATTACKING );
 
 	obj->clearLeechRangeModeForAllWeapons();
 
 	AIUpdateInterface *ai = obj->getAI();
-	if (ai) 
-	{	
+	if (ai)
+	{
 		//ai->notifyVictimIsDead();	no, do NOT do this here.
 		ai->setCurrentVictim(NULL);
 		for (int i = 0; i < MAX_TURRETS; ++i)
@@ -5529,19 +5546,19 @@ class AIAttackThenIdleStateMachine : public StateMachine
 void AIAttackThenIdleStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void AIAttackThenIdleStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -5549,7 +5566,7 @@ void AIAttackThenIdleStateMachine::xfer( Xfer *xfer )
 void AIAttackThenIdleStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //-----------------------------------------------------------------------------------------------------------
 AIAttackThenIdleStateMachine::AIAttackThenIdleStateMachine(Object *owner, AsciiString name) : StateMachine(owner, name)
@@ -5583,7 +5600,7 @@ AIAttackSquadState::~AIAttackSquadState()
 // ------------------------------------------------------------------------------------------------
 void AIAttackSquadState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -5594,9 +5611,9 @@ void AIAttackSquadState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
-	
+
 	Bool hasMachine = m_attackSquadMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
 	if (hasMachine && m_attackSquadMachine==NULL)	{
@@ -5607,14 +5624,14 @@ void AIAttackSquadState::xfer( Xfer *xfer )
 	if (hasMachine) {
 		xfer->xferSnapshot(m_attackSquadMachine);
 	}
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIAttackSquadState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 #ifdef STATE_MACHINE_DEBUG
 //----------------------------------------------------------------------------------------------------------
@@ -5637,7 +5654,7 @@ StateReturnType AIAttackSquadState::onEnter( void )
 {
 	// create new state machine for attack behavior
 	m_attackSquadMachine = newInstance(AIAttackThenIdleStateMachine)( getMachineOwner(), "AIAttackMachine"  );
-	
+
 	Object *victim = chooseVictim();
 	// tell the attack machine who the victim of the attack is
 	m_attackSquadMachine->setGoalObject( victim );
@@ -5659,14 +5676,14 @@ StateReturnType AIAttackSquadState::update( void )
 		return STATE_FAILURE;
 	}
 
-	/* 
+	/*
 		Note the use of CONVERT_SLEEP_TO_CONTINUE; even if the sub-machine
 		sleeps, we still need to be called every frame.
 	*/
 	StateReturnType attackStatus = CONVERT_SLEEP_TO_CONTINUE(m_attackSquadMachine->updateStateMachine());
 
-	// if we're in attack state, 
-	if (m_attackSquadMachine->getCurrentStateID() != AI_IDLE) 
+	// if we're in attack state,
+	if (m_attackSquadMachine->getCurrentStateID() != AI_IDLE)
 	{
 		return attackStatus;
 	}
@@ -5683,7 +5700,7 @@ StateReturnType AIAttackSquadState::update( void )
 
 	// choose a new target and start over.
 	Object *victim = chooseVictim();
-	if (!victim) 
+	if (!victim)
 	{
 		return STATE_SUCCESS;
 	}
@@ -5696,19 +5713,16 @@ StateReturnType AIAttackSquadState::update( void )
 //----------------------------------------------------------------------------------------------------------
 void AIAttackSquadState::onExit( StateExitType status )
 {
-	if( m_attackSquadMachine )
-	{
-		// destroy the attack machine
-		deleteInstance(m_attackSquadMachine);
-		m_attackSquadMachine = NULL;
-	}
+	// destroy the attack machine
+	deleteInstance(m_attackSquadMachine);
+	m_attackSquadMachine = NULL;
 }
 
 //----------------------------------------------------------------------------------------------------------
 Object *AIAttackSquadState::chooseVictim(void)
 {
 	Squad *victimSquad = ((AIStateMachine*)getMachine())->getGoalSquad();
-	if (!victimSquad) 
+	if (!victimSquad)
 	{
 		return NULL;
 	}
@@ -5716,23 +5730,23 @@ Object *AIAttackSquadState::chooseVictim(void)
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAI();
 	UnsignedInt moodVal = ai->getMoodMatrixValue();
-	
-	if (moodVal & MM_Controller_AI) 
+
+	if (moodVal & MM_Controller_AI)
 	{
-		if (moodVal & MM_Mood_Sleep) 
+		if (moodVal & MM_Mood_Sleep)
 		{
 			return NULL;
 		}
 
-		if (moodVal & MM_Mood_Passive) 
+		if (moodVal & MM_Mood_Passive)
 		{
 			BodyModuleInterface *bmi = owner->getBodyModule();
 			if (!bmi) {
 				return NULL;
 			}
-			
+
 			const DamageInfo *di = bmi->getLastDamageInfo();
-			if (!di) 
+			if (!di)
 			{
 				return NULL;
 			}
@@ -5743,8 +5757,8 @@ Object *AIAttackSquadState::chooseVictim(void)
 
 	GameDifficulty difficulty = owner->getControllingPlayer()->getPlayerDifficulty();
 	const CommandSourceType cmdSource = ai->getLastCommandSource();
-	
-	if (cmdSource == CMD_FROM_PLAYER) 
+
+	if (cmdSource == CMD_FROM_PLAYER)
 	{
 		// if a player did this, we want to always give them the Seek and obliterate method.
 		difficulty = DIFFICULTY_HARD;
@@ -5753,7 +5767,7 @@ Object *AIAttackSquadState::chooseVictim(void)
 	if (TheScriptEngine->getChooseVictimAlwaysUsesNormal())
 	{
 		difficulty = DIFFICULTY_NORMAL;
-	}	
+	}
 
 	switch(difficulty)
 	{
@@ -5762,7 +5776,7 @@ Object *AIAttackSquadState::chooseVictim(void)
 			// pick a random unit
 			VecObjectPtr objects = victimSquad->getLiveObjects();
 			Int numUnits = objects.size();
-			if (numUnits == 0) 
+			if (numUnits == 0)
 			{
 				return NULL;
 			}
@@ -5779,7 +5793,7 @@ Object *AIAttackSquadState::chooseVictim(void)
 			PartitionFilterAcceptOnSquad f1(victimSquad);
 			PartitionFilterSameMapStatus filterMapStatus(getMachineOwner());
 			PartitionFilter *filters[] = { &f1, &filterMapStatus, NULL };
-			
+
 			Object *victim = ThePartitionManager->getClosestObject(getMachineOwner(), HUGE_DIST, FROM_CENTER_2D, filters, NULL, NULL);
 			return victim;
 			break;
@@ -5789,7 +5803,7 @@ Object *AIAttackSquadState::chooseVictim(void)
 		{
 			// everyone picks the same unit
 			VecObjectPtr objects = victimSquad->getLiveObjects();
-			if (objects.size() > 0) 
+			if (!objects.empty())
 			{
 				return objects[0];
 			}
@@ -5820,7 +5834,7 @@ AIDockState::~AIDockState()
 // ------------------------------------------------------------------------------------------------
 void AIDockState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -5833,7 +5847,7 @@ void AIDockState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_dockMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
 	if (hasMachine && m_dockMachine==NULL)	{
@@ -5844,14 +5858,14 @@ void AIDockState::xfer( Xfer *xfer )
 		xfer->xferSnapshot(m_dockMachine);
 	}
 	xfer->xferBool(&m_usingPrecisionMovement);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIDockState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 #ifdef STATE_MACHINE_DEBUG
 //----------------------------------------------------------------------------------------------------------
@@ -5878,7 +5892,7 @@ StateReturnType AIDockState::onEnter()
 	if (dockWithMe == NULL)
 	{
 		// we have nothing to dock with!
-		DEBUG_LOG(("No goal in AIDockState::onEnter - exiting.\n"));
+		DEBUG_LOG(("No goal in AIDockState::onEnter - exiting."));
 		return STATE_FAILURE;
 	}
   DockUpdateInterface *dock = NULL;
@@ -5886,13 +5900,13 @@ StateReturnType AIDockState::onEnter()
 
 	// if we have nothing to dock with, fail
 	if (dock == NULL)	{
-		DEBUG_LOG(("Goal is not a dock in AIDockState::onEnter - exiting.\n"));
+		DEBUG_LOG(("Goal is not a dock in AIDockState::onEnter - exiting."));
 		return STATE_FAILURE;
 	}
 
 	// tell the pathfinder to ignore the object we are docking with, so it doesn't block us
 	AIUpdateInterface *ai = getMachineOwner()->getAI();
-	if( ai ) 
+	if( ai )
 	{
 		ai->ignoreObstacle( dockWithMe );
 	}
@@ -5918,7 +5932,7 @@ void AIDockState::onExit( StateExitType status )
 		deleteInstance(m_dockMachine);
 		m_dockMachine = NULL;
 	}	else {
-		DEBUG_LOG(("Dock exited immediately\n"));
+		DEBUG_LOG(("Dock exited immediately"));
 	}
 
 	// stop ignoring our goal object
@@ -5928,7 +5942,7 @@ void AIDockState::onExit( StateExitType status )
 		ai->setCanPathThroughUnits(false);
 		ai->ignoreObstacle( NULL );
 	}
-	
+
 }
 
 /**
@@ -5949,13 +5963,13 @@ StateReturnType AIDockState::update()
 	{
 		ai->setCanPathThroughUnits(true);
 		//if (ai->isBlockedAndStuck()) {
-			//DEBUG_LOG(("Blocked and stuck.\n"));
+			//DEBUG_LOG(("Blocked and stuck."));
 		//}
 		//if (ai->getNumFramesBlocked()>5) {
-			//DEBUG_LOG(("Blocked %d frames\n", ai->getNumFramesBlocked()));
+			//DEBUG_LOG(("Blocked %d frames", ai->getNumFramesBlocked()));
 		//}
 	}
-	/* 
+	/*
 		Note the use of CONVERT_SLEEP_TO_CONTINUE; even if the sub-machine
 		sleeps, we still need to be called every frame.
 	*/
@@ -5972,7 +5986,7 @@ StateReturnType AIDockState::update()
 void AIEnterState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -5987,7 +6001,7 @@ void AIEnterState::xfer( Xfer *xfer )
 	AIInternalMoveToState::xfer(xfer);
 
 	xfer->xferObjectID(&m_entryToClear);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -5995,7 +6009,7 @@ void AIEnterState::xfer( Xfer *xfer )
 void AIEnterState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIEnterState::onEnter()
@@ -6007,7 +6021,7 @@ StateReturnType AIEnterState::onEnter()
 	if (goal)
 	{
 		if( !TheActionManager->canEnterObject( obj, goal, obj->getAI()->getLastCommandSource(), CHECK_CAPACITY ) )
-			return STATE_FAILURE;	
+			return STATE_FAILURE;
 
 		m_goalPosition = *goal->getPosition();
 
@@ -6026,7 +6040,7 @@ StateReturnType AIEnterState::onEnter()
 	// tell the pathfinder to ignore the enterable object
 	AIUpdateInterface *ai = obj->getAI();
 	ai->ignoreObstacle( getMachineGoalObject() );
-	if (ai->getCurLocomotor()) 
+	if (ai->getCurLocomotor())
 	{
 		ai->getCurLocomotor()->setAllowInvalidPosition(true);
 	}
@@ -6042,11 +6056,11 @@ void AIEnterState::onExit( StateExitType status )
 
 	// tell the pathfinder to stop ignoring the object
 	AIUpdateInterface *ai = obj->getAI();
-	if (ai) 
+	if (ai)
 	{
 
 		ai->ignoreObstacle( NULL );
-		if (ai->getCurLocomotor()) 
+		if (ai->getCurLocomotor())
 		{
 			ai->getCurLocomotor()->setAllowInvalidPosition(false);
 		}
@@ -6084,7 +6098,7 @@ StateReturnType AIEnterState::update()
 		// this just bails in this case. (srj)
 		if (goal->getContainedBy() != NULL && goal->isAboveTerrain() && !obj->isAboveTerrain())
 		{
-			return STATE_FAILURE;	
+			return STATE_FAILURE;
 		}
 
 		m_goalPosition = *goal->getPosition();
@@ -6112,9 +6126,9 @@ StateReturnType AIEnterState::update()
 					// since we just changed the state, it doesn't really matter what we return here.
 					return STATE_CONTINUE;
 				}
-				return STATE_FAILURE;	
+				return STATE_FAILURE;
 			}
-			return STATE_FAILURE;	
+			return STATE_FAILURE;
 		}
 
 		// If we are held, then we must have entered the goal.
@@ -6122,8 +6136,8 @@ StateReturnType AIEnterState::update()
 		{
 			return STATE_SUCCESS;
 		}
-	} 
-	else 
+	}
+	else
 	{
 		return STATE_FAILURE;
 	}
@@ -6136,7 +6150,7 @@ StateReturnType AIEnterState::update()
 		code = STATE_CONTINUE;
 	}
 
-	if (code == STATE_SUCCESS) 
+	if (code == STATE_SUCCESS)
 	{
 		// Make sure we entered the container.
 		// srj sez: I don't think we want to restrict this to HELD items. See the intro of GLA02.map
@@ -6180,7 +6194,7 @@ StateReturnType AIEnterState::update()
 // ------------------------------------------------------------------------------------------------
 void AIExitState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6193,14 +6207,14 @@ void AIExitState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferObjectID(&m_entryToClear);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIExitState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIExitState::onEnter()
@@ -6258,8 +6272,8 @@ StateReturnType AIExitState::update()
 			return STATE_CONTINUE;// Not sucess, because exitViaDoor has changed us to FollowPath, and if we say Success, our machine will think FollowPath succeeded
 		else
 			return STATE_SUCCESS;
-	} 
-	else 
+	}
+	else
 	{
 		return STATE_FAILURE;
 	}
@@ -6316,7 +6330,7 @@ AsciiString AIGuardState::getName(  ) const
 // ------------------------------------------------------------------------------------------------
 void AIGuardState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6329,7 +6343,7 @@ void AIGuardState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_guardMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
 	if (hasMachine && m_guardMachine==NULL)	{
@@ -6337,17 +6351,17 @@ void AIGuardState::xfer( Xfer *xfer )
 		m_guardMachine = newInstance(AIGuardMachine)( getMachineOwner());
 	}
 	if (hasMachine) {
-		xfer->xferSnapshot(m_guardMachine);	
+		xfer->xferSnapshot(m_guardMachine);
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIGuardState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 /**
@@ -6372,7 +6386,7 @@ StateReturnType AIGuardState::onEnter()
 	m_guardMachine->setGuardMode(ai->getGuardMode());
 
 	// now that essential parameters are set, set the machine's initial state
-	if (m_guardMachine->initDefaultState() == STATE_FAILURE) 
+	if (m_guardMachine->initDefaultState() == STATE_FAILURE)
 		return STATE_FAILURE;
 	return m_guardMachine->setState(AI_GUARD_RETURN);
 }
@@ -6390,9 +6404,9 @@ void AIGuardState::onExit( StateExitType status )
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIGuardState::update()
 {
-	//DEBUG_LOG(("AIGuardState frame %d: %08lx\n",TheGameLogic->getFrame(),getMachineOwner()));
+	//DEBUG_LOG(("AIGuardState frame %d: %08lx",TheGameLogic->getFrame(),getMachineOwner()));
 
-	if (m_guardMachine == NULL) 
+	if (m_guardMachine == NULL)
 	{
 		return STATE_FAILURE; // We actually already exited.
 	}
@@ -6402,7 +6416,7 @@ StateReturnType AIGuardState::update()
 	Object* owner = getMachineOwner();
 	if (owner->isOutOfAmmo() && !owner->isKindOf(KINDOF_PROJECTILE))
 	{
-		DEBUG_CRASH(("Hmm, this should probably never happen, since this case should be intercepted by JetAIUpdate\n"));
+		DEBUG_CRASH(("Hmm, this should probably never happen, since this case should be intercepted by JetAIUpdate"));
 		return STATE_FAILURE;
 	}
 
@@ -6442,7 +6456,7 @@ AsciiString AITunnelNetworkGuardState::getName(  ) const
 // ------------------------------------------------------------------------------------------------
 void AITunnelNetworkGuardState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6455,7 +6469,7 @@ void AITunnelNetworkGuardState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_guardMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
 	if (hasMachine && m_guardMachine==NULL)	{
@@ -6463,17 +6477,17 @@ void AITunnelNetworkGuardState::xfer( Xfer *xfer )
 		m_guardMachine = newInstance(AITNGuardMachine)( getMachineOwner());
 	}
 	if (hasMachine) {
-		xfer->xferSnapshot(m_guardMachine);	
+		xfer->xferSnapshot(m_guardMachine);
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AITunnelNetworkGuardState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 /**
@@ -6489,11 +6503,11 @@ StateReturnType AITunnelNetworkGuardState::onEnter()
 	m_guardMachine = newInstance(AITNGuardMachine)( getMachineOwner());
 
 	// tell the guarding machine what it is guarding with
-	m_guardMachine->setTargetPositionToGuard( ai->getGuardLocation() ); 
+	m_guardMachine->setTargetPositionToGuard( ai->getGuardLocation() );
 	m_guardMachine->setGuardMode(ai->getGuardMode());
 
 	// now that essential parameters are set, set the machine's initial state
-	if (m_guardMachine->initDefaultState() == STATE_FAILURE) 
+	if (m_guardMachine->initDefaultState() == STATE_FAILURE)
 		return STATE_FAILURE;
 	return m_guardMachine->setState(AI_GUARD_RETURN);
 }
@@ -6511,9 +6525,9 @@ void AITunnelNetworkGuardState::onExit( StateExitType status )
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AITunnelNetworkGuardState::update()
 {
-	//DEBUG_LOG(("AITunnelNetworkGuardState frame %d: %08lx\n",TheGameLogic->getFrame(),getMachineOwner()));
+	//DEBUG_LOG(("AITunnelNetworkGuardState frame %d: %08lx",TheGameLogic->getFrame(),getMachineOwner()));
 
-	if (m_guardMachine == NULL) 
+	if (m_guardMachine == NULL)
 	{
 		return STATE_FAILURE; // We actually already exited.
 	}
@@ -6523,7 +6537,7 @@ StateReturnType AITunnelNetworkGuardState::update()
 	Object* owner = getMachineOwner();
 	if (owner->isOutOfAmmo() && !owner->isKindOf(KINDOF_PROJECTILE))
 	{
-		DEBUG_CRASH(("Hmm, this should probably never happen, since this case should be intercepted by JetAIUpdate\n"));
+		DEBUG_CRASH(("Hmm, this should probably never happen, since this case should be intercepted by JetAIUpdate"));
 		return STATE_FAILURE;
 	}
 
@@ -6544,7 +6558,7 @@ StateReturnType AITunnelNetworkGuardState::update()
 //----------------------------------------------------------------------------------------------------------
 AIHuntState::~AIHuntState()
 {
-	if (m_huntMachine) 
+	if (m_huntMachine)
 	{
 		m_huntMachine->halt();
 		deleteInstance(m_huntMachine);
@@ -6556,7 +6570,7 @@ AIHuntState::~AIHuntState()
 // ------------------------------------------------------------------------------------------------
 void AIHuntState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6569,7 +6583,7 @@ void AIHuntState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_huntMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
 	if (hasMachine && m_huntMachine==NULL)	{
@@ -6581,14 +6595,14 @@ void AIHuntState::xfer( Xfer *xfer )
 	}
 	xfer->xferUnsignedInt(&m_nextEnemyScanTime);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIHuntState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 /**
@@ -6601,7 +6615,7 @@ StateReturnType AIHuntState::onEnter()
 	m_huntMachine = newInstance(AIAttackThenIdleStateMachine)( getMachineOwner(), "AIAttackThenIdleStateMachine");
 
 	// first time thru, use a random amount so that everyone doesn't scan on the same frame,
-	// to avoid "spikes". 
+	// to avoid "spikes".
 	UnsignedInt sleepTime = GameLogicRandomValue(0, ENEMY_SCAN_RATE);
 	UnsignedInt now = TheGameLogic->getFrame();
 	m_nextEnemyScanTime = now + sleepTime;
@@ -6618,7 +6632,7 @@ void AIHuntState::onExit( StateExitType status )
 	m_huntMachine = NULL;
 
 	Object *obj = getMachineOwner();
-	if (obj) 
+	if (obj)
 	{
 		obj->releaseWeaponLock(LOCKED_TEMPORARILY);	// release any temporary locks.
 	}
@@ -6668,16 +6682,16 @@ StateReturnType AIHuntState::update()
 
 		// Check if team auto targets same victim.
 		Object* teamVictim = NULL;
-		if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+		if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 		{
 			teamVictim = owner->getTeam()->getTeamTargetObject();
 		}
 		Object* victim = NULL;
-		if (teamVictim && info==NULL) 
+		if (teamVictim && info==NULL)
 		{
 			victim = teamVictim;
-		} 
-		else 
+		}
+		else
 		{
 			// do NOT do line of sight check - we want to find everything
 			victim = TheAI->findClosestEnemy( owner, 9999.9f, AI::CAN_ATTACK, info );
@@ -6685,7 +6699,7 @@ StateReturnType AIHuntState::update()
 				// If we are doing an all hunt, try hunting without the attack priority info. jba.
 				victim = TheAI->findClosestEnemy(owner, 9999.9f, AI::CAN_ATTACK, NULL);
 			}
-			if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+			if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 			{
 				// Check priorities.
 				if (teamVictim && info) {
@@ -6709,7 +6723,7 @@ StateReturnType AIHuntState::update()
 		}
 		m_huntMachine->setGoalObject( victim );
 
-		if (m_huntMachine->getCurrentStateID() == AI_IDLE && victim)	
+		if (m_huntMachine->getCurrentStateID() == AI_IDLE && victim)
 		{
 			m_huntMachine->setState( AI_ATTACK_OBJECT );
 		}
@@ -6721,9 +6735,9 @@ StateReturnType AIHuntState::update()
 		}
 	}
 
-	getMachine()->lock("AIHuntState::update");	// The idle state in the sub machine can sometimes acquire targets. 
+	getMachine()->lock("AIHuntState::update");	// The idle state in the sub machine can sometimes acquire targets.
 												// It is important to not switch out of this state via a sub machine call. jba.
-	/* 
+	/*
 		Note the use of CONVERT_SLEEP_TO_CONTINUE; even if the sub-machine
 		sleeps, we still need to be called every frame.
 	*/
@@ -6752,7 +6766,7 @@ AIAttackAreaState::~AIAttackAreaState()
 // ------------------------------------------------------------------------------------------------
 void AIAttackAreaState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6765,7 +6779,7 @@ void AIAttackAreaState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_attackMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
 	if (hasMachine && m_attackMachine==NULL)	{
@@ -6777,14 +6791,14 @@ void AIAttackAreaState::xfer( Xfer *xfer )
 	}
 	xfer->xferUnsignedInt(&m_nextEnemyScanTime);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIAttackAreaState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 #ifdef STATE_MACHINE_DEBUG
 //----------------------------------------------------------------------------------------------------------
@@ -6806,7 +6820,7 @@ StateReturnType AIAttackAreaState::onEnter()
 	m_attackMachine = newInstance(AIAttackThenIdleStateMachine)( getMachineOwner(), "AIAttackThenIdleStateMachine");
 
 	// first time thru, use a random amount so that everyone doesn't scan on the same frame,
-	// to avoid "spikes". 
+	// to avoid "spikes".
 	UnsignedInt now = TheGameLogic->getFrame();
 	m_nextEnemyScanTime = now + GameLogicRandomValue(0, ENEMY_SCAN_RATE);
 
@@ -6843,7 +6857,7 @@ StateReturnType AIAttackAreaState::update()
 		m_nextEnemyScanTime = now + ENEMY_SCAN_RATE;
 
 		AIUpdateInterface *ai = owner->getAI();
-		if (ai->getAreaToGuard() == NULL) 
+		if (ai->getAreaToGuard() == NULL)
 			return STATE_FAILURE;
 
 		const AttackPriorityInfo *info = NULL;
@@ -6854,7 +6868,7 @@ StateReturnType AIAttackAreaState::update()
 		Object *victim = TheAI->findClosestEnemy( owner, 9999.9f, AI::CAN_ATTACK, info, &polyFilter );
 		m_attackMachine->setGoalObject( victim );
 
-		if (m_attackMachine->getCurrentStateID() == AI_IDLE && victim)	
+		if (m_attackMachine->getCurrentStateID() == AI_IDLE && victim)
 		{
 			m_attackMachine->setState( AI_ATTACK_OBJECT );
 		}
@@ -6863,9 +6877,9 @@ StateReturnType AIAttackAreaState::update()
 		}
 	}
 
-	getMachine()->lock("AIAttackAreaState::update");	// The idle state in the sub machine can sometimes acquire targets. 
+	getMachine()->lock("AIAttackAreaState::update");	// The idle state in the sub machine can sometimes acquire targets.
 												// It is important to not switch out of this state via a sub machine call. jba.
-	/* 
+	/*
 		Note the use of CONVERT_SLEEP_TO_CONTINUE; even if the sub-machine
 		sleeps, we still need to be called every frame.
 	*/
@@ -6886,7 +6900,7 @@ StateReturnType AIAttackAreaState::update()
 // ------------------------------------------------------------------------------------------------
 void AIFaceState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6899,7 +6913,7 @@ void AIFaceState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferBool(&m_canTurnInPlace);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -6907,7 +6921,7 @@ void AIFaceState::xfer( Xfer *xfer )
 void AIFaceState::loadPostProcess( void )
 {
 	// empty.  jba.
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIFaceState::onEnter()
@@ -6922,7 +6936,7 @@ StateReturnType AIFaceState::onEnter()
 	if (m_obj && target == NULL )
 	{
 		// Nothing to face...
-		return STATE_FAILURE; 
+		return STATE_FAILURE;
 	}
 
 	return STATE_CONTINUE;
@@ -6947,7 +6961,7 @@ StateReturnType AIFaceState::update()
 		if (!target)
 		{
 			// Nothing to face.
-			return STATE_FAILURE;	
+			return STATE_FAILURE;
 		}
 		pos = target->getPosition();
 	}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp
index 16446d486b7..048c7163432 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: AITNGuard.cpp 
+// FILE: AITNGuard.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -36,7 +36,7 @@
 /* Revision History:                                                         */
 /*		12/20/2002 : Initial creation - modified from AIGuard.cpp                                           */
 /*---------------------------------------------------------------------------*/
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 #include "Common/Team.h"
@@ -55,11 +55,6 @@
 
 const Real CLOSE_ENOUGH = (25.0f);
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/ )
 {
@@ -78,10 +73,10 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
 	Object *target = TheGameLogic->findObjectByID(bmi->getClearableLastAttacker());
 	bmi->clearLastAttacker();
 
-	// We use the clearable last attacker because we should continue attacking the guy. But if he 
-	// stops attacking us, then we want our timer to kick us off of him and make us go attack 
+	// We use the clearable last attacker because we should continue attacking the guy. But if he
+	// stops attacking us, then we want our timer to kick us off of him and make us go attack
 	// other units instead.
-	
+
 
 	if (!target) {
 		return FALSE;
@@ -91,7 +86,7 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
 		return FALSE;
 	}
 
-	// This is a quick test on the target. It will be duplicated in getAbleToAttackSpecificObject, 
+	// This is a quick test on the target. It will be duplicated in getAbleToAttackSpecificObject,
 	// but the payoff is worth the duplication.
 	if (target->isEffectivelyDead()) {
 		return FALSE;
@@ -105,7 +100,7 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
 	return FALSE;
 }
 
-static Object *findBestTunnel(Player *ownerPlayer, const Coord3D *pos) 
+static Object *findBestTunnel(Player *ownerPlayer, const Coord3D *pos)
 {
 	if (!ownerPlayer) return NULL; // should never happen, but hey.  jba.
 	TunnelTracker *tunnels = ownerPlayer->getTunnelSystem();
@@ -139,25 +134,25 @@ Bool TunnelNetworkExitConditions::shouldExit(const StateMachine* machine) const
 		if (TheGameLogic->getFrame() >= m_attackGiveUpFrame)
 		{
 			return true;
-		} 
-	
+		}
+
 	return false;
 }
 
 
 //-- AITNGuardMachine -------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------
-AITNGuardMachine::AITNGuardMachine( Object *owner ) : 
+AITNGuardMachine::AITNGuardMachine( Object *owner ) :
 	StateMachine(owner, "AITNGuardMachine"),
 	m_nemesisToAttack(INVALID_ID),
 	m_guardMode(GUARDMODE_NORMAL)
 {
 	m_positionToGuard.zero();
-	
+
 	static const StateConditionInfo attackAggressors[] =
 	{
 		StateConditionInfo(hasAttackedMeAndICanReturnFire, AI_TN_GUARD_ATTACK_AGGRESSOR, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -182,7 +177,7 @@ AITNGuardMachine::~AITNGuardMachine()
 //--------------------------------------------------------------------------------------
 /*static*/ Real AITNGuardMachine::getStdGuardRange(const Object* obj)
 {
-	Real visionRange = TheAI->getAdjustedVisionRangeForObject(obj, 
+	Real visionRange = TheAI->getAdjustedVisionRangeForObject(obj,
 		AI_VISIONFACTOR_OWNERTYPE | AI_VISIONFACTOR_MOOD | AI_VISIONFACTOR_GUARDINNER);
 
 	return visionRange;
@@ -195,10 +190,10 @@ Bool AITNGuardMachine::lookForInnerTarget(void)
 
 	// Check if team auto targets same victim.
 	Object *teamVictim = NULL;
-	if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+	if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 	{
 		teamVictim = owner->getTeam()->getTeamTargetObject();
-		if (teamVictim) 
+		if (teamVictim)
 		{
 			setNemesisID(teamVictim->getID());
 			return true;	// Transitions to AITNGuardInnerState.
@@ -239,7 +234,7 @@ Bool AITNGuardMachine::lookForInnerTarget(void)
 						// winner.
 						ObjectID attackerID = info->in.m_sourceID;
 						Object *attacker = TheGameLogic->findObjectByID(attackerID);
-						
+
 						if( attacker )
 						{
 							if (owner->getRelationship(attacker) != ENEMIES) {
@@ -268,7 +263,7 @@ Bool AITNGuardMachine::lookForInnerTarget(void)
 // ------------------------------------------------------------------------------------------------
 void AITNGuardMachine::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -287,14 +282,14 @@ void AITNGuardMachine::xfer( Xfer *xfer )
 	xfer->xferObjectID(&m_nemesisToAttack);
 	xfer->xferCoord3D(&m_positionToGuard);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AITNGuardMachine::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-- AITNGuardInnerState ----------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -302,7 +297,7 @@ void AITNGuardMachine::loadPostProcess( void )
 // ------------------------------------------------------------------------------------------------
 void AITNGuardInnerState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -314,7 +309,7 @@ void AITNGuardInnerState::xfer( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -322,15 +317,21 @@ void AITNGuardInnerState::xfer( Xfer *xfer )
 void AITNGuardInnerState::loadPostProcess( void )
 {
 	onEnter();
-}  // end loadPostProcess
+}
+
+// ------------------------------------------------------------------------------------------------
+AITNGuardInnerState::~AITNGuardInnerState(void)
+{
+	deleteInstance(m_attackState);
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardInnerState::onEnter( void )
 {
 	Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardInnerState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardInnerState."));
 		return STATE_SUCCESS;
 	}
 	m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
@@ -348,7 +349,7 @@ StateReturnType AITNGuardInnerState::onEnter( void )
 	return STATE_SUCCESS;
 }
 
-static Object *TunnelNetworkScan(Object *owner) 
+static Object *TunnelNetworkScan(Object *owner)
 {
 		PartitionFilterRelationship					f1(owner, PartitionFilterRelationship::ALLOW_ENEMIES);
 		PartitionFilterPossibleToAttack			f2(ATTACK_NEW_TARGET, owner, CMD_FROM_AI);
@@ -371,7 +372,7 @@ static Object *TunnelNetworkScan(Object *owner)
 
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardInnerState::update( void )
-{	
+{
 	Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
 	Player *ownerPlayer = getMachineOwner()->getControllingPlayer();
 	TunnelTracker *tunnels = NULL;
@@ -382,13 +383,13 @@ StateReturnType AITNGuardInnerState::update( void )
 	Object* owner = getMachineOwner();
 	// killed him.
 	Object *teamVictim = owner->getTeam()->getTeamTargetObject();
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		if (teamVictim) 
+		if (teamVictim)
 		{
 			getGuardMachine()->setNemesisID(teamVictim->getID());
 			m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
-			return STATE_CONTINUE;	
+			return STATE_CONTINUE;
 		}
 
 		// Check tunnel.
@@ -397,7 +398,7 @@ StateReturnType AITNGuardInnerState::update( void )
 			if (nemesis) {
 				getGuardMachine()->setNemesisID(nemesis->getID());
 				m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
-				return STATE_CONTINUE;	
+				return STATE_CONTINUE;
 			}
 		}
 
@@ -417,7 +418,7 @@ StateReturnType AITNGuardInnerState::update( void )
 	} else {
 		if (nemesis != teamVictim && teamVictim != NULL) {
 			tunnels->updateNemesis(nemesis);
-			getGuardMachine()->setNemesisID(teamVictim->getID());	
+			getGuardMachine()->setNemesisID(teamVictim->getID());
 		}
 	}
 	return m_attackState->update();
@@ -426,7 +427,7 @@ StateReturnType AITNGuardInnerState::update( void )
 //--------------------------------------------------------------------------------------
 void AITNGuardInnerState::onExit( StateExitType status )
 {
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
@@ -440,7 +441,7 @@ void AITNGuardInnerState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AITNGuardOuterState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -452,7 +453,7 @@ void AITNGuardOuterState::xfer( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -460,7 +461,13 @@ void AITNGuardOuterState::xfer( Xfer *xfer )
 void AITNGuardOuterState::loadPostProcess( void )
 {						 AITNGuardOuterState
 	onEnter();
-}  // end loadPostProcess
+}
+
+// ------------------------------------------------------------------------------------------------
+AITNGuardOuterState::~AITNGuardOuterState(void)
+{
+	deleteInstance(m_attackState);
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardOuterState::onEnter( void )
@@ -472,9 +479,9 @@ StateReturnType AITNGuardOuterState::onEnter( void )
 	}
 
 	Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardOuterState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardOuterState."));
 		return STATE_SUCCESS;
 	}
 
@@ -496,7 +503,7 @@ StateReturnType AITNGuardOuterState::update( void )
 {
 	Object *owner = getMachineOwner();
 	Object* goalObj = m_attackState->getMachineGoalObject();
-	if (goalObj) 
+	if (goalObj)
 	{
 	}	else {
 		Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
@@ -505,25 +512,25 @@ StateReturnType AITNGuardOuterState::update( void )
 		}
 		// Check if team auto targets same victim.
 		Object *teamVictim = NULL;
-		if (goalObj == NULL && owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+		if (goalObj == NULL && owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 		{
 			teamVictim = owner->getTeam()->getTeamTargetObject();
-			if (teamVictim) 
-			{	
-				goalObj = teamVictim;	
+			if (teamVictim)
+			{
+				goalObj = teamVictim;
 			}
 			m_attackState->getMachine()->setGoalObject(goalObj);
 			return m_attackState->onEnter();
 		}
 	}
-	
+
 	return m_attackState->update();
 }
 
 //--------------------------------------------------------------------------------------
 void AITNGuardOuterState::onExit( StateExitType status )
 {
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
@@ -538,7 +545,7 @@ void AITNGuardOuterState::onExit( StateExitType status )
 void AITNGuardReturnState::crc( Xfer *xfer )
 {
 	AIEnterState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -551,9 +558,9 @@ void AITNGuardReturnState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	AIEnterState::xfer(xfer);
-	
+
 	xfer->xferUnsignedInt(&m_nextReturnScanTime);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -561,7 +568,7 @@ void AITNGuardReturnState::xfer( Xfer *xfer )
 void AITNGuardReturnState::loadPostProcess( void )
 {
 	AIEnterState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardReturnState::onEnter( void )
@@ -570,7 +577,7 @@ StateReturnType AITNGuardReturnState::onEnter( void )
 	m_nextReturnScanTime = now + GameLogicRandomValue(0, TheAI->getAiData()->m_guardEnemyReturnScanRate);
 
 // no, no, no, don't do this in onEnter, unless you like really slow maps. (srj)
-//	if (getGuardMachine()->lookForInnerTarget()) 
+//	if (getGuardMachine()->lookForInnerTarget())
 //		return STATE_FAILURE; // early termination because we found a target.
 
 	// Find tunnel network to enter.
@@ -580,7 +587,7 @@ StateReturnType AITNGuardReturnState::onEnter( void )
 
 	getMachine()->setGoalObject(bestTunnel);
 	getMachineOwner()->getAI()->friend_setGoalObject(bestTunnel);
-	
+
 	return AIEnterState::onEnter();
 }
 
@@ -590,9 +597,9 @@ StateReturnType AITNGuardReturnState::update( void )
 	Player *ownerPlayer = getMachineOwner()->getControllingPlayer();
 	if (getMachineOwner()->getTeam()) {
 		Object *teamVictim = getMachineOwner()->getTeam()->getTeamTargetObject();
-		if (teamVictim)	{	
+		if (teamVictim)	{
 			getGuardMachine()->setNemesisID(teamVictim->getID());
-			return STATE_FAILURE; // Fail to return goes to inner attack state.	
+			return STATE_FAILURE; // Fail to return goes to inner attack state.
 		}
 	}
 	// Check tunnel for target.
@@ -604,12 +611,12 @@ StateReturnType AITNGuardReturnState::update( void )
 	if (tunnels) {
 		Object *nemesis = tunnels->getCurNemesis();
 		if (nemesis) {
-			// Check distance.  
+			// Check distance.
 			//Coord3D dist;
 			//Coord3D curPos;
 			//dist.set()
 			getGuardMachine()->setNemesisID(nemesis->getID());
-			return STATE_FAILURE; // Fail to return goes to inner attack state.	
+			return STATE_FAILURE; // Fail to return goes to inner attack state.
 		}
 	}
 
@@ -617,7 +624,7 @@ StateReturnType AITNGuardReturnState::update( void )
 	StateReturnType ret = AIEnterState::update();
 	if (ret==STATE_CONTINUE) return STATE_CONTINUE;
 	return STATE_SUCCESS;
-	
+
 }
 
 //--------------------------------------------------------------------------------------
@@ -632,7 +639,7 @@ void AITNGuardReturnState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AITNGuardIdleState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -643,22 +650,22 @@ void AITNGuardIdleState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
-	
+
 	xfer->xferUnsignedInt(&m_nextEnemyScanTime);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AITNGuardIdleState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardIdleState::onEnter( void )
 {
 	// first time thru, use a random amount so that everyone doesn't scan on the same frame,
-	// to avoid "spikes". 
+	// to avoid "spikes".
 	UnsignedInt now = TheGameLogic->getFrame();
 	m_nextEnemyScanTime = now + GameLogicRandomValue(0, TheAI->getAiData()->m_guardEnemyScanRate);
 
@@ -669,7 +676,7 @@ StateReturnType AITNGuardIdleState::onEnter( void )
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardIdleState::update( void )
 {
-	//DEBUG_LOG(("AITNGuardIdleState frame %d: %08lx\n",TheGameLogic->getFrame(),getMachineOwner()));
+	//DEBUG_LOG(("AITNGuardIdleState frame %d: %08lx",TheGameLogic->getFrame(),getMachineOwner()));
 
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (now < m_nextEnemyScanTime)
@@ -685,19 +692,19 @@ StateReturnType AITNGuardIdleState::update( void )
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAIUpdateInterface();
 	// Check to see if we have created a crate we need to pick up.
-	if (ai->getCrateID() != INVALID_ID) 
+	if (ai->getCrateID() != INVALID_ID)
 	{
 		getMachine()->setState(AI_TN_GUARD_GET_CRATE);
 		return STATE_SLEEP(m_nextEnemyScanTime - now);
 	}
 
 	// if anyone is in the inner area, return success.
-	if (getGuardMachine()->lookForInnerTarget()) 
+	if (getGuardMachine()->lookForInnerTarget())
 	{
 		Object *nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID());
-		if (nemesis == NULL) 
+		if (nemesis == NULL)
 		{
-			DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardAttackAggressorState.\n"));
+			DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardAttackAggressorState."));
 			return STATE_SLEEP(0);
 		}
 		if (getMachineOwner()->getContainedBy()) {
@@ -732,14 +739,14 @@ AITNGuardPickUpCrateState::AITNGuardPickUpCrateState( StateMachine *machine )	:
 {
 #ifdef STATE_MACHINE_DEBUG
 		setName("AITNGuardPickUpCrateState");
-#endif	
+#endif
 }
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardPickUpCrateState::onEnter( void )
 {
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAIUpdateInterface();
-	
+
 	// Check to see if we have created a crate we need to pick up.
 	Object* crate = ai->checkForCrateToPickup();
 	if (crate)
@@ -760,17 +767,23 @@ StateReturnType AITNGuardPickUpCrateState::update( void )
 //--------------------------------------------------------------------------------------
 void AITNGuardPickUpCrateState::onExit( StateExitType status )
 {
-	
+
 }
 
 //-- AITNGuardAttackAggressorState ------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-AITNGuardAttackAggressorState::AITNGuardAttackAggressorState( StateMachine *machine ) : 
+AITNGuardAttackAggressorState::AITNGuardAttackAggressorState( StateMachine *machine ) :
 	State( machine, "AITNGuardAttackAggressorState" )
 {
 	m_attackState = NULL;
 }
 
+// ------------------------------------------------------------------------------------------------
+AITNGuardAttackAggressorState::~AITNGuardAttackAggressorState(void)
+{
+	deleteInstance(m_attackState);
+}
+
 //-------------------------------------------------------------------------------------------------
 StateReturnType AITNGuardAttackAggressorState::onEnter( void )
 {
@@ -779,14 +792,14 @@ StateReturnType AITNGuardAttackAggressorState::onEnter( void )
 
 	if (obj->getBodyModule() && obj->getBodyModule()->getLastDamageInfo()->in.m_sourceID) {
 		nemID = obj->getBodyModule()->getLastDamageInfo()->in.m_sourceID;
-		getGuardMachine()->setNemesisID(nemID);	 
+		getGuardMachine()->setNemesisID(nemID);
 
 	}
 
 	Object *nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID());
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardAttackAggressorState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardAttackAggressorState."));
 		return STATE_SUCCESS;
 	}
 
@@ -812,7 +825,7 @@ StateReturnType AITNGuardAttackAggressorState::onEnter( void )
 
 //-------------------------------------------------------------------------------------------------
 StateReturnType AITNGuardAttackAggressorState::update( void )
-{	
+{
 	if (m_attackState->getMachine()->getCurrentStateID() == AttackStateMachine::FIRE_WEAPON) {
 		Object *nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID());
 		Player *ownerPlayer = getMachineOwner()->getControllingPlayer();
@@ -829,14 +842,14 @@ StateReturnType AITNGuardAttackAggressorState::update( void )
 void AITNGuardAttackAggressorState::onExit( StateExitType status )
 {
 	Object *obj = getMachineOwner();
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
 		m_attackState = NULL;
 	}
 
-	if (obj->getTeam()) 
+	if (obj->getTeam())
 	{
 		obj->getTeam()->setTeamTargetObject(NULL); // clear the target.
 	}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/Squad.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/Squad.cpp
index 8f529bdbe69..157899e6900 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/Squad.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/Squad.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Squad.cpp 
+// FILE: Squad.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -36,7 +36,7 @@
 /* Revision History:                                                         */
 /*		4/19/2002 : Initial creation                                          */
 /*---------------------------------------------------------------------------*/
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameLogic/Squad.h"
 
@@ -48,11 +48,6 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Object.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // addObject //////////////////////////////////////////////////////////////////////////////////////
 void Squad::addObject(Object *objectToAdd)
@@ -105,19 +100,19 @@ const VecObjectPtr& Squad::getAllObjects(void) // Not a const function cause we
 }
 
 // getLiveObjects /////////////////////////////////////////////////////////////////////////////////
-const VecObjectPtr& Squad::getLiveObjects(void) 
+const VecObjectPtr& Squad::getLiveObjects(void)
 {
 	// first get all the objects.
 	// cheat, since we are a member function, and just use m_objectsCached
 	getAllObjects();
 	for (VecObjectPtrIt it = m_objectsCached.begin(); it != m_objectsCached.end(); ) {
 		if (!(*it)->isSelectable()) {
-			it = m_objectsCached.erase(it);		
+			it = m_objectsCached.erase(it);
 		} else {
 			++it;
 		}
 	}
-	
+
 	return m_objectsCached;
 }
 
@@ -142,8 +137,8 @@ Bool Squad::isOnSquad(const Object *objToTest) const
 }
 
 /**
- * There should never be a TeamFromSqaud as Teams are entirely a construct to work with the AI. 
- * Since things can only be on one Team at a time, creating a Team from an arbitrary Squad will 
+ * There should never be a TeamFromSqaud as Teams are entirely a construct to work with the AI.
+ * Since things can only be on one Team at a time, creating a Team from an arbitrary Squad will
  * cause weird, difficult to reproduce bugs. Please don't do it.
  */
 
@@ -184,7 +179,7 @@ void Squad::aiGroupFromSquad(AIGroup* aiGroupToFill)
 	if (!aiGroupToFill) {
 		return;
 	}
-	
+
 	// cheat, since we are a member function, and just use m_objectsCached
 	getLiveObjects();
 	for (VecObjectPtr::iterator it = m_objectsCached.begin(); it != m_objectsCached.end(); ++it) {
@@ -198,7 +193,7 @@ void Squad::aiGroupFromSquad(AIGroup* aiGroupToFill)
 void Squad::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -231,20 +226,20 @@ void Squad::xfer( Xfer *xfer )
 			objectID = *it;
 			xfer->xferObjectID( &objectID );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
-		
+
 		// the cached objects list should be empty
-		if( m_objectsCached.size() != 0 )
+		if( !m_objectsCached.empty() )
 		{
 
-			DEBUG_CRASH(( "Squad::xfer - m_objectsCached should be emtpy, but is not\n" ));
+			DEBUG_CRASH(( "Squad::xfer - m_objectsCached should be emtpy, but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end of
+		}
 
 		// read all items
 		for( UnsignedShort i = 0; i < objectCount; ++i )
@@ -256,11 +251,11 @@ void Squad::xfer( Xfer *xfer )
 			// put on list
 			m_objectIDs.push_back( objectID );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -268,4 +263,4 @@ void Squad::xfer( Xfer *xfer )
 void Squad::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp
index 4f07e883143..c9270e89047 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp
@@ -22,11 +22,11 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// TurretAI.cpp 
+// TurretAI.cpp
 // Turret behavior implementation
 // Author: Steven Johnson, April 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES
 
@@ -47,18 +47,13 @@
 
 const UnsignedInt WAIT_INDEFINITELY = 0xffffffff;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 static StateReturnType frameToSleepTime(
-	UnsignedInt frame1, 
-	UnsignedInt frame2 = FOREVER, 
-	UnsignedInt frame3 = FOREVER, 
+	UnsignedInt frame1,
+	UnsignedInt frame2 = FOREVER,
+	UnsignedInt frame3 = FOREVER,
 	UnsignedInt frame4 = FOREVER
 )
 {
@@ -83,15 +78,15 @@ static StateReturnType frameToSleepTime(
 
 //----------------------------------------------------------------------------------------------------------
 /**
- * Create a TurretAI state machine. Define all of the states the machine 
+ * Create a TurretAI state machine. Define all of the states the machine
  * can possibly be in, and set the initial (default) state.
  */
 TurretStateMachine::TurretStateMachine( TurretAI* tai, Object *obj, AsciiString name ) : m_turretAI(tai), StateMachine( obj, name )
 {
-	static const StateConditionInfo fireConditions[] = 
+	static const StateConditionInfo fireConditions[] =
 	{
 		StateConditionInfo(outOfWeaponRangeObject, TURRETAI_AIM, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -148,25 +143,25 @@ StateReturnType TurretStateMachine::setState(StateID newStateID)
 // ------------------------------------------------------------------------------------------------
 void TurretStateMachine::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void TurretStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void TurretStateMachine::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------------------------
@@ -233,9 +228,9 @@ void TurretAIData::parseTurretSweepSpeed(INI* ini, void *instance, void * /*stor
 }
 
 //----------------------------------------------------------------------------------------------------------
-void TurretAIData::buildFieldParse(MultiIniFieldParse& p) 
+void TurretAIData::buildFieldParse(MultiIniFieldParse& p)
 {
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "TurretTurnRate",					INI::parseAngularVelocityReal,				NULL, offsetof( TurretAIData, m_turnRate ) },
 		{ "TurretPitchRate",				INI::parseAngularVelocityReal,				NULL, offsetof( TurretAIData, m_pitchRate ) },
@@ -269,7 +264,7 @@ void TurretAIData::buildFieldParse(MultiIniFieldParse& p)
 //----------------------------------------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------------------------------------
-TurretAI::TurretAI(Object* owner, const TurretAIData* data, WhichTurretType tur) : 
+TurretAI::TurretAI(Object* owner, const TurretAIData* data, WhichTurretType tur) :
 	m_owner(owner),
 	m_whichTurret(tur),
 	m_data(data),
@@ -285,15 +280,9 @@ TurretAI::TurretAI(Object* owner, const TurretAIData* data, WhichTurretType tur)
 	m_enabled(!data->m_initiallyDisabled),
 	m_firesWhileTurning(data->m_firesWhileTurning),
 	m_isForceAttacking(false),
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_victimInitialTeam(NULL)
-	//
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_continuousFireExpirationFrame = -1;
-	//
 	if (!m_data)
 	{
 		DEBUG_CRASH(("TurretAI MUST have ModuleData"));
@@ -326,8 +315,7 @@ TurretAI::~TurretAI()
 {
 	stopRotOrPitchSound();
 
-	if (m_turretStateMachine)
-		deleteInstance(m_turretStateMachine);
+	deleteInstance(m_turretStateMachine);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -335,7 +323,7 @@ TurretAI::~TurretAI()
 // ------------------------------------------------------------------------------------------------
 void TurretAI::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -347,16 +335,16 @@ void TurretAI::xfer( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-/* These 4 are loaded on creation, and don't change. jba. 
+/* These 4 are loaded on creation, and don't change. jba.
 	const TurretAIData*				m_data;
 	WhichTurretType						m_whichTurret;
-	Object*										m_owner;								
+	Object*										m_owner;
 	AudioEventRTS							m_turretRotOrPitchSound;		///< Sound of turret rotation
 	*/
 	xfer->xferSnapshot(m_turretStateMachine);
 
-	xfer->xferReal(&m_angle);									
-	xfer->xferReal(&m_pitch);									
+	xfer->xferReal(&m_angle);
+	xfer->xferReal(&m_pitch);
 	xfer->xferUnsignedInt(&m_enableSweepUntil);
 
 	xfer->xferUser(&m_target, sizeof(m_target));
@@ -375,7 +363,7 @@ void TurretAI::xfer( Xfer *xfer )
 	if (version >= 2)
 		xfer->xferUnsignedInt(&m_sleepUntil);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -386,7 +374,7 @@ void TurretAI::loadPostProcess( void )
 	if (victim) {
 		m_victimInitialTeam = victim->getTeam();
 	}
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 Bool TurretAI::friend_turnTowardsAngle(Real desiredAngle, Real rateModifier, Real relThresh)
@@ -409,7 +397,7 @@ Bool TurretAI::friend_turnTowardsAngle(Real desiredAngle, Real rateModifier, Rea
 	}
 	else
 	{
-		if (angleDiff > 0) 
+		if (angleDiff > 0)
 			actualAngle += turnRate;
 		else
 			actualAngle -= turnRate;
@@ -419,7 +407,7 @@ Bool TurretAI::friend_turnTowardsAngle(Real desiredAngle, Real rateModifier, Rea
 	}
 
 	m_angle = normalizeAngle(actualAngle);
-	
+
 	if( m_angle != origAngle )
 		getOwner()->reactToTurretChange( m_whichTurret, origAngle, m_pitch );
 
@@ -469,7 +457,7 @@ Bool TurretAI::isWeaponSlotOkToFire(WeaponSlotType wslot) const
 //----------------------------------------------------------------------------------------------------------
 Real TurretAI::getTurretFireAngleSweepForWeaponSlot( WeaponSlotType slot ) const
 {
-	return m_data->m_turretFireAngleSweep[slot];	
+	return m_data->m_turretFireAngleSweep[slot];
 }
 
 //----------------------------------------------------------------------------------------------------------
@@ -535,7 +523,7 @@ TurretTargetType TurretAI::friend_getTurretTarget(Object*& obj, Coord3D& pos) co
 	else if (m_target == TARGET_POSITION)
 	{
 		obj = NULL;
-		pos = *m_turretStateMachine->getGoalPosition(); 
+		pos = *m_turretStateMachine->getGoalPosition();
 	}
 
 	return m_target;
@@ -563,7 +551,7 @@ void TurretAI::removeSelfAsTargeter()
 //----------------------------------------------------------------------------------------------------------
 void TurretAI::setTurretTargetObject( Object *victim, Bool forceAttacking )
 {
-	if (!victim || 
+	if (!victim ||
 				victim->isEffectivelyDead() ||
 				!isOwnersCurWeaponOnTurret())
 	{
@@ -587,7 +575,7 @@ void TurretAI::setTurretTargetObject( Object *victim, Bool forceAttacking )
 	{
 		// if we're already in the aim state, don't call setState, since
 		// it would go thru the exit/enter stuff, which we don't really want
-		// to do... 
+		// to do...
 		if (sid != TURRETAI_AIM && sid != TURRETAI_FIRE)
 			m_turretStateMachine->setState( TURRETAI_AIM );
 		m_victimInitialTeam = victim->getTeam();
@@ -624,7 +612,7 @@ void TurretAI::setTurretTargetPosition( const Coord3D* pos )
 	{
 		// if we're already in the aim state, don't call setState, since
 		// it would go thru the exit/enter stuff, which we don't really want
-		// to do... 
+		// to do...
 		if (sid != TURRETAI_AIM && sid != TURRETAI_FIRE)
 			m_turretStateMachine->setState( TURRETAI_AIM );
 		m_victimInitialTeam = NULL;
@@ -647,7 +635,7 @@ void TurretAI::recenterTurret()
 //----------------------------------------------------------------------------------------------------------
 Bool TurretAI::isTurretInNaturalPosition() const
 {
-	if( getNaturalTurretAngle() == getTurretAngle() && 
+	if( getNaturalTurretAngle() == getTurretAngle() &&
 			getNaturalTurretPitch() == getTurretPitch() )
 	{
 		return true;
@@ -672,9 +660,9 @@ UpdateSleepTime TurretAI::updateTurretAI()
 {
 	USE_PERF_TIMER(TurretAI)
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	DEBUG_ASSERTCRASH(!m_enabled ||
-							m_turretStateMachine->peekSleepTill() == 0 || 
+							m_turretStateMachine->peekSleepTill() == 0 ||
 							m_turretStateMachine->peekSleepTill() >= m_sleepUntil, ("Turret Machine is less sleepy than turret"));
 #endif
 
@@ -684,7 +672,7 @@ UpdateSleepTime TurretAI::updateTurretAI()
 		return UPDATE_SLEEP(m_sleepUntil - now);
 	}
 
-	//DEBUG_LOG(("updateTurretAI frame %d: %08lx\n",TheGameLogic->getFrame(),getOwner()));
+	//DEBUG_LOG(("updateTurretAI frame %d: %08lx",TheGameLogic->getFrame(),getOwner()));
 	UpdateSleepTime subMachineSleep = UPDATE_SLEEP_FOREVER;	// assume the best!
 
 	// either we don't care about continuous fire stuff, or we care, but time has elapsed
@@ -722,18 +710,18 @@ UpdateSleepTime TurretAI::updateTurretAI()
 		}
 		else
 		{
-			// it's STATE_CONTINUE, STATE_SUCCESS, or STATE_FAILURE, 
+			// it's STATE_CONTINUE, STATE_SUCCESS, or STATE_FAILURE,
 			// any of which will probably require next frame
 			subMachineSleep = UPDATE_SLEEP_NONE;
 		}
 
-	}	// if enabled or recentering
+	}
 
 	m_sleepUntil = now + subMachineSleep;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	DEBUG_ASSERTCRASH(!m_enabled ||
-							m_turretStateMachine->peekSleepTill() == 0 || 
+							m_turretStateMachine->peekSleepTill() == 0 ||
 							m_turretStateMachine->peekSleepTill() >= m_sleepUntil, ("Turret Machine is less sleepy than turret"));
 #endif
 
@@ -757,7 +745,7 @@ void TurretAI::setTurretEnabled( Bool enabled )
  */
 void TurretAI::startRotOrPitchSound()
 {
-	if (!m_turretRotOrPitchSound.isCurrentlyPlaying()) 
+	if (!m_turretRotOrPitchSound.isCurrentlyPlaying())
 	{
 		m_turretRotOrPitchSound.setObjectID(m_owner->getID());
 		m_turretRotOrPitchSound.setPlayingHandle(TheAudio->addAudioEvent(&m_turretRotOrPitchSound));
@@ -770,7 +758,7 @@ void TurretAI::startRotOrPitchSound()
  */
 void TurretAI::stopRotOrPitchSound()
 {
-	if (m_turretRotOrPitchSound.isCurrentlyPlaying()) 
+	if (m_turretRotOrPitchSound.isCurrentlyPlaying())
 	{
 		TheAudio->removeAudioEvent(m_turretRotOrPitchSound.getPlayingHandle());
 	}
@@ -827,8 +815,8 @@ Bool TurretAI::friend_isAnyWeaponInRangeOf(const Object* o) const
 			continue;
 
 		if (w->isWithinAttackRange(getOwner(), o)
-				// srj sez: not sure if we want to do this or not.  
-				// jba sez: no, don't do this.  isWithinAttackRange checks terrain los now, and 
+				// srj sez: not sure if we want to do this or not.
+				// jba sez: no, don't do this.  isWithinAttackRange checks terrain los now, and
 				// some weapons (like tomahawk) can fire beyond los, so this check is problematical here.
 				//  && w->isClearFiringLineOfSightTerrain(getOwner(), o)
 			)
@@ -841,8 +829,8 @@ Bool TurretAI::friend_isAnyWeaponInRangeOf(const Object* o) const
 }
 
 //----------------------------------------------------------------------------------------------------------
-Bool TurretAI::friend_isSweepEnabled() const 
-{ 
+Bool TurretAI::friend_isSweepEnabled() const
+{
 	if (m_enableSweepUntil != 0 && m_enableSweepUntil > TheGameLogic->getFrame())
 		return true;
 
@@ -854,7 +842,7 @@ UnsignedInt TurretAI::friend_getNextIdleMoodTargetFrame() const
 {
 	const Object* obj = getOwner();
 	const AIUpdateInterface *ai = obj->getAIUpdateInterface();
-	// ai can be null during object construction. 
+	// ai can be null during object construction.
 	return ai ? ai->getNextMoodCheckTime() : TheGameLogic->getFrame();
 }
 
@@ -869,10 +857,10 @@ void TurretAI::friend_checkForIdleMoodTarget()
 	UnsignedInt moodAdjust = ai->getMoodMatrixActionAdjustment(MM_Action_Idle);
 	if (moodAdjust & MAA_Affect_Range_IgnoreAll)
 		return;
-	
+
 	// If we're supposed to attack based on mood, etc, then we will do so.
 	Object* enemy = ai->getNextMoodTarget( true, true );
-	if (enemy) 
+	if (enemy)
 	{
 		setTurretTargetObject(enemy, FALSE);
 		obj->chooseBestWeaponForTarget(enemy, PREFER_MOST_DAMAGE, CMD_FROM_AI);
@@ -950,7 +938,7 @@ StateReturnType TurretAIAimTurretState::onEnter()
  */
 StateReturnType TurretAIAimTurretState::update()
 {
-	//DEBUG_LOG(("TurretAIAimTurretState frame %d: %08lx\n",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
+	//DEBUG_LOG(("TurretAIAimTurretState frame %d: %08lx",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
 
 	TurretAI* turret = getTurretAI();
 	Object* obj = turret->getOwner();
@@ -980,20 +968,20 @@ StateReturnType TurretAIAimTurretState::update()
 			Bool isPrimaryEnemy = (enemy && enemy == ai->getGoalObject());
 			// if the enemy is gone, or we're out of range, or it changed teams, the attack is over
 			Bool ableToAttackTarget = obj->isAbleToAttack();
-			if (ableToAttackTarget) 
+			if (ableToAttackTarget)
 			{
 				// srj sez: since we have already acquired this target, we should use
 				// the CONTINUED attack tests, not the new ones.
 				CanAttackResult result = obj->getAbleToAttackSpecificObject(
-							turret->isForceAttacking() ? ATTACK_CONTINUED_TARGET_FORCED : ATTACK_CONTINUED_TARGET, 
-							enemy, 
-							ai->getLastCommandSource() 
+							turret->isForceAttacking() ? ATTACK_CONTINUED_TARGET_FORCED : ATTACK_CONTINUED_TARGET,
+							enemy,
+							ai->getLastCommandSource()
 						);
 				ableToAttackTarget = result == ATTACKRESULT_POSSIBLE || result == ATTACKRESULT_POSSIBLE_AFTER_MOVING;
 			}
-			
+
 			nothingInRange = !turret->friend_isAnyWeaponInRangeOf(enemy);
-			if (enemy == NULL || !ableToAttackTarget || 
+			if (enemy == NULL || !ableToAttackTarget ||
 					(!isPrimaryEnemy && nothingInRange) ||
 					enemy->getTeam() != turret->friend_getVictimInitialTeam()
 			)
@@ -1006,22 +994,22 @@ StateReturnType TurretAIAimTurretState::update()
 			}
 
 			// aim turret towards enemy (turret angle is relative to its parent object)
-			if (enemy->isKindOf(KINDOF_BRIDGE)) 
+			if (enemy->isKindOf(KINDOF_BRIDGE))
 			{
 				// Special case - bridges have two attackable points at either end.
 				TBridgeAttackInfo info;
 				TheTerrainLogic->getBridgeAttackPoints(enemy, &info);
 				Real distSqr = ThePartitionManager->getDistanceSquared( obj, &info.attackPoint1, FROM_BOUNDINGSPHERE_3D );
-				if (distSqr > ThePartitionManager->getDistanceSquared( obj, &info.attackPoint2, FROM_BOUNDINGSPHERE_3D ) ) 
+				if (distSqr > ThePartitionManager->getDistanceSquared( obj, &info.attackPoint2, FROM_BOUNDINGSPHERE_3D ) )
 				{
 					enemyPosition = info.attackPoint2;
-				}	
-				else 
+				}
+				else
 				{
 					enemyPosition = info.attackPoint1;
 				}
-			}	
-			else 
+			}
+			else
 			{
 				enemyPosition = *enemy->getPosition();
 			}
@@ -1051,16 +1039,16 @@ StateReturnType TurretAIAimTurretState::update()
 
 	WeaponSlotType slot;
 	Weapon *curWeapon = obj->getCurrentWeapon( &slot );
-	if (!curWeapon) 
+	if (!curWeapon)
 	{
-		DEBUG_CRASH(("TurretAIAimTurretState::update - curWeapon is NULL.\n"));
+		DEBUG_CRASH(("TurretAIAimTurretState::update - curWeapon is NULL."));
 		return STATE_FAILURE;
 	}
 
 	Real turnSpeedModifier = 1.0f;// Just like how recentering turns you half speed, sweeping can change your turn speed
-	
+
 	Real relAngle = ThePartitionManager->getRelativeAngle2D( obj, &enemyPosition );
-	
+
 	Real aimAngle = relAngle;
 	Real sweep = turret->getTurretFireAngleSweepForWeaponSlot( slot );
 	if (sweep > 0.0f && turret->friend_isSweepEnabled())
@@ -1107,12 +1095,12 @@ StateReturnType TurretAIAimTurretState::update()
 
 			//GetVectorTo only takes Object as the first, but we want the angle from our Weapon to the
 			// target, not us to the target.  Raise our side to get the line to make sense.
-			v.z -= obj->getGeometryInfo().getMaxHeightAbovePosition() / 2; // I kinda hate our logic/client split.  
+			v.z -= obj->getGeometryInfo().getMaxHeightAbovePosition() / 2; // I kinda hate our logic/client split.
 			//The point to fire from should be intrinsic to the turret, but in reality it is very slow to look it up.
 
 			Real actualPitch;
 			if( v.length() > 0 )
-				actualPitch = ASin( v.z / v.length() ); 
+				actualPitch = ASin( v.z / v.length() );
 			else
 				actualPitch = 0;// Don't point at NAN, just point at 0 if they are right on us
 
@@ -1135,7 +1123,7 @@ StateReturnType TurretAIAimTurretState::update()
 				if (adjust) {
 					Real range = curWeapon->getAttackRange(obj);
 					Real dist = v.length();
-					if (range<1) range = 1; // paranoia. jba.		 
+					if (range<1) range = 1; // paranoia. jba.
 					// As the unit gets closer, reduce the pitch so we don't shoot over him.
 					Real groundPitch = turret->getGroundUnitPitch() * (dist/range);
 					desiredPitch = actualPitch+groundPitch;
@@ -1150,10 +1138,10 @@ StateReturnType TurretAIAimTurretState::update()
 		pitchAlignedToNemesis = turret->friend_turnTowardsPitch(desiredPitch, 1.0f);
 	}
 
-	// For now, we require that we're within range before we can successfully exit the AIM state, 
+	// For now, we require that we're within range before we can successfully exit the AIM state,
 	// and move into the FIRE state.
-	if (turnAlignedToNemesis && pitchAlignedToNemesis && 
-		((enemyForDistanceCheckOnly && curWeapon->isWithinAttackRange(obj, enemyForDistanceCheckOnly)) || 
+	if (turnAlignedToNemesis && pitchAlignedToNemesis &&
+		((enemyForDistanceCheckOnly && curWeapon->isWithinAttackRange(obj, enemyForDistanceCheckOnly)) ||
 		 (!enemyForDistanceCheckOnly && curWeapon->isWithinAttackRange(obj, &enemyPosition))))
 	{
 #ifdef INTER_TURRET_DELAY
@@ -1208,7 +1196,7 @@ StateReturnType TurretAIRecenterTurretState::onEnter()
 
 StateReturnType TurretAIRecenterTurretState::update()
 {
-	//DEBUG_LOG(("TurretAIRecenterTurretState frame %d: %08lx\n",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
+	//DEBUG_LOG(("TurretAIRecenterTurretState frame %d: %08lx",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
 
 	TurretAI* turret = getTurretAI();
 	Bool angleAligned = turret->friend_turnTowardsAngle(turret->getNaturalTurretAngle(), 0.5f, 0.0f);
@@ -1237,7 +1225,7 @@ void TurretAIRecenterTurretState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void TurretAIIdleState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1250,14 +1238,14 @@ void TurretAIIdleState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUnsignedInt(&m_nextIdleScan);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void TurretAIIdleState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 void TurretAIIdleState::resetIdleScan()
@@ -1271,13 +1259,13 @@ void TurretAIIdleState::resetIdleScan()
 StateReturnType TurretAIIdleState::onEnter()
 {
 	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface();
-	if (ai) 
+	if (ai)
 	{
 		ai->resetNextMoodCheckTime();
 		if (ai->friend_getTurretSync() == getTurretAI()->friend_getWhichTurret())
 			ai->friend_setTurretSync(TURRET_INVALID);
-	} // ai doesn't exist if the object was just created this frame.
-	
+	}
+
 	resetIdleScan();
 
 	TurretAI* turret = getTurretAI();
@@ -1287,12 +1275,12 @@ StateReturnType TurretAIIdleState::onEnter()
 //----------------------------------------------------------------------------------------------------------
 StateReturnType TurretAIIdleState::update()
 {
-	//DEBUG_LOG(("TurretAIIdleState frame %d: %08lx\n",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
+	//DEBUG_LOG(("TurretAIIdleState frame %d: %08lx",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
 
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (now >= m_nextIdleScan)
 	{
-		// this is redundant, since we're exiting the state, and will reset 
+		// this is redundant, since we're exiting the state, and will reset
 		// it again in onEnter next time (srj)
 		// resetIdleScan();
 
@@ -1314,7 +1302,7 @@ StateReturnType TurretAIIdleState::update()
 // ------------------------------------------------------------------------------------------------
 void TurretAIIdleScanState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1327,14 +1315,14 @@ void TurretAIIdleScanState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferReal(&m_desiredAngle);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void TurretAIIdleScanState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType TurretAIIdleScanState::onEnter()
@@ -1358,7 +1346,7 @@ StateReturnType TurretAIIdleScanState::onEnter()
 
 StateReturnType TurretAIIdleScanState::update()
 {
-	//DEBUG_LOG(("TurretAIIdleScanState frame %d: %08lx\n",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
+	//DEBUG_LOG(("TurretAIIdleScanState frame %d: %08lx",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
 
 	Bool angleAligned = getTurretAI()->friend_turnTowardsAngle(getTurretAI()->getNaturalTurretAngle() + m_desiredAngle, 0.5f, 0.0f);
 	Bool pitchAligned = getTurretAI()->friend_turnTowardsPitch(getTurretAI()->getNaturalTurretPitch(), 0.5f);
@@ -1386,7 +1374,7 @@ void TurretAIIdleScanState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void TurretAIHoldTurretState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1399,14 +1387,14 @@ void TurretAIHoldTurretState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUnsignedInt(&m_timestamp);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void TurretAIHoldTurretState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType TurretAIHoldTurretState::onEnter()
@@ -1429,7 +1417,7 @@ void TurretAIHoldTurretState::onExit( StateExitType status )
 
 StateReturnType TurretAIHoldTurretState::update()
 {
-	//DEBUG_LOG(("TurretAIHoldTurretState frame %d: %08lx\n",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
+	//DEBUG_LOG(("TurretAIHoldTurretState frame %d: %08lx",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
 
 	if (TheGameLogic->getFrame() >= m_timestamp)
 		return STATE_SUCCESS;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp
index e2092633986..4026e72869c 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp
@@ -26,7 +26,7 @@
 // Class to encapsulate polygon trigger areas.
 // Author: John Ahlquist, November 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/DataChunk.h"
 #include "Common/MapObject.h"
@@ -48,11 +48,8 @@ m_numPoints(0),
 m_sizePoints(0),
 m_exportWithScripts(false),
 m_isWaterArea(false),
-//Added By Sadullah Nader
-//Initializations inserted
 m_isRiver(FALSE),
 m_riverStart(0)
-//
 {
 	if (initialAllocation < 2) initialAllocation = 2;
 	m_points = NEW ICoord3D[initialAllocation];		// pool[]ify
@@ -69,18 +66,17 @@ m_riverStart(0)
 */
 PolygonTrigger::~PolygonTrigger(void)
 {
-	if (m_points) {
-		delete [] m_points;
-		m_points = NULL;
-	}
+	delete [] m_points;
+	m_points = NULL;
+
 	if (m_nextPolygonTrigger) {
 		PolygonTrigger *cur = m_nextPolygonTrigger;
 		PolygonTrigger *next;
 		while (cur) {
 			next = cur->getNext();
-			cur->setNextPoly(NULL); // prevents recursion. 
+			cur->setNextPoly(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
 }
@@ -92,9 +88,13 @@ PolygonTrigger::~PolygonTrigger(void)
  the poly triggers don't change.
 */
 void PolygonTrigger::reallocate(void)
-{	
+{
 	DEBUG_ASSERTCRASH(m_numPoints <= m_sizePoints, ("Invalid m_numPoints."));
 	if (m_numPoints == m_sizePoints) {
+		if (m_sizePoints > INT_MAX / 2) {
+			DEBUG_CRASH(("Too many points to allocate."));
+			return;
+		}
 		// Reallocate.
 		m_sizePoints += m_sizePoints;
 		ICoord3D *newPts = NEW ICoord3D[m_sizePoints];
@@ -127,8 +127,8 @@ PolygonTrigger *PolygonTrigger::getPolygonTriggerByID(Int triggerID)
 * PolygonTrigger::ParsePolygonTriggersDataChunk - read a polygon triggers chunk.
 * Format is the newer CHUNKY format.
 *	See PolygonTrigger::WritePolygonTriggersDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool PolygonTrigger::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -144,7 +144,7 @@ Bool PolygonTrigger::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChu
 	PolygonTrigger::deleteTriggers(); // just in case.
 	PolygonTrigger *pPrevTrig = NULL;
 	ICoord3D loc;
-	count = file.readInt(); 
+	count = file.readInt();
 	while (count>0) {
 		count--;
 		triggerName = file.readAsciiString();
@@ -160,8 +160,8 @@ Bool PolygonTrigger::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChu
 			riverStart = file.readInt();
 		}
 
-		numPoints = file.readInt(); 
-		PolygonTrigger *pTrig = newInstance(PolygonTrigger)(numPoints+1);	
+		numPoints = file.readInt();
+		PolygonTrigger *pTrig = newInstance(PolygonTrigger)(numPoints+1);
 		pTrig->setTriggerName(triggerName);
 		pTrig->setWaterArea(isWater);
 		pTrig->setRiver(isRiver);
@@ -184,7 +184,7 @@ Bool PolygonTrigger::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChu
 		}
 		pPrevTrig = pTrig;
 	}
-	if (info->version == K_TRIGGERS_VERSION_1) 
+	if (info->version == K_TRIGGERS_VERSION_1)
 	{
 		// before water areas existed, so create a default one.
 		PolygonTrigger *pTrig = newInstance(PolygonTrigger)(4);
@@ -219,26 +219,26 @@ Bool PolygonTrigger::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChu
 * PolygonTrigger::WritePolygonTriggersDataChunk - Writes a Polygon triggers chunk.
 * Format is the newer CHUNKY format.
 *	See PolygonTrigger::ParsePolygonTriggersDataChunk for the reader.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void PolygonTrigger::WritePolygonTriggersDataChunk(DataChunkOutput &chunkWriter)
 {
 	chunkWriter.openDataChunk("PolygonTriggers", 	K_TRIGGERS_VERSION_3);
-		
+
 		PolygonTrigger *pTrig;
 		Int count = 0;
 		for (pTrig=PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
 			count++;
 		}
-		chunkWriter.writeInt(count); 
+		chunkWriter.writeInt(count);
 		for (pTrig=PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
-			chunkWriter.writeAsciiString(pTrig->getTriggerName());	
-			chunkWriter.writeInt(pTrig->getID()); 
+			chunkWriter.writeAsciiString(pTrig->getTriggerName());
+			chunkWriter.writeInt(pTrig->getID());
 			chunkWriter.writeByte(pTrig->isWaterArea());
 			chunkWriter.writeByte(pTrig->isRiver());
 			chunkWriter.writeInt(pTrig->getRiverStart());
-			chunkWriter.writeInt(pTrig->getNumPoints()); 
+			chunkWriter.writeInt(pTrig->getNumPoints());
 			Int i;
 			for (i=0; i<pTrig->getNumPoints(); i++) {
 				ICoord3D loc = *pTrig->getPoint(i);
@@ -255,7 +255,7 @@ void PolygonTrigger::WritePolygonTriggersDataChunk(DataChunkOutput &chunkWriter)
  PolygonTrigger::updateBounds - Updates the bounds.
 */
 void PolygonTrigger::updateBounds(void)	const
-{	
+{
 	const Int BIG_INT=0x7ffff0;
 	m_bounds.lo.x = m_bounds.lo.y = BIG_INT;
 	m_bounds.hi.x = m_bounds.hi.y = -BIG_INT;
@@ -278,7 +278,7 @@ void PolygonTrigger::updateBounds(void)	const
  PolygonTrigger::addPolygonTrigger adds a trigger to the list of triggers.
 */
 void PolygonTrigger::addPolygonTrigger(PolygonTrigger *pTrigger)
-{	
+{
 	for (PolygonTrigger *pTrig=getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
 		DEBUG_ASSERTCRASH(pTrig != pTrigger, ("Attempting to add trigger already in list."));
 		if (pTrig==pTrigger) return;
@@ -288,11 +288,11 @@ void PolygonTrigger::addPolygonTrigger(PolygonTrigger *pTrigger)
 }
 
 /**
- PolygonTrigger::removePolygonTrigger removes a trigger to the list of 
+ PolygonTrigger::removePolygonTrigger removes a trigger to the list of
 	triggers.  note - does NOT delete pTrigger.
 */
 void PolygonTrigger::removePolygonTrigger(PolygonTrigger *pTrigger)
-{	
+{
 	PolygonTrigger *pPrev = NULL;
 	PolygonTrigger *pTrig=getFirstPolygonTrigger();
 	for (; pTrig; pTrig = pTrig->getNext()) {
@@ -317,7 +317,7 @@ void PolygonTrigger::removePolygonTrigger(PolygonTrigger *pTrigger)
 */
 void PolygonTrigger::deleteTriggers(void)
 {
-	PolygonTrigger *pList = ThePolygonTriggerListPtr;	
+	PolygonTrigger *pList = ThePolygonTriggerListPtr;
 	ThePolygonTriggerListPtr = NULL;
 	s_currentID = 1;
 	deleteInstance(pList);
@@ -329,7 +329,7 @@ void PolygonTrigger::deleteTriggers(void)
  the poly triggers don't change.
 */
 void PolygonTrigger::addPoint(const ICoord3D &point)
-{	
+{
 	DEBUG_ASSERTCRASH(m_numPoints <= m_sizePoints, ("Invalid m_numPoints."));
 	if (m_numPoints == m_sizePoints) {
 		reallocate();
@@ -345,7 +345,7 @@ void PolygonTrigger::addPoint(const ICoord3D &point)
  the poly triggers don't change.
 */
 void PolygonTrigger::setPoint(const ICoord3D &point, Int ndx)
-{	
+{
 	DEBUG_ASSERTCRASH(ndx>=0 && ndx <= m_numPoints, ("Invalid ndx."));
 	if (ndx<0) return;
 	if (ndx == m_numPoints) {	// we are setting first available unused point
@@ -365,7 +365,7 @@ void PolygonTrigger::setPoint(const ICoord3D &point, Int ndx)
  the poly triggers don't change.
 */
 void PolygonTrigger::insertPoint(const ICoord3D &point, Int ndx)
-{	
+{
 	DEBUG_ASSERTCRASH(ndx>=0 && ndx <= m_numPoints, ("Invalid ndx."));
 	if (ndx<0) return;
 	if (ndx == m_numPoints) {	// we are setting first available unused point
@@ -390,7 +390,7 @@ void PolygonTrigger::insertPoint(const ICoord3D &point, Int ndx)
  the poly triggers don't change.
 */
 void PolygonTrigger::deletePoint(Int ndx)
-{	
+{
 	DEBUG_ASSERTCRASH(ndx>=0 && ndx < m_numPoints, ("Invalid ndx."));
 	if (ndx<0 || ndx>=m_numPoints) return;
 	Int i;
@@ -430,7 +430,7 @@ Real PolygonTrigger::getRadius(void)	const
  PolygonTrigger - pointInTrigger.
 */
 Bool PolygonTrigger::pointInTrigger(ICoord3D &point) const
-{	
+{
 	if (m_boundsNeedsUpdate) {
 		updateBounds();
 	}
@@ -493,7 +493,7 @@ Bool PolygonTrigger::isValid(void) const
 void PolygonTrigger::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -522,7 +522,7 @@ void PolygonTrigger::xfer( Xfer *xfer )
 		// xfer point
 		xfer->xferICoord3D( point );
 
-	}  // end for, i
+	}
 
 	// bounds
 	xfer->xferIRegion2D( &m_bounds );
@@ -533,7 +533,7 @@ void PolygonTrigger::xfer( Xfer *xfer )
 	// bounds need update
 	xfer->xferBool( &m_boundsNeedsUpdate );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -541,4 +541,4 @@ void PolygonTrigger::xfer( Xfer *xfer )
 void PolygonTrigger::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp
index 2a71b7a4e56..c660fdf1214 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp
@@ -24,12 +24,12 @@
 
 // FILE: SidesList.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,7 +43,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/DataChunk.h"
 #include "Common/GameState.h"
@@ -76,7 +76,7 @@ SidesInfo::SidesInfo(const SidesInfo& thatref) :
 }
 
 /**
- SidesInfo - Destructor - 
+ SidesInfo - Destructor -
 */
 SidesInfo::~SidesInfo(void)
 {
@@ -87,10 +87,12 @@ void SidesInfo::init(const Dict* d)
 {
 	deleteInstance(m_pBuildList);
 	m_pBuildList = NULL;
+
 	m_dict.clear();
-	if (m_scripts) 
-		deleteInstance(m_scripts);
+
+	deleteInstance(m_scripts);
 	m_scripts = NULL;
+
 	if (d)
 		m_dict = *d;
 }
@@ -106,7 +108,7 @@ SidesInfo& SidesInfo::operator=(const SidesInfo& that)
 		BuildListInfo* thisBLTail = NULL;
 		for (BuildListInfo* thatBL = that.m_pBuildList; thatBL; thatBL = thatBL->getNext())
 		{
-			BuildListInfo* thisBL = newInstance( BuildListInfo );	
+			BuildListInfo* thisBL = newInstance( BuildListInfo );
 			*thisBL = *thatBL;
 			thisBL->setNextBuildList(NULL);
 
@@ -114,7 +116,7 @@ SidesInfo& SidesInfo::operator=(const SidesInfo& that)
 				thisBLTail->setNextBuildList(thisBL);
 			else
 				this->m_pBuildList = thisBL;
-				
+
 			thisBLTail = thisBL;
 		}
 
@@ -128,7 +130,7 @@ SidesInfo& SidesInfo::operator=(const SidesInfo& that)
 
 /**
 * SidesInfo::addToBuildList - Adds a build list entry as the nth entry.
-*		
+*
 */
 void SidesInfo::addToBuildList(BuildListInfo *pBuildList, Int position)
 {
@@ -158,7 +160,7 @@ void SidesInfo::addToBuildList(BuildListInfo *pBuildList, Int position)
 
 /**
 * SidesInfo::reorderInBuildList - Reorders a build list entry as the nth entry.
-*		
+*
 */
 void SidesInfo::reorderInBuildList(BuildListInfo *pBuildList, Int newPosition)
 {
@@ -169,7 +171,7 @@ void SidesInfo::reorderInBuildList(BuildListInfo *pBuildList, Int newPosition)
 /**
 * SidesInfo::removeFromBuildList - Removes a build list entry.
 * Returns the position in the list that the item occupied.
-*		
+*
 */
 Int SidesInfo::removeFromBuildList(BuildListInfo *pBuildList)
 {
@@ -208,14 +210,14 @@ SidesList::SidesList(void) : m_numSides(0), m_numSkirmishSides(0)
 }
 
 /**
- SidesList - Destructor - 
+ SidesList - Destructor -
 */
 SidesList::~SidesList(void)
 {
 }
 
 /**
- SidesList - reset - 
+ SidesList - reset -
 */
 void SidesList::reset(void)
 {
@@ -223,7 +225,7 @@ void SidesList::reset(void)
 }
 
 /**
- SidesList - clear - 
+ SidesList - clear -
 */
 void SidesList::clear(void)
 {
@@ -237,28 +239,28 @@ void SidesList::clear(void)
 * SidesList::ParseSidesDataChunk - read a Sides chunk.
 * Format is the newer CHUNKY format.
 *	See SidesList::WriteSidesDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool SidesList::ParseSidesDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
 	DEBUG_ASSERTCRASH(TheSidesList, ("TheSidesList is null"));
 
-	if (TheSidesList==NULL) 
+	if (TheSidesList==NULL)
 		return false;
 
 	TheSidesList->clear();
 	Int count = file.readInt();
 	Int i, j;
 	TheSidesList->emptySides();
-	for (i=0; i<count; i++) 
+	for (i=0; i<count; i++)
 	{
 		if (i >= MAX_PLAYER_COUNT) break;
 		Dict d =  file.readDict();
 		TheSidesList->addSide(&d);
 		BuildListInfo* pBuildList;
 		Int count = file.readInt();
-		for (j=0; j<count; j++) 
+		for (j=0; j<count; j++)
 		{
 			pBuildList = newInstance( BuildListInfo );
 			pBuildList->setBuildingName(file.readAsciiString());
@@ -282,19 +284,19 @@ Bool SidesList::ParseSidesDataChunk(DataChunkInput &file, DataChunkInfo *info, v
 			}
 			TheSidesList->getSideInfo(i)->addToBuildList(pBuildList, j);
 		}
-	}	
+	}
 	if (info->version >= K_SIDES_DATA_VERSION_2)
 	{
 		count = file.readInt();
 		TheSidesList->emptyTeams();
-		for (i=0; i<count; i++) 
+		for (i=0; i<count; i++)
 		{
 			Dict d =  file.readDict();
 			TheSidesList->addTeam(&d);
 		}
 	}
-	
-	file.registerParser( AsciiString("PlayerScriptsList"), info->label, ScriptList::ParseScriptsDataChunk );
+
+	file.registerParser( "PlayerScriptsList", info->label, ScriptList::ParseScriptsDataChunk );
 	if (!file.parse(NULL)) {
 		throw(ERROR_CORRUPT_FILE_FORMAT);
 	}
@@ -302,8 +304,7 @@ Bool SidesList::ParseSidesDataChunk(DataChunkInput &file, DataChunkInfo *info, v
 	count = ScriptList::getReadScripts(scripts);
 	for (i=0; i<count; i++) {
 		if (i<TheSidesList->getNumSides()) {
-			ScriptList *pSL = TheSidesList->getSideInfo(i)->getScriptList();
-			deleteInstance(pSL);
+			deleteInstance(TheSidesList->getSideInfo(i)->getScriptList());
 			TheSidesList->getSideInfo(i)->setScriptList(scripts[i]);
 			scripts[i] = NULL;
 		} else {
@@ -323,21 +324,21 @@ Bool SidesList::ParseSidesDataChunk(DataChunkInput &file, DataChunkInfo *info, v
 * SidesList::WriteSidesDataChunk - Writes a Sides chunk.
 * Format is the newer CHUNKY format.
 *	See SidesList::ParseSidesDataChunk for the reader.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void SidesList::WriteSidesDataChunk(DataChunkOutput &chunkWriter)
 {
 	DEBUG_ASSERTCRASH(TheSidesList, ("TheSidesList is null"));
-	if (TheSidesList==NULL) 
+	if (TheSidesList==NULL)
 		return;
 	/**********HEIGHT MAP DATA ***********************/
-	chunkWriter.openDataChunk("SidesList", K_SIDES_DATA_VERSION_3);	
-	
+	chunkWriter.openDataChunk("SidesList", K_SIDES_DATA_VERSION_3);
+
 		chunkWriter.writeInt(TheSidesList->getNumSides());
 		Int i;
 		for (i=0; i<TheSidesList->getNumSides(); i++) {
-			chunkWriter.writeDict(*TheSidesList->getSideInfo(i)->getDict());	
+			chunkWriter.writeDict(*TheSidesList->getSideInfo(i)->getDict());
 			BuildListInfo* pBuildList = TheSidesList->getSideInfo(i)->getBuildList();
 			Int count = 0;
 			while (pBuildList) {
@@ -365,12 +366,12 @@ void SidesList::WriteSidesDataChunk(DataChunkOutput &chunkWriter)
 
 				pBuildList = pBuildList->getNext();
 			}
-		}	
-		
+		}
+
 		// BEGIN stuff new to K_SIDES_DATA_VERSION_2
 		chunkWriter.writeInt(TheSidesList->getNumTeams());
 		for (i=0; i<TheSidesList->getNumTeams(); i++) {
-			chunkWriter.writeDict(*TheSidesList->getTeamInfo(i)->getDict());	
+			chunkWriter.writeDict(*TheSidesList->getTeamInfo(i)->getDict());
 		}
 		// END stuff new to K_SIDES_DATA_VERSION_2
 
@@ -384,7 +385,7 @@ void SidesList::WriteSidesDataChunk(DataChunkOutput &chunkWriter)
 	Bool modified = TheSidesList->validateSides();
 	DEBUG_ASSERTLOG(!modified, ("*** had to clean up sideslist on read"));
 	modified = false;	// silence compiler warnings in release build
-	
+
 }
 
 TeamsInfo *SidesList::findTeamInfo(AsciiString name, Int* index /*= NULL*/)
@@ -394,7 +395,7 @@ TeamsInfo *SidesList::findTeamInfo(AsciiString name, Int* index /*= NULL*/)
 
 SidesInfo *SidesList::findSideInfo(AsciiString name, Int* index /*= NULL*/)
 {
-	for (int i = 0; i < m_numSides; i++) 
+	for (int i = 0; i < m_numSides; i++)
 	{
 		if (m_sides[i].getDict()->getAsciiString(TheKey_playerName) == name)
 		{
@@ -408,7 +409,7 @@ SidesInfo *SidesList::findSideInfo(AsciiString name, Int* index /*= NULL*/)
 
 SidesInfo *SidesList::findSkirmishSideInfo(AsciiString name, Int* index /*= NULL*/)
 {
-	for (int i = 0; i < m_numSkirmishSides; i++) 
+	for (int i = 0; i < m_numSkirmishSides; i++)
 	{
 		if (m_skirmishSides[i].getDict()->getAsciiString(TheKey_playerName) == name)
 		{
@@ -425,8 +426,8 @@ static AsciiString static_readPlayerNames[MAX_PLAYER_COUNT];
 /**
 * ParsePlayersDataChunk - read players names data chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 static Bool ParsePlayersDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -443,8 +444,8 @@ static Bool ParsePlayersDataChunk(DataChunkInput &file, DataChunkInfo *info, voi
 /**
 * ParseTeamsDataChunk - read teams data chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 static Bool ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -456,9 +457,9 @@ static Bool ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info, void
 		if (sides->findSkirmishSideInfo(player)) {
 			// player exists, so just add it.
 			sides->addSkirmishTeam(&teamDict);
-			//DEBUG_LOG(("Adding team %s\n", teamName.str()));
+			//DEBUG_LOG(("Adding team %s", teamName.str()));
 		} else {
-			//DEBUG_LOG(("Couldn't add team %s, no player %s\n", teamName.str(), player.str()));
+			//DEBUG_LOG(("Couldn't add team %s, no player %s", teamName.str(), player.str()));
 		}
 	}
 	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
@@ -481,7 +482,7 @@ void SidesList::prepareForMP_or_Skirmish(void)
 	}
 	m_numSkirmishSides = 0;
 
-	for (i = 0; i < m_numSides; i++) 
+	for (i = 0; i < m_numSides; i++)
 	{
 		m_skirmishSides[m_numSkirmishSides] = m_sides[i];
 		m_numSkirmishSides++;
@@ -500,24 +501,24 @@ void SidesList::prepareForMP_or_Skirmish(void)
 			continue;
 		}
 		if (m_skirmishSides[i].getScriptList()==NULL) continue;
-		if (m_skirmishSides[i].getScriptList()->getScript() != NULL || 
+		if (m_skirmishSides[i].getScriptList()->getScript() != NULL ||
 			m_skirmishSides[i].getScriptList()->getScriptGroup()!=NULL) {
 			gotScripts = true;
 		}
 	}
 	if (!gotScripts) {
 		AsciiString path = "data\\Scripts\\SkirmishScripts.scb";
-		DEBUG_LOG(("Skirmish map using standard scripts\n"));
+		DEBUG_LOG(("Skirmish map using standard scripts"));
 		m_skirmishTeamrec.clear();
 		CachedFileInputStream theInputStream;
-		if (theInputStream.open(path)) { 
+		if (theInputStream.open(path)) {
 				ChunkInputStream *pStrm = &theInputStream;
 				DataChunkInput file( pStrm );
-				file.registerParser( AsciiString("PlayerScriptsList"), AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk );
-				file.registerParser( AsciiString("ScriptsPlayers"), AsciiString::TheEmptyString, ParsePlayersDataChunk );
-				file.registerParser( AsciiString("ScriptTeams"), AsciiString::TheEmptyString, ParseTeamsDataChunk );
+				file.registerParser( "PlayerScriptsList", AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk );
+				file.registerParser( "ScriptsPlayers", AsciiString::TheEmptyString, ParsePlayersDataChunk );
+				file.registerParser( "ScriptTeams", AsciiString::TheEmptyString, ParseTeamsDataChunk );
 				if (!file.parse(this)) {
-					DEBUG_LOG(("ERROR - Unable to read in skirmish scripts.\n"));
+					DEBUG_LOG(("ERROR - Unable to read in skirmish scripts."));
 					return;
 				}
 				ScriptList *scripts[MAX_PLAYER_COUNT];
@@ -535,12 +536,9 @@ void SidesList::prepareForMP_or_Skirmish(void)
 					}
 					if (curSide == -1) continue;
 
-					ScriptList *pSL = getSkirmishSideInfo(curSide)->getScriptList();
+					deleteInstance(getSkirmishSideInfo(curSide)->getScriptList());
 					getSkirmishSideInfo(curSide)->setScriptList(scripts[i]);
 					scripts[i] = NULL;
-					if (pSL) 
-						deleteInstance(pSL);
-					scripts[i] = NULL;
 				}
 				for (i=0; i<MAX_PLAYER_COUNT; i++) {
 					static_readPlayerNames[i].clear();
@@ -571,20 +569,20 @@ Bool SidesList::isPlayerDefaultTeam(TeamsInfo *t)
 	return false;
 }
 
-void SidesList::emptySides() 
-{ 
+void SidesList::emptySides()
+{
 	Int i;
 
-	m_numSides = 0; 
-	m_numSkirmishSides = 0; 
+	m_numSides = 0;
+	m_numSkirmishSides = 0;
 	for (i = 0; i < MAX_PLAYER_COUNT; i++) {
-		m_sides[i].clear(); 
+		m_sides[i].clear();
 		m_skirmishSides[i].clear();
 	}
 }
 
-void SidesList::emptyTeams() 
-{ 
+void SidesList::emptyTeams()
+{
 	m_teamrec.clear();
 	m_skirmishTeamrec.clear();
 }
@@ -632,7 +630,7 @@ Bool SidesList::validateAllyEnemyList(const AsciiString& tname, AsciiString& all
 	Bool modified = false;
 
 	AsciiString str, newstr, token;
-	
+
 	str = allies;
 	newstr.clear();
 	while (str.nextToken(&token))
@@ -692,7 +690,7 @@ void SidesList::addPlayerByTemplate(AsciiString playerTemplateName)
 	Dict d;
 
 	d.clear();
-	d.setAsciiString(TheKey_playerName, playerName);	
+	d.setAsciiString(TheKey_playerName, playerName);
 	d.setBool(TheKey_playerIsHuman, isHuman);
 	d.setUnicodeString(TheKey_playerDisplayName, playerDisplayName);
 	d.setAsciiString(TheKey_playerFaction, playerTemplateName);
@@ -735,7 +733,7 @@ Bool SidesList::validateSides()
 	}
 
 	// now ensure that every player has a proper "default team"
-	for (i = 0; i < getNumSides(); i++) 
+	for (i = 0; i < getNumSides(); i++)
 	{
 		Dict *pdict = getSideInfo(i)->getDict();
 		AsciiString pname = pdict->getAsciiString(TheKey_playerName);
@@ -761,7 +759,7 @@ Bool SidesList::validateSides()
 		}
 		else
 		{
-			DEBUG_LOG(("*** default team for player %s missing (should not be possible), adding it...\n",tname.str()));
+			DEBUG_LOG(("*** default team for player %s missing (should not be possible), adding it...",tname.str()));
 			Dict d;
 			d.setAsciiString(TheKey_teamName, tname);
 			d.setAsciiString(TheKey_teamOwner, pname);
@@ -777,14 +775,14 @@ Bool SidesList::validateSides()
 		// (note that owners can be teams or players, but allies/enemies can only be teams.)
 		if (validateAllyEnemyList(pname, allies))
 		{
-			DEBUG_LOG(("bad allies...\n"));
+			DEBUG_LOG(("bad allies..."));
 			pdict->setAsciiString(TheKey_playerAllies, allies);
 			modified = true;
 		}
 
 		if (validateAllyEnemyList(pname, enemies))
 		{
-			DEBUG_LOG(("bad enemies...\n"));
+			DEBUG_LOG(("bad enemies..."));
 			pdict->setAsciiString(TheKey_playerEnemies, enemies);
 			modified = true;
 		}
@@ -799,7 +797,7 @@ Bool SidesList::validateSides()
 		AsciiString tname = tdict->getAsciiString(TheKey_teamName);
 		if (findSideInfo(tname))
 		{
-			DEBUG_CRASH(("name %s is duplicate between player and team, removing...\n",tname.str()));
+			DEBUG_CRASH(("name %s is duplicate between player and team, removing...",tname.str()));
 			removeTeam(i);
 			modified = true;
 			goto validate_team_names;
@@ -814,14 +812,14 @@ Bool SidesList::validateSides()
 		SidesInfo* si = findSideInfo(towner);
 		if (si == NULL || towner == tname)
 		{
-			DEBUG_LOG(("bad owner %s; reparenting to neutral...\n",towner.str()));
+			DEBUG_LOG(("bad owner %s; reparenting to neutral...",towner.str()));
 			tdict->setAsciiString(TheKey_teamOwner, AsciiString::TheEmptyString);
 			modified = true;
 		}
-//		if (tdict->getType(NAMEKEY(AsciiString("teamAllies"))) != Dict::DICT_NONE)
-//			tdict->remove(NAMEKEY(AsciiString("teamAllies")));
-//		if (tdict->getType(NAMEKEY(AsciiString("teamEnemies"))) != Dict::DICT_NONE)
-//			tdict->remove(NAMEKEY(AsciiString("teamEnemies")));
+//		if (tdict->getType(NAMEKEY("teamAllies")) != Dict::DICT_NONE)
+//			tdict->remove(NAMEKEY("teamAllies"));
+//		if (tdict->getType(NAMEKEY("teamEnemies")) != Dict::DICT_NONE)
+//			tdict->remove(NAMEKEY("teamEnemies"));
 
 	}
 
@@ -834,10 +832,10 @@ Bool SidesList::validateSides()
 void SidesList::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Xfer method 
+/** Xfer method
 	* Version Info:
 	* 1: Initial version */
 // ------------------------------------------------------------------------------------------------
@@ -855,10 +853,10 @@ void SidesList::xfer( Xfer *xfer )
 	if( sideCount != getNumSides() )
 	{
 
-		DEBUG_CRASH(( "SidesList::xfer - The sides list size has changed, this was not supposed to happen, you must version this method and figure out how to translate between old and new versions now\n" ));
+		DEBUG_CRASH(( "SidesList::xfer - The sides list size has changed, this was not supposed to happen, you must version this method and figure out how to translate between old and new versions now" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// side data
 	ScriptList *scriptList;
@@ -874,16 +872,16 @@ void SidesList::xfer( Xfer *xfer )
 				(scriptList != NULL && scriptListPresent == FALSE) )
 		{
 
-			DEBUG_CRASH(( "SidesList::xfer - script list missing/present mismatch\n" ));
+			DEBUG_CRASH(( "SidesList::xfer - script list missing/present mismatch" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 		if( scriptListPresent )
 			xfer->xferSnapshot( scriptList );
 
-	}  // end for i
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -891,7 +889,7 @@ void SidesList::xfer( Xfer *xfer )
 void SidesList::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 /* ********* BuildListInfo class ****************************/
 /**
@@ -919,15 +917,13 @@ m_automaticallyBuild(true),
 m_priorityBuild(false),
 m_buildingName(AsciiString::TheEmptyString)
 {
-	// Added by Sadullah Nader
-	// these initialized values are necessary!!!
 	m_location.zero();
 	m_rallyPointOffset.x = 0.0f;
 	m_rallyPointOffset.y = 0.0f;
 	m_selected = FALSE;
 
 	Int i;
-	for (i=0; i<MAX_RESOURCE_GATHERERS; i++) 
+	for (i=0; i<MAX_RESOURCE_GATHERERS; i++)
 	{
 		m_resourceGatherers[i] = INVALID_ID;
 	}
@@ -944,9 +940,9 @@ BuildListInfo::~BuildListInfo(void)
 		BuildListInfo *next;
 		while (cur) {
 			next = cur->getNext();
-			cur->setNextBuildList(NULL); // prevents recursion. 
+			cur->setNextBuildList(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
 }
@@ -956,7 +952,7 @@ void BuildListInfo::parseStructure(INI *ini, void *instance, void* /*store*/, co
 	const char* c = ini->getNextToken();
 	AsciiString tTemplateName(c);
 
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Name",				INI::parseAsciiString,		NULL, offsetof( BuildListInfo, m_buildingName	 ) },
 			{ "Location",		INI::parseCoord2D,				NULL, offsetof( BuildListInfo, m_location ) },
@@ -965,7 +961,7 @@ void BuildListInfo::parseStructure(INI *ini, void *instance, void* /*store*/, co
       { "InitiallyBuilt",			INI::parseBool,		NULL, offsetof( BuildListInfo, m_isInitiallyBuilt ) },
       { "RallyPointOffset",			INI::parseCoord2D,		NULL, offsetof( BuildListInfo, m_rallyPointOffset ) },
       { "AutomaticallyBuild",			INI::parseBool,	NULL, offsetof( BuildListInfo, m_automaticallyBuild ) },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
 	BuildListInfo *buildInfo = newInstance( BuildListInfo );
@@ -1002,7 +998,7 @@ BuildListInfo *BuildListInfo::duplicate(void)
 void BuildListInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1044,7 +1040,7 @@ void BuildListInfo::xfer( Xfer *xfer )
 		xfer->xferInt(&m_currentGatherers);
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1052,21 +1048,21 @@ void BuildListInfo::xfer( Xfer *xfer )
 void BuildListInfo::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 /* ********* TeamsInfoRec class ****************************/
-TeamsInfoRec::TeamsInfoRec() : 
+TeamsInfoRec::TeamsInfoRec() :
 	m_numTeams(0), m_numTeamsAllocated(0), m_teams(NULL)
 {
 }
 
-TeamsInfoRec::TeamsInfoRec(const TeamsInfoRec& thatref) : 
+TeamsInfoRec::TeamsInfoRec(const TeamsInfoRec& thatref) :
 	m_numTeams(0), m_numTeamsAllocated(0), m_teams(NULL)
 {
 	*this = thatref;
 }
 
-TeamsInfoRec::~TeamsInfoRec() 
+TeamsInfoRec::~TeamsInfoRec()
 {
 	clear();
 }
@@ -1078,7 +1074,7 @@ TeamsInfoRec& TeamsInfoRec::operator=(const TeamsInfoRec& thatref)
 	if (this != that)
 	{
 		this->clear();
-		for (int i = 0; i < that->m_numTeams; i++) 
+		for (int i = 0; i < that->m_numTeams; i++)
 		{
 			this->addTeam(that->m_teams[i].getDict());
 		}
@@ -1086,14 +1082,14 @@ TeamsInfoRec& TeamsInfoRec::operator=(const TeamsInfoRec& thatref)
 	return *this;
 }
 
-void TeamsInfoRec::clear() 
-{ 
+void TeamsInfoRec::clear()
+{
 	Int i;
 
-	for (i = 0; i < m_numTeamsAllocated; i++) 
-		m_teams[i].clear(); 
+	for (i = 0; i < m_numTeams; ++i)
+		m_teams[i].clear();
 
-	m_numTeams = 0; 
+	m_numTeams = 0;
 	m_numTeamsAllocated = 0;
 	delete [] m_teams;
 	m_teams = NULL;
@@ -1101,7 +1097,7 @@ void TeamsInfoRec::clear()
 
 TeamsInfo *TeamsInfoRec::findTeamInfo(AsciiString name, Int* index /*= NULL*/)
 {
-	for (int i = 0; i < m_numTeams; i++) 
+	for (int i = 0; i < m_numTeams; ++i)
 	{
 		if (m_teams[i].getDict()->getAsciiString(TheKey_teamName) == name)
 		{
@@ -1123,24 +1119,22 @@ void TeamsInfoRec::addTeam(const Dict* d)
 	DEBUG_ASSERTCRASH(m_numTeams < 1024, ("hmm, seems like an awful lot of teams..."));
 	if (m_numTeams >= m_numTeamsAllocated)
 	{
-	// pool[]ify
-		TeamsInfo* nti = NEW TeamsInfo[m_numTeamsAllocated + TEAM_ALLOC_CHUNK];	// throws on failure
-		
+		// pool[]ify
+		const Int newNumTeamsAllocated = m_numTeams + TEAM_ALLOC_CHUNK;
+		TeamsInfo* nti = NEW TeamsInfo[newNumTeamsAllocated];
 		Int i;
 
-		for (i = 0; i < m_numTeams; i++)
+		for (i = 0; i < m_numTeams; ++i)
 			nti[i] = m_teams[i];
 
-		for ( ; i < m_numTeamsAllocated + TEAM_ALLOC_CHUNK; i++) 
-			nti[i].clear(); 
-		
 		delete [] m_teams;
-
 		m_teams = nti;
-		m_numTeamsAllocated += TEAM_ALLOC_CHUNK;
+		m_numTeamsAllocated = newNumTeamsAllocated;
 	}
 
-	m_teams[m_numTeams++].init(d);
+	m_teams[m_numTeams].init(d);
+
+	++m_numTeams;
 }
 
 void TeamsInfoRec::removeTeam(Int i)
@@ -1148,11 +1142,10 @@ void TeamsInfoRec::removeTeam(Int i)
 	if (i < 0 || i >= m_numTeams || m_numTeams <= 1)
 		return;
 
-	for ( ; i < m_numTeams-1; i++)
-		m_teams[i] = m_teams[i+1];
+	--m_numTeams;
 
-	for ( ; i < m_numTeamsAllocated; i++)
-		m_teams[i].clear();
+	for ( ; i < m_numTeams; ++i)
+		m_teams[i] = m_teams[i+1];
 
-	--m_numTeams;
+	m_teams[m_numTeams].clear();
 }
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp
index aa2f75a3c8c..2a1898c62d3 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp
@@ -27,7 +27,7 @@
 // Author: Colin Day, April 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/DataChunk.h"
@@ -59,11 +59,6 @@
 #include "WWMath/plane.h"
 #include "WWMath/tri.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
 TerrainLogic *TheTerrainLogic = NULL;
@@ -75,7 +70,7 @@ WaterHandle TerrainLogic::m_gridWaterHandle;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Waypoint::Waypoint(WaypointID id, AsciiString name, const Coord3D *pLoc, AsciiString label1, AsciiString label2, 
+Waypoint::Waypoint(WaypointID id, AsciiString name, const Coord3D *pLoc, AsciiString label1, AsciiString label2,
 									 AsciiString label3, Bool biDirectional) :
 m_name(name),
 m_pNext(NULL),
@@ -91,14 +86,14 @@ m_biDirectional(biDirectional)
 	for (i=0; i<MAX_LINKS; i++) {
 		m_links[i] = NULL;
 	}
-}  // end Waypoint
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Waypoint::~Waypoint()
 {
 
-}  // end ~Waypoint
+}
 
 // Bridge ////////////////////////////////////////////////////////////////////////////////////////
 
@@ -127,8 +122,8 @@ BridgeInfo::BridgeInfo()
 /** Create a tower object for the bridge of the specified type (and therefore position) */
 // ------------------------------------------------------------------------------------------------
 Object *Bridge::createTower( Coord3D *worldPos,
-														 BridgeTowerType towerType, 
-														 const ThingTemplate *towerTemplate, 
+														 BridgeTowerType towerType,
+														 const ThingTemplate *towerTemplate,
 														 Object *bridge )
 {
 
@@ -136,10 +131,10 @@ Object *Bridge::createTower( Coord3D *worldPos,
 	if( towerTemplate == NULL || bridge == NULL )
 	{
 
-		DEBUG_CRASH(( "Bridge::createTower(): Invalid params\n" ));
+		DEBUG_CRASH(( "Bridge::createTower(): Invalid params" ));
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the tower object
 	Object *tower = TheThingFactory->newObject( towerTemplate, bridge->getTeam() );
@@ -148,7 +143,7 @@ Object *Bridge::createTower( Coord3D *worldPos,
 	Real angle = 0;
 	switch( towerType )
 	{
-		
+
 		// --------------------------------------------------------------------------------------------
 		case BRIDGE_TOWER_FROM_LEFT:
 			angle = bridge->getOrientation() + PI;
@@ -171,10 +166,10 @@ Object *Bridge::createTower( Coord3D *worldPos,
 
 		// --------------------------------------------------------------------------------------------
 		default:
-			DEBUG_CRASH(( "Bridge::createTower - Unknown bridge tower type '%d'\n", towerType )); 
+			DEBUG_CRASH(( "Bridge::createTower - Unknown bridge tower type '%d'", towerType ));
 			return NULL;
 
-	}  // end switch
+	}
 
 	// set the position and angle
 	tower->setPosition( worldPos );
@@ -182,13 +177,13 @@ Object *Bridge::createTower( Coord3D *worldPos,
 
 	// tie it to the bridge
 	BridgeBehaviorInterface *bridgeInterface = BridgeBehavior::getBridgeBehaviorInterfaceFromObject( bridge );
-	DEBUG_ASSERTCRASH( bridgeInterface != NULL, ("Bridge::createTower - no 'BridgeBehaviorInterface' found\n") );
+	DEBUG_ASSERTCRASH( bridgeInterface != NULL, ("Bridge::createTower - no 'BridgeBehaviorInterface' found") );
 	if( bridgeInterface )
 		bridgeInterface->setTower( towerType, tower );
 
 	// tie the bridge to us
 	BridgeTowerBehaviorInterface *bridgeTowerInterface = BridgeTowerBehavior::getBridgeTowerBehaviorInterfaceFromObject( tower );
-	DEBUG_ASSERTCRASH( bridgeTowerInterface != NULL, ("Bridge::createTower - no 'BridgeTowerBehaviorInterface' found\n") );
+	DEBUG_ASSERTCRASH( bridgeTowerInterface != NULL, ("Bridge::createTower - no 'BridgeTowerBehaviorInterface' found") );
 	if( bridgeTowerInterface )
 	{
 
@@ -198,7 +193,7 @@ Object *Bridge::createTower( Coord3D *worldPos,
 		// save our position type
 		bridgeTowerInterface->setTowerType( towerType );
 
-	}  // end if
+	}
 
 	// if the bridge is indestructible, so is this tower
 	BodyModuleInterface *bridgeBody = bridge->getBodyModule();
@@ -208,12 +203,12 @@ Object *Bridge::createTower( Coord3D *worldPos,
 
 		towerBody->setIndestructible( TRUE );
 
-	}  // end if
+	}
 
 	// return the newly created tower
 	return tower;
 
-}  // end createTower
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -274,7 +269,7 @@ m_bridgeInfo(theInfo)
 	// get the template of the bridge
 	TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( bridgeTemplateName );
 	if( bridgeTemplate == NULL ) {
-		DEBUG_LOG(( "*** Bridge Template Not Found '%s'.", bridgeTemplateName ));
+		DEBUG_LOG(( "*** Bridge Template Not Found '%s'.", bridgeTemplateName.str() ));
 		return;
 	}
 
@@ -315,27 +310,27 @@ m_bridgeInfo(theInfo)
 				pos.y -= v.y*offset;
 				break;
 
-		}  // end switch
+		}
 		tower = createTower( &pos, type, towerTemplate, bridge );
-		
+
 		// store the tower object ID
 		m_bridgeInfo.towerObjectID[ i ] = tower->getID();
 
-	}  // end for, i
+	}
 #endif
-	
+
 	m_next = NULL;
-}  // end Bridge
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Bridge::Bridge(Object *bridgeObj) 
+Bridge::Bridge(Object *bridgeObj)
 {
 
 	// save the template name
 	m_templateName = bridgeObj->getTemplate()->getName();
 
-	DEBUG_ASSERTLOG( bridgeObj->getGeometryInfo().getGeomType()==GEOMETRY_BOX, ("Bridges need to be rectangles.\n"));
+	DEBUG_ASSERTLOG( bridgeObj->getGeometryInfo().getGeomType()==GEOMETRY_BOX, ("Bridges need to be rectangles."));
 
 	const Coord3D *pos = bridgeObj->getPosition();
 	Real angle = bridgeObj->getOrientation();
@@ -385,7 +380,7 @@ Bridge::Bridge(Object *bridgeObj)
 	AsciiString bridgeTemplateName = bridgeObj->getTemplate()->getName();
 	TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( bridgeTemplateName );
 	if( bridgeTemplate == NULL ) {
-		DEBUG_LOG(( "*** Bridge Template Not Found '%s'.", bridgeTemplateName ));
+		DEBUG_LOG(( "*** Bridge Template Not Found '%s'.", bridgeTemplateName.str() ));
 		return;
 	}
 
@@ -405,7 +400,7 @@ Bridge::Bridge(Object *bridgeObj)
 	// create objects targetable objects for the 4 tower pieces
 	const ThingTemplate *towerTemplate;
 	BridgeTowerType type;
-	Object *tower;	
+	Object *tower;
 	for( Int i = 0; i < BRIDGE_MAX_TOWERS; ++i )
 	{
 
@@ -428,7 +423,7 @@ Bridge::Bridge(Object *bridgeObj)
 				pos.y -= v.y*offset;
 				break;
 
-		}  // end switch
+		}
 		tower = createTower( &pos, type, towerTemplate, bridgeObj );
 		if( tower )
 		{
@@ -436,17 +431,17 @@ Bridge::Bridge(Object *bridgeObj)
 			m_bridgeInfo.towerObjectID[ i ] = tower->getID();
 		}
 
-	}  // end for, i
+	}
 
 	m_next = NULL;
-}  // end Bridge
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Bridge::~Bridge()
 {
 
-}  // end ~Bridge
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -478,9 +473,9 @@ Bool Bridge::isPointOnBridge(const Coord3D *pLoc)
 
 /*-------------------------------------------------------------------------------------------------
 /** Clip a floating point line to the region provided.  The source line runs from p1 to p2, and is clipped
-	* using the clipRegion.  
+	* using the clipRegion.
 	*
-	* Return values: 
+	* Return values:
 	*				TRUE  - Line intersects the region
 	*				FALSE - Line does not intersect the region
 	*/
@@ -510,7 +505,7 @@ Bool LineInRegion( const Coord2D *p1, const Coord2D *p2, const Region2D *clipReg
 	y1 = p1->y;
 	x2 = p2->x;
 	y2 = p2->y;
-		
+
 	// Test first point
 	clipCode1 = 0;
 
@@ -547,7 +542,7 @@ Bool LineInRegion( const Coord2D *p1, const Coord2D *p2, const Region2D *clipReg
 	if ((clipCode1 | clipCode2) == 0)
 	{
 		return TRUE;
-	}  // end if
+	}
 
 	// Both points outside window?
 	if (clipCode1 & clipCode2)
@@ -631,13 +626,13 @@ Bool LineInRegion( const Coord2D *p1, const Coord2D *p2, const Region2D *clipReg
 			x2 >= clipLeft && x2 <= clipRight &&
 			y2 >= clipTop && y2 <= clipBottom);
 
-}  // end LineInRegion
+}
 
 static Bool PointInRegion2D( const Coord3D *pt, const Region2D *clipRegion )
 {
-	return (pt->x>=clipRegion->lo.x && 
+	return (pt->x>=clipRegion->lo.x &&
 					pt->y>=clipRegion->lo.y &&
-					pt->x<=clipRegion->hi.x && 
+					pt->x<=clipRegion->hi.x &&
 					pt->y<=clipRegion->hi.y);
 }
 
@@ -677,17 +672,17 @@ Bool Bridge::isCellOnEnd(const Region2D *cell)
 	if (PointInRegion2D(&toLeft, cell)) return false;
 	if (PointInRegion2D(&toRight, cell)) return false; */
 	Coord2D line1, line2;
-	line1.x = fromLeft.x; 
-	line1.y = fromLeft.y; 
-	line2.x = fromRight.x; 
-	line2.y = fromRight.y; 
+	line1.x = fromLeft.x;
+	line1.y = fromLeft.y;
+	line2.x = fromRight.x;
+	line2.y = fromRight.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
-	line1.x = toLeft.x; 
-	line1.y = toLeft.y; 
-	line2.x = toRight.x; 
-	line2.y = toRight.y; 
+	line1.x = toLeft.x;
+	line1.y = toLeft.y;
+	line2.x = toRight.x;
+	line2.y = toRight.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
@@ -725,17 +720,17 @@ Bool Bridge::isCellOnSide(const Region2D *cell)
 	toRight.y += endVector.y;
 
 	Coord2D line1, line2;
-	line1.x = fromLeft.x; 
-	line1.y = fromLeft.y; 
-	line2.x = toLeft.x; 
-	line2.y = toLeft.y; 
+	line1.x = fromLeft.x;
+	line1.y = fromLeft.y;
+	line2.x = toLeft.x;
+	line2.y = toLeft.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
-	line1.x = fromRight.x; 
-	line1.y = fromRight.y; 
-	line2.x = toRight.x; 
-	line2.y = toRight.y; 
+	line1.x = fromRight.x;
+	line1.y = fromRight.y;
+	line2.x = toRight.x;
+	line2.y = toRight.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
@@ -751,17 +746,17 @@ Bool Bridge::isCellOnSide(const Region2D *cell)
 	toRight.x += endVector.x;
 	toRight.y += endVector.y;
 
-	line1.x = fromLeft.x; 
-	line1.y = fromLeft.y; 
-	line2.x = toLeft.x; 
-	line2.y = toLeft.y; 
+	line1.x = fromLeft.x;
+	line1.y = fromLeft.y;
+	line2.x = toLeft.x;
+	line2.y = toLeft.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
-	line1.x = fromRight.x; 
-	line1.y = fromRight.y; 
-	line2.x = toRight.x; 
-	line2.y = toRight.y; 
+	line1.x = fromRight.x;
+	line1.y = fromRight.y;
+	line2.x = toRight.x;
+	line2.y = toRight.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
@@ -820,17 +815,17 @@ Bool Bridge::isCellEntryPoint(const Region2D *cell)
 	if (PointInRegion2D(&toRight, cell)) return false;
 	*/
 	Coord2D line1, line2;
-	line1.x = fromLeft.x; 
-	line1.y = fromLeft.y; 
-	line2.x = fromRight.x; 
-	line2.y = fromRight.y; 
+	line1.x = fromLeft.x;
+	line1.y = fromLeft.y;
+	line2.x = fromRight.x;
+	line2.y = fromRight.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
-	line1.x = toLeft.x; 
-	line1.y = toLeft.y; 
-	line2.x = toRight.x; 
-	line2.y = toRight.y; 
+	line1.x = toLeft.x;
+	line1.y = toLeft.y;
+	line2.x = toRight.x;
+	line2.y = toRight.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
@@ -861,7 +856,7 @@ Drawable *Bridge::pickBridge(const Vector3 &from, const Vector3 &to, Vector3 *po
 
 	if (isPointOnBridge(&loc)) {
 		*pos = intersectPos;
-		//DEBUG_LOG(("Picked bridge %.2f, %.2f, %.2f\n", intersectPos.X, intersectPos.Y, intersectPos.Z));
+		//DEBUG_LOG(("Picked bridge %.2f, %.2f, %.2f", intersectPos.X, intersectPos.Y, intersectPos.Z));
 		Object *bridge = TheGameLogic->findObjectByID(m_bridgeInfo.bridgeObjectID);
 		if (bridge) {
 			return bridge->getDrawable();
@@ -881,8 +876,8 @@ void Bridge::updateDamageState( void )
 	if (bridge) {
 		// get object damage state
 		{
-			enum BodyDamageType damageState = bridge->getBodyModule()->getDamageState(); 
-			enum BodyDamageType curState = m_bridgeInfo.curDamageState;
+			BodyDamageType damageState = bridge->getBodyModule()->getDamageState();
+			BodyDamageType curState = m_bridgeInfo.curDamageState;
 			if (damageState != curState) {
 				m_bridgeInfo.curDamageState = damageState;
 				if (damageState == BODY_RUBBLE) {
@@ -893,13 +888,13 @@ void Bridge::updateDamageState( void )
 						if (obj->getLayer() == m_layer) {
 							// don't consider the bridge health, 'cuz it's already dead. (srj)
 							const Bool considerBridgeHealth = false;
-							if (TheTerrainLogic->objectInteractsWithBridgeLayer(obj, obj->getLayer(), considerBridgeHealth)) 
+							if (TheTerrainLogic->objectInteractsWithBridgeLayer(obj, obj->getLayer(), considerBridgeHealth))
 							{
 								// srj sez: if we use this threshold, then stuff on the bridge apron doesn't die but
 								// might sink thru the eyecandy of bridge drbris, looking funny. so now we just indiscriminately
 								// kill everything that was on the bridge, regardless of height they might fall.
 								//Real deltaHeight = obj->getPosition()->z - TheTerrainLogic->getGroundHeight(obj->getPosition()->x, obj->getPosition()->y);
-								//if (deltaHeight>PATHFIND_CELL_SIZE_F * 0.5f) 
+								//if (deltaHeight>PATHFIND_CELL_SIZE_F * 0.5f)
 								{
 									// The object fell off the bridge.
 									// Destroy it.
@@ -963,12 +958,9 @@ Real Bridge::getBridgeHeight(const Coord3D *pLoc, Coord3D* normal)
 TerrainLogic::TerrainLogic()
 {
 	Int i;
-	
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
+
 	m_activeBoundary = 0;
 	m_waterGridEnabled = FALSE;
-	//
 	for( i = 0; i < MAX_DYNAMIC_WATER; ++i )
 	{
 
@@ -978,7 +970,7 @@ TerrainLogic::TerrainLogic()
 		m_waterToUpdate[ i ].damageAmount = 0.0f;
 		m_waterToUpdate[ i ].currentHeight = 0.0f;
 
-	}  // end for i
+	}
 	m_numWaterToUpdate = 0;
 
 	m_waypointListHead = NULL;
@@ -989,7 +981,7 @@ TerrainLogic::TerrainLogic()
 	m_mapDY = 0;
 
 
-}  // end TerrainLogic
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -998,7 +990,7 @@ TerrainLogic::~TerrainLogic()
 
 	reset(); // just in case
 
-}  // end ~TerrainLogic
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Init */
@@ -1006,7 +998,7 @@ TerrainLogic::~TerrainLogic()
 void TerrainLogic::init( void )
 {
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -1019,7 +1011,7 @@ void TerrainLogic::reset( void )
 	PolygonTrigger::deleteTriggers();
 	m_numWaterToUpdate = 0;
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -1043,7 +1035,7 @@ void TerrainLogic::update( void )
 
 		for( Int i = m_numWaterToUpdate - 1; i >= 0; --i )
 		{
-			
+
 			// get the water info
 			water = m_waterToUpdate[ i ].waterTable;
 			changePerFrame = m_waterToUpdate[ i ].changePerFrame;
@@ -1059,25 +1051,25 @@ void TerrainLogic::update( void )
 			finalTransition = FALSE;
 			if( changePerFrame > 0 )
 			{
-			
+
 				if( currentHeight + changePerFrame >= targetHeight )
 					finalTransition = TRUE;
 
-			}  // end if
+			}
 			else
 			{
-			
+
 				if( currentHeight + changePerFrame <= targetHeight )
 					finalTransition = TRUE;
-				
-			}  // end else
+
+			}
 
 			if( finalTransition == TRUE )
 			{
 
 				//
 				// make the final water height change, note we do damage on the final transition
-				// in all situations by passing a valid damage amount 
+				// in all situations by passing a valid damage amount
 				//
 				setWaterHeight( water, targetHeight, damageAmount, TRUE );
 
@@ -1090,12 +1082,12 @@ void TerrainLogic::update( void )
 					m_waterToUpdate[ i ] = m_waterToUpdate[ j ];
 				m_numWaterToUpdate -= 1;
 
-			}  // end if
+			}
 			else
 			{
 
 				//
-				// we're not doing damage every frame (0 damage) from the water 
+				// we're not doing damage every frame (0 damage) from the water
 				// because it's an expensive process
 				//
 				if( doDamageThisFrame == FALSE )
@@ -1112,13 +1104,13 @@ void TerrainLogic::update( void )
 				// update actual water
 				setWaterHeight( water, currentHeight, damageAmount, FALSE );
 
-			}  // end else
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** newMap */
@@ -1127,14 +1119,14 @@ void TerrainLogic::newMap( Bool saveGame )
 {
 
 	// Set waypoint's z value, now that the height map is loaded.
-	for( Waypoint *way = m_waypointListHead; way; way = way->getNext() ) 
+	for( Waypoint *way = m_waypointListHead; way; way = way->getNext() )
 	{
 		const Coord3D* loc = way->getLocation();
 		way->setLocationZ(getGroundHeight(loc->x, loc->y));
 	}
 	//
 	// until we have a real way to specify different water planes in the map, we will check
-	// for a special waypoint name that we will put in maps that we want to have a 
+	// for a special waypoint name that we will put in maps that we want to have a
 	// water grid
 	/// @todo Mark W, remove this when you have water plane placements in the map done (Colin)
 	//
@@ -1144,7 +1136,7 @@ void TerrainLogic::newMap( Bool saveGame )
 		enable = TRUE;
 	enableWaterGrid( enable );
 
-}  // end newMap
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1175,7 +1167,7 @@ void TerrainLogic::enableWaterGrid( Bool enable )
 				waterSettingIndex = i;
 				break;  // exit for i
 
-			}  // end if
+			}
 
 			//
 			// no exact map name (including path) was found, try to look for a match in just the
@@ -1204,48 +1196,48 @@ void TerrainLogic::enableWaterGrid( Bool enable )
 			// now try this compare
 			if( strippedMapNameOnly.compareNoCase( strippedCompareMapNameOnly.str() ) == 0 )
 			{
-				
+
 				waterSettingIndex = i;
 				break;  // exit for i
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		// check for no match found
 		if( waterSettingIndex == -1 )
 		{
 
-			DEBUG_CRASH(( "!!!!!! Deformable water won't work because there was no group of vertex water data defined in GameData.INI for this map name '%s' !!!!!! (C. Day)\n",
+			DEBUG_CRASH(( "!!!!!! Deformable water won't work because there was no group of vertex water data defined in GameData.INI for this map name '%s' !!!!!! (C. Day)",
 										TheGlobalData->m_mapName.str() ));
 			return;
 
-		}  // end if
+		}
 
-		TheTerrainVisual->setWaterGridHeightClamps( NULL, 
-																								TheGlobalData->m_vertexWaterHeightClampLow[ waterSettingIndex ], 
+		TheTerrainVisual->setWaterGridHeightClamps( NULL,
+																								TheGlobalData->m_vertexWaterHeightClampLow[ waterSettingIndex ],
 																								TheGlobalData->m_vertexWaterHeightClampHi[ waterSettingIndex ] );
-		TheTerrainVisual->setWaterTransform( NULL, 
-																				 TheGlobalData->m_vertexWaterAngle[ waterSettingIndex ], 
-																				 TheGlobalData->m_vertexWaterXPosition[ waterSettingIndex ], 
-																				 TheGlobalData->m_vertexWaterYPosition[ waterSettingIndex ], 
+		TheTerrainVisual->setWaterTransform( NULL,
+																				 TheGlobalData->m_vertexWaterAngle[ waterSettingIndex ],
+																				 TheGlobalData->m_vertexWaterXPosition[ waterSettingIndex ],
+																				 TheGlobalData->m_vertexWaterYPosition[ waterSettingIndex ],
 																				 TheGlobalData->m_vertexWaterZPosition[ waterSettingIndex ] );
-		TheTerrainVisual->setWaterGridResolution( NULL, 
-																							TheGlobalData->m_vertexWaterXGridCells[ waterSettingIndex ], 
-																							TheGlobalData->m_vertexWaterYGridCells[ waterSettingIndex ], 
+		TheTerrainVisual->setWaterGridResolution( NULL,
+																							TheGlobalData->m_vertexWaterXGridCells[ waterSettingIndex ],
+																							TheGlobalData->m_vertexWaterYGridCells[ waterSettingIndex ],
 																							TheGlobalData->m_vertexWaterGridSize[ waterSettingIndex ] );
-		TheTerrainVisual->setWaterAttenuationFactors( NULL, 
-																									TheGlobalData->m_vertexWaterAttenuationA[ waterSettingIndex ], 
-																									TheGlobalData->m_vertexWaterAttenuationB[ waterSettingIndex ], 
-																									TheGlobalData->m_vertexWaterAttenuationC[ waterSettingIndex ], 
-																									TheGlobalData->m_vertexWaterAttenuationRange[ waterSettingIndex ] );	
+		TheTerrainVisual->setWaterAttenuationFactors( NULL,
+																									TheGlobalData->m_vertexWaterAttenuationA[ waterSettingIndex ],
+																									TheGlobalData->m_vertexWaterAttenuationB[ waterSettingIndex ],
+																									TheGlobalData->m_vertexWaterAttenuationC[ waterSettingIndex ],
+																									TheGlobalData->m_vertexWaterAttenuationRange[ waterSettingIndex ] );
 
-	}  // end if
+	}
 
 	// notify the terrain visual of the change
 	TheTerrainVisual->enableWaterGrid( enable );
 
-}  // end enableWaterGrid
+}
 
 //-------------------------------------------------------------------------------------------------
 /** device independent terrain logic load.  If query is true, we are just loading it to get
@@ -1270,14 +1262,14 @@ Bool TerrainLogic::loadMap( AsciiString filename, Bool query )
 	}
 
 	CachedFileInputStream theInputStream;
-	if (theInputStream.open(AsciiString(m_filenameString.str()))) 
+	if (theInputStream.open(AsciiString(m_filenameString.str())))
 	try {
 		ChunkInputStream *pStrm = &theInputStream;
 		pStrm->absoluteSeek(0);
 		DataChunkInput file( pStrm );
 		if (file.isValidFileType()) {	// Backwards compatible files aren't valid data chunk files.
 			// Read the waypoints.
-			file.registerParser( AsciiString("WaypointsList"), AsciiString::TheEmptyString, parseWaypointDataChunk );
+			file.registerParser( "WaypointsList", AsciiString::TheEmptyString, parseWaypointDataChunk );
 			if (!file.parse(this)) {
 				DEBUG_CRASH(("Unable to read waypoint info."));
 				return false;
@@ -1297,21 +1289,21 @@ Bool TerrainLogic::loadMap( AsciiString filename, Bool query )
 		count++;
 		Coord3D loc;
 		pWay->getLocation(&loc);
-		DEBUG_LOG(("Waypoint %d - '%s' id=%d ", count, pWay->getName().str(), pWay->getID()));
-		DEBUG_LOG(("{%.2f, %.2f, %.2f} ", loc.x, loc.y, loc.z));
+		DEBUG_LOG_RAW(("Waypoint %d - '%s' id=%d ", count, pWay->getName().str(), pWay->getID()));
+		DEBUG_LOG_RAW(("{%.2f, %.2f, %.2f} ", loc.x, loc.y, loc.z));
 		Int i;
 		if (pWay->getNumLinks()) {
-			DEBUG_LOG(("Links to: "));
+			DEBUG_LOG_RAW(("Links to: "));
 			for (i=0; i<pWay->getNumLinks(); i++) {
 				Waypoint *pLink = pWay->getLink(i);
-				DEBUG_LOG(("'%s' id=%d ", pLink->getName().str(), pLink->getID()));
+				DEBUG_LOG_RAW(("'%s' id=%d ", pLink->getName().str(), pLink->getID()));
 			}
 		} else {
-			DEBUG_LOG(("No links."));
+			DEBUG_LOG_RAW(("No links."));
 		}
-		DEBUG_LOG(("\n"));
+		DEBUG_LOG_RAW(("\n"));
 	}
-	DEBUG_LOG(("Total of %d waypoints.\n", count));
+	DEBUG_LOG(("Total of %d waypoints.", count));
 #endif
 
 	if (!query) {
@@ -1321,7 +1313,7 @@ Bool TerrainLogic::loadMap( AsciiString filename, Bool query )
 
 	return TRUE;  // success
 
-}  // end load
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reads in the waypoint chunk */
@@ -1364,7 +1356,7 @@ void TerrainLogic::addWaypoint(MapObject *pMapObj)
 	Bool biDirectional;
 	biDirectional = pMapObj->getProperties()->getBool(TheKey_waypointPathBiDirectional, &exists);
 	DEBUG_ASSERTCRASH(pMapObj->isWaypoint(), ("not a waypoint"));
-	Waypoint *pWay = newInstance(Waypoint)(pMapObj->getWaypointID(), pMapObj->getWaypointName(), 
+	Waypoint *pWay = newInstance(Waypoint)(pMapObj->getWaypointID(), pMapObj->getWaypointName(),
 																&loc, label1, label2, label3, biDirectional);
 	pWay->setNext(m_waypointListHead);
 	m_waypointListHead = pWay;
@@ -1442,7 +1434,7 @@ Real TerrainLogic::getGroundHeight( Real x, Real y, Coord3D* normal ) const
 
 	return 0;
 
-}  // end getHight
+}
 
 //-------------------------------------------------------------------------------------------------
 /** default get height for terrain logic */
@@ -1454,7 +1446,7 @@ Real TerrainLogic::getLayerHeight( Real x, Real y, PathfindLayerEnum layer, Coor
 
 	return 0;
 
-}  // end getLayerHeight
+}
 
 //-------------------------------------------------------------------------------------------------
 /** default isCliffCell for terrain logic */
@@ -1464,7 +1456,7 @@ Bool TerrainLogic::isCliffCell( Real x, Real y) const
 
 	return false;
 
-}  // end isCliffCell
+}
 
 //-------------------------------------------------------------------------------------------------
 void makeAlignToNormalMatrix( Real angle, const Coord3D& pos, const Coord3D& normal, Matrix3D& mtx)
@@ -1479,12 +1471,12 @@ void makeAlignToNormalMatrix( Real angle, const Coord3D& pos, const Coord3D& nor
 		that atan2(xvec.y, xvec.x) == angle. So we must construct
 		the matrix carefully to ensure this!
 	*/
-	x.x = Cos( angle ); 
-	x.y = Sin( angle ); 
-	x.z = 0.0f; 
+	x.x = Cos( angle );
+	x.y = Sin( angle );
+	x.z = 0.0f;
 //x.normalize();	-- redundant; is normalized by definition
 
-	// dot of two unit vectors is cos of angle between them; 
+	// dot of two unit vectors is cos of angle between them;
 	// we want there to be a 90-deg angle between the x and z
 	// vectors, so calc x.z to satisfy this (ie, cos==0)
 	/*
@@ -1497,7 +1489,7 @@ void makeAlignToNormalMatrix( Real angle, const Coord3D& pos, const Coord3D& nor
 		x.normalize();
 	}
 
-	DEBUG_ASSERTCRASH(fabs(x.x*z.x + x.y*z.y + x.z*z.z)<0.0001,("dot is not zero (%f)\n",fabs(x.x*z.x + x.y*z.y + x.z*z.z)));
+	DEBUG_ASSERTCRASH(fabs(x.x*z.x + x.y*z.y + x.z*z.z)<0.0001,("dot is not zero (%f)",fabs(x.x*z.x + x.y*z.y + x.z*z.z)));
 
 	// now computing the y vector is trivial.
 	y.crossProduct( &z, &x, &y );
@@ -1591,7 +1583,7 @@ Waypoint *TerrainLogic::getClosestWaypointOnPath( const Coord3D *pos, AsciiStrin
 	Real distSqr = 0;
 	Waypoint *pClosestWay = NULL;
 	if (label.isEmpty()) {
-		DEBUG_LOG(("***Warning - asking for empty path label.\n"));
+		DEBUG_LOG(("***Warning - asking for empty path label."));
 		return NULL;
 	}
 
@@ -1612,7 +1604,7 @@ Waypoint *TerrainLogic::getClosestWaypointOnPath( const Coord3D *pos, AsciiStrin
 			}
 		}
 	}
-		
+
 	return pClosestWay;
 }
 
@@ -1622,7 +1614,7 @@ Waypoint *TerrainLogic::getClosestWaypointOnPath( const Coord3D *pos, AsciiStrin
 Bool TerrainLogic::isPurposeOfPath( Waypoint *pWay, AsciiString label )
 {
 	if (label.isEmpty() || pWay==NULL) {
-		DEBUG_LOG(("***Warning - asking for empth path label.\n"));
+		DEBUG_LOG(("***Warning - asking for empth path label."));
 		return false;
 	}
 
@@ -1642,7 +1634,7 @@ PolygonTrigger *TerrainLogic::getTriggerAreaByName( AsciiString name )
 {
 	for (PolygonTrigger* pTrig = PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
 		AsciiString trigName = pTrig->getTriggerName();
-		if (name == trigName) 
+		if (name == trigName)
 			return pTrig;
 	}
 	return NULL;
@@ -1670,13 +1662,13 @@ Bridge * TerrainLogic::findBridgeAt( const Coord3D *pLoc) const
 //-------------------------------------------------------------------------------------------------
 Bridge * TerrainLogic::findBridgeLayerAt( const Coord3D *pLoc, PathfindLayerEnum layer, Bool clip) const
 {
-	if (layer == LAYER_GROUND) 
+	if (layer == LAYER_GROUND)
 		return NULL;
 
 	Bridge *pBridge = getFirstBridge();
-	while (pBridge) 
+	while (pBridge)
 	{
-		if (pBridge->getLayer() == layer && (!clip || pBridge->isPointOnBridge(pLoc))) 
+		if (pBridge->getLayer() == layer && (!clip || pBridge->isPointOnBridge(pLoc)))
 		{
 			return(pBridge);
 		}
@@ -1846,10 +1838,10 @@ Bool TerrainLogic::objectInteractsWithBridgeEnd(Object *obj, Int layer) const
 			if (match) {
 				Real bridgeHeight = pBridge->getBridgeHeight(obj->getPosition(), NULL);
 				Real delta = fabs(obj->getPosition()->z-bridgeHeight);
-				if (delta>LAYER_Z_CLOSE_ENOUGH_F) 
+				if (delta>LAYER_Z_CLOSE_ENOUGH_F)
 				{
 					return false;
-				}			
+				}
 				return true;
 			}
 			return false;
@@ -2015,12 +2007,12 @@ void TerrainLogic::deleteBridge( Bridge *bridge )
 
 		m_bridgeListHead = bridge->getNext();
 
-	}  // end if
+	}
 	else
 	{
 
-		for( Bridge *otherBridge = getFirstBridge(); 
-				 otherBridge; 
+		for( Bridge *otherBridge = getFirstBridge();
+				 otherBridge;
 				 otherBridge = otherBridge->getNext() )
 		{
 
@@ -2034,11 +2026,11 @@ void TerrainLogic::deleteBridge( Bridge *bridge )
 				otherBridge->setNext( bridge->getNext() );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for, otherBridge
+		}
 
-	}  // end else
+	}
 
 	// delete object associated with bridge if present
 	BridgeInfo bridgeInfo;
@@ -2052,12 +2044,12 @@ void TerrainLogic::deleteBridge( Bridge *bridge )
 	// delete the bridge in question
 	deleteInstance(bridge);
 
-}  // end deleteBridge
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Returns the ground aligned point on the bounding box closest to the given point*/
 //-------------------------------------------------------------------------------------------------
-Coord3D TerrainLogic::findClosestEdgePoint ( const Coord3D *closestTo ) const 
+Coord3D TerrainLogic::findClosestEdgePoint ( const Coord3D *closestTo ) const
 {
 	Region3D mapExtent;
 	getExtent( &mapExtent );
@@ -2109,7 +2101,7 @@ Coord3D TerrainLogic::findClosestEdgePoint ( const Coord3D *closestTo ) const
 /** Returns the ground aligned point on the bounding box farthest from the given point*/
 //-------------------------------------------------------------------------------------------------
 // Lorenzen was here
-Coord3D TerrainLogic::findFarthestEdgePoint( const Coord3D *farthestFrom ) const 
+Coord3D TerrainLogic::findFarthestEdgePoint( const Coord3D *farthestFrom ) const
 {
 	Region3D mapExtent;
 	getExtent( &mapExtent );
@@ -2148,7 +2140,12 @@ Bool TerrainLogic::isUnderwater( Real x, Real y, Real *waterZ, Real *terrainZ )
 
 	// if no water here, no height, no nuttin
 	if( waterHandle == NULL )
+  {
+    // but we have to return the terrain Z if requested!
+    if (terrainZ)
+      *terrainZ=getGroundHeight(x,y);
 		return FALSE;
+  }
 
 	//
 	// if this water handle is a grid water use the grid height function, otherwise look into
@@ -2187,16 +2184,16 @@ const WaterHandle* TerrainLogic::getWaterHandle( Real x, Real y )
 	iLoc.z = 0;
 
 	// Look for water areas in the polygon triggers
-	for( PolygonTrigger *pTrig = PolygonTrigger::getFirstPolygonTrigger(); 
-			 pTrig; 
-			 pTrig = pTrig->getNext() ) 
+	for( PolygonTrigger *pTrig = PolygonTrigger::getFirstPolygonTrigger();
+			 pTrig;
+			 pTrig = pTrig->getNext() )
 	{
 
-		if( !pTrig->isWaterArea() ) 
+		if( !pTrig->isWaterArea() )
 			continue;
 
 		// See if point is in a water area
-		if( pTrig->pointInTrigger( iLoc ) ) 
+		if( pTrig->pointInTrigger( iLoc ) )
 		{
 
 			if( pTrig->getPoint( 0 )->z >= waterZ )
@@ -2205,11 +2202,11 @@ const WaterHandle* TerrainLogic::getWaterHandle( Real x, Real y )
 				waterZ = pTrig->getPoint( 0 )->z;
 				waterHandle = pTrig->getWaterHandle();
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
 	/**@todo: Remove this after we have all water types included
 		in water triggers.  For now do special check for water grid mesh. */
@@ -2217,7 +2214,7 @@ const WaterHandle* TerrainLogic::getWaterHandle( Real x, Real y )
 	// We shouldn't depend on TerrainVisual here.
 	Real meshZ;
 	if( TheTerrainVisual->getWaterGridHeight( x, y, &meshZ ) )
-	{	
+	{
 
 		//
 		// point falls on water grid, return the special handle for the grid water, since we
@@ -2229,13 +2226,13 @@ const WaterHandle* TerrainLogic::getWaterHandle( Real x, Real y )
 			waterZ = meshZ;
 			waterHandle = &m_gridWaterHandle;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	return waterHandle;
 
-}  // end getWaterHandle
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Get water handle by name assigned from the editor */
@@ -2255,7 +2252,7 @@ const WaterHandle* TerrainLogic::getWaterHandleByName( AsciiString name )
 
 	return NULL;
 
-}  // end getWaterHandleByName
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -2273,18 +2270,18 @@ Real TerrainLogic::getWaterHeight( const WaterHandle *water )
 	if( water == &m_gridWaterHandle )
 	{
 
-		DEBUG_CRASH(( "TerrainLogic::getWaterHeight( WaterHandle *water ) - water is a grid handle, cannot make this query\n" ));
+		DEBUG_CRASH(( "TerrainLogic::getWaterHeight( WaterHandle *water ) - water is a grid handle, cannot make this query" ));
 		return 0.0f;
 
-	}  //  end if
+	}
 
 	// sanity
-	DEBUG_ASSERTCRASH( water->m_polygon != NULL, ("getWaterHeight: polygon trigger in water handle is NULL\n") );
+	DEBUG_ASSERTCRASH( water->m_polygon != NULL, ("getWaterHeight: polygon trigger in water handle is NULL") );
 
 	// return the height of the water using the polygon trigger
 	return water->m_polygon->getPoint( 0 )->z;
 
-}  // end getWaterHeight
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set the water height.  If the water rises, then any objects that now find themselves
@@ -2319,7 +2316,7 @@ void TerrainLogic::setWaterHeight( const WaterHandle *water, Real height, Real d
 		transform.Set_Z_Translation( height );
 		TheTerrainVisual->setWaterTransform( &transform );
 
-	}  // end if
+	}
 	else
 	{
 
@@ -2339,10 +2336,10 @@ void TerrainLogic::setWaterHeight( const WaterHandle *water, Real height, Real d
 			newPoint.z = height;
 			water->m_polygon->setPoint( newPoint, i );
 
-		}  // end for
+		}
 		height = getWaterHeight(water);
 
-	}  // end else
+	}
 
 	// find the bounding rectangle of this water area
 	Region3D affectedRegion;
@@ -2354,9 +2351,9 @@ void TerrainLogic::setWaterHeight( const WaterHandle *water, Real height, Real d
 	{
 
 		// do the pathfind remapping
-		TheAI->pathfinder()->forceMapRecalculation(); 
+		TheAI->pathfinder()->forceMapRecalculation();
 
-	}  // end if
+	}
 
 	//
 	// if the water height has risen, we need apply water damage to things that are now
@@ -2372,13 +2369,13 @@ void TerrainLogic::setWaterHeight( const WaterHandle *water, Real height, Real d
 		center.z = 0.0f;  // irrelavant
 
 		// the max radius to scan around us is the diagonal of the bounding region
-		Real maxDist = sqrt( affectedRegion.width() * affectedRegion.width() + 
+		Real maxDist = sqrt( affectedRegion.width() * affectedRegion.width() +
 												 affectedRegion.height() * affectedRegion.height() );
 
 		// scan the objects in the area of the water affected
 		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( &center,
 																																			 maxDist,
-																																			 FROM_CENTER_2D, 
+																																			 FROM_CENTER_2D,
 																																			 NULL );
 		MemoryPoolObjectHolder hold( iter );
 		Object *obj;
@@ -2401,13 +2398,13 @@ void TerrainLogic::setWaterHeight( const WaterHandle *water, Real height, Real d
 				damageInfo.in.m_amount = damageAmount;
 				obj->attemptDamage( &damageInfo );
 
-			}  // end if
+			}
 
-		}  // end for obj
+		}
 
-	}  // end if, water has risen
+	}
 
-}  // end setWaterHeight
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Change the height of a water table over time */
@@ -2422,10 +2419,10 @@ void TerrainLogic::changeWaterHeightOverTime( const WaterHandle *water,
 	if( m_numWaterToUpdate >= MAX_DYNAMIC_WATER )
 	{
 
-		DEBUG_CRASH(( "Only '%d' simultaneous water table changes are supported\n", MAX_DYNAMIC_WATER ));
+		DEBUG_CRASH(( "Only '%d' simultaneous water table changes are supported", MAX_DYNAMIC_WATER ));
 		return;
 
-	}  // end if
+	}
 
 	// sanity
 	if( water == NULL )
@@ -2450,16 +2447,16 @@ void TerrainLogic::changeWaterHeightOverTime( const WaterHandle *water,
 			//
 			--i;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// get the current height of the water
 	Real currentHeight = getWaterHeight( water );
 
 	// add the entry into the array of water to update
 	m_waterToUpdate[ m_numWaterToUpdate ].waterTable = water;
-	m_waterToUpdate[ m_numWaterToUpdate ].changePerFrame = (finalHeight - currentHeight) / 
+	m_waterToUpdate[ m_numWaterToUpdate ].changePerFrame = (finalHeight - currentHeight) /
 																												 (LOGICFRAMES_PER_SECOND * transitionTimeInSeconds);
 	m_waterToUpdate[ m_numWaterToUpdate ].targetHeight = finalHeight;
 	m_waterToUpdate[ m_numWaterToUpdate ].damageAmount = damageAmount;
@@ -2468,7 +2465,7 @@ void TerrainLogic::changeWaterHeightOverTime( const WaterHandle *water,
 	// we now have one more entry to update
 	++m_numWaterToUpdate;
 
-}  // end chanageWaterHeightOverTime
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Find the axis aligned bounding region around a water table */
@@ -2526,9 +2523,9 @@ void TerrainLogic::findAxisAlignedBoundingRect( const WaterHandle *water, Region
 			if( v.Y > region->hi.y )
 				region->hi.y = v.Y;
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 	else
 	{
 
@@ -2537,7 +2534,7 @@ void TerrainLogic::findAxisAlignedBoundingRect( const WaterHandle *water, Region
 		Int numPoints = water->m_polygon->getNumPoints();
 		for( Int i = 0; i < numPoints; i++ )
 		{
-		
+
 			// get this point
 			p = water->m_polygon->getPoint( i );
 
@@ -2557,11 +2554,11 @@ void TerrainLogic::findAxisAlignedBoundingRect( const WaterHandle *water, Region
 			if( p->z > region->hi.z )
 				region->hi.z = p->z;
 
-		}  // end for i
-				
-	}  // end else
+		}
 
-}  // end findAxisAlignedBoundingRect
+	}
+
+}
 
 void TerrainLogic::setActiveBoundary(Int newActiveBoundary)
 {
@@ -2581,10 +2578,10 @@ void TerrainLogic::setActiveBoundary(Int newActiveBoundary)
 	}
 
 	ShroudStatusStoreRestore partitionStore;
-	
+
 	// Can't have any lingering looks persist over the resize, so flush the queue now
 	ThePartitionManager->processEntirePendingUndoShroudRevealQueue();
-	
+
 	//Store fogged cells
 	ThePartitionManager->storeFoggedCells(partitionStore, TRUE);
 
@@ -2604,7 +2601,7 @@ void TerrainLogic::setActiveBoundary(Int newActiveBoundary)
 
 	//Store permanently revealed cells.
 	ThePartitionManager->storeFoggedCells(partitionStore, FALSE);
-	
+
 	ThePartitionManager->reset();
 	ThePartitionManager->init();
 	TheRadar->newMap(TheTerrainLogic);
@@ -2638,7 +2635,7 @@ void TerrainLogic::setActiveBoundary(Int newActiveBoundary)
 // ------------------------------------------------------------------------------------------------
 /** Flatten the terrain beneath a struture. */
 // ------------------------------------------------------------------------------------------------
-void TerrainLogic::flattenTerrain(Object *obj) 
+void TerrainLogic::flattenTerrain(Object *obj)
 {
 	if (obj->getGeometryInfo().getIsSmall()) {
 		return;
@@ -2702,7 +2699,7 @@ void TerrainLogic::flattenTerrain(Object *obj)
 						match = true;
 					}
 					if (match) {
-						totalHeight += TheTerrainLogic->getGroundHeight(testPt.X, testPt.Y);
+						totalHeight += getGroundHeight(testPt.X, testPt.Y);
 						numSamples++;
 					}
 				}
@@ -2711,9 +2708,9 @@ void TerrainLogic::flattenTerrain(Object *obj)
 			Real avgHeight = totalHeight/numSamples;
 			Int rawDataHeight = REAL_TO_INT_FLOOR(0.5f + avgHeight/MAP_HEIGHT_SCALE);
 
-			// Compare to the height at the building's origin, because setRawMapHeight will only lower, 
+			// Compare to the height at the building's origin, because setRawMapHeight will only lower,
 			// not raise.  jba
-			Int centerHeight = REAL_TO_INT_FLOOR(TheTerrainLogic->getGroundHeight(pos->x, pos->y)/MAP_HEIGHT_SCALE);
+			Int centerHeight = REAL_TO_INT_FLOOR(getGroundHeight(pos->x, pos->y)/MAP_HEIGHT_SCALE);
 			if (rawDataHeight>centerHeight) rawDataHeight = centerHeight;
 
 			for (i=iMin.x; i<=iMax.x; i++) {
@@ -2763,14 +2760,14 @@ void TerrainLogic::flattenTerrain(Object *obj)
 				}
 			}
 
-				
+
 		break;
 		}
 		case GEOMETRY_SPHERE:	// not quite right, but close enough
 		case GEOMETRY_CYLINDER:
 		{
 			// fill in all cells that overlap as obstacle cells
-			Real radius = obj->getGeometryInfo().getMajorRadius();	
+			Real radius = obj->getGeometryInfo().getMajorRadius();
 			Real radiusSqr = sqr(radius);
 			ICoord2D iMin, iMax;
 			iMin.x = REAL_TO_INT_FLOOR((pos->x-radius)/MAP_XY_FACTOR);
@@ -2791,7 +2788,7 @@ void TerrainLogic::flattenTerrain(Object *obj)
 						match = true;
 					}
 					if (match) {
-						totalHeight += TheTerrainLogic->getGroundHeight(testPt.X, testPt.Y);
+						totalHeight += getGroundHeight(testPt.X, testPt.Y);
 						numSamples++;
 					}
 				}
@@ -2844,10 +2841,10 @@ void TerrainLogic::flattenTerrain(Object *obj)
 					}
 				}
 			}
-		
-		} // cylinder
+
+		}
 		break;
-	} // switch
+	}
 
 }
 
@@ -2857,7 +2854,7 @@ void TerrainLogic::flattenTerrain(Object *obj)
 void TerrainLogic::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer
@@ -2870,7 +2867,7 @@ void TerrainLogic::xfer( Xfer *xfer )
 {
 
 	// version
-	const XferVersion currentVersion = 2;	
+	const XferVersion currentVersion = 2;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
@@ -2899,10 +2896,10 @@ void TerrainLogic::xfer( Xfer *xfer )
 				Int triggerID = m_waterToUpdate[ i ].waterTable->m_polygon->getID();
 				xfer->xferInt( &triggerID );
 
-			}  // end if, save
+			}
 			else if (xfer->getXferMode() == XFER_LOAD)
 			{
-				
+
 				// read trigger id
 				Int triggerID;
 				xfer->xferInt( &triggerID );
@@ -2913,12 +2910,12 @@ void TerrainLogic::xfer( Xfer *xfer )
 				// sanity
 				if( poly == NULL )
 				{
-				
-					DEBUG_CRASH(( "TerrainLogic::xfer - Unable to find polygon trigger for water table with trigger ID '%d'\n",
+
+					DEBUG_CRASH(( "TerrainLogic::xfer - Unable to find polygon trigger for water table with trigger ID '%d'",
 												triggerID ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
 				// set water handle
 				m_waterToUpdate[ i ].waterTable = poly->getWaterHandle();
@@ -2927,12 +2924,12 @@ void TerrainLogic::xfer( Xfer *xfer )
 				if( m_waterToUpdate[ i ].waterTable == NULL )
 				{
 
-					DEBUG_CRASH(( "TerrainLogic::xfer - Polygon trigger to use for water handle has no water handle!\n" ));
+					DEBUG_CRASH(( "TerrainLogic::xfer - Polygon trigger to use for water handle has no water handle!" ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
-			}  // end else, load
+			}
 
 			// change per frame
 			xfer->xferReal( &m_waterToUpdate[ i ].changePerFrame );
@@ -2946,11 +2943,11 @@ void TerrainLogic::xfer( Xfer *xfer )
 			// current height
 			xfer->xferReal( &m_waterToUpdate[ i ].currentHeight );
 
-		}  // end for, i
+		}
 
-	}  // end if
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2959,7 +2956,7 @@ void TerrainLogic::loadPostProcess( void )
 {
 	Bridge* pBridge = getFirstBridge();
 	Bridge* pNext;
-	while (pBridge) 
+	while (pBridge)
 	{
 		pNext = pBridge->getNext();
 		Object* obj = TheGameLogic->findObjectByID(pBridge->peekBridgeInfo()->bridgeObjectID);
@@ -2970,5 +2967,5 @@ void TerrainLogic::loadPostProcess( void )
 		pBridge = pNext;
 	}
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Armor.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Armor.cpp
index fe052fa5c07..2fbddabc9ff 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Armor.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Armor.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_DAMAGE_NAMES						// for DamageNames[]
 
@@ -65,8 +65,8 @@ void ArmorTemplate::clear()
 }
 
 //-------------------------------------------------------------------------------------------------
-Real ArmorTemplate::adjustDamage(DamageType t, Real damage) const 
-{ 
+Real ArmorTemplate::adjustDamage(DamageType t, Real damage) const
+{
 	if (t == DAMAGE_UNRESISTABLE)
 		return damage;
 
@@ -74,7 +74,7 @@ Real ArmorTemplate::adjustDamage(DamageType t, Real damage) const
 
 	if (damage < 0.0f)
 		damage = 0.0f;
-	
+
 	return damage;
 }
 
@@ -115,11 +115,10 @@ ArmorStore::~ArmorStore()
 }
 
 //-------------------------------------------------------------------------------------------------
-const ArmorTemplate* ArmorStore::findArmorTemplate(AsciiString name) const
+const ArmorTemplate* ArmorStore::findArmorTemplate(NameKeyType namekey) const
 {
-	NameKeyType namekey = TheNameKeyGenerator->nameToKey(name);
-  ArmorTemplateMap::const_iterator it = m_armorTemplates.find(namekey);
-  if (it == m_armorTemplates.end()) 
+	ArmorTemplateMap::const_iterator it = m_armorTemplates.find(namekey);
+	if (it == m_armorTemplates.end())
 	{
 		return NULL;
 	}
@@ -129,10 +128,22 @@ const ArmorTemplate* ArmorStore::findArmorTemplate(AsciiString name) const
 	}
 }
 
+//-------------------------------------------------------------------------------------------------
+const ArmorTemplate* ArmorStore::findArmorTemplate(const AsciiString& name) const
+{
+	return findArmorTemplate(TheNameKeyGenerator->nameToKey(name));
+}
+
+//-------------------------------------------------------------------------------------------------
+const ArmorTemplate* ArmorStore::findArmorTemplate(const char* name) const
+{
+	return findArmorTemplate(TheNameKeyGenerator->nameToKey(name));
+}
+
 //-------------------------------------------------------------------------------------------------
 /*static */ void ArmorStore::parseArmorDefinition(INI *ini)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ "Armor", ArmorTemplate::parseArmorCoefficients, NULL, 0 }
 	};
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp
index 7e2ea1e227e..97c49aee134 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp
@@ -24,12 +24,12 @@
 
 // FILE: AutoHealBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Thing.h"
 #include "Common/ThingTemplate.h"
 #include "Common/INI.h"
@@ -44,11 +44,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -56,7 +51,7 @@ struct AutoHealPlayerScanHelper
 {
 	KindOfMaskType m_kindOfToTest;
 	Object *m_theHealer;
-	ObjectPointerList *m_objectList;	
+	ObjectPointerList *m_objectList;
 };
 
 static void checkForAutoHeal( Object *testObj, void *userData )
@@ -191,7 +186,7 @@ UpdateSleepTime AutoHealBehavior::update( void )
 		return UPDATE_SLEEP_FOREVER;
 	}
 
-//DEBUG_LOG(("doing auto heal %d\n",TheGameLogic->getFrame()));
+//DEBUG_LOG(("doing auto heal %d",TheGameLogic->getFrame()));
 
 	if( d->m_affectsWholePlayer )
 	{
@@ -235,7 +230,7 @@ UpdateSleepTime AutoHealBehavior::update( void )
 	}
 	else
 	{
-		//EXPANDED SYSTEM -- HEAL FRIENDLIES IN RADIUS 
+		//EXPANDED SYSTEM -- HEAL FRIENDLIES IN RADIUS
 		// setup scan filters
 		PartitionFilterRelationship relationship( obj, PartitionFilterRelationship::ALLOW_ALLIES );
 		PartitionFilterSameMapStatus filterMapStatus(obj);
@@ -262,8 +257,8 @@ UpdateSleepTime AutoHealBehavior::update( void )
 						if ( animTemplate )
 						{
 							Coord3D iconPosition;
-							iconPosition.set(obj->getPosition()->x, 
-															 obj->getPosition()->y, 
+							iconPosition.set(obj->getPosition()->x,
+															 obj->getPosition()->y,
 															 obj->getPosition()->z + obj->getGeometryInfo().getMaxHeightAbovePosition() );
 							TheInGameUI->addWorldAnimation( animTemplate,	&iconPosition, WORLD_ANIM_FADE_ON_EXPIRE,
 																							TheGlobalData->m_getHealedAnimationDisplayTimeInSeconds,
@@ -271,14 +266,14 @@ UpdateSleepTime AutoHealBehavior::update( void )
 						}
 					}
 				}
-			
+
 			}
-		}  // end for obj
+		}
 
 		return UPDATE_SLEEP( d->m_singleBurst ? UPDATE_SLEEP_FOREVER : d->m_healingDelay );
 	}
 }
- 
+
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void AutoHealBehavior::pulseHealObject( Object *obj )
@@ -288,7 +283,7 @@ void AutoHealBehavior::pulseHealObject( Object *obj )
 
 	const AutoHealBehaviorModuleData *data = getAutoHealBehaviorModuleData();
 
-	
+
 	if ( data->m_radius == 0.0f )
 		obj->attemptHealing(data->m_healingAmount, getObject());
 	else
@@ -303,7 +298,7 @@ void AutoHealBehavior::pulseHealObject( Object *obj )
 			system->setPosition( obj->getPosition() );
 		}
 	}
-	
+
 	m_soonestHealFrame = TheGameLogic->getFrame() + data->m_healingDelay;// In case onDamage tries to wake us up early
 }
 
@@ -319,7 +314,7 @@ void AutoHealBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpgradeMux::upgradeMuxCRC( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -349,7 +344,7 @@ void AutoHealBehavior::xfer( Xfer *xfer )
 	// stopped
 	xfer->xferBool( &m_stopped );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -363,4 +358,4 @@ void AutoHealBehavior::loadPostProcess( void )
 	// extend base class
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BehaviorModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BehaviorModule.cpp
index fb85029cb20..4a6e980ea5f 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BehaviorModule.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BehaviorModule.cpp
@@ -41,7 +41,7 @@ void BehaviorModule::crc( Xfer *xfer )
 	// call base class
 	ObjectModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -59,7 +59,7 @@ void BehaviorModule::xfer( Xfer *xfer )
 	// call base class
 	ObjectModule::xfer( xfer );
 
-}  // xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -70,4 +70,4 @@ void BehaviorModule::loadPostProcess( void )
 	// call base class
 	ObjectModule::loadPostProcess();
 
-}  // end loadPostProcess
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp
index a377ed4e8ed..1bdc37c657e 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Radar.h"
 #include "Common/ThingFactory.h"
@@ -62,7 +62,7 @@ BridgeBehaviorModuleData::BridgeBehaviorModuleData( void )
 	m_lateralScaffoldSpeed = 1.0f;
 	m_verticalScaffoldSpeed = 1.0f;
 
-}  // end BridgeBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -75,7 +75,7 @@ BridgeBehaviorModuleData::~BridgeBehaviorModuleData( void )
 	// clear the ocl list
 	m_ocl.clear();
 
-}  // end ~BridgeBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ BridgeBehaviorModuleData::~BridgeBehaviorModuleData( void )
 {
   BehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "LateralScaffoldSpeed",			INI::parseVelocityReal, NULL, offsetof( BridgeBehaviorModuleData, m_lateralScaffoldSpeed ) },
 		{ "VerticalScaffoldSpeed",		INI::parseVelocityReal, NULL, offsetof( BridgeBehaviorModuleData, m_verticalScaffoldSpeed ) },
@@ -94,13 +94,13 @@ BridgeBehaviorModuleData::~BridgeBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Parse time and location info in the form of:
 	* Delay:#### <Bone:BoneName> */
 // ------------------------------------------------------------------------------------------------
-static void parseTimeAndLocationInfo( INI *ini, void *instance, 
+static void parseTimeAndLocationInfo( INI *ini, void *instance,
 																			TimeAndLocationInfo *timeAndLocationInfo )
 {
 
@@ -109,10 +109,10 @@ static void parseTimeAndLocationInfo( INI *ini, void *instance,
 	if( stricmp( token, "Delay" ) != 0 )
 	{
 
-		DEBUG_CRASH(( "Expected 'Delay' token, found '%s'\n", token ));
+		DEBUG_CRASH(( "Expected 'Delay' token, found '%s'", token ));
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// delay value
 	ini->parseDurationUnsignedInt( ini, instance, &timeAndLocationInfo->delay, NULL );
@@ -126,23 +126,23 @@ static void parseTimeAndLocationInfo( INI *ini, void *instance,
 		if( stricmp( token, "Bone" ) != 0 )
 		{
 
-			DEBUG_CRASH(( "Expected 'Bone' token, found '%s'\n", token ));
+			DEBUG_CRASH(( "Expected 'Bone' token, found '%s'", token ));
 			throw INI_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read bone name and store
 		timeAndLocationInfo->boneName = ini->getNextAsciiString();
 
-	}  // end if
+	}
 
-}  // end parseTimeAndLocationInfo
+}
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void BridgeBehaviorModuleData::parseFX( INI *ini, 
-											 														 void *instance, 
-																									 void *store, 
+/*static*/ void BridgeBehaviorModuleData::parseFX( INI *ini,
+											 														 void *instance,
+																									 void *store,
 																									 const void *userData )
 {
 	const char *token;
@@ -159,10 +159,10 @@ static void parseTimeAndLocationInfo( INI *ini, void *instance,
 	if( stricmp( token, "FX" ) != 0 )
 	{
 
-		DEBUG_CRASH(( "Expected 'FX' token, found '%s'\n", token ));
+		DEBUG_CRASH(( "Expected 'FX' token, found '%s'", token ));
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// fx list name and store as pointer
 	FXList *fx;
@@ -177,13 +177,13 @@ static void parseTimeAndLocationInfo( INI *ini, void *instance,
 	// put on list
 	bridgeFXList->push_back( item );
 
-}  // end parseFX
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void BridgeBehaviorModuleData::parseOCL( INI *ini, 
+/*static*/ void BridgeBehaviorModuleData::parseOCL( INI *ini,
 																										void *instance,
-																										void *store, 
+																										void *store,
 																										const void *userData )
 {
 	const char *token;
@@ -200,10 +200,10 @@ static void parseTimeAndLocationInfo( INI *ini, void *instance,
 	if( stricmp( token, "OCL" ) != 0 )
 	{
 
-		DEBUG_CRASH(( "Expected 'OCL' token, found '%s'\n", token ));
+		DEBUG_CRASH(( "Expected 'OCL' token, found '%s'", token ));
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// fx list name and store as pointer
 	ObjectCreationList *ocl;
@@ -218,7 +218,7 @@ static void parseTimeAndLocationInfo( INI *ini, void *instance,
 	// put on list
 	bridgeOCLList->push_back( item );
 
-}  // end parseOCL
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -249,17 +249,17 @@ BridgeBehavior::BridgeBehavior( Thing *thing, const ModuleData *moduleData )
 			m_repairToOCL[ bodyState ][ i ] = NULL;
 			m_repairToFX[ bodyState ][ i ] = NULL;
 
-		}  // end for i
+		}
 
 		// these don't need initialization, they have constructors
 		// m_damageToSound[ bodyState ] = ???
 		// m_repairToSound[ bodyState ] = ???
 
-	}  // end for, bodyState
+	}
 
 	m_deathFrame = 0;
 
-}  // end BridgeBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -280,16 +280,16 @@ BridgeBehavior::~BridgeBehavior( void )
 		if( tower )
 			TheGameLogic->destroyObject( tower );
 
-	}  // end for i
+	}
 
-}  // end ~BridgeBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Get bridge behavior interface */
 // ------------------------------------------------------------------------------------------------
 /*static */BridgeBehaviorInterface *BridgeBehavior::getBridgeBehaviorInterfaceFromObject( Object *obj )
 {
-	
+
 	// sanity
 	if( obj == NULL )
 		return NULL;
@@ -303,12 +303,12 @@ BridgeBehavior::~BridgeBehavior( void )
 		if( bbi )
 			return bbi;
 
-	}  // end for, bmi
+	}
 
 	// interface not found
 	return NULL;
 
-}  // end getBridgeBehaviorInterfaceFromObject
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -318,7 +318,7 @@ void BridgeBehavior::onDelete( void )
 	// clear the list of scaffold objects
 	m_scaffoldObjectIDList.clear();
 
-}  // end onDelete
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -341,7 +341,7 @@ void BridgeBehavior::resolveFX( void )
 	if( bridgeTemplate == NULL )
 		return;
 
-	AsciiString name;	
+	AsciiString name;
 	for( Int bodyState = BODY_PRISTINE; bodyState < BODYDAMAGETYPE_COUNT; ++bodyState )
 	{
 
@@ -352,24 +352,24 @@ void BridgeBehavior::resolveFX( void )
 			name = bridgeTemplate->getDamageToOCLString( (BodyDamageType)bodyState, i );
 			m_damageToOCL[ bodyState ][ i ] = TheObjectCreationListStore->findObjectCreationList( name.str() );
 			if( name.isEmpty() == FALSE && m_damageToOCL[ bodyState ][ i ] == NULL )
-				DEBUG_CRASH(( "OCL list '%s' not found\n", name.str() ));
+				DEBUG_CRASH(( "OCL list '%s' not found", name.str() ));
 
 			name = bridgeTemplate->getDamageToFXString( (BodyDamageType)bodyState, i );
 			m_damageToFX[ bodyState ][ i ] = TheFXListStore->findFXList( name.str() );
 			if( name.isEmpty() == FALSE && m_damageToFX[ bodyState ][ i ] == NULL )
-				DEBUG_CRASH(( "FX list '%s' not found\n", name.str() ));
+				DEBUG_CRASH(( "FX list '%s' not found", name.str() ));
 
 			name = bridgeTemplate->getRepairedToOCLString( (BodyDamageType)bodyState, i );
 			m_repairToOCL[ bodyState ][ i ] = TheObjectCreationListStore->findObjectCreationList( name.str() );
 			if( name.isEmpty() == FALSE && m_repairToOCL[ bodyState ][ i ] == NULL )
-				DEBUG_CRASH(( "OCL list '%s' not found\n", name.str() ));
+				DEBUG_CRASH(( "OCL list '%s' not found", name.str() ));
 
 			name = bridgeTemplate->getRepairedToFXString( (BodyDamageType)bodyState, i );
-			m_repairToFX[ bodyState ][ i ] = TheFXListStore->findFXList( name.str() );;
+			m_repairToFX[ bodyState ][ i ] = TheFXListStore->findFXList( name.str() );
 			if( name.isEmpty() == FALSE && m_repairToFX[ bodyState ][ i ] == NULL )
-				DEBUG_CRASH(( "FX list '%s' not found\n", name.str() ));
+				DEBUG_CRASH(( "FX list '%s' not found", name.str() ));
 
-		}  // end for i
+		}
 
 		// audio sounds
 		name = bridgeTemplate->getDamageToSoundString( (BodyDamageType)bodyState );
@@ -380,12 +380,12 @@ void BridgeBehavior::resolveFX( void )
 		m_repairToSound[ bodyState ].setEventName( name );
 		m_repairToSound[ bodyState ].setObjectID( us->getID() );
 
-	}  // end for, bodyState
+	}
 
 	// fx are now "resolved"
 	m_fxResolved = TRUE;
 
-}  // end resolveFX
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -396,10 +396,10 @@ void BridgeBehavior::setTower( BridgeTowerType towerType, Object *tower )
 	if( towerType < 0 || towerType >= BRIDGE_MAX_TOWERS )
 	{
 
-		DEBUG_CRASH(( "BridgeBehavior::setTower - Invalid tower type index '%d'\n", towerType ));
+		DEBUG_CRASH(( "BridgeBehavior::setTower - Invalid tower type index '%d'", towerType ));
 		return;
 
-	}  // end if
+	}
 
 	// store it
 	if( tower )
@@ -407,7 +407,7 @@ void BridgeBehavior::setTower( BridgeTowerType towerType, Object *tower )
 	else
 		m_towerID[ towerType ] = INVALID_ID;
 
-}  // end setTower
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -418,15 +418,15 @@ ObjectID BridgeBehavior::getTowerID( BridgeTowerType towerType )
 	if( towerType < 0 || towerType >= BRIDGE_MAX_TOWERS )
 	{
 
-		DEBUG_CRASH(( "BridgeBehavior::setTower - Invalid tower type index '%d'\n", towerType ));
+		DEBUG_CRASH(( "BridgeBehavior::setTower - Invalid tower type index '%d'", towerType ));
 		return INVALID_ID;
 
-	}  // end if
+	}
 
 	// return the stored ID
 	return m_towerID[ towerType ];
 
-}  // end getTowerID
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -464,13 +464,13 @@ void BridgeBehavior::onDamage( DamageInfo *damageInfo )
 				towerDamage.in.m_deathType = damageInfo->in.m_deathType;
 				tower->attemptDamage( &towerDamage );
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 
-}  // end onDamage
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -502,19 +502,19 @@ void BridgeBehavior::onHealing( DamageInfo *damageInfo )
 				BodyModuleInterface *towerBody = tower->getBodyModule();
 				tower->attemptHealing(healingPercentage * towerBody->getMaxHealth(), getObject());
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 
-}  // end onHealing
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Pick a random surface spot on the bridge surface */
 // ------------------------------------------------------------------------------------------------
-void BridgeBehavior::getRandomSurfacePosition( TerrainRoadType *bridgeTemplate, 
-																							 const BridgeInfo *bridgeInfo, 
+void BridgeBehavior::getRandomSurfacePosition( TerrainRoadType *bridgeTemplate,
+																							 const BridgeInfo *bridgeInfo,
 																							 Coord3D *pos )
 {
 
@@ -552,21 +552,21 @@ void BridgeBehavior::getRandomSurfacePosition( TerrainRoadType *bridgeTemplate,
 	pos->z = v1.z + v2.z + bridgeInfo->fromLeft.z;
 
 	//
-	// we now have a position picked, the last thing to do is add in an additional 
+	// we now have a position picked, the last thing to do is add in an additional
 	// Z component so that effects can be created in a "cube" area on and above the bridge
 	//
 	pos->z += GameLogicRandomValueReal( 0.0f, bridgeTemplate->getTransitionEffectsHeight() );
 
-}  // end getRandomSurfacePosition
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void BridgeBehavior::doAreaEffects( TerrainRoadType *bridgeTemplate,
-																		Bridge *bridge, 
-																		const ObjectCreationList *ocl, 
+																		Bridge *bridge,
+																		const ObjectCreationList *ocl,
 																		const FXList *fx )
 {
-	
+
 	// sanity
 	if( bridge == NULL )
 		return;
@@ -591,7 +591,7 @@ void BridgeBehavior::doAreaEffects( TerrainRoadType *bridgeTemplate,
 			getRandomSurfacePosition( bridgeTemplate, bridgeInfo, &pos );
 			FXList::doFXPos( fx, &pos );
 
-		}  // end if
+		}
 
 		// pick spot in the bridge area and do OCL
 		if( ocl )
@@ -600,16 +600,16 @@ void BridgeBehavior::doAreaEffects( TerrainRoadType *bridgeTemplate,
 			getRandomSurfacePosition( bridgeTemplate, bridgeInfo, &pos );
 			ObjectCreationList::create( ocl, getObject(), &pos, NULL );
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end doAreaEffects
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																							BodyDamageType oldState, 
+void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
+																							BodyDamageType oldState,
 																							BodyDamageType newState )
 {
 
@@ -620,7 +620,7 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 	if( newState != BODY_RUBBLE )
 		m_deathFrame = 0;
 
-	// first resolve any fx stuff if we need to 
+	// first resolve any fx stuff if we need to
 	if( m_fxResolved == FALSE )
 		resolveFX();
 
@@ -629,7 +629,7 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 		return;
 
 	// sanity
-	DEBUG_ASSERTCRASH( oldState != newState, ("BridgeBehavior::onBodyDamageStateChange - oldState and newState should be different if this is getting called\n") );
+	DEBUG_ASSERTCRASH( oldState != newState, ("BridgeBehavior::onBodyDamageStateChange - oldState and newState should be different if this is getting called") );
 
 	Object *us = getObject();
 	Bridge *bridge = TheTerrainLogic->findBridgeAt( us->getPosition() );
@@ -638,10 +638,10 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 	if( bridge == NULL )
 	{
 
-		DEBUG_CRASH(( "BridgeBehavior - Unable to find bridge\n" ));
+		DEBUG_CRASH(( "BridgeBehavior - Unable to find bridge" ));
 		return;
 
-	}  // end if
+	}
 
 	// get the bridge template name
 	AsciiString bridgeTemplateName = bridge->getBridgeTemplateName();
@@ -650,8 +650,8 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 	TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( bridgeTemplateName );
 
 	// sanity
-	DEBUG_ASSERTCRASH( bridgeTemplate, ("BridgeBehavior: Unable to find bridge template '%s' in bridge object '%s'\n",	
-																		 bridgeTemplateName,
+	DEBUG_ASSERTCRASH( bridgeTemplate, ("BridgeBehavior: Unable to find bridge template '%s' in bridge object '%s'",
+																		 bridgeTemplateName.str(),
 																		 us->getTemplate()->getName().str()) );
 
 	//
@@ -673,7 +673,7 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 		for( Int i = 0; i < MAX_BRIDGE_BODY_FX; i++ )
 			doAreaEffects( bridgeTemplate, bridge, m_repairToOCL[ newState ][ i ], m_repairToFX[ newState ][ i ] );
 
-	}  // end if
+	}
 	else
 	{
 
@@ -683,7 +683,7 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 		for( Int i = 0; i < MAX_BRIDGE_BODY_FX; i++ )
 			doAreaEffects( bridgeTemplate, bridge, m_damageToOCL[ newState ][ i ], m_damageToFX[ newState ][ i ] );
 
-	}  // end else
+	}
 
 	// update bridge damage states
 	///@todo this should be re-written, there no need for this looping bridge examination
@@ -693,13 +693,13 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 	// for the local player, if this bridge has switched from rubble, to usable, or from
 	// usable to rubble, we should reflect the change on the radar.  note that we
 	// request that the radar queue a refresh sometime in the future because it keeps
-	// track of how often we makes requests to do a refresh and doesn't do them too 
+	// track of how often we makes requests to do a refresh and doesn't do them too
 	// often because it's expensive to refresh the terrain
 	//
 	if( oldState == BODY_RUBBLE || newState == BODY_RUBBLE )
 		TheRadar->queueTerrainRefresh();
 
-}  // end onBodyDamageStateChange
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -723,7 +723,7 @@ UpdateSleepTime BridgeBehavior::update( void )
 		TerrainRoadType *bridgeTemplate = NULL;
 		if ( bridge )
 		{
-			DEBUG_ASSERTCRASH( bridge, ("BridgeBehavior::update - Unable to find bridge\n") );
+			DEBUG_ASSERTCRASH( bridge, ("BridgeBehavior::update - Unable to find bridge") );
 
 			// get bridge info
 			bridgeInfo = bridge->peekBridgeInfo();
@@ -731,7 +731,7 @@ UpdateSleepTime BridgeBehavior::update( void )
 			// get the bridge template info
 			AsciiString bridgeTemplateName = bridge->getBridgeTemplateName();
 			bridgeTemplate = TheTerrainRoads->findBridge( bridgeTemplateName );
-			DEBUG_ASSERTCRASH( bridgeTemplate, ("BridgeBeahvior::getRandomSurfacePosition - Encountered a bridge with no template!\n") );
+			DEBUG_ASSERTCRASH( bridgeTemplate, ("BridgeBeahvior::getRandomSurfacePosition - Encountered a bridge with no template!") );
 		}
 
 		// how much time has passed between now and our destruction frame
@@ -743,7 +743,7 @@ UpdateSleepTime BridgeBehavior::update( void )
 		{
 
 			//
-			// we'll launch an fx list if our death time is equal to exactly the delay 
+			// we'll launch an fx list if our death time is equal to exactly the delay
 			// we're waiting for to launch the list
 			//
 			if( deathTime == (*fxIt).timeAndLocationInfo.delay )
@@ -761,14 +761,14 @@ UpdateSleepTime BridgeBehavior::update( void )
 					getRandomSurfacePosition( bridgeTemplate, bridgeInfo, &pos );
 				else
 					pos.set( getObject()->getPosition() );
-					
+
 
 				// launch the fx list
 				FXList::doFXPos( (*fxIt).fx, &pos );
 
-			}  // end if
+			}
 
-		}  // end for, fxIt
+		}
 
 		// see if there are any ocl visuals we need to execute
 		BridgeOCLList::const_iterator oclIt;
@@ -776,7 +776,7 @@ UpdateSleepTime BridgeBehavior::update( void )
 		{
 
 			//
-			// we'll launch an ocl list if our death time is equal to exactly the delay 
+			// we'll launch an ocl list if our death time is equal to exactly the delay
 			// we're waiting for to launch the list
 			//
 			if( deathTime == (*oclIt).timeAndLocationInfo.delay )
@@ -795,16 +795,16 @@ UpdateSleepTime BridgeBehavior::update( void )
 					// special case for creating an OCL for using the bridge object parent center location
 					// why do we have this ... well, apparently the OCL ignores the obj parameter
 					// passed in if you give it a position parameter, and we need it to pay attention
-					// to that object parameteter so the OCL stuff can inherit the LIKE_EXISTING 
+					// to that object parameteter so the OCL stuff can inherit the LIKE_EXISTING
 					// properties from its parent
 					//
 					if( boneName.compare( "ParentObject" ) == 0 )
 					{
-						
+
 						// launch the effects just using the parent object for location info
 						ObjectCreationList::create( (*oclIt).ocl, us, NULL );
 
-					}  // endif 
+					}
 					else
 					{
 
@@ -813,10 +813,10 @@ UpdateSleepTime BridgeBehavior::update( void )
 
 						// launch the fx list
 						ObjectCreationList::create( (*oclIt).ocl, us, &pos, NULL );
-					
-					}  // end else
 
-				}  // end if, bone name not empty
+					}
+
+				}
 				else
 				{
 
@@ -829,17 +829,17 @@ UpdateSleepTime BridgeBehavior::update( void )
 					// launch the fx list
 					ObjectCreationList::create( (*oclIt).ocl, us, &pos, NULL );
 
-				}  // end else
+				}
 
-			}  // end if
+			}
 
-		}  // end for, oclIt
+		}
 
-	}  // end if
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -855,15 +855,15 @@ void BridgeBehavior::onDie( const DamageInfo *damageInfo )
 		if( tower )
 			tower->kill();
 
-	}  // end for, i
+	}
 
 	// we need to handle anything that was on top of us now that we've been destroyed
 	handleObjectsOnBridgeOnDie();
 
 	// we have now died, record the death frame
 	m_deathFrame = TheGameLogic->getFrame();
-			
-}  // end onDie
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -897,7 +897,7 @@ void BridgeBehavior::handleObjectsOnBridgeOnDie( void )
 		for( Int i = 0; i < 4; ++i )
 			if( bridgePolygon[ i ].z < lowBridgeZ )
 				lowBridgeZ = bridgePolygon[ i ].z;
-		
+
 		//
 		// given the polygon area, how big is the radius that we need to scan in the world
 		// to cover from the center of the bridge (the bridge object position) to the edge
@@ -909,8 +909,8 @@ void BridgeBehavior::handleObjectsOnBridgeOnDie( void )
 		Real radius = v.length();
 
 		// scan the objects in the radius
-		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( bridgePos, 
-																																			 radius, 
+		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( bridgePos,
+																																			 radius,
 																																			 FROM_CENTER_2D );
 		MemoryPoolObjectHolder hold( iter );
 		Object *other;
@@ -947,20 +947,20 @@ void BridgeBehavior::handleObjectsOnBridgeOnDie( void )
 			else
 				other->kill();
 
-		}  // end for, other	
+		}
 
-	}  // end if, terrainBridge
+	}
 
-}  // end handleObjectsOnBridgeDie
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set all the position, angle, and speed data we need to for a single scaffold object */
 // ------------------------------------------------------------------------------------------------
-void BridgeBehavior::setScaffoldData( Object *obj, 
-																			Real *angle, 
-																			Real *sunkenHeight, 
-																			const Coord3D *riseToPos, 
-																			const Coord3D *buildPos, 
+void BridgeBehavior::setScaffoldData( Object *obj,
+																			Real *angle,
+																			Real *sunkenHeight,
+																			const Coord3D *riseToPos,
+																			const Coord3D *buildPos,
 																			const Coord3D *bridgeCenter )
 {
 
@@ -973,7 +973,7 @@ void BridgeBehavior::setScaffoldData( Object *obj,
 	// get the scaffold behavior interface
 	BridgeScaffoldBehaviorInterface *scaffoldBehavior;
 	scaffoldBehavior = BridgeScaffoldBehavior::getBridgeScaffoldBehaviorInterfaceFromObject( obj );
-	DEBUG_ASSERTCRASH( scaffoldBehavior, ("Unable to find bridge scaffold behavior interface\n") );
+	DEBUG_ASSERTCRASH( scaffoldBehavior, ("Unable to find bridge scaffold behavior interface") );
 
 	// compute the sunken position that the object will initially start at
 	Real fudge = 8.0f;
@@ -985,7 +985,7 @@ void BridgeBehavior::setScaffoldData( Object *obj,
 
 	// set all the destination points for all scaffold motion
 	scaffoldBehavior->setPositions( &sunkenPos, riseToPos, buildPos );
-	
+
 	// set the scaffold object in motion rising up out of the ground
 	scaffoldBehavior->setMotion( STM_RISE );
 
@@ -1013,7 +1013,7 @@ void BridgeBehavior::setScaffoldData( Object *obj,
 	Real verticalSpeed = modData->m_verticalScaffoldSpeed;
 	scaffoldBehavior->setVerticalSpeed( verticalSpeed );
 
-}  // end setScaffoldData
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Start the bridge repair scaffolding.  If we already have scaffolding this call
@@ -1036,7 +1036,7 @@ void BridgeBehavior::createScaffolding( void )
 	// get the bridge template
 	AsciiString bridgeTemplateName = bridge->getBridgeTemplateName();
 	TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( bridgeTemplateName );
-	DEBUG_ASSERTCRASH( bridgeTemplate, ("Unable to find bridge template to create scaffolding\n") );
+	DEBUG_ASSERTCRASH( bridgeTemplate, ("Unable to find bridge template to create scaffolding") );
 
 	// get the thing template for the scaffold object we're going to use
 	AsciiString scaffoldObjectName = bridgeTemplate->getScaffoldObjectName();
@@ -1044,10 +1044,10 @@ void BridgeBehavior::createScaffolding( void )
 	if( scaffoldTemplate == NULL )
 	{
 
-		DEBUG_CRASH(( "Unable to find bridge scaffold template\n" ));
+		DEBUG_CRASH(( "Unable to find bridge scaffold template" ));
 		return;
 
-	}  // end if
+	}
 
 	// get thing template for scaffold support object
 	AsciiString scaffoldSupportObjectName = bridgeTemplate->getScaffoldSupportObjectName();
@@ -1055,10 +1055,10 @@ void BridgeBehavior::createScaffolding( void )
 	if( scaffoldSupportTemplate == NULL )
 	{
 
-		DEBUG_CRASH(( "Unable to find bridge support scaffold template\n" ));
+		DEBUG_CRASH(( "Unable to find bridge support scaffold template" ));
 		return;
 
-	}  // end if
+	}
 
 	// how much space is going to be between each of the scaffold objects at their final positions
 	Real spacing = scaffoldTemplate->getTemplateGeometryInfo().getMajorRadius() * 2.0f;
@@ -1111,7 +1111,7 @@ void BridgeBehavior::createScaffolding( void )
 	rightVector.z = leftStart.z - rightStart.z;
 
 	//
-	// how many of these scaffold objects will take to tile from each of the endpoints 
+	// how many of these scaffold objects will take to tile from each of the endpoints
 	// to the center area of the bridge
 	//
 	Real tileDistance = leftVector.length();
@@ -1127,7 +1127,7 @@ void BridgeBehavior::createScaffolding( void )
 	Int numIterations = REAL_TO_INT_CEIL( INT_TO_REAL( numObjects ) / 2.0f );
 
 	//
-	// normalize left and right vectors as it is a vector that goes from our left start 
+	// normalize left and right vectors as it is a vector that goes from our left start
 	// position to the destination right start position ... we will multiply this vector by a
 	// spacing amount and add to the left start position to find a destination position
 	// for a particular scaffold object along the bridge surface
@@ -1144,8 +1144,8 @@ void BridgeBehavior::createScaffolding( void )
 	{
 
 		// sanity
-		DEBUG_ASSERTCRASH( scaffoldObjectsCreated < numObjects, 
-											 ("Creating too many scaffold objects\n") );
+		DEBUG_ASSERTCRASH( scaffoldObjectsCreated < numObjects,
+											 ("Creating too many scaffold objects") );
 
 		// create object
 		obj = TheThingFactory->newObject( scaffoldTemplate, us->getTeam() );
@@ -1189,11 +1189,11 @@ void BridgeBehavior::createScaffolding( void )
 			supportDestinationPos.z -= scaffoldSupportHeight;
 			supportBridgeCenter.z -= scaffoldSupportHeight;
 			obj = TheThingFactory->newObject( scaffoldSupportTemplate, us->getTeam() );
-			setScaffoldData( obj, 
-											 angle, 
+			setScaffoldData( obj,
+											 angle,
 											 &scaffoldSupportHeight,
-											 &supportRiseToPos, 
-											 &supportDestinationPos, 
+											 &supportRiseToPos,
+											 &supportDestinationPos,
 											 &supportBridgeCenter );
 			m_scaffoldObjectIDList.push_back( obj->getID() );
 
@@ -1201,7 +1201,7 @@ void BridgeBehavior::createScaffolding( void )
 			// off to the next layer
 			offset -= scaffoldSupportHeight;
 
-		}  // end while
+		}
 
 		//
 		// now create the object from the "right" side of the bridge ... but note that
@@ -1212,8 +1212,8 @@ void BridgeBehavior::createScaffolding( void )
 		{
 
 			// sanity
-			DEBUG_ASSERTCRASH( scaffoldObjectsCreated < numObjects, 
-												 ("Creating too many scaffold objects\n") );
+			DEBUG_ASSERTCRASH( scaffoldObjectsCreated < numObjects,
+												 ("Creating too many scaffold objects") );
 
 			// create new object
 			obj = TheThingFactory->newObject( scaffoldTemplate, us->getTeam() );
@@ -1254,11 +1254,11 @@ void BridgeBehavior::createScaffolding( void )
 				supportDestinationPos.z -= scaffoldSupportHeight;
 				supportBridgeCenter.z -= scaffoldSupportHeight;
 				obj = TheThingFactory->newObject( scaffoldSupportTemplate, us->getTeam() );
-				setScaffoldData( obj, 
-												 angle, 
+				setScaffoldData( obj,
+												 angle,
 												 &scaffoldSupportHeight,
-												 &supportRiseToPos, 
-												 &supportDestinationPos, 
+												 &supportRiseToPos,
+												 &supportDestinationPos,
 												 &supportBridgeCenter );
 				m_scaffoldObjectIDList.push_back( obj->getID() );
 
@@ -1266,11 +1266,11 @@ void BridgeBehavior::createScaffolding( void )
 				// off to the next layer
 				offset -= scaffoldSupportHeight;
 
-			}  // end while
+			}
 
-		}  // end if
+		}
 
-	}  // end for i	
+	}
 
 	// scaffolding is now present
 	m_scaffoldPresent = TRUE;
@@ -1278,7 +1278,7 @@ void BridgeBehavior::createScaffolding( void )
 	// when scaffolding is present, a bridge cannot be used
 	TheAI->pathfinder()->changeBridgeState( bridge->getLayer(), FALSE );
 
-}  // end createScaffolding
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove the bridge scaffolding.  If we don't have any then this call is ignored */
@@ -1304,12 +1304,12 @@ void BridgeBehavior::removeScaffolding( void )
 
 		// get the scaffold behavior
 		scaffoldBehavior = BridgeScaffoldBehavior::getBridgeScaffoldBehaviorInterfaceFromObject( obj );
-		DEBUG_ASSERTCRASH( scaffoldBehavior, ("Unable to find bridge scaffold behavior interface\n") );
-		
+		DEBUG_ASSERTCRASH( scaffoldBehavior, ("Unable to find bridge scaffold behavior interface") );
+
 		// reverse the motion
 		scaffoldBehavior->reverseMotion();
 
-	}  // end for, it
+	}
 
 	// clear our scaffold object list
 	m_scaffoldObjectIDList.clear();
@@ -1328,9 +1328,9 @@ void BridgeBehavior::removeScaffolding( void )
 		if( bridge )
 			TheAI->pathfinder()->changeBridgeState( bridge->getLayer(), TRUE );
 
-	}  // end if
+	}
 
-}  // end removeScaffolding
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Is any of the scaffolding in motion */
@@ -1358,12 +1358,12 @@ Bool BridgeBehavior::isScaffoldInMotion( void )
 		if( bsbi->getCurrentMotion() != STM_STILL )
 			return TRUE;
 
-	}  // end for
+	}
 
 	// not in motion
 	return FALSE;
 
-}  // end isScaffoldInMotion
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -1374,7 +1374,7 @@ void BridgeBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1399,12 +1399,12 @@ void BridgeBehavior::xfer( Xfer *xfer )
 		Bridge *bridge = TheTerrainLogic->findBridgeAt( us->getPosition() );
 
 		// sanity
-		DEBUG_ASSERTCRASH( bridge, ("BridgeBehavior::xfer - Unable to find bridge\n" ));
+		DEBUG_ASSERTCRASH( bridge, ("BridgeBehavior::xfer - Unable to find bridge" ));
 
 		// set new object ID in bridge info to us
 		bridge->setBridgeObjectID( us->getID() );
 
-	}  // end if
+	}
 
 	// xfer the tower object ids
 	for( Int i = 0; i < BRIDGE_MAX_TOWERS; ++i )
@@ -1417,13 +1417,13 @@ void BridgeBehavior::xfer( Xfer *xfer )
 		Bridge *bridge = TheTerrainLogic->findBridgeAt( us->getPosition() );
 
 		// sanity
-		DEBUG_ASSERTCRASH( bridge, ("BridgeBehavior::xfer - Unable to find bridge\n" ));
+		DEBUG_ASSERTCRASH( bridge, ("BridgeBehavior::xfer - Unable to find bridge" ));
 
 		// set new object ID in bridge info to us
 		for( Int i = 0; i < BRIDGE_MAX_TOWERS; ++i )
 			bridge->setTowerObjectID( m_towerID[ i ], (BridgeTowerType)i );
 
-	}  // end if
+	}
 
 	// scaffold present flag
 	xfer->xferBool( &m_scaffoldPresent );
@@ -1435,7 +1435,7 @@ void BridgeBehavior::xfer( Xfer *xfer )
 	ObjectID scaffoldObjectID;
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
-		
+
 		// write out all object IDs
 		ObjectIDListIterator it;
 		for( it = m_scaffoldObjectIDList.begin(); it != m_scaffoldObjectIDList.end(); ++it )
@@ -1444,15 +1444,15 @@ void BridgeBehavior::xfer( Xfer *xfer )
 			scaffoldObjectID = *it;
 			xfer->xferObjectID( &scaffoldObjectID );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
 		// read all object IDs
-		DEBUG_ASSERTCRASH( m_scaffoldObjectIDList.size() == 0,
-											 ("BridgeBehavior::xfer - scaffold object list should be empty\n") );
+		DEBUG_ASSERTCRASH( m_scaffoldObjectIDList.empty(),
+											 ("BridgeBehavior::xfer - scaffold object list should be empty") );
 		for( Int i = 0; i < scaffoldObjectCount; ++i )
 		{
 
@@ -1462,14 +1462,14 @@ void BridgeBehavior::xfer( Xfer *xfer )
 			// put on list
 			m_scaffoldObjectIDList.push_back( scaffoldObjectID );
 
-		}  // end for i
+		}
 
-	}  // end load
+	}
 
 	// death frame
 	xfer->xferUnsignedInt( &m_deathFrame );
-		
-}  // end xfer
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1480,4 +1480,4 @@ void BridgeBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeScaffoldBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeScaffoldBehavior.cpp
index 25b9a985d5a..4ca29443328 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeScaffoldBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeScaffoldBehavior.cpp
@@ -49,14 +49,14 @@ BridgeScaffoldBehavior::BridgeScaffoldBehavior( Thing *thing, const ModuleData *
 	m_lateralSpeed = 1.0f;
 	m_verticalSpeed = 1.0f;
 
-}  // end BridgeScaffoldBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 BridgeScaffoldBehavior::~BridgeScaffoldBehavior( void )
 {
 
-}  // end ~BridgeScaffoldBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set all of the target positions that we're care about as a moving scaffold object */
@@ -70,12 +70,12 @@ void BridgeScaffoldBehavior::setPositions( const Coord3D *createPos,
 	m_riseToPos = *riseToPos;
 	m_buildPos = *buildPos;
 
-}  // end setPositions
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set us moving to the right target position for the requested motion type */
 // ------------------------------------------------------------------------------------------------
-void BridgeScaffoldBehavior::setMotion( ScaffoldTargetMotion targetMotion ) 
+void BridgeScaffoldBehavior::setMotion( ScaffoldTargetMotion targetMotion )
 {
 
 	// save the target motion type
@@ -86,9 +86,9 @@ void BridgeScaffoldBehavior::setMotion( ScaffoldTargetMotion targetMotion )
 	{
 
 		// --------------------------------------------------------------------------------------------
-		case STM_RISE: 
+		case STM_RISE:
 		case STM_TEAR_DOWN_ACROSS:
-			m_targetPos = m_riseToPos; 
+			m_targetPos = m_riseToPos;
 			break;
 
 		// --------------------------------------------------------------------------------------------
@@ -101,9 +101,9 @@ void BridgeScaffoldBehavior::setMotion( ScaffoldTargetMotion targetMotion )
 			m_targetPos = m_createPos;
 			break;
 
-	}  // end switch
+	}
 
-}  // end setMotion
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Whatever our current state of motion is, reverse it */
@@ -134,9 +134,9 @@ void BridgeScaffoldBehavior::reverseMotion( void )
 			setMotion( STM_RISE );
 			break;
 
-	}  // end switch
+	}
 
-}  // end reverseMotion
+}
 
 // ------------------------------------------------------------------------------------------------
 /** The update method */
@@ -192,7 +192,11 @@ UpdateSleepTime BridgeScaffoldBehavior::update( void )
 			end = &m_riseToPos;
 			break;
 
-	}  // end switch
+		default:
+			DEBUG_CRASH(("Unhandled case in BridgeScaffoldBehavior::update()"));
+			return UPDATE_SLEEP_NONE;
+
+	}
 
 	// adjust speed so it's slower at the end of motion
 	Coord3D speedVector;
@@ -241,7 +245,7 @@ UpdateSleepTime BridgeScaffoldBehavior::update( void )
 		newPos = m_targetPos;
 
 		//
-		// we have reached our target position, switch motion to the next position in 
+		// we have reached our target position, switch motion to the next position in
 		// the chain (which may be stay still and don't move anymore)
 		//
 		switch( m_targetMotion )
@@ -258,11 +262,11 @@ UpdateSleepTime BridgeScaffoldBehavior::update( void )
 				TheGameLogic->destroyObject( us );
 				break;
 
-			}  // end case
+			}
 
-		}  // end switch
+		}
 
-	}  // end if
+	}
 
 	// set the new position
 	us->setPosition( &newPos );
@@ -270,7 +274,7 @@ UpdateSleepTime BridgeScaffoldBehavior::update( void )
 	// do not sleep
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** STATIC MEMBER:
@@ -293,12 +297,12 @@ BridgeScaffoldBehaviorInterface *BridgeScaffoldBehavior::getBridgeScaffoldBehavi
 		if( bridgeScaffoldInterface )
 			return bridgeScaffoldInterface;
 
-	}  // end for bmi
+	}
 
 	// interface not found
 	return NULL;
 
-}  // end getBridgeScaffoldBehaviorInterfaceFromObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -309,7 +313,7 @@ void BridgeScaffoldBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -348,7 +352,7 @@ void BridgeScaffoldBehavior::xfer( Xfer *xfer )
 	// current target pos
 	xfer->xferCoord3D( &m_targetPos );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -359,4 +363,4 @@ void BridgeScaffoldBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeTowerBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeTowerBehavior.cpp
index 5376bcbd384..554688e6058 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeTowerBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeTowerBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
@@ -48,14 +48,14 @@ BridgeTowerBehavior::BridgeTowerBehavior( Thing *thing, const ModuleData *module
 
 	m_bridgeID = INVALID_ID;
 
-}  // end BridgeTowerBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 BridgeTowerBehavior::~BridgeTowerBehavior( void )
 {
 
-}  // end ~BridgeTowerBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -67,7 +67,7 @@ void BridgeTowerBehavior::setBridge( Object *bridge )
 	else
 		m_bridgeID = bridge->getID();
 
-}  // end setBridge
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -76,7 +76,7 @@ ObjectID BridgeTowerBehavior::getBridgeID( void )
 
 	return m_bridgeID;
 
-}  // end getBridge
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -85,7 +85,7 @@ void BridgeTowerBehavior::setTowerType( BridgeTowerType type )
 
 	m_type = type;
 
-}  // end setTowerType
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -114,8 +114,8 @@ void BridgeTowerBehavior::onDamage( DamageInfo *damageInfo )
 		if( bridgeInterface )
 			break;
 
-	}  // end for bmi
-	DEBUG_ASSERTCRASH( bridgeInterface != NULL, ("BridgeTowerBehavior::onDamage - no 'BridgeBehaviorInterface' found\n") );
+	}
+	DEBUG_ASSERTCRASH( bridgeInterface != NULL, ("BridgeTowerBehavior::onDamage - no 'BridgeBehaviorInterface' found") );
 	if( bridgeInterface )
 	{
 
@@ -124,7 +124,7 @@ void BridgeTowerBehavior::onDamage( DamageInfo *damageInfo )
 		// or other towers
 		//
 		Object *source = TheGameLogic->findObjectByID( damageInfo->in.m_sourceID );
-		if( source == NULL || 
+		if( source == NULL ||
 			  (source->isKindOf( KINDOF_BRIDGE ) == FALSE &&
 				 source->isKindOf( KINDOF_BRIDGE_TOWER ) == FALSE) )
 		{
@@ -145,9 +145,9 @@ void BridgeTowerBehavior::onDamage( DamageInfo *damageInfo )
 					towerDamage.in.m_deathType = damageInfo->in.m_deathType;
 					tower->attemptDamage( &towerDamage );
 
-				}  // end if
+				}
 
-			}  // end for i
+			}
 
 			//
 			// damage bridge object, but make sure it's done through the bridge interface
@@ -162,11 +162,11 @@ void BridgeTowerBehavior::onDamage( DamageInfo *damageInfo )
 			bridgeDamage.in.m_deathType = damageInfo->in.m_deathType;
 			bridge->attemptDamage( &bridgeDamage );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end onDamage
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -195,8 +195,8 @@ void BridgeTowerBehavior::onHealing( DamageInfo *damageInfo )
 		if( bridgeInterface )
 			break;
 
-	}  // end for bmi
-	DEBUG_ASSERTCRASH( bridgeInterface != NULL, ("BridgeTowerBehavior::onHealing - no 'BridgeBehaviorInterface' found\n") );
+	}
+	DEBUG_ASSERTCRASH( bridgeInterface != NULL, ("BridgeTowerBehavior::onHealing - no 'BridgeBehaviorInterface' found") );
 	if( bridgeInterface )
 	{
 
@@ -205,7 +205,7 @@ void BridgeTowerBehavior::onHealing( DamageInfo *damageInfo )
 		// or other towers
 		//
 		Object *source = TheGameLogic->findObjectByID( damageInfo->in.m_sourceID );
-		if( source == NULL || 
+		if( source == NULL ||
 			  (source->isKindOf( KINDOF_BRIDGE ) == FALSE &&
 				 source->isKindOf( KINDOF_BRIDGE_TOWER ) == FALSE) )
 		{
@@ -220,9 +220,9 @@ void BridgeTowerBehavior::onHealing( DamageInfo *damageInfo )
 					BodyModuleInterface *towerBody = tower->getBodyModule();
 					tower->attemptHealing(healingPercentage * towerBody->getMaxHealth(), getObject());
 
-				}  // end if
+				}
 
-			}  // end for i
+			}
 
 			//
 			// heal bridge object, but make sure it's done through the bridge interface
@@ -231,20 +231,20 @@ void BridgeTowerBehavior::onHealing( DamageInfo *damageInfo )
 			BodyModuleInterface *bridgeBody = bridge->getBodyModule();
 			bridge->attemptHealing(healingPercentage * bridgeBody->getMaxHealth(), getObject());
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end onHealing
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void BridgeTowerBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																									 BodyDamageType oldState, 
+void BridgeTowerBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
+																									 BodyDamageType oldState,
 																									 BodyDamageType newState )
 {
 
-}  // end onBodyDamageStateChange
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -256,7 +256,7 @@ void BridgeTowerBehavior::onDie( const DamageInfo *damageInfo )
 	if( bridge )
 		bridge->kill();
 
-}  // end onDie
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -281,12 +281,12 @@ BridgeTowerBehaviorInterface *BridgeTowerBehavior::getBridgeTowerBehaviorInterfa
 		if( bridgeTowerInterface )
 			return bridgeTowerInterface;
 
-	}  // end for bmi
+	}
 
 	// interface not found
 	return NULL;
 
-}  // getBridgeTowerBehaviorInterfaceFromObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -297,7 +297,7 @@ void BridgeTowerBehavior::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -321,7 +321,7 @@ void BridgeTowerBehavior::xfer( Xfer *xfer )
 	// xfer tower type
 	xfer->xferUser( &m_type, sizeof( BridgeTowerType ) );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -332,4 +332,4 @@ void BridgeTowerBehavior::loadPostProcess( void )
 	// extend base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp
index c9c90e35138..e4096fcab7d 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp
@@ -24,9 +24,9 @@
 
 // FILE: DumbProjectileBehavior.cpp
 // Author: Steven Johnson, July 2002
-// Desc:   
+// Desc:
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BezierSegment.h"
 #include "Common/GameCommon.h"
@@ -45,11 +45,6 @@
 #include "GameLogic/Module/PhysicsUpdate.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -59,7 +54,7 @@
 const Int DEFAULT_MAX_LIFESPAN = 10 * LOGICFRAMES_PER_SECOND;
 
 //-----------------------------------------------------------------------------
-DumbProjectileBehaviorModuleData::DumbProjectileBehaviorModuleData() : 
+DumbProjectileBehaviorModuleData::DumbProjectileBehaviorModuleData() :
 	m_maxLifespan(DEFAULT_MAX_LIFESPAN),
 	m_detonateCallsKill(FALSE),
 	m_orientToFlightPath(TRUE),
@@ -67,7 +62,7 @@ DumbProjectileBehaviorModuleData::DumbProjectileBehaviorModuleData() :
 	m_firstHeight(0.0f),
 	m_secondHeight(0.0f),
 	m_firstPercentIndent(0.0f),
-	m_secondPercentIndent(0.0f),	
+	m_secondPercentIndent(0.0f),
 	m_garrisonHitKillCount(0),
 	m_garrisonHitKillFX(NULL),
 	m_flightPathAdjustDistPerFrame(0.0f)
@@ -79,7 +74,7 @@ void DumbProjectileBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MaxLifespan", INI::parseDurationUnsignedInt, NULL, offsetof( DumbProjectileBehaviorModuleData, m_maxLifespan ) },
 		{ "TumbleRandomly", INI::parseBool, NULL, offsetof( DumbProjectileBehaviorModuleData, m_tumbleRandomly ) },
@@ -123,7 +118,7 @@ DumbProjectileBehavior::DumbProjectileBehavior( Thing *thing, const ModuleData*
 	m_flightPathEnd.zero();
 	m_currentFlightPathStep = 0;
 	m_extraBonusFlags = 0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 DumbProjectileBehavior::~DumbProjectileBehavior()
@@ -155,7 +150,7 @@ static Bool calcTrajectory(
 	Real maxPitch,					// in: max pitch (-PI/2)
 	Bool preferShortPitch,	// in: prefer the shorter or longer path?
 	Real& angle,						// out: the angle to aim
-	Real& pitch							// out: the pitch to aim for 
+	Real& pitch							// out: the pitch to aim for
 )
 {
 	Bool exactTarget = false;
@@ -206,7 +201,7 @@ static Bool calcTrajectory(
 	Real sineOfAngle = (gravity * horizDist) / sqr(velocity);
 	if (sineOfAngle > 1.0f)
 	{
-		return false;	
+		return false;
 	}
 	Real theta = ASin(sineOfAngle)*0.5f;
 */
@@ -223,16 +218,16 @@ static Bool calcTrajectory(
 //++numLoops;
 		pitches[0] = theta;	// shallower angle
 		pitches[1] = (theta >= 0.0) ? (PI/2 - theta) : (-PI/2 - theta);	// steeper angle
-		
-		DEBUG_ASSERTCRASH(pitches[0]<=PI/2&&pitches[0]>=-PI/2,("bad pitches[0] %f\n",rad2deg(pitches[0])));
-		DEBUG_ASSERTCRASH(pitches[1]<=PI/2&&pitches[1]>=-PI/2,("bad pitches[1] %f\n",rad2deg(pitches[1])));
+
+		DEBUG_ASSERTCRASH(pitches[0]<=PI/2&&pitches[0]>=-PI/2,("bad pitches[0] %f",rad2deg(pitches[0])));
+		DEBUG_ASSERTCRASH(pitches[1]<=PI/2&&pitches[1]>=-PI/2,("bad pitches[1] %f",rad2deg(pitches[1])));
 
 		// calc the horiz-speed & time for each.
 		// note that time can only be negative for 90<angle<270, and since we
 		// ruled those out above, we're gold.
 		sinPitches[0] = Sin(pitches[0]);
 		sinPitches[1] = Sin(pitches[1]);
-		cosPitches[0] = Cos(pitches[0]); 
+		cosPitches[0] = Cos(pitches[0]);
 		cosPitches[1] = Cos(pitches[1]);
 		Real t0 = (horizDist / (velocity * cosPitches[0]));
 		Real t1 = (horizDist / (velocity * cosPitches[1]));
@@ -242,7 +237,7 @@ static Bool calcTrajectory(
 
 
 		DEBUG_ASSERTCRASH(t0>=0&&t1>=0,("neg time"));
-		
+
 		Int preferred = ((t0 < t1) == (preferShortPitch)) ? 0 : 1;
 
 		// ok, NOW... since dz is virtually NEVER zero, do a little approximation
@@ -257,7 +252,7 @@ static Bool calcTrajectory(
 		if (root < 0.0f)
 		{
 			// oops, no solution for our preferred pitch. try the other one.
-			if (preferred == 0)	
+			if (preferred == 0)
 				tooClose = true;	// if this fails for the shallow case, it's 'cuz the result is too close
 			preferred = 1 - preferred;
 			vz = velocity*sinPitches[preferred];
@@ -310,7 +305,7 @@ static Bool calcTrajectory(
 		}
 	}
 
-//DEBUG_LOG(("took %d loops to find a match\n",numLoops));
+//DEBUG_LOG(("took %d loops to find a match",numLoops));
 	if (exactTarget)
 		return true;
 
@@ -323,11 +318,11 @@ static Bool calcTrajectory(
 // Prepares the missile for launch via proper weapon-system channels.
 //-------------------------------------------------------------------------------------------------
 void DumbProjectileBehavior::projectileLaunchAtObjectOrPosition(
-	const Object* victim, 
-	const Coord3D* victimPos, 
-	const Object* launcher, 
-	WeaponSlotType wslot, 
-	Int specificBarrelToUse, 
+	const Object* victim,
+	const Coord3D* victimPos,
+	const Object* launcher,
+	WeaponSlotType wslot,
+	Int specificBarrelToUse,
 	const WeaponTemplate* detWeap,
 	const ParticleSystemTemplate* exhaustSysOverride
 )
@@ -379,7 +374,7 @@ void DumbProjectileBehavior::projectileFireAtObjectOrPosition( const Object *vic
 	{
 		m_flightPathSpeed = weaponSpeed;
 	}
-	
+
  	PhysicsBehavior* physics = projectile->getPhysics();
  	if ( d->m_tumbleRandomly && physics)
 	{
@@ -451,7 +446,7 @@ Bool DumbProjectileBehavior::calcFlightPath(Bool recalcNumSegments)
 	flightCurve.getSegmentPoints( m_flightPathSegments, &m_flightPath );
 	DEBUG_ASSERTCRASH(m_flightPathSegments == m_flightPath.size(), ("m_flightPathSegments mismatch"));
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if( TheGlobalData->m_debugProjectilePath )
 		displayFlightPath();
 #endif
@@ -472,7 +467,7 @@ Bool DumbProjectileBehavior::projectileHandleCollision( Object *other )
 			// if it's not the specific thing we were targeting, see if we should incidentally collide...
 		if (!m_detonationWeaponTmpl->shouldProjectileCollideWith(projectileLauncher, getObject(), other, m_victimID))
 		{
-			//DEBUG_LOG(("ignoring projectile collision with %s at frame %d\n",other->getTemplate()->getName().str(),TheGameLogic->getFrame()));
+			//DEBUG_LOG(("ignoring projectile collision with %s at frame %d",other->getTemplate()->getName().str(),TheGameLogic->getFrame()));
 			return true;
 		}
 
@@ -492,15 +487,15 @@ Bool DumbProjectileBehavior::projectileHandleCollision( Object *other )
 						Object* thingToKill = *it++;
 						if (!thingToKill->isEffectivelyDead() && thingToKill->isKindOfMulti(d->m_garrisonHitKillKindof, d->m_garrisonHitKillKindofNot))
 						{
-							//DEBUG_LOG(("Killed a garrisoned unit (%08lx %s) via Flash-Bang!\n",thingToKill,thingToKill->getTemplate()->getName().str()));
+							//DEBUG_LOG(("Killed a garrisoned unit (%08lx %s) via Flash-Bang!",thingToKill,thingToKill->getTemplate()->getName().str()));
 							if (projectileLauncher)
 								projectileLauncher->scoreTheKill( thingToKill );
 							thingToKill->kill();
 							++numKilled;
 						}
-					} // next contained item
-				} // if items
-				
+					}
+				}
+
 				if (numKilled > 0)
 				{
 					// note, fx is played at center of building, not at grenade's location
@@ -511,7 +506,7 @@ Bool DumbProjectileBehavior::projectileHandleCollision( Object *other )
 
 					return true;
 				}
-			}	// if a garrisonable thing
+			}
 		}
 
 	}
@@ -623,7 +618,7 @@ UpdateSleepTime DumbProjectileBehavior::update()
 
 	if (d->m_orientToFlightPath && (!d->m_tumbleRandomly) && m_currentFlightPathStep > 0)
 	{
-	// this seems reasonable; however, if this object has a PhysicsBehavior on it, this calc will be wrong, 
+	// this seems reasonable; however, if this object has a PhysicsBehavior on it, this calc will be wrong,
 	// since Physics is applying gravity, which we duly ignore, but the prevPos won't be what we expect.
 	// get it from the flight path instead. (srj)
 	//Coord3D prevPos = *getObject()->getPosition();
@@ -674,14 +669,14 @@ UpdateSleepTime DumbProjectileBehavior::update()
 // ------------------------------------------------------------------------------------------------
 /** displayFlightPath for debugging */
 // ------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 void DumbProjectileBehavior::displayFlightPath()
 {
 	extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 	for( size_t pointIndex = 0; pointIndex < m_flightPath.size(); ++pointIndex )
 	{
-		addIcon(&m_flightPath[pointIndex], TheGlobalData->m_debugProjectileTileWidth, 
-										TheGlobalData->m_debugProjectileTileDuration, 
+		addIcon(&m_flightPath[pointIndex], TheGlobalData->m_debugProjectileTileWidth,
+										TheGlobalData->m_debugProjectileTileDuration,
 										TheGlobalData->m_debugProjectileTileColor);
 	}
 }
@@ -696,7 +691,7 @@ void DumbProjectileBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -745,20 +740,20 @@ void DumbProjectileBehavior::xfer( Xfer *xfer )
 			if( m_detonationWeaponTmpl == NULL )
 			{
 
-				DEBUG_CRASH(( "DumbProjectileBehavior::xfer - Unknown weapon template '%s'\n",
+				DEBUG_CRASH(( "DumbProjectileBehavior::xfer - Unknown weapon template '%s'",
 											weaponTemplateName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
 	// lifespan frame
 	xfer->xferUnsignedInt( &m_lifespanFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -769,4 +764,4 @@ void DumbProjectileBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDamagedBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDamagedBehavior.cpp
index b99c658e495..c846c48e9c7 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDamagedBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDamagedBehavior.cpp
@@ -24,12 +24,12 @@
 
 // FILE: FireWeaponWhenDamagedBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_SLOWDEATHPHASE_NAMES
 
 #include "Common/Thing.h"
@@ -47,7 +47,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ObjectCreationList.h"
 #include "GameLogic/Weapon.h"
-#include "GameClient/Drawable.h"
 
 const Int MAX_IDX = 32;
 
@@ -56,7 +55,7 @@ const Real END_MIDPOINT_RATIO = 0.65f;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-FireWeaponWhenDamagedBehavior::FireWeaponWhenDamagedBehavior( Thing *thing, const ModuleData* moduleData ) : 
+FireWeaponWhenDamagedBehavior::FireWeaponWhenDamagedBehavior( Thing *thing, const ModuleData* moduleData ) :
 	UpdateModule( thing, moduleData ),
 	m_reactionWeaponPristine( NULL ),
 	m_reactionWeaponDamaged( NULL ),
@@ -86,7 +85,7 @@ FireWeaponWhenDamagedBehavior::FireWeaponWhenDamagedBehavior( Thing *thing, cons
 	if ( d->m_reactionWeaponReallyDamaged )
 	{
 		m_reactionWeaponReallyDamaged		= TheWeaponStore->allocateNewWeapon(
-			d->m_reactionWeaponReallyDamaged,		PRIMARY_WEAPON); 
+			d->m_reactionWeaponReallyDamaged,		PRIMARY_WEAPON);
 		m_reactionWeaponReallyDamaged->reloadAmmo( obj );
 	}
 	if ( d->m_reactionWeaponRubble )
@@ -146,23 +145,15 @@ FireWeaponWhenDamagedBehavior::FireWeaponWhenDamagedBehavior( Thing *thing, cons
 //-------------------------------------------------------------------------------------------------
 FireWeaponWhenDamagedBehavior::~FireWeaponWhenDamagedBehavior( void )
 {
-	if (m_reactionWeaponPristine)
-		deleteInstance(m_reactionWeaponPristine);
-	if (m_reactionWeaponDamaged)
-		deleteInstance(m_reactionWeaponDamaged);
-	if (m_reactionWeaponReallyDamaged)
-		deleteInstance(m_reactionWeaponReallyDamaged);
-	if (m_reactionWeaponRubble)
-		deleteInstance(m_reactionWeaponRubble);
-
-	if (m_continuousWeaponPristine)
-		deleteInstance(m_continuousWeaponPristine);
-	if (m_continuousWeaponDamaged)
-		deleteInstance(m_continuousWeaponDamaged);
-	if (m_continuousWeaponReallyDamaged)
-		deleteInstance(m_continuousWeaponReallyDamaged);
-	if (m_continuousWeaponRubble)
-		deleteInstance(m_continuousWeaponRubble);
+	deleteInstance(m_reactionWeaponPristine);
+	deleteInstance(m_reactionWeaponDamaged);
+	deleteInstance(m_reactionWeaponReallyDamaged);
+	deleteInstance(m_reactionWeaponRubble);
+
+	deleteInstance(m_continuousWeaponPristine);
+	deleteInstance(m_continuousWeaponDamaged);
+	deleteInstance(m_continuousWeaponReallyDamaged);
+	deleteInstance(m_continuousWeaponRubble);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -277,7 +268,7 @@ void FireWeaponWhenDamagedBehavior::crc( Xfer *xfer )
 	// extend upgrade mux
 	UpgradeMux::upgradeMuxCRC( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -348,7 +339,7 @@ void FireWeaponWhenDamagedBehavior::xfer( Xfer *xfer )
 	if( weaponPresent )
 		xfer->xferSnapshot( m_continuousWeaponRubble );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -362,4 +353,4 @@ void FireWeaponWhenDamagedBehavior::loadPostProcess( void )
 	// extend upgrade mux
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp
index 7fde1f16f31..71f1a1e7562 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp
@@ -24,11 +24,11 @@
 
 // FILE: FireWeaponWhenDeadBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_SLOWDEATHPHASE_NAMES
 
 #include "Common/Thing.h"
@@ -47,13 +47,7 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ObjectCreationList.h"
 #include "GameLogic/Weapon.h"
-#include "GameClient/Drawable.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 const Int MAX_IDX = 32;
 
@@ -63,7 +57,7 @@ const Real END_MIDPOINT_RATIO = 0.65f;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-FireWeaponWhenDeadBehavior::FireWeaponWhenDeadBehavior( Thing *thing, const ModuleData* moduleData ) : 
+FireWeaponWhenDeadBehavior::FireWeaponWhenDeadBehavior( Thing *thing, const ModuleData* moduleData ) :
 	BehaviorModule( thing, moduleData )
 {
 	if (getFireWeaponWhenDeadBehaviorModuleData()->m_initiallyActive)
@@ -92,16 +86,16 @@ void FireWeaponWhenDeadBehavior::onDie( const DamageInfo *damageInfo )
 	// right type?
 	if (!d->m_dieMuxData.isDieApplicable(getObject(), damageInfo))
 		return;
-	
+
 	// This will never apply until built.  Otherwise canceling construction sets it off, and killing
 	// a one hitpoint one percent building will too.
 	if( obj->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 		return;
 
-	
+
 	UpgradeMaskType activation, conflicting;
 	getUpgradeActivationMasks( activation, conflicting );
-	
+
 	if( obj->getObjectCompletedUpgradeMask().testForAny( conflicting ) )
 	{
 		return;
@@ -110,7 +104,7 @@ void FireWeaponWhenDeadBehavior::onDie( const DamageInfo *damageInfo )
 	{
 		return;
 	}
-	
+
 	if (d->m_deathWeapon)
 	{
 		// fire the default weapon
@@ -130,7 +124,7 @@ void FireWeaponWhenDeadBehavior::crc( Xfer *xfer )
 	// extend upgrade mux
 	UpgradeMux::upgradeMuxCRC( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -151,7 +145,7 @@ void FireWeaponWhenDeadBehavior::xfer( Xfer *xfer )
 	// extend upgrade mux
 	UpgradeMux::upgradeMuxXfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -165,4 +159,4 @@ void FireWeaponWhenDeadBehavior::loadPostProcess( void )
 	// extend upgrade mux
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp
index c2b8af03571..c52f4fd5b26 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GenerateMinefieldBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_SLOWDEATHPHASE_NAMES
 
 #include "Common/GlobalData.h"
@@ -52,13 +52,7 @@
 #include "GameLogic/ObjectCreationList.h"
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/Weapon.h"
-#include "GameClient/Drawable.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 GenerateMinefieldBehaviorModuleData::GenerateMinefieldBehaviorModuleData()
@@ -77,10 +71,10 @@ GenerateMinefieldBehaviorModuleData::GenerateMinefieldBehaviorModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void GenerateMinefieldBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void GenerateMinefieldBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MineName", INI::parseAsciiString,	NULL, offsetof( GenerateMinefieldBehaviorModuleData, m_mineName ) },
 		{ "GenerationFX", INI::parseFXList,	NULL, offsetof( GenerateMinefieldBehaviorModuleData, m_genFX ) },
@@ -254,7 +248,7 @@ void GenerateMinefieldBehavior::placeMinesAlongLine(const Coord3D& posStart, con
 		pt.z = TheTerrainLogic->getGroundHeight( pt.x, pt.y );
 		offsetBySmallRandomAmount(pt, mineJitter);
 		placeMineAt(pt, mineTemplate, team, obj);
-	} 
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -315,7 +309,7 @@ void GenerateMinefieldBehavior::placeMinesAroundCircle(const Coord3D& pos, Real
 		pt.z = TheTerrainLogic->getGroundHeight( pt.x, pt.y );
 		offsetBySmallRandomAmount(pt, mineJitter);
 		placeMineAt(pt, mineTemplate, team, obj);
-	} 
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -338,7 +332,7 @@ void GenerateMinefieldBehavior::placeMinesInFootprint(const GeometryInfo& geom,
 	{
 		Coord3D pt;
 		Int maxRetry = 100;
-		do 
+		do
 		{
 			geom.makeRandomOffsetWithinFootprint(pt);
 			pt.x += target->x;
@@ -371,7 +365,7 @@ void GenerateMinefieldBehavior::placeMines()
 	const ThingTemplate* mineTemplate = TheThingFactory->findTemplate(d->m_mineName);
 	if (!mineTemplate)
 	{
-		DEBUG_CRASH(("mine %s not found\n",d->m_mineName.str()));
+		DEBUG_CRASH(("mine %s not found",d->m_mineName.str()));
 		return;
 	}
 
@@ -446,7 +440,7 @@ void GenerateMinefieldBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpgradeMux::upgradeMuxCRC( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -472,7 +466,7 @@ void GenerateMinefieldBehavior::xfer( Xfer *xfer )
 	xfer->xferBool( &m_hasTarget );
 	xfer->xferCoord3D( &m_target );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -486,4 +480,4 @@ void GenerateMinefieldBehavior::loadPostProcess( void )
 	// extend base class
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/InstantDeathBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/InstantDeathBehavior.cpp
index 9b3d5f290e6..d2da84a2ef3 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/InstantDeathBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/InstantDeathBehavior.cpp
@@ -24,12 +24,12 @@
 
 // FILE: InstantDeathBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_SLOWDEATHPHASE_NAMES
 
 #include "Common/Thing.h"
@@ -48,7 +48,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ObjectCreationList.h"
 #include "GameLogic/Weapon.h"
-#include "GameClient/Drawable.h"
 
 //-------------------------------------------------------------------------------------------------
 InstantDeathBehaviorModuleData::InstantDeathBehaviorModuleData()
@@ -93,11 +92,11 @@ static void parseWeapon( INI* ini, void *instance, void * /*store*/, const void*
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void InstantDeathBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void InstantDeathBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   DieModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "FX",										parseFX,													NULL, 0 },
 		{ "OCL",									parseOCL,													NULL, 0 },
@@ -183,7 +182,7 @@ void InstantDeathBehavior::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -201,7 +200,7 @@ void InstantDeathBehavior::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -212,4 +211,4 @@ void InstantDeathBehavior::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp
index 5cf8018b9cf..b5cdc239d8e 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/ThingTemplate.h"
@@ -43,11 +43,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ObjectCreationList.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -80,7 +75,7 @@ JetSlowDeathBehaviorModuleData::JetSlowDeathBehaviorModuleData( void )
 	m_pitchRate = 0.0f;
 	m_fallHowFast = 0.0f;
 
-}  // end JetSlowDeathBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -88,7 +83,7 @@ JetSlowDeathBehaviorModuleData::JetSlowDeathBehaviorModuleData( void )
 {
   SlowDeathBehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
 		{ "FXOnGroundDeath",	INI::parseFXList,	NULL, offsetof( JetSlowDeathBehaviorModuleData, m_fxOnGroundDeath ) },
@@ -122,7 +117,7 @@ JetSlowDeathBehaviorModuleData::JetSlowDeathBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -138,14 +133,14 @@ JetSlowDeathBehavior::JetSlowDeathBehavior( Thing *thing, const ModuleData *modu
 	m_timerOnGroundFrame = 0;
 	m_rollRate = 0.0f;
 
-}  // end JetSlowDeathBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 JetSlowDeathBehavior::~JetSlowDeathBehavior( void )
 {
 
-}  // end ~JetSlowDeathBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -157,7 +152,7 @@ void JetSlowDeathBehavior::onDie( const DamageInfo *damageInfo )
 	if( us->isSignificantlyAboveTerrain() == FALSE )
 	{
 		const JetSlowDeathBehaviorModuleData *modData = getJetSlowDeathBehaviorModuleData();
-		
+
 		// execute fx
 		FXList::doFXObj( modData->m_fxOnGroundDeath, us );
 
@@ -167,16 +162,16 @@ void JetSlowDeathBehavior::onDie( const DamageInfo *damageInfo )
 		// destroy object
 		TheGameLogic->destroyObject( us );
 
-	}  // end if
+	}
 	else
 	{
 
 		// extend base class for slow death and begin the slow death behavior
 		SlowDeathBehavior::onDie( damageInfo );
 
-	}  // end else
+	}
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -205,7 +200,7 @@ void JetSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 		m_deathLoopSound.setObjectID( us->getID() );
 		m_deathLoopSound.setPlayingHandle( TheAudio->addAudioEvent( &m_deathLoopSound ) );
 
-	}  // end if
+	}
 
 	// initialize our roll rate to that defined as the initial value in the module data
 	m_rollRate = modData->m_rollRate;
@@ -217,7 +212,7 @@ void JetSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 	// do not allow the jet to turn anymore
 	locomotor->setMaxTurnRate( 0.0f );
 
-}  // end beginSlowDeath
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -237,7 +232,7 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 
 	// roll us around in the air
 	PhysicsBehavior *physics = us->getPhysics();
-	DEBUG_ASSERTCRASH( physics, ("JetSlowDeathBehavior::beginSlowDeath - '%s' has no physics\n",
+	DEBUG_ASSERTCRASH( physics, ("JetSlowDeathBehavior::beginSlowDeath - '%s' has no physics",
 															us->getTemplate()->getName().str()) );
 	if( physics )
 		physics->setRollRate( m_rollRate );
@@ -248,7 +243,7 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 	// do effects for death while in the air
 	if( m_timerOnGroundFrame == 0 )
 	{
-		
+
 		PathfindLayerEnum layer = TheTerrainLogic->getLayerForDestination(us->getPosition());
 		us->setLayer(layer);
 		Real height;
@@ -267,7 +262,7 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 				height = 0.0f;
 		}
 
-		
+
 
 		Bool hitATree = FALSE;
 		// Here we want to make sure we crash if we collide with a tree on the way down
@@ -303,10 +298,10 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 			if( physics )
 				physics->setPitchRate( modData->m_pitchRate );
 
-		}  // end if
+		}
 
 		// timers for the secondary effect
-		if( m_timerDeathFrame != 0 && 
+		if( m_timerDeathFrame != 0 &&
 				TheGameLogic->getFrame() - m_timerDeathFrame >= modData->m_delaySecondaryFromInitialDeath )
 		{
 
@@ -317,9 +312,9 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 			// clear the death frame timer since we've already executed the event now
 			m_timerDeathFrame = 0;
 
-		}  //end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 		// we are on the ground, pay attention to the final explosion timers
@@ -333,13 +328,13 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 			// we're all done now
 			TheGameLogic->destroyObject( us );
 
-		}  // end if
+		}
 
-	}  // end else
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -347,10 +342,10 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 void JetSlowDeathBehavior::crc( Xfer *xfer )
 {
 
-	// extend base class 
+	// extend base class
 	SlowDeathBehavior::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -377,7 +372,7 @@ void JetSlowDeathBehavior::xfer( Xfer *xfer )
 	// roll rate
 	xfer->xferReal( &m_rollRate );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -388,4 +383,4 @@ void JetSlowDeathBehavior::loadPostProcess( void )
 	// extend base class
 	SlowDeathBehavior::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp
index 1083e304d46..1f4da6a1d4f 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_RELATIONSHIP_NAMES
 #include "Common/GameState.h"
 #include "Common/RandomValue.h"
@@ -45,11 +45,6 @@
 #include "GameLogic/Module/AutoHealBehavior.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // detonation never puts our health below this, since we probably auto-regen
 const Real MIN_HEALTH = 0.1f;
@@ -72,12 +67,12 @@ MinefieldBehaviorModuleData::MinefieldBehaviorModuleData()
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void MinefieldBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p ) 
+/*static*/ void MinefieldBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
 
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DetonationWeapon", INI::parseWeaponTemplate,	NULL, offsetof( MinefieldBehaviorModuleData, m_detonationWeapon ) },
 		{ "DetonatedBy", INI::parseBitString32, TheRelationshipNames, offsetof( MinefieldBehaviorModuleData, m_detonatedBy ) },
@@ -94,7 +89,7 @@ MinefieldBehaviorModuleData::MinefieldBehaviorModuleData()
 
   p.add( dataFieldParse );
 
-} 
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -102,7 +97,7 @@ MinefieldBehaviorModuleData::MinefieldBehaviorModuleData()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-MinefieldBehavior::MinefieldBehavior( Thing *thing, const ModuleData* moduleData ) 
+MinefieldBehavior::MinefieldBehavior( Thing *thing, const ModuleData* moduleData )
 								 : UpdateModule( thing, moduleData )
 {
 	const MinefieldBehaviorModuleData* d = getMinefieldBehaviorModuleData();
@@ -223,7 +218,7 @@ UpdateSleepTime MinefieldBehavior::update()
 		if (TheGameLogic->findObjectByID(m_immunes[i].id) == NULL ||
 				now > m_immunes[i].collideTime + 2)
 		{
-			//DEBUG_LOG(("expiring an immunity %d\n",m_immunes[i].id));
+			//DEBUG_LOG(("expiring an immunity %d",m_immunes[i].id));
 			m_immunes[i].id = INVALID_ID;	// he's dead, jim.
 			m_immunes[i].collideTime = 0;
 		}
@@ -352,7 +347,7 @@ void MinefieldBehavior::onCollide( Object *other, const Coord3D *loc, const Coor
 	{
 		if (m_immunes[i].id == other->getID())
 		{
-			//DEBUG_LOG(("ignoring due to immunity %d\n",m_immunes[i].id));
+			//DEBUG_LOG(("ignoring due to immunity %d",m_immunes[i].id));
 			m_immunes[i].collideTime = now;
 			return;
 		}
@@ -392,7 +387,7 @@ void MinefieldBehavior::onCollide( Object *other, const Coord3D *loc, const Coor
 		{
 			if (m_immunes[i].id == INVALID_ID || m_immunes[i].id == other->getID())
 			{
-				//DEBUG_LOG(("add/update immunity %d\n",m_immunes[i].id));
+				//DEBUG_LOG(("add/update immunity %d",m_immunes[i].id));
 				m_immunes[i].id = other->getID();
 				m_immunes[i].collideTime = now;
 
@@ -455,7 +450,7 @@ void MinefieldBehavior::onDamage( DamageInfo *damageInfo )
 	for (;;)
 	{
 		Real virtualMinesExpectedF = ((Real)d->m_numVirtualMines * body->getHealth() / body->getMaxHealth());
-		Int virtualMinesExpected = 
+		Int virtualMinesExpected =
 			damageInfo->in.m_damageType == DAMAGE_HEALING ?
 			REAL_TO_INT_FLOOR(virtualMinesExpectedF) :
 			REAL_TO_INT_CEIL(virtualMinesExpectedF);
@@ -467,7 +462,7 @@ void MinefieldBehavior::onDamage( DamageInfo *damageInfo )
 		}
 		else if (m_virtualMinesRemaining > virtualMinesExpected)
 		{
-			if (m_draining && 
+			if (m_draining &&
 						damageInfo->in.m_sourceID == getObject()->getID() &&
 						damageInfo->in.m_damageType == DAMAGE_UNRESISTABLE)
 			{
@@ -487,7 +482,7 @@ void MinefieldBehavior::onDamage( DamageInfo *damageInfo )
 
 	if (m_virtualMinesRemaining == 0)
 	{
-		// oops, if someone did weapon damage they may have nuked our health to zero, 
+		// oops, if someone did weapon damage they may have nuked our health to zero,
 		// which would be bad if we regen. prevent this. (srj)
 		if (m_regenerates && body->getHealth() < MIN_HEALTH)
 		{
@@ -623,7 +618,7 @@ void MinefieldBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -667,10 +662,10 @@ void MinefieldBehavior::xfer( Xfer *xfer )
 	if( maxImmunity != MAX_IMMUNITY )
 	{
 
-		DEBUG_CRASH(( "MinefieldBehavior::xfer - MAX_IMMUNITY has changed size, you must version this code and then you can remove this error message\n" ));
+		DEBUG_CRASH(( "MinefieldBehavior::xfer - MAX_IMMUNITY has changed size, you must version this code and then you can remove this error message" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( UnsignedByte i = 0; i < maxImmunity; ++i )
 	{
 
@@ -680,12 +675,12 @@ void MinefieldBehavior::xfer( Xfer *xfer )
 		// collide time
 		xfer->xferUnsignedInt( &m_immunes[ i ].collideTime );
 
-	}  // end for, i
+	}
 
 	if( xfer->getXferMode() == XFER_LOAD )
 		m_detonators.clear();
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -696,4 +691,4 @@ void MinefieldBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp
index 83ea354a025..2df2eee4ff8 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp
@@ -30,7 +30,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Radar.h"
@@ -43,11 +43,6 @@
 #include "GameClient/InGameUI.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -57,16 +52,16 @@ OverchargeBehaviorModuleData::OverchargeBehaviorModuleData( void )
 	m_healthPercentToDrainPerSecond = 0.0f;
 	m_notAllowedWhenHealthBelowPercent = 0.0f;
 
-}  // end OverchargeBehaviorModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void OverchargeBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p ) 
+/*static*/ void OverchargeBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
 
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "HealthPercentToDrainPerSecond", INI::parsePercentToReal,	NULL, offsetof( OverchargeBehaviorModuleData, m_healthPercentToDrainPerSecond ) },
 		{ "NotAllowedWhenHealthBelowPercent", INI::parsePercentToReal, NULL, offsetof( OverchargeBehaviorModuleData, m_notAllowedWhenHealthBelowPercent ) },
@@ -75,7 +70,7 @@ OverchargeBehaviorModuleData::OverchargeBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -83,7 +78,7 @@ OverchargeBehaviorModuleData::OverchargeBehaviorModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-OverchargeBehavior::OverchargeBehavior( Thing *thing, const ModuleData* moduleData ) 
+OverchargeBehavior::OverchargeBehavior( Thing *thing, const ModuleData* moduleData )
 									 : UpdateModule( thing, moduleData )
 {
 
@@ -92,14 +87,14 @@ OverchargeBehavior::OverchargeBehavior( Thing *thing, const ModuleData* moduleDa
 	// start off sleeping forever until we become active
 	setWakeFrame( getObject(), UPDATE_SLEEP_FOREVER );
 
-}  // end OverchargeBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 OverchargeBehavior::~OverchargeBehavior( void )
 {
 
-}  // end ~OverchargeBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -140,25 +135,25 @@ UpdateSleepTime OverchargeBehavior::update( void )
 				// do radar event
 				TheRadar->createEvent( us->getPosition(), RADAR_EVENT_INFORMATION );
 
-			}  // end of
+			}
 
 			// do nothing else
 			return UPDATE_SLEEP_NONE;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void OverchargeBehavior::onDamage( DamageInfo *damageInfo )
 {
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Flip the state of our 'overcharge-ness' */
@@ -169,7 +164,7 @@ void OverchargeBehavior::toggle( void )
 	// just toggle using enable()
 	enable( !m_overchargeActive );
 
-}  // end toggle
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Enable or disable an overcharge */
@@ -200,13 +195,13 @@ void OverchargeBehavior::enable( Bool enable )
 
 			// we are no longer active
 			m_overchargeActive = FALSE;
-			
+
 			// sleep forever
 			setWakeFrame( us, UPDATE_SLEEP_FOREVER );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 
@@ -234,11 +229,11 @@ void OverchargeBehavior::enable( Bool enable )
 			// need to update every frame now
 			setWakeFrame( us, UPDATE_SLEEP_NONE );
 
-		}  // end if
+		}
 
-	}  // end else
+	}
 
-}  // end enable
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -256,7 +251,7 @@ void OverchargeBehavior::onDelete( void )
 
 	m_overchargeActive = FALSE;
 
-}  // end onDelete
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -267,7 +262,7 @@ void OverchargeBehavior::onCapture( Player *oldOwner, Player *newOwner )
 	if( m_overchargeActive == FALSE )
 		return;
 
-	if (getObject()->isDisabled()) 
+	if (getObject()->isDisabled())
 		return;
 
 	// remove power bonus from old owner
@@ -278,7 +273,7 @@ void OverchargeBehavior::onCapture( Player *oldOwner, Player *newOwner )
 	if( newOwner )
 		newOwner->addPowerBonus( getObject() );
 
-}  // end onCapture
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -289,7 +284,7 @@ void OverchargeBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -310,7 +305,7 @@ void OverchargeBehavior::xfer( Xfer *xfer )
 	// overcharge active
 	xfer->xferBool( &m_overchargeActive );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -320,9 +315,9 @@ void OverchargeBehavior::loadPostProcess( void )
 
 	// extend base class
 	UpdateModule::loadPostProcess();
-	
+
 	// Our effect is a fire and forget effect, not an upgrade state that is itself saved, so need to re-fire.
 	if( m_overchargeActive && getObject()->getControllingPlayer() )
 		getObject()->getControllingPlayer()->addPowerBonus( getObject() );
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/POWTruckBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/POWTruckBehavior.cpp
index a06ce31ece8..5d72a53965a 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/POWTruckBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/POWTruckBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
 #include "GameClient/InGameUI.h"
@@ -48,15 +48,15 @@
 POWTruckBehaviorModuleData::POWTruckBehaviorModuleData( void )
 {
 
-}  // end POWTruckBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void POWTruckBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p ) 
+/*static*/ void POWTruckBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
   OpenContainModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
 		{ 0, 0, 0, 0 }
@@ -65,7 +65,7 @@ POWTruckBehaviorModuleData::POWTruckBehaviorModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -73,18 +73,18 @@ POWTruckBehaviorModuleData::POWTruckBehaviorModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-POWTruckBehavior::POWTruckBehavior( Thing *thing, const ModuleData *moduleData ) 
+POWTruckBehavior::POWTruckBehavior( Thing *thing, const ModuleData *moduleData )
 								: OpenContain( thing, moduleData )
 {
 
-}  // end POWTruckBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 POWTruckBehavior::~POWTruckBehavior( void )
 {
 
-}  // end ~POWTruckBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -103,16 +103,16 @@ void POWTruckBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 
 	// get our AI info
 	AIUpdateInterface *ourAI = us->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ourAI, ("POWTruckBehavior::onCollide - '%s' has no AI\n",
+	DEBUG_ASSERTCRASH( ourAI, ("POWTruckBehavior::onCollide - '%s' has no AI",
 														us->getTemplate()->getName().str()) );
 	POWTruckAIUpdateInterface *powTruckAI = ourAI->getPOWTruckAIUpdateInterface();
-	DEBUG_ASSERTCRASH( powTruckAI, ("POWTruckBehavior::onCollide - '%s' has no POWTruckAI\n",
+	DEBUG_ASSERTCRASH( powTruckAI, ("POWTruckBehavior::onCollide - '%s' has no POWTruckAI",
 																 us->getTemplate()->getName().str()) );
 
 	// pick up the prisoner
 	powTruckAI->loadPrisoner( other );
 
-}  // end onCollide
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -123,7 +123,7 @@ void POWTruckBehavior::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -141,7 +141,7 @@ void POWTruckBehavior::xfer( Xfer *xfer )
 	// extend base class
 	OpenContain::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -152,6 +152,6 @@ void POWTruckBehavior::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 #endif
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
index 2548dbb573a..4105cf9600a 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
@@ -24,11 +24,11 @@
 
 // FILE: ParkingPlaceBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:	Steven Johnson, June 2002
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/CRCDebug.h"
 #include "Common/Xfer.h"
 #include "Common/ThingTemplate.h"
@@ -44,11 +44,6 @@
 #include "GameLogic/TerrainLogic.h"
 #include "Common/Team.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
@@ -56,14 +51,7 @@
 ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 	m_gotInfo = false;
-	
-	//Added By Sadullah Nader
-	//Initializations 
-	
 	m_heliRallyPoint.zero();
-	
-	//
-
 	m_heliRallyPointExists = FALSE;
 	m_nextHealFrame = FOREVER;
 	setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
@@ -100,7 +88,7 @@ void ParkingPlaceBehavior::buildInfo()
 			{
 				AsciiString tmp;
 				Matrix3D mtx;
-				
+
 				tmp.format("Runway%dPark%dHan",col+1,row+1);
 				getObject()->getSingleLogicalBonePosition(tmp.str(), &info.m_hangarStart, &mtx);
 				info.m_hangarStartOrient = mtx.Get_Z_Rotation();
@@ -137,7 +125,7 @@ void ParkingPlaceBehavior::buildInfo()
 
 			tmp.format("RunwayEnd%d",col+1);
 			getObject()->getSingleLogicalBonePosition(tmp.str(), &info.m_end, NULL);
-			
+
 			info.m_inUseBy = INVALID_ID;
 			info.m_nextInLineForTakeoff = INVALID_ID;
 			info.m_wasInLine = false;
@@ -164,6 +152,7 @@ void ParkingPlaceBehavior::purgeDead()
 				{
 					it->m_objectInSpace = INVALID_ID;
 					it->m_reservedForExit = false;
+					it->m_postponedRunwayReservationForTakeoff = false;
 					if (pu)
 						pu->setHoldDoorOpen(it->m_door, false);
 				}
@@ -214,7 +203,7 @@ void ParkingPlaceBehavior::purgeDead()
 		}
 		if (anythingPurged)
 			resetWakeFrame();
-	}	
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -283,7 +272,7 @@ Bool ParkingPlaceBehavior::hasAvailableSpaceFor(const ThingTemplate* thing) cons
 {
 	if (!m_gotInfo)	// degenerate case, shouldn't happen, but just in case...
 		return false;
-	
+
 	if (thing->isKindOf(KINDOF_PRODUCED_AT_HELIPAD))
 		return true;
 
@@ -332,7 +321,7 @@ Bool ParkingPlaceBehavior::reserveSpace(ObjectID id, Real parkingOffset, Parking
 	ppi->m_objectInSpace = id;
 	ppi->m_reservedForExit = false;
 
-	if (info) 
+	if (info)
 	{
 		const RunwayInfo& rr = m_runways[ppi->m_runway];
 		info->parkingSpace = d->m_parkInHangars ? ppi->m_hangarStart : ppi->m_location;
@@ -356,9 +345,13 @@ Bool ParkingPlaceBehavior::reserveSpace(ObjectID id, Real parkingOffset, Parking
 
 		for (std::vector<RunwayInfo>::iterator it = m_runways.begin(); it != m_runways.end(); ++it)
 		{
-			if (it->m_inUseBy == id && it->m_wasInLine)
+			if (it->m_inUseBy == id)
 			{
-				info->runwayStart = info->runwayPrep;
+				if (it->m_wasInLine)
+				{
+					info->runwayStart = info->runwayPrep;
+				}
+				break;
 			}
 		}
 
@@ -384,10 +377,27 @@ void ParkingPlaceBehavior::releaseSpace(ObjectID id)
 		{
 			it->m_objectInSpace = INVALID_ID;
 			it->m_reservedForExit = false;
+			it->m_postponedRunwayReservationForTakeoff = false;
 			if (pu)
 				pu->setHoldDoorOpen(it->m_door, false);
+			break;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+Int ParkingPlaceBehavior::getRunwayIndex(ObjectID id)
+{
+	purgeDead();
+
+	for (std::vector<ParkingPlaceInfo>::iterator it = m_spaces.begin(); it != m_spaces.end(); ++it)
+	{
+		if (it->m_objectInSpace == id)
+		{
+			return it->m_runway;
 		}
 	}
+	return InvalidRunway;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -405,13 +415,40 @@ void ParkingPlaceBehavior::transferRunwayReservationToNextInLineForTakeoff(Objec
 	purgeDead();
 	for (std::vector<RunwayInfo>::iterator it = m_runways.begin(); it != m_runways.end(); ++it)
 	{
-		if (it->m_inUseBy == id && it->m_nextInLineForTakeoff != INVALID_ID)
+		if (it->m_inUseBy == id)
 		{
-			it->m_inUseBy = it->m_nextInLineForTakeoff;
-			it->m_wasInLine = true;
-			it->m_nextInLineForTakeoff = INVALID_ID;
+			if (it->m_nextInLineForTakeoff != INVALID_ID)
+			{
+				it->m_inUseBy = it->m_nextInLineForTakeoff;
+				it->m_wasInLine = true;
+				it->m_nextInLineForTakeoff = INVALID_ID;
+			}
+			break;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool ParkingPlaceBehavior::postponeRunwayReservation(UnsignedInt spaceIndex, Bool forLanding)
+{
+	// TheSuperHackers @tweak Block the first attempt to reserve a runway for 'upper' space indices.
+	// This allows 'lower' space indices to reserve a runway first to ensure deterministic takeoff ordering.
+
+	if (m_spaces.size() > m_runways.size() && spaceIndex >= m_runways.size())
+	{
+		Bool& postponed = m_spaces[spaceIndex].m_postponedRunwayReservationForTakeoff;
+		if (forLanding)
+		{
+			postponed = false;
+		}
+		else if (!postponed)
+		{
+			postponed = true;
+			return true;
 		}
 	}
+
+	return false;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -421,11 +458,16 @@ Bool ParkingPlaceBehavior::reserveRunway(ObjectID id, Bool forLanding)
 	purgeDead();
 
 	Int runway = -1;
-	for (std::vector<ParkingPlaceInfo>::iterator it = m_spaces.begin(); it != m_spaces.end(); ++it)
+	for (UnsignedInt i = 0; i < m_spaces.size(); ++i)
 	{
-		if (it->m_objectInSpace == id)
+		if (m_spaces[i].m_objectInSpace == id)
 		{
-			runway = it->m_runway;
+#if !RETAIL_COMPATIBLE_CRC
+			if (postponeRunwayReservation(i, forLanding))
+				return false;
+#endif
+
+			runway = m_spaces[i].m_runway;
 			break;
 		}
 	}
@@ -550,7 +592,7 @@ void ParkingPlaceBehavior::defectAllParkedUnits(Team* newTeam, UnsignedInt detec
 			if (obj == NULL || obj->isEffectivelyDead())
 				continue;
 
-			// srj sez: evil. fix better someday. 
+			// srj sez: evil. fix better someday.
 			static NameKeyType jetKey = TheNameKeyGenerator->nameToKey("JetAIUpdate");
 			JetAIUpdate* ju = (JetAIUpdate *)obj->findUpdateModule(jetKey);
 			Bool takeoffOrLanding = ju ? ju->friend_isTakeoffOrLandingInProgress() : false;
@@ -589,14 +631,14 @@ void ParkingPlaceBehavior::killAllParkedUnits()
 			if (obj == NULL || obj->isEffectivelyDead())
 				continue;
 
-			// srj sez: evil. fix better someday. 
+			// srj sez: evil. fix better someday.
 			static NameKeyType jetKey = TheNameKeyGenerator->nameToKey("JetAIUpdate");
 			JetAIUpdate* ju = (JetAIUpdate *)obj->findUpdateModule(jetKey);
 			Bool takeoffOrLanding = ju ? ju->friend_isTakeoffOrLandingInProgress() : false;
 
 			if (obj->isAboveTerrain() && !takeoffOrLanding)
 				continue;
-		
+
 			obj->kill();
 		}
 	}
@@ -614,7 +656,7 @@ void ParkingPlaceBehavior::onDie( const DamageInfo *damageInfo )
 UpdateSleepTime ParkingPlaceBehavior::update()
 {
 	// alas, we need to keep the buildInfo and dead-purged stuff pretty much up to date, for
-	// the client to be able to peek at. at this late date, the most expedient way is to ensure 
+	// the client to be able to peek at. at this late date, the most expedient way is to ensure
 	// our update is run every frame, and do this manually. the extra cost should be trivial, since
 	// there are generally at most only a few airfields at any given time.
 	buildInfo();
@@ -712,7 +754,7 @@ void ParkingPlaceBehavior::exitObjectViaDoor( Object *newObj, ExitDoorType exitD
 	DUMPCOORD3D(getObject()->getPosition());
 	if (producedAtHelipad)
 	{
-		CRCDEBUG_LOG(("Produced at helipad (door = %d)\n", exitDoor));
+		CRCDEBUG_LOG(("Produced at helipad (door = %d)", exitDoor));
 		DEBUG_ASSERTCRASH(exitDoor == DOOR_NONE_NEEDED, ("Hmm, unlikely"));
 		Matrix3D mtx;
 #ifdef DEBUG_CRASHING
@@ -727,7 +769,7 @@ void ParkingPlaceBehavior::exitObjectViaDoor( Object *newObj, ExitDoorType exitD
 	}
 	else
 	{
-		CRCDEBUG_LOG(("Produced at hangar (door = %d)\n", exitDoor));
+		CRCDEBUG_LOG(("Produced at hangar (door = %d)", exitDoor));
 		DEBUG_ASSERTCRASH(exitDoor != DOOR_NONE_NEEDED, ("Hmm, unlikely"));
 		if (!reserveSpace(newObj->getID(), parkingOffset, &ppinfo)) //&loc, &orient, NULL, NULL, NULL, NULL, &hangarInternal, &hangOrient))
 		{
@@ -776,14 +818,14 @@ void ParkingPlaceBehavior::unreserveDoorForExit( ExitDoorType exitDoor )
 		{
 			if (it->m_door == exitDoor)
 			{
-				//DEBUG_ASSERTCRASH(it->m_reservedForExit, ("ParkingPlaceBehavior::unreserveDoorForExit: door %d was not reserved\n",exitDoor));
+				//DEBUG_ASSERTCRASH(it->m_reservedForExit, ("ParkingPlaceBehavior::unreserveDoorForExit: door %d was not reserved",exitDoor));
 				it->m_objectInSpace = INVALID_ID;
 				it->m_reservedForExit = false;
 				return;
 			}
 		}
 
-		DEBUG_CRASH(("ParkingPlaceBehavior::unreserveDoorForExit: door %d was not found\n",exitDoor));
+		DEBUG_CRASH(("ParkingPlaceBehavior::unreserveDoorForExit: door %d was not found",exitDoor));
 	}
 }
 
@@ -830,7 +872,7 @@ void ParkingPlaceBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -872,9 +914,9 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 			// reserved for exit
 			xfer->xferBool( &((*it).m_reservedForExit) );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
 		ObjectID objectID;
@@ -900,11 +942,11 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 				(*it).m_reservedForExit = reservedForExit;
 				++it;
 
-			}  // end if
+			}
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// runways cound and info
 	UnsignedByte runwaysCount = m_runways.size();
@@ -922,9 +964,9 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 			xfer->xferObjectID( &((*it).m_nextInLineForTakeoff) );
 			xfer->xferBool( &((*it).m_wasInLine) );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
 		// read all elements
@@ -951,11 +993,11 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 				(*it).m_wasInLine = wasInLine;
 				++it;
 
-			}  // end if
+			}
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// healees
 	UnsignedByte healCount = m_healing.size();
@@ -972,9 +1014,9 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 			xfer->xferObjectID( &((*it).m_gettingHealedID) );
 			xfer->xferUnsignedInt( &((*it).m_healStartFrame) );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
 		// read all elements
@@ -988,9 +1030,9 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 			xfer->xferUnsignedInt( &info.m_healStartFrame );
 			m_healing.push_back(info);
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	if (version >= 2)
 	{
@@ -1011,7 +1053,7 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 		}
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1024,6 +1066,6 @@ void ParkingPlaceBehavior::loadPostProcess( void )
 
 	// no, this is bad.. it is NOT SAFE to call setWakeFrame from the xfer system. crap. (srj)
 	// make sure we are awake... old save games let us sleep
-	//setWakeFrame(getObject(), UPDATE_SLEEP_NONE); 
+	//setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp
index a0d37ad48ba..d9c446f248b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
 #include "GameLogic/Module/PoisonedBehavior.h"
@@ -37,11 +37,6 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Object.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // tinting is all handled in drawable, now, Graham look near the bottom of Drawable::UpdateDrawable()
 //static const RGBColor poisonedTint = {0.0f, 1.0f, 0.0f};
@@ -54,10 +49,10 @@ PoisonedBehaviorModuleData::PoisonedBehaviorModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void PoisonedBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void PoisonedBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "PoisonDamageInterval", INI::parseDurationUnsignedInt, NULL, offsetof(PoisonedBehaviorModuleData, m_poisonDamageIntervalData) },
 		{ "PoisonDuration", INI::parseDurationUnsignedInt, NULL, offsetof(PoisonedBehaviorModuleData, m_poisonDurationData) },
@@ -75,6 +70,7 @@ PoisonedBehavior::PoisonedBehavior( Thing *thing, const ModuleData* moduleData )
 	m_poisonDamageFrame = 0;
 	m_poisonOverallStopFrame = 0;
 	m_poisonDamageAmount = 0.0f;
+	m_poisonSource = INVALID_ID;
 	m_deathType = DEATH_POISONED;
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 }
@@ -122,7 +118,7 @@ UpdateSleepTime PoisonedBehavior::update()
 		// If it is time to do damage, then do it and reset the damage timer
 		DamageInfo damage;
 		damage.in.m_amount = m_poisonDamageAmount;
-		damage.in.m_sourceID = INVALID_ID;
+		damage.in.m_sourceID = m_poisonSource;
 		damage.in.m_damageType = DAMAGE_UNRESISTABLE; // Not poison, as that will infect us again
 		damage.in.m_deathType = m_deathType;
 		getObject()->attemptDamage( &damage );
@@ -130,9 +126,9 @@ UpdateSleepTime PoisonedBehavior::update()
 		m_poisonDamageFrame = now + d->m_poisonDamageIntervalData;
 	}
 
-	// If we are now at zero we need to turn off our special effects... 
+	// If we are now at zero we need to turn off our special effects...
 	// unless the poison killed us, then we continue to be a pulsating toxic pus ball
-	if( m_poisonOverallStopFrame != 0 && 
+	if( m_poisonOverallStopFrame != 0 &&
 			now >= m_poisonOverallStopFrame &&
 			!getObject()->isEffectivelyDead())
 	{
@@ -146,7 +142,7 @@ UpdateSleepTime PoisonedBehavior::update()
 // ------------------------------------------------------------------------------------------------
 UpdateSleepTime PoisonedBehavior::calcSleepTime()
 {
-	// UPDATE_SLEEP requires a count-of-frames, not an absolute-frame, so subtract 'now' 
+	// UPDATE_SLEEP requires a count-of-frames, not an absolute-frame, so subtract 'now'
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (m_poisonOverallStopFrame == 0 || m_poisonOverallStopFrame == now)
 		return UPDATE_SLEEP_FOREVER;
@@ -162,7 +158,11 @@ void PoisonedBehavior::startPoisonedEffects( const DamageInfo *damageInfo )
 
 	// We are going to take the damage dealt by the original poisoner every so often for a while.
 	m_poisonDamageAmount = damageInfo->out.m_actualDamageDealt;
-	
+#if !RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix Stubbjax 03/09/2025 Allow poison damage to award xp to the poison source.
+	m_poisonSource = damageInfo->in.m_sourceID;
+#endif
+
 	m_poisonOverallStopFrame = now + d->m_poisonDurationData;
 
 	// If we are getting re-poisoned, don't reset the damage counter if running, but do set it if unset
@@ -187,6 +187,7 @@ void PoisonedBehavior::stopPoisonedEffects()
 	m_poisonDamageFrame = 0;
 	m_poisonOverallStopFrame = 0;
 	m_poisonDamageAmount = 0.0f;
+	m_poisonSource = INVALID_ID;
 
 	Drawable *myDrawable = getObject()->getDrawable();
 	if( myDrawable )
@@ -202,7 +203,7 @@ void PoisonedBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -212,8 +213,12 @@ void PoisonedBehavior::crc( Xfer *xfer )
 void PoisonedBehavior::xfer( Xfer *xfer )
 {
 
-	// version 
+	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
 	const XferVersion currentVersion = 2;
+#else
+	const XferVersion currentVersion = 3;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
@@ -234,7 +239,13 @@ void PoisonedBehavior::xfer( Xfer *xfer )
 		xfer->xferUser(&m_deathType, sizeof(m_deathType));
 	}
 
-}  // end xfer
+#if !RETAIL_COMPATIBLE_XFER_SAVE
+	if (version >= 3)
+	{
+		xfer->xferObjectID(&m_poisonSource);
+	}
+#endif
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -245,4 +256,4 @@ void PoisonedBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PrisonBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PrisonBehavior.cpp
index 8de5554d45a..89be9fc77d3 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PrisonBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PrisonBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameState.h"
 #include "Common/Player.h"
 #include "Common/RandomValue.h"
@@ -74,14 +74,14 @@ PrisonVisual::PrisonVisual( void )
 	m_drawableID = INVALID_DRAWABLE_ID;
 	m_next = NULL;
 
-}  // end PrisonVisual
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 PrisonVisual::~PrisonVisual( void )
 {
 
-}  // end ~PrisonVisual
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -94,7 +94,7 @@ PrisonBehaviorModuleData::PrisonBehaviorModuleData( void )
 
 	m_showPrisoners = FALSE;
 
-}  // end PrisonBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -102,10 +102,10 @@ PrisonBehaviorModuleData::PrisonBehaviorModuleData( void )
 {
   OpenContainModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
-		{ "ShowPrisoners",	INI::parseBool,					NULL,		offsetof( PrisonBehaviorModuleData, m_showPrisoners ) },		
+		{ "ShowPrisoners",	INI::parseBool,					NULL,		offsetof( PrisonBehaviorModuleData, m_showPrisoners ) },
 		{ "YardBonePrefix",	INI::parseAsciiString,	NULL,		offsetof( PrisonBehaviorModuleData, m_prisonYardBonePrefix ) },
 		{ 0, 0, 0, 0 }
 
@@ -113,7 +113,7 @@ PrisonBehaviorModuleData::PrisonBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -127,14 +127,14 @@ PrisonBehavior::PrisonBehavior( Thing *thing, const ModuleData *moduleData )
 
 	m_visualList = NULL;
 
-}  // end PrisonBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 PrisonBehavior::~PrisonBehavior( void )
 {
 
-}  // end ~PrisonBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -160,9 +160,9 @@ void PrisonBehavior::onDelete( void )
 		deleteInstance(m_visualList);
 		m_visualList = visual;
 
-	}  // end while
+	}
 
-}  // end onDelete
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -180,7 +180,7 @@ void PrisonBehavior::onContaining( Object *obj )
 	if( modData->m_showPrisoners )
 		addVisual( obj );
 
-}  // end onContaining
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -198,7 +198,7 @@ void PrisonBehavior::onRemoving( Object *obj )
 	// extend functionality
 	OpenContain::onRemoving( obj );
 
-}  // end onRemoving
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
@@ -227,9 +227,9 @@ void PrisonBehavior::pickVisualLocation( Coord3D *pos )
 																									 MAX_YARD_BONES,
 																									 yardPositions,
 																									 NULL );
-	
+
 	//
-	// we must have at least 3 bone locations to make a yard polygon, otherwise we'll 
+	// we must have at least 3 bone locations to make a yard polygon, otherwise we'll
 	// default to the object position
 	//
 	if( yardBones >= 3 )
@@ -253,7 +253,7 @@ void PrisonBehavior::pickVisualLocation( Coord3D *pos )
 			if( yardPositions[ i ].y > yardRegion.hi.y )
 				yardRegion.hi.y = yardPositions[ i ].y;
 
-		}  // end for i
+		}
 
 		//
 		// now that we have a yard region, the default visual position will be in the middle
@@ -282,16 +282,16 @@ void PrisonBehavior::pickVisualLocation( Coord3D *pos )
 				pickedLocation = loc;
 				break;  // exit for i
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 
 	// return the location picked
 	*pos = pickedLocation;
 
-}  // end pickVisualLocation
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add prisoner visual to the prison yard */
@@ -329,7 +329,7 @@ void PrisonBehavior::addVisual( Object *obj )
 	visual->m_next = m_visualList;
 	m_visualList = visual;
 
-}  // end addVisual
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove prisoner visual from the prison yard */
@@ -367,19 +367,19 @@ void PrisonBehavior::removeVisual( Object *obj )
 
 			break;  // exit for
 
-		}  // end if
+		}
 
 		// keep a pointer to the previous element
 		prevVisual = visual;
 
-	}  // end for
+	}
 
 	// find the drawable visual and destroy it
 	Drawable *draw = TheGameClient->findDrawableByID( drawableID );
 	if( draw )
 		TheGameClient->destroyDrawable( draw );
 
-}  // end removeVisual
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -390,7 +390,7 @@ void PrisonBehavior::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -427,9 +427,9 @@ void PrisonBehavior::xfer( Xfer *xfer )
 			// drawable id
 			xfer->xferDrawableID( &visual->m_drawableID );
 
-		}  // end for, visual
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -437,10 +437,10 @@ void PrisonBehavior::xfer( Xfer *xfer )
 		if( m_visualList != NULL )
 		{
 
-			DEBUG_CRASH(( "PrisonBehavior::xfer - the visual list should be empty but is not\n" ));
+			DEBUG_CRASH(( "PrisonBehavior::xfer - the visual list should be empty but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each item
 		for( UnsignedShort i = 0; i < visualCount; ++i )
@@ -457,11 +457,11 @@ void PrisonBehavior::xfer( Xfer *xfer )
 			// read drawable id
 			xfer->xferDrawableID( &visual->m_drawableID );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -472,7 +472,7 @@ void PrisonBehavior::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 #endif
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaCenterBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaCenterBehavior.cpp
index e6720349645..f4ffa2deddc 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaCenterBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaCenterBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
@@ -51,7 +51,7 @@ PropagandaCenterBehaviorModuleData::PropagandaCenterBehaviorModuleData( void )
 
 	m_brainwashDuration = 0;
 
-}  // end PropagandaCenterBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -59,9 +59,9 @@ PropagandaCenterBehaviorModuleData::PropagandaCenterBehaviorModuleData( void )
 {
   PrisonBehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
-		
+
 		{	"BrainwashDuration", INI::parseDurationUnsignedInt, NULL, offsetof( PropagandaCenterBehaviorModuleData, m_brainwashDuration ) },
 		{ 0, 0, 0, 0 }
 
@@ -69,7 +69,7 @@ PropagandaCenterBehaviorModuleData::PropagandaCenterBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -84,14 +84,14 @@ PropagandaCenterBehavior::PropagandaCenterBehavior( Thing *thing, const ModuleDa
 	m_brainwashingSubjectID = INVALID_ID;
 	m_brainwashingSubjectStartFrame = 0;
 
-}  // end PropagandaCenterBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 PropagandaCenterBehavior::~PropagandaCenterBehavior( void )
 {
 
-}  // end ~PropagandaCenterBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -105,8 +105,8 @@ void PropagandaCenterBehavior::onDelete( void )
 	// go through our list of brainwashed objects, and if they are still under our
 	// control, return them to their original owners
 	//
-	for( BrainwashedIDListContIterator it = m_brainwashedList.begin(); 
-			 it != m_brainwashedList.end(); 
+	for( BrainwashedIDListContIterator it = m_brainwashedList.begin();
+			 it != m_brainwashedList.end();
 			 ++it )
 	{
 		Object *obj;
@@ -119,14 +119,14 @@ void PropagandaCenterBehavior::onDelete( void )
 			// return this object under the control of the original owner
 			obj->restoreOriginalTeam();
 
-		}  // end if
-		
-	}  // end for
-	
+		}
+
+	}
+
 	// clear the list
 	m_brainwashedList.clear();
 
-}  // end onDelete
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -157,7 +157,7 @@ UpdateSleepTime PropagandaCenterBehavior::update( void )
 
 					// place this object under the control of the player
 					Player *player = us->getControllingPlayer();
-					DEBUG_ASSERTCRASH( player, ("Brainwashing: No controlling player for '%s'\n", us->getTemplate()->getName().str()) );
+					DEBUG_ASSERTCRASH( player, ("Brainwashing: No controlling player for '%s'", us->getTemplate()->getName().str()) );
 					if( player )
 						brainwashingSubject->setTemporaryTeam( player->getDefaultTeam() );
 
@@ -178,13 +178,13 @@ UpdateSleepTime PropagandaCenterBehavior::update( void )
 					// exit the prison
 					exitObjectViaDoor( brainwashingSubject, exitDoor );
 
-				}  // end if
-						
-			}  // end if
+				}
 
-		}  // end if, 
+			}
 
-	}  // end if
+		}
+
+	}
 
 	// if we have no brainwashing subject, hook one up if we have people inside us
 	if( m_brainwashingSubjectID == INVALID_ID )
@@ -202,14 +202,14 @@ UpdateSleepTime PropagandaCenterBehavior::update( void )
 				m_brainwashingSubjectID = obj->getID();
 				m_brainwashingSubjectStartFrame = TheGameLogic->getFrame();
 
-			}  // end if
- 
-		}  // end if
+			}
+
+		}
 
-	}  // end if
+	}
 
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -223,12 +223,12 @@ void PropagandaCenterBehavior::onRemoving( Object *obj )
 		m_brainwashingSubjectID = INVALID_ID;
 		m_brainwashingSubjectStartFrame = 0;
 
-	}  // end if
+	}
 
 	// extend functionality
 	PrisonBehavior::onRemoving( obj );
 
-}  // end onRemoving
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -239,7 +239,7 @@ void PropagandaCenterBehavior::crc( Xfer *xfer )
 	// extend base class
 	PrisonBehavior::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -266,7 +266,7 @@ void PropagandaCenterBehavior::xfer( Xfer *xfer )
 	// brainwashed list size and data
 	xfer->xferSTLObjectIDList( &m_brainwashedList );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -277,6 +277,6 @@ void PropagandaCenterBehavior::loadPostProcess( void )
 	// extend base class
 	PrisonBehavior::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 #endif
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
index 303c752bd5f..3d0ee6d9b27 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
@@ -30,6 +30,7 @@
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "PreRTS.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Upgrade.h"
@@ -40,15 +41,11 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/Weapon.h"
+#include "GameLogic/Module/ContainModule.h"
 #include "GameLogic/Module/PropagandaTowerBehavior.h"
 #include "GameLogic/Module/BodyModule.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
@@ -89,7 +86,7 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void )
 	m_upgradeRequired = NULL;
 	m_upgradedPulseFX = NULL;
 
-}  // end PropagandaTowerBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -97,7 +94,7 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void )
 {
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Radius",									INI::parseReal,									NULL,	offsetof( PropagandaTowerBehaviorModuleData, m_scanRadius ) },
 		{ "DelayBetweenUpdates",		INI::parseDurationUnsignedInt,	NULL,	offsetof( PropagandaTowerBehaviorModuleData, m_scanDelayInFrames ) },
@@ -111,7 +108,7 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -122,21 +119,18 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void )
 PropagandaTowerBehavior::PropagandaTowerBehavior( Thing *thing, const ModuleData *modData )
 											 : UpdateModule( thing, modData )
 {
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_lastScanFrame = 0;
-	//
 	m_insideList = NULL;
 	setWakeFrame( getObject(), UPDATE_SLEEP_NONE );
 
-}  // end PropagandaTowerBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 PropagandaTowerBehavior::~PropagandaTowerBehavior( void )
 {
 
-}  // end ~PropagandaTowerBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Module is being deleted */
@@ -147,7 +141,7 @@ void PropagandaTowerBehavior::onDelete( void )
 	// remove any benefits from anybody in our area of influence
 	removeAllInfluence();
 
-}  // end onDelete
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Resolve */
@@ -159,12 +153,12 @@ void PropagandaTowerBehavior::onObjectCreated( void )
 	// convert module upgrade name to a pointer
 	m_upgradeRequired = TheUpgradeCenter->findUpgrade( modData->m_upgradeRequired );
 
-}  // end onObjectCreated
+}
 
 // ------------------------------------------------------------------------------------------------
 void PropagandaTowerBehavior::onCapture( Player *oldOwner, Player *newOwner )
 {
-	// We don't function for the neutral player.  
+	// We don't function for the neutral player.
 	if( newOwner == ThePlayerList->getNeutralPlayer() )
 	{
 		removeAllInfluence();
@@ -181,7 +175,7 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 {
 /// @todo srj use SLEEPY_UPDATE here
 	const PropagandaTowerBehaviorModuleData *modData = getPropagandaTowerBehaviorModuleData();
-	
+
 	//Sep 27, 2002 (Kris): Added this code to prevent the tower from working while under construction.
 	Object *self = getObject();
 	if( self->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
@@ -195,7 +189,7 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 
 	if( self->isEffectivelyDead() )
 		return UPDATE_SLEEP_FOREVER;
-	
+
 	if( self->isDisabled() )
 	{
 		// We need to let go of everyone if we are EMPd or underpowered or yadda, but not if we are only held
@@ -209,16 +203,18 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 			return UPDATE_SLEEP_NONE;
 		}
 	}
-	
-	if( self->getContainedBy()  &&  self->getContainedBy()->getContainedBy() )
+
+#if RETAIL_COMPATIBLE_CRC
+	if (self->getContainedBy() && self->getContainedBy()->getContainedBy())
+#else
+	// TheSuperHackers @bugfix If our container or any parent containers are enclosing, we turn the heck off.
+	if (self->getEnclosingContainedBy())
+#endif
 	{
-		// If our container is contained, we turn the heck off.  Seems like a weird specific check, but all of 
-		// attacking is guarded by the same check in isPassengersAllowedToFire.  We similarly work in a container,
-		// but not in a double container.
 		removeAllInfluence();
 		return UPDATE_SLEEP_NONE;
 	}
-	
+
 	// if it's not time to scan, nothing to do
 	UnsignedInt currentFrame = TheGameLogic->getFrame();
 	if( currentFrame - m_lastScanFrame >= modData->m_scanDelayInFrames )
@@ -228,14 +224,14 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 		doScan();
 		m_lastScanFrame = currentFrame;
 
-	}  // end if
+	}
 
 	// go through any objects in our area of influence and do the effect logic on them
 	Object *obj;
 	ObjectTracker *curr = NULL, *prev = NULL, *next = NULL;
 	for( curr = m_insideList; curr; curr = next )
 	{
-		
+
 		// get the next link
 		next = curr->next;
 
@@ -251,7 +247,7 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 			// record this element as the previous one found in the list
 			prev = curr;
 
-		}  // end if
+		}
 		else
 		{
 
@@ -264,14 +260,14 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 			else
 				m_insideList = curr->next;
 			deleteInstance(curr);
-				
-		}  // end else
 
-	}  // end for, curr
+		}
+
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** The death callback */
@@ -282,7 +278,7 @@ void PropagandaTowerBehavior::onDie( const DamageInfo *damageInfo )
 	// remove any benefits from anybody in our area of influence
 	removeAllInfluence();
 
-}  // end onDie
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -311,7 +307,7 @@ void PropagandaTowerBehavior::effectLogic( Object *obj, Bool giving,
 					obj->setWeaponBonusCondition( WEAPONBONUSCONDITION_SUBLIMINAL );
 			}
 
-		} // hasdamageweapon
+		}
 
 
 		// grant health to this object as well
@@ -328,15 +324,15 @@ void PropagandaTowerBehavior::effectLogic( Object *obj, Bool giving,
 
 	// Dustin wants the healing effect not to stack from multiple propaganda towers...
 	// To accomplish this, I'll give every object a single healing-sender (ID)
-	// Any given healing recipient (object) can only receive healing from one particular healing sender 
+	// Any given healing recipient (object) can only receive healing from one particular healing sender
 	// and cannot change healing senders until the previous one expires (its scandelay)
 
-//		obj->attemptHealing(amount, getObject()); // the regular way to give healing... 
+//		obj->attemptHealing(amount, getObject()); // the regular way to give healing...
 			obj->attemptHealingFromSoleBenefactor( amount, getObject(), modData->m_scanDelayInFrames );//the non-stacking way
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 
@@ -344,9 +340,9 @@ void PropagandaTowerBehavior::effectLogic( Object *obj, Bool giving,
 		obj->clearWeaponBonusCondition( WEAPONBONUSCONDITION_ENTHUSIASTIC );
 		obj->clearWeaponBonusCondition( WEAPONBONUSCONDITION_SUBLIMINAL );
 
-	}	  // end else
+	}
 
-}  // end effectLogic
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove all influence from objects we've given bonuses to */
@@ -359,12 +355,12 @@ void PropagandaTowerBehavior::removeAllInfluence( void )
 	Object *obj;
 	for( o = m_insideList; o; o = o->next )
 	{
-		
+
 		obj = TheGameLogic->findObjectByID( o->objectID );
 		if( obj )
 			effectLogic( obj, FALSE, getPropagandaTowerBehaviorModuleData() );
 
-	}  // end for
+	}
 
 	// delete the list of objects under our influence
 	while( m_insideList )
@@ -374,9 +370,9 @@ void PropagandaTowerBehavior::removeAllInfluence( void )
 		deleteInstance(m_insideList);
 		m_insideList = o;
 
-	}  // end while
+	}
 
-}  // end removeAllInfluence
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do a scan */
@@ -404,30 +400,30 @@ void PropagandaTowerBehavior::doScan( void )
 				upgradePresent = player->hasUpgradeComplete( m_upgradeRequired );
 				break;
 
-			}  // end player upgrade
+			}
 
 			// ------------------------------------------------------------------------------------------
 			case UPGRADE_TYPE_OBJECT:
 			{
-				
-				upgradePresent = us->hasUpgrade( m_upgradeRequired );				
+
+				upgradePresent = us->hasUpgrade( m_upgradeRequired );
 				break;
 
-			}  // end object upgrade
+			}
 
 			// ------------------------------------------------------------------------------------------
 			default:
 			{
 
-				DEBUG_CRASH(( "PropagandaTowerBehavior::doScan - Unknown upgrade type '%d'\n",
+				DEBUG_CRASH(( "PropagandaTowerBehavior::doScan - Unknown upgrade type '%d'",
 											m_upgradeRequired->getUpgradeType() ));
 				break;
 
-			}  // end default
+			}
 
-		}  // end switch
+		}
 
-	}  // end if
+	}
 
 	// play the right pulse
 	if( upgradePresent == TRUE )
@@ -440,17 +436,17 @@ void PropagandaTowerBehavior::doScan( void )
 	PartitionFilterAlive filterAlive;
 	PartitionFilterSameMapStatus filterMapStatus(us);
 	PartitionFilterAcceptByKindOf filterOutBuildings(KINDOFMASK_NONE, MAKE_KINDOF_MASK(KINDOF_STRUCTURE));
-	PartitionFilter *filters[] = {	&relationship, 
-																	&filterAlive, 
-																	&filterMapStatus, 
-																	&filterOutBuildings, 
-																	NULL 
+	PartitionFilter *filters[] = {	&relationship,
+																	&filterAlive,
+																	&filterMapStatus,
+																	&filterOutBuildings,
+																	NULL
 																};
 
 	// scan objects in our region
 	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( us->getPosition(),
 																																		 modData->m_scanRadius,
-																																		 FROM_CENTER_2D, 
+																																		 FROM_CENTER_2D,
 																																		 filters );
 	MemoryPoolObjectHolder hold( iter );
 	Object *obj;
@@ -468,7 +464,7 @@ void PropagandaTowerBehavior::doScan( void )
 		newEntry->next = newInsideList;
 		newInsideList = newEntry;
 
-	}  // end for obj
+	}
 
 	//
 	// now that we have a list of objects that are in our area of influence, look through
@@ -478,7 +474,7 @@ void PropagandaTowerBehavior::doScan( void )
 	//
 	for( ObjectTracker *curr = m_insideList; curr; curr = curr->next )
 	{
-	
+
 		// find this entry in the new list
 		ObjectTracker *o = NULL;
 		for( o = newInsideList; o; o = o->next )
@@ -493,10 +489,10 @@ void PropagandaTowerBehavior::doScan( void )
 			if( obj )
 				effectLogic( obj, FALSE, modData );
 
-		}  // end if
+		}
+
+	}
 
-	}  // end for
-		
 	// delete the inside list we have recoreded
 	ObjectTracker *next;
 	while( m_insideList )
@@ -506,12 +502,12 @@ void PropagandaTowerBehavior::doScan( void )
 		deleteInstance(m_insideList);
 		m_insideList = next;
 
-	}  // end while
+	}
 
 	// set the new inside list to the one we're recording
 	m_insideList = newInsideList;
 
-}  // end doScan
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -522,7 +518,7 @@ void PropagandaTowerBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -559,9 +555,9 @@ void PropagandaTowerBehavior::xfer( Xfer *xfer )
 			// object id
 			xfer->xferObjectID( &trackerEntry->objectID );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -569,10 +565,10 @@ void PropagandaTowerBehavior::xfer( Xfer *xfer )
 		if( m_insideList != NULL )
 		{
 
-			DEBUG_CRASH(( "PropagandaTowerBehavior::xfer - m_insideList should be empty but is not\n" ));
+			DEBUG_CRASH(( "PropagandaTowerBehavior::xfer - m_insideList should be empty but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read all entries
 		for( UnsignedShort i = 0; i < insideCount; ++i )
@@ -586,11 +582,11 @@ void PropagandaTowerBehavior::xfer( Xfer *xfer )
 			// read object id
 			xfer->xferObjectID( &trackerEntry->objectID );
 
-		}  // end for i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -601,4 +597,4 @@ void PropagandaTowerBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/RebuildHoleBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/RebuildHoleBehavior.cpp
index 14aed92100a..cbb54d5a2cd 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/RebuildHoleBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/RebuildHoleBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameState.h"
 #include "Common/ThingFactory.h"
 #include "Common/ThingTemplate.h"
@@ -42,11 +42,6 @@
 #include "GameLogic/Module/RebuildHoleBehavior.h"
 #include "GameLogic/Module/StickyBombUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -56,16 +51,16 @@ RebuildHoleBehaviorModuleData::RebuildHoleBehaviorModuleData( void )
 	m_workerRespawnDelay = 0.0f;
 	m_holeHealthRegenPercentPerSecond = 0.1f;
 
-}  // end RebuildHoleBehaviorModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void RebuildHoleBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p ) 
+/*static*/ void RebuildHoleBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
 
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 	  { "WorkerObjectName", INI::parseAsciiString, NULL, offsetof( RebuildHoleBehaviorModuleData, m_workerTemplateName ) },
 		{ "WorkerRespawnDelay", INI::parseDurationReal,	NULL, offsetof( RebuildHoleBehaviorModuleData, m_workerRespawnDelay ) },
@@ -75,7 +70,7 @@ RebuildHoleBehaviorModuleData::RebuildHoleBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -83,7 +78,7 @@ RebuildHoleBehaviorModuleData::RebuildHoleBehaviorModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-RebuildHoleBehavior::RebuildHoleBehavior( Thing *thing, const ModuleData* moduleData ) 
+RebuildHoleBehavior::RebuildHoleBehavior( Thing *thing, const ModuleData* moduleData )
 									 : UpdateModule( thing, moduleData )
 {
 
@@ -94,7 +89,7 @@ RebuildHoleBehavior::RebuildHoleBehavior( Thing *thing, const ModuleData* module
 	m_workerTemplate = NULL;
 	m_rebuildTemplate = NULL;
 
-}  // end RebuildHoleBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -112,7 +107,7 @@ RebuildHoleBehavior::~RebuildHoleBehavior( void )
 		}
 	}
 
-}  // end ~RebuildHoleBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 /** we need to start all the timers and ID ties to make a new worker at the correct time */
@@ -128,7 +123,7 @@ void RebuildHoleBehavior::newWorkerRespawnProcess( Object *existingWorker )
 		TheGameLogic->destroyObject( existingWorker );
 	}
 	m_workerID = INVALID_ID;
-	
+
 	// set the timer for the next worker respawn
 	m_workerWaitCounter = modData->m_workerRespawnDelay;
 
@@ -140,8 +135,8 @@ void RebuildHoleBehavior::newWorkerRespawnProcess( Object *existingWorker )
 	// "focus" of this small area again
 	//
 	getObject()->maskObject( FALSE );
-			
-}  // end newWorkerRespawnProcess
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -149,7 +144,7 @@ void RebuildHoleBehavior::startRebuildProcess( const ThingTemplate *rebuild, Obj
 {
 
 	// save what we're gonna do
-	m_rebuildTemplate = rebuild; 
+	m_rebuildTemplate = rebuild;
 
 	// store the object that spawned this hole (even though it's likely being destroyed)
 	m_spawnerObjectID = spawnerID;
@@ -157,7 +152,7 @@ void RebuildHoleBehavior::startRebuildProcess( const ThingTemplate *rebuild, Obj
 	// start the spawning process for a worker
 	newWorkerRespawnProcess( NULL );
 
-} /// end startRebuildProcess
+}
 
 
 //----------------------------------------------------------------------------------------------
@@ -202,7 +197,7 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 		if( worker == NULL )
 			newWorkerRespawnProcess( NULL );
 
-	}  // end if
+	}
 
 	// if we have a reconstructing object built, get the actual object pointer
 	if( m_reconstructingID != 0 )
@@ -221,9 +216,9 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 			newWorkerRespawnProcess( worker );
 			m_reconstructingID = INVALID_ID;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// see if it's time for us to spawn a worker
 	if( worker == NULL && m_workerWaitCounter > 0 )
@@ -257,14 +252,14 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 				{
 
 					if( reconstructing == NULL )
-						reconstructing = ai->construct( m_rebuildTemplate, 
-																						hole->getPosition(), 
-																						hole->getOrientation(), 
+						reconstructing = ai->construct( m_rebuildTemplate,
+																						hole->getPosition(),
+																						hole->getOrientation(),
 																						hole->getControllingPlayer(),
 																						TRUE );
 					else
 						ai->aiResumeConstruction( reconstructing, CMD_FROM_AI );
-					
+
 					for ( Object *obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() )
 					{
 						// Just like the building transfers attackers to the hole when it creates us, we need to transfer
@@ -275,7 +270,7 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 
 						ai->transferAttack(hole->getID(), reconstructing->getID());
 					}
-											
+
 					// save the id of what we are reconstructing
 					m_reconstructingID = reconstructing->getID();
 
@@ -290,14 +285,14 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 					hole->maskObject( TRUE );
 
 					transferBombs( reconstructing );
-					
-				}  // end if
 
-			}  // end if, worker
+				}
 
-		}  // end if, time to spawn a worker
+			}
+
+		}
 
-	}  // end if, check for working respawn
+	}
 
 	// holes get auto-healed when they're sittin around
 	BodyModuleInterface *body = hole->getBodyModule();
@@ -306,14 +301,14 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 		DamageInfo healingInfo;
 
 		// do some healing
-		healingInfo.in.m_amount = (modData->m_holeHealthRegenPercentPerSecond / LOGICFRAMES_PER_SECOND) * 
+		healingInfo.in.m_amount = (modData->m_holeHealthRegenPercentPerSecond / LOGICFRAMES_PER_SECOND) *
 															body->getMaxHealth();
 		healingInfo.in.m_sourceID = hole->getID();
 		healingInfo.in.m_damageType = DAMAGE_HEALING;
 		healingInfo.in.m_deathType = DEATH_NONE;
 		body->attemptHealing( &healingInfo );
 
-	}  // end if
+	}
 
 	// when re-construction is complete, we remove this hole and worker
 	if( reconstructing && !reconstructing->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
@@ -327,12 +322,12 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 
 		// make the hole go away
 		TheGameLogic->destroyObject( hole );
-		
-	}  // end if
+
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -340,7 +335,7 @@ void RebuildHoleBehavior::onDie( const DamageInfo *damageInfo )
 {
 	if( m_workerID != INVALID_ID )
 	{
-		// Our rebuilding building and us the hole can be killed in the same frame, which means we may not have 
+		// Our rebuilding building and us the hole can be killed in the same frame, which means we may not have
 		// deleted our generated worker since we do that in our update.
 		Object *worker = TheGameLogic->findObjectByID(m_workerID);
 		if( worker )
@@ -355,7 +350,7 @@ void RebuildHoleBehavior::onDie( const DamageInfo *damageInfo )
 	// destroy us
 	TheGameLogic->destroyObject( obj );
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Helper method to get interface given an object */
@@ -374,13 +369,13 @@ void RebuildHoleBehavior::onDie( const DamageInfo *damageInfo )
 			if( rhbi )
 				break;  // exit for
 
-		}  // end for i
+		}
 
-	}  // end if, obj
+	}
 
 	return rhbi;
 
-}  // end getRebuildHoleBehaviorInterfaceFromObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -391,7 +386,7 @@ void RebuildHoleBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -436,17 +431,17 @@ void RebuildHoleBehavior::xfer( Xfer *xfer )
 			if( m_workerTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "RebuildHoleBehavior::xfer - Unable to find template '%s'\n",
+				DEBUG_CRASH(( "RebuildHoleBehavior::xfer - Unable to find template '%s'",
 											workerName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else
 			m_workerTemplate = NULL;
 
-	}  // end if
+	}
 
 	// rebuild template
 	AsciiString rebuildName = m_rebuildTemplate ? m_rebuildTemplate->getName() : AsciiString::TheEmptyString;
@@ -461,19 +456,19 @@ void RebuildHoleBehavior::xfer( Xfer *xfer )
 			if( m_rebuildTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "RebuildHoleBehavior::xfer - Unable to find template '%s'\n",
+				DEBUG_CRASH(( "RebuildHoleBehavior::xfer - Unable to find template '%s'",
 											rebuildName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else
 			m_rebuildTemplate = NULL;
 
-	}  // end if
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -484,4 +479,4 @@ void RebuildHoleBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp
index 3eb9059ccc5..a833818b7f3 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp
@@ -24,12 +24,12 @@
 
 // FILE: SlowDeathBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_SLOWDEATHPHASE_NAMES
 #include "Common/GameLOD.h"
 #include "Common/INI.h"
@@ -49,13 +49,7 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ObjectCreationList.h"
 #include "GameLogic/Weapon.h"
-#include "GameClient/Drawable.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 const Real BEGIN_MIDPOINT_RATIO = 0.35f;
 const Real END_MIDPOINT_RATIO = 0.65f;
@@ -125,11 +119,11 @@ static void parseWeapon( INI* ini, void *instance, void * /*store*/, const void*
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void SlowDeathBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void SlowDeathBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SinkRate",													INI::parseVelocityReal,						NULL, offsetof( SlowDeathBehaviorModuleData, m_sinkRate ) },
 		{ "ProbabilityModifier",							INI::parseInt,										NULL, offsetof( SlowDeathBehaviorModuleData, m_probabilityModifier ) },
@@ -164,7 +158,7 @@ SlowDeathBehavior::SlowDeathBehavior( Thing *thing, const ModuleData* moduleData
 
 	if (getSlowDeathBehaviorModuleData()->m_probabilityModifier < 1)
 	{
-		DEBUG_CRASH(("ProbabilityModifer must be >= 1.\n"));
+		DEBUG_CRASH(("ProbabilityModifer must be >= 1."));
 		throw INI_INVALID_DATA;
 	}
 
@@ -235,19 +229,19 @@ void SlowDeathBehavior::beginSlowDeath(const DamageInfo *damageInfo)
 
 		}
 
-		
+
 		// Ask game detail manager if we need to speedup all deaths to improve performance
 		Real timeScale = TheGameLODManager->getSlowDeathScale();
 		m_acceleratedTimeScale = 1.0f;	// assume normal death speed.
 
 		if (timeScale == 0.0f && !d->hasNonLodEffects())
-		{	
+		{
 			// Deaths happen instantly so just delete the object and return
 			TheGameLogic->destroyObject(obj);
 			return;
 		}
 		else
-		{	
+		{
 			// timescale is some non-zero value so we may need to speed up death
 			if( getObject()->isKindOf( KINDOF_HULK ) && TheGameLogic->getHulkMaxLifetimeOverride() != -1 )
 			{
@@ -271,7 +265,7 @@ void SlowDeathBehavior::beginSlowDeath(const DamageInfo *damageInfo)
 		if (d->m_flingForce > 0)
 		{
 
-			
+
 			//Just in case this is a stingersoldier or other HELD object, lets set them free so they will fly
 			// with their own physics during slow death
 			if( obj->isDisabledByType( DISABLED_HELD ) )
@@ -282,7 +276,7 @@ void SlowDeathBehavior::beginSlowDeath(const DamageInfo *damageInfo)
 				{
 					slave->onSlaverDie( NULL );
 				}
-			}				
+			}
 
 			PhysicsBehavior* physics = obj->getPhysics();
 			if (physics)
@@ -298,7 +292,7 @@ void SlowDeathBehavior::beginSlowDeath(const DamageInfo *damageInfo)
 				}
 
 				Coord3D force;
-				calcRandomForce(d->m_flingForce, d->m_flingForce + d->m_flingForceVariance, 
+				calcRandomForce(d->m_flingForce, d->m_flingForce + d->m_flingForceVariance,
 												d->m_flingPitch, d->m_flingPitch + d->m_flingPitchVariance, force);
 				physics->setAllowToFall(true);
 				physics->applyForce(&force);
@@ -317,9 +311,9 @@ void SlowDeathBehavior::beginSlowDeath(const DamageInfo *damageInfo)
 			// we don't need to wake up immediately, but only when the first of these
 			// counters wants to trigger....
 			Int whenToWakeTime = m_sinkFrame;
-			if (whenToWakeTime > m_destructionFrame) 
+			if (whenToWakeTime > m_destructionFrame)
 				whenToWakeTime = m_destructionFrame;
-			if (whenToWakeTime > m_midpointFrame) 
+			if (whenToWakeTime > m_midpointFrame)
 				whenToWakeTime = m_midpointFrame;
 			setWakeFrame(obj, UPDATE_SLEEP(whenToWakeTime));
 		}
@@ -382,7 +376,7 @@ void SlowDeathBehavior::doPhaseStuff(SlowDeathPhaseType sdphase)
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime SlowDeathBehavior::update()
 {
-	//DEBUG_LOG(("updating SlowDeathBehavior %08lx\n",this));
+	//DEBUG_LOG(("updating SlowDeathBehavior %08lx",this));
 	DEBUG_ASSERTCRASH(isSlowDeathActivated(), ("hmm, this should not be possible"));
 
 	const SlowDeathBehaviorModuleData* d = getSlowDeathBehaviorModuleData();
@@ -392,11 +386,11 @@ UpdateSleepTime SlowDeathBehavior::update()
 
 	// Check if we have normal time scale but LODManager is requeseting acceleration
 	if (timeScale != 1.0f && m_acceleratedTimeScale == 1.0f && !d->hasNonLodEffects())
-	{	
+	{
 		// speed of deaths has been increased since beginning of death
 		// so adjust it to current levels.
 		if (timeScale == 0)
-		{	
+		{
 			// instant death
 			TheGameLogic->destroyObject(obj);
 			return UPDATE_SLEEP_NONE;
@@ -406,10 +400,10 @@ UpdateSleepTime SlowDeathBehavior::update()
 		m_midpointFrame = (Real)m_midpointFrame * timeScale;
 		m_destructionFrame = (Real)m_destructionFrame * timeScale;
 		m_acceleratedTimeScale = timeScale;
-	};	
+	};
 
 	UnsignedInt now = TheGameLogic->getFrame();
-	
+
 
 	if ((m_flags & (1<<FLUNG_INTO_AIR)) != 0)
 	{
@@ -420,11 +414,11 @@ UpdateSleepTime SlowDeathBehavior::update()
 			++m_destructionFrame;
 			if (!obj->isAboveTerrain())
 			{
-				obj->clearAndSetModelConditionFlags(MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_FLAILING), 
+				obj->clearAndSetModelConditionFlags(MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_FLAILING),
 																						MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_BOUNCING));
 				m_flags |= (1<<BOUNCED);
 			}
-			
+
 			// Here we want to make sure we die if we collide with a tree on the way down
 			PhysicsBehavior *phys = obj->getPhysics();
 			if ( phys )
@@ -436,8 +430,8 @@ UpdateSleepTime SlowDeathBehavior::update()
 					if (tree->isKindOf( KINDOF_SHRUBBERY ) )
 					{
 						obj->setDisabled( DISABLED_HELD );
-						obj->clearModelConditionFlags( MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_FLAILING) ); 
-						obj->clearModelConditionFlags( MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_BOUNCING) ); 
+						obj->clearModelConditionFlags( MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_FLAILING) );
+						obj->clearModelConditionFlags( MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_BOUNCING) );
 						obj->setModelConditionFlags(   MAKE_MODELCONDITION_MASK(MODELCONDITION_PARACHUTING) ); //looks like he is snagged in a tree
 						obj->setPositionZ( obj->getPosition()->z - (d->m_sinkRate * 50.0f) );// make him sink faster
 						if ( !obj->isAboveTerrain() )
@@ -536,7 +530,7 @@ void SlowDeathBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -569,7 +563,7 @@ void SlowDeathBehavior::xfer( Xfer *xfer )
 	// flags
 	xfer->xferUnsignedInt( &m_flags );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -580,4 +574,4 @@ void SlowDeathBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp
index 72a1eddabf7..294fad763d5 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp
@@ -27,7 +27,7 @@
 // Desc:   Update will create and monitor a group of spawned units and replace as needed
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/ThingFactory.h"
@@ -48,17 +48,12 @@
 #define NONE_SPAWNED_YET (0xffffffff)
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
 #define SPAWN_DELAY_MIN_FRAMES (16) // about as rapidly as you'd expect people to successively exit through the same door
 //-------------------------------------------------------------------------------------------------
-SpawnBehavior::SpawnBehavior( Thing *thing, const ModuleData* moduleData ) 
+SpawnBehavior::SpawnBehavior( Thing *thing, const ModuleData* moduleData )
 						 : UpdateModule( thing, moduleData )
 {
 	const SpawnBehaviorModuleData* md = getSpawnBehaviorModuleData();
@@ -72,10 +67,7 @@ SpawnBehavior::SpawnBehavior( Thing *thing, const ModuleData* moduleData )
 	//looping back to the beginning
 
 	m_framesToWait = 0;
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_firstBatchCount = 0;
-	//
 	if( md->m_isOneShotData )
 		m_oneShotCountdown = md->m_spawnNumberData;
 	else
@@ -89,19 +81,19 @@ SpawnBehavior::SpawnBehavior( Thing *thing, const ModuleData* moduleData )
 	m_initialBurstTimesInited = FALSE;
 
 
-	
+
 	m_aggregateHealth = md->m_aggregateHealth;
 
 	m_spawnCount = NONE_SPAWNED_YET;
 	m_active = TRUE;
 	m_selfTaskingSpawnCount = 0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 SpawnBehavior::~SpawnBehavior( void )
 {
 	m_replacementTimes.clear();
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 void SpawnBehavior::onDelete()
@@ -128,13 +120,13 @@ void SpawnBehavior::onDelete()
 			// and will *DESTROY* our spawned things if we ourselves are destroyed and they
 			// are still alive (such a case would be calling destroy object on us directly)
 			//
-			if( obj && obj->isEffectivelyDead() == FALSE )	
+			if( obj && obj->isEffectivelyDead() == FALSE )
 				TheGameLogic->destroyObject( obj );
 
-		}  // end for, it
+		}
+
+	}
 
-	}  // end if
-		
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -189,9 +181,9 @@ void SpawnBehavior::onDie( const DamageInfo *damageInfo )
 			if( obj && obj->isEffectivelyDead() == FALSE )
 				obj->kill();
 
-		}  // end for, it
+		}
 
-	}  // end if
+	}
 
 }
 
@@ -203,7 +195,7 @@ UpdateSleepTime SpawnBehavior::update( void )
 	//EVERY FRAME
 	if ( m_aggregateHealth )
 	{
-		computeAggregateStates();	
+		computeAggregateStates();
 	}
 
 	const SpawnBehaviorModuleData* md = getSpawnBehaviorModuleData();
@@ -256,9 +248,9 @@ UpdateSleepTime SpawnBehavior::update( void )
 			if( currentTime > replacementTime )
 			{
 				//If you create one, you pop the number off the list
-				if( createSpawn() )	
+				if( createSpawn() )
 					iterator = m_replacementTimes.erase( iterator );
-				else 
+				else
 					iterator++;
 			}
 			else
@@ -279,7 +271,7 @@ Bool SpawnBehavior::maySpawnSelfTaskAI( Real maxSelfTaskersRatio )
 	if ( maxSelfTaskersRatio == 0)
 		return FALSE;
 
-	
+
 	//if my last attack command was from player or script, I need to forbid my spawn from disobeying that command
 	//otherwise (since my attack state was autoacquired my ny own ai), let them deviate by the ratio specified.
 	Object* obj = getObject();
@@ -288,13 +280,13 @@ Bool SpawnBehavior::maySpawnSelfTaskAI( Real maxSelfTaskersRatio )
 	AIUpdateInterface *ai = obj->getAI();
 	if ( ! ai )
 		return FALSE;
-	
+
 	CommandSourceType lastAttackCommandSource = ai->getLastCommandSource();
-	
+
 
 	if ( lastAttackCommandSource != CMD_FROM_AI )
 		return FALSE;
-	
+
 
 	Real curSelfTaskersRatio = (Real)m_selfTaskingSpawnCount / (Real)m_spawnCount;
 
@@ -312,8 +304,8 @@ Object* SpawnBehavior::getClosestSlave( const Coord3D *pos )
 		if( obj )
 		{
 			Real distance = ThePartitionManager->getDistanceSquared( obj, pos, FROM_CENTER_2D );
-			
-			if( !closest || closestDistance > distance ) 
+
+			if( !closest || closestDistance > distance )
 			{
 				closest = obj;
 				closestDistance = distance;
@@ -393,7 +385,7 @@ CanAttackResult SpawnBehavior::getCanAnySlavesAttackSpecificTarget( AbleToAttack
 
 				case ATTACKRESULT_NOT_POSSIBLE:
 					break;
-				
+
 				case ATTACKRESULT_INVALID_SHOT:
 					invalidShot = TRUE;
 					break;
@@ -431,7 +423,7 @@ CanAttackResult SpawnBehavior::getCanAnySlavesUseWeaponAgainstTarget( AbleToAtta
 
 				case ATTACKRESULT_NOT_POSSIBLE:
 					break;
-				
+
 				case ATTACKRESULT_INVALID_SHOT:
 					invalidShot = TRUE;
 					break;
@@ -515,13 +507,13 @@ static void findClosestOrphan( Object *obj, void *userData )
 	Real distSq = ThePartitionManager->getDistanceSquared( orphanData->m_source, obj, FROM_CENTER_2D );
 	if( distSq < orphanData->m_closestDistSq )
 	{
-	
+
 		orphanData->m_closest = obj;
 		orphanData->m_closestDistSq = distSq;
 
-	}  // end if
-			
-}  // findClosestOrphan
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 Object *SpawnBehavior::reclaimOrphanSpawn( void )
@@ -534,18 +526,18 @@ Object *SpawnBehavior::reclaimOrphanSpawn( void )
 	// that we would normally spawn, if found we'll just make it our own
 	//
 	// EVEN MORE NEW AND DIFFERENT
-	// This block scans the list for matchTemplates 
+	// This block scans the list for matchTemplates
 	//
 
 	OrphanData orphanData;
-	AsciiString prevName = "";
+	AsciiString prevName;
 	for (std::vector<AsciiString>::const_iterator tempName = md->m_spawnTemplateNameData.begin();
-			tempName != md->m_spawnTemplateNameData.end(); 
+			tempName != md->m_spawnTemplateNameData.end();
 			++tempName)
 	{
 		if (prevName.compare(*tempName)) // the list may have redundancy, this will skip some of it
 			continue;
-		orphanData.m_matchTemplate = TheThingFactory->findTemplate( *tempName );;
+		orphanData.m_matchTemplate = TheThingFactory->findTemplate( *tempName );
 		orphanData.m_source = getObject();
 		orphanData.m_closest = NULL;
 		orphanData.m_closestDistSq = BIG_DISTANCE;
@@ -568,13 +560,13 @@ Bool SpawnBehavior::createSpawn()
 		DEBUG_ASSERTCRASH( exitInterface != NULL, ("Something cannot have SpawnBehavior without an exit interface") );
 		return FALSE;
 	}
-	
+
 	ExitDoorType exitDoor = exitInterface->reserveDoorForExit(NULL, NULL);
 	if (exitDoor == DOOR_NONE_AVAILABLE)
 		return FALSE;
 
 	Object *newSpawn = NULL;
-	
+
 	// try to reclaim orphaned objects if possible
 	Bool reclaimedOrphan = FALSE;
 	if( md->m_canReclaimOrphans && md->m_isOneShotData == FALSE )
@@ -645,14 +637,14 @@ Bool SpawnBehavior::createSpawn()
 						--m_initialBurstCountdown;
 						barracksExitSuccess = TRUE;
 					}
-					
+
 				}
 
 			}
-			
+
 			if ( ! barracksExitSuccess )
 			{
-				// find the closest spawn to the nexus... 
+				// find the closest spawn to the nexus...
 				//there is probably a more elegant way to choose the budHost, but oh well
 				Object *budHost = NULL;
 				Object *curSpawn = NULL;
@@ -699,7 +691,7 @@ Bool SpawnBehavior::createSpawn()
 	}
 	else
 	{
-		++ m_spawnCount; 
+		++ m_spawnCount;
 	}
 
 
@@ -710,7 +702,7 @@ Bool SpawnBehavior::createSpawn()
 void SpawnBehavior::onSpawnDeath( ObjectID deadSpawn, DamageInfo *damageInfo )
 {
 	objectIDListIterator it = std::find(m_spawnIDs.begin(), m_spawnIDs.end(), deadSpawn);
-	
+
 	// If the iterator is at the end, we didn't find deadSpawn, so bail out.
 	// Otherwise, bad crash stuff will happen.
 	if (it == m_spawnIDs.end())
@@ -718,7 +710,7 @@ void SpawnBehavior::onSpawnDeath( ObjectID deadSpawn, DamageInfo *damageInfo )
 
 	//When one dies, you push (now + delay) as the time a new one should be made
 	const SpawnBehaviorModuleData* md = getSpawnBehaviorModuleData();
-	
+
 	Int replacementTime = md->m_spawnReplaceDelayData + TheGameLogic->getFrame();
 	m_replacementTimes.push_back( replacementTime );
 
@@ -810,7 +802,7 @@ Bool SpawnBehavior::shouldTryToSpawn()
 //*   spawn health, and dividing by optimal health of full population
 //*   (that is, the max spawn, SpawnBehaviorModuleData::m_spawnNumberData)
 //*   at full health.
-//* Veterancy is sucked out of any unit that has any and put into the 
+//* Veterancy is sucked out of any unit that has any and put into the
 //* Spawner, scaled by 1/SpawnBehaviorModuleData::m_spawnNumberData;
 //* The HealthBoxPosition (maybe to include moodicon, vet icon) is calc'd
 //* as an average position of all the spawn.
@@ -826,7 +818,7 @@ void SpawnBehavior::computeAggregateStates(void)
 
 	Int spawnCount = 0;
 	Int spawnCountMax = md->m_spawnNumberData;
-	Coord3D avgSpawnPos; 
+	Coord3D avgSpawnPos;
 
 	avgSpawnPos.set(0,0,0);
 	Real acrHealth = 0.0f;
@@ -841,7 +833,7 @@ void SpawnBehavior::computeAggregateStates(void)
 	Drawable *spawnDraw = NULL;
 	Object *currentSpawn = NULL;
 
-	WeaponBonusConditionFlags spawnWeaponBonus; 
+	WeaponBonusConditionFlags spawnWeaponBonus;
 
 
 	m_selfTaskingSpawnCount = 0;
@@ -859,7 +851,7 @@ void SpawnBehavior::computeAggregateStates(void)
 				SlavedUpdateInterface* sdu = (*update)->getSlavedUpdateInterface();
 				if (sdu != NULL)
 				{
-					m_selfTaskingSpawnCount += ( sdu->isSelfTasking());;
+					m_selfTaskingSpawnCount += ( sdu->isSelfTasking());
 					break;
 				}
 			}
@@ -897,10 +889,10 @@ void SpawnBehavior::computeAggregateStates(void)
 
 			spawnCount++;
 		}
-	} // next iter
+	}
+
 
 
-	
 	// SELECTION STATE *****************************************
 	// THIS LOGIC IS SIMPLE
 	// IF ANY ONE OF MY SPAWN ARE SELECTED RIGHT NOW,
@@ -932,7 +924,7 @@ void SpawnBehavior::computeAggregateStates(void)
 						teamMsg->appendObjectIDArgument( currentSpawn->getID() );
 					}
 				}
-			} // next iter
+			}
 		}
 		// if somebody is selected then I sure need to be!
 		if ( ! obj->getDrawable()->isSelected())
@@ -948,7 +940,7 @@ void SpawnBehavior::computeAggregateStates(void)
 
 
 	// HEALTH BOX POSITION *****************************
-	// pick a centered, average spot to draw the health box 
+	// pick a centered, average spot to draw the health box
 	avgSpawnPos.scale(1.0f / spawnCount);
 	avgSpawnPos.sub(obj->getPosition());
 	obj->setHealthBoxOffset(avgSpawnPos);
@@ -956,7 +948,7 @@ void SpawnBehavior::computeAggregateStates(void)
 
 
 	// HEALTH STATE *************************************
-	// make my health an aggregate of all my spawns' healths 
+	// make my health an aggregate of all my spawns' healths
 	if ( spawnCount )
 	{
 		avgHealthMax /= spawnCount;
@@ -985,13 +977,13 @@ void SpawnBehavior::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
-	* 2: Added m_initialBurstTimesInited to the save. jba. 
+	* 1: Initial version
+	* 2: Added m_initialBurstTimesInited to the save. jba.
 */
 // ------------------------------------------------------------------------------------------------
 void SpawnBehavior::xfer( Xfer *xfer )
@@ -1006,7 +998,7 @@ void SpawnBehavior::xfer( Xfer *xfer )
 	// extend base class
 	BehaviorModule::xfer( xfer );
 
-	
+
 	if (version >= 2) {
 		xfer->xferBool(&m_initialBurstTimesInited);
 	}
@@ -1020,19 +1012,19 @@ void SpawnBehavior::xfer( Xfer *xfer )
 		m_spawnTemplate = NULL;
 		if( name.isEmpty() == FALSE )
 		{
-		
+
 			m_spawnTemplate = TheThingFactory->findTemplate( name );
 			if( m_spawnTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "SpawnBehavior::xfer - Unable to find template '%s'\n", name.str() ));
+				DEBUG_CRASH(( "SpawnBehavior::xfer - Unable to find template '%s'", name.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// one shot countdown
 	xfer->xferInt( &m_oneShotCountdown );
@@ -1063,7 +1055,7 @@ void SpawnBehavior::xfer( Xfer *xfer )
 	// self tasking spawn count
 	xfer->xferUnsignedInt( &m_selfTaskingSpawnCount );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1074,4 +1066,4 @@ void SpawnBehavior::loadPostProcess( void )
 	// extend base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SupplyWarehouseCripplingBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SupplyWarehouseCripplingBehavior.cpp
index 97cc132428b..a6d6ed0281c 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SupplyWarehouseCripplingBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SupplyWarehouseCripplingBehavior.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameLogic/Module/SupplyWarehouseCripplingBehavior.h"
 #include "GameLogic/GameLogic.h"
@@ -45,10 +45,10 @@ SupplyWarehouseCripplingBehaviorModuleData::SupplyWarehouseCripplingBehaviorModu
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void SupplyWarehouseCripplingBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void SupplyWarehouseCripplingBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SelfHealSupression",	INI::parseDurationUnsignedInt,	NULL, offsetof(SupplyWarehouseCripplingBehaviorModuleData, m_selfHealSupression) },
 		{ "SelfHealDelay",			INI::parseDurationUnsignedInt,	NULL, offsetof(SupplyWarehouseCripplingBehaviorModuleData, m_selfHealDelay) },
@@ -146,7 +146,7 @@ void SupplyWarehouseCripplingBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -170,7 +170,7 @@ void SupplyWarehouseCripplingBehavior::xfer( Xfer *xfer )
 	// next healing frame
 	xfer->xferUnsignedInt( &m_nextHealingFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -181,4 +181,4 @@ void SupplyWarehouseCripplingBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/TechBuildingBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/TechBuildingBehavior.cpp
index 5433a7a7803..7b1efe52b69 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/TechBuildingBehavior.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/TechBuildingBehavior.cpp
@@ -52,7 +52,7 @@ TechBuildingBehaviorModuleData::TechBuildingBehaviorModuleData( void )
 {
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "PulseFX",								INI::parseFXList,								NULL,	offsetof( TechBuildingBehaviorModuleData, m_pulseFX ) },
 		{ "PulseFXRate",						INI::parseDurationUnsignedInt,	NULL,	offsetof( TechBuildingBehaviorModuleData, m_pulseFXRate ) },
@@ -61,7 +61,7 @@ TechBuildingBehaviorModuleData::TechBuildingBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -90,7 +90,7 @@ UpdateSleepTime TechBuildingBehavior::update( void )
 	Object *us = getObject();
 	const TechBuildingBehaviorModuleData* d = getTechBuildingBehaviorModuleData();
 	Bool captured = false;
-	
+
 	// update our model condition for the captured status
 	Player *player = us->getControllingPlayer();
 	if( player && player->isPlayableSide() )
@@ -128,7 +128,7 @@ void TechBuildingBehavior::onDie( const DamageInfo *damageInfo )
 	Object *us = getObject();
 	us->setTeam( ThePlayerList->getNeutralPlayer()->getDefaultTeam() );
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -141,7 +141,7 @@ void TechBuildingBehavior::onCapture( Player *oldOwner, Player *newOwner )
 	// wake up next frame so we can re-evaluate our captured status
 	setWakeFrame( getObject(), UPDATE_SLEEP_NONE );
 
-}  // end onCapture
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -151,7 +151,7 @@ void TechBuildingBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -162,11 +162,11 @@ void TechBuildingBehavior::xfer( Xfer *xfer )
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
-	
+
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -176,5 +176,5 @@ void TechBuildingBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp
index 3893614c119..f96f8c8d33b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/BitFlagsIO.h"
 #include "Common/CRCDebug.h"
 #include "Common/DamageFX.h"
@@ -57,11 +57,6 @@
 #include "GameLogic/Module/DieModule.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define YELLOW_DAMAGE_PERCENT (0.25f)
 
@@ -90,7 +85,7 @@ class BodyParticleSystem : public MemoryPoolObject
 BodyParticleSystem::~BodyParticleSystem( void )
 {
 
-}  // end ~BodyParticleSystem
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -133,11 +128,11 @@ ActiveBodyModuleData::ActiveBodyModuleData()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void ActiveBodyModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void ActiveBodyModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MaxHealth",						INI::parseReal,						NULL,		offsetof( ActiveBodyModuleData, m_maxHealth ) },
 		{ "InitialHealth",				INI::parseReal,						NULL,		offsetof( ActiveBodyModuleData, m_initialHealth ) },
@@ -148,8 +143,8 @@ void ActiveBodyModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-ActiveBody::ActiveBody( Thing *thing, const ModuleData* moduleData ) : 
-	BodyModule(thing, moduleData), 
+ActiveBody::ActiveBody( Thing *thing, const ModuleData* moduleData ) :
+	BodyModule(thing, moduleData),
 	m_curDamageFX(NULL),
 	m_curArmorSet(NULL),
 	m_frontCrushed(false),
@@ -188,7 +183,7 @@ void ActiveBody::onDelete( void )
 	// delete all particle systems
 	deleteAllParticleSystems();
 
-}  // end onDelete
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -205,14 +200,14 @@ void ActiveBody::setCorrectDamageState()
 			rubbleHeight = TheGlobalData->m_defaultStructureRubbleHeight;
 
 		/** @todo I had to change this to a Z only version to keep it from disappearing from the
-			PartitionManager for a frame.  That didn't used to happen.		 
+			PartitionManager for a frame.  That didn't used to happen.
 		*/
 		getObject()->setGeometryInfoZ(rubbleHeight);
 
 		// Have to tell pathfind as well, as rubble pathfinds differently.
 		TheAI->pathfinder()->removeObjectFromPathfindMap(getObject());
 		TheAI->pathfinder()->addObjectToPathfindMap(getObject());
-		
+
 
 		// here we make sure nobody collides with us, ever again...			//Lorenzen
 		//THis allows projectiles shot from infantry that are inside rubble to get out of said rubble safely
@@ -286,7 +281,7 @@ Real ActiveBody::estimateDamage( DamageInfoInput& damageInfo ) const
 void ActiveBody::doDamageFX( const DamageInfo *damageInfo )
 {
 	DamageType damageTypeToUse = damageInfo->in.m_damageType;
-	if (damageInfo->in.m_damageType == DAMAGE_UNRESISTABLE && 
+	if (damageInfo->in.m_damageType == DAMAGE_UNRESISTABLE &&
 				(damageInfo->in.m_deathType == DEATH_POISONED || damageInfo->in.m_deathType == DEATH_POISONED_BETA))
 	{
 		// PoisonedBehavior sends DAMAGE_UNRESISTABLE (rather that DAMAGE_POISON) to avoid reinfection,
@@ -359,7 +354,7 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 
 		case DAMAGE_KILLPILOT:
 		{
-			// This type of damage doesn't actually damage the unit, but it does kill it's 
+			// This type of damage doesn't actually damage the unit, but it does kill it's
 			// pilot, in the case of a vehicle.
 			if( obj->isKindOf( KINDOF_VEHICLE ) )
 			{
@@ -370,7 +365,7 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 
 				// Convert it to the neutral team so it renders gray giving visual representation that it is unmanned.
 				obj->setTeam( ThePlayerList->getNeutralPlayer()->getDefaultTeam() );
-				
+
 			}
 			alreadyHandled = TRUE;
 			allowModifier = FALSE;
@@ -393,7 +388,7 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 	{
 		BodyDamageType oldState = m_curDamageState;
 
-		if (!alreadyHandled) 
+		if (!alreadyHandled)
 		{
 			// do the damage simplistic damage subtraction
 			internalChangeHealth( -amount );
@@ -426,7 +421,7 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 		damageInfo->out.m_actualDamageDealt = amount;
 		damageInfo->out.m_actualDamageClipped = m_prevHealth - m_currentHealth;
 
-		// then copy the whole DamageInfo struct for easy lookup 
+		// then copy the whole DamageInfo struct for easy lookup
 		// (object pointer loses scope as soon as atteptdamage's caller ends)
 		// m_lastDamageTimestamp is initialized to FFFFFFFFFF, so doing a < compare is problematic.
 		// jba.
@@ -456,9 +451,9 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 				// no change.
 			}
 		}
-	
+
 		// Notify the player that they have been attacked by this player
-		if (m_lastDamageInfo.in.m_sourceID != INVALID_ID) 
+		if (m_lastDamageInfo.in.m_sourceID != INVALID_ID)
 		{
 			Object *srcObj = TheGameLogic->findObjectByID(m_lastDamageInfo.in.m_sourceID);
 			if (srcObj)
@@ -491,9 +486,9 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 
 				d->onBodyDamageStateChange( damageInfo, oldState, m_curDamageState );
 			}
-			
+
 			// @todo: This really feels like it should be in the TransitionFX lists.
-			if (m_curDamageState == BODY_DAMAGED) 
+			if (m_curDamageState == BODY_DAMAGED)
 			{
 				AudioEventRTS damaged = *obj->getTemplate()->getSoundOnDamaged();
 				damaged.setObjectID(obj->getID());
@@ -507,10 +502,10 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 			}
 
 		}
-		
+
 		// Should we play our fear sound?
-		if( (m_prevHealth / m_maxHealth) > YELLOW_DAMAGE_PERCENT && 
-				(m_currentHealth / m_maxHealth) < YELLOW_DAMAGE_PERCENT && 
+		if( (m_prevHealth / m_maxHealth) > YELLOW_DAMAGE_PERCENT &&
+				(m_currentHealth / m_maxHealth) < YELLOW_DAMAGE_PERCENT &&
 				(m_currentHealth > 0) )
 		{
 			// 25% chance to play
@@ -532,7 +527,7 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 			{
 				killer->scoreTheKill( obj );
 			}
-	
+
 			obj->onDie( damageInfo );
 		}
 	}
@@ -540,9 +535,9 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 	doDamageFX(damageInfo);
 
 	// Damaged repulsable civilians scare (repulse) other civs.	jba.
-	if( TheAI->getAiData()->m_enableRepulsors ) 
+	if( TheAI->getAiData()->m_enableRepulsors )
 	{
-		if( obj->isKindOf( KINDOF_CAN_BE_REPULSED ) ) 
+		if( obj->isKindOf( KINDOF_CAN_BE_REPULSED ) )
 		{
 			obj->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_REPULSOR ) );
 		}
@@ -571,7 +566,7 @@ void ActiveBody::attemptHealing( DamageInfo *damageInfo )
 	// srj sez: sorry, once yer dead, yer dead.
 	// Special case for bridges, cause the system now things they're dead
 	///@todo we need to figure out what has changed so we don't have to hack this (CBD 11-1-2002)
-	if( obj->isKindOf( KINDOF_BRIDGE ) == FALSE && 
+	if( obj->isKindOf( KINDOF_BRIDGE ) == FALSE &&
 			obj->isKindOf( KINDOF_BRIDGE_TOWER ) == FALSE &&
 			obj->isEffectivelyDead())
 		return;
@@ -594,11 +589,13 @@ void ActiveBody::attemptHealing( DamageInfo *damageInfo )
 		damageInfo->out.m_actualDamageDealt = amount;
 		damageInfo->out.m_actualDamageClipped = m_prevHealth - m_currentHealth;
 
-		//then copy the whole DamageInfo struct for easy lookup 
+		//then copy the whole DamageInfo struct for easy lookup
 		//(object pointer loses scope as soon as atteptdamage's caller ends)
 		m_lastDamageInfo = *damageInfo;
 		m_lastDamageCleared = false;
+#if PRESERVE_RETAIL_BEHAVIOR
 		m_lastDamageTimestamp = TheGameLogic->getFrame();
+#endif
 		m_lastHealingTimestamp = TheGameLogic->getFrame();
 
 		// if our health has gone UP then do run the damage module callback
@@ -641,12 +638,12 @@ void ActiveBody::setInitialHealth(Int initialPercent)
 	m_prevHealth = m_currentHealth;
 
 	Real factor = initialPercent/100.0f;
-	Real newHealth = factor * m_initialHealth; 
-	
+	Real newHealth = factor * m_initialHealth;
+
 	// change the health to the requested percentage.
 	internalChangeHealth(newHealth - m_currentHealth);
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Simple setting of the health value, it does *NOT* track any transition
@@ -694,7 +691,7 @@ void ActiveBody::setMaxHealth( Real maxHealth, MaxHealthChangeType healthChangeT
 		internalChangeHealth( maxHealth - m_currentHealth );
 	}
 
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given the current damage state of the object, evaluate the visual model conditions
@@ -722,7 +719,7 @@ void ActiveBody::evaluateVisualCondition()
 	* specified by the bone base name.  If there are more bones than maxSystems then the
 	* bones will be randomly selected */
 // ------------------------------------------------------------------------------------------------
-void ActiveBody::createParticleSystems( const AsciiString &boneBaseName, 
+void ActiveBody::createParticleSystems( const AsciiString &boneBaseName,
 																				const ParticleSystemTemplate *systemTemplate,
 																				Int maxSystems )
 {
@@ -731,14 +728,14 @@ void ActiveBody::createParticleSystems( const AsciiString &boneBaseName,
 	// sanity
 	if( systemTemplate == NULL )
 		return;
-	
+
 	// get the bones
 	enum { MAX_BONES = 16 };
 	Coord3D bonePositions[ MAX_BONES ];
-	Int numBones = us->getMultiLogicalBonePosition( boneBaseName.str(), 
-																									MAX_BONES, 
-																									bonePositions, 
-																									NULL, 
+	Int numBones = us->getMultiLogicalBonePosition( boneBaseName.str(),
+																									MAX_BONES,
+																									bonePositions,
+																									NULL,
 																									FALSE );
 
 	// if no bones found nothing else to do
@@ -759,14 +756,14 @@ void ActiveBody::createParticleSystems( const AsciiString &boneBaseName,
 	// but don't want to repeat any
 	//
 	Bool usedBoneIndices[ MAX_BONES ] = { FALSE };
-	
+
 	// create the particle systems
 	const Coord3D *pos;
 	for( Int i = 0; i < maxSystems; ++i )
 	{
 
 		// pick a bone index to place this particle system at
-		
+
 		// MDC: moving to GameLogicRandomValue.  This does not need to be synced, but having it so makes searches *so* much nicer.
 		//Int boneIndex = GameLogicRandomValue( 0, maxSystems - i - 1 );
 
@@ -792,20 +789,20 @@ void ActiveBody::createParticleSystems( const AsciiString &boneBaseName,
 				usedBoneIndices[ j ] = TRUE;
 				break;  // exit for j
 
-			}  // end if
+			}
 			else
 			{
 
 				// we won't use this index, increment count until we find a suitable index to use
 				++count;
 
-			}  // end else
+			}
 
-		}  // end for, j
+		}
 
 		// sanity
-		DEBUG_ASSERTCRASH( j != numBones, 
-											 ("ActiveBody::createParticleSystems, Unable to select particle system index\n") );
+		DEBUG_ASSERTCRASH( j != numBones,
+											 ("ActiveBody::createParticleSystems, Unable to select particle system index") );
 
 		// create particle system here
 		ParticleSystem *particleSystem = TheParticleSystemManager->createParticleSystem( systemTemplate );
@@ -824,11 +821,11 @@ void ActiveBody::createParticleSystems( const AsciiString &boneBaseName,
 			newEntry->m_next = m_particleSystems;
 			m_particleSystems = newEntry;
 
-		}  // end if
+		}
 
-	}  // end for, i
+	}
 
-}  // end createParticleSystems
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Delete all the body particle systems */
@@ -855,9 +852,9 @@ void ActiveBody::deleteAllParticleSystems( void )
 		// set the body systems head to the next
 		m_particleSystems = nextBodySystem;
 
-	}  // end while
+	}
 
-}  // end deleteAllParticleSystems
+}
 
 // ------------------------------------------------------------------------------------------------
 /* 	This function is called on state changes only.  Body Type or Aflameness. */
@@ -896,7 +893,7 @@ void ActiveBody::updateBodyParticleSystems( void )
 		// we get to make more of them all too
 		countModifier = 2;
 
-	}  // end if
+	}
 	else
 	{
 
@@ -911,7 +908,7 @@ void ActiveBody::updateBodyParticleSystems( void )
 		// we make just the normal amount of these
 		countModifier = 1;
 
-	}  // end else
+	}
 
 	//
 	// remove any particle systems we have currently in the list in favor of any new ones
@@ -924,41 +921,41 @@ void ActiveBody::updateBodyParticleSystems( void )
 	//
 
 	// small fire bones
-	createParticleSystems( TheGlobalData->m_autoFireParticleSmallPrefix, 
+	createParticleSystems( TheGlobalData->m_autoFireParticleSmallPrefix,
 												 fireSmall, TheGlobalData->m_autoFireParticleSmallMax * countModifier );
 
 	// medium fire bones
-	createParticleSystems( TheGlobalData->m_autoFireParticleMediumPrefix, 
+	createParticleSystems( TheGlobalData->m_autoFireParticleMediumPrefix,
 												 fireMedium, TheGlobalData->m_autoFireParticleMediumMax * countModifier );
 
 	// large fire bones
-	createParticleSystems( TheGlobalData->m_autoFireParticleLargePrefix, 
+	createParticleSystems( TheGlobalData->m_autoFireParticleLargePrefix,
 												 fireLarge, TheGlobalData->m_autoFireParticleLargeMax * countModifier );
 
 	// small smoke bones
-	createParticleSystems( TheGlobalData->m_autoSmokeParticleSmallPrefix, 
+	createParticleSystems( TheGlobalData->m_autoSmokeParticleSmallPrefix,
 												 smokeSmall, TheGlobalData->m_autoSmokeParticleSmallMax * countModifier );
 
 	// medium smoke bones
-	createParticleSystems( TheGlobalData->m_autoSmokeParticleMediumPrefix, 
+	createParticleSystems( TheGlobalData->m_autoSmokeParticleMediumPrefix,
 												 smokeMedium, TheGlobalData->m_autoSmokeParticleMediumMax * countModifier );
 
 	// large smoke bones
-	createParticleSystems( TheGlobalData->m_autoSmokeParticleLargePrefix, 
+	createParticleSystems( TheGlobalData->m_autoSmokeParticleLargePrefix,
 												 smokeLarge, TheGlobalData->m_autoSmokeParticleLargeMax * countModifier );
 
 	// actively on fire
 	if( getObject()->testStatus( OBJECT_STATUS_AFLAME ) )
-		createParticleSystems( TheGlobalData->m_autoAflameParticlePrefix, 
+		createParticleSystems( TheGlobalData->m_autoAflameParticlePrefix,
 													 aflameTemplate, TheGlobalData->m_autoAflameParticleMax * countModifier );
 
-}  // end updatebodyParticleSystems
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Simple changing of the health value, it does *NOT* track any transition
 	* states for the event of "damage" or the event of "death".  If you
 	* with to kill an object and give these modules a chance to react
-	* to that event use the proper damage method calls. 
+	* to that event use the proper damage method calls.
 	* No game logic should go in here.  This is the low level math and flag maintenance.
 	* Game stuff goes in attemptDamage and attemptHealing.
 */
@@ -997,13 +994,13 @@ void ActiveBody::internalChangeHealth( Real delta )
 		if( !getObject()->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 			evaluateVisualCondition();
 
-	}  // end if
+	}
 
 	// mark the bit according to our health. (if our AI is dead but our health improves, it will
 	// still re-flag this bit in the AIDeadState every frame.)
 	getObject()->setEffectivelyDead(m_currentHealth <= 0);
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1021,17 +1018,17 @@ BodyDamageType ActiveBody::getDamageState() const
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Real ActiveBody::getMaxHealth() const 
+Real ActiveBody::getMaxHealth() const
 {
 	return m_maxHealth;
-}  ///< return max health
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Real ActiveBody::getInitialHealth() const 
-{ 
+Real ActiveBody::getInitialHealth() const
+{
 	return m_initialHealth;
-}  // return initial health
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -1063,41 +1060,44 @@ void ActiveBody::setIndestructible( Bool indestructible )
 					if( body )
 						body->setIndestructible( indestructible );
 
-				}  // end if
+				}
 
-			}  // end for, i
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end setIndestructible
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void ActiveBody::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel )
+void ActiveBody::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback )
 {
 	if (oldLevel == newLevel)
 		return;
-	
+
 	if (oldLevel < newLevel)
 	{
-		AudioEventRTS veterancyChanged;
-		switch (newLevel)
+		if (provideFeedback)
 		{
-			case LEVEL_VETERAN:
-				veterancyChanged = *getObject()->getTemplate()->getSoundPromotedVeteran();
-				break;
-			case LEVEL_ELITE:
-				veterancyChanged = *getObject()->getTemplate()->getSoundPromotedElite();
-				break;
-			case LEVEL_HEROIC:
-				veterancyChanged = *getObject()->getTemplate()->getSoundPromotedHero();
-				break;
-		}
+			AudioEventRTS veterancyChanged;
+			switch (newLevel)
+			{
+				case LEVEL_VETERAN:
+					veterancyChanged = *getObject()->getTemplate()->getSoundPromotedVeteran();
+					break;
+				case LEVEL_ELITE:
+					veterancyChanged = *getObject()->getTemplate()->getSoundPromotedElite();
+					break;
+				case LEVEL_HEROIC:
+					veterancyChanged = *getObject()->getTemplate()->getSoundPromotedHero();
+					break;
+			}
 
-		veterancyChanged.setObjectID(getObject()->getID());
-		TheAudio->addAudioEvent(&veterancyChanged);
+			veterancyChanged.setObjectID(getObject()->getID());
+			TheAudio->addAudioEvent(&veterancyChanged);
+		}
 
 		//Also mark the UI dirty -- incase the object is selected or contained.
 		Object *obj = getObject();
@@ -1173,7 +1173,7 @@ void ActiveBody::setAflame( Bool )
 	// All this does now is act like a major body state change. It is called after Aflame has been
 	// set or cleared as an Object Status
 	//
-	updateBodyParticleSystems();	
+	updateBodyParticleSystems();
 
 }
 
@@ -1186,7 +1186,7 @@ void ActiveBody::crc( Xfer *xfer )
   // extend base class
 	BodyModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1264,9 +1264,9 @@ void ActiveBody::xfer( Xfer *xfer )
 			// write particle system ID
 			xfer->xferUser( &system->m_particleSystemID, sizeof( ParticleSystemID ) );
 
-		}  // end for, system
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		ParticleSystemID particleSystemID;
@@ -1275,10 +1275,10 @@ void ActiveBody::xfer( Xfer *xfer )
 		if( m_particleSystems != NULL )
 		{
 
-			DEBUG_CRASH(( "ActiveBody::xfer - m_particleSystems should be empty, but is not\n" ));
+			DEBUG_CRASH(( "ActiveBody::xfer - m_particleSystems should be empty, but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read all data elements
 		BodyParticleSystem *newEntry;
@@ -1294,14 +1294,14 @@ void ActiveBody::xfer( Xfer *xfer )
 			newEntry->m_next = m_particleSystems;  // the list will be reversed, but we don't care
 			m_particleSystems = newEntry;
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// armor set flags
 	m_curArmorSetFlags.xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1312,4 +1312,4 @@ void ActiveBody::loadPostProcess( void )
 	// extend base class
 	BodyModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/BodyModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/BodyModule.cpp
index 79917da6d31..e85e5890f2b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/BodyModule.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/BodyModule.cpp
@@ -24,7 +24,7 @@
 
 // FILE: BodyModule.cpp ///////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2002
-// Desc:   BodyModule base class 
+// Desc:   BodyModule base class
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
@@ -41,7 +41,7 @@ void BodyModule::crc( Xfer *xfer )
 	// call base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -57,12 +57,12 @@ void BodyModule::xfer( Xfer *xfer )
 	xfer->xferVersion( &version, currentVersion );
 
 	// call base class
-	BehaviorModule::xfer( xfer ); 
+	BehaviorModule::xfer( xfer );
 
 	// damage scalar
 	xfer->xferReal( &m_damageScalar );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -72,5 +72,5 @@ void BodyModule::loadPostProcess( void )
 
 	// call base class
 	BehaviorModule::loadPostProcess();
-	
-}  // end loadPostProcess
+
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/HighlanderBody.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/HighlanderBody.cpp
index 045cb2ff434..cfcc0005b54 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/HighlanderBody.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/HighlanderBody.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 
 #include "GameLogic/Module/HighlanderBody.h"
@@ -37,7 +37,7 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-HighlanderBody::HighlanderBody( Thing *thing, const ModuleData* moduleData ) 
+HighlanderBody::HighlanderBody( Thing *thing, const ModuleData* moduleData )
 						 : ActiveBody( thing, moduleData )
 {
 }
@@ -69,7 +69,7 @@ void HighlanderBody::crc( Xfer *xfer )
 	// extend base class
 	ActiveBody::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -87,7 +87,7 @@ void HighlanderBody::xfer( Xfer *xfer )
 	// extend base class
 	ActiveBody::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -98,4 +98,4 @@ void HighlanderBody::loadPostProcess( void )
 	// extend base class
 	ActiveBody::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/HiveStructureBody.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/HiveStructureBody.cpp
index b0252e76c52..ca23cc3b038 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/HiveStructureBody.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/HiveStructureBody.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "Common/ThingTemplate.h"
@@ -52,7 +52,7 @@ HiveStructureBodyModuleData::HiveStructureBodyModuleData()
 
 
 //-------------------------------------------------------------------------------------------------
-HiveStructureBody::HiveStructureBody( Thing *thing, const ModuleData* moduleData ) 
+HiveStructureBody::HiveStructureBody( Thing *thing, const ModuleData* moduleData )
 							: StructureBody( thing, moduleData )
 {
 }
@@ -67,7 +67,7 @@ void HiveStructureBody::attemptDamage( DamageInfo *damageInfo )
 {
 	const HiveStructureBodyModuleData *data = getHiveStructureBodyModuleData();
 	Object *hive = getObject();
-	
+
 	if( getDamageTypeFlag( data->m_damageTypesToPropagateToSlaves, damageInfo->in.m_damageType ) )
 	{
 		//We have the right type of damage types incoming to propagate to slaves. Do we have slaves?
@@ -101,7 +101,7 @@ void HiveStructureBody::attemptDamage( DamageInfo *damageInfo )
 		}
 	}
 
-	//Nothing to propagate (either different damage type or no slaves), 
+	//Nothing to propagate (either different damage type or no slaves),
 	//so damage me instead!
 	StructureBody::attemptDamage( damageInfo );
 }
@@ -113,7 +113,7 @@ void HiveStructureBody::crc( Xfer *xfer )
 	// extend parent class
 	StructureBody::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/ImmortalBody.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/ImmortalBody.cpp
index 676faacecad..bd0164d4c48 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/ImmortalBody.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/ImmortalBody.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/Damage.h"
@@ -38,7 +38,7 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-ImmortalBody::ImmortalBody( Thing *thing, const ModuleData* moduleData ) 
+ImmortalBody::ImmortalBody( Thing *thing, const ModuleData* moduleData )
 						 : ActiveBody( thing, moduleData )
 {
 }
@@ -74,7 +74,7 @@ void ImmortalBody::crc( Xfer *xfer )
 	// extend base class
 	ActiveBody::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -92,7 +92,7 @@ void ImmortalBody::xfer( Xfer *xfer )
 	// extend base class
 	ActiveBody::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -103,4 +103,4 @@ void ImmortalBody::loadPostProcess( void )
 	// extend base class
 	ActiveBody::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/InactiveBody.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/InactiveBody.cpp
index 903dfe986d6..ce79e918640 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/InactiveBody.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/InactiveBody.cpp
@@ -30,7 +30,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
 #include "GameLogic/Module/InactiveBody.h"
@@ -43,18 +43,18 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-InactiveBody::InactiveBody( Thing *thing, const ModuleData* moduleData ) 
+InactiveBody::InactiveBody( Thing *thing, const ModuleData* moduleData )
 						: BodyModule( thing, moduleData ), m_dieCalled(false)
 {
 	getObject()->setEffectivelyDead(true);
-}  // end InactiveBody
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 InactiveBody::~InactiveBody( void )
 {
 
-}  // end ~InactiveBody
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -146,7 +146,7 @@ Real InactiveBody::getHealth() const
 	// Inactive bodies have no health to get
 	return 0.0f;
 
-}  // end getHealth
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -171,7 +171,7 @@ void InactiveBody::crc( Xfer *xfer )
 	// extend base class
 	BodyModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -189,7 +189,7 @@ void InactiveBody::xfer( Xfer *xfer )
 	// base class
 	BodyModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -200,6 +200,6 @@ void InactiveBody::loadPostProcess( void )
 	// extend base class
 	BodyModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/StructureBody.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/StructureBody.cpp
index d95e85a5c7a..211e1294e1c 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Body/StructureBody.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Body/StructureBody.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/Damage.h"
@@ -39,30 +39,30 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-StructureBody::StructureBody( Thing *thing, const ModuleData* moduleData ) 
+StructureBody::StructureBody( Thing *thing, const ModuleData* moduleData )
 							: ActiveBody( thing, moduleData )
 {
 
 	m_constructorObjectID = INVALID_ID;
 
-}  // end StructureBody
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 StructureBody::~StructureBody( void )
 {
 
-}  // end ~StructureBody
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void StructureBody::setConstructorObject( Object *obj )
-{ 
+{
 
-	if( obj ) 
-		m_constructorObjectID = obj->getID(); 
+	if( obj )
+		m_constructorObjectID = obj->getID();
 
-}  // end setConstructorObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -73,7 +73,7 @@ void StructureBody::crc( Xfer *xfer )
 	// extend base class
 	ActiveBody::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -94,7 +94,7 @@ void StructureBody::xfer( Xfer *xfer )
 	// constructor object id
 	xfer->xferObjectID( &m_constructorObjectID );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -105,4 +105,4 @@ void StructureBody::loadPostProcess( void )
 	// extend base class
 	ActiveBody::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CollideModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CollideModule.cpp
index ff3ef22f97d..4e63d980878 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CollideModule.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CollideModule.cpp
@@ -41,7 +41,7 @@ void CollideModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -57,7 +57,7 @@ void CollideModule::xfer( Xfer *xfer )
 	// call base class
 	BehaviorModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -68,4 +68,4 @@ void CollideModule::loadPostProcess( void )
 	// call base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToCarBombCrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToCarBombCrateCollide.cpp
index 88e37f84691..40de4e7c77e 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToCarBombCrateCollide.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToCarBombCrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/Radar.h"
 #include "Common/ThingTemplate.h"
@@ -39,21 +39,20 @@
 #include "GameLogic/Module/ConvertToCarBombCrateCollide.h"
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/ScriptEngine.h"
-#include "GameLogic/ExperienceTracker.h"
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ConvertToCarBombCrateCollide::ConvertToCarBombCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ConvertToCarBombCrateCollide::~ConvertToCarBombCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -68,7 +67,7 @@ Bool ConvertToCarBombCrateCollide::isValidToExecute( const Object *other ) const
 	{
 		return FALSE;
 	}
-	
+
 	if( other->isKindOf( KINDOF_AIRCRAFT ) || other->isKindOf( KINDOF_BOAT ) )
 	{
 		//Can't make carbombs out of planes and boats!
@@ -95,7 +94,7 @@ Bool ConvertToCarBombCrateCollide::isValidToExecute( const Object *other ) const
 		//weaponset.
 		return FALSE;
 	}
-	
+
 	// Also make sure that the car isn't already a carbomb!
 	if( other->testWeaponSetFlag( WEAPONSET_CARBOMB ) )
 	{
@@ -159,7 +158,7 @@ void ConvertToCarBombCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -177,7 +176,7 @@ void ConvertToCarBombCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -188,4 +187,4 @@ void ConvertToCarBombCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp
index 2bcccf16d4c..2eacd9f0103 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp
@@ -23,19 +23,19 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: ConvertToHijackedVehicleCrateCollide.cpp 
+//
+// FILE: ConvertToHijackedVehicleCrateCollide.cpp
 // Author: Mark Lorenzen, July 2002
-// Desc:   A crate (actually a terrorist - mobile crate) that makes the target vehicle switch 
+// Desc:   A crate (actually a terrorist - mobile crate) that makes the target vehicle switch
 //				 sides, and kills its driver
 //	@todo	 Needs to set the science of that vehicle (dozer) so still can build same stuff as always
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
+
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Radar.h"
@@ -56,23 +56,18 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/Module/DozerAIUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ConvertToHijackedVehicleCrateCollide::ConvertToHijackedVehicleCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ConvertToHijackedVehicleCrateCollide::~ConvertToHijackedVehicleCrateCollide( void )
 {
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -149,11 +144,11 @@ Bool ConvertToHijackedVehicleCrateCollide::executeCrateBehavior( Object *other )
 
 	//Before the actual defection takes place, play the "vehicle stolen" EVA
 	//event if the local player is the victim!
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_VehicleStolen );
 	}
-	
+
 	other->setTeam( obj->getControllingPlayer()->getDefaultTeam() );
 	other->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_HIJACKED ) );// I claim this car in the name of the GLA
 
@@ -199,12 +194,12 @@ Bool ConvertToHijackedVehicleCrateCollide::executeCrateBehavior( Object *other )
 			targetCanEject = TRUE;
 			break;
 		}
-	}  // end for dmi
+	}
 
 	if ( ! targetCanEject )
 	{
 		TheGameLogic->destroyObject( obj );
-		return TRUE; 
+		return TRUE;
 	}
 
 	// I we have made it this far, we are going to ride in this vehicle for a while
@@ -243,7 +238,7 @@ Bool ConvertToHijackedVehicleCrateCollide::executeCrateBehavior( Object *other )
 		obj->getDrawable()->setDrawableHidden( true );
 
 	// By returning FALSE, we will not remove the object (Hijacker)
-	return FALSE; 
+	return FALSE;
 //	return TRUE;
 }
 
@@ -256,7 +251,7 @@ void ConvertToHijackedVehicleCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -274,7 +269,7 @@ void ConvertToHijackedVehicleCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -285,4 +280,4 @@ void ConvertToHijackedVehicleCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp
index 49945919baa..8d8e7d5081b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/BitFlagsIO.h"
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -39,11 +39,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/CrateCollide.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -57,22 +52,16 @@ CrateCollideModuleData::CrateCollideModuleData()
 	m_isHumanOnlyPickup = FALSE;
 	m_executeFX = NULL;
 	m_pickupScience = SCIENCE_INVALID;
-
-	// Added By Sadullah Nader
-	// Initializations missing and needed
-	
 	m_executionAnimationTemplate = AsciiString::TheEmptyString;
-	
-	// End Add
 }
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void CrateCollideModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void CrateCollideModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "RequiredKindOf", KindOfMaskType::parseFromINI, NULL, offsetof( CrateCollideModuleData, m_kindof ) },
 		{ "ForbiddenKindOf", KindOfMaskType::parseFromINI, NULL, offsetof( CrateCollideModuleData, m_kindofnot ) },
@@ -96,14 +85,14 @@ void CrateCollideModuleData::buildFieldParse(MultiIniFieldParse& p)
 CrateCollide::CrateCollide( Thing *thing, const ModuleData* moduleData ) : CollideModule( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 CrateCollide::~CrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The collide event.
@@ -119,7 +108,7 @@ void CrateCollide::onCollide( Object *other, const Coord3D *, const Coord3D * )
 		{
 			if( modData->m_executeFX != NULL )
 			{
-				// Note: We pass in other here, because the crate is owned by the neutral player, and 
+				// Note: We pass in other here, because the crate is owned by the neutral player, and
 				// we want to do things that only the other person can see.
 				FXList::doFXObj( modData->m_executeFX, other );
 			}
@@ -142,7 +131,7 @@ void CrateCollide::onCollide( Object *other, const Coord3D *, const Coord3D * )
 
 	}
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool CrateCollide::isValidToExecute( const Object *other ) const
@@ -163,7 +152,7 @@ Bool CrateCollide::isValidToExecute( const Object *other ) const
 		return FALSE;
 
 	// must match our kindof flags (if any)
-	if (md && !other->isKindOfMulti(md->m_kindof, md->m_kindofnot))
+	if ( !other->isKindOfMulti(md->m_kindof, md->m_kindofnot) )
 		return FALSE;
 
 	if( other->isEffectivelyDead() )
@@ -194,7 +183,7 @@ void CrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CollideModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -212,7 +201,7 @@ void CrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CollideModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -223,4 +212,4 @@ void CrateCollide::loadPostProcess( void )
 	// extend base class
 	CollideModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/HealCrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/HealCrateCollide.cpp
index 6a9f3498f1f..2c37e0bad1b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/HealCrateCollide.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/HealCrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/AudioEventRTS.h"
 #include "Common/MiscAudio.h"
 #include "Common/Player.h"
@@ -41,14 +41,14 @@
 HealCrateCollide::HealCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 HealCrateCollide::~HealCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool HealCrateCollide::executeCrateBehavior( Object *other )
@@ -60,7 +60,7 @@ Bool HealCrateCollide::executeCrateBehavior( Object *other )
 	AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateHeal;
 	soundToPlay.setPosition( other->getPosition() );
 	TheAudio->addAudioEvent(&soundToPlay);
-	
+
 	return TRUE;
 }
 
@@ -73,7 +73,7 @@ void HealCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -91,7 +91,7 @@ void HealCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -102,5 +102,5 @@ void HealCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/MoneyCrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/MoneyCrateCollide.cpp
index 3f652f975be..a20e62bd68b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/MoneyCrateCollide.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/MoneyCrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/AudioEventRTS.h"
 #include "Common/MiscAudio.h"
 #include "Common/Player.h"
@@ -41,14 +41,14 @@
 MoneyCrateCollide::MoneyCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 MoneyCrateCollide::~MoneyCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool MoneyCrateCollide::executeCrateBehavior( Object *other )
@@ -62,7 +62,7 @@ Bool MoneyCrateCollide::executeCrateBehavior( Object *other )
 	AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateMoney;
 	soundToPlay.setObjectID( other->getID() );
 	TheAudio->addAudioEvent(&soundToPlay);
-	
+
 	return TRUE;
 }
 
@@ -75,7 +75,7 @@ void MoneyCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -93,7 +93,7 @@ void MoneyCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -104,4 +104,4 @@ void MoneyCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SalvageCrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SalvageCrateCollide.cpp
index 582e96d268b..3ba3e048566 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SalvageCrateCollide.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SalvageCrateCollide.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "GameLogic/Module/SalvageCrateCollide.h"
 
 #include "Common/AudioEventRTS.h"
@@ -49,14 +49,14 @@
 SalvageCrateCollide::SalvageCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SalvageCrateCollide::~SalvageCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool SalvageCrateCollide::isValidToExecute( const Object *other ) const
@@ -79,10 +79,10 @@ Bool SalvageCrateCollide::executeCrateBehavior( Object *other )
 		doWeaponSet( other );
 
 		//Play the salvage installation crate pickup sound.
-		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateSalvage;	
+		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateSalvage;
 		soundToPlay.setObjectID( other->getID() );
 		TheAudio->addAudioEvent( &soundToPlay );
-		
+
 		//Play the unit voice acknowledgement for upgrading weapons.
 		//Already handled by the "move order"
 		//const AudioEventRTS *soundToPlayPtr = other->getTemplate()->getPerUnitSound( "VoiceSalvage" );
@@ -93,14 +93,14 @@ Bool SalvageCrateCollide::executeCrateBehavior( Object *other )
 	else if( eligibleForLevel( other ) && testLevelChance() )
 	{
 		doLevelGain( other );
-		
+
 		//Sound will play in
-		//soundToPlay = TheAudio->getMiscAudio()->m_unitPromoted;	
+		//soundToPlay = TheAudio->getMiscAudio()->m_unitPromoted;
 	}
 	else // just assume the testMoneyChance
 	{
 		doMoney( other );
-		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateMoney;	
+		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateMoney;
 		soundToPlay.setObjectID( other->getID() );
 		TheAudio->addAudioEvent(&soundToPlay);
 	}
@@ -133,7 +133,7 @@ Bool SalvageCrateCollide::eligibleForLevel( Object *other )
 	// Sorry, you are max level
 	if( other->getExperienceTracker()->getVeterancyLevel() == LEVEL_HEROIC )
 		return FALSE;
-	
+
 	// Sorry, you can't gain levels
 	if( !other->getExperienceTracker()->isTrainable() )
 		return FALSE;
@@ -200,7 +200,7 @@ void SalvageCrateCollide::doMoney( Object *other )
 	{
 		other->getControllingPlayer()->getMoney()->deposit( money );
 		other->getControllingPlayer()->getScoreKeeper()->addMoneyEarned( money );
-		
+
 		//Display cash income floating over the crate.  Position is me, everything else is them.
 		UnicodeString moneyString;
 		moneyString.format( TheGameText->fetch( "GUI:AddCash" ), money );
@@ -221,7 +221,7 @@ void SalvageCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -239,7 +239,7 @@ void SalvageCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -250,4 +250,4 @@ void SalvageCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ShroudCrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ShroudCrateCollide.cpp
index ae3563f7c52..f3de3f42a2c 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ShroudCrateCollide.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ShroudCrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/AudioEventRTS.h"
 #include "Common/MiscAudio.h"
 #include "Common/Player.h"
@@ -41,14 +41,14 @@
 ShroudCrateCollide::ShroudCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ShroudCrateCollide::~ShroudCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool ShroudCrateCollide::executeCrateBehavior( Object *other )
@@ -73,7 +73,7 @@ void ShroudCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -91,7 +91,7 @@ void ShroudCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -102,4 +102,4 @@ void ShroudCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/UnitCrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/UnitCrateCollide.cpp
index d6078ceccfe..e6b019cc9b8 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/UnitCrateCollide.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/UnitCrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/AudioEventRTS.h"
 #include "Common/MiscAudio.h"
 #include "Common/Player.h"
@@ -43,14 +43,14 @@
 UnitCrateCollide::UnitCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 UnitCrateCollide::~UnitCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool UnitCrateCollide::executeCrateBehavior( Object *other )
@@ -80,7 +80,7 @@ Bool UnitCrateCollide::executeCrateBehavior( Object *other )
 
 			newObj->setOrientation( other->getOrientation() );
 			newObj->setPosition( &creationPoint );
-		} 
+		}
 	}
 
 	//Play a crate pickup sound.
@@ -100,7 +100,7 @@ void UnitCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -118,7 +118,7 @@ void UnitCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -129,4 +129,4 @@ void UnitCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/VeterancyCrateCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/VeterancyCrateCollide.cpp
index d19dab860e9..427271044f7 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/VeterancyCrateCollide.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/VeterancyCrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/Xfer.h"
 #include "GameLogic/ExperienceTracker.h"
@@ -43,14 +43,14 @@
 VeterancyCrateCollide::VeterancyCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 VeterancyCrateCollide::~VeterancyCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -103,12 +103,12 @@ Bool VeterancyCrateCollide::isValidToExecute( const Object *other ) const
 	{
 		if( other->getControllingPlayer() != getObject()->getControllingPlayer() )
 		{
-			//This is a pilot and we are checking to make sure the pilot is entering a vehicle on 
+			//This is a pilot and we are checking to make sure the pilot is entering a vehicle on
 			//the same team. If it's not, then don't allow it.. this is particularly the case for
 			//pilots attempting to enter civilian vehicles.
 			return false;
 		}
-		
+
 		if( other->isUsingAirborneLocomotor() )
 		{
 			// Can't upgrade a helicopter or plane, but we will think we can for a moment while it
@@ -125,7 +125,7 @@ Bool VeterancyCrateCollide::isValidToExecute( const Object *other ) const
 Bool VeterancyCrateCollide::executeCrateBehavior( Object *other )
 {
  	//Make sure the pilot is actually *TRYING* to enter the object
- 	//unlike other crates 
+ 	//unlike other crates
  	AIUpdateInterface *ai = (AIUpdateInterface*)getObject()->getAIUpdateInterface();
 	const VeterancyCrateCollideModuleData *md = getVeterancyCrateCollideModuleData();
 
@@ -158,7 +158,7 @@ Bool VeterancyCrateCollide::executeCrateBehavior( Object *other )
 			potentialObject->getExperienceTracker()->gainExpForLevel( levelsToGain, ( ! md->m_isPilot) );
 		}
 	}
-	
+
 	//In order to make things easier for the designers, we are going to transfer the terrorist name
 	//to the car... so the designer can control the car with their scripts.
 	if( md->m_isPilot )
@@ -178,7 +178,7 @@ void VeterancyCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -196,7 +196,7 @@ void VeterancyCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -207,4 +207,4 @@ void VeterancyCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/FireWeaponCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/FireWeaponCollide.cpp
index 9ff821aa8e6..6706f057ebe 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/FireWeaponCollide.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/FireWeaponCollide.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_OBJECT_STATUS_NAMES
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -37,11 +37,11 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void FireWeaponCollideModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void FireWeaponCollideModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   CollideModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "CollideWeapon",		INI::parseWeaponTemplate,						NULL, offsetof( FireWeaponCollideModuleData, m_collideWeaponTemplate ) },
 		{ "FireOnce",					INI::parseBool,											NULL, offsetof( FireWeaponCollideModuleData, m_fireOnce ) },
@@ -54,7 +54,7 @@ void FireWeaponCollideModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-FireWeaponCollide::FireWeaponCollide( Thing *thing, const ModuleData* moduleData ) : 
+FireWeaponCollide::FireWeaponCollide( Thing *thing, const ModuleData* moduleData ) :
 	CollideModule( thing, moduleData ),
 	m_collideWeapon(NULL)
 {
@@ -66,8 +66,7 @@ FireWeaponCollide::FireWeaponCollide( Thing *thing, const ModuleData* moduleData
 //-------------------------------------------------------------------------------------------------
 FireWeaponCollide::~FireWeaponCollide( void )
 {
-	if (m_collideWeapon)
-		deleteInstance(m_collideWeapon);
+	deleteInstance(m_collideWeapon);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -81,7 +80,7 @@ void FireWeaponCollide::onCollide( Object *other, const Coord3D *loc, const Coor
 	Object *me = getObject();
 
 	// This will fire at you every frame, because multiple people could be colliding and we want
-	// to hurt them all.  Another solution would be to keep a Map of other->objetIDs and 
+	// to hurt them all.  Another solution would be to keep a Map of other->objetIDs and
 	// delays for each individually.  However, this solution here is so quick and simple that it
 	// warrants the "do it eventually if we need it" clause.
 	if( shouldFireWeapon() )
@@ -97,14 +96,14 @@ Bool FireWeaponCollide::shouldFireWeapon()
 	const FireWeaponCollideModuleData *d = getFireWeaponCollideModuleData();
 
 	ObjectStatusMaskType status = getObject()->getStatusBits();
-	
+
 	//We need all required status or else we fail
 	if( !status.testForAll( d->m_requiredStatus ) )
-		return FALSE; 
+		return FALSE;
 
 	//If we have any forbidden statii, then fail
 	if( status.testForAny( d->m_forbiddenStatus ) )
-		return FALSE; 
+		return FALSE;
 
 	if( m_everFired && d->m_fireOnce )
 		return FALSE;// can only fire once ever
@@ -121,7 +120,7 @@ void FireWeaponCollide::crc( Xfer *xfer )
 	// extend base class
 	CollideModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -146,22 +145,22 @@ void FireWeaponCollide::xfer( Xfer *xfer )
 	{
 
 		DEBUG_ASSERTCRASH( m_collideWeapon != NULL,
-											 ("FireWeaponCollide::xfer - m_collideWeapon present mismatch\n") );
+											 ("FireWeaponCollide::xfer - m_collideWeapon present mismatch") );
 		xfer->xferSnapshot( m_collideWeapon );
 
-	}  // end else
+	}
 	else
 	{
 
 		DEBUG_ASSERTCRASH( m_collideWeapon == NULL,
-											 ("FireWeaponCollide::Xfer - m_collideWeapon missing mismatch\n" ));
+											 ("FireWeaponCollide::Xfer - m_collideWeapon missing mismatch" ));
 
-	}  // end else
+	}
 
 	// ever fired
 	xfer->xferBool( &m_everFired );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -172,4 +171,4 @@ void FireWeaponCollide::loadPostProcess( void )
 	// extend base class
 	CollideModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/SquishCollide.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/SquishCollide.cpp
index ae7c08f504b..dd014d6c640 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/SquishCollide.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/SquishCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingFactory.h"
 #include "Common/Xfer.h"
@@ -41,11 +41,6 @@
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -69,7 +64,7 @@ void SquishCollide::onCollide( Object *other, const Coord3D *loc, const Coord3D
 	// Note that other == null means "collide with ground"
 	if (other == NULL)
 		return;
-	
+
 	Object *self = getObject();
 	AIUpdateInterface *ai = self->getAI();
 	if( ai && ai->getGoalObject() == other )
@@ -104,7 +99,7 @@ void SquishCollide::onCollide( Object *other, const Coord3D *loc, const Coord3D
  		GeometryInfo myGeom = self->getGeometryInfo();
 		myGeom.setMajorRadius(1.0f);
 		myGeom.setMinorRadius(1.0f);
-		if (!ThePartitionManager->geomCollidesWithGeom(other->getPosition(), other->getGeometryInfo(), other->getOrientation(), 
+		if (!ThePartitionManager->geomCollidesWithGeom(other->getPosition(), other->getGeometryInfo(), other->getOrientation(),
 			self->getPosition(), myGeom, self->getOrientation())) {
 			return;
 		}
@@ -143,7 +138,7 @@ void SquishCollide::crc( Xfer *xfer )
 	// extend base class
 	CollideModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -161,7 +156,7 @@ void SquishCollide::xfer( Xfer *xfer )
 	// extend base class
 	CollideModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -172,4 +167,4 @@ void SquishCollide::loadPostProcess( void )
 	// extend base class
 	CollideModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/CaveContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/CaveContain.cpp
index 2efd4217e85..603106a97f9 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/CaveContain.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/CaveContain.cpp
@@ -25,12 +25,12 @@
 // FILE: CaveContain.cpp ////////////////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, July 2002
 // Desc:   A version of OpenContain that overrides where the passengers are stored: one of CaveSystem's
-//					entries. Changing entry is a script or ini command.  All queries about capacity and 
+//					entries. Changing entry is a script or ini command.  All queries about capacity and
 //					contents are also redirected.  They change sides like Garrison too.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameState.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -94,14 +94,14 @@ void CaveContain::removeFromContain( Object *obj, Bool exposeStealthUnits )
 	}
 
 	// This must come before the onRemov*, because CaveContain's version has a edge-0 triggered event.
-	// If that were to go first, the number would still be 1 at that time.  Noone else cares about 
+	// If that were to go first, the number would still be 1 at that time.  Noone else cares about
 	// order.
 	myTracker->removeFromContain( obj, exposeStealthUnits );
 
 	// trigger an onRemoving event for 'm_object' no longer containing 'itemToRemove->m_object'
 	if (getObject()->getContain())
 		getObject()->getContain()->onRemoving( obj );
-		
+
 	// trigger an onRemovedFrom event for 'remove'
 	obj->onRemovedFrom( getObject() );
 
@@ -144,7 +144,7 @@ void CaveContain::onContaining( Object *obj )
 
 	//
 	// the team of the building is now the same as those that have garrisoned it, be sure
-	// to save our original team tho so that we can revert back to it when all the 
+	// to save our original team tho so that we can revert back to it when all the
 	// occupants are gone
 	//
 	recalcApparentControllingPlayer();
@@ -152,7 +152,7 @@ void CaveContain::onContaining( Object *obj )
 }
 
 //-------------------------------------------------------------------------------------------------
-void CaveContain::onRemoving( Object *obj ) 
+void CaveContain::onRemoving( Object *obj )
 {
 	OpenContain::onRemoving(obj);
 	// object is no longer held inside a garrisoned building
@@ -188,7 +188,7 @@ void CaveContain::onRemoving( Object *obj )
 			draw->clearModelConditionState( MODELCONDITION_GARRISONED );
 		}
 
-	}  // end if
+	}
 }
 
 Bool CaveContain::isValidContainerFor(const Object* obj, Bool checkCapacity) const
@@ -203,8 +203,8 @@ UnsignedInt CaveContain::getContainCount() const
 	return myTracker->getContainCount();
 }
 
-Int CaveContain::getContainMax( void ) const 
-{ 
+Int CaveContain::getContainMax( void ) const
+{
 	TunnelTracker *myTracker = TheCaveSystem->getTunnelTrackerForCaveIndex( m_caveIndex );
 	return myTracker->getContainMax();
 }
@@ -232,7 +232,7 @@ void CaveContain::onDie( const DamageInfo * damageInfo )
 	TheCaveSystem->unregisterCave( m_caveIndex );
 
 	myTracker->onTunnelDestroyed( getObject() );
-}  
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -254,7 +254,7 @@ void CaveContain::onBuildComplete( void )
 	TunnelTracker *myTracker = TheCaveSystem->getTunnelTrackerForCaveIndex( m_caveIndex );
 
 	myTracker->onTunnelCreated( getObject() );
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void CaveContain::tryToSetCaveIndex( Int newIndex )
@@ -341,18 +341,18 @@ void CaveContain::changeTeamOnAllConnectedCaves( Team *newTeam, Bool setOriginal
 		Object *currentCave = TheGameLogic->findObjectByID( *iter );
 		if( currentCave )
 		{
-			// This is a distributed Garrison in terms of capturing, so when one node 
+			// This is a distributed Garrison in terms of capturing, so when one node
 			// triggers the change, he needs to tell everyone, so anyone can do the un-change.
 			CaveInterface *caveModule = findCave(currentCave);
 			if( caveModule == NULL )
 				continue;
 			if( setOriginalTeams )
 				caveModule->setOriginalTeam( currentCave->getTeam() );
-			else 
+			else
 				caveModule->setOriginalTeam( NULL );
 
 			// Now do the actual switch for this one.
-			
+
 			currentCave->defect( newTeam, 0 );
 //			currentCave->setTeam( newTeam );
 		}
@@ -370,11 +370,11 @@ void CaveContain::setOriginalTeam( Team *oldTeam )
 // ------------------------------------------------------------------------------------------------
 void CaveContain::crc( Xfer *xfer )
 {
-	
+
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -411,18 +411,18 @@ void CaveContain::xfer( Xfer *xfer )
 			if( m_originalTeam == NULL )
 			{
 
-				DEBUG_CRASH(( "CaveContain::xfer - Unable to find original team by id\n" ));
+				DEBUG_CRASH(( "CaveContain::xfer - Unable to find original team by id" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else
 			m_originalTeam = NULL;
 
-	}  // end if
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -433,4 +433,4 @@ void CaveContain::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
index eb9eb21d588..3851d860cad 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/PerfTimer.h"
@@ -54,10 +54,6 @@
 #include "GameClient/InGameUI.h"
 #include "GameClient/View.h"
 
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 enum { MUZZLE_FLASH_LIFETIME = LOGICFRAMES_PER_SECOND / 7 };
@@ -79,7 +75,7 @@ GarrisonContainModuleData::GarrisonContainModuleData( void )
 	m_immuneToClearBuildingAttacks = false;
 
 	m_initialRoster.count = 0;
-}  // end if
+}
 
 //-----------------------------------------------------------------------------
 inline Real calcDistSqr(const Coord3D& a, const Coord3D& b)
@@ -90,10 +86,13 @@ inline Real calcDistSqr(const Coord3D& a, const Coord3D& b)
 // ------------------------------------------------------------------------------------------------
 /** Given the target position, find the garrison point that is closest to it */
 // ------------------------------------------------------------------------------------------------
-Int GarrisonContain::findClosestFreeGarrisonPointIndex( Int conditionIndex, 
+Int GarrisonContain::findClosestFreeGarrisonPointIndex( Int conditionIndex,
 																												const Coord3D *targetPos )
 {
+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible
+#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC
 	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
+#endif
 
 	// sanity
 	if( targetPos == NULL || m_garrisonPointsInUse == MAX_GARRISON_POINTS )
@@ -118,15 +117,15 @@ Int GarrisonContain::findClosestFreeGarrisonPointIndex( Int conditionIndex,
 				closestDistSq = distSq;
 				closestIndex = i;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	return closestIndex;
 
-}  // end findClosestFreeGarrisonPointIndex
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given the object, return the garrison point index the object is placed at ... if any */
@@ -139,19 +138,19 @@ Int GarrisonContain::getObjectGarrisonPointIndex( Object *obj )
 		return GARRISON_INDEX_INVALID;
 
 	for( Int i = 0; i < MAX_GARRISON_POINTS; ++i )
-		if( m_garrisonPointData[ i ].object == obj ) 
+		if( m_garrisonPointData[ i ].object == obj )
 			return i;
 
 	return GARRISON_INDEX_INVALID;
 
-}  // end getObjectGarrisonPointIndex
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Put the object at the specified garrison point by index */
 // ------------------------------------------------------------------------------------------------
-void GarrisonContain::putObjectAtGarrisonPoint( Object *obj, 
+void GarrisonContain::putObjectAtGarrisonPoint( Object *obj,
 																								ObjectID targetID,
-																								Int conditionIndex, 
+																								Int conditionIndex,
 																								Int pointIndex )
 {
 	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
@@ -161,22 +160,22 @@ void GarrisonContain::putObjectAtGarrisonPoint( Object *obj,
 			conditionIndex < 0 || conditionIndex >= MAX_GARRISON_POINT_CONDITIONS )
 	{
 
-		DEBUG_CRASH(( "GarrisionContain::putObjectAtGarrisionPoint - Invalid arguments\n" ));
+		DEBUG_CRASH(( "GarrisionContain::putObjectAtGarrisionPoint - Invalid arguments" ));
 		return;
 
-	}  // end if
+	}
 
 	// make sure this point is empty
 	if( m_garrisonPointData[ pointIndex ].object != NULL )
 	{
 
-		DEBUG_CRASH(( "GarrisonContain::putObjectAtGarrisonPoint - Garrison Point '%d' is not empty\n", 
+		DEBUG_CRASH(( "GarrisonContain::putObjectAtGarrisonPoint - Garrison Point '%d' is not empty",
 									pointIndex ));
 		return;
 
-	}  // end if
+	}
 
-	// get the position we're going to use 
+	// get the position we're going to use
 	Coord3D pos = m_garrisonPoint[ conditionIndex ][ pointIndex ];
 
 	// set the object position
@@ -193,7 +192,7 @@ void GarrisonContain::putObjectAtGarrisonPoint( Object *obj,
 	// garrison point ready to shoot
 	//
 	static const ThingTemplate *muzzle = TheThingFactory->findTemplate( "GarrisonGun" );
-	DEBUG_ASSERTCRASH( muzzle, ("Warning, Object 'GarrisonGun' not found and is need for Garrison gun effects\n") );
+	DEBUG_ASSERTCRASH( muzzle, ("Warning, Object 'GarrisonGun' not found and is need for Garrison gun effects") );
 	if( muzzle )
 	{
 		Drawable *draw = TheThingFactory->newDrawable( muzzle );
@@ -212,20 +211,20 @@ void GarrisonContain::putObjectAtGarrisonPoint( Object *obj,
 			if (containerDrawable)
 				draw->setFullyObscuredByShroud(containerDrawable->getFullyObscuredByShroud());
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 /*
 UnicodeString msg;
-msg.format( L"Added object '%S'(%d) to point '%d'", 
+msg.format( L"Added object '%S'(%d) to point '%d'",
 						obj->getTemplate()->getName().str(),
 						obj->getID(),
 						pointIndex );
 TheInGameUI->message( msg );
 */
 
-}  // end putObjectAtGarrisonPoint
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given the current state of the structure, return the condition index we are to use
@@ -243,7 +242,7 @@ Int GarrisonContain::findConditionIndex( void )
 		// --------------------------------------------------------------------------------------------
 		case BODY_PRISTINE:
 
-			index = GARRISON_POINT_PRISTINE; 
+			index = GARRISON_POINT_PRISTINE;
 			break;
 
 		// --------------------------------------------------------------------------------------------
@@ -256,21 +255,21 @@ Int GarrisonContain::findConditionIndex( void )
 		case BODY_REALLYDAMAGED:
 		case BODY_RUBBLE:
 
-			index = GARRISON_POINT_REALLY_DAMAGED; 
+			index = GARRISON_POINT_REALLY_DAMAGED;
 			break;
 
 		// --------------------------------------------------------------------------------------------
 		default:
 
-			DEBUG_CRASH(( "GarrisonContain::findConditionIndex - Unknown body damage type '%d'\n",
+			DEBUG_CRASH(( "GarrisonContain::findConditionIndex - Unknown body damage type '%d'",
 										bodyDamage ));
 			break;
 
-	}  // end switch
+	}
 
 	return index;
 
-}  // end findConditionIndex
+}
 
 //-------------------------------------------------------------------------------------------------
 //The weapon system would like to perform a range check assuming the object is placed in the
@@ -289,7 +288,7 @@ Bool GarrisonContain::calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3
 	Int placeIndex = findClosestFreeGarrisonPointIndex( conditionIndex, targetPos );
 	if( placeIndex == GARRISON_INDEX_INVALID )
 	{
-		DEBUG_CRASH( ("GarrisonContain::calcBestGarrisonPosition - Unable to find suitable garrison point.\n") );
+		DEBUG_CRASH( ("GarrisonContain::calcBestGarrisonPosition - Unable to find suitable garrison point.") );
 		return FALSE;
 	}
 
@@ -395,21 +394,21 @@ void GarrisonContain::putObjectAtBestGarrisonPoint( Object *obj, Object *target,
 
 	// get the index of the garrison point that is closest to the target position
 	Int placeIndex = findClosestFreeGarrisonPointIndex( conditionIndex, targetPos );
-	DEBUG_ASSERTCRASH( placeIndex != GARRISON_INDEX_INVALID, 
-										 ("GarrisonContain::putObjectAtBestGarrisonPoint - Unable to find suitable garrison point for '%s'\n", 
+	DEBUG_ASSERTCRASH( placeIndex != GARRISON_INDEX_INVALID,
+										 ("GarrisonContain::putObjectAtBestGarrisonPoint - Unable to find suitable garrison point for '%s'",
 										 obj->getTemplate()->getName().str()) );
 
 	// put it here
 	putObjectAtGarrisonPoint( obj, target ? target->getID() : INVALID_ID, conditionIndex, placeIndex );
 
-}  // end putObjectAtBestGarrisonPoint
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove the object from the garrison point position and replace at the center of the building */
 // ------------------------------------------------------------------------------------------------
 void GarrisonContain::removeObjectFromGarrisonPoint( Object *obj, Int index )
 {
-	
+
 	// sanity
 	if( obj == NULL )
 		return;
@@ -428,11 +427,11 @@ void GarrisonContain::removeObjectFromGarrisonPoint( Object *obj, Int index )
 				removeIndex = i;
 				break;
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 
 	// validate the index slot to remove
 	if( removeIndex < 0 || removeIndex >= MAX_GARRISON_POINTS )
@@ -444,7 +443,7 @@ void GarrisonContain::removeObjectFromGarrisonPoint( Object *obj, Int index )
 		//
 		return;
 
-	}  // end if
+	}
 
 	// remove from this spot
 	m_garrisonPointData[ removeIndex ].object = NULL;
@@ -463,18 +462,18 @@ void GarrisonContain::removeObjectFromGarrisonPoint( Object *obj, Int index )
 
 /*
 UnicodeString msg;
-msg.format( L"Removed object '%S'(%d) from point '%d'", 
+msg.format( L"Removed object '%S'(%d) from point '%d'",
 						obj->getTemplate()->getName().str(),
 						obj->getID(),
 						removeIndex );
 TheInGameUI->message( msg );
 */
 
-}  // end removeObjectFromGarrisonPoint
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-GarrisonContain::GarrisonContain( Thing *thing, const ModuleData *moduleData ) : 
+GarrisonContain::GarrisonContain( Thing *thing, const ModuleData *moduleData ) :
 								 OpenContain( thing, moduleData )
 {
 	Int i, j;
@@ -486,7 +485,7 @@ GarrisonContain::GarrisonContain( Thing *thing, const ModuleData *moduleData ) :
 
 	for( i = 0; i < MAX_GARRISON_POINTS; i++ )
 	{
-		
+
 		m_garrisonPointData[ i ].object = NULL;
 		m_garrisonPointData[ i ].targetID = INVALID_ID;
 		m_garrisonPointData[ i ].placeFrame = 0;
@@ -496,23 +495,23 @@ GarrisonContain::GarrisonContain( Thing *thing, const ModuleData *moduleData ) :
 		for( j = 0; j < MAX_GARRISON_POINT_CONDITIONS; ++j )
 			m_garrisonPoint[ j ][ i ].zero();
 
-	}  // end for i
+	}
 
 	m_rallyValid = FALSE;
 	m_exitRallyPoint.zero();
 
-}  // end GarrisonContain
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 GarrisonContain::~GarrisonContain( void )
 {
 
-}  // end ~GarrisonContain
+}
 
 //-------------------------------------------------------------------------------------------------
-/** can this container contain this kind of object? 
-	and, if checkCapacity is TRUE, does this container have enough space 
+/** can this container contain this kind of object?
+	and, if checkCapacity is TRUE, does this container have enough space
 	left to hold the given unit? */
 // ------------------------------------------------------------------------------------------------
 Bool GarrisonContain::isValidContainerFor(const Object* obj, Bool checkCapacity) const
@@ -572,24 +571,24 @@ void GarrisonContain::removeInvalidObjectsFromGarrisonPoints( void )
 				Weapon *weapon = obj->getCurrentWeapon();
 				if( !weapon || !weapon->isWithinAttackRange( obj, goalObject ) )
 				{
-					//As a garrisoned member, if our target is out of range, 
+					//As a garrisoned member, if our target is out of range,
 					//then get out of the space, because someone else might
 					//be able to shoot it.
 					targetIsValid = false;
 				}
 			}
-			
+
 			// note that we can be attacking a position, rather than an object...
-			if( !obj->testStatus(OBJECT_STATUS_IS_ATTACKING) || !targetIsValid ) 
+			if( !obj->testStatus(OBJECT_STATUS_IS_ATTACKING) || !targetIsValid )
 			{
 				removeObjectFromGarrisonPoint( obj, i );
 			}
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end removeInvalidObjectsFromGarrisonPoints
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Are there any objects in the center that have now obtained targets and need to move to
@@ -610,7 +609,7 @@ void GarrisonContain::addValidObjectsToGarrisonPoints( void )
 		{
 			Object *victim = ai->getCurrentVictim();
 			const Coord3D *victimPos = ai->getCurrentVictimPos();
-			
+
 			//
 			// add this object to the garrison point that is closest to its target if it's not
 			// already in there
@@ -620,11 +619,11 @@ void GarrisonContain::addValidObjectsToGarrisonPoints( void )
 			else if( victimPos )
 				putObjectAtBestGarrisonPoint( obj, NULL, victimPos );
 
-		}  // end if
+		}
 
-	}  // end for it
+	}
 
-}  // end addValidObjectsToGarrisonPoints
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Every frame this method is called.  It keeps any of the attacking units at any of the
@@ -639,11 +638,10 @@ void GarrisonContain::trackTargets( void )
 	AIUpdateInterface *ai;
 	Object *obj;
 
+	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized || containList.empty(), ("garrisonPoints are not inited"));
+
 	for( ContainedItemsList::const_iterator it = containList.begin(); it != containList.end(); ++it )
 	{
-
-		DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
-
 		// get the object
 		obj = *it;
 
@@ -667,7 +665,7 @@ void GarrisonContain::trackTargets( void )
 					const Coord3D *ourPos = obj->getPosition();
 
 					// find the closest free (of all remaining) garrison points to our target
-					Int newIndex = findClosestFreeGarrisonPointIndex( conditionIndex, 
+					Int newIndex = findClosestFreeGarrisonPointIndex( conditionIndex,
 																														victimPos );
 
 					// if unable to find another garrison point, don't bother
@@ -690,9 +688,9 @@ void GarrisonContain::trackTargets( void )
 							// place at the new index
 							putObjectAtGarrisonPoint( obj, victim ? victim->getID() : INVALID_ID, conditionIndex, newIndex );
 
-						}  // end if, new index is closer
+						}
 
-					}  // end if, possible closer index was found
+					}
 
 					//
 					// we are now either at a new garrison fire point, or we have remained at our
@@ -709,17 +707,17 @@ void GarrisonContain::trackTargets( void )
 						// orient the effect object towards the victim position
 						m_garrisonPointData[ ourIndex ].effect->setOrientation( v.toAngle() );
 
-					}  // end if
+					}
 
-				}  // end if, victim present
+				}
 
-			}  // end if, ai
+			}
 
-		}  // end if, we're at a garrison point
+		}
 
-	}  // end for it
+	}
 
-}  // end trackTargets
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove all the objects at garrison points back to the center and redeploy them among the
@@ -756,11 +754,11 @@ void GarrisonContain::redeployOccupants( void )
 			if( index != GARRISON_INDEX_INVALID )
 				m_garrisonPointData[ index ].placeFrame = garrisonPointDataCopy[ i ].placeFrame;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end redeployOccupants
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do any effects during an update cycle that we need to */
@@ -793,27 +791,27 @@ void GarrisonContain::updateEffects( void )
 				Drawable *effect = m_garrisonPointData[ garrisonIndex ].effect;
 				if( effect )
 				{
-			
+
 					// set the model condition
 					effect->setModelConditionState( MODELCONDITION_FIRING_A );
 
 					// mark this "fire frame" so we can turn it off in a little while
 					m_garrisonPointData[ garrisonIndex ].lastEffectFrame = currentFrame;
 
-				}  // end if
+				}
 
-			}  // end if, object is at garrision point
-						
-		}  // end if, object shot last frame
+			}
+
+		}
 
-	}  // end for containment iterator
+	}
 
 	// remove any firing effects for time that has passed
 	for( Int i = 0; i < MAX_GARRISON_POINTS; ++i )
 	{
 
-		if( m_garrisonPointData[ i ].effect && 
-				m_garrisonPointData[ i ].lastEffectFrame != 0 && 
+		if( m_garrisonPointData[ i ].effect &&
+				m_garrisonPointData[ i ].lastEffectFrame != 0 &&
 				currentFrame - m_garrisonPointData[ i ].lastEffectFrame > MUZZLE_FLASH_LIFETIME  )
 		{
 
@@ -823,11 +821,11 @@ void GarrisonContain::updateEffects( void )
 			// clear the last effect frame
 			m_garrisonPointData[ i ].lastEffectFrame = 0;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end updateEffects
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -862,10 +860,10 @@ UpdateSleepTime GarrisonContain::update( void )
 			#define HUGE_FRAME_IN_FUTURE (LOGICFRAMES_PER_SECOND * 1000)
 			contained->setSafeOcclusionFrame( TheGameLogic->getFrame() + HUGE_FRAME_IN_FUTURE );
 
-		}  // end if
+		}
+
+	}
 
-	}  // end for, it
-	
 	// are there any objects at the garrison points who now need to go back to the center of the structure
 	removeInvalidObjectsFromGarrisonPoints();
 
@@ -888,7 +886,7 @@ UpdateSleepTime GarrisonContain::update( void )
 
 	healObjects();
 
-	if (modData->m_mobileGarrison && (getObject()->isMobile() == TRUE) ) 
+	if (modData->m_mobileGarrison && (getObject()->isMobile() == TRUE) )
 	{
 		moveObjectsWithMe();
 	}
@@ -896,11 +894,11 @@ UpdateSleepTime GarrisonContain::update( void )
 	{
 		// sanity information
 		DEBUG_ASSERTCRASH( getObject()->isMobile() == FALSE,
-		 ("GarrisonContain::update - Objects with garrison contain can be spec'd as 'mobile' in the INI. Do you really want to do this? \n") );
+		 ("GarrisonContain::update - Objects with garrison contain can be spec'd as 'mobile' in the INI. Do you really want to do this?") );
 	}
 
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -939,14 +937,14 @@ void GarrisonContain::healSingleObject( Object *obj, Real framesForFullHeal)
 	// if we've been in here long enough ... set our health to max
 	if( TheGameLogic->getFrame() - obj->getContainedByFrame() >= framesForFullHeal )
 	{
-	
+
 		// set the amount to max just to be sure we're at the top
 		healInfo.in.m_amount = body->getMaxHealth();
-		
+
 		// set max health
 		body->attemptHealing( &healInfo );
 
-	}  // end if
+	}
 	else
 	{
 		//
@@ -959,11 +957,11 @@ void GarrisonContain::healSingleObject( Object *obj, Real framesForFullHeal)
 		// do the healing
 		body->attemptHealing( &healInfo );
 
-	}  // end else
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
-/** return the player that *appears* to control this unit. if null, 
+/** return the player that *appears* to control this unit. if null,
 		use getObject()->getControllingPlayer() instead. */
 // ------------------------------------------------------------------------------------------------
 const Player* GarrisonContain::getApparentControllingPlayer( const Player* observingPlayer ) const
@@ -1004,7 +1002,7 @@ void GarrisonContain::recalcApparentControllingPlayer( void )
 		// since the Radar refresh in setTeam will want to use it to decide our color.
 		Bool detected = rider->getStatusBits().test( OBJECT_STATUS_DETECTED );
 		m_hideGarrisonedStateFromNonallies = ( !detected && ( getStealthUnitsContained() == getContainCount() ) );
-		
+
 		Player* controller = rider->getControllingPlayer();
 		Team *team = controller ? controller->getDefaultTeam() : NULL;
 		if( team )
@@ -1114,7 +1112,7 @@ void GarrisonContain::loadGarrisonPoints( void )
 		conditionIndex = GARRISON_POINT_PRISTINE;
 
 		count = structure->getMultiLogicalBonePosition("FIREPOINT", MAX_GARRISON_POINTS, m_garrisonPoint[ conditionIndex ], NULL);
-		
+
 		if ( count > 0) gBonesFound = TRUE;
 
 		// damaged garrisoned
@@ -1147,15 +1145,15 @@ void GarrisonContain::loadGarrisonPoints( void )
 
 		// restore the original condition flags
 		draw->replaceModelConditionFlags( originalFlags );
-		
-	}  // end if, draw
 
-	// garrison points are now initialized 
+	}
+
+	// garrison points are now initialized
 	m_garrisonPointsInitialized = TRUE;
 
 
 
-	if (gBonesFound && modData->m_mobileGarrison && (getObject()->isMobile() == TRUE) ) 
+	if (gBonesFound && modData->m_mobileGarrison && (getObject()->isMobile() == TRUE) )
 	{
 		DEBUG_ASSERTCRASH( getObject()->isMobile() == FALSE,
 		 ("GarrisonContain::update - You have specified this garrisonContain as mobile,\n yet you want garrison point placement bones... \n what are you thinking?") );
@@ -1163,7 +1161,7 @@ void GarrisonContain::loadGarrisonPoints( void )
 
 
 
-}  // end loadGarrisonPoints
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Validate any exit rally point that has been chosen (if any).  If it's not valid,
@@ -1187,7 +1185,7 @@ void GarrisonContain::validateRallyPoint( void )
 		if( ThePartitionManager->findPositionAround( &m_exitRallyPoint, &options, &result ) == FALSE )
 			m_rallyValid = FALSE;
 
-	}  // end if
+	}
 
 	// if no rally point is present, try to find one
 	if( m_rallyValid == FALSE )
@@ -1203,9 +1201,9 @@ void GarrisonContain::validateRallyPoint( void )
 		m_rallyValid = ThePartitionManager->findPositionAround( getObject()->getPosition(),
 																													  &options,
 																													  &m_exitRallyPoint );
-	}  // end if
+	}
 
-}  // end validateRallyPoint
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove all contents of this container.  We will try to do so with intelligent garrison
@@ -1230,14 +1228,14 @@ void GarrisonContain::removeAllContained( Bool exposeStealthUnits )
 		// validate the current rally point is still a good one, or pick a new one
 		validateRallyPoint();
 
-	}  // end if
+	}
 
 	// call the base class to extend functionality and do the actual removal
 	OpenContain::removeAllContained( exposeStealthUnits );
 
 	recalcApparentControllingPlayer();
 
-}  // end removeAllContained
+}
 
 // ------------------------------------------------------------------------------------------------
 /** 'exitObj' is one of the things we contain, it needs to 'exit' us */
@@ -1246,7 +1244,7 @@ void GarrisonContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor
 {
 	DEBUG_ASSERTCRASH(exitDoor == DOOR_1, ("multiple exit doors not supported here"));
 
-	// We don't use the ExitPath system of the general OpenContain, we just send people out.  The 
+	// We don't use the ExitPath system of the general OpenContain, we just send people out.  The
 	// direction of outing has been picked by Design to be the Screen Down at the default camera angle.
 	removeFromContain( exitObj );
 
@@ -1254,14 +1252,14 @@ void GarrisonContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor
 	Coord3D endPosition;
 
 	Real exitAngle = getObject()->getOrientation();
-	// Garrison doesn't have reserveDoor or exitDelay, so if we do nothing, everyone will appear on top 
+	// Garrison doesn't have reserveDoor or exitDelay, so if we do nothing, everyone will appear on top
 	// of each other and get stuck inside each others' extent (except for the first guy).  So we'll
 	// scatter the start point around a little to make it better.
 	startPosition = *getObject()->getPosition();
 	// In the case of cliff bunkers, the units start in a cliff.  So we want to adjust.
 	AIUpdateInterface  *ai = exitObj->getAI();
 	if (ai) {
-		Locomotor *loco = ai->getCurLocomotor(); 
+		Locomotor *loco = ai->getCurLocomotor();
 		if (loco && !TheAI->pathfinder()->validMovementTerrain( LAYER_GROUND, loco, &startPosition)) {
 			// try front & back.
 			Real offset = getObject()->getGeometryInfo().getMajorRadius();
@@ -1321,12 +1319,12 @@ void GarrisonContain::onContaining( Object *obj )
 
 	//
 	// the team of the building is now the same as those that have garrisoned it, be sure
-	// to save our original team tho so that we can revert back to it when all the 
+	// to save our original team tho so that we can revert back to it when all the
 	// occupants are gone
 	//
 	recalcApparentControllingPlayer();
 
-}  // end onContaining
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1368,7 +1366,7 @@ void GarrisonContain::onRemoving( Object *obj )
 			draw->clearModelConditionState( MODELCONDITION_GARRISONED );
 		}
 
-	}  // end if
+	}
 	else if( getStealthUnitsContained() != getContainCount() )
 	{
 		m_hideGarrisonedStateFromNonallies = false;
@@ -1379,7 +1377,7 @@ void GarrisonContain::onRemoving( Object *obj )
 	obj->setSafeOcclusionFrame(TheGameLogic->getFrame()+obj->getTemplate()->getOcclusionDelay());
 
 	recalcApparentControllingPlayer();
-}  // end onRemoving
+}
 
 // ------------------------------------------------------------------------------------------------
 /** A GarrisonContain always lets people shoot out */
@@ -1389,7 +1387,7 @@ Bool GarrisonContain::isPassengerAllowedToFire() const
 
 	return TRUE;
 
-}  // end isPassengerAllowedToFire
+}
 
 // ------------------------------------------------------------------------------------------------
 /** A Mobile garrison keeps its occupants with it when it moves */
@@ -1444,7 +1442,7 @@ void GarrisonContain::onObjectCreated()
 		}
 		else
 		{
-			DEBUG_CRASH( ( "DeliverPayload: PutInContainer %s is full, or not valid for the payload %s!", 
+			DEBUG_CRASH( ( "DeliverPayload: PutInContainer %s is full, or not valid for the payload %s!",
 				object->getName().str(), self->m_initialRoster.templateName.str() ) );
 		}
 	}
@@ -1459,7 +1457,7 @@ void GarrisonContain::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1491,16 +1489,16 @@ void GarrisonContain::xfer( Xfer *xfer )
 			if( m_originalTeam == NULL )
 			{
 
-				DEBUG_CRASH(( "GarrisonContain::xfer - Unable to find original team by id\n" ));
+				DEBUG_CRASH(( "GarrisonContain::xfer - Unable to find original team by id" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else
 			m_originalTeam = NULL;
 
-	}  // end if
+	}
 
 	xfer->xferBool( &m_hideGarrisonedStateFromNonallies );
 
@@ -1520,7 +1518,7 @@ void GarrisonContain::xfer( Xfer *xfer )
 
 			// target
 			xfer->xferObjectID( &m_garrisonPointData[ i ].targetID );
-			
+
 			// placement frame
 			xfer->xferUnsignedInt( &m_garrisonPointData[ i ].placeFrame );
 
@@ -1532,7 +1530,7 @@ void GarrisonContain::xfer( Xfer *xfer )
 			DrawableID drawableID = draw ? draw->getID() : INVALID_DRAWABLE_ID;
 			xfer->xferDrawableID( &drawableID );
 
-		}  // end if, save
+		}
 		else
 		{
 
@@ -1543,7 +1541,7 @@ void GarrisonContain::xfer( Xfer *xfer )
 			// target
 			ObjectID targetID;
 			xfer->xferObjectID( &targetID );
-			
+
 			// placement frame
 			UnsignedInt placeFrame;
 			xfer->xferUnsignedInt( &placeFrame );
@@ -1566,11 +1564,11 @@ void GarrisonContain::xfer( Xfer *xfer )
 				m_garrisonPointData[ i ].lastEffectFrame = lastEffectFrame;
 				m_garrisonPointData[ i ].effectID = drawableID;
 
-			}  // end if
+			}
 
-		}  // end else, load
+		}
 
-	}  // end for i
+	}
 
 	// garrison points in use
 	xfer->xferInt( &m_garrisonPointsInUse );
@@ -1587,7 +1585,7 @@ void GarrisonContain::xfer( Xfer *xfer )
 	// exit rally point
 	xfer->xferCoord3D( &m_exitRallyPoint );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1602,7 +1600,7 @@ void GarrisonContain::loadPostProcess( void )
 	for( Int i = 0; i < MAX_GARRISON_POINTS; i++ )
 	{
 
-		// object pointer		
+		// object pointer
 		if( m_garrisonPointData[ i ].objectID != INVALID_ID )
 		{
 
@@ -1610,12 +1608,12 @@ void GarrisonContain::loadPostProcess( void )
 			if( m_garrisonPointData[ i ].object == NULL )
 			{
 
-				DEBUG_CRASH(( "GarrisonContain::loadPostProcess - Unable to find object for point data\n" ));
+				DEBUG_CRASH(( "GarrisonContain::loadPostProcess - Unable to find object for point data" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else
 			m_garrisonPointData[ i ].object = NULL;
 
@@ -1627,18 +1625,18 @@ void GarrisonContain::loadPostProcess( void )
 			if( m_garrisonPointData[ i ].effect == NULL )
 			{
 
-				DEBUG_CRASH(( "GarrisonContain::loadPostProcess - Unable to find effect for point data\n" ));
+				DEBUG_CRASH(( "GarrisonContain::loadPostProcess - Unable to find effect for point data" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else
 			m_garrisonPointData[ i ].effect = NULL;
 
-	}  // end for i
+	}
 
-}  // end loadPostProcess
+}
 
 
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/HealContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/HealContain.cpp
index 818f4ae6de7..4885ab2570d 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/HealContain.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/HealContain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameLogic/Damage.h"
 #include "GameLogic/GameLogic.h"
@@ -48,7 +48,7 @@ HealContainModuleData::HealContainModuleData( void )
 
 	m_framesForFullHeal = 0;
 
-}  // end HealContainModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -57,7 +57,7 @@ HealContainModuleData::HealContainModuleData( void )
 
   OpenContainModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "TimeForFullHeal", INI::parseDurationUnsignedInt, NULL, offsetof( HealContainModuleData, m_framesForFullHeal ) },
 		{ 0, 0, 0, 0 }
@@ -65,7 +65,7 @@ HealContainModuleData::HealContainModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -77,14 +77,14 @@ HealContain::HealContain( Thing *thing, const ModuleData *moduleData )
 					 : OpenContain( thing, moduleData )
 {
 
-}  // end HealContain
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 HealContain::~HealContain( void )
 {
 
-}  // end ~HealContain
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Per frame update */
@@ -123,13 +123,13 @@ UpdateSleepTime HealContain::update( void )
 			ExitDoorType exitDoor = reserveDoorForExit(obj->getTemplate(), obj);
 			if (exitDoor != DOOR_NONE_AVAILABLE)
 				exitObjectViaDoor( obj, exitDoor );
-		}  // end if
+		}
 
-	}  // end for, it
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do the healing for a single object for a single frame. */
@@ -150,17 +150,17 @@ Bool HealContain::doHeal( Object *obj, UnsignedInt framesForFullHeal )
 	// if we've been in here long enough ... set our health to max
 	if( TheGameLogic->getFrame() - obj->getContainedByFrame() >= framesForFullHeal )
 	{
-	
+
 		// set the amount to max just to be sure we're at the top
 		healInfo.in.m_amount = body->getMaxHealth();
-		
+
 		// set max health
 		body->attemptHealing( &healInfo );
 
 		// we're done healing
 		doneHealing = TRUE;
 
-	}  // end if
+	}
 	else
 	{
 
@@ -174,12 +174,12 @@ Bool HealContain::doHeal( Object *obj, UnsignedInt framesForFullHeal )
 		// do the healing
 		body->attemptHealing( &healInfo );
 
-	}  // end else
+	}
 
 	// return if we're done healing
 	return doneHealing;
-				
-}  // end doHeal
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -190,7 +190,7 @@ void HealContain::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -208,7 +208,7 @@ void HealContain::xfer( Xfer *xfer )
 	// extend base class
 	OpenContain::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -219,4 +219,4 @@ void HealContain::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/MobNexusContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/MobNexusContain.cpp
index cd498acb938..3e729bc9471 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/MobNexusContain.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/MobNexusContain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/ThingTemplate.h"
 #include "Common/ThingFactory.h"
@@ -73,7 +73,7 @@ void MobNexusContainModuleData::parseInitialPayload( INI* ini, void *instance, v
 	const char* name = ini->getNextToken();
 	const char* countStr = ini->getNextTokenOrNull();
 	Int count = countStr ? INI::scanInt(countStr) : 1;
-	
+
 	self->m_initialPayload.name.set(name);
 	self->m_initialPayload.count = count;
 }
@@ -84,7 +84,7 @@ void MobNexusContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   OpenContainModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Slots",	INI::parseInt,		NULL, offsetof( MobNexusContainModuleData, m_slotCapacity ) },
 		{ "ScatterNearbyOnExit",	INI::parseBool,		NULL, offsetof( MobNexusContainModuleData, m_scatterNearbyOnExit ) },
@@ -105,8 +105,8 @@ void MobNexusContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Int MobNexusContain::getContainMax( void ) const 
-{ 
+Int MobNexusContain::getContainMax( void ) const
+{
 	if (getMobNexusContainModuleData())
 		return getMobNexusContainModuleData()->m_slotCapacity;
 
@@ -116,7 +116,7 @@ Int MobNexusContain::getContainMax( void ) const
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-MobNexusContain::MobNexusContain( Thing *thing, const ModuleData *moduleData ) : 
+MobNexusContain::MobNexusContain( Thing *thing, const ModuleData *moduleData ) :
 								 OpenContain( thing, moduleData )
 {
 	m_extraSlotsInUse = 0;
@@ -131,8 +131,8 @@ MobNexusContain::~MobNexusContain( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-/** 
-	can this container contain this kind of object? 
+/**
+	can this container contain this kind of object?
 	and, if checkCapacity is TRUE, does this container have enough space left to hold the given unit?
 */
 Bool MobNexusContain::isValidContainerFor(const Object* rider, Bool checkCapacity) const
@@ -143,7 +143,7 @@ Bool MobNexusContain::isValidContainerFor(const Object* rider, Bool checkCapacit
 		return false;
 
 	//The point of this new code is to determine when something has a negative 1 contain max, to
-	//look at the object inside of it to use that as the valid check. There is a case, when a 
+	//look at the object inside of it to use that as the valid check. There is a case, when a
 	//paratrooper (an infantry contained in a parachute). In this case, when we pass this object
 	//to contain in a --- plane, we want to check the infantry, not the parachute.
 //	const MobNexusContainModuleData *modData = getMobNexusContainModuleData();
@@ -221,7 +221,7 @@ void MobNexusContain::onContaining( Object *rider )
 		if( draw )
 			draw->setModelConditionState( MODELCONDITION_LOADED );
 
-	}  // end if
+	}
 
 }
 
@@ -289,11 +289,11 @@ void MobNexusContain::onRemoving( Object *rider )
 		if( draw )
 			draw->clearModelConditionState( MODELCONDITION_LOADED );
 
-	}  // end if
+	}
 
 	if (getObject()->isAboveTerrain())
 	{
-		// temporarily mark the guy as being allowed to fall 
+		// temporarily mark the guy as being allowed to fall
 		// (overriding his locomotor's stick-to-ground attribute).
 		// this will be reset (by PhysicsBehavior) when he touches the ground.
 		PhysicsBehavior* physics = rider->getPhysics();
@@ -389,8 +389,8 @@ ExitDoorType MobNexusContain::reserveDoorForExit( const ThingTemplate* objType,
 	// This is an override, not an extend.  I will check for game legality for
 	// okaying the call to exitObjectViaDoor.
   Object *me = getObject();
- 
-	// this is present solely for some MobNexuss to override, so that they can land before 
+
+	// this is present solely for some MobNexuss to override, so that they can land before
 	// allowing people to exit...
 	AIUpdateInterface* ai = me->getAIUpdateInterface();
 	if (ai && ai->getAiFreeToExit(me) != FREE_TO_EXIT)
@@ -399,7 +399,7 @@ ExitDoorType MobNexusContain::reserveDoorForExit( const ThingTemplate* objType,
   // I can always kick people out if I am in the air, I know what I'm doing
   if( me->isUsingAirborneLocomotor() )
    	return DOOR_1;
- 
+
   const Coord3D *myPosition = me->getPosition();
  	if( !specificObject->getAIUpdateInterface() )
 	{
@@ -409,7 +409,7 @@ ExitDoorType MobNexusContain::reserveDoorForExit( const ThingTemplate* objType,
   // He can't get to this spot naturally, so I can't force him there.  (amphib MobNexus)
   if( ! TheAI->pathfinder()->validMovementTerrain(me->getLayer(), hisLocomotor, myPosition ) )
    	return DOOR_NONE_AVAILABLE;
- 
+
   return DOOR_1;
 }
 
@@ -462,7 +462,7 @@ void MobNexusContain::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -483,7 +483,7 @@ void MobNexusContain::xfer( Xfer *xfer )
 	// extra slots in use
 	xfer->xferInt( &m_extraSlotsInUse );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -494,4 +494,4 @@ void MobNexusContain::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
index 589c50c0525..659ae112d51 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
@@ -25,13 +25,13 @@
 // FILE: OpenContain.cpp //////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, November 2001
 // Desc:   The OpenContain ContainModule allows objects to be contained inside of other
-//				 objects.  There is a set of functionality that will be common to 
+//				 objects.  There is a set of functionality that will be common to
 //				 all container modules that provides the actual containment
 //				 implementations, those implementations are found here
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BitFlagsIO.h"
 #include "Common/GameAudio.h"
@@ -57,11 +57,6 @@
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -83,15 +78,15 @@ OpenContainModuleData::OpenContainModuleData( void )
  	m_allowAlliesInside = TRUE;
  	m_allowEnemiesInside = TRUE;
  	m_allowNeutralInside = TRUE;
-}  // end OpenContainModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void OpenContainModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void OpenContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ContainMax",								INI::parseInt, NULL, offsetof( OpenContainModuleData, m_containMax ) },
 		{ "EnterSound",								INI::parseAudioEventRTS,		NULL, offsetof( OpenContainModuleData, m_enterSound ) },
@@ -130,13 +125,12 @@ OpenContain::OpenContain( Thing *thing, const ModuleData* moduleData ) : UpdateM
 	m_lastLoadSoundFrame = 0;
 	m_containListSize = 0;
 	m_stealthUnitsContained = 0;
+	m_heroUnitsContained = 0;
+	m_xferVersion = 1;
 	m_doorCloseCountdown = 0;
 
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_rallyPoint.zero();
 	m_rallyPointExists = FALSE;
-	//
 	m_conditionState.clear();
 	m_firePointStart = -1;
 	m_firePointNext = 0;
@@ -146,9 +140,9 @@ OpenContain::OpenContain( Thing *thing, const ModuleData* moduleData ) : UpdateM
 	m_loadSoundsEnabled = TRUE;
 
 	for( Int i = 0; i < MAX_FIRE_POINTS; i++ )
-	{		
+	{
 		m_firePoints[ i ].Make_Identity();
-	}  // end for i
+	}
 
 }
 
@@ -160,7 +154,7 @@ Int OpenContain::getContainMax( void ) const
 
 	return modData->m_containMax;
 
-}  // end getContainMax
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -168,13 +162,13 @@ OpenContain::~OpenContain()
 {
 
 	// sanity, the system should be cleaning these up itself if all is going well
-	DEBUG_ASSERTCRASH( m_containList.empty(), 
-										 ("OpenContain %s: destroying a container that still has items in it!\n", 
+	DEBUG_ASSERTCRASH( m_containList.empty(),
+										 ("OpenContain %s: destroying a container that still has items in it!",
 										  getObject()->getTemplate()->getName().str() ) );
 
 	// sanity
 	DEBUG_ASSERTCRASH( m_xferContainIDList.empty(),
-										 ("OpenContain %s: m_xferContainIDList is not empty but should be\n", 
+										 ("OpenContain %s: m_xferContainIDList is not empty but should be",
 											getObject()->getTemplate()->getName().str() ) );
 
 }
@@ -213,16 +207,16 @@ UpdateSleepTime OpenContain::update( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void OpenContain::addOrRemoveObjFromWorld(Object* obj, Bool add) 
-{ 
+void OpenContain::addOrRemoveObjFromWorld(Object* obj, Bool add)
+{
 
 	//
 	// it's expensive to add and remove structures from the pathfinder, but we really shouldn't
-	// be doing it anyway as it doesn't make much sense to contain a structure, but we'll 
+	// be doing it anyway as it doesn't make much sense to contain a structure, but we'll
 	// check for it here and print a warning
 	//
 	if( obj->isKindOf( KINDOF_STRUCTURE ) )
-		DEBUG_LOG(( "WARNING: Containing/Removing structures like '%s' is potentially a very expensive and slow operation\n",
+		DEBUG_LOG(( "WARNING: Containing/Removing structures like '%s' is potentially a very expensive and slow operation",
 								obj->getTemplate()->getName().str() ));
 
 
@@ -256,7 +250,7 @@ void OpenContain::addOrRemoveObjFromWorld(Object* obj, Bool add)
 
 	}
 
-	// if we're a non-enclosing container (eg, parachute), and we're inside an 
+	// if we're a non-enclosing container (eg, parachute), and we're inside an
 	// enclosing container (eg, b52), we need to be able to show/hide the contained riders...
 	if( obj->getContain() )
 	{
@@ -284,7 +278,7 @@ void OpenContain::addToContain( Object *rider )
 	if( rider == NULL )
 		return;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if( !isValidContainerFor( rider, false ) )
 	{
 		Object *reportObject = rider;
@@ -305,7 +299,7 @@ void OpenContain::addToContain( Object *rider )
 	if( rider->getContainedBy() != NULL )
 	{
 
-		DEBUG_LOG(( "'%s' is trying to contain '%s', but '%s' is already contained by '%s'\n",
+		DEBUG_LOG(( "'%s' is trying to contain '%s', but '%s' is already contained by '%s'",
 								getObject()->getTemplate()->getName().str(),
 								rider->getTemplate()->getName().str(),
 								rider->getTemplate()->getName().str(),
@@ -324,8 +318,11 @@ void OpenContain::addToContain( Object *rider )
 		addOrRemoveObjFromWorld(rider, false);
 	}
 
-	// ensure our contents are positions correctly.
+#if RETAIL_COMPATIBLE_CRC
+	// ensure our occupants are positioned correctly.
+	// TheSuperHackers @info Moving this call elsewhere will cause retail mismatch.
 	redeployOccupants();
+#endif
 
 	// trigger an onContaining event for the object that just "ate" something
 	if( getObject()->getContain() )
@@ -333,6 +330,13 @@ void OpenContain::addToContain( Object *rider )
 		getObject()->getContain()->onContaining( rider );
 	}
 
+	// ensure our occupants are positioned correctly.
+	// TheSuperHackers @fix Skyaero 10/07/2025 Now (re)deploys the occupants after the garrison points
+	// had a chance to initialize with prior call to onContaining(). No user facing bug was observed.
+#if !RETAIL_COMPATIBLE_CRC
+	redeployOccupants();
+#endif
+
 	// trigger an onContainedBy event for the object that just got "eaten" by us
 	rider->onContainedBy( getObject() );
 
@@ -350,6 +354,10 @@ void OpenContain::addToContainList( Object *rider )
 	{
 		m_stealthUnitsContained++;
 	}
+	if( rider->isKindOf( KINDOF_HERO ) )
+	{
+		m_heroUnitsContained++;
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -372,7 +380,7 @@ void OpenContain::removeFromContain( Object *rider, Bool exposeStealthUnits )
 	if( containedBy != getObject() )
 	{
 
-		DEBUG_LOG(( "'%s' is trying to un-contain '%s', but '%s' is really contained by '%s'\n",
+		DEBUG_LOG(( "'%s' is trying to un-contain '%s', but '%s' is really contained by '%s'",
 								getObject()->getTemplate()->getName().str(),
 								rider->getTemplate()->getName().str(),
 								rider->getTemplate()->getName().str(),
@@ -386,7 +394,7 @@ void OpenContain::removeFromContain( Object *rider, Bool exposeStealthUnits )
 	{
 		// note that this invalidates the iterator!
 		removeFromContainViaIterator( it, exposeStealthUnits );
-	}	
+	}
 
 }
 
@@ -403,9 +411,9 @@ void OpenContain::removeAllContained( Bool exposeStealthUnits )
  		// note that this invalidates the iterator!
  		removeFromContainViaIterator( it, exposeStealthUnits );
 
-	}  // end while
+	}
 
-}  // end removeAllContained
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -467,11 +475,11 @@ void OpenContain::iterateContained( ContainIterateFunc func, void *userData, Boo
 		{
 			// save the rider...
 			Object* rider = *it;
-			
+
 			// incr the iterator BEFORE calling the func (if the func removes the rider,
 			// the iterator becomes invalid)
 			++it;
-			
+
 			// call it
 			(*func)( rider, userData );
 		}
@@ -484,11 +492,11 @@ void OpenContain::iterateContained( ContainIterateFunc func, void *userData, Boo
 		{
 			// save the rider...
 			Object* rider = *it;
-			
+
 			// incr the iterator BEFORE calling the func (if the func removes the rider,
 			// the iterator becomes invalid)
 			++it;
-			
+
 			// call it
 			(*func)( rider, userData );
 		}
@@ -516,7 +524,7 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,
 
 /*
 	#ifdef RTS_DEBUG
-		TheInGameUI->message( UnicodeString( L"'%S(%d)' no longer contains '%S(%d)'" ), 
+		TheInGameUI->message( L"'%S(%d)' no longer contains '%S(%d)'",
 													getObject()->getTemplate()->getName().str(),
 													getObject()->getID(),
 													itemToRemove->m_object->getTemplate()->getName().str(),
@@ -530,6 +538,7 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,
 	m_containListSize--;
 	if( rider->isKindOf( KINDOF_STEALTH_GARRISON ) )
 	{
+		DEBUG_ASSERTCRASH( m_stealthUnitsContained > 0, ("OpenContain::removeFromContainViaIterator - Removing stealth unit but stealth count is %d", m_stealthUnitsContained) );
 		m_stealthUnitsContained--;
 		if( exposeStealthUnits )
 		{
@@ -540,6 +549,11 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,
 			}
 		}
 	}
+	if( rider->isKindOf( KINDOF_HERO ) )
+	{
+		DEBUG_ASSERTCRASH( m_heroUnitsContained > 0, ("OpenContain::removeFromContainViaIterator - Removing hero but hero count is %d", m_heroUnitsContained) );
+		m_heroUnitsContained--;
+	}
 
 
 	if (isEnclosingContainerFor( rider ))
@@ -559,7 +573,7 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,
 	{
 		getObject()->getContain()->onRemoving( rider );
 	}
-		
+
 	// trigger an onRemovedFrom event for 'remove'
 	DEBUG_ASSERTCRASH(getObject()->getContain() == this, ("hmm, wrong container 2"));
 	rider->onRemovedFrom( getObject() );
@@ -575,7 +589,7 @@ void OpenContain::scatterToNearbyPosition(Object* rider)
 	// for now we will just set the position of the object that is being removed from us
 	// at a random angle away from our center out some distance
 	//
-	
+
 	//
 	// pick an angle that is in the view of the current camera position so that
 	// the thing will come out "toward" the player and they can see it
@@ -607,18 +621,18 @@ void OpenContain::scatterToNearbyPosition(Object* rider)
 		ai->ignoreObstacle(theContainer);
 		ai->aiMoveToPosition( &pos, CMD_FROM_AI );
 
-	}  // end if
+	}
 	else
 	{
 
 		// no ai, just set position at the target pos
 		rider->setPosition( &pos );
 
-	}  // end else
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
-void OpenContain::onContaining( Object * /*rider*/ )
+void OpenContain::onContaining( Object *rider )
 {
 	// Play audio
 	if( m_loadSoundsEnabled )
@@ -630,7 +644,7 @@ void OpenContain::onContaining( Object * /*rider*/ )
 }
 
 //-------------------------------------------------------------------------------------------------
-void OpenContain::onRemoving( Object *rider) 
+void OpenContain::onRemoving( Object *rider)
 {
 	// Play audio
 	AudioEventRTS exitSound = *getObject()->getTemplate()->getSoundExit();
@@ -686,11 +700,11 @@ void OpenContain::onCollide( Object *other, const Coord3D *loc, const Coord3D *n
 	{
 		// save the rider...
 		Object* rider = *it;
-		
+
 		// incr the iterator BEFORE calling the func (if the func removes the rider,
 		// the iterator becomes invalid)
 		++it;
-		
+
 		// call it
 		if( rider->getControllingPlayer() != other->getControllingPlayer() )
 		{
@@ -718,7 +732,7 @@ void OpenContain::onCollide( Object *other, const Coord3D *loc, const Coord3D *n
 		return;
 
 	addToContain(other);
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -750,11 +764,11 @@ void OpenContain::onDie( const DamageInfo * damageInfo )
 
 	killRidersWhoAreNotFreeToExit();
 
-	// Leaving this commented out to show it can't work.  We are about to die, so they will have zero 
+	// Leaving this commented out to show it can't work.  We are about to die, so they will have zero
 	// chance to hit an exitState::Update.  At least we would clean them up in onDelete.
 //	orderAllPassengersToExit( CMD_FROM_AI );
 	removeAllContained();
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Check to see if we are a valid container for 'obj' */
@@ -783,31 +797,31 @@ Bool OpenContain::isValidContainerFor(const Object* obj, Bool checkCapacity) con
  			if( modData->m_allowAlliesInside == FALSE )
  				relationshipRestricted = TRUE;
  			break;
- 
+
  		case ENEMIES:
  			if( modData->m_allowEnemiesInside == FALSE )
  				relationshipRestricted = TRUE;
  			break;
- 
+
  		case NEUTRAL:
  			if( modData->m_allowNeutralInside == FALSE )
  				relationshipRestricted = TRUE;
  			break;
- 
+
  		default:
  			DEBUG_CRASH(( "isValidContainerFor: Undefined relationship (%d) between '%s' and '%s'",
  										r, getObject()->getTemplate()->getName().str(),
  										obj->getTemplate()->getName().str() ));
  			return FALSE;
- 
- 	}  // end switch
+
+ 	}
  	if( relationshipRestricted == TRUE )
  		return FALSE;
- 
+
 	// all is well
 	return true;
 
-}  // end isValidContainerFor
+}
 
 // ------------------------------------------------------------------------------------------------
 /**
@@ -829,7 +843,7 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 	m_doorCloseCountdown = getOpenContainModuleData()->m_doorOpenTime;
 	if (m_doorCloseCountdown)
 	{
-		// srj sez: only diddle the doors if this countdown is nonzero. 
+		// srj sez: only diddle the doors if this countdown is nonzero.
 		// this allows us to prevent this module from messing with the doors
 		// at all, which is required for DeliverPayloadAIUpdate.
 		/// @todo srj -- for now, OpenContain assumes at most one door
@@ -854,7 +868,7 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 				startBone.concat('0');
 				endBone.concat('0');
 			}
-			
+
 			m_whichExitPath = (m_whichExitPath % numberExits) + 1;// To cycle from 1 to n
 
 			startBone.concat(suffix);
@@ -868,20 +882,20 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 		PhysicsBehavior *physics = exitObj->getPhysics();
 		// Can fall problem - When units exit from planes, they are airborne for a while as they drop.
 		// Airborne units dont' do pathfinding, and this is fine.
-		// However, amphibious transports unload 3 feet off the ground.  This is enough to trigger the 
+		// However, amphibious transports unload 3 feet off the ground.  This is enough to trigger the
 		// airborne flag, and they don't pathfind.  So they all unload at the same exact point, and life
-		// is ugly.  So temporarily, we turn off the allowToFall flag, so they aren't considered airborne, 
+		// is ugly.  So temporarily, we turn off the allowToFall flag, so they aren't considered airborne,
 		// and their final destination (adjustToPossibleDestination) considers them as pathfinding, so they
 		// don't stack up.  Then we turn the flag back, so if they are parachuting, they can fly down
 		//  on their parachute.  jba.
 		Bool canFall = false;
-		if (physics) 
+		if (physics)
 		{
 			canFall = physics->getAllowToFall();
 		}
 		exitObj->setPosition( &startPosition );
 		exitObj->setOrientation( exitAngle );
-		
+
 		// Per JohnA: We need to set our layer to match our transports layer, or we'll try to pick a spot
 		// on the ground.
 		exitObj->setLayer( me->getLayer() );
@@ -890,7 +904,7 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 		AIUpdateInterface *ai = exitObj->getAI();
 		AIUpdateInterface *myAi = me->getAI();
 		TheAI->pathfinder()->addObjectToPathfindMap( exitObj );
-		if (ai) 
+		if (ai)
 		{
 			if (myAi && myAi->isIdle() && me->isKindOf(KINDOF_VEHICLE)) {
 				TheAI->pathfinder()->removeUnitFromPathfindMap(me);
@@ -912,7 +926,7 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 
 		if( ai )
 		{
-			if (physics) 
+			if (physics)
 			{
 				physics->setAllowToFall(false);
 			}
@@ -921,7 +935,7 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 
 			TheAI->pathfinder()->updateGoal(exitObj, &endPosition, TheTerrainLogic->getLayerForDestination(&endPosition));
 		}
-		if (physics) 
+		if (physics)
 		{
 			physics->setAllowToFall(canFall);
 		}
@@ -948,7 +962,7 @@ void OpenContain::exitObjectInAHurry( Object *exitObj )
 	m_doorCloseCountdown = getOpenContainModuleData()->m_doorOpenTime;
 	if (m_doorCloseCountdown)
 	{
-		// srj sez: only diddle the doors if this countdown is nonzero. 
+		// srj sez: only diddle the doors if this countdown is nonzero.
 		// this allows us to prevent this module from messing with the doors
 		// at all, which is required for DeliverPayloadAIUpdate.
 		/// @todo srj -- for now, OpenContain assumes at most one door
@@ -973,7 +987,7 @@ void OpenContain::exitObjectInAHurry( Object *exitObj )
 				startBone.concat('0');
 				endBone.concat('0');
 			}
-			
+
 			m_whichExitPath = (m_whichExitPath % numberExits) + 1;// To cycle from 1 to n
 
 			startBone.concat(suffix);
@@ -986,7 +1000,7 @@ void OpenContain::exitObjectInAHurry( Object *exitObj )
 		Real exitAngle = me->getOrientation();
 		exitObj->setPosition( &startPosition );
 		exitObj->setOrientation( exitAngle );
-		
+
 		// Per JohnA: We need to set our layer to match our transports layer, or we'll try to pick a spot
 		// on the ground.
 		exitObj->setLayer( me->getLayer() );
@@ -995,7 +1009,7 @@ void OpenContain::exitObjectInAHurry( Object *exitObj )
 		AIUpdateInterface *ai = exitObj->getAI();
 		AIUpdateInterface *myAi = me->getAI();
 		TheAI->pathfinder()->addObjectToPathfindMap( exitObj );
-		if (ai) 
+		if (ai)
 		{
 			if (myAi && myAi->isIdle() && me->isKindOf(KINDOF_VEHICLE)) {
 				TheAI->pathfinder()->removeUnitFromPathfindMap(me);
@@ -1071,7 +1085,7 @@ void OpenContain::monitorConditionChanges( void )
 		m_conditionState = currCondition;
 	}
 
-}  // end monitorConditionChanges
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1099,7 +1113,7 @@ void OpenContain::redeployOccupants( void )
 		putObjAtNextFirePoint( *it );
 	}
 
-}  // end redeployOccupants
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Place the object at the 3D position of the next fire point to use */
@@ -1108,7 +1122,7 @@ void OpenContain::putObjAtNextFirePoint( Object *obj )
 {
 
 	//
-	// first, if we need to load the 3D point data from the art do so, if we've already 
+	// first, if we need to load the 3D point data from the art do so, if we've already
 	// determined there is no firepoints in the current art we will avoid searching for
 	// it all the time
 	//
@@ -1124,7 +1138,7 @@ void OpenContain::putObjAtNextFirePoint( Object *obj )
 		if( m_firePointSize == 0 )
 			m_noFirePointsInArt = TRUE;
 
-	}  // end if
+	}
 
 	//
 	// if there are no fire points in the art we just put the object at the center
@@ -1137,7 +1151,7 @@ void OpenContain::putObjAtNextFirePoint( Object *obj )
 		obj->setPosition( pos );
 		return;
 
-	}  // end if
+	}
 
 	// get the position
 	Matrix3D matrix;
@@ -1175,7 +1189,7 @@ void OpenContain::putObjAtNextFirePoint( Object *obj )
 	if( m_firePointNext >= m_firePointSize )
 		m_firePointNext = 0;
 
-}  // end putObjAtNextFirePoint
+}
 
 //-------------------------------------------------------------------------------------------------
 /**
@@ -1229,11 +1243,11 @@ void OpenContain::markAllPassengersDetected( )
 	{
 		// save the rider...
 		Object* rider = *it;
-		
+
 		// incr the iterator BEFORE calling the func (if the func removes the rider,
 		// the iterator becomes invalid)
 		++it;
-		
+
 		// call it
 		if( rider->isKindOf( KINDOF_STEALTH_GARRISON ) )
 		{
@@ -1260,11 +1274,11 @@ void OpenContain::orderAllPassengersToExit( CommandSourceType commandSource )
 	{
 		// save the rider...
 		Object* rider = *it;
-		
+
 		// incr the iterator BEFORE calling the func (if the func removes the rider,
 		// the iterator becomes invalid)
 		++it;
-		
+
 		// call it
 		if( rider->getAI() )
 			rider->getAI()->aiExit( getObject(), commandSource );
@@ -1274,23 +1288,22 @@ void OpenContain::orderAllPassengersToExit( CommandSourceType commandSource )
 //-------------------------------------------------------------------------------------------------
 void OpenContain::processDamageToContained()
 {
+	const OpenContainModuleData* data = getOpenContainModuleData();
+
+#if RETAIL_COMPATIBLE_CRC
+
 	const ContainedItemsList* items = getContainedItemsList();
 	if( items )
 	{
-		ContainedItemsList::const_iterator it;
-		it = items->begin();
+		ContainedItemsList::const_iterator it = items->begin();
+		const size_t listSize = items->size();
 
 		while( it != items->end() )
 		{
-			Object *object = *it;
-
-			//Advance to the next iterator before we apply the damage.
-			//It's possible that the damage will kill the unit and foobar
-			//the iterator list.
-			++it;
+			Object *object = *it++;
 
 			//Calculate the damage to be inflicted on each unit.
-			Real damage = object->getBodyModule()->getMaxHealth() * getOpenContainModuleData()->m_damagePercentageToUnits;
+			Real damage = object->getBodyModule()->getMaxHealth() * data->m_damagePercentageToUnits;
 
 			DamageInfo damageInfo;
 			damageInfo.in.m_damageType = DAMAGE_UNRESISTABLE;
@@ -1299,16 +1312,89 @@ void OpenContain::processDamageToContained()
 			damageInfo.in.m_amount = damage;
 			object->attemptDamage( &damageInfo );
 
-			if( !object->isEffectivelyDead() && getOpenContainModuleData()->m_damagePercentageToUnits == 1.0f )
-				object->kill(); // in case we are carrying flame proof troops we have been asked to kill			
+			if( !object->isEffectivelyDead() && data->m_damagePercentageToUnits == 1.0f )
+				object->kill(); // in case we are carrying flame proof troops we have been asked to kill
+
+			// TheSuperHackers @info Calls to Object::attemptDamage and Object::kill will not remove
+			// the occupant from the host container straight away. Instead it will be removed when the
+			// Object deletion is finalized in a Game Logic update. This will lead to strange behavior
+			// where the occupant will be removed after death with a delay. This behavior cannot be
+			// changed without breaking retail compatibility.
+
+			// TheSuperHackers @bugfix xezon 05/06/2025 Stop iterating when the list was cleared.
+			// This scenario can happen if the killed occupant(s) apply deadly damage on death
+			// to the host container, which then attempts to remove all remaining occupants
+			// on the death of the host container. This is reproducible by destroying a
+			// GLA Battle Bus with at least 2 half damaged GLA Terrorists inside.
+			if (listSize != items->size())
+			{
+				DEBUG_ASSERTCRASH( listSize == 0, ("List is expected empty") );
+				break;
+			}
+		}
+	}
+
+#else
+
+	// TheSuperHackers @bugfix xezon 05/06/2025 Temporarily empty the m_containList
+	// to prevent a potential child call to catastrophically modify the m_containList.
+	// This scenario can happen if the killed occupant(s) apply deadly damage on death
+	// to the host container, which then attempts to remove all remaining occupants
+	// on the death of the host container. This is reproducible by destroying a
+	// GLA Battle Bus with at least 2 half damaged GLA Terrorists inside.
+
+	// Caveat: While the m_containList is empty, it will not be possible to apply damage
+	// on death of a unit to another unit in the host container. If this functionality
+	// is desired, then this implementation needs to be revisited.
+
+	ContainedItemsList list;
+	m_containList.swap(list);
+	m_containListSize = 0;
+
+	ContainedItemsList::iterator it = list.begin();
+
+	while ( it != list.end() )
+	{
+		Object *object = *it;
+
+		DEBUG_ASSERTCRASH( object, ("Contain list must not contain NULL element") );
+
+		// Calculate the damage to be inflicted on each unit.
+		Real damage = object->getBodyModule()->getMaxHealth() * data->m_damagePercentageToUnits;
+
+		DamageInfo damageInfo;
+		damageInfo.in.m_damageType = DAMAGE_UNRESISTABLE;
+		damageInfo.in.m_deathType = DEATH_BURNED;
+		damageInfo.in.m_sourceID = getObject()->getID();
+		damageInfo.in.m_amount = damage;
+		object->attemptDamage( &damageInfo );
+
+		if( !object->isEffectivelyDead() && data->m_damagePercentageToUnits == 1.0f )
+			object->kill(); // in case we are carrying flame proof troops we have been asked to kill
+
+		if ( object->isEffectivelyDead() )
+		{
+			onRemoving( object );
+			object->onRemovedFrom( getObject() );
+			it = list.erase( it );
+		}
+		else
+		{
+			++it;
 		}
 	}
+
+	// Swap the list back where it belongs.
+	m_containList.swap(list);
+	m_containListSize = (UnsignedInt)m_containList.size();
+
+#endif // RETAIL_COMPATIBLE_CRC
 }
 
 //-------------------------------------------------------------------------------------------------
 Bool OpenContain::isEnclosingContainerFor( const Object * ) const
 {
-	return TRUE; 
+	return TRUE;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1363,20 +1449,27 @@ void OpenContain::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version */
+	* 1: Initial version
+	* 2: TheSuperHackers @tweak Serialize hero units contained count
+	*/
 // ------------------------------------------------------------------------------------------------
 void OpenContain::xfer( Xfer *xfer )
 {
 
-	// version 
-	const XferVersion currentVersion = 1;
+	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
+	XferVersion currentVersion = 1;
+#else
+	XferVersion currentVersion = 2;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
+	m_xferVersion = version;
 
 	// extend base class
 	UpdateModule::xfer( xfer );
@@ -1395,9 +1488,9 @@ void OpenContain::xfer( Xfer *xfer )
 			objectID = (*it)->getID();
 			xfer->xferObjectID( &objectID );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -1417,11 +1510,11 @@ void OpenContain::xfer( Xfer *xfer )
 			}
 			m_containList.clear();
 #else
-			DEBUG_CRASH(( "OpenContain::xfer - Contain list should be empty before load but is not\n" ));
+			DEBUG_CRASH(( "OpenContain::xfer - Contain list should be empty before load but is not" ));
 			throw SC_INVALID_DATA;
 #endif
 
-		}  // end if
+		}
 
 		// contain list size
 		xfer->xferUnsignedInt( &m_containListSize );
@@ -1436,9 +1529,9 @@ void OpenContain::xfer( Xfer *xfer )
 			// put on list for later processing once objects are loaded
 			m_xferContainIDList.push_back( objectID );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// player entered mask
 	xfer->xferUser( &m_playerEnteredMask, sizeof( PlayerMaskType ) );
@@ -1452,6 +1545,12 @@ void OpenContain::xfer( Xfer *xfer )
 	// stealth units contained
 	xfer->xferUnsignedInt( &m_stealthUnitsContained );
 
+	// hero units contained
+	if (version >= 2)
+	{
+		xfer->xferUnsignedInt( &m_heroUnitsContained );
+	}
+
 	// door close countdown
 	xfer->xferUnsignedInt( &m_doorCloseCountdown );
 
@@ -1498,20 +1597,20 @@ void OpenContain::xfer( Xfer *xfer )
 			enterExitType = (*it).second;
 			xfer->xferUser( &enterExitType, sizeof( ObjectEnterExitType ) );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
-		
+
 		// the map should be emtpy now
 		if( m_objectEnterExitInfo.empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "OpenContain::xfer - m_objectEnterExitInfo should be empty, but is not\n" ));
+			DEBUG_CRASH(( "OpenContain::xfer - m_objectEnterExitInfo should be empty, but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read all data items
 		for( UnsignedShort i = 0; i < enterExitCount; ++i )
@@ -1526,14 +1625,14 @@ void OpenContain::xfer( Xfer *xfer )
 			// assign
 			m_objectEnterExitInfo[ objectID ] = enterExitType;
 
-		}  // end for, i
+		}
+
+	}
 
-	}  // end else, load
-	
 	// which exit path
 	xfer->xferInt( &m_whichExitPath );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1549,10 +1648,10 @@ void OpenContain::loadPostProcess( void )
 	if( m_containList.empty() == FALSE )
 	{
 
-		DEBUG_CRASH(( "OpenContain::loadPostProcess - Contain list should be empty before load but is not\n" ));
+		DEBUG_CRASH(( "OpenContain::loadPostProcess - Contain list should be empty before load but is not" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// turn the contained id list into actual object pointers in the contain list
 	Object *obj;
@@ -1567,10 +1666,10 @@ void OpenContain::loadPostProcess( void )
 		if( obj == NULL )
 		{
 
-			DEBUG_CRASH(( "OpenContain::loadPostProcess - Unable to find object to put on contain list\n" ));
+			DEBUG_CRASH(( "OpenContain::loadPostProcess - Unable to find object to put on contain list" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// put object on list
 		m_containList.push_back( obj );
@@ -1582,13 +1681,26 @@ void OpenContain::loadPostProcess( void )
 		// record in the object who we are contained by
 		obj->friend_setContainedBy( us );
 
-	}  // end for, idIt
+	}
+
+	if (m_xferVersion < 2)
+	{
+		// Restore hero count by iterating hero objects for old save versions
+		m_heroUnitsContained = 0;
+		for( ContainedItemsList::const_iterator it = m_containList.begin(); it != m_containList.end(); ++it )
+		{
+			if( (*it)->isKindOf( KINDOF_HERO ) )
+			{
+				m_heroUnitsContained++;
+			}
+		}
+	}
 
 	// sanity
 	DEBUG_ASSERTCRASH( m_containListSize == m_containList.size(),
-										 ("OpenContain::loadPostProcess - contain list count mismatch\n") );
+										 ("OpenContain::loadPostProcess - contain list count mismatch") );
 
 	// clear the list as we don't need it anymore
 	m_xferContainIDList.clear();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp
index e84213ce62a..a67b4afe6f8 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp
@@ -33,7 +33,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/Xfer.h"
 #include "GameClient/ControlBar.h"
@@ -44,11 +44,6 @@
 #include "GameLogic/PartitionManager.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // ------------------------------------------------------------------------------------------------
@@ -63,7 +58,7 @@ void OverlordContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   TransportContainModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ 0, 0, 0, 0 }
 	};
@@ -72,7 +67,7 @@ void OverlordContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-OverlordContain::OverlordContain( Thing *thing, const ModuleData *moduleData ) : 
+OverlordContain::OverlordContain( Thing *thing, const ModuleData *moduleData ) :
 								 TransportContain( thing, moduleData )
 {
 	m_redirectionActivated = FALSE;
@@ -87,8 +82,8 @@ OverlordContain::~OverlordContain( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void OverlordContain::onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+void OverlordContain::onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState)  ///< state change callback
 {
 	// I can't use any convienience functions, as they will all get routed to the bunker I may carry.
@@ -142,15 +137,15 @@ void OverlordContain::onDie( const DamageInfo *damageInfo )
 	}
 	//Everything is fine if I am empty or carrying a regular guy.  If I have a redirected contain
 	// set up, then I need to handle the order of death explicitly, or things will become confused
-	// when I stop redirecting in the middle of the process.  Or I will get confused as my commands 
+	// when I stop redirecting in the middle of the process.  Or I will get confused as my commands
 	// get sucked up the pipe.
 
 	// So this is an extend that lets me control the order of death.
-	
+
 	deactivateRedirectedContain();
 	Object *myGuy = m_containList.front();
 	myGuy->kill();
-	
+
 	TransportContain::onDie( damageInfo );
 }
 
@@ -178,7 +173,7 @@ void OverlordContain::onCapture( Player *oldOwner, Player *newOwner )
 {
 	if( m_containListSize < 1 )
 		return;
-	
+
 	// Need to capture our specific rider.  He will then kick passengers out if he is a Transport
 	Object *myGuy = m_containList.front();
 	myGuy->setTeam( newOwner->getDefaultTeam() );
@@ -190,7 +185,7 @@ Bool OverlordContain::isGarrisonable() const
 	if( getRedirectedContain() == NULL )
 		return FALSE;
 
-	return getRedirectedContain()->isGarrisonable(); 
+	return getRedirectedContain()->isGarrisonable();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -198,8 +193,8 @@ Bool OverlordContain::isKickOutOnCapture()
 {
 	if( getRedirectedContain() == NULL )
 		return FALSE;// Me the Overlord doesn't want to
-	
-	return getRedirectedContain()->isKickOutOnCapture(); 
+
+	return getRedirectedContain()->isKickOutOnCapture();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -211,7 +206,7 @@ void OverlordContain::addToContainList( Object *obj )
 		TransportContain::addToContainList( obj );
 		return;
 	}
-	
+
 	getRedirectedContain()->addToContainList( obj );
 }
 
@@ -224,7 +219,7 @@ void OverlordContain::addToContain( Object *obj )
 		TransportContain::addToContain( obj );
 		return;
 	}
-	
+
 	getRedirectedContain()->addToContain( obj );
 
 }
@@ -258,7 +253,7 @@ void OverlordContain::removeAllContained( Bool exposeStealthUnits )
 		TransportContain::removeAllContained( exposeStealthUnits );
 		return;
 	}
-	
+
 	const ContainedItemsList *fullList = getRedirectedContain()->getContainedItemsList();
 
 	Object *obj;
@@ -283,7 +278,7 @@ void OverlordContain::iterateContained( ContainIterateFunc func, void *userData,
 		TransportContain::iterateContained( func, userData, reverse );
 		return;
 	}
-	
+
 	getRedirectedContain()->iterateContained( func, userData, reverse );
 }
 
@@ -305,7 +300,7 @@ void OverlordContain::onContaining( Object *obj )
 }
 
 //-------------------------------------------------------------------------------------------------
-void OverlordContain::onRemoving( Object *obj ) 
+void OverlordContain::onRemoving( Object *obj )
 {
 	// Do you mean me the Overlord, or my behavior of passing stuff on to my passengers?
 	if( getRedirectedContain() == NULL )
@@ -326,7 +321,7 @@ Bool OverlordContain::isValidContainerFor(const Object* obj, Bool checkCapacity)
 	// Do you mean me the Overlord, or my behavior of passing stuff on to my passengers?
 	if( getRedirectedContain() == NULL )
 		return TransportContain::isValidContainerFor( obj, checkCapacity );
-	
+
 	return getRedirectedContain()->isValidContainerFor( obj, checkCapacity );
 }
 
@@ -338,7 +333,7 @@ UnsignedInt OverlordContain::getContainCount() const
 	// Do you mean me the Overlord, or my behavior of passing stuff on to my passengers?
 	if( redir == NULL )
 		return TransportContain::getContainCount( );
-	
+
 	return redir->getContainCount();
 }
 
@@ -359,12 +354,12 @@ Bool OverlordContain::getContainerPipsToShow(Int& numTotal, Int& numFull)
 }
 
 //-------------------------------------------------------------------------------------------------
-Int OverlordContain::getContainMax( ) const 
-{ 
+Int OverlordContain::getContainMax( ) const
+{
 	// Do you mean me the Overlord, or my behavior of passing stuff on to my passengers?
 	if( getRedirectedContain() == NULL )
 		return TransportContain::getContainMax( );
-	
+
 	return getRedirectedContain()->getContainMax();
 }
 
@@ -374,7 +369,7 @@ const ContainedItemsList* OverlordContain::getContainedItemsList() const
 	// Do you mean me the Overlord, or my behavior of passing stuff on to my passengers?
 	if( getRedirectedContain() == NULL )
 		return TransportContain::getContainedItemsList( );
-	
+
 	return getRedirectedContain()->getContainedItemsList();
 }
 
@@ -397,14 +392,14 @@ Bool OverlordContain::isDisplayedOnControlBar() const
 	// Do you mean me the Overlord, or my behavior of passing stuff on to my passengers?
 	if( getRedirectedContain() == NULL )
 		return FALSE;//No need to call up inheritance, this is a module based question, and I say no.
-	
+
 	return getRedirectedContain()->isDisplayedOnControlBar();
 }
 
 //-------------------------------------------------------------------------------------------------
 const Object *OverlordContain::friend_getRider() const
 {
-// The draw order dependency bug for riders means that our draw module needs to cheat to get 
+// The draw order dependency bug for riders means that our draw module needs to cheat to get
 	//around it.	So this is another function that knows it is getting around redirection to ask
 	// an Overlord specific function.
 
@@ -417,14 +412,14 @@ const Object *OverlordContain::friend_getRider() const
 
 //-------------------------------------------------------------------------------------------------
 void OverlordContain::activateRedirectedContain()
-{ 
-	m_redirectionActivated = TRUE; 
+{
+	m_redirectionActivated = TRUE;
 }
 
 //-------------------------------------------------------------------------------------------------
 void OverlordContain::deactivateRedirectedContain()
-{ 
-	m_redirectionActivated = FALSE; 
+{
+	m_redirectionActivated = FALSE;
 }
 
 
@@ -434,7 +429,7 @@ void OverlordContain::deactivateRedirectedContain()
 // this gets called from
 void OverlordContain::clientVisibleContainedFlashAsSelected()
 {
-	// THIS OVERRIDES GRAHAMS NASTY OVERRIDE THING 
+	// THIS OVERRIDES GRAHAMS NASTY OVERRIDE THING
 	// SO WE CAN FLASH THE PORTABLE BUNKER INSTEAD OF ITS OCCUPANTS
 	const ContainedItemsList* items = TransportContain::getContainedItemsList();
 
@@ -454,7 +449,7 @@ void OverlordContain::clientVisibleContainedFlashAsSelected()
 					draw->flashAsSelected(); //WOW!
 				}
 			}
-			
+
 			++it;
 		}
 	}
@@ -471,7 +466,7 @@ void OverlordContain::crc( Xfer *xfer )
 	// extend base class
 	TransportContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -492,7 +487,7 @@ void OverlordContain::xfer( Xfer *xfer )
 	// redirection activated
 	xfer->xferBool( &m_redirectionActivated );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -503,4 +498,4 @@ void OverlordContain::loadPostProcess( void )
 	// extend base class
 	TransportContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp
index 37d6878d980..2cb5300b4a6 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/CRCDebug.h"
 #include "Common/Player.h"
@@ -49,17 +49,12 @@
 const Real NO_START_Z = 1e10;
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
-ParachuteContainModuleData::ParachuteContainModuleData() : 
+ParachuteContainModuleData::ParachuteContainModuleData() :
 	m_pitchRateMax(0),
 	m_rollRateMax(0),
 	m_lowAltitudeDamping(0.2f),
@@ -70,11 +65,11 @@ ParachuteContainModuleData::ParachuteContainModuleData() :
 }
 
 //-------------------------------------------------------------------------------------------------
-void ParachuteContainModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void ParachuteContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   OpenContainModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "PitchRateMax",	INI::parseAngularVelocityReal,		NULL, offsetof( ParachuteContainModuleData, m_pitchRateMax ) },
 		{ "RollRateMax",	INI::parseAngularVelocityReal,		NULL, offsetof( ParachuteContainModuleData, m_rollRateMax ) },
@@ -91,7 +86,7 @@ void ParachuteContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData ) : 
+ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData ) :
 								 OpenContain( thing, moduleData )
 {
 	m_opened = false;
@@ -103,9 +98,7 @@ ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData )
 	m_rollRate = 0;
 	m_isLandingOverrideSet = FALSE;
 	m_startZ = NO_START_Z;
-	
-	//Added By Sadullah Nader
-	//Initializations 
+
 	m_landingOverride.zero();
 	m_paraAttachBone.zero();
 	m_paraAttachOffset.zero();
@@ -116,7 +109,6 @@ ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData )
 	m_riderSwayBone.zero();
 	m_riderSwayOffset.zero();
 
-	//
 	const ParachuteContainModuleData* d = getParachuteContainModuleData();
 	if (d)
 	{
@@ -135,7 +127,7 @@ ParachuteContain::~ParachuteContain( void )
 
 //-------------------------------------------------------------------------------------------------
 /**
-	this is called whenever a drawable is bound to the object. 
+	this is called whenever a drawable is bound to the object.
 	drawable is NOT guaranteed to be non-null.
 */
 void ParachuteContain::onDrawableBoundToObject()
@@ -161,23 +153,23 @@ void ParachuteContain::updateBonePositions()
 	if (m_needToUpdateParaBones)
 	{
 		m_needToUpdateParaBones = false;	// yeah, even if not found.
-		
+
 		Drawable* parachuteDraw = getObject()->getDrawable();
 		if (parachuteDraw)
 		{
 			if (parachuteDraw->getPristineBonePositions( "PARA_COG", 0, &m_paraSwayBone, NULL, 1) != 1)
 			{
-				DEBUG_CRASH(("PARA_COG not found\n"));
+				DEBUG_CRASH(("PARA_COG not found"));
 				m_paraSwayBone.zero();
 			}
 
 			if (parachuteDraw->getPristineBonePositions( "PARA_ATTCH", 0, &m_paraAttachBone, NULL, 1 ) != 1)
 			{
-				DEBUG_CRASH(("PARA_ATTCH not found\n"));
+				DEBUG_CRASH(("PARA_ATTCH not found"));
 				m_paraAttachBone.zero();
 			}
 		}
-		//DEBUG_LOG(("updating para bone positions %d...\n",TheGameLogic->getFrame()));
+		//DEBUG_LOG(("updating para bone positions %d...",TheGameLogic->getFrame()));
 	}
 
 	if (m_needToUpdateRiderBones)
@@ -191,13 +183,13 @@ void ParachuteContain::updateBonePositions()
 		{
 			if (riderDraw->getPristineBonePositions( "PARA_MAN", 0, &m_riderAttachBone, NULL, 1) != 1)
 			{
-				//DEBUG_LOG(("*** No parachute-attach bone... using object height!\n"));
+				//DEBUG_LOG(("*** No parachute-attach bone... using object height!"));
 				m_riderAttachBone.zero();
 				m_riderAttachBone.z += riderDraw->getDrawableGeometryInfo().getMaxHeightAbovePosition();
 			}
 		}
 
-		//DEBUG_LOG(("updating rider bone positions %d...\n",TheGameLogic->getFrame()));
+		//DEBUG_LOG(("updating rider bone positions %d...",TheGameLogic->getFrame()));
 	}
 }
 
@@ -238,8 +230,8 @@ void ParachuteContain::updateOffsetsFromBones()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-/** 
-	can this container contain this kind of object? 
+/**
+	can this container contain this kind of object?
 	and, if checkCapacity is TRUE, does this container have enough space left to hold the given unit?
 */
 Bool ParachuteContain::isValidContainerFor(const Object* rider, Bool checkCapacity) const
@@ -298,11 +290,11 @@ UpdateSleepTime ParachuteContain::update( void )
 	Object* rider = (getContainCount() > 0) ? getContainList().front() : NULL;
 
 	if (m_startZ == NO_START_Z)	{
-		m_startZ = parachute->getPosition()->z;	
+		m_startZ = parachute->getPosition()->z;
 		Real groundHeight = TheTerrainLogic->getGroundHeight(parachute->getPosition()->x, parachute->getPosition()->y);
 		if (m_startZ-groundHeight < 2*d->m_paraOpenDist) {
 			// Oh dear - we ejected too close to the ground, and there isn't enough
-			// room to open the chute.  Well, since it's only a game, we'll fudge 
+			// room to open the chute.  Well, since it's only a game, we'll fudge
 			// a little so that the pilot doesn't slam into the ground & stick.
 			m_startZ = groundHeight+2*d->m_paraOpenDist;
 		}
@@ -325,7 +317,7 @@ UpdateSleepTime ParachuteContain::update( void )
 				soundToPlay.setObjectID( rider->getID() );
 				TheAudio->addAudioEvent( &soundToPlay );
 			}
-			
+
 
 			// When a parachute opens, it should look for a good place to land.  This could be explicitly set
 			// by a DeliverPayload, otherwise any place clear is good.
@@ -344,7 +336,7 @@ UpdateSleepTime ParachuteContain::update( void )
 					fpOptions.minRadius = 0.0f;
 					fpOptions.maxRadius = 100.0f;
 					fpOptions.relationshipObject = NULL;
-					fpOptions.flags = FPF_NONE; 
+					fpOptions.flags = FPF_NONE;
 					ThePartitionManager->findPositionAround( &target, &fpOptions, &target );
 				}
 				parachuteAI->aiMoveToPosition( &target, CMD_FROM_AI );
@@ -370,11 +362,11 @@ UpdateSleepTime ParachuteContain::update( void )
 	}
 
 	AIUpdateInterface* ai = parachute->getAIUpdateInterface();
-	if (ai && !parachute->isEffectivelyDead()) 
+	if (ai && !parachute->isEffectivelyDead())
 	{
 		ai->chooseLocomotorSet(m_opened ? LOCOMOTORSET_NORMAL : LOCOMOTORSET_FREEFALL);
 
-		Locomotor* locomotor = ai->getCurLocomotor(); 
+		Locomotor* locomotor = ai->getCurLocomotor();
 		if (locomotor)
 		{
 			// damp the swaying a bunch when we get close, so that things land vertically (or nearly so)
@@ -451,7 +443,7 @@ UpdateSleepTime ParachuteContain::update( void )
 //-------------------------------------------------------------------------------------------------
 void ParachuteContain::onContaining( Object *rider )
 {
-	OpenContain::onContaining(rider);	
+	OpenContain::onContaining(rider);
 
 	// objects inside a transport are held
 	rider->setDisabled( DISABLED_HELD );
@@ -468,7 +460,7 @@ void ParachuteContain::onContaining( Object *rider )
 //-------------------------------------------------------------------------------------------------
 void ParachuteContain::onRemoving( Object *rider )
 {
-	OpenContain::onRemoving(rider);	
+	OpenContain::onRemoving(rider);
 
 	const ParachuteContainModuleData* d = getParachuteContainModuleData();
 
@@ -487,7 +479,7 @@ void ParachuteContain::onRemoving( Object *rider )
 	rider->clearModelConditionFlags(MAKE_MODELCONDITION_MASK2(MODELCONDITION_FREEFALL, MODELCONDITION_PARACHUTING));
 	m_needToUpdateRiderBones = true;
 
-	// temporarily mark the guy as being allowed to fall 
+	// temporarily mark the guy as being allowed to fall
 	// (overriding his locomotor's stick-to-ground attribute).
 	// this will be reset (by PhysicsBehavior) when he touches the ground.
 	PhysicsBehavior* physics = rider->getPhysics();
@@ -507,9 +499,9 @@ void ParachuteContain::onRemoving( Object *rider )
 		if (controller && controller->isSkirmishAIPlayer())
 			riderAI->aiHunt(CMD_FROM_AI);	// hunt, as per Dustin's request.
 		else
-			riderAI->aiIdle(CMD_FROM_AI); // become idle.		
+			riderAI->aiIdle(CMD_FROM_AI); // become idle.
 	}
-	
+
 	// if we land in the water, we die. alas.
 	const Coord3D* riderPos = rider->getPosition();
 	Real waterZ, terrainZ;
@@ -640,7 +632,7 @@ void ParachuteContain::onCollide( Object *other, const Coord3D *loc, const Coord
 		// kill it, so that the chute's SlowDeath will trigger!
 		getObject()->kill();
 	}
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -651,7 +643,7 @@ void ParachuteContain::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -686,7 +678,7 @@ void ParachuteContain::xfer( Xfer *xfer )
 
 	// is landing override set
 	xfer->xferBool( &m_isLandingOverrideSet );
-	
+
 	// landing override
 	xfer->xferCoord3D( &m_landingOverride );
 
@@ -723,7 +715,7 @@ void ParachuteContain::xfer( Xfer *xfer )
 	// opened
 	xfer->xferBool( &m_opened );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -734,4 +726,4 @@ void ParachuteContain::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/RailedTransportContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/RailedTransportContain.cpp
index f982bee8776..56d3636b293 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/RailedTransportContain.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/RailedTransportContain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/RailedTransportContain.h"
@@ -43,7 +43,7 @@ static RailedTransportDockUpdateInterface *getRailedTransportDockUpdateInterface
 	if( obj == NULL )
 		return NULL;
 
-	// find us our dock interface	
+	// find us our dock interface
 	RailedTransportDockUpdateInterface *rtdui = NULL;
 	for( BehaviorModule **u = obj->getBehaviorModules(); *u; ++u )
 		if( (rtdui = (*u)->getRailedTransportDockUpdateInterface()) != NULL )
@@ -51,7 +51,7 @@ static RailedTransportDockUpdateInterface *getRailedTransportDockUpdateInterface
 
 	return rtdui;
 
-}  // end getRailedTransportDockUpdateInterface
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -59,20 +59,20 @@ RailedTransportContain::RailedTransportContain( Thing *thing, const ModuleData *
 											: TransportContain( thing, moduleData )
 {
 
-}  // end RailedTransportContain
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 RailedTransportContain::~RailedTransportContain( void )
 {
 
-}  // end ~RailedTransportContain
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void RailedTransportContain::onRemoving( Object *obj )
 {
-	
+
 	// extend functionality
 	TransportContain::onRemoving( obj );
 
@@ -83,9 +83,9 @@ void RailedTransportContain::onRemoving( Object *obj )
 		if( dui )
 			dui->setDockOpen( TRUE );
 
-	}  // end if
+	}
 
-}  // end onRemoving
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -101,7 +101,7 @@ Bool RailedTransportContain::isSpecificRiderFreeToExit( Object *obj )
 	// we can now exit, note we're not extending the base class cause *we* handle it all
 	return TRUE;
 
-}  // end isSpecificRiderFreeToExit
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -115,7 +115,7 @@ void RailedTransportContain::exitObjectViaDoor( Object *newObj, ExitDoorType exi
 	// tell the railed dock to exit ONE object, this one
 	rtdui->unloadSingleObject( newObj );
 
-}  // end exitObjectViaDoor
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -126,7 +126,7 @@ void RailedTransportContain::crc( Xfer *xfer )
 	// extend base class
 	TransportContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -144,7 +144,7 @@ void RailedTransportContain::xfer( Xfer *xfer )
 	// extend base class
 	TransportContain::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -155,4 +155,4 @@ void RailedTransportContain::loadPostProcess( void )
 	// extend base class
 	TransportContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp
index cbf62d9d7fd..2916b521585 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingTemplate.h"
@@ -45,11 +45,6 @@
 #include "GameLogic/Module/TransportContain.h"
 #include "GameLogic/Object.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -84,7 +79,7 @@ void TransportContainModuleData::parseInitialPayload( INI* ini, void *instance,
 	const char* name = ini->getNextToken();
 	const char* countStr = ini->getNextTokenOrNull();
 	Int count = countStr ? INI::scanInt(countStr) : 1;
-	
+
 	self->m_initialPayload.name.set(name);
 	self->m_initialPayload.count = count;
 }
@@ -95,7 +90,7 @@ void TransportContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   OpenContainModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Slots",	INI::parseInt,		NULL, offsetof( TransportContainModuleData, m_slotCapacity ) },
 		{ "ScatterNearbyOnExit",	INI::parseBool,		NULL, offsetof( TransportContainModuleData, m_scatterNearbyOnExit ) },
@@ -120,8 +115,8 @@ void TransportContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Int TransportContain::getContainMax( void ) const 
-{ 
+Int TransportContain::getContainMax( void ) const
+{
 	if (getTransportContainModuleData())
 		return getTransportContainModuleData()->m_slotCapacity;
 
@@ -131,7 +126,7 @@ Int TransportContain::getContainMax( void ) const
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-TransportContain::TransportContain( Thing *thing, const ModuleData *moduleData ) : 
+TransportContain::TransportContain( Thing *thing, const ModuleData *moduleData ) :
 								 OpenContain( thing, moduleData )
 {
 	m_extraSlotsInUse = 0;
@@ -147,8 +142,8 @@ TransportContain::~TransportContain( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-/** 
-	can this container contain this kind of object? 
+/**
+	can this container contain this kind of object?
 	and, if checkCapacity is TRUE, does this container have enough space left to hold the given unit?
 */
 Bool TransportContain::isValidContainerFor(const Object* rider, Bool checkCapacity) const
@@ -159,7 +154,7 @@ Bool TransportContain::isValidContainerFor(const Object* rider, Bool checkCapaci
 		return false;
 
 	// The point of this new code is to determine when something is a "fake" container, to
-	// look at the object inside of it to use that as the valid check. There is a case, when a 
+	// look at the object inside of it to use that as the valid check. There is a case, when a
 	// paratrooper (an infantry contained in a parachute). In this case, when we pass this object
 	// to contain in a transport plane, we want to check the infantry, not the parachute.
 	if (rider->getContain() && rider->getContain()->isSpecialZeroSlotContainer())
@@ -211,7 +206,7 @@ Bool TransportContain::isValidContainerFor(const Object* rider, Bool checkCapaci
 void TransportContain::onContaining( Object *rider )
 {
 	OpenContain::onContaining(rider);
-	
+
 	// objects inside a transport are held
 	rider->setDisabled( DISABLED_HELD );
 
@@ -232,7 +227,7 @@ void TransportContain::onContaining( Object *rider )
 		if( draw )
 			draw->setModelConditionState( MODELCONDITION_LOADED );
 
-	}  // end if
+	}
 
 }
 
@@ -297,11 +292,11 @@ void TransportContain::onRemoving( Object *rider )
 		if( draw )
 			draw->clearModelConditionState( MODELCONDITION_LOADED );
 
-	}  // end if
+	}
 
 	if (getObject()->isAboveTerrain())
 	{
-		// temporarily mark the guy as being allowed to fall 
+		// temporarily mark the guy as being allowed to fall
 		// (overriding his locomotor's stick-to-ground attribute).
 		// this will be reset (by PhysicsBehavior) when he touches the ground.
 		PhysicsBehavior* physics = rider->getPhysics();
@@ -337,7 +332,7 @@ void TransportContain::createPayload()
 	const ThingTemplate* payloadTemplate = TheThingFactory->findTemplate( self->m_initialPayload.name );
 	Object* object = getObject();
 	ContainModuleInterface *contain = object->getContain();
-	
+
 	if( contain )
 	{
 		contain->enableLoadSounds( FALSE );
@@ -454,8 +449,8 @@ Bool TransportContain::isSpecificRiderFreeToExit(Object* specificObject)
 	// This is a override, not an extend.  I will check for game legality for
 	// okaying the call to exitObjectViaDoor.
   const Object* me = getObject();
- 
-	// this is present solely for some transports to override, so that they can land before 
+
+	// this is present solely for some transports to override, so that they can land before
 	// allowing people to exit...
 	const AIUpdateInterface* ai = me->getAIUpdateInterface();
 	if (ai && ai->getAiFreeToExit(specificObject) != FREE_TO_EXIT)
@@ -464,7 +459,7 @@ Bool TransportContain::isSpecificRiderFreeToExit(Object* specificObject)
   // I can always kick people out if I am in the air, I know what I'm doing
   if (me->isUsingAirborneLocomotor())
    	return TRUE;
- 
+
   const Coord3D *myPosition = me->getPosition();
  	if (!specificObject->getAIUpdateInterface())
 		return FALSE;
@@ -472,11 +467,11 @@ Bool TransportContain::isSpecificRiderFreeToExit(Object* specificObject)
 	const Locomotor *hisLocomotor = specificObject->getAIUpdateInterface()->getCurLocomotor();
 	if( hisLocomotor == FALSE )
    	return FALSE;
- 
+
   // He can't get to this spot naturally, so I can't force him there.  (amphib transport)
   if (!TheAI->pathfinder()->validMovementTerrain(me->getLayer(), hisLocomotor, myPosition))
    	return FALSE;
- 
+
   return TRUE;
 }
 
@@ -522,7 +517,7 @@ void TransportContain::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -549,7 +544,7 @@ void TransportContain::xfer( Xfer *xfer )
 	// frame exit not busy
 	xfer->xferUnsignedInt( &m_frameExitNotBusy );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -560,4 +555,4 @@ void TransportContain::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp
index c9ec85f6ec3..2fc9fb89aa0 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/RandomValue.h"
@@ -43,11 +43,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -70,6 +65,10 @@ TunnelContain::~TunnelContain()
 void TunnelContain::addToContainList( Object *obj )
 {
 	Player *owningPlayer = getObject()->getControllingPlayer();
+
+	if(!owningPlayer->getTunnelSystem())
+		return;
+
 	owningPlayer->getTunnelSystem()->addToContainList( obj );
 }
 
@@ -90,7 +89,7 @@ void TunnelContain::removeFromContain( Object *obj, Bool exposeStealthUnits )
 	{
 		getObject()->getContain()->onRemoving( obj );
 	}
-			
+
 	// trigger an onRemovedFrom event for 'remove'
 	obj->onRemovedFrom( getObject() );
 
@@ -102,13 +101,10 @@ void TunnelContain::removeFromContain( Object *obj, Bool exposeStealthUnits )
 	if( owningPlayer == NULL )
 		return; //game tear down.  We do the onRemove* stuff first because this is allowed to fail but that still needs to be done
 
-	if( ! owningPlayer->getTunnelSystem()->isInContainer( obj ) )
-	{
+	if(!owningPlayer->getTunnelSystem())
 		return;
-	}
 
 	owningPlayer->getTunnelSystem()->removeFromContain( obj, exposeStealthUnits );
-
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -117,15 +113,20 @@ void TunnelContain::removeFromContain( Object *obj, Bool exposeStealthUnits )
 void TunnelContain::removeAllContained( Bool exposeStealthUnits )
 {
 	Player *owningPlayer = getObject()->getControllingPlayer();
-	const ContainedItemsList *fullList = owningPlayer->getTunnelSystem()->getContainedItemsList();
 
-	Object *obj;
-	ContainedItemsList::const_iterator it;
-	it = (*fullList).begin();
-	while( it != (*fullList).end() )
+	if(!owningPlayer->getTunnelSystem())
+		return;
+
+	ContainedItemsList list;
+	owningPlayer->getTunnelSystem()->swapContainedItemsList(list);
+
+	ContainedItemsList::iterator it = list.begin();
+
+	while ( it != list.end() )
 	{
-		obj = *it;
-		it++;
+		Object *obj = *it++;
+		DEBUG_ASSERTCRASH( obj, ("Contain list must not contain NULL element"));
+
 		removeFromContain( obj, exposeStealthUnits );
 	}
 }
@@ -136,6 +137,10 @@ void TunnelContain::removeAllContained( Bool exposeStealthUnits )
 void TunnelContain::iterateContained( ContainIterateFunc func, void *userData, Bool reverse )
 {
 	Player *owningPlayer = getObject()->getControllingPlayer();
+
+	if(!owningPlayer->getTunnelSystem())
+		return;
+
 	owningPlayer->getTunnelSystem()->iterateContained( func, userData, reverse );
 }
 
@@ -150,7 +155,7 @@ void TunnelContain::onContaining( Object *obj )
 }
 
 //-------------------------------------------------------------------------------------------------
-void TunnelContain::onRemoving( Object *obj ) 
+void TunnelContain::onRemoving( Object *obj )
 {
 	OpenContain::onRemoving(obj);
 
@@ -158,6 +163,7 @@ void TunnelContain::onRemoving( Object *obj )
 	obj->clearDisabled( DISABLED_HELD );
 
 	/// place the object in the world at position of the container m_object
+#if RETAIL_COMPATIBLE_CRC
 	ThePartitionManager->registerObject( obj );
 	obj->setPosition( getObject()->getPosition() );
 	if( obj->getDrawable() )
@@ -165,6 +171,12 @@ void TunnelContain::onRemoving( Object *obj )
 		obj->setSafeOcclusionFrame(TheGameLogic->getFrame()+obj->getTemplate()->getOcclusionDelay());
 		obj->getDrawable()->setDrawableHidden( false );
 	}
+#else
+	// TheSuperHackers @bugfix Now correctly adds the objects to the world without issues with shrouded portable structures.
+	obj->setPosition(getObject()->getPosition());
+	obj->setSafeOcclusionFrame(TheGameLogic->getFrame() + obj->getTemplate()->getOcclusionDelay());
+	addOrRemoveObjFromWorld(obj, TRUE);
+#endif
 
 	doUnloadSound();
 }
@@ -179,7 +191,7 @@ void TunnelContain::onSelling()
 	TunnelTracker *tunnelTracker = owningPlayer->getTunnelSystem();
 	if( tunnelTracker == NULL )
 		return;
-	
+
 	// We are the last tunnel, so kick everyone out.  This makes tunnels act like Palace and Bunker
 	// rather than killing the occupants as if the last tunnel died.
 	if( tunnelTracker->friend_getTunnelCount() == 1 )
@@ -199,7 +211,11 @@ void TunnelContain::onSelling()
 Bool TunnelContain::isValidContainerFor(const Object* obj, Bool checkCapacity) const
 {
 	Player *owningPlayer = getObject()->getControllingPlayer();
-	return owningPlayer->getTunnelSystem()->isValidContainerFor( obj, checkCapacity );
+	if( owningPlayer && owningPlayer->getTunnelSystem() )
+	{
+		return owningPlayer->getTunnelSystem()->isValidContainerFor( obj, checkCapacity );
+	}
+	return false;
 }
 
 UnsignedInt TunnelContain::getContainCount() const
@@ -212,19 +228,31 @@ UnsignedInt TunnelContain::getContainCount() const
 	return 0;
 }
 
-Int TunnelContain::getContainMax( void ) const 
-{ 
+Int TunnelContain::getContainMax( void ) const
+{
 	Player *owningPlayer = getObject()->getControllingPlayer();
-	return owningPlayer->getTunnelSystem()->getContainMax();
+	if( owningPlayer && owningPlayer->getTunnelSystem() )
+	{
+		return owningPlayer->getTunnelSystem()->getContainMax();
+	}
+	return 0;
 }
 
 const ContainedItemsList* TunnelContain::getContainedItemsList() const
 {
 	Player *owningPlayer = getObject()->getControllingPlayer();
-	return owningPlayer->getTunnelSystem()->getContainedItemsList();
+	if( owningPlayer && owningPlayer->getTunnelSystem() )
+	{
+		return owningPlayer->getTunnelSystem()->getContainedItemsList();
+	}
+	return NULL;
 }
 
-
+UnsignedInt TunnelContain::getFullTimeForHeal(void) const
+{
+	const TunnelContainModuleData* modData = getTunnelContainModuleData();
+	return modData->m_framesForFullHeal;
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////////////////////////
@@ -240,7 +268,7 @@ void TunnelContain::scatterToNearbyPosition(Object* obj)
 	// for now we will just set the position of the object that is being removed from us
 	// at a random angle away from our center out some distance
 	//
-	
+
 	//
 	// pick an angle that is in the view of the current camera position so that
 	// the thing will come out "toward" the player and they can see it
@@ -272,14 +300,14 @@ void TunnelContain::scatterToNearbyPosition(Object* obj)
 		ai->ignoreObstacle(theContainer);
  		ai->aiMoveToPosition( &pos, CMD_FROM_AI );
 
-	}  // end if
+	}
 	else
 	{
 
 		// no ai, just set position at the target pos
 		obj->setPosition( &pos );
 
-	}  // end else
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -303,7 +331,7 @@ void TunnelContain::onDie( const DamageInfo * damageInfo )
 
 	tunnelTracker->onTunnelDestroyed( getObject() );
 	m_isCurrentlyRegistered = FALSE;
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 void TunnelContain::onDelete( void )
@@ -346,7 +374,17 @@ void TunnelContain::onBuildComplete( void )
 
 	tunnelTracker->onTunnelCreated( getObject() );
 	m_isCurrentlyRegistered = TRUE;
-} 
+}
+
+//-------------------------------------------------------------------------------------------------
+void TunnelContain::orderAllPassengersToExit( CommandSourceType commandSource )
+{
+	Player *owningPlayer = getObject()->getControllingPlayer();
+	if( !owningPlayer || !owningPlayer->getTunnelSystem() )
+		return;
+
+	OpenContain::orderAllPassengersToExit( commandSource );
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Per frame update */
@@ -355,8 +393,7 @@ UpdateSleepTime TunnelContain::update( void )
 {
 	// extending functionality to heal the units within the tunnel system
 	OpenContain::update();
-	const TunnelContainModuleData *modData = getTunnelContainModuleData();
-	
+
 	Object *obj = getObject();
 	Player *controllingPlayer = NULL;
 	if (obj)
@@ -366,10 +403,13 @@ UpdateSleepTime TunnelContain::update( void )
 	if (controllingPlayer)
 	{
 		TunnelTracker *tunnelSystem = controllingPlayer->getTunnelSystem();
+#if PRESERVE_RETAIL_BEHAVIOR || RETAIL_COMPATIBLE_CRC
 		if (tunnelSystem)
 		{
+			const TunnelContainModuleData* modData = getTunnelContainModuleData();
 			tunnelSystem->healObjects(modData->m_framesForFullHeal);
 		}
+#endif
 
 		// check for attacked.
 		BodyModuleInterface *body = obj->getBodyModule();
@@ -403,7 +443,7 @@ void TunnelContain::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -427,7 +467,7 @@ void TunnelContain::xfer( Xfer *xfer )
 	// Currently registered with owning player
 	xfer->xferBool( &m_isCurrentlyRegistered );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -438,4 +478,4 @@ void TunnelContain::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/CreateModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/CreateModule.cpp
index f0a76424f59..63d7cfc5980 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/CreateModule.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/CreateModule.cpp
@@ -34,19 +34,19 @@
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-CreateModule::CreateModule( Thing *thing, const ModuleData* moduleData ) 
+CreateModule::CreateModule( Thing *thing, const ModuleData* moduleData )
 						: BehaviorModule( thing, moduleData ),
 						  m_needToRunOnBuildComplete(TRUE)
 {
 
-}  // end createModule
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 CreateModule::~CreateModule()
 {
 
-}  // end ~CreateModule
+}
 
 //-------------------------------------------------------------------------------------------------
 /** CRC */
@@ -57,7 +57,7 @@ void CreateModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -78,7 +78,7 @@ void CreateModule::xfer( Xfer *xfer )
 	// need to run on build complete
 	xfer->xferBool( &m_needToRunOnBuildComplete );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -89,6 +89,6 @@ void CreateModule::loadPostProcess( void )
 	// extend base class
 	BehaviorModule::loadPostProcess();
 
-}  // ene loadPostProcess
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp
index a1c47c7cc8d..c8bcb5ded2e 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_OBJECT_STATUS_NAMES
 #include "Common/Player.h"
@@ -41,7 +41,6 @@
 // ------------------------------------------------------------------------------------------------
 GrantUpgradeCreateModuleData::GrantUpgradeCreateModuleData()
 {
-	m_upgradeName = "";
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -50,7 +49,7 @@ void GrantUpgradeCreateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   CreateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "UpgradeToGrant",	INI::parseAsciiString,		NULL, offsetof( GrantUpgradeCreateModuleData, m_upgradeName ) },
 		{ "ExemptStatus",	ObjectStatusMaskType::parseFromINI, NULL, offsetof( GrantUpgradeCreateModuleData, m_exemptStatus ) },
@@ -68,14 +67,14 @@ void GrantUpgradeCreateModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 GrantUpgradeCreate::GrantUpgradeCreate( Thing *thing, const ModuleData* moduleData ) : CreateModule( thing, moduleData )
 {
-}  // end GrantUpgradeCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 GrantUpgradeCreate::~GrantUpgradeCreate( void )
 {
 
-}  // end ~GrantUpgradeCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The create callback. */
@@ -87,12 +86,12 @@ void GrantUpgradeCreate::onCreate( void )
 	ObjectStatusMaskType currentStatus = getObject()->getStatusBits();
 	if( exemptStatus.test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 	{
-		if(	!currentStatus.test( OBJECT_STATUS_UNDER_CONSTRUCTION ) ) 
+		if(	!currentStatus.test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 		{
 			const UpgradeTemplate *upgradeTemplate = TheUpgradeCenter->findUpgrade( getGrantUpgradeCreateModuleData()->m_upgradeName );
 			if( !upgradeTemplate )
 			{
-				DEBUG_ASSERTCRASH( 0, ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName(), getGrantUpgradeCreateModuleData()->m_upgradeName ) );
+				DEBUG_ASSERTCRASH( 0, ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName().str(), getGrantUpgradeCreateModuleData()->m_upgradeName.str() ) );
 				return;
 			}
 
@@ -109,7 +108,7 @@ void GrantUpgradeCreate::onCreate( void )
 		}
 	}
 
-}  // end onCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -123,7 +122,7 @@ void GrantUpgradeCreate::onBuildComplete( void )
 	const UpgradeTemplate *upgradeTemplate = TheUpgradeCenter->findUpgrade( getGrantUpgradeCreateModuleData()->m_upgradeName );
 	if( !upgradeTemplate )
 	{
-		DEBUG_ASSERTCRASH( 0, ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName(), getGrantUpgradeCreateModuleData()->m_upgradeName ) );
+		DEBUG_ASSERTCRASH( 0, ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName().str(), getGrantUpgradeCreateModuleData()->m_upgradeName.str() ) );
 		return;
 	}
 
@@ -137,7 +136,7 @@ void GrantUpgradeCreate::onBuildComplete( void )
 	{
 		getObject()->giveUpgrade( upgradeTemplate );
 	}
-}  // end onBuildComplete
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -148,7 +147,7 @@ void GrantUpgradeCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -166,7 +165,7 @@ void GrantUpgradeCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -177,4 +176,4 @@ void GrantUpgradeCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/PreorderCreate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/PreorderCreate.cpp
index c3c7e2ddb7b..1a24ee56934 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/PreorderCreate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/PreorderCreate.cpp
@@ -28,18 +28,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/PreorderCreate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -53,7 +48,7 @@ PreorderCreate::PreorderCreate( Thing *thing, const ModuleData* moduleData ) : C
 PreorderCreate::~PreorderCreate( void )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void PreorderCreate::onCreate( void )
@@ -82,7 +77,7 @@ void PreorderCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -100,7 +95,7 @@ void PreorderCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -111,4 +106,4 @@ void PreorderCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/SpecialPowerCreate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/SpecialPowerCreate.cpp
index 8d0dece9249..721283fcdaf 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/SpecialPowerCreate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/SpecialPowerCreate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -47,7 +47,7 @@ SpecialPowerCreate::SpecialPowerCreate( Thing *thing, const ModuleData* moduleDa
 SpecialPowerCreate::~SpecialPowerCreate( void )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void SpecialPowerCreate::onCreate( void )
@@ -70,7 +70,7 @@ void SpecialPowerCreate::onBuildComplete( void )
 
 		sp->onSpecialPowerCreation();
 	}
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -81,7 +81,7 @@ void SpecialPowerCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -99,7 +99,7 @@ void SpecialPowerCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -110,4 +110,4 @@ void SpecialPowerCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/SupplyCenterCreate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/SupplyCenterCreate.cpp
index 5b330ca8473..4e743c5fb94 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/SupplyCenterCreate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/SupplyCenterCreate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -48,7 +48,7 @@ SupplyCenterCreate::SupplyCenterCreate( Thing *thing, const ModuleData* moduleDa
 SupplyCenterCreate::~SupplyCenterCreate( void )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void SupplyCenterCreate::onCreate( void )
@@ -76,7 +76,7 @@ void SupplyCenterCreate::onBuildComplete( void )
 			continue;
 		manager->addSupplyCenter( getObject() );
 	}
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -87,7 +87,7 @@ void SupplyCenterCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -105,7 +105,7 @@ void SupplyCenterCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -116,4 +116,4 @@ void SupplyCenterCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/SupplyWarehouseCreate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/SupplyWarehouseCreate.cpp
index 250c0f07f0a..da84fa1eb8b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/SupplyWarehouseCreate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/SupplyWarehouseCreate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -48,7 +48,7 @@ SupplyWarehouseCreate::SupplyWarehouseCreate( Thing *thing, const ModuleData* mo
 SupplyWarehouseCreate::~SupplyWarehouseCreate( void )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void SupplyWarehouseCreate::onCreate( void )
@@ -78,7 +78,7 @@ void SupplyWarehouseCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -96,7 +96,7 @@ void SupplyWarehouseCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -107,4 +107,4 @@ void SupplyWarehouseCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/VeterancyGainCreate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/VeterancyGainCreate.cpp
index 86372c0a129..339ee4c674b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Create/VeterancyGainCreate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Create/VeterancyGainCreate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_VETERANCY_NAMES				// for TheVeterancyNames[]
 #include "Common/Player.h"
@@ -51,7 +51,7 @@ void VeterancyGainCreateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   CreateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "StartingLevel",		INI::parseIndexList,	TheVeterancyNames,	offsetof( VeterancyGainCreateModuleData, m_startingLevel ) },
 		{ "ScienceRequired",	INI::parseScience,		NULL,								offsetof( VeterancyGainCreateModuleData, m_scienceRequired ) },
@@ -85,14 +85,14 @@ void VeterancyGainCreate::onCreate( void )
 
 	const VeterancyGainCreateModuleData *md = getVeterancyGainCreateModuleData();
 	Player *myPlayer = getObject()->getControllingPlayer();
-	if( myPlayer && (md->m_scienceRequired == SCIENCE_INVALID || 
+	if( myPlayer && (md->m_scienceRequired == SCIENCE_INVALID ||
 									 myPlayer->hasScience( md->m_scienceRequired )) )
 	{
 		ExperienceTracker* myExp = getObject()->getExperienceTracker();
 		if( myExp  &&  myExp->isTrainable() )
 		{
 			// srj sez: use "setMin" here so that we never lose levels
-			myExp->setMinVeterancyLevel( md->m_startingLevel );// sVL can override isTrainable, but this module should not.
+			myExp->setMinVeterancyLevel( md->m_startingLevel, false );// sVL can override isTrainable, but this module should not.
 		}
 	}
 
@@ -107,7 +107,7 @@ void VeterancyGainCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -125,7 +125,7 @@ void VeterancyGainCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -136,4 +136,4 @@ void VeterancyGainCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/BoneFXDamage.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/BoneFXDamage.cpp
index 3fcad642a33..51b09ce1cab 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/BoneFXDamage.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/BoneFXDamage.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
@@ -39,17 +39,17 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-BoneFXDamage::BoneFXDamage( Thing *thing, const ModuleData* moduleData ) 
+BoneFXDamage::BoneFXDamage( Thing *thing, const ModuleData* moduleData )
 																		  : DamageModule( thing, moduleData )
 {
-}  // end BoneFXDamage
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 BoneFXDamage::~BoneFXDamage( void )
 {
 
-}  // end ~BoneFXDamage
+}
 
 //-------------------------------------------------------------------------------------------------
 void BoneFXDamage::onObjectCreated()
@@ -66,8 +66,8 @@ void BoneFXDamage::onObjectCreated()
 //-------------------------------------------------------------------------------------------------
 /** Switching damage states */
 //-------------------------------------------------------------------------------------------------
-void BoneFXDamage::onBodyDamageStateChange( const DamageInfo *damageInfo, 
-																						BodyDamageType oldState, 
+void BoneFXDamage::onBodyDamageStateChange( const DamageInfo *damageInfo,
+																						BodyDamageType oldState,
 																						BodyDamageType newState )
 {
 	static NameKeyType key_BoneFXUpdate = NAMEKEY("BoneFXUpdate");
@@ -75,7 +75,7 @@ void BoneFXDamage::onBodyDamageStateChange( const DamageInfo *damageInfo,
 	if (bfxu)
 		bfxu->changeBodyDamageState(oldState, newState);
 
-}  // end onBodyDamageStateChange
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -86,7 +86,7 @@ void BoneFXDamage::crc( Xfer *xfer )
 	// extend base class
 	DamageModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -104,7 +104,7 @@ void BoneFXDamage::xfer( Xfer *xfer )
 	// extend base class
 	DamageModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -115,4 +115,4 @@ void BoneFXDamage::loadPostProcess( void )
 	// extend base class
 	DamageModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/DamageModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/DamageModule.cpp
index cac94500fbf..aecfa8d4efc 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/DamageModule.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/DamageModule.cpp
@@ -41,7 +41,7 @@ void DamageModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -57,7 +57,7 @@ void DamageModule::xfer( Xfer *xfer )
 	// call base class
 	BehaviorModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -68,4 +68,4 @@ void DamageModule::loadPostProcess( void )
 	// call base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/TransitionDamageFX.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/TransitionDamageFX.cpp
index 7092f77281e..7d9a7d10907 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/TransitionDamageFX.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Damage/TransitionDamageFX.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
@@ -69,15 +69,15 @@ TransitionDamageFXModuleData::TransitionDamageFXModuleData( void )
 			m_particleSystem[ i ][ j ].locInfo.locType = FX_DAMAGE_LOC_TYPE_COORD;
 			m_particleSystem[ i ][ j ].locInfo.randomBone = FALSE;
 
-		}  // end for j
+		}
 
-	}  // end for i
+	}
 
 	m_damageFXTypes = DAMAGE_TYPE_FLAGS_ALL;
 	m_damageOCLTypes = DAMAGE_TYPE_FLAGS_ALL;
 	m_damageParticleTypes = DAMAGE_TYPE_FLAGS_ALL;
 
-}  // end TransitionDamageFXModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse fx location info ... that is a named bone or a coord3d position */
@@ -105,12 +105,12 @@ static void parseFXLocInfo( INI *ini, void *instance, FXLocInfo *locInfo )
 			DEBUG_CRASH(( "parseFXLocInfo: Bone name not followed by RandomBone specifier\nPress IGNORE to see which INI file and line # is incorrect." ));
 			throw INI_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// parse the Bool definition
 		ini->parseBool( ini, instance, &locInfo->randomBone, NULL );
 
-	}  // end if
+	}
 	else if( stricmp( token, "loc" ) == 0 )
 	{
 
@@ -120,22 +120,22 @@ static void parseFXLocInfo( INI *ini, void *instance, FXLocInfo *locInfo )
 		locInfo->loc.z = ini->scanReal( ini->getNextSubToken("Z") );
 		locInfo->locType = FX_DAMAGE_LOC_TYPE_COORD;
 
-	}  // end else
+	}
 	else
 	{
 
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end else
+	}
 
-}  // end parseFXLocInfo
+}
 
 //-------------------------------------------------------------------------------------------------
 /** In the form of:
 	* FXListSlot = <<Bone:BoneName BoneRandom:<Yes|No>> | <Loc: X:x Y:y Z:z>> FXList:FXListName */
 //-------------------------------------------------------------------------------------------------
-void TransitionDamageFXModuleData::parseFXList( INI *ini, void *instance, 
+void TransitionDamageFXModuleData::parseFXList( INI *ini, void *instance,
 																								void *store, const void *userData )
 {
 	const char *token;
@@ -152,18 +152,18 @@ void TransitionDamageFXModuleData::parseFXList( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// parse the fx list name
 	ini->parseFXList( ini, instance, &info->fx, NULL );
 
-}  // end parseFXList
+}
 
 //-------------------------------------------------------------------------------------------------
 /** In the form of:
 	* OCLSlot = <<Bone:BoneName BoneRandom:<Yes|No>> | <Loc: X:x Y:y Z:z>> OCL:OCLName */
 //-------------------------------------------------------------------------------------------------
-void TransitionDamageFXModuleData::parseObjectCreationList( INI *ini, void *instance, 
+void TransitionDamageFXModuleData::parseObjectCreationList( INI *ini, void *instance,
 																														void *store, const void *userData )
 {
 	const char *token;
@@ -180,18 +180,18 @@ void TransitionDamageFXModuleData::parseObjectCreationList( INI *ini, void *inst
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// parse the ocl name
 	ini->parseObjectCreationList( ini, instance, store, &info->ocl );
 
-}  // end parseObjectCreationList
+}
 
 //-------------------------------------------------------------------------------------------------
 /** In the form of:
 	* ParticleSlot = <<Bone:BoneName BoneRandom:<Yes|No>> | <Loc: X:x Y:y Z:z>> PSys:PSysName */
 //-------------------------------------------------------------------------------------------------
-void TransitionDamageFXModuleData::parseParticleSystem( INI *ini, void *instance, 
+void TransitionDamageFXModuleData::parseParticleSystem( INI *ini, void *instance,
 																												void *store, const void *userData )
 {
 	const char *token;
@@ -208,16 +208,16 @@ void TransitionDamageFXModuleData::parseParticleSystem( INI *ini, void *instance
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// parse the particle system name
 	ini->parseParticleSystemTemplate( ini, instance, store, &info->particleSysTemplate );
 
-}  // end parseParticleSystem
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-TransitionDamageFX::TransitionDamageFX( Thing *thing, const ModuleData* moduleData ) 
+TransitionDamageFX::TransitionDamageFX( Thing *thing, const ModuleData* moduleData )
 																		  : DamageModule( thing, moduleData )
 {
 	Int i, j;
@@ -226,14 +226,14 @@ TransitionDamageFX::TransitionDamageFX( Thing *thing, const ModuleData* moduleDa
 		for( j = 0; j < DAMAGE_MODULE_MAX_FX; j++ )
 			m_particleSystemID[ i ][ j ] = INVALID_PARTICLE_SYSTEM_ID;
 
-}  // end TransitionDamageFX
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 TransitionDamageFX::~TransitionDamageFX( void )
 {
 
-}  // end ~TransitionDamageFX
+}
 
 /*
 //-------------------------------------------------------------------------------------------------
@@ -246,17 +246,17 @@ void TransitionDamageFX::onDelete( void )
 	// particle system will automatically delete itself when the object is destroyed
 	//
 
-}  // end onDelete
+}
 */
 
 //-------------------------------------------------------------------------------------------------
-/** Given an FXLoc info struct, return the effect position that we are supposed to use. 
+/** Given an FXLoc info struct, return the effect position that we are supposed to use.
 	* The position is local to to the object */
 //-------------------------------------------------------------------------------------------------
 static Coord3D getLocalEffectPos( const FXLocInfo *locInfo, Drawable *draw )
 {
 
-	DEBUG_ASSERTCRASH( locInfo, ("getLocalEffectPos: locInfo is NULL\n") );
+	DEBUG_ASSERTCRASH( locInfo, ("getLocalEffectPos: locInfo is NULL") );
 
 	if( locInfo->locType == FX_DAMAGE_LOC_TYPE_BONE && draw )
 	{
@@ -264,7 +264,7 @@ static Coord3D getLocalEffectPos( const FXLocInfo *locInfo, Drawable *draw )
 		if( locInfo->randomBone == FALSE )
 		{
 			Coord3D pos;
-		
+
 			// get the bone position
 			Int count = draw->getPristineBonePositions( locInfo->boneName.str(), 0, &pos, NULL, 1 );
 
@@ -275,7 +275,7 @@ static Coord3D getLocalEffectPos( const FXLocInfo *locInfo, Drawable *draw )
 			// return the position retrieved
 			return pos;
 
-		}  // end if
+		}
 		else
 		{
 		  const Int MAX_BONES = 32;
@@ -293,19 +293,19 @@ static Coord3D getLocalEffectPos( const FXLocInfo *locInfo, Drawable *draw )
 			Int pick = GameLogicRandomValue( 0, boneCount - 1 );
 			return positions[ pick ];
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 	else
 		return locInfo->loc;
 
-}  // end getLocalEffectPos
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Switching damage states */
 //-------------------------------------------------------------------------------------------------
-void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																									BodyDamageType oldState, 
+void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
+																									BodyDamageType oldState,
 																									BodyDamageType newState )
 {
 	Object *damageSource = NULL;
@@ -316,7 +316,7 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 	// get the source of the damage if present
 	if( damageInfo )
 		damageSource = TheGameLogic->findObjectByID( damageInfo->in.m_sourceID );
-	
+
 	// remove any particle systems that might be emitting from our old state
 	for( i = 0; i < DAMAGE_MODULE_MAX_FX; i++ )
 	{
@@ -327,9 +327,9 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 			TheParticleSystemManager->destroyParticleSystemByID( m_particleSystemID[ oldState ][ i ] );
 			m_particleSystemID[ oldState ][ i ] = INVALID_PARTICLE_SYSTEM_ID;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	//
 	// when we are transitioning to a "worse" state we will play a set of effects for that
@@ -350,7 +350,7 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 			if( modData->m_fxList[ newState ][ i ].fx )
 			{
 
-				if( lastDamageInfo == NULL || 
+				if( lastDamageInfo == NULL ||
 						getDamageTypeFlag( modData->m_damageFXTypes, lastDamageInfo->in.m_damageType ) )
 				{
 
@@ -358,33 +358,33 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 					getObject()->convertBonePosToWorldPos( &pos, NULL, &pos, NULL );
 					FXList::doFXPos( modData->m_fxList[ newState ][ i ].fx, &pos );
 
-				}  // end if
+				}
+
+			}
 
-			}  // end if
-					
 			// do any object creation list for our new state
-			if( modData->m_OCL[ newState ][ i ].ocl )
+			if( damageSource && modData->m_OCL[ newState ][ i ].ocl )
 			{
 
-				if( lastDamageInfo == NULL || 
+				if( lastDamageInfo == NULL ||
 						getDamageTypeFlag( modData->m_damageOCLTypes, lastDamageInfo->in.m_damageType ) )
 				{
 
 					pos = getLocalEffectPos( &modData->m_OCL[ newState ][ i ].locInfo, draw );
 					getObject()->convertBonePosToWorldPos( &pos, NULL, &pos, NULL );
-					ObjectCreationList::create( modData->m_OCL[ newState ][ i ].ocl, 
+					ObjectCreationList::create( modData->m_OCL[ newState ][ i ].ocl,
 																			getObject(), &pos, damageSource->getPosition() );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
 			// get the template of the system to create
 			pSystemT = modData->m_particleSystem[ newState ][ i ].particleSysTemplate;
 			if( pSystemT )
 			{
 
-				if( lastDamageInfo == NULL || 
+				if( lastDamageInfo == NULL ||
 						getDamageTypeFlag( modData->m_damageParticleTypes, lastDamageInfo->in.m_damageType ) )
 				{
 
@@ -392,7 +392,7 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 					ParticleSystem* pSystem = TheParticleSystemManager->createParticleSystem( pSystemT );
 					if( pSystem )
 					{
-			
+
 						// get the what is the position we're going to playe the effect at
 						pos = getLocalEffectPos( &modData->m_particleSystem[ newState ][ i ].locInfo, draw );
 
@@ -410,17 +410,17 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 						// save the id of this particle system so we can remove it later if it still exists
 						m_particleSystemID[ newState ][ i ] = pSystem->getSystemID();
 
-					}  // end if
+					}
+
+				}
+
+			}
 
-				}  // end if
+		}
 
-			}  // end if
-						
-		}  // end for i
+	}
 
-	}  // end if
-			
-}  // end onBodyDamageStateChange
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -431,7 +431,7 @@ void TransitionDamageFX::crc( Xfer *xfer )
 	// extend base class
 	DamageModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -452,7 +452,7 @@ void TransitionDamageFX::xfer( Xfer *xfer )
 	// particle systems ids
 	xfer->xferUser( m_particleSystemID, sizeof( ParticleSystemID ) * BODYDAMAGETYPE_COUNT * DAMAGE_MODULE_MAX_FX );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -463,4 +463,4 @@ void TransitionDamageFX::loadPostProcess( void )
 	// extend base class
 	DamageModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Destroy/DestroyModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Destroy/DestroyModule.cpp
index 8529b375804..06beb8b7e9b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Destroy/DestroyModule.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Destroy/DestroyModule.cpp
@@ -34,18 +34,18 @@
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-DestroyModule::DestroyModule( Thing *thing, const ModuleData* moduleData ) 
+DestroyModule::DestroyModule( Thing *thing, const ModuleData* moduleData )
 							: BehaviorModule( thing, moduleData )
 {
 
-}  // end DestroyModule
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 DestroyModule::~DestroyModule( void )
 {
 
-}  // end ~DestroyModule
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -56,7 +56,7 @@ void DestroyModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -74,7 +74,7 @@ void DestroyModule::xfer( Xfer *xfer )
 	// extend base class
 	BehaviorModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -85,5 +85,5 @@ void DestroyModule::loadPostProcess( void )
 	// extend base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateCrateDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateCrateDie.cpp
index ea57784410c..ee05f5bd9f1 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateCrateDie.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateCrateDie.cpp
@@ -27,7 +27,7 @@
 // Desc:   A chance to create a crate on death according to certain condition checks
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PlayerList.h"
 #include "Common/Player.h"
@@ -95,7 +95,7 @@ void CreateCrateDie::onDie( const DamageInfo * damageInfo )
 
 			if( KINDOFMASK_ANY_SET(currentCrateData->m_killedByTypeKindof) && !testKillerType( currentCrateData, killer ) )
 				continue; //If this is set up to test and it fails
-			
+
 			if( (currentCrateData->m_killerScience != SCIENCE_INVALID)  &&  !testKillerScience( currentCrateData, killer ) )
 				continue; //If this is set up to test and it fails
 
@@ -108,14 +108,14 @@ void CreateCrateDie::onDie( const DamageInfo * damageInfo )
 					crate->setTeam( me->getControllingPlayer()->getDefaultTeam() );
 				}
 
-				if (killer) 
+				if (killer)
 				{
 					// If the killer is a computer controlled player, notify that the crate exists.
-					if (killer->getControllingPlayer() &&	
-						killer->getControllingPlayer()->getPlayerType()==PLAYER_COMPUTER) 
+					if (killer->getControllingPlayer() &&
+						killer->getControllingPlayer()->getPlayerType()==PLAYER_COMPUTER)
 					{
 						AIUpdateInterface *ai = killer->getAIUpdateInterface();
-						if (ai) 
+						if (ai)
 						{
 							ai->notifyCrate( crate->getID() );
 						}
@@ -124,7 +124,7 @@ void CreateCrateDie::onDie( const DamageInfo * damageInfo )
 			}
 		}
 	}
-}  
+}
 
 Bool CreateCrateDie::testCreationChance( CrateTemplate const *currentCrateData )
 {
@@ -179,7 +179,7 @@ Object *CreateCrateDie::createCrate( CrateTemplate const *currentCrateData )
 	// CreationChance is used for the success of this block, but this block can have any number of potential actual crates
 	Real multipleCratePick = GameLogicRandomValueReal( 0, 1 );
 	Real multipleCrateRunningTotal = 0;
-	AsciiString crateName = "";
+	AsciiString crateName;
 
 	for( crateCreationEntryConstIterator iter = currentCrateData->m_possibleCrates.begin();
 				iter != currentCrateData->m_possibleCrates.end();
@@ -223,7 +223,7 @@ Object *CreateCrateDie::createCrate( CrateTemplate const *currentCrateData )
 		fpOptions.minRadius = 0.0f;
 		fpOptions.maxRadius = 125.0f;
 		fpOptions.relationshipObject = NULL;
-		fpOptions.flags = FPF_NONE; 
+		fpOptions.flags = FPF_NONE;
 		if( ThePartitionManager->findPositionAround( &centerPoint, &fpOptions, &creationPoint ) )
 		{
 			spotFound = TRUE;
@@ -242,7 +242,7 @@ Object *CreateCrateDie::createCrate( CrateTemplate const *currentCrateData )
 		if( crateDrawable )
 		{
 			crateDrawable->setTerrainDecal(TERRAIN_DECAL_CRATE);
-			crateDrawable->setTerrainDecalSize(2.5f * newCrate->getGeometryInfo().getMajorRadius(), 
+			crateDrawable->setTerrainDecalSize(2.5f * newCrate->getGeometryInfo().getMajorRadius(),
 																2.5f * newCrate->getGeometryInfo().getMajorRadius() )	;
 			crateDrawable->setTerrainDecalFadeTarget(1.0f, 0.03f);
 		}
@@ -261,7 +261,7 @@ void CreateCrateDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -279,7 +279,7 @@ void CreateCrateDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -290,4 +290,4 @@ void CreateCrateDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp
index 583b0dea939..c21f3b10798 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp
@@ -27,7 +27,7 @@
 // Desc:   Create an object upon this object's death
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_OBJECT_STATUS_NAMES
 #include "Common/ThingFactory.h"
@@ -37,11 +37,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ObjectCreationList.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -58,7 +53,7 @@ CreateObjectDieModuleData::CreateObjectDieModuleData()
 {
 	DieModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "CreationList",	INI::parseObjectCreationList,		NULL,											offsetof( CreateObjectDieModuleData, m_ocl ) },
 		{ 0, 0, 0, 0 }
@@ -95,7 +90,7 @@ void CreateObjectDie::onDie( const DamageInfo * damageInfo )
 	Object *damageDealer = TheGameLogic->findObjectByID( damageInfo->in.m_sourceID );
 
 	ObjectCreationList::create(getCreateObjectDieModuleData()->m_ocl, getObject(), damageDealer);
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -106,7 +101,7 @@ void CreateObjectDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -124,7 +119,7 @@ void CreateObjectDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -135,4 +130,4 @@ void CreateObjectDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CrushDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CrushDie.cpp
index 08a6df38584..93f9127d0cb 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CrushDie.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/CrushDie.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -165,7 +165,7 @@ void CrushDie::onDie( const DamageInfo * damageInfo )
 	if (!isDieApplicable(damageInfo))
 		return;
 
-	DEBUG_ASSERTCRASH(damageInfo->in.m_damageType == DAMAGE_CRUSH, ("this should only be used for crush damage\n"));
+	DEBUG_ASSERTCRASH(damageInfo->in.m_damageType == DAMAGE_CRUSH, ("this should only be used for crush damage"));
 	if (damageInfo->in.m_damageType != DAMAGE_CRUSH)
 		return;
 
@@ -200,12 +200,12 @@ void CrushDie::onDie( const DamageInfo * damageInfo )
 				newCrushed.set(MODELCONDITION_BACKCRUSHED, crushType == TOTAL_CRUSH || crushType == BACK_END_CRUSH);
 
 				me->getDrawable()->clearAndSetModelConditionFlags(
-					MAKE_MODELCONDITION_MASK2(MODELCONDITION_BACKCRUSHED, MODELCONDITION_FRONTCRUSHED), 
+					MAKE_MODELCONDITION_MASK2(MODELCONDITION_BACKCRUSHED, MODELCONDITION_FRONTCRUSHED),
 					newCrushed);
 			}
 		}
 	}
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -216,7 +216,7 @@ void CrushDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -234,7 +234,7 @@ void CrushDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -245,4 +245,4 @@ void CrushDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DamDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DamDie.cpp
index dd4ea2ec63d..55d0a6e5de5 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DamDie.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DamDie.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
@@ -48,7 +48,7 @@
 DamDieModuleData::DamDieModuleData( void )
 {
 
-}  // end DamDieModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -57,14 +57,14 @@ DamDieModuleData::DamDieModuleData( void )
 
   DieModuleData::buildFieldParse( p );
 
-//	static const FieldParse dataFieldParse[] = 
+//	static const FieldParse dataFieldParse[] =
 //	{
 //		{ 0, 0, 0, 0 }
 //	};
 //
 //  p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -76,14 +76,14 @@ DamDie::DamDie( Thing *thing, const ModuleData *moduleData )
 			 :DieModule( thing, moduleData )
 {
 
-}  // end DamDie
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 DamDie::~DamDie( void )
 {
 
-}  // end ~DamDie
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -104,9 +104,9 @@ void DamDie::onDie( const DamageInfo *damageInfo )
 		// clear any disabled status of the water wave
 		obj->clearDisabled( DISABLED_DEFAULT );
 
-	}  // end for, obj
+	}
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -117,7 +117,7 @@ void DamDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -135,7 +135,7 @@ void DamDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -146,4 +146,4 @@ void DamDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DestroyDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DestroyDie.cpp
index 9cd64529765..a506d8e8edb 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DestroyDie.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DestroyDie.cpp
@@ -28,18 +28,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Module/DestroyDie.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -72,7 +67,7 @@ void DestroyDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -90,7 +85,7 @@ void DestroyDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -101,4 +96,4 @@ void DestroyDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp
index f4af098b8de..913c2cbba74 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp
@@ -24,10 +24,10 @@
 
 // FILE: DieModule.cpp ////////////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:   
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_OBJECT_STATUS_NAMES
 #include "Common/Xfer.h"
@@ -38,11 +38,6 @@
 #include "GameLogic/Object.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
@@ -54,9 +49,9 @@ DieMuxData::DieMuxData() :
 }
 
 //-------------------------------------------------------------------------------------------------
-const FieldParse* DieMuxData::getFieldParse() 
+const FieldParse* DieMuxData::getFieldParse()
 {
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DeathTypes",				INI::parseDeathTypeFlags,						NULL, offsetof( DieMuxData, m_deathTypes ) },
 		{ "VeterancyLevels",	INI::parseVeterancyLevelFlags,			NULL, offsetof( DieMuxData, m_veterancyLevels ) },
@@ -99,7 +94,7 @@ void DieModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -115,7 +110,7 @@ void DieModule::xfer( Xfer *xfer )
 	// call base class
 	BehaviorModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -126,4 +121,4 @@ void DieModule::loadPostProcess( void )
 	// call base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/EjectPilotDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/EjectPilotDie.cpp
index e6c0e4ae267..a993aa2955e 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/EjectPilotDie.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/EjectPilotDie.cpp
@@ -27,7 +27,7 @@
 // Desc:   Create an object upon this object's death
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/Player.h"
@@ -51,11 +51,11 @@ EjectPilotDieModuleData::EjectPilotDieModuleData() :
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void EjectPilotDieModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void EjectPilotDieModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   DieModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "AirCreationList",		INI::parseObjectCreationList,		NULL, offsetof( EjectPilotDieModuleData, m_oclInAir ) },
 		{ "GroundCreationList",		INI::parseObjectCreationList,		NULL, offsetof( EjectPilotDieModuleData, m_oclOnGround ) },
@@ -109,7 +109,7 @@ void EjectPilotDie::onDie( const DamageInfo * damageInfo )
 	const EjectPilotDieModuleData* d = getEjectPilotDieModuleData();
 	const ObjectCreationList* ocl = getObject()->isSignificantlyAboveTerrain() ? d->m_oclInAir : d->m_oclOnGround;
 	ejectPilot(ocl, getObject(), damageDealer);
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -120,7 +120,7 @@ void EjectPilotDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -138,7 +138,7 @@ void EjectPilotDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -149,4 +149,4 @@ void EjectPilotDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/FXListDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/FXListDie.cpp
index 19ef8176276..2cb4d0adcd6 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/FXListDie.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/FXListDie.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_DAMAGE_NAMES
 #include "Common/INI.h"
@@ -65,7 +65,7 @@ void FXListDie::onDie( const DamageInfo *damageInfo )
 	const FXListDieModuleData* d = getFXListDieModuleData();
 	if (d->m_defaultDeathFX)
 	{
-		
+
 		if (d->m_orientToObject)
 		{
 			Object *damageDealer = TheGameLogic->findObjectByID( damageInfo->in.m_sourceID );
@@ -87,7 +87,7 @@ void FXListDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -105,7 +105,7 @@ void FXListDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -116,4 +116,4 @@ void FXListDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/KeepObjectDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/KeepObjectDie.cpp
index 4de6c46bc73..fa493391cd8 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/KeepObjectDie.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/KeepObjectDie.cpp
@@ -31,7 +31,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
@@ -70,7 +70,7 @@ void KeepObjectDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -88,7 +88,7 @@ void KeepObjectDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -99,4 +99,4 @@ void KeepObjectDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp
index 5bbd58f5437..372d55d0bf2 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDE FILES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -45,11 +45,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -66,7 +61,7 @@ RebuildHoleExposeDieModuleData::RebuildHoleExposeDieModuleData()
 {
 	DieModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "HoleName", INI::parseAsciiString, NULL, offsetof( RebuildHoleExposeDieModuleData, m_holeName ) },
 		{ "HoleMaxHealth", INI::parseReal, NULL, offsetof( RebuildHoleExposeDieModuleData, m_holeMaxHealth ) },
@@ -76,7 +71,7 @@ RebuildHoleExposeDieModuleData::RebuildHoleExposeDieModuleData()
 
 	p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -88,14 +83,14 @@ RebuildHoleExposeDie::RebuildHoleExposeDie( Thing *thing, const ModuleData* modu
 										: DieModule( thing, moduleData )
 {
 
-}  // end RebuildHoleExposeDie
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 RebuildHoleExposeDie::~RebuildHoleExposeDie( void )
 {
 
-}  // end ~RebuildHoleExposeDie
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The die callback. */
@@ -111,8 +106,8 @@ void RebuildHoleExposeDie::onDie( const DamageInfo *damageInfo )
 	// if we are being constructed from either the first time or from a hole reconstruction
 	// we do not "spawn" a hole object
 	//
-	if( us->getControllingPlayer() != ThePlayerList->getNeutralPlayer() 
-		  && us->getControllingPlayer()->isPlayerActive() 
+	if( us->getControllingPlayer() != ThePlayerList->getNeutralPlayer()
+		  && us->getControllingPlayer()->isPlayerActive()
 			&& !us->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 	{
 		Object *hole;
@@ -150,7 +145,7 @@ void RebuildHoleExposeDie::onDie( const DamageInfo *damageInfo )
 		RebuildHoleBehaviorInterface *rhbi = RebuildHoleBehavior::getRebuildHoleBehaviorInterfaceFromObject( hole );
 
 		// sanity
-		DEBUG_ASSERTCRASH( rhbi, ("RebuildHoleExposeDie: No Rebuild Hole Behavior interface on hole\n") );
+		DEBUG_ASSERTCRASH( rhbi, ("RebuildHoleExposeDie: No Rebuild Hole Behavior interface on hole") );
 
 		// start the rebuild process
 		if( rhbi )
@@ -168,9 +163,9 @@ void RebuildHoleExposeDie::onDie( const DamageInfo *damageInfo )
 			}
 		}
 
-	}  // end if
+	}
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -181,7 +176,7 @@ void RebuildHoleExposeDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -199,7 +194,7 @@ void RebuildHoleExposeDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -210,4 +205,4 @@ void RebuildHoleExposeDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/SpecialPowerCompletionDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/SpecialPowerCompletionDie.cpp
index b66f21bf721..3e358233ac9 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/SpecialPowerCompletionDie.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/SpecialPowerCompletionDie.cpp
@@ -27,7 +27,7 @@
 // Desc:   Die method responsible for telling TheScriptEngine that a special power has been completed
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/SpecialPower.h"
@@ -42,14 +42,14 @@ SpecialPowerCompletionDie::SpecialPowerCompletionDie( Thing *thing, const Module
 {
 	m_creatorID = INVALID_ID;
 	m_creatorSet = FALSE;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SpecialPowerCompletionDie::~SpecialPowerCompletionDie( void )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -71,7 +71,7 @@ void SpecialPowerCompletionDie::notifyScriptEngine( void )
 			getSpecialPowerCompletionDieModuleData()->m_specialPowerTemplate->getName(),
 			m_creatorID);
 	}
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -93,7 +93,7 @@ void SpecialPowerCompletionDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -117,7 +117,7 @@ void SpecialPowerCompletionDie::xfer( Xfer *xfer )
 	// creator set
 	xfer->xferBool( &m_creatorSet );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -128,4 +128,4 @@ void SpecialPowerCompletionDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp
index 09beb1e6e5b..737dd9cb2d9 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/Upgrade.h"
@@ -79,7 +79,7 @@ void UpgradeDie::onDie( const DamageInfo *damageInfo )
 				DEBUG_ASSERTCRASH( 0, ("Object %s just died, but is trying to free upgrade %s in it's producer %s%s",
 					getObject()->getTemplate()->getName().str(),
 					getUpgradeDieModuleData()->m_upgradeName.str(),
-					producer->getTemplate()->getName().str(), 
+					producer->getTemplate()->getName().str(),
 					", which the producer doesn't have. This is used in cases where the producer builds an upgrade that can die... like ranger building scout drones.") );
 			}
 		}
@@ -95,7 +95,7 @@ void UpgradeDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -113,7 +113,7 @@ void UpgradeDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -124,4 +124,4 @@ void UpgradeDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp
index 8b8435a8237..2518b38a340 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp
@@ -27,7 +27,7 @@
 // Desc:   Keeps track of experience points so Veterance levels can be gained
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "Common/ThingTemplate.h"
@@ -36,11 +36,6 @@
 #include "GameLogic/Object.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 ExperienceTracker::ExperienceTracker(Object *parent) :
@@ -48,8 +43,9 @@ ExperienceTracker::ExperienceTracker(Object *parent) :
 	m_currentLevel(LEVEL_REGULAR),
 	m_experienceSink(INVALID_ID),
 	m_experienceScalar( 1.0f ),
-	m_currentExperience(0) // Added By Sadullah Nader
+	m_currentExperience(0)
 {
+  resetTrainable();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -70,7 +66,19 @@ Int ExperienceTracker::getExperienceValue( const Object* killer ) const
 //-------------------------------------------------------------------------------------------------
 Bool ExperienceTracker::isTrainable() const
 {
-	return m_parent->getTemplate()->isTrainable();
+	return m_isTrainable;
+}
+
+//-------------------------------------------------------------------------------------------------
+void ExperienceTracker::setTrainable(Bool trainable)
+{
+	m_isTrainable = trainable;
+}
+
+//-------------------------------------------------------------------------------------------------
+void ExperienceTracker::resetTrainable()
+{
+	m_isTrainable = m_parent->getTemplate()->isTrainable();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -85,9 +93,15 @@ void ExperienceTracker::setExperienceSink( ObjectID sink )
 	m_experienceSink = sink;
 }
 
+//-------------------------------------------------------------------------------------------------
+ObjectID ExperienceTracker::getExperienceSink() const
+{
+	return m_experienceSink;
+}
+
 //-------------------------------------------------------------------------------------------------
 // Set Level to AT LEAST this... if we are already >= this level, do nothing.
-void ExperienceTracker::setMinVeterancyLevel( VeterancyLevel newLevel )
+void ExperienceTracker::setMinVeterancyLevel( VeterancyLevel newLevel, Bool provideFeedback )
 {
 	// This does not check for IsTrainable, because this function is for explicit setting,
 	// so the setter is assumed to know what they are doing.  The game function
@@ -98,12 +112,12 @@ void ExperienceTracker::setMinVeterancyLevel( VeterancyLevel newLevel )
 		m_currentLevel = newLevel;
 		m_currentExperience = m_parent->getTemplate()->getExperienceRequired(m_currentLevel); //Minimum for this level
 		if (m_parent)
-			m_parent->onVeterancyLevelChanged( oldLevel, newLevel );
+			m_parent->onVeterancyLevelChanged( oldLevel, newLevel, provideFeedback );
 	}
 }
 
 //-------------------------------------------------------------------------------------------------
-void ExperienceTracker::setVeterancyLevel( VeterancyLevel newLevel )
+void ExperienceTracker::setVeterancyLevel( VeterancyLevel newLevel, Bool provideFeedback )
 {
 	// This does not check for IsTrainable, because this function is for explicit setting,
 	// so the setter is assumed to know what they are doing.  The game function
@@ -114,7 +128,7 @@ void ExperienceTracker::setVeterancyLevel( VeterancyLevel newLevel )
 		m_currentLevel = newLevel;
 		m_currentExperience = m_parent->getTemplate()->getExperienceRequired(m_currentLevel); //Minimum for this level
 		if (m_parent)
-			m_parent->onVeterancyLevelChanged( oldLevel, newLevel );
+			m_parent->onVeterancyLevelChanged( oldLevel, newLevel, provideFeedback );
 	}
 }
 
@@ -172,8 +186,8 @@ void ExperienceTracker::addExperiencePoints( Int experienceGain, Bool canScaleFo
 	m_currentExperience += amountToGain;
 
 	Int levelIndex = 0;
-	while( ( (levelIndex + 1) < LEVEL_COUNT) 
-		&&  m_currentExperience >= m_parent->getTemplate()->getExperienceRequired(levelIndex + 1) 
+	while( ( (levelIndex + 1) < LEVEL_COUNT)
+		&&  m_currentExperience >= m_parent->getTemplate()->getExperienceRequired(levelIndex + 1)
 		)
 	{
 		// If there is a higher level to qualify for, and I qualify for it, advance the index
@@ -190,7 +204,7 @@ void ExperienceTracker::addExperiencePoints( Int experienceGain, Bool canScaleFo
 
 }
 //-------------------------------------------------------------------------------------------------
-void ExperienceTracker::setExperienceAndLevel( Int experienceIn )
+void ExperienceTracker::setExperienceAndLevel( Int experienceIn, Bool provideFeedback )
 {
 	if( m_experienceSink != INVALID_ID )
 	{
@@ -199,7 +213,7 @@ void ExperienceTracker::setExperienceAndLevel( Int experienceIn )
 		if( sinkPointer )
 		{
 			// Not a fatal failure if not valid, he died when I was in the air.
-			sinkPointer->getExperienceTracker()->setExperienceAndLevel( experienceIn );
+			sinkPointer->getExperienceTracker()->setExperienceAndLevel( experienceIn, provideFeedback );
 			return;
 		}
 	}
@@ -212,7 +226,7 @@ void ExperienceTracker::setExperienceAndLevel( Int experienceIn )
 	m_currentExperience = experienceIn;
 
 	Int levelIndex = 0;
-	while( ( (levelIndex + 1) < LEVEL_COUNT) 
+	while( ( (levelIndex + 1) < LEVEL_COUNT)
 		&&  m_currentExperience >= m_parent->getTemplate()->getExperienceRequired(levelIndex + 1)
 		)
 	{
@@ -225,7 +239,7 @@ void ExperienceTracker::setExperienceAndLevel( Int experienceIn )
 	if( oldLevel != m_currentLevel )
 	{
 		// Edge trigger special level gain effects.
-		m_parent->onVeterancyLevelChanged( oldLevel, m_currentLevel ); //<<== paradox! this may be a level lost!
+		m_parent->onVeterancyLevelChanged( oldLevel, m_currentLevel, provideFeedback ); //<<== paradox! this may be a level lost!
 	}
 
 }
@@ -235,19 +249,27 @@ void ExperienceTracker::crc( Xfer *xfer )
 {
 	xfer->xferInt( &m_currentExperience );
 	xfer->xferUser( &m_currentLevel, sizeof( VeterancyLevel ) );
-}  // end crc
+#if !RETAIL_COMPATIBLE_CRC
+	xfer->xferBool(&m_isTrainable);
+#endif
+}
 
 //-----------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
+	* 2: TheSuperHackers @tweak Serialize m_isTrainable
 	*/
 // ----------------------------------------------------------------------------
 void ExperienceTracker::xfer( Xfer *xfer )
 {
 
 	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
 	XferVersion currentVersion = 1;
+#else
+	XferVersion currentVersion = 2;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
@@ -266,11 +288,13 @@ void ExperienceTracker::xfer( Xfer *xfer )
 	// experience scalar
 	xfer->xferReal( &m_experienceScalar );
 
-}  // end xfer
+	if (version >= 2)
+		xfer->xferBool(&m_isTrainable);
+}
 
 //-----------------------------------------------------------------------------
 void ExperienceTracker::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp
index 5810e9c2c28..78bc4fced53 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp
@@ -27,7 +27,7 @@
 // Desc:   Keeps track of shots fired and people targeted for weapons that want a history of such a thing
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioHandleSpecialValues.h"
 #include "Common/GameType.h"
@@ -42,11 +42,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 FiringTracker::FiringTracker(Thing* thing, const ModuleData *modData) : UpdateModule( thing, modData )
@@ -245,7 +240,7 @@ void FiringTracker::speedUp()
 {
 	ModelConditionFlags clr, set;
 	Object *self = getObject();
-	
+
 	if( self->testWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_FAST ) )
 	{
 		//self->clearWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_MEAN );
@@ -270,7 +265,7 @@ void FiringTracker::speedUp()
 
 
 	}
-	else 
+	else
 	{
 
 		self->setWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_MEAN );
@@ -292,13 +287,13 @@ void FiringTracker::coolDown()
 {
 	ModelConditionFlags clr, set;
 
-	if( getObject()->testWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_FAST ) 
+	if( getObject()->testWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_FAST )
 	 || getObject()->testWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_MEAN ))
 	{
 
 		// Straight to zero from wherever it is
 		set.set(MODELCONDITION_CONTINUOUS_FIRE_SLOW);
-		
+
 		getObject()->clearWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_FAST );
 		getObject()->clearWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_MEAN );
 		clr.set(MODELCONDITION_CONTINUOUS_FIRE_FAST);
@@ -335,7 +330,7 @@ void FiringTracker::crc( Xfer *xfer )
 	// object helper base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -362,7 +357,7 @@ void FiringTracker::xfer( Xfer *xfer )
 	// frame to start cooldown
 	xfer->xferUnsignedInt( &m_frameToStartCooldown );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -373,4 +368,4 @@ void FiringTracker::loadPostProcess( void )
 	// object helper back class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp
index 67f2aed1e67..2c7af514764 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp
@@ -26,21 +26,19 @@
 // Simple base object
 // Author: Michael S. Booth, October 2000
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/GhostObject.h"
 #include "GameLogic/Object.h"
 
-GhostObjectManager *TheGhostObjectManager=NULL;
+GhostObjectManager *TheGhostObjectManager = NULL;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 GhostObject::GhostObject(void):
-//Added By Sadullah Nader
-//Initializations missing and needed
 m_parentAngle(0.0f),
 // TheSuperHackers @bugfix tomsons26 26/04/2025 Change initialization of m_parentGeometryIsSmall from 0.0f.
 // Assigning a float to a bool results in the compiler using a random 1 byte value to assign to the bool.
@@ -50,16 +48,14 @@ m_parentGeometryMajorRadius(0.0f),
 m_parentGeometryminorRadius(0.0f),
 m_parentObject(NULL),
 m_partitionData(NULL)
-{ 
+{
 	m_parentPosition.zero();
-	// End Initializations
-}  // end Object
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 GhostObject::~GhostObject()
 {
-
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -67,8 +63,7 @@ GhostObject::~GhostObject()
 // ------------------------------------------------------------------------------------------------
 void GhostObject::crc( Xfer *xfer )
 {
-
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -77,7 +72,6 @@ void GhostObject::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 void GhostObject::xfer( Xfer *xfer )
 {
-
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
@@ -90,20 +84,16 @@ void GhostObject::xfer( Xfer *xfer )
 	xfer->xferObjectID( &parentObjectID );
 	if( xfer->getXferMode() == XFER_LOAD )
 	{
-
 		// tie up parent object pointer
 		m_parentObject = TheGameLogic->findObjectByID( parentObjectID );
 
 		// sanity
 		if( parentObjectID != INVALID_ID && m_parentObject == NULL )
 		{
-
-			DEBUG_CRASH(( "GhostObject::xfer - Unable to connect m_parentObject\n" ));
+			DEBUG_CRASH(( "GhostObject::xfer - Unable to connect m_parentObject" ));
 			throw INI_INVALID_DATA;
-
-		}  // end if
-
-	}  // end if
+		}
+	}
 
 	// parent geometry type
 	xfer->xferUser( &m_parentGeometryType, sizeof( GeometryType ) );
@@ -126,16 +116,14 @@ void GhostObject::xfer( Xfer *xfer )
 	// partition data
 	///@todo write me ---> !!!!!
 	// PartitionData	*m_partitionData;	///< our PartitionData
-
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void GhostObject::loadPostProcess( void )
 {
-
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -143,6 +131,7 @@ GhostObjectManager::GhostObjectManager(void)
 {
 	m_lockGhostObjects = FALSE;
 	m_saveLockGhostObjects = FALSE;
+	m_trackAllPlayers = TheGlobalData->m_enablePlayerObserver;
 	m_localPlayer = 0;
 }
 
@@ -150,14 +139,13 @@ GhostObjectManager::GhostObjectManager(void)
 // ------------------------------------------------------------------------------------------------
 GhostObjectManager::~GhostObjectManager()
 {
-
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void GhostObjectManager::reset(void)
 {
-
+	m_trackAllPlayers = TheGlobalData->m_enablePlayerObserver;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -171,14 +159,12 @@ GhostObject *GhostObjectManager::addGhostObject(Object *object, PartitionData *p
 // ------------------------------------------------------------------------------------------------
 void GhostObjectManager::removeGhostObject(GhostObject *mod)
 {
-
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void GhostObjectManager::updateOrphanedObjects(int *playerIndexList, int numNonLocalPlayers)
+void GhostObjectManager::updateOrphanedObjects(int *playerIndexList, int playerIndexCount)
 {
-
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -197,8 +183,7 @@ void GhostObjectManager::restorePartitionData(void)
 // ------------------------------------------------------------------------------------------------
 void GhostObjectManager::crc( Xfer *xfer )
 {
-
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method:
@@ -207,7 +192,6 @@ void GhostObjectManager::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 void GhostObjectManager::xfer( Xfer *xfer )
 {
-
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
@@ -215,13 +199,11 @@ void GhostObjectManager::xfer( Xfer *xfer )
 
 	// local player
 	xfer->xferInt( &m_localPlayer );
-
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void GhostObjectManager::loadPostProcess( void )
 {
-
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp
index 32921202b35..43aaf537eb9 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp
@@ -36,11 +36,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/ObjectDefectionHelper.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -58,7 +53,7 @@ UpdateSleepTime ObjectDefectionHelper::update()
 	// if we are here, we should be an undetected defector, but
 	// just in case someone has changed us behind our backs...
 	if (!obj->getIsUndetectedDefector())
-		return UPDATE_SLEEP_FOREVER; 
+		return UPDATE_SLEEP_FOREVER;
 
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (now >= m_defectionDetectionEnd)
@@ -72,12 +67,12 @@ UpdateSleepTime ObjectDefectionHelper::update()
 			if (draw)
 				draw->flashAsSelected( &white ); //Whew! that's easier, now, isn't it!
 
-		
+
 			AudioEventRTS defectorVulnerableSound = TheAudio->getMiscAudio()->m_defectorTimerDingSound;
 			defectorVulnerableSound.setObjectID( obj->getID() );
 			TheAudio->addAudioEvent(&defectorVulnerableSound);
 		}
-		return UPDATE_SLEEP_FOREVER;	// hey, we're done. 
+		return UPDATE_SLEEP_FOREVER;	// hey, we're done.
 	}
 
 	// dead or attacking... our cover is blown.
@@ -87,7 +82,7 @@ UpdateSleepTime ObjectDefectionHelper::update()
 		// checking the is_attacking statusbit above, only handles weapon related attacks...
 		// I also set m_undetectedDefector = FALSE in the groupDoSpecialPower[...]( ) functions;
 		obj->friend_setUndetectedDefector(FALSE);
-		return UPDATE_SLEEP_FOREVER;	// hey, we're done. 
+		return UPDATE_SLEEP_FOREVER;	// hey, we're done.
 	}
 
 	if (draw && m_doDefectorFX) // skip fx if merely 'invulnerable'
@@ -97,7 +92,7 @@ UpdateSleepTime ObjectDefectionHelper::update()
 		m_defectionDetectionFlashPhase += 0.5f * ( 1.0f - ((Real)timeLeft / DEFECTION_DETECTION_TIME_MAX ) );
 		Bool thisPhase = ( ((Int)m_defectionDetectionFlashPhase) & 1 );// are we in a flashy phase this frame?
 
-		if ( lastPhase && ( ! thisPhase ) ) 
+		if ( lastPhase && ( ! thisPhase ) )
 		{
 			draw->flashAsSelected(); //Whew! that's easier, now, isn't it!
 
@@ -108,7 +103,7 @@ UpdateSleepTime ObjectDefectionHelper::update()
 		}
 	}
 
-	return UPDATE_SLEEP_NONE; 
+	return UPDATE_SLEEP_NONE;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -141,7 +136,7 @@ void ObjectDefectionHelper::crc( Xfer *xfer )
 	// object helper crc
 	ObjectHelper::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -171,7 +166,7 @@ void ObjectDefectionHelper::xfer( Xfer *xfer )
 	// do defector fx
 	xfer->xferBool( &m_doDefectorFX );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -182,4 +177,4 @@ void ObjectDefectionHelper::loadPostProcess( void )
 	// object helper base class
 	ObjectHelper::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp
index f50df5163b3..14e5533bceb 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp
@@ -34,18 +34,13 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/ObjectHelper.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 ObjectHelper::~ObjectHelper( void )
 {
 
-}  // end ~ObjectHelper
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -57,7 +52,7 @@ void ObjectHelper::sleepUntil(UnsignedInt when)
 	// note the setWakeFrame(NEVER) actually awakens immediately, since NEVER==0.
 	// when we get NEVER in this case, we really want to sleep forever.
 	// so just special case it.
-	UpdateSleepTime wakeDelay = (when == NEVER || when == FOREVER) ? 
+	UpdateSleepTime wakeDelay = (when == NEVER || when == FOREVER) ?
 																UPDATE_SLEEP_FOREVER :
 																UPDATE_SLEEP(when - TheGameLogic->getFrame());
 	setWakeFrame(getObject(), wakeDelay);
@@ -72,7 +67,7 @@ void ObjectHelper::crc( Xfer *xfer )
 	// update module crc
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /* Xfer method
@@ -90,7 +85,7 @@ void ObjectHelper::xfer( Xfer *xfer )
 	// update module xfer
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -101,4 +96,4 @@ void ObjectHelper::loadPostProcess( void )
 	// update module post process
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectRepulsorHelper.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectRepulsorHelper.cpp
index 9099996e43b..c3c39591c7b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectRepulsorHelper.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectRepulsorHelper.cpp
@@ -48,7 +48,7 @@ UpdateSleepTime ObjectRepulsorHelper::update()
 	getObject()->clearStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_REPULSOR ) );
 
 	// then go back to sleep until we are forcibly awakened.
-	return UPDATE_SLEEP_FOREVER; 
+	return UPDATE_SLEEP_FOREVER;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -60,7 +60,7 @@ void ObjectRepulsorHelper::crc( Xfer *xfer )
 	// object helper crc
 	ObjectHelper::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -78,7 +78,7 @@ void ObjectRepulsorHelper::xfer( Xfer *xfer )
 	// object helper base class
 	ObjectHelper::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -89,5 +89,5 @@ void ObjectRepulsorHelper::loadPostProcess( void )
 	// object helper base class
 	ObjectHelper::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectSMCHelper.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectSMCHelper.cpp
index e112b1e3ddf..0de2401d8b7 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectSMCHelper.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectSMCHelper.cpp
@@ -48,7 +48,7 @@ UpdateSleepTime ObjectSMCHelper::update()
 	getObject()->clearSpecialModelConditionStates();
 
 	// then go back to sleep until we are forcibly awakened.
-	return UPDATE_SLEEP_FOREVER; 
+	return UPDATE_SLEEP_FOREVER;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -60,7 +60,7 @@ void ObjectSMCHelper::crc( Xfer *xfer )
 	// object helper crc
 	ObjectHelper::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -78,7 +78,7 @@ void ObjectSMCHelper::xfer( Xfer *xfer )
 	// object helper base class
 	ObjectHelper::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -89,5 +89,5 @@ void ObjectSMCHelper::loadPostProcess( void )
 	// object helper base class
 	ObjectHelper::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectWeaponStatusHelper.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectWeaponStatusHelper.cpp
index 0fa4fcf4941..1e753641e22 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectWeaponStatusHelper.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectWeaponStatusHelper.cpp
@@ -34,8 +34,8 @@
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-ObjectWeaponStatusHelper::~ObjectWeaponStatusHelper( void ) 
-{ 
+ObjectWeaponStatusHelper::~ObjectWeaponStatusHelper( void )
+{
 
 }
 
@@ -48,7 +48,7 @@ void ObjectWeaponStatusHelper::crc( Xfer *xfer )
 	// object helper crc
 	ObjectHelper::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -66,7 +66,7 @@ void ObjectWeaponStatusHelper::xfer( Xfer *xfer )
 	// object helper base class
 	ObjectHelper::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -77,4 +77,4 @@ void ObjectWeaponStatusHelper::loadPostProcess( void )
 	// object helper base class
 	ObjectHelper::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp
index f465dcce7d0..06d42d780c1 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_SURFACECATEGORY_NAMES
 #define DEFINE_LOCO_Z_NAMES
@@ -46,11 +46,6 @@
 #include "GameLogic/Module/BodyModule.h"
 #include "GameLogic/Module/AIUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static const Real DONUT_TIME_DELAY_SECONDS=2.5f;
 static const Real DONUT_DISTANCE=4.0*PATHFIND_CELL_SIZE_F;
@@ -64,7 +59,7 @@ LocomotorStore *TheLocomotorStore = NULL;					///< the Locomotor store definitio
 
 const Real BIGNUM = 99999.0f;
 
-static const char *TheLocomotorPriorityNames[] = 
+static const char *const TheLocomotorPriorityNames[] =
 {
 	"MOVES_BACK",
 	"MOVES_MIDDLE",
@@ -72,7 +67,7 @@ static const char *TheLocomotorPriorityNames[] =
 
 	NULL
 };
-
+static_assert(ARRAY_SIZE(TheLocomotorPriorityNames) == LOCOMOTOR_PRIORITY_COUNT + 1, "Array size");
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -168,7 +163,7 @@ static Real tryToRotateVector3D(
 		Matrix3D rotMtx(objCrossGoal, angleBetween);
 		actualDir = rotMtx.Rotate_Vector(curDir);
 	}
-	
+
 	return angleBetween;
 }
 
@@ -197,8 +192,8 @@ inline Real tryToOrientInThisDirection3D(Object* obj, Real maxTurnRate, const Co
 
 //-----------------------------------------------------------------------------
 static void calcDirectionToApplyThrust(
-	const Object* obj, 
-	const PhysicsBehavior* physics, 
+	const Object* obj,
+	const PhysicsBehavior* physics,
 	const Coord3D& ingoalPos,
 	Real maxAccel,
 	Vector3& goalDir
@@ -210,7 +205,7 @@ static void calcDirectionToApplyThrust(
 
 		this is complicated by the fact that we generally have an intrinsic velocity already,
 		that must be accounted for, and by the fact that we can only apply force in our
-		forward-x-direction (with a thrust-angle-range), and (due to limited range) might not 
+		forward-x-direction (with a thrust-angle-range), and (due to limited range) might not
 		be able to apply the force in the optimal direction!
 	*/
 
@@ -252,7 +247,7 @@ static void calcDirectionToApplyThrust(
 			// choose the smallest positive t.
 			if (t < 0 || (t2 >= 0 && t2 < t))
 				t = t2;
-			
+
 			// plug it in.
 			if (!isNearlyZero(t))
 			{
@@ -362,13 +357,13 @@ void LocomotorTemplate::validate()
 	// this is ok; parachutes need it!
 	//DEBUG_ASSERTCRASH(m_lift == 0.0f || m_lift > fabs(TheGlobalData->m_gravity), ("Lift is too low to counteract gravity!"));
 	//DEBUG_ASSERTCRASH(m_liftDamaged == 0.0f || m_liftDamaged > fabs(TheGlobalData->m_gravity), ("LiftDamaged is too low to counteract gravity!"));
-	//DEBUG_ASSERTCRASH(m_preferredHeight == 0.0f || (m_behaviorZ == Z_SURFACE_RELATIVE_HEIGHT || m_behaviorZ == Z_ABSOLUTE_HEIGHT || m_appearance == LOCO_THRUST), 
+	//DEBUG_ASSERTCRASH(m_preferredHeight == 0.0f || (m_behaviorZ == Z_SURFACE_RELATIVE_HEIGHT || m_behaviorZ == Z_ABSOLUTE_HEIGHT || m_appearance == LOCO_THRUST),
 	//	("You must use Z_SURFACE_RELATIVE_HEIGHT or Z_ABSOLUTE_HEIGHT (or THRUST) to use preferredHeight"));
 
 	// for 'damaged' stuff that was omitted, set 'em to be the same as 'undamaged'...
 	if (m_maxSpeedDamaged < 0.0f)
 		m_maxSpeedDamaged = m_maxSpeed;
-	
+
 	if (m_maxTurnRateDamaged < 0.0f)
 		m_maxTurnRateDamaged = m_maxTurnRate;
 
@@ -398,25 +393,25 @@ void LocomotorTemplate::validate()
 				m_lift != 0.0f ||
 				m_liftDamaged != 0.0f)
 		{
-			DEBUG_CRASH(("THRUST locos may not use ZAxisBehavior or lift!\n"));
+			DEBUG_CRASH(("THRUST locos may not use ZAxisBehavior or lift!"));
 			throw INI_INVALID_DATA;
 		}
 		if (m_maxSpeed <= 0.0f)
 		{
 			// if one of these was omitted, it defaults to zero... just quietly heal it here, rather than crashing
-			DEBUG_LOG(("THRUST locos may not have zero m_maxSpeed; healing...\n"));
+			DEBUG_LOG(("THRUST locos may not have zero m_maxSpeed; healing..."));
 			m_maxSpeed = 0.01f;
 		}
 		if (m_maxSpeedDamaged <= 0.0f)
 		{
 			// if one of these was omitted, it defaults to zero... just quietly heal it here, rather than crashing
-			DEBUG_LOG(("THRUST locos may not have zero m_maxSpeedDamaged; healing...\n"));
+			DEBUG_LOG(("THRUST locos may not have zero m_maxSpeedDamaged; healing..."));
 			m_maxSpeedDamaged = 0.01f;
 		}
 		if (m_minSpeed <= 0.0f)
 		{
 			// if one of these was omitted, it defaults to zero... just quietly heal it here, rather than crashing
-			DEBUG_LOG(("THRUST locos may not have zero m_minSpeed; healing...\n"));
+			DEBUG_LOG(("THRUST locos may not have zero m_minSpeed; healing..."));
 			m_minSpeed = 0.01f;
 		}
 	}
@@ -428,73 +423,73 @@ static void parseFrictionPerSec( INI* ini, void * /*instance*/, void *store, con
 	Real fricPerSec = INI::scanReal(ini->getNextToken());
 	Real fricPerFrame = fricPerSec * SECONDS_PER_LOGICFRAME_REAL;
 	*(Real *)store = fricPerFrame;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
-const FieldParse* LocomotorTemplate::getFieldParse() const  
+const FieldParse* LocomotorTemplate::getFieldParse() const
 {
 	static const FieldParse TheFieldParse[] =
 	{
-		{ "Surfaces", INI::parseBitString32, TheLocomotorSurfaceTypeNames, offsetof(LocomotorTemplate, m_surfaces) },		
-		{ "Speed", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_maxSpeed) },		
+		{ "Surfaces", INI::parseBitString32, TheLocomotorSurfaceTypeNames, offsetof(LocomotorTemplate, m_surfaces) },
+		{ "Speed", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_maxSpeed) },
 		{ "SpeedDamaged", INI::parseVelocityReal, NULL, offsetof( LocomotorTemplate, m_maxSpeedDamaged ) },
-		{ "TurnRate", INI::parseAngularVelocityReal, NULL, offsetof(LocomotorTemplate, m_maxTurnRate) },		
+		{ "TurnRate", INI::parseAngularVelocityReal, NULL, offsetof(LocomotorTemplate, m_maxTurnRate) },
 		{ "TurnRateDamaged", INI::parseAngularVelocityReal, NULL, offsetof( LocomotorTemplate, m_maxTurnRateDamaged ) },
-		{ "Acceleration", INI::parseAccelerationReal, NULL, offsetof(LocomotorTemplate, m_acceleration) },		
+		{ "Acceleration", INI::parseAccelerationReal, NULL, offsetof(LocomotorTemplate, m_acceleration) },
 		{ "AccelerationDamaged", INI::parseAccelerationReal, NULL, offsetof( LocomotorTemplate, m_accelerationDamaged ) },
-		{ "Lift", INI::parseAccelerationReal, NULL, offsetof(LocomotorTemplate, m_lift) },		
+		{ "Lift", INI::parseAccelerationReal, NULL, offsetof(LocomotorTemplate, m_lift) },
 		{ "LiftDamaged", INI::parseAccelerationReal, NULL, offsetof( LocomotorTemplate, m_liftDamaged ) },
-		{ "Braking", INI::parseAccelerationReal, NULL, offsetof(LocomotorTemplate, m_braking) },		
-		{ "MinSpeed", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_minSpeed) },		
-		{ "MinTurnSpeed", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_minTurnSpeed) },		
+		{ "Braking", INI::parseAccelerationReal, NULL, offsetof(LocomotorTemplate, m_braking) },
+		{ "MinSpeed", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_minSpeed) },
+		{ "MinTurnSpeed", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_minTurnSpeed) },
 		{ "PreferredHeight", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_preferredHeight) },
 		{ "PreferredHeightDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_preferredHeightDamping) },
 		{ "CirclingRadius", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_circlingRadius) },
 		{ "Extra2DFriction", parseFrictionPerSec, NULL, offsetof(LocomotorTemplate, m_extra2DFriction) },
 		{ "SpeedLimitZ", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_speedLimitZ) },
 		{ "MaxThrustAngle", INI::parseAngleReal, NULL, offsetof(LocomotorTemplate, m_maxThrustAngle) },		// yes, angle, not angular-vel
-		{ "ZAxisBehavior", INI::parseIndexList, TheLocomotorBehaviorZNames, offsetof(LocomotorTemplate, m_behaviorZ) },		
+		{ "ZAxisBehavior", INI::parseIndexList, TheLocomotorBehaviorZNames, offsetof(LocomotorTemplate, m_behaviorZ) },
 		{ "Appearance", INI::parseIndexList, TheLocomotorAppearanceNames, offsetof(LocomotorTemplate, m_appearance) },		\
 		{ "GroupMovementPriority", INI::parseIndexList, TheLocomotorPriorityNames, offsetof(LocomotorTemplate, m_movePriority) },		\
 
-		{ "AccelerationPitchLimit", INI::parseAngleReal, NULL, offsetof(LocomotorTemplate, m_accelPitchLimit) },		
-		{ "BounceAmount", INI::parseAngularVelocityReal, NULL, offsetof(LocomotorTemplate, m_bounceKick) },		
-		{ "PitchStiffness", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_pitchStiffness) },		
-		{ "RollStiffness", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_rollStiffness) },		
-		{ "PitchDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_pitchDamping) },		
-		{ "RollDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_rollDamping) },		
+		{ "AccelerationPitchLimit", INI::parseAngleReal, NULL, offsetof(LocomotorTemplate, m_accelPitchLimit) },
+		{ "BounceAmount", INI::parseAngularVelocityReal, NULL, offsetof(LocomotorTemplate, m_bounceKick) },
+		{ "PitchStiffness", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_pitchStiffness) },
+		{ "RollStiffness", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_rollStiffness) },
+		{ "PitchDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_pitchDamping) },
+		{ "RollDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_rollDamping) },
 		{ "ThrustRoll", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_thrustRoll) },
 		{ "ThrustWobbleRate",	INI::parseReal, NULL, offsetof(LocomotorTemplate, m_wobbleRate) },
 		{ "ThrustMinWobble",	INI::parseReal, NULL, offsetof(LocomotorTemplate, m_minWobble) },
 		{ "ThrustMaxWobble",	INI::parseReal, NULL, offsetof(LocomotorTemplate, m_maxWobble) },
-		{ "PitchInDirectionOfZVelFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_pitchByZVelCoef) },		
-		{ "ForwardVelocityPitchFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_forwardVelCoef) },		
-		{ "LateralVelocityRollFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_lateralVelCoef) },		
-		{ "ForwardAccelerationPitchFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_forwardAccelCoef) },		
-		{ "LateralAccelerationRollFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_lateralAccelCoef) },		
-		{ "UniformAxialDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_uniformAxialDamping) },		
-		{ "TurnPivotOffset", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_turnPivotOffset) },		
+		{ "PitchInDirectionOfZVelFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_pitchByZVelCoef) },
+		{ "ForwardVelocityPitchFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_forwardVelCoef) },
+		{ "LateralVelocityRollFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_lateralVelCoef) },
+		{ "ForwardAccelerationPitchFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_forwardAccelCoef) },
+		{ "LateralAccelerationRollFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_lateralAccelCoef) },
+		{ "UniformAxialDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_uniformAxialDamping) },
+		{ "TurnPivotOffset", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_turnPivotOffset) },
 		{ "Apply2DFrictionWhenAirborne", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_apply2DFrictionWhenAirborne) },
-		{ "DownhillOnly", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_downhillOnly) },		
+		{ "DownhillOnly", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_downhillOnly) },
 		{ "AllowAirborneMotiveForce", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_allowMotiveForceWhileAirborne) },
 		{ "LocomotorWorksWhenDead", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_locomotorWorksWhenDead) },
 		{ "AirborneTargetingHeight", INI::parseInt, NULL, offsetof( LocomotorTemplate, m_airborneTargetingHeight ) },
-		{ "StickToGround",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_stickToGround) },		
-		{ "CanMoveBackwards",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_canMoveBackward) },		
-		{ "HasSuspension",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_hasSuspension) },		
-		{ "FrontWheelTurnAngle", INI::parseAngleReal, NULL, offsetof(LocomotorTemplate, m_wheelTurnAngle) },		
-		{ "MaximumWheelExtension", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_maximumWheelExtension) },		
-		{ "MaximumWheelCompression", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_maximumWheelCompression) },		
+		{ "StickToGround",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_stickToGround) },
+		{ "CanMoveBackwards",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_canMoveBackward) },
+		{ "HasSuspension",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_hasSuspension) },
+		{ "FrontWheelTurnAngle", INI::parseAngleReal, NULL, offsetof(LocomotorTemplate, m_wheelTurnAngle) },
+		{ "MaximumWheelExtension", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_maximumWheelExtension) },
+		{ "MaximumWheelCompression", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_maximumWheelCompression) },
 		{ "CloseEnoughDist",				 INI::parseReal, NULL, offsetof(LocomotorTemplate, m_closeEnoughDist) },
 		{ "CloseEnoughDist3D",			 INI::parseBool, NULL, offsetof(LocomotorTemplate, m_isCloseEnoughDist3D) },
 		{ "SlideIntoPlaceTime",		INI::parseDurationReal, NULL, offsetof(LocomotorTemplate, m_ultraAccurateSlideIntoPlaceFactor) },
 
-		{ "WanderWidthFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_wanderWidthFactor) },		
+		{ "WanderWidthFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_wanderWidthFactor) },
 		{ "WanderLengthFactor",				 INI::parseReal, NULL, offsetof(LocomotorTemplate, m_wanderLengthFactor) },
 		{ "WanderAboutPointRadius",				 INI::parseReal, NULL, offsetof(LocomotorTemplate, m_wanderAboutPointRadius) },
 
-		{ NULL, NULL, NULL, 0 }  // keep this last	
-	
+		{ NULL, NULL, NULL, 0 }
+
 	};
 	return TheFieldParse;
 }
@@ -504,7 +499,7 @@ const FieldParse* LocomotorTemplate::getFieldParse() const
 //-------------------------------------------------------------------------------------------------
 LocomotorStore::LocomotorStore()
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 LocomotorStore::~LocomotorStore()
@@ -525,7 +520,7 @@ LocomotorTemplate* LocomotorStore::findLocomotorTemplate(NameKeyType namekey)
 		return NULL;
 
   LocomotorTemplateMap::iterator it = m_locomotorTemplates.find(namekey);
-  if (it == m_locomotorTemplates.end()) 
+  if (it == m_locomotorTemplates.end())
 		return NULL;
 	else
 		return (*it).second;
@@ -538,7 +533,7 @@ const LocomotorTemplate* LocomotorStore::findLocomotorTemplate(NameKeyType namek
 		return NULL;
 
   LocomotorTemplateMap::const_iterator it = m_locomotorTemplates.find(namekey);
-  if (it == m_locomotorTemplates.end()) 
+  if (it == m_locomotorTemplates.end())
 	{
 		return NULL;
 	}
@@ -589,7 +584,7 @@ LocomotorTemplate *LocomotorStore::newOverride( LocomotorTemplate *locoTemplate
 	// return the newly created override for us to set values with etc
 	return newTemplate;
 
-}  // end newOverride
+}
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ void LocomotorStore::parseLocomotorTemplateDefinition(INI* ini)
@@ -601,12 +596,12 @@ LocomotorTemplate *LocomotorStore::newOverride( LocomotorTemplate *locoTemplate
 	// read the Locomotor name
 	const char* token = ini->getNextToken();
 	NameKeyType namekey = NAMEKEY(token);
-	
+
 	LocomotorTemplate *loco = TheLocomotorStore->findLocomotorTemplate(namekey);
 	if (loco) {
 		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES) {
 			loco = TheLocomotorStore->newOverride((LocomotorTemplate*) loco->friend_getFinalOverride());
-		} 
+		}
 		isOverride = true;
 	} else {
 		loco = newInstance(LocomotorTemplate);
@@ -618,8 +613,8 @@ LocomotorTemplate *LocomotorStore::newOverride( LocomotorTemplate *locoTemplate
 	loco->friend_setName(token);
 	ini->initFromINI(loco, loco->getFieldParse());
 	loco->validate();
-	
-	// if this is an override, then we want the pointer on the existing named locomotor to point us 
+
+	// if this is an override, then we want the pointer on the existing named locomotor to point us
 	// to the override, so don't add it to the map.
 	if (!isOverride)
 		TheLocomotorStore->m_locomotorTemplates[namekey] = loco;
@@ -665,13 +660,8 @@ Locomotor::Locomotor(const LocomotorTemplate* tmpl)
 //-------------------------------------------------------------------------------------------------
 Locomotor::Locomotor(const Locomotor& that)
 {
-	//Added By Sadullah Nader
-	//Initializations 
 	m_angleOffset = 0.0f;
 	m_maintainPos.zero();
-
-	//
-	
 	m_template = that.m_template;
 	m_brakingFactor = that.m_brakingFactor;
 	m_maxLift = that.m_maxLift;
@@ -714,7 +704,7 @@ Locomotor& Locomotor::operator=(const Locomotor& that)
 }
 
 //-------------------------------------------------------------------------------------------------
-Locomotor::~Locomotor() 
+Locomotor::~Locomotor()
 {
 }
 
@@ -724,7 +714,7 @@ Locomotor::~Locomotor()
 void Locomotor::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -759,7 +749,7 @@ void Locomotor::xfer( Xfer *xfer )
 	xfer->xferReal(&m_angleOffset);
 	xfer->xferReal(&m_offsetIncrement);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -767,10 +757,10 @@ void Locomotor::xfer( Xfer *xfer )
 void Locomotor::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
-void Locomotor::startMove(void) 
+void Locomotor::startMove(void)
 {
 	// Reset the donut timer.
 	m_donutTimer = TheGameLogic->getFrame()+DONUT_TIME_DELAY_SECONDS*LOGICFRAMES_PER_SECOND;
@@ -871,7 +861,7 @@ void Locomotor::locoUpdate_moveTowardsAngle(Object* obj, Real goalAngle)
 	}
 
 #ifdef DEBUG_OBJECT_ID_EXISTS
-//	DEBUG_ASSERTLOG(obj->getID() != TheObjectIDToDebug, ("locoUpdate_moveTowardsAngle %f (%f deg), spd %f (%f)\n",goalAngle,goalAngle*180/PI,physics->getSpeed(),physics->getForwardSpeed2D()));
+//	DEBUG_ASSERTLOG(obj->getID() != TheObjectIDToDebug, ("locoUpdate_moveTowardsAngle %f (%f deg), spd %f (%f)",goalAngle,goalAngle*180/PI,physics->getSpeed(),physics->getForwardSpeed2D()));
 #endif
 
 	Real minSpeed = getMinSpeed();
@@ -886,13 +876,13 @@ void Locomotor::locoUpdate_moveTowardsAngle(Object* obj, Real goalAngle)
 		const Real onPathDistToGoal = 99999.0f;
 		Bool blocked = false;
 		locoUpdate_moveTowardsPosition(obj, desiredPos, onPathDistToGoal, minSpeed, &blocked);
-		
+
 		// don't need to call handleBehaviorZ() here, since locoUpdate_moveTowardsPosition() will do so
 		return;
 	}
 	else
 	{
-		DEBUG_ASSERTCRASH(m_template->m_appearance != LOCO_THRUST, ("THRUST should always have minspeeds!\n"));
+		DEBUG_ASSERTCRASH(m_template->m_appearance != LOCO_THRUST, ("THRUST should always have minspeeds!"));
 		Coord3D desiredPos = *obj->getPosition();
 		desiredPos.x += Cos(goalAngle) * 1000.0f;
 		desiredPos.y += Sin(goalAngle) * 1000.0f;
@@ -932,20 +922,20 @@ void Locomotor::setPhysicsOptions(Object* obj)
 }
 
 //-------------------------------------------------------------------------------------------------
-void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalPos, 
+void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalPos,
 																							 Real onPathDistToGoal, Real desiredSpeed, Bool *blocked)
 {
 	setFlag(MAINTAIN_POS_IS_VALID, false);
 
 	BodyDamageType bdt = obj->getBodyModule()->getDamageState();
 	Real maxSpeed = getMaxSpeedForCondition(bdt);
-	
+
 	// sanity, we cannot use desired speed that is greater than our max speed we are capable of moving at
 	if( desiredSpeed > maxSpeed )
 		desiredSpeed = maxSpeed;
 
 	Real distToStopAtMaxSpeed = (maxSpeed/getBraking()) * (maxSpeed)/2.0f;
-	if (onPathDistToGoal>PATHFIND_CELL_SIZE_F && onPathDistToGoal > distToStopAtMaxSpeed) 
+	if (onPathDistToGoal>PATHFIND_CELL_SIZE_F && onPathDistToGoal > distToStopAtMaxSpeed)
 	{
 		setFlag(IS_BRAKING, false);
 		m_brakingFactor = 1.0f;
@@ -958,7 +948,7 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 	}
 
 #ifdef DEBUG_OBJECT_ID_EXISTS
-//	DEBUG_ASSERTLOG(obj->getID() != TheObjectIDToDebug, ("locoUpdate_moveTowardsPosition %f %f %f (dtg %f, spd %f), speed %f (%f)\n",goalPos.x,goalPos.y,goalPos.z,onPathDistToGoal,desiredSpeed,physics->getSpeed(),physics->getForwardSpeed2D()));
+//	DEBUG_ASSERTLOG(obj->getID() != TheObjectIDToDebug, ("locoUpdate_moveTowardsPosition %f %f %f (dtg %f, spd %f), speed %f (%f)",goalPos.x,goalPos.y,goalPos.z,onPathDistToGoal,desiredSpeed,physics->getSpeed(),physics->getForwardSpeed2D()));
 #endif
 
 	//
@@ -966,11 +956,11 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 	// objects we don't need the pathfinder so we'll ignore this
 	//
 	if( BitIsSet( m_template->m_surfaces, LOCOMOTORSURFACE_AIR ) == false &&
-			!TheAI->pathfinder()->validMovementTerrain(obj->getLayer(), this, obj->getPosition()) && 
-			!getFlag(ALLOW_INVALID_POSITION)) 
+			!TheAI->pathfinder()->validMovementTerrain(obj->getLayer(), this, obj->getPosition()) &&
+			!getFlag(ALLOW_INVALID_POSITION))
 	{
 		// Somehow, we have gotten to an invalid location.
-		if (fixInvalidPosition(obj, physics)) 
+		if (fixInvalidPosition(obj, physics))
 		{
 			// the we adjusted us toward a legal position, so just return.
 			return;
@@ -982,64 +972,64 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 	Real dy = goalPos.y - obj->getPosition()->y;
 	Real dz = goalPos.z - obj->getPosition()->z;
 	Real dist = sqrt(dx*dx+dy*dy);
-	if (dist>onPathDistToGoal) 
+	if (dist>onPathDistToGoal)
 	{
-		if (!obj->isKindOf(KINDOF_PROJECTILE) && dist>2*onPathDistToGoal) 
+		if (!obj->isKindOf(KINDOF_PROJECTILE) && dist>2*onPathDistToGoal)
 		{
 			setFlag(IS_BRAKING, true);
 		}
 		onPathDistToGoal = dist;
 	}
 
-	Coord3D nullAccel;							
-	
+	Coord3D nullAccel;
+
 	Bool treatAsAirborne = false;
 	Coord3D pos = *obj->getPosition();
 	Real heightAboveSurface = pos.z - TheTerrainLogic->getLayerHeight(pos.x, pos.y, obj->getLayer());
 
-	if (heightAboveSurface > -(3*3)*TheGlobalData->m_gravity) 
+	if (heightAboveSurface > -(3*3)*TheGlobalData->m_gravity)
 	{
 		// If we get high enough to stay up for 3 frames, then we left the ground.
 		treatAsAirborne = true;
 	}
-	// We apply a zero acceleration to all units, as the call to 
+	// We apply a zero acceleration to all units, as the call to
 	// applyMotiveForce flags an object as being "driven" by a locomotor, rather
 	// than being pushed around by objects bumping it.
 	nullAccel.x = nullAccel.y = nullAccel.z = 0;
 	physics->applyMotiveForce(&nullAccel);
 
-	if (*blocked) 
+	if (*blocked)
 	{
-		if (desiredSpeed > physics->getVelocityMagnitude()) 
+		if (desiredSpeed > physics->getVelocityMagnitude())
 		{
 			*blocked = false;
 		}
-		if (treatAsAirborne && BitIsSet( m_template->m_surfaces, LOCOMOTORSURFACE_AIR ) ) 
+		if (treatAsAirborne && BitIsSet( m_template->m_surfaces, LOCOMOTORSURFACE_AIR ) )
 		{
 			// Airborne flying objects don't collide for now.  jba.
 			*blocked = false;
 		}
 	}
 
-	if (*blocked) 
+	if (*blocked)
 	{
 		physics->scrubVelocity2D(desiredSpeed); // stop if we are about to run into the blocking object.
 		Real turnRate = getMaxTurnRate(obj->getBodyModule()->getDamageState());
-		if (m_template->m_wanderWidthFactor == 0.0f) 
+		if (m_template->m_wanderWidthFactor == 0.0f)
 		{
 			*blocked = (TURN_NONE != rotateObjAroundLocoPivot(obj, goalPos, turnRate));
 		}
-		
+
 		// it is very important to be sure to call this in all situations, even if not moving in 2d space.
 		handleBehaviorZ(obj, physics, goalPos);
 		return;
 	}
 
-	if ( 
+	if (
 // srj sez: I don't know why we didn't want HOVERs to allow to "brake".
 // we actually really want them to, because it allows much more precise destination positioning.
 //			m_template->m_appearance == LOCO_HOVER ||
-				m_template->m_appearance == LOCO_WINGS) 
+				m_template->m_appearance == LOCO_WINGS)
 	{
 		setFlag(IS_BRAKING, false);
 	}
@@ -1049,7 +1039,7 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 	physics->setTurning(TURN_NONE);
 	if (getAllowMotiveForceWhileAirborne() || !treatAsAirborne)
 	{
-		switch (m_template->m_appearance) 
+		switch (m_template->m_appearance)
 		{
 			case LOCO_LEGS_TWO:
 					moveTowardsPositionLegs(obj, physics, goalPos, onPathDistToGoal, desiredSpeed);
@@ -1083,12 +1073,12 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 	// Objects that are braking don't follow the normal physics, so they end up at their destination exactly.
 	obj->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_BRAKING ), getFlag(IS_BRAKING) );
 
-	if (wasBraking) 
+	if (wasBraking)
 	{
 	#define MIN_VEL (PATHFIND_CELL_SIZE_F/(LOGICFRAMES_PER_SECOND))
 
 		Coord3D pos = *obj->getPosition();
-		if (obj->isKindOf(KINDOF_PROJECTILE)) 
+		if (obj->isKindOf(KINDOF_PROJECTILE))
 		{
 			// Projectiles never stop braking once they start.  jba.
 			obj->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_BRAKING ) );
@@ -1100,7 +1090,7 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 			if (vel > dist)
 				vel = dist;	// do not overcompensate!
 			// Normalize.
-			if (dist > 0.001f) 
+			if (dist > 0.001f)
 			{
 				dist = 1.0f / dist;
 				dx *= dist;
@@ -1110,15 +1100,15 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 				pos.y += dy * vel;
 				pos.z += dz * vel;
 			}
-		}	
-		else 
+		}
+		else
 		{
 			// not projectiles only cheat in x & y.
 			// Normalize.
-			if (dist > 0.001f) 
+			if (dist > 0.001f)
 			{
 				Real vel = fabs(physics->getForwardSpeed2D());
-				if (vel < MIN_VEL) 
+				if (vel < MIN_VEL)
 					vel = MIN_VEL;
 				if (vel > dist)
 					vel = dist;	// do not overcompensate!
@@ -1169,7 +1159,7 @@ void Locomotor::moveTowardsPositionTreads(Object* obj, PhysicsBehavior *physics,
 
 	Real dx = obj->getPosition()->x - goalPos.x;
 	Real dy = obj->getPosition()->y - goalPos.y;
-	
+
 
 	Real goalSpeed = (1.0f - angleCoeff) * desiredSpeed;
 
@@ -1179,7 +1169,7 @@ void Locomotor::moveTowardsPositionTreads(Object* obj, PhysicsBehavior *physics,
 
 	Real actualSpeed = physics->getForwardSpeed2D();
 	Real slowDownTime = actualSpeed / getBraking();
-	Real slowDownDist = (actualSpeed/1.50f) * slowDownTime;	
+	Real slowDownDist = (actualSpeed/1.50f) * slowDownTime;
 
 	if (sqr(dx)+sqr(dy)<sqr(2*PATHFIND_CELL_SIZE_F) && angleCoeff > 0.05) {
 		goalSpeed = actualSpeed*0.6f;
@@ -1191,12 +1181,12 @@ void Locomotor::moveTowardsPositionTreads(Object* obj, PhysicsBehavior *physics,
 		m_brakingFactor = 1.1f;
 	}
 
-	if (onPathDistToGoal>PATHFIND_CELL_SIZE_F && onPathDistToGoal > 2.0*slowDownDist) 
+	if (onPathDistToGoal>PATHFIND_CELL_SIZE_F && onPathDistToGoal > 2.0*slowDownDist)
 	{
 		setFlag(IS_BRAKING, false);
 	}
 
-	if (getFlag(IS_BRAKING)) 
+	if (getFlag(IS_BRAKING))
 	{
 		m_brakingFactor = slowDownDist/onPathDistToGoal;
 		m_brakingFactor *= m_brakingFactor;
@@ -1215,7 +1205,7 @@ void Locomotor::moveTowardsPositionTreads(Object* obj, PhysicsBehavior *physics,
 	}
 
 
-	//DEBUG_LOG(("Actual speed %f, Braking factor %f, slowDownDist %f, Pathdist %f, goalSpeed %f\n", 
+	//DEBUG_LOG(("Actual speed %f, Braking factor %f, slowDownDist %f, Pathdist %f, goalSpeed %f",
 	//	actualSpeed, m_brakingFactor, slowDownDist, onPathDistToGoal, goalSpeed));
 
 	//
@@ -1229,7 +1219,7 @@ void Locomotor::moveTowardsPositionTreads(Object* obj, PhysicsBehavior *physics,
 		Real accelForce = mass * acceleration;
 
 		/*
-			don't accelerate/brake more than necessary. do a quick calc to 
+			don't accelerate/brake more than necessary. do a quick calc to
 			see how much force we really need to achieve our goal speed...
 		*/
 		Real maxForceNeeded = mass * speedDelta;
@@ -1274,7 +1264,7 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 	Bool moveBackwards = false;
 
 	// Wheeled vehicles can only turn while moving, so make sure the turn speed is reasonable.
-	if (turnSpeed < maxSpeed/4.0f) 
+	if (turnSpeed < maxSpeed/4.0f)
 	{
 		turnSpeed = maxSpeed/4.0f;
 	}
@@ -1288,7 +1278,7 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 		if (m_template->m_canMoveBackward && fabs(relAngle) > PI/2) {
 			setFlag(MOVING_BACKWARDS, true );
 			setFlag(DOING_THREE_POINT_TURN, onPathDistToGoal>5*obj->getGeometryInfo().getMajorRadius());
-		}																						
+		}
 
 	}
 	if (getFlag(MOVING_BACKWARDS)) {
@@ -1303,14 +1293,14 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 				desiredAngle = stdAngleDiff(desiredAngle, PI);
 				relAngle = stdAngleDiff(desiredAngle, angle);
 			}
-		} 
+		}
 	}
 #endif
 
 	const Real SMALL_TURN = PI / 20.0f;
-	if ((Real)fabs( relAngle ) > SMALL_TURN) 
+	if ((Real)fabs( relAngle ) > SMALL_TURN)
 	{
-		if (desiredSpeed>turnSpeed) 
+		if (desiredSpeed>turnSpeed)
 		{
 			desiredSpeed = turnSpeed;
 		}
@@ -1324,7 +1314,7 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 
 
 	Real slowDownTime = actualSpeed / getBraking() + 1.0f;
-	Real slowDownDist = (actualSpeed/1.5f) * slowDownTime + actualSpeed;	
+	Real slowDownDist = (actualSpeed/1.5f) * slowDownTime + actualSpeed;
 	Real effectiveSlowDownDist = slowDownDist;
 	if (effectiveSlowDownDist < 1*PATHFIND_CELL_SIZE) {
 		effectiveSlowDownDist = 1*PATHFIND_CELL_SIZE;
@@ -1333,20 +1323,20 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 
 	const Real FIFTEEN_DEGREES = PI / 12.0f;
 	const Real PROJECT_FRAMES = LOGICFRAMES_PER_SECOND/2; // Project out 1/2 second.
-	if (fabs( relAngle ) > FIFTEEN_DEGREES) 
+	if (fabs( relAngle ) > FIFTEEN_DEGREES)
 	{
 		// If we're turning more than 10 degrees, check & see if we're moving into "impassable territory"
 		Real distance = PROJECT_FRAMES * (goalSpeed+actualSpeed)/2.0f;
 		Real targetAngle = obj->getOrientation();
 		Real turnFactor = ((goalSpeed+actualSpeed)/2.0f)/turnSpeed;
-		if (turnFactor > 1.0f) 
+		if (turnFactor > 1.0f)
 			turnFactor = 1.0f;
 		Real turnAmount = PROJECT_FRAMES*turnFactor*maxTurnRate/4.0f;
-		if (relAngle < 0) 
+		if (relAngle < 0)
 		{
 			targetAngle -= turnAmount;
-		}	
-		else 
+		}
+		else
 		{
 			targetAngle += turnAmount;
 		}
@@ -1370,7 +1360,7 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 		halfPos.z = pos->z;
 
 		if (!TheAI->pathfinder()->validMovementTerrain(obj->getLayer(), this, &halfPos) ||
-			!TheAI->pathfinder()->validMovementTerrain(obj->getLayer(), this, &nextPos)) 
+			!TheAI->pathfinder()->validMovementTerrain(obj->getLayer(), this, &nextPos))
 		{
 			PhysicsTurningType rotating = rotateTowardsPosition(obj, goalPos);
 			physics->setTurning(rotating);
@@ -1391,7 +1381,7 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 	}
 
 
-	if (onPathDistToGoal>PATHFIND_CELL_SIZE_F && onPathDistToGoal > 2.0*slowDownDist) 
+	if (onPathDistToGoal>PATHFIND_CELL_SIZE_F && onPathDistToGoal > 2.0*slowDownDist)
 	{
 		setFlag(IS_BRAKING, false);
 	}
@@ -1404,13 +1394,13 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 		}
 	}
 
-	if (getFlag(IS_BRAKING)) 
+	if (getFlag(IS_BRAKING))
 	{
 		m_brakingFactor = slowDownDist/onPathDistToGoal;
 		m_brakingFactor *= m_brakingFactor;
 		if (m_brakingFactor>MAX_BRAKING_FACTOR) {
 			m_brakingFactor = MAX_BRAKING_FACTOR;
-		}	
+		}
 		m_brakingFactor = 1.0f;
 		if (slowDownDist>onPathDistToGoal) {
 			goalSpeed = actualSpeed-getBraking();
@@ -1424,7 +1414,7 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 	}
 
 
-	//DEBUG_LOG(("Actual speed %f, Braking factor %f, slowDownDist %f, Pathdist %f, goalSpeed %f\n", 
+	//DEBUG_LOG(("Actual speed %f, Braking factor %f, slowDownDist %f, Pathdist %f, goalSpeed %f",
 	//	actualSpeed, m_brakingFactor, slowDownDist, onPathDistToGoal, goalSpeed));
 
 
@@ -1433,18 +1423,18 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 	if (turnFactor<0) {
 		turnFactor = -turnFactor; // in case we're sliding backwards in a 3 pt turn.
 	}
-	if (turnFactor > 1.0f) 
+	if (turnFactor > 1.0f)
 		turnFactor = 1.0f;
-	Real turnAmount = turnFactor*maxTurnRate;	
+	Real turnAmount = turnFactor*maxTurnRate;
 
 	PhysicsTurningType rotating;
 	if (moveBackwards && !do3pointTurn) {
 		Coord3D backwardPos = *obj->getPosition();
 		backwardPos.x += -(goalPos.x - obj->getPosition()->x);
 		backwardPos.y += -(goalPos.y - obj->getPosition()->y);
-		rotating = rotateObjAroundLocoPivot(obj, backwardPos, turnAmount);	
+		rotating = rotateObjAroundLocoPivot(obj, backwardPos, turnAmount);
 	} else {
-		rotating = rotateObjAroundLocoPivot(obj, goalPos, turnAmount);	
+		rotating = rotateObjAroundLocoPivot(obj, goalPos, turnAmount);
 	}
 
 	physics->setTurning(rotating);
@@ -1468,14 +1458,14 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 		Real accelForce = mass * acceleration;
 
 		/*
-			don't accelerate/brake more than necessary. do a quick calc to 
+			don't accelerate/brake more than necessary. do a quick calc to
 			see how much force we really need to achieve our goal speed...
 		*/
 		Real maxForceNeeded = mass * speedDelta;
 		if (fabs(accelForce) > fabs(maxForceNeeded))
 			accelForce = maxForceNeeded;
 
-		//DEBUG_LOG(("Braking %d, actualSpeed %f, goalSpeed %f, delta %f, accel %f\n", getFlag(IS_BRAKING),
+		//DEBUG_LOG(("Braking %d, actualSpeed %f, goalSpeed %f, delta %f, accel %f", getFlag(IS_BRAKING),
 			//actualSpeed, goalSpeed, speedDelta, accelForce));
 
 		const Coord3D *dir = obj->getUnitDirectionVector2D();
@@ -1537,8 +1527,8 @@ Bool Locomotor::fixInvalidPosition(Object* obj, PhysicsBehavior *physics)
 			// It was already leaving.
 			return false;
 		}
-		
-		
+
+
 		// Kill current accel
 		//physics->clearAcceleration();
 
@@ -1565,11 +1555,11 @@ Real Locomotor::calcMinTurnRadius(BodyDamageType condition, Real* timeToTravelTh
 
 	/*
 		our minimum circumference will be like so:
-		
+
 		Real minTurnCircum = maxSpeed * (2*PI / maxTurnRate);
 
 		so therefore our minimum turn radius is:
-		
+
 		Real minTurnRadius = minTurnCircum / 2*PI;
 
 		so we just eliminate the middleman:
@@ -1591,7 +1581,7 @@ void Locomotor::moveTowardsPositionLegs(Object* obj, PhysicsBehavior *physics, c
 	{
 		return;
 	}
-	
+
 	Real maxAcceleration = getMaxAcceleration( obj->getBodyModule()->getDamageState() );
 
 	// sanity, we cannot use desired speed that is greater than our max speed we are capable of moving at
@@ -1625,7 +1615,7 @@ void Locomotor::moveTowardsPositionLegs(Object* obj, PhysicsBehavior *physics, c
 		}
 		desiredAngle = normalizeAngle(desiredAngle+m_angleOffset);
 	}
-	
+
 	Real relAngle = stdAngleDiff(desiredAngle, angle);
 	locoUpdate_moveTowardsAngle(obj, desiredAngle);
 
@@ -1659,7 +1649,7 @@ void Locomotor::moveTowardsPositionLegs(Object* obj, PhysicsBehavior *physics, c
 		Real accelForce = mass * acceleration;
 
 		/*
-			don't accelerate/brake more than necessary. do a quick calc to 
+			don't accelerate/brake more than necessary. do a quick calc to
 			see how much force we really need to achieve our goal speed...
 		*/
 		Real maxForceNeeded = mass * speedDelta;
@@ -1673,7 +1663,7 @@ void Locomotor::moveTowardsPositionLegs(Object* obj, PhysicsBehavior *physics, c
 		force.y = accelForce * dir->y;
 		force.z = 0.0f;
 
-		
+
 
 		// apply forces to object
 		physics->applyMotiveForce( &force );
@@ -1698,13 +1688,13 @@ void Locomotor::moveTowardsPositionClimb(Object* obj, PhysicsBehavior *physics,
 	Real dx, dy, dz;
 
 	Coord3D pos = *obj->getPosition();
-	
+
 	dx = pos.x - goalPos.x;
 	dy = pos.y - goalPos.y;
 	dz = pos.z - goalPos.z;
 	if (dz*dz > sqr(PATHFIND_CELL_SIZE_F)) {
 		setFlag(CLIMBING, true);
-	} 
+	}
 	if (fabs(dz)<1) {
 		setFlag(CLIMBING, false);
 	}
@@ -1727,7 +1717,7 @@ void Locomotor::moveTowardsPositionClimb(Object* obj, PhysicsBehavior *physics,
 
 		Real groundSlope = fabs(delta.z - pos.z);
 		if (groundSlope<1.0f) groundSlope = 1.0f;
-		
+
 		if (groundSlope>1.0f) {
 			desiredSpeed /= groundSlope*4;
 		}
@@ -1792,7 +1782,7 @@ void Locomotor::moveTowardsPositionClimb(Object* obj, PhysicsBehavior *physics,
 		Real accelForce = mass * acceleration;
 
 		/*
-			don't accelerate/brake more than necessary. do a quick calc to 
+			don't accelerate/brake more than necessary. do a quick calc to
 			see how much force we really need to achieve our goal speed...
 		*/
 		Real maxForceNeeded = mass * speedDelta;
@@ -1828,7 +1818,7 @@ void Locomotor::moveTowardsPositionWings(Object* obj, PhysicsBehavior *physics,
 			// aim for the spot on the opposite side of the circle.
 
 			// find the direction towards our goal pos
-			Real angleTowardPos = 
+			Real angleTowardPos =
 					(isNearlyZero(dx) && isNearlyZero(dy)) ?
 					obj->getOrientation() :
 					atan2(dy, dx);
@@ -1912,7 +1902,7 @@ void Locomotor::moveTowardsPositionThrust(Object* obj, PhysicsBehavior *physics,
 		localGoalPos.z = m_preferredHeight + surfaceHt;
 //		localGoalPos.z = goalPos.z;
 		Real delta = localGoalPos.z - pos.z;
-		delta *= getPreferredHeightDamping();	  
+		delta *= getPreferredHeightDamping();
 		localGoalPos.z = pos.z + delta;
 
 #ifdef USE_ZDIR_DAMPING
@@ -1921,7 +1911,7 @@ void Locomotor::moveTowardsPositionThrust(Object* obj, PhysicsBehavior *physics,
 		// below, but go ahead and calc it now...
 		Real MAX_VERTICAL_DAMP_RANGE = m_preferredHeight * 0.5;
 		delta = fabs(delta);
-		if (delta > MAX_VERTICAL_DAMP_RANGE) 
+		if (delta > MAX_VERTICAL_DAMP_RANGE)
 			delta = MAX_VERTICAL_DAMP_RANGE;
 		zDirDamping = 1.0f - (delta / MAX_VERTICAL_DAMP_RANGE);
 #endif
@@ -1949,7 +1939,7 @@ void Locomotor::moveTowardsPositionThrust(Object* obj, PhysicsBehavior *physics,
 		const Coord3D* veltmp = physics->getVelocity();
 		Vector3 vel(veltmp->x, veltmp->y, veltmp->z);
 		Bool adjust = true;
-		if( obj->getStatusBits().test( OBJECT_STATUS_BRAKING ) ) 
+		if( obj->getStatusBits().test( OBJECT_STATUS_BRAKING ) )
 		{
 			// align to target, cause that's where we're going anyway.
 
@@ -1975,7 +1965,7 @@ void Locomotor::moveTowardsPositionThrust(Object* obj, PhysicsBehavior *physics,
 
 	if (forwardSpeedDelta != 0.0f || thrustAngle != 0.0f)
 	{
-		if (maxForwardSpeed <= 0.0f) 
+		if (maxForwardSpeed <= 0.0f)
 		{
 			maxForwardSpeed = 0.01f; // In some cases, this is 0, hack for now.  jba.
 		}
@@ -1983,7 +1973,7 @@ void Locomotor::moveTowardsPositionThrust(Object* obj, PhysicsBehavior *physics,
 		Vector3 curVel(physics->getVelocity()->x, physics->getVelocity()->y, physics->getVelocity()->z);
 
 		Vector3 accelVec = thrustDir * maxAccel - curVel * damping;
-		//DEBUG_LOG(("accel %f (max %f) vel %f (max %f) damping %f\n",accelVec.Length(),maxAccel,curVel.Length(),maxForwardSpeed,damping));
+		//DEBUG_LOG(("accel %f (max %f) vel %f (max %f) damping %f",accelVec.Length(),maxAccel,curVel.Length(),maxForwardSpeed,damping));
 
 		Real mass = physics->getMass();
 
@@ -2008,7 +1998,7 @@ Real Locomotor::getSurfaceHtAtPt(Real x, Real y)
 	} else {
 		ht += TheTerrainLogic->getGroundHeight(x, y);
 	}
-	
+
 	return ht;
 }
 
@@ -2019,7 +2009,7 @@ Real Locomotor::calcLiftToUseAtPt(Object* obj, PhysicsBehavior *physics, Real cu
 		take the classic equation:
 
 			x = x0 + v*t + 0.5*a*t^2
-		
+
 		and solve for acceleration.
 	*/
 	BodyDamageType bdt = obj->getBodyModule()->getDamageState();
@@ -2067,7 +2057,7 @@ Real Locomotor::calcLiftToUseAtPt(Object* obj, PhysicsBehavior *physics, Real cu
 			//	and
 			// t = (-v +- sqrt(v*v + 2*a*dz))/a
 			//
-			// but if we assume t=1, then 
+			// but if we assume t=1, then
 			//	a=2(dz-v)
 			// then, plug it back in and see if t is really 1...
 			desiredAccel = 2.0f * (deltaZ - curVelZ);
@@ -2104,11 +2094,11 @@ Real Locomotor::calcLiftToUseAtPt(Object* obj, PhysicsBehavior *physics, Real cu
 }
 
 //-------------------------------------------------------------------------------------------------
-PhysicsTurningType Locomotor::rotateObjAroundLocoPivot(Object* obj, const Coord3D& goalPos, 
+PhysicsTurningType Locomotor::rotateObjAroundLocoPivot(Object* obj, const Coord3D& goalPos,
 																											 Real maxTurnRate, Real *relAngle)
 {
 	Real angle = obj->getOrientation();
-	Real offset = getTurnPivotOffset();	
+	Real offset = getTurnPivotOffset();
 
 	PhysicsTurningType turn = TURN_NONE;
 
@@ -2126,7 +2116,7 @@ PhysicsTurningType Locomotor::rotateObjAroundLocoPivot(Object* obj, const Coord3
 		Real dx =goalPos.x - turnPos.x;
 		Real dy = goalPos.y - turnPos.y;
 		// If we are very close to the goal, we twitch due to rounding error.  So just return. jba.
-		if (fabs(dx)<0.1f && fabs(dy)<0.1f) return TURN_NONE; 
+		if (fabs(dx)<0.1f && fabs(dy)<0.1f) return TURN_NONE;
 		Real desiredAngle = atan2(dy, dx);
 		Real amount = stdAngleDiff(desiredAngle, angle);
 		if (relAngle) *relAngle = amount;
@@ -2195,7 +2185,7 @@ Bool Locomotor::handleBehaviorZ(Object* obj, PhysicsBehavior *physics, const Coo
 	switch(m_template->m_behaviorZ)
 	{
 		case Z_NO_Z_MOTIVE_FORCE:
-			// nothing to do. 
+			// nothing to do.
 			requiresConstantCalling = FALSE;
 			break;
 
@@ -2245,7 +2235,7 @@ Bool Locomotor::handleBehaviorZ(Object* obj, PhysicsBehavior *physics, const Coo
 				if (m_preferredHeight != 0.0f || getFlag(PRECISE_Z_POS))
 				{
 					Coord3D pos = *obj->getPosition();
-					
+
 					// srj sez: if we aren't on the ground, never find the ground layer
 					PathfindLayerEnum layerAtDest = obj->getLayer();
 					if (layerAtDest == LAYER_GROUND)
@@ -2266,7 +2256,7 @@ Bool Locomotor::handleBehaviorZ(Object* obj, PhysicsBehavior *physics, const Coo
 
 					Real liftToUse = calcLiftToUseAtPt(obj, physics, pos.z, surfaceHt, preferredHeight);
 
-					//DEBUG_LOG(("HandleBZ %d LiftToUse %f\n",TheGameLogic->getFrame(),liftToUse));
+					//DEBUG_LOG(("HandleBZ %d LiftToUse %f",TheGameLogic->getFrame(),liftToUse));
 					if (liftToUse != 0.0f)
 					{
 						Coord3D force;
@@ -2278,7 +2268,7 @@ Bool Locomotor::handleBehaviorZ(Object* obj, PhysicsBehavior *physics, const Coo
 				}
 			}
 			break;
-	
+
 		case Z_SURFACE_RELATIVE_HEIGHT:
 		case Z_ABSOLUTE_HEIGHT:
 			requiresConstantCalling = TRUE;
@@ -2286,7 +2276,7 @@ Bool Locomotor::handleBehaviorZ(Object* obj, PhysicsBehavior *physics, const Coo
 				if (m_preferredHeight != 0.0f || getFlag(PRECISE_Z_POS))
 				{
 					Coord3D pos = *obj->getPosition();
-					
+
 					Bool surfaceRel = (m_template->m_behaviorZ == Z_SURFACE_RELATIVE_HEIGHT);
 					Real surfaceHt = surfaceRel ? getSurfaceHtAtPt(pos.x, pos.y) : 0.0f;
 					Real preferredHeight = m_preferredHeight + (surfaceRel ? surfaceHt : 0);
@@ -2299,7 +2289,7 @@ Bool Locomotor::handleBehaviorZ(Object* obj, PhysicsBehavior *physics, const Coo
 
 					Real liftToUse = calcLiftToUseAtPt(obj, physics, pos.z, surfaceHt, preferredHeight);
 
-					//DEBUG_LOG(("HandleBZ %d LiftToUse %f\n",TheGameLogic->getFrame(),liftToUse));
+					//DEBUG_LOG(("HandleBZ %d LiftToUse %f",TheGameLogic->getFrame(),liftToUse));
 					if (liftToUse != 0.0f)
 					{
 						Coord3D force;
@@ -2339,11 +2329,11 @@ void Locomotor::moveTowardsPositionOther(Object* obj, PhysicsBehavior *physics,
 	const Coord3D* pos =  obj->getPosition();
 	Coord3D dirToApplyForce = *obj->getUnitDirectionVector2D();
 
-//DEBUG_ASSERTLOG(!getFlag(ULTRA_ACCURATE),("thresh %f %f (%f %f)\n",
+//DEBUG_ASSERTLOG(!getFlag(ULTRA_ACCURATE),("thresh %f %f (%f %f)",
 //fabs(goalPos.y - pos->y),fabs(goalPos.x - pos->x),
 //fabs(goalPos.y - pos->y)/goalSpeed,fabs(goalPos.x - pos->x)/goalSpeed));
-	if (getFlag(ULTRA_ACCURATE) && 
-				fabs(goalPos.y - pos->y) <= goalSpeed * m_template->m_ultraAccurateSlideIntoPlaceFactor && 
+	if (getFlag(ULTRA_ACCURATE) &&
+				fabs(goalPos.y - pos->y) <= goalSpeed * m_template->m_ultraAccurateSlideIntoPlaceFactor &&
 				fabs(goalPos.x - pos->x) <= goalSpeed * m_template->m_ultraAccurateSlideIntoPlaceFactor)
 	{
 		// don't turn, just slide in the right direction
@@ -2379,7 +2369,7 @@ void Locomotor::moveTowardsPositionOther(Object* obj, PhysicsBehavior *physics,
 		Real accelForce = mass * acceleration;
 
 		/*
-			don't accelerate/brake more than necessary. do a quick calc to 
+			don't accelerate/brake more than necessary. do a quick calc to
 			see how much force we really need to achieve our goal speed...
 		*/
 		Real maxForceNeeded = mass * speedDelta;
@@ -2421,11 +2411,11 @@ Bool Locomotor::locoUpdate_maintainCurrentPosition(Object* obj)
 	}
 
 #ifdef DEBUG_OBJECT_ID_EXISTS
-//	DEBUG_ASSERTLOG(obj->getID() != TheObjectIDToDebug, ("locoUpdate_maintainCurrentPosition %f %f %f, speed %f (%f)\n",m_maintainPos.x,m_maintainPos.y,m_maintainPos.z,physics->getSpeed(),physics->getForwardSpeed2D()));
+//	DEBUG_ASSERTLOG(obj->getID() != TheObjectIDToDebug, ("locoUpdate_maintainCurrentPosition %f %f %f, speed %f (%f)",m_maintainPos.x,m_maintainPos.y,m_maintainPos.z,physics->getSpeed(),physics->getForwardSpeed2D()));
 #endif
 
 	Bool requiresConstantCalling = TRUE;	// assume the worst.
-	switch (m_template->m_appearance) 
+	switch (m_template->m_appearance)
 	{
 		case LOCO_THRUST:
 			maintainCurrentPositionThrust(obj, physics);
@@ -2495,7 +2485,7 @@ void Locomotor::maintainCurrentPositionWings(Object* obj, PhysicsBehavior *physi
 		const Coord3D* pos = obj->getPosition();
 		Real dx = m_maintainPos.x - pos->x;
 		Real dy = m_maintainPos.y - pos->y;
-		Real angleTowardMaintainPos = 
+		Real angleTowardMaintainPos =
 				(isNearlyZero(dx) && isNearlyZero(dy)) ?
 				obj->getOrientation() :
 				atan2(dy, dx);
@@ -2530,7 +2520,7 @@ void Locomotor::maintainCurrentPositionHover(Object* obj, PhysicsBehavior *physi
 		//
 		// Stop
 		//
-		Real minSpeed = max( 1.0E-10f, m_template->m_minSpeed ); 
+		Real minSpeed = max( 1.0E-10f, m_template->m_minSpeed );
 		Real speedDelta = minSpeed - actualSpeed;
 		if (fabs(speedDelta) > minSpeed)
 		{
@@ -2539,7 +2529,7 @@ void Locomotor::maintainCurrentPositionHover(Object* obj, PhysicsBehavior *physi
 			Real accelForce = mass * acceleration;
 
 			/*
-				don't accelerate/brake more than necessary. do a quick calc to 
+				don't accelerate/brake more than necessary. do a quick calc to
 				see how much force we really need to achieve our goal speed...
 			*/
 			Real maxForceNeeded = mass * speedDelta;
@@ -2614,7 +2604,7 @@ LocomotorSet::~LocomotorSet()
 void LocomotorSet::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -2648,7 +2638,7 @@ void LocomotorSet::xfer( Xfer *xfer )
 		// vector should be empty at this point
 		if (m_locomotors.empty() == FALSE)
 		{
-			DEBUG_CRASH(( "LocomotorSet::xfer - vector is not empty, but should be\n" ));
+			DEBUG_CRASH(( "LocomotorSet::xfer - vector is not empty, but should be" ));
 			throw XFER_LIST_NOT_EMPTY;
 		}
 
@@ -2660,13 +2650,13 @@ void LocomotorSet::xfer( Xfer *xfer )
 			const LocomotorTemplate* lt = TheLocomotorStore->findLocomotorTemplate(NAMEKEY(name));
 			if (lt == NULL)
 			{
-				DEBUG_CRASH(( "LocomotorSet::xfer - template %s not found\n", name.str() ));
+				DEBUG_CRASH(( "LocomotorSet::xfer - template %s not found", name.str() ));
 				throw XFER_UNKNOWN_STRING;
 			}
 
 			Locomotor* loco = TheLocomotorStore->newLocomotor(lt);
 			xfer->xferSnapshot(loco);
-			m_locomotors.push_back(loco);		
+			m_locomotors.push_back(loco);
 		}
 	}
 
@@ -2681,7 +2671,7 @@ void LocomotorSet::xfer( Xfer *xfer )
 void LocomotorSet::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 void LocomotorSet::xferSelfAndCurLocoPtr(Xfer *xfer, Locomotor** loco)
@@ -2715,7 +2705,7 @@ void LocomotorSet::xferSelfAndCurLocoPtr(Xfer *xfer, Locomotor** loco)
 				}
 			}
 
-			DEBUG_CRASH(( "LocomotorSet::xfer - template %s not found\n", name.str() ));
+			DEBUG_CRASH(( "LocomotorSet::xfer - template %s not found", name.str() ));
 			throw XFER_UNKNOWN_STRING;
 		}
 	}
@@ -2726,8 +2716,7 @@ void LocomotorSet::clear()
 {
 	for (size_t i = 0; i < m_locomotors.size(); ++i)
 	{
-		if (m_locomotors[i])
-			deleteInstance(m_locomotors[i]);
+		deleteInstance(m_locomotors[i]);
 	}
 	m_locomotors.clear();
 	m_validLocomotorSurfaces = 0;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
index 0ac475a72ca..7634db8058f 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -26,15 +26,16 @@
 // Simple base object
 // Author: Michael S. Booth, October 2000
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
-// INCLUDES /////////////////////////////////////////////////////////////////////////////////////// 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_WEAPONCONDITIONMAP
 #include "Common/BitFlagsIO.h"
 #include "Common/BuildAssistant.h"
 #include "Common/Dict.h"
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/ModuleFactory.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -101,18 +102,13 @@
 #include "Common/CRCDebug.h"
 #include "Common/MiscAudio.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #ifdef DEBUG_OBJECT_ID_EXISTS
 ObjectID TheObjectIDToDebug = INVALID_ID;
 #endif
 
 // ------------------------------------------------------------------------------------------------
-static const ModelConditionFlags s_allWeaponFireFlags[WEAPONSLOT_COUNT] = 
+static const ModelConditionFlags s_allWeaponFireFlags[WEAPONSLOT_COUNT] =
 {
 	MAKE_MODELCONDITION_MASK5(
 		MODELCONDITION_FIRING_A,
@@ -169,7 +165,7 @@ AsciiString DebugDescribeObject(const Object *obj)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatusMask, Team *team ) : 
+Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatusMask, Team *team ) :
 	Thing(tt),
 	m_indicatorColor(0),
 	m_ai(NULL),
@@ -203,25 +199,22 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 	m_formationID(NO_FORMATION_ID),
 	m_isReceivingDifficultyBonus(FALSE)
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	m_hasDiedAlready = false;
 #endif
 	//Modules have not been created yet!
 	m_modulesReady = false;
 
 	// Force the thing template to use the most overridden version of itself - jkmcd
-	// Note that after this, the object will be using m_template, which forces the usage of the 
+	// Note that after this, the object will be using m_template, which forces the usage of the
 	// most overridden version of tt, so this is okay.
 	tt = (const ThingTemplate *) tt->getFinalOverride();
-		
+
 	Int i, modIdx;
 	AsciiString modName;
-	
-	//Added By Sadullah Nader
-	//Initializations inserted
+
 	m_formationOffset.x = m_formationOffset.y = 0.0f;
 	m_iPos.zero();
-	//
 	for( i = 0; i < DISABLED_COUNT; i++ )
 	{
 		m_disabledTillFrame[ i ] = NEVER;
@@ -234,7 +227,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// Object's set of these persist for the life of the object.
 	m_partitionLastLook = newInstance(SightingInfo);
@@ -265,7 +258,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 	if( m_shroudClearingRange == -1.0f )
 		m_shroudClearingRange = m_visionRange;// Backwards compatible, and perfectly logical default to assign
 	m_shroudRange = 0.0f;
-	
+
 	m_singleUseCommandUsed = false;
 
 	// assign unique object id
@@ -293,7 +286,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 	static const NameKeyType smcHelperModuleDataTagNameKey = NAMEKEY( "ModuleTag_SMCHelper" );
 	static ObjectSMCHelperModuleData smcModuleData;
 	smcModuleData.setModuleTagNameKey( smcHelperModuleDataTagNameKey );
-	m_smcHelper = newInstance(ObjectSMCHelper)(this, &smcModuleData);		
+	m_smcHelper = newInstance(ObjectSMCHelper)(this, &smcModuleData);
 	*curB++ = m_smcHelper;
 
 	if (TheAI != NULL
@@ -304,7 +297,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		static const NameKeyType repulsorHelperModuleDataTagNameKey = NAMEKEY( "ModuleTag_RepulsorHelper" );
 		static ObjectRepulsorHelperModuleData repulsorModuleData;
 		repulsorModuleData.setModuleTagNameKey( repulsorHelperModuleDataTagNameKey );
-		m_repulsorHelper = newInstance(ObjectRepulsorHelper)(this, &repulsorModuleData);		
+		m_repulsorHelper = newInstance(ObjectRepulsorHelper)(this, &repulsorModuleData);
 		*curB++ = m_repulsorHelper;
 	}
 
@@ -319,7 +312,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		static const NameKeyType defectionModuleDataTagNameKey = NAMEKEY( "ModuleTag_DefectionHelper" );
 		static ObjectDefectionHelperModuleData defectionModuleData;
 		defectionModuleData.setModuleTagNameKey( defectionModuleDataTagNameKey );
-		m_defectionHelper = newInstance(ObjectDefectionHelper)(this, &defectionModuleData);		
+		m_defectionHelper = newInstance(ObjectDefectionHelper)(this, &defectionModuleData);
 		*curB++ = m_defectionHelper;
 	}
 
@@ -329,7 +322,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		static const NameKeyType weaponStatusModuleDataTagNameKey = NAMEKEY( "ModuleTag_WeaponStatusHelper" );
 		static ObjectWeaponStatusHelperModuleData weaponStatusModuleData;
 		weaponStatusModuleData.setModuleTagNameKey( weaponStatusModuleDataTagNameKey );
-		m_wsHelper = newInstance(ObjectWeaponStatusHelper)(this, &weaponStatusModuleData);		
+		m_wsHelper = newInstance(ObjectWeaponStatusHelper)(this, &weaponStatusModuleData);
 		*curB++ = m_wsHelper;
 
 		static const NameKeyType firingTrackerModuleDataTagNameKey = NAMEKEY( "ModuleTag_FiringTrackerHelper" );
@@ -352,14 +345,14 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		*curB++ = newMod;
 
 		BodyModuleInterface* body = newMod->getBody();
-		if (body) 
+		if (body)
 		{
 			DEBUG_ASSERTCRASH(m_body == NULL, ("Duplicate bodies"));
 			m_body = body;
 		}
 
 		ContainModuleInterface* contain = newMod->getContain();
-		if (contain) 
+		if (contain)
 		{
 			DEBUG_ASSERTCRASH(m_contain == NULL, ("Duplicate containers"));
 			m_contain = contain;
@@ -375,14 +368,14 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		AIUpdateInterface* ai = newMod->getAIUpdateInterface();
 		if (ai)
 		{
-			DEBUG_ASSERTCRASH(m_ai == NULL, ("You should never have more than one AI module (srj)\n"));
+			DEBUG_ASSERTCRASH(m_ai == NULL, ("You should never have more than one AI module (srj)"));
 			m_ai = ai;
 		}
 
 		static NameKeyType key_PhysicsUpdate = NAMEKEY("PhysicsBehavior");
 		if (newMod->getModuleNameKey() == key_PhysicsUpdate)
 		{
-			DEBUG_ASSERTCRASH(m_physics == NULL, ("You should never have more than one Physics module (%s)\n",getTemplate()->getName().str()));
+			DEBUG_ASSERTCRASH(m_physics == NULL, ("You should never have more than one Physics module (%s)",getTemplate()->getName().str()));
 			m_physics = (PhysicsBehavior*)newMod;
 		}
 	}
@@ -398,7 +391,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 			if (info && info->getName().isNotEmpty()) {
 				ai->setAttackInfo(info);
 			}
-		}	
+		}
 	}
 
 	// allocate experience tracker
@@ -435,14 +428,18 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 	m_soleHealingBenefactorID = INVALID_ID; ///< who is the only other object that can give me this non-stacking heal benefit?
 	m_soleHealingBenefactorExpirationFrame = 0; ///< on what frame can I accept healing (thus to switch) from a new benefactor
 
+	// TheSuperHackers @bugfix Mauller/xezon 02/08/2025 sendObjectCreated needs calling before CreateModule's are initialized to prevent drawable related crashes
+	// This predominantly occurs with the veterancy create module when the chemical suits upgrade is unlocked as it tries to set the terrain decal.
 
+	// emit message announcing object's creation
+	TheGameLogic->sendObjectCreated( this );
 
-}  // end Object
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Emit message announcing object's creation
- * Note: Have to do this in virtual init() method because virtual methods 
- * don't become virtual until AFTER the constructor has completed, and we 
+ * Note: Have to do this in virtual init() method because virtual methods
+ * don't become virtual until AFTER the constructor has completed, and we
  * need to send our type in this message via virtual getType(). */
 //-------------------------------------------------------------------------------------------------
 void Object::initObject()
@@ -460,9 +457,6 @@ void Object::initObject()
 	// If I have a valid team assigned, I can run through my Upgrade modules with his flags
 	updateUpgradeModules();
 
-	// emit message announcing object's creation
-	TheGameLogic->sendObjectCreated( this );
-
 	//If the player has battle plans (America Strategy Center), then apply those bonuses
 	//to this object if applicable. Internally it validates certain kinds of objects.
 	const Player* controller = getControllingPlayer();
@@ -472,7 +466,7 @@ void Object::initObject()
 		{
 			setReceivingDifficultyBonus(TRUE);
 		}
-			
+
 		if (controller->getNumBattlePlansActive() > 0)
 		{
 			controller->applyBattlePlanBonusesForObject( this );
@@ -497,7 +491,7 @@ void Object::initObject()
 
 	// Kris -- All missiles must be projectiles! This is the perfect place to assert them!
 	// srj: yes, but only in debug...
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if( !isKindOf( KINDOF_PROJECTILE ) )
 	{
 		if( isKindOf( KINDOF_SMALL_MISSILE ) || isKindOf( KINDOF_BALLISTIC_MISSILE ) )
@@ -563,9 +557,8 @@ Object::~Object()
 		ThePartitionManager->unRegisterObject( this );
 
 	// if we are in a group, remove us
-	if (m_group)
-		m_group->remove( this );
-	
+	leaveGroup();
+
 	// note, do NOT free these, there are just a shadow copy!
 	m_ai = NULL;
 	m_physics = NULL;
@@ -577,12 +570,10 @@ Object::~Object()
 		*b = NULL;	// in case other modules call findModule from their dtor!
 	}
 
-	delete [] m_behaviors;		
+	delete [] m_behaviors;
 	m_behaviors = NULL;
 
-	if( m_experienceTracker )
-		deleteInstance(m_experienceTracker);
-
+	deleteInstance(m_experienceTracker);
 	m_experienceTracker = NULL;
 
 	// we don't need to delete these, there were deleted on the m_behaviors list
@@ -602,32 +593,20 @@ Object::~Object()
 }
 
 //-------------------------------------------------------------------------------------------------
-void localIsHero( Object *obj, void* userData )
-{
-	Bool *hero = (Bool*)userData;
-	
-	if( obj && obj->isKindOf( KINDOF_HERO ) )
-	{
-		*hero = TRUE;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
+// TheSuperHackers @performance bobtista 13/11/2025 Use cached hero count for O(1) lookup instead of O(n) iteration.
 Bool Object::isHero() const
 {
 	ContainModuleInterface *contain = getContain();
 	if( contain )
 	{
-		Bool heroInside = FALSE;
-		contain->iterateContained( localIsHero, (void*)(&heroInside), FALSE );
-		if( heroInside )
+		if( contain->getHeroUnitsContained() > 0 )
 		{
 			return TRUE;
 		}
 	}
 	return isKindOf( KINDOF_HERO );
 }
-   
+
 
 //-------------------------------------------------------------------------------------------------
 /// this object now contained in "containedBy"
@@ -674,6 +653,26 @@ Int Object::getTransportSlotCount() const
 	return count;
 }
 
+const Object* Object::getEnclosingContainedBy() const
+{
+	for (const Object* child = this, *container = getContainedBy(); container; child = container, container = container->getContainedBy())
+	{
+		ContainModuleInterface* containModule = container->getContain();
+		if (containModule && containModule->isEnclosingContainerFor(child))
+			return container;
+	}
+
+	return NULL;
+}
+
+const Object* Object::getOuterObject() const
+{
+	if (const Object* enclosing = getEnclosingContainedBy())
+		return enclosing;
+
+	return this;
+}
+
 //-------------------------------------------------------------------------------------------------
 /** Run from GameLogic::destroyObject */
 //-------------------------------------------------------------------------------------------------
@@ -697,17 +696,17 @@ void Object::onDestroy()
 
 	//Have to remove ourself from looking as well.  RebuildHoleWorkers definately hit here.
 	handlePartitionCellMaintenance();
-}  // end onDestroy
+}
 
 //=============================================================================
 //=============================================================================
-void Object::setGeometryInfo(const GeometryInfo& geom) 
-{ 
-	m_geometryInfo = geom; 
+void Object::setGeometryInfo(const GeometryInfo& geom)
+{
+	m_geometryInfo = geom;
 	if( m_partitionData )
 	{
 		// if our geometry changes, we unregister and re-register with the partitionmgr
-		// so that our size gets updated appropriately. this shouldn't be a problem 
+		// so that our size gets updated appropriately. this shouldn't be a problem
 		// unless setGeometryInfo gets called frequently. (srj)
 		ThePartitionManager->unRegisterObject( this );
 		ThePartitionManager->registerObject( this );
@@ -719,8 +718,8 @@ void Object::setGeometryInfo(const GeometryInfo& geom)
 
 //=============================================================================
 //=============================================================================
-void Object::setGeometryInfoZ( Real newZ ) 
-{ 
+void Object::setGeometryInfoZ( Real newZ )
+{
 	// A Z change only does not need to un/register with the PartitionManager
 	m_geometryInfo.setMaxHeightAbovePosition( newZ );
 
@@ -742,17 +741,17 @@ void Object::restoreOriginalTeam()
 {
 	if( m_team == NULL || m_originalTeamName.isEmpty() )
 		return;
-	
+
 	Team* origTeam = TheTeamFactory->findTeam(m_originalTeamName);
 	if (origTeam == NULL)
 	{
-		DEBUG_CRASH(("Object original team (%s) could not be found or created! (srj)\n",m_originalTeamName.str()));
+		DEBUG_CRASH(("Object original team (%s) could not be found or created! (srj)",m_originalTeamName.str()));
 		return;
 	}
 
 	if (m_team == origTeam)
 	{
-		DEBUG_CRASH(("Object appears to still be on its original team, so why are we attempting to restore it? (srj)\n"));
+		DEBUG_CRASH(("Object appears to still be on its original team, so why are we attempting to restore it? (srj)"));
 		return;
 	}
 
@@ -799,7 +798,7 @@ void Object::setOrRestoreTeam( Team* team, Bool restoring )
 			m_team->getControllingPlayer()->becomingTeamMember(this, false);
 		}
 	}
-		
+
 	// Switch //////////////////////////
 	m_team = team;
 
@@ -811,13 +810,13 @@ void Object::setOrRestoreTeam( Team* team, Bool restoring )
 			m_team->prependTo_TeamMemberList(this);
 			m_team->getControllingPlayer()->becomingTeamMember(this, true);
 		}
-		
+
 		// now, adjust the attitude of the unit to its new team.
 		const TeamPrototype* proto = m_team->getPrototype();
-		if (proto && proto->getTemplateInfo()) 
+		if (proto && proto->getTemplateInfo())
 		{
 			AIUpdateInterface *ai = getAIUpdateInterface();
-			if (ai) 
+			if (ai)
 			{
 				ai->setAttitude(proto->getTemplateInfo()->m_initialTeamAttitude);
 				if (proto->getAttackPriorityName().isNotEmpty()) {
@@ -826,7 +825,7 @@ void Object::setOrRestoreTeam( Team* team, Bool restoring )
 					if (info && info->getName().isNotEmpty()) {
 						ai->setAttackInfo(info);
 					}
-				}	
+				}
 			}
 		}
 		// emit message announcing object's new alliance
@@ -884,8 +883,8 @@ void Object::setStatus( ObjectStatusMaskType objectStatus, Bool set )
 		if( m_status.test( OBJECT_STATUS_UNDER_CONSTRUCTION ) != oldStatus.test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 		{
 
-			// CHECK FOR MINES, AND DETONATE THEM NOW 
-			ObjectIterator *iter = 
+			// CHECK FOR MINES, AND DETONATE THEM NOW
+			ObjectIterator *iter =
 					ThePartitionManager->iteratePotentialCollisions( getPosition(), getGeometryInfo(), getOrientation() );
 			MemoryPoolObjectHolder hold( iter );
 			Object *them;
@@ -897,14 +896,14 @@ void Object::setStatus( ObjectStatusMaskType objectStatus, Bool set )
 					Relationship r = getRelationship(them);
 					if (r == ENEMIES)
 					{
-						them->kill(); // detonate mine 
+						them->kill(); // detonate mine
 					}
 					else
 					{
-						TheGameLogic->destroyObject(them); 
+						TheGameLogic->destroyObject(them);
 					}
 				}
-			}// next object
+			}
 
 			if (m_partitionData)
 				m_partitionData->makeDirty(true);
@@ -935,7 +934,7 @@ void Object::setScriptStatus( ObjectScriptStatusBit bit, Bool set )
 			if( m_partitionData )
 			{
 				// if an object becomes disabled or unpowered, then you have to update its partition data because it will
-				// change how far it can see. 
+				// change how far it can see.
 				m_partitionData->makeDirty(true);
 			}
 			if( m_scriptStatus & OBJECT_STATUS_SCRIPT_DISABLED )
@@ -954,7 +953,7 @@ void Object::setScriptStatus( ObjectScriptStatusBit bit, Bool set )
 			if( m_partitionData )
 			{
 				// if an object becomes disabled or unpowered, then you have to update its partition data because it will
-				// change how far it can see. 
+				// change how far it can see.
 				m_partitionData->makeDirty(true);
 			}
 			if( m_scriptStatus & OBJECT_STATUS_SCRIPT_UNPOWERED )
@@ -976,10 +975,10 @@ Bool Object::canCrushOrSquish(Object *otherObj, CrushSquishTestType testType ) c
 {
 	DEBUG_ASSERTCRASH(this, ("null this in canCrushOrSquish"));
 
-	if( !otherObj ) 
+	if( !otherObj )
 	{
 		//Can't crush anything.
-		return false;  
+		return false;
 	}
 
 	if( isDisabledByType( DISABLED_UNMANNED ) )
@@ -991,12 +990,12 @@ Bool Object::canCrushOrSquish(Object *otherObj, CrushSquishTestType testType ) c
 	}
 
 	UnsignedByte crusherLevel = getCrusherLevel();
-	
+
 	// order matters: we want to know if I consider it to be an ally, not vice versa
-	if( getRelationship( otherObj ) == ALLIES ) 
+	if( getRelationship( otherObj ) == ALLIES )
 	{
 		//Friends don't let friends crush friends.
-		return false; 
+		return false;
 	}
 
 	if( !crusherLevel )
@@ -1030,7 +1029,7 @@ Bool Object::canCrushOrSquish(Object *otherObj, CrushSquishTestType testType ) c
 		{
 			// See if other is squishable
 			static NameKeyType key_squish = NAMEKEY( "SquishCollide" );
-			if( otherObj->findModule( key_squish ) ) 
+			if( otherObj->findModule( key_squish ) )
 			{
 				return true; // squishable.
 			}
@@ -1047,7 +1046,7 @@ Bool Object::canCrushOrSquish(Object *otherObj, CrushSquishTestType testType ) c
 			return true;
 		}
 	}
-		
+
 	return false;
 }
 
@@ -1078,9 +1077,9 @@ void Object::topple( const Coord3D *toppleDirection, Real toppleSpeed, UnsignedI
 		// apply the topple force
 		toppleUpdate->applyTopplingForce( toppleDirection, toppleSpeed, options );
 
-	}  // end if
+	}
 
-}  // end topple
+}
 
 //=============================================================================
 void Object::reloadAllAmmo(Bool now)
@@ -1201,9 +1200,9 @@ void Object::clearAndSetModelConditionFlags( const ModelConditionFlags& clr, con
 }
 
 //=============================================================================
-// Special model states are states that are turned on for a period of time, and 
-// turned off automatically -- used for cheer, and scripted special moment 
-// animations. Setting a special state will automatically clear any other 
+// Special model states are states that are turned on for a period of time, and
+// turned off automatically -- used for cheer, and scripted special moment
+// animations. Setting a special state will automatically clear any other
 // special states that may be turned on so you can only have one at a time.
 //=============================================================================
 void Object::setSpecialModelConditionState( ModelConditionFlagType set, UnsignedInt frames )
@@ -1231,10 +1230,10 @@ void Object::clearSpecialModelConditionStates()
 // Lorenzen has some interest in this, ask before deleting
 //=============================================================================
 //const ModelConditionFlags& Object::getModelConditionFlags() const
-//{ 
+//{
 //	if (m_drawable)
 //	{
-//		return m_drawable->getModelConditionFlags(); 
+//		return m_drawable->getModelConditionFlags();
 //	}
 //	else
 //	{
@@ -1291,7 +1290,7 @@ Bool Object::getAmmoPipShowingInfo(Int& numTotal, Int& numFull) const
 
 //=============================================================================
 /*
-	NOTE: getAbleToAttackSpecificObject NO LONGER internally calls isAbleToAttack(), 
+	NOTE: getAbleToAttackSpecificObject NO LONGER internally calls isAbleToAttack(),
 	since that isn't an incredibly fast call, and this is called repeatedly in some inner loops
 	where we already know that isAbleToAttack() == true. so you should always
 	call isAbleToAttack prior to calling this! (srj)
@@ -1347,7 +1346,7 @@ void Object::fireCurrentWeapon(Object *target)
 
 //=============================================================================
 void Object::fireCurrentWeapon(const Coord3D* pos)
-{ 
+{
 	//USE_PERF_TIMER(fireCurrentWeapon)
 
 	if (pos == NULL)
@@ -1407,13 +1406,13 @@ UnsignedInt Object::getLastShotFiredFrame() const
 ObjectID Object::getLastVictimID() const
 {
 	return m_firingTracker ? m_firingTracker->getLastShotVictim() : INVALID_ID;
-} 
+}
 
 //=============================================================================
 // Object::getRelationship
 //=============================================================================
 Relationship Object::getRelationship(const Object *that) const
-{ 
+{
 	const Team *myTeam = getTeam();
 
 	if (myTeam && that)
@@ -1440,10 +1439,10 @@ Relationship Object::getRelationship(const Object *that) const
 // Object::getControllingPlayer
 //=============================================================================
 Player * Object::getControllingPlayer() const
-{ 
-	const Team* myTeam = this->getTeam();	
+{
+	const Team* myTeam = this->getTeam();
 	if (myTeam)
-		return myTeam->getControllingPlayer(); 
+		return myTeam->getControllingPlayer();
 
 	return NULL;
 }
@@ -1466,8 +1465,8 @@ void Object::setBuilder( const Object *obj )
 }
 
 //=============================================================================
-void Object::setCustomIndicatorColor(Color c) 
-{ 
+void Object::setCustomIndicatorColor(Color c)
+{
 	if (m_indicatorColor != c)
 	{
 		m_indicatorColor = c;
@@ -1477,9 +1476,9 @@ void Object::setCustomIndicatorColor(Color c)
 }
 
 //=============================================================================
-void Object::removeCustomIndicatorColor() 
-{ 
-	setCustomIndicatorColor(0); 
+void Object::removeCustomIndicatorColor()
+{
+	setCustomIndicatorColor(0);
 }
 
 //=============================================================================
@@ -1530,6 +1529,31 @@ Color Object::getNightIndicatorColor() const
 	}
 }
 
+//=============================================================================
+// Object::isLogicallyVisible
+//=============================================================================
+Bool Object::isLogicallyVisible() const
+{
+	const Object* obj = getOuterObject();
+
+	// Disguisers are always visible to all players, irrespective of any stealth
+	// status. We thus need to check the type rather than the status as the
+	// disguise status is absent during the disguise transition phase.
+	if (obj->isKindOf(KINDOF_DISGUISER))
+		return true;
+
+	if (obj->testStatus(OBJECT_STATUS_STEALTHED) && !obj->testStatus(OBJECT_STATUS_DETECTED))
+	{
+		const Player* player = rts::getObservedOrLocalPlayer();
+		const Relationship relationship = player->getRelationship(getTeam());
+
+		if (player->isPlayerActive() && relationship != ALLIES)
+			return false;
+	}
+
+	return true;
+}
+
 //=============================================================================
 // Object::isLocallyControlled
 //=============================================================================
@@ -1538,6 +1562,14 @@ Bool Object::isLocallyControlled() const
 	return getControllingPlayer() == ThePlayerList->getLocalPlayer();
 }
 
+//=============================================================================
+// Object::isLocallyViewed
+//=============================================================================
+Bool Object::isLocallyViewed() const
+{
+	return getControllingPlayer() == rts::getObservedOrLocalPlayer();
+}
+
 //=============================================================================
 // Object::isLocallyControlled
 //=============================================================================
@@ -1549,7 +1581,7 @@ Bool Object::isNeutralControlled() const
 //-------------------------------------------------------------------------------------------------
 inline Bool isPosDifferent(const Coord3D* a, const Coord3D* b)
 {
-	// this is necessary because PhysicsBehavior may generate tiny changes even when 
+	// this is necessary because PhysicsBehavior may generate tiny changes even when
 	// "standing still", due to roundoff errors. It's important that we only invalidate
 	// the PartitionManager stuff when the pos/orientation really changes (for efficiency purposes)
 	// so we must put in some cleverness...
@@ -1570,7 +1602,7 @@ inline Bool isPosDifferent(const Coord3D* a, const Coord3D* b)
 //-------------------------------------------------------------------------------------------------
 inline Bool isAngleDifferent(Real a, Real b)
 {
-	// this is necessary because PhysicsBehavior may generate tiny changes even when 
+	// this is necessary because PhysicsBehavior may generate tiny changes even when
 	// "standing still", due to roundoff errors. It's important that we only invalidate
 	// the PartitionManager stuff when the pos/orientation really changes (for efficiency purposes)
 	// so we must put in some cleverness...
@@ -1623,7 +1655,7 @@ void Object::reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPo
 	{
 		if (m_partitionData)
 			m_partitionData->makeDirty(true);
-		
+
 		if (getContain())
 			getContain()->containReactToTransformChange();
 	}
@@ -1631,7 +1663,7 @@ void Object::reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPo
 	if (posDiff)
 	{
 		setTriggerAreaFlagsForChangeInPosition(); // Update for entered/exited
-		
+
 		Region3D mapExtent;
 		TheTerrainLogic->getExtent(&mapExtent);
 		if (mapExtent.isInRegionNoZ(getPosition()))
@@ -1642,16 +1674,16 @@ void Object::reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPo
 }
 
 //-------------------------------------------------------------------------------------------------
-ObjectShroudStatus Object::getShroudedStatus(Int playerIndex) const 
+ObjectShroudStatus Object::getShroudedStatus(Int playerIndex) const
 {
 	if (getTemplate()->isKindOf( KINDOF_ALWAYS_VISIBLE ))
 		return OBJECTSHROUD_CLEAR;
 
 	if (m_partitionData)
-		return m_partitionData->getShroudedStatus(playerIndex); 
+		return m_partitionData->getShroudedStatus(playerIndex);
 
 	// This can happen for objects removed from the partition system (e.g.,
-	// for soldiers that are garrisoned inside a building). 
+	// for soldiers that are garrisoned inside a building).
 	return OBJECTSHROUD_CLEAR;
 }
 
@@ -1663,11 +1695,11 @@ void Object::attemptDamage( DamageInfo *damageInfo )
 	BodyModuleInterface* body = getBodyModule();
 	if (body)
 		body->attemptDamage( damageInfo );
-			
+
 	/// @todo track damage dealt/attempted
 
 	//
-	// if actual damage occurred, and this is an object owned by the local player we 
+	// if actual damage occurred, and this is an object owned by the local player we
 	// might do a radar event for under attack. Note that we do not even try
 	// to do radar events for DAMAGE_PENALTY as that damage type is a type of damage
 	// that occurs with explicit player knowledge
@@ -1675,7 +1707,7 @@ void Object::attemptDamage( DamageInfo *damageInfo )
 	if( damageInfo->out.m_actualDamageDealt > 0.0f &&
 			damageInfo->in.m_damageType != DAMAGE_PENALTY &&
 			damageInfo->in.m_damageType != DAMAGE_HEALING &&
-			!BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) && 
+			!BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) &&
 			m_radarData != NULL &&
 			getControllingPlayer() == ThePlayerList->getLocalPlayer() )
 		TheRadar->tryUnderAttackEvent( this );
@@ -1697,13 +1729,13 @@ void Object::attemptHealing(Real amount, const Object* source)
 	}
 }
 
-ObjectID Object::getSoleHealingBenefactor( void ) const 
+ObjectID Object::getSoleHealingBenefactor( void ) const
 {
 	UnsignedInt now = TheGameLogic->getFrame();
 	if( now > m_soleHealingBenefactorExpirationFrame )
 		return INVALID_ID;
 
-	return	m_soleHealingBenefactorID; 
+	return	m_soleHealingBenefactorID;
 
 }
 
@@ -1717,7 +1749,7 @@ Bool Object::attemptHealingFromSoleBenefactor ( Real amount, const Object* sourc
 	ObjectID id = source->getID();
 
 // Either it is ok to accept healing from any who offer or this is my guy, calling again
-	if( now > m_soleHealingBenefactorExpirationFrame || m_soleHealingBenefactorID == id ) 
+	if( now > m_soleHealingBenefactorExpirationFrame || m_soleHealingBenefactorID == id )
 	{
 		m_soleHealingBenefactorID = id;
 		m_soleHealingBenefactorExpirationFrame = now + duration;
@@ -1747,7 +1779,7 @@ Real Object::estimateDamage( DamageInfoInput& damageInfo ) const
 	BodyModuleInterface* body = getBodyModule();
 	if (body)
 		return body->estimateDamage( damageInfo );
-			
+
 	return 0.0f;
 }
 
@@ -1765,14 +1797,14 @@ void Object::kill()
 	damageInfo.in.m_amount = getBodyModule()->getMaxHealth();
 	attemptDamage( &damageInfo );
 
-	DEBUG_ASSERTCRASH(!damageInfo.out.m_noEffect, ("Attempting to kill an unKillable object (InactiveBody?)\n"));
+	DEBUG_ASSERTCRASH(!damageInfo.out.m_noEffect, ("Attempting to kill an unKillable object (InactiveBody?)"));
 
-}  // end kill
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Restore max health to this Object */
 //-------------------------------------------------------------------------------------------------
-void Object::healCompletely()	
+void Object::healCompletely()
 {
 	attemptHealing(HUGE_DAMAGE_AMOUNT, NULL);
 }
@@ -1798,7 +1830,7 @@ void Object::setCaptured(Bool isCaptured)
 {
 	if (isCaptured)
 		BitSet(m_privateStatus, CAPTURED);
-	else 
+	else
 	{
 		DEBUG_LOG(("Clearing Captured Status. This should never happen. jkmcd"));
 		BitClear(m_privateStatus, CAPTURED);
@@ -1876,7 +1908,7 @@ void Object::setDisabledUntil( DisabledType type, UnsignedInt frame )
 	{
 		//We've lost power -- make sure we aren't already out of power as the sounds shouldn't happen
 		//if you were already disabled.
-		if( !isDisabledByType( DISABLED_UNDERPOWERED ) && 
+		if( !isDisabledByType( DISABLED_UNDERPOWERED ) &&
 				!isDisabledByType( DISABLED_EMP ) &&
 				!isDisabledByType( DISABLED_HACKED ) )
 		{
@@ -1901,7 +1933,7 @@ void Object::setDisabledUntil( DisabledType type, UnsignedInt frame )
 		// srj sez: HELD nevers disables special powers.
 		if ( type != DISABLED_HELD && !isDisabledByType( type ) )
 			pauseAllSpecialPowers( TRUE );
-		
+
 		m_disabledTillFrame[ type ] = frame;
 		m_disabledMask.set( type, frame > TheGameLogic->getFrame() );
 
@@ -1934,9 +1966,9 @@ void Object::setDisabledUntil( DisabledType type, UnsignedInt frame )
 
 	if( type == DISABLED_UNMANNED && !isKindOf( KINDOF_DRONE ) )
 	{
-		//strange but true: If I am a carbomb, 
-		//my driver actually has a dead-man's 
-		//trigger for my dynamite... 
+		//strange but true: If I am a carbomb,
+		//my driver actually has a dead-man's
+		//trigger for my dynamite...
 		//If he gets sniped, I blow up! Wheeee!
 
 		WeaponSetFlags flags;
@@ -1947,7 +1979,7 @@ void Object::setDisabledUntil( DisabledType type, UnsignedInt frame )
 			Object* sniper = TheGameLogic->findObjectByID( getBodyModule()->getLastDamageInfo()->in.m_sourceID );
 			if ( sniper )
 				sniper->scoreTheKill( this );
-			
+
 			kill();
 		}
 		else
@@ -1964,13 +1996,13 @@ void Object::setDisabledUntil( DisabledType type, UnsignedInt frame )
 				AutoHealBehavior* autoHeal = (AutoHealBehavior*)(findUpdateModule( key_AutoHealBehavior ));
 				if (autoHeal)
 					autoHeal->undoUpgrade();
-				
+
 
 			}
 		}
-		
+
 	}
-  
+
 	// This will only be called if we were NOT disabled before coming into this function.
 	if (edgeCase) {
 		onDisabledEdge(true);
@@ -2039,7 +2071,7 @@ Bool Object::clearDisabled( DisabledType type )
 	exceptions.set(DISABLED_UNMANNED);
 
 	// to clarify, if I am NOT disabled by anything other than DISABLED_HELD, or DISABLED_SCRIPT_DISABLED
-	if( !isDisabled() || getDisabledFlags().countInverseIntersection( exceptions ) == 0 )  
+	if( !isDisabled() || getDisabledFlags().countInverseIntersection( exceptions ) == 0 )
 	{
 		if (m_drawable)
 			m_drawable->clearTintStatus( TINT_STATUS_DISABLED );
@@ -2077,7 +2109,7 @@ void Object::checkDisabledStatus()
 
 //-------------------------------------------------------------------------------------------------
 void Object::pauseAllSpecialPowers( const Bool disabling ) const
-{ 
+{
 	for (BehaviorModule** m = m_behaviors; *m; ++m)
 	{
 		SpecialPowerModuleInterface* sp = (*m)->getSpecialPower();
@@ -2096,9 +2128,9 @@ void Object::updateTriggerAreaFlags()
 {
 	Int j = 0;
 	// Update the flags, and remove any trigger areas that this object isn't inside.
-	for (Int i=0; i<m_numTriggerAreasActive; i++) 
+	for (Int i=0; i<m_numTriggerAreasActive; i++)
 	{
-		if (!m_triggerInfo[j].isInside) 
+		if (!m_triggerInfo[j].isInside)
 			continue;
 		m_triggerInfo[j].entered = false;
 		m_triggerInfo[j].exited = false;
@@ -2122,12 +2154,12 @@ void Object::onCollide( Object *other, const Coord3D *loc, const Coord3D *normal
 		if( getStatusBits().test( OBJECT_STATUS_NO_COLLISIONS ) )
 		{
 #ifdef DEBUG_CRC
-			//DEBUG_LOG(("Object::onCollide() - OBJECT_STATUS_NO_COLLISIONS set\n"));
+			//DEBUG_LOG(("Object::onCollide() - OBJECT_STATUS_NO_COLLISIONS set"));
 #endif
 			break;
 		}
 #ifdef DEBUG_CRC
-		//DEBUG_LOG(("Object::onCollide() - calling collide module\n"));
+		//DEBUG_LOG(("Object::onCollide() - calling collide module"));
 #endif
 		collide->onCollide(other, loc, normal);
 	}
@@ -2148,7 +2180,7 @@ Bool Object::isSalvageCrate() const
 }
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
 	Our owning player is telling us to recheck our UpgradeModules, as an upgrade has completed
  */
 void Object::updateUpgradeModules()
@@ -2175,10 +2207,10 @@ void Object::updateUpgradeModules()
 
 //-------------------------------------------------------------------------------------------------
 //This function sucks.
-//It was added for objects that can disguise as other objects and contain upgraded subobject overrides. 
+//It was added for objects that can disguise as other objects and contain upgraded subobject overrides.
 //A concrete example is the bomb truck. Different payloads are displayed based on which upgrades have been
 //made. When the bomb truck disguises as something else, these subobjects are lost because the vector is
-//stored in W3DDrawModule. When we revert back to the original bomb truck, we call this function to 
+//stored in W3DDrawModule. When we revert back to the original bomb truck, we call this function to
 //recalculate those upgraded subobjects.
 //-------------------------------------------------------------------------------------------------
 void Object::forceRefreshSubObjectUpgradeStatus()
@@ -2219,14 +2251,14 @@ Bool Object::didEnterOrExit() const
 //-------------------------------------------------------------------------------------------------
 Bool Object::didEnter(const PolygonTrigger *pTrigger) const
 {
-	if (!didEnterOrExit()) 
+	if (!didEnterOrExit())
 		return false;
 
-	DEBUG_ASSERTCRASH(!isKindOf(KINDOF_INERT), ("Asking whether an inert object entered or exited. This is invalid.\n"));
+	DEBUG_ASSERTCRASH(!isKindOf(KINDOF_INERT), ("Asking whether an inert object entered or exited. This is invalid."));
 
-	for (Int i=0; i<m_numTriggerAreasActive; i++) 
+	for (Int i=0; i<m_numTriggerAreasActive; i++)
 	{
-		if (m_triggerInfo[i].entered && m_triggerInfo[i].pTrigger == pTrigger) 
+		if (m_triggerInfo[i].entered && m_triggerInfo[i].pTrigger == pTrigger)
 			return true;
 	}
 	return false;
@@ -2237,13 +2269,13 @@ Bool Object::didEnter(const PolygonTrigger *pTrigger) const
 //-------------------------------------------------------------------------------------------------
 Bool Object::didExit(const PolygonTrigger *pTrigger) const
 {
-	if (!didEnterOrExit()) 
+	if (!didEnterOrExit())
 		return false;
 
-	DEBUG_ASSERTCRASH(!isKindOf(KINDOF_INERT), ("Asking whether an inert object entered or exited. This is invalid.\n"));
-	for (Int i=0; i<m_numTriggerAreasActive; i++) 
+	DEBUG_ASSERTCRASH(!isKindOf(KINDOF_INERT), ("Asking whether an inert object entered or exited. This is invalid."));
+	for (Int i=0; i<m_numTriggerAreasActive; i++)
 	{
-		if (m_triggerInfo[i].exited && m_triggerInfo[i].pTrigger == pTrigger) 
+		if (m_triggerInfo[i].exited && m_triggerInfo[i].pTrigger == pTrigger)
 			return true;
 	}
 	return false;
@@ -2254,11 +2286,11 @@ Bool Object::didExit(const PolygonTrigger *pTrigger) const
 //-------------------------------------------------------------------------------------------------
 Bool Object::isInside(const PolygonTrigger *pTrigger) const
 {
-	DEBUG_ASSERTCRASH(!isKindOf(KINDOF_INERT), ("Asking whether an inert is inside a trigger area. This is invalid.\n"));
+	DEBUG_ASSERTCRASH(!isKindOf(KINDOF_INERT), ("Asking whether an inert is inside a trigger area. This is invalid."));
 
-	for (Int i=0; i<m_numTriggerAreasActive; i++) 
+	for (Int i=0; i<m_numTriggerAreasActive; i++)
 	{
-		if (m_triggerInfo[i].isInside && m_triggerInfo[i].pTrigger == pTrigger) 
+		if (m_triggerInfo[i].isInside && m_triggerInfo[i].pTrigger == pTrigger)
 			return true;
 	}
 	return false;
@@ -2290,7 +2322,7 @@ ExitInterface *Object::getObjectExitInterface() const
 
 	return exitInterface;
 
-}  // end getObjectExitInterface
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Checks the object against trigger areas when the position changes. */
@@ -2299,7 +2331,7 @@ void Object::setTriggerAreaFlagsForChangeInPosition()
 {
 	// projectiles cannot trigger areas. (jkmcd)
 	// neither can inert objects, like the radar ping, etc. (jkmcd)
-	if (isKindOf(KINDOF_PROJECTILE) || isKindOf(KINDOF_INERT)) 
+	if (isKindOf(KINDOF_PROJECTILE) || isKindOf(KINDOF_INERT))
 		return;
 
 	ICoord3D iPos;
@@ -2307,12 +2339,12 @@ void Object::setTriggerAreaFlagsForChangeInPosition()
 	iPos.x = REAL_TO_INT(pos.x);
 	iPos.y = REAL_TO_INT(pos.y);
 	iPos.z = 0; // Trigger areas compare on xy only.
-	if (m_iPos.x == iPos.x && m_iPos.y == iPos.y) 
+	if (m_iPos.x == iPos.x && m_iPos.y == iPos.y)
 	{
 		return; // didn't move enough to change integer position.
-	}			 
+	}
 
-	if (getAIUpdateInterface()) 
+	if (getAIUpdateInterface())
 	{
 		TheAI->pathfinder()->updatePos(this, getPosition());
 	}
@@ -2323,14 +2355,14 @@ void Object::setTriggerAreaFlagsForChangeInPosition()
 
 	// Check for exited.
 	Int i;
-	for (i=0; i<m_numTriggerAreasActive; i++) 
+	for (i=0; i<m_numTriggerAreasActive; i++)
 	{
-		if (!m_triggerInfo[i].pTrigger->pointInTrigger(m_iPos)) 
+		if (!m_triggerInfo[i].pTrigger->pointInTrigger(m_iPos))
 		{
 			m_triggerInfo[i].isInside = false;
 			m_triggerInfo[i].exited = true;
 			m_enteredOrExitedFrame = now;
-			if (m_team) 
+			if (m_team)
 				m_team->setEnteredExited();
 			TheGameLogic->updateObjectsChangedTriggerAreas();
 #ifdef RTS_DEBUG
@@ -2341,42 +2373,42 @@ void Object::setTriggerAreaFlagsForChangeInPosition()
 
 	m_iPos = iPos;
 
-	for (const PolygonTrigger *pTrig = PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) 
+	for (const PolygonTrigger *pTrig = PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext())
 	{
 		Bool skip = false;
-		for (i = 0; i < m_numTriggerAreasActive; i++) 
+		for (i = 0; i < m_numTriggerAreasActive; i++)
 		{
-			if (m_triggerInfo[i].pTrigger == pTrig) 
+			if (m_triggerInfo[i].pTrigger == pTrig)
 			{
 				// Already handled this one in the check for exited above.
 				skip = true;
 				break;
 			}
 		}
-		if (skip) 
+		if (skip)
 			continue;
-		if (pTrig->pointInTrigger(m_iPos)) 
+		if (pTrig->pointInTrigger(m_iPos))
 		{
-			if (m_numTriggerAreasActive < MAX_TRIGGER_AREA_INFOS) 
+			if (m_numTriggerAreasActive < MAX_TRIGGER_AREA_INFOS)
 			{
 				m_triggerInfo[m_numTriggerAreasActive].isInside = true;
 				m_triggerInfo[m_numTriggerAreasActive].entered = true;
 				m_triggerInfo[m_numTriggerAreasActive].exited = false;
-				m_triggerInfo[m_numTriggerAreasActive].pTrigger = pTrig;  
+				m_triggerInfo[m_numTriggerAreasActive].pTrigger = pTrig;
 				m_enteredOrExitedFrame = now;
-				if (m_team) 
+				if (m_team)
 					m_team->setEnteredExited();
 				TheGameLogic->updateObjectsChangedTriggerAreas();
 				++m_numTriggerAreasActive;
 #ifdef RTS_DEBUG
 				//TheScriptEngine->AppendDebugMessage("Object entered.", false);
 #endif
-			} 
-			else 
+			}
+			else
 			{
 				// Shouldn't happen.
 				static Bool didWarn = false;
-				if (!didWarn) 
+				if (!didWarn)
 				{
 					didWarn = true;
 					TheScriptEngine->AppendDebugMessage("***WARNING - Too many nested trigger areas. ***", true);
@@ -2430,7 +2462,7 @@ void Object::setLayer(PathfindLayerEnum layer)
 	if (layer!=m_layer) {
 #define no_SET_LAYER_INTENSE_DEBUG
 #ifdef SET_LAYER_INTENSE_DEBUG
-		DEBUG_LOG(("Changing layer from %d to %d\n", m_layer, layer));
+		DEBUG_LOG(("Changing layer from %d to %d", m_layer, layer));
 		if (m_layer != LAYER_GROUND) {
 			if (TheTerrainLogic->objectInteractsWithBridgeLayer(this, m_layer)) {
 				DEBUG_CRASH(("Probably shouldn't be chaging layer. jba."));
@@ -2458,13 +2490,13 @@ void Object::setDestinationLayer(PathfindLayerEnum layer)
 void Object::setID( ObjectID id )
 {
 
-	// sanity 
-	DEBUG_ASSERTCRASH( id != INVALID_ID, ("Object::setID - Invalid id\n") );
+	// sanity
+	DEBUG_ASSERTCRASH( id != INVALID_ID, ("Object::setID - Invalid id") );
 
 	// if id hasn't changed do nothing
 	if( m_id == id )
 		return;
-			
+
 	// remove this objects previous id from the lookup table
 	TheGameLogic->removeObjectFromLookupTable( this );
 
@@ -2474,10 +2506,10 @@ void Object::setID( ObjectID id )
 	// add new id to lookup table
 	TheGameLogic->addObjectToLookupTable( this );
 
-}  // end setID
+}
 
 // ------------------------------------------------------------------------------------------------
-Real Object::calculateHeightAboveTerrain(void) const 
+Real Object::calculateHeightAboveTerrain(void) const
 {
 	const Coord3D* pos = getPosition();
 	Real terrainZ = TheTerrainLogic->getLayerHeight( pos->x, pos->y, m_layer );
@@ -2508,18 +2540,18 @@ void Object::friend_prepareForMapBoundaryAdjust(void)
 	// NOTE - DO NOT remove from pathfind map. jba.
 	// NO NO. jba. TheAI->pathfinder()->removeObjectFromPathfindMap( this );
 
-	// remove from the radar, remove from the partition manager	
+	// remove from the radar, remove from the partition manager
 	TheRadar->removeObject(this);
 	ThePartitionManager->unRegisterObject(this);
 
-	// The whole PartitionManager and all of the Looker data is about to be blown away, 
+	// The whole PartitionManager and all of the Looker data is about to be blown away,
 	// so forget what I think I have done
 	m_partitionLastLook->reset();
 	m_partitionLastShroud->reset();
 
 	m_partitionLastThreat->reset();
 	m_partitionLastValue->reset();
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2572,7 +2604,7 @@ void Object::calcNaturalRallyPoint(Coord2D *pt)
 }
 
 //-------------------------------------------------------------------------------------------------
-Module* Object::findModule(NameKeyType key) const 
+Module* Object::findModule(NameKeyType key) const
 {
 	Module* m = NULL;
 
@@ -2587,7 +2619,7 @@ Module* Object::findModule(NameKeyType key) const
 			}
 			else
 			{
-				DEBUG_CRASH(("Duplicate modules found for name %s!\n",TheNameKeyGenerator->keyToName(key).str()));
+				DEBUG_CRASH(("Duplicate modules found for name %s!",TheNameKeyGenerator->keyToName(key).str()));
 			}
 #else
 			m = *b;
@@ -2628,7 +2660,7 @@ void Object::scoreTheKill( const Object *victim )
 		return;
 	}
 
-	
+
 	if ( victim->isKindOf( KINDOF_IGNORED_IN_GUI ) )
 		return;
 
@@ -2670,14 +2702,14 @@ void Object::scoreTheKill( const Object *victim )
 }
 
 //-------------------------------------------------------------------------------------------------
-VeterancyLevel Object::getVeterancyLevel() const 
-{ 
-	return m_experienceTracker ? m_experienceTracker->getVeterancyLevel() : LEVEL_REGULAR; 
+VeterancyLevel Object::getVeterancyLevel() const
+{
+	return m_experienceTracker ? m_experienceTracker->getVeterancyLevel() : LEVEL_REGULAR;
 }
 
 //-------------------------------------------------------------------------------------------------
-void Object::friend_bindToDrawable( Drawable *draw ) 
-{ 
+void Object::friend_bindToDrawable( Drawable *draw )
+{
 	m_drawable = draw;
 	if (m_drawable)
 	{
@@ -2710,12 +2742,12 @@ void Object::friend_bindToDrawable( Drawable *draw )
 	{
 		(*b)->onDrawableBoundToObject();
 	}
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
-void Object::setSelectable(Bool selectable) 
-{ 
-	m_isSelectable = selectable; 
+void Object::setSelectable(Bool selectable)
+{
+	m_isSelectable = selectable;
 	if (m_drawable)
 	{
 		m_drawable->setSelectable(selectable);
@@ -2725,9 +2757,9 @@ void Object::setSelectable(Bool selectable)
 //-------------------------------------------------------------------------------------------------
 Bool Object::isSelectable() const
 {
-	return getTemplate()->isKindOf(KINDOF_ALWAYS_SELECTABLE) 
-				|| (m_isSelectable 
-						&& !testStatus(OBJECT_STATUS_UNSELECTABLE) 
+	return getTemplate()->isKindOf(KINDOF_ALWAYS_SELECTABLE)
+				|| (m_isSelectable
+						&& !testStatus(OBJECT_STATUS_UNSELECTABLE)
 						&& !isEffectivelyDead()
 						&& !getTemplate()->isKindOf(KINDOF_DRONE)//Most drones are unselectable from being slaved, but the SpyDrone needs help
 						);
@@ -2740,9 +2772,9 @@ Bool Object::isMassSelectable() const
 }
 
 //-------------------------------------------------------------------------------------------------
-void Object::setWeaponSetFlag(WeaponSetType wst) 
-{ 
-	m_curWeaponSetFlags.set(wst); 
+void Object::setWeaponSetFlag(WeaponSetType wst)
+{
+	m_curWeaponSetFlags.set(wst);
 	m_weaponSet.updateWeaponSet(this);
 	if (m_drawable)
 	{
@@ -2751,9 +2783,9 @@ void Object::setWeaponSetFlag(WeaponSetType wst)
 }
 
 //-------------------------------------------------------------------------------------------------
-void Object::clearWeaponSetFlag(WeaponSetType wst) 
-{ 
-	m_curWeaponSetFlags.set(wst, 0); 
+void Object::clearWeaponSetFlag(WeaponSetType wst)
+{
+	m_curWeaponSetFlags.set(wst, 0);
 	m_weaponSet.updateWeaponSet(this);
 	if (m_drawable)
 	{
@@ -2768,7 +2800,7 @@ Bool Object::hasSpecialPower( SpecialPowerType type ) const
 }
 
 //-------------------------------------------------------------------------------------------------
-void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel )
+void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback )
 {
 	updateUpgradeModules();
 
@@ -2778,14 +2810,7 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 
 	BodyModuleInterface* body = getBodyModule();
 	if (body)
-		body->onVeterancyLevelChanged(oldLevel, newLevel);
-	
-	
-	Bool hideAnimationForStealth = ( ! isLocallyControlled() && testStatus(OBJECT_STATUS_STEALTHED));
-
-	Bool doAnimation = ( ! hideAnimationForStealth 
-											&& (newLevel > oldLevel) 
-											&& ( ! isKindOf(KINDOF_IGNORED_IN_GUI))); //First, we plan to do the animation if the level went up
+		body->onVeterancyLevelChanged(oldLevel, newLevel, provideFeedback);
 
 	switch (newLevel)
 	{
@@ -2796,7 +2821,6 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 			clearWeaponBonusCondition(WEAPONBONUSCONDITION_VETERAN);
 			clearWeaponBonusCondition(WEAPONBONUSCONDITION_ELITE);
 			clearWeaponBonusCondition(WEAPONBONUSCONDITION_HERO);
-			doAnimation = FALSE;//... but not if somehow up to Regular
 			break;
 		case LEVEL_VETERAN:
 			setWeaponSetFlag(WEAPONSET_VETERAN);
@@ -2824,13 +2848,18 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 			break;
 	}
 
+	Bool doAnimation = provideFeedback
+		&& newLevel > oldLevel
+		&& !isKindOf(KINDOF_IGNORED_IN_GUI)
+		&& isLogicallyVisible();
+
 	if( doAnimation && TheGameLogic->getDrawIconUI() )
 	{
 		if( TheAnim2DCollection && TheGlobalData->m_levelGainAnimationName.isEmpty() == FALSE )
 		{
 			Anim2DTemplate *animTemplate = TheAnim2DCollection->findTemplate( TheGlobalData->m_levelGainAnimationName );
 
-			Coord3D pos = *getPosition(); 
+			Coord3D pos = *getPosition();
 			pos.add(&m_healthBoxOffset);
 
 			TheInGameUI->addWorldAnimation( animTemplate,
@@ -2840,7 +2869,7 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 																			TheGlobalData->m_levelGainAnimationZRisePerSecond);
 		}
 
-		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_unitPromoted;	
+		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_unitPromoted;
 		soundToPlay.setObjectID( getID() );
 		TheAudio->addAudioEvent( &soundToPlay );
 	}
@@ -2867,7 +2896,7 @@ Bool Object::isAbleToAttack() const
 	DEBUG_ASSERTCRASH( (containedBy == NULL) || (containedBy->getContain() != NULL), ("A %s thinks they are contained by something with no contain module!", getTemplate()->getName().str() ) );
 	if( containedBy && containedBy->getContain() && !containedBy->getContain()->isPassengerAllowedToFire() )
 		return false;
-	
+
 
 	// We can't fire if under construction
 	if( testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
@@ -2877,14 +2906,14 @@ Bool Object::isAbleToAttack() const
 	if( testStatus(OBJECT_STATUS_SOLD) )
 		return false;
 
-	//We can't fire if we, as a portable structure, are aptly disabled 
+	//We can't fire if we, as a portable structure, are aptly disabled
 	if ( isKindOf( KINDOF_PORTABLE_STRUCTURE ) || isKindOf( KINDOF_SPAWNS_ARE_THE_WEAPONS ))
 	{
 		if( isDisabledByType( DISABLED_HACKED ) || isDisabledByType( DISABLED_EMP ) )
 			return false;
 	}
 
-	//We can't fire if all our weapons are disabled! 
+	//We can't fire if all our weapons are disabled!
 	//Currently, only turreted weapons can be disabled.
 	//ONLY DO THIS CHECK IF OUR UNIT DOESN'T HAVE THE
 	//KINDOF_CAN_ATTACK flag... nuke cannons have disabled
@@ -2903,7 +2932,7 @@ Bool Object::isAbleToAttack() const
 				continue;
 
 			anyWeapon = TRUE;
-			
+
 			//We found a weapon, is it a turret?
 			Real dummy;
 			WhichTurretType tur = ai->getWhichTurretForWeaponSlot( (WeaponSlotType)i, &dummy );
@@ -2914,12 +2943,12 @@ Bool Object::isAbleToAttack() const
 				anyEnabled = TRUE;
 				break;
 			}
-			
+
 			if( ai->isTurretEnabled( tur ) )
 			{
 				//The turret is enable, meaning we have an enabled weapon. Quit.
 				anyEnabled = TRUE;
-				break;;	
+				break;
 			}
 		}
 		if( anyWeapon && !anyEnabled )
@@ -2941,7 +2970,7 @@ Bool Object::isAbleToAttack() const
 	// for garrisonned buildings that can attack sometimes
 	if( getStatusBits().test( OBJECT_STATUS_CAN_ATTACK ) )
 		return true;
-	
+
 	// for weaponless transports.  This will make me think I can, but I will check if I literally can by looking
 	// at passenger weapons in CanAttack.
 	const ContainModuleInterface* contain = getContain();
@@ -2999,7 +3028,7 @@ void Object::maskObject( Bool mask )
 	if (mask)
 		TheGameLogic->deselectObject(this, ~getControllingPlayer()->getPlayerMask(), TRUE);
 
-}  // end maskObject
+}
 
 //-------------------------------------------------------------------------------------------------
 /*
@@ -3016,8 +3045,8 @@ Bool Object::isUsingAirborneLocomotor( void ) const
 //IT WOULD PROBABLY BE WISE TO MOVE ALL THE HARD-CODED DEFAULTS BELOW
 //INTO A NEW Drawable::getHealthBox..() WHICH USES GEOM0INFO, MODEL DATA, INI DATA, ETC.
 void Object::getHealthBoxPosition(Coord3D& pos) const
-{ 
-	pos = *getPosition(); 
+{
+	pos = *getPosition();
 	pos.z += getGeometryInfo().getMaxHeightAbovePosition() + 10;
 	pos.add(&m_healthBoxOffset);
 
@@ -3034,7 +3063,7 @@ void Object::getHealthBoxPosition(Coord3D& pos) const
 //IT WOULD PROBABLY BE WISE TO MOVE ALL THE HARD-CODED DEFAULTS BELOW
 //INTO A NEW Drawable::getHealthBox..() WHICH USES GEOM0INFO, MODEL DATA, INI DATA, ETC.
 Bool Object::getHealthBoxDimensions(Real &healthBoxHeight, Real &healthBoxWidth) const
-{ 
+{
 
 #ifdef CALC_HEALTHBAR_FROM_HITPOINTS
 	Real maxHP = getBodyModule()->getMaxHealth();
@@ -3047,7 +3076,7 @@ Bool Object::getHealthBoxDimensions(Real &healthBoxHeight, Real &healthBoxWidth)
 		healthBoxWidth = min(150.0f, max(100.0f, maxHP/10));
 		return true;
 	}
-	else if ( isKindOf(KINDOF_MOB_NEXUS) ) 
+	else if ( isKindOf(KINDOF_MOB_NEXUS) )
 	{
 		//enforce healthBoxHeightMinimum/Maximum
 		healthBoxHeight = min(3.0f, max(5.0f, maxHP/50));
@@ -3080,7 +3109,7 @@ Bool Object::getHealthBoxDimensions(Real &healthBoxHeight, Real &healthBoxWidth)
 
 	//just add the major and minor axes
 	Real size = MAX(20.0f, MIN(150.0f, (getGeometryInfo().getMajorRadius() + getGeometryInfo().getMinorRadius())) );
-	healthBoxHeight = 3.0f; 
+	healthBoxHeight = 3.0f;
 	healthBoxWidth = MAX(20.0f, size * 2.0f);
 	return TRUE;
 
@@ -3092,7 +3121,7 @@ Bool Object::getHealthBoxDimensions(Real &healthBoxHeight, Real &healthBoxWidth)
 //-------------------------------------------------------------------------------------------------
 /**
  * Update this object instance with properties from the map object
- * 
+ *
  */
 void Object::updateObjValuesFromMapProperties(Dict* properties)
 {
@@ -3174,7 +3203,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
 			ai->setAttitude((AttitudeType)valInt);
 		}
 	}
-	
+
 	// set recruitable
 	valBool = properties->getBool(TheKey_objectRecruitableAI, &exists);
 	if (exists) {
@@ -3183,7 +3212,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
 			getAIUpdateInterface()->setIsRecruitable(valBool);
 		}
 	}
-	
+
 	// set selectable
 	valBool = properties->getBool(TheKey_objectSelectable, &exists);
 	if (exists) {
@@ -3191,7 +3220,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
 			setSelectable(valBool);
 		}
 	}
-	
+
 	// set the stopping distance
 	valReal = properties->getReal(TheKey_objectStoppingDistance, &exists);
 	if (exists && valReal >= 0.5f)
@@ -3202,7 +3231,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
 			loco->setCloseEnoughDist(valReal);
 		}
 	}
-	
+
 	// set the disabledness of this object
 	valBool = properties->getBool(TheKey_objectEnabled, &exists);
 	if (exists) {
@@ -3232,7 +3261,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
 
 	//Set the player targetable setting of the object
 	valBool = properties->getBool( TheKey_objectTargetable, &exists );
-	if( exists ) 
+	if( exists )
 	{
 		setScriptStatus(OBJECT_STATUS_SCRIPT_TARGETABLE, valBool);
 	}
@@ -3257,33 +3286,33 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
 
 
 	Int upgradeNum = 0;
-	do 
+	do
 	{
 		AsciiString keyName;
 		keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_objectGrantUpgrade).str(), upgradeNum);
 		valStr = properties->getAsciiString(NAMEKEY(keyName), &exists);
 
-		if (exists) 
+		if (exists)
 		{
 			const UpgradeTemplate *ut = TheUpgradeCenter->findUpgrade(valStr);
 			if (ut)
 				giveUpgrade(ut);
 		}
-		else 
+		else
 		{
 			valStr.clear();
 		}
 
 		++upgradeNum;
 	} while (!valStr.isEmpty());
-	
+
 
 }
 
 //-------------------------------------------------------------------------------------------------
 void Object::friend_adjustPowerForPlayer( Bool incoming )
 {
-	if (isDisabled() && getTemplate()->getEnergyProduction() > 0) 
+	if (isDisabled() && getTemplate()->getEnergyProduction() > 0)
 	{
 		// Disabledness only affects Producers, not Consumers.
 		return;
@@ -3308,7 +3337,7 @@ void Object::onDisabledEdge(Bool becomingDisabled)
 	if (controller)
 	{
 		//@todo jkmcd - Colin suggested we rewrite this to use the interface stuff. I agree, but need
-		// to get some more bugs fixed today. 
+		// to get some more bugs fixed today.
 		static NameKeyType radar = NAMEKEY("RadarUpgrade");
 		Module *mod = mod = findModule(radar);
 		if (mod) {
@@ -3326,15 +3355,20 @@ void Object::onDisabledEdge(Bool becomingDisabled)
 
 	// We will need to adjust power ... somehow ...
 	Int powerToAdjust = getTemplate()->getEnergyProduction();
-	
-	if( powerToAdjust > 0 )
+
+	// TheSuperHackers @bugfix Caball009 18/07/2025 Don't adjust the power for power plants that are still under construction.
+#if !RETAIL_COMPATIBLE_CRC
+	if ( powerToAdjust > 0 && !testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
+#else
+	if ( powerToAdjust > 0 )
+#endif
 	{
 		// We can't affect something that consumes, or else we go low power which removes the consumption
 		// which makes us not low power so we add the consumption so we go low power...
 		// This check also guaards the IsDisabled in friend_adjustPower above
 		static NameKeyType powerPlant = NAMEKEY("PowerPlantUpgrade");
 		static NameKeyType overCharge = NAMEKEY("OverchargeBehavior");
-		
+
 		Module* mod = findModule(powerPlant);
 		if (mod) {
 			PowerPlantUpgrade *powerPlantMod = (PowerPlantUpgrade*) mod;
@@ -3342,7 +3376,7 @@ void Object::onDisabledEdge(Bool becomingDisabled)
 				powerToAdjust += getTemplate()->getEnergyBonus();
 			}
 		}
-		
+
 		mod = findModule(overCharge);
 		if (mod) {
 			OverchargeBehavior *overChargeMod = (OverchargeBehavior*) mod;
@@ -3350,7 +3384,7 @@ void Object::onDisabledEdge(Bool becomingDisabled)
 				powerToAdjust += getTemplate()->getEnergyBonus();
 			}
 		}
-		
+
 		// Now, adjust the power for the player.
 		if (controller)
 			controller->getEnergy()->adjustPower(powerToAdjust, !becomingDisabled);
@@ -3399,7 +3433,7 @@ void Object::crc( Xfer *xfer )
 		logString.concat(tmp);
 	}
 #endif // DEBUG_CRC
-	
+
 
 	xfer->xferUser(&m_id,															sizeof(m_id));
 #ifdef DEBUG_CRC
@@ -3455,7 +3489,7 @@ void Object::crc( Xfer *xfer )
 #ifdef DEBUG_CRC
 	if (doLogging)
 	{
-		tmp.format("damage scalar: %g/%8.8X\n", scalar, AS_INT(scalar));
+		tmp.format("damage scalar: %g/%8.8X", scalar, AS_INT(scalar));
 		logString.concat(tmp);
 
 		CRCDEBUG_LOG(("%s", logString.str()));
@@ -3470,13 +3504,13 @@ void Object::crc( Xfer *xfer )
 			xfer->xferSnapshot( thisWeapon );
 		}
 	}
-	
-}  // end crc
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Object xfer implemtation
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Xfers m_singleUseCommandUsed... determines if the single use command button has been used or not.
 	* 3: Xfers the solehealingbenefactor ID and expiration frame
 	* 4: misc stuff that got missed somehow
@@ -3488,7 +3522,7 @@ void Object::crc( Xfer *xfer )
 //-------------------------------------------------------------------------------------------------
 void Object::xfer( Xfer *xfer )
 {
-	
+
 	// version
 	const XferVersion currentVersion = 8;
 	XferVersion version = currentVersion;
@@ -3499,7 +3533,7 @@ void Object::xfer( Xfer *xfer )
 	xfer->xferObjectID( &id );
 	setID( id );
 
-	DEBUG_LOG(("Xfer Object %s id=%d\n",getTemplate()->getName().str(),id));
+	DEBUG_LOG(("Xfer Object %s id=%d",getTemplate()->getName().str(),id));
 
 	if (version >= 7)
 	{
@@ -3523,7 +3557,7 @@ void Object::xfer( Xfer *xfer )
 	// team
 	TeamID teamID = m_team ? m_team->getID() : TEAM_ID_INVALID;
 	xfer->xferUser( &teamID, sizeof( TeamID ) );
-	// DON'T set the team yet; must wait till we read our status bits, 
+	// DON'T set the team yet; must wait till we read our status bits,
 	// since setTeam can affect the player's power usage, but that could
 	// be done incorrectly if our status bits aren't accurate yet... (srj)
 
@@ -3543,7 +3577,7 @@ void Object::xfer( Xfer *xfer )
 		// change the ID of the drawable attached to be the same ID as it was when it was saved
 		draw->setID( drawableID );
 
-	}  // end if
+	}
 
 	// internal name
 	xfer->xferAsciiString( &m_name );
@@ -3585,7 +3619,7 @@ void Object::xfer( Xfer *xfer )
 		Team *team = TheTeamFactory->findTeamByID( teamID );
 		if( team == NULL )
 		{
-			DEBUG_CRASH(( "Object::xfer - Unable to load team\n" ));
+			DEBUG_CRASH(( "Object::xfer - Unable to load team" ));
 			throw SC_INVALID_DATA;
 		}
 		const Bool restoring = true;
@@ -3693,10 +3727,10 @@ void Object::xfer( Xfer *xfer )
 	xfer->xferUnsignedInt(&m_enteredOrExitedFrame);
 	xfer->xferICoord3D(&m_iPos);
 	if (m_numTriggerAreasActive<0 || m_numTriggerAreasActive>MAX_TRIGGER_AREA_INFOS) {
-		DEBUG_CRASH(("Invalid m_numTriggerAreasActive = %d, max is %d", m_numTriggerAreasActive, 
+		DEBUG_CRASH(("Invalid m_numTriggerAreasActive = %d, max is %d", m_numTriggerAreasActive,
 			MAX_TRIGGER_AREA_INFOS));
 		throw SC_INVALID_DATA;
-	}	 
+	}
 	for (i=0; i<m_numTriggerAreasActive; i++) {
 		AsciiString triggerName;
 		if (m_triggerInfo[i].pTrigger) {
@@ -3766,9 +3800,9 @@ void Object::xfer( Xfer *xfer )
 			// end data block
 			xfer->endBlock();
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		AsciiString otherModuleIdentifier;
@@ -3792,7 +3826,7 @@ void Object::xfer( Xfer *xfer )
 					break;
 				}
 
-			}  // end for, moduleIt
+			}
 
 			// start of a new block
 			Int dataSize = xfer->beginBlock();
@@ -3806,27 +3840,27 @@ void Object::xfer( Xfer *xfer )
 			{
 
 				// for testing purposes, this module better be found
-				DEBUG_CRASH(( "Object::xfer - Module '%s' was indicated in file, but not found on object '%s'(%d)\n",
+				DEBUG_CRASH(( "Object::xfer - Module '%s' was indicated in file, but not found on object '%s'(%d)",
 											moduleIdentifier.str(), getTemplate()->getName().str(), getID() ));
 
 				// skip this data in the file
 				xfer->skip( dataSize );
 
-			}  // end if
+			}
 			else
 			{
 
 				// xfer the data into this module
 				xfer->xferSnapshot( module );
 
-			}  // end else
-			
+			}
+
 			// end block
 			xfer->endBlock();
 
-		}  // end for, i module count recorded in file
+		}
 
-	}  // end else, load
+	}
 
 
 	if ( version >= 3 )
@@ -3841,7 +3875,7 @@ void Object::xfer( Xfer *xfer )
 	}
 
 	// Doesn't need to be saved.  These are created as needed.  jba.
-	//AIGroup*		m_group;															///< if non-NULL, we are part of this group of agents
+	//m_group;
 
 	// don't need to save m_partitionData.
 	DEBUG_ASSERTCRASH(!(xfer->getXferMode() == XFER_LOAD && m_partitionData == NULL), ("should not be in partitionmgr yet"));
@@ -3856,7 +3890,7 @@ void Object::xfer( Xfer *xfer )
 	//m_body;
 	//m_ai;
 	//m_physics;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	//m_hasDiedAlready;
 #endif
 
@@ -3880,11 +3914,11 @@ void Object::xfer( Xfer *xfer )
 	if (version >= 5)
 	{
 		xfer->xferBool(&m_isReceivingDifficultyBonus);
-	} 
+	}
 	else
 		m_isReceivingDifficultyBonus = FALSE;
 
-}  // end xfer
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Object load game post process phase */
@@ -3896,24 +3930,24 @@ void Object::loadPostProcess()
 	else
 		m_containedBy = NULL;
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Does this object have this upgrade */
 //-------------------------------------------------------------------------------------------------
-Bool Object::hasUpgrade( const UpgradeTemplate *upgradeT ) const 
+Bool Object::hasUpgrade( const UpgradeTemplate *upgradeT ) const
 {
 	if( m_objectUpgradesCompleted.testForAll( upgradeT->getUpgradeMask() ) )
 	{
 		return TRUE;
 	}
 	return FALSE;
-}  // end hasUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is this object capable of having this upgrade */
 //-------------------------------------------------------------------------------------------------
-Bool Object::affectedByUpgrade( const UpgradeTemplate *upgradeT ) const 
+Bool Object::affectedByUpgrade( const UpgradeTemplate *upgradeT ) const
 {
 	UpgradeMaskType objectMask = getObjectCompletedUpgradeMask();
 	UpgradeMaskType playerMask = getControllingPlayer()->getCompletedUpgradeMask();
@@ -3938,7 +3972,7 @@ Bool Object::affectedByUpgrade( const UpgradeTemplate *upgradeT ) const
 	}
 	return FALSE;
 
-}  // end affectedByUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Give this upgrade to this object */
@@ -3955,7 +3989,7 @@ void Object::giveUpgrade( const UpgradeTemplate *upgradeT )
 		//
 		updateUpgradeModules();
 	}
-}  // end giveUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove this upgrade from this object */
@@ -3996,7 +4030,7 @@ void Object::onCapture( Player *oldOwner, Player *newOwner )
 	// onCapture is used now, so it better be called after ownership changes and not before.
 	//
 	handlePartitionCellMaintenance();
-	
+
 	// Design needs the player to be able to sell buildings he steals from the AI's build list, and this is the
 	// easiest fix.  The only snafu would be a key building build listed by the AI that the player can capture
 	// and the AI tries to capture back but needs to not sell.  In that case, a Cinematic Unsellable version
@@ -4013,18 +4047,18 @@ void Object::onCapture( Player *oldOwner, Player *newOwner )
 		}
 	}
 
-}  // end onCapture
+}
 
 //-------------------------------------------------------------------------------------------------
 /// Object level events that need to happen upon game death
 void Object::onDie( DamageInfo *damageInfo )
 {
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	DEBUG_ASSERTCRASH(m_hasDiedAlready == false, ("Object::onDie has been called multiple times. This is invalid. jkmcd"));
 	m_hasDiedAlready = true;
 #endif
-	
+
 	Bool selfInflicted = (damageInfo->in.m_sourceID == getID());
 
 	// FIRST, call our die modules.
@@ -4038,7 +4072,7 @@ void Object::onDie( DamageInfo *damageInfo )
 	// When objects die we remove from the radar as they're really not interesting anymore
 	if( m_radarData )
 		TheRadar->removeObject( this );
-	
+
 	// Just in case I have been sporting one of thise fancy Terrain Decals,
 	//I naturally lose it now, because I'm dead.
 	Drawable *draw = getDrawable();
@@ -4071,7 +4105,7 @@ void Object::onDie( DamageInfo *damageInfo )
 	else if (damageInfo->in.m_deathType == DEATH_POISONED || damageInfo->in.m_deathType == DEATH_POISONED_BETA)
 		deathSound = *getTemplate()->getSoundDieToxin();
 
-	// If we didn't actually have a specialized die sound (for the case of fire or poison, we 
+	// If we didn't actually have a specialized die sound (for the case of fire or poison, we
 	// should use the generic death sound)
 	if (!TheAudio->isValidAudioEvent(&deathSound))
 		deathSound = *getTemplate()->getSoundDie();
@@ -4082,14 +4116,14 @@ void Object::onDie( DamageInfo *damageInfo )
 	PlayerIndex index = getControllingPlayer() ? getControllingPlayer()->getPlayerIndex() : 0;
 	deathSound.setPlayerIndex( index );
 	TheAudio->addAudioEvent(&deathSound);
-	
-	if (isLocallyControlled() && !selfInflicted) // wasLocallyControlled? :-)
+
+	if (isLocallyViewed() && !selfInflicted) // wasLocallyViewed? :-)
 	{
-		if (isKindOf(KINDOF_STRUCTURE) && isKindOf(KINDOF_MP_COUNT_FOR_VICTORY)) 
+		if (isKindOf(KINDOF_STRUCTURE) && isKindOf(KINDOF_MP_COUNT_FOR_VICTORY))
 		{
 			TheEva->setShouldPlay(EVA_BuldingLost);
-		} 
-		else if (isKindOf(KINDOF_INFANTRY) || isKindOf(KINDOF_VEHICLE)) 
+		}
+		else if (isKindOf(KINDOF_INFANTRY) || isKindOf(KINDOF_VEHICLE))
 		{
 			TheEva->setShouldPlay(EVA_UnitLost);
 			//Create a fake radar event so the user can use the spacebar to quickly jump to this!
@@ -4102,7 +4136,7 @@ void Object::onDie( DamageInfo *damageInfo )
 }
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
 	A weapon cannot be in charge of maintaining condition flags as it is all event driven.
 	I will maintain my ModelCondition myself if it should change.  Firing is set by firing logic,
 	so I don't include it here.  It is only the states that expire on timers that noone watches
@@ -4121,7 +4155,7 @@ void Object::adjustModelConditionForWeaponStatus()
 			m_lastWeaponCondition[i] = WSF_NONE;
 			continue;
 		}
-		
+
 		WeaponSetConditionType conditionToSet = WSF_INVALID;
 		if (i != m_weaponSet.getCurWeaponSlot())
 		{
@@ -4159,7 +4193,7 @@ void Object::adjustModelConditionForWeaponStatus()
 			// then we might have a frame where we have reloaded and are ready-to-fire,
 			// but haven't fired yet this frame. in that case, use 'between' so we still have
 			// a firing pose, 'cuz if we use 'none' we will 'pop' back to idle for a frame. (srj)
-			// additional note: only do if aiming or firing, since we could also be in this state if 
+			// additional note: only do if aiming or firing, since we could also be in this state if
 			// we are approaching or pursuing a target! (srj)
 			if (newStatus == READY_TO_FIRE && conditionToSet == WSF_NONE && testStatus( OBJECT_STATUS_IS_ATTACKING ) &&
 					(testStatus( OBJECT_STATUS_IS_AIMING_WEAPON ) || testStatus( OBJECT_STATUS_IS_FIRING_WEAPON )))
@@ -4189,6 +4223,15 @@ void Object::adjustModelConditionForWeaponStatus()
 	}
 }
 
+//-------------------------------------------------------------------------------------------------
+Bool Object::hasGhostObject() const
+{
+	if (m_partitionData == NULL)
+		return false;
+
+	return m_partitionData->getGhostObject() != NULL;
+}
+
 //-------------------------------------------------------------------------------------------------
 /// We have moved a 'significant' amount, so do maintenence that can be considered 'cell-based'
 void Object::onPartitionCellChange()
@@ -4241,7 +4284,7 @@ void Object::addValue()
 		return;
 	}
 
-	if (!getControllingPlayer()) 
+	if (!getControllingPlayer())
 		return;
 
 	if( getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) || isEffectivelyDead() || getShroudClearingRange() <= 0.0f )
@@ -4272,8 +4315,8 @@ void Object::removeValue()
 		return;
 	}
 
-	ThePartitionManager->undoValueAffect(m_partitionLastValue->m_where.x, 
-																			 m_partitionLastValue->m_where.y, 
+	ThePartitionManager->undoValueAffect(m_partitionLastValue->m_where.x,
+																			 m_partitionLastValue->m_where.y,
 																			 m_partitionLastValue->m_howFar,
 																			 m_partitionLastValue->m_data,
 																			 m_partitionLastValue->m_forWhom
@@ -4290,8 +4333,8 @@ void Object::addThreat()
 		DEBUG_CRASH( ("An Object is adding threat, but hasn't removed his previous threat. (He hasn't finished the threat?)") );
 		return;
 	}
-	
-	if (!getControllingPlayer()) 
+
+	if (!getControllingPlayer())
 		return;
 
 	if( getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) || isEffectivelyDead() || getShroudClearingRange() <= 0.0f )
@@ -4322,8 +4365,8 @@ void Object::removeThreat()
 		return;
 	}
 
-	ThePartitionManager->undoThreatAffect(m_partitionLastThreat->m_where.x, 
-																			  m_partitionLastThreat->m_where.y, 
+	ThePartitionManager->undoThreatAffect(m_partitionLastThreat->m_where.x,
+																			  m_partitionLastThreat->m_where.y,
 																			  m_partitionLastThreat->m_howFar,
 																				m_partitionLastThreat->m_data,
 																			  m_partitionLastThreat->m_forWhom
@@ -4360,14 +4403,14 @@ void Object::look()
 			{
 				const Player *currentPlayer = ThePlayerList->getNthPlayer( currentIndex );
 
-				// Build mask of of allies who can see me. 
+				// Build mask of of allies who can see me.
 				// This is the Object-centric game level that cares
 				if( getControllingPlayer()->getRelationship( currentPlayer->getDefaultTeam() ) == ALLIES )
 				{
 					lookingMask |= currentPlayer->getPlayerMask();
 				}
 			}
-			
+
 			// Other players can also be looking through our eyes.
 			lookingMask |= controller->getVisionSpiedMask();
 
@@ -4375,9 +4418,9 @@ void Object::look()
 				lookingMask = PLAYERMASK_ALL;
 
 			Coord3D pos = *getPosition();
-			ThePartitionManager->doShroudReveal(pos.x, 
-																					pos.y, 
-																					getShroudClearingRange(), 
+			ThePartitionManager->doShroudReveal(pos.x,
+																					pos.y,
+																					getShroudClearingRange(),
 																					lookingMask
 																					);
 
@@ -4385,7 +4428,7 @@ void Object::look()
 			m_partitionLastLook->m_forWhom = lookingMask;
 			m_partitionLastLook->m_howFar = getShroudClearingRange();
 
-//			DEBUG_LOG(( "A %s looks at %f, %f for %x at range %f\n",
+//			DEBUG_LOG(( "A %s looks at %f, %f for %x at range %f",
 //									getTemplate()->getName().str(),
 //									pos.x,
 //									pos.y,
@@ -4406,13 +4449,13 @@ void Object::unlook()
 		return;
 	}
 
-	ThePartitionManager->queueUndoShroudReveal(m_partitionLastLook->m_where.x, 
-																				m_partitionLastLook->m_where.y, 
-																				m_partitionLastLook->m_howFar, 
+	ThePartitionManager->queueUndoShroudReveal(m_partitionLastLook->m_where.x,
+																				m_partitionLastLook->m_where.y,
+																				m_partitionLastLook->m_howFar,
 																				m_partitionLastLook->m_forWhom
 																				);
 
-//			DEBUG_LOG(( "A %s queues an unlook at %f, %f for %x at range %f\n",
+//			DEBUG_LOG(( "A %s queues an unlook at %f, %f for %x at range %f",
 //									getTemplate()->getName().str(),
 //									m_partitionLastLook.m_where.x,
 //									m_partitionLastLook.m_where.y,
@@ -4450,8 +4493,8 @@ void Object::shroud()
 			}
 
 			Coord3D pos = *getPosition();
-			ThePartitionManager->doShroudCover(pos.x, pos.y, 
-				getShroudRange(), 
+			ThePartitionManager->doShroudCover(pos.x, pos.y,
+				getShroudRange(),
 				shroudingMask);
 
 			m_partitionLastShroud->m_where = pos;
@@ -4471,9 +4514,9 @@ void Object::unshroud()
 		return;
 	}
 
-	ThePartitionManager->undoShroudCover(m_partitionLastShroud->m_where.x, 
-		m_partitionLastShroud->m_where.y, 
-		m_partitionLastShroud->m_howFar, 
+	ThePartitionManager->undoShroudCover(m_partitionLastShroud->m_where.x,
+		m_partitionLastShroud->m_where.y,
+		m_partitionLastShroud->m_howFar,
 		m_partitionLastShroud->m_forWhom);
 
 	m_partitionLastShroud->reset();
@@ -4482,17 +4525,17 @@ void Object::unshroud()
 //-------------------------------------------------------------------------------------------------
 Real Object::getVisionRange() const
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_debugVisibility) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugVisibility)
 	{
 		Vector3 pos(m_visionRange, 0, 0);
-		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i) 
+		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i)
 		{
 			pos.Rotate_Z(1.0f * i / TheGlobalData->m_debugVisibilityTileCount * 2 * PI);
 			Coord3D coord = { pos.X + getPosition()->x, pos.Y + getPosition()->y, pos.Z + getPosition()->z };
 
-			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth, 
-											TheGlobalData->m_debugVisibilityTileDuration, 
+			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth,
+											TheGlobalData->m_debugVisibilityTileDuration,
 											TheGlobalData->m_debugVisibilityTargettableColor);
 		}
 	}
@@ -4512,23 +4555,23 @@ Real Object::getShroudClearingRange() const
 	Real shroudClearingRange=m_shroudClearingRange;
 
 	if( getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
-	{	
+	{
 		//structures under construction have limited vision range.  For now, base it
 		//on the geometry extents so the structure can only see itself.
 		shroudClearingRange = getGeometryInfo().getBoundingCircleRadius();
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_debugVisibility) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugVisibility)
 	{
 		Vector3 pos(shroudClearingRange, 0, 0);
-		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i) 
+		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i)
 		{
 			pos.Rotate_Z(1.0f * i / TheGlobalData->m_debugVisibilityTileCount * 2 * PI);
 			Coord3D coord = { pos.X + getPosition()->x, pos.Y + getPosition()->y, pos.Z + getPosition()->z };
 
-			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth, 
-											TheGlobalData->m_debugVisibilityTileDuration, 
+			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth,
+											TheGlobalData->m_debugVisibilityTileDuration,
 											TheGlobalData->m_debugVisibilityDeshroudColor);
 		}
 	}
@@ -4547,7 +4590,7 @@ void Object::setShroudClearingRange( Real newShroudClearingRange )
  		m_shroudClearingRange = newShroudClearingRange;
 
 		/*
-			Complete and total monkey hack fix. 
+			Complete and total monkey hack fix.
 
 			The problem: newObject doesn't get an initial pos, so all objects start at 0,0,0.
 			Most code paths instantly move 'em to a good pos, but in some cases, that is too late:
@@ -4560,7 +4603,7 @@ void Object::setShroudClearingRange( Real newShroudClearingRange )
 			object anyway and we should just ignore you.
 
 			Proper fix for next version is to require initial pos to be passed in to newObject so that
-			all objects can start at their proper initial position from the start of the ctor. 
+			all objects can start at their proper initial position from the start of the ctor.
 
 			(srj)
 		*/
@@ -4575,17 +4618,17 @@ void Object::setShroudClearingRange( Real newShroudClearingRange )
 //-------------------------------------------------------------------------------------------------
 Real Object::getShroudRange() const
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_debugVisibility) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugVisibility)
 	{
 		Vector3 pos(m_shroudRange, 0, 0);
-		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i) 
+		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i)
 		{
 			pos.Rotate_Z(1.0f * i / TheGlobalData->m_debugVisibilityTileCount * 2 * PI);
 			Coord3D coord = { pos.X + getPosition()->x, pos.Y + getPosition()->y, pos.Z + getPosition()->z };
 
-			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth, 
-											TheGlobalData->m_debugVisibilityTileDuration, 
+			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth,
+											TheGlobalData->m_debugVisibilityTileDuration,
 											TheGlobalData->m_debugVisibilityGapColor);
 		}
 	}
@@ -4634,7 +4677,7 @@ void Object::doSpecialPower( const SpecialPowerTemplate *specialPowerTemplate, U
 
 	if (isDisabled())
 		return;
-	
+
 	// sanity
 	if( !forced && TheSpecialPowerStore->canUseSpecialPower( this, specialPowerTemplate ) == FALSE )
 		return;
@@ -4654,7 +4697,7 @@ void Object::doSpecialPowerAtObject( const SpecialPowerTemplate *specialPowerTem
 
 	if (isDisabled())
 		return;
-	
+
 	// sanity
 	if( !forced && TheSpecialPowerStore->canUseSpecialPower( this, specialPowerTemplate ) == FALSE )
 		return;
@@ -4668,13 +4711,13 @@ void Object::doSpecialPowerAtObject( const SpecialPowerTemplate *specialPowerTem
 //-------------------------------------------------------------------------------------------------
 /** Execute special power */
 //-------------------------------------------------------------------------------------------------
-void Object::doSpecialPowerAtLocation( const SpecialPowerTemplate *specialPowerTemplate, 
+void Object::doSpecialPowerAtLocation( const SpecialPowerTemplate *specialPowerTemplate,
 																			 const Coord3D *loc, Real angle, UnsignedInt commandOptions, Bool forced )
 {
 
 	if (isDisabled())
 		return;
-	
+
 	// sanity
 	if( !forced && TheSpecialPowerStore->canUseSpecialPower( this, specialPowerTemplate ) == FALSE )
 		return;
@@ -4684,7 +4727,7 @@ void Object::doSpecialPowerAtLocation( const SpecialPowerTemplate *specialPowerT
 	if( mod )
 		mod->doSpecialPowerAtLocation( loc, angle, commandOptions );
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Execute special power */
@@ -4694,7 +4737,7 @@ void Object::doSpecialPowerUsingWaypoints( const SpecialPowerTemplate *specialPo
 
 	if (isDisabled())
 		return;
-	
+
 	// sanity
 	if( !forced && TheSpecialPowerStore->canUseSpecialPower( this, specialPowerTemplate ) == FALSE )
 		return;
@@ -4713,7 +4756,7 @@ void Object::doCommandButton( const CommandButton *commandButton, CommandSourceT
 {
 	if (isDisabled())
 		return;
-	
+
 	AIUpdateInterface *ai = getAIUpdateInterface();
 	if( commandButton )
 	{
@@ -4753,7 +4796,7 @@ void Object::doCommandButton( const CommandButton *commandButton, CommandSourceT
 			case GUI_COMMAND_PLAYER_UPGRADE:
 				{
 					const UpgradeTemplate *upgradeT = commandButton->getUpgradeTemplate();
-					DEBUG_ASSERTCRASH( upgradeT, ("Undefined upgrade '%s' in player upgrade command\n", "UNKNOWN") );
+					DEBUG_ASSERTCRASH( upgradeT, ("Undefined upgrade '%s' in player upgrade command", "UNKNOWN") );
 					// sanity
 					if( upgradeT == NULL )
 						break;
@@ -4786,7 +4829,7 @@ void Object::doCommandButton( const CommandButton *commandButton, CommandSourceT
 				}
 				break;
 			}
-			
+
 			//Feel free to implement object based command buttons.
 			case GUI_COMMAND_COMBATDROP:
 			case GUI_COMMAND_DOZER_CONSTRUCT_CANCEL:
@@ -4825,7 +4868,7 @@ void Object::doCommandButtonAtObject( const CommandButton *commandButton, Object
 {
 	if (isDisabled())
 		return;
-	
+
 	AIUpdateInterface *ai = getAIUpdateInterface();
 	if( commandButton )
 	{
@@ -4860,7 +4903,7 @@ void Object::doCommandButtonAtObject( const CommandButton *commandButton, Object
 					ai->aiEnter(obj, cmdSource);
 				}
 				break;
-		
+
 			//Feel free to implement object based command buttons.
 			case GUI_COMMAND_DOZER_CONSTRUCT:
 			case GUI_COMMAND_DOZER_CONSTRUCT_CANCEL:
@@ -4904,7 +4947,7 @@ void Object::doCommandButtonAtPosition( const CommandButton *commandButton, cons
 {
 	if (isDisabled())
 		return;
-	
+
 	AIUpdateInterface *ai = getAIUpdateInterface();
 	if( commandButton )
 	{
@@ -4994,11 +5037,11 @@ ProductionUpdateInterface* Object::getProductionUpdateInterface( void )
 		if( pui )
 			return pui;
 
-	}  // end for
+	}
 
 	return NULL;
 
-}  // end getProductionUpdateInterface
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -5014,7 +5057,7 @@ DockUpdateInterface *Object::getDockUpdateInterface( void )
 
 	return NULL;
 
-}  // end getDockUpdateInterface
+}
 
 // ------------------------------------------------------------------------------------------------
 // Search our special power modules for a specific one.
@@ -5030,7 +5073,7 @@ SpecialPowerModuleInterface* Object::findSpecialPowerModuleInterface( SpecialPow
 		const SpecialPowerTemplate *spTemplate = sp->getSpecialPowerTemplate();
 		if (spTemplate && spTemplate->getSpecialPowerType() == type)
 		{
-			return sp; 
+			return sp;
 		}
 	}
 	return NULL;
@@ -5050,7 +5093,7 @@ SpecialPowerModuleInterface* Object::findAnyShortcutSpecialPowerModuleInterface(
 		const SpecialPowerTemplate *spTemplate = sp->getSpecialPowerTemplate();
 		if( spTemplate && spTemplate->isShortcutPower() )
 		{
-			return sp; 
+			return sp;
 		}
 	}
 	return NULL;
@@ -5070,7 +5113,7 @@ SpawnBehaviorInterface* Object::getSpawnBehaviorInterface() const
 		}
 	}
 	return NULL;
-}  // end getSpawnBehaviorInterfaceFromObject
+}
 
 // ------------------------------------------------------------------------------------------------
 // Simply find the special power module that is currently allowing plotting of positions to target.
@@ -5087,7 +5130,7 @@ SpecialPowerUpdateInterface* Object::findSpecialPowerWithOverridableDestinationA
 				return spInterface;
 			}
 		}
-	}  // end for
+	}
 	return NULL;
 }
 
@@ -5106,7 +5149,7 @@ SpecialPowerUpdateInterface* Object::findSpecialPowerWithOverridableDestination(
 				return spInterface;
 			}
 		}
-	}  // end for
+	}
 	return NULL;
 }
 
@@ -5127,7 +5170,7 @@ SpecialAbilityUpdate* Object::findSpecialAbilityUpdate( SpecialPowerType type )
 				return spUpdate;
 			}
 		}
-	}  // end for
+	}
 
 	return NULL;
 }
@@ -5156,9 +5199,9 @@ Bool Object::getSingleLogicalBonePosition(const char* boneName, Coord3D* positio
 	}
 	else
 	{
-		if (position) 
+		if (position)
 			*position = *getPosition();
-		if (transform) 
+		if (transform)
 			*transform = *getTransformMatrix();
 		return false;
 	}
@@ -5184,11 +5227,11 @@ Bool Object::getSingleLogicalBonePositionOnTurret( WhichTurretType whichTurret,
 
 	Matrix3D boneOffset(TRUE);// This will be from the turret to the requested bone
 
-//	Vector3 bonePositionVector(	bonePosition.x - turretPosition.x, 
-//															bonePosition.y - turretPosition.y, 
+//	Vector3 bonePositionVector(	bonePosition.x - turretPosition.x,
+//															bonePosition.y - turretPosition.y,
 //															bonePosition.z - turretPosition.z );
-	Vector3 bonePositionVector(	bonePosition.x, 
-															bonePosition.y, 
+	Vector3 bonePositionVector(	bonePosition.x,
+															bonePosition.y,
 															bonePosition.z );
 	boneOffset.Translate(bonePositionVector);
 
@@ -5220,8 +5263,8 @@ Bool Object::getSingleLogicalBonePositionOnTurret( WhichTurretType whichTurret,
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Int Object::getMultiLogicalBonePosition(const char* boneNamePrefix, Int maxBones, 
-																				Coord3D* positions, Matrix3D* transforms, 
+Int Object::getMultiLogicalBonePosition(const char* boneNamePrefix, Int maxBones,
+																				Coord3D* positions, Matrix3D* transforms,
 																				Bool convertToWorld ) const
 {
 	Int count;
@@ -5252,22 +5295,22 @@ Bool Object::canProduceUpgrade( const UpgradeTemplate *upgrade )
  	for( Int buttonIndex = 0; buttonIndex < MAX_COMMANDS_PER_SET; buttonIndex++ )
  	{
  		const CommandButton *button = set->getCommandButton(buttonIndex);
- 		if( button  
+ 		if( button
 				&&  ( (button->getCommandType() == GUI_COMMAND_PLAYER_UPGRADE)  ||  (button->getCommandType() == GUI_COMMAND_OBJECT_UPGRADE) ) // Or else a button that requires an upgrade will appear the same as a button that gives an upgrade
-				&&  button->getUpgradeTemplate()  
-				&&  (button->getUpgradeTemplate() == upgrade) 
-				)		
+				&&  button->getUpgradeTemplate()
+				&&  (button->getUpgradeTemplate() == upgrade)
+				)
  			return TRUE; // getUpgradeTemplate only returns something if it is actually an upgrade
  	}
- 
+
  	return FALSE;// Cheatin' punk.
 }
- 
+
  //=============================================================================
-const AsciiString& Object::getCommandSetString() const 
-{ 
+const AsciiString& Object::getCommandSetString() const
+{
 	if (m_commandSetStringOverride.isNotEmpty())
-		return m_commandSetStringOverride; 
+		return m_commandSetStringOverride;
 
 	return getTemplate()->friend_getCommandSetString();
 }
@@ -5277,7 +5320,7 @@ const AsciiString& Object::getCommandSetString() const
 //=============================================================================
 void Object::defect( Team* newTeam, UnsignedInt detectionTime )
 {
-	if ( isContained() ) //@todo (KRIS?) make contained units unselectable, until then... lorenzen 
+	if ( isContained() ) //@todo (KRIS?) make contained units unselectable, until then... lorenzen
 	{
 		return;
 	}
@@ -5289,17 +5332,17 @@ void Object::defect( Team* newTeam, UnsignedInt detectionTime )
 	Team* myTeam = player->getDefaultTeam();
 	if ( myTeam == newTeam ) // can't defect from my own team, that would be silly
 		return;
-	
+
 	// things that are under construction, or sold, cannot defect.
 	if (testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) ||
 			testStatus(OBJECT_STATUS_SOLD))
 	{
 		return;
-	}	
+	}
 
 	// Before switch ////////////////////////////////////////
 
-	//Design says: 
+	//Design says:
 	ProductionUpdateInterface *production = getProductionUpdateInterface();
 	if ( production )
 	{
@@ -5308,7 +5351,7 @@ void Object::defect( Team* newTeam, UnsignedInt detectionTime )
 
 	// pop it up on the radar, so as to warn those who care
 	// do this first, since after setTeam() the infiltrator
-	// becomes the controllingplayer, not me 
+	// becomes the controllingplayer, not me
 
 	// But don't do this is if the new team is not a real team.  "'Enemy' infiltration" wouldn't make
 	// sense, and we are probably just reverting a cave or something.
@@ -5326,7 +5369,7 @@ void Object::defect( Team* newTeam, UnsignedInt detectionTime )
 	setTeam( newTeam );
 
 	// After switch ////////////////////////////////////////
-	
+
 	AIUpdateInterface *ai = getAI();
 
 	handlePartitionCellMaintenance();// to clear the shoud for my new master
@@ -5350,7 +5393,7 @@ void Object::defect( Team* newTeam, UnsignedInt detectionTime )
 		defectorTimerSound.setObjectID( getID() );
 		TheAudio->addAudioEvent(&defectorTimerSound);
 	}
-	
+
 	ContainModuleInterface *ct = getContain();
 	if( ct  &&  ct->isKickOutOnCapture() )
 	{
@@ -5404,12 +5447,10 @@ void Object::goInvulnerable( UnsignedInt time )
 // ------------------------------------------------------------------------------------------------
 /** Return the radar priority for this object type */
 // ------------------------------------------------------------------------------------------------
-RadarPriorityType Object::getRadarPriority( void ) const 
+RadarPriorityType Object::getRadarPriority( void ) const
 {
-	RadarPriorityType priority = RADAR_PRIORITY_INVALID;
-
 	// first, get the priority at the thing template level
-	priority = getTemplate()->getDefaultRadarPriority();
+	RadarPriorityType priority = getTemplate()->getDefaultRadarPriority();
 
 	//
 	// there are some objects that we want to show up on the radar when they have
@@ -5431,7 +5472,7 @@ RadarPriorityType Object::getRadarPriority( void ) const
 			priority = RADAR_PRIORITY_STRUCTURE;
 
 
-	}  // end if
+	}
 
 	// Carbombs will show up as units regardless of their default priority
 	if ( testStatus( OBJECT_STATUS_IS_CARBOMB ) )
@@ -5441,33 +5482,41 @@ RadarPriorityType Object::getRadarPriority( void ) const
 	// return the priority we're going to use
 	return priority;
 
-}  // end getRadarPriority
+}
 
 // ------------------------------------------------------------------------------------------------
 AIGroup *Object::getGroup(void)
 {
+#if RETAIL_COMPATIBLE_AIGROUP
 	return m_group;
+#else
+	return m_group.Peek();
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------
 void Object::enterGroup( AIGroup *group )
 {
-//	DEBUG_LOG(("***AIGROUP %x involved in enterGroup on %x\n", group, this));
+//	DEBUG_LOG(("***AIGROUP %x involved in enterGroup on %x", group, this));
 	// if we are in another group, remove ourselves from it first
 	leaveGroup();
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	m_group = group;
+#else
+	m_group = AIGroupPtr::Create_AddRef(group);
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------
 void Object::leaveGroup( void )
 {
-//	DEBUG_LOG(("***AIGROUP %x involved in leaveGroup on %x\n", m_group, this));
+//	DEBUG_LOG(("***AIGROUP %x involved in leaveGroup on %x", m_group, this));
 	// if we are in a group, remove ourselves from it
 	if (m_group)
 	{
 		// to avoid recursion, set m_group to NULL before removing
-		AIGroup *group = m_group;
+		AIGroupPtr group = m_group;
 		m_group = NULL;
 		group->remove( this );
 	}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
index 9614b61e316..2398127315d 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_SHADOW_NAMES								// for TheShadowNames[]
 #define DEFINE_WEAPONSLOTTYPE_NAMES
@@ -70,11 +70,6 @@
 
 #include "Common/CRCDebug.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
@@ -119,11 +114,11 @@ Object* ObjectCreationNugget::create( const Object *primaryObj, const Coord3D *p
 //-------------------------------------------------------------------------------------------------
 class FireWeaponNugget : public ObjectCreationNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FireWeaponNugget, "FireWeaponNugget")		
-	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FireWeaponNugget, "FireWeaponNugget")
+
 public:
 
-	FireWeaponNugget() : 
+	FireWeaponNugget() :
     m_weapon(NULL)
 	{
 	}
@@ -131,7 +126,7 @@ class FireWeaponNugget : public ObjectCreationNugget
 	virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const
 	{
 		if (!primaryObj || !primary || !secondary)
-		{ 
+		{
 			DEBUG_CRASH(("You must have a primary and secondary source for this effect"));
       return NULL;
     }
@@ -145,7 +140,7 @@ class FireWeaponNugget : public ObjectCreationNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Weapon", INI::parseWeaponTemplate,	NULL, offsetof( FireWeaponNugget, m_weapon ) },
 			{ 0, 0, 0, 0 }
@@ -158,17 +153,17 @@ class FireWeaponNugget : public ObjectCreationNugget
 
 private:
 	const WeaponTemplate* m_weapon;
-};  
+};
 EMPTY_DTOR(FireWeaponNugget)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 class AttackNugget : public ObjectCreationNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AttackNugget, "AttackNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AttackNugget, "AttackNugget")
 public:
 
-	AttackNugget() : 
+	AttackNugget() :
     m_numberOfShots(1),
 		m_weaponSlot(PRIMARY_WEAPON),
 		m_deliveryDecalRadius(0)
@@ -178,7 +173,7 @@ class AttackNugget : public ObjectCreationNugget
 	virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, UnsignedInt lifetimeFrames = 0 ) const
 	{
 		if (!primaryObj || !primary || !secondary)
-		{ 
+		{
 			DEBUG_CRASH(("You must have a primary and secondary source for this effect"));
       return NULL;
     }
@@ -186,7 +181,7 @@ class AttackNugget : public ObjectCreationNugget
 		// Star trekkin, across the universe.
 		// Boldly goin forward now, cause we can't find reverse!
 
-		// 1:30 left on the clock, Demo looming, should I de-const all of OCL since this one effect needs the 
+		// 1:30 left on the clock, Demo looming, should I de-const all of OCL since this one effect needs the
 		// Primary to help make the objects?  Should I rewrite superweapons to completely subsume them
 		// into normal special powers, so I can have a spell attack with a global timer and a spinny clock?
 		// Should I const cast?  Should I eat them?  No!  I'd rather hurt them stomp them crush them hurt them
@@ -213,7 +208,7 @@ class AttackNugget : public ObjectCreationNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "NumberOfShots",	INI::parseInt,				NULL, offsetof( AttackNugget, m_numberOfShots ) },
 			{ "WeaponSlot",			INI::parseLookupList,	TheWeaponSlotTypeNamesLookupList, offsetof( AttackNugget, m_weaponSlot ) },
@@ -232,17 +227,17 @@ class AttackNugget : public ObjectCreationNugget
 	Real								m_deliveryDecalRadius;
 	Int									m_numberOfShots;
 	WeaponSlotType			m_weaponSlot;
-};  
+};
 EMPTY_DTOR(AttackNugget)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 class DeliverPayloadNugget : public ObjectCreationNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DeliverPayloadNugget, "DeliverPayloadNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DeliverPayloadNugget, "DeliverPayloadNugget")
 public:
 
-	DeliverPayloadNugget() : 
+	DeliverPayloadNugget() :
 		m_startAtPreferredHeight(true),
 		m_startAtMaxSpeed(false),
 		m_formationSize(1),
@@ -252,15 +247,9 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		m_convergenceFactor( 0.0f )
 	{
 		//Note: m_data is constructed with default values.
-		
-		// Added by Sadullah Nader
-		// Initialization missing and needed
-		
 		m_payload.clear();
 		m_putInContainerName.clear();
 		m_transportName.clear();
-
-		// End Add
 	}
 
 	virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, UnsignedInt lifetimeFrames = 0 ) const
@@ -279,8 +268,8 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		Team* owner = primaryObj ? primaryObj->getControllingPlayer()->getDefaultTeam() : NULL;
 
 
-		//What I'm doing for the purposes of the formations is to calculate the relative positions of 
-		//each member of the formation. To do so, we take the vector from the target location to the 
+		//What I'm doing for the purposes of the formations is to calculate the relative positions of
+		//each member of the formation. To do so, we take the vector from the target location to the
 		//lead plane location, normalize it, then rotate it 90 degrees (CW and CCW). When we add the
 		//resultant vectors to the initial vectors, we can calculate the delta positions for each plane.
 		Real CCWx = 0.0f, CCWy = 0.0f, CWx = 0.0f, CWy = 0.0f;
@@ -290,7 +279,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 			//Get the delta x and y values from the target to the origin.
 			Real dx = primary->x - secondary->x;
 			Real dy = primary->y - secondary->y;
-			
+
 			//Calc length
 			Real length = sqrt( dx*dx + dy*dy );
 
@@ -311,7 +300,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 			CWx = dx * c + dy * -s + dx;
 			CWy = dx * s + dy * c + dy;
 		}
-		
+
 		Object *firstTransport = NULL;
 		for( UnsignedInt formationIndex = 0; formationIndex < m_formationSize; formationIndex++ )
 		{
@@ -341,9 +330,9 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 
 			Coord3D targetPos = *secondary;
 
-			
-			//Our target position only applies when using fireweapon and when we have multiple planes, 
-			//as is the case with the napalm strike. The target position either be somewhere between the 
+
+			//Our target position only applies when using fireweapon and when we have multiple planes,
+			//as is the case with the napalm strike. The target position either be somewhere between the
 			//moveToPos of the lead plane and that of the relative offset -- determined by the convergenceFactor.
 			targetPos.x += offset.x * (1.0f - m_convergenceFactor);
 			targetPos.y += offset.y * (1.0f - m_convergenceFactor);
@@ -425,7 +414,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 						physics->applyMotiveForce( &startingForce );
 					}
 				}
-				
+
 				// only the first guy in each formation gets a delivery decal
 				DeliverPayloadData data = m_data;
 				if (formationIndex != 0)
@@ -443,7 +432,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 					const ThingTemplate* payloadTmpl = TheThingFactory->findTemplate(it->m_payloadName);
 					if( !payloadTmpl )
 					{
-						DEBUG_CRASH( ("DeliverPayloadNugget::create() -- %s couldn't create %s (template not found).", 
+						DEBUG_CRASH( ("DeliverPayloadNugget::create() -- %s couldn't create %s (template not found).",
 							transport->getTemplate()->getName().str(), it->m_payloadName.str() ) );
 						return NULL;
 					}
@@ -515,7 +504,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		const char* name = ini->getNextToken();
 		const char* countStr = ini->getNextTokenOrNull();
 		Int count = countStr ? INI::scanInt(countStr) : 1;
-		
+
 		Payload p;
 		p.m_payloadName.set(name);
 		p.m_payloadCount = count;
@@ -524,7 +513,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			//***************************************************************
 			//OBJECT CREATION LIST SPECIFIC DATA -- once created data no longer needed
@@ -545,7 +534,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 			{ "PutInContainer",						INI::parseAsciiString,				NULL, offsetof( DeliverPayloadNugget, m_putInContainerName) },
 			//END OBJECT CREATION LIST SPECIFIC DATA
 			//***************************************************************
-			
+
 			//***************************************************************
 			//DELIVERPAYLOADDATA contains the rest (and most) of the parsed data.
 			//***************************************************************
@@ -583,7 +572,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 
 	//AI specific data passed over to DeliverPayloadAIUpdate::deliver()
 	DeliverPayloadData		m_data;
-};  
+};
 EMPTY_DTOR(DeliverPayloadNugget)
 
 //-------------------------------------------------------------------------------------------------
@@ -609,10 +598,10 @@ static void calcRandomForce(Real minMag, Real maxMag, Real minPitch, Real maxPit
 //-------------------------------------------------------------------------------------------------
 class ApplyRandomForceNugget : public ObjectCreationNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ApplyRandomForceNugget, "ApplyRandomForceNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ApplyRandomForceNugget, "ApplyRandomForceNugget")
 public:
 
-	ApplyRandomForceNugget() : 
+	ApplyRandomForceNugget() :
 		m_spinRate(0.0f),
 		m_minMag(0.0f),
 		m_maxMag(0.0f),
@@ -660,7 +649,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "SpinRate",					INI::parseAngularVelocityReal,	NULL, offsetof(ApplyRandomForceNugget, m_spinRate) },
 			{ "MinForceMagnitude",	INI::parseReal,	NULL, offsetof(ApplyRandomForceNugget, m_minMag) },
@@ -681,7 +670,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 	Real											m_spinRate;
 	Real											m_minMag, m_maxMag;
 	Real											m_minPitch, m_maxPitch;
-};  
+};
 EMPTY_DTOR(ApplyRandomForceNugget)
 
 //-------------------------------------------------------------------------------------------------
@@ -698,7 +687,7 @@ enum DebrisDisposition CPP_11(: Int)
 	WHIRLING								= 0x00000100
 };
 
-static const char* DebrisDispositionNames[] =
+static const char* const DebrisDispositionNames[] =
 {
 	"LIKE_EXISTING",
 	"ON_GROUND_ALIGNED",
@@ -709,6 +698,7 @@ static const char* DebrisDispositionNames[] =
 	"FLOATING",
 	"INHERIT_VELOCITY",
 	"WHIRLING",
+	NULL
 };
 
 std::vector<AsciiString>	debrisModelNamesGlobalHack;
@@ -720,18 +710,18 @@ static void parseFrictionPerSec( INI* ini, void * /*instance*/, void *store, con
 	Real fricPerSec = INI::scanReal(ini->getNextToken());
 	Real fricPerFrame = fricPerSec * SECONDS_PER_LOGICFRAME_REAL;
 	*(Real *)store = fricPerFrame;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 class GenericObjectCreationNugget : public ObjectCreationNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GenericObjectCreationNugget, "GenericObjectCreationNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GenericObjectCreationNugget, "GenericObjectCreationNugget")
 public:
 
-	GenericObjectCreationNugget() : 
+	GenericObjectCreationNugget() :
 		m_requiresLivePlayer(FALSE),
-		m_debrisToGenerate(1), 
-		m_mass(0), 
+		m_debrisToGenerate(1),
+		m_mass(0),
 		m_extraBounciness(0),
 		m_extraFriction(0),
 		m_disposition(ON_GROUND_ALIGNED),
@@ -758,9 +748,9 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		m_fadeIn(false),
 		m_fadeOut(false),
 		m_fadeFrames(0),
-		m_fadeSoundName(AsciiString::TheEmptyString), // Added By Sadullah Nader
-		m_particleSysName(AsciiString::TheEmptyString), // Added By Sadullah Nader
-		m_putInContainer(AsciiString::TheEmptyString), // Added By Sadullah Nader
+		m_fadeSoundName(AsciiString::TheEmptyString),
+		m_particleSysName(AsciiString::TheEmptyString),
+		m_putInContainer(AsciiString::TheEmptyString),
 		m_minMag(0.0f),
 		m_maxMag(0.0f),
 		m_minPitch(0.0f),
@@ -770,11 +760,9 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		m_shadowType(SHADOW_NONE),
 		m_fxFinal(NULL),
 		m_preserveLayer(true),
-		m_objectCount(0) // Added By Sadullah Nader
+		m_objectCount(0)
 	{
-		// Change Made by Sadullah Nader
-		// for init purposes, easier to read
-		m_offset.zero(); 
+		m_offset.zero();
 	}
 
 	virtual Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const
@@ -848,7 +836,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 	static void parseObject(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "ContainInsideSourceObject", INI::parseBool, NULL, offsetof( GenericObjectCreationNugget, m_containInsideSourceObject) },
 			{ "ObjectNames",				parseDebrisObjectNames,		NULL, 0 },
@@ -876,7 +864,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 	static void parseDebris(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "ModelNames",							parseDebrisObjectNames,							NULL,					0 },
 			{ "Mass",										INI::parsePositiveNonZeroReal,			NULL,					offsetof( GenericObjectCreationNugget, m_mass ) },
@@ -898,7 +886,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 		ini->initFromINIMulti(nugget, p);
 
-		DEBUG_ASSERTCRASH(nugget->m_mass > 0.0f, ("Zero masses are not allowed for debris!\n"));
+		DEBUG_ASSERTCRASH(nugget->m_mass > 0.0f, ("Zero masses are not allowed for debris!"));
 		((ObjectCreationList*)instance)->addObjectCreationNugget(nugget);
 	}
 
@@ -914,11 +902,11 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 protected:
 
 	void doStuffToObj(
-		Object* obj, 
-		const AsciiString& modelName, 
-		const Coord3D *pos, 
-		const Matrix3D *mtx, 
-		Real orientation, 
+		Object* obj,
+		const AsciiString& modelName,
+		const Coord3D *pos,
+		const Matrix3D *mtx,
+		Real orientation,
 		const Object *sourceObj,
 		UnsignedInt lifetimeFrames
 	) const
@@ -941,7 +929,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				lup->setLifetimeRange(m_minFrames, m_maxFrames);
 			}
 		}
-		
+
 		if (!m_nameAreObjects)
 		{
 			for (DrawModule** dm = obj->getDrawable()->getDrawModules(); *dm; ++dm)
@@ -950,7 +938,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				if (di)
 				{
 					di->setModelName(modelName, m_okToChangeModelColor ? obj->getIndicatorColor() : 0, m_shadowType);
-					if (m_animSets.size() > 0)
+					if (!m_animSets.empty())
 					{
 						Int which = GameLogicRandomValue(0, m_animSets.size()-1);
 						di->setAnimNames(m_animSets[which].m_animInitial, m_animSets[which].m_animFlying, m_animSets[which].m_animFinal, m_fxFinal);
@@ -967,7 +955,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		chunkPos.x = pos->x + offset.x;
 		chunkPos.y = pos->y + offset.y;
 		chunkPos.z = pos->z + offset.z;
-		
+
 		if (!m_particleSysName.isEmpty())
 		{
 			const ParticleSystemTemplate *tmp = TheParticleSystemManager->findTemplate(m_particleSysName);
@@ -977,7 +965,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				sys->attachToObject(obj);
 			}
 		}
-		
+
 		if (m_ignorePrimaryObstacle)
 		{
 			PhysicsBehavior* p = obj->getPhysics();
@@ -1004,7 +992,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 		if (m_inheritsVeterancy && sourceObj && obj->getExperienceTracker()->isTrainable())
 		{
-			DEBUG_LOG(("Object %s inherits veterancy level %d from %s\n",
+			DEBUG_LOG(("Object %s inherits veterancy level %d from %s",
 				obj->getTemplate()->getName().str(), sourceObj->getVeterancyLevel(), sourceObj->getTemplate()->getName().str()));
 			VeterancyLevel v = sourceObj->getVeterancyLevel();
 			obj->getExperienceTracker()->setVeterancyLevel(v);
@@ -1016,7 +1004,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 		if ( m_invulnerableTime > 0 )
 		{
-			obj->goInvulnerable( m_invulnerableTime ); 
+			obj->goInvulnerable( m_invulnerableTime );
 		}
 
 		if( BitIsSet( m_disposition, INHERIT_VELOCITY ) && sourceObj )
@@ -1041,7 +1029,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				PhysicsBehavior* physics = obj->getPhysics();
 				if (physics)
 					physics->setAllowToFall(true);
-			}	
+			}
 		}
 
 		if( BitIsSet( m_disposition, ON_GROUND_ALIGNED ) )
@@ -1102,7 +1090,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 					DUMPREAL(m_mass);
 					objUp->setMass( m_mass );
 				}
-				DEBUG_ASSERTCRASH(objUp->getMass() > 0.0f, ("Zero masses are not allowed for obj!\n"));
+				DEBUG_ASSERTCRASH(objUp->getMass() > 0.0f, ("Zero masses are not allowed for obj!"));
 
 				objUp->setExtraBounciness(m_extraBounciness);
 				objUp->setExtraFriction(m_extraFriction);
@@ -1110,7 +1098,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				objUp->setBounceSound(&m_bounceSound);
 				DUMPREAL(m_extraBounciness);
 				DUMPREAL(m_extraFriction);
-				
+
 				// if omitted from INI, calc it based on intensity.
 				Real spinRate		= m_spinRate >= 0.0f ? m_spinRate : (PI/32.0f) * m_dispositionIntensity;
 
@@ -1123,7 +1111,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				DUMPREAL(yawRate);
 				DUMPREAL(rollRate);
 				DUMPREAL(pitchRate);
-				
+
 				Real yaw = GameLogicRandomValueReal( -yawRate, yawRate );
 				Real roll = GameLogicRandomValueReal( -rollRate, rollRate );
 				Real pitch = GameLogicRandomValueReal( -pitchRate, pitchRate );
@@ -1146,8 +1134,8 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				else if (BitIsSet(m_disposition, SEND_IT_UP) )
 				{
 					Real horizForce = 2.0f * m_dispositionIntensity;
-					Real vertForce = 4.0f * m_dispositionIntensity;	
-					
+					Real vertForce = 4.0f * m_dispositionIntensity;
+
 					force.x = GameLogicRandomValueReal( -horizForce, horizForce );
 					force.y = GameLogicRandomValueReal( -horizForce, horizForce );
 					force.z = GameLogicRandomValueReal( vertForce * 0.75f, vertForce );
@@ -1155,7 +1143,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 					DUMPREAL(vertForce);
 					DUMPCOORD3D(&force);
 				}
-				else 
+				else
 				{
 					calcRandomForce(m_minMag, m_maxMag, m_minPitch, m_maxPitch, &force);
 					DUMPREAL(m_minMag);
@@ -1194,7 +1182,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				objUp->setPitchRate(pitch);
 			}
 		}
-		
+
 		if( BitIsSet( m_disposition, FLOATING ) )
 		{
 			static NameKeyType key = NAMEKEY( "FloatUpdate" );
@@ -1229,7 +1217,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 	{
 		static const ThingTemplate* debrisTemplate = TheThingFactory->findTemplate("GenericDebris");
 
-		if (m_names.size() <= 0)
+		if (m_names.empty())
 			return NULL;
 
 		if (m_requiresLivePlayer && (!sourceObj || !sourceObj->getControllingPlayer()->isPlayerActive()))
@@ -1239,7 +1227,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		Team *debrisOwner = NULL;
 		if( sourceObj )
 			debrisOwner = sourceObj->getControllingPlayer()->getDefaultTeam();
-		
+
 		Object* container = NULL;
 		Object *firstObject = NULL;
 		if (!m_putInContainer.isEmpty())
@@ -1274,7 +1262,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 				tmpl = debrisTemplate;
 			}
-			DEBUG_ASSERTCRASH(tmpl, ("Object %s not found\n",m_names[pick].str()));
+			DEBUG_ASSERTCRASH(tmpl, ("Object %s not found",m_names[pick].str()));
 			if (!tmpl)
 				continue;
 
@@ -1304,7 +1292,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 			// objects that are placed in the same location are no longer placed in a
 			// diagonal line but rather in random locations nearby, this logic will no
 			// longer be necessary and can be taken out -- amit
-			if (m_spreadFormation) 
+			if (m_spreadFormation)
 			{
 				Coord3D resultPos;
 				FindPositionOptions fpOptions;
@@ -1314,13 +1302,13 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				ThePartitionManager->findPositionAround(pos, &fpOptions, &resultPos);
 				doStuffToObj( debris, m_names[pick], &resultPos, mtx, orientation, sourceObj, lifetimeFrames );
 			}
-			else 
+			else
 			{
 				// do stuff to contained objects too
 				doStuffToObj( debris, m_names[pick], pos, mtx, orientation, sourceObj, lifetimeFrames );
 			}
 
-			if (m_fadeIn) 
+			if (m_fadeIn)
 			{
 				AudioEventRTS fadeAudioEvent(m_fadeSoundName);
 				fadeAudioEvent.setObjectID(sourceObj->getID());
@@ -1328,7 +1316,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				debris->getDrawable()->fadeIn(m_fadeFrames);
 			}
 
-			if (m_fadeOut) 
+			if (m_fadeOut)
 			{
 				AudioEventRTS fadeAudioEvent(m_fadeSoundName);
 				fadeAudioEvent.setObjectID(sourceObj->getID());
@@ -1337,9 +1325,14 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 			}
 		}
 
+#if !RETAIL_COMPATIBLE_CRC && !PRESERVE_RETAIL_BEHAVIOR
+		ObjectID sinkID = sourceObj->getExperienceTracker()->getExperienceSink();
+		firstObject->getExperienceTracker()->setExperienceSink(sinkID != INVALID_ID ? sinkID : sourceObj->getID());
+#endif
+
 		if (container)
 			doStuffToObj( container, AsciiString::TheEmptyString, pos, mtx, orientation, sourceObj, lifetimeFrames );
-    
+
 		return firstObject;
 	}
 
@@ -1406,7 +1399,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 	Bool											m_inheritsVeterancy;
 	Bool											m_skipIfSignificantlyAirborne;
 
-};  
+};
 EMPTY_DTOR(GenericObjectCreationNugget)
 
 //-------------------------------------------------------------------------------------------------
@@ -1417,13 +1410,13 @@ EMPTY_DTOR(GenericObjectCreationNugget)
 //-------------------------------------------------------------------------------------------------
 static const FieldParse TheObjectCreationListFieldParse[] =
 {
-	{ "CreateObject",			GenericObjectCreationNugget::parseObject, 0, 0},		
-	{ "CreateDebris",			GenericObjectCreationNugget::parseDebris, 0, 0},		
+	{ "CreateObject",			GenericObjectCreationNugget::parseObject, 0, 0},
+	{ "CreateDebris",			GenericObjectCreationNugget::parseDebris, 0, 0},
 	{ "ApplyRandomForce",	ApplyRandomForceNugget::parse, 0, 0},
 	{ "DeliverPayload",		DeliverPayloadNugget::parse, 0, 0},
 	{ "FireWeapon",				FireWeaponNugget::parse, 0, 0},
 	{ "Attack",						AttackNugget::parse, 0, 0},
-	{ NULL, NULL, 0, 0 }  // keep this last
+	{ NULL, NULL, 0, 0 }
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -1499,8 +1492,7 @@ ObjectCreationListStore::~ObjectCreationListStore()
 {
 	for (ObjectCreationNuggetVector::iterator i = m_nuggets.begin(); i != m_nuggets.end(); ++i)
 	{
-		if (*i)
-			deleteInstance(*i);
+		deleteInstance(*i);
 	}
 	m_nuggets.clear();
 }
@@ -1512,7 +1504,7 @@ const ObjectCreationList *ObjectCreationListStore::findObjectCreationList(const
 		return NULL;
 
   ObjectCreationListMap::const_iterator it = m_ocls.find(NAMEKEY(name));
-  if (it == m_ocls.end()) 
+  if (it == m_ocls.end())
 	{
 		return NULL;
 	}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectTypes.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectTypes.cpp
index 9f5f34848b5..ebb220a392b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectTypes.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/ObjectTypes.cpp
@@ -169,9 +169,9 @@ void ObjectTypes::xfer(Xfer *xfer)
 			// write type name
 			xfer->xferAsciiString( &(*it) );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -179,10 +179,10 @@ void ObjectTypes::xfer(Xfer *xfer)
 		if( m_objectTypes.empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "ObjectTypes::xfer - m_objectTypes vector should be emtpy but is not!\n" ));
+			DEBUG_CRASH(( "ObjectTypes::xfer - m_objectTypes vector should be emtpy but is not!" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read all data
 		AsciiString typeName;
@@ -195,9 +195,9 @@ void ObjectTypes::xfer(Xfer *xfer)
 			// put on vector
 			m_objectTypes.push_back( typeName );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp
index 9b98775f05f..cabb37d8144 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PartitionManager.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -39,20 +39,21 @@
 // Created:   Steven Johnson, September 2001
 //
 // Desc:      Partition management, this system will allow us to partition the
-//					  objects in space, iterate objects in specified volumes, 
+//					  objects in space, iterate objects in specified volumes,
 //					  regions, by types and other properties.
 //
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/DiscreteCircle.h"
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/MessageStream.h"
 #include "Common/NameKeyGenerator.h"
 #include "Common/PerfTimer.h"
@@ -81,7 +82,6 @@
 
 #ifdef RTS_DEBUG
 //#include "GameClient/InGameUI.h"	// for debugHints
-#include "Common/PlayerList.h"
 #endif
 
 #ifdef DUMP_PERF_STATS
@@ -90,34 +90,29 @@
 	Int64 s_timeInClosestObjects = 0;
 	Int64 s_timeInClosestObjectsThisFrame = 0;
 	UnsignedInt s_gcoPerfFrame = 0xffffffff;
-#endif 
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
 #endif
 
+
 extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 
 const Real HUGE_DIST_SQR = (HUGE_DIST*HUGE_DIST);
 
 #define DISABLE_INVALID_PREVENTION	//Steven, I had to turn this off because it was causing problem with map border resizing (USA04). -MW
 
-//------------------------------------------------------------------------------ Performance Timers 
+//------------------------------------------------------------------------------ Performance Timers
 //#include "Common/PerfMetrics.h"
 //#include "Common/PerfTimer.h"
 
 //-------------------------------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 static PartitionContactList* TheContactList = NULL;
 
 //-----------------------------------------------------------------------------
-//         Local Types                                                      
+//         Local Types
 //-----------------------------------------------------------------------------
 struct ThreatValueParms
 {
@@ -153,8 +148,8 @@ static int cellValueProc(PartitionCell* cell, void* userData);
 	-- collideLoc and collideNormal will only be filled in if result is true;
 			they are undefined if result is false.
 	-- either collideLoc or collideNormal may be null if you don't need 'em.
-	-- collideLoc is not guaranteed to lie precisely on either 'a' or 'b'! 
-			(this matters iff the objects are overlapping and thus have multiple/ambiguous 
+	-- collideLoc is not guaranteed to lie precisely on either 'a' or 'b'!
+			(this matters iff the objects are overlapping and thus have multiple/ambiguous
 			collision points; we pick an 'in-between' spot to simplify matters, such that
 			the same spot will be used for the collision in both directions)
 	-- collideNormal is the normal the collision surface at 'a' at collideLoc.
@@ -166,17 +161,17 @@ typedef Bool (*CollideTestProc)(const CollideInfo *a, const CollideInfo *b, Coll
 // if the dist is greater than maxDist, return false, and the output stuff is undefined.
 typedef Bool (*DistCalcProc)
 (
-	const Coord3D *posA, 
-	const Object *objA, 
-	const Coord3D *posB, 
-	const Object *objB, 
-	Real& abDistSqr, 
+	const Coord3D *posA,
+	const Object *objA,
+	const Coord3D *posB,
+	const Object *objB,
+	Real& abDistSqr,
 	Coord3D& abVec,
 	Real maxDistSqr
-); 
+);
 
 //-----------------------------------------------------------------------------
-//         Inline Functions                                                      
+//         Inline Functions
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
@@ -247,10 +242,10 @@ inline Bool filtersAllow(PartitionFilter **filters, Object *objOther)
 
 	if (DoFilterProfiling && calls > 0 && calls % 1000==0)
 	{
-		DEBUG_LOG(("\n\n"));
+		DEBUG_LOG(("\n"));
 		for (idx = 0; idx < maxEver; idx++)
 		{
-			DEBUG_LOG(("rejections[%s] = %d (useful = %d)\n",names[idx],rejections[idx],usefulRejections[idx]));
+			DEBUG_LOG(("rejections[%s] = %d (useful = %d)",names[idx],rejections[idx],usefulRejections[idx]));
 		}
 	}
 
@@ -263,7 +258,7 @@ inline Bool filtersAllow(PartitionFilter **filters, Object *objOther)
 			return false;
 		}
 	}
-	// assume true if no filters rejected it	
+	// assume true if no filters rejected it
 	return true;
 #endif
 }
@@ -329,7 +324,7 @@ inline Real maxReal(Real a, Real b)
 }
 
 //-----------------------------------------------------------------------------
-//         Local Functions                                                      
+//         Local Functions
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
@@ -371,10 +366,10 @@ static Bool collideTest_Box_Sphere(const CollideInfo *a, const CollideInfo *b, C
 static Bool collideTest_Box_Cylinder(const CollideInfo *a, const CollideInfo *b, CollideLocAndNormal *cinfo);
 static Bool collideTest_Box_Box(const CollideInfo *a, const CollideInfo *b, CollideLocAndNormal *cinfo);
 
-static Bool distCalcProc_CenterAndCenter_2D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr); 
-static Bool distCalcProc_BoundaryAndBoundary_2D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr); 
-static Bool distCalcProc_CenterAndCenter_3D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr); 
-static Bool distCalcProc_BoundaryAndBoundary_3D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr); 
+static Bool distCalcProc_CenterAndCenter_2D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr);
+static Bool distCalcProc_BoundaryAndBoundary_2D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr);
+static Bool distCalcProc_CenterAndCenter_3D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr);
+static Bool distCalcProc_BoundaryAndBoundary_3D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr);
 
 //-----------------------------------------------------------------------------
 inline void projectCoord3D(Coord3D *coord, const Coord3D *unitDir, Real dist)
@@ -420,7 +415,7 @@ static void testRotatedPointsAgainstRect(
 		#ifdef INTENSE_DEBUG
 		Real mag_a = sqr(ptx)+sqr(pty);
 		Real mag_b = sqr(ptx_new)+sqr(pty_new);
-		DEBUG_ASSERTCRASH(fabs(mag_a - mag_b) <= 1.0, ("hmm, unlikely")); 
+		DEBUG_ASSERTCRASH(fabs(mag_a - mag_b) <= 1.0, ("hmm, unlikely"));
 		#endif
 
 		if (ptx_new <= major && pty_new <= minor)
@@ -540,7 +535,7 @@ static Bool xy_collideTest_Circle_Circle(const CollideInfo *a, const CollideInfo
 			cinfo->loc = a->position;
 			projectCoord3D(&cinfo->loc, &cinfo->normal, a->geom.getMajorRadius());
 		}
-		
+
 		return true;
 	}
 	return false;
@@ -561,7 +556,7 @@ static Bool xy_collideTest_Rect_Rect(const CollideInfo *a, const CollideInfo *b,
 
 	rectToFourPoints(b, pts);
 	testRotatedPointsAgainstRect(pts, a, &avg, &avgTot);
-	
+
 	if (avgTot > 0)
 	{
 		if (cinfo)
@@ -572,16 +567,16 @@ static Bool xy_collideTest_Rect_Rect(const CollideInfo *a, const CollideInfo *b,
 			cinfo->loc.z = (a->position.z + b->position.z) * 0.5f;
 
 			// yow, what exactly does it mean to find the normal to two *intersecting*
-			// rects? with "true" physics we could project ahead and determine 
+			// rects? with "true" physics we could project ahead and determine
 			// what the collision point would be, which would of course always
 			// give a perfect, symmetrical normal. however, we almost always determine
 			// collisions "after the fact" and thus the rects already intersect, meaning
-			// that it's tricky to find the normal. we could do it the "right" way, which 
+			// that it's tricky to find the normal. we could do it the "right" way, which
 			// would be to back up the objects to find the perfect point (see above), but
 			// we don't have velocity information at this point, so we can't really
 			// do that. so, naturally, we provide a (poor) guess by just doing the center-to-center
 			// normal. this is rarely the correct surface normal for a box-box collision,
-			// but until I either (a) rewrite everything to have predictive collisions, 
+			// but until I either (a) rewrite everything to have predictive collisions,
 			// or (b) come up with a better definition of a useful normal in this case,
 			// I'm not sure we can do a whole lot better... (srj)
 			vecDiff_2D(&b->position, &a->position, &cinfo->normal);
@@ -668,7 +663,7 @@ inline Bool z_collideTest_Nonsphere_Nonsphere(CollideTestProc xyproc, const Coll
 	if (minRadius>r) minRadius = r;
 	r = b->geom.getMinorRadius();
 	if (minRadius>r) minRadius = r;
-	
+
 	Bool closeEnough = sqr(minRadius) > dSqr;
 
 	if (closeEnough || xyproc(a, b, cinfo))
@@ -772,11 +767,11 @@ static Bool collideTest_Box_Box(const CollideInfo *a, const CollideInfo *b, Coll
 
 //-----------------------------------------------------------------------------
 static Bool distCalcProc_CenterAndCenter_2D(
-	const Coord3D *posA, 
-	const Object *objA, 
-	const Coord3D *posB, 
-	const Object *objB, 
-	Real& abDistSqr, 
+	const Coord3D *posA,
+	const Object *objA,
+	const Coord3D *posB,
+	const Object *objB,
+	Real& abDistSqr,
 	Coord3D& abVec,
 	Real maxDistSqr
 )
@@ -787,7 +782,7 @@ static Bool distCalcProc_CenterAndCenter_2D(
 	diff.x = posB->x - posA->x;
 	diff.y = posB->y - posA->y;
 	diff.z = 0.0f;
-	
+
 	//if (abDistSqr)
 	{
 		abDistSqr = sqr(diff.x) + sqr(diff.y);
@@ -803,11 +798,11 @@ static Bool distCalcProc_CenterAndCenter_2D(
 
 //-----------------------------------------------------------------------------
 static Bool distCalcProc_BoundaryAndBoundary_2D(
-	const Coord3D *posA, 
-	const Object *objA, 
-	const Coord3D *posB, 
-	const Object *objB, 
-	Real& abDistSqr, 
+	const Coord3D *posA,
+	const Object *objA,
+	const Coord3D *posB,
+	const Object *objB,
+	Real& abDistSqr,
 	Coord3D& abVec,
 	Real maxDistSqr
 )
@@ -816,24 +811,24 @@ static Bool distCalcProc_BoundaryAndBoundary_2D(
 	diff.x = posB->x - posA->x;
 	diff.y = posB->y - posA->y;
 	diff.z = 0.0f;
-	
+
 	Real actualDistSqr = sqr(diff.x) + sqr(diff.y);
 
 	Real shrinkFactor = 1.0f;
 	Real shrunkenDistSqr = actualDistSqr;
-	Real totalRad = (objA ? objA->getGeometryInfo().getBoundingCircleRadius() : 0.0f) + 
+	Real totalRad = (objA ? objA->getGeometryInfo().getBoundingCircleRadius() : 0.0f) +
 							(objB ? objB->getGeometryInfo().getBoundingCircleRadius() : 0.0f);
 
 	if (totalRad > 0.0f)
 	{
 		Real actualDist = sqrtf(actualDistSqr);
 		Real shrunkenDist = actualDist - totalRad;
-		if (shrunkenDist <= 0.0f) 
+		if (shrunkenDist <= 0.0f)
 		{
 			shrinkFactor = 0.0f;
 			shrunkenDistSqr = 0.0f;	// sorry, distances can't be negative
 		}
-		else 
+		else
 		{
 			shrinkFactor = shrunkenDist / actualDist;
 			shrunkenDistSqr = sqr(shrunkenDist);
@@ -857,11 +852,11 @@ static Bool distCalcProc_BoundaryAndBoundary_2D(
 
 //-----------------------------------------------------------------------------
 static Bool distCalcProc_CenterAndCenter_3D(
-	const Coord3D *posA, 
-	const Object *objA, 
-	const Coord3D *posB, 
-	const Object *objB, 
-	Real& abDistSqr, 
+	const Coord3D *posA,
+	const Object *objA,
+	const Coord3D *posB,
+	const Object *objB,
+	Real& abDistSqr,
 	Coord3D& abVec,
 	Real maxDistSqr
 )
@@ -872,7 +867,7 @@ static Bool distCalcProc_CenterAndCenter_3D(
 	diff.x = posB->x - posA->x;
 	diff.y = posB->y - posA->y;
 	diff.z = posB->z - posA->z;
-	
+
 	//if (abDistSqr)
 	{
 		abDistSqr = sqr(diff.x) + sqr(diff.y) + sqr(diff.z);
@@ -887,11 +882,11 @@ static Bool distCalcProc_CenterAndCenter_3D(
 
 //-----------------------------------------------------------------------------
 static Bool distCalcProc_BoundaryAndBoundary_3D(
-	const Coord3D *posA, 
-	const Object *objA, 
-	const Coord3D *posB, 
-	const Object *objB, 
-	Real& abDistSqr, 
+	const Coord3D *posA,
+	const Object *objA,
+	const Coord3D *posB,
+	const Object *objB,
+	Real& abDistSqr,
 	Coord3D& abVec,
 	Real maxDistSqr
 )
@@ -904,9 +899,9 @@ static Bool distCalcProc_BoundaryAndBoundary_3D(
 	Coord3D diff;
 	diff.x = posB->x - posA->x;
 	diff.y = posB->y - posA->y;
-	diff.z = ((posB->z + (geomB ? geomB->getZDeltaToCenterPosition() : 0.0f)) 
+	diff.z = ((posB->z + (geomB ? geomB->getZDeltaToCenterPosition() : 0.0f))
 						- (posA->z + (geomA ? geomA->getZDeltaToCenterPosition() : 0.0f)));
-	
+
 	Real actualDistSqr = sqr(diff.x) + sqr(diff.y) + sqr(diff.z);
 
 	Real shrinkFactor = 1.0f;
@@ -916,12 +911,12 @@ static Bool distCalcProc_BoundaryAndBoundary_3D(
 	{
 		Real actualDist = sqrtf(actualDistSqr);
 		Real shrunkenDist = actualDist - totalRad;
-		if (shrunkenDist <= 0.0f) 
+		if (shrunkenDist <= 0.0f)
 		{
 			shrinkFactor = 0.0f;
 			shrunkenDistSqr = 0.0f;	// sorry, distances can't be negative
 		}
-		else 
+		else
 		{
 			shrinkFactor = shrunkenDist / actualDist;
 			shrunkenDistSqr = sqr(shrunkenDist);
@@ -945,23 +940,23 @@ static Bool distCalcProc_BoundaryAndBoundary_3D(
 }
 
 //-----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 
-static DistCalcProc theDistCalcProcs[] = 
-{ 
-	distCalcProc_CenterAndCenter_2D, 
+static DistCalcProc theDistCalcProcs[] =
+{
+	distCalcProc_CenterAndCenter_2D,
 	distCalcProc_CenterAndCenter_3D,
-	distCalcProc_BoundaryAndBoundary_2D, 
-	distCalcProc_BoundaryAndBoundary_3D, 
+	distCalcProc_BoundaryAndBoundary_2D,
+	distCalcProc_BoundaryAndBoundary_3D,
 };
 
 // NOTE: This *DEPENDS* on the order of the geometry enum defines
-static CollideTestProc theCollideTestProcs[] = 
+static CollideTestProc theCollideTestProcs[] =
 {
 	collideTest_Sphere_Sphere,
 	collideTest_Sphere_Cylinder,
@@ -975,7 +970,7 @@ static CollideTestProc theCollideTestProcs[] =
 };
 
 //-----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //-----------------------------------------------------------------------------
 PartitionManager *ThePartitionManager = NULL;  ///< the object manager singleton
 
@@ -988,11 +983,11 @@ class PartitionContactListNode : public MemoryPoolObject
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PartitionContactListNode, "PartitionContactListNode" )
 
 public:
-	PartitionContactListNode*			m_nextHash;	///< next node with same hash value 
+	PartitionContactListNode*			m_nextHash;	///< next node with same hash value
 	PartitionContactListNode*			m_next;			///< next node
 	PartitionData*								m_obj;			///< one object that is possibly colliding
 	PartitionData*								m_other;		///< the other object (or null for collisions with the terrain)
-	Int														m_hashValue;///< index into hash table 
+	Int														m_hashValue;///< index into hash table
 };
 
 inline PartitionContactListNode::~PartitionContactListNode() { }
@@ -1005,7 +1000,7 @@ class PartitionContactList
 
 	/*
 		socketcount should be prime (and "not too close to a power of 2) for best results.
-		
+
 		if this one isn't large enough, try this website:
 		http://www.utm.edu/research/primes/lists/small/1000.txt
 
@@ -1147,7 +1142,7 @@ CellAndObjectIntersection::~CellAndObjectIntersection()
 void CellAndObjectIntersection::friend_addToCellList(CellAndObjectIntersection **pListHead)
 {
 	DEBUG_ASSERTCRASH(m_prevCoi == NULL && m_nextCoi == NULL && *pListHead != this, ("trying to add a cell to list, but it appears to already be in a list"));
-	
+
 	this->m_nextCoi = *pListHead;
 	if (*pListHead)
 		(*pListHead)->m_prevCoi = this;
@@ -1226,10 +1221,7 @@ void CellAndObjectIntersection::removeAllCoverage()
 //-----------------------------------------------------------------------------
 PartitionCell::PartitionCell()
 {
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_cellX = m_cellY = 0;
-	//
 	m_firstCoiInCell = NULL;
 	m_coiCount = 0;
 #ifdef PM_CACHE_TERRAIN_HEIGHT
@@ -1281,9 +1273,9 @@ void PartitionCell::addLooker(Int playerIndex)
 
 	CellShroudStatus newShroud = getShroudStatusForPlayer( playerIndex );
 
-//	DEBUG_LOG(( "ADD    %d, %d.  CS = %d, AS = %d for player %d.\n", 
-//							m_cellX, 
-//							m_cellY, 
+//	DEBUG_LOG(( "ADD    %d, %d.  CS = %d, AS = %d for player %d.",
+//							m_cellX,
+//							m_cellY,
 //							m_shroudLevel[playerIndex].m_currentShroud,
 //							m_shroudLevel[playerIndex].m_activeShroudLevel,
 //							playerIndex
@@ -1294,7 +1286,7 @@ void PartitionCell::addLooker(Int playerIndex)
 		// On an edge trigger, tell all objects to think about their shroudedness
 		invalidateShroudedStatusForAllCois( playerIndex );
 
-		if( playerIndex == ThePlayerList->getLocalPlayer()->getPlayerIndex() )
+		if( playerIndex == rts::getObservedOrLocalPlayer()->getPlayerIndex() )
 		{
 			// and if this is the local player, do the Client update.
 			TheDisplay->setShroudLevel(m_cellX, m_cellY, newShroud);
@@ -1317,9 +1309,9 @@ void PartitionCell::removeLooker(Int playerIndex)
 	}
 	CellShroudStatus newShroud = getShroudStatusForPlayer( playerIndex );
 
-//	DEBUG_LOG(( "REMOVE %d, %d.  CS = %d, AS = %d for player %d.\n", 
-//							m_cellX, 
-//							m_cellY, 
+//	DEBUG_LOG(( "REMOVE %d, %d.  CS = %d, AS = %d for player %d.",
+//							m_cellX,
+//							m_cellY,
 //							m_shroudLevel[playerIndex].m_currentShroud,
 //							m_shroudLevel[playerIndex].m_activeShroudLevel,
 //							playerIndex
@@ -1330,7 +1322,7 @@ void PartitionCell::removeLooker(Int playerIndex)
 		// On an edge trigger, tell all objects to think about their shroudedness
 		invalidateShroudedStatusForAllCois( playerIndex );
 
-		if( playerIndex == ThePlayerList->getLocalPlayer()->getPlayerIndex() )
+		if( playerIndex == rts::getObservedOrLocalPlayer()->getPlayerIndex() )
 		{
 			// and if this is the local player, do the Client update.
 			TheDisplay->setShroudLevel(m_cellX, m_cellY, newShroud);
@@ -1358,7 +1350,7 @@ void PartitionCell::addShrouder( Int playerIndex )
 		invalidateShroudedStatusForAllCois( playerIndex );
 
 		// and update the client if we are on the local player
-		if( playerIndex == ThePlayerList->getLocalPlayer()->getPlayerIndex() )
+		if( playerIndex == rts::getObservedOrLocalPlayer()->getPlayerIndex() )
 		{
 			TheDisplay->setShroudLevel(m_cellX, m_cellY, newShroud);
 			TheRadar->setShroudLevel(m_cellX, m_cellY, newShroud);
@@ -1513,7 +1505,7 @@ void PartitionCell::crc( Xfer *xfer )
 	xfer->xferUser(&m_cellX, sizeof(m_cellX));
 	xfer->xferUser(&m_cellY, sizeof(m_cellY));
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1529,7 +1521,7 @@ void PartitionCell::xfer( Xfer *xfer )
 	// xfer shroud data
 	xfer->xferUser( &m_shroudLevel, sizeof( ShroudLevel ) * MAX_PLAYER_COUNT );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1537,7 +1529,7 @@ void PartitionCell::xfer( Xfer *xfer )
 void PartitionCell::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -1546,7 +1538,7 @@ void PartitionCell::loadPostProcess( void )
 //-----------------------------------------------------------------------------
 PartitionData::PartitionData()
 {
-	//DEBUG_LOG(("create pd %08lx\n",this));
+	//DEBUG_LOG(("create pd %08lx",this));
 	m_next = NULL;
 	m_prev = NULL;
 	m_nextDirty = NULL;
@@ -1570,17 +1562,17 @@ PartitionData::PartitionData()
 //-----------------------------------------------------------------------------
 PartitionData::~PartitionData()
 {
-	//DEBUG_LOG(("toss pd for pd %08lx obj %08lx\n",this,m_object));
+	//DEBUG_LOG(("toss pd for pd %08lx obj %08lx",this,m_object));
 	removeAllTouchedCells();
 	freeCoiArray();
 	DEBUG_ASSERTCRASH(ThePartitionManager, ("ThePartitionManager is null"));
 	if (ThePartitionManager && ThePartitionManager->isInListDirtyModules(this))
 	{
-		//DEBUG_LOG(("remove pd %08lx from dirty list (%08lx %08lx)\n",this,m_prevDirty,m_nextDirty));
+		//DEBUG_LOG(("remove pd %08lx from dirty list (%08lx %08lx)",this,m_prevDirty,m_nextDirty));
 		ThePartitionManager->removeFromDirtyModules(this);
-		//DEBUG_ASSERTCRASH(!ThePartitionManager->isInListDirtyModules(this), ("hmm\n"));
+		//DEBUG_ASSERTCRASH(!ThePartitionManager->isInListDirtyModules(this), ("hmm"));
 	}
-} 
+}
 
 //-----------------------------------------------------------------------------
 Int PartitionData::getControllingPlayerIndex() const
@@ -1600,7 +1592,7 @@ Int PartitionData::getControllingPlayerIndex() const
 
 //-----------------------------------------------------------------------------
 // only used to restore state after map border resizing and/or xfer!
-void PartitionData::friend_setShroudednessPrevious(Int playerIndex, ObjectShroudStatus status) 
+void PartitionData::friend_setShroudednessPrevious(Int playerIndex, ObjectShroudStatus status)
 {
 	m_shroudednessPrevious[playerIndex] = status;
 
@@ -1612,16 +1604,16 @@ void PartitionData::friend_setShroudednessPrevious(Int playerIndex, ObjectShroud
 	if (m_shroudedness[playerIndex] == OBJECTSHROUD_INVALID)
 		m_shroudedness[playerIndex] = OBJECTSHROUD_INVALID_BUT_PREVIOUS_VALID;
 #endif
-} 
+}
 
 //-----------------------------------------------------------------------------
 ObjectShroudStatus PartitionData::getShroudedStatus(Int playerIndex)
 {
 	// sanity
-	DEBUG_ASSERTCRASH( playerIndex >= 0 && playerIndex < MAX_PLAYER_COUNT, 
-										 ("PartitionData::getShroudedStatus - Invalid player index '%d'\n", playerIndex) );
+	DEBUG_ASSERTCRASH( playerIndex >= 0 && playerIndex < MAX_PLAYER_COUNT,
+										 ("PartitionData::getShroudedStatus - Invalid player index '%d'", playerIndex) );
 
-	if (!ThePartitionManager->getUpdatedSinceLastReset()) 
+	if (!ThePartitionManager->getUpdatedSinceLastReset())
 	{
 		// The shroud should be invalid until update has been called.
 		// I'll set myself as invalid so the next time you ask I'll recompute.  (If I just return Invalid, then the old state will persist unfairly over a reset)
@@ -1661,7 +1653,7 @@ ObjectShroudStatus PartitionData::getShroudedStatus(Int playerIndex)
 			}
 		}
 		else if( shroudedCells + foggedCells == m_coiInUseCount )
-		{	
+		{
 			m_shroudedness[playerIndex] = OBJECTSHROUD_FOGGED;	//object is visible but fogged.
 			if (m_object && m_ghostObject)	//object does not exist for modules holding only GhostObjects
 			{
@@ -1698,7 +1690,7 @@ ObjectShroudStatus PartitionData::getShroudedStatus(Int playerIndex)
 				//need a ghost object.
 				m_ghostObject->freeSnapShot(playerIndex);
 			}
-		}	// no cell I use has anything
+		}
 		else
 		{	//Record that this object was seen by the player.  This info will be used to show fogged enemy faction buildings.
 			m_everSeenByPlayer[playerIndex] = true;
@@ -1710,11 +1702,11 @@ ObjectShroudStatus PartitionData::getShroudedStatus(Int playerIndex)
 			}
 		}
 #ifndef DISABLE_INVALID_PREVENTION
- 		if (m_coiInUseCount && updateShroudednessPrevious) 
-		{	
+ 		if (m_coiInUseCount && updateShroudednessPrevious)
+		{
 #else
- 		if (m_coiInUseCount) 
-		{	
+ 		if (m_coiInUseCount)
+		{
 #endif
 			//only remember the previous state of objects actually on the map.
  			m_shroudednessPrevious[playerIndex] = m_shroudedness[playerIndex];
@@ -1746,7 +1738,7 @@ void PartitionData::addSubPixToCoverage(PartitionCell *cell)
 {
 	DEBUG_ASSERTCRASH(m_coiInUseCount < m_coiArrayCount, ("not enough cois allocated for this object"));
 	if (cell)
-	{			
+	{
 		// see if we already have a coi for this cell.
 		CellAndObjectIntersection *coi = m_coiArray;
 		CellAndObjectIntersection *coiToUse = NULL;
@@ -1805,7 +1797,7 @@ void PartitionData::doRectFill(
 	Int numStepsX = REAL_TO_INT_CEIL(halfsizeX * stepSizeInvTimes2);
 	Int numStepsY = REAL_TO_INT_CEIL(halfsizeY * stepSizeInvTimes2);
 	// GS 12-26-02  Oh my part 2.  Now that we are no longer greatly underestimating our COI imprint,
-	// we don't need this fudge.  The fudge is not in the calcMaxCOIForShape, so it just results in 
+	// we don't need this fudge.  The fudge is not in the calcMaxCOIForShape, so it just results in
 	// good COIs getting dropped since we didn't allocate enough to handle this fudge.
 
 	Real tl_x = centerX - halfsizeX*c - halfsizeY*s;
@@ -1843,6 +1835,8 @@ void PartitionData::hLineCircle(Int x1, Int x2, Int y)
 }
 
 // -----------------------------------------------------------------------------
+// Marks all partition cells that intersect a circle of the given center and radius
+// as covered by this object using a variation of the midpoint circle algorithm.
 void PartitionData::doCircleFill(
 	Real centerX,
 	Real centerY,
@@ -1855,12 +1849,20 @@ void PartitionData::doCircleFill(
 	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 
 	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	Int y = cellRadius - 1;
 	Int dec = 3 - 2*cellRadius;
-	for (Int x = 0; x < cellRadius; x++)
+
+#if RETAIL_COMPATIBLE_CRC
+	// Cell coverage diverges at radii >= 240 between algorithms.
+	Int end = cellRadius - 1;
+	Int& endRef = (cellRadius < 240) ? y : end;
+	for (Int x = 0; x <= endRef; ++x)
+#else
+	for (Int x = 0; x <= y; ++x)
+#endif
 	{
 		hLineCircle(cellCenterX - x, cellCenterX + x, cellCenterY + y);
 		hLineCircle(cellCenterX - x, cellCenterX + x, cellCenterY - y);
@@ -1888,7 +1890,7 @@ void PartitionData::doSmallFill(
 	Real halfCellSize = ThePartitionManager->getCellSize() * 0.5f;
 	if (radius > halfCellSize)
 	{
-		DEBUG_CRASH(("object is too large to use a 'small' geometry, truncating size to cellsize\n"));
+		DEBUG_CRASH(("object is too large to use a 'small' geometry, truncating size to cellsize"));
 		radius = halfCellSize;
 	}
 
@@ -1939,7 +1941,7 @@ void PartitionData::addPossibleCollisions(PartitionContactList *ctList)
 	}
 #endif
 
-	//DEBUG_LOG(("adding possible collision for %s\n",getObject()->getTemplate()->getName().str()));
+	//DEBUG_LOG(("adding possible collision for %s",getObject()->getTemplate()->getName().str()));
 
 	CellAndObjectIntersection *myCoi = m_coiArray;
 	for (Int i = m_coiInUseCount; i > 0; --i, ++myCoi)
@@ -1997,10 +1999,10 @@ Bool PartitionData::collidesWith(const PartitionData *that, CollideLocAndNormal
 
 //-----------------------------------------------------------------------------
 /* See if thisObj collides with geom at pos & angle. */
-Bool PartitionManager::geomCollidesWithGeom(const Coord3D* pos1, 
+Bool PartitionManager::geomCollidesWithGeom(const Coord3D* pos1,
 		const GeometryInfo& geom1,
 		Real angle1,
-		const Coord3D* pos2, 
+		const Coord3D* pos2,
 		const GeometryInfo& geom2,
 		Real angle2) const
 {
@@ -2008,7 +2010,7 @@ Bool PartitionManager::geomCollidesWithGeom(const Coord3D* pos1,
 	CollideInfo thatInfo(pos2, geom2, angle2);
 
 	// invariant for all geometries: first do z collision check.
-	if (thisInfo.position.z + thisInfo.geom.getMaxHeightAbovePosition() >= thatInfo.position.z && 
+	if (thisInfo.position.z + thisInfo.geom.getMaxHeightAbovePosition() >= thatInfo.position.z &&
 			thisInfo.position.z <= thatInfo.position.z + thatInfo.geom.getMaxHeightAbovePosition())
 	{
 		GeometryType thisGeom = geom1.getGeomType();
@@ -2039,10 +2041,9 @@ void PartitionData::updateCellsTouched()
 
 
 	Object *obj = getObject();
-	DEBUG_ASSERTCRASH(obj != NULL || m_ghostObject != NULL, ("must be attached to an Object here 1"));
 
 	if (obj)
-	{	
+	{
 		//we have no object using this PartitionData but we still have a GhostObject so copy its data.
 		geom = obj->getGeometryInfo().getGeomType();
 		isSmall = obj->getGeometryInfo().getIsSmall();
@@ -2060,6 +2061,11 @@ void PartitionData::updateCellsTouched()
 		majorRadius = m_ghostObject->getGeometryMajorRadius();
 		minorRadius = m_ghostObject->getGeometryMinorRadius();
 	}
+	else
+	{
+		DEBUG_CRASH(("must be attached to an Object here"));
+		return;
+	}
 
 	removeAllTouchedCells();
 	if (isSmall)
@@ -2090,10 +2096,10 @@ void PartitionData::updateCellsTouched()
 	const PartitionCell *currentCell = ThePartitionManager->getCellAt( currentCellIndexX, currentCellIndexY );
 	if(obj && currentCell != m_lastCell )
 	{
-		// To not expose PartitionCells, he will think in terms of points.  He will 
-		// unlook at a point and look at the new point.  We do the rounding and the 
+		// To not expose PartitionCells, he will think in terms of points.  He will
+		// unlook at a point and look at the new point.  We do the rounding and the
 		// changing into PartitionCells
-		obj->onPartitionCellChange(); 
+		obj->onPartitionCellChange();
 		m_lastCell = currentCell;
 	}
 
@@ -2117,8 +2123,8 @@ void PartitionData::updateCellsTouched()
 }
 
 //-----------------------------------------------------------------------------
-void PartitionData::invalidateShroudedStatusForPlayer(Int playerIndex) 
-{ 
+void PartitionData::invalidateShroudedStatusForPlayer(Int playerIndex)
+{
 #ifndef DISABLE_INVALID_PREVENTION
 	if (m_shroudedness[playerIndex] != OBJECTSHROUD_INVALID && m_shroudedness[playerIndex] != OBJECTSHROUD_INVALID_BUT_PREVIOUS_VALID)
 #endif
@@ -2126,15 +2132,15 @@ void PartitionData::invalidateShroudedStatusForPlayer(Int playerIndex)
 }
 
 //-----------------------------------------------------------------------------
-void PartitionData::invalidateShroudedStatusForAllPlayers() 
-{ 
-	for (Int i = 0; i < MAX_PLAYER_COUNT; i++) 
+void PartitionData::invalidateShroudedStatusForAllPlayers()
+{
+	for (Int i = 0; i < MAX_PLAYER_COUNT; i++)
 	{
 		invalidateShroudedStatusForPlayer(i);
 	}
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 static AsciiString theObjName;
 #endif
 
@@ -2144,10 +2150,10 @@ Int PartitionData::calcMaxCoiForShape(GeometryType geom, Real majorRadius, Real
 	Int result;
 	if (isSmall)
 	{
-		#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+		#if defined(RTS_DEBUG)
 		Int chk = calcMaxCoiForShape(geom, majorRadius, minorRadius, false);
 		(void)chk;
-		DEBUG_ASSERTCRASH(chk <= 4, ("Small objects should be <= 4 cells, but I calced %s as %d\n",theObjName.str(),chk));
+		DEBUG_ASSERTCRASH(chk <= 4, ("Small objects should be <= 4 cells, but I calced %s as %d",theObjName.str(),chk));
 		#endif
 		result = 4;
 	}
@@ -2162,14 +2168,21 @@ Int PartitionData::calcMaxCoiForShape(GeometryType geom, Real majorRadius, Real
 				// this actually allocates a few too many, but that's ok.
 				Int cells = ThePartitionManager->worldToCellDist(majorRadius*2) + 1;
 				result = cells * cells;
+#if !RETAIL_COMPATIBLE_CRC
+				break;
+#endif
 			}
 			case GEOMETRY_BOX:
 			{
 				Real diagonal = (Real)(sqrtf(majorRadius*majorRadius + minorRadius*minorRadius));
 				Int cells = ThePartitionManager->worldToCellDist(diagonal*2) + 1;
 				result = cells * cells;
+				break;
 			}
+			default:
+				return 4;
 		};
+		static_assert(GEOMETRY_NUM_TYPES == 3, "GEOMETRY_NUM_TYPES has changed");
 	}
 	if (result < 4)
 		result = 4;
@@ -2181,12 +2194,12 @@ Int PartitionData::calcMaxCoiForObject()
 {
 	Object *obj = getObject();
 	DEBUG_ASSERTCRASH(obj != NULL, ("must be attached to an Object here 2"));
-	
+
 	GeometryType geom = obj->getGeometryInfo().getGeomType();
 	Real majorRadius = obj->getGeometryInfo().getMajorRadius();
 	Real minorRadius = obj->getGeometryInfo().getMinorRadius();
 	Bool isSmall = obj->getGeometryInfo().getIsSmall();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 theObjName = obj->getTemplate()->getName();
 #endif
 	return calcMaxCoiForShape(geom, majorRadius, minorRadius, isSmall);
@@ -2195,7 +2208,7 @@ theObjName = obj->getTemplate()->getName();
 //-----------------------------------------------------------------------------
 void PartitionData::makeDirty(Bool needToUpdateCells)
 {
-	//DEBUG_LOG(("makeDirty for pd %08lx obj %08lx\n",this,m_object));
+	//DEBUG_LOG(("makeDirty for pd %08lx obj %08lx",this,m_object));
 	if (!ThePartitionManager->isInListDirtyModules(this))
 	{
 		if (needToUpdateCells)
@@ -2257,7 +2270,7 @@ void PartitionData::attachToObject(Object* object)
 			m_ghostObject = TheGhostObjectManager->addGhostObject(object, this);
 	}
 
-	//DEBUG_LOG(("attach pd for pd %08lx obj %08lx\n",this,m_object));
+	//DEBUG_LOG(("attach pd for pd %08lx obj %08lx",this,m_object));
 
 	// (re)calc maxCoi and (re)alloc cois
 	DEBUG_ASSERTCRASH(m_coiArrayCount == 0 && m_coiArray == NULL, ("hmm, coi should probably be null here"));
@@ -2288,7 +2301,7 @@ void PartitionData::detachFromObject()
 	removeAllTouchedCells();
 	freeCoiArray();
 
-	//DEBUG_LOG(("detach pd for pd %08lx obj %08lx\n",this,m_object));
+	//DEBUG_LOG(("detach pd for pd %08lx obj %08lx",this,m_object));
 
 	// no longer attached to object
 	m_object = NULL;
@@ -2334,7 +2347,7 @@ void PartitionData::detachFromGhostObject(void)
 	removeAllTouchedCells();
 	freeCoiArray();
 
-	//DEBUG_LOG(("detach pd for pd %08lx obj %08lx\n",this,m_object));
+	//DEBUG_LOG(("detach pd for pd %08lx obj %08lx",this,m_object));
 
 	// no longer attached to object
 	m_object = NULL;
@@ -2367,7 +2380,7 @@ void PartitionContactList::addToContactList( PartitionData *obj, PartitionData *
 {
 	if (obj == other || obj == NULL || other == NULL)
 		return;
-	
+
 	Object* obj_obj = obj->getObject();
 	Object* other_obj = other->getObject();
 	if (obj_obj == NULL || other_obj == NULL)
@@ -2377,28 +2390,28 @@ void PartitionContactList::addToContactList( PartitionData *obj, PartitionData *
 	UnsignedInt hashValue = hash2ints(obj_obj->getID(), other_obj->getID());
 	hashValue %= PartitionContactList_SOCKET_COUNT;
 
-	// make sure given hit has not already been recorded 
+	// make sure given hit has not already been recorded
 	for (PartitionContactListNode* cd = m_contactHash[ hashValue ]; cd; cd = cd->m_nextHash )
 	{
 		if ((cd->m_obj == obj && cd->m_other == other) ||
-				(cd->m_obj == other && cd->m_other == obj)) 
+				(cd->m_obj == other && cd->m_other == obj))
 		{
-			// already noted 
+			// already noted
 			return;
 		}
 	}
 
-	// new hit 
+	// new hit
 	PartitionContactListNode *ncd = newInstance(PartitionContactListNode);
 	ncd->m_obj = obj;
 	ncd->m_other = other;
 	ncd->m_hashValue = hashValue;
 
-	// add to hash table 
+	// add to hash table
 	ncd->m_nextHash = m_contactHash[ hashValue ];
 	m_contactHash[ hashValue ] = ncd;
 
-	// add to list of contacts for this frame 
+	// add to list of contacts for this frame
 	ncd->m_next = m_contactList;
 	m_contactList = ncd;
 
@@ -2412,7 +2425,7 @@ for (PartitionContactListNode *cd2 = m_contactHash[ hashValue ]; cd2; cd2 = cd2-
 }
 if (depth > 3)
 {
-	DEBUG_LOG(("depth is %d for %s %08lx (%d) - %s %08lx (%d)\n",
+	DEBUG_LOG(("depth is %d for %s %08lx (%d) - %s %08lx (%d)",
 		depth,obj_obj->getTemplate()->getName().str(),obj_obj,obj_obj->getID(),
 		other_obj->getTemplate()->getName().str(),other_obj,other_obj->getID()
 		));
@@ -2423,7 +2436,7 @@ if (depth > 3)
 		//hashValue %= PartitionContactList_SOCKET_COUNT;
 
 
-		DEBUG_LOG(("ENTRY: %s %08lx (%d) - %s %08lx (%d) [rawhash %d]\n",
+		DEBUG_LOG(("ENTRY: %s %08lx (%d) - %s %08lx (%d) [rawhash %d]",
 			cd2->m_obj->getObject()->getTemplate()->getName().str(),cd2->m_obj->getObject(),cd2->m_obj->getObject()->getID(),
 			cd2->m_other->getObject()->getTemplate()->getName().str(),cd2->m_other->getObject(),cd2->m_other->getObject()->getID(),
 			rawhash));
@@ -2444,7 +2457,7 @@ for (int ii = 0; ii < PartitionContactList_SOCKET_COUNT; ++ii)
 	}
 }
 aggcount += 1.0f;
-DEBUG_ASSERTLOG(((Int)aggcount)%1000!=0,("avg hash depth at %f is %f, fullness %f%%\n",
+DEBUG_ASSERTLOG(((Int)aggcount)%1000!=0,("avg hash depth at %f is %f, fullness %f%%",
 aggcount,aggtotal/(aggcount*PartitionContactList_SOCKET_COUNT),(aggfull*100)/(aggcount*PartitionContactList_SOCKET_COUNT)));
 #endif
 
@@ -2467,7 +2480,7 @@ void PartitionContactList::removeSpecificPartitionData(PartitionData* data)
 //-----------------------------------------------------------------------------
 void PartitionContactList::resetContactList()
 {
-	// remove items from hash table 
+	// remove items from hash table
 	PartitionContactListNode* cdnext;
 	for (PartitionContactListNode* cd = m_contactList; cd; cd = cdnext)
 	{
@@ -2482,12 +2495,12 @@ void PartitionContactList::resetContactList()
 //-----------------------------------------------------------------------------
 void PartitionContactList::processContactList()
 {
-	for (PartitionContactListNode* cd = m_contactList; cd; cd = cd->m_next) 
+	for (PartitionContactListNode* cd = m_contactList; cd; cd = cd->m_next)
 	{
 		if (cd->m_obj == NULL || cd->m_other == NULL)
 			continue;
 
-		// we know that their partitions overlap; determine if they REALLY collide 
+		// we know that their partitions overlap; determine if they REALLY collide
 		// before proceeding...
 		CollideLocAndNormal cinfo;
 		if (!cd->m_obj->friend_collidesWith(cd->m_other, &cinfo))
@@ -2495,12 +2508,12 @@ void PartitionContactList::processContactList()
 
 		Object* obj = cd->m_obj->getObject();
 		Object* other = cd->m_other->getObject();
-		
+
 		if( obj->getStatusBits().test( OBJECT_STATUS_NO_COLLISIONS ) ||
 				other->getStatusBits().test( OBJECT_STATUS_NO_COLLISIONS ) )
 			continue;
 
-		DEBUG_ASSERTCRASH(!(obj->isKindOf(KINDOF_IMMOBILE) && other->isKindOf(KINDOF_IMMOBILE)), 
+		DEBUG_ASSERTCRASH(!(obj->isKindOf(KINDOF_IMMOBILE) && other->isKindOf(KINDOF_IMMOBILE)),
 			("we should never have collisions between two immobile things reported"));
 
 		// the onCollide() calls can remove the object(s) from the partition mgr,
@@ -2514,7 +2527,7 @@ void PartitionContactList::processContactList()
 
  		//Before checking the "other" case, make sure that the previous collision didn't
  		//absorb him. This becomes a conflict for pilots giving veterancy to transports
- 		//and pilots entering transports. Both would occur if these isDestroyed checks 
+ 		//and pilots entering transports. Both would occur if these isDestroyed checks
  		//were missing.
  		if( !obj->isDestroyed() && !other->isDestroyed() )
  		{
@@ -2529,12 +2542,12 @@ void PartitionContactList::processContactList()
 		//
 		if (!obj->isDestroyed() && obj->friend_getPartitionData() != NULL && !obj->isKindOf(KINDOF_IMMOBILE))
 		{
-//DEBUG_LOG(("%d: re-dirtying collision of %s %08lx with %s %08lx\n",TheGameLogic->getFrame(),obj->getTemplate()->getName().str(),obj,other->getTemplate()->getName().str(),other));
+//DEBUG_LOG(("%d: re-dirtying collision of %s %08lx with %s %08lx",TheGameLogic->getFrame(),obj->getTemplate()->getName().str(),obj,other->getTemplate()->getName().str(),other));
 			obj->friend_getPartitionData()->makeDirty(false);
 		}
 		if (!other->isDestroyed() && other->friend_getPartitionData() != NULL && !other->isKindOf(KINDOF_IMMOBILE))
 		{
-//DEBUG_LOG(("%d: re-dirtying collision of %s %08lx with %s %08lx [other]\n",TheGameLogic->getFrame(),other->getTemplate()->getName().str(),other,obj->getTemplate()->getName().str(),obj));
+//DEBUG_LOG(("%d: re-dirtying collision of %s %08lx with %s %08lx [other]",TheGameLogic->getFrame(),other->getTemplate()->getName().str(),other,obj->getTemplate()->getName().str(),obj));
 			other->friend_getPartitionData()->makeDirty(false);
 		}
 	}
@@ -2560,7 +2573,7 @@ PartitionManager::PartitionManager()
 #ifdef FASTER_GCO
 	m_maxGcoRadius = 0;
 #endif
-} 
+}
 
 //-----------------------------------------------------------------------------
 PartitionManager::~PartitionManager()
@@ -2568,7 +2581,7 @@ PartitionManager::~PartitionManager()
 
 	shutdown();
 
-}  // end ~PartitionManager
+}
 
 //-----------------------------------------------------------------------------
 #ifdef PM_CACHE_TERRAIN_HEIGHT
@@ -2582,9 +2595,9 @@ static void calcHeights(const Region3D& world, Real cellSize, Int x, Int y, Real
 	Real step = cellSize / numSteps;
 	loZ = HUGE_DIST;		// huge positive
 	hiZ = -HUGE_DIST;		// huge negative
-	for (Real yy = 0; yy <= cellSize; yy += step) 
+	for (Real yy = 0; yy <= cellSize; yy += step)
 	{
-		for (Real xx = 0; xx <= cellSize; xx += step) 
+		for (Real xx = 0; xx <= cellSize; xx += step)
 		{
 			Real h = TheTerrainLogic->getGroundHeight( xbase + xx, ybase + yy );
 			if (h < loZ) loZ = h;
@@ -2686,7 +2699,7 @@ void PartitionManager::reset()
 void PartitionManager::shutdown()
 {
 	m_updatedSinceLastReset = false;
-	ThePartitionManager->removeAllDirtyModules();
+	removeAllDirtyModules();
 
 #ifdef RTS_DEBUG
 	// the above *should* remove all the touched cells (via unRegisterObject), but let's check:
@@ -2705,7 +2718,7 @@ void PartitionManager::shutdown()
 #endif
 
 	resetPendingUndoShroudRevealQueue();
-	
+
 	delete [] m_cells;
 	m_cells = NULL;
 
@@ -2726,7 +2739,7 @@ void PartitionManager::update()
 #ifdef INTENSE_DEBUG
 		Int cc = 0;
 #endif
-		if (!m_updatedSinceLastReset) 
+		if (!m_updatedSinceLastReset)
 		{
 			m_updatedSinceLastReset = true;
 		}
@@ -2741,14 +2754,14 @@ void PartitionManager::update()
 
 			// save it.
 			PartitionData *dirty = m_dirtyModules;
-			DEBUG_ASSERTCRASH(dirty->getObject() != NULL || dirty->getGhostObject() != NULL, 
+			DEBUG_ASSERTCRASH(dirty->getObject() != NULL || dirty->getGhostObject() != NULL,
 												("must be attached to an Object here %08lx",dirty));
 
 			// get this BEFORE removing from dirty list, since that clears the
 			// flag in question.
 			Bool updateEm = dirty->isInNeedOfUpdatingCells();
 			Bool collideEm = dirty->isInNeedOfCollisionCheck() && dirty->getObject();	//only update collisions if we have object
-			
+
 			// detach it from the dirty list.
 			removeFromDirtyModules(dirty);
 
@@ -2762,34 +2775,34 @@ void PartitionManager::update()
 				dirty->addPossibleCollisions(&ctList);
 			}
 		}
-		
+
 		ctList.processContactList();
 #ifdef INTENSE_DEBUG
-		DEBUG_ASSERTLOG(cc==0,("updated partition info for %d objects\n",cc));
+		DEBUG_ASSERTLOG(cc==0,("updated partition info for %d objects",cc));
 #endif
 		TheContactList = NULL;
 
 		processPendingUndoShroudRevealQueue();
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_debugThreatMap) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugThreatMap)
 	{
 		if (TheGameLogic->getFrame() % TheGlobalData->m_debugThreatMapTileDuration)
 		{
 			Int cellCount = m_cellCountX * m_cellCountY;
-			for (int i = 0; i < cellCount; ++i) 
+			for (int i = 0; i < cellCount; ++i)
 			{
-				UnsignedInt threat = m_cells[i].getThreatValue(ThePlayerList->getLocalPlayer()->getPlayerIndex());
-				if (threat > 0) 
+				UnsignedInt threat = m_cells[i].getThreatValue(rts::getObservedOrLocalPlayer()->getPlayerIndex());
+				if (threat > 0)
 				{
 					Real threatMul = INT_TO_REAL(threat) / TheGlobalData->m_maxDebugThreat;
 					if (threatMul > 1.0f)
 						threatMul = 1.0f;
 
 					Real size = TheGlobalData->m_partitionCellSize;
-					Coord3D pos = { m_cells[i].getCellX() * size, 
-													m_cells[i].getCellY() * size, 
+					Coord3D pos = { m_cells[i].getCellX() * size,
+													m_cells[i].getCellY() * size,
 													0 };
 					pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y);
 					RGBColor color;
@@ -2808,18 +2821,18 @@ void PartitionManager::update()
 		if (TheGameLogic->getFrame() % TheGlobalData->m_debugCashValueMapTileDuration)
 		{
 			Int cellCount = m_cellCountX * m_cellCountY;
-			for (int i = 0; i < cellCount; ++i) 
+			for (int i = 0; i < cellCount; ++i)
 			{
-				UnsignedInt value = m_cells[i].getCashValue(ThePlayerList->getLocalPlayer()->getPlayerIndex());
-				if (value > 0) 
+				UnsignedInt value = m_cells[i].getCashValue(rts::getObservedOrLocalPlayer()->getPlayerIndex());
+				if (value > 0)
 				{
 					Real valueMul = INT_TO_REAL(value) / TheGlobalData->m_maxDebugValue;
 					if (valueMul > 1.0f)
 						valueMul = 1.0f;
 
 					Real size = TheGlobalData->m_partitionCellSize;
-					Coord3D pos = { m_cells[i].getCellX() * size, 
-													m_cells[i].getCellY() * size, 
+					Coord3D pos = { m_cells[i].getCellX() * size,
+													m_cells[i].getCellY() * size,
 													0 };
 					pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y);
 					RGBColor color;
@@ -2829,11 +2842,11 @@ void PartitionManager::update()
 
 					addIcon(&pos, size, TheGlobalData->m_debugCashValueMapTileDuration, color);
 				}
-			}			
+			}
 		}
 	}
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-}  // end update
+#endif // defined(RTS_DEBUG)
+}
 
 //------------------------------------------------------------------------------
 void PartitionManager::registerObject( Object* object )
@@ -2845,10 +2858,10 @@ void PartitionManager::registerObject( Object* object )
 	// if object is already part of this system get out of here
 	if( object->friend_getPartitionData() != NULL )
 	{
-		DEBUG_LOG(( "Object '%s' already registered with partition manager\n",
+		DEBUG_LOG(( "Object '%s' already registered with partition manager",
 								object->getTemplate()->getName().str() ));
 		return;
-	}  // end if
+	}
 
 	// allocate a new module of partition data
 	PartitionData *mod = newInstance( PartitionData );
@@ -2920,9 +2933,9 @@ void PartitionManager::registerGhostObject( GhostObject* object)
 	// if object is already part of this system get out of here
 	if( object->friend_getPartitionData() != NULL )
 	{
-		DEBUG_LOG(( "GhostObject already registered with partition manager\n"));
+		DEBUG_LOG(( "GhostObject already registered with partition manager"));
 		return;
-	}  // end if
+	}
 
 	// allocate a new module of partition data
 	PartitionData *mod = newInstance( PartitionData );
@@ -2967,35 +2980,35 @@ void PartitionManager::unRegisterGhostObject( GhostObject* object )
 	deleteInstance(mod);
 }
 
-/** 
+/**
 	Reveals the map for the given player, but does not override Shroud generation.  (Script)
 */
 void PartitionManager::revealMapForPlayer( Int playerIndex )
 {
 	// By looking and then stopping on every cell, I clear all Passive Shroud
 	// By adding a looker directly I don't hit the Ally logic of the normal look/doShroudReveal
-	for (int i = 0; i < m_totalCellCount; ++i) 
+	for (int i = 0; i < m_totalCellCount; ++i)
 	{
 		m_cells[i].addLooker( playerIndex );
 		m_cells[i].removeLooker( playerIndex );
 	}
 }
 
-/** 
+/**
 	Reveals the map for the given player, AND permanently disables all Shroud generation (Observer Mode).
 	*/
 void PartitionManager::revealMapForPlayerPermanently( Int playerIndex )
 {
-	// By skipping the removeLooker, I consider myself as actively looking at everything, 
+	// By skipping the removeLooker, I consider myself as actively looking at everything,
 	// so Shroud generation will no longer function
 	// By adding a looker directly I don't hit the Ally logic of the normal look/doShroudReveal
-	for (int i = 0; i < m_totalCellCount; ++i) 
+	for (int i = 0; i < m_totalCellCount; ++i)
 	{
 		m_cells[i].addLooker( playerIndex );
 	}
 }
 
-/** 
+/**
 		Adds a layer of permanent blindness.  Used solely to undo the permanent reveal for debugging
 	*/
 void PartitionManager::undoRevealMapForPlayerPermanently( Int playerIndex )
@@ -3005,13 +3018,13 @@ void PartitionManager::undoRevealMapForPlayerPermanently( Int playerIndex )
 
 	// This will have amusing consequences if done without a preceding revealMapForPlayerPermanently.
 	// Everything you own can become shrouded.
-	for (int i = 0; i < m_totalCellCount; ++i) 
+	for (int i = 0; i < m_totalCellCount; ++i)
 	{
 		m_cells[i].removeLooker( playerIndex );
 	}
 }
 
-/** 
+/**
 	Resets the shroud for the given player with passive shroud (can re-explore).
 	*/
 void PartitionManager::shroudMapForPlayer( Int playerIndex )
@@ -3020,7 +3033,7 @@ void PartitionManager::shroudMapForPlayer( Int playerIndex )
 	processEntirePendingUndoShroudRevealQueue();
 
 	// By pulsing a blast of shroud like this, we will set everything not actively looked at as Passive Shroud
-	for (int i = 0; i < m_totalCellCount; ++i) 
+	for (int i = 0; i < m_totalCellCount; ++i)
 	{
 		m_cells[i].addShrouder( playerIndex );
 		m_cells[i].removeShrouder( playerIndex );
@@ -3034,7 +3047,7 @@ void PartitionManager::refreshShroudForLocalPlayer()
 	TheDisplay->clearShroud();
 	TheRadar->clearShroud();
 
-	Int playerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+	const Int playerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
 	for (int i = 0; i < m_totalCellCount; ++i)
 	{
 		Int x = m_cells[i].getCellX();
@@ -3061,12 +3074,38 @@ CellShroudStatus PartitionManager::getShroudStatusForPlayer(Int playerIndex, con
 {
 	Int x, y;
 
-	ThePartitionManager->worldToCell( loc->x, loc->y, &x, &y );
+	worldToCell( loc->x, loc->y, &x, &y );
 
 	return getShroudStatusForPlayer( playerIndex, x, y );
 }
 
 
+//-----------------------------------------------------------------------------
+ObjectShroudStatus PartitionManager::getPropShroudStatusForPlayer(Int playerIndex, const Coord3D *loc ) const
+{
+	Int x, y;
+
+	worldToCell( loc->x - m_cellSize*0.5f, loc->y - m_cellSize*0.5f, &x, &y );
+
+	CellShroudStatus cellStat = getShroudStatusForPlayer( playerIndex, x, y );
+	if (cellStat != getShroudStatusForPlayer( playerIndex, x+1, y )) {
+		return OBJECTSHROUD_PARTIAL_CLEAR;
+	}
+	if (cellStat != getShroudStatusForPlayer( playerIndex, x+1, y+1 )) {
+		return OBJECTSHROUD_PARTIAL_CLEAR;
+	}
+	if (cellStat != getShroudStatusForPlayer( playerIndex, x, y+1 )) {
+		return OBJECTSHROUD_PARTIAL_CLEAR;
+	}
+	if (cellStat == CELLSHROUD_SHROUDED) {
+		return OBJECTSHROUD_SHROUDED;
+	}
+	if (cellStat == CELLSHROUD_CLEAR) {
+		return OBJECTSHROUD_CLEAR;
+	}
+	return OBJECTSHROUD_FOGGED;
+}
+
 
 
 #ifdef FASTER_GCO
@@ -3082,22 +3121,22 @@ Int PartitionManager::calcMinRadius(const ICoord2D& cur)
 		and objects in adjacent cells can be nearly-zero distance apart!
 	*/
 	Real halfCell = m_cellSize * 0.5;
-	Coord3D centerPos[4] = 
-	{ 
-		{ -halfCell, -halfCell }, 
-		{ halfCell, -halfCell }, 
-		{ -halfCell, halfCell }, 
-		{ halfCell, halfCell } 
+	Coord3D centerPos[4] =
+	{
+		{ -halfCell, -halfCell },
+		{ halfCell, -halfCell },
+		{ -halfCell, halfCell },
+		{ halfCell, halfCell }
 	};
 
 	Real x = cur.x * m_cellSize;
 	Real y = cur.y * m_cellSize;
-	Coord3D otherPos[4] = 
-	{ 
-		{ x - halfCell, y - halfCell }, 
-		{ x + halfCell, y - halfCell }, 
-		{ x - halfCell, y + halfCell }, 
-		{ x + halfCell, y + halfCell } 
+	Coord3D otherPos[4] =
+	{
+		{ x - halfCell, y - halfCell },
+		{ x + halfCell, y - halfCell },
+		{ x - halfCell, y + halfCell },
+		{ x + halfCell, y + halfCell }
 	};
 
 	/*
@@ -3139,9 +3178,9 @@ void PartitionManager::calcRadiusVec()
 	double dx = (double)cx * (double)cellSize;
 	double dy = (double)cy * (double)cellSize;
 	double maxPossibleDist = sqrt(dx*dx + dy*dy);
-	
+
 	m_maxGcoRadius = REAL_TO_INT_CEIL(maxPossibleDist / cellSize);
-	
+
 	m_radiusVec.clear();
 	m_radiusVec.resize(m_maxGcoRadius+1, OffsetVec());
 
@@ -3155,20 +3194,20 @@ void PartitionManager::calcRadiusVec()
 				contain objects that are <= (curRadius * cellSize) distance away from cell (0,0).
 			*/
 			Int curRadius = calcMinRadius(cur);
-			DEBUG_ASSERTCRASH(curRadius <= m_maxGcoRadius, ("expected max of %d but got %d\n",m_maxGcoRadius,curRadius));
+			DEBUG_ASSERTCRASH(curRadius <= m_maxGcoRadius, ("expected max of %d but got %d",m_maxGcoRadius,curRadius));
 			if (curRadius <= m_maxGcoRadius)
 				m_radiusVec[curRadius].push_back(cur);
 		}
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	Int total = 0;
 	for (Int i = 0; i <= m_maxGcoRadius; ++i)
 	{
 		total += m_radiusVec[i].size();
-		//DEBUG_LOG(("radius %d has %d entries\n",i,m_radiusVec[i].size()));
+		//DEBUG_LOG(("radius %d has %d entries",i,m_radiusVec[i].size()));
 	}
-	DEBUG_ASSERTCRASH(total == (cx*2-1)*(cy*2-1),("expected %d, got %d\n",(cx*2-1)*(cy*2-1),total));
+	DEBUG_ASSERTCRASH(total == (cx*2-1)*(cy*2-1),("expected %d, got %d",(cx*2-1)*(cy*2-1),total));
 #endif
 
 }
@@ -3177,11 +3216,11 @@ void PartitionManager::calcRadiusVec()
 //-----------------------------------------------------------------------------
 //DECLARE_PERF_TIMER(getClosestObjects)
 Object *PartitionManager::getClosestObjects(
-	const Object *obj, 
-	const Coord3D *pos, 
-	Real maxDist, 
-	DistanceCalculationType dc, 
-	PartitionFilter **filters, 
+	const Object *obj,
+	const Coord3D *pos,
+	Real maxDist,
+	DistanceCalculationType dc,
+	PartitionFilter **filters,
 	SimpleObjectIterator *iterArg,	// if nonnull, append ALL satisfactory objects to the iterator (not just the single closest)
 	Real *closestDistArg,
 	Coord3D *closestVecArg
@@ -3202,7 +3241,7 @@ Object *PartitionManager::getClosestObjects(
 	Int64 startTime64;
 	GetPrecisionTimer(&startTime64);
 #endif
-	
+
 #ifdef RTS_DEBUG
 	static Int theEntrancyCount = 0;
 	DEBUG_ASSERTCRASH(theEntrancyCount == 0, ("sorry, this routine is not reentrant"));
@@ -3215,7 +3254,7 @@ Object *PartitionManager::getClosestObjects(
 
 	const Coord3D *objPos;
 	const Object *objToUse;
-	if (pos) 
+	if (pos)
 	{
 		objPos = pos;
 		objToUse = NULL;
@@ -3231,6 +3270,11 @@ Object *PartitionManager::getClosestObjects(
 	Object* closestObj = NULL;
 	Real closestDistSqr = maxDist * maxDist;	// if it's not closer than this, we shouldn't consider it anyway...
 	Coord3D closestVec;
+#if !RETAIL_COMPATIBLE_CRC // TheSuperHackers @info This should be safe to initialize because it is unused, but let us be extra safe for now.
+	closestVec.x = maxDist;
+	closestVec.y = maxDist;
+	closestVec.z = maxDist;
+#endif
 
 #ifdef FASTER_GCO
 
@@ -3277,7 +3321,7 @@ Object *PartitionManager::getClosestObjects(
 				Object *thisObj = thisMod->getObject();
 
 				// never compare against ourself.
-				if (thisObj == obj || thisObj == NULL) 
+				if (thisObj == obj || thisObj == NULL)
 					continue;
 
 				// since an object can exist in multiple COIs, we use this to avoid processing
@@ -3285,7 +3329,7 @@ Object *PartitionManager::getClosestObjects(
 				if (thisMod->friend_getDoneFlag() == theIterFlag)
 					continue;
 				thisMod->friend_setDoneFlag(theIterFlag);
-			
+
 				Real thisDistSqr;
 				Coord3D distVec;
 				if (!(*distProc)(objPos, objToUse, thisObj->getPosition(), thisObj, thisDistSqr, distVec, closestDistSqr))
@@ -3311,15 +3355,15 @@ Object *PartitionManager::getClosestObjects(
 
 					if (!foundAny)
 					{
-						// if not adding to iterArg, we want to stop once we have the closest object. 
+						// if not adding to iterArg, we want to stop once we have the closest object.
 						maxRadiusLimit = curRadius;
 					}
 					foundAny = true;
 				}
 
-			} // next coi
-		}	// next cell in this radius
-  } // next radius
+			}
+		}
+  }
 
 #else // not FASTER_GCO
 
@@ -3346,20 +3390,20 @@ Object *PartitionManager::getClosestObjects(
 		for (CellAndObjectIntersection *thisCoi = thisCell->getFirstCoiInCell(); thisCoi; thisCoi = nextCoi)
 		{
 			nextCoi = thisCoi->getNextCoi();
-		
+
 			PartitionData *thisMod = thisCoi->getModule();
 
 			Object *thisObj = thisMod->getObject();
 
 			// never compare against ourself.
-			if (thisObj == obj) 
+			if (thisObj == obj)
 				continue;
 
 			if (thisMod->friend_getDoneFlag() == theIterFlag)
 				continue;
 
 			thisMod->friend_setDoneFlag(theIterFlag);
-		
+
 			// hmm, ok, calc the distance.
 			Real thisDistSqr;
 			Coord3D distVec;
@@ -3383,7 +3427,7 @@ Object *PartitionManager::getClosestObjects(
 
 				if (!foundAny)
 				{
-					// if not adding to iterArg, we want to stop once we have the closest object. 
+					// if not adding to iterArg, we want to stop once we have the closest object.
 					// since all objects in this radius (and the next radius, due to slop) might
 					// be slightly closer, we still have to check all of them. so set the termination
 					// radius to be our-current-radius-plus-1. (if we ARE adding to the iterArg, we skip
@@ -3394,7 +3438,7 @@ Object *PartitionManager::getClosestObjects(
 			}
 		}
 	}
-	
+
 #endif  // not FASTER_GCO
 
 	if (closestVecArg)
@@ -3423,10 +3467,10 @@ Object *PartitionManager::getClosestObjects(
 
 //-----------------------------------------------------------------------------
 Object *PartitionManager::getClosestObject(
-	const Object *obj, 
-	Real maxDist, 
-	DistanceCalculationType dc, 
-	PartitionFilter **filters, 
+	const Object *obj,
+	Real maxDist,
+	DistanceCalculationType dc,
+	PartitionFilter **filters,
 	Real *closestDist,
 	Coord3D *closestDistVec
 )
@@ -3436,10 +3480,10 @@ Object *PartitionManager::getClosestObject(
 
 //-----------------------------------------------------------------------------
 Object *PartitionManager::getClosestObject(
-	const Coord3D *pos, 
-	Real maxDist, 
-	DistanceCalculationType dc, 
-	PartitionFilter **filters, 
+	const Coord3D *pos,
+	Real maxDist,
+	DistanceCalculationType dc,
+	PartitionFilter **filters,
 	Real *closestDist,
 	Coord3D *closestDistVec
 )
@@ -3523,7 +3567,7 @@ Real PartitionManager::getRelativeAngle2D( const Object *obj, const Object *othe
 Real PartitionManager::getRelativeAngle2D( const Object *obj, const Coord3D *pos )
 {
 	Coord3D v;
-	
+
 	// compute vector to given position
 	Coord3D objPos = *obj->getPosition();
 	v.x = pos->x - objPos.x;
@@ -3570,10 +3614,10 @@ Real PartitionManager::getRelativeAngle2D( const Object *obj, const Coord3D *pos
 
 //-----------------------------------------------------------------------------
 SimpleObjectIterator *PartitionManager::iterateObjectsInRange(
-	const Object *obj, 
-	Real maxDist, 
-	DistanceCalculationType dc, 
-	PartitionFilter **filters, 
+	const Object *obj,
+	Real maxDist,
+	DistanceCalculationType dc,
+	PartitionFilter **filters,
 	IterOrderType order
 )
 {
@@ -3590,10 +3634,10 @@ SimpleObjectIterator *PartitionManager::iterateObjectsInRange(
 
 //-----------------------------------------------------------------------------
 SimpleObjectIterator *PartitionManager::iterateObjectsInRange(
-	const Coord3D *pos, 
-	Real maxDist, 
-	DistanceCalculationType dc, 
-	PartitionFilter **filters, 
+	const Coord3D *pos,
+	Real maxDist,
+	DistanceCalculationType dc,
+	PartitionFilter **filters,
 	IterOrderType order
 )
 {
@@ -3610,12 +3654,12 @@ SimpleObjectIterator *PartitionManager::iterateObjectsInRange(
 
 //-----------------------------------------------------------------------------
 SimpleObjectIterator* PartitionManager::iteratePotentialCollisions(
-	const Coord3D* pos, 
+	const Coord3D* pos,
 	const GeometryInfo& geom,
 	Real angle,
 	Bool use2D
 )
-{	
+{
 	Real maxDist = geom.getBoundingSphereRadius();
 	maxDist *= 1.1f;	// just a little slop
 
@@ -3750,18 +3794,18 @@ Bool PartitionManager::tryPosition( const Coord3D *center,
 		else if( isUnderwater == TRUE && layer == LAYER_GROUND )
 			return FALSE;
 
-	}  // end if
+	}
 
 	// object checks
 	if( BitIsSet( options->flags, FPF_IGNORE_ALL_OBJECTS ) == FALSE )
 	{
 
 		//
-		// iterate the potential collisions at this location using a 
+		// iterate the potential collisions at this location using a
 		// very small sphere geometry around the point
 		//
 		GeometryInfo geometry( GEOMETRY_SPHERE, TRUE, 5.0f, 5.0f, 5.0f );
-		ObjectIterator *iter = ThePartitionManager->iteratePotentialCollisions( &pos, geometry, angle, true );
+		ObjectIterator *iter = iteratePotentialCollisions( &pos, geometry, angle, true );
 		MemoryPoolObjectHolder hold( iter );
 //	Bool overlap = FALSE;
 
@@ -3800,7 +3844,7 @@ Bool PartitionManager::tryPosition( const Coord3D *center,
 						them->isKindOf( KINDOF_STRUCTURE ) )
 					continue;
 
-			}  // end if, relationship checks
+			}
 
 			//
 			// if we have a source that must path to the destination we will ignore that too
@@ -3815,9 +3859,9 @@ Bool PartitionManager::tryPosition( const Coord3D *center,
 			// oops, we have overlapped something
 			return FALSE;
 
-		}  // end for, them
+		}
 
-	}  // end if
+	}
 
 	//
 	// finally ... if sourceToPathDest is valid ... the source object must be able to
@@ -3834,13 +3878,13 @@ Bool PartitionManager::tryPosition( const Coord3D *center,
 																									&pos ) == FALSE )
 				return FALSE;
 
-	}  // end if
+	}
 
 	// save result and return TRUE for position found
 	*result = pos;
 	return TRUE;
 
-}  // end tryPosition
+}
 
 //
 // the following determines how fast we expand our concentric ring search for the
@@ -3853,11 +3897,11 @@ static Real ringSpacing = 5.0f;
 	* at least minRadis away from it, but no more than maxRadius away.
 	*
 	* Return TRUE if position is found and that position is returned in 'result'
-	* return FALSE no legal position exists or invalid params 
+	* return FALSE no legal position exists or invalid params
 	*/
 //-------------------------------------------------------------------------------------------------
-Bool PartitionManager::findPositionAround( const Coord3D *center, 
-																					 const FindPositionOptions *options, 
+Bool PartitionManager::findPositionAround( const Coord3D *center,
+																					 const FindPositionOptions *options,
 																					 Coord3D *result )
 {
 
@@ -3876,7 +3920,7 @@ Bool PartitionManager::findPositionAround( const Coord3D *center,
 	// sanity, FPF_IGNORE_WATER and FPF_WATER_ONLY are mutually exclusive
 	DEBUG_ASSERTCRASH( !(BitIsSet( options->flags, FPF_IGNORE_WATER ) == TRUE &&
 										   BitIsSet( options->flags, FPF_WATER_ONLY ) == TRUE),
-										 ("PartitionManager::findPositionAround - The options FPF_WATER_ONLY and FPF_IGNORE_WATER are mutually exclusive.  You cannot use them together\n") );
+										 ("PartitionManager::findPositionAround - The options FPF_WATER_ONLY and FPF_IGNORE_WATER are mutually exclusive.  You cannot use them together") );
 
 	// pick a random angle from the center location to start at
 	Real startAngle;
@@ -3921,30 +3965,30 @@ Bool PartitionManager::findPositionAround( const Coord3D *center,
 			//
 			if( i != 0 )
 				if( tryPosition( center, dist, startAngle - angleSpacing * i, options, result ) == TRUE )
-					return TRUE;	
+					return TRUE;
 
-		}  // end if
+		}
 
-	}  // end for, dist
+	}
 
 	// no position was able to be found
 	return FALSE;
 
-}  // end findPositionAround
+}
 
 //-----------------------------------------------------------------------------
 // This is the main accessor of the shroud system.  At this level, allies are taken
 // into consideration as specified by the caller.  Look/Unlook are the ones sending Ally info, as that
 // is in Object where Allies make sense.  AddLooker literally just adds a looker for the player you specify.
-// This way, Full map reveals and Observer mode active look will not carry over to all 
+// This way, Full map reveals and Observer mode active look will not carry over to all
 // allies.  They'll use the RevealWholeDamnMap series, which call addLooker directly.
-void PartitionManager::doShroudReveal(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask) 
+void PartitionManager::doShroudReveal(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	DiscreteCircle circle(cellCenterX, cellCenterY, cellRadius);
@@ -3960,7 +4004,7 @@ void PartitionManager::doShroudReveal(Real centerX, Real centerY, Real radius, P
 		}
 	}
 }
-	
+
 //-----------------------------------------------------------------------------
 void PartitionManager::processPendingUndoShroudRevealQueue( Bool considerTimestamp )
 {
@@ -4005,13 +4049,13 @@ void PartitionManager::resetPendingUndoShroudRevealQueue()
 }
 
 //-----------------------------------------------------------------------------
-void PartitionManager::undoShroudReveal(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask) 
+void PartitionManager::undoShroudReveal(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	DiscreteCircle circle(cellCenterX, cellCenterY, cellRadius);
@@ -4025,9 +4069,9 @@ void PartitionManager::undoShroudReveal(Real centerX, Real centerY, Real radius,
 		}
 	}
 }
-	
+
 //-----------------------------------------------------------------------------
-void PartitionManager::queueUndoShroudReveal(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask) 
+void PartitionManager::queueUndoShroudReveal(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask)
 {
 	UnsignedInt now = TheGameLogic->getFrame();
 	SightingInfo *newInfo = newInstance(SightingInfo);
@@ -4040,15 +4084,15 @@ void PartitionManager::queueUndoShroudReveal(Real centerX, Real centerY, Real ra
 
 	m_pendingUndoShroudReveals.push(newInfo);
 }
-	
+
 //-----------------------------------------------------------------------------
-void PartitionManager::doShroudCover(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask) 
+void PartitionManager::doShroudCover(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	DiscreteCircle circle(cellCenterX, cellCenterY, cellRadius);
@@ -4066,13 +4110,13 @@ void PartitionManager::doShroudCover(Real centerX, Real centerY, Real radius, Pl
 }
 
 //-----------------------------------------------------------------------------
-void PartitionManager::undoShroudCover(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask) 
+void PartitionManager::undoShroudCover(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	DiscreteCircle circle(cellCenterX, cellCenterY, cellRadius);
@@ -4091,12 +4135,12 @@ void PartitionManager::undoShroudCover(Real centerX, Real centerY, Real radius,
 void PartitionManager::doThreatAffect( Real centerX, Real centerY, Real radius, UnsignedInt threatVal, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 	Real fCellCenterX = INT_TO_REAL(cellCenterX);
 	Real fCellCenterY = INT_TO_REAL(cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	Real fCellRadius = INT_TO_REAL(cellRadius + 1);
@@ -4124,12 +4168,12 @@ void PartitionManager::doThreatAffect( Real centerX, Real centerY, Real radius,
 void PartitionManager::undoThreatAffect( Real centerX, Real centerY, Real radius, UnsignedInt threatVal, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 	Real fCellCenterX = INT_TO_REAL(cellCenterX);
 	Real fCellCenterY = INT_TO_REAL(cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	Real fCellRadius = INT_TO_REAL(cellRadius + 1);
@@ -4157,12 +4201,12 @@ void PartitionManager::undoThreatAffect( Real centerX, Real centerY, Real radius
 void PartitionManager::doValueAffect( Real centerX, Real centerY, Real radius, UnsignedInt valueVal, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 	Real fCellCenterX = INT_TO_REAL(cellCenterX);
 	Real fCellCenterY = INT_TO_REAL(cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	Real fCellRadius = INT_TO_REAL(cellRadius + 1);
@@ -4190,12 +4234,12 @@ void PartitionManager::doValueAffect( Real centerX, Real centerY, Real radius, U
 void PartitionManager::undoValueAffect( Real centerX, Real centerY, Real radius, UnsignedInt valueVal, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 	Real fCellCenterX = INT_TO_REAL(cellCenterX);
 	Real fCellCenterY = INT_TO_REAL(cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	Real fCellRadius = INT_TO_REAL(cellRadius + 1);
@@ -4207,7 +4251,7 @@ void PartitionManager::undoValueAffect( Real centerX, Real centerY, Real radius,
 	parms.threatOrValue = valueVal;
 	parms.xCenter = fCellCenterX;
 	parms.yCenter = fCellCenterY;
-	
+
 	for( Int currentIndex = ThePlayerList->getPlayerCount() - 1; currentIndex >=0; currentIndex-- )
 	{
 		const Player *currentPlayer = ThePlayerList->getNthPlayer( currentIndex );
@@ -4243,7 +4287,7 @@ void PartitionManager::getCellCenterPos(Int x, Int y, Real& xx, Real& yy)
 static Int checkTerrainExtreme(PartitionCell* cell, void* userData)
 {
 	TerrainExtremeData* data = (TerrainExtremeData*)userData;
-	
+
 	data->isValid = true;
 
 	Real tmp;
@@ -4251,7 +4295,7 @@ static Int checkTerrainExtreme(PartitionCell* cell, void* userData)
 	if (data->minZ)
 	{
 		tmp = cell->getLoTerrain();
-		if (tmp < *data->minZ ) 
+		if (tmp < *data->minZ )
 		{
 			*data->minZ = tmp;
 			if (data->minZPos)
@@ -4264,7 +4308,7 @@ static Int checkTerrainExtreme(PartitionCell* cell, void* userData)
 	if (data->maxZ)
 	{
 		tmp = cell->getHiTerrain();
-		if (tmp > *data->maxZ ) 
+		if (tmp > *data->maxZ )
 		{
 			*data->maxZ = tmp;
 			if (data->maxZPos)
@@ -4358,7 +4402,7 @@ Int PartitionManager::iterateCellsAlongLine(const Coord3D& pos, const Coord3D& p
 
 	for (Int curpixel = 0; curpixel <= numpixels; curpixel++)
 	{
-		PartitionCell* cell = ThePartitionManager->getCellAt(x, y);	// might be null if off the edge
+		PartitionCell* cell = getCellAt(x, y);	// might be null if off the edge
 		DEBUG_ASSERTCRASH(cell != NULL, ("off the map"));
 		if (cell)
 		{
@@ -4377,7 +4421,7 @@ Int PartitionManager::iterateCellsAlongLine(const Coord3D& pos, const Coord3D& p
 		x += xinc2;												// Change the x as appropriate
 		y += yinc2;												// Change the y as appropriate
 	}
-	
+
 	return 0;
 }
 
@@ -4391,8 +4435,8 @@ Int PartitionManager::iterateCellsBreadthFirst(const Coord3D *pos, CellBreadthFi
 	// -1 means error, but we should add a define later for this.
 
 	Int cellX, cellY;
-	ThePartitionManager->worldToCell(pos->x, pos->y, &cellX, &cellY);
-	
+	worldToCell(pos->x, pos->y, &cellX, &cellY);
+
 	// Note, bool. not Bool, cause bool will cause this to be a bitfield.
 	std::vector<bool> bitField;
 	Int cellCount = m_cellCountX * m_cellCountY;
@@ -4468,7 +4512,7 @@ static Real calcDist2D(Real x1, Real y1, Real x2, Real y2)
 Bool PartitionManager::isClearLineOfSightTerrain(const Object* obj, const Coord3D& objPos, const Object* other, const Coord3D& otherPos)
 {
 	Coord3D pos, posOther;
-	
+
 	if (obj)
 	{
 		pos = *obj->getPosition();
@@ -4515,7 +4559,7 @@ Bool PartitionManager::isClearLineOfSightTerrain(const Object* obj, const Coord3
 
 	Real totalDist2D = calcDist2D(pos.x, pos.y, posOther.x, posOther.y);
 	Real terrainDist2D = calcDist2D(pos.x, pos.y, maxZPos.x, maxZPos.y);
-	
+
 	const Real TINY_DIST = 0.01f;
 	Real percent = (totalDist2D > TINY_DIST) ? (terrainDist2D / totalDist2D) : 0.0f;
 	if (percent < 0.0f) percent = 0.0f;
@@ -4528,7 +4572,7 @@ Bool PartitionManager::isClearLineOfSightTerrain(const Object* obj, const Coord3
 	const Real LOS_FUDGE = 0.5f;
 	if (terrainAtHighPoint > lineOfSightAtHighPoint + LOS_FUDGE)
 	{
-		//DEBUG_LOG(("isClearLineOfSightTerrain fails\n"));
+		//DEBUG_LOG(("isClearLineOfSightTerrain fails"));
 		return false;
 	}
 
@@ -4550,7 +4594,7 @@ void PartitionManager::crc( Xfer *xfer )
 		m_cells[i].crc(xfer);
 	}
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -4579,24 +4623,24 @@ void PartitionManager::xfer( Xfer *xfer )
 	if( cellSize != m_cellSize )
 	{
 
-		DEBUG_CRASH(( "Partition cell size has changed, this save game file is invalid\n" ));
+		DEBUG_CRASH(( "Partition cell size has changed, this save game file is invalid" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// cell count
 	Int totalCellCount = m_totalCellCount;
 	xfer->xferInt( &totalCellCount );
-	
+
 	// total cell count better match what we have allocated for cells in the partition manager
 	if( totalCellCount != m_totalCellCount )
 	{
 
-		DEBUG_CRASH(( "Partition total cell count mismatch %d, should be %d\n",
+		DEBUG_CRASH(( "Partition total cell count mismatch %d, should be %d",
 									totalCellCount, m_totalCellCount ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// xfer each cell information
 	PartitionCell *cell;
@@ -4609,7 +4653,7 @@ void PartitionManager::xfer( Xfer *xfer )
 		// xfer the data for this cell
 		xfer->xferSnapshot( cell );
 
-	}  // end for i
+	}
 
 	// when loading tell the partition manager to rethink and refresh all shroud information
 	if( xfer->getXferMode() == XFER_LOAD )
@@ -4621,21 +4665,21 @@ void PartitionManager::xfer( Xfer *xfer )
 		// refresh the shroud for the local player which will update the radar and everything
 		refreshShroudForLocalPlayer();
 
-	}  // end if
+	}
 
 	if( version >= 2 )
 	{
 		Int queueSize = m_pendingUndoShroudReveals.size();
 		xfer->xferInt(&queueSize);
-		// This xfer thing is still cool.  On save, I just wrote the number of elements.  On load, the first line 
+		// This xfer thing is still cool.  On save, I just wrote the number of elements.  On load, the first line
 		// above was a decoy, and the second found out the size.
 
 		if(xfer->getXferMode() == XFER_LOAD)
 		{
-			// have to remove this assert, because during load there is a setTeam call for each guy on a sub-team, and that results 
+			// have to remove this assert, because during load there is a setTeam call for each guy on a sub-team, and that results
 			// in a queued unlook, so we actually have stuff in here at the start.  I am fairly certain that setTeam should wait
 			// until loadPostProcess, but I ain't gonna change it now.
-//			DEBUG_ASSERTCRASH(m_pendingUndoShroudReveals.size() == 0, ("At load, we appear to not be in a reset state.") );
+//			DEBUG_ASSERTCRASH(m_pendingUndoShroudReveals.empty(), ("At load, we appear to not be in a reset state.") );
 
 			// I have to split this up though, since on Load I need to make new instances.
 			for( Int infoIndex = 0; infoIndex < queueSize; infoIndex++ )
@@ -4664,7 +4708,7 @@ void PartitionManager::xfer( Xfer *xfer )
 		// Version 1 save games will just not have any SightingInfos in the queue to be undone.
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4672,7 +4716,7 @@ void PartitionManager::xfer( Xfer *xfer )
 void PartitionManager::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-----------------------------------------------------------------------------
 Real PartitionManager::getGroundOrStructureHeight(Real posx, Real posy)
@@ -4701,7 +4745,7 @@ Real PartitionManager::getGroundOrStructureHeight(Real posx, Real posy)
 			tallestHeight = thisHeight;
 
 	}
-		
+
   return terrainHeightHere + tallestHeight;
 }
 
@@ -4716,10 +4760,10 @@ void PartitionManager::getMostValuableLocation( Int playerIndex, UnsignedInt whi
 		return;
 
 	Int cellCount = m_cellCountX * m_cellCountY;
-	
+
 	PlayerMaskType allPlayerMasks[MAX_PLAYER_COUNT] = { 0 };
 	Int totalPlayerCount = ThePlayerList->getPlayerCount();
-	
+
 	Int i;
 	for (i = 0; i < totalPlayerCount; ++i) {
 		Player *player = ThePlayerList->getNthPlayer(i);
@@ -4772,10 +4816,10 @@ void PartitionManager::getNearestGroupWithValue( Int playerIndex, UnsignedInt wh
 	PlayerMaskType playerMask = ThePlayerList->getPlayersWithRelationship(playerIndex, whichPlayerTypes);
 	if (playerMask == 0)
 		return;
-	
+
 	PlayerMaskType allPlayerMasks[MAX_PLAYER_COUNT] = { 0 };
 	Int totalPlayerCount = ThePlayerList->getPlayerCount();
-	
+
 	Int i;
 	for (i = 0; i < totalPlayerCount; ++i) {
 		Player *player = ThePlayerList->getNthPlayer(i);
@@ -4791,9 +4835,9 @@ void PartitionManager::getNearestGroupWithValue( Int playerIndex, UnsignedInt wh
 	parms.greaterThan = valueRequired;
 	parms.valueType = valType;
 	parms.allowedPlayersMasks = playerMask;
-	for (i = 0; i < MAX_PLAYER_COUNT; ++i) 
+	for (i = 0; i < MAX_PLAYER_COUNT; ++i)
 		parms.allPlayersMask[i] = allPlayerMasks[i];
-	
+
 	Int nearestGreat = iterateCellsBreadthFirst(sourceLocation, cellValueProc, &parms);
 	if (nearestGreat != -1) {
 		(*outLocation).x = m_cells[nearestGreat].getCellX() * TheGlobalData->m_partitionCellSize;
@@ -4812,7 +4856,7 @@ void PartitionManager::storeFoggedCells(ShroudStatusStoreRestore &outPartitionSt
 	if (storeToFog) {
 		// This is the first pass
 		outPartitionStore.m_cellsWide = m_cellCountX;
-		
+
 		// Resize all of our arrays.
 		for (p = 0; p < MAX_PLAYER_COUNT; ++p) {
 			outPartitionStore.m_foggedOrRevealed[p].resize(m_totalCellCount);
@@ -4830,12 +4874,12 @@ void PartitionManager::storeFoggedCells(ShroudStatusStoreRestore &outPartitionSt
 
 		for (j = 0; j < m_cellCountY; ++j) {
 			for (i = 0; i < m_cellCountX; ++i) {
-				UnsignedByte &byteToWrite = outPartitionStore.m_foggedOrRevealed[p][j * m_cellCountX + i]; 
+				UnsignedByte &byteToWrite = outPartitionStore.m_foggedOrRevealed[p][j * m_cellCountX + i];
 
 				if (storeToFog && m_cells[j * m_cellCountX + i].getShroudStatusForPlayer(p) == CELLSHROUD_FOGGED) {
 					byteToWrite = STORE_FOG;
 				}
-					
+
 				if (!storeToFog && m_cells[j * m_cellCountX + i].getShroudStatusForPlayer(p) == CELLSHROUD_CLEAR) {
 					byteToWrite = STORE_PERMANENTLY_REVEALED;
 				}
@@ -4891,10 +4935,10 @@ void PartitionManager::restoreFoggedCells(const ShroudStatusStoreRestore &inPart
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-PartitionFilterRejectBuildings::PartitionFilterRejectBuildings(const Object *o) : 
+PartitionFilterRejectBuildings::PartitionFilterRejectBuildings(const Object *o) :
 	m_self(o),
 	m_acquireEnemies(false)
-{ 
+{
 	// if I am a computer-controlled opponent, auto-aquire enemy buildings
 	if (m_self->getControllingPlayer()->getPlayerType() == PLAYER_COMPUTER)
 	{
@@ -4969,7 +5013,7 @@ Bool PartitionFilterInsignificantBuildings::allow( Object *other )
 			}
 		}
 		return true;
-		
+
 	} else {
 		if (m_allowNonBuildings) {
 			return true;
@@ -4988,23 +5032,23 @@ Bool PartitionFilterInsignificantBuildings::allow( Object *other )
 
 Bool PartitionFilterRepulsor::allow( Object *other )
 {
-	if (other == m_self) 
+	if (other == m_self)
 	{
 		// don't repulse yourself. :)
 		return false;
 	}
 
 	// If it's flagged, it's a repulsor.
-	if (other->testStatus(OBJECT_STATUS_REPULSOR)) 
+	if (other->testStatus(OBJECT_STATUS_REPULSOR))
 	{
 		return	true;
 	}
 
-	if (other->isEffectivelyDead()) 
+	if (other->isEffectivelyDead())
 		return false; // no dead enemies.
 
 	Relationship r = m_self->getRelationship(other);
-	if (r != ENEMIES) 
+	if (r != ENEMIES)
 	{
 		return false; // only enemies auto repulse.
 	}
@@ -5016,7 +5060,7 @@ Bool PartitionFilterRepulsor::allow( Object *other )
 			return true;
 		return false;
 	}
-	
+
 	if ( other->isKindOf( KINDOF_INERT ))
 		return false;
 
@@ -5064,7 +5108,7 @@ Bool PartitionFilterPlayerAffiliation::allow( Object *other )
 	Relationship rel = m_player->getRelationship(other->getTeam());
 	switch (rel)
 	{
-		case ENEMIES:	
+		case ENEMIES:
 			if (m_affiliation & ALLOW_ENEMIES) {
 				return m_match;
 			}
@@ -5084,7 +5128,7 @@ Bool PartitionFilterPlayerAffiliation::allow( Object *other )
 	}
 
 	if (other->getControllingPlayer() == m_player) {
-		return m_match;		
+		return m_match;
 	}
 
 	return !m_match;
@@ -5158,7 +5202,7 @@ Bool PartitionFilterWouldCollide::allow(Object *objOther)
   Bool doesCollide;
 
 	// invariant for all geometries: first do z collision check.
-	if (thisInfo.position.z + thisInfo.geom.getMaxHeightAbovePosition() >= thatInfo.position.z && 
+	if (thisInfo.position.z + thisInfo.geom.getMaxHeightAbovePosition() >= thatInfo.position.z &&
 			thisInfo.position.z <= thatInfo.position.z + thatInfo.geom.getMaxHeightAbovePosition())
 	{
 		GeometryType thisGeom = m_geom.getGeomType();
@@ -5218,7 +5262,7 @@ PartitionFilterAcceptOnTeam::PartitionFilterAcceptOnTeam(const Team *team) : m_t
 }
 
 //-----------------------------------------------------------------------------
-Bool PartitionFilterAcceptOnTeam::allow(Object *objOther) 
+Bool PartitionFilterAcceptOnTeam::allow(Object *objOther)
 {
 	// objOther is guaranteed to be non-null, so we don't need to check (srj)
 	return (objOther->getTeam() == m_team);
@@ -5338,7 +5382,7 @@ PartitionFilterPossibleToAttack::PartitionFilterPossibleToAttack(AbleToAttackTyp
 Bool PartitionFilterPossibleToAttack::allow(Object *objOther)
 {
 	// objOther is guaranteed to be non-null, so we don't need to check (srj)
-	
+
 // don't do this here... done in getAbleToAttackSpecificObject (srj)
 //	// cannot attack dead things
 //	if (objOther->isEffectivelyDead())
@@ -5351,10 +5395,8 @@ Bool PartitionFilterPossibleToAttack::allow(Object *objOther)
 //		return false;
 
 	// we should have already filtered out isAbleToAttack!
-#ifdef RTS_DEBUG
-	// disable this assert for INTERNAL builds (srj)
-	DEBUG_ASSERTCRASH(m_obj && m_obj->isAbleToAttack(), ("if the object is unable to attack at all, you should filter that out ahead of time!"));
-#endif
+	DEBUG_ASSERTCRASH(m_obj->isAbleToAttack(), ("if the object is unable to attack at all, you should filter that out ahead of time!"));
+
 	CanAttackResult result = m_obj->getAbleToAttackSpecificObject( m_attackType, objOther, m_commandSource );
 	if( result == ATTACKRESULT_POSSIBLE || result == ATTACKRESULT_POSSIBLE_AFTER_MOVING )
 	{
@@ -5368,7 +5410,7 @@ Bool PartitionFilterPossibleToAttack::allow(Object *objOther)
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-PartitionFilterLastAttackedBy::PartitionFilterLastAttackedBy(Object *obj) 
+PartitionFilterLastAttackedBy::PartitionFilterLastAttackedBy(Object *obj)
 {
 	if (obj && obj->getBodyModule()) {
 		m_lastAttackedBy = obj->getBodyModule()->getLastDamageInfo()->in.m_sourceID;
@@ -5395,7 +5437,7 @@ Bool PartitionFilterLastAttackedBy::allow(Object *other)
 
 //-----------------------------------------------------------------------------
 Bool PartitionFilterAcceptByObjectStatus::allow(Object *objOther)
-{ 
+{
 	ObjectStatusMaskType status = objOther->getStatusBits();
 	return status.testForAll( m_mustBeSet ) && status.testForNone( m_mustBeClear );
 }
@@ -5407,7 +5449,7 @@ Bool PartitionFilterAcceptByObjectStatus::allow(Object *objOther)
 
 //-----------------------------------------------------------------------------
 Bool PartitionFilterRejectByObjectStatus::allow(Object *objOther)
-{ 
+{
 	ObjectStatusMaskType status = objOther->getStatusBits();
 
 	return !( status.testForAll( m_mustBeSet ) && status.testForNone( m_mustBeClear ) );
@@ -5432,7 +5474,7 @@ Bool PartitionFilterAcceptByKindOf::allow(Object *objOther)
 //-----------------------------------------------------------------------------
 Bool PartitionFilterRejectByKindOf::allow(Object *objOther)
 {
-	return !objOther->isKindOfMulti(m_mustBeSet, m_mustBeClear); 
+	return !objOther->isKindOfMulti(m_mustBeSet, m_mustBeClear);
 }
 
 
@@ -5529,7 +5571,7 @@ static int cellValueProc(PartitionCell* cell, void* userData)
 		}
 	}
 
-	if ((val > parms->valueRequired && parms->greaterThan) || 
+	if ((val > parms->valueRequired && parms->greaterThan) ||
 			(val < parms->valueRequired && !parms->greaterThan)) {
 		return 1;
 	}
@@ -5624,7 +5666,7 @@ static void hLineAddThreat(Int x1, Int x2, Int y, void *threatValueParms)
 
 		distance = sqrt( pow(x - parms->xCenter, 2) + pow(y - parms->yCenter, 2) );
 		mulVal = 1 - distance / parms->radius;
-		if (mulVal < 0.0f) 
+		if (mulVal < 0.0f)
 			mulVal = 0.0f;
 		else if (mulVal > 1.0f)
 			mulVal = 1.0f;
@@ -5652,11 +5694,11 @@ static void hLineRemoveThreat(Int x1, Int x2, Int y, void *threatValueParms)
 
 		distance = sqrt( pow(x - parms->xCenter, 2) + pow(y - parms->yCenter, 2) );
 		mulVal = 1 - distance / parms->radius;
-		if (mulVal < 0.0f) 
+		if (mulVal < 0.0f)
 			mulVal = 0.0f;
 		else if (mulVal > 1.0f)
 			mulVal = 1.0f;
-		
+
 		cell->removeThreatValue( parms->playerIndex, REAL_TO_UNSIGNEDINT(parms->threatOrValue * mulVal) );
 	}
 }
@@ -5680,11 +5722,11 @@ static void hLineAddValue(Int x1, Int x2, Int y, void *threatValueParms)
 
 		distance = sqrt( pow(x - parms->xCenter, 2) + pow(y - parms->yCenter, 2) );
 		mulVal = 1 - distance / parms->radius;
-		if (mulVal < 0.0f) 
+		if (mulVal < 0.0f)
 			mulVal = 0.0f;
 		else if (mulVal > 1.0f)
 			mulVal = 1.0f;
-		
+
 		cell->addCashValue( parms->playerIndex, REAL_TO_UNSIGNEDINT(parms->threatOrValue * mulVal) );
 	}
 }
@@ -5708,7 +5750,7 @@ static void hLineRemoveValue(Int x1, Int x2, Int y, void *threatValueParms)
 
 		distance = sqrt( pow(x - parms->xCenter, 2) + pow(y - parms->yCenter, 2) );
 		mulVal = 1 - distance / parms->radius;
-		if (mulVal < 0.0f) 
+		if (mulVal < 0.0f)
 			mulVal = 0.0f;
 		else if (mulVal > 1.0f)
 			mulVal = 1.0f;
@@ -5719,7 +5761,7 @@ static void hLineRemoveValue(Int x1, Int x2, Int y, void *threatValueParms)
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-SightingInfo::SightingInfo() 
+SightingInfo::SightingInfo()
 {
 	reset();
 }
@@ -5748,7 +5790,7 @@ Bool SightingInfo::isInvalid() const
 void SightingInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -5775,7 +5817,7 @@ void SightingInfo::xfer( Xfer *xfer )
 	// how much
 	xfer->xferUnsignedInt( &m_data );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -5783,11 +5825,11 @@ void SightingInfo::xfer( Xfer *xfer )
 void SightingInfo::loadPostProcess()
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 SightingInfo::~SightingInfo()
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SimpleObjectIterator.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SimpleObjectIterator.cpp
index 74d5e629c64..78ae8a60632 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/SimpleObjectIterator.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SimpleObjectIterator.cpp
@@ -25,7 +25,7 @@
 // SimpleObjectIterator
 // Implementation of a simple object iterator
 // Author: Steven Johnson, September 2001
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameLogic/ObjectIter.h"
 
@@ -35,8 +35,8 @@
 
 /// @todo Doxygenize this file
 
-SimpleObjectIterator::ClumpCompareProc SimpleObjectIterator::theClumpCompareProcs[] = 
-{ 
+SimpleObjectIterator::ClumpCompareProc SimpleObjectIterator::theClumpCompareProcs[] =
+{
 	NULL,						// "fastest" gets no proc
 	SimpleObjectIterator::sortNearToFar,
 	SimpleObjectIterator::sortFarToNear,
@@ -99,7 +99,7 @@ Object *SimpleObjectIterator::nextWithNumeric(Real *num)
 			*num = m_curClump->m_numeric;
 		m_curClump = m_curClump->m_nextClump;
 	}
-		
+
 	return obj;
 }
 
@@ -134,10 +134,10 @@ void SimpleObjectIterator::sort(IterOrderType order)
 
 #ifdef INTENSE_DEBUG
 {
-	DEBUG_LOG(("\n\n---------- BEFORE sort for %d -----------\n",order));
+	DEBUG_LOG(("\n\n---------- BEFORE sort for %d -----------",order));
 	for (Clump *p = m_firstClump; p; p = p->m_nextClump)
 	{
-		DEBUG_LOG(("    obj %08lx numeric %f\n",p->m_obj,p->m_numeric));
+		DEBUG_LOG(("    obj %08lx numeric %f",p->m_obj,p->m_numeric));
 	}
 }
 #endif
@@ -150,7 +150,7 @@ void SimpleObjectIterator::sort(IterOrderType order)
 	// do a basic mergesort, which works nicely for linked lists,
 	// and is reasonably efficient (N log N).
 
-  for ( Int n = 1 ; ; n *= 2 ) 
+  for ( Int n = 1 ; ; n *= 2 )
 	{
 		Clump *to_do = m_firstClump;
 		Clump *tail = NULL;
@@ -158,19 +158,19 @@ void SimpleObjectIterator::sort(IterOrderType order)
 
 		Int mergeCount = 0;
 
-		while (to_do) 
+		while (to_do)
 		{
 			++mergeCount;
 
 			Int to_do_count = 0;
-			
+
 			// make two lists of length 'n' (to_do is one, sub is the other)
 			Clump *sub = to_do;
-			for (Int i = 0; i < n; i++) 
+			for (Int i = 0; i < n; i++)
 			{
 				++to_do_count;
 				sub = sub->m_nextClump;
-				if (!sub) 
+				if (!sub)
 					break;
 			}
 			Int subCount = sub ? n : 0;
@@ -180,44 +180,44 @@ void SimpleObjectIterator::sort(IterOrderType order)
 			while (to_do_count + subCount > 0) {
 
 				DEBUG_ASSERTCRASH(to_do_count + subCount >= 0, ("uhoh"));
-	
+
 				Clump *tmp;
-				
+
 				// bleah, coalesce into more elegant test case
 				if (subCount == 0)
 				{
 					DEBUG_ASSERTCRASH(to_do_count > 0, ("hmm, expected nonzero to_do_count"));
-					tmp = to_do; 
-					to_do = to_do->m_nextClump; 
+					tmp = to_do;
+					to_do = to_do->m_nextClump;
 					--to_do_count;
 				}
 				else if (to_do_count == 0)
 				{
 					DEBUG_ASSERTCRASH(subCount > 0, ("hmm, expected nonzero subCount"));
-					tmp = sub; 
-					sub = sub->m_nextClump; 
+					tmp = sub;
+					sub = sub->m_nextClump;
 					--subCount;
-				} 
-				else if ((*cmpProc)(to_do, sub) <= 0.0f) 
+				}
+				else if ((*cmpProc)(to_do, sub) <= 0.0f)
 				{
 					DEBUG_ASSERTCRASH(to_do_count > 0, ("hmm, expected nonzero to_do_count"));
-					tmp = to_do; 
-					to_do = to_do->m_nextClump; 
+					tmp = to_do;
+					to_do = to_do->m_nextClump;
 					--to_do_count;
-				} 
-				else 
+				}
+				else
 				{
 					DEBUG_ASSERTCRASH(subCount > 0, ("hmm, expected nonzero subCount"));
-					tmp = sub; 
-					sub = sub->m_nextClump; 
+					tmp = sub;
+					sub = sub->m_nextClump;
 					--subCount;
 				}
 				if (!sub) subCount = 0;
 				if (!to_do) to_do_count = 0;
 
-				if (tail) 
+				if (tail)
 					tail->m_nextClump = tmp;
-				else 
+				else
 					m_firstClump = tmp;
 				tail = tmp;
 			}
@@ -233,10 +233,10 @@ void SimpleObjectIterator::sort(IterOrderType order)
 
 #ifdef INTENSE_DEBUG
 {
-	DEBUG_LOG(("\n\n---------- sort for %d -----------\n",order));
+	DEBUG_LOG(("\n\n---------- sort for %d -----------",order));
 	for (Clump *p = m_firstClump; p; p = p->m_nextClump)
 	{
-		DEBUG_LOG(("    obj %08lx numeric %f\n",p->m_obj,p->m_numeric));
+		DEBUG_LOG(("    obj %08lx numeric %f",p->m_obj,p->m_numeric));
 	}
 }
 #endif
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/BaikonurLaunchPower.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/BaikonurLaunchPower.cpp
index 2cea6d5d2e7..43d4850f732 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/BaikonurLaunchPower.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/BaikonurLaunchPower.cpp
@@ -24,12 +24,12 @@
 
 // FILE: BaikonurLaunchPower.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	November 2002
@@ -43,7 +43,7 @@
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingFactory.h"
@@ -61,15 +61,15 @@ BaikonurLaunchPowerModuleData::BaikonurLaunchPowerModuleData( void )
 /*static*/ void BaikonurLaunchPowerModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 	SpecialPowerModuleData::buildFieldParse( p );
-	
-	static const FieldParse dataFieldParse[] = 
+
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DetonationObject", INI::parseAsciiString, NULL, offsetof( BaikonurLaunchPowerModuleData, m_detonationObject ) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
-	
-}  // end buildFieldParse
+
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ BaikonurLaunchPower::BaikonurLaunchPower( Thing *thing, const ModuleData *module
 BaikonurLaunchPower::~BaikonurLaunchPower( void )
 {
 
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 void BaikonurLaunchPower::doSpecialPower( UnsignedInt commandOptions )
@@ -95,7 +95,7 @@ void BaikonurLaunchPower::doSpecialPower( UnsignedInt commandOptions )
 	SpecialPowerModule::doSpecialPower( commandOptions );
 
 	getObject()->setModelConditionState( MODELCONDITION_DOOR_1_OPENING );
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 void BaikonurLaunchPower::doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions )
@@ -118,7 +118,7 @@ void BaikonurLaunchPower::doSpecialPowerAtLocation( const Coord3D *loc, Real ang
 			detonation->setPosition( loc );
 		}
 	}
-}  
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -130,7 +130,7 @@ void BaikonurLaunchPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -148,7 +148,7 @@ void BaikonurLaunchPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -159,4 +159,4 @@ void BaikonurLaunchPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashBountyPower.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashBountyPower.cpp
index 61b52f6dff6..1e6bd51e3b8 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashBountyPower.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashBountyPower.cpp
@@ -24,12 +24,12 @@
 
 // FILE: CashBountyPower.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	CashBountyPower.cpp
 //
 //	author:		Steven Johnson
-//	
+//
 //	purpose:
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -49,7 +49,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -77,7 +77,7 @@ CashBountyPowerModuleData::CashBountyPowerModuleData()
 	m_upgrades.clear();
 #endif
 	m_defaultBounty = 0.0;
-} 
+}
 
 #ifdef NOT_IN_USE
 //-------------------------------------------------------------------------------------------------
@@ -91,7 +91,7 @@ static void parseBountyUpgradePair( INI* ini, void * /*instance*/, void *store,
 
 	std::vector<CashBountyPowerModuleData::Upgrades>* s = (std::vector<CashBountyPowerModuleData::Upgrades>*)store;
 	s->push_back(up);
-} 
+}
 #endif
 
 //-------------------------------------------------------------------------------------------------
@@ -100,17 +100,17 @@ static void parseBountyUpgradePair( INI* ini, void * /*instance*/, void *store,
 {
 	SpecialPowerModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 #ifdef NOT_IN_USE
 		{ "UpgradeBounty", parseBountyUpgradePair, NULL, offsetof( CashBountyPowerModuleData, m_upgrades ) },
 #endif
 		{ "Bounty",			INI::parsePercentToReal, NULL, offsetof( CashBountyPowerModuleData, m_defaultBounty ) },
-		{ 0, 0, 0, 0 } 
+		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -118,17 +118,17 @@ static void parseBountyUpgradePair( INI* ini, void * /*instance*/, void *store,
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-CashBountyPower::CashBountyPower( Thing *thing, const ModuleData* moduleData ) : 
+CashBountyPower::CashBountyPower( Thing *thing, const ModuleData* moduleData ) :
 							SpecialPowerModule( thing, moduleData )
 {
-}  // end CashBountyPower
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 CashBountyPower::~CashBountyPower()
 {
 
-}  // end ~CashBountyPower
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -152,7 +152,7 @@ Real CashBountyPower::findBounty() const
 	const Player* controller = getObject()->getControllingPlayer();
 	if (controller != NULL)
 	{
-		for (std::vector<CashBountyPowerModuleData::Upgrades>::const_iterator it = d->m_upgrades.begin(); 
+		for (std::vector<CashBountyPowerModuleData::Upgrades>::const_iterator it = d->m_upgrades.begin();
 					it != d->m_upgrades.end();
 					++it)
 		{
@@ -188,7 +188,7 @@ void CashBountyPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -206,7 +206,7 @@ void CashBountyPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -217,4 +217,4 @@ void CashBountyPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashHackSpecialPower.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashHackSpecialPower.cpp
index b1bd94370ff..82b94e1a754 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashHackSpecialPower.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashHackSpecialPower.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Team.h"
@@ -58,23 +58,23 @@ static void parseCashHackUpgradePair( INI* ini, void * /*instance*/, void *store
 
 	std::vector<CashHackSpecialPowerModuleData::Upgrades>* s = (std::vector<CashHackSpecialPowerModuleData::Upgrades>*)store;
 	s->push_back(up);
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 /*static*/ void CashHackSpecialPowerModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 	SpecialPowerModuleData::buildFieldParse( p );
-	
-	static const FieldParse dataFieldParse[] = 
+
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "UpgradeMoneyAmount", parseCashHackUpgradePair, NULL, offsetof( CashHackSpecialPowerModuleData, m_upgrades ) },
 		{ "MoneyAmount", INI::parseInt, NULL, offsetof( CashHackSpecialPowerModuleData, m_defaultAmountToSteal ) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
-	
-}  // end buildFieldParse
+
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -86,14 +86,14 @@ CashHackSpecialPower::CashHackSpecialPower( Thing *thing, const ModuleData *modu
 												: SpecialPowerModule( thing, moduleData )
 {
 
-}  // end CashHackSpecialPower
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 CashHackSpecialPower::~CashHackSpecialPower( void )
 {
 
-}  // end ~CashHackSpecialPower
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -104,7 +104,7 @@ void CashHackSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real an
 
 	// only allowed at objects
 	return;
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -114,7 +114,7 @@ Int CashHackSpecialPower::findAmountToSteal() const
 	const Player* controller = getObject()->getControllingPlayer();
 	if (controller != NULL)
 	{
-		for (std::vector<CashHackSpecialPowerModuleData::Upgrades>::const_iterator it = d->m_upgrades.begin(); 
+		for (std::vector<CashHackSpecialPowerModuleData::Upgrades>::const_iterator it = d->m_upgrades.begin();
 					it != d->m_upgrades.end();
 					++it)
 		{
@@ -166,7 +166,7 @@ void CashHackSpecialPower::doSpecialPowerAtObject( Object *victim, UnsignedInt c
 			pos.add( self->getPosition() );
 			pos.z += 20.0f; //add a little z to make it show up above the unit.
 			TheInGameUI->addFloatingText( moneyString, &pos, GameMakeColor( 0, 255, 0, 255 ) );
-		
+
 			//Display cash lost floating over the target
 			moneyString.format( TheGameText->fetch( "GUI:LoseCash" ), cash );
 			pos.zero();
@@ -176,7 +176,7 @@ void CashHackSpecialPower::doSpecialPowerAtObject( Object *victim, UnsignedInt c
 		}
 	}
 
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -187,7 +187,7 @@ void CashHackSpecialPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -205,7 +205,7 @@ void CashHackSpecialPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -216,4 +216,4 @@ void CashHackSpecialPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CleanupAreaPower.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CleanupAreaPower.cpp
index cb9851027e1..dfa42864475 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CleanupAreaPower.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CleanupAreaPower.cpp
@@ -24,25 +24,25 @@
 
 // FILE: CleanupAreaPower.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	September 2002
 //
 //	Author:		Kris Morness
-//	
-//  Makes use of the cleanup hazard update by augmenting the cleanup range 
+//
+//  Makes use of the cleanup hazard update by augmenting the cleanup range
 //  until there is nothing left to cleanup at which time it goes idle.
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingTemplate.h"
@@ -55,21 +55,21 @@
 CleanupAreaPowerModuleData::CleanupAreaPowerModuleData()
 {
 	m_cleanupMoveRange = 0.0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void CleanupAreaPowerModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 	SpecialPowerModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MaxMoveDistanceFromLocation",			INI::parseReal, NULL, offsetof( CleanupAreaPowerModuleData, m_cleanupMoveRange ) },
-		{ 0, 0, 0, 0 } 
+		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 //-------------------------------------------------------------------------------------------------
 CleanupAreaPower::CleanupAreaPower( Thing *thing, const ModuleData* moduleData ) : SpecialPowerModule( thing, moduleData )
@@ -113,12 +113,12 @@ void CleanupAreaPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 //-------------------------------------------------------------------------------------------------
 // Xfer method
 // Version Info:
-// 1: Initial version 
+// 1: Initial version
 //-------------------------------------------------------------------------------------------------
 void CleanupAreaPower::xfer( Xfer *xfer )
 {
@@ -131,7 +131,7 @@ void CleanupAreaPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 //-------------------------------------------------------------------------------------------------
 void CleanupAreaPower::loadPostProcess( void )
@@ -140,4 +140,4 @@ void CleanupAreaPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DefectorSpecialPower.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DefectorSpecialPower.cpp
index 2edbcf596fb..d6f6ec27422 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DefectorSpecialPower.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DefectorSpecialPower.cpp
@@ -24,14 +24,14 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //
-// FILE: DefectorSpecialPower.cpp 
+// FILE: DefectorSpecialPower.cpp
 // Author: Mark Lorenzen, JULY 2002
 // Desc:   General can click command cursor on any enemy, and it becomes his
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/SpecialPower.h"
@@ -48,7 +48,7 @@ DefectorSpecialPowerModuleData::DefectorSpecialPowerModuleData( void )
 
 	m_fatCursorRadius = 0.0f;
 
-}  // end DefectorSpecialPowerModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -58,15 +58,15 @@ DefectorSpecialPowerModuleData::DefectorSpecialPowerModuleData( void )
  void DefectorSpecialPowerModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 	SpecialPowerModuleData::buildFieldParse( p );
-	
-	static const FieldParse dataFieldParse[] = 
+
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "FatCursorRadius", INI::parseReal, NULL, offsetof( DefectorSpecialPowerModuleData, m_fatCursorRadius ) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
-	
-}  // end buildFieldParse
+
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -78,16 +78,16 @@ DefectorSpecialPower::DefectorSpecialPower( Thing *thing, const ModuleData *modu
 												: SpecialPowerModule( thing, moduleData )
 {
 
-}  // end DefectorSpecialPower
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 DefectorSpecialPower::~DefectorSpecialPower( void )
 {
 
-}  // end ~DefectorSpecialPower
+}
+
 
- 
 // ------------------------------------------------------------------------------------------------
 
 void DefectorSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions )
@@ -123,7 +123,7 @@ void DefectorSpecialPower::doSpecialPowerAtObject( Object *objectToMakeDefector,
 
 	//AIUpdateInterface *hisAI = objectToMakeDefector->getAIUpdateInterface();
 	//if (hisAI)
-	//{			
+	//{
 		// how do I get at SpecialPowerTemplate::getDetectionTime() from here?
 		const SpecialPowerTemplate *specPowTemp = getSpecialPowerTemplate();
 		UnsignedInt time = specPowTemp->getDetectionTime();
@@ -132,7 +132,7 @@ void DefectorSpecialPower::doSpecialPowerAtObject( Object *objectToMakeDefector,
 		objectToMakeDefector->defect(self->getControllingPlayer()->getDefaultTeam(), time );// @todo lorenzen hook into the new AIUpdateI methods
 	//}
 
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -143,7 +143,7 @@ void DefectorSpecialPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -161,7 +161,7 @@ void DefectorSpecialPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -172,4 +172,4 @@ void DefectorSpecialPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DemoralizeSpecialPower.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DemoralizeSpecialPower.cpp
index 8665ec52120..3ebffaddd19 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DemoralizeSpecialPower.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DemoralizeSpecialPower.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #ifdef ALLOW_DEMORALIZE
 
@@ -54,15 +54,15 @@ DemoralizeSpecialPowerModuleData::DemoralizeSpecialPowerModuleData( void )
 	m_maxDurationInFrames = 0;
 	m_fxList = NULL;
 
-}  // end DemoralizeSpecialPowerModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void DemoralizeSpecialPowerModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
 	SpecialPowerModuleData::buildFieldParse( p );
-	
-	static const FieldParse dataFieldParse[] = 
+
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "BaseRange",									INI::parseReal,			NULL,			offsetof( DemoralizeSpecialPowerModuleData, m_baseRange ) },
 		{ "BonusRangePerCaptured",			INI::parseReal,			NULL,			offsetof( DemoralizeSpecialPowerModuleData, m_bonusRangePerCaptured ) },
@@ -74,8 +74,8 @@ void DemoralizeSpecialPowerModuleData::buildFieldParse( MultiIniFieldParse &p )
 		{ 0, 0, 0, 0 }
 	};
 	p.add( dataFieldParse );
-	
-}  // end buildFieldParse
+
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -87,14 +87,14 @@ DemoralizeSpecialPower::DemoralizeSpecialPower( Thing *thing, const ModuleData *
 												: SpecialPowerModule( thing, moduleData )
 {
 
-}  // end DemoralizeSpecialPower
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 DemoralizeSpecialPower::~DemoralizeSpecialPower( void )
 {
 
-}  // end ~DemoralizeSpecialPower
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -132,7 +132,7 @@ void DemoralizeSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real
 		// cap at the max
 		if( duration > modData->m_maxDurationInFrames )
 			duration = modData->m_maxDurationInFrames;
-					
+
 		// increase the range for every prisoner we got
 		range += contain->getContainCount() * modData->m_bonusRangePerCaptured;
 
@@ -140,7 +140,7 @@ void DemoralizeSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real
 		if( range > modData->m_maxRange )
 			range = modData->m_maxRange;
 
-	}  // end if
+	}
 
 	// scan the objects in the area range and demoralize them
 	PartitionFilterRelationship filter1( source, PartitionFilterRelationship::ALLOW_ENEMIES |
@@ -164,18 +164,18 @@ void DemoralizeSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real
 		if( ai )
 			ai->setDemoralized( duration );
 
-	}  // end for obj
+	}
 
 	// play an effect at the destination location
 	if( modData->m_fxList )
 	{
-	
+
 		// execute FX
 		FXList::doFXPos( modData->m_fxList, loc );
 
-	}  // end if
-		
-}    // end doSpecialPowerAtLocation
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -187,7 +187,7 @@ void DemoralizeSpecialPower::doSpecialPowerAtObject( const Object *obj, Real ang
 	if( obj )
 		doSpecialPowerAtLocation( obj->getPosition(), angle, commandOptions );
 
-}  // end doSpecialPowerAtObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -198,7 +198,7 @@ void DemoralizeSpecialPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -216,7 +216,7 @@ void DemoralizeSpecialPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -227,7 +227,7 @@ void DemoralizeSpecialPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 #endif	// #ifdef ALLOW_DEMORALIZE
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp
index ed5006c1966..0e70351b04e 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/RandomValue.h"
@@ -43,18 +43,13 @@
 // MODULE DATA ////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
-enum 
+enum
 {
 	CREATE_ABOVE_LOCATION_HEIGHT = 300
 };
 
-static const char* TheOCLCreateLocTypeNames[] =
+static const char* const TheOCLCreateLocTypeNames[] =
 {
 	"CREATE_AT_EDGE_NEAR_SOURCE",
 	"CREATE_AT_EDGE_NEAR_TARGET",
@@ -64,6 +59,7 @@ static const char* TheOCLCreateLocTypeNames[] =
 	"CREATE_AT_EDGE_FARTHEST_FROM_TARGET",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheOCLCreateLocTypeNames) == OCL_CREATE_LOC_COUNT + 1, "Incorrect array size");
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -85,7 +81,7 @@ static void parseOCLUpgradePair( INI* ini, void * /*instance*/, void *store, con
 
 	std::vector<OCLSpecialPowerModuleData::Upgrades>* s = (std::vector<OCLSpecialPowerModuleData::Upgrades>*)store;
 	s->push_back(up);
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -93,7 +89,7 @@ static void parseOCLUpgradePair( INI* ini, void * /*instance*/, void *store, con
 {
 	SpecialPowerModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "UpgradeOCL", parseOCLUpgradePair, NULL, offsetof( OCLSpecialPowerModuleData, m_upgradeOCL ) },
 		{ "OCL", INI::parseObjectCreationList, NULL, offsetof( OCLSpecialPowerModuleData, m_defaultOCL ) },
@@ -114,7 +110,7 @@ OCLSpecialPower::OCLSpecialPower( Thing *thing, const ModuleData *moduleData )
 							 : SpecialPowerModule( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -124,7 +120,7 @@ const ObjectCreationList* OCLSpecialPower::findOCL() const
 	const Player* controller = getObject()->getControllingPlayer();
 	if (controller != NULL)
 	{
-		for (std::vector<OCLSpecialPowerModuleData::Upgrades>::const_iterator it = d->m_upgradeOCL.begin(); 
+		for (std::vector<OCLSpecialPowerModuleData::Upgrades>::const_iterator it = d->m_upgradeOCL.begin();
 					it != d->m_upgradeOCL.end();
 					++it)
 		{
@@ -195,7 +191,7 @@ void OCLSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real angle,
 			ObjectCreationList::create( ocl, getObject(), &creationCoord, loc );
 			break;
 	}
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -208,7 +204,7 @@ void OCLSpecialPower::doSpecialPowerAtObject( Object *obj, UnsignedInt commandOp
 	if( !obj )
 		return;
 	doSpecialPowerAtLocation( obj->getPosition(), INVALID_ANGLE, commandOptions );
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 void OCLSpecialPower::doSpecialPower( UnsignedInt commandOptions )
@@ -218,7 +214,7 @@ void OCLSpecialPower::doSpecialPower( UnsignedInt commandOptions )
 
 	Coord3D creationCoord;
 	creationCoord.set( getObject()->getPosition() );
-	
+
 	// call the base class action cause we are *EXTENDING* functionality
 	SpecialPowerModule::doSpecialPowerAtLocation( &creationCoord, INVALID_ANGLE, commandOptions );
 
@@ -235,7 +231,7 @@ void OCLSpecialPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -253,7 +249,7 @@ void OCLSpecialPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -264,4 +260,4 @@ void OCLSpecialPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp
index e985809aa6f..61628a2e3fd 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp
@@ -24,12 +24,12 @@
 
 // FILE: SpecialAbility.cpp /////////////////////////////////////////////////////////////
 // Author: Kris Morness, July 2002
-// Desc:   This is the class that handles processing of any special attack from a unit. There are 
+// Desc:   This is the class that handles processing of any special attack from a unit. There are
 //         many different styles and rules for various attacks.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -39,11 +39,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -51,14 +46,14 @@ SpecialAbility::SpecialAbility( Thing *thing, const ModuleData *moduleData )
 												: SpecialPowerModule( thing, moduleData )
 {
 
-}  // end SpecialAbility
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 SpecialAbility::~SpecialAbility( void )
 {
 
-}  // end ~SpecialAbility
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -73,7 +68,7 @@ void SpecialAbility::doSpecialPowerAtLocation( const Coord3D *loc, Real angle, U
 
 	// call the base class action cause we are *EXTENDING* functionality
 	SpecialPowerModule::doSpecialPowerAtLocation( loc, angle, commandOptions );
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -87,7 +82,7 @@ void SpecialAbility::doSpecialPowerAtObject( Object *obj, UnsignedInt commandOpt
 
 	// call the base class action cause we are *EXTENDING* functionality
 	SpecialPowerModule::doSpecialPowerAtObject( obj, commandOptions );
-}  
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -99,7 +94,7 @@ void SpecialAbility::doSpecialPower( UnsignedInt commandOptions )
 
 	// call the base class action cause we are *EXTENDING* functionality
 	SpecialPowerModule::doSpecialPower( commandOptions );
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -110,7 +105,7 @@ void SpecialAbility::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -128,7 +123,7 @@ void SpecialAbility::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -139,4 +134,4 @@ void SpecialAbility::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp
index 62399560e56..20e8230cd92 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/GlobalData.h"
@@ -54,11 +54,6 @@
 #include "GameClient/ControlBar.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -69,7 +64,7 @@ SpecialPowerModuleData::SpecialPowerModuleData()
 	m_updateModuleStartsAttack = false;
 	m_startsPaused = FALSE;
 
-}  // end SpecialPowerModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -77,7 +72,7 @@ SpecialPowerModuleData::SpecialPowerModuleData()
 {
 	BehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SpecialPowerTemplate", INI::parseSpecialPowerTemplate, NULL, offsetof( SpecialPowerModuleData, m_specialPowerTemplate ) },
 		{ "UpdateModuleStartsAttack", INI::parseBool, NULL, offsetof( SpecialPowerModuleData, m_updateModuleStartsAttack ) },
@@ -87,7 +82,7 @@ SpecialPowerModuleData::SpecialPowerModuleData()
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -99,7 +94,11 @@ SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleDa
 									: BehaviorModule( thing, moduleData )
 {
 
+#if RETAIL_COMPATIBLE_CRC
 	m_availableOnFrame = 0;
+#else
+	m_availableOnFrame = 0xFFFFFFFF;
+#endif
 	m_pausedCount = 0;
 	m_pausedOnFrame = 0;
 	m_pausedPercent = 0.0f;
@@ -121,10 +120,10 @@ SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleDa
 	const SpecialPowerModuleData *md = (const SpecialPowerModuleData *)moduleData;
 	if( md->m_startsPaused )
 		pauseCountdown( TRUE );
-	
+
 	resolveSpecialPower();
 
-	// Now, if we find that we have just come into being, 
+	// Now, if we find that we have just come into being,
 	// but there is already a science granted for our shared superweapon,
 	// lets make sure TheIngameUI knows about our public timer
 	// add this weapon to the UI if it has a public timer for all to see
@@ -134,14 +133,14 @@ SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleDa
 			getObject()->getControllingPlayer() &&
 			getObject()->isKindOf( KINDOF_STRUCTURE ) )
 	{
-		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(), 
-																 getPowerName(), 
-																 getObject()->getID(), 
+		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(),
+																 getPowerName(),
+																 getObject()->getID(),
 																 getSpecialPowerModuleData()->m_specialPowerTemplate );
 	}
 
 
-}  // end SpecialPowerModule
+}
 
 //-------------------------------------------------------------------------------------------------
 const AudioEventRTS& SpecialPowerModule::getInitiateSound() const
@@ -156,12 +155,12 @@ SpecialPowerModule::~SpecialPowerModule()
 
  	if( getSpecialPowerModuleData()->m_specialPowerTemplate->hasPublicTimer() == TRUE &&
 			getObject()->getControllingPlayer() )
- 		TheInGameUI->removeSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(), 
-																		getPowerName(), 
-																		getObject()->getID(), 
+ 		TheInGameUI->removeSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(),
+																		getPowerName(),
+																		getObject()->getID(),
 																		getSpecialPowerModuleData()->m_specialPowerTemplate );
 
-}  // end ~SpecialPowerModule
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -177,9 +176,9 @@ void SpecialPowerModule::resolveSpecialPower( void )
 	{
 		//KM: The KINDOF_STRUCTURE check was made to prevent scripted bombers from registering their
 		//    special powers as public timers.
-		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(), 
-																 getPowerName(), 
-																 getObject()->getID(), 
+		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(),
+																 getPowerName(),
+																 getObject()->getID(),
 																 getSpecialPowerModuleData()->m_specialPowerTemplate );
 	}
 	*/
@@ -189,13 +188,13 @@ void SpecialPowerModule::resolveSpecialPower( void )
 //-------------------------------------------------------------------------------------------------
 void SpecialPowerModule::onSpecialPowerCreation( void )
 {
-	// THIS gets called by addScience(), that is, when the General has purchased a new special power, 
+	// THIS gets called by addScience(), that is, when the General has purchased a new special power,
 	// and this module is thus activated.
 
 	// start a power recharge going
 	startPowerRecharge();
 
-	// Dustin wants these special powers to start ready to fire, 
+	// Dustin wants these special powers to start ready to fire,
 	// so here (and only here) we will expressly set them to ready-now.
 	if ( getSpecialPowerTemplate()->isSharedNSync())
 	{
@@ -217,9 +216,9 @@ void SpecialPowerModule::onSpecialPowerCreation( void )
 			getObject()->getControllingPlayer() &&
 			getObject()->isKindOf( KINDOF_STRUCTURE ) )
 	{
-		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(), 
-																 getPowerName(), 
-																 getObject()->getID(), 
+		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(),
+																 getPowerName(),
+																 getObject()->getID(),
 																 getSpecialPowerModuleData()->m_specialPowerTemplate );
 	}
 }
@@ -230,7 +229,7 @@ ScienceType SpecialPowerModule::getRequiredScience( void ) const
 {
 
 	return getSpecialPowerModuleData()->m_specialPowerTemplate->getRequiredScience();
-}  // end ~SpecialPowerModule
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -238,7 +237,7 @@ const SpecialPowerTemplate * SpecialPowerModule::getSpecialPowerTemplate( void )
 {
 
 	return getSpecialPowerModuleData()->m_specialPowerTemplate;
-}  // end ~SpecialPowerModule
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -246,14 +245,14 @@ AsciiString SpecialPowerModule::getPowerName( void ) const
 {
 
 	return getSpecialPowerModuleData()->m_specialPowerTemplate->getName();
-}  // end ~SpecialPowerModule
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is this module designed for the power identier template passed in? */
 //-------------------------------------------------------------------------------------------------
 Bool SpecialPowerModule::isModuleForPower( const SpecialPowerTemplate *specialPowerTemplate ) const
 {
-	
+
 	// get the module data
 	const SpecialPowerModuleData *modData = getSpecialPowerModuleData();
 
@@ -262,15 +261,15 @@ Bool SpecialPowerModule::isModuleForPower( const SpecialPowerTemplate *specialPo
 	// to check then we are for it!
 	//
 	return modData->m_specialPowerTemplate == specialPowerTemplate;
-		
-}  // end canExecutePower
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is this special power ready to use */
 //-------------------------------------------------------------------------------------------------
 Bool SpecialPowerModule::isReady() const
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	// this is a cheat ... remove this for release!
 	if( TheGlobalData->m_specialPowerUsesDelay == FALSE )
 		return TRUE;
@@ -288,10 +287,10 @@ Bool SpecialPowerModule::isReady() const
 				return (TheGameLogic->getFrame() >= player->getOrStartSpecialPowerReadyFrame( modData->m_specialPowerTemplate ) );
 		}
 	}
-	
+
 	return (m_pausedCount == 0) && (TheGameLogic->getFrame() >= m_availableOnFrame);
 
-}  // end isReady
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the percentage ready a special power is to use
@@ -302,11 +301,11 @@ Bool SpecialPowerModule::isReady() const
 //-------------------------------------------------------------------------------------------------
 Real SpecialPowerModule::getPercentReady() const
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if( TheGlobalData->m_specialPowerUsesDelay == FALSE )
 		return 1.0f;
 #endif
-	
+
 	// easy case ... is ready
 	if( isReady() )
 		return 1.0f;
@@ -337,8 +336,8 @@ Real SpecialPowerModule::getPercentReady() const
 		}
 	}
 
-	// calculate the percent	
-	Real percent = 1.0f - ((readyFrame - TheGameLogic->getFrame()) / 
+	// calculate the percent
+	Real percent = 1.0f - ((readyFrame - TheGameLogic->getFrame()) /
 												 (Real)modData->m_specialPowerTemplate->getReloadTime());
 
 	return percent;
@@ -350,7 +349,7 @@ Real SpecialPowerModule::getPercentReady() const
 //-------------------------------------------------------------------------------------------------
 void SpecialPowerModule::startPowerRecharge()
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	// this is a cheat ... remove this for release!
 	if( TheGlobalData->m_specialPowerUsesDelay == FALSE )
 		return;
@@ -411,8 +410,8 @@ Bool SpecialPowerModule::initiateIntentToDoSpecialPower( const Object *targetObj
 	//appropriate update module!
 	if( !valid && getSpecialPowerModuleData()->m_updateModuleStartsAttack )
 	{
-		DEBUG_CRASH( ("Object does not contain a special power module to execute.  Did you forget to add it to the object INI?\n"));
-		//DEBUG_CRASH(( "Object does not contain special power module (%s) to execute.  Did you forget to add it to the object INI?\n",
+		DEBUG_CRASH( ("Object does not contain a special power module to execute.  Did you forget to add it to the object INI?"));
+		//DEBUG_CRASH(( "Object does not contain special power module (%s) to execute.  Did you forget to add it to the object INI?",
 		//							command->m_specialPower->getName().str() ));
 	}
 
@@ -426,7 +425,7 @@ void SpecialPowerModule::triggerSpecialPower( const Coord3D *location )
 	aboutToDoSpecialPower( location );	// do BEFORE recharge
 
 	createViewObject(location);
-	
+
 	// we won't be able to use the power for X number of frames now
 	startPowerRecharge();
 }
@@ -468,7 +467,7 @@ void SpecialPowerModule::createViewObject( const Coord3D *location )
 	if( dup )
 	{
 		dup->setLifetimeRange( visionDuration, visionDuration );
-	}	
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -485,14 +484,14 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
 {
 	// Tell the scripting engine!
 	TheScriptEngine->notifyOfTriggeredSpecialPower(
-		getObject()->getControllingPlayer()->getPlayerIndex(), 
+		getObject()->getControllingPlayer()->getPlayerIndex(),
 		getSpecialPowerModuleData()->m_specialPowerTemplate->getName(),
 		getObject()->getID());
 
 	// Let EVA do her thing
 	SpecialPowerType type = getSpecialPowerModuleData()->m_specialPowerTemplate->getSpecialPowerType();
 
-	// Only play the EVA sounds if this is not the local player, and the local player doesn't consider the 
+	// Only play the EVA sounds if this is not the local player, and the local player doesn't consider the
 	// person an enemy.
 	// Kris: Actually, all players need to hear these warnings.
 	//Player *localPlayer = ThePlayerList->getLocalPlayer();
@@ -522,14 +521,14 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
 		soundAtLocation.setPlayerIndex(getObject()->getControllingPlayer()->getPlayerIndex());
 		TheAudio->addAudioEvent( &soundAtLocation );
 
-	}  // end if
+	}
 
 }
 
 //-------------------------------------------------------------------------------------------------
 //By default, special powers are not triggered by it's update module -- in which case
 //it triggers it and resets its timer immediately. When the update module triggers it,
-//then all we do is initiate the special power, and trust that the update module will 
+//then all we do is initiate the special power, and trust that the update module will
 //do the rest.
 //-------------------------------------------------------------------------------------------------
 void SpecialPowerModule::doSpecialPower( UnsignedInt commandOptions )
@@ -543,14 +542,14 @@ void SpecialPowerModule::doSpecialPower( UnsignedInt commandOptions )
 	initiateIntentToDoSpecialPower( NULL, NULL, NULL, commandOptions );
 
 	//Only trigger the special power immediately if the updatemodule doesn't start the attack.
-	//An example of a case that wouldn't trigger immediately is for a unit that needs to 
+	//An example of a case that wouldn't trigger immediately is for a unit that needs to
 	//close to range before firing the special attack. A case that would trigger immediately
 	//is the napalm strike. If we don't call this now, it's up to the update module to do so.
 	if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
 	{
 		triggerSpecialPower( NULL );// Location-less trigger
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -565,14 +564,14 @@ void SpecialPowerModule::doSpecialPowerAtObject( Object *obj, UnsignedInt comman
 	initiateIntentToDoSpecialPower( obj, NULL, NULL, commandOptions );
 
 	//Only trigger the special power immediately if the updatemodule doesn't start the attack.
-	//An example of a case that wouldn't trigger immediately is for a unit that needs to 
+	//An example of a case that wouldn't trigger immediately is for a unit that needs to
 	//close to range before firing the special attack. A case that would trigger immediately
 	//is the napalm strike. If we don't call this now, it's up to the update module to do so.
 	if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
 	{
 		triggerSpecialPower( obj->getPosition() );
 	}
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -587,14 +586,14 @@ void SpecialPowerModule::doSpecialPowerAtLocation( const Coord3D *loc, Real angl
 	initiateIntentToDoSpecialPower( NULL, loc, NULL, commandOptions );
 
 	//Only trigger the special power immediately if the updatemodule doesn't start the attack.
-	//An example of a case that wouldn't trigger immediately is for a unit that needs to 
+	//An example of a case that wouldn't trigger immediately is for a unit that needs to
 	//close to range before firing the special attack. A case that would trigger immediately
 	//is the napalm strike. If we don't call this now, it's up to the update module to do so.
 	if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
 	{
 		triggerSpecialPower( loc );
 	}
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -609,7 +608,7 @@ void SpecialPowerModule::doSpecialPowerUsingWaypoints( const Waypoint *way, Unsi
 	initiateIntentToDoSpecialPower( NULL, NULL, way, commandOptions );
 
 	//Only trigger the special power immediately if the updatemodule doesn't start the attack.
-	//An example of a case that wouldn't trigger immediately is for a unit that needs to 
+	//An example of a case that wouldn't trigger immediately is for a unit that needs to
 	//close to range before firing the special attack. A case that would trigger immediately
 	//is the napalm strike. If we don't call this now, it's up to the update module to do so.
 	if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
@@ -639,12 +638,12 @@ void SpecialPowerModule::pauseCountdown( Bool pause )
 		--m_pausedCount;
 
 		// And only update the ready time if we are fully unpaused now.
-		if( m_pausedCount == 0 )	
+		if( m_pausedCount == 0 )
 		{
 			m_availableOnFrame += (TheGameLogic->getFrame() - m_pausedOnFrame);
 		}
 	}
-}  // end pauseCountdown
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -681,7 +680,7 @@ void SpecialPowerModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -711,7 +710,7 @@ void SpecialPowerModule::xfer( Xfer *xfer )
 	// paused percent
 	xfer->xferReal( &m_pausedPercent );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -724,7 +723,7 @@ void SpecialPowerModule::loadPostProcess( void )
 
 
 
-	// Now, if we find that we have just come into being, 
+	// Now, if we find that we have just come into being,
 	// but there is already a science granted for our shared superweapon,
 	// lets make sure TheIngameUI knows about our public timer
 	// add this weapon to the UI if it has a public timer for all to see
@@ -734,9 +733,9 @@ void SpecialPowerModule::loadPostProcess( void )
 			getObject()->getControllingPlayer() &&
 			getObject()->isKindOf( KINDOF_STRUCTURE ) )
 	{
-		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(), 
-																 getPowerName(), 
-																 getObject()->getID(), 
+		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(),
+																 getPowerName(),
+																 getObject()->getID(),
 																 getSpecialPowerModuleData()->m_specialPowerTemplate );
 	}
 
@@ -745,4 +744,4 @@ void SpecialPowerModule::loadPostProcess( void )
 
 
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpyVisionSpecialPower.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpyVisionSpecialPower.cpp
index 9da21aad27b..73643833048 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpyVisionSpecialPower.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpyVisionSpecialPower.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -52,8 +52,8 @@ SpyVisionSpecialPowerModuleData::SpyVisionSpecialPowerModuleData( void )
 void SpyVisionSpecialPowerModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
 	SpecialPowerModuleData::buildFieldParse( p );
-	
-	static const FieldParse dataFieldParse[] = 
+
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "BaseDuration",								INI::parseDurationUnsignedInt,	NULL,   offsetof( SpyVisionSpecialPowerModuleData, m_baseDurationInFrames ) },
 		{ "BonusDurationPerCaptured",		INI::parseDurationUnsignedInt,	NULL,   offsetof( SpyVisionSpecialPowerModuleData, m_bonusDurationPerCapturedInFrames ) },
@@ -61,8 +61,8 @@ void SpyVisionSpecialPowerModuleData::buildFieldParse( MultiIniFieldParse &p )
 		{ 0, 0, 0, 0 }
 	};
 	p.add( dataFieldParse );
-	
-}  // end buildFieldParse
+
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -74,14 +74,14 @@ SpyVisionSpecialPower::SpyVisionSpecialPower( Thing *thing, const ModuleData *mo
 												: SpecialPowerModule( thing, moduleData )
 {
 
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 SpyVisionSpecialPower::~SpyVisionSpecialPower( void )
 {
 
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -93,7 +93,7 @@ void SpyVisionSpecialPower::doSpecialPower( UnsignedInt commandOptions )
 	// call the base class action cause we are *EXTENDING* functionality
 	SpecialPowerModule::doSpecialPower( commandOptions );
 
-	
+
 	// get the source of this power
 	Object *source = getObject();
 
@@ -124,7 +124,7 @@ void SpyVisionSpecialPower::doSpecialPower( UnsignedInt commandOptions )
 	}
 
 	update->activateSpyVision( duration );
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -135,7 +135,7 @@ void SpyVisionSpecialPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -153,7 +153,7 @@ void SpyVisionSpecialPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -164,4 +164,4 @@ void SpyVisionSpecialPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
index b88ea92b9af..67cedc7f376 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
@@ -27,7 +27,7 @@
 // Author: Michael S. Booth, 2001-2002
 // Subsequently : John Ahlquist 2002 and a cast of thousands.
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_LOCOMOTORSET_NAMES					// for TheLocomotorSetNames[]
 #define DEFINE_AUTOACQUIRE_NAMES
@@ -73,11 +73,6 @@
 
 #define SLEEPY_AI
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 AIUpdateModuleData::AIUpdateModuleData()
@@ -100,8 +95,7 @@ AIUpdateModuleData::~AIUpdateModuleData()
 		if (m_turretData[i])
 		{
 			TurretAIData* td = const_cast<TurretAIData*>(m_turretData[i]);
-			if (td)
-				deleteInstance(td);
+			deleteInstance(td);
 		}
 	}
 }
@@ -113,7 +107,7 @@ const LocomotorTemplateVector* AIUpdateModuleData::findLocomotorTemplateVector(L
 		return NULL;
 
   LocomotorTemplateMap::const_iterator it = m_locomotorTemplates.find(t);
-  if (it == m_locomotorTemplates.end()) 
+  if (it == m_locomotorTemplates.end())
 	{
 		return NULL;
 	}
@@ -124,11 +118,11 @@ const LocomotorTemplateVector* AIUpdateModuleData::findLocomotorTemplateVector(L
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void AIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void AIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Turret", AIUpdateModuleData::parseTurret, NULL, offsetof(AIUpdateModuleData, m_turretData[0]) },
 		{ "AltTurret", AIUpdateModuleData::parseTurret, NULL, offsetof(AIUpdateModuleData, m_turretData[1]) },
@@ -161,7 +155,7 @@ const LocomotorTemplateVector* AIUpdateModuleData::findLocomotorTemplateVector(L
 {
 	ThingTemplate *tt = (ThingTemplate *)instance;
 	AIUpdateModuleData *self = tt->friend_getAIModuleInfo();
-	if (!self) 
+	if (!self)
 	{
 		DEBUG_CRASH(("Attempted to specify a locomotor for an object without an AIUpdate block."));
 		throw INI_INVALID_DATA;
@@ -172,7 +166,7 @@ const LocomotorTemplateVector* AIUpdateModuleData::findLocomotorTemplateVector(L
 	{
 		if (ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES)
 		{
-			DEBUG_CRASH(("re-specifying a LocomotorSet is no longer allowed\n"));
+			DEBUG_CRASH(("re-specifying a LocomotorSet is no longer allowed"));
 			throw INI_INVALID_DATA;
 		}
 	}
@@ -180,14 +174,14 @@ const LocomotorTemplateVector* AIUpdateModuleData::findLocomotorTemplateVector(L
 	self->m_locomotorTemplates[set].clear();
 	for (const char* locoName = ini->getNextToken(); locoName; locoName = ini->getNextTokenOrNull())
 	{
-		if (!*locoName || !stricmp(locoName, "None"))
+		if (!*locoName || stricmp(locoName, "None") == 0)
 			continue;
 
 		NameKeyType locoKey = NAMEKEY(locoName);
 		const LocomotorTemplate* lt = TheLocomotorStore->findLocomotorTemplate(locoKey);
 		if (!lt)
 		{
-			DEBUG_CRASH(("Locomotor %s not found!\n",locoName));
+			DEBUG_CRASH(("Locomotor %s not found!",locoName));
 			throw INI_INVALID_DATA;
 		}
 		self->m_locomotorTemplates[set].push_back(lt);
@@ -204,7 +198,7 @@ AIStateMachine* AIUpdateInterface::makeStateMachine()
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-AIUpdateInterface::AIUpdateInterface( Thing *thing, const ModuleData* moduleData ) : 
+AIUpdateInterface::AIUpdateInterface( Thing *thing, const ModuleData* moduleData ) :
 	UpdateModule( thing, moduleData )
 {
 	int i;
@@ -315,7 +309,7 @@ void AIUpdateInterface::setSurrendered( const Object *objWeSurrenderedTo, Bool s
 
 		if (m_surrenderedFramesLeft < d->m_surrenderDuration)
 			m_surrenderedFramesLeft = d->m_surrenderDuration;
-		
+
 		const Player* playerWeSurrenderedTo = objWeSurrenderedTo ? objWeSurrenderedTo->getControllingPlayer() : NULL;
 		m_surrenderedPlayerIndex = playerWeSurrenderedTo ? playerWeSurrenderedTo->getPlayerIndex() : -1;
 
@@ -331,12 +325,12 @@ void AIUpdateInterface::setSurrendered( const Object *objWeSurrenderedTo, Bool s
 			// Play our sound surrendered
 			AudioEventRTS surrenderSound = *getObject()->getTemplate()->getVoiceSurrender();
 			surrenderSound.setObjectID(getObject()->getID());
-			TheAudio->addAudioEvent(&surrenderSound);		
+			TheAudio->addAudioEvent(&surrenderSound);
 		}
 	}
 	else
 	{
-		// GS During the act of surrendering, we dipped to 0 and then were manually set to have hit points.  
+		// GS During the act of surrendering, we dipped to 0 and then were manually set to have hit points.
 		// That made us alive but marked as Dead.  Gotta undo that.
 
 		getObject()->setEffectivelyDead( FALSE );
@@ -399,8 +393,8 @@ void AIUpdateInterface::doPathfind( PathfindServicesInterface *pathfinder )
 	if (!m_waitingForPath) {
 		return;
 	}
-	//CRCDEBUG_LOG(("AIUpdateInterface::doPathfind() for object %d\n", getObject()->getID()));
-	m_waitingForPath = FALSE;	 
+	//CRCDEBUG_LOG(("AIUpdateInterface::doPathfind() for object %d", getObject()->getID()));
+	m_waitingForPath = FALSE;
 	if (m_isSafePath) {
 		destroyPath();
 		Coord3D pos1, pos2;
@@ -414,9 +408,9 @@ void AIUpdateInterface::doPathfind( PathfindServicesInterface *pathfinder )
 		if (repulsor) {
 			pos2 = *repulsor->getPosition();
 		}
-		m_path = pathfinder->findSafePath(getObject(), m_locomotorSet, 
-			getObject()->getPosition(), 
-			&pos1, 	&pos2, 
+		m_path = pathfinder->findSafePath(getObject(), m_locomotorSet,
+			getObject()->getPosition(),
+			&pos1, 	&pos2,
 			getObject()->getVisionRange() + TheAI->getAiData()->m_repulsedDistance);
 		return;
 	}
@@ -425,7 +419,7 @@ void AIUpdateInterface::doPathfind( PathfindServicesInterface *pathfinder )
 	}
 	if (m_isApproachPath) {
 		destroyPath();
-		m_path = pathfinder->findClosestPath(getObject(), m_locomotorSet, getObject()->getPosition(), 
+		m_path = pathfinder->findClosestPath(getObject(), m_locomotorSet, getObject()->getPosition(),
 			&m_requestedDestination, m_isBlockedAndStuck, 0.2f, FALSE );
 		if (isDoingGroundMovement() && getPath()) {
 			TheAI->pathfinder()->updateGoal(getObject(), getPath()->getLastNode()->getPosition(),
@@ -435,27 +429,27 @@ void AIUpdateInterface::doPathfind( PathfindServicesInterface *pathfinder )
 	}
 	if (m_isAttackPath) {
 		Object *victim = NULL;
-		if (m_requestedVictimID != INVALID_ID) { 
+		if (m_requestedVictimID != INVALID_ID) {
 			victim = TheGameLogic->findObjectByID(m_requestedVictimID);
 		}
-		if (computeAttackPath(pathfinder, victim, &m_requestedDestination))	{	
+		if (computeAttackPath(pathfinder, victim, &m_requestedDestination))	{
 			if (getPath()) {
 				TheAI->pathfinder()->updateGoal(getObject(), getPath()->getLastNode()->getPosition(),
 					getPath()->getLastNode()->getLayer());
 			}
-			//CRCDEBUG_LOG(("AIUpdateInterface::doPathfind() - m_isAttackPath = TRUE after computeAttackPath\n"));
-			m_isAttackPath = TRUE; 
+			//CRCDEBUG_LOG(("AIUpdateInterface::doPathfind() - m_isAttackPath = TRUE after computeAttackPath"));
+			m_isAttackPath = TRUE;
 			return;
 		}
-		//CRCDEBUG_LOG(("AIUpdateInterface::doPathfind() - m_isAttackPath = FALSE after computeAttackPath()\n"));
+		//CRCDEBUG_LOG(("AIUpdateInterface::doPathfind() - m_isAttackPath = FALSE after computeAttackPath()"));
 		m_isAttackPath = FALSE;
 		if (victim) {
 			m_requestedDestination = *victim->getPosition();
 			/* find a pathable destination near the victim.*/
 			TheAI->pathfinder()->adjustToPossibleDestination(getObject(), getLocomotorSet(), &m_requestedDestination);
-			ignoreObstacle(victim); 
+			ignoreObstacle(victim);
 		}
-	} 
+	}
 	computePath(pathfinder, &m_requestedDestination);
 	if (m_isFinalGoal && isDoingGroundMovement() && getPath()) {
 		TheAI->pathfinder()->updateGoal(getObject(), getPath()->getLastNode()->getPosition(),
@@ -473,23 +467,23 @@ void AIUpdateInterface::doPathfind( PathfindServicesInterface *pathfinder )
 #endif
 }
 
-/* Requests a path to be found.  Note that if it is possible to do it without having to use the 
+/* Requests a path to be found.  Note that if it is possible to do it without having to use the
 pathfinder (air units just move point to point) it generates the path immediately.  Otherwise the path
 will be processed when we get to the front of the pathfind queue. jba */
 //-------------------------------------------------------------------------------------------------
-void AIUpdateInterface::requestPath( Coord3D *destination, Bool isFinalGoal ) 
+void AIUpdateInterface::requestPath( Coord3D *destination, Bool isFinalGoal )
 {
 
 	if (m_locomotorSet.getValidSurfaces() == 0) {
 		DEBUG_CRASH(("Attempting to path immobile unit."));
 	}
 
-	//DEBUG_LOG(("Request Frame %d, obj %s %x\n", TheGameLogic->getFrame(), getObject()->getTemplate()->getName().str(), getObject()));
+	//DEBUG_LOG(("Request Frame %d, obj %s %x", TheGameLogic->getFrame(), getObject()->getTemplate()->getName().str(), getObject()));
 	m_requestedDestination = *destination;
 	m_isFinalGoal = isFinalGoal;
-	CRCDEBUG_LOG(("AIUpdateInterface::requestPath() - m_isAttackPath = FALSE for object %d\n", getObject()->getID()));
-	m_isAttackPath = FALSE;	
-	m_requestedVictimID = INVALID_ID;	
+	CRCDEBUG_LOG(("AIUpdateInterface::requestPath() - m_isAttackPath = FALSE for object %d", getObject()->getID()));
+	m_isAttackPath = FALSE;
+	m_requestedVictimID = INVALID_ID;
 	m_isApproachPath = FALSE;
 	m_isSafePath = FALSE;
 	if (canComputeQuickPath()) {
@@ -499,12 +493,12 @@ void AIUpdateInterface::requestPath( Coord3D *destination, Bool isFinalGoal )
 	m_waitingForPath = TRUE;
 	if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
 		/* Requesting path very quickly.  Can cause a spin. */
-		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 1 second\n",
+		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 1 second",
 			//TheGameLogic->getFrame()));
 		setQueueForPathTime(LOGICFRAMES_PER_SECOND);
 		// See if it has been too soon.
 		// jba intense debug
-		//DEBUG_LOG(("Info - RePathing very quickly %d, %d.\n", m_pathTimestamp, TheGameLogic->getFrame()));
+		//DEBUG_LOG(("Info - RePathing very quickly %d, %d.", m_pathTimestamp, TheGameLogic->getFrame()));
 		if (m_path && m_isBlockedAndStuck) {
 			setIgnoreCollisionTime(2*LOGICFRAMES_PER_SECOND);
 			m_blockedFrames = 0;
@@ -518,21 +512,21 @@ void AIUpdateInterface::requestPath( Coord3D *destination, Bool isFinalGoal )
 }
 
 //-------------------------------------------------------------------------------------------------
-void AIUpdateInterface::requestAttackPath( ObjectID victimID, const Coord3D* victimPos ) 
+void AIUpdateInterface::requestAttackPath( ObjectID victimID, const Coord3D* victimPos )
 {
 	if (m_locomotorSet.getValidSurfaces() == 0) {
 		DEBUG_CRASH(("Attempting to path immobile unit."));
 	}
-	CRCDEBUG_LOG(("AIUpdateInterface::requestAttackPath() - m_isAttackPath = TRUE for object %d\n", getObject()->getID()));
+	CRCDEBUG_LOG(("AIUpdateInterface::requestAttackPath() - m_isAttackPath = TRUE for object %d", getObject()->getID()));
 	m_requestedDestination = *victimPos;
-	m_requestedVictimID = victimID;	
+	m_requestedVictimID = victimID;
 	m_isAttackPath = TRUE;
 	m_isApproachPath = FALSE;
 	m_isSafePath = FALSE;
 	m_waitingForPath = TRUE;
 	if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
 		/* Requesting path very quickly.  Can cause a spin. */
-		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 2 second\n",TheGameLogic->getFrame()));
+		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 2 second",TheGameLogic->getFrame()));
 		setQueueForPathTime(2*LOGICFRAMES_PER_SECOND);
 		return;
 	}
@@ -540,22 +534,22 @@ void AIUpdateInterface::requestAttackPath( ObjectID victimID, const Coord3D* vic
 }
 
 //-------------------------------------------------------------------------------------------------
-void AIUpdateInterface::requestApproachPath( Coord3D *destination ) 
+void AIUpdateInterface::requestApproachPath( Coord3D *destination )
 {
 	if (m_locomotorSet.getValidSurfaces() == 0) {
 		DEBUG_CRASH(("Attempting to path immobile unit."));
 	}
 	m_requestedDestination = *destination;
 	m_isFinalGoal = TRUE;
-	CRCDEBUG_LOG(("AIUpdateInterface::requestApproachPath() - m_isAttackPath = FALSE for object %d\n", getObject()->getID()));
-	m_isAttackPath = FALSE;	
-	m_requestedVictimID = INVALID_ID;	
+	CRCDEBUG_LOG(("AIUpdateInterface::requestApproachPath() - m_isAttackPath = FALSE for object %d", getObject()->getID()));
+	m_isAttackPath = FALSE;
+	m_requestedVictimID = INVALID_ID;
 	m_isApproachPath = TRUE;
 	m_isSafePath = FALSE;
 	m_waitingForPath = TRUE;
 	if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
 		/* Requesting path very quickly.  Can cause a spin. */
-		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 2 second\n",TheGameLogic->getFrame()));
+		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 2 second",TheGameLogic->getFrame()));
 		setQueueForPathTime(2*LOGICFRAMES_PER_SECOND);
 		return;
 	}
@@ -564,22 +558,22 @@ void AIUpdateInterface::requestApproachPath( Coord3D *destination )
 
 //-------------------------------------------------------------------------------------------------
 // Requests a safe path away from the repulsor.
-void AIUpdateInterface::requestSafePath( ObjectID repulsor ) 
+void AIUpdateInterface::requestSafePath( ObjectID repulsor )
 {
 	if (repulsor != m_repulsor1) {
 		m_repulsor2 = m_repulsor1; // save the prior repulsor.
 	}
-	m_repulsor1 = repulsor;	
+	m_repulsor1 = repulsor;
 	m_isFinalGoal = FALSE;
-	CRCDEBUG_LOG(("AIUpdateInterface::requestSafePath() - m_isAttackPath = FALSE for object %d\n", getObject()->getID()));
-	m_isAttackPath = FALSE;	
-	m_requestedVictimID = INVALID_ID;	
+	CRCDEBUG_LOG(("AIUpdateInterface::requestSafePath() - m_isAttackPath = FALSE for object %d", getObject()->getID()));
+	m_isAttackPath = FALSE;
+	m_requestedVictimID = INVALID_ID;
 	m_isApproachPath = FALSE;
 	m_isSafePath = TRUE;
 	m_waitingForPath = TRUE;
 	if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
 		/* Requesting path very quickly.  Can cause a spin. */
-		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 2 second\n",TheGameLogic->getFrame()));
+		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 2 second",TheGameLogic->getFrame()));
 		setQueueForPathTime(2*LOGICFRAMES_PER_SECOND);
 		return;
 	}
@@ -588,8 +582,8 @@ void AIUpdateInterface::requestSafePath( ObjectID repulsor )
 
 enum {WAYPOINT_PATH_LIMIT=1024};
 //-------------------------------------------------------------------------------------------------
-// 
-void AIUpdateInterface::setPathFromWaypoint(const Waypoint *way, const Coord2D *offset) 
+//
+void AIUpdateInterface::setPathFromWaypoint(const Waypoint *way, const Coord2D *offset)
 {
 	destroyPath();
 	m_path = newInstance(Path);
@@ -609,7 +603,7 @@ void AIUpdateInterface::setPathFromWaypoint(const Waypoint *way, const Coord2D *
 		count++;
 		if (count>WAYPOINT_PATH_LIMIT) break;
 	}
-	m_waitingForPath = FALSE;	 
+	m_waitingForPath = FALSE;
 	TheAI->pathfinder()->setDebugPath(m_path);
 #ifdef SLEEPY_AI
 	// if we're no longer waiting for a path, make sure we wake up right away!
@@ -643,8 +637,7 @@ AIUpdateInterface::~AIUpdateInterface( void )
 
 	for (int i = 0; i < MAX_TURRETS; i++)
 	{
-		if (m_turretAI[i])
-			deleteInstance(m_turretAI[i]);
+		deleteInstance(m_turretAI[i]);
 		m_turretAI[i] = NULL;
 	}
 	m_stateMachine = NULL;
@@ -860,13 +853,13 @@ void AIUpdateInterface::chooseGoodLocomotorFromCurrentSet( void )
 		{
 		/* due to physics, we might slight into a cell for which we have no loco
 			(eg, cliff) and get stuck. this is bad. as a solution, we do this.
-			this may look a little funny, but as a practical matter, it works well, 
+			this may look a little funny, but as a practical matter, it works well,
 			since the pathfinder will prevent us from doing any significant "wrong" terrain. */
 			newLoco = prevLoco;
 		}
 		else
 		{
-			/* this can happen for a newly-created object, which might come into being in 
+			/* this can happen for a newly-created object, which might come into being in
 				the middle of an obstacle. for now, we just fake it and choose a ground locomotor. */
 			newLoco = m_locomotorSet.findLocomotor(LOCOMOTORSURFACE_GROUND);
 		}
@@ -893,11 +886,11 @@ void AIUpdateInterface::chooseGoodLocomotorFromCurrentSet( void )
 //----------------------------------------------------------------------------------------------------------
 Object* AIUpdateInterface::checkForCrateToPickup()
 {
-	if (m_crateCreated != INVALID_ID) 
+	if (m_crateCreated != INVALID_ID)
 	{
 		m_crateCreated = INVALID_ID; // we have processed it, so clear it.
 		Object* crate = TheGameLogic->findObjectByID(m_crateCreated);
-		if (crate) 
+		if (crate)
 		{
 			for (BehaviorModule** m = crate->getBehaviorModules(); *m; ++m)
 			{
@@ -922,7 +915,7 @@ void AIUpdateInterface::doSurrenderUpdateStuff()
 	RELEASE_CRASH(("Read the comment in doSurrenderUpdateStuff"));
 
 	/*
-		If you ever re-enable this code, you must convert it to be 
+		If you ever re-enable this code, you must convert it to be
 		properly sleepy. It is crucial that we avoid requiring a call
 		to AIUpdate every frame just to support this. (srj)
 	*/
@@ -1000,12 +993,12 @@ void AIUpdateInterface::friend_notifyStateMachineChanged()
  * The "main loop" of the AI subsystem
  */
 DECLARE_PERF_TIMER(AIUpdateInterface_update)
-UpdateSleepTime AIUpdateInterface::update( void )	 
+UpdateSleepTime AIUpdateInterface::update( void )
 {
-	//DEBUG_LOG(("AIUpdateInterface frame %d: %08lx\n",TheGameLogic->getFrame(),getObject()));
+	//DEBUG_LOG(("AIUpdateInterface frame %d: %08lx",TheGameLogic->getFrame(),getObject()));
 
 	USE_PERF_TIMER(AIUpdateInterface_update)
-	
+
 	m_isInUpdate = TRUE;
 
 	m_completedWaypoint = NULL; // Reset so state machine update can set it if we just completed the path.
@@ -1023,7 +1016,7 @@ UpdateSleepTime AIUpdateInterface::update( void )
 	}
 	else
 	{
-		// it's STATE_CONTINUE, STATE_SUCCESS, or STATE_FAILURE, 
+		// it's STATE_CONTINUE, STATE_SUCCESS, or STATE_FAILURE,
 		// any of which will probably require next frame
 		subMachineSleep = UPDATE_SLEEP_NONE;
 	}
@@ -1033,7 +1026,7 @@ UpdateSleepTime AIUpdateInterface::update( void )
 	// which we just called. thus we should
 	// never have worry about waking ourselves up when this changes, since
 	// if it changes the code will always flow thru here anyway. (srj)
-	if (m_movementComplete) 
+	if (m_movementComplete)
 	{
 		setQueueForPathTime(0);
 
@@ -1044,12 +1037,12 @@ UpdateSleepTime AIUpdateInterface::update( void )
 		getObject()->clearModelConditionState(MODELCONDITION_MOVING);
 
 		Coord3D goalPos;
-		if (TheAI->pathfinder()->goalPosition(getObject(), &goalPos)) 
+		if (TheAI->pathfinder()->goalPosition(getObject(), &goalPos))
 		{
 			// Pop to goal - This shouldn't happen (often), but make sure we got to where we're going.
 			Real dx = goalPos.x-getObject()->getPosition()->x;
 			Real dy = goalPos.y-getObject()->getPosition()->y;
-			if (dx*dx+dy*dy>=PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F) 
+			if (dx*dx+dy*dy>=PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F)
 			{
 				// Too far, so just grid current pos.
 				goalPos = *getObject()->getPosition();
@@ -1065,7 +1058,7 @@ UpdateSleepTime AIUpdateInterface::update( void )
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (m_queueForPathFrame != 0)
 	{
-		if (now >= m_queueForPathFrame) 
+		if (now >= m_queueForPathFrame)
 		{
 			TheAI->pathfinder()->queueForPath(getObject()->getID());
 			setQueueForPathTime(0);
@@ -1087,9 +1080,9 @@ UpdateSleepTime AIUpdateInterface::update( void )
 			! obj->isDisabledByType( DISABLED_HACKED ) )
 	{
 		// If we are dead, don't let the turrets do anything anymore, or else they will keep attacking
-		for (int i = 0; i < MAX_TURRETS; ++i) 
+		for (int i = 0; i < MAX_TURRETS; ++i)
 		{
-			if (m_turretAI[i]) 
+			if (m_turretAI[i])
 			{
 				UpdateSleepTime tmp = m_turretAI[i]->updateTurretAI();
 				if (tmp < subMachineSleep)
@@ -1145,7 +1138,7 @@ UpdateSleepTime AIUpdateInterface::update( void )
 		return UPDATE_SLEEP_NONE;
 #endif
 	}
-} 
+}
 
 
 
@@ -1203,7 +1196,7 @@ The way to have a higher priority is:
 1. If the paths were assigned when both units were in the same ai group, we use the path priority assigned.
 2. If not, the unit that is in front has the higher priority.
 3. If exactly tied (usually beacause both units got unfortunately snapped to the same location), ObjectID is used
-to break the tie. 
+to break the tie.
 */
 Bool AIUpdateInterface::hasHigherPathPriority(AIUpdateInterface *otherAI) const
 {
@@ -1224,7 +1217,7 @@ Bool AIUpdateInterface::hasHigherPathPriority(AIUpdateInterface *otherAI) const
 	if (ourDir.x*otherDir.x + ourDir.y*otherDir.y <= 0) {
 		return getObject()->getID() < other->getID();
 	}
-	Coord2D	combinedDir; 
+	Coord2D	combinedDir;
 	combinedDir.x = ourDir.x + otherDir.x;
 	combinedDir.y = ourDir.y + otherDir.y;
 	Coord2D vectorToOther;
@@ -1234,7 +1227,7 @@ Bool AIUpdateInterface::hasHigherPathPriority(AIUpdateInterface *otherAI) const
 	Real dotProduct = combinedDir.x*vectorToOther.x	+ combinedDir.y*vectorToOther.y;
 	if (dotProduct>0) return FALSE;  // other is ahead of us along our directional vector.
 	if (dotProduct<0) return TRUE; // We are ahead of other.
-	// Exactly equal.  Use object id's to break the tie.  
+	// Exactly equal.  Use object id's to break the tie.
 	return getObject()->getID() < other->getID();
 }
 
@@ -1257,11 +1250,11 @@ Real AIUpdateInterface::calculateMaxBlockedSpeed(Object *other) const
 	PhysicsBehavior *otherPhysics = other->getPhysics();
 	if (!otherPhysics) {
 		return m_curMaxBlockedSpeed;
-	}	
+	}
 	Coord3D otherVel = *otherPhysics->getVelocity();
 	otherVel.z = 0;
 	// Calculate how fast other is moving away from us...
-	Real awaySpeed = otherVel.length() * speedFactor;				 
+	Real awaySpeed = otherVel.length() * speedFactor;
 
 	// Now calculate the amount we are moving relative to towards them...
 	dotProduct = vectorToOther.x*ourDir.x	+ vectorToOther.y*ourDir.y;
@@ -1321,7 +1314,7 @@ Bool AIUpdateInterface::blockedBy(Object *other)
 		if (!otherMoving) {
 			return FALSE;  // Infantry can run through other infantry.
 		}
-		return FALSE; 
+		return FALSE;
 #else
 		// If we are crossing, just pass through.
 		Coord3D ourDir = *obj->getUnitDirectionVector2D();
@@ -1349,7 +1342,7 @@ Bool AIUpdateInterface::blockedBy(Object *other)
 
 	Real collisionAngle = ThePartitionManager->getRelativeAngle2D( obj, &otherPos );
 	Real otherAngle = ThePartitionManager->getRelativeAngle2D( other, &pos );
-	//DEBUG_LOG(("Collision angle %.2f, %.2f, %s, %x %s\n", collisionAngle*180/PI, otherAngle*180/PI, obj->getTemplate()->getName().str(), obj, other->getTemplate()->getName().str()));
+	//DEBUG_LOG(("Collision angle %.2f, %.2f, %s, %x %s", collisionAngle*180/PI, otherAngle*180/PI, obj->getTemplate()->getName().str(), obj, other->getTemplate()->getName().str()));
 	Real angleLimit = PI/4; // 45 degrees.
 	if (collisionAngle>PI/2 || collisionAngle<-PI/2) {
 		return FALSE; // we're moving away.
@@ -1369,7 +1362,7 @@ Bool AIUpdateInterface::blockedBy(Object *other)
 					return FALSE;
 				}
 			}	else {
-				//DEBUG_LOG(("Moving Away From EachOther\n"));
+				//DEBUG_LOG(("Moving Away From EachOther"));
 				return FALSE;  // moving away, so no need for corrective action.
 			}
 		} else {
@@ -1378,7 +1371,7 @@ Bool AIUpdateInterface::blockedBy(Object *other)
 	}
 
 
-	if (!aiOther->isAiInDeadState())	
+	if (!aiOther->isAiInDeadState())
 	{
 		return TRUE;
 	}
@@ -1390,22 +1383,22 @@ Bool AIUpdateInterface::blockedBy(Object *other)
 Bool AIUpdateInterface::needToRotate(void)
 /* Returns TRUE if we need to rotate to point in our path's direcion.*/
 {
-	if (isWaitingForPath()) 
+	if (isWaitingForPath())
 		return TRUE; // new path will probably require rotation.
 
-	if (this->getCurLocomotor() && this->getCurLocomotor()->getWanderWidthFactor()>0.0f) 
+	if (this->getCurLocomotor() && this->getCurLocomotor()->getWanderWidthFactor()>0.0f)
 		return FALSE; // wanderers don't need to rotate.
 
 	Real deltaAngle = 0;
 	if (getPath())
 	{
 		ClosestPointOnPathInfo info;
-		CRCDEBUG_LOG(("AIUpdateInterface::needToRotate() - calling computePointOnPath() for object %d\n", getObject()->getID()));
+		CRCDEBUG_LOG(("AIUpdateInterface::needToRotate() - calling computePointOnPath() for object %d", getObject()->getID()));
 		getPath()->computePointOnPath(getObject(), m_locomotorSet, *getObject()->getPosition(), info);
 		deltaAngle = ThePartitionManager->getRelativeAngle2D( getObject(), &info.posOnPath );
-	}	
+	}
 
-	if (fabs(deltaAngle)>PI/30) 
+	if (fabs(deltaAngle)>PI/30)
 	{
 		return TRUE;
 	}
@@ -1415,7 +1408,7 @@ Bool AIUpdateInterface::needToRotate(void)
 
 
 //-------------------------------------------------------------------------------------------------
-/* Returns TRUE if the physics collide should apply the force.  Normally not.  
+/* Returns TRUE if the physics collide should apply the force.  Normally not.
 Also determines whether objects are blocked, and if so, if they are stuck.  jba.*/
 Bool AIUpdateInterface::processCollision(PhysicsBehavior *physics, Object *other)
 {
@@ -1424,41 +1417,41 @@ Bool AIUpdateInterface::processCollision(PhysicsBehavior *physics, Object *other
 	return false;
 #endif
 
-	if (m_ignoreCollisionsUntil > TheGameLogic->getFrame()) 
+	if (m_ignoreCollisionsUntil > TheGameLogic->getFrame())
 		return FALSE;
 
-	if (m_canPathThroughUnits) 
+	if (m_canPathThroughUnits)
 		return FALSE;
 
 	AIUpdateInterface* aiOther = other->getAI();
-	if (aiOther == NULL) 
+	if (aiOther == NULL)
 		return FALSE;
 
 	Bool selfMoving = isMoving();
 	Bool otherMoving = ( aiOther && aiOther->isMoving() );
 	if (!isDoingGroundMovement()) return FALSE;
 	if (!aiOther->isDoingGroundMovement()) return FALSE;
-	if (selfMoving) 
+	if (selfMoving)
 	{
 		Bool blocked = blockedBy(other);
-		if (blocked) 
+		if (blocked)
 		{
-			if (getObject()->isKindOf(KINDOF_INFANTRY)) 
+			if (getObject()->isKindOf(KINDOF_INFANTRY))
 			{
 				// Panic bounces around.
-				if (getStateMachine()->getCurrentStateID() == AI_PANIC) 
+				if (getStateMachine()->getCurrentStateID() == AI_PANIC)
 				{
 					return TRUE; // just bounce off of other humans.
 				}
 			}
 			m_isBlocked = TRUE; // we are blocked.
- 			if (otherMoving && aiOther->isWaitingForPath()) 
+ 			if (otherMoving && aiOther->isWaitingForPath())
 			{
 				return FALSE; // let them get their path;
 			}
 
 			Real maxSpeed = calculateMaxBlockedSpeed(other);
-			if (maxSpeed < m_curMaxBlockedSpeed) 
+			if (maxSpeed < m_curMaxBlockedSpeed)
 			{
 				m_curMaxBlockedSpeed = maxSpeed;
 			}
@@ -1470,7 +1463,7 @@ Bool AIUpdateInterface::processCollision(PhysicsBehavior *physics, Object *other
 					return FALSE;
 				}
 #define dont_MOVE_AROUND // It just causes more problems than it fixes. jba.
-#ifdef MOVE_AROUND 
+#ifdef MOVE_AROUND
 				if (m_curLocomotor!=NULL && (other->isKindOf(KINDOF_INFANTRY)==getObject()->isKindOf(KINDOF_INFANTRY))) {
 					Real myMaxSpeed = m_curLocomotor->getMaxSpeedForCondition(getObject()->getBodyModule()->getDamageState());
 					Locomotor *hisLoco = aiOther->getCurLocomotor();
@@ -1485,53 +1478,53 @@ Bool AIUpdateInterface::processCollision(PhysicsBehavior *physics, Object *other
 #endif
 			}
 
-			//DEBUG_LOG(("Blocked %s, %x, %s\n", getObject()->getTemplate()->getName().str(), getObject(), other->getTemplate()->getName().str()));
+			//DEBUG_LOG(("Blocked %s, %x, %s", getObject()->getTemplate()->getName().str(), getObject(), other->getTemplate()->getName().str()));
 			if (m_blockedFrames==0) m_blockedFrames = 1;
-			if (!needToRotate()) 
+			if (!needToRotate())
 			{
 				// If we are already pointing in the right direction, we may be stuck.
-				if (!otherMoving) 
+				if (!otherMoving)
 				{
 					// Intense logging jba
-					// DEBUG_LOG(("Blocked&Stuck !otherMoving\n"));
+					// DEBUG_LOG(("Blocked&Stuck !otherMoving"));
 					m_isBlockedAndStuck = TRUE;
 					return FALSE;
 				}
 
 				// See if other is blocked by us.
-				if (aiOther->blockedBy(getObject())) 
+				if (aiOther->blockedBy(getObject()))
 				{
-					if (!aiOther->needToRotate()) 
+					if (!aiOther->needToRotate())
 					{
 						// Deadlocked.
-						if (!hasHigherPathPriority(aiOther)) 
+						if (!hasHigherPathPriority(aiOther))
 						{
 							// get out of his way.
 							aiMoveAwayFromUnit(aiOther->getObject(), CMD_FROM_AI);
 							//m_isBlockedAndStuck = TRUE;
 							// Intense logging jba.
-							// DEBUG_LOG(("Blocked&Stuck other is blockedByUs, has higher priority\n"));
+							// DEBUG_LOG(("Blocked&Stuck other is blockedByUs, has higher priority"));
 						}
 					}
-				}	
-				else 
+				}
+				else
 				{
 					// Just wait.
 				}
-			}	
-			else 
+			}
+			else
 			{
 				// We are rotating, so don't accumulate blocked frames.
 				m_blockedFrames = 1;
 			}
 		}
-	}	
-	else 
+	}
+	else
 	{
-		if (isAiInDeadState()) 
+		if (isAiInDeadState())
 		{
 			// Dead infantry get pushed around by crushers.
-			if (getObject()->isKindOf(KINDOF_INFANTRY) && other->canCrushOrSquish(getObject(), TEST_SQUISH_ONLY)) 
+			if (getObject()->isKindOf(KINDOF_INFANTRY) && other->canCrushOrSquish(getObject(), TEST_SQUISH_ONLY))
 			{
 				return TRUE;
 			}
@@ -1541,8 +1534,8 @@ Bool AIUpdateInterface::processCollision(PhysicsBehavior *physics, Object *other
 		Real dx = getObject()->getPosition()->x - otherPos.x;
 		Real dy = getObject()->getPosition()->y - otherPos.y;
 		Real curDSqr = dx*dx+dy*dy;
-		if (!otherMoving && curDSqr < PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F*0.25f) 
-		{	
+		if (!otherMoving && curDSqr < PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F*0.25f)
+		{
 			if (this->getCurrentStateID() == AI_BUSY) {
 				return false;
 			}
@@ -1550,15 +1543,15 @@ Bool AIUpdateInterface::processCollision(PhysicsBehavior *physics, Object *other
 				return false;  // we are doing a special ability.  Shouldn't move at this time.  jba.
 			}
 			// jba intense debug
-			//DEBUG_LOG(("*****Units ended up on top of each other.  Shouldn't happen.\n"));
+			//DEBUG_LOG(("*****Units ended up on top of each other.  Shouldn't happen."));
 			if (isIdle()) {
 				Coord3D safePosition = *getObject()->getPosition();
-				
+
 				TheAI->pathfinder()->adjustToPossibleDestination(getObject(), getLocomotorSet(), &safePosition);
-				aiMoveToPosition( &safePosition, CMD_FROM_AI ); 
+				aiMoveToPosition( &safePosition, CMD_FROM_AI );
 			}
 			if (aiOther->isIdle()) {
-				TheAI->pathfinder()->adjustToPossibleDestination(other, aiOther->getLocomotorSet(), 
+				TheAI->pathfinder()->adjustToPossibleDestination(other, aiOther->getLocomotorSet(),
 					&otherPos);
 				aiOther->aiMoveToPosition( &otherPos, CMD_FROM_AI);
 			}
@@ -1603,7 +1596,7 @@ Bool AIUpdateInterface::computeQuickPath( const Coord3D *destination )
 	// for now, quick path objects don't pathfind, generally airborne units
 	// build a trivial one-node path containing destination
 
-	
+
 	// First, see if our path already goes to the destination.
 	if (m_path) {
 		PathNode *closeNode = NULL;
@@ -1622,7 +1615,7 @@ Bool AIUpdateInterface::computeQuickPath( const Coord3D *destination )
 	}
 	// destroy previous path
 	destroyPath();
-	if (getObject()->isKindOf(KINDOF_AIRCRAFT) && !getObject()->isKindOf(KINDOF_PROJECTILE)) {	
+	if (getObject()->isKindOf(KINDOF_AIRCRAFT) && !getObject()->isKindOf(KINDOF_PROJECTILE)) {
 		m_path = TheAI->pathfinder()->getAircraftPath(getObject(), destination);
 	} else {
 		m_path = newInstance(Path);
@@ -1632,7 +1625,7 @@ Bool AIUpdateInterface::computeQuickPath( const Coord3D *destination )
 		m_path->prependNode( &pos, getObject()->getLayer() );
 		m_path->getFirstNode()->setNextOptimized(m_path->getFirstNode()->getNext());
 
-		if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) 
+		if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS)
 		{
 			TheAI->pathfinder()->setDebugPath(m_path);
 		}
@@ -1692,7 +1685,7 @@ Bool AIUpdateInterface::computePath( PathfindServicesInterface *pathServices, Co
 	// sanity check - if destination cell is invalid, don't bother pathing
 
 	LocomotorSurfaceTypeMask surfaces = m_locomotorSet.getValidSurfaces();
-	if (!m_isFinalGoal && TheAI->pathfinder()->isLinePassable( getObject(), surfaces, 
+	if (!m_isFinalGoal && TheAI->pathfinder()->isLinePassable( getObject(), surfaces,
 			getObject()->getLayer(), *getObject()->getPosition(), originalDestination, false, true)) {
 		return computeQuickPath(destination);
 	}
@@ -1706,16 +1699,16 @@ Bool AIUpdateInterface::computePath( PathfindServicesInterface *pathServices, Co
 	{
 		// compute a ground-based path
 		if (m_isBlockedAndStuck) {
-			theNewPath = pathServices->patchPath( getObject(), m_locomotorSet, 
+			theNewPath = pathServices->patchPath( getObject(), m_locomotorSet,
 				getPath(), m_isBlockedAndStuck);
 		}	else {
-			theNewPath = pathServices->findPath( getObject(), m_locomotorSet, getObject()->getPosition(), 
+			theNewPath = pathServices->findPath( getObject(), m_locomotorSet, getObject()->getPosition(),
 				destination);
 		}
 	}
 	if (theNewPath==NULL && m_path==NULL) {
-		Real pathCostFactor = 0.0f;	
-		theNewPath = pathServices->findClosestPath( getObject(), m_locomotorSet, getObject()->getPosition(), 
+		Real pathCostFactor = 0.0f;
+		theNewPath = pathServices->findClosestPath( getObject(), m_locomotorSet, getObject()->getPosition(),
 			destination, m_isBlockedAndStuck, pathCostFactor, FALSE );
 		m_retryPath = true;
 	}
@@ -1767,13 +1760,13 @@ Bool AIUpdateInterface::computePath( PathfindServicesInterface *pathServices, Co
  */
 Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServices, const Object *victim, const Coord3D* victimPos )
 {
-	//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() for object %d\n", getObject()->getID()));
+	//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() for object %d", getObject()->getID()));
 	// See if it has been too soon.
-	if (m_pathTimestamp >= TheGameLogic->getFrame()-2) 
+	if (m_pathTimestamp >= TheGameLogic->getFrame()-2)
 	{
 		// jba intense debug
-		//CRCDEBUG_LOG(("Info - RePathing very quickly %d, %d.\n", m_pathTimestamp, TheGameLogic->getFrame()));
-		if (m_path && m_isBlockedAndStuck) 
+		//CRCDEBUG_LOG(("Info - RePathing very quickly %d, %d.", m_pathTimestamp, TheGameLogic->getFrame()));
+		if (m_path && m_isBlockedAndStuck)
 		{
 			setIgnoreCollisionTime(2*LOGICFRAMES_PER_SECOND);
 			m_blockedFrames = 0;
@@ -1791,9 +1784,9 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 	}
 
 	Object* source = getObject();
-	if (!victim && !victimPos) 
+	if (!victim && !victimPos)
 	{
-		//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() - victim is NULL\n"));
+		//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() - victim is NULL"));
 		return FALSE;
 	}
 
@@ -1816,17 +1809,17 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 		if (weapon->isWithinAttackRange(source, victim))
 		{
 			Bool viewBlocked = FALSE;
-			if (isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain()) 
+			if (isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain())
 			{
 				viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(source, *source->getPosition(), victim, *victim->getPosition());
 			}
-			if (!viewBlocked) 
+			if (!viewBlocked)
 			{
 				destroyPath();
-				//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() - target is in range and visible\n"));
+				//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() - target is in range and visible"));
 				return TRUE;
 			}
-			
+
 		}
 	}
 	else if (victimPos != NULL)
@@ -1834,26 +1827,26 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 		if (weapon->isWithinAttackRange(source, victimPos))
 		{
 			Bool viewBlocked = FALSE;
-			if (isDoingGroundMovement()) 
+			if (isDoingGroundMovement())
 			{
 				viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(source, *source->getPosition(), NULL, *victimPos);
 			}
 			if (!viewBlocked) {
 				destroyPath();
-				//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() target pos is in range and visible\n"));
+				//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() target pos is in range and visible"));
 				return TRUE;
 			}
 		}
 	}
 
 	// Contact weapon
-	if (weapon->isContactWeapon()) 
+	if (weapon->isContactWeapon())
 	{
 		// Weapon is basically a contact weapon, like a car bomb.  The approach target logic
 		// has been modified to let it approach the object, so just approach the target position.	jba.
 		Coord3D tmp = *victimPos;
 		destroyPath();
-		if (this->getCurLocomotor()) 
+		if (this->getCurLocomotor())
 		{
 			getCurLocomotor()->setNoSlowDownAsApproachingDest(TRUE);
 		}
@@ -1863,7 +1856,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 		dx = victimPos->x - m_path->getLastNode()->getPosition()->x;
 		dy = victimPos->y - m_path->getLastNode()->getPosition()->y;
 		if (sqr(dx)+sqr(dy) < sqr(PATHFIND_CELL_SIZE_F*2)) {
-			if (m_path) 
+			if (m_path)
 			{
 				m_path->updateLastNode(victimPos); // jam in the coordinates of the target.
 			}
@@ -1875,7 +1868,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 			destroyPath();
 			return false;
 		}
-		//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() is contact weapon\n"));
+		//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() is contact weapon"));
 		return ok;
 	}
 
@@ -1883,7 +1876,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 	Coord3D localVictimPos;
 	if (victim != NULL)
 	{
-		if (victim->isKindOf(KINDOF_BRIDGE)) 
+		if (victim->isKindOf(KINDOF_BRIDGE))
 		{
 			TBridgeAttackInfo info;
 			TheTerrainLogic->getBridgeAttackPoints(victim, &info);
@@ -1914,10 +1907,10 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 
 		weapon->computeApproachTarget(getObject(), victim, &localVictimPos, 0, localVictimPos);
 		//DEBUG_ASSERTCRASH(weapon->isGoalPosWithinAttackRange(getObject(), &localVictimPos, victim, victimPos, NULL),
-		//	("position we just calced is not acceptable\n"));
-		
+		//	("position we just calced is not acceptable"));
+
 		// First, see if our path already goes to the destination.
-		if (m_path) 
+		if (m_path)
 		{
 			PathNode *startNode, *closeNode = NULL;
 			startNode = m_path->getFirstNode();
@@ -1927,7 +1920,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 				dxSqr *= dxSqr;
 				Real dySqr = localVictimPos.y - closeNode->getPosition()->y;
 				dySqr *= dySqr;
-				if (dxSqr+dySqr<0.25f) 
+				if (dxSqr+dySqr<0.25f)
 				{
 					return TRUE;
 				}
@@ -1941,7 +1934,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 		pos.z = localVictimPos.z;
 		m_path->prependNode( &pos, LAYER_GROUND );
 		m_path->getFirstNode()->setNextOptimized(m_path->getFirstNode()->getNext());
-		if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) 
+		if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS)
 		{
 			TheAI->pathfinder()->setDebugPath(m_path);
 		}
@@ -1954,10 +1947,10 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 		TheAI->pathfinder()->setIgnoreObstacleID( getIgnoredObstacleID() );
 
 		// compute a ground-based path
-		m_path = pathServices->findAttackPath( getObject(), m_locomotorSet, getObject()->getPosition(), 
+		m_path = pathServices->findAttackPath( getObject(), m_locomotorSet, getObject()->getPosition(),
 			victim, &localVictimPos, weapon);
 		TheAI->pathfinder()->setIgnoreObstacleID( INVALID_ID );
-		if (m_path && m_path->getBlockedByAlly()) 
+		if (m_path && m_path->getBlockedByAlly())
 		{
 	 		if( !getObject()->isKindOf(KINDOF_NO_COLLIDE))// If I don't collide with things, I don't need to tell them to get out of the way
 				TheAI->pathfinder()->moveAllies(getObject(), m_path);
@@ -1969,7 +1962,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 
 	m_blockedFrames = 0;
 	m_isBlockedAndStuck = FALSE;
-	//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() done\n"));
+	//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() done"));
 	if (m_path)
 		return TRUE;
 
@@ -1983,12 +1976,11 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 void AIUpdateInterface::destroyPath( void )
 {
 	// destroy previous path
-	if (m_path)
-		deleteInstance(m_path);
-
+	deleteInstance(m_path);
 	m_path = NULL;
+
 	m_waitingForPath = FALSE; // we no longer need it.
-	//CRCDEBUG_LOG(("AIUpdateInterface::destroyPath() - m_isAttackPath = FALSE for object %d\n", getObject()->getID()));
+	//CRCDEBUG_LOG(("AIUpdateInterface::destroyPath() - m_isAttackPath = FALSE for object %d", getObject()->getID()));
 	m_isAttackPath = FALSE;
 	setLocomotorGoalNone();
 }
@@ -1997,7 +1989,7 @@ void AIUpdateInterface::destroyPath( void )
 /**
  * This is used by the internal move to state to indicate that a move started.
  */
-void AIUpdateInterface::friend_startingMove(void) 
+void AIUpdateInterface::friend_startingMove(void)
 {
 	m_movementComplete = FALSE; // we aren't finished moving.
 	m_isMoving = TRUE;
@@ -2044,7 +2036,7 @@ void AIUpdateInterface::friend_setGoalObject(Object *obj)
 //-------------------------------------------------------------------------------------------------
 Bool AIUpdateInterface::isPathAvailable( const Coord3D *destination ) const
 {
-	
+
 	// sanity
 	if( destination == NULL )
 		return FALSE;
@@ -2053,7 +2045,7 @@ Bool AIUpdateInterface::isPathAvailable( const Coord3D *destination ) const
 
 	return TheAI->pathfinder()->quickDoesPathExist( m_locomotorSet, myPos, destination );
 
-}  // end isPathAvailable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is there a path (computed using the less accurate but quick method )
@@ -2061,7 +2053,7 @@ Bool AIUpdateInterface::isPathAvailable( const Coord3D *destination ) const
 //-------------------------------------------------------------------------------------------------
 Bool AIUpdateInterface::isQuickPathAvailable( const Coord3D *destination ) const
 {
-	
+
 	// sanity
 	if( destination == NULL )
 		return FALSE;
@@ -2070,7 +2062,7 @@ Bool AIUpdateInterface::isQuickPathAvailable( const Coord3D *destination ) const
 
 	return TheAI->pathfinder()->quickDoesPathExist( m_locomotorSet, myPos, destination );
 
-}  // end isQuickPathAvailable
+}
 
 
 
@@ -2095,11 +2087,11 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 
 	chooseGoodLocomotorFromCurrentSet();
 
-	if (m_isBlocked) 
+	if (m_isBlocked)
 	{
 		++m_blockedFrames;
-	} 
-	else 
+	}
+	else
 	{
 		m_blockedFrames = 0;
 	}
@@ -2128,23 +2120,23 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 						Real myMaxSpeed = m_curLocomotor->getMaxSpeedForCondition(getObject()->getBodyModule()->getDamageState());
 						if( speed == FAST_AS_POSSIBLE || speed > myMaxSpeed )
 							speed = myMaxSpeed;
-						m_curLocomotor->locoUpdate_moveTowardsPosition(getObject(), 
+						m_curLocomotor->locoUpdate_moveTowardsPosition(getObject(),
 							m_locomotorGoalData, 0.0f, speed, &blocked);
 						m_doFinalPosition = FALSE;
 					}
 					break;
 
 				case POSITION_ON_PATH:
-					{	 
+					{
 						if (!getPath())
 						{
-							if (m_waitingForPath) 
+							if (m_waitingForPath)
 							{
 								return UPDATE_SLEEP_FOREVER;  // Can't move till we get our path.
 							}
-							DEBUG_LOG(("Dead %d, obj %s %x\n", isAiInDeadState(), getObject()->getTemplate()->getName().str(), getObject()));
+							DEBUG_LOG(("Dead %d, obj %s %x", isAiInDeadState(), getObject()->getTemplate()->getName().str(), getObject()));
 #ifdef STATE_MACHINE_DEBUG
-							DEBUG_LOG(("Waiting %d, state %s\n", m_waitingForPath, getStateMachine()->getCurrentStateName().str()));
+							DEBUG_LOG(("Waiting %d, state %s", m_waitingForPath, getStateMachine()->getCurrentStateName().str()));
 							m_stateMachine->setDebugOutput(1);
 #endif
 							DEBUG_CRASH(("must have a path here (doLocomotor)"));
@@ -2152,17 +2144,17 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 						}
 						Coord3D goalPos;
 						Real onPathDistToGoal;
-						if (!isDoingGroundMovement()) 
+						if (!isDoingGroundMovement())
 						{
 							// airborne locomotor.  Get the goal and distance direct to the goal, don't consider obstacles.
 							onPathDistToGoal = getPath()->computeFlightDistToGoal(getObject()->getPosition(), goalPos);
-						} 
-						else 
+						}
+						else
 						{
 							// Compute the actual goal position along the path to move towards.  Consider
 							// obstacles, and follow the intermediate path points.
 							ClosestPointOnPathInfo info;
-							CRCDEBUG_LOG(("AIUpdateInterface::doLocomotor() - calling computePointOnPath() for %s\n",
+							CRCDEBUG_LOG(("AIUpdateInterface::doLocomotor() - calling computePointOnPath() for %s",
 								DebugDescribeObject(getObject()).str()));
 							getPath()->computePointOnPath(getObject(), m_locomotorSet, *getObject()->getPosition(), info);
 							onPathDistToGoal = info.distAlongPath;
@@ -2170,13 +2162,13 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 							// layer is a possible bridge in the path.  Check & set the layer if applicable.
 							TheAI->pathfinder()->updateLayer(getObject(), info.layer);
 						}
-				 
+
 						Real speed = m_desiredSpeed;
 						Real myMaxSpeed = m_curLocomotor->getMaxSpeedForCondition(getObject()->getBodyModule()->getDamageState());
 						if( speed == FAST_AS_POSSIBLE || speed > myMaxSpeed )
 							speed = myMaxSpeed;
 
-						if (blocked && speed>m_curMaxBlockedSpeed) 
+						if (blocked && speed>m_curMaxBlockedSpeed)
 						{
 							speed = m_curMaxBlockedSpeed;
 							if (m_bumpSpeedLimit>speed) {
@@ -2184,8 +2176,8 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 							}
 							m_bumpSpeedLimit *= 0.95f;
 							speed = m_bumpSpeedLimit;
-						} 
-						else 
+						}
+						else
 						{
 							blocked = FALSE;
 							if (m_bumpSpeedLimit<FAST_AS_POSSIBLE) {
@@ -2199,7 +2191,7 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 							}
 						}
 
-						m_curLocomotor->locoUpdate_moveTowardsPosition(getObject(), goalPos, 
+						m_curLocomotor->locoUpdate_moveTowardsPosition(getObject(), goalPos,
 							onPathDistToGoal+getPathExtraDistance(), speed, &blocked);
 
 						m_doFinalPosition = FALSE;
@@ -2215,7 +2207,7 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 
 				case NONE:
 					{
-						if (m_doFinalPosition) 
+						if (m_doFinalPosition)
 						{
 							Coord3D pos = *getObject()->getPosition();
 							Bool onGround = !getObject()->isAboveTerrain() && getObject()->getLayer() == LAYER_GROUND;
@@ -2223,16 +2215,16 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 							Real dy = m_finalPosition.y - pos.y;
 							Real dSqr = dx*dx+dy*dy;
 							const Real DARN_CLOSE = 0.25f;
-							if (dSqr < DARN_CLOSE) 
+							if (dSqr < DARN_CLOSE)
 							{
-								m_doFinalPosition = FALSE; 
+								m_doFinalPosition = FALSE;
 								if (onGround)
 									m_finalPosition.z = TheTerrainLogic->getGroundHeight( m_finalPosition.x, m_finalPosition.y );
 								else
 									m_finalPosition.z = pos.z;
 								getObject()->setPosition(&m_finalPosition);
-							} 
-							else 
+							}
+							else
 							{
 								Real dist = sqrtf(dSqr);
 								if (dist<1) dist = 1;
@@ -2248,8 +2240,8 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 					break;
 			}
 		}
-		
-		if (!blocked && m_blockedFrames>1) 
+
+		if (!blocked && m_blockedFrames>1)
 		{
 			m_blockedFrames = 1;
 		}
@@ -2320,24 +2312,24 @@ void AIUpdateInterface::setLocomotorGoalNone()
 //-------------------------------------------------------------------------------------------------
 Bool AIUpdateInterface::isDoingGroundMovement(void) const
 {
-	if (m_locomotorSet.getValidSurfaces() == LOCOMOTORSURFACE_AIR) 
+	if (m_locomotorSet.getValidSurfaces() == LOCOMOTORSURFACE_AIR)
 	{
 		return FALSE;  // air only loco.
 	}
 
-	if (m_curLocomotor == NULL) 
+	if (m_curLocomotor == NULL)
 	{
 		return FALSE;	// No loco, so we aren't moving.
 	}
 
 	// Cur loco is air, so not ground.
-	if (m_curLocomotor->getLegalSurfaces() & LOCOMOTORSURFACE_AIR) 
+	if (m_curLocomotor->getLegalSurfaces() & LOCOMOTORSURFACE_AIR)
 	{
-		return FALSE; 
+		return FALSE;
 	}
 
 	// We are held, so not moving on ground.
-	if( getObject()->isDisabledByType( DISABLED_HELD ) ) 
+	if( getObject()->isDisabledByType( DISABLED_HELD ) )
 	{
 		return FALSE;
 	}
@@ -2351,7 +2343,7 @@ Bool AIUpdateInterface::isDoingGroundMovement(void) const
 	}
 
 	// After all exceptions, we must be doing ground movement.
-	//DEBUG_ASSERTLOG(getObject()->isSignificantlyAboveTerrain(), ("Object %s is significantly airborne but also doing ground movement. What?\n",getObject()->getTemplate()->getName().str()));
+	//DEBUG_ASSERTLOG(getObject()->isSignificantlyAboveTerrain(), ("Object %s is significantly airborne but also doing ground movement. What?",getObject()->getTemplate()->getName().str()));
 	return TRUE;
 }
 
@@ -2362,12 +2354,12 @@ destinations, and this routine identifies non-ground units that should unstack.
 
 Bool AIUpdateInterface::isAircraftThatAdjustsDestination(void) const
 {
-	if (m_curLocomotor == NULL) 
+	if (m_curLocomotor == NULL)
 	{
 		return FALSE;	// No loco, so we aren't moving.
 	}
 
-	if (m_curLocomotor->getAppearance() == LOCO_HOVER) 
+	if (m_curLocomotor->getAppearance() == LOCO_HOVER)
 	{
 		return TRUE;	// Hover adjusts.
 	}
@@ -2387,12 +2379,12 @@ Bool AIUpdateInterface::isAircraftThatAdjustsDestination(void) const
 Bool AIUpdateInterface::getTreatAsAircraftForLocoDistToGoal() const
 {
 	Bool treatAsAircraft = !isDoingGroundMovement();
-	if (getPathExtraDistance() > PATHFIND_CLOSE_ENOUGH) 
+	if (getPathExtraDistance() > PATHFIND_CLOSE_ENOUGH)
 	{
 		// We are following a waypoint or other multiple point path, so use the "easy" success criteria.
 		treatAsAircraft = TRUE;
 	}
-	if (m_curLocomotor && m_curLocomotor->getAppearance() == LOCO_HOVER) 
+	if (m_curLocomotor && m_curLocomotor->getAppearance() == LOCO_HOVER)
 	{
 		// Hovercrafts are very sloppy.  So use aircraft tests for distance to goal.  jba.
 		treatAsAircraft = TRUE;
@@ -2401,7 +2393,7 @@ Bool AIUpdateInterface::getTreatAsAircraftForLocoDistToGoal() const
 }
 
 //-------------------------------------------------------------------------------------------------
-Real AIUpdateInterface::getLocomotorDistanceToGoal() 
+Real AIUpdateInterface::getLocomotorDistanceToGoal()
 {
 	switch (m_locomotorGoalType)
 	{
@@ -2410,16 +2402,16 @@ Real AIUpdateInterface::getLocomotorDistanceToGoal()
 			return 0.0f;
 
 		case POSITION_ON_PATH:
-			if (!getPath()) 
+			if (!getPath())
 			{
 				DEBUG_CRASH(("must have a path here (getLocomotorDistanceToGoal)"));
 				return 0.0f;
 			}
-			else if (!m_curLocomotor) 
+			else if (!m_curLocomotor)
 			{
-				//DEBUG_LOG(("no locomotor here, so no dist. (this is ok.)\n"));
+				//DEBUG_LOG(("no locomotor here, so no dist. (this is ok.)"));
 				return 0.0f;
-			}	
+			}
 			else if( m_curLocomotor->isCloseEnoughDist3D() || getObject()->isKindOf(KINDOF_PROJECTILE))
 			{
 				const Object *me = getObject();
@@ -2430,48 +2422,48 @@ Real AIUpdateInterface::getLocomotorDistanceToGoal()
 				Real distance = ThePartitionManager->getDistanceSquared( me, dest, FROM_CENTER_3D );
 				return sqrt( distance );// Other paths return dots of normalized vectors, so one sqrt ain't so bad
 			}
-			else 
+			else
 			{
 				Coord3D goalPos;
 				Bool treatAsAircraft = getTreatAsAircraftForLocoDistToGoal();
 				Real dist;
-				if (treatAsAircraft) 
+				if (treatAsAircraft)
 				{
 					// airborne locomotor.  Get the goal and distance direct to the goal, don't consider obstacles.
 					dist =  getPath()->computeFlightDistToGoal(getObject()->getPosition(), goalPos);
 				}	else {
 					// Ground based locomotor.
 					ClosestPointOnPathInfo info;
-					CRCDEBUG_LOG(("AIUpdateInterface::getLocomotorDistanceToGoal() - calling computePointOnPath() for object %d\n", getObject()->getID()));
+					CRCDEBUG_LOG(("AIUpdateInterface::getLocomotorDistanceToGoal() - calling computePointOnPath() for object %d", getObject()->getID()));
 					getPath()->computePointOnPath(getObject(), m_locomotorSet, *getObject()->getPosition(), info);
-					goalPos = info.posOnPath;	 
+					goalPos = info.posOnPath;
 					dist = info.distAlongPath;
 				}
 				if (m_path->getLastNode()) {
 					goalPos = *m_path->getLastNode()->getPosition();
 				}
-				// We are trying to get to goal.  So, 
+				// We are trying to get to goal.  So,
 				// If the actual distance is farther, then use the actual distance so we get there.
 				Real dx = goalPos.x - getObject()->getPosition()->x;
 				Real dy = goalPos.y - getObject()->getPosition()->y;
 				Real distSqr = dx*dx + dy*dy;
-				
-				if (treatAsAircraft) 
+
+				if (treatAsAircraft)
 				{
-					if (sqr(dist) > distSqr) 
+					if (sqr(dist) > distSqr)
 					{
 						return sqrt(distSqr);
 					}
 					else
 					{
-						return dist; 
+						return dist;
 					}
 				}
 
 				if (dist<PATHFIND_CELL_SIZE_F || sqr(dist) < distSqr)
 					return sqrtf(distSqr);
 				else
-					return dist;			 
+					return dist;
 
 			}
 
@@ -2483,7 +2475,7 @@ Real AIUpdateInterface::getLocomotorDistanceToGoal()
 
 	return 0.0f;
 }
- 
+
 
 /**
  * Catch up with the rest of the team.
@@ -2506,18 +2498,18 @@ void AIUpdateInterface::joinTeam( void )
 	for (DLINK_ITERATOR<Object> iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		Object *anObj = iter.cur();
-		if (!anObj) 
+		if (!anObj)
 		{
 			continue;
 		}
-		if (obj == anObj) 
+		if (obj == anObj)
 		{
 			// it's us.
 			continue;
-		}	
-		else if (anObj->getAI()) 
+		}
+		else if (anObj->getAI())
 		{
-			if( !anObj->isDisabledByType( DISABLED_HELD ) ) 
+			if( !anObj->isDisabledByType( DISABLED_HELD ) )
 			{
 				other = anObj;
 				break;
@@ -2541,7 +2533,7 @@ void AIUpdateInterface::joinTeam( void )
 		getStateMachine()->setState( state );
 	}
 
-}  // end joinTeam
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool AIUpdateInterface::isAllowedToRespondToAiCommands(const AICommandParms* parms) const
@@ -2790,7 +2782,7 @@ void AIUpdateInterface::privateMoveToPosition( const Coord3D *pos, CommandSource
 /**
  * Move to given object
  */
-void AIUpdateInterface::privateMoveToObject( Object *obj, CommandSourceType cmdSource ) 
+void AIUpdateInterface::privateMoveToObject( Object *obj, CommandSourceType cmdSource )
 {
 	// the dead don't listen very well
 	if (m_isAiDead)
@@ -2804,7 +2796,7 @@ void AIUpdateInterface::privateMoveToObject( Object *obj, CommandSourceType cmdS
 	//other systems (like the battle drone) change the locomotor based on what it's trying to do, and
 	//doesn't want to get reset when ordered to move.
 	//chooseLocomotorSet(LOCOMOTORSET_NORMAL);
-	
+
 	getStateMachine()->clear();
 	getStateMachine()->setGoalObject( obj );
 	m_blockedFrames = 0;
@@ -3044,7 +3036,7 @@ Bool AIUpdateInterface::isMovingAwayFrom(Object *obj)	 const
 	ObjectID id = obj->getID();
 	if (m_stateMachine->getTemporaryState() == AI_MOVE_OUT_OF_THE_WAY) {
 		if (m_moveOutOfWay1 == id) return TRUE;
-		if (m_moveOutOfWay2 == id) return TRUE; 
+		if (m_moveOutOfWay2 == id) return TRUE;
 	}
 	return FALSE;
 }
@@ -3073,7 +3065,7 @@ Bool AIUpdateInterface::isMoving() const
 void AIUpdateInterface::privateMoveAwayFromUnit( Object *unit, CommandSourceType cmdSource )
 {
 	// the dead don't listen very well
-	if (isAiInDeadState() || (getObject()->isMobile() == FALSE) || !isAllowedToMoveAwayFromUnit()) 
+	if (isAiInDeadState() || (getObject()->isMobile() == FALSE) || !isAllowedToMoveAwayFromUnit())
 	{
 		return;
 	}
@@ -3116,13 +3108,13 @@ void AIUpdateInterface::privateMoveAwayFromUnit( Object *unit, CommandSourceType
 		setCanPathThroughUnits(TRUE);
 		newPath = TheAI->pathfinder()->getMoveAwayFromPath(getObject(), unit, unitPath, obj2, path2);
 	}
-		
+
 	if (newPath) {
 		destroyPath();
 		m_path = newPath;
 		wakeUpNow();
 		m_stateMachine->setTemporaryState(AI_MOVE_OUT_OF_THE_WAY, 10*LOGICFRAMES_PER_SECOND);
-		if (m_path) 
+		if (m_path)
 		{
 	 		if( !getObject()->isKindOf(KINDOF_NO_COLLIDE))// If I don't collide with things, I don't need to tell them to get out of the way
 				TheAI->pathfinder()->moveAllies(getObject(), m_path);
@@ -3262,7 +3254,7 @@ void AIUpdateInterface::privateFollowPath( const std::vector<Coord3D>* path, Obj
 	// clear current state machine
 	getStateMachine()->clear();
 
-	if (path->size()>0) {
+	if (!path->empty()) {
 		const Coord3D goal = (*path)[path->size()-1];
 		getStateMachine()->setGoalPosition(&goal);
 	}
@@ -3292,7 +3284,7 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,
 	//doesn't want to get reset when ordered to move.
 	//chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 
-	if (!victim) 
+	if (!victim)
 	{
 		// Hard to kill em if they're already dead.  jba
 		return;
@@ -3535,7 +3527,7 @@ void AIUpdateInterface::privateRepair( Object *obj, CommandSourceType cmdSource
 
 	// there is no "default" way for generic objects to repair each other
 	return;
-				
+
 }
 
 #ifdef ALLOW_SURRENDER
@@ -3675,7 +3667,7 @@ void AIUpdateInterface::privateExit( Object *objectToExit, CommandSourceType cmd
 	if (!objectToExit)
 		return;
 
-	// we must go thru this state (rather than calling exitObjectViaDoor directly!), 
+	// we must go thru this state (rather than calling exitObjectViaDoor directly!),
 	// because a few containers might need to delay to allow
 	// us to exit (eg, Chinooks must land), meaning we might have to wait a bit, and coordinate
 	// with the container by actually NOTIFYING it that we want to exit...
@@ -3760,7 +3752,7 @@ void AIUpdateInterface::privateWander( const Waypoint *way, CommandSourceType cm
 	setLastCommandSource( cmdSource );
 	getStateMachine()->setGoalWaypoint( way );
 	getStateMachine()->setState( AI_WANDER );
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -3782,7 +3774,7 @@ void AIUpdateInterface::privateWanderInPlace( CommandSourceType cmdSource )
 	getStateMachine()->clear();
 	setLastCommandSource( cmdSource );
 	getStateMachine()->setState( AI_WANDER_IN_PLACE );
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -3800,12 +3792,12 @@ void AIUpdateInterface::privatePanic( const Waypoint *way, CommandSourceType cmd
 	//other systems (like the battle drone) change the locomotor based on what it's trying to do, and
 	//doesn't want to get reset when ordered to move.
 	//chooseLocomotorSet(LOCOMOTORSET_PANIC);
-	
+
 	getStateMachine()->clear();
 	setLastCommandSource( cmdSource );
 	getStateMachine()->setGoalWaypoint( way );
 	getStateMachine()->setState( AI_PANIC );
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4034,7 +4026,7 @@ void AIUpdateInterface::setAttitude( AttitudeType tude )
 }
 
 /**
- * Get the current behavior modifier state	
+ * Get the current behavior modifier state
  */
 AttitudeType AIUpdateInterface::getAttitude( void ) const
 {
@@ -4063,8 +4055,8 @@ void AIUpdateInterface::ignoreObstacleID( ObjectID id )
 
 //-------------------------------------------------------------------------------------------------
 ObjectID AIUpdateInterface::getIgnoredObstacleID( void ) const
-{ 
-	return m_ignoreObstacleID; 
+{
+	return m_ignoreObstacleID;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4072,7 +4064,7 @@ Object* AIUpdateInterface::getEnterTarget()
 {
 	AIStateType stateType = getAIStateType();
 
-	if( stateType != AI_ENTER && 
+	if( stateType != AI_ENTER &&
 			stateType != AI_GUARD_TUNNEL_NETWORK &&
 			stateType != AI_GET_REPAIRED )
 		return NULL;
@@ -4083,7 +4075,7 @@ Object* AIUpdateInterface::getEnterTarget()
 //-------------------------------------------------------------------------------------------------
 void AIUpdateInterface::setLastCommandSource( CommandSourceType source )
 {
-	m_lastCommandSource = source; 
+	m_lastCommandSource = source;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4091,26 +4083,26 @@ UnsignedInt AIUpdateInterface::getMoodMatrixValue( void ) const
 {
 	UnsignedInt returnVal = 0;
 	// seems like a weird way to get my controlling object, but I don't see another
-	if (!getStateMachine()) 
+	if (!getStateMachine())
 	{
 		return returnVal;
 	}
-	
+
 	const Object *owner = getObject();
 	Player *player = owner->getControllingPlayer();
 
-	if (!player) 
+	if (!player)
 	{
 		return returnVal;
 	}
-	
-	if (player->getPlayerType() == PLAYER_HUMAN) 
+
+	if (player->getPlayerType() == PLAYER_HUMAN)
 	{
 		returnVal |= MM_Controller_Player;
 		// Human units don't have a mood.
 
-	} 
-	else 
+	}
+	else
 	{
 		returnVal |= MM_Controller_AI;
 		switch (getAttitude())
@@ -4120,24 +4112,24 @@ UnsignedInt AIUpdateInterface::getMoodMatrixValue( void ) const
 			case ATTITUDE_NORMAL:			returnVal |= MM_Mood_Normal; break;
 			case ATTITUDE_ALERT:			returnVal |= MM_Mood_Alert; break;
 			case ATTITUDE_AGGRESSIVE:	returnVal |= MM_Mood_Aggressive; break;
-			default: 
+			default:
 				DEBUG_CRASH(("Unknown mood '%d' in getMoodMatrixValue. (Team '%s'). Using normal. (jkmcd)", getAttitude(), getObject()->getTeam()->getName().str() ));
 				returnVal |= MM_Mood_Normal;
 				break;
 		}
 	}
 
-	if (getLocomotorSet().getValidSurfaces() & LOCOMOTORSURFACE_AIR) 
+	if (getLocomotorSet().getValidSurfaces() & LOCOMOTORSURFACE_AIR)
 	{
 		returnVal |= MM_UnitType_Air;
-	} 
-	else 
+	}
+	else
 	{
-		if (m_turretAI[0] != NULL) 
+		if (m_turretAI[0] != NULL)
 		{
 			returnVal |= MM_UnitType_Turreted;
-		} 
-		else 
+		}
+		else
 		{
 			returnVal |= MM_UnitType_NonTurreted;
 		}
@@ -4164,7 +4156,7 @@ UnsignedInt AIUpdateInterface::getMoodMatrixActionAdjustment( MoodMatrixAction a
 	UnsignedInt moodMatrix = getMoodMatrixValue();
 	UnsignedInt returnVal = 0;
 
-	if (moodMatrix & MM_Controller_Player) 
+	if (moodMatrix & MM_Controller_Player)
 	{
 		// Player-controlled units can always do actions (from a mood perspective, at any rate)
 		returnVal = MAA_Action_Ok;
@@ -4174,7 +4166,7 @@ UnsignedInt AIUpdateInterface::getMoodMatrixActionAdjustment( MoodMatrixAction a
 	returnVal = MAA_Action_Ok;
 	switch (action)
 	{
-		case MM_Action_Idle: 
+		case MM_Action_Idle:
 		{
 			switch( moodMatrix & MM_Mood_Bitmask )
 			{
@@ -4266,7 +4258,7 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	Object *obj = getObject();
 
 	// if we're dead, we can't attack
-	if (obj->isEffectivelyDead()) 
+	if (obj->isEffectivelyDead())
 		return NULL;
 
 	if (obj->testStatus(OBJECT_STATUS_IS_USING_ABILITY)) {
@@ -4274,10 +4266,10 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	}
 
 	const AIUpdateModuleData* d = getAIUpdateModuleData();
-	
+
 	if (calledDuringIdle)
 	{
-		if ((d->m_autoAcquireEnemiesWhenIdle & AAS_Idle) == 0) 
+		if ((d->m_autoAcquireEnemiesWhenIdle & AAS_Idle) == 0)
 		{
 			return NULL;
 		}
@@ -4293,9 +4285,9 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	//AutoAcquireWhenIdle = Yes Stealthed.
 	if ( calledDuringIdle )
 	{
-		if( obj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) ) 
+		if( obj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) )
 		{
-			if ((getAIUpdateModuleData()->m_autoAcquireEnemiesWhenIdle & AAS_Idle_Stealthed) == 0) 
+			if ((getAIUpdateModuleData()->m_autoAcquireEnemiesWhenIdle & AAS_Idle_Stealthed) == 0)
 			{
 				//He's stealthed and idle, but if he's garrisoned, then that's a whole different matter....
 				const Object *container = obj->getContainedBy();
@@ -4317,10 +4309,10 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 
 	// Check if team auto targets same victim.
 	Object *teamVictim = NULL;
-	if (calledByAI && obj->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+	if (calledByAI && obj->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 	{
 		teamVictim = obj->getTeam()->getTeamTargetObject();
-		if (teamVictim && getAttitude()>=ATTITUDE_NORMAL) 
+		if (teamVictim && getAttitude()>=ATTITUDE_NORMAL)
 			return teamVictim;
 	}
 
@@ -4345,7 +4337,7 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	// Use Guard Outer, which typically corresponds to the total range
 	Real rangeToFindWithin = TheAI->getAdjustedVisionRangeForObject(obj, AI_VISIONFACTOR_OWNERTYPE | AI_VISIONFACTOR_MOOD);
 
-	if (rangeToFindWithin <= 0.0f) 
+	if (rangeToFindWithin <= 0.0f)
 		return NULL;
 
 	//If we are contained by an object, add it's bounding radius so that large buildings can auto acquire everything in
@@ -4358,7 +4350,7 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	}
 
 	UnsignedInt moodMatrixVal = getMoodMatrixValue();
-	if ((moodMatrixVal & MM_Controller_AI) && (moodMatrixVal & MM_Mood_Passive)) 
+	if ((moodMatrixVal & MM_Controller_AI) && (moodMatrixVal & MM_Mood_Passive))
 	{
 		BodyModuleInterface *bmi = obj->getBodyModule();
 		if (!bmi)
@@ -4374,9 +4366,9 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	}
 
 	if (TheAI->getAiData()->m_attackIgnoreInsignificantBuildings) {
-		flags |= AI::IGNORE_INSIGNIFICANT_BUILDINGS; 
+		flags |= AI::IGNORE_INSIGNIFICANT_BUILDINGS;
 	}
-	
+
 	if( d->m_autoAcquireEnemiesWhenIdle & AAS_Idle_Attack_Buildings )
 	{
 		flags |= AI::ATTACK_BUILDINGS;
@@ -4389,11 +4381,11 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	{
 		flags |= AI::WITHIN_ATTACK_RANGE;
 	}
-	
+
 	// Instead of shroud affecting the ability to attack, it affects the ability to target.
 	// The same checks apply as the old WeaponSet check (now commented out, search for getShroudedStatus)
 	if( calledByAI
-			&& obj->getControllingPlayer() 
+			&& obj->getControllingPlayer()
 			&& obj->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN
 		)
 	{
@@ -4403,7 +4395,7 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	Object *newVictim = TheAI->findClosestEnemy(obj, rangeToFindWithin, flags, getAttackInfo());
 
 /*
-DEBUG_LOG(("GNMT frame %d: %s %08lx (con %s %08lx) uses range %f, flags %08lx, %s finds %s %08lx\n",
+DEBUG_LOG(("GNMT frame %d: %s %08lx (con %s %08lx) uses range %f, flags %08lx, %s finds %s %08lx",
 	now,
 	obj->getTemplate()->getName().str(),
 	obj,
@@ -4419,7 +4411,7 @@ DEBUG_LOG(("GNMT frame %d: %s %08lx (con %s %08lx) uses range %f, flags %08lx, %
 
 	if (newVictim)
 	{
-		CRCDEBUG_LOG(("AIUpdateInterface::getNextMoodTarget() - %d is attacking %d\n", obj->getID(), newVictim->getID()));
+		CRCDEBUG_LOG(("AIUpdateInterface::getNextMoodTarget() - %d is attacking %d", obj->getID(), newVictim->getID()));
 /*
 srj debug hack. ignore.
 Int ot = getTmpValue();
@@ -4434,95 +4426,156 @@ setTmpValue(now);
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void AIUpdateInterface::evaluateMoraleBonus( void )
+Bool AIUpdateInterface::hasNationalism() const
 {
-	Object *us = getObject();
-#ifdef ALLOW_DEMORALIZE
-	Bool demoralized = isDemoralized();
-#endif
-	Bool horde = FALSE;
-	Bool nationalism = FALSE;
-
-	// are we in a horde
-	HordeUpdateInterface *hui;
-	for( BehaviorModule** u = us->getBehaviorModules(); *u; ++u )
+	if (const Player *player = getObject()->getControllingPlayer())
 	{
+		///@todo Find a better way to represent nationalism without hard coding here (CBD)
+		static const UpgradeTemplate *nationalismTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_Nationalism" );
+		if (nationalismTemplate != NULL)
+		{
+			return player->hasUpgradeComplete( nationalismTemplate );
+		}
+	}
+	return false;
+}
 
-		hui = (*u)->getHordeUpdateInterface();
-		if( hui && hui->isInHorde() )
-			horde = TRUE;
-
-	}  // end for
-
-	// do we have nationalism
-	///@todo Find a better way to represent nationalism without hardcoding here (CBD)
-	static const UpgradeTemplate *nationalismTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_Nationalism" );
-	DEBUG_ASSERTCRASH( nationalismTemplate != NULL, ("AIUpdateInterface::evaluateMoraleBonus - Nationalism upgrade not found\n") );
-	Player *player = us->getControllingPlayer();
-	if( player && player->hasUpgradeComplete( nationalismTemplate ) )
-		nationalism = TRUE;
-
-#ifdef ALLOW_DEMORALIZE
-	// if we are are not demoralized we can have horde and nationalism effects
-	if( demoralized == FALSE )
-#endif
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+Bool AIUpdateInterface::hasFanaticism() const
+{
+	if (const Player *player = getObject()->getControllingPlayer())
 	{
-
-#ifdef ALLOW_DEMORALIZE
-		// demoralized
-		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_DEMORALIZED );
-#endif		
-		
-		//Lorenzen temporarily disabled, since it fights with the horde buff
-		//Drawable *draw = us->getDrawable();
-		//if ( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
-		//	draw->setTerrainDecal(TERRAIN_DECAL_NONE);
-
-		// horde
-		if( horde )
+		///@todo Find a better way to represent fanaticism without hard coding here (MAL)
+		static const UpgradeTemplate *fanaticismTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_Fanaticism" );
+		if (fanaticismTemplate != NULL)
 		{
-			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
-
-		}  // end if
-		else
-			us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
-
-		// nationalism
-		if( nationalism )
-			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
-		else
-			us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+			return player->hasUpgradeComplete( fanaticismTemplate );
+		}
+	}
+	return false;
+}
 
-	}  // end if
+// ------------------------------------------------------------------------------------------------
+// TheSuperHackers @refactor The implementation has been improved and simplified.
+// ------------------------------------------------------------------------------------------------
+void AIUpdateInterface::evaluateMoraleBonus( Bool inHorde, Bool allowNationalism, HordeActionType type )
+{
 #ifdef ALLOW_DEMORALIZE
-	else
+
+	// if we are demoralized, then we can not have horde and nationalism effects
+	if( isDemoralized() )
 	{
+		Object *us = getObject();
 
 		// demoralized
 		us->setWeaponBonusCondition( WEAPONBONUSCONDITION_DEMORALIZED );
 
-		// we cannot have horde bonus condition
+		// we cannot have horde bonuses
 		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+
 		Drawable *draw = us->getDrawable();
 		if( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
-		{	
+		{
 			draw->setTerrainDecal(TERRAIN_DECAL_DEMORALIZED);
 		}
-				
-		// we cannot have nationalism bonus condition
-		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
 
-	}  // end else
+		return;
+	}
+
+	// demoralized
+	us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_DEMORALIZED );
+
+#endif // ALLOW_DEMORALIZE
+
+	//Lorenzen temporarily disabled, since it fights with the horde buff
+	//Object *us = getObject();
+	//Drawable *draw = us->getDrawable();
+	//if ( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
+	//	draw->setTerrainDecal(TERRAIN_DECAL_NONE);
+
+	switch (type)
+	{
+	case HORDEACTION_HORDE:
+		evaluateNationalismBonusClassic(inHorde, allowNationalism);
+		break;
+
+#if !RETAIL_COMPATIBLE_CRC
+	case HORDEACTION_HORDE_FIXED:
+		evaluateNationalismBonus(inHorde, allowNationalism);
+		break;
 #endif
+	}
+}
 
-/*
-	UnicodeString msg;
-	msg.format( L"'%S' Horde=%d,Nationalism=%d,Demoralized=%d",
-							us->getTemplate()->getName().str(), horde, nationalism, demoralized );
-	TheInGameUI->message( msg );
-*/
+// ------------------------------------------------------------------------------------------------
+// TheSuperHackers @info The classic Nationalism Bonus implementation.
+// Is not great, because Nationalism and Fanaticism bonuses are not disabled when leaving the horde.
+// ------------------------------------------------------------------------------------------------
+void AIUpdateInterface::evaluateNationalismBonusClassic( Bool inHorde, Bool allowNationalism )
+{
+	Object *us = getObject();
+
+	if( inHorde )
+	{
+		us->setWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
+	}
+	else
+	{
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
+	}
+
+	if( allowNationalism && hasNationalism() )
+	{
+		us->setWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+
+		if ( hasFanaticism() )
+		{
+			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+		}
+		else
+		{
+			us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+		}
+	}
+	else
+	{
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+	}
+}
 
-}  // end evaluateMoraleBonus
+// ------------------------------------------------------------------------------------------------
+// TheSuperHackers @bugfix The fixed Nationalism Bonus implementation.
+// Nationalism and Fanaticism are now tied to the horde status.
+// And Fanaticism is no longer dependent on Nationalism.
+// ------------------------------------------------------------------------------------------------
+void AIUpdateInterface::evaluateNationalismBonus( Bool inHorde, Bool allowNationalism )
+{
+	Object *us = getObject();
+
+	if( inHorde )
+	{
+		us->setWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
+
+		if( allowNationalism && hasNationalism() )
+		{
+			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+		}
+
+		if( allowNationalism && hasFanaticism() )
+		{
+			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+		}
+	}
+	else
+	{
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+	}
+}
 
 #ifdef ALLOW_DEMORALIZE
 // ------------------------------------------------------------------------------------------------
@@ -4538,12 +4591,16 @@ void AIUpdateInterface::setDemoralized( UnsignedInt durationInFrames )
 	if( (prevDemoralizedFrames == 0 && m_demoralizedFramesLeft > 0) ||
 			(prevDemoralizedFrames > 0 && m_demoralizedFramesLeft == 0) )
 	{
-
 		// evaluate demoralization, nationalism, and horde effect as they are all intertwined
-		evaluateMoraleBonus();
-
-	}  // end if
-
+		Object *us = getObject();
+		for( BehaviorModule** u = us->getBehaviorModules(); *u; ++u )
+		{
+			if ( HordeUpdateInterface *hui = (*u)->getHordeUpdateInterface() )
+			{
+				evaluateMoraleBonus( hui->isInHorde(), hui->isAllowedNationalism(), hui->getHordeActionType() );
+			}
+		}
+	}
 }
 #endif
 
@@ -4732,15 +4789,15 @@ AIGroup *AIUpdateInterface::getGroup(void)
 // ------------------------------------------------------------------------------------------------
 void AIUpdateInterface::crc( Xfer *x )
 {
-	CRCGEN_LOG(("AIUpdateInterface::crc() begin - %8.8X\n", ((XferCRC *)x)->getCRC()));
+	CRCGEN_LOG(("AIUpdateInterface::crc() begin - %8.8X", ((XferCRC *)x)->getCRC()));
 	// extend base class
 	UpdateModule::crc( x );
 
 	xfer(x);
 
-	CRCGEN_LOG(("AIUpdateInterface::crc() end - %8.8X\n", ((XferCRC *)x)->getCRC()));
+	CRCGEN_LOG(("AIUpdateInterface::crc() end - %8.8X", ((XferCRC *)x)->getCRC()));
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -4753,18 +4810,18 @@ void AIUpdateInterface::xfer( Xfer *xfer )
   const XferVersion currentVersion = 4;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
   UpdateModule::xfer( xfer );
- 
+
 	xfer->xferUnsignedInt(&m_priorWaypointID);
 	xfer->xferUnsignedInt(&m_currentWaypointID);
 	xfer->xferSnapshot(m_stateMachine);
 	xfer->xferBool(&m_isAiDead);
 	xfer->xferBool(&m_isRecruitable);
 
-	xfer->xferUnsignedInt(&m_nextEnemyScanTime);		
-	xfer->xferObjectID(&m_currentVictimID);	
+	xfer->xferUnsignedInt(&m_nextEnemyScanTime);
+	xfer->xferObjectID(&m_currentVictimID);
 	xfer->xferReal(&m_desiredSpeed);
 	xfer->xferUser(&m_lastCommandSource, sizeof(m_lastCommandSource));
 	xfer->xferUser(&m_guardTargetType[0], sizeof(m_guardTargetType));
@@ -4781,7 +4838,7 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 		if (triggerName.isNotEmpty()) {
 			m_areaToGuard = TheTerrainLogic->getTriggerAreaByName(triggerName);
 		}
-	} 
+	}
 
 	AsciiString attackName;
 	if (m_attackInfo) attackName = m_attackInfo->getName();
@@ -4791,7 +4848,7 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 		if (attackName.isNotEmpty()) {
 			m_attackInfo = TheScriptEngine->getAttackInfo(attackName);
 		}
-	}  
+	}
 
 	xfer->xferInt(&m_waypointCount);
 	if (m_waypointCount<0 || m_waypointCount>MAX_WAYPOINTS) {
@@ -4831,8 +4888,8 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 	xfer->xferCoord3D(&m_requestedDestination2);
 
 	// Not needed - we will recompute paths on load.
-	//xfer->xferUnsignedInt(&m_pathTimestamp);		
-	
+	//xfer->xferUnsignedInt(&m_pathTimestamp);
+
 	xfer->xferObjectID(&m_ignoreObstacleID);
 	xfer->xferReal(&m_pathExtraDistance);
 	xfer->xferICoord2D(&m_pathfindGoalCell);
@@ -4876,12 +4933,12 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 		// Read in from .ini
 		//LocomotorSet			m_locomotorSet;
 		AsciiString setName;
-		if (m_curLocomotorSet > LOCOMOTORSET_INVALID && m_curLocomotorSet < LOCOMOTORSET_COUNT) 
+		if (m_curLocomotorSet > LOCOMOTORSET_INVALID && m_curLocomotorSet < LOCOMOTORSET_COUNT)
 			setName = TheLocomotorSetNames[m_curLocomotorSet];
 
 		xfer->xferAsciiString(&setName);
 
-		if (setName.isNotEmpty()) 
+		if (setName.isNotEmpty())
 			m_curLocomotorSet = (LocomotorSetType)INI::scanIndexList(setName.str(), TheLocomotorSetNames);
 
 		m_fixLocoInPostProcess = TRUE;
@@ -4891,7 +4948,7 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 		if (xfer->getXferMode() == XFER_LOAD)
 		{
 			// our ctor choose a NORMAL set for us. it's simpler
-			// to simply clear out whatever we have here and allow 
+			// to simply clear out whatever we have here and allow
 			// xferSelfAndCurLocoPtr() to continue to require a pristine,
 			// empty set. (srj)
 			m_locomotorSet.clear();
@@ -4913,7 +4970,7 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 	xfer->xferUser(&m_attitude, sizeof(m_attitude));
 
 	xfer->xferUnsignedInt(&m_nextMoodCheckTime);
-	if (version == 1)	
+	if (version == 1)
 	{
 		// surrender + demoralize
 #ifdef ALLOW_DEMORALIZE
@@ -4963,7 +5020,7 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 		xfer->xferInt(&repulsorCountdown);
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4972,7 +5029,7 @@ void AIUpdateInterface::loadPostProcess( void )
 {
 	UpdateModule::loadPostProcess();
 
-	if (m_fixLocoInPostProcess && m_curLocomotorSet!=LOCOMOTORSET_INVALID) 
+	if (m_fixLocoInPostProcess && m_curLocomotorSet!=LOCOMOTORSET_INVALID)
 	{
 		m_fixLocoInPostProcess = FALSE;
 
@@ -5000,14 +5057,14 @@ void AIUpdateInterface::loadPostProcess( void )
 		}
 	}
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Int AIUpdateInterface::friend_getWaypointGoalPathSize() const 
-{ 
+Int AIUpdateInterface::friend_getWaypointGoalPathSize() const
+{
 			//
-			// it is VERY IMPORTANT to check for the current state type as being follow-path, 
+			// it is VERY IMPORTANT to check for the current state type as being follow-path,
 			// because "getGoalPath" and friends are used for other things (eg, jet takeoff and landing).
 			// if you don't do this check, you will end up with really bizarre behavior in obscure jet-related
 			// cases, and our users will all laugh at us.
@@ -5018,7 +5075,7 @@ Int AIUpdateInterface::friend_getWaypointGoalPathSize() const
 	if (getAIStateType() != AI_FOLLOW_PATH)
 		return 0;
 
-	return getStateMachine()->getGoalPathSize(); 
+	return getStateMachine()->getGoalPathSize();
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp
index da0c9b3c2a8..214cb16d0c6 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp
@@ -28,7 +28,7 @@
 //         troops, order them to attack, then return. Can do extra things like ordering
 //         injured troops to return to the transport for healing purposes.
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingFactory.h"
@@ -43,11 +43,6 @@
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -58,7 +53,7 @@ AssaultTransportAIUpdate::AssaultTransportAIUpdate( Thing *thing, const ModuleDa
 {
 	m_currentMembers = MAX_TRANSPORT_SLOTS; //First time, max it out, to ensure clearing arrays in reset.
 	reset();
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void AssaultTransportAIUpdate::reset()
@@ -82,7 +77,7 @@ void AssaultTransportAIUpdate::reset()
 //-------------------------------------------------------------------------------------------------
 AssaultTransportAIUpdate::~AssaultTransportAIUpdate( void )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void AssaultTransportAIUpdate::aiDoCommand(const AICommandParms* parms)
@@ -91,7 +86,7 @@ void AssaultTransportAIUpdate::aiDoCommand(const AICommandParms* parms)
 	if( parms->m_cmdSource != CMD_FROM_AI )
 	{
 		//Now the only time we care about anything is if we were ordered to attack something or attack move.
-		switch( parms->m_cmd ) 
+		switch( parms->m_cmd )
 		{
 			case AICMD_ATTACKMOVE_TO_POSITION:
 				//Reset because we have been ordered to do something.
@@ -118,7 +113,7 @@ void AssaultTransportAIUpdate::aiDoCommand(const AICommandParms* parms)
 		}
 	}
 
-	//Note, in both cases, the transport will fire a dummy DEPLOY weapon that will trigger the 
+	//Note, in both cases, the transport will fire a dummy DEPLOY weapon that will trigger the
 	//evacuation of the troops.
 	AIUpdateInterface::aiDoCommand( parms );
 }
@@ -235,7 +230,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 					//Generally only player commands allow this, so this flag allows AI commands to do the same.
 					passenger->getAI()->setAllowedToChase( TRUE );
 				}
-				
+
 				//Check if the passenger is wounded below threshhold (if so make sure we heal him before ordering him to fight!)
 				if( isMemberWounded( passenger ) )
 				{
@@ -278,7 +273,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 		{
 			Object *member = TheGameLogic->findObjectByID( m_memberIDs[ i ] );
 			AIUpdateInterface *ai = member ? member->getAI() : NULL;
-			
+
 			if( member && ai )
 			{
 				Bool contained = member->isContained();
@@ -289,7 +284,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 					//New members are exempt!
 					ai->aiExit( transport, CMD_FROM_AI );
 				}
-				if( !contained ) 
+				if( !contained )
 				{
 					if( wounded )
 					{
@@ -299,7 +294,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 							ai->aiEnter( transport, CMD_FROM_AI );
 						}
 					}
-					else 
+					else
 					{
 						//Increment the number of fighters and their position.
 						fighterCentroidPos.add( member->getPosition() );
@@ -333,7 +328,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 
 	/*
 	//Keep near the troops.
-	if( !m_framesRemaining ) 
+	if( !m_framesRemaining )
 	{
 		if( !isMoving() && fightingMembers && designatedTarget )
 		{
@@ -345,7 +340,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 
 			Coord3D designatedTargetPos = *designatedTarget->getPosition();
 
-			//Calculate a vector from the target passed the fighters to be at a safe place 
+			//Calculate a vector from the target passed the fighters to be at a safe place
 			//to be as a transport.
 			Coord3D vector;
 			vector.set( &fighterCentroidPos );
@@ -375,7 +370,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 		//aiFaceObject( designatedTarget, CMD_FROM_AI );
 	}
 	*/
-	
+
 	/*UpdateSleepTime ret =*/ AIUpdateInterface::update();
 	//return (mine < ret) ? mine : ret;
 	/// @todo srj -- someday, make sleepy. for now, must not sleep.
@@ -490,7 +485,7 @@ void AssaultTransportAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -503,7 +498,7 @@ void AssaultTransportAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -517,16 +512,16 @@ void AssaultTransportAIUpdate::xfer( Xfer *xfer )
 
 	xfer->xferCoord3D( &m_attackMoveGoalPos );
 	xfer->xferObjectID( &m_designatedTarget );
-	
+
 	Int state = (Int)m_state;
 	xfer->xferInt( &state );
 	m_state = (AssaultStateTypes)state;
-	
+
 	xfer->xferUnsignedInt( &m_framesRemaining );
 	xfer->xferBool( &m_isAttackMove );
 	xfer->xferBool( &m_isAttackObject );
 
-}  // end xfer
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -535,5 +530,5 @@ void AssaultTransportAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
index 48d4046ea1e..cf48a89f970 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
@@ -24,13 +24,14 @@
 
 // ChinookAIUpdate.cpp //////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_VETERANCY_NAMES				// for TheVeterancyNames[]
 
 #include "Common/ActionManager.h"
 #include "Common/DrawModule.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/RandomValue.h"
 #include "Common/Team.h"
@@ -48,11 +49,6 @@
 
 const Real BIGNUM = 99999.0f;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 enum ChinookAIStateType CPP_11(: Int)
@@ -64,17 +60,17 @@ enum ChinookAIStateType CPP_11(: Int)
 	LANDING,
 
 	MOVE_TO_AND_LAND,
-	
+
 	MOVE_TO_AND_EVAC,
 	LAND_AND_EVAC,
 	EVAC_AND_TAKEOFF,
-	
+
 	MOVE_TO_AND_EVAC_AND_EXIT,
 	LAND_AND_EVAC_AND_EXIT,
 	EVAC_AND_EXIT,
 	TAKEOFF_AND_EXIT,
 	HEAD_OFF_MAP,
-	
+
 	MOVE_TO_COMBAT_DROP,
 	DO_COMBAT_DROP
 };
@@ -109,9 +105,9 @@ static Object* getPotentialRappeller(Object* obj)
 }
 
 //----------------------------------------------------------------------------------------------------------
-class ChinookEvacuateState : public State 
+class ChinookEvacuateState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookEvacuateState, "ChinookEvacuateState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookEvacuateState, "ChinookEvacuateState")
 protected:
 	// snapshot interface	STUBBED - no member vars to save. jba.
 	virtual void crc( Xfer *xfer ){};
@@ -141,7 +137,7 @@ EMPTY_DTOR(ChinookEvacuateState)
 //-------------------------------------------------------------------------------------------------
 class ChinookHeadOffMapState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookHeadOffMapState, "ChinookHeadOffMapState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookHeadOffMapState, "ChinookHeadOffMapState")
 	//I'm outta here
 protected:
 	// snapshot interface	STUBBED - no member vars to save. jba.
@@ -192,9 +188,9 @@ class ChinookHeadOffMapState :  public State
 EMPTY_DTOR(ChinookHeadOffMapState)
 
 //-------------------------------------------------------------------------------------------------
-class ChinookTakeoffOrLandingState : public State 
+class ChinookTakeoffOrLandingState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookTakeoffOrLandingState, "ChinookTakeoffOrLandingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookTakeoffOrLandingState, "ChinookTakeoffOrLandingState")
 private:
 	Coord3D		m_destLoc;
 	Bool			m_landing;
@@ -223,7 +219,7 @@ class ChinookTakeoffOrLandingState : public State
 	}
 
 public:
-	ChinookTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), State( machine, "ChinookTakeoffOrLandingState" ) 
+	ChinookTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), State( machine, "ChinookTakeoffOrLandingState" )
 	{
 		m_destLoc.zero();
 	}
@@ -258,7 +254,7 @@ class ChinookTakeoffOrLandingState : public State
 			Coord3D tmp;
 			FindPositionOptions options;
 			options.maxRadius = obj->getGeometryInfo().getBoundingCircleRadius() * 100.0f;
-			if (ThePartitionManager->findPositionAround(&m_destLoc, &options, &tmp)) 
+			if (ThePartitionManager->findPositionAround(&m_destLoc, &options, &tmp))
 			{
 				m_destLoc = tmp;
 				TheAI->pathfinder()->adjustToLandingDestination(obj, &m_destLoc);
@@ -310,7 +306,7 @@ class ChinookTakeoffOrLandingState : public State
 
 		ai->friend_setFlightStatus(m_landing ? CHINOOK_LANDED : CHINOOK_FLYING);
 
-		// Paranoia checks - sometimes onExit is called when we are 
+		// Paranoia checks - sometimes onExit is called when we are
 		// shutting down, and not all pieces are valid.  CurLocomotor
 		// is definitely null in some cases. jba.
 		Locomotor* loco = ai->getCurLocomotor();
@@ -339,9 +335,9 @@ class ChinookTakeoffOrLandingState : public State
 EMPTY_DTOR(ChinookTakeoffOrLandingState)
 
 //-------------------------------------------------------------------------------------------------
-class ChinookCombatDropState : public State 
+class ChinookCombatDropState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookCombatDropState, "ChinookCombatDropState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookCombatDropState, "ChinookCombatDropState")
 
 private:
 
@@ -365,7 +361,11 @@ class ChinookCombatDropState : public State
 			for (std::list<ObjectID>::iterator oit = it->rappellerIDs.begin(); oit != it->rappellerIDs.end(); )
 			{
 				Object* rappeller = TheGameLogic->findObjectByID(*oit);
+#if RETAIL_COMPATIBLE_CRC
 				if (rappeller == NULL || rappeller->isEffectivelyDead() || !rappeller->isAboveTerrain())
+#else
+				if (rappeller == NULL || rappeller->isEffectivelyDead() || !rappeller->isAboveTerrain() || rappeller->isContained())
+#endif
 				{
 					oit = it->rappellerIDs.erase(oit);
 				}
@@ -436,12 +436,12 @@ class ChinookCombatDropState : public State
 			{
 				if (!m_ropes.empty())
 				{
-					DEBUG_CRASH(( "ChinookCombatDropState - ropes should be empty\n" ));
+					DEBUG_CRASH(( "ChinookCombatDropState - ropes should be empty" ));
 					throw SC_INVALID_DATA;
 				}
 				m_ropes.resize(numRopes);
 			}
-			
+
 			for (Int i = 0; i < numRopes; ++i)
 			{
 				RopeInfo info;
@@ -500,7 +500,7 @@ class ChinookCombatDropState : public State
 		UnsignedInt now = TheGameLogic->getFrame();
 
 		const ThingTemplate* ropeTmpl = TheThingFactory->findTemplate(d->m_ropeName);
-		
+
 		const Int MAX_BONES = 32;
     Coord3D ropePos[MAX_BONES];
     Matrix3D dropMtx[MAX_BONES];
@@ -520,7 +520,7 @@ class ChinookCombatDropState : public State
 			RopeInfo info;
 
 			obj->convertBonePosToWorldPos( NULL, &dropMtx[i], NULL, &info.dropStartMtx );
-			
+
 			info.ropeDrawable = ropeTmpl ? TheThingFactory->newDrawable(ropeTmpl) : NULL;
 			if (info.ropeDrawable)
 			{
@@ -552,7 +552,7 @@ class ChinookCombatDropState : public State
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
 		const ChinookAIUpdateModuleData* d = ai->friend_getData();
-		
+
 		if (obj->isEffectivelyDead())
 		{
 			return STATE_FAILURE;
@@ -587,6 +587,7 @@ class ChinookCombatDropState : public State
 				Object* rappeller = getPotentialRappeller(obj);
 				if (rappeller != NULL)
 				{
+#if RETAIL_COMPATIBLE_CRC
 					ExitInterface *exitInterface = obj->getObjectExitInterface();
 					ExitDoorType exitDoor = exitInterface ? exitInterface->reserveDoorForExit(rappeller->getTemplate(), rappeller) : DOOR_NONE_AVAILABLE;
 					if(exitDoor != DOOR_NONE_AVAILABLE)
@@ -597,6 +598,15 @@ class ChinookCombatDropState : public State
 					{
 						DEBUG_CRASH(("rappeller is not free to exit... what?"));
 					}
+#else
+					// TheSuperHackers @bugfix 03/01/2026 Bypass door reservation as rappellers are always
+					// expected to be free to exit. This avoids prior rappel conditions in getAiFreeToExit
+					// from allowing rappellers to be freely 'dropped' from the Chinook during this state.
+					if (ExitInterface* exitInterface = obj->getObjectExitInterface())
+					{
+						exitInterface->exitObjectViaDoor(rappeller, DOOR_1);
+					}
+#endif
 
 					rappeller->setTransformMatrix(&it->dropStartMtx);
 
@@ -680,7 +690,7 @@ EMPTY_DTOR(ChinookCombatDropState)
  */
 class ChinookMoveToBldgState : public AIMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookMoveToBldgState, "ChinookMoveToBldgState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookMoveToBldgState, "ChinookMoveToBldgState")
 private:
 	Real m_oldPreferredHeight;
 	Real m_newPreferredHeight;
@@ -837,11 +847,11 @@ ChinookAIUpdateModuleData::ChinookAIUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void ChinookAIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void ChinookAIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   SupplyTruckAIUpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "RappelSpeed", INI::parseVelocityReal, 0, offsetof(ChinookAIUpdateModuleData, m_rappelSpeed) },
 		{ "RopeDropSpeed", INI::parseVelocityReal, 0, offsetof(ChinookAIUpdateModuleData, m_ropeDropSpeed) },
@@ -875,7 +885,7 @@ AIStateMachine* ChinookAIUpdate::makeStateMachine()
 //-------------------------------------------------------------------------------------------------
 ChinookAIUpdate::ChinookAIUpdate( Thing *thing, const ModuleData* moduleData ) : SupplyTruckAIUpdate( thing, moduleData )
 {
-	m_hasPendingCommand = false;	
+	m_hasPendingCommand = false;
 	m_flightStatus = CHINOOK_FLYING;	// yep, that's right, even if we start "on ground"
 	m_airfieldForHealing = INVALID_ID;
 }
@@ -963,13 +973,13 @@ Bool ChinookAIUpdate::isAllowedToAdjustDestination() const
 {
 	 if (m_flightStatus == CHINOOK_LANDED)
 		return false;
-	
-	return SupplyTruckAIUpdate::isAllowedToAdjustDestination(); 
+
+	return SupplyTruckAIUpdate::isAllowedToAdjustDestination();
 }
 
 //-------------------------------------------------------------------------------------------------
-ObjectID ChinookAIUpdate::getBuildingToNotPathAround() const 
-{ 
+ObjectID ChinookAIUpdate::getBuildingToNotPathAround() const
+{
 	if (getAIStateType() == MOVE_TO_COMBAT_DROP || getAIStateType() == DO_COMBAT_DROP)
 	{
 		const Object* goalObj = getStateMachine()->getGoalObject();
@@ -977,17 +987,21 @@ ObjectID ChinookAIUpdate::getBuildingToNotPathAround() const
 			return goalObj->getID();
 	}
 
-	return INVALID_ID; 
+	return INVALID_ID;
 }
 
 //-------------------------------------------------------------------------------------------------
-AIFreeToExitType ChinookAIUpdate::getAiFreeToExit(const Object* exiter) const 
-{ 
-	 if (m_flightStatus == CHINOOK_LANDED 
+AIFreeToExitType ChinookAIUpdate::getAiFreeToExit(const Object* exiter) const
+{
+#if RETAIL_COMPATIBLE_CRC
+	 if (m_flightStatus == CHINOOK_LANDED
 				|| (m_flightStatus == CHINOOK_DOING_COMBAT_DROP && exiter->isKindOf(KINDOF_CAN_RAPPEL)))
+#else
+	if (m_flightStatus == CHINOOK_LANDED)
+#endif
 		return FREE_TO_EXIT;
-	
-	return WAIT_TO_EXIT; 
+
+	return WAIT_TO_EXIT;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1002,9 +1016,16 @@ Bool ChinookAIUpdate::chooseLocomotorSet(LocomotorSetType wst)
 UpdateSleepTime ChinookAIUpdate::update()
 {
 	ParkingPlaceBehaviorInterface* pp = getPP(m_airfieldForHealing);
+	const ContainModuleInterface* contain = getObject()->getContain();
+	const Bool waitingToEnterOrExit = contain && contain->hasObjectsWantingToEnterOrExit();
+
 	if (pp != NULL)
 	{
-		if (m_flightStatus == CHINOOK_LANDED && 
+		if (m_flightStatus == CHINOOK_LANDED &&
+#if !RETAIL_COMPATIBLE_CRC
+				// TheSuperHackers @bugfix Stubbjax 03/11/2025 Prevent Chinooks from taking off while there are still units wanting to enter or exit.
+				!waitingToEnterOrExit &&
+#endif
 				!m_hasPendingCommand &&
 				getObject()->getBodyModule()->getHealth() == getObject()->getBodyModule()->getMaxHealth())
 		{
@@ -1026,10 +1047,8 @@ UpdateSleepTime ChinookAIUpdate::update()
 	// when we have a pending command...
 	if (SupplyTruckAIUpdate::isIdle())
 	{
-		ContainModuleInterface* contain = getObject()->getContain();
 		if( contain )
 		{
-			Bool waitingToEnterOrExit = contain->hasObjectsWantingToEnterOrExit();
 			if (m_hasPendingCommand)
 			{
 				AICommandParms parms(AICMD_MOVE_TO_POSITION, CMD_FROM_AI);	// values don't matter, will be wiped by next line
@@ -1096,7 +1115,7 @@ void ChinookAIUpdate::privateCombatDrop( Object* target, const Coord3D& pos, Com
 	// when there is a target present, we must verify that we can logically do the action when
 	// we get commands from players (we'll assume AI knows what its doing)
 	//
-	if( target != NULL && cmdSource == CMD_FROM_PLAYER && 
+	if( target != NULL && cmdSource == CMD_FROM_PLAYER &&
 			TheActionManager->canEnterObject( getObject(), target, cmdSource, COMBATDROP_INTO ) == FALSE )
 		return;
 
@@ -1123,14 +1142,20 @@ void ChinookAIUpdate::privateCombatDrop( Object* target, const Coord3D& pos, Com
 //-------------------------------------------------------------------------------------------------
 void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
 {
+#if RETAIL_COMPATIBLE_CRC
 	// this gets reset every time a command is issued.
 	setAirfieldForHealing(INVALID_ID);
+#else
+	// TheSuperHackers @bugfix Stubbjax 31/10/2025 Don't leave healing state for evacuation commands.
+	if (parms->m_cmd != AICMD_EVACUATE && parms->m_cmd != AICMD_EXIT)
+		setAirfieldForHealing(INVALID_ID);
+#endif
 
 	if (!isAllowedToRespondToAiCommands(parms))
 		return;
 
-	if (m_flightStatus == CHINOOK_TAKING_OFF || 
-				m_flightStatus == CHINOOK_LANDING || 
+	if (m_flightStatus == CHINOOK_TAKING_OFF ||
+				m_flightStatus == CHINOOK_LANDING ||
 				m_flightStatus == CHINOOK_DOING_COMBAT_DROP)
 	{
 		// have to wait for takeoff or landing (or rappel) to complete, just store the sucker.
@@ -1156,7 +1181,7 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
 		{
 			const Real THRESH = 3.0f;
 			const Real THRESH_SQR = THRESH*THRESH;
-			if (calcDistSqr(*getObject()->getPosition(), parms->m_pos) > THRESH_SQR && 
+			if (calcDistSqr(*getObject()->getPosition(), parms->m_pos) > THRESH_SQR &&
 					m_flightStatus == CHINOOK_LANDED)
 			{
 				// gotta take off first!
@@ -1170,7 +1195,7 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
 			{
 				// do this INSTEAD of the standard stuff
 				setMyState(
-					(parms->m_cmd == AICMD_MOVE_TO_POSITION_AND_EVACUATE) ? MOVE_TO_AND_EVAC : MOVE_TO_AND_EVAC_AND_EXIT, 
+					(parms->m_cmd == AICMD_MOVE_TO_POSITION_AND_EVACUATE) ? MOVE_TO_AND_EVAC : MOVE_TO_AND_EVAC_AND_EXIT,
 					NULL, &parms->m_pos, CMD_FROM_AI);
 				passItThru = false;
 			}
@@ -1220,7 +1245,7 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
 void ChinookAIUpdate::crc( Xfer *xfer )
 {
 	SupplyTruckAIUpdate::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1243,7 +1268,7 @@ void ChinookAIUpdate::xfer( Xfer *xfer )
 	xfer->xferUser(&m_flightStatus, sizeof(m_flightStatus));
 	xfer->xferObjectID(&m_airfieldForHealing);
  // extend base class
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1251,4 +1276,4 @@ void ChinookAIUpdate::xfer( Xfer *xfer )
 void ChinookAIUpdate::loadPostProcess( void )
 {
 	SupplyTruckAIUpdate::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp
index aa9a886b08b..a8c7c8876ca 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp
@@ -25,7 +25,7 @@
 // DeliverPayloadAIUpdate.cpp ////////////
 // Author: Graham Smallwood, March 2002
 // Desc:   State machine that controls the approach and deployment of airborne cargo
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES
 
@@ -49,16 +49,11 @@
 #include "GameLogic/Weapon.h"
 #include "GameLogic/WeaponSet.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 const FieldParse* DeliverPayloadData::getFieldParse()
 {
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
 		{ "DeliveryDistance",								INI::parseReal,								NULL, offsetof( DeliverPayloadData, m_distToTarget) },
@@ -81,10 +76,10 @@ const FieldParse* DeliverPayloadData::getFieldParse()
 		{ "VisiblePayloadTemplateName",			INI::parseAsciiString,				NULL, offsetof( DeliverPayloadData, m_visiblePayloadTemplateName ) },
 		{ "VisiblePayloadWeaponTemplate",		INI::parseWeaponTemplate,			NULL, offsetof( DeliverPayloadData, m_visiblePayloadWeaponTemplate ) },
 		{ "SelfDestructObject",		          INI::parseBool,		           	NULL, offsetof( DeliverPayloadData, m_selfDestructObject ) },
-		
-		//Weapon based payload 
+
+		//Weapon based payload
 		{ "FireWeapon",											INI::parseBool,								NULL, offsetof( DeliverPayloadData, m_fireWeapon ) },
-		
+
 		//Specify an additional weaponslot to be fired while strafing
 		{ "DiveStartDistance",							INI::parseReal,								NULL, offsetof( DeliverPayloadData, m_diveStartDistance ) },
 		{ "DiveEndDistance",								INI::parseReal,								NULL, offsetof( DeliverPayloadData, m_diveEndDistance ) },
@@ -120,34 +115,25 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData*
 	m_visibleItemsDelivered = 0;
 	m_deliveryDecal.clear();
 	m_previousDistanceSqr = 0;
-
 	m_freeToExit = FALSE;
 	m_acceptingCommands = TRUE;
-
-	// Added By Sadullah Nader
-	// Initialization missing and needed
-	
 	m_diveState = DIVESTATE_PREDIVE;
-	
-	// End Add
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 DeliverPayloadAIUpdate::~DeliverPayloadAIUpdate( void )
 {
 	m_deliveryDecal.clear();
-
-	if (m_deliverPayloadStateMachine)
-		deleteInstance(m_deliverPayloadStateMachine);
-} 
+	deleteInstance(m_deliverPayloadStateMachine);
+}
 
 //-------------------------------------------------------------------------------------------------
-AIFreeToExitType DeliverPayloadAIUpdate::getAiFreeToExit(const Object* exiter) const 
-{ 
+AIFreeToExitType DeliverPayloadAIUpdate::getAiFreeToExit(const Object* exiter) const
+{
 	if( getObject()->isEffectivelyDead() )
 		return NOT_FREE_TO_EXIT;
-	
-	return m_freeToExit ? FREE_TO_EXIT : NOT_FREE_TO_EXIT; 
+
+	return m_freeToExit ? FREE_TO_EXIT : NOT_FREE_TO_EXIT;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -189,14 +175,14 @@ UpdateSleepTime DeliverPayloadAIUpdate::update( void )
 				getObject()->getAIUpdateInterface()->getCurLocomotor()->setUsePreciseZPos( true );
 
 				AudioEventRTS soundDive = *(getObject()->getTemplate()->getPerUnitSound("StartDive"));
-				if( soundDive.getEventName().isNotEmpty() ) 
+				if( soundDive.getEventName().isNotEmpty() )
 				{
 					soundDive.setPosition( getObject()->getPosition() );
 					TheAudio->addAudioEvent( &soundDive );
 				}
 			}
 		}
-		else 
+		else
 		{
 			//Check to see when we shall end diving
 			Real endDiveDistanceSquared = sqr( getData()->m_diveEndDistance );
@@ -219,7 +205,7 @@ UpdateSleepTime DeliverPayloadAIUpdate::update( void )
 					Real currentDistance = sqrt( currentDistanceSquared );
 
 					Real diveRatio = (startDiveDistance - currentDistance) / (startDiveDistance - endDiveDistance);
-					
+
 					Coord3D velocity = *getObject()->getPhysics()->getVelocity();
 					velocity.z = 0.0f;
 					velocity.normalize();
@@ -251,7 +237,7 @@ UpdateSleepTime DeliverPayloadAIUpdate::update( void )
 //-------------------------------------------------------------------------------------------------
 void DeliverPayloadAIUpdate::deliverPayload(
 	const Coord3D *moveToPos,
-	const Coord3D *targetPos, 
+	const Coord3D *targetPos,
 	const DeliverPayloadData *data
 )
 {
@@ -259,17 +245,16 @@ void DeliverPayloadAIUpdate::deliverPayload(
 	//****************************************************
 	//THIS GETS CALLED VIA OBJECT CREATION LISTS ONLY!!!
 	//****************************************************
-	
-	if (m_deliverPayloadStateMachine)
-		deleteInstance(m_deliverPayloadStateMachine);
+
+	deleteInstance(m_deliverPayloadStateMachine);
 	m_deliverPayloadStateMachine = NULL;
 
 	m_moveToPos = *moveToPos;
 	m_targetPos = *targetPos;
 	m_data			= *data;
-	
+
 	m_deliveryDecal.clear();
-	m_data.m_deliveryDecalTemplate.createRadiusDecal(*targetPos, 
+	m_data.m_deliveryDecalTemplate.createRadiusDecal(*targetPos,
 		m_data.m_deliveryDecalRadius, getObject()->getControllingPlayer(), m_deliveryDecal);
 
 	if( m_data.m_diveStartDistance <= 0.0f )
@@ -349,11 +334,11 @@ Real DeliverPayloadAIUpdate::calcMinTurnRadius(Real* timeToTravelThatDist) const
 
 	/*
 		our minimum circumference will be like so:
-		
+
 		Real minTurnCircum = maxSpeed * (2*PI / maxTurnRate);
 
 		so therefore our minimum turn radius is:
-		
+
 		Real minTurnRadius = minTurnCircum / 2*PI;
 
 		so we just eliminate the middleman:
@@ -368,10 +353,10 @@ Real DeliverPayloadAIUpdate::calcMinTurnRadius(Real* timeToTravelThatDist) const
 
 
 //-------------------------------------------------------------------------------------------------
-Bool DeliverPayloadAIUpdate::isCloseEnoughToTarget() 
+Bool DeliverPayloadAIUpdate::isCloseEnoughToTarget()
 {
 	// In addition to testing distance, it is also sensitive to being in/outward bound
-////The new getPreOpenDistance() allows the deliver state to fire early, but only if inbound, 
+////The new getPreOpenDistance() allows the deliver state to fire early, but only if inbound,
 ////so the doors can open and payload can get ready...
 
 	Real allowedDistanceSqr = sqr( getAllowedDistanceToTarget() );
@@ -382,7 +367,7 @@ Bool DeliverPayloadAIUpdate::isCloseEnoughToTarget()
 	if ( inBound )
 		allowedDistanceSqr = sqr(getAllowedDistanceToTarget() + getPreOpenDistance());
 
-	//DEBUG_LOG(("Dist to target is %f (allowed %f)\n",sqrt(currentDistanceSqr),sqrt(allowedDistanceSqr)));
+	//DEBUG_LOG(("Dist to target is %f (allowed %f)",sqrt(currentDistanceSqr),sqrt(allowedDistanceSqr)));
 
 
 	if ( allowedDistanceSqr > currentDistanceSqr )
@@ -411,7 +396,7 @@ void DeliverPayloadAIUpdate::crc( Xfer *xfer )
 {
  // extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -424,7 +409,7 @@ void DeliverPayloadAIUpdate::xfer( Xfer *xfer )
   const XferVersion currentVersion = 3;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -435,8 +420,8 @@ void DeliverPayloadAIUpdate::xfer( Xfer *xfer )
 
 	DeliverPayloadData data = m_data;
 
-	xfer->xferAsciiString(&data.m_visibleDropBoneName);	
-	xfer->xferAsciiString(&data.m_visibleSubObjectName);	
+	xfer->xferAsciiString(&data.m_visibleDropBoneName);
+	xfer->xferAsciiString(&data.m_visibleSubObjectName);
 	xfer->xferAsciiString(&data.m_visiblePayloadTemplateName);
   xfer->xferReal(&data.m_distToTarget);
 	xfer->xferInt(&data.m_maxAttempts);
@@ -445,23 +430,23 @@ void DeliverPayloadAIUpdate::xfer( Xfer *xfer )
 	xfer->xferUnsignedInt(&data.m_dropDelay);
 	xfer->xferBool(&data.m_fireWeapon);
 	xfer->xferBool(&data.m_selfDestructObject);
-	xfer->xferInt(&data.m_visibleNumBones);						
+	xfer->xferInt(&data.m_visibleNumBones);
 	xfer->xferReal(&data.m_diveStartDistance);
 	xfer->xferReal(&data.m_diveEndDistance);
 	xfer->xferUser(&data.m_strafingWeaponSlot, sizeof(data.m_strafingWeaponSlot));
 	xfer->xferInt(&data.m_visibleItemsDroppedPerInterval);
 	xfer->xferBool(&data.m_inheritTransportVelocity);
-	xfer->xferBool(&data.m_isParachuteDirectly);		
+	xfer->xferBool(&data.m_isParachuteDirectly);
 	xfer->xferReal(&data.m_exitPitchRate);
 	// const FXList					*m_strafeFX;
 	xfer->xferReal(&data.m_strafeLength);
 	AsciiString weaponTemplateName;
-	if (data.m_visiblePayloadWeaponTemplate) 
+	if (data.m_visiblePayloadWeaponTemplate)
 	{
 		weaponTemplateName = data.m_visiblePayloadWeaponTemplate->getName();
 	}
 	xfer->xferAsciiString(&weaponTemplateName);
-	if( xfer->getXferMode() == XFER_LOAD && weaponTemplateName.isNotEmpty()) 
+	if( xfer->getXferMode() == XFER_LOAD && weaponTemplateName.isNotEmpty())
 	{
 		data.m_visiblePayloadWeaponTemplate = TheWeaponStore->findWeaponTemplate(weaponTemplateName);
 	}
@@ -471,7 +456,7 @@ void DeliverPayloadAIUpdate::xfer( Xfer *xfer )
 
 	Bool hasStateMachine = m_deliverPayloadStateMachine!=NULL;
 	xfer->xferBool(&hasStateMachine);
-	if (hasStateMachine && m_deliverPayloadStateMachine==NULL) 
+	if (hasStateMachine && m_deliverPayloadStateMachine==NULL)
 	{
 		m_deliverPayloadStateMachine = newInstance(DeliverPayloadStateMachine)( getObject() );
 	}
@@ -479,7 +464,7 @@ void DeliverPayloadAIUpdate::xfer( Xfer *xfer )
 	{
 		xfer->xferSnapshot(m_deliverPayloadStateMachine);
 	}
-	
+
 	m_deliveryDecal.xferRadiusDecal(xfer);
 
 	if (version >= 2)
@@ -492,7 +477,7 @@ void DeliverPayloadAIUpdate::xfer( Xfer *xfer )
 	}
 
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -501,7 +486,7 @@ void DeliverPayloadAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -512,10 +497,10 @@ DeliverPayloadStateMachine::DeliverPayloadStateMachine( Object *owner ) : StateM
 {
 //	DeliverPayloadAIUpdate *ai = (DeliverPayloadAIUpdate*)owner->getAIUpdateInterface();
 
-	static const StateConditionInfo considerConditions[] = 
+	static const StateConditionInfo considerConditions[] =
 	{
 		StateConditionInfo(DeliverPayloadStateMachine::isOffMap, RECOVER_FROM_OFF_MAP, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -538,19 +523,19 @@ DeliverPayloadStateMachine::~DeliverPayloadStateMachine()
 void DeliverPayloadStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void DeliverPayloadStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -558,7 +543,7 @@ void DeliverPayloadStateMachine::xfer( Xfer *xfer )
 void DeliverPayloadStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ Bool DeliverPayloadStateMachine::isOffMap( State *thisState, void* userData )
@@ -630,7 +615,7 @@ StateReturnType ApproachState::update()
 // ------------------------------------------------------------------------------------------------
 void DeliveringState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -644,14 +629,14 @@ void DeliveringState::xfer( Xfer *xfer )
 
 	xfer->xferUnsignedInt(&m_dropDelayLeft);
 	xfer->xferBool(&m_didOpen);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DeliveringState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -696,7 +681,7 @@ StateReturnType DeliveringState::update() // Kick a dude out every so often
 		return STATE_FAILURE;
 
 	const ContainedItemsList* items = owner->getContain() ? owner->getContain()->getContainedItemsList() : NULL;
-	if( (!items || !items->size()) && ai->getVisibleItemsDelivered() == ai->getData()->m_visibleNumBones )
+	if( (!items || items->empty()) && ai->getVisibleItemsDelivered() == ai->getData()->m_visibleNumBones )
 	{
 		//We are out of payload to drop AND our visible payload is empty. It's possible for deliverers to
 		//have one or the other or even both.
@@ -748,7 +733,7 @@ StateReturnType DeliveringState::update() // Kick a dude out every so often
 				// This will most likely be ignored, as the item is still in the transport, and therefore Held.
 				itemAI->aiMoveToPosition( ai->getMoveToPos(), CMD_FROM_AI );
 			}
-			
+
 			/// @todo srj -- urg. icky.
 			static NameKeyType key_GenerateMinefieldBehavior = NAMEKEY("GenerateMinefieldBehavior");
 			GenerateMinefieldBehavior* mfb = (GenerateMinefieldBehavior *)item->findUpdateModule(key_GenerateMinefieldBehavior);
@@ -790,7 +775,7 @@ StateReturnType DeliveringState::update() // Kick a dude out every so often
 				{
 					const ThingTemplate* thing = TheThingFactory->findTemplate( ai->getData()->m_visiblePayloadTemplateName.str() );
 					Object *payload = TheThingFactory->newObject( thing, owner->getControllingPlayer()->getDefaultTeam() );
-					
+
 					if( payload )
 					{
 						payload->setProducer( owner );
@@ -836,7 +821,7 @@ StateReturnType DeliveringState::update() // Kick a dude out every so often
 							ProjectileUpdateInterface* pui = (*u)->getProjectileUpdateInterface();
 							if( pui  )
 							{
-								//Missile! 
+								//Missile!
 								const WeaponTemplate *weaponTemplate = ai->getData()->m_visiblePayloadWeaponTemplate;
 								if( !weaponTemplate )
 								{
@@ -873,7 +858,7 @@ StateReturnType DeliveringState::update() // Kick a dude out every so often
 					}
 				}
 			}
-			
+
 			//Update the counters
 			attemptDrops--;
 			ai->setVisibleItemsDelivered( ai->getVisibleItemsDelivered() + 1 );
@@ -909,7 +894,7 @@ void DeliveringState::onExit( StateExitType ) // Close the doors
 // ------------------------------------------------------------------------------------------------
 void ConsiderNewApproachState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -922,14 +907,14 @@ void ConsiderNewApproachState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferInt(&m_numberEntriesToState);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void ConsiderNewApproachState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -944,10 +929,10 @@ StateReturnType ConsiderNewApproachState::onEnter() // Increment local counter o
 
 	++m_numberEntriesToState;
 
-	DEBUG_LOG(("Considering approach #%d...\n",m_numberEntriesToState));
+	DEBUG_LOG(("Considering approach #%d...",m_numberEntriesToState));
 	if( m_numberEntriesToState > ai->getMaxNumberAttempts() )
 	{
-		DEBUG_LOG(("Too many approaches! Time to give up.\n"));
+		DEBUG_LOG(("Too many approaches! Time to give up."));
 		return STATE_FAILURE;
 	}
 
@@ -1021,7 +1006,7 @@ void ConsiderNewApproachState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void RecoverFromOffMapState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1034,14 +1019,14 @@ void RecoverFromOffMapState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUnsignedInt(&m_reEntryFrame);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void RecoverFromOffMapState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp
index 48062d7aa41..4d7749f530c 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp
@@ -26,7 +26,7 @@
 // Author: Kris Morness, August 2002
 // Desc:   A standard ai update that also handles units that must deploy to attack and pack before moving.
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingFactory.h"
@@ -46,11 +46,6 @@
 #include "GameLogic/Module/DeployStyleAIUpdate.h"
 #include "GameLogic/Module/PhysicsUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -63,12 +58,12 @@ DeployStyleAIUpdate::DeployStyleAIUpdate( Thing *thing, const ModuleData* module
 	m_state = READY_TO_MOVE;
 	m_frameToWakeForDeploy = 0;
 	reset();
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 DeployStyleAIUpdate::~DeployStyleAIUpdate( void )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool DeployStyleAIUpdate::isIdle() const
@@ -112,13 +107,13 @@ void DeployStyleAIUpdate::aiDoCommand( const AICommandParms* parms )
 			m_lastOutsideCommand.store( *parms );
 			m_hasOutsideCommand = TRUE;
 		}
-		
+
 		if( m_state != DEPLOY && m_state != UNDEPLOY )
 		{
 			//Only issue the command if we're not in the process of deploying/undeploying.
 			AIUpdateInterface::aiDoCommand( parms );
 		}
-		switch( parms->m_cmd ) 
+		switch( parms->m_cmd )
 		{
 			case AICMD_GUARD_POSITION:
 				m_position.set( &parms->m_pos );
@@ -226,12 +221,12 @@ UpdateSleepTime DeployStyleAIUpdate::update( void )
 						m_overriddenAttack = TRUE;
 						m_designatedTargetID = designatedTarget->getID();
 					}
-					else 
+					else
 					{
 						designatedTarget = NULL;
 					}
 				}
-				else 
+				else
 				{
 					designatedTarget = NULL;
 				}
@@ -321,7 +316,7 @@ UpdateSleepTime DeployStyleAIUpdate::update( void )
 			break;
 		}
 	}
-	
+
 	UpdateSleepTime mine = UPDATE_SLEEP_FOREVER;
 	switch( m_state )
 	{
@@ -356,7 +351,7 @@ void DeployStyleAIUpdate::setMyState( DeployStateTypes stateID )
 		{
 			//Tell our object to deploy (so it can continue the same attack later).
 			aiIdle( CMD_FROM_AI );
-			self->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_PACKING ), 
+			self->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_PACKING ),
 																						 MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ) );
 			m_frameToWakeForDeploy = getUnpackTime(); //In frames
 			//Make sure the animation matches the length of unpacking
@@ -372,7 +367,7 @@ void DeployStyleAIUpdate::setMyState( DeployStateTypes stateID )
 				soundToPlay.setObjectID( self->getID() );
 				TheAudio->addAudioEvent( &soundToPlay );
 			}
-			
+
 			break;
 		}
 		case UNDEPLOY:
@@ -394,7 +389,7 @@ void DeployStyleAIUpdate::setMyState( DeployStateTypes stateID )
 					setTurretEnabled( tur, false );
 				}
 			}
-			
+
 			//Play undeploy sound
 			const ThingTemplate *thing = self->getTemplate();
 			const AudioEventRTS* soundToPlayPtr = thing->getPerUnitSound( "Undeploy" );
@@ -434,7 +429,7 @@ void DeployStyleAIUpdate::setMyState( DeployStateTypes stateID )
  				aiDoCommand(&parms);
 			}
 
-			self->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ), 
+			self->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ),
 																						 MAKE_MODELCONDITION_MASK( MODELCONDITION_DEPLOYED) );
 
 			if( doTurretsFunctionOnlyWhenDeployed() )
@@ -470,12 +465,12 @@ void DeployStyleAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Added support for attack move
 	* 3: Added improved support for guard, and support for hunt AI
  **/
@@ -486,7 +481,7 @@ void DeployStyleAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 3;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -517,7 +512,7 @@ void DeployStyleAIUpdate::xfer( Xfer *xfer )
 		obsolete.doXfer(xfer);
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -526,5 +521,5 @@ void DeployStyleAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
index 40745308ad8..4ef21b66eb0 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/Team.h"
@@ -55,11 +55,6 @@
 #include "GameLogic/Module/DozerAIUpdate.h"
 #include "GameClient/InGameUI.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
 class DozerPrimaryStateMachine;
@@ -86,7 +81,7 @@ enum DozerActionType CPP_11(: Int)
 //-------------------------------------------------------------------------------------------------
 class DozerActionPickActionPosState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionPickActionPosState, "DozerActionPickActionPosState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionPickActionPosState, "DozerActionPickActionPosState")
 
 public:
 
@@ -100,9 +95,9 @@ class DozerActionPickActionPosState : public State
 	virtual void loadPostProcess();
 
 protected:
-	
+
 	DozerTask m_task;							///< our task
-	Int m_failedAttempts;					/**< counter for successive unsuccessfull attempts to pick 
+	Int m_failedAttempts;					/**< counter for successive unsuccessfull attempts to pick
 																		 and move to an action position */
 
 };
@@ -118,14 +113,14 @@ DozerActionPickActionPosState::DozerActionPickActionPosState( StateMachine *mach
 	m_task = task;
 	m_failedAttempts = 0;
 
-}  // end DozerActionPickActionPosState
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
 // ------------------------------------------------------------------------------------------------
 void DozerActionPickActionPosState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -139,14 +134,14 @@ void DozerActionPickActionPosState::xfer( Xfer *xfer )
 
 	xfer->xferUser(&m_task, sizeof(m_task));
 	xfer->xferInt(&m_failedAttempts);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DozerActionPickActionPosState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Pick a position around the target */
@@ -172,7 +167,7 @@ StateReturnType DozerActionPickActionPosState::update( void )
 	Object *goalObject = TheGameLogic->findObjectByID( dozerAI->getTaskTarget( m_task ) );
 
 	// if there is no goal, get out of this machine with a failure code (success is done in the action state )
-	if( goalObject == NULL )	
+	if( goalObject == NULL )
 	{
 
 		// to be clean get rid of the goal object we set
@@ -184,7 +179,7 @@ StateReturnType DozerActionPickActionPosState::update( void )
 		// exit with failure
 		return STATE_FAILURE;
 
-	}  // end if
+	}
 
 	// pick a location to move to
 	Coord3D goalPos;
@@ -203,7 +198,7 @@ StateReturnType DozerActionPickActionPosState::update( void )
 		Coord2D v;
 		v.x = dozer->getPosition()->x - goalObject->getPosition()->x;
 		v.y = dozer->getPosition()->y - goalObject->getPosition()->y;
-	
+
 		Real radius = goalObject->getGeometryInfo().getBoundingSphereRadius();
 		FindPositionOptions fpOptions;
 		fpOptions.minRadius = radius;
@@ -218,7 +213,7 @@ StateReturnType DozerActionPickActionPosState::update( void )
 			// if ai.
 			goalPos = *goalObject->getPosition();
 
-		}  // end if	
+		}
 
 		//
 		// we only ignore the goal object when we did the point selection in this more
@@ -226,7 +221,7 @@ StateReturnType DozerActionPickActionPosState::update( void )
 		//
 		ai->ignoreObstacle( goalObject );
 
-	}  // end if
+	}
 
 	// set goal position and object
 	machine->setGoalObject( goalObject );
@@ -236,14 +231,14 @@ StateReturnType DozerActionPickActionPosState::update( void )
 
 	return STATE_SUCCESS;
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Dozer moves to the action position */
 //-------------------------------------------------------------------------------------------------
 class DozerActionMoveToActionPosState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionMoveToActionPosState, "DozerActionMoveToActionPosState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionMoveToActionPosState, "DozerActionMoveToActionPosState")
 
 public:
 
@@ -268,7 +263,7 @@ EMPTY_DTOR(DozerActionMoveToActionPosState)
 // ------------------------------------------------------------------------------------------------
 void DozerActionMoveToActionPosState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -281,14 +276,14 @@ void DozerActionMoveToActionPosState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUser(&m_task, sizeof(m_task));
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DozerActionMoveToActionPosState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 /** We are supposed to be on route to our action position now, see when we get there or
@@ -304,10 +299,10 @@ StateReturnType DozerActionMoveToActionPosState::update( void )
 		return STATE_FAILURE;
 
 	AIUpdateInterface *ai = dozer->getAIUpdateInterface();
-	ObjectID currentRepairer = goalObject->getSoleHealingBenefactor(); 
+	ObjectID currentRepairer = goalObject->getSoleHealingBenefactor();
 	if( m_task==DOZER_TASK_REPAIR && currentRepairer != INVALID_ID && currentRepairer != dozer->getID() )//oops I guess someone beat me to it!
 	{
-		if ( ai )	
+		if ( ai )
 		{
 			DozerAIInterface *dozerAI = ai->getDozerAIInterface();
 			if ( dozerAI )
@@ -329,7 +324,7 @@ StateReturnType DozerActionMoveToActionPosState::update( void )
 	if( (m_task == DOZER_TASK_BUILD) && goalObject && (goalObject->getBuilderID() != dozer->getID()) )
 	{
 		// Geebus.  Returning failure is ignored, so you have to explicitly make the ai stop trying to restart the machine
-		if ( ai )	
+		if ( ai )
 		{
 			DozerAIInterface *dozerAI = ai->getDozerAIInterface();
 			if ( dozerAI )
@@ -357,40 +352,38 @@ StateReturnType DozerActionMoveToActionPosState::update( void )
 			// but the setting of the same model condition doesn't have any adverse effects
 			//
 			goalObject->clearAndSetModelConditionFlags(
-				MAKE_MODELCONDITION_MASK(MODELCONDITION_AWAITING_CONSTRUCTION), 
+				MAKE_MODELCONDITION_MASK(MODELCONDITION_AWAITING_CONSTRUCTION),
 				MAKE_MODELCONDITION_MASK2(MODELCONDITION_PARTIALLY_CONSTRUCTED, MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED));
 
-		}  // end if
+		}
 
 		return STATE_SUCCESS;
 
-	}  // end if
+	}
 
 
 	// if we're in the idle state fail our move
-	// Failure transition is back to DOZER_ACTION_PICK_ACTION_POS, so 
+	// Failure transition is back to DOZER_ACTION_PICK_ACTION_POS, so
 	// it is ok to fail. jba.
 	if( ai && ai->isIdle() )
 		return STATE_FAILURE;
 
 	return STATE_CONTINUE;
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Dozer does the "action" */
 //-------------------------------------------------------------------------------------------------
 class DozerActionDoActionState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionDoActionState, "DozerActionDoActionState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionDoActionState, "DozerActionDoActionState")
 
 public:
 
-	DozerActionDoActionState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionDoActionState" ) 
-	{ 
-		m_task = task; 
-		//Added By Sadullah Nader
-		// Initializations missing and needed
+	DozerActionDoActionState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionDoActionState" )
+	{
+		m_task = task;
 		m_enterFrame = 0;
 	}
 	virtual StateReturnType update( void );
@@ -404,7 +397,7 @@ class DozerActionDoActionState : public State
 	virtual void loadPostProcess();
 
 protected:
-	
+
 	DozerTask m_task;						///< our task
 	UnsignedInt m_enterFrame;		///< frame we entered this state on
 
@@ -416,7 +409,7 @@ EMPTY_DTOR(DozerActionDoActionState)
 // ------------------------------------------------------------------------------------------------
 void DozerActionDoActionState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -430,14 +423,14 @@ void DozerActionDoActionState::xfer( Xfer *xfer )
 
 	xfer->xferUser(&m_task, sizeof(m_task));
 	xfer->xferUnsignedInt(&m_enterFrame);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DozerActionDoActionState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Entering the do action state */
@@ -451,7 +444,7 @@ StateReturnType DozerActionDoActionState::onEnter( void )
 		return STATE_FAILURE;
 	}
 	// DozerAIUpdate *dozerAI = static_cast<DozerAIUpdate *>(dozer->getAIUpdateInterface());
-	
+
 	// record the frame we came in on
 	m_enterFrame = TheGameLogic->getFrame();
 
@@ -461,7 +454,7 @@ StateReturnType DozerActionDoActionState::onEnter( void )
 
 	return STATE_CONTINUE;
 
-}  // end onEnter
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Do the action */
@@ -513,8 +506,8 @@ StateReturnType DozerActionDoActionState::update( void )
 				// we're now moving to the dock location
 				dozerAI->setBuildSubTask( DOZER_MOVING_TO_BUILD_DOCK_LOCATION );
 
-			}  // end if
-			
+			}
+
 			// if we're moving to the build dock location, when we become idle we are there
 			if( dozerAI->getBuildSubTask() == DOZER_MOVING_TO_BUILD_DOCK_LOCATION )
 			{
@@ -525,7 +518,7 @@ StateReturnType DozerActionDoActionState::update( void )
 					// from the building itself)
 					dozerAI->startBuildingSound( goalObject->getTemplate()->getPerUnitSound( "UnderConstruction" ), goalObject->getID() );
 				}
-			}  // end if
+			}
 
 			// only do the build if we've moved into the dock position
 			if( dozerAI->getBuildSubTask() == DOZER_DO_BUILD_AT_DOCK )
@@ -533,12 +526,12 @@ StateReturnType DozerActionDoActionState::update( void )
 
 				// the builder is now actively constructing something
 				dozer->setModelConditionState( MODELCONDITION_ACTIVELY_CONSTRUCTING );
-				
+
 
 				// increase the construction percent of the goal object
 				Int framesToBuild = goalObject->getTemplate()->calcTimeToBuild( dozer->getControllingPlayer() );
 				Real percentProgressThisFrame = 100.0f / framesToBuild;
-				goalObject->setConstructionPercent( goalObject->getConstructionPercent() + 
+				goalObject->setConstructionPercent( goalObject->getConstructionPercent() +
 																						percentProgressThisFrame );
 
 				//
@@ -604,7 +597,7 @@ StateReturnType DozerActionDoActionState::update( void )
 							create->onBuildComplete();
 						}
 
-					}  // end if
+					}
 
 					// Creation is another valid and essential time to call this.  This building now Looks.
 					goalObject->handlePartitionCellMaintenance();
@@ -613,7 +606,7 @@ StateReturnType DozerActionDoActionState::update( void )
 					/// @todo need to write this
 
 					// do some UI stuff for the constrolling player
-					if( dozer->isLocallyControlled() )
+					if( dozer->isLocallyViewed() )
 					{
 
 						// message the the building player
@@ -625,7 +618,7 @@ StateReturnType DozerActionDoActionState::update( void )
 
 							objectName.format( format, goalObject->getTemplate()->getName().str() );
 
-						}  // end if
+						}
 
 						UnicodeString msg;
 						msg.format( format.str(), objectName.str() );
@@ -638,11 +631,11 @@ StateReturnType DozerActionDoActionState::update( void )
 						/// make radar neat-o attention grabber event at build location
 						TheRadar->createEvent( goalObject->getPosition(), RADAR_EVENT_CONSTRUCTION );
 
-					}  // end if
+					}
 
 					// this will allow us to exit the state machine with success
 					complete = TRUE;
-	
+
 					// move off to the end dock position if present
 					const Coord3D *endPos = dozerAI->getDockPoint( m_task, DOZER_DOCK_POINT_END );
 					Coord3D pos = *dozer->getPosition();
@@ -653,13 +646,13 @@ StateReturnType DozerActionDoActionState::update( void )
 					TheAI->pathfinder()->adjustToPossibleDestination(dozer, ai->getLocomotorSet(), &pos);
 					ai->aiMoveToPosition( &pos, CMD_FROM_AI );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end build
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case DOZER_TASK_REPAIR:
@@ -676,7 +669,7 @@ StateReturnType DozerActionDoActionState::update( void )
 				// we're now complete
 				complete = TRUE;
 
-			}  // end if
+			}
 			else
 			{
 				Bool canHeal = TRUE;
@@ -695,16 +688,16 @@ StateReturnType DozerActionDoActionState::update( void )
 				if( goalObject->isKindOf( KINDOF_BRIDGE_TOWER ) )
 				{
 					BridgeTowerBehaviorInterface *btbi = BridgeTowerBehavior::getBridgeTowerBehaviorInterfaceFromObject( goalObject );
-					DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower interface\n") );
+					DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower interface") );
 					Object *bridgeObject = TheGameLogic->findObjectByID( btbi->getBridgeID() );
-					DEBUG_ASSERTCRASH( bridgeObject, ("Unable to find bridge center object\n") );
+					DEBUG_ASSERTCRASH( bridgeObject, ("Unable to find bridge center object") );
 					BridgeBehaviorInterface *bbi = BridgeBehavior::getBridgeBehaviorInterfaceFromObject( bridgeObject );
-					DEBUG_ASSERTCRASH( bbi, ("Unable to find bridge interface from tower goal object during repair\n") );
+					DEBUG_ASSERTCRASH( bbi, ("Unable to find bridge interface from tower goal object during repair") );
 
 					if( bbi->isScaffoldInMotion() == TRUE )
 						canHeal = FALSE;
 
-				}  // end if
+				}
 
 				// do healing
 				if( canHeal )
@@ -730,15 +723,15 @@ StateReturnType DozerActionDoActionState::update( void )
 
 
 
-				}  // end if
+				}
 
-			}  // end else
+			}
 
 			// play a repairing sound
 
 			break;
 
-		}  // end repair
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case DOZER_TASK_FORTIFY:
@@ -747,18 +740,18 @@ StateReturnType DozerActionDoActionState::update( void )
 			/// @todo write me
 			break;
 
-		}  // end fortify
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 		{
 
-			DEBUG_CRASH(( "Unknown task for the dozer action do action state\n" ));
+			DEBUG_CRASH(( "Unknown task for the dozer action do action state" ));
 			return STATE_FAILURE;
 
-		}  // end default
+		}
 
-	}  // end switch
+	}
 
 	// if we're complete with the task we exit success
 	if( complete == TRUE )
@@ -769,20 +762,20 @@ StateReturnType DozerActionDoActionState::update( void )
 
 		// to be clean get rid of the goal object we set
 		getMachine()->setGoalObject( NULL );
- 
+
 
 		getMachineOwner()->setWeaponSetFlag(WEAPONSET_MINE_CLEARING_DETAIL);//maybe go clear some mines, if I feel like it
 		// we're done
 		return STATE_SUCCESS;
 
-	}  // end if
+	}
 
 	// just continue sitting here for a while
 	getMachineOwner()->clearWeaponSetFlag(WEAPONSET_MINE_CLEARING_DETAIL);// no mine clearing fun while I'm on the job
 
 	return STATE_CONTINUE;
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The Dozer action state machine */
@@ -812,7 +805,7 @@ EMPTY_DTOR(DozerActionStateMachine)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-DozerActionStateMachine::DozerActionStateMachine( Object *owner, DozerTask task ) : 
+DozerActionStateMachine::DozerActionStateMachine( Object *owner, DozerTask task ) :
 												 StateMachine( owner, "DozerActionStateMachine" )
 {
 
@@ -831,7 +824,7 @@ DozerActionStateMachine::DozerActionStateMachine( Object *owner, DozerTask task
 // ------------------------------------------------------------------------------------------------
 void DozerActionStateMachine::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -844,14 +837,14 @@ void DozerActionStateMachine::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUser(&m_task, sizeof(m_task));
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DozerActionStateMachine::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -868,7 +861,7 @@ static Object *findObjectToRepair( Object *dozer )
 		return  NULL;
 	if( !dozer->getAIUpdateInterface() )
 	{
-		return NULL; 
+		return NULL;
 	}
 	const DozerAIInterface *dozerAI = dozer->getAIUpdateInterface()->getDozerAIInterface();
 
@@ -900,7 +893,7 @@ static Object *findObjectToRepair( Object *dozer )
 			closestRepairTarget = obj;
 			closestRepairTargetDistSqr = ThePartitionManager->getDistanceSquared( dozer, obj, FROM_CENTER_2D );
 
-		}  // end if
+		}
 		else
 		{
 
@@ -908,19 +901,19 @@ static Object *findObjectToRepair( Object *dozer )
 			Real distSqr = ThePartitionManager->getDistanceSquared( dozer, obj, FROM_CENTER_2D );
 			if( distSqr < closestRepairTargetDistSqr )
 			{
-				
+
 				closestRepairTarget = obj;
 				closestRepairTargetDistSqr = distSqr;
 
-			}  // end if
+			}
 
-		}  // end else
+		}
 
-	}  // end for obj
+	}
 
 	return closestRepairTarget;
 
-}  // end findObjectToRepair
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -932,7 +925,7 @@ static Object *findMine( Object *dozer )
 		return  NULL;
 	if( !dozer->getAIUpdateInterface() )
 	{
-		return NULL; 
+		return NULL;
 	}
 	const DozerAIInterface *dozerAI = dozer->getAIUpdateInterface()->getDozerAIInterface();
 
@@ -945,7 +938,7 @@ static Object *findMine( Object *dozer )
 	Object* mine = ThePartitionManager->getClosestObject(dozer, dozerAI->getBoredRange(), FROM_CENTER_2D, filters);
 
 	return mine;
-}  // end findMine
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Available primary Dozer states */
@@ -964,11 +957,11 @@ enum
 //-------------------------------------------------------------------------------------------------
 class DozerPrimaryIdleState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerPrimaryIdleState, "DozerPrimaryIdleState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerPrimaryIdleState, "DozerPrimaryIdleState")
 
 public:
 
-	DozerPrimaryIdleState( StateMachine *machine ) : State( machine, "DozerPrimaryIdleState" ) 
+	DozerPrimaryIdleState( StateMachine *machine ) : State( machine, "DozerPrimaryIdleState" )
 	{
 		m_idleTooLongTimestamp = 0;
 		m_idlePlayerNumber = 0;
@@ -997,7 +990,7 @@ EMPTY_DTOR(DozerPrimaryIdleState)
 // ------------------------------------------------------------------------------------------------
 void DozerPrimaryIdleState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1012,14 +1005,14 @@ void DozerPrimaryIdleState::xfer( Xfer *xfer )
 	xfer->xferUnsignedInt(&m_idleTooLongTimestamp);
 	xfer->xferInt(&m_idlePlayerNumber);
 	xfer->xferBool(&m_isMarkedAsIdle);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DozerPrimaryIdleState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -1040,7 +1033,7 @@ StateReturnType DozerPrimaryIdleState::onEnter( void )
 
 	return STATE_CONTINUE;
 
-}  // end onEnter
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Upon exiting the dozer primary idle state */
@@ -1098,7 +1091,7 @@ StateReturnType DozerPrimaryIdleState::update( void )
 	//
 	if( !ai->isIdle() )
 		m_idleTooLongTimestamp = TheGameLogic->getFrame();
-	
+
 	//
 	// if we're just sitting here in idle, and there is no task pending ... after so long we'll
 	// try to go to the nearest command center
@@ -1135,19 +1128,19 @@ StateReturnType DozerPrimaryIdleState::update( void )
 			}
 		}
 
-					
-	}  // end if
+
+	}
 
 	return STATE_CONTINUE;
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Dozer action state */
 //-------------------------------------------------------------------------------------------------
 class DozerActionState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionState, "DozerActionState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionState, "DozerActionState")
 
 public:
 
@@ -1157,9 +1150,9 @@ class DozerActionState : public State
 		m_actionMachine = newInstance(DozerActionStateMachine)( getMachineOwner(), task );
 		m_actionMachine->initDefaultState();
 	}
-	/* 
+	/*
 		Note that we DON'T use CONVERT_SLEEP_TO_CONTINUE; since we're not doing anything else
-		interesting in update, we can sleep when this machine sleeps 
+		interesting in update, we can sleep when this machine sleeps
 	*/
 	virtual StateReturnType update( void ) { return m_actionMachine->updateStateMachine(); }
 
@@ -1178,14 +1171,14 @@ class DozerActionState : public State
 	StateMachine *m_actionMachine;
 
 };
-inline DozerActionState::~DozerActionState( void ) { if (m_actionMachine) deleteInstance(m_actionMachine); }
+inline DozerActionState::~DozerActionState( void ) { deleteInstance(m_actionMachine); }
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
 // ------------------------------------------------------------------------------------------------
 void DozerActionState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1199,14 +1192,14 @@ void DozerActionState::xfer( Xfer *xfer )
 
 	xfer->xferUser(&m_task, sizeof(m_task));
 	xfer->xferSnapshot(m_actionMachine);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DozerActionState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -1233,7 +1226,7 @@ StateReturnType DozerActionState::onEnter( void )
 
 	return STATE_CONTINUE;
 
-}  // end onEnter
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1249,14 +1242,14 @@ void DozerActionState::onExit( StateExitType status )
 	DozerAIInterface *dozerAI = dozer->getAIUpdateInterface()->getDozerAIInterface();
 	dozerAI->setCurrentTask( DOZER_TASK_INVALID );
 
-}  // end onExit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Dozer primary going home state */
 //-------------------------------------------------------------------------------------------------
 class DozerPrimaryGoingHomeState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerPrimaryGoingHomeState, "DozerPrimaryGoingHomeState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerPrimaryGoingHomeState, "DozerPrimaryGoingHomeState")
 
 protected:
 	// snapshot interface	 STUBBED no member vars
@@ -1276,12 +1269,12 @@ EMPTY_DTOR(DozerPrimaryGoingHomeState)
 //-------------------------------------------------------------------------------------------------
 DozerPrimaryStateMachine::DozerPrimaryStateMachine( Object *owner ) : StateMachine( owner, "DozerPrimaryStateMachine" )
 {
-	static const StateConditionInfo idleConditions[] = 
+	static const StateConditionInfo idleConditions[] =
 	{
 		StateConditionInfo(isBuildMostImportant, DOZER_PRIMARY_BUILD, NULL),
 		StateConditionInfo(isRepairMostImportant, DOZER_PRIMARY_REPAIR, NULL),
 		StateConditionInfo(isFortifyMostImportant, DOZER_PRIMARY_FORTIFY, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -1291,14 +1284,14 @@ DozerPrimaryStateMachine::DozerPrimaryStateMachine( Object *owner ) : StateMachi
 	defineState( DOZER_PRIMARY_FORTIFY, newInstance(DozerActionState)( this, DOZER_TASK_FORTIFY ), DOZER_PRIMARY_IDLE, DOZER_PRIMARY_IDLE );
 	defineState( DOZER_PRIMARY_GO_HOME, newInstance(DozerPrimaryGoingHomeState)( this ), DOZER_PRIMARY_IDLE, DOZER_PRIMARY_IDLE );
 
-}  // end DozerPrimaryStateMachine
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 DozerPrimaryStateMachine::~DozerPrimaryStateMachine( void )
 {
 
-}  // end ~DozerPrimaryStateMachine
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -1306,19 +1299,19 @@ DozerPrimaryStateMachine::~DozerPrimaryStateMachine( void )
 void DozerPrimaryStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void DozerPrimaryStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1326,7 +1319,7 @@ void DozerPrimaryStateMachine::xfer( Xfer *xfer )
 void DozerPrimaryStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1351,7 +1344,7 @@ Bool DozerPrimaryStateMachine::isBuildMostImportant( State *thisState, void* use
 	DozerTask task = dozerAI->getMostRecentCommand();
 	return task == DOZER_TASK_BUILD;
 
-}  // end isBuildMostImportant
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1376,7 +1369,7 @@ Bool DozerPrimaryStateMachine::isRepairMostImportant( State *thisState, void* us
 	DozerTask task = dozerAI->getMostRecentCommand();
 	return task == DOZER_TASK_REPAIR;
 
-}  // end isRepairMostImportant
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1401,7 +1394,7 @@ Bool DozerPrimaryStateMachine::isFortifyMostImportant( State *thisState, void* u
 	DozerTask task = dozerAI->getMostRecentCommand();
 	return task == DOZER_TASK_FORTIFY;
 
-}  // end isFortifyMostImportat
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1416,14 +1409,14 @@ DozerAIUpdateModuleData::DozerAIUpdateModuleData( void )
 	m_boredTime = 0.0f;
 	m_boredRange = 0.0f;
 
-}  // end DozerAIUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 void DozerAIUpdateModuleData::buildFieldParse( MultiIniFieldParse& p)
 {
   AIUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "RepairHealthPercentPerSecond",	INI::parsePercentToReal,	NULL, offsetof( DozerAIUpdateModuleData, m_repairHealthPercentPerSecond ) },
 		{ "BoredTime",										INI::parseDurationReal,		NULL, offsetof( DozerAIUpdateModuleData, m_boredTime ) },
@@ -1433,13 +1426,13 @@ void DozerAIUpdateModuleData::buildFieldParse( MultiIniFieldParse& p)
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-DozerAIUpdate::DozerAIUpdate( Thing *thing, const ModuleData* moduleData ) : 
+DozerAIUpdate::DozerAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 							 AIUpdateInterface( thing, moduleData )
-               
+
 {
 	Int i, j;
 
@@ -1455,9 +1448,9 @@ DozerAIUpdate::DozerAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 			m_dockPoint[ i ][ j ].valid = FALSE;
 			m_dockPoint[ i ][ j ].location.zero();
 
-		}  // end for j
+		}
 
-	}  // end for i
+	}
 	m_currentTask = DOZER_TASK_INVALID;
 
 	m_buildSubTask = DOZER_SELECT_BUILD_DOCK_LOCATION;  // irrelavant, but I want non-garbage value
@@ -1469,7 +1462,7 @@ DozerAIUpdate::DozerAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 	m_dozerMachine = NULL;
 
 	createMachines();
-}  // end DozerAIUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1477,8 +1470,7 @@ DozerAIUpdate::~DozerAIUpdate( void )
 {
 
 	// delete our behavior state machine
-	if( m_dozerMachine )
-		deleteInstance(m_dozerMachine);
+	deleteInstance(m_dozerMachine);
 
 	// no orders
 	for( Int i = 0; i < DOZER_NUM_TASKS; i++ )
@@ -1487,9 +1479,9 @@ DozerAIUpdate::~DozerAIUpdate( void )
 		m_task[ i ].m_targetObjectID = INVALID_ID;
 		m_task[ i ].m_taskOrderFrame = 0;
 
-	}  // end for i
+	}
 
-}  // end ~DozerAIUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Create any sub machines we need to do all our behavior */
@@ -1503,9 +1495,9 @@ void DozerAIUpdate::createMachines( void )
 		m_dozerMachine = newInstance(DozerPrimaryStateMachine)( getObject() );
 		m_dozerMachine->initDefaultState();
 
-	}  // end if
+	}
 
-}  // end createMachines
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Create the bridge scaffolding if necessary for the bridge that is attached to this tower */
@@ -1531,7 +1523,7 @@ void DozerAIUpdate::createBridgeScaffolding( Object *bridgeTower )
 	// tell the bridge to create scaffolding if necessary
 	bbi->createScaffolding();
 
-}  // end createBridgeScaffolding
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove the bridge scaffolding from the bridge object that is attached to this tower */
@@ -1557,7 +1549,7 @@ void DozerAIUpdate::removeBridgeScaffolding( Object *bridgeTower )
 	// tell the bridge to end any scaffolding from repairing
 	bbi->removeScaffolding();
 
-}  // end removeBridgeScaffolding
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1581,7 +1573,7 @@ UpdateSleepTime DozerAIUpdate::update( void )
 			getCurLocomotor()->setUltraAccurate( TRUE );
 			getCurLocomotor()->setAllowInvalidPosition(TRUE);
 	}*/
-	
+
 	// extend the normal AI system
 	UpdateSleepTime result;
 	result = AIUpdateInterface::update();
@@ -1595,22 +1587,27 @@ UpdateSleepTime DozerAIUpdate::update( void )
 	DozerTask currentTask = getCurrentTask();
 	if( currentTask != DOZER_TASK_INVALID )
 	{
-		
+
 
 		ObjectID taskTarget = getTaskTarget( currentTask );
 		Object *targetObject = TheGameLogic->findObjectByID( taskTarget );
 		Bool invalidTask = FALSE;
 
 		// validate the task and the target
+		// TheSuperHackers @bugfix Stubbjax 16/11/2025 Invalidate the task when the build scaffold is destroyed.
 		if( currentTask == DOZER_TASK_REPAIR &&
 				TheActionManager->canRepairObject( getObject(), targetObject, getLastCommandSource() ) == FALSE )
 			invalidTask = TRUE;
-		
+#if !RETAIL_COMPATIBLE_CRC
+		else if (currentTask == DOZER_TASK_BUILD && targetObject == NULL)
+			invalidTask = TRUE;
+#endif
+
 		// cancel the task if it's now invalid
 		if( invalidTask == TRUE )
 			cancelTask( currentTask );
 
-	}  // end if
+	}
 	else
 		getObject()->setWeaponSetFlag(WEAPONSET_MINE_CLEARING_DETAIL);//maybe go clear some mines, if I feel like it
 
@@ -1618,15 +1615,15 @@ UpdateSleepTime DozerAIUpdate::update( void )
 	m_dozerMachine->updateStateMachine();
 
 	return UPDATE_SLEEP_NONE;
-		
-}  // end update
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The entry point of a construct command to the Dozer */
 //-------------------------------------------------------------------------------------------------
-Object *DozerAIUpdate::construct( const ThingTemplate *what, 
-																	const Coord3D *pos, 
-																	Real angle, 
+Object *DozerAIUpdate::construct( const ThingTemplate *what,
+																	const Coord3D *pos,
+																	Real angle,
 																	Player *owningPlayer,
 																	Bool isRebuild )
 {
@@ -1646,8 +1643,8 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 
 	// sanity
 	DEBUG_ASSERTCRASH( getObject()->getControllingPlayer() == owningPlayer,
-										 ("Dozer::Construct - The controlling player of the Dozer is not the owning player passed in\n") );
-	
+										 ("Dozer::Construct - The controlling player of the Dozer is not the owning player passed in") );
+
 	// if we're not rebuilding, we have a few checks to pass first for sanity
 	if( isRebuild == FALSE )
 	{
@@ -1658,8 +1655,8 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 		{
 
 			// Just build it.  The ai will validate, or cheat.  jba.
-			
-		}  // end if
+
+		}
 		else
 		{
 
@@ -1676,9 +1673,9 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 																										 getObject(), NULL ) != LBC_OK )
 				return NULL;
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
 	//
 	// what will our initial status bits be, it is important to do this early
@@ -1702,7 +1699,7 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 
 		money->withdraw( what->calcCostToBuild( owningPlayer ) );
 
-	}  // end if	
+	}
 
 	// initialize object
 	obj->setPosition( pos );
@@ -1713,7 +1710,7 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 	Coord3D adjustedPos = *pos;
 	adjustedPos.z = TheTerrainLogic->getGroundHeight(pos->x, pos->y);
 	obj->setPosition(&adjustedPos);
-	
+
 	// Note - very important that we add to map AFTER we flatten terrain. jba.
 	TheAI->pathfinder()->addObjectToPathfindMap( obj );
 	// "callback" event for structure created (note that it's not yet "complete")
@@ -1728,7 +1725,7 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 
 	// set the model action state to awaiting construction
 	obj->clearAndSetModelConditionFlags(
-		MAKE_MODELCONDITION_MASK2(MODELCONDITION_PARTIALLY_CONSTRUCTED, MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED), 
+		MAKE_MODELCONDITION_MASK2(MODELCONDITION_PARTIALLY_CONSTRUCTED, MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED),
 		MAKE_MODELCONDITION_MASK(MODELCONDITION_AWAITING_CONSTRUCTION)
 	);
 
@@ -1736,8 +1733,8 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 	newTask( DOZER_TASK_BUILD, obj );
 
 	return obj;
-				
-}  // end construct
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given our current task and repair target, can we accept this as a new repair target */
@@ -1764,7 +1761,7 @@ Bool DozerAIUpdate::canAcceptNewRepair( Object *obj )
 			return FALSE;
 
 		// check for repairing any tower on the same bridge
-		if( currentRepair->isKindOf( KINDOF_BRIDGE_TOWER ) && 
+		if( currentRepair->isKindOf( KINDOF_BRIDGE_TOWER ) &&
 				obj->isKindOf( KINDOF_BRIDGE_TOWER ) )
 		{
 			BridgeTowerBehaviorInterface *currentTowerInterface = NULL;
@@ -1777,23 +1774,23 @@ Bool DozerAIUpdate::canAcceptNewRepair( Object *obj )
 			if( currentTowerInterface == NULL || newTowerInterface == NULL )
 			{
 
-				DEBUG_CRASH(( "Unable to find bridge tower interface on object\n" ));
+				DEBUG_CRASH(( "Unable to find bridge tower interface on object" ));
 				return FALSE;
 
-			}  // end if
+			}
 
 			// if they are part of the same bridge, ignore this repair command
 			if( currentTowerInterface->getBridgeID() == newTowerInterface->getBridgeID() )
 				return FALSE;
 
-		}  // end if
+		}
 
-	}  // end if, currentRepair object exists
+	}
 
 	// all is well
 	return TRUE;
 
-}  // end canAcceptNewRepair
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Issue an order for the Dozer to go repair the target 'obj' */
@@ -1823,24 +1820,24 @@ void DozerAIUpdate::privateRepair( Object *obj, CommandSourceType cmdSource )
 	//if( obj->isKindOf( KINDOF_BRIDGE_TOWER ) )
 	//{
 	//	BridgeTowerBehaviorInterface *btbi = BridgeTowerBehavior::getBridgeTowerBehaviorInterfaceFromObject( obj );
-	//	DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower behavior interface\n") );
+	//	DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower behavior interface") );
   //
 	//	Object *bridge = TheGameLogic->findObjectByID( btbi->getBridgeID() );
-	//	DEBUG_ASSERTCRASH( bridge, ("Unable to find bridge object\n") );
+	//	DEBUG_ASSERTCRASH( bridge, ("Unable to find bridge object") );
 	//	if( BitIsSet( bridge->getStatusBits(), OBJECT_STATUS_UNDERGOING_REPAIR ) == TRUE )
 	//		return;
   //
 	//}  // end if
-	
-	
+
+
 	// for bridges, set the status for the bridge object
 	//if( obj->isKindOf( KINDOF_BRIDGE_TOWER ) )
 	//{
 	//	BridgeTowerBehaviorInterface *btbi = BridgeTowerBehavior::getBridgeTowerBehaviorInterfaceFromObject( obj );
-	//	DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower behavior interface\n") );
+	//	DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower behavior interface") );
 	//
 	//  Object *bridge = TheGameLogic->findObjectByID( btbi->getBridgeID() );
-	//	DEBUG_ASSERTCRASH( bridge, ("Unable to find bridge object\n") );
+	//	DEBUG_ASSERTCRASH( bridge, ("Unable to find bridge object") );
 	//	bridge->setStatus( OBJECT_STATUS_UNDERGOING_REPAIR );
   //
 	//}  // end if
@@ -1848,7 +1845,7 @@ void DozerAIUpdate::privateRepair( Object *obj, CommandSourceType cmdSource )
 	// start the new task
 	newTask( DOZER_TASK_REPAIR, obj );
 
-}  // end repair
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Resume construction on a building */
@@ -1867,7 +1864,7 @@ void DozerAIUpdate::privateResumeConstruction( Object *obj, CommandSourceType cm
 	// start the new task for construction
 	newTask( DOZER_TASK_BUILD, obj );
 
-}  // end privateResumeConstruction
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1876,12 +1873,12 @@ void DozerAIUpdate::privateResumeConstruction( Object *obj, CommandSourceType cm
 	// The place we go to build or repair is the closest spot from us to them
 	Coord3D ourPosition = *me->getPosition();
 	Coord3D theirPosition = *target->getPosition();
-	
+
 	Coord3D bestPosition = theirPosition;// This answer is the best, as it includes findPositionAround
 	Coord3D workingPosition = theirPosition;// But if findPositionAround fails, we need to say something.
-	
-	Vector3 offset( ourPosition.x - theirPosition.x, 
-									ourPosition.y - theirPosition.y, 
+
+	Vector3 offset( ourPosition.x - theirPosition.x,
+									ourPosition.y - theirPosition.y,
 									ourPosition.z - theirPosition.z );
 	offset.Normalize();
 	// This scaler makes FindPositionAround bias towards our side
@@ -1968,7 +1965,7 @@ void DozerAIUpdate::newTask( DozerTask task, Object *target )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	// sanity
 	if( target == NULL )
@@ -1996,7 +1993,7 @@ void DozerAIUpdate::newTask( DozerTask task, Object *target )
 
 		//
 		// for building, we say that even "thinking" about building or rebuilding an object
-		// sets us as the current builder of that object.  this allows any dozers that are 
+		// sets us as the current builder of that object.  this allows any dozers that are
 		// ordered later to resume construction on something to see that somebody is already taking
 		// care of it and then they won't be even try to resume a build since we don't allow
 		// multiple dozers/workers to double up on construction efforts
@@ -2016,7 +2013,7 @@ void DozerAIUpdate::newTask( DozerTask task, Object *target )
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_END ].valid				= TRUE;
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_END ].location		= position;
 
-	}  // end if
+	}
 
 	// set the new task target and the frame in which we got this order
 	m_task[ task ].m_targetObjectID = target->getID();
@@ -2025,10 +2022,10 @@ void DozerAIUpdate::newTask( DozerTask task, Object *target )
 	// reset the dozer behavior so that it can re-evluate which task to continue working on
 	m_dozerMachine->resetToDefaultState();
 
-}  // end newTask
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Cancel a task and reset the dozer behavior state machine so that it can 
+/** Cancel a task and reset the dozer behavior state machine so that it can
 	* re-evaluate what it wants to do if it was working on the task being
 	* cancelled */
 //-------------------------------------------------------------------------------------------------
@@ -2041,7 +2038,7 @@ void DozerAIUpdate::cancelTask( DozerTask task )
 	// reset the machine to we can re-evaluate what we want to do
 	m_dozerMachine->resetToDefaultState();
 
-}  // end cancelTask
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is there a given task waiting to be done */
@@ -2050,25 +2047,25 @@ Bool DozerAIUpdate::isTaskPending( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	return m_task[ task ].m_targetObjectID != 0 ? TRUE : FALSE;
-		
-}  // end isTaskPending
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is there any task pending */
 //-------------------------------------------------------------------------------------------------
 Bool DozerAIUpdate::isAnyTaskPending( void )
 {
-	
+
 	for( Int i = 0; i < DOZER_NUM_TASKS; i++ )
 		if( isTaskPending( (DozerTask)i ) )
 			return TRUE;
 
 	return FALSE;
 
-}  // end isAnyTaskPending
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the target object of a given task */
@@ -2077,11 +2074,11 @@ ObjectID DozerAIUpdate::getTaskTarget( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	return m_task[ task ].m_targetObjectID;
 
-}  // end getTaskTarget
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set a task as successfully completed */
@@ -2090,7 +2087,7 @@ void DozerAIUpdate::internalTaskComplete( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	// call the single method that gets called for completing and canceling tasks
 	internalTaskCompleteOrCancelled( task );
@@ -2103,7 +2100,7 @@ void DozerAIUpdate::internalTaskComplete( DozerTask task )
 	for( Int i = 0; i < DOZER_NUM_DOCK_POINTS; i++ )
 		m_dockPoint[ task ][ i ].valid = FALSE;
 
-}  // end internalTaskComplete
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Clear a task from the Dozer for consideration, we can use this when a goal object becomes
@@ -2113,8 +2110,8 @@ void DozerAIUpdate::internalCancelTask( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
-	
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
+
 	if(task < 0 || task >= DOZER_NUM_TASKS)
 		return;  //DAMNIT!  You CANNOT assert and then not handle the damn error!  The.  Code.  Must.  Not.  Crash.
 
@@ -2124,16 +2121,16 @@ void DozerAIUpdate::internalCancelTask( DozerTask task )
 	// remove the info for this task
 	m_task[ task ].m_targetObjectID = INVALID_ID;
 	m_task[ task ].m_taskOrderFrame = 0;
-	
+
 	// remove dock point info for this task
 	for( Int i = 0; i < DOZER_NUM_DOCK_POINTS; i++ )
 		m_dockPoint[ task ][ i ].valid = FALSE;
-	
+
 	// stop the dozer from moving
 	AIUpdateInterface *ai = getObject()->getAIUpdateInterface();
 	ai->aiIdle( CMD_FROM_AI );
 
-}  // end internalCancelTask
+}
 
 // ------------------------------------------------------------------------------------------------
 /** This method is called whenever a task is completed *OR* cancelled */
@@ -2145,13 +2142,13 @@ void DozerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 	{
 
 		// --------------------------------------------------------------------------------------------
-		case DOZER_TASK_INVALID:	
+		case DOZER_TASK_INVALID:
 		{
 
-			break;  // do nothing, this is really no task 
+			break;  // do nothing, this is really no task
+
+		}
 
-		}  // end invalid
-						
 		// --------------------------------------------------------------------------------------------
 		case DOZER_TASK_BUILD:
 		{
@@ -2168,8 +2165,8 @@ void DozerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 //				goalObject->clearModelConditionState(MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED);
 //			}
 			break;
-		
-		}  // end build
+
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case DOZER_TASK_REPAIR:
@@ -2186,29 +2183,29 @@ void DozerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 			//if( obj )
 			//{
       //
-			//	
+			//
 			//	 when we're done repairing bridges, tell the scaffolding to go away and also remove
 			//	 the undergoing repair status from the bridge object itself
-			//	
+			//
 			//	if( obj->isKindOf( KINDOF_BRIDGE_TOWER ) )
 			//	{
 			//		// remove the bridge scaffold
 			//		removeBridgeScaffolding( obj );
-      //  
+      //
 			//		// clear the repair bit from the bridge
 			//		BridgeTowerBehaviorInterface *btbi = BridgeTowerBehavior::getBridgeTowerBehaviorInterfaceFromObject( obj );
-			//		DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower behavior interface\n") );
+			//		DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower behavior interface") );
 			//		Object *bridge = TheGameLogic->findObjectByID( btbi->getBridgeID() );
-			//		DEBUG_ASSERTCRASH( bridge, ("Unable to find bridge object\n") );
+			//		DEBUG_ASSERTCRASH( bridge, ("Unable to find bridge object") );
 			//		bridge->clearStatus( OBJECT_STATUS_UNDERGOING_REPAIR );
-			//	
+			//
 			//	}  // end if
       //
 			//}  // end if
 
 			break;
 
-		}  // end repair
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case DOZER_TASK_FORTIFY:
@@ -2216,20 +2213,20 @@ void DozerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 
 			break;
 
-		}  // end fortify
+		}
 
 		// --------------------------------------------------------------------------------------------
 		default:
 		{
 
-			DEBUG_CRASH(( "internalTaskCompleteOrCancelled: Unknown Dozer task '%d'\n", task ));
+			DEBUG_CRASH(( "internalTaskCompleteOrCancelled: Unknown Dozer task '%d'", task ));
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch( task )
+	}
 
-}  // end internalTaskCompleteOrCancelled
+}
 
 //-------------------------------------------------------------------------------------------------
 /** If we were building something, kill the active-construction flag on it */
@@ -2241,11 +2238,11 @@ void DozerAIUpdate::onDelete( void )
 	// cancel any of the tasks we had queued up
 	for( i = DOZER_TASK_FIRST; i < DOZER_NUM_TASKS; ++i )
 	{
-		
+
 		if( isTaskPending( (DozerTask)i ) )
 			cancelTask( (DozerTask)i );
-			
-	}  // end for i
+
+	}
 
 	for( i = 0; i < DOZER_NUM_TASKS; i++ )
 	{
@@ -2278,15 +2275,15 @@ DozerTask DozerAIUpdate::getMostRecentCommand( void )
 				mostRecentTask = (DozerTask)i;
 				mostRecentFrame = m_task[ i ].m_taskOrderFrame;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	return mostRecentTask;
-			
-}  // end getMostRecentCommand
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -2308,7 +2305,7 @@ const Coord3D* DozerAIUpdate::getDockPoint( DozerTask task, DozerDockPoint point
 	// no valid point has been set for this dock point on this task
 	return NULL;
 
-}  // end getDockPoint
+}
 
 // ------------------------------------------------------------------------------------------------
 Real DozerAIUpdate::getRepairHealthPerSecond( void ) const
@@ -2374,7 +2371,7 @@ void DozerAIUpdate::aiDoCommand(const AICommandParms* parms)
 			privateRepair(parms->m_obj, parms->m_cmdSource);
 			break;
 
-		}  // end repair
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case AICMD_RESUME_CONSTRUCTION:
@@ -2388,7 +2385,7 @@ void DozerAIUpdate::aiDoCommand(const AICommandParms* parms)
 			privateResumeConstruction( parms->m_obj, parms->m_cmdSource );
 			break;
 
-		}  // end resume construction
+		}
 
 		// --------------------------------------------------------------------------------------------
 		default:
@@ -2406,11 +2403,11 @@ void DozerAIUpdate::aiDoCommand(const AICommandParms* parms)
 				m_dozerMachine->resetToDefaultState();
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch
+	}
 
-}  // end aiDoCommand
+}
 
 //------------------------------------------------------------------------------------------------
 void DozerAIUpdate::startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID )
@@ -2434,7 +2431,7 @@ void DozerAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -2447,7 +2444,7 @@ void DozerAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -2479,7 +2476,7 @@ void DozerAIUpdate::xfer( Xfer *xfer )
 	}
 	xfer->xferUser(&m_buildSubTask, sizeof(m_buildSubTask));
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2488,6 +2485,6 @@ void DozerAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp
index d69e1f7a228..82c34f3859b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp
@@ -26,7 +26,7 @@
 // Author: Kris Morness, June 2002
 // Desc:   State machine that handles internet hacking (free cash)
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingFactory.h"
@@ -42,11 +42,6 @@
 #include "GameLogic/Object.h"
 //#include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -61,13 +56,13 @@ AIStateMachine* HackInternetAIUpdate::makeStateMachine()
 //-------------------------------------------------------------------------------------------------
 HackInternetAIUpdate::HackInternetAIUpdate( Thing *thing, const ModuleData* moduleData ) : AIUpdateInterface( thing, moduleData )
 {
-	m_hasPendingCommand = false;	
-} 
+	m_hasPendingCommand = false;
+}
 
 //-------------------------------------------------------------------------------------------------
 HackInternetAIUpdate::~HackInternetAIUpdate( void )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool HackInternetAIUpdate::isIdle() const
@@ -93,7 +88,7 @@ Bool HackInternetAIUpdate::isHacking() const
 //-------------------------------------------------------------------------------------------------
 Bool HackInternetAIUpdate::isHackingPackingOrUnpacking() const
 {
-	if( getStateMachine()->getCurrentStateID() == HACK_INTERNET || 
+	if( getStateMachine()->getCurrentStateID() == HACK_INTERNET ||
 			getStateMachine()->getCurrentStateID() == PACKING ||
 			getStateMachine()->getCurrentStateID() == UNPACKING )
 	{
@@ -131,16 +126,26 @@ void HackInternetAIUpdate::aiDoCommand(const AICommandParms* parms)
 	if (!isAllowedToRespondToAiCommands(parms))
 		return;
 
+	const StateID currentState = getStateMachine()->getCurrentStateID();
+
+#if !RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix andrew-2e128 / Mauller 14/07/2025 prevent hacking hackers packing and unpacking when commanded to hack the internet
+	if (parms->m_cmd == AICMD_HACK_INTERNET && ( currentState == HACK_INTERNET || currentState == UNPACKING ) )
+	{
+		return;
+	}
+#endif
+
 	//If our hacker is currently packing up his gear, we need to prevent him
 	//from moving until completed. In order to accomplish this, we'll detect,
-	//then 
-	if( getStateMachine()->getCurrentStateID() == HACK_INTERNET || getStateMachine()->getCurrentStateID() == PACKING )
+	//then
+	if( currentState == HACK_INTERNET || currentState == PACKING )
 	{
 		// nuke any existing pending cmd
 		m_pendingCommand.store(*parms);
 		m_hasPendingCommand = true;
 
-		if( getStateMachine()->getCurrentStateID() == HACK_INTERNET )
+		if( currentState == HACK_INTERNET )
 		{
 			getStateMachine()->clear();
 			setLastCommandSource( CMD_FROM_AI );
@@ -180,13 +185,13 @@ UnsignedInt HackInternetAIUpdate::getUnpackTime() const
 // ------------------------------------------------------------------------------------------------
 UnsignedInt HackInternetAIUpdate::getPackTime() const
 {
-	return getHackInternetAIUpdateModuleData()->m_packTime; 
+	return getHackInternetAIUpdateModuleData()->m_packTime;
 }
 
 // ------------------------------------------------------------------------------------------------
 UnsignedInt HackInternetAIUpdate::getCashUpdateDelay() const
 {
-	return getHackInternetAIUpdateModuleData()->m_cashUpdateDelay; 
+	return getHackInternetAIUpdateModuleData()->m_cashUpdateDelay;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -196,7 +201,7 @@ void HackInternetAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -209,14 +214,14 @@ void HackInternetAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 	xfer->xferBool(&m_hasPendingCommand);
 	if (m_hasPendingCommand) {
 		m_pendingCommand.doXfer(xfer);
 	}
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -225,7 +230,7 @@ void HackInternetAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -253,7 +258,7 @@ HackInternetStateMachine::~HackInternetStateMachine()
 // ------------------------------------------------------------------------------------------------
 void UnpackingState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -266,14 +271,14 @@ void UnpackingState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUnsignedInt(&m_framesRemaining);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void UnpackingState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 StateReturnType UnpackingState::onEnter()
@@ -286,13 +291,13 @@ StateReturnType UnpackingState::onEnter()
 	}
 
 	owner->clearModelConditionFlags( MAKE_MODELCONDITION_MASK3( MODELCONDITION_PACKING, MODELCONDITION_FIRING_A, MODELCONDITION_UNPACKING ) );
-	
+
 	owner->setModelConditionState( MODELCONDITION_UNPACKING );
 
 	AudioEventRTS sound = *owner->getTemplate()->getPerUnitSound( "UnitUnpack" );
 	sound.setObjectID( owner->getID() );
 	TheAudio->addAudioEvent( &sound );
-	
+
 	Real variationFactor = ai->getPackUnpackVariationFactor();
 	Real variation = GameLogicRandomValueReal( 1.0f - variationFactor, 1.0f + variationFactor );
 	m_framesRemaining = ai->getUnpackTime() * variation; //In frames
@@ -342,7 +347,7 @@ void UnpackingState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void PackingState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -355,17 +360,17 @@ void PackingState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUnsignedInt(&m_framesRemaining);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void PackingState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
-StateReturnType PackingState::onEnter() 
+StateReturnType PackingState::onEnter()
 {
 	Object *owner = getMachineOwner();
 	HackInternetAIUpdate *ai = (HackInternetAIUpdate*)owner->getAIUpdateInterface();
@@ -374,13 +379,13 @@ StateReturnType PackingState::onEnter()
 		return STATE_FAILURE;
 	}
 
-	owner->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_FIRING_A ), 
+	owner->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_FIRING_A ),
 																				 MAKE_MODELCONDITION_MASK( MODELCONDITION_PACKING ) );
 
 	AudioEventRTS sound = *owner->getTemplate()->getPerUnitSound( "UnitPack" );
 	sound.setObjectID( owner->getID() );
 	TheAudio->addAudioEvent( &sound );
-	
+
 	Real variationFactor = ai->getPackUnpackVariationFactor();
 	Real variation = GameLogicRandomValueReal( 1.0f - variationFactor, 1.0f + variationFactor );
 	m_framesRemaining = ai->getPackTime() * variation; //In frames
@@ -418,7 +423,7 @@ void PackingState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void HackInternetState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -431,14 +436,14 @@ void HackInternetState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUnsignedInt(&m_framesRemaining);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void HackInternetState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 StateReturnType HackInternetState::onEnter()
@@ -450,8 +455,8 @@ StateReturnType HackInternetState::onEnter()
 	{
 		return STATE_FAILURE;
 	}
-	
-	owner->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ), 
+
+	owner->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ),
 																				 MAKE_MODELCONDITION_MASK( MODELCONDITION_FIRING_A ) );
 
 	m_framesRemaining = ai->getCashUpdateDelay();
@@ -477,7 +482,7 @@ StateReturnType HackInternetState::update()
 	else
 	{
 		//We have waited the full amount of the delay, so hack some cash from the heavens!
-		
+
 		//Add cash
 		Money *money = owner->getControllingPlayer()->getMoney();
 		if( money )
@@ -494,28 +499,28 @@ StateReturnType HackInternetState::update()
 						{
 							break;
 						}
-						//If entry missing, fall through!
+						FALLTHROUGH; //If entry missing, fall through!
 					case LEVEL_ELITE:
 						amount = ai->getEliteCashAmount();
 						if( amount )
 						{
 							break;
 						}
-						//If entry missing, fall through!
+						FALLTHROUGH; //If entry missing, fall through!
 					case LEVEL_VETERAN:
 						amount = ai->getVeteranCashAmount();
 						if( amount )
 						{
 							break;
 						}
-						//If entry missing, fall through!
+						FALLTHROUGH; //If entry missing, fall through!
 					case LEVEL_REGULAR:
 						amount = ai->getRegularCashAmount();
 						if( amount )
 						{
 							break;
 						}
-						//If entry missing, fall through!
+						FALLTHROUGH; //If entry missing, fall through!
 					default:
 						amount = 1;
 						break;
@@ -544,7 +549,7 @@ StateReturnType HackInternetState::update()
 
 		//Reset timer and start a new cycle.
 		m_framesRemaining = ai->getCashUpdateDelay();
-		
+
 	}
 
 	//This is a persistent state until told otherwise.
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
index 12d0b138d19..f2642286188 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
@@ -24,7 +24,7 @@
 
 // JetAIUpdate.cpp //////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_LOCOMOTORSET_NAMES
 
@@ -48,11 +48,6 @@
 
 const Real BIGNUM = 99999.0f;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 enum TaxiType CPP_11(: Int)
@@ -136,7 +131,7 @@ class PartitionFilterHasParkingPlace : public PartitionFilter
 public:
 	PartitionFilterHasParkingPlace(ObjectID id) : m_id(id) { }
 protected:
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterHasParkingPlace"; }
 #endif
 	virtual Bool allow(Object *objOther)
@@ -184,7 +179,7 @@ static Object* findSuitableAirfield(Object* jet)
 */
 class JetAwaitingRunwayState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetAwaitingRunwayState, "JetAwaitingRunwayState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetAwaitingRunwayState, "JetAwaitingRunwayState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -232,7 +227,7 @@ class JetAwaitingRunwayState : public State
 			DEBUG_ASSERTCRASH(m_landing, ("hmm, this should never happen for taking-off things"));
 			return STATE_FAILURE;
 		}
-		
+
 		if (pp->reserveRunway(jet->getID(), m_landing))
 		{
 			return STATE_SUCCESS;
@@ -265,7 +260,7 @@ EMPTY_DTOR(JetAwaitingRunwayState)
 */
 class JetOrHeliCirclingDeadAirfieldState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliCirclingDeadAirfieldState, "JetOrHeliCirclingDeadAirfieldState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliCirclingDeadAirfieldState, "JetOrHeliCirclingDeadAirfieldState")
 protected:
 	// snapshot interface	 STUBBED.
 	// The state will check immediately after a load game, but I think that's ok.  jba.
@@ -283,7 +278,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 	};
 
 public:
-	JetOrHeliCirclingDeadAirfieldState( StateMachine *machine ) : 
+	JetOrHeliCirclingDeadAirfieldState( StateMachine *machine ) :
 		State( machine, "JetOrHeliCirclingDeadAirfieldState"),
 		m_checkAirfield(0) { }
 
@@ -295,7 +290,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 		{
 			return STATE_FAILURE;
 		}
-		
+
 		// obscure case: if the jet wasn't spawned, but just placed directly on the map,
 		// it might not have an owning airfield, and it might be trying to return
 		// simply due to being idle, not out of ammo. so check and don't die in that
@@ -329,7 +324,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 
 		// just stay where we are.
 		jetAI->setLocomotorGoalNone();
-		
+
 		Real damageRate = jetAI->friend_getOutOfAmmoDamagePerSecond();
 		if (damageRate > 0)
 		{
@@ -370,7 +365,7 @@ EMPTY_DTOR(JetOrHeliCirclingDeadAirfieldState)
 */
 class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliReturningToDeadAirfieldState, "JetOrHeliReturningToDeadAirfieldState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliReturningToDeadAirfieldState, "JetOrHeliReturningToDeadAirfieldState")
 public:
 	JetOrHeliReturningToDeadAirfieldState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturningToDeadAirfieldState") { }
 
@@ -393,13 +388,13 @@ class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState
 EMPTY_DTOR(JetOrHeliReturningToDeadAirfieldState)
 
 //-------------------------------------------------------------------------------------------------
-// This solution uses the 
-// http://www.faqs.org/faqs/graphics/algorithms-faq/ 
+// This solution uses the
+// http://www.faqs.org/faqs/graphics/algorithms-faq/
 // Subject 1.03
 static Bool intersectInfiniteLine2D
 (
-	Real ax, Real ay, Real ao, 
-	Real cx, Real cy, Real co, 
+	Real ax, Real ay, Real ao,
+	Real cx, Real cy, Real co,
 	Real& ix, Real& iy
 )
 {
@@ -409,7 +404,7 @@ static Bool intersectInfiniteLine2D
 	Real dy = cy + Sin(co);
 
 	Real denom = ((bx - ax) * (dy - cy) - (by - ay) * (dx - cx));
-	if (denom == 0.0f) 
+	if (denom == 0.0f)
 	{
 		// the lines are parallel.
 		return false;
@@ -427,9 +422,9 @@ static Bool intersectInfiniteLine2D
 	Success: we are on the ground at the runway start
 	Failure: we are unable to get on the ground
 */
-class JetOrHeliTaxiState : public AIMoveOutOfTheWayState 
+class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliTaxiState, "JetOrHeliTaxiState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliTaxiState, "JetOrHeliTaxiState")
 private:
 	TaxiType m_taxiMode;
 public:
@@ -441,7 +436,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
 		if( !jetAI )
 			return STATE_FAILURE;
-		
+
 		jetAI->setCanPathThroughUnits(true);
 		jetAI->friend_setTakeoffInProgress(m_taxiMode != TO_PARKING);
 		jetAI->friend_setLandingInProgress(m_taxiMode == TO_PARKING);
@@ -455,11 +450,11 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 		ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID(), &airfield);
 		if (pp == NULL)
 			return STATE_SUCCESS;	// no airfield? just skip this step.
-		
+
 		ParkingPlaceBehaviorInterface::PPInfo ppinfo;
 		if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), &ppinfo))
 			return STATE_FAILURE;	// full?
-		
+
 		Coord3D intermedPt;
 		Bool intermed = false;
 		Real orient = atan2(ppinfo.runwayPrep.y - ppinfo.parkingSpace.y, ppinfo.runwayPrep.x - ppinfo.parkingSpace.x);
@@ -498,7 +493,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 			movePath->appendNode( &ppinfo.parkingSpace, LAYER_GROUND );
 		}
 
-		m_waitingForPath = FALSE;	 
+		m_waitingForPath = FALSE;
 		TheAI->pathfinder()->setDebugPath(movePath);
 
 		setAdjustsDestination(false);	// precision is necessary
@@ -540,9 +535,9 @@ EMPTY_DTOR(JetOrHeliTaxiState)
 	Success: we are on the ground at the runway start
 	Failure: we are unable to get on the ground
 */
-class JetTakeoffOrLandingState : public AIFollowPathState 
+class JetTakeoffOrLandingState : public AIFollowPathState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetTakeoffOrLandingState, "JetTakeoffOrLandingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetTakeoffOrLandingState, "JetTakeoffOrLandingState")
 private:
 	Real			m_maxLift;
 	Real			m_maxSpeed;
@@ -591,14 +586,14 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID());
 		if (pp == NULL)
 			return STATE_SUCCESS;	// no airfield? just skip this step
-		
+
 		ParkingPlaceBehaviorInterface::PPInfo ppinfo;
 		if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), &ppinfo))
 		{
 			// it's full.
 			return STATE_FAILURE;
 		}
-		
+
 		// only check this for landing; we might have already given up the reservation to the guy behind us for takeoff
 		if (m_landing)
 		{
@@ -608,7 +603,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 				return STATE_FAILURE;
 			}
 		}
-		
+
 		std::vector<Coord3D> path;
 		if (m_landing)
 		{
@@ -647,7 +642,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
 		if( !jetAI )
 			return STATE_FAILURE;
-		
+
 		if (m_landing)
 		{
 #ifdef CIRCLE_FOR_LANDING
@@ -673,11 +668,11 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 				Real zSlop = 0.25f;
 				PathfindLayerEnum layer = TheTerrainLogic->getHighestLayerForDestination( jet->getPosition() );
 				Real groundZ = TheTerrainLogic->getLayerHeight( jet->getPosition()->x, jet->getPosition()->y, layer );
-				
+
 				if( zPos - zSlop <= groundZ )
 				{
 					m_landingSoundPlayed = TRUE;
-					AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_aircraftWheelScreech;	
+					AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_aircraftWheelScreech;
 					soundToPlay.setPosition( jet->getPosition() );
 					TheAudio->addAudioEvent( &soundToPlay );
 				}
@@ -714,7 +709,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		jetAI->friend_setLandingInProgress(false);
 		jetAI->friend_enableAfterburners(false);
 
-		// Paranoia checks - sometimes onExit is called when we are 
+		// Paranoia checks - sometimes onExit is called when we are
 		// shutting down, and not all pieces are valid.  CurLocomotor
 		// is definitely null in some cases. jba.
 		Locomotor* loco = jetAI->getCurLocomotor();
@@ -753,9 +748,9 @@ static Real calcDistSqr(const Coord3D& a, const Coord3D& b)
 	Success: we are on the ground at the runway start
 	Failure: we are unable to get on the ground
 */
-class HeliTakeoffOrLandingState : public State 
+class HeliTakeoffOrLandingState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState")
 protected:
 	// snapshot interface
 	virtual void crc( Xfer *xfer )
@@ -789,9 +784,9 @@ class HeliTakeoffOrLandingState : public State
 	Real			m_parkingOrientation;
 	Bool			m_landing;
 public:
-	HeliTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), 
+	HeliTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing),
 		State( machine, "HeliTakeoffOrLandingState" ), m_index(0)
-		{ 
+		{
 			m_parkingLoc.zero();
 		}
 
@@ -817,7 +812,7 @@ class HeliTakeoffOrLandingState : public State
 		ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID(), &airfield);
 		if (pp == NULL)
 			return STATE_SUCCESS;	// no airfield? just skip this step
-		
+
 		Coord3D landingApproach;
 		if (jet->isKindOf(KINDOF_PRODUCED_AT_HELIPAD))
 		{
@@ -844,7 +839,7 @@ class HeliTakeoffOrLandingState : public State
 			landingApproach = m_parkingLoc;
 			landingApproach.z += (ppinfo.runwayApproach.z - ppinfo.runwayEnd.z);
 		}
-		
+
 		if (m_landing)
 		{
 			m_path[0] = landingApproach;
@@ -883,11 +878,11 @@ class HeliTakeoffOrLandingState : public State
 		Real dy = hoverloc.y - pos.y;
 		Real dSqr = dx*dx+dy*dy;
 		const Real DARN_CLOSE = 0.25f;
-		if (dSqr < DARN_CLOSE) 
+		if (dSqr < DARN_CLOSE)
 		{
 			jet->setPosition(&hoverloc);
-		} 
-		else 
+		}
+		else
 		{
 			Real dist = sqrtf(dSqr);
 			if (dist<1) dist = 1;
@@ -916,7 +911,7 @@ class HeliTakeoffOrLandingState : public State
 		Real distSqr = calcDistSqr(*a, *b);
 		if (distSqr <= THRESH_SQR)
 			++m_index;
-		
+
 		if (m_index >= 2)
 			return STATE_SUCCESS;
 
@@ -934,7 +929,7 @@ class HeliTakeoffOrLandingState : public State
 		jetAI->friend_setTakeoffInProgress(false);
 		jetAI->friend_setLandingInProgress(false);
 
-		// Paranoia checks - sometimes onExit is called when we are 
+		// Paranoia checks - sometimes onExit is called when we are
 		// shutting down, and not all pieces are valid.  CurLocomotor
 		// is definitely null in some cases. jba.
 		Locomotor* loco = jetAI->getCurLocomotor();
@@ -967,7 +962,7 @@ EMPTY_DTOR(HeliTakeoffOrLandingState)
 //-------------------------------------------------------------------------------------------------
 class JetOrHeliParkOrientState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -1011,7 +1006,7 @@ class JetOrHeliParkOrientState : public State
 		ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID());
 		if (pp == NULL)
 			return STATE_FAILURE;
-		
+
 		ParkingPlaceBehaviorInterface::PPInfo ppinfo;
 		if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), &ppinfo))
 			return STATE_FAILURE;
@@ -1048,7 +1043,7 @@ EMPTY_DTOR(JetOrHeliParkOrientState)
 //-------------------------------------------------------------------------------------------------
 class JetPauseBeforeTakeoffState : public AIFaceState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState")
 protected:
 	// snapshot interface
 	virtual void crc( Xfer *xfer )
@@ -1059,29 +1054,52 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	virtual void xfer( Xfer *xfer )
 	{
 		// version
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
 		XferVersion currentVersion = 1;
+#else
+		XferVersion currentVersion = 2;
+#endif
 		XferVersion version = currentVersion;
 		xfer->xferVersion( &version, currentVersion );
 
 		// set on create. xfer->xferBool(&m_landing);
-		xfer->xferUnsignedInt(&m_when);
+		xfer->xferUnsignedInt(&m_whenTakeoff);
 		xfer->xferUnsignedInt(&m_whenTransfer);
-		xfer->xferBool(&m_afterburners);
-		xfer->xferBool(&m_resetTimer);
+
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
+		if (version <= 1)
+		{
+			xfer->xferBool(&m_afterburners);
+			xfer->xferBool(&m_resetTimer);
+		}
+#else
+		if (version <= 1)
+		{
+			Bool afterburners = false;
+			Bool resetTimer = false;
+			xfer->xferBool(&afterburners);
+			xfer->xferBool(&resetTimer);
+		}
+#endif
+
 		xfer->xferObjectID(&m_waitedForTaxiID);
 	}
+
 	virtual void loadPostProcess()
 	{
 		// empty. jba.
 	}
 
 private:
-	UnsignedInt		m_when;
+	UnsignedInt		m_whenTakeoff;
 	UnsignedInt		m_whenTransfer;
 	ObjectID			m_waitedForTaxiID;
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
 	Bool					m_resetTimer;
 	Bool					m_afterburners;
+#endif
 
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
 	Bool findWaiter()
 	{
 		Object* jet = getMachineOwner();
@@ -1111,16 +1129,51 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		}
 		return false;
 	}
+#else
+	Object* findJetToWaitFor() const
+	{
+		const Object* thisJet = getMachineOwner();
+		ParkingPlaceBehaviorInterface* pp = getPP(getMachineOwner()->getProducerID());
+
+		if (pp != NULL)
+		{
+			const Int thisJetRunway = pp->getRunwayIndex(thisJet->getID());
+			const Int runwayCount = pp->getRunwayCount();
+
+			for (Int runway = 0; runway < runwayCount; ++runway)
+			{
+				if (runway == thisJetRunway)
+					continue;
+
+				Object* otherJet = TheGameLogic->findObjectByID(pp->getRunwayReservation(runway));
+				if (otherJet == NULL)
+					continue;
+
+				AIUpdateInterface* ai = otherJet->getAIUpdateInterface();
+				if (ai == NULL)
+					continue;
+
+				if (ai->getCurrentStateID() != TAXI_TO_TAKEOFF)
+					continue;
+
+				return otherJet;
+			}
+		}
+		return NULL;
+	}
+#endif
 
 public:
-	JetPauseBeforeTakeoffState( StateMachine *machine ) : 
-		AIFaceState(machine, false), 
-		m_when(0), 
-		m_whenTransfer(0),
-		m_waitedForTaxiID(INVALID_ID), 
-		m_resetTimer(false),
-		m_afterburners(false) 
-	{ 
+	JetPauseBeforeTakeoffState( StateMachine *machine )
+		: AIFaceState(machine, false)
+		, m_whenTakeoff(0)
+		, m_whenTransfer(0)
+		, m_waitedForTaxiID(INVALID_ID)
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
+		, m_resetTimer(false)
+		, m_afterburners(false)
+#endif
+	{
 		// nothing
 	}
 
@@ -1134,25 +1187,28 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		jetAI->friend_setTakeoffInProgress(true);
 		jetAI->friend_setLandingInProgress(false);
 
-		m_when = 0;
+		m_whenTakeoff = 0;
 		m_whenTransfer = 0;
 		m_waitedForTaxiID = INVALID_ID;
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
 		m_resetTimer = false;
 		m_afterburners = false;
+#endif
 
 		ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID());
 		if (pp == NULL)
 			return STATE_SUCCESS;	// no airfield? just skip this step.
-		
+
 		ParkingPlaceBehaviorInterface::PPInfo ppinfo;
 		if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), &ppinfo))
 			return STATE_SUCCESS;	// full?
 
 		getMachine()->setGoalPosition(&ppinfo.runwayEnd);
-		
+
 		return AIFaceState::onEnter();
 	}
 
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
 	virtual StateReturnType update()
 	{
 		Object* jet = getMachineOwner();
@@ -1162,7 +1218,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 
 		// always call this.
 		StateReturnType superStatus = AIFaceState::update();
-		
+
 		if (findWaiter())
 			return STATE_CONTINUE;
 
@@ -1170,11 +1226,11 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		if (!m_resetTimer)
 		{
 			// we had to wait, but now everyone else is ready, so restart our countdown.
-			m_when = now + jetAI->friend_getTakeoffPause();
+			m_whenTakeoff = now + jetAI->friend_getTakeoffPause();
 			if (m_waitedForTaxiID == INVALID_ID)
 			{
 				m_waitedForTaxiID = jet->getID();	// just so we don't pick up anyone else
-				m_whenTransfer = now + 1;	
+				m_whenTransfer = now + 1;
 			}
 			else
 			{
@@ -1189,7 +1245,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 			m_afterburners = true;
 		}
 
-		DEBUG_ASSERTCRASH(m_when != 0, ("hmm"));
+		DEBUG_ASSERTCRASH(m_whenTakeoff != 0, ("hmm"));
 		DEBUG_ASSERTCRASH(m_whenTransfer != 0, ("hmm"));
 
 			// once we start the final wait, release the runways for guys behind us, so they can start taxiing
@@ -1199,11 +1255,86 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 			pp->transferRunwayReservationToNextInLineForTakeoff(jet->getID());
 		}
 
-		if (now >= m_when)
+		if (now >= m_whenTakeoff)
 			return superStatus;
 
 		return STATE_CONTINUE;
 	}
+#else
+	// TheSuperHackers @bugfix Reimplements the update to wait for another Jet on another runway.
+	// If this must work with more than 2 runways, then this logic needs another look.
+	virtual StateReturnType update()
+	{
+		Object* jet = getMachineOwner();
+		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
+
+		if (jet->isEffectivelyDead())
+			return STATE_FAILURE;
+
+		// always call this.
+		StateReturnType superStatus = AIFaceState::update();
+
+		if (Object* otherJet = findJetToWaitFor())
+		{
+			// Found a jet on another runway to wait for.
+			if (m_waitedForTaxiID == INVALID_ID)
+			{
+				// Save the other Jet to wait for.
+				m_waitedForTaxiID = otherJet->getID();
+			}
+
+			if (m_waitedForTaxiID == otherJet->getID())
+			{
+				// Wait for the other Jet to get ready.
+				return STATE_CONTINUE;
+			}
+		}
+
+		const UnsignedInt now = TheGameLogic->getFrame();
+
+		if (m_whenTakeoff == 0)
+		{
+			// The other Jet (if any) is ready. Prepare runway transfer and takeoff.
+			// Transfer the runway after one or two frames earliest to give the other
+			// Jet a chance to update as well before the runway is transfered.
+			if (m_waitedForTaxiID == INVALID_ID)
+			{
+				// Do not wait for any other Jet from now on.
+				m_waitedForTaxiID = jet->getID();
+				m_whenTransfer = now + 1;
+			}
+			else
+			{
+				m_whenTransfer = now + 2; // 2 seems odd, but is correct
+			}
+
+			// Take off soon, but not before the runway transfer.
+			m_whenTakeoff = std::max(m_whenTransfer, now + jetAI->friend_getTakeoffPause());
+			jetAI->friend_enableAfterburners(true);
+		}
+		else
+		{
+			// once we start the final wait, release the runways for guys behind us, so they can start taxiing
+			if (now >= m_whenTransfer)
+			{
+				if (ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID()))
+				{
+					pp->transferRunwayReservationToNextInLineForTakeoff(jet->getID());
+				}
+				// Do not transfer the runway again in the next update.
+				m_whenTransfer = ~0u;
+			}
+
+			if (now >= m_whenTakeoff)
+			{
+				// Ready to take off!
+				return superStatus;
+			}
+		}
+
+		return STATE_CONTINUE;
+	}
+#endif
 
 	virtual void onExit(StateExitType status)
 	{
@@ -1220,7 +1351,7 @@ EMPTY_DTOR(JetPauseBeforeTakeoffState)
 //-------------------------------------------------------------------------------------------------
 class JetOrHeliReloadAmmoState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliReloadAmmoState, "JetOrHeliReloadAmmoState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliReloadAmmoState, "JetOrHeliReloadAmmoState")
 private:
 	UnsignedInt		m_reloadTime;
 	UnsignedInt		m_reloadDoneFrame;
@@ -1262,14 +1393,14 @@ class JetOrHeliReloadAmmoState : public State
 		jetAI->friend_setTakeoffInProgress(false);
 		jetAI->friend_setLandingInProgress(false);
 		jetAI->friend_setUseSpecialReturnLoco(false);
-		
+
 		m_reloadTime = 0;
 		for (Int i = 0; i < WEAPONSLOT_COUNT;	++i)
 		{
 			const Weapon* w = jet->getWeaponInWeaponSlot((WeaponSlotType)i);
 			if (w == NULL)
 				continue;
-			
+
 			Int remaining = w->getRemainingAmmo();
 			Int clipSize = w->getClipSize();
 			UnsignedInt rt = w->getClipReloadTime(jet);
@@ -1282,7 +1413,7 @@ class JetOrHeliReloadAmmoState : public State
 			if (rt > m_reloadTime)
 				m_reloadTime = rt;
 		}
-		
+
 		if (m_reloadTime < 1)
 			m_reloadTime = 1;
 		m_reloadDoneFrame = m_reloadTime + TheGameLogic->getFrame();
@@ -1299,7 +1430,7 @@ class JetOrHeliReloadAmmoState : public State
 			Weapon* w = jet->getWeaponInWeaponSlot((WeaponSlotType)i);
 			if (w == NULL)
 				continue;
-			
+
 			if (now >= m_reloadDoneFrame)
 				w->setClipPercentFull(1.0f, false);
 			else
@@ -1333,7 +1464,7 @@ EMPTY_DTOR(JetOrHeliReloadAmmoState)
 */
 class JetOrHeliReturnForLandingState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliReturnForLandingState, "JetOrHeliReturnForLandingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliReturnForLandingState, "JetOrHeliReturnForLandingState")
 public:
 	JetOrHeliReturnForLandingState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturnForLandingState") { }
 
@@ -1359,7 +1490,7 @@ class JetOrHeliReturnForLandingState : public AIInternalMoveToState
 				return STATE_FAILURE;
 			}
 		}
-		
+
 		if (jet->isKindOf(KINDOF_PRODUCED_AT_HELIPAD))
 		{
 			m_goalPosition = jetAI->friend_getLandingPosForHelipadStuff();
@@ -1478,11 +1609,11 @@ JetAIUpdateModuleData::JetAIUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void JetAIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void JetAIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   AIUpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "OutOfAmmoDamagePerSecond",			INI::parsePercentToReal, NULL, offsetof( JetAIUpdateModuleData, m_outOfAmmoDamagePerSecond ) },
 		{ "NeedsRunway",									INI::parseBool, NULL, offsetof( JetAIUpdateModuleData, m_needsRunway ) },
@@ -1534,10 +1665,7 @@ JetAIUpdate::JetAIUpdate( Thing *thing, const ModuleData* moduleData ) : AIUpdat
 	m_lockonDrawable = NULL;
 	m_landingPosForHelipadStuff.zero();
 
-	//Added By Sadullah Nader
-	//Initializations missing and needed 
 	m_producerLocation.zero();
-	//
 	m_enginesOn = TRUE;
 }
 
@@ -1637,7 +1765,7 @@ UpdateSleepTime JetAIUpdate::update()
 	{
 		if (pp != NULL)
 		{
-			if (!getFlag(ALLOW_AIR_LOCO) && 
+			if (!getFlag(ALLOW_AIR_LOCO) &&
 					!getFlag(HAS_PENDING_COMMAND) &&
 						jet->isKindOf(KINDOF_PRODUCED_AT_HELIPAD) &&
 						jet->getBodyModule()->getHealth() == jet->getBodyModule()->getMaxHealth())
@@ -1667,7 +1795,7 @@ UpdateSleepTime JetAIUpdate::update()
 			setLastCommandSource( CMD_FROM_AI );
 			getStateMachine()->setState(RETURNING_FOR_LANDING);
 		}
-		else if (getFlag(HAS_PENDING_COMMAND) 
+		else if (getFlag(HAS_PENDING_COMMAND)
 			// srj sez: if we are reloading ammo, wait will we are done before processing the pending command.
 			&& getStateMachine()->getCurrentStateID() != RELOAD_AMMO)
 		{
@@ -1699,7 +1827,7 @@ UpdateSleepTime JetAIUpdate::update()
 			pp->setHealee(getObject(), false);
 		}
 		m_returnToBaseFrame = 0;
-		if (getFlag(ALLOW_INTERRUPT_AND_RESUME_OF_CUR_STATE_FOR_RELOAD) && 
+		if (getFlag(ALLOW_INTERRUPT_AND_RESUME_OF_CUR_STATE_FOR_RELOAD) &&
 						isOutOfSpecialReloadAmmo(jet) && getFlag(ALLOW_AIR_LOCO))
 		{
 			setFlag(USE_SPECIAL_RETURN_LOCO, true);
@@ -1715,7 +1843,7 @@ UpdateSleepTime JetAIUpdate::update()
 	if (draw != NULL)
 	{
 		StateID id = getStateMachine()->getCurrentStateID();
-		Bool needToCheckMinHeight = (id >= JETAISTATETYPE_FIRST && id <= JETAISTATETYPE_LAST) || 
+		Bool needToCheckMinHeight = (id >= JETAISTATETYPE_FIRST && id <= JETAISTATETYPE_LAST) ||
 																	!jet->isAboveTerrain() ||
 																	!getFlag(ALLOW_AIR_LOCO);
 		if (needToCheckMinHeight)
@@ -1767,7 +1895,7 @@ UpdateSleepTime JetAIUpdate::update()
 	}
 
 	positionLockon();
-	
+
 	if (m_attackLocoExpireFrame != 0)
 	{
 		chooseLocomotorSet(d->m_attackingLoco);
@@ -1777,21 +1905,21 @@ UpdateSleepTime JetAIUpdate::update()
 		chooseLocomotorSet(d->m_returningLoco);
 	}
 
-	
+
 	if( !jet->isKindOf( KINDOF_PRODUCED_AT_HELIPAD ) )
 	{
 		Drawable *draw = jet->getDrawable();
 		if( draw )
 		{
-			if( getFlag(TAKEOFF_IN_PROGRESS) 
-					|| getFlag(LANDING_IN_PROGRESS) 
-					|| getObject()->isSignificantlyAboveTerrain() 
-					|| isMoving() 
+			if( getFlag(TAKEOFF_IN_PROGRESS)
+					|| getFlag(LANDING_IN_PROGRESS)
+					|| getObject()->isSignificantlyAboveTerrain()
+					|| isMoving()
 					|| isWaitingForPath() )
 			{
 				if( !m_enginesOn )
 				{
-					//We just started moving, therefore turn on the engines!			
+					//We just started moving, therefore turn on the engines!
 					draw->enableAmbientSound( TRUE );
 					m_enginesOn = TRUE;
 				}
@@ -1877,7 +2005,7 @@ void JetAIUpdate::pruneDeadTargeters()
 {
 	if (!m_targetedBy.empty())
 	{
-		for (std::list<ObjectID>::iterator it = m_targetedBy.begin(); it != m_targetedBy.end(); /* empty */ ) 
+		for (std::list<ObjectID>::iterator it = m_targetedBy.begin(); it != m_targetedBy.end(); /* empty */ )
 		{
 			if (TheGameLogic->findObjectByID(*it) == NULL)
 			{
@@ -1935,7 +2063,7 @@ void JetAIUpdate::positionLockon()
 	Bool lastPhase = ((Int)(factor * elapsedTimeSumPrev) & 1) != 0;
 	Bool thisPhase = ((Int)(factor * elapsedTimeSumCurr) & 1) != 0;
 
-	if (lastPhase && (!thisPhase)) 
+	if (lastPhase && (!thisPhase))
 	{
 		AudioEventRTS lockonSound = TheAudio->getMiscAudio()->m_lockonTickSound;
 		lockonSound.setObjectID(getObject()->getID());
@@ -1980,7 +2108,7 @@ void JetAIUpdate::addTargeter(ObjectID id, Bool add)
 		{
 			if (it == m_targetedBy.end())
 			{
-				m_targetedBy.push_back(id); 
+				m_targetedBy.push_back(id);
 				if (m_untargetableExpireFrame == 0 && m_targetedBy.size() == 1)
 				{
 					m_untargetableExpireFrame = TheGameLogic->getFrame() + lockonTime;
@@ -1992,7 +2120,7 @@ void JetAIUpdate::addTargeter(ObjectID id, Bool add)
 		{
 			if (it != m_targetedBy.end())
 			{
-				m_targetedBy.erase(it); 
+				m_targetedBy.erase(it);
 				if (m_targetedBy.empty())
 				{
 					m_untargetableExpireFrame = 0;
@@ -2089,7 +2217,7 @@ void JetAIUpdate::doLandingCommand(Object *airfield, CommandSourceType cmdSource
 		ParkingPlaceBehaviorInterface* pp = (*i)->getParkingPlaceBehaviorInterface();
 		if (pp == NULL)
 			continue;
-		
+
 		if (getObject()->isKindOf(KINDOF_PRODUCED_AT_HELIPAD) ||
 				pp->reserveSpace(getObject()->getID(), friend_getParkingOffset(), NULL))
 		{
@@ -2181,7 +2309,7 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 
 	if (!isAllowedToRespondToAiCommands(parms))
 		return;
-		
+
 	// note that we always store this, even if nothing will be "pending".
 	m_mostRecentCommand.store(*parms);
 
@@ -2215,8 +2343,8 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 				// if we're already parked at the airfield in question, just ignore.
 				if (isParkedAt(parms->m_obj))
 					return;
-			
-				// else fall thru to the default case!
+
+				FALLTHROUGH; // else fall thru to the default case!
 
 			default:
 			{
@@ -2227,7 +2355,7 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 				getStateMachine()->clear();
 				setLastCommandSource( CMD_FROM_AI );
 				getStateMachine()->setState( TAKING_OFF_AWAIT_CLEARANCE );
-				
+
 				return;
 			}
 		}
@@ -2251,9 +2379,9 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 }
 
 //-------------------------------------------------------------------------------------------------
-void JetAIUpdate::friend_setAllowAirLoco(Bool allowAirLoco) 
-{ 
-	setFlag(ALLOW_AIR_LOCO, allowAirLoco); 
+void JetAIUpdate::friend_setAllowAirLoco(Bool allowAirLoco)
+{
+	setFlag(ALLOW_AIR_LOCO, allowAirLoco);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2286,7 +2414,7 @@ void JetAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -2300,7 +2428,7 @@ void JetAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 2;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -2322,7 +2450,7 @@ void JetAIUpdate::xfer( Xfer *xfer )
 		drawName = m_lockonDrawable->getTemplate()->getName();
 	}
 	xfer->xferAsciiString(&drawName);
-	if (drawName.isNotEmpty() && m_lockonDrawable==NULL) 
+	if (drawName.isNotEmpty() && m_lockonDrawable==NULL)
 	{
 		const ThingTemplate* tt = TheThingFactory->findTemplate(drawName);
 		if (tt)
@@ -2349,7 +2477,7 @@ void JetAIUpdate::xfer( Xfer *xfer )
 		}
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2369,4 +2497,4 @@ void JetAIUpdate::loadPostProcess( void )
 
 	// extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp
index 725840f56db..1b42513fc2a 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp
@@ -26,7 +26,7 @@
 // Author: Michael S. Booth, December 2001
 // Desc:   Implementation of missile behavior
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Thing.h"
 #include "Common/ThingTemplate.h"
@@ -52,11 +52,6 @@
 
 const Real BIGNUM = 99999.0f;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -76,7 +71,7 @@ MissileAIUpdateModuleData::MissileAIUpdateModuleData()
 	m_detonateOnNoFuel = FALSE;
 	m_garrisonHitKillCount = 0;
 	m_garrisonHitKillFX = NULL;
-	m_lockDistance = 75.0f;	
+	m_lockDistance = 75.0f;
 }
 
 //-----------------------------------------------------------------------------
@@ -84,7 +79,7 @@ void MissileAIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   AIUpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "TryToFollowTarget",			INI::parseBool,		NULL, offsetof( MissileAIUpdateModuleData, m_tryToFollowTarget ) },
 		{ "FuelLifetime",						INI::parseDurationUnsignedInt,		NULL, offsetof( MissileAIUpdateModuleData, m_fuelLifetime ) },
@@ -132,7 +127,7 @@ MissileAIUpdate::MissileAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 	m_exhaustID = INVALID_PARTICLE_SYSTEM_ID;
 	m_extraBonusFlags = 0;
 	m_originalTargetPos.zero();
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 MissileAIUpdate::~MissileAIUpdate()
@@ -177,11 +172,11 @@ void MissileAIUpdate::switchToState(MissileStateType s)
 // Prepares the missile for launch via proper weapon-system channels.
 //-------------------------------------------------------------------------------------------------
 void MissileAIUpdate::projectileLaunchAtObjectOrPosition(
-	const Object *victim, 
-	const Coord3D* victimPos, 
-	const Object *launcher, 
-	WeaponSlotType wslot, 
-	Int specificBarrelToUse, 
+	const Object *victim,
+	const Coord3D* victimPos,
+	const Object *launcher,
+	WeaponSlotType wslot,
+	Int specificBarrelToUse,
 	const WeaponTemplate* detWeap,
 	const ParticleSystemTemplate* exhaustSysOverride
 )
@@ -269,7 +264,7 @@ void MissileAIUpdate::projectileFireAtObjectOrPosition( const Object *victim, co
 		// ick. const-cast is evil. fix. (srj)
  		aiMoveToObject(const_cast<Object*>(victim), CMD_FROM_AI );
 		m_originalTargetPos = *victim->getPosition();
-		m_isTrackingTarget = TRUE;// Remember that I was originally shot at a moving object, so if the 
+		m_isTrackingTarget = TRUE;// Remember that I was originally shot at a moving object, so if the
 		// target dies I can do something cool.
 		m_victimID = victim->getID();
 	}
@@ -319,11 +314,11 @@ Bool MissileAIUpdate::projectileHandleCollision( Object *other )
 	if (other != NULL)
 	{
  		Object *projectileLauncher = TheGameLogic->findObjectByID( projectileGetLauncherID() );
- 				
+
  		// if it's not the specific thing we were targeting, see if we should incidentally collide...
  		if (!m_detonationWeaponTmpl->shouldProjectileCollideWith(projectileLauncher, obj, other, m_victimID))
 		{
-			//DEBUG_LOG(("ignoring projectile collision with %s at frame %d\n",other->getTemplate()->getName().str(),TheGameLogic->getFrame()));
+			//DEBUG_LOG(("ignoring projectile collision with %s at frame %d",other->getTemplate()->getName().str(),TheGameLogic->getFrame()));
 			return true;
 		}
 
@@ -343,15 +338,15 @@ Bool MissileAIUpdate::projectileHandleCollision( Object *other )
 						Object* thingToKill = *it++;
 						if (!thingToKill->isEffectivelyDead() && thingToKill->isKindOfMulti(d->m_garrisonHitKillKindof, d->m_garrisonHitKillKindofNot))
 						{
-							//DEBUG_LOG(("Killed a garrisoned unit (%08lx %s) via Flash-Bang!\n",thingToKill,thingToKill->getTemplate()->getName().str()));
+							//DEBUG_LOG(("Killed a garrisoned unit (%08lx %s) via Flash-Bang!",thingToKill,thingToKill->getTemplate()->getName().str()));
 							if (projectileLauncher)
 								projectileLauncher->scoreTheKill( thingToKill );
 							thingToKill->kill();
 							++numKilled;
 						}
-					} // next contained item
-				} // if items
-				
+					}
+				}
+
 				if (numKilled > 0)
 				{
 					// note, fx is played at center of building, not at grenade's location
@@ -359,10 +354,10 @@ Bool MissileAIUpdate::projectileHandleCollision( Object *other )
 
 					// don't do the normal explosion; just destroy ourselves & return
 					TheGameLogic->destroyObject(obj);
-					
+
 					return true;
 				}
-			}	// if a garrisonable thing
+			}
 		}
 	}
 
@@ -419,7 +414,7 @@ void MissileAIUpdate::doKillSelfState()
 	}
 	Object* obj = getObject();
 	if (m_detonationWeaponTmpl)	{
-		TheGameLogic->destroyObject( obj );	
+		TheGameLogic->destroyObject( obj );
 	}
 	switchToState(DEAD);
 }
@@ -469,7 +464,7 @@ void MissileAIUpdate::doIgnitionState()
 
 //-------------------------------------------------------------------------------------------------
 void MissileAIUpdate::doAttackState(Bool turnOK)
-{	
+{
 	Locomotor* curLoco = getCurLocomotor();
 
 	const MissileAIUpdateModuleData* d = getMissileAIUpdateModuleData();
@@ -517,10 +512,10 @@ void MissileAIUpdate::doAttackState(Bool turnOK)
 					// Ground pos.  Change to original goal.
 					aiMoveToPosition(&m_originalTargetPos, CMD_FROM_AI );
 				}
-				switchToState(KILL); 
+				switchToState(KILL);
 				return;
 			}
-		} 
+		}
 	}
 
 	if(curLoco && curLoco->getPreferredHeight() > 0)
@@ -549,7 +544,7 @@ void MissileAIUpdate::doAttackState(Bool turnOK)
 
 //-------------------------------------------------------------------------------------------------
 void MissileAIUpdate::doKillState(void)
-{		 
+{
 	if (TheGameLogic->getFrame() >= m_fuelExpirationDate)
 	{
 		if( getMissileAIUpdateModuleData()->m_detonateOnNoFuel )
@@ -567,7 +562,7 @@ void MissileAIUpdate::doKillState(void)
 		"Cheat" and move directly towards the target.  This ensures that the missile will hit.
 		jba. */
 	Locomotor* curLoco = getCurLocomotor();
-	Object *obj = getObject();	
+	Object *obj = getObject();
 	// Objects that are braking don't follow the normal physics, so they end up at their destination exactly.
 	obj->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_BRAKING ) );
 
@@ -586,7 +581,7 @@ void MissileAIUpdate::doKillState(void)
 				closeEnough = curLoco->getMaxSpeedForCondition(BODY_PRISTINE);
 			}
 			Real distanceToTargetSq = ThePartitionManager->getDistanceSquared( getObject(), getGoalObject(), FROM_CENTER_3D);
-			//DEBUG_LOG(("Distance to target %f, closeEnough %f\n", sqrt(distanceToTargetSq), closeEnough));
+			//DEBUG_LOG(("Distance to target %f, closeEnough %f", sqrt(distanceToTargetSq), closeEnough));
 			if (distanceToTargetSq < closeEnough*closeEnough) {
 				Coord3D pos = *getGoalObject()->getPosition();
 				getObject()->setPosition(&pos);
@@ -606,7 +601,7 @@ void MissileAIUpdate::doKillState(void)
 
 //-------------------------------------------------------------------------------------------------
 void MissileAIUpdate::doDeadState()
-{	
+{
 	Locomotor* curLoco = getCurLocomotor();
 	if (curLoco)
 	{
@@ -629,8 +624,8 @@ UpdateSleepTime MissileAIUpdate::update()
 		m_prevPos = newPos;
 	}
 
-	if (newPos.z < 0) 
-	{	 
+	if (newPos.z < 0)
+	{
 		// we ended up under the world.  go away.
 		TheGameLogic->destroyObject(getObject());
 		return UPDATE_SLEEP_FOREVER;
@@ -652,6 +647,8 @@ UpdateSleepTime MissileAIUpdate::update()
 			{
 				break;
 			}
+			FALLTHROUGH;
+
 		case IGNITION:
 			doIgnitionState();
 			break;
@@ -717,7 +714,7 @@ UpdateSleepTime MissileAIUpdate::update()
 
 //-------------------------------------------------------------------------------------------------
 Bool MissileAIUpdate::processCollision(PhysicsBehavior *physics, Object *other)
-/* Returns true if the physics collide should apply the force.  Normally not.  
+/* Returns true if the physics collide should apply the force.  Normally not.
 Also determines whether objects are blocked, and if so, if they are stuck.  jba.*/
 {
 	// Missiles dont' get blocked by other objects.
@@ -740,7 +737,7 @@ void MissileAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -753,7 +750,7 @@ void MissileAIUpdate::xfer( Xfer *xfer )
   const XferVersion currentVersion = 4;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -772,23 +769,23 @@ void MissileAIUpdate::xfer( Xfer *xfer )
 	xfer->xferReal(&m_maxAccel);
 
 	AsciiString weaponName;
-	if (m_detonationWeaponTmpl) 
+	if (m_detonationWeaponTmpl)
 	{
 		weaponName = m_detonationWeaponTmpl->getName();
 	}
 	xfer->xferAsciiString(&weaponName);
-	if (weaponName.isNotEmpty() && m_detonationWeaponTmpl == NULL) 
+	if (weaponName.isNotEmpty() && m_detonationWeaponTmpl == NULL)
 	{
 		m_detonationWeaponTmpl = TheWeaponStore->findWeaponTemplate(weaponName);
 	}
 
 	AsciiString exhaustName;
-	if (m_exhaustSysTmpl) 
+	if (m_exhaustSysTmpl)
 	{
 		exhaustName = m_exhaustSysTmpl->getName();
 	}
 	xfer->xferAsciiString(&exhaustName);
-	if (exhaustName.isNotEmpty() && m_exhaustSysTmpl == NULL) 
+	if (exhaustName.isNotEmpty() && m_exhaustSysTmpl == NULL)
 	{
 		m_exhaustSysTmpl = TheParticleSystemManager->findTemplate(exhaustName);
 	}
@@ -806,7 +803,7 @@ void MissileAIUpdate::xfer( Xfer *xfer )
 		xfer->xferUser( &m_exhaustID, sizeof( m_exhaustID ) );
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -815,4 +812,4 @@ void MissileAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/POWTruckAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/POWTruckAIUpdate.cpp
index 1f7ca41af98..b809367e515 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/POWTruckAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/POWTruckAIUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/GlobalData.h"
@@ -58,14 +58,14 @@ POWTruckAIUpdateModuleData::POWTruckAIUpdateModuleData( void )
 	m_boredTimeInFrames = 0;
 	m_hangAroundPrisonDistance = 0;
 
-}  // end POWTruckAIUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 void POWTruckAIUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
   AIUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "BoredTime",					INI::parseDurationUnsignedInt,	NULL, offsetof( POWTruckAIUpdateModuleData, m_boredTimeInFrames ) },
 		{ "AtPrisonDistance",		INI::parseReal,		NULL,		offsetof( POWTruckAIUpdateModuleData, m_hangAroundPrisonDistance ) },
@@ -74,7 +74,7 @@ void POWTruckAIUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
@@ -83,7 +83,7 @@ void POWTruckAIUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 POWTruckAIUpdate::POWTruckAIUpdate( Thing *thing, const ModuleData *moduleData )
-								: AIUpdateInterface( thing, moduleData )              
+								: AIUpdateInterface( thing, moduleData )
 {
 
 	m_aiMode = AUTOMATIC;
@@ -93,21 +93,21 @@ POWTruckAIUpdate::POWTruckAIUpdate( Thing *thing, const ModuleData *moduleData )
 	m_enteredWaitingFrame = 0;
 	m_lastFindFrame = 0;
 
-}  // end POWTruckAIUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 POWTruckAIUpdate::~POWTruckAIUpdate( void )
 {
 
-}  // end ~POWTruckAIUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void POWTruckAIUpdate::onDelete( void )
 {
 
-}  // end onDelete
+}
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -127,7 +127,7 @@ void POWTruckAIUpdate::aiDoCommand( const AICommandParms *parms )
 		// set our task to waiting
 		setTask( POW_TRUCK_TASK_WAITING );
 
-	}  // end if
+	}
 
 	switch( parms->m_cmd )
 	{
@@ -139,7 +139,7 @@ void POWTruckAIUpdate::aiDoCommand( const AICommandParms *parms )
 			privatePickUpPrisoner( parms->m_obj, parms->m_cmdSource );
 			break;
 
-		}  // end pick up prisoner
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case AICMD_RETURN_PRISONERS:
@@ -148,7 +148,7 @@ void POWTruckAIUpdate::aiDoCommand( const AICommandParms *parms )
 			privateReturnPrisoners( parms->m_obj, parms->m_cmdSource );
 			break;
 
-		}  // end return prisoners
+		}
 
 		// --------------------------------------------------------------------------------------------
 		default:
@@ -158,11 +158,11 @@ void POWTruckAIUpdate::aiDoCommand( const AICommandParms *parms )
 			AIUpdateInterface::aiDoCommand( parms );
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch( parms->m_cmd )
+	}
 
-}  // end aiDoCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -198,14 +198,14 @@ UpdateSleepTime POWTruckAIUpdate::update( void )
 			updateReturnPrisoners();
 			break;
 		default:
-			DEBUG_CRASH(( "POWTruckAIUpdate::update - Unknown current task '%d'\n", m_currentTask ));
+			DEBUG_CRASH(( "POWTruckAIUpdate::update - Unknown current task '%d'", m_currentTask ));
 			break;
 
-	}  // end switch, current task
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PROTECTED //////////////////////////////////////////////////////////////////////////////////////
@@ -219,15 +219,15 @@ void POWTruckAIUpdate::setTask( POWTruckTask task, Object *taskObject )
 	POWTruckTask oldTask = m_currentTask;
 
 	// sanity, POW_TRUCK_TASK_COLLECTING_TARGET and POW_TRUCK_TASK_RETURNING_PRISONERS require taskObject parameters
-	if( (task == POW_TRUCK_TASK_COLLECTING_TARGET || task == POW_TRUCK_TASK_RETURNING_PRISONERS) && 
+	if( (task == POW_TRUCK_TASK_COLLECTING_TARGET || task == POW_TRUCK_TASK_RETURNING_PRISONERS) &&
 			taskObject == NULL )
 	{
 
-		DEBUG_CRASH(( "POWTruckAIUpdate::setTask - Illegal arguments\n" ));
+		DEBUG_CRASH(( "POWTruckAIUpdate::setTask - Illegal arguments" ));
 		setTask( POW_TRUCK_TASK_WAITING );
 		return;
 
-	}  // end if
+	}
 
 	// when leaving the collecting target state, we need to do some bookeeping
 	if( oldTask == POW_TRUCK_TASK_COLLECTING_TARGET )
@@ -236,7 +236,7 @@ void POWTruckAIUpdate::setTask( POWTruckTask task, Object *taskObject )
 		// target cleanup
 		m_targetID = INVALID_ID;
 
-	}  // end if
+	}
 
 	// to be clean, when leaving the POW_TRUCK_TASK_RETURNING_PRISONERS state, clear out the prison ID we were watching
 	if( oldTask == POW_TRUCK_TASK_RETURNING_PRISONERS )
@@ -250,33 +250,33 @@ void POWTruckAIUpdate::setTask( POWTruckTask task, Object *taskObject )
 		m_targetID = taskObject->getID();
 
 		// mark this target as slated for pickup
-		DEBUG_ASSERTCRASH( taskObject->getAIUpdateInterface(), ("POWTruckAIUpdate::setTask - '%s' has no ai module\n",
+		DEBUG_ASSERTCRASH( taskObject->getAIUpdateInterface(), ("POWTruckAIUpdate::setTask - '%s' has no ai module",
 													 taskObject->getTemplate()->getName().str()) );
 
-	}  // end if
+	}
 	else if( task == POW_TRUCK_TASK_RETURNING_PRISONERS )
 	{
 
 		// save ID of the prison we're going to
 		m_prisonID = taskObject->getID();
 
-	}  // end else
+	}
 	else if( task == POW_TRUCK_TASK_WAITING )
 	{
 
 		// mark the frame and always go idle
 		m_enteredWaitingFrame = TheGameLogic->getFrame();
 
-	}  // end else if
+	}
 
 	// store the new current task
 	m_currentTask = task;
 
-}  // end task
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Set this unit into automatic or manual AI mode, when automatic the AI will look for 
-	* prisoners, collect them, and bring them back automatically.  When in manual, the 
+/** Set this unit into automatic or manual AI mode, when automatic the AI will look for
+	* prisoners, collect them, and bring them back automatically.  When in manual, the
 	* player must direct the actions of the unit explicitly */
 // ------------------------------------------------------------------------------------------------
 void POWTruckAIUpdate::setAIMode( POWTruckAIMode mode )
@@ -285,7 +285,7 @@ void POWTruckAIUpdate::setAIMode( POWTruckAIMode mode )
 	// save the mode
 	m_aiMode = mode;
 
-}  // end setAIModel
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -317,7 +317,7 @@ void POWTruckAIUpdate::privatePickUpPrisoner( Object *prisoner, CommandSourceTyp
 		getCurLocomotor()->setUltraAccurate( TRUE );
 	aiMoveToObject( prisoner, CMD_FROM_AI );
 
-}  // end privatePickUpPrisoner
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -344,7 +344,7 @@ void POWTruckAIUpdate::privateReturnPrisoners( Object *prison, CommandSourceType
 		getCurLocomotor()->setUltraAccurate( TRUE );
 	aiDock( prison, cmdSource );
 
-}  // end privateReturnPrisoners
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -358,7 +358,7 @@ void POWTruckAIUpdate::updateWaiting( void )
 	// get our info
 	Object *us = getObject();
 	AIUpdateInterface *ai = us->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::updateWaiting - '%s' has no ai\n",
+	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::updateWaiting - '%s' has no ai",
 													us->getTemplate()->getName().str()) );
 
 	//
@@ -376,7 +376,7 @@ void POWTruckAIUpdate::updateWaiting( void )
 	if( TheGameLogic->getFrame() - m_enteredWaitingFrame > modData->m_boredTimeInFrames )
 		setTask( POW_TRUCK_TASK_FIND_TARGET );
 
-}  // updateWaiting
+}
 
 static const UnsignedInt FIND_DELAY = LOGICFRAMES_PER_SECOND * 1;
 // ------------------------------------------------------------------------------------------------
@@ -385,7 +385,7 @@ void POWTruckAIUpdate::updateFindTarget( void )
 {
 
 	// we never find targets when in manual ai mode
-	DEBUG_ASSERTCRASH( m_aiMode != MANUAL, ("POWTruckAIUpdate::updateFindTarget - We shouldn't be here with a manual ai mode\n") );
+	DEBUG_ASSERTCRASH( m_aiMode != MANUAL, ("POWTruckAIUpdate::updateFindTarget - We shouldn't be here with a manual ai mode") );
 	if( m_aiMode == MANUAL )
 		return;
 
@@ -399,7 +399,7 @@ void POWTruckAIUpdate::updateFindTarget( void )
 	// get our info
 	Object *us = getObject();
 	AIUpdateInterface *ai = us->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::updateFindTarget - '%s' has no ai\n",
+	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::updateFindTarget - '%s' has no ai",
 													us->getTemplate()->getName().str()) );
 
 	// if we're full we should return to prison
@@ -410,7 +410,7 @@ void POWTruckAIUpdate::updateFindTarget( void )
 		doReturnPrisoners();
 		return;
 
-	}  // end if
+	}
 
 	// find closest target not already targeted for pickup by another POW truck
 	Object *target = findBestTarget();
@@ -418,23 +418,23 @@ void POWTruckAIUpdate::updateFindTarget( void )
 	// if target exists, go get it
 	if( target )
 	{
-		
+
 		// send the pickup command
 		ai->aiPickUpPrisoner( target, CMD_FROM_AI );
 
-	}  // end if
+	}
 	else
 	{
-	
+
 		// no target exists, if we have prisoners return them
 		if( contain->getContainCount() != 0 )
 			doReturnPrisoners();
 		else
 			doReturnToPrison( NULL );
 
-	}  // end else
-			
-}  // end updateFindTarget
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -454,7 +454,7 @@ void POWTruckAIUpdate::updateCollectingTarget( void )
 
 		return;
 
-	}  // end if
+	}
 
 	// we should never become idle while collecting a target, if we do, find a target
 	Object *us = getObject();
@@ -467,7 +467,7 @@ void POWTruckAIUpdate::updateCollectingTarget( void )
 		else
 			setTask( POW_TRUCK_TASK_WAITING );
 
-	}  // end if
+	}
 
 /*
 	//
@@ -487,12 +487,12 @@ void POWTruckAIUpdate::updateCollectingTarget( void )
 			// tell them to start moving to us
 			targetAI->aiMoveToObject( us, CMD_FROM_AI );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 */
 
-}  // end updateCollectingTarget
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -510,7 +510,7 @@ static void putContainedInPrison( Object *obj, void *userData )
 
 	// sanity
 	DEBUG_ASSERTCRASH( returnData != NULL && returnData->source != NULL && returnData->dest != NULL,
-										 ("putContainedInPrison: Invalid arguments\n") );
+										 ("putContainedInPrison: Invalid arguments") );
 
 	// take 'obj' out of the source
 	ContainModuleInterface *sourceContain = returnData->source->getContain();
@@ -526,7 +526,7 @@ static void putContainedInPrison( Object *obj, void *userData )
 		destContain->addToContain( obj );
 	}
 
-}  // end putContainedInPrison
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -534,12 +534,12 @@ void POWTruckAIUpdate::updateReturnPrisoners( void )
 {
 	Object *us = getObject();
 	AIUpdateInterface *ai = us->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::updateReturnPrisoners - '%s' has no AI\n",
+	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::updateReturnPrisoners - '%s' has no AI",
 												 us->getTemplate()->getName().str()) );
 
 	// get the prison we're returning to
 	Object *prison = TheGameLogic->findObjectByID( m_prisonID );
-	
+
 	// prison has gone away, do this all over again
 	if( prison == NULL )
 	{
@@ -547,13 +547,13 @@ void POWTruckAIUpdate::updateReturnPrisoners( void )
 		doReturnPrisoners();
 		return;
 
-	}  // end if
+	}
 
 	// we should not go idle, we should collide with the prison to return the prisoners
 	if( ai->isIdle() )
 		doReturnPrisoners();
 
-}  // end updateReturnPrisoners
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Is the object 'target' a valid target for collection */
@@ -563,14 +563,14 @@ Bool POWTruckAIUpdate::validateTarget( const Object *target )
 
 	return TheActionManager->canPickUpPrisoner( getObject(), target, getLastCommandSource() );
 
-}  // end validateTarget
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Initiate a return prisoners contained in us to prison */
 // ------------------------------------------------------------------------------------------------
 void POWTruckAIUpdate::doReturnPrisoners( void )
 {
-	
+
 	// find the closest prison
 	Object *prison = findBestPrison();
 
@@ -581,16 +581,16 @@ void POWTruckAIUpdate::doReturnPrisoners( void )
 		setTask( POW_TRUCK_TASK_WAITING );
 		return;
 
-	}  // end if
+	}
 
 	// start the prisoner return process
 	Object *us = getObject();
 	AIUpdateInterface *ai = us->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::doReturnPrisoners - '%s' has no AI\n",
+	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::doReturnPrisoners - '%s' has no AI",
 												 us->getTemplate()->getName().str()) );
 	ai->aiReturnPrisoners( prison, CMD_FROM_AI );
 
-}  // end doReturnPrisoners
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Initate a return of our empty truck back near the closest prison */
@@ -624,7 +624,7 @@ void POWTruckAIUpdate::doReturnToPrison( Object *prison )
 	// dock us with the prison
 	aiDock( prison, CMD_FROM_AI );
 
-}  // end doReturnToPrison
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Find the best prison for us to use given our current position */
@@ -641,7 +641,7 @@ Object *POWTruckAIUpdate::findBestPrison( void )
 
 	return prison;
 
-}  // end findBestPrison
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Find the best prisoner for us to go pick up given our current situation */
@@ -657,7 +657,7 @@ Object *POWTruckAIUpdate::findBestTarget( void )
 
 	// get our info
 	const AIUpdateInterface *ai = us->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::findBestTarget- '%s' has no AI\n",
+	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::findBestTarget- '%s' has no AI",
 												 us->getTemplate()->getName().str()) );
 
 	// scan all objects, there is no range
@@ -679,13 +679,13 @@ Object *POWTruckAIUpdate::findBestTarget( void )
 			continue;
 
 		// is this target closer than the one we've found so far
-		Real distSq = ThePartitionManager->getDistanceSquared( us, other, FROM_CENTER_2D ); 
+		Real distSq = ThePartitionManager->getDistanceSquared( us, other, FROM_CENTER_2D );
 		if( closestTarget == NULL || distSq < closestTargetDistSq )
 		{
 
-			// we must be able to pathfind to this target 
+			// we must be able to pathfind to this target
 			if( TheAI->pathfinder()->quickDoesPathExist( ai->getLocomotorSet(),
-																							us->getPosition(), 
+																							us->getPosition(),
 																							other->getPosition() ) == TRUE )
 			{
 
@@ -693,15 +693,15 @@ Object *POWTruckAIUpdate::findBestTarget( void )
 				closestTarget = other;
 				closestTargetDistSq = distSq;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end for other
+	}
 
 	return closestTarget;
 
-}  // end findBestTarget
+}
 
 // ------------------------------------------------------------------------------------------------
 /** We are chosing to pass a structure through the iterate function to unload the
@@ -727,9 +727,9 @@ static void putPrisonersInPrison( Object *obj, void *userData )
 	Object *prison = prisonUnloadData->destPrison;
 
 	// sanity
-	DEBUG_ASSERTCRASH( prison, ("putPrisonersInPrison: NULL user data\n") );
+	DEBUG_ASSERTCRASH( prison, ("putPrisonersInPrison: NULL user data") );
 	DEBUG_ASSERTCRASH( obj->getContainedBy() != NULL,
-										 ("putPrisonersInPrison: Prisoner '%s' is not contained by anything, it should be contained by a POW truck\n",
+										 ("putPrisonersInPrison: Prisoner '%s' is not contained by anything, it should be contained by a POW truck",
 										 obj->getTemplate()->getName().str()) );
 
 	// extra super sanity, just so that we don't crash ... this is in the assert above
@@ -752,10 +752,10 @@ static void putPrisonersInPrison( Object *obj, void *userData )
 
 	// add up bounty for this prisoner
 	Player *prisonerOwningPlayer = obj->getControllingPlayer();
-	prisonUnloadData->bounty += TheGlobalData->m_prisonBountyMultiplier * 
+	prisonUnloadData->bounty += TheGlobalData->m_prisonBountyMultiplier *
 															obj->getTemplate()->calcCostToBuild( prisonerOwningPlayer );
 
-}  // end putPrisonersInPrison
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -771,15 +771,15 @@ void POWTruckAIUpdate::unloadPrisonersToPrison( Object *prison )
 	ContainModuleInterface *truckContain = us->getContain();
 
 	// sanity
-	DEBUG_ASSERTCRASH( prison->getContain(), ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no contain\n",
+	DEBUG_ASSERTCRASH( prison->getContain(), ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no contain",
 																		prison->getTemplate()->getName().str()) );
-	DEBUG_ASSERTCRASH( prison->getContain()->asOpenContain(), 
-										 ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no OPEN contain\n",
+	DEBUG_ASSERTCRASH( prison->getContain()->asOpenContain(),
+										 ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no OPEN contain",
 										 prison->getTemplate()->getName().str()) );
-	DEBUG_ASSERTCRASH( truckContain, ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no contain\n",
+	DEBUG_ASSERTCRASH( truckContain, ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no contain",
 																	 us->getTemplate()->getName().str()) );
-	DEBUG_ASSERTCRASH( truckContain->asOpenContain(), 
-										 ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no OPEN contain\n",
+	DEBUG_ASSERTCRASH( truckContain->asOpenContain(),
+										 ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no OPEN contain",
 										 us->getTemplate()->getName().str()) );
 
 	// put the prisoners in the prison
@@ -801,7 +801,7 @@ void POWTruckAIUpdate::unloadPrisonersToPrison( Object *prison )
 
 			if( money )
 			{
-				
+
 				// deposit the money
 				money->deposit( prisonUnloadData.bounty );
 				player->getScoreKeeper()->addMoneyEarned( prisonUnloadData.bounty );
@@ -815,16 +815,16 @@ void POWTruckAIUpdate::unloadPrisonersToPrison( Object *prison )
 				moneyString.format( TheGameText->fetch( "GUI:AddCash" ), prisonUnloadData.bounty );
 				TheInGameUI->addFloatingText( moneyString, &pos, moneyColor );
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// set our state to waiting and become idle
 	setTask( POW_TRUCK_TASK_WAITING );
 
-}  // end unloadPrisonersToPrison
+}
 
 // ------------------------------------------------------------------------------------------------
 /** We have arrived at a prisoner to load into us ... do it */
@@ -850,7 +850,7 @@ void POWTruckAIUpdate::loadPrisoner( Object *prisoner )
 		doReturnPrisoners();
 		return;
 
-	}  // end if
+	}
 
 	// add object to our containment
 	contain->addToContain( prisoner );
@@ -870,7 +870,7 @@ void POWTruckAIUpdate::loadPrisoner( Object *prisoner )
 	else
 		setTask( POW_TRUCK_TASK_WAITING );
 
-}  // end loadPrisoner
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -879,7 +879,7 @@ void POWTruckAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -892,7 +892,7 @@ void POWTruckAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -903,7 +903,7 @@ void POWTruckAIUpdate::xfer( Xfer *xfer )
 	xfer->xferUnsignedInt(&m_enteredWaitingFrame);
 	xfer->xferUnsignedInt(&m_lastFindFrame);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -912,6 +912,6 @@ void POWTruckAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
 #endif
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailedTransportAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailedTransportAIUpdate.cpp
index d9b2b3eaae5..f22256ff035 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailedTransportAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailedTransportAIUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/GameState.h"
@@ -45,7 +45,7 @@ static const Int INVALID_PATH = -1;
 RailedTransportAIUpdateModuleData::RailedTransportAIUpdateModuleData( void )
 {
 
-}  // end RailedTransportAIUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -53,7 +53,7 @@ void RailedTransportAIUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
   AIUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "PathPrefixName",		INI::parseAsciiString, NULL,	offsetof( RailedTransportAIUpdateModuleData, m_pathPrefixName ) },
 		{ 0, 0, 0, 0 }
@@ -61,12 +61,12 @@ void RailedTransportAIUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 RailedTransportAIUpdate::RailedTransportAIUpdate( Thing *thing, const ModuleData *moduleData )
-											 : AIUpdateInterface( thing, moduleData )              
+											 : AIUpdateInterface( thing, moduleData )
 {
 
 	m_inTransit = FALSE;
@@ -76,19 +76,19 @@ RailedTransportAIUpdate::RailedTransportAIUpdate( Thing *thing, const ModuleData
 		m_path[ i ].startWaypointID = 0;
 		m_path[ i ].endWaypointID = 0;
 
-	}  // end for i
+	}
 	m_numPaths = 0;
 	m_currentPath = INVALID_PATH;
 	m_waypointDataLoaded = FALSE;
 
-}  // end RailedTransportAIUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 RailedTransportAIUpdate::~RailedTransportAIUpdate( void )
 {
 
-}  // end ~RailedTransportAIUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -118,14 +118,14 @@ void RailedTransportAIUpdate::loadWaypointData( void )
 			m_path[ i ].endWaypointID = end->getID();
 			m_numPaths++;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// waypoint data is loaded
 	m_waypointDataLoaded = TRUE;
 
-}  // end loadWaypointData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -163,15 +163,15 @@ void RailedTransportAIUpdate::pickAndMoveToInitialLocation( void )
 				closestPath = i;
 				closestEndWaypoint = waypoint;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// a path must have been found
 	DEBUG_ASSERTCRASH( closestPath != INVALID_PATH,
-										 ("No suitable starting waypoint path could be found for '%s'\n",
+										 ("No suitable starting waypoint path could be found for '%s'",
 										 us->getTemplate()->getName().str()) );
 
 	// follow the waypoint path to its destination end point
@@ -183,7 +183,7 @@ void RailedTransportAIUpdate::pickAndMoveToInitialLocation( void )
 	// we are now "in transit"
 	setInTransit( TRUE );
 
-}  // end pickAndMoveToInitialLocation
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -203,7 +203,7 @@ UpdateSleepTime RailedTransportAIUpdate::update( void )
 	Locomotor *currentLocomotor = getCurLocomotor();
 	if( currentLocomotor )
 		currentLocomotor->setUltraAccurate( TRUE );
-	
+
 	//
 	// if we have no current path selected pick one and move to the end waypoint of that
 	// path.  this will set us up in an initial position at the end of the closest path
@@ -218,38 +218,45 @@ UpdateSleepTime RailedTransportAIUpdate::update( void )
 	//
 	if( m_inTransit )
 	{
-	
+
 		// sanity
 		DEBUG_ASSERTCRASH( m_currentPath != INVALID_PATH,
-											 ("RailedTransportAIUpdate: Invalid current path '%s'\n", m_currentPath) );
+											 ("RailedTransportAIUpdate: Invalid current path '%s'", m_currentPath) );
 
 		// get our target waypoint
 		Waypoint *waypoint = TheTerrainLogic->getWaypointByID( m_path[ m_currentPath ].endWaypointID );
-		
+
 		// sanity
-		DEBUG_ASSERTCRASH( waypoint, ("RailedTransportAIUpdate: Invalid target waypoint\n") );
-
-		// how far away are we from the target waypoint
-		const Coord3D *start = us->getPosition();
-		const Coord3D *end = waypoint->getLocation();
-		Coord3D v;
-		v.x = end->x - start->x;
-		v.y = end->y - start->y;
-		v.z = end->z - start->z;
-		Real dist = v.length();
-		if( dist <= 5.0f || isIdle() )
+		DEBUG_ASSERTCRASH( waypoint, ("RailedTransportAIUpdate: Invalid target waypoint") );
+
+		if (waypoint)
 		{
+			// how far away are we from the target waypoint
+			const Coord3D *start = us->getPosition();
+			const Coord3D *end = waypoint->getLocation();
+			Coord3D v;
+			v.x = end->x - start->x;
+			v.y = end->y - start->y;
+			v.z = end->z - start->z;
+			Real dist = v.length();
+			if( dist <= 5.0f || isIdle() )
+			{
 
-			// we are no longer in transit
-			setInTransit( FALSE );
+				// we are no longer in transit
+				setInTransit( FALSE );
 
-		}  // end if
+			}
+		}
+		else
+		{
+			setInTransit( FALSE );
+		}
 
-	}  // end if
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -261,15 +268,15 @@ void RailedTransportAIUpdate::aiDoCommand( const AICommandParms *parms )
 		return;
 
 	// we ignore all commands from the player except the one to start a transit and to unload
-	if( parms->m_cmdSource == CMD_FROM_PLAYER && 
+	if( parms->m_cmdSource == CMD_FROM_PLAYER &&
 			parms->m_cmd != AICMD_EXECUTE_RAILED_TRANSPORT &&
 			parms->m_cmd != AICMD_EVACUATE )
 		return;
 
 	// call the default do command
 	AIUpdateInterface::aiDoCommand( parms );
-	
-}  // end aiDoCommand
+
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
@@ -289,7 +296,7 @@ void RailedTransportAIUpdate::setInTransit( Bool inTransit )
 	// no longer in transit
 	m_inTransit = inTransit;
 
-}  // end setInTransit
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -317,7 +324,7 @@ void RailedTransportAIUpdate::privateExecuteRailedTransport( CommandSourceType c
 
 	// find the start waypoint for our current path
 	Waypoint *startWaypoint = TheTerrainLogic->getWaypointByID( m_path[ m_currentPath ].startWaypointID );
-	DEBUG_ASSERTCRASH( startWaypoint, ("RailedTransportAIUpdate: Start waypoint not found\n") );
+	DEBUG_ASSERTCRASH( startWaypoint, ("RailedTransportAIUpdate: Start waypoint not found") );
 
 	// follow this waypoint path
 	aiFollowWaypointPath( startWaypoint, CMD_FROM_AI );
@@ -325,7 +332,7 @@ void RailedTransportAIUpdate::privateExecuteRailedTransport( CommandSourceType c
 	// we are now in transit
 	setInTransit( TRUE );
 
-}  // end privateExecuteRailedTransport
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -358,7 +365,7 @@ void RailedTransportAIUpdate::privateEvacuate( Int exposeStealthUnits, CommandSo
 	// start the manual undocking process
 	rtdui->unloadAll();
 
-}  // end privateEvacuate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -367,7 +374,7 @@ void RailedTransportAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -379,7 +386,7 @@ void RailedTransportAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -397,7 +404,7 @@ void RailedTransportAIUpdate::xfer( Xfer *xfer )
 	xfer->xferInt(&m_currentPath);
 	xfer->xferBool(&m_waypointDataLoaded);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -406,4 +413,4 @@ void RailedTransportAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
index 8ca6f8849d2..05608fd5f5b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc: The railroad track following railroad carriage/locomotive logic module
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	
+#include "PreRTS.h"
 
 #include "Common/Player.h"
 #include "Common/ThingFactory.h"
@@ -58,28 +58,19 @@ static const Int INVALID_PATH = -1;
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-//#pragma message("NO COMMENTS, PLEASE ABOUT THIS PRAGMA BEING LEFT ON... IT IS FOR A SPECIAL TEST...")
-//#pragma message("IF QA EVER REPRODUCES A DESYNC (BELIEVED FIXED) I'LL NEED TO DEBUG WHILE PLAYING AGAINST")
-//#pragma message("THAT MACHINE WITHOUT QUITTING TO START A DEBUGGABLE VERSION...")
-//#pragma message("THIS WILL BE CORRECTED IN GOOD TIME. JUST TRUST ME, -ML")
-#endif
 
 
 #define FRAMES_UNPULLED_LONG_ENOUGH_TO_UNHITCH (2)
 
 
-void TrainTrack::incReference() 
-{ 
-	++m_refCount; 
+void TrainTrack::incReference()
+{
+	++m_refCount;
 }
 
-Bool TrainTrack::releaseReference() 
-{ 
-	return ( --m_refCount == 0 ); 
+Bool TrainTrack::releaseReference()
+{
+	return ( --m_refCount == 0 );
 }
 
 
@@ -90,7 +81,7 @@ RailroadBehaviorModuleData::RailroadBehaviorModuleData( void )
 	m_carriageTemplateNameData.clear();
 	m_pathPrefixName.clear();
 	m_CrashFXTemplateName.clear();
-	
+
 	m_isLocomotive = FALSE;
 	m_runningGarrisonSpeedMax = 1.0f;
 	m_killSpeedMin = 1.0f;
@@ -99,13 +90,13 @@ RailroadBehaviorModuleData::RailroadBehaviorModuleData( void )
 	m_braking = 0.99f;
 	m_friction = 0.97f;
 	m_waitAtStationTime = 150;
-}  // end RailroadBehaviorModuleData
+}
 
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-RailroadBehavior::RailroadBehavior( Thing *thing, const ModuleData *moduleData ) 
-											 : PhysicsBehavior( thing, moduleData )          
+RailroadBehavior::RailroadBehavior( Thing *thing, const ModuleData *moduleData )
+											 : PhysicsBehavior( thing, moduleData )
 {
 	const RailroadBehaviorModuleData *modData = getRailroadBehaviorModuleData();
 
@@ -150,17 +141,17 @@ RailroadBehavior::RailroadBehavior( Thing *thing, const ModuleData *moduleData )
 	m_waitAtStationTimer = 0;
 
 
-	
+
 	m_anchorWaypointID = INVALID_WAYPOINT_ID;
 
 	m_carriagesCreated = FALSE;
 	m_hasEverBeenHitched = FALSE;
 	m_trackDataLoaded = FALSE;
 	m_waitingInWings = TRUE;
-	m_endOfLine = FALSE;			
+	m_endOfLine = FALSE;
 	m_isLocomotive = modData->m_isLocomotive;
 	m_isLeadCarraige = m_isLocomotive;  // for now, I am the lead, only if I am the locomotive
-	m_wantsToBeLeadCarraige = FALSE; 
+	m_wantsToBeLeadCarraige = FALSE;
 	m_disembark = FALSE;
 	m_inTunnel = FALSE;
 
@@ -168,7 +159,7 @@ RailroadBehavior::RailroadBehavior( Thing *thing, const ModuleData *moduleData )
 	m_conductorState = m_isLocomotive ? ACCELERATE : COAST;
 
 
-}  // end RailroadBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -186,12 +177,12 @@ RailroadBehavior::~RailroadBehavior( void )
 	}
 
 
-}  // end ~RailroadBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 
-Bool RailroadBehavior::isRailroad() const 
+Bool RailroadBehavior::isRailroad() const
 {
 	if ( ! m_track )
 		return FALSE;// I haven't even started yet!
@@ -248,7 +239,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 				other->kill();
 				obj->kill();//and I am dead, too
 			}
-			
+
 			return ;//// its a train, folks
 		}
 
@@ -265,7 +256,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 				other->isKindOf( KINDOF_REBUILD_HOLE ) )
 		{
 			playImpactSound(other, other->getPosition());
-			other->kill(); 
+			other->kill();
 			return;
 		}
 
@@ -282,7 +273,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 		}
 	}
 
-	
+
 	PhysicsBehavior *theirPhys = other->getPhysics();
 	if( ! theirPhys )
 		return;
@@ -292,7 +283,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 	if ( m_conductorState == WAIT_AT_STATION && (m_pullInfo.speed < modData->m_runningGarrisonSpeedMax) ) // they can grab on safely
 	{
 		AIUpdateInterface *ai = other->getAI();
-		if (ai && ai->getEnterTarget() == obj) // other intends to garrison me. 
+		if (ai && ai->getEnterTarget() == obj) // other intends to garrison me.
 		{
 			return;
 		}
@@ -319,7 +310,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 	dlt.z = theirLoc->z - myLoc->z;
 
 
-	//Alert all the players of recent disaster 
+	//Alert all the players of recent disaster
 	if ( ! m_whistleSound.isCurrentlyPlaying())
 		m_whistleSound.setPlayingHandle(TheAudio->addAudioEvent( &m_whistleSound ));
 
@@ -426,11 +417,11 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 
 	if (dot > 0)
 		theirPhys->setYawRate( deviationCOG * -0.06f * m_pullInfo.speed);
-	
 
 
 
-}  // end RailroadBehavior:: on collide
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -487,7 +478,7 @@ void RailroadBehavior::playImpactSound(Object *victim, const Coord3D *impactPosi
 		vel /= 2;
 		mass /= 2;//average of him and me
 		impact.setPosition(victim->getPosition());
-	} 
+	}
 
 	vel = MIN(NORMAL_VEL_Z, MAX(0, vel));
 	mass = MIN(NORMAL_MASS, MAX(0, mass));
@@ -514,7 +505,7 @@ void RailroadBehavior::loadTrackData( void )
 	if ( m_track != NULL )
 		return;// lets do this only once!
 
- 
+
 	//First we scan the map for the nearest waypoint
 	Object *obj = getObject();
 	const Coord3D *myPos =  obj->getPosition();
@@ -525,10 +516,10 @@ void RailroadBehavior::loadTrackData( void )
 
 	// m_anchorWaypointID COULD HAVE BEEN RECORDED IN XFER, WHICH MEANS I LOADED MY TRACK DATA IN A PRIOR LIFE,
 	// SO LETS JUST RE_INIT THE TRACK BASED ON THAT POINT, AUTOMAGICALLY
-	Waypoint *anchorWaypoint = NULL; 
+	Waypoint *anchorWaypoint = NULL;
 	if ( m_anchorWaypointID == INVALID_WAYPOINT_ID )
 	{
-		Waypoint *anyWaypoint = TheTerrainLogic->getFirstWaypoint(); 
+		Waypoint *anyWaypoint = TheTerrainLogic->getFirstWaypoint();
 
 		while ( anyWaypoint )
 		{
@@ -563,12 +554,12 @@ void RailroadBehavior::loadTrackData( void )
 
 
 	m_track = NEW( TrainTrack );// this constructor inc's the refcount to 1
-	
+
 	// From now until the next carriage is added, this track is writable using getWritablePointList();
 	// This method will return NULL when refcount is 2 or more
 	// getPointList returns the list as const to any caller
 	// each carriage must increment the reference when this pointer is passed to it,
-	// any subsequent carriage (destructor) will delete this memory here if it releases refcount to zero 
+	// any subsequent carriage (destructor) will delete this memory here if it releases refcount to zero
 
 	Coord3D fromPos, toPos, fromToDelta;
 	m_track->m_length = 0.0f;
@@ -644,7 +635,7 @@ void RailroadBehavior::loadTrackData( void )
 		}
 	}
 
-}  // end loadTrackData
+}
 
 
 
@@ -728,7 +719,7 @@ UpdateSleepTime RailroadBehavior::update( void )
 				conductorPullInfo.speed = -modData->m_speedMax;
 			}
 
-			
+
 			if ( ! m_runningSound.isCurrentlyPlaying() )
 				m_runningSound.setPlayingHandle(TheAudio->addAudioEvent( &m_runningSound ));
 
@@ -745,24 +736,24 @@ UpdateSleepTime RailroadBehavior::update( void )
 
 	if ( m_isLeadCarraige )
 	{
-	
+
 		if ( m_conductorState == COAST )
 		{
 			conductorPullInfo.speed *= modData->m_friction;
 			TheAudio->removeAudioEvent( m_runningSound.getPlayingHandle() );
 		}
-		
+
 		conductorPullInfo.trackDistance += conductorPullInfo.speed ;
 		// only normalize track position for a looping track, otherwise, let train exit by exceeding tracklength
-		while ( (conductorPullInfo.trackDistance > m_track->m_length) && m_track->m_isLooping) 
+		while ( (conductorPullInfo.trackDistance > m_track->m_length) && m_track->m_isLooping)
 			conductorPullInfo.trackDistance -= m_track->m_length;
-		while ( (conductorPullInfo.trackDistance < 0.0f ) && m_track->m_isLooping) 
+		while ( (conductorPullInfo.trackDistance < 0.0f ) && m_track->m_isLooping)
 			conductorPullInfo.trackDistance += m_track->m_length;
 
-		FindPosByPathDistance( &conductorPullInfo.towHitchPosition, 
-														conductorPullInfo.trackDistance, 
+		FindPosByPathDistance( &conductorPullInfo.towHitchPosition,
+														conductorPullInfo.trackDistance,
 														m_track->m_length);
-					
+
 		//let the conductor pull "me" while reseting my info, then...
 		updatePositionTrackDistance( &conductorPullInfo, &m_pullInfo);
 
@@ -784,7 +775,7 @@ UpdateSleepTime RailroadBehavior::update( void )
 		{
 			m_trailerID = INVALID_ID;// so I will forget about my trailer and designate myself as the caboose
 
-			if ( m_endOfLine ) 
+			if ( m_endOfLine )
 				TheGameLogic->destroyObject( getObject() );
 		}
 	}
@@ -809,13 +800,13 @@ UpdateSleepTime RailroadBehavior::update( void )
 			draw->setModelConditionState(MODELCONDITION_OVER_WATER);
 		else
 			draw->clearModelConditionState(MODELCONDITION_OVER_WATER);
-	
+
 	}
 
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -831,7 +822,7 @@ void RailroadBehavior::disembark(void)
 		contain->orderAllPassengersToExit( CMD_FROM_AI );
 	}
 
-	
+
 
 	Object *trailer = TheGameLogic->findObjectByID( m_trailerID );
 	if ( trailer )
@@ -870,8 +861,8 @@ class PartitionFilterIsValidCarriage : public PartitionFilter
 public:
 
 	PartitionFilterIsValidCarriage(Object* obj, const RailroadBehaviorModuleData* data) : m_obj(obj), m_data(data) { }
-	
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterIsValidCarriage"; }
 #endif
 
@@ -960,15 +951,15 @@ void RailroadBehavior::createCarriages( void )
 					firstCarriage = closeCarriage;
 				else // or else let's use the defualt template list prvided in the INI
 				{
-					firstCarriage = TheThingFactory->newObject( temp, self->getTeam() ); 
-					DEBUG_LOG(("%s Added a carriage, %s \n", self->getTemplate()->getName().str(),firstCarriage->getTemplate()->getName().str()));
+					firstCarriage = TheThingFactory->newObject( temp, self->getTeam() );
+					DEBUG_LOG(("%s Added a carriage, %s ", self->getTemplate()->getName().str(),firstCarriage->getTemplate()->getName().str()));
 				}
-				
+
 				if ( firstCarriage )
 				{
 					firstCarriage->setProducer(self);
 					m_trailerID = firstCarriage->getID();
-					
+
 					static NameKeyType key_rb = NAMEKEY("RailroadBehavior");
 					RailroadBehavior *rb = (RailroadBehavior*)firstCarriage->findUpdateModule(key_rb);
 					if( rb )
@@ -980,8 +971,8 @@ void RailroadBehavior::createCarriages( void )
 					}
 					else
 					{
-						DEBUG_ASSERTCRASH( rb, 
-							("%s is attempting to hitch carriage, %s without a RailroadBehavior... \nwhat kind of nutty conductor are you? ", 
+						DEBUG_ASSERTCRASH( rb,
+							("%s is attempting to hitch carriage, %s without a RailroadBehavior... \nwhat kind of nutty conductor are you? ",
 							self->getTemplate()->getName().str(),
 							firstCarriage->getTemplate()->getName().str() ) );
 					}
@@ -1039,16 +1030,16 @@ void RailroadBehavior::hitchNewCarriagebyTemplate( ObjectID locoID, const Templa
 			}
 			else
 			{
-				DEBUG_ASSERTCRASH( rb, 
-					("%s could not hitch a %s without a RailroadBehavior... \nwhat kind of nutty conductor are you? \nThe next carriage would have been a %s.", 
+				DEBUG_ASSERTCRASH( rb,
+					("%s could not hitch a %s without a RailroadBehavior... \nwhat kind of nutty conductor are you? \nThe next carriage would have been a %s.",
 					locomotive->getTemplate()->getName().str(),
 					newCarriage->getTemplate()->getName().str(),
-					*iter
+					iter->str()
 					) );
 			}
 
 		}
-	} 
+	}
 
 
 }
@@ -1092,7 +1083,7 @@ void RailroadBehavior::hitchNewCarriagebyProximity( ObjectID locoID, TrainTrack
 
 	Object* xferCarriage = NULL;
 	Object *closeCarriage = NULL;
-	
+
 	if ( m_trailerID != INVALID_ID )
 	{
 		xferCarriage = TheGameLogic->findObjectByID( m_trailerID );
@@ -1102,20 +1093,20 @@ void RailroadBehavior::hitchNewCarriagebyProximity( ObjectID locoID, TrainTrack
 	else
 		closeCarriage = ThePartitionManager->getClosestObject( &myHitchLoc, maxRadius, FROM_CENTER_2D, filters);
 
-	
+
 	if ( closeCarriage )
 	{
 		closeCarriage->setProducer(self);
 		m_trailerID = closeCarriage->getID();
-		
+
 		static NameKeyType key_rb = NAMEKEY("RailroadBehavior");
 		RailroadBehavior *rb = (RailroadBehavior*)closeCarriage->findUpdateModule(key_rb);
 		if( rb )
 			rb->hitchNewCarriagebyProximity( self->getID(), m_track );
 		else
 		{
-			DEBUG_ASSERTCRASH( rb, 
-				("%s is attempting to hitch carriage, %s without a RailroadBehavior... \nwhat kind of nutty conductor are you? ", 
+			DEBUG_ASSERTCRASH( rb,
+				("%s is attempting to hitch carriage, %s without a RailroadBehavior... \nwhat kind of nutty conductor are you? ",
 				self->getTemplate()->getName().str(),
 				closeCarriage->getTemplate()->getName().str() ) );
 		}
@@ -1154,7 +1145,7 @@ void RailroadBehavior::getPulled( PullInfo *info )
 	info->previousWaypoint = info->currentWaypoint;
 
 	updatePositionTrackDistance( info, &m_pullInfo );
-	
+
 
 	//get pointer to my trailer
 	Object *trailer = TheGameLogic->findObjectByID( m_trailerID );
@@ -1172,7 +1163,7 @@ void RailroadBehavior::getPulled( PullInfo *info )
 	else
 	{
 		m_trailerID = INVALID_ID;// so I will forget about my trailer and designate myself as the caboose
-		if ( m_endOfLine ) 
+		if ( m_endOfLine )
 			TheGameLogic->destroyObject( getObject() );
 
 	}
@@ -1193,16 +1184,16 @@ void alignToTerrain( Real angle, const Coord3D& pos, const Coord3D& normal, Matr
 
 	z = normal;
 
-	x.x = Cos( angle ); 
-	x.y = Sin( angle ); 
-	x.z = 0.0f; 
+	x.x = Cos( angle );
+	x.y = Sin( angle );
+	x.z = 0.0f;
 	if (z.z != 0.0f)
 	{
 		x.z = -(x.x*z.x + x.y*z.y) / z.z;
 		x.normalize();
 	}
 
-	DEBUG_ASSERTCRASH(fabs(x.x*z.x + x.y*z.y + x.z*z.z)<0.0001,("dot is not zero\n"));
+	DEBUG_ASSERTCRASH(fabs(x.x*z.x + x.y*z.y + x.z*z.z)<0.0001,("dot is not zero"));
 
 	// now computing the y vector is trivial.
 	y.crossProduct( &z, &x, &y );
@@ -1235,7 +1226,7 @@ void RailroadBehavior::updatePositionTrackDistance( PullInfo *pullerInfo, PullIn
 	// my conductor, or another car
 
 	Real hitchRadius = obj->getGeometryInfo().getMajorRadius();
-	myInfo->trackDistance = pullerInfo->trackDistance - (hitchRadius * 2);      
+	myInfo->trackDistance = pullerInfo->trackDistance - (hitchRadius * 2);
 	myInfo->speed = pullerInfo->speed;// YES, if I am getting pulled, I must obey puller
 	myInfo->m_direction = pullerInfo->m_direction;// YES, if I am getting pulled, I must obey puller
 
@@ -1244,13 +1235,13 @@ void RailroadBehavior::updatePositionTrackDistance( PullInfo *pullerInfo, PullIn
 
 
 // I THINK THE TURN_TO POINT SHOULD BE A BONE ON THE PREVIOUS CAR!!!!!!
-	FindPosByPathDistance( &myInfo->towHitchPosition, 
+	FindPosByPathDistance( &myInfo->towHitchPosition,
 													myInfo->trackDistance, // the look ahead
 													m_track->m_length);
 
 	Coord3D carPosition;
-	FindPosByPathDistance( &carPosition, 
-													myInfo->trackDistance, 
+	FindPosByPathDistance( &carPosition,
+													myInfo->trackDistance,
 													m_track->m_length, TRUE);
 
 
@@ -1289,7 +1280,7 @@ void RailroadBehavior::updatePositionTrackDistance( PullInfo *pullerInfo, PullIn
 	//enforce ground elevation
 	Coord3D normal ;
 	Real enforceElevation = TheTerrainLogic->getGroundHeight( turnPos.x, turnPos.y, &normal );
-	
+
 	obj->setTransformMatrix(&mtx);
 
 	if (!m_inTunnel)
@@ -1335,7 +1326,7 @@ void RailroadBehavior::destroyTheWholeTrainNow( void )
 // ------------------------------------------------------------------------------------------------
 void RailroadBehavior::FindPosByPathDistance( Coord3D *pos, const Real dist, const Real length, Bool setState )
 {
-	
+
 	if ( ! m_track )
 		return;
 
@@ -1380,7 +1371,7 @@ void RailroadBehavior::FindPosByPathDistance( Coord3D *pos, const Real dist, con
 	std::list<TrackPoint>::const_iterator pointIter = pointList->begin();
 
 
-	while ( pointIter != pointList->end() ) 
+	while ( pointIter != pointList->end() )
 	{
 		const TrackPoint *thisPoint = &(*pointIter);
 		++pointIter;// next pointIter in this list, so then...
@@ -1395,7 +1386,7 @@ void RailroadBehavior::FindPosByPathDistance( Coord3D *pos, const Real dist, con
 			if (pointIter != pointList->end()) {
 				 nextPoint = &(*pointIter);
 			}
-			
+
 			if (nextPoint && nextPoint->m_distanceFromFirst > actualDistance)
 			{
 				//I am between this point and the next
@@ -1476,13 +1467,13 @@ void RailroadBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
-	* 2: Added... like, everything.	
+	* 1: Initial version
+	* 2: Added... like, everything.
 	**/
 // ------------------------------------------------------------------------------------------------
 void RailroadBehavior::xfer( Xfer *xfer )
@@ -1492,9 +1483,9 @@ void RailroadBehavior::xfer( Xfer *xfer )
 	XferVersion currentVersion = 2;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
-	
+
 	// PLEASE NOTE:
-	// m_track and trackDataLoaded are indeed NOT xferred, 
+	// m_track and trackDataLoaded are indeed NOT xferred,
 	// since these are inited afresh within the update module,
 
 
@@ -1502,46 +1493,46 @@ void RailroadBehavior::xfer( Xfer *xfer )
 	{
 		// extend base class
 		PhysicsBehavior::xfer( xfer );
-		
+
 		//StationTask m_nextStationTask;
 		xfer->xferUser( &m_nextStationTask, sizeof( StationTask ) );
-		
+
 		//ObjectID m_trailerID; ///< the ID of the object I am directly pulling
 		xfer->xferObjectID( &m_trailerID );
-		
-		//Int m_currentPointHandle; 
+
+		//Int m_currentPointHandle;
 		xfer->xferInt( &m_currentPointHandle );
-		
+
 		//Int m_waitAtStationTimer;
 		xfer->xferInt( &m_waitAtStationTimer );
-		
+
 		//Bool m_carriagesCreated; ///< TRUE once we have made all the cars in the train
 		xfer->xferBool( &m_carriagesCreated );
-		
+
 		//Bool m_hasEverBeenHitched; /// has somebody ever hitched me? Remains true, even after puller dies.
 		xfer->xferBool( &m_hasEverBeenHitched );
-	
+
 		//Bool m_waitingInWings; /// I have not entered the real track yet, so leave me alone
 		xfer->xferBool( &m_waitingInWings );
-		
+
 		//Bool m_endOfLine;				/// I have reached the end of a non looping track
 		xfer->xferBool( &m_endOfLine );
-		
-		//Bool m_isLocomotive; ///< Am I a locomotive, 
+
+		//Bool m_isLocomotive; ///< Am I a locomotive,
 		xfer->xferBool( &m_isLocomotive );
-		
-		//Bool m_isLeadCarraige; ///< Am the carraige in front,  
+
+		//Bool m_isLeadCarraige; ///< Am the carraige in front,
 		xfer->xferBool( &m_isLeadCarraige );
-		
-		//Int m_wantsToBeLeadCarraige; ///< Am the carraige in front,  
+
+		//Int m_wantsToBeLeadCarraige; ///< Am the carraige in front,
 		xfer->xferInt( &m_wantsToBeLeadCarraige );
-		
+
 		//Bool m_disembark; ///< If I wait at a station, I should also evacuate everybody when I get theres
 		xfer->xferBool( &m_disembark );
-		
-		//Bool m_inTunnel; ///< Am I in a tunnel, so I wil not snap to ground height, until the next waypoint, 
+
+		//Bool m_inTunnel; ///< Am I in a tunnel, so I wil not snap to ground height, until the next waypoint,
 		xfer->xferBool( &m_inTunnel );
-		
+
 		//ConductorState m_conductorState;
 		xfer->xferUser( &m_conductorState, sizeof( ConductorState ) );
 
@@ -1556,7 +1547,7 @@ void RailroadBehavior::xfer( Xfer *xfer )
 	}
 
 
-}  // end xfer
+}
 
 
 
@@ -1598,7 +1589,7 @@ void RailroadBehavior::loadPostProcess( void )
 	m_whistleSound.setObjectID( getObject()->getID() ) ;
 	m_clicketyClackSound.setObjectID( getObject()->getID() ) ;
 
-}  // end loadPostProcess
+}
 
 
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
index 004c0c01613..79afbb2b75c 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
@@ -26,7 +26,7 @@
 // Author: Graham Smallwood, February 2002
 // Desc:   State machine that controls when and with who a Truck docks
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ResourceGatheringManager.h"
@@ -41,11 +41,6 @@
 #include "GameClient/Drawable.h"
 #include "GameClient/InGameUI.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define NO_DEBUG_SUPPLY_STATE
 
@@ -80,16 +75,16 @@ SupplyTruckAIUpdate::SupplyTruckAIUpdate( Thing *thing, const ModuleData* module
 	m_forcedBusyPending = FALSE;
 	m_supplyTruckStateMachine = newInstance(SupplyTruckStateMachine)( getObject() );
 	m_supplyTruckStateMachine->initDefaultState();
-	
+
 	m_suppliesDepletedVoice = getSupplyTruckAIUpdateModuleData()->m_suppliesDepletedVoice;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 SupplyTruckAIUpdate::~SupplyTruckAIUpdate( void )
 {
 	deleteInstance(m_supplyTruckStateMachine);
-} 
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -125,8 +120,8 @@ Bool SupplyTruckAIUpdate::isCurrentlyFerryingSupplies() const
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool SupplyTruckAIUpdate::isAvailableForSupplying() const 
-{ 
+Bool SupplyTruckAIUpdate::isAvailableForSupplying() const
+{
 	return true;
 }
 
@@ -154,18 +149,18 @@ Bool SupplyTruckAIUpdate::gainOneBox( Int remainingStock )
 	++m_numberBoxes;
 
 
-	//if I just took the last box, 
+	//if I just took the last box,
 	//i will announce that this supply source is now empty
 	if (remainingStock == 0)
 	{
 		Object* bestWarehouse = getObject()->getControllingPlayer()->getResourceGatheringManager()->findBestSupplyWarehouse( getObject() );
-		
+
 		Bool playDepleted = FALSE;
 		if ( bestWarehouse )
 		{
 			//figure out whether the best one is considerably far from the previous one (current position)
 			Coord3D delta = *getObject()->getPosition();
-			delta.sub( bestWarehouse->getPosition() ); 
+			delta.sub( bestWarehouse->getPosition() );
 			if ( delta.length() > getWarehouseScanDistance()/4)
 			playDepleted = TRUE;
 		}
@@ -250,7 +245,7 @@ void SupplyTruckAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -262,7 +257,7 @@ void SupplyTruckAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -271,7 +266,7 @@ void SupplyTruckAIUpdate::xfer( Xfer *xfer )
 	xfer->xferInt(&m_numberBoxes);
 	xfer->xferBool(&m_forcePending);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -280,7 +275,7 @@ void SupplyTruckAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------
@@ -289,7 +284,7 @@ void SupplyTruckAIUpdate::loadPostProcess( void )
 
 class SupplyTruckBusyState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckBusyState, "SupplyTruckBusyState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckBusyState, "SupplyTruckBusyState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -298,8 +293,8 @@ class SupplyTruckBusyState :  public State
 
 public:
 	SupplyTruckBusyState( StateMachine *machine ) : State( machine, "SupplyTruckBusyState" ) { }
-	virtual StateReturnType onEnter() 
-	{ 
+	virtual StateReturnType onEnter()
+	{
 		if( getMachineOwner() && getMachineOwner()->getAI() )
 		{
 			// Have to check, since constructor sets a state.  Phhbbt. Constructor = set up, init = do first thing.
@@ -314,11 +309,11 @@ class SupplyTruckBusyState :  public State
 #ifdef DEBUG_SUPPLY_STATE
 TheInGameUI->DEBUG_addFloatingText("entering busy state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
 #endif
-		return STATE_CONTINUE; 
-	}	
-	virtual StateReturnType update() 
-	{ 
-		return STATE_CONTINUE; 
+		return STATE_CONTINUE;
+	}
+	virtual StateReturnType update()
+	{
+		return STATE_CONTINUE;
 	}
 	virtual void onExit(StateExitType status)
 	{
@@ -333,7 +328,7 @@ EMPTY_DTOR(SupplyTruckBusyState)
 //-----------------------------------------------------------------------------------------------------------
 class SupplyTruckIdleState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckIdleState, "SupplyTruckIdleState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckIdleState, "SupplyTruckIdleState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -343,9 +338,9 @@ class SupplyTruckIdleState :  public State
 public:
 	SupplyTruckIdleState( StateMachine *machine ) : State( machine, "SupplyTruckIdleState" ) { }
 	virtual StateReturnType onEnter();
-	virtual StateReturnType update() 
-	{ 
-		return STATE_CONTINUE; 
+	virtual StateReturnType update()
+	{
+		return STATE_CONTINUE;
 	}
 	virtual void onExit(StateExitType status)
 	{
@@ -357,12 +352,12 @@ TheInGameUI->DEBUG_addFloatingText("exiting idle state", getMachineOwner()->getP
 };
 EMPTY_DTOR(SupplyTruckIdleState)
 
-StateReturnType SupplyTruckIdleState::onEnter() 
-{ 
+StateReturnType SupplyTruckIdleState::onEnter()
+{
 #ifdef DEBUG_SUPPLY_STATE
 TheInGameUI->DEBUG_addFloatingText("entering idle state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
 #endif
- 
+
  	Object *owner = getMachineOwner();
  	if (owner != NULL) {
  		AIUpdateInterface * ownerAI = owner->getAIUpdateInterface();
@@ -380,8 +375,8 @@ TheInGameUI->DEBUG_addFloatingText("entering idle state", getMachineOwner()->get
  		}
  	}
 
-	return STATE_CONTINUE; 
-}	
+	return STATE_CONTINUE;
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -391,42 +386,42 @@ TheInGameUI->DEBUG_addFloatingText("entering idle state", getMachineOwner()->get
 //-------------------------------------------------------------------------------------------------
 SupplyTruckStateMachine::SupplyTruckStateMachine( Object *owner ) : StateMachine( owner, "SupplyTruckStateMachine" )
 {
-	static const StateConditionInfo busyConditions[] = 
+	static const StateConditionInfo busyConditions[] =
 	{
 		StateConditionInfo(ownerIdle, ST_IDLE, NULL),
 		StateConditionInfo(ownerDocking, ST_DOCKING, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
-	static const StateConditionInfo idleConditions[] = 
+	static const StateConditionInfo idleConditions[] =
 	{
 		StateConditionInfo(isForcedIntoBusyState, ST_BUSY, NULL),
 		StateConditionInfo(isForcedIntoWantingState, ST_WANTING, NULL),
 		StateConditionInfo(ownerDocking, ST_DOCKING, NULL),
 		StateConditionInfo(ownerNotDockingOrIdle, ST_BUSY, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
-	static const StateConditionInfo wantingConditions[] = 
+	static const StateConditionInfo wantingConditions[] =
 	{
 		StateConditionInfo(ownerDocking, ST_DOCKING, NULL),
 		StateConditionInfo(ownerNotDockingOrIdle, ST_BUSY, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
-	static const StateConditionInfo regroupingConditions[] = 
+	static const StateConditionInfo regroupingConditions[] =
 	{
 		StateConditionInfo(ownerIdle, ST_IDLE, NULL),
 		StateConditionInfo(ownerDocking, ST_DOCKING, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
-	static const StateConditionInfo dockingConditions[] = 
+	static const StateConditionInfo dockingConditions[] =
 	{
 		StateConditionInfo(isForcedIntoBusyState, ST_BUSY, NULL),
 		StateConditionInfo(ownerAvailableForSupplying, ST_WANTING, NULL),
 		StateConditionInfo(ownerNotDockingOrIdle, ST_BUSY, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -448,19 +443,19 @@ SupplyTruckStateMachine::~SupplyTruckStateMachine()
 void SupplyTruckStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void SupplyTruckStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -468,7 +463,7 @@ void SupplyTruckStateMachine::xfer( Xfer *xfer )
 void SupplyTruckStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -544,7 +539,7 @@ StateReturnType RegroupingState::onEnter()
 TheInGameUI->DEBUG_addFloatingText("entering regrouping state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
 #endif
 	// I have failed to find a dock, so my first choice is to go hang out at a Supply Center (I may have
-	// failed to find a Warehouse).  My second choices is to go to a ConYard.  My last choice is just to 
+	// failed to find a Warehouse).  My second choices is to go to a ConYard.  My last choice is just to
 	// go to a friendly building.
 
 	Object* owner = getMachineOwner();
@@ -561,13 +556,13 @@ TheInGameUI->DEBUG_addFloatingText("entering regrouping state", getMachineOwner(
 	}
 	Int numBoxes = update->getNumberBoxes();
 	// If we are forced to regroup, and we have boxes, we want to wait for the player to
-	// rebuild a supply center & go to it. 
+	// rebuild a supply center & go to it.
 	Bool wanting = numBoxes > 0;
 
 	update->setForceWantingState( wanting );
 
 	Object *destinationObject = NULL;
-	
+
 	KindOfMaskType kindof;
 	KindOfMaskType kindofnot;
 	kindof.set(KINDOF_CASH_GENERATOR);
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp
index 652a3f7ea2c..00b494a802b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp
@@ -23,10 +23,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // TransportAIUpdate.cpp //////////
-// Needs to check legality of evacuate, and may move to a place that is better to evacuate at 
+// Needs to check legality of evacuate, and may move to a place that is better to evacuate at
 // Author: Graham Smallwood, July 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "GameLogic/Module/TransportAIUpdate.h"
@@ -36,11 +36,6 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
@@ -69,7 +64,7 @@ void TransportAIUpdate::privateAttackObject( Object *victim, Int maxShotsToFire,
 	ContainModuleInterface* contain = getObject()->getContain();
 	if( contain != NULL  &&  contain->isPassengerAllowedToFire() )
 	{
-		// As an extension of the normal attack, I may want to tell my passengers to attack 
+		// As an extension of the normal attack, I may want to tell my passengers to attack
 		// too, but only if this is a direct command.  (As opposed to a passive aquire)
 		if( cmdSource == CMD_FROM_PLAYER  ||  cmdSource == CMD_FROM_SCRIPT )
 		{
@@ -86,12 +81,12 @@ void TransportAIUpdate::privateAttackObject( Object *victim, Int maxShotsToFire,
 				// If I am an overlord with a gattling upgrade, I do not tell it to fire if it is disabled
 				if ( passenger->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
 				{
-					if( passenger->isDisabledByType( DISABLED_HACKED ) 
-						|| passenger->isDisabledByType( DISABLED_EMP ) 
+					if( passenger->isDisabledByType( DISABLED_HACKED )
+						|| passenger->isDisabledByType( DISABLED_EMP )
 						|| passenger->isDisabledByType( DISABLED_PARALYZED) )
 						continue;
 				}
-				
+
 				AIUpdateInterface *passengerAI = passenger->getAIUpdateInterface();
 				if( passengerAI )
 				{
@@ -113,7 +108,7 @@ void TransportAIUpdate::privateForceAttackObject( Object *victim, Int maxShotsTo
 	ContainModuleInterface* contain = getObject()->getContain();
 	if( contain != NULL  &&  contain->isPassengerAllowedToFire() )
 	{
-		// As an extension of the normal attack, I may want to tell my passengers to attack 
+		// As an extension of the normal attack, I may want to tell my passengers to attack
 		// too, but only if this is a direct command.  (As opposed to a passive aquire)
 		if( cmdSource == CMD_FROM_PLAYER  ||  cmdSource == CMD_FROM_SCRIPT )
 		{
@@ -130,12 +125,12 @@ void TransportAIUpdate::privateForceAttackObject( Object *victim, Int maxShotsTo
 				// If I am an overlord with a gattling upgrade, I do not tell it to fire if it is disabled
 				if ( passenger->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
 				{
-					if( passenger->isDisabledByType( DISABLED_HACKED ) 
-						|| passenger->isDisabledByType( DISABLED_EMP ) 
+					if( passenger->isDisabledByType( DISABLED_HACKED )
+						|| passenger->isDisabledByType( DISABLED_EMP )
 						|| passenger->isDisabledByType( DISABLED_PARALYZED) )
 						continue;
 				}
-				
+
 				AIUpdateInterface *passengerAI = passenger->getAIUpdateInterface();
 				if( passengerAI )
 				{
@@ -157,7 +152,7 @@ void TransportAIUpdate::privateAttackPosition( const Coord3D *pos, Int maxShotsT
 	ContainModuleInterface* contain = getObject()->getContain();
 	if( contain != NULL  &&  contain->isPassengerAllowedToFire() )
 	{
-		// As an extension of the normal attack, I may want to tell my passengers to attack 
+		// As an extension of the normal attack, I may want to tell my passengers to attack
 		// too, but only if this is a direct command.  (As opposed to a passive aquire)
 		if( cmdSource == CMD_FROM_PLAYER  ||  cmdSource == CMD_FROM_SCRIPT )
 		{
@@ -174,8 +169,8 @@ void TransportAIUpdate::privateAttackPosition( const Coord3D *pos, Int maxShotsT
 				// If I am an overlord with a gattling upgrade, I do not tell it ti fire if it is disabled
 				if ( passenger->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
 				{
-					if( passenger->isDisabledByType( DISABLED_HACKED ) 
-						|| passenger->isDisabledByType( DISABLED_EMP) 
+					if( passenger->isDisabledByType( DISABLED_HACKED )
+						|| passenger->isDisabledByType( DISABLED_EMP)
 						|| passenger->isDisabledByType( DISABLED_PARALYZED) )
 						continue;
 				}
@@ -193,10 +188,10 @@ void TransportAIUpdate::privateAttackPosition( const Coord3D *pos, Int maxShotsT
 }
 
 //-------------------------------------------------------------------------------------------------
-AIFreeToExitType TransportAIUpdate::getAiFreeToExit(const Object* exiter) const 
-{ 
+AIFreeToExitType TransportAIUpdate::getAiFreeToExit(const Object* exiter) const
+{
 	// Transports have a speed at which you can exit.
-	return FREE_TO_EXIT; 
+	return FREE_TO_EXIT;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -206,7 +201,7 @@ void TransportAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -218,11 +213,11 @@ void TransportAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -231,4 +226,4 @@ void TransportAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WanderAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WanderAIUpdate.cpp
index eaba1acd298..c50d49d435c 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WanderAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WanderAIUpdate.cpp
@@ -26,7 +26,7 @@
 // Will give self random move commands
 // Author: Graham Smallwood, April 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "GameLogic/Module/WanderAIUpdate.h"
@@ -66,7 +66,7 @@ UpdateSleepTime WanderAIUpdate::update( void )
 	//return (mine < ret) ? mine : ret;
 	/// @todo srj -- someday, make sleepy. for now, must not sleep.
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -75,7 +75,7 @@ void WanderAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -87,11 +87,11 @@ void WanderAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -100,4 +100,4 @@ void WanderAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
index 28d68695fa4..54a92e76664 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/Team.h"
@@ -62,11 +62,6 @@
 #include "GameLogic/Module/WorkerAIUpdate.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
@@ -84,20 +79,15 @@ enum
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-WorkerAIUpdate::WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ) : 
+WorkerAIUpdate::WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 							 AIUpdateInterface( thing, moduleData )
-               
+
 {
 
 	//
 	// initialize the dozer machine to NULL, we want to do this and create it during the update
 	// implementation because at this point we don't have the object all setup
-	//
-
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_isRebuild = FALSE;
-	//
 	m_dozerMachine = NULL;
 	for( Int i = 0; i < DOZER_NUM_TASKS; i++ )
 	{
@@ -108,10 +98,10 @@ WorkerAIUpdate::WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 			m_dockPoint[ i ][ j ].valid = FALSE;
 			m_dockPoint[ i ][ j ].location.zero();
 		}
-	} 
+	}
 	m_currentTask = DOZER_TASK_INVALID;
 	m_buildSubTask = DOZER_SELECT_BUILD_DOCK_LOCATION;  // irrelavant, but I want non-garbage value
-	
+
 	m_supplyTruckStateMachine = NULL;
 	m_numberBoxes = 0;
 	m_forcePending = FALSE;
@@ -120,7 +110,7 @@ WorkerAIUpdate::WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 	m_workerMachine = NULL;
 
  	m_suppliesDepletedVoice = getWorkerAIUpdateModuleData()->m_suppliesDepletedVoice;
-	
+
 	createMachines();
 
 }
@@ -131,14 +121,9 @@ WorkerAIUpdate::~WorkerAIUpdate( void )
 {
 
 	// delete our behavior state machine
-	if( m_dozerMachine )
-		deleteInstance(m_dozerMachine);
-
-	if( m_supplyTruckStateMachine )
-		deleteInstance(m_supplyTruckStateMachine);
-
-	if( m_workerMachine )
-		deleteInstance(m_workerMachine);
+	deleteInstance(m_dozerMachine);
+	deleteInstance(m_supplyTruckStateMachine);
+	deleteInstance(m_workerMachine);
 
 }
 
@@ -162,8 +147,8 @@ Bool WorkerAIUpdate::isCurrentlyFerryingSupplies() const
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool WorkerAIUpdate::isAvailableForSupplying() const 
-{ 
+Bool WorkerAIUpdate::isAvailableForSupplying() const
+{
 	return true;
 }
 
@@ -290,20 +275,25 @@ UpdateSleepTime WorkerAIUpdate::update( void )
 			Bool invalidTask = FALSE;
 
 			// validate the task and the target
+			// TheSuperHackers @bugfix Stubbjax 16/11/2025 Invalidate the task when the build scaffold is destroyed.
 			if( currentTask == DOZER_TASK_REPAIR &&
 					TheActionManager->canRepairObject( getObject(), targetObject, getLastCommandSource() ) == FALSE )
 				invalidTask = TRUE;
-			
+#if !RETAIL_COMPATIBLE_CRC
+			else if (currentTask == DOZER_TASK_BUILD && targetObject == NULL)
+				invalidTask = TRUE;
+#endif
+
 			// cancel the task if it's now invalid
 			if( invalidTask == TRUE )
 				cancelTask( currentTask );
 
-		}  // end if
+		}
 
 		// update dozer behavior
 		m_dozerMachine->updateStateMachine();
 
-	}  // end if
+	}
 	else
 	{
 		m_supplyTruckStateMachine->updateStateMachine();
@@ -311,7 +301,7 @@ UpdateSleepTime WorkerAIUpdate::update( void )
 		getObject()->setWeaponSetFlag(WEAPONSET_MINE_CLEARING_DETAIL);//maybe go clear some mines, if I feel like it
 	}
 	return UPDATE_SLEEP_NONE;
-} 
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -324,19 +314,19 @@ UpdateSleepTime WorkerAIUpdate::update( void )
 //-------------------------------------------------------------------------------------------------
 /** The entry point of a construct command to the Dozer */
 //-------------------------------------------------------------------------------------------------
-Object *WorkerAIUpdate::construct( const ThingTemplate *what, 
-																	 const Coord3D *pos, 
-																	 Real angle, 
+Object *WorkerAIUpdate::construct( const ThingTemplate *what,
+																	 const Coord3D *pos,
+																	 Real angle,
 																	 Player *owningPlayer,
 																	 Bool isRebuild )
 {
 
 	// !!! NOTE: If you modify this you must modify the dozer too !!!
 	// !!! Graham: Please please please have inspiration for how to *not* duplicate this code
-	// GS - Construct needs to be an AI primitive.  Inheriting off of AIUpdate means you are writing a 
+	// GS - Construct needs to be an AI primitive.  Inheriting off of AIUpdate means you are writing a
 	// master brain that will call AI primitives on the object, not something that does stuff itself.
-  // SupplyTruckAI decides who to call AIDock on.  Worker should decide to AIDock or AIConstruct 
-	// or AIRepair.  Dozer should just use the latter two.  No construction logic should be in 
+  // SupplyTruckAI decides who to call AIDock on.  Worker should decide to AIDock or AIConstruct
+	// or AIRepair.  Dozer should just use the latter two.  No construction logic should be in
 	// the inherited AIUpdates at all.
 
 	// create our machines if they don't yet exist
@@ -352,7 +342,7 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 
 	// sanity
 	DEBUG_ASSERTCRASH( getObject()->getControllingPlayer() == owningPlayer,
-										 ("Dozer::Construct - The controlling player of the Dozer is not the owning player passed in\n") );
+										 ("Dozer::Construct - The controlling player of the Dozer is not the owning player passed in") );
 
 	// if we're not rebuilding, we have a few checks to pass first for sanity
 	if( isRebuild == FALSE )
@@ -369,8 +359,8 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 																										 BuildAssistant::NO_OBJECT_OVERLAP,
 																										 getObject(), NULL ) != LBC_OK )
 				return NULL;
-		
-		}  // end if
+
+		}
 		else
 		{
 
@@ -387,9 +377,9 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 																										 getObject(), NULL ) != LBC_OK )
 				return NULL;
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
 	// what will our initial status bits
 	ObjectStatusMaskType statusBits = MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_UNDER_CONSTRUCTION );
@@ -405,7 +395,7 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 
 	// leave the supply truck state and now behave like a dozer.
 	exitingSupplyTruckState();
-	
+
 	// take the required money away from the player
 	if( isRebuild == FALSE )
 	{
@@ -413,8 +403,8 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 
 		money->withdraw( what->calcCostToBuild( owningPlayer ) );
 
-	}  // end if
-		
+	}
+
 	//
 	// set a bit that this object is under construction, it is important to do this early
 	// before the hooks add/subtract power from a player are executed
@@ -446,7 +436,7 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 
 	// set the model action state to awaiting construction
 	obj->clearAndSetModelConditionFlags(
-		MAKE_MODELCONDITION_MASK2(MODELCONDITION_PARTIALLY_CONSTRUCTED, MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED), 
+		MAKE_MODELCONDITION_MASK2(MODELCONDITION_PARTIALLY_CONSTRUCTED, MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED),
 		MAKE_MODELCONDITION_MASK(MODELCONDITION_AWAITING_CONSTRUCTION)
 	);
 
@@ -454,8 +444,8 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 	newTask( DOZER_TASK_BUILD, obj );
 
 	return obj;
-				
-} 
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** We just exited from a supply truck task and are now idle, we should go back to Dozer idle
@@ -478,7 +468,7 @@ void WorkerAIUpdate::exitingSupplyTruckState()
  		// I'm not busy.  Both states are being polite, so I must force the switch.
 	}
 }
-  
+
 
 // ------------------------------------------------------------------------------------------------
 /** Given our current task and repair target, can we accept this as a new repair target */
@@ -505,7 +495,7 @@ Bool WorkerAIUpdate::canAcceptNewRepair( Object *obj )
 			return FALSE;
 
 		// check for repairing any tower on the same bridge
-		if( currentRepair->isKindOf( KINDOF_BRIDGE_TOWER ) && 
+		if( currentRepair->isKindOf( KINDOF_BRIDGE_TOWER ) &&
 				obj->isKindOf( KINDOF_BRIDGE_TOWER ) )
 		{
 			BridgeTowerBehaviorInterface *currentTowerInterface = NULL;
@@ -518,23 +508,23 @@ Bool WorkerAIUpdate::canAcceptNewRepair( Object *obj )
 			if( currentTowerInterface == NULL || newTowerInterface == NULL )
 			{
 
-				DEBUG_CRASH(( "Unable to find bridge tower interface on object\n" ));
+				DEBUG_CRASH(( "Unable to find bridge tower interface on object" ));
 				return FALSE;
 
-			}  // end if
+			}
 
 			// if they are part of the same bridge, ignore this repair command
 			if( currentTowerInterface->getBridgeID() == newTowerInterface->getBridgeID() )
 				return FALSE;
 
-		}  // end if
+		}
 
-	}  // end if, currentRepair object exists
+	}
 
 	// all is well
 	return TRUE;
 
-}  // end canAcceptNewRepair
+}
 
 //----------------------------------------------------------------------------------------
 void WorkerAIUpdate::privateIdle(CommandSourceType cmdSource)
@@ -545,7 +535,7 @@ void WorkerAIUpdate::privateIdle(CommandSourceType cmdSource)
 	// If the user gives a stop command, I have to turn off autopilot
 //	if( cmdSource == CMD_FROM_PLAYER )
 //		setForceBusyState(TRUE);
-	
+
 	AIUpdateInterface::privateIdle(cmdSource);
 }
 
@@ -589,7 +579,7 @@ void WorkerAIUpdate::privateRepair( Object *obj, CommandSourceType cmdSource )
 	// start the new task
 	newTask( DOZER_TASK_REPAIR, obj );
 
-}  // end privateRepair
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Resume construction on a building */
@@ -608,7 +598,7 @@ void WorkerAIUpdate::privateResumeConstruction( Object *obj, CommandSourceType c
 	// start the new task for construction
 	newTask( DOZER_TASK_BUILD, obj );
 
-}  // end privateResumeConstruction
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Issue and order to the dozer */
@@ -617,7 +607,7 @@ void WorkerAIUpdate::newTask( DozerTask task, Object* target )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	// sanity
 	if( target == NULL )
@@ -647,7 +637,7 @@ void WorkerAIUpdate::newTask( DozerTask task, Object* target )
 
 		//
 		// for building, we say that even "thinking" about building or rebuilding an object
-		// sets us as the current builder of that object.  this allows any dozers that are 
+		// sets us as the current builder of that object.  this allows any dozers that are
 		// ordered later to resume construction on something to see that somebody is already taking
 		// care of it and then they won't be even try to resume a build since we don't allow
 		// multiple dozers/workers to double up on construction efforts
@@ -662,7 +652,7 @@ void WorkerAIUpdate::newTask( DozerTask task, Object* target )
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_END ].valid				= TRUE;
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_END ].location		= position;
 
-	}  // end if, build task
+	}
 
 	// set the new task target and the frame in which we got this order
 	m_task[ task ].m_targetObjectID = target->getID();
@@ -687,10 +677,10 @@ void WorkerAIUpdate::newTask( DozerTask task, Object* target )
 		// I'm not busy.  Both states are being polite, so I must force the switch.
 	}
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Cancel a task and reset the dozer behavior state machine so that it can 
+/** Cancel a task and reset the dozer behavior state machine so that it can
 	* re-evaluate what it wants to do if it was working on the task being
 	* cancelled */
 //-------------------------------------------------------------------------------------------------
@@ -703,7 +693,7 @@ void WorkerAIUpdate::cancelTask( DozerTask task )
 	// reset the machine to we can re-evaluate what we want to do
 	m_dozerMachine->resetToDefaultState();
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is there a given task waiting to be done */
@@ -712,25 +702,25 @@ Bool WorkerAIUpdate::isTaskPending( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	return m_task[ task ].m_targetObjectID != 0 ? TRUE : FALSE;
-		
-}  
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is there any task pending */
 //-------------------------------------------------------------------------------------------------
 Bool WorkerAIUpdate::isAnyTaskPending( void )
 {
-	
+
 	for( Int i = 0; i < DOZER_NUM_TASKS; i++ )
 		if( isTaskPending( (DozerTask)i ) )
 			return TRUE;
 
 	return FALSE;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the target object of a given task */
@@ -739,11 +729,11 @@ ObjectID WorkerAIUpdate::getTaskTarget( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	return m_task[ task ].m_targetObjectID;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set a task as successfully completed */
@@ -752,7 +742,7 @@ void WorkerAIUpdate::internalTaskComplete( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	// call the single method that gets called for completing and canceling tasks
 	internalTaskCompleteOrCancelled( task );
@@ -765,7 +755,7 @@ void WorkerAIUpdate::internalTaskComplete( DozerTask task )
 	for( Int i = 0; i < DOZER_NUM_DOCK_POINTS; i++ )
 		m_dockPoint[ task ][ i ].valid = FALSE;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Clear a task from the Dozer for consideration, we can use this when a goal object becomes
@@ -775,8 +765,8 @@ void WorkerAIUpdate::internalCancelTask( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
-	
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
+
 	if(task < 0 || task >= DOZER_NUM_TASKS)
 		return;  //DAMNIT!  You CANNOT assert and then not handle the damn error!  The.  Code.  Must.  Not.  Crash.
 
@@ -786,11 +776,11 @@ void WorkerAIUpdate::internalCancelTask( DozerTask task )
 	// remove the info for this task
 	m_task[ task ].m_targetObjectID = INVALID_ID;
 	m_task[ task ].m_taskOrderFrame = 0;
-	
+
 	// remove dock point info for this task
 	for( Int i = 0; i < DOZER_NUM_DOCK_POINTS; i++ )
 		m_dockPoint[ task ][ i ].valid = FALSE;
-	
+
 	// stop the dozer from moving
 	AIUpdateInterface *ai = getObject()->getAIUpdateInterface();
 	if( !ai )
@@ -800,7 +790,7 @@ void WorkerAIUpdate::internalCancelTask( DozerTask task )
 	/// @todo we really need a stop command instead of making it move to it's current location
 	ai->aiMoveToPosition( getObject()->getPosition(), CMD_FROM_AI );
 
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -811,13 +801,13 @@ void WorkerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 	{
 
 		// --------------------------------------------------------------------------------------------
-		case DOZER_TASK_INVALID:	
+		case DOZER_TASK_INVALID:
 		{
 
-			break;  // do nothing, this is really no task 
+			break;  // do nothing, this is really no task
+
+		}
 
-		}  // end invalid
-		
 		// --------------------------------------------------------------------------------------------
 		case DOZER_TASK_BUILD:
 		{
@@ -834,8 +824,8 @@ void WorkerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 //				goalObject->clearModelConditionState(MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED);
 //			}
 			break;
-		
-		}  // end build
+
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case DOZER_TASK_REPAIR:
@@ -854,11 +844,11 @@ void WorkerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
  				if( obj->isKindOf( KINDOF_BRIDGE_TOWER ) )
  					removeBridgeScaffolding( obj );
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end repair
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case DOZER_TASK_FORTIFY:
@@ -866,18 +856,18 @@ void WorkerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 
 			break;
 
-		}  // end fortify
+		}
 
 		// --------------------------------------------------------------------------------------------
 		default:
 		{
 
-			DEBUG_CRASH(( "internalTaskCompleteOrCancelled: Unknown Dozer task '%d'\n", task ));
+			DEBUG_CRASH(( "internalTaskCompleteOrCancelled: Unknown Dozer task '%d'", task ));
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch( task )
+	}
 
 }
 
@@ -891,11 +881,11 @@ void WorkerAIUpdate::onDelete( void )
 	// cancel any of the tasks we had queued up
 	for( i = DOZER_TASK_FIRST; i < DOZER_NUM_TASKS; ++i )
 	{
-		
+
 		if( isTaskPending( (DozerTask)i ) )
 			cancelTask( (DozerTask)i );
-			
-	}  // end for i
+
+	}
 
 	for( i = 0; i < DOZER_NUM_TASKS; i++ )
 	{
@@ -924,11 +914,11 @@ DozerTask WorkerAIUpdate::getMostRecentCommand( void )
 			{
 				mostRecentTask = (DozerTask)i;
 				mostRecentFrame = m_task[ i ].m_taskOrderFrame;
-			} 
-		}  
-	} 
-	return mostRecentTask;			
-} 
+			}
+		}
+	}
+	return mostRecentTask;
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -950,7 +940,7 @@ const Coord3D* WorkerAIUpdate::getDockPoint( DozerTask task, DozerDockPoint poin
 	// no valid point has been set for this dock point on this task
 	return NULL;
 
-}  // end getDockPoint
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -971,7 +961,7 @@ void WorkerAIUpdate::aiDoCommand(const AICommandParms* parms)
 
 	if (!isAllowedToRespondToAiCommands(parms))
 		return;
-	
+
 	// create our machines if they don't yet exist
 	createMachines();
 
@@ -990,7 +980,7 @@ void WorkerAIUpdate::aiDoCommand(const AICommandParms* parms)
 			privateRepair(parms->m_obj, parms->m_cmdSource);
 			break;
 
-		}  // end repair
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case AICMD_RESUME_CONSTRUCTION:
@@ -1004,7 +994,7 @@ void WorkerAIUpdate::aiDoCommand(const AICommandParms* parms)
 			privateResumeConstruction( parms->m_obj, parms->m_cmdSource );
 			break;
 
-		}  // end resume construction
+		}
 
 		// --------------------------------------------------------------------------------------------
 		default:
@@ -1022,9 +1012,9 @@ void WorkerAIUpdate::aiDoCommand(const AICommandParms* parms)
 				m_dozerMachine->resetToDefaultState();
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch
+	}
 
 	if (isClearingMines() && m_numberBoxes > 0 )
 	{
@@ -1075,18 +1065,18 @@ Bool WorkerAIUpdate::gainOneBox( Int remainingStock )
 
 	++m_numberBoxes;
 
-	//if I just took the last box, 
+	//if I just took the last box,
 	//i will announce that this supply source is now empty
 	if (remainingStock == 0)
 	{
 		Object* bestWarehouse = getObject()->getControllingPlayer()->getResourceGatheringManager()->findBestSupplyWarehouse( getObject() );
-		
+
 		Bool playDepleted = FALSE;
 		if ( bestWarehouse )
 		{
 			//figure out whether the best one is considerably far from the previous one (current position)
 			Coord3D delta = *getObject()->getPosition();
-			delta.sub( bestWarehouse->getPosition() ); 
+			delta.sub( bestWarehouse->getPosition() );
 			if ( delta.length() > getWarehouseScanDistance()/4)
 			playDepleted = TRUE;
 		}
@@ -1141,7 +1131,7 @@ void WorkerAIUpdate::resetDozerBrain()
 // Worker's master state machine, that controls Dozerness or Supplytruckness
 class ActAsDozerState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsDozerState, "ActAsDozerState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsDozerState, "ActAsDozerState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -1160,7 +1150,7 @@ EMPTY_DTOR(ActAsDozerState)
 // ------------------------------------------------------------------------------------------------
 class ActAsSupplyTruckState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsSupplyTruckState, "ActAsSupplyTruckState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsSupplyTruckState, "ActAsSupplyTruckState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -1179,16 +1169,16 @@ EMPTY_DTOR(ActAsSupplyTruckState)
 // ------------------------------------------------------------------------------------------------
 WorkerStateMachine::WorkerStateMachine( Object *owner ) : StateMachine( owner, "WorkerStateMachine" )
 {
-	static const StateConditionInfo asDozerConditions[] = 
+	static const StateConditionInfo asDozerConditions[] =
 	{
 		StateConditionInfo(supplyTruckSubMachineWantsToEnter, AS_SUPPLY_TRUCK, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
-	static const StateConditionInfo asTruckConditions[] = 
+	static const StateConditionInfo asTruckConditions[] =
 	{
 		StateConditionInfo(supplyTruckSubMachineReadyToLeave, AS_DOZER, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -1208,19 +1198,19 @@ WorkerStateMachine::~WorkerStateMachine()
 void WorkerStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void WorkerStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1228,7 +1218,7 @@ void WorkerStateMachine::xfer( Xfer *xfer )
 void WorkerStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1354,7 +1344,7 @@ void WorkerAIUpdate::createBridgeScaffolding( Object *bridgeTower )
 	// tell the bridge to create scaffolding if necessary
 	bbi->createScaffolding();
 
-}  // end createBridgeScaffolding
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove the bridge scaffolding from the bridge object that is attached to this tower */
@@ -1380,7 +1370,7 @@ void WorkerAIUpdate::removeBridgeScaffolding( Object *bridgeTower )
 	// tell the bridge to end any scaffolding from repairing
 	bbi->removeScaffolding();
 
-}  // end removeBridgeScaffolding
+}
 
 //------------------------------------------------------------------------------------------------
 void WorkerAIUpdate::startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID )
@@ -1406,7 +1396,7 @@ void WorkerAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1418,7 +1408,7 @@ void WorkerAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -1463,7 +1453,7 @@ void WorkerAIUpdate::xfer( Xfer *xfer )
 	//-------------------------- xfer Worker info
 	xfer->xferSnapshot(m_workerMachine);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1472,4 +1462,4 @@ void WorkerAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp
index 2526e17f4c9..3670aeb4e90 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES
 #include "Common/Player.h"
@@ -42,20 +42,15 @@
 #include "GameLogic/Module/LaserUpdate.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void AssistedTargetingUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void AssistedTargetingUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "AssistingClipSize",		INI::parseInt,		NULL, offsetof( AssistedTargetingUpdateModuleData, m_clipSize ) },
 		{ "AssistingWeaponSlot",	INI::parseLookupList,	TheWeaponSlotTypeNamesLookupList, offsetof( AssistedTargetingUpdateModuleData, m_weaponSlot ) },
@@ -154,7 +149,7 @@ void AssistedTargetingUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -172,7 +167,7 @@ void AssistedTargetingUpdate::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -183,4 +178,4 @@ void AssistedTargetingUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AutoDepositUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AutoDepositUpdate.cpp
index 37cb378d644..3daca28f94f 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AutoDepositUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AutoDepositUpdate.cpp
@@ -24,12 +24,12 @@
 
 // FILE: AutoDepositUpdate.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	AutoDepositUpdate.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The meat of the auto deposit update module
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BuildAssistant.h"
 #include "Common/Thing.h"
@@ -71,7 +71,6 @@
 void parseUpgradePair( INI *ini, void *instance, void *store, const void *userData )
 {
 	upgradePair info;
-	info.type = "";
 	info.amount = 0;
 
 	const char *token = ini->getNextToken( ini->getSepsColon() );
@@ -96,8 +95,8 @@ void parseUpgradePair( INI *ini, void *instance, void *store, const void *userDa
 	// Insert the info into the upgrade list
 	std::list<upgradePair> * theList = (std::list<upgradePair>*)store;
 	theList->push_back(info);
-	
-}  // end parseFactionObjectCreationList
+
+}
 
 //-----------------------------------------------------------------------------
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -149,23 +148,23 @@ UpdateSleepTime AutoDepositUpdate::update( void )
 	if( TheGameLogic->getFrame() >= m_depositOnFrame)
 	{
 		if (!m_initialized) {
-			// Note - we have to set these in update, because during load the team is set, 
+			// Note - we have to set these in update, because during load the team is set,
 			// and we don't want to award initial bonus on load.  jba :)
 			m_awardInitialCaptureBonus = TRUE;
 			m_initialized = TRUE;
 		}
 		m_depositOnFrame = TheGameLogic->getFrame() + getAutoDepositUpdateModuleData()->m_depositFrame;
-		
+
 		if(getObject()->isNeutralControlled() || getAutoDepositUpdateModuleData()->m_depositAmount <= 0 )
 			return UPDATE_SLEEP_NONE;
 
 		// makes sure that buildings under construction do not get a bonus CCB
 		if( getObject()->getConstructionPercent() != CONSTRUCTION_COMPLETE )
 			return UPDATE_SLEEP_NONE;
-		
+
 		getObject()->getControllingPlayer()->getMoney()->deposit( getAutoDepositUpdateModuleData()->m_depositAmount);
 		getObject()->getControllingPlayer()->getScoreKeeper()->addMoneyEarned( getAutoDepositUpdateModuleData()->m_depositAmount);
-		
+
 		//Display cash income floating over the blacklotus
 		if(getAutoDepositUpdateModuleData()->m_depositAmount > 0)
 		{
@@ -177,7 +176,7 @@ UpdateSleepTime AutoDepositUpdate::update( void )
 			Color color = getObject()->getControllingPlayer()->getPlayerColor() | GameMakeColor( 0, 0, 0, 230 );
 			TheInGameUI->addFloatingText( moneyString, &pos, color );
 		}
-		
+
 	}
 
 	return UPDATE_SLEEP_NONE;
@@ -192,7 +191,7 @@ void AutoDepositUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -219,7 +218,7 @@ void AutoDepositUpdate::xfer( Xfer *xfer )
 		xfer->xferBool(&m_initialized);
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -230,4 +229,4 @@ void AutoDepositUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AutoFindHealingUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AutoFindHealingUpdate.cpp
index 36545530d01..7637a09f748 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AutoFindHealingUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AutoFindHealingUpdate.cpp
@@ -65,7 +65,7 @@ AutoFindHealingUpdateModuleData::AutoFindHealingUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ScanRate",							INI::parseDurationUnsignedInt,	NULL, offsetof( AutoFindHealingUpdateModuleData, m_scanFrames ) },
 		{ "ScanRange",						INI::parseReal,									NULL, offsetof( AutoFindHealingUpdateModuleData, m_scanRange ) },
@@ -80,7 +80,7 @@ AutoFindHealingUpdateModuleData::AutoFindHealingUpdateModuleData()
 AutoFindHealingUpdate::AutoFindHealingUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 	m_nextScanFrames						= 0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -93,14 +93,14 @@ AutoFindHealingUpdate::~AutoFindHealingUpdate( void )
 //-------------------------------------------------------------------------------------------------
 void AutoFindHealingUpdate::onObjectCreated()
 {
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime AutoFindHealingUpdate::update()
-{	
+{
 /// @todo srj use SLEEPY_UPDATE here
 	Object *obj = getObject();
 	if (obj->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN) {
@@ -179,7 +179,7 @@ Object* AutoFindHealingUpdate::scanClosestTarget()
 			closestDistSqr = fDistSqr;
 			continue;
 		}
-	}  // end for, other
+	}
 
 	return bestTarget;
 }
@@ -193,7 +193,7 @@ void AutoFindHealingUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -214,7 +214,7 @@ void AutoFindHealingUpdate::xfer( Xfer *xfer )
 	// next scan frames
 	xfer->xferInt( &m_nextScanFrames );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -225,4 +225,4 @@ void AutoFindHealingUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BaseRenerateUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BaseRenerateUpdate.cpp
index 2ba110d1400..8e88437b830 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BaseRenerateUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BaseRenerateUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/Xfer.h"
@@ -50,11 +50,11 @@ BaseRegenerateUpdateModuleData::BaseRegenerateUpdateModuleData()
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void BaseRegenerateUpdateModuleData::buildFieldParse( MultiIniFieldParse &p ) 
+void BaseRegenerateUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ 0, 0, 0, 0 }
 	};
@@ -69,7 +69,7 @@ void BaseRegenerateUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-BaseRegenerateUpdate::BaseRegenerateUpdate( Thing *thing, const ModuleData* moduleData ) 
+BaseRegenerateUpdate::BaseRegenerateUpdate( Thing *thing, const ModuleData* moduleData )
 										: UpdateModule( thing, moduleData )
 {
 
@@ -114,7 +114,7 @@ UpdateSleepTime BaseRegenerateUpdate::update( void )
 {
 	// this is us!
 	Object *me = getObject();
-	
+
 	if( me->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
 	{
 		return UPDATE_SLEEP_NONE;
@@ -137,13 +137,13 @@ UpdateSleepTime BaseRegenerateUpdate::update( void )
 		const Int HEAL_RATE = 3;
 
 		// do some healing
-		Real amount = HEAL_RATE * (body->getMaxHealth() * TheGlobalData->m_baseRegenHealthPercentPerSecond) / 
+		Real amount = HEAL_RATE * (body->getMaxHealth() * TheGlobalData->m_baseRegenHealthPercentPerSecond) /
 														 LOGICFRAMES_PER_SECOND;
 		me->attemptHealing(amount, me);
 
 		return UPDATE_SLEEP(HEAL_RATE);
 	}
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -154,7 +154,7 @@ void BaseRegenerateUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -172,7 +172,7 @@ void BaseRegenerateUpdate::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -183,4 +183,4 @@ void BaseRegenerateUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp
index 8c3eb42b988..8647e010085 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   Update module to handle building states and battle plan execution & changes
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_MAXHEALTHCHANGETYPE_NAMES						// for TheMaxHealthChangeTypeNames[]
 
@@ -61,11 +61,6 @@
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/Module/StealthDetectorUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -77,7 +72,7 @@ BattlePlanUpdateModuleData::BattlePlanUpdateModuleData()
 	m_searchAndDestroyPlanAnimationFrames = 0;
 	m_battlePlanParalyzeFrames						= 0;
 
-	
+
 	m_holdTheLineArmorDamageScalar				= 1.0f;
 	m_searchAndDestroySightRangeScalar		= 1.0f;
 	m_strategyCenterSearchAndDestroySightRangeScalar = 1.0f;
@@ -92,7 +87,7 @@ BattlePlanUpdateModuleData::BattlePlanUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SpecialPowerTemplate",									INI::parseSpecialPowerTemplate,	NULL, offsetof( BattlePlanUpdateModuleData, m_specialPowerTemplate ) },
 
@@ -124,7 +119,7 @@ BattlePlanUpdateModuleData::BattlePlanUpdateModuleData()
 		{ "StrategyCenterSearchAndDestroySightRangeScalar", INI::parseReal,				NULL, offsetof( BattlePlanUpdateModuleData, m_strategyCenterSearchAndDestroySightRangeScalar ) },
 		{ "StrategyCenterSearchAndDestroyDetectsStealth",   INI::parseBool,				NULL, offsetof( BattlePlanUpdateModuleData, m_strategyCenterSearchAndDestroyDetectsStealth ) },
 		{ "StrategyCenterHoldTheLineMaxHealthScalar",				INI::parseReal,				NULL, offsetof( BattlePlanUpdateModuleData, m_strategyCenterHoldTheLineMaxHealthScalar ) },
-    { "StrategyCenterHoldTheLineMaxHealthChangeType",		INI::parseIndexList,  TheMaxHealthChangeTypeNames, offsetof( BattlePlanUpdateModuleData, m_strategyCenterHoldTheLineMaxHealthChangeType ) }, 
+    { "StrategyCenterHoldTheLineMaxHealthChangeType",		INI::parseIndexList,  TheMaxHealthChangeTypeNames, offsetof( BattlePlanUpdateModuleData, m_strategyCenterHoldTheLineMaxHealthChangeType ) },
 
 		{ "VisionObjectName",											INI::parseAsciiString,					NULL, offsetof( BattlePlanUpdateModuleData, m_visionObjectName ) },
 
@@ -134,7 +129,7 @@ BattlePlanUpdateModuleData::BattlePlanUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-BattlePlanUpdate::BattlePlanUpdate( Thing *thing, const ModuleData* moduleData ) : 
+BattlePlanUpdate::BattlePlanUpdate( Thing *thing, const ModuleData* moduleData ) :
 	UpdateModule( thing, moduleData ),
 	m_bonuses(NULL)
 {
@@ -160,13 +155,8 @@ BattlePlanUpdate::BattlePlanUpdate( Thing *thing, const ModuleData* moduleData )
 
 	m_visionObjectID = INVALID_ID;
 
-	//------------------------//
-	// Added by Sadullah Nader//
-	//------------------------//
-
 	m_specialPowerModule   = NULL;
-	//
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -198,7 +188,7 @@ void BattlePlanUpdate::onDelete()
 		obj = TheGameLogic->findObjectByID( m_visionObjectID );
 		if( obj )
 			TheGameLogic->destroyObject( obj );
-	}  // end if
+	}
 
 	// If we get destroyed, then make sure we remove our bonus!
 	// srj sez: we can't do this in the dtor because our team
@@ -319,7 +309,7 @@ CommandOption BattlePlanUpdate::getCommandOption() const
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime BattlePlanUpdate::update()
-{	
+{
 
 	if( m_invalidSettings )
 	{
@@ -358,7 +348,7 @@ UpdateSleepTime BattlePlanUpdate::update()
 				}
 				break;
 			case TRANSITIONSTATUS_ACTIVE:
-				//If we're active and the user has selected a different plan, then we need to 
+				//If we're active and the user has selected a different plan, then we need to
 				//pack up.
 				if( m_currentPlan != m_desiredPlan )
 				{
@@ -414,7 +404,7 @@ void BattlePlanUpdate::createVisionObject()
 
 	// get template of object to create
 	const ThingTemplate *tt = TheThingFactory->findTemplate( data->m_visionObjectName );
-	DEBUG_ASSERTCRASH( tt, ("BattlePlanUpdate::setStatus - Invalid vision object name '%s'\n",
+	DEBUG_ASSERTCRASH( tt, ("BattlePlanUpdate::setStatus - Invalid vision object name '%s'",
 													data->m_visionObjectName.str()) );
 
 	if (!tt)
@@ -441,9 +431,9 @@ void BattlePlanUpdate::createVisionObject()
 		// set the shroud clearing range
 		visionObject->setShroudClearingRange( obj->getGeometryInfo().getBoundingSphereRadius() );
 
-	}  // end if
+	}
 
-}  // end createVisionObject
+}
 
 //-------------------------------------------------------------------------------------------------
 void BattlePlanUpdate::setStatus( TransitionStatus newStatus )
@@ -780,7 +770,7 @@ void BattlePlanUpdate::setBattlePlan( BattlePlanStatus plan )
 						update->setSDEnabled( false );
 					}
 				}
-				
+
 				break;
 			}
 		}
@@ -799,7 +789,7 @@ void BattlePlanUpdate::setBattlePlan( BattlePlanStatus plan )
 				//Paralyze troops!
 				player->iterateObjects( paralyzeTroop, (void*)data );
 				break;
-				
+
 			case PLANSTATUS_BOMBARDMENT:
 				//Set the bombardment bonuses
 				m_bonuses->m_bombardment	= 1; //for weapon bonuses
@@ -855,7 +845,7 @@ void BattlePlanUpdate::setBattlePlan( BattlePlanStatus plan )
 }
 
 //------------------------------------------------------------------------------------------------
-//Returns the currently active battle plan -- unpacked and ready... returns PLANSTATUS_NONE if in 
+//Returns the currently active battle plan -- unpacked and ready... returns PLANSTATUS_NONE if in
 //transition!
 //------------------------------------------------------------------------------------------------
 BattlePlanStatus BattlePlanUpdate::getActiveBattlePlan() const
@@ -874,7 +864,7 @@ void BattlePlanUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 //------------------------------------------------------------------------------------------------
 // Xfer method
@@ -928,7 +918,7 @@ void BattlePlanUpdate::xfer( Xfer *xfer )
 	// vision object data
 	xfer->xferObjectID( &m_visionObjectID );
 
-}  // end xfer
+}
 
 //------------------------------------------------------------------------------------------------
 void BattlePlanUpdate::loadPostProcess( void )
@@ -937,4 +927,4 @@ void BattlePlanUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp
index 693e8cf09bd..92dc1c839d7 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp
@@ -24,11 +24,11 @@
 
 // FILE: BoneFXUpdate.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/Thing.h"
@@ -88,7 +88,6 @@ BoneFXUpdate::BoneFXUpdate( Thing *thing, const ModuleData* moduleData ) : Updat
 	m_particleSystemIDs.clear();
 	m_active = FALSE;
 
-	//Added By Sadullah Nader
 	m_curBodyState = BODY_PRISTINE;
 }
 
@@ -124,16 +123,16 @@ static void parseFXLocInfo( INI *ini, void *instance, BoneLocInfo *locInfo )
 		// save bone name and location type
 		locInfo->boneName = ini->getNextToken();
 
-	}  // end if
+	}
 	else
 	{
 
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end else
+	}
 
-}  // end parseFXLocInfo
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a random delay.  This is a number pair, where the numbers are a min and max time in miliseconds. */
@@ -160,7 +159,7 @@ static void parseGameLogicRandomDelay( INI *ini, void *instance, GameLogicRandom
 /** In the form of:
 	* <BodyDamageState>FXList<index> = Bone:<BoneName> OnlyOnce:<Yes|No> <Min delay> <Max delay> FXList:<FXListName> */
 //-------------------------------------------------------------------------------------------------
-void BoneFXUpdateModuleData::parseFXList( INI *ini, void *instance, 
+void BoneFXUpdateModuleData::parseFXList( INI *ini, void *instance,
 																								void *store, const void *userData )
 {
 	const char *token;
@@ -177,7 +176,7 @@ void BoneFXUpdateModuleData::parseFXList( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	} // end if
+	}
 
 	ini->parseBool( ini, instance, &info->onlyOnce, NULL);
 
@@ -191,18 +190,18 @@ void BoneFXUpdateModuleData::parseFXList( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// parse the fx list name
 	ini->parseFXList( ini, instance, &info->fx, NULL );
 
-}  // end parseFXList
+}
 
 //-------------------------------------------------------------------------------------------------
 /** In the form of:
 	* <BodyDamageState>OCL<index> = Bone:<BoneName> OnlyOnce:<Yes|No> <Min delay> <Max delay> OCL:<OCLName> */
 //-------------------------------------------------------------------------------------------------
-void BoneFXUpdateModuleData::parseObjectCreationList( INI *ini, void *instance, 
+void BoneFXUpdateModuleData::parseObjectCreationList( INI *ini, void *instance,
 																														void *store, const void *userData )
 {
 	const char *token;
@@ -219,7 +218,7 @@ void BoneFXUpdateModuleData::parseObjectCreationList( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	} // end if
+	}
 
 	ini->parseBool( ini, instance, &info->onlyOnce, NULL );
 
@@ -233,18 +232,18 @@ void BoneFXUpdateModuleData::parseObjectCreationList( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// parse the ocl name
 	ini->parseObjectCreationList( ini, instance, &info->ocl, NULL );
 
-}  // end parseObjectCreationList
+}
 
 //-------------------------------------------------------------------------------------------------
 /** In the form of:
 	* <BodyDamageState>ParticleSystem<index> = <Bone:BoneName> OnlyOnce:<Yes|No> <Min delay> <Max delay> PSys:<PSysName> */
 //-------------------------------------------------------------------------------------------------
-void BoneFXUpdateModuleData::parseParticleSystem( INI *ini, void *instance, 
+void BoneFXUpdateModuleData::parseParticleSystem( INI *ini, void *instance,
 																												void *store, const void *userData )
 {
 	const char *token;
@@ -261,7 +260,7 @@ void BoneFXUpdateModuleData::parseParticleSystem( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	} // end if
+	}
 
 	ini->parseBool( ini, instance, &info->onlyOnce, NULL );
 
@@ -275,12 +274,12 @@ void BoneFXUpdateModuleData::parseParticleSystem( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// parse the particle system name
 	ini->parseParticleSystemTemplate( ini, instance, &info->particleSysTemplate, NULL );
 
-}  // end parseParticleSystem
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -361,7 +360,7 @@ static void buildNonDupRandomIndexList(Int range, Int count, Int idxList[])
 		do
 		{
 			idx = GameLogicRandomValue(0, range-1);
-		} 
+		}
 		while (inList(idx, i, idxList));
 		idxList[i] = idx;
 	}
@@ -445,13 +444,13 @@ void BoneFXUpdate::doParticleSystemAtBone(const ParticleSystemTemplate *particle
 	Object *building = getObject();
 
 	ParticleSystem *psys = TheParticleSystemManager->createParticleSystem(particleSystemTemplate);
-	if (psys != NULL) 
+	if (psys != NULL)
 	{
 		m_particleSystemIDs.push_back(psys->getSystemID());
 		psys->setPosition(bonePosition);
 		psys->attachToObject(building);
 		Drawable *drawable = building->getDrawable();
-		if (drawable && drawable->isDrawableEffectivelyHidden()) 
+		if (drawable && drawable->isDrawableEffectivelyHidden())
 		{
 			psys->stop();
 		}
@@ -508,26 +507,23 @@ void BoneFXUpdate::resolveBoneLocations() {
 	Drawable *drawable = building->getDrawable();
 	if (drawable == NULL) {
 		DEBUG_ASSERTCRASH(drawable != NULL, ("There is no drawable?"));
-	}
-
-	if (d == NULL) {
 		return;
 	}
 
 	for (i = 0; i < BONE_FX_MAX_BONES; ++i) {
-		if (d->m_fxList[m_curBodyState][i].locInfo.boneName.compare(AsciiString::TheEmptyString) != 0) 
+		if (d->m_fxList[m_curBodyState][i].locInfo.boneName.compare(AsciiString::TheEmptyString) != 0)
 		{
 			const BoneFXListInfo *info = &(d->m_fxList[m_curBodyState][i]);
 			drawable->getPristineBonePositions(info->locInfo.boneName.str(), 0, &m_FXBonePositions[m_curBodyState][i], NULL, 1);
 		}
 
-		if (d->m_OCL[m_curBodyState][i].locInfo.boneName.compare(AsciiString::TheEmptyString) != 0) 
+		if (d->m_OCL[m_curBodyState][i].locInfo.boneName.compare(AsciiString::TheEmptyString) != 0)
 		{
 			const BoneOCLInfo *info = &(d->m_OCL[m_curBodyState][i]);
 			drawable->getPristineBonePositions(info->locInfo.boneName.str(), 0, &m_OCLBonePositions[m_curBodyState][i], NULL, 1);
 		}
 
-		if (d->m_particleSystem[m_curBodyState][i].locInfo.boneName.compare(AsciiString::TheEmptyString) != 0) 
+		if (d->m_particleSystem[m_curBodyState][i].locInfo.boneName.compare(AsciiString::TheEmptyString) != 0)
 		{
 			const BoneParticleSystemInfo *info = &(d->m_particleSystem[m_curBodyState][i]);
 			drawable->getPristineBonePositions(info->locInfo.boneName.str(), 0, &m_PSBonePositions[m_curBodyState][i], NULL, 1);
@@ -559,7 +555,7 @@ void BoneFXUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -591,9 +587,9 @@ void BoneFXUpdate::xfer( Xfer *xfer )
 			systemID = *it;
 			xfer->xferUser( &systemID, sizeof( ParticleSystemID ) );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -601,10 +597,10 @@ void BoneFXUpdate::xfer( Xfer *xfer )
 		if( m_particleSystemIDs.empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "BoneFXUpdate::xfer - m_particleSystemIDs should be empty but is not\n" ));
+			DEBUG_CRASH(( "BoneFXUpdate::xfer - m_particleSystemIDs should be empty but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read all data
 		for( UnsignedShort i = 0; i < particleSystemCount; ++i )
@@ -616,13 +612,13 @@ void BoneFXUpdate::xfer( Xfer *xfer )
 			// put at end of vector
 			m_particleSystemIDs.push_back( systemID );
 
-		}  // end for, i
+		}
 
-	}  // end else
+	}
 
 	// next fx frame
 	xfer->xferUser( m_nextFXFrame, sizeof( Int ) * BODYDAMAGETYPE_COUNT * BONE_FX_MAX_BONES );
-	
+
 	// next OCL farme
 	xfer->xferUser( m_nextOCLFrame, sizeof( Int ) * BODYDAMAGETYPE_COUNT * BONE_FX_MAX_BONES );
 
@@ -647,7 +643,7 @@ void BoneFXUpdate::xfer( Xfer *xfer )
 	// active
 	xfer->xferBool( &m_active );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -658,4 +654,4 @@ void BoneFXUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CheckpointUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CheckpointUpdate.cpp
index 0830754676e..746118fb4d6 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CheckpointUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CheckpointUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 #include "Common/ThingTemplate.h"
@@ -62,7 +62,7 @@ CheckpointUpdate::~CheckpointUpdate( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Look around us for enemies.
  */
 void CheckpointUpdate::checkForAlliesAndEnemies( void )
@@ -107,10 +107,10 @@ void CheckpointUpdate::checkForAlliesAndEnemies( void )
 UpdateSleepTime CheckpointUpdate::update()
 {
 /// @todo srj use SLEEPY_UPDATE here
-	
+
 	Bool wasAnAlly  = m_allyNear;
 	Bool wasAnEnemy = m_enemyNear;
-	
+
 	checkForAlliesAndEnemies();
 
 	Bool change = ( (wasAnAlly != m_allyNear) || (wasAnEnemy != m_enemyNear) );
@@ -141,7 +141,7 @@ UpdateSleepTime CheckpointUpdate::update()
 				}
 			}
 
-		}// end if change
+		}
 
 		GeometryInfo geom = obj->getGeometryInfo();
 
@@ -151,7 +151,7 @@ UpdateSleepTime CheckpointUpdate::update()
 
 		// THis method is more accidental than above, but it works for an unimportant thing like checkpoint
 		Real radius = geom.getMinorRadius();
-		
+
 		if ( open )
 		{
 			if ( radius > 0 ) geom.setMinorRadius( radius - 0.333f );
@@ -160,11 +160,11 @@ UpdateSleepTime CheckpointUpdate::update()
 		{
 			if ( radius < m_maxMinorRadius ) geom.setMinorRadius( radius + 0.333f );
 		}
-		
+
 
 		obj->setGeometryInfo( geom );
 
-	} // end if draw
+	}
 
 	return UPDATE_SLEEP_NONE;
 
@@ -179,7 +179,7 @@ void CheckpointUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -209,7 +209,7 @@ void CheckpointUpdate::xfer( Xfer *xfer )
 	// enemy scan delay
 	xfer->xferUnsignedInt( &m_enemyScanDelay );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -220,4 +220,4 @@ void CheckpointUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CleanupHazardUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CleanupHazardUpdate.cpp
index 80979372ab9..9fc92b0a4e7 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CleanupHazardUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CleanupHazardUpdate.cpp
@@ -46,11 +46,6 @@
 #include "GameLogic/WeaponSet.h"
 #include "GameLogic/Module/AIUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -66,7 +61,7 @@ CleanupHazardUpdateModuleData::CleanupHazardUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "WeaponSlot",						INI::parseLookupList,						TheWeaponSlotTypeNamesLookupList, offsetof( CleanupHazardUpdateModuleData, m_weaponSlot ) },
 		{ "ScanRate",							INI::parseDurationUnsignedInt,	NULL, offsetof( CleanupHazardUpdateModuleData, m_scanFrames ) },
@@ -87,7 +82,7 @@ CleanupHazardUpdate::CleanupHazardUpdate( Thing *thing, const ModuleData* module
 	m_moveRange									= 0.0f;
 	m_pos.zero();
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -102,13 +97,13 @@ void CleanupHazardUpdate::onObjectCreated()
 {
 	const CleanupHazardUpdateModuleData *data = getCleanupHazardUpdateModuleData();
 	Object *self = getObject();
-	
+
 	//Make sure we have a weapon template
 	self->setWeaponSetFlag( WEAPONSET_VETERAN );
 	Weapon *weapon = self->getWeaponInWeaponSlot( data->m_weaponSlot );
 	if( !weapon )
 	{
-		DEBUG_CRASH( ("CleanupHazardUpdate for %s doesn't have a valid weapon template", 
+		DEBUG_CRASH( ("CleanupHazardUpdate for %s doesn't have a valid weapon template",
 			getObject()->getTemplate()->getName().str() ) );
 		return;
 	}
@@ -129,7 +124,7 @@ void CleanupHazardUpdate::onObjectCreated()
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime CleanupHazardUpdate::update()
-{	
+{
 /// @todo srj use SLEEPY_UPDATE here
 	const CleanupHazardUpdateModuleData *data = getCleanupHazardUpdateModuleData();
 	Object *obj = getObject();
@@ -172,7 +167,7 @@ UpdateSleepTime CleanupHazardUpdate::update()
 	}
 	else if( m_moveRange )
 	{
-		//There's nothing nearby, so if we are cleaning up an area versus hazards 
+		//There's nothing nearby, so if we are cleaning up an area versus hazards
 		//immediately in range, set the AI to idle so it can advance to the next script!
 		AIUpdateInterface *ai = obj->getAI();
 		if( ai && (ai->isIdle() || ai->isBusy()) )
@@ -219,7 +214,7 @@ void CleanupHazardUpdate::fireWhenReady()
 		{
 			if( m_inRange )
 			{
-				//We were in range last frame, but the target has moved out of firing range, so 
+				//We were in range last frame, but the target has moved out of firing range, so
 				//re-evaluate by forcing a new scan.
 				m_nextScanFrames = GameLogicRandomValue( 0, 3 );
 				m_bestTargetID = INVALID_ID;
@@ -237,7 +232,7 @@ void CleanupHazardUpdate::fireWhenReady()
 			}
 		}
 	}
-	
+
 	if( m_nextShotAvailableInFrames > 0 )
 	{
 		//We can't fire this frame.
@@ -285,7 +280,7 @@ Object* CleanupHazardUpdate::scanClosestTarget()
 		bestTargetInRange = ThePartitionManager->getClosestObject( me->getPosition(), data->m_scanRange, FROM_CENTER_2D, filters );
 	}
 
-	if( bestTargetInRange ) 
+	if( bestTargetInRange )
 	{
 		m_bestTargetID = bestTargetInRange->getID();
 	}
@@ -310,7 +305,7 @@ void CleanupHazardUpdate::setCleanupAreaParameters( const Coord3D *pos, Real ran
 		//CMD_FROM_AI important because it'll abort when other types are used -- like if a player
 		//or script orders the unit to do something else, we need a way to cancel this passive
 		//situation.
-		ai->aiMoveToPosition( pos, CMD_FROM_AI ); 
+		ai->aiMoveToPosition( pos, CMD_FROM_AI );
 	}
 }
 
@@ -323,7 +318,7 @@ void CleanupHazardUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -362,7 +357,7 @@ void CleanupHazardUpdate::xfer( Xfer *xfer )
 	// move range
 	xfer->xferReal( &m_moveRange );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -373,4 +368,4 @@ void CleanupHazardUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CommandButtonHuntUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CommandButtonHuntUpdate.cpp
index 6321cc43a4e..802d2d7afa2 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CommandButtonHuntUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/CommandButtonHuntUpdate.cpp
@@ -24,9 +24,9 @@
 
 // FILE: CommandButtonHuntUpdate.cpp //////////////////////////////////////////////////////////////////////////
 // Author: John Ahlquist, Sept. 2002
-// Desc:   Update module to handle "Hunting" using a special power.  If the unit is idle, and the 
+// Desc:   Update module to handle "Hunting" using a special power.  If the unit is idle, and the
 // power is not active, it targets a new unit with the power.	 Note that this is an update rather than
-// an AI state because many of the special abilities use the ai to perform portions of the special 
+// an AI state because many of the special abilities use the ai to perform portions of the special
 // ability.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -52,11 +52,6 @@
 #include "GameLogic/Module/SpecialPowerModule.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -71,7 +66,7 @@ CommandButtonHuntUpdateModuleData::CommandButtonHuntUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ScanRate",							INI::parseDurationUnsignedInt,	NULL, offsetof( CommandButtonHuntUpdateModuleData, m_scanFrames ) },
 		{ "ScanRange",						INI::parseReal,									NULL, offsetof( CommandButtonHuntUpdateModuleData, m_scanRange ) },
@@ -81,13 +76,13 @@ CommandButtonHuntUpdateModuleData::CommandButtonHuntUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-CommandButtonHuntUpdate::CommandButtonHuntUpdate( Thing *thing, const ModuleData* moduleData ) : 
+CommandButtonHuntUpdate::CommandButtonHuntUpdate( Thing *thing, const ModuleData* moduleData ) :
 UpdateModule( thing, moduleData ),
 m_commandButton(NULL)
 {
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 	m_commandButtonName = AsciiString::TheEmptyString;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -100,14 +95,14 @@ CommandButtonHuntUpdate::~CommandButtonHuntUpdate( void )
 //-------------------------------------------------------------------------------------------------
 void CommandButtonHuntUpdate::onObjectCreated()
 {
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
 void CommandButtonHuntUpdate::setCommandButton(const AsciiString& buttonName)
 {
 	Object *obj = getObject();
-	m_commandButtonName = buttonName;	
+	m_commandButtonName = buttonName;
 	m_commandButton = NULL;
 	const CommandSet *commandSet = TheControlBar->findCommandSet( obj->getCommandSetString() );
 	if( commandSet )
@@ -146,7 +141,7 @@ void CommandButtonHuntUpdate::setCommandButton(const AsciiString& buttonName)
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime CommandButtonHuntUpdate::update()
-{	
+{
 
 	Object *obj = getObject();
 
@@ -252,7 +247,7 @@ Object* CommandButtonHuntUpdate::scanClosestTarget(void)
 	if (spTemplate->getSpecialPowerType() == SPECIAL_TANKHUNTER_TNT_ATTACK) isPlaceExplosive = true;
 
 
-	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( me->getPosition(), data->m_scanRange, 
+	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( me->getPosition(), data->m_scanRange,
 		FROM_CENTER_2D, filters, ITER_SORTED_NEAR_TO_FAR );
 	MemoryPoolObjectHolder hold(iter);
 
@@ -272,7 +267,7 @@ Object* CommandButtonHuntUpdate::scanClosestTarget(void)
 			if (other->isDisabled() && isBlackLotusVehicleHack) {
 				// The hack disables the vehicle, so we don't want to do it again.
 				continue;
-			}	
+			}
 			if (isCaptureBuilding) {
 				if (me->getControllingPlayer() == other->getControllingPlayer()) {
 					continue; // no need to capture our own buildings.
@@ -298,19 +293,19 @@ Object* CommandButtonHuntUpdate::scanClosestTarget(void)
 				Real dist = sqrt(distSqr);
 				Int curPriority = data->m_scanRange - dist;
 				if (info) curPriority = info->getPriority(other->getTemplate());
-				if (curPriority == 0) 
+				if (curPriority == 0)
 					continue; // don't attack 0 priority targets.
 				Int modifier = dist/TheAI->getAiData()->m_attackPriorityDistanceModifier;
 				Int modPriority = curPriority-modifier;
-				if (modPriority < 1) 
+				if (modPriority < 1)
 					modPriority = 1;
-				if (modPriority > effectivePriority) 
+				if (modPriority > effectivePriority)
 				{
 					effectivePriority = modPriority;
 					actualPriority = curPriority;
 					bestTarget = other;
 				}
-				if (modPriority == effectivePriority && curPriority > actualPriority) 
+				if (modPriority == effectivePriority && curPriority > actualPriority)
 				{
 					effectivePriority = modPriority;
 					actualPriority = curPriority;
@@ -333,7 +328,7 @@ void CommandButtonHuntUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -366,7 +361,7 @@ void CommandButtonHuntUpdate::xfer( Xfer *xfer )
 		{
 			Object *us = getObject();
 			const CommandSet *commandSet = TheControlBar->findCommandSet( us->getCommandSetString() );
-	
+
 			if( commandSet )
 			{
 				const CommandButton *button;
@@ -377,21 +372,21 @@ void CommandButtonHuntUpdate::xfer( Xfer *xfer )
 					button = commandSet->getCommandButton(i);
 					if( button && button->getName() == m_commandButtonName )
 					{
-					
+
 						m_commandButton = button;
 						break;  // exit for, i
 
-					}  // end if
+					}
 
-				}  // end for, i
+				}
 
-			} // end if, commandSet
+			}
 
-		}  // end if, command button name present
+		}
 
-	}  // end if, loading
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -402,4 +397,4 @@ void CommandButtonHuntUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DelayedWeaponSetUpgradeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DelayedWeaponSetUpgradeUpdate.cpp
index 876dfa9b3a8..0ba4f1aac11 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DelayedWeaponSetUpgradeUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DelayedWeaponSetUpgradeUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h"
@@ -41,19 +41,19 @@ DelayedWeaponSetUpgradeUpdateModuleData::DelayedWeaponSetUpgradeUpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void DelayedWeaponSetUpgradeUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void DelayedWeaponSetUpgradeUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ 0, 0, 0, 0 }
 	};
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -73,7 +73,7 @@ DelayedWeaponSetUpgradeUpdate::DelayedWeaponSetUpgradeUpdate( Thing *thing, cons
 DelayedWeaponSetUpgradeUpdate::~DelayedWeaponSetUpgradeUpdate( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -102,7 +102,7 @@ void DelayedWeaponSetUpgradeUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -120,7 +120,7 @@ void DelayedWeaponSetUpgradeUpdate::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -131,4 +131,4 @@ void DelayedWeaponSetUpgradeUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DeletionUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DeletionUpdate.cpp
index 6e7a12218bc..36b0699f043 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DeletionUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DeletionUpdate.cpp
@@ -58,7 +58,7 @@ DeletionUpdate::~DeletionUpdate( void )
 //-------------------------------------------------------------------------------------------------
 void DeletionUpdate::setLifetimeRange( UnsignedInt minFrames, UnsignedInt maxFrames )
 {
-	
+
 #if defined RTS_DEBUG && defined CRISS_CROSS_GEOMETRY
 	setWakeFrame(getObject(), UPDATE_SLEEP(2));
 #else
@@ -115,7 +115,7 @@ void DeletionUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -136,7 +136,7 @@ void DeletionUpdate::xfer( Xfer *xfer )
 	// die frame
 	xfer->xferUnsignedInt( &m_dieFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -147,4 +147,4 @@ void DeletionUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DemoTrapUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DemoTrapUpdate.cpp
index 29a5a1644f0..95b1f638fdc 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DemoTrapUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DemoTrapUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   Update module to handle demo trap proximity triggering.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES
 
@@ -65,7 +65,7 @@ DemoTrapUpdateModuleData::DemoTrapUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
     { "DefaultProximityMode",      INI::parseBool,								NULL, offsetof( DemoTrapUpdateModuleData, m_defaultsToProximityMode ) },
     { "DetonationWeaponSlot",      INI::parseLookupList,					TheWeaponSlotTypeNamesLookupList, offsetof( DemoTrapUpdateModuleData, m_detonationWeaponSlot ) },
@@ -87,7 +87,7 @@ DemoTrapUpdate::DemoTrapUpdate( Thing *thing, const ModuleData* moduleData ) : U
 {
 	m_nextScanFrames = 0;
 	m_detonated = false;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -129,7 +129,7 @@ void DemoTrapUpdate::onObjectCreated()
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime DemoTrapUpdate::update()
-{	
+{
 /// @todo srj use SLEEPY_UPDATE here
 	const DemoTrapUpdateModuleData *data = getDemoTrapUpdateModuleData();
 
@@ -171,7 +171,7 @@ UpdateSleepTime DemoTrapUpdate::update()
 		return UPDATE_SLEEP_NONE;
 	}
 
-	
+
 	if( weaponSlot == data->m_manualModeWeaponSlot )
 	{
 		//Don't scan!
@@ -269,7 +269,7 @@ void DemoTrapUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -293,7 +293,7 @@ void DemoTrapUpdate::xfer( Xfer *xfer )
 	// detonated
 	xfer->xferBool( &m_detonated );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -304,4 +304,4 @@ void DemoTrapUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp
index 363ef66ed4d..f1ee45abe75 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   Behavior common to all DockUpdates is here.  Everything but action()
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Debug.h"
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
@@ -51,7 +51,7 @@ DockUpdateModuleData::DockUpdateModuleData( void )
 
 	UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "NumberApproachPositions"	,INI::parseInt,		NULL, offsetof( DockUpdateModuleData, m_numberApproachPositionsData ) },
 		{ "AllowsPassthrough"				,INI::parseBool,	NULL, offsetof( DockUpdateModuleData, m_isAllowPassthrough ) },
@@ -61,7 +61,7 @@ DockUpdateModuleData::DockUpdateModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 DockUpdate::DockUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
@@ -228,7 +228,7 @@ Bool DockUpdate::isClearToAdvance( Object const* docker, Int dockerIndex ) const
 	Bool correctRequest = dockerID == m_approachPositionOwners[dockerIndex];
 	Bool approachReached = m_approachPositionReached[dockerIndex];
 	Bool nextSpotFree = (dockerIndex > 0)  &&  (m_approachPositionOwners[dockerIndex - 1] == INVALID_ID);
-	
+
 	return correctRequest && approachReached && nextSpotFree;
 }
 
@@ -356,9 +356,9 @@ void DockUpdate::onDockReached( Object* docker )
 void DockUpdate::onExitReached( Object* docker )
 {
 	Object *me = getObject();
-	me->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK2(MODELCONDITION_DOCKING_ACTIVE, MODELCONDITION_DOCKING), 
+	me->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK2(MODELCONDITION_DOCKING_ACTIVE, MODELCONDITION_DOCKING),
 																			MAKE_MODELCONDITION_MASK(MODELCONDITION_DOCKING_ENDING) );
-	docker->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK2(MODELCONDITION_DOCKING_ACTIVE, MODELCONDITION_DOCKING), 
+	docker->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK2(MODELCONDITION_DOCKING_ACTIVE, MODELCONDITION_DOCKING),
 																					MAKE_MODELCONDITION_MASK(MODELCONDITION_DOCKING_ENDING) );
 	m_dockerInside = FALSE;
 
@@ -394,7 +394,7 @@ void DockUpdate::cancelDock( Object* docker )
 		Object *dockingObject = TheGameLogic->findObjectByID(m_activeDocker);
 		m_activeDocker = INVALID_ID;
 		m_dockerInside = FALSE;
-		// clear any model conditions related to docking that may be set on us and them.  
+		// clear any model conditions related to docking that may be set on us and them.
 		// (Normal clear is part of each stage, but we won't get there.)
 		ModelConditionFlags clear;
 		clear.set( MODELCONDITION_DOCKING_ENDING );
@@ -430,7 +430,7 @@ UpdateSleepTime DockUpdate::update()
 	else if ( getObject()->isKindOf( KINDOF_SUPPLY_SOURCE ) )
 	{
 		Object *docker = TheGameLogic->findObjectByID( m_activeDocker );
-		if ( docker && docker->isKindOf( KINDOF_DOZER ) && docker->isKindOf( KINDOF_HARVESTER ))// a worker 
+		if ( docker && docker->isKindOf( KINDOF_DOZER ) && docker->isKindOf( KINDOF_HARVESTER ))// a worker
 		{
 			ModelConditionFlags test;
 			test.set( MODELCONDITION_DOCKING_BEGINNING );
@@ -452,10 +452,10 @@ Coord3D DockUpdate::computeApproachPosition( Int positionIndex, Object *forWhom
 
 	Coord3D bestPosition;// This answer is the best, as it includes findPositionAround
 	Coord3D workingPosition;// But if findPositionAround fails, we need to say something.
-	
+
 	FindPositionOptions fpOptions;
 	// Start with the pristine bone, then convert it to the world, then find a clean spot around it.
-	
+
 	Object *us = getObject();
 	us->convertBonePosToWorldPos( &m_approachPositions[positionIndex], NULL, &workingPosition, NULL );
 
@@ -540,7 +540,7 @@ void DockUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -616,7 +616,7 @@ void DockUpdate::xfer( Xfer *xfer )
 	// dock open
 	xfer->xferBool( &m_dockOpen );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -627,5 +627,5 @@ void DockUpdate::loadPostProcess( void )
 	// call base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/PrisonDockUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/PrisonDockUpdate.cpp
index b97530c8d97..3ee5ae7e848 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/PrisonDockUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/PrisonDockUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
@@ -45,14 +45,14 @@ PrisonDockUpdate::PrisonDockUpdate( Thing *thing, const ModuleData* moduleData )
 								: DockUpdate( thing, moduleData )
 {
 
-}  // end PrisonDockUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 PrisonDockUpdate::~PrisonDockUpdate( void )
 {
 
-}  // end ~PrisonDockUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do the action while docked
@@ -73,10 +73,10 @@ Bool PrisonDockUpdate::action( Object *docker, Object *drone )
 
 	// unload the prisoners from the docker into us
 	AIUpdateInterface *ai = docker->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ai, ("'%s' docking with prison has no AI\n",
+	DEBUG_ASSERTCRASH( ai, ("'%s' docking with prison has no AI",
 												 docker->getTemplate()->getName().str()) );
 	POWTruckAIUpdateInterface *powAI = ai->getPOWTruckAIUpdateInterface();
-	DEBUG_ASSERTCRASH( powAI, ("'s' docking with prison has no POW Truck AI\n",
+	DEBUG_ASSERTCRASH( powAI, ("'s' docking with prison has no POW Truck AI",
 														docker->getTemplate()->getName().str()) );
 
 	powAI->unloadPrisonersToPrison( getObject() );
@@ -84,7 +84,7 @@ Bool PrisonDockUpdate::action( Object *docker, Object *drone )
 	// end docking
 	return FALSE;
 
-}  // end action
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -95,7 +95,7 @@ void PrisonDockUpdate::crc( Xfer *xfer )
 	// extend base class
 	DockUpdate::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -113,7 +113,7 @@ void PrisonDockUpdate::xfer( Xfer *xfer )
 	// extend base class
 	DockUpdate::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -124,6 +124,6 @@ void PrisonDockUpdate::loadPostProcess( void )
 	// extend base class
 	DockUpdate::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 #endif
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RailedTransportDockUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RailedTransportDockUpdate.cpp
index 05cc0515edb..bedbd258caa 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RailedTransportDockUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RailedTransportDockUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
@@ -53,7 +53,7 @@ RailedTransportDockUpdateModuleData::RailedTransportDockUpdateModuleData( void )
 	m_pullInsideDurationInFrames = 0;
 	m_pushOutsideDurationInFrames = 0;
 
-}  // end RailedTransportDockUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -61,10 +61,10 @@ RailedTransportDockUpdateModuleData::RailedTransportDockUpdateModuleData( void )
 {
   DockUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
-		{ "PullInsideDuration", INI::parseDurationUnsignedInt, NULL, offsetof( RailedTransportDockUpdateModuleData, m_pullInsideDurationInFrames ) },	
+		{ "PullInsideDuration", INI::parseDurationUnsignedInt, NULL, offsetof( RailedTransportDockUpdateModuleData, m_pullInsideDurationInFrames ) },
 		{ "PushOutsideDuration",INI::parseDurationUnsignedInt, NULL, offsetof( RailedTransportDockUpdateModuleData, m_pushOutsideDurationInFrames ) },
 		{ 0, 0, 0, 0 }
 
@@ -72,7 +72,7 @@ RailedTransportDockUpdateModuleData::RailedTransportDockUpdateModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -90,23 +90,23 @@ RailedTransportDockUpdate::RailedTransportDockUpdate( Thing *thing, const Module
 	m_pushOutsideDistancePerFrame = 0.0f;
 	m_unloadCount = UNLOAD_ALL;
 
-}  // end RailedTransportDockUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 RailedTransportDockUpdate::~RailedTransportDockUpdate( void )
 {
 
-}  // end ~RailedTransportDockUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 UpdateSleepTime RailedTransportDockUpdate::update( void )
 {
-	
+
 	// extend functionality
 	UpdateSleepTime result;
-	
+
 	result = DockUpdate::update();
 
 	// do any pull in docking we need to
@@ -116,7 +116,7 @@ UpdateSleepTime RailedTransportDockUpdate::update( void )
 	doPushOutDocking();
 
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** The dock action callback, return FALSE when done docking */
@@ -165,12 +165,12 @@ Bool RailedTransportDockUpdate::action( Object *docker, Object *drone )
 		angleVector.x = dockPos->x - dockerPos->x;
 		angleVector.y = dockPos->y - dockerPos->y;
 		docker->setOrientation( angleVector.toAngle() );
-		
-	}  // end if	
+
+	}
 
 	return TRUE;
 
-}  // end action
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Is clear to enter the railed transport */
@@ -190,8 +190,8 @@ Bool RailedTransportDockUpdate::isClearToEnter( Object const *docker ) const
 		return FALSE;
 
 	return TRUE;
-		
-}  // end isClearToEnter
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Is anything currently loading or unloading */
@@ -201,10 +201,10 @@ Bool RailedTransportDockUpdate::isLoadingOrUnloading( void )
 
 	if( m_unloadingObjectID != INVALID_ID || m_dockingObjectID != INVALID_ID )
 		return TRUE;
-	
+
 	return FALSE;
 
-}  // end isLoadingOrUnloading
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Start the unload process */
@@ -220,7 +220,7 @@ void RailedTransportDockUpdate::unloadAll( void )
 	m_unloadCount = UNLOAD_ALL;
 	unloadNext();
 
-}  // end manualUnload
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Unload a single individual only */
@@ -232,7 +232,7 @@ void RailedTransportDockUpdate::unloadSingleObject( Object *obj )
 	m_unloadCount = 1;
 	unloadNext();
 
-}  // end unloadSingleObject
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -254,7 +254,7 @@ void RailedTransportDockUpdate::doPullInDocking( void )
 	{
 		Object *us = getObject();
 		Object *docker = TheGameLogic->findObjectByID( m_dockingObjectID );
-		
+
 		// check for docker gone
 		if( docker == NULL )
 			m_dockingObjectID = INVALID_ID;
@@ -314,17 +314,17 @@ void RailedTransportDockUpdate::doPullInDocking( void )
 				{
 					contain->addToContain( docker );
 				}
-				
+
 				// no object is docking now
 				m_dockingObjectID = INVALID_ID;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end doPullInDocking
+}
 
 // ------------------------------------------------------------------------------------------------
 /** If we have an object recorded as being pushed out of us then do that here */
@@ -343,7 +343,7 @@ void RailedTransportDockUpdate::doPushOutDocking( void )
 			unloadNext();
 			return;
 
-		}  // end if
+		}
 
 		// pull it
 		if( unloader )
@@ -412,18 +412,18 @@ void RailedTransportDockUpdate::doPushOutDocking( void )
 					us->convertBonePosToWorldPos( &finalPos, NULL, &finalPos, NULL );
 					unloaderAI->aiMoveToPosition( &finalPos, CMD_FROM_AI );
 
-				}  // end if
-						
+				}
+
 				// unload the next object
-				unloadNext();				
+				unloadNext();
+
+			}
 
-			}  // end if
-		
-		}  // end if
+		}
 
-	}  // end if, m_unloadingID
+	}
 
-}  // end doPushOutDocking
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Iterate callback for the finding the first contained object */
@@ -439,7 +439,7 @@ static void getFirstContain( Object *obj, void *userData )
 	// assign this as the first object found
 	*firstContain = obj;
 
-}  // end getFirstContain
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Start the next object contained by us as "unloading and coming out" */
@@ -461,7 +461,7 @@ void RailedTransportDockUpdate::unloadNext( void )
 	// better be an open container
 	ContainModuleInterface *contain = us->getContain();
 	OpenContain *openContain = contain ? contain->asOpenContain() : NULL;
-	DEBUG_ASSERTCRASH( openContain, ("Unloading next from railed transport, but '%s' has no open container\n",
+	DEBUG_ASSERTCRASH( openContain, ("Unloading next from railed transport, but '%s' has no open container",
 										 us->getTemplate()->getName().str()) );
 
 	// get the first contained object
@@ -475,7 +475,7 @@ void RailedTransportDockUpdate::unloadNext( void )
 
 		// set position of the loader to our position
 		unloader->setPosition( us->getPosition() );
-	
+
 		// orient unloader to the same angle as us so we can drive out the front
 		unloader->setOrientation( us->getOrientation() );
 
@@ -502,17 +502,17 @@ void RailedTransportDockUpdate::unloadNext( void )
 		// now that we know how far we must go, now much distance should we travel every frame
 		const RailedTransportDockUpdateModuleData *modData = getRailedTransportDockUpdateModuleData();
 		m_pushOutsideDistancePerFrame = mag / modData->m_pushOutsideDurationInFrames;
-		
+
 		// set this as our current unloader
 		m_unloadingObjectID = unloader->getID();
-	
+
 		// we've now used an unload (if we're keeping count for single exits)
 		if( m_unloadCount != UNLOAD_ALL )
 			--m_unloadCount;
-						
-	}  // end if
 
-}  // end unloadNext
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -523,7 +523,7 @@ void RailedTransportDockUpdate::crc( Xfer *xfer )
 	// extend base class
 	DockUpdate::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -540,7 +540,7 @@ void RailedTransportDockUpdate::xfer( Xfer *xfer )
 
 	// extend base class
 	DockUpdate::xfer( xfer );
-	
+
 	// docking object id
 	xfer->xferObjectID( &m_dockingObjectID );
 
@@ -556,7 +556,7 @@ void RailedTransportDockUpdate::xfer( Xfer *xfer )
 	// unload count
 	xfer->xferInt( &m_unloadCount );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -567,4 +567,4 @@ void RailedTransportDockUpdate::loadPostProcess( void )
 	// extend base class
 	DockUpdate::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RepairDockUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RepairDockUpdate.cpp
index 2c09ac628b9..f39dd2741f9 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RepairDockUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RepairDockUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -42,7 +42,7 @@ RepairDockUpdateModuleData::RepairDockUpdateModuleData( void )
 
 	m_framesForFullHeal = 1.0f;  // 1 frame, instant heal by default (keeps away from divide by 0's)
 
-}  // end RepairDockUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -51,7 +51,7 @@ RepairDockUpdateModuleData::RepairDockUpdateModuleData( void )
 
 	DockUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "TimeForFullHeal", INI::parseDurationReal, NULL, offsetof( RepairDockUpdateModuleData, m_framesForFullHeal ) },
 		{ 0, 0, 0, 0 }
@@ -59,7 +59,7 @@ RepairDockUpdateModuleData::RepairDockUpdateModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -74,14 +74,14 @@ RepairDockUpdate::RepairDockUpdate( Thing *thing, const ModuleData* moduleData )
   m_lastRepair = INVALID_ID;
 	m_healthToAddPerFrame = 0.0f;
 
-}  // end RepairDockUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 RepairDockUpdate::~RepairDockUpdate( void )
 {
 
-}  // end ~RepairDockUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do the action while docked
@@ -120,7 +120,7 @@ Bool RepairDockUpdate::action( Object *docker, Object *drone )
 		//
 		m_healthToAddPerFrame = (body->getMaxHealth() - body->getHealth()) / modData->m_framesForFullHeal;
 
-	}  // end if
+	}
 
 	// if we're at max health we're done
 	if( body->getHealth() >= body->getMaxHealth() )
@@ -132,7 +132,7 @@ Bool RepairDockUpdate::action( Object *docker, Object *drone )
 		// returning false will complete the docking process
 		return FALSE;
 
-	}  // end if
+	}
 
 	// give us some health buddy
 	DamageInfo healingInfo;
@@ -147,11 +147,11 @@ Bool RepairDockUpdate::action( Object *docker, Object *drone )
 		healingInfo.in.m_amount = body->getMaxHealth();
 		body->attemptHealing( &healingInfo );
 	}
-	
+
 	// stay docked
 	return TRUE;
 
-}  // end action
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -162,7 +162,7 @@ void RepairDockUpdate::crc( Xfer *xfer )
 	// extend base class
 	DockUpdate::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -186,7 +186,7 @@ void RepairDockUpdate::xfer( Xfer *xfer )
 	// health to add per frame
 	xfer->xferReal( &m_healthToAddPerFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -197,4 +197,4 @@ void RepairDockUpdate::loadPostProcess( void )
 	// extend base class
 	DockUpdate::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp
index 598e226494a..965f0fdd028 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   The action of this dock update is taking boxes and turning them into money for my ownerplayer
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -50,14 +50,14 @@ SupplyCenterDockUpdateModuleData::SupplyCenterDockUpdateModuleData( void )
 
 	DockUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ 0, 0, 0, 0 }
 	};
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -93,13 +93,13 @@ Bool SupplyCenterDockUpdate::action( Object* docker, Object *drone )
 	Player *ownerPlayer = getObject()->getControllingPlayer();
 	while( supplyTruckAI->loseOneBox() )
 		value += ownerPlayer->getSupplyBoxValue();
-	
+
 	if( value > 0 )
 	{
 		Money *ownerPlayerMoney = ownerPlayer->getMoney();
 		ownerPlayerMoney->deposit(value);
 		ownerPlayer->getScoreKeeper()->addMoneyEarned(value);
-		
+
 		// Setup info for adding a floating text
 		Coord3D pos;
 		const Coord3D *dockerPos;
@@ -110,11 +110,11 @@ Bool SupplyCenterDockUpdate::action( Object* docker, Object *drone )
 		pos.y = dockerPos->y;
 		pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y);//dockerPos->z + docker->getGeometryInfo().getHeight();
 		Color color = ownerPlayer->getPlayerColor() | GameMakeColor( 0, 0, 0, 230 );
-		
+
 		TheInGameUI->addFloatingText(moneys, &pos, color);
 	}
 
-		
+
 	return FALSE;
 }
 
@@ -130,7 +130,7 @@ UpdateSleepTime SupplyCenterDockUpdate::update()
 	SupplyCenterCreate* create = (SupplyCenterCreate*)getObject()->findCreateModule(key_SupplyCenterCreate);
 	DEBUG_ASSERTCRASH( create && ! create->shouldDoOnBuildComplete(), ("A Supply center did not call onBuildComplete.") );
 #endif
-	
+
 	return result;
 }
 
@@ -143,7 +143,7 @@ void SupplyCenterDockUpdate::crc( Xfer *xfer )
 	// extend base class
 	DockUpdate::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -161,7 +161,7 @@ void SupplyCenterDockUpdate::xfer( Xfer *xfer )
 	// extend base class
 	DockUpdate::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -172,4 +172,4 @@ void SupplyCenterDockUpdate::loadPostProcess( void )
 	// extend base class
 	DockUpdate::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyWarehouseDockUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyWarehouseDockUpdate.cpp
index 12b9b40e5c4..fcfb9f0eb95 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyWarehouseDockUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyWarehouseDockUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   The action of this dock update is identifying who is docking and either taking Boxes away or giving them
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/Xfer.h"
@@ -38,11 +38,6 @@
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/AIPathfind.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 SupplyWarehouseDockUpdateModuleData::SupplyWarehouseDockUpdateModuleData( void )
@@ -58,7 +53,7 @@ SupplyWarehouseDockUpdateModuleData::SupplyWarehouseDockUpdateModuleData( void )
 
 	DockUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "StartingBoxes",	INI::parseInt,	NULL, offsetof( SupplyWarehouseDockUpdateModuleData, m_startingBoxesData ) },
 		{ "DeleteWhenEmpty",	INI::parseBool,	NULL, offsetof( SupplyWarehouseDockUpdateModuleData, m_deleteWhenEmpty ) },
@@ -67,7 +62,7 @@ SupplyWarehouseDockUpdateModuleData::SupplyWarehouseDockUpdateModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -100,7 +95,7 @@ Bool SupplyWarehouseDockUpdate::action( Object* docker, Object *drone )
 	Real closeEnoughSqr = sqr(docker->getGeometryInfo().getBoundingCircleRadius()*2);
 	Real curDistSqr = ThePartitionManager->getDistanceSquared(docker, getObject(), FROM_BOUNDINGSPHERE_2D);
 	if (curDistSqr > closeEnoughSqr) {
-		DEBUG_LOG(("Failing dock, dist %f, not close enough(%f).\n", sqrt(curDistSqr), sqrt(closeEnoughSqr)));
+		DEBUG_LOG(("Failing dock, dist %f, not close enough(%f).", sqrt(curDistSqr), sqrt(closeEnoughSqr)));
 		// Make it twitch a little.
 		Coord3D newPos = *docker->getPosition();
 		Real range = 0.4*PATHFIND_CELL_SIZE_F;
@@ -109,7 +104,7 @@ Bool SupplyWarehouseDockUpdate::action( Object* docker, Object *drone )
 		docker->setPosition(&newPos);
 		return FALSE;  //not close enough.
 	}
-	
+
 	--m_boxesStored;// so the docker sees that I am shy by one box (or empty) from within his gainOneBox()
 
 	SupplyTruckAIInterface *ai = docker->getAIUpdateInterface()->getSupplyTruckAIInterface();
@@ -131,7 +126,7 @@ Bool SupplyWarehouseDockUpdate::action( Object* docker, Object *drone )
 
 		return TRUE;
 	}
-	else 
+	else
 		++m_boxesStored; //take it back, since there was noone to gain the box
   									 //this is important so that I have one less boxes as perceived by the docker when he gains one
 
@@ -192,7 +187,7 @@ void SupplyWarehouseDockUpdate::crc( Xfer *xfer )
 	// extend base class
 	DockUpdate::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -213,7 +208,7 @@ void SupplyWarehouseDockUpdate::xfer( Xfer *xfer )
 	// boxes stored
 	xfer->xferInt( &m_boxesStored );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -231,4 +226,4 @@ void SupplyWarehouseDockUpdate::loadPostProcess( void )
 	if( draw )
 		draw->updateDrawableSupplyStatus( modData->m_startingBoxesData, m_boxesStored );
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DynamicGeometryInfoUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DynamicGeometryInfoUpdate.cpp
index 8698e8ca23a..1663997ab29 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DynamicGeometryInfoUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DynamicGeometryInfoUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Module/DynamicGeometryInfoUpdate.h"
@@ -59,7 +59,7 @@ DynamicGeometryInfoUpdateModuleData::DynamicGeometryInfoUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
 		{ "InitialDelay",					INI::parseDurationUnsignedInt,		NULL, offsetof(DynamicGeometryInfoUpdateModuleData, m_initialDelay) },
@@ -94,7 +94,7 @@ DynamicGeometryInfoUpdate::DynamicGeometryInfoUpdate( Thing *thing, const Module
 
 	m_reverseAtTransitionTime = modData->m_reverseAtTransitionTime;
 	m_switchedDirections = FALSE;
-	
+
 	// record in our instance what initial and final height are
 	m_initialHeight = modData->m_initialHeight;
 	m_initialMajorRadius = modData->m_initialMajorRadius;
@@ -103,7 +103,7 @@ DynamicGeometryInfoUpdate::DynamicGeometryInfoUpdate( Thing *thing, const Module
 	m_finalMajorRadius = modData->m_finalMajorRadius;
 	m_finalMinorRadius = modData->m_finalMinorRadius;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -129,7 +129,7 @@ UpdateSleepTime DynamicGeometryInfoUpdate::update( void )
 
 		m_started = TRUE;
 
-	}  // end if
+	}
 
 	// Either we've been running, or we just started right now.  Doesn't matter.
 	const DynamicGeometryInfoUpdateModuleData *data = getDynamicGeometryInfoUpdateModuleData();
@@ -171,16 +171,16 @@ UpdateSleepTime DynamicGeometryInfoUpdate::update( void )
 			m_finalMajorRadius = data->m_initialMajorRadius;
 			m_finalMinorRadius = data->m_initialMinorRadius;
 
-		}  // end if
+		}
 		else
 		{
 
 			// no switch needed ... we're all done
 			m_finished = TRUE;
 
-		}  // end else
+		}
 
-	}  // end if, time active is longer than transition time
+	}
 
 	return UPDATE_SLEEP_NONE;
 }
@@ -194,7 +194,7 @@ void DynamicGeometryInfoUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -251,7 +251,7 @@ void DynamicGeometryInfoUpdate::xfer( Xfer *xfer )
 	// final minor radius
 	xfer->xferReal( &m_finalMinorRadius );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -262,4 +262,4 @@ void DynamicGeometryInfoUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp
index b24f9825873..0253517006a 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp
@@ -37,11 +37,6 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 DynamicShroudClearingRangeUpdateModuleData::DynamicShroudClearingRangeUpdateModuleData()
@@ -58,11 +53,11 @@ DynamicShroudClearingRangeUpdateModuleData::DynamicShroudClearingRangeUpdateModu
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void DynamicShroudClearingRangeUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void DynamicShroudClearingRangeUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ChangeInterval",			INI::parseDurationUnsignedInt,	NULL, offsetof( DynamicShroudClearingRangeUpdateModuleData, m_changeInterval ) },
 		{ "GrowInterval",			INI::parseDurationUnsignedInt,	NULL, offsetof( DynamicShroudClearingRangeUpdateModuleData, m_growInterval ) },
@@ -78,13 +73,13 @@ DynamicShroudClearingRangeUpdateModuleData::DynamicShroudClearingRangeUpdateModu
 }
 
 //-------------------------------------------------------------------------------------------------
-//                                                                                                 
-//  doneForeverFrame                                                                               
-//  o                |                                     shrinkdelay                    |        
-//  |<-----------------------------------stateCountDown---------------------------------->|        
-//  |  shrinktime    |                                     |   growtime  |   growdelay    |        
-//  |                shrinkStartDeadline                   sustain       growStartDeadline|        
-//                                                                                                 
+//
+//  doneForeverFrame
+//  o                |                                     shrinkdelay                    |
+//  |<-----------------------------------stateCountDown---------------------------------->|
+//  |  shrinktime    |                                     |   growtime  |   growdelay    |
+//  |                shrinkStartDeadline                   sustain       growStartDeadline|
+//
 //-------------------------------------------------------------------------------------------------
 DynamicShroudClearingRangeUpdate::DynamicShroudClearingRangeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
@@ -106,8 +101,8 @@ DynamicShroudClearingRangeUpdate::DynamicShroudClearingRangeUpdate( Thing *thing
 
 	m_doneForeverFrame = TheGameLogic->getFrame() + m_stateCountDown;// a failsafe to force a shutdown on schedule
 
-//	m_shrinkStartDeadline;	
-//	m_doneForeverFrame; //	
+//	m_shrinkStartDeadline;
+//	m_doneForeverFrame; //
 
 	m_decalsCreated = FALSE;
 	m_nativeClearingRange = 200;// a sensible default
@@ -342,7 +337,7 @@ void DynamicShroudClearingRangeUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -379,11 +374,11 @@ void DynamicShroudClearingRangeUpdate::xfer( Xfer *xfer )
 	xfer->xferBool( &m_decalsCreated );
 
 	xfer->xferReal( &m_visionChangePerInterval );
-	
+
 	xfer->xferReal( &m_nativeClearingRange );
 	xfer->xferReal( &m_currentClearingRange );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -394,4 +389,4 @@ void DynamicShroudClearingRangeUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp
index 33b7fc8aae6..e64539f715a 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Thing.h"
 #include "Common/ThingTemplate.h"
@@ -48,11 +48,6 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
@@ -83,18 +78,18 @@ static void saturateRGB(RGBColor& color, Real factor)
 EMPUpdate::EMPUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 
-	//s_lastInstanceSpunPositive = !s_lastInstanceSpunPositive; //TOGGLES STATIC BOOL 
+	//s_lastInstanceSpunPositive = !s_lastInstanceSpunPositive; //TOGGLES STATIC BOOL
 
 	const EMPUpdateModuleData *data = getEMPUpdateModuleData();
 	if ( data )
 	{
 		//SANITY
-		DEBUG_ASSERTCRASH( TheGameLogic, ("EMPUpdate::EMPUpdate - TheGameLogic is NULL\n" ) );
+		DEBUG_ASSERTCRASH( TheGameLogic, ("EMPUpdate::EMPUpdate - TheGameLogic is NULL" ) );
 		UnsignedInt now = TheGameLogic->getFrame();
 
 		m_currentScale = data->m_startScale;
-		m_dieFrame = REAL_TO_UNSIGNEDINT( now + data->m_lifeFrames );			
-		m_tintEnvPlayFrame = REAL_TO_UNSIGNEDINT( now + data->m_startFadeFrame );	
+		m_dieFrame = REAL_TO_UNSIGNEDINT( now + data->m_lifeFrames );
+		m_tintEnvPlayFrame = REAL_TO_UNSIGNEDINT( now + data->m_startFadeFrame );
 		m_tintEnvFadeFrames = m_dieFrame - m_tintEnvPlayFrame;
 		//m_spinRate = GameLogicRandomValueReal(data->m_spinRateMax * 0.5f, data->m_spinRateMax);
 		m_targetScale = GameLogicRandomValueReal(data->m_targetScaleMin, data->m_targetScaleMax);
@@ -105,17 +100,17 @@ EMPUpdate::EMPUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModul
 
 		getObject()->setOrientation(GameLogicRandomValueReal(-PI,PI));
 
-		DEBUG_ASSERTCRASH( m_tintEnvPlayFrame < m_dieFrame, ("EMPUpdate::EMPUpdate - you cant play fade after death\n" ) );
-		
+		DEBUG_ASSERTCRASH( m_tintEnvPlayFrame < m_dieFrame, ("EMPUpdate::EMPUpdate - you cant play fade after death" ) );
+
 		return;
 	}
 
 	//SANITY
-	DEBUG_ASSERTCRASH( data, ("EMPUpdate::EMPUpdate - getEMPUpdateModuleData is NULL\n" ) );
+	DEBUG_ASSERTCRASH( data, ("EMPUpdate::EMPUpdate - getEMPUpdateModuleData is NULL" ) );
 	m_currentScale = 1.0f;
-	m_dieFrame = 0;			
+	m_dieFrame = 0;
 	m_tintEnvFadeFrames = 0;
-	m_tintEnvPlayFrame  = 0;	
+	m_tintEnvPlayFrame  = 0;
 	//m_spinRate = 0;
 	m_targetScale = 1;
 }
@@ -138,7 +133,7 @@ UpdateSleepTime EMPUpdate::update( void )
 	const EMPUpdateModuleData *data = getEMPUpdateModuleData();
 	Drawable *dr = obj->getDrawable();
 	UnsignedInt now = TheGameLogic->getFrame();
-	
+
 	m_currentScale += ( m_targetScale - m_currentScale ) * 0.05f;
 	dr->setInstanceScale( m_currentScale );
 
@@ -152,7 +147,7 @@ UpdateSleepTime EMPUpdate::update( void )
 	{
 		RGBColor end = data->m_endColor;
 		saturateRGB( end, 5 );
-		dr->colorFlash( &end, 9999, m_tintEnvFadeFrames, TRUE );
+		dr->colorFlash( &end, 0, m_tintEnvFadeFrames, ~0u );
 		doDisableAttack();
 	}
 
@@ -180,16 +175,16 @@ void EMPUpdate::doDisableAttack( void )
 	Real curVictimDistSqr;
 	const Coord3D *pos = object->getPosition();
 
-	SimpleObjectIterator *iter;
-	Object *curVictim;
+	SimpleObjectIterator *iter = NULL;
+	Object *curVictim = NULL;
 
 	if (radius > 0.0f)
 	{
-		iter = ThePartitionManager->iterateObjectsInRange(pos, 
+		iter = ThePartitionManager->iterateObjectsInRange(pos,
 			radius, FROM_BOUNDINGSPHERE_3D);
 
 		curVictim = iter->firstWithNumeric(&curVictimDistSqr);
-	} 
+	}
 
 	MemoryPoolObjectHolder hold(iter);
 
@@ -220,7 +215,7 @@ void EMPUpdate::doDisableAttack( void )
 				if ( ! curVictim->isFactionStructure() )
 					continue;
 			}
-		
+
 			//Disable the target for a specified amount of time.
 			curVictim->setDisabledUntil( DISABLED_EMP, TheGameLogic->getFrame() + data->m_disabledDuration );
 
@@ -242,7 +237,7 @@ void EMPUpdate::doDisableAttack( void )
 					{
 
 						ParticleSystem *sys = TheParticleSystemManager->createParticleSystem(tmp);
-						
+
 						if (sys)
 						{
 							Coord3D offs = {0,0,0};
@@ -267,7 +262,7 @@ void EMPUpdate::doDisableAttack( void )
 							sys->setInitialDelay(GameLogicRandomValue(1,100));
 						}
 					}
-				} 
+				}
 			}
 
 		}
@@ -281,7 +276,7 @@ void EMPUpdate::doDisableAttack( void )
 void EMPUpdate::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -296,7 +291,7 @@ void EMPUpdate::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -304,4 +299,4 @@ void EMPUpdate::xfer( Xfer *xfer )
 void EMPUpdate::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EnemyNearUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EnemyNearUpdate.cpp
index cf64c1bb8e8..3bd99fbb760 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EnemyNearUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/EnemyNearUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 #include "Common/ThingTemplate.h"
@@ -59,7 +59,7 @@ EnemyNearUpdate::~EnemyNearUpdate( void )
 
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Look around us for enemies.
  */
 void EnemyNearUpdate::checkForEnemies( void )
@@ -115,7 +115,7 @@ void EnemyNearUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -139,7 +139,7 @@ void EnemyNearUpdate::xfer( Xfer *xfer )
 	// enemy near
 	xfer->xferBool( &m_enemyNear );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -150,4 +150,4 @@ void EnemyNearUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp
index df413ad986a..5a1c35f59c3 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES  //TheWeaponSlotTypeNamesLookupList
 
@@ -51,16 +51,11 @@
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/Module/BodyModule.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 FireOCLAfterWeaponCooldownUpdateModuleData::FireOCLAfterWeaponCooldownUpdateModuleData()
 {
-	m_weaponSlot						= PRIMARY_WEAPON; 
+	m_weaponSlot						= PRIMARY_WEAPON;
 	m_minShotsRequired			= 1;
 	m_oclLifetimePerSecond	= 1000;
 	m_oclMaxFrames					= 1000;
@@ -71,7 +66,7 @@ FireOCLAfterWeaponCooldownUpdateModuleData::FireOCLAfterWeaponCooldownUpdateModu
 void FireOCLAfterWeaponCooldownUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "WeaponSlot",						INI::parseLookupList,						TheWeaponSlotTypeNamesLookupList, offsetof( FireOCLAfterWeaponCooldownUpdateModuleData, m_weaponSlot ) },
 		{ "OCL",									INI::parseObjectCreationList,		NULL, offsetof( FireOCLAfterWeaponCooldownUpdateModuleData, m_ocl ) },
@@ -100,7 +95,7 @@ FireOCLAfterWeaponCooldownUpdate::~FireOCLAfterWeaponCooldownUpdate( void )
 
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime FireOCLAfterWeaponCooldownUpdate::update( void )
-{	
+{
 	const FireOCLAfterWeaponCooldownUpdateModuleData* data = getFireOCLAfterWeaponCooldownUpdateModuleData();
 	UpgradeMaskType activation, conflicting;
 	getUpgradeActivationMasks( activation, conflicting );
@@ -114,7 +109,7 @@ UpdateSleepTime FireOCLAfterWeaponCooldownUpdate::update( void )
 	{
 		if( weapon->getWeaponSlot() != data->m_weaponSlot )
 		{
-			//Not the right weapon slot -- it's possible we switched weapons in which case it's 
+			//Not the right weapon slot -- it's possible we switched weapons in which case it's
 			//possible to fire the OCL.
 			validThisFrame = false;
 		}
@@ -145,14 +140,14 @@ UpdateSleepTime FireOCLAfterWeaponCooldownUpdate::update( void )
 			m_consecutiveShots++;
 			if( m_consecutiveShots == 1 )
 			{
-				//Our first shot -- so record the frame number so we can easily calculate the 
+				//Our first shot -- so record the frame number so we can easily calculate the
 				//time we've been firing!
 				m_startFrame = now;
 			}
 		}
 		else if( weapon->getPossibleNextShotFrame() < now )
 		{
-			//Means we could have shot but didn't! 
+			//Means we could have shot but didn't!
 
 			if( data->m_minShotsRequired <= m_consecutiveShots )
 			{
@@ -173,12 +168,12 @@ UpdateSleepTime FireOCLAfterWeaponCooldownUpdate::update( void )
 	}
 
 	if( validThisFrame != m_valid )
-	{	
+	{
 		//There has been a validity change, so reset all values!
 		m_valid = validThisFrame;
 		resetStats();
 	}
-	
+
 	return UPDATE_SLEEP_NONE;
 }
 
@@ -219,7 +214,7 @@ void FireOCLAfterWeaponCooldownUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpgradeMux::upgradeMuxCRC( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -249,7 +244,7 @@ void FireOCLAfterWeaponCooldownUpdate::xfer( Xfer *xfer )
 	// start frame
 	xfer->xferUnsignedInt( &m_startFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -263,4 +258,4 @@ void FireOCLAfterWeaponCooldownUpdate::loadPostProcess( void )
 	// extend base class
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
index c004860d70b..82553422d93 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
@@ -49,9 +49,9 @@ class PartitionFilterFlammable : public PartitionFilter
 public:
 
 	PartitionFilterFlammable(){ }
-	
+
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterFlammable"; }
 #endif
 };
@@ -84,11 +84,11 @@ FireSpreadUpdateModuleData::FireSpreadUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void FireSpreadUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void FireSpreadUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "OCLEmbers",				INI::parseObjectCreationList,		NULL, offsetof( FireSpreadUpdateModuleData, m_oclEmbers ) },
 		{ "MinSpreadDelay",		INI::parseDurationUnsignedInt,	NULL, offsetof( FireSpreadUpdateModuleData, m_minSpreadTryDelayData ) },
@@ -131,17 +131,17 @@ UpdateSleepTime FireSpreadUpdate::update( void )
 			PartitionFilter *filters[] = { &fFilter, NULL };
 
 //			SimpleObjectIterator *iter = NULL;
-//			iter = ThePartitionManager->iterateObjectsInRange(getObject(), 
-//																									d->m_spreadTryRange, 
-//																									FROM_CENTER_3D, 
-//																									filters, 
+//			iter = ThePartitionManager->iterateObjectsInRange(getObject(),
+//																									d->m_spreadTryRange,
+//																									FROM_CENTER_3D,
+//																									filters,
 //																									ITER_SORTED_NEAR_TO_FAR
 //																									);
 //			MemoryPoolObjectHolder hold(iter);
 //			Object *objectToLight = iter->first();
 //
 // srj sez: the above code is stupid and slow. since we only want the closest object,
-// just ask for that; the above has to find ALL objects in range, but we ignore all 
+// just ask for that; the above has to find ALL objects in range, but we ignore all
 // but the first (closest).
 //
 			Object* objectToLight = ThePartitionManager->getClosestObject(getObject(), d->m_spreadTryRange, FROM_CENTER_3D, filters);
@@ -188,7 +188,7 @@ void FireSpreadUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -206,7 +206,7 @@ void FireSpreadUpdate::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -217,4 +217,4 @@ void FireSpreadUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireWeaponUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireWeaponUpdate.cpp
index 42c71e1c299..915540b4a8f 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireWeaponUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FireWeaponUpdate.cpp
@@ -28,18 +28,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/FireWeaponUpdate.h"
 #include "GameLogic/WeaponStatus.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 FireWeaponUpdateModuleData::FireWeaponUpdateModuleData()
@@ -48,11 +43,11 @@ FireWeaponUpdateModuleData::FireWeaponUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void FireWeaponUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void FireWeaponUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Weapon",	INI::parseWeaponTemplate,	NULL, offsetof( FireWeaponUpdateModuleData, m_weaponTemplate ) },
 		{ 0, 0, 0, 0 }
@@ -62,7 +57,7 @@ FireWeaponUpdateModuleData::FireWeaponUpdateModuleData()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-FireWeaponUpdate::FireWeaponUpdate( Thing *thing, const ModuleData* moduleData ) : 
+FireWeaponUpdate::FireWeaponUpdate( Thing *thing, const ModuleData* moduleData ) :
 	UpdateModule( thing, moduleData ),
 	m_weapon(NULL)
 {
@@ -78,8 +73,7 @@ FireWeaponUpdate::FireWeaponUpdate( Thing *thing, const ModuleData* moduleData )
 //-------------------------------------------------------------------------------------------------
 FireWeaponUpdate::~FireWeaponUpdate( void )
 {
-	if (m_weapon)
-		deleteInstance(m_weapon);
+	deleteInstance(m_weapon);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -116,7 +110,7 @@ void FireWeaponUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -137,7 +131,7 @@ void FireWeaponUpdate::xfer( Xfer *xfer )
 	// weapon
 	xfer->xferSnapshot( m_weapon );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -148,4 +142,4 @@ void FireWeaponUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FirestormDynamicGeometryInfoUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FirestormDynamicGeometryInfoUpdate.cpp
index 22b9d7f0848..72201fbcd5b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FirestormDynamicGeometryInfoUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FirestormDynamicGeometryInfoUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 
@@ -48,7 +48,7 @@
 //-------------------------------------------------------------------------------------------------
 FirestormDynamicGeometryInfoUpdateModuleData::FirestormDynamicGeometryInfoUpdateModuleData() : DynamicGeometryInfoUpdateModuleData()
 {
-	
+
 	for( Int i = 0; i < MAX_FIRESTORM_SYSTEMS; i++ )
 		m_particleSystem[ i ] = NULL;
 	m_fxList = NULL;
@@ -65,7 +65,7 @@ FirestormDynamicGeometryInfoUpdateModuleData::FirestormDynamicGeometryInfoUpdate
 {
 	DynamicGeometryInfoUpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DelayBetweenDamageFrames", INI::parseDurationReal, NULL, offsetof( FirestormDynamicGeometryInfoUpdateModuleData, m_delayBetweenDamageFrames ) },
 		{ "DamageAmount", INI::parseReal, NULL, offsetof( FirestormDynamicGeometryInfoUpdateModuleData, m_damageAmount ) },
@@ -97,14 +97,14 @@ FirestormDynamicGeometryInfoUpdateModuleData::FirestormDynamicGeometryInfoUpdate
 //-------------------------------------------------------------------------------------------------
 FirestormDynamicGeometryInfoUpdate::FirestormDynamicGeometryInfoUpdate( Thing *thing, const ModuleData* moduleData ) : DynamicGeometryInfoUpdate( thing, moduleData )
 {
-	
+
 	for( Int i = 0; i < MAX_FIRESTORM_SYSTEMS; i++ )
 		m_myParticleSystemID[ i ] = INVALID_PARTICLE_SYSTEM_ID;
 	m_effectsFired = FALSE;
 	m_scorchPlaced = FALSE;
 	m_lastDamageFrame = 0;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -117,7 +117,7 @@ FirestormDynamicGeometryInfoUpdate::~FirestormDynamicGeometryInfoUpdate( void )
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 {
-	
+
 	// extend functionality
 	DynamicGeometryInfoUpdate::update();
 
@@ -134,7 +134,7 @@ UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 		ParticleSystem *sys;
 
 		//
-		// construct a position to play the particle effects ... that is on the ground, but 
+		// construct a position to play the particle effects ... that is on the ground, but
 		// note that we add a small amount to it to avoid particles from the system (especially
 		// flat XY particles) from popping up through the terrain
 		//
@@ -154,9 +154,9 @@ UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 				sys->setPosition( &pos );
 				m_myParticleSystemID[ i ] = sys->getSystemID();
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		// do the FX list
 		FXList::doFXObj( modData->m_fxList, getObject() );
@@ -176,7 +176,7 @@ UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 		if( m_myParticleSystemID[ i ] )
 		{
 			ParticleSystem *sys = TheParticleSystemManager->findParticleSystem( m_myParticleSystemID[ i ] );
-		
+
 			if( sys )
 			{
 				ParticleSystemInfo::EmissionVolumeType type = sys->getEmisionVolumeType();
@@ -186,18 +186,18 @@ UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 				else if( type == ParticleSystemInfo::EmissionVolumeType::CYLINDER )
 					sys->setEmissionVolumeCylinderRadius( getObject()->getGeometryInfo().getMajorRadius() );
 
-			}  // end if
+			}
 			else
 			{
 
 				// this system not found (it probably died)... stop trying to find it in the future
 				m_myParticleSystemID[ i ] = INVALID_PARTICLE_SYSTEM_ID;
 
-			}  // end else
+			}
 
-		}  // end if
+		}
 
-	}  // end for, i
+	}
 
 	// when we first start running backward ... make a scorch mark
 	if( m_switchedDirections == TRUE && m_scorchPlaced == FALSE )
@@ -206,7 +206,7 @@ UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 		TheGameClient->addScorch( getObject()->getPosition(), modData->m_scorchSize, SCORCH_1 );
 		m_scorchPlaced = TRUE;
 
-	}  // end if
+	}
 
 	// scan and do some damage every once in a while
 	if( TheGameLogic->getFrame() - m_lastDamageFrame >= modData->m_delayBetweenDamageFrames )
@@ -215,7 +215,7 @@ UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 		doDamageScan();
 		m_lastDamageFrame = TheGameLogic->getFrame();
 
-	}  // end if
+	}
 
 	return UPDATE_SLEEP_NONE;
 }
@@ -247,7 +247,7 @@ void FirestormDynamicGeometryInfoUpdate::doDamageScan( void )
 	{
 		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( firestormPos,
 																																			 boundingCircle,
-																																			 FROM_BOUNDINGSPHERE_2D, 
+																																			 FROM_BOUNDINGSPHERE_2D,
 																																			 NULL );
 		MemoryPoolObjectHolder hold( iter );
 		Object *other;
@@ -260,11 +260,11 @@ void FirestormDynamicGeometryInfoUpdate::doDamageScan( void )
 			// do damage
 			other->attemptDamage( &damageInfo );
 
-		}  // end for, other
+		}
 
-	}  // end if, an boundingCircle radius exists
+	}
 
-}  // end doDamageScan
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -275,7 +275,7 @@ void FirestormDynamicGeometryInfoUpdate::crc( Xfer *xfer )
 	// extend base class
 	DynamicGeometryInfoUpdate::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -305,7 +305,7 @@ void FirestormDynamicGeometryInfoUpdate::xfer( Xfer *xfer )
 	// last damage frame
 	xfer->xferUnsignedInt( &m_lastDamageFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -316,4 +316,4 @@ void FirestormDynamicGeometryInfoUpdate::loadPostProcess( void )
 	// extend base class
 	DynamicGeometryInfoUpdate::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp
index cb4ccb710e3..e8e8f750e72 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioEventRTS.h"
 #include "Common/GameAudio.h"
@@ -47,20 +47,17 @@ FlammableUpdateModuleData::FlammableUpdateModuleData()
 	m_aflameDuration = 0;
 	m_aflameDamageDelay = 0;
 	m_aflameDamageAmount = 0;
-	// Enabled By Sadullah Nader
-	// Initialization needed
 	m_burningSoundName.clear();
-	//
 	m_flameDamageLimitData = 20.0f;
 	m_flameDamageExpirationDelay = LOGICFRAMES_PER_SECOND * 2;
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void FlammableUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void FlammableUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "BurnedDelay",						INI::parseDurationUnsignedInt,	NULL, offsetof( FlammableUpdateModuleData, m_burnedDelay ) },
 		{ "AflameDuration",					INI::parseDurationUnsignedInt,	NULL, offsetof( FlammableUpdateModuleData, m_aflameDuration ) },
@@ -84,6 +81,7 @@ FlammableUpdate::FlammableUpdate( Thing *thing, const ModuleData* moduleData ) :
 	m_damageEndFrame = 0;
 	m_audioHandle = NULL;
 	m_flameDamageLimit = getFlammableUpdateModuleData()->m_flameDamageLimitData;
+	m_flameSource = INVALID_ID;
 	m_lastFlameDamageDealt = 0;
 
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
@@ -110,7 +108,13 @@ void FlammableUpdate::onDamage( DamageInfo *damageInfo )
 			m_flameDamageLimit = getFlammableUpdateModuleData()->m_flameDamageLimitData;
 		}
 		m_lastFlameDamageDealt = now;
-		
+#if RETAIL_COMPATIBLE_CRC
+		m_flameSource = getObject()->getID();
+#else
+		// TheSuperHackers @bugfix Stubbjax 03/09/2025 Allow flame damage to award xp to the flame source.
+		m_flameSource = damageInfo->in.m_sourceID;
+#endif
+
 		Object *me = getObject();
 		if( !me->getStatusBits().test( OBJECT_STATUS_AFLAME ) && !me->getStatusBits().test( OBJECT_STATUS_BURNED ) )
 		{
@@ -180,7 +184,7 @@ UpdateSleepTime FlammableUpdate::calcSleepTime()
 		if (m_burnedEndFrame != 0 && m_burnedEndFrame < soonest && m_burnedEndFrame > now) soonest = m_burnedEndFrame;
 		if (m_damageEndFrame != 0 && m_damageEndFrame < soonest && m_damageEndFrame > now) soonest = m_damageEndFrame;
 		DEBUG_ASSERTCRASH(soonest - now > 0, ("hmm"));
-		// UPDATE_SLEEP requires a count-of-frames, not an absolute-frame, so subtract 'now' 
+		// UPDATE_SLEEP requires a count-of-frames, not an absolute-frame, so subtract 'now'
 		return UPDATE_SLEEP(soonest - now);
 	}
 	else
@@ -229,7 +233,7 @@ void FlammableUpdate::doAflameDamage()
 
 	DamageInfo info;
 	info.in.m_amount = data->m_aflameDamageAmount;
-	info.in.m_sourceID = getObject()->getID();
+	info.in.m_sourceID = m_flameSource;
 	info.in.m_damageType = DAMAGE_FLAME;
 	info.in.m_deathType = DEATH_BURNED;
 
@@ -276,7 +280,7 @@ void FlammableUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -287,7 +291,11 @@ void FlammableUpdate::xfer( Xfer *xfer )
 {
 
 	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
 	XferVersion currentVersion = 1;
+#else
+	XferVersion currentVersion = 2;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
@@ -312,7 +320,13 @@ void FlammableUpdate::xfer( Xfer *xfer )
 	// last flame damage dealt
 	xfer->xferUnsignedInt( &m_lastFlameDamageDealt );
 
-}  // end xfer
+#if !RETAIL_COMPATIBLE_XFER_SAVE
+	if (version >= 2)
+	{
+		xfer->xferObjectID(&m_flameSource);
+	}
+#endif
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -323,4 +337,4 @@ void FlammableUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp
index 670271cb3e4..4963527673c 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -40,11 +40,6 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // ------------------------------------------------------------------------------------------------
@@ -54,7 +49,7 @@ FloatUpdateModuleData::FloatUpdateModuleData( void )
 
 	m_enabled = FALSE;
 
-}  // end FloatUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -63,14 +58,14 @@ FloatUpdateModuleData::FloatUpdateModuleData( void )
 
 	UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Enabled",	INI::parseBool,	NULL, offsetof( FloatUpdateModuleData, m_enabled ) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -85,14 +80,14 @@ FloatUpdate::FloatUpdate( Thing *thing, const ModuleData *moduleData )
 	// save our initial enabled status based on INI settings
 	m_enabled = ((FloatUpdateModuleData *)moduleData)->m_enabled;
 
-}  // end FloatUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 FloatUpdate::~FloatUpdate( void )
 {
 
-}  // end ~FloatUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -105,7 +100,7 @@ UpdateSleepTime FloatUpdate::update( void )
 	{
 		// get object position
 		const Coord3D *pos = getObject()->getPosition();
-		
+
 		// get the height of the water here
 		Real waterZ;
 		TheTerrainLogic->isUnderwater( pos->x, pos->y, &waterZ );
@@ -134,12 +129,12 @@ UpdateSleepTime FloatUpdate::update( void )
 		mx.Rotate_Z(zRot);
 		mx.Rotate_Y(yaw);
 		mx.Rotate_X(pitch);
-		
+
 		draw->setInstanceMatrix(&mx);
 	}
 
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -150,7 +145,7 @@ void FloatUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -171,7 +166,7 @@ void FloatUpdate::xfer( Xfer *xfer )
 	// enabled
 	xfer->xferBool( &m_enabled );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -182,4 +177,4 @@ void FloatUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp
index 5cbf6cc7e9c..892d741695a 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
@@ -42,11 +42,6 @@
 #include "GameLogic/Module/HeightDieUpdate.h"
 #include "GameLogic/Module/PhysicsUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -60,16 +55,16 @@ HeightDieUpdateModuleData::HeightDieUpdateModuleData( void )
 	m_snapToGroundOnDeath = FALSE;
 	m_initialDelay = 0;
 
-}  // end HeightDieUpdateModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void HeightDieUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void HeightDieUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "TargetHeight", INI::parseReal, NULL, offsetof( HeightDieUpdateModuleData, m_targetHeightAboveTerrain ) },
 		{ "TargetHeightIncludesStructures", INI::parseBool, NULL, offsetof( HeightDieUpdateModuleData, m_targetHeightIncludesStructures ) },
@@ -83,7 +78,7 @@ void HeightDieUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -102,14 +97,14 @@ HeightDieUpdate::HeightDieUpdate( Thing *thing, const ModuleData* moduleData )
 	m_earliestDeathFrame = UINT_MAX;
 	// m_lastPosition = *thing->getPosition();
 
-}  // end HeightDieUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 HeightDieUpdate::~HeightDieUpdate( void )
 {
 
-}  // end ~HeightDieUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -133,7 +128,7 @@ UpdateSleepTime HeightDieUpdate::update( void )
 		// get outta here
 		return UPDATE_SLEEP_NONE;
 
-	}  // end if
+	}
 
 	// get the module data
 	const HeightDieUpdateModuleData *modData = getHeightDieUpdateModuleData();
@@ -151,11 +146,11 @@ UpdateSleepTime HeightDieUpdate::update( void )
 			if( pos->z >= m_lastPosition.z )
 				directionOK = FALSE;
 
-		}  // end fi
+		}
 
 		// get the terrain height
 		Real terrainHeightAtPos = TheTerrainLogic->getGroundHeight( pos->x, pos->y );
-		
+
 		// if including structures, check for bridges
 		if (modData->m_targetHeightIncludesStructures)
 		{
@@ -187,8 +182,8 @@ UpdateSleepTime HeightDieUpdate::update( void )
 			PartitionFilter *filters[] = { &filter1, NULL };
 			Real range = getObject()->getGeometryInfo().getBoundingCircleRadius();
 			ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( getObject(),
-																																				 range, 
-																																				 FROM_BOUNDINGSPHERE_3D, 
+																																				 range,
+																																				 FROM_BOUNDINGSPHERE_3D,
 																																				 filters );
 			MemoryPoolObjectHolder hold( iter );
 			Object *obj;
@@ -208,8 +203,8 @@ UpdateSleepTime HeightDieUpdate::update( void )
 				if( thisHeight > tallestHeight )
 					tallestHeight = thisHeight;
 
-			}  // end for obj
-			
+			}
+
 			//
 			// our target height is either the height above the terrain as specified by the INI
 			// entry for the object that has this update ... or it is the building height of the
@@ -218,14 +213,14 @@ UpdateSleepTime HeightDieUpdate::update( void )
 			if( tallestHeight > modData->m_targetHeightAboveTerrain )
 				targetHeight = tallestHeight + terrainHeightAtPos;
 
-		}  // end if
+		}
 
 		// if we are below the target height ... DIE!
 		if( pos->z < targetHeight && directionOK )
 		{
 
 			// if we're supposed to snap us to the ground on death do so
-			// AND: even if we're not snapping to ground, be sure we don't go BELOW ground 
+			// AND: even if we're not snapping to ground, be sure we don't go BELOW ground
 			if( modData->m_snapToGroundOnDeath || pos->z < terrainHeightAtPos )
 			{
 				Coord3D ground;
@@ -243,9 +238,9 @@ UpdateSleepTime HeightDieUpdate::update( void )
 			// we have died ... don't do this again
 			m_hasDied = TRUE;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	//
 	// if our height is below the destroy attached particles height above the terrain, clean
@@ -260,14 +255,14 @@ UpdateSleepTime HeightDieUpdate::update( void )
 		// don't do this again
 		m_particlesDestroyed = TRUE;
 
-	}  // end if
+	}
 
 	// save our current position as the last position we monitored
 	m_lastPosition = *pos;
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -278,12 +273,12 @@ void HeightDieUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: m_earliestDeathFrame
 */
 // ------------------------------------------------------------------------------------------------
@@ -312,7 +307,7 @@ void HeightDieUpdate::xfer( Xfer *xfer )
 	else
 		m_earliestDeathFrame = 0;
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -323,4 +318,4 @@ void HeightDieUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp
index 98ecd1ce6d1..57057173a94 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/GlobalData.h"
@@ -55,24 +55,16 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( void )
 {
-	//Added By Sadullah Nader
-	//Initializations missing and needed
 	m_attachParticleBone.clear();
 	m_bladeBone.clear();
 	m_bladeObjectName.clear();
 	m_finalRubbleObject.clear();
-	//
 
 	m_spiralOrbitTurnRate = 0.0f;
 	m_spiralOrbitForwardSpeed = 0.0f;
@@ -99,15 +91,15 @@ HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( vo
 	m_delayFromGroundToFinalDeath = 0;
 	m_maxBraking = 99999.0f;
 
-}  // end HelicopterSlowDeathBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void HelicopterSlowDeathBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p ) 
+/*static*/ void HelicopterSlowDeathBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
   SlowDeathBehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SpiralOrbitTurnRate",	INI::parseAngularVelocityReal, NULL, offsetof( HelicopterSlowDeathBehaviorModuleData, m_spiralOrbitTurnRate ) },
 		{ "SpiralOrbitForwardSpeed", INI::parseVelocityReal, NULL, offsetof( HelicopterSlowDeathBehaviorModuleData, m_spiralOrbitForwardSpeed ) },
@@ -142,7 +134,7 @@ HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( vo
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Helicopter slow death update ///////////////////////////////////////////////////////////////////
@@ -170,14 +162,14 @@ HelicopterSlowDeathBehavior::HelicopterSlowDeathBehavior( Thing *thing, const Mo
 	m_bladeFlyOffFrame = 0;
 	m_hitGroundFrame = 0;
 
-}  // end HelicopterSlowDeathBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 HelicopterSlowDeathBehavior::~HelicopterSlowDeathBehavior( void )
 {
 
-}  // end ~HelicopterSlowDeathBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -188,7 +180,7 @@ void HelicopterSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 	SlowDeathBehavior::beginSlowDeath( damageInfo );
 
 	// stop the current movement sound
-	if (getObject()->getDrawable()) 
+	if (getObject()->getDrawable())
 	{
 		getObject()->getDrawable()->stopAmbientSound();
 	}
@@ -197,7 +189,7 @@ void HelicopterSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 	const HelicopterSlowDeathBehaviorModuleData *modData = getHelicopterSlowDeathBehaviorModuleData();
 
 	m_deathSound = modData->m_deathSound;
-	
+
 	if (m_deathSound.getEventName().isEmpty() == false)
 	{
 		m_deathSound.setObjectID(getObject()->getID());
@@ -223,7 +215,7 @@ void HelicopterSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 
 	// start our self spinning at the min self spin rate
 	m_selfSpin = modData->m_minSelfSpin;
-	
+
 	// we will start off changing the self spin towards the MaxSelfSpin
 	m_selfSpinTowardsMax = TRUE;
 
@@ -242,7 +234,7 @@ void HelicopterSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 		ParticleSystem *pSys = TheParticleSystemManager->createParticleSystem( modData->m_attachParticleSystem );
 		if( pSys )
 		{
-			
+
 			// where do the offset attachment to
 			if( modData->m_attachParticleBone.isEmpty() == FALSE )
 			{
@@ -255,27 +247,27 @@ void HelicopterSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 					if( draw->getPristineBonePositions( modData->m_attachParticleBone.str(), 0, &pos, NULL, 1 ) )
 						pSys->setPosition( &pos );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
 				// use location coord specified ... it will be zero if not given which is center of obj anyway
 				pSys->setPosition( &modData->m_attachParticleLoc );
 
-			}  // end else
+			}
 
 			// attach the particle system to the object
 			pSys->attachToObject( getObject() );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 
 
-}  // end beginSlowDeath
+}
 
 
 
@@ -325,7 +317,7 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 			if( m_selfSpinTowardsMax == TRUE )
 			{
 
-				// we're going towards the max self spin, increase it		
+				// we're going towards the max self spin, increase it
 				m_selfSpin += modData->m_selfSpinUpdateAmount / LOGICFRAMES_PER_SECOND;
 				if( m_selfSpin > modData->m_maxSelfSpin )
 				{
@@ -333,12 +325,12 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 					m_selfSpin = modData->m_maxSelfSpin;  // cap at max
 					m_selfSpinTowardsMax = FALSE;					// now start changing spin towards min again
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
-			
+
 				// we're going towards the min self spin, decrease it
 				m_selfSpin -= modData->m_selfSpinUpdateAmount / LOGICFRAMES_PER_SECOND;
 				if( m_selfSpin < modData->m_minSelfSpin )
@@ -347,18 +339,18 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 					m_selfSpin = modData->m_minSelfSpin;  // cap at min
 					m_selfSpinTowardsMax = TRUE;					// now start chaning spin towards max again
 
-				}  // end if
+				}
 
-			}  // end else
+			}
 
 			// we have made a change to the self spinning
 			m_lastSelfSpinUpdateFrame = TheGameLogic->getFrame();
 
-		}  // end if
+		}
 
 		// get the physics update module
 		PhysicsBehavior *physics = copter->getPhysics();
-		DEBUG_ASSERTCRASH( physics, ("HelicopterSlowDeathBehavior: object '%s' does not have a physics module\n", 
+		DEBUG_ASSERTCRASH( physics, ("HelicopterSlowDeathBehavior: object '%s' does not have a physics module",
 																 copter->getTemplate()->getName().str()) );
 
 		//
@@ -395,17 +387,17 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 					draw->getPristineBonePositions( modData->m_bladeBone.str(), 0, &bladePos, NULL, 1 );
 					draw->convertBonePosToWorldPos( &bladePos, NULL, &bladePos, NULL );
 
-				}  // end if
-		
+				}
+
 				// create the blades flying through the air
 	//			const ObjectCreationList *ocl = TheObjectCreationListStore->findObjectCreationList( "OCL_ComancheBlades" );
 	//			ObjectCreationList::create( ocl, &bladePos );
-		
+
 				// run the fx at the blade position
 				FXList::doFXPos( modData->m_fxBlade, &bladePos );
 				ObjectCreationList::create( modData->m_oclBlade, copter, &bladePos, NULL );
 
-				//				
+				//
 				// if we have (potentially) a pilot ejection, do it here.
 				// note that we call EjectPilotDie::ejectPilot() rather than ObjectCreationList::create(),
 				// because the former makes the right sounds, and also constrains to veteran-or-better status.
@@ -413,11 +405,11 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 				if( modData->m_oclEjectPilot && copter->getVeterancyLevel() > LEVEL_REGULAR )
 					EjectPilotDie::ejectPilot( modData->m_oclEjectPilot, copter, NULL );
 
-			}  // end if
+			}
 
-		}  // endif
+		}
 
-	}  // end if, not on ground
+	}
 
 
 
@@ -451,7 +443,7 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 
 		if (pos->z <= ground + 1.0f || hitATree )
 		{
-			
+
 			// mark the frame we hit the ground on
 			m_hitGroundFrame = TheGameLogic->getFrame();
 
@@ -470,11 +462,11 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 			// Stop the sound from playing.
 			TheAudio->removeAudioEvent(m_deathSound.getPlayingHandle());
 
-		}  // end if
+		}
 	}
 
 	// if we're on the ground, see if it's time for our final boom
-	if( m_hitGroundFrame && 
+	if( m_hitGroundFrame &&
 			TheGameLogic->getFrame() - m_hitGroundFrame > modData->m_delayFromGroundToFinalDeath )
 	{
 
@@ -490,16 +482,16 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 
 			rubble->setTransformMatrix( copter->getTransformMatrix() );
 
-		}  // end if
+		}
 
 		// destroy the copter finally
 		TheGameLogic->destroyObject( copter );
 
-	}  // end if
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -510,7 +502,7 @@ void HelicopterSlowDeathBehavior::crc( Xfer *xfer )
 	// extend base class
 	SlowDeathBehavior::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -552,7 +544,7 @@ void HelicopterSlowDeathBehavior::xfer( Xfer *xfer )
 	// hit ground frame
 	xfer->xferUnsignedInt( &m_hitGroundFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -563,4 +555,4 @@ void HelicopterSlowDeathBehavior::loadPostProcess( void )
 	// extend base class
 	SlowDeathBehavior::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HijackerUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HijackerUpdate.cpp
index d8b29182f72..c71120c2557 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HijackerUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HijackerUpdate.cpp
@@ -24,15 +24,15 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //
-// FILE: HijackerUpdate.cpp 
+// FILE: HijackerUpdate.cpp
 // Author: Mark Lorenzen, July 2002
-// Desc:   Allows hijacker to kepp with his hijacked vehicle (though hidden) until it dies, then 
+// Desc:   Allows hijacker to kepp with his hijacked vehicle (though hidden) until it dies, then
 // to become a hijacker once more
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingFactory.h"
@@ -59,7 +59,7 @@ HijackerUpdate::HijackerUpdate( Thing *thing, const ModuleData *moduleData ) : U
 	m_ejectPos.zero();
 //	m_ejectPilotDMI = NULL;
 }
-  
+
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 HijackerUpdate::~HijackerUpdate( void )
@@ -90,7 +90,7 @@ UpdateSleepTime HijackerUpdate::update( void )
 			obj->setPosition( target->getPosition() );
 			m_wasTargetAirborne = target->isSignificantlyAboveTerrain();
 			m_ejectPos = *target->getPosition();
-			
+
 			// So, if while I am driving this American war vehicle, I gain skill points, I get to keep them when I wreck the vehicle
 			ExperienceTracker *targetExp = target->getExperienceTracker();
 			ExperienceTracker *jackerExp = obj->getExperienceTracker();
@@ -110,7 +110,7 @@ UpdateSleepTime HijackerUpdate::update( void )
 				//THIS BLOCK RESTORES HIJACKER TO PARTITION MANAGER AND UNHIDES HIM
 				ThePartitionManager->registerObject( obj );
 
-				if( obj->getDrawable() ) 
+				if( obj->getDrawable() )
 				{
 					// so it is time to unhide ourselves and be a pedestrian hijacker again
 					obj->getDrawable()->setDrawableHidden( false );
@@ -146,14 +146,14 @@ UpdateSleepTime HijackerUpdate::update( void )
 				}
 
 
-			}// end if (! hostVehicleHasEjection)
+			}
 
-			setTargetObject( NULL ); 
+			setTargetObject( NULL );
 			setIsInVehicle( FALSE );
 			setUpdate( FALSE );
 			m_wasTargetAirborne = false;
 
-		}// end if( target )
+		}
 
 	}
 	else	// not in vehicle
@@ -210,7 +210,7 @@ void HijackerUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -243,7 +243,7 @@ void HijackerUpdate::xfer( Xfer *xfer )
 	// was target airborne
 	xfer->xferBool( &m_wasTargetAirborne );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -258,4 +258,4 @@ void HijackerUpdate::loadPostProcess( void )
 	Object *obj = TheGameLogic->findObjectByID( m_targetID );
 	setTargetObject( obj );
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
index 57b71869bae..9d1be6984d3 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_HORDEACTION_NAMES
 #include "Common/Player.h"
@@ -47,11 +47,6 @@
 //-------------------------------------------------------------------------------------------------
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 static HordeUpdateInterface* getHUI(Object* obj)
@@ -78,8 +73,8 @@ class PartitionFilterHordeMember : public PartitionFilter
 public:
 
 	PartitionFilterHordeMember(Object* obj, const HordeUpdateModuleData* data) : m_obj(obj), m_data(data) { }
-	
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterHordeMember"; }
 #endif
 
@@ -118,14 +113,15 @@ class PartitionFilterHordeMember : public PartitionFilter
 const Int DEFAULT_UPDATE_RATE = LOGICFRAMES_PER_SECOND;
 
 //-------------------------------------------------------------------------------------------------
-HordeUpdateModuleData::HordeUpdateModuleData() :
-	m_updateRate(DEFAULT_UPDATE_RATE),
-  m_minCount(0),
-  m_minDist(0.0f),
-	m_rubOffRadius(20.0f),
-	m_alliesOnly(true),
-	m_exactMatch(false),
-	m_action(HORDEACTION_HORDE)
+HordeUpdateModuleData::HordeUpdateModuleData()
+	: m_updateRate(DEFAULT_UPDATE_RATE)
+	, m_minCount(0)
+	, m_minDist(0.0f)
+	, m_rubOffRadius(20.0f)
+	, m_alliesOnly(true)
+	, m_exactMatch(false)
+	, m_allowedNationalism(TRUE)
+	, m_action(HORDEACTION_DEFAULT)
 {
 }
 
@@ -134,7 +130,7 @@ HordeUpdateModuleData::HordeUpdateModuleData() :
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "UpdateRate", INI::parseDurationUnsignedInt, NULL, offsetof(HordeUpdateModuleData, m_updateRate) },
 		{ "KindOf", KindOfMaskType::parseFromINI, NULL, offsetof(HordeUpdateModuleData, m_kindof) },
@@ -145,6 +141,7 @@ HordeUpdateModuleData::HordeUpdateModuleData() :
 		{ "ExactMatch", INI::parseBool, NULL, offsetof(HordeUpdateModuleData, m_exactMatch) },
 		{ "Action", INI::parseIndexList, TheHordeActionTypeNames, offsetof(HordeUpdateModuleData, m_action) },
 		{ "FlagSubObjectNames", INI::parseAsciiStringVector, NULL, offsetof(HordeUpdateModuleData, m_flagSubObjNames) },
+		{ "AllowedNationalism", INI::parseBool, NULL, offsetof(HordeUpdateModuleData, m_allowedNationalism) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
@@ -160,10 +157,7 @@ HordeUpdate::HordeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateM
 	m_inHorde = FALSE;
 	m_hasFlag = FALSE;
 	m_lastHordeRefreshFrame = TheGameLogic->getFrame();
-	// Added By Sadullah Nader
-	// Initializations missing and needed
 	m_trueHordeMember = FALSE;
-	//
 
 	UnsignedInt delay = getHordeUpdateModuleData()->m_updateRate;
 	setWakeFrame(getObject(), UPDATE_SLEEP(GameLogicRandomValue(1, delay)));
@@ -175,10 +169,17 @@ HordeUpdate::~HordeUpdate()
 
 }
 
+//-------------------------------------------------------------------------------------------------
+Bool HordeUpdate::isAllowedNationalism() const
+{
+	const HordeUpdateModuleData *data = getHordeUpdateModuleData();
+	return data->m_allowedNationalism;
+}
+
 //-------------------------------------------------------------------------------------------------
 /** @todo I think we should model the horde list ... so we can do all this without doing
   * all this scanning, plus we can give exactly 1 flag to the right person in the
-	* center of the horde which I think would look better (CBD) 
+	* center of the horde which I think would look better (CBD)
 	*
 	* Redesign occurred 10/15, where the flags have been removed replaced by a teraindecal for each horde member
 	* Thank You for reading, MLorenzen
@@ -186,36 +187,22 @@ HordeUpdate::~HordeUpdate()
 // ------------------------------------------------------------------------------------------------
 void HordeUpdate::joinOrLeaveHorde(SimpleObjectIterator *iter, Bool join)
 {
-	Bool prevInHorde = m_inHorde;
-
-	m_inHorde = join;
-
-
-
-
-	const HordeUpdateModuleData* d = getHordeUpdateModuleData();
-	switch (d->m_action)
+	// give/remove bonus effects
+	if( m_inHorde != join )
 	{
-		case HORDEACTION_HORDE:
-			{
-
-				// give/remove bonus effects
-				if( prevInHorde != m_inHorde )
-				{
-					AIUpdateInterface *ai = getObject()->getAIUpdateInterface();
-
-					if( ai )
-						ai->evaluateMoraleBonus();
-					else
-						DEBUG_CRASH(( "HordeUpdate::joinOrLeaveHorde - We (%s) must have an AI to benefit from horde\n",
-													getObject()->getTemplate()->getName().str() ));
-				}  // end if
+		m_inHorde = join;
 
-			}
-			break;
+		if( AIUpdateInterface *ai = getObject()->getAIUpdateInterface() )
+		{
+			const HordeUpdateModuleData* md = getHordeUpdateModuleData();
+			ai->evaluateMoraleBonus(m_inHorde, md->m_allowedNationalism, md->m_action);
+		}
+		else
+		{
+			DEBUG_CRASH(( "HordeUpdate::joinOrLeaveHorde - We (%s) must have an AI to benefit from horde",
+										getObject()->getTemplate()->getName().str() ));
+		}
 	}
-
-
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -237,7 +224,7 @@ void HordeUpdate::showHideFlag(Bool show)
 
 //-------------------------------------------------------------------------------------------------
 /**
-	this is called whenever a drawable is bound to the object. 
+	this is called whenever a drawable is bound to the object.
 	drawable is NOT guaranteed to be non-null.
 */
 void HordeUpdate::onDrawableBoundToObject()
@@ -262,13 +249,13 @@ UpdateSleepTime HordeUpdate::update( void )
 	Bool wasInHorde = m_inHorde;
 
 	// This is a sticky situation, where refreshing the model state (like from default to damaged, for example)
-	// will rebuild the terraindecal and set its size to the default size.... since Vehicles have a special size,
-	// we want to keep it fresh, here, but not do the horde-ing test every frame...
+	// will rebuild the terrain decal and set its size to the default size.... since Vehicles have a special size,
+	// we want to keep it fresh, here, but not do the hording test every frame...
 	Bool isInfantry = ( obj->isKindOf(KINDOF_INFANTRY) );
 	if ( isInfantry || (TheGameLogic->getFrame() > m_lastHordeRefreshFrame + md->m_updateRate) )
 	{
 		m_lastHordeRefreshFrame = TheGameLogic->getFrame();
-		
+
 		PartitionFilterHordeMember hmFilter(getObject(), md);
 		PartitionFilter *filters[] = { &hmFilter, NULL };
 		SimpleObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(getObject(), md->m_minDist, FROM_BOUNDINGSPHERE_3D, filters);
@@ -304,22 +291,22 @@ UpdateSleepTime HordeUpdate::update( void )
 
 		AIUpdateInterface *ai = getObject()->getAIUpdateInterface();
 		if( ai )
-			ai->evaluateMoraleBonus();
+			ai->evaluateMoraleBonus(m_inHorde, md->m_allowedNationalism, md->m_action);
 
 	}
 
 
 
-	
+
 
 
 	// This is a sticky situation, where refreshing the model state (like from default to damaged, for example)
-	// will rebuild the terraindecal and set its size to the default size.... since Vehicles have a special size,
-	// we want to keep it fresh, here, but not do the horde-ing test every frame...
-	// This is a weak solution, in that It causes this update to fight the defualt behavior of the modelstate methods,
-	// But in the interest of not breaking the modelstate changing logic for five hundred other units a week before golden, 
+	// will rebuild the terrain decal and set its size to the default size.... since Vehicles have a special size,
+	// we want to keep it fresh, here, but not do the hording test every frame...
+	// This is a weak solution, in that It causes this update to fight the default behavior of the model state methods,
+	// But in the interest of not breaking the model state changing logic for five hundred other units a week before golden,
 	// this is my solution... If anyone gets this note on the next project... please please please, fix the resetting of the
-	// shadows/terraindecals in W3DModelDraw. THanks, ML
+	// shadows/terrain decals in W3DModelDraw. Thanks, ML
 
 	Drawable* draw = getObject()->getDrawable();
 	if ( draw && ! obj->isEffectivelyDead() )
@@ -328,7 +315,7 @@ UpdateSleepTime HordeUpdate::update( void )
 		{
 			if(m_inHorde && !obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )// this not is a ride-on for overlord
 			{
-				
+
 				TerrainDecalType nuType;// uninitialized
 
 				if ( isInfantry )
@@ -384,7 +371,7 @@ void HordeUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -402,13 +389,10 @@ void HordeUpdate::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-	// in horder
 	xfer->xferBool( &m_inHorde );
-
-	// has flag
 	xfer->xferBool( &m_hasFlag );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -419,4 +403,4 @@ void HordeUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp
index 90a69e20a3c..8b4a9b4ed72 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp
@@ -28,8 +28,9 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/GameUtility.h"
 #include "Common/Xfer.h"
 #include "Common/DrawModule.h"
 #include "GameClient/Drawable.h"
@@ -52,7 +53,7 @@ LaserUpdateModuleData::LaserUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MuzzleParticleSystem",		INI::parseAsciiString,	NULL, offsetof( LaserUpdateModuleData, m_particleSystemName ) },
 		{ "TargetParticleSystem",		INI::parseAsciiString,  NULL, offsetof( LaserUpdateModuleData, m_targetParticleSystemName ) },
@@ -81,15 +82,12 @@ LaserRadiusUpdate::LaserRadiusUpdate()
 //-------------------------------------------------------------------------------------------------
 LaserUpdate::LaserUpdate( Thing *thing, const ModuleData* moduleData ) : ClientUpdateModule( thing, moduleData )
 {
-	//Added By Sadullah Nader
-	//Initialization missing and needed
 	m_dirty = FALSE;
 	m_endPos.zero();
 	m_startPos.zero();
-	//
 	m_particleSystemID = INVALID_PARTICLE_SYSTEM_ID;
 	m_targetParticleSystemID = INVALID_PARTICLE_SYSTEM_ID;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -217,7 +215,7 @@ void LaserUpdate::initLaser( const Object *parent, const Coord3D *startPos, cons
 				// failed to find the required bone, so just die
 				TheGameClient->destroyDrawable( getDrawable() );
 				return;
-			}				
+			}
 		}
 		else
 		{
@@ -226,7 +224,7 @@ void LaserUpdate::initLaser( const Object *parent, const Coord3D *startPos, cons
 				// failed to find the required bone, so just die
 				TheGameClient->destroyDrawable( getDrawable() );
 				return;
-			}				
+			}
 		}
 	}
 	else if( startPos )
@@ -244,7 +242,7 @@ void LaserUpdate::initLaser( const Object *parent, const Coord3D *startPos, cons
 	//Compute endPos
 	if( endPos != NULL )
 	{
-		// just use what they gave, no override here 
+		// just use what they gave, no override here
 		m_endPos = *endPos;
 	}
 	else
@@ -331,7 +329,7 @@ Real LaserUpdate::getTemplateLaserRadius() const
 		{
 			//***NOTE***
 			//While it appears the logic is accessing client data, it is actually accessing template module
-			//data from the client. This value is INI constant thus can't change. It's grouped with other 
+			//data from the client. This value is INI constant thus can't change. It's grouped with other
 			//laser defining attributes and having it there makes it easier for artists.
 			return ldi->getLaserTemplateWidth();
 		}
@@ -354,7 +352,7 @@ void LaserUpdate::crc( Xfer *xfer )
 	// extend base class
 	ClientUpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -389,7 +387,7 @@ void LaserUpdate::xfer( Xfer *xfer )
 
 	m_laserRadius.xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -400,4 +398,4 @@ void LaserUpdate::loadPostProcess( void )
 	// extend base class
 	ClientUpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp
index 998e52fd813..c56333c9616 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
@@ -36,21 +36,13 @@
 #include "GameLogic/Module/LifetimeUpdate.h"
 #include "GameLogic/Object.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 LifetimeUpdate::LifetimeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 	const LifetimeUpdateModuleData* d = getLifetimeUpdateModuleData();
-	// Added By Sadullah Nader
-	// Initializations needed
 	m_dieFrame = 0;
-	//
 	UnsignedInt delay;
 	if( getObject()->isKindOf( KINDOF_HULK ) && TheGameLogic->getHulkMaxLifetimeOverride() != -1 )
 	{
@@ -106,7 +98,7 @@ void LifetimeUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -127,7 +119,7 @@ void LifetimeUpdate::xfer( Xfer *xfer )
 	// die frame
 	xfer->xferUnsignedInt( &m_dieFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -138,4 +130,4 @@ void LifetimeUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp
index f19fe7ada9d..c1bcc533ca8 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   Update will change model state conditions based on special power state
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/GlobalData.h"
@@ -41,11 +41,6 @@
 #include "GameClient/Drawable.h"
 #include "GameClient/FXList.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 MissileLauncherBuildingUpdate::MissileLauncherBuildingUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
@@ -55,16 +50,16 @@ MissileLauncherBuildingUpdate::MissileLauncherBuildingUpdate( Thing *thing, cons
 	m_timeoutFrame = 0;
 	m_openIdleAudio = getMissileLauncherBuildingUpdateModuleData()->m_openIdleAudio;
 	m_openIdleAudio.setObjectID(getObject()->getID());
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 MissileLauncherBuildingUpdate::~MissileLauncherBuildingUpdate( void )
 {
-	if (m_openIdleAudio.isCurrentlyPlaying()) 
+	if (m_openIdleAudio.isCurrentlyPlaying())
 	{
 		TheAudio->removeAudioEvent(m_openIdleAudio.getPlayingHandle());
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
@@ -78,7 +73,7 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 	switch (dst)
 	{
 		case DOOR_CLOSED:
-			DEBUG_LOG(("switch to state DOOR_CLOSED at %d\n",now));
+			DEBUG_LOG(("switch to state DOOR_CLOSED at %d",now));
 			/// @todo srj -- for now, this assumes at most one door
 			clr.set(MODELCONDITION_DOOR_1_WAITING_TO_CLOSE);
 			clr.set(MODELCONDITION_DOOR_1_CLOSING);
@@ -91,14 +86,14 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 				const Coord3D *pos = getObject()->getPosition();
 				FXList::doFXPos(d->m_closedFX, pos);
 			}
-			if (m_openIdleAudio.isCurrentlyPlaying()) 
+			if (m_openIdleAudio.isCurrentlyPlaying())
 			{
 				TheAudio->removeAudioEvent(m_openIdleAudio.getPlayingHandle());
 			}
 			break;
 
 		case DOOR_OPENING:
-			DEBUG_LOG(("switch to state DOOR_OPENING at %d\n",now));
+			DEBUG_LOG(("switch to state DOOR_OPENING at %d",now));
 			/// @todo srj -- for now, this assumes at most one door
 			clr.set(MODELCONDITION_DOOR_1_WAITING_TO_CLOSE);
 			clr.set(MODELCONDITION_DOOR_1_CLOSING);
@@ -113,14 +108,14 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 				const Coord3D *pos = getObject()->getPosition();
 				FXList::doFXPos(d->m_openingFX, pos);
 			}
-			if (m_openIdleAudio.isCurrentlyPlaying()) 
+			if (m_openIdleAudio.isCurrentlyPlaying())
 			{
 				TheAudio->removeAudioEvent(m_openIdleAudio.getPlayingHandle());
 			}
 			break;
 
 		case DOOR_OPEN:
-			DEBUG_LOG(("switch to state DOOR_OPEN at %d\n",now));
+			DEBUG_LOG(("switch to state DOOR_OPEN at %d",now));
 			/// @todo srj -- for now, this assumes at most one door
 			clr.set(MODELCONDITION_DOOR_1_WAITING_TO_CLOSE);
 			clr.set(MODELCONDITION_DOOR_1_CLOSING);
@@ -140,7 +135,7 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 			break;
 
 		case DOOR_WAITING_TO_CLOSE:
-			DEBUG_LOG(("switch to state DOOR_WAITING_TO_CLOSE at %d\n",now));
+			DEBUG_LOG(("switch to state DOOR_WAITING_TO_CLOSE at %d",now));
 			/// @todo srj -- for now, this assumes at most one door
 			clr.set(MODELCONDITION_DOOR_1_CLOSING);
 			clr.set(MODELCONDITION_DOOR_1_OPENING);
@@ -153,14 +148,14 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 				const Coord3D *pos = getObject()->getPosition();
 				FXList::doFXPos(d->m_waitingToCloseFX, pos);
 			}
-			if (m_openIdleAudio.isCurrentlyPlaying()) 
+			if (m_openIdleAudio.isCurrentlyPlaying())
 			{
 				TheAudio->removeAudioEvent(m_openIdleAudio.getPlayingHandle());
 			}
 			break;
 
 		case DOOR_CLOSING:
-			DEBUG_LOG(("switch to state DOOR_CLOSING at %d\n",now));
+			DEBUG_LOG(("switch to state DOOR_CLOSING at %d",now));
 			/// @todo srj -- for now, this assumes at most one door
 			clr.set(MODELCONDITION_DOOR_1_WAITING_TO_CLOSE);
 			clr.set(MODELCONDITION_DOOR_1_WAITING_OPEN);
@@ -180,7 +175,7 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 				const Coord3D *pos = getObject()->getPosition();
 				FXList::doFXPos(d->m_closingFX, pos);
 			}
-			if (m_openIdleAudio.isCurrentlyPlaying()) 
+			if (m_openIdleAudio.isCurrentlyPlaying())
 			{
 				TheAudio->removeAudioEvent(m_openIdleAudio.getPlayingHandle());
 			}
@@ -205,7 +200,7 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 //-------------------------------------------------------------------------------------------------
 Bool MissileLauncherBuildingUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions )
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	DEBUG_ASSERTCRASH(!TheGlobalData->m_specialPowerUsesDelay || m_doorState == DOOR_OPEN, ("door is not fully open when specialpower is fired!"));
 #endif
 
@@ -217,7 +212,7 @@ Bool MissileLauncherBuildingUpdate::initiateIntentToDoSpecialPower( const Specia
 Bool MissileLauncherBuildingUpdate::isPowerCurrentlyInUse( const CommandButton *command ) const
 {
 	//@todo -- Implement me in such a way that it still works with Ctrl+s cheat key...
-	//In fact, this code doesn't really care because in legit mode, the game will 
+	//In fact, this code doesn't really care because in legit mode, the game will
 	//never require this check to disable the cameo button.
 	return false;
 }
@@ -228,7 +223,7 @@ UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
 	const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();
 
 	UnsignedInt now = TheGameLogic->getFrame();
-	
+
 	// If we are under construction, any decision we make about door status could be wrong.
 	// Our special power module is randomly going to be initialized or not (which would result
 	// in him reporting a 0 frame ready, which means we will start open).
@@ -240,7 +235,7 @@ UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
 		m_specialPowerModule = getObject()->getSpecialPowerModule(d->m_specialPowerTemplate);
 		DEBUG_ASSERTCRASH(m_specialPowerModule, ("Missing special power"));
 	}
-	
+
 	if (m_specialPowerModule)
 	{
 		UnsignedInt readyFrame = m_specialPowerModule->getReadyFrame();
@@ -251,13 +246,13 @@ UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
 			switchToState(m_timeoutState);
 		}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		DEBUG_ASSERTCRASH(!TheGlobalData->m_specialPowerUsesDelay || !(m_specialPowerModule->isReady() && m_doorState != DOOR_OPEN), ("door is not fully open when specialpower is ready!"));
 #endif
 
 		if (m_doorState != DOOR_OPEN && m_specialPowerModule->isReady())
 		{
-			DEBUG_LOG(("*** had to POP the door open!\n"));
+			DEBUG_LOG(("*** had to POP the door open!"));
 			switchToState(DOOR_OPEN);
 		}
 		else if (m_doorState == DOOR_CLOSED && now >= whenToStartOpening)
@@ -284,7 +279,7 @@ void MissileLauncherBuildingUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -314,7 +309,7 @@ void MissileLauncherBuildingUpdate::xfer( Xfer *xfer )
 	// timeout frame
 	xfer->xferUnsignedInt( &m_timeoutFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -325,4 +320,4 @@ void MissileLauncherBuildingUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MobMemberSlavedUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MobMemberSlavedUpdate.cpp
index 48a3a4971fc..071f32af641 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MobMemberSlavedUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/MobMemberSlavedUpdate.cpp
@@ -29,13 +29,12 @@
 // Desc:  Slaved unit(s) remain close to their master. Used by angry Mob members (various)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/InGameUI.h"// selection logic
 #include "GameClient/Drawable.h"
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
-#include "GameClient/Drawable.h"
 #include "GameClient/ParticleSys.h"
 #include "GameLogic/AIPathfind.h"
 #include "GameLogic/Damage.h"
@@ -48,18 +47,11 @@
 #include "GameLogic/Module/BodyModule.h"
 #include "GameLogic/Module/MobMemberSlavedUpdate.h"
 #include "GameLogic/Module/SpawnBehavior.h"
-#include "GameClient/InGameUI.h"// selection logic
-#include "GameClient/Drawable.h"
 #include "Common/ThingFactory.h"
-#include "Common/ThingTemplate.h" 
+#include "Common/ThingTemplate.h"
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 #define STRAY_MULTIPLIER 2.0f // Multiplier from stating diestance from tunnel, to max distance from
@@ -78,7 +70,7 @@ MobMemberSlavedUpdate::MobMemberSlavedUpdate( Thing *thing, const ModuleData* mo
 	m_personalColor.red = GameLogicRandomValueReal( 0.2f, 0.4f );
 	m_personalColor.green = GameLogicRandomValueReal( 0.2f, 0.4f );
 	m_personalColor.blue = GameLogicRandomValueReal( 0.2f, 0.4f );
-	
+
 //	Drawable *myDraw = getObject()->getDrawable();
 //	if ( myDraw )
 //		myDraw->colorTint( &m_personalColor );
@@ -92,12 +84,12 @@ MobMemberSlavedUpdate::MobMemberSlavedUpdate( Thing *thing, const ModuleData* mo
 	// MDC: moving to GameLogicRandomValue.  This does not need to be synced, but having it so makes searches *so* much nicer.
 	//getObject()->getDrawable()->setInstanceScale(GameLogicRandomValueReal( 5.0f, 1.5f ));
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 MobMemberSlavedUpdate::~MobMemberSlavedUpdate( void )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void MobMemberSlavedUpdate::onObjectCreated()
@@ -128,7 +120,7 @@ void MobMemberSlavedUpdate::onSlaverDamage( const DamageInfo *info )
 	if( ai )
 		ai->aiGoProne( info, CMD_FROM_AI );
 }
- 
+
 
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime MobMemberSlavedUpdate::update( void )
@@ -138,7 +130,7 @@ UpdateSleepTime MobMemberSlavedUpdate::update( void )
 	const MobMemberSlavedUpdateModuleData* data = getMobMemberSlavedUpdateModuleData();
 	Object *me = getObject();
 	if( !me )
-	{ 
+	{
 		return UPDATE_SLEEP_NONE;
 	}
 
@@ -146,7 +138,7 @@ UpdateSleepTime MobMemberSlavedUpdate::update( void )
 	if( master == NULL )
 	{
 		stopSlavedEffects();
-		
+
 		//TheGameLogic->destroyObject( me );
 		me->kill();
 		return UPDATE_SLEEP_NONE;	// you cannot return SLEEP_FOREVER unless you make yourself sleepy...
@@ -186,10 +178,10 @@ UpdateSleepTime MobMemberSlavedUpdate::update( void )
 
 	if ( ++m_framesToWait < 16)
 		return UPDATE_SLEEP_NONE;
-	
+
 	m_framesToWait = 0;
 
-	
+
 	Locomotor *locomotor = myAI->getCurLocomotor();
 	if( !locomotor )
 	{
@@ -230,7 +222,7 @@ UpdateSleepTime MobMemberSlavedUpdate::update( void )
 			{
 				myAI->aiMoveToPosition( master->getPosition(), CMD_FROM_AI ); // NASTY BEEHIVE EFFECT
 			}
-			else 
+			else
 			{
 				Coord3D goalDelta = *myAI->getGoalPosition();
 				goalDelta.sub( &nuPos );
@@ -240,7 +232,7 @@ UpdateSleepTime MobMemberSlavedUpdate::update( void )
 					myAI->aiMoveToPosition( &nuPos, CMD_FROM_AI ); // Whither thou goest... THis causes the mob to reconverge
 				}
 			}
-				
+
 																															// on the fly, instead of doubling back to reconverge
 		}
 		else // master is still, so let's re group in a hurry
@@ -286,19 +278,19 @@ UpdateSleepTime MobMemberSlavedUpdate::update( void )
 		m_catchUpCrisisTimer = 0; // I'm not too far from the nexus this frame
 
 		Int seed = GameLogicRandomValue( 0, 10 );
-		if ( seed == 1 ) 
+		if ( seed == 1 )
 			myAI->chooseLocomotorSet(LOCOMOTORSET_WANDER);
-		else if ( seed == 2 ) 
-			myAI->chooseLocomotorSet(LOCOMOTORSET_PANIC); 
-		else if ( seed == 3 ) 
-			myAI->chooseLocomotorSet(LOCOMOTORSET_NORMAL); 
+		else if ( seed == 2 )
+			myAI->chooseLocomotorSet(LOCOMOTORSET_PANIC);
+		else if ( seed == 3 )
+			myAI->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 	//	else if ( seed >= 5 ) // go towards mommy's goal
 	//	{
 	//		Coord3D destination = *me->getPosition();
 	//		TheAI->pathfinder()->adjustToPossibleDestination(me, myAI->getLocomotorSet(), &destination);
 	//		myAI->aiMoveToPosition( &destination, CMD_FROM_AI ); // reconverge
 	//	}
-		
+
 	}
 	else // give me something to do while I'm standing here...
 	{
@@ -390,7 +382,7 @@ void MobMemberSlavedUpdate::startSlavedEffects( const Object *slaver )
 		return;
 
 	m_slaver = slaver->getID();
-	
+
 	// mark selves as not selectable
 	//getObject()->setStatus( OBJECT_STATUS_UNSELECTABLE );
 
@@ -415,7 +407,7 @@ void MobMemberSlavedUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -453,11 +445,11 @@ void MobMemberSlavedUpdate::xfer( Xfer *xfer )
 
 	// is self tasking
 	xfer->xferBool( &m_isSelfTasking );
-	
+
 	// catch up crisis timer
   xfer->xferUnsignedInt( &m_catchUpCrisisTimer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -468,4 +460,4 @@ void MobMemberSlavedUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileSlowDeathUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileSlowDeathUpdate.cpp
index aada4f5f551..c7b1b9abfa1 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileSlowDeathUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileSlowDeathUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameState.h"
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -53,7 +53,7 @@
 // ------------------------------------------------------------------------------------------------
 NeutronMissileSlowDeathBehaviorModuleData::NeutronMissileSlowDeathBehaviorModuleData( void )
 {
-	
+
 	for( Int i = 0; i < MAX_NEUTRON_BLASTS; ++i )
 	{
 
@@ -67,11 +67,11 @@ NeutronMissileSlowDeathBehaviorModuleData::NeutronMissileSlowDeathBehaviorModule
 		m_blastInfo[ i ].toppleSpeed = 0.0f;
 		m_blastInfo[ i ].pushForceMag = 0.0f;
 
-	}  // end for i
+	}
 	m_scorchSize = 0.0f;
 	m_fxList		 = NULL;
 
-}  // end NeutronMissileSlowDeathBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -80,98 +80,98 @@ NeutronMissileSlowDeathBehaviorModuleData::NeutronMissileSlowDeathBehaviorModule
 
   SlowDeathBehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
-		{ "ScorchMarkSize", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_scorchSize ) },	
+		{ "ScorchMarkSize", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_scorchSize ) },
 		{ "FXList",					INI::parseFXList, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_fxList ) },
 
-		{ "Blast1Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].enabled ) },	
-		{ "Blast1Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].delay ) },	
-		{ "Blast1ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].scorchDelay ) },	
-		{ "Blast1InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].innerRadius ) },	
-		{ "Blast1OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].outerRadius ) },	
-		{ "Blast1MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].maxDamage ) },	
-		{ "Blast1MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].minDamage ) },	
+		{ "Blast1Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].enabled ) },
+		{ "Blast1Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].delay ) },
+		{ "Blast1ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].scorchDelay ) },
+		{ "Blast1InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].innerRadius ) },
+		{ "Blast1OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].outerRadius ) },
+		{ "Blast1MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].maxDamage ) },
+		{ "Blast1MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].minDamage ) },
 		{ "Blast1ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].toppleSpeed ) },
 		{ "Blast1PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].pushForceMag ) },
 
-		{ "Blast2Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].enabled ) },	
-		{ "Blast2Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].delay ) },	
-		{ "Blast2ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].scorchDelay ) },	
-		{ "Blast2InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].innerRadius ) },	
-		{ "Blast2OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].outerRadius ) },	
-		{ "Blast2MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].maxDamage ) },	
-		{ "Blast2MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].minDamage ) },	
+		{ "Blast2Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].enabled ) },
+		{ "Blast2Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].delay ) },
+		{ "Blast2ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].scorchDelay ) },
+		{ "Blast2InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].innerRadius ) },
+		{ "Blast2OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].outerRadius ) },
+		{ "Blast2MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].maxDamage ) },
+		{ "Blast2MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].minDamage ) },
 		{ "Blast2ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].toppleSpeed ) },
 		{ "Blast2PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].pushForceMag ) },
 
-		{ "Blast3Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].enabled ) },	
-		{ "Blast3Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].delay ) },	
-		{ "Blast3ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].scorchDelay ) },	
-		{ "Blast3InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].innerRadius ) },	
-		{ "Blast3OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].outerRadius ) },	
-		{ "Blast3MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].maxDamage ) },	
-		{ "Blast3MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].minDamage ) },	
+		{ "Blast3Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].enabled ) },
+		{ "Blast3Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].delay ) },
+		{ "Blast3ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].scorchDelay ) },
+		{ "Blast3InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].innerRadius ) },
+		{ "Blast3OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].outerRadius ) },
+		{ "Blast3MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].maxDamage ) },
+		{ "Blast3MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].minDamage ) },
 		{ "Blast3ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].toppleSpeed ) },
 		{ "Blast3PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].pushForceMag ) },
 
-		{ "Blast4Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].enabled ) },	
-		{ "Blast4Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].delay ) },	
-		{ "Blast4ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].scorchDelay ) },	
-		{ "Blast4InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].innerRadius ) },	
-		{ "Blast4OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].outerRadius ) },	
-		{ "Blast4MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].maxDamage ) },	
-		{ "Blast4MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].minDamage ) },	
+		{ "Blast4Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].enabled ) },
+		{ "Blast4Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].delay ) },
+		{ "Blast4ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].scorchDelay ) },
+		{ "Blast4InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].innerRadius ) },
+		{ "Blast4OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].outerRadius ) },
+		{ "Blast4MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].maxDamage ) },
+		{ "Blast4MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].minDamage ) },
 		{ "Blast4ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].toppleSpeed ) },
 		{ "Blast4PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].pushForceMag ) },
 
-		{ "Blast5Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].enabled ) },	
-		{ "Blast5Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].delay ) },	
-		{ "Blast5ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].scorchDelay ) },	
-		{ "Blast5InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].innerRadius ) },	
-		{ "Blast5OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].outerRadius ) },	
-		{ "Blast5MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].maxDamage ) },	
-		{ "Blast5MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].minDamage ) },	
+		{ "Blast5Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].enabled ) },
+		{ "Blast5Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].delay ) },
+		{ "Blast5ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].scorchDelay ) },
+		{ "Blast5InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].innerRadius ) },
+		{ "Blast5OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].outerRadius ) },
+		{ "Blast5MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].maxDamage ) },
+		{ "Blast5MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].minDamage ) },
 		{ "Blast5ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].toppleSpeed ) },
 		{ "Blast5PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].pushForceMag ) },
 
-		{ "Blast6Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].enabled ) },	
-		{ "Blast6Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].delay ) },	
-		{ "Blast6ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].scorchDelay ) },			
-		{ "Blast6InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].innerRadius ) },	
-		{ "Blast6OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].outerRadius ) },	
-		{ "Blast6MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].maxDamage ) },	
-		{ "Blast6MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].minDamage ) },	
+		{ "Blast6Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].enabled ) },
+		{ "Blast6Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].delay ) },
+		{ "Blast6ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].scorchDelay ) },
+		{ "Blast6InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].innerRadius ) },
+		{ "Blast6OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].outerRadius ) },
+		{ "Blast6MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].maxDamage ) },
+		{ "Blast6MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].minDamage ) },
 		{ "Blast6ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].toppleSpeed ) },
 		{ "Blast6PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].pushForceMag ) },
 
-		{ "Blast7Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].enabled ) },	
-		{ "Blast7Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].delay ) },	
-		{ "Blast7ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].scorchDelay ) },			
-		{ "Blast7InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].innerRadius ) },	
-		{ "Blast7OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].outerRadius ) },	
-		{ "Blast7MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].maxDamage ) },	
-		{ "Blast7MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].minDamage ) },	
+		{ "Blast7Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].enabled ) },
+		{ "Blast7Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].delay ) },
+		{ "Blast7ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].scorchDelay ) },
+		{ "Blast7InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].innerRadius ) },
+		{ "Blast7OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].outerRadius ) },
+		{ "Blast7MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].maxDamage ) },
+		{ "Blast7MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].minDamage ) },
 		{ "Blast7ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].toppleSpeed ) },
 		{ "Blast7PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].pushForceMag ) },
 
-		{ "Blast8Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].enabled ) },	
-		{ "Blast8Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].delay ) },	
-		{ "Blast8ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].scorchDelay ) },			
-		{ "Blast8InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].innerRadius ) },	
-		{ "Blast8OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].outerRadius ) },	
-		{ "Blast8MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].maxDamage ) },	
-		{ "Blast8MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].minDamage ) },	
+		{ "Blast8Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].enabled ) },
+		{ "Blast8Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].delay ) },
+		{ "Blast8ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].scorchDelay ) },
+		{ "Blast8InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].innerRadius ) },
+		{ "Blast8OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].outerRadius ) },
+		{ "Blast8MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].maxDamage ) },
+		{ "Blast8MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].minDamage ) },
 		{ "Blast8ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].toppleSpeed ) },
 		{ "Blast8PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].pushForceMag ) },
 
-		{ "Blast9Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].enabled ) },	
-		{ "Blast9Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].delay ) },	
-		{ "Blast9ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].scorchDelay ) },			
-		{ "Blast9InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].innerRadius ) },	
-		{ "Blast9OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].outerRadius ) },	
-		{ "Blast9MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].maxDamage ) },	
-		{ "Blast9MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].minDamage ) },	
+		{ "Blast9Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].enabled ) },
+		{ "Blast9Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].delay ) },
+		{ "Blast9ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].scorchDelay ) },
+		{ "Blast9InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].innerRadius ) },
+		{ "Blast9OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].outerRadius ) },
+		{ "Blast9MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].maxDamage ) },
+		{ "Blast9MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].minDamage ) },
 		{ "Blast9ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].toppleSpeed ) },
 		{ "Blast9PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].pushForceMag ) },
 
@@ -180,7 +180,7 @@ NeutronMissileSlowDeathBehaviorModuleData::NeutronMissileSlowDeathBehaviorModule
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -188,7 +188,7 @@ NeutronMissileSlowDeathBehaviorModuleData::NeutronMissileSlowDeathBehaviorModule
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-NeutronMissileSlowDeathBehavior::NeutronMissileSlowDeathBehavior( Thing *thing, const ModuleData *moduleData ) 
+NeutronMissileSlowDeathBehavior::NeutronMissileSlowDeathBehavior( Thing *thing, const ModuleData *moduleData )
 															: SlowDeathBehavior( thing, moduleData )
 {
 	Int i;
@@ -201,16 +201,16 @@ NeutronMissileSlowDeathBehavior::NeutronMissileSlowDeathBehavior( Thing *thing,
 		m_completedBlasts[ i ] = FALSE;
 		m_completedScorchBlasts[ i ] = FALSE;
 
-	}  // end for i
+	}
 
-}  // end NeutronMissileSlowDeathBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 NeutronMissileSlowDeathBehavior::~NeutronMissileSlowDeathBehavior( void )
 {
 
-}  // end ~NeutronMissileSlowDeathBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -245,7 +245,7 @@ UpdateSleepTime NeutronMissileSlowDeathBehavior::update( void )
 		m_activationFrame = currFrame;
 
 		FXList::doFXPos( modData->m_fxList, &pos );
-	}  // end if
+	}
 
 	// see if it's time for any explosions
 	for( Int i = 0; i < MAX_NEUTRON_BLASTS; i++ )
@@ -257,7 +257,7 @@ UpdateSleepTime NeutronMissileSlowDeathBehavior::update( void )
 
 		// has the time of this blast come
 		if( m_completedBlasts[ i ] == FALSE &&
-				(currFrame - m_activationFrame > modData->m_blastInfo[ i ].delay) ) 
+				(currFrame - m_activationFrame > modData->m_blastInfo[ i ].delay) )
 		{
 
 			// do the blast
@@ -266,7 +266,7 @@ UpdateSleepTime NeutronMissileSlowDeathBehavior::update( void )
 			// mark this blast as complete now
 			m_completedBlasts[ i ] = TRUE;
 
-		}  // end if
+		}
 
 		// has the time for a scorch blast come
 		if( m_completedScorchBlasts[ i ] == FALSE &&
@@ -279,13 +279,13 @@ UpdateSleepTime NeutronMissileSlowDeathBehavior::update( void )
 			// mark this scorch blast as complete now
 			m_completedScorchBlasts[ i ] = TRUE;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do a single blast for the bomb */
@@ -316,7 +316,7 @@ void NeutronMissileSlowDeathBehavior::doBlast( const BlastInfo *blastInfo )
 	{
 		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( missilePos,
 																																			 blastInfo->outerRadius,
-																																			 FROM_CENTER_2D, 
+																																			 FROM_CENTER_2D,
 																																			 NULL );
 		MemoryPoolObjectHolder hold( iter );
 		Object *other;
@@ -335,7 +335,7 @@ void NeutronMissileSlowDeathBehavior::doBlast( const BlastInfo *blastInfo )
 			forceVector.z = otherPos->z - missilePos->z;
 
 			// try to topple other object
-			other->topple( &forceVector, blastInfo->toppleSpeed, TOPPLE_OPTIONS_NO_BOUNCE | 
+			other->topple( &forceVector, blastInfo->toppleSpeed, TOPPLE_OPTIONS_NO_BOUNCE |
 																													 TOPPLE_OPTIONS_NO_FX );
 
 			//
@@ -356,8 +356,8 @@ void NeutronMissileSlowDeathBehavior::doBlast( const BlastInfo *blastInfo )
 				if( damageInfo.in.m_amount < blastInfo->minDamage )
 					damageInfo.in.m_amount = blastInfo->minDamage;
 
-			}  // end else
-					
+			}
+
 			// do actual damage
 			if( damageInfo.in.m_amount )
 			{
@@ -372,9 +372,9 @@ void NeutronMissileSlowDeathBehavior::doBlast( const BlastInfo *blastInfo )
 					TheGameClient->addScorch( missilePos, modData->m_scorchSize, SCORCH_1 );
 					m_scorchPlaced = TRUE;
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
 /*
 			// apply a small force to the object from the shockwave center
@@ -397,14 +397,14 @@ void NeutronMissileSlowDeathBehavior::doBlast( const BlastInfo *blastInfo )
 				// apply the force
 				physics->applyForce( &physicsForce );
 
-			}  // end if, physics
+			}
 */
 
-		}  // end for, other
+		}
 
-	}  // end if, an outer radius exists
-		
-}  // end doBlast
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do a scorch blast event ... this doesn't do actual damage, but it "scorches" things */
@@ -428,13 +428,13 @@ void NeutronMissileSlowDeathBehavior::doScorchBlast( const BlastInfo *blastInfo
 	{
 		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( missilePos,
 																																			 blastInfo->outerRadius,
-																																			 FROM_CENTER_2D, 
+																																			 FROM_CENTER_2D,
 																																			 NULL );
 		MemoryPoolObjectHolder hold( iter );
 		Object *other;
 		for( other = iter->first(); other; other = iter->next() )
 		{
-					
+
 			// set things aflame
 			///@todo can't to this now, flames eat too many particles
 	//		static NameKeyType flammableKey = NAMEKEY( "FlammableUpdate" );
@@ -453,13 +453,13 @@ void NeutronMissileSlowDeathBehavior::doScorchBlast( const BlastInfo *blastInfo
 				if( draw )
 					draw->setShadowsEnabled( FALSE );
 
-			}  // end if
+			}
 
-		}  // end for, other
+		}
 
-	}  // end if, outer radius exists
+	}
 
-}  // end doScorchBlast
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -470,7 +470,7 @@ void NeutronMissileSlowDeathBehavior::crc( Xfer *xfer )
 	// extend base class
 	SlowDeathBehavior::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -497,10 +497,10 @@ void NeutronMissileSlowDeathBehavior::xfer( Xfer *xfer )
 	if( maxNeutronBlasts != MAX_NEUTRON_BLASTS )
 	{
 
-		DEBUG_CRASH(( "NeutronMissileSlowDeathBehavior::xfer - Size of MAX_NEUTRON_BLASTS has changed, you must version this xfer code and then you can remove this error message\n" ));
+		DEBUG_CRASH(( "NeutronMissileSlowDeathBehavior::xfer - Size of MAX_NEUTRON_BLASTS has changed, you must version this xfer code and then you can remove this error message" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// completed blasts
 	UnsignedByte i;
@@ -514,7 +514,7 @@ void NeutronMissileSlowDeathBehavior::xfer( Xfer *xfer )
 	// scorch placed
 	xfer->xferBool( &m_scorchPlaced );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -525,4 +525,4 @@ void NeutronMissileSlowDeathBehavior::loadPostProcess( void )
 	// extend base class
 	SlowDeathBehavior::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileUpdate.cpp
index 6160db52fab..f7f728ab4ec 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileUpdate.cpp
@@ -26,7 +26,7 @@
 // Author: Michael S. Booth, December 2001
 // Desc:   Implementation of missile behavior
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/Thing.h"
@@ -76,7 +76,7 @@ void NeutronMissileUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DistanceToTravelBeforeTurning",	INI::parseReal,		NULL, offsetof( NeutronMissileUpdateModuleData, m_initialDist ) },
 		{ "MaxTurnRate",			INI::parseAngularVelocityReal,		NULL, offsetof( NeutronMissileUpdateModuleData, m_maxTurnRate ) },
@@ -126,7 +126,7 @@ NeutronMissileUpdate::NeutronMissileUpdate( Thing *thing, const ModuleData* modu
 
 	m_exhaustSysTmpl = NULL;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 NeutronMissileUpdate::~NeutronMissileUpdate( void )
@@ -215,7 +215,7 @@ void NeutronMissileUpdate::doLaunch( void )
 		if (!launcher->getDrawable() ||
 			!launcher->getDrawable()->getProjectileLaunchOffset(m_attach_wslot, m_attach_specificBarrelToUse, &attachTransform, TURRET_INVALID, NULL))
 		{
-			DEBUG_CRASH(("ProjectileLaunchPos %d %d not found!\n",m_attach_wslot, m_attach_specificBarrelToUse));
+			DEBUG_CRASH(("ProjectileLaunchPos %d %d not found!",m_attach_wslot, m_attach_specificBarrelToUse));
 			attachTransform.Make_Identity();
 		}
 
@@ -230,7 +230,7 @@ void NeutronMissileUpdate::doLaunch( void )
 
 		//
 		// the missile on the raising up launch platform is actually 45 degrees from the missile
-		// that is flying around the world ... we want to rotate it "on end and in place" so 
+		// that is flying around the world ... we want to rotate it "on end and in place" so
 		// that we don't see any decals on the side of the missile 'pop' to the new angle
 		/// @todo, this should not be a hard coded value ... I love demos!!!
 		//
@@ -263,7 +263,7 @@ void NeutronMissileUpdate::doLaunch( void )
 	getObject()->setPosition( &pos );
 
 	FXList::doFXObj(getNeutronMissileUpdateModuleData()->m_ignitionFX, getObject());
-	
+
 	if (m_exhaustSysTmpl != NULL)
 		TheParticleSystemManager->createAttachedParticleSystemID(m_exhaustSysTmpl, getObject());
 
@@ -338,7 +338,7 @@ void NeutronMissileUpdate::doAttack( void )
 
 	if (getNeutronMissileUpdateModuleData()->m_targetFromDirectlyAbove && m_reachedIntermediatePos)
 		speed *= STRAIGHT_DOWN_SLOW_FACTOR;
-	
+
 	// if we're still in the no-turning-time, OR if we're out of fuel
 	if (m_noTurnDistLeft > 0.0f)
 	{
@@ -365,7 +365,7 @@ void NeutronMissileUpdate::doAttack( void )
 	Vector3 trueDir = mx.Get_X_Vector();
 	trueDir.Normalize();
 
-	// 
+	//
 	// Move forward along forward direction
 	//
 	Real damping = getNeutronMissileUpdateModuleData()->m_forwardDamping;
@@ -417,9 +417,9 @@ void NeutronMissileUpdate::doAttack( void )
 	pos.y += m_vel.y;
 	pos.z += m_vel.z;
 
-//DEBUG_LOG(("vel %f accel %f z %f\n",m_vel.length(),m_accel.length(), pos.z));
+//DEBUG_LOG(("vel %f accel %f z %f",m_vel.length(),m_accel.length(), pos.z));
 //Real vm = sqrt(m_vel.x*m_vel.x+m_vel.y*m_vel.y+m_vel.z*m_vel.z);
-//DEBUG_LOG(("vel is %f %f %f (%f)\n",m_vel.x,m_vel.y,m_vel.z,vm));
+//DEBUG_LOG(("vel is %f %f %f (%f)",m_vel.x,m_vel.y,m_vel.z,vm));
 	getObject()->setTransformMatrix( &mx );
 	getObject()->setPosition( &pos );
 
@@ -484,7 +484,7 @@ UpdateSleepTime NeutronMissileUpdate::update( void )
 			Real vel = m_vel.length();
 			m_vel.x = 0;
 			m_vel.y = 0;
-			m_vel.z = -vel * STRAIGHT_DOWN_SLOW_FACTOR;	
+			m_vel.z = -vel * STRAIGHT_DOWN_SLOW_FACTOR;
 
 		}
 	}
@@ -513,7 +513,7 @@ UpdateSleepTime NeutronMissileUpdate::update( void )
 	{
 		Coord3D newPos = *getObject()->getPosition();
 		Real distThisTurn = sqrt(sqr(newPos.x-oldPos.x) + sqr(newPos.y-oldPos.y) + sqr(newPos.z-oldPos.z));
-		//DEBUG_LOG(("noTurnDist goes from %f to %f\n",m_noTurnDistLeft,m_noTurnDistLeft-distThisTurn));
+		//DEBUG_LOG(("noTurnDist goes from %f to %f",m_noTurnDistLeft,m_noTurnDistLeft-distThisTurn));
 		m_noTurnDistLeft -= distThisTurn;
 	}
 
@@ -538,7 +538,7 @@ void NeutronMissileUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -619,16 +619,16 @@ void NeutronMissileUpdate::xfer( Xfer *xfer )
 			if( m_exhaustSysTmpl == NULL )
 			{
 
-				DEBUG_CRASH(( "NeutronMissileUpdate::xfer - Unable to find particle system '%s'\n", name.str() ));
+				DEBUG_CRASH(( "NeutronMissileUpdate::xfer - Unable to find particle system '%s'", name.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -639,4 +639,4 @@ void NeutronMissileUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/OCLUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/OCLUpdate.cpp
index 6d9aef10c6b..ae5549043f2 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/OCLUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/OCLUpdate.cpp
@@ -49,11 +49,11 @@ OCLUpdateModuleData::OCLUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void OCLUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void OCLUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "OCL",					INI::parseObjectCreationList,		NULL, offsetof( OCLUpdateModuleData, m_ocl ) },
 		{ "MinDelay",			INI::parseDurationUnsignedInt,	NULL, offsetof( OCLUpdateModuleData, m_minDelay ) },
@@ -82,6 +82,17 @@ OCLUpdate::~OCLUpdate( void )
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime OCLUpdate::update( void )
 {
+#if !RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix dizzyj/Caball009/Mauller 14/07/2025 prevent triggering supply drop when subdued while under construction
+	// When the construction is finished, we allow the timer to be initialized and then start shifting the timer while subdued
+	if ( m_timerStartedFrame > 0 && getObject()->isDisabled() )
+	{
+		m_nextCreationFrame++;
+		m_timerStartedFrame++;
+		return UPDATE_SLEEP_NONE;
+	}
+#endif
+
 /// @todo srj use SLEEPY_UPDATE here
 	if( shouldCreate() )
 	{
@@ -122,7 +133,7 @@ Bool OCLUpdate::shouldCreate()
 // ------------------------------------------------------------------------------------------------
 void OCLUpdate::setNextCreationFrame()
 {
-	UnsignedInt delay = GameLogicRandomValue( getOCLUpdateModuleData()->m_minDelay, 
+	UnsignedInt delay = GameLogicRandomValue( getOCLUpdateModuleData()->m_minDelay,
 																						getOCLUpdateModuleData()->m_maxDelay );
 	m_timerStartedFrame = TheGameLogic->getFrame();
 	m_nextCreationFrame = m_timerStartedFrame + delay;
@@ -156,7 +167,7 @@ void OCLUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -180,7 +191,7 @@ void OCLUpdate::xfer( Xfer *xfer )
 	// timer stated frame
 	xfer->xferUnsignedInt( &m_timerStartedFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -191,4 +202,4 @@ void OCLUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
index 55610d153f3..ad7614d1f13 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
@@ -27,12 +27,13 @@
 // Desc:   Update module to handle building states and weapon firing of the particle uplink cannon.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_DAMAGE_NAMES
 #define DEFINE_DEATH_NAMES
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "Common/GameUtility.h"
 #include "Common/ThingTemplate.h"
 #include "Common/ThingFactory.h"
 #include "Common/Player.h"
@@ -58,11 +59,6 @@
 #include "GameLogic/Module/PhysicsUpdate.h"
 #include "GameLogic/Module/ActiveBody.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
@@ -91,11 +87,8 @@ ParticleUplinkCannonUpdateModuleData::ParticleUplinkCannonUpdateModuleData()
   m_manualDrivingSpeed						= 0.0f;
   m_manualFastDrivingSpeed				= 0.0f;
   m_doubleClickToFastDriveDelay		= 500;
-	//Added by Sadullah Nader
-	//Initializations inserted
 	m_swathOfDeathAmplitude					= 0.0f;
 	m_swathOfDeathDistance					=	0.0f;
-	//
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -103,7 +96,7 @@ ParticleUplinkCannonUpdateModuleData::ParticleUplinkCannonUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SpecialPowerTemplate",									INI::parseSpecialPowerTemplate,	NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_specialPowerTemplate ) },
     { "BeginChargeTime",											INI::parseDurationUnsignedInt,	NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_beginChargeFrames ) },
@@ -113,7 +106,7 @@ ParticleUplinkCannonUpdateModuleData::ParticleUplinkCannonUpdateModuleData()
 		{ "BeamTravelTime",												INI::parseDurationUnsignedInt,	NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_beamTravelFrames ) },
 		{ "TotalFiringTime",											INI::parseDurationUnsignedInt,  NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_totalFiringFrames ) },
 		{ "RevealRange",													INI::parseReal,									NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_revealRange ) },
-		
+
 		{ "OuterEffectBoneName",									INI::parseAsciiString,					NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_outerEffectBaseBoneName ) },
 		{ "OuterEffectNumBones",									INI::parseUnsignedInt,					NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_outerEffectNumBones ) },
 		{ "OuterNodesLightFlareParticleSystem",		INI::parseAsciiString,					NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_outerNodesLightFlareParticleSystemName ) },
@@ -143,8 +136,8 @@ ParticleUplinkCannonUpdateModuleData::ParticleUplinkCannonUpdateModuleData()
 
 		{ "DamagePerSecond",											INI::parseReal,									NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_damagePerSecond ) },
 		{ "TotalDamagePulses",										INI::parseUnsignedInt,					NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_totalDamagePulses ) },
-		{ "DamageType",														INI::parseIndexList,						TheDamageNames,	offsetof( ParticleUplinkCannonUpdateModuleData, m_damageType ) },		
-		{ "DeathType",														INI::parseIndexList,						TheDeathNames,	offsetof( ParticleUplinkCannonUpdateModuleData, m_deathType ) },		
+		{ "DamageType",														INI::parseIndexList,						TheDamageNames,	offsetof( ParticleUplinkCannonUpdateModuleData, m_damageType ) },
+		{ "DeathType",														INI::parseIndexList,						TheDeathNames,	offsetof( ParticleUplinkCannonUpdateModuleData, m_deathType ) },
 		{ "DamageRadiusScalar",										INI::parseReal,									NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_damageRadiusScalar ) },
 
 		{ "PoweringUpSoundLoop",									INI::parseAsciiString,					NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_powerupSoundName ) },
@@ -202,7 +195,7 @@ ParticleUplinkCannonUpdate::ParticleUplinkCannonUpdate( Thing *thing, const Modu
 		m_outerNodePositions[ i ].zero();
 		m_outerNodeOrientations[ i ].Make_Identity();
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -280,6 +273,8 @@ Bool ParticleUplinkCannonUpdate::initiateIntentToDoSpecialPower(const SpecialPow
 
 	if( !BitIsSet( commandOptions, COMMAND_FIRED_BY_SCRIPT ) )
 	{
+		DEBUG_ASSERTCRASH(targetPos, ("Particle Cannon target data must not be NULL"));
+
 		//All human players have manual control and must "drive" the beam around!
 		m_startAttackFrame = TheGameLogic->getFrame();
 		m_laserStatus = LASERSTATUS_NONE;
@@ -290,14 +285,17 @@ Bool ParticleUplinkCannonUpdate::initiateIntentToDoSpecialPower(const SpecialPow
 	}
 	else
 	{
+		DEBUG_ASSERTCRASH(targetPos, ("Particle Cannon target data must not be NULL"));
+
 		//All computer controlled players have automatic control -- the "S" curve.
 		UnsignedInt now = TheGameLogic->getFrame();
-   	m_initialTargetPosition.set( targetPos );
-   	m_startAttackFrame = max( now, (UnsignedInt)1 );
-   	m_laserStatus = LASERSTATUS_NONE;
+		m_initialTargetPosition.set( targetPos );
+		m_startAttackFrame = max( now, (UnsignedInt)1 );
+		m_laserStatus = LASERSTATUS_NONE;
 		setLogicalStatus( STATUS_READY_TO_FIRE );
 		m_specialPowerModule->setReadyFrame( now );
 	}
+
 	m_startDecayFrame = m_startAttackFrame + data->m_totalFiringFrames;
 
 	SpecialPowerModuleInterface *spmInterface = getObject()->getSpecialPowerModule( specialPowerTemplate );
@@ -321,11 +319,11 @@ Bool ParticleUplinkCannonUpdate::isPowerCurrentlyInUse( const CommandButton *com
 
 //-------------------------------------------------------------------------------------------------
 void ParticleUplinkCannonUpdate::setSpecialPowerOverridableDestination( const Coord3D *loc )
-{ 
+{
 	if( !getObject()->isDisabled() )
 	{
-		m_overrideTargetDestination = *loc; 
-		m_manualTargetMode = true; 
+		m_overrideTargetDestination = *loc;
+		m_manualTargetMode = true;
 		m_2ndLastDrivingClickFrame = m_lastDrivingClickFrame;
 		m_lastDrivingClickFrame = TheGameLogic->getFrame();
 	}
@@ -336,7 +334,7 @@ void ParticleUplinkCannonUpdate::setSpecialPowerOverridableDestination( const Co
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime ParticleUplinkCannonUpdate::update()
-{	
+{
 	if( m_invalidSettings )
 	{
 		// can't return UPDATE_SLEEP_FOREVER unless we are sleepy...
@@ -382,7 +380,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 	{
 		if( m_startDecayFrame > now )
 		{
-			if( me->isDisabledByType( DISABLED_UNDERPOWERED ) || 
+			if( me->isDisabledByType( DISABLED_UNDERPOWERED ) ||
 					me->isDisabledByType( DISABLED_EMP ) ||
 					me->isDisabledByType( DISABLED_HACKED ) )
 			{
@@ -403,7 +401,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 					createOrbitToTargetLaser( data->m_widthGrowFrames );
 					m_laserStatus = LASERSTATUS_BORN;
 					m_scorchMarksMade		= 0;
-					m_nextScorchMarkFrame = now; 
+					m_nextScorchMarkFrame = now;
 					m_damagePulsesMade = 0;
 					m_nextDamagePulseFrame = now;
 				}
@@ -455,13 +453,19 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 				break;
 		}
 
-		if( orbitalBirthFrame <= now && now < orbitalDeathFrame )
+#if RETAIL_COMPATIBLE_CRC
+		// TheSuperHackers @info helmutbuhler 12/06/2025
+		// Note that this code is very brittle for retail compatibility. Inlining isFiring
+		// can cause incompatibility in some circumstances.
+#endif
+		const Bool isFiring = orbitalBirthFrame <= now && now < orbitalDeathFrame;
+		if ( isFiring )
 		{
-		
+
 			if( !m_manualTargetMode )
 			{
 				//Calculate the position of the beam because it swaths -- a nice S curve centering at the target location!
-				
+
 				//First determine the factor of time completed (ranges between 0.0 and 1.0)
 				Real factor = (Real)(now - orbitalBirthFrame) / (Real)(orbitalDeathFrame - orbitalBirthFrame);
 
@@ -577,7 +581,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 			scorchRadius = logicalLaserRadius * data->m_scorchMarkScalar;
 #if defined(RETAIL_COMPATIBLE_CRC)
 			DEBUG_ASSERTCRASH(logicalLaserRadius == visualLaserRadius,
-				("ParticleUplinkCannonUpdate's laser radius does not match LaserUpdate's laser radius - will cause mismatch in VS6 retail compatible builds\n"));
+				("ParticleUplinkCannonUpdate's laser radius does not match LaserUpdate's laser radius - will cause mismatch in VS6 retail compatible builds"));
 #endif
 
 			//Create scorch marks periodically
@@ -631,7 +635,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 					{
 						body->attemptDamage( &damageInfo );
 					}
-				} 
+				}
 
 				if( data->m_damagePulseRemnantObjectName.isNotEmpty() )
 				{
@@ -653,7 +657,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 				m_nextDamagePulseFrame = orbitalBirthFrame + nextFactor * (orbitalDeathFrame - orbitalBirthFrame);
 			}
 		}
-		
+
 		if( endDecayFrame <= now )
 		{
 			setLogicalStatus( STATUS_PACKING );
@@ -698,7 +702,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 	}
 
 	//Handle shrouded status changes for the client player.
-	Player *localPlayer = ThePlayerList->getLocalPlayer();
+	Player *localPlayer = rts::getObservedOrLocalPlayer();
 	if( localPlayer )
 	{
 		Bool shrouded = me->getShroudedStatus( localPlayer->getPlayerIndex() ) != OBJECTSHROUD_CLEAR;
@@ -782,7 +786,7 @@ void ParticleUplinkCannonUpdate::createConnectorLasers( IntensityTypes intensity
 		case IT_LIGHT:
 			break;
 		case IT_MEDIUM:
-			str = data->m_connectorMediumLaserNameName;;
+			str = data->m_connectorMediumLaserNameName;
 			break;
 		case IT_INTENSE:
 			str = data->m_connectorIntenseLaserNameName;
@@ -1115,7 +1119,7 @@ void ParticleUplinkCannonUpdate::setLogicalStatus( PUCStatus newStatus )
 			}
 			TheAudio->removeAudioEvent( m_firingToIdleSound.getPlayingHandle() );
 			TheAudio->removeAudioEvent( m_annihilationSound.getPlayingHandle() );
-			
+
 			m_laserStatus = LASERSTATUS_NONE;
 			break;
 		}
@@ -1193,7 +1197,7 @@ void ParticleUplinkCannonUpdate::setClientStatus( PUCStatus newStatus, Bool reve
 
 	//This isn't the most efficient way to do this. Various effects can live in more than
 	//one status state, but keeping track of them properly is error-prone and hard to read.
-	//Therefore, the new philosophy is to delete EVERYTHING between status changes and 
+	//Therefore, the new philosophy is to delete EVERYTHING between status changes and
 	//create the ones we want!
 	removeAllEffects();
 
@@ -1299,7 +1303,7 @@ void ParticleUplinkCannonUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1387,7 +1391,7 @@ void ParticleUplinkCannonUpdate::xfer( Xfer *xfer )
 
 	// next scorch mark frame
 	xfer->xferUnsignedInt( &m_nextScorchMarkFrame );
-	
+
 	// next launch FX frame
 	xfer->xferUnsignedInt( &m_nextLaunchFXFrame );
 
@@ -1421,7 +1425,7 @@ void ParticleUplinkCannonUpdate::xfer( Xfer *xfer )
 		m_orbitToTargetLaserRadius.xfer( xfer );
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1450,9 +1454,9 @@ void ParticleUplinkCannonUpdate::loadPostProcess( void )
 		}
 		else
 		{
-			DEBUG_CRASH(( "ParticleUplinkCannonUpdate::loadPostProcess - Unable to find drawable for m_orbitToTargetBeamID\n" ));
+			DEBUG_CRASH(( "ParticleUplinkCannonUpdate::loadPostProcess - Unable to find drawable for m_orbitToTargetBeamID" ));
 		}
 	}
 #endif
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp
index 6ac17ecd7c6..36dd8619c9d 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp
@@ -22,11 +22,11 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// PhysicsBehavior.cpp 
+// PhysicsBehavior.cpp
 // Simple rigid body physics
 // Author: Michael S. Booth, November 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // please talk to MDC (x36804) before taking this out
 #define NO_DEBUG_CRC
@@ -63,11 +63,6 @@ const Int MOTIVE_FRAMES = LOGICFRAMES_PER_SECOND / 3;
 
 #define SLEEPY_PHYSICS
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 static Real angleBetweenVectors(const Coord3D& inCurDir, const Coord3D& inGoalDir)
@@ -99,7 +94,7 @@ static Real heightToSpeed(Real height)
 	// don't bother trying to remember how far we've fallen; instead,
 	// back-calc it from our speed & gravity... v = sqrt(2*g*h)
 	return sqrt(fabs(2.0f * TheGlobalData->m_gravity * height));
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 PhysicsBehaviorModuleData::PhysicsBehaviorModuleData()
@@ -119,7 +114,7 @@ PhysicsBehaviorModuleData::PhysicsBehaviorModuleData()
 		thru some bizarre editing mishap, we have been double-apply pitch/roll/yaw rates
 		to objects for, well, a long time, it looks like. I have corrected that problem
 		in the name of efficiency, but to maintain the same visual appearance without having
-		to edit every freaking INI in the world at this point, I am just multiplying 
+		to edit every freaking INI in the world at this point, I am just multiplying
 		all the results by a factor so that the effect is the same (but with less execution time).
 		I have put this factor into INI in the unlikely event we ever need to change it,
 		but defaulting it to 2 is, in fact, the right thing for now... (srj)
@@ -137,7 +132,7 @@ static void parseHeightToSpeed( INI* ini, void * /*instance*/, void *store, cons
 	// back-calc it from our speed & gravity... v = sqrt(2*g*h)
 	Real height = INI::scanReal(ini->getNextToken());
 	*(Real *)store = heightToSpeed(height);
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 static void parseFrictionPerSec( INI* ini, void * /*instance*/, void *store, const void* /*userData*/ )
@@ -145,14 +140,14 @@ static void parseFrictionPerSec( INI* ini, void * /*instance*/, void *store, con
 	Real fricPerSec = INI::scanReal(ini->getNextToken());
 	Real fricPerFrame = fricPerSec * SECONDS_PER_LOGICFRAME_REAL;
 	*(Real *)store = fricPerFrame;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void PhysicsBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void PhysicsBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Mass",								INI::parsePositiveNonZeroReal,		NULL, offsetof( PhysicsBehaviorModuleData, m_mass ) },
 
@@ -242,17 +237,14 @@ void PhysicsBehavior::onObjectCreated()
 //-------------------------------------------------------------------------------------------------
 PhysicsBehavior::~PhysicsBehavior()
 {
-	if (m_bounceSound)
-	{
-		deleteInstance(m_bounceSound);
-		m_bounceSound = NULL;
-	}
+	deleteInstance(m_bounceSound);
+	m_bounceSound = NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
 void PhysicsBehavior::setIgnoreCollisionsWith(const Object* obj)
 {
-	m_ignoreCollisionsWith = obj ? obj->getID() : INVALID_ID; 
+	m_ignoreCollisionsWith = obj ? obj->getID() : INVALID_ID;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -303,14 +295,17 @@ Real PhysicsBehavior::getZFriction() const
  */
 void PhysicsBehavior::applyForce( const Coord3D *force )
 {
-	DEBUG_ASSERTCRASH(!(_isnan(force->x) || _isnan(force->y) || _isnan(force->z)), ("PhysicsBehavior::applyForce force NAN!\n"));
+// TheSuperHackers @info helmutbuhler 06/05/2025 This debug mutates the code to become CRC incompatible
+#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC
+	DEBUG_ASSERTCRASH(!(_isnan(force->x) || _isnan(force->y) || _isnan(force->z)), ("PhysicsBehavior::applyForce force NAN!"));
+#endif
 	if (_isnan(force->x) || _isnan(force->y) || _isnan(force->z)) {
 		return;
 	}
 	// F = ma  -->  a = F/m  (divide force by mass)
 	Real mass = getMass();
 	Coord3D modForce = *force;
-	if (isMotive()) 
+	if (isMotive())
 	{
 		const Coord3D *dir = getObject()->getUnitDirectionVector2D();
 		// Only accept the lateral acceleration.
@@ -324,8 +319,8 @@ void PhysicsBehavior::applyForce( const Coord3D *force )
 	m_accel.y += modForce.y * massInv;
 	m_accel.z += modForce.z * massInv;
 
-	//DEBUG_ASSERTCRASH(!(_isnan(m_accel.x) || _isnan(m_accel.y) || _isnan(m_accel.z)), ("PhysicsBehavior::applyForce accel NAN!\n"));
-	//DEBUG_ASSERTCRASH(!(_isnan(m_vel.x) || _isnan(m_vel.y) || _isnan(m_vel.z)), ("PhysicsBehavior::applyForce vel NAN!\n"));
+	//DEBUG_ASSERTCRASH(!(_isnan(m_accel.x) || _isnan(m_accel.y) || _isnan(m_accel.z)), ("PhysicsBehavior::applyForce accel NAN!"));
+	//DEBUG_ASSERTCRASH(!(_isnan(m_vel.x) || _isnan(m_vel.y) || _isnan(m_vel.z)), ("PhysicsBehavior::applyForce vel NAN!"));
 	//DEBUG_ASSERTCRASH(fabs(force->z) < 3, ("unlikely z-force"));
 #ifdef SLEEPY_PHYSICS
 	if (getFlag(IS_IN_UPDATE))
@@ -342,9 +337,9 @@ void PhysicsBehavior::applyForce( const Coord3D *force )
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool PhysicsBehavior::isMotive() const 
-{ 
-	return m_motiveForceExpires > TheGameLogic->getFrame(); 
+Bool PhysicsBehavior::isMotive() const
+{
+	return m_motiveForceExpires > TheGameLogic->getFrame();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -382,7 +377,7 @@ void PhysicsBehavior::applyGravitationalForces()
 //-------------------------------------------------------------------------------------------------
 void PhysicsBehavior::applyFrictionalForces()
 {
-	if (getFlag(APPLY_FRICTION2D_WHEN_AIRBORNE) || !getObject()->isSignificantlyAboveTerrain()) 
+	if (getFlag(APPLY_FRICTION2D_WHEN_AIRBORNE) || !getObject()->isSignificantlyAboveTerrain())
 	{
 		applyYPRDamping(1.0f - DEFAULT_LATERAL_FRICTION);
 
@@ -485,23 +480,23 @@ inline Bool isZero3D(const Coord3D& v)
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::setPitchRate(Real pitch) 
-{ 
+void PhysicsBehavior::setPitchRate(Real pitch)
+{
 	m_pitchRate = pitch;
 	setFlag(HAS_PITCHROLLYAW, (m_pitchRate != 0.0f || m_rollRate != 0.0f || m_yawRate != 0.0f));
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::setRollRate(Real roll) 
-{ 
+void PhysicsBehavior::setRollRate(Real roll)
+{
 	m_rollRate = roll;
 	setFlag(HAS_PITCHROLLYAW, (m_pitchRate != 0.0f || m_rollRate != 0.0f || m_yawRate != 0.0f));
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::setYawRate(Real yaw) 
-{ 
-	m_yawRate = yaw; 
+void PhysicsBehavior::setYawRate(Real yaw)
+{
+	m_yawRate = yaw;
 	setFlag(HAS_PITCHROLLYAW, (m_pitchRate != 0.0f || m_rollRate != 0.0f || m_yawRate != 0.0f));
 }
 
@@ -515,22 +510,19 @@ void PhysicsBehavior::applyYPRDamping(Real factor)
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::setBounceSound(const AudioEventRTS* bounceSound) 
-{ 
+void PhysicsBehavior::setBounceSound(const AudioEventRTS* bounceSound)
+{
 	if (bounceSound)
 	{
 		if (m_bounceSound == NULL)
 			m_bounceSound = newInstance(DynamicAudioEventRTS);
 
-		m_bounceSound->m_event = *bounceSound; 
+		m_bounceSound->m_event = *bounceSound;
 	}
 	else
 	{
-		if (m_bounceSound)
-		{
-			deleteInstance(m_bounceSound);
-			m_bounceSound = NULL;
-		}
+		deleteInstance(m_bounceSound);
+		m_bounceSound = NULL;
 	}
 }
 
@@ -586,7 +578,7 @@ UpdateSleepTime PhysicsBehavior::update()
 		Real oldPosZ = mtx.Get_Z_Translation();
 
 		// integrate velocity into position
-		if (obj->testStatus(OBJECT_STATUS_BRAKING)) 
+		if (obj->testStatus(OBJECT_STATUS_BRAKING))
 		{
 			// Don't update position if the locomotor is braking.
 			if (!obj->isKindOf(KINDOF_PROJECTILE))
@@ -594,8 +586,8 @@ UpdateSleepTime PhysicsBehavior::update()
 				// Things other than projectiles don't cheat in z.  jba.
 				mtx.Adjust_Z_Translation(m_vel.z);
 			}
-		}	
-		else 
+		}
+		else
 		{
 			mtx.Adjust_X_Translation(m_vel.x);
 			mtx.Adjust_Y_Translation(m_vel.y);
@@ -613,7 +605,7 @@ UpdateSleepTime PhysicsBehavior::update()
 
 			/*
 				You may be tempted to do something like this:
-				
+
 					Real rollAngle = -mtx.Get_X_Rotation();
 					Real pitchAngle = mtx.Get_Y_Rotation();
 					Real yawAngle = mtx.Get_Z_Rotation();
@@ -621,7 +613,7 @@ UpdateSleepTime PhysicsBehavior::update()
 
 				You must resist this temptation, because your code will be wrong!
 
-				The problem is that you can't use these calls to later reconstruct 
+				The problem is that you can't use these calls to later reconstruct
 				the matrix... because doing such a thing is highly order-dependent,
 				and furthermore, you'd have to use Euler angles (Not the Get_?_Rotation
 				calls) to be able to reconstruct 'em, and that's too slow to do for
@@ -630,7 +622,7 @@ UpdateSleepTime PhysicsBehavior::update()
 				The one exception is that it is OK to use Get_Z_Rotation() to get
 				the yaw angle.
 			*/
-			
+
 			// only update the position if we are not HELD
 			// (otherwise, slowdeath sinking into ground won't work)
 			Real yawRateToUse = m_yawRate * d->m_pitchRollYawFactor;
@@ -668,29 +660,29 @@ UpdateSleepTime PhysicsBehavior::update()
 		activeVelZ = m_vel.z;
 		if (mtx.Get_Z_Translation() <= groundZ)
 		{
-			// Note - when vehicles are going down a slope, they will maintain a small negative 
+			// Note - when vehicles are going down a slope, they will maintain a small negative
 			// z velocity as they go down.  So don't slam it to 0 if they aren't slamming into the
 			// ground.
 			Real dz = groundZ - mtx.Get_Z_Translation();  // Our excess z velocity.
 			m_vel.z += dz;							// Remove the excess z velocity.
 			if (m_vel.z > 0.0f)
-				m_vel.z = 0.0f;	
+				m_vel.z = 0.0f;
 
 			m_velMag = INVALID_VEL_MAG;
-			
+
 			mtx.Set_Z_Translation(groundZ);
 
 			// this flag is ALWAYS cleared once we hit the ground.
 			setFlag(ALLOW_TO_FALL, false);
 		}
-		else if (mtx.Get_Z_Translation() > groundZ) 
+		else if (mtx.Get_Z_Translation() > groundZ)
 		{
 			if (getFlag(IS_IN_FREEFALL))
 			{
 				obj->setDisabled(DISABLED_FREEFALL);
 				obj->setModelConditionState(MODELCONDITION_FREEFALL);
 			}
-			else if (getFlag(STICK_TO_GROUND) && !getFlag(ALLOW_TO_FALL)) 
+			else if (getFlag(STICK_TO_GROUND) && !getFlag(ALLOW_TO_FALL))
 			{
 				mtx.Set_Z_Translation(groundZ);
 			}
@@ -698,7 +690,7 @@ UpdateSleepTime PhysicsBehavior::update()
 
 		obj->setTransformMatrix(&mtx);
 
-	} // if not held
+	}
 
 	// reset the acceleration for accumulation next frame
 	m_accel.zero();
@@ -714,9 +706,9 @@ UpdateSleepTime PhysicsBehavior::update()
 
 	Bool airborneAtEnd = obj->isAboveTerrain();
 
-	// it's not good enough to check for airborne being different between 
+	// it's not good enough to check for airborne being different between
 	// the start and end of this func... we have to compare since last frame,
-	// since (if we're held by a parachute, for instance) we might have been 
+	// since (if we're held by a parachute, for instance) we might have been
 	// moved by other bits of code!
 	if (getFlag(WAS_AIRBORNE_LAST_FRAME) && !airborneAtEnd && !getFlag(IMMUNE_TO_FALLING_DAMAGE))
 	{
@@ -738,25 +730,25 @@ UpdateSleepTime PhysicsBehavior::update()
 		// even bother doing this check here.
 		//
 		Real netSpeed = -activeVelZ - d->m_minFallSpeedForDamage;
-		
+
 		if (netSpeed > 0.0f && m_pui == NULL)
 		{
 			// only apply force if it's a pretty steep fall, so that things
 			// going down hills don't injure themselves (unless the hill is really steep)
 			const Real MIN_ANGLE_TAN = 3.0f;	//	roughly 71 degrees
 			const Real TINY_DELTA = 0.01f;
-			if ((fabs(m_vel.x) <= TINY_DELTA || fabs(activeVelZ / m_vel.x) >= MIN_ANGLE_TAN) && 
+			if ((fabs(m_vel.x) <= TINY_DELTA || fabs(activeVelZ / m_vel.x) >= MIN_ANGLE_TAN) &&
 				(fabs(m_vel.y) <= TINY_DELTA || fabs(activeVelZ / m_vel.y) >= MIN_ANGLE_TAN))
 			{
 				Real damageAmt = netSpeed * getMass() * d->m_fallHeightDamageFactor;
 
 				DamageInfo damageInfo;
 				damageInfo.in.m_damageType = DAMAGE_FALLING;
-				damageInfo.in.m_deathType = DEATH_SPLATTED;	
+				damageInfo.in.m_deathType = DEATH_SPLATTED;
 				damageInfo.in.m_sourceID = obj->getID();
-				damageInfo.in.m_amount = damageAmt;	
+				damageInfo.in.m_amount = damageAmt;
 				obj->attemptDamage( &damageInfo );
-				//DEBUG_LOG(("Dealing %f (%f %f) points of falling damage to %s!\n",damageAmt,damageInfo.out.m_actualDamageDealt, damageInfo.out.m_actualDamageClipped,obj->getTemplate()->getName().str()));
+				//DEBUG_LOG(("Dealing %f (%f %f) points of falling damage to %s!",damageAmt,damageInfo.out.m_actualDamageDealt, damageInfo.out.m_actualDamageClipped,obj->getTemplate()->getName().str()));
 
 				// if this killed us, add SPLATTED to get a cool death.
 				if (obj->isEffectivelyDead())
@@ -802,7 +794,7 @@ UpdateSleepTime PhysicsBehavior::update()
 UpdateSleepTime PhysicsBehavior::calcSleepTime() const
 {
 #ifdef SLEEPY_PHYSICS
-	if (isZero3D(m_vel) 
+	if (isZero3D(m_vel)
 			&& isZero3D(m_accel)
 			&& !getFlag(HAS_PITCHROLLYAW)
 			&& !isMotive()
@@ -832,7 +824,7 @@ Real PhysicsBehavior::getVelocityMagnitude() const
 
 //-------------------------------------------------------------------------------------------------
 /**
- * Return the current velocity magnitude in the forward direction.  
+ * Return the current velocity magnitude in the forward direction.
  * If velocity is opposite facing vector, the returned value will be negative.
  */
 Real PhysicsBehavior::getForwardSpeed2D() const
@@ -846,7 +838,7 @@ Real PhysicsBehavior::getForwardSpeed2D() const
 
 	Real speedSquared = vx*vx + vy*vy;
 //	DEBUG_ASSERTCRASH( speedSquared != 0, ("zero speedSquared will overflow sqrtf()!") );// lorenzen... sanity check
-	
+
 	Real speed = (Real)sqrtf( speedSquared );
 
 	if (dot >= 0.0f)
@@ -857,7 +849,7 @@ Real PhysicsBehavior::getForwardSpeed2D() const
 
 //-------------------------------------------------------------------------------------------------
 /**
- * Return the current velocity magnitude in the forward direction.  
+ * Return the current velocity magnitude in the forward direction.
  * If velocity is opposite facing vector, the returned value will be negative.
  */
 Real PhysicsBehavior::getForwardSpeed3D() const
@@ -880,26 +872,26 @@ Real PhysicsBehavior::getForwardSpeed3D() const
 
 //-------------------------------------------------------------------------------------------------
 Bool PhysicsBehavior::isCurrentlyOverlapped(Object *obj) const
-{ 
+{
 	return obj != NULL && obj->getID() == m_currentOverlap;
 }
 
 //-------------------------------------------------------------------------------------------------
 Bool PhysicsBehavior::wasPreviouslyOverlapped(Object *obj) const
-{ 
+{
 	return obj != NULL && obj->getID() == m_previousOverlap;
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::scrubVelocityZ( Real desiredVelocity ) 
-{ 	 
-	if (fabs(desiredVelocity) < 0.001f) 
+void PhysicsBehavior::scrubVelocityZ( Real desiredVelocity )
+{
+	if (fabs(desiredVelocity) < 0.001f)
 	{
-		m_vel.z = 0; 
-	} 
-	else 
+		m_vel.z = 0;
+	}
+	else
 	{
-		if ((desiredVelocity < 0 && m_vel.z < desiredVelocity) || (desiredVelocity > 0 && m_vel.z > desiredVelocity)) 
+		if ((desiredVelocity < 0 && m_vel.z < desiredVelocity) || (desiredVelocity > 0 && m_vel.z > desiredVelocity))
 		{
 			m_vel.z = desiredVelocity;
 		}
@@ -908,30 +900,30 @@ void PhysicsBehavior::scrubVelocityZ( Real desiredVelocity )
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::scrubVelocity2D( Real desiredVelocity ) 
-{ 	 
-	if (desiredVelocity < 0.001f) 
+void PhysicsBehavior::scrubVelocity2D( Real desiredVelocity )
+{
+	if (desiredVelocity < 0.001f)
 	{
-		m_vel.x = 0; 
+		m_vel.x = 0;
 		m_vel.y = 0;
-	} 
-	else 
+	}
+	else
 	{
 		Real curVelocity = sqrtf(m_vel.x*m_vel.x + m_vel.y*m_vel.y);
-		if (desiredVelocity > curVelocity) 
+		if (desiredVelocity > curVelocity)
 		{
 			return;
 		}
 		desiredVelocity /= curVelocity;
 		m_vel.x *= desiredVelocity;
-		m_vel.y *= desiredVelocity;	 
+		m_vel.y *= desiredVelocity;
 	}
 	m_velMag = INVALID_VEL_MAG;
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::addOverlap(Object *obj) 
-{ 
+void PhysicsBehavior::addOverlap(Object *obj)
+{
 	if (obj && !isCurrentlyOverlapped(obj))
 	{
 		m_currentOverlap = obj->getID();
@@ -942,12 +934,14 @@ void PhysicsBehavior::addOverlap(Object *obj)
 void PhysicsBehavior::transferVelocityTo(PhysicsBehavior* that) const
 {
 	if (that != NULL)
+	{
 		that->m_vel.add(&m_vel);
-	that->m_velMag = INVALID_VEL_MAG;
+		that->m_velMag = INVALID_VEL_MAG;
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::addVelocityTo( const Coord3D *vel) 
+void PhysicsBehavior::addVelocityTo( const Coord3D *vel)
 {
 	if (vel != NULL)
 		m_vel.add( vel );
@@ -969,7 +963,7 @@ void PhysicsBehavior::setAngles( Real yaw, Real pitch, Real roll )
 }
 
 //-------------------------------------------------------------------------------------------------
-Real PhysicsBehavior::getMass() const 
+Real PhysicsBehavior::getMass() const
 {
 	Real mass = m_mass;
 	ContainModuleInterface* contain = getObject()->getContain();
@@ -1027,9 +1021,9 @@ void PhysicsBehavior::doBounceSound(const Coord3D& prevPos)
 }
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Resolve the collision between getObject() and other by computing
- * the amount the objects have overlapd, and applying proportional forces to 
+ * the amount the objects have overlapd, and applying proportional forces to
  * push them apart.
  * Note that this call only applies forces to our object, not to "other".  Since the
  * forces should be equal and opposite, this could be optimized.
@@ -1093,7 +1087,7 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 			//We need to be able to test whether an object on a team has been captured, so set here that this object
 			//was captured.
 			other->setCaptured(true);
-			
+
 			other->defect( obj->getTeam(), 0 );
 			//other->setTeam( obj->getTeam() );
 
@@ -1151,7 +1145,7 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 	if (immobile)
 		mass = 999999.0f;
 
-	if (ai) 
+	if (ai)
 	{
 		// AI objects move under their own initiative, not by getting bounced.  jba.
 		// unless they are dead & colliding with something immobile. (srj)
@@ -1159,7 +1153,7 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 		if (!((obj->isEffectivelyDead() || obj->testStatus(OBJECT_STATUS_PARACHUTING)) && otherImmobile))
 		{
 			Bool doForce = ai->processCollision(this, other);
-			if (!doForce) 
+			if (!doForce)
 				return;
 		}
 
@@ -1196,8 +1190,8 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 		// We don't overlap at all.  How did we get here?
 		return;
 	}
-	
-	
+
+
 	m_lastCollidee = other->getID();
 
 	Real dist = sqrtf(distSqr);
@@ -1221,7 +1215,7 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 				Object* objToBounce = obj;
 				while (objToBounce->getContainedBy() != NULL)
 					objToBounce = objToBounce->getContainedBy();
-				
+
 				Real bounceOutDist = usRadius * 0.1f;
 				Coord3D tmp = *objToBounce->getPosition();
 				tmp.x -= bounceOutDist * delta.x / dist;
@@ -1242,15 +1236,15 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 			if (stiffness < MIN_STIFF) stiffness = MIN_STIFF;
 			if (stiffness > MAX_STIFF) stiffness = MAX_STIFF;
 			// huh huh, he said "stiff"
-			
+
 			Real mag = getVelocityMagnitude();
 			const Real MINBOUNCESPEED = 1.0f/(LOGICFRAMES_PER_SECOND*5.0f);
-			if (mag < MINBOUNCESPEED) 
+			if (mag < MINBOUNCESPEED)
 				mag = MINBOUNCESPEED;
 			factor = -mag * getMass() * stiffness;
-			
+
 			// if we are moving down, we may want to blow ourselves into smithereens....
-			if (delta.z < 0.0f && 
+			if (delta.z < 0.0f &&
 					obj->getPosition()->z >= TheGlobalData->m_defaultStructureRubbleHeight)
 			{
 				if (other->isKindOf(KINDOF_STRUCTURE))
@@ -1278,13 +1272,13 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 			// but then if we were still colliding next frame, we'd get a sudden 'aceleration' of bounce
 			// that would look freakish. so cheat.
 			m_vel.x = 0;
-			m_vel.y = 0;	 
-			m_vel.z = 0;	 
+			m_vel.y = 0;
+			m_vel.z = 0;
 			m_velMag = INVALID_VEL_MAG;
 		}
 		else
 		{
-			if (overlap > 5.0f) 
+			if (overlap > 5.0f)
 				overlap = 5.0f;
 			factor = -overlap;
 		}
@@ -1292,7 +1286,7 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 		force.x = factor * delta.x / dist;
 		force.y = factor * delta.y / dist;
 		force.z = factor * delta.z / dist;	// will be zero for 2d case.
-		DEBUG_ASSERTCRASH(!(_isnan(force.x) || _isnan(force.y) || _isnan(force.z)), ("PhysicsBehavior::onCollide force NAN!\n"));
+		DEBUG_ASSERTCRASH(!(_isnan(force.x) || _isnan(force.y) || _isnan(force.z)), ("PhysicsBehavior::onCollide force NAN!"));
 
 		applyForce( &force );
 	}
@@ -1337,7 +1331,7 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 	if( selfCrushingOther && selfBeingCrushed )
 	{
 		//Is it possible to crush and be crushed at the same time?
-		DEBUG_CRASH( ("%s (Crusher:%d, Crushable:%d) is attempting to crush %s (Crusher:%d, Crushable:%d) but it is reciprocating -- shouldn't be possible!", 
+		DEBUG_CRASH( ("%s (Crusher:%d, Crushable:%d) is attempting to crush %s (Crusher:%d, Crushable:%d) but it is reciprocating -- shouldn't be possible!",
 			crusherMe->getTemplate()->getName().str(), crusherMe->getCrusherLevel(), crusherMe->getCrushableLevel(),
 			crusheeOther->getTemplate()->getName().str(), crusheeOther->getCrusherLevel(), crusheeOther->getCrushableLevel() ) );
 		return false;
@@ -1405,7 +1399,7 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 			// Degenerate case; there is only one point to consider.
 			if( frontCrushed )
 				crushTarget = BACK_END_CRUSH;
-			else 
+			else
 				crushTarget = FRONT_END_CRUSH;
 		}
 		else
@@ -1481,8 +1475,8 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 			// Now find the shortest.  Use the straightline distance to crush point as tie breaker
 			if( (frontPerpLength <= centerPerpLength)  && (frontPerpLength <= backPerpLength) )
 			{
-				if( perpsLogicallyEqual(frontPerpLength, centerPerpLength) 
-					|| perpsLogicallyEqual(frontPerpLength, backPerpLength) 
+				if( perpsLogicallyEqual(frontPerpLength, centerPerpLength)
+					|| perpsLogicallyEqual(frontPerpLength, backPerpLength)
 					)
 				{
 					Real frontVectorLength = frontVector.length();
@@ -1510,8 +1504,8 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 			}
 			else if( (backPerpLength <= centerPerpLength)  && (backPerpLength <= frontPerpLength) )
 			{
-				if( perpsLogicallyEqual(backPerpLength, centerPerpLength) 
-					|| perpsLogicallyEqual(backPerpLength, frontPerpLength) 
+				if( perpsLogicallyEqual(backPerpLength, centerPerpLength)
+					|| perpsLogicallyEqual(backPerpLength, frontPerpLength)
 					)
 				{
 					Real backVectorLength = backVector.length();
@@ -1540,7 +1534,7 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 			else // centerperp is shortest
 			{
 				if( perpsLogicallyEqual(centerPerpLength, backPerpLength)
-					|| perpsLogicallyEqual(centerPerpLength, frontPerpLength) 
+					|| perpsLogicallyEqual(centerPerpLength, frontPerpLength)
 					)
 				{
 					Real centerVectorLength = centerVector.length();
@@ -1593,7 +1587,7 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 		}
 		else if( crushTarget == FRONT_END_CRUSH )
 		{
-			// Check the front point.  
+			// Check the front point.
 			comparisonCoord = *crusheePos;
 			comparisonCoord.x += crushPointOffset.x;
 			comparisonCoord.y += crushPointOffset.y;
@@ -1641,7 +1635,7 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 			crusheeOther->attemptDamage( &damageInfo );
 		}
 
-	} // if crushable
+	}
 
 	return true;
 }
@@ -1655,7 +1649,7 @@ void PhysicsBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1678,7 +1672,7 @@ void PhysicsBehavior::xfer( Xfer *xfer )
 
 	// roll rate
 	xfer->xferReal( &m_rollRate );
-	
+
 	// pitch rate
 	xfer->xferReal( &m_pitchRate );
 
@@ -1735,7 +1729,7 @@ void PhysicsBehavior::xfer( Xfer *xfer )
 	// mag of current vel
 	xfer->xferReal( &m_velMag );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1746,4 +1740,4 @@ void PhysicsBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PilotFindVehicleUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PilotFindVehicleUpdate.cpp
index 6b63a12421a..e82f830db91 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PilotFindVehicleUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PilotFindVehicleUpdate.cpp
@@ -64,7 +64,7 @@ PilotFindVehicleUpdateModuleData::PilotFindVehicleUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ScanRate",							INI::parseDurationUnsignedInt,	NULL, offsetof( PilotFindVehicleUpdateModuleData, m_scanFrames ) },
 		{ "ScanRange",						INI::parseReal,									NULL, offsetof( PilotFindVehicleUpdateModuleData, m_scanRange ) },
@@ -79,7 +79,7 @@ PilotFindVehicleUpdate::PilotFindVehicleUpdate( Thing *thing, const ModuleData*
 {
 	m_didMoveToBase = false;
 	setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -92,19 +92,19 @@ PilotFindVehicleUpdate::~PilotFindVehicleUpdate( void )
 //-------------------------------------------------------------------------------------------------
 void PilotFindVehicleUpdate::onObjectCreated()
 {
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime PilotFindVehicleUpdate::update()
-{	
+{
 
 	Object *obj = getObject();
 	if (obj->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN) {
 		// This is an ai only behavior.
-		return UPDATE_SLEEP_FOREVER; 
+		return UPDATE_SLEEP_FOREVER;
 	}
 	const PilotFindVehicleUpdateModuleData *data = getPilotFindVehicleUpdateModuleData();
 
@@ -151,7 +151,7 @@ Object* PilotFindVehicleUpdate::scanClosestTarget()
 	filters[3] = &filterMapStatus;
 	filters[4] = NULL;
 
-	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( me->getPosition(), data->m_scanRange, 
+	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( me->getPosition(), data->m_scanRange,
 		FROM_CENTER_2D, filters, ITER_SORTED_NEAR_TO_FAR );
 	MemoryPoolObjectHolder hold(iter);
 
@@ -161,7 +161,7 @@ Object* PilotFindVehicleUpdate::scanClosestTarget()
 		BodyModuleInterface *body = other->getBodyModule();
 		if (!body) continue;
 		//	If we're real healthy, don't bother looking for healing.
-		if (body->getHealth() < body->getMaxHealth()*data->m_minHealth) 
+		if (body->getHealth() < body->getMaxHealth()*data->m_minHealth)
 		{
 			continue;
 		}
@@ -190,7 +190,7 @@ void PilotFindVehicleUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -211,7 +211,7 @@ void PilotFindVehicleUpdate::xfer( Xfer *xfer )
 	// did move to base
 	xfer->xferBool( &m_didMoveToBase );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -222,4 +222,4 @@ void PilotFindVehicleUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PointDefenseLaserUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PointDefenseLaserUpdate.cpp
index c36a6cb69c8..f8ed7a44af1 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PointDefenseLaserUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PointDefenseLaserUpdate.cpp
@@ -62,7 +62,7 @@ PointDefenseLaserUpdateModuleData::PointDefenseLaserUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "WeaponTemplate",				INI::parseWeaponTemplate,				NULL, offsetof( PointDefenseLaserUpdateModuleData, m_weaponTemplate ) },
 		{ "PrimaryTargetTypes",		KindOfMaskType::parseFromINI,								NULL, offsetof( PointDefenseLaserUpdateModuleData, m_primaryTargetKindOf ) },
@@ -83,7 +83,7 @@ PointDefenseLaserUpdate::PointDefenseLaserUpdate( Thing *thing, const ModuleData
 	m_nextShotAvailableInFrames = 0;
 	m_inRange  					= false;
 	setWakeFrame(getObject(), UPDATE_SLEEP_NONE);// No starting sleep, but we want to sleep later.
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -97,11 +97,11 @@ PointDefenseLaserUpdate::~PointDefenseLaserUpdate( void )
 void PointDefenseLaserUpdate::onObjectCreated()
 {
 	const PointDefenseLaserUpdateModuleData *data = getPointDefenseLaserUpdateModuleData();
-	
+
 	//Make sure we have a weapon template
 	if( !data->m_weaponTemplate )
 	{
-		DEBUG_CRASH( ("PointDefenseLaserUpdate for %s doesn't have a valid weapon template", 
+		DEBUG_CRASH( ("PointDefenseLaserUpdate for %s doesn't have a valid weapon template",
 			getObject()->getTemplate()->getName().str() ) );
 		return;
 	}
@@ -121,15 +121,15 @@ void PointDefenseLaserUpdate::onObjectCreated()
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime PointDefenseLaserUpdate::update()
-{	
+{
 /// @todo srj use SLEEPY_UPDATE here
 	//*** HERE'S THE UPDATE PHILOSOPHY ***
-	//The point defense laser typically has short range, high rate of fire, and shoots at incoming projectiles 
+	//The point defense laser typically has short range, high rate of fire, and shoots at incoming projectiles
 	//that move fast. This amounts to a potentially very expensive system. Instead of frantically scanning for
 	//targets, we will scan less frequently (data->m_scanFrames) in a larger radius (data->m_scanRange). When
 	//this occurs, we'll store the "best" target, and track only that target until the next update or if it is
 	//killed.
-	
+
 	Object *me = getObject();
 	if( me->isEffectivelyDead() )
 		return UPDATE_SLEEP_FOREVER;//No more laser fo you.
@@ -177,7 +177,7 @@ void PointDefenseLaserUpdate::fireWhenReady()
 		{
 			if( m_inRange )
 			{
-				//We were in range last frame, but the target has moved out of firing range, so 
+				//We were in range last frame, but the target has moved out of firing range, so
 				//re-evaluate by forcing a new scan.
 				m_nextScanFrames = GameLogicRandomValue( 0, 3 );
 				m_bestTargetID = INVALID_ID;
@@ -195,14 +195,14 @@ void PointDefenseLaserUpdate::fireWhenReady()
 			}
 		}
 	}
-	
+
 	if( m_nextShotAvailableInFrames > 0 )
 	{
 		//We can't fire this frame.
 		m_nextShotAvailableInFrames--;
 		return;
 	}
-	
+
 	WeaponTemplate *wt = data->m_weaponTemplate;
 	if( wt )
 	{
@@ -310,7 +310,7 @@ Object* PointDefenseLaserUpdate::scanClosestTarget()
 					pos.set( physics->getVelocity() );
 					pos.scale( data->m_velocityFactor );
 					pos.add( other->getPosition() );
-					
+
 					//Recalculate the distance.
 					fDist = sqrt( ThePartitionManager->getDistanceSquared( me, other, FROM_CENTER_2D ) );
 				}
@@ -323,7 +323,7 @@ Object* PointDefenseLaserUpdate::scanClosestTarget()
 				bestTargetOutOfRange[index] = other;
 			}
 		}
-	}  // end for, other
+	}
 
 	if( bestTargetInRange[ 0 ] )
 	{
@@ -356,7 +356,7 @@ Object* PointDefenseLaserUpdate::scanClosestTarget()
 		m_inRange = false;
 		return bestTargetOutOfRange[ 1 ];
 	}
-	
+
 	//Utter failure -- nothing on the scope.
 	m_bestTargetID = INVALID_ID;
 	m_inRange = false;
@@ -372,7 +372,7 @@ void PointDefenseLaserUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -402,7 +402,7 @@ void PointDefenseLaserUpdate::xfer( Xfer *xfer )
 	// next shot available in frames
 	xfer->xferInt( &m_nextShotAvailableInFrames );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -413,4 +413,4 @@ void PointDefenseLaserUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PowerPlantUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PowerPlantUpdate.cpp
index cdace6f8c7a..7bba76701f5 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PowerPlantUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/PowerPlantUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ModelState.h"
 #include "Common/Xfer.h"
@@ -38,11 +38,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/PowerPlantUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -51,7 +46,7 @@ PowerPlantUpdateModuleData::PowerPlantUpdateModuleData( void )
 
 	m_rodsExtendTime = 0;
 
-}  // end PowerPlantUpdateModuleData
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -66,14 +61,14 @@ PowerPlantUpdate::PowerPlantUpdate( Thing *thing, const ModuleData *moduleData )
 	m_extended = FALSE;
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 
-}  // end PowerPlantUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 PowerPlantUpdate::~PowerPlantUpdate( void )
 {
 
-}  // end PowerPlantUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -99,14 +94,14 @@ void PowerPlantUpdate::extendRods( Bool extend )
 		// they de-extend instantly.
 		Drawable *draw = getObject()->getDrawable();
 		if( draw )
-			draw->clearModelConditionFlags( MAKE_MODELCONDITION_MASK2( MODELCONDITION_POWER_PLANT_UPGRADING, 
+			draw->clearModelConditionFlags( MAKE_MODELCONDITION_MASK2( MODELCONDITION_POWER_PLANT_UPGRADING,
 																														MODELCONDITION_POWER_PLANT_UPGRADED) );
-		
+
 		m_extended = FALSE;
 		setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 	}
 
-}  // end PowerPlantUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -117,10 +112,10 @@ UpdateSleepTime PowerPlantUpdate::update( void )
 	if( draw )
 		draw->clearAndSetModelConditionState( MODELCONDITION_POWER_PLANT_UPGRADING,
 																					MODELCONDITION_POWER_PLANT_UPGRADED );
-	
+
 	m_extended = TRUE;
 	return UPDATE_SLEEP_FOREVER;
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -131,7 +126,7 @@ void PowerPlantUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -152,7 +147,7 @@ void PowerPlantUpdate::xfer( Xfer *xfer )
 	// extend complete
 	xfer->xferBool( &m_extended );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -163,4 +158,4 @@ void PowerPlantUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp
index b18ec3b79d8..9d559b0250a 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp
@@ -28,7 +28,7 @@
 //					This instance simply spits the guy out at a point.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/ThingTemplate.h"
@@ -46,13 +46,7 @@ DefaultProductionExitUpdate::DefaultProductionExitUpdate( Thing *thing, const Mo
 {
 	// no rally point has been set
 	m_rallyPointExists = false;
-	// Added By Sadullah Nader
-	// Initialization missing and needed
-
 	m_rallyPoint.zero();
-
-	//
-
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 }
 
@@ -109,7 +103,7 @@ void DefaultProductionExitUpdate::exitObjectViaDoor( Object *newObj, ExitDoorTyp
 		if (m_rallyPointExists)
 		{
 			tmp = m_rallyPoint;
-			if (ai && ai->isDoingGroundMovement()) 
+			if (ai && ai->isDoingGroundMovement())
 			{
 				if (TheAI->pathfinder()->adjustDestination(newObj, ai->getLocomotorSet(), &tmp))
 					exitPath.push_back(tmp);
@@ -142,7 +136,7 @@ Bool DefaultProductionExitUpdate::getExitPosition( Coord3D& exitPosition ) const
 	exitPosition.x = loc.X;
 	exitPosition.y = loc.Y;
 	exitPosition.z = loc.Z;
-	
+
 	return TRUE;
 
 }
@@ -186,7 +180,7 @@ void DefaultProductionExitUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -210,7 +204,7 @@ void DefaultProductionExitUpdate::xfer( Xfer *xfer )
 	// rally point exists
 	xfer->xferBool( &m_rallyPointExists );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -221,4 +215,4 @@ void DefaultProductionExitUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp
index 50d02707b72..bfcab8950b7 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp
@@ -28,7 +28,7 @@
 //					This instance refuses to spit a second out until the first is clear
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/ThingTemplate.h"
@@ -46,12 +46,8 @@ QueueProductionExitUpdate::QueueProductionExitUpdate( Thing *thing, const Module
 {
 	m_currentDelay = 0;
 
-	//Added By Sadullah Nader
-	//Initializations inserted 
 	m_creationClearDistance = 0;
 	m_rallyPoint.zero();
-	//
-	
 	// no rally point has been set
 	m_rallyPointExists = false;
 	m_currentBurstCount = 0;
@@ -109,8 +105,8 @@ void QueueProductionExitUpdate::exitObjectViaDoor( Object *newObj, ExitDoorType
 		newObj->setOrientation( exitAngle );
 
 		//
-		// Objects that are created in the air from producers that are in the air get 
-		// a kick that will make their starting speed equal mine.  
+		// Objects that are created in the air from producers that are in the air get
+		// a kick that will make their starting speed equal mine.
 		//
 		PhysicsBehavior *newObjectPhysics = newObj->getPhysics();
 		PhysicsBehavior *myPhysics = creationObject->getPhysics();
@@ -144,7 +140,7 @@ void QueueProductionExitUpdate::exitObjectViaDoor( Object *newObj, ExitDoorType
 		if (m_rallyPointExists)
 		{
 			tmp = m_rallyPoint;
-			if (ai && ai->isDoingGroundMovement()) 
+			if (ai && ai->isDoingGroundMovement())
 			{
 				if (TheAI->pathfinder()->adjustDestination(newObj, ai->getLocomotorSet(), &tmp))
 					exitPath.push_back(tmp);
@@ -184,7 +180,7 @@ Bool QueueProductionExitUpdate::getExitPosition( Coord3D& exitPosition ) const
 	exitPosition.x = loc.X;
 	exitPosition.y = loc.Y;
 	exitPosition.z = loc.Z;
-	
+
 	return TRUE;
 
 }
@@ -306,7 +302,7 @@ void QueueProductionExitUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -339,7 +335,7 @@ void QueueProductionExitUpdate::xfer( Xfer *xfer )
 	// current burst count
 	xfer->xferUnsignedInt( &m_currentBurstCount );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -350,4 +346,4 @@ void QueueProductionExitUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SpawnPointProductionExitUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SpawnPointProductionExitUpdate.cpp
index 62558c2a389..2bf00757c5b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SpawnPointProductionExitUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SpawnPointProductionExitUpdate.cpp
@@ -28,7 +28,7 @@
 //					This instance puts guys at named bones.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
@@ -197,7 +197,7 @@ void SpawnPointProductionExitUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -227,7 +227,7 @@ void SpawnPointProductionExitUpdate::xfer( Xfer *xfer )
 	// spawn point occupants
 	xfer->xferUser( &m_spawnPointOccupier, sizeof( ObjectID ) * MAX_SPAWN_POINTS );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -238,4 +238,4 @@ void SpawnPointProductionExitUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SupplyCenterProductionExitUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SupplyCenterProductionExitUpdate.cpp
index 9a894e87e2a..1002ca3d90e 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SupplyCenterProductionExitUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SupplyCenterProductionExitUpdate.cpp
@@ -28,7 +28,7 @@
 //					This instance kicks things it outputs into SupplyTruck autopilot after exiting.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/ThingTemplate.h"
@@ -93,7 +93,7 @@ void SupplyCenterProductionExitUpdate::exitObjectViaDoor( Object *newObj, ExitDo
 		for objects in general */
 		// tell the AI about it
 		TheAI->pathfinder()->addObjectToPathfindMap( newObj );
-		
+
 		Vector3 p;
 
 		//
@@ -151,7 +151,7 @@ Bool SupplyCenterProductionExitUpdate::getExitPosition( Coord3D& exitPosition )
 	exitPosition.x = loc.X;
 	exitPosition.y = loc.Y;
 	exitPosition.z = loc.Z;
-	
+
 	return TRUE;
 
 }
@@ -195,7 +195,7 @@ void SupplyCenterProductionExitUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -219,7 +219,7 @@ void SupplyCenterProductionExitUpdate::xfer( Xfer *xfer )
 	// rally point exists
 	xfer->xferBool( &m_rallyPointExists );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -230,4 +230,4 @@ void SupplyCenterProductionExitUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp
index 48b1572969f..179b61d1395 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BitFlagsIO.h"
 #include "Common/BuildAssistant.h"
@@ -55,15 +55,10 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 
-static const ModelConditionFlagType theOpeningFlags[DOOR_COUNT_MAX] = 
+static const ModelConditionFlagType theOpeningFlags[DOOR_COUNT_MAX] =
 {
 	MODELCONDITION_DOOR_1_OPENING,
 	MODELCONDITION_DOOR_2_OPENING,
@@ -71,7 +66,7 @@ static const ModelConditionFlagType theOpeningFlags[DOOR_COUNT_MAX] =
 	MODELCONDITION_DOOR_4_OPENING
 };
 
-static const ModelConditionFlagType theClosingFlags[DOOR_COUNT_MAX] = 
+static const ModelConditionFlagType theClosingFlags[DOOR_COUNT_MAX] =
 {
 	MODELCONDITION_DOOR_1_CLOSING,
 	MODELCONDITION_DOOR_2_CLOSING,
@@ -79,7 +74,7 @@ static const ModelConditionFlagType theClosingFlags[DOOR_COUNT_MAX] =
 	MODELCONDITION_DOOR_4_CLOSING
 };
 
-static const ModelConditionFlagType theWaitingOpenFlags[DOOR_COUNT_MAX] = 
+static const ModelConditionFlagType theWaitingOpenFlags[DOOR_COUNT_MAX] =
 {
 	MODELCONDITION_DOOR_1_WAITING_OPEN,
 	MODELCONDITION_DOOR_2_WAITING_OPEN,
@@ -87,7 +82,7 @@ static const ModelConditionFlagType theWaitingOpenFlags[DOOR_COUNT_MAX] =
 	MODELCONDITION_DOOR_4_WAITING_OPEN
 };
 
-static const ModelConditionFlagType theWaitingToCloseFlags[DOOR_COUNT_MAX] = 
+static const ModelConditionFlagType theWaitingToCloseFlags[DOOR_COUNT_MAX] =
 {
 	MODELCONDITION_DOOR_1_WAITING_TO_CLOSE,
 	MODELCONDITION_DOOR_2_WAITING_TO_CLOSE,
@@ -126,11 +121,11 @@ ProductionUpdateModuleData::ProductionUpdateModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-/*static*/ void ProductionUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void ProductionUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MaxQueueEntries",	INI::parseInt, NULL, offsetof( ProductionUpdateModuleData, m_maxQueueEntries ) },
 		{ "NumDoorAnimations",	INI::parseInt, NULL, offsetof( ProductionUpdateModuleData, m_numDoorAnimations ) },
@@ -163,19 +158,16 @@ ProductionEntry::ProductionEntry( void )
 	m_framesUnderConstruction = 0;
 	m_next = NULL;
 	m_prev = NULL;
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_productionQuantityProduced = 0;
 	m_productionQuantityTotal = 0;
-	//
-}  // end ProductionEntry
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ProductionEntry::~ProductionEntry( void )
 {
 
-}  // end ~ProductionEntry
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -183,7 +175,7 @@ ProductionEntry::~ProductionEntry( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-ProductionUpdate::ProductionUpdate( Thing *thing, const ModuleData* moduleData ) : 
+ProductionUpdate::ProductionUpdate( Thing *thing, const ModuleData* moduleData ) :
 									UpdateModule( thing, moduleData )
 {
 
@@ -203,7 +195,7 @@ ProductionUpdate::ProductionUpdate( Thing *thing, const ModuleData* moduleData )
 	m_setFlags.clear();
 	m_flagsDirty = FALSE;
 
-}  // end ProductionUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -220,9 +212,9 @@ ProductionUpdate::~ProductionUpdate( void )
 		// TheSuperHackers @fix Mauller 13/04/2025 Delete instance of production item
 		deleteInstance(production);
 
-	}  // end while
+	}
 
-}  // end ~ProductionUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -238,8 +230,8 @@ CanMakeType ProductionUpdate::canQueueUpgrade( const UpgradeTemplate *upgrade )
 //-------------------------------------------------------------------------------------------------
 CanMakeType ProductionUpdate::canQueueCreateUnit( const ThingTemplate *unitType ) const
 {
-	/// @todo srj -- this is horrible, but the "right" way to do it is to move 
-	// ProductionUpdate to be part of ParkingPlaceBehavior, which I don't currently 
+	/// @todo srj -- this is horrible, but the "right" way to do it is to move
+	// ProductionUpdate to be part of ParkingPlaceBehavior, which I don't currently
 	// have time for...
 	ParkingPlaceBehaviorInterface* pp = NULL;
 	for (BehaviorModule** i = getObject()->getBehaviorModules(); *i; ++i)
@@ -272,7 +264,7 @@ Bool ProductionUpdate::queueUpgrade( const UpgradeTemplate *upgrade )
 	Player *player = getObject()->getControllingPlayer();
 
 	// sanity check to make sure we can build this upgrade
-	if( upgrade->getUpgradeType() == UPGRADE_TYPE_PLAYER && 
+	if( upgrade->getUpgradeType() == UPGRADE_TYPE_PLAYER &&
 			TheUpgradeCenter->canAffordUpgrade( player, upgrade ) == FALSE )
 		return FALSE;
 	else if( upgrade->getUpgradeType() == UPGRADE_TYPE_OBJECT &&
@@ -293,7 +285,7 @@ Bool ProductionUpdate::queueUpgrade( const UpgradeTemplate *upgrade )
 	// (or that somewhere else could even possibly be here)
 	//
 	if( upgrade->getUpgradeType() == UPGRADE_TYPE_PLAYER &&
-      (player->hasUpgradeComplete( upgrade ) || player->hasUpgradeInProduction( upgrade )) ) 
+      (player->hasUpgradeComplete( upgrade ) || player->hasUpgradeInProduction( upgrade )) )
 		return FALSE;
 
 	if (m_productionCount >= getProductionUpdateModuleData()->m_maxQueueEntries)
@@ -321,11 +313,11 @@ Bool ProductionUpdate::queueUpgrade( const UpgradeTemplate *upgrade )
 	// add this upgrade as in progress in the player
 	player->addUpgrade( upgrade, UPGRADE_STATUS_IN_PRODUCTION );
 
-	
+
 
 	return TRUE;  // queued
 
-}  // end queueUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Cancel an upgrade being produced here */
@@ -356,7 +348,7 @@ void ProductionUpdate::cancelUpgrade( const UpgradeTemplate *upgrade )
 				production->m_upgradeToResearch == upgrade )
 			break;
 
-	}  // end for
+	}
 
 	// sanity, entry not found
 	if( production == NULL )
@@ -364,7 +356,7 @@ void ProductionUpdate::cancelUpgrade( const UpgradeTemplate *upgrade )
 
 	// refund money back to the player
 	Money *money = player->getMoney();
-	money->deposit( production->m_upgradeToResearch->calcCostToBuild( player ) );
+	money->deposit( production->m_upgradeToResearch->calcCostToBuild( player ), TRUE, FALSE );
 
 	// remove this production from the queue
 	removeFromProductionQueue( production );
@@ -378,8 +370,8 @@ void ProductionUpdate::cancelUpgrade( const UpgradeTemplate *upgrade )
 	//
 	if( upgrade->getUpgradeType() == UPGRADE_TYPE_PLAYER )
 		player->removeUpgrade( upgrade );
-	
-}  // end cancelUpgrade
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Queue the prodcution of a unit.  Returns TRUE if unit was added to queue, FALSE if it
@@ -395,8 +387,8 @@ Bool ProductionUpdate::queueCreateUnit( const ThingTemplate *unitType, Productio
 
 	ExitDoorType exitDoor = DOOR_NONE_AVAILABLE;
 
-	/// @todo srj -- this is horrible, but the "right" way to do it is to move 
-	// ProductionUpdate to be part of ParkingPlaceBehavior, which I don't currently 
+	/// @todo srj -- this is horrible, but the "right" way to do it is to move
+	// ProductionUpdate to be part of ParkingPlaceBehavior, which I don't currently
 	// have time for...
 	ParkingPlaceBehaviorInterface* pp = NULL;
 	for (BehaviorModule** i = getObject()->getBehaviorModules(); *i; ++i)
@@ -448,7 +440,7 @@ Bool ProductionUpdate::queueCreateUnit( const ThingTemplate *unitType, Productio
 			break;
 		}
 	}
-	
+
 	// assing production entry data
 	production->m_type = PRODUCTION_UNIT;
 	production->m_objectToProduce = unitType;
@@ -460,7 +452,7 @@ Bool ProductionUpdate::queueCreateUnit( const ThingTemplate *unitType, Productio
 
 	return TRUE;  // unit queued
 
-}  // end queueMakeUnit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Cancel the construction of the unit with the matching production ID */
@@ -480,7 +472,7 @@ void ProductionUpdate::cancelUnitCreate( ProductionID productionID )
 			// give the player the cost of the object back
 			Player *player = getObject()->getControllingPlayer();
 			Money *money = player->getMoney();
-			money->deposit( production->m_objectToProduce->calcCostToBuild( player ) );
+			money->deposit( production->m_objectToProduce->calcCostToBuild( player ), TRUE, FALSE );
 
 			// remove from queue list
 			removeFromProductionQueue( production );
@@ -490,11 +482,11 @@ void ProductionUpdate::cancelUnitCreate( ProductionID productionID )
 
 			return;
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
-}  // end cancelUnitCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Cancel all production of type unitType */
@@ -515,22 +507,22 @@ void ProductionUpdate::cancelAllUnitsOfType( const ThingTemplate *unitType)
 
 			// cancel the production
 			cancelUnitCreate( production->getProductionID() );
-		
+
 			// advance
 			production = temp;
 
-		}  // end if 
-		else 
+		}
+		else
 		{
 
 			// advance
 			production = production->m_next;
 
-		}  // end else
+		}
 
-	}  // end for
+	}
 
-}  // end cancelAllUnitsOfType
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update the door behavior */
@@ -552,7 +544,7 @@ void ProductionUpdate::updateDoors()
 
 			if( now - m_doors[i].m_doorOpenedFrame > d->m_doorOpeningTime )
 			{
-			
+
 				// set our frame markers for door states
 				m_doors[i].m_doorOpenedFrame = 0;
 				m_doors[i].m_doorWaitOpenFrame = now;
@@ -564,9 +556,9 @@ void ProductionUpdate::updateDoors()
 				m_setFlags.set( theWaitingOpenFlags[i] );
 				m_flagsDirty = TRUE;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else if( m_doors[i].m_doorWaitOpenFrame )
 		{
 
@@ -584,9 +576,9 @@ void ProductionUpdate::updateDoors()
 				m_setFlags.set( theClosingFlags[i] );
 				m_flagsDirty = TRUE;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else if( m_doors[i].m_doorClosedFrame && !m_doors[i].m_holdOpen )
 		{
 
@@ -601,9 +593,9 @@ void ProductionUpdate::updateDoors()
 				m_setFlags.set( theClosingFlags[i], false );
 				m_flagsDirty = TRUE;
 
-			}  // end if
+			}
 
-		}  // end else if
+		}
 	}
 }
 
@@ -627,7 +619,7 @@ UpdateSleepTime ProductionUpdate::update( void )
 	//
 	if( m_constructionCompleteFrame )
 	{
-	
+
 		if( now - m_constructionCompleteFrame > d->m_constructionCompleteDuration )
 		{
 
@@ -639,9 +631,9 @@ UpdateSleepTime ProductionUpdate::update( void )
 			m_setFlags.set( MODELCONDITION_CONSTRUCTION_COMPLETE, false );
 			m_flagsDirty = TRUE;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// if we have dirty bits that need to be set and cleared, do it here all at once
 	if( m_flagsDirty == TRUE )
@@ -656,10 +648,10 @@ UpdateSleepTime ProductionUpdate::update( void )
 		m_setFlags.clear();
 		m_flagsDirty = FALSE;
 
-	}  // end if
+	}
 
 	// if nothing in the queue get outta here
-	if( production == NULL )	
+	if( production == NULL )
 		return UPDATE_SLEEP_NONE;
 
 	//
@@ -687,7 +679,7 @@ UpdateSleepTime ProductionUpdate::update( void )
 
 		return UPDATE_SLEEP_NONE;
 
-	}  // end if
+	}
 
 	//
 	// you can disallow types of units on the fly in scripts, so if there is something
@@ -695,18 +687,18 @@ UpdateSleepTime ProductionUpdate::update( void )
 	//
 	if( production->getProductionType() == PRODUCTION_UNIT &&
 			player->allowedToBuild( production->getProductionObject() ) == FALSE )
-	{	
-	
+	{
+
 		// Don't cancel dozers in the queue.  jba.
-		if (!production->getProductionObject()->isKindOf(KINDOF_DOZER)) 
+		if (!production->getProductionObject()->isKindOf(KINDOF_DOZER))
 		{
 
 			cancelUnitCreate(production->getProductionID());
 			return UPDATE_SLEEP_NONE;
-	
-		}  // end if
 
-	}  // end if
+		}
+
+	}
 
 	// increase the frames we've been under production for
 	production->m_framesUnderConstruction++;
@@ -776,14 +768,14 @@ UpdateSleepTime ProductionUpdate::update( void )
 								m_setFlags.set( theOpeningFlags[exitDoor] );
 								m_flagsDirty = TRUE;
 
-							}  // end if
+							}
 							// if the door is waiting-open, keep it there
 							else if( door->m_doorWaitOpenFrame != 0 )
 							{
 
 								door->m_doorWaitOpenFrame = now;
 
-							}  // end else if
+							}
 							// if the door is closing, for now, pop it to waiting open
 							else if( door->m_doorClosedFrame != 0 )
 							{
@@ -798,9 +790,9 @@ UpdateSleepTime ProductionUpdate::update( void )
 								m_setFlags.set( theWaitingOpenFlags[exitDoor] );
 								m_flagsDirty = TRUE;
 
-							}  // end else
+							}
 
-						}  // end if, has door animation
+						}
 
 						// we now go into the construction complete condition for a while
 						if( m_constructionCompleteFrame == 0 )
@@ -810,8 +802,8 @@ UpdateSleepTime ProductionUpdate::update( void )
 							m_setFlags.set( MODELCONDITION_CONSTRUCTION_COMPLETE );
 							m_flagsDirty = TRUE;
 
-						}  // end if
-											
+						}
+
 						//
 						// make a new object, note that for production buildings that have door
 						// animations we will not make the object until the door has been totally
@@ -819,9 +811,9 @@ UpdateSleepTime ProductionUpdate::update( void )
 						//
 						if( d->m_numDoorAnimations == 0 || door == NULL || door->m_doorWaitOpenFrame != 0 )
 						{
-							Object *newObj = TheThingFactory->newObject( production->m_objectToProduce, 
+							Object *newObj = TheThingFactory->newObject( production->m_objectToProduce,
 																	creationBuilding->getControllingPlayer()->getDefaultTeam() );
-							
+
 							newObj->setProducer(creationBuilding);
 
 							// call the exit interface to do the rally point and position stuff
@@ -861,27 +853,27 @@ UpdateSleepTime ProductionUpdate::update( void )
 							// This is last so the voice check can easily check for "first" guy
 							production->oneProductionSuccessful();
 
-						}  // end if, door open or no door animation ... make the object
+						}
 
-					}  // end, if we got a door reservation
+					}
 
-				} //end of trying to exit all the things we were planning on attempting
+				}
 
 				if( production->getProductionQuantityRemaining() == 0 )
 				{
 					// remove this production entry so we can go on to the next if we are totally finished
 					removeFromProductionQueue( production );
-					
+
 					// delete the production entry
 					deleteInstance(production);
 				}
 
-			}  // end if we found an exit interface
+			}
 			else
 			{
 
 				// there is no exit interface, this is an error
-				DEBUG_ASSERTCRASH( 0, ("Cannot create '%s', there is no ExitUpdate interface defined for producer object '%s'\n", 
+				DEBUG_ASSERTCRASH( 0, ("Cannot create '%s', there is no ExitUpdate interface defined for producer object '%s'",
 															production->m_objectToProduce->getName().str(),
 															creationBuilding->getTemplate()->getName().str()) );
 
@@ -891,16 +883,16 @@ UpdateSleepTime ProductionUpdate::update( void )
 				// delete the production entry
 				deleteInstance(production);
 
-			}  // end else
-	
-		}  // end if, production unit
+			}
+
+		}
 		else if( production->m_type == PRODUCTION_UPGRADE )
 		{
 			const UpgradeTemplate *upgrade = production->m_upgradeToResearch;
 
 			// we finished an upgrade, lets add that money spent on it to the scorekeeper
 			player->getScoreKeeper()->addMoneySpent(upgrade->calcCostToBuild(player));
-			
+
 			// notify the script engine
 			TheScriptEngine->notifyOfCompletedUpgrade(
 				us->getControllingPlayer()->getPlayerIndex(),
@@ -908,7 +900,7 @@ UpdateSleepTime ProductionUpdate::update( void )
 				us->getID());
 
 			// print a message to the local player
-			if( us->isLocallyControlled() )
+			if( us->isLocallyViewed() )
 			{
 				UnicodeString msg;
 				UnicodeString format = TheGameText->fetch( "UPGRADE:UpgradeComplete" );
@@ -919,10 +911,10 @@ UpdateSleepTime ProductionUpdate::update( void )
 
 				// upgrades are a more rare event, play a nifty radar event thingie
 				TheRadar->createEvent( us->getPosition(), RADAR_EVENT_UPGRADE );
-				
+
 				//Play the sound for the upgrade, because we just built it!
 				AudioEventRTS sound = *upgrade->getResearchCompleteSound();
-				if( TheAudio->isValidAudioEvent( &sound ) ) 
+				if( TheAudio->isValidAudioEvent( &sound ) )
 				{
 					//We have a custom upgrade complete sound.
 					sound.setObjectID( us->getID() );
@@ -938,8 +930,8 @@ UpdateSleepTime ProductionUpdate::update( void )
 				sound = *upgrade->getUnitSpecificSound();
 				sound.setObjectID( us->getID() );
 				TheAudio->addAudioEvent( &sound );
-			
-			}  // end if
+
+			}
 
 			// update the upgrade status in the player or give the upgrade to the object
 			if( upgrade->getUpgradeType() == UPGRADE_TYPE_PLAYER )
@@ -950,7 +942,7 @@ UpdateSleepTime ProductionUpdate::update( void )
 			{
 				us->giveUpgrade( upgrade );
 			}
-			
+
 			//Also mark the UI dirty -- incase object with upgrade cameo is selected.
 			Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
 			Object *selectedObject = draw ? draw->getObject() : NULL;
@@ -976,12 +968,12 @@ UpdateSleepTime ProductionUpdate::update( void )
 			// delete the production entry
 			deleteInstance(production);
 
-		}  // end else, production upgrade
+		}
+
+	}
 
-	}  // end if, production is 100% complete
-	
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Add the production entry to the *END* of the production queue list */
@@ -1000,7 +992,7 @@ void ProductionUpdate::addToProductionQueue( ProductionEntry *production )
 		m_productionQueueTail->m_next = production;
 		production->m_prev = m_productionQueueTail;
 
-	}  // end if
+	}
 
 	// this production entry is now the new tail at the end of the list
 	m_productionQueueTail = production;
@@ -1020,11 +1012,11 @@ void ProductionUpdate::addToProductionQueue( ProductionEntry *production )
 			m_setFlags.set( MODELCONDITION_ACTIVELY_CONSTRUCTING );
 			m_flagsDirty = TRUE;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end addToProductionQueue
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove the production entry from the production queue list */
@@ -1068,13 +1060,13 @@ void ProductionUpdate::removeFromProductionQueue( ProductionEntry *production )
 			m_clearFlags.set( MODELCONDITION_ACTIVELY_CONSTRUCTING, true );
 			m_setFlags.set( MODELCONDITION_ACTIVELY_CONSTRUCTING, false );
 			m_flagsDirty = TRUE;
-		
-		}  // end if
 
-	}  // end if
+		}
+
+	}
 
 /*
-	// Debugging 
+	// Debugging
 	UnicodeString msg;
 	if( production->getProductionType() == ProductionEntry::PRODUCTION_UNIT )
 	{
@@ -1089,10 +1081,10 @@ void ProductionUpdate::removeFromProductionQueue( ProductionEntry *production )
 	}
 */
 
-}  // end removeFromProductionQueue
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Is the upgrade already in the production queue.  Note that you can only have one 
+/** Is the upgrade already in the production queue.  Note that you can only have one
 	* production entry for any given upgrade in the queue */
 //-------------------------------------------------------------------------------------------------
 Bool ProductionUpdate::isUpgradeInQueue( const UpgradeTemplate *upgrade ) const
@@ -1106,7 +1098,7 @@ Bool ProductionUpdate::isUpgradeInQueue( const UpgradeTemplate *upgrade ) const
 
 	return FALSE;  // not in queue
 
-}  // end isUpgradeInQueue
+}
 
 // ------------------------------------------------------------------------------------------------
 /** count number of units with matching unit type in the production queue */
@@ -1117,13 +1109,13 @@ UnsignedInt ProductionUpdate::countUnitTypeInQueue( const ThingTemplate *unitTyp
 	const ProductionEntry *production;
 
 	for( production = firstProduction(); production; production = nextProduction( production ) )
-		if( production->getProductionType() == PRODUCTION_UNIT && 
+		if( production->getProductionType() == PRODUCTION_UNIT &&
 				production->getProductionObject() == unitType )
 			count++;
 
 	return count;
 
-}  // end countUnitTypeInQueue
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1142,7 +1134,7 @@ void ProductionUpdate::cancelAndRefundAllProduction( void )
   // Empirically, in release the code can loop forever.  So we limit to 100 passes. jba. [8/31/2003]
   const Int productionLimit = 100;// With luck, we never queue up 100 units. [8/31/2003]
   Int i;
-  for (i=0; i<productionLimit; i++) 
+  for (i=0; i<productionLimit; i++)
   {
     // iterate through our production queue
     if( m_productionQueue )
@@ -1154,13 +1146,13 @@ void ProductionUpdate::cancelAndRefundAllProduction( void )
       else
       {
         // unknown production type
-        DEBUG_CRASH(( "ProductionUpdate::cancelAndRefundAllProduction - Unknown production type '%d'\n",
+        DEBUG_CRASH(( "ProductionUpdate::cancelAndRefundAllProduction - Unknown production type '%d'",
                       m_productionQueue->getProductionType() ));
         return;
-      }  // end else
-    }  // end if
+      }
+    }
   }
-}  // end cancelAndRefundAllProduction
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1184,7 +1176,7 @@ void ProductionUpdate::setHoldDoorOpen(ExitDoorType exitDoor, Bool holdIt)
 // ------------------------------------------------------------------------------------------------
 /*static*/ ProductionUpdateInterface *ProductionUpdate::getProductionUpdateInterfaceFromObject( Object *obj )
 {
-	
+
 	// sanity
 	if( obj == NULL )
 		return NULL;
@@ -1198,13 +1190,13 @@ void ProductionUpdate::setHoldDoorOpen(ExitDoorType exitDoor, Bool holdIt)
 		if( pui )
 			return pui;
 
-	}  // end for, bmi
+	}
 
 	// interface not found
 	return NULL;
 
 
-}  // end getProductionUpdateInterfaceFromObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -1215,7 +1207,7 @@ void ProductionUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1239,7 +1231,7 @@ void ProductionUpdate::xfer( Xfer *xfer )
 	for( production = m_productionQueue; production; production = production->m_next )
 		productionCount++;
 	xfer->xferUnsignedShort( &productionCount );
-	
+
 	// production queue data
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
@@ -1277,9 +1269,9 @@ void ProductionUpdate::xfer( Xfer *xfer )
 			// exit door
 			xfer->xferInt( (Int*)&production->m_exitDoor );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		AsciiString name;
@@ -1287,11 +1279,11 @@ void ProductionUpdate::xfer( Xfer *xfer )
 		// the queue should be emtpy now
 		if( m_productionQueue != NULL )
 		{
-		
-			DEBUG_CRASH(( "ProductionUpdate::xfer - m_productionQueue is not empty, but should be\n" ));
+
+			DEBUG_CRASH(( "ProductionUpdate::xfer - m_productionQueue is not empty, but should be" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each element
 		for( UnsignedShort i = 0; i < productionCount; ++i )
@@ -1311,7 +1303,7 @@ void ProductionUpdate::xfer( Xfer *xfer )
 				m_productionQueueTail->m_next = production;
 				production->m_prev = m_productionQueueTail;
 
-			}  // end if
+			}
 
 			// this production entry is now the new tail at the end of the list
 			m_productionQueueTail = production;
@@ -1327,13 +1319,13 @@ void ProductionUpdate::xfer( Xfer *xfer )
 				production->m_objectToProduce = TheThingFactory->findTemplate( name );
 				if( production->m_objectToProduce == NULL )
 				{
-	
-					DEBUG_CRASH(( "ProductionUpdate::xfer - Cannot find template '%s'\n", name.str() ));
+
+					DEBUG_CRASH(( "ProductionUpdate::xfer - Cannot find template '%s'", name.str() ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
-			}  // end if, unit production
+			}
 			else
 			{
 
@@ -1341,12 +1333,12 @@ void ProductionUpdate::xfer( Xfer *xfer )
 				if( production->m_upgradeToResearch == NULL )
 				{
 
-					DEBUG_CRASH(( "ProductionUpdate::xfer - Cannot find upgrade '%s'\n", name.str() ));
+					DEBUG_CRASH(( "ProductionUpdate::xfer - Cannot find upgrade '%s'", name.str() ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
-			}  // end else, upgrade production
+			}
 
 			// production ID
 			xfer->xferUser( &production->m_productionID, sizeof( ProductionID ) );
@@ -1366,19 +1358,19 @@ void ProductionUpdate::xfer( Xfer *xfer )
 			// exit door
 			xfer->xferInt( (Int*)&production->m_exitDoor );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// unique id
 	xfer->xferUser( &m_uniqueID, sizeof( ProductionID ) );
-	
+
 	// production count
 	xfer->xferUnsignedInt( &m_productionCount );
-	
+
 	// construction complete frame
 	xfer->xferUnsignedInt( &m_constructionCompleteFrame );
-	
+
 	// door info
 	xfer->xferUser( &m_doors, sizeof( DoorInfo ) * DOOR_COUNT_MAX );
 
@@ -1391,7 +1383,7 @@ void ProductionUpdate::xfer( Xfer *xfer )
 	// flags dirty
 	xfer->xferBool( &m_flagsDirty );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1402,4 +1394,4 @@ void ProductionUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp
index 9f706cb5cf1..c805e87220b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/GameLogic.h"
@@ -36,11 +36,6 @@
 #include "GameLogic/Module/ProjectileStreamUpdate.h"
 #include "WWMath/vector3.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -55,7 +50,7 @@ ProjectileStreamUpdate::ProjectileStreamUpdate( Thing *thing, const ModuleData*
 	m_owningObject = INVALID_ID;
 	m_nextFreeIndex = 0;
 	m_firstValidIndex = 0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -134,7 +129,7 @@ void ProjectileStreamUpdate::getAllPoints( Vector3 *points, Int *count )
 			points[pointCount].X = thisPoint.x;
 			points[pointCount].Y = thisPoint.y;
 			points[pointCount].Z = thisPoint.z;
-			
+
 
 			if ( obj && obj->isKindOf( KINDOF_VEHICLE ) )				// this makes the stream skim along my roof, if I have a roof
 			{
@@ -181,7 +176,7 @@ void ProjectileStreamUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -211,7 +206,7 @@ void ProjectileStreamUpdate::xfer( Xfer *xfer )
 	// owning object
 	xfer->xferObjectID( &m_owningObject );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -222,4 +217,4 @@ void ProjectileStreamUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProneUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProneUpdate.cpp
index 1dd8e70a4d1..4e1013b63a1 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProneUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProneUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 
@@ -51,7 +51,7 @@ ProneUpdateModuleData::ProneUpdateModuleData() :
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DamageToFramesRatio", INI::parseReal, NULL, offsetof(ProneUpdateModuleData, m_damageToFramesRatio) },
 		{ 0, 0, 0, 0 }
@@ -63,7 +63,7 @@ ProneUpdateModuleData::ProneUpdateModuleData() :
 ProneUpdate::ProneUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 	m_proneFrames = 0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -127,7 +127,7 @@ void ProneUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -148,7 +148,7 @@ void ProneUpdate::xfer( Xfer *xfer )
 	// prone frames
 	xfer->xferInt( &m_proneFrames );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -159,5 +159,5 @@ void ProneUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/RadarUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/RadarUpdate.cpp
index be33eb57862..3d53816e638 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/RadarUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/RadarUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ModelState.h"
 #include "Common/Xfer.h"
@@ -44,7 +44,7 @@ RadarUpdateModuleData::RadarUpdateModuleData( void )
 
 	m_radarExtendTime = 0.0f;
 
-}  // end RadarUpdateModuleData
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -60,14 +60,14 @@ RadarUpdate::RadarUpdate( Thing *thing, const ModuleData *moduleData )
 	m_extendDoneFrame = 0;
 	m_extendComplete = FALSE;
 
-}  // end RadarUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 RadarUpdate::~RadarUpdate( void )
 {
 
-}  // end RadarUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -86,7 +86,7 @@ void RadarUpdate::extendRadar( void )
 	//Change this to make the radar active after extension...
 	m_radarActive = true;
 
-}  // end extendRadar
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -116,11 +116,11 @@ UpdateSleepTime RadarUpdate::update( void )
 			draw->clearAndSetModelConditionState( MODELCONDITION_RADAR_EXTENDING,
 																						MODELCONDITION_RADAR_UPGRADED );
 
-	}  // end if
-	
+	}
+
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -131,7 +131,7 @@ void RadarUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -158,7 +158,7 @@ void RadarUpdate::xfer( Xfer *xfer )
 	// radar active
 	xfer->xferBool( &m_radarActive );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -169,5 +169,5 @@ void RadarUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/RadiusDecalUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/RadiusDecalUpdate.cpp
index 501ec2ed4da..df97bdbd418 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/RadiusDecalUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/RadiusDecalUpdate.cpp
@@ -26,7 +26,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
@@ -90,7 +90,7 @@ void RadiusDecalUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -113,7 +113,7 @@ void RadiusDecalUpdate::xfer( Xfer *xfer )
 
 	xfer->xferBool(&m_killWhenNoLongerAttacking);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -124,4 +124,4 @@ void RadiusDecalUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SlavedUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SlavedUpdate.cpp
index d4b5ea35ced..1cff280766b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SlavedUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SlavedUpdate.cpp
@@ -30,7 +30,7 @@
 //				can use any or all features, some of which are specialized.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
@@ -50,11 +50,6 @@
 #include "GameLogic/Module/SlavedUpdate.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define STRAY_MULTIPLIER 2.0f // Multiplier from stating diestance from tunnel, to max distance from
 const Real CLOSE_ENOUGH = 15;				// Our moveTo commands and pathfinding can't handle people in the way, so quit trying to hump someone on your spot
@@ -70,12 +65,12 @@ SlavedUpdate::SlavedUpdate( Thing *thing, const ModuleData* moduleData ) : Updat
 	m_framesToWait = 0;
 	m_repairState = REPAIRSTATE_NONE;
 	m_repairing = false;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 SlavedUpdate::~SlavedUpdate( void )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void SlavedUpdate::onObjectCreated()
@@ -152,7 +147,7 @@ UpdateSleepTime SlavedUpdate::update( void )
 	if( !master || master->isEffectivelyDead() || master->isDisabledByType( DISABLED_UNMANNED ) )
 	{
 		stopSlavedEffects();
-		
+
 		//Killing is lame.
 		//me->kill();
 
@@ -162,7 +157,7 @@ UpdateSleepTime SlavedUpdate::update( void )
 
 		return UPDATE_SLEEP_NONE;
 	}
-	else 
+	else
 	{
 		Team *masterTeam = master->getTeam();
 		Team *myTeam     = me->getTeam();
@@ -172,21 +167,21 @@ UpdateSleepTime SlavedUpdate::update( void )
 		}
 
 	}
-	
+
 	if (data->m_stayOnSameLayerAsMaster)
 		me->setLayer(master->getLayer());
-	
+
 	//Clear the drone spotting bonus to the master. Up to the drone
 	//to satisfy the conditions to set it again for the next update.
 	master->clearWeaponBonusCondition( WEAPONBONUSCONDITION_DRONE_SPOTTING );
-	
+
 	//Get my master's AI. If he is attacking something, grant him a range bonus,
 	//and I'll fly over the target.
 	Object *target = NULL;
 	AIUpdateInterface *masterAI = master->getAIUpdateInterface();
 	if( masterAI )
 	{
-		target = masterAI->getCurrentVictim(); 
+		target = masterAI->getCurrentVictim();
 	}
 
 	//Calculate the health percentage of the master -- there are two places we care.
@@ -203,7 +198,7 @@ UpdateSleepTime SlavedUpdate::update( void )
 			healthPercentage = (Int)(health / maxHealth * 100.0f);
 		}
 	}
-		
+
 	//Determine whether or not we need to go back to the master to repair him
 	if( healthPercentage <= data->m_repairWhenHealthBelowPercentage )
 	{
@@ -217,7 +212,7 @@ UpdateSleepTime SlavedUpdate::update( void )
 		//2ND PRIORITY: Go to the master's current victim (as close as wander distance allows)
 		if( target )
 		{
-			//At this point, we officially are in an attack mode! Now, simply 
+			//At this point, we officially are in an attack mode! Now, simply
 			endRepair();
 			doAttackLogic( target );
 			return UPDATE_SLEEP_NONE;
@@ -289,7 +284,7 @@ void SlavedUpdate::doAttackLogic( const Object *target )
 	Object *master = TheGameLogic->findObjectByID( m_slaver );
 	Coord3D attackPosition;
 
-	//First, determine the attack position. If the target is too far away, then we'll 
+	//First, determine the attack position. If the target is too far away, then we'll
 	//calculate the closest allowable position.
 	const Coord3D *targetPos = target->getPosition();
 	Real dist = ThePartitionManager->getDistanceSquared( me, targetPos, FROM_BOUNDINGSPHERE_2D );
@@ -337,7 +332,7 @@ void SlavedUpdate::doAttackLogic( const Object *target )
 
 	if( dist < sqr( data->m_distToTargetToGrantRangeBonus ) )
 	{
-		//Finally, seeing we are close enough to the target, grant our 
+		//Finally, seeing we are close enough to the target, grant our
 		//master extended weapon range!
 		master->setWeaponBonusCondition( WEAPONBONUSCONDITION_DRONE_SPOTTING );
 	}
@@ -353,7 +348,7 @@ void SlavedUpdate::doScoutLogic( const Coord3D *mastersDestination )
 	Object *master = TheGameLogic->findObjectByID( m_slaver );
 	Coord3D scoutPosition;
 
-	//First, determine the scout position. If our master's destination is too far away, then we'll 
+	//First, determine the scout position. If our master's destination is too far away, then we'll
 	//calculate the closest allowable position.
 	Real dist = ThePartitionManager->getDistanceSquared( me, mastersDestination, FROM_BOUNDINGSPHERE_2D );
 	if( dist > sqr( data->m_scoutRange ) )
@@ -504,7 +499,7 @@ void SlavedUpdate::doRepairLogic()
 		{
 			//Calculate the repair rate per frame.
 			Real repairAmount = data->m_repairRatePerSecond / LOGICFRAMES_PER_SECOND;
-			
+
 			DamageInfo healingInfo;
 			healingInfo.in.m_amount = repairAmount;
 			healingInfo.in.m_damageType = DAMAGE_HEALING;
@@ -565,7 +560,7 @@ void SlavedUpdate::setRepairState( RepairStates repairState )
 	const SlavedUpdateModuleData* data = getSlavedUpdateModuleData();
 
 	if( repairState == m_repairState )
-	{	
+	{
 		return;
 	}
 
@@ -641,7 +636,7 @@ void SlavedUpdate::setRepairState( RepairStates repairState )
 							Real time = (Real)(m_framesToWait * LOGICFRAMES_PER_SECOND);
 							weldingSys->setLifetimeRange( time, time );
 
-							AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_repairSparks;	
+							AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_repairSparks;
 							soundToPlay.setPosition( &pos );
 							TheAudio->addAudioEvent( &soundToPlay );
 						}
@@ -715,7 +710,7 @@ void SlavedUpdate::startSlavedEffects( const Object *slaver )
 	m_guardPointOffset.zero();
 	m_guardPointOffset.x += data->m_guardMaxRange * Cos( randomDirection );
 	m_guardPointOffset.y += data->m_guardMaxRange * Sin( randomDirection );
-	
+
 	// mark selves as not selectable
 	getObject()->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_UNSELECTABLE ) );
 }
@@ -740,7 +735,7 @@ void SlavedUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -773,7 +768,7 @@ void SlavedUpdate::xfer( Xfer *xfer )
 	// repairing
 	xfer->xferBool( &m_repairing );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -784,5 +779,5 @@ void SlavedUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp
index 4a08bd399fc..7a1e167cbc9 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   Handles processing of unit special abilities.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/GlobalData.h"
@@ -63,23 +63,15 @@
 #include "GameLogic/Module/StealthUpdate.h"
 #include "GameLogic/Module/ContainModule.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
 SpecialAbilityUpdate::SpecialAbilityUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_captureFlashPhase = 0.0f;
-	//
 	m_active = false;
 	m_prepFrames = 0;
-	m_animFrames = 0;	
+	m_animFrames = 0;
   m_targetID = INVALID_ID;
 	m_targetPos.zero();
 	m_locationCount = 0;
@@ -93,13 +85,13 @@ SpecialAbilityUpdate::SpecialAbilityUpdate( Thing *thing, const ModuleData* modu
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 //  This is the althernate way to one-at-a-time BlackLotus' specials; we'll keep it commented her until Dustin decides, or until 12/10/02
 //	setBusy( FALSE );
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 SpecialAbilityUpdate::~SpecialAbilityUpdate( void )
 {
 	onExit( true );
-} 
+}
 
 /*------------------------------------------------------------------------------------------------
 void SpecialAbilityUpdate::update( void )
@@ -112,7 +104,7 @@ that has every option will do the following in order:
 	2 -- UNPACK: If I need to unpack before I can prepare, then do so now (this uses the model
 			 condition unpack).
 	3 -- PREPARE: If I need to perform a task for a period of time before I can trigger my special
-			 ability, then do so now. A good example is aiming with a targetting laser for a few 
+			 ability, then do so now. A good example is aiming with a targetting laser for a few
 			 seconds before firing your special weapon.
 	4 -- TRIGGER: Once preparation is complete, fire your special ability now.
 	5 -- PACK: If I need to pack after finishing my attack, do so now.
@@ -123,7 +115,7 @@ that has every option will do the following in order:
 	Persistent Specials -- A persistent special will continually trigger it's effect every so often
 		 and never end. A good example of this is the disable building hack. The hacker will run up
 		 to the target building, unpack, prepare (firing hack stream), then after a period of time,
-		 the building becomes disabled. But because it's persistent, we reset the preparation and 
+		 the building becomes disabled. But because it's persistent, we reset the preparation and
 		 trigger the building disabled code over and over again -- which is on a timer.
 	No Target Specials -- You can link two different main specials together. Colonel Burton has the
 		 ability to lay C4 charges on multiple targets. Activating these specials require a target.
@@ -137,9 +129,9 @@ that has every option will do the following in order:
 	AbilityAbortRange		 -- After starting an attack, it'll allow preparation unless the target goes
 	                        beyond this range. If this happens, the ability is aborted outright.
 	PreparationTime			 -- How long it takes to prepare your special once in position and unpacked.
-	PersistentPrepTime	 -- This value defines whether or not you are using a persistent special. 
+	PersistentPrepTime	 -- This value defines whether or not you are using a persistent special.
 													Once the special ability is triggered, it'll wait until this specified
-													delay occurs and it'll trigger it again, for ever until the unit dies, 
+													delay occurs and it'll trigger it again, for ever until the unit dies,
 													the target dies, or the unit decides to do something else.
 	PackTime						 -- How long it takes to pack up the unit after triggering a non persistent
 													special ability or after ordering the unit to do something else, or the
@@ -163,7 +155,7 @@ that has every option will do the following in order:
 													time. The laser example only has one, but the C4 charges can have more.
 	SpecialObjectsPersistent -- If this flag is set, then the objects will remain should the owner
 													decides to do something else... C4 charges are a good example.
-	EffectDuration			 -- Defines the duration of the special ability. In the case of disabling 
+	EffectDuration			 -- Defines the duration of the special ability. In the case of disabling
 													the building (hacker), this value will dictate how long the building
 													will be disabled should the hacker die or stop the attack.
 	UniqueSpecialObjectTargets -- Prevents the owner from placing multiple special objects on the
@@ -173,7 +165,7 @@ that has every option will do the following in order:
 													is a bad example -- because it requires the owner to detonate them.
 	FlipObjectAfterPacking -- Simply rotates the object 180 degrees after packing (due to special
 													animation case).
-	FlipObjectAfterUnPacking -- Simply rotates the object 180 degrees after unpacking (due to 
+	FlipObjectAfterUnPacking -- Simply rotates the object 180 degrees after unpacking (due to
 													special	animation case). Used by colonel burton after planting charge.
 
 
@@ -202,7 +194,7 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
 	//We need to do this now because it's possible the special objects need to be checked while
 	//the the special ability is over (thus inactive).
 	validateSpecialObjects();
-	
+
 	//Important! This check will see if there has been any commands issued by either the player
 	//or script. When told to do something else, we need to immediately cleanup our special ability.
 	//This also means some things might be left around like timed charges to detonate.
@@ -214,7 +206,7 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
 
 	if( !m_active )	// Not active.
 		return calcSleepTime();
-	
+
 	AIUpdateInterface *ai = getObject()->getAIUpdateInterface();
 	if( !ai )
 	{
@@ -249,7 +241,7 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
 				shouldAbort = TRUE;
 			else switch (data->m_specialPowerTemplate->getSpecialPowerType())
 			{
-				case SPECIAL_INFANTRY_CAPTURE_BUILDING:	
+				case SPECIAL_INFANTRY_CAPTURE_BUILDING:
 				case SPECIAL_BLACKLOTUS_CAPTURE_BUILDING:
 				case SPECIAL_HACKER_DISABLE_BUILDING:
 					if (target->getTeam() == getObject()->getTeam())
@@ -294,8 +286,8 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
 				endPreparation();
 				if( needToPack() )
 				{
-					//STEP 5 -- PACK 
-					//Note: If we actually do pack, then cleanup will be handled in 
+					//STEP 5 -- PACK
+					//Note: If we actually do pack, then cleanup will be handled in
 					//handlePackingProcess(), near the top of this function.
 					startPacking(true);
 				}
@@ -316,8 +308,8 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
 				endPreparation();
 				if( needToPack() )
 				{
-					//STEP 5 -- PACK 
-					//Note: If we actually do pack, then cleanup will be handled in 
+					//STEP 5 -- PACK
+					//Note: If we actually do pack, then cleanup will be handled in
 					//handlePackingProcess(), near the top of this function.
 					startPacking(false);
 				}
@@ -358,8 +350,8 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
 
 				if( needToPack() )
 				{
-					//STEP 5 -- PACK 
-					//Note: If we actually do pack, then cleanup will be handled in 
+					//STEP 5 -- PACK
+					//Note: If we actually do pack, then cleanup will be handled in
 					//handlePackingProcess(), near the top of this function.
 					startPacking(true);
 				}
@@ -380,10 +372,10 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool SpecialAbilityUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTemplate *specialPowerTemplate, 
-																													 const Object *targetObj, 
-																													 const Coord3D *targetPos, 
-																													 const Waypoint *way, 
+Bool SpecialAbilityUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTemplate *specialPowerTemplate,
+																													 const Object *targetObj,
+																													 const Coord3D *targetPos,
+																													 const Waypoint *way,
 																													 UnsignedInt commandOptions )
 {
 	const SpecialAbilityUpdateModuleData* data = getSpecialAbilityUpdateModuleData();
@@ -406,7 +398,7 @@ Bool SpecialAbilityUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTem
 	m_facingComplete = false;
 	m_withinStartAbilityRange = false;
 
-	getObject()->clearModelConditionFlags( 
+	getObject()->clearModelConditionFlags(
 		MAKE_MODELCONDITION_MASK4( MODELCONDITION_UNPACKING, MODELCONDITION_PACKING, MODELCONDITION_FIRING_A, MODELCONDITION_RAISING_FLAG ) );
 
 	if( targetObj )
@@ -419,7 +411,7 @@ Bool SpecialAbilityUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTem
 		//Get the position!
 		m_targetPos = *targetPos;
 	}
-	
+
 	//Clear any old AI before starting this special ability.
 	if( !getObject()->getAIUpdateInterface() )
 	{
@@ -435,7 +427,7 @@ Bool SpecialAbilityUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTem
 		//Only unpack if we need to -- setting it to unpacked will skip step 2 in the update
 		m_packingState = STATE_UNPACKED;
 	}
-	
+
 	m_active = true;
 
 	//Prevent other mutually exclusive specials from running (kill them now if we're starting something else)
@@ -444,16 +436,16 @@ Bool SpecialAbilityUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTem
 	if( disableSA && disableSA != this )
 		disableSA->onExit( FALSE );
 	disableSA = getObject()->findSpecialAbilityUpdate( SPECIAL_BLACKLOTUS_STEAL_CASH_HACK );
-	if( disableSA && disableSA != this ) 
+	if( disableSA && disableSA != this )
 		disableSA->onExit( FALSE );
 	disableSA = getObject()->findSpecialAbilityUpdate( SPECIAL_BLACKLOTUS_CAPTURE_BUILDING );
-	if( disableSA && disableSA != this ) 
+	if( disableSA && disableSA != this )
 		disableSA->onExit( FALSE );
 	disableSA = getObject()->findSpecialAbilityUpdate( SPECIAL_REMOTE_CHARGES );
-	if( disableSA && disableSA != this ) 
+	if( disableSA && disableSA != this )
 		disableSA->onExit( FALSE );
 	disableSA = getObject()->findSpecialAbilityUpdate( SPECIAL_TIMED_CHARGES );
-	if( disableSA && disableSA != this ) 
+	if( disableSA && disableSA != this )
 		disableSA->onExit( FALSE );
 
 
@@ -482,7 +474,7 @@ Bool SpecialAbilityUpdate::isPowerCurrentlyInUse( const CommandButton *command )
 	if( m_packingState != STATE_NONE )
 	{
 		//exception for powers with zero reload time... they are ready to use immediately!
-		if ( (m_packingState == STATE_PACKING || m_packingState == STATE_PACKED) && 
+		if ( (m_packingState == STATE_PACKING || m_packingState == STATE_PACKED) &&
 										command && command->getSpecialPowerTemplate()->getReloadTime() == 0 )
 			return false;
 
@@ -491,7 +483,7 @@ Bool SpecialAbilityUpdate::isPowerCurrentlyInUse( const CommandButton *command )
 			return true;
 		}
 	}
-	
+
 	return false;
 }
 
@@ -500,7 +492,7 @@ void SpecialAbilityUpdate::onExit( Bool cleanup )
 {
 	const SpecialAbilityUpdateModuleData* data = getSpecialAbilityUpdateModuleData();
 
-	getObject()->clearModelConditionFlags( 
+	getObject()->clearModelConditionFlags(
 		MAKE_MODELCONDITION_MASK4( MODELCONDITION_UNPACKING, MODELCONDITION_PACKING, MODELCONDITION_FIRING_A, MODELCONDITION_RAISING_FLAG ) );
 	getObject()->clearStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_IS_USING_ABILITY ) );
 
@@ -522,7 +514,7 @@ void SpecialAbilityUpdate::onExit( Bool cleanup )
 //	setBusy( FALSE );// My owner is no longer using me
 
 
-// no, actually, we DON'T want to call this here, since onExit is always called 
+// no, actually, we DON'T want to call this here, since onExit is always called
 // (directly or indirectly) from update()... and calling setWakeFrame() from your
 // own update() method is a no-no (since it would just be ignored in favor
 // of the return value from update() anyway). just set m_active to false,
@@ -642,8 +634,8 @@ void SpecialAbilityUpdate::startPacking(Bool success)
 	m_animFrames = data->m_packTime * variation;
 
 	//Set the animation state
-	getObject()->clearAndSetModelConditionFlags( 
-				MAKE_MODELCONDITION_MASK2( MODELCONDITION_UNPACKING, MODELCONDITION_RAISING_FLAG ), 
+	getObject()->clearAndSetModelConditionFlags(
+				MAKE_MODELCONDITION_MASK2( MODELCONDITION_UNPACKING, MODELCONDITION_RAISING_FLAG ),
 				MAKE_MODELCONDITION_MASK( MODELCONDITION_PACKING ) );
 
 	AudioEventRTS sound = data->m_packSound;
@@ -695,8 +687,8 @@ void SpecialAbilityUpdate::startUnpacking()
 	m_animFrames = data->m_unpackTime * variation;
 
 	//Set the animation state
-	getObject()->clearAndSetModelConditionFlags( 
-				MAKE_MODELCONDITION_MASK( MODELCONDITION_PACKING ), 
+	getObject()->clearAndSetModelConditionFlags(
+				MAKE_MODELCONDITION_MASK( MODELCONDITION_PACKING ),
 				MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ) );
 
 
@@ -766,10 +758,10 @@ Bool SpecialAbilityUpdate::isWithinStartAbilityRange() const
 				{
 					return true;
 				}
-			}  
+			}
 			return false;
 		}
-		
+
 		if( data->m_approachRequiresLOS )
 		{
 			//Make sure we can see the target!
@@ -777,7 +769,7 @@ Bool SpecialAbilityUpdate::isWithinStartAbilityRange() const
 			PartitionFilter *filters[] = { &filterLOS, NULL };
 			ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( self, range, FROM_BOUNDINGSPHERE_2D, filters, ITER_SORTED_NEAR_TO_FAR );
 			MemoryPoolObjectHolder hold(iter);
-			for( Object *theTarget = iter->first(); theTarget; theTarget = iter->next() ) 
+			for( Object *theTarget = iter->first(); theTarget; theTarget = iter->next() )
 			{
 				//LOS check succeeded.
 				if( target == theTarget )
@@ -841,7 +833,7 @@ Bool SpecialAbilityUpdate::isWithinAbilityAbortRange() const
 				{
 					return true;
 				}
-			}  
+			}
 			return false;
 		}
 
@@ -906,7 +898,7 @@ void SpecialAbilityUpdate::startPreparation()
 			}
 			break;
 		}
-		case SPECIAL_INFANTRY_CAPTURE_BUILDING:	
+		case SPECIAL_INFANTRY_CAPTURE_BUILDING:
 		{
 			Object *target = TheGameLogic->findObjectByID( m_targetID );
 			if (target)
@@ -925,11 +917,11 @@ void SpecialAbilityUpdate::startPreparation()
 				draw->setAnimationCompletionTime(data->m_preparationFrames);
 
 			//Warn the victim so he might have a chance to react!
-			if( target && target->isLocallyControlled() )
+			if( target && target->isLocallyViewed() )
 			{
 				TheEva->setShouldPlay( EVA_BuildingBeingStolen );
 			}
-			
+
 			break;
 		}
 
@@ -952,14 +944,14 @@ void SpecialAbilityUpdate::startPreparation()
 				{
 					if (!initLaser(specialObject, target))
 						return;
-					
+
 					//For the hacker this sets up the looping typing animation.
 					getObject()->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ),
 																											 MAKE_MODELCONDITION_MASK( MODELCONDITION_FIRING_A ) );
 				}
 
 				//Warn the victim so he might have a chance to react!
-				if( spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING && target && target->isLocallyControlled() )
+				if( spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING && target && target->isLocallyViewed() )
 				{
 					TheEva->setShouldPlay( EVA_BuildingBeingStolen );
 				}
@@ -975,7 +967,7 @@ void SpecialAbilityUpdate::startPreparation()
 	{
 		spmInterface->markSpecialPowerTriggered(NULL);// Null for not creating a view object
 	}
-	
+
 	if (getObject()->getAI()) {
 		getObject()->getAI()->aiIdle( CMD_FROM_AI ); // just in case.  jba.
 	}
@@ -1018,7 +1010,7 @@ Bool SpecialAbilityUpdate::initLaser(Object* specialObject, Object* target )
 		//If we can't find the bone, then set it to our current position.
 		startPos.set( getObject()->getPosition() );
 	}
-	
+
 	Coord3D endPos;
 	if (target)
 	{
@@ -1066,7 +1058,7 @@ Bool SpecialAbilityUpdate::continuePreparation()
 				//It's been captured by a colleague, so cancel!
 				return false;
 			}
-				
+
 			//Specialized code that specifically creates and looks up a laser update.
 			for( std::list<ObjectID>::iterator it = m_specialObjectIDList.begin(); it != m_specialObjectIDList.end(); ++it )
 			{
@@ -1108,17 +1100,17 @@ Bool SpecialAbilityUpdate::continuePreparation()
 				if (targetDraw) // skip fx if merely 'invulnerable'
 				{
 					Bool lastPhase = ( ((Int)m_captureFlashPhase) & 1 );// were we in a flashy phase last frame?
-					
+
 					Real denominator = MAX(1, data->m_preparationFrames);
 					Real increment = 1.0f - ((Real)m_prepFrames / denominator );
 					m_captureFlashPhase += increment / 3.0f;
 
 					Bool thisPhase = ( ((Int)m_captureFlashPhase) & 1 );// are we in a flashy phase this frame?
 
-					if ( lastPhase && ( ! thisPhase ) ) 
+					if ( lastPhase && ( ! thisPhase ) )
 					{
 
-						RGBColor myHouseColor; 
+						RGBColor myHouseColor;
 						myHouseColor.setFromInt( getObject()->getIndicatorColor() );
 
 						Real saturation = TheGlobalData->m_selectionFlashSaturationFactor;
@@ -1178,7 +1170,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 	AudioEventRTS sound = data->m_triggerSound;
 	sound.setObjectID( object->getID() );
 	TheAudio->addAudioEvent( &sound );
-	
+
 
 	Bool okToLoseStealth = TRUE;
 
@@ -1221,8 +1213,8 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 				StickyBombUpdate *update = (StickyBombUpdate*)charge->findUpdateModule( key_StickyBombUpdate );
 				if( !update )
 				{
-					DEBUG_ASSERTCRASH( 0, 
-						("Unit '%s' attempted to place %s on %s but the bomb requires a StickyBombUpdate module.", 
+					DEBUG_ASSERTCRASH( 0,
+						("Unit '%s' attempted to place %s on %s but the bomb requires a StickyBombUpdate module.",
 						object->getTemplate()->getName().str(),
 						charge->getTemplate()->getName().str(),
 						target->getTemplate()->getName().str() ) );
@@ -1232,13 +1224,13 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 				//Setting the producer ID allows the sticky bomb update module to initialize
 				//and setup timers, etc.
 				update->init( target, object );
-				
+
 
 			}
 			break;
 		}
 		case SPECIAL_HACKER_DISABLE_BUILDING:
-		case SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK: 
+		case SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK:
 		{
 			//Disable the target temporarily.
 			Object *target = TheGameLogic->findObjectByID( m_targetID );
@@ -1265,7 +1257,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 				durationInterleaveFactor = 2;
 			}
 
-			
+
 			if ( m_doDisableFXParticles )
 			{
 				const ParticleSystemTemplate *tmp = data->m_disableFXParticleSystem;
@@ -1287,7 +1279,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 			break;
 		}
 
-		case SPECIAL_INFANTRY_CAPTURE_BUILDING:	
+		case SPECIAL_INFANTRY_CAPTURE_BUILDING:
 		case SPECIAL_BLACKLOTUS_CAPTURE_BUILDING:
 		{
 			Object *target = TheGameLogic->findObjectByID( m_targetID );
@@ -1297,7 +1289,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 			{
 				return;
 			}
-			
+
 			if (target->getTeam() == object->getTeam())
 			{
 				// it's been captured by a colleague! we should stop.
@@ -1313,12 +1305,12 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 			}
 
 			//Play the "building stolen" EVA event if the local player is the victim!
-			if( target && target->isLocallyControlled() )
+			if( target && target->isLocallyViewed() )
 			{
 				TheEva->setShouldPlay( EVA_BuildingStolen );
 			}
 
-			target->defect( object->getControllingPlayer()->getDefaultTeam(), 1); // one frame of flash! 
+			target->defect( object->getControllingPlayer()->getDefaultTeam(), 1); // one frame of flash!
 
 			SpecialPowerModuleInterface *spmInterface = getMySPM();
 			if (spmInterface && spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING )
@@ -1340,14 +1332,18 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 				return;
 			}
 
-			//Steal a thousand cash from the other team!
+			//Steal cash from the other team!
 			Money *targetMoney = target->getControllingPlayer()->getMoney();
 			Money *objectMoney = object->getControllingPlayer()->getMoney();
 			if( targetMoney && objectMoney )
 			{
 				UnsignedInt cash = targetMoney->countMoney();
+#if RETAIL_COMPATIBLE_CRC || PRESERVE_RETAIL_BEHAVIOR
 				UnsignedInt desiredAmount = 1000;
-				//Check to see if they have 1000 cash, otherwise, take the remainder!
+#else
+				UnsignedInt desiredAmount = data->m_effectValue;
+#endif
+				//Check to see if they have the cash, otherwise, take the remainder!
 				cash = min( desiredAmount, cash );
 				if( cash > 0 )
 				{
@@ -1359,7 +1355,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 						controller->getScoreKeeper()->addMoneyEarned( cash );
 
 					//Play the "cash stolen" EVA event if the local player is the victim!
-					if( target && target->isLocallyControlled() )
+					if( target && target->isLocallyViewed() )
 					{
 						TheEva->setShouldPlay( EVA_CashStolen );
 					}
@@ -1371,7 +1367,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 					pos.set( object->getPosition() );
 					pos.z += 20.0f; //add a little z to make it show up above the unit.
 					TheInGameUI->addFloatingText( moneyString, &pos, GameMakeColor( 0, 255, 0, 255 ) );
-				
+
 					//Display cash lost floating over the target
 					moneyString.format( TheGameText->fetch( "GUI:LoseCash" ), cash );
 					pos.set( target->getPosition() );
@@ -1385,7 +1381,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 		case SPECIAL_REMOTE_CHARGES:
 		{
 			static NameKeyType key_StickyBombUpdate = NAMEKEY( "StickyBombUpdate" );
-			if( m_targetID == INVALID_ID && !m_targetPos.x && !m_targetPos.y && !m_targetPos.z ) 
+			if( m_targetID == INVALID_ID && !m_targetPos.x && !m_targetPos.y && !m_targetPos.z )
 			{
 				//If there is no target object nor position, then we are detonating the existing charges.
 				std::list<ObjectID>::iterator i;
@@ -1401,7 +1397,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 							update->detonate();
 							okToLoseStealth = FALSE;
 							//Note: while the objects are detonating, they will still exist in the game.
-							//Our update will be responsible for validating their existance and removing them.. 
+							//Our update will be responsible for validating their existance and removing them..
 							//in case either the enemy player cleans one up, or after it's gone.
 						}
 					}
@@ -1423,8 +1419,8 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 					StickyBombUpdate *update = (StickyBombUpdate*)charge->findUpdateModule( key_StickyBombUpdate );
 					if( !update )
 					{
-						DEBUG_ASSERTCRASH( 0, 
-							("Unit '%s' attempted to place remote charge but the charge '%s' requires a StickyBombUpdate module.", 
+						DEBUG_ASSERTCRASH( 0,
+							("Unit '%s' attempted to place remote charge but the charge '%s' requires a StickyBombUpdate module.",
 							object->getTemplate()->getName().str(),
 							charge->getTemplate()->getName().str() ) );
 						killSpecialObjects();
@@ -1437,7 +1433,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 			}
 			break;
 		}
-		
+
 		case SPECIAL_DISGUISE_AS_VEHICLE:
 		{
 			Object *target = TheGameLogic->findObjectByID( m_targetID );
@@ -1476,7 +1472,7 @@ Object* SpecialAbilityUpdate::createSpecialObject()
 		{
 			//If we are dealing with persistent objects, and we have reached our
 			//limit we can have, then don't allow any more to be created....
-			//We could add recycling code if need be.. but the logic that handles 
+			//We could add recycling code if need be.. but the logic that handles
 			//canDoSpecialPowerXXX should prevent this triggering.
 			return NULL;
 		}
@@ -1498,7 +1494,7 @@ Object* SpecialAbilityUpdate::createSpecialObject()
 			m_specialObjectIDList.push_back( specialObject->getID() );
 			m_specialObjectEntries++;
 			specialObject->setPosition( getObject()->getPosition() );
-			
+
 			//So we can get experience from it when it blows up (if applicable)
 			//specialObject->setProducer( getObject() ); --This causes it to be an enemy which is naughty.
 			ExperienceTracker *xpTracker = specialObject->getExperienceTracker();
@@ -1528,7 +1524,7 @@ void SpecialAbilityUpdate::killSpecialObjects()
 			TheGameLogic->destroyObject( specialObject );
 		}
 	}
-	
+
 	//Reset the list
 	m_specialObjectIDList.clear();
 	m_specialObjectEntries = 0;
@@ -1556,7 +1552,7 @@ UnsignedInt SpecialAbilityUpdate::getSpecialObjectCount() const
 }
 
 //-------------------------------------------------------------------------------------------------
-UnsignedInt SpecialAbilityUpdate::getSpecialObjectMax() const 
+UnsignedInt SpecialAbilityUpdate::getSpecialObjectMax() const
 {
 	const SpecialAbilityUpdateModuleData* data = getSpecialAbilityUpdateModuleData();
 	return data->m_maxSpecialObjects;
@@ -1664,7 +1660,7 @@ void SpecialAbilityUpdate::finishAbility()
 		if (ai)
 	  	ai->aiIdle(CMD_FROM_AI);
 	}
-	
+
 	//// Emit finished sound //Moved to StartPacking(), thank you, ML
 	//AudioEventRTS event = *getObject()->getTemplate()->getVoiceTaskComplete();
 	//event.setObjectID(getObject()->getID());
@@ -1731,10 +1727,10 @@ void SpecialAbilityUpdate::startFacing()
 	if (getObject()->getPhysics())
 		getObject()->getPhysics()->resetDynamicPhysics();
 
-// NO, do not do this; we promise Update modules that they will be 
+// NO, do not do this; we promise Update modules that they will be
 // called *exactly* once per frame... no more, no less! (srj)
 //ai->update();
-	
+
 	m_facingInitiated = true;
 	if( target )
 	{
@@ -1804,10 +1800,10 @@ void SpecialAbilityUpdate::endPreparation()
 
 		case SPECIAL_MISSILE_DEFENDER_LASER_GUIDED_MISSILES:
 		case SPECIAL_HACKER_DISABLE_BUILDING:
-		case SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK: 
+		case SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK:
 		case SPECIAL_BLACKLOTUS_CAPTURE_BUILDING:
 		case SPECIAL_BLACKLOTUS_STEAL_CASH_HACK:
-		case SPECIAL_INFANTRY_CAPTURE_BUILDING:	
+		case SPECIAL_INFANTRY_CAPTURE_BUILDING:
 			killSpecialObjects();
 			break;
 
@@ -1825,7 +1821,7 @@ void SpecialAbilityUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1888,7 +1884,7 @@ void SpecialAbilityUpdate::xfer( Xfer *xfer )
   // capture flash phase
   xfer->xferReal( &m_captureFlashPhase );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1899,4 +1895,4 @@ void SpecialAbilityUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpyVisionUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpyVisionUpdate.cpp
index f5d341a4550..5397affbdc0 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpyVisionUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpyVisionUpdate.cpp
@@ -24,13 +24,13 @@
 
 // FILE: SpyVisionUpdate.cpp /////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, September 2002
-// Desc:   Special Power will spy on the vision of all enemy players.  
+// Desc:   Special Power will spy on the vision of all enemy players.
 //				Putting a SpecialPower in a behavior takes a big huge amount of code duplication and
 //				has no precedent.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -40,10 +40,10 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void SpyVisionUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void SpyVisionUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ 0, 0, 0, 0 }
 	};
@@ -72,7 +72,7 @@ void SpyVisionUpdate::activateSpyVision( UnsignedInt duration )
 	m_deactivateFrame = now + duration;
 
 	doActivationWork( TRUE );
-		
+
 	setWakeFrame( getObject(), UPDATE_SLEEP(duration) );
 }
 
@@ -96,7 +96,7 @@ void SpyVisionUpdate::doActivationWork( Bool setting )
 	Player *ourPlayer = getObject()->getControllingPlayer();
 	if( ourPlayer == NULL  ||  ThePlayerList == NULL )
 		return;
-	
+
 	for (Int i=0; i < ThePlayerList->getPlayerCount(); ++i)
 	{
 		Player *player = ThePlayerList->getNthPlayer(i);
@@ -112,7 +112,7 @@ void SpyVisionUpdate::onDelete( void )
 	// If I was left on at the time of death, then turn me off.
 	if( m_deactivateFrame )
 		doActivationWork( FALSE );
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -123,7 +123,7 @@ void SpyVisionUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -144,7 +144,7 @@ void SpyVisionUpdate::xfer( Xfer *xfer )
 	// deactivate frame
 	xfer->xferUnsignedInt( &m_deactivateFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -155,4 +155,4 @@ void SpyVisionUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
index 106fe566cc1..79769bc5214 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
@@ -27,11 +27,12 @@
 // Desc:	 An update that checks for a status bit to stealth the owning object
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_STEALTHLEVEL_NAMES
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "Common/GameUtility.h"
 #include "Common/MiscAudio.h"
 #include "Common/Radar.h"
 #include "Common/ThingTemplate.h"
@@ -50,18 +51,13 @@
 #include "Common/PlayerList.h"
 #include "Common/Player.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
-void StealthDetectorUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void StealthDetectorUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DetectionRate",							INI::parseDurationUnsignedInt,			NULL, offsetof( StealthDetectorUpdateModuleData, m_updateRate ) },
 		{ "DetectionRange",							INI::parseReal,											NULL, offsetof( StealthDetectorUpdateModuleData, m_detectionRange ) },
@@ -91,7 +87,7 @@ StealthDetectorUpdate::StealthDetectorUpdate( Thing *thing, const ModuleData* mo
 	// start these guys with random phasings so that we don't
 	// have all of 'em check on the same frame.
 	setWakeFrame(getObject(), m_enabled ? UPDATE_SLEEP(GameLogicRandomValue(1, data->m_updateRate)) : UPDATE_SLEEP_FOREVER);
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -101,9 +97,9 @@ StealthDetectorUpdate::~StealthDetectorUpdate( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StealthDetectorUpdate::setSDEnabled( Bool enabled ) 
-{ 
-	m_enabled = enabled; 
+void StealthDetectorUpdate::setSDEnabled( Bool enabled )
+{
+	m_enabled = enabled;
 	setWakeFrame(getObject(), m_enabled ? UPDATE_SLEEP_NONE : UPDATE_SLEEP_FOREVER);
 }
 
@@ -116,11 +112,11 @@ void StealthDetectorUpdate::setSDEnabled( Bool enabled )
 class PartitionFilterStealthedOrStealthGarrisoned : public PartitionFilter
 {
 public:
-	PartitionFilterStealthedOrStealthGarrisoned() { } 
+	PartitionFilterStealthedOrStealthGarrisoned() { }
 
 	virtual Bool allow(Object *objOther);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterStealthedOrStealthGarrisoned"; }
 #endif
 };
@@ -149,8 +145,8 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 	Object* self = getObject();
 
 	if (self->isEffectivelyDead())
-		return UPDATE_SLEEP_FOREVER; 
-	
+		return UPDATE_SLEEP_FOREVER;
+
 	// We have to wait until we are fully constructed, but we will detect the moment we finish
 	if( self->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
 		return UPDATE_SLEEP_NONE;
@@ -179,7 +175,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 			else if( !data->m_canDetectWhileTransported )
 			{
 				//We are in a normal container and can't detect!
-				return UPDATE_SLEEP(data->m_updateRate);	
+				return UPDATE_SLEEP(data->m_updateRate);
 			}
 		}
 	}
@@ -200,7 +196,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 	Bool foundSomeone = FALSE;
 
 	SimpleObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(
-								self, visionRange, FROM_CENTER_2D, filters); 
+								self, visionRange, FROM_CENTER_2D, filters);
 	MemoryPoolObjectHolder hold(iter);
 	for (Object *them = iter->first(); them; them = iter->next())
 	{
@@ -208,7 +204,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 			continue;
 
 		StealthUpdate* stealth = them->getStealth();
-		if ( stealth ) 
+		if ( stealth )
 		{
 
 			// we have found someone
@@ -222,7 +218,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 			{
 
 				// for the player revealing the stealth unit do some UI feedback
-				if( ThePlayerList->getLocalPlayer() == self->getControllingPlayer() &&
+				if( rts::getObservedOrLocalPlayer() == self->getControllingPlayer() &&
 						self->getRelationship( them ) != ALLIES )
 				{
 					Bool doFeedback = TRUE;
@@ -247,12 +243,12 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
  						// ui msg
  						TheInGameUI->message( TheGameText->fetch( "MESSAGE:StealthDiscovered" ) );
 
-					}  // end if				 
+					}
 
-				}  // end if
+				}
 
 				// for the unit being revealed, do some UI feedback
-				if( ThePlayerList->getLocalPlayer() == them->getControllingPlayer() &&
+				if( rts::getObservedOrLocalPlayer() == them->getControllingPlayer() &&
 						self->getRelationship( them ) != ALLIES )
 				{
  					Bool doFeedback = TRUE;
@@ -265,7 +261,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 						doFeedback = TheRadar->tryEvent( RADAR_EVENT_STEALTH_NEUTRALIZED, them->getPosition() );
 					else
  						TheRadar->createEvent( them->getPosition(), RADAR_EVENT_STEALTH_NEUTRALIZED );
-					
+
 					// do audio and UI message if we need to do feedback
 					if( doFeedback )
 					{
@@ -277,15 +273,15 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
  						// ui msg
  						TheInGameUI->message( TheGameText->fetch( "MESSAGE:StealthNeutralized" ) );
 
-					}  // end if
-				
-				}  // end if
-					 
-			}  // end if, them was not previously detected
+					}
+
+				}
+
+			}
 
 			// updateRate PLUS 1 is necessary to ensure it stays detected 'till we are called again...
 			stealth->markAsDetected(data->m_updateRate + 1);
-			
+
 			/** @todo srj -- evil hack here... this whole heat-vision thing is fucked.
 				don't want it on mines but no good way to do that. hack for now. */
 			Drawable *theirDraw = them->getDrawable();
@@ -312,7 +308,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 				}
 			}
 
-		}//end if them has stealthupdate
+		}
 		else // perhaps they are garrisoning something stealthy, eh?
 		{
 			ContainModuleInterface *contain = them->getContain();
@@ -324,7 +320,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 					rider = *it;
 
 					StealthUpdate* stealth = rider->getStealth();
-					if ( stealth ) 
+					if ( stealth )
 					{
 						// we have found someone
 						foundSomeone = TRUE;
@@ -339,8 +335,11 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 		}
 	}
 
+
+  const Player *localPlayer = rts::getObservedOrLocalPlayer();
+
 	//Make sure the detector is visible to the local player before we add effects or sounds.
-	if (data->m_IRGridParticleSysTmpl && self->getShroudedStatus(ThePlayerList->getLocalPlayer()->getPlayerIndex()) <= OBJECTSHROUD_PARTIAL_CLEAR)
+	if (data->m_IRGridParticleSysTmpl && self->getShroudedStatus(localPlayer->getPlayerIndex()) <= OBJECTSHROUD_PARTIAL_CLEAR)
 	{
 		Drawable *myDraw = self->getDrawable();
 		Coord3D bonePosition = {-1.66f,5.5f,15};//@todo use bone position
@@ -379,7 +378,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 					sys->attachToObject( self );
 
 				sys->setPosition( &bonePosition );
-				
+
 			}
 		}
 
@@ -392,7 +391,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 		IRPingSound.setObjectID( self->getID() );
 		TheAudio->addAudioEvent(&IRPingSound);
 
-	} // end if doIRFX
+	}
 
 
 	return UPDATE_SLEEP(data->m_updateRate);
@@ -408,7 +407,7 @@ void StealthDetectorUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -429,7 +428,7 @@ void StealthDetectorUpdate::xfer( Xfer *xfer )
 	// enabled
 	xfer->xferBool( &m_enabled );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -440,4 +439,4 @@ void StealthDetectorUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp
index 74f7b3f4606..1411a1b8307 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp
@@ -27,13 +27,14 @@
 // Desc:	 An update that checks for a status bit to stealth the owning object
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_STEALTHLEVEL_NAMES
 #define DEFINE_OBJECT_STATUS_NAMES
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Radar.h"
@@ -58,23 +59,18 @@
 #include "GameLogic/Module/ContainModule.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
-void StealthUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void StealthUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "StealthDelay",									INI::parseDurationUnsignedInt,	NULL, offsetof( StealthUpdateModuleData, m_stealthDelay ) },
 		{ "MoveThresholdSpeed",						INI::parseVelocityReal,					NULL, offsetof( StealthUpdateModuleData, m_stealthSpeed ) },
-		{ "StealthForbiddenConditions",		INI::parseBitString32,					TheStealthLevelNames, offsetof( StealthUpdateModuleData, m_stealthLevel) }, 
+		{ "StealthForbiddenConditions",		INI::parseBitString32,					TheStealthLevelNames, offsetof( StealthUpdateModuleData, m_stealthLevel) },
 		{ "HintDetectableConditions",	  	ObjectStatusMaskType::parseFromINI,	NULL, offsetof( StealthUpdateModuleData, m_hintDetectableStates) },
 		{ "FriendlyOpacityMin",						INI::parsePercentToReal,				NULL, offsetof( StealthUpdateModuleData, m_friendlyOpacityMin ) },
 		{ "FriendlyOpacityMax",						INI::parsePercentToReal,				NULL, offsetof( StealthUpdateModuleData, m_friendlyOpacityMax ) },
@@ -103,10 +99,7 @@ StealthUpdate::StealthUpdate( Thing *thing, const ModuleData* moduleData ) : Upd
 	//Must be enabled manually if using disguise system (bomb truck uses)
 	m_enabled = !data->m_teamDisguised;
 
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_detectionExpiresFrame = 0;
-	//
 	m_pulsePhaseRate		= 0.2f;
 	m_pulsePhase				= GameClientRandomValueReal(0, PI);
 
@@ -116,7 +109,7 @@ StealthUpdate::StealthUpdate( Thing *thing, const ModuleData* moduleData ) : Upd
 	m_disguised									= false;
 	m_disguiseTransitionFrames	= 0;
 	m_disguiseHalfpointReached  = false;
-	
+
 	if( data->m_innateStealth )
 	{
 		//Giving innate stealth units this status bit allows other code to easily check the status bit.
@@ -129,7 +122,7 @@ StealthUpdate::StealthUpdate( Thing *thing, const ModuleData* moduleData ) : Upd
 	// we do not need to restore a disguise
 	m_xferRestoreDisguise = FALSE;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -149,7 +142,7 @@ Bool StealthUpdate::allowedToStealth() const
 		//Doesn't stealth while aggressive (includes approaching).
 		return FALSE;
 	}
-	
+
 	if( flags & STEALTH_NOT_WHILE_USING_ABILITY && self->getStatusBits().test( OBJECT_STATUS_IS_USING_ABILITY ) )
 	{
 		//Doesn't stealth while using a special ability (starting with preparation, which takes place after unpacking).
@@ -199,10 +192,10 @@ Bool StealthUpdate::allowedToStealth() const
 	}
 
 	const PhysicsBehavior *physics = self->getPhysics();
-	if ((flags & STEALTH_NOT_WHILE_MOVING) && physics != NULL && 
+	if ((flags & STEALTH_NOT_WHILE_MOVING) && physics != NULL &&
 					physics->getVelocityMagnitude() > getStealthUpdateModuleData()->m_stealthSpeed)
 		return false;
-	
+
 	if( self->testScriptStatusBit(OBJECT_STATUS_SCRIPT_UNSTEALTHED))
 	{
 		//We can't stealth because a script disabled this ability for this object!
@@ -216,14 +209,14 @@ Bool StealthUpdate::allowedToStealth() const
 //---------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------------------------------
-void StealthUpdate::hintDetectableWhileUnstealthed() 
+void StealthUpdate::hintDetectableWhileUnstealthed()
 {
 	Object *self = getObject();
 	const StealthUpdateModuleData *md = getStealthUpdateModuleData();
 
 	if( self && md->m_hintDetectableStates.testForAny( self->getStatusBits() ) )
 	{
-		if ( self->getControllingPlayer() == ThePlayerList->getLocalPlayer() )
+		if ( self->getControllingPlayer() == rts::getObservedOrLocalPlayer() )
 		{
 			Drawable *selfDraw = self->getDrawable();
 			if ( selfDraw )
@@ -239,7 +232,7 @@ void StealthUpdate::hintDetectableWhileUnstealthed()
 
 Real StealthUpdate::getFriendlyOpacity() const
 {
-	return getStealthUpdateModuleData()->m_friendlyOpacityMin; 
+	return getStealthUpdateModuleData()->m_friendlyOpacityMin;
 }
 
 
@@ -251,7 +244,7 @@ StealthLookType StealthUpdate::calcStealthedStatusForPlayer(const Object* obj, c
 		for stealthy things, there are these distinct "logical" states:
 
 		-- not stealthed at all (ie, totally visible)
-		-- stealthed 
+		-- stealthed
 		-- stealthed-but-detected
 
 		and the following visual states:
@@ -262,7 +255,7 @@ StealthLookType StealthUpdate::calcStealthedStatusForPlayer(const Object* obj, c
 		-- stealthed-but-visible-to-everyone-due-to-being-detected (sd)
 
 		Let's be ubergeeks and make a matrix of the possibilities:
-				
+
 								Ally		Nonally
 		normal:			(n)			(n)
 		stealthed:	(sv)		(i)
@@ -272,7 +265,7 @@ StealthLookType StealthUpdate::calcStealthedStatusForPlayer(const Object* obj, c
 		Or, to put it another way:
 
 		If normal, you always appear normal.
-		If stealthed (and not detected), you appear as (sv) to allies and (i) to others. 
+		If stealthed (and not detected), you appear as (sv) to allies and (i) to others.
 		If detected, you always appears as (sd).
 
 		Sorry, there is one more condition, stealthed, but visible to friendly folks, YET detected
@@ -281,7 +274,7 @@ StealthLookType StealthUpdate::calcStealthedStatusForPlayer(const Object* obj, c
 
 
 	*/
-	
+
 
 	if (obj->isEffectivelyDead())
 		return STEALTHLOOK_NONE;			// making sure he turns visible when he dies
@@ -370,7 +363,7 @@ UpdateSleepTime StealthUpdate::update( void )
 		if( wasHidden && draw )
 			draw->setDrawableHidden( TRUE );
 
-	}  // end if
+	}
 
 	Object *self = getObject();
 	UnsignedInt now = TheGameLogic->getFrame();
@@ -489,7 +482,7 @@ UpdateSleepTime StealthUpdate::update( void )
 	else
 	{
 		m_stealthAllowedFrame = now + getStealthUpdateModuleData()->m_stealthDelay;
-		
+
 		// if you are destealthing on your own free will, play sound for all to hear
 		if( self->getStatusBits().test( OBJECT_STATUS_STEALTHED ) )
 		{
@@ -499,10 +492,10 @@ UpdateSleepTime StealthUpdate::update( void )
 		}
 
 		self->clearStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ) );
-		
+
 		hintDetectableWhileUnstealthed();
-	
-		
+
+
 	}
 
 
@@ -561,7 +554,7 @@ UpdateSleepTime StealthUpdate::update( void )
 
 	if (draw)
 	{
-		StealthLookType stealthLook = calcStealthedStatusForPlayer( self, ThePlayerList->getLocalPlayer() );
+		StealthLookType stealthLook = calcStealthedStatusForPlayer( self, rts::getObservedOrLocalPlayer() );
 		draw->setStealthLook( stealthLook );
 	}
 
@@ -625,7 +618,7 @@ void StealthUpdate::markAsDetected(UnsignedInt numFrames)
 	if( data->m_orderIdleEnemiesToAttackMeUponReveal )
 	{
 		// This can't be a partitionmanager thing, because we need to know which objects can see
-		// us. Therefore, walk the play list, and for each player that considers us an enemy, 
+		// us. Therefore, walk the play list, and for each player that considers us an enemy,
 		// check if any of their units can see us.
 
 		Int numPlayers = ThePlayerList->getPlayerCount();
@@ -662,7 +655,7 @@ void StealthUpdate::disguiseAsObject( const Object *target )
 			m_disguiseAsTemplate				= target->getTemplate();
 			m_disguiseAsPlayerIndex			= target->getControllingPlayer()->getPlayerIndex();
 		}
-		
+
 		m_enabled										= true;
 		m_transitioningToDisguise		= true; //Means we are gaining disguise over time.
 		m_disguiseTransitionFrames	= data->m_disguiseTransitionFrames;
@@ -686,7 +679,7 @@ void StealthUpdate::disguiseAsObject( const Object *target )
 	{
 		TheControlBar->markUIDirty();
 	}
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -704,7 +697,7 @@ void StealthUpdate::changeVisualDisguise()
 		Player *player = ThePlayerList->getNthPlayer( m_disguiseAsPlayerIndex );
 
 		ModelConditionFlags flags = draw->getModelConditionFlags();
-		
+
 		//Get rid of the old instance!
 		TheGameClient->destroyDrawable( draw );
 
@@ -748,12 +741,13 @@ void StealthUpdate::changeVisualDisguise()
 		FXList::doFXPos( data->m_disguiseFX, self->getPosition() );
 
 		m_disguised = true;
+		self->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_DISGUISED ) );
 	}
 	else if( m_disguiseAsPlayerIndex != -1 )
 	{
 		m_disguiseAsPlayerIndex = -1;
 		ModelConditionFlags flags = draw->getModelConditionFlags();
-		
+
 		//Get rid of the old instance!
 		TheGameClient->destroyDrawable( draw );
 
@@ -782,7 +776,7 @@ void StealthUpdate::changeVisualDisguise()
 			//UGH!
 			//A concrete example is the bomb truck. Different payloads are displayed based on which upgrades have been
 			//made. When the bomb truck disguises as something else, these subobjects are lost because the vector is
-			//stored in W3DDrawModule. When we revert back to the original bomb truck, we call this function to 
+			//stored in W3DDrawModule. When we revert back to the original bomb truck, we call this function to
 			//recalculate those upgraded subobjects.
 			self->forceRefreshSubObjectUpgradeStatus();
 		}
@@ -813,6 +807,7 @@ void StealthUpdate::changeVisualDisguise()
 
 		FXList::doFXPos( data->m_disguiseRevealFX, self->getPosition() );
 		m_disguised = false;
+		self->clearStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_DISGUISED ) );
 	}
 
 	//Reset the radar (determines color on add)
@@ -833,7 +828,7 @@ void StealthUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -865,7 +860,7 @@ void StealthUpdate::xfer( Xfer *xfer )
 
 	// pulse phase
 	xfer->xferReal( &m_pulsePhase );
-	
+
 	// disguise as player index
 	xfer->xferInt( &m_disguiseAsPlayerIndex );
 
@@ -883,14 +878,14 @@ void StealthUpdate::xfer( Xfer *xfer )
 			if( m_disguiseAsTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "StealthUpdate::xfer - Unknown template '%s'\n", name.str() ));
+				DEBUG_CRASH(( "StealthUpdate::xfer - Unknown template '%s'", name.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// disguise transition frames
 	xfer->xferUnsignedInt( &m_disguiseTransitionFrames );
@@ -904,7 +899,7 @@ void StealthUpdate::xfer( Xfer *xfer )
 	// disguised
 	xfer->xferBool( &m_disguised );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -925,4 +920,4 @@ void StealthUpdate::loadPostProcess( void )
 	if( isDisguised() )
 		m_xferRestoreDisguise = TRUE;
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp
index eec1ecc046d..0b7ca867061 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
@@ -50,10 +50,7 @@ StickyBombUpdate::StickyBombUpdate( Thing *thing, const ModuleData *moduleData )
 {
 	m_targetID		= INVALID_ID;
 	m_dieFrame		= 0;
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_nextPingFrame = 0;
-	//
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 }
 
@@ -104,7 +101,7 @@ void StickyBombUpdate::init( const Object *target, const Object *bomber)
 	{
 		//we are a timer bomb
 		m_dieFrame = update->getDieFrame();
-	
+
 		//Calculate the number of seconds (rounded down)
 		UnsignedInt pings = (m_dieFrame - now) / LOGICFRAMES_PER_SECOND;
 		//Now determine the next frame we will make a "ping" sound.
@@ -220,7 +217,7 @@ void StickyBombUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -247,7 +244,7 @@ void StickyBombUpdate::xfer( Xfer *xfer )
 	//Next frame that a ping sound will play.
 	xfer->xferUnsignedInt( &m_nextPingFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -258,4 +255,4 @@ void StickyBombUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp
index a16be816e9b..7789f245f40 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp
@@ -24,11 +24,11 @@
 
 // FILE: StructureCollapseUpdate.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Thing.h"
 #include "Common/ThingTemplate.h"
@@ -50,7 +50,7 @@ const Int MAX_IDX = 32;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-static const char *TheStructureCollapsePhaseNames[] = 
+static const char *const TheStructureCollapsePhaseNames[] =
 {
 	"INITIAL",
 	"DELAY",
@@ -59,6 +59,7 @@ static const char *TheStructureCollapsePhaseNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheStructureCollapsePhaseNames) == SC_PHASE_COUNT + 1, "Wrong array size");
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -67,11 +68,8 @@ StructureCollapseUpdate::StructureCollapseUpdate( Thing *thing, const ModuleData
 	m_collapseFrame = 0;
 	m_collapseState = COLLAPSESTATE_STANDING;
 	m_collapseVelocity = 0.0f;
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_burstFrame = 0;
 	m_currentHeight = 0.0f;
-	//
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 }
 
@@ -106,11 +104,11 @@ static void parseOCL( INI* ini, void *instance, void * /*store*/, const void* /*
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void StructureCollapseUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void StructureCollapseUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MinCollapseDelay",						INI::parseDurationUnsignedInt,		NULL, offsetof( StructureCollapseUpdateModuleData, m_minCollapseDelay ) },
 		{ "MaxCollapseDelay",						INI::parseDurationUnsignedInt,		NULL, offsetof( StructureCollapseUpdateModuleData, m_maxCollapseDelay ) },
@@ -180,7 +178,7 @@ UpdateSleepTime StructureCollapseUpdate::update( void )
 
 	// We are in the dramatic pause between when the building has lost all its hit points and
 	// when it starts toppling over.
-	if (m_collapseState == COLLAPSESTATE_WAITINGFORCOLLAPSESTART) 
+	if (m_collapseState == COLLAPSESTATE_WAITINGFORCOLLAPSESTART)
 	{
 		UnsignedInt now = TheGameLogic->getFrame();
 		Object *building = getObject();
@@ -196,7 +194,7 @@ UpdateSleepTime StructureCollapseUpdate::update( void )
 
 		building->getDrawable()->setInstanceMatrix(&newInstMatrix);
 
-		if (now >= m_collapseFrame) 
+		if (now >= m_collapseFrame)
 		{
 			m_collapseState = COLLAPSESTATE_COLLAPSING;
 			doPhaseStuff(SCPHASE_BURST, currentPosition);
@@ -206,7 +204,7 @@ UpdateSleepTime StructureCollapseUpdate::update( void )
 	}
 
 	// The building is in the process of falling over.
-	if (m_collapseState == COLLAPSESTATE_COLLAPSING) 
+	if (m_collapseState == COLLAPSESTATE_COLLAPSING)
 	{
 		Object *building = getObject();
 		UnsignedInt now = TheGameLogic->getFrame();
@@ -223,13 +221,13 @@ UpdateSleepTime StructureCollapseUpdate::update( void )
 
 		building->getDrawable()->setInstanceMatrix(&newInstMatrix);
 
-		if (now >= m_burstFrame) 
+		if (now >= m_burstFrame)
 		{
-			if (GameLogicRandomValue(1, d->m_bigBurstFrequency) == 1) 
+			if (GameLogicRandomValue(1, d->m_bigBurstFrequency) == 1)
 			{
 				doPhaseStuff(SCPHASE_BURST, currentPosition);
-			} 
-			else 
+			}
+			else
 			{
 				doPhaseStuff(SCPHASE_DELAY, currentPosition);
 			}
@@ -237,7 +235,7 @@ UpdateSleepTime StructureCollapseUpdate::update( void )
 			m_burstFrame += GameLogicRandomValue(d->m_minBurstDelay, d->m_maxBurstDelay);
 		}
 
-//		if ((m_currentHeight + building->getGeometryInfo().getMaxHeightAbovePosition()) <= 0) 
+//		if ((m_currentHeight + building->getGeometryInfo().getMaxHeightAbovePosition()) <= 0)
 		if ((m_currentHeight + building->getTemplate()->getTemplateGeometryInfo().getMaxHeightAbovePosition()) <= 0)
 		{
 			m_collapseState = COLLAPSESTATE_DONE;
@@ -250,7 +248,7 @@ UpdateSleepTime StructureCollapseUpdate::update( void )
 			drawable->setModelConditionState(MODELCONDITION_POST_COLLAPSE);
 			building->setOrientation(building->getOrientation());
 
-			
+
 			// Need to update body particle systems, now
 			BodyModuleInterface *body = building->getBodyModule();
 			body->updateBodyParticleSystems();
@@ -293,7 +291,7 @@ static void buildNonDupRandomIndexList(Int range, Int count, Int idxList[])
 		do
 		{
 			idx = GameLogicRandomValue(0, range-1);
-		} 
+		}
 		while (inList(idx, i, idxList));
 		idxList[i] = idx;
 	}
@@ -303,7 +301,7 @@ static void buildNonDupRandomIndexList(Int range, Int count, Int idxList[])
 //-------------------------------------------------------------------------------------------------
 void StructureCollapseUpdate::doPhaseStuff(StructureCollapsePhaseType scphase, const Coord3D *target)
 {
-	DEBUG_LOG(("Firing phase %d on frame %d\n", scphase, TheGameLogic->getFrame()));
+	DEBUG_LOG(("Firing phase %d on frame %d", scphase, TheGameLogic->getFrame()));
 
 	const StructureCollapseUpdateModuleData* d = getStructureCollapseUpdateModuleData();
 	Int i, idx, count, listSize;
@@ -342,11 +340,11 @@ void StructureCollapseUpdate::doPhaseStuff(StructureCollapsePhaseType scphase, c
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StructureCollapseUpdate::doCollapseDoneStuff() 
+void StructureCollapseUpdate::doCollapseDoneStuff()
 {
 	static NameKeyType key_BoneFXUpdate = NAMEKEY("BoneFXUpdate");
 	BoneFXUpdate *bfxu = (BoneFXUpdate *)getObject()->findUpdateModule(key_BoneFXUpdate);
-	if (bfxu != NULL) 
+	if (bfxu != NULL)
 	{
 		bfxu->stopAllBoneFX();
 	}
@@ -361,7 +359,7 @@ void StructureCollapseUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -394,7 +392,7 @@ void StructureCollapseUpdate::xfer( Xfer *xfer )
 	// current height
 	xfer->xferReal( &m_currentHeight );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -405,4 +403,4 @@ void StructureCollapseUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp
index 6439347f664..ec95774da6d 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp
@@ -24,11 +24,11 @@
 
 // FILE: StructureToppleUpdate.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Thing.h"
 #include "Common/ThingTemplate.h"
@@ -48,11 +48,6 @@
 #include "GameClient/InGameUI.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 const Int MAX_IDX = 32;
 
@@ -60,13 +55,9 @@ const Int MAX_IDX = 32;
 //-------------------------------------------------------------------------------------------------
 StructureToppleUpdate::StructureToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
-	
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_delayBurstLocation.zero();
 	m_structuralIntegrity = 0.0f;
 	m_toppleDirection.x = m_toppleDirection.y = 0;
-	//
 	m_toppleFrame = 0;
 	m_toppleState = TOPPLESTATE_STANDING;
 	m_toppleVelocity = 0.0f;
@@ -111,11 +102,11 @@ static void parseAngleFX(INI* ini, void *instance, void * /* store */, const voi
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void StructureToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void StructureToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MinToppleDelay",						INI::parseDurationUnsignedInt,		NULL, offsetof( StructureToppleUpdateModuleData, m_minToppleDelay ) },
 		{ "MaxToppleDelay",						INI::parseDurationUnsignedInt,		NULL, offsetof( StructureToppleUpdateModuleData, m_maxToppleDelay ) },
@@ -241,9 +232,9 @@ UpdateSleepTime StructureToppleUpdate::update( void )
 	if (m_toppleState == TOPPLESTATE_TOPPLING) {
 		UnsignedInt now = TheGameLogic->getFrame();
 		Real toppleAcceleration = TOPPLE_ACCELERATION_FACTOR * (Sin(m_accumulatedAngle) * (1.0 - m_structuralIntegrity));
-//		DEBUG_LOG(("toppleAcceleration = %f\n", toppleAcceleration));
+//		DEBUG_LOG(("toppleAcceleration = %f", toppleAcceleration));
 		m_toppleVelocity += toppleAcceleration;
-//		DEBUG_LOG(("m_toppleVelocity = %f\n", m_toppleVelocity));
+//		DEBUG_LOG(("m_toppleVelocity = %f", m_toppleVelocity));
 
 		// doesn't make sense to have a structural integrity less than zero.
 		if (m_structuralIntegrity > 0.0f) {
@@ -252,7 +243,7 @@ UpdateSleepTime StructureToppleUpdate::update( void )
 				m_structuralIntegrity = 0.0f;
 			}
 		}
-//		DEBUG_LOG(("m_structuralIntegrity = %f\n\n", m_structuralIntegrity));
+//		DEBUG_LOG(("m_structuralIntegrity = %f", m_structuralIntegrity));
 
 		doAngleFX(m_accumulatedAngle, m_accumulatedAngle + m_toppleVelocity);
 
@@ -288,16 +279,16 @@ UpdateSleepTime StructureToppleUpdate::update( void )
 	}
 
 	// The building is now flat on the ground and done with all the crushing and all that.
-	if (m_toppleState == TOPPLESTATE_WAITINGFORDONE) 
+	if (m_toppleState == TOPPLESTATE_WAITINGFORDONE)
 	{
-		if (m_toppleFrame <= TheGameLogic->getFrame()) 
+		if (m_toppleFrame <= TheGameLogic->getFrame())
 		{
 			Object *building = getObject();
 			Drawable *drawable = building->getDrawable();
 			drawable->clearModelConditionState(MODELCONDITION_RUBBLE);
 			drawable->setModelConditionState(MODELCONDITION_POST_COLLAPSE);
 
-			
+
 			// Need to update body particle systems, now
 			BodyModuleInterface *body = building->getBodyModule();
 			body->updateBodyParticleSystems();
@@ -315,7 +306,7 @@ UpdateSleepTime StructureToppleUpdate::update( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StructureToppleUpdate::doToppleDoneStuff() 
+void StructureToppleUpdate::doToppleDoneStuff()
 {
 	static NameKeyType key_BoneFXUpdate = NAMEKEY("BoneFXUpdate");
 	BoneFXUpdate *bfxu = (BoneFXUpdate *)getObject()->findUpdateModule(key_BoneFXUpdate);
@@ -337,14 +328,14 @@ void StructureToppleUpdate::doToppleDoneStuff()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StructureToppleUpdate::doAngleFX(Real curAngle, Real newAngle) 
+void StructureToppleUpdate::doAngleFX(Real curAngle, Real newAngle)
 {
 	const StructureToppleUpdateModuleData *d = getStructureToppleUpdateModuleData();
 	const DamageInfo *lastDamageInfo = getObject()->getBodyModule()->getLastDamageInfo();
 
 	for (std::vector<AngleFXInfo>::const_iterator it = d->angleFX.begin(); it != d->angleFX.end(); ++it)
 	{
-		if ((it->angle > curAngle) && (it->angle <= newAngle)) 
+		if ((it->angle > curAngle) && (it->angle <= newAngle))
 		{
 			if( lastDamageInfo == NULL || getDamageTypeFlag( d->m_damageFXTypes, lastDamageInfo->in.m_damageType ) )
 				FXList::doFXObj(it->fxList, getObject());
@@ -356,7 +347,7 @@ void StructureToppleUpdate::doAngleFX(Real curAngle, Real newAngle)
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 // theta is the angle of the building with respect to the ground.
-void StructureToppleUpdate::applyCrushingDamage(Real theta) 
+void StructureToppleUpdate::applyCrushingDamage(Real theta)
 {
 //	static const Real THETA_CEILING = PI/8; // This weapon won't do any damage until theta is less than this value.
 	static const Real THETA_CEILING = PI/6; // This weapon won't do any damage until theta is less than this value.
@@ -384,7 +375,7 @@ void StructureToppleUpdate::applyCrushingDamage(Real theta)
 	temp3D.x = majorComponent;
 	temp3D.y = minorComponent;
 	temp3D.z = 0.0f;
-	
+
 	Real facingWidth = temp3D.length() / 2;
 
 	// Get the crushing weapon.
@@ -420,7 +411,7 @@ void StructureToppleUpdate::applyCrushingDamage(Real theta)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StructureToppleUpdate::doDamageLine(Object *building, const WeaponTemplate* wt, Real jcos, Real jsin, Real facingWidth, Real toppleAngle) 
+void StructureToppleUpdate::doDamageLine(Object *building, const WeaponTemplate* wt, Real jcos, Real jsin, Real facingWidth, Real toppleAngle)
 {
 	const DamageInfo *lastDamageInfo = getObject()->getBodyModule()->getLastDamageInfo();
 	static const Real WEAPON_SPACING_PARALLEL = 25;				// The spacing between weapon firing locations,
@@ -431,7 +422,7 @@ void StructureToppleUpdate::doDamageLine(Object *building, const WeaponTemplate*
 
 	Coord3D target;
 
-	for (Real i = -facingWidth; i < facingWidth; i += WEAPON_SPACING_PARALLEL) 
+	for (Real i = -facingWidth; i < facingWidth; i += WEAPON_SPACING_PARALLEL)
 	{
 		target.x = building->getPosition()->x + jcos + (i * Sin(toppleAngle));
 		target.y = building->getPosition()->y + jsin + (i * Cos(toppleAngle));
@@ -465,12 +456,12 @@ void StructureToppleUpdate::doDamageLine(Object *building, const WeaponTemplate*
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StructureToppleUpdate::doToppleStartFX(Object *building, const DamageInfo *damageInfo) 
+void StructureToppleUpdate::doToppleStartFX(Object *building, const DamageInfo *damageInfo)
 {
 	const StructureToppleUpdateModuleData *d = getStructureToppleUpdateModuleData();
 	const DamageInfo *lastDamageInfo = getObject()->getBodyModule()->getLastDamageInfo();
 
-	if( lastDamageInfo == NULL || getDamageTypeFlag( d->m_damageFXTypes, lastDamageInfo->in.m_damageType ) )	
+	if( lastDamageInfo == NULL || getDamageTypeFlag( d->m_damageFXTypes, lastDamageInfo->in.m_damageType ) )
 		FXList::doFXPos(d->m_toppleStartFXList, building->getPosition());
 
 	doPhaseStuff(STPHASE_INITIAL, building->getPosition());
@@ -478,12 +469,12 @@ void StructureToppleUpdate::doToppleStartFX(Object *building, const DamageInfo *
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StructureToppleUpdate::doToppleDelayBurstFX() 
+void StructureToppleUpdate::doToppleDelayBurstFX()
 {
 	const StructureToppleUpdateModuleData *d = getStructureToppleUpdateModuleData();
 	const DamageInfo *lastDamageInfo = getObject()->getBodyModule()->getLastDamageInfo();
 
-	DEBUG_LOG(("Doing topple delay burst on frame %d\n", TheGameLogic->getFrame()));
+	DEBUG_LOG(("Doing topple delay burst on frame %d", TheGameLogic->getFrame()));
 	if( lastDamageInfo == NULL || getDamageTypeFlag( d->m_damageFXTypes, lastDamageInfo->in.m_damageType ) )
 		FXList::doFXPos(d->m_toppleDelayFXList, &m_delayBurstLocation);
 
@@ -496,10 +487,10 @@ void StructureToppleUpdate::doToppleDelayBurstFX()
 		for (std::vector<FXBoneInfo>::const_iterator it = d->fxbones.begin(); it != d->fxbones.end(); ++it)
 		{
 			ParticleSystem *sys = TheParticleSystemManager->createParticleSystem(it->particleSystemTemplate);
-			if (sys != NULL) 
+			if (sys != NULL)
 			{
 				Coord3D pos;
-				if (drawable->getPristineBonePositions(it->boneName.str(), 0, &pos, NULL, 1) == 1) 
+				if (drawable->getPristineBonePositions(it->boneName.str(), 0, &pos, NULL, 1) == 1)
 				{
 					// got the bone position...
 					sys->setPosition(&pos);
@@ -537,7 +528,7 @@ static void buildNonDupRandomIndexList(Int range, Int count, Int idxList[])
 		do
 		{
 			idx = GameLogicRandomValue(0, range-1);
-		} 
+		}
 		while (inList(idx, i, idxList));
 		idxList[i] = idx;
 	}
@@ -576,7 +567,7 @@ void StructureToppleUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -621,7 +612,7 @@ void StructureToppleUpdate::xfer( Xfer *xfer )
 	// delay burst location
 	xfer->xferCoord3D( &m_delayBurstLocation );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -632,4 +623,4 @@ void StructureToppleUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
index 1075711f56d..ddbd652ed31 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "Common/AudioEventRTS.h"
@@ -38,7 +38,7 @@
 #include "GameLogic/Module/TensileFormationUpdate.h"
 #include "GameLogic/Module/BodyModule.h"
 #include "GameLogic/PartitionManager.h"
-#include "GameLogic/GameLogic.h" 
+#include "GameLogic/GameLogic.h"
 #include "GameLogic/AI.h"
 #include "GameLogic/AIPathfind.h"
 
@@ -47,11 +47,6 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 #define MAP_XY_FACTOR			(10.0f)	 //How wide and tall each height map square is in world space.
@@ -76,7 +71,7 @@ class PartitionFilterTensileFormationMember : public PartitionFilter
 
 public:
 	PartitionFilterTensileFormationMember( Object* obj ) : m_obj( obj ) { }
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterTensileFormationMember"; }
 #endif
 	virtual Bool allow( Object *objOther )
@@ -93,7 +88,7 @@ TensileFormationUpdateModuleData::TensileFormationUpdateModuleData( void )
 
 	m_enabled = FALSE;
 
-}  // end TensileFormationUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -102,7 +97,7 @@ TensileFormationUpdateModuleData::TensileFormationUpdateModuleData( void )
 
 	UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Enabled",	    INI::parseBool,	NULL, offsetof( TensileFormationUpdateModuleData, m_enabled ) },
 		{ "CrackSound",	INI::parseAudioEventRTS,	NULL,	offsetof( TensileFormationUpdateModuleData, m_crackSound) },
@@ -110,7 +105,7 @@ TensileFormationUpdateModuleData::TensileFormationUpdateModuleData( void )
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -135,7 +130,7 @@ TensileFormationUpdate::TensileFormationUpdate( Thing *thing, const ModuleData *
 
 	for ( int t = 0; t < 4; ++t)
 	{
-		m_links[ t ].id = INVALID_ID; 
+		m_links[ t ].id = INVALID_ID;
 		m_links[ t ].tensor.set(0,0,0);
 	}
 
@@ -154,14 +149,14 @@ TensileFormationUpdate::TensileFormationUpdate( Thing *thing, const ModuleData *
 
 
 
-}  // end TensileFormationUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 TensileFormationUpdate::~TensileFormationUpdate( void )
 {
 
-}  // end ~TensileFormationUpdate
+}
 
 
 
@@ -193,8 +188,8 @@ void TensileFormationUpdate::initLinks( void )
 		if ( closestDistance > thisDistance )
 		{
 			closestDistance = thisDistance;
-			
-			//push a new link 
+
+			//push a new link
 			for ( int t = 3; t > 0; --t )
 				m_links[ t ] = m_links[ t-1 ];
 
@@ -214,7 +209,7 @@ void TensileFormationUpdate::initLinks( void )
 
 
 
- 
+
 
 
 // ------------------------------------------------------------------------------------------------
@@ -272,7 +267,7 @@ UpdateSleepTime TensileFormationUpdate::update( void )
 	}
 
 
-	if ( m_life%30 == 29 )		
+	if ( m_life%30 == 29 )
 		propagateDislodgement( TRUE );
 
 
@@ -321,9 +316,9 @@ UpdateSleepTime TensileFormationUpdate::update( void )
 			desiredPos.sub( &tensor );
 
 			//Coord3D desiredPos = { theirPos->x - m_links[ t ].tensor.x, theirPos->y - m_links[ t ].tensor.y, theirPos->z - m_links[ t ].tensor.z };
-			
+
 			newPos.x = newPos.x*0.93f + desiredPos.x*0.07f;
-			newPos.y = newPos.y*0.93f + desiredPos.y*0.07f; 
+			newPos.y = newPos.y*0.93f + desiredPos.y*0.07f;
 			newPos.z = MIN( m_lowestSlideElevation, TheTerrainLogic->getGroundHeight(newPos.x, newPos.y) );//rest on surface here
 
 			tensor.normalize();
@@ -347,7 +342,7 @@ UpdateSleepTime TensileFormationUpdate::update( void )
 
 
 	draw->setModelConditionFlags(MAKE_MODELCONDITION_MASK(MODELCONDITION_POST_COLLAPSE));
-			
+
 	if ( m_life < 200 )
 		draw->setModelConditionFlags(MAKE_MODELCONDITION_MASK(MODELCONDITION_MOVING));
 	else
@@ -357,13 +352,13 @@ UpdateSleepTime TensileFormationUpdate::update( void )
 		draw->setModelConditionFlags(MAKE_MODELCONDITION_MASK(MODELCONDITION_FREEFALL));
 	else
 		draw->clearModelConditionFlags(MAKE_MODELCONDITION_MASK(MODELCONDITION_FREEFALL));
-		
+
 //	{
 //		RGBColor cyan = {0,1,1};
 //		draw->flashAsSelected(&cyan);
 //	}
 
-	
+
 
 	//else
 		//m_motionlessCounter = 0;
@@ -379,7 +374,7 @@ UpdateSleepTime TensileFormationUpdate::update( void )
 
 
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 
 
@@ -445,7 +440,7 @@ void TensileFormationUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -466,7 +461,7 @@ void TensileFormationUpdate::xfer( Xfer *xfer )
 	// enabled
 	xfer->xferBool( &m_enabled );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -477,4 +472,4 @@ void TensileFormationUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp
index f3a05875d8a..8eb909b8809 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/ThingFactory.h"
@@ -50,7 +50,7 @@
 
 //-------------------------------------------------------------------------------------------------
 // this is our "bounce" limit -- slightly less that 90 degrees, to account for slop.
-static const Real ANGULAR_LIMIT = PI/2 - PI/64;		
+static const Real ANGULAR_LIMIT = PI/2 - PI/64;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -74,11 +74,11 @@ ToppleUpdateModuleData::ToppleUpdateModuleData()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void ToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void ToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ToppleFX",	INI::parseFXList, NULL, offsetof( ToppleUpdateModuleData, m_toppleFX ) },
 		{ "BounceFX",	INI::parseFXList, NULL, offsetof( ToppleUpdateModuleData, m_bounceFX ) },
@@ -104,15 +104,12 @@ void ToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 ToppleUpdate::ToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_angleDeltaX = 0.0f;
 	m_doBounceFX = FALSE;
 	m_numAngleDeltaX = 0;
-	//
 	m_angularVelocity = 0;
 	m_angularAccumulation = 0;
-	m_angularAcceleration = 0;	
+	m_angularAcceleration = 0;
 	m_toppleDirection.x = 0;
 	m_toppleDirection.y = 0;
 	m_toppleDirection.z = 0;
@@ -145,7 +142,7 @@ void ToppleUpdate::applyTopplingForce( const Coord3D* toppleDirection, Real topp
 	if (getObject()->isEffectivelyDead())
 		return;
 
-	//DEBUG_LOG(("awaking ToppleUpdate %08lx\n",this));
+	//DEBUG_LOG(("awaking ToppleUpdate %08lx",this));
 	setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
 
 	const ToppleUpdateModuleData* d = getToppleUpdateModuleData();
@@ -252,7 +249,7 @@ Bool ToppleUpdate::isAbleToBeToppled() const
 static void deathByToppling(Object* obj)
 {
 	// use a special "topppling" damage type here so that
-	// toppled stuff can have different damage/die modules 
+	// toppled stuff can have different damage/die modules
 	// for toppled-death vs other-death
 	DamageInfo damageInfo;
 	damageInfo.in.m_damageType = DAMAGE_UNRESISTABLE;
@@ -267,7 +264,7 @@ static void deathByToppling(Object* obj)
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime ToppleUpdate::update()
 {
-	//DEBUG_LOG(("updating ToppleUpdate %08lx\n",this));
+	//DEBUG_LOG(("updating ToppleUpdate %08lx",this));
 	DEBUG_ASSERTCRASH(m_toppleState != TOPPLE_UPRIGHT, ("hmm, we should be sleeping here"));
 	if ( (m_toppleState == TOPPLE_UPRIGHT)  ||  (m_toppleState == TOPPLE_DOWN) )
 		return UPDATE_SLEEP_FOREVER;
@@ -300,7 +297,7 @@ UpdateSleepTime ToppleUpdate::update()
 		// Hit so either bounce or stop if too little remaining velocity.
 		m_angularVelocity *= -d->m_bounceVelocityPercent;
 
-		if( BitIsSet( m_options, TOPPLE_OPTIONS_NO_BOUNCE ) == TRUE || 
+		if( BitIsSet( m_options, TOPPLE_OPTIONS_NO_BOUNCE ) == TRUE ||
 				fabs(m_angularVelocity) < VELOCITY_BOUNCE_LIMIT )
 		{
 			// too slow, just stop
@@ -330,7 +327,7 @@ UpdateSleepTime ToppleUpdate::update()
 					obj->setOrientation(obj->getOrientation());
 
 				}
-			} // if kill when toppled
+			}
 
 			if (d->m_killStumpWhenToppled)
 			{
@@ -381,7 +378,7 @@ void ToppleUpdate::onCollide( Object *other, const Coord3D *loc, const Coord3D *
 		toppleVector.x -= other->getPosition()->x;
 		toppleVector.y -= other->getPosition()->y;
 		toppleVector.z = 0;
-		
+
 		Coord3D vel;
 		PhysicsBehavior* phys = other->getPhysics();
 		if (phys)
@@ -403,7 +400,7 @@ void ToppleUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -451,7 +448,7 @@ void ToppleUpdate::xfer( Xfer *xfer )
 	// stump id
 	xfer->xferObjectID( &m_stumpID );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -462,4 +459,4 @@ void ToppleUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp
index f4148d27f92..8a3105a46a8 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp
@@ -33,18 +33,13 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Module/UpdateModule.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 UpdateSleepTime UpdateModule::frameToSleepTime(
-	UnsignedInt frame1, 
-	UnsignedInt frame2, 
-	UnsignedInt frame3, 
+	UnsignedInt frame1,
+	UnsignedInt frame2,
+	UnsignedInt frame3,
 	UnsignedInt frame4
 )
 {
@@ -97,12 +92,12 @@ void UpdateModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info;
-	* 1: Initial version 
+	* 1: Initial version
 	*/
 // ------------------------------------------------------------------------------------------------
 void UpdateModule::xfer( Xfer *xfer )
@@ -116,18 +111,18 @@ void UpdateModule::xfer( Xfer *xfer )
 	// extend base class
 	BehaviorModule::xfer( xfer );
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	/*
 		this is a fix for the following scenario:
 
 		save a game that has an object that uses module "FOO"
 		now change the code for module "FOO" from being nonsleepy to being sleepy
 		now reload that saved game
-		as soon as "FOO" attempts to wake itself up, you're dead. 
-		
+		as soon as "FOO" attempts to wake itself up, you're dead.
+
 		this fix simply looks to see if the module in question is now sleepy in code,
 		but was saved in sleepy form, and if so, quietly nudges a reasonable
-		value into m_nextCallFrameAndPhase. 
+		value into m_nextCallFrameAndPhase.
 	*/
 	#define FIX_OLD_SAVES
 #endif
@@ -142,7 +137,7 @@ void UpdateModule::xfer( Xfer *xfer )
 
 	// next call frame and phase
 	xfer->xferUnsignedInt( &m_nextCallFrameAndPhase );
-	
+
 	if (xfer->getXferMode() == XFER_LOAD)
 	{
 		/*
@@ -152,7 +147,7 @@ void UpdateModule::xfer( Xfer *xfer )
 				PHASE_INITIAL				= 0,
 				PHASE_NORMAL				= 1,
 				PHASE_FINAL					= 2
-			
+
 			post-Jan 2, 2003:
 				PHASE_INITIAL				= 0,
 				PHASE_PHYSICS				= 1,
@@ -165,7 +160,7 @@ void UpdateModule::xfer( Xfer *xfer )
 
 #ifdef FIX_OLD_SAVES
 	if (xfer->getXferMode() == XFER_LOAD
-			&& thisModuleIsNowSleepy 
+			&& thisModuleIsNowSleepy
 			&& m_nextCallFrameAndPhase == 0)
 	{
 	#ifdef ALLOW_NONSLEEPY_UPDATES
@@ -183,7 +178,7 @@ void UpdateModule::xfer( Xfer *xfer )
 		m_indexInLogic = -1;
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -194,7 +189,7 @@ void UpdateModule::loadPostProcess( void )
 	// extned base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp
index 88e4c10b526..33737623cbb 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Radar.h"
 #include "Common/ThingFactory.h"
@@ -58,12 +58,9 @@
 // ------------------------------------------------------------------------------------------------
 WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void )
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_bridgeParticleAngleFudge = 0.0f;
 	m_randomSplashSoundFrequency = 0;
 	m_waveDelay = 0.0f;
-	//
 	m_ySize = 0.0f;
 	m_linearWaveSpacing = 0.0f;
 	m_waveBendMagnitude = 0.0f;
@@ -74,7 +71,7 @@ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void )
 	m_damageAmount = 0.0f;
 	m_toppleForce = 0.0f;
 
-}  // end WaveGuideUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -83,10 +80,10 @@ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void )
 
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
-		{ "WaveDelay", INI::parseDurationReal, NULL, offsetof( WaveGuideUpdateModuleData, m_waveDelay ) },	
+		{ "WaveDelay", INI::parseDurationReal, NULL, offsetof( WaveGuideUpdateModuleData, m_waveDelay ) },
 		{ "YSize", INI::parseReal, NULL, offsetof( WaveGuideUpdateModuleData, m_ySize ) },
 		{ "LinearWaveSpacing", INI::parseReal, NULL, offsetof( WaveGuideUpdateModuleData, m_linearWaveSpacing ) },
 		{ "WaveBendMagnitude", INI::parseReal, NULL, offsetof( WaveGuideUpdateModuleData, m_waveBendMagnitude ) },
@@ -106,7 +103,7 @@ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -138,16 +135,16 @@ WaveGuideUpdate::WaveGuideUpdate( Thing *thing, const ModuleData *moduleData )
 		for( Int j = 0; j < MAX_SHAPE_EFFECTS; j++ )
 			m_shapeEffects[ i ][ j ] = INVALID_PARTICLE_SYSTEM_ID;
 
-	}  // end for i
+	}
 
-}  // end WaveGuideUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 WaveGuideUpdate::~WaveGuideUpdate( void )
 {
 
-}  // end ~WaveGuideUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Start the waveguide moving along its waypoint path, bringing water destruction and havok
@@ -174,15 +171,15 @@ Bool WaveGuideUpdate::startMoving( void )
 		Waypoint *verify = waypoint;
 		while( verify )
 		{
-		
+
 			// can't have more than one link
 			if( verify->getNumLinks() > 1 )
 			{
 
-				DEBUG_CRASH(( "WaveGuideUpdate::startMoving - The waypoint path cannot have multiple link choices at any node\n" ));
+				DEBUG_CRASH(( "WaveGuideUpdate::startMoving - The waypoint path cannot have multiple link choices at any node" ));
 				return FALSE;
 
-			}  // end if
+			}
 
 			// set our destination location to this waypoint position
 			m_finalDestination = *verify->getLocation();
@@ -190,18 +187,18 @@ Bool WaveGuideUpdate::startMoving( void )
 			// on to the next
 			verify = verify->getLink( 0 );
 
-		}  // end while
+		}
 
 		// there must be at least one link
 		Waypoint *next = waypoint->getLink( 0 );
 		if( next == NULL )
 		{
 
-			DEBUG_CRASH(( "WaveGuideUpdate:startMoving - There must be a linked waypoint path to follow\n" ));
+			DEBUG_CRASH(( "WaveGuideUpdate:startMoving - There must be a linked waypoint path to follow" ));
 			return FALSE;
 
-		}  // end if
-				
+		}
+
 		// get vector from next waypoint to first waypoint
 		Coord2D v;
 		v.x = next->getLocation()->x - waypoint->getLocation()->x;
@@ -234,13 +231,13 @@ Bool WaveGuideUpdate::startMoving( void )
 			//
 			ai->setPathExtraDistance( PATH_EXTRA_DISTANCE );
 
-		}  // end if
+		}
 
-	}  // endif
+	}
 
 	return TRUE;  // all is well
 
-}  // end startMoving
+}
 
 // ------------------------------------------------------------------------------------------------
 /** The wave guide has started moving ... this is called once */
@@ -273,7 +270,7 @@ Bool WaveGuideUpdate::initWaveGuide( void )
 			particleSys->attachToObject( getObject() );
 			m_shapeEffects[ i ][ 0 ] = particleSys->getSystemID();
 
-		}  // end if
+		}
 
 		// create spray 2 effect
 		particleSys = TheParticleSystemManager->createParticleSystem( wave2 );
@@ -284,7 +281,7 @@ Bool WaveGuideUpdate::initWaveGuide( void )
 			particleSys->attachToObject( getObject() );
 			m_shapeEffects[ i ][ 1 ] = particleSys->getSystemID();
 
-		}  // end if
+		}
 
 		// create spray 3 every few points across the wave
 		if( i % 5  == 0 )
@@ -298,15 +295,15 @@ Bool WaveGuideUpdate::initWaveGuide( void )
 				particleSys->attachToObject( getObject() );
 				m_shapeEffects[ i ][ 2 ] = particleSys->getSystemID();
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	return TRUE;  // all is well
 
-}  // end initWaveGuide
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -342,9 +339,9 @@ void WaveGuideUpdate::computeWaveShapePoints( void )
 		m_shapePoints[ m_shapePointCount ].z = 0.0f;
 		m_shapePointCount++;
 
-	}  // end for width
+	}
 
-}  // end computeWaveShapePoints
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given the current position and orientation of the wave guide, transform all the wave
@@ -365,9 +362,9 @@ void WaveGuideUpdate::transformWaveShape( void )
 		m_transformedShapePoints[ i ].z = TheTerrainLogic->getGroundHeight( m_transformedShapePoints[ i ].x,
 																																	m_transformedShapePoints[ i ].y );
 
-	}  // end for i
+	}
 
-}  // end transformWaveShape
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Update phase for the effects that make up the front shape of the wave */
@@ -375,7 +372,7 @@ void WaveGuideUpdate::transformWaveShape( void )
 void WaveGuideUpdate::doShapeEffects( void )
 {
 	const WaveGuideUpdateModuleData *modData = getWaveGuideUpdateModuleData();
-	
+
 	//
 	// the particle systems that make up the wave shape need to maintain a position that is
 	// just above the ground
@@ -406,15 +403,15 @@ void WaveGuideUpdate::doShapeEffects( void )
 					pos.z = m_transformedShapePoints[ i ].z;
 					particleSys->setPosition( &pos );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
-		}  // end for j
+		}
 
-	}  // end for i
+	}
 
-}  // end doShapeEffects
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given all our sample points, make the wave go */
@@ -435,13 +432,13 @@ void WaveGuideUpdate::doWaterMotion( void )
 		// push up the water here
 		TheTerrainVisual->addWaterVelocity( m_transformedShapePoints[ i ].x,
 																				m_transformedShapePoints[ i ].y,
-																				modData->m_waterVelocity, 
+																				modData->m_waterVelocity,
 																				modData->m_preferredHeight );
 
 
-	}  // end for i
+	}
 
-}  // end doWaterMotion
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Any points in our wave that are on the shoreline that are close enough to the effect
@@ -476,7 +473,7 @@ void WaveGuideUpdate::doShoreEffects( void )
 		// transform the point
 		waveGuide->transformPoint( &effectPoints[ i ], &effectPoints[ i ] );
 
-	}  // end for i
+	}
 
 	//
 	// go across the shape of our wave ... when we detect a transition from underground to
@@ -508,17 +505,17 @@ void WaveGuideUpdate::doShoreEffects( void )
 			if( underWater == TRUE && i != 0 )
 			{
 				Coord3D *prevPoint = &effectPoints[ i - 1 ];  // the prev point is actuall on the water so we'll use it
-						
+
 				particleSystem = TheParticleSystemManager->createParticleSystem( right );
 				if( particleSystem )
 					particleSystem->setPosition( prevPoint );
 
-			}  // end if
+			}
 
 			// we are now 'above'
 			underWater = FALSE;
 
-		}  // end if
+		}
 		else
 		{
 
@@ -533,16 +530,16 @@ void WaveGuideUpdate::doShoreEffects( void )
 				if( particleSystem )
 					particleSystem->setPosition( point );
 
-			}  // end if
+			}
 
 			// we are now 'under'
 			underWater = TRUE;
 
-		}  // end else
+		}
 
-	}  // end for i
+	}
 
-}  // end doShoreEffects
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do damage to things that have fallen victim in the path of this enourmous wave */
@@ -561,8 +558,8 @@ void WaveGuideUpdate::doDamage( void )
 
 		// scan objects around us and do damage to objects we have "passed over" and are behind us
 		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( &m_transformedShapePoints[ i ],
-																																			 modData->m_damageRadius, 
-																																			 FROM_CENTER_2D, 
+																																			 modData->m_damageRadius,
+																																			 FROM_CENTER_2D,
 																																			 NULL );
 		MemoryPoolObjectHolder hold( iter );
 		Object *obj;
@@ -573,7 +570,7 @@ void WaveGuideUpdate::doDamage( void )
 		{
 
 			// ignore all waveguide types
-			if( obj->isKindOf( KINDOF_WAVEGUIDE ) )	
+			if( obj->isKindOf( KINDOF_WAVEGUIDE ) )
 				continue;
 
 			//
@@ -589,7 +586,7 @@ void WaveGuideUpdate::doDamage( void )
 			//
 			// only damage objects that are below the preferred height of the wave doing the damage,
 			// bridges are an exception as their object is raised above the ground, but we'll
-			// say the water is destroying the foundation of it 
+			// say the water is destroying the foundation of it
 			//
 			if( objPos->z > modData->m_preferredHeight && obj->isKindOf( KINDOF_BRIDGE ) == FALSE )
 				continue;
@@ -599,7 +596,7 @@ void WaveGuideUpdate::doDamage( void )
 			v.y = objPos->y - m_transformedShapePoints[ i ].y;
 			v.z = 0.0f;		// forget Z, this is really a top down 2D calculation
 			v.normalize();
-			
+
 			//
 			// get the cosine of the angle between the our forward direction and the vector to the obj
 			// otherwise known as a dot product
@@ -638,7 +635,7 @@ void WaveGuideUpdate::doDamage( void )
 						particleSystem->setPosition( &pos );
 						particleSystem->attachToObject( waveGuide );
 
-					}  // end if
+					}
 
 					// this object is now wet
 					obj->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_WET ) );
@@ -648,7 +645,7 @@ void WaveGuideUpdate::doDamage( void )
 					toppleVector.x = obj->getPosition()->x - m_transformedShapePoints[ i ].x;
 					toppleVector.y = obj->getPosition()->y - m_transformedShapePoints[ i ].y;
 					toppleVector.z = 0;
-					obj->topple( &toppleVector, modData->m_toppleForce, TOPPLE_OPTIONS_NO_BOUNCE | 
+					obj->topple( &toppleVector, modData->m_toppleForce, TOPPLE_OPTIONS_NO_BOUNCE |
 																															TOPPLE_OPTIONS_NO_FX );
 
 					// do a lot of water damage
@@ -660,8 +657,8 @@ void WaveGuideUpdate::doDamage( void )
 					obj->attemptDamage( &damageInfo );
 
 					//
-					// set flooded condition for model and turn off shadows cause we're inside water, 
-					// note that we want to do this after we damage the object so that we switch 
+					// set flooded condition for model and turn off shadows cause we're inside water,
+					// note that we want to do this after we damage the object so that we switch
 					// off the shadows on the new model data loaded after damage is dealt
 					//
 					Drawable *draw = obj->getDrawable();
@@ -671,7 +668,7 @@ void WaveGuideUpdate::doDamage( void )
 						draw->setModelConditionState( MODELCONDITION_FLOODED );
 						draw->setShadowsEnabled( FALSE );
 
-					}  // end if
+					}
 
 					//
 					// Temp demo hack, replace bridges destroyed with the special destroyed bridge art
@@ -700,7 +697,7 @@ void WaveGuideUpdate::doDamage( void )
 								v.y = bridgeInfo.to.y - bridgeInfo.from.y;
 								angle = v.toAngle();
 
-							}  // end if
+							}
 
 							// put new bridge looking object in the world
 							newBridge->setPosition( obj->getPosition() );
@@ -734,24 +731,24 @@ void WaveGuideUpdate::doDamage( void )
 
 								particleSystem->setLocalTransform( &transform );
 
-							}  // end if
+							}
 
 							// destroy the old bridge and bridge object
 							TheTerrainLogic->deleteBridge( oldBridge );
 
-						}  // end if
+						}
 
-					}  // end if
+					}
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
-		}  // end for obj
+		}
 
-	}  // end for i
+	}
 
-}  // end doDamage
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -797,12 +794,12 @@ UpdateSleepTime WaveGuideUpdate::update( void )
 			TheGameLogic->destroyObject( getObject() );
 			return UPDATE_SLEEP_NONE;
 
-		}  // end if
+		}
 
 		// we are now in motion
 		m_initialized = TRUE;
 
-	}  // end if
+	}
 
 	// every half second we try to play a random spash sound
 	if( TheGameLogic->getFrame() - m_splashSoundFrame > LOGICFRAMES_PER_SECOND / 2.0f )
@@ -812,13 +809,13 @@ UpdateSleepTime WaveGuideUpdate::update( void )
 		m_splashSoundFrame = TheGameLogic->getFrame();
 
 		// pick a random number and play according to frequency
-		if( GameLogicRandomValue( 1, 100 ) > modData->m_randomSplashSoundFrequency )  
+		if( GameLogicRandomValue( 1, 100 ) > modData->m_randomSplashSoundFrequency )
 		{
 			AudioEventRTS randomSplash(modData->m_randomSplashSound);
 			randomSplash.setObjectID(waveGuide->getID());
 			TheAudio->addAudioEvent(&randomSplash);
-		}  // end if
-	}  // end if
+		}
+	}
 
 	//
 	// transform the wave shape points once for the current position ... we have this array
@@ -850,7 +847,7 @@ UpdateSleepTime WaveGuideUpdate::update( void )
 
 		return UPDATE_SLEEP_NONE;
 
-	}  // end if
+	}
 
 	// do wavefront effects
 	doShapeEffects();
@@ -866,7 +863,7 @@ UpdateSleepTime WaveGuideUpdate::update( void )
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -877,7 +874,7 @@ void WaveGuideUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -901,17 +898,17 @@ void WaveGuideUpdate::xfer( Xfer *xfer )
 	// need disable
 	xfer->xferBool( &m_needDisable );
 
-	// initialized 
+	// initialized
 	xfer->xferBool( &m_initialized );
 
 	// shape points
 	xfer->xferUser( m_shapePoints, sizeof( Coord3D ) * MAX_WAVEGUIDE_SHAPE_POINTS );
-		
+
 	// transformed shape points
 	xfer->xferUser( &m_transformedShapePoints, sizeof( Coord3D ) * MAX_WAVEGUIDE_SHAPE_POINTS );
 
 	// particle shape effects
-	xfer->xferUser( m_shapeEffects, sizeof( ParticleSystemID ) * MAX_WAVEGUIDE_SHAPE_POINTS * MAX_SHAPE_EFFECTS );	
+	xfer->xferUser( m_shapeEffects, sizeof( ParticleSystemID ) * MAX_WAVEGUIDE_SHAPE_POINTS * MAX_SHAPE_EFFECTS );
 
 	// shape point count
 	xfer->xferInt( &m_shapePointCount );
@@ -922,7 +919,7 @@ void WaveGuideUpdate::xfer( Xfer *xfer )
 	// final destination
 	xfer->xferCoord3D( &m_finalDestination );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -933,4 +930,4 @@ void WaveGuideUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ActiveShroudUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ActiveShroudUpgrade.cpp
index 17885023fdd..ddd99e0860f 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ActiveShroudUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ActiveShroudUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Module/ActiveShroudUpgrade.h"
@@ -41,7 +41,7 @@ ActiveShroudUpgradeModuleData::ActiveShroudUpgradeModuleData( void )
 
 	m_newShroudRange = 0.0f;
 
-}  // end SpecialPowerModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -49,14 +49,14 @@ ActiveShroudUpgradeModuleData::ActiveShroudUpgradeModuleData( void )
 {
 	UpgradeModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "NewShroudRange", INI::parseReal, NULL, offsetof( ActiveShroudUpgradeModuleData, m_newShroudRange ) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -64,18 +64,18 @@ ActiveShroudUpgradeModuleData::ActiveShroudUpgradeModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-ActiveShroudUpgrade::ActiveShroudUpgrade( Thing *thing, const ModuleData* moduleData ) : 
+ActiveShroudUpgrade::ActiveShroudUpgrade( Thing *thing, const ModuleData* moduleData ) :
 							UpgradeModule( thing, moduleData )
 {
 
-}  // end ActiveShroudUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ActiveShroudUpgrade::~ActiveShroudUpgrade( void )
 {
 
-}  // end ~ActiveShroudUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -87,7 +87,7 @@ void ActiveShroudUpgrade::upgradeImplementation( void )
 		getObject()->setShroudRange( getActiveShroudUpgradeModuleData()->m_newShroudRange );
 		getObject()->handlePartitionCellMaintenance();// To shroud where I am without waiting.
 	}
-}  // end upgradeImplementation
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -98,7 +98,7 @@ void ActiveShroudUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -116,7 +116,7 @@ void ActiveShroudUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -127,4 +127,4 @@ void ActiveShroudUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ArmorUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ArmorUpgrade.cpp
index aa41b12e2b8..5a8250ace5f 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ArmorUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ArmorUpgrade.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ArmorUpgrade.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	May 2002
@@ -37,8 +37,8 @@
 //	Filename: 	ArmorUpgrade.cpp
 //
 //	author:		Chris Brue
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -84,7 +84,7 @@ ArmorUpgrade::~ArmorUpgrade( void )
 //-------------------------------------------------------------------------------------------------
 void ArmorUpgrade::upgradeImplementation( )
 {
-	// Very simple; just need to flag the Object as having the player upgrade, and the WeaponSet chooser 
+	// Very simple; just need to flag the Object as having the player upgrade, and the WeaponSet chooser
 	// will do the work of picking the right one from ini.  This comment is as long as the code.
 	// STILL IN PROGRESS
 	Object *obj = getObject();
@@ -104,7 +104,7 @@ void ArmorUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -122,7 +122,7 @@ void ArmorUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -133,4 +133,4 @@ void ArmorUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/CommandSetUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/CommandSetUpgrade.cpp
index e4a46596b4d..b4a9a244384 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/CommandSetUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/CommandSetUpgrade.cpp
@@ -26,7 +26,7 @@
 // Author: Graham Smallwood, September 2002
 // Desc:	 UpgradeModule that sets a new override string for Command Set look ups
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameClient/ControlBar.h"
@@ -35,11 +35,11 @@
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void CommandSetUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void CommandSetUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpgradeModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "CommandSet",	INI::parseAsciiString,	NULL, offsetof( CommandSetUpgradeModuleData, m_newCommandSet ) },
 		{ 0, 0, 0, 0 }
@@ -63,7 +63,7 @@ CommandSetUpgrade::~CommandSetUpgrade( void )
 //-------------------------------------------------------------------------------------------------
 void CommandSetUpgrade::upgradeImplementation( )
 {
-	Object *obj = getObject();	
+	Object *obj = getObject();
 	obj->setCommandSetStringOverride( getCommandSetUpgradeModuleData()->m_newCommandSet );
 
 	TheControlBar->markUIDirty();// Refresh the UI in case we are selected
@@ -78,7 +78,7 @@ void CommandSetUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -96,7 +96,7 @@ void CommandSetUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -107,4 +107,4 @@ void CommandSetUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/CostModifierUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/CostModifierUpgrade.cpp
index 7912015883b..c2b72526561 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/CostModifierUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/CostModifierUpgrade.cpp
@@ -24,12 +24,12 @@
 
 // FILE: CostModifierUpgrade.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	CostModifierUpgrade.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Upgrade that modifies the cost by a certain percentage
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -78,7 +78,7 @@ CostModifierUpgradeModuleData::CostModifierUpgradeModuleData( void )
 	m_kindOf = KINDOFMASK_NONE;
 	m_percentage = 0;
 
-}  // end CostModifierUpgradeModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -86,15 +86,15 @@ CostModifierUpgradeModuleData::CostModifierUpgradeModuleData( void )
 {
 	UpgradeModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "EffectKindOf",		KindOfMaskType::parseFromINI, NULL, offsetof( CostModifierUpgradeModuleData, m_kindOf ) },
 		{ "Percentage",			INI::parsePercentToReal, NULL, offsetof( CostModifierUpgradeModuleData, m_percentage ) },
-		{ 0, 0, 0, 0 } 
+		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -102,18 +102,18 @@ CostModifierUpgradeModuleData::CostModifierUpgradeModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-CostModifierUpgrade::CostModifierUpgrade( Thing *thing, const ModuleData* moduleData ) : 
+CostModifierUpgrade::CostModifierUpgrade( Thing *thing, const ModuleData* moduleData ) :
 							UpgradeModule( thing, moduleData )
 {
 
-}  // end CostModifierUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 CostModifierUpgrade::~CostModifierUpgrade( void )
 {
 
-}  // end ~CostModifierUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -132,7 +132,7 @@ void CostModifierUpgrade::onDelete( void )
 	// this upgrade module is now "not upgraded"
 	setUpgradeExecuted(FALSE);
 
-}  // end onDelete
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -150,16 +150,16 @@ void CostModifierUpgrade::onCapture( Player *oldOwner, Player *newOwner )
 		oldOwner->removeKindOfProductionCostChange(getCostModifierUpgradeModuleData()->m_kindOf,getCostModifierUpgradeModuleData()->m_percentage );
 		setUpgradeExecuted(FALSE);
 
-	}  // end if
+	}
 	if( newOwner )
 	{
 
 		newOwner->addKindOfProductionCostChange(getCostModifierUpgradeModuleData()->m_kindOf,getCostModifierUpgradeModuleData()->m_percentage );
 		setUpgradeExecuted(TRUE);
 
-	}  // end if
+	}
 
-}  // end onCapture
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -170,7 +170,7 @@ void CostModifierUpgrade::upgradeImplementation( void )
 	// update the player with another TypeOfProductionCostChange
 	player->addKindOfProductionCostChange(getCostModifierUpgradeModuleData()->m_kindOf,getCostModifierUpgradeModuleData()->m_percentage );
 
-}  // end upgradeImplementation
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -181,7 +181,7 @@ void CostModifierUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -199,7 +199,7 @@ void CostModifierUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -210,4 +210,4 @@ void CostModifierUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/DelayedUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/DelayedUpgrade.cpp
index 1c977c2e242..68fd6ecfc43 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/DelayedUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/DelayedUpgrade.cpp
@@ -24,12 +24,12 @@
 
 // FILE: DelayedUpgrade.cpp /////////////////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, April 2002
-// Desc:	 An Upgrade that broadcasts to all DelayedUpgradeUpdates that maybe they should start 
+// Desc:	 An Upgrade that broadcasts to all DelayedUpgradeUpdates that maybe they should start
 //					counting down to execution
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -82,7 +82,7 @@ void DelayedUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -100,7 +100,7 @@ void DelayedUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -111,4 +111,4 @@ void DelayedUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ExperienceScalarUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ExperienceScalarUpgrade.cpp
index 479c246d3e6..bfa7e0a54ec 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ExperienceScalarUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ExperienceScalarUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -44,12 +44,12 @@ ExperienceScalarUpgradeModuleData::ExperienceScalarUpgradeModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void ExperienceScalarUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void ExperienceScalarUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
   UpgradeModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "AddXPScalar",	INI::parseReal,		NULL, offsetof( ExperienceScalarUpgradeModuleData, m_addXPScalar ) },
 		{ 0, 0, 0, 0 }
@@ -57,7 +57,7 @@ void ExperienceScalarUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -95,7 +95,7 @@ void ExperienceScalarUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -113,7 +113,7 @@ void ExperienceScalarUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -124,4 +124,4 @@ void ExperienceScalarUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/LocomotorSetUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/LocomotorSetUpgrade.cpp
index a8b7d5d69df..ae4c01f0f10 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/LocomotorSetUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/LocomotorSetUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -65,7 +65,7 @@ void LocomotorSetUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -83,7 +83,7 @@ void LocomotorSetUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -94,4 +94,4 @@ void LocomotorSetUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/MaxHealthUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/MaxHealthUpgrade.cpp
index c6f844bf2a6..e5aa81681a1 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/MaxHealthUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/MaxHealthUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_MAXHEALTHCHANGETYPE_NAMES
 #include "Common/Xfer.h"
@@ -47,12 +47,12 @@ MaxHealthUpgradeModuleData::MaxHealthUpgradeModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void MaxHealthUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void MaxHealthUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
   UpgradeModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "AddMaxHealth",					INI::parseReal,					NULL,										offsetof( MaxHealthUpgradeModuleData, m_addMaxHealth ) },
 		{ "ChangeType",						INI::parseIndexList,		TheMaxHealthChangeTypeNames, offsetof( MaxHealthUpgradeModuleData, m_maxHealthChangeType ) },
@@ -61,7 +61,7 @@ void MaxHealthUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -100,7 +100,7 @@ void MaxHealthUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -118,7 +118,7 @@ void MaxHealthUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -129,4 +129,4 @@ void MaxHealthUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ObjectCreationUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ObjectCreationUpgrade.cpp
index 2c2b6a7ed57..2fd664af72f 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ObjectCreationUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/ObjectCreationUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ModelState.h"
 #include "Common/Player.h"
@@ -45,7 +45,7 @@ ObjectCreationUpgradeModuleData::ObjectCreationUpgradeModuleData( void )
 
 	m_ocl = NULL;
 
-}  // end SpecialPowerModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -53,14 +53,14 @@ ObjectCreationUpgradeModuleData::ObjectCreationUpgradeModuleData( void )
 {
 	UpgradeModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "UpgradeObject", INI::parseObjectCreationList, NULL, offsetof( ObjectCreationUpgradeModuleData, m_ocl ) },
-		{ 0, 0, 0, 0 } 
+		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -68,24 +68,24 @@ ObjectCreationUpgradeModuleData::ObjectCreationUpgradeModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-ObjectCreationUpgrade::ObjectCreationUpgrade( Thing *thing, const ModuleData* moduleData ) : 
+ObjectCreationUpgrade::ObjectCreationUpgrade( Thing *thing, const ModuleData* moduleData ) :
 							UpgradeModule( thing, moduleData )
 {
 
-}  // end ObjectCreationUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ObjectCreationUpgrade::~ObjectCreationUpgrade( void )
 {
 
-}  // end ~ObjectCreationUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void ObjectCreationUpgrade::onDelete( void )
 {
-}  // end onDelete
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -107,7 +107,7 @@ void ObjectCreationUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -125,7 +125,7 @@ void ObjectCreationUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -136,4 +136,4 @@ void ObjectCreationUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/PowerPlantUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/PowerPlantUpgrade.cpp
index 91b3f7d5b70..3b3342432e9 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/PowerPlantUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/PowerPlantUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ModelState.h"
 #include "Common/Player.h"
@@ -41,18 +41,18 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-PowerPlantUpgrade::PowerPlantUpgrade( Thing *thing, const ModuleData* moduleData ) : 
+PowerPlantUpgrade::PowerPlantUpgrade( Thing *thing, const ModuleData* moduleData ) :
 							UpgradeModule( thing, moduleData )
 {
 
-}  // end PowerPlantUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 PowerPlantUpgrade::~PowerPlantUpgrade( void )
 {
 
-}  // end ~PowerPlantUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -71,7 +71,7 @@ void PowerPlantUpgrade::onDelete( void )
 	// this upgrade module is now "not upgraded"
 	setUpgradeExecuted(FALSE);
 
-}  // end onDelete
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -81,7 +81,7 @@ void PowerPlantUpgrade::onCapture( Player *oldOwner, Player *newOwner )
 	// do nothing if we haven't upgraded yet
 	if( isAlreadyUpgraded() == FALSE )
 		return;
-	
+
 	if (getObject()->isDisabled())
 		return;
 
@@ -103,7 +103,7 @@ void PowerPlantUpgrade::onCapture( Player *oldOwner, Player *newOwner )
 
 	}
 
-}  // end onCapture
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -111,7 +111,7 @@ void PowerPlantUpgrade::upgradeImplementation( void )
 {
 
 	Player *player = getObject()->getControllingPlayer();
-	
+
 	// add the new power production to the object
 	if( player )
 		player->addPowerBonus(getObject());
@@ -124,8 +124,8 @@ void PowerPlantUpgrade::upgradeImplementation( void )
 		if( ppui )
 			ppui->extendRods(TRUE);
 	}
-	
-}  // end upgradeImplementation
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -136,7 +136,7 @@ void PowerPlantUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -154,7 +154,7 @@ void PowerPlantUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -164,16 +164,16 @@ void PowerPlantUpgrade::loadPostProcess( void )
 
 	// extend base class
 	UpgradeModule::loadPostProcess();
-	
+
 	// Most upgrade modules have state change effects that are themselves saved.  This one is a fire and forget.
 	// So we need to re-fire on load if we are turned on.
 	if( isAlreadyUpgraded() )
 	{
 		Player *player = getObject()->getControllingPlayer();
-		
+
 		// add the new power production to the object
 		if( player )
 			player->addPowerBonus(getObject());
 	}
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/RadarUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/RadarUpgrade.cpp
index 65ed61813bf..cd899a854cc 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/RadarUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/RadarUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ModelState.h"
 #include "Common/Player.h"
@@ -40,11 +40,11 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void RadarUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void RadarUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpgradeModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DisableProof",	INI::parseBool,	NULL, offsetof( RadarUpgradeModuleData, m_isDisableProof ) },
 		{ 0, 0, 0, 0 }
@@ -54,18 +54,18 @@ void RadarUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-RadarUpgrade::RadarUpgrade( Thing *thing, const ModuleData* moduleData ) : 
+RadarUpgrade::RadarUpgrade( Thing *thing, const ModuleData* moduleData ) :
 							UpgradeModule( thing, moduleData )
 {
 
-}  // end RadarUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 RadarUpgrade::~RadarUpgrade( void )
 {
 
-}  // end ~RadarUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -89,7 +89,7 @@ void RadarUpgrade::onDelete( void )
 	// this upgrade module is now "not upgraded"
 	setUpgradeExecuted(FALSE);
 
-}  // end onDelete
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -112,16 +112,16 @@ void RadarUpgrade::onCapture( Player *oldOwner, Player *newOwner )
 		oldOwner->removeRadar( md->m_isDisableProof );
 		setUpgradeExecuted(FALSE);
 
-	}  // end if
+	}
 	if( newOwner )
 	{
 
 		newOwner->addRadar( md->m_isDisableProof );
 		setUpgradeExecuted(TRUE);
 
-	}  // end if
+	}
 
-}  // end onCapture
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -140,7 +140,7 @@ void RadarUpgrade::upgradeImplementation( void )
 	if( radarUpdate )
 		radarUpdate->extendRadar();
 
-}  // end upgradeImplementation
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -151,7 +151,7 @@ void RadarUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -169,7 +169,7 @@ void RadarUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -180,4 +180,4 @@ void RadarUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/StatusBitsUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/StatusBitsUpgrade.cpp
index ffc3cbad12c..582a8fa48b9 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/StatusBitsUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/StatusBitsUpgrade.cpp
@@ -24,12 +24,12 @@
 
 // FILE: StatusBitsUpgrade.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	May 2002
@@ -37,8 +37,8 @@
 //	Filename: 	StatusBitsUpgrade.cpp
 //
 //	author:		Steven Johnson
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -51,7 +51,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_OBJECT_STATUS_NAMES
 #include "Common/Xfer.h"
@@ -73,11 +73,11 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StatusBitsUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void StatusBitsUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpgradeModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "StatusToSet",		ObjectStatusMaskType::parseFromINI,	NULL, offsetof( StatusBitsUpgradeModuleData, m_statusToSet ) },
 		{ "StatusToClear",	ObjectStatusMaskType::parseFromINI,	NULL, offsetof( StatusBitsUpgradeModuleData, m_statusToClear ) },
@@ -102,7 +102,7 @@ StatusBitsUpgrade::~StatusBitsUpgrade( void )
 //-------------------------------------------------------------------------------------------------
 void StatusBitsUpgrade::upgradeImplementation( )
 {
-	Object *obj = getObject();	
+	Object *obj = getObject();
 	obj->setStatus( getStatusBitsUpgradeModuleData()->m_statusToSet );
 	obj->clearStatus( getStatusBitsUpgradeModuleData()->m_statusToClear );
 }
@@ -116,7 +116,7 @@ void StatusBitsUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -134,7 +134,7 @@ void StatusBitsUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -145,4 +145,4 @@ void StatusBitsUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/StealthUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/StealthUpgrade.cpp
index 97da33f855f..4627088451e 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/StealthUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/StealthUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Module/StealthUpgrade.h"
@@ -63,7 +63,7 @@ void StealthUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -81,7 +81,7 @@ void StealthUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -92,4 +92,4 @@ void StealthUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/SubObjectsUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/SubObjectsUpgrade.cpp
index 75ae2ac292c..e99d360087a 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/SubObjectsUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/SubObjectsUpgrade.cpp
@@ -24,12 +24,12 @@
 
 // FILE: SubObjectsUpgrade.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	September 2002
@@ -37,14 +37,14 @@
 //	Filename: SubObjectsUpgrade.cpp
 //
 //	Author:		Kris Morness
-//	
+//
 //	Purpose:	Shows or hides a list of subobjects based on upgrade statii. It
 //            will override any animation subobjects states.
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_OBJECT_STATUS_NAMES
 #include "Common/Player.h"
@@ -55,11 +55,11 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void SubObjectsUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void SubObjectsUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpgradeModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ShowSubObjects", INI::parseAsciiStringVectorAppend, NULL, offsetof( SubObjectsUpgradeModuleData, m_showSubObjectNames ) },
 		{ "HideSubObjects", INI::parseAsciiStringVectorAppend, NULL, offsetof( SubObjectsUpgradeModuleData, m_hideSubObjectNames ) },
@@ -87,7 +87,7 @@ void SubObjectsUpgrade::upgradeImplementation( )
 	const SubObjectsUpgradeModuleData *data = getSubObjectsUpgradeModuleData();
 	UpgradeMaskType activation, conflicting;
 	getUpgradeActivationMasks( activation, conflicting );
-	
+
 	//First make sure we have the right combination of upgrades
 
 	if( getObject()->getObjectCompletedUpgradeMask().testForAny( conflicting ) )
@@ -136,12 +136,12 @@ void SubObjectsUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 //------------------------------------------------------------------------------------------------
 // Xfer method
 // Version Info:
-// 1: Initial version 
+// 1: Initial version
 //------------------------------------------------------------------------------------------------
 void SubObjectsUpgrade::xfer( Xfer *xfer )
 {
@@ -154,7 +154,7 @@ void SubObjectsUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 //------------------------------------------------------------------------------------------------
 void SubObjectsUpgrade::loadPostProcess( void )
@@ -163,4 +163,4 @@ void SubObjectsUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UnpauseSpecialPowerUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UnpauseSpecialPowerUpgrade.cpp
index b1cc8aaae14..2edb3c799aa 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UnpauseSpecialPowerUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UnpauseSpecialPowerUpgrade.cpp
@@ -24,7 +24,7 @@
 
 // FILE: UnpauseSpecialPowerUpgrade.cpp ///////////////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, August 2002
-// Desc:	 An upgrade that starts the timer on a Special Power module, so you can have them 
+// Desc:	 An upgrade that starts the timer on a Special Power module, so you can have them
 // dependent on upgrades on the logic side, like NEED_UPGRADE does on the client side by disabling
 // the button.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -42,7 +42,7 @@
 UnpauseSpecialPowerUpgradeModuleData::UnpauseSpecialPowerUpgradeModuleData( void )
 {
 	m_specialPower = NULL;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -50,14 +50,14 @@ UnpauseSpecialPowerUpgradeModuleData::UnpauseSpecialPowerUpgradeModuleData( void
 {
 	UpgradeModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SpecialPowerTemplate", INI::parseSpecialPowerTemplate, NULL, offsetof( UnpauseSpecialPowerUpgradeModuleData, m_specialPower ) },
-		{ 0, 0, 0, 0 } 
+		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -65,18 +65,18 @@ UnpauseSpecialPowerUpgradeModuleData::UnpauseSpecialPowerUpgradeModuleData( void
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-UnpauseSpecialPowerUpgrade::UnpauseSpecialPowerUpgrade( Thing *thing, const ModuleData* moduleData ) : 
+UnpauseSpecialPowerUpgrade::UnpauseSpecialPowerUpgrade( Thing *thing, const ModuleData* moduleData ) :
 							UpgradeModule( thing, moduleData )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 UnpauseSpecialPowerUpgrade::~UnpauseSpecialPowerUpgrade( void )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -102,7 +102,7 @@ void UnpauseSpecialPowerUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -120,7 +120,7 @@ void UnpauseSpecialPowerUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -131,4 +131,4 @@ void UnpauseSpecialPowerUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp
index c059dde8a05..f9425513a97 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp
@@ -32,11 +32,6 @@
 #include "Common/Xfer.h"
 #include "GameLogic/Module/UpgradeModule.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -46,11 +41,11 @@ void UpgradeModule::crc( Xfer *xfer )
 
 	// extend base class
 	BehaviorModule::crc( xfer );
-	
+
 	// extned base class
 	UpgradeMux::upgradeMuxCRC( xfer );
-	
-}  // end crc
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -69,7 +64,7 @@ void UpgradeModule::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeMux::upgradeMuxXfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -83,7 +78,7 @@ void UpgradeModule::loadPostProcess( void )
 	// extend base class
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -94,9 +89,9 @@ UpgradeMux::UpgradeMux() : m_upgradeExecuted(false)
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Bool UpgradeMux::isAlreadyUpgraded() const 
-{ 
-	return m_upgradeExecuted; 
+Bool UpgradeMux::isAlreadyUpgraded() const
+{
+	return m_upgradeExecuted;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -146,7 +141,7 @@ Bool UpgradeMux::wouldUpgrade( UpgradeMaskType keyMask ) const
 					return TRUE;
 				}
 			}
-			else 
+			else
 			{
 				//Check if ANY trigger requirements are met.
 				if( keyMask.testForAny( activation ) )
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponBonusUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponBonusUpgrade.cpp
index 5b850b37103..07cfda4f76f 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponBonusUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponBonusUpgrade.cpp
@@ -24,12 +24,12 @@
 
 // FILE: WeaponBonusUpgrade.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	May 2002
@@ -37,8 +37,8 @@
 //	Filename: 	WeaponBonusUpgrade.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -85,11 +85,11 @@ WeaponBonusUpgrade::~WeaponBonusUpgrade( void )
 //-------------------------------------------------------------------------------------------------
 void WeaponBonusUpgrade::upgradeImplementation( )
 {
-	// Very simple; just need to flag the Object as having the player upgrade, and the WeaponSet chooser 
+	// Very simple; just need to flag the Object as having the player upgrade, and the WeaponSet chooser
 	// will do the work of picking the right one from ini.  This comment is as long as the code.
 	Object *obj = getObject();
 	obj->setWeaponBonusCondition( WEAPONBONUSCONDITION_PLAYER_UPGRADE );
-	
+
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -101,7 +101,7 @@ void WeaponBonusUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -119,7 +119,7 @@ void WeaponBonusUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -130,4 +130,4 @@ void WeaponBonusUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponSetUpgrade.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponSetUpgrade.cpp
index ef5d40c9d5b..85db6a85811 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponSetUpgrade.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponSetUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -50,7 +50,7 @@ WeaponSetUpgrade::~WeaponSetUpgrade( void )
 //-------------------------------------------------------------------------------------------------
 void WeaponSetUpgrade::upgradeImplementation( )
 {
-	// Very simple; just need to flag the Object as having the player upgrade, and the WeaponSet chooser 
+	// Very simple; just need to flag the Object as having the player upgrade, and the WeaponSet chooser
 	// will do the work of picking the right one from ini.  This comment is as long as the code.
 	Object *obj = getObject();
 	obj->setWeaponSetFlag( WEAPONSET_PLAYER_UPGRADE );
@@ -65,7 +65,7 @@ void WeaponSetUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -83,7 +83,7 @@ void WeaponSetUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -94,4 +94,4 @@ void WeaponSetUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
index 31757c6f4a5..86835e3872f 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_DAMAGE_NAMES
 #define DEFINE_DEATH_NAMES
@@ -49,7 +49,7 @@
 #include "Common/ThingFactory.h"
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
- 
+
 #include "GameClient/Drawable.h"
 #include "GameClient/FXList.h"
 #include "GameClient/InGameUI.h"
@@ -86,11 +86,6 @@
 	const DistanceCalculationType ATTACK_RANGE_CALC_TYPE = FROM_BOUNDINGSPHERE_3D;
 #endif
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // damage is ALWAYS 3d
 const DistanceCalculationType DAMAGE_RANGE_CALC_TYPE = FROM_BOUNDINGSPHERE_3D;
@@ -165,79 +160,79 @@ WeaponStore *TheWeaponStore = NULL;					///< the weapon store definition
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-const FieldParse WeaponTemplate::TheWeaponTemplateFieldParseTable[] = 
-{
-
-	{ "PrimaryDamage",						INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_primaryDamage) },		
-	{ "PrimaryDamageRadius",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_primaryDamageRadius) },		
-	{ "SecondaryDamage",					INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_secondaryDamage) },		
-	{ "SecondaryDamageRadius",		INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_secondaryDamageRadius) },		
-	{ "AttackRange",							INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_attackRange) },		
-	{ "MinimumAttackRange",				INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_minimumAttackRange) },		
-	{ "RequestAssistRange",				INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_requestAssistRange) },		
-	{ "AcceptableAimDelta",				INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_aimDelta) },		
-	{ "ScatterRadius",						INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_scatterRadius) },		
-	{ "ScatterTargetScalar",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_scatterTargetScalar) },		
+const FieldParse WeaponTemplate::TheWeaponTemplateFieldParseTable[] =
+{
+
+	{ "PrimaryDamage",						INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_primaryDamage) },
+	{ "PrimaryDamageRadius",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_primaryDamageRadius) },
+	{ "SecondaryDamage",					INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_secondaryDamage) },
+	{ "SecondaryDamageRadius",		INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_secondaryDamageRadius) },
+	{ "AttackRange",							INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_attackRange) },
+	{ "MinimumAttackRange",				INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_minimumAttackRange) },
+	{ "RequestAssistRange",				INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_requestAssistRange) },
+	{ "AcceptableAimDelta",				INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_aimDelta) },
+	{ "ScatterRadius",						INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_scatterRadius) },
+	{ "ScatterTargetScalar",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_scatterTargetScalar) },
 	{ "ScatterRadiusVsInfantry",	INI::parseReal,													NULL,							offsetof( WeaponTemplate, m_infantryInaccuracyDist ) },
-	{ "DamageType",								INI::parseIndexList,										TheDamageNames,		offsetof(WeaponTemplate, m_damageType) },		
-	{ "DeathType",								INI::parseIndexList,										TheDeathNames,		offsetof(WeaponTemplate, m_deathType) },		
-	{ "WeaponSpeed",							INI::parseVelocityReal,									NULL,							offsetof(WeaponTemplate, m_weaponSpeed) },		
-	{ "MinWeaponSpeed",						INI::parseVelocityReal,									NULL,							offsetof(WeaponTemplate, m_minWeaponSpeed) },		
-	{ "ScaleWeaponSpeed",					INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_isScaleWeaponSpeed) },		
-	{ "WeaponRecoil",							INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_weaponRecoil) },		
-	{ "MinTargetPitch",						INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_minTargetPitch) },		
-	{ "MaxTargetPitch",						INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_maxTargetPitch) },		
-	{ "ProjectileObject",					INI::parseAsciiString,									NULL,							offsetof(WeaponTemplate, m_projectileName) },		
-	{ "FireSound",								INI::parseAudioEventRTS,								NULL,							offsetof(WeaponTemplate, m_fireSound) },		
-	{ "FireSoundLoopTime",				INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_fireSoundLoopTime) },		
-	{ "FireFX",											parseAllVetLevelsFXList,							NULL,							offsetof(WeaponTemplate, m_fireFXs) },		
-	{ "ProjectileDetonationFX",			parseAllVetLevelsFXList,							NULL,							offsetof(WeaponTemplate, m_projectileDetonateFXs) },		
-	{ "FireOCL",										parseAllVetLevelsAsciiString,					NULL,							offsetof(WeaponTemplate, m_fireOCLNames) },		
-	{ "ProjectileDetonationOCL",		parseAllVetLevelsAsciiString,					NULL,							offsetof(WeaponTemplate, m_projectileDetonationOCLNames) },		
-	{ "ProjectileExhaust",					parseAllVetLevelsPSys,								NULL,							offsetof(WeaponTemplate, m_projectileExhausts) },		
-	{ "VeterancyFireFX",										parsePerVetLevelFXList,				NULL,							offsetof(WeaponTemplate, m_fireFXs) },		
-	{ "VeterancyProjectileDetonationFX",		parsePerVetLevelFXList,				NULL,							offsetof(WeaponTemplate, m_projectileDetonateFXs) },		
-	{ "VeterancyFireOCL",										parsePerVetLevelAsciiString,	NULL,							offsetof(WeaponTemplate, m_fireOCLNames) },		
-	{ "VeterancyProjectileDetonationOCL",		parsePerVetLevelAsciiString,	NULL,							offsetof(WeaponTemplate, m_projectileDetonationOCLNames) },		
-	{ "VeterancyProjectileExhaust",					parsePerVetLevelPSys,					NULL,							offsetof(WeaponTemplate, m_projectileExhausts) },		
-	{ "ClipSize",									INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_clipSize) },		
-	{ "ContinuousFireOne",				INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_continuousFireOneShotsNeeded) },		
-	{ "ContinuousFireTwo",				INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_continuousFireTwoShotsNeeded) },		
-	{ "ContinuousFireCoast",			INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_continuousFireCoastFrames) },		
-	{ "AutoReloadWhenIdle",				INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_autoReloadWhenIdleFrames) },		
-	{ "ClipReloadTime",						INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_clipReloadTime) },		
+	{ "DamageType",								INI::parseIndexList,										TheDamageNames,		offsetof(WeaponTemplate, m_damageType) },
+	{ "DeathType",								INI::parseIndexList,										TheDeathNames,		offsetof(WeaponTemplate, m_deathType) },
+	{ "WeaponSpeed",							INI::parseVelocityReal,									NULL,							offsetof(WeaponTemplate, m_weaponSpeed) },
+	{ "MinWeaponSpeed",						INI::parseVelocityReal,									NULL,							offsetof(WeaponTemplate, m_minWeaponSpeed) },
+	{ "ScaleWeaponSpeed",					INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_isScaleWeaponSpeed) },
+	{ "WeaponRecoil",							INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_weaponRecoil) },
+	{ "MinTargetPitch",						INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_minTargetPitch) },
+	{ "MaxTargetPitch",						INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_maxTargetPitch) },
+	{ "ProjectileObject",					INI::parseAsciiString,									NULL,							offsetof(WeaponTemplate, m_projectileName) },
+	{ "FireSound",								INI::parseAudioEventRTS,								NULL,							offsetof(WeaponTemplate, m_fireSound) },
+	{ "FireSoundLoopTime",				INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_fireSoundLoopTime) },
+	{ "FireFX",											parseAllVetLevelsFXList,							NULL,							offsetof(WeaponTemplate, m_fireFXs) },
+	{ "ProjectileDetonationFX",			parseAllVetLevelsFXList,							NULL,							offsetof(WeaponTemplate, m_projectileDetonateFXs) },
+	{ "FireOCL",										parseAllVetLevelsAsciiString,					NULL,							offsetof(WeaponTemplate, m_fireOCLNames) },
+	{ "ProjectileDetonationOCL",		parseAllVetLevelsAsciiString,					NULL,							offsetof(WeaponTemplate, m_projectileDetonationOCLNames) },
+	{ "ProjectileExhaust",					parseAllVetLevelsPSys,								NULL,							offsetof(WeaponTemplate, m_projectileExhausts) },
+	{ "VeterancyFireFX",										parsePerVetLevelFXList,				NULL,							offsetof(WeaponTemplate, m_fireFXs) },
+	{ "VeterancyProjectileDetonationFX",		parsePerVetLevelFXList,				NULL,							offsetof(WeaponTemplate, m_projectileDetonateFXs) },
+	{ "VeterancyFireOCL",										parsePerVetLevelAsciiString,	NULL,							offsetof(WeaponTemplate, m_fireOCLNames) },
+	{ "VeterancyProjectileDetonationOCL",		parsePerVetLevelAsciiString,	NULL,							offsetof(WeaponTemplate, m_projectileDetonationOCLNames) },
+	{ "VeterancyProjectileExhaust",					parsePerVetLevelPSys,					NULL,							offsetof(WeaponTemplate, m_projectileExhausts) },
+	{ "ClipSize",									INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_clipSize) },
+	{ "ContinuousFireOne",				INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_continuousFireOneShotsNeeded) },
+	{ "ContinuousFireTwo",				INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_continuousFireTwoShotsNeeded) },
+	{ "ContinuousFireCoast",			INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_continuousFireCoastFrames) },
+	{ "AutoReloadWhenIdle",				INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_autoReloadWhenIdleFrames) },
+	{ "ClipReloadTime",						INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_clipReloadTime) },
 	{ "DelayBetweenShots",				WeaponTemplate::parseShotDelay,					NULL,							0 },
 	{ "ShotsPerBarrel",						INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_shotsPerBarrel) },
-	{ "DamageDealtAtSelfPosition",INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_damageDealtAtSelfPosition) },		
-	{ "RadiusDamageAffects",			INI::parseBitString32,	TheWeaponAffectsMaskNames,				offsetof(WeaponTemplate, m_affectsMask) },		
-	{ "ProjectileCollidesWith",		INI::parseBitString32,	TheWeaponCollideMaskNames,				offsetof(WeaponTemplate, m_collideMask) },		
-	{ "AntiAirborneVehicle",			INI::parseBitInInt32,										(void*)WEAPON_ANTI_AIRBORNE_VEHICLE,	offsetof(WeaponTemplate, m_antiMask) },		
-	{ "AntiGround",								INI::parseBitInInt32,										(void*)WEAPON_ANTI_GROUND,						offsetof(WeaponTemplate, m_antiMask) },		
-	{ "AntiProjectile",						INI::parseBitInInt32,										(void*)WEAPON_ANTI_PROJECTILE,				offsetof(WeaponTemplate, m_antiMask) },		
+	{ "DamageDealtAtSelfPosition",INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_damageDealtAtSelfPosition) },
+	{ "RadiusDamageAffects",			INI::parseBitString32,	TheWeaponAffectsMaskNames,				offsetof(WeaponTemplate, m_affectsMask) },
+	{ "ProjectileCollidesWith",		INI::parseBitString32,	TheWeaponCollideMaskNames,				offsetof(WeaponTemplate, m_collideMask) },
+	{ "AntiAirborneVehicle",			INI::parseBitInInt32,										(void*)WEAPON_ANTI_AIRBORNE_VEHICLE,	offsetof(WeaponTemplate, m_antiMask) },
+	{ "AntiGround",								INI::parseBitInInt32,										(void*)WEAPON_ANTI_GROUND,						offsetof(WeaponTemplate, m_antiMask) },
+	{ "AntiProjectile",						INI::parseBitInInt32,										(void*)WEAPON_ANTI_PROJECTILE,				offsetof(WeaponTemplate, m_antiMask) },
 	{ "AntiSmallMissile",					INI::parseBitInInt32,										(void*)WEAPON_ANTI_SMALL_MISSILE,			offsetof(WeaponTemplate, m_antiMask) },
 	{ "AntiMine",									INI::parseBitInInt32,										(void*)WEAPON_ANTI_MINE,							offsetof(WeaponTemplate, m_antiMask) },
 	{ "AntiParachute",						INI::parseBitInInt32,										(void*)WEAPON_ANTI_PARACHUTE,					offsetof(WeaponTemplate, m_antiMask) },
 	{ "AntiAirborneInfantry",			INI::parseBitInInt32,										(void*)WEAPON_ANTI_AIRBORNE_INFANTRY, offsetof(WeaponTemplate, m_antiMask) },
 	{ "AntiBallisticMissile",			INI::parseBitInInt32,										(void*)WEAPON_ANTI_BALLISTIC_MISSILE, offsetof(WeaponTemplate, m_antiMask) },
-	{ "AutoReloadsClip",					INI::parseIndexList,										TheWeaponReloadNames,							offsetof(WeaponTemplate, m_reloadType) },		
+	{ "AutoReloadsClip",					INI::parseIndexList,										TheWeaponReloadNames,							offsetof(WeaponTemplate, m_reloadType) },
 	{ "ProjectileStreamName",			INI::parseAsciiString,									NULL,							offsetof(WeaponTemplate, m_projectileStreamName) },
 	{ "LaserName",								INI::parseAsciiString,									NULL,							offsetof(WeaponTemplate, m_laserName) },
-	{ "WeaponBonus",							WeaponTemplate::parseWeaponBonusSet,		NULL,							0 },		
-	{ "HistoricBonusTime",				INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_historicBonusTime) },		
-	{ "HistoricBonusRadius",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_historicBonusRadius) },		
-	{ "HistoricBonusCount",				INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_historicBonusCount) },		
-	{ "HistoricBonusWeapon",			INI::parseWeaponTemplate,								NULL,							offsetof(WeaponTemplate, m_historicBonusWeapon) },		
+	{ "WeaponBonus",							WeaponTemplate::parseWeaponBonusSet,		NULL,							0 },
+	{ "HistoricBonusTime",				INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_historicBonusTime) },
+	{ "HistoricBonusRadius",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_historicBonusRadius) },
+	{ "HistoricBonusCount",				INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_historicBonusCount) },
+	{ "HistoricBonusWeapon",			INI::parseWeaponTemplate,								NULL,							offsetof(WeaponTemplate, m_historicBonusWeapon) },
 	{ "LeechRangeWeapon",					INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_leechRangeWeapon) },
-	{ "ScatterTarget",						WeaponTemplate::parseScatterTarget,			NULL,							0 },		
+	{ "ScatterTarget",						WeaponTemplate::parseScatterTarget,			NULL,							0 },
 	{ "CapableOfFollowingWaypoints", INI::parseBool,											NULL,							offsetof(WeaponTemplate, m_capableOfFollowingWaypoint) },
 	{ "ShowsAmmoPips",						INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_isShowsAmmoPips) },
 	{ "AllowAttackGarrisonedBldgs", INI::parseBool,												NULL,							offsetof(WeaponTemplate, m_allowAttackGarrisonedBldgs) },
 	{ "PlayFXWhenStealthed",			INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_playFXWhenStealthed) },
 	{ "PreAttackDelay",						INI::parseDurationUnsignedInt,					NULL,							offsetof( WeaponTemplate, m_preAttackDelay ) },
-	{ "PreAttackType",						INI::parseIndexList,										TheWeaponPrefireNames, offsetof(WeaponTemplate, m_prefireType) },		
+	{ "PreAttackType",						INI::parseIndexList,										TheWeaponPrefireNames, offsetof(WeaponTemplate, m_prefireType) },
 	{ "ContinueAttackRange",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_continueAttackRange) },
-	{ "SuspendFXDelay",						INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_suspendFXDelay) },		
-	{ NULL,												NULL,																		NULL,							0 }  // keep this last
+	{ "SuspendFXDelay",						INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_suspendFXDelay) },
+	{ NULL,												NULL,																		NULL,							0 }
 
 };
 
@@ -314,25 +309,24 @@ WeaponTemplate::WeaponTemplate() : m_nextTemplate(NULL)
 	m_continueAttackRange						= 0.0f;
 	m_infantryInaccuracyDist				= 0.0f;
 	m_suspendFXDelay								= 0;
+
+	m_historicDamageTriggerId = 0;
 }
 
 //-------------------------------------------------------------------------------------------------
 WeaponTemplate::~WeaponTemplate()
 {
-	if (m_nextTemplate) {
-		deleteInstance(m_nextTemplate);
-	}
+	deleteInstance(m_nextTemplate);
 
 	// delete any extra-bonus that's present
-	if (m_extraBonus)
-		deleteInstance(m_extraBonus);
+	deleteInstance(m_extraBonus);
 }
 
 // ------------------------------------------------------------------------------------------------
 void WeaponTemplate::reset( void )
 {
 	m_historicDamage.clear();
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ void WeaponTemplate::parseWeaponBonusSet( INI* ini, void *instance, void * /*store*/, const void* /*userData*/ )
@@ -382,14 +376,14 @@ void WeaponTemplate::reset( void )
 		else
 			self->m_maxDelayBetweenShots = INI::scanInt(ini->getNextToken(ini->getSepsColon()));
 	}
-	else 
+	else
 	{
 		// single entry, as in no label so the first token is just a number
 		self->m_minDelayBetweenShots = INI::scanInt(token);
 		self->m_maxDelayBetweenShots = self->m_minDelayBetweenShots;
 	}
 
-	// No matter what we have now, we want to convert it to frames from msec. 
+	// No matter what we have now, we want to convert it to frames from msec.
 	// ShotDelay used to use parseDurationUnsignedInt, and we are expanding on that.
 	self->m_minDelayBetweenShots = ceilf(ConvertDurationFromMsecsToFrames((Real)self->m_minDelayBetweenShots));
 	self->m_maxDelayBetweenShots = ceilf(ConvertDurationFromMsecsToFrames((Real)self->m_maxDelayBetweenShots));
@@ -404,7 +398,7 @@ void WeaponTemplate::postProcessLoad()
 		DEBUG_CRASH(("you must call this after TheThingFactory is inited"));
 		return;
 	}
-	
+
 	if (m_projectileName.isEmpty())
 	{
 		m_projectileTmpl = NULL;
@@ -442,37 +436,37 @@ void WeaponTemplate::postProcessLoad()
 		m_projectileDetonationOCLNames[i].clear();
 	}
 
-}  // end postProcessLoad
+}
 
 //-------------------------------------------------------------------------------------------------
-Real WeaponTemplate::getAttackRange(const WeaponBonus& bonus) const 
+Real WeaponTemplate::getAttackRange(const WeaponBonus& bonus) const
 {
 #ifdef RATIONALIZE_ATTACK_RANGE
 	// Note - undersize by 1/4 of a pathfind cell, so that the goal is not teetering on the edge
 	// of firing range.  jba.
 	const Real UNDERSIZE = PATHFIND_CELL_SIZE_F*0.25f;
-	Real r = m_attackRange * bonus.getField(WeaponBonus::RANGE) - UNDERSIZE; 
+	Real r = m_attackRange * bonus.getField(WeaponBonus::RANGE) - UNDERSIZE;
 	if (r < 0.0f) r = 0.0f;
 	return r;
 #else
 // fudge this a little to account for pathfinding roundoff & such
 	const Real ATTACK_RANGE_FUDGE = 1.05f;
-	return m_attackRange * bonus.getField(WeaponBonus::RANGE) * ATTACK_RANGE_FUDGE; 
+	return m_attackRange * bonus.getField(WeaponBonus::RANGE) * ATTACK_RANGE_FUDGE;
 #endif
 }
 
 //-------------------------------------------------------------------------------------------------
-Real WeaponTemplate::getMinimumAttackRange() const 
-{ 
+Real WeaponTemplate::getMinimumAttackRange() const
+{
 #ifdef RATIONALIZE_ATTACK_RANGE
 	// Note - undersize by 1/4 of a pathfind cell, so that the goal is not teetering on the edge
 	// of firing range.  jba.
 	const Real UNDERSIZE = PATHFIND_CELL_SIZE_F*0.25f;
-	Real r = m_minimumAttackRange - UNDERSIZE; 
+	Real r = m_minimumAttackRange - UNDERSIZE;
 	if (r < 0.0f) r = 0.0f;
 	return r;
 #else
-	return m_minimumAttackRange; 
+	return m_minimumAttackRange;
 #endif
 }
 
@@ -483,7 +477,7 @@ Real WeaponTemplate::getUnmodifiedAttackRange() const
 }
 
 //-------------------------------------------------------------------------------------------------
-Int WeaponTemplate::getDelayBetweenShots(const WeaponBonus& bonus) const 
+Int WeaponTemplate::getDelayBetweenShots(const WeaponBonus& bonus) const
 {
 	// yes, divide, not multiply; the larger the rate-of-fire bonus, the shorter
 	// we want the delay time to be.
@@ -494,48 +488,48 @@ Int WeaponTemplate::getDelayBetweenShots(const WeaponBonus& bonus) const
 		delayToUse = GameLogicRandomValue( m_minDelayBetweenShots, m_maxDelayBetweenShots );
 
 	Real bonusROF = bonus.getField(WeaponBonus::RATE_OF_FIRE);
-	//CRCDEBUG_LOG(("WeaponTemplate::getDelayBetweenShots() - min:%d max:%d val:%d, bonusROF=%g/%8.8X\n",
+	//CRCDEBUG_LOG(("WeaponTemplate::getDelayBetweenShots() - min:%d max:%d val:%d, bonusROF=%g/%8.8X",
 		//m_minDelayBetweenShots, m_maxDelayBetweenShots, delayToUse, bonusROF, AS_INT(bonusROF)));
 
-	return REAL_TO_INT_FLOOR(delayToUse / bonusROF); 
+	return REAL_TO_INT_FLOOR(delayToUse / bonusROF);
 }
 
 //-------------------------------------------------------------------------------------------------
-Int WeaponTemplate::getClipReloadTime(const WeaponBonus& bonus) const 
+Int WeaponTemplate::getClipReloadTime(const WeaponBonus& bonus) const
 {
 	// yes, divide, not multiply; the larger the rate-of-fire bonus, the shorter
 	// we want the reload time to be.
-	return REAL_TO_INT_FLOOR(m_clipReloadTime / bonus.getField(WeaponBonus::RATE_OF_FIRE));	
+	return REAL_TO_INT_FLOOR(m_clipReloadTime / bonus.getField(WeaponBonus::RATE_OF_FIRE));
 }
 
 //-------------------------------------------------------------------------------------------------
 Int WeaponTemplate::getPreAttackDelay( const WeaponBonus& bonus ) const
 {
-	return m_preAttackDelay * bonus.getField( WeaponBonus::PRE_ATTACK ); 
+	return m_preAttackDelay * bonus.getField( WeaponBonus::PRE_ATTACK );
 }
 
 //-------------------------------------------------------------------------------------------------
-Real WeaponTemplate::getPrimaryDamage(const WeaponBonus& bonus) const 
+Real WeaponTemplate::getPrimaryDamage(const WeaponBonus& bonus) const
 {
-	return m_primaryDamage * bonus.getField(WeaponBonus::DAMAGE); 
+	return m_primaryDamage * bonus.getField(WeaponBonus::DAMAGE);
 }
 
 //-------------------------------------------------------------------------------------------------
-Real WeaponTemplate::getPrimaryDamageRadius(const WeaponBonus& bonus) const 
+Real WeaponTemplate::getPrimaryDamageRadius(const WeaponBonus& bonus) const
 {
-	return m_primaryDamageRadius * bonus.getField(WeaponBonus::RADIUS); 
+	return m_primaryDamageRadius * bonus.getField(WeaponBonus::RADIUS);
 }
 
 //-------------------------------------------------------------------------------------------------
-Real WeaponTemplate::getSecondaryDamage(const WeaponBonus& bonus) const 
+Real WeaponTemplate::getSecondaryDamage(const WeaponBonus& bonus) const
 {
-	return m_secondaryDamage * bonus.getField(WeaponBonus::DAMAGE); 
+	return m_secondaryDamage * bonus.getField(WeaponBonus::DAMAGE);
 }
 
 //-------------------------------------------------------------------------------------------------
-Real WeaponTemplate::getSecondaryDamageRadius(const WeaponBonus& bonus) const 
+Real WeaponTemplate::getSecondaryDamageRadius(const WeaponBonus& bonus) const
 {
-	return m_secondaryDamageRadius * bonus.getField(WeaponBonus::RADIUS); 
+	return m_secondaryDamageRadius * bonus.getField(WeaponBonus::RADIUS);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -544,20 +538,20 @@ Bool WeaponTemplate::isContactWeapon() const
 #ifdef RATIONALIZE_ATTACK_RANGE
 	// Note - undersize by 1/4 of a pathfind cell, so that the goal is not teetering on the edge
 	// of firing range.  jba.
-	const Real UNDERSIZE = PATHFIND_CELL_SIZE_F*0.25f; 
+	const Real UNDERSIZE = PATHFIND_CELL_SIZE_F*0.25f;
 	return (m_attackRange - UNDERSIZE) < PATHFIND_CELL_SIZE_F;
 #else
 // fudge this a little to account for pathfinding roundoff & such
 	const Real ATTACK_RANGE_FUDGE = 1.05f;
-	return m_attackRange * ATTACK_RANGE_FUDGE < PATHFIND_CELL_SIZE_F; 
+	return m_attackRange * ATTACK_RANGE_FUDGE < PATHFIND_CELL_SIZE_F;
 #endif
 }
 
 //-------------------------------------------------------------------------------------------------
 Real WeaponTemplate::estimateWeaponTemplateDamage(
-	const Object *sourceObj, 
-	const Object *victimObj, 
-	const Coord3D* victimPos, 
+	const Object *sourceObj,
+	const Object *victimObj,
+	const Coord3D* victimPos,
 	const WeaponBonus& bonus
 ) const
 {
@@ -567,10 +561,16 @@ Real WeaponTemplate::estimateWeaponTemplateDamage(
 		return 0.0f;
 	}
 
+	const Real damageAmount = getPrimaryDamage(bonus);
+	if ( victimObj == NULL )
+	{
+		return damageAmount;
+	}
+
 	DamageType damageType = getDamageType();
 	DeathType deathType = getDeathType();
 
-	if (victimObj && victimObj->isKindOf(KINDOF_SHRUBBERY))
+	if ( victimObj->isKindOf(KINDOF_SHRUBBERY) )
 	{
 		if (deathType == DEATH_BURNED)
 		{
@@ -584,7 +584,7 @@ Real WeaponTemplate::estimateWeaponTemplateDamage(
 	}
 
 // this stays, even if ALLOW_SURRENDER is not defed, since flashbangs still use 'em
-	if (damageType == DAMAGE_SURRENDER || m_allowAttackGarrisonedBldgs)
+	if ( damageType == DAMAGE_SURRENDER || m_allowAttackGarrisonedBldgs )
 	{
 		ContainModuleInterface* contain = victimObj->getContain();
 		if( contain && contain->getContainCount() > 0 && contain->isGarrisonable() && !contain->isImmuneToClearBuildingAttacks() )
@@ -594,71 +594,54 @@ Real WeaponTemplate::estimateWeaponTemplateDamage(
 		}
 	}
 
-	if( victimObj )
+	if( victimObj->isKindOf(KINDOF_MINE) && damageType == DAMAGE_DISARM )
 	{
-		if( victimObj->isKindOf(KINDOF_MINE) && damageType == DAMAGE_DISARM )
-		{
-			// this is just a nonzero value, to ensure we can target mines with disarm weapons, regardless...
-			return 1.0f;
-		}
-		if( damageType == DAMAGE_DEPLOY && !victimObj->isAirborneTarget() )
-		{
-			return 1.0f;
-		}
+		// this is just a nonzero value, to ensure we can target mines with disarm weapons, regardless...
+		return 1.0f;
+	}
+	if( damageType == DAMAGE_DEPLOY && !victimObj->isAirborneTarget() )
+	{
+		return 1.0f;
 	}
 
 	//@todo Kris need to examine the DAMAGE_HACK type for damage estimation purposes.
 	//Likely this damage type will have threat implications that won't properly be dealt with until resolved.
 
-//	const Coord3D* sourcePos = sourceObj->getPosition();
-	if (victimPos == NULL)
-	{
-		victimPos = victimObj->getPosition();
-	}
-
-	Real damageAmount = getPrimaryDamage(bonus);
-	if (victimObj == NULL)
-	{
-		return damageAmount;
-	}
-	else
-	{
-		DamageInfoInput damageInfo;
-		damageInfo.m_damageType = damageType;
-		damageInfo.m_deathType = deathType;
-		damageInfo.m_sourceID = sourceObj->getID();
-		damageInfo.m_amount = damageAmount;
-		return victimObj->estimateDamage(damageInfo);
-	}
+	DamageInfoInput damageInfo;
+	damageInfo.m_damageType = damageType;
+	damageInfo.m_deathType = deathType;
+	damageInfo.m_sourceID = sourceObj->getID();
+	damageInfo.m_amount = damageAmount;
+	return victimObj->estimateDamage(damageInfo);
 }
 
 //-------------------------------------------------------------------------------------------------
 Bool WeaponTemplate::shouldProjectileCollideWith(
-	const Object* projectileLauncher, 
-	const Object* projectile, 
+	const Object* projectileLauncher,
+	const Object* projectile,
 	const Object* thingWeCollidedWith,
 	ObjectID intendedVictimID	// could be INVALID_ID for a position-shot
 ) const
 {
  	if (!projectile || !thingWeCollidedWith)
  		return false;
- 
+
 	// if it's our intended victim, we want to collide with it, regardless of any other considerations.
 	if (intendedVictimID == thingWeCollidedWith->getID())
 		return true;
 
  	if (projectileLauncher != NULL)
  	{
- 
+
  		// Don't hit your own launcher, ever.
  		if (projectileLauncher == thingWeCollidedWith)
  			return false;
- 
+
  		// If our launcher is inside something, and that something is 'thingWeCollidedWith' we won't collide
  		const Object *launcherContainedBy = projectileLauncher->getContainedBy();
  		if( launcherContainedBy == thingWeCollidedWith )
  			return false;
- 
+
  	}
 
 	// never bother burning already-burned things. (srj)
@@ -676,7 +659,7 @@ Bool WeaponTemplate::shouldProjectileCollideWith(
 	if (thingWeCollidedWith->isKindOf(KINDOF_AIRFIELD))
 	{
 		//
-		// ok, so if we are an airfield, and our intended victim has a reserved space 
+		// ok, so if we are an airfield, and our intended victim has a reserved space
 		// with us, it "belongs" to us and collisions intended for it should not detonate
 		// as a result of colliding with us.
 		//
@@ -719,23 +702,23 @@ Bool WeaponTemplate::shouldProjectileCollideWith(
 	if (thingWeCollidedWith->getTemplate()->getFenceWidth() > 0)	requiredMask |= WEAPON_COLLIDE_WALLS;
 	if (thingWeCollidedWith->isKindOf(KINDOF_SMALL_MISSILE))			requiredMask |= WEAPON_COLLIDE_SMALL_MISSILES;			//All missiles are also projectiles!
 	if (thingWeCollidedWith->isKindOf(KINDOF_BALLISTIC_MISSILE))	requiredMask |= WEAPON_COLLIDE_BALLISTIC_MISSILES;	//All missiles are also projectiles!
-		
+
 	// if any in requiredMask are present in collidemask, do the collision. (srj)
 	if ((getProjectileCollideMask() & requiredMask) != 0)
 		return true;
 
-	//DEBUG_LOG(("Rejecting projectile collision between %s and %s!\n",projectile->getTemplate()->getName().str(),thingWeCollidedWith->getTemplate()->getName().str()));
+	//DEBUG_LOG(("Rejecting projectile collision between %s and %s!",projectile->getTemplate()->getName().str(),thingWeCollidedWith->getTemplate()->getName().str()));
 	return false;
 }
 
 //-------------------------------------------------------------------------------------------------
 UnsignedInt WeaponTemplate::fireWeaponTemplate
 (
-	const Object *sourceObj, 
-	WeaponSlotType wslot, 
-	Int specificBarrelToUse, 
-	const Object *victimObj, 
-	const Coord3D* victimPos, 
+	const Object *sourceObj,
+	WeaponSlotType wslot,
+	Int specificBarrelToUse,
+	const Object *victimObj,
+	const Coord3D* victimPos,
 	const WeaponBonus& bonus,
 	Bool isProjectileDetonation,
 	Bool ignoreRanges,
@@ -744,8 +727,8 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 ) const
 {
 
-	//-extraLogging 
-	#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+	//-extraLogging
+	#if defined(RTS_DEBUG)
 		AsciiString targetStr;
 		if( TheGlobalData->m_extraLogging )
 		{
@@ -756,23 +739,23 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 			else
 				targetStr.format( "SELF." );
 
-			DEBUG_LOG( ("%d - WeaponTemplate::fireWeaponTemplate() begin - %s attacking %s - ", 
+			DEBUG_LOG( ("%d - WeaponTemplate::fireWeaponTemplate() begin - %s attacking %s",
 				TheGameLogic->getFrame(), sourceObj->getTemplate()->getName().str(), targetStr.str() ) );
 		}
 	#endif
-	//end -extraLogging 
+	//end -extraLogging
 
-	//CRCDEBUG_LOG(("WeaponTemplate::fireWeaponTemplate() from %s\n", DescribeObject(sourceObj).str()));
-	DEBUG_ASSERTCRASH(specificBarrelToUse >= 0, ("specificBarrelToUse should no longer be -1\n"));
+	//CRCDEBUG_LOG(("WeaponTemplate::fireWeaponTemplate() from %s", DescribeObject(sourceObj).str()));
+	DEBUG_ASSERTCRASH(specificBarrelToUse >= 0, ("specificBarrelToUse should no longer be -1"));
 
 	if (sourceObj == NULL || (victimObj == NULL && victimPos == NULL))
 	{
-		//-extraLogging 
-		#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+		//-extraLogging
+		#if defined(RTS_DEBUG)
 			if( TheGlobalData->m_extraLogging )
-				DEBUG_LOG( ("FAIL 1 (sourceObj %d == NULL || (victimObj %d == NULL && victimPos %d == NULL)\n", sourceObj != 0, victimObj != 0, victimPos != 0) );
+				DEBUG_LOG( ("FAIL 1 (sourceObj %d == NULL || (victimObj %d == NULL && victimPos %d == NULL)", sourceObj != 0, victimObj != 0, victimPos != 0) );
 		#endif
-		//end -extraLogging 
+		//end -extraLogging
 
 		return 0;
 	}
@@ -788,7 +771,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 	Coord3D victimPosStorage;
 	if (victimObj)
 	{
-		DEBUG_ASSERTLOG(sourceObj != victimObj, ("*** firing weapon at self -- is this really what you want?\n"));
+		DEBUG_ASSERTLOG(sourceObj != victimObj, ("*** firing weapon at self -- is this really what you want?"));
 		victimPos = victimObj->getPosition();
 		victimID = victimObj->getID();
 
@@ -809,21 +792,21 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		}
 		else
 		{
-			if (victimObj->isKindOf(KINDOF_BRIDGE)) 
+			if (victimObj->isKindOf(KINDOF_BRIDGE))
 			{
 				// Bridges are kind of oddball - they have 2 target points at either end.
 				TheTerrainLogic->getBridgeAttackPoints(victimObj, &info);
 				distSqr = ThePartitionManager->getDistanceSquared( sourceObj, &info.attackPoint1, ATTACK_RANGE_CALC_TYPE );
 				victimPos = &info.attackPoint1;
  				Real distSqr2 = ThePartitionManager->getDistanceSquared( sourceObj, &info.attackPoint2, ATTACK_RANGE_CALC_TYPE );
-				if (distSqr > distSqr2) 
+				if (distSqr > distSqr2)
 				{
 					// Try the other one.
 					distSqr = distSqr2;
 					victimPos = &info.attackPoint2;
 				}
-			}	
-			else 
+			}
+			else
 			{
 				distSqr = ThePartitionManager->getDistanceSquared(sourceObj, victimObj, ATTACK_RANGE_CALC_TYPE);
 			}
@@ -835,7 +818,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		distSqr = ThePartitionManager->getDistanceSquared(sourceObj, victimPos, ATTACK_RANGE_CALC_TYPE);
 	}
 
-//	DEBUG_LOG(("WeaponTemplate::fireWeaponTemplate: firing weapon %s (source=%s, victim=%s)\n",
+//	DEBUG_LOG(("WeaponTemplate::fireWeaponTemplate: firing weapon %s (source=%s, victim=%s)",
 //		m_name.str(),sourceObj->getTemplate()->getName().str(),victimObj?victimObj->getTemplate()->getName().str():"NULL"));
 
 	//Only perform this check if the weapon isn't a leech range weapon (which can have unlimited range!)
@@ -844,14 +827,14 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		Real attackRangeSqr = sqr(getAttackRange(bonus));
 		if (distSqr > attackRangeSqr)
 		{
-			//DEBUG_ASSERTCRASH(distSqr < 5*5 || distSqr < attackRangeSqr*1.2f, ("*** victim is out of range (%f vs %f) of this weapon -- why did we attempt to fire?\n",sqrtf(distSqr),sqrtf(attackRangeSqr)));
-			
-			//-extraLogging 
-			#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+			//DEBUG_ASSERTCRASH(distSqr < 5*5 || distSqr < attackRangeSqr*1.2f, ("*** victim is out of range (%f vs %f) of this weapon -- why did we attempt to fire?",sqrtf(distSqr),sqrtf(attackRangeSqr)));
+
+			//-extraLogging
+			#if defined(RTS_DEBUG)
 				if( TheGlobalData->m_extraLogging )
-					DEBUG_LOG( ("FAIL 2 (distSqr %.2f > attackRangeSqr %.2f)\n", distSqr, attackRangeSqr ) );
+					DEBUG_LOG( ("FAIL 2 (distSqr %.2f > attackRangeSqr %.2f)", distSqr, attackRangeSqr ) );
 			#endif
-			//end -extraLogging 
+			//end -extraLogging
 
 			return 0;
 		}
@@ -866,14 +849,14 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		if (distSqr < minAttackRangeSqr-0.5f && !isProjectileDetonation)
 #endif
 		{
-			DEBUG_ASSERTCRASH(distSqr > minAttackRangeSqr*0.8f, ("*** victim is closer than min attack range (%f vs %f) of this weapon -- why did we attempt to fire?\n",sqrtf(distSqr),sqrtf(minAttackRangeSqr)));
+			DEBUG_ASSERTCRASH(distSqr > minAttackRangeSqr*0.8f, ("*** victim is closer than min attack range (%f vs %f) of this weapon -- why did we attempt to fire?",sqrtf(distSqr),sqrtf(minAttackRangeSqr)));
 
-			//-extraLogging 
-			#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+			//-extraLogging
+			#if defined(RTS_DEBUG)
 				if( TheGlobalData->m_extraLogging )
-					DEBUG_LOG( ("FAIL 3 (distSqr %.2f< minAttackRangeSqr %.2f - 0.5f && !isProjectileDetonation %d)\n", distSqr, minAttackRangeSqr, isProjectileDetonation ) );
+					DEBUG_LOG( ("FAIL 3 (distSqr %.2f< minAttackRangeSqr %.2f - 0.5f && !isProjectileDetonation %d)", distSqr, minAttackRangeSqr, isProjectileDetonation ) );
 			#endif
-			//end -extraLogging 
+			//end -extraLogging
 
 			return 0;
 		}
@@ -895,15 +878,15 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		Real reDir = reAngle != 0.0f ? (atan2(victimPos->y - sourcePos->y, victimPos->x - sourcePos->x)) : 0.0f;
 		VeterancyLevel v = sourceObj->getVeterancyLevel();
 		const FXList* fx = isProjectileDetonation ? getProjectileDetonateFX(v) : getFireFX(v);
-		
+
 		if ( TheGameLogic->getFrame() < firingWeapon->getSuspendFXFrame() )
 			fx = NULL;
 
 		Bool handled;
-		
-		if(!sourceObj->isLocallyControlled()									// if user watching is not controller and
-			&&  sourceObj->testStatus(OBJECT_STATUS_STEALTHED)	// if unit is stealthed (like a Pathfinder)
-			&& !sourceObj->testStatus(OBJECT_STATUS_DETECTED)		// but not detected...
+
+		// TheSuperHackers @todo: Remove hardcoded KINDOF_MINE check and apply PlayFXWhenStealthed = Yes to the mine weapons instead.
+
+		if (!sourceObj->isLogicallyVisible()									// if user watching cannot see us
 			&& !sourceObj->isKindOf(KINDOF_MINE)								// and not a mine (which always do the FX, even if hidden)...
 			&& !isPlayFXWhenStealthed()													// and not a weapon marked to playwhenstealthed
 			)
@@ -912,12 +895,12 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		}
 		else
 		{
-			handled = sourceObj->getDrawable()->handleWeaponFireFX(wslot, 
-																															specificBarrelToUse, 
-																															fx, 
-																															getWeaponSpeed(), 
-																															reAngle, 
-																															reDir, 
+			handled = sourceObj->getDrawable()->handleWeaponFireFX(wslot,
+																															specificBarrelToUse,
+																															fx,
+																															getWeaponSpeed(),
+																															reAngle,
+																															reDir,
 																															&targetPos,
 																															getPrimaryDamageRadius(bonus)
 																															);
@@ -926,7 +909,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		if (handled == false && fx != NULL)
 		{
 			// bah. just play it at the drawable's pos.
-			//DEBUG_LOG(("*** WeaponFireFX not fully handled by the client\n"));
+			//DEBUG_LOG(("*** WeaponFireFX not fully handled by the client"));
 			const Coord3D* where = isContactWeapon() ? &targetPos : sourceObj->getDrawable()->getPosition();
 			FXList::doFXPos(fx, where, sourceObj->getDrawable()->getTransformMatrix(), getWeaponSpeed(), &targetPos, getPrimaryDamageRadius(bonus));
 		}
@@ -961,15 +944,15 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		if (delayInFrames < 1.0f)
 		{
 			// go ahead and do it now
-			//DEBUG_LOG(("WeaponTemplate::fireWeaponTemplate: firing weapon immediately!\n"));
+			//DEBUG_LOG(("WeaponTemplate::fireWeaponTemplate: firing weapon immediately!"));
 			dealDamageInternal(sourceID, damageID, damagePos, bonus, isProjectileDetonation);
 
-			//-extraLogging 
-			#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+			//-extraLogging
+			#if defined(RTS_DEBUG)
 				if( TheGlobalData->m_extraLogging )
-					DEBUG_LOG( ("EARLY 4 (delayed damage applied now)\n") );
+					DEBUG_LOG( ("EARLY 4 (delayed damage applied now)") );
 			#endif
-			//end -extraLogging 
+			//end -extraLogging
 
 
 			return TheGameLogic->getFrame();
@@ -981,16 +964,16 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 			{
 				UnsignedInt delayInWholeFrames = REAL_TO_INT_CEIL(delayInFrames);
 				when = TheGameLogic->getFrame() + delayInWholeFrames;
-				//DEBUG_LOG(("WeaponTemplate::fireWeaponTemplate: firing weapon in %d frames (= %d)!\n", delayInWholeFrames,when));
+				//DEBUG_LOG(("WeaponTemplate::fireWeaponTemplate: firing weapon in %d frames (= %d)!", delayInWholeFrames,when));
 				TheWeaponStore->setDelayedDamage(this, damagePos, when, sourceID, damageID, bonus);
 			}
 
-			//-extraLogging 
-			#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+			//-extraLogging
+			#if defined(RTS_DEBUG)
 				if( TheGlobalData->m_extraLogging )
-					DEBUG_LOG( ("EARLY 5 (delaying damage applied until frame %d)\n", when ) );
+					DEBUG_LOG( ("EARLY 5 (delaying damage applied until frame %d)", when ) );
 			#endif
-			//end -extraLogging 
+			//end -extraLogging
 
 
 			return when;
@@ -1001,7 +984,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		Player *owningPlayer = sourceObj->getControllingPlayer(); //Need to know so missiles don't collide with firer
 		Object *projectile = TheThingFactory->newObject( getProjectileTemplate(), owningPlayer->getDefaultTeam() );
 		projectile->setProducer(sourceObj);
-		
+
 		//If the player has battle plans (America Strategy Center), then apply those bonuses
 		//to this object if applicable. Internally it validates certain kinds of objects.
 		//When projectiles are created, weapon bonuses such as damage may get applied.
@@ -1037,14 +1020,14 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 
 		Coord3D projectileDestination = *victimPos; //Need to copy this, as we have a pointer to their actual position
 
-		firingWeapon->newProjectileFired( sourceObj, projectile );//The actual logic weapon needs to know this was created. 
+		firingWeapon->newProjectileFired( sourceObj, projectile );//The actual logic weapon needs to know this was created.
 
 		if( m_scatterRadius > 0.0f || m_infantryInaccuracyDist > 0.0f && victimObj && victimObj->isKindOf( KINDOF_INFANTRY ) )
 		{
 			// This weapon scatters, so clear the victimObj, as we are no longer shooting it directly,
 			// and find a random point within the radius to shoot at as victimPos
 			Real scatterRadius = m_scatterRadius;
-			
+
 			// if it's an object, aim at the center, not the ground part (srj)
 			PathfindLayerEnum targetLayer = LAYER_GROUND;
 			if( victimObj )
@@ -1096,26 +1079,27 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		}
 		else
 		{
-			//DEBUG_CRASH(("Projectiles should implement ProjectileUpdateInterface!\n"));
+			//DEBUG_CRASH(("Projectiles should implement ProjectileUpdateInterface!"));
 			// actually, this is ok, for things like Firestorm.... (srj)
 			projectile->setPosition(&projectileDestination);
 		}
-		//-extraLogging 
-		#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+		//-extraLogging
+		#if defined(RTS_DEBUG)
 			if( TheGlobalData->m_extraLogging )
-				DEBUG_LOG( ("DONE\n") );
+				DEBUG_LOG( ("DONE") );
 		#endif
-		//end -extraLogging 
+		//end -extraLogging
 
 		return 0;
 	}
 }
 
 //-------------------------------------------------------------------------------------------------
+#if RETAIL_COMPATIBLE_CRC
 void WeaponTemplate::trimOldHistoricDamage() const
 {
 	UnsignedInt expirationDate = TheGameLogic->getFrame() - TheGlobalData->m_historicDamageLimit;
-	while (m_historicDamage.size() > 0)
+	while (!m_historicDamage.empty())
 	{
 		HistoricWeaponDamageInfo& h = m_historicDamage.front();
 		if (h.frame <= expirationDate)
@@ -1131,6 +1115,40 @@ void WeaponTemplate::trimOldHistoricDamage() const
 		}
 	}
 }
+#else
+void WeaponTemplate::trimOldHistoricDamage() const
+{
+	if (m_historicDamage.empty())
+		return;
+
+	const UnsignedInt currentFrame = TheGameLogic->getFrame();
+	const UnsignedInt expirationFrame = currentFrame - m_historicBonusTime;
+
+	HistoricWeaponDamageList::iterator it = m_historicDamage.begin();
+
+	while (it != m_historicDamage.end())
+	{
+		if (it->frame <= expirationFrame)
+			it = m_historicDamage.erase(it);
+		else
+			break;
+	}
+}
+#endif
+
+//-------------------------------------------------------------------------------------------------
+void WeaponTemplate::trimTriggeredHistoricDamage() const
+{
+	HistoricWeaponDamageList::iterator it = m_historicDamage.begin();
+
+	while (it != m_historicDamage.end())
+	{
+		if (it->triggerId == m_historicDamageTriggerId)
+			it = m_historicDamage.erase(it);
+		else
+			++it;
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 static Bool is2DDistSquaredLessThan(const Coord3D& a, const Coord3D& b, Real distSqr)
@@ -1140,16 +1158,9 @@ static Bool is2DDistSquaredLessThan(const Coord3D& a, const Coord3D& b, Real dis
 }
 
 //-------------------------------------------------------------------------------------------------
-void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, const Coord3D *pos, const WeaponBonus& bonus, Bool isProjectileDetonation) const
+#if RETAIL_COMPATIBLE_CRC
+void WeaponTemplate::processHistoricDamage(const Object* source, const Coord3D* pos) const
 {
-	if (sourceID == 0)	// must have a source
-		return;
-
-	if (victimID == 0 && pos == NULL)	// must have some sort of destination
-		return;
-
-	Object *source = TheGameLogic->findObjectByID(sourceID);	// might be null...
-
 	//
 	/** @todo We need to rewrite the historic stuff ... if you fire 5 missiles, and the 5th,
 	// one creates a firestorm ... and then half a second later another volley of 5 missiles
@@ -1157,17 +1168,17 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 	// firestorms (CBD) */
 	//
 
-	trimOldHistoricDamage();
-
 	if( m_historicBonusCount > 0 && m_historicBonusWeapon != this )
 	{
+		trimOldHistoricDamage();
+
 		Real radSqr = m_historicBonusRadius * m_historicBonusRadius;
 		Int count = 0;
 		UnsignedInt frameNow = TheGameLogic->getFrame();
 		UnsignedInt oldestThatWillCount = frameNow - m_historicBonusTime; // Anything before this frame is "more than two seconds ago" eg
 		for( HistoricWeaponDamageList::const_iterator it = m_historicDamage.begin(); it != m_historicDamage.end(); ++it )
 		{
-			if( it->frame >= oldestThatWillCount && 
+			if( it->frame >= oldestThatWillCount &&
 					is2DDistSquaredLessThan( *pos, it->location, radSqr ) )
 			{
 				// This one is close enough in time and distance, so count it. This is tracked by template since it applies
@@ -1175,7 +1186,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 				++count;
 			}
 		}
-		
+
 		if( count >= m_historicBonusCount - 1 )	// minus 1 since we include ourselves implicitly
 		{
 		  TheWeaponStore->createAndFireTempWeapon(m_historicBonusWeapon, source, pos);
@@ -1188,15 +1199,67 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 		}
 		else
 		{
-			
+
 			// add AFTER checking for historic stuff
 			m_historicDamage.push_back( HistoricWeaponDamageInfo(frameNow, *pos) );
 
-		}  // end else
+		}
 
-	} // if historic bonuses
+	}
+}
+#else
+void WeaponTemplate::processHistoricDamage(const Object* source, const Coord3D* pos) const
+{
+	if (m_historicBonusCount > 0 && m_historicBonusWeapon != this)
+	{
+		trimOldHistoricDamage();
+
+		++m_historicDamageTriggerId;
+
+		const Int requiredCount = m_historicBonusCount - 1; // minus 1 since we include ourselves implicitly
+		if (m_historicDamage.size() >= requiredCount)
+		{
+			const Real radSqr = m_historicBonusRadius * m_historicBonusRadius;
+			Int count = 0;
+
+			for (HistoricWeaponDamageList::iterator it = m_historicDamage.begin(); it != m_historicDamage.end(); ++it)
+			{
+				if (is2DDistSquaredLessThan(*pos, it->location, radSqr))
+				{
+					// This one is close enough in time and distance, so count it. This is tracked by template since it applies
+					// across units, so don't try to clear historicDamage on success in here.
+					it->triggerId = m_historicDamageTriggerId;
+
+					if (++count == requiredCount)
+					{
+						TheWeaponStore->createAndFireTempWeapon(m_historicBonusWeapon, source, pos);
+						trimTriggeredHistoricDamage();
+						return;
+					}
+				}
+			}
+		}
+
+		// add AFTER checking for historic stuff
+		m_historicDamage.push_back(HistoricWeaponDamageInfo(TheGameLogic->getFrame(), *pos));
+	}
+}
+#endif
+
+//-------------------------------------------------------------------------------------------------
+void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, const Coord3D *pos, const WeaponBonus& bonus, Bool isProjectileDetonation) const
+{
+	if (sourceID == 0)	// must have a source
+		return;
 
-//DEBUG_LOG(("WeaponTemplate::dealDamageInternal: dealing damage %s at frame %d\n",m_name.str(),TheGameLogic->getFrame()));
+	if (victimID == 0 && pos == NULL)	// must have some sort of destination
+		return;
+
+	Object *source = TheGameLogic->findObjectByID(sourceID);	// might be null...
+
+	processHistoricDamage(source, pos);
+
+//DEBUG_LOG(("WeaponTemplate::dealDamageInternal: dealing damage %s at frame %d",m_name.str(),TheGameLogic->getFrame()));
 
 	// if there's a specific victim, use it's pos (overriding the value passed in)
 	Object *primaryVictim = victimID ? TheGameLogic->findObjectByID(victimID) : NULL;	// might be null...
@@ -1219,7 +1282,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 		Real secondaryDamage = getSecondaryDamage(bonus);
 		Int affects = getAffectsMask();
 
-		DEBUG_ASSERTCRASH(secondaryRadius >= primaryRadius || secondaryRadius == 0.0f, ("secondary radius should be >= primary radius (or zero)\n"));
+		DEBUG_ASSERTCRASH(secondaryRadius >= primaryRadius || secondaryRadius == 0.0f, ("secondary radius should be >= primary radius (or zero)"));
 
 		Real primaryRadiusSqr = sqr(primaryRadius);
 		Real radius = max(primaryRadius, secondaryRadius);
@@ -1227,7 +1290,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 		{
 			iter = ThePartitionManager->iterateObjectsInRange(pos, radius, DAMAGE_RANGE_CALC_TYPE);
 			curVictim = iter->firstWithNumeric(&curVictimDistSqr);
-		} 
+		}
 		else
 		{
 			//DEBUG_ASSERTCRASH(primaryVictim != NULL, ("weapons without radii should always pass in specific victims"));
@@ -1261,7 +1324,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 						// Remember that source is a missile for some units, and they don't want to injure them'selves' either
 						if( source == curVictim || source->getProducerID() == curVictim->getID() )
 						{
-							//DEBUG_LOG(("skipping damage done to SELF...\n"));
+							//DEBUG_LOG(("skipping damage done to SELF..."));
 							continue;
 						}
 					}
@@ -1284,13 +1347,13 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 
 					/*
 						The idea here is: if its our ally(/enemies), AND it's not the direct target, AND the weapon doesn't
-						do radius-damage to allies(/enemies)... skip it. 
+						do radius-damage to allies(/enemies)... skip it.
 					*/
 					Relationship r = curVictim->getRelationship(source);
 					Int requiredMask;
-					if (r == ALLIES) 
+					if (r == ALLIES)
 						requiredMask = WEAPON_AFFECTS_ALLIES;
-					else if (r == ENEMIES) 
+					else if (r == ENEMIES)
 						requiredMask = WEAPON_AFFECTS_ENEMIES;
 					else /* r == NEUTRAL */
 						requiredMask = WEAPON_AFFECTS_NEUTRALS;
@@ -1311,7 +1374,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 			if (source && source->getControllingPlayer()) {
 				damageInfo.in.m_sourcePlayerMask = source->getControllingPlayer()->getPlayerMask();
 			}
-			// note, don't bother with damage multipliers here... 
+			// note, don't bother with damage multipliers here...
 			// that's handled internally by the attemptDamage() method.
 			damageInfo.in.m_amount = (curVictimDistSqr <= primaryRadiusSqr) ? primaryDamage : secondaryDamage;
 
@@ -1346,14 +1409,14 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 			}
 
 			curVictim->attemptDamage(&damageInfo);
-			//DEBUG_ASSERTLOG(damageInfo.out.m_noEffect, ("WeaponTemplate::dealDamageInternal: dealt to %s %08lx: attempted %f, actual %f (%f)\n",
+			//DEBUG_ASSERTLOG(damageInfo.out.m_noEffect, ("WeaponTemplate::dealDamageInternal: dealt to %s %08lx: attempted %f, actual %f (%f)",
 			//	curVictim->getTemplate()->getName().str(),curVictim,
 			//	damageInfo.in.m_amount, damageInfo.out.m_actualDamageDealt, damageInfo.out.m_actualDamageClipped));
 		}
 	}
 	else
 	{
-		DEBUG_CRASH(("projectile weapons should never get dealDamage called directly\n"));
+		DEBUG_CRASH(("projectile weapons should never get dealDamage called directly"));
 	}
 }
 
@@ -1362,7 +1425,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 //-------------------------------------------------------------------------------------------------
 WeaponStore::WeaponStore()
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 WeaponStore::~WeaponStore()
@@ -1372,16 +1435,16 @@ WeaponStore::~WeaponStore()
 	for (size_t i = 0; i < m_weaponTemplateVector.size(); i++)
 	{
 		WeaponTemplate* wt = m_weaponTemplateVector[i];
-		if (wt)
-			deleteInstance(wt);
+		deleteInstance(wt);
 	}
 	m_weaponTemplateVector.clear();
+	m_weaponTemplateHashMap.clear();
 }
 
 //-------------------------------------------------------------------------------------------------
 void WeaponStore::handleProjectileDetonation(const WeaponTemplate* wt, const Object *source, const Coord3D* pos, WeaponBonusConditionFlags extraBonusFlags)
 {
-	Weapon* w = TheWeaponStore->allocateNewWeapon(wt, PRIMARY_WEAPON);
+	Weapon* w = allocateNewWeapon(wt, PRIMARY_WEAPON);
 	w->loadAmmoNow(source);
 	w->fireProjectileDetonationWeapon(source, pos, extraBonusFlags);
 	deleteInstance(w);
@@ -1392,7 +1455,7 @@ void WeaponStore::createAndFireTempWeapon(const WeaponTemplate* wt, const Object
 {
 	if (wt == NULL)
 		return;
-	Weapon* w = TheWeaponStore->allocateNewWeapon(wt, PRIMARY_WEAPON);
+	Weapon* w = allocateNewWeapon(wt, PRIMARY_WEAPON);
 	w->loadAmmoNow(source);
 	w->fireWeapon(source, pos);
 	deleteInstance(w);
@@ -1401,22 +1464,32 @@ void WeaponStore::createAndFireTempWeapon(const WeaponTemplate* wt, const Object
 //-------------------------------------------------------------------------------------------------
 void WeaponStore::createAndFireTempWeapon(const WeaponTemplate* wt, const Object *source, Object *target)
 {
-	//CRCDEBUG_LOG(("WeaponStore::createAndFireTempWeapon() for %s\n", DescribeObject(source)));
+	//CRCDEBUG_LOG(("WeaponStore::createAndFireTempWeapon() for %s", DescribeObject(source)));
 	if (wt == NULL)
 		return;
-	Weapon* w = TheWeaponStore->allocateNewWeapon(wt, PRIMARY_WEAPON);
+	Weapon* w = allocateNewWeapon(wt, PRIMARY_WEAPON);
 	w->loadAmmoNow(source);
 	w->fireWeapon(source, target);
 	deleteInstance(w);
 }
 
 //-------------------------------------------------------------------------------------------------
-const WeaponTemplate *WeaponStore::findWeaponTemplate( AsciiString name ) const 
-{ 
-	if (stricmp(name.str(), "None") == 0)
+const WeaponTemplate *WeaponStore::findWeaponTemplate( const AsciiString& name ) const
+{
+	if (name.compareNoCase("None") == 0)
+		return NULL;
+	const WeaponTemplate * wt = findWeaponTemplatePrivate( TheNameKeyGenerator->nameToKey( name ) );
+	DEBUG_ASSERTCRASH(wt != NULL, ("Weapon %s not found!",name));
+	return wt;
+}
+
+//-------------------------------------------------------------------------------------------------
+const WeaponTemplate *WeaponStore::findWeaponTemplate( const char* name ) const
+{
+	if (stricmp(name, "None") == 0)
 		return NULL;
 	const WeaponTemplate * wt = findWeaponTemplatePrivate( TheNameKeyGenerator->nameToKey( name ) );
-	DEBUG_ASSERTCRASH(wt != NULL, ("Weapon %s not found!\n",name.str()));
+	DEBUG_ASSERTCRASH(wt != NULL, ("Weapon %s not found!",name));
 	return wt;
 }
 
@@ -1424,9 +1497,9 @@ const WeaponTemplate *WeaponStore::findWeaponTemplate( AsciiString name ) const
 WeaponTemplate *WeaponStore::findWeaponTemplatePrivate( NameKeyType key ) const
 {
 	// search weapon list for name
-	for (size_t i = 0; i < m_weaponTemplateVector.size(); i++)
-		if( m_weaponTemplateVector[ i ]->getNameKey() == key )
-			return m_weaponTemplateVector[i];
+	WeaponTemplateMap::const_iterator it = m_weaponTemplateHashMap.find(key);
+	if(it != m_weaponTemplateHashMap.end())
+		return it->second;
 
 	return NULL;
 
@@ -1445,23 +1518,24 @@ WeaponTemplate *WeaponStore::newWeaponTemplate(AsciiString name)
 	wt->m_name = name;
 	wt->m_nameKey = TheNameKeyGenerator->nameToKey( name );
 	m_weaponTemplateVector.push_back(wt);
+	m_weaponTemplateHashMap[wt->m_nameKey] = wt;
 
 	return wt;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 WeaponTemplate *WeaponStore::newOverride(WeaponTemplate *weaponTemplate)
 {
 	if (!weaponTemplate)
 		return NULL;
-	
+
 	// allocate a new weapon
 	WeaponTemplate *wt = newInstance(WeaponTemplate);
 	(*wt) = (*weaponTemplate);
 	(wt)->friend_setNextTemplate(weaponTemplate);
-	
+
 	return wt;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void WeaponStore::update()
@@ -1508,7 +1582,7 @@ void WeaponStore::reset()
 	for (size_t i = 0; i < m_weaponTemplateVector.size(); ++i)
 	{
 		WeaponTemplate *wt = m_weaponTemplateVector[i];
-		if (wt->isOverride()) 
+		if (wt->isOverride())
 		{
 			WeaponTemplate *override = wt;
 			wt = wt->friend_clearNextTemplate();
@@ -1549,7 +1623,7 @@ void WeaponStore::postProcessLoad()
 			wt->postProcessLoad();
 	}
 
-}  // end postProcessLoad
+}
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ void WeaponStore::parseWeaponTemplateDefinition(INI* ini)
@@ -1558,7 +1632,7 @@ void WeaponStore::postProcessLoad()
 
 	// read the weapon name
 	const char* c = ini->getNextToken();
-	name.set(c);	
+	name.set(c);
 
 	// find existing item if present
 	WeaponTemplate *weapon = TheWeaponStore->findWeaponTemplatePrivate( TheNameKeyGenerator->nameToKey( name ) );
@@ -1566,7 +1640,7 @@ void WeaponStore::postProcessLoad()
 	{
 		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES)
 			weapon = TheWeaponStore->newOverride(weapon);
-		else 
+		else
 		{
 			DEBUG_CRASH(("Weapon '%s' already exists, but OVERRIDE not specified", c));
 			return;
@@ -1577,7 +1651,7 @@ void WeaponStore::postProcessLoad()
 	{
 		// no item is present, create a new one
 		weapon = TheWeaponStore->newWeaponTemplate(name);
-	} 
+	}
 
 	// parse the ini weapon definition
 	ini->initFromINI(weapon, weapon->getFieldParse());
@@ -1585,10 +1659,10 @@ void WeaponStore::postProcessLoad()
 	if (weapon->m_projectileName.isNone())
 		weapon->m_projectileName.clear();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (!weapon->getFireSound().getEventName().isEmpty() && weapon->getFireSound().getEventName().compareNoCase("NoSound") != 0) 
-	{ 
-		DEBUG_ASSERTCRASH(TheAudio->isValidAudioEvent(&weapon->getFireSound()), ("Invalid FireSound %s in Weapon '%s'.", weapon->getFireSound().getEventName().str(), weapon->getName().str())); 
+#if defined(RTS_DEBUG)
+	if (!weapon->getFireSound().getEventName().isEmpty() && weapon->getFireSound().getEventName().compareNoCase("NoSound") != 0)
+	{
+		DEBUG_ASSERTCRASH(TheAudio->isValidAudioEvent(&weapon->getFireSound()), ("Invalid FireSound %s in Weapon '%s'.", weapon->getFireSound().getEventName().str(), weapon->getName().str()));
 	}
 #endif
 
@@ -1676,7 +1750,7 @@ void Weapon::computeBonus(const Object *source, WeaponBonusConditionFlags extraB
 {
 	bonus.clear();
 	WeaponBonusConditionFlags flags = source->getWeaponBonusCondition();
-	//CRCDEBUG_LOG(("Weapon::computeBonus() - flags are %X for %s\n", flags, DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::computeBonus() - flags are %X for %s", flags, DescribeObject(source).str()));
 	flags |= extraBonusFlags;
 	if (TheGlobalData->m_weaponBonusSet)
 		TheGlobalData->m_weaponBonusSet->appendBonuses(flags, bonus);
@@ -1721,10 +1795,10 @@ void Weapon::setClipPercentFull(Real percent, Bool allowReduction)
 	{
 		m_ammoInClip = ammo;
 		m_status = m_ammoInClip ? OUT_OF_AMMO : READY_TO_FIRE;
-		//CRCDEBUG_LOG(("Weapon::setClipPercentFull() just set m_status to %d (ammo in clip is %d)\n", m_status, m_ammoInClip));
+		//CRCDEBUG_LOG(("Weapon::setClipPercentFull() just set m_status to %d (ammo in clip is %d)", m_status, m_ammoInClip));
 		m_whenLastReloadStarted = TheGameLogic->getFrame();
-		m_whenWeCanFireAgain = m_whenLastReloadStarted;		
-		//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::setClipPercentFull\n", m_whenWeCanFireAgain));
+		m_whenWeCanFireAgain = m_whenLastReloadStarted;
+		//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::setClipPercentFull", m_whenWeCanFireAgain));
 		rebuildScatterTargets();
 	}
 }
@@ -1745,7 +1819,7 @@ void Weapon::rebuildScatterTargets()
 //-------------------------------------------------------------------------------------------------
 void Weapon::reloadWithBonus(const Object *sourceObj, const WeaponBonus& bonus, Bool loadInstantly)
 {
-	if (m_template->getClipSize() > 0 
+	if (m_template->getClipSize() > 0
 			&& m_ammoInClip == m_template->getClipSize()
 			&& !sourceObj->isReloadTimeShared())
 		return;	// don't restart our reload delay.
@@ -1757,22 +1831,22 @@ void Weapon::reloadWithBonus(const Object *sourceObj, const WeaponBonus& bonus,
 	m_status = RELOADING_CLIP;
 	Real reloadTime = loadInstantly ? 0 : m_template->getClipReloadTime(bonus);
 	m_whenLastReloadStarted = TheGameLogic->getFrame();
-	m_whenWeCanFireAgain = m_whenLastReloadStarted + reloadTime;			
-	//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::reloadWithBonus 1\n", m_whenWeCanFireAgain));
+	m_whenWeCanFireAgain = m_whenLastReloadStarted + reloadTime;
+	//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::reloadWithBonus 1", m_whenWeCanFireAgain));
 
 			// if we are sharing reload times
 			// go through other weapons in weapon set
-			// set their m_whenWeCanFireAgain to this guy's delay	
+			// set their m_whenWeCanFireAgain to this guy's delay
 			// set their m_status to this guy's status
 	if (sourceObj->isReloadTimeShared())
-	{	
+	{
 		for (Int wt = 0; wt<WEAPONSLOT_COUNT; wt++)
 		{
 			Weapon *weapon = sourceObj->getWeaponInWeaponSlot((WeaponSlotType)wt);
 			if (weapon)
 			{
 				weapon->setPossibleNextShotFrame(m_whenWeCanFireAgain);
-				//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::reloadWithBonus 2\n", m_whenWeCanFireAgain));
+				//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::reloadWithBonus 2", m_whenWeCanFireAgain));
 				weapon->setStatus(RELOADING_CLIP);
 			}
 		}
@@ -1786,7 +1860,7 @@ static void clipToTerrainExtent(Coord3D& approachTargetPos)
 {
 	Region3D bounds;
 	TheTerrainLogic->getExtent(&bounds);
-	if (approachTargetPos.x < bounds.lo.x+PATHFIND_CELL_SIZE_F) {	 
+	if (approachTargetPos.x < bounds.lo.x+PATHFIND_CELL_SIZE_F) {
 		approachTargetPos.x = bounds.lo.x+PATHFIND_CELL_SIZE_F;
 	}
 	if (approachTargetPos.y < bounds.lo.y+PATHFIND_CELL_SIZE_F) {
@@ -1806,12 +1880,12 @@ Bool Weapon::computeApproachTarget(const Object *source, const Object *target, c
 	// compute unit direction vector from us to our victim
 	const Coord3D *targetPos;
 	Coord3D dir;
-	if (target) 
+	if (target)
 	{
 		targetPos = target->getPosition();
 		ThePartitionManager->getVectorTo( target, source, ATTACK_RANGE_CALC_TYPE, dir );
-	}	
-	else if (pos) 
+	}
+	else if (pos)
 	{
 		targetPos = pos;
 		ThePartitionManager->getVectorTo( source, pos, ATTACK_RANGE_CALC_TYPE, dir );
@@ -1829,10 +1903,10 @@ Bool Weapon::computeApproachTarget(const Object *source, const Object *target, c
 
 	Real dist = dir.length();
 	Real minAttackRange = m_template->getMinimumAttackRange();
-	if (minAttackRange > PATHFIND_CELL_SIZE_F && dist < minAttackRange) 
+	if (minAttackRange > PATHFIND_CELL_SIZE_F && dist < minAttackRange)
 	{
 		// We aret too close, so move away from the target.
-		DEBUG_ASSERTCRASH((minAttackRange<0.9f*getAttackRange(source)), ("Min attack range is too near attack range.\n"));
+		DEBUG_ASSERTCRASH((minAttackRange<0.9f*getAttackRange(source)), ("Min attack range is too near attack range."));
 		// Recompute dir, cause if the bounding spheres touch, it will be 0.
 		Coord3D srcPos = *source->getPosition();
 		dir.x = srcPos.x-targetPos->x;
@@ -1869,11 +1943,11 @@ Bool Weapon::computeApproachTarget(const Object *source, const Object *target, c
 		// select a spot along the line between us, halfway between the min & max range.
 		Real attackRange = (getAttackRange(source) + minAttackRange)/2.0f;
 #ifdef ATTACK_RANGE_IS_2D
-		if (target) 
+		if (target)
 			attackRange += target->getGeometryInfo().getBoundingCircleRadius();
 		attackRange += source->getGeometryInfo().getBoundingCircleRadius();
 #else
-		if (target) 
+		if (target)
 			attackRange += target->getGeometryInfo().getBoundingSphereRadius();
 		attackRange += source->getGeometryInfo().getBoundingSphereRadius();
 #endif
@@ -1888,13 +1962,13 @@ Bool Weapon::computeApproachTarget(const Object *source, const Object *target, c
 	const Real FUDGE = 0.001f;
 	if (dist < FUDGE)
 	{
-		// we're close enough! 
+		// we're close enough!
 		approachTargetPos = *source->getPosition();
 		return true;
 	}
 	else
 	{
-		if (isContactWeapon()) 
+		if (isContactWeapon())
 		{
 			// Weapon is basically a contact weapon, like a car bomb.  The approach target logic
 			// has been modified to let it approach the object, so just return the target position.	jba.
@@ -1931,12 +2005,12 @@ Bool Weapon::computeApproachTarget(const Object *source, const Object *target, c
 
 //-------------------------------------------------------------------------------------------------
 //Special case attack range calculate that fakes moving the object (to a garrisoned point) without
-//actually moving the object. This is used to help determine if a garrisoned unit not yet 
+//actually moving the object. This is used to help determine if a garrisoned unit not yet
 //positioned can attack someone.
 //-------------------------------------------------------------------------------------------------
 Bool Weapon::isSourceObjectWithGoalPositionWithinAttackRange( const Object *source, const Coord3D *goalPos, const Object *target, const Coord3D *targetPos ) const
 {
-	
+
 	Real distSqr;
 	if( target )
 		distSqr = ThePartitionManager->getGoalDistanceSquared( source, goalPos, target, ATTACK_RANGE_CALC_TYPE );
@@ -1984,20 +2058,20 @@ Bool Weapon::isWithinAttackRange(const Object *source, const Object *target) con
 	if( !target->isKindOf(KINDOF_BRIDGE) )
 	{
 		distSqr = ThePartitionManager->getDistanceSquared( source, target, ATTACK_RANGE_CALC_TYPE );
-	}	
-	else 
+	}
+	else
 	{
 		// Special case - bridges have two attackable points at either end.
 		TBridgeAttackInfo info;
 		TheTerrainLogic->getBridgeAttackPoints(target, &info);
 		distSqr = ThePartitionManager->getDistanceSquared( source, &info.attackPoint1, ATTACK_RANGE_CALC_TYPE );
-		if (distSqr>attackRangeSqr) 
+		if (distSqr>attackRangeSqr)
 		{
 			// Try the other one.
 			distSqr = ThePartitionManager->getDistanceSquared( source, &info.attackPoint2, ATTACK_RANGE_CALC_TYPE );
 		}
 	}
-	
+
 	Real minAttackRangeSqr = sqr(m_template->getMinimumAttackRange());
 #ifdef RATIONALIZE_ATTACK_RANGE
 	if (distSqr < minAttackRangeSqr)
@@ -2026,12 +2100,12 @@ Bool Weapon::isWithinAttackRange(const Object *source, const Object *target) con
 				{
 					return true;
 				}
-			}  
+			}
 			return false;
 		}
 		return true;
 	}
-	return false;	
+	return false;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2046,7 +2120,7 @@ Bool Weapon::isTooClose(const Object *source, const Object *target) const
 	{
 		return true;
 	}
-	return false;	
+	return false;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2061,7 +2135,7 @@ Bool Weapon::isTooClose( const Object *source, const Coord3D *pos ) const
 	{
 		return true;
 	}
-	return false;	
+	return false;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2070,8 +2144,8 @@ Bool Weapon::isGoalPosWithinAttackRange(const Object *source, const Coord3D* goa
 	Real distSqr;
 	// Note - undersize by 1/4 of a pathfind cell, so that the goal is not teetering on the edge
 	// of firing range.  jba.
-	// Note 2 - even with RATIONALIZE_ATTACK_RANGE, we still need to subtract 1/4 of a pathfind cell, 
-	// otherwise if it teters on the edge, attacks can fail.  jba. 
+	// Note 2 - even with RATIONALIZE_ATTACK_RANGE, we still need to subtract 1/4 of a pathfind cell,
+	// otherwise if it teters on the edge, attacks can fail.  jba.
 	Real attackRangeSqr = sqr(getAttackRange(source)-(PATHFIND_CELL_SIZE_F*0.25f));
 
 	if (target != NULL)
@@ -2082,13 +2156,13 @@ Bool Weapon::isGoalPosWithinAttackRange(const Object *source, const Coord3D* goa
 			TBridgeAttackInfo info;
 			TheTerrainLogic->getBridgeAttackPoints(target, &info);
 			distSqr = ThePartitionManager->getGoalDistanceSquared( source, goalPos, &info.attackPoint1, ATTACK_RANGE_CALC_TYPE );
-			if (distSqr>attackRangeSqr) 
+			if (distSqr>attackRangeSqr)
 			{
 				// Try the other one.
 				distSqr = ThePartitionManager->getGoalDistanceSquared( source, goalPos, &info.attackPoint2, ATTACK_RANGE_CALC_TYPE );
 			}
-		}	
-		else 
+		}
+		else
 		{
 			distSqr = ThePartitionManager->getGoalDistanceSquared( source, goalPos, target, ATTACK_RANGE_CALC_TYPE );
 		}
@@ -2100,8 +2174,8 @@ Bool Weapon::isGoalPosWithinAttackRange(const Object *source, const Coord3D* goa
 
 	// Note - oversize by 1/4 of a pathfind cell, so that the goal is not teetering on the edge
 	// of firing range.  jba.
-	// Note 2 - even with RATIONALIZE_ATTACK_RANGE, we still need to add 1/4 of a pathfind cell, 
-	// otherwise if it teters on the edge, attacks can fail.  jba. 
+	// Note 2 - even with RATIONALIZE_ATTACK_RANGE, we still need to add 1/4 of a pathfind cell,
+	// otherwise if it teters on the edge, attacks can fail.  jba.
 	Real minAttackRangeSqr = sqr(m_template->getMinimumAttackRange()+(PATHFIND_CELL_SIZE_F*0.25f));
 #ifdef RATIONALIZE_ATTACK_RANGE
 	if (distSqr < minAttackRangeSqr)
@@ -2161,10 +2235,10 @@ Real Weapon::getPercentReadyToFire() const
 
 //-------------------------------------------------------------------------------------------------
 Real Weapon::getAttackRange(const Object *source) const
-{ 
+{
 	WeaponBonus bonus;
 	computeBonus(source, 0, bonus);
-	return m_template->getAttackRange(bonus); 
+	return m_template->getAttackRange(bonus);
 
 	//Contained objects have longer ranges.
 	//const Object *container = source->getContainedBy();
@@ -2177,7 +2251,7 @@ Real Weapon::getAttackRange(const Object *source) const
 
 //-------------------------------------------------------------------------------------------------
 Real Weapon::getAttackDistance(const Object *source, const Object *victimObj, const Coord3D* victimPos) const
-{ 
+{
 	Real range = getAttackRange(source);
 
 	if (victimObj != NULL)
@@ -2248,7 +2322,7 @@ void Weapon::createLaser( const Object *sourceObj, const Object *victimObj, cons
 	Object* laser = TheThingFactory->newObject( pst, sourceObj->getControllingPlayer()->getDefaultTeam() );
 	if( laser == NULL )
 		return;
-	
+
 	//Check for laser update
 	Drawable *draw = laser->getDrawable();
 	if( draw )
@@ -2273,16 +2347,16 @@ void Weapon::createLaser( const Object *sourceObj, const Object *victimObj, cons
 // return true if we auto-reloaded our clip after firing.
 //DECLARE_PERF_TIMER(fireWeapon)
 Bool Weapon::privateFireWeapon(
-	const Object *sourceObj, 
-	Object *victimObj, 
-	const Coord3D* victimPos, 
-	Bool isProjectileDetonation, 
-	Bool ignoreRanges, 
+	const Object *sourceObj,
+	Object *victimObj,
+	const Coord3D* victimPos,
+	Bool isProjectileDetonation,
+	Bool ignoreRanges,
 	WeaponBonusConditionFlags extraBonusFlags,
 	ObjectID* projectileID
 )
 {
-	//CRCDEBUG_LOG(("Weapon::privateFireWeapon() for %s\n", DescribeObject(sourceObj).str()));
+	//CRCDEBUG_LOG(("Weapon::privateFireWeapon() for %s", DescribeObject(sourceObj).str()));
 	//USE_PERF_TIMER(fireWeapon)
 	if (projectileID)
 		*projectileID = INVALID_ID;
@@ -2294,8 +2368,8 @@ Bool Weapon::privateFireWeapon(
 	if( m_template->getRequestAssistRange()  &&  victimObj )
 		processRequestAssistance( sourceObj, victimObj );
 
-	//For weapon templates that have the leech range weapon flag set, it essentially grants 
-	//the weapon unlimited range for the remainder of the attack. While it's triggered here 
+	//For weapon templates that have the leech range weapon flag set, it essentially grants
+	//the weapon unlimited range for the remainder of the attack. While it's triggered here
 	//it's the AIAttackState machine that actually uses and resets this value.
 	//This makes the ASSUMPTION that it is IMPOSSIBLE TO FIRE A WEAPON WITHOUT BEING IN AN AIATTACKSTATE
 	//
@@ -2369,7 +2443,7 @@ Bool Weapon::privateFireWeapon(
 			//We're using a hacker unit to hack a target. Hacking has various effects and
 			//instead of inflicting damage, we are waiting for a period of time until the hack takes effect.
 			//return FALSE;
-		}	
+		}
 	}
 
 	WeaponBonus bonus;
@@ -2395,7 +2469,7 @@ Bool Weapon::privateFireWeapon(
 			m_numShotsForCurBarrel = m_template->getShotsPerBarrel();
 		}
 
-		if( m_scatterTargetsUnused.size() )
+		if( !m_scatterTargetsUnused.empty() )
 		{
 			// If I have a set scatter pattern, I need to offset the target by a random pick from that pattern
 			if( victimObj )
@@ -2427,7 +2501,7 @@ Bool Weapon::privateFireWeapon(
 		{
 			m_template->fireWeaponTemplate(sourceObj, m_wslot, m_curBarrel, victimObj, victimPos, bonus, isProjectileDetonation, ignoreRanges, this, projectileID);
 		}
-		
+
 		m_lastFireFrame = now;
 		--m_ammoInClip;
 		--m_maxShotCount;
@@ -2449,40 +2523,40 @@ Bool Weapon::privateFireWeapon(
 			{
 				m_status = OUT_OF_AMMO;
 				m_whenWeCanFireAgain = 0x7fffffff;
-				//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::privateFireWeapon 1\n", m_whenWeCanFireAgain));
+				//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::privateFireWeapon 1", m_whenWeCanFireAgain));
 			}
 		}
 		else
 		{
 			m_status = BETWEEN_FIRING_SHOTS;
-			//CRCDEBUG_LOG(("Weapon::privateFireWeapon() just set m_status to BETWEEN_FIRING_SHOTS\n"));
+			//CRCDEBUG_LOG(("Weapon::privateFireWeapon() just set m_status to BETWEEN_FIRING_SHOTS"));
 			Int delay = m_template->getDelayBetweenShots(bonus);
 			m_whenLastReloadStarted = now;
 			m_whenWeCanFireAgain = now + delay;
-			//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d (delay is %d) in Weapon::privateFireWeapon\n", m_whenWeCanFireAgain, delay));
-			
+			//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d (delay is %d) in Weapon::privateFireWeapon", m_whenWeCanFireAgain, delay));
+
 			// if we are sharing reload times
 			// go through other weapons in weapon set
 			// set their m_whenWeCanFireAgain to this guy's delay
 			// set their m_status to this guy's status
 
 			if ( sourceObj->isReloadTimeShared() )
-			{	
+			{
 				for (Int wt = 0; wt<WEAPONSLOT_COUNT; wt++)
 				{
 					Weapon *weapon = sourceObj->getWeaponInWeaponSlot((WeaponSlotType)wt);
 					if (weapon)
 					{
 						weapon->setPossibleNextShotFrame(m_whenWeCanFireAgain);
-						//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::privateFireWeapon 3\n", m_whenWeCanFireAgain));
+						//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::privateFireWeapon 3", m_whenWeCanFireAgain));
 						weapon->setStatus(BETWEEN_FIRING_SHOTS);
 					}
 				}
 			}
- 
+
 		}
 	}
- 
+
 	return reloaded;
 }
 
@@ -2505,7 +2579,7 @@ void Weapon::preFireWeapon( const Object *source, const Object *victim )
 //-------------------------------------------------------------------------------------------------
 Bool Weapon::fireWeapon(const Object *source, Object *target, ObjectID* projectileID)
 {
-	//CRCDEBUG_LOG(("Weapon::fireWeapon() for %s at %s\n", DescribeObject(source).str(), DescribeObject(target).str()));
+	//CRCDEBUG_LOG(("Weapon::fireWeapon() for %s at %s", DescribeObject(source).str(), DescribeObject(target).str()));
 	return privateFireWeapon(source, target, NULL, false, false, 0, projectileID);
 }
 
@@ -2513,21 +2587,21 @@ Bool Weapon::fireWeapon(const Object *source, Object *target, ObjectID* projecti
 // return true if we auto-reloaded our clip after firing.
 Bool Weapon::fireWeapon(const Object *source, const Coord3D* pos, ObjectID* projectileID)
 {
-	//CRCDEBUG_LOG(("Weapon::fireWeapon() for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::fireWeapon() for %s", DescribeObject(source).str()));
 	return privateFireWeapon(source, NULL, pos, false, false, 0, projectileID);
 }
 
 //-------------------------------------------------------------------------------------------------
 void Weapon::fireProjectileDetonationWeapon(const Object *source, Object *target, WeaponBonusConditionFlags extraBonusFlags)
 {
-	//CRCDEBUG_LOG(("Weapon::fireProjectileDetonationWeapon() for %sat %s\n", DescribeObject(source).str(), DescribeObject(target).str()));
+	//CRCDEBUG_LOG(("Weapon::fireProjectileDetonationWeapon() for %sat %s", DescribeObject(source).str(), DescribeObject(target).str()));
 	privateFireWeapon(source, target, NULL, true, false, extraBonusFlags, NULL);
 }
 
 //-------------------------------------------------------------------------------------------------
 void Weapon::fireProjectileDetonationWeapon(const Object *source, const Coord3D* pos, WeaponBonusConditionFlags extraBonusFlags)
 {
-	//CRCDEBUG_LOG(("Weapon::fireProjectileDetonationWeapon() for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::fireProjectileDetonationWeapon() for %s", DescribeObject(source).str()));
 	privateFireWeapon(source, NULL, pos, true, false, extraBonusFlags, NULL);
 }
 
@@ -2536,7 +2610,7 @@ void Weapon::fireProjectileDetonationWeapon(const Object *source, const Coord3D*
 //and immediately gain control of the weapon that was fired to give it special orders...
 Object* Weapon::forceFireWeapon( const Object *source, const Coord3D *pos)
 {
-	//CRCDEBUG_LOG(("Weapon::forceFireWeapon() for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::forceFireWeapon() for %s", DescribeObject(source).str()));
 	//Force the ammo to load instantly.
 	//loadAmmoNow( source );
 	//Fire the weapon at the position. Internally, it'll store the weapon projectile ID if so created.
@@ -2560,7 +2634,7 @@ WeaponStatus Weapon::getStatus() const
 			m_status = READY_TO_FIRE;
 		else
 			m_status = OUT_OF_AMMO;
-		//CRCDEBUG_LOG(("Weapon::getStatus() just set m_status to %d (ammo in clip is %d)\n", m_status, m_ammoInClip));
+		//CRCDEBUG_LOG(("Weapon::getStatus() just set m_status to %d (ammo in clip is %d)", m_status, m_ammoInClip));
 	}
 	return m_status;
 }
@@ -2587,7 +2661,7 @@ Bool Weapon::isWithinTargetPitch(const Object *source, const Object *victim) con
 			(minPitch <= m_template->getMinTargetPitch() && maxPitch >= m_template->getMaxTargetPitch()))
 		return true;
 
-	//DEBUG_LOG(("pitch %f-%f is out of range\n",rad2deg(minPitch),rad2deg(maxPitch),rad2deg(m_template->getMinTargetPitch()),rad2deg(m_template->getMaxTargetPitch())));
+	//DEBUG_LOG(("pitch %f-%f is out of range",rad2deg(minPitch),rad2deg(maxPitch),rad2deg(m_template->getMinTargetPitch()),rad2deg(m_template->getMaxTargetPitch())));
 	return false;
 }
 
@@ -2619,7 +2693,7 @@ Bool Weapon::isDamageWeapon() const
 		case DAMAGE_HACK:
 			return FALSE;
 	}
-	
+
 	//Use no bonus
 	WeaponBonus whoCares;
 	if( m_template->getPrimaryDamage( whoCares ) > 0.0f || m_template->getSecondaryDamage( whoCares ) > 0.0f )
@@ -2709,7 +2783,7 @@ static void makeAssistanceRequest( Object *requestOf, void *userData )
 //-------------------------------------------------------------------------------------------------
 void Weapon::processRequestAssistance( const Object *requestingObject, Object *victimObject )
 {
-	// Iterate through our player's objects, and tell everyone like us within our assistance range 
+	// Iterate through our player's objects, and tell everyone like us within our assistance range
 	// who is free to do so to assist us on this shot.
 	Player *ourPlayer = requestingObject->getControllingPlayer();
 	if( !ourPlayer )
@@ -2725,8 +2799,8 @@ void Weapon::processRequestAssistance( const Object *requestingObject, Object *v
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ void Weapon::calcProjectileLaunchPosition(
-	const Object* launcher, 
-	WeaponSlotType wslot, 
+	const Object* launcher,
+	WeaponSlotType wslot,
 	Int specificBarrelToUse,
 	Matrix3D& worldTransform,
 	Coord3D& worldPos
@@ -2751,17 +2825,17 @@ void Weapon::processRequestAssistance( const Object *requestingObject, Object *v
 	Real turretPitch = 0.0f;
 	const AIUpdateInterface* ai = launcher->getAIUpdateInterface();
 	WhichTurretType tur = ai ? ai->getWhichTurretForWeaponSlot(wslot, &turretAngle, &turretPitch) : TURRET_INVALID;
-	//CRCDEBUG_LOG(("calcProjectileLaunchPosition(): Turret %d, slot %d, barrel %d for %s\n", tur, wslot, specificBarrelToUse, DescribeObject(launcher).str()));
+	//CRCDEBUG_LOG(("calcProjectileLaunchPosition(): Turret %d, slot %d, barrel %d for %s", tur, wslot, specificBarrelToUse, DescribeObject(launcher).str()));
 
 	Matrix3D attachTransform(true);
 	Coord3D turretRotPos = {0.0f, 0.0f, 0.0f};
 	Coord3D turretPitchPos = {0.0f, 0.0f, 0.0f};
 	const Drawable* draw = launcher->getDrawable();
-	//CRCDEBUG_LOG(("Do we have a drawable? %d\n", (draw != NULL)));
+	//CRCDEBUG_LOG(("Do we have a drawable? %d", (draw != NULL)));
 	if (!draw || !draw->getProjectileLaunchOffset(wslot, specificBarrelToUse, &attachTransform, tur, &turretRotPos, &turretPitchPos))
 	{
-		//CRCDEBUG_LOG(("ProjectileLaunchPos %d %d not found!\n",wslot, specificBarrelToUse));
-		DEBUG_CRASH(("ProjectileLaunchPos %d %d not found!\n",wslot, specificBarrelToUse));
+		//CRCDEBUG_LOG(("ProjectileLaunchPos %d %d not found!",wslot, specificBarrelToUse));
+		DEBUG_CRASH(("ProjectileLaunchPos %d %d not found!",wslot, specificBarrelToUse));
 		attachTransform.Make_Identity();
 		turretRotPos.zero();
 		turretPitchPos.zero();
@@ -2803,13 +2877,13 @@ void Weapon::processRequestAssistance( const Object *requestingObject, Object *v
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ void Weapon::positionProjectileForLaunch(
-	Object* projectile, 
-	const Object* launcher, 
-	WeaponSlotType wslot, 
+	Object* projectile,
+	const Object* launcher,
+	WeaponSlotType wslot,
 	Int specificBarrelToUse
 )
 {
-	//CRCDEBUG_LOG(("Weapon::positionProjectileForLaunch() for %s from %s\n",
+	//CRCDEBUG_LOG(("Weapon::positionProjectileForLaunch() for %s from %s",
 		//DescribeObject(projectile).str(), DescribeObject(launcher).str()));
 
 	// if our launch vehicle is gone, destroy ourselves
@@ -2844,7 +2918,7 @@ void Weapon::getFiringLineOfSightOrigin(const Object* source, Coord3D& origin) c
 {
 	//GS 1-6-03
 	// Sorry, but we have to simplify this.  If we take the actual projectile launch pos, then
-	// that point can change. Take a Ranger with his gun on his shoulder.  His point is very high so 
+	// that point can change. Take a Ranger with his gun on his shoulder.  His point is very high so
 	// he clears this check and transitions to attacking.  This puts his gun at waist level and
 	// now he fails this check so he transitions back.  Our height won't change.
 	origin.z += source->getGeometryInfo().getMaxHeightAbovePosition();
@@ -2876,12 +2950,12 @@ Bool Weapon::isClearFiringLineOfSightTerrain(const Object* source, const Object*
 {
 	Coord3D origin;
 	origin = *source->getPosition();
-	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain(Object) for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain(Object) for %s", DescribeObject(source).str()));
 	//DUMPCOORD3D(&origin);
 	getFiringLineOfSightOrigin(source, origin);
 	Coord3D victimPos;
 	victim->getGeometryInfo().getCenterPosition( *victim->getPosition(), victimPos );
-	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain() - victimPos is (%g,%g,%g) (%X,%X,%X)\n",
+	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain() - victimPos is (%g,%g,%g) (%X,%X,%X)",
 	//	victimPos.x, victimPos.y, victimPos.z,
 	//	AS_INT(victimPos.x),AS_INT(victimPos.y),AS_INT(victimPos.z)));
 	return ThePartitionManager->isClearLineOfSightTerrain(NULL, origin, NULL, victimPos);
@@ -2893,7 +2967,7 @@ Bool Weapon::isClearFiringLineOfSightTerrain(const Object* source, const Coord3D
 {
 	Coord3D origin;
 	origin = *source->getPosition();
-	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain(Coord3D) for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain(Coord3D) for %s", DescribeObject(source).str()));
 	//DUMPCOORD3D(&origin);
 	getFiringLineOfSightOrigin(source, origin);
 	return ThePartitionManager->isClearLineOfSightTerrain(NULL, origin, NULL, victimPos);
@@ -2905,7 +2979,7 @@ Bool Weapon::isClearFiringLineOfSightTerrain(const Object* source, const Coord3D
 Bool Weapon::isClearGoalFiringLineOfSightTerrain(const Object* source, const Coord3D& goalPos, const Object* victim) const
 {
 	Coord3D origin=goalPos;
-	//CRCDEBUG_LOG(("Weapon::isClearGoalFiringLineOfSightTerrain(Object) for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::isClearGoalFiringLineOfSightTerrain(Object) for %s", DescribeObject(source).str()));
 	//DUMPCOORD3D(&origin);
 	getFiringLineOfSightOrigin(source, origin);
 	Coord3D victimPos;
@@ -2919,10 +2993,10 @@ Bool Weapon::isClearGoalFiringLineOfSightTerrain(const Object* source, const Coo
 Bool Weapon::isClearGoalFiringLineOfSightTerrain(const Object* source, const Coord3D& goalPos, const Coord3D& victimPos) const
 {
 	Coord3D origin=goalPos;
-	//CRCDEBUG_LOG(("Weapon::isClearGoalFiringLineOfSightTerrain(Coord3D) for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::isClearGoalFiringLineOfSightTerrain(Coord3D) for %s", DescribeObject(source).str()));
 	//DUMPCOORD3D(&origin);
 	getFiringLineOfSightOrigin(source, origin);
-	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain() - victimPos is (%g,%g,%g) (%X,%X,%X)\n",
+	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain() - victimPos is (%g,%g,%g) (%X,%X,%X)",
 	//	victimPos.x, victimPos.y, victimPos.z,
 	//	AS_INT(victimPos.x),AS_INT(victimPos.y),AS_INT(victimPos.z)));
 	return ThePartitionManager->isClearLineOfSightTerrain(NULL, origin, NULL, victimPos);
@@ -3097,7 +3171,7 @@ void Weapon::crc( Xfer *xfer )
 		}
 #endif // DEBUG_CRC
 
-	}  // end for, it
+	}
 
 	// pitch limited
 	xfer->xferBool( &m_pitchLimited );
@@ -3123,11 +3197,11 @@ void Weapon::crc( Xfer *xfer )
 #ifdef DEBUG_CRC
 	if (doLogging)
 	{
-		CRCDEBUG_LOG(("%s\n", logString.str()));
+		CRCDEBUG_LOG(("%s", logString.str()));
 	}
 #endif // DEBUG_CRC
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer
@@ -3200,7 +3274,7 @@ void Weapon::xfer( Xfer *xfer )
 	UnsignedShort scatterCount = m_scatterTargetsUnused.size();
 	xfer->xferUnsignedShort( &scatterCount );
 	Int intData;
-	if( xfer->getXferMode() == XFER_SAVE )	
+	if( xfer->getXferMode() == XFER_SAVE )
 	{
 		std::vector< Int >::const_iterator it;
 
@@ -3210,9 +3284,9 @@ void Weapon::xfer( Xfer *xfer )
 			intData = *it;
 			xfer->xferInt( &intData );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -3225,9 +3299,9 @@ void Weapon::xfer( Xfer *xfer )
 			xfer->xferInt( &intData );
 			m_scatterTargetsUnused.push_back( intData );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// pitch limited
 	xfer->xferBool( &m_pitchLimited );
@@ -3235,7 +3309,7 @@ void Weapon::xfer( Xfer *xfer )
 	// leech weapon range active
 	xfer->xferBool( &m_leechWeaponRangeActive );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3296,7 +3370,7 @@ void WeaponBonusSet::appendBonuses(WeaponBonusConditionFlags flags, WeaponBonus&
 	{
 		if ((flags & (1 << i)) == 0)
 			continue;
-		
+
 		this->m_bonus[i].appendBonuses(bonus);
 	}
 }
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp
index 2657f5a299f..9eb4a1e54eb 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES
 #define DEFINE_COMMANDSOURCEMASK_NAMES
@@ -53,17 +53,13 @@
 #include "GameLogic/Weapon.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-const char* WeaponSetFlags::s_bitNameList[] = 
+template<>
+const char* const WeaponSetFlags::s_bitNameList[] =
 {
 	"VETERAN",
 	"ELITE",
@@ -77,6 +73,7 @@ const char* WeaponSetFlags::s_bitNameList[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(WeaponSetFlags::s_bitNameList) == WeaponSetFlags::NumBits + 1, "Incorrect array size");
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -96,7 +93,7 @@ void WeaponTemplateSet::clear()
 	m_isReloadTimeShared = false;
 	m_isWeaponLockSharedAcrossSets = FALSE;
 	m_types.clear();
-	for (int i = 0; i < WEAPONSLOT_COUNT; ++i) 
+	for (int i = 0; i < WEAPONSLOT_COUNT; ++i)
 	{
 		m_template[i] = NULL;
 		m_autoChooseMask[i] = 0xffffffff;					// by default, allow autochoosing from any CommandSource
@@ -107,7 +104,7 @@ void WeaponTemplateSet::clear()
 //-------------------------------------------------------------------------------------------------
 Bool WeaponTemplateSet::hasAnyWeapons() const
 {
-	for (int i = 0; i < WEAPONSLOT_COUNT; ++i) 
+	for (int i = 0; i < WEAPONSLOT_COUNT; ++i)
 	{
 		if (m_template[i])
 			return true;
@@ -142,7 +139,7 @@ void WeaponTemplateSet::parsePreferredAgainst(INI* ini, void *instance, void * /
 //-------------------------------------------------------------------------------------------------
 void WeaponTemplateSet::parseWeaponTemplateSet( INI* ini, const ThingTemplate* tt )
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ "Conditions", WeaponSetFlags::parseFromINI, NULL, offsetof( WeaponTemplateSet, m_types ) },
 		{ "Weapon",	WeaponTemplateSet::parseWeapon,	NULL, 0 },
@@ -187,8 +184,7 @@ WeaponSet::WeaponSet()
 WeaponSet::~WeaponSet()
 {
 	for (Int i = 0; i < WEAPONSLOT_COUNT; ++i)
-		if (m_weapons[i])
-			deleteInstance(m_weapons[i]);
+		deleteInstance(m_weapons[i]);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -197,7 +193,7 @@ WeaponSet::~WeaponSet()
 void WeaponSet::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -243,7 +239,7 @@ void WeaponSet::xfer( Xfer *xfer )
 			const ThingTemplate* tt = m_curWeaponTemplateSet->friend_getThingTemplate();
 			if (tt == NULL)
 				throw INI_INVALID_DATA;
-		
+
 			ttName = tt->getName();
 			wsFlags = m_curWeaponTemplateSet->friend_getWeaponSetFlags();
 		}
@@ -285,7 +281,7 @@ void WeaponSet::xfer( Xfer *xfer )
 void WeaponSet::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 void WeaponSet::updateWeaponSet(const Object* obj)
@@ -296,7 +292,7 @@ void WeaponSet::updateWeaponSet(const Object* obj)
 	{
 		if( ! set->isWeaponLockSharedAcrossSets() )
 		{
-			DEBUG_ASSERTLOG(!isCurWeaponLocked(), ("changing WeaponSet while Weapon is Locked... implicit unlock occurring!\n"));
+			DEBUG_ASSERTLOG(!isCurWeaponLocked(), ("changing WeaponSet while Weapon is Locked... implicit unlock occurring!"));
 			releaseWeaponLock(LOCKED_PERMANENTLY);	// release all locks. sorry!
 			m_curWeapon = PRIMARY_WEAPON;
 		}
@@ -307,11 +303,8 @@ void WeaponSet::updateWeaponSet(const Object* obj)
 		m_hasDamageWeapon = false;
 		for (Int i = WEAPONSLOT_COUNT - 1; i >= PRIMARY_WEAPON ; --i)
 		{
-			if (m_weapons[i] != NULL)
-			{
-				deleteInstance(m_weapons[i]);
-				m_weapons[i] = NULL;
-			}
+			deleteInstance(m_weapons[i]);
+			m_weapons[i] = NULL;
 
 			if (set->getNth((WeaponSlotType)i))
 			{
@@ -332,7 +325,7 @@ void WeaponSet::updateWeaponSet(const Object* obj)
 			}
 		}
 		m_curWeaponTemplateSet = set;
-		//DEBUG_LOG(("WeaponSet::updateWeaponSet -- changed curweapon to %s\n",getCurWeapon()->getName().str()));
+		//DEBUG_LOG(("WeaponSet::updateWeaponSet -- changed curweapon to %s",getCurWeapon()->getName().str()));
 	}
 }
 
@@ -351,7 +344,7 @@ void WeaponSet::updateWeaponSet(const Object* obj)
 	ModelConditionFlagType f = Lookup[a][wslot];
 	if (f != MODELCONDITION_INVALID)
 		flags.set(f);
-	
+
 	static const ModelConditionFlagType Using[WEAPONSLOT_COUNT] = { MODELCONDITION_USING_WEAPON_A, MODELCONDITION_USING_WEAPON_B, MODELCONDITION_USING_WEAPON_C };
 	if (a != WSF_NONE)
 		flags.set(Using[wslot]);
@@ -427,12 +420,12 @@ CanAttackResult WeaponSet::getAbleToAttackSpecificObject( AbleToAttackType attac
 {
 
 	// basic sanity checks.
-	if (!source || 
-			!victim || 
-			source->isEffectivelyDead() || 
-			victim->isEffectivelyDead() || 
-			source->isDestroyed() || 
-			victim->isDestroyed() || 
+	if (!source ||
+			!victim ||
+			source->isEffectivelyDead() ||
+			victim->isEffectivelyDead() ||
+			source->isDestroyed() ||
+			victim->isDestroyed() ||
 			victim == source)
 		return ATTACKRESULT_NOT_POSSIBLE;
 
@@ -471,10 +464,10 @@ CanAttackResult WeaponSet::getAbleToAttackSpecificObject( AbleToAttackType attac
   	  allowStealthToPreventAttacks = FALSE;
   }
 
-	// If an object is stealthed and hasn't been detected yet, then it is not a valid target to fire 
+	// If an object is stealthed and hasn't been detected yet, then it is not a valid target to fire
 	// on.
-	if (allowStealthToPreventAttacks && 
-				victim->testStatus(OBJECT_STATUS_STEALTHED) && 
+	if (allowStealthToPreventAttacks &&
+				victim->testStatus(OBJECT_STATUS_STEALTHED) &&
 				!victim->testStatus(OBJECT_STATUS_DETECTED))
 	{
 		if( !victim->isKindOf( KINDOF_DISGUISER ) )
@@ -504,7 +497,7 @@ CanAttackResult WeaponSet::getAbleToAttackSpecificObject( AbleToAttackType attac
 	// If the victim is fully fogged or fully shrouded, then we cannot attack them
 	// GS -- Shroud only applies in decision making to Player owned objects and when the source is not from script
 	// SRJ -- ignore shroud checks if mode is CONTINUED and the target is immobile, since presumably
-	// we know where it is (and it's not going anywhere); this prevents wonky behavior if you have planes attack 
+	// we know where it is (and it's not going anywhere); this prevents wonky behavior if you have planes attack
 	// a deshrouded thing, which becomes reshrouded before they get there (basically the planes circle once in order
 	// to deshroud it again, and get nailed by AA fire in the meantime)
 
@@ -515,7 +508,7 @@ CanAttackResult WeaponSet::getAbleToAttackSpecificObject( AbleToAttackType attac
  //   && sourceController->getPlayerType() == PLAYER_HUMAN
 //		&& commandSource != CMD_FROM_SCRIPT
 //		&& !(isContinuedAttack(attackType) && victim->isKindOf(KINDOF_IMMOBILE))
-//		&&  victim->getShroudedStatus(sourceController->getPlayerIndex()) >= OBJECTSHROUD_FOGGED 
+//		&&  victim->getShroudedStatus(sourceController->getPlayerIndex()) >= OBJECTSHROUD_FOGGED
 //		)
 //	{
 //		return ATTACKRESULT_NOT_POSSIBLE;
@@ -585,7 +578,7 @@ CanAttackResult WeaponSet::getAbleToAttackSpecificObject( AbleToAttackType attac
 CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType attackType, const Object *source, const Object *victim, const Coord3D *pos, CommandSourceType commandSource ) const
 {
 
-	//First determine if we are attacking an object or the ground and get the 
+	//First determine if we are attacking an object or the ground and get the
 	//appropriate weapon anti mask.
 	WeaponAntiMaskType targetAntiMask;
 	if( victim )
@@ -601,7 +594,7 @@ CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType att
 		//Attacking the ground so this is obvious.
 		targetAntiMask = WEAPON_ANTI_GROUND;
 	}
-	
+
 
 	// Special Case test for turreted weapons on buildings... since they cannot move, they must be within range of target
 	//Kris: Actually -- let's just do this for all immobile objects. If we can give it orders to attack, then we must check
@@ -665,7 +658,7 @@ CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType att
 	}
 
 	CanAttackResult okResult = withinAttackRange ? ATTACKRESULT_POSSIBLE : ATTACKRESULT_POSSIBLE_AFTER_MOVING;
-	
+
 
 // ----- things we examine about SOURCE to determine legality of attack
 
@@ -678,7 +671,7 @@ CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType att
 		//of the weapon mask check preceding this, the attack is possible!
 		if( !victim )
 			return okResult;
-		
+
 		if (!isAnyWithinTargetPitch(source, victim))
 			return ATTACKRESULT_INVALID_SHOT;
 
@@ -732,15 +725,15 @@ CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType att
 
 	// Do a check to see if we have a hive object that has slaved objects.
 	SpawnBehaviorInterface* spawnInterface = source->getSpawnBehaviorInterface();
-	if( spawnInterface && 
+	if( spawnInterface &&
 		spawnInterface->getCanAnySlavesUseWeaponAgainstTarget( attackType, victim, pos, commandSource ) == ATTACKRESULT_POSSIBLE )
 	{
 
-// srj sez: this bit is intended to fix the situation where you have a stinger site 
+// srj sez: this bit is intended to fix the situation where you have a stinger site
 // selected and get the "attack if I move" cursor against an enemy. since the stinger site can't
 // move or fire, you shouldn't really EVER get this cursor for it. and since we just verified above
 // that our slaves (the soldiers) can attack correctly, just nork it.
-		if (source->isKindOf( KINDOF_IMMOBILE ) 
+		if (source->isKindOf( KINDOF_IMMOBILE )
 				&& source->isKindOf( KINDOF_SPAWNS_ARE_THE_WEAPONS )
 				&& okResult == ATTACKRESULT_POSSIBLE_AFTER_MOVING)
 			okResult = ATTACKRESULT_POSSIBLE;
@@ -756,7 +749,7 @@ CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType att
 Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victim, WeaponChoiceCriteria criteria, CommandSourceType cmdSource)
 {
 	/*
-		1) The first criteria is weapon fitness.  If the object has two weapons that can fire concurrently, 
+		1) The first criteria is weapon fitness.  If the object has two weapons that can fire concurrently,
 			find the set of weapons that can hit the given target.  If two weapons can hit the given target,
 		2) Figure potential damage. If both weapons have the same potential damage (should never happen) then,
 		3) Pick one.
@@ -798,7 +791,7 @@ Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victi
 		// no weapon in this slot.
 		if (!m_weapons[i])
 			continue;
-		
+
 		// weapon not allowed to be specified via this command source.
 		CommandSourceMask okSrcs = m_curWeaponTemplateSet->getNthCommandSourceMask((WeaponSlotType)i);
 		if ((okSrcs & (1 << cmdSource)) == 0)
@@ -807,7 +800,7 @@ Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victi
 		Weapon* weapon = m_weapons[i];
 		if (weapon == NULL)
 			continue;
-		
+
 		// weapon out of range.
 		if (!weapon->isWithinAttackRange(obj, victim))
 			continue;
@@ -815,14 +808,14 @@ Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victi
 		// weapon out of ammo.
 		if (weapon->getStatus() == OUT_OF_AMMO && !weapon->getAutoReloadsClip())
 			continue;
-		
+
 		// weapon not allowed to target this kind of thing.
 		if (!(weapon->getAntiMask() & getVictimAntiMask(victim)))
 			continue;
 
 		if (!weapon->isWithinTargetPitch(obj, victim))
 			continue;
-		
+
 		Real damage = weapon->estimateWeaponDamage(obj, victim);
 		Real attackRange = weapon->getAttackRange(obj);
 		Bool weaponIsReady = (weapon->getStatus() == READY_TO_FIRE);
@@ -835,7 +828,7 @@ Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victi
 		// exception: 'unresistable' weapons are allowed to do zero damage.
 		if (damage <= 0.0f && weapon->getDamageType() != DAMAGE_UNRESISTABLE)
 			continue;
-	
+
 		/*
 			now that we've eliminated the impossible ones, let's decide which
 			one we will prefer.
@@ -851,7 +844,7 @@ Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victi
 		if (KINDOFMASK_ANY_SET(preferredAgainst) && victim->isKindOfMulti(preferredAgainst, KINDOFMASK_NONE))
 		{
 			const Real HUGE_DAMAGE = 1e10;		// wow, that's a lot of damage.
-			const Real HUGE_RANGE = 1e10;			
+			const Real HUGE_RANGE = 1e10;
 			damage = HUGE_DAMAGE;
 			attackRange = HUGE_RANGE;
 			// preferred weapons are also kept if they are merely reloading. (if out of ammo, we can punt.)
@@ -917,13 +910,13 @@ Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victi
 		m_curWeapon = currentDecisionBackup;
 		found = TRUE;
 	}
-	else 
+	else
 	{
 		// No weapon at all was found, so we go back to primary.
 		m_curWeapon = PRIMARY_WEAPON;
 	}
 
-	//DEBUG_LOG(("WeaponSet::chooseBestWeaponForTarget -- changed curweapon to %s\n",getCurWeapon()->getName().str()));
+	//DEBUG_LOG(("WeaponSet::chooseBestWeaponForTarget -- changed curweapon to %s",getCurWeapon()->getName().str()));
 
 	return found;
 }
@@ -995,7 +988,7 @@ Bool WeaponSet::setWeaponLock( WeaponSlotType weaponSlot, WeaponLockType lockTyp
 {
 	if (lockType == NOT_LOCKED)
 	{
-		DEBUG_CRASH(("calling setWeaponLock with NOT_LOCKED, so I am doing nothing... did you mean to use releaseWeaponLock()?\n"));
+		DEBUG_CRASH(("calling setWeaponLock with NOT_LOCKED, so I am doing nothing... did you mean to use releaseWeaponLock()?"));
 		return false;
 	}
 
@@ -1007,19 +1000,19 @@ Bool WeaponSet::setWeaponLock( WeaponSlotType weaponSlot, WeaponLockType lockTyp
 		{
 			m_curWeapon = weaponSlot;
 			m_curWeaponLockedStatus = lockType;
-			//DEBUG_LOG(("WeaponSet::setWeaponLock permanently -- changed curweapon to %s\n",getCurWeapon()->getName().str()));
+			//DEBUG_LOG(("WeaponSet::setWeaponLock permanently -- changed curweapon to %s",getCurWeapon()->getName().str()));
 		}
 		else if( lockType == LOCKED_TEMPORARILY && m_curWeaponLockedStatus != LOCKED_PERMANENTLY )
 		{
 			m_curWeapon = weaponSlot;
 			m_curWeaponLockedStatus = lockType;
-			//DEBUG_LOG(("WeaponSet::setWeaponLock temporarily -- changed curweapon to %s\n",getCurWeapon()->getName().str()));
+			//DEBUG_LOG(("WeaponSet::setWeaponLock temporarily -- changed curweapon to %s",getCurWeapon()->getName().str()));
 		}
 
 		return true;
 	}
 
-	DEBUG_CRASH(("setWeaponLock: weapon %d not found (missing an upgrade?)\n", (Int)weaponSlot));
+	DEBUG_CRASH(("setWeaponLock: weapon %d not found (missing an upgrade?)", (Int)weaponSlot));
 	return false;
 }
 
@@ -1044,14 +1037,14 @@ void WeaponSet::releaseWeaponLock(WeaponLockType lockType)
 	}
 	else
 	{
-		DEBUG_CRASH(("calling releaseWeaponLock with NOT_LOCKED makes no sense. why did you do this?\n"));
+		DEBUG_CRASH(("calling releaseWeaponLock with NOT_LOCKED makes no sense. why did you do this?"));
 	}
 }
 
 //-------------------------------------------------------------------------------------------------
 Weapon* WeaponSet::getWeaponInWeaponSlot(WeaponSlotType wslot) const
-{ 
-	return m_weapons[wslot]; 
+{
+	return m_weapons[wslot];
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1077,4 +1070,4 @@ Bool WeaponSet::isSharedReloadTime() const
 		return m_curWeaponTemplateSet->isSharedReloadTime();
 	return false;
 }
- 
+
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
index 26e3374594a..6680f09c8ce 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
@@ -27,12 +27,12 @@
 // Author: John Ahlquist, Nov. 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioAffect.h"
 #include "Common/AudioHandleSpecialValues.h"
+#include "Common/FramePacer.h"
 #include "Common/GameAudio.h"
-#include "Common/GameEngine.h"
 #include "Common/MapObject.h"							// For MAP_XY_FACTOR
 #include "Common/PartitionSolver.h"
 #include "Common/Player.h"
@@ -81,11 +81,6 @@
 #include "GameLogic/Weapon.h"
 #include "GameLogic/VictoryConditions.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // Kind of hacky, but we need to dance on the guts of the terrain.
 extern void oversizeTheTerrain(Int amount);
@@ -100,7 +95,7 @@ static void updateTeamAndPlayerStuff( Object *obj, void *userData )
 	if (obj)
 	{
 		obj->updateUpgradeModules();
-		
+
 		// srj sez: apparently we have to do this too, since Team::setControllingPlayer
 		// does not. Might make more sense to do it there, but am scared to at this point.
 		Drawable* draw = obj->getDrawable();
@@ -132,14 +127,14 @@ ScriptActions::ScriptActions()
 	m_suppressNewWindows = FALSE;
 	m_unnamedUnit = AsciiString::TheEmptyString;
 
-}  // end ScriptActions
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ScriptActions::~ScriptActions()
 {
 	reset(); // just in case.
-}  // end ~ScriptActions
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Init */
@@ -149,7 +144,7 @@ void ScriptActions::init( void )
 
 	reset();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -159,7 +154,7 @@ void ScriptActions::reset( void )
 	m_suppressNewWindows = FALSE;
 	closeWindows(FALSE); // Close victory or defeat windows.
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -167,7 +162,7 @@ void ScriptActions::reset( void )
 void ScriptActions::update( void )
 {
 	// Empty for now.  jba.
-}  // end update
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -181,7 +176,7 @@ void ScriptActions::closeWindows( Bool suppressNewWindows )
 		TheWindowManager->winDestroy(m_messageWindow);
 		m_messageWindow = NULL;
 	}
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** doQuickVictory */
@@ -223,7 +218,7 @@ void ScriptActions::doVictory( void )
 		{
 			m_messageWindow = TheWindowManager->winCreateFromScript("Menus/Victorious.wnd");
 		}
-	}	
+	}
 	if(TheCampaignManager)
 		TheCampaignManager->SetVictorious(TRUE);
 	TheScriptEngine->startEndGameTimer();
@@ -341,7 +336,7 @@ void ScriptActions::changeObjectPanelFlagForSingleObject(Object *obj, const Asci
 void ScriptActions::doDebugMessage(const AsciiString& msg, Bool pause )
 {
 	TheScriptEngine->AppendDebugMessage(msg, pause);
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** doPlaySoundEffect */
@@ -352,14 +347,14 @@ void ScriptActions::doPlaySoundEffect(const AsciiString& sound)
 	audioEvent.setIsLogicalAudio(true);
 	audioEvent.setPlayerIndex(ThePlayerList->getLocalPlayer()->getPlayerIndex());
 	TheAudio->addAudioEvent( &audioEvent );
-}  
+}
 
 
 //-------------------------------------------------------------------------------------------------
 /** doPlaySoundEffectAt */
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doPlaySoundEffectAt(const AsciiString& sound, const AsciiString& waypoint)
-{	
+{
 	Waypoint *way = TheTerrainLogic->getWaypointByName(waypoint);
 	if (!way) {
 		return;
@@ -369,7 +364,7 @@ void ScriptActions::doPlaySoundEffectAt(const AsciiString& sound, const AsciiStr
 	audioEvent.setIsLogicalAudio(true);
 	audioEvent.setPlayerIndex(ThePlayerList->getLocalPlayer()->getPlayerIndex());
 	TheAudio->addAudioEvent( &audioEvent );
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** doDamageTeamMembers */
@@ -382,7 +377,7 @@ void ScriptActions::doDamageTeamMembers(const AsciiString& team, Real amount)
 	if (theTeam) {
 		theTeam->damageTeamMembers(amount);
 	}
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** doMoveToWaypoint */
@@ -394,16 +389,19 @@ void ScriptActions::doMoveToWaypoint(const AsciiString& team, const AsciiString&
 	// The team is the team based on the name, and the calling team (if any) and the team that
 	// triggered the condition.  jba. :)
 	if (theTeam) {
-		AIGroup* theGroup = TheAI->createGroup();
+		AIGroupPtr theGroup = TheAI->createGroup();
 		if (!theGroup) {
 			return;
 		}
-
+#if RETAIL_COMPATIBLE_AIGROUP
 		theTeam->getTeamAsAIGroup(theGroup);
+#else
+		theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 		Waypoint *way = TheTerrainLogic->getWaypointByName(waypoint);
 		if (way) {
 			Coord3D destination = *way->getLocation();
-			//DEBUG_LOG(("Moving team to waypoint %f, %f, %f\n", destination.x, destination.y, destination.z));
+			//DEBUG_LOG(("Moving team to waypoint %f, %f, %f", destination.x, destination.y, destination.z));
  			theGroup->groupMoveToPosition( &destination, false, CMD_FROM_SCRIPT );
 		}
 	}
@@ -415,7 +413,7 @@ void ScriptActions::doMoveToWaypoint(const AsciiString& team, const AsciiString&
 void ScriptActions::doNamedMoveToWaypoint(const AsciiString& unit, const AsciiString& waypoint)
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
-	if (theObj) 
+	if (theObj)
 	{
 		Waypoint *way = TheTerrainLogic->getWaypointByName(waypoint);
 		if (!way) {
@@ -428,7 +426,7 @@ void ScriptActions::doNamedMoveToWaypoint(const AsciiString& unit, const AsciiSt
 		if (!aiUpdate) {
 			return;
 		}
-		
+
 		aiUpdate->clearWaypointQueue();
 		theObj->leaveGroup();
 		aiUpdate->chooseLocomotorSet( LOCOMOTORSET_NORMAL );
@@ -443,8 +441,8 @@ void ScriptActions::doNamedMoveToWaypoint(const AsciiString& unit, const AsciiSt
 void ScriptActions::doCameraFollowNamed(const AsciiString& unit, Bool snapToUnit)
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
-	if (theObj) 
-	{	
+	if (theObj)
+	{
 		TheTacticalView->setCameraLock(theObj->getID());
 		if (snapToUnit)
 			TheTacticalView->snapToCameraLock();
@@ -472,7 +470,7 @@ void ScriptActions::doSetTeamState(const AsciiString& team, const AsciiString& s
 	if (theTeam) {
 		theTeam->setState(state);
 	}
-}	
+}
 
 /** doCreateReinforcements */
 //-------------------------------------------------------------------------------------------------
@@ -484,15 +482,15 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 
 	Bool needToMoveToDestination = false;
 	//Validate the waypoint
-	Waypoint *way = TheTerrainLogic->getWaypointByName(waypoint); 
-	if (way==NULL) 
+	Waypoint *way = TheTerrainLogic->getWaypointByName(waypoint);
+	if (way==NULL)
 	{
 		return;
 	}
 
 	destination = *way->getLocation();
 	if (!theTeamProto) {
-		DEBUG_LOG(("***WARNING - Team %s not found.\n", team));
+		DEBUG_LOG(("***WARNING - Team %s not found.", team.str()));
 		return;
 	}
 	const TeamTemplateInfo *pInfo = theTeamProto->getTemplateInfo();
@@ -518,12 +516,12 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 	Object *transport=NULL;
 	ContainModuleInterface *contain = NULL;
 	transportTemplate = TheThingFactory->findTemplate( pInfo->m_transportUnitType );
-	if( transportTemplate ) 
+	if( transportTemplate )
 	{
 		transport = TheThingFactory->newObject( transportTemplate, theTeam );
 		transport->setPosition( &origin );
 		transport->setOrientation( 0.0f );
-		if( transport ) 
+		if( transport )
 		{
 			contain = transport->getContain();
 		}
@@ -550,15 +548,15 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 
 	//Now create the units that make up the team.
 	Int i, j;
-	for (i=0; i<pInfo->m_numUnitsInfo; i++) 
+	for (i=0; i<pInfo->m_numUnitsInfo; i++)
 	{
 		// get thing template based from map object name
 		unitTemplate = TheThingFactory->findTemplate(pInfo->m_unitsInfo[i].unitThingName);
 		Coord3D pos = origin;
-		if (unitTemplate && theTeam) 
+		if (unitTemplate && theTeam)
 		{
 			Object *obj = NULL;
-			for (j=0; j<pInfo->m_unitsInfo[i].maxUnits; j++) 
+			for (j=0; j<pInfo->m_unitsInfo[i].maxUnits; j++)
 			{
 				// create new object in the world
 				obj = TheThingFactory->newObject( unitTemplate, theTeam );
@@ -569,19 +567,19 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 					pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y);
 					obj->setPosition( &pos );
 					obj->setOrientation(0.0f);
-				}  // end if
+				}
 			}
 			if (obj) pos.y += 2*obj->getGeometryInfo().getMajorRadius();
 		}
 		origin.y = pos.y;
 	}
 	origin = destination;
-	if (pInfo->m_teamStartsFull) 
+	if (pInfo->m_teamStartsFull)
 	{
 		// Have them load into transports in the team.
 		EntriesVec vecOfUnits;
 		SpacesVec vecOfTransports;
-		
+
 		for (DLINK_ITERATOR<Object> iter = theTeam->iterate_TeamMemberList(); !iter.done(); iter.advance())
 		{
 			Object *obj = iter.cur();
@@ -591,7 +589,7 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 			if (obj==transport) {
 				continue; // Skip the one we created.  The team loads into the transports on the team for team starts full. jba
 			}
-			if (obj->isKindOf(KINDOF_TRANSPORT)) 
+			if (obj->isKindOf(KINDOF_TRANSPORT))
 			{
 				ContainModuleInterface *contain = obj->getContain();
 				if( contain )
@@ -602,8 +600,8 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 				{
 					DEBUG_CRASH( ("doCreateReinforcement script -- transport doesn't have contain to hold guys.") );
 				}
-			} 
-			else 
+			}
+			else
 			{
 				Int slots = obj->getTransportSlotCount();
 				if (slots==0) slots = 0x7fffff; // 0 means lots.
@@ -623,11 +621,11 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 				continue;
 			}
 			ContainModuleInterface *contain = trans->getContain();
-			if (contain) 
+			if (contain)
 			{
 				contain->addToContain(unit);
 			}
-		}		
+		}
 
 	}
 	contain = NULL;
@@ -635,21 +633,21 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 	{
 		contain = transport->getContain();
 	}
-	if (contain) 
+	if (contain)
 	{
 		for (DLINK_ITERATOR<Object> iter = theTeam->iterate_TeamMemberList(); !iter.done(); iter.advance())
 		{
 			Object *obj = iter.cur();
-			if (!obj) 
+			if (!obj)
 			{
 				continue;
 			}
-			if (obj->getTemplate()->isEquivalentTo(transport->getTemplate()) ) 
+			if (obj->getTemplate()->isEquivalentTo(transport->getTemplate()) )
 			{
 				// it's our transport.
 				continue;
 			}
-			if (obj->getContainedBy() != NULL) 
+			if (obj->getContainedBy() != NULL)
 			{
 				continue;
 			}
@@ -658,19 +656,19 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 			Coord3D pos = origin;
 			pos.x += transportCount*transport->getGeometryInfo().getMajorRadius();
 			pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y);
-			
-			if (contain && contain->isValidContainerFor(obj, false)) 
+
+			if (contain && contain->isValidContainerFor(obj, false))
 			{
 				//Now that we know it fits in the transport, check to see if it's full. If it is,
 				//then we'll create a new transport.
-				if (!contain->isValidContainerFor(obj, true)) 
+				if (!contain->isValidContainerFor(obj, true))
 				{
 					// full, try building another.
 					transport = TheThingFactory->newObject( transportTemplate, theTeam );
 					transport->setPosition( &pos );
 					transportCount++;
 					transport->setOrientation(0.0f);
-					if (transport) 
+					if (transport)
 					{
 						contain = transport->getContain();
 					}
@@ -701,19 +699,19 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 	}
 
 
-	if (theTeam) 
+	if (theTeam)
 	{
-		if (transport) 
+		if (transport)
 		{
 			for (DLINK_ITERATOR<Object> iter = theTeam->iterate_TeamMemberList(); !iter.done(); iter.advance())
 			{
 				Object *obj = iter.cur();
-				if (!obj) 
+				if (!obj)
 				{
 					continue;
 				}
 				AIUpdateInterface *ai = obj->getAIUpdateInterface();
-				if (obj->getTemplate()->isEquivalentTo(transport->getTemplate()) ) 
+				if (obj->getTemplate()->isEquivalentTo(transport->getTemplate()) )
 				{
 					if( dp )
 					{
@@ -736,11 +734,11 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 							ai->aiMoveToAndEvacuate( &destination, CMD_FROM_SCRIPT );
 						}
 					}
-				}	
-				else 
+				}
+				else
 				{
 					// If there are any units that aren't transportable, move them to the goal.
-					if( !obj->isDisabledByType( DISABLED_HELD ) ) 
+					if( !obj->isDisabledByType( DISABLED_HELD ) )
 					{
 						if( ai )
 						{
@@ -750,18 +748,22 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 					}
 				}
 			}
-		} 
-		else 
+		}
+		else
 		{
 			theTeam->setActive();
-			if (needToMoveToDestination) 
+			if (needToMoveToDestination)
 			{
-				AIGroup* theGroup = TheAI->createGroup();
-				if (!theGroup) 
+				AIGroupPtr theGroup = TheAI->createGroup();
+				if (!theGroup)
 				{
 					return;
 				}
+#if RETAIL_COMPATIBLE_AIGROUP
 				theTeam->getTeamAsAIGroup(theGroup);
+#else
+				theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 				theGroup->groupMoveToPosition( &destination, false, CMD_FROM_SCRIPT );
 			}
 		}
@@ -776,7 +778,7 @@ void ScriptActions::doMoveCameraTo(const AsciiString& waypoint, Real sec, Real c
 	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext()) {
 		if (way->getName() == waypoint) {
 			Coord3D destination = *way->getLocation();
-			TheTacticalView->moveCameraTo(&destination, sec*1000, cameraStutterSec*1000, true);			
+			TheTacticalView->moveCameraTo(&destination, sec*1000, cameraStutterSec*1000, true);
 			break;
 		}
 	}
@@ -821,11 +823,11 @@ void ScriptActions::doSetupCamera(const AsciiString& waypoint, Real zoom, Real p
 	Waypoint *way = TheTerrainLogic->getWaypointByName(waypoint);
 	if (way==NULL) return;
 	Coord3D	pos = *way->getLocation();
-	Waypoint *lookat = TheTerrainLogic->getWaypointByName(lookAtWaypoint); 
+	Waypoint *lookat = TheTerrainLogic->getWaypointByName(lookAtWaypoint);
 	if (lookat==NULL) return;
 	Coord3D destination = *lookat->getLocation();
-	TheTacticalView->moveCameraTo(&pos, 0, 0, true);			
-	TheTacticalView->cameraModLookToward(&destination);			
+	TheTacticalView->moveCameraTo(&pos, 0, 0, true);
+	TheTacticalView->cameraModLookToward(&destination);
 	TheTacticalView->cameraModFinalPitch(pitch);
 	TheTacticalView->cameraModFinalZoom(zoom);
 }
@@ -838,7 +840,7 @@ void ScriptActions::doModCameraLookToward(const AsciiString& waypoint)
 	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext()) {
 		if (way->getName() == waypoint) {
 			Coord3D destination = *way->getLocation();
-			TheTacticalView->cameraModLookToward(&destination);			
+			TheTacticalView->cameraModLookToward(&destination);
 			break;
 		}
 	}
@@ -852,7 +854,7 @@ void ScriptActions::doModCameraFinalLookToward(const AsciiString& waypoint)
 	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext()) {
 		if (way->getName() == waypoint) {
 			Coord3D destination = *way->getLocation();
-			TheTacticalView->cameraModFinalLookToward(&destination);			
+			TheTacticalView->cameraModFinalLookToward(&destination);
 			break;
 		}
 	}
@@ -870,7 +872,7 @@ void ScriptActions::doModCameraMoveToSelection(void)
 	for (Drawable *d = TheGameClient->firstDrawable(); d; d = d->getNextDrawable())
 	{
 		if (d->isSelected())
-		{	
+		{
 			Coord3D pos = *d->getPosition();
 			destination.x += pos.x;
 			destination.y += pos.y;
@@ -882,7 +884,7 @@ void ScriptActions::doModCameraMoveToSelection(void)
 		destination.z /= count;
 		destination.x /= count;
 		destination.y /= count;
-		TheTacticalView->cameraModFinalMoveTo(&destination);			
+		TheTacticalView->cameraModFinalMoveTo(&destination);
 	}
 
 }
@@ -895,7 +897,7 @@ void ScriptActions::doResetCamera(const AsciiString& waypoint, Real sec)
 	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext()) {
 		if (way->getName() == waypoint) {
 			Coord3D destination = *way->getLocation();
-			TheTacticalView->resetCamera(&destination, sec*1000);			
+			TheTacticalView->resetCamera(&destination, sec*1000);
 			break;
 		}
 	}
@@ -906,7 +908,7 @@ void ScriptActions::doResetCamera(const AsciiString& waypoint, Real sec)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doRotateCamera(Real rotations, Real sec)
 {
-	TheTacticalView->rotateCamera(rotations, sec*1000);			
+	TheTacticalView->rotateCamera(rotations, sec*1000);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -917,7 +919,7 @@ void ScriptActions::doRotateCameraTowardObject(const AsciiString& unitName, Real
 	const Object *unit = TheScriptEngine->getUnitNamed(unitName);
 	if (!unit)
 		return;
-	TheTacticalView->rotateCameraTowardObject(unit->getID(), sec*1000, holdSec*1000);			
+	TheTacticalView->rotateCameraTowardObject(unit->getID(), sec*1000, holdSec*1000);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -927,7 +929,7 @@ void ScriptActions::doRotateCameraTowardWaypoint(const AsciiString& waypointName
 {
 	Waypoint *way = TheTerrainLogic->getWaypointByName(waypointName);
 	if (way==NULL) return;
-	TheTacticalView->rotateCameraTowardPosition(way->getLocation(), sec*1000);			
+	TheTacticalView->rotateCameraTowardPosition(way->getLocation(), sec*1000);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -937,7 +939,7 @@ void ScriptActions::doMoveCameraAlongWaypointPath(const AsciiString& waypoint, R
 {
 	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext()) {
 		if (way->getName() == waypoint) {
-			TheTacticalView->moveCameraAlongWaypointPath(way, sec*1000, cameraStutterSec*1000, true);			
+			TheTacticalView->moveCameraAlongWaypointPath(way, sec*1000, cameraStutterSec*1000, true);
 			break;
 		}
 	}
@@ -973,7 +975,7 @@ void ScriptActions::doCreateObject(const AsciiString& objectName, const AsciiStr
 	if (!theTeam) {
 		TheScriptEngine->AppendDebugMessage("***WARNING - Team not found:***", false);
 		TheScriptEngine->AppendDebugMessage(teamName, true);
-		DEBUG_LOG(("WARNING - Team %s not found.\n", teamName.str()));
+		DEBUG_LOG(("WARNING - Team %s not found.", teamName.str()));
 		return;
 	}
 	const ThingTemplate *thingTemplate;
@@ -995,9 +997,9 @@ void ScriptActions::doCreateObject(const AsciiString& objectName, const AsciiStr
 
 			obj->setOrientation(angle);
 			obj->setPosition( pos );
-		}  // end if
+		}
 	} else {
-		DEBUG_LOG(("WARNING - ThingTemplate '%s' not found.\n", thingName.str()));
+		DEBUG_LOG(("WARNING - ThingTemplate '%s' not found.", thingName.str()));
 	}
 }
 
@@ -1010,17 +1012,21 @@ void ScriptActions::doAttack(const AsciiString& attackerName, const AsciiString&
 	// The team is the team based on the name, and the calling team (if any) and the team that
 	// triggered the condition.  jba. :)
 	const Team *victimTeam = TheScriptEngine->getTeamNamed( victimName );
-	
+
 	// sanity
 	if( attackingTeam == NULL || victimTeam == NULL )
 		return;
 
-	AIGroup *aiGroup = TheAI->createGroup();
+	AIGroupPtr aiGroup = TheAI->createGroup();
 	if (!aiGroup) {
 		return;
 	}
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	attackingTeam->getTeamAsAIGroup(aiGroup);
+#else
+	attackingTeam->getTeamAsAIGroup(aiGroup.Peek());
+#endif
 	aiGroup->groupAttackTeam(victimTeam, NO_MAX_SHOTS_LIMIT, CMD_FROM_SCRIPT);
 
 }
@@ -1139,7 +1145,7 @@ void ScriptActions::createUnitOnTeamAt(const AsciiString& unitName, const AsciiS
 	if (!theTeam) {
 		TheScriptEngine->AppendDebugMessage("***WARNING - Team not found:***", false);
 		TheScriptEngine->AppendDebugMessage(teamName, true);
-		DEBUG_LOG(("WARNING - Team %s not found.\n", teamName.str()));
+		DEBUG_LOG(("WARNING - Team %s not found.", teamName.str()));
 		return;
 	}
 	const ThingTemplate *thingTemplate;
@@ -1158,16 +1164,16 @@ void ScriptActions::createUnitOnTeamAt(const AsciiString& unitName, const AsciiS
 					TheScriptEngine->addObjectToCache(obj);
 				}
 			}
-	
+
 			Waypoint *way = TheTerrainLogic->getWaypointByName( waypoint );
 			if (way)
 			{
 				Coord3D destination = *way->getLocation();
 				obj->setPosition(&destination);
 			}
-		}  // end if
+		}
 	} else {
-		DEBUG_LOG(("WARNING - ThingTemplate '%s' not found.\n", objType.str()));
+		DEBUG_LOG(("WARNING - ThingTemplate '%s' not found.", objType.str()));
 	}
 }
 
@@ -1185,7 +1191,7 @@ void ScriptActions::updateNamedAttackPrioritySet(const AsciiString& unitName, co
 	if (!pInterface) {
 		return;
 	}
-	
+
 	const AttackPriorityInfo *info = TheScriptEngine->getAttackInfo(attackPrioritySet);
 
 	pInterface->setAttackInfo(info);
@@ -1204,7 +1210,7 @@ void ScriptActions::updateTeamAttackPrioritySet(const AsciiString& teamName, con
 	}
 
 	const AttackPriorityInfo *info = TheScriptEngine->getAttackInfo(attackPrioritySet);
-	
+
 	if (info->getName().isNotEmpty()) {
 		team->setAttackPriorityName(info->getName());
 	}
@@ -1246,7 +1252,7 @@ void ScriptActions::updateNamedSetAttitude(const AsciiString& unitName, Int atti
 	if (!pInterface) {
 		return;
 	}
-	
+
 	pInterface->setAttitude((AttitudeType) attitude);
 }
 
@@ -1260,12 +1266,16 @@ void ScriptActions::updateTeamSetAttitude(const AsciiString& teamName, Int attit
 		return;
 	}
 
-	AIGroup *pAIGroup = TheAI->createGroup();
+	AIGroupPtr pAIGroup = TheAI->createGroup();
 	if (!pAIGroup) {
 		return;
 	}
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	theSrcTeam->getTeamAsAIGroup(pAIGroup);
+#else
+	theSrcTeam->getTeamAsAIGroup(pAIGroup.Peek());
+#endif
 	pAIGroup->setAttitude((AttitudeType) attitude);
 }
 
@@ -1291,12 +1301,12 @@ void ScriptActions::doTeamSetRepulsor(const AsciiString& teamName, Bool repulsor
 		return;
 	}
 
-	if (theSrcTeam) 
+	if (theSrcTeam)
 	{
 		for (DLINK_ITERATOR<Object> iter = theSrcTeam->iterate_TeamMemberList(); !iter.done(); iter.advance())
 		{
 			Object *obj = iter.cur();
-			if (!obj) 
+			if (!obj)
 			{
 				continue;
 			}
@@ -1315,7 +1325,7 @@ void ScriptActions::doNamedAttackArea(const AsciiString& unitName, const AsciiSt
 	if (!theSrcUnit) {
 		return;
 	}
-	
+
 	PolygonTrigger *pTrig = TheScriptEngine->getQualifiedTriggerAreaByName(areaName);
 	if (!pTrig) {
 		return;
@@ -1341,7 +1351,7 @@ void ScriptActions::doNamedAttackTeam(const AsciiString& unitName, const AsciiSt
 	if (!theSrcUnit) {
 		return;
 	}
-	
+
 	const Team *theTeam = TheScriptEngine->getTeamNamed( teamName );
 	if (!theTeam) {
 		return;
@@ -1369,12 +1379,16 @@ void ScriptActions::doTeamAttackArea(const AsciiString& teamName, const AsciiStr
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	PolygonTrigger *pTrig = TheScriptEngine->getQualifiedTriggerAreaByName(areaName);
 	if (!pTrig) {
@@ -1401,12 +1415,16 @@ void ScriptActions::doTeamAttackNamed(const AsciiString& teamName, const AsciiSt
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupAttackObject(theVictim, NO_MAX_SHOTS_LIMIT, CMD_FROM_SCRIPT);
 }
 
@@ -1424,7 +1442,7 @@ void ScriptActions::doLoadAllTransports(const AsciiString& teamName)
 
 	EntriesVec vecOfUnits;
 	SpacesVec vecOfTransports;
-	
+
 	for (DLINK_ITERATOR<Object> iter = theTeam->iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		Object *obj = iter.cur();
@@ -1432,7 +1450,7 @@ void ScriptActions::doLoadAllTransports(const AsciiString& teamName)
 			continue;
 		}
 
-		if( obj->isKindOf(KINDOF_TRANSPORT) ) 
+		if( obj->isKindOf(KINDOF_TRANSPORT) )
 		{
 			ContainModuleInterface *contain = obj->getContain();
 			if( contain )
@@ -1443,8 +1461,8 @@ void ScriptActions::doLoadAllTransports(const AsciiString& teamName)
 			{
 				DEBUG_CRASH( ("doLoadAllTransports script -- transport doesn't have a container!") );
 			}
-		} 
-		else 
+		}
+		else
 		{
 			vecOfUnits.push_back(std::make_pair(obj->getID(), obj->getTransportSlotCount()));
 		}
@@ -1466,7 +1484,7 @@ void ScriptActions::doLoadAllTransports(const AsciiString& teamName)
 			unit->getAIUpdateInterface()->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 			unit->getAIUpdateInterface()->aiEnter(trans, CMD_FROM_SCRIPT);
 		}
-	}		
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1478,7 +1496,7 @@ void ScriptActions::doNamedEnterNamed(const AsciiString& unitSrcName, const Asci
 	if (!theSrcUnit) {
 		return;
 	}
-	
+
 	Object *theTransport = TheScriptEngine->getUnitNamed( unitDestName );
 	if (!theTransport) {
 		return;
@@ -1502,15 +1520,19 @@ void ScriptActions::doTeamEnterNamed(const AsciiString& teamName, const AsciiStr
 	if (!theSrcTeam) {
 		return;
 	}
-	
+
 	Object *theTransport = TheScriptEngine->getUnitNamed( unitDestName );
 	if (!theTransport) {
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
-	theSrcTeam->getTeamAsAIGroup(theGroup);
+	AIGroupPtr theGroup = TheAI->createGroup();
 
+#if RETAIL_COMPATIBLE_AIGROUP
+	theSrcTeam->getTeamAsAIGroup(theGroup);
+#else
+	theSrcTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupEnter(theTransport, CMD_FROM_SCRIPT);
 }
 
@@ -1544,9 +1566,13 @@ void ScriptActions::doTeamExitAll(const AsciiString& teamName)
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
-	theTeamOfTransports->getTeamAsAIGroup(theGroup);
+	AIGroupPtr theGroup = TheAI->createGroup();
 
+#if RETAIL_COMPATIBLE_AIGROUP
+	theTeamOfTransports->getTeamAsAIGroup(theGroup);
+#else
+	theTeamOfTransports->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupEvacuate( CMD_FROM_SCRIPT );
 }
 
@@ -1570,8 +1596,8 @@ void ScriptActions::doNamedFollowWaypoints(const AsciiString& unitName, const As
 		return;
 	}
 
-	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this.\n"));
-	
+	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this."));
+
 	theUnit->leaveGroup();
 	aiUpdate->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 	aiUpdate->aiFollowWaypointPath(way, CMD_FROM_SCRIPT);
@@ -1597,8 +1623,8 @@ void ScriptActions::doNamedFollowWaypointsExact(const AsciiString& unitName, con
 		return;
 	}
 
-	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this.\n"));
-	
+	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this."));
+
 	theUnit->leaveGroup();
 	aiUpdate->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 	aiUpdate->aiFollowWaypointPathExact(way, CMD_FROM_SCRIPT);
@@ -1614,11 +1640,15 @@ void ScriptActions::doTeamFollowSkirmishApproachPath(const AsciiString& teamName
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	Int count = 0;
 	Coord3D pos;
 	pos.x=pos.y=pos.z=0;
@@ -1658,8 +1688,8 @@ void ScriptActions::doTeamFollowSkirmishApproachPath(const AsciiString& teamName
 		aiPlayer->checkBridges(firstUnit, way);
 	}
 
-	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, pathLabel), ("***Wrong waypoint purpose. Make jba fix this.\n"));
-	if (asTeam) 
+	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, pathLabel), ("***Wrong waypoint purpose. Make jba fix this."));
+	if (asTeam)
 	{
 		theGroup->groupFollowWaypointPathAsTeam(way, CMD_FROM_SCRIPT);
 	}	else {
@@ -1677,11 +1707,15 @@ void ScriptActions::doTeamMoveToSkirmishApproachPath(const AsciiString& teamName
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	Int count = 0;
 	Coord3D pos;
 	pos.x=pos.y=pos.z=0;
@@ -1711,7 +1745,7 @@ void ScriptActions::doTeamMoveToSkirmishApproachPath(const AsciiString& teamName
 	if (!way) {
 		return;
 	}
-	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, pathLabel), ("***Wrong waypoint purpose. Make jba fix this.\n"));
+	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, pathLabel), ("***Wrong waypoint purpose. Make jba fix this."));
 	theGroup->groupMoveToPosition(way->getLocation(), false, CMD_FROM_SCRIPT);
 }
 
@@ -1725,11 +1759,15 @@ void ScriptActions::doTeamFollowWaypoints(const AsciiString& teamName, const Asc
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	Int count = 0;
 	Coord3D pos;
 	pos.x=pos.y=pos.z=0;
@@ -1753,8 +1791,8 @@ void ScriptActions::doTeamFollowWaypoints(const AsciiString& teamName, const Asc
 	if (!way) {
 		return;
 	}
-	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this.\n"));
-	if (asTeam) 
+	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this."));
+	if (asTeam)
 	{
 		theGroup->groupFollowWaypointPathAsTeam(way, CMD_FROM_SCRIPT);
 	}	else {
@@ -1772,11 +1810,15 @@ void ScriptActions::doTeamFollowWaypointsExact(const AsciiString& teamName, cons
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	Int count = 0;
 	Coord3D pos;
 	pos.x=pos.y=pos.z=0;
@@ -1800,8 +1842,8 @@ void ScriptActions::doTeamFollowWaypointsExact(const AsciiString& teamName, cons
 	if (!way) {
 		return;
 	}
-	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this.\n"));
-	if (asTeam) 
+	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this."));
+	if (asTeam)
 	{
 		theGroup->groupFollowWaypointPathAsTeamExact(way, CMD_FROM_SCRIPT);
 	}	else {
@@ -1823,7 +1865,7 @@ void ScriptActions::doNamedGuard(const AsciiString& unitName)
 	if (!aiUpdate) {
 		return;
 	}
-	
+
 	theUnit->leaveGroup();
 	Coord3D position = *theUnit->getPosition();
 	aiUpdate->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
@@ -1858,17 +1900,21 @@ void ScriptActions::doTeamGuard(const AsciiString& teamName)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doTeamGuardPosition(const AsciiString& teamName, const AsciiString& waypointName)
 {
-	Waypoint *way = TheTerrainLogic->getWaypointByName(waypointName); 
+	Waypoint *way = TheTerrainLogic->getWaypointByName(waypointName);
 	Team *theTeam = TheScriptEngine->getTeamNamed( teamName );
 	if (!theTeam || !way) {
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	Coord3D position = *way->getLocation();
 
 	theGroup->groupGuardPosition( &position, GUARDMODE_NORMAL, CMD_FROM_SCRIPT );
@@ -1885,12 +1931,15 @@ void ScriptActions::doTeamGuardObject(const AsciiString& teamName, const AsciiSt
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
-
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupGuardObject( theUnit, GUARDMODE_NORMAL, CMD_FROM_SCRIPT );
 }
 
@@ -1905,12 +1954,15 @@ void ScriptActions::doTeamGuardArea(const AsciiString& teamName, const AsciiStri
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
-
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupGuardArea( pTrig, GUARDMODE_NORMAL, CMD_FROM_SCRIPT );
 }
 
@@ -1943,12 +1995,15 @@ void ScriptActions::doTeamHunt(const AsciiString& teamName)
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
-
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupHunt( CMD_FROM_SCRIPT );
 }
 //-------------------------------------------------------------------------------------------------
@@ -1974,7 +2029,7 @@ void ScriptActions::doTeamHuntWithCommandButton(const AsciiString& teamName, con
 			case GUI_COMMAND_SPECIAL_POWER:
 				if( commandButton->getSpecialPowerTemplate() )
 				{
-					if (BitIsSet( commandButton->getOptions(), COMMAND_OPTION_NEED_OBJECT_TARGET )) 
+					if (BitIsSet( commandButton->getOptions(), COMMAND_OPTION_NEED_OBJECT_TARGET ))
 					{
 						// OK, we can hunt with a power that targets an object.
 						break;
@@ -1991,7 +2046,7 @@ void ScriptActions::doTeamHuntWithCommandButton(const AsciiString& teamName, con
 					// ok, we can hunt with a weapon.
 					break;
 				}
-			
+
 			case GUI_COMMAND_OBJECT_UPGRADE:
 			case GUI_COMMAND_PLAYER_UPGRADE:
 			case GUI_COMMAND_DOZER_CONSTRUCT:
@@ -2083,16 +2138,16 @@ void ScriptActions::doTeamHuntWithCommandButton(const AsciiString& teamName, con
 						msg.concat("' requires CommandButtonHuntUpdate in .ini definition to hunt with ");
 						msg.concat(ability);
 						TheScriptEngine->AppendDebugMessage(msg, false);
-					}  // end if
+					}
 				}
 				break;
-				
+
 		}
-			
+
 	}
 
 }
-								
+
 //-------------------------------------------------------------------------------------------------
 /** doTeamHunt */
 //-------------------------------------------------------------------------------------------------
@@ -2151,7 +2206,7 @@ void ScriptActions::doPlayerDisableFactories(const AsciiString& playerName, cons
 void ScriptActions::doPlayerDisableUnitConstruction(const AsciiString& playerName)
 {
 	Player* pPlayer = TheScriptEngine->getPlayerFromAsciiString(playerName);
- 
+
 	if (!pPlayer) {
 		return;
 	}
@@ -2236,7 +2291,7 @@ void ScriptActions::doBuildTeam(const AsciiString& teamName)
 		if (player) {
 			player->buildSpecificTeam(theTeamProto);
 		}
-	}	
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2250,7 +2305,7 @@ void ScriptActions::doRecruitTeam(const AsciiString& teamName, Real recruitRadiu
 		if (player) {
 			player->recruitSpecificTeam(theTeamProto, recruitRadius);
 		}
-	}	
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2469,7 +2524,7 @@ void ScriptActions::doPlayerKill(const AsciiString& playerName)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doDisplayText(const AsciiString& displayText)
 {
-	TheInGameUI->message(displayText);	
+	TheInGameUI->message(displayText);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2495,13 +2550,12 @@ void ScriptActions::doDisplayCinematicText(const AsciiString& displayText, const
 
 	// get the font name
 	AsciiString fontName = AsciiString::TheEmptyString;
-	char buf[256];
-	char *c;
-	strcpy(buf, fontType.str());
+
 	// TheSuperHackers @fix xezon 22/03/2025 Fixes potential buffer overrun via prior c!='\0' test.
-	for( c = buf; *c != '\0'; c++ )
+	const char* c = fontType.str();
+	for (; *c != '\0'; c++)
 	{
-		if( *c != ' ' && *c++ != '-' ) 
+		if( *c != ' ' && *c++ != '-' )
 			fontName.concat(c);
 		else
 			break;
@@ -2531,7 +2585,7 @@ void ScriptActions::doDisplayCinematicText(const AsciiString& displayText, const
 		bold = TRUE;
 
 	// phew, now set as new font
-	GameFont *font = TheFontLibrary->getFont( fontName, 
+	GameFont *font = TheFontLibrary->getFont( fontName,
 		TheGlobalLanguageData->adjustFontSize(size), bold );
 	TheDisplay->setCinematicFont( font );
 
@@ -2551,6 +2605,7 @@ void ScriptActions::doCameoFlash(const AsciiString& name, Int timeInSeconds)
 	if( button == NULL )
 	{
 		DEBUG_CRASH(( "ScriptActions::doCameoFlash can't find AsciiString cameoflash" ));
+		return;
 	}
 
 	Int frames = LOGICFRAMES_PER_SECOND * timeInSeconds;
@@ -2584,7 +2639,7 @@ void ScriptActions::doNamedCustomColor(const AsciiString& unitName, Color c)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doNamedFlash(const AsciiString& unitName, Int timeInSeconds, const RGBColor *color)
 {
-	/** This is called the first time this unit is told by the script to flash. timeInSeconds will tell the drawable 
+	/** This is called the first time this unit is told by the script to flash. timeInSeconds will tell the drawable
 	how long to flash for.  Sets drawable to start flashing but only allows drawable's update to
 	call the actual flash method */
 
@@ -2675,7 +2730,7 @@ void ScriptActions::doSoundPlayFromNamed(const AsciiString& soundName, const Asc
 	if (!pUnit) {
 		return;
 	}
-	
+
 	AudioEventRTS sfx(soundName, pUnit->getID());
 	sfx.setIsLogicalAudio(true);
 	TheAudio->addAudioEvent(&sfx);
@@ -2685,7 +2740,7 @@ void ScriptActions::doSoundPlayFromNamed(const AsciiString& soundName, const Asc
 /** doSpeechPlay */
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doSpeechPlay(const AsciiString& speechName, Bool allowOverlap)
-{	
+{
 	AudioEventRTS speech(speechName);
 	speech.setIsLogicalAudio(true);
 	speech.setPlayerIndex(ThePlayerList->getLocalPlayer()->getPlayerIndex());
@@ -2704,7 +2759,7 @@ void ScriptActions::doPlayerTransferAssetsToPlayer(const AsciiString& playerSrcN
 	if (!pPlayerDest || !pPlayerSrc) {
 		return;
 	}
-	
+
 	pPlayerDest->transferAssetsFromThat(pPlayerSrc);
 }
 
@@ -2782,12 +2837,12 @@ void ScriptActions::doObjectRadarCreateEvent(const AsciiString& unitName, Int ev
 	Object *theBuilding = TheScriptEngine->getUnitNamed( unitName );
 	if (!theBuilding)
 		return;
-	
+
 	// get building's position
 	const Coord3D *pos = theBuilding->getPosition();
 	if (!pos)
 		return;
-	
+
 	// create event
 	TheRadar->createEvent(pos, (RadarEventType)eventType);
 }
@@ -2803,7 +2858,7 @@ void ScriptActions::doTeamRadarCreateEvent(const AsciiString& teamName, Int even
 		return;
 	if (!theTeam->hasAnyUnits())
 		return;
-	
+
 	// get team's position
 	const Coord3D *pos = theTeam->getEstimateTeamPosition();
 	if (!pos)
@@ -2818,7 +2873,7 @@ void ScriptActions::doTeamRadarCreateEvent(const AsciiString& teamName, Int even
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doRadarDisable(void)
 {
-	TheRadar->hide(true);
+	TheRadar->hide(ThePlayerList->getLocalPlayer()->getPlayerIndex(), true);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2826,7 +2881,7 @@ void ScriptActions::doRadarDisable(void)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doRadarEnable(void)
 {
-	TheRadar->hide(false);
+	TheRadar->hide(ThePlayerList->getLocalPlayer()->getPlayerIndex(), false);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2874,7 +2929,7 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)
 {
 	if (TheTacticalView->setViewFilter(FT_VIEW_MOTION_BLUR_FILTER))
 	{
-		enum FilterModes mode;
+		FilterModes mode;
 		if (saturate) {
 			if (zoomIn) {
 				mode = FM_VIEW_MB_IN_SATURATE;
@@ -2897,15 +2952,23 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)
 
 static PlayerMaskType getHumanPlayerMask( void )
 {
+#if RETAIL_COMPATIBLE_CRC
 	PlayerMaskType mask;
+#else
+	PlayerMaskType mask = 0;
+#endif
 	for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)
 	{
 		const Player *player = ThePlayerList->getNthPlayer(i);
 		if (player->getPlayerType() == PLAYER_HUMAN)
+#if RETAIL_COMPATIBLE_CRC
 			mask &= player->getPlayerMask();
+#else
+			mask |= player->getPlayerMask();
+#endif
 	}
 
-	//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X\n", mask));
+	//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X", mask));
 	return mask;
 }
 
@@ -2964,22 +3027,22 @@ void ScriptActions::doShroudMapAtWaypoint(const AsciiString& waypointName, Real
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doRevealMapEntire(const AsciiString& playerName)
 {
-	DEBUG_LOG(("ScriptActions::doRevealMapEntire() for player named '%s'\n", playerName.str()));
+	DEBUG_LOG(("ScriptActions::doRevealMapEntire() for player named '%s'", playerName.str()));
 	Player* player = TheScriptEngine->getPlayerFromAsciiString(playerName);
 	if (player && playerName.isNotEmpty())
 	{
-		DEBUG_LOG(("ScriptActions::doRevealMapEntire() for player named '%ls' in position %d\n", player->getPlayerDisplayName().str(), player->getPlayerIndex()));
+		DEBUG_LOG(("ScriptActions::doRevealMapEntire() for player named '%ls' in position %d", player->getPlayerDisplayName().str(), player->getPlayerIndex()));
 		ThePartitionManager->revealMapForPlayer( player->getPlayerIndex() );
 	}
 	else
 	{
-		DEBUG_LOG(("ScriptActions::doRevealMapEntire() - no player, so doing all human players\n"));
+		DEBUG_LOG(("ScriptActions::doRevealMapEntire() - no player, so doing all human players"));
 		for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)
 		{
 			Player *player = ThePlayerList->getNthPlayer(i);
 			if (player->getPlayerType() == PLAYER_HUMAN)
 			{
-				DEBUG_LOG(("ScriptActions::doRevealMapEntire() for player %d\n", i));
+				DEBUG_LOG(("ScriptActions::doRevealMapEntire() for player %d", i));
 				ThePartitionManager->revealMapForPlayer( i );
 			}
 		}
@@ -3003,7 +3066,7 @@ void ScriptActions::doRevealMapEntirePermanently( Bool reveal, const AsciiString
 			Player *player = ThePlayerList->getNthPlayer(i);
 			if (player->getPlayerType() == PLAYER_HUMAN)
 			{
-				DEBUG_LOG(("ScriptActions::doRevealMapEntirePermanently() for player %d\n", i));
+				DEBUG_LOG(("ScriptActions::doRevealMapEntirePermanently() for player %d", i));
 				if( reveal )
 					ThePartitionManager->revealMapForPlayerPermanently( i );
 				else
@@ -3030,7 +3093,7 @@ void ScriptActions::doShroudMapEntire(const AsciiString& playerName)
 			Player *player = ThePlayerList->getNthPlayer(i);
 			if (player->getPlayerType() == PLAYER_HUMAN)
 			{
-				DEBUG_LOG(("ScriptActions::doShroudMapEntire() for player %d\n", i));
+				DEBUG_LOG(("ScriptActions::doShroudMapEntire() for player %d", i));
 				ThePartitionManager->shroudMapForPlayer( i );
 			}
 		}
@@ -3073,7 +3136,7 @@ void ScriptActions::doMergeTeamIntoTeam(const AsciiString& teamSrcName, const As
 	}
 
 //	Bool done = FALSE;
-	
+
 	DLINK_ITERATOR<Object> iter = teamSrc->iterate_TeamMemberList();
 	Object *nextObj = iter.cur();
 
@@ -3104,7 +3167,7 @@ void ScriptActions::doMergeTeamIntoTeam(const AsciiString& teamSrcName, const As
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doDisableInput()
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (!TheGlobalData->m_disableScriptedInputDisabling)
 #endif
 	{
@@ -3155,7 +3218,7 @@ void ScriptActions::doIdleAllPlayerUnits(const AsciiString& playerName)
 			Player *player = ThePlayerList->getNthPlayer(i);
 			if (player->getPlayerType() == PLAYER_HUMAN)
 			{
-				DEBUG_LOG(("ScriptActions::doIdleAllPlayerUnits() for player %d\n", i));
+				DEBUG_LOG(("ScriptActions::doIdleAllPlayerUnits() for player %d", i));
 				player->setUnitsShouldIdleOrResume(true);
 			}
 		}
@@ -3179,7 +3242,7 @@ void ScriptActions::doResumeSupplyTruckingForIdleUnits(const AsciiString& player
 			Player *player = ThePlayerList->getNthPlayer(i);
 			if (player->getPlayerType() == PLAYER_HUMAN)
 			{
-				DEBUG_LOG(("ScriptActions::doResumeSupplyTruckingForIdleUnits() for player %d\n", i));
+				DEBUG_LOG(("ScriptActions::doResumeSupplyTruckingForIdleUnits() for player %d", i));
 				player->setUnitsShouldIdleOrResume(false);
 			}
 		}
@@ -3236,17 +3299,20 @@ void ScriptActions::doTeamGarrisonSpecificBuilding(const AsciiString& teamName,
 	}
 	PlayerMaskType player = theBuilding->getContain()->getPlayerWhoEntered();
 
-	if (!(theBuilding->isKindOf(KINDOF_STRUCTURE) && 
+	if (!(theBuilding->isKindOf(KINDOF_STRUCTURE) &&
 		(player == 0) || (player == theTeam->getControllingPlayer()->getPlayerMask()))) {
 		return;
 	}
-	
-	AIGroup* theGroup = TheAI->createGroup();
+
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
-	
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupEnter(theBuilding, CMD_FROM_SCRIPT);
 }
 
@@ -3256,18 +3322,18 @@ void ScriptActions::doTeamGarrisonSpecificBuilding(const AsciiString& teamName,
 void ScriptActions::doExitSpecificBuilding(const AsciiString& buildingName)
 {
 	Object *theBuilding = TheScriptEngine->getUnitNamed(buildingName);
-	if (!theBuilding) 
+	if (!theBuilding)
 	{
 		return;
 	}
-	
-	if (!theBuilding->isKindOf(KINDOF_STRUCTURE)) 
+
+	if (!theBuilding->isKindOf(KINDOF_STRUCTURE))
 	{
 		return;
 	}
 
 	AIUpdateInterface *ai = theBuilding->getAIUpdateInterface();
-	if (ai) 
+	if (ai)
 	{
 		ai->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 		ai->aiEvacuate( FALSE, CMD_FROM_SCRIPT );
@@ -3275,7 +3341,7 @@ void ScriptActions::doExitSpecificBuilding(const AsciiString& buildingName)
 	}
 
 	ContainModuleInterface *contain = theBuilding->getContain();
-	if (contain) 
+	if (contain)
 	{
 		contain->removeAllContained( FALSE );
 	}
@@ -3290,7 +3356,7 @@ void ScriptActions::doTeamGarrisonNearestBuilding(const AsciiString& teamName)
 	if (!theTeam) {
 		return;
 	}
-	
+
 	DLINK_ITERATOR<Object> diter = theTeam->iterate_TeamMemberList();
 	Object *leader = diter.cur();
 	if (!leader) {
@@ -3304,10 +3370,10 @@ void ScriptActions::doTeamGarrisonNearestBuilding(const AsciiString& teamName)
 	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(leader, REALLY_FAR, FROM_CENTER_3D, filters, ITER_SORTED_NEAR_TO_FAR);
 	MemoryPoolObjectHolder hold(iter);
 
-	
-	// here's what we do. Find out how many slots each building has open, and tell each unit individually to 
+
+	// here's what we do. Find out how many slots each building has open, and tell each unit individually to
 	// garrison a specific building. We won't use the partition solver because we've already done most of the work
-	
+
 	for (Object *theBuilding = iter->first(); theBuilding; theBuilding = iter->next()) {
 		ContainModuleInterface *cmi = theBuilding->getContain();
 		if (!cmi) {
@@ -3340,7 +3406,7 @@ void ScriptActions::doTeamExitAllBuildings(const AsciiString& teamName)
 	if (!theTeam) {
 		return;
 	}
-		
+
 	for (DLINK_ITERATOR<Object> iter = theTeam->iterate_TeamMemberList(); !iter.done(); iter.advance()) {
 		Object *obj = iter.cur();
 		if (!obj) {
@@ -3380,7 +3446,7 @@ void ScriptActions::doUnitGarrisonSpecificBuilding(const AsciiString& unitName,
 	}
 	PlayerMaskType player = theBuilding->getContain()->getPlayerWhoEntered();
 
-	if (!(theBuilding->isKindOf(KINDOF_STRUCTURE) && 
+	if (!(theBuilding->isKindOf(KINDOF_STRUCTURE) &&
 		(player == 0) || (player == theUnit->getControllingPlayer()->getPlayerMask()))) {
 		return;
 	}
@@ -3415,7 +3481,7 @@ void ScriptActions::doUnitGarrisonNearestBuilding(const AsciiString& unitName)
 	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(theUnit, REALLY_FAR, FROM_CENTER_3D, filters, ITER_SORTED_NEAR_TO_FAR);
 	MemoryPoolObjectHolder hold(iter);
 
-	for (Object *theBuilding = iter->first(); theBuilding; theBuilding = iter->next()) 
+	for (Object *theBuilding = iter->first(); theBuilding; theBuilding = iter->next())
 	{
 		ContainModuleInterface *contain = theBuilding->getContain();
 		if( !contain )
@@ -3452,15 +3518,15 @@ void ScriptActions::doNamedEnableStealth( const AsciiString& unitName, Bool enab
 void ScriptActions::doTeamEnableStealth( const AsciiString& teamName, Bool enabled )
 {
 	Team *team = TheScriptEngine->getTeamNamed( teamName );
-	if( !team ) 
+	if( !team )
 	{
 		return;
 	}
-		
+
 	for( DLINK_ITERATOR<Object> iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance() )
 	{
 		Object *obj = iter.cur();
-		if( obj ) 
+		if( obj )
 		{
 			obj->setScriptStatus( OBJECT_STATUS_SCRIPT_UNSTEALTHED, !enabled );
 		}
@@ -3492,12 +3558,12 @@ void ScriptActions::doUnitExitBuilding(const AsciiString& unitName)
 void ScriptActions::doPlayerGarrisonAllBuildings(const AsciiString& playerName)
 {
 	Player* player = TheScriptEngine->getPlayerFromAsciiString(playerName);
-	
+
 	if (!player) {
 		return;
 	}
 
-	player->garrisonAllUnits(CMD_FROM_SCRIPT);	
+	player->garrisonAllUnits(CMD_FROM_SCRIPT);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -3506,7 +3572,7 @@ void ScriptActions::doPlayerGarrisonAllBuildings(const AsciiString& playerName)
 void ScriptActions::doPlayerExitAllBuildings(const AsciiString& playerName)
 {
 	Player* player = TheScriptEngine->getPlayerFromAsciiString(playerName);
-	
+
 	if (!player) {
 		return;
 	}
@@ -3589,7 +3655,7 @@ void ScriptActions::doUnfreezeTime(void)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doMilitaryCaption(const AsciiString& briefing, Int duration)
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_disableMilitaryCaption)
 		duration = 1;
 #endif
@@ -3622,7 +3688,7 @@ void ScriptActions::doSetStoppingDistance(const AsciiString& team, Real stopping
 			if (!aiUpdate || !aiUpdate->getCurLocomotor()) {
 				return;
 			}
-			
+
 			if (stoppingDistance >= 0.5f)
 			{
 				aiUpdate->getCurLocomotor()->setCloseEnoughDist(stoppingDistance);
@@ -3637,7 +3703,7 @@ void ScriptActions::doSetStoppingDistance(const AsciiString& team, Real stopping
 void ScriptActions::doNamedSetHeld(const AsciiString& unit, Bool held)
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
-	if (theObj) 
+	if (theObj)
 	{
 		theObj->setDisabledUntil( DISABLED_HELD, held ? FOREVER : NEVER );
 	}
@@ -3649,13 +3715,13 @@ void ScriptActions::doNamedSetHeld(const AsciiString& unit, Bool held)
 void ScriptActions::doNamedSetStoppingDistance(const AsciiString& unit, Real stoppingDistance)
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
-	if (theObj) 
+	if (theObj)
 	{
 		AIUpdateInterface *aiUpdate = theObj->getAIUpdateInterface();
 		if (!aiUpdate || !aiUpdate->getCurLocomotor()) {
 			return;
 		}
-		
+
 		if (stoppingDistance >= 0.5f)
 		{
 			aiUpdate->getCurLocomotor()->setCloseEnoughDist(stoppingDistance);
@@ -3752,7 +3818,7 @@ void ScriptActions::doSetMoney(const AsciiString& playerName, Int money)
 		return;
 
 	m->withdraw(m->countMoney());
-	m->deposit(money);
+	m->deposit(money, FALSE, FALSE);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -3909,17 +3975,17 @@ void ScriptActions::doSkirmishFireSpecialPowerAtMostCost( const AsciiString &pla
 	enemyNdx = enemyPlayer->getPlayerIndex();
 
 	const SpecialPowerTemplate *power = TheSpecialPowerStore->findSpecialPowerTemplate(specialPower);
-	if (power==NULL) 
+	if (power==NULL)
 		return;
 	Real radius = 50.0f;
 	if (power->getRadiusCursorRadius()>radius) {
 		radius = power->getRadiusCursorRadius();
 	}
-	
+
 	Player::PlayerTeamList::const_iterator it;
-	
+
 	Player *pPlayer = TheScriptEngine->getPlayerFromAsciiString(player);
-	if (pPlayer==NULL) 
+	if (pPlayer==NULL)
 		return;
 
 	Coord3D location;
@@ -3966,7 +4032,7 @@ void ScriptActions::doNamedFireSpecialPowerAtNamed( const AsciiString& unit, con
 void ScriptActions::doNamedUseCommandButtonAbility( const AsciiString& unit, const AsciiString& ability )
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
-	
+
 	//Sanity check
 	if( !theObj )
 	{
@@ -4000,7 +4066,7 @@ void ScriptActions::doNamedUseCommandButtonAbilityOnNamed( const AsciiString& un
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
 	Object *theTarget = TheScriptEngine->getUnitNamed( target );
-	
+
 	//Sanity check
 	if( !theObj || !theTarget )
 	{
@@ -4034,7 +4100,7 @@ void ScriptActions::doNamedUseCommandButtonAbilityAtWaypoint( const AsciiString&
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
 	Waypoint *pWaypoint = TheTerrainLogic->getWaypointByName( waypoint );
-	
+
 	//Sanity check
 	if( !theObj || !pWaypoint )
 	{
@@ -4069,7 +4135,7 @@ void ScriptActions::doTeamUseCommandButtonAbility( const AsciiString& team, cons
 	Team *theTeam = TheScriptEngine->getTeamNamed( team );
 	// The team is the team based on the name, and the calling team (if any) and the team that
 	// triggered the condition.  jba. :)
-	if( !theTeam ) 
+	if( !theTeam )
 	{
 		return;
 	}
@@ -4081,14 +4147,17 @@ void ScriptActions::doTeamUseCommandButtonAbility( const AsciiString& team, cons
 	}
 
 
-	AIGroup* theGroup = TheAI->createGroup();
-	if( !theGroup ) 
+	AIGroupPtr theGroup = TheAI->createGroup();
+	if( !theGroup )
 	{
 		return;
 	}
 
-	theTeam->getTeamAsAIGroup( theGroup );
-	
+#if RETAIL_COMPATIBLE_AIGROUP
+	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupDoCommandButton( commandButton, CMD_FROM_SCRIPT );
 }
 
@@ -4098,7 +4167,7 @@ void ScriptActions::doTeamUseCommandButtonAbilityOnNamed( const AsciiString& tea
 	Team *theTeam = TheScriptEngine->getTeamNamed( team );
 	// The team is the team based on the name, and the calling team (if any) and the team that
 	// triggered the condition.  jba. :)
-	if( !theTeam ) 
+	if( !theTeam )
 	{
 		return;
 	}
@@ -4116,14 +4185,17 @@ void ScriptActions::doTeamUseCommandButtonAbilityOnNamed( const AsciiString& tea
 	}
 
 
-	AIGroup* theGroup = TheAI->createGroup();
-	if( !theGroup ) 
+	AIGroupPtr theGroup = TheAI->createGroup();
+	if( !theGroup )
 	{
 		return;
 	}
 
-	theTeam->getTeamAsAIGroup( theGroup );
-	
+#if RETAIL_COMPATIBLE_AIGROUP
+	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupDoCommandButtonAtObject( commandButton, theObj, CMD_FROM_SCRIPT );
 }
 
@@ -4133,7 +4205,7 @@ void ScriptActions::doTeamUseCommandButtonAbilityAtWaypoint( const AsciiString&
 	Team *theTeam = TheScriptEngine->getTeamNamed( team );
 	// The team is the team based on the name, and the calling team (if any) and the team that
 	// triggered the condition.  jba. :)
-	if( !theTeam ) 
+	if( !theTeam )
 	{
 		return;
 	}
@@ -4151,18 +4223,21 @@ void ScriptActions::doTeamUseCommandButtonAbilityAtWaypoint( const AsciiString&
 	}
 
 
-	AIGroup* theGroup = TheAI->createGroup();
-	if( !theGroup ) 
+	AIGroupPtr theGroup = TheAI->createGroup();
+	if( !theGroup )
 	{
 		return;
 	}
 
-	theTeam->getTeamAsAIGroup( theGroup );
-	
+#if RETAIL_COMPATIBLE_AIGROUP
+	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupDoCommandButtonAtPosition( commandButton, pWaypoint->getLocation(), CMD_FROM_SCRIPT );
 }
 
-		
+
 
 
 
@@ -4181,8 +4256,8 @@ void ScriptActions::doRadarRefresh( void )
 void ScriptActions::doCameraTetherNamed(const AsciiString& unit, Bool snapToUnit, Real play)
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
-	if (theObj) 
-	{	
+	if (theObj)
+	{
 		TheTacticalView->setCameraLock(theObj->getID());
 		if (snapToUnit)
 			TheTacticalView->snapToCameraLock();
@@ -4235,17 +4310,20 @@ void ScriptActions::doTeamStop(const AsciiString& teamName, Bool shouldDisband)
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
-
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupIdle(CMD_FROM_SCRIPT);
 
 	if (shouldDisband) {
 		Team *playerDefaultTeam = theTeam->getControllingPlayer()->getDefaultTeam();
-		
+
 		for (DLINK_ITERATOR<Object> iter = theTeam->iterate_TeamMemberList(); !iter.done(); iter.advance()) {
 			Object *obj = iter.cur();
 
@@ -4364,7 +4442,7 @@ void ScriptActions::doUnitStartSequentialScript(const AsciiString& unitName, con
 	seqScript->m_objectID = obj->getID();
 	seqScript->m_scriptToExecuteSequentially = script;
 	seqScript->m_timesToLoop = loopVal;
-	
+
 	TheScriptEngine->appendSequentialScript(seqScript);
 
 	deleteInstance(seqScript);
@@ -4394,11 +4472,11 @@ void ScriptActions::doNamedFireWeaponFollowingWaypointPath( const AsciiString& u
 {
 	//Get the unit... if it fails, abort.
 	Object *theUnit = TheScriptEngine->getUnitNamed( unit );
-	if( !theUnit ) 
+	if( !theUnit )
 	{
 		return;
 	}
-	
+
 	Coord3D pos = *theUnit->getPosition();
 
 
@@ -4424,8 +4502,8 @@ void ScriptActions::doNamedFireWeaponFollowingWaypointPath( const AsciiString& u
 		{
 			return;
 		}
-		DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPath), ("***Wrong waypoint purpose. Make jba fix this.\n"));
-		
+		DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPath), ("***Wrong waypoint purpose. Make jba fix this."));
+
 		projectile->leaveGroup();
 		aiUpdate->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 		aiUpdate->aiFollowWaypointPath(way, CMD_FROM_SCRIPT);
@@ -4448,12 +4526,15 @@ void ScriptActions::doTeamStartSequentialScript(const AsciiString& teamName, con
 	}
 
 	// Idle the team so the seq script will start executing. jba.
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
-
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupIdle(CMD_FROM_SCRIPT);
 
 
@@ -4461,7 +4542,7 @@ void ScriptActions::doTeamStartSequentialScript(const AsciiString& teamName, con
 	seqScript->m_teamToExecOn = team;
 	seqScript->m_scriptToExecuteSequentially = script;
 	seqScript->m_timesToLoop = loopVal;
-	
+
 	TheScriptEngine->appendSequentialScript(seqScript);
 
 	deleteInstance(seqScript);
@@ -4555,12 +4636,15 @@ void ScriptActions::doTeamIdleForFramecount(const AsciiString& teamName, Int fra
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
-
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	Coord3D center;
 	theGroup->getCenter(&center);
 
@@ -4625,7 +4709,7 @@ void ScriptActions::doBorderSwitch(Int borderToUse)
 	{
 		ThePartitionManager->revealMapForPlayerPermanently( observerPlayerIndex );
 	}
-	
+
 	ThePartitionManager->refreshShroudForLocalPlayer();
 }
 
@@ -4635,7 +4719,7 @@ void ScriptActions::doBorderSwitch(Int borderToUse)
 void ScriptActions::doForceObjectSelection(const AsciiString& teamName, const AsciiString& objectType, Bool centerInView, const AsciiString& audioToPlay)
 {
 	Team *team = TheScriptEngine->getTeamNamed(teamName);
-	
+
 	if (!team) {
 		return;
 	}
@@ -4647,14 +4731,14 @@ void ScriptActions::doForceObjectSelection(const AsciiString& teamName, const As
 		if (!obj) {
 			continue;
 		}
-		
+
 		if (obj->getTemplate() && obj->getTemplate()->getName() == objectType) {
 			if (bestGuess == NULL || obj->getID() < bestGuess->getID()) { // lower ID means its newer
-				bestGuess = obj;				
+				bestGuess = obj;
 			}
 		}
 	}
-	
+
 	if (!(bestGuess && bestGuess->getDrawable())) {
 		return;
 	}
@@ -4691,7 +4775,7 @@ void ScriptActions::doDestroyAllContained(const AsciiString& unitName, Int damag
 	}
 
 	ContainModuleInterface *cmi = obj->getContain();
-	if( !cmi || cmi->getContainCount() == 0 ) 
+	if( !cmi || cmi->getContainCount() == 0 )
 	{
 		return;
 	}
@@ -4704,7 +4788,7 @@ void ScriptActions::doDestroyAllContained(const AsciiString& unitName, Int damag
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doRadarForceEnable(void)
 {
-	TheRadar->forceOn(true);
+	TheRadar->forceOn(ThePlayerList->getLocalPlayer()->getPlayerIndex(), true);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4712,7 +4796,7 @@ void ScriptActions::doRadarForceEnable(void)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doRadarRevertNormal(void)
 {
-	TheRadar->forceOn(false);
+	TheRadar->forceOn(ThePlayerList->getLocalPlayer()->getPlayerIndex(), false);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4731,7 +4815,7 @@ void ScriptActions::doScreenShake( UnsignedInt intensity )
 void ScriptActions::doModifyBuildableStatus( const AsciiString& objectType, Int buildableStatus )
 {
 	const ThingTemplate *templ = TheThingFactory->findTemplate(objectType);
-	if (!templ) 
+	if (!templ)
 	{
 		return;
 	}
@@ -4757,7 +4841,7 @@ static CaveInterface* findCave(Object* obj)
 void ScriptActions::doSetCaveIndex( const AsciiString& caveName, Int caveIndex )
 {
 	Object *obj = TheScriptEngine->getUnitNamed(caveName);
-	if (!obj) 
+	if (!obj)
 	{
 		return;
 	}
@@ -4775,7 +4859,7 @@ void ScriptActions::doSetCaveIndex( const AsciiString& caveName, Int caveIndex )
 void ScriptActions::doSetWarehouseValue( const AsciiString& warehouseName, Int cashValue )
 {
 	Object *obj = TheScriptEngine->getUnitNamed(warehouseName);
-	if (!obj) 
+	if (!obj)
 	{
 		return;
 	}
@@ -4799,7 +4883,7 @@ void ScriptActions::doSoundEnableType( const AsciiString& soundEventName, Bool e
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doSoundRemoveAllDisabled()
 {
-	TheAudio->removeDisabledEvents(); 
+	TheAudio->removeDisabledEvents();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4838,8 +4922,8 @@ void ScriptActions::doMoveUnitTowardsNearest( const AsciiString& unitName, const
 	if (!ai) {
 		return;
 	}
-	
-	const ThingTemplate *templ = TheThingFactory->findTemplate(objectType);
+
+	const ThingTemplate *templ = TheThingFactory->findTemplate(objectType, FALSE);
 	if (!templ) {
 		return;
 	}
@@ -4859,7 +4943,7 @@ void ScriptActions::doMoveUnitTowardsNearest( const AsciiString& unitName, const
 	if (!dest) {
 		return;
 	}
-	
+
 	ai->chooseLocomotorSet( LOCOMOTORSET_NORMAL );
 	ai->aiMoveToObject(dest, CMD_FROM_SCRIPT);
 }
@@ -4873,8 +4957,8 @@ void ScriptActions::doMoveTeamTowardsNearest( const AsciiString& teamName, const
 	if (!team) {
 		return;
 	}
-	
-	const ThingTemplate *templ = TheThingFactory->findTemplate(objectType);
+
+	const ThingTemplate *templ = TheThingFactory->findTemplate(objectType, FALSE);
 	if (!templ) {
 		return;
 	}
@@ -4900,12 +4984,12 @@ void ScriptActions::doMoveTeamTowardsNearest( const AsciiString& teamName, const
 		PartitionFilterSameMapStatus filterMapStatus(obj);
 
 		PartitionFilter *filters[] = { &thingsToAccept, &acceptWithin, &filterMapStatus, NULL };
-		
+
 		Object *dest = ThePartitionManager->getClosestObject(obj->getPosition(), REALLY_FAR, FROM_CENTER_2D, filters);
 		if (!dest) {
 			return;
 		}
-		
+
 		ai->chooseLocomotorSet( LOCOMOTORSET_NORMAL );
 		ai->aiMoveToObject(dest, CMD_FROM_SCRIPT);
 	}
@@ -4941,8 +5025,12 @@ void ScriptActions::doSkirmishAttackNearestGroupWithValue( const AsciiString& te
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	Player *player = team->getControllingPlayer();
 
@@ -4953,7 +5041,7 @@ void ScriptActions::doSkirmishAttackNearestGroupWithValue( const AsciiString& te
 	Coord3D groupLoc;
 	theGroup->getCenter(&groupLoc);
 	if (comparison == Parameter::GREATER_EQUAL || comparison == Parameter::GREATER) {
-		ThePartitionManager->getNearestGroupWithValue(player->getPlayerIndex(), ALLOW_ENEMIES, VOT_CashValue, 
+		ThePartitionManager->getNearestGroupWithValue(player->getPlayerIndex(), ALLOW_ENEMIES, VOT_CashValue,
 			&groupLoc, value, true, &loc);
 	}
 
@@ -4970,8 +5058,12 @@ void ScriptActions::doSkirmishCommandButtonOnMostValuable( const AsciiString& te
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	Player *player = team->getControllingPlayer();
 	if (!player)
@@ -5033,8 +5125,12 @@ void ScriptActions::doTeamUseCommandButtonOnNamed( const AsciiString& teamName,
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if(!commandButton) {
@@ -5072,8 +5168,12 @@ void ScriptActions::doTeamUseCommandButtonOnNearestEnemy( const AsciiString& tea
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if(!commandButton) {
@@ -5118,8 +5218,12 @@ void ScriptActions::doTeamUseCommandButtonOnNearestGarrisonedBuilding( const Asc
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if(!commandButton) {
@@ -5166,8 +5270,12 @@ void ScriptActions::doTeamUseCommandButtonOnNearestKindof( const AsciiString& te
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if (!commandButton) {
@@ -5213,8 +5321,12 @@ void ScriptActions::doTeamUseCommandButtonOnNearestBuilding( const AsciiString&
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if (!commandButton) {
@@ -5260,8 +5372,12 @@ void ScriptActions::doTeamUseCommandButtonOnNearestBuildingClass( const AsciiStr
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if (!commandButton) {
@@ -5308,8 +5424,12 @@ void ScriptActions::doTeamUseCommandButtonOnNearestObjectType( const AsciiString
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if (!commandButton) {
@@ -5327,7 +5447,7 @@ void ScriptActions::doTeamUseCommandButtonOnNearestObjectType( const AsciiString
 		return;
 	}
 
-	const ThingTemplate *thingTemplate = TheThingFactory->findTemplate(objectType);
+	const ThingTemplate *thingTemplate = TheThingFactory->findTemplate(objectType, FALSE);
 	if (!thingTemplate) {
 		return;
 	}
@@ -5370,18 +5490,18 @@ void ScriptActions::doTeamPartialUseCommandButton( Real percentage, const AsciiS
 
 	for (iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance()) {
 		Object *obj = iter.cur();
-		if (commandButton->isValidToUseOn(obj, NULL, NULL, CMD_FROM_SCRIPT)) {	
+		if (commandButton->isValidToUseOn(obj, NULL, NULL, CMD_FROM_SCRIPT)) {
 			objList.push_back(obj);
 		}
 	}
-	
+
 	Int numObjs = REAL_TO_INT_CEIL(percentage / 100.0f * objList.size());
 	Int count = 0;
 	for (std::vector<Object*>::const_iterator it = objList.begin(); it != objList.end(); ++it)
 	{
 		Object *obj = (*it);
 
-		if (count >= numObjs) 
+		if (count >= numObjs)
 			return;
 
 		obj->doCommandButton(commandButton, CMD_FROM_SCRIPT);
@@ -5399,8 +5519,12 @@ void ScriptActions::doTeamCaptureNearestUnownedFactionUnit( const AsciiString& t
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	PartitionFilterPlayerAffiliation f1(team->getControllingPlayer(), ALLOW_ENEMIES | ALLOW_NEUTRAL, true);
 	PartitionFilterUnmannedObject f2(true);
@@ -5510,18 +5634,22 @@ void ScriptActions::doPlayerSetScienceAvailability( const AsciiString& playerNam
 void ScriptActions::doTeamEmoticon(const AsciiString& teamName, const AsciiString& emoticonName, Real duration)
 {
 	Team *theTeam = TheScriptEngine->getTeamNamed( teamName );
-	if( !theTeam ) 
+	if( !theTeam )
 	{
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
-	if( !theGroup ) 
+	AIGroupPtr theGroup = TheAI->createGroup();
+	if( !theGroup )
 	{
 		return;
 	}
-	theTeam->getTeamAsAIGroup( theGroup );
-	
+#if RETAIL_COMPATIBLE_AIGROUP
+	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
+
 	Int frames = (Int)( duration * LOGICFRAMES_PER_SECOND );
 	theGroup->groupSetEmoticon( emoticonName, frames );
 }
@@ -5542,7 +5670,7 @@ void ScriptActions::doNamedEmoticon(const AsciiString& unitName, const AsciiStri
 }
 
 //-------------------------------------------------------------------------------------------------
-// if addObject, we're adding an object to a list. If not addObject, we're removing the associated 
+// if addObject, we're adding an object to a list. If not addObject, we're removing the associated
 // object.
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doObjectTypeListMaintenance(const AsciiString& objectList, const AsciiString& objectType, Bool addObject)
@@ -5608,7 +5736,7 @@ void ScriptActions::doOverrideHulkLifetime( Real seconds )
 void ScriptActions::doNamedFaceNamed( const AsciiString &unitName, const AsciiString &faceUnitName )
 {
 	Object *obj = TheScriptEngine->getUnitNamed( unitName );
-	if( obj ) 
+	if( obj )
 	{
 		Object *faceObj = TheScriptEngine->getUnitNamed( faceUnitName );
 		if( faceObj )
@@ -5629,7 +5757,7 @@ void ScriptActions::doNamedFaceNamed( const AsciiString &unitName, const AsciiSt
 void ScriptActions::doNamedFaceWaypoint( const AsciiString &unitName, const AsciiString &faceWaypointName )
 {
 	Object *obj = TheScriptEngine->getUnitNamed( unitName );
-	if( obj ) 
+	if( obj )
 	{
 		Waypoint *way = TheTerrainLogic->getWaypointByName( faceWaypointName );
 		if( way )
@@ -5789,15 +5917,15 @@ void ScriptActions::doRemoveCommandBarButton(const AsciiString& buttonName, cons
 	}
 
 	Int slotNum = -1;
-	for (Int i = 0; i < MAX_COMMANDS_PER_SET; ++i) 
+	for (Int i = 0; i < MAX_COMMANDS_PER_SET; ++i)
 	{
-		if (cs->getCommandButton(i) && (cs->getCommandButton(i)->getName() == buttonName)) 
+		if (cs->getCommandButton(i) && (cs->getCommandButton(i)->getName() == buttonName))
 		{
 			slotNum = i;
 			break;
 		}
 	}
-	
+
 	if (slotNum >= 0)
 	{
 		TheGameLogic->setControlBarOverride(templ->friend_getCommandSetString(), slotNum, NULL);
@@ -5838,7 +5966,7 @@ void ScriptActions::doAffectSkillPointsModifier(const AsciiString& playerName, R
 	}
 
 	playerDst->setSkillPointsModifier(newModifier);
-		
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -5888,86 +6016,86 @@ void ScriptActions::doChooseVictimAlwaysUsesNormal(Bool enable)
 void ScriptActions::executeAction( ScriptAction *pAction )
 {
 	switch (pAction->getActionType()) {
-		default: 
+		default:
 			DEBUG_CRASH(("Unknown ScriptAction type %d", pAction->getActionType())); return;
-		case ScriptAction::DEBUG_MESSAGE_BOX: 
+		case ScriptAction::DEBUG_MESSAGE_BOX:
 			doDebugMessage(pAction->getParameter(0)->getString(), true);
 			return;
-		case ScriptAction::DEBUG_STRING: 
+		case ScriptAction::DEBUG_STRING:
 			doDebugMessage(pAction->getParameter(0)->getString(), false);
 			return;
-		case ScriptAction::DAMAGE_MEMBERS_OF_TEAM: 
+		case ScriptAction::DAMAGE_MEMBERS_OF_TEAM:
 			doDamageTeamMembers(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal());
 			return;
-		case ScriptAction::MOVE_TEAM_TO: 
+		case ScriptAction::MOVE_TEAM_TO:
 			doMoveToWaypoint(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::MOVE_NAMED_UNIT_TO: 
+		case ScriptAction::MOVE_NAMED_UNIT_TO:
 			doNamedMoveToWaypoint(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::TEAM_SET_STATE: 
+		case ScriptAction::TEAM_SET_STATE:
 			doSetTeamState(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::TEAM_FOLLOW_WAYPOINTS: 
-			doTeamFollowWaypoints(pAction->getParameter(0)->getString(), 
-				pAction->getParameter(1)->getString(), 
+		case ScriptAction::TEAM_FOLLOW_WAYPOINTS:
+			doTeamFollowWaypoints(pAction->getParameter(0)->getString(),
+				pAction->getParameter(1)->getString(),
 				pAction->getParameter(2)->getInt());
 			return;
-		case ScriptAction::TEAM_FOLLOW_WAYPOINTS_EXACT: 
-			doTeamFollowWaypointsExact(pAction->getParameter(0)->getString(), 
-				pAction->getParameter(1)->getString(), 
+		case ScriptAction::TEAM_FOLLOW_WAYPOINTS_EXACT:
+			doTeamFollowWaypointsExact(pAction->getParameter(0)->getString(),
+				pAction->getParameter(1)->getString(),
 				pAction->getParameter(2)->getInt());
 			return;
-		case ScriptAction::NAMED_FOLLOW_WAYPOINTS_EXACT: 
-			doNamedFollowWaypointsExact(pAction->getParameter(0)->getString(), 
+		case ScriptAction::NAMED_FOLLOW_WAYPOINTS_EXACT:
+			doNamedFollowWaypointsExact(pAction->getParameter(0)->getString(),
 				pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::SKIRMISH_FOLLOW_APPROACH_PATH: 
-			doTeamFollowSkirmishApproachPath(pAction->getParameter(0)->getString(), 
-				pAction->getParameter(1)->getString(), 
+		case ScriptAction::SKIRMISH_FOLLOW_APPROACH_PATH:
+			doTeamFollowSkirmishApproachPath(pAction->getParameter(0)->getString(),
+				pAction->getParameter(1)->getString(),
 				pAction->getParameter(2)->getInt());
 			return;
-		case ScriptAction::SKIRMISH_MOVE_TO_APPROACH_PATH: 
-			doTeamMoveToSkirmishApproachPath(pAction->getParameter(0)->getString(), 
+		case ScriptAction::SKIRMISH_MOVE_TO_APPROACH_PATH:
+			doTeamMoveToSkirmishApproachPath(pAction->getParameter(0)->getString(),
 				pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::CREATE_REINFORCEMENT_TEAM: 
+		case ScriptAction::CREATE_REINFORCEMENT_TEAM:
 			doCreateReinforcements(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::SKIRMISH_BUILD_BUILDING: 
+		case ScriptAction::SKIRMISH_BUILD_BUILDING:
 			doBuildBuilding(pAction->getParameter(0)->getString());
 			return;
-		case ScriptAction::AI_PLAYER_BUILD_SUPPLY_CENTER: 
+		case ScriptAction::AI_PLAYER_BUILD_SUPPLY_CENTER:
 			doBuildSupplyCenter(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), pAction->getParameter(2)->getInt());
 			return;
-		case ScriptAction::AI_PLAYER_BUILD_UPGRADE: 
+		case ScriptAction::AI_PLAYER_BUILD_UPGRADE:
 			doBuildUpgrade(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::SKIRMISH_BUILD_BASE_DEFENSE_FRONT: 
+		case ScriptAction::SKIRMISH_BUILD_BASE_DEFENSE_FRONT:
 			doBuildBaseDefense(false);
 			return;
-		case ScriptAction::SKIRMISH_BUILD_BASE_DEFENSE_FLANK: 
+		case ScriptAction::SKIRMISH_BUILD_BASE_DEFENSE_FLANK:
 			doBuildBaseDefense(true);
 			return;
-		case ScriptAction::SKIRMISH_BUILD_STRUCTURE_FRONT: 
+		case ScriptAction::SKIRMISH_BUILD_STRUCTURE_FRONT:
 			doBuildBaseStructure(pAction->getParameter(0)->getString(), false);
 			return;
-		case ScriptAction::SKIRMISH_BUILD_STRUCTURE_FLANK: 
+		case ScriptAction::SKIRMISH_BUILD_STRUCTURE_FLANK:
 			doBuildBaseStructure(pAction->getParameter(0)->getString(), true);
 			return;
-		case ScriptAction::RECRUIT_TEAM: 
+		case ScriptAction::RECRUIT_TEAM:
 			doRecruitTeam(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal());
 			return;
-		case ScriptAction::PLAY_SOUND_EFFECT: 
+		case ScriptAction::PLAY_SOUND_EFFECT:
 			doPlaySoundEffect(pAction->getParameter(0)->getString());
 			return;
-		case ScriptAction::MOVE_CAMERA_TO: 
+		case ScriptAction::MOVE_CAMERA_TO:
 			doMoveCameraTo(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal());
 			return;
-		case ScriptAction::SETUP_CAMERA: 
+		case ScriptAction::SETUP_CAMERA:
 			doSetupCamera(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal(), pAction->getParameter(3)->getString());
 			return;
-		case ScriptAction::ZOOM_CAMERA: 
+		case ScriptAction::ZOOM_CAMERA:
 			doZoomCamera(pAction->getParameter(0)->getReal(), pAction->getParameter(1)->getReal());
 			return;
 		case ScriptAction::PITCH_CAMERA:
@@ -5979,19 +6107,19 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::CAMERA_STOP_FOLLOW:
 			doStopCameraFollowUnit();
 			return;
-		case ScriptAction::OVERSIZE_TERRAIN:  
+		case ScriptAction::OVERSIZE_TERRAIN:
 			doOversizeTheTerrain(pAction->getParameter(0)->getInt());
 			return;
-		case ScriptAction::CAMERA_MOD_LOOK_TOWARD: 
+		case ScriptAction::CAMERA_MOD_LOOK_TOWARD:
 			doModCameraLookToward(pAction->getParameter(0)->getString());
 			return;
-		case ScriptAction::CAMERA_MOD_FINAL_LOOK_TOWARD: 
+		case ScriptAction::CAMERA_MOD_FINAL_LOOK_TOWARD:
 			doModCameraFinalLookToward(pAction->getParameter(0)->getString());
 			return;
-		case ScriptAction::MOVE_CAMERA_ALONG_WAYPOINT_PATH: 
+		case ScriptAction::MOVE_CAMERA_ALONG_WAYPOINT_PATH:
 			doMoveCameraAlongWaypointPath(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal());
 			return;
-		case ScriptAction::ROTATE_CAMERA: 
+		case ScriptAction::ROTATE_CAMERA:
 			doRotateCamera(pAction->getParameter(0)->getReal(), pAction->getParameter(1)->getReal());
 			return;
 		case ScriptAction::CAMERA_LOOK_TOWARD_OBJECT:
@@ -6000,40 +6128,40 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::CAMERA_LOOK_TOWARD_WAYPOINT:
 			doRotateCameraTowardWaypoint(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal());
 			return;
-		case ScriptAction::RESET_CAMERA: 
+		case ScriptAction::RESET_CAMERA:
 			doResetCamera(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal());
 			return;
-		case ScriptAction::MOVE_CAMERA_TO_SELECTION: 
+		case ScriptAction::MOVE_CAMERA_TO_SELECTION:
 			doModCameraMoveToSelection();
 			return;
-		case ScriptAction::CAMERA_MOD_FREEZE_TIME: 
+		case ScriptAction::CAMERA_MOD_FREEZE_TIME:
 			TheTacticalView->cameraModFreezeTime();
 			return;
-		case ScriptAction::CAMERA_MOD_FREEZE_ANGLE: 
+		case ScriptAction::CAMERA_MOD_FREEZE_ANGLE:
 			TheTacticalView->cameraModFreezeAngle();
 			return;
-		case ScriptAction::CAMERA_MOD_SET_FINAL_ZOOM: 
+		case ScriptAction::CAMERA_MOD_SET_FINAL_ZOOM:
 			TheTacticalView->cameraModFinalZoom(pAction->getParameter(0)->getReal());
 			return;
-		case ScriptAction::CAMERA_MOD_SET_FINAL_PITCH: 
+		case ScriptAction::CAMERA_MOD_SET_FINAL_PITCH:
 			TheTacticalView->cameraModFinalPitch(pAction->getParameter(0)->getReal());
 			return;
-		case ScriptAction::CAMERA_MOD_SET_FINAL_SPEED_MULTIPLIER: 
+		case ScriptAction::CAMERA_MOD_SET_FINAL_SPEED_MULTIPLIER:
 			TheTacticalView->cameraModFinalTimeMultiplier(pAction->getParameter(0)->getInt());
 			return;
-		case ScriptAction::CAMERA_MOD_SET_ROLLING_AVERAGE: 
+		case ScriptAction::CAMERA_MOD_SET_ROLLING_AVERAGE:
 			TheTacticalView->cameraModRollingAverage(pAction->getParameter(0)->getInt());
 			return;
-		case ScriptAction::SET_VISUAL_SPEED_MULTIPLIER: 
+		case ScriptAction::SET_VISUAL_SPEED_MULTIPLIER:
 			TheTacticalView->setTimeMultiplier(pAction->getParameter(0)->getInt());
 			return;
 		case ScriptAction::SUSPEND_BACKGROUND_SOUNDS:
 			TheAudio->pauseAudio(AudioAffect_Sound);
 			return;
-		case ScriptAction::RESUME_BACKGROUND_SOUNDS: 
+		case ScriptAction::RESUME_BACKGROUND_SOUNDS:
 			TheAudio->resumeAudio(AudioAffect_Sound);
 			return;
-		case ScriptAction::PLAY_SOUND_EFFECT_AT: 
+		case ScriptAction::PLAY_SOUND_EFFECT_AT:
 			doPlaySoundEffectAt(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString());
 			return;
 		case ScriptAction::SET_INFANTRY_LIGHTING_OVERRIDE:
@@ -6231,7 +6359,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 			{
 				const char* MSG = "Your Script requested the following message be displayed:\n\n";
 				const char* MSG2 = "\n\nTHIS IS NOT A BUG. DO NOT REPORT IT.";
-				DEBUG_CRASH(("%s%s%s\n",MSG,pAction->getParameter(0)->getString().str(),MSG2));
+				DEBUG_CRASH(("%s%s%s",MSG,pAction->getParameter(0)->getString().str(),MSG2));
 			}
 #endif
 			return;
@@ -6429,11 +6557,11 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 			doCameraMotionBlurJump(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getInt());
 			return;
 		case ScriptAction::CAMERA_MOTION_BLUR_FOLLOW:
-			TheTacticalView->setViewFilterMode((enum FilterModes)(FM_VIEW_MB_PAN_ALPHA+pAction->getParameter(0)->getInt())); 						 
+			TheTacticalView->setViewFilterMode((FilterModes)(FM_VIEW_MB_PAN_ALPHA+pAction->getParameter(0)->getInt()));
 			TheTacticalView->setViewFilter(FT_VIEW_MOTION_BLUR_FILTER);
 			return;
 		case ScriptAction::CAMERA_MOTION_BLUR_END_FOLLOW:
-			TheTacticalView->setViewFilterMode(FM_VIEW_MB_END_PAN_ALPHA); 						 
+			TheTacticalView->setViewFilterMode(FM_VIEW_MB_END_PAN_ALPHA);
 			TheTacticalView->setViewFilter(FT_VIEW_MOTION_BLUR_FILTER);
 			return;
 		case ScriptAction::FREEZE_TIME:
@@ -6454,16 +6582,16 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::SET_FPS_LIMIT:
 			if (!pAction->getParameter(0)->getInt())
 			{
-				TheGameEngine->setFramesPerSecondLimit(TheGlobalData->m_framesPerSecondLimit);
+				TheFramePacer->setFramesPerSecondLimit(TheGlobalData->m_framesPerSecondLimit);
 			}
 			else
 			{
-				TheGameEngine->setFramesPerSecondLimit(pAction->getParameter(0)->getInt());
+				TheFramePacer->setFramesPerSecondLimit(pAction->getParameter(0)->getInt());
 			}
 			// Setting the fps limit doesn't do much good if we don't use it.  jba.
-			TheWritableGlobalData->m_useFpsLimit = true; 
+			TheWritableGlobalData->m_useFpsLimit = true;
 			return;
-			
+
 		case ScriptAction::DISABLE_SPECIAL_POWER_DISPLAY:
 			doDisableSpecialPowerDisplay();
 			return;
@@ -6565,7 +6693,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::REFRESH_RADAR:
 			doRadarRefresh();
 			return;
-		
+
 		case ScriptAction::NAMED_STOP:
 			doNamedStop(pAction->getParameter(0)->getString());
 			return;
@@ -6578,22 +6706,22 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 			doTeamStop(pAction->getParameter(0)->getString(), TRUE);
 			return;
 
-		case ScriptAction::CAMERA_TETHER_NAMED: 
+		case ScriptAction::CAMERA_TETHER_NAMED:
 			doCameraTetherNamed(pAction->getParameter(0)->getString(), (Bool)(pAction->getParameter(1)->getInt()), pAction->getParameter(2)->getReal());
 			return;
 
-		case ScriptAction::CAMERA_STOP_TETHER_NAMED: 
+		case ScriptAction::CAMERA_STOP_TETHER_NAMED:
 			doCameraStopTetherNamed();
 			return;
 
-		case ScriptAction::CAMERA_SET_DEFAULT: 
+		case ScriptAction::CAMERA_SET_DEFAULT:
 			doCameraSetDefault(pAction->getParameter(0)->getReal(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal());
 			return;
 
 		case ScriptAction::TEAM_SET_OVERRIDE_RELATION_TO_TEAM:
 			doTeamSetOverrideRelationToTeam(pAction->getParameter(0)->getString(),		// first team
 									pAction->getParameter(1)->getString(),		// second team
-									pAction->getParameter(2)->getInt());				// relation (ENEMIES, etc) 
+									pAction->getParameter(2)->getInt());				// relation (ENEMIES, etc)
 			return;
 
 		case ScriptAction::TEAM_REMOVE_OVERRIDE_RELATION_TO_TEAM:
@@ -6608,7 +6736,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::TEAM_SET_OVERRIDE_RELATION_TO_PLAYER:
 			doTeamSetOverrideRelationToPlayer(pAction->getParameter(0)->getString(),		// first team
 									pAction->getParameter(1)->getString(),			// second player
-									pAction->getParameter(2)->getInt());				// relation (ENEMIES, etc) 
+									pAction->getParameter(2)->getInt());				// relation (ENEMIES, etc)
 			return;
 
 		case ScriptAction::TEAM_REMOVE_OVERRIDE_RELATION_TO_PLAYER:
@@ -6619,7 +6747,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::PLAYER_SET_OVERRIDE_RELATION_TO_TEAM:
 			doPlayerSetOverrideRelationToTeam(pAction->getParameter(0)->getString(),		// first player
 									pAction->getParameter(1)->getString(),		// second team
-									pAction->getParameter(2)->getInt());				// relation (ENEMIES, etc) 
+									pAction->getParameter(2)->getInt());				// relation (ENEMIES, etc)
 			return;
 
 		case ScriptAction::PLAYER_REMOVE_OVERRIDE_RELATION_TO_TEAM:
@@ -6642,7 +6770,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::NAMED_USE_COMMANDBUTTON_ABILITY_AT_WAYPOINT:
 			doNamedUseCommandButtonAbilityAtWaypoint( pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), pAction->getParameter(2)->getString() );
 			return;
-		
+
 		case ScriptAction::TEAM_USE_COMMANDBUTTON_ABILITY:
 			doTeamUseCommandButtonAbility( pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString() );
 			return;
@@ -6654,7 +6782,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::TEAM_USE_COMMANDBUTTON_ABILITY_AT_WAYPOINT:
 			doTeamUseCommandButtonAbilityAtWaypoint( pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), pAction->getParameter(2)->getString() );
 			return;
-		
+
 		case ScriptAction::UNIT_EXECUTE_SEQUENTIAL_SCRIPT:
 			doUnitStartSequentialScript(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), 0);
 			return;
@@ -6686,11 +6814,11 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::UNIT_IDLE_FOR_FRAMECOUNT:
 			doUnitIdleForFramecount(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getInt());
 			return;
-		
+
 		case ScriptAction::TEAM_GUARD_FOR_FRAMECOUNT:
 			doTeamIdleForFramecount(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getInt());
 			return;
-		
+
 		case ScriptAction::TEAM_IDLE_FOR_FRAMECOUNT:
 			doTeamIdleForFramecount(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getInt());
 			return;
@@ -6707,7 +6835,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::MAP_SWITCH_BORDER:
 			doBorderSwitch(pAction->getParameter(0)->getInt());
 			return;
-			
+
 		case ScriptAction::OBJECT_FORCE_SELECT:
 			doForceObjectSelection(pAction->getParameter(0)->getString(),
 														 pAction->getParameter(1)->getString(),
@@ -6754,7 +6882,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::SOUND_ENABLE_ALL:
 			doSoundEnableType(AsciiString::TheEmptyString, true);
 			return;
-			
+
 		case ScriptAction::SOUND_REMOVE_ALL_DISABLED:
 			doSoundRemoveAllDisabled();
 			return;
@@ -6927,7 +7055,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::TEAM_FACE_WAYPOINT:
 			doTeamFaceWaypoint( pAction->getParameter( 0 )->getString(), pAction->getParameter( 1 )->getString() );
 			return;
-			
+
 		case ScriptAction::UNIT_AFFECT_OBJECT_PANEL_FLAGS:
 			doAffectObjectPanelFlagsUnit(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), pAction->getParameter(2)->getInt());
 			return;
@@ -6955,7 +7083,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 			doCreateObject( pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), pAction->getParameter(2)->getString(), &pos, pAction->getParameter(4)->getReal() );
 			return;
 		}
-		
+
 		case ScriptAction::PLAYER_AFFECT_RECEIVING_EXPERIENCE:
 			doAffectSkillPointsModifier(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal());
 			return;
@@ -6971,7 +7099,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::TEAM_GUARD_IN_TUNNEL_NETWORK:
 			doTeamGuardInTunnelNetwork(pAction->getParameter(0)->getString());
 			return;
-			
+
 		case ScriptAction::RESIZE_VIEW_GUARDBAND:
 			doResizeViewGuardband( pAction->getParameter(0)->getReal(), pAction->getParameter(1)->getReal() );
 			return;
@@ -6985,5 +7113,5 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 			return;
 
 
-	}  
+	}
 }
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp
index d90f03a54a5..9ebaba9e855 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp
@@ -27,7 +27,7 @@
 // Author: John Ahlquist, Nov. 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/MapObject.h"
@@ -37,7 +37,6 @@
 #include "Common/ThingTemplate.h"
 #include "Common/ThingFactory.h"
 #include "Common/Team.h"
-#include "Common/Player.h"
 #include "Common/ObjectStatusTypes.h"
 
 #include "GameClient/ControlBar.h"
@@ -61,11 +60,6 @@
 #include "GameLogic/Scripts.h"
 #include "GameLogic/VictoryConditions.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 class ObjectTypesTemp
 {
@@ -79,15 +73,14 @@ class ObjectTypesTemp
 
 	~ObjectTypesTemp()
 	{
-		if (m_types)
-			deleteInstance(m_types);
+		deleteInstance(m_types);
 	}
 };
 
 // STATICS ////////////////////////////////////////////////////////////////////////////////////////
 namespace rts
 {
-	template<typename T> 
+	template<typename T>
 		T sum(std::vector<T>& vecOfValues )
 	{
 		T retVal = 0;
@@ -104,7 +97,7 @@ ScriptConditionsInterface *TheScriptConditions = NULL;
 
 class TransportStatus : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TransportStatus, "TransportStatus")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TransportStatus, "TransportStatus")
 public:
 	TransportStatus *	m_nextStatus;
 	ObjectID					m_objID;
@@ -117,10 +110,9 @@ class TransportStatus : public MemoryPoolObject
 };
 
 //-------------------------------------------------------------------------------------------------
-TransportStatus::~TransportStatus() 
-{ 
-	if (m_nextStatus) 
-		deleteInstance(m_nextStatus); 
+TransportStatus::~TransportStatus()
+{
+	deleteInstance(m_nextStatus);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -131,14 +123,14 @@ static TransportStatus *s_transportStatuses;
 ScriptConditions::ScriptConditions()
 {
 
-}  // end ScriptConditions
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ScriptConditions::~ScriptConditions()
 {
 	reset(); // just in case.
-}  // end ~ScriptConditions
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Init */
@@ -148,7 +140,7 @@ void ScriptConditions::init( void )
 
 	reset();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -159,7 +151,7 @@ void ScriptConditions::reset( void )
 	deleteInstance(s_transportStatuses);
 	s_transportStatuses = NULL;
 	// Empty for now.  jba.
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -168,7 +160,7 @@ void ScriptConditions::update( void )
 {
 
 	// Empty for now. jba
-}  // end update
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -232,7 +224,7 @@ Bool ScriptConditions::evaluateAllDestroyed(Parameter *pSideParm )
 		return (!pPlayer->hasAnyObjects());
 	}
 	return true; // Non existent player is all destroyed. :)
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateAllBuildFacilitiesDestroyed */
@@ -244,7 +236,7 @@ Bool ScriptConditions::evaluateAllBuildFacilitiesDestroyed(Parameter *pSideParm
 		return (!pPlayer->hasAnyBuildFacility());
 	}
 	return true; // Non existent player is all destroyed. :)
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateIsDestroyed */
@@ -257,8 +249,8 @@ Bool ScriptConditions::evaluateIsDestroyed(Parameter *pTeamParm)
 	if (theTeam) {
 		return (!theTeam->hasAnyObjects());
 	}
-	return false; // Non existent team is not destroyed. 
-}  
+	return false; // Non existent team is not destroyed.
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateBridgeBroken */
@@ -274,7 +266,7 @@ Bool ScriptConditions::evaluateBridgeBroken(Parameter *pBridgeParm)
 		return (TheTerrainLogic->isBridgeBroken(theBridge));
 	}
 	return false;
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateBridgeRepaired */
@@ -290,7 +282,7 @@ Bool ScriptConditions::evaluateBridgeRepaired(Parameter *pBridgeParm)
 		return (TheTerrainLogic->isBridgeRepaired(theBridge));
 	}
 	return false;
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateNamedUnitDestroyed */
@@ -298,7 +290,7 @@ Bool ScriptConditions::evaluateBridgeRepaired(Parameter *pBridgeParm)
 Bool ScriptConditions::evaluateNamedUnitDestroyed(Parameter *pUnitParm)
 {
 	Object *theUnit = TheScriptEngine->getUnitNamed( pUnitParm->getString() );
-	if (theUnit) 
+	if (theUnit)
 	{
 		return theUnit->isEffectivelyDead();
 	}
@@ -306,7 +298,7 @@ Bool ScriptConditions::evaluateNamedUnitDestroyed(Parameter *pUnitParm)
 	if (TheScriptEngine->didUnitExist(pUnitParm->getString())) {
 		return true;
 	}
-	return false; // Non existent unit is not destroyed. 
+	return false; // Non existent unit is not destroyed.
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -315,12 +307,12 @@ Bool ScriptConditions::evaluateNamedUnitDestroyed(Parameter *pUnitParm)
 Bool ScriptConditions::evaluateNamedUnitExists(Parameter *pUnitParm)
 {
 	Object *theUnit = TheScriptEngine->getUnitNamed( pUnitParm->getString() );
-	if (theUnit) 
+	if (theUnit)
 	{
 		return !theUnit->isEffectivelyDead();
 	}
 
-	return false; // Doesn't exist. 
+	return false; // Doesn't exist.
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -329,16 +321,16 @@ Bool ScriptConditions::evaluateNamedUnitExists(Parameter *pUnitParm)
 Bool ScriptConditions::evaluateNamedUnitDying(Parameter *pUnitParm)
 {
 	Object *theUnit = TheScriptEngine->getUnitNamed( pUnitParm->getString() );
-	if (theUnit) 
+	if (theUnit)
 	{
 		return theUnit->isEffectivelyDead();
 	}
 
-	if (TheScriptEngine->didUnitExist(pUnitParm->getString())) 
+	if (TheScriptEngine->didUnitExist(pUnitParm->getString()))
 	{
 		return false; // already totally killed
 	}
-	return false; // Non existent unit is not dying. 
+	return false; // Non existent unit is not dying.
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -355,7 +347,7 @@ Bool ScriptConditions::evaluateNamedUnitTotallyDead(Parameter *pUnitParm)
 		// Did exist, now it doesnt.  So it is really, really dead.
 		return true; // totally killed
 	}
-	return false; // Non existent unit is not dead. 
+	return false; // Non existent unit is not dead.
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -372,7 +364,7 @@ Bool ScriptConditions::evaluateHasUnits(Parameter *pTeamParm)
 		if (theTeam) {
 			return (theTeam->hasAnyUnits());
 		}
-		return false; // Non existent team has no units. 
+		return false; // Non existent team has no units.
 	}
 	Team *thisTeam = TheScriptEngine->getTeamNamed(THIS_TEAM);
 	if (thisTeam && thisTeam->getName()==desiredTeamName)	{
@@ -385,7 +377,7 @@ Bool ScriptConditions::evaluateHasUnits(Parameter *pTeamParm)
 	pProto = TheTeamFactory->findTeamPrototype(desiredTeamName);
 
 	if (pProto) {
-		// We have a team referred to in the conditions.  Iterate over the instances of the team, 
+		// We have a team referred to in the conditions.  Iterate over the instances of the team,
 		// applying the script conditions (and possibly actions) to each instance of the team.
 		for (DLINK_ITERATOR<Team> iter = pProto->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			if (iter.cur()->hasAnyUnits()) {
@@ -393,8 +385,8 @@ Bool ScriptConditions::evaluateHasUnits(Parameter *pTeamParm)
 			}
 		}
 	}
-	return false; // Non existent team has no units. 
-}  
+	return false; // Non existent team has no units.
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateUnitsEntered */
@@ -406,14 +398,14 @@ Bool ScriptConditions::evaluateTeamInsideAreaPartially(Parameter *pTeamParm, Par
 	// is being considered for the condition.  jba. :)
 	AsciiString triggerName = pTriggerAreaParm->getString();
 	PolygonTrigger *pTrig = TheScriptEngine->getQualifiedTriggerAreaByName(pTriggerAreaParm->getString());
-	
+
 	if (pTrig == NULL) return false;
 	if (theTeam) {
 		return (theTeam->someInsideSomeOutside(pTrig, (UnsignedInt) pTypeParm->getInt()) ||
 						theTeam->allInside(pTrig, (UnsignedInt) pTypeParm->getInt()));
 	}
 	return false; // Non existent team isn't in trigger area. :)
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateNamedInsideArea */
@@ -436,7 +428,7 @@ Bool ScriptConditions::evaluateNamedInsideArea(Parameter *pUnitParm, Parameter *
 		return pTrig->pointInTrigger(iCoord);
 	}
 	return false; // Non existent team isn't in trigger area. :)
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluatePlayerHasUnitTypeInArea */
@@ -466,7 +458,7 @@ Bool ScriptConditions::evaluatePlayerHasUnitTypeInArea(Condition *pCondition, Pa
 				continue;
 			}
 			if (team->didEnterOrExit()) {
-				anyChanges = true; 
+				anyChanges = true;
 			}
 		}
 	}
@@ -512,13 +504,13 @@ Bool ScriptConditions::evaluatePlayerHasUnitTypeInArea(Condition *pCondition, Pa
 			}
 		}
 	}
-	
+
 	Bool comparison = false;
 	switch (pComparisonParm->getInt())
 	{
 		case Parameter::LESS_THAN :			comparison = (count < pCountParm->getInt()); break;
 		case Parameter::LESS_EQUAL :		comparison = (count <= pCountParm->getInt()); break;
-		case Parameter::EQUAL :					comparison = (count == pCountParm->getInt()); break; 
+		case Parameter::EQUAL :					comparison = (count == pCountParm->getInt()); break;
 		case Parameter::GREATER_EQUAL :	comparison = (count >= pCountParm->getInt()); break;
 		case Parameter::GREATER :				comparison = (count > pCountParm->getInt()); break;
 		case Parameter::NOT_EQUAL :			comparison = (count != pCountParm->getInt()); break;
@@ -528,7 +520,7 @@ Bool ScriptConditions::evaluatePlayerHasUnitTypeInArea(Condition *pCondition, Pa
 		pCondition->setCustomData(1); // true.
 	}
 	return comparison;
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluatePlayerHasUnitKindInArea */
@@ -540,7 +532,7 @@ Bool ScriptConditions::evaluatePlayerHasUnitKindInArea(Condition *pCondition, Pa
 	if (pTrig == NULL) return false;
 
 	KindOfType kind = (KindOfType)pKindParm->getInt();
-	
+
 	Player* pPlayer = playerFromParam(pPlayerParm);
 	if (!pPlayer) {
 		return false;
@@ -560,7 +552,7 @@ Bool ScriptConditions::evaluatePlayerHasUnitKindInArea(Condition *pCondition, Pa
 				continue;
 			}
 			if (team->didEnterOrExit()) {
-				anyChanges = true; 
+				anyChanges = true;
 			}
 		}
 	}
@@ -596,20 +588,20 @@ Bool ScriptConditions::evaluatePlayerHasUnitKindInArea(Condition *pCondition, Pa
 			}
 		}
 	}
-	
+
 	Bool comparison = false;
 	switch (pComparisonParm->getInt())
 	{
 		case Parameter::LESS_THAN :			comparison = (count < pCountParm->getInt()); break;
 		case Parameter::LESS_EQUAL :		comparison = (count <= pCountParm->getInt()); break;
-		case Parameter::EQUAL :					comparison = (count == pCountParm->getInt()); break; 
+		case Parameter::EQUAL :					comparison = (count == pCountParm->getInt()); break;
 		case Parameter::GREATER_EQUAL :	comparison = (count >= pCountParm->getInt()); break;
 		case Parameter::GREATER :				comparison = (count > pCountParm->getInt()); break;
 		case Parameter::NOT_EQUAL :			comparison = (count != pCountParm->getInt()); break;
 	}
 
 	return comparison;
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateTeamStateIs */
@@ -623,8 +615,8 @@ Bool ScriptConditions::evaluateTeamStateIs(Parameter *pTeamParm, Parameter *pSta
 	if (theTeam) {
 		return (theTeam->getState() == stateName);
 	}
-	return false; // Non existent team isn't in any state. 
-}  
+	return false; // Non existent team isn't in any state.
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -639,8 +631,8 @@ Bool ScriptConditions::evaluateTeamStateIsNot(Parameter *pTeamParm, Parameter *p
 	if (theTeam) {
 		return (!(theTeam->getState() == stateName));
 	}
-	return false; // Non existent team isn't in any state. 
-}  
+	return false; // Non existent team isn't in any state.
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateNamedOutsideArea */
@@ -652,7 +644,7 @@ Bool ScriptConditions::evaluateNamedOutsideArea(Parameter *pUnitParm, Parameter
 }
 
 //-------------------------------------------------------------------------------------------------
-/** evaluateTeamInsideAreaEntirely */ 
+/** evaluateTeamInsideAreaEntirely */
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateTeamInsideAreaEntirely(Parameter *pTeamParm, Parameter *pTriggerParm, Parameter *pTypeParm)
 {// This is actually TeamInside(...)
@@ -661,8 +653,8 @@ Bool ScriptConditions::evaluateTeamInsideAreaEntirely(Parameter *pTeamParm, Para
 	// is being considered for the condition.  jba. :)
 	AsciiString triggerName = pTriggerParm->getString();
 	PolygonTrigger *pTrig = TheScriptEngine->getQualifiedTriggerAreaByName(pTriggerParm->getString());
-	
-	if (pTrig == NULL) 
+
+	if (pTrig == NULL)
 		return false;
 
 	if (theTeam) {
@@ -694,13 +686,13 @@ Bool ScriptConditions::evaluateNamedAttackedByType(Parameter *pUnitParm, Paramet
 	if (!theBodyModule) {
 		return false;
 	}
-	
+
 	const DamageInfo* lastDamageInfo = theBodyModule->getLastDamageInfo();
-	
+
 	if (!lastDamageInfo) {
 		return false;
 	}
-	
+
 	ObjectID id = lastDamageInfo->in.m_sourceID;
 	Object* pAttacker = TheGameLogic->findObjectByID(id);
 	if (!pAttacker || !pAttacker->getTemplate()) {
@@ -731,24 +723,24 @@ Bool ScriptConditions::evaluateTeamAttackedByType(Parameter *pTeamParm, Paramete
 		if (!pCur) {
 			continue;
 		}
-		
+
 		BodyModuleInterface* theBodyModule = pCur->getBodyModule();
 		if (!theBodyModule) {
 			continue;
 		}
-		
+
 		const DamageInfo* lastDamageInfo = theBodyModule->getLastDamageInfo();
-		
+
 		if (!lastDamageInfo) {
 			continue;
 		}
-		
+
 		ObjectID id = lastDamageInfo->in.m_sourceID;
 		Object* pAttacker = TheGameLogic->findObjectByID(id);
 		if (!pAttacker || !pAttacker->getTemplate()) {
 			continue;
 		}
-		
+
 		if (types.m_types->isInSet(pAttacker->getTemplate()->getName())) {
 			return true;
 		}
@@ -771,13 +763,13 @@ Bool ScriptConditions::evaluateNamedAttackedByPlayer(Parameter *pUnitParm, Param
 	if (!theBodyModule) {
 		return false;
 	}
-	
+
 	const DamageInfo* lastDamageInfo = theBodyModule->getLastDamageInfo();
-	
+
 	if (!lastDamageInfo) {
 		return false;
 	}
-	
+
 	ObjectID id = lastDamageInfo->in.m_sourceID;
 	Object* pAttacker = TheGameLogic->findObjectByID(id);
 	Player *pPlayer = NULL;
@@ -787,7 +779,7 @@ Bool ScriptConditions::evaluateNamedAttackedByPlayer(Parameter *pUnitParm, Param
 	if (pPlayer || pAttacker) {
 		Player *victimPlayer = playerFromParam(pPlayerParm);
 		if (pPlayer == victimPlayer) {
-			return true;	
+			return true;
 		}
 		if (!pAttacker) return false; // wasn't attacked.
 		return (pAttacker->getControllingPlayer() == victimPlayer);
@@ -814,19 +806,19 @@ Bool ScriptConditions::evaluateTeamAttackedByPlayer(Parameter *pTeamParm, Parame
 		if (!theBodyModule) {
 			continue;
 		}
-		
+
 		const DamageInfo* lastDamageInfo = theBodyModule->getLastDamageInfo();
-		
+
 		if (!lastDamageInfo) {
 			continue;
 		}
-		
+
 		ObjectID id = lastDamageInfo->in.m_sourceID;
 		Object* pAttacker = TheGameLogic->findObjectByID(id);
 		if (!pAttacker) {
 			continue;
 		}
-		
+
 		if (pAttacker->getControllingPlayer() == playerFromParam(pPlayerParm)) {
 			return true;
 		}
@@ -918,9 +910,9 @@ Bool ScriptConditions::evaluateUnitHealth(Parameter *pUnitParm, Parameter* pComp
 
 	switch (pComparisonParm->getInt())
 	{
-		case Parameter::LESS_THAN :			return (curPercent < pHealthPercent->getInt()); 
+		case Parameter::LESS_THAN :			return (curPercent < pHealthPercent->getInt());
 		case Parameter::LESS_EQUAL :		return (curPercent <= pHealthPercent->getInt());
-		case Parameter::EQUAL :					return (curPercent == pHealthPercent->getInt()); 
+		case Parameter::EQUAL :					return (curPercent == pHealthPercent->getInt());
 		case Parameter::GREATER_EQUAL :	return (curPercent >= pHealthPercent->getInt());
 		case Parameter::GREATER :				return (curPercent > pHealthPercent->getInt());
 		case Parameter::NOT_EQUAL :			return (curPercent != pHealthPercent->getInt());
@@ -938,7 +930,7 @@ Bool ScriptConditions::evaluatePlayerHasCredits(Parameter *pCreditsParm, Paramet
 	if (!pPlayer) {
 		return false;
 	}
-	
+
 	if (pPlayer && pPlayer->getMoney()) {
 		switch (pComparisonParm->getInt())
 		{
@@ -995,7 +987,7 @@ Bool ScriptConditions::evaluateIsBuildingEmpty( Parameter *pItemParm )
 	if (!theBuilding) {
 		return false;
 	}
-	
+
 	ContainModuleInterface* contain = theBuilding->getContain();
 	if (!contain) {
 		return false;
@@ -1034,6 +1026,10 @@ Bool ScriptConditions::evaluateEnemySighted(Parameter *pItemParm, Parameter *pAl
 		case Parameter::REL_ENEMY:
 			relationDescriber = PartitionFilterRelationship::ALLOW_ENEMIES;
 			break;
+		default:
+			DEBUG_CRASH(("Unhandled case in ScriptConditions::evaluateEnemySighted()"));
+			relationDescriber = 0;
+			break;
 	}
 	PartitionFilterRelationship	filterTeam(theObj, relationDescriber);
 
@@ -1041,9 +1037,9 @@ Bool ScriptConditions::evaluateEnemySighted(Parameter *pItemParm, Parameter *pAl
 	PartitionFilterAlive filterAlive;
 
 	// and only nonstealthed items.
-	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ), 
+	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ),
 																										 MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_DETECTED ) );
-	
+
 	// and only on-map (or not)
 	PartitionFilterSameMapStatus filterMapStatus(theObj);
 
@@ -1052,7 +1048,7 @@ Bool ScriptConditions::evaluateEnemySighted(Parameter *pItemParm, Parameter *pAl
 	Real visionRange = theObj->getVisionRange();
 
 	SimpleObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(
-								theObj, visionRange, FROM_CENTER_2D, filters); 
+								theObj, visionRange, FROM_CENTER_2D, filters);
 	MemoryPoolObjectHolder hold(iter);
 	for (Object *them = iter->first(); them; them = iter->next())
 	{
@@ -1086,7 +1082,7 @@ Bool ScriptConditions::evaluateTypeSighted(Parameter *pItemParm, Parameter *pTyp
 	PartitionFilterAlive filterAlive;
 
 	// and only nonstealthed items.
-	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ), 
+	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ),
 																										 MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_DETECTED ) );
 
 	// and only on-map (or not)
@@ -1097,7 +1093,7 @@ Bool ScriptConditions::evaluateTypeSighted(Parameter *pItemParm, Parameter *pTyp
 	Real visionRange = theObj->getVisionRange();
 
 	SimpleObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(
-								theObj, visionRange, FROM_CENTER_2D, filters); 
+								theObj, visionRange, FROM_CENTER_2D, filters);
 	MemoryPoolObjectHolder hold(iter);
 	for (Object *them = iter->first(); them; them = iter->next())
 	{
@@ -1123,16 +1119,16 @@ Bool ScriptConditions::evaluateNamedDiscovered(Parameter *pItemParm, Parameter*
 	if (!pPlayer) {
 		return false;
 	}
-	
+
 	// We are held, so we are not visible.
-	if( theObj->isDisabledByType( DISABLED_HELD ) ) 
+	if( theObj->isDisabledByType( DISABLED_HELD ) )
 	{
 		return false;
 	}
 
 	// If we are stealthed we are not visible.
-	if( theObj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) && 
-			!theObj->getStatusBits().test( OBJECT_STATUS_DETECTED ) ) 
+	if( theObj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) &&
+			!theObj->getStatusBits().test( OBJECT_STATUS_DETECTED ) )
 	{
 		return false;
 	}
@@ -1144,7 +1140,7 @@ Bool ScriptConditions::evaluateNamedDiscovered(Parameter *pItemParm, Parameter*
 /** evaluateTeamDiscovered */
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateTeamDiscovered(Parameter *pTeamParm, Parameter *pPlayerParm)
-{	
+{
 	Team *theTeam = TheScriptEngine->getTeamNamed( pTeamParm->getString() );
 	if (!theTeam) {
 		return false;
@@ -1162,19 +1158,19 @@ Bool ScriptConditions::evaluateTeamDiscovered(Parameter *pTeamParm, Parameter *p
 		}
 
 		// We are held, so we are not visible.
-		if( pObj->isDisabledByType( DISABLED_HELD ) ) 
+		if( pObj->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue;
 		}
-		
+
 		// If we are stealthed we are not visible.
-		if( pObj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) && 
+		if( pObj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) &&
 				!pObj->getStatusBits().test( OBJECT_STATUS_DETECTED ) )
 		{
 			continue;
 		}
 		ObjectShroudStatus shroud = pObj->getShroudedStatus(pPlayer->getPlayerIndex());
-		
+
 		if (shroud == OBJECTSHROUD_CLEAR || shroud == OBJECTSHROUD_PARTIAL_CLEAR) {
 			return true;
 		}
@@ -1187,7 +1183,7 @@ Bool ScriptConditions::evaluateTeamDiscovered(Parameter *pTeamParm, Parameter *p
 /** evaluateMissionAttempts */
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateMissionAttempts(Parameter *pPlayerParm, Parameter *pComparisonParm, Parameter *pAttemptsParm)
-{	
+{
 //Player* pPlayer = playerFromParam(pPlayerParm);
 	return false;
 }
@@ -1207,7 +1203,7 @@ Bool ScriptConditions::evaluateNamedOwnedByPlayer(Parameter *pUnitParm, Paramete
 	if (!pObj) {
 		return false;
 	}
-	
+
 	return (pObj->getControllingPlayer() == pPlayer);
 }
 
@@ -1225,7 +1221,7 @@ Bool ScriptConditions::evaluateTeamOwnedByPlayer(Parameter *pTeamParm, Parameter
 	if (!pTeam) {
 		return false;
 	}
-	
+
 	return (pTeam->getControllingPlayer() == pPlayer);
 }
 
@@ -1268,7 +1264,7 @@ Bool ScriptConditions::evaluatePlayerHasPower(Parameter *pPlayerParm)
 	if (!pPlayer) {
 		return false;
 	}
-	
+
 	Energy* pPlayersEnergy = pPlayer->getEnergy();
 	if (!pPlayersEnergy) {
 		return false;
@@ -1285,9 +1281,9 @@ Bool ScriptConditions::evaluateNamedReachedWaypointsEnd(Parameter *pUnitParm, Pa
 	if (!theObj) {
 		return false;
 	}
-	
+
 	AIUpdateInterface *ai = theObj->getAIUpdateInterface();
-	if (!ai) 
+	if (!ai)
 		return false;
 
 	const Waypoint *targetWay = ai->getCompletedWaypoint();
@@ -1352,7 +1348,7 @@ Bool ScriptConditions::evaluateTeamReachedWaypointsEnd(Parameter *pTeamParm, Par
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateNamedSelected(Condition *pCondition, Parameter *pUnitParm)
 {
-	if (TheGameEngine->isMultiplayerSession()) 
+	if (TheGameEngine->isMultiplayerSession())
 	{
 		return false;
 	}
@@ -1379,7 +1375,7 @@ Bool ScriptConditions::evaluateNamedSelected(Condition *pCondition, Parameter *p
 	{
 		draw = *it;
 
-		if (draw->getObject()->getName() == (pUnitParm->getString())) { 
+		if (draw->getObject()->getName() == (pUnitParm->getString())) {
 			isSelected = true;
 			break;
 		}
@@ -1582,7 +1578,7 @@ Bool ScriptConditions::evaluateNamedEnteredArea(Parameter *pUnitParm, Parameter
 	if (!pTrig) {
 		return false;
 	}
-	
+
 	return (pUnit->didEnter(pTrig));
 }
 
@@ -1601,7 +1597,7 @@ Bool ScriptConditions::evaluateNamedExitedArea(Parameter *pUnitParm, Parameter *
 	if (!pTrig) {
 		return false;
 	}
-	
+
 	return (pUnit->didExit(pTrig));
 }
 
@@ -1620,7 +1616,7 @@ Bool ScriptConditions::evaluateTeamEnteredAreaEntirely(Parameter *pTeamParm, Par
 	if (pTrig) {
 		return pTeam->didAllEnter(pTrig, (UnsignedInt)pTypeParm->getInt());
 	}
-	
+
 	return false;
 }
 
@@ -1639,7 +1635,7 @@ Bool ScriptConditions::evaluateTeamEnteredAreaPartially(Parameter *pTeamParm, Pa
 	if (pTrig) {
 		return pTeam->didPartialEnter(pTrig, (UnsignedInt)pTypeParm->getInt());
 	}
-	
+
 	return false;
 }
 
@@ -1658,7 +1654,7 @@ Bool ScriptConditions::evaluateTeamExitedAreaEntirely(Parameter *pTeamParm, Para
 	if (!pTrig) {
 		return false;
 	}
-	
+
 	return (pTeam->didAllExit(pTrig, (UnsignedInt)pTypeParm->getInt()));
 }
 
@@ -1677,7 +1673,7 @@ Bool ScriptConditions::evaluateTeamExitedAreaPartially(Parameter *pTeamParm, Par
 	if (!pTrig) {
 		return false;
 	}
-	
+
 	return (pTeam->didPartialExit(pTrig, (UnsignedInt)pTypeParm->getInt()));
 }
 
@@ -1709,7 +1705,7 @@ Bool ScriptConditions::evaluateMultiplayerPlayerDefeat(void)
 /** evaluatePlayerUnitCondition */
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluatePlayerUnitCondition(Condition *pCondition, Parameter *pPlayerParm, Parameter *pComparisonParm, Parameter *pCountParm, Parameter *pUnitTypeParm)
-{					
+{
 	if (pCondition->getCustomData()!=0) {
 		// We have a cached value.
 		if (TheScriptEngine->getFrameObjectCountChanged()+1 < TheGameLogic->getFrame()) {
@@ -1737,13 +1733,13 @@ Bool ScriptConditions::evaluatePlayerUnitCondition(Condition *pCondition, Parame
 		pPlayer->countObjectsByThingTemplate(numObjs, &(*templates.begin()), false, &(*counts.begin()));
 		count = rts::sum(counts);
 	}
-	
+
 	Bool comparison = false;
 	switch (pComparisonParm->getInt())
 	{
 		case Parameter::LESS_THAN :			comparison = (count < pCountParm->getInt()); break;
 		case Parameter::LESS_EQUAL :		comparison = (count <= pCountParm->getInt()); break;
-		case Parameter::EQUAL :					comparison = (count == pCountParm->getInt()); break; 
+		case Parameter::EQUAL :					comparison = (count == pCountParm->getInt()); break;
 		case Parameter::GREATER_EQUAL :	comparison = (count >= pCountParm->getInt()); break;
 		case Parameter::GREATER :				comparison = (count > pCountParm->getInt()); break;
 		case Parameter::NOT_EQUAL :			comparison = (count != pCountParm->getInt()); break;
@@ -1771,9 +1767,9 @@ Bool ScriptConditions::evaluatePlayerHasComparisonPercentPower(Parameter *pPlaye
 	Real testRatio = pPercentParm->getInt()/100.0f;
 	switch (pComparisonParm->getInt())
 	{
-		case Parameter::LESS_THAN :			return (powerRatio < testRatio); 
+		case Parameter::LESS_THAN :			return (powerRatio < testRatio);
 		case Parameter::LESS_EQUAL :		return (powerRatio <= testRatio);
-		case Parameter::EQUAL :					return (powerRatio == testRatio); 
+		case Parameter::EQUAL :					return (powerRatio == testRatio);
 		case Parameter::GREATER_EQUAL :	return (powerRatio >= testRatio);
 		case Parameter::GREATER :				return (powerRatio > testRatio);
 		case Parameter::NOT_EQUAL:			return (powerRatio != testRatio);
@@ -1793,9 +1789,9 @@ Bool ScriptConditions::evaluatePlayerHasComparisonValueExcessPower(Parameter *pP
 	Int actualKilowats = pPlayer->getEnergy()->getProduction() - pPlayer->getEnergy()->getConsumption();
 	switch (pComparisonParm->getInt())
 	{
-		case Parameter::LESS_THAN :			return (actualKilowats < desiredKilowattExcess); 
+		case Parameter::LESS_THAN :			return (actualKilowats < desiredKilowattExcess);
 		case Parameter::LESS_EQUAL :		return (actualKilowats <= desiredKilowattExcess);
-		case Parameter::EQUAL :					return (actualKilowats == desiredKilowattExcess); 
+		case Parameter::EQUAL :					return (actualKilowats == desiredKilowattExcess);
 		case Parameter::GREATER_EQUAL :	return (actualKilowats >= desiredKilowattExcess);
 		case Parameter::GREATER :				return (actualKilowats > desiredKilowattExcess);
 		case Parameter::NOT_EQUAL:			return (actualKilowats != desiredKilowattExcess);
@@ -1821,7 +1817,7 @@ Bool ScriptConditions::evaluateSkirmishSpecialPowerIsReady(Parameter *pSkirmishP
 	Bool found = false;
 	Player::PlayerTeamList::const_iterator it;
 	Player *pPlayer = playerFromParam(pSkirmishPlayerParm);
-	if (pPlayer==NULL) 
+	if (pPlayer==NULL)
 		return false;
 
 	for (it = pPlayer->getPlayerTeams()->begin(); it != pPlayer->getPlayerTeams()->end(); ++it) {
@@ -1896,7 +1892,7 @@ Bool ScriptConditions::evaluateUnitHasEmptied(Parameter *pUnitParm)
 	UnsignedInt frameNum = TheGameLogic->getFrame();
 
 
-	if (stats == NULL) 
+	if (stats == NULL)
 	{
 		TransportStatus *transportStatus = newInstance(TransportStatus);
 		transportStatus->m_objID = object->getID();
@@ -1935,7 +1931,7 @@ Bool ScriptConditions::evaluateTeamIsContained(Parameter *pTeamParm, Bool allCon
 		if (!obj) {
 			continue;
 		}
-		
+
 		Bool isContained = (obj->getContainedBy() != NULL);
 		if (!isContained) {
 			// we could still be exiting, in which case we should pretend like we are contained.
@@ -1994,10 +1990,10 @@ Bool ScriptConditions::evaluateTeamHasObjectStatus(Parameter *pTeamParm, Paramet
 		ObjectStatusMaskType objStatus = pObjectStatus->getStatus();
 		Bool currObjHasStatus = pObj->getStatusBits().testForAny( objStatus );
 
-		if( entireTeam && !currObjHasStatus ) 
+		if( entireTeam && !currObjHasStatus )
 		{
 			return false;
-		} 
+		}
 		else if( !entireTeam && currObjHasStatus )
 		{
 			return true;
@@ -2008,12 +2004,12 @@ Bool ScriptConditions::evaluateTeamHasObjectStatus(Parameter *pTeamParm, Paramet
 	if (entireTeam) {
 		return true;
 	}
-	
+
 	return false;
 }
 
 //-------------------------------------------------------------------------------------------------
-// @todo: PERF_EVALUATE Get a perf timer on this. Should we adjust this function so that it runs like 
+// @todo: PERF_EVALUATE Get a perf timer on this. Should we adjust this function so that it runs like
 // evaluatePlayerHasUnitKindInArea
 // ?
 Bool ScriptConditions::evaluateSkirmishValueInArea(Condition *pCondition, Parameter *pSkirmishPlayerParm, Parameter *pComparisonParm, Parameter *pMoneyParm, Parameter *pTriggerParm)
@@ -2043,8 +2039,8 @@ Bool ScriptConditions::evaluateSkirmishValueInArea(Condition *pCondition, Parame
 			if (!team) {
 				continue;
 			}
-			if (team->didEnterOrExit()) {	
-				anyChanges = true; 
+			if (team->didEnterOrExit()) {
+				anyChanges = true;
 			}
 		}
 	}
@@ -2085,7 +2081,7 @@ Bool ScriptConditions::evaluateSkirmishValueInArea(Condition *pCondition, Parame
 	{
 		case Parameter::LESS_THAN :			comparison = (totalCost < pMoneyParm->getInt()); break;
 		case Parameter::LESS_EQUAL :		comparison = (totalCost <= pMoneyParm->getInt()); break;
-		case Parameter::EQUAL :					comparison = (totalCost == pMoneyParm->getInt()); break; 
+		case Parameter::EQUAL :					comparison = (totalCost == pMoneyParm->getInt()); break;
 		case Parameter::GREATER_EQUAL :	comparison = (totalCost >= pMoneyParm->getInt()); break;
 		case Parameter::GREATER :				comparison = (totalCost > pMoneyParm->getInt()); break;
 		case Parameter::NOT_EQUAL :			comparison = (totalCost != pMoneyParm->getInt()); break;
@@ -2127,7 +2123,7 @@ Bool ScriptConditions::evaluateSkirmishSuppliesWithinDistancePerimeter(Parameter
 	Coord3D center;
 	trigger->getCenterPoint(&center);
 	Real distance = trigger->getRadius() + pDistanceParm->getReal();
-	
+
 	Real compareToValue = pValueParm->getReal();
 
 	PartitionFilterAcceptByKindOf f1(MAKE_KINDOF_MASK(KINDOF_STRUCTURE), KINDOFMASK_NONE);
@@ -2251,13 +2247,13 @@ Bool ScriptConditions::evaluateSkirmishUnownedFactionUnitComparison( Parameter *
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 				Object *obj = objIter.cur();
 				if (!obj) {
 					continue;
 				}
-				
+
 				if( obj->isDisabledByType( DISABLED_UNMANNED ) )
 				{
 					++numFactionUnits;
@@ -2265,7 +2261,7 @@ Bool ScriptConditions::evaluateSkirmishUnownedFactionUnitComparison( Parameter *
 			}
 		}
 	}
-		
+
 	switch (pComparisonParm->getInt())
 	{
 		case Parameter::LESS_THAN			:	return numFactionUnits < pCountParm->getInt();	break;
@@ -2302,7 +2298,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasComparisonGarrisoned(Parameter *
 		return FALSE;
 	}
 
-	// Note: This looks slow, and probably is. 
+	// Note: This looks slow, and probably is.
 	// @todo: PERF_EVALUATE
 	Int numGarrisonedBuildings = 0;
 	Player::PlayerTeamList::const_iterator it;
@@ -2312,18 +2308,18 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasComparisonGarrisoned(Parameter *
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 				Object *obj = objIter.cur();
 				if (!obj) {
 					continue;
 				}
-				
+
 				ContainModuleInterface *cmi = obj->getContain();
 				if (!cmi) {
 					continue;
 				}
-				
+
 				if (cmi->isGarrisonable() && cmi->getContainCount() > 0) {
 					++numGarrisonedBuildings;
 				}
@@ -2353,7 +2349,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasComparisonCapturedUnits(Paramete
 		return FALSE;
 	}
 
-	// Note: This looks slow, and probably is. 
+	// Note: This looks slow, and probably is.
 	// @todo: PERF_EVALUATE
 	Int numCapturedUnits = 0;
 	Player::PlayerTeamList::const_iterator it;
@@ -2363,7 +2359,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasComparisonCapturedUnits(Paramete
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 				Object *obj = objIter.cur();
 				if (!obj) {
@@ -2426,7 +2422,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasUnitsInArea(Condition *pConditio
 				continue;
 			}
 			if (team->didEnterOrExit()) {
-				anyChanges = true; 
+				anyChanges = true;
 			}
 		}
 	}
@@ -2478,7 +2474,7 @@ Bool ScriptConditions::evaluateSkirmishSupplySourceSafe(Condition *pCondition, P
 		pCondition->setCustomData(1); // true.
 	}
 	return isSafe;
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateSkirmishSupplySourceAttacked(Parameter *pSkirmishPlayerParm)
@@ -2488,7 +2484,7 @@ Bool ScriptConditions::evaluateSkirmishSupplySourceAttacked(Parameter *pSkirmish
 		return FALSE;
 	}
 	return player->isSupplySourceAttacked( );
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateSkirmishStartPosition(Parameter *pSkirmishPlayerParm, Parameter *pStartNdx)
@@ -2500,7 +2496,7 @@ Bool ScriptConditions::evaluateSkirmishStartPosition(Parameter *pSkirmishPlayerP
 	Int ndx = pStartNdx->getInt()-1;  // externally 1, 2, 3, internally 0, 1, 2.
 	Int startNdx = player->getMpStartIndex();
 	return ndx == startNdx;
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateSkirmishPlayerHasBeenAttackedByPlayer(Parameter *pSkirmishPlayerParm, Parameter *pAttackedByParm )
@@ -2509,7 +2505,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasBeenAttackedByPlayer(Parameter *
 	if (!player) {
 		return FALSE;
 	}
-	
+
 	Player *srcPlayer = playerFromParam(pAttackedByParm);
 	if (!srcPlayer ) {
 		return FALSE;
@@ -2557,7 +2553,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasDiscoveredPlayer(Parameter *pSki
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 				Object *obj = objIter.cur();
 				if (!obj) {
@@ -2589,7 +2585,7 @@ Bool ScriptConditions::evaluatePlayerLostObjectType(Parameter *pPlayerParm, Para
 	if (!player) {
 		return FALSE;
 	}
-	
+
 	ObjectTypesTemp objs;
 	objectTypesFromParam(pTypeParm, objs.m_types);
 
@@ -2619,34 +2615,34 @@ Bool ScriptConditions::evaluatePlayerLostObjectType(Parameter *pPlayerParm, Para
 Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 {
 	switch (pCondition->getConditionType()) {
-		default: 
-			DEBUG_CRASH(("Unknown ScriptCondition type %d", pCondition->getConditionType())); 
+		default:
+			DEBUG_CRASH(("Unknown ScriptCondition type %d", pCondition->getConditionType()));
 			return false;
-		case Condition::PLAYER_ALL_DESTROYED: 
+		case Condition::PLAYER_ALL_DESTROYED:
 			return evaluateAllDestroyed(pCondition->getParameter(0));
-		case Condition::PLAYER_ALL_BUILDFACILITIES_DESTROYED: 
+		case Condition::PLAYER_ALL_BUILDFACILITIES_DESTROYED:
 			return evaluateAllBuildFacilitiesDestroyed(pCondition->getParameter(0));
-		case Condition::TEAM_INSIDE_AREA_PARTIALLY: 
+		case Condition::TEAM_INSIDE_AREA_PARTIALLY:
 			return evaluateTeamInsideAreaPartially(pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2));
-		case Condition::NAMED_INSIDE_AREA: 
+		case Condition::NAMED_INSIDE_AREA:
 			return evaluateNamedInsideArea(pCondition->getParameter(0), pCondition->getParameter(1));
-		case Condition::TEAM_DESTROYED: 
+		case Condition::TEAM_DESTROYED:
 			return evaluateIsDestroyed(pCondition->getParameter(0));
-		case Condition::NAMED_DESTROYED: 
+		case Condition::NAMED_DESTROYED:
 			return evaluateNamedUnitDestroyed(pCondition->getParameter(0));
-		case Condition::NAMED_DYING: 
+		case Condition::NAMED_DYING:
 			return evaluateNamedUnitDying(pCondition->getParameter(0));
-		case Condition::NAMED_TOTALLY_DEAD: 
+		case Condition::NAMED_TOTALLY_DEAD:
 			return evaluateNamedUnitTotallyDead(pCondition->getParameter(0));
-		case Condition::NAMED_NOT_DESTROYED: 
+		case Condition::NAMED_NOT_DESTROYED:
 			return evaluateNamedUnitExists(pCondition->getParameter(0));
-		case Condition::TEAM_HAS_UNITS: 
+		case Condition::TEAM_HAS_UNITS:
 			return evaluateHasUnits(pCondition->getParameter(0));
-		case Condition::CAMERA_MOVEMENT_FINISHED: 
+		case Condition::CAMERA_MOVEMENT_FINISHED:
 			return TheTacticalView->isCameraMovementFinished();
-		case Condition::TEAM_STATE_IS: 
+		case Condition::TEAM_STATE_IS:
 			return evaluateTeamStateIs(pCondition->getParameter(0), pCondition->getParameter(1));
-		case Condition::TEAM_STATE_IS_NOT: 
+		case Condition::TEAM_STATE_IS_NOT:
 			return evaluateTeamStateIsNot(pCondition->getParameter(0), pCondition->getParameter(1));
 		case Condition::NAMED_OUTSIDE_AREA:
 			return evaluateNamedOutsideArea(pCondition->getParameter(0), pCondition->getParameter(1));
@@ -2681,7 +2677,7 @@ Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 		case Condition::BUILDING_ENTERED_BY_PLAYER:
 			return evaluateBuildingEntered(pCondition->getParameter(0), pCondition->getParameter(1));
 		case Condition::ENEMY_SIGHTED:
-		{	
+		{
 			Int numParameters = pCondition->getNumParameters();
 			DEBUG_ASSERTCRASH(numParameters == 3, ("'Condition: [Unit] Unit has sighted a(n) friendly/neutral/enemy unit belonging to a side.' has too few parameters. Please fix in WB. (jkmcd)"));
 
@@ -2761,7 +2757,7 @@ Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 			return evaluateSciencePurchasePoints(pCondition->getParameter(0), pCondition->getParameter(1));
 		case Condition::DEFUNCT_PLAYER_SELECTED_GENERAL:
 		case Condition::DEFUNCT_PLAYER_SELECTED_GENERAL_FROM_NAMED:
-			DEBUG_CRASH(("PLAYER_SELECTED_GENERAL script conditions are no longer in use\n")); 
+			DEBUG_CRASH(("PLAYER_SELECTED_GENERAL script conditions are no longer in use"));
 			return false;
 		case Condition::PLAYER_BUILT_UPGRADE:
 			return evaluateUpgradeFromUnitComplete(pCondition->getParameter(0), pCondition->getParameter(1), NULL);
@@ -2772,7 +2768,7 @@ Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 		case Condition::PLAYER_DESTROYED_N_BUILDINGS_PLAYER:
 			return evaluatePlayerDestroyedNOrMoreBuildings(pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2));
 		case Condition::PLAYER_HAS_COMPARISON_UNIT_TYPE_IN_TRIGGER_AREA:
-		{	
+		{
 			Int numParameters = pCondition->getNumParameters();
 			DEBUG_ASSERTCRASH(numParameters == 5, ("'Condition: [Player] has (comparison) unit type in an area' has too few parameters. Please fix in WB. (jkmcd)"));
 
@@ -2795,16 +2791,16 @@ Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 		}
 		case Condition::UNIT_EMPTIED:
 			return evaluateUnitHasEmptied(pCondition->getParameter(0));
-			
+
 		case Condition::PLAYER_POWER_COMPARE_PERCENT:
 			return evaluatePlayerHasComparisonPercentPower(pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2));
-			
+
 		case Condition::PLAYER_EXCESS_POWER_COMPARE_VALUE:
 			return evaluatePlayerHasComparisonValueExcessPower(pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2));
-			
+
 		case Condition::SKIRMISH_SPECIAL_POWER_READY:
 			return evaluateSkirmishSpecialPowerIsReady(pCondition->getParameter(0), pCondition->getParameter(1));
-			
+
 		case Condition::UNIT_HAS_OBJECT_STATUS:
 			return evaluateUnitHasObjectStatus(pCondition->getParameter(0), pCondition->getParameter(1));
 
@@ -2813,7 +2809,7 @@ Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 
 		case Condition::TEAM_SOME_HAVE_OBJECT_STATUS:
 			return evaluateTeamHasObjectStatus(pCondition->getParameter(0), pCondition->getParameter(1), false);
-			
+
 		case Condition::SKIRMISH_VALUE_IN_AREA:
 			return evaluateSkirmishValueInArea(pCondition, pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2), pCondition->getParameter(3));
 
@@ -2837,44 +2833,44 @@ Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 
 		case Condition::SKIRMISH_PLAYER_HAS_PREREQUISITE_TO_BUILD:
 			return evaluateSkirmishPlayerHasPrereqsToBuild(pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::SKIRMISH_PLAYER_HAS_COMPARISON_GARRISONED:
 			return evaluateSkirmishPlayerHasComparisonGarrisoned(pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2));
-		
+
 		case Condition::SKIRMISH_PLAYER_HAS_COMPARISON_CAPTURED_UNITS:
 			return evaluateSkirmishPlayerHasComparisonCapturedUnits(pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2));
-		
+
 		case Condition::SKIRMISH_NAMED_AREA_EXIST:
 			return evaluateSkirmishNamedAreaExists(pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::SKIRMISH_PLAYER_HAS_UNITS_IN_AREA:
 			return evaluateSkirmishPlayerHasUnitsInArea(pCondition, pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::SKIRMISH_PLAYER_HAS_BEEN_ATTACKED_BY_PLAYER:
 			return evaluateSkirmishPlayerHasBeenAttackedByPlayer(pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::SKIRMISH_PLAYER_IS_OUTSIDE_AREA:
 			return evaluateSkirmishPlayerIsOutsideArea(pCondition, pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::SKIRMISH_PLAYER_HAS_DISCOVERED_PLAYER:
 			return evaluateSkirmishPlayerHasDiscoveredPlayer(pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::MUSIC_TRACK_HAS_COMPLETED:
 			return evaluateMusicHasCompleted(pCondition->getParameter(0), pCondition->getParameter(1));
 
 		case Condition::SUPPLY_SOURCE_SAFE:
 			return evaluateSkirmishSupplySourceSafe(pCondition, pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::SUPPLY_SOURCE_ATTACKED:
 			return evaluateSkirmishSupplySourceAttacked(pCondition->getParameter(0));
-		
+
 		case Condition::START_POSITION_IS:
 			return evaluateSkirmishStartPosition(pCondition->getParameter(0), pCondition->getParameter(1));
 
 		case Condition::PLAYER_LOST_OBJECT_TYPE:
 			return evaluatePlayerLostObjectType(pCondition->getParameter(0), pCondition->getParameter(1));
 
-		
+
 	}
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
index 8d63c563fe8..5bb04e08179 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
@@ -26,12 +26,12 @@
 // The game scripting engine.  Interprets scripts.
 // Author: John Ahlquist, Nov. 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/DataChunk.h"
 #include "Common/file.h"
 #include "Common/FileSystem.h"
-#include "Common/GameEngine.h"
+#include "Common/FramePacer.h"
 #include "Common/GameState.h"
 #include "Common/LatchRestore.h"
 #include "Common/MessageStream.h"
@@ -56,11 +56,6 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/SidesList.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // These are for debugger window
 static int st_LastCurrentFrame;
@@ -104,7 +99,7 @@ Bool st_particleSystemNeedsStopping = FALSE; ///< Set along with st_particleSyst
 #define FORMAT_STRING_LEADING_STRING		"%s%.2f"
 // That's it for particle editor
 
-#if defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	#define DO_VTUNE_STUFF
 #endif
 
@@ -112,7 +107,7 @@ Bool st_particleSystemNeedsStopping = FALSE; ///< Set along with st_particleSyst
 
 //typedef __declspec(dllimport) void __cdecl (*VTProc)();
 	typedef void (*VTProc)();
-	
+
 	static Bool						st_EnableVTune = false;
 	static HMODULE				st_vTuneDLL = NULL;
 	static VTProc VTPause = NULL;
@@ -134,21 +129,21 @@ static const Int FRAMES_TO_SHOW_WIN_LOSE_MESSAGE = 120;
 static const Int FRAMES_TO_FADE_IN_AT_START = 33;
 
 
-//------------------------------------------------------------------------------ Performance Timers 
+//------------------------------------------------------------------------------ Performance Timers
 //#include "Common/PerfMetrics.h"
 //#include "Common/PerfTimer.h"
 
 // GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
 ScriptEngine *TheScriptEngine = NULL;
 
-/// Local classes 
+/// Local classes
 /// AttackPriorityInfo class
 
 static const Int ATTACK_PRIORITY_DEFAULT = 1;
 //-------------------------------------------------------------------------------------------------
 /** Ctor */
 //-------------------------------------------------------------------------------------------------
-AttackPriorityInfo::AttackPriorityInfo() :m_defaultPriority(ATTACK_PRIORITY_DEFAULT), m_priorityMap(NULL) 
+AttackPriorityInfo::AttackPriorityInfo() :m_defaultPriority(ATTACK_PRIORITY_DEFAULT), m_priorityMap(NULL)
 {
 	m_name.clear();
 }
@@ -158,7 +153,7 @@ AttackPriorityInfo::AttackPriorityInfo() :m_defaultPriority(ATTACK_PRIORITY_DEFA
 //-------------------------------------------------------------------------------------------------
 AttackPriorityInfo::~AttackPriorityInfo()
 {
-	if (m_priorityMap) delete m_priorityMap;
+	delete m_priorityMap;
 	m_priorityMap = NULL;
 }
 
@@ -185,7 +180,7 @@ Int AttackPriorityInfo::getPriority(const ThingTemplate *tThing) const
 	tThing = (const ThingTemplate *)tThing->getFinalOverride();
 	if (m_priorityMap && !m_priorityMap->empty()) {
 		AttackPriorityMap::const_iterator it = m_priorityMap->find(tThing);
-		if (it != m_priorityMap->end()) 
+		if (it != m_priorityMap->end())
 		{
 			priority = (*it).second;
 		}
@@ -198,13 +193,13 @@ Int AttackPriorityInfo::getPriority(const ThingTemplate *tThing) const
 //-------------------------------------------------------------------------------------------------
 void AttackPriorityInfo::dumpPriorityInfo(void)
 {
-	DEBUG_LOG(("Attack priority '%s', default %d\n", m_name.str(), m_defaultPriority));
+	DEBUG_LOG(("Attack priority '%s', default %d", m_name.str(), m_defaultPriority));
 	if (m_priorityMap==NULL) return;
 	for (AttackPriorityMap::const_iterator it = m_priorityMap->begin(); it != m_priorityMap->end(); ++it) {
 		const ThingTemplate *tThing = (*it).first;
 		Int priority = (*it).second;
 		(void)tThing; (void)priority;
-		DEBUG_LOG(("  Thing '%s' priority %d\n",tThing->getName().str(), priority));
+		DEBUG_LOG(("  Thing '%s' priority %d",tThing->getName().str(), priority));
 	}
 }
 #endif
@@ -221,16 +216,10 @@ void AttackPriorityInfo::reset( void )
 	// go back to default priority
 	m_defaultPriority = ATTACK_PRIORITY_DEFAULT;
 
-	// delete the priority map if present
-	if( m_priorityMap )
-	{
-
-		delete m_priorityMap;
-		m_priorityMap = NULL;
-
-	}  // end if
+	delete m_priorityMap;
+	m_priorityMap = NULL;
 
-}  // end reset
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -238,7 +227,7 @@ void AttackPriorityInfo::reset( void )
 void AttackPriorityInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -271,11 +260,11 @@ void AttackPriorityInfo::xfer( Xfer *xfer )
 	if( m_priorityMap )
 	{
 		AttackPriorityMap::const_iterator it;
-		
+
 		for( it = m_priorityMap->begin(); it != m_priorityMap->end(); ++it )
 			++priorityMapCount;
-	
-	}  // end if
+
+	}
 	xfer->xferUnsignedShort( &priorityMapCount );
 
 	// priority map
@@ -300,24 +289,24 @@ void AttackPriorityInfo::xfer( Xfer *xfer )
 				// write thing template name
 				thingTemplate = (*it).first;
 				thingTemplateName = thingTemplate->getName();
-				DEBUG_ASSERTCRASH( thingTemplateName.isEmpty() == FALSE, 
-													 ("AttackPriorityInfo::xfer - Writing an empty thing template name\n") );
+				DEBUG_ASSERTCRASH( thingTemplateName.isEmpty() == FALSE,
+													 ("AttackPriorityInfo::xfer - Writing an empty thing template name") );
 				xfer->xferAsciiString( &thingTemplateName );
 
 				// write priority
 				priority = (*it).second;
 				xfer->xferInt( &priority );
 
-			}  // end for i
+			}
 
 			// sanity
-			DEBUG_ASSERTCRASH( count == priorityMapCount, 
-												("AttackPriorityInfo::xfer - Mismatch in priority map size.  Size() method returned '%d' but actual iteration count was '%d'\n",
+			DEBUG_ASSERTCRASH( count == priorityMapCount,
+												("AttackPriorityInfo::xfer - Mismatch in priority map size.  Size() method returned '%d' but actual iteration count was '%d'",
 												 priorityMapCount, count) );
 
-		}  // end if
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -331,11 +320,11 @@ void AttackPriorityInfo::xfer( Xfer *xfer )
 			if( thingTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "AttackPriorityInfo::xfer - Unable to find thing template '%s'\n",
+				DEBUG_CRASH(( "AttackPriorityInfo::xfer - Unable to find thing template '%s'",
 											thingTemplateName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// read priority
 			xfer->xferInt( &priority );
@@ -343,11 +332,11 @@ void AttackPriorityInfo::xfer( Xfer *xfer )
 			// set priority (this will allocate the map on the first call as well)
 			setPriority( thingTemplate, priority );
 
-		}  // end for
+		}
 
-	}  // end else, load
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -355,7 +344,7 @@ void AttackPriorityInfo::xfer( Xfer *xfer )
 void AttackPriorityInfo::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ScriptEngine class
 
@@ -373,8 +362,6 @@ m_skirmishHumanPlayer(NULL),
 m_fade(FADE_NONE),
 m_freezeByScript(FALSE),
 m_frameObjectCountChanged(0),
-//Added By Sadullah Nader
-//Initializations inserted
 m_closeWindowTimer(0),
 m_curFadeFrame(0),
 m_curFadeValue(0.0f),
@@ -389,14 +376,13 @@ m_numAttackInfo(0),
 m_shownMPLocalDefeatWindow(FALSE),
 m_objectsShouldReceiveDifficultyBonus(TRUE),
 m_ChooseVictimAlwaysUsesNormal(false)
-//
 {
 	st_CanAppCont = true;
 	st_LastCurrentFrame = st_CurrentFrame = 0;
 	// By default, difficulty should be normal.
 	setGlobalDifficulty(DIFFICULTY_NORMAL);
 
-}  // end ScriptEngine
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -427,7 +413,7 @@ ScriptEngine::~ScriptEngine()
 #endif
 
 	reset(); // just in case.
-}  // end ~ScriptEngine
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Init */
@@ -440,7 +426,7 @@ void ScriptEngine::init( void )
 		} else {
 			st_DebugDLL = NULL;
 		}
-		
+
 		if (TheGlobalData->m_particleEdit) {
 			st_ParticleDLL = LoadLibrary("ParticleEditor.dll");
 		} else {
@@ -472,7 +458,7 @@ void ScriptEngine::init( void )
 	m_maxUpdateTime=0;
 #endif
 #endif
-	
+
 	if (TheScriptActions) {
 		TheScriptActions->init();
 	}
@@ -483,7 +469,7 @@ void ScriptEngine::init( void )
 			1. In Scripts.h, add an enum element to enum ScriptActionType just before NUM_ITEMS.
 			2. Go to the end of this section of templates, and create a template.
 			3. Go to ScriptActions.h and add a protected method.
-			4. Go to ScriptActions.cpp, and add your enum to the 
+			4. Go to ScriptActions.cpp, and add your enum to the
 					switch in ScriptActions::executeAction to call your method in 3 above.
 	*/
 
@@ -808,7 +794,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numParameters = 2;
 	curTemplate->m_parameters[0] = Parameter::TEAM;
 	curTemplate->m_parameters[1] = Parameter::INT;
-	curTemplate->m_numUiStrings = 3;									  
+	curTemplate->m_numUiStrings = 3;
 	curTemplate->m_uiStrings[0] = "Have Team ";
 	curTemplate->m_uiStrings[1] = " guard attacked or closest supply src with at least ";
 	curTemplate->m_uiStrings[2] = " available resources";
@@ -1350,7 +1336,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[0] = "";
 	curTemplate->m_uiStrings[1] = " attempts to purchase Science ";
 	curTemplate->m_uiStrings[2] = ".";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::PLAYER_SCIENCE_AVAILABILITY];
 	curTemplate->m_name = "[Player] Set science availability.";
 	curTemplate->m_numParameters = 3;
@@ -1362,7 +1348,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[1] = " set ";
 	curTemplate->m_uiStrings[2] = " availability to ";
 	curTemplate->m_uiStrings[3] = ".";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::SET_BASE_CONSTRUCTION_SPEED];
 	curTemplate->m_name = "[Player] Set the delay between building teams.";
 	curTemplate->m_numParameters = 2;
@@ -1925,7 +1911,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = "A radar event occurs at ";
 	curTemplate->m_uiStrings[1] = " of type ";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::RADAR_DISABLE];
 	curTemplate->m_name = "[Radar] Disable the radar.";
 	curTemplate->m_numParameters = 0;
@@ -2271,7 +2257,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_parameters[0] = Parameter::REAL;
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = "Set the audible range during camera-up shots to ";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::NAMED_SET_HELD];
 	curTemplate->m_name = "[Unit] Set unit to be held in place, ignoring Physics, Locomotors, etc.";
 	curTemplate->m_numParameters = 2;
@@ -2510,7 +2496,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numParameters = 0;
 	curTemplate->m_numUiStrings = 1;
 	curTemplate->m_uiStrings[0] = "Refresh radar terrain.";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::NAMED_STOP];
 	curTemplate->m_name = "[Unit] Set a specific unit to stop.";
 	curTemplate->m_numParameters = 1;
@@ -2801,7 +2787,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[4] = " dam/sec.";
 
 	curTemplate = &m_actionTemplates[ ScriptAction::NAMED_USE_COMMANDBUTTON_ABILITY ];
-	curTemplate->m_name = "[Unit] Use commandbutton ability."; 
+	curTemplate->m_name = "[Unit] Use commandbutton ability.";
 	curTemplate->m_numParameters = 2;
 	curTemplate->m_parameters[0] = Parameter::UNIT;
 	curTemplate->m_parameters[1] = Parameter::COMMANDBUTTON_ABILITY;
@@ -2811,7 +2797,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[2] = ".";
 
 	curTemplate = &m_actionTemplates[ ScriptAction::NAMED_USE_COMMANDBUTTON_ABILITY_ON_NAMED ];
-	curTemplate->m_name = "[Unit] Use commandbutton ability on an object."; 
+	curTemplate->m_name = "[Unit] Use commandbutton ability on an object.";
 	curTemplate->m_numParameters = 3;
 	curTemplate->m_parameters[0] = Parameter::UNIT;
 	curTemplate->m_parameters[1] = Parameter::COMMANDBUTTON_ABILITY;
@@ -2823,7 +2809,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[3] = ".";
 
 	curTemplate = &m_actionTemplates[ ScriptAction::NAMED_USE_COMMANDBUTTON_ABILITY_AT_WAYPOINT ];
-	curTemplate->m_name = "[Unit] Use commandbutton ability at a waypoint."; 
+	curTemplate->m_name = "[Unit] Use commandbutton ability at a waypoint.";
 	curTemplate->m_numParameters = 3;
 	curTemplate->m_parameters[0] = Parameter::UNIT;
 	curTemplate->m_parameters[1] = Parameter::COMMANDBUTTON_ABILITY;
@@ -2835,7 +2821,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[3] = ".";
 
 	curTemplate = &m_actionTemplates[ ScriptAction::TEAM_USE_COMMANDBUTTON_ABILITY ];
-	curTemplate->m_name = "[Team] Use commandbutton ability."; 
+	curTemplate->m_name = "[Team] Use commandbutton ability.";
 	curTemplate->m_numParameters = 2;
 	curTemplate->m_parameters[0] = Parameter::TEAM;
 	curTemplate->m_parameters[1] = Parameter::COMMANDBUTTON_ALL_ABILITIES;
@@ -2845,7 +2831,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[2] = ".";
 
 	curTemplate = &m_actionTemplates[ ScriptAction::TEAM_USE_COMMANDBUTTON_ABILITY_ON_NAMED ];
-	curTemplate->m_name = "[Team] Use commandbutton ability on an object."; 
+	curTemplate->m_name = "[Team] Use commandbutton ability on an object.";
 	curTemplate->m_numParameters = 3;
 	curTemplate->m_parameters[0] = Parameter::TEAM;
 	curTemplate->m_parameters[1] = Parameter::COMMANDBUTTON_ALL_ABILITIES;
@@ -2857,7 +2843,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[3] = ".";
 
 	curTemplate = &m_actionTemplates[ ScriptAction::TEAM_USE_COMMANDBUTTON_ABILITY_AT_WAYPOINT ];
-	curTemplate->m_name = "[Team] Use commandbutton ability at a waypoint."; 
+	curTemplate->m_name = "[Team] Use commandbutton ability at a waypoint.";
 	curTemplate->m_numParameters = 3;
 	curTemplate->m_parameters[0] = Parameter::TEAM;
 	curTemplate->m_parameters[1] = Parameter::COMMANDBUTTON_ALL_ABILITIES;
@@ -3026,7 +3012,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[0] = "";
 	curTemplate->m_uiStrings[1] = " will move towards the nearest ";
 	curTemplate->m_uiStrings[2] = " within ";
-	
+
  	curTemplate = &m_actionTemplates[ScriptAction::SKIRMISH_ATTACK_NEAREST_GROUP_WITH_VALUE];
 	curTemplate->m_name = "[Skirmish] Team attacks nearest group matching value comparison.";
 	curTemplate->m_numParameters = 3;
@@ -3048,7 +3034,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 5;
 	curTemplate->m_uiStrings[0] = "";
 	curTemplate->m_uiStrings[1] = " performs ";
-	curTemplate->m_uiStrings[2] = " on most expensive object within ";	
+	curTemplate->m_uiStrings[2] = " on most expensive object within ";
 	curTemplate->m_uiStrings[3] = " ";
 	curTemplate->m_uiStrings[4] = " (true = all valid sources, false = first valid source).";
 
@@ -3061,9 +3047,9 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 4;
 	curTemplate->m_uiStrings[0] = "";
 	curTemplate->m_uiStrings[1] = " 's ";
-	curTemplate->m_uiStrings[2] = " all wait until ";	
+	curTemplate->m_uiStrings[2] = " all wait until ";
 	curTemplate->m_uiStrings[3] = " is ready.";
-	
+
  	curTemplate = &m_actionTemplates[ScriptAction::SKIRMISH_WAIT_FOR_COMMANDBUTTON_AVAILABLE_PARTIAL];
 	curTemplate->m_name = "[Skirmish] Delay a sequential script until the specified command ability is ready - partial.";
 	curTemplate->m_numParameters = 3;
@@ -3073,9 +3059,9 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 4;
 	curTemplate->m_uiStrings[0] = "";
 	curTemplate->m_uiStrings[1] = " 's ";
-	curTemplate->m_uiStrings[2] = " wait until at least one member is ";	
+	curTemplate->m_uiStrings[2] = " wait until at least one member is ";
 	curTemplate->m_uiStrings[3] = " ready.";
-	
+
  	curTemplate = &m_actionTemplates[ScriptAction::TEAM_SPIN_FOR_FRAMECOUNT];
 	curTemplate->m_name = "[Team] Set to continue current action for some number of frames.";
 	curTemplate->m_numParameters = 2;
@@ -3363,7 +3349,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = "";
 	curTemplate->m_uiStrings[1] = " begin facing ";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::TEAM_FACE_NAMED];
 	curTemplate->m_name = "[Team] Set team to face another unit.";
 	curTemplate->m_numParameters = 2;
@@ -3381,7 +3367,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = "";
 	curTemplate->m_uiStrings[1] = " begin facing ";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::COMMANDBAR_REMOVE_BUTTON_OBJECTTYPE];
 	curTemplate->m_name = "[Scripting] Remove a command button from an object type.";
 	curTemplate->m_numParameters = 2;
@@ -3453,7 +3439,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = "Enable Object Bonuses based on difficulty ";
 	curTemplate->m_uiStrings[1] = " (true to enable, false to disable).";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::TEAM_GUARD_IN_TUNNEL_NETWORK];
 	curTemplate->m_name = "[Team] Set to guard - from inside tunnel network.";
 	curTemplate->m_numParameters = 1;
@@ -3510,7 +3496,7 @@ void ScriptEngine::init( void )
 			1. In Scripts.h, add an enum element to enum ConditionType just before NUM_ITEMS.
 			2. Go to the end of this section of templates, and create a template.
 			3. Go to ScriptConditions.h and add a protected method.
-			4. Go to ScriptConditions.cpp, and add your enum to the 
+			4. Go to ScriptConditions.cpp, and add your enum to the
 					switch in ScriptConditions::evaluateCondition to call your method in 3 above.
 	*/
 
@@ -3570,7 +3556,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = "";
 	curTemplate->m_uiStrings[1] = " state IS NOT ";
-																										 
+
 	curTemplate = &m_conditionTemplates[Condition::CONDITION_TRUE];
 	curTemplate->m_name = "[Scripting] True.";
 	curTemplate->m_numParameters = 0;
@@ -3712,7 +3698,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_parameters[1] = Parameter::TRIGGER_AREA;
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = "";
-	curTemplate->m_uiStrings[1] = " is outside ";	
+	curTemplate->m_uiStrings[1] = " is outside ";
 
 	curTemplate = &m_conditionTemplates[Condition::TEAM_INSIDE_AREA_ENTIRELY];
 	curTemplate->m_name = "[Team] Team completely inside an area.";
@@ -4395,8 +4381,8 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[1] = ". There are ";
 	curTemplate->m_uiStrings[2] = " ";
 	curTemplate->m_uiStrings[3] = " unowned faction units.";
-	
-	
+
+
 	curTemplate = &m_conditionTemplates[Condition::SKIRMISH_PLAYER_HAS_PREREQUISITE_TO_BUILD];
 	curTemplate->m_name = "[Skirmish] Player has prerequisites to build an object type.";
 	curTemplate->m_numParameters = 2;
@@ -4406,7 +4392,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[0] = "";
 	curTemplate->m_uiStrings[1] = " can build ";
 	curTemplate->m_uiStrings[2] = ".";
-	
+
 	curTemplate = &m_conditionTemplates[Condition::SKIRMISH_PLAYER_HAS_COMPARISON_GARRISONED];
 	curTemplate->m_name = "[Skirmish] Player has garrisoned buildings -- comparison.";
 	curTemplate->m_numParameters = 3;
@@ -4440,7 +4426,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[0] = "";
 	curTemplate->m_uiStrings[1] = ". ";
 	curTemplate->m_uiStrings[2] = " exists.";
-	
+
 	curTemplate = &m_conditionTemplates[Condition::SKIRMISH_PLAYER_HAS_UNITS_IN_AREA];
 	curTemplate->m_name = "[Skirmish] Player has units in an area";
 	curTemplate->m_numParameters = 2;
@@ -4529,11 +4515,11 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[0] = "";
 	curTemplate->m_uiStrings[1] = " has lost an object of type ";
 	curTemplate->m_uiStrings[2] = " (can be an object type list).";
-	
+
 
 	reset();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -4541,11 +4527,11 @@ void ScriptEngine::init( void )
 void ScriptEngine::reset( void )
 {
 	// setting FPS limit in case a script had changed it
-	if (TheGameEngine && TheGlobalData)
-		TheGameEngine->setFramesPerSecondLimit(TheGlobalData->m_framesPerSecondLimit);
+	if (TheFramePacer && TheGlobalData)
+		TheFramePacer->setFramesPerSecondLimit(TheGlobalData->m_framesPerSecondLimit);
 
 	if (TheScriptActions) {
-		TheScriptActions->reset();	 
+		TheScriptActions->reset();
 	}
 	if (TheScriptConditions) {
 		TheScriptConditions->reset();
@@ -4593,9 +4579,10 @@ void ScriptEngine::reset( void )
 #ifdef SPECIAL_SCRIPT_PROFILING
 #ifdef DEBUG_LOGGING
 	if (m_numFrames > 1) {
-		DEBUG_LOG(("\n***SCRIPT ENGINE STATS %.0f frames:\n", m_numFrames));
-		DEBUG_LOG(("Avg time to update %.3f milisec\n", 1000*m_totalUpdateTime/m_numFrames));
-		DEBUG_LOG(("  Max time to update %.3f miliseconds.\n", m_maxUpdateTime*1000));
+		DEBUG_LOG_RAW(("\n"));
+		DEBUG_LOG(("***SCRIPT ENGINE STATS %.0f frames:", m_numFrames));
+		DEBUG_LOG(("Avg time to update %.3f milisec", 1000*m_totalUpdateTime/m_numFrames));
+		DEBUG_LOG(("  Max time to update %.3f miliseconds.", m_maxUpdateTime*1000));
 	}
 	m_numFrames=0;
 	m_totalUpdateTime=0;
@@ -4629,24 +4616,32 @@ void ScriptEngine::reset( void )
 				}
 			}
 			if (maxScript) {
-				DEBUG_LOG(("   SCRIPT %s total time %f seconds,\n        evaluated %d times, avg execution %2.3f msec (Goal less than 0.05)\n",
+				DEBUG_LOG(("   SCRIPT %s total time %f seconds,\n        evaluated %d times, avg execution %2.3f msec (Goal less than 0.05)",
 					maxScript->getName().str(),
 					maxScript->getConditionTime(), maxScript->getConditionCount(), 1000*maxScript->getConditionTime()/maxScript->getConditionCount()) );
 				maxScript->addToConditionTime(-2*maxTime); // reset to negative.
 			}
 
 		}
-		DEBUG_LOG(("***\n"));
+		DEBUG_LOG(("***"));
 	}
 #endif
 #endif
 
 	_updateCurrentParticleCap();
 
-	VecSequentialScriptPtrIt seqScriptIt;
-	for (seqScriptIt = m_sequentialScripts.begin(); seqScriptIt != m_sequentialScripts.end(); ) {
-		cleanupSequentialScript(seqScriptIt, TRUE);
+	// delete and clear all sequential scripts.
+	VecSequentialScriptPtrIt seqScriptIt = m_sequentialScripts.begin();
+	while (seqScriptIt != m_sequentialScripts.end()) {
+		SequentialScript* seqScript = *seqScriptIt;
+		while (seqScript != NULL) {
+			SequentialScript* scriptToDelete = seqScript;
+			seqScript = seqScript->m_nextScriptInSequence;
+			deleteInstance(scriptToDelete);
+		}
+		++seqScriptIt;
 	}
+	m_sequentialScripts.clear();
 
 	// clear out all the lists of object types that were in the old map.
 	for (AllObjectTypesIt it = m_allObjectTypeLists.begin(); it != m_allObjectTypeLists.end(); it = m_allObjectTypeLists.begin() ) {
@@ -4656,11 +4651,11 @@ void ScriptEngine::reset( void )
 			m_allObjectTypeLists.erase(it);
 		}
 	}
-	DEBUG_ASSERTCRASH( m_allObjectTypeLists.empty() == TRUE, ("ScriptEngine::reset - m_allObjectTypeLists should be empty but is not!\n") );
+	DEBUG_ASSERTCRASH( m_allObjectTypeLists.empty() == TRUE, ("ScriptEngine::reset - m_allObjectTypeLists should be empty but is not!") );
 
 	// reset all the reveals that have taken place.
 	m_namedReveals.clear();
-	
+
 	// Clear the named objects list.
  	m_namedObjects.clear();
 
@@ -4689,8 +4684,8 @@ void ScriptEngine::reset( void )
 
 	// clear topple directions
 	m_toppleDirections.clear();
-		
-}  // end reset
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** newMap */
@@ -4747,7 +4742,7 @@ void ScriptEngine::newMap( void )
 				checkConditionsForTeamNames(pScr);
 			}
 		}
-	}	
+	}
 	m_firstUpdate = true;
 
 	m_fade = FADE_MULTIPLY; //default to a fade in from black.
@@ -4759,7 +4754,7 @@ void ScriptEngine::newMap( void )
 	m_fadeFramesDecrease = FRAMES_TO_FADE_IN_AT_START;
 	m_curFadeValue = 0.0f;
 
-}  // end newMap
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -4780,9 +4775,9 @@ void ScriptEngine::update( void )
 		AsciiString name = it->first;
 		Object * obj = it->second;
 		if (obj && obj->getAIUpdateInterface())
-			DEBUG_LOG(("%s=%x('%s'), isDead%d\n", name.str(), obj, obj->getName().str(), obj->getAIUpdateInterface()->isDead()));
+			DEBUG_LOG(("%s=%x('%s'), isDead%d", name.str(), obj, obj->getName().str(), obj->getAIUpdateInterface()->isDead()));
 	}
-	DEBUG_LOG(("\n\n"));
+	DEBUG_LOG(("\n"));
 */
 #endif
 #endif
@@ -4793,7 +4788,7 @@ void ScriptEngine::update( void )
 	} else {
 		particleEditorUpdate();
 	}
-	
+
 	if (m_closeWindowTimer>0) {
 		m_closeWindowTimer--;
 		if (m_closeWindowTimer < 1) {
@@ -4803,8 +4798,7 @@ void ScriptEngine::update( void )
 	if (m_endGameTimer>0) {
 		m_endGameTimer--;
 		if (m_endGameTimer < 1) {
-			// clear out all the game data
-			/*GameMessage *msg =*/ TheMessageStream->appendMessage( GameMessage::MSG_CLEAR_GAME_DATA );
+			TheGameLogic->exitGame();
 			//TheScriptActions->closeWindows(FALSE); // Close victory or defeat windows.
 		}
 	}
@@ -4815,13 +4809,13 @@ void ScriptEngine::update( void )
 	}
 
 	if (m_fade!=FADE_NONE) {
-		updateFades(); 
+		updateFades();
 	}
 
 	if (m_endGameTimer>=0) {
-		return; // we are just timing down 
+		return; // we are just timing down
 	}
-	
+
 	if (TheScriptActions) {
 		TheScriptActions->update();
 	}
@@ -4858,8 +4852,8 @@ void ScriptEngine::update( void )
 		}
 		m_currentPlayer = NULL;
 	}
-	
-	// Reset the entered/exited flag in teams, so the next update sets them 
+
+	// Reset the entered/exited flag in teams, so the next update sets them
 	// correctly.  Also, execute any team created scripts.
 	ThePlayerList->updateTeamStates();
 
@@ -4871,7 +4865,7 @@ void ScriptEngine::update( void )
 
 	// Script debugger stuff
 	st_CurrentFrame++;
-	if (st_DebugDLL) { 
+	if (st_DebugDLL) {
 		for (int j = 1; j < m_numCounters; ++j) {
 			_adjustVariable(m_counters[j].name.str(), m_counters[j].value);
 		}
@@ -4898,12 +4892,12 @@ void ScriptEngine::update( void )
 	m_curUpdateTime = timeToUpdate;
 #endif
 #endif
-	
+
 #ifdef DO_VTUNE_STUFF
 	_updateVTune();
 #endif
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** getStats */
@@ -4961,7 +4955,7 @@ AsciiString ScriptEngine::getStats(Real *curTimePtr, Real *script1Time, Real *sc
 #endif
 #endif
 	return msg;
-}  // end getStats
+}
 
 //-------------------------------------------------------------------------------------------------
 /** startQuickEndGameTimer */
@@ -4969,7 +4963,7 @@ AsciiString ScriptEngine::getStats(Real *curTimePtr, Real *script1Time, Real *sc
 void ScriptEngine::startQuickEndGameTimer( void )
 {
 	m_endGameTimer = 1;
-}  // end startQuickEndGameTimer
+}
 
 //-------------------------------------------------------------------------------------------------
 /** startEndGameTimer */
@@ -4977,7 +4971,7 @@ void ScriptEngine::startQuickEndGameTimer( void )
 void ScriptEngine::startEndGameTimer( void )
 {
 	m_endGameTimer = FRAMES_TO_SHOW_WIN_LOSE_MESSAGE;
-}  // end startEndGameTimer
+}
 
 //-------------------------------------------------------------------------------------------------
 /** startCloseWindowTimer */
@@ -4985,7 +4979,7 @@ void ScriptEngine::startEndGameTimer( void )
 void ScriptEngine::startCloseWindowTimer( void )
 {
 	m_closeWindowTimer = FRAMES_TO_SHOW_WIN_LOSE_MESSAGE;
-}  // end startCloseWindowTimer
+}
 
 //-------------------------------------------------------------------------------------------------
 /** updateFades */
@@ -4999,7 +4993,7 @@ void ScriptEngine::updateFades( void )
 		factor = (Real)m_curFadeFrame/m_fadeFramesIncrease;
 		m_curFadeValue = m_minFade + factor*(m_maxFade-m_minFade);
 		return;
-	}	
+	}
 	fade -= m_fadeFramesIncrease;
 	if (fade<=m_fadeFramesHold) {
 		m_curFadeValue = m_maxFade;
@@ -5012,10 +5006,10 @@ void ScriptEngine::updateFades( void )
 		factor = (Real)fade/divisor;
 		m_curFadeValue = m_maxFade + factor*(m_minFade-m_maxFade);
 		return;
-	}	
+	}
 	// time is up.
 	m_fade = FADE_NONE;
-}  // end updateFades
+}
 
 //-------------------------------------------------------------------------------------------------
 /** getCurrentPlayer */
@@ -5025,7 +5019,7 @@ Player *ScriptEngine::getCurrentPlayer(void)
 	if (m_currentPlayer==NULL)
 		AppendDebugMessage("***Unexpected NULL player:***", false);
 	return m_currentPlayer;
-}  // end getCurrentPlayer
+}
 
 //-------------------------------------------------------------------------------------------------
 /** clearFlag */
@@ -5044,7 +5038,7 @@ void ScriptEngine::clearFlag(const AsciiString &name)
 			}
 		}
 	}
-}  // end clearFlag
+}
 
 //-------------------------------------------------------------------------------------------------
 /** clearTeamFlags */
@@ -5060,7 +5054,7 @@ void ScriptEngine::clearTeamFlags(void)
 	clearFlag("GLA Team is Building");
 	clearFlag("GLA Inf Team is Building");
 
-}  // end clearTeamFlags
+}
 
 //-------------------------------------------------------------------------------------------------
 /** getSkirmishEnemyPlayer */
@@ -5106,7 +5100,7 @@ Player *ScriptEngine::getSkirmishPlayerFromAsciiString(const AsciiString& skirmi
 		return getSkirmishAIPlayer();
 	else if (skirmishPlayerString == SKIRMISH_PLAYER_HUMAN)
 		return getSkirmishHumanPlayer();
-	
+
 	AppendDebugMessage("***Invalid Skirmish Player name:***", false);
 
 	return NULL;
@@ -5132,7 +5126,7 @@ Player *ScriptEngine::getPlayerFromAsciiString(const AsciiString& playerString)
 			return pPlayer;
 		}
 	}
-	
+
 	AppendDebugMessage("***Invalid Player name:***", false);
 
 	return NULL;
@@ -5167,7 +5161,7 @@ ObjectTypes *ScriptEngine::getObjectTypes(const AsciiString& objectTypeList)
 void ScriptEngine::doObjectTypeListMaintenance(const AsciiString& objectTypeList, const AsciiString& objectType, Bool addObject)
 {
 	ObjectTypes *currentObjectTypeVec = getObjectTypes(objectTypeList);
-	
+
 	if (!currentObjectTypeVec) {
 		ObjectTypes *newVec = newInstance(ObjectTypes)(objectTypeList);
 		m_allObjectTypeLists.push_back(newVec);
@@ -5175,7 +5169,7 @@ void ScriptEngine::doObjectTypeListMaintenance(const AsciiString& objectTypeList
 	}
 
 	if (addObject) {
-		currentObjectTypeVec->addObjectType(objectType);	
+		currentObjectTypeVec->addObjectType(objectType);
 	} else {
 		currentObjectTypeVec->removeObjectType(objectType);
 	}
@@ -5183,7 +5177,7 @@ void ScriptEngine::doObjectTypeListMaintenance(const AsciiString& objectTypeList
 	// Remove it. Its dead Jim.
 	if (currentObjectTypeVec->getListSize() == 0) {
 		removeObjectTypes(currentObjectTypeVec);
-		
+
 		// Semantic emphasis
 		currentObjectTypeVec = NULL;
 	}
@@ -5241,7 +5235,7 @@ PolygonTrigger *ScriptEngine::getQualifiedTriggerAreaByName( AsciiString name )
 Team * ScriptEngine::getTeamNamed(const AsciiString& teamName)
 {
 	if (teamName == THIS_TEAM) {
-		if (m_callingTeam) 
+		if (m_callingTeam)
 			return m_callingTeam;
 		return m_conditionTeam;
 	}
@@ -5260,7 +5254,7 @@ Team * ScriptEngine::getTeamNamed(const AsciiString& teamName)
 		}
 		return NULL; // team wasn't active.
 	}
-	
+
 	static int warnCount = 0;
 	if (theTeamProto->countTeamInstances()>1) {
 		if (warnCount<10) {
@@ -5270,7 +5264,7 @@ Team * ScriptEngine::getTeamNamed(const AsciiString& teamName)
 		}
 	}
 	return theTeamProto->getFirstItemIn_TeamInstanceList();
-}  // end getTeamNamed
+}
 
 //-------------------------------------------------------------------------------------------------
 /** getUnitNamed */
@@ -5316,7 +5310,7 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team *pThisTeam)
 	if (scriptName==NONE_STRING) {
 		return; // no script
 	}
-	
+
 
 	Player *savPlayer = m_currentPlayer;
 //	Team *pSavConditionTeam = m_conditionTeam;
@@ -5337,7 +5331,7 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team *pThisTeam)
 		}	else {
 				AppendDebugMessage("***Attempting to call script that is not a subroutine:***", false);
 				AppendDebugMessage(scriptName, false);
-				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.\n", scriptName.str()));
+				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.", scriptName.str()));
 		}
 	}	else {
 		pScript = findScript(scriptName);
@@ -5347,18 +5341,18 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team *pThisTeam)
 			} else {
 				AppendDebugMessage("***Attempting to call script that is not a subroutine:***", false);
 				AppendDebugMessage(scriptName, false);
-				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.\n", scriptName.str()));
+				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.", scriptName.str()));
 			}
 		} else {
 			AppendDebugMessage("***Script not defined:***", false);
 			AppendDebugMessage(scriptName, false);
-			DEBUG_LOG(("WARNING: Script '%s' not defined.\n", scriptName.str()));
+			DEBUG_LOG(("WARNING: Script '%s' not defined.", scriptName.str()));
 		}
 	}
 	// m_callingTeam is restored automatically via LatchRestore
 	m_conditionTeam = m_conditionTeam;
 	m_currentPlayer = savPlayer;
-}  // end runScript
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -5384,7 +5378,7 @@ void ScriptEngine::runObjectScript(const AsciiString& scriptName, Object *pThisO
 		}	else {
 				AppendDebugMessage("***Attempting to call script that is not a subroutine:***", false);
 				AppendDebugMessage(scriptName, false);
-				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.\n", scriptName.str()));
+				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.", scriptName.str()));
 		}
 	}	else {
 		pScript = findScript(scriptName);
@@ -5394,16 +5388,16 @@ void ScriptEngine::runObjectScript(const AsciiString& scriptName, Object *pThisO
 			} else {
 				AppendDebugMessage("***Attempting to call script that is not a subroutine:***", false);
 				AppendDebugMessage(scriptName, false);
-				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.\n", scriptName.str()));
+				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.", scriptName.str()));
 			}
 		} else {
 			AppendDebugMessage("***Script not defined:***", false);
 			AppendDebugMessage(scriptName, false);
-			DEBUG_LOG(("WARNING: Script '%s' not defined.\n", scriptName.str()));
+			DEBUG_LOG(("WARNING: Script '%s' not defined.", scriptName.str()));
 		}
 	}
 	m_callingObject = pSavCallingObject;
-}  // end runScript
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -5418,7 +5412,7 @@ Int ScriptEngine::allocateCounter( const AsciiString& name)
 			return i;
 		}
 	}
-	DEBUG_ASSERTCRASH(m_numCounters<MAX_COUNTERS, ("Too many counters, failed to make '%s'.\n", name.str()));
+	DEBUG_ASSERTCRASH(m_numCounters<MAX_COUNTERS, ("Too many counters, failed to make '%s'.", name.str()));
 	if (m_numCounters < MAX_COUNTERS) {
 		m_counters[m_numCounters].name = name;
 		i = m_numCounters;
@@ -5452,7 +5446,7 @@ void ScriptEngine::createNamedMapReveal(const AsciiString& revealName, const Asc
 	// Will fail if there's already one in existence of the same name.
 	for (it = m_namedReveals.begin(); it != m_namedReveals.end(); ++it) {
 		if (it->m_revealName == revealName) {
-			DEBUG_CRASH(("ScriptEngine::createNamedMapReveal: Attempted to redefine named Reveal '%s', so I won't change it.\n", revealName.str()));
+			DEBUG_CRASH(("ScriptEngine::createNamedMapReveal: Attempted to redefine named Reveal '%s', so I won't change it.", revealName.str()));
 			return;
 		}
 	}
@@ -5535,7 +5529,7 @@ void ScriptEngine::undoNamedMapReveal(const AsciiString& revealName)
 void ScriptEngine::removeNamedMapReveal(const AsciiString& revealName)
 {
 	VecNamedRevealIt it;
-	
+
 	for (it = m_namedReveals.begin(); it != m_namedReveals.end(); ++it) {
 		if (it->m_revealName == revealName) {
 			m_namedReveals.erase(it);
@@ -5556,7 +5550,7 @@ Int ScriptEngine::allocateFlag( const AsciiString& name)
 			return i;
 		}
 	}
-	DEBUG_ASSERTCRASH(m_numFlags < MAX_FLAGS, ("Too many flags, failed to make '%s'..\n", name.str()));
+	DEBUG_ASSERTCRASH(m_numFlags < MAX_FLAGS, ("Too many flags, failed to make '%s'..", name.str()));
 	if (m_numFlags < MAX_FLAGS) {
 		m_flags[m_numFlags].name = name;
 		i = m_numFlags;
@@ -5617,8 +5611,8 @@ Script  *ScriptEngine::findScript(const AsciiString& name)
 //-------------------------------------------------------------------------------------------------
 Bool ScriptEngine::evaluateCounter( Condition *pCondition )
 {
-	DEBUG_ASSERTCRASH(pCondition->getNumParameters() >= 3, ("Not enough parameters.\n"));
-	DEBUG_ASSERTCRASH(pCondition->getConditionType() == Condition::COUNTER, ("Wrong condition.\n"));
+	DEBUG_ASSERTCRASH(pCondition->getNumParameters() >= 3, ("Not enough parameters."));
+	DEBUG_ASSERTCRASH(pCondition->getConditionType() == Condition::COUNTER, ("Wrong condition."));
 	Int counterNdx = pCondition->getParameter(0)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pCondition->getParameter(0)->getString());
@@ -5641,7 +5635,7 @@ Bool ScriptEngine::evaluateCounter( Condition *pCondition )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setCounter( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	Int counterNdx = pAction->getParameter(0)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pAction->getParameter(0)->getString());
@@ -5656,7 +5650,7 @@ void ScriptEngine::setCounter( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setFade( ScriptAction *pAction )
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_disableCameraFade)
 	{
 		m_fade = FADE_NONE;
@@ -5664,7 +5658,7 @@ void ScriptEngine::setFade( ScriptAction *pAction )
 	}
 #endif
 
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 5, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 5, ("Not enough parameters."));
 	switch (pAction->getActionType()) {
 		default:	m_fade = FADE_NONE; return;
 		case ScriptAction::CAMERA_FADE_ADD: m_fade = FADE_ADD; break;
@@ -5690,7 +5684,7 @@ void ScriptEngine::setFade( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setSway( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 5, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 5, ("Not enough parameters."));
 	++m_breezeInfo.m_breezeVersion;
 	m_breezeInfo.m_direction = pAction->getParameter(0)->getReal();
 	m_breezeInfo.m_directionVec.x = Sin(m_breezeInfo.m_direction);
@@ -5698,7 +5692,7 @@ void ScriptEngine::setSway( ScriptAction *pAction )
 	m_breezeInfo.m_intensity = pAction->getParameter(1)->getReal();
 	m_breezeInfo.m_lean = pAction->getParameter(2)->getReal();
 	m_breezeInfo.m_breezePeriod = pAction->getParameter(3)->getInt();
-	if (m_breezeInfo.m_breezePeriod<1) 
+	if (m_breezeInfo.m_breezePeriod<1)
 		m_breezeInfo.m_breezePeriod = 1;
 	m_breezeInfo.m_randomness = pAction->getParameter(4)->getReal();
 
@@ -5709,7 +5703,7 @@ void ScriptEngine::setSway( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::addCounter( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	Int value = pAction->getParameter(0)->getInt();
 	Int counterNdx = pAction->getParameter(1)->getInt();
 	if (counterNdx == 0) {
@@ -5724,7 +5718,7 @@ void ScriptEngine::addCounter( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::subCounter( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	Int value = pAction->getParameter(0)->getInt();
 	Int counterNdx = pAction->getParameter(1)->getInt();
 	if (counterNdx == 0) {
@@ -5739,8 +5733,8 @@ void ScriptEngine::subCounter( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 Bool ScriptEngine::evaluateFlag( Condition *pCondition )
 {
-	DEBUG_ASSERTCRASH(pCondition->getNumParameters() >= 2, ("Not enough parameters.\n"));
-	DEBUG_ASSERTCRASH(pCondition->getConditionType() == Condition::FLAG, ("Wrong condition.\n"));
+	DEBUG_ASSERTCRASH(pCondition->getNumParameters() >= 2, ("Not enough parameters."));
+	DEBUG_ASSERTCRASH(pCondition->getConditionType() == Condition::FLAG, ("Wrong condition."));
 	Int flagNdx = pCondition->getParameter(0)->getInt();
 	if (flagNdx == 0) {
 		flagNdx = allocateFlag(pCondition->getParameter(0)->getString());
@@ -5749,7 +5743,7 @@ Bool ScriptEngine::evaluateFlag( Condition *pCondition )
 	Int value = pCondition->getParameter(1)->getInt();
 	Bool boolVal = (value!=0);
 	Bool boolFlag = (m_flags[flagNdx].value != 0);
-	
+
 	if (boolVal == boolFlag) {
 		return true;
 	}
@@ -5768,7 +5762,7 @@ Bool ScriptEngine::evaluateFlag( Condition *pCondition )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setFlag( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	Int flagNdx = pAction->getParameter(0)->getInt();
 	if (flagNdx == 0) {
 		flagNdx = allocateFlag(pAction->getParameter(0)->getString());
@@ -5811,7 +5805,7 @@ const AttackPriorityInfo *ScriptEngine::getDefaultAttackInfo(void)
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Returns the named attack info, if non-existent returns default attack priority info.  
+/** Returns the named attack info, if non-existent returns default attack priority info.
 		Never returns null. */
 //-------------------------------------------------------------------------------------------------
 const AttackPriorityInfo *ScriptEngine::getAttackInfo(const AsciiString& name)
@@ -5831,13 +5825,13 @@ const AttackPriorityInfo *ScriptEngine::getAttackInfo(const AsciiString& name)
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setPriorityThing( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 3, ("Not enough parameters.\n"));
-	
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 3, ("Not enough parameters."));
+
 	AsciiString typeArgument = pAction->getParameter(1)->getString();
 
 	// Our argument could be an individual type, or a list name.
-	const ObjectTypes *types = TheScriptEngine->getObjectTypes(typeArgument);
-	if( !types ) 
+	const ObjectTypes *types = getObjectTypes(typeArgument);
+	if( !types )
 	{
 		// Lookup failed, so it is just a single type
 
@@ -5867,7 +5861,7 @@ void ScriptEngine::setPriorityThing( ScriptAction *pAction )
 
 		return;
 	}
-	else 
+	else
 	{
 		// Found a list by this name, so we have a bunch of things
 
@@ -5907,7 +5901,7 @@ void ScriptEngine::setPriorityThing( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setPriorityKind( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 3, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 3, ("Not enough parameters."));
 	AttackPriorityInfo *info = findAttackInfo(pAction->getParameter(0)->getString(), true);
 	if (info==NULL) {
 		AppendDebugMessage("***Error allocating attack priority set - fix or raise limit. ***", false);
@@ -5931,7 +5925,7 @@ void ScriptEngine::setPriorityKind( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setPriorityDefault( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	AttackPriorityInfo *info = findAttackInfo(pAction->getParameter(0)->getString(), true);
 	if (info==NULL) {
 		AppendDebugMessage("***Error allocating attack priority set - fix or raise limit. ***", false);
@@ -5962,7 +5956,7 @@ Int ScriptEngine::getObjectCount(Int playerIndex, const AsciiString& objectTypeN
 void ScriptEngine::setObjectCount(Int playerIndex, const AsciiString& objectTypeName, Int newCount)
 {
 	// Don't really need inactive player checks here.
-	
+
 	ObjectTypeCount &ocm = m_objectCounts[playerIndex];
 	ocm[objectTypeName] = newCount;
 }
@@ -5996,8 +5990,8 @@ void ScriptEngine::removeObjectTypes(ObjectTypes *typesToRemove)
 //-------------------------------------------------------------------------------------------------
 Bool ScriptEngine::evaluateTimer( Condition *pCondition )
 {
-	DEBUG_ASSERTCRASH(pCondition->getNumParameters() >= 1, ("Not enough parameters.\n"));
-	DEBUG_ASSERTCRASH(pCondition->getConditionType() == Condition::TIMER_EXPIRED, ("Wrong condition.\n"));
+	DEBUG_ASSERTCRASH(pCondition->getNumParameters() >= 1, ("Not enough parameters."));
+	DEBUG_ASSERTCRASH(pCondition->getConditionType() == Condition::TIMER_EXPIRED, ("Wrong condition."));
 	Int counterNdx = pCondition->getParameter(0)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pCondition->getParameter(0)->getString());
@@ -6016,7 +6010,7 @@ Bool ScriptEngine::evaluateTimer( Condition *pCondition )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setTimer( ScriptAction *pAction, Bool millisecondTimer, Bool random )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	Int counterNdx = pAction->getParameter(0)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pAction->getParameter(0)->getString());
@@ -6045,7 +6039,7 @@ void ScriptEngine::setTimer( ScriptAction *pAction, Bool millisecondTimer, Bool
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::pauseTimer( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters."));
 	Int counterNdx = pAction->getParameter(0)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pAction->getParameter(0)->getString());
@@ -6059,7 +6053,7 @@ void ScriptEngine::pauseTimer( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::restartTimer( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters."));
 	Int counterNdx = pAction->getParameter(0)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pAction->getParameter(0)->getString());
@@ -6075,7 +6069,7 @@ void ScriptEngine::restartTimer( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::adjustTimer( ScriptAction *pAction, Bool millisecondTimer, Bool add)
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	Int counterNdx = pAction->getParameter(1)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pAction->getParameter(1)->getString());
@@ -6099,7 +6093,7 @@ void ScriptEngine::adjustTimer( ScriptAction *pAction, Bool millisecondTimer, Bo
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::enableScript( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters."));
 	ScriptGroup *pGroup = findGroup(pAction->getParameter(0)->getString());
 	if (pGroup) {
 		pGroup->setActive(true);
@@ -6115,7 +6109,7 @@ void ScriptEngine::enableScript( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::disableScript( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters."));
 	Script *pScript = findScript(pAction->getParameter(0)->getString());
 	if (pScript) {
 		pScript->setActive(false);
@@ -6131,7 +6125,7 @@ void ScriptEngine::disableScript( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::callSubroutine( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters."));
 	AsciiString scriptName = pAction->getParameter(0)->getString();
 	Script  *pScript;
 	ScriptGroup *pGroup = findGroup(scriptName);
@@ -6143,7 +6137,7 @@ void ScriptEngine::callSubroutine( ScriptAction *pAction )
 		}	else {
 				AppendDebugMessage("***Attempting to call script that is not a subroutine:***", false);
 				AppendDebugMessage(scriptName, false);
-				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.\n", scriptName.str()));
+				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.", scriptName.str()));
 		}
 	}	else {
 		pScript = findScript(scriptName);
@@ -6153,12 +6147,12 @@ void ScriptEngine::callSubroutine( ScriptAction *pAction )
 			} else {
 				AppendDebugMessage("***Attempting to call script that is not a subroutine:***", false);
 				AppendDebugMessage(scriptName, false);
-				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.\n", scriptName.str()));
+				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.", scriptName.str()));
 			}
 		} else {
 			AppendDebugMessage("***Script not defined:***", false);
 			AppendDebugMessage(scriptName, false);
-			DEBUG_LOG(("WARNING: Script '%s' not defined.\n", scriptName.str()));
+			DEBUG_LOG(("WARNING: Script '%s' not defined.", scriptName.str()));
 		}
 	}
 }
@@ -6205,7 +6199,7 @@ void ScriptEngine::checkConditionsForTeamNames(Script *pScript)
 							AppendDebugMessage(scriptName, false);
 							AppendDebugMessage(multiTeamName, false);
 							AppendDebugMessage(teamName, false);
-							DEBUG_LOG(("WARNING: Script '%s' contains multiple non-singleton team conditions: %s & %s.\n", scriptName.str(), 
+							DEBUG_LOG(("WARNING: Script '%s' contains multiple non-singleton team conditions: %s & %s.", scriptName.str(),
 								multiTeamName.str(), teamName.str()));
 						}
 					}
@@ -6271,7 +6265,7 @@ void ScriptEngine::executeScript( Script *pScript )
 	}
 
 	if (pProto && pProto->countTeamInstances() > 0) {
-		// We have a team referred to in the conditions.  Iterate over the instances of the team, 
+		// We have a team referred to in the conditions.  Iterate over the instances of the team,
 		// applying the script conditions (and possibly actions) to each instance of the team.
 		for (DLINK_ITERATOR<Team> iter = pProto->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			m_conditionTeam = iter.cur();
@@ -6282,7 +6276,7 @@ void ScriptEngine::executeScript( Script *pScript )
 					_appendMessage(pScript->getName());
 					executeActions(pScript->getAction());
 				}
-				
+
 				if (pScript->isOneShot()) {
 					pScript->setActive(false);
 				}
@@ -6338,7 +6332,7 @@ void ScriptEngine::executeScript( Script *pScript )
 Bool ScriptEngine::evaluateCondition( Condition *pCondition )
 {
 	switch (pCondition->getConditionType()) {
-		default: 
+		default:
 			return TheScriptConditions->evaluateCondition(pCondition);
 		case Condition::CONDITION_FALSE: return false;
 		case Condition::CONDITION_TRUE: return true;
@@ -6384,15 +6378,15 @@ void ScriptEngine::addObjectToCache(Object* pNewObject)
 		if (it->first == objName) {
 			if (it->second == NULL) {
 				AsciiString newNameForDead;
-				newNameForDead.format("Reassigning dead object's name '%s' to object (%d) of type '%s'\n", objName.str(), pNewObject->getID(), pNewObject->getTemplate()->getName().str());
-				TheScriptEngine->AppendDebugMessage(newNameForDead, FALSE);
+				newNameForDead.format("Reassigning dead object's name '%s' to object (%d) of type '%s'", objName.str(), pNewObject->getID(), pNewObject->getTemplate()->getName().str());
+				AppendDebugMessage(newNameForDead, FALSE);
 				DEBUG_LOG((newNameForDead.str()));
 				it->second = pNewObject;
 				return;
 			} else {
-				DEBUG_CRASH(("Attempting to assign the name '%s' to object (%d) of type '%s'," 
-										 " but object (%d) of type '%s' already has that name\n",
-										 objName.str(), pNewObject->getID(), pNewObject->getTemplate()->getName().str(), 
+				DEBUG_CRASH(("Attempting to assign the name '%s' to object (%d) of type '%s',"
+										 " but object (%d) of type '%s' already has that name",
+										 objName.str(), pNewObject->getID(), pNewObject->getTemplate()->getName().str(),
 										 it->second->getID(), it->second->getTemplate()->getName().str()));
 				return;
 			}
@@ -6426,7 +6420,7 @@ void ScriptEngine::removeObjectFromCache( Object* pDeadObject )
 
 //-------------------------------------------------------------------------------------------------
 /** Kris:
-		Looks for existing cached object with same name and replaces that object point with the supplied one. 
+		Looks for existing cached object with same name and replaces that object point with the supplied one.
 		This is an important feature for units that change into something else. Good examples include terrorists
 		entering a vehicle to convert it to a carbomb, pilots adding veterancy to vehicles, hijackers stealing
 		vehicles, and infantry taking over disabled vehicles.
@@ -6440,9 +6434,9 @@ void ScriptEngine::transferObjectName( const AsciiString& unitName, Object *pNew
 		return;
 	}
 
-	//John Ahlquist: When transferring an object name, make sure the new object isn't already in 
+	//John Ahlquist: When transferring an object name, make sure the new object isn't already in
 	//							 the vector. If so, remove it, or it'll end up there twice and cause a crash.
-	if( pNewObject->getName().isNotEmpty() ) 
+	if( pNewObject->getName().isNotEmpty() )
 	{
 		removeObjectFromCache(pNewObject);
 	}
@@ -6477,7 +6471,7 @@ void ScriptEngine::transferObjectName( const AsciiString& unitName, Object *pNew
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::notifyOfObjectDestruction( Object *pDeadObject )
 {
-	if (!pDeadObject->getName().isEmpty()) 
+	if (!pDeadObject->getName().isEmpty())
 	{
 		removeObjectFromCache(pDeadObject);
 	}
@@ -6494,7 +6488,7 @@ void ScriptEngine::notifyOfObjectDestruction( Object *pDeadObject )
 //-------------------------------------------------------------------------------------------------
 /** Notify the script engine that a video has completed */
 //-------------------------------------------------------------------------------------------------
-void ScriptEngine::notifyOfCompletedVideo( const AsciiString& completedVideo ) 
+void ScriptEngine::notifyOfCompletedVideo( const AsciiString& completedVideo )
 {
 	m_completedVideo.push_back(completedVideo);
 }
@@ -6775,7 +6769,7 @@ Bool ScriptEngine::isScienceAcquired( Int playerIndex, ScienceType science, Bool
 	{
 		if (*it == science)
 		{
-			if (removeFromList) 
+			if (removeFromList)
 			{
 				specialList->erase(it);
 			}
@@ -6881,7 +6875,7 @@ Bool ScriptEngine::evaluateConditions( Script *pScript, Team *thisTeam, Player *
 	for (pCurCondition = pConditionHead; pCurCondition; pCurCondition = pCurCondition->getNextOrCondition()) {
 		Condition *pCondition = pCurCondition->getFirstAndCondition();
 		if (!pCondition) continue; // No conditions, so go to the next or.
-		Bool andTerm = true; 
+		Bool andTerm = true;
 		while (pCondition && andTerm) {
 			if (!evaluateCondition(pCondition)) {
 				andTerm = false;
@@ -6934,10 +6928,10 @@ void ScriptEngine::executeActions( ScriptAction *pActionHead )
 			case ScriptAction::CALL_SUBROUTINE: callSubroutine(pCurAction);break;
 
 			// Fade operations.
-			case ScriptAction::CAMERA_FADE_ADD : 
-			case ScriptAction::CAMERA_FADE_SUBTRACT : 
-			case ScriptAction::CAMERA_FADE_SATURATE : 
-			case ScriptAction::CAMERA_FADE_MULTIPLY : 
+			case ScriptAction::CAMERA_FADE_ADD :
+			case ScriptAction::CAMERA_FADE_SUBTRACT :
+			case ScriptAction::CAMERA_FADE_SATURATE :
+			case ScriptAction::CAMERA_FADE_MULTIPLY :
 				setFade(pCurAction); break;
 
 			// Attack priority set operations.
@@ -6949,7 +6943,7 @@ void ScriptEngine::executeActions( ScriptAction *pActionHead )
 		}
 	}
 }
-																		
+
 //-------------------------------------------------------------------------------------------------
 /** Execute a linked list of scripts */
 //-------------------------------------------------------------------------------------------------
@@ -6964,7 +6958,7 @@ void ScriptEngine::executeScripts( Script *pScriptHead )
 		}
 		executeScript(pCurScript);
 	}
-}  // end update
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -6972,23 +6966,23 @@ void ScriptEngine::executeScripts( Script *pScriptHead )
 //-------------------------------------------------------------------------------------------------
 const ActionTemplate * ScriptEngine::getActionTemplate( Int ndx )
 {
-	DEBUG_ASSERTCRASH(ndx >= 0 && ndx < ScriptAction::NUM_ITEMS, ("Out of range.\n"));
+	DEBUG_ASSERTCRASH(ndx >= 0 && ndx < ScriptAction::NUM_ITEMS, ("Out of range."));
 	if (ndx <0 || ndx >= ScriptAction::NUM_ITEMS) ndx = 0;
-	DEBUG_ASSERTCRASH (!m_actionTemplates[ndx].getName().isEmpty(), ("Need to initialize action enum=%d.\n", ndx));
-	
+	DEBUG_ASSERTCRASH (!m_actionTemplates[ndx].getName().isEmpty(), ("Need to initialize action enum=%d.", ndx));
+
 	return &m_actionTemplates[ndx];
-}  // end getActionTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Gets the ui and parameter template for a script condition */
 //-------------------------------------------------------------------------------------------------
 const ConditionTemplate * ScriptEngine::getConditionTemplate( Int ndx )
 {
-	DEBUG_ASSERTCRASH(ndx >= 0 && ndx < ScriptAction::NUM_ITEMS, ("Out of range.\n"));
+	DEBUG_ASSERTCRASH(ndx >= 0 && ndx < ScriptAction::NUM_ITEMS, ("Out of range."));
 	if (ndx <0 || ndx >= Condition::NUM_ITEMS) ndx = 0;
-	DEBUG_ASSERTCRASH (!m_conditionTemplates[ndx].getName().isEmpty(), ("Need to initialize Condition enum=%d.\n", ndx));
+	DEBUG_ASSERTCRASH (!m_conditionTemplates[ndx].getName().isEmpty(), ("Need to initialize Condition enum=%d.", ndx));
 	return &m_conditionTemplates[ndx];
-}  // end getConditionTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Fills the named object cache initally. */
@@ -7016,7 +7010,7 @@ void ScriptEngine::createNamedCache( void )
 
 void ScriptEngine::appendSequentialScript(const SequentialScript *scriptToSequence)
 {
-	SequentialScript *newSequentialScript = newInstance( SequentialScript );	
+	SequentialScript *newSequentialScript = newInstance( SequentialScript );
 	(*newSequentialScript) = (*scriptToSequence);
 
 	// Must set this to NULL, as we don't want an infinite loop.
@@ -7024,7 +7018,7 @@ void ScriptEngine::appendSequentialScript(const SequentialScript *scriptToSequen
 
 	// reset the instruction pointer
 	newSequentialScript->m_currentInstruction = -1;
-	
+
 	VecSequentialScriptPtrIt it;
 	Bool found = false;
 	for (it = m_sequentialScripts.begin(); it != m_sequentialScripts.end(); ++it) {
@@ -7036,7 +7030,7 @@ void ScriptEngine::appendSequentialScript(const SequentialScript *scriptToSequen
 		if ((scriptToSequence->m_objectID && scriptToSequence->m_objectID == seqScript->m_objectID) ||
 				 (scriptToSequence->m_teamToExecOn && scriptToSequence->m_teamToExecOn == seqScript->m_teamToExecOn)) {
 			found = true;
-			while (seqScript->m_nextScriptInSequence) { 
+			while (seqScript->m_nextScriptInSequence) {
 				seqScript = seqScript->m_nextScriptInSequence;
 			}
 
@@ -7049,12 +7043,12 @@ void ScriptEngine::appendSequentialScript(const SequentialScript *scriptToSequen
 		m_sequentialScripts.push_back(newSequentialScript);
 	}
 
-	// do not delete either of these here. 
+	// do not delete either of these here.
 }
 
 void ScriptEngine::removeSequentialScript(SequentialScript *scriptToRemove)
 {
-	
+
 }
 
 void ScriptEngine::removeAllSequentialScripts(Object *obj)
@@ -7091,7 +7085,7 @@ void ScriptEngine::notifyOfObjectCreationOrDestruction(void)
 void ScriptEngine::notifyOfTeamDestruction(Team *teamDestroyed)
 {
 	if (!teamDestroyed) {
-		return;		
+		return;
 	}
 
 	VecSequentialScriptPtrIt it;
@@ -7100,7 +7094,7 @@ void ScriptEngine::notifyOfTeamDestruction(Team *teamDestroyed)
 		if (!seqScript) {
 			continue;
 		}
-		
+
 		if (seqScript->m_teamToExecOn == teamDestroyed) {
 			it = cleanupSequentialScript(it, TRUE);
 			continue;
@@ -7175,7 +7169,7 @@ void ScriptEngine::evaluateAndProgressAllSequentialScripts( void )
 		if (spinCount > MAX_SPIN_COUNT) {
 			SequentialScript *seqScript = (*it);
 			if (seqScript) {
-				DEBUG_LOG(("Sequential script %s appears to be in an infinite loop.\n", 
+				DEBUG_LOG(("Sequential script %s appears to be in an infinite loop.",
 					seqScript->m_scriptToExecuteSequentially->getName().str()));
 			}
 			++it;
@@ -7183,7 +7177,7 @@ void ScriptEngine::evaluateAndProgressAllSequentialScripts( void )
 		}
 
 		lastScript = (*it);
-		
+
 		itAdvanced = false;
 
 		SequentialScript *seqScript = (*it);
@@ -7210,16 +7204,20 @@ void ScriptEngine::evaluateAndProgressAllSequentialScripts( void )
 		}
 
 		AIUpdateInterface *ai = obj ? obj->getAIUpdateInterface() : NULL;
-		AIGroup *aigroup = (team ? TheAI->createGroup() : NULL);
+		AIGroupPtr aigroup = (team ? TheAI->createGroup() : NULL);
 		if (aigroup) {
+#if RETAIL_COMPATIBLE_AIGROUP
 			team->getTeamAsAIGroup(aigroup);
+#else
+			team->getTeamAsAIGroup(aigroup.Peek());
+#endif
 		}
 
 		if( ai || aigroup ) {
-			if (((ai && (ai->isIdle()) || (aigroup && aigroup->isIdle())) && 
+			if (((ai && (ai->isIdle()) || (aigroup && aigroup->isIdle())) &&
 				seqScript->m_framesToWait < 1) || (seqScript->m_framesToWait == 0)) {
-				
-				// We want to supress messages if we're repeatedly waiting for an event to occur, cause 
+
+				// We want to supress messages if we're repeatedly waiting for an event to occur, cause
 				// it KILLS our debug framerate.
 				Bool displayMessage = TRUE;
 
@@ -7283,7 +7281,7 @@ void ScriptEngine::evaluateAndProgressAllSequentialScripts( void )
 					}
 
 					action->setNextAction(nextAction);
-					
+
 					// Check to see if executing our action told us to wait. If so, skip to the next Sequential script
 					if (seqScript->m_dontAdvanceInstruction) {
 						++it;
@@ -7297,7 +7295,11 @@ void ScriptEngine::evaluateAndProgressAllSequentialScripts( void )
 					} else if (team) {
 						// attempt to rebuild the aigroup, as it probably expired during the action execution
 						aigroup = (team ? TheAI->createGroup() : NULL);
+#if RETAIL_COMPATIBLE_AIGROUP
 						team->getTeamAsAIGroup(aigroup);
+#else
+						team->getTeamAsAIGroup(aigroup.Peek());
+#endif
 					}
 
 					if (aigroup && aigroup->isIdle()) {
@@ -7346,7 +7348,7 @@ ScriptEngine::VecSequentialScriptPtrIt ScriptEngine::cleanupSequentialScript(Vec
 	SequentialScript *seqScript;
 	seqScript = (*it);
 	if (!seqScript) {
-		return it;				
+		return it;
 	}
 
 	SequentialScript *scriptToDelete = seqScript;
@@ -7402,9 +7404,9 @@ void ScriptEngine::setEnableVTune(Bool value)
 }
 
 //----SequentialScript-----------------------------------------------------------------------------
-SequentialScript::SequentialScript() : m_teamToExecOn(NULL), 
-																			 m_objectID(INVALID_ID), 
-																			 m_scriptToExecuteSequentially(NULL), 
+SequentialScript::SequentialScript() : m_teamToExecOn(NULL),
+																			 m_objectID(INVALID_ID),
+																			 m_scriptToExecuteSequentially(NULL),
 																			 m_currentInstruction(START_INSTRUCTION),
 																			 m_timesToLoop(0),
 																			 m_framesToWait(-1),
@@ -7419,7 +7421,7 @@ SequentialScript::SequentialScript() : m_teamToExecOn(NULL),
 void SequentialScript::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -7447,13 +7449,13 @@ void SequentialScript::xfer( Xfer *xfer )
 		if( teamID != TEAM_ID_INVALID && m_teamToExecOn == NULL )
 		{
 
-			DEBUG_CRASH(( "SequentialScript::xfer - Unable to find team by ID (#%d) for m_teamToExecOn\n", 
+			DEBUG_CRASH(( "SequentialScript::xfer - Unable to find team by ID (#%d) for m_teamToExecOn",
 										teamID ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// object id
 	xfer->xferObjectID( &m_objectID );
@@ -7467,7 +7469,7 @@ void SequentialScript::xfer( Xfer *xfer )
 		scriptName = m_scriptToExecuteSequentially->getName();
 		xfer->xferAsciiString( &scriptName );
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -7475,16 +7477,16 @@ void SequentialScript::xfer( Xfer *xfer )
 		xfer->xferAsciiString( &scriptName );
 
 		// script pointer
-		DEBUG_ASSERTCRASH( m_scriptToExecuteSequentially == NULL, ("SequentialScript::xfer - m_scripttoExecuteSequentially\n") );
-			
+		DEBUG_ASSERTCRASH( m_scriptToExecuteSequentially == NULL, ("SequentialScript::xfer - m_scripttoExecuteSequentially") );
+
 		// find script
 		m_scriptToExecuteSequentially = const_cast<Script*>(TheScriptEngine->findScriptByName(scriptName));
 
-		// sanity	
+		// sanity
 		DEBUG_ASSERTCRASH( m_scriptToExecuteSequentially != NULL,
-											 ("SequentialScript::xfer - m_scriptToExecuteSequentially is NULL but should not be\n") );
+											 ("SequentialScript::xfer - m_scriptToExecuteSequentially is NULL but should not be") );
 
-	}  // end else, load
+	}
 
 	// current instruction
 	xfer->xferInt( &m_currentInstruction );
@@ -7497,8 +7499,8 @@ void SequentialScript::xfer( Xfer *xfer )
 
 	// dont advance instruction
 	xfer->xferBool( &m_dontAdvanceInstruction );
-	
-}  // end xfer
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -7506,7 +7508,7 @@ void SequentialScript::xfer( Xfer *xfer )
 void SequentialScript::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 #ifdef NOT_IN_USE
 //----SequentialScriptStatus Stuff ----------------------------------------------------------------
@@ -7516,7 +7518,7 @@ void SequentialScript::loadPostProcess( void )
 void SequentialScriptStatus::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -7540,7 +7542,7 @@ void SequentialScriptStatus::xfer( Xfer *xfer )
 	// is executing sequentially
 	xfer->xferBool( &m_isExecutingSequentially );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 // Load post process */
@@ -7548,7 +7550,7 @@ void SequentialScriptStatus::xfer( Xfer *xfer )
 void SequentialScriptStatus::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 #endif
 
 //----Particle Editor Stuff------------------------------------------------------------------------
@@ -7562,7 +7564,7 @@ void ScriptEngine::particleEditorUpdate( void )
 	}
 
 	_updateCurrentParticleCount();
-	
+
 	Bool busyWait = false;
 	do {
 		if (m_firstUpdate) {
@@ -7570,7 +7572,7 @@ void ScriptEngine::particleEditorUpdate( void )
 			_appendAllThingTemplates();
 		} else {
 			switch (_getEditorBehavior())
-			{			
+			{
 				case 0x00:
 				{
 					busyWait = false;
@@ -7584,7 +7586,7 @@ void ScriptEngine::particleEditorUpdate( void )
 					busyWait = false;
 					break;
 				}
-				
+
 				case 0x03:
 				{
 					AsciiString particleSystemName = _getParticleSystemName();
@@ -7606,7 +7608,7 @@ void ScriptEngine::particleEditorUpdate( void )
 					busyWait = false;
 					return;
 				}
-				
+
 				case 0x05:
 				{
 					int newCap = _getNewCurrentParticleCap();
@@ -7740,12 +7742,12 @@ Bool ScriptEngine::isTimeFast(void)
 		} else {
 			if (st_AppIsFast) {
 				st_AppIsFast = false;
-			} 
+			}
 		}
 		if (st_AppIsFast) {
 			if ((TheGameLogic->getFrame()%10) == 0) {
 				return false;
-			}	 
+			}
 			return true;
 		} else {
 			return false;
@@ -7769,7 +7771,7 @@ void ScriptEngine::forceUnfreezeTime(void)
 void ScriptEngine::AppendDebugMessage(const AsciiString& strToAdd, Bool forcePause)
 {
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG(("-SCRIPT- %d %s\n", TheGameLogic->getFrame(), strToAdd.str()));
+	DEBUG_LOG(("-SCRIPT- %d %s", TheGameLogic->getFrame(), strToAdd.str()));
 #endif
 	typedef void (*funcptr)(const char*);
 	if (!st_DebugDLL) {
@@ -7803,7 +7805,7 @@ void ScriptEngine::AdjustDebugVariableData(const AsciiString& variableName, Int
 void ScriptEngine::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Version Info:
@@ -7813,7 +7815,7 @@ static void xferListAsciiString( Xfer *xfer, ListAsciiString *list )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiString - Invalid parameters\n") );
+	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiString - Invalid parameters") );
 
 	// version
 	XferVersion currentVersion = 1;
@@ -7837,9 +7839,9 @@ static void xferListAsciiString( Xfer *xfer, ListAsciiString *list )
 			string = *it;
 			xfer->xferAsciiString( &string );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -7847,10 +7849,10 @@ static void xferListAsciiString( Xfer *xfer, ListAsciiString *list )
 		if( list->empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "xferListAsciiString - list should be empty upon loading but is not\n" ));
+			DEBUG_CRASH(( "xferListAsciiString - list should be empty upon loading but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each string
 		for( UnsignedShort i = 0; i < count; ++i )
@@ -7862,11 +7864,11 @@ static void xferListAsciiString( Xfer *xfer, ListAsciiString *list )
 			// put on list
 			list->push_back( string );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xferListAsciiString
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Version Info:
@@ -7876,7 +7878,7 @@ static void xferListAsciiStringUINT( Xfer *xfer, ListAsciiStringUINT *list )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiStringUINT - Invalid parameters\n") );
+	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiStringUINT - Invalid parameters") );
 
 	// version
 	XferVersion currentVersion = 1;
@@ -7906,9 +7908,9 @@ static void xferListAsciiStringUINT( Xfer *xfer, ListAsciiStringUINT *list )
 			unsignedIntData = it->second;
 			xfer->xferUnsignedInt( &unsignedIntData );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		PairAsciiStringUINT newPair;
@@ -7917,10 +7919,10 @@ static void xferListAsciiStringUINT( Xfer *xfer, ListAsciiStringUINT *list )
 		if( list->empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "xferListAsciiStringUINT - list should be empty upon loading but is not\n" ));
+			DEBUG_CRASH(( "xferListAsciiStringUINT - list should be empty upon loading but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each string
 		for( UnsignedShort i = 0; i < count; ++i )
@@ -7937,11 +7939,11 @@ static void xferListAsciiStringUINT( Xfer *xfer, ListAsciiStringUINT *list )
 			newPair.second = unsignedIntData;
 			list->push_back( newPair );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xferListAsciiStringUINT
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Version Info:
@@ -7951,7 +7953,7 @@ static void xferListAsciiStringObjectID( Xfer *xfer, ListAsciiStringObjectID *li
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiStringObjectID - Invalid parameters\n") );
+	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiStringObjectID - Invalid parameters") );
 
 	// version
 	XferVersion currentVersion = 1;
@@ -7981,9 +7983,9 @@ static void xferListAsciiStringObjectID( Xfer *xfer, ListAsciiStringObjectID *li
 			objectID = it->second;
 			xfer->xferObjectID( &objectID );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		AsciiStringObjectIDPair newPair;
@@ -7992,10 +7994,10 @@ static void xferListAsciiStringObjectID( Xfer *xfer, ListAsciiStringObjectID *li
 		if( list->empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "xferListAsciiStringObjectID - list should be empty upon loading but is not\n" ));
+			DEBUG_CRASH(( "xferListAsciiStringObjectID - list should be empty upon loading but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each string
 		for( UnsignedShort i = 0; i < count; ++i )
@@ -8012,11 +8014,11 @@ static void xferListAsciiStringObjectID( Xfer *xfer, ListAsciiStringObjectID *li
 			newPair.second = objectID;
 			list->push_back( newPair );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xferListAsciiStringObjectID
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Version Info:
@@ -8026,7 +8028,7 @@ static void xferListAsciiStringCoord3D( Xfer *xfer, ListAsciiStringCoord3D *list
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiStringCoord3D - Invalid parameters\n") );
+	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiStringCoord3D - Invalid parameters") );
 
 	// version
 	XferVersion currentVersion = 1;
@@ -8056,9 +8058,9 @@ static void xferListAsciiStringCoord3D( Xfer *xfer, ListAsciiStringCoord3D *list
 			coord = it->second;
 			xfer->xferCoord3D( &coord );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		AsciiStringCoord3DPair newPair;
@@ -8067,10 +8069,10 @@ static void xferListAsciiStringCoord3D( Xfer *xfer, ListAsciiStringCoord3D *list
 		if( list->empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "xferListAsciiStringCoord3D - list should be empty upon loading but is not\n" ));
+			DEBUG_CRASH(( "xferListAsciiStringCoord3D - list should be empty upon loading but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each string
 		for( UnsignedShort i = 0; i < count; ++i )
@@ -8079,7 +8081,7 @@ static void xferListAsciiStringCoord3D( Xfer *xfer, ListAsciiStringCoord3D *list
 			// read string
 			xfer->xferAsciiString( &string );
 
-			// read coord 
+			// read coord
 			xfer->xferCoord3D( &coord );
 
 			// put on list
@@ -8087,22 +8089,22 @@ static void xferListAsciiStringCoord3D( Xfer *xfer, ListAsciiStringCoord3D *list
 			newPair.second = coord;
 			list->push_back( newPair );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // ene xferListAsciiStringCoord3D
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void ScriptEngine::setGlobalDifficulty( GameDifficulty difficulty )
 {
-	DEBUG_LOG(("ScriptEngine::setGlobalDifficulty(%d)\n", ((Int)difficulty)));
+	DEBUG_LOG(("ScriptEngine::setGlobalDifficulty(%d)", ((Int)difficulty)));
 	m_gameDifficulty = difficulty;
 }
 
 // ------------------------------------------------------------------------------------------------
-/** Xfer method 
+/** Xfer method
 	* Version Info:
 	* 1: Initial version
 	* 2: Added m_namedReveals and m_allObjectTypeLists (CBD)
@@ -8138,20 +8140,20 @@ void ScriptEngine::xfer( Xfer *xfer )
 			// xfer data
 			xfer->xferSnapshot( sequentialScript );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
 		// this list should be empty on loading
-		if( m_sequentialScripts.size() != 0 )
+		if( !m_sequentialScripts.empty() )
 		{
 
-			DEBUG_CRASH(( "ScriptEngine::xfer - m_sequentialScripts should be empty but is not\n" ));
+			DEBUG_CRASH(( "ScriptEngine::xfer - m_sequentialScripts should be empty but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each entry
 		for( UnsignedShort i = 0; i < sequentialScriptCount; ++i )
@@ -8166,9 +8168,9 @@ void ScriptEngine::xfer( Xfer *xfer )
 			// xfer data
 			xfer->xferSnapshot( sequentialScript );
 
-		}  // end for i
+		}
 
-	}  // end else, load
+	}
 
 	// counters
 	UnsignedShort countersSize = m_numCounters;
@@ -8176,10 +8178,10 @@ void ScriptEngine::xfer( Xfer *xfer )
 	if( countersSize > MAX_COUNTERS )
 	{
 
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_COUNTERS has changed size, need to version this\n" ));
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_COUNTERS has changed size, need to version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < countersSize; ++i )
 	{
 
@@ -8191,8 +8193,8 @@ void ScriptEngine::xfer( Xfer *xfer )
 
 		// countdown timer
 		xfer->xferBool( &m_counters[ i ].isCountdownTimer );
-		
-	}  // end for, i
+
+	}
 
 	// num counters
 	xfer->xferInt( &m_numCounters );
@@ -8202,22 +8204,22 @@ void ScriptEngine::xfer( Xfer *xfer )
 	xfer->xferUnsignedShort( &flagsSize );
 	if( flagsSize > MAX_FLAGS )
 	{
-	
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_FLAGS has changed size, need to version this\n" ));
+
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_FLAGS has changed size, need to version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < flagsSize; ++i )
 	{
 
 		// value
 		xfer->xferBool( &m_flags[ i ].value );
-		
+
 		// name
 		xfer->xferAsciiString( &m_flags[ i ].name );
 
-	}  // end for i
-		
+	}
+
 	// num flags
 	xfer->xferInt( &m_numFlags );
 
@@ -8227,17 +8229,17 @@ void ScriptEngine::xfer( Xfer *xfer )
 	if( attackPriorityInfoSize > MAX_ATTACK_PRIORITIES )
 	{
 
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_ATTACK_PRIORITIES size has changed, need to version this\n" ));
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_ATTACK_PRIORITIES size has changed, need to version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < attackPriorityInfoSize; ++i )
 	{
 
 		// xfer each data
 		xfer->xferSnapshot( &m_attackPriorityInfo[ i ] );
 
-	}  // end for i
+	}
 
 	// num attack info
 	xfer->xferInt( &m_numAttackInfo );
@@ -8269,9 +8271,9 @@ void ScriptEngine::xfer( Xfer *xfer )
 			objectID = obj ? obj->getID() : INVALID_ID;
 			xfer->xferObjectID( &objectID );
 
-		}  // end for i
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		NamedRequest req;
@@ -8295,19 +8297,19 @@ void ScriptEngine::xfer( Xfer *xfer )
 			if( obj == NULL && objectID != INVALID_ID )
 			{
 
-				DEBUG_CRASH(( "ScriptEngine::xfer - Unable to find object by ID for m_namedObjects\n" ));
+				DEBUG_CRASH(( "ScriptEngine::xfer - Unable to find object by ID for m_namedObjects" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// assign
 			req.first = namedObjectName;
 			req.second = obj;
 			m_namedObjects.push_back( req );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// first update
 	xfer->xferBool( &m_firstUpdate );
@@ -8353,11 +8355,11 @@ void ScriptEngine::xfer( Xfer *xfer )
 	xfer->xferUnsignedShort( &triggeredSpecialPowersSize );
 	if( triggeredSpecialPowersSize != MAX_PLAYER_COUNT )
 	{
-	
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_triggeredSpecialPowers size is now different and we must version this\n" ));
+
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_triggeredSpecialPowers size is now different and we must version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < triggeredSpecialPowersSize; ++i )
 		xferListAsciiStringObjectID( xfer, &m_triggeredSpecialPowers[ i ] );
 
@@ -8366,11 +8368,11 @@ void ScriptEngine::xfer( Xfer *xfer )
 	xfer->xferUnsignedShort( &midwaySpecialPowersSize );
 	if( midwaySpecialPowersSize != MAX_PLAYER_COUNT )
 	{
-	
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_midwaySpecialPowers size is now different and we must version this\n" ));
+
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_midwaySpecialPowers size is now different and we must version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < midwaySpecialPowersSize; ++i )
 		xferListAsciiStringObjectID( xfer, &m_midwaySpecialPowers[ i ] );
 
@@ -8379,11 +8381,11 @@ void ScriptEngine::xfer( Xfer *xfer )
 	xfer->xferUnsignedShort( &finishedSpecialPowersSize );
 	if( finishedSpecialPowersSize != MAX_PLAYER_COUNT )
 	{
-	
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_finishedSpecialPowers size is now different and we must version this\n" ));
+
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_finishedSpecialPowers size is now different and we must version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < finishedSpecialPowersSize; ++i )
 		xferListAsciiStringObjectID( xfer, &m_finishedSpecialPowers[ i ] );
 
@@ -8392,11 +8394,11 @@ void ScriptEngine::xfer( Xfer *xfer )
 	xfer->xferUnsignedShort( &completedUpgradesSize );
 	if( completedUpgradesSize != MAX_PLAYER_COUNT )
 	{
-	
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_completedUpgrades size is now different and we must version this\n" ));
+
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_completedUpgrades size is now different and we must version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < completedUpgradesSize; ++i )
 		xferListAsciiStringObjectID( xfer, &m_completedUpgrades[ i ] );
 
@@ -8405,11 +8407,11 @@ void ScriptEngine::xfer( Xfer *xfer )
 	xfer->xferUnsignedShort( &acquiredSciencesSize );
 	if( acquiredSciencesSize != MAX_PLAYER_COUNT )
 	{
-	
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_acquiredSciences size is now different and we must version this\n" ));
+
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_acquiredSciences size is now different and we must version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < acquiredSciencesSize; ++i )
 		xfer->xferScienceVec( &m_acquiredSciences[ i ] );
 
@@ -8431,7 +8433,7 @@ void ScriptEngine::xfer( Xfer *xfer )
 
 	// freeze by script
 	xfer->xferBool( &m_freezeByScript );
-	
+
 	// version 2
 	if( version >= 2 )
 	{
@@ -8460,10 +8462,10 @@ void ScriptEngine::xfer( Xfer *xfer )
 
 				// player name
 				xfer->xferAsciiString( &it->m_playerName );
-				
-			}  // end for, it
 
-		}  // end if, save
+			}
+
+		}
 		else
 		{
 
@@ -8471,16 +8473,16 @@ void ScriptEngine::xfer( Xfer *xfer )
 			if( m_namedReveals.empty() == FALSE )
 			{
 
-				DEBUG_CRASH(( "ScriptEngine::xfer - m_namedReveals should be empty but is not!\n" ));
+				DEBUG_CRASH(( "ScriptEngine::xfer - m_namedReveals should be empty but is not!" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// read all entries
 			NamedReveal reveal;
 			for( UnsignedShort i = 0; i < namedRevealCount; ++i )
 			{
-				
+
 				// read name
 				xfer->xferAsciiString( &reveal.m_revealName );
 
@@ -8489,16 +8491,16 @@ void ScriptEngine::xfer( Xfer *xfer )
 
 				// read radius
 				xfer->xferReal( &reveal.m_radiusToReveal );
-				
+
 				// read player name
 				xfer->xferAsciiString( &reveal.m_playerName );
 
 				// put on list
 				m_namedReveals.push_back( reveal );
 
-			}  // end for, i
+			}
 
-		}  // end else, load
+		}
 
 		// all object type lists size
 		UnsignedShort allObjectTypesCount = m_allObjectTypeLists.size();
@@ -8507,7 +8509,7 @@ void ScriptEngine::xfer( Xfer *xfer )
 		// all object type lists data
 		if( xfer->getXferMode() == XFER_SAVE )
 		{
-			
+
 			// iterate list
 			AllObjectTypesIt it;
 			ObjectTypes *objectTypes;
@@ -8520,9 +8522,9 @@ void ScriptEngine::xfer( Xfer *xfer )
 				// save object types
 				xfer->xferSnapshot( objectTypes );
 
-			}  // end for, it
+			}
 
-		}  // end if, save
+		}
 		else
 		{
 
@@ -8530,10 +8532,10 @@ void ScriptEngine::xfer( Xfer *xfer )
 			if( m_allObjectTypeLists.empty() == FALSE )
 			{
 
-				DEBUG_CRASH(( "ScriptEngine::xfer - m_allObjectTypeLists should be empty but is not!\n" ));
+				DEBUG_CRASH(( "ScriptEngine::xfer - m_allObjectTypeLists should be empty but is not!" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// read all data
 			ObjectTypes *objectTypes;
@@ -8549,11 +8551,11 @@ void ScriptEngine::xfer( Xfer *xfer )
 				// put on list
 				m_allObjectTypeLists.push_back( objectTypes );
 
-			}  // end for, i
+			}
 
-		}  //  end else, load
+		}
 
-	}  // end if, version 2
+	}
 
 	if (version >= 3) {
 		xfer->xferBool(&m_objectsShouldReceiveDifficultyBonus);
@@ -8581,14 +8583,14 @@ void ScriptEngine::xfer( Xfer *xfer )
 			m_fade = FADE_MULTIPLY; //default to a fade in from black.
 			m_curFadeFrame = 0;
 			m_minFade = 1.0f;
-			m_maxFade = 0.0f;	
+			m_maxFade = 0.0f;
 			m_fadeFramesIncrease = 0;
 			m_fadeFramesHold = 0;
 			m_fadeFramesDecrease = FRAMES_TO_FADE_IN_AT_START;
 			m_curFadeValue = 0.0f;
 		}
 	}
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -8607,9 +8609,9 @@ void ScriptEngine::loadPostProcess( void )
 		TheAudio->addAudioEvent(&event);
 	}
 
-}  // end loadPostProcess
+}
 
-//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+//#if defined(RTS_DEBUG)
 void ScriptEngine::debugVictory( void )
 {
 	ScriptAction *action = newInstance(ScriptAction)(ScriptAction::VICTORY);
@@ -8645,7 +8647,7 @@ void _appendMessage(const AsciiString& str, Bool isTrueMessage, Bool shouldPause
 	msg.concat(str);
 
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG(("-SCRIPT- %s\n", msg.str()));
+	DEBUG_LOG(("-SCRIPT- %s", msg.str()));
 #endif
 	if (!st_DebugDLL) {
 		return;
@@ -8776,7 +8778,7 @@ void _addUpdatedParticleSystem( AsciiString particleSystemName )
 	if (TheParticleSystemManager->findTemplate(particleSystemName)) {
 		return;
 	}
-	
+
 	FARPROC proc, proc2;
 	proc = GetProcAddress(st_ParticleDLL, "AppendParticleSystem");
 	if (!proc) {
@@ -8822,12 +8824,12 @@ AsciiString _getParticleSystemName( void )
 void _updatePanelParameters( ParticleSystemTemplate *particleTemplate )
 {
 	typedef void (*funcptr)(ParticleSystemTemplate*);
-	
+
 	if (!st_ParticleDLL) {
 		return;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "UpdateCurrentParticleSystem");
 	if (!proc) {
 		return;
@@ -8844,22 +8846,22 @@ void _updateAsciiStringParmsToSystem( ParticleSystemTemplate *particleTemplate )
 		return;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "GetSelectedParticleAsciiStringParm");
 
 	if (!proc) {
 		return;
 	}
-	
+
 	char buff[ARBITRARY_BUFF_SIZE];
 	ParticleSystemTemplate* otherTemp;
 
 	((funcptr) proc)(0, buff, &otherTemp); // PARM_ParticleTypeName
 	if (otherTemp == particleTemplate) {
-		particleTemplate->m_particleTypeName.set(buff);	
+		particleTemplate->m_particleTypeName.set(buff);
 	}
 
-	
+
 	((funcptr) proc)(1, buff, &otherTemp); // PARM_SlaveSystemName
 	if (otherTemp == particleTemplate) {
 		particleTemplate->m_slaveSystemName.set(buff);
@@ -8867,7 +8869,7 @@ void _updateAsciiStringParmsToSystem( ParticleSystemTemplate *particleTemplate )
 
 	((funcptr) proc)(2, buff, &otherTemp); // PARM_AttachedSystemName
 	if (otherTemp == particleTemplate) {
-		particleTemplate->m_attachedSystemName.set(buff);	
+		particleTemplate->m_attachedSystemName.set(buff);
 	}
 }
 
@@ -8879,7 +8881,7 @@ extern void _updateAsciiStringParmsFromSystem( ParticleSystemTemplate *particleT
 		return;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "UpdateParticleAsciiStringParm");
 
 	if (!proc) {
@@ -8896,13 +8898,13 @@ extern void _updateAsciiStringParmsFromSystem( ParticleSystemTemplate *particleT
 #define BACKUP_EXT				"BAK"
 static void _writeOutINI( void )
 {
-	// currently, this uses NO intelligence. It blindly iterates through all of the 
+	// currently, this uses NO intelligence. It blindly iterates through all of the
 	// particle system templates and writes out every field that it thinks it should.
 	const int maxFileLength = 128;
 	char buff[maxFileLength];
-	
+
 	File *saveFile = NULL;
-	
+
 	int i = 0;
 	do {
 		if (saveFile) {
@@ -8918,10 +8920,10 @@ static void _writeOutINI( void )
 	if (!saveFile) {
 		return;
 	}
-	
+
 	// save the old file
 	File *oldINI = TheFileSystem->openFile("Data\\INI\\ParticleSystem.ini", File::READ | File::TEXT);
-	
+
 	if (oldINI) {
 		char singleChar;
 		while (oldINI->position() != oldINI->size()) {
@@ -9048,9 +9050,9 @@ static const std::string F_VOLCYLRAD =		"VolCylinderRadius";
 static const std::string F_VOLCYLLEN =		"VolCylinderLength";
 static const std::string F_ISHOLLOW =			"IsHollow";
 static const std::string F_ISXYPLANAR =		"IsGroundAligned";
-static const std::string F_ISEMITABOVEGROUNDONLY 
+static const std::string F_ISEMITABOVEGROUNDONLY
 																			=		"IsEmitAboveGroundOnly";
-static const std::string F_ISPARTICLEUPTOWARDSEMITTER 
+static const std::string F_ISPARTICLEUPTOWARDSEMITTER
 																			=		"IsParticleUpTowardsEmitter";
 
 static const std::string F_WINDMOTION = "WindMotion";
@@ -9072,28 +9074,28 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 	static char buff2[ARBITRARY_BUFF_SIZE];
 	static char buff3[ARBITRARY_BUFF_SIZE];
 	static char buff4[ARBITRARY_BUFF_SIZE];
-	
 
-	// the .append looks REALLY ugly, but this code was written with streams in mind, and so 
+
+	// the .append looks REALLY ugly, but this code was written with streams in mind, and so
 	// these were all originally << (feed-operator for streams)
 	// I might come back and re-write this later, if there are enough complaints. ;-) jkmcd
 	// in the meantime, move along...
-	std::string thisEntry = "";
+	std::string thisEntry;
 	thisEntry.append(HEADER).append(SEP_SPACE).append(templ->getName().str()).append(SEP_EOL);
 	thisEntry.append(SEP_HEAD).append(F_PRIORITY).append(EQ_WITH_SPACES).append(ParticlePriorityNames[templ->m_priority]).append(SEP_EOL);
 	thisEntry.append(SEP_HEAD).append(F_ISONESHOT).append(EQ_WITH_SPACES).append((templ->m_isOneShot ? STR_TRUE : STR_FALSE)).append(SEP_EOL);
 	thisEntry.append(SEP_HEAD).append(F_SHADER).append(EQ_WITH_SPACES).append(ParticleShaderTypeNames[templ->m_shaderType]).append(SEP_EOL);
 	thisEntry.append(SEP_HEAD).append(F_TYPE).append(EQ_WITH_SPACES).append(ParticleTypeNames[templ->m_particleType]).append(SEP_EOL);
 	thisEntry.append(SEP_HEAD).append(F_PARTICLENAME).append(EQ_WITH_SPACES).append(templ->m_particleTypeName.str()).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_angleX.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_angleX.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_ANGLEX).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_angleY.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_angleY.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_ANGLEY).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_angleZ.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_angleZ.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_ANGLEZ).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
@@ -9101,11 +9103,11 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 	sprintf(buff1, FORMAT_STRING, templ->m_angularRateX.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_angularRateX.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_ANGLERATEX).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_angularRateY.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_angularRateY.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_ANGLERATEY).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_angularRateZ.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_angularRateZ.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_ANGLERATEZ).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
@@ -9117,7 +9119,7 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 	sprintf(buff1, FORMAT_STRING, templ->m_velDamping.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_velDamping.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_VELOCITYDAMP).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_gravity);
 	thisEntry.append(SEP_HEAD).append(F_GRAVITY).append(EQ_WITH_SPACES).append(buff1).append(SEP_EOL);
 	if (!templ->m_slaveSystemName.isEmpty()) {
@@ -9142,15 +9144,15 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 	sprintf(buff1, FORMAT_STRING, templ->m_startSize.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_startSize.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_SIZE).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_startSizeRate.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_startSizeRate.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_STARTSIZERATE).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_sizeRate.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_sizeRate.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_SIZERATE).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_sizeRateDamping.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_sizeRateDamping.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_SIZERATEDAMP).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
@@ -9169,27 +9171,27 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 	sprintf(buff2, FORMAT_STRING, templ->m_alphaKey[2].var.getMaximumValue());
 	sprintf(buff3, "%d", templ->m_alphaKey[2].frame);
 	thisEntry.append(SEP_HEAD).append(F_ALPHA3).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_alphaKey[3].var.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_alphaKey[3].var.getMaximumValue());
 	sprintf(buff3, "%d", templ->m_alphaKey[3].frame);
 	thisEntry.append(SEP_HEAD).append(F_ALPHA4).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_alphaKey[4].var.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_alphaKey[4].var.getMaximumValue());
 	sprintf(buff3, "%d", templ->m_alphaKey[4].frame);
 	thisEntry.append(SEP_HEAD).append(F_ALPHA5).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_alphaKey[5].var.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_alphaKey[5].var.getMaximumValue());
 	sprintf(buff3, "%d", templ->m_alphaKey[5].frame);
 	thisEntry.append(SEP_HEAD).append(F_ALPHA6).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_alphaKey[6].var.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_alphaKey[6].var.getMaximumValue());
 	sprintf(buff3, "%d", templ->m_alphaKey[6].frame);
 	thisEntry.append(SEP_HEAD).append(F_ALPHA7).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_alphaKey[7].var.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_alphaKey[7].var.getMaximumValue());
 	sprintf(buff3, "%d", templ->m_alphaKey[7].frame);
@@ -9212,53 +9214,53 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 	sprintf(buff3, "%s%d", STR_B.c_str(), REAL_TO_INT(templ->m_colorKey[2].color.blue * 255 + 0.5));
 	sprintf(buff4, "%d", templ->m_colorKey[2].frame);
 	thisEntry.append(SEP_HEAD).append(F_COLOR3).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_SPACE).append(buff4).append(SEP_EOL);
-	
+
 	sprintf(buff1, "%s%d", STR_R.c_str(), REAL_TO_INT(templ->m_colorKey[3].color.red * 255 + 0.5));
 	sprintf(buff2, "%s%d", STR_G.c_str(), REAL_TO_INT(templ->m_colorKey[3].color.green * 255 + 0.5));
 	sprintf(buff3, "%s%d", STR_B.c_str(), REAL_TO_INT(templ->m_colorKey[3].color.blue * 255 + 0.5));
 	sprintf(buff4, "%d", templ->m_colorKey[3].frame);
 	thisEntry.append(SEP_HEAD).append(F_COLOR4).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_SPACE).append(buff4).append(SEP_EOL);
-	
+
 	sprintf(buff1, "%s%d", STR_R.c_str(), REAL_TO_INT(templ->m_colorKey[4].color.red * 255 + 0.5));
 	sprintf(buff2, "%s%d", STR_G.c_str(), REAL_TO_INT(templ->m_colorKey[4].color.green * 255 + 0.5));
 	sprintf(buff3, "%s%d", STR_B.c_str(), REAL_TO_INT(templ->m_colorKey[4].color.blue * 255 + 0.5));
 	sprintf(buff4, "%d", templ->m_colorKey[4].frame);
 	thisEntry.append(SEP_HEAD).append(F_COLOR5).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_SPACE).append(buff4).append(SEP_EOL);
-	
+
 	sprintf(buff1, "%s%d", STR_R.c_str(), REAL_TO_INT(templ->m_colorKey[5].color.red * 255 + 0.5));
 	sprintf(buff2, "%s%d", STR_G.c_str(), REAL_TO_INT(templ->m_colorKey[5].color.green * 255 + 0.5));
 	sprintf(buff3, "%s%d", STR_B.c_str(), REAL_TO_INT(templ->m_colorKey[5].color.blue * 255 + 0.5));
 	sprintf(buff4, "%d", templ->m_colorKey[5].frame);
 	thisEntry.append(SEP_HEAD).append(F_COLOR6).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_SPACE).append(buff4).append(SEP_EOL);
-	
+
 	sprintf(buff1, "%s%d", STR_R.c_str(), REAL_TO_INT(templ->m_colorKey[6].color.red * 255 + 0.5));
 	sprintf(buff2, "%s%d", STR_G.c_str(), REAL_TO_INT(templ->m_colorKey[6].color.green * 255 + 0.5));
 	sprintf(buff3, "%s%d", STR_B.c_str(), REAL_TO_INT(templ->m_colorKey[6].color.blue * 255 + 0.5));
 	sprintf(buff4, "%d", templ->m_colorKey[6].frame);
 	thisEntry.append(SEP_HEAD).append(F_COLOR7).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_SPACE).append(buff4).append(SEP_EOL);
-	
+
 	sprintf(buff1, "%s%d", STR_R.c_str(), REAL_TO_INT(templ->m_colorKey[7].color.red * 255 + 0.5));
 	sprintf(buff2, "%s%d", STR_G.c_str(), REAL_TO_INT(templ->m_colorKey[7].color.green * 255 + 0.5));
 	sprintf(buff3, "%s%d", STR_B.c_str(), REAL_TO_INT(templ->m_colorKey[7].color.blue * 255 + 0.5));
 	sprintf(buff4, "%d", templ->m_colorKey[7].frame);
 	thisEntry.append(SEP_HEAD).append(F_COLOR8).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_SPACE).append(buff4).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_colorScale.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_colorScale.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_COLORSCALE).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_burstDelay.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_burstDelay.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_BURSTDELAY).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_burstCount.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_burstCount.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_BURSTCOUNT).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_initialDelay.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_initialDelay.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_INITIALDELAY).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING_LEADING_STRING, STR_X.c_str(), templ->m_driftVelocity.x);
 	sprintf(buff2, FORMAT_STRING_LEADING_STRING, STR_Y.c_str(), templ->m_driftVelocity.y);
 	sprintf(buff3, FORMAT_STRING_LEADING_STRING, STR_Z.c_str(), templ->m_driftVelocity.z);
@@ -9271,11 +9273,11 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 		sprintf(buff1, FORMAT_STRING, templ->m_emissionVelocity.ortho.x.getMinimumValue());
 		sprintf(buff2, FORMAT_STRING, templ->m_emissionVelocity.ortho.x.getMaximumValue());
 		thisEntry.append(SEP_HEAD).append(F_VELORTHOX).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-		
+
 		sprintf(buff1, FORMAT_STRING, templ->m_emissionVelocity.ortho.y.getMinimumValue());
 		sprintf(buff2, FORMAT_STRING, templ->m_emissionVelocity.ortho.y.getMaximumValue());
 		thisEntry.append(SEP_HEAD).append(F_VELORTHOY).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-		
+
 		sprintf(buff1, FORMAT_STRING, templ->m_emissionVelocity.ortho.z.getMinimumValue());
 		sprintf(buff2, FORMAT_STRING, templ->m_emissionVelocity.ortho.z.getMaximumValue());
 		thisEntry.append(SEP_HEAD).append(F_VELORTHOZ).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
@@ -9306,7 +9308,7 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 		sprintf(buff1, FORMAT_STRING, templ->m_emissionVelocity.outward.otherSpeed.getMinimumValue());
 		sprintf(buff2, FORMAT_STRING, templ->m_emissionVelocity.outward.otherSpeed.getMaximumValue());
 		thisEntry.append(SEP_HEAD).append(F_VELOUTOTHER).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	}	
+	}
 
 	thisEntry.append(SEP_HEAD).append(F_VOLUMETYPE).append(EQ_WITH_SPACES).append(EmissionVolumeTypeNames[templ->m_emissionVolumeType]).append(SEP_EOL);
 
@@ -9378,7 +9380,7 @@ static int _getEditorBehavior( void )
 		return 0x00;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "NextParticleEditorBehavior");
 
 	if (!proc) {
@@ -9398,14 +9400,14 @@ static void _updateAndSetCurrentSystem( void )
 		_updateAsciiStringParmsFromSystem(pTemp);
 		_updatePanelParameters(pTemp);
 
-		if( st_particleSystemNeedsStopping ) 
+		if( st_particleSystemNeedsStopping )
 		{
 			st_particleSystem->stop();
 			st_particleSystem->destroy();
 			st_particleSystemNeedsStopping = FALSE;
 		}
 		st_particleSystem = TheParticleSystemManager->createParticleSystem(pTemp);
-		if( st_particleSystem ) 
+		if( st_particleSystem )
 		{
 			if( st_particleSystem->isSystemForever() )
 				st_particleSystemNeedsStopping = TRUE;// Only infinite lifetime systems need to be stopped.
@@ -9454,7 +9456,7 @@ static void _reloadParticleSystemFromINI( AsciiString particleSystemName )
 	if (!iniFile) {
 		return;
 	}
-	
+
 	try {
 		// find the entry
 		while (!((iniFile->eof()) || INI::isDeclarationOfType("ParticleSystem", particleSystemName, linebuff))) {
@@ -9465,9 +9467,9 @@ static void _reloadParticleSystemFromINI( AsciiString particleSystemName )
 			if (iniFile->eof()) {
 				throw 0;
 			}
-			
+
 			outTempINI = TheFileSystem->openFile("temporary.ini", File::WRITE | File::TEXT);
-			if (!outTempINI) {	
+			if (!outTempINI) {
 				throw 0;
 			}
 
@@ -9480,7 +9482,7 @@ static void _reloadParticleSystemFromINI( AsciiString particleSystemName )
 			if (iniFile->eof()) {
 				throw 1;
 			}
-			
+
 
 			// write out the closing "END"
 			outTempINI->write(linebuff, strlen(linebuff));
@@ -9489,7 +9491,7 @@ static void _reloadParticleSystemFromINI( AsciiString particleSystemName )
 		}
 
 		// force the current system to stop.
-		if (st_particleSystemNeedsStopping) 
+		if (st_particleSystemNeedsStopping)
 		{
 			st_particleSystem->stop();
 			st_particleSystem->destroy();
@@ -9498,7 +9500,7 @@ static void _reloadParticleSystemFromINI( AsciiString particleSystemName )
 		// reload that entry
 		INI ini;
 		ini.load("temporary.ini", INI_LOAD_OVERWRITE, NULL);
-		
+
 		// delete the file
 //		unlink("temporary.ini");
 
@@ -9508,9 +9510,9 @@ static void _reloadParticleSystemFromINI( AsciiString particleSystemName )
 		_updatePanelParameters(pTemp);
 
 	} catch (int why) {
-		switch(why) 
+		switch(why)
 		{
-			case 2:	
+			case 2:
 			case 1: if (outTempINI) { outTempINI->close(); }
 			case 0: if (iniFile) { iniFile->close(); }
 		}
@@ -9526,7 +9528,7 @@ static int _getNewCurrentParticleCap( void )
 		return -1;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "GetNewParticleCap");
 
 	if (!proc) {
@@ -9544,7 +9546,7 @@ static void _updateCurrentParticleCap( void )
 		return;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "UpdateCurrentParticleCap");
 
 	if (!proc) {
@@ -9562,7 +9564,7 @@ static void _updateCurrentParticleCount( void )
 		return;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "UpdateCurrentNumParticles");
 
 	if (!proc) {
@@ -9585,12 +9587,12 @@ static void _initVTune()
 	st_vTuneDLL = ::LoadLibrary("vtuneapi.dll");
 // nope, not here...
 //DEBUG_ASSERTCRASH(st_vTuneDLL != NULL, "VTuneAPI DLL not found!"));
-	
+
 	if (st_vTuneDLL)
 	{
 		VTPause = (VTProc)::GetProcAddress(st_vTuneDLL, "VTPause");
 		VTResume = (VTProc)::GetProcAddress(st_vTuneDLL, "VTResume");
-		DEBUG_ASSERTCRASH(VTPause != NULL && VTResume != NULL, ("VTuneAPI procs not found!\n"));
+		DEBUG_ASSERTCRASH(VTPause != NULL && VTResume != NULL, ("VTuneAPI procs not found!"));
 	}
 	else
 	{
@@ -9598,14 +9600,14 @@ static void _initVTune()
 		VTResume = NULL;
 	}
 
-	if (TheGlobalData->m_vTune) 
+	if (TheGlobalData->m_vTune)
 	{
 		// if -vtune was specified, start it paused.
 		st_EnableVTune = false;
 		if (VTPause)
-			VTPause();		
+			VTPause();
 		// only complain about it being missing if they were expecting it to be present
-		DEBUG_ASSERTCRASH(st_vTuneDLL != NULL, ("VTuneAPI DLL not found!\n"));
+		DEBUG_ASSERTCRASH(st_vTuneDLL != NULL, ("VTuneAPI DLL not found!"));
 	}
 	else
 	{
@@ -9618,7 +9620,7 @@ static void _initVTune()
 
 static void _updateVTune()
 {
-	if (!st_vTuneDLL) 
+	if (!st_vTuneDLL)
 		return;
 
 	if (st_EnableVTune)
@@ -9629,13 +9631,13 @@ static void _updateVTune()
 	else
 	{
 		if (VTPause)
-			VTPause();		
+			VTPause();
 	}
 }
 
 static void _cleanUpVTune()
 {
-	if (st_vTuneDLL) 
+	if (st_vTuneDLL)
 	{
 		FreeLibrary(st_vTuneDLL);
 	}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp
index 0499d5b508d..e81045e9a97 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Scripts.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   Generals
@@ -41,7 +41,7 @@
 // Desc:      Contains the information describing scripts.
 //
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Lib/BaseType.h"
 
@@ -66,21 +66,16 @@
 #include "GameLogic/SidesList.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 static Script *s_mtScript = NULL;
 static ScriptGroup *s_mtGroup = NULL;
 
 //
-// These strings must be in the same order as they are in their definitions 
+// These strings must be in the same order as they are in their definitions
 // (See SHELL_SCRIPT_HOOK_* )
 //
-const char *TheShellHookNames[]=
+static const char *const TheShellHookNames[]=
 {
 	"ShellMainMenuCampaignPushed", //SHELL_SCRIPT_HOOK_MAIN_MENU_CAMPAIGN_SELECTED,
 	"ShellMainMenuCampaignHighlighted", //SHELL_SCRIPT_HOOK_MAIN_MENU_CAMPAIGN_HIGHLIGHTED,
@@ -121,6 +116,8 @@ const char *TheShellHookNames[]=
 	"ShellLANClosed", //SHELL_SCRIPT_HOOK_LAN_CLOSED,
 	"ShellLANEnteredFromGame", //SHELL_SCRIPT_HOOK_LAN_ENTERED_FROM_GAME,
 };
+static_assert(ARRAY_SIZE(TheShellHookNames) == SHELL_SCRIPT_HOOK_TOTAL, "Incorrect array size");
+
 void SignalUIInteraction(Int interaction)
 {
 	if (TheScriptEngine)
@@ -138,7 +135,7 @@ enum { K_SCRIPT_LIST_DATA_VERSION_1 = 1,
 			K_SCRIPT_GROUP_DATA_VERSION_2 = 2,
 			K_SCRIPT_DATA_VERSION_1 = 1,
 			K_SCRIPT_DATA_VERSION_2 = 2,
-			K_SCRIPT_OR_CONDITION_DATA_VERSION_1=1, 
+			K_SCRIPT_OR_CONDITION_DATA_VERSION_1=1,
 			K_SCRIPT_ACTION_VERSION_1 = 1,
 			K_SCRIPT_CONDITION_VERSION_1 = 1,
 			K_SCRIPT_CONDITION_VERSION_2 = 2,
@@ -147,16 +144,16 @@ enum { K_SCRIPT_LIST_DATA_VERSION_1 = 1,
 			end_of_the_enumeration
 };
 
-static Condition::ConditionType ParameterChangesVer2[] = 
-{ 
+static Condition::ConditionType ParameterChangesVer2[] =
+{
 	// Seven Changed from version 1.
-	Condition::TEAM_INSIDE_AREA_PARTIALLY, 
-	Condition::TEAM_INSIDE_AREA_ENTIRELY, 
-	Condition::TEAM_OUTSIDE_AREA_ENTIRELY, 
-	Condition::TEAM_ENTERED_AREA_PARTIALLY, 
-	Condition::TEAM_ENTERED_AREA_ENTIRELY, 
-	Condition::TEAM_EXITED_AREA_ENTIRELY, 
-	Condition::TEAM_EXITED_AREA_PARTIALLY, 
+	Condition::TEAM_INSIDE_AREA_PARTIALLY,
+	Condition::TEAM_INSIDE_AREA_ENTIRELY,
+	Condition::TEAM_OUTSIDE_AREA_ENTIRELY,
+	Condition::TEAM_ENTERED_AREA_PARTIALLY,
+	Condition::TEAM_ENTERED_AREA_ENTIRELY,
+	Condition::TEAM_EXITED_AREA_ENTIRELY,
+	Condition::TEAM_EXITED_AREA_PARTIALLY,
 	(Condition::ConditionType) -1,
 };
 
@@ -175,14 +172,14 @@ Int ScriptList::m_curId = 0;
  ScriptList::updateDefaults -  checks for empty script lists, and adds some default stuff
  so you don't get a totally blank screen in the editor.
 */
-void ScriptList::updateDefaults(void) 
+void ScriptList::updateDefaults(void)
 {
 	Int i;
-	for (i=0; i<TheSidesList->getNumSides(); i++) 
+	for (i=0; i<TheSidesList->getNumSides(); i++)
 	{
 		ScriptList* pList = TheSidesList->getSideInfo(i)->getScriptList();
 		if (pList == NULL) {
-			pList = newInstance(ScriptList);	
+			pList = newInstance(ScriptList);
 			TheSidesList->getSideInfo(i)->setScriptList(pList);
 		}
 	}
@@ -191,11 +188,11 @@ void ScriptList::updateDefaults(void)
 /**
   Deletes any script lists attached to sides.  Used for editor cleanup.
 */
-void ScriptList::reset(void) 
+void ScriptList::reset(void)
 {
 	Int i;
 	if (TheSidesList == NULL) return; /// @todo - move this code into sides list.
-	for (i=0; i<TheSidesList->getNumSides(); i++) 
+	for (i=0; i<TheSidesList->getNumSides(); i++)
 	{
 		ScriptList* pList = TheSidesList->getSideInfo(i)->getScriptList();
 		TheSidesList->getSideInfo(i)->setScriptList(NULL);
@@ -218,16 +215,13 @@ m_firstScript(NULL)
   Dtor.  Deletes any script lists or group lists.  Note that dtors for groups and script lists
 	delete the whole list, so don't need to traverse here.
 */
-ScriptList::~ScriptList(void) 
+ScriptList::~ScriptList(void)
 {
-	if (m_firstGroup) {
-		deleteInstance(m_firstGroup);
-		m_firstGroup = NULL;
-	}
-	if (m_firstScript) {
-		deleteInstance(m_firstScript);
-		m_firstScript = NULL;
-	}
+	deleteInstance(m_firstGroup);
+	m_firstGroup = NULL;
+
+	deleteInstance(m_firstScript);
+	m_firstScript = NULL;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -257,7 +251,7 @@ void ScriptList::xfer( Xfer *xfer )
 	UnsignedShort scriptCount = 0;
 	for( script = getScript(); script; script = script->getNext() )
 		scriptCount++;
-	countVerify = scriptCount; 
+	countVerify = scriptCount;
 	xfer->xferUnsignedShort( &scriptCount );
 	if( countVerify != scriptCount )
 	{
@@ -265,7 +259,7 @@ void ScriptList::xfer( Xfer *xfer )
 		DEBUG_CRASH(( "ScriptList::xfer - Script list count has changed, attempting to recover."));
 		// throw SC_INVALID_DATA; try to recover. jba.
 
-	}  // end if
+	}
 
 	// all script data here
 	for( script = getScript(); script; script = script->getNext() )	{
@@ -294,7 +288,7 @@ void ScriptList::xfer( Xfer *xfer )
 
 		DEBUG_CRASH(( "ScriptList::xfer - Script group count has changed, attempting to recover."));
 
-	}  // end if
+	}
 
 	// all script group data
 	for( scriptGroup = getScriptGroup(); scriptGroup; scriptGroup = scriptGroup->getNext() ) {
@@ -322,9 +316,9 @@ void ScriptList::loadPostProcess( void )
 }
 
 /**
-  ScriptList::duplicate - Creates a full, "deep" copy of scriptlist. 
+  ScriptList::duplicate - Creates a full, "deep" copy of scriptlist.
 */
-ScriptList *ScriptList::duplicate(void) const 
+ScriptList *ScriptList::duplicate(void) const
 {
 	ScriptList *pNew = newInstance(ScriptList);
 
@@ -367,10 +361,10 @@ ScriptList *ScriptList::duplicate(void) const
 
 /**
   ScriptList::duplicateAndQualify - Creates a full, "deep" copy of scriptlist,
-	adding the qualifier to names. 
+	adding the qualifier to names.
 */
-ScriptList *ScriptList::duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const 
+ScriptList *ScriptList::duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const
 {
 	ScriptList *pNew = newInstance(ScriptList);
 
@@ -412,9 +406,9 @@ ScriptList *ScriptList::duplicateAndQualify(const AsciiString& qualifier,
 }
 
 /**
-  ScriptList::discard - Deletes a script list, but not any children. 
+  ScriptList::discard - Deletes a script list, but not any children.
 */
-void ScriptList::discard(void)  
+void ScriptList::discard(void)
 {
 	m_firstGroup = NULL;
 	m_firstScript = NULL;
@@ -522,19 +516,17 @@ void ScriptList::deleteGroup(ScriptGroup *pGrp)
 * ScriptList::ParseScriptsDataChunk - read a Scripts chunk.
 * Format is the newer CHUNKY format.
 *	See ScriptList::ScriptList for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptList::ParseScriptsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
 	Int i;
-	file.registerParser( AsciiString("ScriptList"), info->label, ScriptList::ParseScriptListDataChunk );
+	file.registerParser( "ScriptList", info->label, ScriptList::ParseScriptListDataChunk );
 	DEBUG_ASSERTCRASH(s_numInReadList==0, ("Leftover scripts floating aroung."));
 	for (i=0; i<s_numInReadList; i++) {
-		if (s_readLists[i]) {
-			deleteInstance(s_readLists[i]);
-			s_readLists[i] = NULL;
-		}
+		deleteInstance(s_readLists[i]);
+		s_readLists[i] = NULL;
 	}
 	TScriptListReadInfo readInfo;
 	for (i=0; i<MAX_PLAYER_COUNT; i++) {
@@ -555,10 +547,10 @@ Bool ScriptList::ParseScriptsDataChunk(DataChunkInput &file, DataChunkInfo *info
 /**
 * ScriptList::getReadScripts - Gets the scripts read in from a file by .
 * ScriptList::ParseScriptsDataChunk.
-*		
+*
 */
 Int ScriptList::getReadScripts(ScriptList *scriptLists[MAX_PLAYER_COUNT])
-{		 
+{
 	Int i;
 	Int count = s_numInReadList;
 	s_numInReadList = 0;
@@ -567,19 +559,19 @@ Int ScriptList::getReadScripts(ScriptList *scriptLists[MAX_PLAYER_COUNT])
 		s_readLists[i] = NULL;
 	}
 	return count;
-}								 
+}
 
 /**
 * ScriptList::WriteScriptsDataChunk - Writes a Scripts chunk.
 * Format is the newer CHUNKY format.
 *	See ScriptEngine::ParseScriptsDataChunk for the reader.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void ScriptList::WriteScriptsDataChunk(DataChunkOutput &chunkWriter, ScriptList *scriptLists[], Int numLists )
 {
 	/**********SCRIPTS DATA ***********************/
-	chunkWriter.openDataChunk("PlayerScriptsList", K_SCRIPTS_DATA_VERSION_1);	
+	chunkWriter.openDataChunk("PlayerScriptsList", K_SCRIPTS_DATA_VERSION_1);
 		Int i;
 		for (i=0; i<numLists; i++) {
 			chunkWriter.openDataChunk("ScriptList", K_SCRIPT_LIST_DATA_VERSION_1);
@@ -587,7 +579,7 @@ void ScriptList::WriteScriptsDataChunk(DataChunkOutput &chunkWriter, ScriptList
 			chunkWriter.closeDataChunk();
 		}
 	chunkWriter.closeDataChunk();
-	
+
 }
 
 
@@ -595,8 +587,8 @@ void ScriptList::WriteScriptsDataChunk(DataChunkOutput &chunkWriter, ScriptList
 /**
 * ScriptList::WriteScriptListDataChunk - Writes a Scripts chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void ScriptList::WriteScriptListDataChunk(DataChunkOutput &chunkWriter)
 {
@@ -610,8 +602,8 @@ void ScriptList::WriteScriptListDataChunk(DataChunkOutput &chunkWriter)
 * ScriptList::ParseScriptListDataChunk - read a Scripts chunk.
 * Format is the newer CHUNKY format.
 *	See ScriptList::WriteScriptListDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptList::ParseScriptListDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -621,10 +613,10 @@ Bool ScriptList::ParseScriptListDataChunk(DataChunkInput &file, DataChunkInfo *i
 	pInfo->readLists[pInfo->numLists] = newInstance(ScriptList);
 	Int cur = pInfo->numLists;
 	pInfo->numLists++;
-	file.registerParser( AsciiString("Script"), info->label, Script::ParseScriptFromListDataChunk );
-	file.registerParser( AsciiString("ScriptGroup"), info->label, ScriptGroup::ParseGroupDataChunk );
+	file.registerParser( "Script", info->label, Script::ParseScriptFromListDataChunk );
+	file.registerParser( "ScriptGroup", info->label, ScriptGroup::ParseGroupDataChunk );
 	return file.parse(pInfo->readLists[cur]);
-	
+
 }
 
 
@@ -640,10 +632,7 @@ m_firstScript(NULL),
 m_hasWarnings(false),
 m_isGroupActive(true),
 m_isGroupSubroutine(false),
-//Added By Sadullah Nader
-//Initializations inserted
 m_nextGroup(NULL)
-//
 {
 	m_groupName.format("Script Group %d", ScriptList::getNextID());
 }
@@ -652,22 +641,21 @@ m_nextGroup(NULL)
   Dtor - The script list deletes the rest of the list, but we have to loop & delete
 	sll the script groups in out list.
 */
-ScriptGroup::~ScriptGroup(void) 
+ScriptGroup::~ScriptGroup(void)
 {
-	if (m_firstScript) {
-		// Delete the first script.  m_firstScript deletes the entire list.
-		deleteInstance(m_firstScript);
-		m_firstScript = NULL;
-	}
+	// Delete the first script.  m_firstScript deletes the entire list.
+	deleteInstance(m_firstScript);
+	m_firstScript = NULL;
+
 	if (m_nextGroup) {
 		// Delete all the subsequent groups in our list.
 		ScriptGroup *cur = m_nextGroup;
 		ScriptGroup *next;
 		while (cur) {
 			next = cur->getNext();
-			cur->setNextGroup(NULL); // prevents recursion. 
+			cur->setNextGroup(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
 }
@@ -678,7 +666,7 @@ ScriptGroup::~ScriptGroup(void)
 void ScriptGroup::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -706,7 +694,7 @@ void ScriptGroup::xfer( Xfer *xfer )
 		DEBUG_CRASH(( "ScriptGroup::xfer - Script list count has changed, attempting to recover."));
 		// throw SC_INVALID_DATA; try to recover. jba.
 
-	}  // end if
+	}
 
 	// xfer script data
 	for( script = getScript(); script; script = script->getNext() )	{
@@ -723,7 +711,7 @@ void ScriptGroup::xfer( Xfer *xfer )
 		}
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -731,15 +719,15 @@ void ScriptGroup::xfer( Xfer *xfer )
 void ScriptGroup::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 /**
   ScriptGroup::duplicate - Creates a full, "deep" copy of ScriptGroup.
 	m_nextGroup is NULL on the copy.
 */
-ScriptGroup *ScriptGroup::duplicate(void) const 
+ScriptGroup *ScriptGroup::duplicate(void) const
 {
-	ScriptGroup *pNew = newInstance(ScriptGroup);	
+	ScriptGroup *pNew = newInstance(ScriptGroup);
 
 	{
 		Script *src = this->m_firstScript;
@@ -767,12 +755,12 @@ ScriptGroup *ScriptGroup::duplicate(void) const
 }
 
 /**
-  ScriptGroup::duplicateAndQualify - Creates a full, "deep" copy of ScriptGroup, 
+  ScriptGroup::duplicateAndQualify - Creates a full, "deep" copy of ScriptGroup,
 	adding qualifier to names.
 	m_nextGroup is NULL on the copy.
 */
-ScriptGroup *ScriptGroup::duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const 
+ScriptGroup *ScriptGroup::duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const
 {
 	ScriptGroup *pNew = newInstance(ScriptGroup);
 
@@ -852,8 +840,8 @@ void ScriptGroup::addScript(Script *pScr, Int ndx)
 /**
 * ScriptGroup::WriteGroupDataChunk - Writes a Scripts chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void ScriptGroup::WriteGroupDataChunk(DataChunkOutput &chunkWriter, ScriptGroup *pGroup)
 {
@@ -868,15 +856,15 @@ void ScriptGroup::WriteGroupDataChunk(DataChunkOutput &chunkWriter, ScriptGroup
 		chunkWriter.closeDataChunk();
 		pGroup = pGroup->getNext();
 	}
-	
+
 }
 
 /**
 * ScriptGroup::ParseGroupDataChunk - read a Group chunk.
 * Format is the newer CHUNKY format.
 *	See ScriptList::WriteScriptListDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptGroup::ParseGroupDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -889,9 +877,9 @@ Bool ScriptGroup::ParseGroupDataChunk(DataChunkInput &file, DataChunkInfo *info,
 		pGroup->m_isGroupSubroutine= file.readByte();
 	}
 	pList->addGroup(pGroup, AT_END);
-	file.registerParser( AsciiString("Script"), info->label, Script::ParseScriptFromGroupDataChunk );
+	file.registerParser( "Script", info->label, Script::ParseScriptFromGroupDataChunk );
 	return file.parse(pGroup);
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -905,7 +893,7 @@ m_isActive(true),
 m_isOneShot(true),
 m_easy(true),
 m_normal(true),
-m_hard(true),	
+m_hard(true),
 m_delayEvaluationSeconds(0),
 m_conditionTime(0),
 m_conditionExecutedCount(0),
@@ -915,11 +903,8 @@ m_hasWarnings(false),
 m_nextScript(NULL),
 m_condition(NULL),
 m_action(NULL),
-//Added By Sadullah Nader
-//Initializations inserted
 m_actionFalse(NULL),
 m_curTime(0.0f)
-//
 {
 }
 
@@ -927,28 +912,22 @@ m_curTime(0.0f)
   Dtor - The condition and action deletes the rest of the list, but we have to loop & delete
 	all the scripts in out list.
 */
-Script::~Script(void) 
+Script::~Script(void)
 {
 	if (m_nextScript) {
 		Script *cur = m_nextScript;
 		Script *next;
 		while (cur) {
 			next = cur->getNext();
-			cur->setNextScript(NULL); // prevents recursion. 
+			cur->setNextScript(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
-	if (m_condition) {
-		deleteInstance(m_condition);
-	}
-	if (m_action) {
-		deleteInstance(m_action);
-	}
 
-	if (m_actionFalse) {
-		deleteInstance(m_actionFalse);
-	}
+	deleteInstance(m_condition);
+	deleteInstance(m_action);
+	deleteInstance(m_actionFalse);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -957,7 +936,7 @@ Script::~Script(void)
 void Script::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -977,7 +956,7 @@ void Script::xfer( Xfer *xfer )
 	xfer->xferBool( &active );
 	setActive( active );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -985,22 +964,17 @@ void Script::xfer( Xfer *xfer )
 void Script::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 /**
   Script::duplicate - Creates a full, "deep" copy of script. Condition list and action
   list is duplicated as well.  Note - just the script, doesn't
 	duplicate a list of scripts.  m_nextScript is NULL on the copy.
 */
-Script *Script::duplicate(void) const 
+Script *Script::duplicate(void) const
 {
-	Script *pNew = newInstance(Script);	
-	if (pNew->m_condition) {
-		deleteInstance(pNew->m_condition);
-	}
-	if (pNew->m_action) {
-		deleteInstance(pNew->m_action);
-	}
+	Script *pNew = newInstance(Script);
+
 	pNew->m_scriptName = m_scriptName;
 	pNew->m_comment = m_comment;
 	pNew->m_conditionComment = m_conditionComment;
@@ -1012,6 +986,7 @@ Script *Script::duplicate(void) const
 	pNew->m_normal = m_normal;
 	pNew->m_hard = m_hard;
 	pNew->m_delayEvaluationSeconds = m_delayEvaluationSeconds;
+
 	if (m_condition) {
 		pNew->m_condition = m_condition->duplicate();
 	}
@@ -1025,21 +1000,16 @@ Script *Script::duplicate(void) const
 }
 
 /**
-  Script::duplicate - Creates a full, "deep" copy of script, with qualifier 
+  Script::duplicate - Creates a full, "deep" copy of script, with qualifier
   added to names. Condition list and action
   list is duplicated as well.  Note - just the script, doesn't
 	duplicate a list of scripts.  m_nextScript is NULL on the copy.
 */
-Script *Script::duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const 
+Script *Script::duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const
 {
 	Script *pNew = newInstance(Script);
-	if (pNew->m_condition) {
-		deleteInstance(pNew->m_condition);
-	}
-	if (pNew->m_action) {
-		deleteInstance(pNew->m_action);
-	}
+
 	pNew->m_scriptName = m_scriptName;
 	pNew->m_scriptName.concat(qualifier);
 	pNew->m_comment = m_comment;
@@ -1052,6 +1022,7 @@ Script *Script::duplicateAndQualify(const AsciiString& qualifier,
 	pNew->m_normal = m_normal;
 	pNew->m_hard = m_hard;
 	pNew->m_delayEvaluationSeconds = m_delayEvaluationSeconds;
+
 	if (m_condition) {
 		pNew->m_condition = m_condition->duplicateAndQualify(qualifier, playerTemplateName, newPlayerName);
 	}
@@ -1065,12 +1036,12 @@ Script *Script::duplicateAndQualify(const AsciiString& qualifier,
 }
 
 /**
-  Script::updateFrom - Copies all the data from pSrc into this.  Any data in this 
+  Script::updateFrom - Copies all the data from pSrc into this.  Any data in this
 	is deleted (conditions, actions).  Note that this guts pSrc, and removes it's conditions
 	and actions.  Intended for use in an edit dialog, where pSrc is a copy edited, and if cancelled
 	discarded, and if not cancelled, updated into the real script, then discarded.
 */
-void Script::updateFrom(Script *pSrc) 
+void Script::updateFrom(Script *pSrc)
 {
 	this->m_scriptName = pSrc->m_scriptName;
 	this->m_comment = pSrc->m_comment;
@@ -1083,19 +1054,16 @@ void Script::updateFrom(Script *pSrc)
 	this->m_easy = pSrc->m_easy;
 	this->m_normal = pSrc->m_normal;
 	this->m_hard = pSrc->m_hard;
-	if (this->m_condition) {
-		deleteInstance(this->m_condition);
-	}
+
+	deleteInstance(this->m_condition);
 	this->m_condition = pSrc->m_condition;
 	pSrc->m_condition = NULL;
-	if (this->m_action) {
-		deleteInstance(this->m_action);
-	}
+
+	deleteInstance(this->m_action);
 	this->m_action = pSrc->m_action;
 	pSrc->m_action = NULL;
-	if (this->m_actionFalse) {
-		deleteInstance(this->m_actionFalse);
-	}
+
+	deleteInstance(this->m_actionFalse);
 	this->m_actionFalse = pSrc->m_actionFalse;
 	pSrc->m_actionFalse = NULL;
 }
@@ -1172,7 +1140,7 @@ void Script::deleteFalseAction(ScriptAction *pAct)
 /**
   Script::getUiText - Creates the string to display in the scripts dialog box.
 */
-AsciiString Script::getUiText(void) 
+AsciiString Script::getUiText(void)
 {
 	AsciiString uiText("*** IF ***\r\n");
 	OrCondition *pOr = m_condition;
@@ -1219,8 +1187,8 @@ AsciiString Script::getUiText(void)
 /**
 * Script::WriteScriptDataChunk - Writes a Scripts chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void Script::WriteScriptDataChunk(DataChunkOutput &chunkWriter, Script *pScript)
 {
@@ -1236,22 +1204,22 @@ void Script::WriteScriptDataChunk(DataChunkOutput &chunkWriter, Script *pScript)
 			chunkWriter.writeByte(pScript->m_isOneShot);
 			chunkWriter.writeByte(pScript->m_easy);
 			chunkWriter.writeByte(pScript->m_normal);
-			chunkWriter.writeByte(pScript->m_hard);	 
-			chunkWriter.writeByte(pScript->m_isSubroutine);	
-			chunkWriter.writeInt(pScript->m_delayEvaluationSeconds);	
+			chunkWriter.writeByte(pScript->m_hard);
+			chunkWriter.writeByte(pScript->m_isSubroutine);
+			chunkWriter.writeInt(pScript->m_delayEvaluationSeconds);
 			if (pScript->m_condition) OrCondition::WriteOrConditionDataChunk(chunkWriter, pScript->m_condition);
 			if (pScript->m_action) ScriptAction::WriteActionDataChunk(chunkWriter, pScript->m_action);
 			if (pScript->m_actionFalse) ScriptAction::WriteActionFalseDataChunk(chunkWriter, pScript->m_actionFalse);
 		chunkWriter.closeDataChunk();
 		pScript = pScript->getNext();
-	}	
+	}
 }
 /**
 * Script::ParseScript - read a script chunk.
 * Format is the newer CHUNKY format.
 *	See ScriptList::WriteScriptDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Script *Script::ParseScript(DataChunkInput &file, unsigned short version)
 {
@@ -1271,14 +1239,14 @@ Script *Script::ParseScript(DataChunkInput &file, unsigned short version)
 	if (version>=K_SCRIPT_DATA_VERSION_2) {
 		pScript->m_delayEvaluationSeconds = file.readInt();
 	}
-	file.registerParser( AsciiString("OrCondition"), AsciiString("Script"), OrCondition::ParseOrConditionDataChunk );
-	file.registerParser( AsciiString("ScriptAction"),  AsciiString("Script"), ScriptAction::ParseActionDataChunk );
-	file.registerParser( AsciiString("ScriptActionFalse"),  AsciiString("Script"), ScriptAction::ParseActionFalseDataChunk );
-	if (! file.parse(pScript) ) 
+	file.registerParser( "OrCondition", "Script", OrCondition::ParseOrConditionDataChunk );
+	file.registerParser( "ScriptAction",  "Script", ScriptAction::ParseActionDataChunk );
+	file.registerParser( "ScriptActionFalse",  "Script", ScriptAction::ParseActionFalseDataChunk );
+	if (! file.parse(pScript) )
 	{
 		return NULL;
 	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return pScript;
 }
 
@@ -1286,15 +1254,15 @@ Script *Script::ParseScript(DataChunkInput &file, unsigned short version)
 * Script::ParseScriptFromListDataChunk - read a script chunk in a script list.
 * Format is the newer CHUNKY format.
 *	See ScriptList::WriteScriptListDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool Script::ParseScriptFromListDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
 	ScriptList *pList = (ScriptList *)userData;
 	Script *pScript = ParseScript(file, info->version);
 	pList->addScript(pScript, AT_END);
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return true;
 }
 
@@ -1302,23 +1270,23 @@ Bool Script::ParseScriptFromListDataChunk(DataChunkInput &file, DataChunkInfo *i
 * Script::ParseScriptFromGroupDataChunk - read a script chunk in a script group.
 * Format is the newer CHUNKY format.
 *	See ScriptList::WriteScriptListDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool Script::ParseScriptFromGroupDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
 	ScriptGroup *pGroup = (ScriptGroup *)userData;
 	Script *pScript = ParseScript(file, info->version);
 	pGroup->addScript(pScript, AT_END);
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return true;
 }
 
 
 /**
 * Script::findPreviousOrCondition - find the OrCondition that immediately proceeds curOr.
-*	Input: OrCondition 
-*		
+*	Input: OrCondition
+*
 */
 OrCondition *Script::findPreviousOrCondition( OrCondition *curOr )
 {
@@ -1326,7 +1294,7 @@ OrCondition *Script::findPreviousOrCondition( OrCondition *curOr )
 	if ( myConditions == curOr ) {
 		return NULL;
 	}
-	
+
 	while (myConditions) {
 		if (myConditions->getNextOrCondition() == curOr) {
 			return myConditions;
@@ -1341,27 +1309,26 @@ OrCondition *Script::findPreviousOrCondition( OrCondition *curOr )
 //-------------------------------------------------------------------------------------------------
 // ******************************** class  OrCondition *********************************************
 //-------------------------------------------------------------------------------------------------
-OrCondition::~OrCondition(void) 
+OrCondition::~OrCondition(void)
 {
-	if (m_firstAnd) {
-		deleteInstance(m_firstAnd);
-		m_firstAnd = NULL;
-	}
+	deleteInstance(m_firstAnd);
+	m_firstAnd = NULL;
+
 	if (m_nextOr) {
 		OrCondition *cur = m_nextOr;
 		OrCondition *next;
 		while (cur) {
 			next = cur->getNextOrCondition();
-			cur->setNextOrCondition(NULL); // prevents recursion. 
+			cur->setNextOrCondition(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
 }
 
-OrCondition *OrCondition::duplicate(void) const 
+OrCondition *OrCondition::duplicate(void) const
 {
-	OrCondition *pNew = newInstance(OrCondition);	
+	OrCondition *pNew = newInstance(OrCondition);
 	if (m_firstAnd) {
 		pNew->m_firstAnd = m_firstAnd->duplicate();
 	}
@@ -1378,8 +1345,8 @@ OrCondition *OrCondition::duplicate(void) const
 	return pNew;
 }
 
-OrCondition *OrCondition::duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const 
+OrCondition *OrCondition::duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const
 {
 	OrCondition *pNew = newInstance(OrCondition);
 	if (m_firstAnd) {
@@ -1408,7 +1375,7 @@ Condition *OrCondition::removeCondition(Condition *pCond)
 	}
 
 	DEBUG_ASSERTCRASH(pCur, ("Couldn't find condition."));
-	if (pCur==NULL) 
+	if (pCur==NULL)
 		return NULL;
 	if (pPrev) {
 		pPrev->setNextCondition(pCur->getNext());
@@ -1424,7 +1391,7 @@ void OrCondition::deleteCondition(Condition *pCond)
 {
 	Condition *pCur = removeCondition(pCond);
 	DEBUG_ASSERTCRASH(pCur, ("Couldn't find condition."));
-	if (pCur==NULL) 
+	if (pCur==NULL)
 		return;
 	deleteInstance(pCur);
 }
@@ -1433,8 +1400,8 @@ void OrCondition::deleteCondition(Condition *pCond)
 /**
 * OrCondition::WriteOrConditionDataChunk - Writes a Or condition chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void OrCondition::WriteOrConditionDataChunk(DataChunkOutput &chunkWriter, OrCondition	*pOrCondition)
 {
@@ -1445,15 +1412,15 @@ void OrCondition::WriteOrConditionDataChunk(DataChunkOutput &chunkWriter, OrCond
 		chunkWriter.closeDataChunk();
 		pOrCondition = pOrCondition->getNextOrCondition();
 	}
-	
+
 }
 
 /**
 * OrCondition::ParseOrConditionDataChunk - read a Or condition chunk.
 * Format is the newer CHUNKY format.
 *	See OrCondition::WriteOrConditionDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool OrCondition::ParseOrConditionDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1468,17 +1435,17 @@ Bool OrCondition::ParseOrConditionDataChunk(DataChunkInput &file, DataChunkInfo
 	} else {
 		pScript->setOrCondition(pOrCondition);
 	}
-	file.registerParser( AsciiString("Condition"), info->label, Condition::ParseConditionDataChunk );
+	file.registerParser( "Condition", info->label, Condition::ParseConditionDataChunk );
 	return file.parse(pOrCondition);
-	
+
 }
 
 /**
 * OrCondition::findPreviousCondition - find the condition that immediately proceeds curCond.
 * Format is the newer CHUNKY format.
 *	See OrCondition::WriteOrConditionDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Condition *OrCondition::findPreviousCondition( Condition *curCond )
 {
@@ -1510,7 +1477,7 @@ m_numParms(0),
 m_nextAndCondition(NULL)
 {
 	Int i;
-	for (i = 0; i < MAX_PARMS; i++) 
+	for (i = 0; i < MAX_PARMS; i++)
 	{
 		m_parms[i] = NULL;
 	}
@@ -1531,21 +1498,20 @@ void Condition::setConditionType(enum ConditionType type)
 {
 	Int i;
 	for (i=0; i<m_numParms; i++) {
-		if (m_parms[i]) 
-			deleteInstance(m_parms[i]);
+		deleteInstance(m_parms[i]);
 		m_parms[i] = NULL;
 	}
 	m_conditionType = type;
 	const ConditionTemplate *pTemplate = TheScriptEngine->getConditionTemplate(m_conditionType);
 	m_numParms = pTemplate->getNumParameters();
 	for (i=0; i<m_numParms; i++) {
-		m_parms[i] = newInstance(Parameter)(pTemplate->getParameterType(i));	
+		m_parms[i] = newInstance(Parameter)(pTemplate->getParameterType(i));
 	}
 }
 
-Condition *Condition::duplicate(void) const 
+Condition *Condition::duplicate(void) const
 {
-	Condition *pNew = newInstance(Condition)(m_conditionType);	
+	Condition *pNew = newInstance(Condition)(m_conditionType);
 	Int i;
 	for (i=0; i<m_numParms && i<pNew->m_numParms; i++) {
 		*pNew->m_parms[i] = *m_parms[i];
@@ -1563,8 +1529,8 @@ Condition *Condition::duplicate(void) const
 	return pNew;
 }
 
-Condition *Condition::duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const 
+Condition *Condition::duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const
 {
 	Condition *pNew = newInstance(Condition)(m_conditionType);
 	Int i;
@@ -1586,7 +1552,7 @@ Condition *Condition::duplicateAndQualify(const AsciiString& qualifier,
 	return pNew;
 }
 
-Condition::~Condition(void) 
+Condition::~Condition(void)
 {
 	Int i;
 	for (i=0; i<m_numParms; i++) {
@@ -1598,9 +1564,9 @@ Condition::~Condition(void)
 		Condition *next;
 		while (cur) {
 			next = cur->getNext();
-			cur->setNextCondition(NULL); // prevents recursion. 
+			cur->setNextCondition(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
 }
@@ -1640,8 +1606,8 @@ AsciiString Condition::getUiText(void)
 /**
 * Condition::WriteConditionDataChunk - Writes a condition chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void Condition::WriteConditionDataChunk(DataChunkOutput &chunkWriter, Condition	*pCondition)
 {
@@ -1656,14 +1622,14 @@ void Condition::WriteConditionDataChunk(DataChunkOutput &chunkWriter, Condition
 			}
 		chunkWriter.closeDataChunk();
 		pCondition = pCondition->getNext();
-	}	
+	}
 }
 /**
 * Condition::ParseConditionDataChunk - read a condition.
 * Format is the newer CHUNKY format.
 *	See Condition::WriteActionDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool Condition::ParseConditionDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1672,11 +1638,11 @@ Bool Condition::ParseConditionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 	pCondition->m_conditionType = (enum ConditionType)file.readInt();
 	pCondition->m_numParms =file.readInt();
 	Int i;
-	for (i=0; i<pCondition->m_numParms; i++) 
+	for (i=0; i<pCondition->m_numParms; i++)
 	{
 		pCondition->m_parms[i] = Parameter::ReadParameter(file);
 	}
-	
+
 	if (file.getChunkVersion() < K_SCRIPT_CONDITION_VERSION_2) {
 		for (int j = 0; ParameterChangesVer2[j] != -1; ++j) {
 			if (pCondition->m_conditionType == ParameterChangesVer2[j]) {
@@ -1686,7 +1652,7 @@ Bool Condition::ParseConditionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 		}
 	}
 	// heal old files.
-	switch (pCondition->getConditionType()) 
+	switch (pCondition->getConditionType())
 	{
 		case SKIRMISH_SPECIAL_POWER_READY:
 			if (pCondition->m_numParms == 1)
@@ -1707,7 +1673,7 @@ Bool Condition::ParseConditionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 	} else {
 		pOr->setFirstAndCondition(pCondition);
 	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return true;
 }
 
@@ -1734,7 +1700,7 @@ Int Template::getUiStrings(AsciiString strings[MAX_PARMS]) const
 //-------------------------------------------------------------------------------------------------
 // ******************************** class Parameter ***********************************************
 //-------------------------------------------------------------------------------------------------
-enum Parameter::ParameterType Template::getParameterType(Int ndx) const 
+enum Parameter::ParameterType Template::getParameterType(Int ndx) const
 {
 	if (ndx >= 0 && ndx < m_numParameters) {
 		return m_parameters[ndx];
@@ -1760,8 +1726,8 @@ void Parameter::setCoord3D(const Coord3D *pLoc)
 	}
 }
 
-void Parameter::qualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) 
+void Parameter::qualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName)
 {
 	AsciiString tmpString;
 	switch (m_paramType) {
@@ -1772,11 +1738,11 @@ void Parameter::qualify(const AsciiString& qualifier,
 				m_string = newPlayerName;
 			}
 			break;
-		case TEAM:	
+		case TEAM:
 			if (m_string == THIS_TEAM) {
 				break;
 			}
-			/// otherwise drop down & qualify.
+			FALLTHROUGH; /// otherwise drop down & qualify.
 		case SCRIPT:
 		case COUNTER:
 		case FLAG:
@@ -1794,7 +1760,7 @@ AsciiString Parameter::getUiText(void) const
 	}
 
 	Coord3D pos;
-	switch (m_paramType) 
+	switch (m_paramType)
 	{
 		default:
 			DEBUG_CRASH(("Unknown parameter type."));
@@ -1850,14 +1816,14 @@ AsciiString Parameter::getUiText(void) const
 		case COORD3D:
 			getCoord3D(&pos);
 			uiText.format("(%.2f,%.2f,%.2f)", pos.x,pos.y,pos.z);
-			break;	
+			break;
 		case OBJECT_TYPE:
 			uiText.format("'%s'", uiString.str());
 			break;
 		case KIND_OF_PARAM:
 			if (m_int >= KINDOF_FIRST && m_int < KINDOF_COUNT )
 				uiText.format("Kind is '%s'", KindOfMaskType::getNameFromSingleBit(m_int));
-			else 
+			else
 				uiText.format("Kind is ???");
 			break;
 		case SIDE:
@@ -1872,7 +1838,7 @@ AsciiString Parameter::getUiText(void) const
 		case BOOLEAN:
 			uiText.concat(m_int?"TRUE":"FALSE");
 			break;
-					 
+
 		case REAL:
 			uiText.format("%.2f", m_real);
 			break;
@@ -1891,7 +1857,7 @@ AsciiString Parameter::getUiText(void) const
 				default : DEBUG_CRASH(("Unknown comparison type."));
 			}
 			break;
-		
+
 		case RELATION:
 			switch (m_int) {
 				case REL_ENEMY: uiText.format("Enemy"); break;
@@ -1915,7 +1881,7 @@ AsciiString Parameter::getUiText(void) const
 		case RADAR_EVENT_TYPE:
 			switch (m_int) {
 				//case RADAR_EVENT_INVALID: ++m_int;	// continue to the next case.
-				case RADAR_EVENT_INVALID: DEBUG_CRASH(("Invalid radar event\n")); uiText.format("Construction"); break;
+				case RADAR_EVENT_INVALID: DEBUG_CRASH(("Invalid radar event")); uiText.format("Construction"); break;
 				case RADAR_EVENT_CONSTRUCTION: uiText.format("Construction"); break;
 				case RADAR_EVENT_UPGRADE: uiText.format("Upgrade"); break;
 				case RADAR_EVENT_UNDER_ATTACK: uiText.format("Under Attack"); break;
@@ -1924,7 +1890,7 @@ AsciiString Parameter::getUiText(void) const
 				default : DEBUG_CRASH(("Unknown Radar event type."));
 			}
 			break;
-			
+
 
 		case DIALOG:
 			uiText.format("'%s'", uiString.str());
@@ -1961,16 +1927,16 @@ AsciiString Parameter::getUiText(void) const
 		case UPGRADE:
 			uiText.format("Upgrade '%s'", uiString.str());
 			break;
-		
+
 		case COMMANDBUTTON_ABILITY:
 		case COMMANDBUTTON_ALL_ABILITIES:
 			uiText.format( "Ability '%s'", uiString.str() );
 			break;
-			
+
 		case EMOTICON:
 			uiText.format( "Emoticon '%s'", uiString.str() );
 			break;
-			
+
 		case BOUNDARY:
 			uiText.format("Boundary %s", BORDER_COLORS[m_int % BORDER_COLORS_SIZE].m_colorName);
 			break;
@@ -1978,15 +1944,15 @@ AsciiString Parameter::getUiText(void) const
 		case BUILDABLE:
 			if (m_int >= BSTATUS_YES && m_int < BSTATUS_NUM_TYPES )
 				uiText.format("Buildable (%s)", BuildableStatusNames[m_int - BSTATUS_YES]);
-			else 
+			else
 				uiText.format("Buildable ???");
 			break;
-		
+
 		case SURFACES_ALLOWED:
 		{
 			if (m_int > 0 && m_int <= 3)
 				uiText.format("Surfaces Allowed: %s", Surfaces[m_int - 1]);
-			else 
+			else
 				uiText.format("Surfaces Allowed: ???");
 			break;
 		}
@@ -1999,7 +1965,7 @@ AsciiString Parameter::getUiText(void) const
 				uiText.format("Shake Intensity: ???");
 			break;
 		}
-		
+
 		case OBJECT_STATUS:
 		{
 			if (m_string.isEmpty()) {
@@ -2019,7 +1985,7 @@ AsciiString Parameter::getUiText(void) const
 		case OBJECT_TYPE_LIST:
 			uiText.format("'%s'", uiString.str());
 			break;
-			
+
 		case REVEALNAME:
 			uiText.format("Reveal Name: %s", uiString.str());
 			break;
@@ -2034,8 +2000,8 @@ AsciiString Parameter::getUiText(void) const
 /**
 * Parameter::WriteParameter - Writes an Parameter.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void Parameter::WriteParameter(DataChunkOutput &chunkWriter)
 {
@@ -2061,8 +2027,8 @@ void Parameter::WriteParameter(DataChunkOutput &chunkWriter)
 * Parameter::ReadParameter - read a parameter.
 * Format is the newer CHUNKY format.
 *	See Parameter::WriteParameter for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Parameter *Parameter::ReadParameter(DataChunkInput &file)
 {
@@ -2074,46 +2040,46 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)
 		pos.y = file.readReal();
 		pos.z = file.readReal();
 		pParm->setCoord3D(&pos);
-	} 
-	else 
+	}
+	else
 	{
 		pParm->m_int = file.readInt();
 		pParm->m_real = file.readReal();
 		pParm->m_string = file.readAsciiString();
 	}
 
-	if (pParm->getParameterType() == OBJECT_TYPE) 
+	if (pParm->getParameterType() == OBJECT_TYPE)
 	{
 		// quick hack to make loading models with "Fundamentalist" switch to "GLA"
-		if (pParm->m_string.startsWith("Fundamentalist")) 
+		if (pParm->m_string.startsWith("Fundamentalist"))
 		{
-			char oldName[256];
+			const char* replacePrefix = "Fundamentalist";
+			const size_t offset = pParm->m_string.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
 			char newName[256];
-			strcpy(oldName, pParm->m_string.str());
 			strcpy(newName, "GLA");
-			strcat(newName, oldName+strlen("Fundamentalist"));
+			strlcat(newName, pParm->m_string.str() + offset, ARRAY_SIZE(newName));
+			DEBUG_LOG(("Changing Script Ref from %s to %s", pParm->m_string.str(), newName));
 			pParm->m_string.set(newName);
-			DEBUG_LOG(("Changing Script Ref from %s to %s\n", oldName, newName));
 		}
 	}
 
-	if (pParm->getParameterType() == UPGRADE) 
+	if (pParm->getParameterType() == UPGRADE)
 	{
 		// quick hack to make obsolete capture building upgrades switch to the new one. jba.
 		if (pParm->m_string == "Upgrade_AmericaRangerCaptureBuilding" ||
 			pParm->m_string == "Upgrade_ChinaRedguardCaptureBuilding" ||
-			pParm->m_string == "Upgrade_GLARebelCaptureBuilding") 
+			pParm->m_string == "Upgrade_GLARebelCaptureBuilding")
 		{
 			pParm->m_string.set("Upgrade_InfantryCaptureBuilding");
 		}
 	}
 
-	if (pParm->getParameterType() == OBJECT_STATUS) 
+	if (pParm->getParameterType() == OBJECT_STATUS)
 	{
 		// Need to change the string to an ObjectStatusMaskType
-		for( int i = 0; i < OBJECT_STATUS_COUNT; ++i ) 
+		for( int i = 0; i < OBJECT_STATUS_COUNT; ++i )
 		{
-			if( !pParm->m_string.compareNoCase( ObjectStatusMaskType::getBitNames()[i] ) ) 
+			if( !pParm->m_string.compareNoCase( ObjectStatusMaskType::getBitNames()[i] ) )
 			{
 				pParm->setStatus( MAKE_OBJECT_STATUS_MASK( i ) );
 				break;
@@ -2121,16 +2087,16 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)
 		}
 	}
 
-	if (pParm->getParameterType() == KIND_OF_PARAM) 
+	if (pParm->getParameterType() == KIND_OF_PARAM)
   {
 		// Need to change the string to an integer
-		const char** kindofNames = KindOfMaskType::getBitNames();
-		if (!pParm->m_string.isEmpty()) 
+		const char* const* kindofNames = KindOfMaskType::getBitNames();
+		if (!pParm->m_string.isEmpty())
     {
 			Bool found = false;
-			for (int i = 0; kindofNames[i]; ++i) 
+			for (int i = 0; kindofNames[i]; ++i)
 			{
-				if (pParm->m_string.compareNoCase(kindofNames[i]) == 0) 
+				if (pParm->m_string.compareNoCase(kindofNames[i]) == 0)
         {
 					pParm->setInt(i);
 					found = true;
@@ -2166,7 +2132,7 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)
 					pParm->m_string.format( "SMALL_MISSILE" );
 					for( i = 0; kindofNames[i]; ++i )
 					{
-						if (pParm->m_string.compareNoCase("SMALL_MISSILE") == 0) 
+						if (pParm->m_string.compareNoCase("SMALL_MISSILE") == 0)
 						{
 							pParm->setInt(i);
 							found = true;
@@ -2175,15 +2141,15 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)
 					}
 					DEBUG_CRASH(("Unable to find Kindof SMALL_MISSILE', please call KrisM (x36844).", pParm->m_string.str()));
 				}
-				
+
 			}
-			if (!found) 
+			if (!found)
       {
 				DEBUG_CRASH(("Unable to find Kindof '%s', please call JKM (x36872).", pParm->m_string.str()));
 				throw ERROR_BUG;
 			}
-		} 
-    else 
+		}
+    else
     {
 			// Seems weird, but this is so WB will load them into the proper format.
 			pParm->m_string = kindofNames[pParm->m_int];
@@ -2200,10 +2166,7 @@ ScriptAction::ScriptAction():
 m_actionType(NO_OP),
 m_hasWarnings(false),
 m_numParms(0),
-//Added By Sadullah Nader
-//Initializations inserted
 m_nextAction(NULL)
-//
 {
 }
 
@@ -2222,8 +2185,7 @@ void ScriptAction::setActionType(enum ScriptActionType type)
 {
 	Int i;
 	for (i=0; i<m_numParms; i++) {
-		if (m_parms[i]) 
-			deleteInstance(m_parms[i]);
+		deleteInstance(m_parms[i]);
 		m_parms[i] = NULL;
 	}
 	m_actionType = type;
@@ -2234,9 +2196,9 @@ void ScriptAction::setActionType(enum ScriptActionType type)
 	}
 }
 
-ScriptAction *ScriptAction::duplicate(void) const 
+ScriptAction *ScriptAction::duplicate(void) const
 {
-	ScriptAction *pNew = newInstance(ScriptAction)(m_actionType);	
+	ScriptAction *pNew = newInstance(ScriptAction)(m_actionType);
 	Int i;
 	for (i=0; i<m_numParms; i++) {
 		if (pNew->m_parms[i]) {
@@ -2258,8 +2220,8 @@ ScriptAction *ScriptAction::duplicate(void) const
 	return pNew;
 }
 
-ScriptAction *ScriptAction::duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const 
+ScriptAction *ScriptAction::duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const
 {
 	ScriptAction *pNew = newInstance(ScriptAction)(m_actionType);
 	Int i;
@@ -2285,7 +2247,7 @@ ScriptAction *ScriptAction::duplicateAndQualify(const AsciiString& qualifier,
 	return pNew;
 }
 
-ScriptAction::~ScriptAction(void) 
+ScriptAction::~ScriptAction(void)
 {
 	Int i;
 	for (i=0; i<m_numParms; i++) {
@@ -2297,9 +2259,9 @@ ScriptAction::~ScriptAction(void)
 		ScriptAction *next;
 		while (cur) {
 			next = cur->getNext();
-			cur->setNextAction(NULL); // prevents recursion. 
+			cur->setNextAction(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
 }
@@ -2338,8 +2300,8 @@ AsciiString ScriptAction::getUiText(void)
 /**
 * ScriptAction::WriteActionDataChunk - Writes an Action chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void ScriptAction::WriteActionDataChunk(DataChunkOutput &chunkWriter, ScriptAction	*pScriptAction)
 {
@@ -2354,15 +2316,15 @@ void ScriptAction::WriteActionDataChunk(DataChunkOutput &chunkWriter, ScriptActi
 			}
 		chunkWriter.closeDataChunk();
 		pScriptAction = pScriptAction->getNext();
-	}	
+	}
 }
 
 /**
 * ScriptAction::ParseActionDataChunk - read an action chunk in a script list.
 * Format is the newer CHUNKY format.
 *	See ScriptAction::WriteActionDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptAction::ParseActionDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -2372,22 +2334,22 @@ Bool ScriptAction::ParseActionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 
 	pScriptAction->m_actionType = (enum ScriptActionType)file.readInt();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	const ActionTemplate* at = TheScriptEngine->getActionTemplate(pScriptAction->m_actionType);
 	if (at && (at->getName().isEmpty() || (at->getName().compareNoCase("(placeholder)") == 0))) {
-		DEBUG_CRASH(("Invalid Script Action found in script '%s'\n", pScript->getName().str()));
+		DEBUG_CRASH(("Invalid Script Action found in script '%s'", pScript->getName().str()));
 	}
 #endif
 
 	pScriptAction->m_numParms =file.readInt();
 	Int i;
-	for (i=0; i<pScriptAction->m_numParms; i++) 
+	for (i=0; i<pScriptAction->m_numParms; i++)
 	{
 		pScriptAction->m_parms[i] = Parameter::ReadParameter(file);
 	}
 
 	// heal old files.
-	switch (pScriptAction->getActionType()) 
+	switch (pScriptAction->getActionType())
 	{
 		case SKIRMISH_FIRE_SPECIAL_POWER_AT_MOST_COST:
 			if (pScriptAction->m_numParms == 1)
@@ -2407,7 +2369,7 @@ Bool ScriptAction::ParseActionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 			break;
 		case SKIRMISH_BUILD_BASE_DEFENSE_FRONT:
 			if (pScriptAction->m_numParms == 1)
-			{		
+			{
 				Bool flank = pScriptAction->m_parms[0]->getInt()!=0;
 				deleteInstance(pScriptAction->m_parms[0]);
 				pScriptAction->m_numParms = 0;
@@ -2416,7 +2378,7 @@ Bool ScriptAction::ParseActionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 			break;
 		case NAMED_SET_ATTITUDE:
 		case TEAM_SET_ATTITUDE:
-			if (pScriptAction->m_numParms >= 2 && pScriptAction->m_parms[1]->getParameterType() == Parameter::INT) 
+			if (pScriptAction->m_numParms >= 2 && pScriptAction->m_parms[1]->getParameterType() == Parameter::INT)
 			{
 				pScriptAction->m_parms[1] = newInstance(Parameter)(Parameter::AI_MOOD, pScriptAction->m_parms[1]->getInt());
 			}
@@ -2440,32 +2402,32 @@ Bool ScriptAction::ParseActionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 			}
 			break;
 		case SPEECH_PLAY:
-			if (pScriptAction->getNumParameters() == 1) 
+			if (pScriptAction->getNumParameters() == 1)
 			{
 				pScriptAction->m_numParms = 2;
 				// Default it to TRUE, as per conversation with JohnL
 				pScriptAction->m_parms[1] = newInstance(Parameter)(Parameter::BOOLEAN, 1);
-				break;
 			}
+			break;
 	}
 
 
 	/// @todo - Verify read in parameters with current action template.  jba.
 	ScriptAction *pLast = pScript->getAction();
-	while (pLast && pLast->getNext()) 
+	while (pLast && pLast->getNext())
 	{
 		pLast = pLast->getNext();
 	}
 
-	if (pLast) 
+	if (pLast)
 	{
 		pLast->setNextAction(pScriptAction);
-	} 
-	else 
+	}
+	else
 	{
 		pScript->setAction(pScriptAction);
 	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return true;
 }
 
@@ -2473,8 +2435,8 @@ Bool ScriptAction::ParseActionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 /**
 * ScriptAction::WriteActionFalseDataChunk - Writes a false Action chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void ScriptAction::WriteActionFalseDataChunk(DataChunkOutput &chunkWriter, ScriptAction	*pScriptAction)
 {
@@ -2489,15 +2451,15 @@ void ScriptAction::WriteActionFalseDataChunk(DataChunkOutput &chunkWriter, Scrip
 			}
 		chunkWriter.closeDataChunk();
 		pScriptAction = pScriptAction->getNext();
-	}	
+	}
 }
 
 /**
 * ScriptAction::ParseActionFalseDataChunk - read a false action chunk in a script list.
 * Format is the newer CHUNKY format.
 *	See ScriptAction::WriteActionDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptAction::ParseActionFalseDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -2521,15 +2483,15 @@ Bool ScriptAction::ParseActionFalseDataChunk(DataChunkInput &file, DataChunkInfo
 	} else {
 		pScript->setFalseAction(pScriptAction);
 	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return true;
 }
 
-// NOTE: Changing these or adding ot TheOBjectFlagNames requires changes to 
+// NOTE: Changing these or adding to TheObjectFlagsNames requires changes to
 // ScriptActions::changeObjectPanelFlagForSingleObject
 // THEY SHOULD STAY IN SYNC.
-const char* TheObjectFlagsNames[] = 
-{ 
+const char* const TheObjectFlagsNames[] =
+{
 	"Enabled",
 	"Powered",
 	"Indestructible",
diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
index c75633340ba..c3f70c082cb 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
@@ -26,12 +26,13 @@
 // Generals multiplayer victory condition specifications
 // Author: Matthew D. Campbell, February 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioEventRTS.h"
 #include "Common/GameAudio.h"
 #include "Common/GameCommon.h"
 #include "Common/GameEngine.h"
+#include "Common/GameUtility.h"
 #include "Common/KindOf.h"
 #include "Common/PlayerList.h"
 #include "Common/Player.h"
@@ -51,11 +52,6 @@
 #include "GameNetwork/GameInfo.h"
 #include "GameNetwork/NetworkDefs.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 #define ISSET(x) (m_victoryConditions & VICTORY_##x)
@@ -66,7 +62,7 @@ VictoryConditionsInterface *TheVictoryConditions = NULL;
 //-------------------------------------------------------------------------------------------------
 inline static Bool areAllies(const Player *p1, const Player *p2)
 {
-	if (p1 != p2 && 
+	if (p1 != p2 &&
 		p1->getRelationship(p2->getDefaultTeam()) == ALLIES &&
 		p2->getRelationship(p1->getDefaultTeam()) == ALLIES)
 		return true;
@@ -79,7 +75,7 @@ class VictoryConditions : public VictoryConditionsInterface
 {
 public:
 	VictoryConditions();
-	
+
 	void init( void );
 	void reset( void );
 	void update( void );
@@ -117,7 +113,7 @@ VictoryConditions::VictoryConditions()
 {
 	reset();
 }
-	
+
 //-------------------------------------------------------------------------------------------------
 void VictoryConditions::init( void )
 {
@@ -145,7 +141,7 @@ void VictoryConditions::reset( void )
 //-------------------------------------------------------------------------------------------------
 void VictoryConditions::update( void )
 {
-	if (!TheRecorder->isMultiplayer() || (m_localSlotNum == -1 && !m_isObserver))
+	if (!TheRecorder->isMultiplayer() || (m_localSlotNum < 0 && !m_isObserver))
 		return;
 
 	// Check for a single winning alliance
@@ -192,7 +188,7 @@ void VictoryConditions::update( void )
 			if (TheGameLogic->getFrame() > 1)
 			{
 				ThePartitionManager->revealMapForPlayerPermanently( p->getPlayerIndex() );
-				
+
 				TheInGameUI->message("GUI:PlayerHasBeenDefeated", p->getPlayerDisplayName().str() );
 				// People are boneheads. Also play a sound
 				static AudioEventRTS leftGameSound("GUIMessageReceived");
@@ -208,7 +204,7 @@ void VictoryConditions::update( void )
 					GameSlot *slot = (TheGameInfo)?TheGameInfo->getSlot(idx):NULL;
 					if (slot && slot->isAI())
 					{
-						DEBUG_LOG(("Marking AI player %s as defeated\n", pName.str()));
+						DEBUG_LOG(("Marking AI player %s as defeated", pName.str()));
 						slot->setLastFrameInGame(TheGameLogic->getFrame());
 					}
 				}
@@ -231,7 +227,7 @@ void VictoryConditions::update( void )
 				//MessageBoxOk(TheGameText->fetch("GUI:Defeat"), TheGameText->fetch("GUI:LocalDefeat"), NULL);
 			}
 			m_localPlayerDefeated = true;	// don't check again
-			TheRadar->forceOn(TRUE);
+			TheRadar->forceOn(localPlayer->getPlayerIndex(), TRUE);
 			SetInGameChatType( INGAME_CHAT_EVERYONE ); // can't chat to allies after death.  Only to other observers.
 		}
 	}
@@ -313,10 +309,10 @@ void VictoryConditions::cachePlayerPtrs( void )
 	for (Int i=0; i<MAX_PLAYER_COUNT; ++i)
 	{
 		Player *player = ThePlayerList->getNthPlayer(i);
-		DEBUG_LOG(("Checking whether to cache player %d - [%ls], house [%ls]\n", i, player?player->getPlayerDisplayName().str():L"<NOBODY>", (player&&player->getPlayerTemplate())?player->getPlayerTemplate()->getDisplayName().str():L"<NONE>"));
+		DEBUG_LOG(("Checking whether to cache player %d - [%ls], house [%ls]", i, player?player->getPlayerDisplayName().str():L"<NOBODY>", (player&&player->getPlayerTemplate())?player->getPlayerTemplate()->getDisplayName().str():L"<NONE>"));
 		if (player && player != ThePlayerList->getNeutralPlayer() && player->getPlayerTemplate() && player->getPlayerTemplate() != civTemplate && !player->isPlayerObserver())
 		{
-			DEBUG_LOG(("Caching player\n"));
+			DEBUG_LOG(("Caching player"));
 			m_players[playerCount] = player;
 			if (m_players[playerCount]->isLocalPlayer())
 				m_localSlotNum = playerCount;
@@ -331,8 +327,6 @@ void VictoryConditions::cachePlayerPtrs( void )
 	if (m_localSlotNum < 0)
 	{
 		m_localPlayerDefeated = true;	// if we have no local player, don't check for defeat
-		DEBUG_ASSERTCRASH(TheRadar, ("No Radar!"));
-		TheRadar->forceOn(TRUE);
 		m_isObserver = true;
 	}
 }
diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/CaveSystem.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/CaveSystem.cpp
index a6c3a6ebd03..380dd9529d0 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/System/CaveSystem.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/System/CaveSystem.cpp
@@ -27,7 +27,7 @@
 // Desc:   System responsible for keeping track of all cave systems on the map
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/TunnelTracker.h"
@@ -52,11 +52,8 @@ void CaveSystem::reset()
 {
 	for( std::vector<TunnelTracker*>::iterator iter = m_tunnelTrackerVector.begin(); iter != m_tunnelTrackerVector.end(); iter++ )
 	{
-		TunnelTracker *currentTracker = *iter;
-		if( currentTracker )// could be NULL, since we don't slide back to fill deleted entries so offsets don't shift
-		{
-			deleteInstance(currentTracker);
-		}
+		TunnelTracker *currentTracker = *iter; // could be NULL, since we don't slide back to fill deleted entries so offsets don't shift
+		deleteInstance(currentTracker);
 	}
 	m_tunnelTrackerVector.clear();
 }
@@ -83,7 +80,7 @@ Bool CaveSystem::canSwitchIndexToIndex( Int oldIndex, Int newIndex )
 			return FALSE;// You can't switch a connection if one of the two is non empty
 	}
 
-	// Both are either empty or non-existent, so go ahead.  
+	// Both are either empty or non-existent, so go ahead.
 	// (Remember non-exist is only a valid case because you are going to do the switch now.)
 
 	return TRUE;
@@ -159,9 +156,9 @@ void CaveSystem::xfer( Xfer *xfer )
 			tracker = *it;
 			xfer->xferSnapshot( tracker );
 
-		}  // end
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -169,10 +166,10 @@ void CaveSystem::xfer( Xfer *xfer )
 		if( m_tunnelTrackerVector.empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "CaveSystem::xfer - m_tunnelTrackerVector should be empty but is not\n" ));
+			DEBUG_CRASH(( "CaveSystem::xfer - m_tunnelTrackerVector should be empty but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each item
 		for( UnsignedShort i = 0; i < count; ++i )
@@ -187,10 +184,10 @@ void CaveSystem::xfer( Xfer *xfer )
 			// put in vector
 			m_tunnelTrackerVector.push_back( tracker );
 
-		}  // end for, i
+		}
 
-	}  // end else, laod
+	}
 
-}  // end xfer
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp
index cc60e391cc4..810e5d07b46 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp
@@ -27,7 +27,7 @@
 // Desc:   System responsible for Crates as code objects - ini, new/delete etc
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_VETERANCY_NAMES				// for TheVeterancyNames[]
 
@@ -47,10 +47,7 @@ CrateSystem::~CrateSystem()
 	for( Int templateIndex = 0; templateIndex < count; templateIndex ++ )
 	{
 		CrateTemplate *currentTemplate = m_crateTemplateVector[templateIndex];
-		if( currentTemplate )
-		{
-			deleteInstance(currentTemplate);
-		}
+		deleteInstance(currentTemplate);
 	}
 	m_crateTemplateVector.clear();
 }
@@ -93,7 +90,7 @@ void CrateSystem::parseCrateTemplateDefinition(INI* ini)
 
 	// read the crateTemplate name
 	const char* c = ini->getNextToken();
-	name.set(c);	
+	name.set(c);
 
 	CrateTemplate *crateTemplate = TheCrateSystem->friend_findCrateTemplate(name);
 	if (crateTemplate == NULL) {
@@ -122,7 +119,7 @@ CrateTemplate *CrateSystem::newCrateTemplate( AsciiString name )
 	CrateTemplate *ct = newInstance(CrateTemplate);
 
 	// if the default template is present, get it and copy over any data to the new template
-	const CrateTemplate *defaultCT = findCrateTemplate(AsciiString("DefaultCrate"));
+	const CrateTemplate *defaultCT = findCrateTemplate("DefaultCrate");
 	if(defaultCT)
 	{
 		*ct = *defaultCT;
@@ -157,7 +154,7 @@ const CrateTemplate *CrateSystem::findCrateTemplate(AsciiString name) const
 			CrateTemplateOverride overridable(m_crateTemplateVector[i]);
 			return overridable;
 		}
-		
+
 
 	return NULL;
 }
@@ -180,7 +177,7 @@ CrateTemplate *CrateSystem::friend_findCrateTemplate(AsciiString name)
 //--------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------
-const FieldParse CrateTemplate::TheCrateTemplateFieldParseTable[] = 
+const FieldParse CrateTemplate::TheCrateTemplateFieldParseTable[] =
 {
 	{ "CreationChance",		INI::parseReal,													NULL,									offsetof( CrateTemplate, m_creationChance ) },
 	{ "VeterancyLevel",		INI::parseIndexList,										TheVeterancyNames,		offsetof( CrateTemplate, m_veterancyLevel ) },
@@ -188,13 +185,11 @@ const FieldParse CrateTemplate::TheCrateTemplateFieldParseTable[] =
 	{ "CrateObject",			CrateTemplate::parseCrateCreationEntry,	NULL,									NULL },
 	{ "KillerScience",		INI::parseScience,											NULL,									offsetof( CrateTemplate, m_killerScience) },
 	{ "OwnedByMaker",			INI::parseBool,													NULL,									offsetof( CrateTemplate, m_isOwnedByMaker) },
-	{ NULL,								NULL,																		NULL,									NULL },		// keep this last!
+	{ NULL,								NULL,																		NULL,									NULL },
 };
 
 CrateTemplate::CrateTemplate()
 {
-	m_name = "";
-
 	m_creationChance = 0;
 	CLEAR_KINDOFMASK(m_killedByTypeKindof);
 	m_veterancyLevel = LEVEL_INVALID;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/Damage.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/Damage.cpp
index 3e380628919..25a65e0c3fc 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/System/Damage.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/System/Damage.cpp
@@ -55,7 +55,7 @@ void DamageInfo::xfer( Xfer *xfer )
 	// xfer output
 	xfer->xferSnapshot( &out );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -85,7 +85,7 @@ void DamageInfoInput::xfer( Xfer *xfer )
 	// amount
 	xfer->xferReal( &m_amount );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -109,5 +109,5 @@ void DamageInfoOutput::xfer( Xfer *xfer )
 	// no effect
 	xfer->xferBool( &m_noEffect );
 
-}  // end xfer
+}
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
index 3881db0cb62..1b2fa9b864a 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
@@ -27,19 +27,22 @@
 // Author: Michael S. Booth, October 2000
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioAffect.h"
 #include "Common/AudioHandleSpecialValues.h"
 #include "Common/BuildAssistant.h"
 #include "Common/CRCDebug.h"
+#include "Common/FramePacer.h"
 #include "Common/GameAudio.h"
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/INI.h"
 #include "Common/LatchRestore.h"
 #include "Common/MapObject.h"
 #include "Common/MultiplayerSettings.h"
+#include "Common/OSDisplay.h"
 #include "Common/PerfTimer.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -68,7 +71,6 @@
 #include "GameClient/Mouse.h"
 #include "GameClient/ParticleSys.h"
 #include "GameClient/View.h"
-#include "GameClient/ControlBar.h"
 #include "GameClient/CampaignManager.h"
 #include "GameClient/GameWindowTransitions.h"
 
@@ -106,7 +108,7 @@
 
 DECLARE_PERF_TIMER(SleepyMaintenance)
 
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.		 
+#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
 // If defined, the game times various units.
 #ifdef DO_UNIT_TIMINGS
 #pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
@@ -121,13 +123,8 @@ FILE *g_UT_commaLog=NULL;
 #endif
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
-// I'm making this larger now that we know how big our maps are going to be. 
+// I'm making this larger now that we know how big our maps are going to be.
 enum { OBJ_HASH_SIZE	= 8192 };
 
 /// The GameLogic singleton instance
@@ -210,8 +207,6 @@ void setFPMode( void )
 // ------------------------------------------------------------------------------------------------
 GameLogic::GameLogic( void )
 {
-	//Added By Sadullah Nader
-	//Initializations missing and necessary 
 	m_background = NULL;
 	m_CRC = 0;
 	m_isInUpdate = FALSE;
@@ -225,11 +220,11 @@ GameLogic::GameLogic( void )
 	}
 
 	m_shouldValidateCRCs = FALSE;
-	
+
 	m_startNewGame = FALSE;
-	//
 
 	m_frame = 0;
+	m_hasUpdated = FALSE;
 	m_frameObjectsChangedTriggerAreas = 0;
 	m_width = 0;
 	m_height = 0;
@@ -246,6 +241,7 @@ GameLogic::GameLogic( void )
 	m_pauseInput = FALSE;
 	m_inputEnabledMemory = TRUE;
 	m_mouseVisibleMemory = TRUE;
+	m_logicTimeScaleEnabledMemory = FALSE;
 	m_loadScreen = NULL;
 	m_forceGameStartByTimeOut = FALSE;
 #ifdef DUMP_PERF_STATS
@@ -253,41 +249,12 @@ GameLogic::GameLogic( void )
 #endif
 }
 
-// ------------------------------------------------------------------------------------------------
-/** Utility function to set class variables to default values. */
-// ------------------------------------------------------------------------------------------------
-void GameLogic::setDefaults( Bool saveGame )
-{
-	m_frame = 0;
-	m_width = DEFAULT_WORLD_WIDTH;
-	m_height = DEFAULT_WORLD_HEIGHT;
-	m_objList = NULL;
-#ifdef ALLOW_NONSLEEPY_UPDATES
-	m_normalUpdates.clear();
-#endif
-	for (std::vector<UpdateModulePtr>::iterator it = m_sleepyUpdates.begin(); it != m_sleepyUpdates.end(); ++it)
-	{
-		(*it)->friend_setIndexInLogic(-1);
-	}
-	m_sleepyUpdates.clear();
-	m_curUpdateModule = NULL;
-
-	//
-	// only reset the next object ID allocater counter when we're not loading a save game.
-	// for save games, we read this value out of the save game file and it is important
-	// that we preserve it as we load and execute the game
-	//
-	if( saveGame == FALSE )
-		m_nextObjID = (ObjectID)1;
-
-}
-
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Bool GameLogic::isInSinglePlayerGame( void )
 {
 	return (m_gameMode == GAME_SINGLE_PLAYER ||
-		(TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK && TheRecorder->getGameMode() == GAME_SINGLE_PLAYER));
+		(TheRecorder && TheRecorder->isPlaybackMode() && TheRecorder->getGameMode() == GAME_SINGLE_PLAYER));
 }
 
 
@@ -316,9 +283,9 @@ void GameLogic::destroyAllObjectsImmediate()
 
 	// process the destroy list immediately
 	processDestroyList();
-	DEBUG_ASSERTCRASH( m_objList == NULL, ("destroyAllObjectsImmediate: Object list not cleared\n") );
+	DEBUG_ASSERTCRASH( m_objList == NULL, ("destroyAllObjectsImmediate: Object list not cleared") );
 
-}  // end destroyAllObjectsImmediate
+}
 
 //-------------------------------------------------------------------------------------------------
 /**GameLogic class destructor, the destruction order should mirror the
@@ -360,7 +327,7 @@ GameLogic::~GameLogic()
 	// delete the Script Engine
 	delete TheScriptEngine;
 	TheScriptEngine = NULL;
-	
+
 	// Null out TheGameLogic
 	TheGameLogic = NULL;
 }
@@ -373,9 +340,6 @@ void GameLogic::init( void )
 
 	setFPMode();
 
-	/// @todo Clear object and destroy lists
-	setDefaults( FALSE );
-
 	// create the partition manager
 	ThePartitionManager = NEW PartitionManager;
 	ThePartitionManager->init();
@@ -403,30 +367,8 @@ void GameLogic::init( void )
 	//DEBUG_ASSERTCRASH(ThePlayerList, ("null ThePlayerList"));
 	//ThePlayerList->setLocalPlayer(0);
 
-	m_CRC = 0;
-	m_pauseFrame = 0;
-	m_gamePaused = FALSE;
-	m_pauseSound = FALSE;
-	m_pauseMusic = FALSE;
-	m_pauseInput = FALSE;
-	m_inputEnabledMemory = TRUE;
-	m_mouseVisibleMemory = TRUE;
-	for(Int i = 0; i < MAX_SLOTS; ++i)
-	{
-		m_progressComplete[i] = FALSE;
-		m_progressCompleteTimeout[i] = 0;
-	}
-	m_forceGameStartByTimeOut = FALSE;
-
-	m_isScoringEnabled = TRUE;
-	m_showBehindBuildingMarkers = TRUE;
-	m_drawIconUI = TRUE;
-	m_showDynamicLOD = TRUE;
-	m_scriptHulkMaxLifetimeOverride = -1;
-	
+	reset();
 	m_isInUpdate = FALSE;
-
-	m_rankPointsToAddAtGameStart = 0;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -452,6 +394,8 @@ void GameLogic::reset( void )
 	m_pauseInput = FALSE;
 	m_inputEnabledMemory = TRUE;
 	m_mouseVisibleMemory = TRUE;
+	m_logicTimeScaleEnabledMemory = FALSE;
+
 	setFPMode();
 
 	// destroy all objects
@@ -475,16 +419,26 @@ void GameLogic::reset( void )
 	}
 	m_forceGameStartByTimeOut = FALSE;
 
-	if(TheStatsCollector)
-	{
-		delete TheStatsCollector;
-		TheStatsCollector = NULL;
-	}
+	delete TheStatsCollector;
+	TheStatsCollector = NULL;
 
 	// clear any table of contents we have
 	m_objectTOC.clear();
 
-	setDefaults( FALSE );
+	m_frame = 0;
+	m_hasUpdated = FALSE;
+	m_width = DEFAULT_WORLD_WIDTH;
+	m_height = DEFAULT_WORLD_HEIGHT;
+	m_objList = NULL;
+#ifdef ALLOW_NONSLEEPY_UPDATES
+	m_normalUpdates.clear();
+#endif
+	for (std::vector<UpdateModulePtr>::iterator it = m_sleepyUpdates.begin(); it != m_sleepyUpdates.end(); ++it)
+	{
+		(*it)->friend_setIndexInLogic(-1);
+	}
+	m_sleepyUpdates.clear();
+	m_curUpdateModule = NULL;
 
 	m_isScoringEnabled = TRUE;
 	m_showBehindBuildingMarkers = TRUE;
@@ -497,22 +451,22 @@ void GameLogic::reset( void )
 	TheWaterTransparency = (WaterTransparencySetting*) wt->deleteOverrides();
 
 	m_rankPointsToAddAtGameStart = 0;
-}  // end reset
+}
 
 static Object * placeObjectAtPosition(Int slotNum, AsciiString objectTemplateName, Coord3D& pos, Player *pPlayer,
 																	const PlayerTemplate *pTemplate)
 {
 	const ThingTemplate* btt = TheThingFactory->findTemplate(objectTemplateName);
 	Object *obj = TheThingFactory->newObject( btt, pPlayer->getDefaultTeam() );
-	DEBUG_ASSERTCRASH(obj, ("TheThingFactory didn't give me a valid Object for player %d's (%ls) starting building\n",
+	DEBUG_ASSERTCRASH(obj, ("TheThingFactory didn't give me a valid Object for player %d's (%ls) starting building",
 		slotNum, pTemplate->getDisplayName().str()));
 	if (obj)
 	{
-		obj->setOrientation(obj->getTemplate()->getPlacementViewAngle());	
+		obj->setOrientation(obj->getTemplate()->getPlacementViewAngle());
 		obj->setPosition( &pos );
 
-		//DEBUG_LOG(("Placed a starting building for %s at waypoint %s\n", playerName.str(), waypointName.str()));
-		CRCDEBUG_LOG(("Placed an object for %ls at pos (%g,%g,%g)\n", pPlayer->getPlayerDisplayName().str(),
+		//DEBUG_LOG(("Placed a starting building for %s at waypoint %s", playerName.str(), waypointName.str()));
+		CRCDEBUG_LOG(("Placed an object for %ls at pos (%g,%g,%g)", pPlayer->getPlayerDisplayName().str(),
 			pos.x, pos.y, pos.z));
 		DUMPCOORD3D(&pos);
 
@@ -533,7 +487,7 @@ static Object * placeObjectAtPosition(Int slotNum, AsciiString objectTemplateNam
 			team->setActive();
 		TheAI->pathfinder()->addObjectToPathfindMap(obj);
 		if (obj->getAIUpdateInterface() && !obj->isKindOf(KINDOF_IMMOBILE)) {
-			CRCDEBUG_LOG(("Not immobile - adjusting dest\n"));
+			CRCDEBUG_LOG(("Not immobile - adjusting dest"));
 			if (TheAI->pathfinder()->adjustDestination(obj, obj->getAIUpdateInterface()->getLocomotorSet(), &pos)) {
 				DUMPCOORD3D(&pos);
 				TheAI->pathfinder()->updateGoal(obj, &pos, LAYER_GROUND);	// Units always start on the ground for now.  jba.
@@ -556,7 +510,7 @@ static void placeNetworkBuildingsForPlayer(Int slotNum, const GameSlot *pSlot, P
 
 	Waypoint *waypoint = findNamedWaypoint(waypointName);
 	Waypoint *rallyWaypoint = findNamedWaypoint(rallyWaypointName);
-	DEBUG_ASSERTCRASH(waypoint, ("Player %d has no starting waypoint (Player_%d_Start)\n", slotNum, startPos));
+	DEBUG_ASSERTCRASH(waypoint, ("Player %d has no starting waypoint (Player_%d_Start)", slotNum, startPos));
 	if (!waypoint)
 		return;
 
@@ -565,12 +519,12 @@ static void placeNetworkBuildingsForPlayer(Int slotNum, const GameSlot *pSlot, P
 
 	AsciiString buildingTemplateName = pTemplate->getStartingBuilding();
 
-	DEBUG_ASSERTCRASH(!buildingTemplateName.isEmpty(), ("no starting building type for player %d (playertemplate %ls)\n",
+	DEBUG_ASSERTCRASH(!buildingTemplateName.isEmpty(), ("no starting building type for player %d (playertemplate %ls)",
 		slotNum, pTemplate->getDisplayName().str()));
 	if (buildingTemplateName.isEmpty())
 		return;
 
-	DEBUG_LOG(("Placing starting building at waypoint %s\n", waypointName.str()));
+	DEBUG_LOG(("Placing starting building at waypoint %s", waypointName.str()));
 	Object *conYard = placeObjectAtPosition(slotNum, buildingTemplateName, pos, pPlayer, pTemplate);
 
 	if (!conYard)
@@ -598,7 +552,7 @@ static void placeNetworkBuildingsForPlayer(Int slotNum, const GameSlot *pSlot, P
 			FindPositionOptions options;
 			options.minRadius = conYard->getGeometryInfo().getBoundingSphereRadius() * 0.7f;
 			options.maxRadius = conYard->getGeometryInfo().getBoundingSphereRadius() * 1.3f;
-			DEBUG_LOG(("Placing starting object %d (%s)\n", i, objName.str()));
+			DEBUG_LOG(("Placing starting object %d (%s)", i, objName.str()));
 			ThePartitionManager->update();
 			Bool foundPos = ThePartitionManager->findPositionAround(&pos, &options, &objPos);
 			if (foundPos)
@@ -610,7 +564,7 @@ static void placeNetworkBuildingsForPlayer(Int slotNum, const GameSlot *pSlot, P
 			}
 			else
 			{
-				DEBUG_LOG(("Could not find position\n"));
+				DEBUG_LOG(("Could not find position"));
 			}
 		}
 	}
@@ -620,7 +574,7 @@ static void placeNetworkBuildingsForPlayer(Int slotNum, const GameSlot *pSlot, P
 // ------------------------------------------------------------------------------------------------
 LoadScreen *GameLogic::getLoadScreen( Bool saveGame )
 {
-	switch (m_gameMode) 
+	switch (m_gameMode)
 	{
 	case GAME_SHELL:
 		return NEW ShellGameLoadScreen;
@@ -699,7 +653,7 @@ static void checkForDuplicateColors( GameInfo *game )
 		}
 		else if (colorIdx >= 0)
 		{
-			DEBUG_LOG(("Clearing color %d for player %d\n", colorIdx, i));
+			DEBUG_LOG(("Clearing color %d for player %d", colorIdx, i));
 		}
 	}
 }
@@ -733,16 +687,16 @@ static void populateRandomSideAndColor( GameInfo *game )
 
 		// clean up random factions
 		Int playerTemplateIdx = slot->getPlayerTemplate();
-		DEBUG_LOG(("Player %d has playerTemplate index %d\n", i, playerTemplateIdx));
+		DEBUG_LOG(("Player %d has playerTemplate index %d", i, playerTemplateIdx));
 		while (playerTemplateIdx != PLAYERTEMPLATE_OBSERVER && (playerTemplateIdx < 0 || playerTemplateIdx >= ThePlayerTemplateStore->getPlayerTemplateCount()))
 		{
-			DEBUG_ASSERTCRASH(playerTemplateIdx == -1, ("Non-random bad playerTemplate %d in slot %d\n", playerTemplateIdx, i));
+			DEBUG_ASSERTCRASH(playerTemplateIdx == -1, ("Non-random bad playerTemplate %d in slot %d", playerTemplateIdx, i));
 #ifdef MORE_RANDOM
 			// our RNG is basically shit -- horribly nonrandom at the start of the sequence.
 			// get a few values at random to get rid of the dreck.
 			// there's no mathematical basis for this, but empirically, it helps a lot.
 			UnsignedInt silly = GetGameLogicRandomSeed() % 7;
-			for (UnsignedInt poo = 0; poo < silly; ++poo) 
+			for (UnsignedInt poo = 0; poo < silly; ++poo)
 			{
 				GameLogicRandomValue(0, 1);	// ignore result
 			}
@@ -761,7 +715,7 @@ static void populateRandomSideAndColor( GameInfo *game )
 			}
 			else
 			{
-				DEBUG_LOG(("Setting playerTemplateIdx %d to %d\n", i, playerTemplateIdx));
+				DEBUG_LOG(("Setting playerTemplateIdx %d to %d", i, playerTemplateIdx));
 				slot->setPlayerTemplate(playerTemplateIdx);
 			}
 		}
@@ -769,14 +723,14 @@ static void populateRandomSideAndColor( GameInfo *game )
 		Int colorIdx = slot->getColor();
 		if (colorIdx < 0 || colorIdx >= TheMultiplayerSettings->getNumColors())
 		{
-			DEBUG_ASSERTCRASH(colorIdx == -1, ("Non-random bad color %d in slot %d\n", colorIdx, i));
+			DEBUG_ASSERTCRASH(colorIdx == -1, ("Non-random bad color %d in slot %d", colorIdx, i));
 			while (colorIdx == -1)
 			{
 				colorIdx = GameLogicRandomValue(0, TheMultiplayerSettings->getNumColors()-1);
 				if (game->isColorTaken(colorIdx))
 					colorIdx = -1;
 			}
-			DEBUG_LOG(("Setting color %d to %d\n", i, colorIdx));
+			DEBUG_LOG(("Setting color %d to %d", i, colorIdx));
 			slot->setColor(colorIdx);
 		}
 	}
@@ -784,6 +738,8 @@ static void populateRandomSideAndColor( GameInfo *game )
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
+static const WaypointMap s_emptyWaypoints = WaypointMap();
+
 static void populateRandomStartPosition( GameInfo *game )
 {
 	if(!game)
@@ -792,9 +748,11 @@ static void populateRandomStartPosition( GameInfo *game )
 	Int i;
 	Int numPlayers = MAX_SLOTS;
 	const MapMetaData *md = TheMapCache->findMap( game->getMap() );
-  DEBUG_ASSERTCRASH( md , ("Could not find map %s in the mapcache", game->getMap().str()));
 	if (md)
 		numPlayers = md->m_numPlayers;
+	else
+		printf("Could not find map \"%s\"\n", game->getMap().str());
+	DEBUG_ASSERTCRASH( md , ("Could not find map %s in the mapcache", game->getMap().str()));
 
 	// generate a map of start spot distances
 	Real startSpotDistance[MAX_SLOTS][MAX_SLOTS];
@@ -804,12 +762,13 @@ static void populateRandomStartPosition( GameInfo *game )
 		{
 			if (i != j && (i<numPlayers && j<numPlayers))
 			{
+				const WaypointMap& waypoints = md ? md->m_waypoints : s_emptyWaypoints;
 				AsciiString w1, w2;
 				w1.format("Player_%d_Start", i+1);
 				w2.format("Player_%d_Start", j+1);
-				WaypointMap::const_iterator c1 = md->m_waypoints.find(w1);
-				WaypointMap::const_iterator c2 = md->m_waypoints.find(w2);
-				if (c1 == md->m_waypoints.end() || c2 == md->m_waypoints.end())
+				WaypointMap::const_iterator c1 = waypoints.find(w1);
+				WaypointMap::const_iterator c2 = waypoints.find(w2);
+				if (c1 == waypoints.end() || c2 == waypoints.end())
 				{
 					// couldn't find a waypoint.  must be kinda far away.
 					startSpotDistance[i][j] = 1000000.0f;
@@ -862,7 +821,7 @@ static void populateRandomStartPosition( GameInfo *game )
 		Int posIdx = slot->getStartPos();
 		if (posIdx < 0 || posIdx >= numPlayers)
 		{
-			DEBUG_ASSERTCRASH(posIdx == -1, ("Non-random bad start position %d in slot %d\n", posIdx, i));
+			DEBUG_ASSERTCRASH(posIdx == -1, ("Non-random bad start position %d in slot %d", posIdx, i));
 			if (hasStartSpotBeenPicked)
 			{
 				// pick the farthest spot away
@@ -897,7 +856,7 @@ static void populateRandomStartPosition( GameInfo *game )
 						}
 					}
 				}
-				DEBUG_ASSERTCRASH(farthestIndex >= 0, ("Couldn't find a farthest spot!\n"));
+				DEBUG_ASSERTCRASH(farthestIndex >= 0, ("Couldn't find a farthest spot!"));
 				slot->setStartPos(farthestIndex);
 				taken[farthestIndex] = TRUE;
 			}
@@ -911,7 +870,7 @@ static void populateRandomStartPosition( GameInfo *game )
 					if (game->isStartPositionTaken(posIdx))
 						posIdx = -1;
 				}
-				DEBUG_LOG(("Setting start position %d to %d (random choice)\n", i, posIdx));
+				DEBUG_LOG(("Setting start position %d to %d (random choice)", i, posIdx));
 				slot->setStartPos(posIdx);
 				taken[posIdx] = TRUE;
 				hasStartSpotBeenPicked = TRUE;
@@ -947,7 +906,7 @@ static void populateRandomStartPosition( GameInfo *game )
 			if (!game->isStartPositionTaken(posIdx))
 				posIdx = -1;
 		}
-		DEBUG_LOG(("Setting observer start position %d to %d\n", i, posIdx));
+		DEBUG_LOG(("Setting observer start position %d to %d", i, posIdx));
 		slot->setStartPos(posIdx);
 	}
 }
@@ -957,11 +916,11 @@ static void populateRandomStartPosition( GameInfo *game )
 // ------------------------------------------------------------------------------------------------
 void GameLogic::updateLoadProgress( Int progress )
 {
-	
+
 	if( m_loadScreen )
 		m_loadScreen->update( progress );
 
-}  // end updateLoadProgress
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Delete the load screen */
@@ -969,21 +928,38 @@ void GameLogic::updateLoadProgress( Int progress )
 void GameLogic::deleteLoadScreen( void )
 {
 
-	if( m_loadScreen )
-	{
-
-		delete m_loadScreen;
-		m_loadScreen = NULL;
-
-	}  // end if
+	delete m_loadScreen;
+	m_loadScreen = NULL;
 
-}  // end deleteLoadScreen
+}
 
 void GameLogic::setGameLoading( Bool loading )
 {
 	m_loadingScene = loading;
 }
 
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void GameLogic::updateDisplayBusyState()
+{
+	const Bool busySystem = isInInteractiveGame() && !isGamePaused();
+	const Bool busyDisplay = busySystem && !TheGlobalData->m_headless;
+
+	OSDisplaySetBusyState(busyDisplay, busySystem);
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void GameLogic::setGameMode( GameMode mode )
+{
+	GameMode prev = m_gameMode;
+	m_gameMode = mode;
+
+	TheMouse->onGameModeChanged(prev, mode);
+
+	updateDisplayBusyState();
+}
+
 // ------------------------------------------------------------------------------------------------
 /** Entry point for starting a new game, the engine is already in clean state at this
 	* point and ready to load up with all the data */
@@ -1000,6 +976,7 @@ void GameLogic::startNewGame( Bool saveGame )
 
 	// reset the frame counter
 	m_frame = 0;
+	m_hasUpdated = FALSE;
 
 #ifdef DEBUG_CRC
 	// TheSuperHackers @info helmutbuhler 04/09/2025
@@ -1020,9 +997,9 @@ void GameLogic::startNewGame( Bool saveGame )
 		if (TheGameState->isInSaveDirectory(TheGlobalData->m_mapName))
 		{
 
-			DEBUG_CRASH(( "FATAL SAVE/LOAD ERROR! - Setting a pristine map name that refers to a map in the save directory.  The pristine map should always refer to the ORIGINAL map in the Maps directory, if the pristine map string is corrupt then map.ini files will not load correctly.\n" ));
+			DEBUG_CRASH(( "FATAL SAVE/LOAD ERROR! - Setting a pristine map name that refers to a map in the save directory.  The pristine map should always refer to the ORIGINAL map in the Maps directory, if the pristine map string is corrupt then map.ini files will not load correctly." ));
 
-		}  // end if
+		}
 
 		if( m_startNewGame == FALSE )
 		{
@@ -1050,92 +1027,90 @@ void GameLogic::startNewGame( Bool saveGame )
 			m_startNewGame = TRUE;
 			return;
 
-		}  
+		}
 
-	}  // end if
+	}
 
 	m_rankLevelLimit = 1000;	// this is reset every game.
-	setDefaults( saveGame );
-	TheWritableGlobalData->m_loadScreenRender = TRUE;	///< mark it so only a few select things are rendered during load	
-	TheWritableGlobalData->m_TiVOFastMode = FALSE;	//always disable the TIVO fast-forward mode at the start of a new game.
 
-	m_showBehindBuildingMarkers = TRUE;
-	m_drawIconUI = TRUE;
-	m_showDynamicLOD = TRUE;
-	m_scriptHulkMaxLifetimeOverride = -1;
+	//
+	// only reset the next object ID allocater counter when we're not loading a save game.
+	// for save games, we read this value out of the save game file and it is important
+	// that we preserve it as we load and execute the game
+	//
+	if( saveGame == FALSE )
+		m_nextObjID = (ObjectID)1;
+
+	TheWritableGlobalData->m_loadScreenRender = TRUE;	///< mark it so only a few select things are rendered during load
+	TheWritableGlobalData->m_TiVOFastMode = FALSE;	//always disable the TIVO fast-forward mode at the start of a new game.
 
 	// Fill in the game color and Factions before we do the Load Screen
-	GameInfo *game = NULL;
 	TheGameInfo = NULL;
 	Int localSlot = 0;
 	if (TheNetwork)
 	{
 		if (TheLAN)
 		{
-			DEBUG_LOG(("Starting network game\n"));
-			TheGameInfo = game = TheLAN->GetMyGame();
+			DEBUG_LOG(("Starting network game"));
+			TheGameInfo = TheLAN->GetMyGame();
 		}
 		else
 		{
-			DEBUG_LOG(("Starting gamespy game\n"));
-			TheGameInfo = game = TheGameSpyGame;	/// @todo: MDC add back in after demo
+			DEBUG_LOG(("Starting gamespy game"));
+			TheGameInfo = TheGameSpyGame;	/// @todo: MDC add back in after demo
 		}
 	}
 	else
 	{
-		if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK)
+		if (TheRecorder && TheRecorder->isPlaybackMode())
 		{
-			TheGameInfo = game = TheRecorder->getGameInfo();
+			TheGameInfo = TheRecorder->getGameInfo();
 		}
 		else if(m_gameMode == GAME_SKIRMISH)
 		{
-		  TheGameInfo = game = TheSkirmishGameInfo;
+		  TheGameInfo = TheSkirmishGameInfo;
 		}
 	}
 
-	checkForDuplicateColors( game );
+	checkForDuplicateColors( TheGameInfo );
 
 	Bool isSkirmishOrSkirmishReplay = FALSE;
-	if (game)
+	if (TheGameInfo)
 	{
 		for (Int i=0; i<MAX_SLOTS; ++i)
 		{
-			GameSlot *slot = game->getSlot(i);
+			GameSlot *slot = TheGameInfo->getSlot(i);
 			if (!saveGame) {
 				slot->saveOffOriginalInfo();
 			}
 			if (slot->isAI())
 			{
 				isSkirmishOrSkirmishReplay = TRUE;
-				continue;
 			}
 		}
 	} else {
 		if (m_gameMode == GAME_SINGLE_PLAYER)	{
-			if (TheSkirmishGameInfo) {
-				delete TheSkirmishGameInfo;
-				TheSkirmishGameInfo = NULL;
-			}
+			delete TheSkirmishGameInfo;
+			TheSkirmishGameInfo = NULL;
 		}
 	}
 
-	populateRandomSideAndColor( game );
-	populateRandomStartPosition( game );
+	populateRandomSideAndColor( TheGameInfo );
+	populateRandomStartPosition( TheGameInfo );
 
 	//****************************//
 	// Start the LoadScreen Now!	//
 	//****************************//
 
 	// Get the m_loadScreen for this kind of game
-	if(!m_loadScreen)
+	if(!m_loadScreen && !(TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_SIMULATION_PLAYBACK))
 	{
 		m_loadScreen = getLoadScreen( saveGame );
 		if(m_loadScreen && !TheGlobalData->m_headless)
 		{
 			TheMouse->setVisibility(FALSE);
-			m_loadScreen->init(game);
+			m_loadScreen->init(TheGameInfo);
 
-			// 
 			updateLoadProgress( LOAD_PROGRESS_START );
 		}
 	}
@@ -1150,11 +1125,11 @@ void GameLogic::startNewGame( Bool saveGame )
 		TheCampaignManager->SetVictorious(FALSE);
 	m_startNewGame = FALSE;
 
-	// update the loadscreen 
+	// update the loadscreen
 	if(m_loadScreen)
 		updateLoadProgress(LOAD_PROGRESS_POST_PARTICLE_INI_LOAD);
 
-	DEBUG_ASSERTCRASH(m_frame == 0, ("framecounter expected to be 0 here\n"));
+	DEBUG_ASSERTCRASH(m_frame == 0, ("framecounter expected to be 0 here"));
 
 	// before loading the map, load the map.ini file in the same directory.
 	loadMapINI( TheGlobalData->m_mapName );
@@ -1164,33 +1139,33 @@ void GameLogic::startNewGame( Bool saveGame )
 	// anytime the world's size changes, must reset the partition mgr
 	//ThePartitionManager->init();
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_LOAD_MAP);
 
 	#ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
 	char Buf[256];
-	sprintf(Buf,"After terrainlogic->loadmap=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
-		//DEBUG_LOG(("Placed a starting building for %s at waypoint %s\n", playerName.str(), waypointName.str()));
+	sprintf(Buf,"After terrainlogic->loadmap=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+		//DEBUG_LOG(("Placed a starting building for %s at waypoint %s", playerName.str(), waypointName.str()));
 	DEBUG_LOG(("%s", Buf));
 	#endif
 
 	Int progressCount = LOAD_PROGRESS_SIDE_POPULATION;
-	if (game)
+	if (TheGameInfo)
 	{
-		 
+
 		if (TheGameEngine->isMultiplayerSession() || isSkirmishOrSkirmishReplay)
 		{
 			// Saves off any player, and resets the sides to 0 players so we can add the skirmish players.
 			TheSidesList->prepareForMP_or_Skirmish();
 		}
 
-		//DEBUG_LOG(("Starting LAN game with %d players\n", game->getNumPlayers()));
+		//DEBUG_LOG(("Starting LAN game with %d players", TheGameInfo->getNumPlayers()));
 		Dict d;
 		for (int i=0; i<MAX_SLOTS; ++i)
 		{
 			// Add a Side to TheSidesList
-			GameSlot *slot = game->getSlot(i);
+			GameSlot *slot = TheGameInfo->getSlot(i);
 
 			if (!slot || !slot->isHuman())
 			{
@@ -1216,31 +1191,31 @@ void GameLogic::startNewGame( Bool saveGame )
 			{
 				d.setAsciiString(TheKey_playerFaction, KEYNAME(pt->getNameKey()));
 			}
-			
-			if (game->isPlayerPreorder(i))
+
+			if (TheGameInfo->isPlayerPreorder(i))
 			{
 				d.setBool(TheKey_playerIsPreorder, TRUE);
 			}
-					
+
 			AsciiString enemiesString, alliesString;
 			Int team = slot->getTeamNumber();
-			DEBUG_LOG(("Looking for allies of player %d, team %d\n", i, team));
+			DEBUG_LOG(("Looking for allies of player %d, team %d", i, team));
 			for(int j=0; j < MAX_SLOTS; ++j)
 			{
-				GameSlot *teamSlot = game->getSlot(j);
+				GameSlot *teamSlot = TheGameInfo->getSlot(j);
 				// for check to see if we're trying to add ourselves
 				if(i == j || !teamSlot->isOccupied())
 					continue;
-				
-				DEBUG_LOG(("Player %d is team %d\n", j, teamSlot->getTeamNumber()));
+
+				DEBUG_LOG(("Player %d is team %d", j, teamSlot->getTeamNumber()));
 
 				AsciiString teamPlayerName;
 				teamPlayerName.format("player%d", j);
-				// if our team is None, or our team is not equal to their team, 
+				// if our team is None, or our team is not equal to their team,
 				// then their our enemy
 				Bool isEnemy = FALSE;
 				if(team == -1 || teamSlot->getTeamNumber() != team ) isEnemy = TRUE;
-				DEBUG_LOG(("Player %d is %s\n", j, (isEnemy)?"enemy":"ally"));
+				DEBUG_LOG(("Player %d is %s", j, (isEnemy)?"enemy":"ally"));
 
 				if (isEnemy)
 				{
@@ -1254,24 +1229,24 @@ void GameLogic::startNewGame( Bool saveGame )
 					if(!alliesString.isEmpty())
 						alliesString.concat(" ");
 					alliesString.concat(teamPlayerName);
-				}				
+				}
 			}
 			d.setAsciiString(TheKey_playerAllies, alliesString);
 			d.setAsciiString(TheKey_playerEnemies, enemiesString);
-			DEBUG_LOG(("Player %d's teams are: allies=%s, enemies=%s\n", i,alliesString.str(),enemiesString.str()));
+			DEBUG_LOG(("Player %d's teams are: allies=%s, enemies=%s", i,alliesString.str(),enemiesString.str()));
 /*
 
 			Int colorIdx = slot->getColor();
 			if (colorIdx < 0 || colorIdx >= TheMultiplayerSettings->getNumColors())
 			{
-				DEBUG_ASSERTCRASH(colorIdx == -1, ("Non-random bad color %d in slot %d\n", colorIdx, i));
+				DEBUG_ASSERTCRASH(colorIdx == -1, ("Non-random bad color %d in slot %d", colorIdx, i));
 				while (colorIdx == -1)
 				{
 					colorIdx = GameLogicRandomValue(0, TheMultiplayerSettings->getNumColors()-1);
 					if (game->isColorTaken(colorIdx))
 						colorIdx = -1;
 				}
-				DEBUG_LOG(("Setting color %d to %d\n", i, colorIdx));
+				DEBUG_LOG(("Setting color %d to %d", i, colorIdx));
 				slot->setColor(colorIdx);
 			}
 			*/
@@ -1281,17 +1256,17 @@ void GameLogic::startNewGame( Bool saveGame )
 			d.setInt(TheKey_multiplayerStartIndex, slot->getStartPos());
 //			d.setBool(TheKey_multiplayerIsLocal, slot->isLocalPlayer());
 //			d.setBool(TheKey_multiplayerIsLocal, slot->getIP() == game->getLocalIP());
-			d.setBool(TheKey_multiplayerIsLocal, slot->isHuman() && (slot->getName().compare(game->getSlot(game->getLocalSlotNum())->getName().str()) == 0));
+			d.setBool(TheKey_multiplayerIsLocal, slot->isHuman() && (slot->getName().compare(TheGameInfo->getSlot(TheGameInfo->getLocalSlotNum())->getName().str()) == 0));
 
 /*
 			if (slot->getIP() == game->getLocalIP())
 			{
 				localSlot = i;
-				DEBUG_LOG(("GameLogic::StartNewGame - local slot is %d\n", localSlot));
+				DEBUG_LOG(("GameLogic::StartNewGame - local slot is %d", localSlot));
 			}
 */
 
-			if (isSkirmishOrSkirmishReplay) 
+			if (isSkirmishOrSkirmishReplay)
 			{
 				d.setBool(TheKey_playerIsSkirmish, true);
 				switch (slot->getState()) {
@@ -1304,7 +1279,7 @@ void GameLogic::startNewGame( Bool saveGame )
 
 			AsciiString slotNameAscii;
 			slotNameAscii.translate(slot->getName());
-			if (slot->isHuman() && game->getSlotNum(slotNameAscii) == game->getLocalSlotNum()) {
+			if (slot->isHuman() && TheGameInfo->getSlotNum(slotNameAscii) == TheGameInfo->getLocalSlotNum()) {
 				localSlot = i;
 			}
 			TheSidesList->addSide(&d);
@@ -1319,18 +1294,18 @@ void GameLogic::startNewGame( Bool saveGame )
 			d.setBool(TheKey_teamIsSingleton, true);
 			TheSidesList->addTeam(&d);
 
-			DEBUG_LOG(("Added side %d\n", i));
+			DEBUG_LOG(("Added side %d", i));
 			updateLoadProgress(progressCount + i);
-		}		
+		}
 	}
 	//if(m_gameMode != GAME_REPLAY)
 	//{
-	
+
 		// Always add in an observer Player
 		Dict d;
 		d.setAsciiString(TheKey_playerName, "ReplayObserver");
 		d.setBool(TheKey_playerIsHuman, TRUE);
-		d.setUnicodeString(TheKey_playerDisplayName, UnicodeString(L"Observer"));
+		d.setUnicodeString(TheKey_playerDisplayName, L"Observer");
 		const PlayerTemplate* pt;
 		pt = ThePlayerTemplateStore->findPlayerTemplate( TheNameKeyGenerator->nameToKey("FactionObserver") );
 		if (pt)
@@ -1344,29 +1319,29 @@ void GameLogic::startNewGame( Bool saveGame )
 		d.setInt(TheKey_multiplayerStartIndex, 0);
 		d.setBool(TheKey_multiplayerIsLocal, FALSE);
 
-		TheSidesList->addSide(&d);	
+		TheSidesList->addSide(&d);
 		d.clear();
 		d.setAsciiString(TheKey_teamName, "teamReplayObserver");
 		d.setAsciiString(TheKey_teamOwner, "ReplayObserver");
 		d.setBool(TheKey_teamIsSingleton, true);
 		TheSidesList->addTeam(&d);
 	//}
-	TheSidesList->validateSides();		
+	TheSidesList->validateSides();
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_SIDE_LIST_INIT);
 
 	// update the player list to match the new map.
 	TheTeamFactory->reset();
 	ThePlayerList->newGame();
-	
-	// update the loadscreen 
+
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_PLAYER_LIST_RESET);
 
 	// Tell the script engine that a newe set of scripts is loaded.
 	TheScriptEngine->newMap();
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_SCRIPT_ENGINE_NEW_MAP);
 
 	if (TheGameEngine->isMultiplayerSession() || isSkirmishOrSkirmishReplay)
@@ -1374,11 +1349,11 @@ void GameLogic::startNewGame( Bool saveGame )
 		// if there are no other teams (happens for debugging) don't end the game immediately
 		Int numTeams = 0; // this can be higher than expected, but is accurate for determining 0, 1, 2+
 		Int lastTeam = -1;
-		if (game)
+		if (TheGameInfo)
 		{
 			for (int i=0; i<MAX_SLOTS; ++i)
 			{
-				const GameSlot *slot = game->getConstSlot(i);
+				const GameSlot *slot = TheGameInfo->getConstSlot(i);
 				if (slot->isOccupied() && slot->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
 				{
 					if (slot->getTeamNumber() == -1 || slot->getTeamNumber() != lastTeam)
@@ -1396,12 +1371,12 @@ void GameLogic::startNewGame( Bool saveGame )
 			AsciiString path = "Data\\Scripts\\MultiplayerScripts.scb";
 			CachedFileInputStream theInputStream;
 			if (theInputStream.open(path))
-			{ 
+			{
 				ChunkInputStream *pStrm = &theInputStream;
 				DataChunkInput file( pStrm );
-				file.registerParser( AsciiString("PlayerScriptsList"), AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk );
+				file.registerParser( "PlayerScriptsList", AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk );
 				if (!file.parse(NULL)) {
-					DEBUG_LOG(("ERROR - Unable to read in multiplayer scripts.\n"));
+					DEBUG_LOG(("ERROR - Unable to read in multiplayer scripts."));
 					return;
 				}
 				ScriptList *scripts[MAX_PLAYER_COUNT];
@@ -1409,12 +1384,15 @@ void GameLogic::startNewGame( Bool saveGame )
 				if (count)
 				{
 					ScriptList *pSL = TheSidesList->getSideInfo(0)->getScriptList();
-					Script *next = scripts[0]->getScript();
-					while (next)
+					if (pSL != NULL)
 					{
-						Script *dupe = next->duplicate();
-						pSL->addScript(dupe, 0);
-						next = next->getNext();
+						Script *next = scripts[0]->getScript();
+						while (next)
+						{
+							Script *dupe = next->duplicate();
+							pSL->addScript(dupe, 0);
+							next = next->getNext();
+						}
 					}
 				}
 				for (Int i=0; i<count; ++i)
@@ -1487,71 +1465,78 @@ void GameLogic::startNewGame( Bool saveGame )
 		*/
 	}
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_VICTORY_CONDITION_SETUP);
 
+	Player *localPlayer = ThePlayerList->getLocalPlayer();
+	Player *observerPlayer = ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey("ReplayObserver"));
+
 	// set the radar as on a new map
 	TheRadar->newMap( TheTerrainLogic );
+
+	// TheSuperHackers @tweak Force on radar for all observers.
+	for (Int i = 0; i < MAX_PLAYER_COUNT; ++i)
+	{
+		Player *player = ThePlayerList->getNthPlayer(i);
+		if (player->isPlayerObserver())
+		{
+			TheRadar->forceOn(i, TRUE);
+		}
+	}
+
 	TheInGameUI->setClientQuiet( FALSE ); // okay to start beeping and stuff
 
 	// Tell the multiplayer victory condition singleton that the players are created
 	TheVictoryConditions->cachePlayerPtrs();
 	TheVictoryConditions->setVictoryConditions(VICTORY_NOBUILDINGS);
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_VICTORY_CONDITION_SET_VICTORY_CONDITION);
 
 	// set the world extents to that of the map
 	Region3D extent;
 	TheTerrainLogic->getExtent( &extent );
 
-	TheGameLogic->setWidth( extent.hi.x - extent.lo.x );
-	TheGameLogic->setHeight( extent.hi.y - extent.lo.y );
+	setWidth( extent.hi.x - extent.lo.x );
+	setHeight( extent.hi.y - extent.lo.y );
 
 	// anytime the world's size changes, must reset the partition mgr
 	ThePartitionManager->init();
 	ThePartitionManager->refreshShroudForLocalPlayer();// Can't do this until after init, and doesn't seem right to do in init
 
-	TheGhostObjectManager->setLocalPlayerIndex(ThePlayerList->getLocalPlayer()->getPlayerIndex());
+	TheGhostObjectManager->setLocalPlayerIndex(localPlayer->getPlayerIndex());
 	TheGhostObjectManager->reset();
-	
-	// update the loadscreen 
+
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_GHOST_OBJECT_MANAGER_RESET);
 
 	// update the terrain logic now that all is loaded
 	TheTerrainLogic->newMap( saveGame );
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_TERRAIN_LOGIC_NEW_MAP);
 
 	#ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
-	sprintf(Buf,"After terrainlogic->newmap=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+	sprintf(Buf,"After terrainlogic->newmap=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
 	DEBUG_LOG(("%s", Buf));
 	#endif
 
 		// Special case, load any bridge map objects.
  	const ThingTemplate *thingTemplate;
 	MapObject *pMapObj;
-	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
 
-		if (pMapObj->getFlag(FLAG_BRIDGE_FLAGS) || pMapObj->getFlag(FLAG_ROAD_FLAGS)) 
+		if (pMapObj->getFlag(FLAG_BRIDGE_FLAGS) || pMapObj->getFlag(FLAG_ROAD_FLAGS))
 			continue;	// these roads & bridges are special cased in the terrain side.
 
 		// get thing template based from map object name
 		thingTemplate = pMapObj->getThingTemplate();
 		if( thingTemplate == NULL )
-			continue;	
-
-		Bool isBridgeLikeObject = false;
-
-		if (thingTemplate->isBridge()) 
-			isBridgeLikeObject = true;
-		if (thingTemplate->isKindOf(KINDOF_WALK_ON_TOP_OF_WALL)) 
-			isBridgeLikeObject = true;
+			continue;
 
-		if (!isBridgeLikeObject)
+		if (!thingTemplate->isBridgeLike())
 			continue;
 
 		Team *team = ThePlayerList->getNeutralPlayer()->getDefaultTeam();
@@ -1562,7 +1547,7 @@ void GameLogic::startNewGame( Bool saveGame )
 			Coord3D pos = *pMapObj->getLocation();
 			pos.z += TheTerrainLogic->getGroundHeight( pos.x, pos.y );
 
-			Real angle = normalizeAngle(pMapObj->getAngle());  
+			Real angle = normalizeAngle(pMapObj->getAngle());
 			obj->setOrientation(angle);
 			obj->setPosition( &pos );
 			if (thingTemplate->isBridge()) {
@@ -1576,11 +1561,11 @@ void GameLogic::startNewGame( Bool saveGame )
 			// in the map object properties.
 			// update this object instance with properties from the map object
 			obj->updateObjValuesFromMapProperties( pMapObj->getProperties() );
-		}  // end if
+		}
 
-	}	// for, loading bridge map objects
+	}
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_BRIDGE_LOAD);
 
 	// refresh the radar to reflect loaded bridges
@@ -1590,29 +1575,29 @@ void GameLogic::startNewGame( Bool saveGame )
 	// Note that it is important that the pathfinder be called before the map objects are loaded.
 	TheAI->pathfinder()->newMap( );
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_PATHFINDER_NEW_MAP);
 
 	// reveal the map for the permanent observer
-	ThePartitionManager->revealMapForPlayerPermanently( ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey("ReplayObserver"))->getPlayerIndex() );
-	DEBUG_LOG(("Reveal shroud for %ls whose index is %d\n", ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey("ReplayObserver"))->getPlayerDisplayName().str(),ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey("ReplayObserver"))->getPlayerIndex()));
-	
-	if (game)
+	ThePartitionManager->revealMapForPlayerPermanently( observerPlayer->getPlayerIndex() );
+	DEBUG_LOG(("Reveal shroud for %ls whose index is %d", observerPlayer->getPlayerDisplayName().str(), observerPlayer->getPlayerIndex()));
+
+	if (TheGameInfo)
 	{
 		for (int i=0; i<MAX_SLOTS; ++i)
 		{
-			GameSlot *slot = game->getSlot(i);
-			
+			GameSlot *slot = TheGameInfo->getSlot(i);
+
 			if (!slot || !slot->isOccupied())
 				continue;
-			
+
 			AsciiString playerName;
 			playerName.format("player%d", i);
 			Player *player = ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(playerName));
-			
+
 			if (slot->getPlayerTemplate() == PLAYERTEMPLATE_OBSERVER)
 			{
-				DEBUG_LOG(("Clearing shroud for observer %s in playerList slot %d\n", playerName.str(), player->getPlayerIndex()));
+				DEBUG_LOG(("Clearing shroud for observer %s in playerList slot %d", playerName.str(), player->getPlayerIndex()));
 				ThePartitionManager->revealMapForPlayerPermanently( player->getPlayerIndex() );
 			}
 			else
@@ -1626,7 +1611,7 @@ void GameLogic::startNewGame( Bool saveGame )
 
 	#ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
-	sprintf(Buf,"Before loading objects=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+	sprintf(Buf,"Before loading objects=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
 	DEBUG_LOG(("%s", Buf));
 	#endif
 
@@ -1635,9 +1620,9 @@ void GameLogic::startNewGame( Bool saveGame )
 	if( saveGame == FALSE )
 	{
 
-		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 		{
-		
+
 			if (pMapObj->getFlag(FLAG_BRIDGE_FLAGS) || pMapObj->getFlag(FLAG_ROAD_FLAGS)) {
 				continue;	// roads & bridges are special cased in the terrain side.
 			}
@@ -1650,19 +1635,16 @@ void GameLogic::startNewGame( Bool saveGame )
 
 			//
 			// if no template continue, some map objects don't have thing templates like
-			// lights (handled in the device).  Objects that are test objects have a 
-			// test string (designated with *** and the define TEST_STRING) and will 
-			// have temporary templates created 'on the fly' during a 
+			// lights (handled in the device).  Objects that are test objects have a
+			// test string (designated with *** and the define TEST_STRING) and will
+			// have temporary templates created 'on the fly' during a
 			// ThingFactory->findTemplate() call when loading from the map file
 			//
 			if( thingTemplate == NULL )
 				continue;
 
-			Bool isBridgeLikeObject = false;
-			if (thingTemplate->isBridge()) isBridgeLikeObject = true;
-			if (thingTemplate->isKindOf(KINDOF_WALK_ON_TOP_OF_WALL)) isBridgeLikeObject = true;
-			if (isBridgeLikeObject)
-				continue;	// bridges have to be added earlier.
+			if (thingTemplate->isBridgeLike())
+				continue; // bridges have to be added earlier.
 
 			Bool useTrees = TheGlobalData->m_useTrees;
 			if (TheRecorder && TheRecorder->isMultiplayer()) {
@@ -1671,9 +1653,9 @@ void GameLogic::startNewGame( Bool saveGame )
 			// don't create trees and shrubs if this is one and we have that option off
 			if( thingTemplate->isKindOf( KINDOF_SHRUBBERY ) && !useTrees )
 				continue;
-			
+
 			// Get the team information
-			DEBUG_ASSERTCRASH(pMapObj->getProperties()->getType(TheKey_originalOwner) == Dict::DICT_ASCIISTRING, ("unit %s has no original owner specified (obsolete map file)\n",pMapObj->getName().str()));
+			DEBUG_ASSERTCRASH(pMapObj->getProperties()->getType(TheKey_originalOwner) == Dict::DICT_ASCIISTRING, ("unit %s has no original owner specified (obsolete map file)",pMapObj->getName().str()));
 			AsciiString originalOwner = pMapObj->getProperties()->getAsciiString(TheKey_originalOwner);
 			Team *team = ThePlayerList->validateTeam(originalOwner);
 
@@ -1684,14 +1666,14 @@ void GameLogic::startNewGame( Bool saveGame )
 				Coord3D pos = *pMapObj->getLocation();
 				pos.z += TheTerrainLogic->getGroundHeight( pos.x, pos.y );
 
-				if(pMapObj->getFlag(FLAG_DRAWS_IN_MIRROR) || obj->isKindOf(KINDOF_CAN_CAST_REFLECTIONS)) 
+				if(pMapObj->getFlag(FLAG_DRAWS_IN_MIRROR) || obj->isKindOf(KINDOF_CAN_CAST_REFLECTIONS))
 				{
 					Drawable* draw = obj->getDrawable();
 					if(draw)
 						draw->setDrawableStatus( DRAWABLE_STATUS_DRAWS_IN_MIRROR );
 				}
 
-				Real angle = normalizeAngle(pMapObj->getAngle());  
+				Real angle = normalizeAngle(pMapObj->getAngle());
 				obj->setOrientation(angle);
 				obj->setPosition( &pos );
 
@@ -1716,8 +1698,8 @@ void GameLogic::startNewGame( Bool saveGame )
 				team->setActive();
 				TheAI->pathfinder()->addObjectToPathfindMap( obj );
 
-			}  // end if
-		
+			}
+
 			if(timeGetTime() > timer + 500)
 			{
 				if(progressCount < LOAD_PROGRESS_MAX_ALL_THE_FREAKN_OBJECTS)
@@ -1726,31 +1708,31 @@ void GameLogic::startNewGame( Bool saveGame )
 				timer = timeGetTime();
 			}
 
-		}	// for, loading map objects
+		}
 
-	}  // end if, not loading save game
+	}
 
 	#ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
-	sprintf(Buf,"After loading objects=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+	sprintf(Buf,"After loading objects=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
 	DEBUG_LOG(("%s", Buf));
 	#endif
 
 	progressCount = LOAD_PROGRESS_LOOP_INITIAL_NETWORK_BUILDINGS;
 	// place initial network buildings/units
-	if (game && !saveGame)
+	if (TheGameInfo && !saveGame)
 	{
 		for (int i=0; i<MAX_SLOTS; ++i)
 		{
-			GameSlot *slot = game->getSlot(i);
-			
+			GameSlot *slot = TheGameInfo->getSlot(i);
+
 			if (!slot || !slot->isOccupied())
 				continue;
-			
+
 			AsciiString playerName;
 			playerName.format("player%d", i);
 			Player *player = ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(playerName));
-			
+
 			if (slot->getPlayerTemplate() == PLAYERTEMPLATE_OBSERVER)
 			{
 				slot->setPlayerTemplate(0);
@@ -1766,7 +1748,7 @@ void GameLogic::startNewGame( Bool saveGame )
 						}
 					}
 				}
-				DEBUG_LOG(("Setting observer's playerTemplate to %d in slot %d\n", slot->getPlayerTemplate(), i));
+				DEBUG_LOG(("Setting observer's playerTemplate to %d in slot %d", slot->getPlayerTemplate(), i));
 			}
 			else
 			{
@@ -1780,7 +1762,7 @@ void GameLogic::startNewGame( Bool saveGame )
 
 		}
 	}
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_INITIAL_NETWORK_BUILDINGS);
 
 	//
@@ -1804,7 +1786,7 @@ void GameLogic::startNewGame( Bool saveGame )
 	//put this here somewhat randomly.
 	TheControlBar->hideCommunicator( FALSE );
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_PRELOAD_ASSETS);
 
 	TheTacticalView->setAngleAndPitchToDefault();
@@ -1817,20 +1799,20 @@ void GameLogic::startNewGame( Bool saveGame )
 	// Note - We construct the multiplayer start spot name manually here, so change this if you
 	//        change TheKey_Player_1_Start etc.  mdc
 	AsciiString startingCamName = TheNameKeyGenerator->keyToName(TheKey_InitialCameraPosition);
-	if (game)
+	if (TheGameInfo)
 	{
-		GameSlot *slot = game->getSlot(localSlot);
+		GameSlot *slot = TheGameInfo->getSlot(localSlot);
 		DEBUG_ASSERTCRASH(slot, ("Starting a LAN game without ourselves!"));
-		
+
 		if (slot->isHuman())
 		{
 			Int startPos = slot->getStartPos();
 			startingCamName.format("Player_%d_Start", startPos+1); // start pos waypoints are 1-based
-			DEBUG_LOG(("Using %s as the multiplayer initial camera position\n", startingCamName.str()));
+			DEBUG_LOG(("Using %s as the multiplayer initial camera position", startingCamName.str()));
 		}
 	}
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_STARTING_CAMERA);
 
 	Waypoint *way = findNamedWaypoint(startingCamName);
@@ -1848,7 +1830,7 @@ void GameLogic::startNewGame( Bool saveGame )
 		pos.y = 50;
 		pos.z = 0;
 		TheTacticalView->lookAt( &pos );
-		DEBUG_LOG(("Failed to find initial camera position waypoint %s\n", startingCamName.str()));
+		DEBUG_LOG(("Failed to find initial camera position waypoint %s", startingCamName.str()));
 	}
 
 	// Set up the camera height based on the map height & globalData.
@@ -1856,7 +1838,7 @@ void GameLogic::startNewGame( Bool saveGame )
 	TheTacticalView->setAngleAndPitchToDefault();
 	TheTacticalView->setZoomToDefault();
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_STARTING_CAMERA_2);
 
 	// update partition info - We need to do the initial update so that it can be queried
@@ -1865,7 +1847,7 @@ void GameLogic::startNewGame( Bool saveGame )
 
 	#ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
-	sprintf(Buf,"After partition manager update=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+	sprintf(Buf,"After partition manager update=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
 	DEBUG_LOG(("%s", Buf));
 	#endif
 
@@ -1886,7 +1868,7 @@ void GameLogic::startNewGame( Bool saveGame )
 			if (pPlayer)
 			{
 				pPlayer->addSkillPoints(m_rankPointsToAddAtGameStart);
-				DEBUG_LOG(("GameLogic::startNewGame() - adding m_rankPointsToAddAtGameStart==%d to player %d(%ls)\n",
+				DEBUG_LOG(("GameLogic::startNewGame() - adding m_rankPointsToAddAtGameStart==%d to player %d(%ls)",
 					m_rankPointsToAddAtGameStart, i, pPlayer->getPlayerDisplayName().str()));
 			}
 		}
@@ -1908,7 +1890,7 @@ void GameLogic::startNewGame( Bool saveGame )
 	}
 
 	// if we're in a load game, don't fade yet
-	if(saveGame == FALSE && TheTransitionHandler != NULL)
+	if(saveGame == FALSE && TheTransitionHandler != NULL && m_loadScreen)
 	{
 		TheTransitionHandler->setGroup("FadeWholeScreen");
 		while(!TheTransitionHandler->isFinished())
@@ -1920,7 +1902,7 @@ void GameLogic::startNewGame( Bool saveGame )
 				setFPMode();
 				Sleep(33);
 			}
-			
+
 		}
 	}
 
@@ -1939,10 +1921,10 @@ void GameLogic::startNewGame( Bool saveGame )
 			deleteLoadScreen();
 
 	}
-	
+
 	#ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
-	sprintf(Buf,"After delete load screen=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+	sprintf(Buf,"After delete load screen=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
 	DEBUG_LOG(("%s", Buf));
 	#endif
 
@@ -1951,7 +1933,7 @@ void GameLogic::startNewGame( Bool saveGame )
 		if (!TheGlobalData->m_headless)
 		{
 			if(TheShell->getScreenCount() == 0)
-				TheShell->push( AsciiString("Menus/MainMenu.wnd") );
+				TheShell->push( "Menus/MainMenu.wnd" );
 			else if (TheShell->top())
 			{
 				TheShell->top()->hide(FALSE);
@@ -1962,7 +1944,7 @@ void GameLogic::startNewGame( Bool saveGame )
 	}
 	else
 	{
-		
+
 //		TheShell->hideShell();
 		if(TheStatsCollector)
 		{
@@ -1979,17 +1961,17 @@ void GameLogic::startNewGame( Bool saveGame )
 		// explicitly set the Control bar to Observer Mode
 		if(m_gameMode == GAME_REPLAY )
 		{
-			
-			ThePlayerList->setLocalPlayer(ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey("ReplayObserver")));
-			TheRadar->forceOn(TRUE);
-			ThePartitionManager->refreshShroudForLocalPlayer();
-			TheControlBar->setControlBarSchemeByPlayer( ThePlayerList->getLocalPlayer());
-			DEBUG_LOG(("Start of a replay game %ls, %d\n",ThePlayerList->getLocalPlayer()->getPlayerDisplayName().str(), ThePlayerList->getLocalPlayer()->getPlayerIndex()));
+			rts::changeLocalPlayer(observerPlayer);
+
+			DEBUG_LOG(("Start of a replay game %ls, %d", localPlayer->getPlayerDisplayName().str(), localPlayer->getPlayerIndex()));
 		}
 		else
-			TheControlBar->setControlBarSchemeByPlayer(ThePlayerList->getLocalPlayer());
+		{
+			TheControlBar->setControlBarSchemeByPlayer(localPlayer);
+			TheControlBar->initSpecialPowershortcutBar(localPlayer);
+		}
 //		ShowControlBar();
-		
+
 	}
 	TheTacticalView->setOkToAdjustHeight(TRUE);
 
@@ -1998,9 +1980,9 @@ void GameLogic::startNewGame( Bool saveGame )
 	g_UT_curThing = TheThingFactory->firstTemplate();
 	g_UT_startTiming = true;
 	g_UT_gotUnit = false;
-	g_UT_timingLog = fopen("TimingLog.txt", "w");	 
+	g_UT_timingLog = fopen("TimingLog.txt", "w");
 	g_UT_commaLog = fopen("TimingCDL.txt", "w");
-	fputs("Full,100*ms,NoPart-NoSpawn,,No Spawn,100*ms,Logic,100*ms,Thing,Model,Kind,Side,DrawCalls All,DrawCalls NoPart-NoSpawn,DrawCalls NoSpawn\n", g_UT_commaLog); 
+	fputs("Full,100*ms,NoPart-NoSpawn,,No Spawn,100*ms,Logic,100*ms,Thing,Model,Kind,Side,DrawCalls All,DrawCalls NoPart-NoSpawn,DrawCalls NoSpawn\n", g_UT_commaLog);
 
 	// Turn off shadows
 	TheWritableGlobalData->m_useShadowVolumes = false;
@@ -2025,9 +2007,9 @@ void GameLogic::startNewGame( Bool saveGame )
 	// We'll ask the Recorder, so we survive replays
 	if( TheRecorder->isMultiplayer() )
 	{
-		// Iterate through each player's objects, and ask if the object 
+		// Iterate through each player's objects, and ask if the object
 		//is a command center, and if so, select it for that player
-		for (Int i = 0; i < MAX_PLAYER_COUNT; ++i) 
+		for (Int i = 0; i < MAX_PLAYER_COUNT; ++i)
 		{
 			Player *player = ThePlayerList->getNthPlayer(i);
 			if (player && player->isPlayerActive())
@@ -2038,7 +2020,6 @@ void GameLogic::startNewGame( Bool saveGame )
 			}
 		}
 	}
-	TheControlBar->initSpecialPowershortcutBar(ThePlayerList->getLocalPlayer());
 
 	if(m_gameMode == GAME_SHELL)
 	{
@@ -2054,7 +2035,7 @@ void GameLogic::startNewGame( Bool saveGame )
 	HideControlBar();
 #endif
 	TheWritableGlobalData->m_loadScreenRender = FALSE;	///< mark to resume rendering as normal
-	
+
 	// if we're in a gamespy game, mark us as playing
 	if (TheGameSpyBuddyMessageQueue && TheGameSpyGame && isInInternetGame())
 	{
@@ -2064,16 +2045,14 @@ void GameLogic::startNewGame( Bool saveGame )
 		strcpy(req.arg.status.statusString, "Playing");
 		sprintf(req.arg.status.locationString, "%s", WideCharStringToMultiByte(TheGameSpyGame->getGameName().str()).c_str());
 		TheGameSpyBuddyMessageQueue->addRequest(req);
-	}	
-	
-	//Added By Sadullah Nader
-	//Added to fix the quit menu 
+	}
+
 	//ReAllows quit menu to work during loading scene
 	setGameLoading(FALSE);
 
 #ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
-	sprintf(Buf,"Total startnewgame=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+	sprintf(Buf,"Total startnewgame=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
 	DEBUG_LOG(("%s", Buf));
 #endif
 
@@ -2082,7 +2061,14 @@ void GameLogic::startNewGame( Bool saveGame )
 	if (TheGameSpyInfo)
 		TheGameSpyInfo->updateAdditionalGameSpyDisconnections(1);
 
-}  // end startNewGame
+
+  if ( isInReplayGame() && TheInGameUI && TheGameText )
+  {
+		TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE( "GUI:FastForwardInstructions", L"Press F to toggle Fast Forward" ) );
+  }
+
+
+}
 
 //-----------------------------------------------------------------------------------------
 static void findAndSelectCommandCenter(Object *obj, void* alreadyFound)
@@ -2111,24 +2097,22 @@ void GameLogic::loadMapINI( AsciiString mapName )
 		return;
 	}
 
-	char filename[_MAX_PATH];
-	char fullFledgeFilename[_MAX_PATH];
-
-	memset(filename, 0, _MAX_PATH);
-	strcpy(filename, mapName.str());
-
 	//
 	// if map name begins with a "SAVE_DIRECTORY\", then the map refers to a map
 	// that has been extracted from a save game file ... in that case we need to get
 	// the pristine map name string in order to manipulate and load the right map.ini
 	// for that map from it's original location
 	//
-	if (TheGameState->isInSaveDirectory(filename))
-		strcpy( filename, TheGameState->getSaveGameInfo()->pristineMapName.str() );
+	const char* pristineMapName = TheGameState->isInSaveDirectory(mapName.str())
+		? TheGameState->getSaveGameInfo()->pristineMapName.str()
+		: mapName.str();
+
+	char filename[_MAX_PATH];
+	strlcpy(filename, pristineMapName, ARRAY_SIZE(filename));
 
 	// sanity
 	int length = strlen(filename);
-	if (length < 4) { 
+	if (length < 4) {
 		return;
 	}
 
@@ -2140,20 +2124,24 @@ void GameLogic::loadMapINI( AsciiString mapName )
 	*extension = 0;
 
 
+	char fullFledgeFilename[_MAX_PATH];
 	sprintf(fullFledgeFilename, "%s\\map.ini", filename);
 	if (TheFileSystem->doesFileExist(fullFledgeFilename)) {
-		DEBUG_LOG(("Loading map.ini\n"));
+		DEBUG_LOG(("Loading map.ini"));
 		INI ini;
 		ini.load( AsciiString(fullFledgeFilename), INI_LOAD_CREATE_OVERRIDES, NULL );
 	}
 
+	// TheSuperHackers @todo Implement ini load directory for map folder.
+	// Requires adjustments in map transfer.
+
 	sprintf(fullFledgeFilename, "%s\\solo.ini", filename);
 	if (TheFileSystem->doesFileExist(fullFledgeFilename)) {
-		DEBUG_LOG(("Loading solo.ini\n"));
+		DEBUG_LOG(("Loading solo.ini"));
 		INI ini;
 		ini.load( AsciiString(fullFledgeFilename), INI_LOAD_CREATE_OVERRIDES, NULL );
 	}
-	
+
 	// No error here. There could've just *not* been a map.ini file.
 
 	// now look for a string file
@@ -2206,8 +2194,8 @@ void GameLogic::processDestroyList( void )
 		/*
 			this looks odd, but is necessary; since erasing a single entry can shuffle others in the list
 			(in order to maintain its heap-ness), we must do two passes: one to find the updates for this
-			object, another to actually erase 'em. 
-			
+			object, another to actually erase 'em.
+
 			(in case you're wondering: yes, this is still more efficient than just deleting them
 			and rebalancing the entire heap afterwards, at least for real-world maps, since an individual
 			rebalance is O(log N) and a full rebalance is O(N)... so unless you are deleting the majority
@@ -2286,14 +2274,14 @@ void GameLogic::processCommandList( CommandList *list )
 			}
 			else
 			{
-				//DEBUG_LOG(("Comparing %d CRCs on frame %d\n", m_cachedCRCs.size(), m_frame));
+				//DEBUG_LOG(("Comparing %d CRCs on frame %d", m_cachedCRCs.size(), m_frame));
 				std::map<Int, UnsignedInt>::const_iterator crcIt = m_cachedCRCs.begin();
 				Int validatorCRC = crcIt->second;
-				//DEBUG_LOG(("Validator CRC from player %d is %8.8X\n", crcIt->first, validatorCRC));
+				//DEBUG_LOG(("Validator CRC from player %d is %8.8X", crcIt->first, validatorCRC));
 				while (++crcIt != m_cachedCRCs.end())
 				{
 					Int validatedCRC = crcIt->second;
-					//DEBUG_LOG(("CRC to validate is from player %d: %8.8X\n", crcIt->first, validatedCRC));
+					//DEBUG_LOG(("CRC to validate is from player %d: %8.8X", crcIt->first, validatedCRC));
 					if (validatorCRC != validatedCRC)
 					{
 						DEBUG_CRASH(("CRC mismatch!"));
@@ -2306,11 +2294,11 @@ void GameLogic::processCommandList( CommandList *list )
 		if (sawCRCMismatch)
 		{
 #ifdef DEBUG_LOGGING
-			DEBUG_LOG(("CRC Mismatch - saw %d CRCs from %d players\n", m_cachedCRCs.size(), numPlayers));
+			DEBUG_LOG(("CRC Mismatch - saw %d CRCs from %d players", m_cachedCRCs.size(), numPlayers));
 			for (std::map<Int, UnsignedInt>::const_iterator crcIt = m_cachedCRCs.begin(); crcIt != m_cachedCRCs.end(); ++crcIt)
 			{
 				Player *player = ThePlayerList->getNthPlayer(crcIt->first);
-				DEBUG_LOG(("CRC from player %d (%ls) = %X\n", crcIt->first,
+				DEBUG_LOG(("CRC from player %d (%ls) = %X", crcIt->first,
 					player?player->getPlayerDisplayName().str():L"<NONE>", crcIt->second));
 			}
 #endif // DEBUG_LOGGING
@@ -2318,7 +2306,7 @@ void GameLogic::processCommandList( CommandList *list )
 		}
 	}
 
-}  // end processCommandList
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -2337,7 +2325,7 @@ void GameLogic::selectObject(Object *obj, Bool createNewSelection, PlayerMaskTyp
 	}
 
 	if (!obj->isMassSelectable() && !createNewSelection) {
-		DEBUG_LOG(("GameLogic::selectObject() - Object attempted to be added to selection, but isn't mass-selectable.\n"));
+		DEBUG_LOG(("GameLogic::selectObject() - Object attempted to be added to selection, but isn't mass-selectable."));
 		return;
 	}
 
@@ -2347,19 +2335,30 @@ void GameLogic::selectObject(Object *obj, Bool createNewSelection, PlayerMaskTyp
 			return;
 		}
 
-		AIGroup *group = NULL;
-		CRCGEN_LOG(( "Creating AIGroup in GameLogic::selectObject()\n" ));
-		group = TheAI->createGroup();
+		CRCGEN_LOG(( "Creating AIGroup in GameLogic::selectObject()" ));
+		AIGroupPtr group = TheAI->createGroup();
 		group->add(obj);
 
 		// add all selected agents to the AI group
 		if (createNewSelection)	{
+#if RETAIL_COMPATIBLE_AIGROUP
 			player->setCurrentlySelectedAIGroup(group);
+#else
+			player->setCurrentlySelectedAIGroup(group.Peek());
+#endif
 		} else {
+#if RETAIL_COMPATIBLE_AIGROUP
 			player->addAIGroupToCurrentSelection(group);
+#else
+			player->addAIGroupToCurrentSelection(group.Peek());
+#endif
 		}
 
+#if RETAIL_COMPATIBLE_AIGROUP
 		TheAI->destroyGroup(group);
+#else
+		group->removeAll();
+#endif
 
 		if (affectClient) {
 			Drawable *draw = obj->getDrawable();
@@ -2384,25 +2383,28 @@ void GameLogic::deselectObject(Object *obj, PlayerMaskType playerMask, Bool affe
 			return;
 		}
 
-		AIGroup *group = NULL;
-		CRCGEN_LOG(( "Removing a unit from a selected group in GameLogic::deselectObject()\n" ));
-		group = TheAI->createGroup();
+		CRCGEN_LOG(( "Removing a unit from a selected group in GameLogic::deselectObject()" ));
+		AIGroupPtr group = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 		player->getCurrentSelectionAsAIGroup(group);
-		
-		Bool deleted = FALSE;
-		Bool actuallyRemoved = FALSE;
-		
+#else
+		player->getCurrentSelectionAsAIGroup(group.Peek());
+#endif
+
 		if (group) {
-			deleted = group->remove(obj);
-			actuallyRemoved = TRUE;
-		}
-		
-		if (actuallyRemoved) {
+			Bool emptied = group->remove(obj);
+
 			// Set this to be the currently selected group.
-			if (!deleted) {
+			if (!emptied) {
+#if RETAIL_COMPATIBLE_AIGROUP
 				player->setCurrentlySelectedAIGroup(group);
 				// Then, cleanup the group.
 				TheAI->destroyGroup(group);
+#else
+				player->setCurrentlySelectedAIGroup(group.Peek());
+				// Then, cleanup the group.
+				group->removeAll();
+#endif
 			} else {
 				// NULL will clear the group.
 				player->setCurrentlySelectedAIGroup(NULL);
@@ -2431,14 +2433,14 @@ inline void GameLogic::validateSleepyUpdate() const
 		return;
 
 	int i;
-	//DEBUG_LOG(("\n\n"));
+	//DEBUG_LOG(("\n"));
 	//for (i = 0; i < sz; ++i)
 	//{
-	//	DEBUG_LOG(("u %04d: %08lx %08lx\n",i,m_sleepyUpdates[i],m_sleepyUpdates[i]->friend_getNextCallFrame()));
+	//	DEBUG_LOG(("u %04d: %08lx %08lx",i,m_sleepyUpdates[i],m_sleepyUpdates[i]->friend_getNextCallFrame()));
 	//}
 	for (i = 0; i < sz; ++i)
 	{
-		DEBUG_ASSERTCRASH(m_sleepyUpdates[i]->friend_getIndexInLogic() == i, ("index mismatch: expected %d, got %d\n",i,m_sleepyUpdates[i]->friend_getIndexInLogic()));
+		DEBUG_ASSERTCRASH(m_sleepyUpdates[i]->friend_getIndexInLogic() == i, ("index mismatch: expected %d, got %d",i,m_sleepyUpdates[i]->friend_getIndexInLogic()));
 		UnsignedInt pri = m_sleepyUpdates[i]->friend_getPriority();
 		if (i > 0)
 		{
@@ -2534,7 +2536,7 @@ Int GameLogic::rebalanceChildSleepyUpdate(Int i)
 // this function gets the brunt of the work (we frequently
 // balance down, not up), so this one is hand-unrolled for
 // max efficiency. I have left the pristine non-unrolled
-// version present for clarity. (Yes, this is worth doing.) (srj) 
+// version present for clarity. (Yes, this is worth doing.) (srj)
 #if 1
 	UpdateModulePtr* pI = &m_sleepyUpdates[i];
 
@@ -2543,7 +2545,7 @@ Int GameLogic::rebalanceChildSleepyUpdate(Int i)
 	UpdateModulePtr* pChild = &m_sleepyUpdates[0] + child;
 	UpdateModulePtr* pSZ = &m_sleepyUpdates[0] + m_sleepyUpdates.size();	// yes, this is off the end.
 
-  while (pChild < pSZ) 
+  while (pChild < pSZ)
 	{
 		// choose the higher-priority of the two children; we must be higher-pri than that.
 		if (pChild < pSZ-1 && isLowerPriority(*pChild, *(pChild+1)))
@@ -2578,12 +2580,12 @@ Int GameLogic::rebalanceChildSleepyUpdate(Int i)
 	// our children are i*2 and i*2+1
 	Int sz = m_sleepyUpdates.size();
   Int child = ((i)<<1)+1;
-  while (child < sz) 
+  while (child < sz)
 	{
 		// choose the higher-priority of the two children; we must be higher-pri than that.
 		if (child < sz-1 && isLowerPriority(m_sleepyUpdates[child], m_sleepyUpdates[child+1]))
       ++child;
-		
+
 		// if we're higher-pri than our children, we're done.
 		if (!isLowerPriority(m_sleepyUpdates[i], m_sleepyUpdates[child]))
 		{
@@ -2621,7 +2623,7 @@ void GameLogic::remakeSleepyUpdate()
 	USE_PERF_TIMER(SleepyMaintenance)
 
 	Int parent = m_sleepyUpdates.size() / 2;
-  while (true) 
+  while (true)
 	{
     rebalanceChildSleepyUpdate(parent);
     if (parent == 0)
@@ -2641,7 +2643,7 @@ void GameLogic::pushSleepyUpdate(UpdateModulePtr u)
 
 	m_sleepyUpdates.push_back(u);
 	u->friend_setIndexInLogic(m_sleepyUpdates.size() - 1);
-	
+
 	rebalanceParentSleepyUpdate(m_sleepyUpdates.size()-1);
 }
 
@@ -2651,7 +2653,7 @@ UpdateModulePtr GameLogic::peekSleepyUpdate() const
 	USE_PERF_TIMER(SleepyMaintenance)
 
 	UpdateModulePtr u = m_sleepyUpdates.front();
-	DEBUG_ASSERTCRASH(u->friend_getIndexInLogic() == 0, ("index mismatch: expected %d, got %d\n",0,u->friend_getIndexInLogic()));
+	DEBUG_ASSERTCRASH(u->friend_getIndexInLogic() == 0, ("index mismatch: expected %d, got %d",0,u->friend_getIndexInLogic()));
 	return u;
 }
 
@@ -2688,12 +2690,12 @@ void GameLogic::popSleepyUpdate()
 void GameLogic::friend_awakenUpdateModule(Object* obj, UpdateModulePtr u, UnsignedInt whenToWakeUp)
 {
 	//USE_PERF_TIMER(friend_awakenUpdateModule)
-	UnsignedInt now = TheGameLogic->getFrame();
+	UnsignedInt now = getFrame();
 	DEBUG_ASSERTCRASH(whenToWakeUp >= now, ("setWakeFrame frame is in the past... are you sure this is what you want?"));
 
 	if (u == m_curUpdateModule)
 	{
-		DEBUG_CRASH(("You should not call setWakeFrame() from inside your update(), because it will be ignored, in favor of the return code from update.\n"));
+		DEBUG_CRASH(("You should not call setWakeFrame() from inside your update(), because it will be ignored, in favor of the return code from update."));
 		return;
 	}
 
@@ -2702,7 +2704,7 @@ void GameLogic::friend_awakenUpdateModule(Object* obj, UpdateModulePtr u, Unsign
 
 	if ((now > 0) && (u->friend_getNextCallFrame() == now) && (whenToWakeUp == now + 1))
 	{
-		// subtle but important case: if we already awake, and someone calls 
+		// subtle but important case: if we already awake, and someone calls
 		// setWakeFrame(self, UPDATE_SLEEP_NONE), we don't want to reset our wake frame,
 		// since that would prevent us from getting called THIS frame. since UPDATE_SLEEP_NONE
 		// really means "wake up as soon as possible", we don't want to change our status
@@ -2715,13 +2717,13 @@ void GameLogic::friend_awakenUpdateModule(Object* obj, UpdateModulePtr u, Unsign
 	{
 		if (idx < 0 || idx >= m_sleepyUpdates.size())
 		{
-			RELEASE_CRASH("fatal error! sleepy update module illegal index.\n");
+			RELEASE_CRASH("fatal error! sleepy update module illegal index.");
 			return;
 		}
 
 		if (m_sleepyUpdates[idx] != u)
 		{
-			RELEASE_CRASH("fatal error! sleepy update module index mismatch.\n");
+			RELEASE_CRASH("fatal error! sleepy update module index mismatch.");
 			return;
 		}
 
@@ -2730,7 +2732,7 @@ void GameLogic::friend_awakenUpdateModule(Object* obj, UpdateModulePtr u, Unsign
 
 		// rebalance.
 		rebalanceSleepyUpdate(idx);
-		
+
 		// validate. (harmless except in debug mode)
 		validateSleepyUpdate();
 
@@ -2740,11 +2742,11 @@ void GameLogic::friend_awakenUpdateModule(Object* obj, UpdateModulePtr u, Unsign
 	{
 		if (idx != -1)
 		{
-			RELEASE_CRASH("fatal error! sleepy update module index mismatch.\n");
+			RELEASE_CRASH("fatal error! sleepy update module index mismatch.");
 			return;
 		}
 
-		// this can happen if stuff happens during object initialization. fortunately, 
+		// this can happen if stuff happens during object initialization. fortunately,
 		// it's easy to deal with:
 		u->friend_setNextCallFrame(whenToWakeUp);
 		return;
@@ -2758,7 +2760,7 @@ static void unitTimings(void)
 {
 	static Int settleFrames = 0;
 	static Int timeFrames = 0;
-	enum { INFANTRY, VEHICLE, STRUCTURE, OTHER, END}; 
+	enum { INFANTRY, VEHICLE, STRUCTURE, OTHER, END};
 	static Int unitTypes = INFANTRY;
 	AsciiString sides[8];
 
@@ -2792,7 +2794,7 @@ static void unitTimings(void)
 	static enum { LOGIC, NO_PARTICLES, NO_SPAWN, ALL} mode;
 	static double timeAll, timeAllNoAnim, timeNoPart, timeNoSpawn, timeLogic, timeLogicNoAnim;
 	static float drawCallAll,drawCallNoPart,drawCallNoSpawn,drawCallLogic;
-	
+
 	if (settleFrames>0) {
 		settleFrames--;
 		if (settleFrames>0) return;
@@ -2809,12 +2811,12 @@ static void unitTimings(void)
 		drawCallTotal += TheDisplay->getLastFrameDrawCalls();
 		timeFrames--;
 		if (timeFrames>0) return;
-		
+
 		QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 		double timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
 		timeToUpdate *= FACTOR;
-	
-		
+
+
 
 		if (mode == LOGIC) {
 			timeLogic = timeToUpdate;
@@ -2834,14 +2836,14 @@ static void unitTimings(void)
 			timeAll = timeToUpdate;
 			drawCallAll = (float)drawCallTotal / (float)(TIME_FRAMES * 100);  // 100 units for TIME_FRAMES
 
-			mode = NO_PARTICLES; 
+			mode = NO_PARTICLES;
 			settleFrames = 10;
 			if (TheParticleSystemManager->getParticleCount()>1) {
 				TheParticleSystemManager->reset();
 				DEBUG_LOG(("Starting noPart - "));
 			}
 			return;
-		} 
+		}
 		if (mode == NO_PARTICLES) {
 			timeNoPart = timeToUpdate;
 			drawCallNoPart = (float)drawCallTotal / (float)(TIME_FRAMES * 100);  // 100 units for TIME_FRAMES
@@ -2855,13 +2857,13 @@ static void unitTimings(void)
 					gotSpawn = true;
 				}
 				obj = obj->getNextObject();
-			}	
+			}
 			if (gotSpawn) {
 				DEBUG_LOG(("Starting noSpawn - "));
 				settleFrames = 10;
 				return;
 			}
-		}	
+		}
 		if (mode==NO_SPAWN) {
 			timeNoSpawn = timeToUpdate;
 			drawCallNoSpawn = (float)drawCallTotal / (float)(TIME_FRAMES * 100);  // 100 units for TIME_FRAMES
@@ -2875,11 +2877,11 @@ static void unitTimings(void)
 		if (veryFirstTime) {
 			thingName = "No Object";
 		}
-		sprintf(foo, "\nTime %f, %d ms for 100 %s , noPart %f, noSpawn %f logic %f \n", timeAll, 
-			(Int)(timeAll*1000/TIME_FRAMES), thingName.str(), timeNoPart, 
+		sprintf(foo, "\nTime %f, %d ms for 100 %s , noPart %f, noSpawn %f logic %f \n", timeAll,
+			(Int)(timeAll*1000/TIME_FRAMES), thingName.str(), timeNoPart,
 			timeNoSpawn, timeLogic);
 		DEBUG_LOG((foo));
-		sprintf(foo, "\nDrawCalls for 100 %s , all %d, noPart %d, noSpawn %d logic %d \n", thingName.str(), 
+		sprintf(foo, "\nDrawCalls for 100 %s , all %d, noPart %d, noSpawn %d logic %d \n", thingName.str(),
 			drawCallAll,drawCallNoPart,drawCallNoSpawn, drawCallLogic);
 		DEBUG_LOG((foo));
 
@@ -2896,7 +2898,7 @@ static void unitTimings(void)
 				type="Structure";
 			}	else {
 				type="Other";
-			}						 
+			}
 			AsciiString modelName;
 			ModelConditionFlags state;
 			state.clear();
@@ -2914,10 +2916,10 @@ static void unitTimings(void)
 				modelName = "**NO MODEL**";
 				veryFirstTime = false;
 			}
-			sprintf(foo, "%f,%d,%f,%d,%f,%d,%f,%d,%s,%s,%s,%s,%f,%f,%f\n", timeAll, 
-			(Int)(timeAll*1000/TIME_FRAMES),timeNoPart, 
-			(Int)(timeNoPart*1000/TIME_FRAMES),timeNoSpawn, 
-			(Int)(timeNoSpawn*1000/TIME_FRAMES),timeLogic, 
+			sprintf(foo, "%f,%d,%f,%d,%f,%d,%f,%d,%s,%s,%s,%s,%f,%f,%f\n", timeAll,
+			(Int)(timeAll*1000/TIME_FRAMES),timeNoPart,
+			(Int)(timeNoPart*1000/TIME_FRAMES),timeNoSpawn,
+			(Int)(timeNoSpawn*1000/TIME_FRAMES),timeLogic,
 			(Int)(timeLogic*1000/TIME_FRAMES), thingName.str(), modelName.str(), type.str(),
 			sides[side].str(),
 			drawCallAll,drawCallNoPart,drawCallNoSpawn);
@@ -2932,10 +2934,10 @@ static void unitTimings(void)
 		if (g_UT_curThing->getName()==SINGLE_UNIT) {
 			return;
 		}
-		while (g_UT_curThing->friend_getNextTemplate() 
-			&& g_UT_curThing->friend_getNextTemplate()->getName()!=SINGLE_UNIT) 
+		while (g_UT_curThing->friend_getNextTemplate()
+			&& g_UT_curThing->friend_getNextTemplate()->getName()!=SINGLE_UNIT)
 			g_UT_curThing = g_UT_curThing->friend_getNextTemplate();
-		
+
 	}
 #endif
 
@@ -2943,7 +2945,7 @@ static void unitTimings(void)
 	while (obj) {
 		TheGameLogic->destroyObject(obj);
 		obj = obj->getNextObject();
-	}												
+	}
 
 	if (g_UT_startTiming && g_UT_curThing && !g_UT_gotUnit) {
 		TheWritableGlobalData->m_framesPerSecondLimit = 10000;
@@ -3000,7 +3002,7 @@ static void unitTimings(void)
 			if (btt->getName().startsWith("Firestorm"))	continue;	// 100 crashes
 			if (btt->getName().startsWith("Avalanche"))	continue;	// 100 crashes
 			if (btt->getName().startsWith("InfernoTankShell"))	continue;	// 100 crashes
-			
+
 			if (btt->getName() == "ChinaArtilleryBarrageShell") continue; // 100 takes really, freaking long. Doesn't crash jba.
 			if (btt->getName() == "ChinaTankOverlordBattleBunker") continue; // 100 seems to hang gth.
 			if (btt->getName() == "ChinaTankOverlordPropagandaTower") continue; // 100 seems to hang gth.
@@ -3010,7 +3012,7 @@ static void unitTimings(void)
 
 #ifdef SINGLE_UNIT
 			if (btt->getName()!=SINGLE_UNIT) {
-				DEBUG_LOG(("Skipping %s\n", btt->getName().str()));
+				DEBUG_LOG(("Skipping %s", btt->getName().str()));
 				continue;
 			}
 #endif
@@ -3028,10 +3030,10 @@ static void unitTimings(void)
 						pos.x = 20*i+30;
 						pos.y = 20*j+30;
 						pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y );
-					
-						obj->setOrientation(0);	
+
+						obj->setOrientation(0);
 						obj->setPosition( &pos );
-						
+
 						// Now onCreates were called at the constructor.  This magically created
 						// thing needs to be considered as Built for Game specific stuff.
 						for (BehaviorModule** m = obj->getBehaviorModules(); *m; ++m)
@@ -3086,7 +3088,7 @@ void GameLogic::update( void )
 #endif
 
 	setFPMode();
-	
+
 	/// @todo remove this hack
 	if ( m_startNewGame && !TheDisplay->isMoviePlaying())
 	{
@@ -3105,7 +3107,7 @@ void GameLogic::update( void )
 		__int64 freq64;
 		GetPrecisionTimerTicksPerSec(&freq64);
 
-		sprintf(Buf,"Texture=%f, Anim=%f, CreateRobj=%f, Load3DAssets=%f\n",
+		sprintf(Buf,"Texture=%f, Anim=%f, CreateRobj=%f, Load3DAssets=%f",
 			((double)Total_Get_Texture_Time/(double)(freq64)*1000.0),
 			((double)Total_Get_HAnim_Time/(double)(freq64)*1000.0),
 			((double)Total_Create_Render_Obj_Time/(double)(freq64)*1000.0),
@@ -3116,8 +3118,7 @@ void GameLogic::update( void )
 	}
 
 	// send the current time to the GameClient
-	DEBUG_ASSERTCRASH(TheGameLogic == this, ("hmm, TheGameLogic is not right"));
-	UnsignedInt now = TheGameLogic->getFrame();
+	UnsignedInt now = getFrame();
 	TheGameClient->setFrame(now);
 
 	// update (execute) scripts
@@ -3125,22 +3126,6 @@ void GameLogic::update( void )
 		TheScriptEngine->UPDATE();
 	}
 
-	Bool freezeTime = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
-	freezeTime = freezeTime || TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript();
-	
-	if (freezeTime) 
-	{
-		if (TheCommandList->containsMessageOfType(GameMessage::MSG_CLEAR_GAME_DATA)) 
-		{
-			TheScriptEngine->forceUnfreezeTime();
-		} 
-		else 
-		{
-			/// @todo - make sure this never happens during a network game.  jba.
-			return;
-		}
-	}
-
 	// Note - TerrainLogic update needs to happen after ScriptEngine update, but before object updates.  jba.
 	// This way changes in bridges are noted in the script engine before being cleared in TerrainLogic->update
 	{
@@ -3162,20 +3147,21 @@ void GameLogic::update( void )
 	if (generateForSolo || generateForMP)
 	{
 		m_CRC = getCRC( CRC_RECALC );
-		if (isMPGameOrReplay)
-		{
-			GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_LOGIC_CRC );
-			msg->appendIntegerArgument( m_CRC );
-			msg->appendBooleanArgument( (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK) ); // playback CRC
-			DEBUG_LOG(("Appended CRC on frame %d: %8.8X\n", m_frame, m_CRC));
-		}
-		else
-		{
-			GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_LOGIC_CRC );
-			msg->appendIntegerArgument( m_CRC );
-			msg->appendBooleanArgument( (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK) ); // playback CRC
-			DEBUG_LOG(("Appended Playback CRC on frame %d: %8.8X\n", m_frame, m_CRC));
-		}
+		bool isPlayback = (TheRecorder && TheRecorder->isPlaybackMode());
+
+		GameMessage *msg = newInstance(GameMessage)(GameMessage::MSG_LOGIC_CRC);
+		msg->appendIntegerArgument(m_CRC);
+		msg->appendBooleanArgument(isPlayback);
+
+		// TheSuperHackers @info helmutbuhler 13/04/2025
+		// During replay simulation, we bypass TheMessageStream and instead put the CRC message
+		// directly into TheCommandList because we don't update TheMessageStream during simulation.
+		GameMessageList *messageList = TheMessageStream;
+		if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_SIMULATION_PLAYBACK)
+			messageList = TheCommandList;
+		messageList->appendMessage(msg);
+
+		DEBUG_LOG(("Appended %sCRC on frame %d: %8.8X", isPlayback ? "Playback " : "", m_frame, m_CRC));
 	}
 
 	// collect stats
@@ -3230,7 +3216,7 @@ void GameLogic::update( void )
 				continue;
 			}
 
-			// we're done, everyone else is sleeping. 
+			// we're done, everyone else is sleeping.
 			// break from the loop BEFORE we pop this item off.
 			if (u->friend_getNextCallFrame() > now)
 			{
@@ -3244,12 +3230,12 @@ void GameLogic::update( void )
 			{
 				USE_PERF_TIMER(GameLogic_update_sleepy)
 
-				//DEBUG_LOG(("calling update %08lx (%d %d)... ",update,update->friend_getNextCallFrame(),update->friend_getNextCallPhase()));
+				//DEBUG_LOG(("calling update %08lx (%d %d)...",update,update->friend_getNextCallFrame(),update->friend_getNextCallPhase()));
 				m_curUpdateModule = u;
 
 				sleepLen = u->update();
 				DEBUG_ASSERTCRASH(sleepLen > 0, ("you may not return 0 from update"));
-				if (sleepLen < 1) 
+				if (sleepLen < 1)
 					sleepLen = UPDATE_SLEEP_NONE;
 
 				m_curUpdateModule = NULL;
@@ -3289,8 +3275,8 @@ void GameLogic::update( void )
 	// reset the command list, destroying all messages
 	TheCommandList->reset();
 
-	TheWeaponStore->UPDATE();	
-	TheLocomotorStore->UPDATE();	
+	TheWeaponStore->UPDATE();
+	TheLocomotorStore->UPDATE();
 	TheVictoryConditions->UPDATE();
 
 	{
@@ -3308,6 +3294,7 @@ void GameLogic::update( void )
 	if (!m_startNewGame)
 	{
 		m_frame++;
+		m_hasUpdated = TRUE;
 	}
 }
 
@@ -3315,13 +3302,15 @@ void GameLogic::update( void )
 // ------------------------------------------------------------------------------------------------
 void GameLogic::preUpdate()
 {
+	m_hasUpdated = FALSE;
+
 	if (m_pauseFrame == m_frame && m_pauseFrame != 0)
 	{
 		m_pauseFrame = 0;
 		Bool pause = TRUE;
 		Bool pauseMusic = FALSE;
 		Bool pauseInput = FALSE;
-		TheGameLogic->setGamePaused(pause, pauseMusic, pauseInput);
+		setGamePaused(pause, pauseMusic, pauseInput);
 	}
 }
 
@@ -3357,7 +3346,7 @@ void GameLogic::addObjectToLookupTable( Object *obj )
 	// add to lookup
 	m_objHash[ obj->getID() ] = obj;
 
-}  // end addObjectToLookupTable
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove object from the ID lookup table */
@@ -3372,7 +3361,7 @@ void GameLogic::removeObjectFromLookupTable( Object *obj )
 	// remove from lookup table
 	m_objHash.erase( obj->getID() );
 
-}  // end removeObjectFromLookupTable
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given an object, register it with the GameLogic and give it a unique ID. */
@@ -3386,7 +3375,7 @@ void GameLogic::registerObject( Object *obj )
 	// add object to lookup table
 	addObjectToLookupTable( obj );
 
-	UnsignedInt now = TheGameLogic->getFrame();
+	UnsignedInt now = getFrame();
 	if (now == 0)
 		now = 1;
 	for (BehaviorModule** b = obj->getBehaviorModules(); *b; ++b)
@@ -3443,7 +3432,7 @@ Object *GameLogic::friend_createObject( const ThingTemplate *thing, const Object
 	obj = newInstance(Object)( thing, statusBits, team );
 
 	return obj;
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Mark the object as destroyed, and place on list for deletion at the end of the next update.
@@ -3487,7 +3476,7 @@ void GameLogic::destroyObject( Object *obj )
 	if( obj->isKindOf( KINDOF_WALK_ON_TOP_OF_WALL ) )
 		TheAI->pathfinder()->removeWallPiece( obj );
 
-}  // end destroyObject
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -3537,7 +3526,7 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 	DEBUG_ASSERTCRASH(this == TheGameLogic, ("Not in GameLogic"));
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("CRC at start of frame %d is 0x%8.8X\n", m_frame, xferCRC->getCRC()));
+		CRCGEN_LOG(("CRC at start of frame %d is 0x%8.8X", m_frame, xferCRC->getCRC()));
 	}
 
 	marker = "MARKER:Objects";
@@ -3549,12 +3538,12 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 	UnsignedInt seed = GetGameLogicRandomSeedCRC();
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("CRC after objects for frame %d is 0x%8.8X\n", m_frame, xferCRC->getCRC()));
+		CRCGEN_LOG(("CRC after objects for frame %d is 0x%8.8X", m_frame, xferCRC->getCRC()));
 	}
 
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("RandomSeed: %d\n", seed));
+		CRCGEN_LOG(("RandomSeed: %d", seed));
 	}
 	if (xferCRC->getXferMode() == XFER_CRC)
 	{
@@ -3565,7 +3554,7 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 	xferCRC->xferSnapshot( ThePartitionManager );
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("CRC after partition manager for frame %d is 0x%8.8X\n", m_frame, xferCRC->getCRC()));
+		CRCGEN_LOG(("CRC after partition manager for frame %d is 0x%8.8X", m_frame, xferCRC->getCRC()));
 	}
 
 #ifdef DEBUG_CRC
@@ -3577,7 +3566,7 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 		xferCRC->xferSnapshot( TheModuleFactory );
 		if (isInGameLogicUpdate())
 		{
-			CRCGEN_LOG(("CRC after module factory for frame %d is 0x%8.8X\n", m_frame, xferCRC->getCRC()));
+			CRCGEN_LOG(("CRC after module factory for frame %d is 0x%8.8X", m_frame, xferCRC->getCRC()));
 		}
 	}
 #endif //DEBUG_CRC
@@ -3587,7 +3576,7 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 	xferCRC->xferSnapshot( ThePlayerList );
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("CRC after PlayerList for frame %d is 0x%8.8X\n", m_frame, xferCRC->getCRC()));
+		CRCGEN_LOG(("CRC after PlayerList for frame %d is 0x%8.8X", m_frame, xferCRC->getCRC()));
 	}
 
 	marker = "MARKER:TheAI";
@@ -3595,7 +3584,7 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 	xferCRC->xferSnapshot( TheAI );
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("CRC after AI for frame %d is 0x%8.8X\n", m_frame, xferCRC->getCRC()));
+		CRCGEN_LOG(("CRC after AI for frame %d is 0x%8.8X", m_frame, xferCRC->getCRC()));
 	}
 
 	if (xferCRC->getXferMode() == XFER_SAVE)
@@ -3614,11 +3603,22 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("CRC for frame %d is 0x%8.8X\n", m_frame, theCRC));
+		CRCGEN_LOG(("CRC for frame %d is 0x%8.8X", m_frame, theCRC));
 	}
 	return theCRC;
 }
 
+// ------------------------------------------------------------------------------------------------
+void GameLogic::exitGame()
+{
+	// TheSuperHackers @fix The logic update must not be halted to process the game exit message.
+	setGamePaused(FALSE);
+	TheScriptEngine->forceUnfreezeTime();
+	TheScriptEngine->doUnfreezeTime();
+
+	TheMessageStream->appendMessage(GameMessage::MSG_CLEAR_GAME_DATA);
+}
+
 // ------------------------------------------------------------------------------------------------
 /** A new GameLogic object has been constructed, therefore create
  * a corresponding drawable and bind them together. */
@@ -3674,11 +3674,17 @@ Bool GameLogic::isGamePaused( void )
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void GameLogic::setGamePausedInFrame( UnsignedInt frame )
+void GameLogic::setGamePausedInFrame( UnsignedInt frame, Bool disableLogicTimeScale )
 {
 	if (frame >= m_frame)
 	{
 		m_pauseFrame = frame;
+
+		if (disableLogicTimeScale)
+		{
+			m_logicTimeScaleEnabledMemory = TheFramePacer->isLogicTimeScaleEnabled();
+			TheFramePacer->enableLogicTimeScale(FALSE);
+		}
 	}
 }
 
@@ -3703,6 +3709,8 @@ void GameLogic::setGamePaused( Bool paused, Bool pauseMusic, Bool pauseInput )
 	pauseGameSound(paused);
 	pauseGameMusic(paused && pauseMusic);
 	pauseGameInput(paused && pauseInput);
+
+	updateDisplayBusyState();
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -3710,6 +3718,12 @@ void GameLogic::setGamePaused( Bool paused, Bool pauseMusic, Bool pauseInput )
 void GameLogic::pauseGameLogic(Bool paused)
 {
 	m_gamePaused = paused;
+
+	if (!paused && m_logicTimeScaleEnabledMemory)
+	{
+		m_logicTimeScaleEnabledMemory = FALSE;
+		TheFramePacer->enableLogicTimeScale(TRUE);
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -3775,6 +3789,8 @@ void GameLogic::pauseGameInput(Bool paused)
 
 	m_pauseInput = paused;
 
+	TheMouse->onGamePaused(paused);
+
 	if(paused)
 	{
 		// remember the state of the mouse/input so we can return to the same state once we "unpause"
@@ -3819,15 +3835,15 @@ void GameLogic::processProgressComplete(Int playerId)
 {
 	if(playerId < 0 || playerId >= MAX_SLOTS)
 	{
-		DEBUG_ASSERTCRASH(FALSE,("GameLogic::processProgressComplete, Invalid playerid was passed in %d\n", playerId));
+		DEBUG_ASSERTCRASH(FALSE,("GameLogic::processProgressComplete, Invalid playerid was passed in %d", playerId));
 		return;
 	}
 	if(m_progressComplete[playerId] == TRUE)
 	{
-		DEBUG_LOG(("GameLogic::processProgressComplete, playerId %d is marked TRUE already yet we're trying to mark him as true again\n", playerId));
+		DEBUG_LOG(("GameLogic::processProgressComplete, playerId %d is marked TRUE already yet we're trying to mark him as true again", playerId));
 		return;
 	}
-	DEBUG_LOG(("Progress Complete for Player %d\n", playerId));
+	DEBUG_LOG(("Progress Complete for Player %d", playerId));
 	m_progressComplete[playerId] = TRUE;
 	lastHeardFrom(playerId);
 }
@@ -3885,7 +3901,7 @@ void GameLogic::testTimeOut( void )
 // ------------------------------------------------------------------------------------------------
 void GameLogic::timeOutGameStart( void )
 {
-	DEBUG_LOG(("We got the Force TimeOut Start Message\n"));
+	DEBUG_LOG(("We got the Force TimeOut Start Message"));
 	m_forceGameStartByTimeOut = TRUE;
 }
 
@@ -3918,7 +3934,7 @@ UnsignedInt GameLogic::getObjectCount( void )
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 GhostObjectManager *GameLogic::createGhostObjectManager(void)
-{ 
+{
 	return NEW GhostObjectManager;
 }
 
@@ -4020,7 +4036,7 @@ void GameLogic::getAIMetricsStatistics( UnsignedInt *numAI, UnsignedInt *numMovi
 void GameLogic::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given a string name, find the object TOC entry (if any) associated with it */
@@ -4034,7 +4050,7 @@ GameLogic::ObjectTOCEntry *GameLogic::findTOCEntryByName( AsciiString name )
 
 	return NULL;
 
-}  // end findTOCEntryByname
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given a object TOC identifier, find the object TOC if any */
@@ -4048,7 +4064,7 @@ GameLogic::ObjectTOCEntry *GameLogic::findTOCEntryById( UnsignedShort id )
 
 	return NULL;
 
-}  // end findTOCEntryById
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add an object TOC entry */
@@ -4061,7 +4077,7 @@ void GameLogic::addTOCEntry( AsciiString name, UnsignedShort id )
 	tocEntry.id = id;
 	m_objectTOC.push_back( tocEntry );
 
-}  // end addTOCEntry
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer object table of contents */
@@ -4093,11 +4109,11 @@ void GameLogic::xferObjectTOC( Xfer *xfer )
 			// if is this object name already in the TOC, skip it
 			if( findTOCEntryByName( templateName ) != NULL )
 				continue;
-			
+
 			// add this entry to the TOC
 			addTOCEntry( obj->getTemplate()->getName(), ++tocCount );
 
-		}  // end for obj
+		}
 
 		// xfer entries in the TOC
 		xfer->xferUnsignedInt( &tocCount );
@@ -4117,9 +4133,9 @@ void GameLogic::xferObjectTOC( Xfer *xfer )
 			// xfer the paired id
 			xfer->xferUnsignedShort( &tocEntry->id );
 
-		}  // end for
+		}
 
-	}  // end if
+	}
 	else
 	{
 		AsciiString templateName;
@@ -4137,15 +4153,15 @@ void GameLogic::xferObjectTOC( Xfer *xfer )
 
 			// read the id
 			xfer->xferUnsignedShort( &id );
-			
+
 			// add this to the TOC
 			addTOCEntry( templateName, id );
-					
-		}  // end for i
 
-	}  // end else
+		}
 
-}  // end xferObjectTOC
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -4171,13 +4187,13 @@ void GameLogic::prepareLogicForObjectLoad( void )
 			Bridge *bridge = TheTerrainLogic->findBridgeAt( obj->getPosition() );
 
 			// sanity
-			DEBUG_ASSERTCRASH( bridge, ("GameLogic::prepareLogicForObjectLoad - Unable to find bridge\n" ));
+			DEBUG_ASSERTCRASH( bridge, ("GameLogic::prepareLogicForObjectLoad - Unable to find bridge" ));
 
 			// get the old object that is in the bridge info
 			const BridgeInfo *bridgeInfo = bridge->peekBridgeInfo();
 			Object *oldObject = findObjectByID( bridgeInfo->bridgeObjectID );
-			DEBUG_ASSERTCRASH( oldObject, ("GameLogic::prepareLogicForObjectLoad - Unable to find old bridge object\n") );
-			DEBUG_ASSERTCRASH( oldObject == obj, ("GameLogic::prepareLogicForObjectLoad - obj != oldObject\n") );
+			DEBUG_ASSERTCRASH( oldObject, ("GameLogic::prepareLogicForObjectLoad - Unable to find old bridge object") );
+			DEBUG_ASSERTCRASH( oldObject == obj, ("GameLogic::prepareLogicForObjectLoad - obj != oldObject") );
 
 			//
 			// destroy the 4 towers that are attached to this old object (they will be loaded from
@@ -4192,43 +4208,43 @@ void GameLogic::prepareLogicForObjectLoad( void )
 					destroyObject( oldTower );
 				}
 
-			}  // end for, i
+			}
 
 			// destroy the old bridge object
 			destroyObject( oldObject );
 
-		}  // end if, bridge
+		}
 		else if( obj->isKindOf( KINDOF_WALK_ON_TOP_OF_WALL ) )
 		{
 
 			// destroy walk on top of wall things too
 			destroyObject( obj );
 
-		}  // end else if
+		}
 
-	}  // end for, obj
+	}
 
 	// process the destruction of these objects immediately before we proceed with the load process
 	processDestroyList();
 
 	// there should be no objects anywhere
 	DEBUG_ASSERTCRASH( getFirstObject() == NULL,
-										 ("GameLogic::prepareLogicForObjectLoad - There are still objects loaded in the engine, but it should be empty (Top is '%s')\n",
+										 ("GameLogic::prepareLogicForObjectLoad - There are still objects loaded in the engine, but it should be empty (Top is '%s')",
 										 getFirstObject()->getTemplate()->getName().str()) );
 
-}  // end prepareLogicForObjectLoad
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Load/Save game logic to xfer 
+/** Load/Save game logic to xfer
 	*	Version Info:
 	* 1: Initial version
-	* 2: Added m_isScoringEnabled flag (BGC) 
+	* 2: Added m_isScoringEnabled flag (BGC)
 	* 3: Added polygon triggers (CBD)
 	* 4: Added block markers around object data, no version checking is done and therefore
 	*		 this version breaks compatibility with previous versions. (CBD)
 	* 5: Added xfering the BuildAssistant's sell list.
 	* 9: Added m_rankPointsToAddAtGameStart, or else on a load game, your RestartGame button will forget your exp
-	*/	
+	*/
 // ------------------------------------------------------------------------------------------------
 void GameLogic::xfer( Xfer *xfer )
 {
@@ -4245,7 +4261,7 @@ void GameLogic::xfer( Xfer *xfer )
 	// note that we do not do the id counter here, we did it in the game state block because
 	// it's important to do that part very early in the load process
 	//
-	// !!!DON'T DO THIS!!! ----> xfer->xferObjectID( &m_nextObjectID ); <---- !!!DON'T DO THIS!!! 
+	// !!!DON'T DO THIS!!! ----> xfer->xferObjectID( &m_nextObjectID ); <---- !!!DON'T DO THIS!!!
 
 	//
 	// xfer a table of contents that contain thing template and indentifier pairs.  this
@@ -4276,10 +4292,10 @@ void GameLogic::xfer( Xfer *xfer )
 			if( tocEntry == NULL )
 			{
 
-				DEBUG_CRASH(( "GameLogic::xfer - Object TOC entry not found for '%s'\n", obj->getTemplate()->getName().str() ));
+				DEBUG_CRASH(( "GameLogic::xfer - Object TOC entry not found for '%s'", obj->getTemplate()->getName().str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// transfer TOC id entry
 			xfer->xferUnsignedShort( &tocEntry->id );
@@ -4293,9 +4309,9 @@ void GameLogic::xfer( Xfer *xfer )
 			// end a block of data
 			xfer->endBlock();
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		Team *defaultTeam = ThePlayerList->getNeutralPlayer()->getDefaultTeam();
@@ -4316,10 +4332,10 @@ void GameLogic::xfer( Xfer *xfer )
 			if( tocEntry == NULL )
 			{
 
-				DEBUG_CRASH(( "GameLogic::xfer - No TOC entry match for id '%d'\n", tocID ));
+				DEBUG_CRASH(( "GameLogic::xfer - No TOC entry match for id '%d'", tocID ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// a block of data has begun
 			objectDataSize = xfer->beginBlock();
@@ -4329,12 +4345,12 @@ void GameLogic::xfer( Xfer *xfer )
 			if( thingTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "GameLogic::xfer - Unrecognized thing template name '%s', skipping.  ENGINEERS - Are you *sure* it's OK to be ignoring this object from the save file???  Think hard about it!\n",
+				DEBUG_CRASH(( "GameLogic::xfer - Unrecognized thing template name '%s', skipping.  ENGINEERS - Are you *sure* it's OK to be ignoring this object from the save file???  Think hard about it!",
 											tocEntry->name.str() ));
 				xfer->skip( objectDataSize );
 				continue;
-							
-			}  // end if
+
+			}
 
 			// create new object
 			obj = TheThingFactory->newObject( thingTemplate, defaultTeam );
@@ -4349,9 +4365,9 @@ void GameLogic::xfer( Xfer *xfer )
 			if( obj->isKindOf( KINDOF_WALK_ON_TOP_OF_WALL ) )
 				TheAI->pathfinder()->addWallPiece( obj );
 
-		}  // end for, i
+		}
 
-	}  // end else
+	}
 
 	// campaign info
 	xfer->xferSnapshot( TheCampaignManager );
@@ -4360,7 +4376,7 @@ void GameLogic::xfer( Xfer *xfer )
 	xfer->xferSnapshot( TheCaveSystem );
 
 	// is scoring enabled
-	if( version >= 2 ) 
+	if( version >= 2 )
 		xfer->xferBool(&m_isScoringEnabled);
 
 	// polygon triggers
@@ -4386,11 +4402,11 @@ void GameLogic::xfer( Xfer *xfer )
 		if( sanityTriggerCount != triggerCount )
 		{
 
-			DEBUG_CRASH(( "GameLogic::xfer - Polygon trigger count mismatch.  Save file has a count of '%d', but map had '%d' triggers\n",
+			DEBUG_CRASH(( "GameLogic::xfer - Polygon trigger count mismatch.  Save file has a count of '%d', but map had '%d' triggers",
 										sanityTriggerCount, triggerCount ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// xfer each of the polygon triggers
 		if( xfer->getXferMode() == XFER_SAVE )
@@ -4401,15 +4417,15 @@ void GameLogic::xfer( Xfer *xfer )
 			{
 
 				// write polygon ID
-				triggerID = poly->getID();	
+				triggerID = poly->getID();
 				xfer->xferInt( &triggerID );
 
 				// xfer polygon data
 				xfer->xferSnapshot( poly );
 
-			}  // end for, poly
+			}
 
-		}  // end if, save
+		}
 		else
 		{
 			Int triggerID;
@@ -4428,16 +4444,16 @@ void GameLogic::xfer( Xfer *xfer )
 				if( poly == NULL )
 				{
 
-					DEBUG_CRASH(( "GameLogic::xfer - Unable to find polygon trigger with id '%d'\n",
+					DEBUG_CRASH(( "GameLogic::xfer - Unable to find polygon trigger with id '%d'",
 												triggerID ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
 				// xfer polygon data
 				xfer->xferSnapshot( poly );
 
-			}  // end for, i
+			}
 
 			//
 			// force a recalculation of the pathfinding cause some of these polygon triggers
@@ -4446,9 +4462,9 @@ void GameLogic::xfer( Xfer *xfer )
 			//
 			TheAI->pathfinder()->newMap();
 
-		}  // end else, load
+		}
 
-	}	 // end if, version >= 3
+	}
 
 	// note that version=4 is the same as version=3
 	if (version >= 5)
@@ -4461,7 +4477,7 @@ void GameLogic::xfer( Xfer *xfer )
 		TheBuildAssistant->xferTheSellList(xfer);
 	}
 
-	if (version >= 7) 
+	if (version >= 7)
 	{
 		if( xfer->getXferMode() == XFER_SAVE )
 		{
@@ -4479,11 +4495,11 @@ void GameLogic::xfer( Xfer *xfer )
 		{
 			if (m_thingTemplateBuildableOverrides.empty() == false)
 			{
-				DEBUG_CRASH(( "GameLogic::xfer - m_thingTemplateBuildableOverrides should be empty, but is not\n"));
+				DEBUG_CRASH(( "GameLogic::xfer - m_thingTemplateBuildableOverrides should be empty, but is not"));
 				throw SC_INVALID_DATA;
 			}
-			
-			for (;;) 
+
+			for (;;)
 			{
 				AsciiString name;
 				xfer->xferAsciiString(&name);
@@ -4519,11 +4535,11 @@ void GameLogic::xfer( Xfer *xfer )
 		{
 			if (m_controlBarOverrides.empty() == false)
 			{
-				DEBUG_CRASH(( "GameLogic::xfer - m_controlBarOverrides should be empty, but is not\n"));
+				DEBUG_CRASH(( "GameLogic::xfer - m_controlBarOverrides should be empty, but is not"));
 				throw SC_INVALID_DATA;
 			}
-			
-			for (;;) 
+
+			for (;;)
 			{
 				AsciiString name;
 				xfer->xferAsciiString(&name);
@@ -4535,7 +4551,7 @@ void GameLogic::xfer( Xfer *xfer )
 				if (value.isNotEmpty())
 				{
 					button = TheControlBar->findCommandButton(value);
-					DEBUG_ASSERTCRASH(button != NULL, ("Could not find button %s\n",value.str()));
+					DEBUG_ASSERTCRASH(button != NULL, ("Could not find button %s",value.str()));
 				}
 				m_controlBarOverrides[name] = button;
 			}
@@ -4547,7 +4563,7 @@ void GameLogic::xfer( Xfer *xfer )
 		xfer->xferInt(&m_rankPointsToAddAtGameStart);
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process entry point */
@@ -4556,7 +4572,7 @@ void GameLogic::loadPostProcess( void )
 {
 
 	//
-	// the act of loading objects can (theoretically) as a side effect create other objects, 
+	// the act of loading objects can (theoretically) as a side effect create other objects,
 	// our m_nextObjID that we maintain to give objects unique ID is also continually
 	// climbing higher and higher due to us allocating objects during load (even though
 	// those objects have their ids overwritten with data from the file.  To prevent the
@@ -4578,7 +4594,7 @@ void GameLogic::loadPostProcess( void )
 #ifdef ALLOW_NONSLEEPY_UPDATES
 	m_normalUpdates.clear();
 #else
-	UnsignedInt now = TheGameLogic->getFrame();
+	UnsignedInt now = getFrame();
 	if (now == 0)
 		now = 1;
 #endif
@@ -4598,7 +4614,7 @@ void GameLogic::loadPostProcess( void )
 #endif
 			if (!u)
 				continue;
-			
+
 			DEBUG_ASSERTCRASH(u->friend_getIndexInLogic() == -1, ("Hmm, expected index to be -1 here"));
 
 			// check each update module
@@ -4619,14 +4635,14 @@ void GameLogic::loadPostProcess( void )
 				m_sleepyUpdates.push_back(u);
 				u->friend_setIndexInLogic(m_sleepyUpdates.size() - 1);
 			}
-				
-		}  // end for, u
 
-	}  // end for, obj
+		}
+
+	}
 
 	// re-sort the priority queue all at once now that all modules are on it
 	remakeSleepyUpdate();
 
-}  // end loadPostProcess
+}
 
 
diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
index cf835cb3733..dc05ea60e69 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
@@ -28,9 +28,10 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/CRCDebug.h"
+#include "Common/FramePacer.h"
 #include "Common/GameAudio.h"
 #include "Common/GameEngine.h"
 #include "Common/GlobalData.h"
@@ -85,11 +86,6 @@
 #include "GameNetwork/NetworkInterface.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 #define MAX_PATH_SUBJECTS 64
@@ -104,7 +100,7 @@ static int thePlanSubjectCount = 0;
 static void doMoveTo( Object *obj, const Coord3D *pos )
 {
 	AIUpdateInterface *ai = obj->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH(ai, ("Attemped doMoveTo() on an Object with no AI\n"));
+	DEBUG_ASSERTCRASH(ai, ("Attemped doMoveTo() on an Object with no AI"));
 	if (ai)
 	{
 		if (theBuildPlan)
@@ -166,13 +162,14 @@ static void doSetRallyPoint( Object *obj, const Coord3D& pos )
 			// play the no can do sound
 			static AudioEventRTS rallyNotSet("UnableToSetRallyPoint");
 			rallyNotSet.setPosition(&pos);
+			rallyNotSet.setPlayerIndex(obj->getControllingPlayer()->getPlayerIndex());
 			TheAudio->addAudioEvent(&rallyNotSet);
 
-		}  // end if
+		}
 
 		return;
 
-	}  // end if
+	}
 
 	// feedback to the player
 	if( isLocalPlayer )
@@ -180,7 +177,7 @@ static void doSetRallyPoint( Object *obj, const Coord3D& pos )
 
 		// print a message to the user
 		UnicodeString info;
-		info.format( TheGameText->fetch( "GUI:RallyPointSet" ), 
+		info.format( TheGameText->fetch( "GUI:RallyPointSet" ),
 								 obj->getTemplate()->getDisplayName().str() );
 		TheInGameUI->message( info );
 
@@ -195,7 +192,7 @@ static void doSetRallyPoint( Object *obj, const Coord3D& pos )
 		if( draw && draw->isSelected() )
 			TheControlBar->markUIDirty();
 
-	}  // end if
+	}
 
 	// if this object has a ProductionExitUpdate interface, we are setting a rally point
 	ExitInterface *exitInterface = obj->getObjectExitInterface();
@@ -231,13 +228,13 @@ void GameLogic::closeWindows( void )
 	TheControlBar->hidePurchaseScience();
 	TheControlBar->hideSpecialPowerShortcut();
 	HideQuitMenu();
-	
+
 	// hide the options menu
 	NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonBack" );
 	GameWindow *button = TheWindowManager->winGetWindowFromId( NULL, buttonID );
 	GameWindow *window = TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey("OptionsMenu.wnd:OptionsMenuParent") );
 	if(window)
-		TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+		TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																			(WindowMsgData)button, buttonID );
 }
 
@@ -277,7 +274,7 @@ void GameLogic::clearGameData( Bool showScoreScreen )
 //	m_background->bringForward();
 //	if(shellGame)
 
-	
+
 	if (TheGlobalData->m_initialFile.isEmpty() == FALSE)
 	{
 		TheGameEngine->setQuitting(TRUE);
@@ -294,18 +291,15 @@ void GameLogic::clearGameData( Bool showScoreScreen )
 		deleteInstance(m_background);
 		m_background = NULL;
 	}
-	
+
 }
 
 // ------------------------------------------------------------------------------------------------
 /** Prepare for a new game */
 // ------------------------------------------------------------------------------------------------
-void GameLogic::prepareNewGame( Int gameMode, GameDifficulty diff, Int rankPoints )
+void GameLogic::prepareNewGame( GameMode gameMode, GameDifficulty diff, Int rankPoints )
 {
-	//Added By Sadullah Nader
-	//Fix for loading game scene
 	setGameLoading(TRUE);
-	//
 
 	TheScriptEngine->setGlobalDifficulty(diff);
 
@@ -317,7 +311,7 @@ void GameLogic::prepareNewGame( Int gameMode, GameDifficulty diff, Int rankPoint
 		m_background->bringForward();
 	}
 	m_background->getFirstWindow()->winClearStatus(WIN_STATUS_IMAGE);
-	TheGameLogic->setGameMode( gameMode );
+	setGameMode( gameMode );
 	if (!TheGlobalData->m_pendingFile.isEmpty())
 	{
 		TheWritableGlobalData->m_mapName = TheGlobalData->m_pendingFile;
@@ -325,20 +319,20 @@ void GameLogic::prepareNewGame( Int gameMode, GameDifficulty diff, Int rankPoint
 	}
 
 	m_rankPointsToAddAtGameStart = rankPoints;
-	DEBUG_LOG(("GameLogic::prepareNewGame() - m_rankPointsToAddAtGameStart = %d\n", m_rankPointsToAddAtGameStart));
+	DEBUG_LOG(("GameLogic::prepareNewGame() - m_rankPointsToAddAtGameStart = %d", m_rankPointsToAddAtGameStart));
 
 	// If we're about to start a game, hide the shell.
-	if(!TheGameLogic->isInShellGame())
+	if(!isInShellGame())
 		TheShell->hideShell();
 
 	m_startNewGame = FALSE;
 
-}  // end prepareNewGame
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This message handles dispatches object command messages to the
   * appropriate objects.
-	* @todo Rename this to "CommandProcessor", or similiar. */
+	* @todo Rename this to "CommandProcessor", or similar. */
 //-------------------------------------------------------------------------------------------------
 void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 {
@@ -347,10 +341,10 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 #endif
 
 	Player *thisPlayer = ThePlayerList->getNthPlayer( msg->getPlayerIndex() );
-	DEBUG_ASSERTCRASH( thisPlayer, ("logicMessageDispatcher: Processing message from unknown player (player index '%d')\n", 
+	DEBUG_ASSERTCRASH( thisPlayer, ("logicMessageDispatcher: Processing message from unknown player (player index '%d')",
 																	msg->getPlayerIndex()) );
-	
-	AIGroup *currentlySelectedGroup = NULL;
+
+	AIGroupPtr currentlySelectedGroup = NULL;
 
 	if (isInGame())
 	{
@@ -359,15 +353,21 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			if (msg->getType() != GameMessage::MSG_LOGIC_CRC && msg->getType() != GameMessage::MSG_SET_REPLAY_CAMERA)
 			{
 				currentlySelectedGroup = TheAI->createGroup(); // can't do this outside a game - it'll cause sync errors galore.
-				CRCGEN_LOG(( "Creating AIGroup %d in GameLogic::logicMessageDispatcher()\n", (currentlySelectedGroup)?currentlySelectedGroup->getID():0 ));
+				CRCGEN_LOG(( "Creating AIGroup %d in GameLogic::logicMessageDispatcher()", currentlySelectedGroup?currentlySelectedGroup->getID():0 ));
+#if RETAIL_COMPATIBLE_AIGROUP
 				thisPlayer->getCurrentSelectionAsAIGroup(currentlySelectedGroup);
+#else
+				thisPlayer->getCurrentSelectionAsAIGroup(currentlySelectedGroup.Peek());
+#endif
 
-				// We can't issue commands to groups that contain units that don't belong the issuing player, so pretend like 
+				// We can't issue commands to groups that contain units that don't belong to the issuing player, so pretend like
 				// there's nothing selected. Also, if currentlySelectedGroup is empty, go ahead and delete it, so that we can skip
 				// any processing on it.
 				if (currentlySelectedGroup->isEmpty())
 				{
+#if RETAIL_COMPATIBLE_AIGROUP
 					TheAI->destroyGroup(currentlySelectedGroup);
+#endif
 					currentlySelectedGroup = NULL;
 				}
 
@@ -385,7 +385,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 #ifdef DEBUG_LOGGING
 	AsciiString commandName;
 
-	commandName = msg->getCommandAsAsciiString();
+	commandName = msg->getCommandAsString();
 	if (msg->getType() < GameMessage::MSG_BEGIN_NETWORK_MESSAGES || msg->getType() > GameMessage::MSG_END_NETWORK_MESSAGES)
 	{
 		commandName.concat(" (NON-LOGIC-MESSAGE!!!)");
@@ -397,7 +397,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 #if 0
 	if (commandName.isNotEmpty() /*&& msg->getType() != GameMessage::MSG_FRAME_TICK*/)
 	{
-		DEBUG_LOG(("Frame %d: GameLogic::logicMessageDispatcher() saw a %s from player %d (%ls)\n", getFrame(), commandName.str(),
+		DEBUG_LOG(("Frame %d: GameLogic::logicMessageDispatcher() saw a %s from player %d (%ls)", getFrame(), commandName.str(),
 			msg->getPlayerIndex(), thisPlayer->getPlayerDisplayName().str()));
 	}
 #endif
@@ -411,21 +411,21 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		case GameMessage::MSG_NEW_GAME:
 		{
 			//DEBUG_ASSERTCRASH(msg->getArgumentCount() == 1 || msg->getArgumentCount() == 2, ("%d arguments to MSG_NEW_GAME", msg->getArgumentCount()));
-			Int gameMode = msg->getArgument( 0 )->integer;
+			GameMode gameMode = (GameMode)msg->getArgument( 0 )->integer;
 			Int rankPoints = 0;
 			GameDifficulty diff = DIFFICULTY_NORMAL;
 			if ( msg->getArgumentCount() >= 2 )
 				diff = (GameDifficulty)msg->getArgument( 1 )->integer;
 			if ( msg->getArgumentCount() >= 3 )
 				rankPoints = msg->getArgument( 2 )->integer;
-			
+
 			if ( msg->getArgumentCount() >= 4 )
 			{
 				Int maxFPS = msg->getArgument( 3 )->integer;
 				if (maxFPS < 1 || maxFPS > 1000)
 					maxFPS = TheGlobalData->m_framesPerSecondLimit;
-				DEBUG_LOG(("Setting max FPS limit to %d FPS\n", maxFPS));
-				TheGameEngine->setFramesPerSecondLimit(maxFPS);
+				DEBUG_LOG(("Setting max FPS limit to %d FPS", maxFPS));
+				TheFramePacer->setFramesPerSecondLimit(maxFPS);
 				TheWritableGlobalData->m_useFpsLimit = true;
 			}
 
@@ -437,29 +437,35 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end new game
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CLEAR_GAME_DATA:
 		{
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 			if (TheDisplay && TheGlobalData->m_dumpAssetUsage)
 				TheDisplay->dumpAssetUsage(TheGlobalData->m_mapName.str());
 #endif
 
 			if (currentlySelectedGroup)
+			{
+#if RETAIL_COMPATIBLE_AIGROUP
 				TheAI->destroyGroup(currentlySelectedGroup);
+#else
+				currentlySelectedGroup->removeAll();
+#endif
+			}
 			currentlySelectedGroup = NULL;
-			TheGameLogic->clearGameData();
+			clearGameData();
 			break;
 
-		}  // end clear game data
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_BEGIN_PATH_BUILD:
 		{
-			DEBUG_LOG(("META: begin path build\n"));
+			DEBUG_LOG(("META: begin path build"));
 			DEBUG_ASSERTCRASH(!theBuildPlan, ("mismatched theBuildPlan"));
 
 			if (theBuildPlan == false)
@@ -474,7 +480,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_END_PATH_BUILD:
 		{
-			DEBUG_LOG(("META: end path build\n"));
+			DEBUG_LOG(("META: end path build"));
 			DEBUG_ASSERTCRASH(theBuildPlan, ("mismatched theBuildPlan"));
 
 			// tell everyone who participated in the plan to move
@@ -494,7 +500,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SET_RALLY_POINT:
 		{
-			Object *obj = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *obj = findObjectByID( msg->getArgument( 0 )->objectID );
 			Coord3D dest = msg->getArgument( 1 )->location;
 			if (obj)
 			{
@@ -510,7 +516,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		{
 			WeaponSlotType weaponSlot = (WeaponSlotType)msg->getArgument( 0 )->integer;
 			Int maxShotsToFire = msg->getArgument( 1 )->integer;
-			
+
 			// lock it just till the weapon is empty or the attack is "done"
 			if( currentlySelectedGroup && currentlySelectedGroup->setWeaponLockForGroup( weaponSlot, LOCKED_TEMPORARILY ))
 			{
@@ -518,17 +524,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			}
 
 			break;
-		}  
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_COMBATDROP_AT_OBJECT:
 		{
-			Object *targetObject = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *targetObject = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// issue command for either single object or for selected group
 			if( currentlySelectedGroup )
-				currentlySelectedGroup->groupCombatDrop( targetObject, 
-																								 *targetObject->getPosition(), 
+				currentlySelectedGroup->groupCombatDrop( targetObject,
+																								 *targetObject->getPosition(),
 																								 CMD_FROM_PLAYER );
 
 /*
@@ -544,7 +550,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end GameMessage::MSG_COMBATDROP_AT_OBJECT
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_COMBATDROP_AT_LOCATION:
@@ -567,7 +573,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end GameMessage::MSG_COMBATDROP_AT_LOCATION
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_WEAPON_AT_OBJECT:
@@ -575,13 +581,13 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			// Lock the weapon choice to the right weapon, then give an attack command
 
 			WeaponSlotType weaponSlot = (WeaponSlotType)msg->getArgument( 0 )->integer;
-			Object *targetObject = TheGameLogic->findObjectByID( msg->getArgument( 1 )->objectID );
+			Object *targetObject = findObjectByID( msg->getArgument( 1 )->objectID );
 			Int maxShotsToFire = msg->getArgument( 2 )->integer;
 
 			// sanity
 			if( targetObject == NULL )
 				break;
-			
+
 
 			// issue command for either single object or for selected group
 			if( currentlySelectedGroup )
@@ -589,10 +595,10 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					// lock it just till the weapon is empty or the attack is "done"
 				if (currentlySelectedGroup->setWeaponLockForGroup( weaponSlot, LOCKED_TEMPORARILY ))
 					currentlySelectedGroup->groupAttackObject( targetObject, maxShotsToFire, CMD_FROM_PLAYER );
-			}  // end if, command for group
+			}
 			break;
 
-		}  // end do weapon at object
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SWITCH_WEAPONS:
@@ -604,7 +610,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				currentlySelectedGroup->setWeaponLockForGroup( weaponSlot, LOCKED_PERMANENTLY );
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SET_MINE_CLEARING_DETAIL:
 		{
@@ -630,11 +636,11 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
  					currentlySelectedGroup->groupAttackPosition( &targetLoc, maxShotsToFire, CMD_FROM_PLAYER );
 
 
-			}  // end if, command for group
+			}
 
 			break;
 
-		}  //end do weapon at location
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_SPECIAL_POWER:
@@ -648,13 +654,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			// check for possible specific source, ignoring selection.
 			ObjectID sourceID = msg->getArgument(2)->objectID;
-			Object* source = TheGameLogic->findObjectByID(sourceID);
+			Object* source = findObjectByID(sourceID);
 			if (source != NULL)
 			{
-				AIGroup* theGroup = TheAI->createGroup();
+				AIGroupPtr theGroup = TheAI->createGroup();
 				theGroup->add(source);
 				theGroup->groupDoSpecialPower( specialPowerID, options );
+#if RETAIL_COMPATIBLE_AIGROUP
 				TheAI->destroyGroup(theGroup);
+#else
+				theGroup->removeAll();
+#endif
 			}
 			else
 			{
@@ -666,7 +676,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			}
 			break;
 
-		}  // end do special 
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_SPECIAL_POWER_AT_LOCATION:
@@ -679,20 +689,24 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			// Object in way -- if applicable (some specials care, others don't)
 			ObjectID objectID = msg->getArgument( 2 )->objectID;
-			Object *objectInWay = TheGameLogic->findObjectByID( objectID );
+			Object *objectInWay = findObjectByID( objectID );
 
 			// Command button options -- special power may care about variance options
 			UnsignedInt options = msg->getArgument( 3 )->integer;
 
 			// check for possible specific source, ignoring selection.
 			ObjectID sourceID = msg->getArgument(4)->objectID;
-			Object* source = TheGameLogic->findObjectByID(sourceID);
+			Object* source = findObjectByID(sourceID);
 			if (source != NULL)
 			{
-				AIGroup* theGroup = TheAI->createGroup();
+				AIGroupPtr theGroup = TheAI->createGroup();
 				theGroup->add(source);
 				theGroup->groupDoSpecialPowerAtLocation( specialPowerID, &targetCoord, INVALID_ANGLE, objectInWay, options );
+#if RETAIL_COMPATIBLE_AIGROUP
 				TheAI->destroyGroup(theGroup);
+#else
+				theGroup->removeAll();
+#endif
 			}
 			else
 			{
@@ -704,7 +718,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			}
 			break;
 
-		}  // end do special at location
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_SPECIAL_POWER_AT_OBJECT:
@@ -714,7 +728,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			// argument 2 is target object
 			ObjectID targetID = msg->getArgument(1)->objectID;
-			Object *target = TheGameLogic->findObjectByID( targetID );
+			Object *target = findObjectByID( targetID );
 			if( !target )
 			{
 				break;
@@ -722,16 +736,20 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			// Command button options -- special power may care about variance options
 			UnsignedInt options = msg->getArgument( 2 )->integer;
-			
+
 			// check for possible specific source, ignoring selection.
 			ObjectID sourceID = msg->getArgument(3)->objectID;
-			Object* source = TheGameLogic->findObjectByID(sourceID);
+			Object* source = findObjectByID(sourceID);
 			if (source != NULL)
 			{
-				AIGroup* theGroup = TheAI->createGroup();
+				AIGroupPtr theGroup = TheAI->createGroup();
 				theGroup->add(source);
 				theGroup->groupDoSpecialPowerAtObject( specialPowerID, target, options );
+#if RETAIL_COMPATIBLE_AIGROUP
 				TheAI->destroyGroup(theGroup);
+#else
+				theGroup->removeAll();
+#endif
 			}
 			else
 			{
@@ -742,8 +760,8 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			}
 			break;
 
-		}  // end do special at object
-		
+		}
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_ATTACKMOVETO:
 		{
@@ -757,7 +775,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_FORCEMOVETO:
 		{
@@ -771,7 +789,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		// MSG_DO_SALVAGE is intentionally set up to mimic the moveto.
 		case GameMessage::MSG_DO_SALVAGE:
@@ -781,7 +799,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			if( currentlySelectedGroup )
 			{
-				//DEBUG_LOG(("GameLogicDispatch - got a MSG_DO_MOVETO command\n"));
+				//DEBUG_LOG(("GameLogicDispatch - got a MSG_DO_MOVETO command"));
 				currentlySelectedGroup->releaseWeaponLockForGroup(LOCKED_TEMPORARILY);	// release any temporary locks.
 				currentlySelectedGroup->groupMoveToPosition( &dest, false, CMD_FROM_PLAYER );
 			}
@@ -796,14 +814,14 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			if( currentlySelectedGroup )
 			{
-				//DEBUG_LOG(("GameLogicDispatch - got a MSG_DO_MOVETO command\n"));
+				//DEBUG_LOG(("GameLogicDispatch - got a MSG_DO_MOVETO command"));
 				currentlySelectedGroup->releaseWeaponLockForGroup(LOCKED_TEMPORARILY);	// release any temporary locks.
 				currentlySelectedGroup->groupMoveToPosition( &dest, true, CMD_FROM_PLAYER );
 			}
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_GUARD_POSITION:
 		{
@@ -820,7 +838,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_GUARD_OBJECT:
 		{
-			Object* obj = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object* obj = findObjectByID( msg->getArgument( 0 )->objectID );
 			if (!obj)
 				break;
 
@@ -843,7 +861,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_SCATTER:
 		{
@@ -854,7 +872,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CREATE_FORMATION:
 		{
@@ -865,11 +883,11 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CLEAR_INGAME_POPUP_MESSAGE:
 		{
-		
+
 			if( TheInGameUI )
 			{
 				TheInGameUI->clearPopupMessageData();
@@ -887,8 +905,8 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			}
 			break;
 		}
-		
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DEBUG_KILL_SELECTION:
 		{
@@ -954,7 +972,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_ENTER:
 		{
-			Object *enter = TheGameLogic->findObjectByID( msg->getArgument( 1 )->objectID );
+			Object *enter = findObjectByID( msg->getArgument( 1 )->objectID );
 
 			// sanity
 			if( enter == NULL )
@@ -968,13 +986,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end GameMessage::MSG_ENTER
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_EXIT:
 		{
-			Object *objectWantingToExit = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *objectWantingToExit = findObjectByID( msg->getArgument( 0 )->objectID );
+#if RETAIL_COMPATIBLE_AIGROUP
 			Object *objectContainingExiter = getSingleObjectFromSelection(currentlySelectedGroup);
+#else
+			Object *objectContainingExiter = getSingleObjectFromSelection(currentlySelectedGroup.Peek());
+#endif
 
 			// sanity
 			if( objectWantingToExit == NULL )
@@ -986,7 +1008,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			// sanity, the player must actually control this object
 			if( objectWantingToExit->getControllingPlayer() != thisPlayer )
 				break;
-			
+
 			objectWantingToExit->releaseWeaponLock(LOCKED_TEMPORARILY);	// release any temporary locks.
 
 			// exit whatever objectWantingToExit is INSIDE of
@@ -999,7 +1021,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end GameMessage::MSG_EXIT
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_EVACUATE:
@@ -1026,23 +1048,23 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 // no, this is bad, don't do here, do when POSTING message
 //			pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_EVACUATE );
 
-			}  // end if, command for group
+			}
 
 			break;
 
-		}  // end GameMessage::MSG_EVACUATE
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_EXECUTE_RAILED_TRANSPORT:
 		{
-		
+
 			// issue command to currently selected objects
 			if( currentlySelectedGroup )
 				currentlySelectedGroup->groupExecuteRailedTransport( CMD_FROM_PLAYER );
 
 			break;
 
-		}  // end GameMessage::MSG_EXECUTE_RAILED_TRANSPORT
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_INTERNET_HACK:
@@ -1059,7 +1081,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_GET_REPAIRED:
 		{
-			Object *repairDepot = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *repairDepot = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// sanity
 			if( repairDepot == NULL )
@@ -1071,12 +1093,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end get repaired
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DOCK:
 		{
-			Object *dockBuilding = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *dockBuilding = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// sanity
 			if( dockBuilding == NULL )
@@ -1088,12 +1110,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end get repaired
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_GET_HEALED:
 		{
-			Object *healDest = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *healDest = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// sanity
 			if( healDest == NULL )
@@ -1105,12 +1127,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end get repaired
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_REPAIR:
 		{
-			Object *repairTarget = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *repairTarget = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// sanity
 			if( repairTarget == NULL )
@@ -1125,12 +1147,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end get repaired
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_RESUME_CONSTRUCTION:
 		{
-			Object *constructTarget = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *constructTarget = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// sanity
 			if( constructTarget == NULL )
@@ -1149,8 +1171,8 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end resume construction
-		
+		}
+
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION:
 		{
@@ -1158,13 +1180,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			SpecialPowerType spType = (SpecialPowerType)msg->getArgument( 1 )->integer;
 
 			ObjectID sourceID = msg->getArgument(2)->objectID;
-			Object* source = TheGameLogic->findObjectByID(sourceID);
+			Object* source = findObjectByID(sourceID);
 			if (source != NULL)
 			{
-				AIGroup* theGroup = TheAI->createGroup();
+				AIGroupPtr theGroup = TheAI->createGroup();
 				theGroup->add(source);
 				theGroup->groupOverrideSpecialPowerDestination( spType, loc, CMD_FROM_PLAYER );
+#if RETAIL_COMPATIBLE_AIGROUP
 				TheAI->destroyGroup(theGroup);
+#else
+				theGroup->removeAll();
+#endif
 			}
 			else
 			{
@@ -1173,15 +1199,18 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					currentlySelectedGroup->groupOverrideSpecialPowerDestination( spType, loc, CMD_FROM_PLAYER );
 				}
 			}
+
+			break;
+
 		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_ATTACK_OBJECT:
 		{
-			Object *enemy = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *enemy = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// Check enemy, as it is possible that he died this frame.
-			if (enemy) 
+			if (enemy)
 			{
 				if (currentlySelectedGroup)
 				{
@@ -1195,15 +1224,15 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end GameMessage::MSG_DO_ATTACK_GROUND_OBJECT
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_FORCE_ATTACK_OBJECT:
 		{
-			Object *enemy = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *enemy = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// Check enemy, as it is possible that he died this frame.
-			if (enemy) 
+			if (enemy)
 			{
 				if (currentlySelectedGroup)
 				{
@@ -1215,7 +1244,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end GameMessage::MSG_DO_ATTACK_GROUND_OBJECT
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_FORCE_ATTACK_GROUND:
@@ -1230,7 +1259,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				//Kris: This code was added to allow the toxin tractor to force attack
 				//      while contaminating. When this change was made, it was causing
 				//      rangers and scud launchers to reset to primary weapon mode whenever
-				//      force attacking while not idle. I fixed this by enforcing the 
+				//      force attacking while not idle. I fixed this by enforcing the
 				//      temporary and permanent modes that are already set when attempting
 				//      the new lock. In this case, the temp lock attempt will fail whenever
 				//      a permanent lock is in effect, thus fixing the ranger and scud and
@@ -1249,12 +1278,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					currentlySelectedGroup->groupAttackPosition( pos, NO_MAX_SHOTS_LIMIT, CMD_FROM_PLAYER );
 				}
 
-			
+
 			}
 
 			break;
 
-		}  // end GameMessage::MSG_DO_ATTACK_GROUND_OBJECT
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_QUEUE_UPGRADE:
@@ -1268,12 +1297,16 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end queue upgrade
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CANCEL_UPGRADE:
 		{
+#if RETAIL_COMPATIBLE_AIGROUP
 			Object *producer = getSingleObjectFromSelection(currentlySelectedGroup);
+#else
+			Object *producer = getSingleObjectFromSelection(currentlySelectedGroup.Peek());
+#endif
 			const UpgradeTemplate *upgradeT = TheUpgradeCenter->findUpgradeByKey( (NameKeyType)(msg->getArgument( 0 )->integer) );
 
 			// sanity
@@ -1294,12 +1327,16 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end cancel upgrade
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_QUEUE_UNIT_CREATE:
 		{
+#if RETAIL_COMPATIBLE_AIGROUP
 			Object *producer = getSingleObjectFromSelection(currentlySelectedGroup);
+#else
+			Object *producer = getSingleObjectFromSelection(currentlySelectedGroup.Peek());
+#endif
 			const ThingTemplate *whatToCreate;
 			ProductionID productionID;
 
@@ -1316,44 +1353,48 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			if( pu == NULL )
 			{
 
-				DEBUG_ASSERTCRASH( 0, ("MSG_QUEUE_UNIT_CREATE: Producer '%s' doesn't have a unit production interface\n", 
+				DEBUG_ASSERTCRASH( 0, ("MSG_QUEUE_UNIT_CREATE: Producer '%s' doesn't have a unit production interface",
 															producer->getTemplate()->getName().str()) );
 				break;
 
-			}  // end if
+			}
 
 			// queue the build
 			pu->queueCreateUnit( whatToCreate, productionID );
 
 			break;
 
-		}  // end GameMessage::MSG_QUEUE_UNIT_CREATE
+		}
 
 		//-------------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CANCEL_UNIT_CREATE:
 		{
+#if RETAIL_COMPATIBLE_AIGROUP
 			Object *producer = getSingleObjectFromSelection(currentlySelectedGroup);
+#else
+			Object *producer = getSingleObjectFromSelection(currentlySelectedGroup.Peek());
+#endif
 			ProductionID productionID = (ProductionID)msg->getArgument( 0 )->integer;
-			
+
 			// sanity
 			if( producer == NULL )
 				break;
-				
-			// sanity, the player must control the producer			
+
+			// sanity, the player must control the producer
 			if( producer->getControllingPlayer() != thisPlayer )
 				break;
 
 			// get the unit production interface
 			ProductionUpdateInterface *pu = producer->getProductionUpdateInterface();
 			if( pu == NULL )
-				return;
+				break;
 
 			// cancel the production
 			pu->cancelUnitCreate( productionID );
 
 			break;
 
-		}  // end GameMessage::MSG_CANCEL_UNIT_CREATE
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DOZER_CONSTRUCT:
@@ -1364,7 +1405,11 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			Real angle;
 
 			// get player, what to place, and location
+#if RETAIL_COMPATIBLE_AIGROUP
 			Object *constructorObject = getSingleObjectFromSelection(currentlySelectedGroup);
+#else
+			Object *constructorObject = getSingleObjectFromSelection(currentlySelectedGroup.Peek());
+#endif
 			place = TheThingFactory->findByTemplateID( msg->getArgument( 0 )->integer );
 			loc = msg->getArgument( 1 )->location;
 			angle = msg->getArgument( 2 )->real;
@@ -1375,10 +1420,10 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			if( msg->getType() == GameMessage::MSG_DOZER_CONSTRUCT )
 			{
 
-				TheBuildAssistant->buildObjectNow( constructorObject, place, &loc, angle, 
+				TheBuildAssistant->buildObjectNow( constructorObject, place, &loc, angle,
 																					 constructorObject->getControllingPlayer() );
 
-			}  // end if
+			}
 			else
 			{
 				Coord3D locEnd;
@@ -1387,14 +1432,14 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				locEnd = msg->getArgument( 3 )->location;
 
 				// place the line of structures, the end location being present will make it happen
-				TheBuildAssistant->buildObjectLineNow( constructorObject, place, &loc, &locEnd, angle, 
+				TheBuildAssistant->buildObjectLineNow( constructorObject, place, &loc, &locEnd, angle,
 																							 constructorObject->getControllingPlayer() );
 
-			}  // end else
+			}
 
 			// place the sound for putting a building down
 
-			static AudioEventRTS placeBuilding(AsciiString("PlaceBuilding"));
+			static AudioEventRTS placeBuilding("PlaceBuilding");
 			placeBuilding.setObjectID(constructorObject->getID());
 			TheAudio->addAudioEvent( &placeBuilding );
 
@@ -1404,21 +1449,25 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end build start
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DOZER_CANCEL_CONSTRUCT:
 		{
 
 			// get the building to cancel construction on
+#if RETAIL_COMPATIBLE_AIGROUP
 			Object *building = getSingleObjectFromSelection(currentlySelectedGroup);
+#else
+			Object *building = getSingleObjectFromSelection(currentlySelectedGroup.Peek());
+#endif
 			if( building == NULL )
 				break;
 
 			// the player sending this message must actually control this building
 			if( building->getControllingPlayer() != thisPlayer )
 				break;
-			
+
 			// Check to make sure it is actually under construction
 			if( !building->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
 				break;
@@ -1428,19 +1477,19 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			{
 				Money *money = thisPlayer->getMoney();
 				UnsignedInt amount = building->getTemplate()->calcCostToBuild( thisPlayer );
-				money->deposit( amount );
+				money->deposit( amount, TRUE, FALSE );
 			}
 
 			//
 			// Destroy the building ... killing the
-			// building will automatically cause the dozer also cancel its own building 
+			// building will automatically cause the dozer also cancel its own building
 			// behavior and it will go on its merry way doing other assigned tasks
 			//
 			building->kill();
 
 			break;
 
-		}  // end cancel dozer construction
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SELL:
@@ -1452,7 +1501,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end sell
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_TOGGLE_OVERCHARGE:
@@ -1464,7 +1513,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end toggle overcharge
+		}
 
 #ifdef ALLOW_SURRENDER
 		// --------------------------------------------------------------------------------------------
@@ -1479,11 +1528,11 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				if( currentlySelectedGroup )
 					currentlySelectedGroup->groupPickUpPrisoner( prisoner, CMD_FROM_PLAYER );
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end pick up prisoner
+		}
 #endif
 
 #ifdef ALLOW_SURRENDER
@@ -1497,7 +1546,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end return to prison
+		}
 #endif
 
 		//---------------------------------------------------------------------------------------------
@@ -1516,18 +1565,18 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			Bool firstObject = TRUE;
 
 			for (Int i = 1; i < msg->getArgumentCount(); ++i) {
-				Object *obj = TheGameLogic->findObjectByID( msg->getArgument( i )->objectID );
+				Object *obj = findObjectByID( msg->getArgument( i )->objectID );
 				if (!obj) {
 					continue;
 				}
 
-				TheGameLogic->selectObject(obj, createNewGroup && firstObject, player->getPlayerMask());
+				selectObject(obj, createNewGroup && firstObject, player->getPlayerMask());
 				firstObject = FALSE;
 			}
-			
+
 			break;
 
-		}  // end build start
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_REMOVE_FROM_SELECTED_GROUP:
@@ -1541,17 +1590,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			for (Int i = 0; i < msg->getArgumentCount(); ++i) {
 				ObjectID objID = msg->getArgument(i)->objectID;
-				Object *objToRemove = TheGameLogic->findObjectByID(objID);
+				Object *objToRemove = findObjectByID(objID);
 				if (!objToRemove) {
 					continue;
 				}
-				
-				TheGameLogic->deselectObject(objToRemove, player->getPlayerMask());
+
+				deselectObject(objToRemove, player->getPlayerMask());
 			}
 
 			break;
 
-		}  // end MSG_REMOVE_FROM_SELECTED_GROUP
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DESTROY_SELECTED_GROUP:
@@ -1564,7 +1613,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end build start
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SELECTED_GROUP_COMMAND:
@@ -1572,8 +1621,8 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end selected group command
-		
+		}
+
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_PLACE_BEACON:
 		{
@@ -1590,7 +1639,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				// how many does this player have active?
 				Int count;
 				thisPlayer->countObjectsByThingTemplate( 1, &thing, false, &count );
-				DEBUG_LOG(("Player already has %d beacons active\n", count));
+				DEBUG_LOG(("Player already has %d beacons active", count));
 				if (count >= TheMultiplayerSettings->getMaxBeaconsPerPlayer())
 				{
 					if (thisPlayer == ThePlayerList->getLocalPlayer())
@@ -1626,7 +1675,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 					// beacons are a rare event; play a nifty radar event thingie
 					TheRadar->createEvent( object->getPosition(), RADAR_EVENT_INFORMATION );
-					
+
 					if (ThePlayerList->getLocalPlayer()->getRelationship(thisPlayer->getDefaultTeam()) == ALLIES)
 						TheEva->setShouldPlay(EVA_BeaconDetected);
 
@@ -1667,15 +1716,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				TheAudio->addAudioEvent(&aSound);
 			}
 			break;
-		} // end beacon placement
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_REMOVE_BEACON:
 		{
-	
-			AIGroup *allSelectedObjects = NULL;
-			allSelectedObjects = TheAI->createGroup();
+			AIGroupPtr allSelectedObjects = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 			thisPlayer->getCurrentSelectionAsAIGroup(allSelectedObjects); // need to act on all objects, so we can hide teammates' beacons.
+#else
+			thisPlayer->getCurrentSelectionAsAIGroup(allSelectedObjects.Peek()); // need to act on all objects, so we can hide teammates' beacons.
+#endif
 			if( allSelectedObjects )
 			{
 				const VecObjectID& selectedObjects = allSelectedObjects->getAllIDs();
@@ -1684,12 +1735,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					Object *beacon = findObjectByID(*it);
 					if (beacon)
 					{
-						const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );
-						if (thing->isEquivalentTo(beacon->getTemplate()))
+						// TheSuperHackers @bugfix Prevent runtime crashing when a beacon is no longer associated with an initialized player.
+						const PlayerTemplate *playerTemplate = beacon->getControllingPlayer()->getPlayerTemplate();
+						if (!playerTemplate)
+							continue;
+
+						const ThingTemplate *thing = TheThingFactory->findTemplate( playerTemplate->getBeaconTemplate() );
+						if (thing && thing->isEquivalentTo(beacon->getTemplate()))
 						{
 							if (beacon->getControllingPlayer() == thisPlayer)
 							{
-								TheGameLogic->destroyObject(beacon); // the owner is telling it to go away.  such is life.
+								destroyObject(beacon); // the owner is telling it to go away.  such is life.
 
 								TheControlBar->markUIDirty(); // check if we should un-grey out the button
 							}
@@ -1716,14 +1772,16 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 						}
 					}
 				}
+#if RETAIL_COMPATIBLE_AIGROUP
 				if (allSelectedObjects->isEmpty())
 				{
 					TheAI->destroyGroup(allSelectedObjects);
 					allSelectedObjects = NULL;
 				}
+#endif
 			}
 			break;
-		} // end beacon removal
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SET_BEACON_TEXT:
@@ -1754,7 +1812,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				}
 			}
 			break;
-		} // end beacon text
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SELF_DESTRUCT:
@@ -1799,7 +1857,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SET_REPLAY_CAMERA:
 		{
-			if (TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK && TheGlobalData->m_useCameraInReplay && TheControlBar->getObserverLookAtPlayer() == thisPlayer)
+			if (TheRecorder->isPlaybackMode() && TheGlobalData->m_useCameraInReplay && TheControlBar->getObserverLookAtPlayer() == thisPlayer)
 			{
 				if (TheTacticalView->isCameraMovementFinished())
 				{
@@ -1813,6 +1871,9 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					loc.init(pos.x, pos.y, pos.z, angle, pitch, zoom);
 					TheTacticalView->setLocation( &loc );
 
+					// TheSuperHackers @fix xezon 18/09/2025 Lock the new location to avoid user input from changing the camera in this frame.
+					TheTacticalView->lockViewUntilFrame( getFrame() + 1 );
+
 					if (!TheLookAtTranslator->hasMouseMovedRecently())
 					{
 						TheMouse->setCursor( (Mouse::MouseCursor)(msg->getArgument( 4 )->integer) );
@@ -1823,7 +1884,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				}
 			}
 			break;
-		} // end beacon text
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CREATE_TEAM0:
@@ -1841,14 +1902,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			Player *player = ThePlayerList->getNthPlayer(playerIndex);
 			DEBUG_ASSERTCRASH(player != NULL, ("Could not find player for create team message"));
 
-			if (player == NULL)
-			{
-				break;
-			}
+			// TheSuperHackers @tweak Stubbjax 17/08/2025 The local player processes this message in CommandXlat for immediate assignment.
+			if (player && !player->isLocalPlayer())
+				player->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg);
 
-			player->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg);
 			break;
-		} // end create team command
+		}
 
 		case GameMessage::MSG_SELECT_TEAM0:
 		case GameMessage::MSG_SELECT_TEAM1:
@@ -1919,34 +1978,34 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 				if (thisPlayer->isLocalPlayer())
 				{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 					// don't even put this in release, cause someone might hack it.
 					if (!TheDebugIgnoreSyncErrors)
 					{
 #endif
 						m_shouldValidateCRCs = TRUE;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 					}
 #endif
 				}
 
 				//UnsignedInt oldCRC = m_cachedCRCs[msg->getPlayerIndex()];
 				UnsignedInt newCRC = msg->getArgument(0)->integer;
-				//DEBUG_LOG(("Recieved CRC of %8.8X from %ls on frame %d\n", newCRC,
+				//DEBUG_LOG(("Recieved CRC of %8.8X from %ls on frame %d", newCRC,
 					//thisPlayer->getPlayerDisplayName().str(), m_frame));
 				m_cachedCRCs[msg->getPlayerIndex()] = newCRC; // to mask problem: = (oldCRC < newCRC)?newCRC:oldCRC;
 			}
-			else if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK)
+			else if (TheRecorder && TheRecorder->isPlaybackMode())
 			{
 				UnsignedInt newCRC = msg->getArgument(0)->integer;
-				//DEBUG_LOG(("Saw CRC of %X from player %d.  Our CRC is %X.  Arg count is %d\n",
+				//DEBUG_LOG(("Saw CRC of %X from player %d.  Our CRC is %X.  Arg count is %d",
 					//newCRC, thisPlayer->getPlayerIndex(), getCRC(), msg->getArgumentCount()));
 
 				TheRecorder->handleCRCMessage(newCRC, thisPlayer->getPlayerIndex(), (msg->getArgument(1)->boolean));
 			}
 			break;
 
-		}  // end CRC message
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_PURCHASE_SCIENCE:
@@ -1956,17 +2015,25 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			// sanity
 			if( science == SCIENCE_INVALID || thisPlayer == NULL )
 				break;
-			
+
 			thisPlayer->attemptToPurchaseScience(science);
 
 			break;
 
-		}  // end pick specialized science
+		}
 
-	}  // end switch
+	}
+
+#if RETAIL_COMPATIBLE_AIGROUP
+	// TheSuperHackers @bugfix xezon 28/06/2025 This hack avoids crashing when players are selected during Replay playback.
+	// It can read data from an already deleted AIGroup and return this function when its member size is 0, signifying that
+	// it is indeed deleted.
+	if (currentlySelectedGroup && currentlySelectedGroup->getCount() == 0)
+		return;
+#endif
 
 	/**/ /// @todo: multiplayer semantics
-	if (currentlySelectedGroup && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK && TheGlobalData->m_useCameraInReplay && TheControlBar->getObserverLookAtPlayer() == thisPlayer /*&& !TheRecorder->isMultiplayer()*/)
+	if (currentlySelectedGroup && TheRecorder->isPlaybackMode() && TheGlobalData->m_useCameraInReplay && TheControlBar->getObserverLookAtPlayer() == thisPlayer /*&& !TheRecorder->isMultiplayer()*/)
 	{
 		const VecObjectID& selectedObjects = currentlySelectedGroup->getAllIDs();
 		TheInGameUI->deselectAllDrawables();
@@ -1985,7 +2052,11 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 	if( currentlySelectedGroup != NULL )
 	{
+#if RETAIL_COMPATIBLE_AIGROUP
 		TheAI->destroyGroup(currentlySelectedGroup);
+#else
+		currentlySelectedGroup->removeAll();
+#endif
 	}
 
-}  // end logicMessageDispatches
+}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/RankInfo.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/RankInfo.cpp
index 425ef424764..f4a2d3c4b0b 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/System/RankInfo.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/System/RankInfo.cpp
@@ -24,10 +24,10 @@
 
 // FILE: RankInfo.cpp /////////////////////////////////////////////////////////
 // Created:   Steven Johnson, Sep 2002
-// Desc:      
+// Desc:
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/Player.h"
@@ -35,11 +35,6 @@
 
 RankInfoStore* TheRankInfoStore = NULL;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 RankInfo::~RankInfo()
@@ -54,10 +49,7 @@ RankInfoStore::~RankInfoStore()
 	for (level =0; level < getRankLevelCount(); level++)
 	{
 		RankInfo* ri = m_rankInfos[level];
-		if (ri)
-		{
-			deleteInstance(ri);
-		}
+		deleteInstance(ri);
 	}
 	m_rankInfos.clear();
 }
@@ -97,14 +89,14 @@ void RankInfoStore::reset()
 
 //-----------------------------------------------------------------------------
 Int RankInfoStore::getRankLevelCount() const
-{ 
-	return m_rankInfos.size(); 
+{
+	return m_rankInfos.size();
 }
 
 //-----------------------------------------------------------------------------
 // note that level is 1...n, NOT 0...n-1
-const RankInfo* RankInfoStore::getRankInfo(Int level) const 
-{ 
+const RankInfo* RankInfoStore::getRankInfo(Int level) const
+{
 	if (level >= 1 && level <= getRankLevelCount())
 	{
 		const RankInfo* ri = m_rankInfos[level-1];
@@ -123,7 +115,7 @@ void RankInfoStore::friend_parseRankDefinition( INI* ini )
 	{
 		Int rank = INI::scanInt(ini->getNextToken());
 
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "RankName", INI::parseAndTranslateLabel, NULL, offsetof( RankInfo, m_rankName ) },
 			{ "SkillPointsNeeded", INI::parseInt, NULL, offsetof( RankInfo, m_skillPointsNeeded ) },
@@ -132,7 +124,7 @@ void RankInfoStore::friend_parseRankDefinition( INI* ini )
 			{ 0, 0, 0, 0 }
 		};
 
-		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES) 
+		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES)
 		{
 			// we aren't allowed to add ranks in overrides, only to override existing ones.
 			if (rank < 1 || rank > TheRankInfoStore->m_rankInfos.size())
@@ -140,7 +132,7 @@ void RankInfoStore::friend_parseRankDefinition( INI* ini )
 				DEBUG_CRASH(("Rank not found in map.ini"));
 				throw INI_INVALID_DATA;
 			}
-			
+
 			RankInfo* info = TheRankInfoStore->m_rankInfos[rank-1];
 			if (!info)
 			{
@@ -149,7 +141,7 @@ void RankInfoStore::friend_parseRankDefinition( INI* ini )
 			}
 
 			RankInfo* newInfo = newInstance(RankInfo);
-			
+
 			// copy data from final override to 'newInfo' as a set of initial default values
 			info = (RankInfo*)(info->friend_getFinalOverride());
 
@@ -160,7 +152,7 @@ void RankInfoStore::friend_parseRankDefinition( INI* ini )
 			ini->initFromINI(newInfo, myFieldParse);
 			//TheRankInfoStore->m_rankInfos.push_back(newInfo);	// NO, BAD, WRONG -- don't add in this case.
 
-		} 
+		}
 		else
 		{
 			if (rank != TheRankInfoStore->m_rankInfos.size() + 1)
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/Connection.cpp b/Generals/Code/GameEngine/Source/GameNetwork/Connection.cpp
deleted file mode 100644
index ef90f099b57..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/Connection.cpp
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/Connection.h"
-#include "GameNetwork/networkutil.h"
-#include "GameLogic/GameLogic.h"
-
-enum { MaxQuitFlushTime = 30000 }; // wait this many milliseconds at most to retry things before quitting
-
-/**
- * The constructor.
- */
-Connection::Connection() {
-	m_transport = NULL;
-	m_user = NULL;
-	m_netCommandList = NULL;
-	m_retryTime = 2000; // set retry time to 2 seconds.
-	m_lastTimeSent = 0;
-	m_frameGrouping = 1;
-	m_isQuitting = false;
-	m_quitTime = 0;
-	// Added By Sadullah Nader
-	// clearing out the latency tracker
-	m_averageLatency = 0.0f;
-	Int i;
-	for(i = 0; i < CONNECTION_LATENCY_HISTORY_LENGTH; i++)
-	{
-		m_latencies[i] = 0.0f;
-	}
-	// End Add
-}
-
-/**
- * The destructor.
- */
-Connection::~Connection() {
-	if (m_user != NULL) {
-		deleteInstance(m_user);
-		m_user = NULL;
-	}
-
-	if (m_netCommandList != NULL) {
-		deleteInstance(m_netCommandList);
-		m_netCommandList = NULL;
-	}
-}
-
-/**
- * Initialize the connection and any subsystems.
- */
-void Connection::init() {
-	m_transport = NULL;
-
-	if (m_user != NULL) {
-		deleteInstance(m_user);
-		m_user = NULL;
-	}
-
-	if (m_netCommandList == NULL) {
-		m_netCommandList = newInstance(NetCommandList);
-		m_netCommandList->init();
-	}
-	m_netCommandList->reset();
-
-	m_lastTimeSent = 0;
-	m_frameGrouping = 1;
-	m_numRetries = 0;
-	m_retryMetricsTime = 0;
-
-	for (Int i = 0; i < CONNECTION_LATENCY_HISTORY_LENGTH; ++i) {
-		m_latencies[i] = 0;
-	}
-	m_averageLatency = 0;
-	m_isQuitting = FALSE;
-	m_quitTime = 0;
-}
-
-/**
- * Take the connection back to the initial state.
- */
-void Connection::reset() {
-	init();
-}
-
-/**
- * Doesn't really do anything.
- */
-void Connection::update() {
-}
-
-/**
- * Attach the transport object that this connection should use.
- */
-void Connection::attachTransport(Transport *transport) {
-	m_transport = transport;
-}
-
-/**
- * Assign this connection a user.  This is the user to whome we send all our packetized goodies.
- */
-void Connection::setUser(User *user) {
-	if (m_user != NULL) {
-		deleteInstance(m_user);
-	}
-
-	m_user = user;
-}
-
-/**
- * Return the user object.
- */
-User * Connection::getUser() {
-	return m_user;
-}
-
-/**
- * Add this network command to the send queue for this connection.
- * The relay is the mask specifying the people the person we are sending to should send to.
- * The relay mostly has to do with the packet router.
- */
-void Connection::sendNetCommandMsg(NetCommandMsg *msg, UnsignedByte relay) {
-	static NetPacket *packet = NULL;
-
-	// this is done so we don't have to allocate and delete a packet every time we send a message.
-	if (packet == NULL) {
-		packet = newInstance(NetPacket);
-	}
-
-
-	if (m_isQuitting)
-		return;
-
-	if (m_netCommandList != NULL) {
-		// check to see if this command will fit in a packet.  If not, we need to split it up.
-		// we are splitting up the command here so that the retry logic will not try to 
-		// resend the ENTIRE command (i.e. multiple packets work of data) and only do the retry
-		// one wrapper command at a time.
-		packet->reset();
-
-		NetCommandRef *tempref = NEW_NETCOMMANDREF(msg);
-
-		Bool msgFits = packet->addCommand(tempref);
-		deleteInstance(tempref); // delete the temporary reference.
-		tempref = NULL;
-
-		if (!msgFits) {
-			NetCommandRef *origref = NEW_NETCOMMANDREF(msg);
-			origref->setRelay(relay);
-			// the message doesn't fit in a single packet, need to split it up.
-			NetPacketList packetList = NetPacket::ConstructBigCommandPacketList(origref);
-			NetPacketListIter tempPacketPtr = packetList.begin();
-
-			while (tempPacketPtr != packetList.end()) {
-				NetPacket *tempPacket = (*tempPacketPtr);
-
-				NetCommandList *list = tempPacket->getCommandList();
-				NetCommandRef *ref1 = list->getFirstMessage();
-				while (ref1 != NULL) {
-					NetCommandRef *ref2 = m_netCommandList->addMessage(ref1->getCommand());
-					ref2->setRelay(relay);
-
-					ref1 = ref1->getNext();
-				}
-
-				deleteInstance(tempPacket);
-				tempPacket = NULL;
-				++tempPacketPtr;
-
-				deleteInstance(list);
-				list = NULL;
-			}
-
-			deleteInstance(origref);
-			origref = NULL;
-
-			return;
-		}
-
-		// the message fits in a packet, add to the command list normally.
-		NetCommandRef *ref = m_netCommandList->addMessage(msg);
-
-		if (ref != NULL) {
-
-/*
-#if ((defined(RTS_DEBUG)) || (defined(RTS_INTERNAL)))
-			if (msg->getNetCommandType() == NETCOMMANDTYPE_GAMECOMMAND) {
-				DEBUG_LOG(("Connection::sendNetCommandMsg - added game command %d to net command list for frame %d.\n",
-					msg->getID(), msg->getExecutionFrame()));
-			} else if (msg->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) {
-				DEBUG_LOG(("Connection::sendNetCommandMsg - added frame info for frame %d\n", msg->getExecutionFrame()));
-			}
-#endif // RTS_DEBUG || RTS_INTERNAL
-*/
-
-			ref->setRelay(relay);
-		}
-	}
-}
-
-void Connection::clearCommandsExceptFrom( Int playerIndex )
-{
-	NetCommandRef *tmp = m_netCommandList->getFirstMessage();
-	while (tmp)
-	{
-		NetCommandMsg *msg = tmp->getCommand();
-		if (msg->getPlayerID() != playerIndex)
-		{
-			DEBUG_LOG(("Connection::clearCommandsExceptFrom(%d) - clearing a command from %d for frame %d\n",
-				playerIndex, tmp->getCommand()->getPlayerID(), tmp->getCommand()->getExecutionFrame()));
-			m_netCommandList->removeMessage(tmp);
-			NetCommandRef *toDelete = tmp;
-			tmp = tmp->getNext();
-			deleteInstance(toDelete);
-		} else {
-			tmp = tmp->getNext();
-		}
-	}
-}
-
-Bool Connection::isQueueEmpty() {
-	if (m_netCommandList->getFirstMessage() == NULL) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-void Connection::setQuitting( void )
-{
-	m_isQuitting = TRUE;
-	m_quitTime = timeGetTime();
-	DEBUG_LOG(("Connection::setQuitting() at time %d\n", m_quitTime));
-}
-
-/**
- * This is the good part. We take all the network commands queued up for this connection,
- * packetize them and put them on the transport's send queue for actual sending.
- */
-UnsignedInt Connection::doSend() {
-	Int numpackets = 0;
-	time_t curtime = timeGetTime();
-	Bool couldQueue = TRUE;
-
-	// Do this check first, since it's an important fail-safe
-	if (m_isQuitting && curtime > m_quitTime + MaxQuitFlushTime)
-	{
-		DEBUG_LOG(("Timed out a quitting connection.  Deleting all %d messages\n", m_netCommandList->length()));
-		m_netCommandList->reset();
-		return 0;
-	}
-
-	if ((curtime - m_lastTimeSent) < m_frameGrouping) {
-//		DEBUG_LOG(("not sending packet, time = %d, m_lastFrameSent = %d, m_frameGrouping = %d\n", curtime, m_lastTimeSent, m_frameGrouping));
-		return 0;
-	}
-	
-	// iterate through all the messages and put them into a packet(s).
-	NetCommandRef *msg = m_netCommandList->getFirstMessage();
-
-	while ((msg != NULL) && couldQueue) {
-		NetPacket *packet = newInstance(NetPacket);
-		packet->init();
-		packet->setAddress(m_user->GetIPAddr(), m_user->GetPort());
-
-		Bool notDone = TRUE;
-
-		// add the command messages until either we run out of messages or the packet is full.
-		while ((msg != NULL) && notDone) {
-			NetCommandRef *next = msg->getNext(); // Need this since msg could be deleted
-
-			time_t timeLastSent = msg->getTimeLastSent();
-
-			if (((curtime - timeLastSent) > m_retryTime) || (timeLastSent == -1)) {
-				notDone = packet->addCommand(msg);
-				if (notDone) {
-					// the msg command was added to the packet.
-					if (CommandRequiresAck(msg->getCommand())) {
-						if (timeLastSent != -1) {
-							++m_numRetries;
-						}
-						doRetryMetrics();
-						msg->setTimeLastSent(curtime);
-					} else {
-						m_netCommandList->removeMessage(msg);
-						deleteInstance(msg);
-					}
-				}
-			}
-			msg = next;
-		}
-
-		if (msg != NULL) {
-			DEBUG_LOG(("didn't finish sending all commands in connection\n"));
-		}
-
-		++numpackets;
-
-		/// @todo Make the act of giving the transport object a packet to send more efficient.  Make the transport take a NetPacket object rather than the raw data, thus avoiding an extra memcpy.
-		if (packet->getNumCommands() > 0) {
-			// If the packet actually has any information to give, give it to the transport object
-			// for transmission.
-			couldQueue = m_transport->queueSend(packet->getAddr(), packet->getPort(), packet->getData(), packet->getLength());
-			m_lastTimeSent = curtime;
-		}
-		if (packet != NULL) {
-			deleteInstance(packet); // delete the packet now that we're done with it.
-		}
-	}
-
-	return numpackets;
-}
-
-NetCommandRef * Connection::processAck(NetAckStage1CommandMsg *msg) {
-	return processAck(msg->getCommandID(), msg->getOriginalPlayerID());
-}
-
-NetCommandRef * Connection::processAck(NetAckBothCommandMsg *msg) {
-	return processAck(msg->getCommandID(), msg->getOriginalPlayerID());
-}
-
-NetCommandRef * Connection::processAck(NetCommandMsg *msg) {
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) {
-		NetAckStage1CommandMsg *ackmsg = (NetAckStage1CommandMsg *)msg;
-		return processAck(ackmsg);
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
-		NetAckBothCommandMsg *ackmsg = (NetAckBothCommandMsg *)msg;
-		return processAck(ackmsg);
-	}
-
-	return NULL;
-}
-
-/**
- * The person we are sending to has ack'd one of the messages we sent him.
- * Take that message off the list of commands to send.
- */
-NetCommandRef * Connection::processAck(UnsignedShort commandID, UnsignedByte originalPlayerID) {
-	NetCommandRef *temp = m_netCommandList->getFirstMessage();
-	while ((temp != NULL) && ((temp->getCommand()->getID() != commandID) || (temp->getCommand()->getPlayerID() != originalPlayerID))) {
-
-		// cycle through the commands till we find the one we need to remove.
-		// Need to check for both the command ID and the player ID.
-		temp = temp->getNext();
-	}
-	if (temp == NULL) {
-		return NULL;
-	}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	Bool doDebug = FALSE;
-	if (temp->getCommand()->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) {
-		doDebug = TRUE;
-	}
-#endif
-
-	Int index = temp->getCommand()->getID() % CONNECTION_LATENCY_HISTORY_LENGTH;
-	m_averageLatency -= ((Real)(m_latencies[index])) / CONNECTION_LATENCY_HISTORY_LENGTH;
-	Real lat = timeGetTime() - temp->getTimeLastSent();
-	m_averageLatency += lat / CONNECTION_LATENCY_HISTORY_LENGTH;
-	m_latencies[index] = lat;
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (doDebug == TRUE) {
-		DEBUG_LOG(("Connection::processAck - disconnect frame command %d found, removing from command list.\n", commandID));
-	}
-#endif
-	m_netCommandList->removeMessage(temp);
-	return temp;
-}
-
-void Connection::setFrameGrouping(time_t frameGrouping) {
-	m_frameGrouping = frameGrouping;
-//	m_retryTime = frameGrouping * 4;
-}
-
-void Connection::doRetryMetrics() {
-	static Int numSeconds = 0;
-	time_t curTime = timeGetTime();
-
-	if ((curTime - m_retryMetricsTime) > 10000) {
-		m_retryMetricsTime = curTime;
-		++numSeconds;
-//		DEBUG_LOG(("Retries in the last 10 seconds = %d, average latency = %fms\n", m_numRetries, m_averageLatency));
-		m_numRetries = 0;
-//		m_retryTime = m_averageLatency * 1.5;
-	}
-}
-
-#if defined(RTS_DEBUG) || (RTS_INTERNAL)
-void Connection::debugPrintCommands() {
-	NetCommandRef *ref = m_netCommandList->getFirstMessage();
-	while (ref != NULL) {
-		DEBUG_LOG(("Connection::debugPrintCommands - ID: %d\tType: %s\tRelay: 0x%X for frame %d\n",
-			ref->getCommand()->getID(), GetAsciiNetCommandType(ref->getCommand()->getNetCommandType()).str(),
-			ref->getRelay(), ref->getCommand()->getExecutionFrame()));
-		ref = ref->getNext();
-	}
-}
-#endif
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
deleted file mode 100644
index 3ed78617532..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
+++ /dev/null
@@ -1,2456 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Compression.h"
-#include "strtok_r.h"
-#include "Common/AudioEventRTS.h"
-#include "Common/CRCDebug.h"
-#include "Common/Debug.h"
-#include "Common/file.h"
-#include "Common/GameAudio.h"
-#include "Common/LocalFileSystem.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "Common/RandomValue.h"
-#include "Common/Recorder.h"
-
-#include "GameClient/Diplomacy.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MessageBox.h"
-#include "GameNetwork/ConnectionManager.h"
-#include "GameNetwork/LANAPICallbacks.h"
-#include "GameNetwork/NAT.h"
-#include "GameNetwork/NetCommandWrapperList.h"
-#include "GameNetwork/networkutil.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/ScriptActions.h"
-#include "GameLogic/ScriptEngine.h"
-#include "GameLogic/VictoryConditions.h"
-#include "GameClient/DisconnectMenu.h"
-#include "GameClient/InGameUI.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-/**
- * Le destructor.
- */
-ConnectionManager::~ConnectionManager(void)
-{
-	if (m_localUser != NULL) {
-		deleteInstance(m_localUser);
-		m_localUser = NULL;
-	}
-
-//	m_transport = NULL; // Network will delete transports; we just forget them
-	if (m_transport != NULL) {
-		delete m_transport;
-		m_transport = NULL;
-	}
-
-	Int i = 0;
-	for (; i < MAX_SLOTS; ++i) {
-		if (m_frameData[i] != NULL) {
-			deleteInstance(m_frameData[i]);
-			m_frameData[i] = NULL;
-		}
-	}
-
-	for (i = 0; i < NUM_CONNECTIONS; ++i) {
-		if (m_connections[i] != NULL) {
-			deleteInstance(m_connections[i]);
-			m_connections[i] = NULL;
-		}
-	}
-
-	if (TheDisconnectMenu != NULL) {
-		// This is done here since TheDisconnectMenu should only be there if we are in a network game.
-		delete TheDisconnectMenu;
-		TheDisconnectMenu = NULL;
-	}
-
-	if (m_disconnectManager != NULL) {
-		delete m_disconnectManager;
-		m_disconnectManager = NULL;
-	}
-
-	if (m_pendingCommands != NULL) {
-		deleteInstance(m_pendingCommands);
-		m_pendingCommands = NULL;
-	}
-
-	if (m_relayedCommands != NULL) {
-		deleteInstance(m_relayedCommands);
-		m_relayedCommands = NULL;
-	}
-
-	if (m_netCommandWrapperList != NULL) {
-		deleteInstance(m_netCommandWrapperList);
-		m_netCommandWrapperList = NULL;
-	}
-
-	s_fileCommandMap.clear();
-	s_fileRecipientMaskMap.clear();
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		s_fileProgressMap[i].clear();
-	}
-}
-
-/**
- * Le constructor
- */
-ConnectionManager::ConnectionManager(void)
-{
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		m_frameData[i] = NULL;
-	}
-	m_transport = NULL;
-	m_disconnectManager = NULL;
-	m_pendingCommands = NULL;
-	m_relayedCommands = NULL;
-	m_localAddr = 0;
-	m_localPort = 0;
-	m_netCommandWrapperList = NULL;
-	m_localUser = NULL;
-	m_localUser = newInstance(User);
-}
-
-/**
- * Initialize the connection manager and any subsystems.
- */
-void ConnectionManager::init() 
-{
-//	if (m_transport == NULL) {
-//		m_transport = new Transport;
-//	}
-//	m_transport->reset();
-
-	UnsignedInt i = 0;
-	for (; i < NUM_CONNECTIONS; ++i) {
-		m_connections[i] = NULL;
-	}
-
-	if (m_pendingCommands == NULL) {
-		m_pendingCommands = newInstance(NetCommandList);
-		m_pendingCommands->init();
-	}
-	m_pendingCommands->reset();
-
-	if (m_relayedCommands == NULL) {
-		m_relayedCommands = newInstance(NetCommandList);
-		m_relayedCommands->init();
-	}
-	m_relayedCommands->reset();
-
-	m_localSlot = -1;
-#ifdef MEMORYPOOL_DEBUG
-	TheMemoryPoolFactory->debugSetInitFillerIndex(m_localSlot);
-#endif
-	m_packetRouterSlot = 0; /// @todo The LAN/WOL interface should be telling us who the packet router is based on machine specs passed around through game options.
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		m_packetRouterFallback[i] = -1;
-	}
-
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		if (m_frameData[i] != NULL) {
-			deleteInstance(m_frameData[i]);
-			m_frameData[i] = NULL;
-		}
-	}
-
-//	m_averageFps = 30;			// since 30 fps is the desired rate, we'll start off at that.
-//	m_averageLatency = (Real)0.2; // 200ms seems like a good starting point.
-
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		m_fpsAverages[i] = -1;
-	}
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		m_latencyAverages[i] = 0.0; // using zero since all floating point standards should be able to specify 0.0 accurately.
-	}
-	m_smallestPacketArrivalCushion = -1;
-
-	m_frameMetrics.init();
-
-	TheDisconnectMenu = NEW DisconnectMenu;
-	TheDisconnectMenu->init();
-
-	m_disconnectManager = NEW DisconnectManager;
-	m_disconnectManager->init();
-
-	TheDisconnectMenu->attachDisconnectManager(m_disconnectManager);
-	TheDisconnectMenu->hideScreen();
-
-	m_netCommandWrapperList = newInstance(NetCommandWrapperList);
-	m_netCommandWrapperList->init();
-
-	s_fileCommandMap.clear();
-	s_fileRecipientMaskMap.clear();
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		s_fileProgressMap[i].clear();
-	}
-}
-
-/**
- * Reset the connection manager and any subsystems.
- */
-void ConnectionManager::reset() 
-{
-//	if (m_transport == NULL) {
-//		m_transport = new Transport;
-//	}
-//	m_transport->reset();
-	if (m_transport != NULL) {
-		delete m_transport;
-		m_transport = NULL;
-	}
-
-	UnsignedInt i = 0;
-	for (; i < (UnsignedInt)NUM_CONNECTIONS; ++i) {
-		if (m_connections[i] != NULL) {
-			deleteInstance(m_connections[i]);
-			m_connections[i] = NULL;
-		}
-	}
-
-	for (i=0; i<(UnsignedInt)MAX_SLOTS; ++i)
-	{
-		if (m_frameData[i] != NULL) {
-			deleteInstance(m_frameData[i]);
-			m_frameData[i] = NULL;
-		}
-	}
-
-	if (m_pendingCommands == NULL) {
-		m_pendingCommands = newInstance(NetCommandList);
-		m_pendingCommands->init();
-	}
-	m_pendingCommands->reset();
-
-	if (m_relayedCommands == NULL) {
-		m_relayedCommands = newInstance(NetCommandList);
-		m_relayedCommands->init();
-	}
-	m_relayedCommands->reset();
-
-	if (m_netCommandWrapperList == NULL) {
-		m_netCommandWrapperList = newInstance(NetCommandWrapperList);
-		m_netCommandWrapperList->init();
-	}
-	m_netCommandWrapperList->reset();
-
-	m_localSlot = -1;
-#ifdef MEMORYPOOL_DEBUG
-	TheMemoryPoolFactory->debugSetInitFillerIndex(m_localSlot);
-#endif
-	m_packetRouterSlot = -1;
-
-	for (i = 0; i < TheGlobalData->m_networkFPSHistoryLength; ++i) {
-		m_fpsAverages[i] = -1;
-	}
-	for (i = 0; i < TheGlobalData->m_networkLatencyHistoryLength; ++i) {
-		m_latencyAverages[i] = 0.0;
-	}
-
-	for (i = 0; i < (UnsignedInt)MAX_SLOTS; ++i) {
-		m_packetRouterFallback[i] = -1;
-	}
-
-	m_frameMetrics.reset();
-}
-
-UnsignedInt ConnectionManager::getPingFrame()
-{
-	return (m_disconnectManager)?m_disconnectManager->getPingFrame():0;
-}
-
-Int ConnectionManager::getPingsSent()
-{
-	return (m_disconnectManager)?m_disconnectManager->getPingsSent():0;
-}
-
-Int ConnectionManager::getPingsRecieved()
-{
-	return (m_disconnectManager)?m_disconnectManager->getPingsRecieved():0;
-}
-
-Bool ConnectionManager::isPlayerConnected( Int playerID )
-{
-	return ( playerID == m_localSlot || (m_connections[playerID] && !m_connections[playerID]->isQuitting()) );
-}
-
-void ConnectionManager::attachTransport(Transport *transport) {
-	if (m_transport != NULL) {
-		delete m_transport;
-		m_transport = NULL;
-	}
-	m_transport = transport;
-}
-
-/**
- * zero out the command counts for the given frames.  Presently this is used for
- * the start of a game since there won't be any commands for the first few frames due to runahead.
- */
-void ConnectionManager::zeroFrames(UnsignedInt startingFrame, UnsignedInt numFrames) {
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_frameData[i] != NULL) {
-//			DEBUG_LOG(("Calling zeroFrames on player %d, starting frame %d, numFrames %d\n", i, startingFrame, numFrames));
-			m_frameData[i]->zeroFrames(startingFrame, numFrames);
-		}
-	}
-}
-
-/**
- * Destroy any game messages that are left over due to the run ahead.
- */
-void ConnectionManager::destroyGameMessages() {
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		// Need to destroy these game messages because when the game ends, there are
-		// still some game messages left over because of the run ahead aspect of
-		// network play.
-		if (m_frameData[i] != NULL) {
-			m_frameData[i]->destroyGameMessages();
-		}
-	}
-}
-
-/**
- * ConnectionManager::doRelay()
- * Queries the transport for commands that need to be relayed to another client.
- * Get those commands and relay them to the appropriate Connection(s). We make the
- * assumption that a command will only be relayed once.
- */
-void ConnectionManager::doRelay() {
-	static Int numPackets = 0;
-	static Int numCommands = 0;
-
-	NetPacket *packet = NULL;
-
-	for (Int i = 0; i < MAX_MESSAGES; ++i) {
-		if (m_transport->m_inBuffer[i].length != 0) {
-			// This transport buffer has yet to be processed.
-
-			// make a NetPacket out of this data so it can be broken up into individual commands.
-			packet = newInstance(NetPacket)(&(m_transport->m_inBuffer[i]));
-
-			//DEBUG_LOG(("ConnectionManager::doRelay() - got a packet with %d commands\n", packet->getNumCommands()));
-			//LOGBUFFER( packet->getData(), packet->getLength() );
-
-			// Get the command list from the packet.
-			NetCommandList *cmdList = packet->getCommandList();
-			NetCommandRef *cmd = cmdList->getFirstMessage();
-
-			// Iterate through the commands in this packet and send them to the proper connections.
-			while (cmd != NULL) {
-				//DEBUG_LOG(("ConnectionManager::doRelay() - Looking at a command of type %s\n",
-					//GetAsciiNetCommandType(cmd->getCommand()->getNetCommandType()).str()));
-				if (CommandRequiresAck(cmd->getCommand())) {
-					ackCommand(cmd, m_localSlot);
-				}
-				if (!processNetCommand(cmd)) {
-					sendRemoteCommand(cmd);
-				}
-				cmd = cmd->getNext();
-
-				++numCommands;
-			}
-			++numPackets;
-
-			// Delete this packet since we won't be needing it anymore.
-			deleteInstance(packet);
-			packet = NULL;
-
-			deleteInstance(cmdList);
-			cmdList = NULL;
-
-			// signal that this has been processed.
-			m_transport->m_inBuffer[i].length = 0;
-		}
-	}
-
-	NetCommandList *cmdList = m_netCommandWrapperList->getReadyCommands();
-	NetCommandRef *cmd = cmdList->getFirstMessage();
-	while (cmd != NULL) {
-		if (CommandRequiresAck(cmd->getCommand())) {
-			ackCommand(cmd, m_localSlot);
-		}
-		if (!processNetCommand(cmd)) {
-			sendRemoteCommand(cmd);
-		}
-		cmd = cmd->getNext();
-
-		++numCommands;
-	}
-	++numPackets;
-
-	// Delete this packet since we won't be needing it anymore.
-	deleteInstance(packet);
-	packet = NULL;
-
-	deleteInstance(cmdList);
-	cmdList = NULL;
-}
-
-/**
- * This is where the non-synchronized network commands should be processed.
- * Return TRUE if the command should not be relayed. Return FALSE if it should be relayed.
- */
-Bool ConnectionManager::processNetCommand(NetCommandRef *ref) {
-	NetCommandMsg *msg = ref->getCommand();
-
-	if ((msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH)) {
-
-		processAck(msg);
-		return FALSE;
-	}
-
-	if ((m_connections[msg->getPlayerID()] == NULL) && (msg->getPlayerID() != m_localSlot)) {
-		// if this is from a player that is no longer in the game, then ignore them.
-		return TRUE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_WRAPPER) {
-		processWrapper(ref); // need to send the NetCommandRef since we have to construct the relay for the wrapped command.
-		return FALSE;
-	}
-
-	if ((msg->getPlayerID() >= 0) && (msg->getPlayerID() < MAX_SLOTS) && (msg->getPlayerID() != m_localSlot)) {
-		if (m_connections[msg->getPlayerID()] == NULL) {
-			return TRUE;
-		}
-	}
-
-	// Don't allow an out of date command to be sent through.
-	// Its unnecessary traffic and it could cause problems.
-	//
-	// This was a fix for a command count bug where a command would be
-	// executed, then a command for that old frame would be added to the
-	// FrameData for that frame + 256, and would screw up the command count.
-
-	if (IsCommandSynchronized(msg->getNetCommandType())) {
-		if (ref->getCommand()->getExecutionFrame() < TheGameLogic->getFrame()) {
-			return TRUE;
-		}
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) {
-		processFrameInfo((NetFrameCommandMsg *)msg);
-		
-		// need to set the relay so we don't send it to ourselves.
-		UnsignedByte relay = ref->getRelay();
-		relay = relay & (0xff ^ (1 << m_localSlot));
-		ref->setRelay(relay);
-		return FALSE;
-	}
-	
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_PROGRESS)
-	{
-		//DEBUG_LOG(("ConnectionManager::processNetCommand - got a progress net command from player %d\n", msg->getPlayerID()));
-		processProgress((NetProgressCommandMsg *) msg);
-
-		// need to set the relay so we don't send it to ourselves.
-		UnsignedByte relay = ref->getRelay();
-		relay = relay & (0xff ^ (1 << m_localSlot));
-		ref->setRelay(relay);
-		return FALSE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_TIMEOUTSTART)
-	{
-		DEBUG_LOG(("ConnectionManager::processNetCommand - got a TimeOut GameStart net command from player %d\n", msg->getPlayerID()));
-		processTimeOutGameStart(msg);
-		return FALSE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEADMETRICS) {
-		processRunAheadMetrics((NetRunAheadMetricsCommandMsg *)msg);
-		return TRUE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_KEEPALIVE) {
-		return TRUE;
-	}
-
-	if ((msg->getNetCommandType() > NETCOMMANDTYPE_DISCONNECTSTART) && (msg->getNetCommandType() < NETCOMMANDTYPE_DISCONNECTEND)) {
-		m_disconnectManager->processDisconnectCommand(ref, this);
-		return TRUE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTCHAT) {
-		processDisconnectChat((NetDisconnectChatCommandMsg *)msg);
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_LOADCOMPLETE)
-	{
-		DEBUG_LOG(("ConnectionManager::processNetCommand - got a Load Complete net command from player %d\n", msg->getPlayerID()));
-		processLoadComplete(msg);
-		return FALSE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_CHAT) {
-		processChat((NetChatCommandMsg *)msg);
-		return FALSE;
-	} 
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_FILE) {
-		processFile((NetFileCommandMsg *)msg);
-		return FALSE;
-	} 
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_FILEANNOUNCE) {
-		processFileAnnounce((NetFileAnnounceCommandMsg *)msg);
-		return FALSE;
-	} 
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_FILEPROGRESS) {
-		processFileProgress((NetFileProgressCommandMsg *)msg);
-		return FALSE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_FRAMERESENDREQUEST) {
-		processFrameResendRequest((NetFrameResendRequestCommandMsg *)msg);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-void ConnectionManager::processFrameResendRequest(NetFrameResendRequestCommandMsg *msg) {
-	// first make sure this is a valid slot
-	Int playerID = msg->getPlayerID();
-	if ((playerID < 0) || (playerID >= MAX_SLOTS)) {	
-		return;
-	}
-
-	// make sure this player is still in our game.
-	if ((m_connections[playerID] == NULL) || (m_connections[playerID]->isQuitting() == TRUE)) {
-		return;
-	}
-
-	sendFrameDataToPlayer(playerID, msg->getFrameToResend());
-}
-
-/**
- * We have received a wrapper for a command too big to fit in a packet.
- */
-void ConnectionManager::processWrapper(NetCommandRef *ref) 
-{
-	NetWrapperCommandMsg *wrapperMsg = (NetWrapperCommandMsg *)(ref->getCommand());
-	UnsignedShort commandID = wrapperMsg->getWrappedCommandID();
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processWrapper() - wrapped commandID is %d, commandID is %d\n",
-		commandID, wrapperMsg->getID()));
-	Int origProgress = 0;
-	FileCommandMap::iterator fcIt = s_fileCommandMap.find(commandID);
-	if (fcIt != s_fileCommandMap.end())
-	{
-		origProgress = s_fileProgressMap[m_localSlot][commandID];
-	}
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processWrapper() - origProgress[%d] == %d for command %d\n",
-		m_localSlot, origProgress, commandID));
-
-	m_netCommandWrapperList->processWrapper(ref);
-
-	if (fcIt != s_fileCommandMap.end())
-	{
-		Int newProgress = m_netCommandWrapperList->getPercentComplete(commandID);
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processWrapper() - newProgress[%d] == %d for command %d\n",
-			m_localSlot, newProgress, commandID));
-		if (newProgress > origProgress && newProgress < 100)
-		{
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processWrapper() - sending a NetFileProgressCommandMsg\n"));
-			s_fileProgressMap[m_localSlot][commandID] = newProgress;
-
-			Int progressMask = 0xff ^ (1 << m_localSlot);
-			NetFileProgressCommandMsg *msg = newInstance(NetFileProgressCommandMsg);
-			msg->setPlayerID(m_localSlot);
-			msg->setID(0);
-			if (DoesCommandRequireACommandID(msg->getNetCommandType()))
-			{
-				msg->setID(GenerateNextCommandID());
-			}
-			msg->setFileID(commandID);
-			msg->setProgress(newProgress);
-			sendLocalCommand(msg, progressMask);
-			processFileProgress(msg);
-			msg->detach();
-		}
-	}
-}
-
-/**
- * A client has sent us their run ahead metrics, lets store them away for future calculations.
- */
-void ConnectionManager::processRunAheadMetrics(NetRunAheadMetricsCommandMsg *msg) 
-{
-	UnsignedInt player = msg->getPlayerID();
-	if ((player >= 0) && (player < MAX_SLOTS) && (isPlayerConnected(player))) {
-		m_latencyAverages[player] = msg->getAverageLatency();
-		m_fpsAverages[player] = msg->getAverageFps();
-		//DEBUG_LOG(("ConnectionManager::processRunAheadMetrics - player %d, fps = %d, latency = %f\n", player, msg->getAverageFps(), msg->getAverageLatency()));
-		if (m_fpsAverages[player] > 100) {
-			// limit the reported frame rate average to 100.  This is done because if a
-			// user alt-tab's out of the game their frame rate climbs to in the neighborhood of
-			// 300, that was deemed "ugly" by the powers that be.
-			m_fpsAverages[player] = 100;
-		}
-	}
-}
-
-void ConnectionManager::processDisconnectChat(NetDisconnectChatCommandMsg *msg) 
-{
-	UnicodeString unitext;
-	UnicodeString name;
-	UnsignedByte playerID = msg->getPlayerID();
-	if (playerID == m_localSlot) {
-		name = m_localUser->GetName();
-	} else if (isPlayerConnected(playerID)) {
-		name = m_connections[playerID]->getUser()->GetName();
-	}
-	unitext.format(L"[%ls] %ls", name.str(), msg->getText().str());
-//	DEBUG_LOG(("ConnectionManager::processDisconnectChat - got message from player %d, message is %ls\n", playerID, unitext.str()));
-	TheDisconnectMenu->showChat(unitext); // <-- need to implement this
-}
-
-void ConnectionManager::processChat(NetChatCommandMsg *msg) 
-{
-	UnicodeString unitext;
-	UnicodeString name;
-	UnsignedByte playerID = msg->getPlayerID();
-	//DEBUG_LOG(("processChat(): playerID = %d\n", playerID));
-	if (playerID == m_localSlot) {
-		name = m_localUser->GetName();
-		//DEBUG_LOG(("connection is NULL, using %ls\n", name.str()));
-	} else if (((m_connections[playerID] != NULL) && (m_connections[playerID]->isQuitting() == FALSE))) {
-		name = m_connections[playerID]->getUser()->GetName();
-		//DEBUG_LOG(("connection is non-NULL, using %ls\n", name.str()));
-	}
-	unitext.format(L"[%ls] %ls", name.str(), msg->getText().str());
-//	DEBUG_LOG(("ConnectionManager::processChat - got message from player %d (mask %8.8X), message is %ls\n", playerID, msg->getPlayerMask(), unitext.str()));
-	
-	AsciiString playerName;
-	playerName.format("player%d", msg->getPlayerID());
-	const Player *player = ThePlayerList->findPlayerWithNameKey( TheNameKeyGenerator->nameToKey( playerName ) );
-	if (!player)
-	{
-		TheInGameUI->message(UnicodeString(L"%ls"), unitext.str());
-		return;
-	}
-	
-	Bool fromObserver = !player->isPlayerActive();
-	Bool amIObserver = !ThePlayerList->getLocalPlayer()->isPlayerActive();
-	Bool canSeeChat = amIObserver || !fromObserver && !TheGameInfo->getConstSlot(playerID)->isMuted();
-	
-	if ( ((1<<m_localSlot) & msg->getPlayerMask() ) && canSeeChat  )
-	{
-		RGBColor rgb;
-		rgb.setFromInt(player->getPlayerColor());
-		TheInGameUI->messageColor(&rgb, UnicodeString(L"%ls"), unitext.str());
-
-		// feedback for received chat messages in-game
-		AudioEventRTS audioEvent("GUICommunicatorIncoming");
-		TheAudio->addAudioEvent(&audioEvent);
-	}
-}
-
-void ConnectionManager::processFile(NetFileCommandMsg *msg) 
-{
-#ifdef RTS_INTERNAL
-	UnicodeString log;
-	log.format(L"Saw file transfer: '%hs' of %d bytes from %d", msg->getPortableFilename().str(), msg->getFileLength(), msg->getPlayerID());
-	DEBUG_LOG(("%ls\n", log.str()));
-#endif
-
-	if (TheFileSystem->doesFileExist(msg->getRealFilename().str()))
-	{
-		DEBUG_LOG(("File exists already!\n"));
-		//return;
-	}
-
-	UnsignedByte *buf = msg->getFileData();
-	Int len = msg->getFileLength();
-
-	// uncompress Targas
-#ifdef COMPRESS_TARGAS
-	Bool deleteBuf = FALSE;
-	if (msg->getFilename().endsWith(".tga") && CompressionManager::isDataCompressed(buf, len))
-	{
-		Int uncompLen = CompressionManager::getUncompressedSize(buf, len);
-		UnsignedByte *uncompBuffer = NEW UnsignedByte[uncompLen];
-		Int actualLen = CompressionManager::decompressData(buf, len, uncompBuffer, uncompLen);
-		if (actualLen == uncompLen)
-		{
-			DEBUG_LOG(("Uncompressed Targa after map transfer\n"));
-			deleteBuf = TRUE;
-			buf = uncompBuffer;
-			len = uncompLen;
-		}
-		else
-		{
-			DEBUG_LOG(("Failed to uncompress Targa after map transfer\n"));
-			delete[] uncompBuffer; // failed to decompress, so just use the source
-		}
-	}
-#endif // COMPRESS_TARGAS
-
-	File *fp = TheFileSystem->openFile(msg->getRealFilename().str(), File::CREATE | File::BINARY | File::WRITE);
-	if (fp)
-	{
-		fp->write(buf, len);
-		fp->close();
-		fp = NULL;
-		DEBUG_LOG(("Wrote %d bytes to file %s!\n",len,msg->getRealFilename().str()));
-
-	}
-	else
-	{
-		DEBUG_LOG(("Cannot open file!\n"));
-	}
-
-	DEBUG_LOG(("ConnectionManager::processFile() - sending a NetFileProgressCommandMsg\n"));
-	
-	Int commandID = msg->getID();
-	Int newProgress = 100;
-
-	s_fileProgressMap[m_localSlot][commandID] = newProgress;
-
-	Int progressMask = 0xff ^ (1 << m_localSlot);
-	NetFileProgressCommandMsg *progressMsg = newInstance(NetFileProgressCommandMsg);
-	progressMsg->setPlayerID(m_localSlot);
-	progressMsg->setID(0);
-	if (DoesCommandRequireACommandID(progressMsg->getNetCommandType()))
-	{
-		progressMsg->setID(GenerateNextCommandID());
-	}
-	progressMsg->setFileID(commandID);
-	progressMsg->setProgress(newProgress);
-	sendLocalCommand(progressMsg, progressMask);
-	processFileProgress(progressMsg);
-	progressMsg->detach();
-
-#ifdef COMPRESS_TARGAS
-	if (deleteBuf)
-	{
-		delete[] buf;
-		buf = NULL;
-	}
-#endif // COMPRESS_TARGAS
-}
-
-void ConnectionManager::processFileAnnounce(NetFileAnnounceCommandMsg *msg) 
-{
-	DEBUG_LOG(("ConnectionManager::processFileAnnounce() - expecting '%s' (%s) in command %d\n", msg->getPortableFilename().str(), msg->getRealFilename().str(), msg->getFileID()));
-	s_fileCommandMap[msg->getFileID()] = msg->getRealFilename();
-	s_fileRecipientMaskMap[msg->getFileID()] = msg->getPlayerMask();
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if ( (1<<i) & msg->getPlayerMask() )
-		{
-			s_fileProgressMap[i][msg->getFileID()] = 0;
-		}
-		else
-		{
-			s_fileProgressMap[i][msg->getFileID()] = 100; // they don't need to get it, so they're already done.
-		}
-	}
-}
-
-void ConnectionManager::processFileProgress(NetFileProgressCommandMsg *msg) 
-{
-	DEBUG_LOG(("ConnectionManager::processFileProgress() - command %d is at %d%%\n",
-		msg->getFileID(), msg->getProgress()));
-	Int oldProgress = s_fileProgressMap[msg->getPlayerID()][msg->getFileID()];
-
-	s_fileProgressMap[msg->getPlayerID()][msg->getFileID()] = max(oldProgress, msg->getProgress());
-}
-
-void ConnectionManager::processProgress( NetProgressCommandMsg *msg )
-{
-	TheGameLogic->processProgress(msg->getPlayerID(), msg->getPercentage());
-}
-
-void ConnectionManager::processLoadComplete( NetCommandMsg *msg )
-{
-	TheGameLogic->processProgressComplete(msg->getPlayerID());
-}
-
-void ConnectionManager::processTimeOutGameStart( NetCommandMsg *msg )
-{
-	TheGameLogic->timeOutGameStart();
-}
-
-/**
- * Another client has sent us the command count for a new frame.
- */
-void ConnectionManager::processFrameInfo(NetFrameCommandMsg *msg) {
-	//stupid frame info, why don't you process yourself?
-
-	UnsignedInt playerID = msg->getPlayerID();
-
-	if ((playerID >= 0) && (playerID < MAX_SLOTS)) {
-		if (m_frameData[playerID] != NULL) {
-//			DEBUG_LOG(("ConnectionManager::processFrameInfo - player %d, frame %d, command count %d, received on frame %d\n", playerID, msg->getExecutionFrame(), msg->getCommandCount(), TheGameLogic->getFrame()));
-			m_frameData[playerID]->setFrameCommandCount(msg->getExecutionFrame(), msg->getCommandCount());
-		}
-	}
-}
-
-/**
- * We just got a stage 1 ack from someone.  So we should remove it from the connection that sent it so
- * it doesn't keep resending it.
- */
-void ConnectionManager::processAckStage1(NetCommandMsg *msg) {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	Bool doDebug = (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ? TRUE : FALSE;
-#endif
-
-	UnsignedByte playerID = msg->getPlayerID();
-	NetCommandRef *ref = NULL;
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (doDebug == TRUE) {
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processAck - processing ack for command %d from player %d\n", ((NetAckStage1CommandMsg *)msg)->getCommandID(), playerID));
-	}
-#endif
-	
-	if ((playerID >= 0) && (playerID < NUM_CONNECTIONS)) {
-		if (m_connections[playerID] != NULL) {
-			ref = m_connections[playerID]->processAck(msg);
-		}
-	} else {
-		DEBUG_ASSERTCRASH((playerID >= 0) && (playerID < NUM_CONNECTIONS), ("ConnectionManager::processAck - %d is an invalid player number"));
-	}
-
-	if (ref != NULL) {
-		if (ref->getCommand()->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) {
-			m_frameMetrics.processLatencyResponse(((NetFrameCommandMsg *)(ref->getCommand()))->getExecutionFrame());
-		}
-
-		deleteInstance(ref);
-		ref = NULL;
-	}
-}
-
-/**
- * We just got a stage 2 ack from someone.  So remove it from the pending commands list so it doesn't
- * get sent in the case of a new packet router.
- */
-void ConnectionManager::processAckStage2(NetCommandMsg *msg) {
-	UnsignedShort commandID = 0;
-	UnsignedByte playerID = 0;
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) {
-		commandID = ((NetAckStage2CommandMsg *)msg)->getCommandID();
-		playerID = ((NetAckStage2CommandMsg *)msg)->getOriginalPlayerID();
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
-		commandID = ((NetAckBothCommandMsg *)msg)->getCommandID();
-		playerID = ((NetAckBothCommandMsg *)msg)->getOriginalPlayerID();
-	} else {
-		return;
-	}
-
-	NetCommandRef *ref = m_pendingCommands->findMessage(commandID, playerID);
-	if (ref != NULL) {
-		//DEBUG_LOG(("ConnectionManager::processAckStage2 - removing command %d from the pending commands list.\n", commandID));
-		DEBUG_ASSERTCRASH((m_localSlot == playerID), ("Found a command in the pending commands list that wasn't originated by the local player"));
-		m_pendingCommands->removeMessage(ref);
-		deleteInstance(ref);
-		ref = NULL;
-	} else {
-		//DEBUG_LOG(("ConnectionManager::processAckStage2 - Couldn't find command %d from player %d in the pending commands list.\n", commandID, playerID));
-	}
-
-	ref = m_relayedCommands->findMessage(commandID, playerID);
-	if (ref != NULL) {
-		//DEBUG_LOG(("ConnectionManager::processAckStage2 - found command ID %d from player %d in the relayed commands list.\n", commandID, playerID));
-		UnsignedByte relay = ref->getRelay();
-		//DEBUG_LOG(("ConnectionManager::processAckStage2 - relay was %d and is now ", relay));
-		relay = relay & ~(1 << msg->getPlayerID());
-		//DEBUG_LOG(("%d\n", relay));
-		if (relay == 0) {
-			//DEBUG_LOG(("ConnectionManager::processAckStage2 - relay is 0, removing command from the relayed commands list.\n"));
-			m_relayedCommands->removeMessage(ref);
-			NetAckStage2CommandMsg *ackmsg = newInstance(NetAckStage2CommandMsg)(ref->getCommand());
-			sendLocalCommand(ackmsg, 1 << ackmsg->getOriginalPlayerID());
-			deleteInstance(ref);
-			ref = NULL;
-
-			ackmsg->detach();
-			ackmsg = NULL;
-		} else {
-			ref->setRelay(relay);
-		}
-	}
-}
-
-/**
- * We just got a "both" ack from someone.  So process it as both a stage 1 and stage 2 ack.
- */
-void ConnectionManager::processAck(NetCommandMsg *msg) {
-	if ((msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) || (msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH)) {
-		processAckStage1(msg);
-	}
-	if ((msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) || (msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH)) {
-		processAckStage2(msg);
-	}
-}
-
-/**
- * A player has just left our game. Delete their connection and frame data manager.
- * return codes are:
- * PLAYERLEAVECODE_UNKNOWN - player didn't have a valid slot number.
- * PLAYERLEAVECODE_CLIENT - someone in the game that wasn't us or the packet router.
- * PLAYERLEAVECODE_LOCAL - We are leaving the game, we could also be the packet router.
- * PLAYERLEAVECODE_PACKETROUTER - The packet router left the game.
- *
- * If we are leaving and are also the packet router, it will return the PLAYERLEAVECODE_LOCAL return code.
- */
-PlayerLeaveCode ConnectionManager::processPlayerLeave(NetPlayerLeaveCommandMsg *msg) {
-	UnsignedByte playerID = msg->getLeavingPlayerID();
-	if ((playerID != m_localSlot) && (m_connections[playerID] != NULL)) {
-		DEBUG_LOG(("ConnectionManager::processPlayerLeave() - setQuitting() on player %d on frame %d\n", playerID, TheGameLogic->getFrame()));
-		m_connections[playerID]->setQuitting();
-	}
-	DEBUG_ASSERTCRASH(m_frameData[playerID]->getIsQuitting() == FALSE, ("Player %d is already quitting", playerID));
-	if ((playerID != m_localSlot) && (m_frameData[playerID] != NULL) && (m_frameData[playerID]->getIsQuitting() == FALSE)) {
-		DEBUG_LOG(("ConnectionManager::processPlayerLeave - setQuitFrame on player %d for frame %d\n", playerID, TheGameLogic->getFrame()+1));
-		m_frameData[playerID]->setQuitFrame(TheGameLogic->getFrame() + FRAMES_TO_KEEP + 1);
-	}
-
-	if (playerID == m_localSlot)
-	{
-		// we're leaving, so mark our connections and frame datas to go away.
-		for (Int i=0; i<MAX_SLOTS; ++i)
-		{
-			if (m_connections[i])
-			{
-				m_connections[i]->clearCommandsExceptFrom(m_localSlot);
-				m_connections[i]->setQuitting();
-			}
-		}
-	}
-
-	PlayerLeaveCode code = disconnectPlayer(playerID);
-	DEBUG_LOG(("ConnectionManager::processPlayerLeave() - just disconnected player %d with ret code %d\n", playerID, code));
-	if (code == PLAYERLEAVECODE_PACKETROUTER)
-		resendPendingCommands();
-
-	PopulateInGameDiplomacyPopup();
-	return code;
-}
-
-UnsignedInt ConnectionManager::getPacketRouterFallbackSlot(Int packetRouterNumber) {
-	if ((packetRouterNumber >= 0) && (packetRouterNumber < MAX_SLOTS)) {
-		return m_packetRouterFallback[packetRouterNumber];
-	}
-	return MAX_SLOTS;
-}
-
-UnsignedInt ConnectionManager::getPacketRouterSlot() {
-	return m_packetRouterSlot;
-}
-
-Bool ConnectionManager::areAllQueuesEmpty(void) {
-	Bool retval = TRUE;
-	for (Int i = 0; (i < MAX_SLOTS) && retval; ++i) {
-		if (m_connections[i] != NULL) {
-			if (m_connections[i]->isQueueEmpty() == FALSE) {
-				//DEBUG_LOG(("ConnectionManager::areAllQueuesEmpty() - m_connections[%d] is not empty\n", i));
-				//m_connections[i]->debugPrintCommands();
-				retval = FALSE;
-			}
-		}
-	}
-
-	return retval;
-}
-
-Bool ConnectionManager::canILeave() {
-	return areAllQueuesEmpty();
-}
-
-/**
- * The local player is leaving. Tell the local player as well as the other players
- * to remove this player at the specified frame.
- */
-void ConnectionManager::handleLocalPlayerLeaving(UnsignedInt frame) {
-	NetPlayerLeaveCommandMsg *msg = newInstance(NetPlayerLeaveCommandMsg);
-
-	msg->setLeavingPlayerID(m_localSlot);
-	msg->setExecutionFrame(frame);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-	msg->setPlayerID(m_localSlot);
-
-	DEBUG_LOG(("ConnectionManager::handleLocalPlayerLeaving - Local player leaving on frame %d\n", frame));
-	DEBUG_ASSERTCRASH(m_packetRouterSlot >= 0, ("ConnectionManager::handleLocalPlayerLeaving, packet router is %d, illegal value.", m_packetRouterSlot));
-
-	sendLocalCommand(msg);
-
-	msg->detach();
-}
-
-/**
- * We just got a message that needs to be ack'd, so ack it!
- */
-void ConnectionManager::ackCommand(NetCommandRef *ref, UnsignedInt localSlot) {
-	NetCommandMsg *msg = ref->getCommand();
-	NetCommandMsg *ackmsg;
-	UnsignedShort commandID;
-	UnsignedByte originalPlayerID;
-	UnsignedByte sendRelay = 0;
-
-	// Make send relay a bitmask for the connections that the relay will actually be sent to. This is
-	// necessary to determine whether or not we have to wait to send a stage 2 ack.
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE))) {
-			sendRelay = sendRelay | (1 << i);
-		}
-	}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	Bool doDebug = (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ? TRUE : FALSE;
-#endif
-
-	sendRelay = sendRelay & ref->getRelay();
-	if (sendRelay == 0) {
-		NetAckBothCommandMsg *bothmsg = newInstance(NetAckBothCommandMsg)(ref->getCommand());
-		ackmsg = bothmsg;
-		commandID = bothmsg->getCommandID();
-		originalPlayerID = bothmsg->getOriginalPlayerID();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		if (doDebug) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::ackCommand - doing ack both for command %d from player %d\n", bothmsg->getCommandID(), bothmsg->getOriginalPlayerID()));
-		}
-#endif
-	} else {
-		NetAckStage1CommandMsg *stage1msg = newInstance(NetAckStage1CommandMsg)(ref->getCommand());
-		ackmsg = stage1msg;
-		commandID = stage1msg->getCommandID();
-		originalPlayerID = stage1msg->getOriginalPlayerID();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		if (doDebug) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::ackCommand - doing ack stage 1 for command %d from player %d\n", stage1msg->getCommandID(), stage1msg->getOriginalPlayerID()));
-		}
-#endif
-	}
-
-	ackmsg->setPlayerID(localSlot); // Tell the player who this ack is coming from.
-
-	if (CommandRequiresDirectSend(msg) && CommandRequiresAck(msg)) {
-		// Send this ack directly back to the sending player, don't go through the packet router.
-		if ((msg->getPlayerID() >= 0) && (msg->getPlayerID() < MAX_SLOTS)) {
-			if (m_connections[msg->getPlayerID()] != NULL) {
-				m_connections[msg->getPlayerID()]->sendNetCommandMsg(ackmsg, 1 << msg->getPlayerID());
-			}
-		}
-	} else {
-		// The local connection may be the packet router, in that case, the connection would be NULL.  So do something about it!
-		if ((m_packetRouterSlot >= 0) && (m_packetRouterSlot < MAX_SLOTS)) {
-			if (m_connections[m_packetRouterSlot] != NULL) {
-//				DEBUG_LOG(("ConnectionManager::ackCommand - acking command %d from player %d to packet router.\n", commandID, m_packetRouterSlot));
-				m_connections[m_packetRouterSlot]->sendNetCommandMsg(ackmsg, 1 << m_packetRouterSlot);
-			} else if (m_localSlot == m_packetRouterSlot) {
-				// we are the packet router, send the ack to the player that sent the command.
-				if ((msg->getPlayerID() >= 0) && (msg->getPlayerID() < MAX_SLOTS)) {
-					if (m_connections[msg->getPlayerID()] != NULL) {
-//						DEBUG_LOG(("ConnectionManager::ackCommand - acking command %d from player %d directly to player.\n", commandID, msg->getPlayerID()));
-						m_connections[msg->getPlayerID()]->sendNetCommandMsg(ackmsg, 1 << msg->getPlayerID());
-					} else {
-	//					DEBUG_ASSERTCRASH(m_connections[msg->getPlayerID()] != NULL, ("Connection to player is NULL"));
-					}
-				} else {
-					DEBUG_ASSERTCRASH((msg->getPlayerID() >= 0) && (msg->getPlayerID() < MAX_SLOTS), ("Command sent by an invalid player ID."));
-				}
-			} else {
-				DEBUG_ASSERTCRASH(m_connections[m_packetRouterSlot] != NULL, ("Connection to packet router is NULL"));
-			}
-		} else {
-			DEBUG_ASSERTCRASH((m_packetRouterSlot >= 0) && (m_packetRouterSlot < MAX_SLOTS), ("I don't know who the packet router is."));
-		}
-	}
-
-	ackmsg->detach();
-}
-
-/**
- * This is where we relay a command from one client to others (including ourselves).
- * This should only be done by the current packet router.
- */
-void ConnectionManager::sendRemoteCommand(NetCommandRef *msg) {
-	UnsignedByte actualRelay = 0;
-	if (msg->getCommand() == NULL) {
-		return;
-	}
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - sending net command %d of type %s from player %d, relay is 0x%x\n",
-		msg->getCommand()->getID(), GetAsciiNetCommandType(msg->getCommand()->getNetCommandType()).str(), msg->getCommand()->getPlayerID(), msg->getRelay()));
-
-	UnsignedByte relay = msg->getRelay();
-	if ((relay & (1 << m_localSlot)) && (m_frameData[msg->getCommand()->getPlayerID()] != NULL)) {
-		if (IsCommandSynchronized(msg->getCommand()->getNetCommandType())) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - adding net command of type %s to player %d for frame %d\n", GetAsciiNetCommandType(msg->getCommand()->getNetCommandType()).str(), msg->getCommand()->getPlayerID(), msg->getCommand()->getExecutionFrame()));
-			m_frameData[msg->getCommand()->getPlayerID()]->addNetCommandMsg(msg->getCommand());
-		}
-	}
-
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if ((relay & (1 << i)) && ((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE))) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - relaying command %d to player %d\n", msg->getCommand()->getID(), i));
-			m_connections[i]->sendNetCommandMsg(msg->getCommand(), 1 << i);
-			actualRelay = actualRelay | (1 << i);
-		}
-	}
-
-	if ((actualRelay != 0) && (CommandRequiresAck(msg->getCommand()) == TRUE)) {
-		NetCommandRef *ref = m_relayedCommands->addMessage(msg->getCommand());
-		if (ref != NULL) {
-			ref->setRelay(actualRelay);
-			//DEBUG_LOG(("ConnectionManager::sendRemoteCommand - command %d added to relayed commands with relay %d\n", msg->getCommand()->getID(), ref->getRelay()));
-		}
-	}
-
-	// Do some metrics to find the minimum packet arrival cushion.
-	if (IsCommandSynchronized(msg->getCommand()->getNetCommandType())) {
-//		DEBUG_LOG(("ConnectionManager::sendRemoteCommand - about to call allCommandsReady\n"));
-		if (allCommandsReady(msg->getCommand()->getExecutionFrame(), TRUE)) {
-			UnsignedInt cushion = msg->getCommand()->getExecutionFrame() - TheGameLogic->getFrame();
-			if ((cushion < m_smallestPacketArrivalCushion) || (m_smallestPacketArrivalCushion == -1)) {
-				m_smallestPacketArrivalCushion = cushion;
-			}
-			m_frameMetrics.addCushion(cushion);
-//			DEBUG_LOG(("Adding %d to cushion for frame %d\n", cushion, msg->getCommand()->getExecutionFrame()));
-		}
-	}
-}
-
-/**
- * ConnectionManager::update
- * Update the connections. Tell them to do the receive and send.  Also relay
- * commands to their final destinations as necessary.
- */
-void ConnectionManager::update(Bool isInGame) {
-//
-// 1. do this
-// 2. do that
-// 3. do something else
-// 4. blow something up
-// 5. bust some cap
-//
-
-	if ((m_localAddr == 0) || (m_localPort == 0)) {
-		// we don't have a local address or port yet, this is bad.
-		DEBUG_ASSERTCRASH((m_localAddr != 0) && (m_localPort != 0), ("ConnectionManager doesn't have a local address."));
-		return;
-	}
-
-	m_transport->doRecv();
-
-	if (isInGame) {
-		m_disconnectManager->update(this);
-	}
-
-	// take the packets from the transport, break them up into commands, and give them to the appropriate connections.
-	doRelay();
-
-	// send any necessary keep-alive packets.
-	doKeepAlive();
-
-	for (Int i = 0; i < NUM_CONNECTIONS; ++i) {
-		if (m_connections[i] != NULL) {
-			/*
-			if (m_connections[i]->isQueueEmpty() == FALSE) {
-//				DEBUG_LOG(("ConnectionManager::update - calling doSend on connection %d\n", i));
-			}
-			*/
-
-			m_connections[i]->doSend();
-
-			if (m_connections[i]->isQuitting() && m_connections[i]->isQueueEmpty())
-			{
-				DEBUG_LOG(("ConnectionManager::update - deleting connection for slot %d\n", i));
-				deleteInstance(m_connections[i]);
-				m_connections[i] = NULL;
-			}
-		}
-
-		if ((m_frameData[i] != NULL) && (m_frameData[i]->getIsQuitting() == TRUE)) {
-			if (m_frameData[i]->getQuitFrame() == TheGameLogic->getFrame()) {
-				DEBUG_LOG(("ConnectionManager::update - deleting frame data for slot %d on quitting frame %d\n", i, m_frameData[i]->getQuitFrame()));
-				deleteInstance(m_frameData[i]);
-				m_frameData[i] = NULL;
-			}
-		}
-	}
-
-	m_transport->doSend();
-}
-
-void ConnectionManager::updateRunAhead(Int oldRunAhead, Int frameRate, Bool didSelfSlug, Int nextExecutionFrame) {
-	static time_t lasttimesent = 0;
-	time_t curTime = timeGetTime();
-
-	if ((lasttimesent == 0) || ((curTime - lasttimesent) > TheGlobalData->m_networkRunAheadMetricsTime)) {
-		if (m_localSlot == m_packetRouterSlot) {
-			// We are the packet router, time to compute a new run ahead for this game.
-			m_latencyAverages[m_localSlot] = m_frameMetrics.getAverageLatency();
-
-			// since we are now using the display frame rate rather than the logic frame rate to get our average FPS,
-			// it doesn't make sense to send the desired logic frame rate if we "slugged" ourself.
-//			if (didSelfSlug) {
-//				m_fpsAverages[m_localSlot] = frameRate;
-//			} else {
-				m_fpsAverages[m_localSlot] = m_frameMetrics.getAverageFPS();
-//			}
-			if (didSelfSlug) {
-				//DEBUG_LOG(("ConnectionManager::updateRunAhead - local player run ahead metrics, fps = %d, actual fps = %d, latency = %f, didSelfSlug = true\n", m_fpsAverages[m_localSlot], m_frameMetrics.getAverageFPS(), m_latencyAverages[m_localSlot]));
-			} else {
-				//DEBUG_LOG(("ConnectionManager::updateRunAhead - local player run ahead metrics, fps = %d, latency = %f, didSelfSlug = false\n", m_fpsAverages[m_localSlot], m_latencyAverages[m_localSlot]));
-			}
-			Int minFps;
-			Int minFpsPlayer;
-			getMinimumFps(minFps, minFpsPlayer);
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::updateRunAhead - max latency = %f, min fps = %d, min fps player = %d old FPS = %d\n", getMaximumLatency(), minFps, minFpsPlayer, frameRate));
-			if ((minFps >= ((frameRate * 9) / 10)) && (minFps < frameRate)) {
-				// if the minimum fps is within 10% of the desired framerate, then keep the current minimum fps.
-				minFps = frameRate;
-			}
-			if (minFps < 5) {
-				minFps = 5; // Absolutely do not run below 5 fps.
-			}
-			if (minFps > TheGlobalData->m_framesPerSecondLimit) {
-				minFps = TheGlobalData->m_framesPerSecondLimit; // Cap to 30 FPS.
-			}
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::updateRunAhead - minFps after adjustment is %d\n", minFps));
-			Int newRunAhead = (Int)((getMaximumLatency() / 2.0) * (Real)minFps);
-			newRunAhead += (newRunAhead * TheGlobalData->m_networkRunAheadSlack) / 100; // Add in 10% of slack to the run ahead in case of network hiccups.
-			if (newRunAhead < MIN_RUNAHEAD) {
-				newRunAhead = MIN_RUNAHEAD; // make sure its at least MIN_RUNAHEAD.
-			}
-
-			if (newRunAhead > (MAX_FRAMES_AHEAD / 2)) {
-				newRunAhead = MAX_FRAMES_AHEAD / 2; // dont let run ahead get out of hand.
-			}
-
-			NetRunAheadCommandMsg *msg = newInstance(NetRunAheadCommandMsg);
-			msg->setPlayerID(m_localSlot);
-			if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-				msg->setID(GenerateNextCommandID());
-			}
-
-			// needs to be set to the greater of getExecutionFrame and TheGameLogic->getFrame() + oldRunAhead
-			// This prevents the case of...
-			// run ahead starts at 30
-			// run ahead changes to 10 at frame 31 (the command was created on frame 1)
-			// run ahead changes to 10 at frame 56 (the command was created on frame 46)
-			// notice that 56 is within the previous run ahead of 30 which has triggered
-			// the frame command count being set for frames 1 through 60 since run ahead
-			// didn't change for the first time till frame 31.  This creates an extra command
-			// for frame 56 that isn't accounted for in the frame command count that is sent
-			// out in the NetFrameCommandMsg.  sheesh.
-			if (nextExecutionFrame > (TheGameLogic->getFrame() + oldRunAhead)) {
-				msg->setExecutionFrame(nextExecutionFrame);
-			} else {
-				msg->setExecutionFrame(TheGameLogic->getFrame() + oldRunAhead);
-			}
-
-			msg->setRunAhead(newRunAhead);
-			msg->setFrameRate(minFps);
-			//DEBUG_LOG(("ConnectionManager::updateRunAhead - new run ahead = %d, new frame rate = %d, execution frame %d\n", newRunAhead, minFps, msg->getExecutionFrame()));
-			sendLocalCommand(msg, 0xff ^ (1 << minFpsPlayer)); // Send the packet to everyone but the lowest FPS player.
-
-			NetRunAheadCommandMsg *msg2 = newInstance(NetRunAheadCommandMsg);
-			msg2->setPlayerID(m_localSlot);
-			if (DoesCommandRequireACommandID(msg2->getNetCommandType())) {
-				/*
-				 * Ok there needs to be a big friggin comment about this change...
-				 * What happens is that the two run ahead commands get sent to different players
-				 * using different command ID's.  So player 1 has the run ahead command as command x
-				 * and player 2 has the command as command x+1.  This is all good except when it comes
-				 * to players being disconnected.  With the new disconnect scheme player 1 could potentially
-				 * send his run ahead command to player 2 (or the other way around) to let player 2 catch
-				 * up to him.  So if player 2 has his run ahead command as x+1 and now he gets player 1's
-				 * command list with the run ahead command listed as command x, he won't see them as being
-				 * the same command and will now think he has two different run ahead commands for that frame
-				 * and thus his command list will have an extra command and he will never be able to recover.
-				 * So to fix this we have to use the same command ID for both run ahead commands.  That way
-				 * when the commands are copied places for the disconnect screen they will be seen as the
-				 * same command, and all will be good.
-				 */
-//				msg2->setID(GenerateNextCommandID());
-				msg2->setID(msg->getID());
-			}
-			if (nextExecutionFrame > (TheGameLogic->getFrame() + oldRunAhead)) {
-				msg2->setExecutionFrame(nextExecutionFrame);
-			} else {
-				msg2->setExecutionFrame(TheGameLogic->getFrame() + oldRunAhead);
-			}
-
-			// Let the player with the slowest FPS run a little faster than the other computers...
-			// just in case they are able to.  Then we might be able to run the game faster which would be good.
-			Int newMinFps = (minFps * 11) / 10;
-			if (newMinFps == minFps) {
-				newMinFps = minFps + 1;
-			}
-			if (newMinFps > 30) {
-				newMinFps = 30; // Cap FPS to 30.
-			}
-			msg2->setRunAhead(newRunAhead);
-			msg2->setFrameRate(newMinFps);
-
-			sendLocalCommand(msg2, 1 << minFpsPlayer);
-
-			msg->detach();
-			msg2->detach();
-		} else {
-			// We are not the packet router, send our metrics info to the packet router.
-			NetRunAheadMetricsCommandMsg *msg = newInstance(NetRunAheadMetricsCommandMsg);
-			msg->setPlayerID(m_localSlot);
-			if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-				msg->setID(GenerateNextCommandID());
-			}
-			msg->setAverageLatency(m_frameMetrics.getAverageLatency());
-
-			// see above for explanation.
-//			if (didSelfSlug) {
-//				msg->setAverageFps(frameRate);
-//			} else {
-				msg->setAverageFps(m_frameMetrics.getAverageFPS());
-//			}
-			if (didSelfSlug) {
-				//DEBUG_LOG(("ConnectionManager::updateRunAhead - average latency = %f, average fps = %d, actual fps = %d, didSelfSlug = true\n", m_frameMetrics.getAverageLatency(), m_frameMetrics.getAverageFPS(), m_frameMetrics.getAverageFPS()));
-			} else {
-				//DEBUG_LOG(("ConnectionManager::updateRunAhead - average latency = %f, average fps = %d, didSelfSlug = false\n", m_frameMetrics.getAverageLatency(), m_frameMetrics.getAverageFPS()));
-			}
-			m_connections[m_packetRouterSlot]->sendNetCommandMsg(msg, 1 << m_packetRouterSlot);
-			msg->detach();
-		}
-		lasttimesent = curTime;
-	}
-}
-
-Real ConnectionManager::getMaximumLatency() {
-	// This works for 2 player games because the latency for the packet router is always 0.
-	Real lat1 = 0.0;
-	Real lat2 = 0.0;
-
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (isPlayerConnected(i)) {
-			if (m_latencyAverages[i] != 0.0) {
-				if (m_latencyAverages[i] > lat1) {
-					lat2 = lat1;
-					lat1 = m_latencyAverages[i];
-				} else if (m_latencyAverages[i] > lat2) {
-					lat2 = m_latencyAverages[i];
-				}
-			}
-		}
-	}
-
-	return (lat1 + lat2);
-}
-
-void ConnectionManager::getMinimumFps(Int &minFps, Int &minFpsPlayer) {
-	minFps = -1;
-	minFpsPlayer = -1;
-//	DEBUG_LOG(("ConnectionManager::getMinimumFps -"));
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if ((m_connections[i] != NULL) || (i == m_localSlot)) {
-//			DEBUG_LOG((" %d: %d,", i, m_fpsAverages[i]));
-			if (m_fpsAverages[i] != -1) {
-				if ((minFps == -1) || (m_fpsAverages[i] < minFps)) {
-					minFps = m_fpsAverages[i];
-					minFpsPlayer = i;
-				}
-			}
-		}
-	}
-//	DEBUG_LOG(("\n"));
-}
-
-UnsignedInt ConnectionManager::getMinimumCushion() {
-	return m_frameMetrics.getMinimumCushion();
-}
-
-/**
- * The commands for the given frame are all ready, time to send out our command count for that frame.
- */
-void ConnectionManager::processFrameTick(UnsignedInt frame) {
-	if ((m_frameData[m_localSlot] == NULL) || (m_frameData[m_localSlot]->getIsQuitting() == TRUE)) {
-		// if the local frame data stuff is NULL, we must be leaving the game.
-		return;
-	}
-	UnsignedShort commandCount = m_frameData[m_localSlot]->getCommandCount(frame);
-	NetFrameCommandMsg *msg = newInstance(NetFrameCommandMsg);
-	msg->setExecutionFrame(frame);
-	msg->setCommandCount(commandCount);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-	msg->setPlayerID(m_localSlot);
-
-	m_frameMetrics.doPerFrameMetrics(frame);
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processFrameTick - sending frame info for frame %d, ID %d, command count %d\n", frame, msg->getID(), commandCount));
-
-	sendLocalCommand(msg, 0xff & ~(1 << m_localSlot));
-
-	msg->detach();
-}
-
-/**
- * Set the local address.
- */
-void ConnectionManager::setLocalAddress(UnsignedInt ip, UnsignedInt port) {
-	DEBUG_LOG(("ConnectionManager::setLocalAddress() - local address is %X:%d\n", ip, port));
-	m_localAddr = ip;
-	m_localPort = port;
-}
-
-/**
- * Initialize the transport object
- */
-void ConnectionManager::initTransport() {
-	DEBUG_ASSERTCRASH((m_transport == NULL), ("m_transport already exists when trying to init it."));
-	DEBUG_LOG(("ConnectionManager::initTransport - Initializing Transport\n"));
-	if (m_transport != NULL) {
-		delete m_transport;
-		m_transport = NULL;
-	}
-	m_transport = new Transport;
-	m_transport->reset();
-	m_transport->init(m_localAddr, m_localPort);
-}
-
-/**
- * This is where the commands from the local client are sent to the other clients in
- * the game.  This is also where the local commands are put into the frame data for
- * future execution.
- */
-void ConnectionManager::sendLocalGameMessage(GameMessage *msg, UnsignedInt frame) {
-	UnsignedShort currentID = 0;
-	if (DoesCommandRequireACommandID(NETCOMMANDTYPE_GAMECOMMAND)) {
-		currentID = GenerateNextCommandID();
-	}
-
-	NetCommandMsg *netmsg = newInstance(NetGameCommandMsg)(msg);
-	netmsg->setExecutionFrame(frame);
-	netmsg->setPlayerID(m_localSlot);
-	netmsg->setID(currentID);
-
-	sendLocalCommand(netmsg);
-
-	netmsg->detach();
-}
-
-/**
- * This is a NetCommandMsg that originated on the local computer. Send this to everyone specified
- * in the relay field.  Commands sent in this way go through the packet router.
- */
-void ConnectionManager::sendLocalCommand(NetCommandMsg *msg, UnsignedByte relay /* = 0xff by default*/) {
-	if (CommandRequiresDirectSend(msg) || (m_packetRouterSlot < 0) || (m_packetRouterSlot >= MAX_SLOTS) || (m_connections[m_packetRouterSlot] == NULL)) {
-		sendLocalCommandDirect(msg, relay);
-		return;
-	}
-	msg->attach();
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommand - sending net command %d of type %s\n", msg->getID(),
-		GetAsciiNetCommandType(msg->getNetCommandType()).str()));
-
-	if (relay & (1 << m_localSlot)) {
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommand - adding net command of type %s to player %d for frame %d\n", GetAsciiNetCommandType(msg->getNetCommandType()).str(), msg->getPlayerID(), msg->getExecutionFrame()));
-		m_frameData[m_localSlot]->addNetCommandMsg(msg);
-	}
-
-	// Send the packet to everyone else
-	if (m_localSlot == m_packetRouterSlot) {
-		// I am the packet router, I need to send this packet to everyone individually.
-		for (Int i = 0; i < MAX_SLOTS; ++i) {
-			// Send it to all open connections.
-			if (((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE)) && (relay & (1 << i))) {
-				// Set the relay mask to only go to this player so he knows not to relay it to anyone else.
-				UnsignedByte temprelay = 1 << i;
-				m_connections[i]->sendNetCommandMsg(msg, temprelay); // This will create a new copy of netmsg for this connection.
-			}
-		}
-	} else {
-		// Send the command to everyone else via the packet router.
-		UnsignedByte temprelay = relay & ~(1 << m_localSlot);	// Tell the packet router to relay the message to everyone but myself.
-														// Hopefully the packet router is smart enough to not send it
-														// to slots that are not in the game.
-
-		m_connections[m_packetRouterSlot]->sendNetCommandMsg(msg, temprelay); // This will create a new copy of netmsg for this connection.
-
-		if (CommandRequiresAck(msg)) {
-			NetCommandRef *ref = m_pendingCommands->addMessage(msg);
-			//DEBUG_LOG(("ConnectionManager::sendLocalCommand - added command %d to pending commands list.\n", msg->getID()));
-			if (ref != NULL) {
-				ref->setRelay(temprelay);
-			}
-		}
-	}
-
-	msg->detach(); // detach from the command msg.
-}
-
-/**
- * This is a NetCommandMsg that originated on the local computer.  Send this to everyone specified
- * in the relay field.  Commands sent in this way do not go through the packet router.
- */
-void ConnectionManager::sendLocalCommandDirect(NetCommandMsg *msg, UnsignedByte relay) {
-	msg->attach();
-
-	if (((relay & (1 << m_localSlot)) != 0) && (m_frameData[m_localSlot] != NULL)) {
-		if (IsCommandSynchronized(msg->getNetCommandType()) == TRUE) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - adding net command of type %s to player %d for frame %d\n", GetAsciiNetCommandType(msg->getNetCommandType()).str(), msg->getPlayerID(), msg->getExecutionFrame()));
-			m_frameData[m_localSlot]->addNetCommandMsg(msg);
-		}
-	}
-
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if ((relay & (1 << i)) != 0) {
-			if ((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE)) {
-				UnsignedByte temprelay = 1 << i;
-				m_connections[i]->sendNetCommandMsg(msg, temprelay);
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - Sending direct command %d of type %s to player %d\n", msg->getID(), GetAsciiNetCommandType(msg->getNetCommandType()).str(), i));
-			}
-		}
-	}
-
-	msg->detach();
-}
-
-Int commandsReadyDebugSpewage = 0;
-
-/**
- * Returns true if all the commands for the given frame are ready to be executed.
- */
-Bool ConnectionManager::allCommandsReady(UnsignedInt frame, Bool justTesting /* = FALSE */) {
-	Bool retval = TRUE;
-	FrameDataReturnType frameRetVal = FRAMEDATA_NOTREADY;
-//	retval = FALSE;  // ****for testing purposes only!!!!!!****
-	Int i = 0;
-	for (; (i < MAX_SLOTS) && retval; ++i) {
-		if ((m_frameData[i] != NULL) && (m_frameData[i]->getIsQuitting() == FALSE)) {
-/*
-			if (!(m_frameData[i]->allCommandsReady(frame, (frame != commandsReadyDebugSpewage) && (justTesting == FALSE)))) {
-				if ((frame != commandsReadyDebugSpewage) && (justTesting == FALSE)) {
-					DEBUG_LOG(("ConnectionManager::allCommandsReady, frame %d player %d not ready.\n", frame, i));
-					commandsReadyDebugSpewage = frame;
-				}
-				retval = FALSE;
-			} else {
-//				DEBUG_LOG(("ConnectionManager::allCommandsReady, frame %d player %d is ready.\n", frame, i));
-			}
-*/
-
-			frameRetVal = m_frameData[i]->allCommandsReady(frame, (frame != commandsReadyDebugSpewage) && (justTesting == FALSE));
-			if (frameRetVal == FRAMEDATA_NOTREADY) {
-				retval = FALSE;
-			} else if (frameRetVal == FRAMEDATA_RESEND) {
-				requestFrameDataResend(i, frame);
-				retval = FALSE;
-			}
-		}
-	}
-
-	if (frameRetVal == FRAMEDATA_RESEND) {
-		// this frame's data is really screwed up, we need to clean it out so it can be resent to us.
-		for (i = 0; i < MAX_SLOTS; ++i) {
-			if ((m_frameData[i] != NULL) && (i != m_localSlot)) {
-				m_frameData[i]->resetFrame(frame, FALSE);
-			}
-		}
-	}
-
-	if ((retval == TRUE) && (justTesting == FALSE)) {
-		m_disconnectManager->allCommandsReady(TheGameLogic->getFrame(), this);
-		retval = m_disconnectManager->allowedToContinue(); // allow the disconnect manager to keep us on this frame
-																											// in case we are waiting for a new packet router or something.
-	}
-
-	return retval;
-}
-
-void ConnectionManager::handleAllCommandsReady(void)
-{
-	m_disconnectManager->allCommandsReady(TheGameLogic->getFrame(), this, FALSE);
-}
-
-
-/**
- * Only call this after making sure that all the commands are there for this frame.
- * After calling this the commands for this frame will be removed from the connection.
- *
- * BGC - To account for the case where the host disconnects without sending the
- *       same commands to all players, we now have to keep around the last 'run ahead'
- *       frames so we can potentially send those commands to the other players in the
- *       game so they can catch up.
- */
-NetCommandList *ConnectionManager::getFrameCommandList(UnsignedInt frame) 
-{
-	NetCommandList *retlist = newInstance(NetCommandList);
-	retlist->init();
-
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_frameData[i] != NULL) {
-			retlist->appendList(m_frameData[i]->getFrameCommandList(frame));
-			if (frame > FRAMES_TO_KEEP) {
-				m_frameData[i]->resetFrame(frame - FRAMES_TO_KEEP);	// After getting the commands for that frame from this
-													// FrameDataManager object, we need to tell it that we're
-													// done with the messages for that frame.
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("getFrameCommandList - called reset frame on player %d for frame %d\n", i, frame - FRAMES_TO_KEEP));
-			}
-		}
-	}
-
-	return retlist; // retlist deallocated by calling function.
-}
-
-void ConnectionManager::setFrameGrouping(time_t frameGrouping) {
-	// Since we are the packet router, we should send more packets per second since we
-	// may become the latency bottleneck for sending packets from one player to the next.
-	// This is probably ok since the packet router should have the fastest connection of all
-	// the players in the game.
-	if (m_localSlot == m_packetRouterSlot) {
-		frameGrouping = frameGrouping / 2;
-	}
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_connections[i] != NULL) {
-			m_connections[i]->setFrameGrouping(frameGrouping);
-		}
-	}
-}
-
-/*
-void ConnectionManager::determineRouterFallbackPlan() {
-	memset(m_packetRouterFallback, 0, sizeof(m_packetRouterFallback));
-	Int curnum = 1;
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_connections[i] != NULL) {
-			m_packetRouterFallback[i] = curnum;
-			if (curnum == 1) {
-				m_packetRouterSlot = i;
-			}
-			++curnum;
-		}
-	}
-}
-*/
-
-void ConnectionManager::doKeepAlive() {
-	static Int nextIndex = 0;
-	static time_t startTime = 0;
-
-	time_t curTime = timeGetTime();
-
-	if (startTime == 0) {
-		startTime = curTime;
-		return;
-	}
-
-	time_t numSeconds = (curTime - startTime) / 1000;
-
-	while ((nextIndex <= numSeconds) && (nextIndex < MAX_SLOTS)) {
-//		DEBUG_LOG(("ConnectionManager::doKeepAlive - trying to send keep alive message to player %d\n", nextIndex));
-		if (m_connections[nextIndex] != NULL) {
-			NetKeepAliveCommandMsg *msg = newInstance(NetKeepAliveCommandMsg);
-			msg->setPlayerID(m_localSlot);
-			if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
-				msg->setID(GenerateNextCommandID());
-			}
-//			DEBUG_LOG(("ConnectionManager::doKeepAlive - sending keep alive message to player %d\n", nextIndex));
-			sendLocalCommandDirect(msg, 1 << nextIndex);
-			msg->detach();
-		}
-		++nextIndex;
-	}
-	if (nextIndex == MAX_SLOTS) {
-		nextIndex = 0;
-		startTime = curTime;
-	}
-}
-
-PlayerLeaveCode ConnectionManager::disconnectPlayer(Int slot) {
-	// Need to do the deletion of the slot's connection and frame data here.
-	PlayerLeaveCode retval = PLAYERLEAVECODE_CLIENT;
-	DEBUG_LOG(("ConnectionManager::disconnectPlayer - disconnecting slot %d on frame %d\n", slot, TheGameLogic->getFrame()));
-
-	if ((slot < 0) || (slot >= MAX_SLOTS)) {
-		return PLAYERLEAVECODE_UNKNOWN;
-	}
-
-	if (TheGameInfo)
-	{
-		GameSlot *gSlot = TheGameInfo->getSlot( slot );
-		if (gSlot && !gSlot->lastFrameInGame())
-		{
-			DEBUG_LOG(("ConnectionManager::disconnectPlayer(%d) - slot is last in the game on frame %d\n",
-				slot, TheGameLogic->getFrame()));
-			gSlot->setLastFrameInGame(TheGameLogic->getFrame());
-		}
-	}
-
-	UnicodeString unicodeName;
-	unicodeName = getPlayerName(slot);
-	if (unicodeName.getLength() > 0 && m_connections[slot]) {
-		TheInGameUI->message("Network:PlayerLeftGame", unicodeName.str());
-
-		// People are boneheads. Also play a sound
-		static AudioEventRTS leftGameSound("GUIMessageReceived");
-		TheAudio->addAudioEvent(&leftGameSound);
-	}
-
-	if ((m_frameData[slot] != NULL) && (m_frameData[slot]->getIsQuitting() == FALSE)) {
-		DEBUG_LOG(("ConnectionManager::disconnectPlayer - deleting player %d frame data\n", slot));
-		deleteInstance(m_frameData[slot]);
-		m_frameData[slot] = NULL;
-	}
-
-	if (m_connections[slot] != NULL && !m_connections[slot]->isQuitting()) {
-		DEBUG_LOG(("ConnectionManager::disconnectPlayer - deleting player %d connection\n", slot));
-		deleteInstance(m_connections[slot]);
-		m_connections[slot] = NULL;
-	}
-
-//	if (playerID == m_localSlot) {
-//		TheMessageStream->appendMessage(GameMessage::MSG_CLEAR_GAME_DATA);
-//	}
-
-	if (slot == m_packetRouterSlot) {
-		Int index = 0;
-		while ((index < (MAX_SLOTS-1)) && (m_packetRouterFallback[index] != m_packetRouterSlot)) {
-			++index;
-		}
-		++index;
-		m_packetRouterSlot = m_packetRouterFallback[index];
-		DEBUG_LOG(("Packet router left.  New packet router is slot %d\n", m_packetRouterSlot));
-		retval = PLAYERLEAVECODE_PACKETROUTER;
-	}
-	if (m_localSlot == slot) {
-		DEBUG_LOG(("Disconnecting self\n"));
-		retval = PLAYERLEAVECODE_LOCAL;
-	}
-
-	// Take the player out of the fallback plan
-	Int fallbackindex = 0;
-	while ((fallbackindex < MAX_SLOTS) && (m_packetRouterFallback[fallbackindex] != slot)) {
-		++fallbackindex;
-	}
-
-	for (Int i = fallbackindex; i < MAX_SLOTS-1; ++i) {
-		m_packetRouterFallback[i] = m_packetRouterFallback[i+1];
-	}
-	m_packetRouterFallback[MAX_SLOTS-1] = -1;
-
-	return retval;
-}
-
-void ConnectionManager::quitGame() {
-	// Need to do the NetDisconnectPlayerCommandMsg creation and sending here.
-	NetDisconnectPlayerCommandMsg *disconnectMsg = newInstance(NetDisconnectPlayerCommandMsg);
-	disconnectMsg->setDisconnectSlot(m_localSlot);
-	disconnectMsg->setPlayerID(m_localSlot);
-	if (DoesCommandRequireACommandID(disconnectMsg->getNetCommandType())) {
-		disconnectMsg->setID(GenerateNextCommandID());
-	}
-	//DEBUG_LOG(("ConnectionManager::disconnectLocalPlayer - about to send disconnect command\n"));
-	sendLocalCommandDirect(disconnectMsg, 0xff ^ (1 << m_localSlot));
-
-	//DEBUG_LOG(("ConnectionManager::disconnectLocalPlayer - about to flush connections\n"));
-	flushConnections(); // need to do this so our packet actually gets sent before the connections are deleted.
-	//DEBUG_LOG(("ConnectionManager::disconnectLocalPlayer - done flushing connections\n"));
-
-	disconnectMsg->detach();
-
-	// if we get here, we hit Quit on the disconnect screen.  Mark everyone as having disconnected from us
-	// so the online stats can give us appropriate feedback.
-	if (TheGameInfo)
-	{
-		for (Int i = 0; i < MAX_SLOTS; ++i)
-		{
-			GameSlot *gSlot = TheGameInfo->getSlot( i );
-			if (gSlot && !gSlot->lastFrameInGame())
-			{
-				gSlot->markAsDisconnected();
-			}
-		}
-	}
-
-	disconnectLocalPlayer();
-}
-
-void ConnectionManager::disconnectLocalPlayer() {
-	// kill the frame data and the connections for all the other players.
-	DEBUG_LOG(("ConnectionManager::disconnectLocalPlayer()\n"));
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (i != m_localSlot) {
-			disconnectPlayer(i);
-		}
-	}
-}
-
-/**
- * Takes all the commands that are ready to send and sends them right now.
- */
-void ConnectionManager::flushConnections() {
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_connections[i] != NULL) {
-//			DEBUG_LOG(("ConnectionManager::flushConnections - flushing connection to player %d\n", i));
-			/*
-			if (m_connections[i]->isQueueEmpty()) {
-//				DEBUG_LOG(("ConnectionManager::flushConnections - connection queue empty\n"));
-			}
-			*/
-			m_connections[i]->doSend();
-		}
-	}
-
-	if (m_transport != NULL) {
-		m_transport->doSend();
-	}
-}
-
-void ConnectionManager::resendPendingCommands() {
-	//DEBUG_LOG(("ConnectionManager::resendPendingCommands()\n"));
-	if (m_pendingCommands == NULL) {
-		return;
-	}
-
-	NetCommandRef *ref = m_pendingCommands->getFirstMessage();
-	while (ref != NULL) {
-		//DEBUG_LOG(("ConnectionManager::resendPendingCommands - resending command %d\n", ref->getCommand()->getID()));
-		sendLocalCommand(ref->getCommand(), ref->getRelay());
-		ref = ref->getNext();
-	}
-}
-
-UnsignedInt ConnectionManager::getLocalPlayerID() {
-	return m_localSlot;
-}
-
-UnicodeString ConnectionManager::getPlayerName(Int playerNum) {
-	UnicodeString retval;
-	if( playerNum == m_localSlot ) {
-		retval = m_localUser->GetName();
-	}	else if (((m_connections[playerNum] != NULL) && (m_connections[playerNum]->isQuitting() == FALSE))) {
-		retval = m_connections[playerNum]->getUser()->GetName();
-	}
-	return retval;
-}
-
-/**
- * Take a user list and make connections and frame data manager objects for each of the players.
- * For now, this is also how we'll determine the packet router fallback plan.
- */
-void ConnectionManager::parseUserList(const GameInfo *game)
-{
-	if (!game)
-		return;
-
-	Int i;
-	Int numUsers = 0;
-	m_localSlot = -1;
-	DEBUG_LOG(("Local slot is %d\n", game->getLocalSlotNum()));
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = game->getConstSlot(i);	// badness, but since we cast right back to const, we should be ok
-		if (slot->isHuman())
-		{
-			if (game->getLocalSlotNum() == i)
-			{
-				m_localSlot = i;
-   			m_localUser->setName(slot->getName());
-			}
-
-			if (m_localSlot != i)
-			{
-				m_connections[i] = newInstance(Connection)();
-				m_connections[i]->init();
-				m_connections[i]->attachTransport(m_transport);
-//				UnsignedShort port = (TheNAT)?TheNAT->getSlotPort(i):8088;
-				UnsignedShort port = slot->getPort();
-				m_connections[i]->setUser(newInstance(User)(slot->getName(), slot->getIP(), port));
-				m_frameData[i] = newInstance(FrameDataManager)(FALSE);
-				DEBUG_LOG(("Remote user is at %X:%d\n", slot->getIP(), slot->getPort()));
-			}
-			else
-			{
-				DEBUG_LOG(("Local user is %d (%X:%d)\n", m_localSlot, slot->getIP(), slot->getPort()));
-				m_frameData[i] = newInstance(FrameDataManager)(TRUE);
-			}
-			m_frameData[i]->init();
-			m_frameData[i]->reset();
-
-			m_packetRouterFallback[numUsers] = i;
-
-			++numUsers;
-
-		}
-	}
-#ifdef MEMORYPOOL_DEBUG
-	TheMemoryPoolFactory->debugSetInitFillerIndex(m_localSlot);
-#endif
-
-	/*
-	if ( numUsers < 2 || m_localSlot == -1 )
-	{
-		DEBUG_CRASH(("FAILED parseUserList - network game won't work as expected\n"));
-		return;
-	}
-
-	char * list = strdup(buf);
-	char *listPtr = list;
-	if (!list)
-		return;
-
-	User users[MAX_SLOTS];
-	int localUser = -1;
-	int i;
-
-	for (i=0; i<MAX_SLOTS; i++)
-	{
-		users[i].setName("");
-	}
-
-	char *userStr, *nameStr, *addrStr, *portStr;
-	AsciiString addrAsciiStr;
-
-	char *listPos;
-
-	DEBUG_LOG(("ConnectionManager::parseUserList - looking for local user at %d.%d.%d.%d:%d\n",
-		PRINTF_IP_AS_4_INTS(m_localAddr),
-		m_localPort));
-
-	int numUsers = 0;
-	while ( (userStr=strtok_r(listPtr, ",", &listPos)) != NULL )
-	{
-		listPtr = NULL;
-		char *pos = NULL;
-
-		nameStr = strtok_r(userStr, "@", &pos);
-		addrStr = strtok_r(NULL, "@:", &pos);
-		portStr = strtok_r(NULL, ": ", &pos);
-
-		if (!portStr || numUsers >= MAX_SLOTS)
-		{
-			DEBUG_LOG(("ConnectionManager::parseUserList - (numUsers = %d) FAILED parseUserList with list [%s]\n", numUsers, buf));
-			return;
-		}
-
-		addrAsciiStr = addrStr;
-		UnsignedInt addr = ResolveIP(addrAsciiStr);
-		UnsignedInt port = atoi(portStr);
-
-//		if ((m_localAddr != addr) || (m_localPort != port)) {
-		if (loginName.compare(nameStr) != 0) {
-			m_connections[numUsers] = newInstance(Connection)();
-			m_connections[numUsers]->init();
-			m_connections[numUsers]->attachTransport(m_transport);
-			m_connections[numUsers]->setUser(newInstance(User)(nameStr, addr, port));
-
-			m_frameData[numUsers] = newInstance(FrameDataManager)(FALSE);
-
-			DEBUG_LOG(("ConnectionManager::parseUserList - User %d is %s\n", numUsers, nameStr));
-		} else {
-			m_localSlot = numUsers;
-			m_localUser.setName(nameStr);
-
-			DEBUG_LOG(("ConnectionManager::parseUserList - User %d is %s\n", numUsers, nameStr));
-			DEBUG_LOG(("Local user is %d\n", m_localSlot));
-
-			m_frameData[numUsers] = newInstance(FrameDataManager)(TRUE);
-		}
-		m_frameData[numUsers]->init();
-		m_frameData[numUsers]->reset();
-
-		m_packetRouterFallback[numUsers] = numUsers;
-
-		numUsers++;
-	}
-
-	if (numUsers < 2 || m_localSlot == -1)
-	{
-		DEBUG_LOG(("ConnectionManager::parseUserList - FAILED (local user = %d, num players = %d) with list [%s]\n", m_localSlot, numUsers, buf));
-		return;
-	}
-
-	if (list != NULL) {
-		free(list); // from the strdup above.
-		list = NULL;
-	}
-	*/
-}
-
-/**
- * Return the number of incoming bytes per second averaged over 30 sec.
- */
-Real ConnectionManager::getIncomingBytesPerSecond( void )
-{
-	if (m_transport)
-		return m_transport->getIncomingBytesPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * Return the number of incoming packets per second averaged over the last 30 sec.
- */
-Real ConnectionManager::getIncomingPacketsPerSecond( void )
-{
-	if (m_transport)
-		return m_transport->getIncomingPacketsPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * Return the number of outgoing bytes per second averaged over the last 30 sec.
- */
-Real ConnectionManager::getOutgoingBytesPerSecond( void )
-{
-	if (m_transport)
-		return m_transport->getOutgoingBytesPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * Return the number of outgoing packets per second averaged over the last 30 sec.
- */
-Real ConnectionManager::getOutgoingPacketsPerSecond( void )
-{
-	if (m_transport) {
-		return m_transport->getOutgoingPacketsPerSecond();
-	} else {
-	  return 0.0;
-	}
-}
-
-/**
- * Return the number of bytes not from generals clients received per second averaged over the last 30 sec.
- */
-Real ConnectionManager::getUnknownBytesPerSecond( void )
-{
-	if (m_transport)
-		return m_transport->getUnknownBytesPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * Return the number ov packets not from generals clients received per second averaged over the last 30 sec.
- */
-Real ConnectionManager::getUnknownPacketsPerSecond( void )
-{
-	if (m_transport)
-		return m_transport->getUnknownPacketsPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * Return the smallest packet arrival cushion since this was last called.
- */
-UnsignedInt ConnectionManager::getPacketArrivalCushion() {
-	UnsignedInt retval = m_smallestPacketArrivalCushion;
-	m_smallestPacketArrivalCushion = -1;
-	return retval;
-}
-
-void ConnectionManager::sendChat(UnicodeString text, Int playerMask, UnsignedInt executionFrame)
-{
-	NetChatCommandMsg *msg = newInstance(NetChatCommandMsg);
-	msg->setText(text);
-	msg->setPlayerMask(playerMask);
-	msg->setPlayerID(m_localSlot);
-	msg->setID(0);
-	msg->setExecutionFrame(executionFrame);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType()))
-	{
-		msg->setID(GenerateNextCommandID());
-	}
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Chat message has ID of %d, mask of %8.8X, text of %ls\n", msg->getID(), msg->getPlayerMask(), msg->getText().str()));
-
-	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
-	processChat(msg);
-
-	msg->detach();
-}
-
-void ConnectionManager::sendDisconnectChat(UnicodeString text) {
-	NetDisconnectChatCommandMsg *msg = newInstance(NetDisconnectChatCommandMsg);
-	msg->setPlayerID(m_localSlot);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-	msg->setText(text);
-
-	sendLocalCommandDirect(msg, 0xff ^ (1 << m_localSlot));
-	processDisconnectChat(msg);
-}
-
-UnsignedShort ConnectionManager::sendFileAnnounce(AsciiString path, UnsignedByte playerMask)
-{
-	File *theFile = TheLocalFileSystem->openFile(path.str());
-	if (!theFile || !theFile->size())
-	{
-		UnicodeString log;
-		log.format(L"Not sending file '%hs' to %X\n", path.str(), playerMask);
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("%ls\n", log.str()));
-		if (TheLAN)
-			TheLAN->OnChat(UnicodeString(L"sendFile"), 0, log, LANAPI::LANCHAT_SYSTEM);
-		return 0;
-	}
-
-	theFile->close();
-
-	Int announceMask = 0xff ^ (1 << m_localSlot);
-	NetFileAnnounceCommandMsg *announceMsg = newInstance(NetFileAnnounceCommandMsg);
-	announceMsg->setPlayerID(m_localSlot);
-	if (DoesCommandRequireACommandID(announceMsg->getNetCommandType()) == TRUE) {
-		announceMsg->setID(GenerateNextCommandID());
-	}
-	announceMsg->setRealFilename(path);
-	announceMsg->setPlayerMask(playerMask);
-	UnsignedShort fileID = GenerateNextCommandID();
-	announceMsg->setFileID(fileID);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFileAnnounce() - creating announce message with ID of %d from %d to mask %X for '%s' going to %X as command %d\n",
-		announceMsg->getID(), announceMsg->getPlayerID(), announceMask, announceMsg->getRealFilename().str(),
-		announceMsg->getPlayerMask(), announceMsg->getFileID()));
-
-	processFileAnnounce(announceMsg); // set up things for the host
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Sending file announce to %X\n", announceMask));
-	sendLocalCommand(announceMsg, announceMask);
-	announceMsg->detach();
-
-	return fileID;
-}
-
-void ConnectionManager::sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID)
-{
-	File *theFile = TheLocalFileSystem->openFile(path.str());
-	if (!theFile || !theFile->size())
-	{
-		UnicodeString log;
-		log.format(L"Not sending file '%hs' to %X\n", path.str(), playerMask);
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("%ls\n", log.str()));
-		if (TheLAN)
-			TheLAN->OnChat(UnicodeString(L"sendFile"), 0, log, LANAPI::LANCHAT_SYSTEM);
-		return;
-	}
-
-	Int len = theFile->size();
-	char *buf = theFile->readEntireAndClose();
-
-	// compress Targas
-#ifdef COMPRESS_TARGAS
-	char *compressedBuf = NULL;
-	Int compressedLen = path.endsWith(".tga")?CompressionManager::getMaxCompressedSize(len, CompressionManager::getPreferredCompression()):0;
-	Int compressedSize = 0;
-	if (compressedLen)
-		compressedSize = CompressionManager::compressData(CompressionManager::getPreferredCompression(),
-		buf, len, compressedBuf, compressedLen);
-
-	if (compressedBuf && !compressedSize)
-	{
-		delete[] compressedBuf;
-		compressedBuf = NULL;
-	}
-#endif // COMPRESS_TARGAS
-
-	NetFileCommandMsg *fileMsg = newInstance(NetFileCommandMsg);
-	fileMsg->setPlayerID(m_localSlot);
-	fileMsg->setID(commandID);
-	fileMsg->setRealFilename(path);
-#ifdef COMPRESS_TARGAS
-	if (compressedBuf)
-	{
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Compressed '%s' from %d to %d (%g%%) before transfer\n", path.str(), len, compressedSize,
-			(Real)compressedSize/(Real)len*100.0f));
-		fileMsg->setFileData((unsigned char *)compressedBuf, compressedSize);
-	}
-	else
-#endif // COMPRESS_TARGAS
-	{
-		fileMsg->setFileData((unsigned char *)buf, len);
-	}
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFile() - creating file message with ID of %d for '%s' going to %X from %d, size of %d\n",
-		fileMsg->getID(), fileMsg->getRealFilename().str(), playerMask, fileMsg->getPlayerID(), fileMsg->getFileLength()));
-
-	delete[] buf;
-	buf = NULL;
-#ifdef COMPRESS_TARGAS
-	if (compressedBuf)
-	{
-		delete[] compressedBuf;
-		compressedBuf = NULL;
-	}
-#endif // COMPRESS_TARGAS
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Sending file: '%s', len %d, to %X\n", path.str(), len, playerMask));
-
-	sendLocalCommand(fileMsg, playerMask);
-
-	fileMsg->detach();
-}
-
-Int ConnectionManager::getFileTransferProgress(Int playerID, AsciiString path)
-{
-	FileCommandMap::iterator commandIt = s_fileCommandMap.begin();
-	while (commandIt != s_fileCommandMap.end())
-	{
-		//DEBUG_LOG(("ConnectionManager::getFileTransferProgress(%s): looking at existing transfer of '%s'\n",
-		//	path.str(), commandIt->second.str()));
-		if (commandIt->second == path)
-		{
-			return s_fileProgressMap[playerID][commandIt->first];
-		}
-		++commandIt;
-	}
-	//DEBUG_LOG(("Falling back to 0, since we couldn't find the map\n"));
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::getFileTransferProgress: path %s not found\n",path.str()));
-	return 0;
-}
-
-
-void ConnectionManager::voteForPlayerDisconnect(Int slot) {
-	if (m_disconnectManager != NULL) {
-		m_disconnectManager->voteForPlayerDisconnect(slot, this);
-	}
-}
-
-Int ConnectionManager::getNumPlayers()
-{
-	Int retval = 0;
-	for (Int i = 0; i < MAX_SLOTS; ++i)
-	{
-		if (isPlayerConnected(i)) {
-			++retval;
-		}
-	}
-
-	return retval;
-}
-
-void ConnectionManager::updateLoadProgress( Int progress )
-{
-	NetProgressCommandMsg *msg = newInstance(NetProgressCommandMsg);
-	msg->setPercentage( progress );
-	msg->setPlayerID( m_localSlot );
-	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
-		msg->setID(GenerateNextCommandID());
-	}
-	processProgress(msg);
-	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
-
-	msg->detach();
-}
-
-void ConnectionManager::loadProgressComplete()
-{
-	NetCommandMsg *msg = newInstance(NetCommandMsg);
-	msg->setPlayerID( m_localSlot );
-	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
-		msg->setID(GenerateNextCommandID());
-	}
-	msg->setNetCommandType(NETCOMMANDTYPE_LOADCOMPLETE);
-	processLoadComplete(msg);
-	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
-
-	msg->detach();
-}
-
-void ConnectionManager::sendTimeOutGameStart()
-{
-	NetCommandMsg *msg = newInstance(NetCommandMsg);
-	msg->setPlayerID( m_localSlot );
-	msg->setNetCommandType(NETCOMMANDTYPE_TIMEOUTSTART);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
-		msg->setID(GenerateNextCommandID());
-	}
-	processTimeOutGameStart(msg);
-	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
-
-	msg->detach();
-}
-
-Bool ConnectionManager::isPacketRouter( void )
-{
-	return m_localSlot == m_packetRouterSlot;
-}
-
-Int ConnectionManager::getAverageFPS( void )
-{
-	return m_frameMetrics.getAverageFPS();
-}
-
-Int ConnectionManager::getSlotAverageFPS(Int slot) {
-	if ((slot < 0) || (slot >= MAX_SLOTS)) {
-		return -1;
-	}
-	if ((m_packetRouterSlot != m_localSlot) && (slot == m_localSlot)) {
-		// our framerate data isn't valid for other players unless we are the
-		// packet router, so don't fake someone out.
-		return -1;
-	}
-	return m_fpsAverages[slot];
-}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-void ConnectionManager::debugPrintConnectionCommands() {
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::debugPrintConnectionCommands - begin commands\n"));
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_connections[i] != NULL) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::debugPrintConnectionCommands - commands for connection %d\n", i));
-			m_connections[i]->debugPrintCommands();
-		}
-	}
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::debugPrintConnectionCommands - end commands\n"));
-}
-#endif
-
-void ConnectionManager::notifyOthersOfCurrentFrame(Int frame) {
-	NetDisconnectFrameCommandMsg *msg = newInstance(NetDisconnectFrameCommandMsg);
-
-	msg->setPlayerID(m_localSlot);
-	msg->setDisconnectFrame(frame);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::notifyOthersOfCurrentFrame - sending disconnect frame of %d, command ID = %d\n", frame, msg->getID()));
-	sendLocalCommandDirect(msg, 0xff ^ (1 << m_localSlot));
-	NetCommandRef *ref = NEW_NETCOMMANDREF(msg);
-	ref->setRelay(1 << m_localSlot);
-	m_disconnectManager->processDisconnectCommand(ref, this);
-	deleteInstance(ref);
-
-	msg->detach();
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::notifyOthersOfCurrentFrame - start screen on debug stuff\n"));
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	debugPrintConnectionCommands();
-#endif
-}
-
-void ConnectionManager::notifyOthersOfNewFrame(UnsignedInt frame) {
-	NetDisconnectScreenOffCommandMsg *msg = newInstance(NetDisconnectScreenOffCommandMsg);
-
-	msg->setPlayerID(m_localSlot);
-	msg->setNewFrame(frame);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-
-	sendLocalCommandDirect(msg, 0xff ^ (1 << m_localSlot));
-	NetCommandRef *ref = NEW_NETCOMMANDREF(msg);
-	ref->setRelay(1 << m_localSlot);
-	m_disconnectManager->processDisconnectCommand(ref, this);
-	deleteInstance(ref);
-
-	msg->detach();
-}
-
-void ConnectionManager::sendFrameDataToPlayer(UnsignedInt playerID, UnsignedInt startingFrame) {
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - sending frame data to player %d starting with frame %d\n", playerID, startingFrame));
-	for (UnsignedInt frame = startingFrame; frame < TheGameLogic->getFrame(); ++frame) {
-		sendSingleFrameToPlayer(playerID, frame);
-	}
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - done sending commands to player %d\n", playerID));
-}
-
-void ConnectionManager::sendSingleFrameToPlayer(UnsignedInt playerID, UnsignedInt frame) {
-	if ((TheGameLogic->getFrame() - FRAMES_TO_KEEP) > frame) {
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendSingleFrameToPlayer - player %d requested frame %d when we are on frame %d, this is too far in the past.\n", playerID, frame, TheGameLogic->getFrame()));
-		return;
-	}
-
-	UnsignedByte relay = 1 << playerID;
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - sending data for frame %d\n", frame));
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if ((m_frameData[i] != NULL) && (i != playerID)) { // no need to send his own commands to him.
-			NetCommandList *list = m_frameData[i]->getFrameCommandList(frame);
-			if (list != NULL) {
-				NetCommandRef *ref = list->getFirstMessage();
-				while (ref != NULL) {
-					DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - sending command %d from player %d to player %d using relay 0x%x\n", ref->getCommand()->getID(), i, playerID, relay));
-					sendLocalCommandDirect(ref->getCommand(), relay);
-					ref = ref->getNext();
-				}
-			}
-			UnsignedInt frameCommandCount = m_frameData[i]->getFrameCommandCount(frame);
-			NetFrameCommandMsg *msg = newInstance(NetFrameCommandMsg);
-			msg->setExecutionFrame(frame);
-			msg->setCommandCount(frameCommandCount);
-			if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-				msg->setID(GenerateNextCommandID());
-			}
-			msg->setPlayerID(i);
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - sending frame info from player %d to player %d for frame %d with command count %d and ID %d and relay %d\n", i, playerID, msg->getExecutionFrame(), msg->getCommandCount(), msg->getID(), relay));
-			sendLocalCommandDirect(msg, relay);
-			msg->detach();
-		}
-	}
-}
-
-UnsignedInt ConnectionManager::getNextPacketRouterSlot(UnsignedInt playerID) {
-	Int index = 0;
-	while ((index < (MAX_SLOTS-1)) && (m_packetRouterFallback[index] != playerID)) {
-		++index;
-	}
-	++index;
-	return m_packetRouterFallback[index];
-}
-
-void ConnectionManager::requestFrameDataResend(Int playerID, UnsignedInt frame) {
-	NetFrameResendRequestCommandMsg *msg = newInstance(NetFrameResendRequestCommandMsg);
-	msg->setPlayerID(m_localSlot);
-	msg->setFrameToResend(frame);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-
-	if (isPlayerConnected(playerID) == FALSE) {
-		playerID = 0;
-		while ((playerID < MAX_SLOTS) && (isPlayerConnected(playerID) == FALSE)) {
-			++playerID;
-		}
-	}
-
-	if (playerID < MAX_SLOTS) {
-		sendLocalCommandDirect(msg, 1 << playerID);
-	}
-
-	msg->detach();
-}
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/DisconnectManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/DisconnectManager.cpp
deleted file mode 100644
index 6daed7ef83a..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/DisconnectManager.cpp
+++ /dev/null
@@ -1,810 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/Recorder.h"
-#include "GameClient/DisconnectMenu.h"
-#include "GameClient/InGameUI.h"
-#include "GameLogic/GameLogic.h"
-#include "GameNetwork/DisconnectManager.h"
-#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/networkutil.h"
-#include "GameNetwork/GameSpy/PingThread.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-DisconnectManager::DisconnectManager() 
-{
-	// Added By Sadullah Nader	
-	// Initializations missing and needed
-	Int i;
-	m_currentPacketRouterIndex = 0;
-	m_lastFrame = 0;
-	m_lastFrameTime = 0;
-	m_lastKeepAliveSendTime = 0;
-	m_haveNotifiedOtherPlayersOfCurrentFrame = FALSE;
-	m_timeOfDisconnectScreenOn = 0;
-
-	for( i = 0; i < MAX_SLOTS; ++i) {
-		m_packetRouterFallback[i] = 0;
-	}
-	
-	m_packetRouterTimeout = 0;
-	for( i = 0; i < MAX_SLOTS -1; ++i) {
-		m_playerTimeouts[i] = 0;
-	}
-
-	for( i = 0; i < MAX_SLOTS; ++i) {
-		for (Int j = 0; j < MAX_SLOTS; ++j) {
-			m_playerVotes[i][j].vote = FALSE;
-			m_playerVotes[i][j].frame = 0;
-		}
-	}
-}
-
-DisconnectManager::~DisconnectManager() {
-}
-
-void DisconnectManager::init() {
-	TheDisconnectMenu->hideScreen(); // make sure the screen starts out hidden.
-	m_lastFrame = 0;
-	m_lastFrameTime = -1;
-	m_lastKeepAliveSendTime = -1;
-	m_disconnectState = DISCONNECTSTATETYPE_SCREENOFF;
-	m_currentPacketRouterIndex = 0;
-	m_timeOfDisconnectScreenOn = 0;
-
-	Int i = 0;
-	for (; i < MAX_SLOTS; ++i) {
-		for (Int j = 0; j < MAX_SLOTS; ++j) {
-			m_playerVotes[i][j].vote = FALSE;
-			m_playerVotes[i][j].frame = 0;
-		}
-	}
-
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		m_disconnectFrames[i] = 0;
-		m_disconnectFramesReceived[i] = FALSE;
-	}
-	
-	m_pingFrame = 0;
-	m_pingsSent = 0;
-	m_pingsRecieved = 0;
-}
-
-void DisconnectManager::update(ConnectionManager *conMgr) {
-	if (m_lastFrameTime == -1) {
-		m_lastFrameTime = timeGetTime();
-	}
-
-	// The game logic stalls on the frame we are currently waiting for commands on,
-	// so we have to check for the current logic frame being one higher than
-	// the last one we had the commands ready for.
-	if (TheGameLogic->getFrame() == m_lastFrame) {
-		time_t curTime = timeGetTime();
-		if ((curTime - m_lastFrameTime) > TheGlobalData->m_networkDisconnectTime) {
-			if (m_disconnectState == DISCONNECTSTATETYPE_SCREENOFF) {
-				turnOnScreen(conMgr);
-			}
-			sendKeepAlive(conMgr);
-		}
-	} else {
-		nextFrame(TheGameLogic->getFrame(), conMgr);
-	}
-
-	if (m_disconnectState != DISCONNECTSTATETYPE_SCREENOFF) {
-		updateDisconnectStatus(conMgr);
-
-		// check to see if we need to send pings
-		if (m_pingFrame < TheGameLogic->getFrame())
-		{
-			time_t curTime = timeGetTime();
-			if ((curTime - m_lastFrameTime) > 10000) /// @todo: plug in some better measure here
-			{
-				m_pingFrame = TheGameLogic->getFrame();
-				m_pingsSent = 0;
-				m_pingsRecieved = 0;
-
-				// Send the pings
-				if (ThePinger)
-				{
-					//use next ping server
-					static size_t serverIndex = 0;
-					serverIndex++;
-					if( serverIndex >= TheGameSpyConfig->getPingServers().size() )
-						serverIndex = 0;  //wrap back to first ping server
-
-					std::list<AsciiString>::iterator it = TheGameSpyConfig->getPingServers().begin();
-					for( size_t i = 0;  i < serverIndex;  i++ )
-						it++;
-
-					PingRequest req;
-					req.hostname = it->str();
-					req.repetitions = 5;
-					req.timeout = 2000;
-					m_pingsSent = req.repetitions;
-					ThePinger->addRequest(req);
-					DEBUG_LOG(("DisconnectManager::update() - requesting %d pings of %d from %s\n",
-						req.repetitions, req.timeout, req.hostname.c_str()));
-				}
-			}
-		}
-
-		// update the ping thread, tracking pings if we are on the same frame
-		if (ThePinger)
-		{
-			PingResponse resp;
-			while (ThePinger->getResponse(resp))
-			{
-				if (m_pingFrame != TheGameLogic->getFrame())
-				{
-					// wrong frame - we're not pinging yet
-					DEBUG_LOG(("DisconnectManager::update() - discarding ping of %d from %s (%d reps)\n",
-						resp.avgPing, resp.hostname.c_str(), resp.repetitions));
-				}
-				else
-				{
-					// right frame
-					DEBUG_LOG(("DisconnectManager::update() - keeping ping of %d from %s (%d reps)\n",
-						resp.avgPing, resp.hostname.c_str(), resp.repetitions));
-					if (resp.avgPing < 2000)
-					{
-						m_pingsRecieved += resp.repetitions;
-					}
-				}
-			}
-		}
-	}
-}
-
-UnsignedInt DisconnectManager::getPingFrame()
-{
-	return m_pingFrame;
-}
-
-Int DisconnectManager::getPingsSent()
-{
-	return m_pingsSent;
-}
-
-Int DisconnectManager::getPingsRecieved()
-{
-	return m_pingsRecieved;
-}
-
-
-void DisconnectManager::updateDisconnectStatus(ConnectionManager *conMgr) {
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (conMgr->isPlayerConnected(i)) {
-			Int slot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
-			if (slot != -1) {
-				time_t curTime = timeGetTime();
-				time_t newTime = TheGlobalData->m_networkPlayerTimeoutTime - (curTime - m_playerTimeouts[slot]);
-
-// if someone is more than 2/3 timed out, lets get our frame numbers sync'd up.  Also if someone is voted out
-// lets do the same thing.
-
-				if (m_haveNotifiedOtherPlayersOfCurrentFrame == FALSE) {
-					if ((newTime < TheGlobalData->m_networkPlayerTimeoutTime / 3) || (isPlayerVotedOut(slot, conMgr) == TRUE)) {
-						TheNetwork->notifyOthersOfCurrentFrame();
-						m_haveNotifiedOtherPlayersOfCurrentFrame = TRUE;
-					}
-
-					DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - curTime = %d, m_timeOfDisconnectScreenOn = %d, curTime - m_timeOfDisconnectScreenOn = %d\n", curTime, m_timeOfDisconnectScreenOn, curTime - m_timeOfDisconnectScreenOn));
-
-					if (m_timeOfDisconnectScreenOn != 0) {
-						if ((curTime - m_timeOfDisconnectScreenOn) > TheGlobalData->m_networkDisconnectScreenNotifyTime) {
-							TheNetwork->notifyOthersOfCurrentFrame();
-							m_haveNotifiedOtherPlayersOfCurrentFrame = TRUE;
-						}
-					}
-				}
-
-				if ((newTime < 0) || (isPlayerVotedOut(slot, conMgr) == TRUE)) {
-					newTime = 0;
-					DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - player %d(translated slot %d) has been voted out or timed out\n", i, slot));
-					if (allOnSameFrame(conMgr) == TRUE) {
-						DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - all on same frame\n"));
-						if (isLocalPlayerNextPacketRouter(conMgr) == TRUE) {
-							DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - local player is next packet router\n"));
-							DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - about to do the disconnect procedure for player %d\n", i));
-							sendDisconnectCommand(i, conMgr);
-							disconnectPlayer(i, conMgr);
-							sendPlayerDestruct(i, conMgr);
-						} else {
-							DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - local player is not the next packet router\n"));
-						}
-					} else {
-						DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - not all on same frame\n"));
-					}
-				}
-				TheDisconnectMenu->setPlayerTimeoutTime(slot, newTime);
-			}
-		}
-	}
-}
-
-void DisconnectManager::updateWaitForPacketRouter(ConnectionManager *conMgr) {
-/*
-	time_t curTime = timeGetTime();
-	time_t newTime = TheGlobalData->m_networkPlayerTimeoutTime - (curTime - m_packetRouterTimeout);
-	if (newTime < 0) {
-		newTime = 0;
-
-		// The guy that we were hoping would be the new packet router isn't.  We're screwed, get out of the game.
-
-		DEBUG_LOG(("DisconnectManager::updateWaitForPacketRouter - timed out waiting for new packet router, quitting game\n"));
-		TheNetwork->quitGame();
-	}
-	TheDisconnectMenu->setPacketRouterTimeoutTime(newTime);
-*/
-}
-
-void DisconnectManager::processDisconnectCommand(NetCommandRef *ref, ConnectionManager *conMgr) {
-	NetCommandMsg *msg = ref->getCommand();
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTKEEPALIVE) {
-		processDisconnectKeepAlive(msg, conMgr);
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) {
-		processDisconnectPlayer(msg, conMgr);
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_PACKETROUTERQUERY) {
-		processPacketRouterQuery(msg, conMgr);
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_PACKETROUTERACK) {
-		processPacketRouterAck(msg, conMgr);
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTVOTE) {
-		processDisconnectVote(msg, conMgr);
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) {
-		processDisconnectFrame(msg, conMgr);
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTSCREENOFF) {
-		processDisconnectScreenOff(msg, conMgr);
-	}
-}
-
-void DisconnectManager::processDisconnectKeepAlive(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetDisconnectKeepAliveCommandMsg *cmdMsg = (NetDisconnectKeepAliveCommandMsg *)msg;
-	Int slot = translatedSlotPosition(cmdMsg->getPlayerID(), conMgr->getLocalPlayerID());
-	if (slot != -1) {
-		resetPlayerTimeout(slot);
-	}
-}
-
-void DisconnectManager::processDisconnectPlayer(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetDisconnectPlayerCommandMsg *cmdMsg = (NetDisconnectPlayerCommandMsg *)msg;
-	DEBUG_LOG(("DisconnectManager::processDisconnectPlayer - Got disconnect player command from player %d.  Disconnecting player %d on frame %d\n", msg->getPlayerID(), cmdMsg->getDisconnectSlot(), cmdMsg->getDisconnectFrame()));
-	DEBUG_ASSERTCRASH(TheGameLogic->getFrame() == cmdMsg->getDisconnectFrame(), ("disconnecting player on the wrong frame!!!"));
-	disconnectPlayer(cmdMsg->getDisconnectSlot(), conMgr);
-}
-
-void DisconnectManager::processPacketRouterQuery(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetPacketRouterQueryCommandMsg *cmdMsg = (NetPacketRouterQueryCommandMsg *)msg;
-	DEBUG_LOG(("DisconnectManager::processPacketRouterQuery - got a packet router query command from player %d\n", msg->getPlayerID()));
-
-	if (conMgr->getPacketRouterSlot() == conMgr->getLocalPlayerID()) {
-		NetPacketRouterAckCommandMsg *ackmsg = newInstance(NetPacketRouterAckCommandMsg);
-		ackmsg->setPlayerID(conMgr->getLocalPlayerID());
-		if (DoesCommandRequireACommandID(ackmsg->getNetCommandType()) == TRUE) {
-			ackmsg->setID(GenerateNextCommandID());
-		}
-		DEBUG_LOG(("DisconnectManager::processPacketRouterQuery - We are the new packet router, responding with an packet router ack. Local player is %d\n", ackmsg->getPlayerID()));
-		conMgr->sendLocalCommandDirect(ackmsg, 1 << cmdMsg->getPlayerID());
-		ackmsg->detach();
-	} else {
-		DEBUG_LOG(("DisconnectManager::processPacketRouterQuery - We are NOT the new packet router, these are not the droids you're looking for.\n"));
-	}
-}
-
-void DisconnectManager::processPacketRouterAck(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)msg;
-	DEBUG_LOG(("DisconnectManager::processPacketRouterAck - got packet router ack command from player %d\n", msg->getPlayerID()));
-
-	if (conMgr->getPacketRouterSlot() == cmdMsg->getPlayerID()) {
-		DEBUG_LOG(("DisconnectManager::processPacketRouterAck - packet router command is from who it should be.\n"));
-		resetPacketRouterTimeout();
-		Int currentPacketRouterSlot = conMgr->getPacketRouterSlot();
-		Int currentPacketRouterIndex = 0;
-		while ((currentPacketRouterSlot != conMgr->getPacketRouterFallbackSlot(currentPacketRouterIndex)) && (currentPacketRouterIndex < MAX_SLOTS)) {
-			++currentPacketRouterIndex;
-		}
-		DEBUG_ASSERTCRASH((currentPacketRouterIndex < MAX_SLOTS), ("Invalid packet router index"));
-
-		DEBUG_LOG(("DisconnectManager::processPacketRouterAck - New packet router confirmed, resending pending commands\n"));
-		conMgr->resendPendingCommands();
-		m_currentPacketRouterIndex = currentPacketRouterIndex;
-		DEBUG_LOG(("DisconnectManager::processPacketRouterAck - Setting disconnect state to screen on.\n"));
-		m_disconnectState = DISCONNECTSTATETYPE_SCREENON; ///< set it to screen on so that the next call to AllCommandsReady can set up everything for the next frame properly.
-	}
-}
-
-void DisconnectManager::processDisconnectVote(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)msg;
-	DEBUG_LOG(("DisconnectManager::processDisconnectVote - Got a disconnect vote for player %d command from player %d\n", cmdMsg->getSlot(), cmdMsg->getPlayerID()));
-	Int transSlot = translatedSlotPosition(msg->getPlayerID(), conMgr->getLocalPlayerID());
-
-	if (isPlayerInGame(transSlot, conMgr) == FALSE) {
-		// if they've been timed out, voted out, disconnected, don't count their vote.
-		return;
-	}
-
-	applyDisconnectVote(cmdMsg->getSlot(), cmdMsg->getVoteFrame(), cmdMsg->getPlayerID(), conMgr);
-}
-
-void DisconnectManager::processDisconnectFrame(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)msg;
-	UnsignedInt playerID = cmdMsg->getPlayerID();
-	if (m_disconnectFrames[playerID] >= cmdMsg->getDisconnectFrame()) {
-		// this message isn't valid, we have a disconnect frame that is later than this already.
-		return;
-	}
-
-	if (m_disconnectFramesReceived[playerID] == TRUE) {
-		DEBUG_LOG(("DisconnectManager::processDisconnectFrame - Got two disconnect frames without an intervening disconnect screen off command from player %d. Frames are %d and %d\n", playerID, m_disconnectFrames[playerID], cmdMsg->getDisconnectFrame()));
-	}
-
-	DEBUG_LOG(("DisconnectManager::processDisconnectFrame - about to call resetPlayersVotes for player %d\n", playerID));
-	resetPlayersVotes(playerID, cmdMsg->getDisconnectFrame()-1, conMgr);
-
-	m_disconnectFrames[playerID] = cmdMsg->getDisconnectFrame();
-	m_disconnectFramesReceived[playerID] = TRUE;
-	DEBUG_LOG(("DisconnectManager::processDisconnectFrame - Got a disconnect frame for player %d, frame = %d, local player is %d, local disconnect frame = %d, command id = %d\n", cmdMsg->getPlayerID(), cmdMsg->getDisconnectFrame(), conMgr->getLocalPlayerID(), m_disconnectFrames[conMgr->getLocalPlayerID()], cmdMsg->getID()));
-
-	if (playerID == conMgr->getLocalPlayerID()) {
-		DEBUG_LOG(("DisconnectManager::processDisconnectFrame - player %d is the local player\n", playerID));
-		// we just got the message from the local player, check to see if we need to send
-		// commands to anyone we already have heard from.
-		for (Int i = 0; i < MAX_SLOTS; ++i) {
-			if (i != playerID) {
-				Int transSlot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
-				if (isPlayerInGame(transSlot, conMgr) == TRUE) {
-					if ((m_disconnectFrames[i] < m_disconnectFrames[playerID]) && (m_disconnectFramesReceived[i] == TRUE)) {
-						DEBUG_LOG(("DisconnectManager::processDisconnectFrame - I have more frames than player %d, my frame = %d, their frame = %d\n", i, m_disconnectFrames[conMgr->getLocalPlayerID()], m_disconnectFrames[i]));
-						conMgr->sendFrameDataToPlayer(i, m_disconnectFrames[i]);
-					}
-				}
-			}
-		}
-	} else if ((m_disconnectFrames[playerID] < m_disconnectFrames[conMgr->getLocalPlayerID()]) && (m_disconnectFramesReceived[playerID] == TRUE)) {
-		DEBUG_LOG(("DisconnectManager::processDisconnectFrame - I have more frames than player %d, my frame = %d, their frame = %d\n", playerID, m_disconnectFrames[conMgr->getLocalPlayerID()], m_disconnectFrames[playerID]));
-		conMgr->sendFrameDataToPlayer(playerID, m_disconnectFrames[playerID]);
-	}
-}
-
-void DisconnectManager::processDisconnectScreenOff(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)msg;
-	UnsignedInt playerID = cmdMsg->getPlayerID();
-
-	DEBUG_LOG(("DisconnectManager::processDisconnectScreenOff - got a screen off command from player %d for frame %d\n", cmdMsg->getPlayerID(), cmdMsg->getNewFrame()));
-
-	if ((playerID < 0) || (playerID >= MAX_SLOTS)) {
-		return;
-	}
-
-	UnsignedInt newFrame = cmdMsg->getNewFrame();
-	if (newFrame >= m_disconnectFrames[playerID]) {
-		DEBUG_LOG(("DisconnectManager::processDisconnectScreenOff - resetting the disconnect screen status for player %d\n", playerID));
-		m_disconnectFramesReceived[playerID] = FALSE;
-		m_disconnectFrames[playerID] = newFrame; // just in case we get packets out of order and the disconnect screen off message gets here before the disconnect frame message.
-
-		DEBUG_LOG(("DisconnectManager::processDisconnectScreenOff - about to call resetPlayersVotes for player %d\n", playerID));
-		resetPlayersVotes(playerID, cmdMsg->getNewFrame(), conMgr);
-	}
-}
-
-void DisconnectManager::applyDisconnectVote(Int slot, UnsignedInt frame, Int fromSlot, ConnectionManager *conMgr) {
-	m_playerVotes[slot][fromSlot].vote = TRUE;
-	m_playerVotes[slot][fromSlot].frame = frame;
-	Int numVotes = countVotesForPlayer(slot);
-	DEBUG_LOG(("DisconnectManager::applyDisconnectVote - added a vote to disconnect slot %d, from slot %d, for frame %d, current votes are %d\n", slot, fromSlot, frame, numVotes));
-	Int transSlot = translatedSlotPosition(slot, conMgr->getLocalPlayerID());
-	if (transSlot != -1) {
-		TheDisconnectMenu->updateVotes(transSlot, numVotes);
-	}
-}
-
-void DisconnectManager::nextFrame(UnsignedInt frame, ConnectionManager *conMgr) {
-	m_lastFrame = frame;
-	m_lastFrameTime = timeGetTime();
-	resetPlayerTimeouts(conMgr);
-}
-
-void DisconnectManager::allCommandsReady(UnsignedInt frame, ConnectionManager *conMgr, Bool waitForPacketRouter) {
-		if (m_disconnectState != DISCONNECTSTATETYPE_SCREENOFF) {
-			DEBUG_LOG(("DisconnectManager::allCommandsReady - setting screen state to off.\n"));
-
-			TheDisconnectMenu->hideScreen();
-			m_disconnectState = DISCONNECTSTATETYPE_SCREENOFF;
-			TheNetwork->notifyOthersOfNewFrame(frame);
-
-			// reset the votes since we're moving to a new frame.
-			for (Int i = 0; i < MAX_SLOTS; ++i) {
-				m_playerVotes[i][conMgr->getLocalPlayerID()].vote = FALSE;
-			}
-
-			DEBUG_LOG(("DisconnectManager::allCommandsReady - resetting m_timeOfDisconnectScreenOn\n"));
-			m_timeOfDisconnectScreenOn = 0;
-		}
-}
-
-Bool DisconnectManager::allowedToContinue() {
-	if (m_disconnectState != DISCONNECTSTATETYPE_SCREENOFF) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-void DisconnectManager::sendKeepAlive(ConnectionManager *conMgr) {
-	time_t curTime = timeGetTime();
-
-	if (((curTime - m_lastKeepAliveSendTime) > 500) || (m_lastKeepAliveSendTime == -1)) {
-		NetDisconnectKeepAliveCommandMsg *msg = newInstance(NetDisconnectKeepAliveCommandMsg);
-		msg->setPlayerID(conMgr->getLocalPlayerID());
-		if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
-			msg->setID(GenerateNextCommandID());
-		}
-		conMgr->sendLocalCommandDirect(msg, 0xff ^ (1 << msg->getPlayerID()));
-		msg->detach();
-
-		m_lastKeepAliveSendTime = curTime;
-	}
-}
-
-void DisconnectManager::populateDisconnectScreen(ConnectionManager *conMgr) {
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		UnicodeString name = conMgr->getPlayerName(i);
-		Int slot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
-		if (slot != -1) {
-			TheDisconnectMenu->setPlayerName(slot, name);
-
-			Int numVotes = countVotesForPlayer(i);
-			TheDisconnectMenu->updateVotes(slot, numVotes);
-		}
-	}
-}
-
-Int DisconnectManager::translatedSlotPosition(Int slot, Int localSlot) {
-	if (slot < localSlot) {
-		return slot;
-	}
-
-	if (slot == localSlot) {
-		return -1;
-	}
-
-	return (slot - 1);
-}
-
-Int DisconnectManager::untranslatedSlotPosition(Int slot, Int localSlot) {
-	if (slot == -1) {
-		return localSlot;
-	}
-
-	if (slot < localSlot) {
-		return slot;
-	}
-
-	return (slot + 1);
-}
-
-void DisconnectManager::resetPlayerTimeouts(ConnectionManager *conMgr) {
-	// reset the player timeouts.
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		Int slot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
-		if (slot != -1) {
-			resetPlayerTimeout(slot);
-		}
-	}
-}
-
-void DisconnectManager::resetPlayerTimeout(Int slot) {
-	m_playerTimeouts[slot] = timeGetTime();
-}
-
-void DisconnectManager::resetPacketRouterTimeout() {
-	m_packetRouterTimeout = timeGetTime();
-}
-
-void DisconnectManager::turnOnScreen(ConnectionManager *conMgr) {
-	TheDisconnectMenu->showScreen();
-	DEBUG_LOG(("DisconnectManager::turnOnScreen - turning on screen on frame %d\n", TheGameLogic->getFrame()));
-	m_disconnectState = DISCONNECTSTATETYPE_SCREENON;
-	m_lastKeepAliveSendTime = -1;
-	populateDisconnectScreen(conMgr);
-	resetPlayerTimeouts(conMgr);
-	TheDisconnectMenu->hidePacketRouterTimeout();
-
-	m_haveNotifiedOtherPlayersOfCurrentFrame = FALSE;
-
-	m_timeOfDisconnectScreenOn = timeGetTime();
-	DEBUG_LOG(("DisconnectManager::turnOnScreen - turned on screen at time %d\n", m_timeOfDisconnectScreenOn));
-}
-
-void DisconnectManager::disconnectPlayer(Int slot, ConnectionManager *conMgr) {
-	DEBUG_LOG(("DisconnectManager::disconnectPlayer - Disconnecting slot number %d on frame %d\n", slot, TheGameLogic->getFrame()));
-	DEBUG_ASSERTCRASH((slot >= 0) && (slot < MAX_SLOTS), ("Attempting to disconnect an invalid slot number"));
-	if ((slot < 0) || (slot >= (MAX_SLOTS))) {
-		return;
-	}
-
-	if (TheGameInfo)
-	{
-		GameSlot *gSlot = TheGameInfo->getSlot( slot );
-		if (gSlot)
-		{
-			gSlot->markAsDisconnected();
-		}
-	}
-
-	Int transSlot = translatedSlotPosition(slot, conMgr->getLocalPlayerID());
-
-	if (transSlot != -1) {
-		// Ignore any disconnect commands that tell us to disconnect ourselves.
-
-		// Get the disconnecting player off the disconnect window.
-		UnicodeString uname = conMgr->getPlayerName(slot);
-		TheRecorder->logPlayerDisconnect(uname, slot);
-		TheDisconnectMenu->removePlayer(transSlot, uname);
-
-		PlayerLeaveCode retcode = conMgr->disconnectPlayer(slot);
-		DEBUG_ASSERTCRASH((retcode != PLAYERLEAVECODE_UNKNOWN), ("Invalid player leave code"));
-
-		if (retcode == PLAYERLEAVECODE_PACKETROUTER) {
-			DEBUG_LOG(("DisconnectManager::disconnectPlayer - disconnecting player was packet router.\n"));
-
-			conMgr->resendPendingCommands();
-		}
-	}
-}
-
-void DisconnectManager::sendDisconnectCommand(Int slot, ConnectionManager *conMgr) {
-	DEBUG_LOG(("DisconnectManager::sendDisconnectCommand - Sending disconnect command for slot number %d\n", slot));
-	DEBUG_ASSERTCRASH((slot >= 0) && (slot < MAX_SLOTS), ("Attempting to send a disconnect command for an invalid slot number"));
-	if ((slot < 0) || (slot >= (MAX_SLOTS))) {
-		return;
-	}
-
-	UnsignedInt disconnectFrame = getMaxDisconnectFrame();
-
-	// Need to do the NetDisconnectPlayerCommandMsg creation and sending here.
-	NetDisconnectPlayerCommandMsg *msg = newInstance(NetDisconnectPlayerCommandMsg);
-	msg->setDisconnectSlot(slot);
-	msg->setDisconnectFrame(disconnectFrame);
-	msg->setPlayerID(conMgr->getLocalPlayerID());
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-
-	conMgr->sendLocalCommand(msg);
-
-	DEBUG_LOG(("DisconnectManager::sendDisconnectCommand - Sending disconnect command for slot number %d for frame %d\n", slot, disconnectFrame));
-
-	msg->detach();
-}
-
-void DisconnectManager::sendVoteCommand(Int slot, ConnectionManager *conMgr) {
-	NetDisconnectVoteCommandMsg *msg = newInstance(NetDisconnectVoteCommandMsg);
-
-	msg->setPlayerID(conMgr->getLocalPlayerID());
-	msg->setSlot(slot);
-	msg->setVoteFrame(TheGameLogic->getFrame());
-	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
-		msg->setID(GenerateNextCommandID());
-	}
-
-	conMgr->sendLocalCommandDirect(msg, 0xff & ~(1 << conMgr->getLocalPlayerID()));
-
-	msg->detach();
-}
-
-void DisconnectManager::voteForPlayerDisconnect(Int slot, ConnectionManager *conMgr) {
-	Int transSlot = untranslatedSlotPosition(slot, conMgr->getLocalPlayerID());
-
-	if (m_playerVotes[transSlot][conMgr->getLocalPlayerID()].vote == FALSE) {
-		m_playerVotes[transSlot][conMgr->getLocalPlayerID()].vote = TRUE;
-
-		sendVoteCommand(transSlot, conMgr);
-
-		// we use the game logic frame cause we might not have sent out our own disconnect frame yet.
-		applyDisconnectVote(transSlot, TheGameLogic->getFrame(), conMgr->getLocalPlayerID(), conMgr);
-	}
-}
-
-void DisconnectManager::recalculatePacketRouterIndex(ConnectionManager *conMgr) {
-	Int currentPacketRouterSlot = conMgr->getPacketRouterSlot();
-	m_currentPacketRouterIndex = 0;
-	while ((currentPacketRouterSlot != conMgr->getPacketRouterFallbackSlot(m_currentPacketRouterIndex)) && (m_currentPacketRouterIndex < MAX_SLOTS)) {
-		++m_currentPacketRouterIndex;
-	}
-	DEBUG_ASSERTCRASH((m_currentPacketRouterIndex < MAX_SLOTS), ("Invalid packet router index"));
-}
-
-Bool DisconnectManager::allOnSameFrame(ConnectionManager *conMgr) {
-	Bool retval = TRUE;
-	for (Int i = 0; (i < MAX_SLOTS) && (retval == TRUE); ++i) {
-		Int transSlot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
-		if (transSlot == -1) {
-			continue;
-		}
-		if ((conMgr->isPlayerConnected(i) == TRUE) && (isPlayerInGame(transSlot, conMgr) == TRUE)) {
-			// ok, i is someone who is in the game and hasn't timed out yet or been voted out.
-			if (m_disconnectFramesReceived[i] == FALSE) {
-				// we don't know what frame they are on yet.
-				retval = FALSE;
-			}
-			if ((m_disconnectFramesReceived[i] == TRUE) && (m_disconnectFrames[conMgr->getLocalPlayerID()] != m_disconnectFrames[i])) {
-				// We know their frame, but they aren't on the same frame as us.
-				retval = FALSE;
-			}
-		}
-	}
-	return retval;
-}
-
-Bool DisconnectManager::isLocalPlayerNextPacketRouter(ConnectionManager *conMgr) {
-	UnsignedInt localSlot = conMgr->getLocalPlayerID();
-	UnsignedInt packetRouterSlot = conMgr->getPacketRouterSlot();
-	Int transSlot = translatedSlotPosition(packetRouterSlot, localSlot);
-
-	// stop when we have found a packet router that is connected
-	while ((transSlot != -1) && (isPlayerInGame(transSlot, conMgr) == FALSE)) {
-		packetRouterSlot = conMgr->getNextPacketRouterSlot(packetRouterSlot);
-		if ((packetRouterSlot >= MAX_SLOTS) || (packetRouterSlot < 0)) {
-			// don't know who the next packet router is going to be,
-			// so this game is not going to go anywhere anymore.
-			DEBUG_CRASH(("no more players left to be the packet router, this shouldn't happen."));
-			return FALSE;
-		}
-		transSlot = translatedSlotPosition(packetRouterSlot, localSlot);
-	}
-
-	if (packetRouterSlot == localSlot) {
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-Bool DisconnectManager::hasPlayerTimedOut(Int slot) {
-	if (slot == -1) {
-		return FALSE;
-	}
-
-	time_t newTime = TheGlobalData->m_networkPlayerTimeoutTime - (timeGetTime() - m_playerTimeouts[slot]);
-	if (newTime <= 0) {
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-// this function assumes that we are the packet router. (or at least that 
-// we will be after everyone is getting disconnected)
-void DisconnectManager::sendPlayerDestruct(Int slot, ConnectionManager *conMgr) {
-	UnsignedShort currentID = 0;
-	if (DoesCommandRequireACommandID(NETCOMMANDTYPE_DESTROYPLAYER))
-	{
-		currentID = GenerateNextCommandID();
-	}
-
-	DEBUG_LOG(("Queueing DestroyPlayer %d for frame %d on frame %d as command %d\n",
-		slot, TheNetwork->getExecutionFrame()+1, TheGameLogic->getFrame(), currentID));
-
-	NetDestroyPlayerCommandMsg *netmsg = newInstance(NetDestroyPlayerCommandMsg);	
-	netmsg->setExecutionFrame(TheNetwork->getExecutionFrame()+1);
-	netmsg->setPlayerID(conMgr->getLocalPlayerID());
-	netmsg->setID(currentID);
-	netmsg->setPlayerIndex(slot);
-	conMgr->sendLocalCommand(netmsg);
-	netmsg->detach();
-}
-
-// the 'slot' variable is supposed to be a translated slot position. (translated slot meaning
-// that it is the player's position in the disconnect menu)
-Bool DisconnectManager::isPlayerVotedOut(Int slot, ConnectionManager *conMgr) {
-	if (slot == -1) {
-		// we can't vote out ourselves.
-		return FALSE;
-	}
-	Int transSlot = untranslatedSlotPosition(slot, conMgr->getLocalPlayerID());
-	Int numVotes = countVotesForPlayer(transSlot);
-	if (numVotes >= (conMgr->getNumPlayers() - 1)) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-UnsignedInt DisconnectManager::getMaxDisconnectFrame() {
-	UnsignedInt retval = 0;
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_disconnectFrames[i] > retval) {
-			retval = m_disconnectFrames[i];
-		}
-	}
-	return retval;
-}
-
-Bool DisconnectManager::isPlayerInGame(Int slot, ConnectionManager *conMgr) {
-	Int transSlot = untranslatedSlotPosition(slot, conMgr->getLocalPlayerID());
-	DEBUG_ASSERTCRASH((transSlot >= 0) && (transSlot < MAX_SLOTS), ("invalid slot number"));
-	if (((transSlot < 0) || (transSlot >= MAX_SLOTS)) || conMgr->isPlayerConnected(transSlot) == FALSE) {
-		return FALSE;
-	}
-	
-	if (isPlayerVotedOut(slot, conMgr) == TRUE) {
-		return FALSE;
-	}
-	
-	if (hasPlayerTimedOut(slot) == TRUE) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-void DisconnectManager::playerHasAdvancedAFrame(Int slot, UnsignedInt frame) {
-	// if they have advanced beyond the frame they had been previously disconnecting on.
-	if (frame >= m_disconnectFrames[slot]) {
-		m_disconnectFrames[slot] = frame; // just in case we get a disconnect frame command after this is called.
-		m_disconnectFramesReceived[slot] = FALSE;
-	}
-}
-
-Int DisconnectManager::countVotesForPlayer(Int slot) {
-	if ((slot < 0) || (slot >= MAX_SLOTS)) {
-		return 0;
-	}
-
-	Int retval = 0;
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		// using TheGameLogic->getFrame() cause we might not have sent our disconnect frame yet.
-		if ((m_playerVotes[slot][i].vote == TRUE) && (m_playerVotes[slot][i].frame == TheGameLogic->getFrame())) {
-			++retval;
-		}
-	}
-
-	return retval;
-}
-
-void DisconnectManager::resetPlayersVotes(Int playerID, UnsignedInt frame, ConnectionManager *conMgr) {
-	DEBUG_LOG(("DisconnectManager::resetPlayersVotes - resetting player %d's votes on frame %d\n", playerID, frame));
-
-	// we need to reset this player's votes that happened before or on the given frame.
-	for(Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_playerVotes[i][playerID].frame <= frame) {
-			DEBUG_LOG(("DisconnectManager::resetPlayersVotes - resetting player %d's vote for player %d from frame %d on frame %d\n", playerID, i, m_playerVotes[i][playerID].frame, frame));
-			m_playerVotes[i][playerID].vote = FALSE;
-		}
-	}
-
-	Int numVotes = countVotesForPlayer(playerID);
-	DEBUG_LOG(("DisconnectManager::resetPlayersVotes - after adjusting votes, player %d has %d votes\n", playerID, numVotes));
-	Int transSlot = translatedSlotPosition(playerID, conMgr->getLocalPlayerID());
-	if (transSlot != -1) {
-		TheDisconnectMenu->updateVotes(transSlot, numVotes);
-	}
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/DownloadManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/DownloadManager.cpp
deleted file mode 100644
index 1429a83e6c6..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/DownloadManager.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: DownloadManager.cpp //////////////////////////////////////////////////////
-// Generals download manager code
-// Author: Matthew D. Campbell, July 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/GameText.h"
-#include "GameNetwork/DownloadManager.h"
-
-DownloadManager *TheDownloadManager;
-
-DownloadManager::DownloadManager()
-{
-	m_download = NEW CDownload(this);
-	m_wasError = m_sawEnd = false;
-	
-	//Added By Sadullah Nader
-	//Initializations missing and needed
-	
-	m_queuedDownloads.clear();
-	
-	//
-
-	m_statusString = TheGameText->fetch("FTP:StatusIdle");
-
-	// ----- Initialize Winsock -----
-	m_winsockInit = true;
-	WORD verReq = MAKEWORD(2, 2);
-	WSADATA wsadata;
-
-	int err = WSAStartup(verReq, &wsadata);
-	if (err != 0)
-	{
-		m_winsockInit = false;
-	}
-	else
-	{
-		if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2))
-		{
-			WSACleanup();
-			m_winsockInit = false;
-		}
-	}
-
-}
-
-DownloadManager::~DownloadManager()
-{
-	delete m_download;
-	if (m_winsockInit)
-	{
-		WSACleanup();
-		m_winsockInit = false;
-	}
-}
-
-void DownloadManager::init( void )
-{
-}
-
-void DownloadManager::reset( void )
-{
-}
-
-HRESULT DownloadManager::update( void )
-{
-	return m_download->PumpMessages();
-}
-
-HRESULT DownloadManager::downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume )
-{
-	return m_download->DownloadFile( server.str(), username.str(), password.str(), file.str(), localfile.str(), regkey.str(), tryResume );
-}
-
-void DownloadManager::queueFileForDownload( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume )
-{
-	QueuedDownload q;
-	q.file = file;
-	q.localFile = localfile;
-	q.password = password;
-	q.regKey = regkey;
-	q.server = server;
-	q.tryResume = tryResume;
-	q.userName = username;
-
-	m_queuedDownloads.push_back(q);
-}
-
-HRESULT DownloadManager::downloadNextQueuedFile( void )
-{
-	QueuedDownload q;
-	std::list<QueuedDownload>::iterator it = m_queuedDownloads.begin();
-	if (it != m_queuedDownloads.end())
-	{
-		q = *it;
-		m_queuedDownloads.pop_front();
-		m_wasError = m_sawEnd = false;
-		return downloadFile( q.server, q.userName, q.password, q.file, q.localFile, q.regKey, q.tryResume );
-	}
-	else
-	{
-		DEBUG_CRASH(("Starting non-existent download!"));
-		return S_OK;
-	}
-}
-
-AsciiString DownloadManager::getLastLocalFile( void )
-{
-	char buf[256] = "";
-	m_download->GetLastLocalFile(buf, 256);
-	return buf;
-}
-
-HRESULT DownloadManager::OnError( Int error )
-{
-	m_wasError = true;
-	AsciiString s = "FTP:UnknownError";
-	switch (error)
-	{
-		case DOWNLOADEVENT_NOSUCHSERVER:
-			s = "FTP:NoSuchServer";
-			break;
-		case DOWNLOADEVENT_COULDNOTCONNECT:
-			s = "FTP:CouldNotConnect";
-			break;
-		case DOWNLOADEVENT_LOGINFAILED:
-			s = "FTP:LoginFailed";
-			break;
-		case DOWNLOADEVENT_NOSUCHFILE:
-			s = "FTP:NoSuchFile";
-			break;
-		case DOWNLOADEVENT_LOCALFILEOPENFAILED:
-			s = "FTP:LocalFileOpenFailed";
-			break;
-		case DOWNLOADEVENT_TCPERROR:
-			s = "FTP:TCPError";
-			break;
-		case DOWNLOADEVENT_DISCONNECTERROR:
-			s = "FTP:DisconnectError";
-			break;
-	}
-	m_errorString = TheGameText->fetch(s);
-	DEBUG_LOG(("DownloadManager::OnError(): %s(%d)\n", s.str(), error));
-	return S_OK;
-}
-
-HRESULT DownloadManager::OnEnd()
-{
-	m_sawEnd = true;
-	DEBUG_LOG(("DownloadManager::OnEnd()\n"));
-	return S_OK;
-}
-
-HRESULT DownloadManager::OnQueryResume()
-{
-	DEBUG_LOG(("DownloadManager::OnQueryResume()\n"));
-	//return DOWNLOADEVENT_DONOTRESUME;
-	return DOWNLOADEVENT_RESUME;
-}
-
-HRESULT DownloadManager::OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft )
-{
-	DEBUG_LOG(("DownloadManager::OnProgressUpdate(): %d/%d %d/%d\n", bytesread, totalsize, timetaken, timeleft));
-	return S_OK;
-}
-
-HRESULT DownloadManager::OnStatusUpdate( Int status )
-{
-	AsciiString s = "FTP:StatusNone";
-	switch (status)
-	{
-		case DOWNLOADSTATUS_CONNECTING:
-			s = "FTP:StatusConnecting";
-			break;
-		case DOWNLOADSTATUS_LOGGINGIN:
-			s = "FTP:StatusLoggingIn";
-			break;
-		case DOWNLOADSTATUS_FINDINGFILE:
-			s = "FTP:StatusFindingFile";
-			break;
-		case DOWNLOADSTATUS_QUERYINGRESUME:
-			s = "FTP:StatusQueryingResume";
-			break;
-		case DOWNLOADSTATUS_DOWNLOADING:
-			s = "FTP:StatusDownloading";
-			break;
-		case DOWNLOADSTATUS_DISCONNECTING:
-			s = "FTP:StatusDisconnecting";
-			break;
-		case DOWNLOADSTATUS_FINISHING:
-			s = "FTP:StatusFinishing";
-			break;
-		case DOWNLOADSTATUS_DONE:
-			s = "FTP:StatusDone";
-			break;
-	}
-	m_statusString = TheGameText->fetch(s);
-	DEBUG_LOG(("DownloadManager::OnStatusUpdate(): %s(%d)\n", s.str(), status));
-	return S_OK;
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/FileTransfer.cpp b/Generals/Code/GameEngine/Source/GameNetwork/FileTransfer.cpp
deleted file mode 100644
index 0f63cd1847b..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/FileTransfer.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: FileTransfer.cpp
-// Author: Matthew D. Campbell, December 2002
-// Description: File Transfer wrapper using TheNetwork
-///////////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/LoadScreen.h"
-#include "GameClient/Shell.h"
-#include "GameNetwork/FileTransfer.h"
-#include "GameNetwork/networkutil.h"
-
-//-------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------
-
-static Bool doFileTransfer( AsciiString filename, MapTransferLoadScreen *ls, Int mask )
-{
-	Bool fileTransferDone = FALSE;
-	Int fileTransferPercent = 0;
-	Int i;
-
-	if (mask)
-	{
-		ls->setCurrentFilename(filename);
-		UnsignedInt startTime = timeGetTime();
-		const Int timeoutPeriod = 2*60*1000;
-		ls->processTimeout(timeoutPeriod/1000);
-
-		ls->update(0);
-		fileTransferDone = FALSE;
-		fileTransferPercent = 0;
-
-		UnsignedShort fileCommandID = 0;
-		Bool sentFile = FALSE;
-		if (TheGameInfo->amIHost())
-		{
-			Sleep(500);
-			fileCommandID = TheNetwork->sendFileAnnounce(filename, mask);
-		}
-		else
-		{
-			sentFile = TRUE;
-		}
-
-		DEBUG_LOG(("Starting file transfer loop\n"));
-
-		while (!fileTransferDone)
-		{
-			if (!sentFile && TheNetwork->areAllQueuesEmpty())
-			{
-				TheNetwork->sendFile(filename, mask, fileCommandID);
-				sentFile = TRUE;
-			}
-
-			// get the progress for each player, and take the min for our overall progress
-			fileTransferDone = TRUE;
-			fileTransferPercent = 100;
-			for (i=1; i<MAX_SLOTS; ++i)
-			{
-				if (TheGameInfo->getConstSlot(i)->isHuman() && !TheGameInfo->getConstSlot(i)->hasMap())
-				{
-					Int slotTransferPercent = TheNetwork->getFileTransferProgress(i, filename);
-					fileTransferPercent = min(fileTransferPercent, slotTransferPercent);
-
-					if (slotTransferPercent == 0)
-						ls->processProgress(i, slotTransferPercent, "MapTransfer:Preparing");
-					else if (slotTransferPercent < 100)
-						ls->processProgress(i, slotTransferPercent, "MapTransfer:Recieving");
-					else
-						ls->processProgress(i, slotTransferPercent, "MapTransfer:Done");
-				}
-			}
-			if (fileTransferPercent < 100)
-			{
-				fileTransferDone = FALSE;
-				if (fileTransferPercent == 0)
-					ls->processProgress(0, fileTransferPercent, "MapTransfer:Preparing");
-				else
-					ls->processProgress(0, fileTransferPercent, "MapTransfer:Sending");
-			}
-			else
-			{
-				DEBUG_LOG(("File transfer is 100%%!\n"));
-				ls->processProgress(0, fileTransferPercent, "MapTransfer:Done");
-			}
-
-			Int now = timeGetTime();
-			if (now > startTime + timeoutPeriod) // bail if we don't finish in a reasonable amount of time
-			{
-				DEBUG_LOG(("Timing out file transfer\n"));
-				break;
-			}
-			else
-			{
-				ls->processTimeout((startTime + timeoutPeriod - now)/1000);
-			}
-
-			ls->update(fileTransferPercent);
-		}
-
-		if (!fileTransferDone)
-		{
-			return FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-//-------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------
-
-AsciiString GetBasePathFromPath( AsciiString path )
-{
-	const char *s = path.reverseFind('\\');
-	if (s)
-	{
-		Int len = s - path.str();
-
-		AsciiString base;
-		char *buf = base.getBufferForRead(len + 1);
-		memcpy(buf, path.str(), len);
-		buf[len] = 0;
-		return buf;
-	}
-	return AsciiString::TheEmptyString;
-}
-
-AsciiString GetFileFromPath( AsciiString path )
-{
-	const char *s = path.reverseFind('\\');
-	if (s)
-		return s+1;
-	return path;
-}
-
-AsciiString GetExtensionFromFile( AsciiString fname )
-{
-	const char *s = fname.reverseFind('.');
-	if (s)
-		return s+1;
-	return fname;
-}
-
-AsciiString GetBaseFileFromFile( AsciiString fname )
-{
-	const char *s = fname.reverseFind('.');
-	if (s)
-	{
-		Int len = s - fname.str();
-
-		AsciiString base;
-		char *buf = base.getBufferForRead(len + 1);
-		memcpy(buf, fname.str(), len);
-		buf[len] = 0;
-		return buf;
-	}
-	return AsciiString::TheEmptyString;
-}
-
-AsciiString GetPreviewFromMap( AsciiString path )
-{
-	AsciiString fname = GetBaseFileFromFile(GetFileFromPath(path));
-	AsciiString base = GetBasePathFromPath(path);
-	
-	AsciiString out;
-	out.format("%s\\%s.tga", base.str(), fname.str());
-	return out;
-}
-
-AsciiString GetINIFromMap( AsciiString path )
-{
-	AsciiString base = GetBasePathFromPath(path);
-
-	AsciiString out;
-	out.format("%s\\map.ini", base.str());
-	return out;
-}
-
-AsciiString GetStrFileFromMap( AsciiString path )
-{
-	AsciiString base = GetBasePathFromPath(path);
-
-	AsciiString out;
-	out.format("%s\\map.str", base.str());
-	return out;
-}
-
-AsciiString GetSoloINIFromMap( AsciiString path )
-{
-	AsciiString base = GetBasePathFromPath(path);
-
-	AsciiString out;
-	out.format("%s\\solo.ini", base.str());
-	return out;
-}
-
-AsciiString GetAssetUsageFromMap( AsciiString path )
-{
-	AsciiString base = GetBasePathFromPath(path);
-
-	AsciiString out;
-	out.format("%s\\assetusage.txt", base.str());
-	return out;
-}
-
-AsciiString GetReadmeFromMap( AsciiString path )
-{
-	AsciiString base = GetBasePathFromPath(path);
-
-	AsciiString out;
-	out.format("%s\\readme.txt", base.str());
-	return out;
-}
-
-//-------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------
-
-Bool DoAnyMapTransfers(GameInfo *game)
-{
-	TheGameInfo = game;
-	Int mask = 0;
-	Int i=0;
-	for (i=1; i<MAX_SLOTS; ++i)
-	{
-		if (TheGameInfo->getConstSlot(i)->isHuman() && !TheGameInfo->getConstSlot(i)->hasMap())
-		{
-			DEBUG_LOG(("Adding player %d to transfer mask\n", i));
-			mask |= (1<<i);
-		}
-	}
-	if (!mask)
-		return TRUE;
-
-	TheShell->hideShell();
-	MapTransferLoadScreen *ls = NEW MapTransferLoadScreen;
-	ls->init(TheGameInfo);
-	Bool ok = TRUE;
-	if (TheGameInfo->getMapContentsMask() & 2)
-		ok = doFileTransfer(GetPreviewFromMap(game->getMap()), ls, mask);
-	if (ok && TheGameInfo->getMapContentsMask() & 4)
-		ok = doFileTransfer(GetINIFromMap(game->getMap()), ls, mask);
-	if (ok && TheGameInfo->getMapContentsMask() & 8)
-		ok = doFileTransfer(GetStrFileFromMap(game->getMap()), ls, mask);
-	if (ok && TheGameInfo->getMapContentsMask() & 16)
-		ok = doFileTransfer(GetSoloINIFromMap(game->getMap()), ls, mask);
-	if (ok && TheGameInfo->getMapContentsMask() & 32)
-		ok = doFileTransfer(GetAssetUsageFromMap(game->getMap()), ls, mask);
-	if (ok && TheGameInfo->getMapContentsMask() & 64)
-		ok = doFileTransfer(GetReadmeFromMap(game->getMap()), ls, mask);
-	if (ok)
-		ok = doFileTransfer(game->getMap(), ls, mask);
-	delete ls;
-	ls = NULL;
-	if (!ok)
-		TheShell->showShell();
-	return ok;
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp b/Generals/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp
deleted file mode 100644
index f44b7b1455b..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp
+++ /dev/null
@@ -1,1588 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /RedAlert2/NAT.CPP                                          $*
- *                                                                                             *
- *                      $Author:: Steve_t                                                     $*
- *                                                                                             *
- *                     $Modtime:: 3/15/01 12:00PM                                             $*
- *                                                                                             *
- *                    $Revision:: 1                                                           $*
- *                                                                                             *
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- *                                                                                             *
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- *                                                                                             *
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/crc.h"
-#include "Common/UserPreferences.h"
-#include "GameNetwork/FirewallHelper.h"
-#include "GameNetwork/NAT.h"
-#include "GameNetwork/udp.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-FirewallHelperClass *TheFirewallHelper = NULL;
-
-FirewallHelperClass * createFirewallHelper() 
-{
-	return NEW FirewallHelperClass();
-}
-
-
-/***********************************************************************************************
- * FirewallHelperClass::FirewallHelperClass -- Constructor                                     *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 5:03PM ST : Created                                                               *
- *=============================================================================================*/
-/* static */ Int FirewallHelperClass::m_sourcePortPool = 4096;
-
-FirewallHelperClass::FirewallHelperClass(void)
-{
-	//Added Sadullah Nader
-	//Initializations missing and needed
-	m_currentTry = 0;
-	m_numManglers = 0;
-	m_numResponses = 0;
-	m_packetID = 0;
-	m_timeoutLength = 0;
-	m_timeoutStart = 0;
-	//
-
-	m_behavior = FIREWALL_TYPE_UNKNOWN;
-	m_lastBehavior = FIREWALL_TYPE_UNKNOWN;
-	m_sourcePortAllocationDelta = 0;
-	m_lastSourcePortAllocationDelta = 0;
-	Int i = 0;
-	for (; i < MAX_SPARE_SOCKETS; ++i) {
-		m_spareSockets[i].port = 0;
-		m_messages[i].length = 0;
-		m_mangledPorts[i] = 0;
-		m_sparePorts[i] = 0;
-	}
-
-	for (i = 0; i < MAX_NUM_MANGLERS; i++)
-	{
-		m_manglers[i] = 0;
-	}
-	
-	m_currentState = DETECTIONSTATE_IDLE;
-
-	m_sourcePortPool = 4096 + ((timeGetTime() / 1000) % 1000); // do this to make sure we don't use the same source
-																										// port before a previous connection has had a chance
-																										// to time out.
-}
-
-
-
-/***********************************************************************************************
- * FirewallHelperClass::~FirewallHelperClass -- Destructor                                     *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/16/02 BGC : Created                                                                     *
- *=============================================================================================*/
-FirewallHelperClass::~FirewallHelperClass()
-{
-	reset();
-}
-
-/***********************************************************************************************
- * FirewallHelperClass::Reset -- Cleans out the object                                         *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/29/01 1:04AM ST : Created                                                               *
- *=============================================================================================*/
-void FirewallHelperClass::reset(void)
-{
-	closeAllSpareSockets();
-	m_currentState = DETECTIONSTATE_IDLE;
-	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
-		m_messages[i].length = 0;
-	}
-}
-
-
-
-
-/***********************************************************************************************
- * FirewallHelperClass::Detect_Firewall -- See what our firewall is up to                      *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 6:47PM ST : Created                                                               *
- *=============================================================================================*/
-Bool FirewallHelperClass::detectFirewall(void)
-{
-	OptionPreferences pref;
-
-	OptionPreferences::const_iterator it = pref.find("FirewallNeedToRefresh");
-	if (it != pref.end()) {
-		AsciiString str = it->second;
-		if (str.compareNoCase("TRUE") == 0) {
-			TheWritableGlobalData->m_firewallBehavior = FIREWALL_TYPE_UNKNOWN;
-		}
-	}
-
-	if (TheWritableGlobalData->m_firewallBehavior == FIREWALL_TYPE_UNKNOWN) {
-		detectFirewallBehavior();
-
-		return FALSE;
-	} else {
-		DEBUG_LOG(("FirewallHelperClass::detectFirewall - firewall behavior already specified as %d, port allocation delta is %d, skipping detection.\n", TheWritableGlobalData->m_firewallBehavior, TheWritableGlobalData->m_firewallPortAllocationDelta));
-	}
-
-	return TRUE;
-}
-
-
-Bool FirewallHelperClass::behaviorDetectionUpdate()
-{
-	if (m_currentState == DETECTIONSTATE_IDLE) {
-		return FALSE;
-	}
-
-	if (m_currentState == DETECTIONSTATE_DONE) {
-		return TRUE;
-	}
-
-	if (m_currentState == DETECTIONSTATE_BEGIN) {
-		return detectionBeginUpdate();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST1) {
-		return detectionTest1Update();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST2) {
-		return detectionTest2Update();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST3) {
-		return detectionTest3Update();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST3_WAITFORRESPONSES) {
-		return detectionTest3WaitForResponsesUpdate();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST4_1) {
-		return detectionTest4Stage1Update();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST4_2) {
-		return detectionTest4Stage2Update();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST5) {
-		return detectionTest5Update();
-	}
-
-	return TRUE;
-}
-
-/***********************************************************************************************
- * FHC::getNextTemporarySourcePort -- Get a throwaway source port for temporary use        *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    number of ports in sequence to skip                                               *
- *                                                                                             *
- * OUTPUT:   port number                                                                       *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 12:06PM ST : Created                                                              *
- *=============================================================================================*/
-UnsignedShort FirewallHelperClass::getNextTemporarySourcePort(Int skip)
-{
-	UnsignedShort return_port = (UnsignedShort) m_sourcePortPool;
-
-	/*
-	** Try max 256 ports until we find one we can bind to a socket.
-	*/
-	Int tries = 256;
-	if (skip == 0) {
-		skip = 1;
-	}
-
-	while (tries--) {
-
-		m_sourcePortPool += skip;
-		return_port = (UnsignedShort) m_sourcePortPool;
-
-		if (m_sourcePortPool > 65535) {
-			m_sourcePortPool = 2048;
-		}
-
-		/*
-		** Validate the port by trying to bind it to a socket.
-		*/
-		Bool result = openSpareSocket(return_port);
-
-		if (result) {
-			closeSpareSocket(return_port);
-			return(return_port);
-		} else {
-			DEBUG_LOG(("FirewallHelperClass::getNextTemporarySourcePort - failed to open socket on port %d\n"));
-		}
-	}
-
-	return(return_port);
-
-}
-
-
-
-
-
-/***********************************************************************************************
- * FHC::sendToManglerFromPort -- Send to the mangler from the specified port               *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Address of mangler server                                                         *
- *           Source port to send *from*                                                        *
- *                                                                                             *
- * OUTPUT:   True if sent OK                                                                   *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 12:47PM ST : Created                                                              *
- *=============================================================================================*/
-Bool FirewallHelperClass::sendToManglerFromPort(UnsignedInt address, UnsignedShort port, UnsignedShort packetID, Bool blitzme)
-{
-	DEBUG_LOG(("sizeof(ManglerMessage) == %d, sizeof(ManglerData) == %d\n",
-		sizeof(ManglerMessage), sizeof(ManglerData)));
-
-	/*
-	** Build the packet to send out.
-	*/
-	ManglerMessage packet;
-	memset(&(packet.data),0x44, sizeof(ManglerData));
-	packet.data.NetCommandType = 12; // mangler request.
-	packet.data.PacketID = packetID;
-	if (blitzme) {
-		packet.data.BlitzMe = 1;
-	} else {
-		packet.data.BlitzMe = 0;
-	}
-	packet.data.magic = GENERALS_MAGIC_NUMBER;
-	packet.data.OriginalPortNumber = port;
-/*
-	DEBUG_LOG(("Pre-Adjust Buffer = "));
-	for (Int i = 0; i < sizeof(ManglerData); ++i) {
-		DEBUG_LOG(("%02x", *(((unsigned char *)(&(packet.data))) + i)));
-	}
-	DEBUG_LOG(("\n"));
-*/
-	byteAdjust(&(packet.data));
-/*
-	DEBUG_LOG(("Pre-CRC Buffer = "));
-	for (i = 0; i < sizeof(ManglerData); ++i) {
-		DEBUG_LOG(("%02x", *(((unsigned char *)(&(packet.data))) + i)));
-	}
-	DEBUG_LOG(("\n"));
-*/
-	CRC crc;
-	crc.computeCRC((unsigned char *)(&(packet.data.magic)), sizeof(ManglerData) - sizeof(unsigned int));
-	packet.data.CRC = htonl(crc.get());
-
-	packet.length = sizeof(ManglerData);
-
-	DEBUG_LOG(("FirewallHelperClass::sendToManglerFromPort - Sending from port %d to %d.%d.%d.%d:%d\n", (UnsignedInt)port,
-		PRINTF_IP_AS_4_INTS(address), MANGLER_PORT));
-/*
-	DEBUG_LOG(("Buffer = "));
-	for (i = 0; i < sizeof(ManglerData); ++i) {
-		DEBUG_LOG(("%02x", *(((unsigned char *)(&(packet.data))) + i)));
-	}
-	DEBUG_LOG(("\n"));
-*/
-	SpareSocketStruct *spareSocket = findSpareSocketByPort(port);
-//	DEBUG_LOG(("PacketID = %u\n", packetID));
-//	DEBUG_LOG(("OriginalPortNumber = %u\n", port));
-
-	if (spareSocket == NULL) {
-		DEBUG_ASSERTCRASH(spareSocket != NULL, ("Could not find spare socket for send."));
-		DEBUG_LOG(("FirewallHelperClass::sendToManglerFromPort - failed to find the spare socket for port %d\n", port));
-		return FALSE;
-	}
-
-	spareSocket->udp->Write((UnsignedByte *) &packet, sizeof(ManglerData), address, MANGLER_PORT);
-
-	return(TRUE);
-}
-
-
-SpareSocketStruct * FirewallHelperClass::findSpareSocketByPort(UnsignedShort port) {
-	DEBUG_LOG(("FirewallHelperClass::findSpareSocketByPort - trying to find spare socket with port %d\n", port));
-	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
-		if (m_spareSockets[i].port == port) {
-			DEBUG_LOG(("FirewallHelperClass::findSpareSocketByPort - found it!\n"));
-			return &(m_spareSockets[i]);
-		}
-	}
-
-	DEBUG_LOG(("FirewallHelperClass::findSpareSocketByPort - didn't find it\n"));
-	return NULL;
-}
-
-ManglerMessage * FirewallHelperClass::findEmptyMessage() {
-	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
-		if (m_messages[i].length == 0) {
-			return &(m_messages[i]);
-		}
-	}
-	return NULL;
-}
-
-void FirewallHelperClass::byteAdjust(ManglerData *data) {
-//	for (Int i = 0; i < len/4; ++i) {
-//		*buf = htonl(*buf);
-//		++buf;
-//	}
-	data->CRC = htonl(data->CRC);
-	data->magic = htons(data->magic);
-	data->MyMangledPortNumber = htons(data->MyMangledPortNumber);
-	data->OriginalPortNumber = htons(data->OriginalPortNumber);
-	data->PacketID = htons(data->PacketID);
-}
-
-/***********************************************************************************************
- * FHC::Get_Mangler_Response_On_Port -- Get the manglers response to a specific query           *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Packet id of packet we are looking for                                            *
- *                                                                                             *
- * OUTPUT:   Port the mangler saw this packet come from.                                       *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 12:51PM ST : Created                                                              *
- *=============================================================================================*/
-UnsignedShort FirewallHelperClass::getManglerResponse(UnsignedShort packetID, Int time)
-{
-	ManglerMessage *msg = NULL;
-
-//	SpareSocketStruct *spareSocket = NULL;
-
-	sockaddr_in addr;
-
-	Int i = 0;
-	for (; i < MAX_SPARE_SOCKETS; ++i) {
-		if (m_spareSockets[i].udp != NULL) {
-			ManglerMessage *message = findEmptyMessage();
-			if (message == NULL) {
-				break;
-			}
-			Int retval = m_spareSockets[i].udp->Read((unsigned char *)message, sizeof(ManglerData), &addr);
-			if (retval > 0) {
-				
-				CRC crc;
-				crc.computeCRC((unsigned char *)(&(message->data.magic)), sizeof(ManglerData) - sizeof(unsigned int));
-				if (crc.get() != htonl(message->data.CRC)) {
-					DEBUG_LOG(("FirewallHelperClass::getManglerResponse - Saw message, CRC mismatch.  Expected CRC %u, computed CRC %u\n", message->data.CRC, crc.get()));
-					continue;
-				}
-				byteAdjust(&(message->data));
-				message->length = retval;
-				DEBUG_LOG(("FirewallHelperClass::getManglerResponse - Saw message of %d bytes from mangler %d on port %u\n", retval, i, m_spareSockets[i].port));
-				DEBUG_LOG(("FirewallHelperClass::getManglerResponse - Message has packet ID %d 0x%08X, looking for packet id %d 0x%08X\n", message->data.PacketID, message->data.PacketID, packetID, packetID));
-				if (message->data.PacketID == packetID) {
-					DEBUG_LOG(("FirewallHelperClass::getManglerResponse - packet ID's match, returning message\n"));
-					msg = message;
-					message->length = 0;
-				}
-				if (ntohs(message->data.PacketID) == packetID) {
-					DEBUG_LOG(("FirewallHelperClass::getManglerResponse - NETWORK BYTE ORDER packet ID's match, returning message\n"));
-					msg = message;
-					message->length = 0;
-				}
-			}
-		}
-	}
-
-	// See if we have already received it and saved it.
-	if (msg == NULL) {
-		for (i = 0; i < MAX_SPARE_SOCKETS; ++i) {
-			if ((m_messages[i].length != 0) && (m_messages[i].data.PacketID == packetID)) {
-				msg = &(m_messages[i]);
-				msg->length = 0;
-			}
-		}
-	}
-
-	if (msg == NULL) {
-		return 0;
-	}
-
-	UnsignedShort mangled_port = msg->data.MyMangledPortNumber;
-	DEBUG_LOG(("Mangler is seeing packets from port %d as coming from port %d\n", (UnsignedInt)msg->data.OriginalPortNumber, (UnsignedInt)mangled_port));
-	return mangled_port;
-}
-
-
-
-
-/***********************************************************************************************
- * FirewallHelperClass::Write_Firewall_Settings -- Save out firewall settings.                 *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/22/01 10:23PM ST : Created                                                              *
- *=============================================================================================*/
-void FirewallHelperClass::writeFirewallBehavior(void)
-{
-	OptionPreferences pref;
-
-	char num[16];
-	num[0] = 0;
-	itoa(TheGlobalData->m_firewallBehavior, num, 10);
-	AsciiString numstr;
-	numstr = num;
-	(pref)["FirewallBehavior"] = numstr;
-
-	TheWritableGlobalData->m_firewallPortAllocationDelta = TheFirewallHelper->getSourcePortAllocationDelta();
-	num[0] = 0;
-	itoa(TheGlobalData->m_firewallPortAllocationDelta, num, 10);
-	numstr = num;
-	(pref)["FirewallPortAllocationDelta"] = numstr;
-
-	pref.write();
-}
-
-
-/***********************************************************************************************
- * FirewallHelperClass::flagNeedToRefresh -- Flag that the next time we log in we need to      *
- *    refresh our firewall settings.                                                           *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    flag - whether or not to refresh...munkee                                         *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/19/03 4:30PM BGC : Created                                                              *
- *=============================================================================================*/
-void FirewallHelperClass::flagNeedToRefresh(Bool flag)
-{
-	OptionPreferences pref;
-
-	(pref)["FirewallNeedToRefresh"] = flag ? AsciiString("TRUE") : AsciiString("FALSE");
-
-	pref.write();
-}
-
-
-/***********************************************************************************************
- * FirewallHelperClass::Read_Firewall_Behavior -- Read in old firewall settings                *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/22/01 10:25PM ST : Created                                                              *
- *=============================================================================================*/
-void FirewallHelperClass::readFirewallBehavior(void)
-{
-#if (0)
-	m_lastBehavior = (FirewallBehaviorType) ConfigINI.Get_Int("MultiPlayer", "FirewallSettings", FIREWALL_UNKNOWN);
-	m_lastSourcePortAllocationDelta = ConfigINI.Get_Int("MultiPlayer", "FirewallDelta", 1);
-#endif //(0)
-}
-
-
-
-/***********************************************************************************************
- * FHC::detectFirewallBehavior -- What is that wacky firewall doing to our packet headers?   *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Firewall behavior                                                                 *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 12:30PM ST : Created                                                              *
- *=============================================================================================*/
-void FirewallHelperClass::detectFirewallBehavior(/*Bool &canRecord*/)
-{
-	m_behavior = FIREWALL_TYPE_SIMPLE;
-
-	m_currentState = DETECTIONSTATE_BEGIN;
-}
-
-FirewallHelperClass::FirewallBehaviorType FirewallHelperClass::getFirewallBehavior() {
-	m_currentState = DETECTIONSTATE_IDLE;
-	return m_behavior;
-}
-
-Short FirewallHelperClass::getSourcePortAllocationDelta() {
-	return m_sourcePortAllocationDelta;
-}
-
-/* static */ void FirewallHelperClass::getManglerName(Int manglerIndex, Char *nameBuf)
-{
-	AsciiString host;
-	UnsignedShort port;
-	TheGameSpyConfig->getManglerLocation(manglerIndex, host, port);
-	strcpy(nameBuf, host.str());
-}
-
-Bool FirewallHelperClass::detectionBeginUpdate() {
-//	UnsignedShort mangler_port = MANGLER_PORT;
-	 m_packetID = 0x7f00;
-	//int current_mangler = 0;
-
-	/*
-	** Well, we are going to need some manglers.
-	*/
-
-	UnsignedByte mangler_addresses[4][4];
-
-//	Int delta = 0;
-
-
-	/*
-	** If the user specified a particular port to use then we act as if there is no firewall.
-	*/
-	if (TheWritableGlobalData->m_firewallPortOverride != 0) {
-		m_behavior = FIREWALL_TYPE_SIMPLE;
-		DEBUG_LOG(("Source port %d specified by user\n", TheGlobalData->m_firewallPortOverride));
-
-		if (TheGlobalData->m_firewallSendDelay) {
-			UnsignedInt addbehavior = FIREWALL_TYPE_NETGEAR_BUG;
-			addbehavior |= (UnsignedInt)m_behavior;
-			m_behavior = (FirewallBehaviorType) addbehavior;
-			DEBUG_LOG(("Netgear bug specified by command line or SendDelay flag\n"));
-		}
-		m_currentState = DETECTIONSTATE_DONE;
-		return TRUE;
-	}
-
-
-
-	m_timeoutStart = timeGetTime();
-	m_timeoutLength = 5000;
-	DEBUG_LOG(("About to call gethostbyname for the mangler address\n"));
-	int namenum = 0;
-
-	do {
-		AsciiString host;
-		UnsignedShort port;
-		TheGameSpyConfig->getManglerLocation(namenum, host, port);
-		const char *mangler_name_ptr = host.str();
-		DEBUG_LOG(("Looking at %s:%d", host.str(), port));
-
-		/*
-		** Use the wolapi supplied mangler info if available.
-		*/
-//		if (NumManglerServers > namenum) {
-//			mangler_name_ptr = &ManglerServerAddress[namenum][0];
-//			mangler_port = ManglerServerPort[namenum];
-			//current_mangler = CurrentManglerServer;
-//			DEBUG_LOG(("Using mangler from servserv\n"));
-//		}
-		namenum++;
-
-		if (strlen(mangler_name_ptr) == 0) {
-			break;
-		}
-
-		/*
-		** Do the lookup.
-		*/
-		char temp_name[256];
-		strcpy(temp_name, mangler_name_ptr);
-		struct hostent *host_info = gethostbyname(temp_name);
-
-		if (!host_info) {
-			DEBUG_LOG(("gethostbyname failed! Error code %d\n", WSAGetLastError()));
-			break;
-		}
-
-		/*
-		** See if we already have that address in the list.
-		*/
-		Bool found = FALSE;
-		for (Int i=0 ; i<m_numManglers; i++) {
-			if (memcmp(mangler_addresses[i], &host_info->h_addr_list[0][0], 4) == 0) {
-				found = TRUE;
-				break;
-			}
-		}
-		/*
-		** Add the address in if we didn't find it.
-		*/
-		if (!found) {
-			Int m = m_numManglers++;
-			memcpy(&mangler_addresses[m][0], &host_info->h_addr_list[0][0], 4);
-			ntohl((UnsignedInt)mangler_addresses[m]);
-			DEBUG_LOG(("Found mangler address at %d.%d.%d.%d\n", mangler_addresses[m][0], mangler_addresses[m][1], mangler_addresses[m][2], mangler_addresses[m][3]));
-		}
-
-	} while ((m_numManglers < MAX_NUM_MANGLERS) && ((timeGetTime() - m_timeoutStart) < m_timeoutLength));
-
-
-	DEBUG_ASSERTCRASH(m_numManglers > 2, ("not enough mangler addresses found."));
-	if (m_numManglers < 3) {
-		m_currentState = DETECTIONSTATE_DONE;
-		return TRUE;
-	}
-
-	for (Int i=0 ; i<m_numManglers ; i++) {
-		UnsignedInt temp = 0;
-		temp = mangler_addresses[i][3];
-		temp += mangler_addresses[i][2] << 8;
-		temp += mangler_addresses[i][1] << 16;
-		temp += mangler_addresses[i][0] << 24;
-		m_manglers[i] = temp;
-//		memcpy(&(m_manglers[i]), &mangler_addresses[i][0], 4);
-	}
-
-	DEBUG_LOG(("FirewallHelperClass::detectionBeginUpdate - Testing for Netgear bug\n"));
-
-	/*
-	** See if the user specified a netgear firewall - that will save us the trouble.
-	*/
-	if (TheGlobalData->m_firewallSendDelay) {
-		UnsignedInt addbehavior = FIREWALL_TYPE_NETGEAR_BUG;
-		addbehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType) addbehavior;
-		DEBUG_LOG(("FirewallHelperClass::detectionBeginUpdate - Netgear bug specified by command line or SendDelay flag\n"));
-	} else {
-		DEBUG_LOG(("FirewallHelperClass::detectionBeginUpdate - Netgear bug not specified\n"));
-	}
-
-	/*
-	** OK, we have our manglers.
-	**
-	** First test, see if there is any port mangling at all.
-	**
-	**
-	**
-	*/
-
-	DEBUG_LOG(("About to start mangler test 1\n"));
-	/*
-	** Get a spare port number and create a new socket to bind it to.
-	*/
-	m_sparePorts[0] = getNextTemporarySourcePort(0);
-	if (!openSpareSocket(m_sparePorts[0])) {
-		m_currentState = DETECTIONSTATE_DONE;
-		return TRUE;
-	}
-
-	/*
-	** Send to the mangler from this port until we get a response.
-	*/
-	m_timeoutStart = timeGetTime();
-	m_timeoutLength = 6000;
-
-	sendToManglerFromPort(m_manglers[0], m_sparePorts[0], m_packetID);
-	m_currentState = DETECTIONSTATE_TEST1;
-	return FALSE;
-}
-
-
-Bool FirewallHelperClass::detectionTest1Update() {
-
-	m_mangledPorts[0] = getManglerResponse(m_packetID);
-
-	/*
-	** See if we got no response or a non-mangled response.
-	*/
-	if (m_mangledPorts[0] == 0 || m_mangledPorts[0] == m_sparePorts[0]) {
-		if (m_mangledPorts[0] == m_sparePorts[0]) {
-			m_sourcePortAllocationDelta = 0;
-			DEBUG_LOG(("FirewallHelperClass::detectionTest1Update - Non-mangled response from mangler, quitting test.\n"));
-		}
-		if ((m_mangledPorts[0] == 0) && ((timeGetTime() - m_timeoutStart) < m_timeoutLength)) {
-			// we are still waiting for a response and haven't timed out yet.
-			DEBUG_LOG(("FirewallHelperClass::detectionTest1Update - waiting for response from mangler.\n"));
-			return FALSE;
-		}
-		if ((m_mangledPorts[0] == 0) && ((timeGetTime() - m_timeoutStart) >= m_timeoutLength)) {
-			// we are still waiting for a response and we timed out.
-			DEBUG_LOG(("FirewallHelperClass::detectionTest1Update - timed out waiting for response from mangler.\n"));
-		}
-		// either we have received a non-mangled response or we timed out waiting for a response.
-		closeSpareSocket(m_sparePorts[0]);
-
-		m_currentState = DETECTIONSTATE_DONE;
-		return TRUE;
-	}
-
-	DEBUG_LOG(("FirewallHelperClass::detectionTest1Update - test 1 complete\n"));
-	/*
-	** Test one completed, time to start up the second test.
-	**
-	** Second test. See if the ports are mangled differently for different destination IPs.
-	**
-	** We can use the spare socket from the last test and send to a different mangler.
-	**
-	*/
-
-	/*
-	** Send to the mangler from this port until we get a response.
-	*/
-	m_timeoutStart = timeGetTime();
-	m_timeoutLength = 6000;
-	m_mangledPorts[1] = 0;
-	sendToManglerFromPort(m_manglers[1], m_sparePorts[0], m_packetID+1);
-
-	m_currentState = DETECTIONSTATE_TEST2;
-	return FALSE;
-}
-
-Bool FirewallHelperClass::detectionTest2Update() {
-
-	m_mangledPorts[1] = getManglerResponse(m_packetID+1);
-
-	if (m_mangledPorts[1] == 0) {
-		if ((timeGetTime() - m_timeoutStart) <= m_timeoutLength) {
-			return FALSE;
-		}
-		DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - timed out waiting for mangler response\n"));
-		m_currentState = DETECTIONSTATE_DONE;
-		return TRUE;
-	}
-
-	/*
-	** We are done with this socket/port
-	*/
-	closeSpareSocket(m_sparePorts[0]);
-
-	/*
-	** See if we got no response or a non-mangled response.
-	*/
-	if (m_mangledPorts[1] == 0 || m_mangledPorts[1] == m_sparePorts[0]) {
-		m_currentState = DETECTIONSTATE_DONE;
-		UnsignedInt addBehavior = (UnsignedInt)FIREWALL_TYPE_SIMPLE;
-		addBehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType)addBehavior;
-
-		if (m_mangledPorts[1] == 0) {
-			DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - got no response from mangler\n"));
-		} else {
-			DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - got a mangler response, no port mangling\n"));
-		}
-		DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - Setting behavior to SIMPLE, done testing\n"));
-		return TRUE;
-	}
-
-	if (m_mangledPorts[0] == m_mangledPorts[1]) {
-		DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - port mangling doesn't depend on destination IP, setting to DUMB_MANGLING\n"));
-		UnsignedInt addBehavior = (UnsignedInt)FIREWALL_TYPE_DUMB_MANGLING;
-		addBehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType)addBehavior;
-	} else {
-		DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - port mangling depends on destination IP, setting to SMART_MANGLING\n"));
-		UnsignedInt addBehavior = (UnsignedInt)FIREWALL_TYPE_SMART_MANGLING;
-		addBehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType)addBehavior;
-	}
-
-
-
-
-	/*
-	** Third test.
-	**
-	** This test tries to detect a pattern in the ports allocated by the NAT.
-	** We use several source ports for this one.
-	**
-	*/
-
-	m_currentTry = 0;
-	m_packetID = m_packetID + 10;
-
-	DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - moving on to 3rd test\n"));
-
-	m_currentState = DETECTIONSTATE_TEST3;
-	return FALSE;
-}
-
-Bool FirewallHelperClass::detectionTest3Update() {
-	/*
-	** Try this whole thing a max of 3 times.
-	*/
-	if (m_currentTry < 3) {
-		memset(m_sparePorts, 0, sizeof(m_sparePorts));
-		memset(m_mangledPorts, 0, sizeof(m_mangledPorts));
-
-		/*
-		** Open a socket for each source port.
-		** We should use a non-linear set of source ports so we can detect the NAT32 relative offset
-		** case.
-		*/
-		Int i=0;
-		for (; i<NUM_TEST_PORTS ; i++) {
-			m_sparePorts[i] = getNextTemporarySourcePort(i);
-			if (!openSpareSocket(m_sparePorts[i])) {
-
-				/*
-				** Close any spare ports we allocated already before we bail.
-				*/
-				for (Int j=0 ; j<i ; j++) {
-					if (m_sparePorts[j]) {
-						closeSpareSocket(m_sparePorts[j]);
-					}
-				}
-				DEBUG_LOG(("FirewallHelperClass::detectionTest3Update - Failed to open all the spare sockets, bailing test\n"));
-				m_currentState = DETECTIONSTATE_DONE;
-				return TRUE;
-			}
-		}
-
-		/*
-		** OK, lets get some numbers from the mangler.
-		**
-		** Keep sending from each port until we get a response to all the sends. There's a implied
-		** delay between initial sends due to the timeout in Get_Mangler_Response.
-		*/
-		m_timeoutStart = timeGetTime();
-		m_timeoutLength = 12000;
-
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3Update - Sending to %d manglers\n", NUM_TEST_PORTS));
-		for (i=0 ; i<NUM_TEST_PORTS ; i++) {
-			if (m_mangledPorts[i] == 0) {
-				sendToManglerFromPort(m_manglers[0], m_sparePorts[i], m_packetID+i);
-			}
-		}
-
-		m_numResponses = 0;
-
-		m_currentState = DETECTIONSTATE_TEST3_WAITFORRESPONSES;
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3Update - Waiting for mangler responses\n"));
-		return FALSE;
-	}
-
-	DEBUG_LOG(("FirewallHelperClass::detectionTest3Update - Failed to complete test, quitting\n"));
-	m_currentState = DETECTIONSTATE_DONE;
-	return TRUE;
-}
-
-Bool FirewallHelperClass::detectionTest3WaitForResponsesUpdate() {
-	Int i = 0;
-	for (; i < NUM_TEST_PORTS; ++i) {
-		if (m_mangledPorts[i] == 0) {
-			m_mangledPorts[i] = getManglerResponse(m_packetID + i);
-			if (m_mangledPorts[i] != 0) {
-				++m_numResponses;
-			}
-		}
-	}
-
-	if (m_numResponses < NUM_TEST_PORTS) {
-		if ((timeGetTime() - m_timeoutStart) > m_timeoutLength) {
-			/*
-			** Close down those sockets - we are finished with them.
-			*/
-			for (Int j=0 ; j<i ; j++) {
-				if (m_spareSockets[j].port != 0) {
-					closeSpareSocket(m_spareSockets[j].port);
-				}
-			}
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - timed out waiting, bailing test\n"));
-			m_currentState = DETECTIONSTATE_DONE;
-			return TRUE;
-		}
-		return FALSE;
-	}
-
-	/*
-	** Close down those sockets - we are finished with them.
-	*/
-	for (Int j=0 ; j<i ; j++) {
-		if (m_spareSockets[j].port != 0) {
-			closeSpareSocket(m_spareSockets[j].port);
-		}
-	}
-
-	/*
-	** We need at least 4 responses to be sure of the port allocation scheme.
-	*/
-	if (m_numResponses < 4) {
-		if (m_lastSourcePortAllocationDelta != 0 && (int)m_lastBehavior > (int)FIREWALL_TYPE_SIMPLE) {
-			/*
-			** If the delta we got last time we played looks good then use that.
-			*/
-			m_sourcePortAllocationDelta = m_lastSourcePortAllocationDelta;
-		}
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - didn't get enough responses, using %d as the source port allocation delta, finished test\n"));
-		m_currentState = DETECTIONSTATE_DONE;
-		return TRUE;
-	}
-
-
-	Bool relative_delta = FALSE;
-	Bool looks_good = FALSE;
-	Int delta = getNATPortAllocationScheme(m_numResponses, m_sparePorts, m_mangledPorts, relative_delta, looks_good);
-	DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - getNATPortAllocationScheme returned %d\n", delta));
-
-	if (delta) {
-
-		/*
-		** Hey, we got it!
-		*/
-		UnsignedInt addbehavior = 0;
-		if (relative_delta) {
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - detected RELATIVE PORT ALLOCATION\n"));
-			addbehavior = (UnsignedInt)FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION;
-		} else {
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - detected SIMPLE PORT ALLOCATION\n"));
-			addbehavior = (UnsignedInt)FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION;
-		}
-		addbehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType) addbehavior;
-
-		m_sourcePortAllocationDelta = delta;
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - setting source port delta to %d\n", delta));
-	} else {
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - didn't get a delta value\n"));
-		if (m_lastSourcePortAllocationDelta != 0 && (Int)m_lastBehavior > (Int)FIREWALL_TYPE_SIMPLE) {
-			/*
-			** If the delta we got last time we played looks good then use that.
-			*/
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - using the port allocation delta we have from before which is %d\n", m_lastSourcePortAllocationDelta));
-			m_sourcePortAllocationDelta = m_lastSourcePortAllocationDelta;
-		}
-		++m_currentTry;
-		m_currentState = DETECTIONSTATE_TEST3;
-		return FALSE;
-	}
-
-	DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - starting 4th test\n"));
-	/*
-	** Fourth test.
-	**
-	** Test to see if the NAT mangles differently per destination port at the same IP.
-	*/
-	if ((m_behavior & FIREWALL_TYPE_SMART_MANGLING) != 0) {
-
-		if ((m_behavior & FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION) != 0) {
-
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - simple port allocation, Testing to see if the NAT mangles differently per destination port at the same IP\n"));
-
-			/*
-			** We need 2 source ports for this.
-			*/
-			m_sparePorts[0] = getNextTemporarySourcePort(0);
-			if (!openSpareSocket(m_sparePorts[0])) {
-				m_currentState = DETECTIONSTATE_DONE;
-				DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - Failed to open first spare port, bailing\n"));
-				return TRUE;
-			}
-
-			m_sparePorts[1] = getNextTemporarySourcePort(0);
-			if (!openSpareSocket(m_sparePorts[1])) {
-				closeSpareSocket(m_sparePorts[0]);
-				m_currentState = DETECTIONSTATE_DONE;
-				DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - Failed to open second spare port, bailing\n"));
-				return TRUE;
-			}
-
-			/*
-			** Get a reference port.
-			*/
-			m_timeoutStart = timeGetTime();
-			m_timeoutLength = 4000;
-			m_mangledPorts[0] = 0;
-			m_packetID += 10;
-
-			/*
-			** Wait for a response.
-			*/
-			sendToManglerFromPort(m_manglers[0], m_sparePorts[0], m_packetID);
-
-			m_currentState = DETECTIONSTATE_TEST4_1;
-			return FALSE;
-		} else {
-			/*
-			** NAT32 uses different mangled source ports for different destination ports.
-			*/
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - relative port allocation, NAT32 right?\n"));
-			UnsignedInt addbehavior = 0;
-			addbehavior = (UnsignedInt)FIREWALL_TYPE_DESTINATION_PORT_DELTA;
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - adding DESTINATION PORT DELTA to behavior\n"));
-			addbehavior |= (UnsignedInt)m_behavior;
-			m_behavior = (FirewallBehaviorType) addbehavior;
-		}
-	} else {
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - We don't have smart mangling, skipping test 4, entering test 5\n"));
-	}
-
-	DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - entering test 5\n"));
-
-	m_currentState = DETECTIONSTATE_TEST5;
-	return FALSE;
-}
-
-
-
-Bool FirewallHelperClass::detectionTest4Stage1Update() {
-	m_mangledPorts[0] = getManglerResponse(m_packetID);
-
-	if (m_mangledPorts[0] == 0) {
-		if ((timeGetTime() - m_timeoutStart) > m_timeoutLength) {
-			closeSpareSocket(m_sparePorts[0]);
-			closeSpareSocket(m_sparePorts[1]);
-			m_currentState = DETECTIONSTATE_DONE;
-			DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage1Update - timed out waiting for mangler response, quitting\n"));
-			return TRUE;
-		}
-		return FALSE;
-	}
-
-	/*
-	** Send out to a different port at that IP.
-	** We won't get a response for this.
-	*/
-	UnsignedInt addr = m_manglers[0];
-	UnsignedShort port1 = m_sparePorts[0] + 1;
-	sendToManglerFromPort(addr, port1, m_packetID);
-	sendToManglerFromPort(addr, port1, m_packetID);
-	sendToManglerFromPort(addr, port1, m_packetID);
-
-	/*
-	** We can't get a response from a different destination port so the only way to detect
-	** this behavior is to check the next mangled port allocation to see if it's double
-	** what we would normally expect.
-	*/
-	m_packetID++;
-	m_timeoutStart = timeGetTime();
-	m_timeoutLength = 4000;
-
-	sendToManglerFromPort(m_manglers[0], m_sparePorts[1], m_packetID);
-
-	m_currentState = DETECTIONSTATE_TEST4_2;
-	return FALSE;
-}
-
-Bool FirewallHelperClass::detectionTest4Stage2Update() {
-	m_mangledPorts[1] = getManglerResponse(m_packetID);
-
-	if (m_mangledPorts[1] == 0) {
-		if ((timeGetTime() - m_timeoutStart) > m_timeoutLength) {
-			closeSpareSocket(m_sparePorts[0]);
-			closeSpareSocket(m_sparePorts[1]);
-			m_currentState = DETECTIONSTATE_DONE;
-			DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage2Update - timed out waiting for the second mangler response, quitting\n"));
-			return TRUE;
-		}
-		return FALSE;
-	}
-
-	if (m_mangledPorts[1] != m_mangledPorts[0] + m_sourcePortAllocationDelta) {
-		DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage2Update - NAT uses different source ports for different destination ports\n"));
-
-		UnsignedInt addbehavior = 0;
-		addbehavior = (UnsignedInt)FIREWALL_TYPE_DESTINATION_PORT_DELTA;
-		addbehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType) addbehavior;
-	} else {
-		DEBUG_ASSERTCRASH(m_mangledPorts[1] == m_mangledPorts[0] + m_sourcePortAllocationDelta, ("Problem getting the source port deltas."));
-		if (m_mangledPorts[1] == m_mangledPorts[0] + m_sourcePortAllocationDelta) {
-			DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage2Update - NAT uses the same source port for different destination ports\n"));
-		} else {
-			DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage2Update - Unable to complete destination port mangling test\n"));
-			DEBUG_CRASH(("Unable to complete destination port mangling test\n"));
-		}
-	}
-
-	m_currentState = DETECTIONSTATE_TEST5;
-	
-	return detectionTest5Update();
-}
-
-Bool FirewallHelperClass::detectionTest5Update() {
-	/*
-	** We have done all the tests we *have* to. There's other info that it would be nice to know though.
-	**
-	** Test for the netgear bug behavior.
-	*/
-#if (0)
-// moved to before test 1.  Moved because this flag could be specified for another firewall
-// for testing purposes and never get this far because it has behavior that doesn't require
-// all the tests to be performed.
-// BGC 10/1/02
-	DEBUG_LOG(("FirewallHelperClass::detectionTest5Update - Testing for Netgear bug\n"));
-
-	/*
-	** See if the user specified a netgear firewall - that will save us the trouble.
-	*/
-	if (TheGlobalData->m_firewallSendDelay) {
-		UnsignedInt addbehavior = FIREWALL_TYPE_NETGEAR_BUG;
-		addbehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType) addbehavior;
-		DEBUG_LOG(("FirewallHelperClass::detectionTest5Update - Netgear bug specified by command line or SendDelay flag\n"));
-	} else {
-		DEBUG_LOG(("FirewallHelperClass::detectionTest5Update - Netgear bug not specified\n"));
-	}
-#endif // #if (0)
-
-	DEBUG_LOG(("FirewallHelperClass::detectionTest5Update - All done, behavior is: "));
-
-	if ((m_behavior & FIREWALL_TYPE_SIMPLE) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_SIMPLE "));
-	}
-	if ((m_behavior & FIREWALL_TYPE_DUMB_MANGLING) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_DUMB_MANGLING "));
-	}
-	if ((m_behavior & FIREWALL_TYPE_SMART_MANGLING) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_SMART_MANGLING "));
-	}
-	if ((m_behavior & FIREWALL_TYPE_NETGEAR_BUG) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_NETGEAR_BUG "));
-	}
-	if ((m_behavior & FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION "));
-	}
-	if ((m_behavior & FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION "));
-	}
-	if ((m_behavior & FIREWALL_TYPE_DESTINATION_PORT_DELTA) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_DESTINATION_PORT_DELTA "));
-	}
-
-	DEBUG_LOG(("\n"));
-
-	m_currentState = DETECTIONSTATE_DONE;
-	return TRUE;
-}
-
-
-/***********************************************************************************************
- * FHC::Get_NAT_Port_Allocation_Scheme -- Find out how a NAT is allocating ports               *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Number of ports we should analyze                                                 *
- *           List of original port numbers                                                     *
- *           List of mangled port numbers                                                      *
- *           relative_delta (out) Is the delta relative to the original port number?           *
- *           looks_good (out) Do all the values point to the same delta?                       *
- *                                                                                             *
- * OUTPUT:   Port allocation delta                                                             *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 4:45PM ST : Created                                                               *
- *=============================================================================================*/
-Int FirewallHelperClass::getNATPortAllocationScheme(Int numPorts, UnsignedShort *originalPorts, UnsignedShort *mangledPorts, Bool &relativeDelta, Bool &looksGood)
-{
-	DEBUG_ASSERTCRASH(numPorts > 3, ("numPorts too small"));
-
-	DEBUG_LOG(("Looking for port allocation pattern in originalPorts %d, %d, %d, %d\n", originalPorts[0], originalPorts[1], originalPorts[2], originalPorts[3]));
-
-	/*
-	** Sort the mangled ports into order - should be easier to detect patterns.
-	** Stupid bubble sort will do. original_ports may be out of oder after the sort.
-	*/
-	for (Int x=0 ; x<numPorts ; x++) {
-		for (Int y=0 ; y<numPorts-1 ; y++) {
-			if (mangledPorts[y] > mangledPorts[y+1]) {
-				Int temp = mangledPorts[y];
-				mangledPorts[y] = mangledPorts[y+1];
-				mangledPorts[y+1] = temp;
-				temp = originalPorts[y];
-				originalPorts[y] = originalPorts[y+1];
-				originalPorts[y+1] = temp;
-			}
-		}
-	}
-
-	/*
-	** Now start looking for patterns in the port numbers. Possible patterns include.
-	**
-	** Incremental. Port numbers are allocated incrementally.
-	** Every 'n' ports. NAT adds 'n' port numbers when allocating ports.
-	**
-	** Also, schemes may be absolute or relative to the original port number.
-	*/
-
-	/*
-	** 1. Check for absolute sequential allocation.
-	*/
-	if (mangledPorts[1] - mangledPorts[0] == 1) {
-		if (mangledPorts[2] - mangledPorts[1] == 1) {
-			if (mangledPorts[3] - mangledPorts[2] == 1) {
-				DEBUG_LOG(("Incremental port allocation detected\n"));
-				relativeDelta = FALSE;
-				looksGood = TRUE;
-				return(1);
-			}
-		}
-	}
-
-	/*
-	** 2. Check for semi sequential.
-	*/
-	if (mangledPorts[1] - mangledPorts[0] == 2) {
-		if (mangledPorts[2] - mangledPorts[1] == 2) {
-			if (mangledPorts[3] - mangledPorts[2] == 2) {
-				DEBUG_LOG(("Semi-incremental port allocation detected\n"));
-				relativeDelta = FALSE;
-				looksGood = TRUE;
-				return(2);
-			}
-		}
-	}
-
-	Int diff1 = mangledPorts[1] - mangledPorts[0];
-	Int diff2 = mangledPorts[2] - mangledPorts[1];
-	Int diff3 = mangledPorts[3] - mangledPorts[2];
-
-
-	/*
-	** 3. Check for absolute scheme skipping 'n' ports.
-	*/
-	if (diff1 == diff2 && diff2 == diff3) {
-		DEBUG_LOG(("Looks good for absolute allocation sequence delta of %d\n", diff1));
-		relativeDelta = FALSE;
-		looksGood = TRUE;
-		return(diff1);
-	}
-
-	if (diff1 == diff2) {
-		DEBUG_LOG(("Probable absolute allocation sequence delta of %d\n", diff1));
-		relativeDelta = FALSE;
-		looksGood = FALSE;
-		return(diff1);
-	}
-
-	if (diff2 == diff3) {
-		DEBUG_LOG(("Probable absolute allocation sequence delta of %d\n", diff2));
-		relativeDelta = FALSE;
-		looksGood = FALSE;
-		return(diff2);
-	}
-
-
-
-
-	/*
-	** Insert more tests here if we can think of any!!!!!
-	*/
-
-
-
-	/*
-	** 4. Check for relative scheme skipping 'n' ports. NAT32 behaves this way, it skips 100 ports
-	** each time.
-	*/
-	for (Int i=0 ; i<numPorts ; i++) {
-		mangledPorts[i] -= originalPorts[i];
-	}
-
-	diff1 = mangledPorts[1] - mangledPorts[0];
-	diff2 = mangledPorts[2] - mangledPorts[1];
-	diff3 = mangledPorts[3] - mangledPorts[2];
-
-	/*
-	** Look for a linear pattern.
-	*/
-	if (diff1 == diff2 && diff2 == diff3) {
-		/*
-		** Return a -ve result to indicate that port mangling is relative.
-		*/
-		DEBUG_LOG(("Looks good for a relative port range delta of %d\n", diff1));
-		relativeDelta = TRUE;
-		looksGood = TRUE;
-		return(diff1);
-	}
-
-	/*
-	** Look for a broken pattern. Maybe the NAT skipped a whole range.
-	*/
-	if (diff1 == diff2 || diff1 == diff3) {
-		DEBUG_LOG(("Detected probable broken relative port range delta of %d\n", diff1));
-		relativeDelta = TRUE;
-		looksGood = FALSE;
-		return(diff1);
-	}
-
-	if (diff2 == diff3) {
-		DEBUG_LOG(("Detected probable broken relative port range delta of %d\n", diff2));
-		relativeDelta = TRUE;
-		looksGood = FALSE;
-		return(diff2);
-	}
-
-
-	/*
-	** Aw hell, I don't know what it is.
-	*/
-	looksGood = FALSE;
-	relativeDelta = FALSE;
-	return(0);
-}
-
-
-
-
-
-
-/***********************************************************************************************
- * FHC::Get_Firewall_Hardness -- How hard is it to connect to this firewall                    *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Firewall behavior                                                                 *
- *                                                                                             *
- * OUTPUT:   Hardness                                                                          *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/16/01 11:43AM ST : Created                                                              *
- *=============================================================================================*/
-Int FirewallHelperClass::getFirewallHardness(FirewallBehaviorType behavior)
-{
-
-	Int hardness = 0;
-
-
-	UnsignedInt fw = (UnsignedInt) behavior;
-
-	if (((UnsignedInt)FIREWALL_TYPE_SIMPLE & fw) != 0) {
-		hardness++;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_DUMB_MANGLING & fw) != 0) {
-		hardness += 2;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_SMART_MANGLING & fw) != 0) {
-		hardness += 3;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_NETGEAR_BUG & fw) != 0) {
-		hardness += 10;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION & fw) != 0) {
-		hardness += 1;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION & fw) != 0) {
-		hardness += 2;
-	}
-
-	return(hardness);
-}
-
-
-
-
-
-/***********************************************************************************************
- * FHC::Get_Firewall_Retries -- How many retries is it likely to take before we connect?       *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Firewall behavior                                                                 *
- *                                                                                             *
- * OUTPUT:   Hardness                                                                          *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/16/01 11:43AM ST : Created                                                              *
- *=============================================================================================*/
-Int FirewallHelperClass::getFirewallRetries(FirewallBehaviorType behavior)
-{
-
-	Int retries = 2;
-
-
-	UnsignedInt fw = (UnsignedInt) behavior;
-
-	if (((UnsignedInt)FIREWALL_TYPE_SIMPLE & fw) != 0) {
-		retries++;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_DUMB_MANGLING & fw) != 0) {
-		retries += 1;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_SMART_MANGLING & fw) != 0) {
-		retries += 1;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_NETGEAR_BUG & fw) != 0) {
-		//retries += 10;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION & fw) != 0) {
-		//retries += 1;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION & fw) != 0) {
-		retries += 5;
-	}
-
-	return(retries);
-}
-
-
-
-/*
- *  openSpareSocket - opens a socket for communication on a specified port.
- *  returns TRUE if successful, FALSE otherwise.
- */
-Bool FirewallHelperClass::openSpareSocket(UnsignedShort port) {
-	Int i = 0;
-	for (; i < MAX_SPARE_SOCKETS; ++i) {
-		if (m_spareSockets[i].port == 0) {
-			break;
-		}
-	}
-
-	// don't have room for any more spare sockets.  Fail.
-	if (i == MAX_SPARE_SOCKETS) {
-		DEBUG_ASSERTCRASH(i < MAX_SPARE_SOCKETS, ("Ran out of spare sockets."));
-		return FALSE;
-	}
-
-	m_spareSockets[i].udp = NEW UDP();
-	if (m_spareSockets[i].udp == NULL) {
-		DEBUG_LOG(("FirewallHelperClass::openSpareSocket - failed to create UDP object\n"));
-		return FALSE;
-	}
-
-	if (m_spareSockets[i].udp->Bind((UnsignedInt)0, port) != 0) {
-		DEBUG_CRASH(("FirewallHelperClass::openSpareSocket - Failed to init spare socket"));
-		return FALSE;
-	}
-
-	m_spareSockets[i].port = port;
-	DEBUG_LOG(("FirewallHelperClass::openSpareSocket - port %d is open for send\n", port));
-	return TRUE;
-}
-
-/*
- *  closeSpareSocket - closes a socket at a specific port.
- */
-void FirewallHelperClass::closeSpareSocket(UnsignedShort port) {
-	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
-		if (m_spareSockets[i].port == port) {
-			if (m_spareSockets[i].udp != NULL) {
-				delete m_spareSockets[i].udp;
-				m_spareSockets[i].udp = NULL;
-			}
-			m_spareSockets[i].port = 0;
-			break;
-		}
-	}
-}
-
-/*
- *  closeAllSpareSockets - closes all spare sockets, duh.
- */
-void FirewallHelperClass::closeAllSpareSockets() {
-	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
-		if (m_spareSockets[i].port != 0) {
-			m_spareSockets[i].port = 0;
-		}
-		if (m_spareSockets[i].udp != NULL) {
-			delete (m_spareSockets[i].udp);
-			m_spareSockets[i].udp = NULL;
-		}
-	}
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/FrameData.cpp b/Generals/Code/GameEngine/Source/GameNetwork/FrameData.cpp
deleted file mode 100644
index 9e7159c2fc7..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/FrameData.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/FrameData.h"
-#include "GameNetwork/networkutil.h"
-
-/**
- * Constructor
- */
-FrameData::FrameData() 
-{
-	m_frame = 0;
-	m_commandList = NULL;
-	m_commandCount = 0;
-	m_frameCommandCount = -1;
-	//Added By Sadullah Nader
-	//Initializations missing and needed
-	m_lastFailedCC = 0;
-	m_lastFailedFrameCC = 0;
-	//
-}
-
-/**
- * Destructor
- */
-FrameData::~FrameData() 
-{
-	if (m_commandList != NULL) {
-		deleteInstance(m_commandList);
-		m_commandList = NULL;
-	}
-}
-
-/**
- * Initialize this thing.
- */
-void FrameData::init() 
-{
-	m_frame = 0;
-	if (m_commandList == NULL) {
-		m_commandList = newInstance(NetCommandList);
-		m_commandList->init();
-	}
-	m_commandList->reset();
-
-	m_frameCommandCount = -1;
-	//DEBUG_LOG(("FrameData::init\n"));
-	m_commandCount = 0;
-	m_lastFailedCC = -2;
-	m_lastFailedFrameCC = -2;
-}
-
-/**
- * Reset this thing.
- */
-void FrameData::reset() {
-	init();
-}
-
-/**
- * update the thing, doesn't do anything at the moment.
- */
-void FrameData::update() {
-}
-
-/**
- * return the frame number this frame data is associated with.
- */
-UnsignedInt FrameData::getFrame() {
-	return m_frame;
-}
-
-/**
- * Assign the frame number this frame data is associated with.
- */
-void FrameData::setFrame(UnsignedInt frame) {
-	m_frame = frame;
-}
-
-/**
- * Returns true if all the frame command count is equal to the number of commands that have been received.
- */
-FrameDataReturnType FrameData::allCommandsReady(Bool debugSpewage) {
-	if (m_frameCommandCount == m_commandCount) {
-		m_lastFailedFrameCC = -2;
-		m_lastFailedCC = -2;
-		return FRAMEDATA_READY;
-	}
-
-	if (debugSpewage) {
-		if ((m_lastFailedFrameCC != m_frameCommandCount) || (m_lastFailedCC != m_commandCount)) {
-			DEBUG_LOG(("FrameData::allCommandsReady - failed, frame command count = %d, command count = %d\n", m_frameCommandCount, m_commandCount));
-			m_lastFailedFrameCC = m_frameCommandCount;
-			m_lastFailedCC = m_commandCount;
-		}
-	}
-
-	if (m_commandCount > m_frameCommandCount) {
-		DEBUG_LOG(("FrameData::allCommandsReady - There are more commands than there should be (%d, should be %d).  Commands in command list are...\n", m_commandCount, m_frameCommandCount));
-		NetCommandRef *ref = m_commandList->getFirstMessage();
-		while (ref != NULL) {
-			DEBUG_LOG(("%s, frame = %d, id = %d\n", GetAsciiNetCommandType(ref->getCommand()->getNetCommandType()).str(), ref->getCommand()->getExecutionFrame(), ref->getCommand()->getID()));
-			ref = ref->getNext();
-		}
-		DEBUG_LOG(("FrameData::allCommandsReady - End of command list.\n"));
-		DEBUG_LOG(("FrameData::allCommandsReady - about to clear the command list\n"));
-		reset();
-		DEBUG_LOG(("FrameData::allCommandsReady - command list cleared. command list length = %d, command count = %d, frame command count = %d\n", m_commandList->length(), m_commandCount, m_frameCommandCount));
-		return FRAMEDATA_RESEND;
-	}
-	return FRAMEDATA_NOTREADY;
-}
-
-/**
- * Set the command count for this frame
- */
-void FrameData::setFrameCommandCount(UnsignedInt frameCommandCount) {
-	//DEBUG_LOG(("setFrameCommandCount to %d for frame %d\n", frameCommandCount, m_frame));
-	m_frameCommandCount = frameCommandCount;
-}
-
-/**
- * Get the command count for this frame.
- */
-UnsignedInt FrameData::getFrameCommandCount() {
-	return m_frameCommandCount;
-}
-
-/**
- * return the number of commands received so far.
- */
-UnsignedInt FrameData::getCommandCount() {
-	return m_commandCount;
-}
-
-/**
- * Add a command to this frame
- */
-void FrameData::addCommand(NetCommandMsg *msg) {
-	// need to add the message in order of command ID
-	if (m_commandList == NULL) {
-		init();
-	}
-
-	// We don't need to worry about setting the relay since its not getting sent anywhere.
-	if (m_commandList->findMessage(msg) != NULL) {
-		// We don't want to add the same command twice.
-		return;
-	}
-	m_commandList->addMessage(msg);
-
-	++m_commandCount;
-	//DEBUG_LOG(("added command %d, type = %d(%s), command count = %d, frame command count = %d\n", msg->getID(), msg->getNetCommandType(), GetAsciiNetCommandType(msg->getNetCommandType()).str(), m_commandCount, m_frameCommandCount));
-}
-
-/**
- * Return the list of commands for this frame
- */
-NetCommandList * FrameData::getCommandList() {
-	return m_commandList;
-}
-
-/**
- * Set both the command count and the frame command count to 0.
- */
-void FrameData::zeroFrame() {
-	m_commandCount = 0;
-	m_frameCommandCount = 0;
-}
-
-/**
- * destroy all the commands in this frame.
- */
-void FrameData::destroyGameMessages() {
-	if (m_commandList == NULL) {
-		return;
-	}
-
-	m_commandList->reset();
-	m_commandCount = 0;
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/FrameDataManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/FrameDataManager.cpp
deleted file mode 100644
index 9cca5954e7a..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/FrameDataManager.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/FrameDataManager.h"
-#include "GameNetwork/networkutil.h"
-
-/**
- * Constructor.  isLocal tells it whether its the frame data manager for the local player or not.
- */
-FrameDataManager::FrameDataManager(Bool isLocal) {
-	m_isLocal = isLocal;
-	
-	m_frameData = NEW FrameData[FRAME_DATA_LENGTH];
-
-	m_isQuitting = FALSE;
-	m_quitFrame = 0;
-}
-
-/**
- * destructor.
- */
-FrameDataManager::~FrameDataManager() {
-	for (Int i = 0; i < FRAME_DATA_LENGTH; ++i) {
-		m_frameData[i].reset();
-	}
-
-	if (m_frameData)
-	{
-		delete[] m_frameData;
-		m_frameData = NULL;
-	}
-}
-
-/**
- * Initialize all of the frame datas associated with this manager.
- */
-void FrameDataManager::init() {
-	for (Int i = 0; i < FRAME_DATA_LENGTH; ++i) {
-		m_frameData[i].init();
-		if (m_isLocal) {
-			// If this is the local connection, adjust the frame command count.
-			m_frameData[i].setFrameCommandCount(m_frameData[i].getCommandCount());
-		}
-	}
-
-	m_isQuitting = FALSE;
-	m_quitFrame = 0;
-}
-
-/**
- * Reset the state of all the frames.
- */
-void FrameDataManager::reset() {
-	init();
-}
-
-/**
- * update function. Does nothing at this time.
- */
-void FrameDataManager::update() {
-}
-
-/**
- * Add a network command to the appropriate frame.
- */
-void FrameDataManager::addNetCommandMsg(NetCommandMsg *msg) {
-	UnsignedInt frame = msg->getExecutionFrame();
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("FrameDataManager::addNetCommandMsg - about to add a command of type %s for frame %d, frame index %d\n", GetAsciiNetCommandType(msg->getNetCommandType()).str(), frame, frameindex));
-	m_frameData[frameindex].addCommand(msg);
-
-	if (m_isLocal) {
-		// If this is the local connection, adjust the frame command count.
-		m_frameData[frameindex].setFrameCommandCount(m_frameData[frameindex].getCommandCount());
-	}
-}
-
-/**
- * Returns true if all the commands for the given frame are ready.
- */
-FrameDataReturnType FrameDataManager::allCommandsReady(UnsignedInt frame, Bool debugSpewage) {
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-	//DEBUG_ASSERTCRASH(m_frameData[frameindex].getFrame() == frame || frame == 256, ("Looking at old commands!"));
-	return m_frameData[frameindex].allCommandsReady(debugSpewage);
-}
-
-/**
- * Returns the command list for the given frame.
- */
-NetCommandList * FrameDataManager::getFrameCommandList(UnsignedInt frame) {
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-	return m_frameData[frameindex].getCommandList();
-}
-
-/**
- * Reset the contents of the given frame.
- */
-void FrameDataManager::resetFrame(UnsignedInt frame, Bool isAdvancing) {
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-
-	m_frameData[frameindex].reset();
-
-	if (isAdvancing) {
-		m_frameData[frameindex].setFrame(frame + MAX_FRAMES_AHEAD);
-	}
-
-	if (m_isLocal) {
-		m_frameData[frameindex].setFrameCommandCount(m_frameData[frameindex].getCommandCount());
-	}
-
-	DEBUG_ASSERTCRASH(m_frameData[frameindex].getCommandCount() == 0, ("we just reset the frame data and the command count is not zero, huh?"));
-}
-
-/**
- * Returns the command count for the given frame.
- */
-UnsignedInt FrameDataManager::getCommandCount(UnsignedInt frame) {
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-
-	return m_frameData[frameindex].getCommandCount();
-}
-
-/**
- * Set the frame command count for the given frame.
- */
-void FrameDataManager::setFrameCommandCount(UnsignedInt frame, UnsignedInt commandCount) {
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-
-	m_frameData[frameindex].setFrameCommandCount(commandCount);
-}
-
-/**
- *
- */
-UnsignedInt FrameDataManager::getFrameCommandCount(UnsignedInt frame) {
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-
-	return m_frameData[frameindex].getFrameCommandCount();
-}
-
-/**
- * Set both the command count and the frame command count to 0 for the given frames.
- */
-void FrameDataManager::zeroFrames(UnsignedInt startingFrame, UnsignedInt numFrames) {
-	UnsignedInt frameIndex = startingFrame % FRAME_DATA_LENGTH;
-	for (UnsignedInt i = 0; i < numFrames; ++i) {
-		//DEBUG_LOG(("Calling zeroFrame for frame index %d\n", frameIndex));
-		m_frameData[frameIndex].zeroFrame();
-		++frameIndex;
-		frameIndex = frameIndex % FRAME_DATA_LENGTH;
-	}
-}
-
-/**
- * Destroy all the commands held by this object.
- */
-void FrameDataManager::destroyGameMessages() {
-	for (Int i = 0; i < FRAME_DATA_LENGTH; ++i) {
-		m_frameData[i].destroyGameMessages();
-	}
-}
-
-/**
- * Sets the quit frame, also sets the isQuitting flag.
- */
-void FrameDataManager::setQuitFrame(UnsignedInt frame) {
-	m_isQuitting = TRUE;
-	m_quitFrame = frame;
-}
-
-/**
- * returns the quit frame.
- */
-UnsignedInt FrameDataManager::getQuitFrame() {
-	return m_quitFrame;
-}
-
-/**
- * returns true if this frame data manager is quitting.
- */
-Bool FrameDataManager::getIsQuitting() {
-	return m_isQuitting;
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/FrameMetrics.cpp b/Generals/Code/GameEngine/Source/GameNetwork/FrameMetrics.cpp
deleted file mode 100644
index 8a9131b74ee..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/FrameMetrics.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/** FrameMetrics.cpp */
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/FrameMetrics.h"
-#include "GameClient/Display.h"
-#include "GameNetwork/networkutil.h"
-
-FrameMetrics::FrameMetrics() 
-{
-	//Added By Sadullah Nader
-	//Initializations missing and needed
-	m_averageFps = 0.0f;
-	m_averageLatency = 0.0f;
-	m_cushionIndex = 0;
-	m_fpsListIndex = 0;
-	m_lastFpsTimeThing = 0;
-	m_minimumCushion = 0;
-
-	m_pendingLatencies = NEW time_t[MAX_FRAMES_AHEAD];
-	for(Int i = 0; i < MAX_FRAMES_AHEAD; i++)
-		m_pendingLatencies[i] = 0;
-	//
-	m_fpsList = NEW Real[TheGlobalData->m_networkFPSHistoryLength];
-	m_latencyList = NEW Real[TheGlobalData->m_networkLatencyHistoryLength];
-}
-
-FrameMetrics::~FrameMetrics() {
-	if (m_fpsList != NULL) {
-		delete m_fpsList;
-		m_fpsList = NULL;
-	}
-
-	if (m_latencyList != NULL) {
-		delete m_latencyList;
-		m_latencyList = NULL;
-	}
-
-	if (m_pendingLatencies)
-	{
-		delete[] m_pendingLatencies;
-		m_pendingLatencies = NULL;
-	}
-}
-
-void FrameMetrics::init() {
-	m_averageFps = 30;
-	m_averageLatency = (Real)0.2;
-	m_minimumCushion = -1;
-
-	UnsignedInt i = 0;
-	for (; i < TheGlobalData->m_networkFPSHistoryLength; ++i) {
-		m_fpsList[i] = 30.0;
-	}
-	m_fpsListIndex = 0;
-	for (i = 0; i < TheGlobalData->m_networkLatencyHistoryLength; ++i) {
-		m_latencyList[i] = (Real)0.2;
-	}
-	m_cushionIndex = 0;
-}
-
-void FrameMetrics::reset() {
-	init();
-}
-
-void FrameMetrics::doPerFrameMetrics(UnsignedInt frame) {
-	// Do the measurement of the fps.
-	time_t curTime = timeGetTime();
-	if ((curTime - m_lastFpsTimeThing) >= 1000) {
-//		if ((m_fpsListIndex % 16) == 0) {
-//			DEBUG_LOG(("FrameMetrics::doPerFrameMetrics - adding %f to fps history. average before: %f ", m_fpsList[m_fpsListIndex], m_averageFps));
-//		}
-		m_averageFps -= ((m_fpsList[m_fpsListIndex])) / TheGlobalData->m_networkFPSHistoryLength; // subtract out the old value from the average.
-		m_fpsList[m_fpsListIndex] = TheDisplay->getAverageFPS();
-//		m_fpsList[m_fpsListIndex] = TheGameClient->getFrame() - m_fpsStartingFrame;
-		m_averageFps += ((Real)(m_fpsList[m_fpsListIndex])) / TheGlobalData->m_networkFPSHistoryLength; // add the new value to the average.
-//		DEBUG_LOG(("average after: %f\n", m_averageFps));
-		++m_fpsListIndex;
-		m_fpsListIndex %= TheGlobalData->m_networkFPSHistoryLength;
-		m_lastFpsTimeThing = curTime;
-	}
-
-	Int pendingLatenciesIndex = frame % MAX_FRAMES_AHEAD;
-	m_pendingLatencies[pendingLatenciesIndex] = curTime;
-
-}
-
-void FrameMetrics::processLatencyResponse(UnsignedInt frame) {
-	time_t curTime = timeGetTime();
-	Int pendingIndex = frame % MAX_FRAMES_AHEAD;
-	time_t timeDiff = curTime - m_pendingLatencies[pendingIndex];
-
-	Int latencyListIndex = frame % TheGlobalData->m_networkLatencyHistoryLength;
-	m_averageLatency -= m_latencyList[latencyListIndex] / TheGlobalData->m_networkLatencyHistoryLength;
-	m_latencyList[latencyListIndex] = (Real)timeDiff / (Real)1000; // convert to seconds from milliseconds.
-	m_averageLatency += m_latencyList[latencyListIndex] / TheGlobalData->m_networkLatencyHistoryLength;
-
-	if (frame % 16 == 0) {
-//		DEBUG_LOG(("ConnectionManager::processFrameInfoAck - average latency = %f\n", m_averageLatency));
-	}
-}
-
-void FrameMetrics::addCushion(Int cushion) {
-	++m_cushionIndex;
-	m_cushionIndex %= TheGlobalData->m_networkCushionHistoryLength;
-	if (m_cushionIndex == 0) {
-		m_minimumCushion = -1;
-	}
-	if ((cushion < m_minimumCushion) || (m_minimumCushion == -1)) {
-		m_minimumCushion = cushion;
-	}
-}
-
-Int FrameMetrics::getAverageFPS() {
-	return (Int)m_averageFps;
-}
-
-Real FrameMetrics::getAverageLatency() {
-	return m_averageLatency;
-}
-
-Int FrameMetrics::getMinimumCushion() {
-	return m_minimumCushion;
-}
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp
index f7eb013b315..7ead7cd440d 100644
--- a/Generals/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp
+++ b/Generals/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp
@@ -25,7 +25,7 @@
 // FILE: GUIUtil.cpp //////////////////////////////////////////////////////
 // Author: Matthew D. Campbell, Sept 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameNetwork/GUIUtil.h"
 #include "GameNetwork/NetworkDefs.h"
@@ -44,11 +44,6 @@
 #include "Common/PlayerTemplate.h"
 #include "GameNetwork/LANAPICallbacks.h" // for acceptTrueColor, etc
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // -----------------------------------------------------------------------------
 
@@ -140,7 +135,7 @@ void ShowUnderlyingGUIElements( Bool show, const char *layoutFilename, const cha
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	if (!parent)
 	{
-		DEBUG_CRASH(("Window %s not found\n", parentNameStr.str()));
+		DEBUG_CRASH(("Window %s not found", parentNameStr.str()));
 		return;
 	}
 
@@ -196,7 +191,7 @@ void PopulateColorComboBox(Int comboBox, GameWindow *comboArray[], GameInfo *myG
 
 	for (i = 0; i < MAX_SLOTS; i++)
 	{
-		GameSlot *slot = myGame->getSlot(i);	
+		GameSlot *slot = myGame->getSlot(i);
 		if( slot && (i != comboBox) && (slot->getColor() >= 0 )&& (slot->getColor() < numColors))
 		{
 			DEBUG_ASSERTCRASH(slot->getColor() >= 0,("We've tried to access array %d and that ain't good",slot->getColor()));
@@ -316,7 +311,7 @@ void PopulateTeamComboBox(Int comboBox, GameWindow *comboArray[], GameInfo *myGa
 //-------------------------------------------------------------------------------------------------
 void UpdateSlotList( GameInfo *myGame, GameWindow *comboPlayer[],
 										GameWindow *comboColor[], GameWindow *comboPlayerTemplate[],
-										GameWindow *comboTeam[], GameWindow *buttonAccept[], 
+										GameWindow *comboTeam[], GameWindow *buttonAccept[],
 										GameWindow *buttonStart, GameWindow *buttonMapStartPosition[] )
 {
 	if(!AreSlotListUpdatesEnabled())
@@ -339,13 +334,14 @@ void UpdateSlotList( GameInfo *myGame, GameWindow *comboPlayer[],
 		for( int i =0; i < MAX_SLOTS; i++ )
 		{
 			GameSlot * slot = myGame->getSlot(i);
+
 			// if i'm host, enable the controls for AI
-			if(myGame->amIHost() && slot && slot->isAI())
+			if(myGame->amIHost() && slot->isAI())
 			{
 				EnableAcceptControls(TRUE, myGame, comboPlayer, comboColor, comboPlayerTemplate,
 					comboTeam, buttonAccept, buttonStart, buttonMapStartPosition, i);
 			}
-			else if (slot && myGame->getLocalSlotNum() == i)
+			else if (myGame->getLocalSlotNum() == i)
 			{
 				if(slot->isAccepted() && !myGame->amIHost())
 				{
@@ -364,14 +360,14 @@ void UpdateSlotList( GameInfo *myGame, GameWindow *comboPlayer[],
 							comboTeam, buttonAccept, buttonStart, buttonMapStartPosition);
 					}
 				}
-				
+
 			}
 			else if(myGame->amIHost())
 			{
 				EnableAcceptControls(FALSE, myGame, comboPlayer, comboColor, comboPlayerTemplate,
 					comboTeam, buttonAccept, buttonStart, buttonMapStartPosition, i);
 			}
-			if(slot && slot->isHuman())
+			if(slot->isHuman())
 			{
 				UnicodeString newName = slot->getName();
 				UnicodeString oldName = GadgetComboBoxGetText(comboPlayer[i]);
@@ -400,7 +396,7 @@ void UpdateSlotList( GameInfo *myGame, GameWindow *comboPlayer[],
 				}
 			}
 			else
-			{				
+			{
 				GadgetComboBoxSetSelectedPos(comboPlayer[i], slot->getState(), TRUE);
         if( buttonAccept &&  buttonAccept[i] )
 				  buttonAccept[i]->winHide(TRUE);
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameInfo.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameInfo.cpp
deleted file mode 100644
index 24501b3dcc5..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameInfo.cpp
+++ /dev/null
@@ -1,1546 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GameInfo.cpp //////////////////////////////////////////////////////
-// game setup state info
-// Author: Matthew D. Campbell, December 2001
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/CRCDebug.h"
-#include "Common/file.h"
-#include "Common/FileSystem.h"
-#include "Common/GameState.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MapUtil.h"
-#include "Common/MultiplayerSettings.h"
-#include "Common/PlayerTemplate.h"
-#include "Common/Xfer.h"
-#include "GameNetwork/FileTransfer.h"
-#include "GameNetwork/GameInfo.h"
-#include "GameNetwork/GameSpy/ThreadUtils.h"
-#include "GameNetwork/GameSpy/StagingRoomGameInfo.h"
-#include "GameNetwork/LANAPI.h"						// for testing packet size
-#include "GameNetwork/LANAPICallbacks.h"	// for testing packet size
-#include "strtok_r.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-
-GameInfo *TheGameInfo = NULL;
-
-// GameSlot ----------------------------------------
-
-GameSlot::GameSlot()
-{
-	reset();
-}
-
-void GameSlot::reset()
-{
-	m_state = SLOT_CLOSED; // decent default
-	m_isAccepted = false;
-	m_hasMap = true;
-	m_color = -1;
-	m_startPos = -1;
-	m_playerTemplate = -1;
-	m_teamNumber = -1;
-	m_NATBehavior = FirewallHelperClass::FIREWALL_TYPE_SIMPLE;
-	m_lastFrameInGame = 0;
-	m_disconnected = FALSE;
-	m_port = 0;
-	m_isMuted = FALSE;
-	m_origPlayerTemplate = -1;
-	m_origStartPos = -1;
-	m_origColor = -1;
-}
-
-void GameSlot::saveOffOriginalInfo( void )
-{
-	DEBUG_LOG(("GameSlot::saveOffOriginalInfo() - orig was color=%d, pos=%d, house=%d\n",
-		m_origColor, m_origStartPos, m_origPlayerTemplate));
-	m_origPlayerTemplate = m_playerTemplate;
-	m_origStartPos = m_startPos;
-	m_origColor = m_color;
-	DEBUG_LOG(("GameSlot::saveOffOriginalInfo() - color=%d, pos=%d, house=%d\n",
-		m_color, m_startPos, m_playerTemplate));
-}
-
-static Int getSlotIndex(const GameSlot *slot)
-{
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (TheGameInfo->getConstSlot(i) == slot)
-			return i;
-	}
-	return -1;
-}
-
-static Bool isSlotLocalAlly(const GameSlot *slot)
-{
-	Int slotIndex = getSlotIndex(slot);
-	Int localIndex = TheGameInfo->getLocalSlotNum();
-	const GameSlot *localSlot = TheGameInfo->getConstSlot(localIndex);
-
-	// if either doesn't exist, not an ally
-	if (slotIndex < 0 || localIndex < 0)
-		return FALSE;
-
-	// if slot is us, ally
-	if (slotIndex == localIndex)
-		return TRUE;
-
-	// if slot is same team as us, ally
-	if (slot->getTeamNumber() == localSlot->getTeamNumber() && slot->getTeamNumber() >= 0)
-		return TRUE;
-
-	// if we're an observer, we see all
-	if (localSlot->getOriginalPlayerTemplate() == PLAYERTEMPLATE_OBSERVER)
-		return TRUE;
-
-	// nope
-	return FALSE;
-}
-
-UnicodeString GameSlot::getApparentPlayerTemplateDisplayName( void ) const
-{
-	if (TheMultiplayerSettings && TheMultiplayerSettings->showRandomPlayerTemplate() &&
-		m_origPlayerTemplate == PLAYERTEMPLATE_RANDOM && !isSlotLocalAlly(this))
-	{
-		return TheGameText->fetch("GUI:Random");
-	}
-	else if (m_origPlayerTemplate == PLAYERTEMPLATE_OBSERVER)
-	{
-		return TheGameText->fetch("GUI:Observer");
-	}
-	DEBUG_LOG(("Fetching player template display name for player template %d (orig is %d)\n",
-		m_playerTemplate, m_origPlayerTemplate));
-	if (m_playerTemplate < 0)
-	{
-		return TheGameText->fetch("GUI:Random");
-	}
-	return ThePlayerTemplateStore->getNthPlayerTemplate(m_playerTemplate)->getDisplayName();
-}
-
-Int GameSlot::getApparentPlayerTemplate( void ) const
-{
-	if (TheMultiplayerSettings && TheMultiplayerSettings->showRandomPlayerTemplate() &&
-		!isSlotLocalAlly(this))
-	{
-		return m_origPlayerTemplate;
-	}
-	return m_playerTemplate;
-}
-
-Int GameSlot::getApparentColor( void ) const
-{
-	if (TheMultiplayerSettings && m_origPlayerTemplate == PLAYERTEMPLATE_OBSERVER)
-		return TheMultiplayerSettings->getColor(PLAYERTEMPLATE_OBSERVER)->getColor();
-
-	if (TheMultiplayerSettings && TheMultiplayerSettings->showRandomColor() &&
-		!isSlotLocalAlly(this))
-	{
-		return m_origColor;
-	}
-	return m_color;
-}
-
-Int GameSlot::getApparentStartPos( void ) const
-{
-	if (TheMultiplayerSettings && TheMultiplayerSettings->showRandomStartPos() &&
-		!isSlotLocalAlly(this))
-	{
-		return m_origStartPos;
-	}
-	return m_startPos;
-}
-
-
-void GameSlot::unAccept( void )
-{
-	if (isHuman())
-	{
-		m_isAccepted = false;
-	}
-}
-
-void GameSlot::setMapAvailability( Bool hasMap )
-{
-	if (isHuman())
-	{
-		m_hasMap = hasMap;
-	}
-}
-
-void GameSlot::setState( SlotState state, UnicodeString name, UnsignedInt IP )
-{
-	if (!(isAI() &&  (state == SLOT_EASY_AI || state == SLOT_MED_AI || state == SLOT_BRUTAL_AI)))
-	{
-		m_color = -1;
-		m_startPos = -1;
-		m_playerTemplate = -1;
-		m_teamNumber = -1;
-
-		if (state == SLOT_OPEN && TheGameSpyGame && TheGameSpyGame->getConstSlot(0) == this)
-		{
-			DEBUG_CRASH(("Game Is Hosed!\n"));
-		}
-	}
-	if (state == SLOT_PLAYER)
-	{
-		reset();
-		m_state = state;
-		m_name = name;
-	}// state == SLOT_PLAYER
-	else
-	{
-		m_state = state;
-		m_isAccepted = true;
-		m_hasMap = true;
-		switch(state)
-		{
-		case SLOT_OPEN:
-			m_name = TheGameText->fetch("GUI:Open");
-			break;
-		case SLOT_EASY_AI:
-			m_name = TheGameText->fetch("GUI:EasyAI");
-			break;
-		case SLOT_MED_AI:
-			m_name = TheGameText->fetch("GUI:MediumAI");
-			break;
-		case SLOT_BRUTAL_AI:
-			m_name = TheGameText->fetch("GUI:HardAI");
-			break;
-		case SLOT_CLOSED:
-		default:
-			m_name = TheGameText->fetch("GUI:Closed");
-			break;
-		}
-	}
-
-	m_IP = IP;
-}
-
-// Various tests
-Bool GameSlot::isHuman( void ) const
-{
-	return m_state == SLOT_PLAYER;
-}
-
-Bool GameSlot::isOccupied( void ) const
-{
-	return m_state == SLOT_PLAYER || m_state == SLOT_EASY_AI || m_state == SLOT_MED_AI || m_state == SLOT_BRUTAL_AI;
-}
-
-Bool GameSlot::isAI( void ) const
-{
-	return m_state == SLOT_EASY_AI || m_state == SLOT_MED_AI || m_state == SLOT_BRUTAL_AI;
-}
-
-Bool GameSlot::isPlayer( AsciiString userName ) const
-{
-	UnicodeString uName;
-	uName.translate(userName);
-	return (m_state == SLOT_PLAYER && !m_name.compareNoCase(uName));
-}
-
-Bool GameSlot::isPlayer( UnicodeString userName ) const
-{
-	return (m_state == SLOT_PLAYER && !m_name.compareNoCase(userName));
-}
-
-Bool GameSlot::isPlayer( UnsignedInt ip ) const
-{
-	return (m_state == SLOT_PLAYER && m_IP == ip);
-}
-
-Bool GameSlot::isOpen( void ) const
-{
-	return m_state == SLOT_OPEN;
-}
-
-// GameInfo ----------------------------------------
-
-GameInfo::GameInfo()
-{
-	for (int i=0; i<MAX_SLOTS; ++i)
-	{
-		m_slot[i] = NULL;
-	}
-	reset();
-}
-
-void GameInfo::init( void )
-{
-	reset();
-}
-
-void GameInfo::reset( void )
-{
-	m_crcInterval = NET_CRC_INTERVAL;
-	m_inGame = false;
-	m_inProgress = false;
-	m_gameID = 0;
-	m_mapName = AsciiString("NOMAP");
-	m_mapMask = 0;
-	m_seed = GetTickCount(); //GameClientRandomValue(0, INT_MAX - 1);
-	m_surrendered = FALSE;
-	// Added By Sadullah Nader
-	// Initializations missing and needed
-//	m_localIP = 0; // BGC - actually we don't want this to be reset since the m_localIP is 
-										// set properly in the constructor of LANGameInfo which uses this as a base class.
-	m_mapCRC = 0;
-	m_mapSize = 0;
-	//
-
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_slot[i])
-			m_slot[i]->reset();
-	}
-
-	m_preorderMask = 0;
-}
-
-Bool GameInfo::isPlayerPreorder(Int index)
-{
-	if (index >= 0 && index < MAX_SLOTS)
-		return ((m_preorderMask & (1 << index)) != 0);
-	return FALSE;
-}
-
-void GameInfo::markPlayerAsPreorder(Int index)
-{
-	if (index >= 0 && index < MAX_SLOTS)
-		m_preorderMask |= 1 << index;
-}
-
-
-void GameInfo::clearSlotList( void )
-{
-	for (int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_slot[i])
-			m_slot[i]->setState(SLOT_CLOSED);
-	}
-}
-
-Int GameInfo::getNumPlayers( void ) const
-{
-	Int numPlayers = 0;
-	for (int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_slot[i] && m_slot[i]->isOccupied())
-			numPlayers++;
-	}
-	return numPlayers;
-}
-
-Int GameInfo::getNumNonObserverPlayers( void ) const
-{
-	Int numPlayers = 0;
-	for (int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_slot[i] && m_slot[i]->isOccupied() && m_slot[i]->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
-			numPlayers++;
-	}
-	return numPlayers;
-}
-
-Int GameInfo::getMaxPlayers( void ) const
-{
-	if (!TheMapCache)
-		return -1;
-
-	AsciiString lowerMap = m_mapName;
-	lowerMap.toLower();
-	MapCache::iterator it = TheMapCache->find(lowerMap);
-	if (it == TheMapCache->end())
-		return -1;
-	MapMetaData data = it->second;
-	return data.m_numPlayers;
-}
-
-void GameInfo::enterGame( void )
-{
-	DEBUG_ASSERTCRASH(!m_inGame && !m_inProgress, ("Entering game at a bad time!"));
-	reset();
-	m_inGame = true;
-	m_inProgress = false;
-}
-
-void GameInfo::leaveGame( void )
-{
-	DEBUG_ASSERTCRASH(m_inGame && !m_inProgress, ("Leaving game at a bad time!"));
-	reset();
-}
-
-void GameInfo::startGame( Int gameID )
-{
-	DEBUG_ASSERTCRASH(m_inGame && !m_inProgress, ("Starting game at a bad time!"));
-	m_gameID = gameID;
-	closeOpenSlots();
-	m_inProgress = true;
-}
-
-void GameInfo::endGame( void )
-{
-	DEBUG_ASSERTCRASH(m_inGame && m_inProgress, ("Ending game without playing one!"));
-	m_inGame = false;
-	m_inProgress = false;
-}
-
-void GameInfo::setSlot( Int slotNum, GameSlot slotInfo )
-{
-	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("GameInfo::setSlot - Invalid slot number"));
-	if (slotNum < 0 || slotNum >= MAX_SLOTS)
-		return;
-
-	DEBUG_ASSERTCRASH( m_slot[slotNum], ("NULL slot pointer"));
-	if (!m_slot[slotNum])
-		return;
-
-//	Bool isHuman = slotInfo.isHuman();
-//	Bool wasHuman = m_slot[slotNum]->isHuman();
-
-	if (slotNum == 0)
-	{
-		slotInfo.setAccept();
-		slotInfo.setMapAvailability(true);
-	}
-	*m_slot[slotNum] = slotInfo;
-
-#ifdef DEBUG_LOGGING
-	UnsignedInt ip = slotInfo.getIP();
-#endif
-
-	DEBUG_LOG(("GameInfo::setSlot - setting slot %d to be player %ls with IP %d.%d.%d.%d\n", slotNum, slotInfo.getName().str(),
-							PRINTF_IP_AS_4_INTS(ip)));
-}
-
-GameSlot* GameInfo::getSlot( Int slotNum )
-{
-	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("GameInfo::getSlot - Invalid slot number"));
-	if (slotNum < 0 || slotNum >= MAX_SLOTS)
-		return NULL;
-
-	return m_slot[slotNum];
-}
-
-const GameSlot* GameInfo::getConstSlot( Int slotNum ) const
-{
-	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("GameInfo::getSlot - Invalid slot number"));
-	if (slotNum < 0 || slotNum >= MAX_SLOTS)
-		return NULL;
-
-	return m_slot[slotNum];
-}
-
-Int GameInfo::getLocalSlotNum( void ) const
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for local game slot while not in game"));
-	if (!m_inGame)
-		return -1;
-
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = getConstSlot(i);
-		if (slot == NULL) {
-			continue;
-		}
-		if (slot->isPlayer(m_localIP))
-			return i;
-	}
-	return -1;
-}
-
-Int GameInfo::getSlotNum( AsciiString userName ) const
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
-	if (!m_inGame)
-		return -1;
-
-	UnicodeString uName;
-	uName.translate(userName);
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = getConstSlot(i);
-		if (slot->isPlayer( uName ))
-			return i;
-	}
-	return -1;
-}
-
-Bool GameInfo::amIHost( void ) const
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
-	if (!m_inGame)
-		return false;
-
-	return getConstSlot(0)->isPlayer(m_localIP);
-}
-
-void GameInfo::setMap( AsciiString mapName )
-{
-	m_mapName = mapName;
-	if (m_inGame && amIHost())
-	{
-		const MapMetaData *mapData = TheMapCache->findMap( mapName );
-		if (mapData)
-		{
-			m_mapMask = 1;
-			AsciiString path = mapName;
-			path.removeLastChar();
-			path.removeLastChar();
-			path.removeLastChar();
-			path.concat("tga");
-			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", path.str()));
-			File *fp = TheFileSystem->openFile(path.str());
-			if (fp)
-			{
-				m_mapMask |= 2;
-				fp->close();
-				fp = NULL;
-			}
-
-			AsciiString newMapName;
-			if (mapName.getLength() > 0)
-			{
-				AsciiString token;
-				mapName.nextToken(&token, "\\/");
-				// add all the tokens except the last one.
-				// that way we don't add the filename, just the
-				// directory name, we can do this since the filename
-				// is just the directory name with the file extention
-				// added onto it.
-				while (mapName.find('\\') != NULL)
-				{
-					if (newMapName.getLength() > 0)
-					{
-						newMapName.concat('/');
-					}
-					newMapName.concat(token);
-					mapName.nextToken(&token, "\\/");
-				}
-			}
-			newMapName.concat("/map.ini");
-			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", newMapName.str()));
-			fp = TheFileSystem->openFile(newMapName.str());
-			if (fp)
-			{
-				m_mapMask |= 4;
-				fp->close();
-				fp = NULL;
-			}
-
-			path = GetStrFileFromMap(m_mapName);
-			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", path.str()));
-			fp = TheFileSystem->openFile(path.str());
-			if (fp)
-			{
-				m_mapMask |= 8;
-				fp->close();
-				fp = NULL;
-			}
-
-			path = GetSoloINIFromMap(m_mapName);
-			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", path.str()));
-			fp = TheFileSystem->openFile(path.str());
-			if (fp)
-			{
-				m_mapMask |= 16;
-				fp->close();
-				fp = NULL;
-			}
-
-			path = GetAssetUsageFromMap(m_mapName);
-			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", path.str()));
-			fp = TheFileSystem->openFile(path.str());
-			if (fp)
-			{
-				m_mapMask |= 32;
-				fp->close();
-				fp = NULL;
-			}
-
-			path = GetReadmeFromMap(m_mapName);
-			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", path.str()));
-			fp = TheFileSystem->openFile(path.str());
-			if (fp)
-			{
-				m_mapMask |= 64;
-				fp->close();
-				fp = NULL;
-			}
-		}
-		else
-		{
-			m_mapMask = 0;
-		}
-	}
-}
-
-void GameInfo::setMapContentsMask( Int mask )
-{
-	m_mapMask = mask;
-}
-
-void GameInfo::setMapCRC( UnsignedInt mapCRC )
-{
-	m_mapCRC = mapCRC;
-	if (!TheMapCache)
-		return;
-
-	// check the map cache
-	if (m_inGame && getLocalSlotNum() >= 0)
-	{
-		//TheMapCache->updateCache();
-		AsciiString lowerMap = m_mapName;
-		lowerMap.toLower();
-		//DEBUG_LOG(("GameInfo::setMapCRC - looking for map file \"%s\" in the map cache\n", lowerMap.str()));
-		std::map<AsciiString, MapMetaData>::iterator it = TheMapCache->find(lowerMap);
-		if (it == TheMapCache->end())
-		{
-			/*
-			DEBUG_LOG(("GameInfo::setMapCRC - could not find map file.\n"));
-			it = TheMapCache->begin();
-			while (it != TheMapCache->end())
-			{
-				DEBUG_LOG(("\t\"%s\"\n", it->first.str()));
-				++it;
-			}
-			*/
-			getSlot(getLocalSlotNum())->setMapAvailability(false);
-		}
-		else if (m_mapCRC != it->second.m_CRC)
-		{
-			DEBUG_LOG(("GameInfo::setMapCRC - map CRC's do not match (%X/%X).\n", m_mapCRC, it->second.m_CRC));
-			getSlot(getLocalSlotNum())->setMapAvailability(false);
-		}
-		else
-		{
-			//DEBUG_LOG(("GameInfo::setMapCRC - map CRC's match.\n"));
-			getSlot(getLocalSlotNum())->setMapAvailability(true);
-		}
-	}
-}
-
-void GameInfo::setMapSize( UnsignedInt mapSize )
-{
-	m_mapSize = mapSize;
-	if (!TheMapCache)
-		return;
-
-	// check the map cache
-	if (m_inGame && getLocalSlotNum() >= 0)
-	{
-		//TheMapCache->updateCache();
-		AsciiString lowerMap = m_mapName;
-		lowerMap.toLower();
-		std::map<AsciiString, MapMetaData>::iterator it = TheMapCache->find(lowerMap);
-		if (it == TheMapCache->end())
-		{
-			DEBUG_LOG(("GameInfo::setMapSize - could not find map file.\n"));
-			getSlot(getLocalSlotNum())->setMapAvailability(false);
-		}
-		else if (m_mapCRC != it->second.m_CRC)
-		{
-			DEBUG_LOG(("GameInfo::setMapSize - map CRC's do not match.\n"));
-			getSlot(getLocalSlotNum())->setMapAvailability(false);
-		}
-		else
-		{
-			//DEBUG_LOG(("GameInfo::setMapSize - map CRC's match.\n"));
-			getSlot(getLocalSlotNum())->setMapAvailability(true);
-		}
-	}
-}
-
-void GameInfo::setSeed( Int seed )
-{
-	m_seed = seed;
-}
-
-void GameInfo::setSlotPointer( Int index, GameSlot *slot )
-{
-	if (index < 0 || index >= MAX_SLOTS)
-		return;
-
-	m_slot[index] = slot;
-}
-
-Bool GameInfo::isColorTaken(Int colorIdx, Int slotToIgnore ) const
-{
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = getConstSlot(i);
-		if (slot && slot->getColor() == colorIdx && i != slotToIgnore)
-			return true;
-	}
-	return false;
-}
-
-Bool GameInfo::isStartPositionTaken(Int positionIdx, Int slotToIgnore ) const
-{
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = getConstSlot(i);
-		if (slot && slot->getStartPos() == positionIdx && i != slotToIgnore)
-			return true;
-	}
-	return false;
-}
-
-void GameInfo::resetAccepted( void )
-{
-	GameSlot *slot = getSlot(0);
-	if (slot)
-		slot->setAccept();
-	for(int i = 1; i< MAX_SLOTS; i++)
-	{
-		slot = getSlot(i);
-		if (slot)
-			slot->unAccept();
-	}
-}
-
-void GameInfo::resetStartSpots()
-{
-	GameSlot *slot = NULL;
-	for (Int i = 0; i < MAX_SLOTS; ++i)
-	{
-		slot = getSlot(i);
-		if (slot != NULL)
-		{
-			slot->setStartPos(-1);
-		}
-	}
-}
-
-// adjust the slots in the game to open or closed
-// depending on the players in there now and the number of
-// players the map can hold.
-void GameInfo::adjustSlotsForMap()
-{
-	const MapMetaData *md = TheMapCache->findMap(m_mapName);
-	if (md != NULL)
-	{
-		// get the number of players allowed from the map.
-		Int numPlayers = md->m_numPlayers;
-		Int numPlayerSlots = 0;
-
-		// first get the number of occupied slots.
-		Int i = 0;
-		for (; i < MAX_SLOTS; ++i)
-		{
-			GameSlot *tempSlot = getSlot(i);
-			if (tempSlot->isOccupied())
-			{
-				++numPlayerSlots;
-			}
-		}
-
-		// now go through and close the appropriate number of slots.
-		// note that no players are kicked in this process, we leave
-		// that up to the user.
-		for (i = 0; i < MAX_SLOTS; ++i)
-		{
-			// we have room for more players, if this slot is unoccupied, set it to open.
-			GameSlot *slot = getSlot(i);
-			if (numPlayers > numPlayerSlots)
-			{
-				if (!(slot->isOccupied()))
-				{
-					GameSlot newSlot;
-					newSlot.setState(SLOT_OPEN);
-					setSlot(i, newSlot);
-					++numPlayerSlots;
-				}
-			}
-			else
-			{
-				if (!(slot->isOccupied()))
-				{
-					// we don't have any more room, set this slot to closed.
-					GameSlot newSlot;
-					newSlot.setState(SLOT_CLOSED);
-					setSlot(i, newSlot);
-				}
-			}
-		}
-	}
-}
-
-void GameInfo::closeOpenSlots()
-{
-	for (Int i = 0; i < MAX_SLOTS; ++i)
-	{
-		GameSlot *slot = getSlot(i);
-		if (!(slot->isOccupied()))
-		{
-			GameSlot newSlot;
-			newSlot.setState(SLOT_CLOSED);
-			setSlot(i, newSlot);
-		}
-	}
-}
-
-static Bool isSlotLocalAlly(GameInfo *game, const GameSlot *slot)
-{
-	const GameSlot *localSlot = game->getConstSlot(game->getLocalSlotNum());
-	if (!localSlot)
-		return TRUE;
-
-	if (slot == localSlot)
-		return TRUE;
-
-	if (slot->getTeamNumber() < 0)
-		return FALSE;
-
-	return slot->getTeamNumber() == localSlot->getTeamNumber();
-}
-
-Bool GameInfo::isSkirmish(void)
-{
-	Bool sawAI = FALSE;
-
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (i == getLocalSlotNum())
-			continue;
-
-		if (getConstSlot(i)->isHuman())
-			return FALSE;
-
-		if (getConstSlot(i)->isAI())
-		{
-			if (isSlotLocalAlly(getConstSlot(i)))
-				return FALSE;
-			sawAI = TRUE;
-		}
-	}
-	return sawAI;
-}
-
-Bool GameInfo::isMultiPlayer(void)
-{
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (i == getLocalSlotNum())
-			continue;
-
-		if (getConstSlot(i)->isHuman())
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-Bool GameInfo::isSandbox(void)
-{
-	Int localSlotNum = getLocalSlotNum();
-	Int localTeam = getConstSlot(localSlotNum)->getTeamNumber();
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (i == localSlotNum)
-			continue;
-
-		const GameSlot *slot = getConstSlot(i);
-		if (slot->isOccupied() && (slot->getTeamNumber() < 0 || slot->getTeamNumber() != localTeam))
-			return FALSE;
-	}
-	return TRUE;
-}
-
-
-// Convenience Functions ----------------------------------------
-
-static const char slotListID		= 'S';
-
-AsciiString GameInfoToAsciiString( const GameInfo *game )
-{
-	if (!game)
-		return AsciiString::TheEmptyString;
-
-	AsciiString mapName = game->getMap();
-	mapName = TheGameState->realMapPathToPortableMapPath(mapName);
-	AsciiString newMapName;
-	if (mapName.getLength() > 0)
-	{
-		AsciiString token;
-		mapName.nextToken(&token, "\\/");
-		// add all the tokens except the last one.
-		// that way we don't add the filename, just the
-		// directory name, we can do this since the filename
-		// is just the directory name with the file extention
-		// added onto it.
-		while (mapName.find('\\') != NULL)
-		{
-			if (newMapName.getLength() > 0)
-			{
-				newMapName.concat('/');
-			}
-			newMapName.concat(token);
-			mapName.nextToken(&token, "\\/");
-		}
-		DEBUG_LOG(("Map name is %s\n", mapName.str()));
-	}
-
-	AsciiString optionsString;
-	optionsString.format("M=%2.2x%s;MC=%X;MS=%d;SD=%d;C=%d;", game->getMapContentsMask(), newMapName.str(),
-		game->getMapCRC(), game->getMapSize(), game->getSeed(), game->getCRCInterval());
-	optionsString.concat(slotListID);
-	optionsString.concat('=');
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = game->getConstSlot(i);
-		AsciiString str;
-		if (slot && slot->isHuman())
-		{
-			AsciiString name = WideCharStringToMultiByte(slot->getName().str()).c_str();
-			
-			str.format( "H%s,%X,%d,%c%c,%d,%d,%d,%d,%d:",
-				name.str(), slot->getIP(), slot->getPort(),
-				(slot->isAccepted()?'T':'F'),
-				(slot->hasMap()?'T':'F'),
-				slot->getColor(), slot->getPlayerTemplate(),
-				slot->getStartPos(), slot->getTeamNumber(),
-				slot->getNATBehavior() );
-		}
-		else if (slot && slot->isAI())
-		{
-			Char c;
-			if (slot->getState() == SLOT_EASY_AI)
-				c = 'E';
-			else if (slot->getState() == SLOT_MED_AI)
-				c = 'M';
-			else
-				c = 'H';
-			str.format("C%c,%d,%d,%d,%d:", c,
-				slot->getColor(), slot->getPlayerTemplate(),
-				slot->getStartPos(), slot->getTeamNumber());
-		}
-		else if (slot && slot->getState() == SLOT_OPEN)
-		{
-			str = "O:";
-		}
-		else if (slot && slot->getState() == SLOT_CLOSED)
-		{
-			str = "X:";
-		}
-		else
-		{
-			DEBUG_ASSERTCRASH(false, ("Bad slot type"));
-			str = "X:";
-		}
-		optionsString.concat(str);
-	}
-	optionsString.concat(';');
-
-	DEBUG_ASSERTCRASH(!TheLAN || (optionsString.getLength() < m_lanMaxOptionsLength),
-		("WARNING: options string is longer than expected!  Length is %d, but max is %d!\n",
-		optionsString.getLength(), m_lanMaxOptionsLength));
-	
-	return optionsString;
-}
-
-static Int grabHexInt(const char *s)
-{
-	char tmp[5] = "0xff";
-	tmp[2] = s[0];
-	tmp[3] = s[1];
-	Int b = strtol(tmp, NULL, 16);
-	return b;
-}
-Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
-{
-	// Parse game options
-	char *buf = strdup(options.str());
-	char *bufPtr = buf;
-	char *strPos, *keyValPair;
-	GameSlot newSlot[MAX_SLOTS];
-	Bool optionsOk = true;
-	AsciiString mapName;
-	Int mapContentsMask;
-	UnsignedInt mapCRC, mapSize;
-	Int seed = 0;
-	Int crc = 100;
-	Bool sawCRC = FALSE;
-
-	Bool sawMap, sawMapCRC, sawMapSize, sawSeed, sawSlotlist;
-	sawMap = sawMapCRC = sawMapSize = sawSeed = sawSlotlist = FALSE;
-
-	//DEBUG_LOG(("Saw options of %s\n", options.str()));
-	DEBUG_LOG(("ParseAsciiStringToGameInfo - parsing [%s]\n", options.str()));
-
-
-	while ( (keyValPair = strtok_r(bufPtr, ";", &strPos)) != NULL )
-	{
-		bufPtr = NULL; // strtok within the same string
-
-		AsciiString key, val;
-		char *pos = NULL;
-		char *keyPtr, *valPtr;
-		keyPtr = (strtok_r(keyValPair, "=", &pos));
-		valPtr = (strtok_r(NULL, "\n", &pos));
-		if (keyPtr)
-			key = keyPtr;
-		if (valPtr)
-			val = valPtr;
-
-		if (val.isEmpty())
-		{
-			optionsOk = false;
-			DEBUG_LOG(("ParseAsciiStringToGameInfo - saw empty value, quitting\n"));
-			break;
-		}
-
-		if (key.compare("M") == 0)
-		{
-			if (val.getLength() < 3)
-			{
-				optionsOk = FALSE;
-				DEBUG_LOG(("ParseAsciiStringToGameInfo - saw bogus map; quitting\n"));
-				break;
-			}
-			mapContentsMask = grabHexInt(val.str());
-			AsciiString tempstr;
-			AsciiString token;
-			tempstr = val.str()+2;
-			tempstr.nextToken(&token, "\\/");
-			while (tempstr.getLength() > 0)
-			{
-				mapName.concat(token);
-				mapName.concat('\\');
-				tempstr.nextToken(&token, "\\/");
-			}
-			mapName.concat(token);
-			mapName.concat('\\');
-			mapName.concat(token);
-			mapName.concat('.');
-			mapName.concat(TheMapCache->getMapExtension());
-			mapName = TheGameState->portableMapPathToRealMapPath(mapName);
-			sawMap = true;
-			DEBUG_LOG(("ParseAsciiStringToGameInfo - map name is %s\n", mapName.str()));
-		}
-		else if (key.compare("MC") == 0)
-		{
-			mapCRC = 0;
-			sscanf(val.str(), "%X", &mapCRC);
-			sawMapCRC = true;
-		}
-		else if (key.compare("MS") == 0)
-		{
-			mapSize = atoi(val.str());
-			sawMapSize = true;
-		}
-		else if (key.compare("SD") == 0)
-		{
-			seed = atoi(val.str());
-			sawSeed = true;
-//			DEBUG_LOG(("ParseAsciiStringToGameInfo - random seed is %d\n", seed));
-		}
-		else if (key.compare("C") == 0)
-		{
-			crc = atoi(val.str());
-			sawCRC = TRUE;
-		}
-		else if (key.getLength() == 1 && *key.str() == slotListID)
-		{
-			sawSlotlist = true;
-			/// @TODO: Need to read in all the slot info... big mess right now.
-			char *rawSlotBuf = strdup(val.str());
-			char *freeMe = NULL;
-			AsciiString rawSlot;
-//			Bool slotsOk = true;	//flag that lets us know whether or not the slot list is good.
-
-//			DEBUG_LOG(("ParseAsciiStringToGameInfo - Parsing slot list\n"));
-			for (int i=0; i<MAX_SLOTS; ++i)
-				{
-					rawSlot = strtok_r(rawSlotBuf,":",&pos);
-					if( rawSlotBuf )
-						freeMe = rawSlotBuf;
-					rawSlotBuf = NULL;
-					switch (*rawSlot.str())
-					{
-						case 'H':
-						{
-//							DEBUG_LOG(("ParseAsciiStringToGameInfo - Human player\n"));
-							char *slotPos = NULL;
-							//Parse out the Name																
-							AsciiString slotValue(strtok_r((char *)rawSlot.str(),",",&slotPos));
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue name is empty, quitting\n"));
-								break;
-							}
-							UnicodeString name;
-              name.set(MultiByteToWideCharSingleLine(slotValue.str() +1).c_str());
-
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - name is %s\n", slotValue.str()+1));
-							
-							//Parse out the IP
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue IP address is empty, quitting\n"));
-								break;
-							}
-							UnsignedInt playerIP = 0;
-							sscanf(slotValue.str(),"%x", &playerIP);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - IP address is %x\n", playerIP));
-							
-							//set the state of the slot
-							newSlot[i].setState(SLOT_PLAYER, name, playerIP);
-
-							// parse out the port
-							slotValue = strtok_r(NULL, ",", &slotPos);
-							if (slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue port is empty, quitting\n"));
-								break;
-							}
-							UnsignedInt playerPort = 0;
-							sscanf(slotValue.str(), "%d", &playerPort);
-							newSlot[i].setPort(playerPort);
-							DEBUG_LOG(("ParseAsciiStringToGameInfo - port is %d\n", playerPort));
-
-							//Read if it's accepted or not
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.getLength() != 2)
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue accepted is mis-sized, quitting\n"));
-								break;
-							}
-							const char *svs = slotValue.str();
-							if(*svs == 'T') {
-								newSlot[i].setAccept();
-								//DEBUG_LOG(("ParseAsciiStringToGameInfo - player has accepted\n"));
-							} else if (*svs == 'F') {
-								newSlot[i].unAccept();
-								//DEBUG_LOG(("ParseAsciiStringToGameInfo - player has not accepted\n"));
-							}
-							++svs;
-							if(*svs == 'T') {
-								newSlot[i].setMapAvailability(TRUE);
-								//DEBUG_LOG(("ParseAsciiStringToGameInfo - player has map\n"));
-							} else {
-								newSlot[i].setMapAvailability(FALSE);
-								//DEBUG_LOG(("ParseAsciiStringToGameInfo - player does not have map\n"));
-							}
-
-							//Read color index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue color is empty, quitting\n"));
-								break;
-							}
-							Int color = atoi(slotValue.str());
-							if (color < -1 || color >= TheMultiplayerSettings->getNumColors())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - player color was invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setColor(color);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player color set to %d\n", color));
-
-							//Read playerTemplate index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue player template is empty, quitting\n"));
-								break;
-							}
-							Int playerTemplate = atoi(slotValue.str());
-							if (playerTemplate < PLAYERTEMPLATE_MIN || playerTemplate >= ThePlayerTemplateStore->getPlayerTemplateCount())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - player template value is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setPlayerTemplate(playerTemplate);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player template is %d\n", playerTemplate));
-
-							//Read start position index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue start position is empty, quitting\n"));
-								break;
-							}
-							Int startPos = atoi(slotValue.str());
-							if (startPos < -1 || startPos >= MAX_SLOTS)
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - player start position is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setStartPos(startPos);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player start position is %d\n", startPos));
-
-							//Read team index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue team number is empty, quitting\n"));
-								break;
-							}
-							Int team = atoi(slotValue.str());
-							if (team < -1 || team >= MAX_SLOTS/2)
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - team number is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setTeamNumber(team);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - team number is %d\n", team));
-
-							// Read the NAT behavior
-							slotValue = strtok_r(NULL, ",",&slotPos);
-							if (slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - NAT behavior is empty, quitting\n"));
-								break;
-							}
-							FirewallHelperClass::FirewallBehaviorType NATType = (FirewallHelperClass::FirewallBehaviorType)atoi(slotValue.str());
-							if ((NATType < FirewallHelperClass::FIREWALL_MIN) ||
-									(NATType > FirewallHelperClass::FIREWALL_MAX)) {
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - NAT behavior is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setNATBehavior(NATType);
-							DEBUG_LOG(("ParseAsciiStringToGameInfo - NAT behavior is %X\n", NATType));
-						}// case 'H':
-						break;
-						case 'C':
-						{
-            	DEBUG_LOG(("ParseAsciiStringToGameInfo - AI player\n"));
-							char *slotPos = NULL;
-							//Parse out the Name																
-							AsciiString slotValue(strtok_r((char *)rawSlot.str(),",",&slotPos));
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue AI Type is empty, quitting\n"));
-								break;
-							}
-              
-							switch(*(slotValue.str() + 1))
-							{
-								case 'E':
-								{
-									newSlot[i].setState(SLOT_EASY_AI);
-									//DEBUG_LOG(("ParseAsciiStringToGameInfo - Easy AI\n"));
-								}
-								break;
-								case 'M':
-								{
-									newSlot[i].setState(SLOT_MED_AI);
-									//DEBUG_LOG(("ParseAsciiStringToGameInfo - Medium AI\n"));
-								}
-								break;
-								case 'H':
-								{
-									newSlot[i].setState(SLOT_BRUTAL_AI);
-									//DEBUG_LOG(("ParseAsciiStringToGameInfo - Brutal AI\n"));
-								}
-								break;
-								default:
-								{
-									optionsOk = false;
-									DEBUG_LOG(("ParseAsciiStringToGameInfo - Unknown AI, quitting\n"));
-								}
-								break;
-							}//switch(*rawSlot.str()+1)
-              
-							//Read color index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue color is empty, quitting\n"));
-								break;
-							}
-							Int color = atoi(slotValue.str());
-							if (color < -1 || color >= TheMultiplayerSettings->getNumColors())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - player color was invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setColor(color);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player color set to %d\n", color));
-
-							//Read playerTemplate index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue player template is empty, quitting\n"));
-								break;
-							}
-							Int playerTemplate = atoi(slotValue.str());
-							if (playerTemplate < PLAYERTEMPLATE_MIN || playerTemplate >= ThePlayerTemplateStore->getPlayerTemplateCount())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - player template value is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setPlayerTemplate(playerTemplate);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player template is %d\n", playerTemplate));
-
-							//Read start pos
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue start pos is empty, quitting\n"));
-								break;
-							}
-							Int startPos = atoi(slotValue.str());
-							Bool isStartPosBad = FALSE;
-							if (startPos < -1 || startPos >= MAX_SLOTS)
-							{
-								isStartPosBad = TRUE;
-							}
-							for (Int j=0; j<i; ++j)
-							{
-								if (startPos >= 0 && startPos == newSlot[i].getStartPos())
-								{
-									isStartPosBad = TRUE; // can't have multiple people using the same start pos
-								}
-							}
-							if (isStartPosBad)
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - start pos is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setStartPos(startPos);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - start spot is %d\n", startPos));
-
-							//Read team index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue team number is empty, quitting\n"));
-								break;
-							}
-							Int team = atoi(slotValue.str());
-							if (team < -1 || team >= MAX_SLOTS/2)
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - team number is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setTeamNumber(team);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - team number is %d\n", team));
-
-						}//case 'C':
-						break;
-						case 'O':
-						{
-							newSlot[i].setState( SLOT_OPEN );
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - Slot is open\n"));
-						}// case 'O':
-						break;
-						case 'X':
-						{
-							newSlot[i].setState( SLOT_CLOSED );
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - Slot is closed\n"));
-						}// case 'X':
-						break;
-						default:
-						{								
-							optionsOk = false;
-							DEBUG_LOG(("ParseAsciiStringToGameInfo - unrecognized slot entry, quitting\n"));
-						}
-						break;
-					}
-				}
-		if(freeMe)
-			free(freeMe);
-		}
-		else
-		{
-			optionsOk = false;
-			break;
-		}
-	}
-	if( buf )
-		free(buf);
-
-	//DEBUG_LOG(("Options were ok == %d\n", optionsOk));
-	if (optionsOk && sawMap && sawMapCRC && sawMapSize && sawSeed && sawSlotlist && sawCRC)
-	{
-		// We were setting the Global Data directly here, but Instead, I'm now 
-		// first setting the data in game.  We'll set the global data when
-		// we start a game.
-		if (!game)
-			return true;
-
-		//DEBUG_LOG(("ParseAsciiStringToGameInfo - game options all good, setting info\n"));
-
-		for(Int i = 0; i<MAX_SLOTS; i++)
-			game->setSlot(i,newSlot[i]);
-
-		game->setMap(mapName);
-		game->setMapCRC(mapCRC);
-		game->setMapSize(mapSize);
-		game->setMapContentsMask(mapContentsMask);
-		game->setSeed(seed);
-		game->setCRCInterval(crc);
-
-		return true;
-	}
-
-	DEBUG_LOG(("ParseAsciiStringToGameInfo - game options messed up\n"));
-	return false;
-}
-
-
-//----------------------------------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------------------------------
-
-//------------------------- SkirmishGameInfo ---------------------------------------------------------------
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void SkirmishGameInfo::crc( Xfer *xfer )
-{
-}  // end crc
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer Method */
-// ------------------------------------------------------------------------------------------------
-void SkirmishGameInfo::xfer( Xfer *xfer )
-{
-	const XferVersion currentVersion = 2;	
-	XferVersion version = currentVersion; 
-	xfer->xferVersion( &version, currentVersion );
-
-
-	xfer->xferInt(&m_preorderMask);
-	xfer->xferInt(&m_crcInterval);
-	xfer->xferBool(&m_inGame);
-	xfer->xferBool(&m_inProgress);
-	xfer->xferBool(&m_surrendered);
-	xfer->xferInt(&m_gameID);
-
-	Int slot = MAX_SLOTS;
-	xfer->xferInt(&slot);
-	DEBUG_ASSERTCRASH(slot==MAX_SLOTS, ("MAX_SLOTS changed, need to change version. jba."));
-
-	for (slot = 0; slot < MAX_SLOTS; slot++) 
-	{
-		Int state = m_slot[slot]->getState();
-		xfer->xferInt(&state);
-
-		UnicodeString name=m_slot[slot]->getName();	
-		if (version >= 2)
-		{
-			xfer->xferUnicodeString(&name);
-		}
-
-		Bool isAccepted=m_slot[slot]->isAccepted();
-		xfer->xferBool(&isAccepted);
-
-		Bool isMuted=m_slot[slot]->isMuted();
-		xfer->xferBool(&isMuted);
-		m_slot[slot]->mute(isMuted);
-
-		Int color=m_slot[slot]->getColor();
-		xfer->xferInt(&color);
-
-		Int startPos=m_slot[slot]->getStartPos();
-		xfer->xferInt(&startPos);
-
-		Int playerTemplate=m_slot[slot]->getPlayerTemplate();
-		xfer->xferInt(&playerTemplate);
-
-		Int teamNumber=m_slot[slot]->getTeamNumber();
-		xfer->xferInt(&teamNumber);
-
-		Int origColor=m_slot[slot]->getOriginalColor();
-		xfer->xferInt(&origColor);
-
-		Int origStartPos=m_slot[slot]->getOriginalStartPos();
-		xfer->xferInt(&origStartPos);
-
- 		Int origPlayerTemplate=m_slot[slot]->getOriginalPlayerTemplate();
-		xfer->xferInt(&origPlayerTemplate);
-
-		if( xfer->getXferMode() == XFER_LOAD ) {
-			m_slot[slot]->setState((SlotState)state, name);
-			if (isAccepted) m_slot[slot]->setAccept();
-
-			m_slot[slot]->setPlayerTemplate(origPlayerTemplate);
-			m_slot[slot]->setStartPos(origStartPos);
-			m_slot[slot]->setColor(origColor);
-			m_slot[slot]->saveOffOriginalInfo();
-
-			m_slot[slot]->setTeamNumber(teamNumber);
-			m_slot[slot]->setColor(color);
-			m_slot[slot]->setStartPos(startPos);
-			m_slot[slot]->setPlayerTemplate(playerTemplate);
-		}
-	}
-
-	xfer->xferUnsignedInt(&m_localIP);
-
-	xfer->xferMapName(&m_mapName);
-	xfer->xferUnsignedInt(&m_mapCRC);
-	xfer->xferUnsignedInt(&m_mapSize);
-	xfer->xferInt(&m_mapMask);
-	xfer->xferInt(&m_seed);
-
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void SkirmishGameInfo::loadPostProcess( void )
-{
-}  // end loadPostProcess
-
-
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameMessageParser.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameMessageParser.cpp
deleted file mode 100644
index ee4434b3c27..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameMessageParser.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/GameMessageParser.h"
-
-//----------------------------------------------------------------------------
-GameMessageParser::GameMessageParser() 
-{
-	m_first = NULL;
-	m_argTypeCount = 0;
-}
-
-//----------------------------------------------------------------------------
-GameMessageParser::GameMessageParser(GameMessage *msg) 
-{
-	m_first = NULL;
-	m_argTypeCount = 0;
-
-	UnsignedByte argCount = msg->getArgumentCount();
-	GameMessageArgumentDataType lasttype = ARGUMENTDATATYPE_UNKNOWN;
-	Int thisTypeCount = 0;
-
-	for (UnsignedByte i = 0; i < argCount; ++i) {
-		GameMessageArgumentDataType type = msg->getArgumentDataType(i);
-		if (type != lasttype) {
-			if (thisTypeCount > 0) {
-				addArgType(lasttype, thisTypeCount);
-				++m_argTypeCount;
-			}
-			lasttype = type;
-			thisTypeCount = 0;
-		}
-		++thisTypeCount;
-	}
-	if (thisTypeCount > 0) {
-		addArgType(lasttype, thisTypeCount);
-		++m_argTypeCount;
-	}
-}
-
-//----------------------------------------------------------------------------
-GameMessageParser::~GameMessageParser() 
-{
-	GameMessageParserArgumentType *temp = NULL;
-	while (m_first != NULL) {
-		temp = m_first->getNext();
-		deleteInstance(m_first);
-		m_first = temp;
-	}
-}
-
-//----------------------------------------------------------------------------
-void GameMessageParser::addArgType(GameMessageArgumentDataType type, Int argCount) 
-{
-	if (m_first == NULL) {
-		m_first = newInstance(GameMessageParserArgumentType)(type, argCount);
-		m_last = m_first;
-		return;
-	}
-
-	m_last->setNext(newInstance(GameMessageParserArgumentType)(type, argCount));
-	m_last = m_last->getNext();
-}
-
-//----------------------------------------------------------------------------
-GameMessageParserArgumentType::GameMessageParserArgumentType(GameMessageArgumentDataType type, Int argCount) 
-{
-	m_next = NULL;
-	m_type = type;
-	m_argCount = argCount;
-}
-
-//----------------------------------------------------------------------------
-GameMessageParserArgumentType::~GameMessageParserArgumentType() 
-{
-}
-
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy.cpp
index d9853f3b693..65be44e5c34 100644
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy.cpp
+++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy.cpp
@@ -26,7 +26,7 @@
 // GameSpy callbacks, etc
 // Author: Matthew D. Campbell, February 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "gamespy/gp/gp.h"
 #include "gamespy/gstats/gpersist.h"
@@ -65,7 +65,7 @@ void GameSpyThreadClass::Thread_Function()
 
 	//poll network and update GameSpy object
 
-	while (running) 
+	while (running)
 	{
 		inThread = true;
 		if (m_doLogin)
@@ -256,7 +256,7 @@ void GameSpyChat::update( void )
 		{
 			TheGameSpyThread->setShowLocaleSelect(false);
 			WindowLayout *layout = NULL;
-			layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupLocaleSelect.wnd" ) );
+			layout = TheWindowManager->winCreateLayout( "Menus/PopupLocaleSelect.wnd" );
 			layout->runInit();
 			layout->hide( FALSE );
 			layout->bringForward();
@@ -305,7 +305,7 @@ void GameSpyChat::update( void )
 		{
 			// login timed out
 			m_loginTimeout = 0;
-			GSMessageBoxOk(UnicodeString(L"Error connecting"), UnicodeString(L"Timed out connecting"), NULL);
+			GSMessageBoxOk(L"Error connecting", L"Timed out connecting", NULL);
 
 			// Enable controls again
 			//EnableLoginControls(TRUE);
@@ -407,7 +407,7 @@ void GameSpyChat::createStagingRoom( AsciiString gameName, AsciiString password,
 	TheGameSpyChat->leaveRoom(GroupRoom);
 	TheGameSpyChat->setCurrentGroupRoomID(0);
 
-	DEBUG_LOG(("GameSpyChat::createStagingRoom - creating staging room, name is %s\n", m_loginName.str()));
+	DEBUG_LOG(("GameSpyChat::createStagingRoom - creating staging room, name is %s", m_loginName.str()));
 
 	peerCreateStagingRoom(m_peer, m_loginName.str(), maxPlayers, password.str(), createRoomCallback, (void *)oldGroupID, PEERFalse);
 }
@@ -422,7 +422,7 @@ void GameSpyChat::joinBestGroupRoom( void )
 		while (iter != m_groupRooms.end())
 		{
 			GameSpyGroupRoom room = iter->second;
-			DEBUG_LOG(("Group room %d: %s (%d, %d, %d, %d)\n", room.m_groupID, room.m_name.str(), room.m_numWaiting, room.m_maxWaiting,
+			DEBUG_LOG(("Group room %d: %s (%d, %d, %d, %d)", room.m_groupID, room.m_name.str(), room.m_numWaiting, room.m_maxWaiting,
 				room.m_numGames, room.m_numPlaying));
 
 			if (minPlayers > 25 && room.m_numWaiting < minPlayers)
@@ -440,12 +440,12 @@ void GameSpyChat::joinBestGroupRoom( void )
 		}
 		else
 		{
-			GSMessageBoxOk(UnicodeString(L"Oops"), UnicodeString(L"No empty group rooms"), NULL);
+			GSMessageBoxOk(L"Oops", L"No empty group rooms", NULL);
 		}
 	}
 	else
 	{
-		GSMessageBoxOk(UnicodeString(L"Oops"), UnicodeString(L"No group rooms"), NULL);
+		GSMessageBoxOk(L"Oops", L"No group rooms", NULL);
 	}
 }
 
@@ -535,13 +535,13 @@ void PlayerJoinedCallback(PEER peer, RoomType roomType,
 	}
 	if (roomType == StagingRoom && TheGameSpyGame)
 	{
-		DEBUG_LOG(("StagingRoom, Game OK\n"));
+		DEBUG_LOG(("StagingRoom, Game OK"));
 		for (Int i=1; i<MAX_SLOTS; ++i)
 		{
 			GameSlot *slot = TheGameSpyGame->getSlot(i);
 			if (slot && slot->getState() == SLOT_OPEN)
 			{
-				DEBUG_LOG(("Putting %s in slot %d\n", nick, i));
+				DEBUG_LOG(("Putting %s in slot %d", nick, i));
 				UnicodeString uName;
 				uName.translate(nick);
 				slot->setState(SLOT_PLAYER, uName);
@@ -553,7 +553,7 @@ void PlayerJoinedCallback(PEER peer, RoomType roomType,
 				Int id;
 				UnsignedInt ip;
 				PEERBool success = peerGetPlayerInfoNoWait(TheGameSpyChat->getPeer(), nick, &ip, &id);
-				DEBUG_LOG(("PlayerJoinedCallback - result from peerGetPlayerInfoNoWait, %d: ip=%d.%d.%d.%d, id=%d\n", success,
+				DEBUG_LOG(("PlayerJoinedCallback - result from peerGetPlayerInfoNoWait, %d: ip=%d.%d.%d.%d, id=%d", success,
 					(ip >> 24) & 0xff,
 					(ip >> 16) & 0xff,
 					(ip >> 8) & 0xff,
@@ -599,7 +599,7 @@ void PlayerLeftCallback(PEER peer, RoomType roomType,
 			if (slot)
 			{
 				slot->setState(SLOT_OPEN);
-				DEBUG_LOG(("Removing %s from slot %d\n", nick, slotNum));
+				DEBUG_LOG(("Removing %s from slot %d", nick, slotNum));
 				if (TheGameSpyGame->amIHost())
 				{
 					peerUTMRoom(TheGameSpyChat->getPeer(), StagingRoom, "SL/", GameInfoToAsciiString(TheGameSpyGame).str(), PEERFalse);
@@ -625,34 +625,34 @@ void PlayerChangedNickCallback(PEER peer, RoomType roomType,
 void PingCallback(PEER peer, const char * nick, int ping,
 									void * param)
 {
-	DEBUG_LOG(("PingCallback\n"));
+	DEBUG_LOG(("PingCallback"));
 }
 
 void CrossPingCallback(PEER peer, const char * nick1,
 											 const char * nick2, int crossPing,
 											 void * param)
 {
-	DEBUG_LOG(("CrossPingCallback\n"));
+	DEBUG_LOG(("CrossPingCallback"));
 }
 
 static void RoomUTMCallback(PEER peer, RoomType roomType, const char * nick,
 														const char * command, const char * parameters,
 														PEERBool authenticated, void * param)
 {
-	DEBUG_LOG(("RoomUTMCallback: %s says %s = [%s]\n", nick, command, parameters));
+	DEBUG_LOG(("RoomUTMCallback: %s says %s = [%s]", nick, command, parameters));
 	if (roomType == StagingRoom && TheGameSpyGame)
 	{
 		Int slotNum = TheGameSpyGame->getSlotNum(nick);
 		if (slotNum == 0 && !TheGameSpyGame->amIHost())
 		{
-			if (!strcmp(command, "SL"))
+			if (strcmp(command, "SL") == 0)
 			{
 				AsciiString options = parameters;
 				options.trim();
 				ParseAsciiStringToGameInfo(TheGameSpyGame, options.str());
 				WOLDisplaySlotList();
 			}
-			else if (!strcmp(command, "HWS")) // HostWantsStart
+			else if (strcmp(command, "HWS") == 0) // HostWantsStart
 			{
 				Int slotNum = TheGameSpyGame->getLocalSlotNum();
 				GameSlot *slot = TheGameSpyGame->getSlot(slotNum);
@@ -669,13 +669,13 @@ static void PlayerUTMCallback(PEER peer, const char * nick,
 															const char * command, const char * parameters,
 															PEERBool authenticated, void * param)
 {
-	DEBUG_LOG(("PlayerUTMCallback: %s says %s = [%s]\n", nick, command, parameters));
+	DEBUG_LOG(("PlayerUTMCallback: %s says %s = [%s]", nick, command, parameters));
 	if (TheGameSpyGame)
 	{
 		Int slotNum = TheGameSpyGame->getSlotNum(nick);
 		if (slotNum != 0 && TheGameSpyGame->amIHost())
 		{
-			if (!strcmp(command, "REQ"))
+			if (strcmp(command, "REQ") == 0)
 			{
 				AsciiString options = parameters;
 				options.trim();
@@ -687,7 +687,7 @@ static void PlayerUTMCallback(PEER peer, const char * nick,
 				options.nextToken(&key, "=");
 				Int val = atoi(options.str()+1);
 				UnsignedInt uVal = atoi(options.str()+1);
-				DEBUG_LOG(("GameOpt request: key=%s, val=%s from player %d\n", key.str(), options.str(), slotNum));
+				DEBUG_LOG(("GameOpt request: key=%s, val=%s from player %d", key.str(), options.str(), slotNum));
 
 				GameSlot *slot = TheGameSpyGame->getSlot(slotNum);
 				if (!slot)
@@ -716,7 +716,7 @@ static void PlayerUTMCallback(PEER peer, const char * nick,
 					}
 					else
 					{
-						DEBUG_LOG(("Rejecting invalid color %d\n", val));
+						DEBUG_LOG(("Rejecting invalid color %d", val));
 					}
 				}
 				else if (key == "PlayerTemplate")
@@ -729,7 +729,7 @@ static void PlayerUTMCallback(PEER peer, const char * nick,
 					}
 					else
 					{
-						DEBUG_LOG(("Rejecting invalid PlayerTemplate %d\n", val));
+						DEBUG_LOG(("Rejecting invalid PlayerTemplate %d", val));
 					}
 				}
 				else if (key == "StartPos")
@@ -742,7 +742,7 @@ static void PlayerUTMCallback(PEER peer, const char * nick,
 					}
 					else
 					{
-						DEBUG_LOG(("Rejecting invalid startPos %d\n", val));
+						DEBUG_LOG(("Rejecting invalid startPos %d", val));
 					}
 				}
 				else if (key == "Team")
@@ -755,7 +755,7 @@ static void PlayerUTMCallback(PEER peer, const char * nick,
 					}
 					else
 					{
-						DEBUG_LOG(("Rejecting invalid team %d\n", val));
+						DEBUG_LOG(("Rejecting invalid team %d", val));
 					}
 				}
 				else if (key == "IP")
@@ -768,7 +768,7 @@ static void PlayerUTMCallback(PEER peer, const char * nick,
 					}
 					else
 					{
-						DEBUG_LOG(("Rejecting invalid IP %d\n", uVal));
+						DEBUG_LOG(("Rejecting invalid IP %d", uVal));
 					}
 				}
 				else if (key == "NAT")
@@ -777,12 +777,12 @@ static void PlayerUTMCallback(PEER peer, const char * nick,
 							(val <= FirewallHelperClass::FIREWALL_TYPE_DESTINATION_PORT_DELTA))
 					{
 						slot->setNATBehavior((FirewallHelperClass::FirewallBehaviorType)val);
-						DEBUG_LOG(("Setting NAT behavior to %d for player %d\n", val, slotNum));
+						DEBUG_LOG(("Setting NAT behavior to %d for player %d", val, slotNum));
 						change = true;
 					}
 					else
 					{
-						DEBUG_LOG(("Rejecting invalid NAT behavior %d from player %d\n", val, slotNum));
+						DEBUG_LOG(("Rejecting invalid NAT behavior %d from player %d", val, slotNum));
 					}
 				}
 
@@ -792,9 +792,9 @@ static void PlayerUTMCallback(PEER peer, const char * nick,
 						TheGameSpyGame->resetAccepted();
 					peerUTMRoom(TheGameSpyChat->getPeer(), StagingRoom, "SL/", GameInfoToAsciiString(TheGameSpyGame).str(), PEERFalse);
 					WOLDisplaySlotList();
-					DEBUG_LOG(("Slot value is color=%d, PlayerTemplate=%d, startPos=%d, team=%d, IP=0x%8.8X\n",
+					DEBUG_LOG(("Slot value is color=%d, PlayerTemplate=%d, startPos=%d, team=%d, IP=0x%8.8X",
 						slot->getColor(), slot->getPlayerTemplate(), slot->getStartPos(), slot->getTeamNumber(), slot->getIP()));
-					DEBUG_LOG(("Slot list updated to %s\n", GameInfoToAsciiString(TheGameSpyGame).str()));
+					DEBUG_LOG(("Slot list updated to %s", GameInfoToAsciiString(TheGameSpyGame).str()));
 				}
 
 
@@ -808,7 +808,7 @@ void GOABasicCallback(PEER peer, PEERBool playing, char * outbuf,
 {
 	snprintf(outbuf, maxlen, "\\gamename\\c&cgenerals\\gamever\\%s\\location\\%d",
 		TheVersion->getAsciiVersion().str(), 0);
-	DEBUG_LOG(("GOABasicCallback: [%s]\n", outbuf));
+	DEBUG_LOG(("GOABasicCallback: [%s]", outbuf));
 	TheGameSpyGame->gotGOACall();
 }
 
@@ -817,7 +817,7 @@ void GOAInfoCallback(PEER peer, PEERBool playing, char * outbuf,
 {
 	snprintf(outbuf, maxlen, "\\hostname\\%s\\hostport\\%d\\mapname\\%s\\gametype\\%s\\numplayers\\%d\\maxplayers\\%d\\gamemode\\%s",
 		TheGameSpyChat->getLoginName().str(), 0, TheGameSpyGame->getMap().str(), "battle", TheGameSpyGame->getNumPlayers(), TheGameSpyGame->getMaxPlayers(), "wait");
-	DEBUG_LOG(("GOAInfoCallback: [%s]\n", outbuf));
+	DEBUG_LOG(("GOAInfoCallback: [%s]", outbuf));
 	TheGameSpyGame->gotGOACall();
 }
 
@@ -826,7 +826,7 @@ void GOARulesCallback(PEER peer, PEERBool playing, char * outbuf,
 {
 	snprintf(outbuf, maxlen, "\\password\\0\\seed\\%d",
 		TheGameSpyGame->getSeed());
-	DEBUG_LOG(("GOARulesCallback: [%s]\n", outbuf));
+	DEBUG_LOG(("GOARulesCallback: [%s]", outbuf));
 	TheGameSpyGame->gotGOACall();
 }
 
@@ -836,7 +836,7 @@ void GOAPlayersCallback(PEER peer, PEERBool playing, char * outbuf,
 	AsciiString buf, tmp;
 	for (Int i=0; i<MAX_SLOTS; ++i)
 	{
-		DEBUG_LOG(("GOAPlayersCallback - about to call getSlot for player %d\n", i));
+		DEBUG_LOG(("GOAPlayersCallback - about to call getSlot for player %d", i));
 		GameSlot *slot = TheGameSpyGame->getSlot(i);
 		AsciiString name;
 		switch (slot->getState())
@@ -876,13 +876,13 @@ void GOAPlayersCallback(PEER peer, PEERBool playing, char * outbuf,
 		buf.concat(tmp);
 	}
 	snprintf(outbuf, maxlen, buf.str());
-	DEBUG_LOG(("GOAPlayersCallback: [%s]\n", outbuf));
+	DEBUG_LOG(("GOAPlayersCallback: [%s]", outbuf));
 	TheGameSpyGame->gotGOACall();
 }
 
 void JoinRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomType roomType, void *param)
 {
-	DEBUG_LOG(("JoinRoomCallback: success==%d, result==%d\n", success, result));
+	DEBUG_LOG(("JoinRoomCallback: success==%d, result==%d", success, result));
 	switch (roomType)
 	{
 		case GroupRoom:
@@ -896,7 +896,7 @@ void JoinRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomTy
 					// see if we need to change screens
 					WindowLayout *layout = TheShell->top();
 					AsciiString windowFile = layout->getFilename();
-					DEBUG_LOG(("Joined group room, active screen was %s\n", windowFile.str()));
+					DEBUG_LOG(("Joined group room, active screen was %s", windowFile.str()));
 					if (windowFile.compareNoCase("Menus/WOLCustomLobby.wnd") == 0)
 					{
 						// already on the right screen - just refresh it
@@ -914,13 +914,13 @@ void JoinRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomTy
 					// failed to join lobby - bail to welcome screen
 					WindowLayout *layout = TheShell->top();
 					AsciiString windowFile = layout->getFilename();
-					DEBUG_LOG(("Joined group room, active screen was %s\n", windowFile.str()));
+					DEBUG_LOG(("Joined group room, active screen was %s", windowFile.str()));
 					if (windowFile.compareNoCase("Menus/WOLWelcomeMenu.wnd") != 0)
 					{
 						TheShell->pop();
 						TheShell->push("Menus/WOLWelcomeMenu.wnd");
 					}
-					GSMessageBoxOk(UnicodeString(L"Oops"), UnicodeString(L"Unable to join group room"), NULL);
+					GSMessageBoxOk(L"Oops", L"Unable to join group room", NULL);
 				}
 
 				// Update buddy location
@@ -944,7 +944,7 @@ void JoinRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomTy
 				((GameSpyChat *)TheGameSpyChat)->finishJoiningStagingRoom();
 				if (success)
 				{
-					DEBUG_LOG(("JoinRoomCallback - Joined staging room\n"));
+					DEBUG_LOG(("JoinRoomCallback - Joined staging room"));
 					GServer server = (GServer)param;
 
 					// leave any chat channels
@@ -978,8 +978,8 @@ void JoinRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomTy
 				else
 				{
 					// let the user know
-					GSMessageBoxOk(UnicodeString(L"Oops"), UnicodeString(L"Unable to join game"), NULL);
-					DEBUG_LOG(("JoinRoomCallback - Failed to join staging room.\n"));
+					GSMessageBoxOk(L"Oops", L"Unable to join game", NULL);
+					DEBUG_LOG(("JoinRoomCallback - Failed to join staging room."));
 				}
 
 				// Update buddy location
@@ -1005,7 +1005,7 @@ void JoinRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomTy
 
 void createRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomType roomType, void *param)
 {
-	DEBUG_LOG(("CreateRoomCallback: success==%d, result==%d\n", success, result));
+	DEBUG_LOG(("CreateRoomCallback: success==%d, result==%d", success, result));
 
 	if (roomType != StagingRoom)
 	{
@@ -1021,10 +1021,10 @@ void createRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, Room
 	{
 		// set up the game info
 		UnsignedInt localIP = peerGetLocalIP(TheGameSpyChat->getPeer());
-		DEBUG_LOG(("createRoomCallback - peerGetLocalIP returned %d.%d.%d.%d as the local IP\n", 
+		DEBUG_LOG(("createRoomCallback - peerGetLocalIP returned %d.%d.%d.%d as the local IP",
 								localIP >> 24, (localIP >> 16) & 0xff, (localIP >> 8) & 0xff, localIP & 0xff));
 //		GetLocalChatConnectionAddress("peerchat.gamespy.com", 6667, localIP);
-//		DEBUG_LOG(("createRoomCallback - GetLocalChatConnectionAddress returned %d.%d.%d.%d as the local IP\n", 
+//		DEBUG_LOG(("createRoomCallback - GetLocalChatConnectionAddress returned %d.%d.%d.%d as the local IP",
 //								localIP >> 24, (localIP >> 16) & 0xff, (localIP >> 8) & 0xff, localIP & 0xff));
 		localIP = ntohl(localIP); // The IP returned from GetLocalChatConnectionAddress is in network byte order.
 		TheGameSpyGame->setLocalIP(localIP);
@@ -1055,7 +1055,7 @@ void createRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, Room
 
 			TheGameSpyGame->adjustSlotsForMap(); // BGC- adjust the slots for the new map.
 		}
-		
+
 
 		// change to the proper screen
 		TheShell->pop();
@@ -1065,7 +1065,7 @@ void createRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, Room
 	{
 		// join the lobby again
 		TheGameSpyChat->joinGroupRoom(oldGroupID);
-		GSMessageBoxOk(UnicodeString(L"Oops"), UnicodeString(L"Unable to create game"), NULL);
+		GSMessageBoxOk(L"Oops", L"Unable to create game", NULL);
 	}
 
 	// Update buddy location
@@ -1094,7 +1094,7 @@ void ListGroupRoomsCallback(PEER peer, PEERBool success,
 														int maxWaiting, int numGames,
 														int numPlaying, void * param)
 {
-	DEBUG_LOG(("ListGroupRoomsCallback\n"));
+	DEBUG_LOG(("ListGroupRoomsCallback"));
 	if (success)
 	{
 		if (groupID)
@@ -1141,8 +1141,8 @@ void GameSpyChat::_connectCallback(PEER peer, PEERBool success, void * param)
 	m_loginTimeout = 0;
 
 	if (!success) {
-		GSMessageBoxOk(UnicodeString(L"Error connecting"), UnicodeString(L"Failed to connect"), NULL);
-		DEBUG_LOG(("GameSpyChat::_connectCallback - failed to connect.\n"));
+		GSMessageBoxOk(L"Error connecting", L"Failed to connect", NULL);
+		DEBUG_LOG(("GameSpyChat::_connectCallback - failed to connect."));
 	}
 
 	if(!success)
@@ -1157,7 +1157,7 @@ void GameSpyChat::_connectCallback(PEER peer, PEERBool success, void * param)
 		return;
 	}
 
-	DEBUG_LOG(("Connected as profile %d (%s)\n", m_profileID, m_loginName.str()));
+	DEBUG_LOG(("Connected as profile %d (%s)", m_profileID, m_loginName.str()));
 
 	TheGameSpyGame = NEW GameSpyGameInfo;
 
@@ -1195,19 +1195,19 @@ void GameSpyChat::_nickErrorCallback(PEER peer, int type, const char * nick, voi
 		{
 			intVal = atoi(appendedVal.str()) + 1;
 		}
-		DEBUG_LOG(("Nickname taken: origName=%s, tries=%d\n", origName.str(), intVal));
+		DEBUG_LOG(("Nickname taken: origName=%s, tries=%d", origName.str(), intVal));
 
 		if (intVal < 10)
 		{
 			nickStr.format("%s{%d}", origName.str(), intVal);
 			// Retry the connect with a similar nick.
-			DEBUG_LOG(("GameSpyChat::_nickErrorCallback - nick was taken, setting to %s\n", nickStr.str()));
+			DEBUG_LOG(("GameSpyChat::_nickErrorCallback - nick was taken, setting to %s", nickStr.str()));
 			m_loginName = nickStr;
 			peerRetryWithNick(peer, nickStr.str());
 		}
 		else
 		{
-			GSMessageBoxOk(UnicodeString(L"Error connecting"), UnicodeString(L"That nickname is already taken; please choose another one."), NULL);
+			GSMessageBoxOk(L"Error connecting", L"That nickname is already taken; please choose another one.", NULL);
 			// Cancel the connect.
 			peerRetryWithNick(peer, NULL);
 
@@ -1218,7 +1218,7 @@ void GameSpyChat::_nickErrorCallback(PEER peer, int type, const char * nick, voi
 	}
 	else
 	{
-		GSMessageBoxOk(UnicodeString(L"Error connecting"), UnicodeString(L"That nickname contains at least 1 invalid character, please choose another one."), NULL);
+		GSMessageBoxOk(L"Error connecting", L"That nickname contains at least 1 invalid character, please choose another one.", NULL);
 		// Cancel the connect.
 		peerRetryWithNick(peer, NULL);
 
@@ -1230,7 +1230,7 @@ void GameSpyChat::_nickErrorCallback(PEER peer, int type, const char * nick, voi
 
 void GameSpyChat::_GPConnectCallback(GPConnection * pconnection, GPConnectResponseArg * arg, void * param)
 {
-	DEBUG_LOG(("GPConnectCallback:\n"));
+	DEBUG_LOG(("GPConnectCallback:"));
 	GPResult *res = (GPResult *)param;
 	*res = arg->result;
 
@@ -1239,7 +1239,7 @@ void GameSpyChat::_GPConnectCallback(GPConnection * pconnection, GPConnectRespon
 	if (*res != GP_NO_ERROR)
 	{
 		// couldn't connect.  bummer.
-		GSMessageBoxOk(UnicodeString(L"Error connecting"), UnicodeString(L"Error connecting to buddy server"), NULL);
+		GSMessageBoxOk(L"Error connecting", L"Error connecting to buddy server", NULL);
 		gpDisconnect(TheGPConnection);
 		gpDestroy(TheGPConnection);
 		m_loginTimeout = 0;
@@ -1255,14 +1255,14 @@ static Bool inGPReconnect = false;
 void GameSpyChat::_GPReconnectCallback(GPConnection * pconnection, GPConnectResponseArg * arg, void * param)
 {
 	inGPReconnect = false;
-	DEBUG_LOG(("GPConnectCallback:\n"));
+	DEBUG_LOG(("GPConnectCallback:"));
 
 	setProfileID(arg->profile);
 
 	if (arg->result != GP_NO_ERROR)
 	{
 		// couldn't connect.  bummer.
-		GSMessageBoxOk(UnicodeString(L"Error connecting"), UnicodeString(L"Error connecting to buddy server"), NULL);
+		GSMessageBoxOk(L"Error connecting", L"Error connecting to buddy server", NULL);
 		gpDisconnect(TheGPConnection);
 		gpDestroy(TheGPConnection);
 		return;
@@ -1270,7 +1270,7 @@ void GameSpyChat::_GPReconnectCallback(GPConnection * pconnection, GPConnectResp
 	else
 	{
 		// yay!  we're back in!
-		GSMessageBoxOk(UnicodeString(L"Connected!"), UnicodeString(L"Reonnected to buddy server"), NULL);
+		GSMessageBoxOk(L"Connected!", L"Reonnected to buddy server", NULL);
 	}
 }
 
@@ -1287,7 +1287,7 @@ void GameSpyChat::loginProfile(AsciiString loginName, AsciiString password, Asci
 
 	GPResult res = GP_PARAMETER_ERROR;
 	m_loginName = loginName;
-	DEBUG_LOG(("GameSpyChat::loginProfile - m_loginName set to %s\n", m_loginName.str()));
+	DEBUG_LOG(("GameSpyChat::loginProfile - m_loginName set to %s", m_loginName.str()));
 	m_password = password;
 	m_email = email;
 	gpConnect(TheGPConnection, loginName.str(), email.str(), password.str(), GP_FIREWALL, GP_NON_BLOCKING, (GPCallback)GPConnectCallback, &res);
@@ -1295,7 +1295,7 @@ void GameSpyChat::loginProfile(AsciiString loginName, AsciiString password, Asci
 	if (res != GP_NO_ERROR)
 	{
 		// couldn't connect.  bummer.
-		GSMessageBoxOk(UnicodeString(L"Error connecting"), UnicodeString(L"Error connecting to buddy server"), NULL);
+		GSMessageBoxOk(L"Error connecting", L"Error connecting to buddy server", NULL);
 		gpDisconnect(TheGPConnection);
 		gpDestroy(TheGPConnection);
 		loginTimeout = 0;
@@ -1332,7 +1332,7 @@ void GameSpyChat::loginQuick(AsciiString login)
 	// Connect to chat.
 	///////////////////
 	m_loginName = login;
-	DEBUG_LOG(("GameSpyChat::loginQuick - setting login to %s\n", m_loginName));
+	DEBUG_LOG(("GameSpyChat::loginQuick - setting login to %s", m_loginName));
 	peerConnect(m_peer, login.str(), 0, nickErrorCallback, connectCallback, NULL, PEERFalse);
 }
 
@@ -1367,16 +1367,16 @@ void GameSpyChat::login(AsciiString loginName, AsciiString password, AsciiString
 	callbacks.GOAPlayers = GOAPlayersCallback;
 	//callbacks.globalKeyChanged = GlobalKeyChanged;
 	callbacks.param = NULL;
-	
+
 	// Init peer.
 	/////////////
 	m_peer = peerInitialize(&callbacks);
 	if(!m_peer)
 	{
-		GSMessageBoxOk(UnicodeString(L"No Peer"), UnicodeString(L"No Peer"), NULL);
+		GSMessageBoxOk(L"No Peer", L"No Peer", NULL);
 		return;
 	}
-	
+
 	// Setup which rooms to do pings and cross-pings in.
 	////////////////////////////////////////////////////
 	PEERBool pingRooms[NumRooms];
@@ -1387,12 +1387,12 @@ void GameSpyChat::login(AsciiString loginName, AsciiString password, AsciiString
 	crossPingRooms[TitleRoom] = PEERFalse;
 	crossPingRooms[GroupRoom] = PEERFalse;
 	crossPingRooms[StagingRoom] = PEERTrue;
-	
+
 	// Set the title.
 	/////////////////
 	if(!peerSetTitle(m_peer, "gmtest", "HA6zkS", "gmtest", "HA6zkS", 15, pingRooms, crossPingRooms))
 	{
-		GSMessageBoxOk(UnicodeString(L"Error setting title"), UnicodeString(L"Error setting title"), NULL);
+		GSMessageBoxOk(L"Error setting title", L"Error setting title", NULL);
 		peerShutdown(m_peer);
 		m_peer = NULL;
 		return;
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp
deleted file mode 100644
index 2bd368d9229..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Chat.cpp //////////////////////////////////////////////////////
-// Generals GameSpy chat-related code
-// Author: Matthew D. Campbell, July 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/AudioEventRTS.h"
-#include "Common/INI.h"
-#include "GameClient/GameText.h"
-#include "GameClient/GadgetListBox.h"
-#include "GameClient/LanguageFilter.h"
-#include "GameClient/GameWindowManager.h"
-#include "GameNetwork/GameSpy/PeerDefsImplementation.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-#include "GameClient/InGameUI.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#define OFFSET(x) (sizeof(Int) * (x))
-static const FieldParse GameSpyColorFieldParse[] = 
-{
-
-	{ "Default",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_DEFAULT) },
-	{ "CurrentRoom",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CURRENTROOM) },
-	{ "ChatRoom",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_ROOM) },
-	{ "Game",								INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_GAME) },
-	{ "GameFull",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_GAME_FULL) },
-	{ "GameCRCMismatch",		INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_GAME_CRCMISMATCH) },
-	{ "PlayerNormal",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_NORMAL) },
-	{ "PlayerOwner",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_OWNER) },
-	{ "PlayerBuddy",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_BUDDY) },
-	{ "PlayerSelf",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_SELF) },
-	{ "PlayerIgnored",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_IGNORED) },
-	{ "ChatNormal",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_NORMAL) },
-	{ "ChatEmote",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_EMOTE) },
-	{ "ChatOwner",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_OWNER) },
-	{ "ChatOwnerEmote",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_OWNER_EMOTE) },
-	{ "ChatPriv",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_PRIVATE) },
-	{ "ChatPrivEmote",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_PRIVATE_EMOTE) },
-	{ "ChatPrivOwner",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_PRIVATE_OWNER) },
-	{ "ChatPrivOwnerEmote",	INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_PRIVATE_OWNER_EMOTE) },
-	{ "ChatBuddy",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_BUDDY) },
-	{ "ChatSelf",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_SELF) },
-	{ "AcceptTrue",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_ACCEPT_TRUE) },
-	{ "AcceptFalse",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_ACCEPT_FALSE) },
-	{ "MapSelected",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_MAP_SELECTED) },
-	{ "MapUnselected",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_MAP_UNSELECTED) },
-	{ "MOTD",								INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_MOTD) },
-	{ "MOTDHeading",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_MOTD_HEADING) },
-
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
-
-};
-
-void INI::parseOnlineChatColorDefinition( INI* ini )
-{
-	// parse the ini definition
-	ini->initFromINI( GameSpyColor, GameSpyColorFieldParse );
-}
-
-
-Color GameSpyColor[GSCOLOR_MAX] =
-{
-	GameMakeColor(255,255,255,255),	// GSCOLOR_DEFAULT
-	GameMakeColor(255,255,  0,255),	// GSCOLOR_CURRENTROOM
-	GameMakeColor(255,255,255,255),	// GSCOLOR_ROOM
-	GameMakeColor(128,128,0,255),		// GSCOLOR_GAME
-	GameMakeColor(128,128,128,255),	// GSCOLOR_GAME_FULL
-	GameMakeColor(128,128,128,255),	// GSCOLOR_GAME_CRCMISMATCH
-	GameMakeColor(255,  0,  0,255),	// GSCOLOR_PLAYER_NORMAL
-	GameMakeColor(255,  0,255,255),	// GSCOLOR_PLAYER_OWNER
-	GameMakeColor(255,  0,128,255),	// GSCOLOR_PLAYER_BUDDY
-	GameMakeColor(255,  0,  0,255),	// GSCOLOR_PLAYER_SELF
-	GameMakeColor(128,128,128,255),	// GSCOLOR_PLAYER_IGNORED
-	GameMakeColor(255,0,0,255),			// GSCOLOR_CHAT_NORMAL
-	GameMakeColor(255,128,0,255),		// GSCOLOR_CHAT_EMOTE,
-	GameMakeColor(255,255,0,255),		// GSCOLOR_CHAT_OWNER,
-	GameMakeColor(128,255,0,255),		// GSCOLOR_CHAT_OWNER_EMOTE,
-	GameMakeColor(0,0,255,255),			// GSCOLOR_CHAT_PRIVATE,
-	GameMakeColor(0,255,255,255),		// GSCOLOR_CHAT_PRIVATE_EMOTE,
-	GameMakeColor(255,0,255,255),		// GSCOLOR_CHAT_PRIVATE_OWNER,
-	GameMakeColor(255,128,255,255),	// GSCOLOR_CHAT_PRIVATE_OWNER_EMOTE,
-	GameMakeColor(255,  0,255,255),	// GSCOLOR_CHAT_BUDDY,
-	GameMakeColor(255,  0,128,255),	// GSCOLOR_CHAT_SELF,
-	GameMakeColor(  0,255,  0,255),	// GSCOLOR_ACCEPT_TRUE,
-	GameMakeColor(255,  0,  0,255),	// GSCOLOR_ACCEPT_FALSE,
-	GameMakeColor(255,255,  0,255),	// GSCOLOR_MAP_SELECTED,
-	GameMakeColor(255,255,255,255),	// GSCOLOR_MAP_UNSELECTED,
-	GameMakeColor(255,255,255,255),	// GSCOLOR_MOTD,
-	GameMakeColor(255,255,  0,255),	// GSCOLOR_MOTD_HEADING,
-};
-
-Bool GameSpyInfo::sendChat( UnicodeString message, Bool isAction, GameWindow *playerListbox )
-{
-	RoomType roomType = StagingRoom;
-	if (getCurrentGroupRoom())
-		roomType = GroupRoom;
-
-	PeerRequest req;
-	req.text = message.str();
-
-	message.trim();
-	// Echo the user's input to the chat window
-	if (!message.isEmpty())
-	{
-		if (!playerListbox)
-		{
-			// Public message
-			req.message.isAction = isAction;
-			req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEROOM;
-			TheGameSpyPeerMessageQueue->addRequest(req);
-			return false;
-		}
-
-		// Get the selections (is this a private message?)
-		Int maxSel = GadgetListBoxGetListLength(playerListbox);
-		Int *selections;
-		GadgetListBoxGetSelected(playerListbox, (Int *)&selections);
-
-		if (selections[0] == -1)
-		{
-			// Public message
-			req.message.isAction = isAction;
-			req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEROOM;
-			TheGameSpyPeerMessageQueue->addRequest(req);
-			return false;
-		}
-		else
-		{
-			// Private message
-
-			// Construct a list
-			AsciiString names = AsciiString::TheEmptyString;
-			AsciiString tmp = AsciiString::TheEmptyString;
-			AsciiString aStr; // AsciiString buf for translating Unicode entries
-			names.format("%s", TheGameSpyInfo->getLocalName().str());
-			for (int i=0; i<maxSel; i++)
-			{
-				if (selections[i] != -1)
-				{
-					aStr.translate(GadgetListBoxGetText(playerListbox, selections[i], GadgetListBoxGetNumColumns(playerListbox)-1));
-					if (aStr.compareNoCase(TheGameSpyInfo->getLocalName()))
-					{
-						tmp.format(",%s", aStr.str());
-						names.concat(tmp);
-					}
-				}
-				else
-				{
-					break;
-				}
-			}
-
-			if (!names.isEmpty())
-			{
-				req.nick = names.str();
-				req.message.isAction = isAction;
-				req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEPLAYER;
-				TheGameSpyPeerMessageQueue->addRequest(req);
-			}
-
-			return true;
-		}
-	}
-	return false;
-}
-
-void GameSpyInfo::addChat( AsciiString nick, Int profileID, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win )
-{
-	PlayerInfoMap::iterator it = getPlayerInfoMap()->find(nick);
-	if (it != getPlayerInfoMap()->end())
-	{
-		addChat( it->second, msg, isPublic, isAction, win );
-	}
-	else
-	{
-	}
-}
-
-void GameSpyInfo::addChat( PlayerInfo p, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win )
-{
-	Int style;
-	if(isSavedIgnored(p.m_profileID) || isIgnored(p.m_name))
-		return;
-	
-	Bool isOwner = p.m_flags & PEER_FLAG_OP;
-	Bool isBuddy = getBuddyMap()->find(p.m_profileID) != getBuddyMap()->end();
-
-	Bool isMe = p.m_name.compare(TheGameSpyInfo->getLocalName()) == 0;
-
-	if(!isMe)
-	{
-		if(m_disallowAsainText)
-		{
-			const WideChar *buff = msg.str();
-			Int length =  msg.getLength();	
-			for(Int i = 0; i < length; ++i)
-			{
-				if(buff[i] >= 256)
-					return;
-			}
-		}
-		else if(m_disallowNonAsianText)
-		{
-			const WideChar *buff = msg.str();
-			Int length =  msg.getLength();	
-			Bool hasUnicode = FALSE;
-			for(Int i = 0; i < length; ++i)
-			{
-				if(buff[i] >= 256)
-				{
-					hasUnicode = TRUE;
-					break;
-				}
-			}
-			if(!hasUnicode)
-				return;
-		}
-
-		if (!isPublic)
-		{
-			AudioEventRTS privMsgAudio("GUIMessageReceived");
-
-			if( TheAudio )
-			{
-				TheAudio->addAudioEvent( &privMsgAudio );
-			}  // end if
-		}
-	}
-
-
-	if (isBuddy)
-	{
-		style = GSCOLOR_CHAT_BUDDY;
-	}
-	else if (isPublic && isAction)
-	{
-		style = (isOwner)?GSCOLOR_CHAT_OWNER_EMOTE:GSCOLOR_CHAT_EMOTE;
-	}
-	else if (isPublic)
-	{
-		style = (isOwner)?GSCOLOR_CHAT_OWNER:GSCOLOR_CHAT_NORMAL;
-	}
-	else if (isAction)
-	{
-		style = (isOwner)?GSCOLOR_CHAT_PRIVATE_OWNER_EMOTE:GSCOLOR_CHAT_PRIVATE_EMOTE;
-	}
-	else
-	{
-		style = (isOwner)?GSCOLOR_CHAT_PRIVATE_OWNER:GSCOLOR_CHAT_PRIVATE;
-	}
-
-	UnicodeString name;
-	name.translate(p.m_name);
-
-	// filters language
-//  if( TheGlobalData->m_languageFilterPref )
-//  {
-    TheLanguageFilter->filterLine(msg);
-//  }
-
-	UnicodeString fullMsg;
-	if (isAction)
-	{
-		fullMsg.format( L"%ls %ls", name.str(), msg.str() );
-	}
-	else
-	{
-		fullMsg.format( L"[%ls] %ls", name.str(), msg.str() );
-	}
-
-	Int index = addText(fullMsg, GameSpyColor[style], win);
-	if (index >= 0)
-	{
-		GadgetListBoxSetItemData(win, (void *)p.m_profileID, index);
-	}
-}
-
-Int GameSpyInfo::addText( UnicodeString message, Color c, GameWindow *win )
-{
-	if (TheGameSpyGame && TheGameSpyGame->isInGame() && TheGameSpyGame->isGameInProgress())
-	{
-		static AudioEventRTS messageFromChatSound("GUIMessageReceived");
-		TheAudio->addAudioEvent(&messageFromChatSound);
-
-		TheInGameUI->message(message);
-	}
-
-	if (!win)
-	{
-		// try to pick up a registered text window
-		if (m_textWindows.empty())
-			return -1;
-
-		win = *(m_textWindows.begin());
-	}
-	Int index = GadgetListBoxAddEntryText(win, message, c, -1, -1);
-	GadgetListBoxSetItemData(win, (void *)-1, index);
-
-	return index;
-}
-
-void GameSpyInfo::registerTextWindow( GameWindow *win )
-{
-	m_textWindows.insert(win);
-}
-
-void GameSpyInfo::unregisterTextWindow( GameWindow *win )
-{
-	m_textWindows.erase(win);
-}
-
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp
deleted file mode 100644
index f8f6e98cbe7..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: GSConfig.cpp
-// Author: Matthew D. Campbell, Sept 2002
-// Description: GameSpy online config
-///////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameState.h"
-#include "GameClient/MapUtil.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-#include "GameNetwork/RankPointValue.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-GameSpyConfigInterface *TheGameSpyConfig = NULL;
-
-class GameSpyConfig : public GameSpyConfigInterface
-{
-public:
-	GameSpyConfig( AsciiString config );
-	~GameSpyConfig() {}
-
-	// Pings
-	std::list<AsciiString> getPingServers(void)	{ return m_pingServers; }
-	Int getNumPingRepetitions(void)							{ return m_pingReps; }
-	Int getPingTimeoutInMs(void)								{ return m_pingTimeout; }
-	virtual Int getPingCutoffGood( void )				{	return m_pingCutoffGood; }
-	virtual Int getPingCutoffBad( void )				{ return m_pingCutoffBad;	}
-
-	// QM
-	std::list<AsciiString> getQMMaps(void)			{ return m_qmMaps; }
-	Int getQMBotID(void)												{ return m_qmBotID; }
-	Int getQMChannel(void)											{ return m_qmChannel; }
-	void setQMChannel(Int channel)							{ m_qmChannel = channel; }
-
-	// Player Info
-	Int getPointsForRank(Int rank);
-	virtual Bool isPlayerVIP(Int id);
-	
-	virtual Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port);
-
-	// Ladder / Any other external parsing
-	AsciiString getLeftoverConfig(void)					{ return m_leftoverConfig; }
-	
-	// NAT Timeouts
-	virtual Int getTimeBetweenRetries() { return m_natRetryInterval; }
-	virtual Int getMaxManglerRetries() { return m_natMaxManglerRetries; }
-	virtual time_t getRetryInterval() { return m_natManglerRetryInterval; }
-	virtual time_t getKeepaliveInterval() { return m_natKeepaliveInterval; }
-	virtual time_t getPortTimeout() { return m_natPortTimeout; }
-	virtual time_t getRoundTimeout() { return m_natRoundTimeout; }
-
-	// Custom match
-	virtual Bool restrictGamesToLobby() { return m_restrictGamesToLobby; }
-
-protected:
-	std::list<AsciiString> m_pingServers;
-	Int m_pingReps;
-	Int m_pingTimeout;
-	Int m_pingCutoffGood;
-	Int m_pingCutoffBad;
-
-	Int m_natRetryInterval;
-	Int m_natMaxManglerRetries;
-	time_t m_natManglerRetryInterval;
-	time_t m_natKeepaliveInterval;
-	time_t m_natPortTimeout;
-	time_t m_natRoundTimeout;
-
-	std::vector<AsciiString> m_manglerHosts;
-	std::vector<UnsignedShort> m_manglerPorts;
-
-	std::list<AsciiString> m_qmMaps;
-	Int m_qmBotID;
-	Int m_qmChannel;
-
-	Bool m_restrictGamesToLobby;
-
-	std::set<Int> m_vip; // VIP people
-
-	Int m_rankPoints[MAX_RANKS];
-
-	AsciiString m_leftoverConfig;
-};
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-GameSpyConfigInterface* GameSpyConfigInterface::create(AsciiString config)
-{
-	return NEW GameSpyConfig(config);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-class SectionChecker
-{
-public:
-	typedef std::list<const Bool *> SectionList;
-	void addVar(const Bool *var) { m_bools.push_back(var); }
-	Bool isInSection();
-protected:
-	 SectionList m_bools;
-};
-Bool SectionChecker::isInSection() {
-	Bool ret = FALSE;
-	for (SectionList::const_iterator it = m_bools.begin(); it != m_bools.end(); ++it)
-	{
-		ret = ret || **it;
-	}
-	return ret;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-GameSpyConfig::GameSpyConfig( AsciiString config ) :
-m_natRetryInterval(1000),
-m_natMaxManglerRetries(25),
-m_natManglerRetryInterval(300),
-m_natKeepaliveInterval(15000),
-m_natPortTimeout(10000),
-m_natRoundTimeout(10000),
-m_pingReps(1),
-m_pingTimeout(1000),
-m_pingCutoffGood(300),
-m_pingCutoffBad(600),
-m_restrictGamesToLobby(FALSE),
-m_qmBotID(0),
-m_qmChannel(0)
-{
-	m_rankPoints[0] = 0;
-	m_rankPoints[1] = 5;
-	m_rankPoints[2] = 10;
-	m_rankPoints[3] = 20;
-	m_rankPoints[4] = 50;
-	m_rankPoints[5] = 100;
-	m_rankPoints[6] = 200;
-	m_rankPoints[7] = 500;
-	m_rankPoints[8] = 1000;
-	m_rankPoints[9] = 2000;
-
-	AsciiString line;
-	Bool inPingServers = FALSE;
-	Bool inPingDuration = FALSE;
-	Bool inQMMaps = FALSE;
-	Bool inQMBot = FALSE;
-	Bool inManglers = FALSE;
-	Bool inVIP = FALSE;
-	Bool inNAT = FALSE;
-	Bool inCustom = FALSE;
-
-	SectionChecker sections;
-	sections.addVar(&inPingServers);
-	sections.addVar(&inPingDuration);
-	sections.addVar(&inQMMaps);
-	sections.addVar(&inQMBot);
-	sections.addVar(&inManglers);
-	sections.addVar(&inVIP);
-	sections.addVar(&inNAT);
-	sections.addVar(&inCustom);
-
-	while (config.nextToken(&line, "\n"))
-	{
-		if (line.getCharAt(line.getLength()-1) == '\r')
-			line.removeLastChar();	// there is a trailing '\r'
-
-		line.trim();
-
-		if (line.isEmpty())
-			continue;
-
-		if (!sections.isInSection() && line.compare("<PingServers>") == 0)
-		{
-			inPingServers = TRUE;
-		}
-		else if (inPingServers && line.compare("</PingServers>") == 0)
-		{
-			inPingServers = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<PingDuration>") == 0)
-		{
-			inPingDuration = TRUE;
-		}
-		else if (inPingDuration && line.compare("</PingDuration>") == 0)
-		{
-			inPingDuration = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<QMMaps>") == 0)
-		{
-			inQMMaps = TRUE;
-		}
-		else if (inQMMaps && line.compare("</QMMaps>") == 0)
-		{
-			inQMMaps = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<Manglers>") == 0)
-		{
-			inManglers = TRUE;
-		}
-		else if (inManglers && line.compare("</Manglers>") == 0)
-		{
-			inManglers = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<QMBot>") == 0)
-		{
-			inQMBot = TRUE;
-		}
-		else if (inQMBot && line.compare("</QMBot>") == 0)
-		{
-			inQMBot = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<VIP>") == 0)
-		{
-			inVIP = TRUE;
-		}
-		else if (inVIP && line.compare("</VIP>") == 0)
-		{
-			inVIP = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<NAT>") == 0)
-		{
-			inNAT = TRUE;
-		}
-		else if (inNAT && line.compare("</NAT>") == 0)
-		{
-			inNAT = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<Custom>") == 0)
-		{
-			inCustom = TRUE;
-		}
-		else if (inCustom && line.compare("</Custom>") == 0)
-		{
-			inCustom = FALSE;
-		}
-		else if (inVIP)
-		{
-			line.toLower();
-			if (line.getLength())
-			{
-				Int val = atoi(line.str());
-				if (val > 0)
-					m_vip.insert(val);
-			}
-		}
-		else if (inPingServers)
-		{
-			line.toLower();
-			m_pingServers.push_back(line);
-		}
-		else if (inPingDuration)
-		{
-			line.toLower();
-			AsciiString key, val;
-			if (line.nextToken(&key, " ="))
-			{
-				if (key == "reps")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_pingReps = atoi(val.str());
-					}
-				}
-				else if (key == "timeout")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_pingTimeout = atoi(val.str());
-					}
-				}
-				else if (key == "low")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_pingCutoffGood = atoi(val.str());
-					}
-				}
-				else if (key == "med")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_pingCutoffBad = atoi(val.str());
-					}
-				}
-			}
-		}
-		else if (inManglers)
-		{
-			line.trim();
-			line.toLower();
-			AsciiString hostStr;
-			AsciiString portStr;
-			line.nextToken(&hostStr, ":");
-			line.nextToken(&portStr, ":\n\r");
-			if (hostStr.isNotEmpty() && portStr.isNotEmpty())
-			{
-				m_manglerHosts.push_back(hostStr);
-				m_manglerPorts.push_back(atoi(portStr.str()));
-			}
-		}
-		else if (inQMMaps)
-		{
-			line.toLower();
-			AsciiString mapName;
-			mapName.format("%s\\%s\\%s.map", TheMapCache->getMapDir().str(), line.str(), line.str());
-			mapName = TheGameState->portableMapPathToRealMapPath(TheGameState->realMapPathToPortableMapPath(mapName));
-			mapName.toLower();
-
-			// [SKB: Jul 01 2003 @ 6:43pm] :
-			// German2 is missing some maps because of content.  But, we need the m_qmMaps
-			// to contain same number of strings as the Retail version so that the
-			// QM Bot thinks that they have the same number of maps.
-			#if 1
-			m_qmMaps.push_back(mapName);
-			#else
-			const MapMetaData *md = TheMapCache->findMap(mapName);
-			if (md)
-			{
-				m_qmMaps.push_back(mapName);
-			} 
-			#endif
-		}
-		else if (inQMBot)
-		{
-			line.toLower();
-			AsciiString key, val;
-			if (line.nextToken(&key, " ="))
-			{
-				if (key == "id")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_qmBotID = atoi(val.str());
-					}
-				}
-			}
-		}
-		else if (inNAT)
-		{
-			line.toLower();
-			AsciiString key, val;
-			if (line.nextToken(&key, " ="))
-			{
-				if (key == "retryinterval")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_natRetryInterval = atoi(val.str());
-					}
-				}
-				else if (key == "manglerretries")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_natMaxManglerRetries = atoi(val.str());
-					}
-				}
-				else if (key == "manglerinterval")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_natManglerRetryInterval = atoi(val.str());
-					}
-				}
-				else if (key == "keepaliveinterval")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_natKeepaliveInterval = atoi(val.str());
-					}
-				}
-				else if (key == "porttimeout")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_natPortTimeout = atoi(val.str());
-					}
-				}
-				else if (key == "roundtimeout")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_natRoundTimeout = atoi(val.str());
-					}
-				}
-				else
-				{
-					DEBUG_LOG(("Unknown key '%s' = '%s' in NAT block of GameSpy Config\n", key.str(), val.str()));
-				}
-			}
-			else
-			{
-				DEBUG_LOG(("Key '%s' missing val in NAT block of GameSpy Config\n", key.str()));
-			}
-		}
-		else if (inCustom)
-		{
-			line.toLower();
-			AsciiString key, val;
-			if (line.nextToken(&key, " =") && line.nextToken(&val, " ="))
-			{
-				if (key == "restricted")
-				{
-					m_restrictGamesToLobby = atoi(val.str());
-				}
-				else
-				{
-					DEBUG_LOG(("Unknown key '%s' = '%s' in Custom block of GameSpy Config\n", key.str(), val.str()));
-				}
-			}
-			else
-			{
-				DEBUG_LOG(("Key '%s' missing val in Custom block of GameSpy Config\n", key.str()));
-			}
-		}
-		else
-		{
-			m_leftoverConfig.concat(line);
-			m_leftoverConfig.concat('\n');
-		}
-	}
-
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-Int GameSpyConfig::getPointsForRank(Int rank)
-{
-	if (rank >= MAX_RANKS) rank = MAX_RANKS-1;
-	if (rank < 0) rank = 0;
-	return m_rankPoints[rank];
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-Bool GameSpyConfig::getManglerLocation(Int index, AsciiString& host, UnsignedShort& port)
-{
-	if (index < 0 || index >= m_manglerHosts.size())
-	{
-		return FALSE;
-	}
-
-	host = m_manglerHosts[index];
-	port = m_manglerPorts[index];
-	return TRUE;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-Bool GameSpyConfig::isPlayerVIP(Int id)
-{
-	std::set<Int>::const_iterator it = std::find(m_vip.begin(), m_vip.end(), id);
-	return it != m_vip.end();
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp
deleted file mode 100644
index cf8336b3580..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: LadderDefs.cpp //////////////////////////////////////////////////////
-// Generals ladder code
-// Author: Matthew D. Campbell, August 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/GameSpy/ThreadUtils.h"
-#include "GameNetwork/GameSpy/LadderDefs.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-#include "Common/GameState.h"
-#include "Common/file.h"
-#include "Common/FileSystem.h"
-#include "Common/PlayerTemplate.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MapUtil.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-LadderList *TheLadderList = NULL;
-
-LadderInfo::LadderInfo()
-{
-	playersPerTeam = 1;
-	minWins = 0;
-	maxWins = 0;
-	randomMaps = TRUE;
-	randomFactions = TRUE;
-	validQM = TRUE;
-	validCustom = FALSE;
-	port = 0;
-	submitReplay = FALSE;
-	index = -1;
-}
-
-static LadderInfo *parseLadder(AsciiString raw)
-{
-	DEBUG_LOG(("Looking at ladder:\n%s\n", raw.str()));
-	LadderInfo *lad = NULL;
-	AsciiString line;
-	while (raw.nextToken(&line, "\n"))
-	{
-		if (line.getCharAt(line.getLength()-1) == '\r')
-			line.removeLastChar();	// there is a trailing '\r'
-
-		line.trim();
-
-		if (line.isEmpty())
-			continue;
-
-		// woohoo!  got a line!
-		line.trim();
-		if ( !lad && line.startsWith("<Ladder ") )
-		{
-			// start of a ladder def
-			lad = NEW LadderInfo;
-
-			// fill in some info
-			AsciiString tokenName, tokenAddr, tokenPort, tokenHomepage;
-			line.removeLastChar(); // the '>'
-			line = line.str() + 7; // the "<Ladder "
-			line.nextToken(&tokenAddr, "\" ");
-			line.nextToken(&tokenPort, " ");
-			line.nextToken(&tokenHomepage, " ");
-
-			lad->name = MultiByteToWideCharSingleLine(tokenName.str()).c_str();
-			while (lad->name.getLength() > 20)
-				lad->name.removeLastChar(); // Per Harvard's request, ladder names are limited to 20 chars
-			lad->address = tokenAddr;
-			lad->port = atoi(tokenPort.str());
-			lad->homepageURL = tokenHomepage;
-		}
-		else if ( lad && line.startsWith("Name ") )
-		{
-			lad->name = MultiByteToWideCharSingleLine(line.str() + 5).c_str();
-		}
-		else if ( lad && line.startsWith("Desc ") )
-		{
-			lad->description = MultiByteToWideCharSingleLine(line.str() + 5).c_str();
-		}
-		else if ( lad && line.startsWith("Loc ") )
-		{
-			lad->location = MultiByteToWideCharSingleLine(line.str() + 4).c_str();
-		}
-		else if ( lad && line.startsWith("TeamSize ") )
-		{
-			lad->playersPerTeam = atoi(line.str() + 9);
-		}
-		else if ( lad && line.startsWith("RandomMaps ") )
-		{
-			lad->randomMaps = atoi(line.str() + 11);
-		}
-		else if ( lad && line.startsWith("RandomFactions ") )
-		{
-			lad->randomFactions = atoi(line.str() + 15);
-		}
-		else if ( lad && line.startsWith("Faction ") )
-		{
-			AsciiString faction = line.str() + 8;
-			AsciiStringList outStringList;
-			ThePlayerTemplateStore->getAllSideStrings(&outStringList);
-
-			AsciiStringList::iterator aIt = std::find(outStringList.begin(), outStringList.end(), faction);
-			if (aIt != outStringList.end())
-			{
-				// valid faction - now check for dupes
-				aIt = std::find(lad->validFactions.begin(), lad->validFactions.end(), faction);
-				if (aIt == lad->validFactions.end())
-				{
-					lad->validFactions.push_back(faction);
-				}
-			}
-		}
-		/*
-		else if ( lad && line.startsWith("QM ") )
-		{
-			lad->validQM = atoi(line.str() + 3);
-		}
-		else if ( lad && line.startsWith("Custom ") )
-		{
-			lad->validCustom = atoi(line.str() + 7);
-		}
-		*/
-		else if ( lad && line.startsWith("MinWins ") )
-		{
-			lad->minWins = atoi(line.str() + 8);
-		}
-		else if ( lad && line.startsWith("MaxWins ") )
-		{
-			lad->maxWins = atoi(line.str() + 8);
-		}
-		else if ( lad && line.startsWith("CryptedPass ") )
-		{
-			lad->cryptedPassword = line.str() + 12;
-		}
-		else if ( lad && line.compare("</Ladder>") == 0 )
-		{
-			DEBUG_LOG(("Saw a ladder: name=%ls, addr=%s:%d, players=%dv%d, pass=%s, replay=%d, homepage=%s\n",
-				lad->name.str(), lad->address.str(), lad->port, lad->playersPerTeam, lad->playersPerTeam, lad->cryptedPassword.str(),
-				lad->submitReplay, lad->homepageURL.str()));
-			// end of a ladder
-			if (lad->playersPerTeam >= 1 && lad->playersPerTeam <= MAX_SLOTS/2)
-			{
-				if (lad->validFactions.size() == 0)
-				{
-					DEBUG_LOG(("No factions specified.  Using all.\n"));
-					lad->validFactions.push_back("America");
-					lad->validFactions.push_back("China");
-					lad->validFactions.push_back("GLA");
-				}
-				else
-				{
-					AsciiStringList validFactions = lad->validFactions;
-					for (AsciiStringListIterator it = validFactions.begin(); it != validFactions.end(); ++it)
-					{
-						AsciiString faction = *it;
-						AsciiString marker;
-						marker.format("INI:Faction%s", faction.str());
-						DEBUG_LOG(("Faction %s has marker %s corresponding to str %ls\n", faction.str(), marker.str(), TheGameText->fetch(marker).str()));
-					}
-				}
-
-				if (lad->validMaps.size() == 0)
-				{
-					DEBUG_LOG(("No maps specified.  Using all.\n"));
-					std::list<AsciiString> qmMaps = TheGameSpyConfig->getQMMaps();
-					for (std::list<AsciiString>::const_iterator it = qmMaps.begin(); it != qmMaps.end(); ++it)
-					{
-						AsciiString mapName = *it;
-
-						// check sizes on the maps before allowing them
-						const MapMetaData *md = TheMapCache->findMap(mapName);
-						if (md && md->m_numPlayers >= lad->playersPerTeam*2)
-						{
-							lad->validMaps.push_back(mapName);
-						}
-					}
-				}
-				return lad;
-			}
-			else
-			{
-				// no maps?  don't play on it!
-				delete lad;
-				lad = NULL;
-				return NULL;
-			}
-		}
-		else if ( lad && line.startsWith("Map ") )
-		{
-			// valid map
-			AsciiString mapName = line.str() + 4;
-			mapName.trim();
-			if (mapName.isNotEmpty())
-			{
-				mapName.format("%s\\%s\\%s.map", TheMapCache->getMapDir().str(), mapName.str(), mapName.str());
-				mapName = TheGameState->portableMapPathToRealMapPath(TheGameState->realMapPathToPortableMapPath(mapName));
-				mapName.toLower();
-				std::list<AsciiString> qmMaps = TheGameSpyConfig->getQMMaps();
-				if (std::find(qmMaps.begin(), qmMaps.end(), mapName) != qmMaps.end())
-				{
-					// check sizes on the maps before allowing them
-					const MapMetaData *md = TheMapCache->findMap(mapName);
-					if (md && md->m_numPlayers >= lad->playersPerTeam*2)
-						lad->validMaps.push_back(mapName);
-				}
-			}
-		}
-		else
-		{
-			// bad ladder - kill it
-			delete lad;
-			lad = NULL;
-		}
-	}
-
-	if (lad)
-	{
-		delete lad;
-		lad = NULL;
-	}
-	return NULL;
-}
-
-LadderList::LadderList()
-{
-	//Int profile = TheGameSpyInfo->getLocalProfileID();
-
-	AsciiString rawMotd = TheGameSpyConfig->getLeftoverConfig();
-	AsciiString line;
-	Bool inLadders = FALSE;
-	Bool inSpecialLadders = FALSE;
-	Bool inLadder = FALSE;
-	LadderInfo *lad = NULL;
-	Int index = 1;
-	AsciiString rawLadder;
-
-	while (rawMotd.nextToken(&line, "\n"))
-	{
-		if (line.getCharAt(line.getLength()-1) == '\r')
-			line.removeLastChar();	// there is a trailing '\r'
-
-		line.trim();
-
-		if (line.isEmpty())
-			continue;
-
-		if (!inLadders && line.compare("<Ladders>") == 0)
-		{
-			inLadders = TRUE;
-			rawLadder.clear();
-		}
-		else if (inLadders && line.compare("</Ladders>") == 0)
-		{
-			inLadders = FALSE;
-		}
-		else if (!inSpecialLadders && line.compare("<SpecialLadders>") == 0)
-		{
-			inSpecialLadders = TRUE;
-			rawLadder.clear();
-		}
-		else if (inSpecialLadders && line.compare("</SpecialLadders>") == 0)
-		{
-			inSpecialLadders = FALSE;
-		}
-		else if (inLadders || inSpecialLadders)
-		{
-			if (line.startsWith("<Ladder ") && !inLadder)
-			{
-				inLadder = TRUE;
-				rawLadder.clear();
-				rawLadder.concat(line);
-				rawLadder.concat('\n');
-			}
-			else if (line.compare("</Ladder>") == 0 && inLadder)
-			{
-				inLadder = FALSE;
-				rawLadder.concat(line);
-				rawLadder.concat('\n');
-				if ((lad = parseLadder(rawLadder)) != NULL)
-				{
-					lad->index = index++;
-					if (inLadders)
-					{
-						DEBUG_LOG(("Adding to standard ladders\n"));
-						m_standardLadders.push_back(lad);
-					}
-					else
-					{
-						DEBUG_LOG(("Adding to special ladders\n"));
-						m_specialLadders.push_back(lad);
-					}
-				}
-				rawLadder.clear();
-			}
-			else if (inLadder)
-			{
-				rawLadder.concat(line);
-				rawLadder.concat('\n');
-			}
-		}
-	}
-
-	// look for local ladders
-	loadLocalLadders();
-
-	DEBUG_LOG(("After looking for ladders, we have %d local, %d special && %d normal\n", m_localLadders.size(), m_specialLadders.size(), m_standardLadders.size()));
-}
-
-LadderList::~LadderList()
-{
-	LadderInfoList::iterator it;
-	for (it = m_specialLadders.begin(); it != m_specialLadders.end(); it = m_specialLadders.begin())
-	{
-		delete *it;
-		m_specialLadders.pop_front();
-	}
-	for (it = m_standardLadders.begin(); it != m_standardLadders.end(); it = m_standardLadders.begin())
-	{
-		delete *it;
-		m_standardLadders.pop_front();
-	}
-	for (it = m_localLadders.begin(); it != m_localLadders.end(); it = m_localLadders.begin())
-	{
-		delete *it;
-		m_localLadders.pop_front();
-	}
-}
-
-const LadderInfo* LadderList::findLadder( const AsciiString& addr, UnsignedShort port )
-{
-	LadderInfoList::const_iterator cit;
-
-	for (cit = m_specialLadders.begin(); cit != m_specialLadders.end(); ++cit)
-	{
-		const LadderInfo *li = *cit;
-		if (li->address == addr && li->port == port)
-		{
-			return li;
-		}
-	}
-
-	for (cit = m_standardLadders.begin(); cit != m_standardLadders.end(); ++cit)
-	{
-		const LadderInfo *li = *cit;
-		if (li->address == addr && li->port == port)
-		{
-			return li;
-		}
-	}
-
-	for (cit = m_localLadders.begin(); cit != m_localLadders.end(); ++cit)
-	{
-		const LadderInfo *li = *cit;
-		if (li->address == addr && li->port == port)
-		{
-			return li;
-		}
-	}
-
-	return NULL;
-}
-
-const LadderInfo* LadderList::findLadderByIndex( Int index )
-{
-	if (index == 0)
-		return NULL;
-
-	LadderInfoList::const_iterator cit;
-
-	for (cit = m_specialLadders.begin(); cit != m_specialLadders.end(); ++cit)
-	{
-		const LadderInfo *li = *cit;
-		if (li->index == index)
-		{
-			return li;
-		}
-	}
-
-	for (cit = m_standardLadders.begin(); cit != m_standardLadders.end(); ++cit)
-	{
-		const LadderInfo *li = *cit;
-		if (li->index == index)
-		{
-			return li;
-		}
-	}
-
-	for (cit = m_localLadders.begin(); cit != m_localLadders.end(); ++cit)
-	{
-		const LadderInfo *li = *cit;
-		if (li->index == index)
-		{
-			return li;
-		}
-	}
-
-	return NULL;
-}
-
-const LadderInfoList* LadderList::getSpecialLadders( void )
-{
-	return &m_specialLadders;
-}
-
-const LadderInfoList* LadderList::getStandardLadders( void )
-{
-	return &m_standardLadders;
-}
-
-const LadderInfoList* LadderList::getLocalLadders( void )
-{
-	return &m_localLadders;
-}
-
-void LadderList::loadLocalLadders( void )
-{
-	AsciiString dirname;
-	dirname.format("%sGeneralsOnline\\Ladders\\", TheGlobalData->getPath_UserData().str());
-	FilenameList filenameList;
-	TheFileSystem->getFileListInDirectory(dirname, AsciiString("*.ini"), filenameList, TRUE);
-
-	Int index = -1;
-
-	FilenameList::iterator it = filenameList.begin();
-	while (it != filenameList.end())
-	{
-		AsciiString filename = *it;
-		DEBUG_LOG(("Looking at possible ladder info file '%s'\n", filename.str()));
-		filename.toLower();
-		checkLadder( filename, index-- );
-		++it;
-	}
-}
-
-void LadderList::checkLadder( AsciiString fname, Int index )
-{
-	File *fp = TheFileSystem->openFile(fname.str(), File::READ | File::TEXT);
-	char buf[1024];
-	AsciiString rawData;
-	if (fp)
-	{
-		Int len;
-		while (!fp->eof())
-		{
-			len = fp->read(buf, 1023);
-			buf[len] = 0;
-			buf[1023] = 0;
-			rawData.concat(buf);
-		}
-		fp->close();
-		fp = NULL;
-	}
-
-	DEBUG_LOG(("Read %d bytes from '%s'\n", rawData.getLength(), fname.str()));
-	if (rawData.isEmpty())
-		return;
-
-	LadderInfo *li = parseLadder(rawData);
-	if (!li)
-	{
-		return;
-	}
-
-	// sanity check
-	if (li->address.isEmpty())
-	{
-		DEBUG_LOG(("Bailing because of li->address.isEmpty()\n"));
-		delete li;
-		return;
-	}
-
-	if (!li->port)
-	{
-		DEBUG_LOG(("Bailing because of !li->port\n"));
-		delete li;
-		return;
-	}
-
-	if (li->validMaps.size() == 0)
-	{
-		DEBUG_LOG(("Bailing because of li->validMaps.size() == 0\n"));
-		delete li;
-		return;
-	}
-
-	li->index = index;
-
-	// ladders are QM-only at this point, which kinda invalidates the whole concept of local ladders.  Oh well.
-	li->validQM = FALSE; // no local ladders in QM
-	li->validCustom = FALSE;
-
-	//for (Int i=0; i<4; ++i)
-	//	fname.removeLastChar(); // remove .lad
-	//li->name = UnicodeString(MultiByteToWideCharSingleLine(fname.reverseFind('\\')+1).c_str());
-
-	DEBUG_LOG(("Adding local ladder %ls\n", li->name.str()));
-	m_localLadders.push_back(li);
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp
deleted file mode 100644
index 6961a9d16a9..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp
+++ /dev/null
@@ -1,859 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: LobbyUtils.cpp
-// Author: Matthew D. Campbell, Sept 2002
-// Description: GameSpy lobby utils
-///////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameEngine.h"
-#include "Common/MultiplayerSettings.h"
-#include "Common/PlayerTemplate.h"
-#include "Common/version.h"
-#include "GameClient/AnimateWindowManager.h"
-#include "GameClient/WindowLayout.h"
-#include "GameClient/Gadget.h"
-#include "GameClient/Image.h"
-#include "GameClient/Shell.h"
-#include "GameClient/KeyDefs.h"
-#include "GameClient/GameWindowManager.h"
-#include "GameClient/GadgetComboBox.h"
-#include "GameClient/GadgetListBox.h"
-#include "GameClient/GadgetTextEntry.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MapUtil.h"
-#include "GameClient/MessageBox.h"
-#include "GameClient/Mouse.h"
-#include "GameNetwork/GameSpyOverlay.h"
-
-#include "GameClient/LanguageFilter.h"
-#include "GameNetwork/GameSpy/BuddyDefs.h"
-#include "GameNetwork/GameSpy/LadderDefs.h"
-#include "GameNetwork/GameSpy/LobbyUtils.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-#include "GameNetwork/GameSpy/PersistentStorageDefs.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-
-#include "Common/STLTypedefs.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-static enum {
-	COLUMN_NAME = 0,
-	COLUMN_MAP,
-	COLUMN_LADDER,
-	COLUMN_NUMPLAYERS,
-	COLUMN_PASSWORD,
-	COLUMN_OBSERVER,
-	COLUMN_PING,
-};
-
-static NameKeyType buttonSortAlphaID = NAMEKEY_INVALID;
-static NameKeyType buttonSortPingID = NAMEKEY_INVALID;
-static NameKeyType buttonSortBuddiesID = NAMEKEY_INVALID;
-static NameKeyType windowSortAlphaID = NAMEKEY_INVALID;
-static NameKeyType windowSortPingID = NAMEKEY_INVALID;
-static NameKeyType windowSortBuddiesID = NAMEKEY_INVALID;
-
-static GameWindow *buttonSortAlpha = NULL;
-static GameWindow *buttonSortPing = NULL;
-static GameWindow *buttonSortBuddies = NULL;
-static GameWindow *windowSortAlpha = NULL;
-static GameWindow *windowSortPing = NULL;
-static GameWindow *windowSortBuddies = NULL;
-
-static GameSortType theGameSortType = GAMESORT_ALPHA_ASCENDING;
-static Bool sortBuddies = TRUE;
-static void showSortIcons(void)
-{
-	if (windowSortAlpha && windowSortPing)
-	{
-		switch(theGameSortType)
-		{
-			case GAMESORT_ALPHA_ASCENDING:
-				windowSortAlpha->winHide(FALSE);
-				windowSortAlpha->winEnable(TRUE);
-				windowSortPing->winHide(TRUE);
-				break;
-			case GAMESORT_ALPHA_DESCENDING:
-				windowSortAlpha->winHide(FALSE);
-				windowSortAlpha->winEnable(FALSE);
-				windowSortPing->winHide(TRUE);
-				break;
-			case GAMESORT_PING_ASCENDING:
-				windowSortPing->winHide(FALSE);
-				windowSortPing->winEnable(TRUE);
-				windowSortAlpha->winHide(TRUE);
-				break;
-			case GAMESORT_PING_DESCENDING:
-				windowSortPing->winHide(FALSE);
-				windowSortPing->winEnable(FALSE);
-				windowSortAlpha->winHide(TRUE);
-				break;
-		}
-	}
-
-	if (sortBuddies)
-	{
-		if (windowSortBuddies)
-		{
-			windowSortBuddies->winHide(FALSE);
-		}
-	}
-	else
-	{
-		if (windowSortBuddies)
-		{
-			windowSortBuddies->winHide(TRUE);
-		}
-	}
-}
-void setSortMode( GameSortType sortType ) { theGameSortType = sortType; showSortIcons(); RefreshGameListBoxes(); }
-void sortByBuddies( Bool doSort ) { sortBuddies = doSort; showSortIcons(); RefreshGameListBoxes(); }
-
-Bool HandleSortButton( NameKeyType sortButton )
-{
-	if (sortButton == buttonSortBuddiesID)
-	{
-		sortByBuddies( !sortBuddies );
-		return TRUE;
-	}
-	else if (sortButton == buttonSortAlphaID)
-	{
-		if (theGameSortType == GAMESORT_ALPHA_ASCENDING)
-		{
-			setSortMode(GAMESORT_ALPHA_DESCENDING);
-		}
-		else
-		{
-			setSortMode(GAMESORT_ALPHA_ASCENDING);
-		}
-		return TRUE;
-	}
-	else if (sortButton == buttonSortPingID)
-	{
-		if (theGameSortType == GAMESORT_PING_ASCENDING)
-		{
-			setSortMode(GAMESORT_PING_DESCENDING);
-		}
-		else
-		{
-			setSortMode(GAMESORT_PING_ASCENDING);
-		}
-		return TRUE;
-	}
-	return FALSE;
-}
-
-// window ids ------------------------------------------------------------------------------
-static NameKeyType parentID = NAMEKEY_INVALID;
-//static NameKeyType parentGameListSmallID = NAMEKEY_INVALID;
-static NameKeyType parentGameListLargeID = NAMEKEY_INVALID;
-static NameKeyType listboxLobbyGamesSmallID = NAMEKEY_INVALID;
-static NameKeyType listboxLobbyGamesLargeID = NAMEKEY_INVALID;
-//static NameKeyType listboxLobbyGameInfoID = NAMEKEY_INVALID;
-
-// Window Pointers ------------------------------------------------------------------------
-static GameWindow *parent = NULL;
-//static GameWindow *parentGameListSmall = NULL;
-static GameWindow *parentGameListLarge = NULL;
-       //GameWindow *listboxLobbyGamesSmall = NULL;
-       GameWindow *listboxLobbyGamesLarge = NULL;
-       //GameWindow *listboxLobbyGameInfo = NULL;
-
-static const Image *pingImages[3] = { NULL, NULL, NULL };
-
-static void gameTooltip(GameWindow *window,
-													WinInstanceData *instData,
-													UnsignedInt mouse)
-{
-	Int x, y, row, col;
-	x = LOLONGTOSHORT(mouse);
-	y = HILONGTOSHORT(mouse);
-
-	GadgetListBoxGetEntryBasedOnXY(window, x, y, row, col);
-
-	if (row == -1 || col == -1)
-	{
-		TheMouse->setCursorTooltip( UnicodeString::TheEmptyString);//TheGameText->fetch("TOOLTIP:GamesBeingFormed") );
-		return;
-	}
-
-	Int gameID = (Int)GadgetListBoxGetItemData(window, row, 0);
-	GameSpyStagingRoom *room = TheGameSpyInfo->findStagingRoomByID(gameID);
-	if (!room)
-	{
-		TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:UnknownGame") );
-		return;
-	}
-
-	if (col == COLUMN_PING)
-	{
-#ifdef DEBUG_LOGGING
-		UnicodeString s;
-		s.format(L"Ping is %d ms (cutoffs are %d ms and %d ms\n%hs local pings\n%hs remote pings",
-			room->getPingAsInt(), TheGameSpyConfig->getPingCutoffGood(), TheGameSpyConfig->getPingCutoffBad(),
-			TheGameSpyInfo->getPingString().str(), room->getPingString().str()
-		);
-		TheMouse->setCursorTooltip( s, 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
-#else
-		TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:PingInfo"), 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
-#endif
-		return;
-	}
-	if (col == COLUMN_NUMPLAYERS)
-	{
-		TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:NumberOfPlayers"), 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
-		return;
-	}
-	if (col == COLUMN_PASSWORD)
-	{
-		if (room->getHasPassword())
-		{
-			UnicodeString checkTooltip =TheGameText->fetch("TOOTIP:Password");
-			if(!checkTooltip.compare(L"Password required to joing game"))
-				checkTooltip.set(L"Password required to join game");
-			TheMouse->setCursorTooltip( checkTooltip, 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
-		}
-		else
-			TheMouse->setCursorTooltip( UnicodeString::TheEmptyString );
-		return;
-	}
-
-	UnicodeString tooltip;
-
-	UnicodeString mapName;
-	const MapMetaData *md = TheMapCache->findMap(room->getMap());
-	if (md)
-	{
-		mapName = md->m_displayName;
-	}
-	else
-	{
-		const char *start = room->getMap().reverseFind('\\');
-		if (start)
-		{
-			++start;
-		}
-		else
-		{
-			start = room->getMap().str();
-		}
-		mapName.translate( start );
-	}
-	UnicodeString tmp;
-	tooltip.format(TheGameText->fetch("TOOLTIP:GameInfoGameName"), room->getGameName().str());
-	if (room->getLadderPort() != 0)
-	{
-		const LadderInfo *linfo = TheLadderList->findLadder(room->getLadderIP(), room->getLadderPort());
-		if (linfo)
-		{
-			tmp.format(TheGameText->fetch("TOOLTIP:GameInfoLadderName"), linfo->name.str());
-			tooltip.concat(tmp);
-		}
-	}
-	if (room->getExeCRC() != TheGlobalData->m_exeCRC || room->getIniCRC() != TheGlobalData->m_iniCRC)
-	{
-		tmp.format(TheGameText->fetch("TOOLTIP:InvalidGameVersion"), mapName.str());
-		tooltip.concat(tmp);
-	}
-	tmp.format(TheGameText->fetch("TOOLTIP:GameInfoMap"), mapName.str());
-	tooltip.concat(tmp);
-
-	AsciiString aPlayer;
-	UnicodeString player;
-	Int numPlayers = 0;
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		GameSpyGameSlot *slot = room->getGameSpySlot(i);
-		if (i == 0 && (!slot || !slot->isHuman()))
-		{
-			DEBUG_CRASH(("About to tooltip a non-hosted game!\n"));
-		}
-		if (slot && slot->isHuman())
-		{
-			tmp.format(TheGameText->fetch("TOOLTIP:GameInfoPlayer"), slot->getName().str(), slot->getWins(), slot->getLosses());
-			tooltip.concat(tmp);
-			++numPlayers;
-		}
-		else if (slot && slot->isAI())
-		{
-			++numPlayers;
-			switch(slot->getState())
-			{
-			case SLOT_EASY_AI:
-				tooltip.concat(L'\n');
-				tooltip.concat(TheGameText->fetch("GUI:EasyAI"));
-				break;
-			case SLOT_MED_AI:
-				tooltip.concat(L'\n');
-				tooltip.concat(TheGameText->fetch("GUI:MediumAI"));
-				break;
-			case SLOT_BRUTAL_AI:
-				tooltip.concat(L'\n');
-				tooltip.concat(TheGameText->fetch("GUI:HardAI"));
-				break;
-			}
-		}
-	}
-	DEBUG_ASSERTCRASH(numPlayers, ("Tooltipping a 0-player game!\n"));
-
-	TheMouse->setCursorTooltip( tooltip, 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
-}
-
-static Bool isSmall = TRUE;
-
-GameWindow *GetGameListBox( void )
-{
-	return listboxLobbyGamesLarge;
-}
-
-GameWindow *GetGameInfoListBox( void )
-{
-	return NULL;
-}
-
-NameKeyType GetGameListBoxID( void )
-{
-	return listboxLobbyGamesLargeID;
-}
-
-NameKeyType GetGameInfoListBoxID( void )
-{
-	return NAMEKEY_INVALID;
-}
-
-void GrabWindowInfo( void )
-{
-	isSmall = TRUE;
-	parentID = NAMEKEY( "WOLCustomLobby.wnd:WOLLobbyMenuParent" );
-	parent = TheWindowManager->winGetWindowFromId(NULL, parentID);
-
-	pingImages[0] = TheMappedImageCollection->findImageByName("Ping03");
-	pingImages[1] = TheMappedImageCollection->findImageByName("Ping02");
-	pingImages[2] = TheMappedImageCollection->findImageByName("Ping01");
-	DEBUG_ASSERTCRASH(pingImages[0], ("Can't find ping image!"));
-	DEBUG_ASSERTCRASH(pingImages[1], ("Can't find ping image!"));
-	DEBUG_ASSERTCRASH(pingImages[2], ("Can't find ping image!"));
-
-//	parentGameListSmallID = NAMEKEY( "WOLCustomLobby.wnd:ParentGameListSmall" );
-//	parentGameListSmall = TheWindowManager->winGetWindowFromId(NULL, parentGameListSmallID);
-
-	parentGameListLargeID = NAMEKEY( "WOLCustomLobby.wnd:ParentGameListLarge" );
-	parentGameListLarge = TheWindowManager->winGetWindowFromId(NULL, parentGameListLargeID);
-
-	listboxLobbyGamesSmallID = NAMEKEY( "WOLCustomLobby.wnd:ListboxGames" );
-//	listboxLobbyGamesSmall = TheWindowManager->winGetWindowFromId(NULL, listboxLobbyGamesSmallID);
-//	listboxLobbyGamesSmall->winSetTooltipFunc(gameTooltip);
-
-	listboxLobbyGamesLargeID = NAMEKEY( "WOLCustomLobby.wnd:ListboxGamesLarge" );
-	listboxLobbyGamesLarge = TheWindowManager->winGetWindowFromId(NULL, listboxLobbyGamesLargeID);
-	listboxLobbyGamesLarge->winSetTooltipFunc(gameTooltip);
-//
-//	listboxLobbyGameInfoID = NAMEKEY( "WOLCustomLobby.wnd:ListboxGameInfo" );
-//	listboxLobbyGameInfo = TheWindowManager->winGetWindowFromId(NULL, listboxLobbyGameInfoID);
-
-	buttonSortAlphaID = NAMEKEY("WOLCustomLobby.wnd:ButtonSortAlpha");
-	buttonSortPingID = NAMEKEY("WOLCustomLobby.wnd:ButtonSortPing");
-	buttonSortBuddiesID = NAMEKEY("WOLCustomLobby.wnd:ButtonSortBuddies");
-	windowSortAlphaID = NAMEKEY("WOLCustomLobby.wnd:WindowSortAlpha");
-	windowSortPingID = NAMEKEY("WOLCustomLobby.wnd:WindowSortPing");
-	windowSortBuddiesID = NAMEKEY("WOLCustomLobby.wnd:WindowSortBuddies");
-
-	buttonSortAlpha = TheWindowManager->winGetWindowFromId(parent, buttonSortAlphaID);
-	buttonSortPing = TheWindowManager->winGetWindowFromId(parent, buttonSortPingID);
-	buttonSortBuddies = TheWindowManager->winGetWindowFromId(parent, buttonSortBuddiesID);
-	windowSortAlpha = TheWindowManager->winGetWindowFromId(parent, windowSortAlphaID);
-	windowSortPing = TheWindowManager->winGetWindowFromId(parent, windowSortPingID);
-	windowSortBuddies = TheWindowManager->winGetWindowFromId(parent, windowSortBuddiesID);
-
-	showSortIcons();
-}
-
-void ReleaseWindowInfo( void )
-{
-	isSmall = TRUE;
-	parent = NULL;
-//	parentGameListSmall = NULL;
-	parentGameListLarge = NULL;
-//	listboxLobbyGamesSmall = NULL;
-	listboxLobbyGamesLarge = NULL;
-//	listboxLobbyGameInfo = NULL;
-
-	buttonSortAlpha = NULL;
-	buttonSortPing = NULL;
-	buttonSortBuddies = NULL;
-	windowSortAlpha = NULL;
-	windowSortPing = NULL;
-	windowSortBuddies = NULL;
-}
-
-typedef std::set<GameSpyStagingRoom *> BuddyGameSet;
-static BuddyGameSet *theBuddyGames = NULL;
-static void populateBuddyGames(void)
-{
-	BuddyInfoMap *m = TheGameSpyInfo->getBuddyMap();
-	theBuddyGames = NEW BuddyGameSet;
-	if (!m)
-	{
-		return;
-	}
-	for (BuddyInfoMap::const_iterator bit = m->begin(); bit != m->end(); ++bit)
-	{
-		BuddyInfo info = bit->second;
-		if (info.m_status == GP_STAGING)
-		{
-			StagingRoomMap *srm = TheGameSpyInfo->getStagingRoomList();
-			for (StagingRoomMap::iterator srmIt = srm->begin(); srmIt != srm->end(); ++srmIt)
-			{
-				GameSpyStagingRoom *game = srmIt->second;
-				game->cleanUpSlotPointers();
-				const GameSpyGameSlot *slot = game->getGameSpySlot(0);
-				if (slot && slot->getName() == info.m_locationString)
-				{
-					theBuddyGames->insert(game);
-					break;
-				}
-			}
-		}
-	}
-}
-
-static void clearBuddyGames(void)
-{
-	if (theBuddyGames)
-		delete theBuddyGames;
-	theBuddyGames = NULL;
-}
-
-struct GameSortStruct
-{
-	bool operator()(GameSpyStagingRoom *g1, GameSpyStagingRoom *g2) const
-	{
-		// sort CRC mismatches to the bottom
-		Bool g1Good = (g1->getExeCRC() != TheGlobalData->m_exeCRC || g1->getIniCRC() != TheGlobalData->m_iniCRC);
-		Bool g2Good = (g1->getExeCRC() != TheGlobalData->m_exeCRC || g1->getIniCRC() != TheGlobalData->m_iniCRC);
-		if ( g1Good ^ g2Good )
-		{
-			return g1Good;
-		}
-
-		// sort games with private ladders to the bottom
-		Bool g1UnknownLadder = (g1->getLadderPort() && TheLadderList->findLadder(g1->getLadderIP(), g1->getLadderPort()) == NULL);
-		Bool g2UnknownLadder = (g2->getLadderPort() && TheLadderList->findLadder(g2->getLadderIP(), g2->getLadderPort()) == NULL);
-		if ( g1UnknownLadder ^ g2UnknownLadder )
-		{
-			return g2UnknownLadder;
-		}
-
-		// sort full games to the bottom
-		Bool g1Full = (g1->getNumNonObserverPlayers() == g1->getMaxPlayers() || g1->getNumPlayers() == MAX_SLOTS);
-		Bool g2Full = (g2->getNumNonObserverPlayers() == g2->getMaxPlayers() || g2->getNumPlayers() == MAX_SLOTS);
-		if ( g1Full ^ g2Full )
-		{
-			return g2Full;
-		}
-
-		if (sortBuddies)
-		{
-			Bool g1HasBuddies = (theBuddyGames->find(g1) != theBuddyGames->end());
-			Bool g2HasBuddies = (theBuddyGames->find(g2) != theBuddyGames->end());
-			if ( g1HasBuddies ^ g2HasBuddies )
-			{
-				return g1HasBuddies;
-			}
-		}
-
-		switch(theGameSortType)
-		{
-		case GAMESORT_ALPHA_ASCENDING:
-			return wcsicmp(g1->getGameName().str(), g2->getGameName().str()) < 0;
-			break;
-		case GAMESORT_ALPHA_DESCENDING:
-			return wcsicmp(g1->getGameName().str(),g2->getGameName().str()) > 0;
-			break;
-		case GAMESORT_PING_ASCENDING:
-			return g1->getPingAsInt() < g2->getPingAsInt();
-			break;
-		case GAMESORT_PING_DESCENDING:
-			return g1->getPingAsInt() > g2->getPingAsInt();
-			break;
-		}
-		return false;
-	}
-};
-
-static Int insertGame( GameWindow *win, GameSpyStagingRoom *game, Bool showMap )
-{
-	game->cleanUpSlotPointers();
-	Color gameColor = GameSpyColor[GSCOLOR_GAME];
-	if (game->getNumNonObserverPlayers() == game->getMaxPlayers() || game->getNumPlayers() == MAX_SLOTS)
-	{
-		gameColor = GameSpyColor[GSCOLOR_GAME_FULL];
-	}
-	if (game->getExeCRC() != TheGlobalData->m_exeCRC || game->getIniCRC() != TheGlobalData->m_iniCRC)
-	{
-		gameColor = GameSpyColor[GSCOLOR_GAME_CRCMISMATCH];
-	}
-	UnicodeString gameName = game->getGameName();
-	
-	if(TheGameSpyInfo->getDisallowAsianText())
-	{
-		const WideChar *buff = gameName.str();
-		Int length =  gameName.getLength();	
-		for(Int i = 0; i < length; ++i)
-		{
-			if(buff[i] >= 256)
-				return -1;
-		}
-	}
-	else if(TheGameSpyInfo->getDisallowNonAsianText())
-	{
-		const WideChar *buff = gameName.str();
-		Int length =  gameName.getLength();	
-		Bool hasUnicode = FALSE;
-		for(Int i = 0; i < length; ++i)
-		{
-			if(buff[i] >= 256)
-			{
-				hasUnicode = TRUE;
-				break;
-			}
-		}
-		if(!hasUnicode)
-			return -1;
-	}
-
-
-
-	Int index = GadgetListBoxAddEntryText(win, game->getGameName(), gameColor, -1, COLUMN_NAME);
-	GadgetListBoxSetItemData(win, (void *)game->getID(), index);
-
-	UnicodeString s;
-
-	if (showMap)
-	{
-		UnicodeString mapName;
-		const MapMetaData *md = TheMapCache->findMap(game->getMap());
-		if (md)
-		{
-			mapName = md->m_displayName;
-		}
-		else
-		{
-			const char *start = game->getMap().reverseFind('\\');
-			if (start)
-			{
-				++start;
-			}
-			else
-			{
-				start = game->getMap().str();
-			}
-			mapName.translate( start );
-		}
-		GadgetListBoxAddEntryText(win, mapName, gameColor, index, COLUMN_MAP);
-
-		const LadderInfo * li = TheLadderList->findLadder(game->getLadderIP(), game->getLadderPort());
-		if (li)
-		{
-			GadgetListBoxAddEntryText(win, li->name, gameColor, index, COLUMN_LADDER);
-		}
-		else if (game->getLadderPort())
-		{
-			GadgetListBoxAddEntryText(win, TheGameText->fetch("GUI:UnknownLadder"), gameColor, index, COLUMN_LADDER);
-		}
-		else
-		{
-			GadgetListBoxAddEntryText(win, TheGameText->fetch("GUI:NoLadder"), gameColor, index, COLUMN_LADDER);
-		}
-	}
-	else
-	{
-		GadgetListBoxAddEntryText(win, UnicodeString(L" "), gameColor, index, COLUMN_MAP);
-		GadgetListBoxAddEntryText(win, UnicodeString(L" "), gameColor, index, COLUMN_LADDER);
-	}
-
-	s.format(L"%d/%d", game->getReportedNumPlayers(), game->getReportedMaxPlayers());
-	GadgetListBoxAddEntryText(win, s, gameColor, index, COLUMN_NUMPLAYERS);
-
-	if (game->getHasPassword())
-	{
-		const Image *img = TheMappedImageCollection->findImageByName("Password");
-		Int width = 10, height = 10;
-		if (img)
-		{
-			width = img->getImageWidth();
-			height = img->getImageHeight();
-		}
-		GadgetListBoxAddEntryImage(win, img, index, COLUMN_PASSWORD, width, height);
-	}
-	else
-	{
-		GadgetListBoxAddEntryText(win, UnicodeString(L" "), gameColor, index, COLUMN_PASSWORD);
-	}
-
-	if (game->getAllowObservers())
-	{
-		const Image *img = TheMappedImageCollection->findImageByName("Observer");
-		GadgetListBoxAddEntryImage(win, img, index, COLUMN_OBSERVER);
-	}
-	else
-	{
-		GadgetListBoxAddEntryText(win, UnicodeString(L" "), gameColor, index, COLUMN_OBSERVER);
-	}
-
-	s.format(L"%d", game->getPingAsInt());
-	GadgetListBoxAddEntryText(win, s, gameColor, index, COLUMN_PING);
-	Int ping = game->getPingAsInt();
-	Int width = 10, height = 10;
-	if (pingImages[0])
-	{
-		width = pingImages[0]->getImageWidth();
-		height = pingImages[0]->getImageHeight();
-	}
-	// CLH picking an arbitrary number for our ping display
-	if (ping < TheGameSpyConfig->getPingCutoffGood())
-	{
-		GadgetListBoxAddEntryImage(win, pingImages[0], index, COLUMN_PING, width, height);
-	}
-	else if (ping < TheGameSpyConfig->getPingCutoffBad())
-	{
-		GadgetListBoxAddEntryImage(win, pingImages[1], index, COLUMN_PING, width, height);
-	}
-	else
-	{
-		GadgetListBoxAddEntryImage(win, pingImages[2], index, COLUMN_PING, width, height);
-	}
-
-	return index;
-}
-
-void RefreshGameListBox( GameWindow *win, Bool showMap )
-{
-	if (!win)
-		return;
-
-	// save off selection
-	Int selectedIndex = -1;
-	Int indexToSelect = -1;
-	Int selectedID = 0;
-	GadgetListBoxGetSelected(win, &selectedIndex);
-	if (selectedIndex != -1 )
-	{
-		selectedID = (Int)GadgetListBoxGetItemData(win, selectedIndex);
-	}
-	int prevPos = GadgetListBoxGetTopVisibleEntry( win );
-
-	// empty listbox
-	GadgetListBoxReset(win);
-
-	// sort our games
-	typedef std::multiset<GameSpyStagingRoom *, GameSortStruct> SortedGameList;
-	SortedGameList sgl;
-	StagingRoomMap *srm = TheGameSpyInfo->getStagingRoomList();
-	populateBuddyGames();
-	for (StagingRoomMap::iterator srmIt = srm->begin(); srmIt != srm->end(); ++srmIt)
-	{
-		sgl.insert(srmIt->second);
-	}
-
-	// populate listbox
-	for (SortedGameList::iterator sglIt = sgl.begin(); sglIt != sgl.end(); ++sglIt)
-	{
-		GameSpyStagingRoom *game = *sglIt;
-		if (game)
-		{
-			Int index = insertGame(win, game, showMap);
-			if (game->getID() == selectedID)
-			{
-				indexToSelect = index;
-			}
-		}
-	}
-
-	clearBuddyGames();
-
-	// restore selection
-	GadgetListBoxSetSelected(win, indexToSelect); // even for -1, so we can disable the 'Join Game' button
-//	if(prevPos > 10)
-		GadgetListBoxSetTopVisibleEntry( win, prevPos  );//+ 1
-
-	if (indexToSelect < 0 && selectedID)
-	{
-		TheWindowManager->winSetLoneWindow(NULL);
-	}
-}
-
-void RefreshGameInfoListBox( GameWindow *mainWin, GameWindow *win )
-{
-//	if (!mainWin || !win)
-//		return;
-//
-//	GadgetListBoxReset(win);
-//
-//	Int selected = -1;
-//	GadgetListBoxGetSelected(mainWin, &selected);
-//	if (selected < 0)
-//	{
-//		return;
-//	}
-//
-//	Int selectedID = (Int)GadgetListBoxGetItemData(mainWin, selected);
-//	if (selectedID < 0)
-//	{
-//		return;
-//	}
-//
-//	StagingRoomMap *srm = TheGameSpyInfo->getStagingRoomList();
-//	StagingRoomMap::iterator srmIt = srm->find(selectedID);
-//	if (srmIt != srm->end())
-//	{
-//		GameSpyStagingRoom *theRoom = srmIt->second;
-//		theRoom->cleanUpSlotPointers();
-//
-//		// game name
-////		GadgetListBoxAddEntryText(listboxLobbyGameInfo, theRoom->getGameName(), GameSpyColor[GSCOLOR_DEFAULT], -1);
-//
-//		const LadderInfo * li = TheLadderList->findLadder(theRoom->getLadderIP(), theRoom->getLadderPort());
-//		if (li)
-//		{
-//			UnicodeString tmp;
-//			tmp.format(TheGameText->fetch("TOOLTIP:LadderName"), li->name.str());
-//			GadgetListBoxAddEntryText(listboxLobbyGameInfo, tmp, GameSpyColor[GSCOLOR_DEFAULT], -1);
-//		}
-//		else if (theRoom->getLadderPort())
-//		{
-//			GadgetListBoxAddEntryText(listboxLobbyGameInfo, TheGameText->fetch("TOOLTIP:UnknownLadder"), GameSpyColor[GSCOLOR_DEFAULT], -1);
-//		}
-//		else
-//		{
-//			GadgetListBoxAddEntryText(listboxLobbyGameInfo, TheGameText->fetch("TOOLTIP:NoLadder"), GameSpyColor[GSCOLOR_DEFAULT], -1);
-//		}
-//
-//		if (theRoom->getExeCRC() != TheGlobalData->m_exeCRC || theRoom->getIniCRC() != TheGlobalData->m_iniCRC)
-//		{
-//			GadgetListBoxAddEntryText(listboxLobbyGameInfo, TheGameText->fetch("TOOLTIP:InvalidGameVersionSingleLine"), GameSpyColor[GSCOLOR_DEFAULT], -1);
-//		}
-//
-//		// map name
-//		UnicodeString mapName;
-//		const MapMetaData *md = TheMapCache->findMap(theRoom->getMap());
-//		if (md)
-//		{
-//			mapName = md->m_displayName;
-//		}
-//		else
-//		{
-//			const char *start = theRoom->getMap().reverseFind('\\');
-//			if (start)
-//			{
-//				++start;
-//			}
-//			else
-//			{
-//				start = theRoom->getMap().str();
-//			}
-//			mapName.translate( start );
-//		}
-//
-//		GadgetListBoxAddEntryText(listboxLobbyGameInfo, mapName, GameSpyColor[GSCOLOR_DEFAULT], -1);
-//
-//		// player list (rank, win/loss, side)
-//		for (Int i=0; i<MAX_SLOTS; ++i)
-//		{
-//			const GameSpyGameSlot *slot = theRoom->getGameSpySlot(i);
-//			if (slot && slot->isHuman())
-//			{
-//				UnicodeString theName, theRating, thePlayerTemplate;
-//				Int colorIdx = slot->getColor();
-//				theName = slot->getName();
-//				theRating.format(L" (%d-%d)", slot->getWins(), slot->getLosses());
-//				const PlayerTemplate * pt = ThePlayerTemplateStore->getNthPlayerTemplate(slot->getPlayerTemplate());
-//				if (pt)
-//				{
-//					thePlayerTemplate = pt->getDisplayName();
-//				}
-//				else
-//				{
-//					thePlayerTemplate = TheGameText->fetch("GUI:Random");
-//				}
-//
-//				UnicodeString theText;
-//				theText.format(L"%ls - %ls - %ls", theName.str(), thePlayerTemplate.str(), theRating.str());
-//
-//				Int theColor = GameSpyColor[GSCOLOR_DEFAULT];
-//				const MultiplayerColorDefinition *mcd = TheMultiplayerSettings->getColor(colorIdx);
-//				if (mcd)
-//				{
-//					theColor = mcd->getColor();
-//				}
-//
-//				GadgetListBoxAddEntryText(listboxLobbyGameInfo, theText, theColor, -1);
-//			}
-//		}
-//	}
-
-}
-
-void RefreshGameListBoxes( void )
-{
-	GameWindow *main = GetGameListBox();
-	GameWindow *info = GetGameInfoListBox();
-
-	RefreshGameListBox( main, (info == NULL) );
-
-	if (info)
-	{
-		RefreshGameInfoListBox( main, info );
-	}
-}
-
-void ToggleGameListType( void )
-{
-	isSmall = !isSmall;
-	if(isSmall)
-	{
-		parentGameListLarge->winHide(TRUE);
-//		parentGameListSmall->winHide(FALSE);
-	}
-	else
-	{
-		parentGameListLarge->winHide(FALSE);
-//		parentGameListSmall->winHide(TRUE);
-	}
-
-	RefreshGameListBoxes();
-}
-
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp
deleted file mode 100644
index 0d8cb1a8ead..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp
+++ /dev/null
@@ -1,897 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: MainMenuUtils.cpp
-// Author: Matthew D. Campbell, Sept 2002
-// Description: GameSpy version check, patch download, etc utils
-///////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include <fcntl.h>
-
-//#include "Common/Registry.h"
-#include "Common/UserPreferences.h"
-#include "Common/version.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MessageBox.h"
-#include "GameClient/Shell.h"
-#include "GameLogic/ScriptEngine.h"
-
-#include "GameClient/ShellHooks.h"
-
-#include "gamespy/ghttp/ghttp.h"
-
-#include "GameNetwork/DownloadManager.h"
-#include "GameNetwork/GameSpy/BuddyThread.h"
-#include "GameNetwork/GameSpy/MainMenuUtils.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-
-#include "WWDownload/Registry.h"
-#include "WWDownload/urlBuilder.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static Bool checkingForPatchBeforeGameSpy = FALSE;
-static Int checksLeftBeforeOnline = 0;
-static Int timeThroughOnline = 0; // used to avoid having old callbacks cause problems
-static Bool mustDownloadPatch = FALSE;
-static Bool cantConnectBeforeOnline = FALSE;
-static std::list<QueuedDownload> queuedDownloads;
-
-static char *MOTDBuffer = NULL;
-static char *configBuffer = NULL;
-GameWindow *onlineCancelWindow = NULL;
-
-static Bool s_asyncDNSThreadDone = TRUE;
-static Bool s_asyncDNSThreadSucceeded = FALSE;
-static Bool s_asyncDNSLookupInProgress = FALSE;
-static HANDLE s_asyncDNSThreadHandle = NULL;
-enum {
-	LOOKUP_INPROGRESS,
-	LOOKUP_FAILED,
-	LOOKUP_SUCCEEDED,
-};
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static void startOnline( void );
-static void reallyStartPatchCheck( void );
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-// someone has hit a button allowing downloads to start
-void StartDownloadingPatches( void )
-{
-	if (queuedDownloads.empty())
-	{
-		HandleCanceledDownload();
-		return;
-	}
-
-	WindowLayout *layout;
-	layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DownloadMenu.wnd" ) );
-	layout->runInit();
-	layout->hide( FALSE );
-	layout->bringForward();
-	HandleCanceledDownload(FALSE);
-	DEBUG_ASSERTCRASH(TheDownloadManager, ("No download manager!"));
-	if (TheDownloadManager)
-	{
-		std::list<QueuedDownload>::iterator it = queuedDownloads.begin();
-		while (it != queuedDownloads.end())
-		{
-			QueuedDownload q = *it;
-			TheDownloadManager->queueFileForDownload(q.server, q.userName, q.password,
-				q.file, q.localFile, q.regKey, q.tryResume);
-			queuedDownloads.pop_front();
-			it = queuedDownloads.begin();
-		}
-		TheDownloadManager->downloadNextQueuedFile();
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-// user agrees to patch before going online
-static void patchBeforeOnlineCallback( void )
-{
-	StartDownloadingPatches();
-}
-
-// user doesn't want to patch before going online
-static void noPatchBeforeOnlineCallback( void )
-{
-	queuedDownloads.clear();
-	if (mustDownloadPatch || cantConnectBeforeOnline)
-	{
-		// go back to normal
-		HandleCanceledDownload();
-	}
-	else
-	{
-		// clear out unneeded downloads and go on
-		startOnline();
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static Bool hasWriteAccess()
-{
-	const char* filename = "PatchAccessTest.txt";	
-
-	remove(filename);
-
-	int handle = _open( filename, _O_CREAT | _O_RDWR, _S_IREAD | _S_IWRITE);
-	if (handle == -1)
-	{
-		return false;
-	}
-
-	_close(handle);
-	remove(filename);
-	
-	unsigned int val;
-	if (!GetUnsignedIntFromRegistry("", "Version", val))
-	{
-		return false;
-	}
-
-	if (!SetUnsignedIntInRegistry("", "Version", val))
-	{
-		return false;
-	}
-
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static void startOnline( void )
-{
-	checkingForPatchBeforeGameSpy = FALSE;
-
-	DEBUG_ASSERTCRASH(checksLeftBeforeOnline==0, ("starting online with pending callbacks"));
-	if (onlineCancelWindow)
-	{
-		TheWindowManager->winDestroy(onlineCancelWindow);
-		onlineCancelWindow = NULL;
-	}
-
-	if (cantConnectBeforeOnline)
-	{
-		MessageBoxOk(TheGameText->fetch("GUI:CannotConnectToServservTitle"),
-			TheGameText->fetch("GUI:CannotConnectToServserv"),
-			noPatchBeforeOnlineCallback);
-		return;
-	}
-	if (queuedDownloads.size())
-	{
-		if (!hasWriteAccess())
-		{
-			MessageBoxOk(TheGameText->fetch("GUI:Error"),
-				TheGameText->fetch("GUI:MustHaveAdminRights"),
-				noPatchBeforeOnlineCallback);
-		}
-		else if (mustDownloadPatch)
-		{
-			MessageBoxOkCancel(TheGameText->fetch("GUI:PatchAvailable"),
-				TheGameText->fetch("GUI:MustPatchForOnline"),
-				patchBeforeOnlineCallback, noPatchBeforeOnlineCallback);
-		}
-		else
-		{
-			MessageBoxYesNo(TheGameText->fetch("GUI:PatchAvailable"),
-				TheGameText->fetch("GUI:CanPatchForOnline"),
-				patchBeforeOnlineCallback, noPatchBeforeOnlineCallback);
-		}
-		return;
-	}
-
-	TheScriptEngine->signalUIInteract(TheShellHookNames[SHELL_SCRIPT_HOOK_MAIN_MENU_ONLINE_SELECTED]);
-
-	DEBUG_ASSERTCRASH( !TheGameSpyBuddyMessageQueue, ("TheGameSpyBuddyMessageQueue exists!") );
-	DEBUG_ASSERTCRASH( !TheGameSpyPeerMessageQueue, ("TheGameSpyPeerMessageQueue exists!") );
-	DEBUG_ASSERTCRASH( !TheGameSpyInfo, ("TheGameSpyInfo exists!") );
-	SetUpGameSpy(MOTDBuffer, configBuffer);
-	if (MOTDBuffer)
-	{
-		delete[] MOTDBuffer;
-		MOTDBuffer = NULL;
-	}
-	if (configBuffer)
-	{
-		delete[] configBuffer;
-		configBuffer = NULL;
-	}
-
-#ifdef ALLOW_NON_PROFILED_LOGIN
-	UserPreferences pref;
-	pref.load("GameSpyLogin.ini");
-	UserPreferences::const_iterator it = pref.find("useProfiles");
-	if (it != pref.end() && it->second.compareNoCase("yes") == 0)
-#endif // ALLOW_NON_PROFILED_LOGIN
-		TheShell->push( AsciiString("Menus/GameSpyLoginProfile.wnd") );
-#ifdef ALLOW_NON_PROFILED_LOGIN
-	else
-		TheShell->push( AsciiString("Menus/GameSpyLoginQuick.wnd") );
-#endif // ALLOW_NON_PROFILED_LOGIN
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static void queuePatch(Bool mandatory, AsciiString downloadURL)
-{
-	QueuedDownload q;
-	Bool success = TRUE;
-
-	AsciiString connectionType;
-	success &= downloadURL.nextToken(&connectionType, ":");
-
-	AsciiString server;
-	success &= downloadURL.nextToken(&server, ":/");
-
-	AsciiString user;
-	success &= downloadURL.nextToken(&user, ":@");
-
-	AsciiString pass;
-	success &= downloadURL.nextToken(&pass, "@/");
-
-	AsciiString filePath;
-	success &= downloadURL.nextToken(&filePath, "");
-
-	if (!success && user.isNotEmpty())
-	{
-		// no user/pass combo - move the file into it's proper place
-		filePath = user;
-		user = ""; // LFeenanEA - Credentials removed as per Security requirements
-		pass = "";
-		success = TRUE;
-	}
-
-	AsciiString fileStr = filePath;
-	const char *s = filePath.reverseFind('/');
-	if (s)
-		fileStr = s+1;
-	AsciiString fileName = "patches\\";
-	fileName.concat(fileStr);
-
-	DEBUG_LOG(("download URL split: %d [%s] [%s] [%s] [%s] [%s] [%s]\n",
-		success, connectionType.str(), server.str(), user.str(), pass.str(),
-		filePath.str(), fileName.str()));
-
-	if (!success)
-		return;
-
-	q.file = filePath;
-	q.localFile = fileName;
-	q.password = pass;
-	q.regKey = "";
-	q.server = server;
-	q.tryResume = TRUE;
-	q.userName = user;
-
-	std::list<QueuedDownload>::iterator it = queuedDownloads.begin();
-	while (it != queuedDownloads.end())
-	{
-		if (it->localFile == q.localFile)
-			return; // don't add it if it exists already (because we can check multiple times)
-		++it;
-	}
-
-	queuedDownloads.push_back(q);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool motdCallback( GHTTPRequest request, GHTTPResult result,
-															char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	Int run = (Int)param;
-	if (run != timeThroughOnline)
-	{
-		DEBUG_CRASH(("Old callback being called!"));
-		return GHTTPTrue;
-	}
-
-	if (MOTDBuffer)
-	{
-		delete[] MOTDBuffer;
-		MOTDBuffer = NULL;
-	}
-
-	MOTDBuffer = NEW char[bufferLen];
-	memcpy(MOTDBuffer, buffer, bufferLen);
-	MOTDBuffer[bufferLen-1] = 0;
-
-	--checksLeftBeforeOnline;
-	DEBUG_ASSERTCRASH(checksLeftBeforeOnline>=0, ("Too many callbacks"));
-	if (onlineCancelWindow && !checksLeftBeforeOnline)
-	{
-		TheWindowManager->winDestroy(onlineCancelWindow);
-		onlineCancelWindow = NULL;
-	}
-
-	DEBUG_LOG(("------- Got MOTD before going online -------\n"));
-	DEBUG_LOG(("%s\n", (MOTDBuffer)?MOTDBuffer:""));
-	DEBUG_LOG(("--------------------------------------------\n"));
-
-	if (!checksLeftBeforeOnline)
-		startOnline();
-
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool configCallback( GHTTPRequest request, GHTTPResult result,
-																char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	Int run = (Int)param;
-	if (run != timeThroughOnline)
-	{
-		DEBUG_CRASH(("Old callback being called!"));
-		return GHTTPTrue;
-	}
-
-	if (configBuffer)
-	{
-		delete[] configBuffer;
-		configBuffer = NULL;
-	}
-
-	if (result != GHTTPSuccess || bufferLen < 100)
-	{
-		if (!checkingForPatchBeforeGameSpy)
-			return GHTTPTrue;
-		--checksLeftBeforeOnline;
-		if (onlineCancelWindow && !checksLeftBeforeOnline)
-		{
-			TheWindowManager->winDestroy(onlineCancelWindow);
-			onlineCancelWindow = NULL;
-		}
-		cantConnectBeforeOnline = TRUE;
-		if (!checksLeftBeforeOnline)
-		{
-			startOnline();
-		}
-		return GHTTPTrue;
-	}
-
-	configBuffer = NEW char[bufferLen];
-	memcpy(configBuffer, buffer, bufferLen);
-	configBuffer[bufferLen-1] = 0;
-
-	AsciiString fname;
-	fname.format("%sGeneralsOnline\\Config.txt", TheGlobalData->getPath_UserData().str());
-	FILE *fp = fopen(fname.str(), "wb");
-	if (fp)
-	{
-		fwrite(configBuffer, bufferLen, 1, fp);
-		fclose(fp);
-	}
-
-	--checksLeftBeforeOnline;
-	DEBUG_ASSERTCRASH(checksLeftBeforeOnline>=0, ("Too many callbacks"));
-	if (onlineCancelWindow && !checksLeftBeforeOnline)
-	{
-		TheWindowManager->winDestroy(onlineCancelWindow);
-		onlineCancelWindow = NULL;
-	}
-
-	DEBUG_LOG(("Got Config before going online\n"));
-
-	if (!checksLeftBeforeOnline)
-		startOnline();
-
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool configHeadCallback( GHTTPRequest request, GHTTPResult result,
-																		char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	Int run = (Int)param;
-	if (run != timeThroughOnline)
-	{
-		DEBUG_CRASH(("Old callback being called!"));
-		return GHTTPTrue;
-	}
-
-	DEBUG_LOG(("HTTP head resp: res=%d, len=%d, buf=[%s]\n", result, bufferLen, buffer));
-
-	if (result == GHTTPSuccess)
-	{
-		DEBUG_LOG(("Headers are [%s]\n", ghttpGetHeaders( request )));
-
-		AsciiString headers(ghttpGetHeaders( request ));
-		AsciiString line;
-		while (headers.nextToken(&line, "\n\r"))
-		{
-			AsciiString key, val;
-			line.nextToken(&key, ": ");
-			line.nextToken(&val, ": \r\n");
-
-			if (key.compare("Content-Length") == 0 && val.isNotEmpty())
-			{
-				Int serverLen = atoi(val.str());
-				Int fileLen = 0;
-				AsciiString fname;
-				fname.format("%sGeneralsOnline\\Config.txt", TheGlobalData->getPath_UserData().str());
-				FILE *fp = fopen(fname.str(), "rb");
-				if (fp)
-				{
-					fseek(fp, 0, SEEK_END);
-					fileLen = ftell(fp);
-					fclose(fp);
-				}
-
-				if (serverLen == fileLen)
-				{
-					// we don't need to download the MOTD again
-					--checksLeftBeforeOnline;
-					DEBUG_ASSERTCRASH(checksLeftBeforeOnline>=0, ("Too many callbacks"));
-					if (onlineCancelWindow && !checksLeftBeforeOnline)
-					{
-						TheWindowManager->winDestroy(onlineCancelWindow);
-						onlineCancelWindow = NULL;
-					}
-
-					if (configBuffer)
-					{
-						delete[] configBuffer;
-						configBuffer = NULL;
-					}
-
-					AsciiString fname;
-					fname.format("%sGeneralsOnline\\Config.txt", TheGlobalData->getPath_UserData().str());
-					FILE *fp = fopen(fname.str(), "rb");
-					if (fp)
-					{
-						configBuffer = NEW char[fileLen];
-						fread(configBuffer, fileLen, 1, fp);
-						configBuffer[fileLen-1] = 0;
-						fclose(fp);
-
-						DEBUG_LOG(("Got Config before going online\n"));
-
-						if (!checksLeftBeforeOnline)
-							startOnline();
-
-						return GHTTPTrue;
-					}
-				}
-			}
-		}
-	}
-
-	// we need to download the MOTD again
-	std::string gameURL, mapURL;
-	std::string configURL, motdURL;
-	FormatURLFromRegistry(gameURL, mapURL, configURL, motdURL);
-	ghttpGet( configURL.c_str(), GHTTPFalse, configCallback, param );
-
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool gamePatchCheckCallback( GHTTPRequest request, GHTTPResult result, char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	Int run = (Int)param;
-	if (run != timeThroughOnline)
-	{
-		DEBUG_CRASH(("Old callback being called!"));
-		return GHTTPTrue;
-	}
-
-	--checksLeftBeforeOnline;
-	DEBUG_ASSERTCRASH(checksLeftBeforeOnline>=0, ("Too many callbacks"));
-
-	DEBUG_LOG(("Result=%d, buffer=[%s], len=%d\n", result, buffer, bufferLen));
-	if (result != GHTTPSuccess)
-	{
-		if (!checkingForPatchBeforeGameSpy)
-			return GHTTPTrue;
-		cantConnectBeforeOnline = TRUE;
-		if (!checksLeftBeforeOnline)
-		{
-			startOnline();
-		}
-		return GHTTPTrue;
-	}
-
-	AsciiString message = buffer;
-	AsciiString line;
-	while (message.nextToken(&line, "\r\n"))
-	{
-		AsciiString type, req, url;
-		Bool ok = TRUE;
-		ok &= line.nextToken(&type, " ");
-		ok &= line.nextToken(&req, " ");
-		ok &= line.nextToken(&url, " ");
-		if (ok && type == "patch")
-		{
-			DEBUG_LOG(("Saw a patch: %d/[%s]\n", atoi(req.str()), url.str()));
-			queuePatch( atoi(req.str()), url );
-			if (atoi(req.str()))
-			{
-				mustDownloadPatch = TRUE;
-			}
-		}
-		else if (ok && type == "server")
-		{
-		}
-	}
-
-	if (!checksLeftBeforeOnline)
-	{
-		startOnline();
-	}
-
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-void CancelPatchCheckCallbackAndReopenDropdown( void )
-{
-	HandleCanceledDownload();
-	CancelPatchCheckCallback();
-}
-
-void CancelPatchCheckCallback( void )
-{
-	s_asyncDNSLookupInProgress = FALSE;
-	HandleCanceledDownload(FALSE); // don't dropdown
-	checkingForPatchBeforeGameSpy = FALSE;
-	checksLeftBeforeOnline = 0;
-	if (onlineCancelWindow)
-	{
-		TheWindowManager->winDestroy(onlineCancelWindow);
-		onlineCancelWindow = NULL;
-	}
-	queuedDownloads.clear();
-	if (MOTDBuffer)
-	{
-		delete[] MOTDBuffer;
-		MOTDBuffer = NULL;
-	}
-	if (configBuffer)
-	{
-		delete[] configBuffer;
-		configBuffer = NULL;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool overallStatsCallback( GHTTPRequest request, GHTTPResult result, char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	DEBUG_LOG(("overallStatsCallback() - Result=%d, len=%d\n", result, bufferLen));
-	if (result != GHTTPSuccess)
-	{
-		return GHTTPTrue;
-	}
-
-	OverallStats USA, China, GLA;
-	AsciiString message = buffer;
-
-	Int state = STATS_MAX; // STATS_MAX == none
-	AsciiString line;
-	OverallStats *stats = NULL;
-	while (message.nextToken(&line, "\n"))
-	{
-		line.trim();
-		line.toLower();
-		if (strstr(line.str(), "today"))
-		{
-			state = STATS_TODAY;
-		}
-		else if (strstr(line.str(), "yesterday"))
-		{
-			state = STATS_YESTERDAY;
-		}
-		else if (strstr(line.str(), "all time"))
-		{
-			state = STATS_ALLTIME;
-		}
-		else if (strstr(line.str(), "last week"))
-		{
-			state = STATS_LASTWEEK;
-		}
-		else if (state != STATS_MAX && strstr(line.str(), "usa"))
-		{
-			stats = &USA;
-		}
-		else if (state != STATS_MAX && strstr(line.str(), "china"))
-		{
-			stats = &China;
-		}
-		else if (state != STATS_MAX && strstr(line.str(), "gla"))
-		{
-			stats = &GLA;
-		}
-
-		if (stats)
-		{
-			AsciiString totalLine, winsLine, lossesLine;
-			message.nextToken(&totalLine, "\n");
-			message.nextToken(&winsLine, "\n");
-			message.nextToken(&lossesLine, "\n");
-			while (totalLine.isNotEmpty() && !isdigit(totalLine.getCharAt(0)))
-			{
-				totalLine = totalLine.str()+1;
-			}
-			while (winsLine.isNotEmpty() && !isdigit(winsLine.getCharAt(0)))
-			{
-				winsLine = winsLine.str()+1;
-			}
-			while (lossesLine.isNotEmpty() && !isdigit(lossesLine.getCharAt(0)))
-			{
-				lossesLine = lossesLine.str()+1;
-			}
-			if (totalLine.isNotEmpty() && winsLine.isNotEmpty() && lossesLine.isNotEmpty())
-			{
-				stats->wins[state] = atoi(winsLine.str());
-				stats->losses[state] = atoi(lossesLine.str());
-			}
-
-			stats = NULL;
-		}
-	}
-
-	HandleOverallStats(USA, China, GLA);
-
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool numPlayersOnlineCallback( GHTTPRequest request, GHTTPResult result, char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	DEBUG_LOG(("numPlayersOnlineCallback() - Result=%d, buffer=[%s], len=%d\n", result, buffer, bufferLen));
-	if (result != GHTTPSuccess)
-	{
-		return GHTTPTrue;
-	}
-
-	AsciiString message = buffer;
-	message.trim();
-	const char *s = message.reverseFind('\\');
-	if (!s)
-	{
-		return GHTTPTrue;
-	}
-
-	if (*s == '\\')
-		++s;
-
-	DEBUG_LOG(("Message was '%s', trimmed to '%s'=%d\n", buffer, s, atoi(s)));
-	HandleNumPlayersOnline(atoi(s));
-
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-void CheckOverallStats( void )
-{
-	ghttpGet("http://gamestats.gamespy.com/ccgenerals/display.html",
-		GHTTPFalse, overallStatsCallback, NULL);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-void CheckNumPlayersOnline( void )
-{
-	ghttpGet("http://launch.gamespyarcade.com/software/launch/arcadecount2.dll?svcname=ccgenerals",
-		GHTTPFalse, numPlayersOnlineCallback, NULL);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-DWORD WINAPI asyncGethostbynameThreadFunc( void * szName )
-{
-	HOSTENT *he = gethostbyname( (const char *)szName );
-
-	if (he)
-	{
-		s_asyncDNSThreadSucceeded = TRUE;
-	}
-	else
-	{
-		s_asyncDNSThreadSucceeded = FALSE;
-	}
-
-	s_asyncDNSThreadDone = TRUE;
-	return 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-int asyncGethostbyname(char * szName)
-{
-	static int            stat = 0;
-	static unsigned long  threadid;
-
-	if( stat == 0 )
-	{
-		/* Kick off gethostname thread */
-		s_asyncDNSThreadDone = FALSE;
-		s_asyncDNSThreadHandle = CreateThread( NULL, 0, asyncGethostbynameThreadFunc, szName, 0, &threadid );
-
-		if( s_asyncDNSThreadHandle == NULL )
-		{
-			return( LOOKUP_FAILED );
-		}
-		stat = 1;
-	}
-	if( stat == 1 )
-	{
-		if( s_asyncDNSThreadDone )
-		{
-			/* Thread finished */
-			stat = 0;
-			s_asyncDNSLookupInProgress = FALSE;
-			s_asyncDNSThreadHandle = NULL;
-			return( (s_asyncDNSThreadSucceeded)?LOOKUP_SUCCEEDED:LOOKUP_FAILED );
-		}
-	}
-
-	return( LOOKUP_INPROGRESS );
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-// GameSpy's HTTP SDK has had at least 1 crash bug, so we're going to just bail and
-// never try again if they crash us.  We won't be able to get back online again (we'll
-// time out) but at least we'll live.
-static Bool isHttpOk = TRUE;
-
-void HTTPThinkWrapper( void )
-{
-	if (s_asyncDNSLookupInProgress)
-	{
-		Char hostname[] = "servserv.generals.ea.com";
-		Int ret = asyncGethostbyname(hostname);
-		switch(ret)
-		{
-		case LOOKUP_FAILED:
-			cantConnectBeforeOnline = TRUE;
-			startOnline();
-			break;
-		case LOOKUP_SUCCEEDED:
-			reallyStartPatchCheck();
-			break;
-		}
-	}
-
-	if (isHttpOk)
-	{
-		try
-		{
-			ghttpThink();
-		}
-		catch (...)
-		{
-			isHttpOk = FALSE; // we can't abort the login, since we might be done with the
-												// required checks and are fetching extras.  If it is a required
-												// check, we'll time out normally.
-		}
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-void StopAsyncDNSCheck( void )
-{
-	if (s_asyncDNSThreadHandle)
-	{
-#ifdef DEBUG_CRASHING
-		Int res =
-#endif
-			TerminateThread(s_asyncDNSThreadHandle,0);
-		DEBUG_ASSERTCRASH(res, ("Could not terminate the Async DNS Lookup thread!"));	// Thread still not killed!
-	}
-	s_asyncDNSThreadHandle = NULL;
-	s_asyncDNSLookupInProgress = FALSE;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-void StartPatchCheck( void )
-{
-	checkingForPatchBeforeGameSpy = TRUE;
-	cantConnectBeforeOnline = FALSE;
-	timeThroughOnline++;
-	checksLeftBeforeOnline = 0;
-
-	onlineCancelWindow = MessageBoxCancel(TheGameText->fetch("GUI:CheckingForPatches"),
-		TheGameText->fetch("GUI:CheckingForPatches"), CancelPatchCheckCallbackAndReopenDropdown);
-
-	s_asyncDNSLookupInProgress = TRUE;
-	Char hostname[] = "servserv.generals.ea.com";
-	Int ret = asyncGethostbyname(hostname);
-	switch(ret)
-	{
-	case LOOKUP_FAILED:
-		cantConnectBeforeOnline = TRUE;
-		startOnline();
-		break;
-	case LOOKUP_SUCCEEDED:
-		reallyStartPatchCheck();
-		break;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static void reallyStartPatchCheck( void )
-{
-	checksLeftBeforeOnline = 4;
-
-	std::string gameURL, mapURL;
-	std::string configURL, motdURL;
-
-	FormatURLFromRegistry(gameURL, mapURL, configURL, motdURL);
-
-	std::string proxy;
-	if (GetStringFromRegistry("", "Proxy", proxy))
-	{
-		if (!proxy.empty())
-		{
-			ghttpSetProxy(proxy.c_str());
-		}
-	}
-
-	// check for a patch first
-	DEBUG_LOG(("Game patch check: [%s]\n", gameURL.c_str()));
-	DEBUG_LOG(("Map patch check: [%s]\n", mapURL.c_str()));
-	DEBUG_LOG(("Config: [%s]\n", configURL.c_str()));
-	DEBUG_LOG(("MOTD: [%s]\n", motdURL.c_str()));
-	ghttpGet(gameURL.c_str(), GHTTPFalse, gamePatchCheckCallback, (void *)timeThroughOnline);
-	ghttpGet(mapURL.c_str(), GHTTPFalse, gamePatchCheckCallback, (void *)timeThroughOnline);
-	ghttpHead(configURL.c_str(), GHTTPFalse, configHeadCallback, (void *)timeThroughOnline);
-	ghttpGet(motdURL.c_str(), GHTTPFalse, motdCallback, (void *)timeThroughOnline);
-	
-	// check total game stats
-	CheckOverallStats();
-
-	// check the users online
-	CheckNumPlayersOnline();
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp
deleted file mode 100644
index aebd617cc59..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp
+++ /dev/null
@@ -1,938 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// FILE: PeerDefs.cpp //////////////////////////////////////////////////////
-// Generals GameSpy Peer (chat) definitions
-// Author: Matthew D. Campbell, June 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#include <set>
-
-#include "Common/GameState.h"
-#include "Common/RandomValue.h"
-#include "Common/IgnorePreferences.h"
-#include "Common/CustomMatchPreferences.h"
-#include "Common/GameSpyMiscPreferences.h"
-#include "Common/Recorder.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "Common/PlayerTemplate.h"
-#include "GameClient/MapUtil.h"
-#include "GameClient/ShellHooks.h"
-#include "GameClient/GameText.h"
-#include "GameNetwork/GameSpy/LadderDefs.h"
-#include "GameNetwork/GameSpy/PeerDefsImplementation.h"
-#include "GameNetwork/GameSpy/BuddyThread.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-#include "GameNetwork/GameSpy/PingThread.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-#include "GameNetwork/GameSpyOverlay.h"
-#include "GameNetwork/RankPointValue.h"
-#include "GameLogic/GameLogic.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-GameSpyInfoInterface *TheGameSpyInfo = NULL;
-GameSpyStagingRoom *TheGameSpyGame = NULL;
-void deleteNotificationBox( void );
-
-bool AsciiComparator::operator()(AsciiString s1, AsciiString s2) const
-{
-	return stricmp(s1.str(), s2.str()) < 0;
-}
-
-GameSpyInfo::GameSpyInfo()
-{
-	reset();
-	TheGameSpyGame = &m_localStagingRoom;
-	m_isDisconAfterGameStart = FALSE;
-}
-
-GameSpyInfo::~GameSpyInfo()
-{
-	TheGameSpyGame = NULL;
-	reset();
-}
-
-void GameSpyInfo::reset( void )
-{
-	m_sawFullGameList = FALSE;
-	m_isDisconAfterGameStart = FALSE;
-	m_currentGroupRoomID = 0;
-	clearGroupRoomList();
-	clearStagingRoomList();
-	m_localStagingRoomID = 0;
-	m_buddyRequestMap.clear();
-	m_buddyMap.clear();
-	m_buddyMessages.clear();
-	m_joinedStagingRoom = 0;
-	m_isHosting = false;
-	m_localStagingRoomID = 0;
-	m_localStagingRoom.reset();
-	m_gotGroupRoomList = false;
-	m_localName = "";
-	m_localProfileID = 0;
-	m_maxMessagesPerUpdate = 100;
-	
-	// Added By Sadullah Nader
-	// Initialization missing and needed
-	m_disallowAsainText = FALSE;
-	m_disallowNonAsianText = FALSE;
-	m_disconReason = 0;
-	m_localBaseName.clear();
-	m_localEmail.clear();
-	m_localPasswd.clear();
-	m_pingString.clear();
-	m_rawConfig.clear();
-	m_rawMotd.clear();
-	//
-
-	m_internalIP = m_externalIP = 0;
-
-	m_savedIgnoreMap.clear();
-	m_preorderPlayers.clear();
-
-	m_cachedLocalPlayerStats.reset();
-	
-	m_additionalDisconnects = -1;
-}
-
-Bool GameSpyInfo::didPlayerPreorder( Int profileID ) const
-{
-	std::set<Int>::const_iterator it = m_preorderPlayers.find(profileID);
-	return (it != m_preorderPlayers.end());
-}
-
-void GameSpyInfo::markPlayerAsPreorder( Int profileID )
-{
-	m_preorderPlayers.insert(profileID);
-}
-
-void GameSpyInfo::setLocalIPs(UnsignedInt internalIP, UnsignedInt externalIP)
-{
-	m_internalIP = internalIP;
-	m_externalIP = externalIP;
-}
-
-void GameSpyInfo::readAdditionalDisconnects( void )
-{
-	m_additionalDisconnects = GetAdditionalDisconnectsFromUserFile(m_localProfileID);
-	DEBUG_LOG(("GameSpyInfo::readAdditionalDisconnects() found %d disconnects.\n", m_additionalDisconnects));
-}
-
-Int GameSpyInfo::getAdditionalDisconnects( void )
-{
-	DEBUG_LOG(("GameSpyInfo::getAdditionalDisconnects() would have returned %d.  Returning 0 instead.\n", m_additionalDisconnects));
-	return 0;
-}
-
-void GameSpyInfo::clearAdditionalDisconnects( void )
-{
-	m_additionalDisconnects = 0;
-}
-
-GameSpyInfoInterface* GameSpyInfoInterface::createNewGameSpyInfoInterface( void )
-{
-	return NEW GameSpyInfo;
-}
-
-Bool GameSpyInfo::amIHost( void )
-{
-	return m_isHosting;
-}
-
-GameSpyStagingRoom* GameSpyInfo::getCurrentStagingRoom( void )
-{
-	if (m_isHosting || m_joinedStagingRoom)
-		return &m_localStagingRoom;
-
-	StagingRoomMap::iterator it = m_stagingRooms.find(m_joinedStagingRoom);
-	if (it != m_stagingRooms.end())
-		return it->second;
-
-	return NULL;
-}
-
-void GameSpyInfo::setGameOptions( void )
-{
-	if (!m_isHosting)
-		return;
-
-	// set options for game lists, and UTM players in-game
-	PeerRequest req;
-	req.peerRequestType = PeerRequest::PEERREQUEST_SETGAMEOPTIONS;
-	req.options = GameInfoToAsciiString(&m_localStagingRoom).str();
-
-	Int i;
-	AsciiString mapName = TheGameState->realMapPathToPortableMapPath(m_localStagingRoom.getMap());
-	AsciiString newMapName;
-	for (i=0; i<mapName.getLength(); ++i)
-	{
-		char c = mapName.getCharAt(i);
-		if (c != '\\')
-			newMapName.concat(c);
-		else
-			newMapName.concat('/');
-	}
-	req.gameOptsMapName = newMapName.str();
-
-	//const MapMetaData *md = TheMapCache->findMap(mapName);
-	//if (!md)
-		//return; // there really isn't any need to send info like this...
-
-	req.gameOptions.numPlayers = 0;
-	req.gameOptions.numObservers = 0;
-	Int numOpenSlots = 0;
-	AsciiString playerInfo = "";
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		Int wins = 0, losses = 0, profileID = 0;
-		GameSpyGameSlot *slot = TheGameSpyGame->getGameSpySlot(i);
-		req.gameOptsPlayerNames[i] = "";
-		if (!slot->isOccupied())
-		{
-			if (slot->isOpen())
-				++numOpenSlots;
-		}
-		else
-		{
-			AsciiString playerName;
-			if (slot->isHuman())
-			{
-				playerName.translate(slot->getName());
-				req.gameOptsPlayerNames[i] = playerName.str();
-				PlayerInfoMap::iterator it = m_playerInfoMap.find(playerName);
-				if (it != m_playerInfoMap.end())
-				{
-					wins = it->second.m_wins;
-					losses = it->second.m_losses;
-					profileID = it->second.m_profileID;
-				}
-				req.gameOptions.wins[req.gameOptions.numObservers+req.gameOptions.numPlayers] = wins;
-				req.gameOptions.losses[req.gameOptions.numObservers+req.gameOptions.numPlayers] = losses;
-				req.gameOptions.profileID[req.gameOptions.numObservers+req.gameOptions.numPlayers] = profileID;
-				req.gameOptions.faction[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getPlayerTemplate();
-				req.gameOptions.color[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getColor();
-				if (slot->getPlayerTemplate() == PLAYERTEMPLATE_OBSERVER)
-				{
-					++req.gameOptions.numObservers;
-				}
-				else
-				{
-					++req.gameOptions.numPlayers;
-				}
-			}
-			else if (slot->isAI())
-			{
-				// add in AI players
-				switch (slot->getState())
-				{
-				case SLOT_EASY_AI:
-					playerName = "CE";
-					break;
-				case SLOT_MED_AI:
-					playerName = "CM";
-					break;
-				case SLOT_BRUTAL_AI:
-					playerName = "CH";
-					break;
-				}
-				req.gameOptsPlayerNames[i] = playerName.str(); // name is unused - we go off of the profileID
-				req.gameOptions.wins[req.gameOptions.numObservers+req.gameOptions.numPlayers] = 0;
-				req.gameOptions.losses[req.gameOptions.numObservers+req.gameOptions.numPlayers] = 0;
-				req.gameOptions.profileID[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getState();
-				req.gameOptions.faction[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getPlayerTemplate();
-				req.gameOptions.color[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getColor();
-				++req.gameOptions.numPlayers;
-			}
-		}
-	}
-	req.gameOptions.maxPlayers = numOpenSlots + req.gameOptions.numPlayers + req.gameOptions.numObservers;
-	TheGameSpyPeerMessageQueue->addRequest(req);
-
-	req.peerRequestType = PeerRequest::PEERREQUEST_UTMROOM;
-	req.UTM.isStagingRoom = TRUE;
-	req.id = "Pings/";
-	AsciiString pings;
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		if (i!=0)
-			pings.concat(",");
-
-		GameSpyGameSlot *slot = TheGameSpyGame->getGameSpySlot(i);
-		if (slot && slot->isHuman())
-		{
-			pings.concat(slot->getPingString());
-		}
-		else
-		{
-			pings.concat("0");
-		}
-	}
-	req.options = pings.str();
-	TheGameSpyPeerMessageQueue->addRequest(req);
-}
-
-Bool GameSpyInfo::isBuddy( Int id )
-{
-	return m_buddyMap.find(id) != m_buddyMap.end();
-}
-
-void GameSpyInfo::addGroupRoom( GameSpyGroupRoom room )
-{
-	if (room.m_groupID == 0)
-	{
-		m_gotGroupRoomList = TRUE;
-
-		GroupRoomMap::iterator iter;
-
-		// figure out how many good strings we've got
-		std::vector<UnicodeString> names;
-		Int numRooms = 0;
-		for (iter = getGroupRoomList()->begin(); iter != getGroupRoomList()->end(); ++iter)
-		{
-			GameSpyGroupRoom room = iter->second;
-			if (room.m_groupID != TheGameSpyConfig->getQMChannel())
-			{
-				++numRooms;
-
-				AsciiString groupLabel;
-				groupLabel.format("GUI:%s", room.m_name.str());
-
-				Bool exists = FALSE;
-				UnicodeString groupName = TheGameText->fetch(groupLabel, &exists);
-				if (exists)
-				{
-					names.push_back(groupName);
-				}
-			}
-		}
-
-		if (!names.empty() && names.size() != numRooms)
-		{
-			// didn't get all names.  fix up
-			Int nameIndex = 0;
-			Int timesThrough = 1; // start with USA Lobby 1
-			for (iter = TheGameSpyInfo->getGroupRoomList()->begin(); iter != TheGameSpyInfo->getGroupRoomList()->end(); ++iter)
-			{
-				GameSpyGroupRoom room = iter->second;
-				if (room.m_groupID != TheGameSpyConfig->getQMChannel())
-				{
-					room.m_translatedName.format(L"%ls %d", names[nameIndex].str(), timesThrough);
-					nameIndex = (nameIndex+1)%names.size();
-					m_groupRooms[room.m_groupID] = room;
-					if (!nameIndex)
-					{
-						// we've looped through the name list already.  increment the timesThrough counter
-						++timesThrough;
-					}
-				}
-			}
-		}
-	}
-	else
-	{
-		DEBUG_LOG(("Adding group room %d (%s)\n", room.m_groupID, room.m_name.str()));
-		AsciiString groupLabel;
-		groupLabel.format("GUI:%s", room.m_name.str());
-		room.m_translatedName = TheGameText->fetch(groupLabel);
-		m_groupRooms[room.m_groupID] = room;
-		if ( !stricmp("quickmatch", room.m_name.str()) )
-		{
-			DEBUG_LOG(("Group room %d (%s) is the QuickMatch room\n", room.m_groupID, room.m_name.str()));
-			TheGameSpyConfig->setQMChannel(room.m_groupID);
-		}
-	}
-}
-
-void GameSpyInfo::joinGroupRoom( Int groupID )
-{
-	if (groupID > 0)
-	{
-		PeerRequest req;
-		req.peerRequestType = PeerRequest::PEERREQUEST_JOINGROUPROOM;
-		req.groupRoom.id = groupID;
-		TheGameSpyPeerMessageQueue->addRequest(req);
-		m_playerInfoMap.clear();
-	}
-}
-
-void GameSpyInfo::leaveGroupRoom( void )
-{
-	PeerRequest req;
-	req.peerRequestType = PeerRequest::PEERREQUEST_LEAVEGROUPROOM;
-	TheGameSpyPeerMessageQueue->addRequest(req);
-	setCurrentGroupRoom(0);
-	m_playerInfoMap.clear();
-}
-
-void GameSpyInfo::joinBestGroupRoom( void )
-{
-	if (m_currentGroupRoomID)
-	{
-		DEBUG_LOG(("Bailing from GameSpyInfo::joinBestGroupRoom() - we were already in a room\n"));
-		m_currentGroupRoomID = 0;
-		return;
-	}
-
-	if (m_groupRooms.size())
-	{
-		int minID = -1;
-		int minPlayers = 1000;
-		GroupRoomMap::iterator iter = m_groupRooms.begin();
-		while (iter != m_groupRooms.end())
-		{
-			GameSpyGroupRoom room = iter->second;
-			DEBUG_LOG(("Group room %d: %s (%d, %d, %d, %d)\n", room.m_groupID, room.m_name.str(), room.m_numWaiting, room.m_maxWaiting,
-				room.m_numGames, room.m_numPlaying));
-
-			if (TheGameSpyConfig->getQMChannel() != room.m_groupID && minPlayers > 25 && room.m_numWaiting < minPlayers)
-			{
-				minID = room.m_groupID;
-				minPlayers = room.m_numWaiting;
-			}
-
-			++iter;
-		}
-
-		if (minID > 0)
-		{
-			PeerRequest req;
-			req.peerRequestType = PeerRequest::PEERREQUEST_JOINGROUPROOM;
-			req.groupRoom.id = minID;
-			TheGameSpyPeerMessageQueue->addRequest(req);
-			m_playerInfoMap.clear();
-		}
-		else
-		{
-			GSMessageBoxOk(TheGameText->fetch("GUI:Error"), TheGameText->fetch("GUI:GSGroupRoomJoinFail"), NULL);
-		}
-	}
-	else
-	{
-		GSMessageBoxOk(TheGameText->fetch("GUI:Error"), TheGameText->fetch("GUI:GSGroupRoomJoinFail"), NULL);
-	}
-}
-
-void GameSpyInfo::updatePlayerInfo( PlayerInfo pi, AsciiString oldNick )
-{
-	if (!oldNick.isEmpty())
-		playerLeftGroupRoom(oldNick);
-
-	m_playerInfoMap[pi.m_name] = pi;
-
-	if (pi.m_preorder != 0)
-		markPlayerAsPreorder(pi.m_profileID);
-}
-
-void GameSpyInfo::playerLeftGroupRoom( AsciiString nick )
-{
-	PlayerInfoMap::iterator it = m_playerInfoMap.find(nick);
-	if (it != m_playerInfoMap.end())
-	{
-		m_playerInfoMap.erase(it);
-	}
-}
-
-void GameSpyInfo::clearStagingRoomList( void )
-{
-	Int numRoomsRemoved = 0;
-	m_sawFullGameList = FALSE;
-	m_stagingRoomsDirty = FALSE;
-	
-	StagingRoomMap::iterator it = m_stagingRooms.begin();
-	while (it != m_stagingRooms.end())
-	{
-		++numRoomsRemoved;
-
-		delete it->second;
-		m_stagingRooms.erase(it);
-		it = m_stagingRooms.begin();
-	}
-	if (numRoomsRemoved > 0)
-	{
-		//m_stagingRoomsDirty = true; // only consider ourselves dirty if we actually removed some games.
-	}
-}
-
-void GameSpyInfo::addStagingRoom( GameSpyStagingRoom room )
-{
-	removeStagingRoom(room);
-	GameSpyStagingRoom *newRoom = NEW GameSpyStagingRoom;
-	*newRoom = room;
-	newRoom->cleanUpSlotPointers();
-	m_stagingRooms[room.getID()] = newRoom;
-	m_stagingRoomsDirty = m_sawFullGameList;
-}
-
-void GameSpyInfo::updateStagingRoom( GameSpyStagingRoom room )
-{
-	addStagingRoom(room);
-}
-
-void GameSpyInfo::removeStagingRoom( GameSpyStagingRoom room )
-{
-	StagingRoomMap::iterator it = m_stagingRooms.find(room.getID());
-	if (it != m_stagingRooms.end())
-	{
-		delete it->second;
-		m_stagingRooms.erase(it);
-
-		m_stagingRoomsDirty = m_sawFullGameList;
-	}
-}
-
-Bool GameSpyInfo::hasStagingRoomListChanged( void )
-{
-	Bool val = m_stagingRoomsDirty;
-	m_stagingRoomsDirty = false;
-	return val;
-}
-
-GameSpyStagingRoom* GameSpyInfo::findStagingRoomByID( Int id )
-{
-	StagingRoomMap::iterator it = m_stagingRooms.find(id);
-	if (it != m_stagingRooms.end())
-		return it->second;
-
-	return NULL;
-}
-
-void GameSpyInfo::leaveStagingRoom( void )
-{
-	m_localStagingRoomID = 0;
-	PeerRequest req;
-	req.peerRequestType = PeerRequest::PEERREQUEST_LEAVESTAGINGROOM;
-	TheGameSpyPeerMessageQueue->addRequest(req);
-	m_playerInfoMap.clear();
-	m_joinedStagingRoom = FALSE;
-	m_isHosting = FALSE;
-}
-
-void GameSpyInfo::markAsStagingRoomHost( void )
-{
-	m_localStagingRoomID = 0;
-	m_joinedStagingRoom = FALSE; m_isHosting = TRUE;
-	m_localStagingRoom.reset();
-	m_localStagingRoom.enterGame();
-	m_localStagingRoom.setSeed(GetTickCount());
-	
-	GameSlot newSlot;
-	UnicodeString uName;
-	uName.translate(m_localName);
-	newSlot.setState(SLOT_PLAYER, uName);
-
-	m_localStagingRoom.setLocalIP(m_externalIP);
-	newSlot.setIP(m_externalIP);
-
-	m_localStagingRoom.setSlot(0,newSlot);
-	m_localStagingRoom.setLocalName(m_localName);
-
-	TheMapCache->updateCache();
-	m_localStagingRoom.setMap(getDefaultMap(TRUE));
-	m_localStagingRoom.adjustSlotsForMap(); // close slots that the map can't hold. BGC
-}
-
-void GameSpyInfo::markAsStagingRoomJoiner( Int game )
-{
-	m_localStagingRoomID = game;
-	m_joinedStagingRoom = TRUE; m_isHosting = FALSE;
-	m_localStagingRoom.reset();
-	m_localStagingRoom.enterGame();
-	StagingRoomMap::iterator it = m_stagingRooms.find(game);
-	if (it != m_stagingRooms.end())
-	{
-		GameSpyStagingRoom *info = it->second;
-		info->cleanUpSlotPointers();
-		AsciiString options = GameInfoToAsciiString(info);
-#ifdef DEBUG_CRASHING
-		Bool res =
-#endif
-		ParseAsciiStringToGameInfo(&m_localStagingRoom, options);
-		DEBUG_ASSERTCRASH(res, ("Could not parse game info \"%s\"", options.str()));
-		m_localStagingRoom.setInGame();
-		m_localStagingRoom.setLocalName(m_localName);
-		m_localStagingRoom.setExeCRC(info->getExeCRC());
-		m_localStagingRoom.setIniCRC(info->getIniCRC());
-		m_localStagingRoom.setAllowObservers(info->getAllowObservers());
-		m_localStagingRoom.setHasPassword(info->getHasPassword());
-		m_localStagingRoom.setGameName(info->getGameName());
-		DEBUG_LOG(("Joining game: host is %ls\n", m_localStagingRoom.getConstSlot(0)->getName().str()));
-	}
-}
-
-void GameSpyInfo::setMOTD( const AsciiString& motd )
-{
-	m_rawMotd = motd;
-}
-
-const AsciiString& GameSpyInfo::getMOTD( void )
-{
-	return m_rawMotd;
-}
-
-void GameSpyInfo::setConfig( const AsciiString& config )
-{
-	m_rawConfig = config;
-}
-
-const AsciiString& GameSpyInfo::getConfig( void )
-{
-	return m_rawConfig;
-}
-
-// --------------------------------------------------------------
-void SetUpGameSpy( const char *motdBuffer, const char *configBuffer )
-{
-	if (!motdBuffer)
-		motdBuffer = "";
-	if (!configBuffer)
-		configBuffer = "";
-	TearDownGameSpy();
-
-	AsciiString dir = TheGlobalData->getPath_UserData();
-	CreateDirectory(dir.str(), NULL);
-	dir.format("%sGeneralsOnline", TheGlobalData->getPath_UserData().str());
-	CreateDirectory(dir.str(), NULL);
-	dir.format("%sGeneralsOnline\\Ladders", TheGlobalData->getPath_UserData().str());
-	CreateDirectory(dir.str(), NULL);
-
-	TheGameSpyBuddyMessageQueue = GameSpyBuddyMessageQueueInterface::createNewMessageQueue();
-	TheGameSpyBuddyMessageQueue->startThread();
-
-	TheGameSpyPeerMessageQueue = GameSpyPeerMessageQueueInterface::createNewMessageQueue();
-	TheGameSpyPeerMessageQueue->startThread();
-	
-	TheGameSpyPSMessageQueue = GameSpyPSMessageQueueInterface::createNewMessageQueue();
-	TheGameSpyPSMessageQueue->startThread();
-
-	/*
-	TheGameSpyGame = NEW GameSpyStagingRoom;
-	*/
-
-	TheGameSpyInfo = GameSpyInfoInterface::createNewGameSpyInfoInterface();
-	TheGameSpyInfo->setMOTD(motdBuffer);
-	TheGameSpyInfo->setConfig(configBuffer);
-
-	CustomMatchPreferences pref;
-	TheGameSpyInfo->setDisallowAsianText(pref.getDisallowAsianText());
-	TheGameSpyInfo->setDisallowNonAsianText( pref.getDisallowNonAsianText());
-	
-
-	TheGameSpyConfig = GameSpyConfigInterface::create(configBuffer);
-
-	TheLadderList = NEW LadderList;
-
-	ThePinger = PingerInterface::createNewPingerInterface();
-	ThePinger->startThreads();
-
-	TheRankPointValues = NEW RankPoints;
-}
-
-void TearDownGameSpy( void )
-{
-	// save off cached stats
-	if (TheGameSpyInfo && TheGameSpyInfo->getLocalProfileID())
-	{
-//		/* This was done on the score screen, so there is no need to do it now.
-//		 *
-		PSPlayerStats localPSStats = TheGameSpyPSMessageQueue->findPlayerStatsByID(TheGameSpyInfo->getLocalProfileID());
-		if (localPSStats.id != 0)
-		{
-			GameSpyMiscPreferences mPref;
-			mPref.setCachedStats(GameSpyPSMessageQueueInterface::formatPlayerKVPairs(localPSStats).c_str());
-			mPref.write();
-		}
-//		*/
-	}
-
-	// End our threads before we kill off the singletons they reference.  No crashy-crash for you!
-	if (TheGameSpyPSMessageQueue)
-		TheGameSpyPSMessageQueue->endThread();
-	if (TheGameSpyBuddyMessageQueue)
-		TheGameSpyBuddyMessageQueue->endThread();
-	if (TheGameSpyPeerMessageQueue)
-		TheGameSpyPeerMessageQueue->endThread();
-	if (ThePinger)
-		ThePinger->endThreads();
-
-	if(TheRankPointValues)
-	{
-		delete TheRankPointValues;
-		TheRankPointValues = NULL;
-	}
-	if (TheGameSpyPSMessageQueue)
-	{
-		delete TheGameSpyPSMessageQueue;
-		TheGameSpyPSMessageQueue = NULL;
-	}
-
-	if (TheGameSpyBuddyMessageQueue)
-	{
-		delete TheGameSpyBuddyMessageQueue;
-		TheGameSpyBuddyMessageQueue = NULL;
-	}
-
-	if (TheGameSpyPeerMessageQueue)
-	{
-		delete TheGameSpyPeerMessageQueue;
-		TheGameSpyPeerMessageQueue = NULL;
-	}
-
-	if (TheGameSpyInfo)
-	{
-		if (TheGameSpyInfo->getInternalIP())
-		{
-			// we've logged in before.  mark us as logging out.
-			SignalUIInteraction(SHELL_SCRIPT_HOOK_GENERALS_ONLINE_LOGOUT);
-		}
-		delete TheGameSpyInfo;
-		TheGameSpyInfo = NULL;
-	}
-
-	if (ThePinger)
-	{
-		delete ThePinger;
-		ThePinger = NULL;
-	}
-
-	if (TheLadderList)
-	{
-		delete TheLadderList;
-		TheLadderList = NULL;
-	}
-
-	if (TheGameSpyConfig)
-	{
-		delete TheGameSpyConfig;
-		TheGameSpyConfig = NULL;
-	}
-
-	// make sure the notification box doesn't exist
-	deleteNotificationBox();
-}
-
-
-void GameSpyInfo::addToIgnoreList( AsciiString nick )
-{
-	m_ignoreList.insert(nick);
-}
-
-void GameSpyInfo::removeFromIgnoreList( AsciiString nick )
-{
-	m_ignoreList.erase(nick);
-}
-
-Bool GameSpyInfo::isIgnored( AsciiString nick )
-{
-	return m_ignoreList.find(nick) != m_ignoreList.end();
-}
-
-IgnoreList GameSpyInfo::returnIgnoreList( void )
-{
- return m_ignoreList;
-}
-
-void GameSpyInfo::addToSavedIgnoreList( Int profileID, AsciiString nick)
-{
-	m_savedIgnoreMap[profileID] = nick;
-	IgnorePreferences pref;
-	pref.setIgnore(nick, profileID, true);
-	pref.write();
-}
-
-void GameSpyInfo::removeFromSavedIgnoreList( Int profileID )
-{
-	m_savedIgnoreMap.erase(profileID);
-	IgnorePreferences pref;
-	pref.setIgnore(AsciiString::TheEmptyString, profileID, false);
-	pref.write();
-}
-
-Bool GameSpyInfo::isSavedIgnored( Int profileID )
-{
-	return m_savedIgnoreMap.find(profileID) != m_savedIgnoreMap.end();
-}
-
-SavedIgnoreMap	GameSpyInfo::returnSavedIgnoreList( void )
-{
-	return m_savedIgnoreMap;
-}
-
-static Int grabHexInt(const char *s)
-{
-	char tmp[5] = "0xff";
-	tmp[2] = s[0];
-	tmp[3] = s[1];
-	Int b = strtol(tmp, NULL, 16);
-	return b;
-}
-
-Int GameSpyInfo::getPingValue( const AsciiString& otherPing )
-{
-	if (m_pingString.getLength() != otherPing.getLength())
-	{
-		return TheGameSpyConfig->getPingTimeoutInMs();
-	}
-
-	if (m_pingString.getLength() % 2 != 0)
-	{
-		return TheGameSpyConfig->getPingTimeoutInMs();
-	}
-
-	Int best = 255+255;
-	const char *myStr = m_pingString.str();
-	const char *otherStr = otherPing.str();
-
-	while (*myStr)
-	{
-		Int myVal = grabHexInt(myStr);
-		Int otherVal = grabHexInt(otherStr);
-		Int val = myVal + otherVal;
-		best = (val < best) ? val : best;
-		myStr += 2;
-		otherStr += 2;
-	}
-
-	return best * TheGameSpyConfig->getPingTimeoutInMs() / (255+255);
-}
-
-Bool PlayerInfo::isIgnored( void )
-{
-	return (m_profileID)?TheGameSpyInfo->isSavedIgnored(m_profileID):TheGameSpyInfo->isIgnored(m_name);
-}
-
-void GameSpyInfo::loadSavedIgnoreList( void )
-{
-	m_savedIgnoreMap.clear();
-	IgnorePreferences prefs;
-	m_savedIgnoreMap = prefs.getIgnores();	
-}
-
-void GameSpyInfo::setDisallowAsianText( Bool val )
-{
-	m_disallowAsainText = val;
-}
-
-void GameSpyInfo::setDisallowNonAsianText( Bool val )
-{
-	m_disallowNonAsianText = val;
-}
-
-Bool GameSpyInfo::getDisallowAsianText( void )
-{
-	return m_disallowAsainText;
-}
-Bool GameSpyInfo::getDisallowNonAsianText(void )
-{
-	return m_disallowNonAsianText;
-}
-
-void GameSpyInfo::setMaxMessagesPerUpdate( Int num )
-{
-	m_maxMessagesPerUpdate = num;
-}
-
-Int GameSpyInfo::getMaxMessagesPerUpdate( void )
-{
-	return m_maxMessagesPerUpdate;
-}
-
-/**This function is used to force an update of player's gamespy stats with an additional
-disconnection.  This is used upon starting a new game so that if user disconnects prior
-to finishing game, the disconnection stays on the server.  If he completes the game, we
-remove this extra disconnection inside of populatePlayerInfo() on the ScoreScreen.  This
-seems like the only secure way to handle this issue since users can abort the process
-before we can detect/log disconnections.*/
-void GameSpyInfo::updateAdditionalGameSpyDisconnections(Int count)
-{
-	if (TheRecorder->isMultiplayer() && TheGameLogic->isInInternetGame())
-	{	
-		Int localID = TheGameSpyInfo->getLocalProfileID();
-		PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(localID);
-		
-		Player *player=ThePlayerList->getLocalPlayer();
-
-		Int ptIdx;
-		const PlayerTemplate *myTemplate = player->getPlayerTemplate();
-		DEBUG_LOG(("myTemplate = %X(%s)\n", myTemplate, myTemplate->getName().str()));
-		for (ptIdx = 0; ptIdx < ThePlayerTemplateStore->getPlayerTemplateCount(); ++ptIdx)
-		{
-			const PlayerTemplate *nthTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(ptIdx);
-			DEBUG_LOG(("nthTemplate = %X(%s)\n", nthTemplate, nthTemplate->getName().str()));
-			if (nthTemplate == myTemplate)
-			{
-					break;
-			}
-		}
-
-		Bool anyAI = FALSE;
-		for (Int i=0; i<MAX_SLOTS; ++i)
-		{
-			const GameSlot *slot = TheGameInfo->getConstSlot(i);
-
-			if (slot->isAI())
-			{
-				anyAI = TRUE;
-			}
-		}
-
-		//Check for cases where we're not tracking stats.
-		if (anyAI || stats.id == 0 || myTemplate->isObserver() || player->getPlayerType() != PLAYER_HUMAN || player->isPlayerObserver())
-			return;
-
-		Int disCons=stats.discons[ptIdx];
-		disCons += count;
-		if (disCons < 0)
-		{	DEBUG_LOG(("updateAdditionalGameSpyDisconnections() - disconnection count below zero\n"));
-			return;	//something is wrong here
-		}
-		stats.discons[ptIdx] = disCons;	//add an additional disconnection to their stats.
-
-		//Add an additional disconnection to player stats.
-		PSRequest req;
-
-		req.requestType = PSRequest::PSREQUEST_UPDATEPLAYERSTATS;
-		req.email = TheGameSpyInfo->getLocalEmail().str();
-		req.nick = TheGameSpyInfo->getLocalBaseName().str();
-		req.password = TheGameSpyInfo->getLocalPassword().str();
-		req.player = stats;
-		req.addDesync = FALSE;
-		req.addDiscon = FALSE;
-		req.lastHouse = ptIdx;
-
-		TheGameSpyPSMessageQueue->addRequest(req);
-		TheGameSpyPSMessageQueue->trackPlayerStats(stats);
-
-		// force an update of our shtuff
-		PSResponse newResp;
-		newResp.responseType = PSResponse::PSRESPONSE_PLAYERSTATS;
-		newResp.player = stats;
-		TheGameSpyPSMessageQueue->addResponse(newResp);
-
-		// cache our stuff for easy reading next time
-   		GameSpyMiscPreferences mPref;
-   		mPref.setCachedStats(GameSpyPSMessageQueueInterface::formatPlayerKVPairs(stats).c_str());
-   		mPref.write();
-	}
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
deleted file mode 100644
index 40e671f18e8..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
+++ /dev/null
@@ -1,896 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: StagingRoomGameInfo.cpp //////////////////////////////////////////////////////
-// Generals GameSpy GameInfo-related code
-// Author: Matthew D. Campbell, July 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameState.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "Common/PlayerTemplate.h"
-#include "Common/RandomValue.h"
-#include "Common/ScoreKeeper.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MapUtil.h"
-#include "GameClient/Shell.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/VictoryConditions.h"
-#include "GameNetwork/FileTransfer.h"
-#include "GameNetwork/GameSpy/BuddyThread.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/ThreadUtils.h"
-#include "GameNetwork/GameSpyOverlay.h"
-#include "GameNetwork/NAT.h"
-#include "GameNetwork/NetworkInterface.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// GameSpyGameSlot -------------------------------------------
-
-GameSpyGameSlot::GameSpyGameSlot()
-{
-	GameSlot();
-	m_gameSpyLogin.clear();
-	m_gameSpyLocale.clear();
-	m_profileID = 0;
-	m_wins = 0;
-	m_losses = 0;
-	m_rankPoints = 0;
-	m_favoriteSide = 0;
-	m_pingInt = 0;
-	// Added By Sadullah Nader
-	// Initializations missing and needed
-	m_profileID = 0;
-	m_pingStr.clear();
-}
-
-// Helper Functions ----------------------------------------
-/*
-** Function definitions for the MIB-II entry points.
-*/
-
-BOOL (__stdcall *SnmpExtensionInitPtr)(IN DWORD dwUpTimeReference, OUT HANDLE *phSubagentTrapEvent, OUT AsnObjectIdentifier *pFirstSupportedRegion);
-BOOL (__stdcall *SnmpExtensionQueryPtr)(IN BYTE bPduType, IN OUT RFC1157VarBindList *pVarBindList, OUT AsnInteger32 *pErrorStatus, OUT AsnInteger32 *pErrorIndex);
-LPVOID (__stdcall *SnmpUtilMemAllocPtr)(IN DWORD bytes);
-VOID (__stdcall *SnmpUtilMemFreePtr)(IN LPVOID pMem);
-
-typedef struct tConnInfoStruct {
-	unsigned int State;
-	unsigned long LocalIP;
-	unsigned short LocalPort;
-	unsigned long RemoteIP;
-	unsigned short RemotePort;
-} ConnInfoStruct;
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
-#endif
-
-/***********************************************************************************************
- * Get_Local_Chat_Connection_Address -- Which address are we using to talk to the chat server? *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Ptr to address to return local address                                            *                                                                                             *
- *                                                                                             *
- * OUTPUT:   True if success                                                                   *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   10/27/00 3:24PM ST : Created                                                              *
- *=============================================================================================*/
-Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverPort, UnsignedInt& localIP)
-{
-	//return false;
-	/*
-	** Local defines.
-	*/
-	enum {
-		CLOSED = 1,
-		LISTENING,
-		SYN_SENT,
-		SEN_RECEIVED,
-		ESTABLISHED,
-		FIN_WAIT,
-		FIN_WAIT2,
-		CLOSE_WAIT,
-		LAST_ACK,
-		CLOSING,
-		TIME_WAIT,
-		DELETE_TCB
-	};
-
-	enum {
-		tcpConnState = 1,
-		tcpConnLocalAddress,
-		tcpConnLocalPort,
-		tcpConnRemAddress,
-		tcpConnRemPort
-	};
-
-
-	/*
-	** Locals.
-	*/
-	unsigned char serverAddress[4];
-	unsigned char remoteAddress[4];
-	HANDLE trap_handle;
-	AsnObjectIdentifier first_supported_region;
-	std::vector<ConnInfoStruct> connectionVector;
-	int last_field;
-	int index;
-	AsnInteger error_status;
-	AsnInteger error_index;
-	int conn_entry_type_index;
-	int conn_entry_type;
-	Bool found;
-
-	/*
-	** Statics.
-	*/
-	static char _conn_state[][32] = {
-		"?",
-		"CLOSED",
-		"LISTENING",
-		"SYN_SENT",
-		"SEN_RECEIVED",
-		"ESTABLISHED",
-		"FIN_WAIT",
-		"FIN_WAIT2",
-		"CLOSE_WAIT",
-		"LAST_ACK",
-		"CLOSING",
-		"TIME_WAIT",
-		"DELETE_TCB"
-	};
-
-	DEBUG_LOG(("Finding local address used to talk to the chat server\n"));
-	DEBUG_LOG(("Current chat server name is %s\n", serverName.str()));
-	DEBUG_LOG(("Chat server port is %d\n", serverPort));
-
-	/*
-	** Get the address of the chat server.
-	*/
-	DEBUG_LOG( ("About to call gethostbyname\n"));
-	struct hostent *host_info = gethostbyname(serverName.str());
-
-	if (!host_info) {
-		DEBUG_LOG( ("gethostbyname failed! Error code %d\n", WSAGetLastError()));
-		return(false);
-	}
-
-	memcpy(serverAddress, &host_info->h_addr_list[0][0], 4);
-	unsigned long temp = *((unsigned long*)(&serverAddress[0]));
-	temp = ntohl(temp);
-	*((unsigned long*)(&serverAddress[0])) = temp;
-
-	DEBUG_LOG(("Host address is %d.%d.%d.%d\n", serverAddress[3], serverAddress[2], serverAddress[1], serverAddress[0]));
-
-	/*
-	** Load the MIB-II SNMP DLL.
-	*/
-	DEBUG_LOG(("About to load INETMIB1.DLL\n"));
-
-	HINSTANCE mib_ii_dll = LoadLibrary("inetmib1.dll");
-	if (mib_ii_dll == NULL) {
-		DEBUG_LOG(("Failed to load INETMIB1.DLL\n"));
-		return(false);
-	}
-
-	DEBUG_LOG(("About to load SNMPAPI.DLL\n"));
-
-	HINSTANCE snmpapi_dll = LoadLibrary("snmpapi.dll");
-	if (snmpapi_dll == NULL) {
-		DEBUG_LOG(("Failed to load SNMPAPI.DLL\n"));
-		FreeLibrary(mib_ii_dll);
-		return(false);
-	}
-
-	/*
-	** Get the function pointers into the .dll
-	*/
-	SnmpExtensionInitPtr = (int (__stdcall *)(unsigned long,void ** ,AsnObjectIdentifier *)) GetProcAddress(mib_ii_dll, "SnmpExtensionInit");
-	SnmpExtensionQueryPtr = (int (__stdcall *)(unsigned char,SnmpVarBindList *,long *,long *)) GetProcAddress(mib_ii_dll, "SnmpExtensionQuery");
-	SnmpUtilMemAllocPtr = (void *(__stdcall *)(unsigned long)) GetProcAddress(snmpapi_dll, "SnmpUtilMemAlloc");
-	SnmpUtilMemFreePtr = (void (__stdcall *)(void *)) GetProcAddress(snmpapi_dll, "SnmpUtilMemFree");
-	if (SnmpExtensionInitPtr == NULL || SnmpExtensionQueryPtr == NULL || SnmpUtilMemAllocPtr == NULL || SnmpUtilMemFreePtr == NULL) {
-		DEBUG_LOG(("Failed to get proc addresses for linked functions\n"));
-		FreeLibrary(snmpapi_dll);
-		FreeLibrary(mib_ii_dll);
-		return(false);
-	}
-
-
-	RFC1157VarBindList *bind_list_ptr = (RFC1157VarBindList *) SnmpUtilMemAllocPtr(sizeof(RFC1157VarBindList));
-	RFC1157VarBind *bind_ptr = (RFC1157VarBind *) SnmpUtilMemAllocPtr(sizeof(RFC1157VarBind));
-
-	/*
-	** OK, here we go. Try to initialise the .dll
-	*/
-	DEBUG_LOG(("About to init INETMIB1.DLL\n"));
-	int ok = SnmpExtensionInitPtr(GetCurrentTime(), &trap_handle, &first_supported_region);
-
-	if (!ok) {
-		/*
-		** Aw crap.
-		*/
-		DEBUG_LOG(("Failed to init the .dll\n"));
-		SnmpUtilMemFreePtr(bind_list_ptr);
-		SnmpUtilMemFreePtr(bind_ptr);
-		FreeLibrary(snmpapi_dll);
-		FreeLibrary(mib_ii_dll);
-		return(false);
-	}
-
-	/*
-	** Name of mib_ii object we want to query. See RFC 1213.
-	**
-	** iso.org.dod.internet.mgmt.mib-2.tcp.tcpConnTable.TcpConnEntry.tcpConnState
-	**  1   3   6      1      2     1   6        13          1             1
-	*/
-	unsigned int mib_ii_name[] = {1,3,6,1,2,1,6,13,1,1};
-	unsigned int *mib_ii_name_ptr = (unsigned int *) SnmpUtilMemAllocPtr(sizeof(mib_ii_name));
-	memcpy(mib_ii_name_ptr, mib_ii_name, sizeof(mib_ii_name));
-
-	/*
-	** Get the index of the conn entry data.
-	*/
-	conn_entry_type_index = ARRAY_SIZE(mib_ii_name) - 1;
-
-	/*
-	** Set up the bind list.
-	*/
-	bind_ptr->name.idLength = ARRAY_SIZE(mib_ii_name);
-	bind_ptr->name.ids = mib_ii_name;
-	bind_list_ptr->list = bind_ptr;
-	bind_list_ptr->len = 1;
-
-
-	/*
-	** We start with the tcpConnLocalAddress field.
-	*/
-	last_field = 1;
-
-	/*
-	** First connection.
-	*/
-	index = 0;
-
-	/*
-	** Suck out that tcp connection info....
-	*/
-	while (true) {
-
-		if (!SnmpExtensionQueryPtr(SNMP_PDU_GETNEXT, bind_list_ptr, &error_status, &error_index)) {
-		//if (!SnmpExtensionQueryPtr(ASN_RFC1157_GETNEXTREQUEST, bind_list_ptr, &error_status, &error_index)) {
-			DEBUG_LOG(("SnmpExtensionQuery returned false\n"));
-			SnmpUtilMemFreePtr(bind_list_ptr);
-			SnmpUtilMemFreePtr(bind_ptr);
-			FreeLibrary(snmpapi_dll);
-			FreeLibrary(mib_ii_dll);
-			return(false);
-		}
-
-		/*
-		** If this is something new we aren't looking for then we are done.
-		*/
-		if (bind_ptr->name.idLength < ARRAY_SIZE(mib_ii_name)) {
-			break;
-		}
-
-		/*
-		** Get the type of info we are looking at. See RFC1213.
-		**
-		** 1 = tcpConnState
-		** 2 = tcpConnLocalAddress
-		** 3 = tcpConnLocalPort
-		** 4 = tcpConnRemAddress
-		** 5 = tcpConnRemPort
-		**
-		** tcpConnState is one of the following...
-		**
-		**   1  closed
-		**   2  listen
-		**   3  synSent
-		**   4  synReceived
-		**   5  established
-		**   6  finWait1
-		**   7  finWait2
-		**   8  closeWait
-		**   9  lastAck
-		**   10 closing
-		**   11 timeWait
-		**   12 deleteTCB
-		*/
-		conn_entry_type = bind_ptr->name.ids[conn_entry_type_index];
-
-		if (last_field != conn_entry_type) {
-			index = 0;
-			last_field = conn_entry_type;
-		}
-
-		switch (conn_entry_type) {
-
-			/*
-			** 1. First field in the entry. Need to create a new connection info struct
-			** here to store this connection in.
-			*/
-			case tcpConnState:
-			{
-				ConnInfoStruct new_conn;
-				new_conn.State = bind_ptr->value.asnValue.number;
-				connectionVector.push_back(new_conn);
-				break;
-			}
-
-			/*
-			** 2. Local address field.
-			*/
-			case tcpConnLocalAddress:
-				DEBUG_ASSERTCRASH(index < connectionVector.size(), ("Bad connection index"));
-				connectionVector[index].LocalIP = *((unsigned long*)bind_ptr->value.asnValue.address.stream);
-				index++;
-				break;
-
-			/*
-			** 3. Local port field.
-			*/
-			case tcpConnLocalPort:
-				DEBUG_ASSERTCRASH(index < connectionVector.size(), ("Bad connection index"));
-				connectionVector[index].LocalPort = bind_ptr->value.asnValue.number;
-				//connectionVector[index]->LocalPort = ntohs(connectionVector[index]->LocalPort);
-				index++;
-				break;
-
-			/*
-			** 4. Remote address field.
-			*/
-			case tcpConnRemAddress:
-				DEBUG_ASSERTCRASH(index < connectionVector.size(), ("Bad connection index"));
-				connectionVector[index].RemoteIP = *((unsigned long*)bind_ptr->value.asnValue.address.stream);
-				index++;
-				break;
-
-			/*
-			** 5. Remote port field.
-			*/
-			case tcpConnRemPort:
-				DEBUG_ASSERTCRASH(index < connectionVector.size(), ("Bad connection index"));
-				connectionVector[index].RemotePort = bind_ptr->value.asnValue.number;
-				//connectionVector[index]->RemotePort = ntohs(connectionVector[index]->RemotePort);
-				index++;
-				break;
-		}
-	}
-
-	SnmpUtilMemFreePtr(bind_list_ptr);
-	SnmpUtilMemFreePtr(bind_ptr);
-	SnmpUtilMemFreePtr(mib_ii_name_ptr);
-
-	DEBUG_LOG(("Got %d connections in list, parsing...\n", connectionVector.size()));
-
-	/*
-	** Right, we got the lot. Lets see if any of them have the same address as the chat
-	** server we think we are talking to.
-	*/
-	found = false;
-	for (size_t i=0; i<connectionVector.size(); ++i) {
-		ConnInfoStruct connection = connectionVector[i];
-
-		temp = ntohl(connection.RemoteIP);
-		memcpy(remoteAddress, (unsigned char*)&temp, 4);
-
-		/*
-		** See if this connection has the same address as our server.
-		*/
-		if (!found && memcmp(remoteAddress, serverAddress, 4) == 0) {
-			DEBUG_LOG(("Found connection with same remote address as server\n"));
-
-			if (serverPort == 0 || serverPort == (unsigned int)connection.RemotePort) {
-
-				DEBUG_LOG(("Connection has same port\n"));
-				/*
-				** Make sure the connection is current.
-				*/
-				if (connection.State == ESTABLISHED) {
-					DEBUG_LOG(("Connection is ESTABLISHED\n"));
-					localIP = connection.LocalIP;
-					found = true;
-				} else {
-					DEBUG_LOG(("Connection is not ESTABLISHED - skipping\n"));
-				}
-			} else {
-				DEBUG_LOG(("Connection has different port. Port is %d, looking for %d\n", connection.RemotePort, serverPort));
-			}
-		}
-	}
-
-	if (found) {
-		DEBUG_LOG(("Using address 0x%8.8X to talk to chat server\n", localIP));
-	}
-
-	FreeLibrary(snmpapi_dll);
-	FreeLibrary(mib_ii_dll);
-	return(found);
-}
-
-// GameSpyGameSlot ----------------------------------------
-
-void GameSpyGameSlot::setPingString( AsciiString pingStr )
-{
-	m_pingStr = pingStr;
-	m_pingInt = TheGameSpyInfo->getPingValue(pingStr);
-}
-
-// GameSpyStagingRoom ----------------------------------------
-
-GameSpyStagingRoom::GameSpyStagingRoom()
-{
-	cleanUpSlotPointers();
-
-	setLocalIP(0);
-	m_transport = NULL;
-
-	m_localName = "localhost";
-
-	m_ladderIP.clear();
-	m_ladderPort = 0;
-}
-
-void GameSpyStagingRoom::cleanUpSlotPointers( void )
-{
-	for (Int i = 0; i< MAX_SLOTS; ++i)
-		setSlotPointer(i, &m_GameSpySlot[i]);
-}
-
-GameSpyGameSlot * GameSpyStagingRoom::getGameSpySlot( Int index )
-{
-	GameSlot *slot = getSlot(index);
-	DEBUG_ASSERTCRASH(slot && (slot == &(m_GameSpySlot[index])), ("Bad game slot pointer\n"));
-	return (GameSpyGameSlot *)slot;
-}
-
-void GameSpyStagingRoom::init( void )
-{
-	GameInfo::init();
-}
-
-void GameSpyStagingRoom::setPingString( AsciiString pingStr )
-{
-	m_pingStr = pingStr;
-	m_pingInt = TheGameSpyInfo->getPingValue(pingStr);
-}
-
-Bool GameSpyStagingRoom::amIHost( void ) const
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
-	if (!m_inGame)
-		return false;
-
-	return getConstSlot(0)->isPlayer(m_localName);
-}
-
-void GameSpyStagingRoom::resetAccepted( void )
-{
-	GameInfo::resetAccepted();
-
-	if (amIHost())
-	{
-		/*
-		peerStateChanged(TheGameSpyChat->getPeer());
-		m_hasBeenQueried = false;
-		DEBUG_LOG(("resetAccepted() called peerStateChange()\n"));
-		*/
-	}
-}
-
-Int GameSpyStagingRoom::getLocalSlotNum( void ) const
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for local game slot while not in game"));
-	if (!m_inGame)
-		return -1;
-
-	AsciiString localName = TheGameSpyInfo->getLocalName();
-
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = getConstSlot(i);
-		if (slot == NULL) {
-			continue;
-		}
-		if (slot->isPlayer(localName))
-			return i;
-	}
-	return -1;
-}
-
-void GameSpyStagingRoom::startGame(Int gameID)
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Starting a game while not in game"));
-	DEBUG_LOG(("GameSpyStagingRoom::startGame - game id = %d\n", gameID));
-	DEBUG_ASSERTCRASH(m_transport == NULL, ("m_transport is not NULL when it should be"));
-	DEBUG_ASSERTCRASH(TheNAT == NULL, ("TheNAT is not NULL when it should be"));
-
-	UnsignedInt localIP = TheGameSpyInfo->getInternalIP();
-	setLocalIP(localIP);
-
-	if (TheNAT != NULL) {
-		delete TheNAT;
-		TheNAT = NULL;
-	}
-
-	// fill in GS-specific info
-	Int numHumans = 0;
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_GameSpySlot[i].isHuman())
-		{
-			++numHumans;
-			AsciiString gsName;
-			gsName.translate( m_GameSpySlot[i].getName() );
-			m_GameSpySlot[i].setLoginName( gsName );
-
-			if (m_isQM)
-			{
-				if (getLocalSlotNum() == i)
-					m_GameSpySlot[i].setProfileID(TheGameSpyInfo->getLocalProfileID());  // hehe - we know our own.  the rest, they'll tell us.
-			}
-			else
-			{
-				PlayerInfoMap *pInfoMap = TheGameSpyInfo->getPlayerInfoMap();
-				PlayerInfoMap::iterator it = pInfoMap->find(gsName);
-				if (it != pInfoMap->end())
-				{
-					m_GameSpySlot[i].setProfileID(it->second.m_profileID);
-					m_GameSpySlot[i].setLocale(it->second.m_locale);
-					m_GameSpySlot[i].setSlotRankPoints(it->second.m_rankPoints);
-					m_GameSpySlot[i].setFavoriteSide(it->second.m_side);
-				}
-				else
-				{
-					DEBUG_CRASH(("No player info for %s", gsName.str()));
-				}
-			}
-		}
-	}
-
-//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (numHumans < 2)
-	{
-		launchGame();
-		if (TheGameSpyInfo)
-			TheGameSpyInfo->leaveStagingRoom();
-	}
-	else
-//#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	{
-		TheNAT = NEW NAT();
-		TheNAT->attachSlotList(m_slot, getLocalSlotNum(), m_localIP);
-		TheNAT->establishConnectionPaths();
-	}
-}
-
-AsciiString GameSpyStagingRoom::generateGameSpyGameResultsPacket( void )
-{
-	Int i;
-	Int endFrame = TheVictoryConditions->getEndFrame();
-	Int localSlotNum = getLocalSlotNum();
-	Int winningTeam = -1;
-	Int numHumans = 0;
-	Int numPlayers = 0;
-	Int numAIs = 0;
-	Int numTeamsAtGameEnd = 0;
-	Int lastTeamAtGameEnd = -1;
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		AsciiString playerName;
-		playerName.format("player%d", i);
-		Player *p = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
-		if (p)
-		{
-			++numHumans;
-			if (TheVictoryConditions->hasAchievedVictory(p))
-			{
-				winningTeam = getSlot(i)->getTeamNumber();
-			}
-
-			// check if he lasted
-			GameSlot *slot = getSlot(i);
-			if (!slot->disconnected())
-			{
-				if (slot->getTeamNumber() != lastTeamAtGameEnd || numTeamsAtGameEnd == 0)
-				{
-					lastTeamAtGameEnd = slot->getTeamNumber();
-					++numTeamsAtGameEnd;
-				}
-			}
-		}
-		else
-		{
-			if (m_GameSpySlot[i].isAI())
-				++numAIs;
-		}
-	}
-	numPlayers = numHumans + numAIs;
-
-	AsciiString mapName;
-	for (i=0; i<getMap().getLength(); ++i)
-	{
-		char c = getMap().getCharAt(i);
-		if (c == '\\')
-			c = '/';
-		mapName.concat(c);
-	}
-
-	AsciiString results;
-	results.format("\\seed\\%d\\hostname\\%s\\mapname\\%s\\numplayers\\%d\\duration\\%d\\gamemode\\exiting\\localplayer\\%d",
-		getSeed(), m_GameSpySlot[0].getLoginName().str(), mapName.str(), numPlayers, endFrame, localSlotNum);
-
-	Int playerID = 0;
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		AsciiString playerName;
-		playerName.format("player%d", i);
-		Player *p = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
-		if (p)
-		{
-			GameSpyGameSlot *slot = &(m_GameSpySlot[i]);
-			AsciiString playerName = (slot->isHuman())?slot->getLoginName():"AIPlayer";
-			Int gsPlayerID = slot->getProfileID();
-			Bool disconnected = slot->disconnected();
-
-			AsciiString result = "loss";
-			if (disconnected)
-				result = "discon";
-			else if (TheNetwork->sawCRCMismatch())
-				result = "desync";
-			else if (TheVictoryConditions->hasAchievedVictory(p))
-				result = "win";
-
-			AsciiString side = p->getPlayerTemplate()->getSide();
-			if (side == "America")
-				side = "USA";  //conform to GameSpy
-
-			AsciiString playerStr;
-			playerStr.format("\\player_%d\\%s\\pid_%d\\%d\\team_%d\\%d\\result_%d\\%s\\side_%d\\%s",
-				playerID, playerName.str(), playerID, gsPlayerID, playerID, slot->getTeamNumber(),
-				playerID, result.str(), playerID, side.str());
-			results.concat(playerStr);
-
-			++playerID;
-		}
-	}
-
-	return results;
-}
-
-AsciiString GameSpyStagingRoom::generateLadderGameResultsPacket( void )
-{
-	Int i;
-	Int endFrame = TheVictoryConditions->getEndFrame();
-	Int localSlotNum = getLocalSlotNum();
-	Bool sawGameEnd = (endFrame > 0);
-	Int winningTeam = -1;
-	Int numPlayers = 0;
-	Int numTeamsAtGameEnd = 0;
-	Int lastTeamAtGameEnd = -1;
-	Player* p[MAX_SLOTS];
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		AsciiString playerName;
-		playerName.format("player%d", i);
-		p[i] = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
-		if (p[i])
-		{
-			++numPlayers;
-			if (TheVictoryConditions->hasAchievedVictory(p[i]))
-			{
-				winningTeam = getSlot(i)->getTeamNumber();
-			}
-
-			// check if he lasted
-			GameSlot *slot = getSlot(i);
-			if (!slot->disconnected())
-			{
-				if (slot->getTeamNumber() != lastTeamAtGameEnd || numTeamsAtGameEnd == 0)
-				{
-					lastTeamAtGameEnd = slot->getTeamNumber();
-					++numTeamsAtGameEnd;
-				}
-			}
-		}
-	}
-
-	AsciiString results;
-	results.format("seed=%d,slotNum=%d,sawDesync=%d,sawGameEnd=%d,winningTeam=%d,disconEnd=%d,duration=%d,numPlayers=%d,isQM=%d,map=%s",
-		getSeed(), localSlotNum, TheNetwork->sawCRCMismatch(), sawGameEnd, winningTeam, (numTeamsAtGameEnd < 2),
-		endFrame, numPlayers, m_isQM, TheGameState->realMapPathToPortableMapPath(getMap()).str());
-
-	AsciiString tempStr;
-	tempStr.format(",ladderIP=%s,ladderPort=%d", getLadderIP().str(), getLadderPort());
-	results.concat(tempStr);
-
-	Int playerID = 0;
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		AsciiString playerName;
-		playerName.format("player%d", i);
-		if (p[i])
-		{
-			GameSpyGameSlot *slot = &(m_GameSpySlot[i]);
-			ScoreKeeper *keeper = p[i]->getScoreKeeper();
-			AsciiString playerName = slot->getLoginName();
-			Int gsPlayerID = slot->getProfileID();
-			PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(gsPlayerID);
-			Int fps = TheNetwork->getAverageFPS();
-			Int unitsKilled = keeper->getTotalUnitsDestroyed();
-			Int unitsLost = keeper->getTotalUnitsLost();
-			Int unitsBuilt = keeper->getTotalUnitsBuilt();
-			Int buildingsKilled = keeper->getTotalBuildingsDestroyed();
-			Int buildingsLost = keeper->getTotalBuildingsLost();
-			Int buildingsBuilt = keeper->getTotalBuildingsBuilt();
-			Int earnings = keeper->getTotalMoneyEarned();
-			Int techCaptured = keeper->getTotalTechBuildingsCaptured();
-			Bool disconnected = slot->disconnected();
-
-			AsciiString playerStr;
-			playerStr.format(",player%d=%s,playerID%d=%d,locale%d=%d",
-				playerID, playerName.str(), playerID, gsPlayerID, playerID, stats.locale);
-			results.concat(playerStr);
-			playerStr.format(",unitsKilled%d=%d,unitsLost%d=%d,unitsBuilt%d=%d",
-				playerID, unitsKilled, playerID, unitsLost, playerID, unitsBuilt);
-			results.concat(playerStr);
-			playerStr.format(",buildingsKilled%d=%d,buildingsLost%d=%d,buildingsBuilt%d=%d",
-				playerID, buildingsKilled, playerID, buildingsLost, playerID, buildingsBuilt);
-			results.concat(playerStr);
-			playerStr.format(",fps%d=%d,cash%d=%d,capturedTech%d=%d,discon%d=%d,side%d=%s,team%d=%d",
-				playerID, fps, playerID, earnings, playerID, techCaptured, playerID, disconnected, playerID, p[i]->getPlayerTemplate()->getSide().str(), playerID, slot->getTeamNumber());
-			results.concat(playerStr);
-
-			++playerID;
-		}
-	}
-
-	// Add a trailing size value (so the server can ensure it got the entire packet)
-	results.concat(",size=");
-	int resultsLen = results.getLength()+10;
-	AsciiString tail;
-	tail.format("%10.10d", resultsLen);
-	results.concat(tail);
-
-	return results;
-}
-
-void GameSpyStagingRoom::launchGame( void )
-{
-	setGameInProgress(TRUE);
-	
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSpyGameSlot *slot = getGameSpySlot(i);
-		if (slot->isHuman())
-		{
-			if (TheGameSpyInfo->didPlayerPreorder(slot->getProfileID()))
-				markPlayerAsPreorder(i);
-		}
-	}
-
-	// Set up the game network
-	AsciiString user;
-	AsciiString userList;
-	DEBUG_ASSERTCRASH(TheNetwork == NULL, ("For some reason TheNetwork isn't NULL at the start of this game.  Better look into that."));
-
-	if (TheNetwork != NULL) {
-		delete TheNetwork;
-		TheNetwork = NULL;
-	}
-
-	// Time to initialize TheNetwork for this game.
-	TheNetwork = NetworkInterface::createNetwork();
-	TheNetwork->init();
-	
-	TheNetwork->setLocalAddress(getLocalIP(), (TheNAT)?TheNAT->getSlotPort(getLocalSlotNum()):8888);
-	if (TheNAT)
-		TheNetwork->attachTransport(TheNAT->getTransport());
-	else
-		TheNetwork->initTransport();
-
-	TheNetwork->parseUserList(this);
-
-
-	if (TheGameLogic->isInGame()) {
-		TheGameLogic->clearGameData();
-	}
-
-	Bool filesOk = DoAnyMapTransfers(this);
-
-	// see if we really have the map.  if not, back out.
-	TheMapCache->updateCache();
-	if (!filesOk || TheMapCache->findMap(getMap()) == NULL)
-	{
-		DEBUG_LOG(("After transfer, we didn't really have the map.  Bailing...\n"));
-		if (TheNetwork != NULL) {
-			delete TheNetwork;
-			TheNetwork = NULL;
-		}
-		GSMessageBoxOk(TheGameText->fetch("GUI:Error"), TheGameText->fetch("GUI:CouldNotTransferMap"));
-
-		void PopBackToLobby( void );
-		PopBackToLobby();
-		return;
-	}
-
-
-	// shutdown the top, but do not pop it off the stack
-//		TheShell->hideShell();
-	// setup the Global Data with the Map and Seed
-	TheWritableGlobalData->m_pendingFile = TheGameSpyGame->getMap();
-
-	// send a message to the logic for a new game
-	GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
-	msg->appendIntegerArgument(GAME_INTERNET);
-
-	TheWritableGlobalData->m_useFpsLimit = false;
-
-	// Set the random seed
-	InitGameLogicRandom( getSeed() );
-	DEBUG_LOG(("InitGameLogicRandom( %d )\n", getSeed()));
-
-	// mark us as "Loading" in the buddy list
-	BuddyRequest req;
-	req.buddyRequestType = BuddyRequest::BUDDYREQUEST_SETSTATUS;
-	req.arg.status.status = GP_PLAYING;
-	strcpy(req.arg.status.statusString, "Loading");
-	sprintf(req.arg.status.locationString, "%s", WideCharStringToMultiByte(TheGameSpyGame->getGameName().str()).c_str());
-	TheGameSpyBuddyMessageQueue->addRequest(req);
-
-	if (TheNAT != NULL) {
-		delete TheNAT;
-		TheNAT = NULL;
-	}
-}
-
-void GameSpyStagingRoom::reset(void)
-{
-#ifdef DEBUG_LOGGING
-	if (this == TheGameSpyGame)
-	{
-		WindowLayout *theLayout = TheShell->findScreenByFilename("Menus/GameSpyGameOptionsMenu.wnd");
-		if (theLayout)
-		{
-			DEBUG_LOG(("Resetting TheGameSpyGame on the game options menu!\n"));
-		}
-	}
-#endif
-	GameInfo::reset();
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
deleted file mode 100644
index b970e4c4f02..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
+++ /dev/null
@@ -1,681 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: BuddyThread.cpp //////////////////////////////////////////////////////
-// GameSpy Presence & Messaging (Buddy) thread
-// This thread communicates with GameSpy's buddy server
-// and talks through a message queue with the rest of
-// the game.
-// Author: Matthew D. Campbell, June 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/GameSpy/BuddyThread.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/ThreadUtils.h"
-
-#include "Common/StackDump.h"
-
-#include "mutex.h"
-#include "thread.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-------------------------------------------------------------------------
-
-typedef std::queue<BuddyRequest> RequestQueue;
-typedef std::queue<BuddyResponse> ResponseQueue;
-class BuddyThreadClass;
-
-class GameSpyBuddyMessageQueue : public GameSpyBuddyMessageQueueInterface
-{
-public:
-	virtual ~GameSpyBuddyMessageQueue();
-	GameSpyBuddyMessageQueue();
-	virtual void startThread( void );
-	virtual void endThread( void );
-	virtual Bool isThreadRunning( void );
-	virtual Bool isConnected( void );
-	virtual Bool isConnecting( void );
-
-	virtual void addRequest( const BuddyRequest& req );
-	virtual Bool getRequest( BuddyRequest& req );
-
-	virtual void addResponse( const BuddyResponse& resp );
-	virtual Bool getResponse( BuddyResponse& resp );
-
-	virtual GPProfile getLocalProfileID( void );
-
-	BuddyThreadClass* getThread( void );
-
-private:
-	MutexClass m_requestMutex;
-	MutexClass m_responseMutex;
-	RequestQueue m_requests;
-	ResponseQueue m_responses;
-	BuddyThreadClass *m_thread;
-};
-
-GameSpyBuddyMessageQueueInterface* GameSpyBuddyMessageQueueInterface::createNewMessageQueue( void )
-{
-	return NEW GameSpyBuddyMessageQueue;
-}
-
-GameSpyBuddyMessageQueueInterface *TheGameSpyBuddyMessageQueue;
-#define MESSAGE_QUEUE ((GameSpyBuddyMessageQueue *)TheGameSpyBuddyMessageQueue)
-
-//-------------------------------------------------------------------------
-
-class BuddyThreadClass : public ThreadClass
-{
-
-public:
-	BuddyThreadClass() : ThreadClass() { m_isNewAccount = m_isdeleting = m_isConnecting = m_isConnected = false; m_profileID = 0; m_lastErrorCode = 0; }
-
-	void Thread_Function();
-
-	void errorCallback( GPConnection *con, GPErrorArg *arg );
-	void messageCallback( GPConnection *con, GPRecvBuddyMessageArg *arg );
-	void connectCallback( GPConnection *con, GPConnectResponseArg *arg );
-	void requestCallback( GPConnection *con, GPRecvBuddyRequestArg *arg );
-	void statusCallback( GPConnection *con, GPRecvBuddyStatusArg *arg );
-
-	Bool isConnecting( void ) { return m_isConnecting; }
-	Bool isConnected( void ) { return m_isConnected; }
-
-	GPProfile getLocalProfileID( void ) { return m_profileID; }
-
-private:
-	Bool m_isNewAccount;
-	Bool m_isConnecting;
-	Bool m_isConnected;
-	GPProfile m_profileID;
-	Int m_lastErrorCode;
-	Bool m_isdeleting;
-	std::string m_nick, m_email, m_pass;
-};
-
-static enum CallbackType
-{
-	CALLBACK_CONNECT,
-	CALLBACK_ERROR,
-	CALLBACK_RECVMESSAGE,
-	CALLBACK_RECVREQUEST,
-	CALLBACK_RECVSTATUS,
-	CALLBACK_MAX
-};
-
-void callbackWrapper( GPConnection *con, void *arg, void *param )
-{
-	CallbackType info = (CallbackType)(Int)param;
-	BuddyThreadClass *thread = MESSAGE_QUEUE->getThread() ? MESSAGE_QUEUE->getThread() : NULL /*(TheGameSpyBuddyMessageQueue)?TheGameSpyBuddyMessageQueue->getThread():NULL*/;
-	if (!thread)
-		return;
-
-	switch (info)
-	{
-		case CALLBACK_CONNECT:
-			thread->connectCallback( con, (GPConnectResponseArg *)arg );
-			break;
-		case CALLBACK_ERROR:
-			thread->errorCallback( con, (GPErrorArg *)arg );
-			break;
-		case CALLBACK_RECVMESSAGE:
-			thread->messageCallback( con, (GPRecvBuddyMessageArg *)arg );
-			break;
-		case CALLBACK_RECVREQUEST:
-			thread->requestCallback( con, (GPRecvBuddyRequestArg *)arg );
-			break;
-		case CALLBACK_RECVSTATUS:
-			thread->statusCallback( con, (GPRecvBuddyStatusArg *)arg );
-			break;
-	}
-}
-
-//-------------------------------------------------------------------------
-
-GameSpyBuddyMessageQueue::GameSpyBuddyMessageQueue()
-{
-	m_thread = NULL;
-}
-
-GameSpyBuddyMessageQueue::~GameSpyBuddyMessageQueue()
-{
-	endThread();
-}
-
-void GameSpyBuddyMessageQueue::startThread( void )
-{
-	if (!m_thread)
-	{
-		m_thread = NEW BuddyThreadClass;
-		m_thread->Execute();
-	}
-	else
-	{
-		if (!m_thread->Is_Running())
-		{
-			m_thread->Execute();
-		}
-	}
-}
-
-void GameSpyBuddyMessageQueue::endThread( void )
-{
-	if (m_thread)
-		delete m_thread;
-	m_thread = NULL;
-}
-
-Bool GameSpyBuddyMessageQueue::isThreadRunning( void )
-{
-	return (m_thread) ? m_thread->Is_Running() : false;
-}
-
-Bool GameSpyBuddyMessageQueue::isConnected( void )
-{
-	return (m_thread) ? m_thread->isConnected() : false;
-}
-
-Bool GameSpyBuddyMessageQueue::isConnecting( void )
-{
-	return (m_thread) ? m_thread->isConnecting() : false;
-}
-
-void GameSpyBuddyMessageQueue::addRequest( const BuddyRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex);
-	if (m.Failed())
-		return;
-
-	m_requests.push(req);
-}
-
-Bool GameSpyBuddyMessageQueue::getRequest( BuddyRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_requests.empty())
-		return false;
-	req = m_requests.front();
-	m_requests.pop();
-	return true;
-}
-
-void GameSpyBuddyMessageQueue::addResponse( const BuddyResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex);
-	if (m.Failed())
-		return;
-
-	m_responses.push(resp);
-}
-
-Bool GameSpyBuddyMessageQueue::getResponse( BuddyResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_responses.empty())
-		return false;
-	resp = m_responses.front();
-	m_responses.pop();
-	return true;
-}
-
-BuddyThreadClass* GameSpyBuddyMessageQueue::getThread( void )
-{
-	return m_thread;
-}
-
-GPProfile GameSpyBuddyMessageQueue::getLocalProfileID( void )
-{
-	return (m_thread) ? m_thread->getLocalProfileID() : 0;
-}
-
-//-------------------------------------------------------------------------
-
-void BuddyThreadClass::Thread_Function()
-{
-	try {
-	_set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
-	GPConnection gpCon;
-	GPConnection *con = &gpCon;
-	gpInitialize( con, 675, 0, GP_PARTNERID_GAMESPY );
-	m_isConnected = m_isConnecting = false;
-
-	gpSetCallback( con, GP_ERROR,								callbackWrapper,	(void *)CALLBACK_ERROR );
-	gpSetCallback( con, GP_RECV_BUDDY_MESSAGE,	callbackWrapper,	(void *)CALLBACK_RECVMESSAGE );
-	gpSetCallback( con, GP_RECV_BUDDY_REQUEST,	callbackWrapper,	(void *)CALLBACK_RECVREQUEST );
-	gpSetCallback( con, GP_RECV_BUDDY_STATUS,		callbackWrapper,	(void *)CALLBACK_RECVSTATUS );
-
-	GPEnum lastStatus = GP_OFFLINE;
-	std::string lastStatusString;
-
-	BuddyRequest incomingRequest;
-	while ( running )
-	{
-		// deal with requests
-		if (TheGameSpyBuddyMessageQueue->getRequest(incomingRequest))
-		{
-			switch (incomingRequest.buddyRequestType)
-			{
-			case BuddyRequest::BUDDYREQUEST_LOGIN:
-				m_isConnecting = true;
-				m_nick = incomingRequest.arg.login.nick;
-				m_email = incomingRequest.arg.login.email;
-				m_pass = incomingRequest.arg.login.password;
-				m_isConnected = (gpConnect( con, incomingRequest.arg.login.nick, incomingRequest.arg.login.email,
-					incomingRequest.arg.login.password, (incomingRequest.arg.login.hasFirewall)?GP_FIREWALL:GP_NO_FIREWALL,
-					GP_BLOCKING, callbackWrapper, (void *)CALLBACK_CONNECT ) == GP_NO_ERROR);
-				m_isConnecting = false;
-				break;
-
-			case BuddyRequest::BUDDYREQUEST_RELOGIN:
-				m_isConnecting = true;
-				m_isConnected = (gpConnect( con, m_nick.c_str(), m_email.c_str(), m_pass.c_str(), GP_FIREWALL,
-					GP_BLOCKING, callbackWrapper, (void *)CALLBACK_CONNECT ) == GP_NO_ERROR);
-				m_isConnecting = false;
-				break;
-			case BuddyRequest::BUDDYREQUEST_DELETEACCT:
-				m_isdeleting =  true;
-				// TheSuperHackers @tweak OmniBlade API was updated since Generals released to require a callback. Passing -1 will make our wrapper ignore this.
-				gpDeleteProfile( con, callbackWrapper, (void *)(-1) );
-				break;
-			case BuddyRequest::BUDDYREQUEST_LOGOUT:
-				m_isConnecting = m_isConnected = false;
-				gpDisconnect( con );
-				break;
-			case BuddyRequest::BUDDYREQUEST_MESSAGE:
-				{
-					std::string s = WideCharStringToMultiByte( incomingRequest.arg.message.text );
-					DEBUG_LOG(("Sending a buddy message to %d [%s]\n", incomingRequest.arg.message.recipient, s.c_str()));
-					gpSendBuddyMessage( con, incomingRequest.arg.message.recipient, s.c_str() );
-				}
-				break;
-			case BuddyRequest::BUDDYREQUEST_LOGINNEW:
-				{
-					m_isConnecting = true;
-					m_nick = incomingRequest.arg.login.nick;
-					m_email = incomingRequest.arg.login.email;
-					m_pass = incomingRequest.arg.login.password;
-					m_isNewAccount = TRUE;
-					// TheSuperHackers @tweak OmniBlade API was updated since Generals release to require uniquenick which is the same as nick and cdkey is an empty string here.
-					m_isConnected = (gpConnectNewUser( con, incomingRequest.arg.login.nick, incomingRequest.arg.login.nick, incomingRequest.arg.login.email,
-						incomingRequest.arg.login.password, "", (incomingRequest.arg.login.hasFirewall)?GP_FIREWALL:GP_NO_FIREWALL,
-						GP_BLOCKING, callbackWrapper, (void *)CALLBACK_CONNECT ) == GP_NO_ERROR);
-					if (m_isNewAccount) // if we didn't re-login
-					{
-						gpSetInfoMask( con, GP_MASK_NONE ); // don't share info
-					}
-					m_isConnecting = false;
-				}
-				break;
-			case BuddyRequest::BUDDYREQUEST_ADDBUDDY:
-				{
-					std::string s = WideCharStringToMultiByte( incomingRequest.arg.addbuddy.text );
-					gpSendBuddyRequest( con, incomingRequest.arg.addbuddy.id, s.c_str() );
-				}
-				break;
-			case BuddyRequest::BUDDYREQUEST_DELBUDDY:
-				{
-					gpDeleteBuddy( con, incomingRequest.arg.profile.id );
-				}
-				break;
-			case BuddyRequest::BUDDYREQUEST_OKADD:
-				{
-					gpAuthBuddyRequest( con, incomingRequest.arg.profile.id );
-				}
-				break;
-			case BuddyRequest::BUDDYREQUEST_DENYADD:
-				{
-					gpDenyBuddyRequest( con, incomingRequest.arg.profile.id );
-				}
-			case BuddyRequest::BUDDYREQUEST_SETSTATUS:
-				{
-					//don't blast our 'Loading' status with 'Online'.
-					if (lastStatus == GP_PLAYING && lastStatusString == "Loading" && incomingRequest.arg.status.status == GP_ONLINE)
-						break;
-
-					DEBUG_LOG(("BUDDYREQUEST_SETSTATUS: status is now %d:%s/%s\n",
-						incomingRequest.arg.status.status, incomingRequest.arg.status.statusString, incomingRequest.arg.status.locationString));
-					gpSetStatus( con, incomingRequest.arg.status.status, incomingRequest.arg.status.statusString,
-						incomingRequest.arg.status.locationString );
-					lastStatus = incomingRequest.arg.status.status;
-					lastStatusString = incomingRequest.arg.status.statusString;
-				}
-				break;
-			}
-		}
-
-		// update the network
-		GPEnum isConnected = GP_CONNECTED;
-		GPResult res = GP_NO_ERROR;
-		res = gpIsConnected( con, &isConnected );
-		if ( isConnected == GP_CONNECTED && res == GP_NO_ERROR )
-			gpProcess( con );
-
-		// end our timeslice
-		Switch_Thread();
-	}
-
-	gpDestroy( con );
-	} catch ( ... ) {
-		DEBUG_CRASH(("Exception in buddy thread!"));
-	}
-}
-
-void BuddyThreadClass::errorCallback( GPConnection *con, GPErrorArg *arg )
-{
-	// log the error
-	DEBUG_LOG(("GPErrorCallback\n"));
-	m_lastErrorCode = arg->errorCode;
-
-	char errorCodeString[256];
-	char resultString[256];
-
-	#define RESULT(x) case x: strcpy(resultString, #x); break;
-	switch(arg->result)
-	{
-		RESULT(GP_NO_ERROR)
-		RESULT(GP_MEMORY_ERROR)
-		RESULT(GP_PARAMETER_ERROR)
-		RESULT(GP_NETWORK_ERROR)
-		RESULT(GP_SERVER_ERROR)
-	default:
-		strcpy(resultString, "Unknown result!");
-	}
-	#undef RESULT
-
-	#define ERRORCODE(x) case x: strcpy(errorCodeString, #x); break;
-	switch(arg->errorCode)
-	{
-		ERRORCODE(GP_GENERAL)
-		ERRORCODE(GP_PARSE)
-		ERRORCODE(GP_NOT_LOGGED_IN)
-		ERRORCODE(GP_BAD_SESSKEY)
-		ERRORCODE(GP_DATABASE)
-		ERRORCODE(GP_NETWORK)
-		ERRORCODE(GP_FORCED_DISCONNECT)
-		ERRORCODE(GP_CONNECTION_CLOSED)
-		ERRORCODE(GP_LOGIN)
-		ERRORCODE(GP_LOGIN_TIMEOUT)
-		ERRORCODE(GP_LOGIN_BAD_NICK)
-		ERRORCODE(GP_LOGIN_BAD_EMAIL)
-		ERRORCODE(GP_LOGIN_BAD_PASSWORD)
-		ERRORCODE(GP_LOGIN_BAD_PROFILE)
-		ERRORCODE(GP_LOGIN_PROFILE_DELETED)
-		ERRORCODE(GP_LOGIN_CONNECTION_FAILED)
-		ERRORCODE(GP_LOGIN_SERVER_AUTH_FAILED)
-		ERRORCODE(GP_NEWUSER)
-		ERRORCODE(GP_NEWUSER_BAD_NICK)
-		ERRORCODE(GP_NEWUSER_BAD_PASSWORD)
-		ERRORCODE(GP_UPDATEUI)
-		ERRORCODE(GP_UPDATEUI_BAD_EMAIL)
-		ERRORCODE(GP_NEWPROFILE)
-		ERRORCODE(GP_NEWPROFILE_BAD_NICK)
-		ERRORCODE(GP_NEWPROFILE_BAD_OLD_NICK)
-		ERRORCODE(GP_UPDATEPRO)
-		ERRORCODE(GP_UPDATEPRO_BAD_NICK)
-		ERRORCODE(GP_ADDBUDDY)
-		ERRORCODE(GP_ADDBUDDY_BAD_FROM)
-		ERRORCODE(GP_ADDBUDDY_BAD_NEW)
-		ERRORCODE(GP_ADDBUDDY_ALREADY_BUDDY)
-		ERRORCODE(GP_AUTHADD)
-		ERRORCODE(GP_AUTHADD_BAD_FROM)
-		ERRORCODE(GP_AUTHADD_BAD_SIG)
-		ERRORCODE(GP_STATUS)
-		ERRORCODE(GP_BM)
-		ERRORCODE(GP_BM_NOT_BUDDY)
-		ERRORCODE(GP_GETPROFILE)
-		ERRORCODE(GP_GETPROFILE_BAD_PROFILE)
-		ERRORCODE(GP_DELBUDDY)
-		ERRORCODE(GP_DELBUDDY_NOT_BUDDY)
-		ERRORCODE(GP_DELPROFILE)
-		ERRORCODE(GP_DELPROFILE_LAST_PROFILE)
-		ERRORCODE(GP_SEARCH)
-		ERRORCODE(GP_SEARCH_CONNECTION_FAILED)
-	default:
-		strcpy(errorCodeString, "Unknown error code!");
-	}
-	#undef ERRORCODE
-
-	if(arg->fatal)
-	{
-		DEBUG_LOG(( "-----------\n"));
-		DEBUG_LOG(( "GP FATAL ERROR\n"));
-		DEBUG_LOG(( "-----------\n"));
-	}
-	else
-	{
-		DEBUG_LOG(( "-----\n"));
-		DEBUG_LOG(( "GP ERROR\n"));
-		DEBUG_LOG(( "-----\n"));
-	}
-	DEBUG_LOG(( "RESULT: %s (%d)\n", resultString, arg->result));
-	DEBUG_LOG(( "ERROR CODE: %s (0x%X)\n", errorCodeString, arg->errorCode));
-	DEBUG_LOG(( "ERROR STRING: %s\n", arg->errorString));
-
-	if (arg->fatal == GP_FATAL)
-	{
-		BuddyResponse errorResponse;
-		errorResponse.buddyResponseType = BuddyResponse::BUDDYRESPONSE_DISCONNECT;
-		errorResponse.result = arg->result;
-		errorResponse.arg.error.errorCode = arg->errorCode;
-		errorResponse.arg.error.fatal = arg->fatal;
-		strncpy(errorResponse.arg.error.errorString, arg->errorString, MAX_BUDDY_CHAT_LEN);
-		errorResponse.arg.error.errorString[MAX_BUDDY_CHAT_LEN-1] = 0;
-		m_isConnecting = m_isConnected = false;
-		TheGameSpyBuddyMessageQueue->addResponse( errorResponse );
-		if (m_isdeleting)
-		{
-			PeerRequest req;
-			req.peerRequestType = PeerRequest::PEERREQUEST_LOGOUT;
-			TheGameSpyPeerMessageQueue->addRequest( req );
-			m_isdeleting = false;
-		}
-	}
-}
-
-static void getNickForMessage( GPConnection *con, GPGetInfoResponseArg *arg, void *param )
-{
-	BuddyResponse *resp = (BuddyResponse *)param;
-	strcpy(resp->arg.message.nick, arg->nick);
-}
-
-void BuddyThreadClass::messageCallback( GPConnection *con, GPRecvBuddyMessageArg *arg )
-{
-	BuddyResponse messageResponse;
-	messageResponse.buddyResponseType = BuddyResponse::BUDDYRESPONSE_MESSAGE;
-	messageResponse.profile = arg->profile;
-
-	// get info about the person asking to be our buddy
-	gpGetInfo( con, arg->profile, GP_CHECK_CACHE, GP_BLOCKING, (GPCallback)getNickForMessage, &messageResponse);
-
-	std::wstring s = MultiByteToWideCharSingleLine( arg->message );
-	wcsncpy(messageResponse.arg.message.text, s.c_str(), MAX_BUDDY_CHAT_LEN);
-	messageResponse.arg.message.text[MAX_BUDDY_CHAT_LEN-1] = 0;
-	messageResponse.arg.message.date = arg->date;
-	DEBUG_LOG(("Got a buddy message from %d [%ls]\n", arg->profile, s.c_str()));
-	TheGameSpyBuddyMessageQueue->addResponse( messageResponse );
-}
-
-void BuddyThreadClass::connectCallback( GPConnection *con, GPConnectResponseArg *arg )
-{
-	BuddyResponse loginResponse;
-	if (arg->result == GP_NO_ERROR)
-	{
-		loginResponse.buddyResponseType = BuddyResponse::BUDDYRESPONSE_LOGIN;
-		loginResponse.result = arg->result;
-		loginResponse.profile = arg->profile;
-		TheGameSpyBuddyMessageQueue->addResponse( loginResponse );
-		m_profileID = arg->profile;
-
-		if (!TheGameSpyPeerMessageQueue->isConnected() && !TheGameSpyPeerMessageQueue->isConnecting())
-		{
-			DEBUG_LOG(("Buddy connect: trying chat connect\n"));
-			PeerRequest req;
-			req.peerRequestType = PeerRequest::PEERREQUEST_LOGIN;
-			req.nick = m_nick;
-			req.password = m_pass;
-			req.email = m_email;
-			req.login.profileID = arg->profile;
-			TheGameSpyPeerMessageQueue->addRequest(req);
-		}
-	}
-	else
-	{
-		if (!TheGameSpyPeerMessageQueue->isConnected() && !TheGameSpyPeerMessageQueue->isConnecting())
-		{
-			if (m_lastErrorCode == GP_NEWUSER_BAD_NICK)
-			{
-				m_isNewAccount = FALSE;
-				// they just hit 'create account' instead of 'log in'.  Fix them.
-				DEBUG_LOG(("User Error: Create Account instead of Login.  Fixing them...\n"));
-				BuddyRequest req;
-				req.buddyRequestType = BuddyRequest::BUDDYREQUEST_LOGIN;
-				strcpy(req.arg.login.nick, m_nick.c_str());
-				strcpy(req.arg.login.email, m_email.c_str());
-				strcpy(req.arg.login.password, m_pass.c_str());
-				req.arg.login.hasFirewall = true;
-				TheGameSpyBuddyMessageQueue->addRequest( req );
-				return;
-			}
-			DEBUG_LOG(("Buddy connect failed (%d/%d): posting a failed chat connect\n", arg->result, m_lastErrorCode));
-			PeerResponse resp;
-			resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
-			resp.discon.reason = DISCONNECT_COULDNOTCONNECT;
-			switch (m_lastErrorCode)
-			{
-			case GP_LOGIN_TIMEOUT:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_TIMEOUT;
-				break;
-			case GP_LOGIN_BAD_NICK:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_BAD_NICK;
-				break;
-			case GP_LOGIN_BAD_EMAIL:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_BAD_EMAIL;
-				break;
-			case GP_LOGIN_BAD_PASSWORD:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_BAD_PASSWORD;
-				break;
-			case GP_LOGIN_BAD_PROFILE:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_BAD_PROFILE;
-				break;
-			case GP_LOGIN_PROFILE_DELETED:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_PROFILE_DELETED;
-				break;
-			case GP_LOGIN_CONNECTION_FAILED:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_CONNECTION_FAILED;
-				break;
-			case GP_LOGIN_SERVER_AUTH_FAILED:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_SERVER_AUTH_FAILED;
-				break;
-			case GP_NEWUSER_BAD_NICK:
-				resp.discon.reason = DISCONNECT_GP_NEWUSER_BAD_NICK;
-				break;
-			case GP_NEWUSER_BAD_PASSWORD:
-				resp.discon.reason = DISCONNECT_GP_NEWUSER_BAD_PASSWORD;
-				break;
-			case GP_NEWPROFILE_BAD_NICK:
-				resp.discon.reason = DISCONNECT_GP_NEWPROFILE_BAD_NICK;
-				break;
-			case GP_NEWPROFILE_BAD_OLD_NICK:
-				resp.discon.reason = DISCONNECT_GP_NEWPROFILE_BAD_OLD_NICK;
-				break;
-			}
-			TheGameSpyPeerMessageQueue->addResponse(resp);
-		}
-	}
-}
-
-// -----------------------
-
-static void getInfoResponseForRequest( GPConnection *con, GPGetInfoResponseArg *arg, void *param )
-{
-	BuddyResponse *resp = (BuddyResponse *)param;
-	resp->profile = arg->profile;
-	strcpy(resp->arg.request.nick, arg->nick);
-	strcpy(resp->arg.request.email, arg->email);
-	strcpy(resp->arg.request.countrycode, arg->countrycode);
-}
-
-void BuddyThreadClass::requestCallback( GPConnection *con, GPRecvBuddyRequestArg *arg )
-{
-	BuddyResponse response;
-	response.buddyResponseType = BuddyResponse::BUDDYRESPONSE_REQUEST;
-	response.profile = arg->profile;
-
-	// get info about the person asking to be our buddy
-	gpGetInfo( con, arg->profile, GP_CHECK_CACHE, GP_BLOCKING, (GPCallback)getInfoResponseForRequest, &response);
-
-	std::wstring s = MultiByteToWideCharSingleLine( arg->reason );
-	wcsncpy(response.arg.request.text, s.c_str(), GP_REASON_LEN);
-	response.arg.request.text[GP_REASON_LEN-1] = 0;
-
-	TheGameSpyBuddyMessageQueue->addResponse( response );
-}
-
-// -----------------------
-
-static void getInfoResponseForStatus(GPConnection * connection, GPGetInfoResponseArg * arg, void * param)
-{
-	BuddyResponse *resp = (BuddyResponse *)param;
-	resp->profile = arg->profile;
-	strcpy(resp->arg.status.nick, arg->nick);
-	strcpy(resp->arg.status.email, arg->email);
-	strcpy(resp->arg.status.countrycode, arg->countrycode);
-}
-
-void BuddyThreadClass::statusCallback( GPConnection *con, GPRecvBuddyStatusArg *arg )
-{
-	BuddyResponse response;
-
-	// get user's name
-	response.buddyResponseType = BuddyResponse::BUDDYRESPONSE_STATUS;
-	gpGetInfo( con, arg->profile, GP_CHECK_CACHE, GP_BLOCKING, (GPCallback)getInfoResponseForStatus, &response);
-
-	// get user's status
-	GPBuddyStatus status;
-	gpGetBuddyStatus( con, arg->index, &status );
-	strcpy(response.arg.status.location, status.locationString);
-	strcpy(response.arg.status.statusString, status.statusString);
-	response.arg.status.status = status.status;
-	DEBUG_LOG(("Got buddy status for %d(%s) - status %d\n", status.profile, response.arg.status.nick, status.status));
-
-	// relay to UI
-	TheGameSpyBuddyMessageQueue->addResponse( response );
-}
-
-
-//-------------------------------------------------------------------------
-
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
deleted file mode 100644
index 0c446e948b4..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PingThread.cpp //////////////////////////////////////////////////////
-// Ping thread
-// Author: Matthew D. Campbell, August 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include <winsock.h>	// This one has to be here. Prevents collisions with winsock2.h
-
-#include "GameNetwork/GameSpy/GameResultsThread.h"
-#include "mutex.h"
-#include "thread.h"
-
-#include "Common/StackDump.h"
-#include "Common/SubsystemInterface.h"
-
-//-------------------------------------------------------------------------
-
-static const Int NumWorkerThreads = 1;
-
-typedef std::queue<GameResultsRequest> RequestQueue;
-typedef std::queue<GameResultsResponse> ResponseQueue;
-class GameResultsThreadClass;
-
-class GameResultsQueue : public GameResultsInterface
-{
-public:
-	virtual ~GameResultsQueue();
-	GameResultsQueue();
-
-	virtual void init() {}
-	virtual void reset() {}
-	virtual void update() {}
-
-	virtual void startThreads( void );
-	virtual void endThreads( void );
-	virtual Bool areThreadsRunning( void );
-
-	virtual void addRequest( const GameResultsRequest& req );
-	virtual Bool getRequest( GameResultsRequest& resp );
-
-	virtual void addResponse( const GameResultsResponse& resp );
-	virtual Bool getResponse( GameResultsResponse& resp );
-
-	virtual Bool areGameResultsBeingSent( void );
-
-private:
-	MutexClass m_requestMutex;
-	MutexClass m_responseMutex;
-	RequestQueue m_requests;
-	ResponseQueue m_responses;
-	Int m_requestCount;
-	Int m_responseCount;
-
-	GameResultsThreadClass *m_workerThreads[NumWorkerThreads];
-};
-
-GameResultsInterface* GameResultsInterface::createNewGameResultsInterface( void )
-{
-	return NEW GameResultsQueue;
-}
-
-GameResultsInterface *TheGameResultsQueue;
-
-//-------------------------------------------------------------------------
-
-class GameResultsThreadClass : public ThreadClass
-{
-
-public:
-	GameResultsThreadClass() : ThreadClass() {}
-
-	void Thread_Function();
-
-private:
-	Int sendGameResults( UnsignedInt IP, UnsignedShort port, const std::string& results );
-};
-
-
-//-------------------------------------------------------------------------
-
-GameResultsQueue::GameResultsQueue() : m_requestCount(0), m_responseCount(0)
-{
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		m_workerThreads[i] = NULL;
-	}
-
-	startThreads();
-}
-
-GameResultsQueue::~GameResultsQueue()
-{
-	endThreads();
-}
-
-void GameResultsQueue::startThreads( void )
-{
-	endThreads();
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		m_workerThreads[i] = NEW GameResultsThreadClass;
-		m_workerThreads[i]->Execute();
-	}
-}
-
-void GameResultsQueue::endThreads( void )
-{
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		if (m_workerThreads[i])
-		{
-			delete m_workerThreads[i];
-			m_workerThreads[i] = NULL;
-		}
-	}
-}
-
-Bool GameResultsQueue::areThreadsRunning( void )
-{
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		if (m_workerThreads[i])
-		{
-			if (m_workerThreads[i]->Is_Running())
-				return true;
-		}
-	}
-	return false;
-}
-
-void GameResultsQueue::addRequest( const GameResultsRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex);
-
-	++m_requestCount;
-	m_requests.push(req);
-}
-
-Bool GameResultsQueue::getRequest( GameResultsRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_requests.empty())
-		return false;
-	req = m_requests.front();
-	m_requests.pop();
-	return true;
-}
-
-void GameResultsQueue::addResponse( const GameResultsResponse& resp )
-{
-	{
-		MutexClass::LockClass m(m_responseMutex);
-
-		++m_responseCount;
-		m_responses.push(resp);
-	}
-}
-
-Bool GameResultsQueue::getResponse( GameResultsResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_responses.empty())
-		return false;
-	resp = m_responses.front();
-	m_responses.pop();
-	return true;
-}
-
-Bool GameResultsQueue::areGameResultsBeingSent( void )
-{
-	MutexClass::LockClass m(m_requestMutex, 0);
-	if (m.Failed())
-		return true;
-
-	return m_requestCount > 0;
-}
-
-
-//-------------------------------------------------------------------------
-// Wrap ladder results in HTTP POST
-static void WrapHTTP( const std::string& hostname, std::string& results )
-{
-	const char HEADER[] =
-		"PUT / HTTP/1.1\r\n"
-		"Connection: Close\r\n"
-		"Host: %s\r\n"
-		"Content-Length: %d\r\n"
-		"\r\n";
-
-	char szHdr[256];
-	snprintf( szHdr, 256, HEADER, hostname.c_str(), results.length() );
-	results = szHdr + results;
-} //WrapHTTP
-
-
-//-------------------------------------------------------------------------
-
-void GameResultsThreadClass::Thread_Function()
-{
-	try {
-	_set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
-	GameResultsRequest req;
-
-	WSADATA wsaData;
-
-	// Fire up winsock (prob already done, but doesn't matter)
-	WORD wVersionRequested = MAKEWORD(1, 1);
-	WSAStartup( wVersionRequested, &wsaData );
-
-	while ( running )
-	{
-		// deal with requests
-		if (TheGameResultsQueue && TheGameResultsQueue->getRequest(req))
-		{
-			// resolve the hostname
-			const char *hostnameBuffer = req.hostname.c_str();
-			UnsignedInt IP = 0xFFFFFFFF;
-			if (isdigit(hostnameBuffer[0]))
-			{
-				IP = inet_addr(hostnameBuffer);
-				in_addr hostNode;
-				hostNode.s_addr = IP;
-				DEBUG_LOG(("sending game results to %s - IP = %s\n", hostnameBuffer, inet_ntoa(hostNode) ));
-			}
-			else
-			{
-				HOSTENT *hostStruct;
-				in_addr *hostNode;
-				hostStruct = gethostbyname(hostnameBuffer);
-				if (hostStruct == NULL)
-				{
-					DEBUG_LOG(("sending game results to %s - host lookup failed\n", hostnameBuffer));
-					
-					// Even though this failed to resolve IP, still need to send a
-					//   callback.
-					IP = 0xFFFFFFFF;   // flag for IP resolve failed
-				}
-				hostNode = (in_addr *) hostStruct->h_addr;
-				IP = hostNode->s_addr;
-				DEBUG_LOG(("sending game results to %s IP = %s\n", hostnameBuffer, inet_ntoa(*hostNode) ));
-			}
-
-			int result = sendGameResults( IP, req.port, req.results );
-			GameResultsResponse resp;
-			resp.hostname = req.hostname;
-			resp.port = req.port;
-			resp.sentOk = (result == req.results.length());
-
-		}
-
-		// end our timeslice
-		Switch_Thread();
-	}
-
-	WSACleanup();
-	} catch ( ... ) {
-		DEBUG_CRASH(("Exception in results thread!"));
-	}
-}
-
-//-------------------------------------------------------------------------
-
-#define CASE(x) case (x): return #x;
-
-static const char *getWSAErrorString( Int error )
-{
-	switch (error)
-	{
-		CASE(WSABASEERR)
-		CASE(WSAEINTR)
-		CASE(WSAEBADF)
-		CASE(WSAEACCES)
-		CASE(WSAEFAULT)
-		CASE(WSAEINVAL)
-		CASE(WSAEMFILE)
-		CASE(WSAEWOULDBLOCK)
-		CASE(WSAEINPROGRESS)
-		CASE(WSAEALREADY)
-		CASE(WSAENOTSOCK)
-		CASE(WSAEDESTADDRREQ)
-		CASE(WSAEMSGSIZE)
-		CASE(WSAEPROTOTYPE)
-		CASE(WSAENOPROTOOPT)
-		CASE(WSAEPROTONOSUPPORT)
-		CASE(WSAESOCKTNOSUPPORT)
-		CASE(WSAEOPNOTSUPP)
-		CASE(WSAEPFNOSUPPORT)
-		CASE(WSAEAFNOSUPPORT)
-		CASE(WSAEADDRINUSE)
-		CASE(WSAEADDRNOTAVAIL)
-		CASE(WSAENETDOWN)
-		CASE(WSAENETUNREACH)
-		CASE(WSAENETRESET)
-		CASE(WSAECONNABORTED)
-		CASE(WSAECONNRESET)
-		CASE(WSAENOBUFS)
-		CASE(WSAEISCONN)
-		CASE(WSAENOTCONN)
-		CASE(WSAESHUTDOWN)
-		CASE(WSAETOOMANYREFS)
-		CASE(WSAETIMEDOUT)
-		CASE(WSAECONNREFUSED)
-		CASE(WSAELOOP)
-		CASE(WSAENAMETOOLONG)
-		CASE(WSAEHOSTDOWN)
-		CASE(WSAEHOSTUNREACH)
-		CASE(WSAENOTEMPTY)
-		CASE(WSAEPROCLIM)
-		CASE(WSAEUSERS)
-		CASE(WSAEDQUOT)
-		CASE(WSAESTALE)
-		CASE(WSAEREMOTE)
-		CASE(WSAEDISCON)
-		CASE(WSASYSNOTREADY)
-		CASE(WSAVERNOTSUPPORTED)
-		CASE(WSANOTINITIALISED)
-		CASE(WSAHOST_NOT_FOUND)
-		CASE(WSATRY_AGAIN)
-		CASE(WSANO_RECOVERY)
-		CASE(WSANO_DATA)
-		default:
-			return "Not a Winsock error";
-	}
-}
-
-#undef CASE
-
-//-------------------------------------------------------------------------
-
-Int GameResultsThreadClass::sendGameResults( UnsignedInt IP, UnsignedShort port, const std::string& results )
-{
-	int error = 0;
-
-	// create the socket
-	Int sock = socket( AF_INET, SOCK_STREAM, 0 );
-	if (sock < 0)
-	{
-		DEBUG_LOG(("GameResultsThreadClass::sendGameResults() - socket() returned %d(%s)\n", sock, getWSAErrorString(sock)));
-		return sock;
-	}
-
-	// fill in address info
-	struct sockaddr_in sockAddr;
-	memset( &sockAddr, 0, sizeof( sockAddr ) );
-	sockAddr.sin_family = AF_INET;
-	sockAddr.sin_addr.s_addr = IP;
-	sockAddr.sin_port = htons(port);
-
-	// Start the connection process....
-	if( connect( sock, (struct sockaddr *)&sockAddr, sizeof( sockAddr ) ) == -1 )
-	{
-		error = WSAGetLastError();
-		DEBUG_LOG(("GameResultsThreadClass::sendGameResults() - connect() returned %d(%s)\n", error, getWSAErrorString(error)));
-		if( ( error == WSAEWOULDBLOCK ) || ( error == WSAEINVAL ) || ( error == WSAEALREADY ) )
-		{
-			return( -1 );
-		}
-
-		if( error != WSAEISCONN )
-		{
-			closesocket( sock );
-			return( -1 );
-		}
-	}
-
-	if (send( sock, results.c_str(), results.length(), 0 ) == SOCKET_ERROR)
-	{
-		error = WSAGetLastError();
-		DEBUG_LOG(("GameResultsThreadClass::sendGameResults() - send() returned %d(%s)\n", error, getWSAErrorString(error)));
-		closesocket(sock);
-		return WSAGetLastError();
-	}
-
-	closesocket(sock);
-
-	return results.length();
-}
-
-
-//-------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
deleted file mode 100644
index d099d9e801f..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
+++ /dev/null
@@ -1,2962 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PeerThread.cpp //////////////////////////////////////////////////////
-// GameSpy Peer (chat) thread
-// This thread communicates with GameSpy's chat server
-// and talks through a message queue with the rest of
-// the game.
-// Author: Matthew D. Campbell, June 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/Registry.h"
-#include "Common/StackDump.h"
-#include "Common/UserPreferences.h"
-#include "Common/version.h"
-#include "GameNetwork/IPEnumeration.h"
-#include "GameNetwork/GameSpy/BuddyThread.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/ThreadUtils.h"
-
-#include "strtok_r.h"
-#include "mutex.h"
-#include "thread.h"
-
-#include "Common/MiniLog.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// enable this for trying to track down why SBServers are losing their keyvals  -MDC 2/20/2003
-#undef SERVER_DEBUGGING
-#ifdef SERVER_DEBUGGING
-void CheckServers(PEER peer);
-#endif // SERVER_DEBUGGING
-
-#ifdef DEBUG_LOGGING
-//#define PING_TEST
-static LogClass s_pingLog("Ping.txt");
-#define PING_LOG(x) s_pingLog.log x
-#else // DEBUG_LOGGING
-#define PING_LOG(x) {}
-#endif // DEBUG_LOGGING
-
-#ifdef DEBUG_LOGGING
-static LogClass s_stateChangedLog("StateChanged.txt");
-
-#define STATECHANGED_LOG(x) s_stateChangedLog.log x
-
-#else // DEBUG_LOGGING
-
-#define STATECHANGED_LOG(x) {}
-
-#endif // DEBUG_LOGGING
-
-// we should always be using broadcast keys from now on.  Remove the old code sometime when
-// we're not in a rush, ok?
-// -MDC 2/14/2003
-#define USE_BROADCAST_KEYS
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-int isThreadHosting = 0;
-static UnsignedInt s_lastStateChangedHeartbeat = 0;
-static Bool s_wantStateChangedHeartbeat = FALSE;
-static UnsignedInt s_heartbeatInterval = 10000;
-
-static SOCKET qr2Sock = INVALID_SOCKET;
-
-enum
-{
-	EXECRC_KEY = NUM_RESERVED_KEYS + 1,
-	INICRC_KEY,
-	PW_KEY,
-	OBS_KEY,
-	LADIP_KEY,
-	LADPORT_KEY,
-	PINGSTR_KEY,
-	NUMPLAYER_KEY,
-	MAXPLAYER_KEY,
-	NUMOBS_KEY,
-	NAME__KEY,
-	FACTION__KEY,
-	COLOR__KEY,
-	WINS__KEY,
-	LOSSES__KEY
-};
-
-#define EXECRC_STR		"exeCRC"
-#define INICRC_STR		"iniCRC"
-#define PW_STR				"pw"
-#define OBS_STR				"obs"
-#define LADIP_STR			"ladIP"
-#define LADPORT_STR		"ladPort"
-#define PINGSTR_STR		"pings"
-#define NUMPLAYER_STR	"numRealPlayers"
-#define MAXPLAYER_STR	"maxRealPlayers"
-#define NUMOBS_STR		"numObservers"
-#define NAME__STR			"name"
-#define FACTION__STR	"faction"
-#define COLOR__STR		"color"
-#define WINS__STR			"wins"
-#define LOSSES__STR		"losses"
-
-//-------------------------------------------------------------------------
-
-typedef std::queue<PeerRequest> RequestQueue;
-typedef std::queue<PeerResponse> ResponseQueue;
-class PeerThreadClass;
-
-class GameSpyPeerMessageQueue : public GameSpyPeerMessageQueueInterface
-{
-public:
-	virtual ~GameSpyPeerMessageQueue();
-	GameSpyPeerMessageQueue();
-	virtual void startThread( void );
-	virtual void endThread( void );
-	virtual Bool isThreadRunning( void );
-	virtual Bool isConnected( void );
-	virtual Bool isConnecting( void );
-
-	virtual void addRequest( const PeerRequest& req );
-	virtual Bool getRequest( PeerRequest& req );
-
-	virtual void addResponse( const PeerResponse& resp );
-	virtual Bool getResponse( PeerResponse& resp );
-
-	virtual SerialAuthResult getSerialAuthResult( void ) { return m_serialAuth; }
-	void setSerialAuthResult( SerialAuthResult result ) { m_serialAuth = result; }
-
-	PeerThreadClass* getThread( void );
-
-private:
-	MutexClass m_requestMutex;
-	MutexClass m_responseMutex;
-	RequestQueue m_requests;
-	ResponseQueue m_responses;
-	PeerThreadClass *m_thread;
-
-	SerialAuthResult m_serialAuth;
-};
-
-GameSpyPeerMessageQueueInterface* GameSpyPeerMessageQueueInterface::createNewMessageQueue( void )
-{
-	return NEW GameSpyPeerMessageQueue;
-}
-
-GameSpyPeerMessageQueueInterface *TheGameSpyPeerMessageQueue;
-#define MESSAGE_QUEUE ((GameSpyPeerMessageQueue *)TheGameSpyPeerMessageQueue)
-
-//-------------------------------------------------------------------------
-
-class PeerThreadClass : public ThreadClass
-{
-
-public:
-	PeerThreadClass() : ThreadClass()
-	{
-		//Added By Sadullah Nader
-		//Initializations inserted
-		m_roomJoined = m_allowObservers = m_hasPassword = FALSE;
-		m_exeCRC = m_iniCRC = 0;
-		m_gameVersion = 0;
-		m_ladderPort = 0;
-		m_localRoomID = 0;
-		m_maxPlayers = 0;
-		m_numObservers = 0;
-		m_maxPlayers = 0;
-		m_qmGroupRoom = 0;
-		m_sawEndOfEnumPlayers = m_sawMatchbot = FALSE;
-		m_sawCompleteGameList = FALSE;
-		//
-		m_isConnecting = m_isConnected = false; 
-		m_groupRoomID = m_profileID = 0;
-		m_nextStagingServer = 1; m_stagingServers.clear();
-		m_pingStr = ""; m_mapName = ""; m_ladderIP = ""; m_isHosting = false;
-		for (Int i=0; i<MAX_SLOTS; ++i)
-		{
-			m_playerNames[i] = "";
-			
-			//Added by Sadullah Nader
-			//Initializations 
-			m_playerColors[i] = 0;
-			m_playerFactions[i] = 0;
-			m_playerLosses[i] = 0;
-			m_playerProfileID[i] = 0;
-			m_playerWins[i] = 0;
-
-			//
-		}
-	}
-
-	void Thread_Function();
-
-	void markAsDisconnected( void ) { m_isConnecting = m_isConnected = false; }
-
-	void connectCallback( PEER peer, PEERBool success );
-	void nickErrorCallback( PEER peer, Int type, const char *nick );
-
-	Bool isConnecting( void ) { return m_isConnecting; }
-	Bool isConnected( void ) { return m_isConnected; }
-
-	Int addServerToMap( SBServer server );
-	Int removeServerFromMap( SBServer server );
-	void clearServers( void );
-	SBServer findServerByID( Int id );
-	Int findServer( SBServer server );
-
-	// get info about the game we are hosting
-	Bool isHosting( void ) { return m_isHosting; }
-	void stopHostingAlready(PEER peer);
-	Bool hasPassword( void ) { return m_hasPassword; }
-	Bool allowObservers( void ) { return m_allowObservers; }
-	std::string getMapName( void ) { return m_mapName; }
-	UnsignedInt exeCRC( void ) { return m_exeCRC; }
-	UnsignedInt iniCRC( void ) { return m_iniCRC; }
-	UnsignedInt gameVersion( void ) { return m_gameVersion; }
-	std::wstring getLocalStagingServerName( void ) { return m_localStagingServerName; }
-	Int getLocalRoomID( void ) { return m_localRoomID; }
-	std::string ladderIP( void ) { return m_ladderIP; }
-	UnsignedShort ladderPort( void ) { return m_ladderPort; }
-	std::string pingStr( void ) { return m_pingStr; }
-	std::string getPlayerName(Int idx) { return m_playerNames[idx]; }
-	Int getPlayerWins(Int idx) { return m_playerWins[idx]; }
-	Int getPlayerLosses(Int idx) { return m_playerLosses[idx]; }
-	Int getPlayerProfileID(Int idx) { return m_playerProfileID[idx]; }
-	Int getPlayerFaction(Int idx) { return m_playerFactions[idx]; }
-	Int getPlayerColor(Int idx) { return m_playerColors[idx]; }
-	Int getNumPlayers(void) { return m_numPlayers; }
-	Int getMaxPlayers(void) { return m_maxPlayers; }
-	Int getNumObservers(void) { return m_numObservers; }
-
-	void roomJoined( Bool val ) { m_roomJoined = val; }
-	void setQMGroupRoom( Int groupID ) { m_qmGroupRoom = groupID; }
-	void sawEndOfEnumPlayers( void ) { m_sawEndOfEnumPlayers = true; }
-	void sawMatchbot( std::string bot ) { m_sawMatchbot = true; m_matchbotName = bot; }
-	QMStatus getQMStatus( void ) { return m_qmStatus; }
-	void handleQMMatch(PEER peer, Int mapIndex, Int seed, char *playerName[MAX_SLOTS], char *playerIP[MAX_SLOTS], char *playerSide[MAX_SLOTS], char *playerColor[MAX_SLOTS], char *playerNAT[MAX_SLOTS]);
-	std::string getQMBotName( void ) { return m_matchbotName; }
-	Int getQMGroupRoom( void ) { return m_qmGroupRoom; }
-	Int getQMLadder( void ) { return m_qmInfo.QM.ladderID; }
-
-	Int getCurrentGroupRoom(void) { return m_groupRoomID; }
-
-#ifdef USE_BROADCAST_KEYS
-	void pushStatsToRoom(PEER peer);
-	void getStatsFromRoom(PEER peer, RoomType roomType);
-	void trackStatsForPlayer(RoomType roomType, const char *nick, const char *key, const char *val);
-	int lookupStatForPlayer(RoomType roomType, const char *nick, const char *key);
-	void clearPlayerStats(RoomType roomType);
-#endif // USE_BROADCAST_KEYS
-
-	void setSawCompleteGameList(Bool val) { m_sawCompleteGameList = val; }
-	Bool getSawCompleteGameList() { return m_sawCompleteGameList; }
-
-private:
-	Bool m_isConnecting;
-	Bool m_isConnected;
-	std::string m_loginName, m_originalName, m_password, m_email;
-	Int m_profileID;
-	Int m_groupRoomID;
-	Bool m_sawCompleteGameList;
-
-#ifdef USE_BROADCAST_KEYS
-	enum { NumKeys = 6, ValBufSize = 20 };
-	static const char *s_keys[NumKeys];
-	static char s_valueBuffers[NumKeys][ValBufSize];
-	static const char *s_values[NumKeys];
-
-	typedef std::map<std::string, int> PlayerStatMap;
-	PlayerStatMap m_groupRoomStats;
-	PlayerStatMap m_stagingRoomStats;
-	std::string packStatKey(const char *nick, const char *key);
-#endif // USE_BROADCAST_KEYS
-
-	// game-hosting info for GOA callbacks
-	Bool m_isHosting;
-	Bool m_hasPassword;
-	std::string m_mapName;
-	std::string m_playerNames[MAX_SLOTS];
-	UnsignedInt m_exeCRC;
-	UnsignedInt m_iniCRC;
-	UnsignedInt m_gameVersion;
-	Bool m_allowObservers;
-	std::string m_pingStr;
-	std::string m_ladderIP;
-	UnsignedShort m_ladderPort;
-	Int m_playerWins[MAX_SLOTS];
-	Int m_playerLosses[MAX_SLOTS];
-	Int m_playerProfileID[MAX_SLOTS];
-	Int m_playerColors[MAX_SLOTS];
-	Int m_playerFactions[MAX_SLOTS];
-	Int m_numPlayers;
-	Int m_maxPlayers;
-	Int m_numObservers;
-
-	Int m_nextStagingServer;
-	std::map<Int, SBServer> m_stagingServers;
-	std::wstring m_localStagingServerName;
-	Int m_localRoomID;
-
-	void doQuickMatch( PEER peer );
-	QMStatus m_qmStatus;
-	PeerRequest m_qmInfo;
-	Bool m_roomJoined;
-	Int m_qmGroupRoom;
-	Bool m_sawEndOfEnumPlayers;
-	Bool m_sawMatchbot;
-	std::string m_matchbotName;
-};
-
-#ifdef USE_BROADCAST_KEYS
-const char* PeerThreadClass::s_keys[6] = { "b_locale", "b_wins", "b_losses", "b_points", "b_side", "b_pre" };
-char PeerThreadClass::s_valueBuffers[6][20] = { "", "", "", "", "", "" };
-const char* PeerThreadClass::s_values[6] = { s_valueBuffers[0], s_valueBuffers[1], s_valueBuffers[2],
-	s_valueBuffers[3], s_valueBuffers[4], s_valueBuffers[5]};
-
-void PeerThreadClass::trackStatsForPlayer(RoomType roomType, const char *nick, const char *key, const char *val)
-{
-	switch (roomType)
-	{
-		case GroupRoom:
-			m_groupRoomStats[packStatKey(nick, key)] = atoi(val);
-			break;
-		case StagingRoom:
-			m_stagingRoomStats[packStatKey(nick, key)] = atoi(val);
-			break;
-	}
-}
-
-std::string PeerThreadClass::packStatKey(const char *nick, const char *key)
-{
-	std::string s = nick;
-	s.append(key);
-	return s;
-}
-
-int PeerThreadClass::lookupStatForPlayer(RoomType roomType, const char *nick, const char *key)
-{
-	std::string fullKey = packStatKey(nick, key);
-	PlayerStatMap::const_iterator it;
-	switch (roomType)
-	{
-		case GroupRoom:
-			it = m_groupRoomStats.find(fullKey);
-			if (it != m_groupRoomStats.end())
-				return it->second;
-			break;
-		case StagingRoom:
-			it = m_stagingRoomStats.find(fullKey);
-			if (it != m_stagingRoomStats.end())
-				return it->second;
-			break;
-	}
-	return 0;
-}
-
-void PeerThreadClass::clearPlayerStats(RoomType roomType)
-{
-	switch (roomType)
-	{
-		case GroupRoom:
-			m_groupRoomStats.clear();
-			break;
-		case StagingRoom:
-			m_stagingRoomStats.clear();
-			break;
-	}
-}
-
-void PeerThreadClass::pushStatsToRoom(PEER peer)
-{
-	DEBUG_LOG(("PeerThreadClass::pushStatsToRoom(): stats are %s=%s,%s=%s,%s=%s,%s=%s,%s=%s,%s=%s\n",
-		s_keys[0], s_values[0],
-		s_keys[1], s_values[1],
-		s_keys[2], s_values[2],
-		s_keys[3], s_values[3],
-		s_keys[4], s_values[4],
-		s_keys[5], s_values[5]));
-	peerSetRoomKeys(peer, GroupRoom, m_loginName.c_str(), 6, s_keys, s_values);
-	peerSetRoomKeys(peer, StagingRoom, m_loginName.c_str(), 6, s_keys, s_values);
-}
-
-void getRoomKeysCallback(PEER peer, PEERBool success, RoomType roomType, const char *nick, int num, char **keys, char **values, void *param);
-void PeerThreadClass::getStatsFromRoom(PEER peer, RoomType roomType)
-{
-	peerGetRoomKeys(peer, GroupRoom, "*", NumKeys, s_keys, getRoomKeysCallback, this, PEERFalse);
-}
-#endif // USE_BROADCAST_KEYS
-
-Int PeerThreadClass::addServerToMap( SBServer server )
-{
-	Int val = m_nextStagingServer++;
-	m_stagingServers[val] = server;
-	return val;
-}
-
-Int PeerThreadClass::removeServerFromMap( SBServer server )
-{
-	for (std::map<Int, SBServer>::iterator it = m_stagingServers.begin(); it != m_stagingServers.end(); ++it)
-	{
-		if (it->second == server)
-		{
-			Int val = it->first;
-			m_stagingServers.erase(it);
-			return val;
-		}
-	}
-
-	return 0;
-}
-
-void PeerThreadClass::clearServers( void )
-{
-	m_stagingServers.clear();
-}
-
-SBServer PeerThreadClass::findServerByID( Int id )
-{
-	std::map<Int, SBServer>::iterator it = m_stagingServers.find(id);
-	if (it != m_stagingServers.end())
-	{
-		SBServer server = it->second;
-		if (server && !server->keyvals)
-		{
-			DEBUG_CRASH(("Referencing a missing server!"));
-			return 0;
-		}
-		return it->second;
-	}
-	return 0;
-}
-
-Int PeerThreadClass::findServer( SBServer server )
-{
-	char tmp[10] = "";
-	const char *newName = SBServerGetStringValue(server, "gamename", tmp);
-	UnsignedInt newPrivateIP = SBServerGetPrivateInetAddress(server);
-	UnsignedShort newPrivatePort = SBServerGetPrivateQueryPort(server);
-	UnsignedInt newPublicIP = SBServerGetPublicInetAddress(server);
-
-	SBServer serverToRemove = NULL;
-
-	for (std::map<Int, SBServer>::iterator it = m_stagingServers.begin(); it != m_stagingServers.end(); ++it)
-	{
-		if (it->second == server)
-		{
-			return it->first;
-		}
-		else
-		{
-			const char *oldName = SBServerGetStringValue(it->second, "gamename", tmp);
-			UnsignedInt oldPrivateIP = SBServerGetPrivateInetAddress(it->second);
-			UnsignedShort oldPrivatePort = SBServerGetPrivateQueryPort(it->second);
-			UnsignedInt oldPublicIP = SBServerGetPublicInetAddress(it->second);
-			if (!strcmp(oldName, newName) &&
-				oldPrivateIP == newPrivateIP &&
-				oldPublicIP == newPublicIP &&
-				oldPrivatePort == newPrivatePort)
-			{
-				serverToRemove = it->second;
-			}
-		}
-	}
-
-	if (serverToRemove)
-	{
-		// this is the same as another game - it has just migrated to another port.  Remove the old and replace it.
-		PeerResponse resp;
-		resp.peerResponseType = PeerResponse::PEERRESPONSE_STAGINGROOM;
-		resp.stagingRoom.id = removeServerFromMap( serverToRemove );
-		resp.stagingRoom.action = PEER_REMOVE;
-		resp.stagingRoom.isStaging = TRUE;
-		resp.stagingRoom.percentComplete = -1;
-		TheGameSpyPeerMessageQueue->addResponse(resp);
-	}
-
-	return addServerToMap(server);
-}
-
-static enum CallbackType
-{
-	CALLBACK_CONNECT,
-	CALLBACK_ERROR,
-	CALLBACK_RECVMESSAGE,
-	CALLBACK_RECVREQUEST,
-	CALLBACK_RECVSTATUS,
-	CALLBACK_MAX
-};
-
-void connectCallbackWrapper( PEER peer, PEERBool success, int failureReason, void *param )
-{
-#ifdef SERVER_DEBUGGING
-	DEBUG_LOG(("In connectCallbackWrapper()\n"));
-	CheckServers(peer);
-#endif // SERVER_DEBUGGING
-	if (param != NULL)
-	{
-		((PeerThreadClass *)param)->connectCallback( peer, success );
-	}
-}
-
-void nickErrorCallbackWrapper( PEER peer, Int type, const char *nick, int numSuggestedNicks, const gsi_char** suggestedNicks, void *param )
-{
-	if (param != NULL)
-	{
-		((PeerThreadClass *)param)->nickErrorCallback( peer, type, nick );
-	}
-}
-
-static void joinRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomType roomType, void *param);
-
-//-------------------------------------------------------------------------
-
-GameSpyPeerMessageQueue::GameSpyPeerMessageQueue()
-{
-	m_thread = NULL;
-	m_serialAuth = SERIAL_OK;
-}
-
-GameSpyPeerMessageQueue::~GameSpyPeerMessageQueue()
-{
-	endThread();
-}
-
-void GameSpyPeerMessageQueue::startThread( void )
-{
-	if (!m_thread)
-	{
-		m_thread = NEW PeerThreadClass;
-		m_thread->Execute();
-	}
-	else
-	{
-		if (!m_thread->Is_Running())
-		{
-			m_thread->Execute();
-		}
-	}
-}
-
-void GameSpyPeerMessageQueue::endThread( void )
-{
-	if (m_thread)
-		delete m_thread;
-	m_thread = NULL;
-}
-
-Bool GameSpyPeerMessageQueue::isThreadRunning( void )
-{
-	return (m_thread) ? m_thread->Is_Running() : false;
-}
-
-Bool GameSpyPeerMessageQueue::isConnected( void )
-{
-	return (m_thread) ? m_thread->isConnected() : false;
-}
-
-Bool GameSpyPeerMessageQueue::isConnecting( void )
-{
-	return (m_thread) ? m_thread->isConnecting() : false;
-}
-
-void GameSpyPeerMessageQueue::addRequest( const PeerRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex);
-	if (m.Failed())
-		return;
-
-	m_requests.push(req);
-}
-
-//PeerRequest GameSpyPeerMessageQueue::getRequest( void )
-Bool GameSpyPeerMessageQueue::getRequest( PeerRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_requests.empty())
-		return false;
-	req = m_requests.front();
-	m_requests.pop();
-	return true;
-}
-
-void GameSpyPeerMessageQueue::addResponse( const PeerResponse& resp )
-{
-	if (resp.nick == "(END)")
-		return;
-
-	MutexClass::LockClass m(m_responseMutex);
-	if (m.Failed())
-		return;
-
-	m_responses.push(resp);
-}
-
-//PeerResponse GameSpyPeerMessageQueue::getResponse( void )
-Bool GameSpyPeerMessageQueue::getResponse( PeerResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_responses.empty())
-		return false;
-	resp = m_responses.front();
-	m_responses.pop();
-	return true;
-}
-
-PeerThreadClass* GameSpyPeerMessageQueue::getThread( void )
-{
-	return m_thread;
-}
-
-//-------------------------------------------------------------------------
-static void disconnectedCallback(PEER peer, const char * reason, void * param);
-static void roomMessageCallback(PEER peer, RoomType roomType, const char * nick, const char * message, MessageType messageType, void * param);
-static void playerMessageCallback(PEER peer, const char * nick, const char * message, MessageType messageType, void * param);
-static void playerJoinedCallback(PEER peer, RoomType roomType, const char * nick, void * param);
-static void playerLeftCallback(PEER peer, RoomType roomType, const char * nick, const char * reason, void * param);
-static void playerChangedNickCallback(PEER peer, RoomType roomType, const char * oldNick, const char * newNick, void * param);
-static void playerInfoCallback(PEER peer, RoomType roomType, const char * nick, unsigned int IP, int profileID, void * param);
-static void playerFlagsChangedCallback(PEER peer, RoomType roomType, const char * nick, int oldFlags, int newFlags, void * param);
-static void listingGamesCallback(PEER peer, PEERBool success, const char * name, SBServer server, PEERBool staging, int msg, Int percentListed, void * param);
-static void roomUTMCallback(PEER peer, RoomType roomType, const char * nick, const char * command, const char * parameters, PEERBool authenticated, void * param);
-static void playerUTMCallback(PEER peer, const char * nick, const char * command, const char * parameters, PEERBool authenticated, void * param);
-static void gameStartedCallback(PEER peer, SBServer server, const char *message, void *param);
-static void globalKeyChangedCallback(PEER peer, const char *nick, const char *key, const char *val, void *param);
-static void roomKeyChangedCallback(PEER peer, RoomType roomType, const char *nick, const char *key, const char *val, void *param);
-
-// convenience function to set buddy status
-static void updateBuddyStatus( GameSpyBuddyStatus status, Int groupRoom = 0, std::string gameName = "" )
-{
-	if (!TheGameSpyBuddyMessageQueue)
-		return;
-
-	BuddyRequest req;
-	req.buddyRequestType = BuddyRequest::BUDDYREQUEST_SETSTATUS;
-	switch(status)
-	{
-		case BUDDY_OFFLINE:
-			req.arg.status.status = GP_OFFLINE;
-			strcpy(req.arg.status.statusString, "Offline");
-			strcpy(req.arg.status.locationString, "");
-			break;
-		case BUDDY_ONLINE:
-			req.arg.status.status = GP_ONLINE;
-			strcpy(req.arg.status.statusString, "Online");
-			strcpy(req.arg.status.locationString, "");
-			break;
-		case BUDDY_LOBBY:
-			req.arg.status.status = GP_CHATTING;
-			strcpy(req.arg.status.statusString, "Chatting");
-			sprintf(req.arg.status.locationString, "%d", groupRoom);
-			break;
-		case BUDDY_STAGING:
-			req.arg.status.status = GP_STAGING;
-			strcpy(req.arg.status.statusString, "Staging");
-			sprintf(req.arg.status.locationString, "%s", gameName.c_str());
-			break;
-		case BUDDY_LOADING:
-			req.arg.status.status = GP_PLAYING;
-			strcpy(req.arg.status.statusString, "Loading");
-			sprintf(req.arg.status.locationString, "%s", gameName.c_str());
-			break;
-		case BUDDY_PLAYING:
-			req.arg.status.status = GP_PLAYING;
-			strcpy(req.arg.status.statusString, "Playing");
-			sprintf(req.arg.status.locationString, "%s", gameName.c_str());
-			break;
-		case BUDDY_MATCHING:
-			req.arg.status.status = GP_ONLINE;
-			strcpy(req.arg.status.statusString, "Matching");
-			strcpy(req.arg.status.locationString, "");
-			break;
-	}
-	DEBUG_LOG(("updateBuddyStatus %d:%s\n", req.arg.status.status, req.arg.status.statusString));
-	TheGameSpyBuddyMessageQueue->addRequest(req);
-}
-
-static void createRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomType roomType, void *param)
-{
-	Int *s = (Int *)param;
-	if (s)
-		*s = result;
-}
-
-static const char * KeyTypeToString(qr2_key_type type)
-{
-	switch(type)
-	{
-	case key_server:
-		return "server";
-	case key_player:
-		return "player";
-	case key_team:
-		return "team";
-	}
-
-	return "Unkown key type";
-}
-
-static const char * ErrorTypeToString(qr2_error_t error)
-{
-	switch(error)
-	{
-	case e_qrnoerror:
-		return "noerror";
-	case e_qrwsockerror:
-		return "wsockerror";
-	case e_qrbinderror:
-		return "rbinderror";
-	case e_qrdnserror:
-		return "dnserror";
-	case e_qrconnerror:
-		return "connerror";
-	}
-
-	return "Unknown error type";
-}
-
-static void QRServerKeyCallback
-(
-	PEER peer,
-	int key,
-	qr2_buffer_t buffer,
-	void * param
-)
-{
-	//DEBUG_LOG(("QR_SERVER_KEY | %d (%s)\n", key, qr2_registered_key_list[key]));
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-	{
-		DEBUG_LOG(("QRServerKeyCallback: bailing because of no thread info\n"));
-		return;
-	}
-
-	if (!t->isHosting())
-		t->stopHostingAlready(peer);
-
-#ifdef DEBUG_LOGGING
-	AsciiString val = "";
-#define ADD(x) { qr2_buffer_add(buffer, x); val = x; }
-#define ADDINT(x) { qr2_buffer_add_int(buffer, x); val.format("%d",x); }
-#else
-#define ADD(x) { qr2_buffer_add(buffer, x); }
-#define ADDINT(x) { qr2_buffer_add_int(buffer, x); }
-#endif
-
-	switch(key)
-	{
-	case HOSTNAME_KEY:
-		ADD(t->getPlayerName(0).c_str());
-		break;
-	case GAMEVER_KEY:
-		ADDINT(t->gameVersion());
-		break;
-	case EXECRC_KEY:
-		ADDINT(t->exeCRC());
-		break;
-	case INICRC_KEY:
-		ADDINT(t->iniCRC());
-		break;
-	case GAMENAME_KEY:
-		{
-			std::string tmp = t->getPlayerName(0);
-			tmp.append(" ");
-			tmp.append(WideCharStringToMultiByte(t->getLocalStagingServerName().c_str()));
-			ADD(tmp.c_str());
-		}
-		break;
-	case MAPNAME_KEY:
-		ADD(t->getMapName().c_str());
-		break;
-	case PW_KEY:
-		ADDINT(t->hasPassword());
-		break;
-	case OBS_KEY:
-		ADDINT(t->allowObservers());
-		break;
-	case LADIP_KEY:
-		ADD(t->ladderIP().c_str());
-		break;
-	case LADPORT_KEY:
-		ADDINT(t->ladderPort());
-		break;
-	case PINGSTR_KEY:
-		ADD(t->pingStr().c_str());
-		break;
-	case NUMPLAYER_KEY:
-		ADDINT(t->getNumPlayers());
-		break;
-	case MAXPLAYER_KEY:
-		ADDINT(t->getMaxPlayers());
-		break;
-	case NUMOBS_KEY:
-		ADDINT(t->getNumObservers());
-		break;
-	default:
-		ADD("");
-		//DEBUG_LOG(("QR_SERVER_KEY | %d (%s)\n", key, qr2_registered_key_list[key]));
-		break;
-	}
-
-	DEBUG_LOG(("QR_SERVER_KEY | %d (%s) = [%s]\n", key, qr2_registered_key_list[key], val.str()));
-}
-
-static void QRPlayerKeyCallback
-(
-	PEER peer,
-	int key,
-	int index,
-	qr2_buffer_t buffer,
-	void * param
-)
-{
-	//DEBUG_LOG(("QR_PLAYER_KEY | %d | %d (%s)\n", key, index, qr2_registered_key_list[key]));
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-	{
-		DEBUG_LOG(("QRPlayerKeyCallback: bailing because of no thread info\n"));
-		return;
-	}
-
-	if (!t->isHosting())
-		t->stopHostingAlready(peer);
-
-#undef ADD
-#undef ADDINT
-#ifdef DEBUG_LOGGING
-	AsciiString val = "";
-#define ADD(x) { qr2_buffer_add(buffer, x); val = x; }
-#define ADDINT(x) { qr2_buffer_add_int(buffer, x); val.format("%d",x); }
-#else
-#define ADD(x) { qr2_buffer_add(buffer, x); }
-#define ADDINT(x) { qr2_buffer_add_int(buffer, x); }
-#endif
-
-	switch(key)
-	{
-	case NAME__KEY:
-		ADD(t->getPlayerName(index).c_str());
-		break;
-	case WINS__KEY:
-		ADDINT(t->getPlayerWins(index));
-		break;
-	case LOSSES__KEY:
-		ADDINT(t->getPlayerLosses(index));
-		break;
-	case PID__KEY:
-		ADDINT(t->getPlayerProfileID(index));
-		break;
-	case FACTION__KEY:
-		ADDINT(t->getPlayerLosses(index));
-		break;
-	case COLOR__KEY:
-		ADDINT(t->getPlayerLosses(index));
-		break;
-	default:
-		ADD("");
-		//DEBUG_LOG(("QR_PLAYER_KEY | %d | %d (%s)\n", key, index, qr2_registered_key_list[key]));
-		break;
-	}
-
-	DEBUG_LOG(("QR_PLAYER_KEY | %d | %d (%s) = [%s]\n", key, index, qr2_registered_key_list[key], val.str()));
-}
-
-static void QRTeamKeyCallback
-(
-	PEER peer,
-	int key,
-	int index,
-	qr2_buffer_t buffer,
-	void * param
-)
-{
-	//DEBUG_LOG(("QR_TEAM_KEY | %d | %d\n", key, index));
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-	{
-		DEBUG_LOG(("QRTeamKeyCallback: bailing because of no thread info\n"));
-		return;
-	}
-	if (!t->isHosting())
-		t->stopHostingAlready(peer);
-
-	// we don't report teams, so this shouldn't get called
-	qr2_buffer_add(buffer, "");
-}
-
-static void QRKeyListCallback
-(
-	PEER peer,
-	qr2_key_type type,
-	qr2_keybuffer_t keyBuffer,
-	void * param
-)
-{
-	DEBUG_LOG(("QR_KEY_LIST | %s\n", KeyTypeToString(type)));
-
-	/*
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-	{
-		DEBUG_LOG(("QRKeyListCallback: bailing because of no thread info\n"));
-		return;
-	}
-	if (!t->isHosting())
-		t->stopHostingAlready(peer);
-		*/
-
-	// register the keys we use
-	switch(type)
-	{
-	case key_server:
-		qr2_keybuffer_add(keyBuffer, HOSTNAME_KEY);
-		qr2_keybuffer_add(keyBuffer, GAMEVER_KEY);
-		//qr2_keybuffer_add(keyBuffer, GAMENAME_KEY);
-		qr2_keybuffer_add(keyBuffer, MAPNAME_KEY);
-		qr2_keybuffer_add(keyBuffer, EXECRC_KEY);
-		qr2_keybuffer_add(keyBuffer, INICRC_KEY);
-		qr2_keybuffer_add(keyBuffer, PW_KEY);
-		qr2_keybuffer_add(keyBuffer, OBS_KEY);
-		qr2_keybuffer_add(keyBuffer, LADIP_KEY);
-		qr2_keybuffer_add(keyBuffer, LADPORT_KEY);
-		qr2_keybuffer_add(keyBuffer, PINGSTR_KEY);
-		qr2_keybuffer_add(keyBuffer, NUMPLAYER_KEY);
-		qr2_keybuffer_add(keyBuffer, MAXPLAYER_KEY);
-		qr2_keybuffer_add(keyBuffer, NUMOBS_KEY);
-		break;
-	case key_player:
-		qr2_keybuffer_add(keyBuffer, NAME__KEY);
-		qr2_keybuffer_add(keyBuffer, WINS__KEY);
-		qr2_keybuffer_add(keyBuffer, LOSSES__KEY);
-		qr2_keybuffer_add(keyBuffer, PID__KEY);
-		qr2_keybuffer_add(keyBuffer, FACTION__KEY);
-		qr2_keybuffer_add(keyBuffer, COLOR__KEY);
-		break;
-	case key_team:
-		// no custom team keys
-		break;
-	}
-}
-
-static int QRCountCallback
-(
-	PEER peer,
-	qr2_key_type type,
-	void * param
-)
-{
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-	{
-		DEBUG_LOG(("QRCountCallback: bailing because of no thread info\n"));
-		return 0;
-	}
-	if (!t->isHosting())
-		t->stopHostingAlready(peer);
-
-	if(type == key_player)
-	{
-		DEBUG_LOG(("QR_COUNT | %s = %d\n", KeyTypeToString(type), t->getNumPlayers() + t->getNumObservers()));
-		return t->getNumPlayers() + t->getNumObservers();
-	}
-	else if(type == key_team)
-	{
-		DEBUG_LOG(("QR_COUNT | %s = %d\n", KeyTypeToString(type), 0));
-		return 0;
-	}
-
-	DEBUG_LOG(("QR_COUNT | %s = %d\n", KeyTypeToString(type), 0));
-	return 0;
-}
-
-void PeerThreadClass::stopHostingAlready(PEER peer)
-{
-	isThreadHosting = 0; // debugging
-	s_lastStateChangedHeartbeat = 0;
-	s_wantStateChangedHeartbeat = FALSE;
-	peerStopGame(peer);
-	if (qr2Sock != INVALID_SOCKET)
-	{
-		closesocket(qr2Sock);
-		qr2Sock = INVALID_SOCKET;
-	}
-}
-
-static void QRAddErrorCallback
-(
-	PEER peer,
-	qr2_error_t error,
-	char * errorString,
-	void * param
-)
-{
-	DEBUG_LOG(("QR_ADD_ERROR | %s | %s\n", ErrorTypeToString(error), errorString));
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_FAILEDTOHOST;
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-static void QRNatNegotiateCallback
-(
-	PEER peer,
-	int cookie,
-	void * param
-)
-{
-	DEBUG_LOG(("QR_NAT_NEGOTIATE | 0x%08X\n", cookie));
-}
-
-static void KickedCallback
-(
-	PEER peer,
-	RoomType roomType,
-	const char * nick,
-	const char * reason,
-	void * param
-)
-{
-	DEBUG_LOG(("Kicked from %d by %s: \"%s\"\n", roomType, nick, reason));
-}
-
-static void NewPlayerListCallback
-(
-	PEER peer,
-	RoomType roomType,
-	void * param
-)
-{
-	DEBUG_LOG(("NewPlayerListCallback\n"));
-}
-
-static void AuthenticateCDKeyCallback
-(
-	PEER peer,
-	int result,
-	const char * message,
-	void * param
-)
-{
-	DEBUG_LOG(("CD Key Result: %s (%d) %X\n", message, result, param));
-#ifdef SERVER_DEBUGGING
-	CheckServers(peer);
-#endif // SERVER_DEBUGGING
-	SerialAuthResult *val = (SerialAuthResult *)param;
-	if (val)
-	{
-		if (result >= 1)
-		{
-			*val = SERIAL_OK;
-		}
-		else
-		{
-			*val = SERIAL_AUTHFAILED;
-		}
-	}
-#ifdef SERVER_DEBUGGING
-	CheckServers(peer);
-#endif // SERVER_DEBUGGING
-}
-
-static SerialAuthResult doCDKeyAuthentication( PEER peer )
-{
-	SerialAuthResult retval = SERIAL_NONEXISTENT;
-	if (!peer)
-		return retval;
-
-	AsciiString s = "";
-	if (GetStringFromRegistry("\\ergc", "", s) && s.isNotEmpty())
-	{
-#ifdef SERVER_DEBUGGING
-		DEBUG_LOG(("Before peerAuthenticateCDKey()\n"));
-		CheckServers(peer);
-#endif // SERVER_DEBUGGING
-		peerAuthenticateCDKey(peer, s.str(), AuthenticateCDKeyCallback, &retval, PEERTrue);
-#ifdef SERVER_DEBUGGING
-		DEBUG_LOG(("After peerAuthenticateCDKey()\n"));
-		CheckServers(peer);
-#endif // SERVER_DEBUGGING
-	}
-	
-	if (retval == SERIAL_OK)
-	{
-		PSRequest req;
-		req.requestType = PSRequest::PSREQUEST_READCDKEYSTATS;
-		req.cdkey = s.str();
-		TheGameSpyPSMessageQueue->addRequest(req);
-	}
-
-	return retval;
-}
-
-#define INBUF_LEN 256
-void checkQR2Queries( PEER peer, SOCKET sock )
-{
-	static char indata[INBUF_LEN];
-	struct sockaddr_in saddr;
-	int saddrlen = sizeof(struct sockaddr_in);
-	fd_set set;
-	struct timeval timeout = {0,0};
-	int error;
-
-	FD_ZERO ( &set );
-	FD_SET ( sock, &set );
-
-	while (1)
-	{
-		error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
-		if (SOCKET_ERROR == error || 0 == error)
-			return;
-		//else we have data
-		error = recvfrom(sock, indata, INBUF_LEN - 1, 0, (struct sockaddr *)&saddr, &saddrlen);
-		if (error != SOCKET_ERROR)
-		{
-			indata[error] = '\0';
-			peerParseQuery( peer, indata, error, (sockaddr *)&saddr );
-		}
-	}
-}
-
-static UnsignedInt localIP = 0;
-
-void PeerThreadClass::Thread_Function()
-{
-	try {
-	_set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
-
-	PEER peer;
-
-	// Setup the callbacks.
-	///////////////////////
-	PEERCallbacks callbacks;
-	memset(&callbacks, 0, sizeof(PEERCallbacks));
-	callbacks.disconnected = disconnectedCallback;
-	//callbacks.readyChanged = readyChangedCallback;
-	callbacks.roomMessage = roomMessageCallback;
-	callbacks.playerMessage = playerMessageCallback;
-	callbacks.gameStarted = gameStartedCallback;
-	callbacks.playerJoined = playerJoinedCallback;
-	callbacks.playerLeft = playerLeftCallback;
-	callbacks.playerChangedNick = playerChangedNickCallback;
-	callbacks.playerFlagsChanged = playerFlagsChangedCallback;
-	callbacks.playerInfo = playerInfoCallback;
-	callbacks.roomUTM = roomUTMCallback;
-	callbacks.playerUTM = playerUTMCallback;
-	callbacks.globalKeyChanged = globalKeyChangedCallback;
-	callbacks.roomKeyChanged = roomKeyChangedCallback;
-
-	callbacks.qrServerKey = QRServerKeyCallback;
-	callbacks.qrPlayerKey = QRPlayerKeyCallback;
-	callbacks.qrTeamKey = QRTeamKeyCallback;
-	callbacks.qrKeyList = QRKeyListCallback;
-	callbacks.qrCount = QRCountCallback;
-	callbacks.qrAddError = QRAddErrorCallback;
-	callbacks.qrNatNegotiateCallback = QRNatNegotiateCallback;
-
-	callbacks.kicked = KickedCallback;
-	callbacks.newPlayerList = NewPlayerListCallback;
-
-	callbacks.param = this;
-
-	m_qmGroupRoom = 0;
-
-	peer = peerInitialize( &callbacks );
-	DEBUG_ASSERTCRASH( peer != NULL, ("NULL peer!") );
-	m_isConnected = m_isConnecting = false;
-
-	qr2_register_key(EXECRC_KEY, EXECRC_STR);
-	qr2_register_key(INICRC_KEY, INICRC_STR);
-	qr2_register_key(PW_KEY, PW_STR);
-	qr2_register_key(OBS_KEY, OBS_STR);
-	qr2_register_key(LADIP_KEY, LADIP_STR);
-	qr2_register_key(LADPORT_KEY, LADPORT_STR);
-	qr2_register_key(PINGSTR_KEY, PINGSTR_STR);
-	qr2_register_key(NUMOBS_KEY, NUMOBS_STR);
-	qr2_register_key(NUMPLAYER_KEY, NUMPLAYER_STR);
-	qr2_register_key(MAXPLAYER_KEY, MAXPLAYER_STR);
-	qr2_register_key(NAME__KEY, NAME__STR "_");
-	qr2_register_key(WINS__KEY, WINS__STR "_");
-	qr2_register_key(LOSSES__KEY, LOSSES__STR "_");
-	qr2_register_key(FACTION__KEY, FACTION__STR "_");
-	qr2_register_key(COLOR__KEY, COLOR__STR "_");
-
-	const Int NumKeys = 14;
-	unsigned char allKeysArray[NumKeys] = {
-		/*
-		PID__KEY,
-		NAME__KEY,
-		WINS__KEY,
-		LOSSES__KEY,
-		FACTION__KEY,
-		COLOR__KEY,
-		*/
-		MAPNAME_KEY,
-		GAMEVER_KEY,
-		GAMENAME_KEY,
-		EXECRC_KEY,
-		INICRC_KEY,
-		PW_KEY,
-		OBS_KEY,
-		LADIP_KEY,
-		LADPORT_KEY,
-		PINGSTR_KEY,
-		NUMOBS_KEY,
-		NUMPLAYER_KEY,
-		MAXPLAYER_KEY,
-		HOSTNAME_KEY
-	};
-
-	/*
-	const char *allKeys = "\\pid_\\mapname\\gamever\\gamename" \
-		"\\" EXECRC_STR "\\" INICRC_STR \
-		"\\" PW_STR "\\" OBS_STR "\\" LADIP_STR "\\" LADPORT_STR \
-		"\\" PINGSTR_STR "\\" NUMOBS_STR \
-		"\\" NUMPLAYER_STR "\\" MAXPLAYER_STR \
-		"\\" NAME__STR "_" "\\" WINS__STR "_" "\\" LOSSES__STR "_" "\\" FACTION__STR "_" "\\" COLOR__STR "_";
-	*/
-
-	const char * key = "username";
-	peerSetRoomWatchKeys(peer, StagingRoom, 1, &key, PEERTrue);
-	peerSetRoomWatchKeys(peer, GroupRoom, 1, &key, PEERTrue);
-
-	m_localRoomID = 0;
-	m_localStagingServerName = L"";
-
-	m_qmStatus = QM_IDLE;
-
-	// Setup which rooms to do pings and cross-pings in.
-	////////////////////////////////////////////////////
-	PEERBool pingRooms[NumRooms];
-	PEERBool crossPingRooms[NumRooms];
-	pingRooms[TitleRoom] = PEERFalse;
-	pingRooms[GroupRoom] = PEERFalse;
-	pingRooms[StagingRoom] = PEERFalse;
-	crossPingRooms[TitleRoom] = PEERFalse;
-	crossPingRooms[GroupRoom] = PEERFalse;
-	crossPingRooms[StagingRoom] = PEERFalse;
-	
-	/*********
-	First step, set our game authentication info
-	We could do:
-		strcpy(gcd_gamename,"ccgenerals");
-		strcpy(gcd_secret_key,"h5T2f6");
-	or
-		strcpy(gcd_gamename,"ccgeneralsb");
-		strcpy(gcd_secret_key,"g3T9s2");
-	...but this is more secure:
-	**********/
-	char gameName[12];
-	char secretKey[7];
-	/**
-	gameName[0]='c';gameName[1]='c';gameName[2]='g';gameName[3]='e';
-	gameName[4]='n';gameName[5]='e';gameName[6]='r';gameName[7]='a';
-	gameName[8]='l';gameName[9]='s';gameName[10]='b';gameName[11]='\0';
-	secretKey[0]='g';secretKey[1]='3';secretKey[2]='T';secretKey[3]='9';
-	secretKey[4]='s';secretKey[5]='2';secretKey[6]='\0';
-	/**/
-	gameName[0]='c';gameName[1]='c';gameName[2]='g';gameName[3]='e';
-	gameName[4]='n';gameName[5]='e';gameName[6]='r';gameName[7]='a';
-	gameName[8]='l';gameName[9]='s';gameName[10]='\0';
-	secretKey[0]='h';secretKey[1]='5';secretKey[2]='T';secretKey[3]='2';
-	secretKey[4]='f';secretKey[5]='6';secretKey[6]='\0';
-	/**/
-
-	// Set the title.
-	/////////////////
-	if(!peerSetTitle( peer , gameName, secretKey, gameName, secretKey, GetRegistryVersion(), 30, PEERTrue, pingRooms, crossPingRooms))
-	{
-		DEBUG_CRASH(("Error setting title"));
-		peerShutdown( peer );
-		peer = NULL;
-		return;
-	}
-
-	OptionPreferences pref;
-	UnsignedInt preferredIP = INADDR_ANY;
-	UnsignedInt selectedIP = pref.getOnlineIPAddress();
-	DEBUG_LOG(("Looking for IP %X\n", selectedIP));
-	IPEnumeration IPs;
-	EnumeratedIP *IPlist = IPs.getAddresses();
-	while (IPlist)
-	{
-		DEBUG_LOG(("Looking at IP %s\n", IPlist->getIPstring().str()));
-		if (selectedIP == IPlist->getIP())
-		{
-			preferredIP = IPlist->getIP();
-			DEBUG_LOG(("Connecting to GameSpy chat server via IP address %8.8X\n", preferredIP));
-			break;
-		}
-		IPlist = IPlist->getNext();
-	}
-	chatSetLocalIP(preferredIP);
-
-	UnsignedInt preferredQRPort = 0;
-	AsciiString selectedQRPort = pref["GameSpyQRPort"];
-	if (selectedQRPort.isNotEmpty())
-	{
-		preferredQRPort = atoi(selectedQRPort.str());
-	}
-
-	PeerRequest incomingRequest;
-	while ( running )
-	{
-		// deal with requests
-		if (TheGameSpyPeerMessageQueue->getRequest(incomingRequest))
-		{
-			DEBUG_LOG(("TheGameSpyPeerMessageQueue->getRequest() got request of type %d\n", incomingRequest.peerRequestType));
-			switch (incomingRequest.peerRequestType)
-			{
-			case PeerRequest::PEERREQUEST_LOGIN:
-				{
-				m_isConnecting = true;
-				m_originalName = incomingRequest.nick;
-				m_loginName = incomingRequest.nick;
-				m_profileID = incomingRequest.login.profileID;
-				m_password = incomingRequest.password;
-				m_email = incomingRequest.email;
-				peerConnect( peer, incomingRequest.nick.c_str(), incomingRequest.login.profileID, nickErrorCallbackWrapper, connectCallbackWrapper, this, PEERTrue );
-#ifdef SERVER_DEBUGGING
-				DEBUG_LOG(("After peerConnect()\n"));
-				CheckServers(peer);
-#endif // SERVER_DEBUGGING
-				if (m_isConnected)
-				{
-					SerialAuthResult ret = doCDKeyAuthentication( peer );
-					if (ret != SERIAL_OK)
-					{
-						m_isConnecting = m_isConnected = false;
-						MESSAGE_QUEUE->setSerialAuthResult( ret );
-						peerDisconnect( peer );
-					}
-				}
-				m_isConnecting = false;
-
-				// check our connection
-				//if (m_isConnected)
-				//{
-				//	GetLocalChatConnectionAddress("peerchat.gamespy.com", 6667, localIP);
-				//}
-				}
-
-				break;
-
-			case PeerRequest::PEERREQUEST_LOGOUT:
-				m_isConnecting = m_isConnected = false;
-				peerDisconnect( peer );
-				break;
-
-			case PeerRequest::PEERREQUEST_JOINGROUPROOM:
-				m_groupRoomID = incomingRequest.groupRoom.id;
-				isThreadHosting = 0; // debugging
-				s_lastStateChangedHeartbeat = 0;
-				s_wantStateChangedHeartbeat = FALSE;
-				peerStopGame( peer );
-				peerLeaveRoom( peer, GroupRoom, NULL );
-				peerLeaveRoom( peer, StagingRoom, NULL );
-				if (qr2Sock != INVALID_SOCKET)
-				{
-					closesocket(qr2Sock);
-					qr2Sock = INVALID_SOCKET;
-				}
-				m_isHosting = false;
-				m_localRoomID = m_groupRoomID;
-				DEBUG_LOG(("Requesting to join room %d in thread %X\n", m_localRoomID, this));
-				peerJoinGroupRoom( peer, incomingRequest.groupRoom.id, joinRoomCallback, (void *)this, PEERTrue );
-				break;
-
-			case PeerRequest::PEERREQUEST_LEAVEGROUPROOM:
-				m_groupRoomID = 0;
-				updateBuddyStatus( BUDDY_ONLINE );
-				peerLeaveRoom( peer, GroupRoom, NULL );
-				peerLeaveRoom( peer, StagingRoom, NULL ); m_isHosting = false;
-				break;
-
-			case PeerRequest::PEERREQUEST_JOINSTAGINGROOM:
-				{
-					m_groupRoomID = 0;
-					updateBuddyStatus( BUDDY_ONLINE );
-					peerLeaveRoom( peer, GroupRoom, NULL );
-					peerLeaveRoom( peer, StagingRoom, NULL ); m_isHosting = false;
-					SBServer server = findServerByID(incomingRequest.stagingRoom.id);
-					m_localStagingServerName = incomingRequest.text;
-					DEBUG_LOG(("Setting m_localStagingServerName to [%ls]\n", m_localStagingServerName.c_str()));
-					m_localRoomID = incomingRequest.stagingRoom.id;
-					DEBUG_LOG(("Requesting to join room %d\n", m_localRoomID));
-					if (server)
-					{
-						peerJoinStagingRoom( peer, server, incomingRequest.password.c_str(), joinRoomCallback, (void *)this, PEERTrue );
-					}
-					else
-					{
-						PeerResponse resp;
-						resp.peerResponseType = PeerResponse::PEERRESPONSE_JOINSTAGINGROOM;
-						resp.joinStagingRoom.id = incomingRequest.stagingRoom.id;
-						resp.joinStagingRoom.ok = FALSE;
-						resp.joinStagingRoom.result = PEERJoinFailed;
-						TheGameSpyPeerMessageQueue->addResponse(resp);
-					}
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_LEAVESTAGINGROOM:
-				m_groupRoomID = 0;
-				updateBuddyStatus( BUDDY_ONLINE );
-				peerLeaveRoom( peer, GroupRoom, NULL );
-				peerLeaveRoom( peer, StagingRoom, NULL );
-				isThreadHosting = 0; // debugging
-				s_lastStateChangedHeartbeat = 0;
-				s_wantStateChangedHeartbeat = FALSE;
-				if (m_isHosting)
-				{
-					peerStopGame( peer );
-					if (qr2Sock != INVALID_SOCKET)
-					{
-						closesocket(qr2Sock);
-						qr2Sock = INVALID_SOCKET;
-					}
-					m_isHosting = false;
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_MESSAGEPLAYER:
-				{
-					std::string s = WideCharStringToMultiByte(incomingRequest.text.c_str());
-					peerMessagePlayer( peer, incomingRequest.nick.c_str(), s.c_str(), (incomingRequest.message.isAction)?ActionMessage:NormalMessage );
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_MESSAGEROOM:
-				{
-					std::string s = WideCharStringToMultiByte(incomingRequest.text.c_str());
-					peerMessageRoom( peer, (m_groupRoomID)?GroupRoom:StagingRoom, s.c_str(), (incomingRequest.message.isAction)?ActionMessage:NormalMessage );
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_PUSHSTATS:
-				{
-					DEBUG_LOG(("PEERREQUEST_PUSHSTATS: stats are %d,%d,%d,%d,%d,%d\n",
-						incomingRequest.statsToPush.locale, incomingRequest.statsToPush.wins, incomingRequest.statsToPush.losses, incomingRequest.statsToPush.rankPoints, incomingRequest.statsToPush.side, incomingRequest.statsToPush.preorder));
-
-					// Testing alternate way to push stats
-#ifdef USE_BROADCAST_KEYS
-					snprintf(s_valueBuffers[0], 20, "%d", incomingRequest.statsToPush.locale);
-					snprintf(s_valueBuffers[1], 20, "%d", incomingRequest.statsToPush.wins);
-					snprintf(s_valueBuffers[2], 20, "%d", incomingRequest.statsToPush.losses);
-					snprintf(s_valueBuffers[3], 20, "%d", incomingRequest.statsToPush.rankPoints);
-					snprintf(s_valueBuffers[4], 20, "%d", incomingRequest.statsToPush.side);
-					snprintf(s_valueBuffers[5], 20, "%d", incomingRequest.statsToPush.preorder);
-					pushStatsToRoom(peer);
-#else
-					const char *keys[6] = { "locale", "wins", "losses", "points", "side", "pre" };
-					char valueStrings[6][20];
-					char *values[6] = { valueStrings[0], valueStrings[1], valueStrings[2],
-						valueStrings[3], valueStrings[4], valueStrings[5]};
-					snprintf(values[0], 20, "%d", incomingRequest.statsToPush.locale);
-					snprintf(values[1], 20, "%d", incomingRequest.statsToPush.wins);
-					snprintf(values[2], 20, "%d", incomingRequest.statsToPush.losses);
-					snprintf(values[3], 20, "%d", incomingRequest.statsToPush.rankPoints);
-					snprintf(values[4], 20, "%d", incomingRequest.statsToPush.side);
-					snprintf(values[5], 20, "%d", incomingRequest.statsToPush.preorder);
-					peerSetGlobalKeys(peer, 6, (const char **)keys, (const char **)values);
-					peerSetGlobalWatchKeys(peer, GroupRoom,   0, NULL, PEERFalse);
-					peerSetGlobalWatchKeys(peer, StagingRoom, 0, NULL, PEERFalse);
-					peerSetGlobalWatchKeys(peer, GroupRoom,   6, keys, PEERTrue);
-					peerSetGlobalWatchKeys(peer, StagingRoom, 6, keys, PEERTrue);
-#endif
-				}
-				break;
-				
-			case PeerRequest::PEERREQUEST_SETGAMEOPTIONS:
-				{
-					m_mapName = incomingRequest.gameOptsMapName;
-					m_numPlayers = incomingRequest.gameOptions.numPlayers;
-					m_numObservers = incomingRequest.gameOptions.numObservers;
-					m_maxPlayers = incomingRequest.gameOptions.maxPlayers;
-					DEBUG_LOG(("peerStateChanged(): Marking game options state as changed - %d players, %d observers\n", m_numPlayers, m_numObservers));
-					for (Int i=0; i<MAX_SLOTS; ++i)
-					{
-						m_playerNames[i] = incomingRequest.gameOptsPlayerNames[i];
-						m_playerWins[i] = incomingRequest.gameOptions.wins[i];
-						m_playerLosses[i] = incomingRequest.gameOptions.losses[i];
-						m_playerProfileID[i] = incomingRequest.gameOptions.profileID[i];
-						m_playerFactions[i] = incomingRequest.gameOptions.faction[i];
-						m_playerColors[i] = incomingRequest.gameOptions.color[i];
-					}
-
-					s_wantStateChangedHeartbeat = TRUE;
-
-					/*
-					peerStateChanged( peer );
-
-#ifdef DEBUG_LOGGING
-					static UnsignedInt prev = 0;
-					UnsignedInt now = timeGetTime();
-					UnsignedInt diff = now - prev;
-					prev = now;
-#endif
-					STATECHANGED_LOG(("peerStateChanged() at time %d (difference of %d ms)\n", now, diff));
-					*/
-
-					peerUTMRoom( peer, StagingRoom, "SL/", incomingRequest.options.c_str(), PEERFalse ); // send the full string to people in the room
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_GETEXTENDEDSTAGINGROOMINFO:
-				{
-					SBServer server = findServerByID( incomingRequest.stagingRoom.id );
-					if (server)
-					{
-						DEBUG_LOG(("Requesting full update on a game\n"));
-						peerUpdateGame( peer, server, PEERTrue );
-					}
-					else
-					{
-						DEBUG_LOG(("Tried to update non-existent server!\n"));
-					}
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_CREATESTAGINGROOM:
-				{
-					Int oldGroupID = m_groupRoomID;
-					m_groupRoomID = 0;
-					updateBuddyStatus( BUDDY_ONLINE );
-					if (!incomingRequest.stagingRoomCreation.restrictGameList)
-					{
-						peerLeaveRoom( peer, GroupRoom, NULL );
-						peerLeaveRoom( peer, StagingRoom, NULL );
-					}
-					m_isHosting = TRUE;
-
-					Int res = PEERJoinFailed;
-					if (qr2Sock == INVALID_SOCKET)
-					{
-						// allocate a port
-						if (preferredQRPort < 1024)
-						{
-							preferredQRPort = 6500 + (ntohl(localIP) & 0xff);
-						}
-						DEBUG_LOG(("Using %8.8X:%d for QR2\n", ntohl(localIP), preferredQRPort));
-					}
-					else
-					{
-						closesocket(qr2Sock);
-						qr2Sock = INVALID_SOCKET;
-					}
-					qr2Sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-					struct sockaddr_in saddr;
-					saddr.sin_port=htons(preferredQRPort);
-					saddr.sin_addr.s_addr=localIP;
-					saddr.sin_family=AF_INET;
-					if (bind(qr2Sock, (sockaddr *)&saddr, sizeof(saddr)) != 0)
-					{
-						DEBUG_LOG(("Could not bind to %d!  Falling back to GameSpy's default port\n", preferredQRPort));
-						closesocket(qr2Sock);
-						qr2Sock = INVALID_SOCKET;
-						preferredQRPort = 0;
-					}
-					std::string compositeGame = m_loginName;
-					compositeGame.append(" ");
-					compositeGame.append(WideCharStringToMultiByte(incomingRequest.text.c_str()));
-					m_localStagingServerName = incomingRequest.text;
-					m_playerNames[0] = m_loginName;
-					peerCreateStagingRoomWithSocket(peer, compositeGame.c_str(), MAX_SLOTS, incomingRequest.password.c_str(), qr2Sock, preferredQRPort, createRoomCallback, (void *)&res, PEERTrue);
-					//peerCreateStagingRoomWithSocket(peer, WideCharStringToMultiByte(incomingRequest.text.c_str()).c_str(), MAX_SLOTS, incomingRequest.password.c_str(), qr2Sock, preferredQRPort, createRoomCallback, (void *)&res, PEERTrue);
-					DEBUG_LOG(("PEERREQUEST_CREATESTAGINGROOM - creating staging room, name is %ls, passwd is %s, result = %d\n",
-						incomingRequest.text.c_str(), incomingRequest.password.c_str(), res));
-
-					PeerResponse resp;
-					resp.peerResponseType = PeerResponse::PEERRESPONSE_CREATESTAGINGROOM;
-					resp.createStagingRoom.result = res;
-					TheGameSpyPeerMessageQueue->addResponse(resp);
-
-					if (res != PEERJoinSuccess && res != PEERAlreadyInRoom)
-					{
-						m_localRoomID = oldGroupID;
-						DEBUG_LOG(("Requesting to join room %d\n", m_localRoomID));
-						if (incomingRequest.stagingRoomCreation.restrictGameList)
-						{
-							peerLeaveRoom( peer, StagingRoom, NULL );
-						}
-						else
-						{
-							peerJoinGroupRoom( peer, oldGroupID, joinRoomCallback, (void *)this, PEERTrue );
-						}
-						m_isHosting = FALSE;
-						m_localStagingServerName = L"";
-						m_playerNames[0] = "";
-					}
-					else
-					{
-						if (incomingRequest.stagingRoomCreation.restrictGameList)
-						{
-							peerLeaveRoom( peer, GroupRoom, NULL );
-						}
-						isThreadHosting = 1; // debugging
-						s_lastStateChangedHeartbeat = timeGetTime(); // wait the full interval before updating state
-						s_wantStateChangedHeartbeat = FALSE;
-						m_isHosting = TRUE;
-						m_allowObservers = incomingRequest.stagingRoomCreation.allowObservers;
-						m_mapName = "";
-						for (Int i=0; i<MAX_SLOTS; ++i)
-						{
-							m_playerNames[i] = "";
-							m_playerWins[i] = 0;
-							m_playerLosses[i] = 0;
-							m_playerProfileID[i] = 0;
-							m_playerFactions[i] = 0;
-							m_playerColors[i] = 0;
-						}
-						if (incomingRequest.password.length() > 0)
-							m_hasPassword = true;
-						else
-							m_hasPassword = false;
-						m_playerNames[0] = m_loginName;
-						m_exeCRC = incomingRequest.stagingRoomCreation.exeCRC;
-						m_iniCRC = incomingRequest.stagingRoomCreation.iniCRC;
-						m_gameVersion = incomingRequest.stagingRoomCreation.gameVersion;
-						m_localStagingServerName = incomingRequest.text;
-						m_ladderIP = incomingRequest.ladderIP;
-						m_pingStr = incomingRequest.hostPingStr;
-						m_ladderPort = incomingRequest.stagingRoomCreation.ladPort;
-
-#ifdef USE_BROADCAST_KEYS
-						pushStatsToRoom(peer);
-#endif // USE_BROADCAST_KEYS
-
-						DEBUG_LOG(("Setting m_localStagingServerName to [%ls]\n", m_localStagingServerName.c_str()));
-						updateBuddyStatus( BUDDY_STAGING, 0, WideCharStringToMultiByte(m_localStagingServerName.c_str()) );
-					}
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_STARTGAMELIST:
-				{
-					m_sawCompleteGameList = FALSE;
-					PeerResponse resp;
-					resp.peerResponseType = PeerResponse::PEERRESPONSE_STAGINGROOM;
-					resp.stagingRoom.action = PEER_CLEAR;
-					resp.stagingRoom.isStaging = TRUE;
-					resp.stagingRoom.percentComplete = 0;
-					clearServers();
-					TheGameSpyPeerMessageQueue->addResponse(resp);
-					peerStartListingGames( peer, allKeysArray, NumKeys, (incomingRequest.gameList.restrictGameList?"~":NULL), listingGamesCallback, this );
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_STOPGAMELIST:
-				{
-					peerStopListingGames( peer );
-				}
-				break;
-				
-			case PeerRequest::PEERREQUEST_STARTGAME:
-				{
-					peerStartGame( peer, NULL, PEER_STOP_REPORTING);
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_UTMPLAYER:
-				{
-					if (incomingRequest.nick.length() > 0)
-					{
-						peerUTMPlayer( peer, incomingRequest.nick.c_str(), incomingRequest.id.c_str(), incomingRequest.options.c_str(), PEERFalse );
-					}
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_UTMROOM:
-				{
-					peerUTMRoom( peer, (incomingRequest.UTM.isStagingRoom)?StagingRoom:GroupRoom, incomingRequest.id.c_str(), incomingRequest.options.c_str(), PEERFalse );
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_STARTQUICKMATCH:
-				{
-					m_qmInfo = incomingRequest;
-					doQuickMatch( peer );
-				}
-				break;
-
-			}
-		}
-
-		if (isThreadHosting && s_wantStateChangedHeartbeat)
-		{
-			UnsignedInt now = timeGetTime();
-			if (now > s_lastStateChangedHeartbeat + s_heartbeatInterval)
-			{
-				s_lastStateChangedHeartbeat = now;
-				s_wantStateChangedHeartbeat = FALSE;
-				peerStateChanged( peer );
-
-#ifdef DEBUG_LOGGING
-				static UnsignedInt prev = 0;
-				UnsignedInt now = timeGetTime();
-				UnsignedInt diff = now - prev;
-				prev = now;
-#endif
-				STATECHANGED_LOG(("peerStateChanged() at time %d (difference of %d ms)\n", now, diff));
-			}
-		}
-
-		// update the network
-		PEERBool isConnected = PEERTrue;
-		isConnected = peerIsConnected( peer );
-		if ( isConnected == PEERTrue )
-		{
-			if (qr2Sock != INVALID_SOCKET)
-			{
-				// check hosting activity
-				checkQR2Queries( peer, qr2Sock );
-			}
-			peerThink( peer );
-		}
-
-		// end our timeslice
-		Switch_Thread();
-	}
-
-	DEBUG_LOG(("voluntarily ending peer thread %d\n", running));
-	peerShutdown( peer );
-
-	} catch ( ... ) {
-		DEBUG_CRASH(("Exception in peer thread!"));
-
-		try {
-			PeerResponse resp;
-			resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
-			resp.discon.reason = DISCONNECT_LOSTCON;
-			TheGameSpyPeerMessageQueue->addResponse(resp);
-		}
-		catch (...)
-		{
-		}
-	}
-}
-
-static void qmProfileIDCallback( PEER peer, PEERBool success, const char *nick, int profileID, void *param )
-{
-	Int *i = (Int *)param;
-	if (!i || !success || !nick)
-		return;
-
-	*i = profileID;
-}
-
-static Int matchbotProfileID = 0;
-void quickmatchEnumPlayersCallback( PEER peer, PEERBool success, RoomType roomType, int index, const char * nick, int flags, void * param )
-{
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t || !success || nick == NULL || nick[0] == '\0')
-	{
-		t->sawEndOfEnumPlayers();
-		return;
-	}
-
-	Int id = 0;
-	peerGetPlayerProfileID(peer, nick, qmProfileIDCallback, &id, PEERTrue);
-	DEBUG_LOG(("Saw player %s with id %d (looking for %d)\n", nick, id, matchbotProfileID));
-	if (id == matchbotProfileID)
-	{
-		t->sawMatchbot(nick);
-	}
-
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERJOIN;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-	resp.player.IP = 0;
-
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-void PeerThreadClass::handleQMMatch(PEER peer, Int mapIndex, Int seed,
-																		char *playerName[MAX_SLOTS],
-																		char *playerIP[MAX_SLOTS],
-																		char *playerSide[MAX_SLOTS],
-																		char *playerColor[MAX_SLOTS],
-																		char *playerNAT[MAX_SLOTS])
-{
-	if (m_qmStatus == QM_WORKING)
-	{
-		m_qmStatus = QM_MATCHED;
-		peerLeaveRoom(peer, GroupRoom, "");
-
-		Int i=0;
-		for (; i<MAX_SLOTS; ++i)
-		{
-			if (playerName[i] && stricmp(playerName[i], m_loginName.c_str()))
-			{
-				peerMessagePlayer( peer, playerName[i], "We're matched!", NormalMessage );
-			}
-		}
-
-		PeerResponse resp;
-		resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-		resp.qmStatus.status = QM_MATCHED;
-		for (i=0; i<MAX_SLOTS; ++i)
-		{
-			if (playerName[i])
-			{
-				resp.stagingRoomPlayerNames[i] = playerName[i];
-				resp.qmStatus.IP[i] = atoi(playerIP[i]);
-				resp.qmStatus.side[i] = atoi(playerSide[i]);
-				resp.qmStatus.color[i] = atoi(playerColor[i]);
-				resp.qmStatus.nat[i] = atoi(playerNAT[i]);
-			}
-			else
-			{
-				resp.stagingRoomPlayerNames[i] = "";
-				resp.qmStatus.IP[i] = 0;
-				resp.qmStatus.side[i] = 0;
-				resp.qmStatus.color[i] = 0;
-				resp.qmStatus.nat[i] = 0;
-			}
-		}
-		resp.qmStatus.seed = seed;
-		resp.qmStatus.mapIdx = mapIndex;
-		TheGameSpyPeerMessageQueue->addResponse(resp);
-	}
-}
-
-void PeerThreadClass::doQuickMatch( PEER peer )
-{
-	m_qmStatus = QM_JOININGQMCHANNEL;
-	Bool done = false;
-	matchbotProfileID = m_qmInfo.QM.botID;
-	setQMGroupRoom( m_qmInfo.QM.roomID );
-	m_sawMatchbot = false;
-	updateBuddyStatus( BUDDY_MATCHING );
-	while (!done && running)
-	{
-		if (!peerIsConnected( peer ))
-		{
-			done = true;
-		}
-		else
-		{
-			// update the network
-			peerThink( peer );
-
-			// end our timeslice
-			Switch_Thread();
-
-			PeerRequest incomingRequest;
-			if (TheGameSpyPeerMessageQueue->getRequest(incomingRequest))
-			{
-				switch (incomingRequest.peerRequestType)
-				{
-				case PeerRequest::PEERREQUEST_WIDENQUICKMATCHSEARCH:
-					{
-						if (m_qmStatus != QM_IDLE && m_qmStatus != QM_STOPPED && m_sawMatchbot)
-						{
-							peerMessagePlayer( peer, m_matchbotName.c_str(), "\\WIDEN", NormalMessage );
-						}
-					}
-					break;
-				case PeerRequest::PEERREQUEST_STOPQUICKMATCH:
-					{
-						m_qmStatus = QM_STOPPED;
-						peerLeaveRoom(peer, GroupRoom, "");
-						done = true;
-					}
-					break;
-				case PeerRequest::PEERREQUEST_LOGOUT:
-					{
-						m_qmStatus = QM_STOPPED;
-						peerLeaveRoom(peer, GroupRoom, "");
-						done = true;
-					}
-					break;
-				case PeerRequest::PEERREQUEST_LEAVEGROUPROOM:
-					{
-						m_qmStatus = QM_STOPPED;
-						peerLeaveRoom(peer, GroupRoom, "");
-						done = true;
-					}
-					break;
-				case PeerRequest::PEERREQUEST_UTMPLAYER:
-					{
-						peerUTMPlayer( peer, incomingRequest.nick.c_str(), incomingRequest.id.c_str(), incomingRequest.options.c_str(), PEERFalse );
-					}
-					break;
-				default:
-					{
-						DEBUG_CRASH(("Unanticipated request %d to peer thread!", incomingRequest.peerRequestType));
-					}
-					break;
-				}
-			}
-
-			if (!done)
-			{
-				// do the next bit of QM
-				switch (m_qmStatus)
-				{
-				case QM_JOININGQMCHANNEL:
-					{
-						PeerResponse resp;
-						resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-						resp.qmStatus.status = QM_JOININGQMCHANNEL;
-						TheGameSpyPeerMessageQueue->addResponse(resp);
-
-						m_groupRoomID = m_qmGroupRoom;
-						peerLeaveRoom( peer, GroupRoom, NULL );
-						peerLeaveRoom( peer, StagingRoom, NULL ); m_isHosting = false;
-						m_localRoomID = m_groupRoomID;
-						m_roomJoined = false;
-						DEBUG_LOG(("Requesting to join room %d in thread %X\n", m_localRoomID, this));
-						peerJoinGroupRoom( peer, m_localRoomID, joinRoomCallback, (void *)this, PEERTrue );
-						if (m_roomJoined)
-						{
-							resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-							resp.qmStatus.status = QM_LOOKINGFORBOT;
-							TheGameSpyPeerMessageQueue->addResponse(resp);
-
-							m_qmStatus = QM_LOOKINGFORBOT;
-							m_sawMatchbot = false;
-							m_sawEndOfEnumPlayers = false;
-							peerEnumPlayers( peer, GroupRoom, quickmatchEnumPlayersCallback, this );
-						}
-						else
-						{
-							resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-							resp.qmStatus.status = QM_COULDNOTFINDBOT;
-							TheGameSpyPeerMessageQueue->addResponse(resp);
-							done = true;
-							m_qmStatus = QM_STOPPED;
-						}
-					}
-					break;
-				case QM_LOOKINGFORBOT:
-					{
-						if (m_sawEndOfEnumPlayers)
-						{
-							if (m_sawMatchbot)
-							{
-								char buf[64];
-								std::string msg = "\\CINFO";
-								snprintf(buf, 64, "\\Widen\\%d", m_qmInfo.QM.widenTime);
-								msg.append(buf);
-								snprintf(buf, 64, "\\LadID\\%d", m_qmInfo.QM.ladderID);
-								msg.append(buf);
-								snprintf(buf, 64, "\\LadPass\\%d", m_qmInfo.QM.ladderPassCRC);
-								msg.append(buf);
-								snprintf(buf, 64, "\\PointsMin\\%d", m_qmInfo.QM.minPointPercentage);
-								msg.append(buf);
-								snprintf(buf, 64, "\\PointsMax\\%d", m_qmInfo.QM.maxPointPercentage);
-								msg.append(buf);
-								snprintf(buf, 64, "\\Points\\%d", m_qmInfo.QM.points);
-								msg.append(buf);
-								snprintf(buf, 64, "\\Discons\\%d", m_qmInfo.QM.discons);
-								msg.append(buf);
-								snprintf(buf, 64, "\\DisconMax\\%d", m_qmInfo.QM.maxDiscons);
-								msg.append(buf);
-								snprintf(buf, 64, "\\NumPlayers\\%d", m_qmInfo.QM.numPlayers);
-								msg.append(buf);
-								snprintf(buf, 64, "\\Pings\\%s", m_qmInfo.QM.pings);
-								msg.append(buf);
-								snprintf(buf, 64, "\\IP\\%d", ntohl(peerGetLocalIP(peer)));// not ntohl(localIP), as we need EXTERNAL address for proper NAT negotiation!
-								msg.append(buf);
-								snprintf(buf, 64, "\\Side\\%d", m_qmInfo.QM.side);
-								msg.append(buf);
-								snprintf(buf, 64, "\\Color\\%d", m_qmInfo.QM.color);
-								msg.append(buf);
-								snprintf(buf, 64, "\\NAT\\%d", m_qmInfo.QM.NAT);
-								msg.append(buf);
-								snprintf(buf, 64, "\\EXE\\%d", m_qmInfo.QM.exeCRC);
-								msg.append(buf);
-								snprintf(buf, 64, "\\INI\\%d", m_qmInfo.QM.iniCRC);
-								msg.append(buf);
-								buf[0] = 0;
-								msg.append("\\Maps\\");
-								for (size_t i=0; i<m_qmInfo.qmMaps.size(); ++i)
-								{
-									if (m_qmInfo.qmMaps[i])
-										msg.append("1");
-									else
-										msg.append("0");
-								}
-								DEBUG_LOG(("Sending QM options of [%s] to %s\n", msg.c_str(), m_matchbotName.c_str()));
-								peerMessagePlayer( peer, m_matchbotName.c_str(), msg.c_str(), NormalMessage );
-								m_qmStatus = QM_WORKING;
-								PeerResponse resp;
-								resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-								resp.qmStatus.status = QM_SENTINFO;
-								TheGameSpyPeerMessageQueue->addResponse(resp);
-							}
-							else
-							{
-								// no QM bot.  Bail.
-								PeerResponse resp;
-								resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-								resp.qmStatus.status = QM_COULDNOTFINDBOT;
-								TheGameSpyPeerMessageQueue->addResponse(resp);
-
-								m_qmStatus = QM_STOPPED;
-								peerLeaveRoom(peer, GroupRoom, "");
-								done = true;
-							}
-						}
-					}
-					break;
-				case QM_WORKING:
-					{
-					}
-					break;
-				case QM_MATCHED:
-					{
-						// leave QM channel, and clean up.  Our work here is done.
-						peerLeaveRoom( peer, GroupRoom, NULL );
-						peerLeaveRoom( peer, StagingRoom, NULL ); m_isHosting = false;
-
-						m_qmStatus = QM_STOPPED;
-						peerLeaveRoom(peer, GroupRoom, "");
-						done = true;
-					}
-					break;
-				case QM_INCHANNEL:
-					{
-					}
-					break;
-				case QM_NEGOTIATINGFIREWALLS:
-					{
-					}
-					break;
-				case QM_STARTINGGAME:
-					{
-					}
-					break;
-				case QM_COULDNOTFINDCHANNEL:
-					{
-					}
-					break;
-				case QM_COULDNOTNEGOTIATEFIREWALLS:
-					{
-					}
-					break;
-				}
-			}
-		}
-	}
-	updateBuddyStatus( BUDDY_ONLINE );
-}
-
-static void getPlayerProfileIDCallback(PEER peer,  PEERBool success,  const char * nick,  int profileID,  void * param)
-{
-	if (success && param != NULL)
-	{
-		*((Int *)param) = profileID;
-	}
-}
-
-static void stagingRoomPlayerEnum( PEER peer, PEERBool success, RoomType roomType, int index, const char * nick, int flags, void * param )
-{
-	DEBUG_LOG(("Enum: success=%d, index=%d, nick=%s, flags=%d\n", success, index, nick, flags));
-	if (!nick || !success)
-		return;
-
-	Int id = 0;
-	peerGetPlayerProfileID(peer, nick, getPlayerProfileIDCallback, &id, PEERTrue);
-	DEBUG_ASSERTCRASH(id != 0, ("Failed to fetch player ID!"));
-
-	PeerResponse *resp = (PeerResponse *)param;
-	if (flags & PEER_FLAG_OP)
-	{
-		resp->joinStagingRoom.isHostPresent = TRUE;
-	}
-	if (index < MAX_SLOTS)
-	{
-		resp->stagingRoomPlayerNames[index] = nick;
-	}
-
-	if (id)
-	{
-		PSRequest req;
-		req.requestType = PSRequest::PSREQUEST_READPLAYERSTATS;
-		req.player.id = id;
-		TheGameSpyPSMessageQueue->addRequest(req);
-	}
-}
-
-static void joinRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomType roomType, void *param)
-{
-	DEBUG_LOG(("JoinRoomCallback: success==%d, result==%d\n", success, result));
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-		return;
-	DEBUG_LOG(("Room id was %d from thread %X\n", t->getLocalRoomID(), t));
-	DEBUG_LOG(("Current staging server name is [%ls]\n", t->getLocalStagingServerName().c_str()));
-	DEBUG_LOG(("Room type is %d (GroupRoom=%d, StagingRoom=%d, TitleRoom=%d)\n", roomType, GroupRoom, StagingRoom, TitleRoom));
-
-#ifdef USE_BROADCAST_KEYS
-	if (success)
-	{
-		t->pushStatsToRoom(peer);
-		t->getStatsFromRoom(peer, roomType);
-	}
-#endif // USE_BROADCAST_KEYS
-
-	switch (roomType)
-	{
-		case GroupRoom:
-			{
-#ifdef USE_BROADCAST_KEYS
-				t->clearPlayerStats(GroupRoom);
-#endif // USE_BROADCAST_KEYS
-				PeerResponse resp;
-				resp.peerResponseType = PeerResponse::PEERRESPONSE_JOINGROUPROOM;
-				resp.joinGroupRoom.id = t->getLocalRoomID();
-				resp.joinGroupRoom.ok = success;
-				TheGameSpyPeerMessageQueue->addResponse(resp);
-				t->roomJoined(success == PEERTrue);
-				DEBUG_LOG(("Entered group room %d, qm is %d\n", t->getLocalRoomID(), t->getQMGroupRoom()));
-				if ((!t->getQMGroupRoom()) || (t->getQMGroupRoom() != t->getLocalRoomID()))
-				{
-					DEBUG_LOG(("Updating buddy status\n"));
-					updateBuddyStatus( BUDDY_LOBBY, t->getLocalRoomID() );
-				}
-			}
-			break;
-		case StagingRoom:
-			{
-#ifdef USE_BROADCAST_KEYS
-				t->clearPlayerStats(StagingRoom);
-#endif // USE_BROADCAST_KEYS
-				PeerResponse resp;
-				resp.peerResponseType = PeerResponse::PEERRESPONSE_JOINSTAGINGROOM;
-				resp.joinStagingRoom.id = t->getLocalRoomID();
-				resp.joinStagingRoom.ok = success;
-				resp.joinStagingRoom.result = result;
-				if (success)
-				{
-					DEBUG_LOG(("joinRoomCallback() - game name is now '%ls'\n", t->getLocalStagingServerName().c_str()));
-					updateBuddyStatus( BUDDY_STAGING, 0, WideCharStringToMultiByte(t->getLocalStagingServerName().c_str()) );
-				}
-
-				resp.joinStagingRoom.isHostPresent = FALSE;
-				DEBUG_LOG(("Enum of staging room players\n"));
-				peerEnumPlayers(peer, StagingRoom, stagingRoomPlayerEnum, &resp);
-				DEBUG_LOG(("Host %s present\n", (resp.joinStagingRoom.isHostPresent)?"is":"is not"));
-
-				TheGameSpyPeerMessageQueue->addResponse(resp);
-			}
-			break;
-	}
-}
-
-// Gets called once for each group room when listing group rooms.
-// After this has been called for each group room, it will be
-// called one more time with groupID==0 and name==NULL.
-/////////////////////////////////////////////////////////////////
-static void listGroupRoomsCallback(PEER peer, PEERBool success,
-														int groupID, SBServer server,
-														const char * name, int numWaiting,
-														int maxWaiting, int numGames,
-														int numPlaying, void * param)
-{
-	DEBUG_LOG(("listGroupRoomsCallback, success=%d, server=%X, groupID=%d\n", success, server, groupID));
-#ifdef SERVER_DEBUGGING
-	CheckServers(peer);
-#endif // SERVER_DEBUGGING
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-	{
-		DEBUG_LOG(("No thread!  Bailing!\n"));
-		return;
-	}
-
-	if (success)
-	{
-		DEBUG_LOG(("Saw group room of %d (%s) at address %X %X\n", groupID, name, server, (server)?server->keyvals:0));
-		PeerResponse resp;
-		resp.peerResponseType = PeerResponse::PEERRESPONSE_GROUPROOM;
-		resp.groupRoom.id = groupID;
-		resp.groupRoom.numWaiting = numWaiting;
-		resp.groupRoom.maxWaiting = maxWaiting;
-		resp.groupRoom.numGames = numGames;
-		resp.groupRoom.numPlaying = numPlaying;
-		if (name)
-		{
-			resp.groupRoomName = name;
-			//t->setQMGroupRoom(groupID);
-		}
-		TheGameSpyPeerMessageQueue->addResponse(resp);
-#ifdef SERVER_DEBUGGING
-		CheckServers(peer);
-		DEBUG_LOG(("\n"));
-#endif // SERVER_DEBUGGING
-	}
-	else
-	{
-		DEBUG_LOG(("Failure!\n"));
-	}
-}
-
-void PeerThreadClass::connectCallback( PEER peer, PEERBool success )
-{
-	PeerResponse resp;
-	if(!success)
-	{
-		//updateBuddyStatus( BUDDY_OFFLINE );
-		resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
-		resp.discon.reason = DISCONNECT_COULDNOTCONNECT;
-		TheGameSpyPeerMessageQueue->addResponse(resp);
-		return;
-	}
-
-	updateBuddyStatus( BUDDY_ONLINE );
-
-	m_isConnected = true;
-	DEBUG_LOG(("Connected as profile %d (%s)\n", m_profileID, m_loginName.c_str()));
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_LOGIN;
-	resp.player.profileID = m_profileID;
-	resp.nick = m_loginName;
-	GetLocalChatConnectionAddress("peerchat.gamespy.com", 6667, localIP);
-	chatSetLocalIP(localIP);
-	resp.player.internalIP = ntohl(localIP);
-	resp.player.externalIP = ntohl(peerGetLocalIP(peer));
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-
-	PSRequest psReq;
-	psReq.requestType = PSRequest::PSREQUEST_READPLAYERSTATS;
-	psReq.player.id = m_profileID;
-	psReq.nick = m_originalName;
-	psReq.email = m_email;
-	psReq.password = m_password;
-	TheGameSpyPSMessageQueue->addRequest(psReq);
-
-#ifdef SERVER_DEBUGGING
-	DEBUG_LOG(("Before peerListGroupRooms()\n"));
-	CheckServers(peer);
-#endif // SERVER_DEBUGGING
-	peerListGroupRooms( peer, NULL, listGroupRoomsCallback, this, PEERTrue );
-#ifdef SERVER_DEBUGGING
-	DEBUG_LOG(("After peerListGroupRooms()\n"));
-	CheckServers(peer);
-#endif // SERVER_DEBUGGING
-}
-
-void PeerThreadClass::nickErrorCallback( PEER peer, Int type, const char *nick )
-{
-	if(type == PEER_IN_USE)
-	{
-		Int len = strlen(nick);
-		std::string nickStr = nick;
-		Int newVal = 0;
-		if (nick[len-1] == '}' && nick[len-3] == '{' && isdigit(nick[len-2]))
-		{
-			newVal = nick[len-2] - '0' + 1;
-			nickStr.erase(len-3, 3);
-		}
-
-		DEBUG_LOG(("Nickname taken: was %s, new val = %d, new nick = %s\n", nick, newVal, nickStr.c_str()));
-
-		if (newVal < 10)
-		{
-			nickStr.append("{");
-			char tmp[2];
-			tmp[0] = '0'+newVal;
-			tmp[1] = '\0';
-			nickStr.append(tmp);
-			nickStr.append("}");
-			// Retry the connect with a similar nick.
-			m_loginName = nickStr;
-			peerRetryWithNick(peer, nickStr.c_str());
-		}
-		else
-		{
-			PeerResponse resp;
-			resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
-			resp.discon.reason = DISCONNECT_NICKTAKEN;
-			TheGameSpyPeerMessageQueue->addResponse(resp);
-
-			// Cancel the connect.
-			peerRetryWithNick(peer, NULL);
-		}
-	}
-	else
-	{
-		PeerResponse resp;
-		resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
-		resp.discon.reason = DISCONNECT_BADNICK;
-		TheGameSpyPeerMessageQueue->addResponse(resp);
-
-		// Cancel the connect.
-		peerRetryWithNick(peer, NULL);
-	}
-}
-
-void disconnectedCallback(PEER peer, const char * reason, void * param)
-{
-	DEBUG_LOG(("disconnectedCallback(): reason was '%s'\n", reason));
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (t)
-		t->markAsDisconnected();
-	//updateBuddyStatus( BUDDY_OFFLINE );
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
-	resp.discon.reason = DISCONNECT_LOSTCON;
-	SerialAuthResult res = TheGameSpyPeerMessageQueue->getSerialAuthResult();
-	switch (res)
-	{
-		case SERIAL_NONEXISTENT:
-			resp.discon.reason = DISCONNECT_SERIAL_NOT_PRESENT;
-			break;
-		case SERIAL_AUTHFAILED:
-			resp.discon.reason = DISCONNECT_SERIAL_INVALID;
-			break;
-		case SERIAL_BANNED:
-			resp.discon.reason = DISCONNECT_SERIAL_BANNED;
-			break;
-	}
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-void roomMessageCallback(PEER peer, RoomType roomType, const char * nick, const char * message, MessageType messageType, void * param)
-{
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_MESSAGE;
-	resp.nick = nick;
-	resp.text = MultiByteToWideCharSingleLine(message);
-	resp.message.isPrivate = FALSE;
-	resp.message.isAction = (messageType == ActionMessage);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-	DEBUG_LOG(("Saw text [%hs] (%ls) %d chars Orig was %s (%d chars)\n", nick, resp.text.c_str(), resp.text.length(), message, strlen(message)));
-
-	UnsignedInt IP;
-	peerGetPlayerInfoNoWait(peer, nick, &IP, &resp.message.profileID);
-	
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (t && (t->getQMStatus() != QM_IDLE && t->getQMStatus() != QM_STOPPED))
-	{
-		if (resp.message.profileID == matchbotProfileID)
-		{
-			char *lastStr = NULL;
-			char *cmd = strtok_r((char *)message, " ", &lastStr);
-			if ( cmd && strcmp(cmd, "MBOT:POOLSIZE") == 0 )
-			{
-				Int poolSize = 0;
-
-				while (1)
-				{
-					char *poolStr = strtok_r(NULL, " ", &lastStr);
-					char *sizeStr = strtok_r(NULL, " ", &lastStr);
-					if (poolStr && sizeStr)
-					{
-						Int pool = atoi(poolStr);
-						Int size = atoi(sizeStr);
-						if (pool == t->getQMLadder())
-						{
-							poolSize = size;
-							break;
-						}
-					}
-					else
-						break;
-				}
-
-				PeerResponse resp;
-				resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-				resp.qmStatus.status = QM_POOLSIZE;
-				resp.qmStatus.poolSize = poolSize;
-				TheGameSpyPeerMessageQueue->addResponse(resp);
-			}
-		}
-	}
-}
-
-void gameStartedCallback( PEER peer, SBServer server, const char *message, void *param )
-{
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_GAMESTART;
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-void playerMessageCallback(PEER peer, const char * nick, const char * message, MessageType messageType, void * param)
-{
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_MESSAGE;
-	resp.nick = nick;
-	resp.text = MultiByteToWideCharSingleLine(message);
-	resp.message.isPrivate = TRUE;
-	resp.message.isAction = (messageType == ActionMessage);
-	UnsignedInt IP;
-	peerGetPlayerInfoNoWait(peer, nick, &IP, &resp.message.profileID);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (t && (t->getQMStatus() != QM_IDLE && t->getQMStatus() != QM_STOPPED))
-	{
-		if (resp.message.isPrivate && resp.message.profileID == matchbotProfileID)
-		{
-			char *lastStr = NULL;
-			char *cmd = strtok_r((char *)message, " ", &lastStr);
-			if ( cmd && strcmp(cmd, "MBOT:MATCHED") == 0 )
-			{
-				char *mapNumStr = strtok_r(NULL, " ", &lastStr);
-				char *seedStr = strtok_r(NULL, " ", &lastStr);
-				char *playerStr[MAX_SLOTS];
-				char *playerIPStr[MAX_SLOTS];
-				char *playerSideStr[MAX_SLOTS];
-				char *playerColorStr[MAX_SLOTS];
-				char *playerNATStr[MAX_SLOTS];
-				Int numPlayers = 0;
-				for (Int i=0; i<MAX_SLOTS; ++i)
-				{
-					playerStr[i] = strtok_r(NULL, " ", &lastStr);
-					playerIPStr[i] = strtok_r(NULL, " ", &lastStr);
-					playerSideStr[i] = strtok_r(NULL, " ", &lastStr);
-					playerColorStr[i] = strtok_r(NULL, " ", &lastStr);
-					playerNATStr[i] = strtok_r(NULL, " ", &lastStr);
-					if (playerNATStr[i])
-					{
-						++numPlayers;
-					}
-					else
-					{
-						playerStr[i] = NULL;
-						playerIPStr[i] = NULL;
-						playerSideStr[i] = NULL;
-						playerColorStr[i] = NULL;
-						playerNATStr[i] = NULL;
-					}
-				}
-
-				if (numPlayers > 1)
-				{
-					// woohoo!  got everything needed for a match!
-					DEBUG_LOG(("Saw %d-player QM match: map index = %s, seed = %s\n", numPlayers, mapNumStr, seedStr));
-					t->handleQMMatch(peer, atoi(mapNumStr), atoi(seedStr), playerStr, playerIPStr, playerSideStr, playerColorStr, playerNATStr);
-				}
-			}
-			else if ( cmd && strcmp(cmd, "MBOT:WORKING") == 0 )
-			{
-				Int poolSize = 0;
-				char *poolStr = strtok_r(NULL, " ", &lastStr);
-				if (poolStr)
-					poolSize = atoi(poolStr);
-				PeerResponse resp;
-				resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-				resp.qmStatus.status = QM_WORKING;
-				resp.qmStatus.poolSize = poolSize;
-				TheGameSpyPeerMessageQueue->addResponse(resp);
-			}
-			else if ( cmd && strcmp(cmd, "MBOT:WIDENINGSEARCH") == 0 )
-			{
-				PeerResponse resp;
-				resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-				resp.qmStatus.status = QM_WIDENINGSEARCH;
-				TheGameSpyPeerMessageQueue->addResponse(resp);
-			}
-		}
-	}
-}
-
-void roomUTMCallback(PEER peer, RoomType roomType, const char * nick, const char * command, const char * parameters, PEERBool authenticated, void * param)
-{
-	DEBUG_LOG(("roomUTMCallback: %s says %s = [%s]\n", nick, command, parameters));
-	if (roomType != StagingRoom)
-		return;
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_ROOMUTM;
-	resp.nick = nick;
-	resp.command = command;
-	resp.commandOptions = parameters;
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-void playerUTMCallback(PEER peer, const char * nick, const char * command, const char * parameters, PEERBool authenticated, void * param)
-{
-	DEBUG_LOG(("playerUTMCallback: %s says %s = [%s]\n", nick, command, parameters));
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERUTM;
-	resp.nick = nick;
-	resp.command = command;
-	resp.commandOptions = parameters;
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-static void getPlayerInfo(PeerThreadClass *t, PEER peer, const char *nick, Int& id, UnsignedInt& IP,
-													std::string& locale, Int& wins, Int& losses, Int& rankPoints, Int& side, Int& preorder,
-													RoomType roomType, Int& flags)
-{
-	if (!t || !nick)
-		return;
-	peerGetPlayerInfoNoWait(peer, nick, &IP, &id);
-#ifdef USE_BROADCAST_KEYS
-	//locale.printf
-	Int localeIndex = t->lookupStatForPlayer(roomType, nick, "b_locale");
-	AsciiString tmp;
-	tmp.format("%d", localeIndex);
-	locale = tmp.str();
-
-	wins = t->lookupStatForPlayer(roomType, nick, "b_wins");
-	losses = t->lookupStatForPlayer(roomType, nick, "b_losses");
-	rankPoints = t->lookupStatForPlayer(roomType, nick, "b_points");
-	side = t->lookupStatForPlayer(roomType, nick, "b_side");
-	preorder = t->lookupStatForPlayer(roomType, nick, "b_pre");
-#else // USE_BROADCAST_KEYS
-	const char *s;
-	s = peerGetGlobalWatchKey(peer, nick, "locale");
-	locale = (s)?s:"";
-	s = peerGetGlobalWatchKey(peer, nick, "wins");
-	wins = atoi((s)?s:"");
-	s = peerGetGlobalWatchKey(peer, nick, "losses");
-	losses = atoi((s)?s:"");
-	s = peerGetGlobalWatchKey(peer, nick, "points");
-	rankPoints = atoi((s)?s:"");
-	s = peerGetGlobalWatchKey(peer, nick, "side");
-	side = atoi((s)?s:"");
-	s = peerGetGlobalWatchKey(peer, nick, "pre");
-	preorder = atoi((s)?s:"");
-#endif // USE_BROADCAST_KEYS
-	flags = 0;
-	peerGetPlayerFlags(peer, nick, roomType, &flags);
-	DEBUG_LOG(("getPlayerInfo(%d) - %s has locale %s, wins:%d, losses:%d, rankPoints:%d, side:%d, preorder:%d\n",
-		id, nick, locale.c_str(), wins, losses, rankPoints, side, preorder));
-}
-
-static void roomKeyChangedCallback(PEER peer, RoomType roomType, const char *nick, const char *key, const char *val, void *param)
-{
-#ifdef USE_BROADCAST_KEYS
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	DEBUG_ASSERTCRASH(nick && key && val, ("Bad values %X %X %X\n", nick, key, val));
-	if (!t || !nick || !key || !val)
-	{
-		DEBUG_ASSERTLOG(!nick, ("nick = %s\n", nick));
-		DEBUG_ASSERTLOG(!key, ("key = %s\n", key));
-		DEBUG_ASSERTLOG(!val, ("val = %s\n", val));
-		return;
-	}
-
-#ifdef DEBUG_LOGGING
-	if (strcmp(key, "username") && strcmp(key, "b_flags"))
-	{
-		DEBUG_LOG(("roomKeyChangedCallback() - %s set %s=%s\n", nick, key, val));
-	}
-#endif
-
-	t->trackStatsForPlayer(roomType, nick, key, val);
-
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERINFO;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		resp.player.roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-#endif // USE_BROADCAST_KEYS
-}
-
-#ifdef USE_BROADCAST_KEYS
-void getRoomKeysCallback(PEER peer, PEERBool success, RoomType roomType, const char *nick, int num, char **keys, char **values, void *param)
-{
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	DEBUG_ASSERTCRASH(keys && values, ("bad key/value %X/%X", keys, values));
-	if (!t || !nick || !num || !success || !keys || !values)
-		return;
-
-	for (Int i=0; i<num; ++i)
-	{
-		t->trackStatsForPlayer(roomType, nick, keys[i], values[i]);
-	}
-
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERINFO;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		resp.player.roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-#endif // USE_BROADCAST_KEYS
-
-static void globalKeyChangedCallback(PEER peer, const char *nick, const char *key, const char *val, void *param)
-{
-	if (!nick)
-		return;
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t)
-		return;
-
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERINFO;
-	resp.nick = nick;
-	resp.player.roomType = t->getCurrentGroupRoom()?GroupRoom:StagingRoom;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		resp.player.roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-void playerJoinedCallback(PEER peer, RoomType roomType, const char * nick, void * param)
-{
-	if (!nick)
-		return;
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t)
-		return;
-
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERJOIN;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-void playerLeftCallback(PEER peer, RoomType roomType, const char * nick, const char * reason, void * param)
-{
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERLEFT;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-	resp.player.profileID = 0;
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t)
-		return;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-
-	if (t->getQMStatus() != QM_IDLE && t->getQMStatus() != QM_STOPPED)
-	{
-		if (!stricmp(t->getQMBotName().c_str(), nick))
-		{
-			// matchbot left - bail
-			PeerResponse resp;
-			resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-			resp.qmStatus.status = QM_COULDNOTFINDBOT;
-			TheGameSpyPeerMessageQueue->addResponse(resp);
-
-			PeerRequest req;
-			req.peerRequestType = PeerRequest::PEERREQUEST_STOPQUICKMATCH;
-			TheGameSpyPeerMessageQueue->addRequest(req);
-		}
-	}
-}
-
-void playerChangedNickCallback(PEER peer, RoomType roomType, const char * oldNick, const char * newNick, void * param)
-{
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERCHANGEDNICK;
-	resp.nick = newNick;
-	resp.oldNick = oldNick;
-	resp.player.roomType = roomType;
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t)
-		return;
-
-	getPlayerInfo(t, peer, newNick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-static void playerInfoCallback(PEER peer, RoomType roomType, const char * nick, unsigned int IP, int profileID, void * param)
-{
-	if (!nick)
-		return;
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERINFO;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t)
-		return;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-static void playerFlagsChangedCallback(PEER peer, RoomType roomType, const char * nick, int oldFlags, int newFlags, void * param)
-{
-	if (!nick)
-		return;
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERCHANGEDFLAGS;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t)
-		return;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-#ifdef DEBUG_LOGGING
-/*
-static void enumFunc(char *key, char *val, void *param)
-{
-	DEBUG_LOG(("  [%s] = [%s]\n", key, val));
-}
-*/
-#endif
-
-static void listingGamesCallback(PEER peer, PEERBool success, const char * name, SBServer server, PEERBool staging, int msg, Int percentListed, void * param)
-{
-#ifdef DEBUG_LOGGING
-	AsciiString cmdStr = "<Unknown>";
-	switch(msg)
-	{
-		case PEER_ADD:
-			cmdStr = "PEER_ADD";
-			break;
-		case PEER_UPDATE:
-			cmdStr = "PEER_UPDATE";
-			break;
-		case PEER_REMOVE:
-			cmdStr = "PEER_REMOVE";
-			break;
-		case PEER_CLEAR:
-			cmdStr = "PEER_CLEAR";
-			break;
-		case PEER_COMPLETE:
-			cmdStr = "PEER_COMPLETE";
-			break;
-	}
-	DEBUG_LOG(("listingGamesCallback() - doing command %s on server %X\n", cmdStr.str(), server));
-#endif // DEBUG_LOGGING
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(name, ("Game has no name!\n"));
-	if (!t || !success || (!name && (msg == PEER_ADD || msg == PEER_UPDATE)))
-	{
-		DEBUG_LOG(("Bailing from listingGamesCallback() - success=%d, name=%X, server=%X, msg=%X\n", success, name, server, msg));
-		return;
-	}
-	if (!name)
-		name = "bogus";
-
-	if (server && (msg == PEER_ADD || msg == PEER_UPDATE))
-	{
-		DEBUG_ASSERTCRASH(server->keyvals, ("Looking at an already-freed server for msg type %d!", msg));
-		if (!server->keyvals)
-		{
-			msg = PEER_REMOVE;
-		}
-	}
-
-	if (server && success && (msg == PEER_ADD || msg == PEER_UPDATE))
-	{
-		DEBUG_LOG(("Game name is '%s'\n", name));
-		const char *newname = SBServerGetStringValue(server, "gamename", (char *)name);
-		if (strcmp(newname, "ccgenerals"))
-			name = newname;
-		DEBUG_LOG(("Game name is now '%s'\n", name));
-	}
-
-	DEBUG_LOG(("listingGamesCallback - got percent complete %d\n", percentListed));
-	if (percentListed == 100)
-	{
-		if (!t->getSawCompleteGameList())
-		{
-			t->setSawCompleteGameList(TRUE);
-			PeerResponse completeResp;
-			completeResp.peerResponseType = PeerResponse::PEERRESPONSE_STAGINGROOMLISTCOMPLETE;
-			TheGameSpyPeerMessageQueue->addResponse(completeResp);
-		}
-	}
-
-	AsciiString gameName = name;
-	AsciiString tmp = gameName;
-	AsciiString hostName;
-	tmp.nextToken(&hostName, " ");
-	const char *firstSpace = gameName.find(' ');
-	if(firstSpace)
-	{
-		gameName.set(firstSpace + 1);
-		//gameName.trim();
-		DEBUG_LOG(("Hostname/Gamename split leaves '%s' hosting '%s'\n", hostName.str(), gameName.str()));
-	}
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_STAGINGROOM;
-	resp.stagingRoom.action = msg;
-	resp.stagingRoom.isStaging = staging;
-	resp.stagingRoom.percentComplete = percentListed;
-
-	if (server && (msg == PEER_ADD || msg == PEER_UPDATE))
-	{
-		Bool hasPassword = (Bool)SBServerGetIntValue(server, PW_STR, FALSE);
-		Bool allowObservers = (Bool)SBServerGetIntValue(server, OBS_STR, FALSE);
-		const char *verStr = SBServerGetStringValue(server, "gamever", "000000");
-		const char *exeStr = SBServerGetStringValue(server, EXECRC_STR, "000000");
-		const char *iniStr = SBServerGetStringValue(server, INICRC_STR, "000000");
-		const char *ladIPStr = SBServerGetStringValue(server, LADIP_STR, "000000");
-		const char *pingStr = SBServerGetStringValue(server, PINGSTR_STR, "FFFFFFFFFFFFFFFF");
-		UnsignedShort ladPort = (UnsignedShort)SBServerGetIntValue(server, LADPORT_STR, 0);
-		UnsignedInt verVal = strtoul(verStr, NULL, 10);
-		UnsignedInt exeVal = strtoul(exeStr, NULL, 10);
-		UnsignedInt iniVal = strtoul(iniStr, NULL, 10);
-		resp.stagingRoom.requiresPassword = hasPassword;
-		resp.stagingRoom.allowObservers = allowObservers;
-		resp.stagingRoom.version = verVal;
-		resp.stagingRoom.exeCRC = exeVal;
-		resp.stagingRoom.iniCRC = iniVal;
-		resp.stagingServerLadderIP = ladIPStr;
-		resp.stagingServerPingString = pingStr;
-		resp.stagingRoom.ladderPort = ladPort;
-		resp.stagingRoom.numPlayers = SBServerGetIntValue(server, NUMPLAYER_STR, 0);
-		resp.stagingRoom.numObservers = SBServerGetIntValue(server, NUMOBS_STR, 0);
-		resp.stagingRoom.maxPlayers = SBServerGetIntValue(server, MAXPLAYER_STR, 8);
-		resp.stagingRoomMapName = SBServerGetStringValue(server, "mapname", "");
-		for (Int i=0; i<MAX_SLOTS; ++i)
-		{
-			resp.stagingRoomPlayerNames[i] = SBServerGetPlayerStringValue(server, i, NAME__STR, "");
-			resp.stagingRoom.wins[i] = SBServerGetPlayerIntValue(server, i, WINS__STR, 0);
-			resp.stagingRoom.losses[i] = SBServerGetPlayerIntValue(server, i, LOSSES__STR, 0);
-			resp.stagingRoom.profileID[i] = SBServerGetPlayerIntValue(server, i, "pid", 0);
-			resp.stagingRoom.color[i] = SBServerGetPlayerIntValue(server, i, COLOR__STR, 0);
-			resp.stagingRoom.faction[i] = SBServerGetPlayerIntValue(server, i, FACTION__STR, 0);
-#ifdef DEBUG_LOGGING
-			if (resp.stagingRoomPlayerNames[i].length())
-			{
-				DEBUG_LOG(("Player %d raw stuff: [%s] [%d] [%d] [%d]\n", i, resp.stagingRoomPlayerNames[i].c_str(), resp.stagingRoom.wins[i], resp.stagingRoom.losses[i], resp.stagingRoom.profileID[i]));
-			}
-#endif
-		}
-		if (resp.stagingRoomPlayerNames[0].empty())
-		{
-			resp.stagingRoomPlayerNames[0] = hostName.str();
-		}
-		DEBUG_ASSERTCRASH(resp.stagingRoomPlayerNames[0].empty() == false, ("No host!"));
-		DEBUG_LOG(("Raw stuff: [%s] [%s] [%s] [%d] [%d]\n", verStr, exeStr, iniStr, hasPassword, allowObservers));
-		DEBUG_LOG(("Raw stuff: [%s] [%s] [%d]\n", pingStr, ladIPStr, ladPort));
-		DEBUG_LOG(("Saw game with stuff %s %d %X %X %X %s\n", resp.stagingRoomMapName.c_str(), hasPassword, verVal, exeVal, iniVal, SBServerGetStringValue(server, "password", "missing")));
-#ifdef PING_TEST
-	PING_LOG(("%s\n", pingStr));
-#endif
-	}
-
-	if (msg == PEER_ADD || msg == PEER_UPDATE)
-	{
-		if (!resp.stagingRoom.exeCRC || !resp.stagingRoom.iniCRC)
-		{
-			if (SBServerHasBasicKeys(server))
-			{
-				DEBUG_LOG(("Server %x does not have basic keys\n", server));
-				return;
-			}
-			else
-			{
-				DEBUG_LOG(("Server %x has basic keys, yet has no info\n", server));
-			}
-			if (msg == PEER_UPDATE)
-			{
-				PeerRequest req;
-				req.peerRequestType = PeerRequest::PEERREQUEST_GETEXTENDEDSTAGINGROOMINFO;
-				req.stagingRoom.id = t->findServer( server );
-				DEBUG_LOG(("Add/update a 0/0 server %X (%d, %s) - requesting full update to see if that helps.\n",
-					server, resp.stagingRoom.id, gameName.str()));
-				TheGameSpyPeerMessageQueue->addRequest(req);
-			}
-			return; // don't actually try to list it.
-		}
-	}
-
-	switch (msg)
-	{
-		case PEER_CLEAR:
-			t->clearServers();
-			break;
-		case PEER_ADD:
-		case PEER_UPDATE:
-			resp.stagingRoom.id = t->findServer( server );
-			DEBUG_LOG(("Add/update on server %X (%d, %s)\n", server, resp.stagingRoom.id, gameName.str()));
-			resp.stagingServerName = MultiByteToWideCharSingleLine( gameName.str() );
-			DEBUG_LOG(("Server had basic=%d, full=%d\n", SBServerHasBasicKeys(server), SBServerHasFullKeys(server)));
-#ifdef DEBUG_LOGGING
-			//SBServerEnumKeys(server, enumFunc, NULL);
-#endif
-			break;
-		case PEER_REMOVE:
-			DEBUG_LOG(("Removing server %X (%d)\n", server, resp.stagingRoom.id));
-			resp.stagingRoom.id = t->removeServerFromMap( server );
-			break;
-	}
-
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-//-------------------------------------------------------------------------
-
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
deleted file mode 100644
index c042e8c5f67..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
+++ /dev/null
@@ -1,1514 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PersistentStorageThread.cpp //////////////////////////////////////////////////////
-// GameSpy Persistent Storage thread
-// This thread communicates with GameSpy's persistent storage server
-// and talks through a message queue with the rest of
-// the game.
-// Author: Matthew D. Campbell, July 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/UserPreferences.h"
-#include "Common/PlayerTemplate.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-
-#include "mutex.h"
-#include "thread.h"
-
-#include "Common/StackDump.h"
-#include "Common/SubsystemInterface.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-------------------------------------------------------------------------
-
-PSRequest::PSRequest()
-{
-	player.reset();
-	requestType = PSREQUEST_READPLAYERSTATS;
-	addDiscon = addDesync = FALSE;
-	lastHouse = -1;
-}
-
-//-------------------------------------------------------------------------
-
-#define DEBUG_MAP(x) for (it = stats.x.begin(); it != stats.x.end(); ++it) \
-{ \
-	if (it->second > 0) \
-	{ \
-		DEBUG_LOG(("%s(%d): %d\n", #x, it->first, it->second)); \
-	} \
-}
-
-static void debugDumpPlayerStats( const PSPlayerStats& stats )
-{
-	DEBUG_LOG(("-----------------------------------------\n"));
-	DEBUG_LOG(("Tracking player stats for player %d:\n", stats.id));
-	PerGeneralMap::const_iterator it;
-	DEBUG_MAP(wins);
-	DEBUG_MAP(losses);
-	DEBUG_MAP(games);
-	DEBUG_MAP(duration);
-	DEBUG_MAP(unitsKilled);
-	DEBUG_MAP(unitsLost);
-	DEBUG_MAP(unitsBuilt);
-	DEBUG_MAP(buildingsKilled);
-	DEBUG_MAP(buildingsLost);
-	DEBUG_MAP(buildingsBuilt);
-	DEBUG_MAP(earnings);
-	DEBUG_MAP(techCaptured);
-	DEBUG_MAP(discons);
-	DEBUG_MAP(desyncs);
-	DEBUG_MAP(surrenders);
-	DEBUG_MAP(gamesOf2p);
-	DEBUG_MAP(gamesOf3p);
-	DEBUG_MAP(gamesOf4p);
-	DEBUG_MAP(gamesOf5p);
-	DEBUG_MAP(gamesOf6p);
-	DEBUG_MAP(gamesOf7p);
-	DEBUG_MAP(gamesOf8p);
-	DEBUG_MAP(customGames);
-	DEBUG_MAP(QMGames);
-	
-	if (stats.locale > 0)
-	{
-		DEBUG_LOG(("Locale: %d\n", stats.locale));
-	}
-	
-	if (stats.gamesAsRandom > 0)
-	{
-		DEBUG_LOG(("gamesAsRandom: %d\n", stats.gamesAsRandom));
-	}
-
-	if (stats.options.length())
-	{
-		DEBUG_LOG(("Options: %s\n", stats.options.c_str()));
-	}
-
-	if (stats.systemSpec.length())
-	{
-		DEBUG_LOG(("systemSpec: %s\n", stats.systemSpec.c_str()));
-	}
-
-	if (stats.lastFPS > 0.0f)
-	{
-		DEBUG_LOG(("lastFPS: %g\n", stats.lastFPS));
-	}
-
-	if (stats.battleHonors > 0)
-	{
-		DEBUG_LOG(("battleHonors: %x\n", stats.battleHonors));
-	}
-	if (stats.challengeMedals > 0)
-	{
-		DEBUG_LOG(("challengeMedals: %x\n", stats.challengeMedals));
-	}
-	if (stats.lastGeneral >= 0)
-	{
-		DEBUG_LOG(("lastGeneral: %d\n", stats.lastGeneral));
-	}
-	if (stats.gamesInRowWithLastGeneral >= 0)
-	{
-		DEBUG_LOG(("gamesInRowWithLastGeneral: %d\n", stats.gamesInRowWithLastGeneral));
-	}
-	if (stats.builtSCUD >= 0)
-	{
-		DEBUG_LOG(("builtSCUD: %d\n", stats.builtSCUD));
-	}
-	if (stats.builtNuke >= 0)
-	{
-		DEBUG_LOG(("builtNuke: %d\n", stats.builtNuke));
-	}
-	if (stats.builtParticleCannon >= 0)
-	{
-		DEBUG_LOG(("builtParticleCannon: %d\n", stats.builtParticleCannon));
-	}
-
-	if (stats.winsInARow >= 0)
-	{
-		DEBUG_LOG(("winsInARow: %d\n", stats.winsInARow));
-	}
-	if (stats.maxWinsInARow >= 0)
-	{
-		DEBUG_LOG(("maxWinsInARow: %d\n", stats.maxWinsInARow));
-	}
-	if (stats.disconsInARow >= 0)
-	{
-		DEBUG_LOG(("disconsInARow: %d\n", stats.disconsInARow));
-	}
-	if (stats.maxDisconsInARow >= 0)
-	{
-		DEBUG_LOG(("maxDisconsInARow: %d\n", stats.maxDisconsInARow));
-	}
-	if (stats.lossesInARow >= 0)
-	{
-		DEBUG_LOG(("lossesInARow: %d\n", stats.lossesInARow));
-	}
-	if (stats.maxLossesInARow >= 0)
-	{
-		DEBUG_LOG(("maxLossesInARow: %d\n", stats.maxLossesInARow));
-	}
-	if (stats.desyncsInARow >= 0)
-	{
-		DEBUG_LOG(("desyncsInARow: %d\n", stats.desyncsInARow));
-	}
-	if (stats.maxDesyncsInARow >= 0)
-	{
-		DEBUG_LOG(("maxDesyncsInARow: %d\n", stats.maxDesyncsInARow));
-	}
-
-	if (stats.lastLadderPort >= 0)
-	{
-		DEBUG_LOG(("lastLadderPort: %d\n", stats.lastLadderPort));
-	}
-
-	if (stats.lastLadderHost.length())
-	{
-		DEBUG_LOG(("lastLadderHost: %s\n", stats.lastLadderHost.c_str()));
-	}
-
-
-
-}
-
-//-------------------------------------------------------------------------
-
-#define INCORPORATE_MAP(x) for (it = other.x.begin(); it != other.x.end(); ++it) \
-{ \
-	if (it->second > 0) \
-	{ \
-		x[it->first] = it->second; \
-	} \
-}
-
-void PSPlayerStats::incorporate( const PSPlayerStats& other )
-{
-	PerGeneralMap::const_iterator it;
-	INCORPORATE_MAP(wins);
-	INCORPORATE_MAP(losses);
-	INCORPORATE_MAP(games);
-	INCORPORATE_MAP(duration);
-	INCORPORATE_MAP(unitsKilled);
-	INCORPORATE_MAP(unitsLost);
-	INCORPORATE_MAP(unitsBuilt);
-	INCORPORATE_MAP(buildingsKilled);
-	INCORPORATE_MAP(buildingsLost);
-	INCORPORATE_MAP(buildingsBuilt);
-	INCORPORATE_MAP(earnings);
-	INCORPORATE_MAP(techCaptured);
-
-	//GS  Clear all disconnects so that we don't retain any that were
-	//previously reported as 1 by updateAdditionalGameSpyDisconnections
-	discons.clear();
-	INCORPORATE_MAP(discons);
-
-	INCORPORATE_MAP(desyncs);
-	INCORPORATE_MAP(surrenders);
-	INCORPORATE_MAP(gamesOf2p);
-	INCORPORATE_MAP(gamesOf3p);
-	INCORPORATE_MAP(gamesOf4p);
-	INCORPORATE_MAP(gamesOf5p);
-	INCORPORATE_MAP(gamesOf6p);
-	INCORPORATE_MAP(gamesOf7p);
-	INCORPORATE_MAP(gamesOf8p);
-	INCORPORATE_MAP(customGames);
-	INCORPORATE_MAP(QMGames);
-	
-	if (other.locale > 0)
-	{
-		locale = other.locale;
-	}
-	
-	if (other.gamesAsRandom > 0)
-	{
-		gamesAsRandom = other.gamesAsRandom;
-	}
-
-	if (other.options.length())
-	{
-		options = other.options;
-	}
-
-	if (other.systemSpec.length())
-	{
-		systemSpec = other.systemSpec;
-	}
-
-	if (other.lastFPS > 0.0f)
-	{
-		lastFPS = other.lastFPS;
-	}
-
-	if (other.battleHonors > 0)
-	{
-		battleHonors |= other.battleHonors;
-	}
-	if (other.challengeMedals > 0)
-	{
-		challengeMedals |= other.challengeMedals;
-	}
-	if (other.lastGeneral >= 0)
-	{
-		lastGeneral = other.lastGeneral;
-	}
-	if (other.gamesInRowWithLastGeneral >= 0)
-	{
-		gamesInRowWithLastGeneral = other.gamesInRowWithLastGeneral;
-	}
-	if (other.builtParticleCannon >= 0)
-	{
-		builtParticleCannon = other.builtParticleCannon;
-	}
-	if (other.builtNuke >= 0)
-	{
-		builtNuke = other.builtNuke;
-	}
-	if (other.builtSCUD >= 0)
-	{
-		builtSCUD = other.builtSCUD;
-	}
-	if (other.winsInARow >= 0)
-	{
-		winsInARow = other.winsInARow;
-	}
-	if (other.maxWinsInARow >= 0)
-	{
-		maxWinsInARow = other.maxWinsInARow;
-	}
-	if (other.lossesInARow >= 0)
-	{
-		lossesInARow = other.lossesInARow;
-	}
-	if (other.maxLossesInARow >= 0)
-	{
-		maxLossesInARow = other.maxLossesInARow;
-	}
-	if (other.disconsInARow >= 0)
-	{
-		disconsInARow = other.disconsInARow;
-	}
-	if (other.maxDisconsInARow >= 0)
-	{
-		maxDisconsInARow = other.maxDisconsInARow;
-	}
-	if (other.desyncsInARow >= 0)
-	{
-		desyncsInARow = other.desyncsInARow;
-	}
-	if (other.maxDesyncsInARow >= 0)
-	{
-		maxDesyncsInARow = other.maxDesyncsInARow;
-	}
-	if (other.lastLadderPort >= 0)
-	{
-		lastLadderPort = other.lastLadderPort;
-	}
-	if (other.lastLadderHost.length())
-	{
-		lastLadderHost = other.lastLadderHost;
-	}
-}
-
-PSPlayerStats::PSPlayerStats( const PSPlayerStats& other )
-{
-	incorporate(other);
-	id = other.id;
-	locale = other.locale;
-	gamesAsRandom = other.gamesAsRandom;
-	options = other.options;
-	systemSpec = other.systemSpec;
-	lastFPS = other.lastFPS;
-	lastGeneral = other.lastGeneral;
-	gamesInRowWithLastGeneral = other.gamesInRowWithLastGeneral;
-	builtParticleCannon = other.builtParticleCannon;
-	builtNuke = other.builtNuke;
-	builtSCUD = other.builtSCUD;
-	challengeMedals = other.challengeMedals;
-	battleHonors = other.battleHonors;
-	winsInARow = other.winsInARow;
-	maxWinsInARow = other.maxWinsInARow;
-	lossesInARow = other.lossesInARow;
-	maxLossesInARow = other.maxLossesInARow;
-	disconsInARow = other.disconsInARow;
-	maxDisconsInARow = other.maxDisconsInARow;
-	desyncsInARow = other.desyncsInARow;
-	maxDesyncsInARow = other.maxDesyncsInARow;
-	lastLadderHost = other.lastLadderHost;
-	lastLadderPort = other.lastLadderPort;
-}
-
-//-------------------------------------------------------------------------
-
-typedef std::queue<PSRequest> RequestQueue;
-typedef std::queue<PSResponse> ResponseQueue;
-class PSThreadClass;
-
-class GameSpyPSMessageQueue : public GameSpyPSMessageQueueInterface
-{
-public:
-	virtual ~GameSpyPSMessageQueue();
-	GameSpyPSMessageQueue();
-	virtual void startThread( void );
-	virtual void endThread( void );
-	virtual Bool isThreadRunning( void );
-
-	virtual void addRequest( const PSRequest& req );
-	virtual Bool getRequest( PSRequest& req );
-
-	virtual void addResponse( const PSResponse& resp );
-	virtual Bool getResponse( PSResponse& resp );
-
-	virtual void trackPlayerStats( PSPlayerStats stats );
-	virtual PSPlayerStats findPlayerStatsByID( Int id );
-
-	PSThreadClass* getThread( void );
-
-	Int getLocalPlayerID(void) { return m_localPlayerID; }
-	void setLocalPlayerID(Int localPlayerID) { m_localPlayerID = localPlayerID; }
-
-	std::string getEmail() { return m_email; }
-	std::string getNick() { return m_nick; }
-	std::string getPassword() { return m_password; }
-
-	void setEmail(std::string email) { m_email = email; }
-	void setNick(std::string nick) { m_nick = nick; }
-	void setPassword(std::string password) { m_password = password; }
-
-private:
-	MutexClass m_requestMutex;
-	MutexClass m_responseMutex;
-	RequestQueue m_requests;
-	ResponseQueue m_responses;
-	PSThreadClass *m_thread;
-	Int m_localPlayerID;
-
-	std::string m_email;
-	std::string m_nick;
-	std::string m_password;
-
-	std::map<Int, PSPlayerStats> m_playerStats;
-};
-
-GameSpyPSMessageQueueInterface* GameSpyPSMessageQueueInterface::createNewMessageQueue( void )
-{
-	return NEW GameSpyPSMessageQueue;
-}
-
-GameSpyPSMessageQueueInterface *TheGameSpyPSMessageQueue = NULL;
-#define MESSAGE_QUEUE ((GameSpyPSMessageQueue *)TheGameSpyPSMessageQueue)
-
-//-------------------------------------------------------------------------
-
-class PSThreadClass : public ThreadClass
-{
-
-public:
-	PSThreadClass() : ThreadClass() 
-	{ 
-		m_loginOK = m_sawLocalData = m_doneTryingToLogin = false; 
-		m_opCount = 0; 
-	}
-
-	void Thread_Function();
-
-	void persAuthCallback( Bool val ) { m_loginOK = val; m_doneTryingToLogin = true; }
-	void decrOpCount( void ) { --m_opCount; }
-	void incrOpCount( void ) { ++m_opCount; }
-	Int getOpCount( void ) { return m_opCount; }
-	Bool sawLocalPlayerData( void ) { return m_sawLocalData; }
-	void gotLocalPlayerData( void ) { m_sawLocalData = TRUE; }
-
-private:
-	Bool tryConnect( void );
-	Bool tryLogin( Int id, std::string nick, std::string password, std::string email );
-	Bool m_loginOK;
-	Bool m_doneTryingToLogin;
-	Int m_opCount;
-	Bool m_sawLocalData;
-};
-
-
-//-------------------------------------------------------------------------
-
-GameSpyPSMessageQueue::GameSpyPSMessageQueue()
-{
-	m_thread = NULL;
-	m_localPlayerID = 0;
-}
-
-GameSpyPSMessageQueue::~GameSpyPSMessageQueue()
-{
-	endThread();
-}
-
-void GameSpyPSMessageQueue::startThread( void )
-{
-	if (!m_thread)
-	{
-		m_thread = NEW PSThreadClass;
-		m_thread->Execute();
-	}
-	else
-	{
-		if (!m_thread->Is_Running())
-		{
-			m_thread->Execute();
-		}
-	}
-}
-
-void GameSpyPSMessageQueue::endThread( void )
-{
-	if (m_thread)
-		delete m_thread;
-	m_thread = NULL;
-}
-
-Bool GameSpyPSMessageQueue::isThreadRunning( void )
-{
-	return (m_thread) ? m_thread->Is_Running() : false;
-}
-
-void GameSpyPSMessageQueue::addRequest( const PSRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex);
-	if (m.Failed())
-		return;
-
-	m_requests.push(req);
-}
-
-Bool GameSpyPSMessageQueue::getRequest( PSRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_requests.empty())
-		return false;
-	req = m_requests.front();
-	m_requests.pop();
-	return true;
-}
-
-void GameSpyPSMessageQueue::addResponse( const PSResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex);
-	if (m.Failed())
-		return;
-
-	m_responses.push(resp);
-}
-
-Bool GameSpyPSMessageQueue::getResponse( PSResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_responses.empty())
-		return false;
-	resp = m_responses.front();
-	m_responses.pop();
-	return true;
-}
-
-PSThreadClass* GameSpyPSMessageQueue::getThread( void )
-{
-	return m_thread;
-}
-
-void GameSpyPSMessageQueue::trackPlayerStats( PSPlayerStats stats )
-{
-#ifdef DEBUG_LOGGING
-	debugDumpPlayerStats( stats );
-	DEBUG_ASSERTCRASH(stats.id != 0, ("Tracking stats with ID of 0\n"));
-#endif
-	PSPlayerStats newStats;
-	std::map<Int, PSPlayerStats>::iterator it = m_playerStats.find(stats.id);
-	if (it != m_playerStats.end())
-	{
-		newStats = it->second;
-		newStats.incorporate(stats);
-		m_playerStats[stats.id] = newStats;
-	}
-	else
-	{
-		m_playerStats[stats.id] = stats;
-	}
-}
-
-PSPlayerStats GameSpyPSMessageQueue::findPlayerStatsByID( Int id )
-{
-	std::map<Int, PSPlayerStats>::iterator it = m_playerStats.find(id);
-	if (it != m_playerStats.end())
-	{
-		return it->second;
-	}
-
-	PSPlayerStats empty;
-	empty.id = 0;
-	return empty;
-}
-
-//-------------------------------------------------------------------------
-
-Bool PSThreadClass::tryConnect( void )
-{
-	Int result;
-
-	DEBUG_LOG(("m_opCount = %d - opening connection\n", m_opCount));
-
-	if (IsStatsConnected())
-	{
-		DEBUG_LOG(("connection already open!\n"));
-		return true;
-	}
-
-	// this may block for 1-2 seconds (according to GS) so it's nice we're not in the UI thread :)
-	result = InitStatsConnection(0);
-
-#ifdef DEBUG_LOGGING
-	static const char *retValStrings[6] = {
-		"GE_NOERROR",
-		"GE_NOSOCKET",
-		"GE_NODNS",
-		"GE_NOCONNECT",
-		"GE_BUSY",
-		"GE_DATAERROR"
-	};
-#endif // DEBUG_LOGGING
-
-	if (result != GE_NOERROR)
-	{
-		DEBUG_LOG(("InitStatsConnection() returned %d (%s)\n", result, retValStrings[result]));
-		return false;
-	}
-	else
-	{
-		DEBUG_LOG(("InitStatsConnection() succeeded\n"));
-	}
-
-	return true;
-}
-
-static void persAuthCallback(int localid, int profileid, int authenticated, char *errmsg, void *instance)
-{
-	PSThreadClass *t = (PSThreadClass *)instance;
-	DEBUG_LOG(("Auth callback: localid: %d profileid: %d auth: %d err: %s\n",localid, profileid, authenticated, errmsg));
-	if (t)
-		t->persAuthCallback(authenticated != 0);
-}
-
-Bool PSThreadClass::tryLogin( Int id, std::string nick, std::string password, std::string email )
-{
-	char validate[33];
-	DEBUG_LOG(("PSThreadClass::tryLogin id = %d, nick = %s, password = %s, email = %s\n", id, nick.c_str(), password.c_str(), email.c_str()));
-	/***********
-	We'll go ahead and start the authentication, using a Presence & Messaging SDK
-	profileid / password.  To generate the new validation token, we'll need to pass
-	in the password for the profile we are authenticating.
-	Again, if this is done in a client/server setting, with the Persistent Storage
-	access being done on the server, and the P&M SDK is used on the client, the
-	server will need to send the challenge (GetChallenge(NULL)) to the client, the
-	client will create the validation token using GenerateAuth, and send it
-	back to the server for use in PreAuthenticatePlayerPM
-	***********/
-	char *munkeeHack = strdup(password.c_str()); // GenerateAuth takes a char*, not a const char* :P
-	GenerateAuth(GetChallenge(NULL), munkeeHack, validate);
-	free (munkeeHack);
-
-	/************
-	After we get the validation token, we pass it and the profileid of the user
-	we are authenticating into PreAuthenticatePlayerPM.
-	We pass the same authentication callback as for the first user, but a different
-	localid this time.
-	************/
-	m_loginOK = false;
-	m_doneTryingToLogin = false;
-	PreAuthenticatePlayerPM(id, id, validate, ::persAuthCallback, this);
-	while (!m_doneTryingToLogin && IsStatsConnected())
-		PersistThink();
-	DEBUG_LOG(("Persistant Storage Login success %d\n", m_loginOK));
-	return m_loginOK;
-}
-
-static void getPersistentDataCallback(int localid, int profileid, persisttype_t type, int index, int success, time_t modified, char *data, int len, void *instance)
-{
-	DEBUG_LOG(("Data get callback: localid: %d profileid: %d success: %d len: %d data: %s\n",localid, profileid, success, len, data));
-	PSThreadClass *t = (PSThreadClass *)instance;
-	if (!t)
-		return;
-
-	t->decrOpCount();
-
-	PSResponse resp;
-
-	if (!success)
-	{
-		resp.responseType = PSResponse::PSRESPONSE_COULDNOTCONNECT;
-		resp.player.id = profileid;
-		TheGameSpyPSMessageQueue->addResponse(resp);
-		if (!t->getOpCount() && !t->sawLocalPlayerData())
-		{
-			// we haven't gotten stats for ourselves - try again
-			DEBUG_LOG(("Requesting retry for reading local player's stats\n"));
-			PSRequest req;
-			req.requestType = PSRequest::PSREQUEST_READPLAYERSTATS;
-			req.player.id = MESSAGE_QUEUE->getLocalPlayerID();
-			TheGameSpyPSMessageQueue->addRequest(req);
-		}
-		return;
-	}
-
-	if (profileid == MESSAGE_QUEUE->getLocalPlayerID())
-	{
-		t->gotLocalPlayerData();
-		DEBUG_LOG(("getPersistentDataCallback() - got local player info\n"));
-
-		// check if we have discons we should update on the server
-		UserPreferences pref;
-		AsciiString userPrefFilename;
-		userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", MESSAGE_QUEUE->getLocalPlayerID());
-		DEBUG_LOG(("using the file %s\n", userPrefFilename.str()));
-		pref.load(userPrefFilename);
-		Int addedInDesyncs2 = pref.getInt("0", 0);
-		DEBUG_LOG(("addedInDesyncs2 = %d\n", addedInDesyncs2));
-		if (addedInDesyncs2 < 0)
-			addedInDesyncs2 = 10;
-		Int addedInDesyncs3 = pref.getInt("1", 0);
-		DEBUG_LOG(("addedInDesyncs3 = %d\n", addedInDesyncs3));
-		if (addedInDesyncs3 < 0)
-			addedInDesyncs3 = 10;
-		Int addedInDesyncs4 = pref.getInt("2", 0);
-		DEBUG_LOG(("addedInDesyncs4 = %d\n", addedInDesyncs4));
-		if (addedInDesyncs4 < 0)
-			addedInDesyncs4 = 10;
-		Int addedInDiscons2 = pref.getInt("3", 0);
-		DEBUG_LOG(("addedInDiscons2 = %d\n", addedInDiscons2));
-		if (addedInDiscons2 < 0)
-			addedInDiscons2 = 10;
-		Int addedInDiscons3 = pref.getInt("4", 0);
-		DEBUG_LOG(("addedInDiscons3 = %d\n", addedInDiscons3));
-		if (addedInDiscons3 < 0)
-			addedInDiscons3 = 10;
-		Int addedInDiscons4 = pref.getInt("5", 0);
-		DEBUG_LOG(("addedInDiscons4 = %d\n", addedInDiscons4));
-		if (addedInDiscons4 < 0)
-			addedInDiscons4 = 10;
-
-		DEBUG_LOG(("addedInDesync=%d,%d,%d, addedInDiscon=%d,%d,%d\n",
-			addedInDesyncs2, addedInDesyncs3, addedInDesyncs4,
-			addedInDiscons2, addedInDiscons3, addedInDiscons4));
-
-		if (addedInDesyncs2 || addedInDesyncs3 || addedInDesyncs4 || addedInDiscons2 || addedInDiscons3 || addedInDiscons4)
-		{
-			DEBUG_LOG(("We have a previous discon we can attempt to update!  Bummer...\n"));
-
-			PSRequest req;
-			req.requestType = PSRequest::PSREQUEST_UPDATEPLAYERSTATS;
-			req.email = MESSAGE_QUEUE->getEmail();
-			req.nick = MESSAGE_QUEUE->getNick();
-			req.password = MESSAGE_QUEUE->getPassword();
-			req.player = GameSpyPSMessageQueueInterface::parsePlayerKVPairs((len)?data:"");
-			req.player.id = profileid;
-			req.addDesync = FALSE;
-			req.addDiscon = FALSE;
-			req.lastHouse = 0;
-			TheGameSpyPSMessageQueue->addRequest(req);
-		}
-	}
-
-	resp.responseType = PSResponse::PSRESPONSE_PLAYERSTATS;
-	resp.player = GameSpyPSMessageQueueInterface::parsePlayerKVPairs((len)?data:"");
-	resp.player.id = profileid;
-
-	TheGameSpyPSMessageQueue->addResponse(resp);
-}
-
-static void setPersistentDataLocaleCallback(int localid, int profileid, persisttype_t type, int index, int success, time_t modified, void *instance)
-{
-	DEBUG_LOG(("Data save callback: localid: %d profileid: %d success: %d\n", localid, profileid, success));
-
-	PSThreadClass *t = (PSThreadClass *)instance;
-	if (!t)
-		return;
-
-	t->decrOpCount();
-}
-
-static void setPersistentDataCallback(int localid, int profileid, persisttype_t type, int index, int success, time_t modified, void *instance)
-{
-	DEBUG_LOG(("Data save callback: localid: %d profileid: %d success: %d\n", localid, profileid, success));
-
-	PSThreadClass *t = (PSThreadClass *)instance;
-	if (!t)
-		return;
-
-	if (success)
-	{
-		UserPreferences pref;
-		AsciiString userPrefFilename;
-		userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", profileid);
-		DEBUG_LOG(("setPersistentDataCallback - writing stats to file %s\n", userPrefFilename.str()));
-		pref.load(userPrefFilename);
-		pref.clear();
-		pref.write();
-	}
-	t->decrOpCount();
-}
-
-struct CDAuthInfo
-{
-	Bool success;
-	Bool done;
-	Int id;
-};
-
-void preAuthCDCallback(int localid, int profileid, int authenticated, char *errmsg, void *instance)
-{
-	DEBUG_LOG(("preAuthCDCallback(): profileid: %d auth: %d err: %s\n", profileid, authenticated, errmsg));
-
-	CDAuthInfo *authInfo = (CDAuthInfo *)instance;
-	authInfo->success = authenticated;
-	authInfo->done = TRUE;
-	authInfo->id = profileid;
-}
-
-static void getPreorderCallback(int localid, int profileid, persisttype_t type, int index, int success, time_t modified, char *data, int len, void *instance)
-{
-	PSThreadClass *t = (PSThreadClass *)instance;
-	if (!t)
-		return;
-
-	t->decrOpCount();
-
-	PSResponse resp;
-
-	if (!success)
-	{
-		DEBUG_LOG(("Failed getPreorderCallback()\n"));
-		return;
-	}
-
-	resp.responseType = PSResponse::PSRESPONSE_PREORDER;
-	resp.preorder = (data && strcmp(data, "\\preorder\\1") == 0);
-	DEBUG_LOG(("getPreorderCallback() - data was '%s'\n", data));
-
-	TheGameSpyPSMessageQueue->addResponse(resp);
-}
-
-void PSThreadClass::Thread_Function()
-{
-	try {
-	_set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
-	/*********
-	First step, set our game authentication info
-	We could do:
-		strcpy(gcd_gamename,"ccgenerals");
-		strcpy(gcd_secret_key,"h5T2f6");
-	or
-		strcpy(gcd_gamename,"ccgeneralsb");
-		strcpy(gcd_secret_key,"g3T9s2");
-	...but this is more secure:
-	**********/
-	/**
-	gcd_gamename[0]='c';gcd_gamename[1]='c';gcd_gamename[2]='g';gcd_gamename[3]='e';
-	gcd_gamename[4]='n';gcd_gamename[5]='e';gcd_gamename[6]='r';gcd_gamename[7]='a';
-	gcd_gamename[8]='l';gcd_gamename[9]='s';gcd_gamename[10]='b';gcd_gamename[11]='\0';
-	gcd_secret_key[0]='g';gcd_secret_key[1]='3';gcd_secret_key[2]='T';gcd_secret_key[3]='9';
-	gcd_secret_key[4]='s';gcd_secret_key[5]='2';gcd_secret_key[6]='\0';
-	/**/
-	gcd_gamename[0]='c';gcd_gamename[1]='c';gcd_gamename[2]='g';gcd_gamename[3]='e';
-	gcd_gamename[4]='n';gcd_gamename[5]='e';gcd_gamename[6]='r';gcd_gamename[7]='a';
-	gcd_gamename[8]='l';gcd_gamename[9]='s';gcd_gamename[10]='\0';
-	gcd_secret_key[0]='h';gcd_secret_key[1]='5';gcd_secret_key[2]='T';gcd_secret_key[3]='2';
-	gcd_secret_key[4]='f';gcd_secret_key[5]='6';gcd_secret_key[6]='\0';
-	/**/
-	
-	//strcpy(StatsServerHostname, "sdkdev.gamespy.com");
-
-	PSRequest req;
-	while ( running )
-	{
-		// deal with requests
-		if (TheGameSpyPSMessageQueue->getRequest(req))
-		{
-			switch (req.requestType)
-			{
-			case PSRequest::PSREQUEST_SENDGAMERESTOGAMESPY:
-				{
-					if (tryConnect())
-					{
-						NewGame(0);
-#ifdef DEBUG_LOGGING
-						Int res = 
-#endif // DEBUG_LOGGING
-							SendGameSnapShot(NULL, req.results.c_str(), SNAP_FINAL);
-						DEBUG_LOG(("Just sent game results - res was %d\n", res));
-						FreeGame(NULL);
-					}
-				}
-				break;
-			case PSRequest::PSREQUEST_READPLAYERSTATS:
-				{
-					Bool initialConnection = FALSE;
-					if (!MESSAGE_QUEUE->getLocalPlayerID())
-					{
-						MESSAGE_QUEUE->setLocalPlayerID(req.player.id); // first request is for ourselves
-						MESSAGE_QUEUE->setEmail(req.email);
-						MESSAGE_QUEUE->setNick(req.nick);
-						MESSAGE_QUEUE->setPassword(req.password);
-						DEBUG_LOG(("Setting email/nick/password = %s/%s/%s\n", req.email.c_str(), req.nick.c_str(), req.password.c_str()));
-						initialConnection = TRUE;
-					}
-					DEBUG_LOG(("Processing PSRequest::PSREQUEST_READPLAYERSTATS\n"));
-					if (tryConnect())
-					{
-						DEBUG_LOG(("Successful login\n"));
-						incrOpCount();
-						gsi_char keys[] = "";
-						GetPersistDataValues(0, req.player.id, pd_public_rw, 0, keys, getPersistentDataCallback, this);
-					}
-					else
-					{
-						DEBUG_LOG(("Unsuccessful login - retry=%d\n", initialConnection));
-						PSResponse resp;
-						resp.responseType = PSResponse::PSRESPONSE_COULDNOTCONNECT;
-						resp.player.id = req.player.id;
-						TheGameSpyPSMessageQueue->addResponse(resp);
-						if (initialConnection)
-						{
-							// we haven't gotten stats for ourselves - try again
-							DEBUG_LOG(("Requesting retry for reading local player's stats\n"));
-							PSRequest req;
-							req.requestType = PSRequest::PSREQUEST_READPLAYERSTATS;
-							req.player.id = MESSAGE_QUEUE->getLocalPlayerID();
-							TheGameSpyPSMessageQueue->addRequest(req);
-						}
-					}
-				}
-				break;
-			case PSRequest::PSREQUEST_UPDATEPLAYERLOCALE:
-				{
-					DEBUG_LOG(("Processing PSRequest::PSREQUEST_UPDATEPLAYERLOCALE\n"));
-					if (tryConnect() && tryLogin(req.player.id, req.nick, req.password, req.email))
-					{
-						char kvbuf[256];
-						sprintf(kvbuf, "\\locale\\%d", req.player.locale);
-						incrOpCount();
-						SetPersistDataValues(0, req.player.id, pd_public_rw, 0, kvbuf, setPersistentDataLocaleCallback, this);
-					}
-				}
-				break;
-			case PSRequest::PSREQUEST_UPDATEPLAYERSTATS:
-				{
-					/*
-					** NOTE THAT THIS IS HIGHLY DEPENDENT ON INI ORDERING FOR THE PLAYERTEMPLATES!!!
-					*/
-					DEBUG_LOG(("Processing PSRequest::PSREQUEST_UPDATEPLAYERSTATS\n"));
-					UserPreferences pref;
-					AsciiString userPrefFilename;
-					userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", MESSAGE_QUEUE->getLocalPlayerID());
-					DEBUG_LOG(("using the file %s\n", userPrefFilename.str()));
-					pref.load(userPrefFilename);
-					Int addedInDesyncs2 = pref.getInt("0", 0);
-					DEBUG_LOG(("addedInDesyncs2 = %d\n", addedInDesyncs2));
-					if (addedInDesyncs2 < 0)
-						addedInDesyncs2 = 10;
-					Int addedInDesyncs3 = pref.getInt("1", 0);
-					DEBUG_LOG(("addedInDesyncs3 = %d\n", addedInDesyncs3));
-					if (addedInDesyncs3 < 0)
-						addedInDesyncs3 = 10;
-					Int addedInDesyncs4 = pref.getInt("2", 0);
-					DEBUG_LOG(("addedInDesyncs4 = %d\n", addedInDesyncs4));
-					if (addedInDesyncs4 < 0)
-						addedInDesyncs4 = 10;
-					Int addedInDiscons2 = pref.getInt("3", 0);
-					DEBUG_LOG(("addedInDiscons2 = %d\n", addedInDiscons2));
-					if (addedInDiscons2 < 0)
-						addedInDiscons2 = 10;
-					Int addedInDiscons3 = pref.getInt("4", 0);
-					DEBUG_LOG(("addedInDiscons3 = %d\n", addedInDiscons3));
-					if (addedInDiscons3 < 0)
-						addedInDiscons3 = 10;
-					Int addedInDiscons4 = pref.getInt("5", 0);
-					DEBUG_LOG(("addedInDiscons4 = %d\n", addedInDiscons4));
-					if (addedInDiscons4 < 0)
-						addedInDiscons4 = 10;
-
-					DEBUG_LOG(("req.addDesync=%d, req.addDiscon=%d, addedInDesync=%d,%d,%d, addedInDiscon=%d,%d,%d\n",
-						req.addDesync, req.addDiscon, addedInDesyncs2, addedInDesyncs3, addedInDesyncs4,
-						addedInDiscons2, addedInDiscons3, addedInDiscons4));
-
-					if (req.addDesync || req.addDiscon)
-					{
-						AsciiString val;
-						if (req.lastHouse == 2)
-						{
-							val.format("%d", addedInDesyncs2 + req.addDesync);
-							pref["0"] = val;
-							val.format("%d", addedInDiscons2 + req.addDiscon);
-							pref["3"] = val;
-							DEBUG_LOG(("house 2 req.addDesync || req.addDiscon: %d %d\n",
-								addedInDesyncs2 + req.addDesync, addedInDiscons2 + req.addDiscon));
-						}
-						else if (req.lastHouse == 3)
-						{
-							val.format("%d", addedInDesyncs3 + req.addDesync);
-							pref["1"] = val;
-							val.format("%d", addedInDiscons3 + req.addDiscon);
-							pref["4"] = val;
-							DEBUG_LOG(("house 3 req.addDesync || req.addDiscon: %d %d\n",
-								addedInDesyncs3 + req.addDesync, addedInDiscons3 + req.addDiscon));
-						}
-						else
-						{
-							val.format("%d", addedInDesyncs4 + req.addDesync);
-							pref["2"] = val;
-							val.format("%d", addedInDiscons4 + req.addDiscon);
-							pref["5"] = val;
-							DEBUG_LOG(("house 4 req.addDesync || req.addDiscon: %d %d\n",
-								addedInDesyncs4 + req.addDesync, addedInDiscons4 + req.addDiscon));
-						}
-						pref.write();
-						if (req.password.size() == 0)
-							return;
-					}
-					if (!req.player.id)
-					{
-						DEBUG_LOG(("Bailing because ID is NULL!\n"));
-						return;
-					}
-					req.player.desyncs[2] += addedInDesyncs2;
-					req.player.games[2] += addedInDesyncs2;
-					req.player.discons[2] += addedInDiscons2;
-					req.player.games[2] += addedInDiscons2;
-					req.player.desyncs[3] += addedInDesyncs3;
-					req.player.games[3] += addedInDesyncs3;
-					req.player.discons[3] += addedInDiscons3;
-					req.player.games[3] += addedInDiscons3;
-					req.player.desyncs[4] += addedInDesyncs4;
-					req.player.games[4] += addedInDesyncs4;
-					req.player.discons[4] += addedInDiscons4;
-					req.player.games[4] += addedInDiscons4;
-					DEBUG_LOG(("House2: %d/%d/%d, House3: %d/%d/%d, House4: %d/%d/%d\n",
-						req.player.desyncs[2], req.player.discons[2], req.player.games[2],
-						req.player.desyncs[3], req.player.discons[3], req.player.games[3],
-						req.player.desyncs[4], req.player.discons[4], req.player.games[4]
-						));
-					if (tryConnect() && tryLogin(req.player.id, req.nick, req.password, req.email))
-					{
-						DEBUG_LOG(("Logged in!\n"));
-						if (TheGameSpyPSMessageQueue)
-							TheGameSpyPSMessageQueue->trackPlayerStats(req.player);
-
-						char *munkeeHack = strdup(GameSpyPSMessageQueueInterface::formatPlayerKVPairs(req.player).c_str()); // GS takes a char* for some reason
-						incrOpCount();
-						DEBUG_LOG(("Setting values %s\n", munkeeHack));
-						SetPersistDataValues(0, req.player.id, pd_public_rw, 0, munkeeHack, setPersistentDataCallback, this);
-						free(munkeeHack);
-					}
-					else
-					{
-						DEBUG_LOG(("Cannot connect!\n"));
-						//if (IsStatsConnected())
-							//CloseStatsConnection();
-					}
-				}
-				break;
-			case PSRequest::PSREQUEST_READCDKEYSTATS:
-				{
-					DEBUG_LOG(("Processing PSRequest::PSREQUEST_READCDKEYSTATS\n"));
-					if (tryConnect())
-					{
-						incrOpCount();
-						CDAuthInfo cdAuthInfo;
-						cdAuthInfo.done = FALSE;
-						cdAuthInfo.success = FALSE;
-						cdAuthInfo.id = 0;
-						char cdkeyHash[33] = "";
-						char validationToken[33] = "";
-						char *munkeeHack = strdup(req.cdkey.c_str()); // GenerateAuth takes a char*, not a const char* :P
-
-						GenerateAuth(GetChallenge(NULL), munkeeHack, validationToken); // validation token
-						GenerateAuth("", munkeeHack, cdkeyHash); // cdkey hash
-
-						free (munkeeHack);
-
-						PreAuthenticatePlayerCD( 0, "preorder", cdkeyHash, validationToken, preAuthCDCallback , &cdAuthInfo);
-
-						while (running && IsStatsConnected() && !cdAuthInfo.done)
-							PersistThink();
-
-						DEBUG_LOG(("Looking for preorder status for %d (success=%d, done=%d) from CDKey %s with hash %s\n",
-							cdAuthInfo.id, cdAuthInfo.success, cdAuthInfo.done, req.cdkey.c_str(), cdkeyHash));
-						if (cdAuthInfo.done && cdAuthInfo.success)
-						{
-							gsi_char keys[] = "\\preorder";
-							GetPersistDataValues(0, cdAuthInfo.id, pd_public_ro, 0, keys, getPreorderCallback, this);
-						}
-						else
-							decrOpCount();
-					}
-				}
-				break;
-			}
-		}
-
-		// update the network
-		if (IsStatsConnected())
-		{
-			PersistThink();
-			if (m_opCount <= 0)
-			{
-				DEBUG_ASSERTCRASH(m_opCount == 0, ("Negative operations pending!!!"));
-				DEBUG_LOG(("m_opCount = %d - closing connection\n", m_opCount));
-				CloseStatsConnection();
-				m_opCount = 0;
-			}
-		}
-
-		// end our timeslice
-		Switch_Thread();
-	}
-
-	if (IsStatsConnected())
-		CloseStatsConnection();
-	} catch ( ... ) {
-		DEBUG_CRASH(("Exception in storage thread!"));
-	}
-}
-
-//-------------------------------------------------------------------------
-PSPlayerStats::PSPlayerStats( void )
-{
-	reset();
-}
-
-void PSPlayerStats::reset( void )
-{
-	id = 0;
-	locale = 0;
-	gamesAsRandom = 0;
-	lastFPS = 0;
-	lastGeneral = 0;
-	gamesInRowWithLastGeneral = 0;
-	builtNuke = 0;
-	builtSCUD = 0;
-	builtParticleCannon = 0;
-	challengeMedals = 0;
-	battleHonors = 0;
-	winsInARow = 0;
-	maxWinsInARow = 0;
-	lossesInARow = 0;
-	maxLossesInARow = 0;
-	disconsInARow = 0;
-	maxDisconsInARow = 0;
-	desyncsInARow = 0;
-	maxDesyncsInARow = 0;
-	lastLadderPort = 0;
-
-	//Added By Sadullah Nader
-	maxQMwinsInARow = 0;
-	QMwinsInARow = 0;
-	//
-}
-
-//-------------------------------------------------------------------------
-#define CHECK(x) if (k == #x && generalMarker >= 0) { s.x[generalMarker] = atoi(v.c_str()); continue; }
-
-PSPlayerStats GameSpyPSMessageQueueInterface::parsePlayerKVPairs( std::string kvPairs )
-{
-	PSPlayerStats s;
-	kvPairs.append("\\");
-
-	Int offset = 0;
-	while (1)
-	{
-		Int firstMarker = kvPairs.find_first_of('\\', offset);
-		if (firstMarker < 0)
-			break;
-		Int secondMarker = kvPairs.find_first_of('\\', firstMarker + 1);
-		if (secondMarker < 0)
-			break;
-		Int thirdMarker = kvPairs.find_first_of('\\', secondMarker + 1);
-		if (thirdMarker < 0)
-			break;
-		Int generalMarker = kvPairs.find_last_not_of("0123456789", secondMarker - 1);
-		std::string k, v, g;
-		if (generalMarker == secondMarker - 1)
-		{
-			k = kvPairs.substr(firstMarker + 1, secondMarker - firstMarker - 1);
-			generalMarker = -1;
-		}
-		else
-		{
-			k = kvPairs.substr(firstMarker + 1, generalMarker - firstMarker);
-			g = kvPairs.substr(generalMarker + 1, secondMarker - generalMarker - 1);
-			generalMarker = atoi(g.c_str());
-		}
-		v = kvPairs.substr(secondMarker + 1, thirdMarker - secondMarker - 1);
-		//DEBUG_LOG(("%d [%s] [%s]\n", generalMarker, k.c_str(), v.c_str()));
-		offset = thirdMarker - 1;
-
-		CHECK(wins);
-		CHECK(losses);
-		CHECK(games);
-		CHECK(duration);
-		CHECK(unitsKilled);
-		CHECK(unitsLost);
-		CHECK(unitsBuilt);
-		CHECK(buildingsKilled);
-		CHECK(buildingsLost);
-		CHECK(buildingsBuilt);
-		CHECK(earnings);
-		CHECK(techCaptured);
-		CHECK(discons);
-		CHECK(desyncs);
-		CHECK(surrenders);
-		CHECK(gamesOf2p);
-		CHECK(gamesOf3p);
-		CHECK(gamesOf4p);
-		CHECK(gamesOf5p);
-		CHECK(gamesOf6p);
-		CHECK(gamesOf7p);
-		CHECK(gamesOf8p);
-		CHECK(customGames);
-		CHECK(QMGames);
-		
-		if (k == "locale" && generalMarker < 0)
-		{
-			s.locale = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "random" && generalMarker < 0)
-		{
-			s.gamesAsRandom = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "options" && generalMarker < 0)
-		{
-			s.options = v;
-			continue;
-		}
-
-		if (k == "systemSpec" && generalMarker < 0)
-		{
-			s.systemSpec = v;
-			continue;
-		}
-
-		if (k == "fps" && generalMarker < 0)
-		{
-			s.lastFPS = atof(v.c_str());
-			continue;
-		}
-		
-		if (k == "lastGeneral" && generalMarker < 0)
-		{
-			s.lastGeneral = atoi(v.c_str());
-			continue;
-		}
-		if (k == "genInRow" && generalMarker < 0)
-		{
-			s.gamesInRowWithLastGeneral = atoi(v.c_str());
-			continue;
-		}
-		if (k == "builtNuke" && generalMarker < 0)
-		{
-			s.builtNuke = atoi(v.c_str());
-			continue;
-		}
-		if (k == "builtSCUD" && generalMarker < 0)
-		{
-			s.builtSCUD = atoi(v.c_str());
-			continue;
-		}
-		if (k == "builtCannon" && generalMarker < 0)
-		{
-			s.builtParticleCannon = atoi(v.c_str());
-			continue;
-		}
-		if (k == "challenge" && generalMarker < 0)
-		{
-			s.challengeMedals = atoi(v.c_str());
-			continue;
-		}
-		if (k == "battle" && generalMarker < 0)
-		{
-			s.battleHonors = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "WinRow" && generalMarker < 0)
-		{
-			s.winsInARow = atoi(v.c_str());
-			continue;
-		}
-		if (k == "WinRowMax" && generalMarker < 0)
-		{
-			s.maxWinsInARow = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "LossRow" && generalMarker < 0)
-		{
-			s.lossesInARow = atoi(v.c_str());
-			continue;
-		}
-		if (k == "LossRowMax" && generalMarker < 0)
-		{
-			s.maxLossesInARow = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "DSRow" && generalMarker < 0)
-		{
-			s.desyncsInARow = atoi(v.c_str());
-			continue;
-		}
-		if (k == "DSRowMax" && generalMarker < 0)
-		{
-			s.maxDesyncsInARow = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "DCRow" && generalMarker < 0)
-		{
-			s.disconsInARow = atoi(v.c_str());
-			continue;
-		}
-		if (k == "DCRowMax" && generalMarker < 0)
-		{
-			s.maxDisconsInARow = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "ladderPort" && generalMarker < 0)
-		{
-			s.lastLadderPort = atoi(v.c_str());
-			continue;
-		}
-		if (k == "ladderHost" && generalMarker < 0)
-		{
-			s.lastLadderHost = v;
-			continue;
-		}
-
-		//DEBUG_ASSERTCRASH(generalMarker >= 0, ("Unknown KV Pair in persistent storage: [%s] = [%s]\n", k.c_str(), v.c_str()));
-		//DEBUG_ASSERTCRASH(generalMarker  < 0, ("Unknown KV Pair in persistent storage for PlayerTemplate %d: [%s] = [%s]\n", generalMarker, k.c_str(), v.c_str()));
-	}
-
-	return s;
-}
-
-#define ITERATE_OVER(x) for (it = stats.x.begin(); it != stats.x.end(); ++it) \
-{ \
-	if (it->second > 0) \
-	{ \
-		sprintf(kvbuf, "\\" #x "%d\\%d", it->first, it->second); \
-		s.append(kvbuf); \
-	} \
-}
-
-std::string GameSpyPSMessageQueueInterface::formatPlayerKVPairs( PSPlayerStats stats )
-{
-	char kvbuf[256];
-	std::string s = "";
-	PerGeneralMap::iterator it;
-
-	ITERATE_OVER(wins);
-	ITERATE_OVER(losses);
-	ITERATE_OVER(games);
-	ITERATE_OVER(duration);
-	ITERATE_OVER(unitsKilled);
-	ITERATE_OVER(unitsLost);
-	ITERATE_OVER(unitsBuilt);
-	ITERATE_OVER(buildingsKilled);
-	ITERATE_OVER(buildingsLost);
-	ITERATE_OVER(buildingsBuilt);
-	ITERATE_OVER(earnings);
-	ITERATE_OVER(techCaptured);
-	
-	//GS  Report all disconnects, even if zero, because might have been 
-	//previously reported as 1 by updateAdditionalGameSpyDisconnections
-//	ITERATE_OVER(discons);
-	for (Int ptIdx = 0; ptIdx < ThePlayerTemplateStore->getPlayerTemplateCount(); ++ptIdx)
-	{
-//		const PlayerTemplate* pTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(ptIdx);
-//		const GeneralPersona* pGeneral = TheChallengeGenerals->getGeneralByTemplateName(pTemplate->getName());
-//		BOOL isReported = pGeneral ? pGeneral->isStartingEnabled() : FALSE;
-//		if( !isReported )
-//			continue;  //don't report unplayable templates (observer, boss, etc.)
-
-		sprintf(kvbuf, "\\discons%d\\%d", ptIdx, stats.discons[ptIdx]);
-		s.append(kvbuf);
-	}
-
-	ITERATE_OVER(desyncs);
-	ITERATE_OVER(surrenders);
-	ITERATE_OVER(gamesOf2p);
-	ITERATE_OVER(gamesOf3p);
-	ITERATE_OVER(gamesOf4p);
-	ITERATE_OVER(gamesOf5p);
-	ITERATE_OVER(gamesOf6p);
-	ITERATE_OVER(gamesOf7p);
-	ITERATE_OVER(gamesOf8p);
-	ITERATE_OVER(customGames);
-	ITERATE_OVER(QMGames);
-	
-	if (stats.locale > 0)
-	{
-		sprintf(kvbuf, "\\locale\\%d", stats.locale);
-		s.append(kvbuf);
-	}
-
-	if (stats.gamesAsRandom > 0)
-	{
-		sprintf(kvbuf, "\\random\\%d", stats.gamesAsRandom);
-		s.append(kvbuf);
-	}
-
-	if (stats.options.length())
-	{
-		snprintf(kvbuf, 256, "\\options\\%s", stats.options.c_str());
-		s.append(kvbuf);
-	}
-
-	if (stats.systemSpec.length())
-	{
-		snprintf(kvbuf, 256, "\\systemSpec\\%s", stats.systemSpec.c_str());
-		s.append(kvbuf);
-	}
-
-	if (stats.lastFPS > 0.0f)
-	{
-		sprintf(kvbuf, "\\fps\\%g", stats.lastFPS);
-		s.append(kvbuf);
-	}
-	if (stats.lastGeneral >= 0)
-	{
-		sprintf(kvbuf, "\\lastGeneral\\%d", stats.lastGeneral);
-		s.append(kvbuf);
-	}
-	if (stats.gamesInRowWithLastGeneral >= 0)
-	{
-		sprintf(kvbuf, "\\genInRow\\%d", stats.gamesInRowWithLastGeneral);
-		s.append(kvbuf);
-	}
-	if (stats.builtParticleCannon >= 0)
-	{
-		sprintf(kvbuf, "\\builtCannon\\%d", stats.builtParticleCannon);
-		s.append(kvbuf);
-	}
-	if (stats.builtNuke >= 0)
-	{
-		sprintf(kvbuf, "\\builtNuke\\%d", stats.builtNuke);
-		s.append(kvbuf);
-	}
-	if (stats.builtSCUD >= 0)
-	{
-		sprintf(kvbuf, "\\builtSCUD\\%d", stats.builtSCUD);
-		s.append(kvbuf);
-	}
-	if (stats.challengeMedals > 0)
-	{
-		sprintf(kvbuf, "\\challenge\\%d", stats.challengeMedals);
-		s.append(kvbuf);
-	}
-	if (stats.battleHonors > 0)
-	{
-		sprintf(kvbuf, "\\battle\\%d", stats.battleHonors);
-		s.append(kvbuf);
-	}
-
-	//if (stats.winsInARow > 0)
-	{
-		sprintf(kvbuf, "\\WinRow\\%d", stats.winsInARow);
-		s.append(kvbuf);
-	}
-	if (stats.maxWinsInARow > 0)
-	{
-		sprintf(kvbuf, "\\WinRowMax\\%d", stats.maxWinsInARow);
-		s.append(kvbuf);
-	}
-
-	//if (stats.lossesInARow > 0)
-	{
-		sprintf(kvbuf, "\\LossRow\\%d", stats.lossesInARow);
-		s.append(kvbuf);
-	}
-	if (stats.maxLossesInARow > 0)
-	{
-		sprintf(kvbuf, "\\LossRowMax\\%d", stats.maxLossesInARow);
-		s.append(kvbuf);
-	}
-
-	//if (stats.disconsInARow > 0)
-	{
-		sprintf(kvbuf, "\\DCRow\\%d", stats.disconsInARow);
-		s.append(kvbuf);
-	}
-	if (stats.maxDisconsInARow > 0)
-	{
-		sprintf(kvbuf, "\\DCRowMax\\%d", stats.maxDisconsInARow);
-		s.append(kvbuf);
-	}
-
-	//if (stats.desyncsInARow > 0)
-	{
-		sprintf(kvbuf, "\\DSRow\\%d", stats.desyncsInARow);
-		s.append(kvbuf);
-	}
-	if (stats.maxDesyncsInARow > 0)
-	{
-		sprintf(kvbuf, "\\DSRowMax\\%d", stats.maxDesyncsInARow);
-		s.append(kvbuf);
-	}
-
-	if (stats.lastLadderPort > 0)
-	{
-		sprintf(kvbuf, "\\ladderPort\\%d", stats.lastLadderPort);
-		s.append(kvbuf);
-	}
-	if (stats.lastLadderHost.length())
-	{
-		snprintf(kvbuf, 256, "\\ladderHost\\%s", stats.lastLadderHost.c_str());
-		s.append(kvbuf);
-	}
-
-	DEBUG_LOG(("Formatted persistent values as '%s'\n", s.c_str()));
-	return s;
-}
-
-//-------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp
deleted file mode 100644
index ea814f758a4..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp
+++ /dev/null
@@ -1,575 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PingThread.cpp //////////////////////////////////////////////////////
-// Ping thread
-// Author: Matthew D. Campbell, August 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include <winsock.h>	// This one has to be here. Prevents collisions with windsock2.h
-
-#include "GameNetwork/GameSpy/PingThread.h"
-#include "mutex.h"
-#include "thread.h"
-
-#include "Common/StackDump.h"
-#include "Common/SubsystemInterface.h"
-
-//-------------------------------------------------------------------------
-
-static const Int NumWorkerThreads = 10;
-
-typedef std::queue<PingRequest> RequestQueue;
-typedef std::queue<PingResponse> ResponseQueue;
-class PingThreadClass;
-
-class Pinger : public PingerInterface
-{
-public:
-	virtual ~Pinger();
-	Pinger();
-	virtual void startThreads( void );
-	virtual void endThreads( void );
-	virtual Bool areThreadsRunning( void );
-
-	virtual void addRequest( const PingRequest& req );
-	virtual Bool getRequest( PingRequest& resp );
-
-	virtual void addResponse( const PingResponse& resp );
-	virtual Bool getResponse( PingResponse& resp );
-
-	virtual Bool arePingsInProgress( void );
-	virtual Int getPing( AsciiString hostname );
-
-	virtual void clearPingMap( void );
-	virtual AsciiString getPingString( Int timeout );
-
-private:
-	MutexClass m_requestMutex;
-	MutexClass m_responseMutex;
-	MutexClass m_pingMapMutex;
-	RequestQueue m_requests;
-	ResponseQueue m_responses;
-	Int m_requestCount;
-	Int m_responseCount;
-
-	std::map<std::string, Int> m_pingMap;
-
-	PingThreadClass *m_workerThreads[NumWorkerThreads];
-};
-
-PingerInterface* PingerInterface::createNewPingerInterface( void )
-{
-	return NEW Pinger;
-}
-
-PingerInterface *ThePinger;
-
-//-------------------------------------------------------------------------
-
-class PingThreadClass : public ThreadClass
-{
-
-public:
-	PingThreadClass() : ThreadClass() {}
-
-	void Thread_Function();
-
-private:
-	Int doPing( UnsignedInt IP, Int timeout );
-};
-
-
-//-------------------------------------------------------------------------
-
-Pinger::Pinger() : m_requestCount(0), m_responseCount(0)
-{
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		m_workerThreads[i] = NULL;
-	}
-}
-
-Pinger::~Pinger()
-{
-	endThreads();
-}
-
-void Pinger::startThreads( void )
-{
-	endThreads();
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		m_workerThreads[i] = NEW PingThreadClass;
-		m_workerThreads[i]->Execute();
-	}
-}
-
-void Pinger::endThreads( void )
-{
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		if (m_workerThreads[i])
-		{
-			delete m_workerThreads[i];
-			m_workerThreads[i] = NULL;
-		}
-	}
-}
-
-Bool Pinger::areThreadsRunning( void )
-{
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		if (m_workerThreads[i])
-		{
-			if (m_workerThreads[i]->Is_Running())
-				return true;
-		}
-	}
-	return false;
-}
-
-void Pinger::addRequest( const PingRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex);
-
-	++m_requestCount;
-	m_requests.push(req);
-}
-
-Bool Pinger::getRequest( PingRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_requests.empty())
-		return false;
-	req = m_requests.front();
-	m_requests.pop();
-	return true;
-}
-
-void Pinger::addResponse( const PingResponse& resp )
-{
-	{
-		MutexClass::LockClass m(m_pingMapMutex);
-
-		m_pingMap[resp.hostname] = resp.avgPing;
-	}
-	{
-		MutexClass::LockClass m(m_responseMutex);
-
-		++m_responseCount;
-		m_responses.push(resp);
-	}
-}
-
-Bool Pinger::getResponse( PingResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_responses.empty())
-		return false;
-	resp = m_responses.front();
-	m_responses.pop();
-	return true;
-}
-
-Bool Pinger::arePingsInProgress( void )
-{
-	return (m_requestCount != m_responseCount);
-}
-
-Int Pinger::getPing( AsciiString hostname )
-{
-	MutexClass::LockClass m(m_pingMapMutex, 0);
-	if (m.Failed())
-		return false;
-
-	std::map<std::string, Int>::const_iterator it = m_pingMap.find(hostname.str());
-	if (it != m_pingMap.end())
-		return it->second;
-
-	return -1;
-}
-
-void Pinger::clearPingMap( void )
-{
-	MutexClass::LockClass m(m_pingMapMutex);
-	m_pingMap.clear();
-}
-
-AsciiString Pinger::getPingString( Int timeout )
-{
-	MutexClass::LockClass m(m_pingMapMutex);
-
-	AsciiString pingString;
-	AsciiString tmp;
-	for (std::map<std::string, Int>::const_iterator it = m_pingMap.begin(); it != m_pingMap.end(); ++it)
-	{
-		Int ping = it->second;
-		if (ping < 0 || ping > timeout)
-			ping = timeout;
-		ping = ping * 255 / timeout;
-		tmp.format("%2.2X", ping);
-		pingString.concat(tmp);
-	}
-	return pingString;
-}
-
-//-------------------------------------------------------------------------
-
-void PingThreadClass::Thread_Function()
-{
-	try {
-	_set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
-	PingRequest req;
-
-	WSADATA wsaData;
-
-	// Fire up winsock (prob already done, but doesn't matter)
-	WORD wVersionRequested = MAKEWORD(1, 1);
-	WSAStartup( wVersionRequested, &wsaData );
-
-	while ( running )
-	{
-		// deal with requests
-		if (ThePinger->getRequest(req))
-		{
-			// resolve the hostname
-			const char *hostnameBuffer = req.hostname.c_str();
-			UnsignedInt IP = 0xFFFFFFFF;
-			if (isdigit(hostnameBuffer[0]))
-			{
-				IP = inet_addr(hostnameBuffer);
-				in_addr hostNode;
-				hostNode.s_addr = IP;
-				DEBUG_LOG(("pinging %s - IP = %s\n", hostnameBuffer, inet_ntoa(hostNode) ));
-			}
-			else
-			{
-				HOSTENT *hostStruct;
-				in_addr *hostNode;
-				hostStruct = gethostbyname(hostnameBuffer);
-				if (hostStruct == NULL)
-				{
-					DEBUG_LOG(("pinging %s - host lookup failed\n", hostnameBuffer));
-					
-					// Even though this failed to resolve IP, still need to send a
-					//   callback.
-					IP = 0xFFFFFFFF;   // flag for IP resolve failed
-				}
-				hostNode = (in_addr *) hostStruct->h_addr;
-				IP = hostNode->s_addr;
-				DEBUG_LOG(("pinging %s IP = %s\n", hostnameBuffer, inet_ntoa(*hostNode) ));
-			}
-
-			// do ping
-			Int totalPing = 0;
-			Int goodReps = 0;
-			Int reps = req.repetitions;
-			while (reps-- && running && IP != 0xFFFFFFFF)
-			{
-				Int ping = doPing(IP, req.timeout);
-				if (ping >= 0)
-				{
-					totalPing += ping;
-					++goodReps;
-				}
-
-				// end our timeslice
-				Switch_Thread();
-			}
-			if (!goodReps)
-				totalPing = -1;
-			else
-				totalPing = totalPing / goodReps;
-
-			PingResponse resp;
-			resp.hostname = req.hostname;
-			resp.avgPing = totalPing;
-			resp.repetitions = goodReps;
-			ThePinger->addResponse(resp);
-		}
-
-		// end our timeslice
-		Switch_Thread();
-	}
-
-	WSACleanup();
-	} catch ( ... ) {
-		DEBUG_CRASH(("Exception in ping thread!"));
-	}
-}
-
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-
-HANDLE WINAPI IcmpCreateFile(VOID); /* INVALID_HANDLE_VALUE on error */
-BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle); /* FALSE on error */
-
-/* Note 2: For the most part, you can refer to RFC 791 for detials
- * on how to fill in values for the IP option information structure. 
- */
-typedef struct ip_option_information
-{
-   UnsignedByte Ttl;         /* Time To Live (used for traceroute) */
-   UnsignedByte Tos;         /* Type Of Service (usually 0) */
-   UnsignedByte Flags;       /* IP header flags (usually 0) */
-   UnsignedByte OptionsSize; /* Size of options data (usually 0, max 40) */
-   UnsignedByte FAR *OptionsData;   /* Options data buffer */
-}
-IPINFO, *PIPINFO, FAR *LPIPINFO;
-
-
-/* Note 1: The Reply Buffer will have an array of ICMP_ECHO_REPLY
- * structures, followed by options and the data in ICMP echo reply
- * datagram received. You must have room for at least one ICMP
- * echo reply structure, plus 8 bytes for an ICMP header. 
- */
-typedef struct icmp_echo_reply
-{
-   UnsignedInt Address;     /* source address */
-   ////////UnsignedInt Status;      /* IP status value (see below) */
-   UnsignedInt RTTime;      /* Round Trip Time in milliseconds */
-   UnsignedShort DataSize;   /* reply data size */
-   UnsignedShort Reserved;   /* */
-   void FAR *Data;     /* reply data buffer */
-   struct ip_option_information Options; /* reply options */
-}
-ICMPECHO, *PICMPECHO, FAR *LPICMPECHO;
-
-
-DWORD WINAPI IcmpSendEcho(
-   HANDLE IcmpHandle,   /* handle returned from IcmpCreateFile() */
-   UnsignedInt DestAddress,  /* destination IP address (in network order) */
-   LPVOID RequestData,  /* pointer to buffer to send */
-   WORD RequestSize,    /* length of data in buffer */
-   LPIPINFO RequestOptns,   /* see Note 2 */
-   LPVOID ReplyBuffer,  /* see Note 1 */
-   DWORD ReplySize,     /* length of reply (must allow at least 1 reply) */
-   DWORD Timeout       /* time in milliseconds to wait for reply */
-);
-
-
-#define IP_STATUS_BASE 11000
-#define IP_SUCCESS 0
-#define IP_BUF_TOO_SMALL (IP_STATUS_BASE + 1)
-#define IP_DEST_NET_UNREACHABLE (IP_STATUS_BASE + 2)
-#define IP_DEST_HOST_UNREACHABLE (IP_STATUS_BASE + 3)
-#define IP_DEST_PROT_UNREACHABLE (IP_STATUS_BASE + 4)
-#define IP_DEST_PORT_UNREACHABLE (IP_STATUS_BASE + 5)
-#define IP_NO_RESOURCES (IP_STATUS_BASE + 6)
-#define IP_BAD_OPTION (IP_STATUS_BASE + 7)
-#define IP_HW_ERROR (IP_STATUS_BASE + 8)
-#define IP_PACKET_TOO_BIG (IP_STATUS_BASE + 9)
-#define IP_REQ_TIMED_OUT (IP_STATUS_BASE + 10)
-#define IP_BAD_REQ (IP_STATUS_BASE + 11)
-#define IP_BAD_ROUTE (IP_STATUS_BASE + 12)
-#define IP_TTL_EXPIRED_TRANSIT (IP_STATUS_BASE + 13)
-#define IP_TTL_EXPIRED_REASSEM (IP_STATUS_BASE + 14)
-#define IP_PARAM_PROBLEM (IP_STATUS_BASE + 15)
-#define IP_SOURCE_QUENCH (IP_STATUS_BASE + 16)
-#define IP_OPTION_TOO_BIG (IP_STATUS_BASE + 17)
-#define IP_BAD_DESTINATION (IP_STATUS_BASE + 18)
-#define IP_ADDR_DELETED (IP_STATUS_BASE + 19)
-#define IP_SPEC_MTU_CHANGE (IP_STATUS_BASE + 20)
-#define IP_MTU_CHANGE (IP_STATUS_BASE + 21)
-#define IP_UNLOAD (IP_STATUS_BASE + 22)
-#define IP_GENERAL_FAILURE (IP_STATUS_BASE + 50)
-#define MAX_IP_STATUS IP_GENERAL_FAILURE
-#define IP_PENDING (IP_STATUS_BASE + 255)
-
-
-#define BUFSIZE     8192
-#define DEFAULT_LEN 32
-#define LOOPLIMIT   4
-#define DEFAULT_TTL 64
-
-Int PingThreadClass::doPing(UnsignedInt IP, Int timeout)
-{
-   /*
-    * Initialize default settings 
-    */
-
-   IPINFO stIPInfo, *lpstIPInfo;
-   HANDLE hICMP, hICMP_DLL;
-   int i, j, nDataLen, nLoopLimit, nTimeOut, nTTL, nTOS;
-   DWORD dwReplyCount;
-   ///////IN_ADDR stDestAddr;
-   BOOL fRet, fDontStop;
-   ///BOOL fTraceRoute;
-
-   nDataLen = DEFAULT_LEN;
-   nLoopLimit = LOOPLIMIT;
-   nTimeOut = timeout;
-   fDontStop = FALSE;
-   lpstIPInfo = NULL;
-   nTTL = DEFAULT_TTL;
-   nTOS = 0;
-
-   Int pingTime = -1;  // in case of error
-
-   char achReqData[BUFSIZE];
-   char achRepData[sizeof(ICMPECHO) + BUFSIZE];
-
-
-   HANDLE ( WINAPI *lpfnIcmpCreateFile )( VOID ) = NULL;
-   BOOL ( WINAPI *lpfnIcmpCloseHandle )( HANDLE ) = NULL;
-   DWORD (WINAPI *lpfnIcmpSendEcho)(HANDLE, DWORD, LPVOID, WORD, LPVOID,
-                                    LPVOID, DWORD, DWORD) = NULL;
-
-
-   /*
-    *  Load the ICMP.DLL
-    */
-   hICMP_DLL = LoadLibrary("ICMP.DLL");
-   if (hICMP_DLL == 0)
-   {
-      DEBUG_LOG(("LoadLibrary() failed: Unable to locate ICMP.DLL!\n"));
-      goto cleanup;
-   }
-
-   /*
-    * Get pointers to ICMP.DLL functions
-    */
-   lpfnIcmpCreateFile = (void * (__stdcall *)(void))GetProcAddress( (HINSTANCE)hICMP_DLL, "IcmpCreateFile");
-   lpfnIcmpCloseHandle = (int (__stdcall *)(void *))GetProcAddress( (HINSTANCE)hICMP_DLL, "IcmpCloseHandle");
-   lpfnIcmpSendEcho = (unsigned long (__stdcall *)(void *, unsigned long, void *, unsigned short,
-                       void *, void *, unsigned long, unsigned long))GetProcAddress( (HINSTANCE)hICMP_DLL, "IcmpSendEcho" );
-
-   if ((!lpfnIcmpCreateFile) ||
-         (!lpfnIcmpCloseHandle) ||
-         (!lpfnIcmpSendEcho))
-   {
-      DEBUG_LOG(("GetProcAddr() failed for at least one function.\n"));
-      goto cleanup;
-   }
-
-
-   /*
-    * IcmpCreateFile() - Open the ping service
-    */
-   hICMP = (HANDLE) lpfnIcmpCreateFile();
-   if (hICMP == INVALID_HANDLE_VALUE)
-   {
-      DEBUG_LOG(("IcmpCreateFile() failed"));
-      goto cleanup;
-   }
-
-   /*
-    * Init data buffer printable ASCII 
-    *  32 (space) through 126 (tilde)
-    */
-   for (j = 0, i = 32; j < nDataLen; j++, i++)
-   {
-      if (i >= 126)
-         i = 32;
-      achReqData[j] = i;
-   }
-
-   /*
-   * Init IPInfo structure
-   */
-   lpstIPInfo = &stIPInfo;
-   stIPInfo.Ttl = nTTL;
-   stIPInfo.Tos = nTOS;
-   stIPInfo.Flags = 0;
-   stIPInfo.OptionsSize = 0;
-   stIPInfo.OptionsData = NULL;
-
-
-
-   /*
-    * IcmpSendEcho() - Send the ICMP Echo Request
-    *                   and read the Reply
-    */
-   dwReplyCount = lpfnIcmpSendEcho(
-                     hICMP,
-                     IP,
-                     achReqData,
-                     nDataLen,
-                     lpstIPInfo,
-                     achRepData,
-                     sizeof(achRepData),
-                     nTimeOut);
-   if (dwReplyCount != 0)
-   {
-      //////////IN_ADDR stDestAddr;
-      DWORD dwStatus;
-
-      pingTime = (*(UnsignedInt *) & (achRepData[8]));
-
-      // I've seen the ping time bigger than the timeout by a little
-      //   bit.  How lame.
-      if (pingTime > timeout)
-         pingTime = timeout;
-
-      dwStatus = *(DWORD *) & (achRepData[4]);
-      if (dwStatus != IP_SUCCESS)
-      {
-         DEBUG_LOG(("ICMPERR: %d\n", dwStatus));
-      }
-
-   }
-   else
-   {
-      DEBUG_LOG(("IcmpSendEcho() failed: %d\n", dwReplyCount));
-      // Ok we didn't get a packet, just say everything's OK
-      //  and the time was -1
-      pingTime = -1;
-      goto cleanup;
-   }
-
-
-   /*
-    * IcmpCloseHandle - Close the ICMP handle
-    */
-   fRet = lpfnIcmpCloseHandle(hICMP);
-   if (fRet == FALSE)
-   {
-      DEBUG_LOG(("Error closing ICMP handle\n"));
-   }
-
-   // Say what you will about goto's but it's handy for stuff like this
-cleanup:
-
-   // Shut down...
-   if (hICMP_DLL)
-      FreeLibrary((HINSTANCE)hICMP_DLL);
-
-   return pingTime;
-}
-
-
-//-------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
deleted file mode 100644
index dc9709f5ae7..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: ThreadUtils.cpp //////////////////////////////////////////////////////
-// GameSpy thread utils
-// Author: Matthew D. Campbell, July 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-//-------------------------------------------------------------------------
-
-std::wstring MultiByteToWideCharSingleLine( const char *orig )
-{
-	Int len = strlen(orig);
-	WideChar *dest = NEW WideChar[len+1];
-
-	MultiByteToWideChar(CP_UTF8, 0, orig, -1, dest, len);
-	WideChar *c = NULL;
-	do
-	{
-		c = wcschr(dest, L'\n');
-		if (c)
-		{
-			*c = L' ';
-		}
-	}
-	while ( c != NULL );
-	do
-	{
-		c = wcschr(dest, L'\r');
-		if (c)
-		{
-			*c = L' ';
-		}
-	}
-	while ( c != NULL );
-
-	dest[len] = 0;
-	std::wstring ret = dest;
-	delete[] dest;
-	return ret;
-}
-
-std::string WideCharStringToMultiByte( const WideChar *orig )
-{
-	std::string ret;
-	Int len = WideCharToMultiByte( CP_UTF8, 0, orig, wcslen(orig), NULL, 0, NULL, NULL ) + 1;
-	if (len > 0)
-	{
-		char *dest = NEW char[len];
-		WideCharToMultiByte( CP_UTF8, 0, orig, -1, dest, len, NULL, NULL );
-		dest[len-1] = 0;
-		ret = dest;
-		delete[] dest;
-	}
-	return ret;
-}
-
-//-------------------------------------------------------------------------
-
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp
index 2a6fb008ece..a567fd126cc 100644
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp
+++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp
@@ -26,7 +26,7 @@
 // GameSpy chat handlers
 // Author: Matthew D. Campbell, February 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameText.h"
 #include "GameClient/GadgetListBox.h"
@@ -135,7 +135,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo
 		case L'r':
 		case L'R':
 			remainder.nextToken(&token);
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 			if (token.compareNoCase(L"raw") == 0)
 			{
 				// Send raw IRC commands (Ascii only)
@@ -149,7 +149,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo
 			}
 #endif
 			break;
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 		case L'k':
 		case L'K':
 			remainder.nextToken(&token);
@@ -194,7 +194,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo
 				}
 				return true; // show it anyway
 			}
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 			else if (token.compareNoCase(L"oper") == 0)
 			{
 				// Send raw IRC oper command
@@ -245,7 +245,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo
 				return true; // show it anyway
 			}
 			break;
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 		case L'c':
 		case L'C':
 			remainder.nextToken(&token);
@@ -262,7 +262,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo
 				return true; // show it anyway
 			}
 			break;
-#endif // RTS_DEBUG || defined RTS_INTERNAL
+#endif // RTS_DEBUG
 		}
 	}
 	*/
@@ -375,7 +375,7 @@ void RoomMessageCallback(PEER peer, RoomType roomType,
 												 const char * nick, const char * message,
 												 MessageType messageType, void * param)
 {
-	DEBUG_LOG(("RoomMessageCallback\n"));
+	DEBUG_LOG(("RoomMessageCallback"));
 	handleUnicodeMessage(nick, QuotedPrintableToUnicodeString(message), true, (messageType == ActionMessage));
 }
 
@@ -383,7 +383,7 @@ void PlayerMessageCallback(PEER peer,
 												 const char * nick, const char * message,
 												 MessageType messageType, void * param)
 {
-	DEBUG_LOG(("PlayerMessageCallback\n"));
+	DEBUG_LOG(("PlayerMessageCallback"));
 	handleUnicodeMessage(nick, QuotedPrintableToUnicodeString(message), false, (messageType == ActionMessage));
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpyGP.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpyGP.cpp
index 751d81d21f0..be309ddae3d 100644
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpyGP.cpp
+++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpyGP.cpp
@@ -26,7 +26,7 @@
 // GameSpy GP callbacks, utils, etc
 // Author: Matthew D. Campbell, February 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameText.h"
 #include "GameNetwork/GameSpy.h"
@@ -40,7 +40,7 @@ char GameSpyProfilePassword[64];
 
 void GPRecvBuddyMessageCallback(GPConnection * pconnection, GPRecvBuddyMessageArg * arg, void * param)
 {
-	DEBUG_LOG(("GPRecvBuddyMessageCallback: message from %d is %s\n", arg->profile, arg->message));
+	DEBUG_LOG(("GPRecvBuddyMessageCallback: message from %d is %s", arg->profile, arg->message));
 
 	//gpGetInfo(pconn, arg->profile, GP_DONT_CHECK_CACHE, GP_BLOCKING, (GPCallback)Whois, NULL);
 	//printf("MESSAGE (%d): %s: %s\n", msgCount,whois, arg->message);
@@ -53,7 +53,7 @@ static void buddyTryReconnect( void )
 
 void GPErrorCallback(GPConnection * pconnection, GPErrorArg * arg, void * param)
 {
-	DEBUG_LOG(("GPErrorCallback\n"));
+	DEBUG_LOG(("GPErrorCallback"));
 
 	AsciiString errorCodeString;
 	AsciiString resultString;
@@ -126,9 +126,9 @@ void GPErrorCallback(GPConnection * pconnection, GPErrorArg * arg, void * param)
 
 	if(arg->fatal)
 	{
-		DEBUG_LOG(( "-----------\n"));
-		DEBUG_LOG(( "GP FATAL ERROR\n"));
-		DEBUG_LOG(( "-----------\n"));
+		DEBUG_LOG(( "-----------"));
+		DEBUG_LOG(( "GP FATAL ERROR"));
+		DEBUG_LOG(( "-----------"));
 
 		// if we're still connected to the chat server, tell the user.  He can always hit the buddy
 		// button to try reconnecting.  Oh yes, also hide the buddy popup.
@@ -140,23 +140,23 @@ void GPErrorCallback(GPConnection * pconnection, GPErrorArg * arg, void * param)
 	}
 	else
 	{
-		DEBUG_LOG(( "-----\n"));
-		DEBUG_LOG(( "GP ERROR\n"));
-		DEBUG_LOG(( "-----\n"));
+		DEBUG_LOG(( "-----"));
+		DEBUG_LOG(( "GP ERROR"));
+		DEBUG_LOG(( "-----"));
 	}
-	DEBUG_LOG(( "RESULT: %s (%d)\n", resultString.str(), arg->result));
-	DEBUG_LOG(( "ERROR CODE: %s (0x%X)\n", errorCodeString.str(), arg->errorCode));
-	DEBUG_LOG(( "ERROR STRING: %s\n", arg->errorString));
+	DEBUG_LOG(( "RESULT: %s (%d)", resultString.str(), arg->result));
+	DEBUG_LOG(( "ERROR CODE: %s (0x%X)", errorCodeString.str(), arg->errorCode));
+	DEBUG_LOG(( "ERROR STRING: %s", arg->errorString));
 }
 
 void GPRecvBuddyStatusCallback(GPConnection * connection, GPRecvBuddyStatusArg * arg, void * param)
 {
-	DEBUG_LOG(("GPRecvBuddyStatusCallback: info on %d is in %d\n", arg->profile, arg->index));
+	DEBUG_LOG(("GPRecvBuddyStatusCallback: info on %d is in %d", arg->profile, arg->index));
 
 	//GameSpyUpdateBuddyOverlay();
 }
 
 void GPRecvBuddyRequestCallback(GPConnection * connection, GPRecvBuddyRequestArg * arg, void * param)
 {
-	DEBUG_LOG(("GPRecvBuddyRequestCallback: %d wants to be our buddy because '%s'\n", arg->profile, arg->reason));
+	DEBUG_LOG(("GPRecvBuddyRequestCallback: %d wants to be our buddy because '%s'", arg->profile, arg->reason));
 }
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpyGameInfo.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpyGameInfo.cpp
index 1f24ff9f7ef..92dc5ddd070 100644
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpyGameInfo.cpp
+++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpyGameInfo.cpp
@@ -26,7 +26,7 @@
 // GameSpy game setup state info
 // Author: Matthew D. Campbell, December 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/Player.h"
@@ -159,18 +159,18 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 		"DELETE_TCB"
 	};
 
-	DEBUG_LOG(("Finding local address used to talk to the chat server\n"));
-	DEBUG_LOG(("Current chat server name is %s\n", serverName.str()));
-	DEBUG_LOG(("Chat server port is %d\n", serverPort));
+	DEBUG_LOG(("Finding local address used to talk to the chat server"));
+	DEBUG_LOG(("Current chat server name is %s", serverName.str()));
+	DEBUG_LOG(("Chat server port is %d", serverPort));
 
 	/*
 	** Get the address of the chat server.
 	*/
-	DEBUG_LOG( ("About to call gethostbyname\n"));
+	DEBUG_LOG( ("About to call gethostbyname"));
 	struct hostent *host_info = gethostbyname(serverName.str());
 
 	if (!host_info) {
-		DEBUG_LOG( ("gethostbyname failed! Error code %d\n", WSAGetLastError()));
+		DEBUG_LOG( ("gethostbyname failed! Error code %d", WSAGetLastError()));
 		return(false);
 	}
 
@@ -179,24 +179,24 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 	temp = ntohl(temp);
 	*((unsigned long*)(&serverAddress[0])) = temp;
 
-	DEBUG_LOG(("Host address is %d.%d.%d.%d\n", serverAddress[3], serverAddress[2], serverAddress[1], serverAddress[0]));
+	DEBUG_LOG(("Host address is %d.%d.%d.%d", serverAddress[3], serverAddress[2], serverAddress[1], serverAddress[0]));
 
 	/*
 	** Load the MIB-II SNMP DLL.
 	*/
-	DEBUG_LOG(("About to load INETMIB1.DLL\n"));
+	DEBUG_LOG(("About to load INETMIB1.DLL"));
 
 	HINSTANCE mib_ii_dll = LoadLibrary("inetmib1.dll");
 	if (mib_ii_dll == NULL) {
-		DEBUG_LOG(("Failed to load INETMIB1.DLL\n"));
+		DEBUG_LOG(("Failed to load INETMIB1.DLL"));
 		return(false);
 	}
 
-	DEBUG_LOG(("About to load SNMPAPI.DLL\n"));
+	DEBUG_LOG(("About to load SNMPAPI.DLL"));
 
 	HINSTANCE snmpapi_dll = LoadLibrary("snmpapi.dll");
 	if (snmpapi_dll == NULL) {
-		DEBUG_LOG(("Failed to load SNMPAPI.DLL\n"));
+		DEBUG_LOG(("Failed to load SNMPAPI.DLL"));
 		FreeLibrary(mib_ii_dll);
 		return(false);
 	}
@@ -209,7 +209,7 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 	SnmpUtilMemAllocPtr = (void *(__stdcall *)(unsigned long)) GetProcAddress(snmpapi_dll, "SnmpUtilMemAlloc");
 	SnmpUtilMemFreePtr = (void (__stdcall *)(void *)) GetProcAddress(snmpapi_dll, "SnmpUtilMemFree");
 	if (SnmpExtensionInitPtr == NULL || SnmpExtensionQueryPtr == NULL || SnmpUtilMemAllocPtr == NULL || SnmpUtilMemFreePtr == NULL) {
-		DEBUG_LOG(("Failed to get proc addresses for linked functions\n"));
+		DEBUG_LOG(("Failed to get proc addresses for linked functions"));
 		FreeLibrary(snmpapi_dll);
 		FreeLibrary(mib_ii_dll);
 		return(false);
@@ -222,14 +222,14 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 	/*
 	** OK, here we go. Try to initialise the .dll
 	*/
-	DEBUG_LOG(("About to init INETMIB1.DLL\n"));
+	DEBUG_LOG(("About to init INETMIB1.DLL"));
 	int ok = SnmpExtensionInitPtr(GetCurrentTime(), &trap_handle, &first_supported_region);
 
 	if (!ok) {
 		/*
 		** Aw crap.
 		*/
-		DEBUG_LOG(("Failed to init the .dll\n"));
+		DEBUG_LOG(("Failed to init the .dll"));
 		SnmpUtilMemFreePtr(bind_list_ptr);
 		SnmpUtilMemFreePtr(bind_ptr);
 		FreeLibrary(snmpapi_dll);
@@ -278,7 +278,7 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 
 		if (!SnmpExtensionQueryPtr(SNMP_PDU_GETNEXT, bind_list_ptr, &error_status, &error_index)) {
 		//if (!SnmpExtensionQueryPtr(ASN_RFC1157_GETNEXTREQUEST, bind_list_ptr, &error_status, &error_index)) {
-			DEBUG_LOG(("SnmpExtensionQuery returned false\n"));
+			DEBUG_LOG(("SnmpExtensionQuery returned false"));
 			SnmpUtilMemFreePtr(bind_list_ptr);
 			SnmpUtilMemFreePtr(bind_ptr);
 			FreeLibrary(snmpapi_dll);
@@ -382,7 +382,7 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 	SnmpUtilMemFreePtr(bind_ptr);
 	SnmpUtilMemFreePtr(mib_ii_name_ptr);
 
-	DEBUG_LOG(("Got %d connections in list, parsing...\n", connectionVector.size()));
+	DEBUG_LOG(("Got %d connections in list, parsing...", connectionVector.size()));
 
 	/*
 	** Right, we got the lot. Lets see if any of them have the same address as the chat
@@ -399,29 +399,29 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 		** See if this connection has the same address as our server.
 		*/
 		if (!found && memcmp(remoteAddress, serverAddress, 4) == 0) {
-			DEBUG_LOG(("Found connection with same remote address as server\n"));
+			DEBUG_LOG(("Found connection with same remote address as server"));
 
 			if (serverPort == 0 || serverPort == (unsigned int)connection.RemotePort) {
 
-				DEBUG_LOG(("Connection has same port\n"));
+				DEBUG_LOG(("Connection has same port"));
 				/*
 				** Make sure the connection is current.
 				*/
 				if (connection.State == ESTABLISHED) {
-					DEBUG_LOG(("Connection is ESTABLISHED\n"));
+					DEBUG_LOG(("Connection is ESTABLISHED"));
 					localIP = connection.LocalIP;
 					found = true;
 				} else {
-					DEBUG_LOG(("Connection is not ESTABLISHED - skipping\n"));
+					DEBUG_LOG(("Connection is not ESTABLISHED - skipping"));
 				}
 			} else {
-				DEBUG_LOG(("Connection has different port. Port is %d, looking for %d\n", connection.RemotePort, serverPort));
+				DEBUG_LOG(("Connection has different port. Port is %d, looking for %d", connection.RemotePort, serverPort));
 			}
 		}
 	}
 
 	if (found) {
-		DEBUG_LOG(("Using address 0x%8.8X to talk to chat server\n", localIP));
+		DEBUG_LOG(("Using address 0x%8.8X to talk to chat server", localIP));
 	}
 
 	FreeLibrary(snmpapi_dll);
@@ -564,7 +564,7 @@ void GameSpyLaunchGame( void )
 
 		// Set the random seed
 		InitGameLogicRandom( TheGameSpyGame->getSeed() );
-		DEBUG_LOG(("InitGameLogicRandom( %d )\n", TheGameSpyGame->getSeed()));
+		DEBUG_LOG(("InitGameLogicRandom( %d )", TheGameSpyGame->getSeed()));
 
 		if (TheNAT != NULL) {
 			delete TheNAT;
@@ -588,7 +588,7 @@ void GameSpyGameInfo::resetAccepted( void )
 	{
 		// ANCIENTMUNKEE peerStateChanged(TheGameSpyChat->getPeer());
 		m_hasBeenQueried = false;
-		DEBUG_LOG(("resetAccepted() called peerStateChange()\n"));
+		DEBUG_LOG(("resetAccepted() called peerStateChange()"));
 	}
 }
 
@@ -614,13 +614,13 @@ Int GameSpyGameInfo::getLocalSlotNum( void ) const
 
 void GameSpyGameInfo::gotGOACall( void )
 {
-	DEBUG_LOG(("gotGOACall()\n"));
+	DEBUG_LOG(("gotGOACall()"));
 	m_hasBeenQueried = true;
 }
 
 void GameSpyGameInfo::startGame(Int gameID)
 {
-	DEBUG_LOG(("GameSpyGameInfo::startGame - game id = %d\n", gameID));
+	DEBUG_LOG(("GameSpyGameInfo::startGame - game id = %d", gameID));
 	DEBUG_ASSERTCRASH(m_transport == NULL, ("m_transport is not NULL when it should be"));
 	DEBUG_ASSERTCRASH(TheNAT == NULL, ("TheNAT is not NULL when it should be"));
 
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpyOverlay.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpyOverlay.cpp
deleted file mode 100644
index 8f55ee217ff..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpyOverlay.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: wolscreens.cpp //////////////////////////////////////////////////////
-// Westwood Online screen setup/teardown
-// Author: Matthew D. Campbell, November 2001
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#include "Common/AudioEventRTS.h"
-
-#include "GameClient/GadgetListBox.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MessageBox.h"
-#include "GameClient/ShellHooks.h"
-//#include "GameNetwork/GameSpy.h"
-//#include "GameNetwork/GameSpyGP.h"
-
-#include "GameNetwork/GameSpyOverlay.h"
-//#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/BuddyThread.h"
-
-void deleteNotificationBox( void );
-static void raiseOverlays( void );
-
-// Message boxes -------------------------------------
-static GameWindow *messageBoxWindow = NULL;
-static GameWinMsgBoxFunc okFunc = NULL;
-static GameWinMsgBoxFunc cancelFunc = NULL;
-static Bool reOpenPlayerInfoFlag = FALSE;
-/**
-	* messageBoxOK is called when a message box is destroyed
-	* by way of an OK button, so we can clear our pointers to it.
-	*/
-static void messageBoxOK( void )
-{
-	DEBUG_ASSERTCRASH(messageBoxWindow, ("Message box window went away without being there in the first place!"));
-	messageBoxWindow = NULL;
-	if (okFunc)
-	{
-		okFunc();
-		okFunc = NULL;
-	}
-}
-
-/**
-	* messageBoxCancel is called when a message box is destroyed
-	* by way of a Cancel button, so we can clear our pointers to it.
-	*/
-static void messageBoxCancel( void )
-{
-	DEBUG_ASSERTCRASH(messageBoxWindow, ("Message box window went away without being there in the first place!"));
-	messageBoxWindow = NULL;
-	if (cancelFunc)
-	{
-		cancelFunc();
-		cancelFunc = NULL;
-	}
-}
-
-/**
-	* clearGSMessageBoxes removes the current message box if
-	* one is present.  This is usually done when putting up a
-	* second messageBox.
-	*/
-void ClearGSMessageBoxes( void )
-{
-	if (messageBoxWindow)
-	{
-		TheWindowManager->winDestroy(messageBoxWindow);
-		messageBoxWindow = NULL;
-	}
-
-	if (okFunc)
-	{
-		okFunc = NULL;
-	}
-
-	if (cancelFunc)
-	{
-		cancelFunc = NULL;
-	}
-}
-
-/**
-	* GSMessageBoxOk puts up an OK dialog box and saves the
-	* pointers to it and its callbacks.
-	*/
-void GSMessageBoxOk(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc newOkFunc)
-{
-	ClearGSMessageBoxes();
-	messageBoxWindow = MessageBoxOk(title, message, messageBoxOK);
-	okFunc = newOkFunc;
-}
-
-/**
-	* GSMessageBoxOkCancel puts up an OK/Cancel dialog box and saves the
-	* pointers to it and its callbacks.
-	*/
-void GSMessageBoxOkCancel(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc newOkFunc, GameWinMsgBoxFunc newCancelFunc)
-{
-	ClearGSMessageBoxes();
-	messageBoxWindow = MessageBoxOkCancel(title, message, messageBoxOK, messageBoxCancel);
-	okFunc = newOkFunc;
-	cancelFunc = newCancelFunc;
-}
-
-/**
-	* GSMessageBoxYesNo puts up a Yes/No dialog box and saves the
-	* pointers to it and its callbacks.
-	*/
-void GSMessageBoxYesNo(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc newYesFunc, GameWinMsgBoxFunc newNoFunc)
-{
-	ClearGSMessageBoxes();
-	messageBoxWindow = MessageBoxYesNo(title, message, messageBoxOK, messageBoxCancel);
-	okFunc = newYesFunc;
-	cancelFunc = newNoFunc;
-}
-
-/**
-	* If the screen transitions underneath the dialog box, we
-	* need to raise it to keep it visible.
-	*/
-void RaiseGSMessageBox( void )
-{
-	raiseOverlays();
-
-	if (!messageBoxWindow)
-		return;
-
-	messageBoxWindow->winBringToTop();
-}
-
-// Overlay screens -------------------------------------
-
-/**
-	* gsOverlays holds a list of the .wnd files used in GS overlays.
-	* The entries *MUST* be in the same order as the GSOverlayType enum.
-	*/
-static const char * gsOverlays[GSOVERLAY_MAX] =
-{
-	"Menus/PopupPlayerInfo.wnd",	// Player info (right-click)
-	"Menus/WOLMapSelectMenu.wnd",	// Map select
-	"Menus/WOLBuddyOverlay.wnd",	// Buddy list
-	"Menus/WOLPageOverlay.wnd",		// Find/page
-	"Menus/PopupHostGame.wnd",		// Hosting options (game name, password, etc)
-	"Menus/PopupJoinGame.wnd",		// Joining options (password, etc)
-	"Menus/PopupLadderSelect.wnd",// LadderSelect
-	"Menus/PopupLocaleSelect.wnd",// Prompt for user's locale
-	"Menus/OptionsMenu.wnd",			// popup options
-};
-
-static WindowLayout *overlayLayouts[GSOVERLAY_MAX] =
-{
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-};
-
-static void buddyTryReconnect( void )
-{
-	BuddyRequest req;
-	req.buddyRequestType = BuddyRequest::BUDDYREQUEST_RELOGIN;
-	TheGameSpyBuddyMessageQueue->addRequest( req );
-}
-
-void GameSpyOpenOverlay( GSOverlayType overlay )
-{
-	if (overlay == GSOVERLAY_BUDDY)
-	{
-		if (!TheGameSpyBuddyMessageQueue->isConnected())
-		{
-			// not connected - is it because we were disconnected?
-			if (TheGameSpyBuddyMessageQueue->getLocalProfileID())
-			{
-				// used to be connected
-				GSMessageBoxYesNo(TheGameText->fetch("GUI:GPErrorTitle"), TheGameText->fetch("GUI:GPDisconnected"), buddyTryReconnect, NULL);
-			}
-			else
-			{
-				// no profile
-				GSMessageBoxOk(TheGameText->fetch("GUI:GPErrorTitle"), TheGameText->fetch("GUI:GPNoProfile"), NULL);
-			}
-			return;
-		}
-		AudioEventRTS buttonClick("GUICommunicatorOpen");
-
-		if( TheAudio )
-		{
-			TheAudio->addAudioEvent( &buttonClick );
-		}  // end if
-	}
-	if (overlayLayouts[overlay])
-	{
-		overlayLayouts[overlay]->hide( FALSE );
-		overlayLayouts[overlay]->bringForward();
-	}
-	else
-	{
-		overlayLayouts[overlay] = TheWindowManager->winCreateLayout( AsciiString( gsOverlays[overlay] ) );
-		overlayLayouts[overlay]->runInit();
-		overlayLayouts[overlay]->hide( FALSE );
-		overlayLayouts[overlay]->bringForward();
-	}
-}
-
-void GameSpyCloseOverlay( GSOverlayType overlay )
-{
-	switch(overlay)
-	{
-		case GSOVERLAY_PLAYERINFO:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_PLAYERINFO\n"));
-			break;
-		case GSOVERLAY_MAPSELECT:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_MAPSELECT\n"));
-			break;
-		case GSOVERLAY_BUDDY:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_BUDDY\n"));
-			break;
-		case GSOVERLAY_PAGE:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_PAGE\n"));
-			break;
-		case GSOVERLAY_GAMEOPTIONS:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_GAMEOPTIONS\n"));
-			break;
-		case GSOVERLAY_GAMEPASSWORD:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_GAMEPASSWORD\n"));
-			break;
-		case GSOVERLAY_LADDERSELECT:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_LADDERSELECT\n"));
-			break;
-		case GSOVERLAY_OPTIONS:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_OPTIONS\n"));
-			if( overlayLayouts[overlay] )
-			{
-				SignalUIInteraction(SHELL_SCRIPT_HOOK_OPTIONS_CLOSED);
-			}
-			break;
-	}
-	if( overlayLayouts[overlay] )
-	{
-		overlayLayouts[overlay]->runShutdown();
-		overlayLayouts[overlay]->destroyWindows();
-		deleteInstance(overlayLayouts[overlay]);
-		overlayLayouts[overlay] = NULL;
-	}
-}
-
-Bool GameSpyIsOverlayOpen( GSOverlayType overlay )
-{
-	return (overlayLayouts[overlay] != NULL);
-}
-
-void GameSpyToggleOverlay( GSOverlayType overlay )
-{
-	if (GameSpyIsOverlayOpen(overlay))
-		GameSpyCloseOverlay(overlay);
-	else
-		GameSpyOpenOverlay(overlay);
-}
-
-void raiseOverlays( void )
-{
-	for (int i=0; i<GSOVERLAY_MAX; ++i)
-	{
-		if (overlayLayouts[(GSOverlayType)i])
-		{
-			overlayLayouts[(GSOverlayType)i]->bringForward();
-		}
-	}
-}
-
-void GameSpyCloseAllOverlays( void )
-{
-	for (int i=0; i<GSOVERLAY_MAX; ++i)
-	{
-		GameSpyCloseOverlay((GSOverlayType)i);
-	}
-
-	// if we're shutting down the rest, chances are we don't want this popping up.
-	deleteNotificationBox();
-}
-
-void GameSpyUpdateOverlays( void )
-{
-	for (int i=0; i<GSOVERLAY_MAX; ++i)
-	{
-		if (overlayLayouts[(GSOverlayType)i])
-		{
-			overlayLayouts[(GSOverlayType)i]->runUpdate();
-		}
-	}
-}
-
-void ReOpenPlayerInfo( void )
-{
-	reOpenPlayerInfoFlag = TRUE;
-}
-void CheckReOpenPlayerInfo(void )
-{
-	if(!reOpenPlayerInfoFlag)
-		return;
-
-	GameSpyOpenOverlay(GSOVERLAY_PLAYERINFO);
-	reOpenPlayerInfoFlag = FALSE;
-		
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpyPersistentStorage.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpyPersistentStorage.cpp
index 980a3b24bae..76b3ef38dee 100644
--- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpyPersistentStorage.cpp
+++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpyPersistentStorage.cpp
@@ -26,7 +26,7 @@
 // GameSpy Persistent Storage callbacks, utils, etc
 // Author: Matthew D. Campbell, March 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "gamespy/gstats/gpersist.h"
 
@@ -86,7 +86,7 @@ void GameSpyPlayerInfo::update( void )
 	{
 		if (m_shouldDisconnect)
 		{
-			DEBUG_LOG(("Persistent Storage close\n"));
+			DEBUG_LOG(("Persistent Storage close"));
 			CloseStatsConnection();
 		}
 		else
@@ -108,7 +108,7 @@ void GameSpyPlayerInfo::threadReadFromServer( void )
 	{
 		// get persistent info
 		m_operationCount++;
-		DEBUG_LOG(("GameSpyPlayerInfo::readFromServer() operation count = %d\n", m_operationCount));
+		DEBUG_LOG(("GameSpyPlayerInfo::readFromServer() operation count = %d", m_operationCount));
 		GetPersistDataValues(0, TheGameSpyChat->getProfileID(), pd_public_rw, 0, "\\locale\\wins\\losses", getPersistentDataCallback, &m_operationCount);
 	}
 	else
@@ -180,7 +180,7 @@ void GameSpyPlayerInfo::threadSetLocale( AsciiString val )
 	str.format("\\%s\\%s", key.str(), val.str());
 	char *writable = strdup(str.str());
 	m_operationCount++;
-	DEBUG_LOG(("GameSpyPlayerInfo::set%s() operation count = %d\n", key.str(), m_operationCount));
+	DEBUG_LOG(("GameSpyPlayerInfo::set%s() operation count = %d", key.str(), m_operationCount));
 	SetPersistDataValues(0, TheGameSpyChat->getProfileID(), pd_public_rw, 0, writable, setPersistentDataCallback, &m_operationCount);
 	free(writable);
 }
@@ -197,7 +197,7 @@ void GameSpyPlayerInfo::threadSetWins( AsciiString val )
 	str.format("\\%s\\%s", key.str(), val.str());
 	char *writable = strdup(str.str());
 	m_operationCount++;
-	DEBUG_LOG(("GameSpyPlayerInfo::set%s() operation count = %d\n", key.str(), m_operationCount));
+	DEBUG_LOG(("GameSpyPlayerInfo::set%s() operation count = %d", key.str(), m_operationCount));
 	SetPersistDataValues(0, TheGameSpyChat->getProfileID(), pd_public_rw, 0, writable, setPersistentDataCallback, &m_operationCount);
 	free(writable);
 }
@@ -214,7 +214,7 @@ void GameSpyPlayerInfo::threadSetLosses( AsciiString val )
 	str.format("\\%s\\%s", key.str(), val.str());
 	char *writable = strdup(str.str());
 	m_operationCount++;
-	DEBUG_LOG(("GameSpyPlayerInfo::set%s() operation count = %d\n", key.str(), m_operationCount));
+	DEBUG_LOG(("GameSpyPlayerInfo::set%s() operation count = %d", key.str(), m_operationCount));
 	SetPersistDataValues(0, TheGameSpyChat->getProfileID(), pd_public_rw, 0, writable, setPersistentDataCallback, &m_operationCount);
 	free(writable);
 }
@@ -236,13 +236,13 @@ GameSpyPlayerInfoInterface *createGameSpyPlayerInfo( void )
 
 static void persAuthCallback(int localid, int profileid, int authenticated, char *errmsg, void *instance)
 {
-	DEBUG_LOG(("Auth callback: localid: %d profileid: %d auth: %d err: %s\n",localid, profileid, authenticated, errmsg));
+	DEBUG_LOG(("Auth callback: localid: %d profileid: %d auth: %d err: %s",localid, profileid, authenticated, errmsg));
 	isProfileAuthorized = (authenticated != 0);
 }
 
 static void getPersistentDataCallback(int localid, int profileid, persisttype_t type, int index, int success, char *data, int len, void *instance)
 {
-	DEBUG_LOG(("Data get callback: localid: %d profileid: %d success: %d len: %d data: %s\n",localid, profileid, success, len, data));
+	DEBUG_LOG(("Data get callback: localid: %d profileid: %d success: %d len: %d data: %s",localid, profileid, success, len, data));
 
 	if (!TheGameSpyPlayerInfo)
 	{
@@ -278,10 +278,10 @@ static void getPersistentDataCallback(int localid, int profileid, persisttype_t
 	// decrement count of active operations
 	Int *opCount = (Int *)instance;
 	(*opCount) --;
-	DEBUG_LOG(("getPersistentDataCallback() operation count = %d\n", (*opCount)));
+	DEBUG_LOG(("getPersistentDataCallback() operation count = %d", (*opCount)));
 	if (!*opCount)
 	{
-		DEBUG_LOG(("getPersistentDataCallback() queue disconnect\n"));
+		DEBUG_LOG(("getPersistentDataCallback() queue disconnect"));
 		((GameSpyPlayerInfo *)TheGameSpyPlayerInfo)->queueDisconnect();
 	}
 
@@ -304,14 +304,14 @@ static void getPersistentDataCallback(int localid, int profileid, persisttype_t
 
 static void setPersistentDataCallback(int localid, int profileid, persisttype_t type, int index, int success, void *instance)
 {
-	DEBUG_LOG(("Data save callback: localid: %d profileid: %d success: %d\n", localid, profileid, success));
+	DEBUG_LOG(("Data save callback: localid: %d profileid: %d success: %d", localid, profileid, success));
 
 	Int *opCount = (Int *)instance;
 	(*opCount) --;
-	DEBUG_LOG(("setPersistentDataCallback() operation count = %d\n", (*opCount)));
+	DEBUG_LOG(("setPersistentDataCallback() operation count = %d", (*opCount)));
 	if (!*opCount)
 	{
-		DEBUG_LOG(("setPersistentDataCallback() queue disconnect\n"));
+		DEBUG_LOG(("setPersistentDataCallback() queue disconnect"));
 		((GameSpyPlayerInfo *)TheGameSpyPlayerInfo)->queueDisconnect();
 	}
 }
@@ -344,7 +344,7 @@ static Bool gameSpyInitPersistentStorageConnection( void )
 
 	if (result != GE_NOERROR)
 	{
-		DEBUG_LOG(("InitStatsConnection returned %d\n",result));
+		DEBUG_LOG(("InitStatsConnection returned %d",result));
 		return isProfileAuthorized;
 	}
 
@@ -386,7 +386,7 @@ static Bool gameSpyInitPersistentStorageConnection( void )
 		msleep(10);
 	}
 
-	DEBUG_LOG(("Persistent Storage connect: %d\n", isProfileAuthorized));
+	DEBUG_LOG(("Persistent Storage connect: %d", isProfileAuthorized));
 	return isProfileAuthorized;
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/IPEnumeration.cpp b/Generals/Code/GameEngine/Source/GameNetwork/IPEnumeration.cpp
deleted file mode 100644
index e6fab46eff0..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/IPEnumeration.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/IPEnumeration.h"
-#include "GameNetwork/networkutil.h"
-#include "GameClient/ClientInstance.h"
-
-IPEnumeration::IPEnumeration( void )
-{
-	m_IPlist = NULL;
-	m_isWinsockInitialized = false;
-}
-
-IPEnumeration::~IPEnumeration( void )
-{
-	if (m_isWinsockInitialized)
-	{
-		WSACleanup();
-		m_isWinsockInitialized = false;
-	}
-
-	EnumeratedIP *ip = m_IPlist;
-	while (ip)
-	{
-		ip = ip->getNext();
-		deleteInstance(m_IPlist);
-		m_IPlist = ip;
-	}
-}
-
-EnumeratedIP * IPEnumeration::getAddresses( void )
-{
-	if (m_IPlist)
-		return m_IPlist;
-
-	if (!m_isWinsockInitialized)
-	{
-		WORD verReq = MAKEWORD(2, 2);
-		WSADATA wsadata;
-
-		int err = WSAStartup(verReq, &wsadata);
-		if (err != 0) {
-			return NULL;
-		}
-
-		if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2)) {
-			WSACleanup();
-			return NULL;
-		}
-		m_isWinsockInitialized = true;
-	}
-
-	// get the local machine's host name
-	char hostname[256];
-	if (gethostname(hostname, sizeof(hostname)))
-	{
-		DEBUG_LOG(("Failed call to gethostname; WSAGetLastError returned %d\n", WSAGetLastError()));
-		return NULL;
-	}
-	DEBUG_LOG(("Hostname is '%s'\n", hostname));
-	
-	// get host information from the host name
-	HOSTENT* hostEnt = gethostbyname(hostname);
-	if (hostEnt == NULL)
-	{
-		DEBUG_LOG(("Failed call to gethostbyname; WSAGetLastError returned %d\n", WSAGetLastError()));
-		return NULL;
-	}
-	
-	// sanity-check the length of the IP adress
-	if (hostEnt->h_length != 4)
-	{
-		DEBUG_LOG(("gethostbyname returns oddly-sized IP addresses!\n"));
-		return NULL;
-	}
-
-#if defined(RTS_MULTI_INSTANCE)
-	// TheSuperHackers @feature Add one unique local host IP address for each multi client instance.
-	const UnsignedInt id = rts::ClientInstance::getInstanceId();
-	addNewIP(
-		127,
-		(UnsignedByte)(id >> 16),
-		(UnsignedByte)(id >> 8),
-		(UnsignedByte)(id));
-#endif
-
-	// construct a list of addresses
-	int numAddresses = 0;
-	char *entry;
-	while ( (entry = hostEnt->h_addr_list[numAddresses++]) != 0 )
-	{
-		addNewIP(
-			(UnsignedByte)entry[0],
-			(UnsignedByte)entry[1],
-			(UnsignedByte)entry[2],
-			(UnsignedByte)entry[3]);
-	}
-
-	return m_IPlist;
-}
-
-void IPEnumeration::addNewIP( UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedByte d )
-{
-	EnumeratedIP *newIP = newInstance(EnumeratedIP);
-
-	AsciiString str;
-	str.format("%d.%d.%d.%d", (int)a, (int)b, (int)c, (int)d);
-
-	UnsignedInt ip = AssembleIp(a, b, c, d);
-
-	newIP->setIPstring(str);
-	newIP->setIP(ip);
-
-	DEBUG_LOG(("IP: 0x%8.8X (%s)\n", ip, str.str()));
-
-	// Add the IP to the list in ascending order
-	if (!m_IPlist)
-	{
-		m_IPlist = newIP;
-		newIP->setNext(NULL);
-	}
-	else
-	{
-		if (newIP->getIP() < m_IPlist->getIP())
-		{
-			newIP->setNext(m_IPlist);
-			m_IPlist = newIP;
-		}
-		else
-		{
-			EnumeratedIP *p = m_IPlist;
-			while (p->getNext() && p->getNext()->getIP() < newIP->getIP())
-			{
-				p = p->getNext();
-			}
-			newIP->setNext(p->getNext());
-			p->setNext(newIP);
-		}
-	}
-}
-
-AsciiString IPEnumeration::getMachineName( void )
-{
-	if (!m_isWinsockInitialized)
-	{
-		WORD verReq = MAKEWORD(2, 2);
-		WSADATA wsadata;
-
-		int err = WSAStartup(verReq, &wsadata);
-		if (err != 0) {
-			return NULL;
-		}
-
-		if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2)) {
-			WSACleanup();
-			return NULL;
-		}
-		m_isWinsockInitialized = true;
-	}
-
-	// get the local machine's host name
-	char hostname[256];
-	if (gethostname(hostname, sizeof(hostname)))
-	{
-		DEBUG_LOG(("Failed call to gethostname; WSAGetLastError returned %d\n", WSAGetLastError()));
-		return NULL;
-	}
-
-	return AsciiString(hostname);
-}
-
-
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp b/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp
deleted file mode 100644
index 8e47946604d..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp
+++ /dev/null
@@ -1,1298 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#define WIN32_LEAN_AND_MEAN  // only bare bones windows stuff wanted
-
-#include "Common/crc.h"
-#include "Common/GameState.h"
-#include "Common/Registry.h"
-#include "GameNetwork/LANAPI.h"
-#include "GameNetwork/networkutil.h"
-#include "Common/GlobalData.h"
-#include "Common/RandomValue.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MapUtil.h"
-#include "Common/UserPreferences.h"
-#include "GameLogic/GameLogic.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-static const UnsignedShort lobbyPort = 8086; ///< This is the UDP port used by all LANAPI communication
-
-AsciiString GetMessageTypeString(UnsignedInt type);
-
-const UnsignedInt LANAPI::s_resendDelta = 10 * 1000;	///< This is how often we announce ourselves to the world
-/*
-LANGame::LANGame( void )
-{
-	m_gameName = L"";
-
-	int player;
-	for (player = 0; player < MAX_SLOTS; ++player)
-	{
-		m_playerName[player] = L"";
-		m_playerIP[player]= 0;
-		m_playerAccepted[player] = false;
-	}
-	m_lastHeard = 0;
-	m_inProgress = false;
-	m_next = NULL;
-}
-*/
-
-
-
-
-LANAPI::LANAPI( void ) : m_transport(NULL)
-{
-	DEBUG_LOG(("LANAPI::LANAPI() - max game option size is %d, sizeof(LANMessage)=%d, MAX_PACKET_SIZE=%d\n",
-		m_lanMaxOptionsLength, sizeof(LANMessage), MAX_PACKET_SIZE));
-
-	m_lastResendTime = 0;
-	//
-	m_lobbyPlayers = NULL;
-	m_games = NULL;
-	m_name = L""; // safe default?
-	m_pendingAction = ACT_NONE;
-	m_expiration = 0;
-	m_localIP = 0;
-	m_inLobby = true;
-	m_isInLANMenu = TRUE;
-	m_currentGame = NULL;
-	m_broadcastAddr = INADDR_BROADCAST;
-	m_directConnectRemoteIP = 0;
-	m_actionTimeout = 5000; // ms
-	m_lastUpdate = 0;
-	m_transport = new Transport;
-	m_isActive = TRUE;
-}
-
-LANAPI::~LANAPI( void )
-{
-	reset();
-	if (m_transport)
-		delete m_transport;
-}
-
-void LANAPI::init( void )
-{
-	m_gameStartTime = 0;
-	m_gameStartSeconds = 0;
-	m_transport->reset();
-	m_transport->init(m_localIP, lobbyPort);
-	m_transport->allowBroadcasts(true);
-
-	m_pendingAction = ACT_NONE;
-	m_expiration = 0;
-	m_inLobby = true;
-	m_isInLANMenu = TRUE;
-	m_currentGame = NULL;
-	m_directConnectRemoteIP = 0;
-	
-	m_lastGameopt = "";
-
-	unsigned long bufSize = UNLEN + 1;
-	char userName[UNLEN + 1];
-	if (!GetUserName(userName, &bufSize))
-	{
-		strcpy(userName, "unknown");
-	}
-	m_userName = userName;
-
-	bufSize = MAX_COMPUTERNAME_LENGTH + 1;
-	char computerName[MAX_COMPUTERNAME_LENGTH + 1];
-	if (!GetComputerName(computerName, &bufSize))
-	{
-		strcpy(computerName, "unknown");
-	}
-	m_hostName = computerName;
-}
-
-void LANAPI::reset( void )
-{
-	if (m_inLobby)
-	{
-		LANMessage msg;
-		fillInLANMessage( &msg );
-		msg.LANMessageType = LANMessage::MSG_REQUEST_LOBBY_LEAVE;
-		sendMessage(&msg);
-	}
-	m_transport->update();
-
-	LANGameInfo *theGame = m_games;
-	LANGameInfo *deletableGame = NULL;
-
-	while (theGame)
-	{
-		deletableGame = theGame;
-		theGame = theGame->getNext();
-		delete deletableGame;
-	}
-
-	LANPlayer *thePlayer = m_lobbyPlayers;
-	LANPlayer *deletablePlayer = NULL;
-
-	while (thePlayer)
-	{
-		deletablePlayer = thePlayer;
-		thePlayer = thePlayer->getNext();
-		delete deletablePlayer;
-	}
-
-	m_games = NULL;
-	m_lobbyPlayers = NULL;
-	m_directConnectRemoteIP = 0;
-	m_pendingAction = ACT_NONE;
-	m_expiration = 0;
-	m_inLobby = true;
-	m_isInLANMenu = TRUE;
-	m_currentGame = NULL;
-	
-}
-
-void LANAPI::sendMessage(LANMessage *msg, UnsignedInt ip /* = 0 */)
-{
-	if (ip != 0)
-	{
-		m_transport->queueSend(ip, lobbyPort, (unsigned char *)msg, sizeof(LANMessage) /*, 0, 0 */);
-	}
-	else if ((m_currentGame != NULL) && (m_currentGame->getIsDirectConnect()))
-	{
-		Int localSlot = m_currentGame->getLocalSlotNum();
-		for (Int i = 0; i < MAX_SLOTS; ++i)
-		{
-			if (i != localSlot) {
-				GameSlot *slot = m_currentGame->getSlot(i);
-				if ((slot != NULL) && (slot->isHuman())) {
-					m_transport->queueSend(slot->getIP(), lobbyPort, (unsigned char *)msg, sizeof(LANMessage) /*, 0, 0 */);
-				}
-			}
-		}
-	}
-	else
-	{
-		m_transport->queueSend(m_broadcastAddr, lobbyPort, (unsigned char *)msg, sizeof(LANMessage) /*, 0, 0 */);
-	}
-}
-
-
-AsciiString GetMessageTypeString(UnsignedInt type)
-{
-	AsciiString returnString;
-
-	switch (type)
-	{
-		case LANMessage::MSG_REQUEST_LOCATIONS:
-			returnString.format( "Request Locations (%d)",type);
-			break;
-		case LANMessage::MSG_GAME_ANNOUNCE:
-			returnString.format("Game Announce (%d)",type);
-			break;
-		case LANMessage::MSG_LOBBY_ANNOUNCE:
-			returnString.format("Lobby Announce (%d)",type);
-			break;
-		case LANMessage::MSG_REQUEST_JOIN:
-			returnString.format("Request Join (%d)",type);
-			break;
-		case LANMessage::MSG_JOIN_ACCEPT:				
-			returnString.format("Join Accept (%d)",type);
-			break;
-		case LANMessage::MSG_JOIN_DENY:
-			returnString.format("Join Deny (%d)",type);
-			break;
-		case LANMessage::MSG_REQUEST_GAME_LEAVE:
-			returnString.format("Request Game Leave (%d)",type);
-			break;
-		case LANMessage::MSG_REQUEST_LOBBY_LEAVE:
-			returnString.format("Request Lobby Leave (%d)",type);
-			break;
-		case LANMessage::MSG_SET_ACCEPT:
-			returnString.format("Set Accept(%d)",type);
-			break;
-		case LANMessage::MSG_CHAT:
-			returnString.format("Chat (%d)",type);
-			break;
-		case LANMessage::MSG_GAME_START:
-			returnString.format("Game Start (%d)",type);
-			break;
-		case LANMessage::MSG_GAME_START_TIMER:
-			returnString.format("Game Start Timer (%d)",type);
-			break;
-		case LANMessage::MSG_GAME_OPTIONS:
-			returnString.format("Game Options (%d)",type);
-			break;
-		case LANMessage::MSG_REQUEST_GAME_INFO:
-			returnString.format("Request GameInfo (%d)", type);
-			break;
-		case LANMessage::MSG_INACTIVE:
-			returnString.format("Inactive (%d)", type);
-			break;
-		default:
-			returnString.format("Unknown Message (%d)",type);
-	}
-	return returnString;
-}
-
-
-void LANAPI::checkMOTD( void )
-{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_useLocalMOTD)
-	{
-		// for a playtest, let's log some play statistics, eh?
-		if (TheGlobalData->m_playStats <= 0)
-			TheWritableGlobalData->m_playStats = 30;
-
-		static UnsignedInt oldMOTDCRC = 0;
-		UnsignedInt newMOTDCRC = 0;
-		AsciiString asciiMOTD;
-		char buf[4096];
-		FILE *fp = fopen(TheGlobalData->m_MOTDPath.str(), "r");
-		Int len;
-		if (fp)
-		{
-			while( (len = fread(buf, 1, 4096, fp)) > 0 )
-			{
-				buf[len] = 0;
-				asciiMOTD.concat(buf);
-			}
-			fclose(fp);
-			CRC crcObj;
-			crcObj.computeCRC(asciiMOTD.str(), asciiMOTD.getLength());
-			newMOTDCRC = crcObj.get();
-		}
-
-		if (oldMOTDCRC != newMOTDCRC)
-		{
-			// different MOTD... display it
-			oldMOTDCRC = newMOTDCRC;
-			AsciiString line;
-			while (asciiMOTD.nextToken(&line, "\n"))
-			{
-				if (line.getCharAt(line.getLength()-1) == '\r')
-					line.removeLastChar();	// there is a trailing '\r'
-
-				if (line.isEmpty())
-				{
-					line = " ";
-				}
-
-				UnicodeString uniLine;
-				uniLine.translate(line);
-				OnChat( UnicodeString(L"MOTD"), 0, uniLine, LANCHAT_SYSTEM );
-			}
-		}
-	}
-#endif
-}
-
-extern Bool LANbuttonPushed;
-extern Bool LANSocketErrorDetected;
-void LANAPI::update( void )
-{
-	if(LANbuttonPushed)
-		return;
-	static const UnsignedInt LANAPIUpdateDelay = 200;
-	UnsignedInt now = timeGetTime();
-	
-	if( now > m_lastUpdate + LANAPIUpdateDelay)
-	{
-		m_lastUpdate = now;
-	} 
-	else
-	{
-		return;
-	}
-
-	// Let the UDP socket breathe
-	if ((m_transport->update() == FALSE) && (LANSocketErrorDetected == FALSE)) {
-		if (m_isInLANMenu == TRUE) {
-			LANSocketErrorDetected = TRUE;
-		}
-	}
-
-	// Handle any new messages
-	int i;
-	for (i=0; i<MAX_MESSAGES && !LANbuttonPushed; ++i)
-	{
-		if (m_transport->m_inBuffer[i].length > 0)
-		{
-			// Process the new message
-			UnsignedInt senderIP = m_transport->m_inBuffer[i].addr;
-			if (senderIP == m_localIP)
-			{
-				m_transport->m_inBuffer[i].length = 0;
-				continue;
-			}
-
-			LANMessage *msg = (LANMessage *)(m_transport->m_inBuffer[i].data);
-			//DEBUG_LOG(("LAN message type %s from %ls (%s@%s)\n", GetMessageTypeString(msg->LANMessageType).str(),
-			//	msg->name, msg->userName, msg->hostName));
-			switch (msg->LANMessageType)
-			{
-				// Location specification
-			case LANMessage::MSG_REQUEST_LOCATIONS:		// Hey, where is everybody?
-				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_LOCATIONS from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleRequestLocations( msg, senderIP );
-				break;
-			case LANMessage::MSG_GAME_ANNOUNCE:				// Here someone is, and here's his game info!
-				DEBUG_LOG(("LANAPI::update - got a MSG_GAME_ANNOUNCE from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleGameAnnounce( msg, senderIP );
-				break;
-			case LANMessage::MSG_LOBBY_ANNOUNCE:			// Hey, I'm in the lobby!
-				DEBUG_LOG(("LANAPI::update - got a MSG_LOBBY_ANNOUNCE from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleLobbyAnnounce( msg, senderIP );
-				break;
-			case LANMessage::MSG_REQUEST_GAME_INFO:
-				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_GAME_INFO from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleRequestGameInfo( msg, senderIP );
-				break;
-
-				// Joining games
-			case LANMessage::MSG_REQUEST_JOIN:				// Let me in!  Let me in!
-				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_JOIN from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleRequestJoin( msg, senderIP );
-				break;
-			case LANMessage::MSG_JOIN_ACCEPT:					// Okay, you can join.
-				DEBUG_LOG(("LANAPI::update - got a MSG_JOIN_ACCEPT from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleJoinAccept( msg, senderIP );
-				break;
-			case LANMessage::MSG_JOIN_DENY:						// Go away!  We don't want any!
-				DEBUG_LOG(("LANAPI::update - got a MSG_JOIN_DENY from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleJoinDeny( msg, senderIP );
-				break;
-
-				// Leaving games, lobby
-			case LANMessage::MSG_REQUEST_GAME_LEAVE:				// I'm outa here!
-				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_GAME_LEAVE from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleRequestGameLeave( msg, senderIP );
-				break;
-			case LANMessage::MSG_REQUEST_LOBBY_LEAVE:				// I'm outa here!
-				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_LOBBY_LEAVE from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleRequestLobbyLeave( msg, senderIP );
-				break;
-
-				// Game options, chat, etc
-			case LANMessage::MSG_SET_ACCEPT:					// I'm cool with everything as is.
-				handleSetAccept( msg, senderIP );
-				break;
-			case LANMessage::MSG_MAP_AVAILABILITY:		// Map status
-				handleHasMap( msg, senderIP );
-				break;
-			case LANMessage::MSG_CHAT:								// Just spouting my mouth off.
-				handleChat( msg, senderIP );
-				break;
-			case LANMessage::MSG_GAME_START:					// Hold on; we're starting!
-				handleGameStart( msg, senderIP );
-				break;
-			case LANMessage::MSG_GAME_START_TIMER:
-				handleGameStartTimer( msg, senderIP );
-				break;
-			case LANMessage::MSG_GAME_OPTIONS:				// Here's some info about the game.
-				DEBUG_LOG(("LANAPI::update - got a MSG_GAME_OPTIONS from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleGameOptions( msg, senderIP );
-				break;
-			case LANMessage::MSG_INACTIVE:		// someone is telling us that we're inactive.
-				handleInActive( msg, senderIP );
-				break;
-
-			default:
-				DEBUG_LOG(("Unknown LAN message type %d\n", msg->LANMessageType));
-			}
-
-			// Mark it as read
-			m_transport->m_inBuffer[i].length = 0;
-		}
-	} // End message handling
-	if(LANbuttonPushed)
-		return;
-	// Send out periodic I'm Here messages
-	if (now > s_resendDelta + m_lastResendTime)
-	{
-		m_lastResendTime = now;
-
-		if (m_inLobby)
-		{
-			RequestSetName(m_name);
-		}
-		else if (m_currentGame && !m_currentGame->isGameInProgress())
-		{
-			if (AmIHost())
-			{				
-				RequestGameOptions( GenerateGameOptionsString(), true );
-				RequestGameAnnounce( );
-			}
-			else
-			{
-				AsciiString text;
-				text.format("User=%s", m_userName.str());
-				RequestGameOptions( text, true );
-				text.format("Host=%s", m_hostName.str());
-				RequestGameOptions( text, true );
-				RequestGameOptions( "HELLO", false );
-			}
-		}
-		else if (m_currentGame)
-		{
-			// game is in progress - RequestGameAnnounce will check if we should send it
-			RequestGameAnnounce();
-		}
-	}
-
-	Bool playerListChanged = false;
-	Bool gameListChanged = false;
-
-	// Weed out people we haven't heard from in a while
-	LANPlayer *player = m_lobbyPlayers;
-	while (player)
-	{
-		if (player->getLastHeard() + s_resendDelta*2 < now)
-		{
-			// He's gone!
-			removePlayer(player);
-			LANPlayer *nextPlayer = player->getNext();
-			delete player;
-			player = nextPlayer;
-			playerListChanged = true;
-		}
-		else
-		{
-			player = player->getNext();
-		}
-	}
-
-	// Weed out people we haven't heard from in a while
-	LANGameInfo *game = m_games;
-	while (game)
-	{
-		if (game != m_currentGame && game->getLastHeard() + s_resendDelta*2 < now)
-		{
-			// He's gone!
-			removeGame(game);
-			LANGameInfo *nextGame = game->getNext();
-			delete game;
-			game = nextGame;
-			gameListChanged = true;
-		}
-		else
-		{
-			game = game->getNext();
-		}
-	}
-	if ( m_currentGame && !m_currentGame->isGameInProgress() )
-	{
-		if ( !AmIHost() && (m_currentGame->getLastHeard() + s_resendDelta*16 < now) )
-		{
-			// We haven't heard from the host in a while.  Bail.
-			// Actually, fake a host leaving message. :)
-			LANMessage msg;
-			fillInLANMessage( &msg );
-			msg.LANMessageType = LANMessage::MSG_REQUEST_GAME_LEAVE;
-			wcsncpy(msg.name, m_currentGame->getPlayerName(0).str(), g_lanPlayerNameLength);
-			msg.name[g_lanPlayerNameLength] = 0;
-			handleRequestGameLeave(&msg, m_currentGame->getIP(0));
-			UnicodeString text;
-			text = TheGameText->fetch("LAN:HostNotResponding");
-			OnChat(UnicodeString::TheEmptyString, m_localIP, text, LANCHAT_SYSTEM);
-		}
-		else if ( AmIHost() )
-		{
-			// Check each player for timeouts
-			for (int p=1; p<MAX_SLOTS; ++p)
-			{
-				if (m_currentGame->getIP(p) && m_currentGame->getPlayerLastHeard(p) + s_resendDelta*8 < now)
-				{
-					LANMessage msg;
-					fillInLANMessage( &msg );
-					UnicodeString theStr;
-					theStr.format(TheGameText->fetch("LAN:PlayerDropped"), m_currentGame->getPlayerName(p).str());
-					msg.LANMessageType = LANMessage::MSG_REQUEST_GAME_LEAVE;
-					wcsncpy(msg.name, m_currentGame->getPlayerName(p).str(), g_lanPlayerNameLength);
-					msg.name[g_lanPlayerNameLength] = 0;
-					handleRequestGameLeave(&msg, m_currentGame->getIP(p));
-					OnChat(UnicodeString::TheEmptyString, m_localIP, theStr, LANCHAT_SYSTEM);
-				}
-			}
-		}
-	}
-
-	if (playerListChanged)
-	{
-		OnPlayerList(m_lobbyPlayers);
-	}
-
-	if (gameListChanged)
-	{
-		OnGameList(m_games);
-	}
-
-	// Time out old actions
-	if (m_pendingAction != ACT_NONE && now > m_expiration)
-	{
-		switch (m_pendingAction)
-		{
-		case ACT_JOIN:
-			OnGameJoin(RET_TIMEOUT, NULL);
-			m_pendingAction = ACT_NONE;
-			m_currentGame = NULL;
-			m_inLobby = true;
-			break;
-		case ACT_LEAVE:
-			OnPlayerLeave(m_name);
-			m_pendingAction = ACT_NONE;
-			m_currentGame = NULL;
-			m_inLobby = true;
-			break;
-		case ACT_JOINDIRECTCONNECT:
-			OnGameJoin(RET_TIMEOUT, NULL);
-			m_pendingAction = ACT_NONE;
-			m_currentGame = NULL;
-			m_inLobby = true;
-			break;
-		default:
-			m_pendingAction = ACT_NONE;
-		}
-	}
-
-	// send out "game starting" messages
-	if ( m_gameStartTime && m_gameStartSeconds && m_gameStartTime <= now )
-	{
-		// m_gameStartTime is when the next message goes out
-		// m_gameStartSeconds is how many seconds remain in the message
-
-		RequestGameStartTimer( m_gameStartSeconds );
-	}
-	else if (m_gameStartTime && m_gameStartTime <= now)
-	{
-//		DEBUG_LOG(("m_gameStartTime=%d, now=%d, m_gameStartSeconds=%d\n", m_gameStartTime, now, m_gameStartSeconds));
-		ResetGameStartTimer();
-		RequestGameStart();
-	}
-
-	// Check for an MOTD every few seconds
-	static UnsignedInt lastMOTDCheck = 0;
-	static const UnsignedInt motdInterval = 30000;
-	if (now > lastMOTDCheck + motdInterval)
-	{
-		checkMOTD();
-		lastMOTDCheck = now;
-	}
-}
-
-// Request functions generate network traffic
-void LANAPI::RequestLocations( void )
-{
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_REQUEST_LOCATIONS;
-	fillInLANMessage( &msg );
-	sendMessage(&msg);
-}
-
-void LANAPI::RequestGameJoin( LANGameInfo *game, UnsignedInt ip /* = 0 */ )
-{
-	if ((m_pendingAction != ACT_NONE) && (m_pendingAction != ACT_JOINDIRECTCONNECT))
-	{
-		OnGameJoin( RET_BUSY, NULL );
-		return;
-	}
-
-	if (!game)
-	{
-		OnGameJoin( RET_GAME_GONE, NULL );
-		return;
-	}
-
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_REQUEST_JOIN;
-	fillInLANMessage( &msg );
-	msg.GameToJoin.gameIP = game->getSlot(0)->getIP();
-	msg.GameToJoin.exeCRC = TheGlobalData->m_exeCRC;
-	msg.GameToJoin.iniCRC = TheGlobalData->m_iniCRC;
-
-	AsciiString s = "";
-	GetStringFromRegistry("\\ergc", "", s);
-	strncpy(msg.GameToJoin.serial, s.str(), g_maxSerialLength);
-	msg.GameToJoin.serial[g_maxSerialLength-1] = '\0';
-
-	sendMessage(&msg, ip);
-
-	m_pendingAction = ACT_JOIN;
-	m_expiration = timeGetTime() + m_actionTimeout;
-}
-
-void LANAPI::RequestGameJoinDirectConnect(UnsignedInt ipaddress)
-{
-	if (m_pendingAction != ACT_NONE)
-	{
-		OnGameJoin( RET_BUSY, NULL );
-		return;
-	}
-
-	if (ipaddress == 0)
-	{
-		OnGameJoin( RET_GAME_GONE, NULL );
-		return;
-	}
-
-	m_directConnectRemoteIP = ipaddress;
-
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_REQUEST_GAME_INFO;
-	fillInLANMessage(&msg);
-	msg.PlayerInfo.ip = GetLocalIP();
-	wcsncpy(msg.PlayerInfo.playerName, m_name.str(), m_name.getLength());
-	msg.PlayerInfo.playerName[m_name.getLength()] = 0;
-
-	sendMessage(&msg, ipaddress);
-
-	m_pendingAction = ACT_JOINDIRECTCONNECT;
-	m_expiration = timeGetTime() + m_actionTimeout;
-}
-
-void LANAPI::RequestGameLeave( void )
-{
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_REQUEST_GAME_LEAVE;
-	fillInLANMessage( &msg );
-	wcsncpy(msg.GameToLeave.gameName, (m_currentGame)?m_currentGame->getName().str():L"", g_lanGameNameLength);
-	msg.GameToLeave.gameName[g_lanGameNameLength] = 0;
-	sendMessage(&msg);
-	m_transport->update();  // Send immediately, before OnPlayerLeave below resets everything.
-
-	if (m_currentGame && m_currentGame->getIP(0) == m_localIP)
-	{
-		// Exit out immediately if we're hosting
-		OnPlayerLeave(m_name);
-		removeGame(m_currentGame);
-		m_currentGame = NULL;
-		m_inLobby = true;
-	}
-	else
-	{
-		m_pendingAction = ACT_LEAVE;
-		m_expiration = timeGetTime() + m_actionTimeout;
-	}
-}
-
-void LANAPI::RequestGameAnnounce( void )
-{
-	// In game - are we a game host?
-	if (m_currentGame && !(m_currentGame->getIsDirectConnect()))
-	{
-		if (m_currentGame->getIP(0) == m_localIP || (m_currentGame->isGameInProgress() && TheNetwork && TheNetwork->isPacketRouter())) // if we're in game we should reply if we're the packet router
-		{
-			LANMessage reply;
-			fillInLANMessage( &reply );
-			reply.LANMessageType = LANMessage::MSG_GAME_ANNOUNCE;
-
-			AsciiString gameOpts = GameInfoToAsciiString(m_currentGame);
-			strncpy(reply.GameInfo.options,gameOpts.str(),m_lanMaxOptionsLength);
-			wcsncpy(reply.GameInfo.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-			reply.GameInfo.gameName[g_lanGameNameLength] = 0;
-			reply.GameInfo.inProgress = m_currentGame->isGameInProgress();
-			reply.GameInfo.isDirectConnect = m_currentGame->getIsDirectConnect();
-
-			sendMessage(&reply);
-		}
-	}
-}
-
-void LANAPI::RequestAccept( void )
-{
-	if (m_inLobby || !m_currentGame)
-		return;
-
-	LANMessage msg;
-	fillInLANMessage( &msg );
-	msg.LANMessageType = LANMessage::MSG_SET_ACCEPT;
-	msg.Accept.isAccepted = true;
-	wcsncpy(msg.Accept.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-	msg.Accept.gameName[g_lanGameNameLength] = 0;
-	sendMessage(&msg);
-}
-
-void LANAPI::RequestHasMap( void )
-{
-	if (m_inLobby || !m_currentGame)
-		return;
-
-	LANMessage msg;
-	fillInLANMessage( &msg );
-	msg.LANMessageType = LANMessage::MSG_MAP_AVAILABILITY;
-	msg.MapStatus.hasMap = m_currentGame->getSlot(m_currentGame->getLocalSlotNum())->hasMap();
-	wcsncpy(msg.MapStatus.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-	msg.MapStatus.gameName[g_lanGameNameLength] = 0;
-	CRC mapNameCRC;
-//mapNameCRC.computeCRC(m_currentGame->getMap().str(), m_currentGame->getMap().getLength());
-	AsciiString portableMapName = TheGameState->realMapPathToPortableMapPath(m_currentGame->getMap());
-	mapNameCRC.computeCRC(portableMapName.str(), portableMapName.getLength());
-	msg.MapStatus.mapCRC = mapNameCRC.get();
-	sendMessage(&msg);
-
-	if (!msg.MapStatus.hasMap)
-	{
-		UnicodeString text;
-		UnicodeString mapDisplayName;
-		const MapMetaData *mapData = TheMapCache->findMap( m_currentGame->getMap() );
-		Bool willTransfer = TRUE;
-		if (mapData)
-		{
-			mapDisplayName.format(L"%ls", mapData->m_displayName.str());
-			if (mapData->m_isOfficial)
-				willTransfer = FALSE;
-		}
-		else
-		{
-			mapDisplayName.format(L"%hs", TheGameState->getMapLeafName(m_currentGame->getMap()).str());
-			willTransfer = WouldMapTransfer(m_currentGame->getMap());
-		}
-		if (willTransfer)
-			text.format(TheGameText->fetch("GUI:LocalPlayerNoMapWillTransfer"), mapDisplayName.str());
-		else
-			text.format(TheGameText->fetch("GUI:LocalPlayerNoMap"), mapDisplayName.str());
-		OnChat(UnicodeString(L"SYSTEM"), m_localIP, text, LANCHAT_SYSTEM);
-	}
-}
-
-void LANAPI::RequestChat( UnicodeString message, ChatType format )
-{
-	LANMessage msg;
-	fillInLANMessage( &msg );
-	wcsncpy(msg.Chat.gameName, (m_currentGame)?m_currentGame->getName().str():L"", g_lanGameNameLength);
-	msg.Chat.gameName[g_lanGameNameLength] = 0;
-	msg.LANMessageType = LANMessage::MSG_CHAT;
-	msg.Chat.chatType = format;
-	wcsncpy(msg.Chat.message, message.str(), g_lanMaxChatLength);
-	msg.Chat.message[g_lanMaxChatLength] = 0;
-	sendMessage(&msg);
-
-	OnChat(m_name, m_localIP, message, format);
-}
-
-void LANAPI::RequestGameStart( void )
-{
-	if (m_inLobby || !m_currentGame || m_currentGame->getIP(0) != m_localIP)
-		return;
-
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_GAME_START;
-	fillInLANMessage( &msg );
-	sendMessage(&msg);
-	m_transport->update(); // force a send
-
-	OnGameStart();
-}
-
-void LANAPI::ResetGameStartTimer( void )
-{
-	m_gameStartTime = 0;
-	m_gameStartSeconds = 0;
-}
-
-void LANAPI::RequestGameStartTimer( Int seconds )
-{
-	if (m_inLobby || !m_currentGame || m_currentGame->getIP(0) != m_localIP)
-		return;
-
-	UnsignedInt now = timeGetTime();
-	m_gameStartTime = now + 1000;
-	m_gameStartSeconds = (seconds) ? seconds - 1 : 0;
-
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_GAME_START_TIMER;
-	msg.StartTimer.seconds = seconds;
-	fillInLANMessage( &msg );
-	sendMessage(&msg);
-	m_transport->update(); // force a send
-
-	OnGameStartTimer(seconds);
-}
-
-void LANAPI::RequestGameOptions( AsciiString gameOptions, Bool isPublic, UnsignedInt ip /* = 0 */ )
-{
-	DEBUG_ASSERTCRASH(gameOptions.getLength() < m_lanMaxOptionsLength, ("Game options string is too long!"));
-
-	if (!m_currentGame)
-		return;
-
-	LANMessage msg;
-	fillInLANMessage( &msg );
-	msg.LANMessageType = LANMessage::MSG_GAME_OPTIONS;
-	strncpy(msg.GameOptions.options, gameOptions.str(), m_lanMaxOptionsLength);
-	msg.GameOptions.options[m_lanMaxOptionsLength] = 0;
-	sendMessage(&msg, ip);
-
-	m_lastGameopt = gameOptions;
-
-	int player;
-	for (player = 0; player<MAX_SLOTS; ++player)
-	{
-		if (m_currentGame->getIP(player) == m_localIP)
-		{
-			OnGameOptions(m_localIP, player, AsciiString(msg.GameOptions.options));
-			break;
-		}
-	}
-
-	// We can request game options (side, color, etc) while we don't have a slot yet.  Of course, we don't need to
-	// call OnGameOptions for those, so it's okay to silently fail.
-	//DEBUG_ASSERTCRASH(player != MAX_SLOTS, ("Requested game options, but we're not in slot list!");
-}
-
-void LANAPI::RequestGameCreate( UnicodeString gameName, Bool isDirectConnect )
-{
-	// No games of the same name should exist...  Ignore that for now.
-	/// @todo: make sure LAN games with identical names don't crash things like in RA2.
-
-	if ((!m_inLobby || m_currentGame) && !isDirectConnect)
-	{
-		DEBUG_ASSERTCRASH(m_inLobby && m_currentGame, ("Can't create a game while in one!"));
-		OnGameCreate(LANAPIInterface::RET_BUSY);
-		return;
-	}
-
-	if (m_pendingAction != ACT_NONE)
-	{
-		OnGameCreate(LANAPIInterface::RET_BUSY);
-		return;
-	}
-
-	// Create the local game object
-	m_inLobby = false;
-	LANGameInfo *myGame = NEW LANGameInfo;
-	
-	myGame->setSeed(GetTickCount());
-	
-//	myGame->setInProgress(false);
-	myGame->enterGame();
-	UnicodeString s;
-	s.format(L"%8.8X%8.8X", m_localIP, myGame->getSeed());
-	if (gameName.isEmpty())
-		s.concat(m_name);
-	else
-		s.concat(gameName);
-
-	while (s.getLength() > g_lanGameNameLength)
-		s.removeLastChar();
-
-	DEBUG_LOG(("Setting local game name to '%ls'\n", s.str()));
-
-	myGame->setName(s);
-
-	LANGameSlot newSlot;
-	newSlot.setState(SLOT_PLAYER, m_name);
-	newSlot.setIP(m_localIP);
-	newSlot.setPort(NETWORK_BASE_PORT_NUMBER); // LAN game, everyone has a unique IP, so it's ok to use the same port.
-	newSlot.setLastHeard(0);
-	newSlot.setLogin(m_userName);
-	newSlot.setHost(m_hostName);
-
-	myGame->setSlot(0,newSlot);
-	myGame->setNext(NULL);
-	LANPreferences pref;	
-
-	AsciiString mapName = pref.getPreferredMap();
-
-	myGame->setMap(mapName);
-	myGame->setIsDirectConnect(isDirectConnect);
-	
-	myGame->setLastHeard(timeGetTime());
-	m_currentGame = myGame;
-
-/// @todo: Need to initialize the players elsewere.
-/*	for (int player = 1; player < MAX_SLOTS; ++player)
-	{
-		myGame->setPlayerName(player, UnicodeString(L""));
-		myGame->setIP(player, 0);
-		myGame->setAccepted(player, false);
-	}*/
-
-	// Add the game to the local game list
-	addGame(myGame);
-
-	// Send an announcement
-	//RequestSlotList();
-/*
-	LANMessage msg;
-	wcsncpy(msg.name, m_name.str(), g_lanPlayerNameLength);
-	msg.name[g_lanPlayerNameLength] = 0;
-	wcscpy(msg.GameInfo.gameName, myGame->getName().str());
-	for (player=0; player<MAX_SLOTS; ++player)
-	{
-		wcscpy(msg.GameInfo.name[player], myGame->getPlayerName(player).str());
-		msg.GameInfo.ip[player] = myGame->getIP(player);
-		msg.GameInfo.playerAccepted[player] = myGame->getAccepted(player);
-	}
-	msg.LANMessageType = LANMessage::MSG_GAME_ANNOUNCE;
-*/
-	OnGameCreate(LANAPIInterface::RET_OK);
-}
-
-
-/*static const char slotListID		= 'S';
-static const char gameOptionsID	= 'G';
-static const char acceptID			= 'A';
-static const char wannaStartID	= 'W';
-
-AsciiString LANAPI::createSlotString( void )
-{
-	AsciiString slotList;
-	slotList.concat(slotListID);
-	for (int i=0; i<MAX_SLOTS; ++i)
-	{
-		LANGameSlot *slot = GetMyGame()->getLANSlot(i);
-		AsciiString str;
-		if (slot->isHuman())
-		{
-			str = "H";
-			LANPlayer *user = slot->getUser();
-			DEBUG_ASSERTCRASH(user, ("Human player has no User*!"));
-			AsciiString name;
-			name.translate(user->getName());
-			str.concat(name);
-			str.concat(',');
-		}
-		else if (slot->isAI())
-		{
-			if (slot->getState() == SLOT_EASY_AI)
-				str = "CE,";
-			if (slot->getState() == SLOT_MED_AI)
-				str = "CM,";
-			else
-				str = "CB,";
-		}
-		else if (slot->getState() == SLOT_OPEN)
-		{
-			str = "O,";
-		}
-		else if (slot->getState() == SLOT_CLOSED)
-		{
-			str = "X,";
-		}
-		else
-		{
-			DEBUG_ASSERTCRASH(false, ("Bad slot type"));
-			str = "X,";
-		}
-
-		slotList.concat(str);
-	}
-	return slotList;
-}
-*/
-/*
-void LANAPI::RequestSlotList( void )
-{
-
-	LANMessage reply;
-	reply.LANMessageType = LANMessage::MSG_GAME_ANNOUNCE;
-	wcsncpy(reply.name, m_name.str(), g_lanPlayerNameLength);
-	reply.name[g_lanPlayerNameLength] = 0;
-	int player;
-	for (player = 0; player < MAX_SLOTS; ++player)
-	{
-		wcsncpy(reply.GameInfo.name[player], m_currentGame->getPlayerName(player).str(), g_lanPlayerNameLength);
-		reply.GameInfo.name[player][g_lanPlayerNameLength] = 0;
-		reply.GameInfo.ip[player] = m_currentGame->getIP(player);
-		reply.GameInfo.playerAccepted[player] = m_currentGame->getSlot(player)->isAccepted();
-	}
-	wcsncpy(reply.GameInfo.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-	reply.GameInfo.gameName[g_lanGameNameLength] = 0;
-	reply.GameInfo.inProgress = m_currentGame->isGameInProgress();
-
-	sendMessage(&reply);
-
-	OnSlotList(LANAPIInterface::RET_OK, m_currentGame);
-} // void LANAPI::RequestSlotList( void )
-*/
-void LANAPI::RequestSetName( UnicodeString newName )
-{
-	newName.trim();
-	if (m_pendingAction != ACT_NONE)
-	{
-		// Can't change name while joining games
-		OnNameChange(m_localIP, newName);
-		return;
-	}
-
-	// Set up timer
-	m_lastResendTime = timeGetTime();
-
-	if (m_inLobby && m_pendingAction == ACT_NONE)
-	{
-		m_name = newName;
-		LANMessage msg;
-		fillInLANMessage( &msg );
-		msg.LANMessageType = LANMessage::MSG_LOBBY_ANNOUNCE;
-		sendMessage(&msg);
-
-		// Update the interface
-		LANPlayer *player = LookupPlayer(m_localIP);
-		if (!player)
-		{
-			player = NEW LANPlayer;
-			player->setIP(m_localIP);
-		}
-		else
-		{
-			removePlayer(player);
-		}
-		player->setName(m_name);
-		player->setHost(m_hostName);
-		player->setLogin(m_userName);
-		player->setLastHeard(timeGetTime());
-
-		addPlayer(player);
-
-		OnNameChange(player->getIP(), player->getName());
-	}
-}
-
-void LANAPI::fillInLANMessage( LANMessage *msg )
-{
-	if (!msg)
-		return;
-
-	wcsncpy(msg->name, m_name.str(), g_lanPlayerNameLength);
-	msg->name[g_lanPlayerNameLength] = 0;
-	strncpy(msg->userName, m_userName.str(), g_lanLoginNameLength);
-	msg->userName[g_lanLoginNameLength] = 0;
-	strncpy(msg->hostName, m_hostName.str(), g_lanHostNameLength);
-	msg->hostName[g_lanHostNameLength] = 0;
-}
-
-void LANAPI::RequestLobbyLeave( Bool forced )
-{
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_REQUEST_LOBBY_LEAVE;
-	fillInLANMessage( &msg );
-	sendMessage(&msg);
-
-	if (forced)
-		m_transport->update();
-}
-
-// Misc utility functions
-LANGameInfo * LANAPI::LookupGame( UnicodeString gameName )
-{
-	LANGameInfo *theGame = m_games;
-
-	while (theGame && theGame->getName() != gameName)
-	{
-		theGame = theGame->getNext();
-	}
-
-	return theGame; // NULL means we didn't find anything.
-}
-
-LANGameInfo * LANAPI::LookupGameByListOffset( Int offset )
-{
-	LANGameInfo *theGame = m_games;
-
-	if (offset < 0)
-		return NULL;
-
-	while (offset-- && theGame)
-	{
-		theGame = theGame->getNext();
-	}
-
-	return theGame; // NULL means we didn't find anything.
-}
-
-void LANAPI::removeGame( LANGameInfo *game )
-{
-	LANGameInfo *g = m_games;
-	if (!game)
-	{
-		return;
-	}
-	else if (m_games == game)
-	{
-		m_games = m_games->getNext();
-	}
-	else
-	{
-		while (g->getNext() && g->getNext() != game)
-		{
-			g = g->getNext();
-		}
-		if (g->getNext() == game)
-		{
-			g->setNext(game->getNext());
-		}
-		else
-		{
-			// Odd.  We went the whole way without finding it in the list.
-			DEBUG_ASSERTCRASH(false, ("LANGameInfo wasn't in the list"));
-		}
-	}
-}
-
-LANPlayer * LANAPI::LookupPlayer( UnsignedInt playerIP )
-{
-	LANPlayer *thePlayer = m_lobbyPlayers;
-
-	while (thePlayer && thePlayer->getIP() != playerIP)
-	{
-		thePlayer = thePlayer->getNext();
-	}
-
-	return thePlayer; // NULL means we didn't find anything.
-}
-
-void LANAPI::removePlayer( LANPlayer *player )
-{
-	LANPlayer *p = m_lobbyPlayers;
-	if (!player)
-	{
-		return;
-	}
-	else if (m_lobbyPlayers == player)
-	{
-		m_lobbyPlayers = m_lobbyPlayers->getNext();
-	}
-	else
-	{
-		while (p->getNext() && p->getNext() != player)
-		{
-			p = p->getNext();
-		}
-		if (p->getNext() == player)
-		{
-			p->setNext(player->getNext());
-		}
-		else
-		{
-			// Odd.  We went the whole way without finding it in the list.
-			DEBUG_ASSERTCRASH(false, ("LANPlayer wasn't in the list"));
-		}
-	}
-}
-
-void LANAPI::addGame( LANGameInfo *game )
-{
-	if (!m_games)
-	{
-		m_games = game;
-		game->setNext(NULL);
-		return;
-	}
-	else
-	{
-		if (game->getName().compareNoCase(m_games->getName()) < 0)
-		{
-			game->setNext(m_games);
-			m_games = game;
-			return;
-		}
-		else
-		{
-			LANGameInfo *g = m_games;
-			while (g->getNext() && g->getNext()->getName().compareNoCase(game->getName()) > 0)
-			{
-				g = g->getNext();
-			}
-			game->setNext(g->getNext());
-			g->setNext(game);
-			return;
-		}
-	}
-}
-
-void LANAPI::addPlayer( LANPlayer *player )
-{
-	if (!m_lobbyPlayers)
-	{
-		m_lobbyPlayers = player;
-		player->setNext(NULL);
-		return;
-	}
-	else
-	{
-		if (player->getName().compareNoCase(m_lobbyPlayers->getName()) < 0)
-		{
-			player->setNext(m_lobbyPlayers);
-			m_lobbyPlayers = player;
-			return;
-		}
-		else
-		{
-			LANPlayer *p = m_lobbyPlayers;
-			while (p->getNext() && p->getNext()->getName().compareNoCase(player->getName()) > 0)
-			{
-				p = p->getNext();
-			}
-			player->setNext(p->getNext());
-			p->setNext(player);
-			return;
-		}
-	}
-}
-
-Bool LANAPI::SetLocalIP( UnsignedInt localIP )
-{
-	Bool retval = TRUE;
-	m_localIP = localIP;
-
-	m_transport->reset();
-	retval = m_transport->init(m_localIP, lobbyPort);
-	m_transport->allowBroadcasts(true);
-
-	return retval;
-}
-
-void LANAPI::SetLocalIP( AsciiString localIP )
-{
-	UnsignedInt resolvedIP = ResolveIP(localIP);
-	SetLocalIP(resolvedIP);
-}
-
-Bool LANAPI::AmIHost( void )
-{
-	return m_currentGame && m_currentGame->getIP(0) == m_localIP;
-}
-
-void LANAPI::setIsActive(Bool isActive) {
-	DEBUG_LOG(("LANAPI::setIsActive - entering\n"));
-	if (isActive != m_isActive) {
-		DEBUG_LOG(("LANAPI::setIsActive - m_isActive changed to %s\n", isActive ? "TRUE" : "FALSE"));
-		if (isActive == FALSE) {
-			if ((m_inLobby == FALSE) && (m_currentGame != NULL)) {
-				LANMessage msg;
-				fillInLANMessage( &msg );
-				msg.LANMessageType = LANMessage::MSG_INACTIVE;
-				sendMessage(&msg);
-				DEBUG_LOG(("LANAPI::setIsActive - sent an IsActive message\n"));
-			}
-		}
-	}
-	m_isActive = isActive;
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp b/Generals/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp
deleted file mode 100644
index 006c270e9bb..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp
+++ /dev/null
@@ -1,740 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: LANAPICallbacks.cpp
-// Author: Chris Huybregts, October 2001
-// Description: LAN API Callbacks
-///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "strtok_r.h"
-#include "Common/GameEngine.h"
-#include "Common/GlobalData.h"
-#include "Common/MessageStream.h"
-#include "Common/MultiplayerSettings.h"
-#include "Common/PlayerTemplate.h"
-#include "Common/QuotedPrintable.h"
-#include "Common/RandomValue.h"
-#include "Common/UserPreferences.h"
-#include "GameClient/GameText.h"
-#include "GameClient/LanguageFilter.h"
-#include "GameClient/MapUtil.h"
-#include "GameClient/MessageBox.h"
-#include "GameLogic/GameLogic.h"
-#include "GameNetwork/FileTransfer.h"
-#include "GameNetwork/LANAPICallbacks.h"
-#include "GameNetwork/networkutil.h"
-
-LANAPI *TheLAN = NULL;
-extern Bool LANbuttonPushed;
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//Colors used for the chat dialogs
-const Color playerColor =  GameMakeColor(255,255,255,255);
-const Color gameColor =  GameMakeColor(255,255,255,255);
-const Color gameInProgressColor =  GameMakeColor(128,128,128,255);
-const Color chatNormalColor =  GameMakeColor(50,215,230,255);
-const Color chatActionColor =  GameMakeColor(255,0,255,255);
-const Color chatLocalNormalColor =  GameMakeColor(255,128,0,255);
-const Color chatLocalActionColor =  GameMakeColor(128,255,255,255);
-const Color chatSystemColor =  GameMakeColor(255,255,255,255);
-const Color acceptTrueColor =  GameMakeColor(0,255,0,255);
-const Color acceptFalseColor =  GameMakeColor(255,0,0,255);
-
-
-UnicodeString LANAPIInterface::getErrorStringFromReturnType( ReturnType ret )
-{
-	switch (ret)
-	{
-		case RET_OK:
-			return TheGameText->fetch("LAN:OK");
-		case RET_TIMEOUT:
-			return TheGameText->fetch("LAN:ErrorTimeout");
-		case RET_GAME_FULL:
-			return TheGameText->fetch("LAN:ErrorGameFull");
-		case RET_DUPLICATE_NAME:
-			return TheGameText->fetch("LAN:ErrorDuplicateName");
-		case RET_CRC_MISMATCH:
-			return TheGameText->fetch("LAN:ErrorCRCMismatch");
-		case RET_GAME_STARTED:
-			return TheGameText->fetch("LAN:ErrorGameStarted");
-		case RET_GAME_EXISTS:
-			return TheGameText->fetch("LAN:ErrorGameExists");
-		case RET_GAME_GONE:
-			return TheGameText->fetch("LAN:ErrorGameGone");
-		case RET_BUSY:
-			return TheGameText->fetch("LAN:ErrorBusy");
-		case RET_SERIAL_DUPE:
-			return TheGameText->fetch("WOL:ChatErrorSerialDup");
-		default:
-			return TheGameText->fetch("LAN:ErrorUnknown");
-	}
-}
-
-// On functions are (generally) the result of network traffic
-
-void LANAPI::OnAccept( UnsignedInt playerIP, Bool status ) 
-{ 
-	if( AmIHost() )
-	{
-		Int i = 0;
-		for (; i < MAX_SLOTS; i++)
-		{
-			if (m_currentGame->getIP(i) == playerIP)
-			{
-				if(status)
-					m_currentGame->getLANSlot(i)->setAccept();
-				else
-					m_currentGame->getLANSlot(i)->unAccept();
-				break;
-			}// if
-		}// for
-		if (i != MAX_SLOTS ) 
-		{
-			RequestGameOptions( GenerateGameOptionsString(), false );
-			lanUpdateSlotList();
-		}
-	}//if
-	else 
-	{
-		//i'm not the host but if the accept came from the host...
-		if( m_currentGame->getIP(0) == playerIP )
-		{
-			UnicodeString text;
-			text = TheGameText->fetch("GUI:HostWantsToStart");
-			OnChat(UnicodeString(L"SYSTEM"), m_localIP, text, LANCHAT_SYSTEM);				
-		}
-	}
-}// void LANAPI::OnAccept( UnicodeString player, Bool status ) 
-
-void LANAPI::OnHasMap( UnsignedInt playerIP, Bool status ) 
-{ 
-	if( AmIHost() )
-	{
-		Int i = 0;
-		for (; i < MAX_SLOTS; i++)
-		{
-			if (m_currentGame->getIP(i) == playerIP)
-			{
-				m_currentGame->getLANSlot(i)->setMapAvailability( status );
-				break;
-			}// if
-		}// for
-		if (i != MAX_SLOTS ) 
-		{
-			UnicodeString mapDisplayName;
-			const MapMetaData *mapData = TheMapCache->findMap( m_currentGame->getMap() );
-			Bool willTransfer = TRUE;
-			if (mapData)
-			{
-				mapDisplayName.format(L"%ls", mapData->m_displayName.str());
-				if (mapData->m_isOfficial)
-					willTransfer = FALSE;
-			}
-			else
-			{
-				mapDisplayName.format(L"%hs", m_currentGame->getMap().str());
-				willTransfer = WouldMapTransfer(m_currentGame->getMap());
-			}
-			if (!status)
-			{
-				UnicodeString text;
-				if (willTransfer)
-					text.format(TheGameText->fetch("GUI:PlayerNoMapWillTransfer"), m_currentGame->getLANSlot(i)->getName().str(), mapDisplayName.str());
-				else
-					text.format(TheGameText->fetch("GUI:PlayerNoMap"), m_currentGame->getLANSlot(i)->getName().str(), mapDisplayName.str());
-				OnChat(UnicodeString(L"SYSTEM"), m_localIP, text, LANCHAT_SYSTEM);
-			}
-			lanUpdateSlotList();
-		}
-	}//if
-}// void LANAPI::OnHasMap( UnicodeString player, Bool status ) 
-
-void LANAPI::OnGameStartTimer( Int seconds )
-{
-	UnicodeString text;
-	if (seconds == 1)
-		text.format(TheGameText->fetch("LAN:GameStartTimerSingular"), seconds);
-	else
-		text.format(TheGameText->fetch("LAN:GameStartTimerPlural"), seconds);
-	OnChat(UnicodeString(L"SYSTEM"), m_localIP, text, LANCHAT_SYSTEM);
-}
-
-void LANAPI::OnGameStart( void )
-{
-	//DEBUG_LOG(("Map is '%s', preview is '%s'\n", m_currentGame->getMap().str(), GetPreviewFromMap(m_currentGame->getMap()).str()));
-	//DEBUG_LOG(("Map is '%s', INI is '%s'\n", m_currentGame->getMap().str(), GetINIFromMap(m_currentGame->getMap()).str()));
-
-	if (m_currentGame)
-	{
-		LANPreferences pref;
-		AsciiString option;
-		option.format("%d", m_currentGame->getLANSlot( m_currentGame->getLocalSlotNum() )->getPlayerTemplate());
-		pref["PlayerTemplate"] = option;
-		option.format("%d", m_currentGame->getLANSlot( m_currentGame->getLocalSlotNum() )->getColor());
-		pref["Color"] = option;
-		if (m_currentGame->amIHost())
-			pref["Map"] = AsciiStringToQuotedPrintable(m_currentGame->getMap());
-		pref.write();
-
-		m_isInLANMenu = FALSE;
-
-		//m_currentGame->startGame(0);
-
-		// Set up the game network
-		DEBUG_ASSERTCRASH(TheNetwork == NULL, ("For some reason TheNetwork isn't NULL at the start of this game.  Better look into that."));
-
-		if (TheNetwork != NULL) {
-			delete TheNetwork;
-			TheNetwork = NULL;
-		}
-
-		// Time to initialize TheNetwork for this game.
-		TheNetwork = NetworkInterface::createNetwork();
-		TheNetwork->init();
-		TheNetwork->setLocalAddress(m_localIP, 8088);
-		TheNetwork->initTransport();
-
-		TheNetwork->parseUserList(m_currentGame);
-
-		if (TheGameLogic->isInGame())
-			TheGameLogic->clearGameData();
-
-		Bool filesOk = DoAnyMapTransfers(m_currentGame);
-
-		// see if we really have the map.  if not, back out.
-		TheMapCache->updateCache();
-		if (!filesOk || TheMapCache->findMap(m_currentGame->getMap()) == NULL)
-		{
-			DEBUG_LOG(("After transfer, we didn't really have the map.  Bailing...\n"));
-			OnPlayerLeave(m_name);
-			removeGame(m_currentGame);
-			m_currentGame = NULL;
-			m_inLobby = TRUE;
-			if (TheNetwork != NULL) {
-				delete TheNetwork;
-				TheNetwork = NULL;
-			}
-			OnChat(UnicodeString::TheEmptyString, 0, TheGameText->fetch("GUI:CouldNotTransferMap"), LANCHAT_SYSTEM);
-			return;
-		}
-
-		m_currentGame->startGame(0);
-
-		// shutdown the top, but do not pop it off the stack
-		//TheShell->hideShell();
-		// setup the Global Data with the Map and Seed
-		TheWritableGlobalData->m_pendingFile = m_currentGame->getMap();
-
-		// send a message to the logic for a new game
-		GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
-		msg->appendIntegerArgument(GAME_LAN);
-
-		TheWritableGlobalData->m_useFpsLimit = false;
-
-		// Set the random seed
-		InitGameLogicRandom( m_currentGame->getSeed() );
-		DEBUG_LOG(("InitGameLogicRandom( %d )\n", m_currentGame->getSeed()));
-	}
-}
-
-void LANAPI::OnGameOptions( UnsignedInt playerIP, Int playerSlot, AsciiString options )
-{
-	if (!m_currentGame)
-		return;
-
-	if (m_currentGame->getIP(playerSlot) != playerIP)
-		return; // He's not in our game?!?
-	
-	
-	if (m_currentGame->isGameInProgress())
-		return; // we don't want to process any game options while in game.
-
-	if (playerSlot == 0 && !m_currentGame->amIHost())
-	{
-		m_currentGame->setLastHeard(timeGetTime());
-		AsciiString oldOptions = GameInfoToAsciiString(m_currentGame); // save these off for if we get booted
-		if(ParseGameOptionsString(m_currentGame,options))
-		{
-			lanUpdateSlotList();
-			updateGameOptions();
-		}
-		Bool booted = true;
-		for(Int player = 1; player< MAX_SLOTS; player++)
-		{
-			if(m_currentGame->getIP(player) == m_localIP)
-			{
-				booted = false;
-				break;
-			}				
-		}
-		if(booted)
-		{
-			// restore the options with us in so we can save prefs
-			ParseGameOptionsString(m_currentGame, oldOptions);
-			OnPlayerLeave(m_name);
-		}
-
-	}
-	else
-	{
-		// Check for user/host updates
-		{
-			AsciiString key;
-			AsciiString munkee = options;
-			munkee.nextToken(&key, "=");
-			//DEBUG_LOG(("GameOpt request: key=%s, val=%s from player %d\n", key.str(), munkee.str(), playerSlot));
-
-			LANGameSlot *slot = m_currentGame->getLANSlot(playerSlot);
-			if (!slot)
-				return;
-
-			if (key == "User")
-			{
-				slot->setLogin(munkee.str()+1);
-				return;
-			}
-			else if (key == "Host")
-			{
-				slot->setHost(munkee.str()+1);
-				return;
-			}
-		}
-
-		// Parse player requests (side, color, etc)
-		if( AmIHost() && m_localIP != playerIP)
-		{
-			if (options.compare("HELLO") == 0)
-			{
-				m_currentGame->setPlayerLastHeard(playerSlot, timeGetTime());
-			}
-			else
-			{
-				m_currentGame->setPlayerLastHeard(playerSlot, timeGetTime());
-				Bool change = false;
-				Bool shouldUnaccept = false;
-				AsciiString key;
-				options.nextToken(&key, "=");
-				Int val = atoi(options.str()+1);
-				DEBUG_LOG(("GameOpt request: key=%s, val=%s from player %d\n", key.str(), options.str(), playerSlot));
-
-				LANGameSlot *slot = m_currentGame->getLANSlot(playerSlot);
-				if (!slot)
-					return;
-
-				if (key == "Color")
-				{
-					if (val >= -1 && val < TheMultiplayerSettings->getNumColors() && val != slot->getColor() && slot->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
-					{
-						Bool colorAvailable = TRUE;
-						if(val != -1 )
-						{
-							for(Int i=0; i <MAX_SLOTS; i++)
-							{
-								LANGameSlot *checkSlot = m_currentGame->getLANSlot(i);
-								if(val == checkSlot->getColor() && slot != checkSlot)
-								{
-									colorAvailable = FALSE;
-									break;
-								}
-							}
-						}
-						if(colorAvailable)
-							slot->setColor(val);
-						change = true;
-					}
-					else
-					{
-						DEBUG_LOG(("Rejecting invalid color %d\n", val));
-					}
-				}
-				else if (key == "PlayerTemplate")
-				{
-					if (val >= PLAYERTEMPLATE_MIN && val < ThePlayerTemplateStore->getPlayerTemplateCount() && val != slot->getPlayerTemplate())
-					{
-						slot->setPlayerTemplate(val);
-						if (val == PLAYERTEMPLATE_OBSERVER)
-						{
-							slot->setColor(-1);
-							slot->setStartPos(-1);
-							slot->setTeamNumber(-1);
-						}
-						change = true;
-						shouldUnaccept = true;
-					}
-					else
-					{
-						DEBUG_LOG(("Rejecting invalid PlayerTemplate %d\n", val));
-					}
-				}
-				else if (key == "StartPos" && slot->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
-				{
-						
-					if (val >= -1 && val < MAX_SLOTS && val != slot->getStartPos())
-					{
-						Bool startPosAvailable = TRUE;
-						if(val != -1)
-							for(Int i=0; i <MAX_SLOTS; i++)
-							{
-								LANGameSlot *checkSlot = m_currentGame->getLANSlot(i);
-								if(val == checkSlot->getStartPos() && slot != checkSlot)
-								{
-									startPosAvailable = FALSE;
-									break;
-								}
-							}
-						if(startPosAvailable)
-							slot->setStartPos(val);
-						change = true;
-						shouldUnaccept = true;
-					}
-					else
-					{
-						DEBUG_LOG(("Rejecting invalid startPos %d\n", val));
-					}
-				}
-				else if (key == "Team")
-				{
-					if (val >= -1 && val < MAX_SLOTS/2 && val != slot->getTeamNumber() && slot->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
-					{
-						slot->setTeamNumber(val);
-						change = true;
-						shouldUnaccept = true;
-					}
-					else
-					{
-						DEBUG_LOG(("Rejecting invalid team %d\n", val));
-					}
-				}
-				else if (key == "NAT")
-				{
-					if ((val >= FirewallHelperClass::FIREWALL_TYPE_SIMPLE) &&
-							(val <= FirewallHelperClass::FIREWALL_TYPE_DESTINATION_PORT_DELTA))
-					{
-						slot->setNATBehavior((FirewallHelperClass::FirewallBehaviorType)val);
-						DEBUG_LOG(("NAT behavior set to %d for player %d\n", val, playerSlot));
-						change = true;
-					}
-					else
-					{
-						DEBUG_LOG(("Rejecting invalid NAT behavior %d\n", (Int)val));
-					}
-				}
-
-				if (change)
-				{
-					if (shouldUnaccept)
-						m_currentGame->resetAccepted();
-					RequestGameOptions(GenerateGameOptionsString(), true);
-					lanUpdateSlotList();
-					DEBUG_LOG(("Slot value is color=%d, PlayerTemplate=%d, startPos=%d, team=%d\n",
-						slot->getColor(), slot->getPlayerTemplate(), slot->getStartPos(), slot->getTeamNumber()));
-					DEBUG_LOG(("Slot list updated to %s\n", GenerateGameOptionsString().str()));
-				}
-			}
-		}
-	}
-}
-
-
-/*
-void LANAPI::OnSlotList( ReturnType ret, LANGameInfo *theGame )
-{
-	if (!theGame || theGame != m_currentGame)
-		return;
-
-	Bool foundMe = false;
-	for (int player = 0; player < MAX_SLOTS; ++player)
-	{
-		if (m_currentGame->getIP(player) == m_localIP)
-		{
-			foundMe = true;
-			break;
-		}
-	}
-	if (!foundMe)
-	{
-		// I've been kicked - back to the lobby for me!
-		// We're counting on the fact that OnPlayerLeave winds up calling reset on TheLAN.
-		OnPlayerLeave(m_name);
-		return;
-	}
-
-	lanUpdateSlotList();
-}
-*/
-void LANAPI::OnPlayerJoin( Int slot, UnicodeString playerName )
-{
-	if (m_currentGame && m_currentGame->getIP(0) == m_localIP)
-	{
-		// Someone New Joined.. lets reset the accepts
-		m_currentGame->resetAccepted();
-
-		// Send out the game options
-		RequestGameOptions(GenerateGameOptionsString(), true);
-	}
-
-	lanUpdateSlotList();
-}
-
-void LANAPI::OnGameJoin( ReturnType ret, LANGameInfo *theGame )
-{
-	if (ret == RET_OK)
-	{
-		LANbuttonPushed = true;
-		TheShell->push( AsciiString("Menus/LanGameOptionsMenu.wnd") );
-		//lanUpdateSlotList();
-
-		LANPreferences pref;
-		AsciiString options;
-		options.format("PlayerTemplate=%d", pref.getPreferredFaction());
-		RequestGameOptions(options, true);
-		options.format("Color=%d", pref.getPreferredColor());
-		RequestGameOptions(options, true);
-		options.format("User=%s", m_userName.str());
-		RequestGameOptions( options, true );
-		options.format("Host=%s", m_hostName.str());
-		RequestGameOptions( options, true );
-		options.format("NAT=%d", FirewallHelperClass::FIREWALL_TYPE_SIMPLE); // BGC: This is a LAN game, so there is no firewall.
-		RequestGameOptions( options, true );
-	}
-	else if (ret != RET_BUSY)
-	{
-		/// @todo: re-enable lobby controls?  Error msgs?
-		UnicodeString title, body;
-		title = TheGameText->fetch("LAN:JoinFailed");
-		body = getErrorStringFromReturnType(ret);
-		MessageBoxOk(title, body, NULL);
-	}
-}
-
-void LANAPI::OnHostLeave( void )
-{
-	DEBUG_ASSERTCRASH(!m_inLobby && m_currentGame, ("Game info is gone!"));
-	if (m_inLobby || !m_currentGame)
-		return;
-	LANbuttonPushed = true;
-	DEBUG_LOG(("Host left - popping to lobby\n"));
-	TheShell->pop();
-}
-
-void LANAPI::OnPlayerLeave( UnicodeString player )
-{
-	DEBUG_ASSERTCRASH(!m_inLobby && m_currentGame, ("Game info is gone!"));
-	if (m_inLobby || !m_currentGame || m_currentGame->isGameInProgress())
-		return;
-
-	if (m_name.compare(player) == 0)
-	{
-		// We're leaving.  Save options and Pop the shell up a screen.
-		//DEBUG_ASSERTCRASH(false, ("Slot is %d\n", m_currentGame->getLocalSlotNum()));
-		if (m_currentGame && m_currentGame->isInGame() && m_currentGame->getLocalSlotNum() >= 0)
-		{
-			LANPreferences pref;
-			AsciiString option;
-			option.format("%d", m_currentGame->getLANSlot( m_currentGame->getLocalSlotNum() )->getPlayerTemplate());
-			pref["PlayerTemplate"] = option;
-			option.format("%d", m_currentGame->getLANSlot( m_currentGame->getLocalSlotNum() )->getColor());
-			pref["Color"] = option;
-			if (m_currentGame->amIHost())
-				pref["Map"] = AsciiStringToQuotedPrintable(m_currentGame->getMap());
-			pref.write();
-		}
-		LANbuttonPushed = true;
-		DEBUG_LOG(("OnPlayerLeave says we're leaving!  pop away!\n"));
-		TheShell->pop();
-	}
-	else
-	{
-		if (m_currentGame && m_currentGame->getIP(0) == m_localIP)
-		{
-			// Force a new slotlist send
-			m_lastResendTime = 0;
-			
-			lanUpdateSlotList();
-			RequestGameOptions( GenerateGameOptionsString(), true );
-
-		}
-	}
-}
-
-void LANAPI::OnGameList( LANGameInfo *gameList )
-{
-		
-	if (m_inLobby)
-	{
-		LANDisplayGameList(listboxGames, gameList);
-	}
-}//void LANAPI::OnGameList( LANGameInfo *gameList ) 
-
-void LANAPI::OnGameCreate( ReturnType ret )
-{
-	if (ret == RET_OK)
-	{
-
-		LANbuttonPushed = true;
-		TheShell->push( AsciiString("Menus/LanGameOptionsMenu.wnd") );
-
-		RequestLobbyLeave( false );
-		//RequestGameAnnounce( ); // can't do this here, since we don't have a map set
-	}
-	else
-	{
-		if(m_inLobby)
-		{
-			switch( ret )
-			{
-			case RET_GAME_EXISTS:
-				GadgetListBoxAddEntryText(listboxChatWindow, TheGameText->fetch("LAN:ErrorGameExists"), chatSystemColor, -1, -1);
-				break;
-			case RET_BUSY:
-				GadgetListBoxAddEntryText(listboxChatWindow, TheGameText->fetch("LAN:ErrorBusy"), chatSystemColor, -1, -1);
-				break;
-			default:
-				GadgetListBoxAddEntryText(listboxChatWindow, TheGameText->fetch("LAN:ErrorUnknown"), chatSystemColor, -1, -1);
-			}
-		}
-	}
-
-}//void OnGameCreate( ReturnType ret )
-
-void LANAPI::OnPlayerList( LANPlayer *playerList )
-{
-	if (m_inLobby)
-	{
-		
-		UnsignedInt selectedIP = 0;
-		Int selectedIndex = -1;
-		Int indexToSelect = -1;
-		GadgetListBoxGetSelected(listboxPlayers, &selectedIndex);
-		
-		if (selectedIndex != -1 )
-			selectedIP = (UnsignedInt) GadgetListBoxGetItemData(listboxPlayers, selectedIndex, 0);
-
-		GadgetListBoxReset(listboxPlayers);
-
-		LANPlayer *player = m_lobbyPlayers;
-		while (player)
-		{
-			Int addedIndex = GadgetListBoxAddEntryText(listboxPlayers, player->getName(), playerColor, -1, -1);
-			GadgetListBoxSetItemData(listboxPlayers, (void *)player->getIP(),addedIndex, 0 );
-
-			if (selectedIP == player->getIP())
-				indexToSelect = addedIndex;
-
-			player = player->getNext();
-		}
-
-		if (indexToSelect >= 0)
-			GadgetListBoxSetSelected(listboxPlayers, indexToSelect);
-	}
-}
-
-void LANAPI::OnNameChange( UnsignedInt IP, UnicodeString newName )
-{
-	OnPlayerList(m_lobbyPlayers);
-}
-
-void LANAPI::OnInActive(UnsignedInt IP) {
-	
-}
-
-void LANAPI::OnChat( UnicodeString player, UnsignedInt ip, UnicodeString message, ChatType format )
-{
-	GameWindow *chatWindow = NULL;
-
-	if (m_inLobby)
-	{
-		chatWindow = listboxChatWindow;
-	}
-	else if( m_currentGame && m_currentGame->isGameInProgress() && TheShell->isShellActive())
-	{
-		chatWindow = listboxChatWindowScoreScreen;
-	}
-	else if( m_currentGame && !m_currentGame->isGameInProgress())
-	{
-		chatWindow = listboxChatWindowLanGame;	
-	}
-	if (chatWindow == NULL)
-		return;
-	Int index = -1;
-	UnicodeString unicodeChat;
-	switch (format)
-	{
-		case LANAPIInterface::LANCHAT_SYSTEM:
-			unicodeChat = L"";
-			unicodeChat.concat(message);
-			unicodeChat.concat(L"");
-			index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatSystemColor, -1, -1);
-			break;
-		case LANAPIInterface::LANCHAT_EMOTE:
-			unicodeChat = player;
-			unicodeChat.concat(L' ');
-			unicodeChat.concat(message);
-			if (ip == m_localIP)
-				index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatLocalActionColor, -1, -1);
-			else
-				index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatActionColor, -1, -1);
-			break;
-		case LANAPIInterface::LANCHAT_NORMAL:
-		default:
-		{
-			// Do the language filtering.
-			TheLanguageFilter->filterLine(message);
-
-			Color chatColor = GameMakeColor(255, 255, 255, 255);
-			if (m_currentGame)
-			{
-				Int slotNum = m_currentGame->getSlotNum(player);
-				// it'll be -1 if its invalid.
-				if (slotNum >= 0) {
-					GameSlot *gs = m_currentGame->getSlot(slotNum);
-					if (gs) {
-						Int colorIndex = gs->getColor();
-						MultiplayerColorDefinition *def = TheMultiplayerSettings->getColor(colorIndex);
-						if (def)
-							chatColor = def->getColor();
-					}
-				}
-			}
-			
-			unicodeChat = L"[";
-			unicodeChat.concat(player);
-			unicodeChat.concat(L"] ");
-			unicodeChat.concat(message);
-			if (ip == m_localIP)
-				index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatColor, -1, -1);
-			else
-				index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatColor, -1, -1);
-			break;
-		}
-	}
-	GadgetListBoxSetItemData(chatWindow, (void *)-1, index);
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp b/Generals/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp
deleted file mode 100644
index 4a0f0af0a1b..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp
+++ /dev/null
@@ -1,683 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: LANAPIHandlers.cpp
-// Author: Matthew D. Campbell, October 2001
-// Description: LAN callback handlers
-///////////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/crc.h"
-#include "Common/GameState.h"
-#include "Common/Registry.h"
-#include "Common/GlobalData.h"
-#include "Common/QuotedPrintable.h"
-#include "Common/UserPreferences.h"
-#include "GameNetwork/LANAPI.h"
-#include "GameNetwork/LANAPICallbacks.h"
-#include "GameClient/MapUtil.h"
-
-void LANAPI::handleRequestLocations( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (m_inLobby)
-	{
-		LANMessage reply;
-		fillInLANMessage( &reply );
-		reply.LANMessageType = LANMessage::MSG_LOBBY_ANNOUNCE;
-
-		sendMessage(&reply);
-		m_lastResendTime = timeGetTime();
-	}
-	else
-	{
-		// In game - are we a game host?
-		if (m_currentGame)
-		{
-			if (m_currentGame->getIP(0) == m_localIP)
-			{
-				LANMessage reply;
-				fillInLANMessage( &reply );
-				reply.LANMessageType = LANMessage::MSG_GAME_ANNOUNCE;
-				AsciiString gameOpts = GenerateGameOptionsString();
-				strncpy(reply.GameInfo.options,gameOpts.str(),m_lanMaxOptionsLength);
-				wcsncpy(reply.GameInfo.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-				reply.GameInfo.gameName[g_lanGameNameLength] = 0;
-				reply.GameInfo.inProgress = m_currentGame->isGameInProgress();
-
-				sendMessage(&reply);
-			}
-			else
-			{
-				// We're a joiner
-			}
-		}
-	}
-	// Add the player to the lobby player list
-	LANPlayer *player = LookupPlayer(senderIP);
-	if (!player)
-	{
-		player = NEW LANPlayer;
-		player->setIP(senderIP);
-	}
-	else
-	{
-		removePlayer(player);
-	}
-	player->setName(UnicodeString(msg->name));
-	player->setHost(msg->hostName);
-	player->setLogin(msg->userName);
-	player->setLastHeard(timeGetTime());
-
-	addPlayer(player);
-
-	OnNameChange(player->getIP(), player->getName());
-}
-
-void LANAPI::handleGameAnnounce( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (senderIP == m_localIP)
-	{
-		return; // Don't try to update own info
-	}
-	else if (m_currentGame && m_currentGame->isGameInProgress())
-	{
-		return; // Don't care about games if we're playing
-	}
-	else if (senderIP == m_directConnectRemoteIP)
-	{
-
-		if (m_currentGame == NULL)
-		{
-			LANGameInfo *game = LookupGame(UnicodeString(msg->GameInfo.gameName));
-			if (!game)
-			{
-				game = NEW LANGameInfo;
-				game->setName(UnicodeString(msg->GameInfo.gameName));
-				addGame(game);
-			}
-			Bool success = ParseGameOptionsString(game,AsciiString(msg->GameInfo.options));
-			game->setGameInProgress(msg->GameInfo.inProgress);
-			game->setIsDirectConnect(msg->GameInfo.isDirectConnect);
-			game->setLastHeard(timeGetTime());
-			if (!success)
-			{
-				// remove from list
-				removeGame(game);
-				delete game;
-				game = NULL;
-				return;
-			}
-			RequestGameJoin(game, m_directConnectRemoteIP);
-		}
-	}
-	else
-	{
-		LANGameInfo *game = LookupGame(UnicodeString(msg->GameInfo.gameName));
-		if (!game)
-		{
-			game = NEW LANGameInfo;
-			game->setName(UnicodeString(msg->GameInfo.gameName));
-			addGame(game);
-		}
-		Bool success = ParseGameOptionsString(game,AsciiString(msg->GameInfo.options));
-		game->setGameInProgress(msg->GameInfo.inProgress);
-		game->setIsDirectConnect(msg->GameInfo.isDirectConnect);
-		game->setLastHeard(timeGetTime());
-		if (!success)
-		{
-			// remove from list
-			removeGame(game);
-			delete game;
-			game = NULL;
-		}
-
-		OnGameList( m_games );
-	//	if (game == m_currentGame && !m_inLobby)
-	//		OnSlotList(RET_OK, game);
-	}
-}
-
-void LANAPI::handleLobbyAnnounce( LANMessage *msg, UnsignedInt senderIP )
-{
-	LANPlayer *player = LookupPlayer(senderIP);
-	if (!player)
-	{
-		player = NEW LANPlayer;
-		player->setIP(senderIP);
-	}
-	else
-	{
-		removePlayer(player);
-	}
-	player->setName(UnicodeString(msg->name));
-	player->setHost(msg->hostName);
-	player->setLogin(msg->userName);
-	player->setLastHeard(timeGetTime());
-
-	addPlayer(player);
-
-	OnNameChange(player->getIP(), player->getName());
-}
-
-void LANAPI::handleRequestGameInfo( LANMessage *msg, UnsignedInt senderIP )
-{
-	// In game - are we a game host?
-	if (m_currentGame)
-	{
-		if (m_currentGame->getIP(0) == m_localIP || (m_currentGame->isGameInProgress() && TheNetwork && TheNetwork->isPacketRouter())) // if we're in game we should reply if we're the packet router
-		{
-			LANMessage reply;
-			fillInLANMessage( &reply );
-			reply.LANMessageType = LANMessage::MSG_GAME_ANNOUNCE;
-			
-			AsciiString gameOpts = GameInfoToAsciiString(m_currentGame);
-			strncpy(reply.GameInfo.options,gameOpts.str(),m_lanMaxOptionsLength);
-			wcsncpy(reply.GameInfo.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-			reply.GameInfo.gameName[g_lanGameNameLength] = 0;
-			reply.GameInfo.inProgress = m_currentGame->isGameInProgress();
-			reply.GameInfo.isDirectConnect = m_currentGame->getIsDirectConnect();
-
-			sendMessage(&reply, senderIP);
-		}
-	}
-}
-
-void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP )
-{
-	UnsignedInt responseIP = senderIP;	// need this cause the player may or may not be
-																			// in the player list at the sendMessage.
-
-	if (msg->GameToJoin.gameIP != m_localIP)
-	{
-		return; // Not us.  Ignore it.
-	}
-	LANMessage reply;
-	fillInLANMessage( &reply );
-	if (!m_inLobby && m_currentGame && m_currentGame->getIP(0) == m_localIP)
-	{
-		if (m_currentGame->isGameInProgress())
-		{
-			reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-			reply.GameNotJoined.reason = LANAPIInterface::RET_GAME_STARTED;
-			reply.GameNotJoined.gameIP = m_localIP;
-			reply.GameNotJoined.playerIP = senderIP;
-			DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because game already started.\n"));
-		}
-		else
-		{
-			int player;
-			Bool canJoin = true;
-
-			// see if the CRCs match
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-			if (TheGlobalData->m_netMinPlayers > 0) {
-#endif
-			if (msg->GameToJoin.iniCRC != TheGlobalData->m_iniCRC ||
-					msg->GameToJoin.exeCRC != TheGlobalData->m_exeCRC)
-			{
-				DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of CRC mismatch. CRCs are them/us INI:%X/%X exe:%X/%X\n",
-					msg->GameToJoin.iniCRC, TheGlobalData->m_iniCRC,
-					msg->GameToJoin.exeCRC, TheGlobalData->m_exeCRC));
-				reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-				reply.GameNotJoined.reason = LANAPIInterface::RET_CRC_MISMATCH;
-				reply.GameNotJoined.gameIP = m_localIP;
-				reply.GameNotJoined.playerIP = senderIP;
-				canJoin = false;
-			}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-			}
-#endif
-			
-// TheSuperHackers @tweak Disables the duplicate serial check
-#if 0
-			// check for a duplicate serial
-			AsciiString s;
-			for (player = 0; canJoin && player<MAX_SLOTS; ++player)
-			{
-				LANGameSlot *slot = m_currentGame->getLANSlot(player);
-				s.clear();
-				if (player == 0)
-				{
-					GetStringFromRegistry("\\ergc", "", s);
-				}
-				else if (slot->isHuman())
-				{
-					s = slot->getSerial();
-					if (s.isEmpty())
-						s = "<Munkee>";
-				}
-
-				if (s.isNotEmpty())
-				{
-					DEBUG_LOG(("Checking serial '%s' in slot %d\n", s.str(), player));
-
-					if (!strncmp(s.str(), msg->GameToJoin.serial, g_maxSerialLength))
-					{
-						// serials match!  kick the punk!
-						reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-						reply.GameNotJoined.reason = LANAPIInterface::RET_SERIAL_DUPE;
-						reply.GameNotJoined.gameIP = m_localIP;
-						reply.GameNotJoined.playerIP = senderIP;
-						canJoin = false;
-
-						DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of duplicate serial # (%s).\n", s.str()));
-						break;
-					}
-				}
-			}
-#endif
-
-			// We're the host, so see if he has a duplicate name
-			for (player = 0; canJoin && player<MAX_SLOTS; ++player)
-			{
-				LANGameSlot *slot = m_currentGame->getLANSlot(player);
-				if (slot->isHuman() && slot->getName().compare(msg->name) == 0)
-				{
-					// just deny duplicates
-					reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-					reply.GameNotJoined.reason = LANAPIInterface::RET_DUPLICATE_NAME;
-					reply.GameNotJoined.gameIP = m_localIP;
-					reply.GameNotJoined.playerIP = senderIP;
-					canJoin = false;
-
-					DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of duplicate names.\n"));
-					break;
-				}
-			}
-
-			// See if there's room
-			// First get the number of players currently in the room.
-			Int numPlayers = 0;
-			for (player = 0; player < MAX_SLOTS; ++player)
-			{
-				if (m_currentGame->getLANSlot(player)->isOccupied()
-					&& !(m_currentGame->getLANSlot(player)->getPlayerTemplate() == PLAYERTEMPLATE_OBSERVER))
-				{
-					++numPlayers;
-				}
-			}
-			
-			// now get the number of starting spots on the map.
-			Int numStartingSpots = MAX_SLOTS;
-			const MapMetaData *md = TheMapCache->findMap(m_currentGame->getMap());
-			if (md != NULL)
-			{
-				numStartingSpots = md->m_numPlayers;
-			}
-
-			if (numPlayers < numStartingSpots) {
-				for (player = 0; canJoin && player<MAX_SLOTS; ++player)
-				{
-					if (m_currentGame->getLANSlot(player)->isOpen())
-					{
-						// OK, add him in.
-						reply.LANMessageType = LANMessage::MSG_JOIN_ACCEPT;
-						wcsncpy(reply.GameJoined.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-						reply.GameJoined.gameName[g_lanGameNameLength] = 0;
-						reply.GameJoined.slotPosition = player;
-						reply.GameJoined.gameIP = m_localIP;
-						reply.GameJoined.playerIP = senderIP;
-
-						LANGameSlot newSlot;
-						newSlot.setState(SLOT_PLAYER, UnicodeString(msg->name));
-						newSlot.setIP(senderIP);
-						newSlot.setPort(NETWORK_BASE_PORT_NUMBER);
-						newSlot.setLastHeard(timeGetTime());
-						newSlot.setSerial(msg->GameToJoin.serial);
-						m_currentGame->setSlot(player,newSlot);
-						DEBUG_LOG(("LANAPI::handleRequestJoin - added player %ls at ip 0x%08x to the game\n", msg->name, senderIP));
-
-						OnPlayerJoin(player, UnicodeString(msg->name));
-						responseIP = 0;
-
-						break;
-					}
-				}
-			}
-			if (canJoin && player == MAX_SLOTS)
-			{
-				reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-				wcsncpy(reply.GameNotJoined.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-				reply.GameNotJoined.gameName[g_lanGameNameLength] = 0;
-				reply.GameNotJoined.reason = LANAPIInterface::RET_GAME_FULL;
-				reply.GameNotJoined.gameIP = m_localIP;
-				reply.GameNotJoined.playerIP = senderIP;
-				DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because game is full.\n"));
-			}
-		}
-	}
-	else
-	{
-		reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-		reply.GameNotJoined.reason = LANAPIInterface::RET_GAME_GONE;
-		reply.GameNotJoined.gameIP = m_localIP;
-		reply.GameNotJoined.playerIP = senderIP;
-	}
-	sendMessage(&reply, responseIP);
-	RequestGameOptions(GenerateGameOptionsString(), true);
-}
-
-void LANAPI::handleJoinAccept( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (msg->GameJoined.playerIP == m_localIP) // Is it for us?
-	{
-		if (m_pendingAction == ACT_JOIN) // Are we trying to join?
-		{
-			m_currentGame = LookupGame(UnicodeString(msg->GameJoined.gameName));
-		
-			if (!m_currentGame)
-			{
-				DEBUG_ASSERTCRASH(false, ("Could not find game to join!"));
-				OnGameJoin(RET_UNKNOWN, NULL);
-			}
-			else
-			{
-				m_inLobby = false;
-				AsciiString options = GameInfoToAsciiString(m_currentGame);
-				m_currentGame->enterGame();
-				ParseAsciiStringToGameInfo(m_currentGame, options);
-
-				Int pos = msg->GameJoined.slotPosition;
-
-				LANGameSlot slot;
-				slot.setState(SLOT_PLAYER, m_name);
-				slot.setIP(m_localIP);
-				slot.setPort(NETWORK_BASE_PORT_NUMBER);
-				slot.setLastHeard(0);
-				slot.setLogin(m_userName);
-				slot.setHost(m_hostName);
-				m_currentGame->setSlot(pos, slot);
-
-				m_currentGame->getLANSlot(0)->setHost(msg->hostName);
-				m_currentGame->getLANSlot(0)->setLogin(msg->userName);
-
-				LANPreferences prefs;
-				AsciiString entry;
-				entry.format("%d.%d.%d.%d:%s", PRINTF_IP_AS_4_INTS(senderIP), UnicodeStringToQuotedPrintable(m_currentGame->getSlot(0)->getName()).str());
-				prefs["RemoteIP0"] = entry;
-				prefs.write();
-
-				OnGameJoin(RET_OK, m_currentGame);
-				//DEBUG_ASSERTCRASH(false, ("setting host to %ls@%ls\n", m_currentGame->getLANSlot(0)->getUser()->getLogin().str(),
-				//	m_currentGame->getLANSlot(0)->getUser()->getHost().str()));
-			}
-			m_pendingAction = ACT_NONE;
-			m_expiration = 0;
-		}
-	}
-}
-
-void LANAPI::handleJoinDeny( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (msg->GameJoined.playerIP == m_localIP) // Is it for us?
-	{
-		if (m_pendingAction == ACT_JOIN) // Are we trying to join?
-		{
-			OnGameJoin(msg->GameNotJoined.reason, LookupGame(UnicodeString(msg->GameNotJoined.gameName)));
-			m_pendingAction = ACT_NONE;
-			m_expiration = 0;
-		}
-	}
-}
-
-void LANAPI::handleRequestGameLeave( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (!m_inLobby && m_currentGame && !m_currentGame->isGameInProgress())
-	{
-		int player;
-		for (player = 0; player < MAX_SLOTS; ++player)
-		{
-			if (m_currentGame->getIP(player) == senderIP)
-			{
-				if (player == 0)
-				{
-					OnHostLeave();
-					removeGame(m_currentGame);
-					delete m_currentGame;
-					m_currentGame = NULL;
-
-					/// @todo re-add myself to lobby?  Or just keep me there all the time?  If we send a LOBBY_ANNOUNCE things'll work out...
-					LANPlayer *lanPlayer = LookupPlayer(m_localIP);
-					if (!lanPlayer)
-					{
-						lanPlayer = NEW LANPlayer;
-						lanPlayer->setIP(m_localIP);
-					}
-					else
-					{
-						removePlayer(lanPlayer);
-					}
-					lanPlayer->setName(UnicodeString(m_name));
-					lanPlayer->setHost(m_hostName);
-					lanPlayer->setLogin(m_userName);
-					lanPlayer->setLastHeard(timeGetTime());
-					addPlayer(lanPlayer);
-
-				}
-				else
-				{
-					if (AmIHost())
-					{
-						// remove the deadbeat
-						LANGameSlot slot;
-						slot.setState(SLOT_OPEN);
-						m_currentGame->setSlot( player, slot );
-					}
-					OnPlayerLeave(UnicodeString(msg->name));
-					m_currentGame->getLANSlot(player)->setState(SLOT_OPEN);
-					m_currentGame->resetAccepted();
-					RequestGameOptions(GenerateGameOptionsString(), false, senderIP);
-					//m_currentGame->endGame();
-				}
-				break;
-			}
-			DEBUG_ASSERTCRASH(player < MAX_SLOTS, ("Didn't find player!"));
-		}
-	}
-	else if (m_inLobby)
-	{
-		// Look for dissappearing games
-		LANGameInfo *game = m_games;
-		while (game)
-		{
-			if (game->getName().compare(msg->GameToLeave.gameName) == 0)
-			{
-				removeGame(game);
-				delete game;
-				OnGameList(m_games);
-				break;
-			}
-			game = game->getNext();
-		}
-	}
-}
-
-void LANAPI::handleRequestLobbyLeave( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (m_inLobby)
-	{
-		LANPlayer *player = m_lobbyPlayers;
-		while (player)
-		{
-			if (player->getIP() == senderIP)
-			{
-				removePlayer(player);
-				OnPlayerList(m_lobbyPlayers);
-				break;
-			}
-			player = player->getNext();
-		}
-	}
-}
-
-void LANAPI::handleSetAccept( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (!m_inLobby && m_currentGame && !m_currentGame->isGameInProgress())
-	{
-		int player;
-		for (player = 0; player < MAX_SLOTS; ++player)
-		{
-			if (m_currentGame->getIP(player) == senderIP)
-			{
-				OnAccept(senderIP, msg->Accept.isAccepted);
-				break;
-			}
-		}
-	}
-}
-
-void LANAPI::handleHasMap( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (!m_inLobby && m_currentGame)
-	{
-		CRC mapNameCRC;
-//	mapNameCRC.computeCRC(m_currentGame->getMap().str(), m_currentGame->getMap().getLength());
-		AsciiString portableMapName = TheGameState->realMapPathToPortableMapPath(m_currentGame->getMap());
-		mapNameCRC.computeCRC(portableMapName.str(), portableMapName.getLength());
-		if (mapNameCRC.get() != msg->MapStatus.mapCRC)
-		{
-			return;
-		}
-
-		int player;
-		for (player = 0; player < MAX_SLOTS; ++player)
-		{
-			if (m_currentGame->getIP(player) == senderIP)
-			{
-				OnHasMap(senderIP, msg->MapStatus.hasMap);
-				break;
-			}
-		}
-	}
-}
-
-void LANAPI::handleChat( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (m_inLobby)
-	{
-		LANPlayer *player;
-		if((player=LookupPlayer(senderIP)) != 0)
-		{
-			OnChat(UnicodeString(player->getName()), player->getIP(), UnicodeString(msg->Chat.message), msg->Chat.chatType);
-			player->setLastHeard(timeGetTime());
-		}
-	}
-	else
-	{
-		if (LookupGame(UnicodeString(msg->Chat.gameName)) != m_currentGame)
-		{
-			DEBUG_LOG(("Game '%ls' is not my game\n", msg->Chat.gameName));
-			if (m_currentGame)
-			{
-				DEBUG_LOG(("Current game is '%ls'\n", m_currentGame->getName().str()));
-			}
-			return;
-		}
-
-		int player;
-		for (player = 0; player < MAX_SLOTS; ++player)
-		{
-			if (m_currentGame && m_currentGame->getIP(player) == senderIP)
-			{
-				OnChat(UnicodeString(msg->name), m_currentGame->getIP(player), UnicodeString(msg->Chat.message), msg->Chat.chatType);
-				break;
-			}
-		}
-	}
-}
-
-void LANAPI::handleGameStart( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (!m_inLobby && m_currentGame && m_currentGame->getIP(0) == senderIP && !m_currentGame->isGameInProgress())
-	{
-		OnGameStart();
-	}
-}
-
-void LANAPI::handleGameStartTimer( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (!m_inLobby && m_currentGame && m_currentGame->getIP(0) == senderIP && !m_currentGame->isGameInProgress())
-	{
-		OnGameStartTimer(msg->StartTimer.seconds);
-	}
-}
-
-void LANAPI::handleGameOptions( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (!m_inLobby && m_currentGame && !m_currentGame->isGameInProgress())
-	{
-		int player;
-		for (player = 0; player < MAX_SLOTS; ++player)
-		{
-			if (m_currentGame->getIP(player) == senderIP)
-			{
-				OnGameOptions(senderIP, player, AsciiString(msg->GameOptions.options));
-				break;
-			}
-		}
-	}
-}
-
-void LANAPI::handleInActive(LANMessage *msg, UnsignedInt senderIP) {
-	if (m_inLobby || (m_currentGame == NULL) || (m_currentGame->isGameInProgress())) {
-		return;
-	}
-
-	// check to see if we are the host of this game.
-	if (m_currentGame->amIHost() == FALSE) {
-		return;
-	}
-
-	UnicodeString playerName;
-	playerName = msg->name;
-
-	Int slotNum = m_currentGame->getSlotNum(playerName);
-	if (slotNum < 0)
-		return;
-	GameSlot *slot = m_currentGame->getSlot(slotNum);
-	if (slot == NULL) {
-		return;
-	}
-
-	if (senderIP != slot->getIP()) {
-		return;
-	}
-
-	// don't want to unaccept the host, that's silly.  They can't hit start alt-tabbed anyways.
-	if (senderIP == TheLAN->GetLocalIP()) {
-		return;
-	}
-
-	// only unaccept if the timer hasn't started yet.
-	if (m_gameStartTime != 0) {
-		return;
-	}
-
-	slot->unAccept();
-	AsciiString options = GenerateGameOptionsString();
-	RequestGameOptions(options, FALSE);
-	lanUpdateSlotList();
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/LANGameInfo.cpp b/Generals/Code/GameEngine/Source/GameNetwork/LANGameInfo.cpp
deleted file mode 100644
index 1ad02416bc7..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/LANGameInfo.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: LANGameInfo.cpp //////////////////////////////////////////////////////
-// LAN game setup state info
-// Author: Matthew D. Campbell, December 2001
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/GameInfoWindow.h"
-#include "GameClient/GameText.h"
-#include "GameClient/GadgetListBox.h"
-#include "GameNetwork/LANGameInfo.h"
-#include "GameNetwork/LANAPICallbacks.h"
-#include "Common/MultiplayerSettings.h"
-#include "strtok_r.h"
-/*
-#include "GameNetwork/LAN.h"
-#include "GameNetwork/LANGame.h"
-#include "GameNetwork/LANPing.h"
-#include "GameNetwork/LANusers.h"
-#include "GameNetwork/LANmenus.h"
-*/
-
-// Singleton ------------------------------------------
-
-LANGameInfo *TheLANGameInfo = NULL;
-
-// LANGameSlot ----------------------------------------
-
-LANGameSlot::LANGameSlot()
-{
-	m_lastHeard = 0;
-}
-
-
-LANPlayer * LANGameSlot::getUser( void )
-{
-	if (isHuman())
-	{
-		m_user.setIP(getIP());
-		m_user.setLastHeard(getLastHeard());
-		m_user.setName(getName());
-		m_user.setNext(NULL);
-		return &m_user;
-	}
-	return NULL;
-}
-
-// Various tests
-Bool LANGameSlot::isUser( LANPlayer *user )
-{
-	return (user && m_state == SLOT_PLAYER && user->getIP() == getIP());
-}
-
-Bool LANGameSlot::isUser( UnicodeString userName )
-{
-	return (m_state == SLOT_PLAYER && !userName.compareNoCase(getName()));
-}
-
-Bool LANGameSlot::isLocalPlayer( void ) const
-{
-	return isHuman() && TheLAN && TheLAN->GetLocalIP() == getIP();
-}
-
-// LANGameInfo ----------------------------------------
-
-LANGameInfo::LANGameInfo()
-{
-	//Added By Sadullah Nader
-	//Initializtions missing and needed
-	m_lastHeard = 0;
-	m_next = NULL;
-	//
-	for (Int i = 0; i< MAX_SLOTS; ++i)
-		setSlotPointer(i, &m_LANSlot[i]);
-
-	setLocalIP(TheLAN->GetLocalIP());
-}
-
-void LANGameInfo::setSlot( Int slotNum, LANGameSlot slotInfo )
-{
-	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("LANGameInfo::setSlot - Invalid slot number"));
-	if (slotNum < 0 || slotNum >= MAX_SLOTS)
-		return;
-
-	m_LANSlot[slotNum] = slotInfo;
-	
-	if (slotNum == 0)
-	{
-		m_LANSlot[slotNum].setAccept();
-		m_LANSlot[slotNum].setMapAvailability(true);
-	}
-}
-
-LANGameSlot* LANGameInfo::getLANSlot( Int slotNum )
-{
-	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("LANGameInfo::getLANSlot - Invalid slot number"));
-	if (slotNum < 0 || slotNum >= MAX_SLOTS)
-		return NULL;
-
-	return &m_LANSlot[slotNum];
-}
-
-const LANGameSlot* LANGameInfo::getConstLANSlot( Int slotNum ) const
-{
-	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("LANGameInfo::getConstLANSlot - Invalid slot number"));
-	if (slotNum < 0 || slotNum >= MAX_SLOTS)
-		return NULL;
-
-	return &m_LANSlot[slotNum];
-}
-
-Int LANGameInfo::getLocalSlotNum( void ) const
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for local game slot while not in game"));
-	if (!m_inGame)
-		return -1;
-
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const LANGameSlot *slot = getConstLANSlot(i);
-		if (slot->isLocalPlayer())
-			return i;
-	}
-	return -1;
-}
-
-Int LANGameInfo::getSlotNum( UnicodeString userName )
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
-	if (!m_inGame)
-		return -1;
-
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		LANGameSlot *slot = getLANSlot(i);
-		if (slot->isUser( userName ))
-			return i;
-	}
-	return -1;
-}
-
-Bool LANGameInfo::amIHost( void )
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
-	if (!m_inGame)
-		return false;
-
-	return getLANSlot(0)->isLocalPlayer();
-}
-
-void LANGameInfo::setMap( AsciiString mapName )
-{
-	GameInfo::setMap(mapName);
-}
-
-void LANGameInfo::setSeed( Int seed )
-{
-	GameInfo::setSeed(seed);
-}
-
-void LANGameInfo::resetAccepted( void )
-{
-	if (TheLAN)
-	{
-		TheLAN->ResetGameStartTimer();
-		if (TheLAN->GetMyGame() == this && TheLAN->AmIHost())
-			LANEnableStartButton(true);
-	}
-	for(int i = 0; i< MAX_SLOTS; i++)
-	{
-		m_LANSlot[i].unAccept();
-	}
-}
-// Misc game-related functionality --------------------
-
-
-void LANDisplayGameList( GameWindow *gameListbox, LANGameInfo *gameList )
-{
-	LANGameInfo *selectedPtr = NULL;
-	Int selectedIndex = -1;
-	Int indexToSelect = -1;
-	if (gameListbox)
-	{
-		GadgetListBoxGetSelected(gameListbox, &selectedIndex);
-		
-		if (selectedIndex != -1 )
-		{
-			selectedPtr = (LANGameInfo *)GadgetListBoxGetItemData(gameListbox, selectedIndex, 0);
-		}
-
-		GadgetListBoxReset(gameListbox);
-		
-		while (gameList)
-		{
-			UnicodeString txtGName;
-			txtGName = L"";
-			if( gameList->isGameInProgress() )
-			{
-				txtGName.concat(L"[");
-			}
-			txtGName.concat(gameList->getPlayerName(0));
-			if( gameList->isGameInProgress() )
-			{
-				txtGName.concat(L"]");
-			}
-			Int addedIndex = GadgetListBoxAddEntryText(gameListbox, txtGName, (gameList->isGameInProgress())?gameInProgressColor:gameColor, -1, -1);
-			GadgetListBoxSetItemData(gameListbox, (void *)gameList, addedIndex, 0 );
-
-			if (selectedPtr == gameList)
-				indexToSelect = addedIndex;
-
-			gameList = gameList->getNext();
-		}
-
-		if (indexToSelect >= 0)
-			GadgetListBoxSetSelected(gameListbox, indexToSelect);
-		else
-			HideGameInfoWindow(TRUE);
-	}
-}
-
-AsciiString GenerateGameOptionsString( void )
-{
-	if(!TheLAN->GetMyGame() || !TheLAN->GetMyGame()->amIHost())
-		return AsciiString::TheEmptyString;
-
-	return GameInfoToAsciiString(TheLAN->GetMyGame());
-}
-
-Bool ParseGameOptionsString(LANGameInfo *game, AsciiString options)
-{
-	if (!TheLAN || !game)
-		return false;
-
-	Int oldLocalSlotNum = (game->isInGame()) ? game->getLocalSlotNum() : -1;
-	Bool wasInGame = oldLocalSlotNum >= 0;
-//	Int hadMap = wasInGame && game->getSlot(oldLocalSlotNum)->hasMap();
-	AsciiString oldMap = game->getMap();
-	UnsignedInt oldMapCRC, newMapCRC;
-	oldMapCRC = game->getMapCRC();
-
-	std::map<UnicodeString, UnicodeString> oldLogins, oldMachines;
-	std::map<UnicodeString, UnicodeString>::iterator mapIt;
-	Int i;
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		LANGameSlot *slot = game->getLANSlot(i);
-		if (slot && slot->isHuman())
-		{
-			//DEBUG_LOG(("Saving off %ls@%ls for %ls\n", slot->getUser()->getLogin().str(), slot->getUser()->getHost().str(), slot->getName().str()));
-			oldLogins[slot->getName()] = slot->getUser()->getLogin();
-			oldMachines[slot->getName()] = slot->getUser()->getHost();
-		}
-	}
-
-	if (ParseAsciiStringToGameInfo(game, options))
-	{
-		Int newLocalSlotNum = (game->isInGame()) ? game->getLocalSlotNum() : -1;
-		Bool isInGame = newLocalSlotNum >= 0;
-		if (!TheLAN->AmIHost() && isInGame)
-		{
-//			Int hasMap = game->getSlot(newLocalSlotNum)->hasMap();
-			newMapCRC = game->getMapCRC();
-			//DEBUG_LOG(("wasInGame:%d isInGame:%d hadMap:%d hasMap:%d oldMap:%s newMap:%s\n", wasInGame, isInGame, hadMap, hasMap, oldMap.str(), game->getMap().str()));
-			if ( (oldMapCRC ^ newMapCRC)/*(hasMap ^ hadMap)*/ || (!wasInGame && isInGame) )
-			{
-				// it changed.  send it
-				TheLAN->RequestHasMap();
-				lanUpdateSlotList();
-				updateGameOptions();
-			}
-		}
-		// clean up LAN users, etc.
-		UnsignedInt now = timeGetTime();
-		for (i=0; i<MAX_SLOTS; ++i)
-		{
-			LANGameSlot *slot = game->getLANSlot(i);
-
-			if (slot->isHuman())
-			{
-				slot->setLastHeard(now);
-				mapIt = oldLogins.find(slot->getName());
-				if (mapIt != oldLogins.end())
-					slot->setLogin(mapIt->second);
-				mapIt = oldMachines.find(slot->getName());
-				if (mapIt != oldMachines.end())
-					slot->setHost(mapIt->second);
-				//DEBUG_LOG(("Restored %ls@%ls for %ls\n", slot->getUser()->getLogin().str(), slot->getUser()->getHost().str(), slot->getName().str()));
-			}
-		}
-
-		return true;
-	}
-
-	return false;
-}
-
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp
deleted file mode 100644
index 41e2f7178ef..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp
+++ /dev/null
@@ -1,1328 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: NAT.cpp /////////////////////////////////////////////////////////////////////////////////
-// Author: Bryan Cleveland April 2002
-// Props to Steve Tall for figuring all the NAT and Firewall behavior patterns out, making my job
-// a LOT easier.
-// Desc:   Resolves NAT'd IPs and port numbers for the other players in a game.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/NAT.h"
-#include "GameNetwork/Transport.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "GameClient/EstablishConnectionsMenu.h"
-#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/GameInfo.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-/*
- * In case you're wondering, we do this weird connection pairing scheme
- * to speed up the negotiation process, especially in cases where there
- * are 4 or more players (nodes).  Take for example an 8 player game...
- * In an 8 player game there are 28 connections that need to be negotiated,
- * doing this pairing scheme thing, we can make those 28 connections in the
- * time it would normally take to make 7 connections.  Since each connection
- * could potentially take several seconds, this can be a HUGE time savings.
-
- * Right now you're probably wondering who this Bryan Cleveland guy is.
- * He's the network coder that got fired when this didn't work.
-
- * In case you're wondering, this did end up working and Bryan left by
- * his own choice.
- */
-//										m_connectionPairs[num nodes]	[round]			 [node index]
-/* static */ Int NAT::m_connectionPairs[MAX_SLOTS-1][MAX_SLOTS-1][MAX_SLOTS] = 
-{
-	{	// 2 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			1,			0,			-1,			-1,			-1,			-1,			-1,			-1},	// round 0
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 1
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 2
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 3
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 4
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
-	},
-	{	// 3 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			1,			0,			-1,			-1,			-1,			-1,			-1,			-1},	// round 0
-		{			2,			-1,			0,			-1,			-1,			-1,			-1,			-1},	// round 1
-		{			-1,			2,			1,			-1,			-1,			-1,			-1,			-1},	// round 2
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 3
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 4
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
-	},
-	{	// 4 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			1,			0,			3,			2,			-1,			-1,			-1,			-1},	// round 0
-		{			2,			3,			0,			1,			-1,			-1,			-1,			-1},	// round 1
-		{			3,			2,			1,			0,			-1,			-1,			-1,			-1},	// round 2
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 3
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 4
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
-	},
-	{	// 5 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			2,			4,			0,			-1,			1,			-1,			-1,			-1},	// round 0
-		{			-1,			3,			4,			1,			2,			-1,			-1,			-1},	// round 1
-		{			3,			2,			1,			0,			-1,			-1,			-1,			-1},	// round 2
-		{			4,			-1,			3,			2,			0,			-1,			-1,			-1},	// round 3
-		{			1,			0,			-1,			4,			3,			-1,			-1,			-1},	// round 4
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
-	},
-	{	// 6 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			3,			5,			4,			0,			2,			1,			-1,			-1},	// round 0
-		{			2,			4,			0,			5,			1,			3,			-1,			-1},	// round 1
-		{			4,			3,			5,			1,			0,			2,			-1,			-1},	// round 2
-		{			1,			0,			3,			2,			5,			4,			-1,			-1},	// round 3
-		{			5,			2,			1,			4,			3,			0,			-1,			-1},	// round 4
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
-	},
-	{	// 7 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			-1,			6,			5,			4,			3,			2,			1,			-1},	// round 0
-		{			2,			-1,			0,			6,			5,			4,			3,			-1},	// round 1
-		{			4,			3,			-1,			1,			0,			6,			5,			-1},	// round 2
-		{			6,			5,			4,			-1,			2,			1,			0,			-1},	// round 3
-		{			1,			0,			6,			5,			-1,			3,			2,			-1},	// round 4
-		{			3,			2,			1,			0,			6,			-1,			4,			-1},	// round 5
-		{			5,			4,			3,			2,			1,			0,			-1,			-1}		// round 6
-	},
-	{	// 8 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			4,			5,			6,			7,			0,			1,			2,			3},		// round 0
-		{			5,			4,			7,			6,			1,			0,			3,			2},		// round 1
-		{			3,			6,			5,			0,			7,			2,			1,			4},		// round 2
-		{			2,			7,			0,			5,			6,			3,			4,			1},		// round 3
-		{			6,			3,			4,			1,			2,			7,			0,			5},		// round 4
-		{			1,			0,			3,			2,			5,			4,			7,			6},		// round 5
-		{			7,			2,			1,			4,			3,			6,			5,			0}		// round 6
-	}
-};
-
-/* static */ Int NAT::m_timeBetweenRetries = 500; // .5 seconds between retries sounds good to me.
-/* static */ time_t NAT::m_manglerRetryTimeInterval = 300; // sounds good to me.
-/* static */ Int NAT::m_maxAllowedManglerRetries = 25; // works for me.
-/* static */ time_t NAT::m_keepaliveInterval = 15000; // 15 seconds between keepalive packets seems good.
-/* static */ time_t NAT::m_timeToWaitForPort = 15000; // wait for 15 seconds for the other player's port number.
-/* static */ time_t NAT::m_timeForRoundTimeout = 15000; // wait for at most 15 seconds for each connection round to finish.
-
-NAT *TheNAT = NULL;
-
-NAT::NAT() 
-{
-	//Added By Sadullah Nader
-	//Initializations inserted
-	m_beenProbed = FALSE;
-	m_connectionPairIndex = 0;
-	m_connectionRound = 0;
-	m_localIP = 0;
-	m_localNodeNumber = 0;
-	m_manglerAddress = 0;
-	m_manglerRetries = 0;
-	m_numNodes = 0;
-	m_numRetries = 0;
-	m_previousSourcePort = 0;
-	for(Int i = 0; i < MAX_SLOTS; i++)
-		m_sourcePorts[i] = 0;
-	m_spareSocketPort = 0;
-	m_startingPortNumber = 0;
-	m_targetNodeNumber = 0;
-	//
-	m_transport = NULL;
-	m_slotList = NULL;
-	m_roundTimeout = 0;
-
-	m_maxNumRetriesAllowed = 10;
-	m_packetID = 0x7f00;
-}
-
-NAT::~NAT() {
-}
-
-// if we're already finished, change to being idle
-// if we are negotiating now, check to see if this round is done
-// if it is, check to see if we're completely done with all rounds.
-// if we are, set state to be done.
-// if not go on to the next connection round.
-// if we are negotiating still, call the connection update
-// check to see if this connection is done for us, or if it has failed.
-enum { MS_TO_WAIT_FOR_STATS = 5000 };
-NATStateType NAT::update() {
-	static UnsignedInt s_startStatWaitTime = 0;
-	if (m_NATState == NATSTATE_DONE) {
-		m_NATState = NATSTATE_IDLE;
-	} else if (m_NATState == NATSTATE_WAITFORSTATS) {
-		// check for all stats
-		Bool gotAllStats = TRUE;
-		Bool timedOut = FALSE;
-		for (Int i=0; i<MAX_SLOTS; ++i)
-		{
-			const GameSpyGameSlot *slot = TheGameSpyGame->getGameSpySlot(i);
-			if (slot && slot->isHuman())
-			{
-				PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(slot->getProfileID());
-				if (stats.id == 0)
-				{
-					gotAllStats = FALSE;
-					//DEBUG_LOG(("Failed to find stats for %ls(%d)\n", slot->getName().str(), slot->getProfileID()));
-				}
-			}
-		}
-		// check for timeout.  Timing out is not a fatal error - it just means we didn't get the other
-		// player's stats.  We'll see 0/0 as his record, but we can still play him just fine.
-		UnsignedInt now = timeGetTime();
-		if (now > s_startStatWaitTime + MS_TO_WAIT_FOR_STATS)
-		{
-			DEBUG_LOG(("Timed out waiting for stats.  Let's just start the dang game.\n"));
-			timedOut = TRUE;
-		}
-		if (gotAllStats || timedOut)
-		{
-			m_NATState = NATSTATE_DONE;
-			TheEstablishConnectionsMenu->endMenu();
-			if (TheFirewallHelper != NULL) {
-				delete TheFirewallHelper;
-				TheFirewallHelper = NULL;
-			}
-		}
-	} else if (m_NATState == NATSTATE_DOCONNECTIONPATHS) {
-		if (allConnectionsDoneThisRound() == TRUE) {
-			// we finished this round, move on to the next one.
-			++m_connectionRound;
-//			m_roundTimeout = timeGetTime() + TheGameSpyConfig->getRoundTimeout();
-			m_roundTimeout = timeGetTime() + m_timeForRoundTimeout;
-			DEBUG_LOG(("NAT::update - done with connection round, moving on to round %d\n", m_connectionRound));
-
-			// we finished that round, now check to see if we're done, or if there are more rounds to go.
-			if (allConnectionsDone() == TRUE) {
-				// we're all done, time to go back home.
-				m_NATState = NATSTATE_WAITFORSTATS;
-
-				// 2/19/03 BGC - we have successfully negotaited a NAT thingy, so our behavior must be correct
-				// so therefore we don't need to refresh our NAT even if we previously thought we had to.
-				TheFirewallHelper->flagNeedToRefresh(FALSE);
-
-				s_startStatWaitTime = timeGetTime();
-				DEBUG_LOG(("NAT::update - done with all connections, woohoo!!\n"));
-				/*
-				m_NATState = NATSTATE_DONE;
-				TheEstablishConnectionsMenu->endMenu();
-				if (TheFirewallHelper != NULL) {
-					delete TheFirewallHelper;
-					TheFirewallHelper = NULL;
-				}
-				*/
-			} else {
-				doThisConnectionRound();
-			}
-		}
-		NATConnectionState state = connectionUpdate();
-
-		if (timeGetTime() > m_roundTimeout) {
-			DEBUG_LOG(("NAT::update - round timeout expired\n"));
-			setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-			notifyUsersOfConnectionFailed(m_localNodeNumber);
-		}
-
-		if (state == NATCONNECTIONSTATE_FAILED) {
-			// if we fail
-			m_NATState = NATSTATE_FAILED;
-			TheEstablishConnectionsMenu->endMenu();
-			if (TheFirewallHelper != NULL) {
-				// we failed NAT negotiation, perhaps we need to redetect our firewall settings.
-				// We don't trust the user to do it for themselves so we force them to do it next time
-				// the log in.
-				// 2/19/03 - ok, we don't want to do this right away, if the user tries to play in another game
-				// before they log out and log back in the game won't have a chance at working.
-				// so we need to simply flag it so that when they log out the firewall behavior gets blown away.
-				TheFirewallHelper->flagNeedToRefresh(TRUE);
-//				TheWritableGlobalData->m_firewallBehavior = FirewallHelperClass::FIREWALL_TYPE_UNKNOWN;
-//				TheFirewallHelper->writeFirewallBehavior();
-
-				delete TheFirewallHelper;
-				TheFirewallHelper = NULL;
-			}
-			// we failed to connect, so we don't have to pass on the transport to the network.
-			if (m_transport != NULL) {
-				delete m_transport;
-				m_transport = NULL;
-			}
-		}
-	}
-	return m_NATState;
-}
-
-
-// update transport, check for PROBE packets from our target.
-// check to see if its time to PROBE our target
-// MANGLER:
-// if we are talking to the mangler, check to see if we got a response
-// if we didn't get a response, check to see if its time to send another packet to it
-NATConnectionState NAT::connectionUpdate() {
-
-	GameSlot *targetSlot = NULL;
-	if (m_targetNodeNumber >= 0) {
-		targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
-	} else {
-		return m_connectionStates[m_localNodeNumber];
-	}
-
-	if (m_beenProbed == FALSE) {
-		if (timeGetTime() >= m_nextPortSendTime) {
-//			sendMangledPortNumberToTarget(m_previousSourcePort, targetSlot);
-			sendMangledPortNumberToTarget(m_sourcePorts[m_targetNodeNumber], targetSlot);
-//			m_nextPortSendTime = timeGetTime() + TheGameSpyConfig->getRetryInterval();
-			m_nextPortSendTime = timeGetTime() + m_timeBetweenRetries;
-		}
-	}
-
-	// check to see if its time to send out our keepalives.
-	if (timeGetTime() >= m_nextKeepaliveTime) {
-		for (UnsignedInt node = 0; node < m_numNodes; ++node) {
-			if (m_myConnections[node] == TRUE) {
-				// we've made this connection, send a keepalive.
-				Int slotIndex = m_connectionNodes[node].m_slotIndex;
-				GameSlot *slot = m_slotList[slotIndex];
-				DEBUG_ASSERTCRASH(slot != NULL, ("Trying to send keepalive to a NULL slot"));
-				if (slot != NULL) {
-					UnsignedInt ip = slot->getIP();
-					DEBUG_LOG(("NAT::connectionUpdate - sending keep alive to node %d at %d.%d.%d.%d:%d\n", node,
-											PRINTF_IP_AS_4_INTS(ip), slot->getPort()));
-					m_transport->queueSend(ip, slot->getPort(), (const unsigned char *)"KEEPALIVE", strlen("KEEPALIVE") + 1);
-				}
-			}
-		}
-//		m_nextKeepaliveTime = timeGetTime() + TheGameSpyConfig->getKeepaliveInterval();
-		m_nextKeepaliveTime = timeGetTime() + m_keepaliveInterval;
-	}
-
-	m_transport->update();
-
-	// check to see if we've been probed.
-	for (Int i = 0; i < MAX_MESSAGES; ++i) {
-		if (m_transport->m_inBuffer[i].length > 0) {
-#ifdef DEBUG_LOGGING
-			UnsignedInt ip = m_transport->m_inBuffer[i].addr;
-#endif
-			DEBUG_LOG(("NAT::connectionUpdate - got a packet from %d.%d.%d.%d:%d, length = %d\n",
-									PRINTF_IP_AS_4_INTS(ip), m_transport->m_inBuffer[i].port, m_transport->m_inBuffer[i].length));
-			UnsignedByte *data = m_transport->m_inBuffer[i].data;
-			if (memcmp(data, "PROBE", strlen("PROBE")) == 0) {
-				Int fromNode = atoi((char *)data + strlen("PROBE"));
-				DEBUG_LOG(("NAT::connectionUpdate - we've been probed by node %d.\n", fromNode));
-
-				if (fromNode == m_targetNodeNumber) {
-					DEBUG_LOG(("NAT::connectionUpdate - probe was sent by our target, setting connection state %d to done.\n", m_targetNodeNumber));
-					setConnectionState(m_targetNodeNumber, NATCONNECTIONSTATE_DONE);
-
-					if (m_transport->m_inBuffer[i].addr != targetSlot->getIP()) {
-						UnsignedInt fromIP = m_transport->m_inBuffer[i].addr;
-#ifdef DEBUG_LOGGING
-						UnsignedInt slotIP = targetSlot->getIP();
-#endif
-						DEBUG_LOG(("NAT::connectionUpdate - incomming packet has different from address than we expected, incoming: %d.%d.%d.%d expected: %d.%d.%d.%d\n",
-												PRINTF_IP_AS_4_INTS(fromIP),
-												PRINTF_IP_AS_4_INTS(slotIP)));
-						targetSlot->setIP(fromIP);
-					}
-					if (m_transport->m_inBuffer[i].port != targetSlot->getPort()) {
-						DEBUG_LOG(("NAT::connectionUpdate - incoming packet came from a different port than we expected, incoming: %d expected: %d\n",
-												m_transport->m_inBuffer[i].port, targetSlot->getPort()));
-						targetSlot->setPort(m_transport->m_inBuffer[i].port);
-						m_sourcePorts[m_targetNodeNumber] = m_transport->m_inBuffer[i].port;
-					}
-					notifyUsersOfConnectionDone(m_targetNodeNumber);
-				}
-
-				m_transport->m_inBuffer[i].length = 0;
-			}
-			if (memcmp(data, "KEEPALIVE", strlen("KEEPALIVE")) == 0) {
-				// keep alive packet, just toss it.
-				DEBUG_LOG(("NAT::connectionUpdate - got keepalive from %d.%d.%d.%d:%d\n",
-										PRINTF_IP_AS_4_INTS(ip), m_transport->m_inBuffer[i].port));
-				m_transport->m_inBuffer[i].length = 0;
-			}
-		}
-	}
-
-	// we are waiting for our target to tell us that they have received our probe.
-	if (m_connectionStates[m_localNodeNumber] == NATCONNECTIONSTATE_WAITINGFORRESPONSE) {
-		// check to see if it's time to probe our target.
-		if ((m_timeTillNextSend != -1) && (m_timeTillNextSend <= timeGetTime())) {
-			if (m_numRetries > m_maxNumRetriesAllowed) {
-				DEBUG_LOG(("NAT::connectionUpdate - too many retries, connection failed.\n"));
-				setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-
-				notifyUsersOfConnectionFailed(m_localNodeNumber);
-			} else {
-				DEBUG_LOG(("NAT::connectionUpdate - trying to send another probe (#%d) to our target\n", m_numRetries+1));
-				// Send a probe.
-				sendAProbe(targetSlot->getIP(), targetSlot->getPort(), m_localNodeNumber);
-//				m_timeTillNextSend = timeGetTime() + TheGameSpyConfig->getRetryInterval();
-				m_timeTillNextSend = timeGetTime() + m_timeBetweenRetries;
-
-				// tell the target they've been probed. In other words, our port is open.
-				notifyTargetOfProbe(targetSlot);
-
-				++m_numRetries;
-			}
-		}
-	}
-
-	// we are waiting for a response from the mangler to tell us what port we're using.
-	if (m_connectionStates[m_localNodeNumber] == NATCONNECTIONSTATE_WAITINGFORMANGLERRESPONSE) {
-		UnsignedShort mangledPort = 0;
-		if (TheFirewallHelper != NULL) {
-			mangledPort = TheFirewallHelper->getManglerResponse(m_packetID);
-		}
-		if (mangledPort != 0) {
-			// we got a response.  now we need to start probing (unless of course we have a netgear)
-			processManglerResponse(mangledPort);
-
-			// we know there is a firewall helper if we got here.
-			TheFirewallHelper->closeSpareSocket(m_spareSocketPort);
-			m_spareSocketPort = 0;
-		} else {
-			if (timeGetTime() >= m_manglerRetryTime) {
-				++m_manglerRetries;
-//				if (m_manglerRetries > TheGameSpyConfig->getMaxManglerRetries()) {
-				if (m_manglerRetries > m_maxAllowedManglerRetries) {
-					// we couldn't communicate with the mangler, just use our non-mangled
-					// port number and hope that works.
-					DEBUG_LOG(("NAT::connectionUpdate - couldn't talk with the mangler using default port number\n"));
-					sendMangledPortNumberToTarget(getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex), targetSlot);
-					m_sourcePorts[m_targetNodeNumber] = getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex);
-					setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
-				} else {
-					if (TheFirewallHelper != NULL) {
-						DEBUG_LOG(("NAT::connectionUpdate - trying to send to the mangler again. mangler address: %d.%d.%d.%d, from port: %d, packet ID:%d\n",
-							PRINTF_IP_AS_4_INTS(m_manglerAddress), m_spareSocketPort, m_packetID));
-						TheFirewallHelper->sendToManglerFromPort(m_manglerAddress, m_spareSocketPort, m_packetID);
-					}
-//					m_manglerRetryTime = TheGameSpyConfig->getRetryInterval() + timeGetTime();
-					m_manglerRetryTime = m_manglerRetryTimeInterval + timeGetTime();
-				}
-			}
-		}
-	}
-
-	if (m_connectionStates[m_localNodeNumber] == NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT) {
-		if (timeGetTime() > m_timeoutTime) {
-			DEBUG_LOG(("NAT::connectionUpdate - waiting too long to get the other player's port number, failed.\n"));
-			setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-
-			notifyUsersOfConnectionFailed(m_localNodeNumber);
-		}
-	}
-
-	return m_connectionStates[m_localNodeNumber];
-}
-
-// this is the function that starts the NAT/firewall negotiation process.
-// after calling this, you should call the update function untill it returns
-// NATSTATE_DONE.
-void NAT::establishConnectionPaths() {
-	DEBUG_LOG(("NAT::establishConnectionPaths - entering\n"));
-	m_NATState = NATSTATE_DOCONNECTIONPATHS;
-	DEBUG_LOG(("NAT::establishConnectionPaths - using %d as our starting port number\n", m_startingPortNumber));
-	if (TheEstablishConnectionsMenu == NULL) {
-		TheEstablishConnectionsMenu = NEW EstablishConnectionsMenu;
-	}
-	TheEstablishConnectionsMenu->initMenu();
-
-	if (TheFirewallHelper == NULL) {
-		TheFirewallHelper = createFirewallHelper();
-	}
-
-	DEBUG_ASSERTCRASH(m_slotList != NULL, ("NAT::establishConnectionPaths - don't have a slot list"));
-	if (m_slotList == NULL) {
-		return;
-	}
-
-	// determine how many nodes we have.
-	m_numNodes = 0;
-	Int i = 0;
-	for (; i < MAX_SLOTS; ++i) {
-		if (m_slotList[i] != NULL) {
-			if (m_slotList[i]->isHuman()) {
-				DEBUG_LOG(("NAT::establishConnectionPaths - slot %d is %ls\n", i, m_slotList[i]->getName().str()));
-				++m_numNodes;
-			}
-		}
-	}
-	DEBUG_LOG(("NAT::establishConnectionPaths - number of nodes: %d\n", m_numNodes));
-
-	if (m_numNodes < 2)
-	{
-		// just start the game - there isn't anybody to which to connect. :P
-		m_NATState = NATSTATE_DONE;
-		return;
-	}
-	
-	m_connectionRound = 0;
-	m_connectionPairIndex = m_numNodes - 2;
-	Bool connectionAssigned[MAX_SLOTS];
-
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		m_connectionNodes[i].m_slotIndex = -1;
-		connectionAssigned[i] = FALSE;
-		m_sourcePorts[i] = 0;
-	}
-
-	m_previousSourcePort = 0;
-
-// check for netgear bug behavior.
-// as an aside, if there are more than 2 netgear bug firewall's in the game,
-// it probably isn't going to work so well.  stupid netgear.
-
-// nodes with a netgear bug behavior need to be matched up first. This prevents
-// the NAT table from being reset for connections to other nodes.  This also happens
-// to be the reason why I call them "nodes" rather than "slots" or "players" as the
-// ordering has to be messed with to get the netgears to make love, not war.
-	DEBUG_LOG(("NAT::establishConnectionPaths - about to set up the node list\n"));
-	DEBUG_LOG(("NAT::establishConnectionPaths - doing the netgear stuff\n"));
-	UnsignedInt otherNetgearNum = -1;
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		if ((m_slotList != NULL) && (m_slotList[i] != NULL)) {
-			if ((m_slotList[i]->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0) {
-				if (otherNetgearNum == -1) {
-					// this is the start of a new pair, put it in as the first non -1 node connection pair thing.
-					Int nodeindex = 0;
-					while ((m_connectionPairs[m_connectionPairIndex][0][nodeindex] == -1) || (m_connectionNodes[nodeindex].m_slotIndex != -1)) {
-						++nodeindex;
-					}
-					m_connectionNodes[nodeindex].m_slotIndex = i;
-					m_connectionNodes[nodeindex].m_behavior = m_slotList[i]->getNATBehavior();
-					connectionAssigned[i] = TRUE;
-					otherNetgearNum = nodeindex;
-					DEBUG_LOG(("NAT::establishConnectionPaths - first netgear in pair. assigning node %d to slot %d (%ls)\n", nodeindex, i, m_slotList[i]->getName().str()));
-				} else {
-					// this is the second in the pair of netgears, pair this up with the other one
-					// for the first round.
-					Int nodeindex = 0;
-					while (m_connectionPairs[m_connectionPairIndex][0][nodeindex] != otherNetgearNum) {
-						++nodeindex;
-					}
-					m_connectionNodes[nodeindex].m_slotIndex = i;
-					m_connectionNodes[nodeindex].m_behavior = m_slotList[i]->getNATBehavior();
-					connectionAssigned[i] = TRUE;
-					otherNetgearNum = -1;
-					DEBUG_LOG(("NAT::establishConnectionPaths - second netgear in pair. assigning node %d to slot %d (%ls)\n", nodeindex, i, m_slotList[i]->getName().str()));
-				}
-			}
-		}
-	}
-
-	// fill in the rest of the nodes with the remaining slots.
-	DEBUG_LOG(("NAT::establishConnectionPaths - doing the non-Netgear nodes\n"));
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		if (connectionAssigned[i] == TRUE) {
-			continue;
-		}
-		if (m_slotList[i] == NULL) {
-			continue;
-		}
-		if (!(m_slotList[i]->isHuman())) {
-			continue;
-		}
-		// find the first available connection node for this slot.
-		Int nodeindex = 0;
-		while (m_connectionNodes[nodeindex].m_slotIndex != -1) {
-			++nodeindex;
-		}
-		DEBUG_LOG(("NAT::establishConnectionPaths - assigning node %d to slot %d (%ls)\n", nodeindex, i, m_slotList[i]->getName().str()));
-		m_connectionNodes[nodeindex].m_slotIndex = i;
-		m_connectionNodes[nodeindex].m_behavior = m_slotList[i]->getNATBehavior();
-		connectionAssigned[i] = TRUE;
-	}
-
-// sanity check
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	for (i = 0; i < m_numNodes; ++i) {
-		DEBUG_ASSERTCRASH(connectionAssigned[i] == TRUE, ("connection number %d not assigned", i));
-	}
-#endif
-
-	// find the local node number.
-	for (i = 0; i < m_numNodes; ++i) {
-		if (m_connectionNodes[i].m_slotIndex == TheGameSpyGame->getLocalSlotNum()) {
-			m_localNodeNumber = i;
-			DEBUG_LOG(("NAT::establishConnectionPaths - local node is %d\n", m_localNodeNumber));
-			break;
-		}
-	}
-
-	// set up the names in the connection window.
-	Int playerNum = 0;
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		while ((i < MAX_SLOTS) && (m_slotList[i] != NULL) && !(m_slotList[i]->isHuman())) {
-			++i;
-		}
-		if (i >= MAX_SLOTS) {
-			break;
-		}
-		if (i != TheGameSpyGame->getLocalSlotNum()) {
-			TheEstablishConnectionsMenu->setPlayerName(playerNum, m_slotList[i]->getName());
-			TheEstablishConnectionsMenu->setPlayerStatus(playerNum, NATCONNECTIONSTATE_WAITINGTOBEGIN);
-			++playerNum;
-		}	
-	}
-
-//	m_roundTimeout = timeGetTime() + TheGameSpyConfig->getRoundTimeout();
-	m_roundTimeout = timeGetTime() + m_timeForRoundTimeout;
-
-	// make the connections for this round.
-	// this song is cool.
-	doThisConnectionRound();
-}
-
-void NAT::attachSlotList(GameSlot *slotList[], Int localSlot, UnsignedInt localIP) {
-	m_slotList = slotList;
-	m_localIP = localIP;
-	m_transport = new Transport;
-	DEBUG_LOG(("NAT::attachSlotList - initting the transport socket with address %d.%d.%d.%d:%d\n",
-							PRINTF_IP_AS_4_INTS(m_localIP), getSlotPort(localSlot)));
-
-	m_startingPortNumber = NETWORK_BASE_PORT_NUMBER + ((timeGetTime() / 1000) % 20000);
-	DEBUG_LOG(("NAT::attachSlotList - using %d as the starting port number\n", m_startingPortNumber));
-	generatePortNumbers(slotList, localSlot);
-	m_transport->init(m_localIP, getSlotPort(localSlot));
-}
-
-Int NAT::getSlotPort(Int slot) {
-//	return (slot + m_startingPortNumber);
-	if (m_slotList[slot] != NULL) {
-		return m_slotList[slot]->getPort();
-	}
-	return 0;
-}
-
-void NAT::generatePortNumbers(GameSlot *slotList[], Int localSlot) {
-	for (UnsignedInt i = 0; i < (UnsignedInt)MAX_SLOTS; ++i) {
-		if (slotList[i] != NULL) {
-			if ((i == localSlot) && (TheWritableGlobalData->m_firewallPortOverride != 0)) {
-				slotList[i]->setPort(TheWritableGlobalData->m_firewallPortOverride);
-			} else {
-				slotList[i]->setPort(i + m_startingPortNumber);
-			}
-		}
-	}
-}
-
-Transport * NAT::getTransport() {
-	return m_transport;
-}
-
-// figure out which port I'll be using.
-// send the port number to our target for this round.
-// init the m_connectionStates for all players.
-void NAT::doThisConnectionRound() {
-	DEBUG_LOG(("NAT::doThisConnectionRound - starting process for connection round %d\n", m_connectionRound));
-	// clear out the states from the last round.
-	m_targetNodeNumber = -1;
-
-	Int i = 0;
-	for (; i < MAX_SLOTS; ++i) {
-		setConnectionState(i, NATCONNECTIONSTATE_NOSTATE);
-	}
-
-	m_beenProbed = FALSE;
-	m_numRetries = 0;
-
-	for (i = 0; i < m_numNodes; ++i) {
-		Int targetNodeNumber = m_connectionPairs[m_connectionPairIndex][m_connectionRound][i];
-		DEBUG_LOG(("NAT::doThisConnectionRound - node %d needs to connect to node %d\n", i, targetNodeNumber));
-		if (targetNodeNumber != -1) {
-			if (i == m_localNodeNumber) {
-				m_targetNodeNumber = targetNodeNumber;
-				DEBUG_LOG(("NAT::doThisConnectionRound - Local node is connecting to node %d\n", m_targetNodeNumber));
-				UnsignedInt targetSlotIndex = m_connectionNodes[(m_connectionPairs[m_connectionPairIndex][m_connectionRound][i])].m_slotIndex;
-				GameSlot *targetSlot = m_slotList[targetSlotIndex];
-				GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-
-				DEBUG_ASSERTCRASH(localSlot != NULL, ("local slot is NULL"));
-				DEBUG_ASSERTCRASH(targetSlot != NULL, ("trying to negotiate with a NULL target slot, slot is %d", m_connectionPairs[m_connectionPairIndex][m_connectionRound][i]));
-				DEBUG_LOG(("NAT::doThisConnectionRound - Target slot index = %d (%ls)\n", targetSlotIndex, m_slotList[targetSlotIndex]->getName().str()));
-				DEBUG_LOG(("NAT::doThisConnectionRound - Target slot has NAT behavior 0x%8X, local slot has NAT behavior 0x%8X\n", targetSlot->getNATBehavior(), localSlot->getNATBehavior()));
-				
-#if defined(DEBUG_LOGGING)
-				UnsignedInt targetIP = targetSlot->getIP();
-				UnsignedInt localIP = localSlot->getIP();
-#endif
-				
-				DEBUG_LOG(("NAT::doThisConnectionRound - Target slot has IP %d.%d.%d.%d  Local slot has IP %d.%d.%d.%d\n",
-							PRINTF_IP_AS_4_INTS(targetIP),
-							PRINTF_IP_AS_4_INTS(localIP)));
-
-				if (((targetSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) == 0) &&
-						((localSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0)) {
-
-					// we have a netgear bug type behavior and the target does not, so we need them to send to us
-					// first to avoid having our NAT table reset.
-
-					DEBUG_LOG(("NAT::doThisConnectionRound - Local node has a netgear and the target node does not, need to delay our probe.\n"));
-					m_timeTillNextSend = -1;
-				}
-
-				// figure out which port number I'm using for this connection
-				// this merely starts to talk to the mangler server, we have to keep calling
-				// the update function till we get a response.
-				DEBUG_LOG(("NAT::doThisConnectionRound - About to attempt to get the next mangled source port\n"));
-				sendMangledSourcePort();
-//				m_nextPortSendTime = timeGetTime() + TheGameSpyConfig->getRetryInterval();
-				m_nextPortSendTime = timeGetTime() + m_timeBetweenRetries;
-//				m_timeoutTime = timeGetTime() + TheGameSpyConfig->getPortTimeout();
-				m_timeoutTime = timeGetTime() + m_timeToWaitForPort;
-			} else {
-				// this is someone else that needs to connect to someone, so wait till they tell us
-				// that they're done.
-				setConnectionState(i, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
-			}
-		} else {
-			// no one to connect to, so this one is done.
-			DEBUG_LOG(("NAT::doThisConnectionRound - node %d has no one to connect to, so they're done\n", i));
-			setConnectionState(i, NATCONNECTIONSTATE_DONE);
-		}
-	}
-}
-
-void NAT::sendAProbe(UnsignedInt ip, UnsignedShort port, Int fromNode) {
-	DEBUG_LOG(("NAT::sendAProbe - sending a probe from port %d to %d.%d.%d.%d:%d\n", getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex),
-							PRINTF_IP_AS_4_INTS(ip), port));
-	AsciiString str;
-	str.format("PROBE%d", fromNode);
-	m_transport->queueSend(ip, port, (unsigned char *)str.str(), str.getLength() + 1);
-	m_transport->doSend();
-}
-
-// find the next mangled source port, and then send it to the other player.
-// if this requires talking to the mangler, we'll have to wait till a later update
-// to send our port out.
-void NAT::sendMangledSourcePort() {
-	UnsignedShort sourcePort = getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex);
-
-	FirewallHelperClass::tFirewallBehaviorType fwType = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex]->getNATBehavior();
-	GameSlot *targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::sendMangledSourcePort - targetSlot is NULL"));
-	if (targetSlot == NULL) {
-		DEBUG_LOG(("NAT::sendMangledSourcePort - targetSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::sendMangledSourcePort - localSlot is NULL, WTF?"));
-	if (localSlot == NULL) {
-		DEBUG_LOG(("NAT::sendMangledSourcePort - localSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	// check to see if the target and I are behind the same NAT
-	if (targetSlot->getIP() == localSlot->getIP()) {
-#if defined(DEBUG_LOGGING)
-		UnsignedInt localip = localSlot->getIP();
-		UnsignedInt targetip = targetSlot->getIP();
-#endif
-		DEBUG_LOG(("NAT::sendMangledSourcePort - target and I are behind the same NAT, no mangling\n"));
-		DEBUG_LOG(("NAT::sendMangledSourcePort - I am %ls, target is %ls, my IP is %d.%d.%d.%d, target IP is %d.%d.%d.%d\n", localSlot->getName().str(), targetSlot->getName().str(),
-								PRINTF_IP_AS_4_INTS(localip),
-								PRINTF_IP_AS_4_INTS(targetip)));
-
-		sendMangledPortNumberToTarget(sourcePort, targetSlot);
-		m_sourcePorts[m_targetNodeNumber] = sourcePort;
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
-		// In case you're wondering, we don't set the m_previousSourcePort here because this will be a different source
-		// address than what other nodes will likely see (unless of course there are more than
-		// two of us behind the same NAT, but we won't worry about that cause theres no mangling
-		// in that case anyways)
-		return;
-	}
-
-	// check to see if we are NAT'd at all.
-	if ((fwType == 0) || (fwType == FirewallHelperClass::FIREWALL_TYPE_SIMPLE)) {
-		// no mangling, just return the source port
-		DEBUG_LOG(("NAT::sendMangledSourcePort - no mangling, just using the source port\n"));
-		sendMangledPortNumberToTarget(sourcePort, targetSlot);
-		m_previousSourcePort = sourcePort;
-		m_sourcePorts[m_targetNodeNumber] = sourcePort;
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
-		return;
-	}
-
-	// check to see if our NAT keeps the same source port for different destinations.
-	// if this is the case, and we've already worked out what our mangled port number is
-	// then we don't have to figure it out again.
-	if (((fwType & FirewallHelperClass::FIREWALL_TYPE_DESTINATION_PORT_DELTA) == 0) &&
-			((fwType & FirewallHelperClass::FIREWALL_TYPE_SMART_MANGLING) == 0)) {
-		DEBUG_LOG(("NAT::sendMangledSourcePort - our firewall doesn't NAT based on destination address, checking for old connections from this address\n"));
-		if (m_previousSourcePort != 0) {
-			DEBUG_LOG(("NAT::sendMangledSourcePort - Previous source port was %d, using that one\n", m_previousSourcePort));
-			sendMangledPortNumberToTarget(m_previousSourcePort, targetSlot);
-			m_sourcePorts[m_targetNodeNumber] = m_previousSourcePort;
-			setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
-			return;
-		} else {
-			DEBUG_LOG(("NAT::sendMangledSourcePort - Previous source port not found\n"));
-		}
-	}
-
-	// At this point we know that our NAT uses some kind of relative port mapping scheme, so we
-	// need to talk to the mangler to find out where we are now so we can find out where we'll be on the
-	// next port allocation.
-
-	// get the address of the mangler we need to talk to.
-	Char manglerName[256];
-	FirewallHelperClass::getManglerName(1, manglerName);
-	DEBUG_LOG(("NAT::sendMangledSourcePort - about to call gethostbyname for mangler at %s\n", manglerName));
-	struct hostent *hostInfo = gethostbyname(manglerName);
-
-	if (hostInfo == NULL) {
-		DEBUG_LOG(("NAT::sendMangledSourcePort - gethostbyname failed for mangler address %s\n", manglerName));
-		// can't find the mangler, we're screwed so just send the source port.
-		sendMangledPortNumberToTarget(sourcePort, targetSlot);
-		m_sourcePorts[m_targetNodeNumber] = sourcePort;
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
-		return;
-	}
-
-	memcpy(&m_manglerAddress, &(hostInfo->h_addr_list[0][0]), 4);
-	m_manglerAddress = ntohl(m_manglerAddress);
-	DEBUG_LOG(("NAT::sendMangledSourcePort - mangler %s address is %d.%d.%d.%d\n", manglerName, 
-							PRINTF_IP_AS_4_INTS(m_manglerAddress)));
-
-	DEBUG_LOG(("NAT::sendMangledSourcePort - NAT behavior = 0x%08x\n", fwType));
-
-//	m_manglerRetryTime = TheGameSpyConfig->getRetryInterval() + timeGetTime();
-	m_manglerRetryTime = m_manglerRetryTimeInterval + timeGetTime();
-	m_manglerRetries = 0;
-
-	if (TheFirewallHelper != NULL) {
-		m_spareSocketPort = TheFirewallHelper->getNextTemporarySourcePort(0);
-		TheFirewallHelper->openSpareSocket(m_spareSocketPort);
-		TheFirewallHelper->sendToManglerFromPort(m_manglerAddress, m_spareSocketPort, m_packetID);
-//		m_manglerRetryTime = TheGameSpyConfig->getRetryInterval() + timeGetTime();
-		m_manglerRetryTime = m_manglerRetryTimeInterval + timeGetTime();
-	}
-
-	setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLERRESPONSE);
-}
-
-void NAT::processManglerResponse(UnsignedShort mangledPort) {
-	DEBUG_LOG(("NAT::processManglerResponse - Work out what my NAT'd port will be\n"));
-
-	GameSlot *targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::processManglerResponse - targetSlot is NULL"));
-	if (targetSlot == NULL) {
-		DEBUG_LOG(("NAT::processManglerResponse - targetSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	Short delta = TheGlobalData->m_firewallPortAllocationDelta;
-	UnsignedShort sourcePort = getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex);
-	UnsignedShort returnPort = 0;
-
-	FirewallHelperClass::tFirewallBehaviorType fwType = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex]->getNATBehavior();
-
-	if ((fwType & FirewallHelperClass::FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION) != 0) {
-		returnPort = mangledPort + delta;
-	} else {
-		// to steal a line from Steve Tall...
-		// Rats. It's a relative mangler. This is much harder. Damn NAT32 guy.
-		if (delta == 100) {
-			// Special NAT32 section.
-			// NAT32 mangles source UDP port by ading 1700 + 100*NAT table index.
-			returnPort = mangledPort - m_spareSocketPort;
-			returnPort -= 1700;
-
-			returnPort += delta;
-			returnPort += sourcePort;
-			returnPort += 1700;
-
-		} else if (delta == 0) {
-			returnPort = sourcePort;
-		} else {
-			returnPort = mangledPort / delta;
-			returnPort = returnPort * delta;
-
-			returnPort += (sourcePort % delta);
-			returnPort += delta;
-		}
-	}
-
-	// This bit is probably doomed.
-	if (returnPort > 65535) {
-		returnPort -= 65535;
-	}
-	if (returnPort < 1024) {
-		returnPort += 1024;
-	}
-
-	DEBUG_LOG(("NAT::processManglerResponse - mangled port is %d\n", returnPort));
-	m_previousSourcePort = returnPort;
-
-	sendMangledPortNumberToTarget(returnPort, targetSlot);
-	m_sourcePorts[m_targetNodeNumber] = returnPort;
-	if (targetSlot->getPort() == 0) {
-		// we haven't got the target's mangled port number yet, wait for it.
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
-	} else {
-		// in this case we should have already sent a PROBE, so we'll just change the state
-		// and leave it at that.
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
-	}
-}
-
-// check to see if we've completed all the rounds
-// this is kind of a cheesy way to check, but it works.
-Bool NAT::allConnectionsDone() {
-	if (m_numNodes == 2) {
-		if (m_connectionRound >= 1) {
-			return TRUE;
-		}
-	} else if (m_numNodes == 3) {
-		if (m_connectionRound >= 3) {
-			return TRUE;
-		}
-	} else if (m_numNodes == 4) {
-		if (m_connectionRound >= 3) {
-			return TRUE;
-		}
-	} else if (m_numNodes == 5) {
-		if (m_connectionRound >= 5) {
-			return TRUE;
-		}
-	} else if (m_numNodes == 6) {
-		if (m_connectionRound >= 5) {
-			return TRUE;
-		}
-	} else if (m_numNodes == 7) {
-		if (m_connectionRound >= 7) {
-			return TRUE;
-		}
-	} else if (m_numNodes == 8) {
-		if (m_connectionRound >= 7) {
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-Bool NAT::allConnectionsDoneThisRound() {
-	Bool retval = TRUE;
-	for (UnsignedInt i = 0; (i < m_numNodes) && (retval == TRUE); ++i) {
-		if ((m_connectionStates[i] != NATCONNECTIONSTATE_DONE) && (m_connectionStates[i] != NATCONNECTIONSTATE_FAILED)) {
-			retval = FALSE;
-		}
-	}
-	return retval;
-}
-
-// this node's connection for this round has been completed.
-void NAT::connectionComplete(Int slotIndex) {
-}
-
-// this node's connection for this round has failed.
-void NAT::connectionFailed(Int slotIndex) {
-}
-
-// I have been probed by the target.
-void NAT::probed(Int nodeNumber) {
-	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::probed - localSlot is NULL, WTF?"));
-	if (localSlot == NULL) {
-		DEBUG_LOG(("NAT::probed - localSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	if (m_beenProbed == FALSE) {
-		m_beenProbed = TRUE;
-		DEBUG_LOG(("NAT::probed - just got probed for the first time.\n"));
-		if ((localSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0) {
-			DEBUG_LOG(("NAT::probed - we have a NETGEAR and we were just probed for the first time\n"));
-			GameSlot *targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
-			DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::probed - targetSlot is NULL"));
-			if (targetSlot == NULL) {
-				DEBUG_LOG(("NAT::probed - targetSlot is NULL, failed this connection\n"));
-				setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-				return;
-			}
-
-			if (targetSlot->getPort() == 0) {
-				setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
-				DEBUG_LOG(("NAT::probed - still waiting for mangled port\n"));
-			} else {
-				DEBUG_LOG(("NAT::probed - sending a probe to %ls\n", targetSlot->getName().str()));
-				sendAProbe(targetSlot->getIP(), targetSlot->getPort(), m_localNodeNumber);
-				notifyTargetOfProbe(targetSlot);
-				setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
-			}
-		}
-	}
-}
-
-// got the mangled port for our target for this round.
-void NAT::gotMangledPort(Int nodeNumber, UnsignedShort mangledPort) {
-
-	// if we've already finished the connection, then we don't need to process this.
-	if (m_connectionStates[m_localNodeNumber] == NATCONNECTIONSTATE_DONE) {
-		DEBUG_LOG(("NAT::gotMangledPort - got a mangled port, but we've already finished this connection, ignoring.\n"));
-		return;
-	}
-
-	GameSlot *targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::gotMangledPort - targetSlot is NULL"));
-	if (targetSlot == NULL) {
-		DEBUG_LOG(("NAT::gotMangledPort - targetSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::gotMangledPort - localSlot is NULL, WTF?"));
-	if (localSlot == NULL) {
-		DEBUG_LOG(("NAT::gotMangledPort - localSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	if (nodeNumber != m_targetNodeNumber) {
-		DEBUG_LOG(("NAT::gotMangledPort - got a mangled port number for someone that isn't my target. node = %d, target node = %d\n", nodeNumber, m_targetNodeNumber));
-		return;
-	}
-
-	targetSlot->setPort(mangledPort);
-	DEBUG_LOG(("NAT::gotMangledPort - got mangled port number %d from our target node (%ls)\n", mangledPort, targetSlot->getName().str()));
-	if (((localSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) == 0) || (m_beenProbed == TRUE) ||
-			(((localSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0) && ((targetSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0))) {
-#ifdef DEBUG_LOGGING
-		UnsignedInt ip = targetSlot->getIP();
-#endif
-		DEBUG_LOG(("NAT::gotMangledPort - don't have a netgear or we have already been probed, or both my target and I have a netgear, send a PROBE. Sending to %d.%d.%d.%d:%d\n",
-								PRINTF_IP_AS_4_INTS(ip), targetSlot->getPort()));
-
-		sendAProbe(targetSlot->getIP(), targetSlot->getPort(), m_localNodeNumber);
-		notifyTargetOfProbe(targetSlot);
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
-	} else {
-		DEBUG_LOG(("NAT::gotMangledPort - we are a netgear, not sending a PROBE yet.\n"));
-	}
-}
-
-void NAT::gotInternalAddress(Int nodeNumber, UnsignedInt address) {
-	GameSlot *targetSlot = m_slotList[m_connectionNodes[nodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::gotInternalAddress - targetSlot is NULL"));
-	if (targetSlot == NULL) {
-		return;
-	}
-
-	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::gotInternalAddress - localSlot is NULL, WTF?"));
-	if (localSlot == NULL) {
-		return;
-	}
-
-	if (nodeNumber != m_targetNodeNumber) {
-		DEBUG_LOG(("NAT::gotInternalAddress - got a internal address for someone that isn't my target. node = %d, target node = %d\n", nodeNumber, m_targetNodeNumber));
-		return;
-	}
-
-	if (localSlot->getIP() == targetSlot->getIP()) {
-		// we have the same IP address, i.e. we are behind the same NAT.
-		// I need to talk directly to his internal address.
-		DEBUG_LOG(("NAT::gotInternalAddress - target and local players have same external address, using internal address.\n"));
-		targetSlot->setIP(address); // use the slot's internal address from now on
-	}
-}
-
-void NAT::notifyTargetOfProbe(GameSlot *targetSlot) {
-	PeerRequest req;
-	AsciiString options;
-	options.format("PROBED%d", m_localNodeNumber);
-	req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
-	req.UTM.isStagingRoom = TRUE;
-	req.id = "NAT/";
-	AsciiString hostName;
-	hostName.translate(targetSlot->getName());
-	req.nick = hostName.str();
-	req.options = options.str();
-	TheGameSpyPeerMessageQueue->addRequest(req);
-	DEBUG_LOG(("NAT::notifyTargetOfProbe - notifying %ls that we have probed them.\n", targetSlot->getName().str()));
-}
-
-void NAT::notifyUsersOfConnectionDone(Int nodeIndex) {
-	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::notifyUsersOfConnectionDone - localSlot is NULL, WTF?"));
-	if (localSlot == NULL) {
-		DEBUG_LOG(("NAT::notifyUsersOfConnectionDone - localSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	PeerRequest req;
-	AsciiString options;
-	options.format("CONNDONE%d %d", nodeIndex, m_localNodeNumber);
-
-	req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
-	req.UTM.isStagingRoom = TRUE;
-	req.id = "NAT";
-	AsciiString names;
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_connectionNodes[m_localNodeNumber].m_slotIndex == i) {
-			continue;
-		}
-
-		if ((m_slotList[i] == NULL) || (m_slotList[i]->isHuman() == FALSE)) {
-			continue;
-		}
-
-		AsciiString name;
-		name.translate(m_slotList[i]->getName());
-		if (names.isNotEmpty())
-		{
-			names.concat(',');
-		}
-		names.concat(name);
-	}
-	req.nick = names.str();
-	req.options = options.str();
-
-	DEBUG_LOG(("NAT::notifyUsersOfConnectionDone - sending %s to %s\n", options.str(), names.str()));
-	TheGameSpyPeerMessageQueue->addRequest(req);
-}
-
-void NAT::notifyUsersOfConnectionFailed(Int nodeIndex) {
-	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::notifyUsersOfConnectionFailed - localSlot is NULL, WTF?"));
-	if (localSlot == NULL) {
-		DEBUG_LOG(("NAT::notifyUsersOfConnectionFailed - localSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	PeerRequest req;
-	AsciiString options;
-	options.format("CONNFAILED%d", nodeIndex);
-/*
-	req.peerRequestType = PeerRequest::PEERREQUEST_UTMROOM;
-	req.UTM.isStagingRoom = TRUE;
-	req.id = "NAT/";
-	req.options = options.str();
-
-	DEBUG_LOG(("NAT::notifyUsersOfConnectionFailed - sending %s to room\n", options.str()));
-*/
-
-	req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
-	req.UTM.isStagingRoom = TRUE;
-	req.id = "NAT";
-	AsciiString names;
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_connectionNodes[m_localNodeNumber].m_slotIndex == i) {
-			continue;
-		}
-
-		if ((m_slotList[i] == NULL) || (m_slotList[i]->isHuman() == FALSE)) {
-			continue;
-		}
-
-		AsciiString name;
-		name.translate(m_slotList[i]->getName());
-		if (names.isNotEmpty())
-		{
-			names.concat(',');
-		}
-		names.concat(name);
-	}
-	req.nick = names.str();
-	req.options = options.str();
-
-	DEBUG_LOG(("NAT::notifyUsersOfConnectionFailed - sending %s to %s\n", options.str(), names.str()));
-
-	TheGameSpyPeerMessageQueue->addRequest(req);
-}
-
-void NAT::sendMangledPortNumberToTarget(UnsignedShort mangledPort, GameSlot *targetSlot) {
-	PeerRequest req;
-	AsciiString options;
-	options.format("PORT%d %d %08X", m_localNodeNumber, mangledPort, m_localIP);
-
-	req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
-	req.UTM.isStagingRoom = TRUE;
-	req.id = "NAT/";
-	AsciiString hostName;
-	hostName.translate(targetSlot->getName());
-	req.nick = hostName.str();
-	req.options = options.str();
-	DEBUG_LOG(("NAT::sendMangledPortNumberToTarget - sending \"%s\" to %s\n", options.str(), hostName.str()));
-	TheGameSpyPeerMessageQueue->addRequest(req);
-}
-
-void NAT::processGlobalMessage(Int slotNum, const char *options) {
-	const char *ptr = options;
-	// skip preceding whitespace.
-	while (isspace(*ptr)) {
-		++ptr;
-	}
-	DEBUG_LOG(("NAT::processGlobalMessage - got message from slot %d, message is \"%s\"\n", slotNum, ptr));
-	if (!strncmp(ptr, "PROBED", strlen("PROBED"))) {
-		// format: PROBED<node number>
-		// a probe has been sent at us, if we are waiting because of a netgear or something, we
-		// should start sending our own probes.
-		Int node = atoi(ptr + strlen("PROBED"));
-		if (node == m_targetNodeNumber) {
-			// make sure we're being probed by who we're supposed to be probed by.
-			probed(node);
-		} else {
-			DEBUG_LOG(("NAT::processGlobalMessage - probed by node %d, not our target\n", node));
-		}
-	} else if (!strncmp(ptr, "CONNDONE", strlen("CONNDONE"))) {
-		// format: CONNDONE<node number>
-		// we should get the node number of the player who's connection is done from the options
-		// and mark that down as part of the connectionStates.
-		const char *c = ptr + strlen("CONNDONE");
-/*		while (*c != ' ') {
-			++c;
-		}
-		while (*c == ' ') {
-			++c;
-		}
-*/		Int node;
-		Int sendingNode;
-		sscanf(c, "%d %d\n", &node, &sendingNode);
-
-		if (m_connectionPairs[m_connectionPairIndex][m_connectionRound][node] == sendingNode) {
-//			Int node = atoi(ptr + strlen("CONNDONE"));
-			DEBUG_LOG(("NAT::processGlobalMessage - got a CONNDONE message for node %d\n", node));
-			if ((node >= 0) && (node <= m_numNodes)) {
-				DEBUG_LOG(("NAT::processGlobalMessage - node %d's connection is complete, setting connection state to done\n", node));
-				setConnectionState(node, NATCONNECTIONSTATE_DONE);
-			}
-		} else {
-			DEBUG_LOG(("NAT::processGlobalMessage - got a connection done message that isn't from this round. node: %d sending node: %d\n", node, sendingNode));
-		}
-	} else if (!strncmp(ptr, "CONNFAILED", strlen("CONNFAILED"))) {
-		// format: CONNFAILED<node number>
-		// we should get the node number of the player who's connection failed from the options
-		// and mark that down as part of the connectionStates.
-		Int node = atoi(ptr + strlen("CONNFAILED"));
-		if ((node >= 0) && (node < m_numNodes)) {
-			DEBUG_LOG(("NAT::processGlobalMessage - node %d's connection failed, setting connection state to failed\n", node));
-			setConnectionState(node, NATCONNECTIONSTATE_FAILED);
-		}
-	} else if (!strncmp(ptr, "PORT", strlen("PORT"))) {
-		// format: PORT<node number> <port number> <internal IP>
-		// we should get the node number and the mangled port number of the client we
-		// are supposed to be communicating with and start probing them. No, that was not
-		// meant to be a phallic reference, you sicko.
-		const char *c = ptr + strlen("PORT");
-		Int node = atoi(c);
-		while (*c != ' ') {
-			++c;
-		}
-		while (*c == ' ') {
-			++c;
-		}
-		UnsignedInt intport = 0;
-		UnsignedInt addr = 0;
-		sscanf(c, "%d %X", &intport, &addr);
-		UnsignedShort port = (UnsignedShort)intport;
-
-		DEBUG_LOG(("NAT::processGlobalMessage - got port message from node %d, port: %d, internal address: %d.%d.%d.%d\n", node, port,
-								PRINTF_IP_AS_4_INTS(addr)));
-
-		if ((node >= 0) && (node < m_numNodes)) {
-			if (port < 1024) {
-				// it has to be less than 65535 cause its a short duh.
-				DEBUG_ASSERTCRASH(port >= 1024, ("Was passed an invalid port number"));
-				port += 1024;
-			}
-			gotInternalAddress(node, addr);
-			gotMangledPort(node, port);
-		}
-	}
-}
-
-void NAT::setConnectionState(Int nodeNumber, NATConnectionState state) {
-	m_connectionStates[nodeNumber] = state;
-
-	if (nodeNumber != m_localNodeNumber) {
-		return;
-	}
-
-	// if this is the case we are starting a new round and we don't know
-	// who we're connecting to yet.
-	if (m_localNodeNumber == m_targetNodeNumber) {
-		return;
-	}
-
-	// if this is the start of a new connection round we don't have a
-	// target yet.
-	if (m_targetNodeNumber == -1) {
-		return;
-	}
-
-	// find the menu slot of the target node.
-	Int slotIndex = m_connectionNodes[m_targetNodeNumber].m_slotIndex;
-	Int slot = 0;
-	Int i = 0;
-	for (; i < MAX_SLOTS; ++i) {
-		if (m_slotList[i] != NULL) {
-			if (m_slotList[i]->isHuman()) {
-				if (i != m_connectionNodes[m_localNodeNumber].m_slotIndex) {
-					if (i == slotIndex) {
-					 break;
-					}
-					++slot;
-				}
-			}
-		}
-	}
-	if (i == MAX_SLOTS) {
-		DEBUG_ASSERTCRASH(i < MAX_SLOTS, ("Didn't find the node number in the slot list"));
-		return;
-	}
-	TheEstablishConnectionsMenu->setPlayerStatus(slot, state);
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NetCommandList.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NetCommandList.cpp
deleted file mode 100644
index 030c983e357..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/NetCommandList.cpp
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/NetCommandList.h"
-#include "GameNetwork/networkutil.h"
-
-/**
- * Constructor.
- */
-NetCommandList::NetCommandList() {
-	m_first = NULL;
-	m_last = NULL;
-	m_lastMessageInserted = NULL;
-}
-
-/**
- * Destructor.
- */
-NetCommandList::~NetCommandList() {
-	reset();
-}
-
-/**
- * Append the given list of commands to this list.
- */
-void NetCommandList::appendList(NetCommandList *list) {
-	if (list == NULL) {
-		return;
-	}
-
-	// Need to do it this way because of the reference counting that needs to happen in appendMessage.
-	NetCommandRef *msg = list->getFirstMessage();
-	NetCommandRef *next = NULL;
-	while (msg != NULL) {
-		next = msg->getNext();
-		NetCommandRef *temp = addMessage(msg->getCommand());
-		if (temp != NULL) {
-			temp->setRelay(msg->getRelay());
-		}
-
-		msg = next;
-	}
-}
-
-/**
- * Return the first message in this list.
- */
-NetCommandRef *NetCommandList::getFirstMessage() {
-	return m_first;
-}
-
-/**
- * Remove the given message from this list.
- */
-void NetCommandList::removeMessage(NetCommandRef *msg) {
-	if (m_lastMessageInserted == msg) {
-		m_lastMessageInserted = msg->getNext();
-	}
-
-	if (msg->getPrev() != NULL) {
-		msg->getPrev()->setNext(msg->getNext());
-	}
-	if (msg->getNext() != NULL) {
-		msg->getNext()->setPrev(msg->getPrev());
-	}
-
-	if (msg == m_first) {
-		m_first = msg->getNext();
-	}
-	if (msg == m_last) {
-		m_last = msg->getPrev();
-	}
-
-	msg->setNext(NULL);
-	msg->setPrev(NULL);
-}
-
-/**
- * Initialize the list.
- */
-void NetCommandList::init() {
-	reset();
-}
-
-/**
- * Reset the contents of this list.
- */
-void NetCommandList::reset() {
-	NetCommandRef *temp = m_first;
-	while (m_first != NULL) {
-		temp = m_first->getNext();
-		m_first->setNext(NULL);
-		m_first->setPrev(NULL);
-		deleteInstance(m_first);
-		m_first = temp;
-	}
-	m_last = NULL;
-	m_lastMessageInserted = NULL;
-}
-
-/**
- * Insert sorts msg.  Assumes that all the previous message inserts were done using this function.
- * The message is sorted in based first on command type, then player id, and then command id.
- */
-NetCommandRef * NetCommandList::addMessage(NetCommandMsg *cmdMsg) {
-	if (cmdMsg == NULL) {
-		DEBUG_ASSERTCRASH(cmdMsg != NULL, ("NetCommandList::addMessage - command message was NULL"));
-		return NULL;
-	}
-
-//	UnsignedInt id = cmdMsg->getID();
-
-	NetCommandRef *msg = NEW_NETCOMMANDREF(cmdMsg);
-
-	if (m_first == NULL) {
-		// this is the first node, so we don't have to worry about ordering it.
-		m_first = msg;
-		m_last = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-
-	if (m_lastMessageInserted != NULL) {
-		// Messages that are inserted in order should just be put in one right after the other.
-		// So saving the placement of the last message inserted can give us a huge boost in
-		// efficiency.
-		NetCommandRef *theNext = m_lastMessageInserted->getNext();
-		if ((m_lastMessageInserted->getCommand()->getNetCommandType() == msg->getCommand()->getNetCommandType()) &&
-			(m_lastMessageInserted->getCommand()->getPlayerID() == msg->getCommand()->getPlayerID()) &&
-			(m_lastMessageInserted->getCommand()->getID() < msg->getCommand()->getID()) &&
-			((theNext == NULL) || ((theNext->getCommand()->getNetCommandType() > msg->getCommand()->getNetCommandType()) ||
-			 (theNext->getCommand()->getPlayerID() > msg->getCommand()->getPlayerID()) ||
-			 (theNext->getCommand()->getID() > msg->getCommand()->getID())))) {
-
-			// Make sure this command isn't already in the list.
-			if (isEqualCommandMsg(m_lastMessageInserted->getCommand(), msg->getCommand())) {
-
-				// This command is already in the list, don't duplicate it.
-				deleteInstance(msg);
-				msg = NULL;
-				return NULL;
-			}
-
-			if (theNext == NULL) {
-				// this means that m_lastMessageInserted == m_last, so m_last should point to the msg that is being inserted.
-				msg->setNext(m_lastMessageInserted->getNext());
-				msg->setPrev(m_lastMessageInserted);
-				m_lastMessageInserted->setNext(msg);
-				m_lastMessageInserted = msg;
-				m_last = msg;
-			} else {
-				msg->setNext(m_lastMessageInserted->getNext());
-				msg->setPrev(m_lastMessageInserted);
-				m_lastMessageInserted->setNext(msg);
-				msg->getNext()->setPrev(msg);
-				m_lastMessageInserted = msg;
-			}
-			return msg;
-		}
-	}
-	
-	if (msg->getCommand()->getNetCommandType() > m_last->getCommand()->getNetCommandType()) {
-		// easy optimization for a command that goes at the end of the list
-		// since they are likely to be added in order.
-
-		// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(m_last->getCommand(), msg->getCommand())) {
-
-			// This command is already in the list, don't duplicate it.
-			deleteInstance(msg);
-			msg = NULL;
-			return NULL;
-		}
-
-		msg->setPrev(m_last);
-		msg->setNext(NULL);
-		m_last->setNext(msg);
-		m_last = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-	
-	if (msg->getCommand()->getNetCommandType() < m_first->getCommand()->getNetCommandType()) {
-		// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(m_first->getCommand(), msg->getCommand())) {
-
-			// This command is already in the list, don't duplicate it.
-			deleteInstance(msg);
-			msg = NULL;
-			return NULL;
-		}
-
-		// The command goes at the head of the list.
-		msg->setNext(m_first);
-		msg->setPrev(NULL);
-		m_first->setPrev(msg);
-		m_first = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-	
-	
-	// Find the start of the command type we're looking for.
-	NetCommandRef *tempmsg = m_first;
-	while ((tempmsg != NULL) && (msg->getCommand()->getNetCommandType() > tempmsg->getCommand()->getNetCommandType())) {
-		tempmsg = tempmsg->getNext();
-	}
-
-	if (tempmsg == NULL) {
-		// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(m_last->getCommand(), msg->getCommand())) {
-
-			// This command is already in the list, don't duplicate it.
-			deleteInstance(msg);
-			msg = NULL;
-			return NULL;
-		}
-
-		// message goes at the end of the list.
-		msg->setPrev(m_last);
-		msg->setNext(NULL);
-		m_last->setNext(msg);
-		m_last = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-
-	// Now find the player position.  munkee.
-	while ((tempmsg != NULL) && (msg->getCommand()->getNetCommandType() == tempmsg->getCommand()->getNetCommandType()) && (msg->getCommand()->getPlayerID() > tempmsg->getCommand()->getPlayerID())) {
-		tempmsg = tempmsg->getNext();
-	}
-
-	if (tempmsg == NULL) {
-		// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(m_last->getCommand(), msg->getCommand())) {
-
-			// This command is already in the list, don't duplicate it.
-			deleteInstance(msg);
-			msg = NULL;
-			return NULL;
-		}
-
-		// message goes at the end of the list.
-		msg->setPrev(m_last);
-		msg->setNext(NULL);
-		m_last->setNext(msg);
-		m_last = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-
-	// Find the position within the player's section based on the command ID.
-	// If the command type doesn't require a command ID, sort by whatever it should be sorted by.
-	while ((tempmsg != NULL) && (msg->getCommand()->getNetCommandType() == tempmsg->getCommand()->getNetCommandType()) && (msg->getCommand()->getPlayerID() == tempmsg->getCommand()->getPlayerID()) && (msg->getCommand()->getSortNumber() > tempmsg->getCommand()->getSortNumber())) {
-		tempmsg = tempmsg->getNext();
-	}
-
-	if (tempmsg == NULL) {
-		// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(m_last->getCommand(), msg->getCommand())) {
-
-			// This command is already in the list, don't duplicate it.
-			deleteInstance(msg);
-			msg = NULL;
-			return NULL;
-		}
-
-		// This message goes at the end of the list.
-		msg->setPrev(m_last);
-		msg->setNext(NULL);
-		m_last->setNext(msg);
-		m_last = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-
-	if (tempmsg == m_first) {
-		// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(m_first->getCommand(), msg->getCommand())) {
-
-			// This command is already in the list, don't duplicate it.
-			deleteInstance(msg);
-			return NULL;
-		}
-
-		// This message goes at the head of the list.
-		msg->setNext(m_first);
-		msg->setPrev(NULL);
-		m_first->setPrev(msg);
-		m_first = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-
-	// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(tempmsg->getCommand(), msg->getCommand())) {
-
-		// This command is already in the list, don't duplicate it.
-		deleteInstance(msg);
-		msg = NULL;
-		return NULL;
-	}
-
-	// Insert message before tempmsg.
-	msg->setNext(tempmsg);
-	msg->setPrev(tempmsg->getPrev());
-	msg->getPrev()->setNext(msg);
-	tempmsg->setPrev(msg);
-	m_lastMessageInserted = msg;
-
-	return msg;
-}
-
-Int NetCommandList::length() {
-	Int retval = 0;
-	NetCommandRef *temp = m_first;
-	while (temp != NULL) {
-		++retval;
-		temp = temp->getNext();
-	}
-	return retval;
-}
-
-/**
- * This is really inefficient, but we can probably get away with it because
- * there shouldn't be too many messages for any given frame.
- */
-NetCommandRef * NetCommandList::findMessage(NetCommandMsg *msg) {
-	NetCommandRef *retval = m_first;
-	while ((retval != NULL) && (isEqualCommandMsg(retval->getCommand(), msg) == FALSE)) {
-		retval = retval->getNext();
-	}
-	return retval;
-}
-
-NetCommandRef * NetCommandList::findMessage(UnsignedShort commandID, UnsignedByte playerID) {
-	NetCommandRef *retval = m_first;
-	while (retval != NULL) {
-		if (DoesCommandRequireACommandID(retval->getCommand()->getNetCommandType())) {
-			if ((retval->getCommand()->getID() == commandID) && (retval->getCommand()->getPlayerID() == playerID)) {
-				return retval;
-			}
-		}
-		retval = retval->getNext();
-	}
-	return retval;
-}
-
-Bool NetCommandList::isEqualCommandMsg(NetCommandMsg *msg1, NetCommandMsg *msg2) {
-	if (DoesCommandRequireACommandID(msg1->getNetCommandType()) != DoesCommandRequireACommandID(msg2->getNetCommandType())) {
-		return FALSE;
-	}
-
-	// At this point we know that the commands both do or do not require a command id.
-	// Do or do not, there is no try.
-	if (DoesCommandRequireACommandID(msg1->getNetCommandType())) {
-		// Are the commands from the same player?
-		if (msg1->getPlayerID() != msg2->getPlayerID()) {
-			return FALSE;
-		}
-
-		// Do they have the same command ID?
-		if (msg1->getID() != msg2->getID()) {
-			return FALSE;
-		}
-		return TRUE;
-	}
-
-	// If we've gotten this far, we know that the commands do not require a command id.
-	// So now our equality checking becomes type-specific.
-
-	// Are they the same type?
-	if (msg1->getNetCommandType() != msg2->getNetCommandType()) {
-		return FALSE;
-	}
-
-	// Are they from the same player?
-	if (msg1->getPlayerID() != msg2->getPlayerID()) {
-		return FALSE;
-	}
-
-	// They are the same type and from the same player.
-	// Time for the type specific stuff.
-	if (msg1->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) {
-		NetAckStage1CommandMsg *ack1 = (NetAckStage1CommandMsg *)msg1;
-		NetAckStage1CommandMsg *ack2 = (NetAckStage1CommandMsg *)msg2;
-		
-		if (ack1->getOriginalPlayerID() != ack2->getOriginalPlayerID()) {
-			return FALSE;
-		}
-
-		if (ack1->getCommandID() != ack2->getCommandID()) {
-			return FALSE;
-		}
-		return TRUE;
-	}
-
-	// They are the same type and from the same player.
-	// Time for the type specific stuff.
-	if (msg1->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) {
-		NetAckStage2CommandMsg *ack1 = (NetAckStage2CommandMsg *)msg1;
-		NetAckStage2CommandMsg *ack2 = (NetAckStage2CommandMsg *)msg2;
-		
-		if (ack1->getOriginalPlayerID() != ack2->getOriginalPlayerID()) {
-			return FALSE;
-		}
-
-		if (ack1->getCommandID() != ack2->getCommandID()) {
-			return FALSE;
-		}
-		return TRUE;
-	}
-
-	// They are the same type and from the same player.
-	// Time for the type specific stuff.
-	if (msg1->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
-		NetAckBothCommandMsg *ack1 = (NetAckBothCommandMsg *)msg1;
-		NetAckBothCommandMsg *ack2 = (NetAckBothCommandMsg *)msg2;
-		
-		if (ack1->getOriginalPlayerID() != ack2->getOriginalPlayerID()) {
-			return FALSE;
-		}
-
-		if (ack1->getCommandID() != ack2->getCommandID()) {
-			return FALSE;
-		}
-		return TRUE;
-	}
-
-	return FALSE;
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp
deleted file mode 100644
index 710c778aed1..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp
+++ /dev/null
@@ -1,1069 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/NetCommandMsg.h"
-#include "Common/GameState.h"
-#include "Common/PlayerList.h"
-#include "Common/Player.h"
-
-/**
- * Base constructor
- */
-NetCommandMsg::NetCommandMsg() 
-{
-	//Added By Sadullah Nader
-	//Initializations inserted
-	m_executionFrame = 0;
-	m_id = 0;
-	m_playerID = 0;
-
-	//
-	m_timestamp = 0;
-	m_referenceCount = 1; // start this off as 1.  This means that an "attach" is implied by creating a NetCommandMsg object.
-	m_commandType = NETCOMMANDTYPE_UNKNOWN;
-}
-
-/**
- * Destructor
- */
-NetCommandMsg::~NetCommandMsg() {
-}
-
-/**
- * Adds one to the reference count.
- */
-void NetCommandMsg::attach() {
-	++m_referenceCount;
-}
-
-/**
- * Subtracts one from the reference count. If the reference count is 0, the this object is destroyed.
- */
-void NetCommandMsg::detach() {
-	--m_referenceCount;
-	if (m_referenceCount == 0) {
-		deleteInstance(this);
-		return;
-	}
-	DEBUG_ASSERTCRASH(m_referenceCount > 0, ("Invalid reference count for NetCommandMsg")); // Just to make sure...
-	if (m_referenceCount < 0) {
-		deleteInstance(this);
-	}
-}
-
-/**
- * Returns the value by which this type of message should be sorted.
- */
-Int NetCommandMsg::getSortNumber() {
-	return m_id;
-}
-
-//-------------------------------
-// NetGameCommandMsg
-//-------------------------------
-
-/**
- * Constructor with no argument, sets everything to default values.
- */
-NetGameCommandMsg::NetGameCommandMsg() : NetCommandMsg() {
-	//Added By Sadullah Nader
-	//Initializations inserted
-	m_argSize = 0;
-	m_numArgs = 0;
-	//
-
-	m_type = (GameMessage::Type)0;
-	m_commandType = NETCOMMANDTYPE_GAMECOMMAND;
-	m_argList = NULL;
-	m_argTail = NULL;
-}
-
-/**
- * Constructor with a GameMessage argument. Sets member variables appropriately for this GameMessage.
- * Also copies all the arguments.
- */
-NetGameCommandMsg::NetGameCommandMsg(GameMessage *msg) : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_GAMECOMMAND;
-
-	m_type = msg->getType();
-	Int count = msg->getArgumentCount();
-	for (Int i = 0; i < count; ++i) {
-		addArgument(msg->getArgumentDataType(i), *(msg->getArgument(i)));
-	}
-}
-
-/**
- * Destructor
- */
-NetGameCommandMsg::~NetGameCommandMsg() {
-	GameMessageArgument *arg = m_argList;
-	while (arg != NULL) {
-		m_argList = m_argList->m_next;
-		deleteInstance(arg);
-		arg = m_argList;
-	}
-}
-
-/**
- * Add an argument to this command.
- */
-void NetGameCommandMsg::addArgument(const GameMessageArgumentDataType type, GameMessageArgumentType arg) 
-{
-	if (m_argTail == NULL) {
-		m_argList = newInstance(GameMessageArgument);	
-		m_argTail = m_argList;
-		m_argList->m_data = arg;
-		m_argList->m_type = type;
-		m_argList->m_next = NULL;
-		return;
-	}
-
-	GameMessageArgument *newArg = newInstance(GameMessageArgument);
-	newArg->m_data = arg;
-	newArg->m_type = type;
-	newArg->m_next = NULL;
-	m_argTail->m_next = newArg;
-	m_argTail = newArg;
-}
-
-// here's where we figure out which slot corresponds to which player
-static Int indexFromMask(UnsignedInt mask)
-{
-	Player *player = NULL;
-	Int i;
-
-	for( i = 0; i < MAX_PLAYER_COUNT; i++ )
-	{
-		player = ThePlayerList->getNthPlayer( i );
-		if( player && player->getPlayerMask() == mask )
-			return i;
-	}  // end for i
-
-	return -1;
-}
-
-/**
- * Construct a new GameMessage object from the data in this object.
- */
-GameMessage *NetGameCommandMsg::constructGameMessage() 
-{
-	GameMessage *retval = newInstance(GameMessage)(m_type);
-
-	AsciiString name;
-	name.format("player%d", getPlayerID());
-	retval->friend_setPlayerIndex( ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(name))->getPlayerIndex());
-//	retval->friend_setPlayerIndex(indexFromMask(ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(name))->getPlayerMask()));
-
-	GameMessageArgument *arg = m_argList;
-	while (arg != NULL) {
-//		retval->appendGenericArgument(arg->m_data);
-		if (arg->m_type == ARGUMENTDATATYPE_INTEGER) {
-			retval->appendIntegerArgument(arg->m_data.integer);
-		} else if (arg->m_type == ARGUMENTDATATYPE_REAL) {
-			retval->appendRealArgument(arg->m_data.real);
-		} else if (arg->m_type == ARGUMENTDATATYPE_BOOLEAN) {
-			retval->appendBooleanArgument(arg->m_data.boolean);
-		} else if (arg->m_type == ARGUMENTDATATYPE_OBJECTID) {
-			retval->appendObjectIDArgument(arg->m_data.objectID);
-		} else if (arg->m_type == ARGUMENTDATATYPE_DRAWABLEID) {
-			retval->appendDrawableIDArgument(arg->m_data.drawableID);
-		} else if (arg->m_type == ARGUMENTDATATYPE_TEAMID) {
-			retval->appendTeamIDArgument(arg->m_data.teamID);
-		} else if (arg->m_type == ARGUMENTDATATYPE_LOCATION) {
-			retval->appendLocationArgument(arg->m_data.location);
-		} else if (arg->m_type == ARGUMENTDATATYPE_PIXEL) {
-			retval->appendPixelArgument(arg->m_data.pixel);
-		} else if (arg->m_type == ARGUMENTDATATYPE_PIXELREGION) {
-			retval->appendPixelRegionArgument(arg->m_data.pixelRegion);
-		} else if (arg->m_type == ARGUMENTDATATYPE_TIMESTAMP) {
-			retval->appendTimestampArgument(arg->m_data.timestamp);
-		} else if (arg->m_type == ARGUMENTDATATYPE_WIDECHAR) {
-			retval->appendWideCharArgument(arg->m_data.wChar);
-		}
-		arg = arg->m_next;
-	}
-	return retval;
-}
-
-/**
- * Sets the type of game message
- */
-void NetGameCommandMsg::setGameMessageType(GameMessage::Type type) {
-	m_type = type;
-}
-
-AsciiString NetGameCommandMsg::getContentsAsAsciiString(void)
-{
-	AsciiString ret;
-	//AsciiString tmp;
-	ret.format("Type:%s", GameMessage::getCommandTypeAsAsciiString((GameMessage::Type)m_type).str());
-
-	return ret;
-}
-
-//-------------------------
-// NetAckBothCommandMsg
-//-------------------------
-/**
- * Constructor.  Sets the member variables according to the given message.
- */
-NetAckBothCommandMsg::NetAckBothCommandMsg(NetCommandMsg *msg) : NetCommandMsg() {
-	m_commandID = msg->getID();
-	m_commandType = NETCOMMANDTYPE_ACKBOTH;
-	m_originalPlayerID = msg->getPlayerID();
-}
-
-/**
- * Constructor.  Sets the member variables to default values.
- */
-NetAckBothCommandMsg::NetAckBothCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_ACKBOTH;
-}
-
-/**
- * Destructor.
- */
-NetAckBothCommandMsg::~NetAckBothCommandMsg() {
-}
-
-/**
- * Returns the command ID of the command being ack'd.
- */
-UnsignedShort NetAckBothCommandMsg::getCommandID() {
-	return m_commandID;
-}
-
-/**
- * Set the command ID of the command being ack'd.
- */
-void NetAckBothCommandMsg::setCommandID(UnsignedShort commandID) {
-	m_commandID = commandID;
-}
-
-/**
- * Get the player id of the player who originally sent the command.
- */
-UnsignedByte NetAckBothCommandMsg::getOriginalPlayerID() {
-	return m_originalPlayerID;
-}
-
-/**
- * Set the player id of the player who originally sent the command.
- */
-void NetAckBothCommandMsg::setOriginalPlayerID(UnsignedByte originalPlayerID) {
-	m_originalPlayerID = originalPlayerID;
-}
-
-Int NetAckBothCommandMsg::getSortNumber() {
-	return m_commandID;
-}
-
-//-------------------------
-// NetAckStage1CommandMsg
-//-------------------------
-/**
- * Constructor.  Sets the member variables according to the given message.
- */
-NetAckStage1CommandMsg::NetAckStage1CommandMsg(NetCommandMsg *msg) : NetCommandMsg() {
-	m_commandID = msg->getID();
-	m_commandType = NETCOMMANDTYPE_ACKSTAGE1;
-	m_originalPlayerID = msg->getPlayerID();
-}
-
-/**
- * Constructor.  Sets the member variables to default values.
- */
-NetAckStage1CommandMsg::NetAckStage1CommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_ACKSTAGE1;
-}
-
-/**
- * Destructor.
- */
-NetAckStage1CommandMsg::~NetAckStage1CommandMsg() {
-}
-
-/**
- * Returns the command ID of the command being ack'd.
- */
-UnsignedShort NetAckStage1CommandMsg::getCommandID() {
-	return m_commandID;
-}
-
-/**
- * Set the command ID of the command being ack'd.
- */
-void NetAckStage1CommandMsg::setCommandID(UnsignedShort commandID) {
-	m_commandID = commandID;
-}
-
-/**
- * Get the player id of the player who originally sent the command.
- */
-UnsignedByte NetAckStage1CommandMsg::getOriginalPlayerID() {
-	return m_originalPlayerID;
-}
-
-/**
- * Set the player id of the player who originally sent the command.
- */
-void NetAckStage1CommandMsg::setOriginalPlayerID(UnsignedByte originalPlayerID) {
-	m_originalPlayerID = originalPlayerID;
-}
-
-Int NetAckStage1CommandMsg::getSortNumber() {
-	return m_commandID;
-}
-
-//-------------------------
-// NetAckStage2CommandMsg
-//-------------------------
-/**
- * Constructor.  Sets the member variables according to the given message.
- */
-NetAckStage2CommandMsg::NetAckStage2CommandMsg(NetCommandMsg *msg) : NetCommandMsg() {
-	m_commandID = msg->getID();
-	m_commandType = NETCOMMANDTYPE_ACKSTAGE2;
-	m_originalPlayerID = msg->getPlayerID();
-}
-
-/**
- * Constructor.  Sets the member variables to default values.
- */
-NetAckStage2CommandMsg::NetAckStage2CommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_ACKSTAGE2;
-}
-
-/**
- * Destructor.
- */
-NetAckStage2CommandMsg::~NetAckStage2CommandMsg() {
-}
-
-/**
- * Returns the command ID of the command being ack'd.
- */
-UnsignedShort NetAckStage2CommandMsg::getCommandID() {
-	return m_commandID;
-}
-
-/**
- * Set the command ID of the command being ack'd.
- */
-void NetAckStage2CommandMsg::setCommandID(UnsignedShort commandID) {
-	m_commandID = commandID;
-}
-
-/**
- * Get the player id of the player who originally sent the command.
- */
-UnsignedByte NetAckStage2CommandMsg::getOriginalPlayerID() {
-	return m_originalPlayerID;
-}
-
-/**
- * Set the player id of the player who originally sent the command.
- */
-void NetAckStage2CommandMsg::setOriginalPlayerID(UnsignedByte originalPlayerID) {
-	m_originalPlayerID = originalPlayerID;
-}
-
-Int NetAckStage2CommandMsg::getSortNumber() {
-	return m_commandID;
-}
-
-//-------------------------
-// NetFrameCommandMsg
-//-------------------------
-/**
- * Constructor.
- */
-NetFrameCommandMsg::NetFrameCommandMsg() : NetCommandMsg() {
-	m_commandCount = 0;
-	m_commandType = NETCOMMANDTYPE_FRAMEINFO;
-}
-
-/**
- * Destructor
- */
-NetFrameCommandMsg::~NetFrameCommandMsg() {
-}
-
-/**
- * Set the command count of this frame.
- */
-void NetFrameCommandMsg::setCommandCount(UnsignedShort commandCount) {
-	m_commandCount = commandCount;
-}
-
-/**
- * Return the command count of this frame.
- */
-UnsignedShort NetFrameCommandMsg::getCommandCount() {
-	return m_commandCount;
-}
-
-//-------------------------
-// NetPlayerLeaveCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetPlayerLeaveCommandMsg::NetPlayerLeaveCommandMsg() : NetCommandMsg() {
-	m_leavingPlayerID = 0;
-	m_commandType = NETCOMMANDTYPE_PLAYERLEAVE;
-}
-
-/**
- * Destructor
- */
-NetPlayerLeaveCommandMsg::~NetPlayerLeaveCommandMsg() {
-}
-
-/**
- * Get the id of the player leaving the game.
- */
-UnsignedByte NetPlayerLeaveCommandMsg::getLeavingPlayerID() {
-	return m_leavingPlayerID;
-}
-
-/**
- * Set the id of the player leaving the game.
- */
-void NetPlayerLeaveCommandMsg::setLeavingPlayerID(UnsignedByte id) {
-	m_leavingPlayerID = id;
-}
-
-//-------------------------
-// NetRunAheadMetricsCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetRunAheadMetricsCommandMsg::NetRunAheadMetricsCommandMsg() : NetCommandMsg() {
-	m_averageLatency = 0.0;
-	m_averageFps = 0;
-	m_commandType = NETCOMMANDTYPE_RUNAHEADMETRICS;
-}
-
-/**
- * Destructor
- */
-NetRunAheadMetricsCommandMsg::~NetRunAheadMetricsCommandMsg() {
-}
-
-/**
- * set the average latency
- */
-void NetRunAheadMetricsCommandMsg::setAverageLatency(Real avgLat) {
-	m_averageLatency = avgLat;
-}
-
-/**
- * get the average latency
- */
-Real NetRunAheadMetricsCommandMsg::getAverageLatency() {
-	return m_averageLatency;
-}
-
-/**
- * set the average fps
- */
-void NetRunAheadMetricsCommandMsg::setAverageFps(Int fps) {
-	m_averageFps = fps;
-}
-
-/**
- * get the average fps
- */
-Int NetRunAheadMetricsCommandMsg::getAverageFps() {
-	return m_averageFps;
-}
-
-//-------------------------
-// NetRunAheadCommandMsg
-//-------------------------
-NetRunAheadCommandMsg::NetRunAheadCommandMsg() : NetCommandMsg() {
-	m_runAhead = min(max(20, MIN_RUNAHEAD), MAX_FRAMES_AHEAD/2);
-	m_frameRate = 30;
-	m_commandType = NETCOMMANDTYPE_RUNAHEAD;
-}
-
-NetRunAheadCommandMsg::~NetRunAheadCommandMsg() {
-}
-
-UnsignedShort NetRunAheadCommandMsg::getRunAhead() {
-	return m_runAhead;
-}
-
-void NetRunAheadCommandMsg::setRunAhead(UnsignedShort runAhead) {
-	m_runAhead = runAhead;
-}
-
-UnsignedByte NetRunAheadCommandMsg::getFrameRate() {
-	return m_frameRate;
-}
-
-void NetRunAheadCommandMsg::setFrameRate(UnsignedByte frameRate) {
-	m_frameRate = frameRate;
-}
-
-//-------------------------
-// NetDestroyPlayerCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetDestroyPlayerCommandMsg::NetDestroyPlayerCommandMsg() : NetCommandMsg()
-{
-	m_playerIndex = 0;
-	m_commandType = NETCOMMANDTYPE_DESTROYPLAYER;
-}
-
-/**
- * Destructor
- */
-NetDestroyPlayerCommandMsg::~NetDestroyPlayerCommandMsg()
-{
-}
-
-/**
- * set the CRC
- */
-void NetDestroyPlayerCommandMsg::setPlayerIndex( UnsignedInt playerIndex )
-{
-	m_playerIndex = playerIndex;
-}
-
-/**
- * get the average CRC
- */
-UnsignedInt NetDestroyPlayerCommandMsg::getPlayerIndex( void )
-{
-	return m_playerIndex;
-}
-
-//-------------------------
-// NetKeepAliveCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetKeepAliveCommandMsg::NetKeepAliveCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_KEEPALIVE;
-}
-
-NetKeepAliveCommandMsg::~NetKeepAliveCommandMsg() {
-}
-
-//-------------------------
-// NetDisconnectKeepAliveCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetDisconnectKeepAliveCommandMsg::NetDisconnectKeepAliveCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_DISCONNECTKEEPALIVE;
-}
-
-NetDisconnectKeepAliveCommandMsg::~NetDisconnectKeepAliveCommandMsg() {
-}
-
-//-------------------------
-// NetDisconnectPlayerCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetDisconnectPlayerCommandMsg::NetDisconnectPlayerCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_DISCONNECTPLAYER;
-	m_disconnectSlot = 0;
-}
-
-/**
- * Destructor
- */
-NetDisconnectPlayerCommandMsg::~NetDisconnectPlayerCommandMsg() {
-}
-
-/**
- * Returns the disconnecting slot number
- */
-UnsignedByte NetDisconnectPlayerCommandMsg::getDisconnectSlot() {
-	return m_disconnectSlot;
-}
-
-/**
- * Sets the disconnecting slot number
- */
-void NetDisconnectPlayerCommandMsg::setDisconnectSlot(UnsignedByte slot) {
-	m_disconnectSlot = slot;
-}
-
-/**
- * Sets the disconnect frame
- */
-void NetDisconnectPlayerCommandMsg::setDisconnectFrame(UnsignedInt frame) {
-	m_disconnectFrame = frame;
-}
-
-/**
- * returns the disconnect frame
- */
-UnsignedInt NetDisconnectPlayerCommandMsg::getDisconnectFrame() {
-	return m_disconnectFrame;
-}
-
-//-------------------------
-// NetPacketRouterQueryCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetPacketRouterQueryCommandMsg::NetPacketRouterQueryCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_PACKETROUTERQUERY;
-}
-
-/**
- * Destructor
- */
-NetPacketRouterQueryCommandMsg::~NetPacketRouterQueryCommandMsg() {
-}
-
-//-------------------------
-// NetPacketRouterAckCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetPacketRouterAckCommandMsg::NetPacketRouterAckCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_PACKETROUTERACK;
-}
-
-/**
- * Destructor
- */
-NetPacketRouterAckCommandMsg::~NetPacketRouterAckCommandMsg() {
-}
-
-//-------------------------
-// NetDisconnectChatCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetDisconnectChatCommandMsg::NetDisconnectChatCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_DISCONNECTCHAT;
-}
-
-/**
- * Destructor
- */
-NetDisconnectChatCommandMsg::~NetDisconnectChatCommandMsg() {
-}
-
-/**
- * Set the chat text for this message.
- */
-void NetDisconnectChatCommandMsg::setText(UnicodeString text) {
-	m_text = text;
-}
-
-/**
- * Get the chat text for this message.
- */
-UnicodeString NetDisconnectChatCommandMsg::getText() {
-	return m_text;
-}
-
-//-------------------------
-// NetChatCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetChatCommandMsg::NetChatCommandMsg() : NetCommandMsg()
-{
-	m_commandType = NETCOMMANDTYPE_CHAT;
-	//added by Sadullah Nader
-	//Initializations inserted
-	m_playerMask = 0;
-	//
-}
-
-/**
- * Destructor
- */
-NetChatCommandMsg::~NetChatCommandMsg()
-{
-}
-
-/**
- * Set the chat text for this message.
- */
-void NetChatCommandMsg::setText(UnicodeString text)
-{
-	m_text = text;
-}
-
-/**
- * Get the chat text for this message.
- */
-UnicodeString NetChatCommandMsg::getText()
-{
-	return m_text;
-}
-
-/**
- * Get the bitmask of chat recipients from this message.
- */
-Int NetChatCommandMsg::getPlayerMask()
-{
-	return m_playerMask;
-}
-
-/**
- * Set a bitmask of chat recipients in this message.
- */
-void NetChatCommandMsg::setPlayerMask( Int playerMask )
-{
-	m_playerMask = playerMask;
-}
-
-//-------------------------
-// NetDisconnectVoteCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetDisconnectVoteCommandMsg::NetDisconnectVoteCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_DISCONNECTVOTE;
-	m_slot = 0;
-}
-
-/**
- * Destructor
- */
-NetDisconnectVoteCommandMsg::~NetDisconnectVoteCommandMsg() {
-}
-
-/**
- * Set the slot that is being voted for.
- */
-void NetDisconnectVoteCommandMsg::setSlot(UnsignedByte slot) {
-	m_slot = slot;
-}
-
-/**
- * Get the slot that is being voted for.
- */
-UnsignedByte NetDisconnectVoteCommandMsg::getSlot() {
-	return m_slot;
-}
-
-/**
- * Get the vote frame.
- */
-UnsignedInt NetDisconnectVoteCommandMsg::getVoteFrame() {
-	return m_voteFrame;
-}
-
-/**
- * Set the vote frame.
- */
-void NetDisconnectVoteCommandMsg::setVoteFrame(UnsignedInt voteFrame) {
-	m_voteFrame = voteFrame;
-}
-
-//-------------------------
-// NetProgressCommandMsg
-//-------------------------
-NetProgressCommandMsg::NetProgressCommandMsg( void ) : NetCommandMsg()
-{
-	m_commandType = NETCOMMANDTYPE_PROGRESS;
-	m_percent = 0;
-}
-
-NetProgressCommandMsg::~NetProgressCommandMsg( void ) {}
-		
-UnsignedByte NetProgressCommandMsg::getPercentage()
-{
-	return m_percent;
-}
-
-void NetProgressCommandMsg::setPercentage( UnsignedByte percent )
-{
-	m_percent = percent;
-}
-
-//-------------------------
-// NetWrapperCommandMsg
-//-------------------------
-NetWrapperCommandMsg::NetWrapperCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_WRAPPER;
-	m_numChunks = 0;
-	m_data = NULL;
-	m_totalDataLength = 0;
-	m_chunkNumber = 0;
-	m_dataLength = 0;
-	m_dataOffset = 0;
-	m_wrappedCommandID = 0;
-}
-
-NetWrapperCommandMsg::~NetWrapperCommandMsg() {
-	if (m_data != NULL) {
-		delete m_data;
-		m_data = NULL;
-	}
-}
-
-UnsignedByte * NetWrapperCommandMsg::getData() {
-	return m_data;
-}
-
-void NetWrapperCommandMsg::setData(UnsignedByte *data, UnsignedInt dataLength) 
-{
-	if (m_data != NULL) {
-		delete m_data;
-		m_data = NULL;
-	}
-
-	m_data = NEW UnsignedByte[dataLength];	// pool[]ify
-	memcpy(m_data, data, dataLength);
-	m_dataLength = dataLength;
-}
-
-UnsignedInt NetWrapperCommandMsg::getDataLength() {
-	return m_dataLength;
-}
-
-UnsignedInt NetWrapperCommandMsg::getDataOffset() {
-	return m_dataOffset;
-}
-
-void NetWrapperCommandMsg::setDataOffset(UnsignedInt offset) {
-	m_dataOffset = offset;
-}
-
-UnsignedInt NetWrapperCommandMsg::getChunkNumber() {
-	return m_chunkNumber;
-}
-
-void NetWrapperCommandMsg::setChunkNumber(UnsignedInt chunkNumber) {
-	m_chunkNumber = chunkNumber;
-}
-
-UnsignedInt NetWrapperCommandMsg::getNumChunks() {
-	return m_numChunks;
-}
-
-void NetWrapperCommandMsg::setNumChunks(UnsignedInt numChunks) {
-	m_numChunks = numChunks;
-}
-
-UnsignedInt NetWrapperCommandMsg::getTotalDataLength() {
-	return m_totalDataLength;
-}
-
-void NetWrapperCommandMsg::setTotalDataLength(UnsignedInt totalDataLength) {
-	m_totalDataLength = totalDataLength;
-}
-
-UnsignedShort NetWrapperCommandMsg::getWrappedCommandID() {
-	return m_wrappedCommandID;
-}
-
-void NetWrapperCommandMsg::setWrappedCommandID(UnsignedShort wrappedCommandID) {
-	m_wrappedCommandID = wrappedCommandID;
-}
-
-//-------------------------
-// NetFileCommandMsg
-//-------------------------
-NetFileCommandMsg::NetFileCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_FILE;
-	m_data = NULL;
-	m_portableFilename.clear();
-	m_dataLength = 0;
-}
-
-NetFileCommandMsg::~NetFileCommandMsg() {
-	if (m_data != NULL) {
-		delete[] m_data;
-		m_data = NULL;
-	}
-}
-
-AsciiString NetFileCommandMsg::getRealFilename() 
-{
-	return TheGameState->portableMapPathToRealMapPath(m_portableFilename);
-}
-
-void NetFileCommandMsg::setRealFilename(AsciiString filename) 
-{
-	m_portableFilename = TheGameState->realMapPathToPortableMapPath(filename);
-}
-
-UnsignedInt NetFileCommandMsg::getFileLength() {
-	return m_dataLength;
-}
-
-UnsignedByte * NetFileCommandMsg::getFileData() {
-	return m_data;
-}
-
-void NetFileCommandMsg::setFileData(UnsignedByte *data, UnsignedInt dataLength) 
-{
-	m_dataLength = dataLength;
-	m_data = NEW UnsignedByte[dataLength];	// pool[]ify
-	memcpy(m_data, data, dataLength);
-}
-
-//-------------------------
-// NetFileAnnounceCommandMsg
-//-------------------------
-NetFileAnnounceCommandMsg::NetFileAnnounceCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_FILEANNOUNCE;
-	m_portableFilename.clear();
-	m_fileID = 0;
-	m_playerMask = 0;
-}
-
-NetFileAnnounceCommandMsg::~NetFileAnnounceCommandMsg() {
-}
-
-AsciiString NetFileAnnounceCommandMsg::getRealFilename() 
-{
-	return TheGameState->portableMapPathToRealMapPath(m_portableFilename);
-}
-
-void NetFileAnnounceCommandMsg::setRealFilename(AsciiString filename) 
-{
-	m_portableFilename = TheGameState->realMapPathToPortableMapPath(filename);
-}
-
-UnsignedShort NetFileAnnounceCommandMsg::getFileID() {
-	return m_fileID;
-}
-
-void NetFileAnnounceCommandMsg::setFileID(UnsignedShort fileID) {
-	m_fileID = fileID;
-}
-
-UnsignedByte NetFileAnnounceCommandMsg::getPlayerMask(void) {
-	return m_playerMask;
-}
-
-void NetFileAnnounceCommandMsg::setPlayerMask(UnsignedByte playerMask) {
-	m_playerMask = playerMask;
-}
-
-
-//-------------------------
-// NetFileProgressCommandMsg
-//-------------------------
-NetFileProgressCommandMsg::NetFileProgressCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_FILEPROGRESS;
-	m_fileID = 0;
-	m_progress = 0;
-}
-
-NetFileProgressCommandMsg::~NetFileProgressCommandMsg() {
-}
-
-UnsignedShort NetFileProgressCommandMsg::getFileID() {
-	return m_fileID;
-}
-
-void NetFileProgressCommandMsg::setFileID(UnsignedShort val) {
-	m_fileID = val;
-}
-
-Int NetFileProgressCommandMsg::getProgress() {
-	return m_progress;
-}
-
-void NetFileProgressCommandMsg::setProgress(Int val) {
-	m_progress = val;
-}
-
-//-------------------------
-// NetDisconnectFrameCommandMsg
-//-------------------------
-NetDisconnectFrameCommandMsg::NetDisconnectFrameCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_DISCONNECTFRAME;
-	m_disconnectFrame = 0;
-}
-
-NetDisconnectFrameCommandMsg::~NetDisconnectFrameCommandMsg() {
-}
-
-UnsignedInt NetDisconnectFrameCommandMsg::getDisconnectFrame() {
-	return m_disconnectFrame;
-}
-
-void NetDisconnectFrameCommandMsg::setDisconnectFrame(UnsignedInt disconnectFrame) {
-	m_disconnectFrame = disconnectFrame;
-}
-
-//-------------------------
-// NetDisconnectScreenOffCommandMsg
-//-------------------------
-NetDisconnectScreenOffCommandMsg::NetDisconnectScreenOffCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_DISCONNECTSCREENOFF;
-	m_newFrame = 0;
-}
-
-NetDisconnectScreenOffCommandMsg::~NetDisconnectScreenOffCommandMsg() {
-}
-
-UnsignedInt NetDisconnectScreenOffCommandMsg::getNewFrame() {
-	return m_newFrame;
-}
-
-void NetDisconnectScreenOffCommandMsg::setNewFrame(UnsignedInt newFrame) {
-	m_newFrame = newFrame;
-}
-
-//-------------------------
-// NetFrameResendRequestCommandMsg
-//-------------------------
-NetFrameResendRequestCommandMsg::NetFrameResendRequestCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_FRAMERESENDREQUEST;
-	m_frameToResend = 0;
-}
-
-NetFrameResendRequestCommandMsg::~NetFrameResendRequestCommandMsg() {
-}
-
-UnsignedInt NetFrameResendRequestCommandMsg::getFrameToResend() {
-	return m_frameToResend;
-}
-
-void NetFrameResendRequestCommandMsg::setFrameToResend(UnsignedInt frame) {
-	m_frameToResend = frame;
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NetCommandRef.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NetCommandRef.cpp
deleted file mode 100644
index aa2612b7998..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/NetCommandRef.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/NetCommandRef.h"
-
-#ifdef DEBUG_NETCOMMANDREF
-static UnsignedInt refNum = 0;
-#endif
-
-/**
- * Constructor.  Attach to the given network command.
- */
-#ifdef DEBUG_NETCOMMANDREF
-NetCommandRef::NetCommandRef(NetCommandMsg *msg, char *filename, int line)
-#else
-NetCommandRef::NetCommandRef(NetCommandMsg *msg)
-#endif
-{
-	m_msg = msg;
-	m_next = NULL;
-	m_prev = NULL;
-	m_msg->attach();
-	m_timeLastSent = -1;
-
-#ifdef DEBUG_NETCOMMANDREF
-	m_id = ++refNum;
-	DEBUG_LOG(("NetCommandRef %d allocated in file %s line %d\n", m_id, filename, line));
-#endif
-}
-
-/**
- * Destructor. Detach from the network command.
- */
-NetCommandRef::~NetCommandRef() 
-{
-	if (m_msg != NULL) 
-	{
-		m_msg->detach();
-	}
- 	DEBUG_ASSERTCRASH(m_next == NULL, ("NetCommandRef::~NetCommandRef - m_next != NULL"));
-	DEBUG_ASSERTCRASH(m_prev == NULL, ("NetCommandRef::~NetCommandRef - m_prev != NULL"));
-
-#ifdef DEBUG_NETCOMMANDREF
-	DEBUG_LOG(("NetCommandRef %d deleted\n", m_id));
-#endif
-}
-
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp
deleted file mode 100644
index 3eefca96227..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-////// NetCommandWrapperList.cpp ////////////////////////////////
-// Bryan Cleveland
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/NetCommandWrapperList.h"
-#include "GameNetwork/NetPacket.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////// NetCommandWrapperListNode ///////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-NetCommandWrapperListNode::NetCommandWrapperListNode(NetWrapperCommandMsg *msg) 
-{
-	//Added By Sadullah Nader
-	//Initializations inserted
-	m_next = NULL;
-
-	//
-
-	m_numChunks = msg->getNumChunks();
-	m_chunksPresent = NEW Bool[m_numChunks];	// pool[]ify
-	m_numChunksPresent = 0;
-
-	for (UnsignedInt i = 0; i < m_numChunks; ++i) {
-		m_chunksPresent[i] = FALSE;
-	}
-
-	m_dataLength = msg->getTotalDataLength();
-	m_data = NEW UnsignedByte[m_dataLength];	// pool[]ify
-
-	m_commandID = msg->getWrappedCommandID();
-}
-
-NetCommandWrapperListNode::~NetCommandWrapperListNode() {
-	if (m_chunksPresent != NULL) {
-		delete[] m_chunksPresent;
-		m_chunksPresent = NULL;
-	}
-
-	if (m_data != NULL) {
-		delete[] m_data;
-		m_data = NULL;
-	}
-}
-
-Bool NetCommandWrapperListNode::isComplete() {
-	return m_numChunksPresent == m_numChunks;
-}
-
-Int NetCommandWrapperListNode::getPercentComplete(void) {
-	if (isComplete())
-		return 100;
-	else
-		return min(99, REAL_TO_INT( ((Real)m_numChunksPresent)/((Real)m_numChunks)*100.0f ));
-}
-
-UnsignedShort NetCommandWrapperListNode::getCommandID() {
-	return m_commandID;
-}
-
-UnsignedInt NetCommandWrapperListNode::getRawDataLength() {
-	return m_dataLength;
-}
-
-void NetCommandWrapperListNode::copyChunkData(NetWrapperCommandMsg *msg) {
-	if (msg == NULL) {
-		DEBUG_CRASH(("Trying to copy data from a non-existent wrapper command message"));
-		return;
-	}
-
-	DEBUG_ASSERTCRASH(msg->getChunkNumber() < m_numChunks, ("MunkeeChunk %d of %d\n",
-		msg->getChunkNumber(), m_numChunks));
-	if (msg->getChunkNumber() >= m_numChunks)
-		return;
-
-	DEBUG_LOG(("NetCommandWrapperListNode::copyChunkData() - copying chunk %d\n",
-		msg->getChunkNumber()));
-
-	if (m_chunksPresent[msg->getChunkNumber()] == TRUE) {
-		// we already received this chunk, no need to recopy it.
-		return;
-	}
-
-	m_chunksPresent[msg->getChunkNumber()] = TRUE;
-	UnsignedInt offset = msg->getDataOffset();
-	memcpy(m_data + offset, msg->getData(), msg->getDataLength());
-	++m_numChunksPresent;
-}
-
-UnsignedByte * NetCommandWrapperListNode::getRawData() {
-	return m_data;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////// NetCommandWrapperList ///////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-NetCommandWrapperList::NetCommandWrapperList() {
-	m_list = NULL;
-}
-
-NetCommandWrapperList::~NetCommandWrapperList() {
-	NetCommandWrapperListNode *temp;
-	while (m_list != NULL) {
-		temp = m_list->m_next;
-		deleteInstance(m_list);
-		m_list = temp;
-	}
-}
-
-void NetCommandWrapperList::init() {
-	m_list = NULL;
-}
-
-void NetCommandWrapperList::reset() {
-	NetCommandWrapperListNode *temp;
-	while (m_list != NULL) {
-		temp = m_list->m_next;
-		deleteInstance(m_list);
-		m_list = temp;
-	}
-}
-
-Int NetCommandWrapperList::getPercentComplete(UnsignedShort wrappedCommandID)
-{
-	NetCommandWrapperListNode *temp = m_list;
-
-	while ((temp != NULL) && (temp->getCommandID() != wrappedCommandID)) {
-		temp = temp->m_next;
-	}
-
-	if (!temp)
-		return 0;
-
-	return temp->getPercentComplete();
-}
-
-void NetCommandWrapperList::processWrapper(NetCommandRef *ref) {
-	NetCommandWrapperListNode *temp = m_list;
-	NetWrapperCommandMsg *msg = (NetWrapperCommandMsg *)(ref->getCommand());
-
-	while ((temp != NULL) && (temp->getCommandID() != msg->getWrappedCommandID())) {
-		temp = temp->m_next;
-	}
-
-	if (temp == NULL) {
-		temp = newInstance(NetCommandWrapperListNode)(msg);
-		temp->m_next = m_list;
-		m_list = temp;
-	}
-
-	temp->copyChunkData(msg);
-}
-
-NetCommandList * NetCommandWrapperList::getReadyCommands() 
-{
-	NetCommandList *retlist = newInstance(NetCommandList);
-	retlist->init();
-
-	NetCommandWrapperListNode *temp = m_list;
-	NetCommandWrapperListNode *next = NULL;
-
-	while (temp != NULL) {
-		next = temp->m_next;
-		if (temp->isComplete()) {
-			NetCommandRef *msg = NetPacket::ConstructNetCommandMsgFromRawData(temp->getRawData(), temp->getRawDataLength());
-			NetCommandRef *ret = retlist->addMessage(msg->getCommand());
-			ret->setRelay(msg->getRelay());
-
-			deleteInstance(msg);
-			msg = NULL;
-
-			removeFromList(temp);
-			temp = NULL;
-		}
-		temp = next;
-	}
-
-	return retlist;
-}
-
-void NetCommandWrapperList::removeFromList(NetCommandWrapperListNode *node) {
-	if (node == NULL) {
-		return;
-	}
-
-	NetCommandWrapperListNode *temp = m_list;
-	NetCommandWrapperListNode *prev = NULL;
-
-	while ((temp != NULL) && (temp->getCommandID() != node->getCommandID())) {
-		prev = temp;
-		temp = temp->m_next;
-	}
-
-	if (temp == NULL) {
-		return;
-	}
-
-	if (prev == NULL) {
-		m_list = temp->m_next;
-		deleteInstance(temp);
-		temp = NULL;
-	} else {
-		prev->m_next = temp->m_next;
-		deleteInstance(temp);
-		temp = NULL;
-	}
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NetMessageStream.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NetMessageStream.cpp
deleted file mode 100644
index 36044f3c826..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/NetMessageStream.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-
-// NetMessageStream.cpp
-// Holds misc functions to encapsulate GameMessages into Command Packets to send
-// over the network.
-// Author: Matthew D. Campbell, July 2001
-/*
-#include "stdlib.h"				// VC++ wants this here, or gives compile error...
-
-#include "Common/GameType.h"
-#include "Common/MessageStream.h"
-#include "Common/GameEngine.h"
-#include "GameLogic/GameLogic.h"
-#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/NetworkDefs.h"
-
-
-
-// The per-player pointers for the list of commands
-static CommandMsg *CommandHead[MAX_SLOTS] = {  /// @todo: remove static initialization
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-static CommandMsg *CommandTail[MAX_SLOTS] = {
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
-/**
- * AddToNetCommandList adds a CommandMsg to a list of commands.
- *
-static Bool AddToNetCommandList(GameMessage *msg, UnsignedInt timestamp, CommandMsg *& CommandHead, CommandMsg *& CommandTail)
-{
-	CommandMsg *cmdMsg = NEW CommandMsg(timestamp, msg);
-	if (!cmdMsg)
-	{
-		DEBUG_LOG(("Alloc failed!\n"));
-		return false;
-	}
-
-	if (CommandTail == NULL)
-	{
-		CommandHead = cmdMsg;
-		CommandTail = cmdMsg;
-	}
-	else
-	{
-		cmdMsg->SetPrevCommandMsg(CommandTail);
-		CommandTail->SetNextCommandMsg(cmdMsg);
-		CommandTail = cmdMsg;
-	}
-
-	return true;
-}
-
-/**
- * AddToRemoteNetCommandList is used by TheNetwork to queue up commands recieved from other players.
- *
-Bool AddToNetCommandList(Int playerNum, GameMessage *msg, UnsignedInt timestamp)
-{
-	if (playerNum < 0 || playerNum >= MAX_SLOTS)
-		return false;
-
-	DEBUG_LOG(("Adding msg to NetCommandList %d\n", playerNum));
-	return AddToNetCommandList(msg, timestamp, CommandHead[playerNum], CommandTail[playerNum]);
-}
-
-/**
- * GetCommandMsg returns a GameMessage (deleting its CommandMsg wrapper) that is valid
- * for the current frame, or NULL.
- *
-static GameMessage * GetCommandMsg(UnsignedInt timestamp, CommandMsg *& CommandHead, CommandMsg *& CommandTail)
-{
-	if (!CommandHead)
-		return NULL;
-
-	if (CommandHead->GetTimestamp() < timestamp)
-	{
-		DEBUG_LOG(("Time is %d, yet message timestamp is %d!\n", timestamp, CommandHead->GetTimestamp()));
-		return NULL;
-	}
-
-	if (CommandHead->GetTimestamp() != timestamp)
-		return NULL;
-
-	CommandMsg *theMsg = CommandHead;
-
-	if (CommandHead->GetNextCommandMsg())
-	{
-		CommandHead->GetNextCommandMsg()->SetPrevCommandMsg(NULL);
-		CommandHead = CommandHead->GetNextCommandMsg();
-	}
-	else
-	{
-		CommandHead = CommandTail = NULL;
-	}
-
-	GameMessage *msg = theMsg->GetGameMessage();
-	delete theMsg;
-	return msg;
-}
-
-/**
- * GetCommandMsg returns a message from the command list.
- *
-GameMessage * GetCommandMsg(UnsignedInt timestamp, Int playerNum)
-{
-	if (playerNum < 0 || playerNum >= MAX_SLOTS)
-		return NULL;
-
-	//DEBUG_LOG(("Adding msg to NetCommandList %d\n", playerNum));
-	return GetCommandMsg(timestamp, CommandHead[playerNum], CommandTail[playerNum]);
-}
-
-
-
-
-//====================================================================================
-
-// The commandBuf & commandPacket hold the commands we're building up for the frame.
-static unsigned char commandBuf[sizeof(CommandPacket)+1];
-static CommandPacket *commandPacket = (CommandPacket *)(commandBuf+1);
-
-/**
- * ClearCommandPacket clears the command packet at the start of the frame.
- *
-void ClearCommandPacket(UnsignedInt frame)
-{
-	commandPacket->m_frame = frame;
-	commandPacket->m_numCommands = 0;
-}
-
-/**
- * AddCommandToPacket creates a packet containing all move/attack/etc commands
- * for the current frame.
- *
-Bool AddCommandToPacket(const GameMessage *msg)
-{
-	int messageSize = sizeofMessageHeader + sizeofMessageArg * msg->getArgumentCount();
-
-	// If we have too much, send what we have
-	if (bytesUsed && (bytesUsed + sizeof(CommandPacketHeader) + messageSize >= MAX_MESSAGE_LEN))
-	{
-		commandBuf[0] = MSGTYPE_PARTIALCOMMAND;
-		if (!TheNetwork->queueSend(BROADCAST_CON, commandBuf, bytesUsed + sizeof(CommandPacketHeader) + 1, MSG_NEEDACK | MSG_SEQUENCED))
-		{
-			//DEBUG_ASSERTCRASH(false, ("Too many commands in one frame!  Some will be dropped."));
-			DEBUG_LOG(("Too many commands in one frame!  Some will be dropped."));
-			return false;
-		}
-		commandBuf[0] = MSGTYPE_COMMANDCOUNT;
-		commandPacket->header.m_numCommands = 0;
-		bytesUsed = 0;
-	}
-
-	if (bytesUsed + sizeof(CommandPacketHeader) + messageSize >= MAX_MESSAGE_LEN)
-	{
-		//DEBUG_ASSERTCRASH(false, ("Too many commands in one frame!  Some will be dropped."));
-		DEBUG_LOG(("Too many commands in one frame!  Some will be dropped."));
-		return false;
-	}
-
-	// We have room, so add the message
-	commandPacket->header.m_numCommands++;
-	commandPacket->m_commands[bytesUsed++] = (unsigned char)msg->getType();
-	commandPacket->m_commands[bytesUsed++] = msg->getArgumentCount();
-
-	for (int i=0; i<msg->getArgumentCount(); ++i)
-	{
-		memcpy((unsigned char *)(commandPacket->m_commands + bytesUsed), (unsigned char *)msg->getArgument(i), sizeofMessageArg);
-		bytesUsed += sizeofMessageArg;
-	}
-
-	//DEBUG_ASSERTCRASH(bytesUsed + sizeof(CommandPacketHeader) < MAX_MESSAGE_LEN, ("Memory overwrite constructing command packet!"));
-	//DEBUG_LOG(("Memory overwrite constructing command packet!"));
-	return true;
-}
-
-/**
- * TheNetwork calls GetCommandPacket to get commands to send.
- *
-CommandPacket *GetCommandPacket(void)
-{
-	commandBuf[0] = MSGTYPE_COMMANDCOUNT;
-	return commandPacket;
-}
-
-//====================================================================================
-
-*/
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NetPacket.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NetPacket.cpp
deleted file mode 100644
index 39367ca6879..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/NetPacket.cpp
+++ /dev/null
@@ -1,5858 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-////////// NetPacket.cpp ///////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/NetPacket.h"
-#include "GameNetwork/NetCommandMsg.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/networkutil.h"
-#include "GameNetwork/GameMessageParser.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// This function assumes that all of the fields are either of default value or are
-// present in the raw data.
-NetCommandRef * NetPacket::ConstructNetCommandMsgFromRawData(UnsignedByte *data, UnsignedShort dataLength) {
-	NetCommandType commandType = NETCOMMANDTYPE_GAMECOMMAND;
-	UnsignedShort commandID = 0;
-	UnsignedInt frame = 0;
-	UnsignedByte playerID = 0;
-	UnsignedByte relay = 0;
-
-	Int offset = 0;
-	Bool notDone = TRUE;
-	NetCommandRef *ref = NULL;
-	NetCommandMsg *msg = NULL;
-
-	while ((offset < (Int)dataLength) && notDone) {
-		if (data[offset] == 'T') {
-			++offset;
-			memcpy(&commandType, data + offset, sizeof(UnsignedByte));
-			offset += sizeof(UnsignedByte);
-		} else if (data[offset] == 'R') {
-			++offset;
-			memcpy(&relay, data + offset, sizeof(UnsignedByte));
-			offset += sizeof(UnsignedByte);
-		} else if (data[offset] == 'P') {
-			++offset;
-			memcpy(&playerID, data + offset, sizeof(UnsignedByte));
-			offset += sizeof(UnsignedByte);
-		} else if (data[offset] == 'C') {
-			++offset;
-			memcpy(&commandID, data + offset, sizeof(UnsignedShort));
-			offset += sizeof(UnsignedShort);
-		} else if (data[offset] == 'F') {
-			++offset;
-			memcpy(&frame, data + offset, sizeof(UnsignedInt));
-			offset += sizeof(UnsignedInt);
-		} else if (data[offset] == 'D') {
-			++offset;
-			if (commandType == NETCOMMANDTYPE_GAMECOMMAND) {
-				msg = readGameMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_ACKBOTH) {
-				msg = readAckBothMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_ACKSTAGE1) {
-				msg = readAckStage1Message(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_ACKSTAGE2) {
-				msg = readAckStage2Message(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_FRAMEINFO) {
-				msg = readFrameMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_PLAYERLEAVE) {
-				msg = readPlayerLeaveMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_RUNAHEADMETRICS) {
-				msg = readRunAheadMetricsMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_RUNAHEAD) {
-				msg = readRunAheadMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DESTROYPLAYER) {
-				msg = readDestroyPlayerMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_KEEPALIVE) {
-				msg = readKeepAliveMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DISCONNECTKEEPALIVE) {
-				msg = readDisconnectKeepAliveMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DISCONNECTPLAYER) {
-				msg = readDisconnectPlayerMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_PACKETROUTERQUERY) {
-				msg = readPacketRouterQueryMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_PACKETROUTERACK) {
-				msg = readPacketRouterAckMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DISCONNECTCHAT) {
-				msg = readDisconnectChatMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DISCONNECTVOTE) {
-				msg = readDisconnectVoteMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_CHAT) {
-				msg = readChatMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_PROGRESS) {
-				msg = readProgressMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_LOADCOMPLETE) {
-				msg = readLoadCompleteMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_TIMEOUTSTART) {
-				msg = readTimeOutGameStartMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_WRAPPER) {
-				msg = readWrapperMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_FILE) {
-				msg = readFileMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_FILEANNOUNCE) {
-				msg = readFileAnnounceMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_FILEPROGRESS) {
-				msg = readFileProgressMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DISCONNECTFRAME) {
-				msg = readDisconnectFrameMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DISCONNECTSCREENOFF) {
-				msg = readDisconnectScreenOffMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_FRAMERESENDREQUEST) {
-				msg = readFrameResendRequestMessage(data, offset);
-			}
-
-			msg->setExecutionFrame(frame);
-			msg->setID(commandID);
-			msg->setPlayerID(playerID);
-			msg->setNetCommandType(commandType);
-
-			ref = NEW_NETCOMMANDREF(msg);
-
-			ref->setRelay(relay);
-
-			msg->detach();
-			msg = NULL;
-
-			notDone = FALSE;
-		}
-	}
-
-	return ref;
-}
-
-NetPacketList NetPacket::ConstructBigCommandPacketList(NetCommandRef *ref) {
-	// if we don't have a unique command ID, then the wrapped command cannot
-	// be identified.  Therefore don't allow commands without a unique ID to
-	// be wrapped.
-	NetCommandMsg *msg = ref->getCommand();
-
-	if (!DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		DEBUG_CRASH(("Trying to wrap a command that doesn't have a unique command ID"));
-		return NetPacketList();
-	}
-
-	UnsignedInt bufferSize = GetBufferSizeNeededForCommand(msg);  // need to implement.  I have a drinking problem.
-	UnsignedByte *bigPacketData = NULL;
-
-	NetPacketList packetList;
-
-	// create the buffer for the huge message and fill the buffer with that message.
-	UnsignedInt bigPacketCurrentOffset = 0;
-	bigPacketData = NEW UnsignedByte[bufferSize];
-	FillBufferWithCommand(bigPacketData, ref);
-
-	// create the wrapper command message we'll be using.
-	NetWrapperCommandMsg *wrapperMsg = newInstance(NetWrapperCommandMsg);
-	// get the amount of space needed for the wrapper message, not including the wrapped command data.
-	UnsignedInt wrapperSize = GetBufferSizeNeededForCommand(wrapperMsg);
-	UnsignedInt commandSizePerPacket = MAX_PACKET_SIZE - wrapperSize;
-
-	UnsignedInt numChunks = bufferSize / commandSizePerPacket;
-	if ((bufferSize % commandSizePerPacket) > 0) {
-		++numChunks;
-	}
-	UnsignedInt currentChunk = 0;
-
-	// create the packets and the wrapper messages.
-	while (currentChunk < numChunks) {
-		NetPacket *packet = newInstance(NetPacket);
-
-		UnsignedShort dataSizeThisPacket = commandSizePerPacket;
-		if ((bufferSize - bigPacketCurrentOffset) < dataSizeThisPacket) {
-			dataSizeThisPacket = bufferSize - bigPacketCurrentOffset;
-		}
-
-		if (DoesCommandRequireACommandID(wrapperMsg->getNetCommandType())) {
-			wrapperMsg->setID(GenerateNextCommandID());
-		}
-		wrapperMsg->setPlayerID(msg->getPlayerID());
-		wrapperMsg->setExecutionFrame(msg->getExecutionFrame());
-
-		wrapperMsg->setChunkNumber(currentChunk);
-		wrapperMsg->setNumChunks(numChunks);
-		wrapperMsg->setDataOffset(bigPacketCurrentOffset);
-		wrapperMsg->setData(bigPacketData + bigPacketCurrentOffset, dataSizeThisPacket);
-		wrapperMsg->setTotalDataLength(bufferSize);
-		wrapperMsg->setWrappedCommandID(msg->getID());
-
-		bigPacketCurrentOffset += dataSizeThisPacket;
-
-		NetCommandRef * ref = NEW_NETCOMMANDREF(wrapperMsg);
-		ref->setRelay(ref->getRelay());
-
-		if (packet->addCommand(ref) == FALSE) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::BeginBigCommandPacketList - failed to add a wrapper command to the packet\n")); // I still have a drinking problem.
-		}
-
-		packetList.push_back(packet);
-
-		deleteInstance(ref);
-		ref = NULL;
-
-		++currentChunk;
-	}
-	wrapperMsg->detach();
-	wrapperMsg = NULL;
-
-	delete[] bigPacketData;
-	bigPacketData = NULL;
-
-	return packetList;
-}
-
-UnsignedInt NetPacket::GetBufferSizeNeededForCommand(NetCommandMsg *msg) {
-	// This is where the fun begins...
-
-	if (msg == NULL) {
-		return TRUE; // There was nothing to add, so it was successful.
-	}
-
-	switch(msg->getNetCommandType())
-	{
-		case NETCOMMANDTYPE_GAMECOMMAND:
-			return GetGameCommandSize(msg);
-		case NETCOMMANDTYPE_ACKSTAGE1:
-		case NETCOMMANDTYPE_ACKSTAGE2:
-		case NETCOMMANDTYPE_ACKBOTH:
-			return GetAckCommandSize(msg);
-		case NETCOMMANDTYPE_FRAMEINFO:
-			return GetFrameCommandSize(msg);
-		case NETCOMMANDTYPE_PLAYERLEAVE:
-			return GetPlayerLeaveCommandSize(msg);
-		case NETCOMMANDTYPE_RUNAHEADMETRICS:
-			return GetRunAheadMetricsCommandSize(msg);
-		case NETCOMMANDTYPE_RUNAHEAD:
-			return GetRunAheadCommandSize(msg);
-		case NETCOMMANDTYPE_DESTROYPLAYER:
-			return GetDestroyPlayerCommandSize(msg);
-		case NETCOMMANDTYPE_KEEPALIVE:
-			return GetKeepAliveCommandSize(msg);
-		case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
-			return GetDisconnectKeepAliveCommandSize(msg);
-		case NETCOMMANDTYPE_DISCONNECTPLAYER:
-			return GetDisconnectPlayerCommandSize(msg);
-		case NETCOMMANDTYPE_PACKETROUTERQUERY:
-			return GetPacketRouterQueryCommandSize(msg);
-		case NETCOMMANDTYPE_PACKETROUTERACK:
-			return GetPacketRouterAckCommandSize(msg);
-		case NETCOMMANDTYPE_DISCONNECTCHAT:
-			return GetDisconnectChatCommandSize(msg);
-		case NETCOMMANDTYPE_DISCONNECTVOTE:
-			return GetDisconnectVoteCommandSize(msg);
-		case NETCOMMANDTYPE_CHAT:
-			return GetChatCommandSize(msg);
-		case NETCOMMANDTYPE_PROGRESS:
-			return GetProgressMessageSize(msg);
-		case NETCOMMANDTYPE_LOADCOMPLETE:
-			return GetLoadCompleteMessageSize(msg);
-		case NETCOMMANDTYPE_TIMEOUTSTART:
-			return GetTimeOutGameStartMessageSize(msg);
-		case NETCOMMANDTYPE_WRAPPER:
-			return GetWrapperCommandSize(msg);
-		case NETCOMMANDTYPE_FILE:
-			return GetFileCommandSize(msg);
-		case NETCOMMANDTYPE_FILEANNOUNCE:
-			return GetFileAnnounceCommandSize(msg);
-		case NETCOMMANDTYPE_FILEPROGRESS:
-			return GetFileProgressCommandSize(msg);
-		case NETCOMMANDTYPE_DISCONNECTFRAME:
-			return GetDisconnectFrameCommandSize(msg);
-		case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
-			return GetDisconnectScreenOffCommandSize(msg);
-		case NETCOMMANDTYPE_FRAMERESENDREQUEST:
-			return GetFrameResendRequestCommandSize(msg);
-		default:
-			DEBUG_CRASH(("Unknown NETCOMMANDTYPE %d", msg->getNetCommandType()));
-			break;
-	}
-
-	return 0;
-}
-
-UnsignedInt NetPacket::GetGameCommandSize(NetCommandMsg *msg) {
-	NetGameCommandMsg *cmdMsg = (NetGameCommandMsg *)msg;
-
-	UnsignedShort msglen = 0;
-	msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte); // frame number
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // relay
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // command type
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte); // command ID
-	msglen += sizeof(UnsignedByte); // the 'D' for the data section.
-
-	GameMessage *gmsg = cmdMsg->constructGameMessage();
-	GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
-
-	msglen += sizeof(GameMessage::Type);
-	msglen += sizeof(UnsignedByte);
-//	Int numTypes = parser->getNumTypes();
-	GameMessageParserArgumentType *arg = parser->getFirstArgumentType();
-	while (arg != NULL) {
-		msglen += 2 * sizeof(UnsignedByte); // for the type and number of args of that type declaration.
-		GameMessageArgumentDataType type = arg->getType();
-		if (type == ARGUMENTDATATYPE_INTEGER) {
-			msglen += arg->getArgCount() * sizeof(Int);
-		} else if (type == ARGUMENTDATATYPE_REAL) {
-			msglen += arg->getArgCount() * sizeof(Real);
-		} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-			msglen += arg->getArgCount() * sizeof(Bool);
-		} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-			msglen += arg->getArgCount() * sizeof(ObjectID);
-		} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-			msglen += arg->getArgCount() * sizeof(DrawableID);
-		} else if (type == ARGUMENTDATATYPE_TEAMID) {
-			msglen += arg->getArgCount() * sizeof(UnsignedInt);
-		} else if (type == ARGUMENTDATATYPE_LOCATION) {
-			msglen += arg->getArgCount() * sizeof(Coord3D);
-		} else if (type == ARGUMENTDATATYPE_PIXEL) {
-			msglen += arg->getArgCount() * sizeof(ICoord2D);
-		} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-			msglen += arg->getArgCount() * sizeof(IRegion2D);
-		} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {
-			msglen += arg->getArgCount() * sizeof(UnsignedInt);
-		} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-			msglen += arg->getArgCount() * sizeof(WideChar);
-		}
-		arg = arg->getNext();
-	}
-
-	deleteInstance(parser);
-	parser = NULL;
-
-	deleteInstance(gmsg);
-	gmsg = NULL;
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetAckCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen;
-	msglen += sizeof(UnsignedShort);
-	msglen += sizeof(UnsignedByte);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetFrameCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen;
-	msglen += sizeof(UnsignedShort);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetPlayerLeaveCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetRunAheadMetricsCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(Real);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetRunAheadCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen;
-	msglen += sizeof(UnsignedShort);
-	msglen += sizeof(UnsignedByte);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDestroyPlayerCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen;
-	msglen += sizeof(UnsignedInt);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetKeepAliveCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // For the 'D'
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDisconnectKeepAliveCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // For the 'D'
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDisconnectPlayerCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen; // the 'D'
-	msglen += sizeof(UnsignedByte); // slot number
-	msglen += sizeof(UnsignedInt);	// disconnect frame
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetPacketRouterQueryCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // the 'D'
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetPacketRouterAckCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // the 'D'
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDisconnectChatCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-	NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg);
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // the 'D'
-	msglen += sizeof(UnsignedByte); // string msglength
-	UnsignedByte textmsglen = cmdMsg->getText().getLength();
-	msglen += textmsglen * sizeof(UnsignedShort);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDisconnectVoteCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen; // the 'D'
-	msglen += sizeof(UnsignedByte); // slot number
-	msglen += sizeof(UnsignedInt); // vote frame.
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetChatCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-	NetChatCommandMsg *cmdMsg = (NetChatCommandMsg *)(msg);
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen; // the 'D'
-	msglen += sizeof(UnsignedByte); // string msglength
-	UnsignedByte textmsglen = cmdMsg->getText().getLength();
-	msglen += textmsglen * sizeof(UnsignedShort);
-	msglen += sizeof(Int); // playerMask
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetProgressMessageSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // For the 'D'
-	++msglen; // percentage
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetLoadCompleteMessageSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // For the 'D'
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetTimeOutGameStartMessageSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // For the 'D'
-
-	return msglen;
-}
-
-// type, player, ID, relay, Data
-UnsignedInt NetPacket::GetWrapperCommandSize(NetCommandMsg *msg) {
-	UnsignedInt msglen = 0;
-
-	++msglen; // 'T'
-	msglen += sizeof(UnsignedByte); // command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay
-	++msglen; // 'D'
-
-	msglen += sizeof(UnsignedShort); // m_wrappedCommandID
-	msglen += sizeof(UnsignedInt); // m_chunkNumber
-	msglen += sizeof(UnsignedInt); // m_numChunks
-	msglen += sizeof(UnsignedInt); // m_totalDataLength
-	msglen += sizeof(UnsignedInt); // m_dataLength
-	msglen += sizeof(UnsignedInt); // m_dataOffset
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetFileCommandSize(NetCommandMsg *msg) {
-	NetFileCommandMsg *filemsg = (NetFileCommandMsg *)msg;
-	UnsignedInt msglen = 0;
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay
-
-	++msglen; // 'D'
-
-	msglen += filemsg->getPortableFilename().getLength() + 1; // PORTABLE filename and the terminating 0
-	msglen += sizeof(UnsignedInt); // file data length
-	msglen += filemsg->getFileLength(); // the file data
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetFileAnnounceCommandSize(NetCommandMsg *msg) {
-	NetFileAnnounceCommandMsg *filemsg = (NetFileAnnounceCommandMsg *)msg;
-	UnsignedInt msglen = 0;
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay
-
-	++msglen; // 'D'
-
-	msglen += filemsg->getPortableFilename().getLength() + 1; // PORTABLE filename and the terminating 0
-	msglen += sizeof(UnsignedShort); // m_fileID
-	msglen += sizeof(UnsignedByte); // m_playerMask
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetFileProgressCommandSize(NetCommandMsg *msg) {
-	UnsignedInt msglen = 0;
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay
-
-	++msglen; // 'D'
-
-	msglen += sizeof(UnsignedShort); // m_fileID
-	msglen += sizeof(Int); // m_progress
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDisconnectFrameCommandSize(NetCommandMsg *msg) {
-	UnsignedInt msglen = 0;
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'T' and command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'R' and relay
-
-	++msglen; // 'D'
-	msglen += sizeof(UnsignedInt); // disconnect frame
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDisconnectScreenOffCommandSize(NetCommandMsg *msg) {
-	UnsignedInt msglen = 0;
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'T' and command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'R' and relay
-
-	++msglen; // 'D'
-	msglen += sizeof(UnsignedInt); // new frame
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetFrameResendRequestCommandSize(NetCommandMsg *msg) {
-	UnsignedInt msglen = 0;
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'T' and command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'R' and relay
-
-	++msglen; // 'D'
-	msglen += sizeof(UnsignedInt); // frame to resend
-
-	return msglen;
-}
-
-// this function assumes that buffer is already the correct size.
-void NetPacket::FillBufferWithCommand(UnsignedByte *buffer, NetCommandRef *ref) {
-	NetCommandMsg *msg = ref->getCommand();
-
-	switch(msg->getNetCommandType())
-	{
-		case NETCOMMANDTYPE_GAMECOMMAND:
-			FillBufferWithGameCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_ACKSTAGE1:
-		case NETCOMMANDTYPE_ACKSTAGE2:
-		case NETCOMMANDTYPE_ACKBOTH:
-			FillBufferWithAckCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_FRAMEINFO:
-			FillBufferWithFrameCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_PLAYERLEAVE:
-			FillBufferWithPlayerLeaveCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_RUNAHEADMETRICS:
-			FillBufferWithRunAheadMetricsCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_RUNAHEAD:
-			FillBufferWithRunAheadCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DESTROYPLAYER:
-			FillBufferWithDestroyPlayerCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_KEEPALIVE:
-			FillBufferWithKeepAliveCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
-			FillBufferWithDisconnectKeepAliveCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DISCONNECTPLAYER:
-			FillBufferWithDisconnectPlayerCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_PACKETROUTERQUERY:
-			FillBufferWithPacketRouterQueryCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_PACKETROUTERACK:
-			FillBufferWithPacketRouterAckCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DISCONNECTCHAT:
-			FillBufferWithDisconnectChatCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DISCONNECTVOTE:
-			FillBufferWithDisconnectVoteCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_CHAT:
-			FillBufferWithChatCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_PROGRESS:
-			FillBufferWithProgressMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_LOADCOMPLETE:
-			FillBufferWithLoadCompleteMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_TIMEOUTSTART:
-			FillBufferWithTimeOutGameStartMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_FILE:
-			FillBufferWithFileMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_FILEANNOUNCE:
-			FillBufferWithFileAnnounceMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_FILEPROGRESS:
-			FillBufferWithFileProgressMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DISCONNECTFRAME:
-			FillBufferWithDisconnectFrameMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
-			FillBufferWithDisconnectScreenOffMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_FRAMERESENDREQUEST:
-			FillBufferWithFrameResendRequestMessage(buffer, ref);
-			break;
-		default:
-			DEBUG_CRASH(("Unknown NETCOMMANDTYPE %d", msg->getNetCommandType()));
-			break;
-	}
-}
-
-void NetPacket::FillBufferWithGameCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetGameCommandMsg *cmdMsg = (NetGameCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-	// get the game message from the NetCommandMsg
-	GameMessage *gmsg = cmdMsg->constructGameMessage();
-
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithGameCommand for command ID %d\n", cmdMsg->getID()));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, put the execution frame into the packet.
-	buffer[offset] = 'F';
-	++offset;
-	UnsignedInt newframe = cmdMsg->getExecutionFrame();
-	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-
-	// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, put the playerID into the packet.
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-	buffer[offset] = 'D';
-	++offset;
-
-	// Now copy the GameMessage type into the packet.
-	GameMessage::Type newType = gmsg->getType();
-	memcpy(buffer + offset, &newType, sizeof(GameMessage::Type));
-	offset += sizeof(GameMessage::Type);
-
-
-	GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
-	UnsignedByte numTypes = parser->getNumTypes();
-	memcpy(buffer + offset, &numTypes, sizeof(numTypes));
-	offset += sizeof(numTypes);
-
-	GameMessageParserArgumentType *argType = parser->getFirstArgumentType();
-	while (argType != NULL) {
-		UnsignedByte type = (UnsignedByte)(argType->getType());
-		memcpy(buffer + offset, &type, sizeof(type));
-		offset += sizeof(type);
-
-		UnsignedByte argTypeCount = argType->getArgCount();
-		memcpy(buffer + offset, &argTypeCount, sizeof(argTypeCount));
-		offset += sizeof(argTypeCount);
-
-		argType = argType->getNext();
-	}
-
-	Int numArgs = gmsg->getArgumentCount();
-	for (Int i = 0; i < numArgs; ++i) {
-		GameMessageArgumentDataType type = gmsg->getArgumentDataType(i);
-		GameMessageArgumentType arg = *(gmsg->getArgument(i));
-//		writeGameMessageArgumentToPacket(type, arg);
-
-		if (type == ARGUMENTDATATYPE_INTEGER) {
-			memcpy(buffer + offset, &(arg.integer), sizeof(arg.integer));
-			offset += sizeof(arg.integer);
-		} else if (type == ARGUMENTDATATYPE_REAL) {
-			memcpy(buffer + offset, &(arg.real), sizeof(arg.real));
-			offset += sizeof(arg.real);
-		} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-			memcpy(buffer + offset, &(arg.boolean), sizeof(arg.boolean));
-			offset += sizeof(arg.boolean);
-		} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-			memcpy(buffer + offset, &(arg.objectID), sizeof(arg.objectID));
-			offset += sizeof(arg.objectID);
-		} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-			memcpy(buffer + offset, &(arg.drawableID), sizeof(arg.drawableID));
-			offset += sizeof(arg.drawableID);
-		} else if (type == ARGUMENTDATATYPE_TEAMID) {
-			memcpy(buffer + offset, &(arg.teamID), sizeof(arg.teamID));
-			offset += sizeof(arg.teamID);
-		} else if (type == ARGUMENTDATATYPE_LOCATION) {
-			memcpy(buffer + offset, &(arg.location), sizeof(arg.location));
-			offset += sizeof(arg.location);
-		} else if (type == ARGUMENTDATATYPE_PIXEL) {
-			memcpy(buffer + offset, &(arg.pixel), sizeof(arg.pixel));
-			offset += sizeof(arg.pixel);
-		} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-			memcpy(buffer + offset, &(arg.pixelRegion), sizeof(arg.pixelRegion));
-			offset += sizeof(arg.pixelRegion);
-		} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {
-			memcpy(buffer + offset, &(arg.timestamp), sizeof(arg.timestamp));
-			offset += sizeof(arg.timestamp);
-		} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-			memcpy(buffer + offset, &(arg.wChar), sizeof(arg.wChar));
-			offset += sizeof(arg.wChar);
-		}
-	}
-
-	deleteInstance(parser);
-	parser = NULL;
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addGameMessage - added game message, frame %d, player %d, command ID %d\n", m_lastFrame, m_lastPlayerID, m_lastCommandID));
-
-	if (gmsg)
-		deleteInstance(gmsg);
-	gmsg = NULL;
-}
-
-void NetPacket::FillBufferWithAckCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithAckCommand - adding ack for command %d for player %d\n", cmdMsg->getCommandID(), msg->getCommand()->getPlayerID()));
-
-	NetCommandMsg *cmdMsg = msg->getCommand();
-	UnsignedShort offset = 0;
-
-	UnsignedShort commandID = 0;
-	UnsignedByte originalPlayerID = 0;
-
-	if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
-		NetAckBothCommandMsg *ackmsg = (NetAckBothCommandMsg *)msg;
-		commandID = ackmsg->getCommandID();
-		originalPlayerID = ackmsg->getOriginalPlayerID();
-	} else if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) {
-		NetAckStage1CommandMsg *ackmsg = (NetAckStage1CommandMsg *)msg;
-		commandID = ackmsg->getCommandID();
-		originalPlayerID = ackmsg->getOriginalPlayerID();
-	} else if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) {
-		NetAckStage2CommandMsg *ackmsg = (NetAckStage2CommandMsg *)msg;
-		commandID = ackmsg->getCommandID();
-		originalPlayerID = ackmsg->getOriginalPlayerID();
-	}
-
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// Put in the command id of the command we are acking.
-	buffer[offset] = 'D';
-	++offset;
-	memcpy(buffer + offset, &commandID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-	memcpy(buffer + offset, &originalPlayerID, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added ACK, original player %d, command id %d\n", origPlayerID, cmdID));
-}
-
-void NetPacket::FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetFrameCommandMsg *cmdMsg = (NetFrameCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-	//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addFrameCommand - adding frame command for frame %d, command count = %d, command id = %d\n", cmdMsg->getExecutionFrame(), cmdMsg->getCommandCount(), cmdMsg->getID()));
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the execution frame into the packet.
-	buffer[offset] = 'F';
-	++offset;
-	UnsignedInt newframe = cmdMsg->getExecutionFrame();
-	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnsignedShort cmdCount = cmdMsg->getCommandCount();
-	memcpy(buffer + offset, &cmdCount, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-	// frameinfodebug
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added frame %d, player %d, command count = %d, command id = %d\n", cmdMsg->getExecutionFrame(), cmdMsg->getPlayerID(), cmdMsg->getCommandCount(), cmdMsg->getID()));
-}
-
-void NetPacket::FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetPlayerLeaveCommandMsg *cmdMsg = (NetPlayerLeaveCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPlayerLeaveCommand - adding player leave command for player %d\n", cmdMsg->getLeavingPlayerID()));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the execution frame into the packet.
-	buffer[offset] = 'F';
-	++offset;
-	UnsignedInt newframe = cmdMsg->getExecutionFrame();
-	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnsignedByte leavingPlayerID = cmdMsg->getLeavingPlayerID();
-	memcpy(buffer + offset, &leavingPlayerID, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-}
-
-void NetPacket::FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetRunAheadMetricsCommandMsg *cmdMsg = (NetRunAheadMetricsCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadMetricsCommand - adding run ahead metrics for player %d, fps = %d, latency = %f\n", cmdMsg->getPlayerID(), cmdMsg->getAverageFps(), cmdMsg->getAverageLatency()));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	// write the average latency
-	Real averageLatency = cmdMsg->getAverageLatency();
-	memcpy(buffer + offset, &averageLatency, sizeof(averageLatency));
-	offset += sizeof(averageLatency);
-	// write the average fps
-	UnsignedShort averageFps = (UnsignedShort)(cmdMsg->getAverageFps());
-	memcpy(buffer + offset, &averageFps, sizeof(averageFps));
-	offset += sizeof(averageFps);
-}
-
-void NetPacket::FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetRunAheadCommandMsg *cmdMsg = (NetRunAheadCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithRunAheadCommand - adding run ahead command\n"));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, put the execution frame into the packet.
-	buffer[offset] = 'F';
-	++offset;
-	UnsignedInt newframe = cmdMsg->getExecutionFrame();
-	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-	// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnsignedShort newRunAhead = cmdMsg->getRunAhead();
-	memcpy(buffer + offset, &newRunAhead, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-	UnsignedByte newFrameRate = cmdMsg->getFrameRate();
-	memcpy(buffer + offset, &newFrameRate, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added run ahead command, frame %d, player id %d command id %d\n", m_lastFrame, m_lastPlayerID, m_lastCommandID));
-}
-
-void NetPacket::FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDestroyPlayerCommandMsg *cmdMsg = (NetDestroyPlayerCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadCommand - adding run ahead command\n"));
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the execution frame into the packet.
-	buffer[offset] = 'F';
-	++offset;
-	UnsignedInt newframe = cmdMsg->getExecutionFrame();
-	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnsignedInt newVal = cmdMsg->getPlayerIndex();
-	memcpy(buffer + offset, &newVal, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-}
-
-void NetPacket::FillBufferWithKeepAliveCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetKeepAliveCommandMsg *cmdMsg = (NetKeepAliveCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	buffer[offset] = 'D';
-	++offset;
-}
-
-void NetPacket::FillBufferWithDisconnectKeepAliveCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDisconnectKeepAliveCommandMsg *cmdMsg = (NetDisconnectKeepAliveCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-
-	// Put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// Put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-	
-	// Put the player ID into the packet.
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	buffer[offset] = 'D';
-	++offset;
-}
-
-void NetPacket::FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDisconnectPlayerCommandMsg *cmdMsg = (NetDisconnectPlayerCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - adding run ahead command\n"));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-	//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnsignedByte slot = cmdMsg->getDisconnectSlot();
-	memcpy(buffer + offset, &slot, sizeof(slot));
-	offset += sizeof(slot);
-
-	UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame();
-	memcpy(buffer + offset, &disconnectFrame, sizeof(disconnectFrame));
-	offset += sizeof(disconnectFrame);
-}
-
-void NetPacket::FillBufferWithPacketRouterQueryCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetPacketRouterQueryCommandMsg *cmdMsg = (NetPacketRouterQueryCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterQueryCommand - adding packet router query command\n"));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-	buffer[offset] = 'D';
-	++offset;
-}
-
-void NetPacket::FillBufferWithPacketRouterAckCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterAckCommand - adding packet router query command\n"));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-	buffer[offset] = 'D';
-	++offset;
-}
-
-void NetPacket::FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command\n"));
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnicodeString unitext = cmdMsg->getText();
-	UnsignedByte length = unitext.getLength();
-	memcpy(buffer + offset, &length, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	memcpy(buffer + offset, unitext.str(), length * sizeof(UnsignedShort));
-	offset += length * sizeof(UnsignedShort);
-}
-
-void NetPacket::FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - adding run ahead command\n"));
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnsignedByte slot = cmdMsg->getSlot();
-	memcpy(buffer + offset, &slot, sizeof(slot));
-	offset += sizeof(slot);
-
-	UnsignedInt voteFrame = cmdMsg->getVoteFrame();
-	memcpy(buffer + offset, &voteFrame, sizeof(voteFrame));
-	offset += sizeof(voteFrame);
-}
-
-void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetChatCommandMsg *cmdMsg = (NetChatCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command\n"));
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the execution frame into the packet.
-	buffer[offset] = 'F';
-	++offset;
-	UnsignedInt newframe = cmdMsg->getExecutionFrame();
-	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnicodeString unitext = cmdMsg->getText();
-	UnsignedByte length = unitext.getLength();
-	Int playerMask = cmdMsg->getPlayerMask();
-	memcpy(buffer + offset, &length, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	memcpy(buffer + offset, unitext.str(), length * sizeof(UnsignedShort));
-	offset += length * sizeof(UnsignedShort);
-
-	memcpy(buffer + offset, &playerMask, sizeof(Int));
-	offset += sizeof(Int);
-}
-
-void NetPacket::FillBufferWithProgressMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetProgressCommandMsg *cmdMsg = (NetProgressCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-// Put the player ID into the packet.
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	buffer[offset] = 'D';
-	++offset;
-
-	buffer[offset] = cmdMsg->getPercentage();
-	++offset;
-}
-
-void NetPacket::FillBufferWithLoadCompleteMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetCommandMsg *cmdMsg = (NetCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-	buffer[offset] = 'D';
-	++offset;
-}
-
-void NetPacket::FillBufferWithTimeOutGameStartMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetCommandMsg *cmdMsg = (NetCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-	buffer[offset] = 'D';
-	++offset;
-}
-
-void NetPacket::FillBufferWithFileMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetFileCommandMsg *cmdMsg = (NetFileCommandMsg *)(msg->getCommand());
-	UnsignedInt offset = 0;
-
-	// command type
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// relay
-	buffer[offset] = 'R';
-	++offset;
-	buffer[offset] = msg->getRelay();
-	offset += sizeof(UnsignedByte);
-
-	// player ID
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// command ID
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(newID));
-	offset += sizeof(newID);
-
-	// data
-	buffer[offset] = 'D';
-	++offset;
-
-	AsciiString filename = cmdMsg->getPortableFilename();	// PORTABLE
-	for (Int i = 0; i < filename.getLength(); ++i) {
-		buffer[offset] = filename.getCharAt(i);
-		++offset;
-	}
-	buffer[offset] = 0;
-	++offset;
-
-	UnsignedInt newInt = cmdMsg->getFileLength();
-	memcpy(buffer + offset, &newInt, sizeof(newInt));
-	offset += sizeof(newInt);
-
-	memcpy(buffer + offset, cmdMsg->getFileData(), cmdMsg->getFileLength());
-	offset += cmdMsg->getFileLength();
-}
-
-void NetPacket::FillBufferWithFileAnnounceMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetFileAnnounceCommandMsg *cmdMsg = (NetFileAnnounceCommandMsg *)(msg->getCommand());
-	UnsignedInt offset = 0;
-
-	// command type
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// relay
-	buffer[offset] = 'R';
-	++offset;
-	buffer[offset] = msg->getRelay();
-	offset += sizeof(UnsignedByte);
-
-	// player ID
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// command ID
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(newID));
-	offset += sizeof(newID);
-
-	// data
-	buffer[offset] = 'D';
-	++offset;
-
-	AsciiString filename = cmdMsg->getPortableFilename();	// PORTABLE
-	for (Int i = 0; i < filename.getLength(); ++i) {
-		buffer[offset] = filename.getCharAt(i);
-		++offset;
-	}
-	buffer[offset] = 0;
-	++offset;
-
-	UnsignedShort fileID = cmdMsg->getFileID();
-	memcpy(buffer + offset, &fileID, sizeof(fileID));
-	offset += sizeof(fileID);
-
-	UnsignedByte playerMask = cmdMsg->getPlayerMask();
-	memcpy(buffer + offset, &playerMask, sizeof(playerMask));
-	offset += sizeof(playerMask);
-}
-
-void NetPacket::FillBufferWithFileProgressMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetFileProgressCommandMsg *cmdMsg = (NetFileProgressCommandMsg *)(msg->getCommand());
-	UnsignedInt offset = 0;
-
-	// command type
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// relay
-	buffer[offset] = 'R';
-	++offset;
-	buffer[offset] = msg->getRelay();
-	offset += sizeof(UnsignedByte);
-
-	// player ID
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// command ID
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(newID));
-	offset += sizeof(newID);
-
-	// data
-	buffer[offset] = 'D';
-	++offset;
-
-	UnsignedShort fileID = cmdMsg->getFileID();
-	memcpy(buffer + offset, &fileID, sizeof(fileID));
-	offset += sizeof(fileID);
-
-	Int progress = cmdMsg->getProgress();
-	memcpy(buffer + offset, &progress, sizeof(progress));
-	offset += sizeof(progress);
-}
-
-void NetPacket::FillBufferWithDisconnectFrameMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)(msg->getCommand());
-	UnsignedInt offset = 0;
-
-	// command type
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// relay
-	buffer[offset] = 'R';
-	++offset;
-	buffer[offset] = msg->getRelay();
-	offset += sizeof(UnsignedByte);
-
-	// player ID
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// command ID
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(newID));
-	offset += sizeof(newID);
-
-	// data
-	buffer[offset] = 'D';
-	++offset;
-
-	UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame();
-	memcpy(buffer + offset, &disconnectFrame, sizeof(disconnectFrame));
-	offset += sizeof(disconnectFrame);
-}
-
-void NetPacket::FillBufferWithDisconnectScreenOffMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)(msg->getCommand());
-	UnsignedInt offset = 0;
-
-	// command type
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// relay
-	buffer[offset] = 'R';
-	++offset;
-	buffer[offset] = msg->getRelay();
-	offset += sizeof(UnsignedByte);
-
-	// player ID
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// command ID
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(newID));
-	offset += sizeof(newID);
-
-	// data
-	buffer[offset] = 'D';
-	++offset;
-
-	UnsignedInt newFrame = cmdMsg->getNewFrame();
-	memcpy(buffer + offset, &newFrame, sizeof(newFrame));
-	offset += sizeof(newFrame);
-}
-
-void NetPacket::FillBufferWithFrameResendRequestMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetFrameResendRequestCommandMsg *cmdMsg = (NetFrameResendRequestCommandMsg *)(msg->getCommand());
-	UnsignedInt offset = 0;
-
-	// command type
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// relay
-	buffer[offset] = 'R';
-	++offset;
-	buffer[offset] = msg->getRelay();
-	offset += sizeof(UnsignedByte);
-
-	// player ID
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// command ID
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(newID));
-	offset += sizeof(newID);
-
-	// data
-	buffer[offset] = 'D';
-	++offset;
-
-	UnsignedInt frameToResend = cmdMsg->getFrameToResend();
-	memcpy(buffer + offset, &frameToResend, sizeof(frameToResend));
-	offset += sizeof(frameToResend);
-}
-
-
-/**
- * Constructor
- */
-NetPacket::NetPacket() {
-	init();
-}
-
-/**
- * Constructor given raw transport data.
- */
-NetPacket::NetPacket(TransportMessage *msg) {
-	init();
-	m_packetLen = msg->length;
-	memcpy(m_packet, msg->data, MAX_PACKET_SIZE);
-	m_numCommands = -1;
-	m_addr = msg->addr;
-	m_port = msg->port;
-}
-
-/**
- * Destructor
- */
-NetPacket::~NetPacket() {
-	if (m_lastCommand != NULL) {
-		deleteInstance(m_lastCommand);
-		m_lastCommand = NULL;
-	}
-}
-
-/**
- * Initialize all the member variable values.
- */
-void NetPacket::init() {
-	m_addr = 0;
-	m_port = 0;
-	m_numCommands = 0;
-	m_packetLen = 0;
-	m_packet[0] = 0;
-
-	m_lastPlayerID = 0;
-	m_lastFrame = 0;
-	m_lastCommandID = 0;
-	m_lastCommandType = 0;
-	m_lastRelay = 0;
-
-	m_lastCommand = NULL;
-}
-
-void NetPacket::reset() {
-	if (m_lastCommand != NULL) {
-		deleteInstance(m_lastCommand);
-		m_lastCommand = NULL;
-	}
-	init();
-}
-
-/**
- * Set the address to which this packet is to be sent.
- */
-void NetPacket::setAddress(Int addr, Int port) {
-	m_addr = addr;
-	m_port = port;
-}
-
-/**
- * Adds this command to the packet.  Returns false if there wasn't enough room
- * in the packet for this message, true otherwise.
- */
-Bool NetPacket::addCommand(NetCommandRef *msg) {
-	// This is where the fun begins...
-
-	NetCommandMsg *cmdMsg = msg->getCommand();
-
-	if (msg == NULL) {
-		return TRUE; // There was nothing to add, so it was successful.
-	}
-
-	switch(cmdMsg->getNetCommandType())
-	{
-		case NETCOMMANDTYPE_GAMECOMMAND:
-			return addGameCommand(msg);
-		case NETCOMMANDTYPE_ACKSTAGE1:
-			return addAckStage1Command(msg);
-		case NETCOMMANDTYPE_ACKSTAGE2:
-			return addAckStage2Command(msg);
-		case NETCOMMANDTYPE_ACKBOTH:
-			return addAckBothCommand(msg);
-		case NETCOMMANDTYPE_FRAMEINFO:
-			return addFrameCommand(msg);
-		case NETCOMMANDTYPE_PLAYERLEAVE:
-			return addPlayerLeaveCommand(msg);
-		case NETCOMMANDTYPE_RUNAHEADMETRICS:
-			return addRunAheadMetricsCommand(msg);
-		case NETCOMMANDTYPE_RUNAHEAD:
-			return addRunAheadCommand(msg);
-		case NETCOMMANDTYPE_DESTROYPLAYER:
-			return addDestroyPlayerCommand(msg);
-		case NETCOMMANDTYPE_KEEPALIVE:
-			return addKeepAliveCommand(msg);
-		case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
-			return addDisconnectKeepAliveCommand(msg);
-		case NETCOMMANDTYPE_DISCONNECTPLAYER:
-			return addDisconnectPlayerCommand(msg);
-		case NETCOMMANDTYPE_PACKETROUTERQUERY:
-			return addPacketRouterQueryCommand(msg);
-		case NETCOMMANDTYPE_PACKETROUTERACK:
-			return addPacketRouterAckCommand(msg);
-		case NETCOMMANDTYPE_DISCONNECTCHAT:
-			return addDisconnectChatCommand(msg);
-		case NETCOMMANDTYPE_DISCONNECTVOTE:
-			return addDisconnectVoteCommand(msg);
-		case NETCOMMANDTYPE_CHAT:
-			return addChatCommand(msg);
-		case NETCOMMANDTYPE_PROGRESS:
-			return addProgressMessage(msg);
-		case NETCOMMANDTYPE_LOADCOMPLETE:
-			return addLoadCompleteMessage(msg);
-		case NETCOMMANDTYPE_TIMEOUTSTART:
-			return addTimeOutGameStartMessage(msg);
-		case NETCOMMANDTYPE_WRAPPER:
-			return addWrapperCommand(msg);
-		case NETCOMMANDTYPE_FILE:
-			return addFileCommand(msg);
-		case NETCOMMANDTYPE_FILEANNOUNCE:
-			return addFileAnnounceCommand(msg);
-		case NETCOMMANDTYPE_FILEPROGRESS:
-			return addFileProgressCommand(msg);
-		case NETCOMMANDTYPE_DISCONNECTFRAME:
-			return addDisconnectFrameCommand(msg);
-		case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
-			return addDisconnectScreenOffCommand(msg);
-		case NETCOMMANDTYPE_FRAMERESENDREQUEST:
-			return addFrameResendRequestCommand(msg);
-		default:
-			DEBUG_CRASH(("Unknown NETCOMMANDTYPE %d", cmdMsg->getNetCommandType()));
-			break;
-	}
-
-	return TRUE;
-}
-
-/*
-T = Net command type
-F = Execution frame
-P = Player ID
-C = Command ID
-R = Relay
-D = Command Data
-Z = Repeat last command
-*/
-Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForFrameResendRequestMessage(msg)) {
-		NetFrameResendRequestCommandMsg *cmdMsg = (NetFrameResendRequestCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		UnsignedInt frameToResend = cmdMsg->getFrameToResend();
-		memcpy(m_packet + m_packetLen, &frameToResend, sizeof(frameToResend));
-		m_packetLen += sizeof(frameToResend);
-
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addFrameResendRequest - added frame resend request command from player %d for frame %d, command id = %d\n", m_lastPlayerID, frameToResend, m_lastCommandID));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForFrameResendRequestMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetFrameResendRequestCommandMsg *cmdMsg = (NetFrameResendRequestCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedInt); // for the frame to be resent
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForDisconnectScreenOffMessage(msg)) {
-		NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		UnsignedInt newFrame = cmdMsg->getNewFrame();
-		memcpy(m_packet + m_packetLen, &newFrame, sizeof(newFrame));
-		m_packetLen += sizeof(newFrame);
-
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectScreenOff - added disconnect screen off command from player %d for frame %d, command id = %d\n", m_lastPlayerID, newFrame, m_lastCommandID));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForDisconnectScreenOffMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedInt); // for the disconnect frame
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForDisconnectFrameMessage(msg)) {
-		NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame();
-		memcpy(m_packet + m_packetLen, &disconnectFrame, sizeof(disconnectFrame));
-		m_packetLen += sizeof(disconnectFrame);
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectFrame - added disconnect frame command from player %d for frame %d, command id = %d\n", m_lastPlayerID, disconnectFrame, m_lastCommandID));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForDisconnectFrameMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedInt); // for the disconnect frame
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addFileCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForFileMessage(msg)) {
-		NetFileCommandMsg *cmdMsg = (NetFileCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		AsciiString filename = cmdMsg->getPortableFilename();		// PORTABLE
-		strcpy((char *)(m_packet + m_packetLen), filename.str());
-		m_packetLen += filename.getLength() + 1;
-
-		UnsignedInt fileLength = cmdMsg->getFileLength();
-		memcpy(m_packet + m_packetLen, &fileLength, sizeof(fileLength));
-		m_packetLen += sizeof(fileLength);
-
-		memcpy(m_packet + m_packetLen, cmdMsg->getFileData(), fileLength);
-		m_packetLen += fileLength;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForFileMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetFileCommandMsg *cmdMsg = (NetFileCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedShort);
-	}
-
-	++len; // 'D'
-	len += cmdMsg->getPortableFilename().getLength() + 1; // PORTABLE filename + the terminating 0
-	len += sizeof(UnsignedInt); // filedata length
-	len += cmdMsg->getFileLength();
-
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForFileAnnounceMessage(msg)) {
-		NetFileAnnounceCommandMsg *cmdMsg = (NetFileAnnounceCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		AsciiString filename = cmdMsg->getPortableFilename();	// PORTABLE
-		strcpy((char *)(m_packet + m_packetLen), filename.str());
-		m_packetLen += filename.getLength() + 1;
-
-		UnsignedShort fileID = cmdMsg->getFileID();
-		memcpy(m_packet + m_packetLen, &fileID, sizeof(fileID));
-		m_packetLen += sizeof(fileID);
-
-		UnsignedByte playerMask = cmdMsg->getPlayerMask();
-		memcpy(m_packet + m_packetLen, &playerMask, sizeof(playerMask));
-		m_packetLen += sizeof(playerMask);
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Adding file announce message for fileID %d, ID %d to packet\n",
-			cmdMsg->getFileID(), cmdMsg->getID()));
-		return TRUE;
-	}
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("No room to add file announce message to packet\n"));
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForFileAnnounceMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetFileAnnounceCommandMsg *cmdMsg = (NetFileAnnounceCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedShort);
-	}
-
-	++len; // 'D'
-	len += cmdMsg->getPortableFilename().getLength() + 1; // PORTABLE filename + the terminating 0
-	len += sizeof(UnsignedShort); // m_fileID
-	len += sizeof(UnsignedByte); // m_playerMask
-
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForFileProgressMessage(msg)) {
-		NetFileProgressCommandMsg *cmdMsg = (NetFileProgressCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		UnsignedShort fileID = cmdMsg->getFileID();
-		memcpy(m_packet + m_packetLen, &fileID, sizeof(fileID));
-		m_packetLen += sizeof(fileID);
-
-		Int progress = cmdMsg->getProgress();
-		memcpy(m_packet + m_packetLen, &progress, sizeof(progress));
-		m_packetLen += sizeof(progress);
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForFileProgressMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetFileProgressCommandMsg *cmdMsg = (NetFileProgressCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedShort);
-	}
-
-	++len; // 'D'
-	len += sizeof(UnsignedShort); // m_fileID
-	len += sizeof(Int); // m_progress
-
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-Bool NetPacket::addWrapperCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForWrapperMessage(msg)) {
-		NetWrapperCommandMsg *cmdMsg = (NetWrapperCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		// wrapped command ID
-		UnsignedShort wrappedCommandID = cmdMsg->getWrappedCommandID();
-		memcpy(m_packet + m_packetLen, &wrappedCommandID, sizeof(wrappedCommandID));
-		m_packetLen += sizeof(wrappedCommandID);
-
-		// chunk number
-//		m_packet[m_packetLen] = cmdMsg->getChunkNumber();
-//		++m_packetLen;
-		UnsignedInt chunkNumber = cmdMsg->getChunkNumber();
-		memcpy(m_packet + m_packetLen, &chunkNumber, sizeof(chunkNumber));
-		m_packetLen += sizeof(chunkNumber);
-
-		// number of chunks
-//		m_packet[m_packetLen] = cmdMsg->getNumChunks();
-//		++m_packetLen;
-		UnsignedInt numChunks = cmdMsg->getNumChunks();
-		memcpy(m_packet + m_packetLen, &numChunks, sizeof(numChunks));
-		m_packetLen += sizeof(numChunks);
-
-		// total length of data for all chunks
-		UnsignedInt totalDataLength = cmdMsg->getTotalDataLength();
-		memcpy(m_packet + m_packetLen, &totalDataLength, sizeof(totalDataLength));
-		m_packetLen += sizeof(totalDataLength);
-
-		// data length for this chunk
-		UnsignedInt dataLength = cmdMsg->getDataLength();
-		memcpy(m_packet + m_packetLen, &dataLength, sizeof(dataLength));
-		m_packetLen += sizeof(dataLength);
-
-		// the offset into the data of this chunk
-		UnsignedInt dataOffset = cmdMsg->getDataOffset();
-		memcpy(m_packet + m_packetLen, &dataOffset, sizeof(dataOffset));
-		m_packetLen += sizeof(dataOffset);
-
-		// the data for this chunk
-		UnsignedByte *data = cmdMsg->getData();
-		memcpy(m_packet + m_packetLen, data, dataLength);
-		m_packetLen += dataLength;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForWrapperMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetWrapperCommandMsg *cmdMsg = (NetWrapperCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedShort);
-	}
-
-	++len; // 'D'
-	len += sizeof(UnsignedShort); // wrapped command ID
-	len += sizeof(UnsignedInt); // chunk number
-	len += sizeof(UnsignedInt); // number of chunks
-	len += sizeof(UnsignedInt); // total data length
-	len += sizeof(UnsignedInt); // data length of this chunk
-	len += sizeof(UnsignedInt); // offset of this chunk
-	len += cmdMsg->getDataLength(); // for the data of this chunk
-
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * Add a TimeOutGameStart  to the packet. Returns true if successful.
- */
-Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForLoadCompleteMessage(msg)) {
-		NetCommandMsg *cmdMsg = (NetCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet.\n"));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room in the packet for this command.
- */
-Bool NetPacket::isRoomForTimeOutGameStartMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetCommandMsg *cmdMsg = (NetCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // For the 'D'
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-
-
-/**
- * Add a Progress command to the packet. Returns true if successful.
- */
-Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForLoadCompleteMessage(msg)) {
-		NetCommandMsg *cmdMsg = (NetCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet.\n"));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room in the packet for this command.
- */
-Bool NetPacket::isRoomForLoadCompleteMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetCommandMsg *cmdMsg = (NetCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // For the 'D'
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-
-
-
-/**
- * Add a Progress command to the packet. Returns true if successful.
- */
-Bool NetPacket::addProgressMessage(NetCommandRef *msg) {
-	if (isRoomForProgressMessage(msg)) {
-		NetProgressCommandMsg *cmdMsg = (NetProgressCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		m_packet[m_packetLen] = cmdMsg->getPercentage();
-		++m_packetLen;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet.\n"));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room in the packet for this command.
- */
-Bool NetPacket::isRoomForProgressMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetProgressCommandMsg *cmdMsg = (NetProgressCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // For the 'D'
-	++len; // percentage
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-
-
-Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - entering...\n"));
-	//  need type, player id, relay, command id, slot number
-	if (isRoomForDisconnectVoteMessage(msg)) {
-		NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - adding run ahead command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnsignedByte slot = cmdMsg->getSlot();
-		memcpy(m_packet + m_packetLen, &slot, sizeof(slot));
-		m_packetLen += sizeof(slot);
-
-		UnsignedInt voteFrame = cmdMsg->getVoteFrame();
-		memcpy(m_packet + m_packetLen, &voteFrame, sizeof(voteFrame));
-		m_packetLen += sizeof(voteFrame);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - added disconnect vote command, player id %d command id %d, voted slot %d\n", m_lastPlayerID, m_lastCommandID, slot));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room for this player disconnect command in this packet.
- */
-Bool NetPacket::isRoomForDisconnectVoteMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // the 'D'
-	len += sizeof(UnsignedByte); // slot number
-	len += sizeof(UnsignedInt); // vote frame
-
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) {
-	// type, player, id, relay, data
-	// data format: 1 byte string length, string (two bytes per character)
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - Entering...\n"));
-	if (isRoomForDisconnectChatMessage(msg)) {
-		NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnicodeString unitext = cmdMsg->getText();
-		UnsignedByte length = unitext.getLength();
-		memcpy(m_packet + m_packetLen, &length, sizeof(UnsignedByte));
-		m_packetLen += sizeof(UnsignedByte);
-
-		memcpy(m_packet + m_packetLen, unitext.str(), length * sizeof(UnsignedShort));
-		m_packetLen += length * sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added disconnect chat command\n"));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForDisconnectChatMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // the 'D'
-	len += sizeof(UnsignedByte); // string length
-	UnsignedByte textLen = cmdMsg->getText().getLength();
-	len += textLen * sizeof(UnsignedShort);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addChatCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForChatMessage(msg)) {
-		NetChatCommandMsg *cmdMsg = (NetChatCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnicodeString unitext = cmdMsg->getText();
-		UnsignedByte length = unitext.getLength();
-		Int playerMask = cmdMsg->getPlayerMask();
-		memcpy(m_packet + m_packetLen, &length, sizeof(UnsignedByte));
-		m_packetLen += sizeof(UnsignedByte);
-
-		memcpy(m_packet + m_packetLen, unitext.str(), length * sizeof(UnsignedShort));
-		m_packetLen += length * sizeof(UnsignedShort);
-
-		memcpy(m_packet + m_packetLen, &playerMask, sizeof(Int));
-		m_packetLen += sizeof(Int);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added chat command\n"));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForChatMessage(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	Int len = 0;
-	NetChatCommandMsg *cmdMsg = (NetChatCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // the 'D'
-	len += sizeof(UnsignedByte); // string length
-	UnsignedByte textLen = cmdMsg->getText().getLength();
-	len += textLen * sizeof(UnsignedShort);
-	len += sizeof(Int); // playerMask
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) {
-	//  need type, player id, relay, command id, slot number
-	if (isRoomForPacketRouterAckMessage(msg)) {
-		NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterAckCommand - adding packet router query command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added packet router ack command, player id %d\n", m_lastPlayerID));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room for this packet router ack command in this packet.
- */
-Bool NetPacket::isRoomForPacketRouterAckMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // the 'D'
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addPacketRouterQueryCommand(NetCommandRef *msg) {
-	//  need type, player id, relay, command id, slot number
-	if (isRoomForPacketRouterQueryMessage(msg)) {
-		NetPacketRouterQueryCommandMsg *cmdMsg = (NetPacketRouterQueryCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterQueryCommand - adding packet router query command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added packet router query command, player id %d\n", m_lastPlayerID));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());	
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room for this packet router query command in this packet.
- */
-Bool NetPacket::isRoomForPacketRouterQueryMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetPacketRouterQueryCommandMsg *cmdMsg = (NetPacketRouterQueryCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // the 'D'
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - entering...\n"));
-	//  need type, player id, relay, command id, slot number
-	if (isRoomForDisconnectPlayerMessage(msg)) {
-		NetDisconnectPlayerCommandMsg *cmdMsg = (NetDisconnectPlayerCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - adding run ahead command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnsignedByte slot = cmdMsg->getDisconnectSlot();
-		memcpy(m_packet + m_packetLen, &slot, sizeof(slot));
-		m_packetLen += sizeof(slot);
-
-		UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame();
-		memcpy(m_packet + m_packetLen, &disconnectFrame, sizeof(disconnectFrame));
-		m_packetLen += sizeof(disconnectFrame);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - added disconnect player command, player id %d command id %d, disconnecting slot %d\n", m_lastPlayerID, m_lastCommandID, slot));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room for this player disconnect command in this packet.
- */
-Bool NetPacket::isRoomForDisconnectPlayerMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetDisconnectPlayerCommandMsg *cmdMsg = (NetDisconnectPlayerCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // the 'D'
-	len += sizeof(UnsignedByte); // slot number
-	len += sizeof(UnsignedInt);	// disconnectFrame
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-
-/**
- * Add a keep alive command to the packet. Returns true if successful.
- */
-Bool NetPacket::addDisconnectKeepAliveCommand(NetCommandRef *msg) {
-	if (isRoomForDisconnectKeepAliveMessage(msg)) {
-		NetDisconnectKeepAliveCommandMsg *cmdMsg = (NetDisconnectKeepAliveCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet.\n"));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room in the packet for this command.
- */
-Bool NetPacket::isRoomForDisconnectKeepAliveMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetDisconnectKeepAliveCommandMsg *cmdMsg = (NetDisconnectKeepAliveCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // For the 'D'
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Add a keep alive command to the packet. Returns true if successful.
- */
-Bool NetPacket::addKeepAliveCommand(NetCommandRef *msg) {
-	if (isRoomForKeepAliveMessage(msg)) {
-		NetKeepAliveCommandMsg *cmdMsg = (NetKeepAliveCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet.\n"));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room in the packet for this command.
- */
-Bool NetPacket::isRoomForKeepAliveMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetKeepAliveCommandMsg *cmdMsg = (NetKeepAliveCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // For the 'D'
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Add a run ahead command to the packet. Returns true if successful.
- */
-Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForRunAheadMessage(msg)) {
-		NetRunAheadCommandMsg *cmdMsg = (NetRunAheadCommandMsg *)(msg->getCommand());
-		//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadCommand - adding run ahead command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnsignedShort newRunAhead = cmdMsg->getRunAhead();
-		memcpy(m_packet + m_packetLen, &newRunAhead, sizeof(UnsignedShort));
-		m_packetLen += sizeof(UnsignedShort);
-
-		UnsignedByte newFrameRate = cmdMsg->getFrameRate();
-		memcpy(m_packet + m_packetLen, &newFrameRate, sizeof(UnsignedByte));
-		m_packetLen += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added run ahead command, frame %d, player id %d command id %d\n", m_lastFrame, m_lastPlayerID, m_lastCommandID));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room for this run ahead command in this packet.
- */
-Bool NetPacket::isRoomForRunAheadMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetRunAheadCommandMsg *cmdMsg = (NetRunAheadCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedShort);
-	len += sizeof(UnsignedByte);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Add a DestroyPlayer command to the packet. Returns true if successful.
- */
-Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForDestroyPlayerMessage(msg)) {
-		NetDestroyPlayerCommandMsg *cmdMsg = (NetDestroyPlayerCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnsignedInt newVal = cmdMsg->getPlayerIndex();
-		memcpy(m_packet + m_packetLen, &newVal, sizeof(UnsignedInt));
-		m_packetLen += sizeof(UnsignedInt);
-
-		//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added CRC:0x%8.8X info command, frame %d, player id %d command id %d\n", newCRC, m_lastFrame, m_lastPlayerID, m_lastCommandID));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room for this DestroyPlayer command in this packet.
- */
-Bool NetPacket::isRoomForDestroyPlayerMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetDestroyPlayerCommandMsg *cmdMsg = (NetDestroyPlayerCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedInt);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Add a run ahead metrics command to the packet. Returns true if successful.
- */
-Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForRunAheadMetricsMessage(msg)) {
-		NetRunAheadMetricsCommandMsg *cmdMsg = (NetRunAheadMetricsCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadMetricsCommand - adding run ahead metrics for player %d, fps = %d, latency = %f\n", cmdMsg->getPlayerID(), cmdMsg->getAverageFps(), cmdMsg->getAverageLatency()));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		// write the average latency
-		Real averageLatency = cmdMsg->getAverageLatency();
-		memcpy(m_packet + m_packetLen, &averageLatency, sizeof(averageLatency));
-		m_packetLen += sizeof(averageLatency);
-		// write the average fps
-		UnsignedShort averageFps = (UnsignedShort)(cmdMsg->getAverageFps());
-		memcpy(m_packet + m_packetLen, &averageFps, sizeof(averageFps));
-		m_packetLen += sizeof(averageFps);
-
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		++m_numCommands;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is enough room in the packet to fit this message.
- */
-Bool NetPacket::isRoomForRunAheadMetricsMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetRunAheadMetricsCommandMsg *cmdMsg = (NetRunAheadMetricsCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // 'D'
-	len += sizeof(UnsignedShort);
-	len += sizeof(Real);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-
-/**
- * Add a player leave command to the packet. Returns true if successful.
- */
-Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForPlayerLeaveMessage(msg)) {
-		NetPlayerLeaveCommandMsg *cmdMsg = (NetPlayerLeaveCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPlayerLeaveCommand - adding player leave command for player %d\n", cmdMsg->getLeavingPlayerID()));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnsignedByte leavingPlayerID = cmdMsg->getLeavingPlayerID();
-		memcpy(m_packet + m_packetLen, &leavingPlayerID, sizeof(UnsignedByte));
-		m_packetLen += sizeof(UnsignedByte);
-
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		++m_numCommands;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is enough room in the packet to fit this message.
- */
-Bool NetPacket::isRoomForPlayerLeaveMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetPlayerLeaveCommandMsg *cmdMsg = (NetPlayerLeaveCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedByte);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Add this frame command message. Returns true if successful.
- */
-Bool NetPacket::addFrameCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isFrameRepeat(msg)) {
-		if (m_packetLen >= MAX_PACKET_SIZE) {
-			return FALSE;
-		}
-		m_packet[m_packetLen] = 'Z';
-		++m_packetLen;
-		m_lastCommandID = msg->getCommand()->getID();
-		deleteInstance(m_lastCommand);
-		m_lastCommand = newInstance(NetCommandRef)(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		++m_lastFrame;		// need this cause we're actually advancing to the next frame by adding this command.
-		++m_numCommands;
-		// frameinfodebug
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added frame %d, player %d, command count = %d, command id = %d, repeat\n", m_lastFrame, m_lastPlayerID, 0, m_lastCommandID));
-		return TRUE;
-	}
-	if (isRoomForFrameMessage(msg)) {
-		NetFrameCommandMsg *cmdMsg = (NetFrameCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addFrameCommand - adding frame command for frame %d, command count = %d, command id = %d\n", cmdMsg->getExecutionFrame(), cmdMsg->getCommandCount(), cmdMsg->getID()));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnsignedShort cmdCount = cmdMsg->getCommandCount();
-		memcpy(m_packet + m_packetLen, &cmdCount, sizeof(UnsignedShort));
-		m_packetLen += sizeof(UnsignedShort);
-
-		// frameinfodebug
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added frame %d, player %d, command count = %d, command id = %d\n", cmdMsg->getExecutionFrame(), cmdMsg->getPlayerID(), cmdMsg->getCommandCount(), cmdMsg->getID()));
-
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		++m_numCommands;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is enough room in this packet for this frame message.
- */
-Bool NetPacket::isRoomForFrameMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetFrameCommandMsg *cmdMsg = (NetFrameCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedShort);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::isFrameRepeat(NetCommandRef *msg) {
-	if (m_lastCommand == NULL) {
-		return FALSE;
-	}
-	if (m_lastCommand->getCommand()->getNetCommandType() != NETCOMMANDTYPE_FRAMEINFO) {
-		return FALSE;
-	}
-	NetFrameCommandMsg *framemsg = (NetFrameCommandMsg *)(msg->getCommand());
-	NetFrameCommandMsg *lastmsg = (NetFrameCommandMsg *)(m_lastCommand->getCommand());
-	if (framemsg->getCommandCount() != 0) {
-		return FALSE;
-	}
-	if (framemsg->getExecutionFrame() != (lastmsg->getExecutionFrame() + 1)) {
-		return FALSE;
-	}
-	if (msg->getRelay() != m_lastCommand->getRelay()) {
-		return FALSE;
-	}
-	if (framemsg->getID() != (lastmsg->getID() + 1)) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Add an ack "both" command.
- */
-Bool NetPacket::addAckBothCommand(NetCommandRef *msg) {
-	NetAckBothCommandMsg *ackmsg = (NetAckBothCommandMsg *)(msg->getCommand());
-	return addAckCommand(msg, ackmsg->getCommandID(), ackmsg->getOriginalPlayerID());
-}
-
-/**
- * Add an ack stage 1 command.
- */
-Bool NetPacket::addAckStage1Command(NetCommandRef *msg) {
-	NetAckStage1CommandMsg *ackmsg = (NetAckStage1CommandMsg *)(msg->getCommand());
-	return addAckCommand(msg, ackmsg->getCommandID(), ackmsg->getOriginalPlayerID());
-}
-
-/**
- * Add an ack stage 2 command.
- */
-Bool NetPacket::addAckStage2Command(NetCommandRef *msg) {
-	NetAckStage2CommandMsg *ackmsg = (NetAckStage2CommandMsg *)(msg->getCommand());
-	return addAckCommand(msg, ackmsg->getCommandID(), ackmsg->getOriginalPlayerID());
-}
-
-/**
- * Add this ack command to the packet.  Returns true if successful.
- */
-Bool NetPacket::addAckCommand(NetCommandRef *msg, UnsignedShort commandID, UnsignedByte originalPlayerID) {
-	if (isAckRepeat(msg)) {
-		if (m_packetLen >= MAX_PACKET_SIZE) {
-			return FALSE;
-		}
-		m_packet[m_packetLen] = 'Z';
-		++m_packetLen;
-		++m_numCommands;
-		deleteInstance(m_lastCommand);
-		m_lastCommand = NULL;
-
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	if (isRoomForAckMessage(msg)) {
-		NetCommandMsg *cmdMsg = msg->getCommand();
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addAckCommand - adding ack for command %d for player %d\n", cmdMsg->getCommandID(), msg->getCommand()->getPlayerID()));
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-		// Put in the command id of the command we are acking.
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		memcpy(m_packet + m_packetLen, &commandID, sizeof(UnsignedShort));
-		m_packetLen += sizeof(UnsignedShort);
-		memcpy(m_packet + m_packetLen, &originalPlayerID, sizeof(UnsignedByte));
-		m_packetLen += sizeof(UnsignedByte);
-
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added ACK, original player %d, command id %d\n", origPlayerID, cmdID));
-		++m_numCommands;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is enough room in the packet for this ack message.
- */
-Bool NetPacket::isRoomForAckMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetCommandMsg *cmdMsg = msg->getCommand();
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedShort);
-	len += sizeof(UnsignedByte);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::isAckRepeat(NetCommandRef *msg) {
-	if (m_lastCommand == NULL) {
-		return FALSE;
-	}
-	if (m_lastCommand->getCommand()->getNetCommandType() != msg->getCommand()->getNetCommandType()) {
-		return FALSE;
-	}
-	if (msg->getCommand()->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
-		return isAckBothRepeat(msg);
-	}
-	if (msg->getCommand()->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) {
-		return isAckStage1Repeat(msg);
-	}
-	if (msg->getCommand()->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) {
-		return isAckStage2Repeat(msg);
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isAckBothRepeat(NetCommandRef *msg) {
-	NetAckBothCommandMsg *ack = (NetAckBothCommandMsg *)(msg->getCommand());
-	NetAckBothCommandMsg *lastAck = (NetAckBothCommandMsg *)(m_lastCommand->getCommand());
-	if (lastAck->getCommandID() != (ack->getCommandID() - 1)) {
-		return FALSE;
-	}
-	if (lastAck->getOriginalPlayerID() != ack->getOriginalPlayerID()) {
-		return FALSE;
-	}
-	if (msg->getRelay() != m_lastCommand->getRelay()) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::isAckStage1Repeat(NetCommandRef *msg) {
-	NetAckStage2CommandMsg *ack = (NetAckStage2CommandMsg *)(msg->getCommand());
-	NetAckStage2CommandMsg *lastAck = (NetAckStage2CommandMsg *)(m_lastCommand->getCommand());
-	if (lastAck->getCommandID() != (ack->getCommandID() - 1)) {
-		return FALSE;
-	}
-	if (lastAck->getOriginalPlayerID() != ack->getOriginalPlayerID()) {
-		return FALSE;
-	}
-	if (msg->getRelay() != m_lastCommand->getRelay()) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::isAckStage2Repeat(NetCommandRef *msg) {
-	NetAckStage2CommandMsg *ack = (NetAckStage2CommandMsg *)(msg->getCommand());
-	NetAckStage2CommandMsg *lastAck = (NetAckStage2CommandMsg *)(m_lastCommand->getCommand());
-	if (lastAck->getCommandID() != (ack->getCommandID() - 1)) {
-		return FALSE;
-	}
-	if (lastAck->getOriginalPlayerID() != ack->getOriginalPlayerID()) {
-		return FALSE;
-	}
-	if (msg->getRelay() != m_lastCommand->getRelay()) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Adds this game command to the packet.  Returns true if successful.
- */
-Bool NetPacket::addGameCommand(NetCommandRef *msg) {
-	Bool retval = FALSE;
-	NetGameCommandMsg *cmdMsg = (NetGameCommandMsg *)(msg->getCommand());
-	// get the game message from the NetCommandMsg
-	GameMessage *gmsg = cmdMsg->constructGameMessage();
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addGameCommand for command ID %d\n", cmdMsg->getID()));
-
-	if (isRoomForGameMessage(msg, gmsg)) {
-		// Now we know there is enough room, put the new game message into the packet.
-
-		Bool needNewCommandID = FALSE; // this is to allow us to force the starting command ID to be respecified with this command.
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary, put the playerID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-			//since if we have a new player we need to respecify the starting command ID, lets force the command id to be different.
-			needNewCommandID = TRUE;
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		// Now copy the GameMessage type into the packet.
-		GameMessage::Type newType = gmsg->getType();
-		memcpy(m_packet + m_packetLen, &newType, sizeof(GameMessage::Type));
-		m_packetLen += sizeof(GameMessage::Type);
-
-
-		GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
-		UnsignedByte numTypes = parser->getNumTypes();
-		memcpy(m_packet + m_packetLen, &numTypes, sizeof(numTypes));
-		m_packetLen += sizeof(numTypes);
-
-		GameMessageParserArgumentType *argType = parser->getFirstArgumentType();
-		while (argType != NULL) {
-			UnsignedByte type = (UnsignedByte)(argType->getType());
-			memcpy(m_packet + m_packetLen, &type, sizeof(type));
-			m_packetLen += sizeof(type);
-
-			UnsignedByte argTypeCount = argType->getArgCount();
-			memcpy(m_packet + m_packetLen, &argTypeCount, sizeof(argTypeCount));
-			m_packetLen += sizeof(argTypeCount);
-
-			argType = argType->getNext();
-		}
-
-		Int numArgs = gmsg->getArgumentCount();
-		for (Int i = 0; i < numArgs; ++i) {
-			GameMessageArgumentDataType type = gmsg->getArgumentDataType(i);
-			GameMessageArgumentType arg = *(gmsg->getArgument(i));
-			writeGameMessageArgumentToPacket(type, arg);
-		}
-
-		deleteInstance(parser);
-		parser = NULL;
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addGameMessage - added game message, frame %d, player %d, command ID %d\n", m_lastFrame, m_lastPlayerID, m_lastCommandID));
-
-		++m_numCommands;
-
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		retval = TRUE;
-	}
-
-	if (gmsg) {
-		deleteInstance(gmsg);
-		gmsg = NULL;
-	}
-
-	return retval;
-}
-
-void NetPacket::writeGameMessageArgumentToPacket(GameMessageArgumentDataType type, GameMessageArgumentType arg) {
-	if (type == ARGUMENTDATATYPE_INTEGER) {
-		memcpy(m_packet + m_packetLen, &(arg.integer), sizeof(arg.integer));
-		m_packetLen += sizeof(arg.integer);
-	} else if (type == ARGUMENTDATATYPE_REAL) {
-		memcpy(m_packet + m_packetLen, &(arg.real), sizeof(arg.real));
-		m_packetLen += sizeof(arg.real);
-	} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-		memcpy(m_packet + m_packetLen, &(arg.boolean), sizeof(arg.boolean));
-		m_packetLen += sizeof(arg.boolean);
-	} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-		memcpy(m_packet + m_packetLen, &(arg.objectID), sizeof(arg.objectID));
-		m_packetLen += sizeof(arg.objectID);
-	} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-		memcpy(m_packet + m_packetLen, &(arg.drawableID), sizeof(arg.drawableID));
-		m_packetLen += sizeof(arg.drawableID);
-	} else if (type == ARGUMENTDATATYPE_TEAMID) {
-		memcpy(m_packet + m_packetLen, &(arg.teamID), sizeof(arg.teamID));
-		m_packetLen += sizeof(arg.teamID);
-	} else if (type == ARGUMENTDATATYPE_LOCATION) {
-		memcpy(m_packet + m_packetLen, &(arg.location), sizeof(arg.location));
-		m_packetLen += sizeof(arg.location);
-	} else if (type == ARGUMENTDATATYPE_PIXEL) {
-		memcpy(m_packet + m_packetLen, &(arg.pixel), sizeof(arg.pixel));
-		m_packetLen += sizeof(arg.pixel);
-	} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-		memcpy(m_packet + m_packetLen, &(arg.pixelRegion), sizeof(arg.pixelRegion));
-		m_packetLen += sizeof(arg.pixelRegion);
-	} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {
-		memcpy(m_packet + m_packetLen, &(arg.timestamp), sizeof(arg.timestamp));
-		m_packetLen += sizeof(arg.timestamp);
-	} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-		memcpy(m_packet + m_packetLen, &(arg.wChar), sizeof(arg.wChar));
-		m_packetLen += sizeof(arg.wChar);
-	}
-}
-
-/**
- * Returns true if there is enough room in this packet for this message.
- */
-Bool NetPacket::isRoomForGameMessage(NetCommandRef *msg, GameMessage *gmsg) {
-	// Calculate how much space the NetCommandMsg will take in this packet.
-	Int msglen = 0;
-
-	NetGameCommandMsg *cmdMsg = (NetGameCommandMsg *)(msg->getCommand());
-
-	Bool needNewCommandID = FALSE;
-
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
-
-	++msglen; // for 'D'
-	msglen += sizeof(GameMessage::Type);
-	msglen += sizeof(UnsignedByte);
-//	Int numTypes = parser->getNumTypes();
-	GameMessageParserArgumentType *arg = parser->getFirstArgumentType();
-	while (arg != NULL) {
-		msglen += 2 * sizeof(UnsignedByte); // for the type and number of args of that type declaration.
-		GameMessageArgumentDataType type = arg->getType();
-		if (type == ARGUMENTDATATYPE_INTEGER) {
-			msglen += arg->getArgCount() * sizeof(Int);
-		} else if (type == ARGUMENTDATATYPE_REAL) {
-			msglen += arg->getArgCount() * sizeof(Real);
-		} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-			msglen += arg->getArgCount() * sizeof(Bool);
-		} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-			msglen += arg->getArgCount() * sizeof(ObjectID);
-		} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-			msglen += arg->getArgCount() * sizeof(DrawableID);
-		} else if (type == ARGUMENTDATATYPE_TEAMID) {
-			msglen += arg->getArgCount() * sizeof(UnsignedInt);
-		} else if (type == ARGUMENTDATATYPE_LOCATION) {
-			msglen += arg->getArgCount() * sizeof(Coord3D);
-		} else if (type == ARGUMENTDATATYPE_PIXEL) {
-			msglen += arg->getArgCount() * sizeof(ICoord2D);
-		} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-			msglen += arg->getArgCount() * sizeof(IRegion2D);
-		} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {
-			msglen += arg->getArgCount() * sizeof(UnsignedInt);
-		} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-			msglen += arg->getArgCount() * sizeof(WideChar);
-		}
-		arg = arg->getNext();
-	}
-
-	deleteInstance(parser);
-	parser = NULL;
-
-	// Is there enough room in the packet for this message?
-	if (msglen > (MAX_PACKET_SIZE - m_packetLen)) {
-		return FALSE; // there isn't enough room in this packet for this new message.
-	}
-	return TRUE;
-}
-
-/**
- * Returns the list of commands that are in this packet.
- */
-NetCommandList * NetPacket::getCommandList() {
-	NetCommandList *retval = newInstance(NetCommandList);
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList, packet length = %d\n", m_packetLen));
-	retval->init();
-
-	// These need to be the same as the default values for m_lastPlayerID, m_lastFrame, etc.
-	UnsignedByte playerID = 0;
-	UnsignedInt frame = 0;
-	UnsignedShort commandID = 1; // The first command is going to be
-	UnsignedByte commandType = 0;
-	UnsignedByte relay = 0;
-	NetCommandRef *lastCommand = NULL;
-
-	Int i = 0;
-	while (i < m_packetLen) {
-		if (m_packet[i] == 'T') {
-			++i;
-			memcpy(&commandType, m_packet + i, sizeof(UnsignedByte));
-			i += sizeof(UnsignedByte);
-		} else if (m_packet[i] == 'F') {
-			++i;
-			memcpy(&frame, m_packet + i, sizeof(UnsignedInt));
-			i += sizeof(UnsignedInt);
-		} else if (m_packet[i] == 'P') {
-			++i;
-			memcpy(&playerID, m_packet + i, sizeof(UnsignedByte));
-			i += sizeof(UnsignedByte);
-		} else if (m_packet[i] == 'R') {
-			++i;
-			memcpy(&relay, m_packet + i, sizeof(UnsignedByte));
-			i += sizeof(UnsignedByte);
-		} else if (m_packet[i] == 'C') {
-			++i;
-			memcpy(&commandID, m_packet + i, sizeof(UnsignedShort));
-			i += sizeof(UnsignedShort);
-		} else if (m_packet[i] == 'D') {
-			++i;
-
-			NetCommandMsg *msg = NULL;
-
-			//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList() - command of type %d(%s)\n", commandType, GetAsciiNetCommandType((NetCommandType)commandType).str()));
-
-			switch((NetCommandType)commandType)
-			{
-			case NETCOMMANDTYPE_GAMECOMMAND:
-				msg = readGameMessage(m_packet, i);
-				//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read game command from player %d for frame %d\n", playerID, frame));
-				break;
-			case NETCOMMANDTYPE_ACKBOTH:
-				msg = readAckBothMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_ACKSTAGE1:
-				msg = readAckStage1Message(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_ACKSTAGE2:
-				msg = readAckStage2Message(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_FRAMEINFO:
-				msg = readFrameMessage(m_packet, i);
-				// frameinfodebug
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read frame %d from player %d, command count = %d, relay = 0x%X\n", frame, playerID, ((NetFrameCommandMsg *)msg)->getCommandCount(), relay));
-				break;
-			case NETCOMMANDTYPE_PLAYERLEAVE:
-				msg = readPlayerLeaveMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read player leave message from player %d for execution on frame %d\n", playerID, frame));
-				break;
-			case NETCOMMANDTYPE_RUNAHEADMETRICS:
-				msg = readRunAheadMetricsMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_RUNAHEAD:
-				msg = readRunAheadMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read run ahead message from player %d for execution on frame %d\n", playerID, frame));
-				break;
-			case NETCOMMANDTYPE_DESTROYPLAYER:
-				msg = readDestroyPlayerMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read CRC info message from player %d for execution on frame %d\n", playerID, frame));
-				break;
-			case NETCOMMANDTYPE_KEEPALIVE:
-				msg = readKeepAliveMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read keep alive message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
-				msg = readDisconnectKeepAliveMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read keep alive message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_DISCONNECTPLAYER:
-				msg = readDisconnectPlayerMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect player message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_PACKETROUTERQUERY:
-				msg = readPacketRouterQueryMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read packet router query message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_PACKETROUTERACK:
-				msg = readPacketRouterAckMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read packet router ack message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_DISCONNECTCHAT:
-				msg = readDisconnectChatMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect chat message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_DISCONNECTVOTE:
-				msg = readDisconnectVoteMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect vote message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_CHAT:
-				msg = readChatMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read chat message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_PROGRESS:
-				msg = readProgressMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read Progress message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_LOADCOMPLETE:
-				msg = readLoadCompleteMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read LoadComplete message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_TIMEOUTSTART:
-				msg = readTimeOutGameStartMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read TimeOutGameStart message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_WRAPPER:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read Wrapper message from player %d\n", playerID));
-				msg = readWrapperMessage(m_packet, i);
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Done reading Wrapper message from player %d - wrapped command was %d\n", playerID,
-					((NetWrapperCommandMsg *)msg)->getWrappedCommandID()));
-				break;
-			case NETCOMMANDTYPE_FILE:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read file message from player %d\n", playerID));
-				msg = readFileMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_FILEANNOUNCE:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read file announce message from player %d\n", playerID));
-				msg = readFileAnnounceMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_FILEPROGRESS:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read file progress message from player %d\n", playerID));
-				msg = readFileProgressMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_DISCONNECTFRAME:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect frame message from player %d\n", playerID));
-				msg = readDisconnectFrameMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect screen off message from player %d\n", playerID));
-				msg = readDisconnectScreenOffMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_FRAMERESENDREQUEST:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read frame resend request message from player %d\n", playerID));
-				msg = readFrameResendRequestMessage(m_packet, i);
-				break;
-			}
-
-			if (msg == NULL) {
-				DEBUG_CRASH(("Didn't read a message from the packet. Things are about to go wrong."));
-				continue;
-			}
-
-			// set the info
-			msg->setExecutionFrame(frame);
-			msg->setPlayerID(playerID);
-			msg->setNetCommandType((NetCommandType)commandType);
-			msg->setID(commandID);
-
-//			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("frame = %d, player = %d, command type = %d, id = %d\n", frame, playerID, commandType, commandID));
-
-			// increment to the next command ID.
-			if (DoesCommandRequireACommandID((NetCommandType)commandType)) {
-				++commandID;
-			}
-
-			// add the message to the list.
-			NetCommandRef *ref = retval->addMessage(msg);
-			if (ref != NULL) {
-				ref->setRelay(relay);
-			} else {
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList - failed to set relay for message %d\n", msg->getID()));
-			}
-
-			if (lastCommand != NULL) {
-				deleteInstance(lastCommand);
-				lastCommand = NULL;
-			}
-			lastCommand = newInstance(NetCommandRef)(msg);
-
-			msg->detach();  // Need to detach from new NetCommandMsg created by the "readXMessage" above.
-
-			// since the message is part of the list now, we don't have to keep track of it.  So we'll just set it to NULL.
-			msg = NULL;
-		} else if (m_packet[i] == 'Z') {
-			++i;
-			// Repeat the last command, doing some funky cool byte-saving stuff
-			if (lastCommand == NULL) {
-				DEBUG_CRASH(("Got a repeat command with no command to repeat."));
-			}
-			NetCommandMsg *msg = NULL;
-			if (commandType == NETCOMMANDTYPE_ACKSTAGE1) {
-				msg = newInstance(NetAckStage1CommandMsg)();
-				NetAckStage1CommandMsg *last = (NetAckStage1CommandMsg *)(lastCommand->getCommand());
-				((NetAckStage1CommandMsg *)msg)->setCommandID(last->getCommandID() + 1);
-				((NetAckStage1CommandMsg *)msg)->setOriginalPlayerID(last->getOriginalPlayerID());
-			} else if (commandType == NETCOMMANDTYPE_ACKSTAGE2) {
-				msg = newInstance(NetAckStage2CommandMsg)();
-				NetAckStage2CommandMsg *last = (NetAckStage2CommandMsg *)(lastCommand->getCommand());
-				((NetAckStage2CommandMsg *)msg)->setCommandID(last->getCommandID() + 1);
-				((NetAckStage2CommandMsg *)msg)->setOriginalPlayerID(last->getOriginalPlayerID());
-			} else if (commandType == NETCOMMANDTYPE_ACKBOTH) {
-				msg = newInstance(NetAckBothCommandMsg)();
-				NetAckBothCommandMsg *last = (NetAckBothCommandMsg *)(lastCommand->getCommand());
-				((NetAckBothCommandMsg *)msg)->setCommandID(last->getCommandID() + 1);
-				((NetAckBothCommandMsg *)msg)->setOriginalPlayerID(last->getOriginalPlayerID());
-			} else if (commandType == NETCOMMANDTYPE_FRAMEINFO) {
-				msg = newInstance(NetFrameCommandMsg)();
-				++frame; // this is set below.
-				((NetFrameCommandMsg *)msg)->setCommandCount(0);
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Read a repeated frame command, frame = %d, player = %d, commandID = %d\n", frame, playerID, commandID));
-			} else {
-				DEBUG_CRASH(("Trying to repeat a command that shouldn't be repeated."));
-				continue;
-			}
-
-			msg->setExecutionFrame(frame);
-			msg->setPlayerID(playerID);
-			msg->setNetCommandType((NetCommandType)commandType);
-			msg->setID(commandID);
-
-//			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("frame = %d, player = %d, command type = %d, id = %d\n", frame, playerID, commandType, commandID));
-
-			// increment to the next command ID.
-			if (DoesCommandRequireACommandID((NetCommandType)commandType)) {
-				++commandID;
-			}
-
-			// add the message to the list.
-			NetCommandRef *ref = retval->addMessage(msg);
-			if (ref != NULL) {
-				ref->setRelay(relay);
-			}
-
-			deleteInstance(lastCommand);
-			lastCommand = NULL;
-//			lastCommand = newInstance(NetCommandRef)(msg);
-			lastCommand = NEW_NETCOMMANDREF(msg);
-
-			msg->detach();  // Need to detach from new NetCommandMsg created by the "readXMessage" above.
-
-			// since the message is part of the list now, we don't have to keep track of it.  So we'll just set it to NULL.
-			msg = NULL;
-		} else {
-			// we don't recognize this command, but we have to increment i so we don't fall into an infinite loop.
-			DEBUG_CRASH(("Unrecognized packet entry, ignoring."));
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList - Unrecognized packet entry at index %d\n", i));
-			dumpPacketToLog();
-			++i;
-		}
-	}
-
-	if (lastCommand != NULL) {
-		deleteInstance(lastCommand);
-		lastCommand = NULL;
-	}
-	return retval;
-}
-
-/**
- * Reads the data portion of a game message from the given position in the packet.
- */
-NetCommandMsg * NetPacket::readGameMessage(UnsignedByte *data, Int &i) 
-{
-	NetGameCommandMsg *msg = newInstance(NetGameCommandMsg);
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readGameMessage\n"));
-
-	// Get the GameMessage command type.
-	GameMessage::Type newType;
-	memcpy(&newType, data + i, sizeof(GameMessage::Type));
-	i += sizeof(GameMessage::Type);
-	msg->setGameMessageType(newType);
-
-	// Get the number of argument types
-	UnsignedByte numArgTypes = 0;
-	memcpy(&numArgTypes, data + i, sizeof(numArgTypes));
-	i += sizeof(numArgTypes);
-
-	// Get the types and the number of arguments of those types.
-	Int totalArgCount = 0;
-	GameMessageParser *parser = newInstance(GameMessageParser)();
-	Int j = 0;
-	for (; j < numArgTypes; ++j) {
-		UnsignedByte type = (UnsignedByte)ARGUMENTDATATYPE_UNKNOWN;
-		memcpy(&type, data + i, sizeof(type));
-		i += sizeof(type);
-
-		UnsignedByte argCount = 0;
-		memcpy(&argCount, data + i, sizeof(argCount));
-		i += sizeof(argCount);
-
-		parser->addArgType((GameMessageArgumentDataType)type, argCount);
-		totalArgCount += argCount;
-	}
-
-	GameMessageParserArgumentType *parserArgType = parser->getFirstArgumentType();
-	GameMessageArgumentDataType lasttype = ARGUMENTDATATYPE_UNKNOWN;
-	Int argsLeftForType = 0;
-	if (parserArgType != NULL) {
-		lasttype = parserArgType->getType();
-		argsLeftForType = parserArgType->getArgCount();
-	}
-	for (j = 0; j < totalArgCount; ++j) {
-		readGameMessageArgumentFromPacket(lasttype, msg, data, i);
-
-		--argsLeftForType;
-		if (argsLeftForType == 0) {
-			DEBUG_ASSERTCRASH(parserArgType != NULL, ("parserArgType was NULL when it shouldn't have been."));
-			if (parserArgType == NULL) {
-				return NULL;
-			}
-
-			parserArgType = parserArgType->getNext();
-			// parserArgType is allowed to be NULL here
-			if (parserArgType != NULL) {
-				argsLeftForType = parserArgType->getArgCount();
-				lasttype = parserArgType->getType();
-			}
-		}
-	}
-
-	deleteInstance(parser);
-	parser = NULL;
-
-	return (NetCommandMsg *)msg;
-}
-
-void NetPacket::readGameMessageArgumentFromPacket(GameMessageArgumentDataType type, NetGameCommandMsg *msg, UnsignedByte *data, Int &i) {
-	if (type == ARGUMENTDATATYPE_INTEGER) {
-		GameMessageArgumentType arg;
-		Int theint;
-		memcpy(&theint, data + i, sizeof(theint));
-		i += sizeof(theint);
-		arg.integer = theint;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_REAL) {
-		GameMessageArgumentType arg;
-		Real thereal;
-		memcpy(&thereal, data + i, sizeof(thereal));
-		i += sizeof(thereal);
-		arg.real = thereal;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-		GameMessageArgumentType arg;
-		Bool thebool;
-		memcpy(&thebool, data + i, sizeof(thebool));
-		i += sizeof(thebool);
-		arg.boolean = thebool;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-		GameMessageArgumentType arg;
-		ObjectID theint;
-		memcpy(&theint, data + i, sizeof(theint));
-		i += sizeof(theint);
-		arg.objectID = theint;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-		GameMessageArgumentType arg;
-		DrawableID theint;
-		memcpy(&theint, data + i, sizeof(theint));
-		i += sizeof(theint);
-		arg.drawableID = theint;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_TEAMID) {
-		GameMessageArgumentType arg;
-		UnsignedInt theint;
-		memcpy(&theint, data + i, sizeof(theint));
-		i += sizeof(theint);
-		arg.teamID = theint;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_LOCATION) {
-		GameMessageArgumentType arg;
-		Coord3D coord;
-		memcpy(&coord, data + i, sizeof(coord));
-		i += sizeof(coord);
-		arg.location = coord;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_PIXEL) {
-		GameMessageArgumentType arg;
-		ICoord2D pixel;
-		memcpy(&pixel, data + i, sizeof(pixel));
-		i += sizeof(pixel);
-		arg.pixel = pixel;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-		GameMessageArgumentType arg;
-		IRegion2D reg;
-		memcpy(&reg, data + i, sizeof(reg));
-		i += sizeof(reg);
-		arg.pixelRegion = reg;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {
-		GameMessageArgumentType arg;
-		UnsignedInt stamp;
-		memcpy(&stamp, data + i, sizeof(stamp));
-		i += sizeof(stamp);
-		arg.timestamp = stamp;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-		GameMessageArgumentType arg;
-		WideChar c;
-		memcpy(&c, data + i, sizeof(c));
-		i += sizeof(c);
-		arg.wChar = c;
-		msg->addArgument(type, arg);
-	}
-}
-
-/**
- * Reads the data portion of the ack message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readAckBothMessage(UnsignedByte *data, Int &i) {
-	NetAckBothCommandMsg *msg = newInstance(NetAckBothCommandMsg);
-
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readAckMessage, "));
-	UnsignedShort cmdID = 0;
-
-	memcpy(&cmdID, data + i, sizeof(UnsignedShort));
-	i += sizeof(UnsignedShort);
-	msg->setCommandID(cmdID);
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("commandID = %d, ", cmdID));
-
-	UnsignedByte origPlayerID = 0;
-	memcpy(&origPlayerID, data + i, sizeof(UnsignedByte));
-	i += sizeof(UnsignedByte);
-	msg->setOriginalPlayerID(origPlayerID);
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("original player id = %d\n", origPlayerID));
-
-	return msg;
-}
-
-/**
- * Reads the data portion of the ack message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readAckStage1Message(UnsignedByte *data, Int &i) {
-	NetAckStage1CommandMsg *msg = newInstance(NetAckStage1CommandMsg);
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readAckMessage, "));
-	UnsignedShort cmdID = 0;
-
-	memcpy(&cmdID, data + i, sizeof(UnsignedShort));
-	i += sizeof(UnsignedShort);
-	msg->setCommandID(cmdID);
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("commandID = %d, ", cmdID));
-
-	UnsignedByte origPlayerID = 0;
-	memcpy(&origPlayerID, data + i, sizeof(UnsignedByte));
-	i += sizeof(UnsignedByte);
-	msg->setOriginalPlayerID(origPlayerID);
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("original player id = %d\n", origPlayerID));
-
-	return msg;
-}
-
-/**
- * Reads the data portion of the ack message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readAckStage2Message(UnsignedByte *data, Int &i) {
-	NetAckStage2CommandMsg *msg = newInstance(NetAckStage2CommandMsg);
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readAckMessage, "));
-	UnsignedShort cmdID = 0;
-
-	memcpy(&cmdID, data + i, sizeof(UnsignedShort));
-	i += sizeof(UnsignedShort);
-	msg->setCommandID(cmdID);
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("commandID = %d, ", cmdID));
-
-	UnsignedByte origPlayerID = 0;
-	memcpy(&origPlayerID, data + i, sizeof(UnsignedByte));
-	i += sizeof(UnsignedByte);
-	msg->setOriginalPlayerID(origPlayerID);
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("original player id = %d\n", origPlayerID));
-
-	return msg;
-}
-
-/**
- * Reads the data portion of the frame message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readFrameMessage(UnsignedByte *data, Int &i) {
-	NetFrameCommandMsg *msg = newInstance(NetFrameCommandMsg);
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readFrameMessage, "));
-	UnsignedShort cmdCount = 0;
-
-	memcpy(&cmdCount, data + i, sizeof(UnsignedShort));
-	i += sizeof(UnsignedShort);
-	msg->setCommandCount(cmdCount);
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command count = %d, ", cmdCount));
-
-	return msg;
-}
-
-/**
- * Reads the player leave message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readPlayerLeaveMessage(UnsignedByte *data, Int &i) {
-	NetPlayerLeaveCommandMsg *msg = newInstance(NetPlayerLeaveCommandMsg);
-
-	UnsignedByte leavingPlayerID = 0;
-
-	memcpy(&leavingPlayerID, data + i, sizeof(UnsignedByte));
-	i += sizeof(UnsignedByte);
-	msg->setLeavingPlayerID(leavingPlayerID);
-
-	return msg;
-}
-
-/**
- * Reads the run ahead metrics message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readRunAheadMetricsMessage(UnsignedByte *data, Int &i) {
-	NetRunAheadMetricsCommandMsg *msg = newInstance(NetRunAheadMetricsCommandMsg);
-
-	Real averageLatency = (Real)0.2;
-	UnsignedShort averageFps = 30;
-
-	memcpy(&averageLatency, data + i, sizeof(Real));
-	i += sizeof(Real);
-	msg->setAverageLatency(averageLatency);
-
-	memcpy(&averageFps, data + i, sizeof(UnsignedShort));
-	i += sizeof(UnsignedShort);
-	msg->setAverageFps((Int)averageFps);
-	return msg;
-}
-
-/**
- * Reads the run ahead message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readRunAheadMessage(UnsignedByte *data, Int &i) {
-	NetRunAheadCommandMsg *msg = newInstance(NetRunAheadCommandMsg);
-
-	UnsignedShort newRunAhead = 20;
-	memcpy(&newRunAhead, data + i, sizeof(UnsignedShort));
-	i += sizeof(UnsignedShort);
-	msg->setRunAhead(newRunAhead);
-
-	UnsignedByte newFrameRate = 30;
-	memcpy(&newFrameRate, data + i, sizeof(UnsignedByte));
-	i += sizeof(UnsignedByte);
-	msg->setFrameRate(newFrameRate);
-
-	return msg;
-}
-
-/**
- * Reads the CRC info message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readDestroyPlayerMessage(UnsignedByte *data, Int &i) {
-	NetDestroyPlayerCommandMsg *msg = newInstance(NetDestroyPlayerCommandMsg);
-
-	UnsignedInt newVal = 0;
-	memcpy(&newVal, data + i, sizeof(UnsignedInt));
-	i += sizeof(UnsignedInt);
-	msg->setPlayerIndex(newVal);
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Saw CRC of 0x%8.8X\n", newCRC));
-
-	return msg;
-}
-
-/**
- * Reads the keep alive data, of which there is none.
- */
-NetCommandMsg * NetPacket::readKeepAliveMessage(UnsignedByte *data, Int &i) {
-	NetKeepAliveCommandMsg *msg = newInstance(NetKeepAliveCommandMsg);
-
-	return msg;
-}
-
-/**
- * Reads the disconnect keep alive data, of which there is none.
- */
-NetCommandMsg * NetPacket::readDisconnectKeepAliveMessage(UnsignedByte *data, Int &i) {
-	NetDisconnectKeepAliveCommandMsg *msg = newInstance(NetDisconnectKeepAliveCommandMsg);
-
-	return msg;
-}
-
-/**
- * Reads the disconnect player data.  Which is the slot number of the player being disconnected.
- */
-NetCommandMsg * NetPacket::readDisconnectPlayerMessage(UnsignedByte *data, Int &i) {
-	NetDisconnectPlayerCommandMsg *msg = newInstance(NetDisconnectPlayerCommandMsg);
-
-	UnsignedByte slot = 0;
-	memcpy(&slot, data + i, sizeof(slot));
-	i += sizeof(slot);
-	msg->setDisconnectSlot(slot);
-
-	UnsignedInt disconnectFrame = 0;
-	memcpy(&disconnectFrame, data + i, sizeof(disconnectFrame));
-	i += sizeof(disconnectFrame);
-	msg->setDisconnectFrame(disconnectFrame);
-
-	return msg;
-}
-
-/**
- * Reads the packet router query data, of which there is none.
- */
-NetCommandMsg * NetPacket::readPacketRouterQueryMessage(UnsignedByte *data, Int &i) {
-	NetPacketRouterQueryCommandMsg *msg = newInstance(NetPacketRouterQueryCommandMsg);
-
-	return msg;
-}
-
-/**
- * Reads the packet router ack data, of which there is none.
- */
-NetCommandMsg * NetPacket::readPacketRouterAckMessage(UnsignedByte *data, Int &i) {
-	NetPacketRouterAckCommandMsg *msg = newInstance(NetPacketRouterAckCommandMsg);
-
-	return msg;
-}
-
-/**
- * Reads the disconnect chat data, which is just the string.
- */
-NetCommandMsg * NetPacket::readDisconnectChatMessage(UnsignedByte *data, Int &i) {
-	NetDisconnectChatCommandMsg *msg = newInstance(NetDisconnectChatCommandMsg);
-
-	WideChar text[256];
-	UnsignedByte length;
-	memcpy(&length, data + i, sizeof(UnsignedByte));
-	++i;
-	memcpy(text, data + i, length * sizeof(WideChar));
-	i += length * sizeof(WideChar);
-	text[length] = 0;
-
-	UnicodeString unitext;
-	unitext.set(text);
-
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readDisconnectChatMessage - read message, message is %ls\n", unitext.str()));
-
-	msg->setText(unitext);
-	return msg;
-}
-
-/**
- * Reads the chat data, which is just the string.
- */
-NetCommandMsg * NetPacket::readChatMessage(UnsignedByte *data, Int &i) {
-	NetChatCommandMsg *msg = newInstance(NetChatCommandMsg);
-
-	WideChar text[256];
-	UnsignedByte length;
-	Int playerMask;
-	memcpy(&length, data + i, sizeof(UnsignedByte));
-	++i;
-	memcpy(text, data + i, length * sizeof(WideChar));
-	i += length * sizeof(WideChar);
-	text[length] = 0;
-	memcpy(&playerMask, data + i, sizeof(Int));
-	i += sizeof(Int);
-
-
-	UnicodeString unitext;
-	unitext.set(text);
-
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readChatMessage - read message, message is %ls\n", unitext.str()));
-
-	msg->setText(unitext);
-	msg->setPlayerMask(playerMask);
-	return msg;
-}
-
-/**
- * Reads the disconnect vote data.  Which is the slot number of the player being disconnected.
- */
-NetCommandMsg * NetPacket::readDisconnectVoteMessage(UnsignedByte *data, Int &i) {
-	NetDisconnectVoteCommandMsg *msg = newInstance(NetDisconnectVoteCommandMsg);
-
-	UnsignedByte slot = 0;
-	memcpy(&slot, data + i, sizeof(slot));
-	i += sizeof(slot);
-	msg->setSlot(slot);
-
-	UnsignedInt voteFrame = 0;
-	memcpy(&voteFrame, data + i, sizeof(voteFrame));
-	i += sizeof(voteFrame);
-	msg->setVoteFrame(voteFrame);
-
-	return msg;
-}
-
-/**
- * Reads the Progress data.  Which is the slot number of the player being disconnected.
- */
-NetCommandMsg * NetPacket::readProgressMessage(UnsignedByte *data, Int &i) {
-	NetProgressCommandMsg *msg = newInstance(NetProgressCommandMsg);
-
-	UnsignedByte percentage = 0;
-	memcpy(&percentage, data + i, sizeof(UnsignedByte));
-	i += sizeof(UnsignedByte);
-	msg->setPercentage(percentage);
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readLoadCompleteMessage(UnsignedByte *data, Int &i) {
-	NetCommandMsg *msg = newInstance(NetCommandMsg);
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readTimeOutGameStartMessage(UnsignedByte *data, Int &i) {
-	NetCommandMsg *msg = newInstance(NetCommandMsg);
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readWrapperMessage(UnsignedByte *data, Int &i) {
-	NetWrapperCommandMsg *msg = newInstance(NetWrapperCommandMsg);
-
-	// get the wrapped command ID
-	UnsignedShort wrappedCommandID = 0;
-	memcpy(&wrappedCommandID, data + i, sizeof(wrappedCommandID));
-	msg->setWrappedCommandID(wrappedCommandID);
-	i += sizeof(wrappedCommandID);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - wrapped command ID == %d\n", wrappedCommandID));
-
-	// get the chunk number.
-	UnsignedInt chunkNumber = 0;
-	memcpy(&chunkNumber, data + i, sizeof(chunkNumber));
-	msg->setChunkNumber(chunkNumber);
-	i += sizeof(chunkNumber);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - chunk number = %d\n", chunkNumber));
-
-	// get the number of chunks
-	UnsignedInt numChunks = 0;
-	memcpy(&numChunks, data + i, sizeof(numChunks));
-	msg->setNumChunks(numChunks);
-	i += sizeof(numChunks);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - number of chunks = %d\n", numChunks));
-
-	// get the total data length
-	UnsignedInt totalDataLength = 0;
-	memcpy(&totalDataLength, data + i, sizeof(totalDataLength));
-	msg->setTotalDataLength(totalDataLength);
-	i += sizeof(totalDataLength);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - total data length = %d\n", totalDataLength));
-
-	// get the data length for this chunk
-	UnsignedInt dataLength = 0;
-	memcpy(&dataLength, data + i, sizeof(dataLength));
-	i += sizeof(dataLength);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - data length = %d\n", dataLength));
-
-	UnsignedInt dataOffset = 0;
-	memcpy(&dataOffset, data + i, sizeof(dataOffset));
-	msg->setDataOffset(dataOffset);
-	i += sizeof(dataOffset);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - data offset = %d\n", dataOffset));
-
-	msg->setData(data + i, dataLength);
-	i += dataLength;
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readFileMessage(UnsignedByte *data, Int &i) {
-	NetFileCommandMsg *msg = newInstance(NetFileCommandMsg);
-	char filename[_MAX_PATH];
-	char *c = filename;
-
-	while (data[i] != 0) {
-		*c = data[i];
-		++c;
-		++i;
-	}
-	*c = 0;
-	++i;
-	msg->setPortableFilename(AsciiString(filename));	// it's transferred as a portable filename
-
-	UnsignedInt dataLength = 0;
-	memcpy(&dataLength, data + i, sizeof(dataLength));
-	i += sizeof(dataLength);
-
-	UnsignedByte *buf = NEW UnsignedByte[dataLength];
-	memcpy(buf, data + i, dataLength);
-	i += dataLength;
-
-	msg->setFileData(buf, dataLength);
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readFileAnnounceMessage(UnsignedByte *data, Int &i) {
-	NetFileAnnounceCommandMsg *msg = newInstance(NetFileAnnounceCommandMsg);
-	char filename[_MAX_PATH];
-	char *c = filename;
-
-	while (data[i] != 0) {
-		*c = data[i];
-		++c;
-		++i;
-	}
-	*c = 0;
-	++i;
-	msg->setPortableFilename(AsciiString(filename));	// it's transferred as a portable filename
-
-	UnsignedShort fileID = 0;
-	memcpy(&fileID, data + i, sizeof(fileID));
-	i += sizeof(fileID);
-	msg->setFileID(fileID);
-
-	UnsignedByte playerMask = 0;
-	memcpy(&playerMask, data + i, sizeof(playerMask));
-	i += sizeof(playerMask);
-	msg->setPlayerMask(playerMask);
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readFileProgressMessage(UnsignedByte *data, Int &i) {
-	NetFileProgressCommandMsg *msg = newInstance(NetFileProgressCommandMsg);
-
-	UnsignedShort fileID = 0;
-	memcpy(&fileID, data + i, sizeof(fileID));
-	i += sizeof(fileID);
-	msg->setFileID(fileID);
-
-	Int progress = 0;
-	memcpy(&progress, data + i, sizeof(progress));
-	i += sizeof(progress);
-	msg->setProgress(progress);
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readDisconnectFrameMessage(UnsignedByte *data, Int &i) {
-	NetDisconnectFrameCommandMsg *msg = newInstance(NetDisconnectFrameCommandMsg);
-
-	UnsignedInt disconnectFrame = 0;
-	memcpy(&disconnectFrame, data + i, sizeof(disconnectFrame));
-	i += sizeof(disconnectFrame);
-	msg->setDisconnectFrame(disconnectFrame);
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readDisconnectFrameMessage - read disconnect frame for frame %d\n", disconnectFrame));
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readDisconnectScreenOffMessage(UnsignedByte *data, Int &i) {
-	NetDisconnectScreenOffCommandMsg *msg = newInstance(NetDisconnectScreenOffCommandMsg);
-
-	UnsignedInt newFrame = 0;
-	memcpy(&newFrame, data + i, sizeof(newFrame));
-	i += sizeof(newFrame);
-	msg->setNewFrame(newFrame);
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readFrameResendRequestMessage(UnsignedByte *data, Int &i) {
-	NetFrameResendRequestCommandMsg *msg = newInstance(NetFrameResendRequestCommandMsg);
-
-	UnsignedInt frameToResend = 0;
-	memcpy(&frameToResend, data + i, sizeof(frameToResend));
-	i += sizeof(frameToResend);
-	msg->setFrameToResend(frameToResend);
-
-	return msg;
-}
-
-/**
- * Returns the number of commands in this packet.  Only valid if the packet is locally constructed.
- */
-Int NetPacket::getNumCommands() {
-	return m_numCommands;
-}
-
-/**
- * Returns the address that this packet is to be sent to.  Only valid if the packet is locally constructed.
- */
-UnsignedInt NetPacket::getAddr() {
-	return m_addr;
-}
-
-/**
- * Returns the port that this packet is to be sent to.  Only valid if the packet is locally constructed.
- */
-UnsignedShort NetPacket::getPort() {
-	return m_port;
-}
-
-/**
- * Returns the data of this packet.
- */
-UnsignedByte * NetPacket::getData() {
-	return m_packet;
-}
-
-/**
- * Returns the length of the packet.
- */
-Int NetPacket::getLength() {
-	return m_packetLen;
-}
-
-/**
- * Dumps the packet to the debug log file
- */
-void NetPacket::dumpPacketToLog() {
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::dumpPacketToLog() - packet is %d bytes\n", m_packetLen));
-	Int numLines = m_packetLen / 8;
-	if ((m_packetLen % 8) != 0) {
-		++numLines;
-	}
-	for (Int dumpindex = 0; dumpindex < numLines; ++dumpindex) {
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("\t%d\t", dumpindex*8));
-		for (Int dumpindex2 = 0; (dumpindex2 < 8) && ((dumpindex*8 + dumpindex2) < m_packetLen); ++dumpindex2) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("%02x '%c' ", m_packet[dumpindex*8 + dumpindex2], m_packet[dumpindex*8 + dumpindex2]));
-		}
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("\n"));
-	}
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("End of packet dump\n"));
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp b/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp
deleted file mode 100644
index 6c9003908bc..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp
+++ /dev/null
@@ -1,1035 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Network.cpp ////////////////////////////////////////////////////
-// Implementation of Network singleton
-// Author: Matthew D. Campbell, July 2001
-///////////////////////////////////////////////////////////////////////////////
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameEngine.h"
-#include "Common/MessageStream.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/udp.h"
-#include "GameNetwork/Transport.h"
-#include "strtok_r.h"
-#include "GameClient/Shell.h"
-#include "Common/CRCDebug.h"
-#include "GameLogic/GameLogic.h"
-
-#include "Common/RandomValue.h"
-
-
-#include "GameLogic/ScriptActions.h"
-#include "GameLogic/ScriptEngine.h"
-#include "Common/Recorder.h"
-#include "GameClient/MessageBox.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#if defined(DEBUG_CRC)
-Int NET_CRC_INTERVAL = 1;
-#else
-Int NET_CRC_INTERVAL = 100;
-#endif
-
-// DEFINES ////////////////////////////////////////////////////////////////////
-
-#define RESEND_INTERVAL 1
-
-// PRIVATE TYPES //////////////////////////////////////////////////////////////
-
-/**
- * Connection message - encapsulating info kept by the connection layer about each
- * packet.  These structs make up the in/out buffers at the connection layer.
- */
-#pragma pack(push, 1)
-struct ConnectionMessage
-{
-	Int id;
-	NetMessageFlags flags;
-	UnsignedByte data[MAX_MESSAGE_LEN];
-	time_t lastSendTime;
-	Int retries;
-	Int length;
-};
-#pragma pack(pop)
-
-static const int CmdMsgLen = 6; //< Minimum size of a command packet (Int + Unsigned Short)
-
-// PRIVATE DATA ///////////////////////////////////////////////////////////////
-
-
-
-// PUBLIC DATA ////////////////////////////////////////////////////////////////
-
-/// The Network singleton instance
-NetworkInterface *TheNetwork = NULL;
-
-// PRIVATE PROTOTYPES /////////////////////////////////////////////////////////
-
-/**
- * The Network class is used to instantiate a singleton which 
- * implements the interface to all Network operations such as message stream processing and network communications.
- */
-class Network : public NetworkInterface
-{
-public:
-	//---------------------------------------------------------------------------------------
-	// Setup / Teardown functions
-	Network();
-	~Network();
-	void init( void );																				///< Initialize or re-initialize the instance
-	void reset( void );																				///< Reinitialize the network
-	void update( void );																			///< Process command list
-	void liteupdate( void );																	///< Do a lightweight update to send packets and pass messages.
-	Bool deinit( void );																			///< Shutdown connections, release memory
-
-	void setLocalAddress(UnsignedInt ip, UnsignedInt port);
-	inline UnsignedInt getRunAhead(void) { return m_runAhead; }
-	inline UnsignedInt getFrameRate(void) { return m_frameRate; }
-	UnsignedInt getPacketArrivalCushion(void);								///< Returns the smallest packet arrival cushion since this was last called.
-	Bool isFrameDataReady( void );
-	void parseUserList( const GameInfo *game );
-	void startGame(void);																			///< Sets the network game frame counter to -1
-
-	void sendChat(UnicodeString text, Int playerMask);
-	void sendDisconnectChat(UnicodeString text);
-
-	void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID);
-	UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask);
-	Int getFileTransferProgress(Int playerID, AsciiString path);
-	Bool areAllQueuesEmpty(void);
-
-	void quitGame();
-	virtual void selfDestructPlayer(Int index);
-
-
-	void voteForPlayerDisconnect(Int slot);
-	virtual Bool isPacketRouter( void );
-
-	// Bandwidth metrics
-	Real getIncomingBytesPerSecond( void );
-	Real getIncomingPacketsPerSecond( void );
-	Real getOutgoingBytesPerSecond( void );
-	Real getOutgoingPacketsPerSecond( void );
-	Real getUnknownBytesPerSecond( void );
-	Real getUnknownPacketsPerSecond( void );
-
-	// Multiplayer Load Progress Functions
-	void updateLoadProgress( Int percent );
-	void loadProgressComplete( void );
-	void sendTimeOutGameStart( void );
-
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
-	// Disconnect screen testing
-	virtual void toggleNetworkOn();
-#endif
-
-	// Exposing some info contained in the Connection Manager
-	UnsignedInt getLocalPlayerID( void );
-	UnicodeString getPlayerName(Int playerNum);
-	Int getNumPlayers(void );
-
-	Int getAverageFPS() { return m_conMgr->getAverageFPS(); }
-	Int getSlotAverageFPS(Int slot);
-
-	void attachTransport(Transport *transport);
-	void initTransport();
-
-	void setSawCRCMismatch( void );
-	Bool sawCRCMismatch( void ) { return m_sawCRCMismatch; }
-	Bool isPlayerConnected( Int playerID );
-
-	void notifyOthersOfCurrentFrame();														///< Tells all the other players what frame we are on.
-	void notifyOthersOfNewFrame(UnsignedInt frame);								///< Tells all the other players that we are on a new frame.
-
-	Int  getExecutionFrame();																			///< Returns the next valid frame for simultaneous command execution.
-
-	// For disconnect blame assignment
-	UnsignedInt getPingFrame();
-	Int getPingsSent();
-	Int getPingsRecieved();
-
-protected:
-	void GetCommandsFromCommandList();														///< Remove commands from TheCommandList and put them on the Network command list.
-	void SendCommandsToConnectionManager();												///< Send the new commands to the ConnectionManager
-	Bool AllCommandsReady(UnsignedInt frame);											///< Do we have all the commands for the given frame?
-	void RelayCommandsToCommandList(UnsignedInt frame);						///< Put the commands for the given frame onto TheCommandList.
-	Bool isTransferCommand(GameMessage *msg);											///< Is this a command that needs to be transfered to the other clients?
-	Bool processCommand(GameMessage *msg);												///< Whatever needs to be done as a result of this command, do it now.
-	void processFrameSynchronizedNetCommand(NetCommandRef *msg);	///< If there is a network command that needs to be executed at the same frame number on all clients, it happens here.
-	void processRunAheadCommand(NetRunAheadCommandMsg *msg);			///< Do what needs to be done when we get a new run ahead command.
-	void processDestroyPlayerCommand(NetDestroyPlayerCommandMsg *msg);	///< Do what needs to be done when we need to destroy a player.
-	void endOfGameCheck();																				///< Checks to see if its ok to leave this game.  If it is, send the apropriate command to the game logic.
-	Bool timeForNewFrame();
-
-	ConnectionManager *m_conMgr;																	///< The connection manager object
-
-	UnsignedInt m_lastFrame;																			///< The last game logic frame that was processed.
-
-	NetLocalStatus m_localStatus;															///< My local status as a player in this game.
-
-	Int m_runAhead;																						///< The current run ahead of the game.
-	Int m_frameRate;
-	Int m_lastExecutionFrame;																	///< The highest frame number that a command could have been executed on.
-	Int m_lastFrameCompleted;
-	Bool m_didSelfSlug;
-	__int64 m_perfCountFreq;														///< The frequency of the performance counter.
-
-	__int64 m_nextFrameTime;														///< When did we execute the last frame?  For slugging the GameLogic...
-
-	Bool m_frameDataReady;																		///< Is the frame data for the next frame ready to be executed by TheGameLogic?
-
-	// CRC info
-	Bool m_checkCRCsThisFrame;
-	Bool m_sawCRCMismatch;
-	std::vector<UnsignedInt> m_CRC[MAX_SLOTS];
-	std::list<Int> m_playersToDisconnect;
-	GameWindow *m_messageWindow;
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	Bool m_networkOn;
-#endif
-};
-
-UnsignedInt Network::getPingFrame()
-{
-	return (m_conMgr)?m_conMgr->getPingFrame():0;
-}
-
-Int Network::getPingsSent()
-{
-	return (m_conMgr)?m_conMgr->getPingsSent():0;
-}
-
-Int Network::getPingsRecieved()
-{
-	return (m_conMgr)?m_conMgr->getPingsRecieved():0;
-}
-
-Bool Network::isPlayerConnected( Int playerID ) {
-	if (playerID == getLocalPlayerID()) {
-		return m_localStatus == NETLOCALSTATUS_INGAME || m_localStatus == NETLOCALSTATUS_LEAVING;
-	}
-	return m_conMgr->isPlayerConnected(playerID);
-}
-
-
-// PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-// PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-/**
- * This creates a network object and returns it.
- */
-NetworkInterface *NetworkInterface::createNetwork() 
-{
-	return NEW Network;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * The constructor.
- */
-Network::Network()
-{
-	//Added By Sadullah Nader
-	//Initializations inserted
-	m_checkCRCsThisFrame = FALSE;
-	m_didSelfSlug = FALSE;
-	m_frameDataReady = FALSE;
-	m_sawCRCMismatch = FALSE;
-	//
-	
-	m_conMgr = NULL;
-	m_messageWindow = NULL;
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	m_networkOn = TRUE;
-#endif
-}
-
-/**
- * The destructor.
- */
-Network::~Network()
-{
-	deinit();
-}
-
-/**
- * This basically releases all the memory.
- */
-Bool Network::deinit( void )
-{
-	if (m_conMgr)
-	{
-		m_conMgr->destroyGameMessages();
-		delete m_conMgr;
-		m_conMgr = NULL;
-	}
-	if (m_messageWindow) {
-		TheWindowManager->winDestroy(m_messageWindow);
-		m_messageWindow = NULL;
-	}
-
-	return true;
-}
-
-/**
- * Takes the network back to the initial state.
- */
-void Network::reset() {
-	init();
-}
-
-/**
- * Initializes all the network subsystems.
- */
-void Network::init()
-{
-	if (!deinit())
-	{
-		DEBUG_LOG(("Could not deinit network prior to init!\n"));
-		return;
-	}
-
-	m_conMgr = NEW ConnectionManager;
-	m_conMgr->init();
-
-	m_lastFrame = 0;
-	m_runAhead = min(max(30, MIN_RUNAHEAD), MAX_FRAMES_AHEAD/2); ///< @todo: don't hard-code the run-ahead.
-	m_frameRate = 30;
-	m_lastExecutionFrame = m_runAhead - 1; // subtract 1 since we're starting on frame 0
-	m_lastFrameCompleted = m_runAhead - 1; // subtract 1 since we're starting on frame 0
-	m_frameDataReady = FALSE;
-	m_didSelfSlug = FALSE;
-
-	m_localStatus = NETLOCALSTATUS_PREGAME;
-
-	QueryPerformanceFrequency((LARGE_INTEGER *)&m_perfCountFreq);
-	m_nextFrameTime = 0;
-	m_sawCRCMismatch = FALSE;
-	m_checkCRCsThisFrame = FALSE;
-
-	DEBUG_LOG(("Network timing values:\n"));
-	DEBUG_LOG(("NetworkFPSHistoryLength: %d\n", TheGlobalData->m_networkFPSHistoryLength));
-	DEBUG_LOG(("NetworkLatencyHistoryLength: %d\n", TheGlobalData->m_networkLatencyHistoryLength));
-	DEBUG_LOG(("NetworkRunAheadMetricsTime: %d\n", TheGlobalData->m_networkRunAheadMetricsTime));
-	DEBUG_LOG(("NetworkCushionHistoryLength: %d\n", TheGlobalData->m_networkCushionHistoryLength));
-	DEBUG_LOG(("NetworkRunAheadSlack: %d\n", TheGlobalData->m_networkRunAheadSlack));
-	DEBUG_LOG(("NetworkKeepAliveDelay: %d\n", TheGlobalData->m_networkKeepAliveDelay));
-	DEBUG_LOG(("NetworkDisconnectTime: %d\n", TheGlobalData->m_networkDisconnectTime));
-	DEBUG_LOG(("NetworkPlayerTimeoutTime: %d\n", TheGlobalData->m_networkPlayerTimeoutTime));
-	DEBUG_LOG(("NetworkDisconnectScreenNotifyTime: %d\n", TheGlobalData->m_networkDisconnectScreenNotifyTime));
-	DEBUG_LOG(("Other network stuff:\n"));
-	DEBUG_LOG(("FRAME_DATA_LENGTH = %d\n", FRAME_DATA_LENGTH));
-	DEBUG_LOG(("FRAMES_TO_KEEP = %d\n", FRAMES_TO_KEEP));
-
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	m_networkOn = TRUE;
-#endif
-
-	return;
-}
-
-void Network::setSawCRCMismatch( void )
-{
-	m_sawCRCMismatch = TRUE;
-
-	TheScriptActions->closeWindows( TRUE );
-	m_messageWindow = TheWindowManager->winCreateFromScript("Menus/CRCMismatch.wnd");
-	TheScriptEngine->startEndGameTimer();
-
-	TheRecorder->logCRCMismatch();
-
-	// dump GameLogic random seed
-	DEBUG_LOG(("Latest frame for mismatch = %d GameLogic frame = %d\n",
-		TheGameLogic->getFrame()-m_runAhead-1, TheGameLogic->getFrame()));
-	DEBUG_LOG(("GetGameLogicRandomSeedCRC() = %d\n", GetGameLogicRandomSeedCRC()));
-
-	// dump CRCs
-	{
-		DEBUG_LOG(("--- GameState Dump ---\n"));
-#ifdef DEBUG_CRC
-		outputCRCDumpLines();
-#endif
-		DEBUG_LOG(("------ End Dump ------\n"));
-	}
-	{
-		DEBUG_LOG(("--- DebugInfo Dump ---\n"));
-#ifdef DEBUG_CRC
-		outputCRCDebugLines();
-#endif
-		DEBUG_LOG(("------ End Dump ------\n"));
-	}
-}
-
-/**
- * Take a user list and build the connection queues and player lists and stuff like that.
- */
-void Network::parseUserList( const GameInfo *game )
-{
-	if (!game)
-	{
-		DEBUG_LOG(("FAILED parseUserList with a NULL game\n"));
-		return;
-	}
-
-	m_conMgr->parseUserList(game);
-
-	// Now that we have the players in this game, we need to reset the FrameData stuff.
-	m_conMgr->destroyGameMessages();
-	m_conMgr->zeroFrames(1, m_runAhead-1); ///< we zero out m_runAhead frames +1 because the game actually starts at frame 1.
-}
-
-/**
- * Guess what, we're starting a game!
- */
-void Network::startGame() {
-}
-
-/**
- * Tell the network which ip address the user has chosen to use.  Well ok, they probably didn't choose
- * it explicitly, but regardless, this is the one we're going to use.
- */
-void Network::setLocalAddress(UnsignedInt ip, UnsignedInt port) {
-	DEBUG_ASSERTCRASH(m_conMgr != NULL, ("Connection manager does not exist."));
-	if (m_conMgr != NULL) {
-		m_conMgr->setLocalAddress(ip, port);
-	}
-}
-
-/**
- * Tell the network to initialize the transport object
- */
-void Network::initTransport() {
-	DEBUG_ASSERTCRASH(m_conMgr != NULL, ("Connection manager does not exist."));
-	if (m_conMgr != NULL) {
-		m_conMgr->initTransport();
-	}
-}
-
-void Network::attachTransport(Transport *transport) {
-	DEBUG_ASSERTCRASH(m_conMgr != NULL, ("Connection manager does not exist."));
-	if (m_conMgr != NULL) {
-		m_conMgr->attachTransport(transport);
-	}
-}
-
-/**
- * Does this command need to be transfered to the other game clients?
- */
-Bool Network::isTransferCommand(GameMessage *msg) {
-	if ((msg != NULL) && ((msg->getType() > GameMessage::MSG_BEGIN_NETWORK_MESSAGES) && (msg->getType() < GameMessage::MSG_END_NETWORK_MESSAGES))) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Take commands from TheCommandList and give them to the connection manager for transport.
- */
-void Network::GetCommandsFromCommandList() {
-	GameMessage *msg = TheCommandList->getFirstMessage();
-	GameMessage *next = NULL;
-	while (msg != NULL) {
-		next = msg->next();
-		if (isTransferCommand(msg)) { // Is this something we should be sending to the other players?
-			if (m_localStatus == NETLOCALSTATUS_INGAME) {
-				m_conMgr->sendLocalGameMessage(msg, getExecutionFrame());
-			}
-			TheCommandList->removeMessage(msg); // This does not destroy msg's prev and next pointers, so they should still be valid.
-			deleteInstance(msg);
-		} else {
-			if (processCommand(msg)) {
-				TheCommandList->removeMessage(msg);
-				deleteInstance(msg);
-			}
-		}
-		msg = next;
-	}
-}
-
-Int Network::getExecutionFrame() {
-	Int logicFrame = TheGameLogic->getFrame() + m_runAhead;
-	if (logicFrame > m_lastExecutionFrame) {
-		m_lastExecutionFrame = logicFrame;
-		return (logicFrame);
-	}
-	return m_lastExecutionFrame;
-}
-
-/**
- * This is where any processing that needs to be done for specific game messages.
- * Also check here to see if the logic frame number has changed to see if we need to
- * send our info for the last frame to the other players.
- * Return true if the message should be "eaten" by the network.
- */
-Bool Network::processCommand(GameMessage *msg) 
-{
-	if ((m_lastFrame != TheGameLogic->getFrame()) || (m_localStatus == NETLOCALSTATUS_PREGAME)) {
-		// If this is the start of a new game logic frame, then tell the connection manager that the last
-		// frame is over and that it should now produce a frame info packet for the other players.
-
-		if (m_localStatus == NETLOCALSTATUS_PREGAME) {
-			// a sort-of-hack that prevents extraneous frames from being executed before the game actually starts.
-			// Idealy this shouldn't be necessary, but I don't think its hurting anything by being here.
-			if (TheGameLogic->getFrame() == 1) {
-				m_localStatus = NETLOCALSTATUS_INGAME;
-				NetCommandList *netcmdlist = m_conMgr->getFrameCommandList(0); // clear out frame 0 since we skipped it
-				deleteInstance(netcmdlist);
-			} else {
-				return FALSE;
-			}
-		}
-
-		// Only send frame info packets for frames where we are actually going to be in the game.
-		// The reason is so we don't have to wait for frame info packets to be sent that aren't going to
-		// matter anyways when we actually try to leave the game ourselves.
-		if (m_localStatus == NETLOCALSTATUS_INGAME) {
-			Int executionFrame = getExecutionFrame();
-
-			// Send command counts for all the frames we can.
-			for (Int i = m_lastFrameCompleted + 1; i < executionFrame; ++i) {
-				m_conMgr->processFrameTick(i);
-				//DEBUG_LOG(("Network::processCommand - calling processFrameTick for frame %d\n", i));
-				m_lastFrameCompleted = i;
-			}
-		}
-
-		//DEBUG_LOG(("Next Execution Frame - %d, last frame completed - %d\n", getExecutionFrame(), m_lastFrameCompleted));
-		m_lastFrame = TheGameLogic->getFrame();
-	}
-
-	// Are we leaving the game?
-	// This has to happen after the check to see if this is the start of a new logic frame.
-	// The reason is that we have to send all the frame info packets necessary to get to the
-	// frame where everyone else is going to see that we left.
-	if ((msg->getType() == GameMessage::MSG_CLEAR_GAME_DATA) && (m_localStatus == NETLOCALSTATUS_INGAME)) {
-		Int executionFrame = getExecutionFrame();
-		DEBUG_LOG(("Network::processCommand - local player leaving, executionFrame = %d, player leaving on frame %d\n", executionFrame, executionFrame+1));
-
-		m_conMgr->handleLocalPlayerLeaving(executionFrame+1);
-		m_conMgr->processFrameTick(executionFrame); // This is the last command we will execute, so send the command count.
-																								// Also, we are guaranteed not to send any more commands for this frame
-																								// since the local status will change to "Leaving" so we don't have to
-																								// worry about messing up the other players.
-		m_conMgr->processFrameTick(executionFrame+1); // since we send it for executionFrame+1, we need to process both ticks
-		m_lastFrameCompleted = executionFrame;
-		DEBUG_LOG(("Network::processCommand - player leaving on frame %d\n", executionFrame));
-		m_localStatus = NETLOCALSTATUS_LEAVING;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * returns true if all the commands are ready for the given frame.
- */
-Bool Network::AllCommandsReady(UnsignedInt frame) {
-	if (m_conMgr == NULL) {
-		return TRUE;
-	}
-
-	if (m_localStatus == NETLOCALSTATUS_PREGAME) {
-		return TRUE;
-	}
-
-	if (m_localStatus == NETLOCALSTATUS_POSTGAME) {
-		return TRUE;
-	}
-
-	return m_conMgr->allCommandsReady(frame);// && m_conMgr->allCRCsReady(frame);
-}
-
-/**
- * Take commands from the connection manager and put them on TheCommandList.
- * The commands need to be put on in the same order across all clients.
- */
-void Network::RelayCommandsToCommandList(UnsignedInt frame) {
-	if ((m_conMgr == NULL) || (m_localStatus == NETLOCALSTATUS_PREGAME)) {
-		return;
-	}
-	m_checkCRCsThisFrame = FALSE;
-	NetCommandList *netcmdlist = m_conMgr->getFrameCommandList(frame);
-	NetCommandRef *msg = netcmdlist->getFirstMessage();
-	while (msg != NULL) {
-		NetCommandType cmdType = msg->getCommand()->getNetCommandType();
-		if (cmdType == NETCOMMANDTYPE_GAMECOMMAND) {
-			//DEBUG_LOG(("Network::RelayCommandsToCommandList - appending command %d of type %s to command list on frame %d\n", msg->getCommand()->getID(), ((NetGameCommandMsg *)msg->getCommand())->constructGameMessage()->getCommandAsAsciiString().str(), TheGameLogic->getFrame()));
-			TheCommandList->appendMessage(((NetGameCommandMsg *)msg->getCommand())->constructGameMessage());
-		} else {
-			processFrameSynchronizedNetCommand(msg);
-		}
-		msg = msg->getNext();
-	}
-
-	for (std::list<Int>::iterator selfDestructIt = m_playersToDisconnect.begin(); selfDestructIt != m_playersToDisconnect.end(); ++selfDestructIt)
-	{
-		//Int playerToDisconnect = *selfDestructIt;
-		//GameMessage *msg = newInstance(GameMessage)( GameMessage::MSG_SELF_DESTRUCT );
-		//msg->friend_setPlayerIndex(playerToDisconnect);
-		//msg->appendBooleanArgument(TRUE);
-		//TheCommandList->appendMessage(msg);
-	}
-	m_playersToDisconnect.clear();
-
-	deleteInstance(netcmdlist);
-}
-
-/**
- * This is where network commands that need to be executed on the same frame should be executed.
- */
-void Network::processFrameSynchronizedNetCommand(NetCommandRef *msg) {
-	NetCommandMsg *cmdMsg = msg->getCommand();
-	if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_PLAYERLEAVE) {
-		PlayerLeaveCode retval = m_conMgr->processPlayerLeave((NetPlayerLeaveCommandMsg *)cmdMsg);
-		if (retval == PLAYERLEAVECODE_LOCAL) {
-			DEBUG_LOG(("Network::processFrameSynchronizedNetCommand - Local player left the game on frame %d.\n", TheGameLogic->getFrame()));
-			m_localStatus = NETLOCALSTATUS_LEFT;
-		} else if (retval == PLAYERLEAVECODE_PACKETROUTER) {
-			DEBUG_LOG(("Network::processFrameSynchronizedNetCommand - Packet router left the game on frame %d\n", TheGameLogic->getFrame()));
-		} else {
-			DEBUG_LOG(("Network::processFrameSynchronizedNetCommand - Client left the game on frame %d\n", TheGameLogic->getFrame()));
-		}
-	}
-	else if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEAD) {
-		NetRunAheadCommandMsg *netmsg = (NetRunAheadCommandMsg *)cmdMsg;
-		processRunAheadCommand(netmsg);
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command to set run ahead to %d and frame rate to %d on frame %d actually executed on frame %d\n", netmsg->getRunAhead(), netmsg->getFrameRate(), netmsg->getExecutionFrame(), TheGameLogic->getFrame()));
-	}
-	else if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_DESTROYPLAYER) {
-		NetDestroyPlayerCommandMsg *netmsg = (NetDestroyPlayerCommandMsg *)cmdMsg;
-		processDestroyPlayerCommand(netmsg);
-		//DEBUG_LOG(("CRC command (%8.8X) on frame %d actually executed on frame %d\n", netmsg->getCRC(), netmsg->getExecutionFrame(), TheGameLogic->getFrame()));
-	}
-}
-
-void Network::processRunAheadCommand(NetRunAheadCommandMsg *msg) {
-	m_runAhead = msg->getRunAhead();
-	m_frameRate = msg->getFrameRate();
-	time_t frameGrouping = (1000 * m_runAhead) / m_frameRate; // number of miliseconds between packet sends
-	frameGrouping = frameGrouping / 2; // since we only want the latency for one way to be a factor.
-//	DEBUG_LOG(("Network::processRunAheadCommand - trying to set frame grouping to %d.  run ahead = %d, m_frameRate = %d\n", frameGrouping, m_runAhead, m_frameRate));
-	if (frameGrouping < 1) {
-		frameGrouping = 1; // Having a value less than 1 doesn't make sense.
-	}
-	if (frameGrouping > 500) {
-		frameGrouping = 500; // Max of a half a second.
-	}
-	m_conMgr->setFrameGrouping(frameGrouping);
-}
-
-void Network::processDestroyPlayerCommand(NetDestroyPlayerCommandMsg *msg)
-{
-	UnsignedInt playerIndex = msg->getPlayerIndex();
-	DEBUG_ASSERTCRASH(playerIndex < MAX_SLOTS, ("Bad player index"));
-	if (playerIndex >= MAX_SLOTS)
-		return;
-
-	AsciiString playerName;
-	playerName.format("player%d", playerIndex);
-	Player *pPlayer = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
-	if (pPlayer)
-	{
-		GameMessage *msg = newInstance(GameMessage)(GameMessage::MSG_SELF_DESTRUCT);
-		msg->appendBooleanArgument(FALSE);
-		msg->friend_setPlayerIndex(pPlayer->getPlayerIndex());
-		TheCommandList->appendMessage(msg);
-	}
-
-	DEBUG_LOG(("Saw DestroyPlayer from %d about %d for frame %d on frame %d\n", msg->getPlayerID(), msg->getPlayerIndex(),
-		msg->getExecutionFrame(), TheGameLogic->getFrame()));
-}
-
-/**
- * Service queues, process message stream, etc
- */
-void Network::update( void )
-{
-//
-// 1. Take Commands off TheCommandList, hand them off to the ConnectionManager.
-// 2. Call ConnectionManager->update;
-// 3. Check to see if all the commands for the next frame are there.
-// 4. If all commands are there, put that frame's commands on TheCommandList.
-//
-	m_frameDataReady = FALSE;
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (m_networkOn == FALSE) {
-		return;
-	}
-#endif
-
-	GetCommandsFromCommandList(); // Remove commands from TheCommandList and send them to the connection manager.
-	if (m_conMgr != NULL) {
-		if (m_localStatus == NETLOCALSTATUS_INGAME) {
-			m_conMgr->updateRunAhead(m_runAhead, m_frameRate, m_didSelfSlug, getExecutionFrame());
-			m_didSelfSlug = FALSE;
-		}
-		//m_conMgr->update(); // Do the priority thing, packetize thing. This also calls the Transport::update function.
-									 // depacketizes the incoming packets and puts them on the Network command list.
-	}
-
-	liteupdate();
-
-	if (m_localStatus == NETLOCALSTATUS_LEFT) {// || (m_localStatus == NETLOCALSTATUS_LEAVING)) {
-		endOfGameCheck();
-	}
-
-	if (AllCommandsReady(TheGameLogic->getFrame())) { // If all the commands are ready for the next frame...
-		m_conMgr->handleAllCommandsReady();
-//		DEBUG_LOG(("Network::update - frame %d is ready\n", TheGameLogic->getFrame()));
-		if (timeForNewFrame()) { // This needs to come after any other pre-frame execution checks as this changes the timing variables.
-			RelayCommandsToCommandList(TheGameLogic->getFrame());	// Put the commands for the next frame on TheCommandList.
-			m_frameDataReady = TRUE; // Tell the GameEngine to run the commands for the new frame.
-		}
-	}
-}
-
-void Network::liteupdate() {
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (m_networkOn == FALSE) {
-		return;
-	}
-#endif
-
-	if (m_conMgr != NULL) {
-		if (m_localStatus == NETLOCALSTATUS_PREGAME) {
-			m_conMgr->update(FALSE);
-		} else {
-			m_conMgr->update(TRUE);
-		}
-	}
-}
-
-void Network::endOfGameCheck() {
-	if (m_conMgr != NULL) {
-		if (m_conMgr->canILeave()) {
-			m_conMgr->disconnectLocalPlayer();
-			TheMessageStream->appendMessage(GameMessage::MSG_CLEAR_GAME_DATA);
-			m_localStatus = NETLOCALSTATUS_POSTGAME;
-
-			DEBUG_LOG(("Network::endOfGameCheck - about to show the shell\n"));
-		}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		else {
-			m_conMgr->debugPrintConnectionCommands();
-		}
-#endif
-	}
-}
-
-Bool Network::timeForNewFrame() {
-	__int64 curTime;
-	QueryPerformanceCounter((LARGE_INTEGER *)&curTime);
-	__int64 frameDelay = m_perfCountFreq / m_frameRate;
-
-	/*
-	 * If we're pushing up against the edge of our run ahead, we should slow the framerate down a bit
-	 * to avoid being frozen by spikes in network lag.  This will happen if another user's computer is
-	 * running too far behind us, so we need to slow down to let them catch up.
-	 */
-	if (m_conMgr != NULL) {
-		Real cushion = m_conMgr->getMinimumCushion();
-		Real runAheadPercentage = m_runAhead * (TheGlobalData->m_networkRunAheadSlack / (Real)100.0); // If we are at least 50% into our slack, we need to slow down.
-		if (cushion < runAheadPercentage) {
-//			DEBUG_LOG(("Average cushion = %f, run ahead percentage = %f.  Adjusting frameDelay from %I64d to ", cushion, runAheadPercentage, frameDelay));
-			frameDelay += frameDelay / 10; // temporarily decrease the frame rate by 20%.
-//			DEBUG_LOG(("%I64d\n", frameDelay));
-			m_didSelfSlug = TRUE;
-//		} else {
-//			DEBUG_LOG(("Average cushion = %f, run ahead percentage = %f\n", cushion, runAheadPercentage));
-		}
-	}
-
-	// Check to see if we can run another frame.
-	if (curTime >= m_nextFrameTime) {
-//		DEBUG_LOG(("Allowing a new frame, frameDelay = %I64d, curTime - m_nextFrameTime = %I64d\n", frameDelay, curTime - m_nextFrameTime));
-
-//		if (m_nextFrameTime + frameDelay < curTime) {
-		if ((m_nextFrameTime + (2 * frameDelay)) < curTime) {
-			// If we get too far behind on our framerate we need to reset the nextFrameTime thing.
-			m_nextFrameTime = curTime;
-//			DEBUG_LOG(("Initializing m_nextFrameTime to %I64d\n", m_nextFrameTime));
-		} else {
-			// Set the soonest possible starting time for the next frame.
-			m_nextFrameTime += frameDelay;
-//			DEBUG_LOG(("m_nextFrameTime = %I64d\n", m_nextFrameTime));
-		}
-
-		return TRUE;
-	}
-//	DEBUG_LOG(("Slowing down frame rate. frame rate = %d, frame delay = %I64d, curTime - m_nextFrameTime = %I64d\n", m_frameRate, frameDelay, curTime - m_nextFrameTime));
-	return FALSE;
-}
-
-/**
- * Returns true if the game commands for the next frame have been put on the command list.
- */
-Bool Network::isFrameDataReady() {
-	return (m_frameDataReady || (m_localStatus == NETLOCALSTATUS_LEFT));
-}
-
-/**
- * returns the number of incoming bytes per second averaged over the last 30 sec.
- */
-Real Network::getIncomingBytesPerSecond( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getIncomingBytesPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * returns the number of incoming packets per second averaged over the last 30 sec.
- */
-Real Network::getIncomingPacketsPerSecond( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getIncomingPacketsPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * returns the number of outgoing bytes per second averaged over the last 30 sec.
- */
-Real Network::getOutgoingBytesPerSecond( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getOutgoingBytesPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * returns the number of outgoing packets per second averaged over the last 30 sec.
- */
-Real Network::getOutgoingPacketsPerSecond( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getOutgoingPacketsPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * returns the number of bytes received per second that are not from a generals client averaged over 30 sec.
- */
-Real Network::getUnknownBytesPerSecond( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getUnknownBytesPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * returns the number of packets received per second that are not from a generals client averaged over 30 sec.
- */
-Real Network::getUnknownPacketsPerSecond( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getUnknownPacketsPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * returns the smallest packet arrival cushion since this was last called.
- */
-UnsignedInt Network::getPacketArrivalCushion( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getPacketArrivalCushion();
-	else
-		return 0;
-}
-
-/**
- * Sends a line of chat to the other players
- */
-void Network::sendChat(UnicodeString text, Int playerMask) {
-	Int executionFrame = getExecutionFrame();
-	m_conMgr->sendChat(text, playerMask, executionFrame);
-}
-
-/**
- * Sends a line of chat to the other players using the disconnect manager.
- */
-void Network::sendDisconnectChat(UnicodeString text) {
-	m_conMgr->sendDisconnectChat(text);
-}
-
-// send a file.  woohoo.
-void Network::sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID)
-{
-	m_conMgr->sendFile(path, playerMask, commandID);
-}
-
-// send a file.  woohoo.
-UnsignedShort Network::sendFileAnnounce(AsciiString path, UnsignedByte playerMask)
-{
-	return m_conMgr->sendFileAnnounce(path, playerMask);
-}
-
-Int Network::getFileTransferProgress(Int playerID, AsciiString path)
-{
-	return m_conMgr->getFileTransferProgress(playerID, path);
-}
-
-Bool Network::areAllQueuesEmpty(void)
-{
-	return m_conMgr->canILeave();
-}
-
-/**
- * Quit the game now.  This should only be called from the disconnect screen.
- */
-void Network::quitGame() {
-	if (m_conMgr != NULL) {
-		m_conMgr->quitGame();
-	}
-
-	TheMessageStream->appendMessage(GameMessage::MSG_CLEAR_GAME_DATA);
-	m_localStatus = NETLOCALSTATUS_POSTGAME;
-	DEBUG_LOG(("Network::quitGame - quitting game..."));
-}
-
-void Network::selfDestructPlayer(Int index)
-{
-	m_playersToDisconnect.push_back(index);
-}
-
-
-Bool Network::isPacketRouter( void )
-{
-	return m_conMgr && m_conMgr->isPacketRouter();
-}
-
-/**
- * Register a vote towards a player being disconnected.
- */
-void Network::voteForPlayerDisconnect(Int slot) {
-	if (m_conMgr != NULL) {
-		m_conMgr->voteForPlayerDisconnect(slot);
-	}
-}
-
-void Network::updateLoadProgress( Int percent )
-{
-	if (m_conMgr != NULL) {
-		m_conMgr->updateLoadProgress( percent );
-	}
-}
-
-void Network::loadProgressComplete( void )
-{
-	if (m_conMgr != NULL) {
-		m_conMgr->loadProgressComplete();
-	}
-}
-
-void Network::sendTimeOutGameStart( void )
-{
-	if (m_conMgr != NULL) {
-		m_conMgr->sendTimeOutGameStart();
-	}
-}
-
-
-UnsignedInt Network::getLocalPlayerID()
-{
-if (m_conMgr != NULL) {
-		return m_conMgr->getLocalPlayerID();
-	}
-	return 49;
-}
-UnicodeString Network::getPlayerName(Int playerNum)
-{
-	if (playerNum == m_conMgr->getLocalPlayerID()) {
-		if (m_localStatus != NETLOCALSTATUS_INGAME) {
-			return UnicodeString::TheEmptyString;
-		}
-	}
-	if (m_conMgr != NULL) {
-		return m_conMgr->getPlayerName( playerNum );
-	}
-	return UnicodeString::TheEmptyString;
-}
-Int Network::getNumPlayers()
-{
-	if (m_conMgr != NULL) {
-		return m_conMgr->getNumPlayers();
-	}
-	return -1;
-}
-
-Int Network::getSlotAverageFPS(Int slot) {
-	if (m_conMgr != NULL) {
-		return m_conMgr->getSlotAverageFPS(slot);
-	}
-	return -1;
-}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-void Network::toggleNetworkOn() {
-	if (m_networkOn == TRUE) {
-		m_networkOn = FALSE;
-	} else {
-		m_networkOn = TRUE;
-	}
-}
-#endif
-
-void Network::notifyOthersOfCurrentFrame() {
-	if (m_conMgr != NULL) {
-		m_conMgr->notifyOthersOfCurrentFrame(TheGameLogic->getFrame());
-	}
-}
-
-void Network::notifyOthersOfNewFrame(UnsignedInt frame) {
-	if (m_conMgr != NULL) {
-		m_conMgr->notifyOthersOfNewFrame(frame);
-	}
-}
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NetworkUtil.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NetworkUtil.cpp
deleted file mode 100644
index 32d2eba6b63..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/NetworkUtil.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/networkutil.h"
-
-Int MAX_FRAMES_AHEAD = 128;
-Int MIN_RUNAHEAD = 10;
-Int FRAME_DATA_LENGTH = (MAX_FRAMES_AHEAD+1)*2;
-Int FRAMES_TO_KEEP = (MAX_FRAMES_AHEAD/2) + 1;
-
-#ifdef DEBUG_LOGGING
-
-void dumpBufferToLog(const void *vBuf, Int len, const char *fname, Int line)
-{
-	DEBUG_LOG(("======= dumpBufferToLog() %d bytes =======\n", len));
-	DEBUG_LOG(("Source: %s:%d\n", fname, line));
-	const char *buf = (const char *)vBuf;
-	Int numLines = len / 8;
-	if ((len % 8) != 0)
-	{
-		++numLines;
-	}
-	for (Int dumpindex = 0; dumpindex < numLines; ++dumpindex)
-	{
-		Int offset = dumpindex*8;
-		DEBUG_LOG(("\t%5.5d\t", offset));
-		Int dumpindex2;
-		Int numBytesThisLine = min(8, len - offset);
-		for (dumpindex2 = 0; dumpindex2 < numBytesThisLine; ++dumpindex2)
-		{
-			Int c = (buf[offset + dumpindex2] & 0xff);
-			DEBUG_LOG(("%02X ", c));
-		}
-		for (; dumpindex2 < 8; ++dumpindex2)
-		{
-			DEBUG_LOG(("   "));
-		}
-		DEBUG_LOG((" | "));
-		for (dumpindex2 = 0; dumpindex2 < numBytesThisLine; ++dumpindex2)
-		{
-			char c = buf[offset + dumpindex2];
-			DEBUG_LOG(("%c", (isprint(c)?c:'.')));
-		}
-		DEBUG_LOG(("\n"));
-	}
-	DEBUG_LOG(("End of packet dump\n"));
-}
-
-#endif // DEBUG_LOGGING
-
-/**
- * ResolveIP turns a string ("games2.westwood.com", or "192.168.0.1") into
- * a 32-bit unsigned integer.
- */
-UnsignedInt ResolveIP(AsciiString host)
-{
-  struct hostent *hostStruct;
-  struct in_addr *hostNode;
-
-  if (host.getLength() == 0)
-  {
-	  DEBUG_LOG(("ResolveIP(): Can't resolve NULL\n"));
-	  return 0;
-  }
-
-  // String such as "127.0.0.1"
-  if (isdigit(host.getCharAt(0)))
-  {
-    return ( ntohl(inet_addr(host.str())) );
-  }
-
-  // String such as "localhost"
-  hostStruct = gethostbyname(host.str());
-  if (hostStruct == NULL)
-  {
-	  DEBUG_LOG(("ResolveIP(): Can't resolve %s\n", host.str()));
-	  return 0;
-  }
-  hostNode = (struct in_addr *) hostStruct->h_addr;
-  return ( ntohl(hostNode->s_addr) );
-}
-
-/**
- * Returns the next network command ID.
- */
-UnsignedShort GenerateNextCommandID() {
-	static UnsignedShort commandID = 64000;
-	++commandID;
-	return commandID;
-}
-
-/**
- * Returns true if this type of command requires a unique command ID.
- */
-Bool DoesCommandRequireACommandID(NetCommandType type) {
-	if ((type == NETCOMMANDTYPE_GAMECOMMAND) ||
-			(type == NETCOMMANDTYPE_FRAMEINFO) ||
-			(type == NETCOMMANDTYPE_PLAYERLEAVE) ||
-			(type == NETCOMMANDTYPE_DESTROYPLAYER) ||
-			(type == NETCOMMANDTYPE_RUNAHEADMETRICS) ||
-			(type == NETCOMMANDTYPE_RUNAHEAD) ||
-			(type == NETCOMMANDTYPE_CHAT) ||
-			(type == NETCOMMANDTYPE_DISCONNECTVOTE) ||
-			(type == NETCOMMANDTYPE_LOADCOMPLETE) ||
-			(type == NETCOMMANDTYPE_TIMEOUTSTART) ||
-			(type == NETCOMMANDTYPE_WRAPPER) ||
-			(type == NETCOMMANDTYPE_FILE) ||
-			(type == NETCOMMANDTYPE_FILEANNOUNCE) ||
-			(type == NETCOMMANDTYPE_FILEPROGRESS) ||
-			(type == NETCOMMANDTYPE_DISCONNECTPLAYER) ||
-			(type == NETCOMMANDTYPE_DISCONNECTFRAME) ||
-			(type == NETCOMMANDTYPE_DISCONNECTSCREENOFF) ||
-			(type == NETCOMMANDTYPE_FRAMERESENDREQUEST))
-	{
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if this type of network command requires an ack.
- */
-Bool CommandRequiresAck(NetCommandMsg *msg) {
-	if ((msg->getNetCommandType() == NETCOMMANDTYPE_GAMECOMMAND) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_PLAYERLEAVE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DESTROYPLAYER) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEADMETRICS) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEAD) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_CHAT) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTVOTE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_LOADCOMPLETE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_TIMEOUTSTART) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_WRAPPER) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FILE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FILEANNOUNCE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FILEPROGRESS) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTSCREENOFF) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FRAMERESENDREQUEST))
-	{
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool IsCommandSynchronized(NetCommandType type) {
-	if ((type == NETCOMMANDTYPE_GAMECOMMAND) ||
-			(type == NETCOMMANDTYPE_FRAMEINFO) ||
-			(type == NETCOMMANDTYPE_PLAYERLEAVE) ||
-			(type == NETCOMMANDTYPE_DESTROYPLAYER) ||
-			(type == NETCOMMANDTYPE_RUNAHEAD))
-	{
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if this type of network command requires the ack to be sent directly to the player
- * rather than going through the packet router.  This should really only be used by commands
- * used on the disconnect screen.
- */
-Bool CommandRequiresDirectSend(NetCommandMsg *msg) {
-	if ((msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTVOTE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_LOADCOMPLETE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_TIMEOUTSTART) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FILE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FILEANNOUNCE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FILEPROGRESS) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTSCREENOFF) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FRAMERESENDREQUEST)) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-AsciiString GetAsciiNetCommandType(NetCommandType type) {
-	AsciiString s;
-	if (type == NETCOMMANDTYPE_FRAMEINFO) {
-		s.set("NETCOMMANDTYPE_FRAMEINFO");
-	} else if (type == NETCOMMANDTYPE_GAMECOMMAND) {
-		s.set("NETCOMMANDTYPE_GAMECOMMAND");
-	} else if (type == NETCOMMANDTYPE_PLAYERLEAVE) {
-		s.set("NETCOMMANDTYPE_PLAYERLEAVE");
-	} else if (type == NETCOMMANDTYPE_RUNAHEADMETRICS) {
-		s.set("NETCOMMANDTYPE_RUNAHEADMETRICS");
-	} else if (type == NETCOMMANDTYPE_RUNAHEAD) {
-		s.set("NETCOMMANDTYPE_RUNAHEAD");
-	} else if (type == NETCOMMANDTYPE_DESTROYPLAYER) {
-		s.set("NETCOMMANDTYPE_DESTROYPLAYER");
-	} else if (type == NETCOMMANDTYPE_ACKBOTH) {
-		s.set("NETCOMMANDTYPE_ACKBOTH");
-	} else if (type == NETCOMMANDTYPE_ACKSTAGE1) {
-		s.set("NETCOMMANDTYPE_ACKSTAGE1");
-	} else if (type == NETCOMMANDTYPE_ACKSTAGE2) {
-		s.set("NETCOMMANDTYPE_ACKSTAGE2");
-	} else if (type == NETCOMMANDTYPE_FRAMEINFO) {
-		s.set("NETCOMMANDTYPE_FRAMEINFO");
-	} else if (type == NETCOMMANDTYPE_KEEPALIVE) {
-		s.set("NETCOMMANDTYPE_KEEPALIVE");
-	} else if (type == NETCOMMANDTYPE_DISCONNECTCHAT) {
-		s.set("NETCOMMANDTYPE_DISCONNECTCHAT");
-	} else if (type == NETCOMMANDTYPE_CHAT) {
-		s.set("NETCOMMANDTYPE_CHAT");
-	} else if (type == NETCOMMANDTYPE_MANGLERQUERY) {
-		s.set("NETCOMMANDTYPE_MANGLERQUERY");
-	} else if (type == NETCOMMANDTYPE_MANGLERRESPONSE) {
-		s.set("NETCOMMANDTYPE_MANGLERRESPONSE");
-	} else if (type == NETCOMMANDTYPE_DISCONNECTKEEPALIVE) {
-		s.set("NETCOMMANDTYPE_DISCONNECTKEEPALIVE");
-	} else if (type == NETCOMMANDTYPE_DISCONNECTPLAYER) {
-		s.set("NETCOMMANDTYPE_DISCONNECTPLAYER");
-	} else if (type == NETCOMMANDTYPE_PACKETROUTERQUERY) {
-		s.set("NETCOMMANDTYPE_PACKETROUTERQUERY");
-	} else if (type == NETCOMMANDTYPE_PACKETROUTERACK) {
-		s.set("NETCOMMANDTYPE_PACKETROUTERACK");
-	} else if (type == NETCOMMANDTYPE_DISCONNECTVOTE) {
-		s.set("NETCOMMANDTYPE_DISCONNECTVOTE");
-	} else if (type == NETCOMMANDTYPE_PROGRESS) {
-		s.set("NETCOMMANDTYPE_PROGRESS");
-	} else if (type == NETCOMMANDTYPE_LOADCOMPLETE) {
-		s.set("NETCOMMANDTYPE_LOADCOMPLETE");
-	} else if (type == NETCOMMANDTYPE_TIMEOUTSTART) {
-		s.set("NETCOMMANDTYPE_TIMEOUTSTART");
-	} else if (type == NETCOMMANDTYPE_WRAPPER) {
-		s.set("NETCOMMANDTYPE_WRAPPER");
-	} else if (type == NETCOMMANDTYPE_FILE) {
-		s.set("NETCOMMANDTYPE_FILE");
-	} else if (type == NETCOMMANDTYPE_FILEANNOUNCE) {
-		s.set("NETCOMMANDTYPE_FILEANNOUNCE");
-	} else if (type == NETCOMMANDTYPE_FILEPROGRESS) {
-		s.set("NETCOMMANDTYPE_FILEPROGRESS");
-	} else if (type == NETCOMMANDTYPE_DISCONNECTFRAME) {
-		s.set("NETCOMMANDTYPE_DISCONNECTFRAME");
-	} else if (type == NETCOMMANDTYPE_DISCONNECTSCREENOFF) {
-		s.set("NETCOMMANDTYPE_DISCONNECTSCREENOFF");
-	} else if (type == NETCOMMANDTYPE_FRAMERESENDREQUEST) {
-		s.set("NETCOMMANDTYPE_FRAMERESENDREQUEST");
-	} else {
-		s.set("UNKNOWN");
-	}
-	return s;
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/Transport.cpp b/Generals/Code/GameEngine/Source/GameNetwork/Transport.cpp
deleted file mode 100644
index 7dccc9f69cf..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/Transport.cpp
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/crc.h"
-#include "GameNetwork/Transport.h"
-#include "GameNetwork/NetworkInterface.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//--------------------------------------------------------------------------
-// Packet-level encryption is an XOR operation, for speed reasons.  To get
-// the max throughput, we only XOR whole 4-byte words, so the last bytes
-// can be non-XOR'd.
-
-// This assumes the buf is a multiple of 4 bytes.  Extra is not encrypted.
-static inline void encryptBuf( unsigned char *buf, Int len )
-{
-	UnsignedInt mask = 0x0000Fade;
-
-	UnsignedInt *uintPtr = (UnsignedInt *) (buf);
-
-	for (int i=0 ; i<len/4 ; i++) {
-		*uintPtr = (*uintPtr) ^ mask;
-		*uintPtr = htonl(*uintPtr);
-		uintPtr++;
-		mask += 0x00000321; // just for fun
-	}
-}
-
-// This assumes the buf is a multiple of 4 bytes.  Extra is not encrypted.
-static inline void decryptBuf( unsigned char *buf, Int len )
-{
-	UnsignedInt mask = 0x0000Fade;
-
-	UnsignedInt *uintPtr = (UnsignedInt *) (buf);
-
-	for (int i=0 ; i<len/4 ; i++) {
-		*uintPtr = htonl(*uintPtr);
-		*uintPtr = (*uintPtr) ^ mask;
-		uintPtr++;
-		mask += 0x00000321; // just for fun
-	}
-}
-
-//--------------------------------------------------------------------------
-
-Transport::Transport(void)
-{
-	m_winsockInit = false;
-	m_udpsock = NULL;
-}
-
-Transport::~Transport(void)
-{
-	reset();
-}
-
-Bool Transport::init( AsciiString ip, UnsignedShort port )
-{
-	return init(ResolveIP(ip), port);
-}
-
-Bool Transport::init( UnsignedInt ip, UnsignedShort port )
-{
-	// ----- Initialize Winsock -----
-	if (!m_winsockInit)
-	{
-		WORD verReq = MAKEWORD(2, 2);
-		WSADATA wsadata;
-
-		int err = WSAStartup(verReq, &wsadata);
-		if (err != 0) {
-			return false;
-		}
-
-		if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2)) {
-			WSACleanup();
-			return false;
-		}
-		m_winsockInit = true;
-	}
-
-	// ------- Bind our port --------
-	if (m_udpsock)
-		delete m_udpsock;
-	m_udpsock = NEW UDP();
-	
-	if (!m_udpsock)
-		return false;
-	
-	int retval = -1;
-	time_t now = timeGetTime();
-	while ((retval != 0) && ((timeGetTime() - now) < 1000)) {
-		retval = m_udpsock->Bind(ip, port);
-	}
-
-	if (retval != 0) {
-		DEBUG_CRASH(("Could not bind to 0x%8.8X:%d\n", ip, port));
-		DEBUG_LOG(("Transport::init - Failure to bind socket with error code %x\n", retval));
-		delete m_udpsock;
-		m_udpsock = NULL;
-		return false;
-	}
-
-	// ------- Clear buffers --------
-	int i=0;
-	for (; i<MAX_MESSAGES; ++i)
-	{
-		m_outBuffer[i].length = 0;
-		m_inBuffer[i].length = 0;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		m_delayedInBuffer[i].message.length = 0;
-#endif
-	}
-	for (i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		m_incomingBytes[i] = 0;
-		m_outgoingBytes[i] = 0;
-		m_unknownBytes[i] = 0;
-		m_incomingPackets[i] = 0;
-		m_outgoingPackets[i] = 0;
-		m_unknownPackets[i] = 0;
-	}
-	m_statisticsSlot = 0;
-	m_lastSecond = timeGetTime();
-
-	m_port = port;
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_latencyAverage > 0 || TheGlobalData->m_latencyNoise)
-		m_useLatency = true;
-
-	if (TheGlobalData->m_packetLoss)
-		m_usePacketLoss = true;
-#endif
-
-	return true;
-}
-
-void Transport::reset( void )
-{
-	if (m_udpsock)
-	{
-		delete m_udpsock;
-		m_udpsock = NULL;
-	}
-
-	if (m_winsockInit)
-	{
-		WSACleanup();
-		m_winsockInit = false;
-	}
-}
-
-Bool Transport::update( void )
-{
-	Bool retval = TRUE;
-	if (doRecv() == FALSE && m_udpsock && m_udpsock->GetStatus() == UDP::ADDRNOTAVAIL)
-	{
-		retval = FALSE;
-	}
-	DEBUG_ASSERTLOG(retval, ("WSA error is %s\n", GetWSAErrorString(WSAGetLastError()).str()));
-	if (doSend() == FALSE && m_udpsock && m_udpsock->GetStatus() == UDP::ADDRNOTAVAIL)
-	{
-		retval = FALSE;
-	}
-	DEBUG_ASSERTLOG(retval, ("WSA error is %s\n", GetWSAErrorString(WSAGetLastError()).str()));
-	return retval;
-}
-
-Bool Transport::doSend() {
-	if (!m_udpsock)
-	{
-		DEBUG_LOG(("Transport::doSend() - m_udpSock is NULL!\n"));
-		return FALSE;
-	}
-
-	Bool retval = TRUE;
-
-	// Statistics gathering
-	UnsignedInt now = timeGetTime();
-	if (m_lastSecond + 1000 < now)
-	{
-		m_lastSecond = now;
-		m_statisticsSlot = (m_statisticsSlot + 1) % MAX_TRANSPORT_STATISTICS_SECONDS;
-		m_outgoingPackets[m_statisticsSlot] = 0;
-		m_outgoingBytes[m_statisticsSlot] = 0;
-		m_incomingPackets[m_statisticsSlot] = 0;
-		m_incomingBytes[m_statisticsSlot] = 0;
-		m_unknownPackets[m_statisticsSlot] = 0;
-		m_unknownBytes[m_statisticsSlot] = 0;
-	}
-
-	// Send all messages
-	int i;
-	for (i=0; i<MAX_MESSAGES; ++i)
-	{
-		if (m_outBuffer[i].length != 0)
-		{
-			int bytesSent = 0;
-			int bytesToSend = m_outBuffer[i].length + sizeof(TransportMessageHeader);
-			// Send this message
-			if ((bytesSent = m_udpsock->Write((unsigned char *)(&m_outBuffer[i]), bytesToSend, m_outBuffer[i].addr, m_outBuffer[i].port)) > 0)
-			{
-				//DEBUG_LOG(("Sending %d bytes to %d.%d.%d.%d:%d\n", bytesToSend, PRINTF_IP_AS_4_INTS(m_outBuffer[i].addr), m_outBuffer[i].port));
-				m_outgoingPackets[m_statisticsSlot]++;
-				m_outgoingBytes[m_statisticsSlot] += m_outBuffer[i].length + sizeof(TransportMessageHeader);
-				m_outBuffer[i].length = 0;  // Remove from queue
-				if (bytesSent != bytesToSend)
-				{
-					DEBUG_LOG(("Transport::doSend - wanted to send %d bytes, only sent %d bytes to %d.%d.%d.%d:%d\n",
-						bytesToSend, bytesSent,
-						PRINTF_IP_AS_4_INTS(m_outBuffer[i].addr), m_outBuffer[i].port));
-				}
-			}
-			else
-			{
-				//DEBUG_LOG(("Could not write to socket!!!  Not discarding message!\n"));
-				retval = FALSE;
-				//DEBUG_LOG(("Transport::doSend returning FALSE\n"));
-			}
-		}
-	} // for (i=0; i<MAX_MESSAGES; ++i)
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	// Latency simulation - deliver anything we're holding on to that is ready
-	if (m_useLatency)
-	{
-		for (i=0; i<MAX_MESSAGES; ++i)
-		{
-			if (m_delayedInBuffer[i].message.length != 0 && m_delayedInBuffer[i].deliveryTime <= now)
-			{
-				for (int j=0; j<MAX_MESSAGES; ++j)
-				{
-					if (m_inBuffer[j].length == 0)
-					{
-						// Empty slot; use it
-						memcpy(&m_inBuffer[j], &m_delayedInBuffer[i].message, sizeof(TransportMessage));
-						m_delayedInBuffer[i].message.length = 0;
-						break;
-					}
-				}
-			}
-		}
-	}
-#endif
-	return retval;
-}
-
-Bool Transport::doRecv() 
-{
-	if (!m_udpsock)
-	{
-		DEBUG_LOG(("Transport::doRecv() - m_udpSock is NULL!\n"));
-		return FALSE;
-	}
-
-	Bool retval = TRUE;
-
-	// Read in anything on our socket
-	sockaddr_in from;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	UnsignedInt now = timeGetTime();
-#endif
-
-	TransportMessage incomingMessage;
-	unsigned char *buf = (unsigned char *)&incomingMessage;
-	int len = MAX_MESSAGE_LEN;
-//	DEBUG_LOG(("Transport::doRecv - checking\n"));
-	while ( (len=m_udpsock->Read(buf, MAX_MESSAGE_LEN, &from)) > 0 )
-	{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		// Packet loss simulation
-		if (m_usePacketLoss)
-		{
-			if ( TheGlobalData->m_packetLoss >= GameClientRandomValue(0, 100) )
-			{
-				continue;
-			}
-		}
-#endif
-
-//		DEBUG_LOG(("Transport::doRecv - Got something! len = %d\n", len));
-		// Decrypt the packet
-//		DEBUG_LOG(("buffer = "));
-//		for (Int munkee = 0; munkee < len; ++munkee) {
-//			DEBUG_LOG(("%02x", *(buf + munkee)));
-//		}
-//		DEBUG_LOG(("\n"));
-		decryptBuf(buf, len);
-
-		incomingMessage.length = len - sizeof(TransportMessageHeader);
-
-		if (len <= sizeof(TransportMessageHeader) || !isGeneralsPacket( &incomingMessage ))
-		{
-			DEBUG_LOG(("Transport::doRecv - unknownPacket! len = %d\n", len));
-			m_unknownPackets[m_statisticsSlot]++;
-			m_unknownBytes[m_statisticsSlot] += len;
-			continue;
-		}
-
-		// Something there; stick it somewhere
-//		DEBUG_LOG(("Saw %d bytes from %d:%d\n", len, ntohl(from.sin_addr.S_un.S_addr), ntohs(from.sin_port)));
-		m_incomingPackets[m_statisticsSlot]++;
-		m_incomingBytes[m_statisticsSlot] += len;
-
-		for (int i=0; i<MAX_MESSAGES; ++i)
-		{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-			// Latency simulation
-			if (m_useLatency)
-			{
-				if (m_delayedInBuffer[i].message.length == 0)
-				{
-					// Empty slot; use it
-					m_delayedInBuffer[i].deliveryTime =
-						now + TheGlobalData->m_latencyAverage +
-						(Int)(TheGlobalData->m_latencyAmplitude * sin(now * TheGlobalData->m_latencyPeriod)) +
-						GameClientRandomValue(-TheGlobalData->m_latencyNoise, TheGlobalData->m_latencyNoise);
-					m_delayedInBuffer[i].message.length = incomingMessage.length;
-					m_delayedInBuffer[i].message.addr = ntohl(from.sin_addr.S_un.S_addr);
-					m_delayedInBuffer[i].message.port = ntohs(from.sin_port);
-					memcpy(&m_delayedInBuffer[i].message, buf, len);
-					break;
-				}
-			}
-			else
-			{
-#endif
-				if (m_inBuffer[i].length == 0)
-				{
-					// Empty slot; use it
-					m_inBuffer[i].length = incomingMessage.length;
-					m_inBuffer[i].addr = ntohl(from.sin_addr.S_un.S_addr);
-					m_inBuffer[i].port = ntohs(from.sin_port);
-					memcpy(&m_inBuffer[i], buf, len);
-					break;
-				}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-			}
-#endif
-		}
-		//DEBUG_ASSERTCRASH(i<MAX_MESSAGES, ("Message lost!"));
-	}
-
-	if (len == -1) {
-		// there was a socket error trying to perform a read.
-		//DEBUG_LOG(("Transport::doRecv returning FALSE\n"));
-		retval = FALSE;
-	}
-
-	return retval;
-}
-
-Bool Transport::queueSend(UnsignedInt addr, UnsignedShort port, const UnsignedByte *buf, Int len /*,
-						  NetMessageFlags flags, Int id */)
-{
-	int i;
-
-	if (len < 1 || len > MAX_PACKET_SIZE)
-	{
-		DEBUG_LOG(("Transport::queueSend - Invalid Packet size\n"));
-		return false;
-	}
-
-	for (i=0; i<MAX_MESSAGES; ++i)
-	{
-		if (m_outBuffer[i].length == 0)
-		{
-			// Insert data here
-			m_outBuffer[i].length = len;
-			memcpy(m_outBuffer[i].data, buf, len);
-			m_outBuffer[i].addr = addr;
-			m_outBuffer[i].port = port;
-//			m_outBuffer[i].header.flags = flags;
-//			m_outBuffer[i].header.id = id;
-			m_outBuffer[i].header.magic = GENERALS_MAGIC_NUMBER;
-
-			CRC crc;
-			crc.computeCRC( (unsigned char *)(&(m_outBuffer[i].header.magic)), m_outBuffer[i].length + sizeof(TransportMessageHeader) - sizeof(UnsignedInt) );
-//			DEBUG_LOG(("About to assign the CRC for the packet\n"));
-			m_outBuffer[i].header.crc = crc.get();
-
-			// Encrypt packet
-//			DEBUG_LOG(("buffer: "));
-			encryptBuf((unsigned char *)&m_outBuffer[i], len + sizeof(TransportMessageHeader));
-//			DEBUG_LOG(("\n"));
-
-			return true;
-		}
-	}
-	DEBUG_LOG(("Send Queue is getting full, dropping packets\n"));
-	return false;
-}
-
-Bool Transport::isGeneralsPacket( TransportMessage *msg )
-{
-	if (!msg)
-		return false;
-
-	if (msg->length < 0 || msg->length > MAX_MESSAGE_LEN)
-		return false;
-
-	CRC crc;
-//	crc.computeCRC( (unsigned char *)msg->data, msg->length );
-	crc.computeCRC( (unsigned char *)(&(msg->header.magic)), msg->length + sizeof(TransportMessageHeader) - sizeof(UnsignedInt) );
-
-	if (crc.get() != msg->header.crc)
-		return false;
-
-	if (msg->header.magic != GENERALS_MAGIC_NUMBER)
-		return false;
-
-	return true;
-}
-
-// Statistics ---------------------------------------------------
-Real Transport::getIncomingBytesPerSecond( void )
-{
-	Real val = 0.0;
-	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		if (i != m_statisticsSlot)
-			val += m_incomingBytes[i];
-	}
-	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
-}
-
-Real Transport::getIncomingPacketsPerSecond( void )
-{
-	Real val = 0.0;
-	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		if (i != m_statisticsSlot)
-			val += m_incomingPackets[i];
-	}
-	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
-}
-
-Real Transport::getOutgoingBytesPerSecond( void )
-{
-	Real val = 0.0;
-	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		if (i != m_statisticsSlot)
-			val += m_outgoingBytes[i];
-	}
-	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
-}
-
-Real Transport::getOutgoingPacketsPerSecond( void )
-{
-	Real val = 0.0;
-	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		if (i != m_statisticsSlot)
-			val += m_outgoingPackets[i];
-	}
-	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
-}
-
-Real Transport::getUnknownBytesPerSecond( void )
-{
-	Real val = 0.0;
-	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		if (i != m_statisticsSlot)
-			val += m_unknownBytes[i];
-	}
-	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
-}
-
-Real Transport::getUnknownPacketsPerSecond( void )
-{
-	Real val = 0.0;
-	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		if (i != m_statisticsSlot)
-			val += m_unknownPackets[i];
-	}
-	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
-}
-
-
-
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/User.cpp b/Generals/Code/GameEngine/Source/GameNetwork/User.cpp
deleted file mode 100644
index 0e1eb827648..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/User.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-// User class copy and comparisons
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/User.h"
-
-/**
- * Constructor.  Sets up the member variables with the appropriate values.
- */
-User::User(UnicodeString name, UnsignedInt addr, UnsignedInt port) {
-	m_name.set(name);
-	m_ipaddr = addr;
-	m_port = port;
-}
-
-/**
- * The assignment operator.
- */
-User & User::operator= (const User *other)
-{
-	m_name = other->m_name;
-	m_ipaddr = other->m_ipaddr;
-	m_port = other->m_port;
-
-	return *this;
-}
-
-/**
- * The equality operator.
- */
-Bool User::operator== (const User *other)
-{
-	return (m_name.compare(other->m_name) == 0);
-}
-
-/**
- * The inequality operator.
- */
-Bool User::operator!= (const User *other)
-{
-	return (m_name.compare(other->m_name) != 0);
-}
-
-/**
- * Set the name of this user.
- */
-void User::setName(UnicodeString name) {
-	m_name.set(name);
-}
\ No newline at end of file
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp b/Generals/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp
deleted file mode 100644
index f47bbbb4871..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/******************************************************************************
-*
-* NAME
-*     $Archive:  $
-*
-* DESCRIPTION
-*
-* PROGRAMMER
-*     Bryan Cleveland
-*     $Author:  $
-*
-* VERSION INFO
-*     $Revision:  $
-*     $Modtime:  $
-*
-******************************************************************************/
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-//#include "WinMain.h"
-#include "GameNetwork/WOLBrowser/WebBrowser.h"
-#include "GameClient/GameWindow.h"
-#include "GameClient/Display.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-/**
-	* OLEInitializer class - Init and shutdown OLE & COM as a global
-	* object.  Scary, nasty stuff, COM.  /me shivers.
-	*/
-class OLEInitializer
-{
-public:
-	OLEInitializer()
-	{
-		// Initialize this instance
-		OleInitialize(NULL);
-	 }
-	~OLEInitializer()
-	{
-		OleUninitialize(); 
-	}
-};
-OLEInitializer g_OLEInitializer;
-CComModule _Module;
-
-CComObject<WebBrowser> * TheWebBrowser = NULL;
-
-
-/******************************************************************************
-*
-* NAME
-*     WebBrowser::WebBrowser
-*
-* DESCRIPTION
-*     Default constructor
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-******************************************************************************/
-
-WebBrowser::WebBrowser() :
-		mRefCount(1)
-{
-	DEBUG_LOG(("Instantiating embedded WebBrowser\n"));
-	m_urlList = NULL;
-}
-
-
-/******************************************************************************
-*
-* NAME
-*     WebBrowser::~WebBrowser
-*
-* DESCRIPTION
-*     Destructor
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-******************************************************************************/
-
-WebBrowser::~WebBrowser()
-{
-	DEBUG_LOG(("Destructing embedded WebBrowser\n"));
-	if (this == TheWebBrowser) {
-		DEBUG_LOG(("WebBrowser::~WebBrowser - setting TheWebBrowser to NULL\n"));
-		TheWebBrowser = NULL;
-	}
-	WebBrowserURL *url = m_urlList;
-	while (url != NULL) {
-		WebBrowserURL *temp = url;
-		url = url->m_next;
-		deleteInstance(temp);
-		temp = NULL;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-/** The INI data fields for Webpage URL's */
-//-------------------------------------------------------------------------------------------------
-const FieldParse WebBrowserURL::m_URLFieldParseTable[] = 
-{
-
-	{ "URL",										INI::parseAsciiString,							NULL, offsetof( WebBrowserURL, m_url ) },
-	{ NULL,											NULL,																NULL, 0 },
-
-};
-
-WebBrowserURL::WebBrowserURL() 
-{
-	m_next = NULL;
-	m_tag.clear();
-	m_url.clear();
-}
-
-WebBrowserURL::~WebBrowserURL() 
-{
-}
-/******************************************************************************
-*
-* NAME
-*     WebBrowser::init
-*
-* DESCRIPTION
-*     Perform post creation initialization.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-******************************************************************************/
-
-void WebBrowser::init() 
-{
-	m_urlList = NULL;
-	INI ini;
-	ini.load( AsciiString( "Data\\INI\\Webpages.ini" ), INI_LOAD_OVERWRITE, NULL );
-}
-
-/******************************************************************************
-*
-* NAME
-*     WebBrowser::reset
-*
-* DESCRIPTION
-*     Perform post creation initialization.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-******************************************************************************/
-
-void WebBrowser::reset() 
-{
-}
-
-void WebBrowser::update( void ) 
-{
-}
-
-WebBrowserURL * WebBrowser::findURL(AsciiString tag) 
-{
-	WebBrowserURL *retval = m_urlList;
-
-	while ((retval != NULL) && tag.compareNoCase(retval->m_tag.str())) 
-	{
-		retval = retval->m_next;
-	}
-
-	return retval;
-}
-
-WebBrowserURL * WebBrowser::makeNewURL(AsciiString tag) 
-{
-	WebBrowserURL *newURL = newInstance(WebBrowserURL);
-
-	newURL->m_tag = tag;
-
-	newURL->m_next = m_urlList;
-	m_urlList = newURL;
-
-	return newURL;
-}
-
-/******************************************************************************
-*
-* NAME
-*     IUnknown::QueryInterface
-*
-* DESCRIPTION
-*
-* INPUTS
-*     IID - Interface ID
-*
-* RESULT
-*
-******************************************************************************/
-
-STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) IUNKNOWN_NOEXCEPT
-{
-	*ppv = NULL;
-
-	if ((iid == IID_IUnknown) || (iid == IID_IBrowserDispatch))
-	{
-		*ppv = static_cast<IBrowserDispatch*>(this);
-	}
-	else
-	{
-		return E_NOINTERFACE;
-	}
-
-	static_cast<IUnknown*>(*ppv)->AddRef();
-
-	return S_OK;
-}
-
-
-/******************************************************************************
-*
-* NAME
-*     IUnknown::AddRef
-*
-* DESCRIPTION
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*
-******************************************************************************/
-
-ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) IUNKNOWN_NOEXCEPT
-{
-	return ++mRefCount;
-}
-
-
-/******************************************************************************
-*
-* NAME
-*     IUnknown::Release
-*
-* DESCRIPTION
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*
-******************************************************************************/
-
-ULONG STDMETHODCALLTYPE WebBrowser::Release(void) IUNKNOWN_NOEXCEPT
-{
-	DEBUG_ASSERTCRASH(mRefCount > 0, ("Negative reference count"));
-	--mRefCount;
-
-	if (mRefCount == 0)
-	{
-		DEBUG_LOG(("WebBrowser::Release - all references released, deleting the object.\n"));
-		if (this == TheWebBrowser) {
-			TheWebBrowser = NULL;
-		}
-		delete this;
-		return 0;
-	}
-
-	return mRefCount;
-}
-
-STDMETHODIMP WebBrowser::TestMethod(Int num1) 
-{
-	DEBUG_LOG(("WebBrowser::TestMethod - num1 = %d\n", num1));
-	return S_OK;
-}
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/udp.cpp b/Generals/Code/GameEngine/Source/GameNetwork/udp.cpp
deleted file mode 100644
index 059313eea50..00000000000
--- a/Generals/Code/GameEngine/Source/GameNetwork/udp.cpp
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Udp.cpp //////////////////////////////////////////////////////////////
-// Implementation of UDP socket wrapper class (taken from wnet lib)
-// Author: Matthew D. Campbell, July 2001
-///////////////////////////////////////////////////////////////////////////////
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "Common/GameEngine.h"
-//#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/udp.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-------------------------------------------------------------------------
-
-#ifdef DEBUG_LOGGING
-
-#define CASE(x) case (x): return #x;
-
-AsciiString GetWSAErrorString( Int error )
-{
-	switch (error)
-	{
-		CASE(WSABASEERR)
-		CASE(WSAEINTR)
-		CASE(WSAEBADF)
-		CASE(WSAEACCES)
-		CASE(WSAEFAULT)
-		CASE(WSAEINVAL)
-		CASE(WSAEMFILE)
-		CASE(WSAEWOULDBLOCK)
-		CASE(WSAEINPROGRESS)
-		CASE(WSAEALREADY)
-		CASE(WSAENOTSOCK)
-		CASE(WSAEDESTADDRREQ)
-		CASE(WSAEMSGSIZE)
-		CASE(WSAEPROTOTYPE)
-		CASE(WSAENOPROTOOPT)
-		CASE(WSAEPROTONOSUPPORT)
-		CASE(WSAESOCKTNOSUPPORT)
-		CASE(WSAEOPNOTSUPP)
-		CASE(WSAEPFNOSUPPORT)
-		CASE(WSAEAFNOSUPPORT)
-		CASE(WSAEADDRINUSE)
-		CASE(WSAEADDRNOTAVAIL)
-		CASE(WSAENETDOWN)
-		CASE(WSAENETUNREACH)
-		CASE(WSAENETRESET)
-		CASE(WSAECONNABORTED)
-		CASE(WSAECONNRESET)
-		CASE(WSAENOBUFS)
-		CASE(WSAEISCONN)
-		CASE(WSAENOTCONN)
-		CASE(WSAESHUTDOWN)
-		CASE(WSAETOOMANYREFS)
-		CASE(WSAETIMEDOUT)
-		CASE(WSAECONNREFUSED)
-		CASE(WSAELOOP)
-		CASE(WSAENAMETOOLONG)
-		CASE(WSAEHOSTDOWN)
-		CASE(WSAEHOSTUNREACH)
-		CASE(WSAENOTEMPTY)
-		CASE(WSAEPROCLIM)
-		CASE(WSAEUSERS)
-		CASE(WSAEDQUOT)
-		CASE(WSAESTALE)
-		CASE(WSAEREMOTE)
-		CASE(WSAEDISCON)
-		CASE(WSASYSNOTREADY)
-		CASE(WSAVERNOTSUPPORTED)
-		CASE(WSANOTINITIALISED)
-		CASE(WSAHOST_NOT_FOUND)
-		CASE(WSATRY_AGAIN)
-		CASE(WSANO_RECOVERY)
-		CASE(WSANO_DATA)
-		default:
-		{
-			AsciiString ret;
-			ret.format("Not a Winsock error (%d)", error);
-			return ret;
-		}
-	}
-	return AsciiString::TheEmptyString; // will not be hit, ever.
-}
-
-#undef CASE
-
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-
-//-------------------------------------------------------------------------
-
-UDP::UDP()
-{
-  fd=0;
-}
-
-UDP::~UDP()
-{
-	if (fd)
-		closesocket(fd);
-}
-
-Int UDP::Bind(const char *Host,UnsignedShort port)
-{
-  char hostName[100];
-  struct hostent *hostStruct;
-  struct in_addr *hostNode;
-
-  if (isdigit(Host[0]))
-    return ( Bind( ntohl(inet_addr(Host)), port) );
-
-  strcpy(hostName, Host);
-
-  hostStruct = gethostbyname(Host);
-  if (hostStruct == NULL)
-    return (0);
-  hostNode = (struct in_addr *) hostStruct->h_addr;
-  return ( Bind(ntohl(hostNode->s_addr),port) );
-}
-
-// You must call bind, implicit binding is for sissies
-//   Well... you can get implicit binding if you pass 0 for either arg
-Int UDP::Bind(UnsignedInt IP,UnsignedShort Port)
-{
-  int retval;
-  int status;
-
-  IP=htonl(IP);
-  Port=htons(Port);
-
-  addr.sin_family=AF_INET;
-  addr.sin_port=Port;
-  addr.sin_addr.s_addr=IP;
-  fd=socket(AF_INET,SOCK_DGRAM,DEFAULT_PROTOCOL);
-  #ifdef _WINDOWS
-  if (fd==SOCKET_ERROR)
-    fd=-1;
-  #endif
-  if (fd==-1)
-    return(UNKNOWN);
-
-  retval=bind(fd,(struct sockaddr *)&addr,sizeof(addr));
-
-  #ifdef _WINDOWS
-  if (retval==SOCKET_ERROR)
-	{
-    retval=-1;
-		m_lastError = WSAGetLastError();
-	}
-  #endif
-  if (retval==-1)
-  {
-    status=GetStatus();
-    //CERR("Bind failure (" << status << ") IP " << IP << " PORT " << Port )
-    return(status);
-  }
-
-  int namelen=sizeof(addr);
-  getsockname(fd, (struct sockaddr *)&addr, &namelen); 
-
-  myIP=ntohl(addr.sin_addr.s_addr);
-  myPort=ntohs(addr.sin_port);
-
-  retval=SetBlocking(FALSE);
-  if (retval==-1)
-    fprintf(stderr,"Couldn't set nonblocking mode!\n");
-
-  return(OK);
-}
-
-Int UDP::getLocalAddr(UnsignedInt &ip, UnsignedShort &port)
-{
-  ip=myIP;
-  port=myPort;
-  return(OK);
-}
-
-
-// private function
-Int UDP::SetBlocking(Int block)
-{
-  #ifdef _WINDOWS
-   unsigned long flag=1;
-   if (block)
-     flag=0;
-   int retval;
-   retval=ioctlsocket(fd,FIONBIO,&flag);
-   if (retval==SOCKET_ERROR)
-     return(UNKNOWN);
-   else
-     return(OK);
-  #else  // UNIX
-   int flags = fcntl(fd, F_GETFL, 0);
-   if (block==FALSE)          // set nonblocking
-     flags |= O_NONBLOCK;
-   else                       // set blocking
-     flags &= ~(O_NONBLOCK);
-
-   if (fcntl(fd, F_SETFL, flags) < 0)
-   {
-     return(UNKNOWN);
-   }
-   return(OK);
-  #endif
-}
-
-
-Int UDP::Write(const unsigned char *msg,UnsignedInt len,UnsignedInt IP,UnsignedShort port)
-{
-  Int retval;
-  struct sockaddr_in to;
-
-  // This happens frequently
-  if ((IP==0)||(port==0)) return(ADDRNOTAVAIL);
-
-#ifdef _UNIX
-  errno=0;
-#endif
-  to.sin_port=htons(port);
-  to.sin_addr.s_addr=htonl(IP);
-  to.sin_family=AF_INET;
-
-  ClearStatus();
-  retval=sendto(fd,(const char *)msg,len,0,(struct sockaddr *)&to,sizeof(to));
-  #ifdef _WINDOWS
-  if (retval==SOCKET_ERROR)
-	{
-    retval=-1;
-		m_lastError = WSAGetLastError();
-#ifdef DEBUG_LOGGING
-		static Int errCount = 0;
-#endif
-		DEBUG_ASSERTLOG(errCount++ > 100, ("UDP::Write() - WSA error is %s\n", GetWSAErrorString(WSAGetLastError()).str()));
-	}
-  #endif
-  
-  return(retval);
-}
-
-Int UDP::Read(unsigned char *msg,UnsignedInt len,sockaddr_in *from)
-{
-  Int retval;
-  int    alen=sizeof(sockaddr_in);
-
-  if (from!=NULL)
-  {
-    retval=recvfrom(fd,(char *)msg,len,0,(struct sockaddr *)from,&alen);
-    #ifdef _WINDOWS
-    if (retval == SOCKET_ERROR)
-		{
-			if (WSAGetLastError() != WSAEWOULDBLOCK)
-			{
-				// failing because of a blocking error isn't really such a bad thing.
-				m_lastError = WSAGetLastError();
-#ifdef DEBUG_LOGGING
-				static Int errCount = 0;
-#endif
-				DEBUG_ASSERTLOG(errCount++ > 100, ("UDP::Read() - WSA error is %s\n", GetWSAErrorString(WSAGetLastError()).str()));
-				retval = -1;
-			} else {
-				retval = 0;
-			}
-		}
-    #endif
-  }
-  else
-  {
-    retval=recvfrom(fd,(char *)msg,len,0,NULL,NULL);
-    #ifdef _WINDOWS
-    if (retval==SOCKET_ERROR)
-		{
-			if (WSAGetLastError() != WSAEWOULDBLOCK)
-			{
-				// failing because of a blocking error isn't really such a bad thing.
-				m_lastError = WSAGetLastError();
-#ifdef DEBUG_LOGGING
-				static Int errCount = 0;
-#endif
-				DEBUG_ASSERTLOG(errCount++ > 100, ("UDP::Read() - WSA error is %s\n", GetWSAErrorString(WSAGetLastError()).str()));
-				retval = -1;
-			} else {
-				retval = 0;
-			}
-		}
-    #endif
-  }
-  return(retval);
-}
-
-
-void UDP::ClearStatus(void)
-{
-  #ifndef _WINDOWS
-  errno=0;
-  #endif
-
-	m_lastError = 0;
-}
-
-UDP::sockStat UDP::GetStatus(void)
-{
-	Int status = m_lastError;
- #ifdef _WINDOWS
-  //int status=WSAGetLastError();
-  if (status==0) return(OK);
-  else if (status==WSAEINTR) return(INTR);
-  else if (status==WSAEINPROGRESS) return(INPROGRESS);
-  else if (status==WSAECONNREFUSED) return(CONNREFUSED);
-  else if (status==WSAEINVAL) return(INVAL);
-  else if (status==WSAEISCONN) return(ISCONN);
-  else if (status==WSAENOTSOCK) return(NOTSOCK);
-  else if (status==WSAETIMEDOUT) return(TIMEDOUT);
-  else if (status==WSAEALREADY) return(ALREADY);
-  else if (status==WSAEWOULDBLOCK) return(WOULDBLOCK);
-  else if (status==WSAEBADF) return(BADF);
-  else     return((UDP::sockStat)status);
- #else
-  //int status=errno;
-  if (status==0) return(OK);
-  else if (status==EINTR) return(INTR);
-  else if (status==EINPROGRESS) return(INPROGRESS);
-  else if (status==ECONNREFUSED) return(CONNREFUSED);
-  else if (status==EINVAL) return(INVAL);
-  else if (status==EISCONN) return(ISCONN);
-  else if (status==ENOTSOCK) return(NOTSOCK);
-  else if (status==ETIMEDOUT) return(TIMEDOUT);
-  else if (status==EALREADY) return(ALREADY);
-  else if (status==EAGAIN) return(AGAIN);
-  else if (status==EWOULDBLOCK) return(WOULDBLOCK);
-  else if (status==EBADF) return(BADF);
-  else     return(UNKNOWN);
- #endif
-}
-
-
-
-/*
-//
-// Wait for net activity on this socket
-//
-int UDP::Wait(Int sec,Int usec,fd_set &returnSet)
-{
-  fd_set inputSet;
- 
-  FD_ZERO(&inputSet);
-  FD_SET(fd,&inputSet);
- 
-  return(Wait(sec,usec,inputSet,returnSet));
-}
-*/
-
-/*
-//
-// Wait for net activity on a list of sockets
-//
-int UDP::Wait(Int sec,Int usec,fd_set &givenSet,fd_set &returnSet)
-{
-  Wtime        timeout,timenow,timethen;
-  fd_set       backupSet;
-  int          retval=0,done,givenMax;
-  Bool         noTimeout=FALSE;
-  timeval      tv;
- 
-  returnSet=givenSet;
-  backupSet=returnSet;
- 
-  if ((sec==-1)&&(usec==-1))
-    noTimeout=TRUE;
- 
-  timeout.SetSec(sec);
-  timeout.SetUsec(usec);
-  timethen+=timeout;
- 
-  givenMax=fd;
-  for (UnsignedInt i=0; i<(sizeof(fd_set)*8); i++)   // i=maxFD+1
-  {
-    if (FD_ISSET(i,&givenSet))
-      givenMax=i;
-  }
-  ///DBGMSG("WAIT  fd="<<fd<<"  givenMax="<<givenMax);
- 
-  done=0;
-  while( ! done)
-  {
-    if (noTimeout)
-      retval=select(givenMax+1,&returnSet,0,0,NULL);
-    else
-    {
-      timeout.GetTimevalMT(tv);
-      retval=select(givenMax+1,&returnSet,0,0,&tv);
-    }
- 
-    if (retval>=0)
-      done=1;
-
-    else if ((retval==-1)&&(errno==EINTR))  // in case of signal
-    {
-      if (noTimeout==FALSE)
-      {
-        timenow.Update();
-        timeout=timethen-timenow;
-      }
-      if ((noTimeout==FALSE)&&(timenow.GetSec()==0)&&(timenow.GetUsec()==0))
-        done=1;
-      else
-        returnSet=backupSet;
-    }
-    else  // maybe out of memory?
-    {
-      done=1;
-    }
-  }
-  ///DBGMSG("Wait retval: "<<retval);
-  return(retval);
-}
-*/
-
-
-
-
-// Set the kernel buffer sizes for incoming, and outgoing packets
-//
-// Linux seems to have a buffer max of 32767 bytes for this,
-//  (which is the default). If you try and set the size to
-//  greater than the default it just sets it to 32767.
-
-Int UDP::SetInputBuffer(UnsignedInt bytes)
-{
-   int retval,arg=bytes;
-
-   retval=setsockopt(fd,SOL_SOCKET,SO_RCVBUF,
-     (char *)&arg,sizeof(int));
-   if (retval==0)
-     return(TRUE);
-   else
-     return(FALSE);
-}
-
-// Same note goes for the output buffer
-
-Int UDP::SetOutputBuffer(UnsignedInt bytes)
-{
-   int retval,arg=bytes;
-
-   retval=setsockopt(fd,SOL_SOCKET,SO_SNDBUF,
-     (char *)&arg,sizeof(int));
-   if (retval==0)
-     return(TRUE);
-   else
-     return(FALSE);
-}
-
-// Get the system buffer sizes 
-
-int UDP::GetInputBuffer(void)
-{
-   int retval,arg=0,len=sizeof(int);
-
-   retval=getsockopt(fd,SOL_SOCKET,SO_RCVBUF,
-     (char *)&arg,&len);
-   return(arg);
-}
-
-
-int UDP::GetOutputBuffer(void)
-{
-   int retval,arg=0,len=sizeof(int);
-
-   retval=getsockopt(fd,SOL_SOCKET,SO_SNDBUF,
-     (char *)&arg,&len);
-   return(arg);
-}
-
-Int UDP::AllowBroadcasts(Bool status)
-{
-	int retval;
-	BOOL val = status;
-	retval = setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char *)&val, sizeof(BOOL));
-	if (retval == 0)
-		return TRUE;
-	else
-		return FALSE;
-}
diff --git a/Generals/Code/GameEngine/Source/Precompiled/PreRTS.cpp b/Generals/Code/GameEngine/Source/Precompiled/PreRTS.cpp
index 8b5e9abc2e3..251e710ea0b 100644
--- a/Generals/Code/GameEngine/Source/Precompiled/PreRTS.cpp
+++ b/Generals/Code/GameEngine/Source/Precompiled/PreRTS.cpp
@@ -25,4 +25,4 @@
 // PreRTS.cpp /////////////////////////////////////////////////////////////////////////////////////
 // Generates PreRTS.obj, which contains all precompiled header info.
 
-#include "PreRTS.h"
\ No newline at end of file
+#include "PreRTS.h"
diff --git a/Generals/Code/GameEngineDevice/CMakeLists.txt b/Generals/Code/GameEngineDevice/CMakeLists.txt
index 0c81233f654..ab3d8f1d620 100644
--- a/Generals/Code/GameEngineDevice/CMakeLists.txt
+++ b/Generals/Code/GameEngineDevice/CMakeLists.txt
@@ -1,16 +1,16 @@
 set(GAMEENGINEDEVICE_SRC
-    Include/MilesAudioDevice/MilesAudioManager.h
-    Include/VideoDevice/Bink/BinkVideoPlayer.h
+#    Include/MilesAudioDevice/MilesAudioManager.h
+#    Include/VideoDevice/Bink/BinkVideoPlayer.h
     Include/W3DDevice/Common/W3DConvert.h
     Include/W3DDevice/Common/W3DFunctionLexicon.h
     Include/W3DDevice/Common/W3DModuleFactory.h
-    Include/W3DDevice/Common/W3DRadar.h
+#    Include/W3DDevice/Common/W3DRadar.h
     Include/W3DDevice/Common/W3DThingFactory.h
-    Include/W3DDevice/GameClient/HeightMap.h
+#    Include/W3DDevice/GameClient/HeightMap.h
     Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
     Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
     Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
-    Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
     Include/W3DDevice/GameClient/Module/W3DModelDraw.h
     Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h
     Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h
@@ -22,8 +22,8 @@ set(GAMEENGINEDEVICE_SRC
     Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h
     Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
     Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
-    Include/W3DDevice/GameClient/TerrainTex.h
-    Include/W3DDevice/GameClient/TileData.h
+#    Include/W3DDevice/GameClient/TerrainTex.h
+#    Include/W3DDevice/GameClient/TileData.h
     Include/W3DDevice/GameClient/W3DAssetManager.h
     Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
     Include/W3DDevice/GameClient/W3DBibBuffer.h
@@ -52,43 +52,43 @@ set(GAMEENGINEDEVICE_SRC
     Include/W3DDevice/GameClient/W3DProjectedShadow.h
     Include/W3DDevice/GameClient/W3DRoadBuffer.h
     Include/W3DDevice/GameClient/W3DScene.h
-    Include/W3DDevice/GameClient/W3DShaderManager.h
+#    Include/W3DDevice/GameClient/W3DShaderManager.h
     Include/W3DDevice/GameClient/W3DShadow.h
     Include/W3DDevice/GameClient/W3DShroud.h
     Include/W3DDevice/GameClient/W3DStatusCircle.h
-    Include/W3DDevice/GameClient/W3DTerrainTracks.h
-    Include/W3DDevice/GameClient/W3DTerrainVisual.h
-    Include/W3DDevice/GameClient/W3DTreeBuffer.h
-    Include/W3DDevice/GameClient/W3DVideobuffer.h
-    Include/W3DDevice/GameClient/W3DView.h
+#    Include/W3DDevice/GameClient/W3DTerrainTracks.h
+#    Include/W3DDevice/GameClient/W3DTerrainVisual.h
+#    Include/W3DDevice/GameClient/W3DTreeBuffer.h
+#    Include/W3DDevice/GameClient/W3DVideoBuffer.h
+#    Include/W3DDevice/GameClient/W3DView.h
     Include/W3DDevice/GameClient/W3DVolumetricShadow.h
-    Include/W3DDevice/GameClient/W3DWater.h
-    Include/W3DDevice/GameClient/W3DWaterTracks.h
+#    Include/W3DDevice/GameClient/W3DWater.h
+#    Include/W3DDevice/GameClient/W3DWaterTracks.h
     Include/W3DDevice/GameClient/W3DWaypointBuffer.h
     Include/W3DDevice/GameClient/W3DWebBrowser.h
-    Include/W3DDevice/GameClient/WorldHeightMap.h
+#    Include/W3DDevice/GameClient/WorldHeightMap.h
     Include/W3DDevice/GameLogic/W3DGameLogic.h
     Include/W3DDevice/GameLogic/W3DGhostObject.h
     Include/W3DDevice/GameLogic/W3DTerrainLogic.h
-    Include/Win32Device/Common/Win32BIGFile.h
-    Include/Win32Device/Common/Win32BIGFileSystem.h
+#    Include/Win32Device/Common/Win32BIGFile.h
+#    Include/Win32Device/Common/Win32BIGFileSystem.h
     Include/Win32Device/Common/Win32CDManager.h
     Include/Win32Device/Common/Win32GameEngine.h
-    Include/Win32Device/Common/Win32LocalFile.h
-    Include/Win32Device/Common/Win32LocalFileSystem.h
+#    Include/Win32Device/Common/Win32LocalFile.h
+#    Include/Win32Device/Common/Win32LocalFileSystem.h
     Include/Win32Device/GameClient/Win32DIKeyboard.h
     Include/Win32Device/GameClient/Win32Mouse.h
-    Source/MilesAudioDevice/MilesAudioManager.cpp
-    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
+#    Source/MilesAudioDevice/MilesAudioManager.cpp
+#    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
     Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
-    Source/W3DDevice/Common/System/W3DRadar.cpp
+#    Source/W3DDevice/Common/System/W3DRadar.cpp
     Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
     Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
     Source/W3DDevice/Common/W3DConvert.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp
-    Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp
@@ -117,7 +117,7 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
     Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
     Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
-    Source/W3DDevice/GameClient/HeightMap.cpp
+#    Source/W3DDevice/GameClient/HeightMap.cpp
     Source/W3DDevice/GameClient/Shaders/invmonochrome.nvp
     Source/W3DDevice/GameClient/Shaders/monochrome.nvp
     Source/W3DDevice/GameClient/Shaders/motionblur.nvp
@@ -130,8 +130,8 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
     Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp
     Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
-    Source/W3DDevice/GameClient/TerrainTex.cpp
-    Source/W3DDevice/GameClient/TileData.cpp
+#    Source/W3DDevice/GameClient/TerrainTex.cpp
+#    Source/W3DDevice/GameClient/TileData.cpp
     Source/W3DDevice/GameClient/W3DAssetManager.cpp
     Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
     Source/W3DDevice/GameClient/W3DBibBuffer.cpp
@@ -151,30 +151,30 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameClient/W3DPoly.cpp
     Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
     Source/W3DDevice/GameClient/W3DScene.cpp
-    Source/W3DDevice/GameClient/W3DShaderManager.cpp
+#    Source/W3DDevice/GameClient/W3DShaderManager.cpp
     Source/W3DDevice/GameClient/W3DShroud.cpp
     Source/W3DDevice/GameClient/W3DStatusCircle.cpp
-    Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
-    Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
-    Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
-    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
-    Source/W3DDevice/GameClient/W3DView.cpp
+#    Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
+#    Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
+#    Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
+#    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
+#    Source/W3DDevice/GameClient/W3DView.cpp
     Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
     Source/W3DDevice/GameClient/W3DWebBrowser.cpp
-    Source/W3DDevice/GameClient/Water/W3DWater.cpp
-    Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
-    Source/W3DDevice/GameClient/Water/wave.nvp
-    Source/W3DDevice/GameClient/Water/wave.nvv
-    Source/W3DDevice/GameClient/WorldHeightMap.cpp
+#    Source/W3DDevice/GameClient/Water/W3DWater.cpp
+#    Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
+#    Source/W3DDevice/GameClient/Water/wave.nvp
+#    Source/W3DDevice/GameClient/Water/wave.nvv
+#    Source/W3DDevice/GameClient/WorldHeightMap.cpp
     Source/W3DDevice/GameLogic/W3DGameLogic.cpp
     Source/W3DDevice/GameLogic/W3DGhostObject.cpp
     Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
-    Source/Win32Device/Common/Win32BIGFile.cpp
-    Source/Win32Device/Common/Win32BIGFileSystem.cpp
+#    Source/Win32Device/Common/Win32BIGFile.cpp
+#    Source/Win32Device/Common/Win32BIGFileSystem.cpp
     Source/Win32Device/Common/Win32CDManager.cpp
     Source/Win32Device/Common/Win32GameEngine.cpp
-    Source/Win32Device/Common/Win32LocalFile.cpp
-    Source/Win32Device/Common/Win32LocalFileSystem.cpp
+#    Source/Win32Device/Common/Win32LocalFile.cpp
+#    Source/Win32Device/Common/Win32LocalFileSystem.cpp
     Source/Win32Device/Common/Win32OSDisplay.cpp
     Source/Win32Device/GameClient/Win32DIKeyboard.cpp
     Source/Win32Device/GameClient/Win32Mouse.cpp
@@ -189,15 +189,21 @@ target_include_directories(g_gameenginedevice PUBLIC
     Include
 )
 
+target_precompile_headers(g_gameenginedevice PRIVATE
+    [["Common/STLTypedefs.h"]]
+    [["Common/SubsystemInterface.h"]]
+    [["INI.h"]]
+    [["WWCommon.h"]]
+    <windows.h>
+)
+
 target_link_libraries(g_gameenginedevice PRIVATE
+    corei_gameenginedevice_private
     gi_always    
     gi_main  
 )
 
 target_link_libraries(g_gameenginedevice PUBLIC
-    benchmark
-    binkstub
-    d3d8lib
+    corei_gameenginedevice_public
     g_gameengine
-    milesstub
 )
diff --git a/Generals/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h b/Generals/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
deleted file mode 100644
index 896cf507fd7..00000000000
--- a/Generals/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// FILE: MilesAudioManager.h //////////////////////////////////////////////////////////////////////////
-// MilesAudioManager implementation
-// Author: John K. McDonald, July 2002
-
-#include "Common/AsciiString.h"
-#include "Common/GameAudio.h"
-#include "mss/mss.h"
-
-class AudioEventRTS;
-
-enum { MAXPROVIDERS = 64 };
-
-enum PlayingAudioType CPP_11(: Int)
-{
-	PAT_Sample,
-	PAT_3DSample,
-	PAT_Stream,
-	PAT_INVALID
-};
-
-enum PlayingStatus CPP_11(: Int)
-{
-	PS_Playing,
-	PS_Stopped,
-	PS_Paused
-};
-
-enum PlayingWhich CPP_11(: Int)
-{
-	PW_Attack,
-	PW_Sound,
-	PW_Decay,
-	PW_INVALID
-};
-
-struct PlayingAudio
-{
-	union
-	{
-		HSAMPLE m_sample;
-		H3DSAMPLE m_3DSample;
-		HSTREAM m_stream;
-	};
-
-	PlayingAudioType m_type;
-	volatile PlayingStatus m_status;	// This member is adjusted by another running thread.
-	AudioEventRTS *m_audioEventRTS;
-	void *m_file;		// The file that was opened to play this
-	Bool m_requestStop;
-	Bool m_cleanupAudioEventRTS;
-	Int m_framesFaded;
-	
-	PlayingAudio() : 
-		m_type(PAT_INVALID), 
-		m_audioEventRTS(NULL), 
-		m_requestStop(false), 
-		m_cleanupAudioEventRTS(true),
-		m_sample(NULL), 
-		m_framesFaded(0)
-	{ }
-};
-
-struct ProviderInfo
-{
-  AsciiString name;
-  HPROVIDER id;
-	Bool m_isValid;
-};
-
-struct OpenAudioFile
-{
-	AILSOUNDINFO m_soundInfo;
-	void *m_file;
-	UnsignedInt m_openCount;
-	UnsignedInt m_fileSize;
-
-	Bool m_compressed;	// if the file was compressed, then we need to free it with a miles function.
-	
-	// Note: OpenAudioFile does not own this m_eventInfo, and should not delete it.
-	const AudioEventInfo *m_eventInfo;	// Not mutable, unlike the one on AudioEventRTS.
-};
-
-typedef std::hash_map< AsciiString, OpenAudioFile, rts::hash<AsciiString>, rts::equal_to<AsciiString> > OpenFilesHash;
-typedef OpenFilesHash::iterator OpenFilesHashIt;
-
-class AudioFileCache
-{
-	public:
-		AudioFileCache();
-		
-		// Protected by mutex
-		virtual ~AudioFileCache();
-		void *openFile( AudioEventRTS *eventToOpenFrom );
-		void closeFile( void *fileToClose );
-		void setMaxSize( UnsignedInt size );
-		// End Protected by mutex
-
-		// Note: These functions should be used for informational purposes only. For speed reasons,
-		// they are not protected by the mutex, so they are not guarenteed to be valid if called from
-		// outside the audio cache. They should be used as a rough estimate only.
-		UnsignedInt getCurrentlyUsedSize() const { return m_currentlyUsedSize; }
-		UnsignedInt getMaxSize() const { return m_maxSize; }
-
-	protected:
-		void releaseOpenAudioFile( OpenAudioFile *fileToRelease );
-
-		// This function will return TRUE if it was able to free enough space, and FALSE otherwise.
-		Bool freeEnoughSpaceForSample(const OpenAudioFile& sampleThatNeedsSpace);
-		
-		OpenFilesHash m_openFiles;
-		UnsignedInt m_currentlyUsedSize;
-		UnsignedInt m_maxSize;
-		HANDLE m_mutex;
-		const char *m_mutexName;
-};
-
-class MilesAudioManager : public AudioManager
-{
-
-	public:
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *, FILE *fp = NULL );
-		virtual AudioHandle addAudioEvent( const AudioEventRTS *eventToAdd );	///< Add an audio event (event must be declared in an INI file)
-#endif
-
-		// from AudioDevice
-		virtual void init();
-		virtual void postProcessLoad();
-		virtual void reset();
-		virtual void update();
-
-		MilesAudioManager();
-		virtual ~MilesAudioManager();
-
-
-		virtual void nextMusicTrack( void );
-		virtual void prevMusicTrack( void );
-		virtual Bool isMusicPlaying( void ) const;
-		virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const;
-		virtual AsciiString getMusicTrackName( void ) const;
-
-		virtual void openDevice( void );
-		virtual void closeDevice( void );
-		virtual void *getDevice( void ) { return m_digitalHandle; }
-
-		virtual void stopAudio( AudioAffect which );
-		virtual void pauseAudio( AudioAffect which );
-		virtual void resumeAudio( AudioAffect which );
-		virtual void pauseAmbient( Bool shouldPause );
-
-		virtual void killAudioEventImmediately( AudioHandle audioEvent );
-
-		///< Return whether the current audio is playing or not. 
-		///< NOTE NOTE NOTE !!DO NOT USE THIS IN FOR GAMELOGIC PURPOSES!! NOTE NOTE NOTE
-		virtual Bool isCurrentlyPlaying( AudioHandle handle );
-
-		virtual void notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags );
-		virtual PlayingAudio *findPlayingAudioFrom( UnsignedInt audioCompleted, UnsignedInt flags );
-
-		virtual UnsignedInt getProviderCount( void ) const;
-		virtual AsciiString getProviderName( UnsignedInt providerNum ) const;
-		virtual UnsignedInt getProviderIndex( AsciiString providerName ) const;
-		virtual void selectProvider( UnsignedInt providerNdx );
-		virtual void unselectProvider( void );
-		virtual UnsignedInt getSelectedProvider( void ) const;
-		virtual void setSpeakerType( UnsignedInt speakerType );
-		virtual UnsignedInt getSpeakerType( void );
-
- 		virtual void *getHandleForBink( void );
- 		virtual void releaseHandleForBink( void );
-
-		virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay);
-
-		virtual UnsignedInt getNum2DSamples( void ) const;
-		virtual UnsignedInt getNum3DSamples( void ) const;
-		virtual UnsignedInt getNumStreams( void ) const;
-
-		virtual Bool doesViolateLimit( AudioEventRTS *event ) const;
-		virtual Bool isPlayingLowerPriority( AudioEventRTS *event ) const;
-		virtual Bool isPlayingAlready( AudioEventRTS *event ) const;
-		virtual Bool isObjectPlayingVoice( UnsignedInt objID ) const;
-		Bool killLowestPrioritySoundImmediately( AudioEventRTS *event );
-		AudioEventRTS* findLowestPrioritySound( AudioEventRTS *event );
-
-		virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume);
-
-		virtual void removePlayingAudio( AsciiString eventName );
-		virtual void removeAllDisabledAudio();
-
-		virtual void processRequestList( void );
-		virtual void processPlayingList( void );
-		virtual void processFadingList( void );
-		virtual void processStoppedList( void );
-
-		Bool shouldProcessRequestThisFrame( AudioRequest *req ) const;
-		void adjustRequest( AudioRequest *req );
-		Bool checkForSample( AudioRequest *req );
-
-		virtual void setHardwareAccelerated(Bool accel);
-		virtual void setSpeakerSurround(Bool surround);
-		
-		virtual void setPreferredProvider(AsciiString provider) { m_pref3DProvider = provider; }
-		virtual void setPreferredSpeaker(AsciiString speakerType) { m_prefSpeaker = speakerType; }
-
-		virtual Real getFileLengthMS( AsciiString strToLoad ) const;
-
-		virtual void closeAnySamplesUsingFile( const void *fileToClose );
-
-    
-    virtual Bool has3DSensitiveStreamsPlaying( void ) const; 
-
-
-	protected:	
-		// 3-D functions
-		virtual void setDeviceListenerPosition( void );
-		const Coord3D *getCurrentPositionFromEvent( AudioEventRTS *event );
-		Bool isOnScreen( const Coord3D *pos ) const;
-		Real getEffectiveVolume(AudioEventRTS *event) const;
-
-		// Looping functions
-		Bool startNextLoop( PlayingAudio *looping );
-
-		void playStream( AudioEventRTS *event, HSTREAM stream );
-		// Returns the file handle for attachment to the PlayingAudio structure
-		void *playSample( AudioEventRTS *event, HSAMPLE sample );
-		void *playSample3D( AudioEventRTS *event, H3DSAMPLE sample3D );
-
-	protected:
-		void buildProviderList( void );
-		void createListener( void );
-		void initDelayFilter( void );
-		Bool isValidProvider( void );
-		void initSamplePools( void );
-		void processRequest( AudioRequest *req );
-
-		void playAudioEvent( AudioEventRTS *event );
-		void stopAudioEvent( AudioHandle handle );
-		void pauseAudioEvent( AudioHandle handle );
-
-		void *loadFileForRead( AudioEventRTS *eventToLoadFrom );
-		void closeFile( void *fileRead );
-
-		PlayingAudio *allocatePlayingAudio( void );
-		void releaseMilesHandles( PlayingAudio *release );
-		void releasePlayingAudio( PlayingAudio *release );
-		
-		void stopAllAudioImmediately( void );
-		void freeAllMilesHandles( void );
-
-		HSAMPLE getFirst2DSample( AudioEventRTS *event );
-		H3DSAMPLE getFirst3DSample( AudioEventRTS *event );
-
-		void adjustPlayingVolume( PlayingAudio *audio );
-		
-		void stopAllSpeech( void );
-		
-	protected:
-		void initFilters( HSAMPLE sample, const AudioEventRTS *eventInfo );
-		void initFilters3D( H3DSAMPLE sample, const AudioEventRTS *eventInfo, const Coord3D *pos );
-
-	protected:
-		ProviderInfo m_provider3D[MAXPROVIDERS];
-		UnsignedInt m_providerCount;
-		UnsignedInt m_selectedProvider;
-		UnsignedInt m_lastProvider;
-		UnsignedInt m_selectedSpeakerType;
-
-		AsciiString m_pref3DProvider;
-		AsciiString m_prefSpeaker;
-
-		HDIGDRIVER m_digitalHandle;
-		H3DPOBJECT m_listener;
-		HPROVIDER m_delayFilter;
-
-		// This is a list of all handles that are forcibly played. They always play as UI sounds.
-		std::list<HAUDIO> m_audioForcePlayed;
-
-		// Available handles for play. Note that there aren't handles open in advance for 
-		// streaming things, only 2-D and 3-D sounds.
-		std::list<HSAMPLE> m_availableSamples;
-		std::list<H3DSAMPLE> m_available3DSamples;
-
-		// Currently Playing stuff. Useful if we have to preempt it. 
-		// This should rarely if ever happen, as we mirror this in Sounds, and attempt to 
-		// keep preemption from taking place here.
-		std::list<PlayingAudio *> m_playingSounds;
-		std::list<PlayingAudio *> m_playing3DSounds;
-		std::list<PlayingAudio *> m_playingStreams;
-
-		// Currently fading stuff. At this point, we just want to let it finish fading, when it is
-		// done it should be added to the completed list, then "freed" and the counts should be updated
-		// on the next update
-		std::list<PlayingAudio *> m_fadingAudio;
-
-		// Stuff that is done playing (either because it has finished or because it was killed)
-		// This stuff should be cleaned up during the next update cycle. This includes updating counts
-		// in the sound engine
-		std::list<PlayingAudio *> m_stoppedAudio;
-
-		AudioFileCache *m_audioCache;
-		PlayingAudio *m_binkHandle;
-		UnsignedInt m_num2DSamples;
-		UnsignedInt m_num3DSamples;
-		UnsignedInt m_numStreams;
-		
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		typedef std::set<AsciiString> SetAsciiString;
-		typedef SetAsciiString::iterator SetAsciiStringIt;
-		SetAsciiString m_allEventsLoaded;
-		void dumpAllAssetsUsed();
-#endif
-
-};
-
diff --git a/Generals/Code/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h b/Generals/Code/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
deleted file mode 100644
index 497795fb860..00000000000
--- a/Generals/Code/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    Generals
-//
-// File name:  GameClient/VideoPlayer.h
-//
-// Created:    10/22/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __VIDEODEVICE_BINKDEVICE_H_
-#define __VIDEODEVICE_BINKDEVICE_H_
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "GameClient/VideoPlayer.h"
-#include "bink.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-class BinkVideoPlayer;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// BinkVideoStream
-//===============================
-
-class BinkVideoStream : public VideoStream
-{
-	friend class BinkVideoPlayer;
-
-	protected:
-
-		HBINK					m_handle;														///< Bink streaming handle;
-		Char					*m_memFile;													///< Pointer to memory resident file
-																											
-		BinkVideoStream();																///< only BinkVideoPlayer can create these
-		virtual ~BinkVideoStream();												
-																											
-	public:																							
-																											
-		virtual void update( void );											///< Update bink stream
-
-		virtual Bool	isFrameReady( void );								///< Is the frame ready to be displayed
-		virtual void	frameDecompress( void );						///< Render current frame in to buffer
-		virtual void	frameRender( VideoBuffer *buffer ); ///< Render current frame in to buffer
-		virtual void	frameNext( void );									///< Advance to next frame
-		virtual Int		frameIndex( void );									///< Returns zero based index of current frame
-		virtual Int		frameCount( void );									///< Returns the total number of frames in the stream
-		virtual void	frameGoto( Int index );							///< Go to the spcified frame index
-		virtual Int		height( void );											///< Return the height of the video
-		virtual Int		width( void );											///< Return the width of the video
-
-
-};
-
-//===============================
-// BinkVideoPlayer
-//===============================
-/**
-  *	Bink video playback code.
-	*/
-//===============================
-
-class BinkVideoPlayer : public VideoPlayer
-{
-
-	protected:
-
-		VideoStreamInterface* createStream( HBINK handle );
-
-	public:
-
-		// subsytem requirements
-		virtual void	init( void );														///< Initialize video playback code
-		virtual void	reset( void );													///< Reset video playback
-		virtual void	update( void );													///< Services all audio tasks. Should be called frequently
-																													
-		virtual void	deinit( void );													///< Close down player
-																														
-																													
-		BinkVideoPlayer();																				
-		~BinkVideoPlayer();																				
-																													
-		// service																						
-		virtual void	loseFocus( void );											///< Should be called when application loses focus
-		virtual void	regainFocus( void );										///< Should be called when application regains focus
-																												
-		virtual VideoStreamInterface*	open( AsciiString movieTitle );	///< Open video file for playback
-		virtual VideoStreamInterface*	load( AsciiString movieTitle );	///< Load video file in to memory for playback
-
-		virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid );
-		virtual void initializeBinkWithMiles( void );
-};
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-
-#endif // __VIDEODEVICE_BINKDEVICE_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h
index f81c2021130..f964eb5c917 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //==============================================================================
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //=============================================================================
 //
 // Project:    RTS3
@@ -41,11 +41,8 @@
 
 #pragma once
 
-#ifndef __W3DCONVERT_H_
-#define __W3DCONVERT_H_
-
 //=============================================================================
-//           Includes                                                      
+//           Includes
 //=============================================================================
 #include "Lib/BaseType.h"
 
@@ -62,7 +59,3 @@ extern void PixelScreenToW3DLogicalScreen( Int screenX, Int screenY,
 //=============================================================================
 //           Type Defines
 //=============================================================================
-
-
-#endif // _W3DCONVERT_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h
index e2c14fd1515..8cb5492aef9 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __W3DFUNCTIONLEXICON_H_
-#define __W3DFUNCTIONLEXICON_H_
-
 #include "Common/FunctionLexicon.h"
 
 //-------------------------------------------------------------------------------------------------
@@ -48,10 +45,7 @@ class W3DFunctionLexicon : public FunctionLexicon
 	virtual void init( void );
 	virtual void reset( void );
 	virtual void update( void );
-	
+
 protected:
 
 };
-
-#endif // __W3DFUNCTIONLEXICON_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h
index 4dc1f785665..ec8c53ceecf 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h
@@ -26,15 +26,12 @@
 // Author: Steven Johnson, September 2001
 //				 Colin Day, November 2001
 // Desc:   W3D game logic class, there shouldn't be a lot of new functionality
-//				 in this class, but there are certain things that need to have close 
+//				 in this class, but there are certain things that need to have close
 //				 knowledge of each other like ther logical and visual terrain
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __W3DMODULEFACTORY_H_
-#define __W3DMODULEFACTORY_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ModuleFactory.h"
 
@@ -46,8 +43,6 @@ class W3DModuleFactory : public ModuleFactory
 
 public:
 
-	virtual void init( void );  
-	
-};
+	virtual void init( void );
 
-#endif // __W3DMODULEFACTORY_H_
+};
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h
deleted file mode 100644
index b60b0967e15..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DRadar.h ///////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, January 2002
-// Desc:   W3D radar implementation, this has the necessary device dependent drawing
-//				 necessary for the radar
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DRADAR_H_
-#define __W3DRADAR_H_
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/Radar.h"
-#include "WW3D2/ww3dformat.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-class TextureClass;
-class TerrainLogic;
-
-// PROTOTYPES /////////////////////////////////////////////////////////////////////////////////////
-//-------------------------------------------------------------------------------------------------
-/** W3D radar class.  This has the device specific implementation of the radar such as
-	* the drawing routines */
-//-------------------------------------------------------------------------------------------------
-class W3DRadar : public Radar
-{
-
-public:
-
-	W3DRadar( void );
-	~W3DRadar( void );
-
-	virtual void init( void );																		///< subsystem init
-	virtual void update( void );																	///< subsystem update
-	virtual void reset( void );																		///< subsystem reset
-
-	virtual void newMap( TerrainLogic *terrain );				///< reset radar for new map
-
-	void draw( Int pixelX, Int pixelY, Int width, Int height );		///< draw the radar
-
-	virtual void clearShroud();
-	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting);
-
-	virtual void refreshTerrain( TerrainLogic *terrain );
-
-protected:
-
-	void drawSingleBeaconEvent( Int pixelX, Int pixelY, Int width, Int height, Int index );
-	void drawSingleGenericEvent( Int pixelX, Int pixelY, Int width, Int height, Int index );
-
-	void initializeTextureFormats( void );				///< find format to use for the radar texture
-	void deleteResources( void );									///< delete resources used
-	void drawEvents( Int pixelX, Int pixelY, Int width, Int height);		///< draw all of the radar events
-	void drawHeroIcon( Int pixelX, Int pixelY, Int width, Int height, const Coord3D *pos );	//< draw a hero icon
-	void drawViewBox( Int pixelX, Int pixelY, Int width, Int height );  ///< draw view box
-	void buildTerrainTexture( TerrainLogic *terrain );	 ///< create the terrain texture of the radar
-	void drawIcons( Int pixelX, Int pixelY, Int width, Int height );	///< draw all of the radar icons
-	void renderObjectList( const RadarObject *listHead, TextureClass *texture, Bool calcHero = FALSE );			 ///< render an object list to the texture
-	void interpolateColorForHeight( RGBColor *color, 
-																	Real height, 
-																	Real hiZ, 
-																	Real midZ, 
-																	Real loZ );		///< "shade" color according to height value
-	void reconstructViewBox( void );							///< remake the view box
-	void radarToPixel( const ICoord2D *radar, ICoord2D *pixel,
-										 Int radarUpperLeftX, Int radarUpperLeftY,
-										 Int radarWidth, Int radarHeight );  ///< convert radar coord to pixel location
-
-	WW3DFormat m_terrainTextureFormat;						///< format to use for terrain texture
-	Image *m_terrainImage;												///< terrain image abstraction for drawing
-	TextureClass *m_terrainTexture;								///< terrain background texture	
-
-	WW3DFormat m_overlayTextureFormat;						///< format to use for overlay texture
-	Image *m_overlayImage;												///< overlay image abstraction for drawing
-	TextureClass *m_overlayTexture;								///< overlay texture
-
-	WW3DFormat m_shroudTextureFormat;							///< format to use for shroud texture
-	Image *m_shroudImage;													///< shroud image abstraction for drawing
-	TextureClass *m_shroudTexture;								///< shroud texture
-
-	Int m_textureWidth;														///< width for all radar textures
-	Int m_textureHeight;													///< height for all radar textures
-
-	//
-	// we want to keep a flag that tells us when to reconstruct the view box, we want
-	// to reconstruct the box on map change, and when the camera changes height
-	// or orientation.  We want to avoid making the view box every frame because 
-	// the 4 points visible on the edge of the screen will "jitter" unevenly as we
-	// translate real world coords to integer radar spots
-	//
-	Bool m_reconstructViewBox;										///< true when we need to reconstruct the box
-	Real m_viewAngle;															///< camera angle used for the view box we have
-	Real m_viewZoom;															///< camera zoom used for the view box we have	
-	ICoord2D m_viewBox[ 4 ];											///< radar cell points for the 4 corners of view box
-
-	std::list<const Coord3D *> m_cachedHeroPosList;					//< cache of hero positions for drawing icons in radar overlay
-};
-
-
-#endif // __W3DRADAR_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h
index 995dc0e9c56..53bb89ba593 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h
@@ -31,9 +31,6 @@
 
 #pragma once
 
-#ifndef __W3DTHINGFACTORY_H_
-#define __W3DTHINGFACTORY_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/ThingFactory.h"
 
@@ -46,7 +43,4 @@ class W3DThingFactory : public ThingFactory
 
 	W3DThingFactory( void );
 	virtual ~W3DThingFactory( void );
-};  // end W3DThingFactory
-
-#endif // __W3DTHINGFACTORY_H_
-
+};
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h
deleted file mode 100644
index 733671f527c..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __HEIGHTMAP_H_
-#define __HEIGHTMAP_H_
-
-#include "always.h"
-#include "rendobj.h"
-#include "w3d_file.h"
-#include "dx8vertexbuffer.h"
-#include "dx8indexbuffer.h"
-#include "dx8wrapper.h"
-#include "shader.h"
-#include "vertmaterial.h"
-#include "Lib/BaseType.h"
-#include "Common/GameType.h"
-#include "WorldHeightMap.h"
-
-#define MAX_ENABLED_DYNAMIC_LIGHTS 20
-typedef UnsignedByte HeightSampleType;	//type of data to store in heightmap
-class W3DTreeBuffer;
-class W3DBibBuffer;
-class W3DRoadBuffer;
-class W3DBridgeBuffer;
-class W3DWaypointBuffer;
-class W3DTerrainLogic;
-class W3DCustomEdging;
-class W3DAssetManager;
-class SimpleSceneClass;
-class W3DShroud;
-
-#define no_TIMING_TESTS	1
-
-#define no_PRE_TRANSFORM_VERTEX // Don't do this, not a performance win.  jba.
-
-#define no_USE_TREE_BUFFER	///@todoRe-enable this optimization later... jba.
-
-typedef struct {
-	Int minX, maxX;
-	Int minY, maxY;
-} TBounds;
-
-#define VERTEX_BUFFER_TILE_LENGTH	32		//tiles of side length 32 (grid of 33x33 vertices).
-
-class LightMapTerrainTextureClass; 
-class CloudMapTerrainTextureClass;
-class W3DDynamicLight;
-
-#if 0
-#define USE_NORMALS	1
-#define VERTEX_FORMAT VertexFormatXYZNUV2
-#else
-#define USE_DIFFUSE	1
-#define VERTEX_FORMAT VertexFormatXYZDUV2
-#define DX8_VERTEX_FORMAT DX8_FVF_XYZDUV2
-#endif
-
-#define DO_SCORCH 1
-
-#define DO_ROADS 1
-
-#define TEST_CUSTOM_EDGING	1
-
-// Adjust the triangles to make cliff sides most attractive.  jba.
-#define FLIP_TRIANGLES 1
-
-#ifdef DO_SCORCH
-typedef struct {
-	Vector3 location;
-	Real		radius;
-	Int			scorchType;
-} TScorch;
-#endif
-
-/// Custom render object that draws the heightmap and handles intersection tests.
-/**
-Custom W3D render object that's used to process the terrain.  It handles
-virtually everything to do with the terrain, including: drawing, lighting,
-scorchmarks and intersection tests.
-*/
-class HeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHook
-{	
-
-public:
-
-	HeightMapRenderObjClass(void);
-	~HeightMapRenderObjClass(void);
-
-	// DX8_CleanupHook methods
-	virtual void ReleaseResources(void);	///< Release all dx8 resources so the device can be reset.
-	virtual void ReAcquireResources(void);  ///< Reacquire all resources after device reset.
-
-
-	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface (W3D methods)
-	/////////////////////////////////////////////////////////////////////////////
-	virtual RenderObjClass *	Clone(void) const;
-	virtual int						Class_ID(void) const;
-	virtual void					Render(RenderInfoClass & rinfo);
-	virtual bool					Cast_Ray(RayCollisionTestClass & raytest); // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int
-///@todo: Add methods for collision detection with terrain
-//	virtual Bool					Cast_AABox(AABoxCollisionTestClass & boxtest);
-//	virtual Bool					Cast_OBBox(OBBoxCollisionTestClass & boxtest);
-//	virtual Bool					Intersect_AABox(AABoxIntersectionTestClass & boxtest);
-//	virtual Bool					Intersect_OBBox(OBBoxIntersectionTestClass & boxtest);
-
-	virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;
-	virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;
-
-
-	virtual void					On_Frame_Update(void); 
-	virtual void					Notify_Added(SceneClass * scene);
-
-	///allocate resources needed to render heightmap
-	int initHeightData(Int width, Int height, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator);
-	Int freeMapResources(void);	///< free resources used to render heightmap
-	inline UnsignedByte getClipHeight(Int x, Int y) const
-	{
-		Int xextent = m_map->getXExtent() - 1;
-		Int yextent = m_map->getYExtent() - 1;
-
-		if (x < 0) 
-			x = 0; 
-		else if (x > xextent) 
-			x = xextent;
-
-		if (y < 0) 
-			y = 0; 
-		else if (y > yextent) 
-			y = yextent;
-
-		return m_map->getDataPtr()[x + y*m_map->getXExtent()];
-	}
-	void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator);
-
-	/// Update the macro texture (pass 3).
-	void updateMacroTexture(AsciiString textureName);
-	void doTextures(Bool flag) {m_disableTextures = !flag;};
-	/// Update the diffuse value from static light info for one vertex.
-	void doTheLight(VERTEX_FORMAT *vb, Vector3*light, Vector3*normal, RefRenderObjListIterator *pLightsIterator, UnsignedByte alpha);
-	void addScorch(Vector3 location, Real radius, Scorches type);
-	void addTree(Coord3D location, Real scale, Real angle, AsciiString name, Bool visibleInMirror);
-	void renderTrees(CameraClass * camera); ///< renders the tree buffer.
-
-	/// Add a bib at location.  
-	void addTerrainBib(Vector3 corners[4], ObjectID id, Bool highlight);
-	void addTerrainBibDrawable(Vector3 corners[4], DrawableID id, Bool highlight);
-	/// Remove a bib.  
-	void removeTerrainBib(ObjectID id);
-	void removeTerrainBibDrawable(DrawableID id);
-
-	/// Removes all bibs.  
-	void removeAllTerrainBibs(void);
-	/// Remove all highlighting.  
-	void removeTerrainBibHighlighting(void);
-
-	void renderTerrainPass(CameraClass *pCamera);	///< renders additional terrain pass.
-	W3DShroud *getShroud()	{return m_shroud;}
-	void renderExtraBlendTiles(void);			///< render 3-way blend tiles that have blend of 3 textures.
-	void updateShorelineTiles(Int minX, Int minY, Int maxX, Int maxY, WorldHeightMap *pMap);	///<figure out which tiles on this map cross water plane
-	void updateViewImpassableAreas(Bool partial = FALSE, Int minX = 0, Int maxX = 0, Int minY = 0, Int maxY = 0);
-	void clearAllScorches(void);
-	void setTimeOfDay( TimeOfDay tod );
-	void staticLightingChanged(void);
-	void loadRoadsAndBridges(W3DTerrainLogic *pTerrainLogic, Bool saveGame); ///< Load the roads from the map objects.
-	void worldBuilderUpdateBridgeTowers( W3DAssetManager *assetManager, SimpleSceneClass *scene );							///< for the editor updating of bridge tower visuals
-	Int  getStaticDiffuse(Int x, Int y); ///< Gets the diffuse terrain lighting value for a point on the mesh.
-	void adjustTerrainLOD(Int adj);
-	void reset(void);
-	void doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator);
-
-	Int	getNumExtraBlendTiles(void) { return m_numExtraBlendTiles;}
-	Int getNumShoreLineTiles(void)	{ return m_numShoreLineTiles;}
-	void setShoreLineDetail(void);	///<update shoreline tiles in case the feature was toggled by user.
-	Bool getMaximumVisibleBox(const FrustumClass &frustum,  AABoxClass *box, Bool ignoreMaxHeight);	///<3d extent of visible terrain.
-	Real getHeightMapHeight(Real x, Real y, Coord3D* normal) const;	///<return height and normal at given point
-	Bool isCliffCell(Real x, Real y);	///<return height and normal at given point
-	Real getMinHeight(void) const {return m_minHeight;}	///<return minimum height of entire terrain
-	Real getMaxHeight(void) const {return m_maxHeight;}	///<return maximum height of entire terrain
-	Real getMaxCellHeight(Real x, Real y) const;	///< returns maximum height of the 4 cell corners.
-	WorldHeightMap *getMap(void) {return m_map;}	///< returns object holding the heightmap samples - need this for fast access.
-	Bool isClearLineOfSight(const Coord3D& pos, const Coord3D& posOther) const;
-
-	Bool getShowImpassableAreas(void) {return m_showImpassableAreas;}
-	void setShowImpassableAreas(Bool show) {m_showImpassableAreas = show;}
-
-	Bool showAsVisibleCliff(Int xIndex, Int yIndex) const;
-	
-	Bool evaluateAsVisibleCliff(Int xIndex, Int yIndex, Real valuesGreaterThanRad);
-
-	void oversizeTerrain(Int tilesToOversize);
-
-	Real getViewImpassableAreaSlope(void) const { return m_curImpassableSlope; }
-	void setViewImpassableAreaSlope(Real viewSlope) { m_curImpassableSlope = viewSlope; }
-	
-	Bool doesNeedFullUpdate(void) {return m_needFullUpdate;}
-
-protected:
-#ifdef DO_SCORCH
-	enum { MAX_SCORCH_VERTEX=8194, 
-					MAX_SCORCH_INDEX=6*8194, 
-					MAX_SCORCH_MARKS=500,
-					SCORCH_MARKS_IN_TEXTURE=9,
-					SCORCH_PER_ROW = 3};
-	DX8VertexBufferClass	*m_vertexScorch;	///<Scorch vertex buffer.
-	DX8IndexBufferClass			*m_indexScorch;	///<indices defining a triangles for the scorch drawing.
-	TextureClass *m_scorchTexture;	///<Scorch mark texture
-	Int			m_curNumScorchVertices;	 ///<number of vertices used in m_vertexScorch.
-	Int			m_curNumScorchIndices;	 ///<number of indices used in m_indexScorch.
-	TScorch	m_scorches[MAX_SCORCH_MARKS];
-	Int			m_numScorches;
-
-	Int			m_scorchesInBuffer;		///< how many are in the buffers.  If less than numScorches, we need to update
-	
-	// NOTE: This argument (contrary to most of the rest of the engine), is in degrees, not radians.
-	Real		m_curImpassableSlope;
-
-	void updateScorches(void);	 ///<Update m_vertexScorch and m_indexScorch so all scorches will be drawn.
-	void allocateScorchBuffers(void);	 ///<allocate static buffers for drawing scorch marks.
-	void freeScorchBuffers(void);		 ///< frees up scorch buffers.
-	void drawScorches(void);		///< Draws the scorch mark polygons in m_vertexScorch.
-#endif
-	WorldHeightMap *m_map;
-	Int	m_x;	///< dimensions of heightmap 
-	Int	m_y;	///< dimensions of heightmap
-	Int m_originX; ///<  Origin point in the grid.  Slides around.
-	Int m_originY; ///< Origin point in the grid.  Slides around.
-	Bool m_useDepthFade;	///<fade terrain lighting under water
-	Vector3 m_depthFade;	///<depth based fall off values for r,g,b
-	Bool m_disableTextures;
-	Bool m_needFullUpdate; ///< True if lighting changed, and we need to update all instead of what moved.
-	Bool m_updating;	 ///< True if we are updating vertex buffers.  (can't draw while buffers are locked.)
-	Bool m_halfResMesh; ///< True if we are doing half resolution mesh of the terrain.
-	Bool m_doXNextTime; ///< True if we updated y scroll, and need to do x scroll next frame.
-	Real	m_minHeight;	///<minimum value of height samples in heightmap
-	Real	m_maxHeight;	///<maximum value of height samples in heightmap
-	Int	m_numVBTilesX;	///<dimensions of array containing all the vertex buffers 
-	Int	m_numVBTilesY;	///<dimensions of array containing all the vertex buffers
-	Int m_numVertexBufferTiles;	///<number of vertex buffers needed to store this heightmap
-	Int	m_numBlockColumnsInLastVB;///<a VB tile may be partially filled, this indicates how many 2x2 vertex blocks are filled.
-	Int	m_numBlockRowsInLastVB;///<a VB tile may be partially filled, this indicates how many 2x2 vertex blocks are filled.
-	Bool m_showImpassableAreas; ///< If true, shade impassable areas.
-
-	// STL is "smart." This is a variable sized bitset. Very memory efficient.
-	std::vector<bool> m_showAsVisibleCliff;
-
-
-	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining triangles in a VB tile.
-#ifdef PRE_TRANSFORM_VERTEX
-	IDirect3DVertexBuffer8 **m_xformedVertexBuffer;
-#endif
-	ShaderClass m_shaderClass; ///<shader or rendering state for heightmap
-	VertexMaterialClass	  	  *m_vertexMaterialClass;	///< vertex shader (lighting) for terrain
-	TextureClass *m_stageZeroTexture;	///<primary texture
-	TextureClass *m_stageOneTexture;	///<transparent edging texture
-	CloudMapTerrainTextureClass *m_stageTwoTexture;	///<Cloud map texture
-	TextureClass *m_stageThreeTexture;	///<light/noise map texture
-	AsciiString m_macroTextureName; ///< Name for stage 3 texture.
-	TextureClass *m_destAlphaTexture;	///< Texture holding destination alpha LUT for water depth.
-	DX8VertexBufferClass	**m_vertexBufferTiles;	///<collection of smaller vertex buffers that make up 1 heightmap
-	char	**m_vertexBufferBackup;	///< In memory copy of the vertex buffer data for quick update of dynamic lighting.
-
-	W3DTreeBuffer *m_treeBuffer; ///< Class for drawing trees and other alpha objects.
-	W3DBibBuffer *m_bibBuffer; ///< Class for drawing trees and other alpha objects.
-	W3DWaypointBuffer *m_waypointBuffer; ///< Draws waypoints.
-#ifdef TEST_CUSTOM_EDGING
-	W3DCustomEdging *m_customEdging; ///< Class for drawing custom edging.
-#endif
-#ifdef DO_ROADS
-	W3DRoadBuffer *m_roadBuffer; ///< Class for drawing roads.
-#endif
-	W3DBridgeBuffer *m_bridgeBuffer;
-	W3DShroud *m_shroud;	///< Class for drawing the shroud over terrain.
-	Int *m_extraBlendTilePositions;	///<array holding x,y tile positions of all extra blend tiles. (used for 3 textures per tile).
-	Int m_numExtraBlendTiles;		///<number of blend tiles in m_extraBlendTilePositions.
-	Int m_extraBlendTilePositionsSize;	//<total size of array including unused memory.
-	struct shoreLineTileInfo
-	{	Int m_xy;	//x,y position of tile
-		Real t0,t1,t2,t3;	//index into water depth alpha LUT.
-	};
-	shoreLineTileInfo *m_shoreLineTilePositions;	///<array holding x,y tile positions of all shoreline terrain.
-	Int m_numShoreLineTiles;		///<number of tiles in m_shoreLineTilePositions.
-	Int m_shoreLineTilePositionsSize;	///<total size of array including unused memory.
-	Real m_currentMinWaterOpacity;		///<current value inside the gradient lookup texture.
-	/// Update the diffuse value from dynamic light info for one vertex.
-	UnsignedInt doTheDynamicLight(VERTEX_FORMAT *vb, VERTEX_FORMAT *vbMirror, Vector3*light, Vector3*normal, W3DDynamicLight *pLights[], Int numLights);
-	Int getXWithOrigin(Int x);
-	Int getYWithOrigin(Int x);
-	///update vertex diffuse color for dynamic lights inside given rectangle
-	Int updateVBForLight(DX8VertexBufferClass *pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights);
-	Int updateVBForLightOptimized(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights);
-	///update vertex buffer vertices inside given rectangle
-	Int updateVB(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator);
-	///upate vertex buffers associated with the given rectangle
-	int updateBlock(Int x0, Int y0, Int x1, Int y1, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator);
-	AABoxClass & getTileBoundingBox(AABoxClass *aabox, Int x, Int y);	///<Vertex buffer bounding box
-	void initDestAlphaLUT(void);	///<initialize water depth LUT stored in m_destAlphaTexture
-	void renderShoreLines(CameraClass *pCamera);	///<re-render parts of terrain that need custom blending into water edge
-};
-
-extern HeightMapRenderObjClass *TheTerrainRenderObject;
-#endif  // end __HEIGHTMAP_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
index 8800a14c856..db06b6189e2 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __W3D_DEBRIS_DRAW_H_
-#define __W3D_DEBRIS_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameType.h"
 #include "Common/DrawModule.h"
@@ -60,7 +57,7 @@ class W3DDebrisDraw : public DrawModule, public DebrisDrawInterface
 	virtual void doDrawModule(const Matrix3D* transformMtx);
 
 	virtual void setShadowsEnabled(Bool enable);
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
+	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
 
 	virtual void setFullyObscuredByShroud(Bool fullyObscured);
@@ -98,6 +95,3 @@ class W3DDebrisDraw : public DrawModule, public DebrisDrawInterface
 	Shadow*										m_shadow;													///< Updates/Renders shadows of this object
 
 };
-
-#endif // __W3D_DEBRIS_DRAW_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
index dbbd729f7c2..fb6b4bfbf62 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __W3DDEFAULTDRAW_H_
-#define __W3DDEFAULTDRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameType.h"
 #include "Common/DrawModule.h"
@@ -62,7 +59,7 @@ class W3DDefaultDraw : public DrawModule
 	virtual void doDrawModule(const Matrix3D* transformMtx);
 
 	virtual void setShadowsEnabled(Bool enable);
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
+	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void setFullyObscuredByShroud(Bool fullyObscured);
 	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle);
@@ -75,6 +72,3 @@ class W3DDefaultDraw : public DrawModule
 	Shadow*				m_shadow;													///< Updates/Renders shadows of this object
 #endif
 };
-
-#endif // __W3DDEFAULTDRAW_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
index 52e719c7617..070288bd88d 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
@@ -34,9 +34,6 @@
 
 #pragma once
 
-#ifndef _W3D_DEPENDENCY_MODEL_DRAW_H_
-#define _W3D_DEPENDENCY_MODEL_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 
@@ -57,7 +54,7 @@ class W3DDependencyModelDraw : public W3DModelDraw
 
  	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DDependencyModelDraw, "W3DDependencyModelDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DDependencyModelDraw, W3DDependencyModelDrawModuleData )
-		
+
 public:
 
 	W3DDependencyModelDraw( Thing *thing, const ModuleData* moduleData );
@@ -69,6 +66,3 @@ class W3DDependencyModelDraw : public W3DModelDraw
 protected:
 	Bool m_dependencyCleared; // The thing we depend on will clear this, and we will relatch it after we draw.
 };
-
-#endif // _W3D_DEPENDENCY_MODEL_DRAW_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
deleted file mode 100644
index 0c1275e9169..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DLaserDraw.h ///////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:   
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DLASERDRAW_H_
-#define __W3DLASERDRAW_H_
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/DrawModule.h"
-//#include "WW3D2/Line3D.h"
-#include "GameClient/Color.h"
-
-class SegmentedLineClass;
-class TextureClass;
-
-class W3DLaserDrawModuleData : public ModuleData
-{
-public:
-
-  Color m_innerColor;
-  Color m_outerColor;
-	Real m_innerBeamWidth;
-	Real m_outerBeamWidth;
-	Real m_scrollRate;
-	Bool m_tile;
-  UnsignedInt m_numBeams;
-  UnsignedInt m_maxIntensityFrames;
-  UnsignedInt m_fadeFrames;
-	AsciiString m_textureName;
-	UnsignedInt m_segments;
-	Real m_arcHeight;
-	Real m_segmentOverlapRatio;
-	Real m_tilingScalar;
-
-	W3DLaserDrawModuleData();
-	~W3DLaserDrawModuleData();
-	static void buildFieldParse(MultiIniFieldParse& p);
-};
-
-//-------------------------------------------------------------------------------------------------
-/** W3D laser draw */
-//-------------------------------------------------------------------------------------------------
-class W3DLaserDraw : public DrawModule, public LaserDrawInterface
-{
-
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DLaserDraw, "W3DLaserDraw" )
-	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DLaserDraw, W3DLaserDrawModuleData )
-		
-public:
-
-	W3DLaserDraw( Thing *thing, const ModuleData* moduleData );
-	// virtual destructor prototype provided by memory pool declaration
-
-	virtual void doDrawModule(const Matrix3D* transformMtx);
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
-	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
-	virtual void setShadowsEnabled(Bool enable) { }
-	virtual void setFullyObscuredByShroud(Bool fullyObscured) { };
-	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle) { }
-	virtual void reactToGeometryChange() { }
-	virtual Bool isLaser() const { return true; }
-	Real getLaserTemplateWidth() const;
-	
-	virtual LaserDrawInterface* getLaserDrawInterface() { return this; }
-	virtual const LaserDrawInterface* getLaserDrawInterface() const { return this; }
-
-protected:
-
-	SegmentedLineClass **m_line3D;  ///< line 3D for effect
-	TextureClass *m_texture;
-	Real m_textureAspectRatio;			///< aspect ratio of texture
-	Bool m_selfDirty;								// not saved
-
-};
-
-#endif // __W3DLASERDRAW_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
index 7305c4e0738..226dc9c769d 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
@@ -29,16 +29,13 @@
 
 #pragma once
 
-#ifndef __W3DModelDraw_H_
-#define __W3DModelDraw_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ModelState.h"
-#include "Common/DrawModule.h" 
+#include "Common/DrawModule.h"
 #ifdef BRUTAL_TIMING_HACK // hack for collecting model timing info.  jba.
 class RenderObjClass {
 public:
-	enum AnimMode 
+	enum AnimMode
 	{
 		ANIM_MODE_MANUAL		= 0,
 		ANIM_MODE_LOOP,
@@ -46,6 +43,8 @@ class RenderObjClass {
 		ANIM_MODE_LOOP_PINGPONG,
 		ANIM_MODE_LOOP_BACKWARDS,	//make sure only backwards playing animations after this one
 		ANIM_MODE_ONCE_BACKWARDS,
+
+		ANIM_MODE_COUNT
 	};
 };
 
@@ -110,7 +109,7 @@ class W3DAnimationInfo
 	W3DAnimationInfo &operator=(const W3DAnimationInfo& r);
 
 	~W3DAnimationInfo();
-	
+
 	HAnimClass* getAnimHandle() const;
 	const AsciiString& getName() const { return m_name; }
 	Bool isIdleAnim() const { return m_isIdleAnim; }
@@ -121,7 +120,7 @@ class W3DAnimationInfo
 typedef std::vector<W3DAnimationInfo>	W3DAnimationVector;
 
 //-------------------------------------------------------------------------------------------------
-struct ParticleSysBoneInfo 
+struct ParticleSysBoneInfo
 {
 	AsciiString boneName;
 	const ParticleSystemTemplate* particleSystemTemplate;
@@ -175,7 +174,7 @@ struct ModelConditionInfo
 		Int							m_fxBone;											///< the FX bone for this barrel (zero == no bone)
 		Int							m_muzzleFlashBone;						///< the muzzle-flash subobj bone for this barrel (zero == none)
 		Matrix3D				m_projectileOffsetMtx;				///< where the projectile fires from
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 		AsciiString			m_muzzleFlashBoneName;
 #endif
 
@@ -190,16 +189,16 @@ struct ModelConditionInfo
 			m_fxBone = 0;
 			m_muzzleFlashBone = 0;
 			m_projectileOffsetMtx.Make_Identity();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 			m_muzzleFlashBoneName.clear();
 #endif
 		}
 
 		void setMuzzleFlashHidden(RenderObjClass *fullObject, Bool hide) const;
-	}; 
+	};
 	typedef std::vector<WeaponBarrelInfo>	WeaponBarrelInfoVec;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 	AsciiString												m_description;
 #endif
 	std::vector<ModelConditionFlags>	m_conditionsYesVec;
@@ -215,7 +214,7 @@ struct ModelConditionInfo
 	NameKeyType												m_transitionKey;
 	NameKeyType												m_allowToFinishKey;
 	Int																m_flags;
-	Int																m_iniReadFlags;	// not read from ini, but used for helping with default states														
+	Int																m_iniReadFlags;	// not read from ini, but used for helping with default states
 	RenderObjClass::AnimMode					m_mode;
 	ParticleSysBoneInfoVector					m_particleSysBones;			///< Bone names and attached particle systems.
 	TransitionSig											m_transitionSig;
@@ -237,8 +236,8 @@ struct ModelConditionInfo
 		PUBLIC_BONES_VALID			= 0x0010
 	};
 
-	inline ModelConditionInfo()
-	{ 
+	ModelConditionInfo()
+	{
 		clear();
 	}
 
@@ -246,9 +245,9 @@ struct ModelConditionInfo
 	void loadAnimations() const;
 	void preloadAssets( TimeOfDay timeOfDay, Real scale );			///< preload any assets for time of day
 
-	inline Int getConditionsYesCount() const { DEBUG_ASSERTCRASH(m_conditionsYesVec.size() > 0, ("empty m_conditionsYesVec.size(), see srj")); return m_conditionsYesVec.size(); }
-	inline const ModelConditionFlags& getNthConditionsYes(Int i) const { return m_conditionsYesVec[i]; }
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	Int getConditionsYesCount() const { DEBUG_ASSERTCRASH(!m_conditionsYesVec.empty(), ("empty m_conditionsYesVec.size(), see srj")); return m_conditionsYesVec.size(); }
+	const ModelConditionFlags& getNthConditionsYes(Int i) const { return m_conditionsYesVec[i]; }
+#if defined(RTS_DEBUG)
 	inline AsciiString getDescription() const { return m_description; }
 #endif
 
@@ -281,7 +280,7 @@ class W3DModelDrawModuleData : public ModuleData
 public:
 
 	mutable ModelConditionVector			m_conditionStates;
-	mutable SparseMatchFinder< ModelConditionInfo, ModelConditionFlags >	
+	mutable SparseMatchFinder< ModelConditionInfo, ModelConditionFlags >
 																		m_conditionStateMap;
 	mutable TransitionMap							m_transitionMap;
 	std::vector<AsciiString>					m_extraPublicBones;
@@ -350,9 +349,9 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	virtual void releaseShadows(void);	///< frees all shadow resources used by this module - used by Options screen.
 	virtual void allocateShadows(void); ///< create shadow resources if not already present. Used by Options screen.
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+#if defined(RTS_DEBUG)
 	virtual void getRenderCost(RenderCost & rc) const;  ///< estimates the render cost of this draw module
-	void getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const; 
+	void getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const;
 #endif
 
 	virtual void setFullyObscuredByShroud(Bool fullyObscured);
@@ -364,6 +363,8 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 
 	// this method must ONLY be called from the client, NEVER From the logic, not even indirectly.
 	virtual Bool clientOnly_getRenderObjInfo(Coord3D* pos, Real* boundingSphereRadius, Matrix3D* transform) const;
+	virtual Bool clientOnly_getRenderObjBoundBox(OBBoxClass * boundbox) const;
+	virtual Bool clientOnly_getRenderObjBoneTransform(const AsciiString & boneName,Matrix3D * set_tm) const;
 	virtual Int getPristineBonePositionsForConditionState(const ModelConditionFlags& condition, const char* boneNamePrefix, Int startIndex, Coord3D* positions, Matrix3D* transforms, Int maxBones) const;
 	virtual Int getCurrentBonePositions(const char* boneNamePrefix, Int startIndex, Coord3D* positions, Matrix3D* transforms, Int maxBones) const;
 	virtual Bool getCurrentWorldspaceClientBonePositions(const char* boneName, Matrix3D& transform) const;
@@ -380,7 +381,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	virtual void setSelectable(Bool selectable); // Change the selectability of the model.
 
 	/**
-		This call says, "I want the current animation (if any) to take n frames to complete a single cycle". 
+		This call says, "I want the current animation (if any) to take n frames to complete a single cycle".
 		If it's a looping anim, each loop will take n frames. someday, we may want to add the option to insert
 		"pad" frames at the start and/or end, but for now, we always just "stretch" the animation to fit.
 		Note that you must call this AFTER setting the condition codes.
@@ -389,7 +390,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 
 	/**
 		similar to the above, but assumes that the current state is a "ONCE",
-		and is smart about transition states... if there is a transition state 
+		and is smart about transition states... if there is a transition state
 		"inbetween", it is included in the completion time.
 	*/
 	virtual void setAnimationCompletionTime(UnsignedInt numFrames);
@@ -410,8 +411,8 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	virtual ObjectDrawInterface* getObjectDrawInterface() { return this; }
 	virtual const ObjectDrawInterface* getObjectDrawInterface() const { return this; }
 
-	///@todo: I had to make this public because W3DDevice needs access for casting shadows -MW 
-	inline RenderObjClass *getRenderObject() { return m_renderObject; }
+	///@todo: I had to make this public because W3DDevice needs access for casting shadows -MW
+	RenderObjClass *getRenderObject() { return m_renderObject; }
 	virtual Bool updateBonesForClientParticleSystems( void );///< this will reposition particle systems on the fly ML
 
 	virtual void onDrawableBoundToObject();
@@ -422,7 +423,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 
 	virtual void onRenderObjRecreated(void){};
 
-	inline const ModelConditionInfo* getCurState() const { return m_curState; }
+	const ModelConditionInfo* getCurState() const { return m_curState; }
 
 	void setModelState(const ModelConditionInfo* newState);
 	const ModelConditionInfo* findBestInfo(const ModelConditionFlags& c) const;
@@ -437,7 +438,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	Bool setCurAnimDurationInMsec(Real duration);
 
 
-	inline Bool getFullyObscuredByShroud() const { return m_fullyObscuredByShroud; }
+	Bool getFullyObscuredByShroud() const { return m_fullyObscuredByShroud; }
 
 private:
 
@@ -463,7 +464,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 			m_shift = 0.0f;
 			m_recoilRate = 0.0f;
 		}
-	}; 
+	};
 
 
 	struct ParticleSysTrackerType
@@ -477,10 +478,10 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	typedef std::vector<ParticleSysTrackerType>	ParticleSystemIDVec;
 	//typedef std::vector<ParticleSystemID>	ParticleSystemIDVec;
 
-	
+
 	const ModelConditionInfo*			m_curState;
 	const ModelConditionInfo*			m_nextState;
-	UnsignedInt										m_nextStateAnimLoopDuration;			
+	UnsignedInt										m_nextStateAnimLoopDuration;
 	Int														m_hexColor;
 	Int														m_whichAnimInCurState;						///< the index of the currently playing anim in cur state (if any)
 	WeaponRecoilInfoVec						m_weaponRecoilInfoVec[WEAPONSLOT_COUNT];
@@ -508,10 +509,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	void adjustAnimSpeedToMovementSpeed();
 	static void hideAllMuzzleFlashes(const ModelConditionInfo* state, RenderObjClass* renderObject);
 	void hideAllHeadlights(Bool hide);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//art wants to see buildings without flags as a test.
+#if defined(RTS_DEBUG)	//art wants to see buildings without flags as a test.
 	void hideGarrisonFlags(Bool hide);
 #endif
 };
-
-#endif // __W3DModelDraw_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h
index 3d25856224b..88f7297770b 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _W3D_OVERLORD_TANK_DRAW_H_
-#define _W3D_OVERLORD_TANK_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "W3DDevice/GameClient/Module/W3DTankDraw.h"
 
@@ -58,7 +55,7 @@ class W3DOverlordTankDraw : public W3DTankDraw
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DOverlordTankDraw, "W3DOverlordTankDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DOverlordTankDraw, W3DOverlordTankDrawModuleData )
-		
+
 public:
 
 	W3DOverlordTankDraw( Thing *thing, const ModuleData* moduleData );
@@ -70,6 +67,3 @@ class W3DOverlordTankDraw : public W3DTankDraw
 protected:
 
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h
index f5d97b5d542..8c1fc03dede 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: W3DPoliceCarDraw.h ///////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:   
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __W3DPOLICECARDRAW_H_
-#define __W3DPOLICECARDRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "W3DDevice/GameClient/Module/W3DTruckDraw.h"
@@ -63,6 +60,3 @@ class W3DPoliceCarDraw : public W3DTruckDraw
 	Real					m_curFrame;
 
 };
-
-#endif // __W3DPOLICECARDRAW_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h
index 33081536943..3ceeaaae5a7 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3D_PROJECTILE_STREAM_DRAW_H_
-#define _W3D_PROJECTILE_STREAM_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "GameLogic/Module/ProjectileStreamUpdate.h" // I am the draw module for this update.  Very tight.
@@ -62,14 +59,14 @@ class W3DProjectileStreamDraw : public DrawModule
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DProjectileStreamDraw, "W3DProjectileStreamDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DProjectileStreamDraw, W3DProjectileStreamDrawModuleData )
-		
+
 public:
 
 	W3DProjectileStreamDraw( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
 	virtual void doDrawModule(const Matrix3D* transformMtx);
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
+	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void setShadowsEnabled(Bool ) { }
 	virtual void setFullyObscuredByShroud(Bool);
@@ -83,6 +80,3 @@ class W3DProjectileStreamDraw : public DrawModule
 	SegmentedLineClass *m_allLines[MAX_PROJECTILE_STREAM];	///< Persist, so I can ensure they live a full cycle, and minimize re-creates by holding on
 	Int m_linesValid;
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h
index aa1579de6f5..58d0febbeb7 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: W3DRopeDraw.h //////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:   
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __W3DRopeDraw_H_
-#define __W3DRopeDraw_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "WW3D2/line3d.h"
@@ -52,7 +49,7 @@ class W3DRopeDraw : public DrawModule, public RopeDrawInterface
 
 	virtual void doDrawModule(const Matrix3D* transformMtx);
 	virtual void setShadowsEnabled(Bool enable) { }
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
+	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void setFullyObscuredByShroud(Bool fullyObscured) { }
 	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle) { }
@@ -80,8 +77,8 @@ class W3DRopeDraw : public DrawModule, public RopeDrawInterface
 	Real m_maxLen;								///< length of rope
 	Real m_width;									///< width of rope
 	RGBColor m_color;							///< color of rope
-	Real m_curSpeed;	
-	Real m_maxSpeed;	
+	Real m_curSpeed;
+	Real m_maxSpeed;
 	Real m_accel;
 	Real m_wobbleLen;
 	Real m_wobbleAmp;
@@ -93,6 +90,3 @@ class W3DRopeDraw : public DrawModule, public RopeDrawInterface
 	void buildSegments();
 
 };
-
-#endif // __W3DRopeDraw_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
index 11e855393de..5458195d7d6 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3D_SCIENCE_MODEL_DRAW_H_
-#define _W3D_SCIENCE_MODEL_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 
@@ -54,7 +51,7 @@ class W3DScienceModelDraw : public W3DModelDraw
 
  	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DScienceModelDraw, "W3DScienceModelDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DScienceModelDraw, W3DScienceModelDrawModuleData )
-		
+
 public:
 
 	W3DScienceModelDraw( Thing *thing, const ModuleData* moduleData );
@@ -63,6 +60,3 @@ class W3DScienceModelDraw : public W3DModelDraw
 
 protected:
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h
index 18507e7201b..44caa00fa8b 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3D_SUPPLY_DRAW_H_
-#define _W3D_SUPPLY_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 
@@ -52,7 +49,7 @@ class W3DSupplyDraw : public W3DModelDraw
 
  	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DSupplyDraw, "W3DSupplyDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DSupplyDraw, W3DSupplyDrawModuleData )
-		
+
 public:
 
 	W3DSupplyDraw( Thing *thing, const ModuleData* moduleData );
@@ -65,6 +62,3 @@ class W3DSupplyDraw : public W3DModelDraw
 	Int m_totalBones;
 	Int m_lastNumberShown;
 };
-
-#endif // _W3D_TRUCK_DRAW_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h
index d7628bd130c..b01db7f9319 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3D_TANK_DRAW_H_
-#define _W3D_TANK_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "GameClient/ParticleSys.h"
@@ -62,7 +59,7 @@ class W3DTankDraw : public W3DModelDraw
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DTankDraw, "W3DTankDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DTankDraw, W3DTankDrawModuleData )
-		
+
 public:
 
 	W3DTankDraw( Thing *thing, const ModuleData* moduleData );
@@ -105,6 +102,3 @@ class W3DTankDraw : public W3DModelDraw
 	void updateTreadObjects(void);												///< update pointers to sub-objects like treads.
 	void updateTreadPositions(Real uvDelta);									///< update uv coordinates on each tread
 };
-
-#endif // _W3D_TANK_DRAW_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h
index f66879d8ef4..a69530f3f8a 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3D_TANKTRUCK_DRAW_H_
-#define _W3D_TANKTRUCK_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "Common/AudioEventRTS.h"
@@ -81,7 +78,7 @@ class W3DTankTruckDraw : public W3DModelDraw
 
  	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DTankTruckDraw, "W3DTankTruckDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DTankTruckDraw, W3DTankTruckDrawModuleData )
-		
+
 public:
 
 	W3DTankTruckDraw( Thing *thing, const ModuleData* moduleData );
@@ -152,6 +149,3 @@ class W3DTankTruckDraw : public W3DModelDraw
 	void updateTreadObjects(void);												///< update pointers to sub-objects like treads.
 	void updateTreadPositions(Real uvDelta);									///< update uv coordinates on each tread
 };
-
-#endif // _W3D_TANKTRUCK_DRAW_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
index 4786df3e55b..335f12a86d0 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: W3DTracerDraw.h //////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:   
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __W3DTRACERDRAW_H_
-#define __W3DTRACERDRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "WW3D2/line3d.h"
@@ -52,7 +49,7 @@ class W3DTracerDraw : public DrawModule, public TracerDrawInterface
 
 	virtual void doDrawModule(const Matrix3D* transformMtx);
 	virtual void setShadowsEnabled(Bool enable) { }
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
+	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void setFullyObscuredByShroud(Bool fullyObscured) { }
 	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle);
@@ -73,6 +70,3 @@ class W3DTracerDraw : public DrawModule, public TracerDrawInterface
 	Real m_opacity;								///< opacity of the tracer
 
 };
-
-#endif // __W3DTRACERDRAW_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
index bdbb1cfd6ad..510a375a7f6 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3D_TRUCK_DRAW_H_
-#define _W3D_TRUCK_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "Common/AudioEventRTS.h"
@@ -84,7 +81,7 @@ class W3DTruckDraw : public W3DModelDraw
 
  	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DTruckDraw, "W3DTruckDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DTruckDraw, W3DTruckDrawModuleData )
-		
+
 public:
 
 	W3DTruckDraw( Thing *thing, const ModuleData* moduleData );
@@ -141,6 +138,3 @@ class W3DTruckDraw : public W3DModelDraw
 	void enableEmitters( Bool enable );						///< stop creating debris from the tank treads
 	void updateBones( void );
 };
-
-#endif // _W3D_TRUCK_DRAW_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h
deleted file mode 100644
index baeb9d2172c..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// TerrainTex.h
-// Class to generate texture for terrain.
-// Author: John Ahlquist, April 2001
-
-#pragma once
-
-#ifndef TERRAINTEX_H
-#define TERRAINTEX_H
-
-//#define DO_8STAGE_TERRAIN_PASS		//optimized terrain rendering for Nvidia based cards
-
-#include "WW3D2/texture.h"
-#include "WWMath/matrix3d.h"
-#include "Common/AsciiString.h"
-
-class WorldHeightMap;
-#define TILE_OFFSET 8
-/** ***********************************************************************
-**                             TerrainTextureClass
-***************************************************************************/
-class TerrainTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(TerrainTextureClass)
-protected:
-	virtual void Apply(unsigned int stage);
-	int update256(WorldHeightMap *htMap);///< Sets the pixels, and returns the actual height of the texture.
-
-public:
-		/// Create texture for a height map.
-		TerrainTextureClass(int height, MipCountType mipLevelCount = MIP_LEVELS_3 );
-
-		// just use default destructor. ~TerrainTextureClass(void);
-public:
-	int update(WorldHeightMap *htMap); ///< Sets the pixels, and returns the actual height of the texture.
-
-};
-
-
-class AlphaTerrainTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(AlphaTerrainTextureClass)
-protected:
-		virtual void Apply(unsigned int stage);
-public:
-		// Create texture for a height map.
-		AlphaTerrainTextureClass(TextureClass *pBaseTex );
-
-		// just use default destructor. ~TerrainTextureClass(void);
-
-};
-
-/** ***********************************************************************
-**                             AlphaEdgeTextureClass
-***************************************************************************/
-class AlphaEdgeTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(AlphaEdgeTextureClass)
-protected:
-	virtual void Apply(unsigned int stage);
-	int update256(WorldHeightMap *htMap);///< Sets the pixels, and returns the actual height of the texture.
-
-public:
-		/// Create texture for a height map.
-		AlphaEdgeTextureClass(int height, MipCountType mipLevelCount = MIP_LEVELS_3 );
-
-		// just use default destructor. ~TerrainTextureClass(void);
-public:
-	int update(WorldHeightMap *htMap); ///< Sets the pixels, and returns the actual height of the texture.
-
-};
-
-class LightMapTerrainTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(LightMapTerrainTextureClass)
-protected:
-		virtual void Apply(unsigned int stage);
-
-public:
-		// Create texture from a height map.
-		LightMapTerrainTextureClass( AsciiString name, MipCountType mipLevelCount = MIP_LEVELS_ALL );
-
-		// just use default destructor. 
-};
-
-class ScorchTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(ScorchTextureClass)
-protected:
-		virtual void Apply(unsigned int stage);
-
-public:
-		// Create texture.
-		ScorchTextureClass( MipCountType mipLevelCount = MIP_LEVELS_3 );
-
-		// just use default destructor. ~ScorchTextureClass(void);
-};
-
-class CloudMapTerrainTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(CloudMapTerrainTextureClass)
-protected:
-		virtual void Apply(unsigned int stage);
-
-protected:
-		float m_xSlidePerSecond ;	 ///< How far the clouds move per second.
-		float m_ySlidePerSecond ;	 ///< How far the clouds move per second.
-		int	  m_curTick;
-		float m_xOffset;
-		float m_yOffset;
-
-
-public:
-		// Create texture from a height map.
-		CloudMapTerrainTextureClass( MipCountType mipLevelCount = MIP_LEVELS_ALL );
-
-		// just use default destructor. ~TerrainTextureClass(void);
-
-		void restore(void);
-};
-
-
-
-#endif //TEXTURE_H
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h
deleted file mode 100644
index 5226c889352..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// TileData.h
-// Class to hold 1 tile's data.
-// Author: John Ahlquist, April 2001
-
-#pragma once
-
-#ifndef TileData_H
-#define TileData_H
-
-#include <stdio.h>
-
-#include "Lib/BaseType.h"
-#include "WWLib/refcount.h"
-#include "Common/AsciiString.h"
-
-typedef struct {
-	Int blendNdx;
-	UnsignedByte horiz;
-	UnsignedByte vert;
-	UnsignedByte rightDiagonal;
-	UnsignedByte leftDiagonal;
-	UnsignedByte inverted;
-	UnsignedByte longDiagonal;
-	Int customBlendEdgeClass; // Class of texture for a blend edge.  -1 means use alpha. 
-} TBlendTileInfo;
-
-#define INVERTED_MASK	0x1		//AND this with TBlendTileInfo.inverted to get actual inverted state
-#define FLIPPED_MASK	0x2		//AND this with TBlendTileInfo.inverted to get forced flip state (for horizontal/vertical flips).
-#define TILE_PIXEL_EXTENT 64
-#define TILE_BYTES_PER_PIXEL 4
-#define DATA_LEN_BYTES TILE_PIXEL_EXTENT*TILE_PIXEL_EXTENT*TILE_BYTES_PER_PIXEL
-#define DATA_LEN_PIXELS TILE_PIXEL_EXTENT*TILE_PIXEL_EXTENT
-#define TILE_PIXEL_EXTENT_MIP1 32
-#define TILE_PIXEL_EXTENT_MIP2 16
-#define TILE_PIXEL_EXTENT_MIP3 8
-#define TILE_PIXEL_EXTENT_MIP4 4
-#define TILE_PIXEL_EXTENT_MIP5 2
-#define TILE_PIXEL_EXTENT_MIP6 1
-#define TEXTURE_WIDTH 2048 // was 1024 jba
-
-/** This class holds the bitmap data from the .tga texture files.  It is used to 
-create the D3D texture in the game and 3d windows, and to create DIB data for the 
-2d window. */
-class TileData : public RefCountClass
-{
-protected: 
-
-	// data is bgrabgrabgra to be compatible with windows blt. jba.
-	// Also, first byte is lower left pixel, not upper left pixel.
-	// so 0,0 is lower left, not upper left.
-	UnsignedByte m_tileData[DATA_LEN_BYTES];
-	/// Mipped down copies of the tile data.
-	UnsignedByte m_tileDataMip32[TILE_PIXEL_EXTENT_MIP1*TILE_PIXEL_EXTENT_MIP1*TILE_BYTES_PER_PIXEL];
-	UnsignedByte m_tileDataMip16[TILE_PIXEL_EXTENT_MIP2*TILE_PIXEL_EXTENT_MIP2*TILE_BYTES_PER_PIXEL];
-	UnsignedByte m_tileDataMip8[TILE_PIXEL_EXTENT_MIP3*TILE_PIXEL_EXTENT_MIP3*TILE_BYTES_PER_PIXEL];
-	UnsignedByte m_tileDataMip4[TILE_PIXEL_EXTENT_MIP4*TILE_PIXEL_EXTENT_MIP4*TILE_BYTES_PER_PIXEL];
-	UnsignedByte m_tileDataMip2[TILE_PIXEL_EXTENT_MIP5*TILE_PIXEL_EXTENT_MIP5*TILE_BYTES_PER_PIXEL];
-	UnsignedByte m_tileDataMip1[TILE_PIXEL_EXTENT_MIP6*TILE_PIXEL_EXTENT_MIP6*TILE_BYTES_PER_PIXEL];
-
-public:
-	ICoord2D	m_tileLocationInTexture;
-
-
-protected:
-	/** doMip - generates the next mip level mipping pHiRes down to pLoRes.
-				pLoRes is 1/2 the width of pHiRes, and both are square. */
-	static void doMip(UnsignedByte *pHiRes, Int hiRow, UnsignedByte *pLoRes);
-
-
-
-public:
-	TileData(void);
-
-public:
-	UnsignedByte *getDataPtr(void) {return(m_tileData);};
-	static Int dataLen(void) {return(DATA_LEN_BYTES);};
-	
-	void updateMips(void);
-
-	Bool hasRGBDataForWidth(Int width);
-	UnsignedByte *getRGBDataForWidth(Int width);
-};
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h
index 3403e1d4bef..baae21cb17d 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h
@@ -42,12 +42,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef W3DASSETMANAGER_H
-#define W3DASSETMANAGER_H
 
 #include "assetmgr.h"
 #include "Lib/BaseType.h"
@@ -59,14 +54,14 @@ class W3DAssetManager: public WW3DAssetManager
 {
 public:
 	W3DAssetManager(void);
-	virtual ~W3DAssetManager(void);	
+	virtual ~W3DAssetManager(void);
 
 	virtual RenderObjClass * Create_Render_Obj(const char * name);
 	// unique to W3DAssetManager
 	virtual HAnimClass *	Get_HAnim(const char * name);
 	virtual bool Load_3D_Assets( const char * filename ); // This CANNOT be Bool, as it will not inherit properly if you make Bool == Int
 	virtual TextureClass *			Get_Texture(
-		const char * filename, 
+		const char * filename,
 		MipCountType mip_level_count=MIP_LEVELS_ALL,
 		WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN,
 		bool allow_compression=true);
@@ -103,10 +98,10 @@ class W3DAssetManager: public WW3DAssetManager
 	int replaceMeshTexture(RenderObjClass *robj, TextureClass *oldTex, TextureClass *newTex);
 
 	//'E&B' customizations
-/*	virtual RenderObjClass * Create_Render_Obj(const char * name, float scale, const Vector3 &hsv_shift);	
+/*	virtual RenderObjClass * Create_Render_Obj(const char * name, float scale, const Vector3 &hsv_shift);
 	TextureClass * Get_Texture_With_HSV_Shift(const char * filename, const Vector3 &hsv_shift, MipCountType mip_level_count = MIP_LEVELS_ALL);
 	void Recolor_Vertex_Material(VertexMaterialClass *vmat, const Vector3 &hsv_shift);
-	void Recolor_Vertices(unsigned int *color, int count, const Vector3 &hsv_shift);	
+	void Recolor_Vertices(unsigned int *color, int count, const Vector3 &hsv_shift);
 	void Recolor_Mesh(RenderObjClass *robj, const Vector3 &hsv_shift);
 	TextureClass * Recolor_Texture(TextureClass *texture, const Vector3 &hsv_shift);
 	TextureClass * Recolor_Texture_One_Time(TextureClass *texture, const Vector3 &hsv_shift);
@@ -115,6 +110,3 @@ class W3DAssetManager: public WW3DAssetManager
 	void Recolor_ParticleEmitter(RenderObjClass *robj, const Vector3 &hsv_shift);
 	void Recolor_Asset(RenderObjClass *robj, const Vector3 &hsv_shift);*/
 };
-
-#endif
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
index d39cba71c1c..978eff73861 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: W3DAssetManagerExposed.h 
+// FILE: W3DAssetManagerExposed.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -38,8 +38,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_W3DASSETMANAGEREXPOSED_
-#define _H_W3DASSETMANAGEREXPOSED_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -52,5 +50,3 @@
 // so this function is here. It should only be called by the particle editor,
 // @todo Remove this function when we are no longer editing particles.
 void ReloadAllTextures(void);
-
-#endif /* _H_W3DASSETMANAGEREXPOSED_ */
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h
index 5cf73b9282d..fedb5ce9790 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DBibBuffer.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,11 +44,8 @@
 
 #pragma once
 
-#ifndef __W3DBIB_BUFFER_H_
-#define __W3DBIB_BUFFER_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "always.h"
 #include "rendobj.h"
@@ -64,7 +61,7 @@
 //-----------------------------------------------------------------------------
 //           Forward References
 //-----------------------------------------------------------------------------
-class MeshClass; 
+class MeshClass;
 
 //-----------------------------------------------------------------------------
 //           Type Defines
@@ -84,9 +81,9 @@ typedef struct {
 // W3DBibBuffer: Draw buffer for the bibs.
 //
 //
-class W3DBibBuffer 
-{	
-friend class HeightMapRenderObjClass;
+class W3DBibBuffer
+{
+friend class BaseHeightMapRenderObjClass;
 public:
 
 	W3DBibBuffer(void);
@@ -101,13 +98,13 @@ friend class HeightMapRenderObjClass;
 	void clearAllBibs(void);
 	/// Removes highlighting.
 	void removeHighlighting(void);
-	/// Draws the bibs.  
+	/// Draws the bibs.
 	void renderBibs();
 	/// Called when the view changes, and sort key needs to be recalculated.
 	/// Normally sortKey gets calculated when a bib becomes visible.
 protected:
-	enum { INITIAL_BIB_VERTEX=256, 
-					INITIAL_BIB_INDEX=384, 
+	enum { INITIAL_BIB_VERTEX=256,
+					INITIAL_BIB_INDEX=384,
 					MAX_BIBS=1000};
 	DX8VertexBufferClass	*m_vertexBib;	///<Bib vertex buffer.
 	Int										m_vertexBibSize; ///< Num vertices in bib buffer.
@@ -131,5 +128,3 @@ friend class HeightMapRenderObjClass;
 	void allocateBibBuffers(void);							 ///< Allocates the buffers.
 	void freeBibBuffers(void);									 ///< Frees the index and vertex buffers.
 };
-
-#endif  // end __W3DBIB_BUFFER_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h
index 1b0b9e73c41..979d3d40af2 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DBridgeBuffer.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,11 +44,8 @@
 
 #pragma once
 
-#ifndef __W3DBRIDGE_BUFFER_H_
-#define __W3DBRIDGE_BUFFER_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "always.h"
 #include "rendobj.h"
@@ -65,23 +62,24 @@
 //-----------------------------------------------------------------------------
 //           Forward References
 //-----------------------------------------------------------------------------
-class MeshClass; 
+class MeshClass;
 class W3DTerrainLogic;
 class W3DAssetManager;
 class SimpleSceneClass;
+enum BodyDamageType CPP_11(: Int);
 
 //-----------------------------------------------------------------------------
 //           Type Defines
 //-----------------------------------------------------------------------------
 
 typedef enum {
-	FIXED_BRIDGE = 0, 
-	SECTIONAL_BRIDGE = 1 
+	FIXED_BRIDGE = 0,
+	SECTIONAL_BRIDGE = 1
 } TBridgeType;
 
 class BridgeInfo;
 /// The individual data for a bridge.
-class W3DBridge 
+class W3DBridge
 {
 protected:
 	Vector3 m_start;						///< Drawing location
@@ -111,15 +109,15 @@ class W3DBridge
 	Int				m_numPolygons;		///< Number of polygons to draw.
 	Bool			m_visible;
 	AsciiString m_templateName;					///< Name of the bridge type.
-	enum BodyDamageType m_curDamageState;
+	BodyDamageType m_curDamageState;
 	Bool			m_enabled;
 
 protected:
 	Int getModelVerticesFixed(VertexFormatXYZNDUV1 *destination_vb, Int curVertex, const Matrix3D &mtx, MeshClass *pMesh, RefRenderObjListIterator *pLightsIterator);
 	Int getModelIndices(UnsignedShort *destination_ib, Int curIndex, Int vertexOffset, MeshClass *pMesh);
 	Int getModelVertices(VertexFormatXYZNDUV1 *destination_vb, Int curVertex,  Real xOffset,
-																Vector3 &vec, Vector3 &vecNormal, Vector3 &vecZ, Vector3 &offset, 
-																const Matrix3D &mtx, 
+																Vector3 &vec, Vector3 &vecNormal, Vector3 &vecZ, Vector3 &offset,
+																const Matrix3D &mtx,
 																MeshClass *pMesh, RefRenderObjListIterator *pLightsIterator);
 
 public:
@@ -130,9 +128,9 @@ class W3DBridge
 	AsciiString getTemplateName(void) {return m_templateName;}
 	const Vector3* getStart(void) const {return &m_start;}
 	const Vector3* getEnd(void) const { return &m_end;}
-	Bool load(enum BodyDamageType curDamageState);
-	enum BodyDamageType getDamageState(void) {return m_curDamageState;};
-	void setDamageState(enum BodyDamageType state) { m_curDamageState = state;};
+	Bool load(BodyDamageType curDamageState);
+	BodyDamageType getDamageState(void) {return m_curDamageState;};
+	void setDamageState(BodyDamageType state) { m_curDamageState = state;};
 	void getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatXYZNDUV1 *destination_vb, Int *curIndexP, Int *curVertexP, RefRenderObjListIterator *pLightsIterator);
 	Bool cullBridge(CameraClass * camera);						 ///< Culls the bridges.  Returns true if visibility changed.
 	void clearBridge(void);		///< Frees all objects associated with a bridge.
@@ -147,9 +145,9 @@ class W3DBridge
 // W3DBridgeBuffer: Draw buffer for the bridges.
 //
 //
-class W3DBridgeBuffer 
-{	
-friend class HeightMapRenderObjClass;
+class W3DBridgeBuffer
+{
+friend class BaseHeightMapRenderObjClass;
 public:
 
 	W3DBridgeBuffer(void);
@@ -164,8 +162,8 @@ friend class HeightMapRenderObjClass;
 	void loadBridges(W3DTerrainLogic *pTerrainLogic, Bool saveGame); ///< Loads the bridges from the map objects list.
 	void worldBuilderUpdateBridgeTowers( W3DAssetManager *assetManager, SimpleSceneClass *scene );			///< for the editor and showing visual bridge towers
 	void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator);
-	enum { MAX_BRIDGE_VERTEX=8000, 
-					MAX_BRIDGE_INDEX=2*8000, 
+	enum { MAX_BRIDGE_VERTEX=8000,
+					MAX_BRIDGE_INDEX=2*8000,
 					MAX_BRIDGES=200};
 protected:
 	DX8VertexBufferClass	*m_vertexBridge;	///<Bridge vertex buffer.
@@ -186,5 +184,3 @@ friend class HeightMapRenderObjClass;
 	void cull(CameraClass * camera);						 ///< Culls the bridges.
 	void freeBridgeBuffers(void);									 ///< Frees the index and vertex buffers.
 };
-
-#endif  // end __W3DBRIDGE_BUFFER_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h
index 64cd1667abb..40e18524de5 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h
@@ -29,23 +29,29 @@
 
 #pragma once
 
-#ifndef _W3D_VERTEX_BUFFER_MANAGER
-#define _W3D_VERTEX_BUFFER_MANAGER
-
 #include "Lib/BaseType.h"
 #include "dx8vertexbuffer.h"
 #include "dx8indexbuffer.h"
 
-#define MAX_VB_SIZES 128	//number of different sized VB slots allowed.
-#define MIN_SLOT_SIZE	32	//minimum number of vertices allocated per slot (power of 2). See also MIN_SLOT_SIZE_SHIFT.
-#define	MIN_SLOT_SIZE_SHIFT	5 //used for division by MIN_SLOT_SIZE
-#define MAX_VERTEX_BUFFERS_CREATED	32	//maximum number of D3D vertex buffers allowed to create per vertex type.
-#define DEFAULT_VERTEX_BUFFER_SIZE	8192	//this size ends up generating VB's of about 256Kbytes
-#define MAX_NUMBER_SLOTS	4096			//maximum number of slots that can be allocated.
-
+// TheSuperHackers @info The max sizes correspond to a number of vertices and indices of a mesh casting shadows
+// in the scene. The more vertices the meshes are supposed to have, the higher these limits need to be.
+// Multiplying these numbers by MIN_SLOT_SIZE gives the max supported amount of vertices and indices.
+#define MAX_VB_SIZES 128 //number of different sized VB slots allowed.
 #define MAX_IB_SIZES 128 //number of different sized IB slots allowed (goes all the way up to 65536)
-#define MAX_INDEX_BUFFERS_CREATED	32
-#define DEFAULT_INDEX_BUFFER_SIZE	32768	
+
+#define MIN_SLOT_SIZE_SHIFT 5 //used for division by MIN_SLOT_SIZE
+#define MIN_SLOT_SIZE (1 << MIN_SLOT_SIZE_SHIFT) //minimum number of vertices allocated per slot (power of 2).
+
+// TheSuperHackers @info The number of slots corresponds to number of meshes casting shadows in the scene.
+// The more meshes there are, the larger the slots needs to be.
+// TheSuperHackers @tweak Double the original sizes to allow for twice as many shadows to be created in the scene.
+#define SLOTS_MULTIPLIER 2
+#define MAX_NUMBER_SLOTS (4096 * SLOTS_MULTIPLIER) //maximum number of slots that can be allocated.
+#define MAX_VERTEX_BUFFERS_CREATED (32 * SLOTS_MULTIPLIER) //maximum number of D3D vertex buffers allowed to create per vertex type.
+#define MAX_INDEX_BUFFERS_CREATED (32 * SLOTS_MULTIPLIER)
+
+#define DEFAULT_VERTEX_BUFFER_SIZE 8192 //this size ends up generating VB's of about 256Kbytes
+#define DEFAULT_INDEX_BUFFER_SIZE 32768
 
 class W3DBufferManager
 {
@@ -176,5 +182,3 @@ class W3DBufferManager
 };
 
 extern W3DBufferManager *TheW3DBufferManager;	//singleton
-
-#endif //_W3D_VERTEX_BUFFER_MANAGER
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h
index 5092f88d131..1682a721789 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DCustomEdging.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,11 +44,8 @@
 
 #pragma once
 
-#ifndef __W3DCUSTOM_EDGING_H_
-#define __W3DCUSTOM_EDGING_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "always.h"
 #include "rendobj.h"
@@ -74,8 +71,8 @@ class WorldHeightMap;
 // W3DCustomEdging: Draw buffer for the trees.
 //
 //
-class W3DCustomEdging 
-{	
+class W3DCustomEdging
+{
 friend class HeightMapRenderObjClass;
 public:
 
@@ -85,20 +82,20 @@ friend class HeightMapRenderObjClass;
 	/// Empties the tree buffer.
 	void clearAllEdging(void);
 	/// Draws the trees.  Uses camera for culling.
-	void drawEdging( WorldHeightMap *pMap, Int minX, Int maxX, Int minY, Int maxY, 
+	void drawEdging( WorldHeightMap *pMap, Int minX, Int maxX, Int minY, Int maxY,
 		TextureClass * terrainTexture, TextureClass * cloudTexture, TextureClass * noiseTexture );
 	/// Called when the view changes, and sort key needs to be recalculated.
 	/// Normally sortKey gets calculated when a tree becomes visible.
 	void doFullUpdate(void) {clearAllEdging();};
 protected:
 #define MAX_BLENDS 2000
-	enum { MAX_EDGE_VERTEX=4*MAX_BLENDS, 
+	enum { MAX_EDGE_VERTEX=4*MAX_BLENDS,
 					MAX_EDGE_INDEX=6*MAX_BLENDS};
 	DX8VertexBufferClass	*m_vertexEdging;	///<Edging vertex buffer.
 	DX8IndexBufferClass			*m_indexEdging;	///<indices defining a triangles for the tree drawing.
 	Int			m_curNumEdgingVertices; ///<Number of vertices used in m_vertexEdging.
 	Int			m_curNumEdgingIndices;	///<Number of indices used in b_indexEdging;
-	Int			m_curEdgingIndexOffset;	///<First index to draw at.  We draw the trees backwards by filling up the index buffer backwards, 
+	Int			m_curEdgingIndexOffset;	///<First index to draw at.  We draw the trees backwards by filling up the index buffer backwards,
 																// so any trees that don't fit are far away from the camera.
 	Bool		m_anythingChanged;	///< Set to true if visibility or sorting changed.
 	Bool		m_initialized;		///< True if the subsystem initialized.
@@ -107,5 +104,3 @@ friend class HeightMapRenderObjClass;
 	void freeEdgingBuffers(void);									 ///< Frees the index and vertex buffers.
 	void loadEdgingsInVertexAndIndexBuffers(WorldHeightMap *pMap, Int minX, Int maxX, Int minY, Int maxY);
 };
-
-#endif  // end __W3DCUSTOM_EDGING_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h
index e90221cc20c..3786750238a 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h
@@ -24,13 +24,8 @@
 
 #pragma once
 
-#ifndef __W3DCUSTOMSCENE_H_
-#define __W3DCUSTOMSCENE_H_
-
 enum CustomScenePassModes CPP_11(: Int)
 {
 	SCENE_PASS_DEFAULT,
 	SCENE_PASS_ALPHA_MASK
 };
-
-#endif //W3DCUSTOMSCENE
\ No newline at end of file
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h
index 72553bbffa4..fed9f5c5717 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    Generals
@@ -43,12 +43,8 @@
 
 #pragma once
 
-#ifndef __W3DDEVICE_GAMECLIENT_W3DDEBUGDISPLAY_H
-#define __W3DDEVICE_GAMECLIENT_W3DDEBUGDISPLAY_H
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "GameClient/DebugDisplay.h"
@@ -67,7 +63,7 @@ class DisplayString;
 
 
 //===============================
-// W3DDebugDisplay 
+// W3DDebugDisplay
 //===============================
 
 class W3DDebugDisplay : public DebugDisplay
@@ -96,9 +92,5 @@ class W3DDebugDisplay : public DebugDisplay
 
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-
-#endif // __W3DDEVICE_GAMECLIENT_W3DDEBUGDISPLAY_H
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h
index de0823f65e5..80fe0dc65be 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h
@@ -22,25 +22,21 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __W3D_DEBUG_ICONS_H_
-#define __W3D_DEBUG_ICONS_H_
-
 #include "always.h"
 #include "rendobj.h"
 #include "vertmaterial.h"
 #include "Lib/BaseType.h"
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 struct DebugIcon;
 //
 /// W3DDebugIcons: Draws huge numbers of debug icons for pathfinding quickly.
 //
 //
 class W3DDebugIcons : public RenderObjClass
-{	
+{
 
 public:
 
@@ -50,7 +46,7 @@ class W3DDebugIcons : public RenderObjClass
 	~W3DDebugIcons(void);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
@@ -64,7 +60,7 @@ class W3DDebugIcons : public RenderObjClass
 protected:
 	VertexMaterialClass	  	*m_vertexMaterialClass;
 
-protected: 
+protected:
 	static DebugIcon				*m_debugIcons;
 	static Int							m_numDebugIcons;
 
@@ -76,6 +72,4 @@ class W3DDebugIcons : public RenderObjClass
 public:
 	static void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 };
-#endif // RTS_DEBUG or RTS_INTERNAL
-
-#endif  // end __W3D_DEBUG_ICONS_H_
+#endif // RTS_DEBUG
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h
index b88aa035fda..472d9d31bcd 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef __W3DDISPLAY_H_
-#define __W3DDISPLAY_H_
-
 #include "GameClient/Display.h"
 #include "WW3D2/lightenvironment.h"
 
@@ -52,7 +49,7 @@ class RTS3DInterfaceScene;
 
 //=============================================================================
 /** W3D implementation of the game display which is responsible for creating
-  * all interaction with the screen and updating the display 
+  * all interaction with the screen and updating the display
 	*/
 class W3DDisplay : public Display
 {
@@ -71,7 +68,7 @@ class W3DDisplay : public Display
 	virtual void getDisplayModeDescription(Int modeIndex, Int *xres, Int *yres, Int *bitDepth);	///<return description of mode
  	virtual void setGamma(Real gamma, Real bright, Real contrast, Bool calibrate);
 	virtual void doSmartAssetPurgeAndPreload(const char* usageFileName);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void dumpAssetUsage(const char* mapname);
 #endif
 
@@ -81,20 +78,21 @@ class W3DDisplay : public Display
 	virtual Bool	isClippingEnabled( void ) 	{ return m_isClippedEnabled; }
 	virtual void	enableClipping( Bool onoff )		{ m_isClippedEnabled = onoff; }
 
+	virtual void step(); ///< Do one fixed time step
 	virtual void draw( void );  ///< redraw the entire display
 
 	/// @todo Replace these light management routines with a LightManager singleton
-	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real outerRadius, 
-																 UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE 
+	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real outerRadius,
+																 UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE
 																 );
 	virtual void setTimeOfDay ( TimeOfDay tod );
 
 	/// draw a line on the display in screen coordinates
-	virtual void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
 												 Real lineWidth, UnsignedInt lineColor );
 
 	/// draw a line on the display in screen coordinates
-	virtual void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
 												 Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 );
 
 	/// draw a rect border on the display in pixel coordinates with the specified color
@@ -102,9 +100,9 @@ class W3DDisplay : public Display
 														 Real lineWidth, UnsignedInt lineColor );
 
 	/// draw a filled rect on the display in pixel coords with the specified color
-	virtual void drawFillRect( Int startX, Int startY, Int width, Int height, 
+	virtual void drawFillRect( Int startX, Int startY, Int width, Int height,
 														 UnsignedInt color );
-	
+
 	/// Draw a percentage of a rectangle, much like a clock (0 to x%)
 	virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color);
 
@@ -112,11 +110,12 @@ class W3DDisplay : public Display
 	virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color);
 
 	/// draw an image fit within the screen coordinates
-	virtual void drawImage( const Image *image, Int startX, Int startY, 
+	virtual void drawImage( const Image *image, Int startX, Int startY,
 													Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA);
 
 	/// draw a video buffer fit within the screen coordinates
-	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY, 
+	virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream );
+	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY,
 													Int endX, Int endY );
 
 	virtual VideoBuffer*	createVideoBuffer( void ) ;							///< Create a video buffer that can be used for this display
@@ -128,11 +127,12 @@ class W3DDisplay : public Display
 	virtual void enableLetterBox(Bool enable);	///<forces letter-boxed display on/off
 
 	virtual Bool isLetterBoxFading(void);	///<returns true while letterbox fades in/out
+	virtual Bool isLetterBoxed(void);
 
 	virtual void clearShroud();
 	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting);
 	virtual void setBorderShroudLevel(UnsignedByte level);	///<color that will appear in unused border terrain.
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void dumpModelAssets(const char *path);	///< dump all used models/textures to a file.
 #endif
 	virtual void preloadModelAssets( AsciiString model );			///< preload model asset
@@ -145,7 +145,8 @@ class W3DDisplay : public Display
 	static W3DAssetManager *m_assetManager;		///< W3D asset manager
 
 	void drawFPSStats( void );								///< draw the fps on the screen
-	virtual Real getAverageFPS( void );								///< return the average FPS.
+	virtual Real getAverageFPS( void );						///< return the average FPS.
+	virtual Real getCurrentFPS( void );						///< return the current FPS.
 	virtual Int getLastFrameDrawCalls( void );				///< returns the number of draw calls issued in the previous frame
 
 protected:
@@ -158,7 +159,7 @@ class W3DDisplay : public Display
 	void drawCurrentDebugDisplay( void );			///< draws current debug display
 	void calculateTerrainLOD(void);						///< Calculate terrain LOD.
 	void renderLetterBox(UnsignedInt time);							///< draw letter box border
-	void updateAverageFPS(void);	///< figure out the average fps over the last 30 frames.
+	void updateAverageFPS(void);	///< calculate the average fps over the last 30 frames.
 
 	Byte m_initialized;												///< TRUE when system is initialized
 	LightClass *m_myLight[LightEnvironmentClass::MAX_LIGHTS];										///< light hack for now
@@ -166,7 +167,8 @@ class W3DDisplay : public Display
 	IRegion2D m_clipRegion;									///< the clipping region for images
 	Bool m_isClippedEnabled;	///<used by 2D drawing operations to define clip re
 	Real m_averageFPS;		///<average fps over the last 30 frames.
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	Real m_currentFPS;		///<current fps value.
+#if defined(RTS_DEBUG)
 	Int64 m_timerAtCumuFPSStart;
 #endif
 
@@ -197,6 +199,4 @@ class W3DDisplay : public Display
 
 	W3DDebugDisplay *m_nativeDebugDisplay;		///< W3D specific debug display interface
 
-};  // end W3DDisplay
-
-#endif  // end __W3DDISPLAY_H_
+};
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h
index 0d31efa757d..c08629bb4d5 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DDisplayString.h ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -47,9 +47,6 @@
 
 #pragma once
 
-#ifndef __W3DDISPLAYSTRING_H_
-#define __W3DDISPLAYSTRING_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -119,6 +116,3 @@ class W3DDisplayString : public DisplayString
 inline void W3DDisplayString::usingResources( UnsignedInt frame ) { m_lastResourceFrame = frame; }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __W3DDISPLAYSTRING_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h
index 79f591f25d5..4c52fe44f9c 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3DDISPLAYSTRINGMANAGER_H_
-#define _W3DDISPLAYSTRINGMANAGER_H_
-
 #include "GameClient/DisplayStringManager.h"
 #include "W3DDevice/GameClient/W3DDisplayString.h"
 
@@ -65,8 +62,8 @@ class W3DDisplayStringManager : public DisplayStringManager
 
 	/// free a display string
 	virtual void freeDisplayString( DisplayString *string );
-	
-	// This is used to save us a few FPS and storage space. There's no reason to 
+
+	// This is used to save us a few FPS and storage space. There's no reason to
 	// duplicate the DisplayString on every drawable when 1 copy will suffice.
 	virtual DisplayString *getGroupNumeralString( Int numeral );
 	virtual DisplayString *getFormationLetterString( void ) { return m_formationLetterDisplayString; };
@@ -76,6 +73,3 @@ class W3DDisplayStringManager : public DisplayStringManager
 	DisplayString *m_formationLetterDisplayString;
 
 };
-
-#endif // _W3DDISPLAYSTRINGMANAGER_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h
index d874555c0d9..deed969ea74 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef W3D_DYNAMIC_LIGHT_H
-#define W3D_DYNAMIC_LIGHT_H
-
 #include "WW3D2/light.h"
 #include "Lib/BaseType.h"
 class HeightMapRenderObjClass;
@@ -45,7 +42,7 @@ friend class HeightMapRenderObjClass;
 	/// Values used by HeightMapRenderObjClass to update the height map.
 	Bool		m_priorEnable;
 	Bool		m_processMe;
-	
+
 
 	Int			m_prevMinX, m_prevMinY, m_prevMaxX, m_prevMaxY;
 	Int			m_minX, m_minY, m_maxX, m_maxY;
@@ -68,7 +65,7 @@ friend class HeightMapRenderObjClass;
 	~W3DDynamicLight(void);
 
 public:
-	virtual void					On_Frame_Update(void); 
+	virtual void					On_Frame_Update(void);
 
 	void setEnabled(Bool enabled) { m_enabled = enabled; m_decayRange = false; m_decayFrameCount = 0; m_decayColor = false; m_increaseFrameCount = 0;};
 	Bool isEnabled(void) {return m_enabled;};
@@ -81,7 +78,3 @@ friend class HeightMapRenderObjClass;
 	// Cull returns true if the terrain vertex at x,y is outside of the light's influence.
 	Bool cull(Int x, Int y ) {return (x<m_minX||y<m_minY||x>m_maxX||y>m_maxY);}
 };
-
-
-
-#endif //TEXTURE_H
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h
index fd83e0d8c8d..9005e915ccd 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h
@@ -24,22 +24,17 @@
 
 // FILE: W3DFileSystem.h ////////////////////////////////////////////////////////
 //
-// W3D implementation of a file factory.  Uses GDI assets, so that 
+// W3D implementation of a file factory.  Uses GDI assets, so that
 // W3D files and targa files are loaded using the GDI file interface.
 //
 // Author: John Ahlquist, Sept 2001
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef __W3DFILESYSTEM_H_
-#define __W3DFILESYSTEM_H_
 
 #include "WWLib/ffactory.h"
+#include "Common/ArchiveFileSystem.h"
 #include "Common/file.h"
 
 //-------------------------------------------------------------------------------------------------
@@ -93,7 +88,11 @@ class	W3DFileSystem : public FileFactoryClass {
 
 	virtual FileClass * Get_File( char const *filename );
 	virtual void Return_File( FileClass *file );
+
+private:
+
+	static void reprioritizeTexturesBySize();
+	static void reprioritizeTexturesBySize(ArchivedDirectoryInfo& dirInfo);
 };
 
 extern W3DFileSystem *TheW3DFileSystem;
-#endif
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h
index bf67cb32b3d..d3fd1d245cb 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __W3DGUICALLBACKS_H_
-#define __W3DGUICALLBACKS_H_
-
 class GameWindow;
 class WindowLayout;
 class WinInstanceData;
@@ -67,6 +64,3 @@ extern void W3DNoDraw( GameWindow *window, WinInstanceData *instData );
 extern void W3DDrawMapPreview( GameWindow *window, WinInstanceData *instData );
 
 void W3DMainMenuInit( WindowLayout *layout, void *userData );
-
-#endif // __W3DGUICALLBACKS_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h
index 0dcb4705317..71a5c97e747 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DGadget.h //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __W3DGADGET_H_
-#define __W3DGADGET_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -89,6 +86,3 @@ extern void W3DGadgetStaticTextDraw( GameWindow *window, WinInstanceData *instDa
 extern void W3DGadgetStaticTextImageDraw( GameWindow *window, WinInstanceData *instData );
 extern void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData );
 extern void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData );
-
-#endif // __W3DGADGET_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h
index 345bb25b588..5190395b813 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h
@@ -24,7 +24,7 @@
 
 // FILE: W3DGameClient.h ///////////////////////////////////////////////////
 //
-// W3D implementation of the game interface.  The GameClient is 
+// W3D implementation of the game interface.  The GameClient is
 // responsible for maintaining our drawbles, handling our GUI, and creating
 // the display ... basically the Client if this were a Client/Server game.
 //
@@ -34,9 +34,6 @@
 
 #pragma once
 
-#ifndef __W3DGAMEINTERFACE_H_
-#define __W3DGAMEINTERFACE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -74,12 +71,12 @@ class W3DGameClient : public GameClient
 	virtual ~W3DGameClient();
 
 	/// given a type, create a drawable
-	virtual Drawable *friend_createDrawable( const ThingTemplate *thing, DrawableStatus statusBits = DRAWABLE_STATUS_NONE );
+	virtual Drawable *friend_createDrawable( const ThingTemplate *thing, DrawableStatusBits statusBits = DRAWABLE_STATUS_DEFAULT );
 
 	virtual void init( void );		///< initialize resources
 	virtual void update( void );  ///< per frame update
 	virtual void reset( void );   ///< reset system
-		
+
 	virtual void addScorch(const Coord3D *pos, Real radius, Scorches type);
 	virtual void createRayEffectByTemplate( const Coord3D *start, const Coord3D *end, const ThingTemplate* tmpl );  ///< create effect needing start and end location
 	//virtual Bool getBonePos(Drawable *draw, AsciiString boneName, Coord3D* pos, Matrix3D* transform) const;
@@ -88,7 +85,7 @@ class W3DGameClient : public GameClient
 
 	//---------------------------------------------------------------------------
 	virtual void setTeamColor( Int red, Int green, Int blue );  ///< @todo superhack for demo, remove!!!
-	virtual void adjustLOD( Int adj ); ///< @todo hack for evaluation, remove.
+	virtual void setTextureLOD( Int level );
 
 protected:
 
@@ -99,7 +96,7 @@ class W3DGameClient : public GameClient
 	virtual Display *createGameDisplay( void ) { return NEW W3DDisplay; }
 
 	/// factory for creating TheInGameUI
-	virtual InGameUI *createInGameUI( void ) { return NEW W3DInGameUI; }	
+	virtual InGameUI *createInGameUI( void ) { return NEW W3DInGameUI; }
 
 	/// factory for creating the window manager
 	virtual GameWindowManager *createWindowManager( void ) { return NEW W3DGameWindowManager; }
@@ -116,7 +113,7 @@ class W3DGameClient : public GameClient
 
 	virtual void setFrameRate(Real msecsPerFrame) { TheW3DFrameLengthInMsec = msecsPerFrame; }
 
-};  // end class W3DGameClient
+};
 
 inline Keyboard *W3DGameClient::createKeyboard( void ) { return NEW DirectInputKeyboard; }
 inline Mouse *W3DGameClient::createMouse( void )
@@ -126,5 +123,3 @@ inline Mouse *W3DGameClient::createMouse( void )
 	TheWin32Mouse = mouse;   ///< global cheat for the WndProc()
 	return mouse;
 }
-
-#endif  // end __W3DGAMEINTERFACE_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h
index c8a5b8f5b43..6c79aa8888b 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DGameFont.h ////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __W3DGAMEFONT_H_
-#define __W3DGAMEFONT_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -75,11 +72,8 @@ class W3DFontLibrary : public FontLibrary
 	/// release the font data pointer
 	void releaseFontData( GameFont *font );
 
-};  // end W3DFontLibrary
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __W3DGAMEFONT_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h
index 795122e5a8f..b72d30f9d6b 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DGameWindow.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __W3DGAMEWINDOW_H_
-#define __W3DGAMEWINDOW_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -63,7 +60,7 @@
 // ----------------------------------------------------------------------------
 class W3DGameWindow : public GameWindow
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(W3DGameWindow, "W3DGameWindow")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(W3DGameWindow, "W3DGameWindow")
 
 public:
 
@@ -75,13 +72,13 @@ class W3DGameWindow : public GameWindow
 	void winDrawBorder( void );
 
 	Int winSetPosition( Int x, Int y );  ///< set window position
-	Int winSetText( UnicodeString newText );  ///< set text string	
+	Int winSetText( UnicodeString newText );  ///< set text string
 	void winSetFont( GameFont *font );  ///< set font for window
 
 	void getTextSize( Int *width, Int *height );  ///< get size of text
 	void setTextLoc( Int x, Int y );  ///< set text screen coord loc
 	void drawText( Color color );  ///< draw text in the text renderer
-		
+
 protected:
 
 	/// helper function to draw borders
@@ -93,13 +90,10 @@ class W3DGameWindow : public GameWindow
 	Bool m_needPolyDraw;  ///< TRUE need to redo the text polys
 	Bool m_newTextPos;  ///< TRUE when our window has moved and we need a new text pos
 
-};  // end class W3DGameWindow
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-extern void W3DGameWinDefaultDraw( GameWindow *window, 
+extern void W3DGameWinDefaultDraw( GameWindow *window,
 																	 WinInstanceData *instData );
-
-#endif // __W3DGAMEWINDOW_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h
index aee4fae19b2..6fba18ef01f 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h
@@ -31,9 +31,6 @@
 
 #pragma once
 
-#ifndef __W3DGAMEWINDOWMANAGER_H_
-#define __W3DGAMEWINDOWMANAGER_H_
-
 #include "GameClient/GameWindowManager.h"
 #include "W3DDevice/GameClient/W3DGameWindow.h"
 #include "W3DDevice/GameClient/W3DGadget.h"
@@ -80,7 +77,7 @@ class W3DGameWindowManager : public GameWindowManager
 
 protected:
 
-};  // end class W3DGameWindowManager
+};
 
 // INLINE //////////////////////////////////////////////////////////////////////////////////////////
 inline GameWindow *W3DGameWindowManager::allocateNewWindow( void ) { return newInstance(W3DGameWindow); }
@@ -107,6 +104,3 @@ inline GameWinDrawFunc W3DGameWindowManager::getStaticTextImageDrawFunc( void )
 inline GameWinDrawFunc W3DGameWindowManager::getStaticTextDrawFunc( void ) { return W3DGadgetStaticTextDraw; }
 inline GameWinDrawFunc W3DGameWindowManager::getTextEntryImageDrawFunc( void ) { return W3DGadgetTextEntryImageDraw; }
 inline GameWinDrawFunc W3DGameWindowManager::getTextEntryDrawFunc( void ) { return W3DGadgetTextEntryDraw; }
-
-#endif // __W3DGAMEWINDOWMANAGER_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h
index d2b00265dd1..1a8fe3a24f9 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h
@@ -24,8 +24,8 @@
 
 // FILE: W3DInGameUI.h ////////////////////////////////////////////////////////
 //
-// W3D implementation of the in game user interface, the in game ui is 
-// responsible for 
+// W3D implementation of the in game user interface, the in game ui is
+// responsible for
 //
 // Author: Colin Day, April 2001
 //
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef __W3DINGAMEUI_H_
-#define __W3DINGAMEUI_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -49,7 +46,7 @@
 class HAnimClass;
 
 // W3DInGameUI ----------------------------------------------------------------
-/** Implementation for the W3D game user interface.  This singleton is 
+/** Implementation for the W3D game user interface.  This singleton is
   * responsible for all user interaction and feedback with as part of the
 	* user interface */
 //-----------------------------------------------------------------------------
@@ -84,6 +81,4 @@ class W3DInGameUI : public InGameUI
 	RenderObjClass *m_buildingPlacementAnchor;
 	RenderObjClass *m_buildingPlacementArrow;
 
-};  // end class W3DInGameUI
-
-#endif  // end __W3DINGAMEUI_H_
+};
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h
index d3e549d6bd8..62f23b2ecdf 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __W3DMirror_H_
-#define __W3DMirror_H_
-
 #include "always.h"
 #include "rendobj.h"
 #include "w3d_file.h"
@@ -46,7 +42,7 @@ Since skies are only visible in reflections, this code will also
 render clouds and sky bodies.
 */
 class MirrorRenderObjClass : public RenderObjClass
-{	
+{
 
 public:
 
@@ -54,7 +50,7 @@ class MirrorRenderObjClass : public RenderObjClass
 	~MirrorRenderObjClass(void);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface (W3D methods) 
+	// Render Object Interface (W3D methods)
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
@@ -100,12 +96,12 @@ class MirrorRenderObjClass : public RenderObjClass
 		TextureClass	*waterTexture;
 		Int				waterRepeatCount;
 		Int				skyRepeatCount;
-		DWORD			vertex00Diffuse;		
-		DWORD			vertex10Diffuse;		
-		DWORD			vertex11Diffuse;		
+		DWORD			vertex00Diffuse;
+		DWORD			vertex10Diffuse;
+		DWORD			vertex11Diffuse;
 		DWORD			vertex01Diffuse;
 		DWORD			waterDiffuse;
-		Real			uScrollPerMs;		
+		Real			uScrollPerMs;
 		Real			vScrollPerMs;
 	};
 
@@ -115,5 +111,3 @@ class MirrorRenderObjClass : public RenderObjClass
 	void renderWater(void);
 	void renderWaterMesh(void);
 };
-
-#endif  // end __W3DMirror_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h
index 1cd3b7370a8..bbb14f2b9a4 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DMouse.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __W3DMOUSE_H_
-#define __W3DMOUSE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -98,17 +95,15 @@ class W3DMouse : public Win32Mouse
 	MouseCursor m_currentW3DCursor;
 	void initW3DAssets(void);		///< load models for mouse cursors, etc.
 	void freeW3DAssets(void);		///< unload models used by mouse cursors.
-	
+
 	MouseCursor m_currentPolygonCursor;
 	void initPolygonAssets(void);		///< load images for cursor polygon.
 	void freePolygonAssets(void);		///< free images for cursor polygon.
 
 	void setCursorDirection(MouseCursor cursor);	///figure out direction for oriented 2D cursors.
 
-};  // end Win32Mouse 
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __W3DMOUSE_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h
index 4c0ccf6ebf9..fb66197064c 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef __W3DParticleSys_H_
-#define __W3DParticleSys_H_
-
 #include "GameClient/ParticleSys.h"
 #include "WW3D2/pointgr.h"
 #include "WW3D2/streak.h"
@@ -38,7 +35,7 @@
 
 //=============================================================================
 /** W3D implementation of the game display which is responsible for creating
-  * all interaction with the screen and updating the display 
+  * all interaction with the screen and updating the display
 	*/
 class W3DParticleSystemManager : public ParticleSystemManager
 {
@@ -63,5 +60,3 @@ class W3DParticleSystemManager : public ParticleSystemManager
 	ShareBufferClass<uint8> *m_angleBuffer;			///< array of particle orientations
 	Bool m_readyToRender;											///< if true, it is OK to render
 };
-
-#endif  // end __W3DParticleSys_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h
index bfe865f4bb8..f7162e23fda 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DPoly.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __W3DPOLY_H_
-#define __W3DPOLY_H_
-
 #include "vector3.h"
 #include "plane.h"
 #include "simplevec.h"
@@ -66,5 +63,3 @@ class ClipPolyClass
 
 	SimpleDynVecClass<Vector3> Verts;
 };
-
-#endif //__W3DPOLY_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h
index a384b6e177d..b9697f2ba2c 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h
@@ -30,10 +30,8 @@
 //
 //
 ///////////////////////////////////////////////////////////////////////////////
-#pragma once
 
-#ifndef __W3D_PROJECTED_SHADOW_H_
-#define __W3D_PROJECTED_SHADOW_H_
+#pragma once
 
 #include "GameClient/Shadow.h"
 
@@ -57,6 +55,7 @@ class W3DProjectedShadowManager	: public ProjectedShadowManager
 		Bool init(void);					///<allocate one-time shadow assets for length of entire game.
 		void reset(void);					///<free all existing shadows - ready for next map.
 		void shutdown(void);			///<free all assets prior to shutdown of entire game.
+		void prepareShadows();
 		Int	 renderShadows(RenderInfoClass & rinfo);	///<iterate over each object and render its shadow onto affected objects.
 		void ReleaseResources(void);	///<release device dependent D3D resources.
 		Bool ReAcquireResources(void);	///<allocate device dependent D3D resources.
@@ -75,6 +74,10 @@ class W3DProjectedShadowManager	: public ProjectedShadowManager
 		void queueSimpleDecal(W3DProjectedShadow *shadow);	///< add shadow decal to render list - decal floats on terrain.
 		void flushDecals(W3DShadowTexture *texture, ShadowType type);	///<empty queue by rendering all decals with given texture
 
+	private:
+		Int renderProjectedTerrainShadow(W3DProjectedShadow *shadow, AABoxClass &box);	///<render shadow on map terrain.
+		void updateShadowNumbers(ShadowType shadowType, Int addNum);
+
 	private:
 		W3DProjectedShadow *m_shadowList;
 		W3DProjectedShadow *m_decalList;
@@ -86,7 +89,12 @@ class W3DProjectedShadowManager	: public ProjectedShadowManager
 		W3DShadowTextureManager *m_W3DShadowTextureManager;
 		Int m_numDecalShadows;							///< number of decal shadows in the system.
 		Int m_numProjectionShadows;						///< number of projected shadows in the system.
-		Int renderProjectedTerrainShadow(W3DProjectedShadow *shadow, AABoxClass &box);	///<render shadow on map terrain.
+
+		//Bounding rectangle around rendered portion of terrain.
+		Int m_drawEdgeX;
+		Int m_drawEdgeY;
+		Int m_drawStartX;
+		Int m_drawStartY;
 };
 
 extern W3DProjectedShadowManager *TheW3DProjectedShadowManager;
@@ -108,17 +116,17 @@ class W3DProjectedShadow	: public Shadow
 		void updateTexture(Vector3 &lightPos);	///<updates the shadow texture image using render object and given light position.
 		void updateProjectionParameters(const Matrix3D &cameraXform);	///<recompute projection matrix - needed when light or object moves.
 		TexProjectClass *getShadowProjector(void)	{return m_shadowProjector;}
-		#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+		#if defined(RTS_DEBUG)
 		virtual void getRenderCost(RenderCost & rc) const;
 		#endif
 		W3DShadowTexture *getTexture(Int lightIndex) {return m_shadowTexture[lightIndex];}
-		
+
 
 	protected:
 		W3DShadowTexture *m_shadowTexture[MAX_SHADOW_LIGHTS];		///<cached shadow data
 		TexProjectClass	 *m_shadowProjector;										///<object used to generate texture and projection matrix.
 		RenderObjClass	*m_robj;						///<render object used to cast the shadow.
-		Vector3		m_lastObjPosition;	///<position of  object at time of projection matrix update.		
+		Vector3		m_lastObjPosition;	///<position of  object at time of projection matrix update.
 		W3DProjectedShadow *m_next;	/// for the shadow manager list
 		Bool	m_allowWorldAlign;	/// wrap shadow around world geometry - else align perpendicular to local z-axis.
 		Real	m_decalOffsetU;		/// texture coordinate offset so not centered at object origin.
@@ -126,5 +134,3 @@ class W3DProjectedShadow	: public Shadow
 		Int		m_flags;			/// custom rendering flags
 		virtual void release(void)	{TheW3DProjectedShadowManager->removeShadow(this);}	///<release shadow from manager
 };
-
-#endif	//__W3D_PROJECTED_SHADOW_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h
index ec65a7beae9..91e5a4ffe27 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DRoadBuffer.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,11 +44,8 @@
 
 #pragma once
 
-#ifndef __W3DROAD_BUFFER_H_
-#define __W3DROAD_BUFFER_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "always.h"
 #include "rendobj.h"
@@ -72,7 +69,7 @@
 //-----------------------------------------------------------------------------
 
 
-enum {bottomLeft=0, bottomRight=1, topLeft=2, topRight=3, NUM_CORNERS=4};												 
+enum {bottomLeft=0, bottomRight=1, topLeft=2, topRight=3, NUM_CORNERS=4};
 #define MAX_LINKS 6
 #define DEFAULT_ROAD_SCALE (8.0f)
 #define MIN_ROAD_SEGMENT (0.25f)
@@ -84,13 +81,13 @@ struct TRoadPt
 	Vector2 top;
 	Vector2 bottom;
 	Int			count;
-	Bool		last;	
+	Bool		last;
 	Bool		multi;
 	Bool		isAngled;
 	Bool		isJoin;
 };
 
-struct TRoadSegInfo 
+struct TRoadSegInfo
 {
 	Vector2 loc;
 	Vector2 roadNormal;
@@ -103,20 +100,20 @@ struct TRoadSegInfo
 
 // The individual data for a road segment.
 enum {MAX_SEG_VERTEX=500, MAX_SEG_INDEX=2000};
-enum TCorner CPP_11(: Int) 
+enum TCorner CPP_11(: Int)
 {
-	SEGMENT, 
-	CURVE, 
-	TEE, 
-	FOUR_WAY, 
-	THREE_WAY_Y, 
-	THREE_WAY_H, 
-	THREE_WAY_H_FLIP, 
-	ALPHA_JOIN, 
+	SEGMENT,
+	CURVE,
+	TEE,
+	FOUR_WAY,
+	THREE_WAY_Y,
+	THREE_WAY_H,
+	THREE_WAY_H_FLIP,
+	ALPHA_JOIN,
 	NUM_JOINS
 };
 
-class RoadSegment 
+class RoadSegment
 {
 public:
 	TRoadPt		m_pt1;					///< Drawing location pt1 to pt2.
@@ -191,14 +188,14 @@ class WorldHeightMap;
 // W3DRoadBuffer: Draw buffer for the roads.
 //
 //
-class W3DRoadBuffer 
-{	
-friend class HeightMapRenderObjClass;
+class W3DRoadBuffer
+{
+friend class BaseHeightMapRenderObjClass;
 public:
 
 	W3DRoadBuffer(void);
 	~W3DRoadBuffer(void);
-	/// Loads the roads from the map objects list.  
+	/// Loads the roads from the map objects list.
 	void loadRoads();
 	/// Empties the road buffer.
 	void clearAllRoads(void);
@@ -209,6 +206,8 @@ friend class HeightMapRenderObjClass;
 	void setMap(WorldHeightMap *pMap);
 	/// Updates the diffuse lighting in the buffers.
 	void updateLighting(void);
+	/// Notifies that the camera moved.
+	void updateCenter(void);
 
 protected:
 	RoadType *m_roadTypes;	///<Roads texture
@@ -232,6 +231,8 @@ friend class HeightMapRenderObjClass;
 	Int			m_curNumRoadVertices; ///<Number of vertices used in current road type.
 	Int			m_curNumRoadIndices;	///<Number of indices used in current road type;
 
+	Bool m_updateBuffers; ///< If true, update the vertex buffers.
+
 	void addMapObjects(void);
 	void addMapObject(RoadSegment *pRoad, Bool updateTheCounts);
 	void adjustStacking(Int topUniqueID, Int bottomUniqueID);
@@ -251,7 +252,7 @@ friend class HeightMapRenderObjClass;
 	void insertTee(Vector2 loc, Int index1, Real scale);
 	Bool insertY(Vector2 loc, Int index1, Real scale);
 	void insert4Way(Vector2 loc, Int index1, Real scale);
-	void offset4Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, TRoadPt *pr3, TRoadPt *pc4, Vector2 loc, Vector2 alignVector, Real widthInTexture); 
+	void offset4Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, TRoadPt *pr3, TRoadPt *pc4, Vector2 loc, Vector2 alignVector, Real widthInTexture);
 	void offset3Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector, Vector2 teeVector, Real widthInTexture);
 	void offsetY(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector, Real widthInTexture);
 	void offsetH(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector, Vector2 teeVector, Bool flip, Bool mirror, Real widthInTexture);
@@ -262,11 +263,11 @@ friend class HeightMapRenderObjClass;
 	void loadY(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Real scale); ///< Fills the index and vertex buffers for drawing 1 Y intersection.
 	void loadAlphaJoin(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Real scale); ///< Fills the index and vertex buffers for drawing 1 alpha blend cap.
 	void loadH(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Bool flip, Real scale); ///< Fills the index and vertex buffers for drawing 1 h tee intersection.
-	void loadFloatSection(RoadSegment *pRoad, Vector2 loc, 
+	void loadFloatSection(RoadSegment *pRoad, Vector2 loc,
 														Vector2 roadVector, Real height, Real left, Real right, Real uOffset, Real vOffset, Real scale);
-	void loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc, 
+	void loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 														Vector2 roadNormal, Vector2 roadVector,
-														Vector2 *cornersP, 
+														Vector2 *cornersP,
 														Real uOffset, Real vOffset, Real uScale, Real vScale);
 	void loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, VertexFormatXYZDUV1 *vb, RefRenderObjListIterator *pDynamicLightsIterator);
 	void loadRoadsInVertexAndIndexBuffers(void); ///< Fills the index and vertex buffers for drawing.
@@ -277,5 +278,3 @@ friend class HeightMapRenderObjClass;
 
 	void rotateAbout(Vector2 *ptP, Vector2 center, Real angle);
 };
-
-#endif  // end __W3DROAD_BUFFER_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
index 663cc2b43b2..dfc445cb7b4 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef __W3DSCENE_H_
-#define __W3DSCENE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -43,6 +40,7 @@
 #include "WW3D2/rinfo.h"
 #include "WW3D2/coltest.h"
 #include "WW3D2/lightenvironment.h"
+
 ///////////////////////////////////////////////////////////////////////////////
 // PROTOTYPES /////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -64,7 +62,7 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
 public:
 
 	RTS3DScene();  ///< RTSScene constructor
-	~RTS3DScene();  ///< RTSScene desctructor
+	~RTS3DScene();  ///< RTSScene destructor
 
 	/// ray picking against objects in scene
 	Bool castRay(RayCollisionTestClass & raytest, Bool testAll, Int collisionType);
@@ -85,13 +83,13 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
 	void renderSpecificDrawables(RenderInfoClass &rinfo, Int numDrawables, Drawable **theDrawables) ;
 
 	/// Lighting methods
-	void				addDynamicLight(W3DDynamicLight * obj);
-	void				removeDynamicLight(W3DDynamicLight * obj);
-	RefRenderObjListIterator *		createLightsIterator(void);
-	void					destroyLightsIterator(RefRenderObjListIterator * it);
-	RefRenderObjListClass				*getDynamicLights(void) {return &m_dynamicLightList;};
+	void addDynamicLight(W3DDynamicLight * obj);
+	void removeDynamicLight(W3DDynamicLight * obj);
+	RefRenderObjListIterator *createLightsIterator(void);
+	void destroyLightsIterator(RefRenderObjListIterator * it);
+	RefRenderObjListClass *getDynamicLights(void) {return &m_dynamicLightList;};
 	W3DDynamicLight *getADynamicLight(void);
-	void				setGlobalLight(LightClass *pLight,Int lightIndex=0);
+	void setGlobalLight(LightClass *pLight,Int lightIndex=0);
 	LightEnvironmentClass &getDefaultLightEnv(void) {return m_defaultLightEnv;}
 
 	void init() {}
@@ -101,8 +99,8 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
 	void doRender(CameraClass * cam);
 
 protected:
-	void	renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, Int localPlayerIndex);
-	void	updateFixedLightEnvironments(RenderInfoClass & rinfo);
+	void renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, Int localPlayerIndex);
+	void updateFixedLightEnvironments(RenderInfoClass & rinfo);
 	void flushTranslucentObjects(RenderInfoClass & rinfo);
 	void flushOccludedObjects(RenderInfoClass & rinfo);
 	void flagOccludedObjects(CameraClass * camera);
@@ -135,10 +133,10 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
 	RenderObjClass **m_nonOccludersOrOccludees;	///<objects which are neither bockers or blockees (small rocks, shrubs, etc.).
 	Int m_numPotentialOccluders;
 	Int m_numPotentialOccludees;
-	Int m_numNonOccluderOrOccludee;	
+	Int m_numNonOccluderOrOccludee;
 
 	CameraClass *m_camera;
-};  // end class RTS3DScene
+};
 
 //-----------------------------------------------------------------------------
 // RTS2DScene
@@ -147,7 +145,6 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
 //-----------------------------------------------------------------------------
 class RTS2DScene : public SimpleSceneClass, public SubsystemInterface
 {
-
 public:
 
 	RTS2DScene();
@@ -160,12 +157,12 @@ class RTS2DScene : public SimpleSceneClass, public SubsystemInterface
 	void draw();
 	void reset(){}
 	void doRender(CameraClass * cam);
-	
+
 protected:
+
 	RenderObjClass *m_status;
 	CameraClass *m_camera;
-
-};  // end class RTS2DScene
+};
 
 //-----------------------------------------------------------------------------
 // RTS3DInterfaceScene
@@ -173,9 +170,7 @@ class RTS2DScene : public SimpleSceneClass, public SubsystemInterface
 /** Scene management for 3D interface overlay on top of 3D scene */
 //-----------------------------------------------------------------------------
 class RTS3DInterfaceScene : public SimpleSceneClass
-
 {
-
 public:
 
 	RTS3DInterfaceScene();
@@ -183,9 +178,4 @@ class RTS3DInterfaceScene : public SimpleSceneClass
 
 	/// customizable renderer for the RTS3DInterfaceScene
 	virtual void Customized_Render( RenderInfoClass &rinfo );
-
-protected:
-
-};  // end class RTS3DInterfaceScene
-
-#endif  // end __W3DSCENE_H_
+};
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
deleted file mode 100644
index b7471193c6d..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DShaderManager.h /////////////////////////////////////////////////////////
-//
-// Custom shader system that allows more options and easier device validation than
-// possible with W3D2.
-//
-// Author: Mark Wilczynski, August 2001
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DSHADERMANAGER_H_
-#define __W3DSHADERMANAGER_H_
-
-#include "WW3D2/texture.h"
-enum FilterTypes CPP_11(: Int);
-enum CustomScenePassModes CPP_11(: Int);
-enum StaticGameLODLevel CPP_11(: Int);
-enum ChipsetType CPP_11(: Int);
-enum CpuType CPP_11(: Int);
-
-class TextureClass;	///forward reference
-/** System for managing complex rendering settings which are either not handled by
-	WW3D2 or need custom paths depending on the video card.  This system will determine
-	the proper shader given video card limitations and also allow the app to query the
-	hardware for specific features.
-*/
-class W3DShaderManager
-{
-public:
-
-	//put any custom shaders (not going through W3D) in here.
-	enum ShaderTypes
-	{	ST_INVALID,			//invalid shader type.
-		ST_TERRAIN_BASE,	//shader to apply base terrain texture only
-		ST_TERRAIN_BASE_NOISE1,	//shader to apply base texture and cloud/noise 1.
-		ST_TERRAIN_BASE_NOISE2,	//shader to apply base texture and cloud/noise 2.
-		ST_TERRAIN_BASE_NOISE12,//shader to apply base texture and both cloud/noise
-		ST_SHROUD_TEXTURE,		//shader to apply shroud texture projection.
-		ST_MASK_TEXTURE,		//shader to apply alpha mask texture projection.
-		ST_ROAD_BASE,	//shader to apply base terrain texture only
-		ST_ROAD_BASE_NOISE1,	//shader to apply base texture and cloud/noise 1.
-		ST_ROAD_BASE_NOISE2,	//shader to apply base texture and cloud/noise 2.
-		ST_ROAD_BASE_NOISE12,//shader to apply base texture and both cloud/noise
-		ST_CLOUD_TEXTURE,			//shader to project clouds.
-		ST_MAX
-	};
-
-
-	W3DShaderManager(void);	///<constructor
-	static void init( void );	///<determine optimal shaders for current device.
-	static void shutdown(void);	///<release resources used by shaders
-	static ChipsetType getChipset(void);	///<return current device chipset.
-	static Int getShaderPasses(ShaderTypes shader);	///<rendering passes required for shader
-	static Int setShader(ShaderTypes shader, Int pass);	///<enable specific shader pass.
-	static void resetShader(ShaderTypes shader);	///<make sure W3D2 gets restored to normal
-	///Specify all textures (up to 8) which can be accessed by the shaders.
-	static void setTexture(Int stage,TextureClass* texture) {m_Textures[stage]=texture;}
-	///Return current texture available to shaders.
-	static inline TextureClass *getShaderTexture(Int stage) { return m_Textures[stage];}	///<returns currently selected texture for given stage
-	///Return last activated shader.
-	static inline ShaderTypes getCurrentShader(void) {return m_currentShader;}
-	/// Loads a .vso file and creates a vertex shader for it
-	static HRESULT LoadAndCreateD3DShader(const char* strFilePath, const DWORD* pDeclaration, DWORD Usage, Bool ShaderType, DWORD* pHandle);
-
-	static Bool testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, Int *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex);
-	static StaticGameLODLevel getGPUPerformanceIndex(void);
-	static Real GetCPUBenchTime(void);
-
-	// Filter methods
-	static Bool filterPreRender(FilterTypes filter, Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
-	static Bool filterPostRender(FilterTypes filter, enum FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
-	static Bool filterSetup(FilterTypes filter, enum FilterModes mode);
-
-	// Support routines for filter methods.
-	static Bool canRenderToTexture(void) { return (m_oldRenderSurface && m_newRenderSurface);}
-	static void startRenderToTexture(void); ///< Sets render target to texture.
-	static IDirect3DTexture8 * endRenderToTexture(void); ///< Ends render to texture, & returns texture.
-	static IDirect3DTexture8 * getRenderTexture(void);	///< returns last used render target texture
-	static void drawViewport(Int color);	///<draws 2 triangles covering the current tactical viewport
-
-
-protected:
-	static TextureClass *m_Textures[8];	///textures assigned to each of the possible stages
-	static ChipsetType m_currentChipset;	///<last video card chipset that was detected.
-	static ShaderTypes m_currentShader;	///<last shader that was set.
-	static Int m_currentShaderPass;		///<pass of last shader that was set.
-
-	static FilterTypes m_currentFilter; ///< Last filter that was set.
-	// Info for a render to texture surface for special effects.
-	static Bool m_renderingToTexture;
-	static IDirect3DSurface8 *m_oldRenderSurface;	///<previous render target
-	static IDirect3DTexture8 *m_renderTexture;		///<texture into which rendering will be redirected.
-	static IDirect3DSurface8 *m_newRenderSurface;	///<new render target inside m_renderTexture
-	static IDirect3DSurface8 *m_oldDepthSurface;	///<previous depth buffer surface
-
-
-};
-
-class W3DFilterInterface
-{
-public:
-	virtual Int init(void) = 0;			///<perform any one time initialization and validation
-	virtual Int shutdown(void) { return TRUE;};			///<release resources used by shader
-	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode) {skipRender=false; return false;} ///< Set up at start of render.  Only applies to screen filter shaders.
-	virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender){return false;} ///< Called after render.  Only applies to screen filter shaders.
-	virtual Bool setup(enum FilterModes mode){return false;} ///< Called when the filter is started, one time before the first prerender.
-protected:
-	virtual Int set(enum FilterModes mode) = 0;		///<setup shader for the specified rendering pass.
-	 ///do any custom resetting necessary to bring W3D in sync.
-	virtual void reset(void) = 0;
-};
-
-
-/*=========  ScreenMotionBlurFilter	=============================================================*/
-///applies motion blur to viewport.
-class ScreenMotionBlurFilter : public W3DFilterInterface
-{
-public:
-	virtual Int set(enum FilterModes mode);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int shutdown(void);		///<release resources used by shader
-	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
-	virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
-	virtual Bool setup(enum FilterModes mode); ///< Called when the filter is started, one time before the first prerender.
-	ScreenMotionBlurFilter();
-
-	static void setZoomToPos(const Coord3D *pos) {m_zoomToPos = *pos; m_zoomToValid = true;}
-
-protected:
-	enum {MAX_COUNT = 60, 
-				MAX_LIMIT = 30,
-				COUNT_STEP = 5,
-				DEFAULT_PAN_FACTOR = 30};
-	Int m_maxCount;
-	Int m_lastFrame;
-	Bool m_decrement;
-	Bool m_skipRender;
-	Bool m_additive;
-	Bool m_doZoomTo;
-	Coord2D m_priorDelta;
-	Int m_panFactor;
-
-
-	static Coord3D m_zoomToPos;
-	static Bool m_zoomToValid;
-} ;
-
-/*=========  ScreenBWFilter	=============================================================*/
-///converts viewport to black & white.
-class ScreenBWFilter : public W3DFilterInterface
-{
-	DWORD	m_dwBWPixelShader;		///<D3D handle to pixel shader which tints texture to black & white.
-public:
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Int shutdown(void);		///<release resources used by shader
-	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
-	virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
-	virtual Bool setup(enum FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
-	static void setFadeParameters(Int fadeFrames, Int direction)
-	{
-		m_curFadeFrame = 0;
-		m_fadeFrames = fadeFrames;
-		m_fadeDirection = direction;
-	}
-protected:
-	virtual Int set(enum FilterModes mode);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	static Int m_fadeFrames;
-	static Int m_fadeDirection;
-	static Int m_curFadeFrame;
-	static Real m_curFadeValue;
-};
-
-class ScreenBWFilterDOT3 : public ScreenBWFilter
-{
-public:
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Int shutdown(void);		///<release resources used by shader
-	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
-	virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
-	virtual Bool setup(enum FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
-protected:
-	virtual Int set(enum FilterModes mode);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-};
-
-/*=========  ScreenCrossFadeFilter	=============================================================*/
-///Fades between 2 different rendered frames.
-class ScreenCrossFadeFilter : public W3DFilterInterface
-{
-public:
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Int shutdown(void);		///<release resources used by shader
-	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
-	virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
-	virtual Bool setup(enum FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
-	static void setFadeParameters(Int fadeFrames, Int direction)
-	{
-		m_curFadeFrame = 0;
-		m_fadeFrames = fadeFrames;
-		m_fadeDirection = direction;
-	}
-	static Real getCurrentFadeValue(void)	{ return m_curFadeValue;}
-	static TextureClass *getCurrentMaskTexture(void) { return m_fadePatternTexture;}
-protected:
-	virtual Int set(enum FilterModes mode);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	Bool updateFadeLevel(void);		///<updated current state of fade and return true if not finished.
-	static Int m_fadeFrames;
-	static Int m_fadeDirection;
-	static Int m_curFadeFrame;
-	static Real m_curFadeValue;
-	static Bool m_skipRender;
-	static TextureClass *m_fadePatternTexture;	///<shape/pattern of the fade
-};
-
-#endif //__W3DSHADERMANAGER_H_
\ No newline at end of file
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h
index 36dca2ecdca..da0a942acd6 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __W3DSHADOW_H_
-#define __W3DSHADOW_H_
-
 #include "matrix4.h"
 #include "GameClient/Shadow.h"
 
@@ -38,7 +34,7 @@ class W3DShadowManager
 {
 
 public:
-	
+
 	W3DShadowManager( void );
 	~W3DShadowManager( void );
 	Bool init( void );	///<initialize resources used by manager, must have valid D3D device.
@@ -56,8 +52,8 @@ class W3DShadowManager
 	void invalidateCachedLightPositions(void);	///<forces shadow volumes to update regardless of last lightposition
 	Vector3 &getLightPosWorld(Int lightIndex);	///<returns the position of specified light source.
 	Bool	isShadowScene(void)	{return m_isShadowScene;}
-	inline void setStencilShadowMask(int mask) {m_stencilShadowMask=mask;}	///<mask used to mask out stencil bits used for storing occlusion/playerColor
-	inline Int getStencilShadowMask(void)	{return m_stencilShadowMask;}
+	void setStencilShadowMask(int mask) {m_stencilShadowMask=mask;}	///<mask used to mask out stencil bits used for storing occlusion/playerColor
+	Int getStencilShadowMask(void)	{return m_stencilShadowMask;}
 
 	// rendering
 	void RenderShadows( void );
@@ -69,8 +65,6 @@ class W3DShadowManager
 		Bool	m_isShadowScene;	///<flag if current scene needs shadows.  No shadows on pre-pass and 2D.
 		UnsignedInt m_shadowColor;	///<color and alpha for all shadows in scene.
 		Int m_stencilShadowMask;
-};  // end class W3DShadowManager
+};
 
 extern W3DShadowManager *TheW3DShadowManager;
-
-#endif	//__W3DSHADOW_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h
index 545228be22e..3b8675cc95b 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __W3DSHROUD_H_
-#define __W3DSHROUD_H_
-
 #include "WW3D2/matpass.h"
 #include "WW3D2/dx8wrapper.h"
 
@@ -99,8 +95,8 @@ class W3DShroud
 	void setShroudLevel(Int x, Int y, W3DShroudLevel,Bool textureOnly=FALSE);
 	void setShroudFilter(Bool enable);	///<turns on bilinear filtering of shroud cells.
 	void setBorderShroudLevel(W3DShroudLevel level);	///<color that will appear in unused border terrain.
-	Real	getDrawOriginX(void)	{return m_drawOriginX;}	///<returns ws origin of first pixel in shroud texture.			
-	Real	getDrawOriginY(void)	{return m_drawOriginY;}	///<returns ws origin of first pixel in shroud texture.			
+	Real	getDrawOriginX(void)	{return m_drawOriginX;}	///<returns ws origin of first pixel in shroud texture.
+	Real	getDrawOriginY(void)	{return m_drawOriginY;}	///<returns ws origin of first pixel in shroud texture.
 
 protected:
 	Int m_numCellsX;						///<number of cells covering entire map
@@ -127,5 +123,3 @@ class W3DShroud
 	void interpolateFogLevels(RECT *rect);		///<fade current fog levels to actual logic side levels.
 	void fillBorderShroudData(W3DShroudLevel level, SurfaceClass* pDestSurface);	///<fill the destination texture with a known value
 };
-
-#endif	//__W3DSHROUD_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h
index e563ea313ec..4139426bd9f 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __STATUS_CIRCLE_H_
-#define __STATUS_CIRCLE_H_
-
 #include "always.h"
 #include "rendobj.h"
 #include "w3d_file.h"
@@ -43,7 +39,7 @@
 //
 //
 class W3DStatusCircle : public RenderObjClass
-{	
+{
 
 public:
 
@@ -53,13 +49,13 @@ class W3DStatusCircle : public RenderObjClass
 	~W3DStatusCircle(void);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
 	virtual void					Render(RenderInfoClass & rinfo);
 //	virtual void					Special_Render(SpecialRenderInfoClass & rinfo);
-//	virtual void 					Set_Transform(const Matrix3D &m); 
+//	virtual void 					Set_Transform(const Matrix3D &m);
 //	virtual void 					Set_Position(const Vector3 &v);
 //TODO: MW: do these later - only needed for collision detection
 	virtual bool					Cast_Ray(RayCollisionTestClass & raytest);
@@ -84,7 +80,7 @@ class W3DStatusCircle : public RenderObjClass
 	Int freeMapResources(void);
 	void static setColor(Int r, Int g, Int b) {m_needUpdate = true; m_diffuse = (b) + (g<<8) + (r<<16);};
 protected:
-	Int	m_numTriangles;	//dimensions of list 
+	Int	m_numTriangles;	//dimensions of list
 	static Int m_diffuse;
 	static Bool			 m_needUpdate;
 
@@ -98,5 +94,3 @@ class W3DStatusCircle : public RenderObjClass
 	Int updateCircleVB(void);
 	Int updateScreenVB(Int diffuse);
 };
-
-#endif  // end __DRAW_OBJECT_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h
deleted file mode 100644
index 615f3e5ec52..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DTERRAINTRACKS_H_
-#define __W3DTERRAINTRACKS_H_
-
-#include "always.h"
-#include "rendobj.h"
-#include "w3d_file.h"
-#include "dx8vertexbuffer.h"
-#include "dx8indexbuffer.h"
-#include "shader.h"
-#include "vertmaterial.h"
-#include "Lib/BaseType.h"
-
-#define MAX_TRACK_EDGE_COUNT	100	//maximum number of edges or divisions in track mark
-#define MAX_TRACK_OPAQUE_EDGE	25	//linear fade of edges will begin at this edge
-#define FADE_TIME_FRAMES 300000	// 300 seconds at 30 fps - time to fade out an edge and remove it from the system.
-
-class TerrainTracksRenderObjClassSystem;
-class Drawable;
-
-/// Custom render object that draws tracks on the terrain.
-/**
-This render object handles drawing tracks left by objects moving on the terrain.
-*/
-class TerrainTracksRenderObjClass : public W3DMPO, public RenderObjClass
-{	
-	W3DMPO_GLUE(TerrainTracksRenderObjClass)
-
-	friend class TerrainTracksRenderObjClassSystem;
-
-public:
-
-	TerrainTracksRenderObjClass(void);
-	~TerrainTracksRenderObjClass(void);
-
-	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface (W3D methods)
-	/////////////////////////////////////////////////////////////////////////////
-	virtual RenderObjClass *	Clone(void) const;
-	virtual int						Class_ID(void) const;
-	virtual void					Render(RenderInfoClass & rinfo);
-	virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;
-    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;
-
-	Int freeTerrainTracksResources(void);	///<free W3D assets used for this track
-	void init( Real width, Real length, const Char *texturename);	///<allocate W3D resources and set size
-	void addEdgeToTrack(Real x, Real y);	///< add a new segment to the track
-	void addCapEdgeToTrack(Real x, Real y);	///< cap the existing segment so we can resume at an unconnected position.
-	void setAirborne(void) {m_airborne = true; }	///< Starts a new section of track, generally after going airborne.
-	void setOwnerDrawable(const Drawable *owner) {m_ownerDrawable = owner;}
-
-protected:
-	TextureClass *m_stageZeroTexture;	///<primary texture
-	SphereClass	m_boundingSphere;		///<bounding sphere of TerrainTracks
-	AABoxClass	m_boundingBox;			///<bounding box of TerrainTracks
-	Int			m_activeEdgeCount;			///<number of active edges in segment list
-	Int			m_totalEdgesAdded;		///<number of edges ever added to this track
-	const Drawable	*m_ownerDrawable;	///<logical object that's laying down tread marks.
-	
-	struct edgeInfo{
-		Vector3	endPointPos[2];			///<the 2 endpoints on the edge
-		Vector2	endPointUV[2];			///< uv coordinates at each end point
-		Int		timeAdded;				///< time when edge was created.
-		Real	alpha;					///< current alpha value for rendering
-	};
-
-	edgeInfo	m_edges[MAX_TRACK_EDGE_COUNT];	///<edges at each segment break
-	Vector3		m_lastAnchor;						///<location of last edge center
-	Int			m_bottomIndex;						///<points at oldest edge on track
-	Int			m_topIndex;						///<points to newest edge on track
-	Bool		m_haveAnchor;					///<set to false until first edge is added
-	Bool		m_bound;						///<object is bound to owner and accepts new edges
-	Real		m_width;						///<track width
-	Real		m_length;						///<length of each track segment
-	Bool		m_airborne;					///< Did the vehicle bounce up into the air?
-	Bool		m_haveCap;					///< is the segment capped so we can stop and resume at new location.
-	TerrainTracksRenderObjClass	*m_nextSystem;			///<next track system
-	TerrainTracksRenderObjClass *m_prevSystem;			///<previous track system
-};
-
-/// System for drawing, updating, and re-using tread mark render objects.
-/**
-This system keeps track of all the active track mark objects and reuses them
-when they expire.  It also renders all the track marks that were submitted in
-this frame.
-*/
-
-class TerrainTracksRenderObjClassSystem
-{
-	friend class TerrainTracksRenderObjClass;
-
-public:
-
-	TerrainTracksRenderObjClassSystem( void );
-	~TerrainTracksRenderObjClassSystem( void );
-
-	void ReleaseResources(void);	///< Release all dx8 resources so the device can be reset.
-	void ReAcquireResources(void);  ///< Reacquire all resources after device reset.
-
-	void setDetail(void);
-
-	void flush (void);	///<draw all tracks that were requested for rendering.
-	void update(void);	///<update the state of all edges (fade alpha, remove old, etc.)
-
-	void init( SceneClass *TerrainTracksScene);	///< pre-allocate track objects
-	void shutdown( void );		///< release all pre-allocated track objects, called by destructor
-	void Reset(void);	///<empties the system, ready for a new scene.
-
-	TerrainTracksRenderObjClass *bindTrack(RenderObjClass *renderObject, Real length, const Char *texturename);	///<track object to be controlled by owner
-	void unbindTrack( TerrainTracksRenderObjClass *mod );	///<releases control of track object
-
-protected:
-	DX8VertexBufferClass		*m_vertexBuffer;	///<vertex buffer used to draw all tracks
-	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining triangles in maximum length track
-	VertexMaterialClass	  	  *m_vertexMaterialClass;	///< vertex lighting material
-	ShaderClass m_shaderClass; ///<shader or rendering state for heightmap
-
-	TerrainTracksRenderObjClass *m_usedModules;	///<active objects being rendered in the scene
-	TerrainTracksRenderObjClass *m_freeModules;	//<unused modules that are free to use again
-	SceneClass	*m_TerrainTracksScene;		///<scene that will contain all the TerrainTracks
-
-	Int	m_edgesToFlush;			///< number of edges to flush on next render.
-
-	void releaseTrack( TerrainTracksRenderObjClass *mod );	///<returns track object to free store.
-	void clearTracks(void);	///<reset the amount of visible track marks of each object.
-
-	Int m_maxTankTrackEdges;	///<maximum length of tank track
-	Int m_maxTankTrackOpaqueEdges;	///<maximum length of tank track before it starts fading.
-	Int m_maxTankTrackFadeDelay;	///<maximum amount of time a tank track segment remains visible.
-
-};  // end class TerrainTracksRenderObjClassSystem
-
-extern TerrainTracksRenderObjClassSystem *TheTerrainTracksRenderObjClassSystem; ///< singleton for track drawing system.
-
-#endif  // end __W3DTERRAINTRACKS_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h
deleted file mode 100644
index a9fd372427a..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DTerrainVisual.h ///////////////////////////////////////////////////////////////////////
-// W3D implementation details for visual aspects of terrain
-// Author: Colin Day, April 2001
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DTERRAINVISUAL_H_
-#define __W3DTERRAINVISUAL_H_
-
-#include "GameClient/TerrainVisual.h"
-#include "W3DDevice/GameClient/W3DWater.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-class Matrix3D;
-class WaterHandle;
-class HeightMapRenderObjClass;
-class WorldHeightMap;
-
-//-------------------------------------------------------------------------------------------------
-/** W3D impelmentation of visual terrain details singleton */
-//-------------------------------------------------------------------------------------------------
-class W3DTerrainVisual : public TerrainVisual
-{
-
-public:
-
-	W3DTerrainVisual();
-	virtual ~W3DTerrainVisual();
-
-	virtual void init( void );
-	virtual void reset( void );
-	virtual void update( void );
-	
-	virtual Bool load( AsciiString filename );
-
-	void getTerrainColorAt( Real x, Real y, RGBColor *pColor );
-
-	/// get the terrain tile type at the world location in the (x,y) plane ignoring Z
-	TerrainType *getTerrainTile( Real x, Real y );
-
-	/** intersect the ray with the terrain, if a hit occurs TRUE is returned
-	and the result point on the terrain is returned in "result" */
-	virtual Bool intersectTerrain( Coord3D *rayStart, Coord3D *rayEnd, Coord3D *result );
-
-	//
-	// water methods
-	//
-	/// enable/disable the water grid
-	virtual void enableWaterGrid( Bool enable );
-	/// set min/max height values allowed in water grid pointed to by waterTable
-	virtual void setWaterGridHeightClamps( const WaterHandle *waterTable, Real minZ, Real maxZ );
-	/// adjust fallof parameters for grid change method
-	virtual void setWaterAttenuationFactors( const WaterHandle *waterTable, 
-																					 Real a, Real b, Real c, Real range );
-	/// set the water table position and orientation in world space
-	virtual void setWaterTransform( const WaterHandle *waterTable, 
-																	Real angle, Real x, Real y, Real z );
-	virtual void setWaterTransform( const Matrix3D *transform );
-	virtual void getWaterTransform( const WaterHandle *waterTable, Matrix3D *transform );
-	/// water grid resolution spacing
-	virtual void setWaterGridResolution( const WaterHandle *waterTable,
-																			 Real gridCellsX, Real gridCellsY, Real cellSize );
-	virtual void getWaterGridResolution( const WaterHandle *waterTable, 
-																			 Real *gridCellsX, Real *gridCellsY, Real *cellSize );
-	/// adjust the water grid in world coords by the delta
-	virtual void changeWaterHeight( Real x, Real y, Real delta );
-	/// adjust the velocity at a water grid point corresponding to the world x,y
-	virtual void addWaterVelocity( Real worldX, Real worldY, 
-																 Real velocity, Real preferredHeight );
-	virtual Bool getWaterGridHeight( Real worldX, Real worldY, Real *height);
-
-	virtual void setTerrainTracksDetail(void);
-	virtual void setShoreLineDetail(void);
-
-	/// Add a bib at location.  
-	void addFactionBib(Object *factionBuilding, Bool highlight, Real extra = 0);
-	/// Remove a bib.  
-	void removeFactionBib(Object *factionBuilding);
-
-	/// Add a bib at location.  
-	void addFactionBibDrawable(Drawable *factionBuilding, Bool highlight, Real extra = 0);
-	/// Remove a bib.  
-	void removeFactionBibDrawable(Drawable *factionBuilding);
-
-	virtual void removeAllBibs(void);
-	virtual void removeBibHighlighting(void);
-
-	//
-	// Modify height.
-	//
-	virtual void setRawMapHeight(const ICoord2D *gridPos, Int height);
-
-	/// Replace the skybox texture
-	virtual void replaceSkyboxTextures(const AsciiString *oldTexName[NumSkyboxTextures], const AsciiString *newTexName[NumSkyboxTextures]);
-
-
-protected:
-
-	// snapshot methods
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-	HeightMapRenderObjClass *m_terrainRenderObject;  ///< W3D render object for terrain
-	WaterRenderObjClass	*m_waterRenderObject;	///< W3D render object for water plane
-	WorldHeightMap *m_terrainHeightMap;  ///< height map used for render obj building
-	Bool m_isWaterGridRenderingEnabled;
-	AsciiString	m_currentSkyboxTexNames[NumSkyboxTextures];	///<store current texture names applied to skybox.
-	AsciiString m_initialSkyboxTexNames[NumSkyboxTextures];	///<store starting texture/default skybox textures.
-
-};  // end class W3DTerrainVisual
-
-#endif  // end __W3DTERRAINVISUAL_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h
deleted file mode 100644
index 73bc657b7c4..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DTreeBuffer.h //////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  W3DTreeBuffer.h
-//
-// Created:    John Ahlquist, May 2001
-//
-// Desc:       Draw buffer to handle all the trees in a scene.
-//
-//-----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __W3DTREE_BUFFER_H_
-#define __W3DTREE_BUFFER_H_
-
-//-----------------------------------------------------------------------------
-//           Includes                                                      
-//-----------------------------------------------------------------------------
-#include "always.h"
-#include "rendobj.h"
-#include "w3d_file.h"
-#include "dx8vertexbuffer.h"
-#include "dx8indexbuffer.h"
-#include "shader.h"
-#include "vertmaterial.h"
-#include "Lib/BaseType.h"
-#include "Common/GameType.h"
-#include "Common/AsciiString.h"
-
-//-----------------------------------------------------------------------------
-//           Forward References
-//-----------------------------------------------------------------------------
-class MeshClass; 
-
-//-----------------------------------------------------------------------------
-//           Type Defines
-//-----------------------------------------------------------------------------
-
-typedef enum {
-	ALPINE_TREE = 0, 
-	DECIDUOUS_TREE = 1,
-	SHRUB = 2,
-	FENCE = 3
-} TTreeType;
-
-/// The individual data for a tree.
-typedef struct {
-	Vector3 location;					///< Drawing location
-	Real		scale;						///< Scale at location.
-	Real		sin;							///< Sine of the rotation angle at location.
-	Real		cos;							///< Cosine of the rotation angle at location.
-	Int			panelStart;				///< Index of the "panel" lod.
-	TTreeType			treeType;		///< Type of tree.  Currently only 3 supported.
-	Bool		visible;					///< Visible flag, updated each frame.
-	Bool		mirrorVisible;		///< Possibly visible in mirror.
-	Bool		rotates;					///< Trees rotate to follow the camera in single panel mode, fences don't
-	SphereClass bounds;				///< Bounding sphere for culling to set the visible flag.
-	Real		sortKey;					///< Sort key, essentially the distance along the look at vector.
-} TTree;
-
-//
-// W3DTreeBuffer: Draw buffer for the trees.
-//
-//
-class W3DTreeBuffer 
-{	
-friend class HeightMapRenderObjClass;
-public:
-
-	W3DTreeBuffer(void);
-	~W3DTreeBuffer(void);
-	/// Add a tree at location.  Name is the w3d model name.
-	void addTree(Coord3D location, Real scale, Real angle, AsciiString name, Bool visibleInMirror);
-	/// Empties the tree buffer.
-	void clearAllTrees(void);
-	/// Draws the trees.  Uses camera for culling.
-	void drawTrees(CameraClass * camera, RefRenderObjListIterator *pDynamicLightsIterator);
-	/// Called when the view changes, and sort key needs to be recalculated.
-	/// Normally sortKey gets calculated when a tree becomes visible.
-	void doFullUpdate(void) {m_updateAllKeys = true;};
-	void setIsTerrain(void) {m_isTerrainPass = true;}; ///< Terrain calls this to tell trees to draw.
-	Bool needToDraw(void) {return m_isTerrainPass;};
-protected:
-	enum { MAX_TREE_VERTEX=4000, 
-					MAX_TREE_INDEX=2*4000, 
-					MAX_TREES=2000};
-	enum {MAX_TYPES = 4,
-				SORT_ITERATIONS_PER_FRAME=10};
-	DX8VertexBufferClass	*m_vertexTree;	///<Tree vertex buffer.
-	DX8IndexBufferClass			*m_indexTree;	///<indices defining a triangles for the tree drawing.
-	TextureClass *m_treeTexture;	///<Trees texture
-	Int			m_curNumTreeVertices; ///<Number of vertices used in m_vertexTree.
-	Int			m_curNumTreeIndices;	///<Number of indices used in b_indexTree;
-	Int			m_curTreeIndexOffset;	///<First index to draw at.  We draw the trees backwards by filling up the index buffer backwards, 
-																// so any trees that don't fit are far away from the camera.
-	TTree	m_trees[MAX_TREES];			///< The tree buffer.  All trees are stored here.
-	Int			m_numTrees;						///< Number of trees in m_trees.
-	Bool		m_anythingChanged;	///< Set to true if visibility or sorting changed.
-	Bool		m_updateAllKeys;  ///< Set to true when the view changes.
-	Bool		m_initialized;		///< True if the subsystem initialized.
-	Bool		m_isTerrainPass;  ///< True if the terrain was drawn in this W3D scene render pass.
-
-	SphereClass m_typeBounds[MAX_TYPES];	///< Bounding boxes for the base tree models.
-	MeshClass *m_typeMesh[MAX_TYPES];			///< W3D mesh models for the trees.
-	Vector3 m_cameraLookAtVector;
-	void loadTreesInVertexAndIndexBuffers(RefRenderObjListIterator *pDynamicLightsIterator); ///< Fills the index and vertex buffers for drawing.
-	void allocateTreeBuffers(void);							 ///< Allocates the buffers.
-	void cull(CameraClass * camera);						 ///< Culls the trees.
-	void cullMirror(CameraClass * camera);		   ///< Culls the trees in the mirror view.
-	Int  doLighting(Vector3 *loc, Real r, Real g, Real b, SphereClass &bounds, RefRenderObjListIterator *pDynamicLightsIterator);
-	void freeTreeBuffers(void);									 ///< Frees the index and vertex buffers.
-	void sort( Int iterations );								 ///< Performs partial bubble sort.
-};
-
-#endif  // end __W3DTREE_BUFFER_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideobuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideobuffer.h
deleted file mode 100644
index b99095ab841..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideobuffer.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    Generals
-//
-// File name:  W3DDevice/GameClient/W3DVideoBuffer.h
-//
-// Created:    10/23/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __W3DDEVICE_GAMECLIENT_W3DVIDEOBUFFER_H_
-#define __W3DDEVICE_GAMECLIENT_W3DVIDEOBUFFER_H_
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "GameClient/VideoPlayer.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-class TextureClass;
-class SurfaceClass;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// W3DVideoBuffer
-//===============================
-/**
-  * Video buffer interface class to a W3D TextureClass
-	*/
-//===============================
-
-
-class W3DVideoBuffer : public VideoBuffer
-{
-	protected:
-
-		TextureClass	*m_texture;
-		SurfaceClass	*m_surface;
-
-	public:
-
-		W3DVideoBuffer( Type format );
-		virtual ~W3DVideoBuffer();
-
-		virtual	Bool		allocate( UnsignedInt width, UnsignedInt height); ///< Allocates buffer
-		virtual void		free( void);					///< Free buffer
-		virtual	void*		lock( void );					///< Returns memory pointer to start of buffer
-		virtual void		unlock( void );				///< Release buffer
-		virtual Bool		valid( void );				///< Is the buffer valid to use
-
-		TextureClass		*texture( void );			///< Returns texture object
-
-		static WW3DFormat TypeToW3DFormat( VideoBuffer::Type format );
-		static VideoBuffer::Type W3DFormatToType( WW3DFormat w3dFormat );
-};
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-inline TextureClass* W3DVideoBuffer::texture( void ) { return m_texture; }
-
-#endif // __W3DDEVICE_GAMECLIENT_W3DVIDEOBUFFER_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h
deleted file mode 100644
index 190b3c2c446..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DView.h ////////////////////////////////////////////////////////////////////////////////
-//
-// W3D implementation of the game view window.  View windows are literally
-// a window into the game world that have width, height, and camera 
-// controls for what to look at
-//
-// Author: Colin Day, April 2001
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DVIEW_H_
-#define __W3DVIEW_H_
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "Common/STLTypedefs.h"
-#include "GameClient/View.h"
-#include "WW3D2/camera.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-class Drawable;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-enum {MAX_WAYPOINTS=25};
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-typedef struct 
-{
-	Int			numWaypoints;
-	Coord3D	waypoints[MAX_WAYPOINTS+2];		// We pad first & last for interpolation.
-	Real		waySegLength[MAX_WAYPOINTS+2];	// Length of each segment;
-	Real		cameraAngle[MAX_WAYPOINTS+2];	// Camera Angle;
-	Real		cameraFXPitch[MAX_WAYPOINTS+2];	// Camera Pitch;
-	Real		cameraZoom[MAX_WAYPOINTS+2];	// Camera Zoom;
-	Int			timeMultiplier[MAX_WAYPOINTS+2];	// Time speedup factor.
-	Real		groundHeight[MAX_WAYPOINTS+1];	// Ground height.
-	Int			totalTimeMilliseconds;					// Num of ms to do this movement.
-	Int			elapsedTimeMilliseconds;				// Time since start.
-	Real		totalDistance;								// Total length of paths.
-	Real		curSegDistance;								// How far we are along the current seg.
-	Int			shutter;
-	Int			curSegment;										// The current segment.
-	Int			curShutter;										// The current shutter.
-	Int			rollingAverageFrames;					// Number of frames to roll.
-} TMoveAlongWaypointPathInfo;
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-typedef struct 
-{
-	Int			numFrames;						///< Number of frames to rotate.
-	Int			curFrame;							///< Current frame.
-	Real		angle;
-	Real		startZoom;
-	Real		endZoom;
-	Real		startPitch;
-	Real		endPitch;
-	Int			startTimeMultiplier;
-	Int			endTimeMultiplier;
-	ObjectID targetObjectID;			///< Target if we are tracking an object instead of just rotating
-	Coord3D	targetObjectPos;			///< Target's position (so we can stay looking at that spot if he dies)
-	Bool		trackObject;					///< Are we tracking an object or just rotating?
-	Int			numHoldFrames;				///< Number of frames to hold the camera before finishing the movement
-} TRotateCameraInfo;
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-typedef struct 
-{
-	Int			numFrames;						///< Number of frames to pitch.
-	Int			curFrame;							///< Current frame.
-	Real		angle;
-	Real		startPitch;
-	Real		endPitch;
-	Int			startTimeMultiplier;
-	Int			endTimeMultiplier;
-} TPitchCameraInfo;
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-typedef struct 
-{
-	Int			numFrames;						///< Number of frames to zoom.
-	Int			curFrame;							///< Current frame.
-	Real		startZoom;
-	Real		endZoom;
-	Int			startTimeMultiplier;
-	Int			endTimeMultiplier;
-} TZoomCameraInfo;
-
-// ------------------------------------------------------------------------------------------------
-/** W3DView implementation of the game view class.  This allows us to create
-  * a "window" into the game world that can be sized and contains controls
-	* for manipulating the camera */
-// ------------------------------------------------------------------------------------------------
-class W3DView : public View, public SubsystemInterface
-{
-
-public:
-	W3DView();
-	~W3DView();
-
-	virtual void init( void );  ///< init/re-init the W3DView
-	virtual void reset( void );
-	virtual void drawView( void );  ///< draw this view
-	virtual void updateView(void);	///<called once per frame to determine the final camera and object transforms
-
-	virtual void draw( );  ///< draw this view
-	virtual void update( );	///<called once per frame to determine the final camera and object transforms
-
-	virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType );  ///< pick drawable given the screen pixel coords.  If force attack, picks bridges.
-
-	/// all drawables in the 2D screen region will call the 'callback'
-	virtual Int iterateDrawablesInRegion( IRegion2D *screenRegion,
-																Bool (*callback)( Drawable *draw, void *userData ),
-																void *userData );
-
-	virtual void setWidth( Int width );
-	virtual void setHeight( Int height );
-	virtual void setOrigin( Int x, Int y);			///< Sets location of top-left view corner on display 
-
-	virtual void scrollBy( Coord2D *delta );  ///< Shift the view by the given delta
-
-	virtual void forceRedraw();
-
-	virtual void setAngle( Real angle );										///< Rotate the view around the up axis by the given angle
-	virtual void setPitch( Real angle );											///< Rotate the view around the horizontal axis to the given angle
-	virtual void setAngleAndPitchToDefault( void );							///< Set the view angle back to default 
-
-	virtual void lookAt( const Coord3D *o );											///< Center the view on the given coordinate
-	virtual void initHeightForMap( void );												///<  Init the camera height for the map at the current position.
-	virtual void moveCameraTo(const Coord3D *o, Int miliseconds,  Int shutter, Bool orient);
-	virtual void moveCameraAlongWaypointPath(Waypoint *pWay, Int frames, Int shutter, Bool orient);
-	virtual Bool isCameraMovementFinished(void);
- 	virtual void resetCamera(const Coord3D *location, Int frames);	///< Move camera to location, and reset to default angle & zoom.
- 	virtual void rotateCamera(Real rotations, Int frames);					///< Rotate camera about current viewpoint.
-	virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds);	///< Rotate camera to face an object, and hold on it
-	virtual void rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds);	///< Rotate camera to face a location.
-	virtual void cameraModFreezeTime(void){ m_freezeTimeForCameraMovement = true;}					///< Freezes time during the next camera movement.
-	virtual void cameraModFreezeAngle(void);												///< Freezes time during the next camera movement.
-	virtual Bool isTimeFrozen(void){ return m_freezeTimeForCameraMovement;}					///< Freezes time during the next camera movement.
-	virtual void cameraModFinalZoom(Real finalZoom);								///< Final zoom for current camera movement.
-	virtual void cameraModRollingAverage(Int framesToAverage);			///< Number of frames to average movement for current camera movement.
-	virtual void cameraModFinalTimeMultiplier(Int finalMultiplier); ///< Final time multiplier for current camera movement.
-	virtual void cameraModFinalPitch(Real finalPitch);							///< Final pitch for current camera movement.
-	virtual void cameraModLookToward(Coord3D *pLoc);								///< Sets a look at point during camera movement.
-	virtual void cameraModFinalLookToward(Coord3D *pLoc);						///< Sets a look at point during camera movement.
-	virtual void cameraModFinalMoveTo(Coord3D *pLoc);			///< Sets a final move to.
-	virtual Int	 getTimeMultiplier(void) {return m_timeMultiplier;};///< Get the time multiplier.
-	virtual void setTimeMultiplier(Int multiple) {m_timeMultiplier = multiple;}; ///< Set the time multiplier.
-	virtual void setDefaultView(Real pitch, Real angle, Real maxHeight);
-	virtual void zoomCamera( Real finalZoom, Int milliseconds );
-	virtual void pitchCamera( Real finalPitch, Int milliseconds );
-
-	virtual void setHeightAboveGround(Real z);
-	virtual void setZoom(Real z);
-	virtual void setZoomToDefault( void );									///< Set zoom to default value
-
-	virtual void setFieldOfView( Real angle );							///< Set the horizontal field of view angle
-
-  virtual WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s );	///< Transform world coordinate "w" into screen coordinate "s"
-	virtual void screenToWorld( const ICoord2D *s, Coord3D *w );	///< Transform screen coordinate "s" into world coordinate "w"
-	virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world );  ///< transform screen coord to a point on the 3D terrain
-	virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z );  ///< transform screen point to world point at the specified world Z value
-
-	CameraClass *get3DCamera() const { return m_3DCamera; }
-	
-	virtual const Coord3D& get3DCameraPosition() const;
-
-	virtual void setCameraLock(ObjectID id);
-	virtual void setSnapMode( CameraLockType lockType, Real lockDist );
-
-	/// Add an impulse force to shake the camera
-	virtual void shake( const Coord3D *epicenter, CameraShakeType shakeType );
-	
-	virtual Real getFXPitch( void ) const { return m_FXPitch; }					///< returns the FX pitch angle
-
-	virtual Bool setViewFilterMode(enum FilterModes filterMode);			///< Turns on viewport special effect (black & white mode)
-	virtual Bool setViewFilter(enum FilterTypes filter);			///< Turns on viewport special effect (black & white mode)
-	virtual void setViewFilterPos(const Coord3D *pos);			///<  Passes a position to the special effect filter.
-	virtual enum FilterModes getViewFilterMode(void) {return m_viewFilterMode;}			///< Turns on viewport special effect (black & white mode)
-	virtual enum FilterTypes getViewFilterType(void) {return m_viewFilter;}			///< Turns on viewport special effect (black & white mode)
-	virtual void setFadeParameters(Int fadeFrames, Int direction);
-	virtual void set3DWireFrameMode(Bool enable);	///<enables custom wireframe rendering of 3D viewport
-
-	Bool updateCameraMovements(void); 
-	virtual void forceCameraConstraintRecalc(void) { calcCameraConstraints(); }
-
-	virtual void setGuardBandBias( const Coord2D *gb ) { m_guardBandBias.x = gb->x; m_guardBandBias.y = gb->y; }
-
-
-private:
-
-	CameraClass *m_3DCamera;												///< camera representation for 3D scene
-	CameraClass *m_2DCamera;												///< camera for UI overlayed on top of 3D scene
-	enum FilterModes m_viewFilterMode;
-	enum FilterTypes m_viewFilter;
-	Bool m_isWireFrameEnabled;
-	Bool m_nextWireFrameEnabled;											///< used to delay wireframe changes by 1 frame (needed for transitions).
-
-
-	Coord2D m_shakeOffset;													///< the offset to add to the camera position
-	Real m_shakeAngleCos;														///< the cosine of the orientation of the oscillation
-	Real m_shakeAngleSin;														///< the sine of the orientation of the oscillation
-	Real m_shakeIntensity;													///< the intensity of the oscillation
-
-
-	TRotateCameraInfo	m_rcInfo;
-	Bool		m_doingRotateCamera;										///< True if we are doing a camera rotate.
-
-	TPitchCameraInfo m_pcInfo;
-	Bool m_doingPitchCamera;
-	TZoomCameraInfo m_zcInfo;
-	Bool m_doingZoomCamera;
-	
-	Bool m_doingScriptedCameraLock;									///< True if we are following a unit via script
-
-	Real		m_FXPitch;															///< Camera effects pitch.  0 = flat, infinite = look down, 1 = normal.
-
-	TMoveAlongWaypointPathInfo m_mcwpInfo;					///< Move camera along waypoint path info.
-	Bool		m_doingMoveCameraOnWaypointPath;				///< If true, moving camera along waypoint path.
-
-	Bool		m_freezeTimeForCameraMovement;
-	Int			m_timeMultiplier;												///< Time speedup multiplier.
-
-	Bool		m_cameraHasMovedSinceRequest;					///< If true, throw out all saved locations
-	VecPosRequests	m_locationRequests;		///< These are cached. New requests are added here
-
-	Coord3D m_cameraOffset;													///< offset for camera from view center
-	Coord3D m_previousLookAtPosition;													///< offset for camera from view center
-	Coord2D m_scrollAmount;													///< scroll speed
-	Real m_scrollAmountCutoff;											///< scroll speed at which we do not adjust height
-
-	Real m_groundLevel;															///< height of ground.
-	
-	Region2D m_cameraConstraint;										///< m_pos should be constrained to be within this area
-	Bool m_cameraConstraintValid;										///< if f, recalc cam constraints
-
-	void setCameraTransform( void );								///< set the transform matrix of m_3DCamera, based on m_pos & m_angle
-	void buildCameraTransform( Matrix3D *transform ) ;			///< calculate (but do not set) the transform matrix of m_3DCamera, based on m_pos & m_angle
-	void calcCameraConstraints() ;			///< recalc m_cameraConstraint
-	void moveAlongWaypointPath(Int milliseconds); ///< Move camera along path.
-	void getPickRay(const ICoord2D *screen, Vector3 *rayStart, Vector3 *rayEnd);	///<returns a line segment (ray) originating at the given screen position
-	void setupWaypointPath(Bool orient);					///< Calculates distances & angles for moving along a waypoint path.
-	void rotateCameraOneFrame(void);							///< Do one frame of a rotate camera movement.
-	void zoomCameraOneFrame(void);							///< Do one frame of a zoom camera movement.
-	void pitchCameraOneFrame(void);							///< Do one frame of a pitch camera movement.
-	void getAxisAlignedViewRegion(Region3D &axisAlignedRegion);	///< Find 3D Region enclosing all possible drawables.
-	void calcDeltaScroll(Coord2D &screenDelta);
-
-};  // end class W3DView
-
-// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
-extern Int TheW3DFrameLengthInMsec;	// default is 33msec/frame == 30fps. but we may change it depending on sys config.
-
-#endif  // end __W3DVIEW_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h
index a9862618fbe..bcf573c9d9d 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __W3DVOLUMETRICSHADOW_H_
-#define __W3DVOLUMETRICSHADOW_H_
-
 #include "matrix4.h"
 #include "W3DDevice/GameClient/W3DBufferManager.h"
 #include "GameClient/Shadow.h"
@@ -54,7 +50,7 @@ class W3DVolumetricShadowManager
 {
 
 public:
-	
+
 	W3DVolumetricShadowManager( void );
 	~W3DVolumetricShadowManager( void );
 	Bool init( void );	///<initialize resources used by manager, must have valid D3D device.
@@ -85,7 +81,7 @@ class W3DVolumetricShadowManager
 		W3DVolumetricShadow *m_shadowList;
 		W3DVolumetricShadowRenderTask *m_dynamicShadowVolumesToRender;
 		W3DShadowGeometryManager *m_W3DShadowGeometryManager;
-};  // end class W3DVolumetricShadowManager
+};
 
 extern W3DVolumetricShadowManager *TheW3DVolumetricShadowManager;
 
@@ -94,7 +90,7 @@ class W3DVolumetricShadow	: public Shadow
 {
 	friend class W3DVolumetricShadowManager;
 
-	enum														
+	enum
 	{
 		SHADOW_DYNAMIC	=	0x1			//flag indicating a dynamic shadow caster (animated mesh).
 	};
@@ -108,7 +104,7 @@ class W3DVolumetricShadow	: public Shadow
 
 		virtual void release(void)	{TheW3DVolumetricShadowManager->removeShadow(this);}	///<release shadow from manager
 
-		#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+		#if defined(RTS_DEBUG)
 		virtual void getRenderCost(RenderCost & rc) const;
 		#endif
 
@@ -156,7 +152,7 @@ class W3DVolumetricShadow	: public Shadow
 
 		// this is our current geometry we will derive the shadow from
 		W3DShadowGeometry *m_geometry;
-		
+
 		RenderObjClass	*m_robj;	///<render object belonging to model casting shadow
 
 		Real	m_shadowLengthScale;	///<scale factor used to reduce/clamp shadow length
@@ -183,12 +179,10 @@ class W3DVolumetricShadow	: public Shadow
 									 // as disjoint pairs.  The acutal size of this
 									 // piece of memory must accomodate #vertices*2
 		Short m_numSilhouetteIndices[MAX_SHADOW_CASTER_MESHES];  // total number of edge indices in the index
-									   // array, these are pairs and therefore 
+									   // array, these are pairs and therefore
 									   // always a multiple of two
 		Short m_maxSilhouetteEntries[MAX_SHADOW_CASTER_MESHES];  // how big the silhouette index can hold max
 
 		Int	  m_numIndicesPerMesh[MAX_SHADOW_CASTER_MESHES];	///<silhouette indices from each mesh.
 
-};  // end class W3DVolumetricShadow
-
-#endif	//__W3DVOLUMETRICSHADOW_H_
+};
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h
deleted file mode 100644
index 0d7e3e27003..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DWater.h ///////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DWater_H_
-#define __W3DWater_H_
-
-#include "always.h"
-#include "rendobj.h"
-#include "w3d_file.h"
-#include "dx8vertexbuffer.h"			 
-#include "dx8indexbuffer.h"
-#include "shader.h"
-#include "vertmaterial.h"
-#include "light.h"
-#include "Lib/BaseType.h"
-#include "Common/GameType.h"
-#include "Common/Snapshot.h"
-
-#define INVALID_WATER_HEIGHT 0.0f	///water height guaranteed to be below all terrain.
-
-#define NUM_BUMP_FRAMES 32	///number of animation frames in bump map
-//Offsets in constant register file to Vertex shader constants
-#define CV_ZERO 0
-#define CV_ONE 1
-#define CV_WORLDVIEWPROJ_0 2
-#define CV_TEXPROJ_0 6
-#define CV_PATCH_SCALE_OFFSET 10
-
-class PolygonTrigger;
-class WaterTracksRenderSystem;
-class Xfer;
-/// Custom render object that draws mirrors, water, and skies.
-/**
-This render object handles drawing reflected W3D scenes.  It will only work
-with rectangular planar surfaces and was tuned with an emphasis on water.
-Since skies are only visible in reflections, this code will also
-render clouds and sky bodies.
-*/
-class WaterRenderObjClass : public Snapshot,
-														public RenderObjClass
-{	
-
-public:
-
-	enum WaterType
-	{
-		WATER_TYPE_0_TRANSLUCENT = 0,	//translucent water, no reflection
-		WATER_TYPE_1_FB_REFLECTION,		//legacy frame buffer reflection (non translucent)
-		WATER_TYPE_2_PVSHADER,		//pixel/vertex shader, texture reflection
-		WATER_TYPE_3_GRIDMESH,		//3D Mesh based water
-		WATER_TYPE_MAX		// end of enumeration
-	};
-
-	WaterRenderObjClass(void);
-	~WaterRenderObjClass(void);
-
-	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface (W3D methods) 
-	/////////////////////////////////////////////////////////////////////////////
-	virtual RenderObjClass *	Clone(void) const;
-	virtual int						Class_ID(void) const;
-	virtual void					Render(RenderInfoClass & rinfo);
-/// @todo: Add methods for collision detection with water surface
-//	virtual Bool					Cast_Ray(RayCollisionTestClass & raytest);
-//	virtual Bool					Cast_AABox(AABoxCollisionTestClass & boxtest);
-//	virtual Bool					Cast_OBBox(OBBoxCollisionTestClass & boxtest);
-//	virtual Bool					Intersect_AABox(AABoxIntersectionTestClass & boxtest);
-//	virtual Bool					Intersect_OBBox(OBBoxIntersectionTestClass & boxtest);
-
-	virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;
-    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;
-	// Get and set static sort level
-	virtual int		Get_Sort_Level(void) const		{ return m_sortLevel; }
-  	virtual void	Set_Sort_Level(int level)		{ m_sortLevel = level;}
-
-	///allocate W3D resources needed to render water
-	void renderWater(void);				///<draw the water surface (flat)
-	Int init(Real waterLevel, Real dx, Real dy, SceneClass *parentScene, WaterType type);
-	void reset( void );  ///< reset any resources we need to
-	void load(void);	///< load/setup any map dependent features
-	void update( void ); ///< update phase of the water
-	void enableWaterGrid(Bool state);	///< used to active custom water for special maps. (i.e DAM).
-	void updateMapOverrides(void);	///< used to update any map specific map overrides for water appearance.
-	void setTimeOfDay(TimeOfDay tod); ///<change sky/water for time of day
-	void toggleCloudLayer(Bool state)	{	m_useCloudLayer=state;}	///<enables/disables the cloud layer
-	void updateRenderTargetTextures(CameraClass *cam);	///< renders into any required textures.	
-	void ReleaseResources(void);	///< Release all dx8 resources so the device can be reset.
-	void ReAcquireResources(void);  ///< Reacquire all resources after device reset.
-	Real getWaterHeight(Real x, Real y);	///<return water height at given point - for use by WB.
-	void setGridHeightClamps(Real minz, Real maxz);	///<set min/max height values alllowed in grid
-	void addVelocity( Real worldX, Real worldY, Real zVelocity, Real preferredHeight );	///< add velocity value
-	void changeGridHeight(Real x, Real y, Real delta);	///<change height of grid at world point including neighbors within falloff.
-	void setGridChangeAttenuationFactors(Real a, Real b, Real c, Real range);	///<adjust falloff parameters for grid change method.
-	void setGridTransform(Real angle, Real x, Real y, Real z);	///<positoin/orientation of grid in space
-	void setGridTransform(const Matrix3D *transform);	///< set transform by matrix
-	void getGridTransform(Matrix3D *transform);	///< get grid transform matrix
-	void setGridResolution(Real gridCellsX, Real gridCellsY, Real cellSize);	///<grid resolution and spacing
-	void getGridResolution(Real *gridCellsX, Real *gridCellsY, Real *cellSize);  ///<get grid resolution params
-	inline void setGridVertexHeight(Int x, Int y, Real value); 
-	inline void getGridVertexHeight(Int x, Int y, Real *value)
-	{	if (m_meshData)	*value=m_meshData[(y+1)*(m_gridCellsX+1+2)+x+1].height+ Get_Position().Z;}
-	inline Bool worldToGridSpace(Real worldX, Real worldY, Real &gridX, Real &gridY);	///<convert from world coordinates to grid's local coordinate system.
-
-	void replaceSkyboxTexture(const AsciiString& oldTexName, const AsciiString& newTextName);
-
-protected:
-	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining quad
-	SceneClass							*m_parentScene;	///<scene to be reflected
-	ShaderClass m_shaderClass; ///<shader or rendering state for heightmap
-	VertexMaterialClass	  		*m_vertexMaterialClass;	///<vertex lighting material
-	VertexMaterialClass			*m_meshVertexMaterialClass; ///<vertex lighting marial for 3D water.
-	LightClass					*m_meshLight;				///<light used for 3D Mesh Water.
-	TextureClass *m_alphaClippingTexture;	///<used for faked clipping using alpha
-	Real	m_dx;	///<x extent of water surface (offset from local center)
-	Real	m_dy;	///<y extent of water surface (offset from local center)
-	Vector3 m_planeNormal;		///<water plane normal
-	Real		m_planeDistance;	///<water plane distance
-	Real		m_level;			///<level of water (hack for water)
-	Real		m_uOffset;			///<current texture offset on u axis
-	Real		m_vOffset;			///<current texture offset on v axis
-	Real		m_uScrollPerMs;		///<texels per/ms scroll rate in u direction
-	Real		m_vScrollPerMs;		///<texels per/ms scroll rate in v direction
-	Int			m_LastUpdateTime;	///<time of last cloud update
-	Bool		m_useCloudLayer;	///<flag if clouds are on/off
-	WaterType	m_waterType;		///<type of water being used
-	Int			m_sortLevel;		///<sort order after main scene is rendered
-
-	//Data used in GeForce3 bump-mapped water (uses direct D3D resources for better
-	//performance and compatibility (most of these featues are not supported by W3D).
-	struct SEA_PATCH_VERTEX	//vertex structure passed to D3D
-	{
-		float x,y,z;
-		unsigned int c;
-		float tu, tv;
-	}; 
-
-	LPDIRECT3DDEVICE8 m_pDev;						///<pointer to D3D Device
-	LPDIRECT3DVERTEXBUFFER8 m_vertexBufferD3D;		///<D3D vertex buffer
-	LPDIRECT3DINDEXBUFFER8	m_indexBufferD3D;	///<D3D index buffer
-	Int						m_vertexBufferD3DOffset;	///<location to start writing vertices
-	DWORD					m_dwWavePixelShader;	///<handle to D3D pixel shader
-	DWORD					m_dwWaveVertexShader;	///<handle to D3D vertex shader
-	Int	m_numVertices;				///<number of vertices in D3D vertex buffer
-	Int m_numIndices;				///<number of indices in D3D index buffer
-	LPDIRECT3DTEXTURE8 m_pBumpTexture[NUM_BUMP_FRAMES]; ///<animation frames
-	LPDIRECT3DTEXTURE8 m_pBumpTexture2[NUM_BUMP_FRAMES]; ///<animation frames
-	Int					m_iBumpFrame;	///<current animation frame
-	Real				m_fBumpScale;	///<scales bump map uv perturbation
-	TextureClass * m_pReflectionTexture;	///<render target for reflection
-	RenderObjClass	*m_skyBox;		///<box around level
-	WaterTracksRenderSystem *m_waterTrackSystem;	///<object responsible for rendering water wakes
-
-	enum WaterMeshStatus
-	{
-		AT_REST = 0x00,
-		IN_MOTION = 0x01
-	};
-	struct WaterMeshData
-	{
-		Real height;										///< height of the 3D mesh at this point
-		Real velocity;									///< velocity in Z that this point is moving up and down
-		UnsignedByte status;						///< status for this grid point
-		UnsignedByte preferredHeight;		///< the hight we prefer to be
-	};
-	WaterMeshData *m_meshData;  ///< heightmap data for 3D Mesh based water.
-	UnsignedInt m_meshDataSize;	///< size of m_meshData 
-	Bool m_meshInMotion;				///< TRUE once we've messed with velocities and are in motion
-	Bool m_doWaterGrid;	///< allows/prevents water grid rendering.
-
-	Vector2	m_gridDirectionX;			///<vector along water grid's x-axis (scaled to world-space)
-	Vector2	m_gridDirectionY;			///<vector along water grid's y-axis (scaled to world-space)
-	Vector2	m_gridOrigin;				///<unit vector along water grid's x-axis
-	Real m_gridWidth;					///<object-space width of water grid
-	Real m_gridHeight;					///<object-space width of water grid
-	Real m_minGridHeight;				///<minimum height value allowed for water mesh
-	Real m_maxGridHeight;				///<maximum height value allowed for water mesh
-	Real m_gridChangeMaxRange;			///<maximum range of changeGridHeight() method
-	Real m_gridChangeAtt0;
-	Real m_gridChangeAtt1;
-	Real m_gridChangeAtt2;
-	Real m_gridCellSize;				///<world-space width/height of each cell.
-	Int  m_gridCellsX;					///<number of cells along width
-	Int  m_gridCellsY;					///<number of cells along height
-
-	Real m_riverVOrigin;
-	TextureClass *m_riverTexture;
-	TextureClass *m_whiteTexture;		///< a texture containing only white used for NULL pixel shader stages.
-	TextureClass *m_waterNoiseTexture;
-	DWORD	m_waterPixelShader;		///<D3D handle to pixel shader.
-	DWORD	m_riverWaterPixelShader;		///<D3D handle to pixel shader.
-	DWORD	m_trapezoidWaterPixelShader;	///<handle to D3D vertex shader
-	TextureClass *m_waterSparklesTexture;
-	Real m_riverXOffset;
-	Real m_riverYOffset;
-	Bool m_drawingRiver;
-	Bool m_disableRiver;
-	TextureClass *m_riverAlphaEdge;
-
-	TimeOfDay m_tod;	///<time of day setting for reflected cloud layer
-
-	struct Setting
-	{
-		TextureClass	*skyTexture;
-		TextureClass	*waterTexture;
-		Int				waterRepeatCount;
-		Real			skyTexelsPerUnit;	//texel density of sky plane (higher value repeats texture more).
-		DWORD			vertex00Diffuse;		
-		DWORD			vertex10Diffuse;		
-		DWORD			vertex11Diffuse;		
-		DWORD			vertex01Diffuse;
-		DWORD			waterDiffuse;
-		DWORD			transparentWaterDiffuse;
-		Real			uScrollPerMs;		
-		Real			vScrollPerMs;
-	};
-
-	Setting m_settings[ TIME_OF_DAY_COUNT ];	///< settings for each time of day
-	void drawRiverWater(PolygonTrigger *pTrig);
-	void drawTrapezoidWater(Vector3 points[4]);
-	void loadSetting ( Setting *skySetting, TimeOfDay timeOfDay );	///<init sky/water settings from GDF
-	void renderSky(void);	///<draw the sky layer (clouds, stars, etc.)
-	void testCurvedWater(void);	///<draw the sky layer (clouds, stars, etc.)
-	void renderSkyBody(Matrix3D *mat);	///<draw the sky body (sun, moon, etc.)
-	void renderWaterMesh(void);			///<draw the water surface mesh (deformed 3d mesh).
-	HRESULT initBumpMap(LPDIRECT3DTEXTURE8 *pTex, TextureClass *pBumpSource);	///<copies data into bump-map format.
-	void renderMirror(CameraClass *cam);	///< Draw reflected scene into texture
-	void drawSea(RenderInfoClass & rinfo);	///< Draw the surface of the water
-	///bounding box of frustum clipped polygon plane
-	Bool getClippedWaterPlane(CameraClass *cam, AABoxClass *box);
-
-	void setupFlatWaterShader(void);
-	void setupJbaWaterShader(void);
-	void cleanupJbaWaterShader(void);
-
-	//Methods used for GeForce3 specific water
-	HRESULT generateIndexBuffer(int sizeX, int sizeY);	///<Generate static index buufer
-	HRESULT generateVertexBuffer( Int sizeX, Int sizeY, Int vertexSize, Bool doFill);///<Generate static vertex buffer
-
-	// snapshot methods for save/load
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-};
-
-//Public inline function declarations
-inline Bool WaterRenderObjClass::worldToGridSpace(Real worldX, Real worldY, Real &gridX, Real &gridY)
-{
-	Real dx,dy;
-	Real ooGridCellSize = 1.0f/m_gridCellSize;
-
-	dx=worldX - m_gridOrigin.X;
-	dy=worldY - m_gridOrigin.Y;
-	gridX = ooGridCellSize * (dx * m_gridDirectionX.X + dy * m_gridDirectionX.Y);
-	gridY = ooGridCellSize * (dx * m_gridDirectionY.X + dy * m_gridDirectionY.Y);
-	
-	if (gridX < 0)
-		return FALSE;
-	if (gridX > m_gridCellsX-1 )
-		return FALSE;
-	if (gridY < 0)
-		return FALSE;
-	if (gridY > m_gridCellsY-1 )
-		return FALSE;
-
-	return TRUE;
-}
-
-extern WaterRenderObjClass *TheWaterRenderObj; ///<global water rendering object
-
-#endif  // end __W3DWater_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h
deleted file mode 100644
index 85422e5ebc1..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __W3DWaterTracks_H_
-#define __W3DWaterTracks_H_
-
-enum waveType CPP_11(: Int);	//forward reference
-
-/// Custom render object that draws animated tracks/waves on the water.
-/**
-	This is an object which draws a small breaking wave or splash animation.  These objects are
-	to be managed/accessed only by the WaterTracksRenderObjClassSystem
-*/
-class WaterTracksObj
-{	
-	friend class WaterTracksRenderSystem;
-
-public:
-
-	WaterTracksObj(void);
-	~WaterTracksObj(void);
-
-	virtual void					Render(void) {};	///<draw this object
-	virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;	///<bounding sphere of this object
-    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;		///<bounding box of this object
-
-	Int freeWaterTracksResources(void);	///<free W3D assets used for this track
-	void init( Real width, Real length, const Vector2 &start, const Vector2 &end, const Char *texturename, Int waveTimeOffset);	///<allocate W3D resources and set size
-	void init( Real width, const Vector2 &start, const Vector2 &end, const Char *texturename);	///<allocate W3D resources and set size
-	Int	update(Int msElapsed);	///< update animation state
-	Int render(DX8VertexBufferClass	*vertexBuffer, Int batchStart);	///<draw this object
-
-protected:
-	TextureClass *m_stageZeroTexture;	///<primary texture
-	SphereClass	m_boundingSphere;		///<bounding sphere of WaterTracks
-	AABoxClass	m_boundingBox;			///<bounding box of WaterTracks
-
-	waveType	m_type;					///<used for render state sorting (set this to texture pointer for now).
-	Int			m_x;					///<vertex count
-	Int			m_y;					///<vertex count
-	Bool		m_bound;				///<object is bound to owner and accepts new edges
-	Vector2		m_startPos;				///<starting position of wave
-//	Vector2		m_endPos;				///<ending position of wave
-	Vector2		m_waveDir;				///<direction of wave travel
-	Vector2		m_perpDir;				///<direction perpendicular to wave travel
-	Vector2		m_initStartPos;			///<original settings used to create wave
-	Vector2		m_initEndPos;			///<original settings used to create wave
-	Int			m_initTimeOffset;		///<time offset when wave is added into the system
-	Int		m_fadeMs;				///<time for wave to fade out after it stops moving
-	Int		m_totalMs;				///<amount of time to complete full motion
-	Int			m_elapsedMs;			///<amount of time since start of motion
-
-	//New version
-	Real	m_waveInitialWidth;				///<width of wave segment when it first appears
-	Real	m_waveInitialHeight;			///<height of wave segment when it first appears
-	Real	m_waveFinalWidth;				///<width of wave segment at full size
-	Real	m_waveFinalWidthPeakFrac;		///<fraction along path when wave reaches full width
-	Real	m_waveFinalHeight;				///<final height of unstretched wave
-
-	Real m_initialVelocity;	//initial velocity in world units per ms.
-	Real m_waveDistance;		//<total distance traveled by wave front.
-	Real m_timeToReachBeach;
-	Real m_frontSlowDownAcc;
-	Real m_timeToStop;
-	Real m_timeToRetreat;
-	Real m_backSlowDownAcc;
-	Real m_timeToCompress;
-	Real m_flipU;			///<force uv coordinates to flip
-
-	WaterTracksObj	*m_nextSystem;			///<next track in system
-	WaterTracksObj *m_prevSystem;			///<previous track in system
-};
-
-/// System for drawing, updating, and re-using water mark render objects.
-/**
-This system keeps track of all the active track mark objects and reuses them
-when they expire.  It also renders all the track marks that were submitted in
-this frame.
-*/
-
-class WaterTracksRenderSystem
-{
-	friend class WaterTracksObj;
-
-public:
-
-	WaterTracksRenderSystem( void );
-	~WaterTracksRenderSystem( void );
-
-	void ReleaseResources(void);	///< Release all dx8 resources so the device can be reset.
-	void ReAcquireResources(void);  ///< Reacquire all resources after device reset.
-
-	void flush (RenderInfoClass & rinfo);	///<draw all tracks that were requested for rendering.
-	void update(void);	///<update the state of all edges (fade alpha, remove old, etc.)
-
-	void init(void);	///< pre-allocate track objects
-	void shutdown( void );		///< release all pre-allocated track objects, called by destructor
-	void reset(void);			///< free all map dependent items.
-
-	WaterTracksObj *bindTrack(waveType type);	///<track object to be controlled by owner
-	void unbindTrack( WaterTracksObj *mod );	///<releases control of track object
-	void saveTracks(void);									///<save all used tracks to disk
-	void loadTracks(void);									///<load tracks from disk
-	WaterTracksObj *findTrack(Vector2 &start, Vector2 &end, waveType type);
-
-protected:
-	DX8VertexBufferClass		*m_vertexBuffer;	///<vertex buffer used to draw all tracks
-	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining triangles in maximum length track
-	VertexMaterialClass	  	  *m_vertexMaterialClass;	///< vertex lighting material
-	ShaderClass m_shaderClass; ///<shader or rendering state for heightmap
-
-	WaterTracksObj *m_usedModules;	///<active objects being rendered in the scene
-	WaterTracksObj *m_freeModules;	//<unused modules that are free to use again
-
-	Int		m_stripSizeX;			///< resolution (vertex count) of wave strip
-	Int		m_stripSizeY;			///< resolution (vertex count) of wave strip
-	Int		m_batchStart;			///< start of unused vertices in vertex buffer
-	Real	m_level;				///< water level
-	void releaseTrack( WaterTracksObj *mod );	///<returns track object to free store.
-};  // end class WaterTracksRenderObjClassSystem
-
-#endif  //__W3DWaterTracks_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h
index f4612ca2062..09b10f4249c 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DWaypointBuffer.h ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   Command & Conquers: Generals
@@ -42,7 +42,7 @@
 //            are rendered after terrain, after roads & bridges, and after
 //            global fog, but before structures, objects, units, trees, etc.
 //            This way if we have two waypoints at the bottom of a hill but
-//            going through the hill, the line won't get cut off. However, 
+//            going through the hill, the line won't get cut off. However,
 //            structures and units on top of paths will render above it. Waypoints
 //            are only shown for selected units while in waypoint plotting mode.
 //
@@ -50,11 +50,8 @@
 
 #pragma once
 
-#ifndef __W3D_WAYPOINT_BUFFER_H
-#define __W3D_WAYPOINT_BUFFER_H
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "always.h"
 #include "rendobj.h"
@@ -68,8 +65,8 @@
 
 class SegmentedLineClass;
 
-class W3DWaypointBuffer 
-{	
+class W3DWaypointBuffer
+{
 	friend class HeightMapRenderObjClass;
 public:
 
@@ -87,5 +84,3 @@ class W3DWaypointBuffer
 	SegmentedLineClass *m_line;
 	TextureClass *m_texture;
 };
-
-#endif  // end __W3D_WAYPOINT_BUFFER_H
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h
index 4eb69551c78..1ccf20bdaea 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef W3DWEBBROWSER_H
-#define W3DWEBBROWSER_H
-
 #include "GameNetwork/WOLBrowser/WebBrowser.h"
 
 class TextureClass;
@@ -45,5 +42,3 @@ class W3DWebBrowser : public WebBrowser
 		virtual void closeBrowserWindow(GameWindow *win);
 
 };
-
-#endif // #ifndef W3DWEBBROWSER_H
\ No newline at end of file
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h
deleted file mode 100644
index d77495811b5..00000000000
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-// WorldHeightMap.h
-// Class to encapsulate height map.
-// Author: John Ahlquist, April 2001
-
-#pragma once
-
-#ifndef WorldHeightMap_H
-#define WorldHeightMap_H
-
-#include "Lib/BaseType.h"
-#include "WWLib/refcount.h"
-#include "WWMath/vector3.h"
-#include "W3DDevice/GameClient/TileData.h"
-#include "../../GameEngine/Include/Common/MapObject.h"
-
-#include "Common/STLTypedefs.h"
-typedef std::vector<ICoord2D> VecICoord2D;
-
-
-/** MapObject class 
-Not ref counted.  Do not store pointers to this class.  */
-
-#define K_MIN_HEIGHT  0
-#define K_MAX_HEIGHT  255
-
-#define NUM_SOURCE_TILES 1024
-#define NUM_BLEND_TILES 16192
-#define NUM_CLIFF_INFO 32384
-#define FLAG_VAL 0x7ADA0000
-
-// For backwards compatiblity.
-#define TEX_PATH_LEN 256
-
-
-/// Struct in memory.
-typedef struct {
-	Int globalTextureClass; 
-	Int firstTile;
-	Int numTiles;
-	Int width;
-	Int isBlendEdgeTile; ///< True if the texture contains blend edges.
-	AsciiString name;
-	ICoord2D positionInTexture;
-} TXTextureClass;
-
-typedef enum {POS_X, POS_Y, NEG_X, NEG_Y} TVDirection;
-/// Struct in memory.
-typedef struct {
-	Real	u0, v0;	 // Upper left uv
-	Real	u1, v1;	 // Lower left uv
-	Real	u2, v2;	 // Lower right uv
-	Real	u3, v3;	 // Upper right uv
-	Bool  flip;
-	Bool	mutant;  // Mutant mapping needed to get this to fit.
-	Short tileIndex; // Tile texture.
-} TCliffInfo;
-
-#define NUM_TEXTURE_CLASSES 256
-
-
-class TextureClass;
-class ChunkInputStream;
-class InputStream;
-class OutputStream;
-class DataChunkInput;
-struct DataChunkInfo;
-class AlphaEdgeTextureClass;
-
-class WorldHeightMap : public RefCountClass
-{
-	friend class TerrainTextureClass;
-	friend class AlphaTerrainTextureClass;
-	friend class W3DCustomEdging;
-	friend class AlphaEdgeTextureClass;
-
-#define NO_EVAL_TILING_MODES
-
-public:
-#ifdef EVAL_TILING_MODES
-	enum {TILE_4x4, TILE_6x6, TILE_8x8} m_tileMode;
-#endif
-	enum {
-		NORMAL_DRAW_WIDTH = 129,
-		NORMAL_DRAW_HEIGHT = 129,
-		STRETCH_DRAW_WIDTH = 65,
-		STRETCH_DRAW_HEIGHT = 65
-	};
-
-protected:
-	Int m_width;				///< Height map width.
-	Int m_height;				///< Height map height (y size of array).
-	Int m_borderSize;		///< Non-playable border area.
-	VecICoord2D m_boundaries;	///< the in-game boundaries
-	Int m_dataSize;			///< size of m_data.
-	UnsignedByte *m_data;	///< array of z(height) values in the height map.
-	UnsignedByte *m_cellFlipState;	///< array of bits to indicate the flip state of each cell.
-	Int m_flipStateWidth;			///< with of the array holding cellFlipState
-	UnsignedByte *m_cellCliffState;	///< array of bits to indicate the cliff state of each cell.
-
-	/// Texture indices.
-	Short  *m_tileNdxes;  ///< matches m_Data, indexes into m_SourceTiles.
-	Short  *m_blendTileNdxes;  ///< matches m_Data, indexes into m_blendedTiles.  0 means no blend info.	
-	Short  *m_cliffInfoNdxes;  ///< matches m_Data, indexes into m_cliffInfo.	 0 means no cliff info.
-	Short  *m_extraBlendTileNdxes;  ///< matches m_Data, indexes into m_extraBlendedTiles.  0 means no blend info.	
-
-	
-	Int m_numBitmapTiles;	// Number of tiles initialized from bitmaps in m_SourceTiles.
-	Int m_numEdgeTiles;	// Number of tiles initialized from bitmaps in m_SourceTiles.
-	Int m_numBlendedTiles;	// Number of blended tiles created from bitmap tiles.
-
-	TileData			*m_sourceTiles[NUM_SOURCE_TILES];	///< Tiles for m_textureClasses
-	TileData			*m_edgeTiles[NUM_SOURCE_TILES];	///< Tiles for m_textureClasses
-
-	TBlendTileInfo	m_blendedTiles[NUM_BLEND_TILES];
-	TBlendTileInfo	m_extraBlendedTiles[NUM_BLEND_TILES];
-
-	TCliffInfo	m_cliffInfo[NUM_CLIFF_INFO];
-	Int m_numCliffInfo; ///< Number of cliffInfo's used in m_cliffInfo.
-
-	// Texture classes.  There is one texture class for each bitmap read in.
-	// A class may have more than one tile.  For example, if the grass bitmap is 
-	// 128x128, it creates 4 64x64 tiles, so the grass texture class will have 4 tiles.
-	int m_numTextureClasses;
-	TXTextureClass m_textureClasses[NUM_TEXTURE_CLASSES];
-
-	// Edge Texture classes.  There is one texture class for each bitmap read in.
-	// An edge class will normally have 4 tiles.
-	int m_numEdgeTextureClasses;
-	TXTextureClass m_edgeTextureClasses[NUM_TEXTURE_CLASSES];
-
-	/** The actual texture used to render the 3d mesh.  Note that it is 
-	 basically m_SourceTiles laid out in rows, so by itself it is not useful.
-	 Use GetUVData to get the mapping info for height cells to map into the 
-	 texture. */
-	TerrainTextureClass *m_terrainTex;
-	Int	m_terrainTexHeight; /// Height of m_terrainTex allocated.
-	/** The texture that contains the alpha edge tiles that get blended on 
-			top of the base texture. getAlphaUVData does the mapping. */
-	AlphaTerrainTextureClass *m_alphaTerrainTex;
-	Int	m_alphaTexHeight; /// Height of m_alphaTerrainTex allocated.
-
-	/** The texture that contains custom blend edge tiles. */
-	AlphaEdgeTextureClass *m_alphaEdgeTex;
-	Int	m_alphaEdgeHeight; /// Height of m_alphaEdgeTex allocated.
-
-	/// Drawing info - re the part of the map that is being drawn.
-	Int m_drawOriginX;
-	Int m_drawOriginY;
-	Int m_drawWidthX;
-	Int m_drawHeightY;
-
-protected:
-	TileData *getSourceTile(UnsignedInt ndx) { if (ndx<NUM_SOURCE_TILES) return(m_sourceTiles[ndx]); return(NULL); };
-	TileData *getEdgeTile(UnsignedInt ndx) { if (ndx<NUM_SOURCE_TILES) return(m_edgeTiles[ndx]); return(NULL); };
-	static Bool readTiles(InputStream *pStrm, TileData **tiles, Int numRows);
-	static Int countTiles(InputStream *pStrm);
-	/// UV mapping data for a cell to map into the terrain texture.
-	void getUVForNdx(Int ndx, float *minU, float *minV, float *maxU, float*maxV, Bool fullTile);
-	Bool getUVForTileIndex(Int ndx, Short tileNdx, float U[4], float V[4], Bool fullTile);
-	Int getTextureClassFromNdx(Int tileNdx);
-	void readTexClass(TXTextureClass *texClass, TileData **tileData); 
-	Int updateTileTexturePositions(Int *edgeHeight); ///< Places each tile in the texture.
-	void initCliffFlagsFromHeights(void);
-	void setCellCliffFlagFromHeights(Int xIndex, Int yIndex);
-
-protected:	 // file reader callbacks.
-	static Bool ParseHeightMapDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	Bool ParseHeightMapData(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	static Bool ParseSizeOnlyInChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	Bool ParseSizeOnly(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	static Bool ParseBlendTileDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	Bool ParseBlendTileData(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	static Bool ParseWorldDictDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	static Bool ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	static Bool ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	Bool ParseObjectData(DataChunkInput &file, DataChunkInfo *info, void *userData, Bool readDict);
-	static Bool ParseLightingDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-
-protected:
-	WorldHeightMap(void);			///< Simple constructor for WorldHeightMapEdit class.
-
-public: // constructors/destructors
-	WorldHeightMap(ChunkInputStream *pFile, Bool bHMapOnly=false);	// read from file.
-	~WorldHeightMap(void);			// destroy.
-
-public:  // Boundary info
-	const VecICoord2D& getAllBoundaries(void) const { return m_boundaries; }
-
-public:  // height map info.
-	static Int getMinHeightValue(void) {return K_MIN_HEIGHT;}
-	static Int getMaxHeightValue(void) {return K_MAX_HEIGHT;}
-
-	UnsignedByte *getDataPtr(void) {return m_data;}
-
-	
-	Int getXExtent(void) {return m_width;}	///<number of vertices in x
-	Int getYExtent(void) {return m_height;}	///<number of vertices in y
-
-	inline Int getDrawOrgX(void) {return m_drawOriginX;}
-	inline Int getDrawOrgY(void) {return m_drawOriginY;}
-
-	inline Int getDrawWidth(void) {return m_drawWidthX;}
-	inline Int getDrawHeight(void) {return m_drawHeightY;}
-	inline void setDrawWidth(Int width) {m_drawWidthX = width; if (m_drawWidthX>m_width) m_drawWidthX = m_width;}
-	inline void setDrawHeight(Int height) {m_drawHeightY = height; if (m_drawHeightY>m_height) m_drawHeightY = m_height;}
-	inline Int getBorderSize(void) {return m_borderSize;}
-	/// Get height with the offset that HeightMapRenderObjClass uses built in.
-	inline UnsignedByte getDisplayHeight(Int x, Int y) { return m_data[x+m_drawOriginX+m_width*(y+m_drawOriginY)];}
-
-	/// Get height in normal coordinates.
-	inline UnsignedByte getHeight(Int xIndex, Int yIndex) 
-	{ 
-		Int ndx = (yIndex*m_width)+xIndex;
-		if ((ndx>=0) && (ndx<m_dataSize) && m_data) 
-			return(m_data[ndx]); 
-		else 
-			return(0);
-	};
-
-	void getUVForBlend(Int edgeClass, Region2D *range);
-
-	Bool setDrawOrg(Int xOrg, Int yOrg);
-
-	static void freeListOfMapObjects(void);
-
-	Int getTextureClassNoBlend(Int xIndex, Int yIndex, Bool baseClass=false);
-	Int getTextureClass(Int xIndex, Int yIndex, Bool baseClass=false);
-	TXTextureClass getTextureFromIndex( Int textureIndex );
-
-public:  // tile and texture info.	
-	TextureClass *getTerrainTexture(void);  //< generates if needed and returns the terrain texture
-	TextureClass *getAlphaTerrainTexture(void); //< generates if needed and returns alpha terrain texture
-	TextureClass *getEdgeTerrainTexture(void); //< generates if needed and returns blend edge texture
-	/// UV mapping data for a cell to map into the terrain texture.  Returns true if the textures had to be stretched for cliffs.
-	Bool getUVData(Int xIndex, Int yIndex, float U[4], float V[4], Bool fullTile);
-	Bool getFlipState(Int xIndex, Int yIndex) const;
-	Bool getCliffState(Int xIndex, Int yIndex) const;
-	Bool getExtraAlphaUVData(Int xIndex, Int yIndex, float U[4], float V[4], UnsignedByte alpha[4], Bool *flip, Bool *cliff);
-	/// UV mapping data for a cell to map into the alpha terrain texture.
-	void getAlphaUVData(Int xIndex, Int yIndex, float U[4], float V[4], UnsignedByte alpha[4], Bool *flip, Bool fullTile);
-	void getTerrainColorAt(Real x, Real y, RGBColor *pColor);
-	AsciiString getTerrainNameAt(Real x, Real y);
-	Bool isCliffMappedTexture(Int xIndex, Int yIndex);
-
-public:  // modify height value
-	void setRawHeight(Int xIndex, Int yIndex, UnsignedByte height) { 
-		Int ndx = (yIndex*m_width)+xIndex;
-		if ((ndx>=0) && (ndx<m_dataSize) && m_data) m_data[ndx]=height;
-	};
-
-protected:
-	void setCliffState(Int xIndex, Int yIndex, Bool state);
-
-};
-
-#endif
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h
index 4c1adba50f4..24c774d8e76 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h
@@ -25,7 +25,7 @@
 // FILE: W3DGameLogic.h ///////////////////////////////////////////////////////
 //
 // W3D game logic class, there shouldn't be a lot of new functionality
-// in this class, but there are certain things that need to have close 
+// in this class, but there are certain things that need to have close
 // knowledge of each other like ther logical and visual terrain
 //
 // Author: Colin Day, April 2001
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef __W3DGAMELOGIC_H_
-#define __W3DGAMELOGIC_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -64,6 +61,4 @@ class W3DGameLogic : public GameLogic
 	virtual TerrainLogic *createTerrainLogic( void ) { return NEW W3DTerrainLogic; };
 	virtual GhostObjectManager *createGhostObjectManager(void) { return NEW W3DGhostObjectManager; }
 
-};  // end class W3DGameLogic
-
-#endif  // end __W3DGAMELOGIC_H_
+};
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h
index 7dada97968e..75e8ec9b683 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3DGHOSTOBJECT_H_
-#define _W3DGHOSTOBJECT_H_
-
 #include "GameLogic/GhostObject.h"
 #include "Lib/BaseType.h"
 #include "Common/GameCommon.h"
@@ -45,23 +42,25 @@ class PartitionData;
 class W3DGhostObject: public GhostObject
 {
 	friend W3DGhostObjectManager;
+
 public:
 	W3DGhostObject();
 	virtual ~W3DGhostObject();
 	virtual void snapShot(int playerIndex);
 	virtual void updateParentObject(Object *object, PartitionData *mod);
 	virtual void freeSnapShot(int playerIndex);
+
 protected:
 	virtual void crc( Xfer *xfer);
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
 	void removeParentObject(void);
 	void restoreParentObject(void);	///< restore the original non-ghosted object to scene.
-	void addToScene(int playerIndex);
-	void removeFromScene(int playerIndex);
-	void release(void);			///< used by manager to return object to free store.
-	void getShroudStatus(int playerIndex);	///< used to get the partition manager to update ghost objects without parent objects.
+	Bool addToScene(int playerIndex);
+	Bool removeFromScene(int playerIndex);
+	ObjectShroudStatus getShroudStatus(int playerIndex);	///< used to get the partition manager to update ghost objects without parent objects.
 	void freeAllSnapShots(void);				///< used to free all snapshots from all players.
+
 	W3DRenderObjectSnapshot *m_parentSnapshots[MAX_PLAYER_COUNT];
 	DrawableInfo	m_drawableInfo;
 
@@ -78,8 +77,8 @@ class W3DGhostObjectManager : public GhostObjectManager
 	virtual void reset(void);
 	virtual GhostObject *addGhostObject(Object *object, PartitionData *pd);
 	virtual void removeGhostObject(GhostObject *mod);
-	virtual void setLocalPlayerIndex(int index);
-	virtual void updateOrphanedObjects(int *playerIndexList, int numNonLocalPlayers);
+	virtual void setLocalPlayerIndex(int playerIndex);
+	virtual void updateOrphanedObjects(int *playerIndexList, int playerIndexCount);
 	virtual void releasePartitionData(void);
 	virtual void restorePartitionData(void);
 
@@ -92,5 +91,3 @@ class W3DGhostObjectManager : public GhostObjectManager
 	W3DGhostObject	*m_freeModules;
 	W3DGhostObject	*m_usedModules;
 };
-
-#endif // _W3DGHOSTOBJECT_H_
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h
index cd8d9325ca2..e2cd3cab2c8 100644
--- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h
+++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __W3DTERRAINLOGIC_H_
-#define __W3DTERRAINLOGIC_H_
-
 #include "GameLogic/TerrainLogic.h"
 
 //-------------------------------------------------------------------------------------------------
@@ -80,6 +77,4 @@ class W3DTerrainLogic : public TerrainLogic
 	Real m_mapMinZ;	///< Minimum terrain z value.
 	Real m_mapMaxZ;	///< Maximum terrain z value.
 
-};  // end W3DTerrainLogic
-
-#endif  // end __W3DTERRAINLOGIC_H_
+};
diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h b/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h
deleted file mode 100644
index be09a7cf010..00000000000
--- a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/////// Win32BIGFile.h ////////////////////////////////////
-// Bryan Cleveland, August 2002
-///////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WIN32BIGFILE_H
-#define __WIN32BIGFILE_H
-
-#include "Common/ArchiveFile.h"
-#include "Common/AsciiString.h"
-#include "Common/List.h"
-
-class Win32BIGFile : public ArchiveFile
-{
-	public:
-		Win32BIGFile();
-		virtual ~Win32BIGFile();
-
-		virtual Bool					getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const;	///< fill in the fileInfo struct with info about the requested file.
-		virtual File*					openFile( const Char *filename, Int access = 0 );///< Open the specified file within the BIG file
-		virtual void					closeAllFiles( void );									///< Close all file opened in this BIG file
-		virtual AsciiString		getName( void );												///< Returns the name of the BIG file
-		virtual AsciiString		getPath( void );												///< Returns full path and name of BIG file
-		virtual void					setSearchPriority( Int new_priority );	///< Set this BIG file's search priority
-		virtual void					close( void );													///< Close this BIG file
-
-	protected:
-
-		AsciiString		m_name;		///< BIG file name
-		AsciiString		m_path;		///< BIG file path
-};
-
-#endif // __WIN32BIGFILE_H
\ No newline at end of file
diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h b/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h
deleted file mode 100644
index 70f955e188d..00000000000
--- a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//////// Win32BIGFileSystem.h ///////////////////////////
-// Bryan Cleveland, August 2002
-/////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WIN32BIGFILESYSTEM_H
-#define __WIN32BIGFILESYSTEM_H
-
-#include "Common/ArchiveFileSystem.h"
-
-class Win32BIGFileSystem : public ArchiveFileSystem
-{
-public:
-	Win32BIGFileSystem();
-	virtual ~Win32BIGFileSystem();
-
-	virtual void init( void );
-	virtual void update( void );
-	virtual void reset( void );
-	virtual void postProcessLoad( void );
-
-	// ArchiveFile operations
-	virtual void closeAllArchiveFiles( void );											///< Close all Archivefiles currently open
-
-	// File operations
-	virtual ArchiveFile * openArchiveFile(const Char *filename);
-	virtual void closeArchiveFile(const Char *filename);
-	virtual void closeAllFiles( void );															///< Close all files associated with ArchiveFiles
-
-	virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE);
-protected:
-
-};
-
-#endif // __WIN32BIGFILESYSTEM_H
\ No newline at end of file
diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32CDManager.h b/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32CDManager.h
index 47ebc6af9cf..fc7502898df 100644
--- a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32CDManager.h
+++ b/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32CDManager.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    Generals
@@ -43,12 +43,8 @@
 
 #pragma once
 
-#ifndef _WIN32DEVICE_COMMON_WIN32CDMANAGER_H_
-#define _WIN32DEVICE_COMMON_WIN32CDMANAGER_H_
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "Common/CDManager.h"
@@ -65,7 +61,7 @@
 //----------------------------------------------------------------------------
 
 //===============================
-// Win32CDDrive 
+// Win32CDDrive
 //===============================
 
 class Win32CDDrive : public CDDrive
@@ -75,7 +71,7 @@ class Win32CDDrive : public CDDrive
 	Win32CDDrive();
 	virtual ~Win32CDDrive();
 
-	virtual void refreshInfo( void );					///< Update drive with least 
+	virtual void refreshInfo( void );					///< Update drive with least
 
 };
 
@@ -102,8 +98,5 @@ class Win32CDManager : public CDManager
 };
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-#endif // _WIN32DEVICE_COMMON_WIN32CDMANAGER_H_
diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h b/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h
index 98e85da26c4..14de394bb47 100644
--- a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h
+++ b/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h
@@ -24,17 +24,14 @@
 
 // FILE: Win32GameEngine.h ////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, April 2001
-// Description: 
-//   Device implementation of the game engine ... this is, of course, the 
-//   highest level of the game that creates the necessary interfaces to the 
+// Description:
+//   Device implementation of the game engine ... this is, of course, the
+//   highest level of the game that creates the necessary interfaces to the
 //   devices we need
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __WIN32GAMEENGINE_H_
-#define __WIN32GAMEENGINE_H_
-
 #include "Common/GameEngine.h"
 #include "GameLogic/GameLogic.h"
 #include "GameNetwork/NetworkInterface.h"
@@ -47,7 +44,6 @@
 #include "W3DDevice/GameClient/W3DWebBrowser.h"
 #include "W3DDevice/Common/W3DFunctionLexicon.h"
 #include "W3DDevice/Common/W3DRadar.h"
-#include "W3DDevice/Common/W3DFunctionLexicon.h"
 #include "W3DDevice/Common/W3DThingFactory.h"
 
 
@@ -64,7 +60,7 @@ class Win32GameEngine : public GameEngine
 	Win32GameEngine();
 	virtual ~Win32GameEngine();
 
-	virtual void init( void );															///< initialization 
+	virtual void init( void );															///< initialization
 	virtual void reset( void );															///< reset engine
 	virtual void update( void );														///< update the game engine
 	virtual void serviceWindowsOS( void );									///< allow windows maintenance in background
@@ -87,7 +83,7 @@ class Win32GameEngine : public GameEngine
 
 protected:
 	UINT m_previousErrorMode;
-};  // end Win32GameEngine
+};
 
 // INLINE -----------------------------------------------------------------------------------------
 inline GameLogic *Win32GameEngine::createGameLogic( void ) { return NEW W3DGameLogic; }
@@ -103,5 +99,3 @@ inline NetworkInterface *Win32GameEngine::createNetwork( void ) { return Network
 inline Radar *Win32GameEngine::createRadar( void ) { return NEW W3DRadar; }
 inline WebBrowser *Win32GameEngine::createWebBrowser( void ) { return NEW CComObject<W3DWebBrowser>; }
 inline AudioManager *Win32GameEngine::createAudioManager( void ) { return NEW MilesAudioManager; }
- 
-#endif  // end __WIN32GAMEENGINE_H_
diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h b/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h
deleted file mode 100644
index 453d0e9cb1e..00000000000
--- a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///// Win32LocalFile.h ///////////////////////////
-// Bryan Cleveland, August 2002
-//////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WIN32LOCALFILE_H
-#define __WIN32LOCALFILE_H
-
-#include "Common/LocalFile.h"
-
-class Win32LocalFile : public LocalFile
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Win32LocalFile, "Win32LocalFile")		
-public:
-	Win32LocalFile();
-	//virtual ~Win32LocalFile();
-
-protected:
-};
-
-#endif // __WIN32LOCALFILE_H
\ No newline at end of file
diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h b/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h
deleted file mode 100644
index 8caf0a48720..00000000000
--- a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///// Win32LocalFileSystem.h //////////////////////////////////
-// Bryan Cleveland, August 2002
-///////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WIN32LOCALFILESYSTEM_H
-#define __WIN32LOCALFILESYSTEM_H
-#include "Common/LocalFileSystem.h"
-
-class Win32LocalFileSystem : public LocalFileSystem
-{
-public:
-	Win32LocalFileSystem();
-	virtual ~Win32LocalFileSystem();
-
-	virtual void init();
-	virtual void reset();
-	virtual void update();
-
-	virtual File * openFile(const Char *filename, Int access = 0);	///< open the given file.
-	virtual Bool doesFileExist(const Char *filename) const;								///< does the given file exist?
-
-	virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.
-	virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const;
-
-	virtual Bool createDirectory(AsciiString directory);
-
-protected:
-};
-
-#endif // __WIN32LOCALFILESYSTEM_H
\ No newline at end of file
diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h
index 20f0ff8ce83..f4641a287b9 100644
--- a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h
+++ b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h
@@ -24,12 +24,12 @@
 
 // FILE: Win32DIKeyboard.h ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __WIN32DIKEYBOARD_H_
-#define __WIN32DIKEYBOARD_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #ifndef DIRECTINPUT_VERSION
 #	define DIRECTINPUT_VERSION	0x800
@@ -95,12 +92,9 @@ class DirectInputKeyboard : public Keyboard
 	// direct input data members
 	LPDIRECTINPUT8 m_pDirectInput;  ///< pointer to direct input interface
 	LPDIRECTINPUTDEVICE8 m_pKeyboardDevice;  ///< pointer to keyboard device
- 
-};  // end class DirectInputKeyboard
+
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __WIN32DIKEYBOARD_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h
index 12774f25c2c..a0c531ff772 100644
--- a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h
+++ b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h
@@ -18,12 +18,12 @@
 
 // FILE: Win32DIMouse.h ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -39,9 +39,6 @@
 
 #pragma once
 
-#ifndef __WIN32DIMOUSE_H_
-#define __WIN32DIMOUSE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #ifndef DIRECTINPUT_VERSION
 #	define DIRECTINPUT_VERSION	0x800
@@ -79,14 +76,14 @@ class DirectInputMouse : public Mouse
 
 	virtual void capture( void );  ///< capture the mouse
 	virtual void releaseCapture( void );  ///< release mouse capture
-		
+
 protected:
 
 	/// device implementation to get mouse event
 	virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush );
 
 	// new internal methods for our direct input implemetation
-	void openMouse( void );  ///< create the direct input mouse 
+	void openMouse( void );  ///< create the direct input mouse
 	void closeMouse( void );  ///< close and release mouse resources
 	/// map direct input mouse data to our own format
 	void mapDirectInputMouse( MouseIO *mouse, DIDEVICEOBJECTDATA *mdat );
@@ -95,11 +92,8 @@ class DirectInputMouse : public Mouse
 	LPDIRECTINPUT8 m_pDirectInput;  ///< pointer to direct input interface
 	LPDIRECTINPUTDEVICE8 m_pMouseDevice;  ///< pointer to mouse device
 
-};  // end class DirectInputMouse
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __WIN32DIMOUSE_H_
-
diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h
index 074b2f529ab..2ba373ba1da 100644
--- a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h
+++ b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h
@@ -24,12 +24,12 @@
 
 // FILE: Win32Mouse.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __WIN32MOUSE_H_
-#define __WIN32MOUSE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -74,17 +71,20 @@ class Win32Mouse : public Mouse
 	virtual void initCursorResources(void);	///< load windows resources needed for 2d cursors.
 
 	virtual void setCursor( MouseCursor cursor );		///< set mouse cursor
-	virtual void capture( void );										///< capture the mouse
-	virtual void releaseCapture( void );						///< release mouse capture
 
 	virtual void setVisibility(Bool visible);
 
+	virtual void loseFocus();
+	virtual void regainFocus();
+
 	/// add an event from a win32 window procedure
 	void addWin32Event( UINT msg, WPARAM wParam, LPARAM lParam, DWORD time );
-	void lostFocus (Bool state) { m_lostFocus = state;}
 
 protected:
 
+	virtual void capture( void ); ///< capture the mouse
+	virtual void releaseCapture( void ); ///< release mouse capture
+
 	/// get the next event available in the buffer
 	virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush );
 
@@ -105,13 +105,10 @@ class Win32Mouse : public Mouse
 															 will come from this index, then it will be
 															 incremented to the next index */
 	MouseCursor m_currentWin32Cursor;	///< keep track of last cursor image sent to D3D.
-	Int m_directionFrame;	///< current frame of directional cursor (frome 0 points up).
-	Bool m_lostFocus;		///< flag if window has lost focues and mouse should stop being updated.	
-};  // end Win32Mouse 
+	Int m_directionFrame;	///< current frame of directional cursor (from 0 points up).
+	Bool m_lostFocus;		///< flag if window has lost focus and mouse should stop being updated.
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __WIN32MOUSE_H_
-
diff --git a/Generals/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp b/Generals/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp
deleted file mode 100644
index 7af59b25938..00000000000
--- a/Generals/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp
+++ /dev/null
@@ -1,3390 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: MilesAudioManager.cpp 
-/*---------------------------------------------------------------------------*/
-/* EA Pacific                                                                */
-/* Confidential Information	                                                 */
-/* Copyright (C) 2001 - All Rights Reserved                                  */
-/* DO NOT DISTRIBUTE                                                         */
-/*---------------------------------------------------------------------------*/
-/* Project:    RTS3                                                          */
-/* File name:  MilesAudioManager.cpp                                         */
-/* Created:    John K. McDonald, Jr., 3/21/2002                              */
-/* Desc:       This is the implementation for the MilesAudioManager, which   */
-/*						 interfaces with the Miles Sound System.                       */
-/* Revision History:                                                         */
-/*		7/18/2002 : Initial creation                                           */
-/*---------------------------------------------------------------------------*/
-
-#include <dsound.h>
-#include "Lib/BaseType.h"
-#include "MilesAudioDevice/MilesAudioManager.h"
-
-#include "Common/AudioAffect.h"
-#include "Common/AudioHandleSpecialValues.h"
-#include "Common/AudioRequest.h"
-#include "Common/AudioSettings.h"
-#include "Common/AsciiString.h"
-#include "Common/AudioEventInfo.h"
-#include "Common/FileSystem.h"
-#include "Common/GameCommon.h"
-#include "Common/GameSounds.h"
-#include "Common/CRCDebug.h"
-#include "Common/GlobalData.h"
-#include "Common/ScopedMutex.h"
-
-#include "GameClient/DebugDisplay.h"
-#include "GameClient/Drawable.h"
-#include "GameClient/GameClient.h"
-#include "GameClient/VideoPlayer.h"
-#include "GameClient/View.h"
-
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/TerrainLogic.h"
-
-#include "Common/file.h"
-
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-enum { INFINITE_LOOP_COUNT = 1000000 };
-
-// Callback functions useful for Miles ////////////////////////////////////////////////////////////
-static void AILCALLBACK setSampleCompleted( HSAMPLE sampleCompleted );
-static void AILCALLBACK set3DSampleCompleted( H3DSAMPLE sample3DCompleted );
-static void AILCALLBACK setStreamCompleted( HSTREAM streamCompleted );
-
-static U32 AILCALLBACK streamingFileOpen(char const *fileName, U32 *file_handle);
-static void AILCALLBACK streamingFileClose(U32 fileHandle);
-static S32 AILCALLBACK streamingFileSeek(U32 fileHandle, S32 offset, U32 type);
-static U32 AILCALLBACK streamingFileRead(U32 fileHandle, void *buffer, U32 bytes);
-
-//-------------------------------------------------------------------------------------------------
-MilesAudioManager::MilesAudioManager() :
-	m_providerCount(0),
-	m_selectedProvider(PROVIDER_ERROR),
-	m_selectedSpeakerType(0),
-	m_lastProvider(PROVIDER_ERROR),
-	m_digitalHandle(NULL),
-	m_num2DSamples(0),
-	m_num3DSamples(0),
-	m_numStreams(0),
-	m_delayFilter(NULL),
-	m_binkHandle(NULL),
-	m_pref3DProvider(AsciiString::TheEmptyString),
-	m_prefSpeaker(AsciiString::TheEmptyString)
-{
-	m_audioCache = NEW AudioFileCache;
-}
-
-//-------------------------------------------------------------------------------------------------
-MilesAudioManager::~MilesAudioManager()
-{
-	DEBUG_ASSERTCRASH(m_binkHandle == NULL, ("Leaked a Bink handle. Chuybregts"));
-	releaseHandleForBink();
-	closeDevice();
-	delete m_audioCache;
-	
-	DEBUG_ASSERTCRASH(this == TheAudio, ("Umm...\n"));
-	TheAudio = NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-AudioHandle MilesAudioManager::addAudioEvent( const AudioEventRTS *eventToAdd )
-{
-	if (TheGlobalData->m_preloadReport) {
-		if (!eventToAdd->getEventName().isEmpty()) {
-			m_allEventsLoaded.insert(eventToAdd->getEventName());
-		}
-	}
-
-	return AudioManager::addAudioEvent(eventToAdd);
-}
-#endif
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::audioDebugDisplay(DebugDisplayInterface *dd, void *, FILE *fp )
-{
-	std::list<PlayingAudio *>::iterator it;
-
-	static char buffer[128] = { 0 };
-	if (buffer[0] == 0) {
-		AIL_MSS_version(buffer, 128);
-	}
-	
-	Coord3D lookPos;
-	TheTacticalView->getPosition( &lookPos );
-	lookPos.z = TheTerrainLogic->getGroundHeight( lookPos.x, lookPos.y );
-	const Coord3D *mikePos = TheAudio->getListenerPosition();
-	Coord3D distanceVector = TheTacticalView->get3DCameraPosition();
-	distanceVector.sub( mikePos );
-
-	Int now = TheGameLogic->getFrame();
-	static Int lastCheck = now;
-	const Int frames = 60;
-	static Int latency = 0;
-	static Int worstLatency = 0;
-	if( lastCheck + frames <= now )
-	{
-		latency = AIL_get_timer_highest_delay();
-		if( latency > worstLatency )
-		{
-			worstLatency = latency;
-		}
-		lastCheck = now;
-	}
-
-	if( dd )
-	{
-		dd->printf("Miles Sound System version: %s    ", buffer);
-		dd->printf("Memory Usage : %d/%d\n", m_audioCache->getCurrentlyUsedSize(), m_audioCache->getMaxSize());
-		dd->printf("Sound: %s    ", (isOn(AudioAffect_Sound) ? "Yes" : "No"));
-		dd->printf("3DSound: %s    ", (isOn(AudioAffect_Sound3D) ? "Yes" : "No"));
-		dd->printf("Speech: %s    ", (isOn(AudioAffect_Speech) ? "Yes" : "No"));
-		dd->printf("Music: %s\n", (isOn(AudioAffect_Music) ? "Yes" : "No"));
-		dd->printf("Channels Available: ");
-		dd->printf("%d Sounds    ", m_sound->getAvailableSamples());
-
-		dd->printf("%d(%d) 3D Sounds\n", m_sound->getAvailable3DSamples(), m_available3DSamples.size() );
-		dd->printf("Volume: ");
-		dd->printf("Sound: %d    ", REAL_TO_INT(m_soundVolume * 100.0f));
-		dd->printf("3DSound: %d    ", REAL_TO_INT(m_sound3DVolume * 100.0f));
-		dd->printf("Speech: %d    ", REAL_TO_INT(m_speechVolume * 100.0f));
-		dd->printf("Music: %d\n", REAL_TO_INT(m_musicVolume * 100.0f));
-		dd->printf("Current 3D Provider: %s    ", 
-			
-		TheAudio->getProviderName(m_selectedProvider).str());
-		dd->printf("Current Speaker Type: %s\n", TheAudio->translateUnsignedIntToSpeakerType(TheAudio->getSpeakerType()).str());
-
-		dd->printf( "Looking at: (%d,%d,%d) -- Microphone at: (%d,%d,%d)\n", 
-				(Int)lookPos.x, (Int)lookPos.y, (Int)lookPos.z, (Int)mikePos->x, (Int)mikePos->y, (Int)mikePos->z );
-		dd->printf( "Camera distance from microphone: %d -- Zoom Volume: %d%%\n", 
-				(Int)distanceVector.length(), (Int)(TheAudio->getZoomVolume()*100.0f) );
-		dd->printf( "Worst latency: %d -- Current latency: %d\n", worstLatency, latency );
-
-		dd->printf("-----------------------------------------------------------\n");
-		dd->printf("Playing Audio\n");
-	}
-	if( fp )
-	{
-		fprintf( fp, "Miles Sound System version: %s    ", buffer );
-		fprintf( fp, "Memory Usage : %d/%d\n", m_audioCache->getCurrentlyUsedSize(), m_audioCache->getMaxSize() );
-		fprintf( fp, "Sound: %s    ", (isOn(AudioAffect_Sound) ? "Yes" : "No") );
-		fprintf( fp, "3DSound: %s    ", (isOn(AudioAffect_Sound3D) ? "Yes" : "No") );
-		fprintf( fp, "Speech: %s    ", (isOn(AudioAffect_Speech) ? "Yes" : "No") );
-		fprintf( fp, "Music: %s\n", (isOn(AudioAffect_Music) ? "Yes" : "No") );
-		fprintf( fp, "Channels Available: " );
-		fprintf( fp, "%d Sounds    ", m_sound->getAvailableSamples() );
-		fprintf( fp, "%d 3D Sounds\n", m_sound->getAvailable3DSamples() );
-		fprintf( fp, "Volume: ");
-		fprintf( fp, "Sound: %d    ", REAL_TO_INT(m_soundVolume * 100.0f) );
-		fprintf( fp, "3DSound: %d    ", REAL_TO_INT(m_sound3DVolume * 100.0f) );
-		fprintf( fp, "Speech: %d    ", REAL_TO_INT(m_speechVolume * 100.0f) );
-		fprintf( fp, "Music: %d\n", REAL_TO_INT(m_musicVolume * 100.0f) );
-		fprintf( fp, "Current 3D Provider: %s    ", TheAudio->getProviderName(m_selectedProvider).str());
-		fprintf( fp, "Current Speaker Type: %s\n", TheAudio->translateUnsignedIntToSpeakerType(TheAudio->getSpeakerType()).str());
-
-		fprintf( fp, "Looking at: (%d,%d,%d) -- Microphone at: (%d,%d,%d)\n", 
-				(Int)lookPos.x, (Int)lookPos.y, (Int)lookPos.z, (Int)mikePos->x, (Int)mikePos->y, (Int)mikePos->z );
-		fprintf( fp, "Camera distance from microphone: %d -- Zoom Volume: %d%%\n", 
-				(Int)distanceVector.length(), (Int)(TheAudio->getZoomVolume()*100.0f) );
-
-		fprintf( fp, "-----------------------------------------------------------\n" );
-		fprintf( fp, "Playing Audio\n" );
-	}
-
-	PlayingAudio *playing = NULL;
-	Int channel;
-	Int channelCount;
-	Real volume = 0.0f;
-	AsciiString filenameNoSlashes;
-
-	const Int maxChannels = 64;
-	PlayingAudio *playingArray[maxChannels] = { NULL };
-
-	// 2-D Sounds
-	if( dd )
-	{
-		dd->printf("-----------------------------------------------------Sounds\n");
-		channelCount = TheAudio->getNum2DSamples();
-		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-			playing = *it;
-			if (!playing) {
-				continue;
-			}
-
-			playingArray[AIL_sample_user_data(playing->m_sample, 0)] = playing;
-		}
-
-		for (Int i = 1; i <= maxChannels && i <= channelCount; ++i) {
-			playing = playingArray[i];
-			if (!playing) {
-				dd->printf("%d: Silence\n", i);
-				continue;
-			}
-
-			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
-			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
-			
-			// Calculate Sample volume
-			volume = 100.0f;
-			volume *= getEffectiveVolume(playing->m_audioEventRTS);
-
-			dd->printf("%2d: %-20s - (%s) Volume: %d (2D)\n", i, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT(volume));
-			playingArray[i] = NULL;
-		}
-	}
-	if( fp )
-	{
-		fprintf( fp, "-----------------------------------------------------Sounds\n" );
-		channelCount = TheAudio->getNum2DSamples();
-		channel = 1;
-		for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it )
-		{
-			playing = *it;
-			if( !playing ) 
-			{
-				continue;
-			}
-			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
-			filenameNoSlashes = filenameNoSlashes.reverseFind( '\\' ) + 1;
-			
-			// Calculate Sample volume
-			volume = 100.0f;
-			volume *= getEffectiveVolume( playing->m_audioEventRTS );
-
-			fprintf( fp, "%2d: %-20s - (%s) Volume: %d (2D)\n", channel++, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT( volume ) );
-		}
-		for( int i = channel; i <= channelCount; ++i ) 
-		{
-			fprintf( fp, "%d: Silence\n", i );
-		}
-	}
-
-	const Coord3D *microphonePos = TheAudio->getListenerPosition();
-
-	// Now 3D Sounds
-	if( dd )
-	{
-		dd->printf("--------------------------------------------------3D Sounds\n");
-		channelCount = TheAudio->getNum3DSamples();
-		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-			playing = *it;
-			if (!playing) {
-				continue;
-			}
-
-			playingArray[AIL_3D_user_data(playing->m_3DSample, 0)] = playing;
-		}
-
-		for (Int i = 1; i <= maxChannels && i <= channelCount; ++i) 
-		{
-			playing = playingArray[i];
-			if (!playing) 
-			{
-				dd->printf("%d: Silence\n", i);
-				continue;
-			}
-
-			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
-			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
-			
-			// Calculate Sample volume
-			volume = 100.0f;
-			volume *= getEffectiveVolume(playing->m_audioEventRTS);
-			Real dist = -1.0f;
-			const Coord3D *pos = playing->m_audioEventRTS->getPosition();
-			char distStr[32];
-			if( pos )
-			{
-				Coord3D vector = *microphonePos;
-				vector.sub( pos );
-				dist = vector.length();
-				sprintf( distStr, "%d", REAL_TO_INT( dist ) );
-			}
-			else
-			{
-				sprintf( distStr, "???" );
-			}
-			char str[32];
-			switch( playing->m_audioEventRTS->getOwnerType() )
-			{
-				case OT_Positional:
-					sprintf( str, "(3D)" );
-					break;
-				case OT_Object:
-					sprintf( str, "(3DObj)" );
-					break;
-				case OT_Drawable:
-					sprintf( str, "(3DDraw)" );
-					break;
-				case OT_Dead:
-					sprintf( str, "(3DDead)" );
-					break;
-
-			}
-
-			dd->printf("%2d: %-20s - (%s) Volume: %d, Dist: %s, %s\n", 
-				i, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT(volume), distStr, str );
-			playingArray[i] = NULL;
-		}
-	}
-	if( fp )
-	{
-		fprintf( fp, "--------------------------------------------------3D Sounds\n" );
-		channelCount = TheAudio->getNum3DSamples();
-		channel = 1;
-		for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) 
-		{
-			playing = *it;
-			if( !playing ) 
-			{
-				continue;
-			}
-			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
-			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
-			
-			// Calculate Sample volume
-			volume = 100.0f;
-			volume *= getEffectiveVolume( playing->m_audioEventRTS );
-			fprintf( fp, "%2d: %-24s - (%s) Volume: %d \n", channel++, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT( volume ) );
-		}
-
-		for( int i = channel; i <= channelCount; ++i ) 
-		{
-			fprintf( fp, "%2d: Silence\n", i );
-		}
-	}
-
-	// Now Streams
-	if( dd )
-	{
-		dd->printf("----------------------------------------------------Streams\n");
-		channelCount = TheAudio->getNumStreams();
-		channel = 1;
-		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-			playing = *it;
-			if (!playing) {
-				continue;
-			}
-			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
-			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
-
-			
-			// Calculate Sample volume
-			volume = 100.0f;
-			volume *= getEffectiveVolume(playing->m_audioEventRTS);
-
-			dd->printf("%2d: %-24s - (%s)  Volume: %d (Stream)\n", channel++, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT(volume));
-		}
-		
-		for ( int i = channel; i <= channelCount; ++i) {
-			dd->printf("%2d: Silence\n", i);
-		}
-		dd->printf("===========================================================\n");
-	}
-	if( fp )
-	{
-		fprintf( fp, "----------------------------------------------------Streams\n" );
-		channelCount = TheAudio->getNumStreams();
-		channel = 1;
-		for( it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it ) 
-		{
-			playing = *it;
-			if( !playing ) 
-			{
-				continue;
-			}
-			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
-			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
-			
-			// Calculate Sample volume
-			volume = 100.0f;
-			volume *= getEffectiveVolume(playing->m_audioEventRTS);
-
-			fprintf( fp, "%2d: %-24s - (%s)  Volume: %d (Stream)\n", channel++, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT( volume ) );
-		}
-		
-		for( int i = channel; i <= channelCount; ++i ) 
-		{
-			fprintf( fp, "%2d: Silence\n", i );
-		}
-		fprintf( fp, "===========================================================\n" );
-	}
-}
-#endif
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::init()
-{
-	AudioManager::init();
-#ifdef INTENSE_DEBUG
-	DEBUG_LOG(("Sound has temporarily been disabled in debug builds only. jkmcd\n"));
-	// for now, RTS_DEBUG builds only should have no sound. ask jkmcd or srj about this.
-	return;
-#endif
-
-	// We should now know how many samples we want to load
-	openDevice();
-	m_audioCache->setMaxSize(getAudioSettings()->m_maxCacheSize);
-
-	// Now, set the file callbacks to load the streams from Biggie files
-	AIL_set_file_callbacks(streamingFileOpen, streamingFileClose, streamingFileSeek, streamingFileRead);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::postProcessLoad()
-{
-	AudioManager::postProcessLoad();
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::reset()
-{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	dumpAllAssetsUsed();
-	m_allEventsLoaded.clear();
-#endif
-
-	AudioManager::reset();
-	stopAllAudioImmediately();
-  removeAllAudioRequests();
-  // This must come after stopAllAudioImmediately() and removeAllAudioRequests(), to ensure that
-  // sounds pointing to the temporary AudioEventInfo handles are deleted before their info is deleted
-  removeLevelSpecificAudioEventInfos();
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::update()
-{
-	AudioManager::update();
-	setDeviceListenerPosition();
-	processRequestList();
-	processPlayingList();
-	processFadingList();
-	processStoppedList();	
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::stopAudio( AudioAffect which )
-{
-	// All we really need to do is:
-	// 1) Remove the EOS callback.
-	// 2) Stop the sample, (so that when we later unload it, bad stuff doesn't happen)
-	// 3) Set the status to stopped, so that when we next process the playing list, we will 
-	//		correctly clean up the sample.
-
-
-	std::list<PlayingAudio *>::iterator it;
-
-	PlayingAudio *playing = NULL;
-	if (BitIsSet(which, AudioAffect_Sound)) {
-		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				AIL_register_EOS_callback(playing->m_sample, NULL);
-				AIL_stop_sample(playing->m_sample);
-				playing->m_status = PS_Stopped;
-			}
-		}
-	}
-
-	if (BitIsSet(which, AudioAffect_Sound3D)) {
-		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				AIL_register_3D_EOS_callback(playing->m_3DSample, NULL);
-				AIL_stop_3D_sample(playing->m_3DSample);
-				playing->m_status = PS_Stopped;
-			}
-		}
-	}
-
-	if (BitIsSet(which, AudioAffect_Speech | AudioAffect_Music)) {
-		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-					if (!BitIsSet(which, AudioAffect_Music)) {
-						continue;
-					}
-				} else {
-					if (!BitIsSet(which, AudioAffect_Speech)) {
-						continue;
-					}
-				}
-				AIL_register_stream_callback(playing->m_stream, NULL);
-				AIL_pause_stream(playing->m_stream, 1);
-				playing->m_status = PS_Stopped;
-			}
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::pauseAudio( AudioAffect which )
-{
-	std::list<PlayingAudio *>::iterator it;
-
-	PlayingAudio *playing = NULL;
-	if (BitIsSet(which, AudioAffect_Sound)) {
-		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				AIL_stop_sample(playing->m_sample);
-			}
-		}
-	}
-
-	if (BitIsSet(which, AudioAffect_Sound3D)) {
-		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				AIL_stop_3D_sample(playing->m_3DSample);
-			}
-		}
-	}
-
-	if (BitIsSet(which, AudioAffect_Speech | AudioAffect_Music)) {
-		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-					if (!BitIsSet(which, AudioAffect_Music)) {
-						continue;
-					}
-				} else {
-					if (!BitIsSet(which, AudioAffect_Speech)) {
-						continue;
-					}
-				}
-
-				AIL_pause_stream(playing->m_stream, 1);
-			}
-		}
-	}
-	
-	//Get rid of PLAY audio requests when pausing audio.
-	std::list<AudioRequest*>::iterator ait;
-	for (ait = m_audioRequests.begin(); ait != m_audioRequests.end(); /* empty */) 
-	{
-		AudioRequest *req = (*ait);
-		if( req && req->m_request == AR_Play ) 
-		{
-			deleteInstance(req);
-			ait = m_audioRequests.erase(ait);
-		}
-		else
-		{
-			ait++;
-		}
-	}
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::resumeAudio( AudioAffect which )
-{
-	std::list<PlayingAudio *>::iterator it;
-
-	PlayingAudio *playing = NULL;
-	if (BitIsSet(which, AudioAffect_Sound)) {
-		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				AIL_resume_sample(playing->m_sample);
-			}
-		}
-	}
-
-	if (BitIsSet(which, AudioAffect_Sound3D)) {
-		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				AIL_resume_3D_sample(playing->m_3DSample);
-			}
-		}
-	}
-
-	if (BitIsSet(which, AudioAffect_Speech | AudioAffect_Music)) {
-		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-					if (!BitIsSet(which, AudioAffect_Music)) {
-						continue;
-					}
-				} else {
-					if (!BitIsSet(which, AudioAffect_Speech)) {
-						continue;
-					}
-				}
-				AIL_pause_stream(playing->m_stream, 0);
-			}
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::pauseAmbient( Bool shouldPause )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::playAudioEvent( AudioEventRTS *event )
-{
-#ifdef INTENSIVE_AUDIO_DEBUG
-	DEBUG_LOG(("MILES (%d) - Processing play request: %d (%s)", TheGameLogic->getFrame(), event->getPlayingHandle(), event->getEventName().str()));
-#endif
-	const AudioEventInfo *info = event->getAudioEventInfo();
-	if (!info) {
-		return;
-	}
-
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing = NULL;
-
-	AudioHandle handleToKill = event->getHandleToKill();
-
-	AsciiString fileToPlay = event->getFilename();
-	PlayingAudio *audio = allocatePlayingAudio();
-	switch(info->m_soundType)
-	{
-		case AT_Music:
-		case AT_Streaming:
-		{
-		#ifdef INTENSIVE_AUDIO_DEBUG
-			DEBUG_LOG(("- Stream\n"));
-		#endif
-			
-			if ((info->m_soundType == AT_Streaming) && event->getUninterruptable()) {
-				stopAllSpeech();
-			}
-
-			Real curVolume = 1.0;
-			if (info->m_soundType == AT_Music) {
-				curVolume = m_musicVolume;
-			} else {
-				curVolume = m_speechVolume;
-			}
-			curVolume *= event->getVolume();
-
-			Bool foundSoundToReplace = false;
-			if (handleToKill) {
-				for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-					playing = (*it);
-					if (!playing) {
-						continue;
-					}
-
-					if (playing->m_audioEventRTS && playing->m_audioEventRTS->getPlayingHandle() == handleToKill) 
-					{
-						//Release this streaming channel immediately because we are going to play another sound in it's place.
-						releasePlayingAudio(playing);
-						m_playingStreams.erase(it);
-						foundSoundToReplace = true;
-						break;
-					}
-				}
-			}
-
-			HSTREAM stream;
-			if (!handleToKill || foundSoundToReplace) {
-				stream = AIL_open_stream(m_digitalHandle, fileToPlay.str(), 0);
-			} else {
-				stream = NULL;
-			}
-
-			// Put this on here, so that the audio event RTS will be cleaned up regardless.
-			audio->m_audioEventRTS = event; 
-			audio->m_stream = stream;
-			audio->m_type = PAT_Stream;
-
-			if (stream) {
-				if ((info->m_soundType == AT_Streaming) && event->getUninterruptable()) {
-					setDisallowSpeech(TRUE);
-	 			}
-				AIL_set_stream_volume_pan(stream, curVolume, 0.5f);
-				playStream(event, stream);
-				m_playingStreams.push_back(audio);
-				audio = NULL;
-			}
-			break;
-		}
-
-		case AT_SoundEffect:
-		{
-		#ifdef INTENSIVE_AUDIO_DEBUG
-			DEBUG_LOG(("- Sound"));
-		#endif
-
-			
-			if (event->isPositionalAudio()) {
-				// Sounds that are non-global are positional 3-D sounds. Deal with them accordingly
-			#ifdef INTENSIVE_AUDIO_DEBUG
-				DEBUG_LOG((" Positional"));
-			#endif
-				Bool foundSoundToReplace = false;
-				if (handleToKill) 
-				{
-					for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-						playing = (*it);
-						if (!playing) {
-							continue;
-						}
-
-						if( playing->m_audioEventRTS && playing->m_audioEventRTS->getPlayingHandle() == handleToKill ) 
-						{
-							//Release this 3D sound channel immediately because we are going to play another sound in it's place.
-							releasePlayingAudio(playing);
-							m_playing3DSounds.erase(it);
-							foundSoundToReplace = true;
-							break;
-						}
-					}
-				}
-				
-				H3DSAMPLE sample3D;
-				if( !handleToKill || foundSoundToReplace )
-				{
-					sample3D = getFirst3DSample( event );
-					if( !sample3D )
-					{
-						//If we don't have an available sample, kill the lowest priority assuming we have one that is lower
-						//than the sound we are trying to add. One possibility for strangeness is when an interrupt sound
-						//that wants to kill a handle to replace it, it's possible that another request already killed it,
-						//in which case we need to attempt to find another sound to kill.
-						if( killLowestPrioritySoundImmediately( event ) )
-						{
-							sample3D = getFirst3DSample( event );
-						}
-					}
-				} 
-				else 
-				{
-					sample3D = NULL;
-				}
-				// Push it onto the list of playing things
-				audio->m_audioEventRTS = event; 
-				audio->m_3DSample = sample3D;
-				audio->m_file = NULL;
-				audio->m_type = PAT_3DSample;
-				m_playing3DSounds.push_back(audio);
-
-				if (sample3D) {
-					audio->m_file = playSample3D(event, sample3D);
-					m_sound->notifyOf3DSampleStart();
-				}
-
-				if( !audio->m_file ) 
-				{
-					m_playing3DSounds.pop_back();
-					#ifdef INTENSIVE_AUDIO_DEBUG
-						DEBUG_LOG((" Killed (no handles available)\n"));
-					#endif
-				} 
-				else 
-				{
-					audio = NULL;
-					#ifdef INTENSIVE_AUDIO_DEBUG
-						DEBUG_LOG((" Playing.\n"));
-					#endif
-				}
-			} 
-			else 
-			{
-				// UI sounds are always 2-D. All other sounds should be Positional
-				// Unit acknowledgement, etc, falls into the UI category of sound.
-				Bool foundSoundToReplace = false;
-				if (handleToKill) {
-					for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-						playing = (*it);
-						if (!playing) {
-							continue;
-						}
-
-						if (playing->m_audioEventRTS && playing->m_audioEventRTS->getPlayingHandle() == handleToKill) 
-						{
-							//Release this 2D sound channel immediately because we are going to play another sound in it's place.
-							releasePlayingAudio(playing);
-							m_playingSounds.erase(it);
-							foundSoundToReplace = true;
-							break;
-						}
-					}
-				}
-
-				HSAMPLE sample;
-				if( !handleToKill || foundSoundToReplace ) 
-				{
-					sample = getFirst2DSample(event);
-					if( !sample )
-					{
-						//If we don't have an available sample, kill the lowest priority assuming we have one that is lower
-						//than the sound we are trying to add. One possibility for strangeness is when an interrupt sound
-						//that wants to kill a handle to replace it, it's possible that another request already killed it,
-						//in which case we need to attempt to find another sound to kill.
-						if( killLowestPrioritySoundImmediately( event ) )
-						{
-							sample = getFirst2DSample( event );
-						}
-					}
-					} 
-				else 
-				{
-					sample = NULL;
-				}
-
-				// Push it onto the list of playing things
-				audio->m_audioEventRTS = event; 
-				audio->m_sample = sample;
-				audio->m_file = NULL;
-				audio->m_type = PAT_Sample;
-				m_playingSounds.push_back(audio);
-
-				if (sample) {
-					audio->m_file = playSample(event, sample);
-					m_sound->notifyOf2DSampleStart();
-				}
-
-				if (!audio->m_file) {
-					#ifdef INTENSIVE_AUDIO_DEBUG
-						DEBUG_LOG((" Killed (no handles available)\n"));
-					#endif
-					m_playingSounds.pop_back();
-				} else {
-					audio = NULL;
-				}
-
-				#ifdef INTENSIVE_AUDIO_DEBUG
-					DEBUG_LOG((" Playing.\n"));
-				#endif
-			}
-			break;
-		}
-	}
-
-	// If we were able to successfully play audio, then we set it to NULL above. (And it will be freed
-	// later. However, if audio is non-NULL at this point, then it must be freed.
-	if (audio) {
-		releasePlayingAudio(audio);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::stopAudioEvent( AudioHandle handle )
-{
-#ifdef INTENSIVE_AUDIO_DEBUG
-	DEBUG_LOG(("MILES (%d) - Processing stop request: %d\n", TheGameLogic->getFrame(), handle));
-#endif
-
-	std::list<PlayingAudio *>::iterator it;
-	if ( handle == AHSV_StopTheMusic || handle == AHSV_StopTheMusicFade ) {
-		// for music, just find the currently playing music stream and kill it.
-		for ( it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it ) {
-			PlayingAudio *audio = (*it);
-			if (!audio) {
-				continue;
-			}
-
-			if( audio->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music ) 
-			{
-				if( handle == AHSV_StopTheMusicFade ) 
-				{
-					m_fadingAudio.push_back(audio);
-				} 
-				else 
-				{
-					//m_stoppedAudio.push_back(audio);
-					releasePlayingAudio( audio );
-				}
-				m_playingStreams.erase(it);
-				break;
-			}
-		}
-	}
-
-	for ( it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it ) {
-		PlayingAudio *audio = (*it);
-		if (!audio) {
-			continue;
-		}
-
-		if (audio->m_audioEventRTS->getPlayingHandle() == handle) {
-			// found it
-			audio->m_requestStop = true;
-			notifyOfAudioCompletion((UnsignedInt)(audio->m_stream), PAT_Stream);
-			break;
-		}
-	}
-
-	for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
-		PlayingAudio *audio = (*it);
-		if (!audio) {
-			continue;
-		}
-
-		if (audio->m_audioEventRTS->getPlayingHandle() == handle) {
-			audio->m_requestStop = true;
-			break;
-		}
-	}
-
-	for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
-		PlayingAudio *audio = (*it);
-		if (!audio) {
-			continue;
-		}
-
-		if (audio->m_audioEventRTS->getPlayingHandle() == handle) {
-		#ifdef INTENSIVE_AUDIO_DEBUG
-			DEBUG_LOG((" (%s)\n", audio->m_audioEventRTS->getEventName()));
-		#endif
-			audio->m_requestStop = true;
-			break;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::killAudioEventImmediately( AudioHandle audioEvent )
-{
-	//First look for it in the request list.
-	std::list<AudioRequest*>::iterator ait;
-	for( ait = m_audioRequests.begin(); ait != m_audioRequests.end(); ait++ ) 
-	{
-		AudioRequest *req = (*ait);
-		if( req && req->m_request == AR_Play && req->m_handleToInteractOn == audioEvent ) 
-		{
-			deleteInstance(req);
-			ait = m_audioRequests.erase(ait);
-			return;
-		}
-	}
-
-	//Look for matching 3D sound to kill
-	std::list<PlayingAudio *>::iterator it;
-	for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); it++ ) 
-	{
-		PlayingAudio *audio = (*it);
-		if( !audio ) 
-		{
-			continue;
-		}
-
-		if( audio->m_audioEventRTS->getPlayingHandle() == audioEvent ) 
-		{
-			releasePlayingAudio( audio );
-			m_playing3DSounds.erase( it );
-			return;
-		}
-	}
-
-	//Look for matching 2D sound to kill
-	for( it = m_playingSounds.begin(); it != m_playingSounds.end(); it++ ) 
-	{
-		PlayingAudio *audio = (*it);
-		if( !audio )
-		{
-			continue;
-		}
-
-		if( audio->m_audioEventRTS->getPlayingHandle() == audioEvent ) 
-		{
-			releasePlayingAudio( audio );
-			m_playingSounds.erase( it );
-			return;
-		}
-	}
-
-	//Look for matching steaming sound to kill
-	for( it = m_playingStreams.begin(); it != m_playingStreams.end(); it++ ) 
-	{
-		PlayingAudio *audio = (*it);
-		if( !audio )
-		{
-			continue;
-		}
-
-		if( audio->m_audioEventRTS->getPlayingHandle() == audioEvent ) 
-		{
-			releasePlayingAudio( audio );
-			m_playingStreams.erase( it );
-			return;
-		}
-	}
-
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::pauseAudioEvent( AudioHandle handle )
-{
-	// pause audio
-}
-
-//-------------------------------------------------------------------------------------------------
-void *MilesAudioManager::loadFileForRead( AudioEventRTS *eventToLoadFrom )
-{
-	return m_audioCache->openFile(eventToLoadFrom);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::closeFile( void *fileRead )
-{
-	m_audioCache->closeFile(fileRead);
-}
-
-
-//-------------------------------------------------------------------------------------------------
-PlayingAudio *MilesAudioManager::allocatePlayingAudio( void )
-{
-	PlayingAudio *aud = NEW PlayingAudio;	// poolify
-	aud->m_status = PS_Playing;
-	return aud;
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::releaseMilesHandles( PlayingAudio *release )
-{
-	switch (release->m_type)
-	{
-		case PAT_Sample:
-		{
-			if (release->m_sample) {
-				AIL_register_EOS_callback(release->m_sample, NULL);
-				AIL_stop_sample(release->m_sample);
-				m_availableSamples.push_back(release->m_sample);
-			}
-			break;
-		}
-		case PAT_3DSample:
-		{
-			if (release->m_3DSample) {
-				AIL_register_3D_EOS_callback(release->m_3DSample, NULL);
-				AIL_stop_3D_sample(release->m_3DSample);
-				m_available3DSamples.push_back(release->m_3DSample);
-			}
-			break;
-		}
-		case PAT_Stream:
-		{
-			if (release->m_stream) {
-				AIL_register_stream_callback(release->m_stream, NULL);
-				AIL_close_stream(release->m_stream);
-			}
-			break;
-		}
-	}
-	release->m_type = PAT_INVALID;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::releasePlayingAudio( PlayingAudio *release )
-{
-	if (release->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_SoundEffect) {
-		if (release->m_type == PAT_Sample) {
-			if (release->m_sample) {
-				m_sound->notifyOf2DSampleCompletion();
-			}
-		} else {
-			if (release->m_3DSample) {
-				m_sound->notifyOf3DSampleCompletion();
-			}
-		}
-	}
-	releaseMilesHandles(release);	// forces stop of this audio
-	closeFile( release->m_file );
-	if (release->m_cleanupAudioEventRTS) {
-		releaseAudioEventRTS(release->m_audioEventRTS);
-	}
-	delete release;
-	release = NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::stopAllAudioImmediately( void )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-
-	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ) {
-		playing = *it;
-		if (!playing) {
-			continue;
-		}
-
-		releasePlayingAudio(playing);
-		it = m_playingSounds.erase(it);
-	}
-
-	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ) {
-		playing = *it;
-		if (!playing) {
-			continue;
-		}
-
-		releasePlayingAudio(playing);
-		it = m_playing3DSounds.erase(it);
-	}
-
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ) {
-		playing = (*it);
-		if (!playing) {
-			continue;
-		}
-
-		releasePlayingAudio(playing);
-		it = m_playingStreams.erase(it);
-	}
-
-  for (it = m_fadingAudio.begin(); it != m_fadingAudio.end(); ) {
-    playing = (*it);
-    if (!playing) {
-      continue;
-    }
-    
-    releasePlayingAudio(playing);
-    it = m_fadingAudio.erase(it);
-  }
-  
-	std::list<HAUDIO>::iterator hit;
-	for (hit = m_audioForcePlayed.begin(); hit != m_audioForcePlayed.end(); ++hit) {
-		if (*hit) {
-			AIL_quick_unload(*hit);
-		}
-	}
-
-	m_audioForcePlayed.clear();
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::freeAllMilesHandles( void )
-{
-	// First, we need to ensure that we don't have any sample handles open. To that end, we must stop
-	// all of our currently playing audio.
-	stopAllAudioImmediately();
-
-	// Walks through the available 2-D and 3-D handles and releases them
-	std::list<HSAMPLE>::iterator it;
-	for ( it = m_availableSamples.begin(); it != m_availableSamples.end(); /* empty */ ) {
-		HSAMPLE sample = *it;
-		AIL_release_sample_handle(sample);
-		it = m_availableSamples.erase(it);
-	}
-	m_num2DSamples = 0;
-	
-	std::list<H3DSAMPLE>::iterator it3D;
-	for ( it3D = m_available3DSamples.begin(); it3D != m_available3DSamples.end(); /* empty */ ) {
-		H3DSAMPLE sample3D = *it3D;
-		AIL_release_3D_sample_handle(sample3D);
-		it3D = m_available3DSamples.erase(it3D);
-	}
-	m_num3DSamples = 0;
-	m_numStreams = 0;
-}
-
-//-------------------------------------------------------------------------------------------------
-HSAMPLE MilesAudioManager::getFirst2DSample( AudioEventRTS *event )
-{
-	if (m_availableSamples.begin() != m_availableSamples.end()) {
-		HSAMPLE retSample = *m_availableSamples.begin();
-		m_availableSamples.erase(m_availableSamples.begin());
-		return (retSample);
-	}
-
-	// Find the first sample of lower priority than my augmented priority that is interruptable and take its handle
-
-	return NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-H3DSAMPLE MilesAudioManager::getFirst3DSample( AudioEventRTS *event )
-{
-	if (m_available3DSamples.begin() != m_available3DSamples.end()) {
-		H3DSAMPLE retSample = *m_available3DSamples.begin();
-		m_available3DSamples.erase(m_available3DSamples.begin());
-		return (retSample);
-	}
-
-	// Find the first sample of lower priority than my augmented priority that is interruptable and take its handle
-	return NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::adjustPlayingVolume( PlayingAudio *audio )
-{
-	Real desiredVolume = audio->m_audioEventRTS->getVolume() * audio->m_audioEventRTS->getVolumeShift();
-	Real pan;
-	if (audio->m_type == PAT_Sample) {
-		AIL_sample_volume_pan(audio->m_sample, NULL, &pan);
-		AIL_set_sample_volume_pan(audio->m_sample, m_soundVolume * desiredVolume, pan);
-
-	} else if (audio->m_type == PAT_3DSample) { 
-		AIL_set_3D_sample_volume(audio->m_3DSample, m_sound3DVolume * desiredVolume);
-
-	} else if (audio->m_type == PAT_Stream) {
-		AIL_stream_volume_pan(audio->m_stream, NULL, &pan);
-		if (audio->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music ) {
-			AIL_set_stream_volume_pan(audio->m_stream, m_musicVolume * desiredVolume, pan);
-			
-		} else {
-			AIL_set_stream_volume_pan(audio->m_stream, m_speechVolume * desiredVolume, pan);
-			
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::stopAllSpeech( void )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ) {
-		playing = (*it);
-		if (!playing) {
-			continue;
-		}
-
-		if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Streaming) {
-			releasePlayingAudio(playing);
-			it = m_playingStreams.erase(it);
-		} else {
-			++it;
-		}
-	}
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::initFilters( HSAMPLE sample, const AudioEventRTS *event )
-{
-	// set the sample volume
-	Real volume = event->getVolume() * event->getVolumeShift() * m_soundVolume;
-	AIL_set_sample_volume_pan(sample, volume, 0.5f);
-
-	// pitch shift
-	Real pitchShift = event->getPitchShift();
-	if (pitchShift == 0.0f) {
-		DEBUG_CRASH(("Invalid Pitch shift in sound: '%s'", event->getEventName().str()) );
-	} else {
-		AIL_set_sample_playback_rate(sample, REAL_TO_INT(AIL_sample_playback_rate(sample) * pitchShift));
-	}
-
-	// set up delay filter, if applicable
-	if (event->getDelay() > 0.0f) {
-		Real value;
-		value = event->getDelay();
-		AIL_set_sample_processor(sample, DP_FILTER, m_delayFilter);
-		AIL_set_filter_sample_preference(sample, "Mono Delay Time", &value);
-
-		value = 0.0;
-		AIL_set_filter_sample_preference(sample, "Mono Delay", &value);
-		AIL_set_filter_sample_preference(sample, "Mono Delay Mix", &value);		
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::initFilters3D( H3DSAMPLE sample, const AudioEventRTS *event, const Coord3D *pos )
-{
-	// set the sample volume
-	Real volume = event->getVolume() * event->getVolumeShift() * m_sound3DVolume;
-	AIL_set_3D_sample_volume(sample, volume);
-
-	// pitch shift
-	Real pitchShift = event->getPitchShift();
-	if (pitchShift == 0.0f) {
-		DEBUG_CRASH(("Invalid Pitch shift in sound: '%s'", event->getEventName().str()) );
-	} else {
-		AIL_set_3D_sample_playback_rate(sample, REAL_TO_INT(AIL_3D_sample_playback_rate(sample) * pitchShift));
-	}
-	
-	// Low pass filter
-	if (event->getAudioEventInfo()->m_lowPassFreq > 0 && !isOnScreen(pos) ) {
-		AIL_set_3D_sample_occlusion(sample, 1.0f - event->getAudioEventInfo()->m_lowPassFreq);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::nextMusicTrack( void )
-{
-	AsciiString trackName;
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-			trackName = playing->m_audioEventRTS->getEventName();
-		}
-	}
-
-	// Stop currently playing music
-	TheAudio->removeAudioEvent(AHSV_StopTheMusic);
-
-	trackName = nextTrackName(trackName);
-	AudioEventRTS newTrack(trackName);
-	TheAudio->addAudioEvent(&newTrack);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::prevMusicTrack( void )
-{
-	AsciiString trackName;
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-			trackName = playing->m_audioEventRTS->getEventName();
-		}
-	}
-
-	// Stop currently playing music 
-	TheAudio->removeAudioEvent(AHSV_StopTheMusic);
-
-	trackName = prevTrackName(trackName);
-	AudioEventRTS newTrack(trackName);
-	TheAudio->addAudioEvent(&newTrack);
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isMusicPlaying( void ) const
-{
-	std::list<PlayingAudio *>::const_iterator it;
-	PlayingAudio *playing;
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const
-{
-	std::list<PlayingAudio *>::const_iterator it;
-	PlayingAudio *playing;
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-			if (playing->m_audioEventRTS->getEventName() == trackName) {
-				if (INFINITE_LOOP_COUNT - AIL_stream_loop_count(playing->m_stream) >= numberOfTimes) {
-					return TRUE;
-				}
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString MilesAudioManager::getMusicTrackName( void ) const
-{
-	// First check the requests. If there's one there, then report that as the currently playing track.
-	std::list<AudioRequest *>::const_iterator ait;
-	for (ait = m_audioRequests.begin(); ait != m_audioRequests.end(); ++ait) {
-		if ((*ait)->m_request != AR_Play) {
-			continue;
-		}
-
-		if (!(*ait)->m_usePendingEvent) {
-			continue;
-		}
-
-		if ((*ait)->m_pendingEvent->getAudioEventInfo()->m_soundType == AT_Music) {
-			return (*ait)->m_pendingEvent->getEventName();
-		}
-	}
-
-	std::list<PlayingAudio *>::const_iterator it;
-	PlayingAudio *playing;
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-			return playing->m_audioEventRTS->getEventName();
-		}
-	}
-
-	return AsciiString::TheEmptyString;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::openDevice( void )
-{
-	if (!TheGlobalData->m_audioOn) {
-		return;
-	}
-	
-	AIL_set_redist_directory("MSS\\");
-	AIL_startup();
-	Int retval = 0;
-
-	// AIL_quick_startup should be replaced later with a call to actually pick which device to use, etc
-	const AudioSettings *audioSettings = getAudioSettings();
-	m_selectedSpeakerType = TheAudio->translateSpeakerTypeToUnsignedInt(m_prefSpeaker);
-
-	retval = AIL_quick_startup(audioSettings->m_useDigital, audioSettings->m_useMidi, audioSettings->m_outputRate, audioSettings->m_outputBits, audioSettings->m_outputChannels);
-	
-	// Quick handles tells us where to store the various devices. For now, we're only interested in the digital handle.
-	AIL_quick_handles(&m_digitalHandle, NULL, NULL);
-	
-	if (retval) {
-		buildProviderList();
-	} else {
-		// if we couldn't initialize any devices, turn sound off (fail silently)
-		setOn( false, AudioAffect_All );
-	}
-
-	selectProvider(TheAudio->getProviderIndex(m_pref3DProvider));
-
-	// Now that we're all done, update the cached variables so that everything is in sync.
-	TheAudio->refreshCachedVariables();
-
-	if (!isValidProvider()) {
-		return;
-	}
-
-	initDelayFilter();
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::closeDevice( void )
-{
-	freeAllMilesHandles();
-	unselectProvider();
-	AIL_shutdown();
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isCurrentlyPlaying( AudioHandle handle )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-
-	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getPlayingHandle() == handle) {
-			return true;
-		}
-	}
-
-	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getPlayingHandle() == handle) {
-			return true;
-		}
-	}
-
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getPlayingHandle() == handle) {
-			return true;
-		}
-	}
-
-	// if something is requested, it is also considered playing
-	std::list<AudioRequest *>::iterator ait;
-	AudioRequest *req = NULL;
-	for (ait = m_audioRequests.begin(); ait != m_audioRequests.end(); ++ait) {
-		req = *ait;
-		if (req && req->m_usePendingEvent && req->m_pendingEvent->getPlayingHandle() == handle) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags )
-{
-	PlayingAudio *playing = findPlayingAudioFrom(audioCompleted, flags);
-	if (!playing) {
-		DEBUG_CRASH(("Audio has completed playing, but we can't seem to find it. - jkmcd"));
-		return;
-	}
-	
-	if (getDisallowSpeech() && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Streaming) {
-		setDisallowSpeech(FALSE);
-	}
-
-	if (playing->m_audioEventRTS->getAudioEventInfo()->m_control & AC_LOOP) {
-		if (playing->m_audioEventRTS->getNextPlayPortion() == PP_Attack) {
-			playing->m_audioEventRTS->setNextPlayPortion(PP_Sound);
-		}
-		if (playing->m_audioEventRTS->getNextPlayPortion() == PP_Sound) {
-			// First, decrease the loop count.
-			playing->m_audioEventRTS->decreaseLoopCount();
-
-			// Now, try to start the next loop
-			if (startNextLoop(playing)) {
-				return;
-			}
-		}
-	}
-
-	playing->m_audioEventRTS->advanceNextPlayPortion();
-	if (playing->m_audioEventRTS->getNextPlayPortion() != PP_Done) {
-		if (playing->m_type == PAT_Sample) {
-			closeFile(playing->m_file);	// close it so as not to leak it.
-			playing->m_file = playSample(playing->m_audioEventRTS, playing->m_sample);
-			
-			// If we don't have a file now, then we should drop to the stopped status so that 
-			// We correctly close this handle.
-			if (playing->m_file) {
-				return;
-			}
-		} else if (playing->m_type == PAT_3DSample) {
-			closeFile(playing->m_file);	// close it so as not to leak it.
-			playing->m_file = playSample3D(playing->m_audioEventRTS, playing->m_3DSample);
-
-			// If we don't have a file now, then we should drop to the stopped status so that 
-			// We correctly close this handle.
-			if (playing->m_file) {
-				return;
-			}
-		} 
-	}
-
-	if (playing->m_type == PAT_Stream) {
-		if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-			playStream(playing->m_audioEventRTS, playing->m_stream);
-			
-			return;
-		}
-	}
-
-	playing->m_status = PS_Stopped;	// it will be cleaned up on the next frame update
-}
-
-//-------------------------------------------------------------------------------------------------
-PlayingAudio *MilesAudioManager::findPlayingAudioFrom( UnsignedInt audioCompleted, UnsignedInt flags )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-
-	if (flags == PAT_Sample) {
-		HSAMPLE sample = (HSAMPLE) audioCompleted;
-		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-			playing = *it;
-			if (playing && playing->m_sample == sample) {
-				return playing;
-			}
-		}
-	}
-
-	if (flags == PAT_3DSample) {
-		H3DSAMPLE sample3D = (H3DSAMPLE) audioCompleted;
-		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-			playing = *it;
-			if (playing && playing->m_3DSample == sample3D) {
-				return playing;
-			}
-		}
-	}
-
-	if (flags == PAT_Stream) {
-		HSTREAM stream = (HSTREAM) audioCompleted;
-		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-			playing = *it;
-			if (playing && playing->m_stream == stream) {
-				return playing;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getProviderCount( void ) const
-{
-	return m_providerCount;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString MilesAudioManager::getProviderName( UnsignedInt providerNum ) const
-{
-	if (isOn(AudioAffect_Sound3D) && providerNum < m_providerCount) {
-		return m_provider3D[providerNum].name;
-	}
-
-	return AsciiString::TheEmptyString;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getProviderIndex( AsciiString providerName ) const
-{
-	for (UnsignedInt i = 0; i < m_providerCount; ++i) {
-		if (providerName == m_provider3D[i].name) {
-			return i;
-		}
-	}
-
-	return PROVIDER_ERROR;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::selectProvider( UnsignedInt providerNdx )
-{
-	if (!isOn(AudioAffect_Sound3D)) 
-	{
-		return;
-	}
-
-	if (providerNdx == m_selectedProvider) 
-	{
-		return;
-	}
-
-	if (isValidProvider()) 
-	{
-		freeAllMilesHandles();
-		unselectProvider();
-	}
-
-	LPDIRECTSOUND lpDirectSoundInfo;
-	AIL_get_DirectSound_info( NULL, (void**)&lpDirectSoundInfo, NULL );
-	Bool useDolby = FALSE;
-	if( lpDirectSoundInfo )
-	{
-		DWORD speakerConfig;
-		lpDirectSoundInfo->GetSpeakerConfig( &speakerConfig );
-		switch( DSSPEAKER_CONFIG( speakerConfig ) )
-		{
-			case DSSPEAKER_DIRECTOUT:
-				m_selectedSpeakerType = AIL_3D_2_SPEAKER;
-				break;
-			case DSSPEAKER_MONO:     
-				m_selectedSpeakerType = AIL_3D_2_SPEAKER;
-				break;
-			case DSSPEAKER_STEREO:   
-				m_selectedSpeakerType = AIL_3D_2_SPEAKER;
-				break;
-			case DSSPEAKER_HEADPHONE:
-				m_selectedSpeakerType = AIL_3D_HEADPHONE;
-				useDolby = TRUE;
-				break;
-			case DSSPEAKER_QUAD:     
-				m_selectedSpeakerType = AIL_3D_4_SPEAKER;
-				useDolby = TRUE;
-				break;
-			case DSSPEAKER_SURROUND:
-				m_selectedSpeakerType = AIL_3D_SURROUND;
-				useDolby = TRUE;
-				break;
-			case DSSPEAKER_5POINT1:  
-				m_selectedSpeakerType = AIL_3D_51_SPEAKER;
-				useDolby = TRUE;
-				break;
-			case DSSPEAKER_7POINT1:  
-				m_selectedSpeakerType = AIL_3D_71_SPEAKER;
-				useDolby = TRUE;
-				break;
-		}
-	}
-
-	Bool success = FALSE;
-	if( useDolby )
-	{
-		providerNdx = getProviderIndex( "Dolby Surround" );
-	}
-	else
-	{
-		providerNdx = getProviderIndex( "Miles Fast 2D Positional Audio" );
-	}
-	success = AIL_open_3D_provider( m_provider3D[providerNdx].id ) == 0;
-
-	//if (providerNdx < m_providerCount) 
-	//{
-	//	failed = AIL_open_3D_provider(m_provider3D[providerNdx].id);
-	//}
-
-
-
-	if( !success ) 
-	{
-		m_selectedProvider = PROVIDER_ERROR;
-		// try to select a failsafe
-		providerNdx = getProviderIndex( "Miles Fast 2D Positional Audio" );
-		success = AIL_open_3D_provider( m_provider3D[providerNdx].id ) == 0;
-	} 
-
-	if ( success )
-	{
-		m_selectedProvider = providerNdx;
-	
-		initSamplePools();
-		
-		createListener();
-		setSpeakerType(m_selectedSpeakerType);
-		if (TheVideoPlayer) 
-		{
-			TheVideoPlayer->notifyVideoPlayerOfNewProvider(TRUE);
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::unselectProvider( void )
-{
-	if (!(isOn(AudioAffect_Sound3D) && isValidProvider())) {
-		return;
-	}
-
-	if (TheVideoPlayer) {
-		TheVideoPlayer->notifyVideoPlayerOfNewProvider(FALSE);
-	}
-	AIL_close_3D_listener(m_listener);
-	m_listener = NULL;
-
-	AIL_close_3D_provider(m_provider3D[m_selectedProvider].id);
-	m_lastProvider = m_selectedProvider;
-
-	m_selectedProvider = PROVIDER_ERROR;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getSelectedProvider( void ) const
-{
-	return m_selectedProvider;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::setSpeakerType( UnsignedInt speakerType )
-{
-	if (!isValidProvider()) {
-		return;
-	}
-	
-	AIL_set_3D_speaker_type( m_provider3D[m_selectedProvider].id, speakerType );
-	m_selectedSpeakerType = speakerType;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getSpeakerType( void )
-{
-	if (!isValidProvider()) {
-		return 0;
-	}
-
-	return m_selectedSpeakerType;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getNum2DSamples( void ) const
-{
-	return m_num2DSamples;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getNum3DSamples( void ) const
-{
-	return m_num3DSamples;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getNumStreams( void ) const
-{
-	return m_numStreams;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::doesViolateLimit( AudioEventRTS *event ) const
-{
-	Int limit = event->getAudioEventInfo()->m_limit;
-	if (limit == 0) {
-		return false;
-	}
-
-	Int totalCount = 0;
-	Int totalRequestCount = 0;
-
-	std::list<PlayingAudio *>::const_iterator it;
-	if (!event->isPositionalAudio()) {
-		// 2-D
-		for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
-			if ((*it)->m_audioEventRTS->getEventName() == event->getEventName()) {
-				if (totalCount == 0) {
-					// This is the oldest audio of this type playing.
-					event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
-				}
-				++totalCount;
-			}
-		}
-	} else {
-		// 3-D
-		for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
-			if ((*it)->m_audioEventRTS->getEventName() == event->getEventName()) {
-				if (totalCount == 0) {
-					// This is the oldest audio of this type playing.
-					event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
-				}
-				++totalCount;
-			}
-		}
-	}
-	
-	// Also check the request list in case we've requested to play this sound.
-	std::list<AudioRequest*>::const_iterator arIt;
-	for (arIt = m_audioRequests.begin(); arIt != m_audioRequests.end(); ++arIt) {
-		AudioRequest *req = (*arIt);
-		if (req == NULL) {
-			continue;
-		}
-		if( req->m_usePendingEvent ) 
-		{
-			if( req->m_pendingEvent->getEventName() == event->getEventName() ) 
-			{
-				totalRequestCount++;
-				totalCount++;
-			}
-		}
-	}
-
-	//If our event is an interrupting type, then normally we would always add it. The exception is when we have requested
-	//multiple sounds in the same frame and those requests violate the limit. Because we don't have any "old" sounds to
-	//remove in the case of an interrupt, we need to catch it early and prevent the sound from being added if we already
-	//reached the limit
-	if( event->getAudioEventInfo()->m_control & AC_INTERRUPT )
-	{
-		if( totalRequestCount < limit )
-		{
-			Int totalPlayingCount = totalCount - totalRequestCount;
-			if( totalRequestCount + totalPlayingCount < limit )
-			{
-				//We aren't exceeding the actual limit, then clear the kill handle.
-				event->setHandleToKill(0);
-				return false;
-			}
-
-			//We are exceeding the limit - the kill handle will kill the
-			//oldest playing sound to enforce the actual limit.
-			return false;
-		}
-	}
-
-	if( totalCount < limit ) 
-	{
-		event->setHandleToKill(0);
-		return false;
-	}
-
-	return true;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isPlayingAlready( AudioEventRTS *event ) const
-{
-	std::list<PlayingAudio *>::const_iterator it;
-	if (!event->isPositionalAudio()) {
-		// 2-D
-		for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
-			if ((*it)->m_audioEventRTS->getEventName() == event->getEventName()) {
-				return true;
-			}
-		}
-	} else {
-		// 3-D
-		for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
-			if ((*it)->m_audioEventRTS->getEventName() == event->getEventName()) {
-				return true;
-			}
-		}
-	}
-
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isObjectPlayingVoice( UnsignedInt objID ) const
-{
-	if (objID == 0) {
-		return false;
-	}
-
-	std::list<PlayingAudio *>::const_iterator it;
-		// 2-D
-	for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
-		if ((*it)->m_audioEventRTS->getObjectID() == objID && (*it)->m_audioEventRTS->getAudioEventInfo()->m_type & ST_VOICE) {
-			return true;
-		}
-	}
-
-	// 3-D
-	for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
-		if ((*it)->m_audioEventRTS->getObjectID() == objID && (*it)->m_audioEventRTS->getAudioEventInfo()->m_type & ST_VOICE) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS* MilesAudioManager::findLowestPrioritySound( AudioEventRTS *event )
-{
-	AudioPriority priority = event->getAudioEventInfo()->m_priority;
-	if( priority == AP_LOWEST )
-	{
-		//If the event we pass in is the lowest priority, don't bother checking because
-		//there is nothing lower priority than lowest.
-		return NULL;
-	}
-	AudioEventRTS *lowestPriorityEvent = NULL;
-	AudioPriority lowestPriority;
-
-	std::list<PlayingAudio *>::const_iterator it;
-	if( event->isPositionalAudio() ) 
-	{
-		//3D
-		for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) 
-		{
-			AudioEventRTS *itEvent = (*it)->m_audioEventRTS;
-			AudioPriority itPriority = itEvent->getAudioEventInfo()->m_priority;
-			if( itPriority < priority ) 
-			{
-				if( !lowestPriorityEvent || lowestPriority > itPriority )
-				{
-					lowestPriorityEvent = itEvent;
-					lowestPriority = itPriority;
-					if( lowestPriority == AP_LOWEST )
-					{
-						return lowestPriorityEvent;
-					}
-				}
-			}
-		}
-	} 
-	else 
-	{
-		//2D
-		for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) 
-		{
-			AudioEventRTS *itEvent = (*it)->m_audioEventRTS;
-			AudioPriority itPriority = itEvent->getAudioEventInfo()->m_priority;
-			if( itPriority < priority ) 
-			{
-				if( !lowestPriorityEvent || lowestPriority > itPriority )
-				{
-					lowestPriorityEvent = itEvent;
-					lowestPriority = itPriority;
-					if( lowestPriority == AP_LOWEST )
-					{
-						return lowestPriorityEvent;
-					}
-				}
-			}
-		}
-	}
-	return lowestPriorityEvent;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isPlayingLowerPriority( AudioEventRTS *event ) const
-{
-	//We don't actually want to do anything to this CONST function. Remember, we're
-	//just checking to see if there is a lower priority sound.
-	AudioPriority priority = event->getAudioEventInfo()->m_priority;
-	if( priority == AP_LOWEST )
-	{
-		//If the event we pass in is the lowest priority, don't bother checking because
-		//there is nothing lower priority than lowest.
-		return false;
-	}
-	std::list<PlayingAudio *>::const_iterator it;
-	if (!event->isPositionalAudio()) {
-		// 2-D
-		for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
-			if ((*it)->m_audioEventRTS->getAudioEventInfo()->m_priority < priority) {
-				//event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
-				return true;
-			}
-		}
-	} else {
-		// 3-D
-		for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
-			if ((*it)->m_audioEventRTS->getAudioEventInfo()->m_priority < priority) {
-				//event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
-				return true;
-			}
-		}
-	}
-
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::killLowestPrioritySoundImmediately( AudioEventRTS *event )
-{
-	//Actually, we want to kill the LOWEST PRIORITY SOUND, not the first "lower" priority
-	//sound we find, because it could easily be 
-	AudioEventRTS *lowestPriorityEvent = findLowestPrioritySound( event );
-	if( lowestPriorityEvent )
-	{
-		std::list<PlayingAudio *>::iterator it;
-		if( event->isPositionalAudio() )
-		{
-			for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) 
-			{
-				PlayingAudio *playing = (*it);
-				if( !playing ) 
-				{
-					continue;
-				}
-
-				if( playing->m_audioEventRTS && playing->m_audioEventRTS == lowestPriorityEvent ) 
-				{
-					//Release this 3D sound channel immediately because we are going to play another sound in it's place.
-					releasePlayingAudio( playing );
-					m_playing3DSounds.erase( it );
-					return TRUE;
-				}
-			}
-		}
-		else
-		{
-			for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) 
-			{
-				PlayingAudio *playing = (*it);
-				if( !playing ) 
-				{
-					continue;
-				}
-
-				if( playing->m_audioEventRTS && playing->m_audioEventRTS == lowestPriorityEvent ) 
-				{
-					//Release this sound channel immediately because we are going to play another sound in it's place.
-					releasePlayingAudio( playing );
-					m_playingSounds.erase( it );
-					return TRUE;
-				}
-			}
-		}
-	}
-	return FALSE;
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume)
-{
-	Real pan;
-	std::list<PlayingAudio *>::iterator it;
-
-	PlayingAudio *playing = NULL;
-	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getEventName() == eventName) {
-			// Adjust it
-			playing->m_audioEventRTS->setVolume(newVolume);
-			Real desiredVolume = playing->m_audioEventRTS->getVolume() * playing->m_audioEventRTS->getVolumeShift();
-			AIL_sample_volume_pan(playing->m_sample, NULL, &pan);
-			AIL_set_sample_volume_pan(playing->m_sample, desiredVolume, pan);
-		}
-	}
-
-	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getEventName() == eventName) {
-			// Adjust it
-			playing->m_audioEventRTS->setVolume(newVolume);
-			Real desiredVolume = playing->m_audioEventRTS->getVolume() * playing->m_audioEventRTS->getVolumeShift();
-			AIL_set_3D_sample_volume(playing->m_3DSample, desiredVolume);
-		}
-	}
-
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getEventName() == eventName) {
-			// Adjust it
-			playing->m_audioEventRTS->setVolume(newVolume);
-			Real desiredVolume = playing->m_audioEventRTS->getVolume() * playing->m_audioEventRTS->getVolumeShift();
-			AIL_stream_volume_pan(playing->m_stream, NULL, &pan);
-			AIL_set_stream_volume_pan(playing->m_stream, desiredVolume, pan);
-		}
-	}
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::removePlayingAudio( AsciiString eventName )
-{
-	std::list<PlayingAudio *>::iterator it;
-
-	PlayingAudio *playing = NULL;
-	for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ) 
-	{
-		playing = *it;
-		if( playing && playing->m_audioEventRTS->getEventName() == eventName ) 
-		{
-			releasePlayingAudio( playing );
-			it = m_playingSounds.erase(it);
-		}
-		else
-		{
-			it++;
-		}
-	}
-
-	for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ) 
-	{
-		playing = *it;
-		if( playing && playing->m_audioEventRTS->getEventName() == eventName ) 
-		{
-			releasePlayingAudio( playing );
-			it = m_playing3DSounds.erase(it);
-		}
-		else
-		{
-			it++;
-		}
-	}
-
-	for( it = m_playingStreams.begin(); it != m_playingStreams.end(); ) 
-	{
-		playing = *it;
-		if( playing && playing->m_audioEventRTS->getEventName() == eventName ) 
-		{
-			releasePlayingAudio( playing );
-			it = m_playingStreams.erase(it);
-		}
-		else
-		{
-			it++;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::removeAllDisabledAudio()
-{
-	std::list<PlayingAudio *>::iterator it;
-
-	PlayingAudio *playing = NULL;
-	for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ) 
-	{
-		playing = *it;
-		if( playing && playing->m_audioEventRTS->getVolume() == 0.0f ) 
-		{
-			releasePlayingAudio( playing );
-			it = m_playingSounds.erase(it);
-		}
-		else
-		{
-			it++;
-		}
-	}
-
-	for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ) 
-	{
-		playing = *it;
-		if( playing && playing->m_audioEventRTS->getVolume() == 0.0f ) 
-		{
-			releasePlayingAudio( playing );
-			it = m_playing3DSounds.erase(it);
-		}
-		else
-		{
-			it++;
-		}
-	}
-
-	for( it = m_playingStreams.begin(); it != m_playingStreams.end(); ) 
-	{
-		playing = *it;
-		if( playing && playing->m_audioEventRTS->getVolume() == 0.0f ) 
-		{
-			releasePlayingAudio( playing );
-			it = m_playingStreams.erase(it);
-		}
-		else
-		{
-			it++;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::processRequestList( void )
-{
-	std::list<AudioRequest*>::iterator it;
-	for (it = m_audioRequests.begin(); it != m_audioRequests.end(); /* empty */) {
-		AudioRequest *req = (*it);
-		if (req == NULL) {
-			continue;
-		}
-
-		if (!shouldProcessRequestThisFrame(req)) {
-			adjustRequest(req);
-			++it;
-			continue;
-		}
-
-		if (!req->m_requiresCheckForSample || checkForSample(req)) {
-			processRequest(req);
-		}
-		deleteInstance(req);
-		it = m_audioRequests.erase(it);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::processPlayingList( void )
-{
-	// There are two types of processing we have to do here. 
-	// 1. Move the item to the stopped list if it has become stopped.
-	// 2. Update the position of the audio if it is positional
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-
-	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); /* empty */) {
-		playing = (*it);
-		if (!playing) 
-		{
-			it = m_playingSounds.erase(it);
-			continue;
-		}
-
-		if (playing->m_status == PS_Stopped) 
-		{
-			//m_stoppedAudio.push_back(playing);
-			releasePlayingAudio( playing );
-			it = m_playingSounds.erase(it);
-		} 
-		else 
-		{
-			if (m_volumeHasChanged) 
-			{
-				adjustPlayingVolume(playing);
-			}
-			++it;
-		}
-	}
-
-	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ) 
-	{
-		playing = (*it);
-		if (!playing) 
-		{
-			it = m_playing3DSounds.erase(it);
-			continue;
-		}
-
-		if (playing->m_status == PS_Stopped) 
-		{
-			//m_stoppedAudio.push_back(playing);			
-			releasePlayingAudio( playing );
-			it = m_playing3DSounds.erase(it);
-		} 
-		else 
-		{
-			if (m_volumeHasChanged) 
-			{
-				adjustPlayingVolume(playing);
-			}
-
-			const Coord3D *pos = getCurrentPositionFromEvent(playing->m_audioEventRTS);
-			if (pos) 
-			{
-				if( playing->m_audioEventRTS->isDead() )
-				{
-					stopAudioEvent( playing->m_audioEventRTS->getPlayingHandle() );
-					it++;
-					continue;
-				}
-				else
-				{
-					Real volForConsideration = getEffectiveVolume(playing->m_audioEventRTS);
-					volForConsideration /= (m_sound3DVolume > 0.0f ? m_soundVolume : 1.0f);
-					Bool playAnyways = BitIsSet( playing->m_audioEventRTS->getAudioEventInfo()->m_type, ST_GLOBAL) || playing->m_audioEventRTS->getAudioEventInfo()->m_priority == AP_CRITICAL;
-					if( volForConsideration < m_audioSettings->m_minVolume && !playAnyways ) 
-					{
-						// don't want to get an additional callback for this sample
-						AIL_register_3D_EOS_callback(playing->m_3DSample, NULL);
-						//m_stoppedAudio.push_back(playing);
-						releasePlayingAudio( playing );
-						it = m_playing3DSounds.erase(it);
-						continue;
-					} 
-					else 
-					{
-						Real x = pos->x;
-						Real y = pos->y;
-						Real z = pos->z;
-						AIL_set_3D_position( playing->m_3DSample, x, y, z );
-					}
-				}
-			} 
-			else 
-			{
-				AIL_register_3D_EOS_callback(playing->m_3DSample, NULL);
-				//m_stoppedAudio.push_back(playing);
-				releasePlayingAudio( playing );
-				it = m_playing3DSounds.erase(it);
-				continue;
-			}
-
-			++it;
-		}
-	}
-
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ) {
-		playing = (*it);
-		if (!playing) 
-		{
-			it = m_playingStreams.erase(it);
-			continue;
-		}
-
-		if (playing->m_status == PS_Stopped) 
-		{
-			//m_stoppedAudio.push_back(playing);			
-			releasePlayingAudio( playing );
-			it = m_playingStreams.erase(it);
-		} 
-		else 
-		{
-			if (m_volumeHasChanged) 
-			{
-				adjustPlayingVolume(playing);
-			}
-
-			++it;
-		}
-	}
-
-	if (m_volumeHasChanged) {
-		m_volumeHasChanged = false;
-	}
-}
-
-//Patch for a rare bug (only on about 5% of in-studio machines suffer, and not all the time) .
-//The actual mechanics of this problem are still elusive as of the date of this comment. 8/21/03
-//but the cause is clear. Some cinematics do a radical change in the microphone position, which
-//calls for a radical 3DSoundVolume adjustment. If this happens while a stereo stream is *ENDING*,
-//low-level code gets caught in a tight loop. (Hangs) on some machines.
-//To prevent this condition, we just suppress the updating of 3DSoundVolume while one of these
-//is on the list. Since the music tracks play continuously, they never *END* during these cinematics.
-//so we filter them out as, *NOT SENSITIVE*... we do want to update 3DSoundVolume during music, 
-//which is almost all of the time.
-
-Bool MilesAudioManager::has3DSensitiveStreamsPlaying( void ) const
-{
-  if ( m_playingStreams.empty() )
-    return FALSE;
-
-	for ( std::list< PlayingAudio* >::const_iterator it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it ) 
-  {
-		const PlayingAudio *playing = (*it);
-
-    if ( ! playing )
-      continue;
-
-    if ( playing->m_audioEventRTS->getAudioEventInfo()->m_soundType != AT_Music )
-    {
-      return TRUE;
-    }
-
-    if ( playing->m_audioEventRTS->getEventName().startsWith("Game_") == FALSE ) 
-    {
-      return TRUE;
-    }
-  }	
-  
-  return FALSE; 
-
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::processFadingList( void )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-
-	for (it = m_fadingAudio.begin(); it != m_fadingAudio.end(); /* emtpy */) {
-		playing = *it;
-		if (!playing) {
-			continue;
-		}
-		
-		if (playing->m_framesFaded >= getAudioSettings()->m_fadeAudioFrames) {
-			playing->m_status = PS_Stopped;
-			playing->m_requestStop = true;
-			//m_stoppedAudio.push_back(playing);
-			releasePlayingAudio( playing );
-			it = m_fadingAudio.erase(it);
-			continue;
-		}
-
-		++playing->m_framesFaded;
-		Real volume = getEffectiveVolume(playing->m_audioEventRTS);
-		volume *= (1.0f - 1.0f * playing->m_framesFaded / getAudioSettings()->m_fadeAudioFrames);
-
-		switch(playing->m_type)
-		{
-			case PAT_Sample:
-			{
-				AIL_set_sample_volume_pan(playing->m_sample, volume, 0.5f);
-				break;
-			}
-
-			case PAT_3DSample:
-			{
-				AIL_set_3D_sample_volume(playing->m_3DSample, volume);
-				break;
-			}
-			
-			case PAT_Stream:
-			{
-				AIL_set_stream_volume_pan(playing->m_stream, volume, 0.5f);
-				break;
-			}
-			
-		}
-		
-		++it;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::processStoppedList( void )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-
-	for (it = m_stoppedAudio.begin(); it != m_stoppedAudio.end(); /* emtpy */) {
-		playing = *it;
-		if (playing) {
-			releasePlayingAudio(playing);
-		}
-		it = m_stoppedAudio.erase(it);
-	}
-}
-
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::shouldProcessRequestThisFrame( AudioRequest *req ) const
-{
-	if (!req->m_usePendingEvent) {
-		return true;
-	}
-
-	if (req->m_pendingEvent->getDelay() < MSEC_PER_LOGICFRAME_REAL) {
-		return true;
-	}
-
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::adjustRequest( AudioRequest *req )
-{
-	if (!req->m_usePendingEvent) {
-		return;
-	}
-
-	req->m_pendingEvent->decrementDelay(MSEC_PER_LOGICFRAME_REAL);
-	req->m_requiresCheckForSample = true;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::checkForSample( AudioRequest *req )
-{
-	if (!req->m_usePendingEvent) {
-		return true;
-	}
-
-  if ( req->m_pendingEvent->getAudioEventInfo() == NULL )
-  {
-    // Fill in event info
-    getInfoForAudioEvent( req->m_pendingEvent );
-  }
-  
-	if (req->m_pendingEvent->getAudioEventInfo()->m_type != AT_SoundEffect) 
-  {
-		return true;
-	}
-
-	return m_sound->canPlayNow(req->m_pendingEvent);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::setHardwareAccelerated(Bool accel)
-{
-	// Extends
-	Bool retEarly = (accel == m_hardwareAccel);
-	AudioManager::setHardwareAccelerated(accel);
-
-	if (retEarly) {
-		return;
-	}
-	
-	if (m_hardwareAccel) {
-		for (Int i = 0; i < MAX_HW_PROVIDERS; ++i) {
-			UnsignedInt providerNdx = TheAudio->getProviderIndex(TheAudio->getAudioSettings()->m_preferred3DProvider[i]);
-			TheAudio->selectProvider(providerNdx);
-			if (getSelectedProvider() == providerNdx) {
-				return;
-			}
-		}
-	}
-
-	// set it false
-	AudioManager::setHardwareAccelerated(FALSE);
-	UnsignedInt providerNdx = TheAudio->getProviderIndex(TheAudio->getAudioSettings()->m_preferred3DProvider[MAX_HW_PROVIDERS]);
-	TheAudio->selectProvider(providerNdx);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::setSpeakerSurround(Bool surround)
-{
-	// Extends
-	Bool retEarly = (surround == m_surroundSpeakers);
-	AudioManager::setSpeakerSurround(surround);
-
-	if (retEarly) {
-		return;
-	}
-
-	UnsignedInt speakerType;
-	if (m_surroundSpeakers) {
-		speakerType = TheAudio->getAudioSettings()->m_defaultSpeakerType3D;
-	} else {
-		speakerType = TheAudio->getAudioSettings()->m_defaultSpeakerType2D;
-	}
-
-	TheAudio->setSpeakerType(speakerType);
-}
-
-//-------------------------------------------------------------------------------------------------
-Real MilesAudioManager::getFileLengthMS( AsciiString strToLoad ) const
-{
-	if (strToLoad.isEmpty()) {
-		return 0.0f;
-	}
-
-	// Load it as a stream to get the file info without actually opening the file.
-	HSTREAM stream = AIL_open_stream(m_digitalHandle, strToLoad.str(), 0);
-	if (!stream) {
-		return 0.0f;
-	}
-
-	long retVal;
-	AIL_stream_ms_position(stream, &retVal, NULL);
-	// Now close the stream
-	AIL_close_stream(stream);
-
-	return INT_TO_REAL(retVal);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::closeAnySamplesUsingFile( const void *fileToClose )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-	
-	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ) {
-		playing = *it;
-		if (!playing) {
-			continue;
-		}
-
-		if (playing->m_file == fileToClose) {
-			releasePlayingAudio(playing);
-			it = m_playingSounds.erase(it);
-		} else {
-			++it;
-		}
-	}
-
-	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ) {
-		playing = *it;
-		if (!playing) {
-			continue;
-		}
-
-		if (playing->m_file == fileToClose) {
-			releasePlayingAudio(playing);
-			it = m_playing3DSounds.erase(it);
-		} else {
-			++it;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::setDeviceListenerPosition( void )
-{
-	if (m_listener) {
-		AIL_set_3D_orientation(m_listener, m_listenerOrientation.x, m_listenerOrientation.y, m_listenerOrientation.z, 0, 0, -1);
-
-		Real x = m_listenerPosition.x;
-		Real y = m_listenerPosition.y;
-		Real z = m_listenerPosition.z;
-		AIL_set_3D_position( m_listener, x, y, z );
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-const Coord3D *MilesAudioManager::getCurrentPositionFromEvent( AudioEventRTS *event )
-{
-	if (!event->isPositionalAudio()) {
-		return NULL;
-	}
-
-	return event->getCurrentPosition();
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isOnScreen( const Coord3D *pos ) const
-{
-	static ICoord2D dummy;
-	// WorldToScreen will return True if the point is onscreen and false if it is offscreen.
-	return TheTacticalView->worldToScreen(pos, &dummy);
-}
-
-//-------------------------------------------------------------------------------------------------
-Real MilesAudioManager::getEffectiveVolume(AudioEventRTS *event) const
-{
-	Real volume = 1.0f;
-	volume *= (event->getVolume() * event->getVolumeShift());
-	if (event->getAudioEventInfo()->m_soundType == AT_Music) 
-	{
-		volume *= m_musicVolume;
-	} 
-	else if (event->getAudioEventInfo()->m_soundType == AT_Streaming) 
-	{
-		volume *= m_speechVolume;
-	} 
-	else 
-	{
-		if (event->isPositionalAudio()) 
-		{
-			volume *= m_sound3DVolume;
-			Coord3D distance = m_listenerPosition;
-			const Coord3D *pos = event->getCurrentPosition();
-			if (pos) 
-			{
-				distance.sub(pos);
-				Real objMinDistance;
-				Real objMaxDistance;
-
-				if (event->getAudioEventInfo()->m_type & ST_GLOBAL) 
-				{
-					objMinDistance = TheAudio->getAudioSettings()->m_globalMinRange;
-					objMaxDistance = TheAudio->getAudioSettings()->m_globalMaxRange;
-				} 
-				else 
-				{
-					objMinDistance = event->getAudioEventInfo()->m_minDistance;
-					objMaxDistance = event->getAudioEventInfo()->m_maxDistance;
-				}
-
-				Real objDistance = distance.length();
-				if( objDistance > objMinDistance ) 
-				{
-					volume *= 1 / (objDistance / objMinDistance);
-				}
-				if( objDistance >= objMaxDistance ) 
-				{
-					volume = 0.0f;
-				}
-				//else if( objDistance > objMinDistance )
-				//{
-				//	volume *= 1.0f - (objDistance - objMinDistance) / (objMaxDistance - objMinDistance);
-				//}
-			}
-		} 
-		else 
-		{
-			volume *= m_soundVolume;
-		}
-	}
-
-	return volume;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::startNextLoop( PlayingAudio *looping )
-{
-	closeFile(looping->m_file);
-	looping->m_file = NULL;
-
-	if (looping->m_requestStop) {
-		return false;
-	}
-
-	if (looping->m_audioEventRTS->hasMoreLoops()) {
-		// generate a new filename, and test to see whether we can play with it now
-		looping->m_audioEventRTS->generateFilename();
-		
-		if (looping->m_audioEventRTS->getDelay() > MSEC_PER_LOGICFRAME_REAL) {
-			// fake it out so that this sound appears done, but also so that it will not
-			// delete the sound on completion (which would suck)
-			looping->m_cleanupAudioEventRTS = false;
-			looping->m_requestStop = true;
-			looping->m_status = PS_Stopped;
-			
-			
-			AudioRequest *req = allocateAudioRequest(true);
-			req->m_pendingEvent = looping->m_audioEventRTS;
-			req->m_requiresCheckForSample = true;
-			appendAudioRequest(req);
-			return true;
-		}
-
-		if (looping->m_type == PAT_3DSample) {
-			looping->m_file = playSample3D(looping->m_audioEventRTS, looping->m_3DSample);
-		} else {
-			looping->m_file = playSample(looping->m_audioEventRTS, looping->m_sample);
-		}
-		
-		return looping->m_file != NULL;
-	} 
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::playStream( AudioEventRTS *event, HSTREAM stream )
-{
-	// Force it to the beginning
-	if (event->getAudioEventInfo()->m_soundType == AT_Music) {
-		AIL_set_stream_loop_count(stream, INFINITE_LOOP_COUNT);
-	}
-
-	AIL_register_stream_callback(stream, setStreamCompleted);
-	AIL_start_stream(stream);
-	if (event->getAudioEventInfo()->m_soundType == AT_Music) {
-		// Need to stop/fade out the old music here.
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void *MilesAudioManager::playSample( AudioEventRTS *event, HSAMPLE sample )
-{
-	AIL_init_sample(sample);
-
-	// Prep any sort of filtering, etc, here
-	AIL_register_EOS_callback(sample, setSampleCompleted);
-	initFilters(sample, event);
-
-	// Load the file in
-	void *fileBuffer = NULL;
-	fileBuffer = loadFileForRead(event);
-	if (fileBuffer) {
-		AIL_set_sample_file(sample, fileBuffer, 0);
-
-		// Start playback
-		AIL_start_sample(sample);
-	}
-
-	return fileBuffer;
-}
-
-//-------------------------------------------------------------------------------------------------
-void *MilesAudioManager::playSample3D( AudioEventRTS *event, H3DSAMPLE sample3D )
-{
-	const Coord3D *pos = getCurrentPositionFromEvent(event);
-	if (pos) {
-		// Load the file in
-		void *fileBuffer = loadFileForRead(event);
-		if (fileBuffer) {
-			AIL_set_3D_sample_file(sample3D, fileBuffer);
-
-			// Prep any sort of filtering, etc, here
-			AIL_register_3D_EOS_callback(sample3D, set3DSampleCompleted);
-
-			// Set the position values of the sample here
-			if (event->getAudioEventInfo()->m_type & ST_GLOBAL) {
-				AIL_set_3D_sample_distances(sample3D, TheAudio->getAudioSettings()->m_globalMinRange, TheAudio->getAudioSettings()->m_globalMaxRange );
-			} else {
-				AIL_set_3D_sample_distances(sample3D, event->getAudioEventInfo()->m_minDistance, event->getAudioEventInfo()->m_maxDistance );
-			}
-			
-			// Set the position of the sample here
-			Real x = pos->x;
-			Real y = pos->y;
-			Real z = pos->z;
-			AIL_set_3D_position( sample3D, x, y, z );
-			initFilters3D(sample3D, event, pos);
-			
-			// Start playback
-			AIL_start_3D_sample(sample3D);
-		}
-		return fileBuffer;
-	}
-
-	return NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::buildProviderList( void )
-{
-   HPROENUM next = HPROENUM_FIRST;
-
-	 char *name;
-	 UnsignedInt index = 0;
-	 while (index < MAXPROVIDERS && AIL_enumerate_3D_providers(&next, &m_provider3D[index].id, &name)) {
-		 m_provider3D[index].name.set(name);	// set it to the AsciiString
-		 ++index;
-	 }
-	 
-	 m_providerCount = index;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::createListener( void )
-{
-	if (!(isOn(AudioAffect_Sound3D) && isValidProvider())) {
-		return;
-	}
-
-	m_listener = AIL_open_3D_listener(m_provider3D[m_selectedProvider].id);
-	// initial listener position will be (0, 0, 0)
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::initDelayFilter( void )
-{
-	if (m_delayFilter != NULL) {
-		return;
-	}
-
-	char* filterName;
-	HPROENUM enumFLTs = HPROENUM_FIRST;
-	HPROVIDER currentProvider;
-
-	while (AIL_enumerate_filters(&enumFLTs, &currentProvider, &filterName )) {  
-		if (strcmp(filterName,"Mono Delay Filter") == 0) {
-			m_delayFilter = currentProvider;
-			break;  
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isValidProvider( void )
-{
-	return (m_selectedProvider < m_providerCount);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::initSamplePools( void )
-{
-	if (!(isOn(AudioAffect_Sound3D) && isValidProvider())) {
-		return;
-	}
-
-	int i = 0;
-	for (i = 0; i < getAudioSettings()->m_sampleCount2D; ++i) {
-		HSAMPLE sample = AIL_allocate_sample_handle(m_digitalHandle);
-		DEBUG_ASSERTCRASH(sample, ("Couldn't get %d 2D samples\n", i + 1));
-		if (sample) {
-			AIL_init_sample(sample);
-			AIL_set_sample_user_data(sample, 0, i + 1);
-			m_availableSamples.push_back(sample);
-			++m_num2DSamples;
-		}
-	}
-
-	for (i = 0; i < getAudioSettings()->m_sampleCount3D; ++i) {
-		H3DSAMPLE sample = AIL_allocate_3D_sample_handle(m_provider3D[m_selectedProvider].id);
-		DEBUG_ASSERTCRASH(sample, ("Couldn't get %d 3D samples\n", i + 1));
-		if (sample) {
-			AIL_set_3D_user_data(sample, 0, i + 1);
-			m_available3DSamples.push_back(sample);
-			++m_num3DSamples;
-		}
-	}
-
-	// Streams are basically free, so we can just allocate the appropriate number
-	m_numStreams = getAudioSettings()->m_streamCount;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::processRequest( AudioRequest *req )
-{
-	switch (req->m_request)
-	{
-		case AR_Play:
-		{
-			playAudioEvent(req->m_pendingEvent);
-			break;
-		}
-		case AR_Pause:
-		{
-			pauseAudioEvent(req->m_handleToInteractOn);
-			break;
-		}
-		case AR_Stop:
-		{
-			stopAudioEvent(req->m_handleToInteractOn);
-			break;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void *MilesAudioManager::getHandleForBink( void )
-{
-	if (m_binkHandle == NULL) {
-		PlayingAudio *aud = allocatePlayingAudio();
-		aud->m_audioEventRTS = NEW AudioEventRTS("BinkHandle");	// poolify
-		getInfoForAudioEvent(aud->m_audioEventRTS);
-		aud->m_sample = getFirst2DSample(aud->m_audioEventRTS);
-		aud->m_type = PAT_Sample;
-
-		if (!aud->m_sample) {
-			releasePlayingAudio(aud);
-			return NULL;
-		}
-
-		m_binkHandle = aud;
-	}
-	
-	AILLPDIRECTSOUND lpDS;
-	AIL_get_DirectSound_info(m_binkHandle->m_sample, &lpDS, NULL);
-	return lpDS;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::releaseHandleForBink( void )
-{
-	if (m_binkHandle) {
-		releasePlayingAudio(m_binkHandle);
-		m_binkHandle = NULL;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay)
-{
-	if (!eventToPlay->getAudioEventInfo()) {
-		getInfoForAudioEvent(eventToPlay);
-		if (!eventToPlay->getAudioEventInfo()) {
-			DEBUG_CRASH(("No info for forced audio event '%s'\n", eventToPlay->getEventName().str()));
-			return;
-		}
-	}
-
-	switch (eventToPlay->getAudioEventInfo()->m_soundType)
-	{
-		case AT_Music:
-			if (!isOn(AudioAffect_Music)) 
-				return;
-			break;
-		case AT_SoundEffect:
-			if (!isOn(AudioAffect_Sound) || !isOn(AudioAffect_Sound3D)) 
-				return;
-			break;
-		case AT_Streaming:
-			if (!isOn(AudioAffect_Speech)) 
-				return;
-			break;
-	}
-	
-	AudioEventRTS event = *eventToPlay;
-
-	event.generateFilename();
-	event.generatePlayInfo();
-
-	std::list<std::pair<AsciiString, Real> >::iterator it;
-	for (it = m_adjustedVolumes.begin(); it != m_adjustedVolumes.end(); ++it) {
-		if (it->first == event.getEventName()) {
-			event.setVolume(it->second);
-			break;
-		}
-	}
-
-	AsciiString fileToPlay = event.getFilename();
-	HAUDIO haud = AIL_quick_load_and_play(fileToPlay.str(), 1, 0);
-
-	// Even though the event type is not Speech, this is used only for mission briefings, so use the 
-	// speech slider to adjust the volume.
-	// Get the volume from the event, and pass 0.5 to play the audio in the middle. (0.0 is full left, 1.0 is full right)
-	AIL_quick_set_volume(haud, event.getVolume() * getVolume(AudioAffect_Speech), 0.5);
-	m_audioForcePlayed.push_back(haud);
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void AILCALLBACK setSampleCompleted( HSAMPLE sampleCompleted )
-{
-	TheAudio->notifyOfAudioCompletion((UnsignedInt) sampleCompleted, PAT_Sample);
-}
-
-//-------------------------------------------------------------------------------------------------
-void AILCALLBACK set3DSampleCompleted( H3DSAMPLE sample3DCompleted )
-{
-	TheAudio->notifyOfAudioCompletion((UnsignedInt) sample3DCompleted, PAT_3DSample);
-}
-
-//-------------------------------------------------------------------------------------------------
-void AILCALLBACK setStreamCompleted( HSTREAM streamCompleted )
-{
-	TheAudio->notifyOfAudioCompletion((UnsignedInt) streamCompleted, PAT_Stream);
-}
-
-//-------------------------------------------------------------------------------------------------
-U32 AILCALLBACK streamingFileOpen(char const *fileName, U32 *file_handle)
-{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (sizeof(U32) != sizeof(File*)) {
-		RELEASE_CRASH(("streamingFileOpen - This function requires work in order to compile on non 32-bit platforms.\n"));
-	}
-#endif
-
-	(*file_handle) = (U32) TheFileSystem->openFile(fileName, File::READ | File::STREAMING);
-	return ((*file_handle) != 0);
-}
-
-//-------------------------------------------------------------------------------------------------
-void AILCALLBACK streamingFileClose(U32 fileHandle)
-{
-	((File*) fileHandle)->close();
-}
-
-//-------------------------------------------------------------------------------------------------
-S32 AILCALLBACK streamingFileSeek(U32 fileHandle, S32 offset, U32 type)
-{
-	return ((File*) fileHandle)->seek(offset, (File::seekMode) type);
-}
-
-//-------------------------------------------------------------------------------------------------
-U32 AILCALLBACK streamingFileRead(U32 file_handle, void *buffer, U32 bytes)
-{
-	return ((File*) file_handle)->read(buffer, bytes);
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-AudioFileCache::AudioFileCache() : m_maxSize(0), m_currentlyUsedSize(0), m_mutexName("AudioFileCacheMutex")
-{
-	m_mutex = CreateMutex(NULL, FALSE, m_mutexName);
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioFileCache::~AudioFileCache()
-{
-	{
-		ScopedMutex mut(m_mutex);
-
-		// Free all the samples that are open.
-		OpenFilesHashIt it;
-		for ( it = m_openFiles.begin(); it != m_openFiles.end(); ++it ) {
-			if (it->second.m_openCount > 0) {
-				DEBUG_CRASH(("Sample '%s' is still playing, and we're trying to quit.\n", it->second.m_eventInfo->m_audioName.str()));
-			}
-
-			releaseOpenAudioFile(&it->second);
-			// Don't erase it from the map, cause it makes this whole process way more complicated, and 
-			// we're about to go away anyways.
-		}
-	}
-
-	CloseHandle(m_mutex);
-}
-
-//-------------------------------------------------------------------------------------------------
-void *AudioFileCache::openFile( AudioEventRTS *eventToOpenFrom )
-{
-	// Protect the entire openFile function
-	ScopedMutex mut(m_mutex);
-
-	AsciiString strToFind;
-	switch (eventToOpenFrom->getNextPlayPortion())
-	{
-		case PP_Attack:
-			strToFind = eventToOpenFrom->getAttackFilename();
-			break;
-		case PP_Sound:
-			strToFind = eventToOpenFrom->getFilename();
-			break;
-		case PP_Decay:
-			strToFind = eventToOpenFrom->getDecayFilename();
-			break;
-		case PP_Done:
-			return NULL;
-	}
-
-	OpenFilesHash::iterator it;
-	it = m_openFiles.find(strToFind);
-
-	if (it != m_openFiles.end()) {
-		++it->second.m_openCount;
-		return it->second.m_file;
-	}
-
-	// Couldn't find the file, so actually open it.
-	File *file = TheFileSystem->openFile(strToFind.str());
-	if (!file) {
-		DEBUG_ASSERTLOG(strToFind.isEmpty(), ("Missing Audio File: '%s'\n", strToFind.str()));
-		return NULL;
-	}
-
-	UnsignedInt fileSize = file->size();
-	char* buffer = file->readEntireAndClose();
-
-	OpenAudioFile openedAudioFile;
-	openedAudioFile.m_eventInfo = eventToOpenFrom->getAudioEventInfo();
-
-	AILSOUNDINFO soundInfo;
-	AIL_WAV_info(buffer, &soundInfo);
-
-	if (eventToOpenFrom->isPositionalAudio()) {
-		if (soundInfo.channels > 1) {
-			DEBUG_CRASH(("Requested Positional Play of audio '%s', but it is in stereo.", strToFind.str()));
-			delete [] buffer;
-			return NULL;
-		}
-	}
-	
-	if (soundInfo.format == WAVE_FORMAT_IMA_ADPCM) {
-		void *decompressFileBuffer;
-		U32 newFileSize;
-		AIL_decompress_ADPCM(&soundInfo, &decompressFileBuffer, &newFileSize);
-		fileSize = newFileSize;
-		openedAudioFile.m_compressed = TRUE;
-		delete [] buffer;
-		openedAudioFile.m_file = decompressFileBuffer;
-		openedAudioFile.m_soundInfo = soundInfo;
-		openedAudioFile.m_openCount = 1;
-	} else if (soundInfo.format == WAVE_FORMAT_PCM) {
-		openedAudioFile.m_compressed = FALSE;
-		openedAudioFile.m_file = buffer;
-		openedAudioFile.m_soundInfo = soundInfo;
-		openedAudioFile.m_openCount = 1;
-	} else {
-		DEBUG_CRASH(("Unexpected compression type in '%s'\n", strToFind.str()));
-		// prevent leaks
-		delete [] buffer;
-		return NULL;
-	}
-
-	openedAudioFile.m_fileSize = fileSize;
-	m_currentlyUsedSize += openedAudioFile.m_fileSize;
-	if (m_currentlyUsedSize > m_maxSize) {
-		// We need to free some samples, or we're not going to be able to play this sound.
-		if (!freeEnoughSpaceForSample(openedAudioFile)) {
-			m_currentlyUsedSize -= openedAudioFile.m_fileSize;
-			releaseOpenAudioFile(&openedAudioFile);
-			return NULL;
-		}
-	}
-
-	m_openFiles[strToFind] = openedAudioFile;
-	return openedAudioFile.m_file;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioFileCache::closeFile( void *fileToClose )
-{
-	if (!fileToClose) {
-		return;
-	}
-
-	// Protect the entire closeFile function
-	ScopedMutex mut(m_mutex);
-
-	OpenFilesHash::iterator it;
-	for ( it = m_openFiles.begin(); it != m_openFiles.end(); ++it ) {
-		if ( it->second.m_file == fileToClose ) {
-			--it->second.m_openCount;
-			return;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioFileCache::setMaxSize( UnsignedInt size )
-{
-	// Protect the function, in case we're trying to use this value elsewhere.
-	ScopedMutex mut(m_mutex);
-
-	m_maxSize = size;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioFileCache::releaseOpenAudioFile( OpenAudioFile *fileToRelease )
-{
-	if (fileToRelease->m_openCount > 0) {
-		// This thing needs to be terminated IMMEDIATELY.
-		TheAudio->closeAnySamplesUsingFile(fileToRelease->m_file);
-	}
-
-	if (fileToRelease->m_file) {
-		if (fileToRelease->m_compressed) {
-			// Files read in via AIL_decompress_ADPCM must be freed with AIL_mem_free_lock. 
-			AIL_mem_free_lock(fileToRelease->m_file);
-		} else { 
-			// Otherwise, we read it, we own it, blow it away.
-			delete [] fileToRelease->m_file;
-		}
-		fileToRelease->m_file = NULL;
-		fileToRelease->m_eventInfo = NULL;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioFileCache::freeEnoughSpaceForSample(const OpenAudioFile& sampleThatNeedsSpace)
-{
-	
-	Int spaceRequired = m_currentlyUsedSize - m_maxSize;
-	Int runningTotal = 0;
-
-	std::list<AsciiString> filesToClose;
-	// First, search for any samples that have ref counts of 0. They are low-hanging fruit, and 
-	// should be considered immediately.
-	OpenFilesHashIt it;
-	for (it = m_openFiles.begin(); it != m_openFiles.end(); ++it) {
-		if (it->second.m_openCount == 0) {
-			// This is said low-hanging fruit.
-			filesToClose.push_back(it->first);
-
-			runningTotal += it->second.m_fileSize;
-
-			if (runningTotal >= spaceRequired) {
-				break;
-			}
-		}
-	}
-
-	// If we don't have enough space yet, then search through the events who have a count of 1 or more
-	// and who are lower priority than this sound.
-	// Mical said that at this point, sounds shouldn't care if other sounds are interruptable or not.
-	// Kill any files of lower priority necessary to clear our the buffer.
-	if (runningTotal < spaceRequired) {
-		for (it = m_openFiles.begin(); it != m_openFiles.end(); ++it) {
-			if (it->second.m_openCount > 0) {
-				if (it->second.m_eventInfo->m_priority < sampleThatNeedsSpace.m_eventInfo->m_priority) {
-					filesToClose.push_back(it->first);
-					runningTotal += it->second.m_fileSize;
-				
-					if (runningTotal >= spaceRequired) {
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	// We weren't able to find enough sounds to truncate. Therefore, this sound is not going to play.
-	if (runningTotal < spaceRequired) {
-		return FALSE;
-	}
-
-	std::list<AsciiString>::iterator ait;
-	for (ait = filesToClose.begin(); ait != filesToClose.end(); ++ait) {
-		OpenFilesHashIt itToErase = m_openFiles.find(*ait);
-		if (itToErase != m_openFiles.end()) {
-			releaseOpenAudioFile(&itToErase->second);
-			m_currentlyUsedSize -= itToErase->second.m_fileSize;
-			m_openFiles.erase(itToErase);
-		}
-	}
-
-	return TRUE;
-}
-
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::dumpAllAssetsUsed()
-{
-	if (!TheGlobalData->m_preloadReport) {
-		return;
-	}
-
-	// Dump all the audio assets we've used.
-	FILE *logfile=fopen("PreloadedAssets.txt","a+");	//append to log
-	if (!logfile)
-		return;
-
-	std::list<AsciiString> missingEvents;
-	std::list<AsciiString> usedFiles;
-
-	std::list<AsciiString>::iterator lit;
-
-	fprintf(logfile, "\nAudio Asset Report - BEGIN\n");
-	{
-		SetAsciiStringIt it;
-		std::vector<AsciiString>::iterator asIt;
-		for (it = m_allEventsLoaded.begin(); it != m_allEventsLoaded.end(); ++it) {
-			AsciiString astr = *it;
-			AudioEventInfo *aei = findAudioEventInfo(astr);
-			if (!aei) {
-				missingEvents.push_back(astr);
-				continue;
-			}
-
-			for (asIt = aei->m_attackSounds.begin(); asIt != aei->m_attackSounds.end(); ++asIt) {
-				usedFiles.push_back(*asIt);
-			}
-
-			for (asIt = aei->m_sounds.begin(); asIt != aei->m_sounds.end(); ++asIt) {
-				usedFiles.push_back(*asIt);
-			}
-
-			for (asIt = aei->m_decaySounds.begin(); asIt != aei->m_decaySounds.end(); ++asIt) {
-				usedFiles.push_back(*asIt);
-			}
-
-			if (!aei->m_filename.isEmpty()) {
-				usedFiles.push_back(aei->m_filename);
-			}
-		}
-
-		fprintf(logfile, "\nEvents Requested that are missing information - BEGIN\n");
-		for (lit = missingEvents.begin(); lit != missingEvents.end(); ++lit) {
-			fprintf(logfile, "%s\n", (*lit).str());
-		}
-		fprintf(logfile, "\nEvents Requested that are missing information - END\n");
-
-		fprintf(logfile, "\nFiles Used - BEGIN\n");
-		for (lit = usedFiles.begin(); lit != usedFiles.end(); ++lit) {
-			fprintf(logfile, "%s\n", (*lit).str());
-		}
-		fprintf(logfile, "\nFiles Used - END\n");
-	}
-	fprintf(logfile, "\nAudio Asset Report - END\n");
-	fclose(logfile);
-	logfile = NULL;
-}
-#endif
diff --git a/Generals/Code/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp b/Generals/Code/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
deleted file mode 100644
index a0606c36a74..00000000000
--- a/Generals/Code/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    VideoDevice
-//
-// File name: BinkDevice.cpp
-//
-// Created:   10/22/01	TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Lib/BaseType.h"
-#include "VideoDevice/Bink/BinkVideoPlayer.h"
-#include "Common/AudioAffect.h"
-#include "Common/GameAudio.h"
-#include "Common/GameMemory.h"
-#include "Common/GlobalData.h"
-#include "Common/Registry.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
- 
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-#define VIDEO_LANG_PATH_FORMAT "Data/%s/Movies/%s.%s"
-#define VIDEO_PATH	"Data\\Movies"
-#define VIDEO_EXT		"bik"
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//============================================================================
-// BinkVideoPlayer::BinkVideoPlayer
-//============================================================================
-
-BinkVideoPlayer::BinkVideoPlayer()
-{
-
-}
-
-//============================================================================
-// BinkVideoPlayer::~BinkVideoPlayer
-//============================================================================
-
-BinkVideoPlayer::~BinkVideoPlayer()
-{
-	deinit();
-}
-
-//============================================================================
-// BinkVideoPlayer::init
-//============================================================================
-
-void	BinkVideoPlayer::init( void )
-{
-	// Need to load the stuff from the ini file.
-	VideoPlayer::init();
-
-	initializeBinkWithMiles();
-}
-
-//============================================================================
-// BinkVideoPlayer::deinit
-//============================================================================
-
-void BinkVideoPlayer::deinit( void )
-{
-	TheAudio->releaseHandleForBink();
-	VideoPlayer::deinit();
-}
-
-//============================================================================
-// BinkVideoPlayer::reset
-//============================================================================
-
-void	BinkVideoPlayer::reset( void )
-{
-	VideoPlayer::reset();
-}
-
-//============================================================================
-// BinkVideoPlayer::update
-//============================================================================
-
-void	BinkVideoPlayer::update( void )
-{
-	VideoPlayer::update();
-
-}
-
-//============================================================================
-// BinkVideoPlayer::loseFocus
-//============================================================================
-
-void	BinkVideoPlayer::loseFocus( void )
-{
-	VideoPlayer::loseFocus();
-}
-
-//============================================================================
-// BinkVideoPlayer::regainFocus
-//============================================================================
-
-void	BinkVideoPlayer::regainFocus( void )
-{
-	VideoPlayer::regainFocus();
-}
-
-//============================================================================
-// BinkVideoPlayer::createStream
-//============================================================================
-
-VideoStreamInterface* BinkVideoPlayer::createStream( HBINK handle )
-{
-
-	if ( handle == NULL )
-	{
-		return NULL;
-	}
-
-	BinkVideoStream *stream = NEW BinkVideoStream;
-
-	if ( stream )
-	{
-
-		stream->m_handle = handle;
-		stream->m_next = m_firstStream;
-		stream->m_player = this;
-		m_firstStream = stream;
-
-		// never let volume go to 0, as Bink will interpret that as "play at full volume".
-		Int mod = (Int) ((TheAudio->getVolume(AudioAffect_Speech) * 0.8f) * 100) + 1;
-		Int volume = (32768*mod)/100;
-		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to set volume (%g -> %d -> %d\n",
-			TheAudio->getVolume(AudioAffect_Speech), mod, volume));
-		BinkSetVolume( stream->m_handle,0, volume);
-		DEBUG_LOG(("BinkVideoPlayer::createStream() - set volume\n"));
-	}
-
-	return stream;
-}
-
-//============================================================================
-// BinkVideoPlayer::open
-//============================================================================
-
-VideoStreamInterface*	BinkVideoPlayer::open( AsciiString movieTitle )
-{
-	VideoStreamInterface*	stream = NULL;
-
-	const Video* pVideo = getVideo(movieTitle);
-	if (pVideo) {
-		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to open bink file\n"));
-
-		if (TheGlobalData->m_modDir.isNotEmpty())
-		{
-			char filePath[ _MAX_PATH ];
-			sprintf( filePath, "%s%s\\%s.%s", TheGlobalData->m_modDir.str(), VIDEO_PATH, pVideo->m_filename.str(), VIDEO_EXT );
-			HBINK handle = BinkOpen(filePath , BINKPRELOADALL );
-			DEBUG_ASSERTLOG(!handle, ("opened bink file %s\n", filePath));
-			if (handle)
-			{
-				return createStream( handle );
-			}
-		}
-
-		char localizedFilePath[ _MAX_PATH ];
-		sprintf( localizedFilePath, VIDEO_LANG_PATH_FORMAT, GetRegistryLanguage().str(), pVideo->m_filename.str(), VIDEO_EXT );
-		HBINK handle = BinkOpen(localizedFilePath , BINKPRELOADALL );
-		DEBUG_ASSERTLOG(!handle, ("opened localized bink file %s\n", localizedFilePath));
-		if (!handle)
-		{
-			char filePath[ _MAX_PATH ];
-			sprintf( filePath, "%s\\%s.%s", VIDEO_PATH, pVideo->m_filename.str(), VIDEO_EXT );
-			handle = BinkOpen(filePath , BINKPRELOADALL );
-			DEBUG_ASSERTLOG(!handle, ("opened bink file %s\n", localizedFilePath));
-		}
-
-		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to create stream\n"));
-		stream = createStream( handle );
-	}
-
-	return stream;	
-}
-
-//============================================================================
-// BinkVideoPlayer::load
-//============================================================================
-
-VideoStreamInterface*	BinkVideoPlayer::load( AsciiString movieTitle )
-{
-	return open(movieTitle); // load() used to have the same body as open(), so I'm combining them.  Munkee.
-}
-
-//============================================================================
-//============================================================================
-void BinkVideoPlayer::notifyVideoPlayerOfNewProvider( Bool nowHasValid )
-{
-	if (!nowHasValid) {
-		TheAudio->releaseHandleForBink();
-		BinkSetSoundTrack(0, 0);
-	} else {
-		initializeBinkWithMiles();
-	}
-}
-
-//============================================================================
-//============================================================================
-void BinkVideoPlayer::initializeBinkWithMiles()
-{
-	Int retVal = 0;
-	void *driver = TheAudio->getHandleForBink();	
-	
-	if ( driver )
-	{
-		retVal = BinkSoundUseDirectSound(driver);
-	}
-	if( !driver || retVal == 0)
-	{
-		BinkSetSoundTrack ( 0,0 );
-	}
-}
-
-//============================================================================
-// BinkVideoStream::BinkVideoStream
-//============================================================================
-
-BinkVideoStream::BinkVideoStream()
-: m_handle(NULL)
-{
-
-}
-
-//============================================================================
-// BinkVideoStream::~BinkVideoStream
-//============================================================================
-
-BinkVideoStream::~BinkVideoStream()
-{
-	if ( m_handle != NULL )
-	{
-		BinkClose( m_handle );
-		m_handle = NULL;
-	}
-}
-
-//============================================================================
-// BinkVideoStream::update
-//============================================================================
-
-void BinkVideoStream::update( void )
-{
-	BinkWait( m_handle );
-}
-
-//============================================================================
-// BinkVideoStream::isFrameReady
-//============================================================================
-
-Bool BinkVideoStream::isFrameReady( void )
-{
-	return !BinkWait( m_handle );
-}
-
-//============================================================================
-// BinkVideoStream::frameDecompress
-//============================================================================
-
-void BinkVideoStream::frameDecompress( void )
-{
-		BinkDoFrame( m_handle );
-}
-
-//============================================================================
-// BinkVideoStream::frameRender
-//============================================================================
-
-void BinkVideoStream::frameRender( VideoBuffer *buffer )
-{
-	if ( buffer )
-	{
-		void *mem = buffer->lock();
-
-		u32 flags;
-
-		switch ( buffer->format())
-		{
-			case VideoBuffer::TYPE_X8R8G8B8:
-				flags = BINKSURFACE32;
-				break;
-
-			case VideoBuffer::TYPE_R8G8B8:
-				flags = BINKSURFACE24;
-				break;
-
-			case VideoBuffer::TYPE_R5G6B5:
-				flags = BINKSURFACE565;
-				break;
-
-			case VideoBuffer::TYPE_X1R5G5B5:
-				flags = BINKSURFACE555;
-				break;
-
-			default:
-				return;
-		}
-		
-		if ( mem != NULL )
-		{
-
-			BinkCopyToBuffer ( m_handle, mem, buffer->pitch(), buffer->height(),
-													buffer->xPos(), buffer->yPos(), flags );
-			buffer->unlock();
-		}
-	}
-
-}
-
-//============================================================================
-// BinkVideoStream::frameNext
-//============================================================================
-
-void BinkVideoStream::frameNext( void )
-{
-	BinkNextFrame( m_handle );
-}
-
-//============================================================================
-// BinkVideoStream::frameIndex
-//============================================================================
-
-Int BinkVideoStream::frameIndex( void )
-{
-	return m_handle->FrameNum - 1;
-}
-
-//============================================================================
-// BinkVideoStream::totalFrames
-//============================================================================
-
-Int	BinkVideoStream::frameCount( void )
-{
-	return m_handle->Frames;
-}
-
-//============================================================================
-// BinkVideoStream::frameGoto
-//============================================================================
-
-void BinkVideoStream::frameGoto( Int index )
-{
-	BinkGoto(m_handle, index, NULL );
-}
-
-//============================================================================
-// VideoStream::height
-//============================================================================
-
-Int		BinkVideoStream::height( void )
-{
-	return m_handle->Height;
-}
-
-//============================================================================
-// VideoStream::width
-//============================================================================
-
-Int		BinkVideoStream::width( void )
-{
-	return m_handle->Width;
-}
-
-
-
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
index a9ff3ba1f9a..8a107fa5a62 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
@@ -36,11 +36,11 @@
 #include "W3DDevice/GameClient/W3DGadget.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// PRIVATE DATA 
+// PRIVATE DATA
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Game Window draw methods -----------------------------------------------------------------------
-static FunctionLexicon::TableEntry gameWinDrawTable [] = 
+static FunctionLexicon::TableEntry gameWinDrawTable [] =
 {
 
 	{ NAMEKEY_INVALID, "GameWinDefaultDraw",						GameWinDefaultDraw },
@@ -100,7 +100,7 @@ static FunctionLexicon::TableEntry gameWinDrawTable [] =
 };
 
 // Game Window init methods -----------------------------------------------------------------------
-static FunctionLexicon::TableEntry layoutInitTable [] = 
+static FunctionLexicon::TableEntry layoutInitTable [] =
 {
 
 	{ NAMEKEY_INVALID, "W3DMainMenuInit",								W3DMainMenuInit },
@@ -110,7 +110,7 @@ static FunctionLexicon::TableEntry layoutInitTable [] =
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC FUNCTIONS 
+// PUBLIC FUNCTIONS
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
@@ -118,14 +118,14 @@ static FunctionLexicon::TableEntry layoutInitTable [] =
 W3DFunctionLexicon::W3DFunctionLexicon( void )
 {
 
-}  // end W3DFunctionLexicon
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DFunctionLexicon::~W3DFunctionLexicon( void )
 {
 
-}  // end ~W3DFunctionLexicon
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the function table specific for our implementations of
@@ -141,7 +141,7 @@ void W3DFunctionLexicon::init( void )
 	loadTable( gameWinDrawTable, TABLE_GAME_WIN_DEVICEDRAW );
 	loadTable( layoutInitTable, TABLE_WIN_LAYOUT_DEVICEINIT );
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -154,7 +154,7 @@ void W3DFunctionLexicon::reset( void )
 	// extend
 	FunctionLexicon::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -165,6 +165,6 @@ void W3DFunctionLexicon::update( void )
 	// extend?
 	FunctionLexicon::update();
 
-}  // end update
+}
 
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp
deleted file mode 100644
index 55ed9ee9fed..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp
+++ /dev/null
@@ -1,1618 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DRadar.cpp /////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, January 2002
-// Desc:   W3D radar implementation, this has the necessary device dependent drawing
-//				 necessary for the radar
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/AudioEventRTS.h"
-#include "Common/Debug.h"
-#include "Common/GlobalData.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-
-#include "GameLogic/TerrainLogic.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/Object.h"
-
-#include "GameLogic/Module/StealthUpdate.h"
-
-#include "GameClient/Color.h"
-#include "GameClient/Display.h"
-#include "GameClient/GameClient.h"
-#include "GameClient/GameWindow.h"
-#include "GameClient/Image.h"
-#include "GameClient/Line2D.h"
-#include "GameClient/TerrainVisual.h"
-#include "GameClient/Water.h"
-#include "W3DDevice/Common/W3DRadar.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/W3DShroud.h"
-#include "WW3D2/texture.h"
-#include "WW3D2/dx8caps.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-enum { OVERLAY_REFRESH_RATE = 6 };  ///< over updates once this many frames
-
-//-------------------------------------------------------------------------------------------------
-/** Is the point legal, that is, inside the resolution of the radar cells */
-//-------------------------------------------------------------------------------------------------
-inline Bool legalRadarPoint( Int px, Int py )
-{
-
-	if( px < 0 || py < 0 || px >= RADAR_CELL_WIDTH || py >= RADAR_CELL_HEIGHT )
-		return FALSE;
-
-	return TRUE;
-
-}
-
-//-------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-static WW3DFormat findFormat(const WW3DFormat formats[])
-{
-	for( Int i = 0; formats[ i ] != WW3D_FORMAT_UNKNOWN; i++ )
-	{
-
-		if( DX8Wrapper::Get_Current_Caps()->Support_Texture_Format( formats[ i ] ) )
-		{
-
-			return formats[ i ];
-
-		}  // end if
-
-	}  // end for i
-	DEBUG_CRASH(("WW3DRadar: No appropriate texture format\n") );
-	return WW3D_FORMAT_UNKNOWN;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Find the texture format we're going to use for the radar.  The texture format must
-	* be supported by the hardware.  The "more preferred" formats appear at the top of
-	* the format tables in order from most preferred to least preferred */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::initializeTextureFormats( void )
-{
-	const WW3DFormat terrainFormats[] = 
-	{
-		WW3D_FORMAT_R8G8B8,
-		WW3D_FORMAT_X8R8G8B8,
-		WW3D_FORMAT_R5G6B5,
-		WW3D_FORMAT_X1R5G5B5,
-		WW3D_FORMAT_UNKNOWN				// keep this one last
-	};
-	const WW3DFormat overlayFormats[] = 
-	{
-		WW3D_FORMAT_A8R8G8B8,
-		WW3D_FORMAT_A4R4G4B4,
-		WW3D_FORMAT_UNKNOWN				// keep this one last
-	};
-	const WW3DFormat shroudFormats[] = 
-	{
-		WW3D_FORMAT_A8R8G8B8,
-		WW3D_FORMAT_A4R4G4B4,
-		WW3D_FORMAT_UNKNOWN				// keep this one last
-	};
-
-	// find a format for the terrain texture
-	m_terrainTextureFormat = findFormat(terrainFormats);
-
-	// find a format for the overlay texture
-	m_overlayTextureFormat = findFormat(overlayFormats);
-
-	// find a format for the shroud texture
-	m_shroudTextureFormat = findFormat(shroudFormats);
-
-}  // end initializeTextureFormats
-
-//-------------------------------------------------------------------------------------------------
-/** Delete resources used specifically in this W3D radar implemetation */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::deleteResources( void )
-{
-
-	//
-	// delete terrain resources used
-	//
-	if( m_terrainTexture )
-		m_terrainTexture->Release_Ref();
-	m_terrainTexture = NULL;
-	if( m_terrainImage )
-		deleteInstance(m_terrainImage);
-	m_terrainImage = NULL;
-
-	//
-	// delete overlay resources used
-	//
-	if( m_overlayTexture )
-		m_overlayTexture->Release_Ref();
-	m_overlayTexture = NULL;
-	if( m_overlayImage )
-		deleteInstance(m_overlayImage);
-	m_overlayImage = NULL;
-
-	//
-	// delete shroud resources used
-	//
-	if( m_shroudTexture )
-		m_shroudTexture->Release_Ref();
-	m_shroudTexture = NULL;
-	if( m_shroudImage )
-		deleteInstance(m_shroudImage);
-	m_shroudImage = NULL;
-
-}  // end deleteResources
-
-//-------------------------------------------------------------------------------------------------
-/** Reconstruct the view box given the current camera settings */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::reconstructViewBox( void )
-{
-	Coord3D world[ 4 ];
-	ICoord2D radar[ 4 ];
-	Int i;
-
-	// get the 4 points of the view corners in the 3D world at the average Z height in the map
-	TheTacticalView->getScreenCornerWorldPointsAtZ( &world[ 0 ],
-																									&world[ 1 ],
-																									&world[ 2 ],
-																									&world[ 3 ],
-																									getTerrainAverageZ() );
-
-	// convert each of the 4 points in the world to radar cell positions
-	for( i = 0; i < 4; i++ )
-	{
-
-		// first convert to radar cells
- 		radar[ i ].x = world[ i ].x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
- 		radar[ i ].y = world[ i ].y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
-
-		//
-		// store these points in the view box array which contains a first position
-		// of (0,0) and then offsets for each additional entry point
-		//
-		if( i == 0 )
-		{
-
-			m_viewBox[ i ].x = 0;
-			m_viewBox[ i ].y = 0;
-
-		}  // end if
-		else
-		{
-
-			m_viewBox[ i ].x = radar[ i ].x - radar[ i - 1 ].x;
-			m_viewBox[ i ].y = radar[ i ].y - radar[ i - 1 ].y;
-
-		}  // end else
-
-	}  // end for i
-
-	//
-	// save the camera settings for this view box, we will need to make it again only
-	// if some of these change
-	//
-	m_viewAngle = TheTacticalView->getAngle();
-	Coord3D pos;
-	TheTacticalView->getPosition( &pos );
-	m_viewZoom = TheTacticalView->getZoom();
-	m_reconstructViewBox = FALSE;
-
-}  // end reconstructViewBox
-
-//-------------------------------------------------------------------------------------------------
-/** Convert radar position to actual pixel coord */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::radarToPixel( const ICoord2D *radar, ICoord2D *pixel,	
-														 Int radarUpperLeftX, Int radarUpperLeftY,
-														 Int radarWidth, Int radarHeight )
-{
-
-	// sanity
-	if( radar == NULL || pixel == NULL )
-		return;
-
-	pixel->x = (radar->x * radarWidth / RADAR_CELL_WIDTH) + radarUpperLeftX;
-	// note the "inverted" y here to orient the way our world looks with +x=right and -y=down
-	pixel->y = ((RADAR_CELL_HEIGHT - 1 - radar->y) * radarHeight / RADAR_CELL_HEIGHT) + radarUpperLeftY;
-
-}  // end radarToPixel
-
-
-//-------------------------------------------------------------------------------------------------
-/** Draw a hero icon at a position, given radar box upper left location and dimensions.  */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::drawHeroIcon( Int pixelX, Int pixelY, Int width, Int height, const Coord3D *pos )
-{
-	// get the hero icon image
-	static const Image *image = (Image *)TheMappedImageCollection->findImageByName("HeroReticle");
-	if (image != NULL)
-	{
-		// convert world to radar coords
-		ICoord2D ulRadar; 
-		ulRadar.x = pos->x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
-		ulRadar.y = pos->y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
-
-		// convert radar to screen coords
-		ICoord2D offsetScreen;
-		radarToPixel( &ulRadar, &offsetScreen, pixelX, pixelY, width, height );
-		
-		// shift from an upper left to a center focus for the icon
-		int iconWidth = image->getImageWidth();
-		int iconHeight = image->getImageHeight();
-		offsetScreen.x -= (iconWidth / 2) - 1;
-		offsetScreen.y -= iconHeight / 2; 
-
-		// draw the icon
-		TheDisplay->drawImage( image, offsetScreen.x , offsetScreen.y, offsetScreen.x + iconWidth, offsetScreen.y + iconHeight );
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Draw a "box" into the texture passed in that represents the viewable area for
-	* the tactical display into the game world */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::drawViewBox( Int pixelX, Int pixelY, Int width, Int height )
-{
-	ICoord2D ulScreen;
-	ICoord2D ulRadar;
-	Coord3D ulWorld;
-	ICoord2D ulStart = { 0, 0 };
-	ICoord2D start, end;
-	ICoord2D clipStart, clipEnd;
-	Real lineWidth = 1.0f;
-	Color topColor = GameMakeColor( 225, 225, 0, 255 );
-	Color bottomColor = GameMakeColor( 158, 158, 0, 255 );
-
-	//
-	// setup the clipping region ... note that this clipping region is not over just the
-	// radar image area ... it's in the WHOLE window available for the radar
-	//
-	IRegion2D clipRegion;
-	ICoord2D radarWindowSize, radarWindowScreenPos;
-	m_radarWindow->winGetSize( &radarWindowSize.x, &radarWindowSize.y );
-	m_radarWindow->winGetScreenPosition( &radarWindowScreenPos.x, &radarWindowScreenPos.y );
-	clipRegion.lo.x = radarWindowScreenPos.x;
-	clipRegion.lo.y = radarWindowScreenPos.y;
-	clipRegion.hi.x = radarWindowScreenPos.x + radarWindowSize.x;
-	clipRegion.hi.y = radarWindowScreenPos.y + radarWindowSize.y;
-
-	// convert top left of screen into world position
-	TheTacticalView->getOrigin( &ulScreen.x, &ulScreen.y );
-	TheTacticalView->screenToWorldAtZ( &ulScreen, &ulWorld, getTerrainAverageZ() );
-
-	// convert world to radar coords
- 	ulRadar.x = ulWorld.x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
- 	ulRadar.y = ulWorld.y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
-
-	//
-	// convert radar point to actual pixel coords on the screen, shifted
-	// into position on the radar for where the radar is drawn and the size of the
-	// area that the radar is drawn in
-	//
-	radarToPixel( &ulRadar, &ulStart, pixelX, pixelY, width, height );
-
-	//
-	// using our view box offset array, convert each of those radar cell offset points
-	// into screen pixels and draw the box.  The view box array is setup with the
-	// first index containing (0,0) (the point we just converted in theory), with cell
-	// offsets to each of the other corners in the following order
-	// (upper left, upper right, lower right, lower left)
-	//
-	ICoord2D radar;
-
-	// top line
-	start = ulStart;
-	radar.x = ulRadar.x + m_viewBox[ 1 ].x;
-	radar.y = ulRadar.y + m_viewBox[ 1 ].y;
-	radarToPixel( &radar, &end, pixelX, pixelY, width, height );
-	if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) )
-		TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y,
-													lineWidth, topColor );
-
-  // right line
-	start = end;
-	radar.x += m_viewBox[ 2 ].x;
-	radar.y += m_viewBox[ 2 ].y;
-	radarToPixel( &radar, &end, pixelX, pixelY, width, height );
-	if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) )
-		TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y,
-													lineWidth, topColor, bottomColor );
-
-  // bottom line
-	start = end;
-	radar.x += m_viewBox[ 3 ].x;
-	radar.y += m_viewBox[ 3 ].y;
-	radarToPixel( &radar, &end, pixelX, pixelY, width, height );
-	if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) )
-		TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y,
-													lineWidth, bottomColor );
-
-  // left line
-	start = end;
-	end = ulStart;
-	if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) )
-		TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y,
-													lineWidth, bottomColor, topColor );
-
-}  // end drawViewBox
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DRadar::drawSingleBeaconEvent( Int pixelX, Int pixelY, Int width, Int height, Int index )
-{
-	RadarEvent *event = &(m_event[index]);
-	ICoord2D tri[ 3 ];
-	ICoord2D start, end;
-	Real angle, addAngle;
-	Color startColor, endColor;
-	Real lineWidth = 1.0f;
-	UnsignedInt currentFrame = TheGameLogic->getFrame();
-	UnsignedInt frameDiff;							// frames the event has been alive for
-	Real maxEventSize = width / 10.0f;   // max size of the event marker
-	Int minEventSize = 6;     // min size of the event marker
-	Int eventSize;									 // current size of a marker to draw
-	const Real TIME_FROM_FULL_SIZE_TO_SMALL_SIZE = LOGICFRAMES_PER_SECOND * 1.5;
-	Real totalAnglesToSpin = 2.0f * PI;  ///< spin around this many angles going from big to small
-	UnsignedByte r, g, b, a;
-
-	// setup screen clipping region
-	IRegion2D clipRegion;
-	clipRegion.lo.x = pixelX;
-	clipRegion.lo.y = pixelY;
-	clipRegion.hi.x = pixelX + width;
-	clipRegion.hi.y = pixelY + height;
-
-	// get the difference in frame from the current frame to the frame we were created on
-	frameDiff = currentFrame - event->createFrame;
-
-	// compute the size of the event marker, it is largest when it starts and smallest at the end
-	eventSize = REAL_TO_INT( maxEventSize * ( 1.0f - frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE) );;
-
-	// we never let the event size get too small
-	if( eventSize < minEventSize )
-		eventSize = minEventSize;
-
-	// compute how much "angle" we will add to each point to make it rotate as it's getting small
-	addAngle = -totalAnglesToSpin * (frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE);
-
-	// create a triangle around the event
-	angle = 0.0f - addAngle;
-	tri[ 0 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
-	tri[ 0 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
-
-	angle = 2.0f * PI / 3.0f - addAngle;
-	tri[ 1 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
-	tri[ 1 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
-
-	angle = -2.0f * PI / 3.0f - addAngle;
-	tri[ 2 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
-	tri[ 2 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
-
-	// translate radar coords to screen coords
-	radarToPixel( &tri[ 0 ], &tri[ 0 ], pixelX, pixelY, width, height );
-	radarToPixel( &tri[ 1 ], &tri[ 1 ], pixelX, pixelY, width, height );
-	radarToPixel( &tri[ 2 ], &tri[ 2 ], pixelX, pixelY, width, height );
-
-	//
-	// make the colors we're going to use, when we're at our smallest size we will start to
-	// fade the alpha away to transparent so that at our lifetime frame we are completely gone
-	//
-
-	// color 1 ------------------
-	r = event->color1.red;
-	g = event->color1.green;
-	b = event->color1.blue;
-	a = event->color1.alpha;
-	if( currentFrame > event->fadeFrame )
-	{
-		
-		a = REAL_TO_UNSIGNEDBYTE( (Real)a * (1.0f - (Real)(currentFrame - event->fadeFrame) / 
-																								(Real)(event->dieFrame - event->fadeFrame) ) );
-
-	}  // end if
-	startColor = GameMakeColor( r, g, b, a );
-
-	// color 2 ------------------
-	r = event->color2.red;
-	g = event->color2.green;
-	b = event->color2.blue;
-	a = event->color2.alpha;
-	if( currentFrame > event->fadeFrame )
-	{
-		
-		a = REAL_TO_UNSIGNEDBYTE( (Real)a * (1.0f - (Real)(currentFrame - event->fadeFrame) / 
-																								(Real)(event->dieFrame - event->fadeFrame) ) );
-
-	}  // end if
-	endColor = GameMakeColor( r, g, b, a );
-
-	// draw the lines
-	if( ClipLine2D( &tri[ 0 ], &tri[ 1 ], &start, &end, &clipRegion ) )
-		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
-	if( ClipLine2D( &tri[ 1 ], &tri[ 2 ], &start, &end, &clipRegion ) )
-		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
-	if( ClipLine2D( &tri[ 2 ], &tri[ 0 ], &start, &end, &clipRegion ) )
-		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DRadar::drawSingleGenericEvent( Int pixelX, Int pixelY, Int width, Int height, Int index )
-{
-	RadarEvent *event = &(m_event[index]);
-	ICoord2D tri[ 3 ];
-	ICoord2D start, end;
-	Real angle, addAngle;
-	Color startColor, endColor;
-	Real lineWidth = 1.0f;
-	UnsignedInt currentFrame = TheGameLogic->getFrame();
-	UnsignedInt frameDiff;							// frames the event has been alive for
-	Real maxEventSize = width / 2.0f;   // max size of the event marker
-	Int minEventSize = 6;     // min size of the event marker
-	Int eventSize;									 // current size of a marker to draw
-	const Real TIME_FROM_FULL_SIZE_TO_SMALL_SIZE = LOGICFRAMES_PER_SECOND * 1.5;
-	Real totalAnglesToSpin = 2.0f * PI;  ///< spin around this many angles going from big to small
-	UnsignedByte r, g, b, a;
-
-	// setup screen clipping region
-	IRegion2D clipRegion;
-	clipRegion.lo.x = pixelX;
-	clipRegion.lo.y = pixelY;
-	clipRegion.hi.x = pixelX + width;
-	clipRegion.hi.y = pixelY + height;
-
-	// get the difference in frame from the current frame to the frame we were created on
-	frameDiff = currentFrame - event->createFrame;
-
-	// compute the size of the event marker, it is largest when it starts and smallest at the end
-	eventSize = REAL_TO_INT( maxEventSize * ( 1.0f - frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE) );;
-
-	// we never let the event size get too small
-	if( eventSize < minEventSize )
-		eventSize = minEventSize;
-
-	// compute how much "angle" we will add to each point to make it rotate as it's getting small
-	addAngle = totalAnglesToSpin * (frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE);
-
-	// create a triangle around the event
-	angle = 0.0f - addAngle;
-	tri[ 0 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
-	tri[ 0 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
-
-	angle = 2.0f * PI / 3.0f - addAngle;
-	tri[ 1 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
-	tri[ 1 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
-
-	angle = -2.0f * PI / 3.0f - addAngle;
-	tri[ 2 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
-	tri[ 2 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
-
-	// translate radar coords to screen coords
-	radarToPixel( &tri[ 0 ], &tri[ 0 ], pixelX, pixelY, width, height );
-	radarToPixel( &tri[ 1 ], &tri[ 1 ], pixelX, pixelY, width, height );
-	radarToPixel( &tri[ 2 ], &tri[ 2 ], pixelX, pixelY, width, height );
-
-	//
-	// make the colors we're going to use, when we're at our smallest size we will start to
-	// fade the alpha away to transparent so that at our lifetime frame we are completely gone
-	//
-
-	// color 1 ------------------
-	r = event->color1.red;
-	g = event->color1.green;
-	b = event->color1.blue;
-	a = event->color1.alpha;
-	if( currentFrame > event->fadeFrame )
-	{
-		
-		a = REAL_TO_UNSIGNEDBYTE( (Real)a * (1.0f - (Real)(currentFrame - event->fadeFrame) / 
-																								(Real)(event->dieFrame - event->fadeFrame) ) );
-
-	}  // end if
-	startColor = GameMakeColor( r, g, b, a );
-
-	// color 2 ------------------
-	r = event->color2.red;
-	g = event->color2.green;
-	b = event->color2.blue;
-	a = event->color2.alpha;
-	if( currentFrame > event->fadeFrame )
-	{
-		
-		a = REAL_TO_UNSIGNEDBYTE( (Real)a * (1.0f - (Real)(currentFrame - event->fadeFrame) / 
-																								(Real)(event->dieFrame - event->fadeFrame) ) );
-
-	}  // end if
-	endColor = GameMakeColor( r, g, b, a );
-
-	// draw the lines
-	if( ClipLine2D( &tri[ 0 ], &tri[ 1 ], &start, &end, &clipRegion ) )
-		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
-	if( ClipLine2D( &tri[ 1 ], &tri[ 2 ], &start, &end, &clipRegion ) )
-		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
-	if( ClipLine2D( &tri[ 2 ], &tri[ 0 ], &start, &end, &clipRegion ) )
-		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Draw all the radar events */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::drawEvents( Int pixelX, Int pixelY, Int width, Int height )
-{
-	Int i;
-
-	for( i = 0;  i < MAX_RADAR_EVENTS; i++ )
-	{
-
-		// only 'active' events actually have something to draw
-		if( m_event[ i ].active == TRUE && m_event[ i ].type != RADAR_EVENT_FAKE )
-		{
-
-			// if we haven't played the sound for this event, do it now that we can see it
-			if( m_event[ i ].soundPlayed == FALSE && m_event[i].type != RADAR_EVENT_BEACON_PULSE )
-			{
-				static AudioEventRTS eventSound("RadarEvent");
-				TheAudio->addAudioEvent( &eventSound );
-
-			}  // end if
-
-			m_event[ i ].soundPlayed = TRUE;
-
-			if ( m_event[ i ].type == RADAR_EVENT_BEACON_PULSE )
-				drawSingleBeaconEvent( pixelX, pixelY, width, height, i );
-			else
-				drawSingleGenericEvent( pixelX, pixelY, width, height, i );
-
-		}  // end if
-
-	}  // end for i
-
-}  // end drawEvents
-
-
-//-------------------------------------------------------------------------------------------------
-/** Draw all the radar icons */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::drawIcons( Int pixelX, Int pixelY, Int width, Int height )
-{
-	// draw the hero icons
-	std::list<const Coord3D *>::const_iterator iter = m_cachedHeroPosList.begin();
-	while (iter != m_cachedHeroPosList.end())
-	{
-		drawHeroIcon( pixelX, pixelY, width, height, (*iter) );
-		++iter;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Render an object list into the texture passed in */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::renderObjectList( const RadarObject *listHead, TextureClass *texture, Bool calcHero )
-{
-
-	// sanity
-	if( listHead == NULL || texture == NULL )
-		return;
-
-	// get surface for texture to render into
-	SurfaceClass *surface = texture->Get_Surface_Level();
-
-	// loop through all objects and draw
-	ICoord2D radarPoint;
-
-	Player *player = ThePlayerList->getLocalPlayer();
-	Int playerIndex=0;
-	if (player)
-		playerIndex=player->getPlayerIndex();
-
-	if( calcHero )
-	{
-		// clear all entries from the cached hero object list
-		m_cachedHeroPosList.clear();
-	}
-
-	for( const RadarObject *rObj = listHead; rObj; rObj = rObj->friend_getNext() )
-	{
-
-		if (rObj->isTemporarilyHidden())
-			continue;
-
-		// get object
-		const Object *obj = rObj->friend_getObject();
-
-		// cache hero object positions for drawing in icon layer
-		if( calcHero && obj->isHero() )
-		{
-			m_cachedHeroPosList.push_back(obj->getPosition());
-		}
-    Bool skip = FALSE;
-
-		// check for shrouded status
-		if (obj->getShroudedStatus(playerIndex) > OBJECTSHROUD_PARTIAL_CLEAR)
-			skip = TRUE;	//object is fogged or shrouded, don't render it.
-
- 		//
- 		// objects with a local only unit priority will only appear on the radar if they
- 		// are controlled by the local player, or if the local player is an observer (cause
-		// they are godlike and can see everything)
- 		//
-
-
- 		if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY &&
- 				obj->getControllingPlayer() != ThePlayerList->getLocalPlayer() &&
-				ThePlayerList->getLocalPlayer()->isPlayerActive() )
- 			skip = TRUE;
-
-		// get object position
-		const Coord3D *pos = obj->getPosition();
-
-		// compute object position as a radar blip
-		radarPoint.x = pos->x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
-		radarPoint.y = pos->y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
-
-
-    if ( skip )
-      continue;
-
-    // get the color we're going to draw in
-		Color c = rObj->getColor();
-
-		
-		
-		// adjust the alpha for stealth units so they "fade/blink" on the radar for the controller
-		// if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY )
-		// ML-- What the heck is this? local-only and neutral-observier-viewed units are stealthy?? Since when?	
-		// Now it twinkles for any stealthed object, whether locally controlled or neutral-observier-viewed
-		if( obj->testStatus( OBJECT_STATUS_STEALTHED ) )
-		{
-			StealthUpdate* stealth = obj->getStealth();
-			if( !stealth )
-				continue;
-
-      if ( ThePlayerList->getLocalPlayer()->getRelationship(obj->getTeam()) == ENEMIES )
-        if( !obj->testStatus( OBJECT_STATUS_DETECTED ) && !stealth->isDisguised() )
-				  skip = TRUE;
-
-			UnsignedByte r, g, b, a;
-			GameGetColorComponents( c, &r, &g, &b, &a );
-
-			const UnsignedInt framesForTransition = LOGICFRAMES_PER_SECOND;
-			const UnsignedByte minAlpha = 32;
-			
-      if (skip)
-        continue;
-
-			Real alphaScale = INT_TO_REAL(TheGameLogic->getFrame() % framesForTransition) / (framesForTransition / 2.0f);
-			if( alphaScale > 0.0f )
-				a = REAL_TO_UNSIGNEDBYTE( ((alphaScale - 1.0f) * (255.0f - minAlpha)) + minAlpha );
-			else
-				a = REAL_TO_UNSIGNEDBYTE( (alphaScale * (255.0f - minAlpha)) + minAlpha );
-			c = GameMakeColor( r, g, b, a );
-
-		}  // end if
-
-
-
-		
-		// draw the blip, but make sure the points are legal
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-		radarPoint.y++;
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-		radarPoint.x++;
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-		radarPoint.y--;
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-	}  // end for
-	REF_PTR_RELEASE(surface);
-
-}  // end renderObjectList
-
-//-------------------------------------------------------------------------------------------------
-/** Shade the color passed in using the height parameter to lighten and darken it.  Colors
-	* will be interpolated using the value "height" across the range from loZ to hiZ.  The
-	* midZ is the "middle" point, height values above it will be lightened, while 
-	* lower ones are darkened. */
-//-------------------------------------------------------------------------------------------------	
-void W3DRadar::interpolateColorForHeight( RGBColor *color,	
-																					Real height, 
-																					Real hiZ,
-																					Real midZ,
-																					Real loZ )
-{
-	const Real howBright = 0.95f;  // bigger is brighter (0.0 to 1.0)
-	const Real howDark   = 0.60f;  // bigger is darker (0.0 to 1.0)
-	
-	// sanity on map height (flat maps bomb)
-	if (hiZ == midZ)
-		hiZ = midZ+0.1f;
-	if (midZ == loZ)
-		loZ = midZ-0.1f;
-	if (hiZ == loZ)
-		hiZ = loZ+0.2f;
-
-	Real t;
-	RGBColor colorTarget;
-
-	// if "over" the middle height, interpolate lighter
-	if( height >= midZ )
-	{
-
-		// how far are we from the middleZ towards the hi Z
-		t = (height - midZ) / (hiZ - midZ);
-
-		// compute what our "lightest" color possible we want to use is
-		colorTarget.red = color->red + (1.0f - color->red) * howBright;
-		colorTarget.green = color->green + (1.0f - color->green) * howBright;
-		colorTarget.blue = color->blue + (1.0f - color->blue) * howBright;
-
-	}  // end if
-	else  // interpolate darker
-	{
-
-		// how far are we from the middleZ towards the low Z
-		t = (midZ - height) / (midZ - loZ);
-
-		// compute what the "darkest" color possible we want to use is
-		colorTarget.red = color->red + (0.0f - color->red) * howDark;
-		colorTarget.green = color->green + (0.0f - color->green) * howDark;
-		colorTarget.blue = color->blue + (0.0f - color->blue) * howDark;
-
-	}  // end else
-
-	// interpolate toward the target color
-	color->red = color->red + (colorTarget.red - color->red) * t;
-	color->green = color->green + (colorTarget.green - color->green) * t;
-	color->blue = color->blue + (colorTarget.blue - color->blue) * t;
-
-	// keep the color real
-	if( color->red < 0.0f )
-		color->red = 0.0f;
-	if( color->red > 1.0f )
-		color->red = 1.0f;
-	if( color->green < 0.0f )
-		color->green = 0.0f;
-	if( color->green > 1.0f )
-		color->green = 1.0f;
-	if( color->blue < 0.0f )
-		color->blue = 0.0f;
-	if( color->blue > 1.0f )
-		color->blue = 1.0f;
-
-}  // end interpolateColorForHeight
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC METHODS /////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DRadar::W3DRadar( void )
-{
-
-	m_terrainTextureFormat = WW3D_FORMAT_UNKNOWN;
-	m_terrainImage = NULL;
-	m_terrainTexture = NULL;
-
-	m_overlayTextureFormat = WW3D_FORMAT_UNKNOWN;
-	m_overlayImage = NULL;
-	m_overlayTexture = NULL;
-
-	m_shroudTextureFormat = WW3D_FORMAT_UNKNOWN;
-	m_shroudImage = NULL;
-	m_shroudTexture = NULL;
-
-	m_textureWidth = RADAR_CELL_WIDTH;
-	m_textureHeight = RADAR_CELL_HEIGHT;
-
-	m_reconstructViewBox = TRUE;
-	m_viewAngle = 0.0f;
-	m_viewZoom = 0.0f;
-	for( Int i = 0; i < 4; i++ )
-	{
-
-		m_viewBox[ i ].x = 0;
-		m_viewBox[ i ].y = 0;
-
-	}  // end for
-
-}  // end W3DRadar
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DRadar::~W3DRadar( void )
-{
-
-	// delete resources used for the W3D radar
-	deleteResources();
-
-}  // end ~W3DRadar
-
-//-------------------------------------------------------------------------------------------------
-/** Radar initialization */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::init( void )
-{
-	ICoord2D size;
-	Region2D uv;
-
-	// extending functionality
-	Radar::init();
-
-	// gather specific texture format information
-	initializeTextureFormats();
-
-	// allocate our terrain texture
-	// poolify
-	m_terrainTexture = MSGNEW("TextureClass") TextureClass( m_textureWidth, m_textureHeight, 
-																			 m_terrainTextureFormat, MIP_LEVELS_1 );
-	DEBUG_ASSERTCRASH( m_terrainTexture, ("W3DRadar: Unable to allocate terrain texture\n") );
-
-	// allocate our overlay texture
-	m_overlayTexture = MSGNEW("TextureClass") TextureClass( m_textureWidth, m_textureHeight,
-																			 m_overlayTextureFormat, MIP_LEVELS_1 );
-	DEBUG_ASSERTCRASH( m_overlayTexture, ("W3DRadar: Unable to allocate overlay texture\n") );
-
-	// set filter type for the overlay texture, try it and see if you like it, I don't ;)
-//	m_overlayTexture->Set_Min_Filter( TextureFilterClass::FILTER_TYPE_NONE );
-//	m_overlayTexture->Set_Mag_Filter( TextureFilterClass::FILTER_TYPE_NONE );
-
-	// allocate our shroud texture
-	m_shroudTexture = MSGNEW("TextureClass") TextureClass( m_textureWidth, m_textureHeight,
-																			 m_shroudTextureFormat, MIP_LEVELS_1 );
-	DEBUG_ASSERTCRASH( m_shroudTexture, ("W3DRadar: Unable to allocate shroud texture\n") );
-	m_shroudTexture->Get_Filter().Set_Min_Filter( TextureFilterClass::FILTER_TYPE_DEFAULT );
-	m_shroudTexture->Get_Filter().Set_Mag_Filter( TextureFilterClass::FILTER_TYPE_DEFAULT );
-
-	//
-	// create images used for rendering and set them up with the textures
-	//
-
-	//
-	// the terrain image, note the UV coords change it from (0,0) in the upper left
-	// to (0,0) in the lower left cause that's how we are initially oriented in the
-	// world (positive X to the right and positive Y up)
-	//
-	m_terrainImage = newInstance(Image);
-	uv.lo.x = 0.0f;
-	uv.lo.y = 1.0f;
-	uv.hi.x = 1.0f;
-	uv.hi.y = 0.0f;
-	m_terrainImage->setStatus( IMAGE_STATUS_RAW_TEXTURE );
-	m_terrainImage->setRawTextureData( m_terrainTexture );
-	m_terrainImage->setUV( &uv );
-	m_terrainImage->setTextureWidth( m_textureWidth );
-	m_terrainImage->setTextureHeight( m_textureHeight );
-	size.x = m_textureWidth;
-	size.y = m_textureHeight;
-	m_terrainImage->setImageSize( &size );
-
-	// the overlay image
-	m_overlayImage = newInstance(Image);
-	uv.lo.x = 0.0f;
-	uv.lo.y = 1.0f;
-	uv.hi.x = 1.0f;
-	uv.hi.y = 0.0f;
-	m_overlayImage->setStatus( IMAGE_STATUS_RAW_TEXTURE );
-	m_overlayImage->setRawTextureData( m_overlayTexture );
-	m_overlayImage->setUV( &uv );
-	m_overlayImage->setTextureWidth( m_textureWidth );
-	m_overlayImage->setTextureHeight( m_textureHeight );
-	size.x = m_textureWidth;
-	size.y = m_textureHeight;
-	m_overlayImage->setImageSize( &size );
-
-	// the shroud image
-	m_shroudImage = newInstance(Image);
-	uv.lo.x = 0.0f;
-	uv.lo.y = 1.0f;
-	uv.hi.x = 1.0f;
-	uv.hi.y = 0.0f;
-	m_shroudImage->setStatus( IMAGE_STATUS_RAW_TEXTURE );
-	m_shroudImage->setRawTextureData( m_shroudTexture );
-	m_shroudImage->setUV( &uv );
-	m_shroudImage->setTextureWidth( m_textureWidth );
-	m_shroudImage->setTextureHeight( m_textureHeight );
-	size.x = m_textureWidth;
-	size.y = m_textureHeight;
-	m_shroudImage->setImageSize( &size );
-
-}  // end init
-
-//-------------------------------------------------------------------------------------------------
-/** Reset the radar to the initial empty state ready for new data */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::reset( void )
-{
-
-	// extending functionality, call base class
-	Radar::reset();
-
-	// clear our texture data, but do not delete the resources
-	SurfaceClass *surface;
-
-	surface = m_terrainTexture->Get_Surface_Level();
-	if( surface )
-	{
-		surface->Clear();
-		REF_PTR_RELEASE(surface);
-	}
-
-	surface = m_overlayTexture->Get_Surface_Level();
-	if( surface )
-	{
-		surface->Clear();
-		REF_PTR_RELEASE(surface);
-	}
-
-	// don't call Clear(); that wips to transparent. do this instead.
-	//gs Dude, it's called CLEARshroud.  It needs to clear the shroud.
-	clearShroud();
-	
-}  // end reset
-
-//-------------------------------------------------------------------------------------------------
-/** Update */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::update( void )
-{
-
-	// extend base class
-	Radar::update();
-
-}  // end update
-
-//-------------------------------------------------------------------------------------------------
-/** Reset the radar for the new map data being given to it */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::newMap( TerrainLogic *terrain )
-{
-
-	//
-	// extending functionality, call the base class ... this will cause a reset of the
-	// system which will clear out our textures but not free them
-	//
-	Radar::newMap( terrain );
-
-	// sanity
-	if( terrain == NULL )
-		return;
-
-	// build terrain texture
-	buildTerrainTexture( terrain );
-
-}  // end newMap
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DRadar::buildTerrainTexture( TerrainLogic *terrain )
-{
-	SurfaceClass *surface;
-	RGBColor waterColor;
-
-	// we will want to reconstruct our new view box now
-	m_reconstructViewBox = TRUE;
-
-	// setup our water color
-	waterColor.red = TheWaterTransparency->m_radarColor.red;
-	waterColor.green = TheWaterTransparency->m_radarColor.green;
-	waterColor.blue = TheWaterTransparency->m_radarColor.blue;
-
-	// get the terrain surface to draw in
-	surface = m_terrainTexture->Get_Surface_Level();
-	DEBUG_ASSERTCRASH( surface, ("W3DRadar: Can't get surface for terrain texture\n") );
-
-	// build the terrain
-	RGBColor sampleColor;
-	RGBColor color;
-	Int i, j, samples;
-	Int x, y, z;
-	ICoord2D radarPoint;
-	Coord3D worldPoint;
-	Bridge *bridge;
-	for( y = 0; y < m_textureHeight; y++ )
-	{
-
-		for( x = 0; x < m_textureWidth; x++ )
-		{
-
-			// what point are we inspecting
-			radarPoint.x = x;
-			radarPoint.y = y;
-			radarToWorld( &radarPoint, &worldPoint );
-
-			// get height of the terrain at this sample point
-			z = terrain->getGroundHeight( worldPoint.x, worldPoint.y );
-
-			// check to see if this point is part of a working bridge
-			Bool workingBridge = FALSE;
-			bridge = TheTerrainLogic->findBridgeAt( &worldPoint );
-			if( bridge != NULL )
-			{
-				Object *obj = TheGameLogic->findObjectByID( bridge->peekBridgeInfo()->bridgeObjectID );
-
-				if( obj )
-				{
-					BodyModuleInterface *body = obj->getBodyModule();
-
-					if( body->getDamageState() != BODY_RUBBLE )
-						workingBridge = TRUE;
-
-				}  // end if
-
-			}  // end if
-
-			// create a color based on the Z height of the map
-			Real waterZ;
-			if( workingBridge == FALSE && terrain->isUnderwater( worldPoint.x, worldPoint.y, &waterZ ) )
-			{
-				const Int waterSamplesAway = 1;		// how many "tiles" from the center tile we will sample away
-																					// to average a color for the tile color
-
-				sampleColor.red = sampleColor.green = sampleColor.blue = 0.0f;
-				samples = 0;
-
-				for( j = y - waterSamplesAway; j <= y + waterSamplesAway; j++ )
-				{
-
-					if( j >= 0 && j < m_textureHeight )
-					{
-
-						for( i = x - waterSamplesAway; i <= x + waterSamplesAway; i++ )
-						{
-
-							if( i >= 0 && i < m_textureWidth )
-							{
-
-								// the the world point we are concerned with
-								radarPoint.x = i;
-								radarPoint.y = j;
-								radarToWorld( &radarPoint, &worldPoint );
-								
-								// get Z at this sample height
-								Real underwaterZ = terrain->getGroundHeight( worldPoint.x, worldPoint.y );
-
-								// get color for this Z and add to our sample color
-								if( terrain->isUnderwater( worldPoint.x, worldPoint.y ) )
-								{
-
-									// this is our "color" for water
-									color = waterColor;									
-
-									// interpolate the water color for height in the water table
-									interpolateColorForHeight( &color, underwaterZ, waterZ,
-																						 waterZ,
-																						 m_mapExtent.lo.z );
-
-									// add color to our samples
-									sampleColor.red += color.red;
-									sampleColor.green += color.green;
-									sampleColor.blue += color.blue;
-									samples++;
-
-								}  // end if
-
-							}  // end if
-
-						}  // end for i
-
-					}  // end if
-
-				}  // end for j
-
-				// prevent divide by zeros
-				if( samples == 0 )
-					samples = 1;
-
-				// set the color to an average of the colors read
-				color.red = sampleColor.red / (Real)samples;
-				color.green = sampleColor.green / (Real)samples;
-				color.blue = sampleColor.blue / (Real)samples;
-
-			}  // end if
-			else  // regular terrain ...
-			{
-				const Int samplesAway = 1;  // how many "tiles" from the center tile we will sample away
-																		// to average a color for the tile color
-
-				sampleColor.red = sampleColor.green = sampleColor.blue = 0.0f;
-				samples = 0;
-
-				for( j = y - samplesAway; j <= y + samplesAway; j++ )
-				{
-
-					if( j >= 0 && j < m_textureHeight )
-					{
-
-						for( i = x - samplesAway; i <= x + samplesAway; i++ )
-						{
-
-							if( i >= 0 && i < m_textureWidth )
-							{
-
-								// the the world point we are concerned with
-								radarPoint.x = i;
-								radarPoint.y = j;
-								radarToWorld( &radarPoint, &worldPoint );
-
-								// get the color we're going to use here																
-								if( workingBridge )
-								{
-									AsciiString bridgeTName = bridge->getBridgeTemplateName();
-									TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( bridgeTName );
-									
-									// sanity
-									DEBUG_ASSERTCRASH( bridgeTemplate, ("W3DRadar::buildTerrainTexture - Can't find bridge template for '%s'\n", bridgeTName.str()) );
-
-									// use bridge color
-									if ( bridgeTemplate )
-										color = bridgeTemplate->getRadarColor();
-									else
-										color.setFromInt(0xffffffff);
-									//
-									// we won't use the height of the terrain at this sample point, we will
-									// instead use the height for the entire bridge
-									//
-									Real bridgeHeight = (bridge->peekBridgeInfo()->fromLeft.z + 
-																			 bridge->peekBridgeInfo()->fromRight.z +
-																			 bridge->peekBridgeInfo()->toLeft.z +
-																			 bridge->peekBridgeInfo()->toRight.z) / 4.0f;
-
-									// interpolate the color, but use the bridge height, not the terrain height
-									interpolateColorForHeight( &color, bridgeHeight,
-																						 getTerrainAverageZ(),
-																						 m_mapExtent.hi.z, m_mapExtent.lo.z );
-
-								}  // end if
-								else
-								{
-
-									// get the color at this point
-									TheTerrainVisual->getTerrainColorAt( worldPoint.x, worldPoint.y, &color );
-
-									// interpolate the color for height
-									interpolateColorForHeight( &color, z, getTerrainAverageZ(), 
-																						 m_mapExtent.hi.z, m_mapExtent.lo.z );
-
-								}  // end else
-
-								// add color to our samples
-								sampleColor.red += color.red;
-								sampleColor.green += color.green;
-								sampleColor.blue += color.blue;
-								samples++;
-
-							}  // end if
-
-						}  // end for i
-
-					}  // end if
-
-				}  // end for j
-
-				// prevent divide by zeros
-				if( samples == 0 )
-					samples = 1;
-
-				// set the color to an average of the colors read
-				color.red = sampleColor.red / (Real)samples;
-				color.green = sampleColor.green / (Real)samples;
-				color.blue = sampleColor.blue / (Real)samples;
-
-			}  // end else
-
-			//
-			// draw the pixel for the terrain at this point, note that because of the orientation
-			// of our world we draw it with positive y in the "up" direction
-			//
-			// FYI: I tried making this faster by pulling out all the code inside DrawPixel
-			// and locking only once ... but it made absolutely *no* performance difference,
-			// the sampling and interpolation algorithm for generating pretty looking terrain
-			// and water for the radar is just, well, expensive.
-			//
-			surface->DrawPixel( x, y, GameMakeColor( color.red * 255, 
-																							 color.green * 255,
-																							 color.blue * 255,
-																							 255 ) );
-
-		}  // end for x
-
-	}  // end for y
-
-	// all done with the surface
-	REF_PTR_RELEASE(surface);
-
-}  // end buildTerrainTexture
-
-// ------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::clearShroud()
-{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (!TheGlobalData->m_shroudOn)
-		return;
-#endif
-
-	SurfaceClass *surface = m_shroudTexture->Get_Surface_Level();
-	
-	// fill to clear, shroud will make black.  Don't want to make something black that logic can't clear
-	unsigned int color = GameMakeColor( 0, 0, 0, 0 );
-	for( Int y = 0; y < m_textureHeight; y++ )
-	{
-		surface->DrawHLine(y, 0, m_textureWidth-1, color);
-	}
-	REF_PTR_RELEASE(surface);
-}
-
-// ------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::setShroudLevel(Int shroudX, Int shroudY, CellShroudStatus setting)
-{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (!TheGlobalData->m_shroudOn)
-		return;
-#endif
-
-	W3DShroud* shroud = TheTerrainRenderObject ? TheTerrainRenderObject->getShroud() : NULL;
-	if (!shroud)
-		return;
-
-	SurfaceClass* surface = m_shroudTexture->Get_Surface_Level();
-	DEBUG_ASSERTCRASH( surface, ("W3DRadar: Can't get surface for Shroud texture\n") );
-
-	Int mapMinX = shroudX * shroud->getCellWidth();
-	Int mapMinY = shroudY * shroud->getCellHeight();
-	Int mapMaxX = (shroudX+1) * shroud->getCellWidth();
-	Int mapMaxY = (shroudY+1) * shroud->getCellHeight();
-
-	ICoord2D radarPoint;
-	Coord3D worldPoint;
-
-	worldPoint.x = mapMinX;
-	worldPoint.y = mapMinY;
-	worldToRadar( &worldPoint, &radarPoint );
-	Int radarMinX = radarPoint.x;
-	Int radarMinY = radarPoint.y;
-
-	worldPoint.x = mapMaxX;
-	worldPoint.y = mapMaxY;
-	worldToRadar( &worldPoint, &radarPoint );
-	Int radarMaxX = radarPoint.x;
-	Int radarMaxY = radarPoint.y;
-
-/*
-	Int radarMinX = REAL_TO_INT_FLOOR(mapMinX / getXSample());
-	Int radarMinY = REAL_TO_INT_FLOOR(mapMinY / getYSample());
-	Int radarMaxX = REAL_TO_INT_CEIL(mapMaxX / getXSample());
-	Int radarMaxY = REAL_TO_INT_CEIL(mapMaxY / getYSample());
-*/
-
-	/// @todo srj -- this really needs to smooth the display!
-
-	//Logic is saying shroud.  We can add alpha levels here in client if needed.  
-	// W3DShroud is a 0-255 alpha byte.  Logic shroud is a double reference count.
-	Int alpha;
-	if( setting == CELLSHROUD_SHROUDED )
-		alpha = 255;
-	else if( setting == CELLSHROUD_FOGGED )
-		alpha = 127;///< @todo placeholder to get feedback on logic work while graphic side being decided
-	else
-		alpha = 0;
-
-	for( Int y = radarMinY; y <= radarMaxY; y++ )
-	{
-		for( Int x = radarMinX; x <= radarMaxX; x++ )
-		{
-			if( legalRadarPoint( x, y ) )
-				surface->DrawPixel( x, y, GameMakeColor( 0, 0, 0, alpha ) );
-		}
-	}
-	REF_PTR_RELEASE(surface);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Actually draw the radar at the screen coordinates provided 
-	* NOTE about how drawing works: The radar images are computed at samples across the
-	* map and are built into a "square" texture area.  At the time of drawing and computing
-	* radar<->world coords we consider the "ratio" of width to height of the map dimensions
-	* so that when we draw we preserve the aspect ratio of the map and don't squish it in
-	* any direction that would cause the map to be distorted.  Extra blank space is drawn
-	* around the radar images to keep the whole radar area covered when the map displayed
-	* is "long" or "tall" */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::draw( Int pixelX, Int pixelY, Int width, Int height )
-{
-
-	// if the local player does not have a radar then we can't draw anything
-	Player *player = ThePlayerList->getLocalPlayer();
-	if( !player->hasRadar() && !TheRadar->isRadarForced() )
-		return;
-
-	//
-	// given a upper left corner at pixelX|Y and a width and height to draw into, figure out
-	// where we should start and end the image so that the final drawn image has the
-	// same ratio as the map and isn't stretched or distorted
-	//
-	ICoord2D ul, lr;
-	findDrawPositions( pixelX, pixelY, width, height, &ul, &lr );
-
-	Int scaledWidth = lr.x - ul.x;
-	Int scaledHeight = lr.y - ul.y;
-
-	// draw black border areas where we need map
-	Color fillColor = GameMakeColor( 0, 0, 0, 255 );
-	Color lineColor = GameMakeColor( 50, 50, 50, 255 );
-	if( m_mapExtent.width()/width >= m_mapExtent.height()/height )
-	{
-		
-		// draw horizontal bars at top and bottom
-		TheDisplay->drawFillRect( pixelX, pixelY, width, ul.y - pixelY - 1, fillColor );
-		TheDisplay->drawFillRect( pixelX, lr.y + 1, width, pixelY + height - lr.y - 1, fillColor);
-		TheDisplay->drawLine(pixelX, ul.y, pixelX + width, ul.y, 1, lineColor);
-		TheDisplay->drawLine(pixelX, lr.y + 1, pixelX + width, lr.y + 1, 1, lineColor);
-
-	}  // end if
-	else
-	{
-
-		// draw vertical bars to the left and right
-		TheDisplay->drawFillRect( pixelX, pixelY, ul.x - pixelX - 1, height, fillColor );
-		TheDisplay->drawFillRect( lr.x + 1, pixelY, width - (lr.x - pixelX) - 1, height, fillColor );
-		TheDisplay->drawLine(ul.x, pixelY, ul.x, pixelY + height, 1, lineColor);
-		TheDisplay->drawLine(lr.x + 1, pixelY, lr.x + 1, pixelY + height, 1, lineColor);
-
-	}  // end else
-
-	// draw the terrain texture
-	TheDisplay->drawImage( m_terrainImage, ul.x, ul.y, lr.x, lr.y );
-
-	// refresh the overlay texture once every so many frames
-	if( TheGameClient->getFrame() % OVERLAY_REFRESH_RATE == 0 )
-	{
-
-		// reset the overlay texture
-		SurfaceClass *surface = m_overlayTexture->Get_Surface_Level();
-		surface->Clear();
-		REF_PTR_RELEASE(surface);
-
-		// rebuild the object overlay
-		renderObjectList( getObjectList(), m_overlayTexture );
-		renderObjectList( getLocalObjectList(), m_overlayTexture, TRUE );
-		
-	}  // end if
-
-	// draw the overlay image
- 	TheDisplay->drawImage( m_overlayImage, ul.x, ul.y, lr.x, lr.y );
-
-	// draw the shroud image
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if( TheGlobalData->m_shroudOn )
-#else
-	if (true)
-#endif
-	{
-		TheDisplay->drawImage( m_shroudImage, ul.x, ul.y, lr.x, lr.y );
-	}
-
-	// draw any icons
-	drawIcons( ul.x, ul.y, scaledWidth, scaledHeight );
-
-	// draw any radar events
-	drawEvents( ul.x, ul.y, scaledWidth, scaledHeight );
-
-	// see if we need to reconstruct the view box
-	if( TheTacticalView->getZoom() != m_viewZoom )
-		m_reconstructViewBox = TRUE;
-	if( TheTacticalView->getAngle() != m_viewAngle )
-		m_reconstructViewBox = TRUE;
-
-	if( m_reconstructViewBox == TRUE )
-		reconstructViewBox();
-
-	// draw the view region on top of the radar reconstructing if necessary
-	drawViewBox( ul.x, ul.y, scaledWidth, scaledHeight );
-
-}  // end draw
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DRadar::refreshTerrain( TerrainLogic *terrain )
-{
-
-	// extend base class
-	Radar::refreshTerrain( terrain );
-
-	// rebuild the entire terrain texture
-	buildTerrainTexture( terrain );
-
-}  // end refreshTerrain
-
-
-
-
-
-///The following is an "archive" of an attempt to foil the mapshroud hack... saved for later, since it is too close to release to try it
-
-
-/*
- *
-	void W3DRadar::renderObjectList( const RadarObject *listHead, TextureClass *texture, Bool calcHero )
-{
-
-	// sanity
-	if( listHead == NULL || texture == NULL )
-		return;
-
-	// get surface for texture to render into
-	SurfaceClass *surface = texture->Get_Surface_Level();
-
-	// loop through all objects and draw
-	ICoord2D radarPoint;
-
-	Player *player = ThePlayerList->getLocalPlayer();
-	Int playerIndex=0;
-	if (player)
-		playerIndex=player->getPlayerIndex();
-
-	UnsignedByte minAlpha = 8;
-
-	if( calcHero )
-	{
-		// clear all entries from the cached hero object list
-		m_cachedHeroPosList.clear();
-	}
-
-	for( const RadarObject *rObj = listHead; rObj; rObj = rObj->friend_getNext() )
-	{
-    UnsignedByte h = (UnsignedByte)(rObj->isTemporarilyHidden());
-    if ( h )
-			continue;
-
-    UnsignedByte a = 0;
-
-		// get object
-		const Object *obj = rObj->friend_getObject();
-		UnsignedByte r = 1;   // all decoys
-
-		// cache hero object positions for drawing in icon layer
-		if( calcHero && obj->isHero() )
-		{
-			m_cachedHeroPosList.push_back(obj->getPosition());
-		}
-
-		// get the color we're going to draw in
-		UnsignedInt c = 0xfe000000;// this is a decoy
-    c |= (UnsignedInt)( obj->testStatus( OBJECT_STATUS_STEALTHED ) );//so is this
-
-		// check for shrouded status
-		UnsignedByte k =  (UnsignedByte)(obj->getShroudedStatus(playerIndex) > OBJECTSHROUD_PARTIAL_CLEAR);
-    if ( k || a)
-			continue;	//object is fogged or shrouded, don't render it.
-
- 		//
- 		// objects with a local only unit priority will only appear on the radar if they
- 		// are controlled by the local player, or if the local player is an observer (cause
-		// they are godlike and can see everything)
- 		//
- 		if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY &&
- 				obj->getControllingPlayer() != ThePlayerList->getLocalPlayer() &&
-				ThePlayerList->getLocalPlayer()->isPlayerActive() )
- 			continue;
-
-    UnsignedByte g = c|a;
-    UnsignedByte b = h|a;
-		// get object position
-		const Coord3D *pos = obj->getPosition();
-
-		// compute object position as a radar blip
-		radarPoint.x = pos->x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
-		radarPoint.y = pos->y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
-
-
-		const UnsignedInt framesForTransition = LOGICFRAMES_PER_SECOND;
-		
-
-		
-		// adjust the alpha for stealth units so they "fade/blink" on the radar for the controller
-		// if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY )
-		// ML-- What the heck is this? local-only and neutral-observier-viewed units are stealthy?? Since when?	
-		// Now it twinkles for any stealthed object, whether locally controlled or neutral-observier-viewed
-    c = rObj->getColor();
-
-		if( g & r )
-		{
-		  Real alphaScale = INT_TO_REAL(TheGameLogic->getFrame() % framesForTransition) / (framesForTransition * 0.5f);
-      minAlpha <<= 2; // decoy
-
- 			if ( ( obj->isLocallyControlled() == (Bool)a ) // another decoy, comparing the return of this non-inline with a local
-        && !obj->testStatus( OBJECT_STATUS_DISGUISED ) 
-        && !obj->testStatus( OBJECT_STATUS_DETECTED ) 
-        && ++a != 0 // The trick is that this increment does not occur unless all three above conditions are true
-        && minAlpha == 32  // tricksy hobbit decoy
-        && c != 0 )        // ditto
-      {
-        g = (UnsignedByte)(rObj->getColor());
-        continue;
-      }
-
-      a |= k | b;
-			GameGetColorComponentsWithCheatSpy( c, &r, &g, &b, &a );//this function does not touch the low order bit in 'a' 
-
-			
-			if( alphaScale > 0.0f )
-				a = REAL_TO_UNSIGNEDBYTE( ((alphaScale - 1.0f) * (255.0f - minAlpha)) + minAlpha );
-			else
-				a = REAL_TO_UNSIGNEDBYTE( (alphaScale * (255.0f - minAlpha)) + minAlpha );
-			c = GameMakeColor( r, g, b, a );
-
-		}  // end if
-
-
-
-		
-		// draw the blip, but make sure the points are legal
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-		radarPoint.x++;
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-		radarPoint.y++;
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-		radarPoint.x--;
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-
-
-
-	}  // end for
-	REF_PTR_RELEASE(surface);
-
-}  // end renderObjectList
-
-
- *
- */
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
index 7b8bdc0df67..21cdc985c92 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
@@ -71,4 +71,4 @@ void W3DModuleFactory::init( void )
 	addModule( W3DTracerDraw );
 	addModule( W3DTankTruckDraw );
 
-}  // end init
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DThingFactory.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
index b0c331143f7..3da7098e715 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
@@ -37,12 +37,12 @@
 W3DThingFactory::W3DThingFactory( void )
 {
 
-}  // end W3DThingFactory
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DThingFactory::~W3DThingFactory( void )
 {
 
-}  // end ~W3DThingFactory
+}
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/W3DConvert.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/W3DConvert.cpp
index 6227077bd97..f32700d30e7 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/W3DConvert.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/W3DConvert.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //=============================================================================
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //=============================================================================
 //
 // Project:		RTS3
@@ -40,40 +40,40 @@
 //=============================================================================
 
 //=============================================================================
-//         Includes                                                      
+//         Includes
 //=============================================================================
 #include "W3DDevice/Common/W3DConvert.h"
 
 //=============================================================================
-//         Externals                                                     
+//         Externals
 //=============================================================================
 
 //=============================================================================
-//         Defines                                                         
+//         Defines
 //=============================================================================
 
 //=============================================================================
-//         Private Types                                                     
+//         Private Types
 //=============================================================================
 
 //=============================================================================
-//         Private Data                                                     
+//         Private Data
 //=============================================================================
 
 //=============================================================================
-//         Public Data                                                      
+//         Public Data
 //=============================================================================
 
 //=============================================================================
-//         Private Prototypes                                               
+//         Private Prototypes
 //=============================================================================
 
 //=============================================================================
-//         Private Functions                                               
+//         Private Functions
 //=============================================================================
 
 //=============================================================================
-//         Public Functions                                                
+//         Public Functions
 //=============================================================================
 
 //=============================================================================
@@ -90,7 +90,7 @@ void W3DLogicalScreenToPixelScreen( Real logX, Real logY,
 	*screenX = REAL_TO_INT((screenWidth  * (logX + 1.0f)) / 2.0f);
 	*screenY = REAL_TO_INT((screenHeight * (-logY + 1.0f)) / 2.0f);
 
-}  // end W3DLogicalScreenToPixelScreen
+}
 
 //=============================================================================
 // PixelScreenToW3DLogicalScreen
@@ -107,4 +107,4 @@ void PixelScreenToW3DLogicalScreen( Int screenX, Int screenY,
 	*logX = ((2.0f * screenX) / (Real)screenWidth) - 1.0f;
 	*logY = -(((2.0f * screenY) / (Real)screenHeight) - 1.0f);
 
-}  // end PixelScreenToW3DLogicalScreen
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
index 6c66ca7232d..664d9bbe058 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
@@ -67,7 +67,7 @@ W3DDebrisDraw::W3DDebrisDraw(Thing *thing, const ModuleData* moduleData) : DrawM
 W3DDebrisDraw::~W3DDebrisDraw(void)
 {
 	if (TheW3DShadowManager && m_shadow)
-	{	
+	{
 		TheW3DShadowManager->removeShadow(m_shadow);
 		m_shadow = NULL;
 	}
@@ -76,7 +76,7 @@ W3DDebrisDraw::~W3DDebrisDraw(void)
 		if (W3DDisplay::m_3DScene != NULL)
 			W3DDisplay::m_3DScene->Remove_Render_Object(m_renderObject);
   	REF_PTR_RELEASE(m_renderObject);
- 		m_renderObject = NULL; 	
+ 		m_renderObject = NULL;
 	}
 	for (int i = 0; i < STATECOUNT; ++i)
 	{
@@ -109,14 +109,14 @@ void W3DDebrisDraw::setModelName(AsciiString name, Color color, ShadowType t)
 		if (color != 0)
 			hexColor = color | 0xFF000000;
 		m_renderObject = W3DDisplay::m_assetManager->Create_Render_Obj(name.str(), getDrawable()->getScale(), hexColor);
-		DEBUG_ASSERTCRASH(m_renderObject, ("Debris model %s not found!\n",name.str()));
+		DEBUG_ASSERTCRASH(m_renderObject, ("Debris model %s not found!",name.str()));
 		if (m_renderObject)
 		{
 			if (W3DDisplay::m_3DScene != NULL)
 				W3DDisplay::m_3DScene->Add_Render_Object(m_renderObject);
 
 			m_renderObject->Set_User_Data(getDrawable()->getDrawableInfo());
-			
+
 			Matrix3D transform;
 			///@todo: Change back to identity once we figure out why objects show up at 0,0,0
 			/// OBJECT_PILE
@@ -124,7 +124,7 @@ void W3DDebrisDraw::setModelName(AsciiString name, Color color, ShadowType t)
 			transform.Set(Vector3(0,0,0));
 			m_renderObject->Set_Transform(transform);
 		}
-		
+
 		if (t != SHADOW_NONE)
 		{
 			Shadow::ShadowTypeInfo shadowInfo;
@@ -136,7 +136,7 @@ void W3DDebrisDraw::setModelName(AsciiString name, Color color, ShadowType t)
 		else
 		{
 			if (TheW3DShadowManager && m_shadow)
-			{	
+			{
 				TheW3DShadowManager->removeShadow(m_shadow);
 				m_shadow = NULL;
 			}
@@ -201,8 +201,8 @@ static Bool isNearlyZero(const Coord3D* vel)
 }
 
 // ------------------------------------------------------------------------------------------------
-void W3DDebrisDraw::reactToTransformChange( const Matrix3D *oldMtx, 
-																						const Coord3D *oldPos, 
+void W3DDebrisDraw::reactToTransformChange( const Matrix3D *oldMtx,
+																						const Coord3D *oldPos,
 																						Real oldAngle )
 {
 
@@ -227,13 +227,13 @@ void W3DDebrisDraw::doDrawModule(const Matrix3D* transformMtx)
 		}
 		m_renderObject->Set_Transform(*transformMtx);
 
-		static const RenderObjClass::AnimMode TheAnimModes[STATECOUNT] = 
+		static const RenderObjClass::AnimMode TheAnimModes[STATECOUNT] =
 		{
 			RenderObjClass::ANIM_MODE_ONCE,
 			RenderObjClass::ANIM_MODE_LOOP,
 			RenderObjClass::ANIM_MODE_ONCE
 		};
-		
+
 		Int oldState = m_state;
 		Object* obj = getDrawable()->getObject();
 		const Int MIN_FINAL_FRAMES = 3;
@@ -270,7 +270,7 @@ void W3DDebrisDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -290,7 +290,7 @@ void W3DDebrisDraw::xfer( Xfer *xfer )
 
 	// model name
 	xfer->xferAsciiString( &m_modelName );
-	
+
 	// model color
 	xfer->xferColor( &m_modelColor );
 
@@ -320,7 +320,7 @@ void W3DDebrisDraw::xfer( Xfer *xfer )
 	// final stop
 	xfer->xferBool( &m_finalStop );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -331,4 +331,4 @@ void W3DDebrisDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
index 79d91571611..e07a19a7ca3 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
@@ -90,14 +90,14 @@ W3DDefaultDraw::W3DDefaultDraw(Thing *thing, const ModuleData* moduleData) : Dra
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void W3DDefaultDraw::reactToTransformChange( const Matrix3D *oldMtx, 
-																						 const Coord3D *oldPos, 
+void W3DDefaultDraw::reactToTransformChange( const Matrix3D *oldMtx,
+																						 const Coord3D *oldPos,
 																						 Real oldAngle )
 {
-
+#ifdef LOAD_TEST_ASSETS
 	if( m_renderObject )
 		m_renderObject->Set_Transform( *getDrawable()->getTransformMatrix() );
-
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -106,7 +106,7 @@ W3DDefaultDraw::~W3DDefaultDraw(void)
 {
 #ifdef LOAD_TEST_ASSETS
 	if (TheW3DShadowManager && m_shadow)
-	{	
+	{
 		TheW3DShadowManager->removeShadow(m_shadow);
 		m_shadow = NULL;
 	}
@@ -170,7 +170,7 @@ void W3DDefaultDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -188,7 +188,7 @@ void W3DDefaultDraw::xfer( Xfer *xfer )
 	// extend base class
 	DrawModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -199,4 +199,4 @@ void W3DDefaultDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp
index d77d71ee557..a0151a6016e 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp
@@ -40,15 +40,10 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
-W3DDependencyModelDrawModuleData::W3DDependencyModelDrawModuleData() 
+W3DDependencyModelDrawModuleData::W3DDependencyModelDrawModuleData()
 {
 }
 
@@ -58,11 +53,11 @@ W3DDependencyModelDrawModuleData::~W3DDependencyModelDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DDependencyModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DDependencyModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "AttachToBoneInContainer", INI::parseAsciiString, NULL, offsetof(W3DDependencyModelDrawModuleData, m_attachToDrawableBoneInContainer) },
 
@@ -74,7 +69,7 @@ void W3DDependencyModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DDependencyModelDraw::W3DDependencyModelDraw( Thing *thing, const ModuleData* moduleData ) : W3DModelDraw( thing, moduleData )
-{	 
+{
 	m_dependencyCleared = FALSE;
 }
 
@@ -109,9 +104,9 @@ void W3DDependencyModelDraw::adjustTransformMtx(Matrix3D& mtx) const
 	// We have an additional adjustment to make, we want to use a bone in our container if there is one
 	const Object *me = getDrawable()->getObject();
 	const W3DDependencyModelDrawModuleData *md = getW3DDependencyModelDrawModuleData();
-	
-	if( md->m_attachToDrawableBoneInContainer.isNotEmpty() 
-		&& me 
+
+	if( md->m_attachToDrawableBoneInContainer.isNotEmpty()
+		&& me
 		&& me->getContainedBy()
 		&& !me->getContainedBy()->getContain()->isEnclosingContainerFor(me)
 		)
@@ -128,7 +123,7 @@ void W3DDependencyModelDraw::adjustTransformMtx(Matrix3D& mtx) const
 			}
 			else
 			{
-				DEBUG_LOG(("m_attachToDrawableBoneInContainer %s not found\n",getW3DDependencyModelDrawModuleData()->m_attachToDrawableBoneInContainer.str()));
+				DEBUG_LOG(("m_attachToDrawableBoneInContainer %s not found",getW3DDependencyModelDrawModuleData()->m_attachToDrawableBoneInContainer.str()));
 			}
 		}
 	}
@@ -143,7 +138,7 @@ void W3DDependencyModelDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -164,7 +159,7 @@ void W3DDependencyModelDraw::xfer( Xfer *xfer )
 	// Dependency status
 	xfer->xferBool( &m_dependencyCleared );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -175,6 +170,6 @@ void W3DDependencyModelDraw::loadPostProcess( void )
 	// extend base class
 	W3DModelDraw::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
deleted file mode 100644
index 5c9a27f1e7e..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DLaserDraw.cpp /////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, May 2001
-// Desc:   W3DLaserDraw 
-// Updated: Kris Morness July 2002 -- made it data driven and added new features to make it flexible.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include <stdlib.h>
-
-#include "Common/Thing.h"
-#include "Common/ThingTemplate.h"
-#include "Common/Xfer.h"
-#include "GameClient/Color.h"
-#include "GameClient/Drawable.h"
-#include "GameClient/GameClient.h"
-#include "GameClient/RayEffect.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/Object.h"
-#include "GameLogic/TerrainLogic.h"
-#include "GameLogic/Module/LaserUpdate.h"
-#include "W3DDevice/GameClient/Module/W3DLaserDraw.h"
-#include "W3DDevice/GameClient/W3DDisplay.h"
-#include "W3DDevice/GameClient/W3DScene.h"
-#include "WW3D2/rinfo.h"
-#include "WW3D2/camera.h"
-#include "WW3D2/segline.h"
-#include "WWMath/vector3.h"
-#include "WW3D2/assetmgr.h"
-
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DLaserDrawModuleData::W3DLaserDrawModuleData()
-{
-	m_innerBeamWidth = 0.0f;         //The total width of beam
-	m_outerBeamWidth = 1.0f;         //The total width of beam
-  m_numBeams = 1;                 //Number of overlapping cylinders that make the beam. 1 beam will just use inner data.
-  m_maxIntensityFrames = 0;				//Laser stays at max intensity for specified time in ms.
-  m_fadeFrames = 0;               //Laser will fade and delete.
-	m_scrollRate = 0.0f;
-	m_tile = false;
-	m_segments = 1;
-	m_arcHeight = 0.0f;
-	m_segmentOverlapRatio = 0.0f;
-	m_tilingScalar = 1.0f;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DLaserDrawModuleData::~W3DLaserDrawModuleData()
-{
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DLaserDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
-{
-  ModuleData::buildFieldParse(p);
-
-	static const FieldParse dataFieldParse[] = 
-	{
-		{ "NumBeams",							INI::parseUnsignedInt,					NULL, offsetof( W3DLaserDrawModuleData, m_numBeams ) },
-		{ "InnerBeamWidth",				INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_innerBeamWidth ) },
-		{ "OuterBeamWidth",				INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_outerBeamWidth ) },
-		{ "InnerColor",						INI::parseColorInt,							NULL, offsetof( W3DLaserDrawModuleData, m_innerColor ) },
-		{ "OuterColor",						INI::parseColorInt,							NULL, offsetof( W3DLaserDrawModuleData, m_outerColor ) },
-		{ "MaxIntensityLifetime",	INI::parseDurationUnsignedInt,	NULL, offsetof( W3DLaserDrawModuleData, m_maxIntensityFrames ) },
-		{ "FadeLifetime",					INI::parseDurationUnsignedInt,	NULL, offsetof( W3DLaserDrawModuleData, m_fadeFrames ) },
-		{ "Texture",							INI::parseAsciiString,					NULL, offsetof( W3DLaserDrawModuleData, m_textureName ) },
-		{ "ScrollRate",						INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_scrollRate ) },
-		{ "Tile",									INI::parseBool,									NULL, offsetof( W3DLaserDrawModuleData, m_tile ) },
-		{ "Segments",							INI::parseUnsignedInt,					NULL, offsetof( W3DLaserDrawModuleData, m_segments ) },
-    { "ArcHeight",						INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_arcHeight ) },
-		{ "SegmentOverlapRatio",	INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_segmentOverlapRatio ) },
-		{ "TilingScalar",					INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_tilingScalar ) },
-		{ 0, 0, 0, 0 }
-	};
-  p.add(dataFieldParse);
-}
-
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DLaserDraw::W3DLaserDraw( Thing *thing, const ModuleData* moduleData ) : 
-	DrawModule( thing, moduleData ),
-	m_line3D(NULL),
-	m_texture(NULL),
-	m_textureAspectRatio(1.0f),
-	m_selfDirty(TRUE)
-{
-	Vector3 dummyPos1( 0.0f, 0.0f, 0.0f );
-	Vector3 dummyPos2( 1.0f, 1.0f, 1.0f );
-	Int i;
-
-	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
-
-	m_texture = WW3DAssetManager::Get_Instance()->Get_Texture( data->m_textureName.str() );
-	if (m_texture)
-	{
-		SurfaceClass::SurfaceDescription surfaceDesc; 
-		m_texture->Get_Level_Description(surfaceDesc);
-		m_textureAspectRatio = (Real)surfaceDesc.Width/(Real)surfaceDesc.Height;
-	}
-
-	//Get the color components for calculation purposes.
-	Real innerRed, innerGreen, innerBlue, innerAlpha, outerRed, outerGreen, outerBlue, outerAlpha;
-	GameGetColorComponentsReal( data->m_innerColor, &innerRed, &innerGreen, &innerBlue, &innerAlpha );
-	GameGetColorComponentsReal( data->m_outerColor, &outerRed, &outerGreen, &outerBlue, &outerAlpha );
-
-	//Make sure our beams range between 1 and the maximum cap.
-#ifdef I_WANT_TO_BE_FIRED
-// srj sez: this data is const for a reason. casting away the constness because we don't like the values
-// isn't an acceptable solution. if you need to constrain the values, do so at parsing time, when
-// it's still legal to modify these values. (In point of fact, there's not even really any reason to limit
-// the numBeams or segments anymore.)
-	data->m_numBeams =		 __min( __max( 1, data->m_numBeams ), MAX_LASER_LINES );
-	data->m_segments =		 __min( __max( 1, data->m_segments ), MAX_SEGMENTS );
-	data->m_tilingScalar = __max( 0.01f, data->m_tilingScalar );
-#endif
-
-	//Allocate an array of lines equal to the number of beams * segments
-	m_line3D = NEW SegmentedLineClass *[ data->m_numBeams * data->m_segments ];
-
-	for( UnsignedInt segment = 0; segment < data->m_segments; segment++ )
-	{
-		//We don't care about segment positioning yet until we actually set the position
-		
-		// create all the lines we need at the right transparency level
-		for( i = data->m_numBeams - 1; i >= 0; i-- )
-		{
-			int index = segment * data->m_numBeams + i;
-
-			Real red, green, blue, alpha, width;
-
-			if( data->m_numBeams == 1 )
-			{	
-				width = data->m_innerBeamWidth;
-				alpha = innerAlpha;
-				red = innerRed * innerAlpha;
-				green = innerGreen * innerAlpha;
-				blue = innerBlue * innerAlpha;
-			}
-			else
-			{
-				//Calculate the scale between min and max values
-				//0 means use min value, 1 means use max value
-				//0.2 means min value + 20% of the diff between min and max
-				Real scale = i / ( data->m_numBeams - 1.0f);
-				
-				width		= data->m_innerBeamWidth	+ scale * (data->m_outerBeamWidth - data->m_innerBeamWidth);
-				alpha		= innerAlpha							+ scale * (outerAlpha - innerAlpha);
-				red			= innerRed								+ scale * (outerRed - innerRed) * innerAlpha;
-				green		= innerGreen							+ scale * (outerGreen - innerGreen) * innerAlpha;
-				blue		= innerBlue								+ scale * (outerBlue - innerBlue) * innerAlpha;
-			}
-
-			m_line3D[ index ] = NEW SegmentedLineClass;
-			
-			SegmentedLineClass *line = m_line3D[ index ];
-			if( line )
-			{
-				line->Set_Texture( m_texture );
-				line->Set_Shader( ShaderClass::_PresetAdditiveShader );	//pick the alpha blending mode you want - see shader.h for others.
-				line->Set_Width( width );
-				line->Set_Color( Vector3( red, green, blue ) );
-				line->Set_UV_Offset_Rate( Vector2(0.0f, data->m_scrollRate) );	//amount to scroll texture on each draw
-				if( m_texture )
-				{
-					line->Set_Texture_Mapping_Mode(SegLineRendererClass::TILED_TEXTURE_MAP);	//this tiles the texture across the line
-				}
-
-				// add to scene
-				if (W3DDisplay::m_3DScene != NULL)
-					W3DDisplay::m_3DScene->Add_Render_Object( line );	//add it to our scene so it gets rendered with other objects.
-
-				// hide the render object until the first time we come to draw it and
-				// set the correct position
-				line->Set_Visible( 0 );
-			}
-
-
-		}  // end for i
-
-	} //end segment loop
-
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DLaserDraw::~W3DLaserDraw( void )
-{
-	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
-
-	for( UnsignedInt i = 0; i < data->m_numBeams * data->m_segments; i++ )
-	{
-
-		// remove line from scene
-		if (W3DDisplay::m_3DScene != NULL)
-			W3DDisplay::m_3DScene->Remove_Render_Object( m_line3D[ i ] );
-
-		// delete line
-		REF_PTR_RELEASE( m_line3D[ i ] );
-
-	}  // end for i
-
-	delete [] m_line3D;
-	// TheSuperHackers @fix Mauller 11/03/2025 Free reference counted material
-	REF_PTR_RELEASE(m_texture);
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-Real W3DLaserDraw::getLaserTemplateWidth() const
-{
-	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
-	return data->m_outerBeamWidth * 0.5f;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DLaserDraw::doDrawModule(const Matrix3D* transformMtx)
-{
-	//UnsignedInt currentFrame = TheGameClient->getFrame();
-	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
-
-	//Get the updatemodule that drives it...
-	Drawable *draw = getDrawable();
-	static NameKeyType key_LaserUpdate = NAMEKEY( "LaserUpdate" );
-	LaserUpdate *update = (LaserUpdate*)draw->findClientUpdateModule( key_LaserUpdate );
-	if( !update )
-	{
-		DEBUG_ASSERTCRASH( 0, ("W3DLaserDraw::doDrawModule() expects its owner drawable %s to have a ClientUpdate = LaserUpdate module.", draw->getTemplate()->getName().str() ));
-		return;
-	}
-
-	//If the update has moved the laser, it requires a reset of the laser.
-	if (update->isDirty() || m_selfDirty)
-	{
-		update->setDirty(false);
-		m_selfDirty = false;
-
-		Vector3 laserPoints[ 2 ];
-
-		for( UnsignedInt segment = 0; segment < data->m_segments; segment++ )
-		{
-			if( data->m_arcHeight > 0.0f && data->m_segments > 1 )
-			{
-				//CALCULATE A CURVED LINE BASED ON TOTAL LENGTH AND DESIRED HEIGHT INCREASE
-				//To do this we will use a portion of the cos wave ranging between -0.25PI
-				//and +0.25PI. 0PI is 1.0 and 0.25PI is 0.70 -- resulting in a somewhat
-				//gentle curve depending on the line height and length. We also have to make
-				//the line *level* for this phase of the calculations.
-
-				//Get the desired direct line
-				Coord3D lineStart, lineEnd, lineVector;
-				lineStart.set( update->getStartPos() );
-				lineEnd.set( update->getEndPos() );
-				//This is critical -- in the case we have sloped lines (at the end, we'll fix it)
-//				lineEnd.z = lineStart.z;
-
-				//Get the length of the line
-				lineVector.set( &lineEnd );
-				lineVector.sub( &lineStart );
-				Real lineLength = lineVector.length();
-
-				//Get the middle point (we'll use this to determine how far we are from
-				//that to calculate our height -- middle point is the highest).
-				Coord3D lineMiddle;
-				lineMiddle.set( &lineStart );
-				lineMiddle.add( &lineEnd );
-				lineMiddle.scale( 0.5 );
-
-				//The half length is used to scale with the distance from middle to 
-				//get our cos( 0 to 0.25 PI) cos value
-				Real halfLength = lineLength * 0.5f;
-
-				//Now calculate which segment we will use.
-				Real startSegmentRatio = segment / ((Real)data->m_segments);
-				Real endSegmentRatio = (segment + 1.0f) / ((Real)data->m_segments);
-
-				//Offset the segment ever-so-slightly to minimize overlap -- only apply
-				//to segments that are not the start/end point
-				if( segment > 0 ) 
-				{
-					startSegmentRatio -= data->m_segmentOverlapRatio;
-				}
-				if( segment < data->m_segments - 1 )
-				{
-					endSegmentRatio += data->m_segmentOverlapRatio;
-				}
-
-				//Calculate our start segment position on the *ground*.
-				Coord3D segmentStart, segmentEnd, vector;
-				vector.set( &lineVector );
-				vector.scale( startSegmentRatio );
-				segmentStart.set( &lineStart );
-				segmentStart.add( &vector );
-
-				//Calculate our end segment position on the *ground*.
-				vector.set( &lineVector );
-				vector.scale( endSegmentRatio );
-				segmentEnd.set( &lineStart );
-				segmentEnd.add( &vector );
-
-				//--------------------------------------------------------------------------------
-				//Now at this point, we have our segment line in the level positions that we want.
-				//Calculate the raised height for the start/end segment positions using cosine.
-				//--------------------------------------------------------------------------------
-
-				//Calculate the distance from midpoint for the start positions.
-				vector.set( &lineMiddle );
-				vector.sub( &segmentStart );
-				Real dist = vector.length();
-				Real scaledRadians = dist / halfLength * PI * 0.5f; 
-				Real height = cos( scaledRadians );
-				height *= data->m_arcHeight;
-				segmentStart.z += height;
-
-				//Now do the same thing for the end position.
-				vector.set( &lineMiddle );
-				vector.sub( &segmentEnd );
-				dist = vector.length();
-				scaledRadians = dist / halfLength * PI * 0.5f; 
-				height = cos( scaledRadians );
-				height *= data->m_arcHeight;
-				segmentEnd.z += height;
-				
-				//This makes the laser skim the ground rather than penetrate it!
-				laserPoints[ 0 ].Set( segmentStart.x, segmentStart.y, 
-					MAX( segmentStart.z, 2.0f + TheTerrainLogic->getGroundHeight(segmentStart.x, segmentStart.y) ) );
-				laserPoints[ 1 ].Set( segmentEnd.x, segmentEnd.y, 
-					MAX( segmentEnd.z, 2.0f + TheTerrainLogic->getGroundHeight(segmentEnd.x, segmentEnd.y) ) );
-				
-			}
-			else
-			{
-				//No arc -- way simpler!
-				laserPoints[ 0 ].Set( update->getStartPos()->x, update->getStartPos()->y, update->getStartPos()->z );
-				laserPoints[ 1 ].Set( update->getEndPos()->x, update->getEndPos()->y, update->getEndPos()->z );
-			}
-
-			//Get the color components for calculation purposes.
-			Real innerRed, innerGreen, innerBlue, innerAlpha, outerRed, outerGreen, outerBlue, outerAlpha;
-			GameGetColorComponentsReal( data->m_innerColor, &innerRed, &innerGreen, &innerBlue, &innerAlpha );
-			GameGetColorComponentsReal( data->m_outerColor, &outerRed, &outerGreen, &outerBlue, &outerAlpha );
-
-			for( Int i = data->m_numBeams - 1; i >= 0; i-- )
-			{
-
-				Real alpha, width;
-				int index = segment * data->m_numBeams + i;
-
-				if( data->m_numBeams == 1 )
-				{	
-					width = data->m_innerBeamWidth * update->getWidthScale();
-					alpha = innerAlpha;
-				}
-				else
-				{
-					//Calculate the scale between min and max values
-					//0 means use min value, 1 means use max value
-					//0.2 means min value + 20% of the diff between min and max
-					Real scale = i / ( data->m_numBeams - 1.0f);
-					Real ultimateScale = update->getWidthScale();
-					width		= (data->m_innerBeamWidth	+ scale * (data->m_outerBeamWidth - data->m_innerBeamWidth));
-					width *= ultimateScale;
-					alpha		= innerAlpha							+ scale * (outerAlpha - innerAlpha);
-				}
-
-
-				//Calculate the number of times to tile the line based on the height of the texture used.
-				if( m_texture && data->m_tile )
-				{
-					//Calculate the length of the line.
-					Vector3 lineVector;
-					Vector3::Subtract( laserPoints[1], laserPoints[0], &lineVector );
-					Real length = lineVector.Length();
-
-					//Adjust tile factor so texture is NOT stretched but tiled equally in both width and length.
-					Real tileFactor = length/width*m_textureAspectRatio*data->m_tilingScalar;
-
-					//Set the tile factor
-					m_line3D[ index ]->Set_Texture_Tile_Factor( tileFactor );	//number of times to tile texture across each segment
-				}
-
-				m_line3D[ index ]->Set_Width( width );
-				m_line3D[ index ]->Set_Points( 2, &laserPoints[0] );
-			}
-		}
-	}
-	
-	return;
-}
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void W3DLaserDraw::crc( Xfer *xfer )
-{
-
-	// extend base class
-	DrawModule::crc( xfer );
-
-}  // end crc
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer method
-	* Version Info:
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-void W3DLaserDraw::xfer( Xfer *xfer )
-{
-
-	// version
-	const XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// extend base class
-	DrawModule::xfer( xfer );
-
-	// Kris says there is no data to save for these, go ask him.
-	// m_selfDirty is not saved, is runtime only
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void W3DLaserDraw::loadPostProcess( void )
-{
-
-	// extend base class
-	DrawModule::loadPostProcess();
-
-	m_selfDirty = true;	// so we update the first time after reload
-
-}  // end loadPostProcess
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
index 429b71813cb..aab8c0ebf9a 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
@@ -68,11 +68,6 @@
 #include "WW3D2/meshmdl.h"
 #include "Common/BitFlagsIO.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 static inline Bool isValidTimeToCalcLogicStuff()
@@ -85,7 +80,7 @@ static inline Bool isValidTimeToCalcLogicStuff()
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 
-#if defined(DEBUG_CRC) && (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+#if defined(DEBUG_CRC) && defined(RTS_DEBUG)
 #include <cstdarg>
 class LogClass
 {
@@ -104,19 +99,13 @@ LogClass::LogClass(const char *fname)
 {
 	char buffer[ _MAX_PATH ];
 	GetModuleFileName( NULL, buffer, sizeof( buffer ) );
-	char *pEnd = buffer + strlen( buffer );
-	while( pEnd != buffer )
+	if (char *pEnd = strrchr(buffer, '\\'))
 	{
-		if( *pEnd == '\\' )
-		{
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+		*pEnd = 0;
 	}
-	AsciiString fullPath;
-	fullPath.format("%s\\%s", buffer, fname);
-	m_fp = fopen(fullPath.str(), "wt");
+	// TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.
+	const std::string fullPath = std::string(buffer) + "\\" + fname;
+	m_fp = fopen(fullPath.c_str(), "wt");
 }
 
 LogClass::~LogClass()
@@ -165,10 +154,10 @@ void LogClass::dumpMatrix3D(const Matrix3D *m, AsciiString name, AsciiString fna
 	fname.toLower();
 	fname = fname.reverseFind('\\') + 1;
 	const Real *matrix = (const Real *)m;
-	log("dumpMatrix3D() %s:%d %s\n",
+	log("dumpMatrix3D() %s:%d %s",
 		fname.str(), line, name.str());
 	for (Int i=0; i<3; ++i)
-		log("      0x%08X 0x%08X 0x%08X 0x%08X\n",
+		log("      0x%08X 0x%08X 0x%08X 0x%08X",
 			AS_INT(matrix[(i<<2)+0]), AS_INT(matrix[(i<<2)+1]), AS_INT(matrix[(i<<2)+2]), AS_INT(matrix[(i<<2)+3]));
 }
 
@@ -178,7 +167,7 @@ void LogClass::dumpReal(Real r, AsciiString name, AsciiString fname, Int line)
 		return;
 	fname.toLower();
 	fname = fname.reverseFind('\\') + 1;
-	log("dumpReal() %s:%d %s %8.8X (%f)\n",
+	log("dumpReal() %s:%d %s %8.8X (%f)",
 		fname.str(), line, name.str(), AS_INT(r), r);
 }
 
@@ -204,11 +193,11 @@ LogClass BonePosLog("bonePositions.txt");
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 extern AsciiString TheThingTemplateBeingParsedName;
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 extern Real TheSkateDistOverride;
 #endif
 
@@ -232,9 +221,11 @@ enum ACBits CPP_11(: Int)
 	MAINTAIN_FRAME_ACROSS_STATES2,
 	MAINTAIN_FRAME_ACROSS_STATES3,
 	MAINTAIN_FRAME_ACROSS_STATES4,
+
+	AC_BITS_COUNT
 };
 
-static const char *ACBitsNames[] =
+static const char *const ACBitsNames[] =
 {
 	"RANDOMSTART",
 	"START_FRAME_FIRST",
@@ -246,9 +237,10 @@ static const char *ACBitsNames[] =
 	"MAINTAIN_FRAME_ACROSS_STATES2",
 	"MAINTAIN_FRAME_ACROSS_STATES3",
 	"MAINTAIN_FRAME_ACROSS_STATES4",
-	
+
 	NULL
 };
+static_assert(ARRAY_SIZE(ACBitsNames) == AC_BITS_COUNT + 1, "Incorrect array size");
 
 static const Int ALL_MAINTAIN_FRAME_FLAGS =
 	(1<<MAINTAIN_FRAME_ACROSS_STATES) |
@@ -274,7 +266,7 @@ inline Bool isCommonMaintainFrameFlagSet(Int a, Int b)
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-static const char *TerrainDecalTextureName[TERRAIN_DECAL_MAX-1]=
+static const char *TerrainDecalTextureName[TERRAIN_DECAL_MAX]=
 {
 #ifdef ALLOW_DEMORALIZE
 	"DM_RING",//demoralized
@@ -282,30 +274,40 @@ static const char *TerrainDecalTextureName[TERRAIN_DECAL_MAX-1]=
 	"TERRAIN_DECAL_DEMORALIZED_OBSOLETE",
 #endif
 	"EXHorde",//enthusiastic
-	"EXHorde_UP", //enthusiastic with nationalism 
+	"EXHorde_UP", //enthusiastic with nationalism
 	"EXHordeB",//enthusiastic vehicle
 	"EXHordeB_UP", //enthusiastic vehicle with nationalism
 	"EXJunkCrate",//Marks a crate as special
+#if RTS_GENERALS && RETAIL_COMPATIBLE_XFER_SAVE
+	"", //dummy entry for TERRAIN_DECAL_NONE
+	"EXHordeC_UP", //enthusiastic with fanaticism
+	"EXChemSuit", //Marks a unit as having chemical suit on
+#else
+	"EXHordeC_UP", //enthusiastic with fanaticism
+	"EXChemSuit", //Marks a unit as having chemical suit on
+	"", //dummy entry for TERRAIN_DECAL_NONE
+#endif
+	"" //dummy entry for TERRAIN_DECAL_SHADOW_TEXTURE
 };
 
 const UnsignedInt NO_NEXT_DURATION = 0xffffffff;
 
 //-------------------------------------------------------------------------------------------------
-W3DAnimationInfo::W3DAnimationInfo(const AsciiString& name, Bool isIdle, Real distanceCovered) : 
+W3DAnimationInfo::W3DAnimationInfo(const AsciiString& name, Bool isIdle, Real distanceCovered) :
 #ifdef RETAIN_ANIM_HANDLES
-	m_handle(NULL), 
+	m_handle(NULL),
 	m_naturalDurationInMsec(0),
 #else
 	m_naturalDurationInMsec(-1),
 #endif
 	m_name(name),
-	m_isIdleAnim(isIdle), 
+	m_isIdleAnim(isIdle),
 	m_distanceCovered(distanceCovered)
-{ 
+{
 }
 
 //-------------------------------------------------------------------------------------------------
-W3DAnimationInfo::W3DAnimationInfo( const W3DAnimationInfo &r ) : 
+W3DAnimationInfo::W3DAnimationInfo( const W3DAnimationInfo &r ) :
 	m_name(r.m_name),
 #ifdef RETAIN_ANIM_HANDLES
 	m_handle(r.m_handle),
@@ -342,13 +344,13 @@ W3DAnimationInfo& W3DAnimationInfo::operator=(const W3DAnimationInfo &r)
 //-------------------------------------------------------------------------------------------------
 // note that this now returns an ADDREFED handle, which must be released by the caller!
 HAnimClass* W3DAnimationInfo::getAnimHandle() const
-{ 
+{
 #ifdef RETAIN_ANIM_HANDLES
 	if (m_handle == NULL)
 	{
 		// Get_HAnim addrefs it, so we'll have to release it in our dtor.
 		m_handle = W3DDisplay::m_assetManager->Get_HAnim(m_name.str());
-		DEBUG_ASSERTCRASH(m_handle, ("*** ASSET ERROR: animation %s not found\n",m_name.str()));
+		DEBUG_ASSERTCRASH(m_handle, ("*** ASSET ERROR: animation %s not found",m_name.str()));
 		if (m_handle)
 		{
 			m_naturalDurationInMsec = m_handle->Get_Num_Frames() * 1000.0f / m_handle->Get_Frame_Rate();
@@ -360,7 +362,7 @@ HAnimClass* W3DAnimationInfo::getAnimHandle() const
 	return m_handle;
 #else
 	HAnimClass* handle = W3DDisplay::m_assetManager->Get_HAnim(m_name.str());
-	DEBUG_ASSERTCRASH(handle, ("*** ASSET ERROR: animation %s not found\n",m_name.str()));
+	DEBUG_ASSERTCRASH(handle, ("*** ASSET ERROR: animation %s not found",m_name.str()));
 	if (handle != NULL && m_naturalDurationInMsec < 0)
 	{
 		m_naturalDurationInMsec = handle->Get_Num_Frames() * 1000.0f / handle->Get_Frame_Rate();
@@ -373,11 +375,11 @@ HAnimClass* W3DAnimationInfo::getAnimHandle() const
 }
 
 //-------------------------------------------------------------------------------------------------
-W3DAnimationInfo::~W3DAnimationInfo() 
-{ 
+W3DAnimationInfo::~W3DAnimationInfo()
+{
 #ifdef RETAIN_ANIM_HANDLES
-	REF_PTR_RELEASE(m_handle); 
-	m_handle = NULL; 
+	REF_PTR_RELEASE(m_handle);
+	m_handle = NULL;
 #endif
 }
 
@@ -389,7 +391,7 @@ void ModelConditionInfo::preloadAssets( TimeOfDay timeOfDay, Real scale )
 	{
 		TheDisplay->preloadModelAssets( m_modelName );
 	}
-	
+
 	// this can be called from the client, which is problematic
 //	validateStuff(NULL, getDrawable()->getScale());
 	//validateCachedBones(NULL, scale);
@@ -414,8 +416,8 @@ void ModelConditionInfo::addPublicBone(const AsciiString& boneName) const
 //-------------------------------------------------------------------------------------------------
 Bool ModelConditionInfo::matchesMode(Bool night, Bool snowy) const
 {
-	for (std::vector<ModelConditionFlags>::const_iterator it = m_conditionsYesVec.begin(); 
-				it != m_conditionsYesVec.end(); 
+	for (std::vector<ModelConditionFlags>::const_iterator it = m_conditionsYesVec.begin();
+				it != m_conditionsYesVec.end();
 				++it)
 	{
 		if (it->test(MODELCONDITION_NIGHT) == (night) &&
@@ -466,12 +468,12 @@ static Bool findSingleSubObj(RenderObjClass* robj, const AsciiString& boneName,
 		// boneIndex = childObject->Get_Sub_Object_Bone_Index(childObject);
 
 		for (Int subObj = 0; subObj < robj->Get_Num_Sub_Objects(); subObj++)
-		{	
+		{
 			RenderObjClass* test = robj->Get_Sub_Object(subObj);
 			if (test == childObject)
 			{
 				boneIndex = robj->Get_Sub_Object_Bone_Index(0, subObj);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 				test->Release_Ref();
 				test = robj->Get_Sub_Object_On_Bone(0, boneIndex);
 				DEBUG_ASSERTCRASH(test != NULL && test == childObject, ("*** ASSET ERROR: Hmm, bone problem"));
@@ -506,8 +508,8 @@ static Bool doSingleBoneName(RenderObjClass* robj, const AsciiString& boneName,
 
 	if (findSingleBone(robj, boneNameTmp, info.mtx, info.boneIndex))
 	{
-//DEBUG_LOG(("added bone %s\n",boneNameTmp.str()));
-		BONEPOS_LOG(("Caching bone %s (index %d)\n", boneNameTmp.str(), info.boneIndex));
+//DEBUG_LOG(("added bone %s",boneNameTmp.str()));
+		BONEPOS_LOG(("Caching bone %s (index %d)", boneNameTmp.str(), info.boneIndex));
 		BONEPOS_DUMPMATRIX3D(&(info.mtx));
 
 		map[NAMEKEY(boneNameTmp)] = info;
@@ -519,8 +521,8 @@ static Bool doSingleBoneName(RenderObjClass* robj, const AsciiString& boneName,
 		tmp.format("%s%02d", boneNameTmp.str(), i);
 		if (findSingleBone(robj, tmp, info.mtx, info.boneIndex))
 		{
-//DEBUG_LOG(("added bone %s\n",tmp.str()));
-			BONEPOS_LOG(("Caching bone %s (index %d)\n", tmp.str(), info.boneIndex));
+//DEBUG_LOG(("added bone %s",tmp.str()));
+			BONEPOS_LOG(("Caching bone %s (index %d)", tmp.str(), info.boneIndex));
 			BONEPOS_DUMPMATRIX3D(&(info.mtx));
 			map[NAMEKEY(tmp)] = info;
 			foundAsBone = true;
@@ -535,8 +537,8 @@ static Bool doSingleBoneName(RenderObjClass* robj, const AsciiString& boneName,
 	{
 		if (findSingleSubObj(robj, boneNameTmp, info.mtx, info.boneIndex))
 		{
-//DEBUG_LOG(("added subobj %s\n",boneNameTmp.str()));
-			BONEPOS_LOG(("Caching bone from subobject %s (index %d)\n", boneNameTmp.str(), info.boneIndex));
+//DEBUG_LOG(("added subobj %s",boneNameTmp.str()));
+			BONEPOS_LOG(("Caching bone from subobject %s (index %d)", boneNameTmp.str(), info.boneIndex));
 			BONEPOS_DUMPMATRIX3D(&(info.mtx));
 			map[NAMEKEY(boneNameTmp)] = info;
 			foundAsSubObj = true;
@@ -547,8 +549,8 @@ static Bool doSingleBoneName(RenderObjClass* robj, const AsciiString& boneName,
 			tmp.format("%s%02d", boneNameTmp.str(), i);
 			if (findSingleSubObj(robj, tmp, info.mtx, info.boneIndex))
 			{
-//DEBUG_LOG(("added subobj %s\n",tmp.str()));
-				BONEPOS_LOG(("Caching bone from subobject %s (index %d)\n", tmp.str(), info.boneIndex));
+//DEBUG_LOG(("added subobj %s",tmp.str()));
+				BONEPOS_LOG(("Caching bone from subobject %s (index %d)", tmp.str(), info.boneIndex));
 				BONEPOS_DUMPMATRIX3D(&(info.mtx));
 				map[NAMEKEY(tmp)] = info;
 				foundAsSubObj = true;
@@ -569,7 +571,7 @@ void ModelConditionInfo::validateStuff(RenderObjClass* robj, Real scale, const s
 // srj sez: hm, this doesn't make sense; I think we really do need to validate transition states.
 //	if (m_transition != NO_TRANSITION)
 //		return;
-	
+
 	loadAnimations();
 	if (!(m_validStuff & PUBLIC_BONES_VALID) && isValidTimeToCalcLogicStuff())
 	{
@@ -601,7 +603,7 @@ void ModelConditionInfo::validateCachedBones(RenderObjClass* robj, Real scale) c
 	setFPMode();
 
 	BONEPOS_LOG(("Validating bones for %s: %s", m_modelName.str(), getDescription().str()));
-	//BONEPOS_LOG(("Passing in valid render obj: %d\n", (robj != 0)));
+	//BONEPOS_LOG(("Passing in valid render obj: %d", (robj != 0)));
 	BONEPOS_DUMPREAL(scale);
 
 	m_pristineBones.clear();
@@ -614,15 +616,15 @@ void ModelConditionInfo::validateCachedBones(RenderObjClass* robj, Real scale) c
 	{
 		if (m_modelName.isEmpty())
 		{
-			//BONEPOS_LOG(("Bailing: model name is empty\n"));
+			//BONEPOS_LOG(("Bailing: model name is empty"));
 			return;
 		}
 
 		robj = W3DDisplay::m_assetManager->Create_Render_Obj(m_modelName.str(), scale, 0);
-		DEBUG_ASSERTCRASH(robj, ("*** ASSET ERROR: Model %s not found!\n",m_modelName.str()));
+		DEBUG_ASSERTCRASH(robj, ("*** ASSET ERROR: Model %s not found!",m_modelName.str()));
 		if (!robj)
 		{
-			//BONEPOS_LOG(("Bailing: could not load render object\n"));
+			//BONEPOS_LOG(("Bailing: could not load render object"));
 			return;
 		}
 		tossRobj = true;
@@ -645,7 +647,7 @@ void ModelConditionInfo::validateCachedBones(RenderObjClass* robj, Real scale) c
 	// if we have any animations in this state, always choose the first, since the animations
 	// vary on a per-client basis.
 	HAnimClass* animToUse;
-	if (m_animations.size() > 0)
+	if (!m_animations.empty())
 	{
 		animToUse = m_animations.front().getAnimHandle();	// return an AddRef'ed handle
 	}
@@ -676,11 +678,11 @@ void ModelConditionInfo::validateCachedBones(RenderObjClass* robj, Real scale) c
 			if (!doSingleBoneName(robj, *it, m_pristineBones))
 			{
 				// don't crash here, since these are catch-all global bones and won't be present in most models.
-				//DEBUG_CRASH(("public bone %s (and variations thereof) not found in model %s!\n",it->str(),m_modelName.str()));
+				//DEBUG_CRASH(("public bone %s (and variations thereof) not found in model %s!",it->str(),m_modelName.str()));
 			}
 			//else
 			//{
-			//	DEBUG_LOG(("global bone %s (or variations thereof) found in model %s\n",it->str(),m_modelName.str()));
+			//	DEBUG_LOG(("global bone %s (or variations thereof) found in model %s",it->str(),m_modelName.str()));
 			//}
 		}
 	}
@@ -689,11 +691,11 @@ void ModelConditionInfo::validateCachedBones(RenderObjClass* robj, Real scale) c
 		if (!doSingleBoneName(robj, *it, m_pristineBones))
 		{
 			// DO crash here, since we specifically requested this bone for this model
-			DEBUG_CRASH(("*** ASSET ERROR: public bone '%s' (and variations thereof) not found in model %s!\n",it->str(),m_modelName.str()));
+			DEBUG_CRASH(("*** ASSET ERROR: public bone '%s' (and variations thereof) not found in model %s!",it->str(),m_modelName.str()));
 		}
 		//else
 		//{
-		//	DEBUG_LOG(("extra bone %s (or variations thereof) found in model %s\n",it->str(),m_modelName.str()));
+		//	DEBUG_LOG(("extra bone %s (or variations thereof) found in model %s",it->str(),m_modelName.str()));
 		//}
 	}
 
@@ -751,7 +753,7 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 				{
 					sprintf(buffer, "%s%02d", mfName.str(), i);
 					findPristineBone(NAMEKEY(buffer), &info.m_muzzleFlashBone);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 					if (info.m_muzzleFlashBone)
 						info.m_muzzleFlashBoneName = buffer;
 #endif
@@ -777,9 +779,9 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 				if (info.m_fxBone == 0 && info.m_recoilBone == 0 && info.m_muzzleFlashBone == 0 && plbBoneIndex == 0)
 					break;
 
-				CRCDEBUG_LOG(("validateWeaponBarrelInfo() - model name %s wslot %d\n", m_modelName.str(), wslot));
+				CRCDEBUG_LOG(("validateWeaponBarrelInfo() - model name %s wslot %d", m_modelName.str(), wslot));
 				DUMPMATRIX3D(&(info.m_projectileOffsetMtx));
-				BONEPOS_LOG(("validateWeaponBarrelInfo() - model name %s wslot %d\n", m_modelName.str(), wslot));
+				BONEPOS_LOG(("validateWeaponBarrelInfo() - model name %s wslot %d", m_modelName.str(), wslot));
 				BONEPOS_DUMPMATRIX3D(&(info.m_projectileOffsetMtx));
 				m_weaponBarrelInfoVec[wslot].push_back(info);
 
@@ -788,7 +790,7 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 
 				prevFxBone = info.m_fxBone;
 			}
-			
+
 			if (m_weaponBarrelInfoVec[wslot].empty())
 			{
 				// try the unadorned names
@@ -799,7 +801,7 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 				if (!mfName.isEmpty())
 					findPristineBone(NAMEKEY(mfName), &info.m_muzzleFlashBone);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 				if (info.m_muzzleFlashBone)
 					info.m_muzzleFlashBoneName = mfName;
 #endif
@@ -812,12 +814,12 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 
 				if (!fxBoneName.isEmpty())
 					findPristineBone(NAMEKEY(fxBoneName), &info.m_fxBone);
-				
+
 				if (info.m_fxBone != 0 || info.m_recoilBone != 0 || info.m_muzzleFlashBone != 0 || plbMtx != NULL)
 				{
-					CRCDEBUG_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) wslot %d\n", m_modelName.str(), wslot));
+					CRCDEBUG_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) wslot %d", m_modelName.str(), wslot));
 					DUMPMATRIX3D(&(info.m_projectileOffsetMtx));
-					BONEPOS_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) wslot %d\n", m_modelName.str(), wslot));
+					BONEPOS_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) wslot %d", m_modelName.str(), wslot));
 					BONEPOS_DUMPMATRIX3D(&(info.m_projectileOffsetMtx));
 					m_weaponBarrelInfoVec[wslot].push_back(info);
 					if (info.m_recoilBone != 0 || info.m_muzzleFlashBone != 0)
@@ -825,16 +827,16 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 				}
 				else
 				{
-					CRCDEBUG_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) found nothing\n", m_modelName.str()));
-					BONEPOS_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) found nothing\n", m_modelName.str()));
+					CRCDEBUG_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) found nothing", m_modelName.str()));
+					BONEPOS_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) found nothing", m_modelName.str()));
 				}
-			}	// if empty
+			}
 
-			DEBUG_ASSERTCRASH(!(m_modelName.isNotEmpty() && m_weaponBarrelInfoVec[wslot].empty()), ("*** ASSET ERROR: No fx bone named '%s' found in model %s!\n",fxBoneName.str(),m_modelName.str()));
+			DEBUG_ASSERTCRASH(!(m_modelName.isNotEmpty() && m_weaponBarrelInfoVec[wslot].empty()), ("*** ASSET ERROR: No fx bone named '%s' found in model %s!",fxBoneName.str(),m_modelName.str()));
 		}
 	}
 	m_validStuff |= BARRELS_VALID;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void ModelConditionInfo::validateTurretInfo() const
@@ -859,34 +861,34 @@ void ModelConditionInfo::validateTurretInfo() const
 		{
 			if (findPristineBone(tur.m_turretAngleNameKey, &tur.m_turretAngleBone) == NULL)
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found! (%s)\n",KEYNAME(tur.m_turretAngleNameKey).str(),m_modelName.str()));
+				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found! (%s)",KEYNAME(tur.m_turretAngleNameKey).str(),m_modelName.str()));
 				tur.m_turretAngleBone = 0;
 			}
 		}
 		else
 		{
 			tur.m_turretAngleBone = 0;
-		}	
+		}
 
 		if (tur.m_turretPitchNameKey != NAMEKEY_INVALID)
 		{
 			if (findPristineBone(tur.m_turretPitchNameKey, &tur.m_turretPitchBone) == NULL)
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found! (%s)\n",KEYNAME(tur.m_turretPitchNameKey).str(),m_modelName.str()));
+				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found! (%s)",KEYNAME(tur.m_turretPitchNameKey).str(),m_modelName.str()));
 				tur.m_turretPitchBone = 0;
 			}
 		}
 		else
 		{
 			tur.m_turretPitchBone = 0;
-		}	
+		}
 	}
 
 	if (isValidTimeToCalcLogicStuff())
 	{
 		m_validStuff |= TURRETS_VALID;
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 const Matrix3D* ModelConditionInfo::findPristineBone(NameKeyType boneName, Int* boneIndex) const
@@ -945,26 +947,26 @@ Bool ModelConditionInfo::findPristineBonePos(NameKeyType boneName, Coord3D& pos)
 
 //-------------------------------------------------------------------------------------------------
 void ModelConditionInfo::loadAnimations() const
-{ 
+{
 #ifdef RETAIN_ANIM_HANDLES
 	for (W3DAnimationVector::const_iterator it2 = m_animations.begin(); it2 != m_animations.end(); ++it2)
 	{
 		HAnimClass* h = it2->getAnimHandle();	// just force it to get loaded
-		REF_PTR_RELEASE(h);	
+		REF_PTR_RELEASE(h);
 		h = NULL;
 	}
 #else
 	// srj sez: I think there is no real reason to preload these all anymore. things that need the anims
-	// (for bones) will force an implicit load anyway, but there's no point in forcibly loading the anims 
+	// (for bones) will force an implicit load anyway, but there's no point in forcibly loading the anims
 	// that don't contain interesting logical bones.
 #endif
 }
 
 //-------------------------------------------------------------------------------------------------
 void ModelConditionInfo::clear()
-{ 
+{
 	int i;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	m_description.clear();
 #endif
 	m_conditionsYesVec.clear();
@@ -998,7 +1000,7 @@ void ModelConditionInfo::clear()
 }
 
 //-------------------------------------------------------------------------------------------------
-W3DModelDrawModuleData::W3DModelDrawModuleData() : 
+W3DModelDrawModuleData::W3DModelDrawModuleData() :
 	m_validated(0),
 	m_okToChangeModelColor(false),
 	m_animationsRequirePower(true),
@@ -1008,10 +1010,10 @@ W3DModelDrawModuleData::W3DModelDrawModuleData() :
 	m_minLODRequired(STATIC_GAME_LOD_LOW),
 	m_defaultState(-1)
 {
-	const Real MAX_SHIFT = 3.0f;			
-	const Real INITIAL_RECOIL_RATE = 2.0f;	
-	const Real RECOIL_DAMPING = 0.4f;	
-	const Real SETTLE_RATE = 0.065f;		
+	const Real MAX_SHIFT = 3.0f;
+	const Real INITIAL_RECOIL_RATE = 2.0f;
+	const Real RECOIL_DAMPING = 0.4f;
+	const Real SETTLE_RATE = 0.065f;
 
 	m_projectileBoneFeedbackEnabledSlots = 0;
 	m_initialRecoil = INITIAL_RECOIL_RATE;
@@ -1100,8 +1102,8 @@ W3DModelDrawModuleData::~W3DModelDrawModuleData()
 void W3DModelDrawModuleData::preloadAssets( TimeOfDay timeOfDay, Real scale ) const
 {
 
-	for( ModelConditionVector::iterator it = m_conditionStates.begin(); 
-			 it != m_conditionStates.end(); 
+	for( ModelConditionVector::iterator it = m_conditionStates.begin();
+			 it != m_conditionStates.end();
 			 ++it )
 	{
 
@@ -1169,11 +1171,11 @@ static void parseAsciiStringLC( INI* ini, void * /*instance*/, void *store, cons
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "InitialRecoilSpeed",	INI::parseVelocityReal, NULL, offsetof(W3DModelDrawModuleData, m_initialRecoil) },
 		{ "MaxRecoilDistance",	INI::parseReal, NULL, offsetof(W3DModelDrawModuleData, m_maxRecoil) },
@@ -1239,7 +1241,7 @@ static void parseAnimation(INI* ini, void *instance, void * /*store*/, const voi
 		while (timesToRepeat--)
 			self->m_animations.push_back(animInfo);
 	}
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 static void parseShowHideSubObject(INI* ini, void *instance, void *store, const void* userData)
@@ -1266,7 +1268,7 @@ static void parseShowHideSubObject(INI* ini, void *instance, void *store, const
 				found = true;
 			}
 		}
-		
+
 		if (!found)
 		{
 			ModelConditionInfo::HideShowSubObjInfo info;
@@ -1277,7 +1279,7 @@ static void parseShowHideSubObject(INI* ini, void *instance, void *store, const
 		subObjName = ini->getNextAsciiString();
 		subObjName.toLower();
 	}
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 void W3DModelDraw::showSubObject( const AsciiString& name, Bool show )
@@ -1311,7 +1313,7 @@ static void parseWeaponBoneName(INI* ini, void *instance, void * store, const vo
 {
 	ModelConditionInfo* self = (ModelConditionInfo*)instance;
 	AsciiString* arr = (AsciiString*)store;
-	
+
 	WeaponSlotType wslot = (WeaponSlotType)INI::scanIndexList(ini->getNextToken(), TheWeaponSlotTypeNames);
 	arr[wslot] = ini->getNextAsciiString();
 	arr[wslot].toLower();
@@ -1390,7 +1392,7 @@ static Bool doesStateExist(const ModelConditionVector& v, const ModelConditionFl
 //-------------------------------------------------------------------------------------------------
 void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void * /*store*/, const void* userData)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ "Model",	parseAsciiStringLC, NULL, offsetof(ModelConditionInfo, m_modelName) },
 		{ "Turret",	parseBoneNameKey, NULL, offsetof(ModelConditionInfo, m_turrets[0].m_turretAngleNameKey) },
@@ -1428,32 +1430,32 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 		{
 			if (self->m_defaultState >= 0)
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: you may have only one default state!\n"));
+				DEBUG_CRASH(("*** ASSET ERROR: you may have only one default state!"));
 				throw INI_INVALID_DATA;
 			}
 			else if (ini->getNextTokenOrNull())
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: unknown keyword\n"));
+				DEBUG_CRASH(("*** ASSET ERROR: unknown keyword"));
 				throw INI_INVALID_DATA;
 			}
 			else
 			{
 				if (!self->m_conditionStates.empty())
 				{
-					DEBUG_CRASH(("*** ASSET ERROR: when using DefaultConditionState, it must be the first state listed (%s)\n",TheThingTemplateBeingParsedName.str()));
+					DEBUG_CRASH(("*** ASSET ERROR: when using DefaultConditionState, it must be the first state listed (%s)",TheThingTemplateBeingParsedName.str()));
 					throw INI_INVALID_DATA;
 				}
 
 				// note, this is size(), not size()-1, since we haven't actually modified the list yet
 				self->m_defaultState = self->m_conditionStates.size();
-				//DEBUG_LOG(("set default state to %d\n",self->m_defaultState));
+				//DEBUG_LOG(("set default state to %d",self->m_defaultState));
 
 				// add an empty conditionstateflag set
 				ModelConditionFlags blankConditions;
 				info.m_conditionsYesVec.clear();
 				info.m_conditionsYesVec.push_back(blankConditions);
 
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	#if defined(RTS_DEBUG)
 				info.m_description.clear();
 				info.m_description.concat(TheThingTemplateBeingParsedName);
 				info.m_description.concat(" DEFAULT");
@@ -1464,14 +1466,16 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 
 		case PARSE_TRANSITION:
 		{
-		  AsciiString firstNm = ini->getNextToken(); firstNm.toLower();
-		  AsciiString secondNm = ini->getNextToken(); secondNm.toLower();
+			AsciiString firstNm = ini->getNextToken();
+			AsciiString secondNm = ini->getNextToken();
+			firstNm.toLower();
+			secondNm.toLower();
 			NameKeyType firstKey = NAMEKEY(firstNm);
 			NameKeyType secondKey = NAMEKEY(secondNm);
 
 			if (firstKey == secondKey)
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: You may not declare a transition between two identical states\n"));
+				DEBUG_CRASH(("*** ASSET ERROR: You may not declare a transition between two identical states"));
 				throw INI_INVALID_DATA;
 			}
 
@@ -1484,7 +1488,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 			}
 
 			info.m_transitionSig = buildTransitionSig(firstKey, secondKey);
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	#if defined(RTS_DEBUG)
 			info.m_description.clear();
 			info.m_description.concat(TheThingTemplateBeingParsedName);
 			info.m_description.concat(" TRANSITION: ");
@@ -1500,15 +1504,15 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 		{
 			if (self->m_conditionStates.empty())
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: AliasConditionState must refer to the previous state!\n"));
+				DEBUG_CRASH(("*** ASSET ERROR: AliasConditionState must refer to the previous state!"));
 				throw INI_INVALID_DATA;
 			}
-			
+
 			ModelConditionInfo& prevState = self->m_conditionStates.at(self->m_conditionStates.size()-1);
-			
+
 			ModelConditionFlags conditionsYes;
 
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	#if defined(RTS_DEBUG)
 			AsciiString description;
 			conditionsYes.parse(ini, &description);
 
@@ -1517,10 +1521,10 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 	#else
 			conditionsYes.parse(ini, NULL);
 	#endif
-			
+
 			if (conditionsYes.anyIntersectionWith(self->m_ignoreConditionStates))
 			{
-				DEBUG_CRASH(("You should not specify bits in a state once they are used in IgnoreConditionStates (%s)\n", TheThingTemplateBeingParsedName.str()));
+				DEBUG_CRASH(("You should not specify bits in a state once they are used in IgnoreConditionStates (%s)", TheThingTemplateBeingParsedName.str()));
 				throw INI_INVALID_DATA;
 			}
 
@@ -1538,7 +1542,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 			}
 
 			prevState.m_conditionsYesVec.push_back(conditionsYes);
-			
+
 			// yes, return, NOT break!
 			return;
 		}
@@ -1555,12 +1559,12 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 	// files too badly. maybe someday.
 	//	else
 	//	{
-	//		DEBUG_CRASH(("*** ASSET ERROR: you must specify a default state\n"));
+	//		DEBUG_CRASH(("*** ASSET ERROR: you must specify a default state"));
 	//		throw INI_INVALID_DATA;
 	//	}
-			
+
 			ModelConditionFlags conditionsYes;
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+	#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 			AsciiString description;
 			conditionsYes.parse(ini, &description);
 
@@ -1574,14 +1578,14 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 
 			if (conditionsYes.anyIntersectionWith(self->m_ignoreConditionStates))
 			{
-				DEBUG_CRASH(("You should not specify bits in a state once they are used in IgnoreConditionStates (%s)\n", TheThingTemplateBeingParsedName.str()));
+				DEBUG_CRASH(("You should not specify bits in a state once they are used in IgnoreConditionStates (%s)", TheThingTemplateBeingParsedName.str()));
 				throw INI_INVALID_DATA;
 			}
 
 			if (self->m_defaultState < 0 && self->m_conditionStates.empty() && conditionsYes.any())
 			{
 				// it doesn't actually NEED to be first, but it does need to be present, and this is the simplest way to enforce...
-				DEBUG_CRASH(("*** ASSET ERROR: when not using DefaultConditionState, the first ConditionState must be for NONE (%s)\n",TheThingTemplateBeingParsedName.str()));
+				DEBUG_CRASH(("*** ASSET ERROR: when not using DefaultConditionState, the first ConditionState must be for NONE (%s)",TheThingTemplateBeingParsedName.str()));
 				throw INI_INVALID_DATA;
 			}
 
@@ -1596,8 +1600,8 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 				DEBUG_CRASH(("*** ASSET ERROR: duplicate condition states are not currently allowed (%s)",info.m_description.str()));
 				throw INI_INVALID_DATA;
 			}
-			
-			DEBUG_ASSERTCRASH(info.m_conditionsYesVec.size() == 0, ("*** ASSET ERROR: nonempty m_conditionsYesVec.size(), see srj"));
+
+			DEBUG_ASSERTCRASH(info.m_conditionsYesVec.empty(), ("*** ASSET ERROR: nonempty m_conditionsYesVec.size(), see srj"));
 			info.m_conditionsYesVec.clear();
 			info.m_conditionsYesVec.push_back(conditionsYes);
 		}
@@ -1624,7 +1628,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 
 	if ((info.m_iniReadFlags & (1<<GOT_IDLE_ANIMS)) && (info.m_mode != RenderObjClass::ANIM_MODE_ONCE && info.m_mode != RenderObjClass::ANIM_MODE_ONCE_BACKWARDS))
 	{
-		DEBUG_CRASH(("*** ASSET ERROR: Idle Anims should always use ONCE or ONCE_BACKWARDS (%s)\n",TheThingTemplateBeingParsedName.str()));
+		DEBUG_CRASH(("*** ASSET ERROR: Idle Anims should always use ONCE or ONCE_BACKWARDS (%s)",TheThingTemplateBeingParsedName.str()));
 		throw INI_INVALID_DATA;
 	}
 
@@ -1672,7 +1676,7 @@ static Int countOnBits(UnsignedInt val)
 	Int count = 0;
 	for (Int i = 0; i < 32; ++i)
 	{
-		if (val & 1) 
+		if (val & 1)
 			++count;
 		val >>= 1;
 	}
@@ -1716,22 +1720,22 @@ W3DModelDraw::W3DModelDraw(Thing *thing, const ModuleData* moduleData) : DrawMod
 	m_fullyObscuredByShroud = false;
 
 	// only validate the current time-of-day and weather conditions by default.
-	getW3DModelDrawModuleData()->validateStuffForTimeAndWeather(getDrawable(), 
-											TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT, 
+	getW3DModelDrawModuleData()->validateStuffForTimeAndWeather(getDrawable(),
+											TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT,
 											TheGlobalData->m_weather == WEATHER_SNOWY);
 
 	ModelConditionFlags emptyFlags;
 	const ModelConditionInfo* info = findBestInfo(emptyFlags);
 	if (!info)
 	{
-		DEBUG_CRASH(("*** ASSET ERROR: all draw modules must have an IDLE state\n"));
+		DEBUG_CRASH(("*** ASSET ERROR: all draw modules must have an IDLE state"));
 		throw INI_INVALID_DATA;
 	}
 
 	Drawable* draw = getDrawable();
 	Object* obj = draw ? draw->getObject() : NULL;
 	if (obj)
-	{	
+	{
 		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
 			m_hexColor = obj->getNightIndicatorColor();
 		else
@@ -1745,8 +1749,8 @@ W3DModelDraw::W3DModelDraw(Thing *thing, const ModuleData* moduleData) : DrawMod
 //-------------------------------------------------------------------------------------------------
 void W3DModelDraw::onDrawableBoundToObject(void)
 {
-	getW3DModelDrawModuleData()->validateStuffForTimeAndWeather(getDrawable(), 
-											TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT, 
+	getW3DModelDrawModuleData()->validateStuffForTimeAndWeather(getDrawable(),
+											TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT,
 											TheGlobalData->m_weather == WEATHER_SNOWY);
 }
 
@@ -1755,7 +1759,7 @@ void W3DModelDraw::onDrawableBoundToObject(void)
 W3DModelDraw::~W3DModelDraw(void)
 {
 	if (m_trackRenderObject && TheTerrainTracksRenderObjClassSystem)
-	{	
+	{
 		TheTerrainTracksRenderObjClassSystem->unbindTrack(m_trackRenderObject);
 		m_trackRenderObject = NULL;
 	}
@@ -1796,12 +1800,12 @@ void W3DModelDraw::setHidden(Bool hidden)
 
 	if (m_terrainDecal)
 		m_terrainDecal->enableShadowRender(!hidden);
-	
+
 	if (m_trackRenderObject && hidden)
 	{	const Coord3D* pos = getDrawable()->getPosition();
 		m_trackRenderObject->addCapEdgeToTrack(pos->x,pos->y);
 	}
-	
+
 	doStartOrStopParticleSys();
 }
 
@@ -1820,9 +1824,9 @@ void W3DModelDraw::allocateShadows(void)
 
 	//Check if we don't already have a shadow but need one for this type of model.
 	if (m_shadow == NULL && m_renderObject && TheW3DShadowManager && tmplate->getShadowType() != SHADOW_NONE)
-	{	
+	{
 		Shadow::ShadowTypeInfo shadowInfo;
-		strcpy(shadowInfo.m_ShadowName, tmplate->getShadowTextureName().str());
+		strlcpy(shadowInfo.m_ShadowName, tmplate->getShadowTextureName().str(), ARRAY_SIZE(shadowInfo.m_ShadowName));
 		DEBUG_ASSERTCRASH(shadowInfo.m_ShadowName[0] != '\0', ("this should be validated in ThingTemplate now"));
 		shadowInfo.allowUpdates			= FALSE;		//shadow image will never update
 		shadowInfo.allowWorldAlign	= TRUE;	//shadow image will wrap around world objects
@@ -1849,19 +1853,19 @@ void W3DModelDraw::setShadowsEnabled(Bool enable)
 }
 
 /**collect some stats about the rendering cost of this draw module */
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+#if defined(RTS_DEBUG)
 void W3DModelDraw::getRenderCost(RenderCost & rc) const
 {
 	getRenderCostRecursive(rc,m_renderObject);
 	if (m_shadow)
 		m_shadow->getRenderCost(rc);
 }
-#endif //RTS_DEBUG || RTS_INTERNAL
+#endif //RTS_DEBUG
 
 
 /**recurse through sub-objs to collect stats about the rendering cost of this draw module */
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
-void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const 
+#if defined(RTS_DEBUG)
+void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const
 {
 	if (robj == NULL) return;
 
@@ -1875,7 +1879,7 @@ void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj)
 	// Only consider visible sub-objects.  Some vehicles have hidden headlight cones for example
 	// that are not normally rendered.
 	if (robj->Is_Not_Hidden_At_All()) {
-		
+
 		// collect stats from meshes
 		if (robj->Class_ID() == RenderObjClass::CLASSID_MESH) {
 			MeshClass * mesh = (MeshClass*)robj;
@@ -1889,7 +1893,7 @@ void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj)
 
 			rc.addDrawCalls(mesh->Get_Draw_Call_Count());
 		}
-		
+
 		// collect bone stats.
 		const HTreeClass * htree = robj->Get_HTree();
 		if (htree != NULL) {
@@ -1897,7 +1901,7 @@ void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj)
 		}
 	}
 }
-#endif //RTS_DEBUG || RTS_INTERNAL
+#endif //RTS_DEBUG
 
 //-------------------------------------------------------------------------------------------------
 void W3DModelDraw::setFullyObscuredByShroud(Bool fullyObscured)
@@ -1971,7 +1975,7 @@ void W3DModelDraw::adjustTransformMtx(Matrix3D& mtx) const
 #else
 	if (d->m_attachToDrawableBone.isNotEmpty())
 	{
-		// override the mtx in this case. yes, call drawable, since the bone in question is 
+		// override the mtx in this case. yes, call drawable, since the bone in question is
 		// likely to be in another module!
 		Matrix3D boneMtx;
 		if (getDrawable()->getCurrentWorldspaceClientBonePositions(d->m_attachToDrawableBone.str(), boneMtx))
@@ -1980,7 +1984,7 @@ void W3DModelDraw::adjustTransformMtx(Matrix3D& mtx) const
 		}
 		else
 		{
-			DEBUG_LOG(("m_attachToDrawableBone %s not found\n",getW3DModelDrawModuleData()->m_attachToDrawableBone.str()));
+			DEBUG_LOG(("m_attachToDrawableBone %s not found",getW3DModelDrawModuleData()->m_attachToDrawableBone.str()));
 		}
 	}
 #endif
@@ -2008,7 +2012,7 @@ void W3DModelDraw::doDrawModule(const Matrix3D* transformMtx)
 
 	Matrix3D scaledTransform;
 	if (getDrawable()->getInstanceScale() != 1.0f)
-	{	
+	{
 		// do custom scaling of the W3D model.
 		scaledTransform = *transformMtx;
 		scaledTransform.Scale(getDrawable()->getInstanceScale());
@@ -2021,7 +2025,7 @@ void W3DModelDraw::doDrawModule(const Matrix3D* transformMtx)
 	{
 		if (m_curState != NULL && m_nextState != NULL)
 		{
-			//DEBUG_LOG(("transition %s is complete\n",m_curState->m_description.str()));
+			//DEBUG_LOG(("transition %s is complete",m_curState->m_description.str()));
 			const ModelConditionInfo* nextState = m_nextState;
 			UnsignedInt nextDuration = m_nextStateAnimLoopDuration;
 			m_nextState = NULL;
@@ -2029,18 +2033,18 @@ void W3DModelDraw::doDrawModule(const Matrix3D* transformMtx)
 			setModelState(nextState);
 			if (nextDuration != NO_NEXT_DURATION)
 			{
-				//DEBUG_LOG(("restoring pending duration of %d frames\n",nextDuration));
+				//DEBUG_LOG(("restoring pending duration of %d frames",nextDuration));
 				setAnimationLoopDuration(nextDuration);
 			}
 		}
-		
+
 		if (m_renderObject &&
 					m_curState != NULL &&
 					m_whichAnimInCurState != -1)
 		{
 			if (m_curState->m_animations[m_whichAnimInCurState].isIdleAnim())
 			{
-				//DEBUG_LOG(("randomly switching to new idle state!\n"));
+				//DEBUG_LOG(("randomly switching to new idle state!"));
 
 				// state hasn't changed, if it's been awhile, switch the idle anim
 				// (yes, that's right: pass curState for prevState)
@@ -2132,9 +2136,9 @@ void W3DModelDraw::adjustAnimation(const ModelConditionInfo* prevState, Real pre
 		{
 			m_whichAnimInCurState = GameClientRandomValue(0, numAnims-1);
 		}
-		
+
 		const W3DAnimationInfo& animInfo = m_curState->m_animations[m_whichAnimInCurState];
-		
+
 		HAnimClass* animHandle = animInfo.getAnimHandle();	// note that this now returns an ADDREFED handle, which must be released by the caller!
 		if (m_renderObject && animHandle)
 		{
@@ -2216,7 +2220,7 @@ Real W3DModelDraw::getCurAnimDistanceCovered() const
 	if (m_curState != NULL && m_whichAnimInCurState >= 0)
 	{
 		const W3DAnimationInfo& animInfo = m_curState->m_animations[m_whichAnimInCurState];
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	#if defined(RTS_DEBUG)
 		if (TheSkateDistOverride != 0.0f)
 			return TheSkateDistOverride;
 	#endif
@@ -2233,23 +2237,23 @@ Real W3DModelDraw::getCurAnimDistanceCovered() const
 static void doHideShowBoneSubObjs(Bool state, Int numSubObjects, Int boneIdx, RenderObjClass *fullObject, const HTreeClass *htree)
 {
 #if 1	//(gth) fixed and tested this version
-	for (Int i=0; i < numSubObjects; i++) 
+	for (Int i=0; i < numSubObjects; i++)
 	{
 		bool is_child = false;
 		Int parentBoneIndex = fullObject->Get_Sub_Object_Bone_Index(0, i);
-		
-		while (parentBoneIndex != 0) 
+
+		while (parentBoneIndex != 0)
 		{
 			parentBoneIndex = htree->Get_Parent_Index(parentBoneIndex);
 
-			if (parentBoneIndex == boneIdx) 
+			if (parentBoneIndex == boneIdx)
 			{
 				is_child = true;
 				break;
 			}
 		}
 
-		if (is_child) 
+		if (is_child)
 		{
 			RenderObjClass* childObject = fullObject->Get_Sub_Object(i);
 			childObject->Set_Hidden(state);
@@ -2258,23 +2262,23 @@ static void doHideShowBoneSubObjs(Bool state, Int numSubObjects, Int boneIdx, Re
 	}
 #endif
 #if 0	//old slow version
-	
+
   for (Int i=0; i < numSubObjects; i++)
-  {	
+  {
   	Int childBoneIndex = fullObject->Get_Sub_Object_Bone_Index(0, i);
   	Int parentIndex = htree->Get_Parent_Index(childBoneIndex);
   	if (childBoneIndex == parentIndex)
   		continue;
 
   	if (parentIndex == boneIdx)	// this object has our subobject as parent so copy hide state
-  	{	
+  	{
   		RenderObjClass* childObject = fullObject->Get_Sub_Object(i);
   		// recurse down the hierarchy to hide all sub-children
   		doHideShowBoneSubObjs(state, numSubObjects, childBoneIndex, fullObject, htree);
 		childObject->Set_Hidden(state);
   		childObject->Release_Ref();
   	}
-  } 
+  }
 #endif
 }
 
@@ -2291,7 +2295,7 @@ void ModelConditionInfo::WeaponBarrelInfo::setMuzzleFlashHidden(RenderObjClass *
 		}
 		else
 		{
-			DEBUG_CRASH(("*** ASSET ERROR: childObject %s not found in setMuzzleFlashHidden()\n",m_muzzleFlashBoneName.str()));
+			DEBUG_CRASH(("*** ASSET ERROR: childObject %s not found in setMuzzleFlashHidden()",m_muzzleFlashBoneName.str()));
 		}
 	}
 }
@@ -2315,7 +2319,7 @@ void W3DModelDraw::doHideShowSubObjs(const std::vector<ModelConditionInfo::HideS
 
 				const HTreeClass *htree = m_renderObject->Get_HTree();
 				if (htree)
-				{	
+				{
 					//get the bone of this subobject so we can hide all other child objects that use this bone
 					//as a parent.
 					Int boneIdx = m_renderObject->Get_Sub_Object_Bone_Index(0, objIndex);
@@ -2325,12 +2329,12 @@ void W3DModelDraw::doHideShowSubObjs(const std::vector<ModelConditionInfo::HideS
 			}
 			else
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: SubObject %s not found (%s)!\n",it->subObjName.str(),getDrawable()->getTemplate()->getName().str()));
+				DEBUG_CRASH(("*** ASSET ERROR: SubObject %s not found (%s)!",it->subObjName.str(),getDrawable()->getTemplate()->getName().str()));
 			}
 		}
 	}
 
-	//Kris (added Aug 2002) 
+	//Kris (added Aug 2002)
 	//This is really important as it allows a person to override modelcondition show/hide objects. Used by the A10 strike
 	//September 2002 -- now used by the UpgradeSubObject system.
 	if( !m_subObjectVec.empty() )
@@ -2340,13 +2344,13 @@ void W3DModelDraw::doHideShowSubObjs(const std::vector<ModelConditionInfo::HideS
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DModelDraw::stopClientParticleSystems() 
+void W3DModelDraw::stopClientParticleSystems()
 {
 	for (std::vector<ParticleSysTrackerType>::const_iterator it = m_particleSystemIDs.begin(); it != m_particleSystemIDs.end(); ++it)
 	//for (std::vector<ParticleSystemID>::const_iterator it = m_particleSystemIDs.begin(); it != m_particleSystemIDs.end(); ++it)
 	{
 		ParticleSystem *sys = TheParticleSystemManager->findParticleSystem((*it).id);
-		if (sys != NULL) 
+		if (sys != NULL)
 		{
 			// this can be NULL
 			sys->destroy();
@@ -2400,7 +2404,7 @@ void W3DModelDraw::handleClientTurretPositioning()
 				if (m_renderObject)
 				{
 					m_renderObject->Capture_Bone( tur.m_turretAngleBone );
-					m_renderObject->Control_Bone( tur.m_turretAngleBone, turretXfrm );	
+					m_renderObject->Control_Bone( tur.m_turretAngleBone, turretXfrm );
 				}
 			}
 
@@ -2414,11 +2418,11 @@ void W3DModelDraw::handleClientTurretPositioning()
 				if (m_renderObject)
 				{
 					m_renderObject->Capture_Bone( tur.m_turretPitchBone );
-					m_renderObject->Control_Bone( tur.m_turretPitchBone, turretPitchXfrm );	
+					m_renderObject->Control_Bone( tur.m_turretPitchBone, turretPitchXfrm );
 				}
 			}
 		}
-	} // next tslot
+	}
 }
 
 
@@ -2433,7 +2437,7 @@ void W3DModelDraw::handleClientTurretPositioning()
 //		if (m_renderObject)
 //		{
 //			m_renderObject->Capture_Bone( tur.m_turretAngleBone );
-//			m_renderObject->Control_Bone( tur.m_turretAngleBone, turretXfrm );	
+//			m_renderObject->Control_Bone( tur.m_turretAngleBone, turretXfrm );
 //		}
 //	}
 //}
@@ -2471,7 +2475,7 @@ void W3DModelDraw::handleClientRecoil()
 			if (barrels[i].m_muzzleFlashBone != 0)
 			{
 				Bool hidden = recoils[i].m_state != WeaponRecoilInfo::RECOIL_START;
-				//DEBUG_LOG(("adjust muzzleflash %08lx for Draw %08lx state %s to %d at frame %d\n",subObjToHide,this,m_curState->m_description.str(),hidden?1:0,TheGameLogic->getFrame()));
+				//DEBUG_LOG(("adjust muzzleflash %08lx for Draw %08lx state %s to %d at frame %d",subObjToHide,this,m_curState->m_description.str(),hidden?1:0,TheGameLogic->getFrame()));
 				barrels[i].setMuzzleFlashHidden(m_renderObject, hidden);
 			}
 
@@ -2512,7 +2516,7 @@ void W3DModelDraw::handleClientRecoil()
 				Matrix3D gunXfrm;
 				gunXfrm.Make_Identity();
 				gunXfrm.Translate_X( -recoils[i].m_shift );
-				//DEBUG_ASSERTLOG(recoils[i].m_shift==0.0f,("adjust bone %d by %f\n",recoils[i].m_recoilBone,recoils[i].m_shift));
+				//DEBUG_ASSERTLOG(recoils[i].m_shift==0.0f,("adjust bone %d by %f",recoils[i].m_recoilBone,recoils[i].m_shift));
 
 				if (m_renderObject)
 				{
@@ -2523,7 +2527,7 @@ void W3DModelDraw::handleClientRecoil()
 			else
 			{
 				recoils[i].m_state = WeaponRecoilInfo::IDLE;
-				//DEBUG_LOG(("reset Draw %08lx state %08lx\n",this,m_curState));
+				//DEBUG_LOG(("reset Draw %08lx state %08lx",this,m_curState));
 			}
 		}
 	}
@@ -2551,13 +2555,13 @@ void W3DModelDraw::recalcBonesForClientParticleSystems()
 		const Drawable* drawable = getDrawable();
 		if (drawable != NULL )
 		{
-		
-			if( m_curState != NULL && drawable->testDrawableStatus( DRAWABLE_STATUS_NO_STATE_PARTICLES ) == FALSE ) 
+
+			if( m_curState != NULL && drawable->testDrawableStatus( DRAWABLE_STATUS_NO_STATE_PARTICLES ) == FALSE )
 			{
 				for (std::vector<ParticleSysBoneInfo>::const_iterator it = m_curState->m_particleSysBones.begin(); it != m_curState->m_particleSysBones.end(); ++it)
 				{
 					ParticleSystem *sys = TheParticleSystemManager->createParticleSystem(it->particleSystemTemplate);
-					if (sys != NULL) 
+					if (sys != NULL)
 					{
 						Coord3D pos;
 						pos.zero();
@@ -2595,7 +2599,7 @@ void W3DModelDraw::recalcBonesForClientParticleSystems()
 						// important: mark it as do-not-save, since we'll just re-create it when we reload.
 						sys->setSaveable(FALSE);
 
-						if (drawable->isDrawableEffectivelyHidden() || m_fullyObscuredByShroud) 
+						if (drawable->isDrawableEffectivelyHidden() || m_fullyObscuredByShroud)
 						{
 							sys->stop(); // don't start the systems for drawables that are hidden.
 						}
@@ -2635,24 +2639,24 @@ void W3DModelDraw::recalcBonesForClientParticleSystems()
 Bool W3DModelDraw::updateBonesForClientParticleSystems()
 {
 	const Drawable* drawable = getDrawable();
-	if (drawable != NULL && m_curState != NULL && m_renderObject != NULL ) 
+	if (drawable != NULL && m_curState != NULL && m_renderObject != NULL )
 	{
 		for (std::vector<ParticleSysTrackerType>::const_iterator it = m_particleSystemIDs.begin(); it != m_particleSystemIDs.end(); ++it)
 		{
 			ParticleSystem *sys = TheParticleSystemManager->findParticleSystem((*it).id);
 			Int boneIndex = (*it).boneIndex;
-			if ( (sys != NULL) && (boneIndex != 0)  ) 
+			if ( (sys != NULL) && (boneIndex != 0)  )
 			{
-				Matrix3D originalTransform = m_renderObject->Get_Transform();	
+				Matrix3D originalTransform = m_renderObject->Get_Transform();
 				Matrix3D tmp(1);
 				tmp.Scale(drawable->getScale());
-				m_renderObject->Set_Transform(tmp);					
+				m_renderObject->Set_Transform(tmp);
 
 				const Matrix3D boneTransform = m_renderObject->Get_Bone_Transform(boneIndex);// just a little worried about state changes
 				Vector3 vpos = boneTransform.Get_Translation();
 				Real rotation = boneTransform.Get_Z_Rotation();
 
-				m_renderObject->Set_Transform(originalTransform);					
+				m_renderObject->Set_Transform(originalTransform);
 
 				Coord3D pos;
 				pos.x = vpos.X;
@@ -2665,7 +2669,7 @@ Bool W3DModelDraw::updateBonesForClientParticleSystems()
 			}
 		}
 
-	}// end if Drawable
+	}
 
 	return TRUE;
 
@@ -2696,7 +2700,7 @@ void W3DModelDraw::setTerrainDecal(TerrainDecalType type)
 
 	//decalInfo.m_type = SHADOW_ADDITIVE_DECAL;//temporary kluge to test graphics
 
-	strcpy(decalInfo.m_ShadowName,TerrainDecalTextureName[type]);
+	strlcpy(decalInfo.m_ShadowName, TerrainDecalTextureName[type], ARRAY_SIZE(decalInfo.m_ShadowName));
 	decalInfo.m_sizeX = tmplate->getShadowSizeX();
 	decalInfo.m_sizeY = tmplate->getShadowSizeY();
 	decalInfo.m_offsetX = tmplate->getShadowOffsetX();
@@ -2756,14 +2760,14 @@ void W3DModelDraw::nukeCurrentRender(Matrix3D* xform)
 	else
 	{
 		if (xform)
-		{	
+		{
 			*xform = *getDrawable()->getTransformMatrix();
 		}
 	}
 }
 
 //-------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//art wants to see buildings without flags as a test.
+#if defined(RTS_DEBUG)	//art wants to see buildings without flags as a test.
 void W3DModelDraw::hideGarrisonFlags(Bool hide)
 {
 	if (!m_renderObject)
@@ -2778,7 +2782,7 @@ void W3DModelDraw::hideGarrisonFlags(Bool hide)
 
 		const HTreeClass *htree = m_renderObject->Get_HTree();
 		if (htree)
-		{	
+		{
 			//get the bone of this subobject so we can hide all other child objects that use this bone
 			//as a parent.
 			Int boneIdx = m_renderObject->Get_Sub_Object_Bone_Index(0, objIndex);
@@ -2796,7 +2800,7 @@ void W3DModelDraw::hideAllHeadlights(Bool hide)
 	if (m_renderObject)
 	{
 		for (Int subObj = 0; subObj < m_renderObject->Get_Num_Sub_Objects(); subObj++)
-		{	
+		{
 			RenderObjClass* test = m_renderObject->Get_Sub_Object(subObj);
 			if (strstr(test->Get_Name(),"HEADLIGHT"))
 			{
@@ -2842,7 +2846,7 @@ static Bool turretNamesDiffer(const ModelConditionInfo* a, const ModelConditionI
 		return true;
 	}
 	for (int i = 0; i < MAX_TURRETS; ++i)
-		if (a->m_turrets[i].m_turretAngleNameKey != b->m_turrets[i].m_turretAngleNameKey || 
+		if (a->m_turrets[i].m_turretAngleNameKey != b->m_turrets[i].m_turretAngleNameKey ||
 				a->m_turrets[i].m_turretPitchNameKey != b->m_turrets[i].m_turretPitchNameKey)
 			return true;
 
@@ -2855,17 +2859,17 @@ static Bool turretNamesDiffer(const ModelConditionInfo* a, const ModelConditionI
 //-------------------------------------------------------------------------------------------------
 void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 {
-	DEBUG_ASSERTCRASH(newState, ("invalid state in W3DModelDraw::setModelState\n")); 
+	DEBUG_ASSERTCRASH(newState, ("invalid state in W3DModelDraw::setModelState"));
 
 #ifdef DEBUG_OBJECT_ID_EXISTS
 	if (getDrawable() && getDrawable()->getObject() && getDrawable()->getObject()->getID() == TheObjectIDToDebug)
 	{
-		DEBUG_LOG(("REQUEST switching to state %s for obj %s %d\n",newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
+		DEBUG_LOG(("REQUEST switching to state %s for obj %s %d",newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
 	}
 #endif
 	const ModelConditionInfo* nextState = NULL;
 	if (m_curState != NULL && newState != NULL)
-	{ 
+	{
 		// if the requested state is the current state (and nothing is pending),
 		// or if the requested state is pending, just punt.
 		//
@@ -2875,13 +2879,13 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 		// leaving us these possibilities:
 		//
 		// -- curState is a transition state
-		//		--in this case, new state should take precedence (unless there's a wait-to-finish marking, 
+		//		--in this case, new state should take precedence (unless there's a wait-to-finish marking,
 		//		which would be handled by the else clause)
 		//
 		// -- curState is a real state, nextState is a real state with a wait-to-finish clause
 		//		-- if curState == newState, presume that we should restart curState, thus punting thepending nextState
 		//		-- if curState != newState, presume we should switch to it, thus punting curState and nextState
-		// 
+		//
 		// -- curState is a real state, nextState is a real state without a wait-to-finish clause
 		//		-- should be impossible!
 
@@ -2891,13 +2895,13 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 #ifdef DEBUG_OBJECT_ID_EXISTS
 			if (getDrawable() && getDrawable()->getObject() && getDrawable()->getObject()->getID() == TheObjectIDToDebug)
 			{
-				DEBUG_LOG(("IGNORE duplicate state %s for obj %s %d\n",newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
+				DEBUG_LOG(("IGNORE duplicate state %s for obj %s %d",newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
 			}
 #endif
 			// I don't think he'll be interested...
 			// he's already got one, you see
 			return;
-		} 
+		}
 		// check for allow-to-finish implicit transitions
 		else if (newState != m_curState &&
 							newState->m_allowToFinishKey != NAMEKEY_INVALID &&
@@ -2908,7 +2912,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 #ifdef DEBUG_OBJECT_ID_EXISTS
 			if (getDrawable() && getDrawable()->getObject() && getDrawable()->getObject()->getID() == TheObjectIDToDebug)
 			{
-				DEBUG_LOG(("ALLOW_TO_FINISH state %s for obj %s %d\n",newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
+				DEBUG_LOG(("ALLOW_TO_FINISH state %s for obj %s %d",newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
 			}
 #endif
 			m_nextState = newState;
@@ -2916,7 +2920,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 			return;
 		}
 		// check for a normal->normal state transition
-		else if (newState != m_curState && 
+		else if (newState != m_curState &&
 					m_curState->m_transitionKey != NAMEKEY_INVALID &&
 					newState->m_transitionKey != NAMEKEY_INVALID)
 		{
@@ -2927,7 +2931,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 #ifdef DEBUG_OBJECT_ID_EXISTS
 				if (getDrawable() && getDrawable()->getObject() && getDrawable()->getObject()->getID() == TheObjectIDToDebug)
 				{
-					DEBUG_LOG(("using TRANSITION state %s before requested state %s for obj %s %d\n",transState->m_description.str(),newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
+					DEBUG_LOG(("using TRANSITION state %s before requested state %s for obj %s %d",transState->m_description.str(),newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
 				}
 #endif
 				nextState = newState;
@@ -2935,7 +2939,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 			}
 		}
 	}
-	
+
 	// get this here, before we change anything... we'll need it to pass to adjustAnimation (srj)
 	Real prevAnimFraction = getCurrentAnimFraction();
 
@@ -2956,8 +2960,8 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 	// note that different states might use the same model; for these, don't go thru the
 	// expense of creating a new render-object. (exception: if color is changing, or subobjs are changing,
 	// or a few other things...)
-	if (m_curState == NULL || 
-			newState->m_modelName != m_curState->m_modelName || 
+	if (m_curState == NULL ||
+			newState->m_modelName != m_curState->m_modelName ||
 			turretNamesDiffer(newState, m_curState)
 			// srj sez: I'm not sure why we want to do the "hard stuff" if we have projectile bones; I think
 			// it is a holdover from days gone by when bones were handled quite differently, rather than being cached.
@@ -2977,10 +2981,10 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 		else
 		{
 			m_renderObject = W3DDisplay::m_assetManager->Create_Render_Obj(newState->m_modelName.str(), draw->getScale(), m_hexColor);
-			DEBUG_ASSERTCRASH(m_renderObject, ("*** ASSET ERROR: Model %s not found!\n",newState->m_modelName.str()));
+			DEBUG_ASSERTCRASH(m_renderObject, ("*** ASSET ERROR: Model %s not found!",newState->m_modelName.str()));
 		}
 
-		//BONEPOS_LOG(("validateStuff() from within W3DModelDraw::setModelState()\n"));
+		//BONEPOS_LOG(("validateStuff() from within W3DModelDraw::setModelState()"));
 		//BONEPOS_DUMPREAL(draw->getScale());
 
 		newState->validateStuff(m_renderObject, draw->getScale(), getW3DModelDrawModuleData()->m_extraPublicBones);
@@ -2989,7 +2993,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 		rebuildWeaponRecoilInfo(newState);
 		doHideShowSubObjs(&newState->m_hideShowVec);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//art wants to see buildings without flags as a test.
+#if defined(RTS_DEBUG)	//art wants to see buildings without flags as a test.
 		if (TheGlobalData->m_hideGarrisonFlags && draw->isKindOf(KINDOF_STRUCTURE))
 			hideGarrisonFlags(TRUE);
 #endif
@@ -2998,9 +3002,9 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 
 		// set up tracks, if not already set.
 		if (m_renderObject &&
-				TheGlobalData->m_makeTrackMarks &&  
-				!m_trackRenderObject && 
-				TheTerrainTracksRenderObjClassSystem != NULL && 
+				TheGlobalData->m_makeTrackMarks &&
+				!m_trackRenderObject &&
+				TheTerrainTracksRenderObjClassSystem != NULL &&
 				!getW3DModelDrawModuleData()->m_trackFile.isEmpty())
 		{
 			m_trackRenderObject = TheTerrainTracksRenderObjClassSystem->bindTrack(m_renderObject, 1.0f*MAP_XY_FACTOR, getW3DModelDrawModuleData()->m_trackFile.str());
@@ -3010,9 +3014,9 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 
 		// set up shadows
 		if (m_renderObject && TheW3DShadowManager && tmplate->getShadowType() != SHADOW_NONE)
-		{	
+		{
 			Shadow::ShadowTypeInfo shadowInfo;
-			strcpy(shadowInfo.m_ShadowName, tmplate->getShadowTextureName().str());
+			strlcpy(shadowInfo.m_ShadowName, tmplate->getShadowTextureName().str(), ARRAY_SIZE(shadowInfo.m_ShadowName));
 			DEBUG_ASSERTCRASH(shadowInfo.m_ShadowName[0] != '\0', ("this should be validated in ThingTemplate now"));
 			shadowInfo.allowUpdates			= FALSE;		//shadow image will never update
 			shadowInfo.allowWorldAlign	= TRUE;	//shadow image will wrap around world objects
@@ -3021,7 +3025,9 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 			shadowInfo.m_sizeY					= tmplate->getShadowSizeY();
 			shadowInfo.m_offsetX				= tmplate->getShadowOffsetX();
 			shadowInfo.m_offsetY				= tmplate->getShadowOffsetY();
-  			m_shadow = TheW3DShadowManager->addShadow(m_renderObject, &shadowInfo, draw);
+
+			DEBUG_ASSERTCRASH(m_shadow == NULL, ("m_shadow is not NULL"));
+			m_shadow = TheW3DShadowManager->addShadow(m_renderObject, &shadowInfo, draw);
 			if (m_shadow)
 			{	m_shadow->enableShadowInvisible(m_fullyObscuredByShroud);
 				m_shadow->enableShadowRender(m_shadowEnabled);
@@ -3031,7 +3037,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 		if( m_renderObject )
 		{
 			// set collision type for render object.  Used by WW3D2 collision code.
-			if (tmplate->isKindOf(KINDOF_SELECTABLE))  
+			if (tmplate->isKindOf(KINDOF_SELECTABLE))
 			{
 				m_renderObject->Set_Collision_Type( PICK_TYPE_SELECTABLE );
 			}
@@ -3052,7 +3058,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 			{
 				m_renderObject->Set_Collision_Type( 0 );
 			}
-			
+
 			Object *obj = draw->getObject();
  			if( obj )
    		{
@@ -3081,8 +3087,6 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 
 			// tie in our drawable as the user data pointer in the render object
 			m_renderObject->Set_User_Data(draw->getDrawableInfo());
-	
-			setTerrainDecal(draw->getTerrainDecalType());
 
 			//We created a new render object so we need to preserve the visibility state
 			//of the previous render object.
@@ -3093,20 +3097,20 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 					m_shadow->enableShadowRender(FALSE);
 				m_shadowEnabled = FALSE;
 			}
-			
+
 			//
 			// set the transform for the new model to that we saved before, we do this so that the
 			// model transition is smooth and will immediately appear at the same orientation and location
 			// as the previous one
 			//
 			m_renderObject->Set_Transform(transform);
-			onRenderObjRecreated(); 
+			onRenderObjRecreated();
 		}
-	} 
-	else 
+	}
+	else
 	{
 
-		//BONEPOS_LOG(("validateStuff() from within W3DModelDraw::setModelState()\n"));
+		//BONEPOS_LOG(("validateStuff() from within W3DModelDraw::setModelState()"));
 		//BONEPOS_DUMPREAL(getDrawable()->getScale());
 
 		newState->validateStuff(m_renderObject, getDrawable()->getScale(), getW3DModelDrawModuleData()->m_extraPublicBones);
@@ -3114,7 +3118,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 
 		// ensure that any muzzle flashes from the *previous* state, are hidden...
 //		hideAllMuzzleFlashes(m_curState, m_renderObject);// moved to above
-		
+
 		doHideShowSubObjs(&newState->m_hideShowVec);
 	}
 	hideAllHeadlights(m_hideHeadlights);
@@ -3151,7 +3155,7 @@ void W3DModelDraw::setSelectable(Bool selectable)
 			current &= ~PICK_TYPE_SELECTABLE;
 		}
 		m_renderObject->Set_Collision_Type(current);
-	}  // end if
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -3161,7 +3165,7 @@ void W3DModelDraw::replaceIndicatorColor(Color color)
 		return;
 
 	if (getRenderObject())
-	{	
+	{
 		Int newColor = (color == 0) ? 0 : (color | 0xFF000000);
 		if (newColor != m_hexColor)
 		{
@@ -3197,12 +3201,12 @@ Bool W3DModelDraw::clientOnly_getRenderObjInfo(Coord3D* pos, Real* boundingSpher
 
 //-------------------------------------------------------------------------------------------------
 Bool W3DModelDraw::getProjectileLaunchOffset(
-	const ModelConditionFlags& condition, 
-	WeaponSlotType wslot, 
-	Int specificBarrelToUse, 
-	Matrix3D* launchPos, 
-	WhichTurretType tur, 
-	Coord3D* turretRotPos, 
+	const ModelConditionFlags& condition,
+	WeaponSlotType wslot,
+	Int specificBarrelToUse,
+	Matrix3D* launchPos,
+	WhichTurretType tur,
+	Coord3D* turretRotPos,
 	Coord3D* turretPitchPos
 ) const
 {
@@ -3215,12 +3219,12 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 	const ModelConditionInfo* stateToUse = findBestInfo(condition);
 	if (!stateToUse)
 	{
-		CRCDEBUG_LOG(("can't find best info\n"));
-		//BONEPOS_LOG(("can't find best info\n"));
+		CRCDEBUG_LOG(("can't find best info"));
+		//BONEPOS_LOG(("can't find best info"));
 		return false;
 	}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	CRCDEBUG_LOG(("W3DModelDraw::getProjectileLaunchOffset() for %s\n",
+#if defined(RTS_DEBUG)
+	CRCDEBUG_LOG(("W3DModelDraw::getProjectileLaunchOffset() for %s",
 		stateToUse->getDescription().str()));
 #endif
 
@@ -3238,13 +3242,13 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 #endif // INTENSE_DEBUG
 
 	const W3DModelDrawModuleData* d = getW3DModelDrawModuleData();
-	//CRCDEBUG_LOG(("validateStuffs() from within W3DModelDraw::getProjectileLaunchOffset()\n"));
+	//CRCDEBUG_LOG(("validateStuffs() from within W3DModelDraw::getProjectileLaunchOffset()"));
 	//DUMPREAL(getDrawable()->getScale());
-	//BONEPOS_LOG(("validateStuffs() from within W3DModelDraw::getProjectileLaunchOffset()\n"));
+	//BONEPOS_LOG(("validateStuffs() from within W3DModelDraw::getProjectileLaunchOffset()"));
 	//BONEPOS_DUMPREAL(getDrawable()->getScale());
 	stateToUse->validateStuff(NULL, getDrawable()->getScale(), d->m_extraPublicBones);
 
-	DEBUG_ASSERTCRASH(stateToUse->m_transitionSig == NO_TRANSITION, 
+	DEBUG_ASSERTCRASH(stateToUse->m_transitionSig == NO_TRANSITION,
 		("It is never legal to getProjectileLaunchOffset from a Transition state (they vary on a per-client basis)... however, we can fix this (see srj)\n"));
 
 	DEBUG_ASSERTCRASH(specificBarrelToUse >= 0, ("specificBarrelToUse should now always be explicit"));
@@ -3265,13 +3269,13 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 	}
 #endif
 
-	CRCDEBUG_LOG(("wslot = %d\n", wslot));
-	const ModelConditionInfo::WeaponBarrelInfoVec& wbvec = stateToUse->m_weaponBarrelInfoVec[wslot];	
+	CRCDEBUG_LOG(("wslot = %d", wslot));
+	const ModelConditionInfo::WeaponBarrelInfoVec& wbvec = stateToUse->m_weaponBarrelInfoVec[wslot];
 	if( wbvec.empty() )
 	{
 		// Can't find the launch pos, but they might still want the other info they asked for
-		CRCDEBUG_LOG(("empty wbvec\n"));
-		//BONEPOS_LOG(("empty wbvec\n"));
+		CRCDEBUG_LOG(("empty wbvec"));
+		//BONEPOS_LOG(("empty wbvec"));
 		launchPos = NULL;
 	}
 	else
@@ -3281,7 +3285,7 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 
 		if (launchPos)
 		{
-			CRCDEBUG_LOG(("specificBarrelToUse = %d\n", specificBarrelToUse));
+			CRCDEBUG_LOG(("specificBarrelToUse = %d", specificBarrelToUse));
 			*launchPos = wbvec[specificBarrelToUse].m_projectileOffsetMtx;
 
 			if (tur != TURRET_INVALID)
@@ -3298,9 +3302,9 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 		}
 	}
 
-	if (turretRotPos) 
+	if (turretRotPos)
 		turretRotPos->zero();
-	if (turretPitchPos) 
+	if (turretPitchPos)
 		turretPitchPos->zero();
 
 	if (tur != TURRET_INVALID)
@@ -3308,13 +3312,13 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 #ifdef CACHE_ATTACH_BONE
 		const Vector3* offset = d->getAttachToDrawableBoneOffset(getDrawable());
 #endif
-		const ModelConditionInfo::TurretInfo& turInfo = stateToUse->m_turrets[tur]; 
+		const ModelConditionInfo::TurretInfo& turInfo = stateToUse->m_turrets[tur];
 		if (turretRotPos)
 		{
 			if (turInfo.m_turretAngleNameKey != NAMEKEY_INVALID &&
 					!stateToUse->findPristineBonePos(turInfo.m_turretAngleNameKey, *turretRotPos))
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found!\n",KEYNAME(turInfo.m_turretAngleNameKey).str()));
+				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found!",KEYNAME(turInfo.m_turretAngleNameKey).str()));
 			}
 #ifdef CACHE_ATTACH_BONE
 			if (offset)
@@ -3330,7 +3334,7 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 			if (turInfo.m_turretPitchNameKey != NAMEKEY_INVALID &&
 					!stateToUse->findPristineBonePos(turInfo.m_turretPitchNameKey, *turretPitchPos))
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found!\n",KEYNAME(turInfo.m_turretPitchNameKey).str()));
+				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found!",KEYNAME(turInfo.m_turretPitchNameKey).str()));
 			}
 #ifdef CACHE_ATTACH_BONE
 			if (offset)
@@ -3348,10 +3352,10 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 //-------------------------------------------------------------------------------------------------
 Int W3DModelDraw::getPristineBonePositionsForConditionState(
 	const ModelConditionFlags& condition,
-	const char* boneNamePrefix, 
-	Int startIndex, 
-	Coord3D* positions, 
-	Matrix3D* transforms, 
+	const char* boneNamePrefix,
+	Int startIndex,
+	Coord3D* positions,
+	Matrix3D* transforms,
 	Int maxBones
 ) const
 {
@@ -3367,18 +3371,18 @@ Int W3DModelDraw::getPristineBonePositionsForConditionState(
 
 //	if (isValidTimeToCalcLogicStuff())
 //	{
-//		CRCDEBUG_LOG(("W3DModelDraw::getPristineBonePositionsForConditionState() - state = '%s'\n",
+//		CRCDEBUG_LOG(("W3DModelDraw::getPristineBonePositionsForConditionState() - state = '%s'",
 //			stateToUse->getDescription().str()));
-//		//CRCDEBUG_LOG(("renderObject == NULL: %d\n", (stateToUse==m_curState)?(m_renderObject == NULL):1));
+//		//CRCDEBUG_LOG(("renderObject == NULL: %d", (stateToUse==m_curState)?(m_renderObject == NULL):1));
 //	}
 
-	//BONEPOS_LOG(("validateStuff() from within W3DModelDraw::getPristineBonePositionsForConditionState()\n"));
+	//BONEPOS_LOG(("validateStuff() from within W3DModelDraw::getPristineBonePositionsForConditionState()"));
 	//BONEPOS_DUMPREAL(getDrawable()->getScale());
 	// we must call this every time we set m_nextState, to ensure cached bones are happy
 	stateToUse->validateStuff(
 		// if the state is the current state, pass in the current render object
 		// so that we don't have to re-create it!
-		stateToUse == m_curState ? m_renderObject : NULL, 
+		stateToUse == m_curState ? m_renderObject : NULL,
 		getDrawable()->getScale(),
 		getW3DModelDrawModuleData()->m_extraPublicBones);
 
@@ -3392,16 +3396,16 @@ Int W3DModelDraw::getPristineBonePositionsForConditionState(
 		transforms = tmpMtx;
 
 	Int posCount = 0;
-	Int endIndex = (startIndex == 0) ? 0 : 99;	
+	Int endIndex = (startIndex == 0) ? 0 : 99;
 	char buffer[256];
 	Int i = startIndex;
 	for (; i <= endIndex; ++i)
 	{
 		if (i == 0)
-			strcpy(buffer, boneNamePrefix);
+			strlcpy(buffer, boneNamePrefix, ARRAY_SIZE(buffer));
 		else
 			sprintf(buffer, "%s%02d", boneNamePrefix, i);
-		
+
 		for (char *c = buffer; c && *c; ++c)
 		{
 			// convert to all-lowercase since that's how we filled in the map
@@ -3419,7 +3423,7 @@ Int W3DModelDraw::getPristineBonePositionsForConditionState(
 		}
 		else
 		{
-			//DEBUG_CRASH(("*** ASSET ERROR: Bone %s not found!\n",buffer));
+			//DEBUG_CRASH(("*** ASSET ERROR: Bone %s not found!",buffer));
 			const Object *obj = getDrawable()->getObject();
 			if (obj)
 				transforms[posCount] = *obj->getTransformMatrix();
@@ -3432,7 +3436,7 @@ Int W3DModelDraw::getPristineBonePositionsForConditionState(
 		if (posCount >= maxBones)
 			break;
 	}
-	
+
 	if (positions && transforms)
 	{
 		for (i = 0; i < posCount; ++i)
@@ -3450,12 +3454,54 @@ Int W3DModelDraw::getPristineBonePositionsForConditionState(
 
 //	if (isValidTimeToCalcLogicStuff())
 //	{
-//		CRCDEBUG_LOG(("end of W3DModelDraw::getPristineBonePositionsForConditionState()\n"));
+//		CRCDEBUG_LOG(("end of W3DModelDraw::getPristineBonePositionsForConditionState()"));
 //	}
 
 	return posCount;
 }
 
+
+//-------------------------------------------------------------------------------------------------
+// (gth) C&C3 Added this accessor for the bounding box of a render object in a W3DModelDraw module
+// this method must ONLY be called from the client, NEVER From the logic, not even indirectly.
+Bool W3DModelDraw::clientOnly_getRenderObjBoundBox(OBBoxClass * boundbox) const
+{
+	if (!m_renderObject)
+		return false;
+
+	AABoxClass aabox;
+	m_renderObject->Get_Obj_Space_Bounding_Box(aabox);
+
+	Matrix3D tm = m_renderObject->Get_Transform();
+
+	// build an OBB for this AAB,transform
+	OBBoxClass box0(aabox.Center,aabox.Extent);
+	OBBoxClass::Transform(tm,box0,boundbox);
+
+	return true;
+}
+
+
+//-------------------------------------------------------------------------------------------------
+// (gth) C&C3 Added this accessor for a bone transform in the render object
+// this method must ONLY be called from the client, NEVER From the logic, not even indirectly.
+Bool W3DModelDraw::clientOnly_getRenderObjBoneTransform(const AsciiString & boneName,Matrix3D * set_tm) const
+{
+	if (!m_renderObject) {
+		return false;
+	}
+
+	int idx = m_renderObject->Get_Bone_Index(boneName.str());
+	if (idx == 0) {
+		set_tm->Make_Identity();
+		return false;
+	} else {
+		*set_tm = m_renderObject->Get_Bone_Transform(idx);
+		return true;
+	}
+}
+
+
 //-------------------------------------------------------------------------------------------------
 Bool W3DModelDraw::getCurrentWorldspaceClientBonePositions(const char* boneName, Matrix3D& transform) const
 {
@@ -3472,10 +3518,10 @@ Bool W3DModelDraw::getCurrentWorldspaceClientBonePositions(const char* boneName,
 
 //-------------------------------------------------------------------------------------------------
 Int W3DModelDraw::getCurrentBonePositions(
-	const char* boneNamePrefix, 
-	Int startIndex, 
-	Coord3D* positions, 
-	Matrix3D* transforms, 
+	const char* boneNamePrefix,
+	Int startIndex,
+	Coord3D* positions,
+	Matrix3D* transforms,
 	Int maxBones
 ) const
 {
@@ -3507,16 +3553,16 @@ Int W3DModelDraw::getCurrentBonePositions(
 #endif
 
 	Int posCount = 0;
-	Int endIndex = (startIndex == 0) ? 0 : 99;	
+	Int endIndex = (startIndex == 0) ? 0 : 99;
 	char buffer[256];
 	Int i = startIndex;
 	for (; i <= endIndex; ++i)
 	{
 		if (i == 0)
-			strcpy(buffer, boneNamePrefix);
+			strlcpy(buffer, boneNamePrefix, ARRAY_SIZE(buffer));
 		else
 			sprintf(buffer, "%s%02d", boneNamePrefix, i);
-		
+
 		Int boneIndex = m_renderObject->Get_Bone_Index(buffer);
 		if (boneIndex == 0)
 			break;
@@ -3531,7 +3577,7 @@ Int W3DModelDraw::getCurrentBonePositions(
 		if (posCount >= maxBones)
 			break;
 	}
-	
+
 	if (positions && transforms)
 	{
 		for (i = 0; i < posCount; ++i)
@@ -3552,8 +3598,8 @@ Int W3DModelDraw::getCurrentBonePositions(
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DModelDraw::reactToTransformChange( const Matrix3D* oldMtx, 
-																					 const Coord3D* oldPos, 
+void W3DModelDraw::reactToTransformChange( const Matrix3D* oldMtx,
+																					 const Coord3D* oldPos,
 																					 Real oldAngle )
 {
 
@@ -3565,7 +3611,7 @@ void W3DModelDraw::reactToTransformChange( const Matrix3D* oldMtx,
 		m_renderObject->Set_Transform(mtx);
 	}
 
-	if (m_trackRenderObject) 
+	if (m_trackRenderObject)
 	{
 		Object *obj = getDrawable()->getObject();
 		const Coord3D* pos = getDrawable()->getPosition();
@@ -3579,11 +3625,11 @@ void W3DModelDraw::reactToTransformChange( const Matrix3D* oldMtx,
 			if (obj && obj->isSignificantlyAboveTerrain())
 			{
 				m_trackRenderObject->setAirborne();
-			} 
+			}
 			m_trackRenderObject->addEdgeToTrack(pos->x, pos->y);
 		}
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 const ModelConditionInfo* W3DModelDraw::findBestInfo(const ModelConditionFlags& c) const
@@ -3614,7 +3660,7 @@ Bool W3DModelDraw::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelTo
 		// FXList::doFXPos(fxl, getDrawable()->getPosition(), getDrawable()->getTransformMatrix(), weaponSpeed, victimPos);
 		return false;
 	}
-	
+
 	Bool handled = false;
 
 	if (specificBarrelToUse < 0 || specificBarrelToUse > wbvec.size())
@@ -3625,7 +3671,7 @@ Bool W3DModelDraw::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelTo
 	if (fxl)
 	{
 		if (info.m_fxBone && m_renderObject)
-		{ 
+		{
 			const Object *logicObject = getDrawable()->getObject();// This is slow, so store it
 			if( ! m_renderObject->Is_Hidden() || (logicObject == NULL) )
 			{
@@ -3647,7 +3693,7 @@ Bool W3DModelDraw::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelTo
 				pos = *(logicObject->getPosition());
 				/** @todo Once Firepoint bones are actually implemented, this matrix will become correct.
 				// Unless of course they decide to not have the tracers come out of the windows, but rather go towards the target.
-				// In that case, tracers will have to be rewritten to be "point towards secondary" instead of 
+				// In that case, tracers will have to be rewritten to be "point towards secondary" instead of
 				// "point straight ahead" which assumes we are facing the target.
 				*/
 				FXList::doFXPos(fxl, &pos, mtx, weaponSpeed, victimPos, damageRadius);
@@ -3657,13 +3703,13 @@ Bool W3DModelDraw::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelTo
 		}
 		else
 		{
-			DEBUG_LOG(("*** no FXBone found for a non-null FXL\n"));
+			DEBUG_LOG(("*** no FXBone found for a non-null FXL"));
 		}
 	}
 
 	if (info.m_recoilBone || info.m_muzzleFlashBone)
 	{
-		//DEBUG_LOG(("START muzzleflash %08lx for Draw %08lx state %s at frame %d\n",info.m_muzzleFlashBone,this,m_curState->m_description.str(),TheGameLogic->getFrame()));
+		//DEBUG_LOG(("START muzzleflash %08lx for Draw %08lx state %s at frame %d",info.m_muzzleFlashBone,this,m_curState->m_description.str(),TheGameLogic->getFrame()));
 		WeaponRecoilInfo& recoil = m_weaponRecoilInfoVec[wslot][specificBarrelToUse];
 		recoil.m_state = WeaponRecoilInfo::RECOIL_START;
 		recoil.m_recoilRate = getW3DModelDrawModuleData()->m_initialRecoil;
@@ -3672,17 +3718,17 @@ Bool W3DModelDraw::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelTo
 	}
 
 	return handled;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void W3DModelDraw::setAnimationLoopDuration(UnsignedInt numFrames)
 {
 // this is never defined -- srj
 #ifdef NO_DURATIONS_ON_TRANSITIONS
-	if (m_curState != NULL && m_curState->m_transition != NO_TRANSITION && 
+	if (m_curState != NULL && m_curState->m_transition != NO_TRANSITION &&
 			m_nextState != NULL && m_nextState->m_transition == NO_TRANSITION)
 	{
-		DEBUG_LOG(("deferring pending duration of %d frames\n",numFrames));
+		DEBUG_LOG(("deferring pending duration of %d frames",numFrames));
 		m_nextStateAnimLoopDuration = numFrames;
 		return;
 	}
@@ -3699,13 +3745,13 @@ void W3DModelDraw::setAnimationLoopDuration(UnsignedInt numFrames)
 //-------------------------------------------------------------------------------------------------
 /**
 	similar to the above, but assumes that the current state is a "ONCE",
-	and is smart about transition states... if there is a transition state 
+	and is smart about transition states... if there is a transition state
 	"inbetween", it is included in the completion time.
 */
 void W3DModelDraw::setAnimationCompletionTime(UnsignedInt numFrames)
 {
-	if (m_curState != NULL && m_curState->m_transitionSig != NO_TRANSITION && m_curState->m_animations.size() > 0 &&
-			m_nextState != NULL && m_nextState->m_transitionSig == NO_TRANSITION && m_nextState->m_animations.size() > 0)
+	if (m_curState != NULL && m_curState->m_transitionSig != NO_TRANSITION && !m_curState->m_animations.empty() &&
+			m_nextState != NULL && m_nextState->m_transitionSig == NO_TRANSITION && !m_nextState->m_animations.empty())
 	{
 		// we have a transition; split up the time suitably.
 		// note that this is just a guess, and assumes that the states
@@ -3726,7 +3772,7 @@ void W3DModelDraw::setAnimationCompletionTime(UnsignedInt numFrames)
 //-------------------------------------------------------------------------------------------------
 void W3DModelDraw::setPauseAnimation(Bool pauseAnim)
 {
-	if (m_pauseAnimation == pauseAnim) 
+	if (m_pauseAnimation == pauseAnim)
 	{
 		return;
 	}
@@ -3742,12 +3788,12 @@ void W3DModelDraw::setPauseAnimation(Bool pauseAnim)
 		HAnimClass* anim = hlod->Peek_Animation_And_Info(framenum, numFrames, mode, dummy);
 		if (anim)
 		{
-			if (m_pauseAnimation) 
+			if (m_pauseAnimation)
 			{
 				m_animationMode = mode;
 				hlod->Set_Animation(anim, framenum, RenderObjClass::ANIM_MODE_MANUAL);
-			} 
-			else 
+			}
+			else
 			{
 				hlod->Set_Animation(anim, framenum, m_animationMode);
 			}
@@ -3765,7 +3811,7 @@ Real W3DModelDraw::getAnimationScrubScalar( void ) const
 #endif
 
 //-------------------------------------------------------------------------------------------------
-void W3DModelDraw::rebuildWeaponRecoilInfo(const ModelConditionInfo* state) 
+void W3DModelDraw::rebuildWeaponRecoilInfo(const ModelConditionInfo* state)
 {
 	Int wslot;
 
@@ -3793,7 +3839,7 @@ void W3DModelDraw::rebuildWeaponRecoilInfo(const ModelConditionInfo* state)
 			}
 		}
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Preload any assets for the time of day requested */
@@ -3887,7 +3933,7 @@ void W3DModelDraw::updateSubObjects()
 
 				const HTreeClass *htree = m_renderObject->Get_HTree();
 				if (htree)
-				{	
+				{
 					//get the bone of this subobject so we can hide all other child objects that use this bone
 					//as a parent.
 					Int boneIdx = m_renderObject->Get_Sub_Object_Bone_Index(0, objIndex);
@@ -3897,7 +3943,7 @@ void W3DModelDraw::updateSubObjects()
 			}
 			else
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: SubObject %s not found (%s)!\n",it->subObjName.str(),getDrawable()->getTemplate()->getName().str()));
+				DEBUG_CRASH(("*** ASSET ERROR: SubObject %s not found (%s)!",it->subObjName.str(),getDrawable()->getTemplate()->getName().str()));
 			}
 		}
 	}
@@ -3912,7 +3958,7 @@ void W3DModelDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -3960,9 +4006,9 @@ void W3DModelDraw::xfer( Xfer *xfer )
 				weaponRecoilInfo.m_recoilRate = (*it).m_recoilRate;
 				xfer->xferReal( &weaponRecoilInfo.m_recoilRate );
 
-			}  // end for, it
-			
-		}  // end if, save
+			}
+
+		}
 		else
 		{
 
@@ -3985,11 +4031,11 @@ void W3DModelDraw::xfer( Xfer *xfer )
 				// stuff it in the vector
 				m_weaponRecoilInfoVec[ i ].push_back( weaponRecoilInfo );
 
-			}  // end for, j
+			}
 
-		}  // end else, load
+		}
 
-	}  // end for, i
+	}
 
 	// sub object vector
 	UnsignedByte subObjectCount = m_subObjectVec.size();
@@ -4010,9 +4056,9 @@ void W3DModelDraw::xfer( Xfer *xfer )
 			hideShowSubObjInfo.hide = (*it).hide;
 			xfer->xferBool( &hideShowSubObjInfo.hide );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -4032,24 +4078,24 @@ void W3DModelDraw::xfer( Xfer *xfer )
 			// stuff in vector
 			m_subObjectVec.push_back( hideShowSubObjInfo );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// animation
 	if( version >= 2 )
 	{
-		
+
 		if( xfer->getXferMode() == XFER_SAVE )
 		{
 				// srj sez: don't save info for transition states, since we can't really
 				// restore them effectively.
-			if ( m_renderObject 
+			if ( m_renderObject
 					&& m_renderObject->Class_ID() == RenderObjClass::CLASSID_HLOD
 					&& m_curState
 					&& m_curState->m_transitionSig == NO_TRANSITION )
 			{
-				
+
 				// cast to HLod
 				HLodClass *hlod = (HLodClass*)m_renderObject;
 
@@ -4076,9 +4122,9 @@ void W3DModelDraw::xfer( Xfer *xfer )
 					Real percent = frame / INT_TO_REAL( anim->Get_Num_Frames()-1 );
 					xfer->xferReal( &percent );
 
-				}  // end if, anim
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -4086,9 +4132,9 @@ void W3DModelDraw::xfer( Xfer *xfer )
 				Bool present = FALSE;
 				xfer->xferBool( &present );
 
-			}  // end else
+			}
 
-		}  // end if, save
+		}
 		else
 		{
 
@@ -4098,7 +4144,7 @@ void W3DModelDraw::xfer( Xfer *xfer )
 
 			if( present )
 			{
-				
+
 				{
 					// read mode
 					Int mode;
@@ -4130,28 +4176,28 @@ void W3DModelDraw::xfer( Xfer *xfer )
 						float dummy1, dummy2;
 						int curMode, dummy3;
 						hlod->Peek_Animation_And_Info(dummy1, dummy3, curMode, dummy2);
-						
+
 						// srj sez: do not change the animation mode. it's too risky, since if you change (say) a nonlooping
 						// to a looping, something might break since it could rely on that anim terminating.
 
 						// set animation data
 						hlod->Set_Animation( anim, frame, curMode );
 
-					}  // end if, anim
+					}
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
-		}  // end else, load
+		}
 
-	}  // end if, version with animation info
+	}
 
 	// when loading, update the sub objects if we have any
 	if( xfer->getXferMode() == XFER_LOAD && m_subObjectVec.empty() == FALSE )
 		updateSubObjects();
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4162,7 +4208,7 @@ void W3DModelDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -4186,7 +4232,7 @@ void W3DModelDrawModuleData::xfer( Xfer *x )
 	{
 		ModelConditionInfo *info = &(*it);
 		x->xferByte(&(info->m_validStuff));
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		x->xferAsciiString(&(info->m_description));
 #endif
 		if (info->m_validStuff)
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
index efe2e11dc02..a89398e22f5 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
@@ -46,11 +46,11 @@ W3DOverlordTankDrawModuleData::~W3DOverlordTankDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DOverlordTankDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DOverlordTankDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DTankDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ 0, 0, 0, 0 }
 	};
@@ -62,7 +62,7 @@ void W3DOverlordTankDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 W3DOverlordTankDraw::W3DOverlordTankDraw( Thing *thing, const ModuleData* moduleData )
 : W3DTankDraw( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -78,7 +78,7 @@ void W3DOverlordTankDraw::doDrawModule(const Matrix3D* transformMtx)
 	// Our big thing is that we get our specific passenger (the turret thing) and then wake it up and make it draw
 	// It depends on us because our renderObject is only made correct in the act of drawing.
 	Object *me = getDrawable()->getObject();
-	if( me 
+	if( me
 		&& me->getContain()
 		&& me->getContain()->friend_getRider()
 		&& me->getContain()->friend_getRider()->getDrawable()
@@ -88,7 +88,7 @@ void W3DOverlordTankDraw::doDrawModule(const Matrix3D* transformMtx)
 		riderDraw->setColorTintEnvelope( *getDrawable()->getColorTintEnvelope() );
 
 		riderDraw->notifyDrawableDependencyCleared();
-		riderDraw->draw( NULL );// What the hell?  This param isn't used for anything
+		riderDraw->draw();
 	}
 }
 
@@ -99,7 +99,7 @@ void W3DOverlordTankDraw::setHidden(Bool h)
 
 	// We need to hide our rider, since he won't realize he's being contained in a contained container
 	Object *me = getDrawable()->getObject();
-	if( me 
+	if( me
 		&& me->getContain()
 		&& me->getContain()->friend_getRider()
 		&& me->getContain()->friend_getRider()->getDrawable()
@@ -108,7 +108,7 @@ void W3DOverlordTankDraw::setHidden(Bool h)
 		me->getContain()->friend_getRider()->getDrawable()->setDrawableHidden(h);
 	}
 }
- 
+
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -119,7 +119,7 @@ void W3DOverlordTankDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DTankDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -137,7 +137,7 @@ void W3DOverlordTankDraw::xfer( Xfer *xfer )
 	// extend base class
 	W3DTankDraw::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -148,4 +148,4 @@ void W3DOverlordTankDraw::loadPostProcess( void )
 	// extend base class
 	W3DTankDraw::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp
index 050927ad8b9..d05f9103dfd 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp
@@ -24,7 +24,7 @@
 
 // FILE: W3DPoliceCarDraw.cpp /////////////////////////////////////////////////////////////////////
 // Author: Colin Day, May 2001
-// Desc:   W3DPoliceCarDraw 
+// Desc:   W3DPoliceCarDraw
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
@@ -52,21 +52,21 @@ W3DDynamicLight *W3DPoliceCarDraw::createDynamicLight( void )
 	light = W3DDisplay::m_3DScene->getADynamicLight();
 	if( light )
 	{
-		
+
 		light->setEnabled( TRUE );
 		light->Set_Ambient( Vector3( 0.0f, 0.0f, 0.0f ) );
-		// Use all ambient, and no diffuse.  This produces a circle of light on 
-		// even and uneven ground.  Diffuse lighting shows up ground unevenness, which looks 
+		// Use all ambient, and no diffuse.  This produces a circle of light on
+		// even and uneven ground.  Diffuse lighting shows up ground unevenness, which looks
 		// funny on a searchlight.  So  no diffuse.  jba.
 		light->Set_Diffuse( Vector3( 0.0f, 0.0f, 0.0f ) );
 		light->Set_Position( Vector3( 0.0f, 0.0f, 0.0f ) );
 		light->Set_Far_Attenuation_Range( 5, 15 );
 
-	}  // end if
+	}
 
 	return light;
 
-}  // end createDynamicSearchLight
+}
 
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 
@@ -77,7 +77,7 @@ W3DPoliceCarDraw::W3DPoliceCarDraw( Thing *thing, const ModuleData* moduleData )
 	m_light = NULL;
 	m_curFrame = GameClientRandomValueReal(0, 10 );
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -92,7 +92,7 @@ W3DPoliceCarDraw::~W3DPoliceCarDraw( void )
 		m_light->setDecayRange();
 		m_light->setDecayColor();
 		m_light = NULL;
-	}  // end if
+	}
 
 }
 
@@ -109,8 +109,8 @@ void W3DPoliceCarDraw::doDrawModule(const Matrix3D* transformMtx)
 		return;
 
 	HAnimClass *anim = policeCarRenderObj->Peek_Animation();
-	if (anim) 
-	{		
+	if (anim)
+	{
 		Real frames = anim->Get_Num_Frames();
 		m_curFrame += animAmt;
 		if (m_curFrame > frames-1) {
@@ -122,9 +122,9 @@ void W3DPoliceCarDraw::doDrawModule(const Matrix3D* transformMtx)
 	Real green = 0;
 	Real blue = 0;
 	if (m_curFrame < 3) {
-		red = 1; green = 0.5; 
+		red = 1; green = 0.5;
 	} else if (m_curFrame < 6) {
-		red = 1; 
+		red = 1;
 	} else if (m_curFrame < 7) {
 		red = 1; green = 0.5;
 	} else if (m_curFrame < 9) {
@@ -153,7 +153,7 @@ void W3DPoliceCarDraw::doDrawModule(const Matrix3D* transformMtx)
 		m_light->Set_Position( Vector3( pos.x,pos.y,pos.z+floatAmt ) );
 	}
 	W3DTruckDraw::doDrawModule(transformMtx);
-} 
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -165,7 +165,7 @@ void W3DPoliceCarDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DTruckDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -185,7 +185,7 @@ void W3DPoliceCarDraw::xfer( Xfer *xfer )
 
 	// John A says there is no data for these to save
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -196,4 +196,4 @@ void W3DPoliceCarDraw::loadPostProcess( void )
 	// extend base class
 	W3DTruckDraw::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp
index 8af1f0a9265..44a69928ea0 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp
@@ -38,7 +38,7 @@
 #include "WWMath/vector3.h"
 
 //-------------------------------------------------------------------------------------------------
-W3DProjectileStreamDrawModuleData::W3DProjectileStreamDrawModuleData() 
+W3DProjectileStreamDrawModuleData::W3DProjectileStreamDrawModuleData()
 {
 	m_textureName = "";
 	m_width = 0.0f;
@@ -53,11 +53,11 @@ W3DProjectileStreamDrawModuleData::~W3DProjectileStreamDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DProjectileStreamDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DProjectileStreamDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Texture",			INI::parseAsciiString,	NULL, offsetof(W3DProjectileStreamDrawModuleData, m_textureName) },
 		{ "Width",				INI::parseReal,					NULL, offsetof(W3DProjectileStreamDrawModuleData, m_width) },
@@ -230,7 +230,7 @@ void W3DProjectileStreamDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -250,7 +250,7 @@ void W3DProjectileStreamDraw::xfer( Xfer *xfer )
 
 	// Graham says there is no data that needs saving here
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -261,4 +261,4 @@ void W3DProjectileStreamDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp
index c7993643457..4680154732f 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp
@@ -44,11 +44,6 @@
 #include "W3DDevice/GameClient/W3DScene.h"
 #include "Common/GameState.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -72,7 +67,7 @@ W3DRopeDraw::W3DRopeDraw( Thing *thing, const ModuleData* moduleData ) : DrawMod
 	m_segments.clear();
 	m_curWobblePhase = 0.0f;
 	m_curZOffset = 0.0f;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -143,7 +138,7 @@ void W3DRopeDraw::tossSegments()
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void W3DRopeDraw::initRopeParms(Real length, Real width, const RGBColor& color, Real wobbleLen, Real wobbleAmp, Real wobbleRate)
-{ 
+{
 	m_maxLen = max(1.0f, length);
 	m_curLen = 0.0f;
 	m_width = width;
@@ -160,16 +155,16 @@ void W3DRopeDraw::initRopeParms(Real length, Real width, const RGBColor& color,
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void W3DRopeDraw::setRopeCurLen(Real length)
-{ 
-	m_curLen = length; 
+{
+	m_curLen = length;
 }
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void W3DRopeDraw::setRopeSpeed(Real curSpeed, Real maxSpeed, Real accel)
-{ 
-	m_curSpeed = curSpeed; 
-	m_maxSpeed = maxSpeed; 
+{
+	m_curSpeed = curSpeed;
+	m_maxSpeed = maxSpeed;
 	m_accel = accel;
 }
 
@@ -227,7 +222,7 @@ void W3DRopeDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -287,7 +282,7 @@ void W3DRopeDraw::xfer( Xfer *xfer )
 		tossSegments();
 
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -298,4 +293,4 @@ void W3DRopeDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp
index f37f0d8c65b..e809aac0331 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp
@@ -29,13 +29,14 @@
 
 #include "W3DDevice/GameClient/Module/W3DScienceModelDraw.h"
 
+#include "Common/GameUtility.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Science.h"
 #include "Common/Xfer.h"
 
 //-------------------------------------------------------------------------------------------------
-W3DScienceModelDrawModuleData::W3DScienceModelDrawModuleData() 
+W3DScienceModelDrawModuleData::W3DScienceModelDrawModuleData()
 {
 	m_requiredScience = SCIENCE_INVALID;
 }
@@ -46,11 +47,11 @@ W3DScienceModelDrawModuleData::~W3DScienceModelDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DScienceModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DScienceModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "RequiredScience", INI::parseScience, NULL, offsetof(W3DScienceModelDrawModuleData, m_requiredScience) },
 
@@ -62,7 +63,7 @@ void W3DScienceModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DScienceModelDraw::W3DScienceModelDraw( Thing *thing, const ModuleData* moduleData ) : W3DModelDraw( thing, moduleData )
-{	 
+{
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -82,9 +83,9 @@ void W3DScienceModelDraw::doDrawModule(const Matrix3D* transformMtx)
 		return;
 	}
 
-	if( !ThePlayerList->getLocalPlayer()->hasScience(science) 
-			&& ThePlayerList->getLocalPlayer()->isPlayerActive()
-		)
+	Player* player = rts::getObservedOrLocalPlayer();
+
+	if( !player->hasScience(science) && player->isPlayerActive() )
 	{
 		// We just don't draw for people without our science except for Observers
 		setHidden( TRUE );
@@ -103,7 +104,7 @@ void W3DScienceModelDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -121,7 +122,7 @@ void W3DScienceModelDraw::xfer( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -132,6 +133,6 @@ void W3DScienceModelDraw::loadPostProcess( void )
 	// extend base class
 	W3DModelDraw::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp
index c37362c1fd2..f9b5dbd254c 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp
@@ -32,7 +32,7 @@
 #include "W3DDevice/GameClient/Module/W3DSupplyDraw.h"
 
 //-------------------------------------------------------------------------------------------------
-W3DSupplyDrawModuleData::W3DSupplyDrawModuleData() 
+W3DSupplyDrawModuleData::W3DSupplyDrawModuleData()
 {
 }
 
@@ -42,11 +42,11 @@ W3DSupplyDrawModuleData::~W3DSupplyDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DSupplyDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DSupplyDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SupplyBonePrefix", INI::parseAsciiString, NULL, offsetof(W3DSupplyDrawModuleData, m_supplyBonePrefix) },
 
@@ -58,7 +58,7 @@ void W3DSupplyDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DSupplyDraw::W3DSupplyDraw( Thing *thing, const ModuleData* moduleData ) : W3DModelDraw( thing, moduleData )
-{	 
+{
 	m_totalBones = -1;
 	m_lastNumberShown = 0;
 }
@@ -119,7 +119,7 @@ void W3DSupplyDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -139,7 +139,7 @@ void W3DSupplyDraw::xfer( Xfer *xfer )
 
 	// Graham says there's no data to save here
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -150,6 +150,6 @@ void W3DSupplyDraw::loadPostProcess( void )
 	// extend base class
 	W3DModelDraw::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp
index c409c8610db..efdc37d46a2 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp
@@ -47,11 +47,6 @@
 #include "W3DDevice/GameClient/Module/W3DTankDraw.h"
 #include "WW3D2/matinfo.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 class Matrix3D;
 
@@ -71,11 +66,11 @@ W3DTankDrawModuleData::~W3DTankDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DTankDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DTankDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "TreadDebrisLeft", INI::parseAsciiString, NULL, offsetof(W3DTankDrawModuleData, m_treadDebrisNameLeft) },
 		{ "TreadDebrisRight", INI::parseAsciiString, NULL, offsetof(W3DTankDrawModuleData, m_treadDebrisNameRight) },
@@ -234,7 +229,12 @@ void W3DTankDraw::updateTreadPositions(Real uvDelta)
 		else
 		if (pTread->m_type == TREAD_RIGHT)	//this tread needs to scroll backwards
 			offset_u = pTread->m_materialSettings.customUVOffset.X - uvDelta;
-				
+		else
+		{
+			DEBUG_CRASH(("Unhandled case in W3DTankDraw::updateTreadPositions"));
+			offset_u = 0.0f;
+		}
+
 		// ensure coordinates of offset are in [0, 1] range:
 		offset_u = offset_u - WWMath::Floor(offset_u);
 		pTread->m_materialSettings.customUVOffset.Set(offset_u,0);
@@ -242,7 +242,7 @@ void W3DTankDraw::updateTreadPositions(Real uvDelta)
 	}
 }
 
-/**Grab pointers to the sub-meshes for each tread*/ 
+/**Grab pointers to the sub-meshes for each tread*/
 void W3DTankDraw::updateTreadObjects(void)
 {
 	RenderObjClass *robj=getRenderObject();
@@ -254,7 +254,7 @@ void W3DTankDraw::updateTreadObjects(void)
 
 	//Make sure this object has defined a speed for tread scrolling.
 	if (getW3DTankDrawModuleData() && getW3DTankDrawModuleData()->m_treadAnimationRate && robj)
-	{	
+	{
 		for (Int i=0; i < robj->Get_Num_Sub_Objects() && m_treadCount < MAX_TREADS_PER_TANK; i++)
 		{
 			RenderObjClass *subObj=robj->Get_Sub_Object(i);
@@ -310,12 +310,15 @@ void W3DTankDraw::onRenderObjRecreated(void)
 //-------------------------------------------------------------------------------------------------
 void W3DTankDraw::doDrawModule(const Matrix3D* transformMtx)
 {
-	const Real DEBRIS_THRESHOLD = 0.00001f;
+	W3DModelDraw::doDrawModule(transformMtx);
 
- 	Bool frozen = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
- 	frozen = frozen || TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript();
-	if (frozen)
+	// TheSuperHackers @tweak Update the draw on every WW Sync only.
+	// All calculations are originally catered to a 30 fps logic step.
+	if (WW3D::Get_Sync_Frame_Time() == 0)
 		return;
+
+	const Real DEBRIS_THRESHOLD = 0.00001f;
+
 	if (getRenderObject()==NULL) return;
 	if (getRenderObject() != m_prevRenderObj) {
 		updateTreadObjects();
@@ -378,7 +381,7 @@ void W3DTankDraw::doDrawModule(const Matrix3D* transformMtx)
 				Coord3D dir;
 				obj->getUnitDirectionVector2D(dir);
 				Real angleToGoal = dir.x * m_lastDirection.x + dir.y * m_lastDirection.y;
-				
+
 				if (fabs(1.0f-angleToGoal) > 0.00001f)	//check if difference in angle cosines is greater than some cutoff.
 				{
 					if (turn == TURN_NEGATIVE)	//turning right
@@ -404,8 +407,6 @@ void W3DTankDraw::doDrawModule(const Matrix3D* transformMtx)
 			}
 		}
 	}
-
-	W3DModelDraw::doDrawModule(transformMtx);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -417,7 +418,7 @@ void W3DTankDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -437,7 +438,7 @@ void W3DTankDraw::xfer( Xfer *xfer )
 
 	// John A and Mark W say there is no data to save here
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -452,4 +453,4 @@ void W3DTankDraw::loadPostProcess( void )
 	tossEmitters();
 	createEmitters();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
index 6b5df1a2494..433b3af4c46 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: W3DTankTruckDraw.cpp 
+// FILE: W3DTankTruckDraw.cpp
 // Draw TankTrucks.  Actually, this draws quad cannon which has both treads and wheels.
 // Author: Mark Wilczynski, August 2002
 
@@ -64,11 +64,11 @@ W3DTankTruckDrawModuleData::~W3DTankTruckDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DTankTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DTankTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Dust", INI::parseAsciiString, NULL, offsetof(W3DTankTruckDrawModuleData, m_dustEffectName) },
 		{ "DirtSpray", INI::parseAsciiString, NULL, offsetof(W3DTankTruckDrawModuleData, m_dirtEffectName) },
@@ -100,7 +100,7 @@ m_dirtEffect(NULL), m_dustEffect(NULL), m_powerslideEffect(NULL), m_effectsIniti
 m_wasAirborne(false), m_isPowersliding(false), m_frontWheelRotation(0), m_rearWheelRotation(0),
 m_frontRightTireBone(0), m_frontLeftTireBone(0), m_rearLeftTireBone(0),m_rearRightTireBone(0),
 m_prevRenderObj(NULL)
-{	 
+{
 	//Truck Data
 	m_landingSound = *(thing->getTemplate()->getPerUnitSound("TruckLandingSound"));
 	m_powerslideSound = *(thing->getTemplate()->getPerUnitSound("TruckPowerslideSound"));
@@ -244,12 +244,12 @@ void W3DTankTruckDraw::createEmitters( void )
 				m_dustEffect->setSaveable(FALSE);
 			}	else {
 				if (!getW3DTankTruckDrawModuleData()->m_dustEffectName.isEmpty()) {
-					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'\n", 
+					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'",
 						getW3DTankTruckDrawModuleData()->m_dustEffectName.str(), getDrawable()->getObject()->getTemplate()->getName().str()));
 				}
 			}
 
-		}	 
+		}
 		if (!m_dirtEffect) {
 			sysTemplate = TheParticleSystemManager->findTemplate(getW3DTankTruckDrawModuleData()->m_dirtEffectName);
 			if (sysTemplate)
@@ -260,7 +260,7 @@ void W3DTankTruckDraw::createEmitters( void )
 				m_dirtEffect->setSaveable(FALSE);
 			}	else {
 				if (!getW3DTankTruckDrawModuleData()->m_dirtEffectName.isEmpty()) {
-					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'\n", 
+					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'",
 						getW3DTankTruckDrawModuleData()->m_dirtEffectName.str(), getDrawable()->getObject()->getTemplate()->getName().str()));
 				}
 			}
@@ -275,13 +275,13 @@ void W3DTankTruckDraw::createEmitters( void )
 				m_powerslideEffect->setSaveable(FALSE);
 			}	else {
 				if (!getW3DTankTruckDrawModuleData()->m_powerslideEffectName.isEmpty()) {
-					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'\n", 
+					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'",
 						getW3DTankTruckDrawModuleData()->m_powerslideEffectName.str(), getDrawable()->getObject()->getTemplate()->getName().str()));
 				}
 			}
 		}
 	}
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -293,89 +293,89 @@ void W3DTankTruckDraw::enableEmitters( Bool enable  )
 {
 	// don't check... if we are hidden the first time thru, then we'll never create the emitters.
 	// eg, if we are loading a game and the unit is in a tunnel, he'll never get emitteres even when he exits.
-	//if (!m_effectsInitialized) 
+	//if (!m_effectsInitialized)
 	{
 		createEmitters();
 		m_effectsInitialized=true;
 	}
 	if (m_dustEffect)
 	{
-		if (enable) 
+		if (enable)
 			m_dustEffect->start();
 		else
 			m_dustEffect->stop();
 	}
 	if (m_dirtEffect)
 	{
-		if (enable) 
+		if (enable)
 			m_dirtEffect->start();
 		else
 			m_dirtEffect->stop();
 	}
 	if (m_powerslideEffect)
 	{
-		if (!enable) 
+		if (!enable)
 			m_powerslideEffect->stop();
 	}
 }
 //-------------------------------------------------------------------------------------------------
 void W3DTankTruckDraw::updateBones( void ) {
-	if( getW3DTankTruckDrawModuleData() ) 
+	if( getW3DTankTruckDrawModuleData() )
 	{
 		//Front tires
-		if( !getW3DTankTruckDrawModuleData()->m_frontLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTankTruckDrawModuleData()->m_frontLeftTireBoneName.isEmpty() )
 		{
 			m_frontLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_frontLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_frontLeftTireBone, ("Missing front-left tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_frontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
-			
+			DEBUG_ASSERTCRASH(m_frontLeftTireBone, ("Missing front-left tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_frontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+
 			m_frontRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_frontRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_frontRightTireBone, ("Missing front-right tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_frontRightTireBoneName.str(), getRenderObject()->Get_Name()));
-			
-			if (!m_frontRightTireBone ) 
+			DEBUG_ASSERTCRASH(m_frontRightTireBone, ("Missing front-right tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_frontRightTireBoneName.str(), getRenderObject()->Get_Name()));
+
+			if (!m_frontRightTireBone )
 			{
 				m_frontLeftTireBone = 0;
 			}
 		}
 		//Rear tires
-		if( !getW3DTankTruckDrawModuleData()->m_rearLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTankTruckDrawModuleData()->m_rearLeftTireBoneName.isEmpty() )
 		{
 			m_rearLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_rearLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_rearLeftTireBone, ("Missing rear-left tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_rearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_rearLeftTireBone, ("Missing rear-left tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_rearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
 
 			m_rearRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_rearRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_rearRightTireBone, ("Missing rear-left tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_rearRightTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_rearRightTireBone, ("Missing rear-left tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_rearRightTireBoneName.str(), getRenderObject()->Get_Name()));
 
-			if (!m_rearRightTireBone) 
+			if (!m_rearRightTireBone)
 			{
 				m_rearLeftTireBone = 0;
 			}
 		}
 
 		//midFront tires
-		if( !getW3DTankTruckDrawModuleData()->m_midFrontLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTankTruckDrawModuleData()->m_midFrontLeftTireBoneName.isEmpty() )
 		{
 			m_midFrontLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_midFrontLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midFrontLeftTireBone, ("Missing mid-front-left tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_midFrontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
-			
+			DEBUG_ASSERTCRASH(m_midFrontLeftTireBone, ("Missing mid-front-left tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_midFrontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+
 			m_midFrontRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_midFrontRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midFrontRightTireBone, ("Missing mid-front-right tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_midFrontRightTireBoneName.str(), getRenderObject()->Get_Name()));
-			
-			if (!m_midFrontRightTireBone ) 
+			DEBUG_ASSERTCRASH(m_midFrontRightTireBone, ("Missing mid-front-right tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_midFrontRightTireBoneName.str(), getRenderObject()->Get_Name()));
+
+			if (!m_midFrontRightTireBone )
 			{
 				m_midFrontLeftTireBone = 0;
 			}
 		}
 
 		//midRear tires
-		if( !getW3DTankTruckDrawModuleData()->m_midRearLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTankTruckDrawModuleData()->m_midRearLeftTireBoneName.isEmpty() )
 		{
 			m_midRearLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_midRearLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midRearLeftTireBone, ("Missing mid-rear-left tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_midRearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_midRearLeftTireBone, ("Missing mid-rear-left tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_midRearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
 
 			m_midRearRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_midRearRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midRearRightTireBone, ("Missing mid-rear-right tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_midRearRightTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_midRearRightTireBone, ("Missing mid-rear-right tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_midRearRightTireBoneName.str(), getRenderObject()->Get_Name()));
 
-			if (!m_midRearRightTireBone) 
+			if (!m_midRearRightTireBone)
 			{
 				m_midRearLeftTireBone = 0;
 			}
@@ -414,7 +414,12 @@ void W3DTankTruckDraw::updateTreadPositions(Real uvDelta)
 		else
 		if (pTread->m_type == TREAD_RIGHT)	//this tread needs to scroll backwards
 			offset_u = pTread->m_materialSettings.customUVOffset.X - uvDelta;
-				
+		else
+		{
+			DEBUG_CRASH(("Unhandled case in W3DTankTruckDraw::updateTreadPositions"));
+			offset_u = 0.0f;
+		}
+
 		// ensure coordinates of offset are in [0, 1] range:
 		offset_u = offset_u - WWMath::Floor(offset_u);
 		pTread->m_materialSettings.customUVOffset.Set(offset_u,0);
@@ -422,7 +427,7 @@ void W3DTankTruckDraw::updateTreadPositions(Real uvDelta)
 	}
 }
 
-/**Grab pointers to the sub-meshes for each tread*/ 
+/**Grab pointers to the sub-meshes for each tread*/
 void W3DTankTruckDraw::updateTreadObjects(void)
 {
 	RenderObjClass *robj=getRenderObject();
@@ -434,7 +439,7 @@ void W3DTankTruckDraw::updateTreadObjects(void)
 
 	//Make sure this object has defined a speed for tread scrolling.
 	if (getW3DTankTruckDrawModuleData() && getW3DTankTruckDrawModuleData()->m_treadAnimationRate && robj)
-	{	
+	{
 		for (Int i=0; i < robj->Get_Num_Sub_Objects() && m_treadCount < MAX_TREADS_PER_TANK; i++)
 		{
 			RenderObjClass *subObj=robj->Get_Sub_Object(i);
@@ -483,8 +488,8 @@ void W3DTankTruckDraw::updateTreadObjects(void)
 //-------------------------------------------------------------------------------------------------
 void W3DTankTruckDraw::onRenderObjRecreated(void)
 {
-	//DEBUG_LOG(("Old obj %x, newObj %x, new bones %d, old bones %d\n",
-	//	m_prevRenderObj, getRenderObject(), getRenderObject()->Get_Num_Bones(), 
+	//DEBUG_LOG(("Old obj %x, newObj %x, new bones %d, old bones %d",
+	//	m_prevRenderObj, getRenderObject(), getRenderObject()->Get_Num_Bones(),
 	//	m_prevNumBones));
 	m_prevRenderObj = NULL;
 	m_frontLeftTireBone = 0;
@@ -510,9 +515,9 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 	if (!TheGlobalData->m_showClientPhysics)
 		return;
 
- 	Bool frozen = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
- 	frozen = frozen || TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript();
-	if (frozen)
+	// TheSuperHackers @tweak Update the draw on every WW Sync only.
+	// All calculations are originally catered to a 30 fps logic step.
+	if (WW3D::Get_Sync_Frame_Time() == 0)
 		return;
 
 	const Real ACCEL_THRESHOLD = 0.01f;
@@ -535,25 +540,21 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 	const Coord3D *vel = physics->getVelocity();
 	Real speed = physics->getVelocityMagnitude();
 
-
 	const TWheelInfo *wheelInfo = getDrawable()->getWheelInfo();	// note, can return null!
-	if (wheelInfo && (m_frontLeftTireBone || m_rearLeftTireBone)) 
+	if (wheelInfo && (m_frontLeftTireBone || m_rearLeftTireBone))
 	{
-		static Real rotation = 0;
 		const Real rotationFactor = getW3DTankTruckDrawModuleData()->m_rotationSpeedMultiplier;
+		const Real powerslideRotationAddition = getW3DTankTruckDrawModuleData()->m_powerslideRotationAddition * m_isPowersliding;
+
 		m_frontWheelRotation += rotationFactor*speed;
-		if (m_isPowersliding) 
-		{
-			m_rearWheelRotation += rotationFactor*(speed+getW3DTankTruckDrawModuleData()->m_powerslideRotationAddition);
-		} 
-		else 
-		{
-			m_rearWheelRotation += rotationFactor*speed;
-		}
+		m_rearWheelRotation += rotationFactor*(speed+powerslideRotationAddition);
+		m_frontWheelRotation = WWMath::Normalize_Angle(m_frontWheelRotation);
+		m_rearWheelRotation = WWMath::Normalize_Angle(m_rearWheelRotation);
+
 		Matrix3D wheelXfrm(1);
-		if (m_frontLeftTireBone) 
+		if (m_frontLeftTireBone)
 		{
-			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);		 
+			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_frontWheelRotation);
 			getRenderObject()->Capture_Bone( m_frontLeftTireBone );
@@ -564,25 +565,25 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_frontWheelRotation);
 			getRenderObject()->Capture_Bone( m_frontRightTireBone );
-			getRenderObject()->Control_Bone( m_frontRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_frontRightTireBone, wheelXfrm );
 		}
-		if (m_rearLeftTireBone) 
+		if (m_rearLeftTireBone)
 		{
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_rearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearLeftHeightOffset);
 			getRenderObject()->Capture_Bone( m_rearLeftTireBone );
-			getRenderObject()->Control_Bone( m_rearLeftTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_rearLeftTireBone, wheelXfrm );
 
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_rearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearRightHeightOffset);
 			getRenderObject()->Capture_Bone( m_rearRightTireBone );
-			getRenderObject()->Control_Bone( m_rearRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_rearRightTireBone, wheelXfrm );
 		}
-		if (m_midFrontLeftTireBone) 
+		if (m_midFrontLeftTireBone)
 		{
-			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);		 
+			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_midFrontWheelRotation);
 			getRenderObject()->Capture_Bone( m_midFrontLeftTireBone );
@@ -593,21 +594,21 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_midFrontWheelRotation);
 			getRenderObject()->Capture_Bone( m_midFrontRightTireBone );
-			getRenderObject()->Control_Bone( m_midFrontRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midFrontRightTireBone, wheelXfrm );
 		}
-		if (m_midRearLeftTireBone) 
+		if (m_midRearLeftTireBone)
 		{
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_midRearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearLeftHeightOffset);
 			getRenderObject()->Capture_Bone( m_midRearLeftTireBone );
-			getRenderObject()->Control_Bone( m_midRearLeftTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midRearLeftTireBone, wheelXfrm );
 
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_midRearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearRightHeightOffset);
 			getRenderObject()->Capture_Bone( m_midRearRightTireBone );
-			getRenderObject()->Control_Bone( m_midRearRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midRearRightTireBone, wheelXfrm );
 		}
 	}
 
@@ -618,7 +619,7 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 		Coord3D accel = *physics->getAcceleration();
 		accel.z = 0; // ignore gravitational force.
 		Bool accelerating = accel.length()>ACCEL_THRESHOLD;
-		//DEBUG_LOG(("Accel %f, speed %f\n", accel.length(), speed));
+		//DEBUG_LOG(("Accel %f, speed %f", accel.length(), speed));
 		if (accelerating)	{
 			Real dot = accel.x*vel->x + accel.y*vel->y;
 			if (dot<0) {
@@ -630,7 +631,7 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			if (speed>SIZE_CAP) {
 				speed = SIZE_CAP;
 			}
-			m_dustEffect->setSizeMultiplier(speed);	 
+			m_dustEffect->setSizeMultiplier(speed);
 		}
 		if (m_dirtEffect) {
 			if (wheelInfo && wheelInfo->m_framesAirborne>3) {
@@ -643,7 +644,7 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			} else {
 				if (!accelerating || speed>2.0f) {
 					m_dirtEffect->stop();
-				}	
+				}
 			}
 		}
 		if (m_powerslideEffect) {
@@ -657,7 +658,7 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 		if (m_dirtEffect) {
 			if (!accelerating || speed>2.0f) {
 				m_dirtEffect->stop();
-			}	
+			}
 		}
 	}
 	else
@@ -750,7 +751,7 @@ void W3DTankTruckDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -770,7 +771,7 @@ void W3DTankTruckDraw::xfer( Xfer *xfer )
 
 	// John A and Mark W say there is no data to save here
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -784,4 +785,4 @@ void W3DTankTruckDraw::loadPostProcess( void )
 	// toss any existing ones (no need to re-create; we'll do that on demand)
 	tossEmitters();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp
index 52364980605..c56ae62d0af 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp
@@ -41,11 +41,6 @@
 #include "WW3D2/line3d.h"
 #include "W3DDevice/GameClient/W3DScene.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -66,13 +61,13 @@ W3DTracerDraw::W3DTracerDraw( Thing *thing, const ModuleData* moduleData ) : Dra
 	m_speedInDistPerFrame = 1.0f;
 	m_theTracer = NULL;
 
-}  // end W3DTracerDraw
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void W3DTracerDraw::setTracerParms(Real speed, Real length, Real width, const RGBColor& color, Real initialOpacity)
-{ 
-	m_speedInDistPerFrame = speed; 
+{
+	m_speedInDistPerFrame = speed;
 	m_length = length;
 	m_width = width;
 	m_color = color;
@@ -102,8 +97,8 @@ W3DTracerDraw::~W3DTracerDraw( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DTracerDraw::reactToTransformChange( const Matrix3D *oldMtx, 
-																							 const Coord3D *oldPos, 
+void W3DTracerDraw::reactToTransformChange( const Matrix3D *oldMtx,
+																							 const Coord3D *oldPos,
 																							 Real oldAngle )
 {
 	if( m_theTracer )
@@ -165,7 +160,7 @@ void W3DTracerDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -185,7 +180,7 @@ void W3DTracerDraw::xfer( Xfer *xfer )
 
 	// no data to save here, nobody will ever notice
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -196,4 +191,4 @@ void W3DTracerDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
index dc54baca09c..0baa25aa28a 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: W3DTruckDraw.cpp 
+// FILE: W3DTruckDraw.cpp
 // Draw Trucks.  Actually, this draws rocket buggies.
 // Author: John Ahlquist, March 2002
 
@@ -49,14 +49,9 @@
 #include "W3DDevice/GameClient/W3DGameClient.h"
 #include "W3DDevice/GameClient/Module/W3DTruckDraw.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
-W3DTruckDrawModuleData::W3DTruckDrawModuleData() 
+W3DTruckDrawModuleData::W3DTruckDrawModuleData()
 {
 }
 
@@ -66,11 +61,11 @@ W3DTruckDrawModuleData::~W3DTruckDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Dust", INI::parseAsciiString, NULL, offsetof(W3DTruckDrawModuleData, m_dustEffectName) },
 		{ "DirtSpray", INI::parseAsciiString, NULL, offsetof(W3DTruckDrawModuleData, m_dirtEffectName) },
@@ -104,20 +99,20 @@ void W3DTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 W3DTruckDraw::W3DTruckDraw( Thing *thing, const ModuleData* moduleData ) : W3DModelDraw( thing, moduleData ),
 m_dirtEffect(NULL), m_dustEffect(NULL), m_powerslideEffect(NULL), m_effectsInitialized(false),
-m_wasAirborne(false), m_isPowersliding(false), 
+m_wasAirborne(false), m_isPowersliding(false),
 m_frontWheelRotation(0), m_rearWheelRotation(0), m_midFrontWheelRotation(0), m_midRearWheelRotation(0),
 m_frontRightTireBone(0), m_frontLeftTireBone(0), m_rearLeftTireBone(0),m_rearRightTireBone(0),
 m_midFrontRightTireBone(0), m_midFrontLeftTireBone(0), m_midRearLeftTireBone(0),m_midRearRightTireBone(0),
 m_midMidRightTireBone(0), m_midMidLeftTireBone(0), m_prevRenderObj(NULL)
-{	 
+{
 	const AudioEventRTS * event;
 	event = thing->getTemplate()->getPerUnitSound("TruckLandingSound");
 	if (event) {
-		m_landingSound = *event; 
+		m_landingSound = *event;
 	}
 	event = thing->getTemplate()->getPerUnitSound("TruckPowerslideSound");
 	if (event) {
-		m_powerslideSound = *event; 
+		m_powerslideSound = *event;
 	}
 }
 
@@ -190,12 +185,12 @@ void W3DTruckDraw::createEmitters( void )
 				m_dustEffect->setSaveable(FALSE);
 			}	else {
 				if (!getW3DTruckDrawModuleData()->m_dustEffectName.isEmpty()) {
-					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'\n", 
+					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'",
 						getW3DTruckDrawModuleData()->m_dustEffectName.str(), getDrawable()->getObject()->getTemplate()->getName().str()));
 				}
 			}
 
-		}	 
+		}
 		if (!m_dirtEffect) {
 			sysTemplate = TheParticleSystemManager->findTemplate(getW3DTruckDrawModuleData()->m_dirtEffectName);
 			if (sysTemplate)
@@ -206,7 +201,7 @@ void W3DTruckDraw::createEmitters( void )
 				m_dirtEffect->setSaveable(FALSE);
 			}	else {
 				if (!getW3DTruckDrawModuleData()->m_dirtEffectName.isEmpty()) {
-					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'\n", 
+					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'",
 						getW3DTruckDrawModuleData()->m_dirtEffectName.str(), getDrawable()->getObject()->getTemplate()->getName().str()));
 				}
 			}
@@ -221,13 +216,13 @@ void W3DTruckDraw::createEmitters( void )
 				m_powerslideEffect->setSaveable(FALSE);
 			}	else {
 				if (!getW3DTruckDrawModuleData()->m_powerslideEffectName.isEmpty()) {
-					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'\n", 
+					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'",
 						getW3DTruckDrawModuleData()->m_powerslideEffectName.str(), getDrawable()->getObject()->getTemplate()->getName().str()));
 				}
 			}
 		}
 	}
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -239,112 +234,112 @@ void W3DTruckDraw::enableEmitters( Bool enable  )
 {
 	// don't check... if we are hidden the first time thru, then we'll never create the emitters.
 	// eg, if we are loading a game and the unit is in a tunnel, he'll never get emitteres even when he exits.
-	//if (!m_effectsInitialized) 
+	//if (!m_effectsInitialized)
 	{
 		createEmitters();
 		m_effectsInitialized=true;
 	}
 	if (m_dustEffect)
 	{
-		if (enable) 
+		if (enable)
 			m_dustEffect->start();
 		else
 			m_dustEffect->stop();
 	}
 	if (m_dirtEffect)
 	{
-		if (enable) 
+		if (enable)
 			m_dirtEffect->start();
 		else
 			m_dirtEffect->stop();
 	}
 	if (m_powerslideEffect)
 	{
-		if (!enable) 
+		if (!enable)
 			m_powerslideEffect->stop();
 	}
 }
 //-------------------------------------------------------------------------------------------------
-void W3DTruckDraw::updateBones( void ) 
+void W3DTruckDraw::updateBones( void )
 {
-	if( getW3DTruckDrawModuleData() ) 
+	if( getW3DTruckDrawModuleData() )
 	{
 		//Front tires
-		if( !getW3DTruckDrawModuleData()->m_frontLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_frontLeftTireBoneName.isEmpty() )
 		{
 			m_frontLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_frontLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_frontLeftTireBone, ("Missing front-left tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_frontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_frontLeftTireBone, ("Missing front-left tire bone %s in model %s", getW3DTruckDrawModuleData()->m_frontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
 		}
 
 		if( !getW3DTruckDrawModuleData()->m_frontRightTireBoneName.isEmpty() )
 		{
 			m_frontRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_frontRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_frontRightTireBone, ("Missing front-right tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_frontRightTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_frontRightTireBone, ("Missing front-right tire bone %s in model %s", getW3DTruckDrawModuleData()->m_frontRightTireBoneName.str(), getRenderObject()->Get_Name()));
 		}
 
 		//Rear tires
-		if( !getW3DTruckDrawModuleData()->m_rearLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_rearLeftTireBoneName.isEmpty() )
 		{
 			m_rearLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_rearLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_rearLeftTireBone, ("Missing rear-left tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_rearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_rearLeftTireBone, ("Missing rear-left tire bone %s in model %s", getW3DTruckDrawModuleData()->m_rearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
 		}
 
-		if( !getW3DTruckDrawModuleData()->m_rearRightTireBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_rearRightTireBoneName.isEmpty() )
 		{
 			m_rearRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_rearRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_rearRightTireBone, ("Missing rear-left tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_rearRightTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_rearRightTireBone, ("Missing rear-left tire bone %s in model %s", getW3DTruckDrawModuleData()->m_rearRightTireBoneName.str(), getRenderObject()->Get_Name()));
 		}
 
 		//midFront tires
-		if( !getW3DTruckDrawModuleData()->m_midFrontLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_midFrontLeftTireBoneName.isEmpty() )
 		{
 			m_midFrontLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_midFrontLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midFrontLeftTireBone, ("Missing mid-front-left tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_midFrontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
-			
+			DEBUG_ASSERTCRASH(m_midFrontLeftTireBone, ("Missing mid-front-left tire bone %s in model %s", getW3DTruckDrawModuleData()->m_midFrontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+
 			m_midFrontRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_midFrontRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midFrontRightTireBone, ("Missing mid-front-right tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_midFrontRightTireBoneName.str(), getRenderObject()->Get_Name()));
-			
-			if (!m_midFrontRightTireBone ) 
+			DEBUG_ASSERTCRASH(m_midFrontRightTireBone, ("Missing mid-front-right tire bone %s in model %s", getW3DTruckDrawModuleData()->m_midFrontRightTireBoneName.str(), getRenderObject()->Get_Name()));
+
+			if (!m_midFrontRightTireBone )
 			{
 				m_midFrontLeftTireBone = 0;
 			}
 		}
 
 		//midRear tires
-		if( !getW3DTruckDrawModuleData()->m_midRearLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_midRearLeftTireBoneName.isEmpty() )
 		{
 			m_midRearLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_midRearLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midRearLeftTireBone, ("Missing mid-rear-left tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_midRearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_midRearLeftTireBone, ("Missing mid-rear-left tire bone %s in model %s", getW3DTruckDrawModuleData()->m_midRearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
 
 			m_midRearRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_midRearRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midRearRightTireBone, ("Missing mid-rear-right tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_midRearRightTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_midRearRightTireBone, ("Missing mid-rear-right tire bone %s in model %s", getW3DTruckDrawModuleData()->m_midRearRightTireBoneName.str(), getRenderObject()->Get_Name()));
 
-			if (!m_midRearRightTireBone) 
+			if (!m_midRearRightTireBone)
 			{
 				m_midRearLeftTireBone = 0;
 			}
 		}
 
 		//midMid tires
-		if( !getW3DTruckDrawModuleData()->m_midMidLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_midMidLeftTireBoneName.isEmpty() )
 		{
 			m_midMidLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_midMidLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midMidLeftTireBone, ("Missing mid-mid-left tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_midMidLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_midMidLeftTireBone, ("Missing mid-mid-left tire bone %s in model %s", getW3DTruckDrawModuleData()->m_midMidLeftTireBoneName.str(), getRenderObject()->Get_Name()));
 
 			m_midMidRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_midMidRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midMidRightTireBone, ("Missing mid-mid-right tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_midMidRightTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_midMidRightTireBone, ("Missing mid-mid-right tire bone %s in model %s", getW3DTruckDrawModuleData()->m_midMidRightTireBoneName.str(), getRenderObject()->Get_Name()));
 
-			if (!m_midMidRightTireBone) 
+			if (!m_midMidRightTireBone)
 			{
 				m_midMidLeftTireBone = 0;
 			}
 		}
 
 		//Cab
-		if( !getW3DTruckDrawModuleData()->m_cabBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_cabBoneName.isEmpty() )
 		{
 			m_cabBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_cabBoneName.str());
-			DEBUG_ASSERTCRASH(m_cabBone, ("Missing cab bone %s in model %s\n", getW3DTruckDrawModuleData()->m_cabBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_cabBone, ("Missing cab bone %s in model %s", getW3DTruckDrawModuleData()->m_cabBoneName.str(), getRenderObject()->Get_Name()));
 			m_trailerBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_trailerBoneName.str());
 		}
 	}
@@ -366,8 +361,8 @@ void W3DTruckDraw::setHidden(Bool h)
 //-------------------------------------------------------------------------------------------------
 void W3DTruckDraw::onRenderObjRecreated(void)
 {
-	//DEBUG_LOG(("Old obj %x, newObj %x, new bones %d, old bones %d\n",
-	//	m_prevRenderObj, getRenderObject(), getRenderObject()->Get_Num_Bones(), 
+	//DEBUG_LOG(("Old obj %x, newObj %x, new bones %d, old bones %d",
+	//	m_prevRenderObj, getRenderObject(), getRenderObject()->Get_Num_Bones(),
 	//	m_prevNumBones));
 	m_prevRenderObj = NULL;
 	m_frontLeftTireBone = 0;
@@ -393,12 +388,14 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 
 	if (!TheGlobalData->m_showClientPhysics)
 		return;
+
 	const W3DTruckDrawModuleData *moduleData = getW3DTruckDrawModuleData();
-	if (moduleData==NULL) return; // shouldn't ever happen.
+	if (moduleData==NULL)
+		return; // shouldn't ever happen.
 
- 	Bool frozen = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
- 	frozen = frozen || TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript();
-	if (frozen)
+	// TheSuperHackers @tweak Update the draw on every WW Sync only.
+	// All calculations are originally catered to a 30 fps logic step.
+	if (WW3D::Get_Sync_Frame_Time() == 0)
 		return;
 
 	const Real ACCEL_THRESHOLD = 0.01f;
@@ -410,10 +407,10 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 
 	if (getRenderObject()==NULL) return;
 	if (getRenderObject() != m_prevRenderObj) {
-		DEBUG_LOG(("W3DTruckDraw::doDrawModule - shouldn't update bones. jba\n"));
+		DEBUG_LOG(("W3DTruckDraw::doDrawModule - shouldn't update bones. jba"));
 		updateBones();
 	}
-	
+
 	// get object physics state
 	PhysicsBehavior *physics = obj->getPhysics();
 	if (physics == NULL)
@@ -426,7 +423,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 	AIUpdateInterface *ai = obj->getAI();
 	if (m_cabBone && wheelInfo) {
 		Matrix3D cabXfrm(1);
-		cabXfrm.Make_Identity();		 
+		cabXfrm.Make_Identity();
 		Real desiredAngle = wheelInfo->m_wheelAngle*moduleData->m_cabRotationFactor;
 
 		// Check goal angle.
@@ -444,7 +441,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 				if (desiredAngle<0) desiredAngle = 0;
 			}
 			//DEBUG_LOG(("final desired %f ", 180*desiredAngle/PI));
-		}	
+		}
 
 		Real deltaAngle = desiredAngle - m_curCabRotation;
 		deltaAngle *= moduleData->m_rotationDampingFactor;
@@ -464,9 +461,11 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 		}
 	}
 
-	if (m_frontLeftTireBone || m_rearLeftTireBone) 
+	if (m_frontLeftTireBone || m_rearLeftTireBone)
 	{
-		Real powerslideRotationAddition = moduleData->m_powerslideRotationAddition;
+		const Real rotationFactor = moduleData->m_rotationSpeedMultiplier;
+		Real powerslideRotationAddition = moduleData->m_powerslideRotationAddition * m_isPowersliding;
+
 		if (ai) {
 			Locomotor *loco = ai->getCurLocomotor();
 			if (loco) {
@@ -476,16 +475,11 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 				}
 			}
 		}
-		const Real rotationFactor = moduleData->m_rotationSpeedMultiplier;
+
 		m_frontWheelRotation += rotationFactor*speed;
-		if (m_isPowersliding) 
-		{
-			m_rearWheelRotation += rotationFactor*(speed + powerslideRotationAddition);
-		} 
-		else 
-		{
-			m_rearWheelRotation += rotationFactor*speed;
-		}
+		m_rearWheelRotation += rotationFactor*(speed + powerslideRotationAddition);
+		m_frontWheelRotation = WWMath::Normalize_Angle(m_frontWheelRotation);
+		m_rearWheelRotation = WWMath::Normalize_Angle(m_rearWheelRotation);
 
 		// For now, just use the same values for mid wheels -- may want to do independent calcs later...
 		m_midFrontWheelRotation = m_frontWheelRotation;
@@ -495,10 +489,10 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 
 
 
-		if (m_frontLeftTireBone && wheelInfo) 
+		if (m_frontLeftTireBone && wheelInfo)
 		{
 			wheelXfrm.Make_Identity();
-			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);		 
+			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_frontWheelRotation);
 			getRenderObject()->Capture_Bone( m_frontLeftTireBone );
@@ -510,15 +504,15 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_frontWheelRotation);
 			getRenderObject()->Capture_Bone( m_frontRightTireBone );
-			getRenderObject()->Control_Bone( m_frontRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_frontRightTireBone, wheelXfrm );
 		}
-		if (m_rearLeftTireBone && wheelInfo) 
+		if (m_rearLeftTireBone && wheelInfo)
 		{
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_rearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearLeftHeightOffset);
 			getRenderObject()->Capture_Bone( m_rearLeftTireBone );
-			getRenderObject()->Control_Bone( m_rearLeftTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_rearLeftTireBone, wheelXfrm );
 
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_rearWheelRotation);
@@ -527,12 +521,12 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			//@todo TROUBLE HERE, THE BONE INDICES DO NOT MATCH THE RENDEROBJECTS BONES, SOMETIMES
 
 			getRenderObject()->Capture_Bone( m_rearRightTireBone );
-			getRenderObject()->Control_Bone( m_rearRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_rearRightTireBone, wheelXfrm );
 		}
-		if (m_midFrontLeftTireBone && wheelInfo) 
+		if (m_midFrontLeftTireBone && wheelInfo)
 		{
 			wheelXfrm.Make_Identity();
-			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);		 
+			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_midFrontWheelRotation);
 			getRenderObject()->Capture_Bone( m_midFrontLeftTireBone );
@@ -543,35 +537,35 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_midFrontWheelRotation);
 			getRenderObject()->Capture_Bone( m_midFrontRightTireBone );
-			getRenderObject()->Control_Bone( m_midFrontRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midFrontRightTireBone, wheelXfrm );
 		}
-		if (m_midRearLeftTireBone && wheelInfo) 
+		if (m_midRearLeftTireBone && wheelInfo)
 		{
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_midRearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearLeftHeightOffset);
 			getRenderObject()->Capture_Bone( m_midRearLeftTireBone );
-			getRenderObject()->Control_Bone( m_midRearLeftTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midRearLeftTireBone, wheelXfrm );
 
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_midRearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearRightHeightOffset);
 			getRenderObject()->Capture_Bone( m_midRearRightTireBone );
-			getRenderObject()->Control_Bone( m_midRearRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midRearRightTireBone, wheelXfrm );
 		}
-		if (m_midMidLeftTireBone && wheelInfo) 
+		if (m_midMidLeftTireBone && wheelInfo)
 		{
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_midRearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearLeftHeightOffset);
 			getRenderObject()->Capture_Bone( m_midMidLeftTireBone );
-			getRenderObject()->Control_Bone( m_midMidLeftTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midMidLeftTireBone, wheelXfrm );
 
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_midRearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearRightHeightOffset);
 			getRenderObject()->Capture_Bone( m_midMidRightTireBone );
-			getRenderObject()->Control_Bone( m_midMidRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midMidRightTireBone, wheelXfrm );
 		}
 	}
 
@@ -582,7 +576,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 		Coord3D accel = *physics->getAcceleration();
 		accel.z = 0; // ignore gravitational force.
 		Bool accelerating = accel.length()>ACCEL_THRESHOLD;
-		//DEBUG_LOG(("Accel %f, speed %f\n", accel.length(), speed));
+		//DEBUG_LOG(("Accel %f, speed %f", accel.length(), speed));
 		if (accelerating)	{
 			Real dot = accel.x*vel->x + accel.y*vel->y;
 			if (dot<0) {
@@ -594,7 +588,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			if (speed>SIZE_CAP) {
 				speed = SIZE_CAP;
 			}
-			m_dustEffect->setSizeMultiplier(speed);	 
+			m_dustEffect->setSizeMultiplier(speed);
 		}
 		if (m_dirtEffect) {
 			if (wheelInfo && wheelInfo->m_framesAirborne>3) {
@@ -607,7 +601,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			} else {
 				if (!accelerating || speed>2.0f) {
 					m_dirtEffect->stop();
-				}	
+				}
 			}
 		}
 		if (m_powerslideEffect) {
@@ -621,7 +615,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 		if (m_dirtEffect) {
 			if (!accelerating || speed>2.0f) {
 				m_dirtEffect->stop();
-			}	
+			}
 		}
 	}
 	else
@@ -648,7 +642,7 @@ void W3DTruckDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -668,7 +662,7 @@ void W3DTruckDraw::xfer( Xfer *xfer )
 
 	// John A and Mark W say there is no data to save here
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -682,4 +676,4 @@ void W3DTruckDraw::loadPostProcess( void )
 	// toss any existing ones (no need to re-create; we'll do that on demand)
 	tossEmitters();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
index 071cb170cf2..1a99fe9ac16 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
@@ -26,6 +26,7 @@
 // Author: Colin Day
 // Desc: Control bar callbacks
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/Radar.h"
 #include "Common/Player.h"
@@ -39,11 +40,6 @@
 #include "GameClient/ControlBarScheme.h"
 #include "GameClient/MapUtil.h"
 #include "GameLogic/GameLogic.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 void W3DCameoMovieDraw( GameWindow *window, WinInstanceData *instData )
@@ -58,15 +54,13 @@ void W3DCameoMovieDraw( GameWindow *window, WinInstanceData *instData )
 
 		TheDisplay->drawVideoBuffer( video, pos.x, pos.y, pos.x + size.x, pos.y + size.y );
 	}
-}  // end W3DLeftHUDDraw
+}
 
 
 //-------------------------------------------------------------------------------------------------
 void W3DLeftHUDDraw( GameWindow *window, WinInstanceData *instData )
 {
 	// draw the default stuff
-//
-	Player *player = ThePlayerList->getLocalPlayer();
 	// draw video buffer
 	VideoBuffer *video = TheInGameUI->videoBuffer();
 	if ( video )
@@ -77,7 +71,7 @@ void W3DLeftHUDDraw( GameWindow *window, WinInstanceData *instData )
 
 		TheDisplay->drawVideoBuffer( video, pos.x, pos.y, pos.x + size.x, pos.y + size.y );
 	}
-	else if( TheRadar->isRadarForced() || ( TheRadar->isRadarHidden() == false && player->hasRadar() ) )
+	else if( rts::localPlayerHasRadar() )
 	{
 		ICoord2D pos, size;
 		//W3DGameWinDefaultDraw( window, instData );
@@ -88,10 +82,8 @@ void W3DLeftHUDDraw( GameWindow *window, WinInstanceData *instData )
 		// draw the radar on the screen now
 		TheRadar->draw( pos.x + 1, pos.y + 1, size.x - 2, size.y - 2 );
 
-	}  // end else if
-
-
-}  // end W3DLeftHUDDraw
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -101,8 +93,8 @@ void W3DRightHUDDraw( GameWindow *window, WinInstanceData *instData )
 	// draw the default stuff
 	if( BitIsSet(window->winGetStatus(), WIN_STATUS_IMAGE ))
 		W3DGameWinDefaultDraw( window, instData );
-	
-}  // end W3DRightHUDDraw
+
+}
 
 Real logN(Real value, Real logBase)
 {
@@ -130,15 +122,7 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
 	//const Image *beginBar = NULL;
 	const Image *centerBar = NULL;
 	static const Image *slider = TheMappedImageCollection->findImageByName("PowerBarSlider");
-	Player *player = NULL;
-	if(TheControlBar->isObserverControlBarOn())
-	{
-		player = TheControlBar->getObserverLookAtPlayer();
-	}
-	else
-		player = ThePlayerList->getLocalPlayer();
-	
-
+	Player* player = TheControlBar->getCurrentlyViewedPlayer();
 
 	if(!player || !TheGlobalData)
 		return;
@@ -147,7 +131,7 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
 		return;
 
 	Int consumption = energy->getConsumption();
-	Int production = energy->getProduction();	
+	Int production = energy->getProduction();
 
 	ICoord2D pos, size;
 	window->winGetScreenPosition( &pos.x, &pos.y );
@@ -155,7 +139,7 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
 
 	static Real pixelsPerInterval = size.x / TheGlobalData->m_powerBarIntervals;
 	Int delta = TheGlobalData->m_powerBarYellowRange;
-	
+
 	if((consumption > energy->getProduction() - delta) && (consumption <= energy->getProduction()))
 	{
 		// 6 and 1 is Green, 6 and 2 is yellow, 6 and 6 is yellow
@@ -207,10 +191,10 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
 
 	// get width we have to draw our repeating center in
 	centerWidth = range; //rightStart.x - leftEnd.x;
-	
+
 	if( centerWidth > 0)
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerBar->getImageWidth();
 		ICoord2D start, end;
@@ -222,12 +206,12 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
 		{
 
 			end.x = start.x + centerBar->getImageWidth();
-			TheWindowManager->winDrawImage( centerBar, 
+			TheWindowManager->winDrawImage( centerBar,
 																			start.x, start.y,
 																			end.x, end.y );
 			start.x += centerBar->getImageWidth();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -297,15 +281,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 	const Image *beginBar = NULL;
 	const Image *centerBar = NULL;
 	static const Image *slider = TheMappedImageCollection->findImageByName("PowerBarSlider");
-	Player *player = NULL;
-	if(TheControlBar->isObserverControlBarOn())
-	{
-		player = TheControlBar->getObserverLookAtPlayer();
-	}
-	else
-		player = ThePlayerList->getLocalPlayer();
-	
-
+	Player* player = TheControlBar->getCurrentlyViewedPlayer();
 
 	if(!player || !TheGlobalData)
 		return;
@@ -314,7 +290,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 		return;
 
 	Int consumption = energy->getConsumption();
-	Int production = energy->getProduction();	
+	Int production = energy->getProduction();
 
 	ICoord2D pos, size;
 	window->winGetScreenPosition( &pos.x, &pos.y );
@@ -322,7 +298,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 
 	static Real pixelsPerInterval = size.x / TheGlobalData->m_powerBarIntervals;
 	Int delta = TheGlobalData->m_powerBarYellowRange;
-	
+
 	if((consumption > energy->getProduction() - delta) && (consumption <= energy->getProduction()))
 	{
 		// 6 and 1 is Green, 6 and 2 is yellow, 6 and 6 is yellow
@@ -374,7 +350,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 
 	// get width we have to draw our repeating center in
 	centerWidth = rightStart.x - leftEnd.x;
-	
+
 	if( centerWidth <= 0)
 	{
 		// draw left end
@@ -393,7 +369,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 	}
 	else
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerBar->getImageWidth();
 
@@ -405,12 +381,12 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 		{
 
 			end.x = start.x + centerBar->getImageWidth();
-			TheWindowManager->winDrawImage( centerBar, 
+			TheWindowManager->winDrawImage( centerBar,
 																			start.x, start.y,
 																			end.x, end.y );
 			start.x += centerBar->getImageWidth();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -474,7 +450,7 @@ void W3DCommandBarGridDraw( GameWindow *window, WinInstanceData *instData )
 	ICoord2D pos, size;
 	window->winGetScreenPosition( &pos.x, &pos.y );
 	window->winGetSize( &size.x, &size.y );
-		
+
 	Color color = TheControlBar->getBorderColor();
 	window->winSetEnabledBorderColor(0, color);
 	W3DGameWinDefaultDraw( window, instData );
@@ -484,16 +460,19 @@ void W3DCommandBarGridDraw( GameWindow *window, WinInstanceData *instData )
 	TheDisplay->drawLine(pos.x + size.x * .33, pos.y, pos.x + size.x *.33, pos.y +size.y, 1,color);
 	TheDisplay->drawLine(pos.x + size.x  * .66, pos.y, pos.x + size.x *.66, pos.y + size.y, 1,color);
 
-	
+
 
 
 }
 
 void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
 {
-	Player *player = ThePlayerList->getLocalPlayer();
-	if(!player->isPlayerActive())
+	// TheSuperHackers @bugfix Stubbjax 08/08/2025 Show the experience bar for observers
+	Player* player = TheControlBar->getCurrentlyViewedPlayer();
+
+	if (!player)
 		return;
+
 	static const Image *endBar = TheMappedImageCollection->findImageByName("GenExpBarTop1");
 	static const Image *beginBar = TheMappedImageCollection->findImageByName("GenExpBarBottom1");
 	static const Image *centerBar = TheMappedImageCollection->findImageByName("GenExpBar1");
@@ -505,7 +484,7 @@ void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
 	{
 		progress = ( ((player->getSkillPoints() - player->getSkillPointsLevelDown()) * 100) / skillPointsRequired );
 	}
-	
+
 	if(progress <= 0)
 		return;
 
@@ -547,7 +526,7 @@ void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
 
 	// get width we have to draw our repeating center in
 	centerWidth = bottomEnd.y - topStart.y;
-	
+
 	if( centerWidth <= 0)
 	{
 		// draw left end
@@ -566,7 +545,7 @@ void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
 	}
 	else
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerBar->getImageHeight();
 
@@ -578,12 +557,12 @@ void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
 		{
 
 			end.y = start.y + centerBar->getImageHeight();
-			TheWindowManager->winDrawImage( centerBar, 
+			TheWindowManager->winDrawImage( centerBar,
 																			start.x, start.y,
 																			end.x, end.y );
 			start.y += centerBar->getImageHeight();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -624,7 +603,7 @@ void W3DCommandBarTopDraw( GameWindow *window, WinInstanceData *instData )
 	GameWindow *win = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonGeneral"));
 	if(!win || win->winIsHidden() || !ThePlayerList->getLocalPlayer()->isPlayerActive())
 		return;
-	
+
 //	TheControlBar->drawTransitionHandler();
 
 //	ICoord2D pos, size, imageStart, imageEnd;
@@ -645,13 +624,13 @@ void W3DCommandBarBackgroundDraw( GameWindow *window, WinInstanceData *instData
 	ControlBarSchemeManager *man = TheControlBar->getControlBarSchemeManager();
 	if(!man)
 		return;
-	static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) );
+	static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" );
 	GameWindow *win =  TheWindowManager->winGetWindowFromId(NULL,winNamekey);
 	static ICoord2D basePos;
 	if(!win)
 	{
 		return;
-		//win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ));
+		//win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ));
 	}
 	TheControlBar->getBackgroundMarkerPos(&basePos.x, &basePos.y);
 	ICoord2D pos, offset;
@@ -670,13 +649,13 @@ void W3DCommandBarForegroundDraw( GameWindow *window, WinInstanceData *instData
 	if(!man)
 		return;
 
-	static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) );
+	static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" );
 	GameWindow *win = TheWindowManager->winGetWindowFromId(NULL,winNamekey);
 	static ICoord2D basePos;
 	if(!win)
 	{
 		return;
-		//win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ));
+		//win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ));
 	}
 	TheControlBar->getForegroundMarkerPos(&basePos.x, &basePos.y);
 	ICoord2D pos, offset;
@@ -693,8 +672,8 @@ void W3DNoDraw( GameWindow *window, WinInstanceData *instData )
 
 	// draw the default stuff
 //	W3DGameWinDefaultDraw( window, instData );
-	
-}  // end W3DRightHUDDraw
+
+}
 
 void drawSkinnyBorder( Int x, Int y, Int width, Int height);
 void W3DDrawMapPreview( GameWindow *window, WinInstanceData *instData)
@@ -710,10 +689,10 @@ void W3DDrawMapPreview( GameWindow *window, WinInstanceData *instData)
 		drawSkinnyBorder(pixelX - 1, pixelY - 1, width + 2, height + 2);
 		return;
 	}
-	
-	
-	
-		
+
+
+
+
 	//
 	// given a upper left corner at pixelX|Y and a width and height to draw into, figure out
 	// where we should start and end the image so that the final drawn image has the
@@ -728,17 +707,17 @@ void W3DDrawMapPreview( GameWindow *window, WinInstanceData *instData)
 	// draw black border areas where we need map
 	Color fillColor = GameMakeColor( 0, 0, 0, 255 );
 	Color lineColor = GameMakeColor( 50, 50, 50, 255 );
-	
+
 	if( mmData->m_extent.width()/width >= mmData->m_extent.height()/height )
 	{
-		
+
 		// draw horizontal bars at top and bottom
 		TheDisplay->drawFillRect( pixelX, pixelY, width, ul.y - pixelY - 1, fillColor );
 		TheDisplay->drawFillRect( pixelX, lr.y + 1, width, pixelY + height - lr.y - 1, fillColor);
 		TheDisplay->drawLine(pixelX, ul.y, pixelX + width, ul.y, 1, lineColor);
 		TheDisplay->drawLine(pixelX, lr.y + 1, pixelX + width, lr.y + 1, 1, lineColor);
 
-	}  // end if
+	}
 	else
 	{
 
@@ -748,7 +727,7 @@ void W3DDrawMapPreview( GameWindow *window, WinInstanceData *instData)
 		TheDisplay->drawLine(ul.x, pixelY, ul.x, pixelY + height, 1, lineColor);
 		TheDisplay->drawLine(lr.x + 1, pixelY, lr.x + 1, pixelY + height, 1, lineColor);
 
-	}  // end else
+	}
 
 	if(!BitIsSet(window->winGetStatus(), WIN_STATUS_IMAGE) || !window->winGetEnabledImage(0))
 		TheDisplay->drawFillRect(ul.x, ul.y, lr.x -ul.x, lr.y-ul.y, lineColor);
@@ -817,7 +796,7 @@ void drawSkinnyBorder( Int x, Int y, Int width, Int height)
 	// x == place to draw remainder if any
 	if( (x2 - x) >= (BORDER_LINE_SIZE / 2) )
 	{
-		
+
 		//Blit Half piece
 		TheDisplay->drawImage( image1,
 													 x, y, x + halfSize, y + size );
@@ -922,11 +901,11 @@ void drawSkinnyBorder( Int x, Int y, Int width, Int height)
 
 void W3DCommandBarHelpPopupDraw( GameWindow *window, WinInstanceData *instData )
 {
-	
+
 	static const Image *endBar = TheMappedImageCollection->findImageByName("Helpbox-top");
 	static const Image *beginBar = TheMappedImageCollection->findImageByName("Helpbox-bottom");
 	static const Image *centerBar = TheMappedImageCollection->findImageByName("Helpbox-middle");
-	
+
 	ICoord2D pos, size;
 	window->winGetScreenPosition( &pos.x, &pos.y );
 	window->winGetSize( &size.x, &size.y );
@@ -935,7 +914,7 @@ void W3DCommandBarHelpPopupDraw( GameWindow *window, WinInstanceData *instData )
 
 	if( !endBar || !beginBar || !centerBar)
 		return;
-	
+
 
 //	Int range;
 //	range = size.y;
@@ -960,7 +939,7 @@ void W3DCommandBarHelpPopupDraw( GameWindow *window, WinInstanceData *instData )
 
 	// get width we have to draw our repeating center in
 	centerWidth = size.y - topSize.y - bottomSize.y;
-	
+
 	if( centerWidth <= 0)
 	{
 		// draw left end
@@ -979,7 +958,7 @@ void W3DCommandBarHelpPopupDraw( GameWindow *window, WinInstanceData *instData )
 	}
 	else
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerBar->getImageHeight();
 
@@ -991,12 +970,12 @@ void W3DCommandBarHelpPopupDraw( GameWindow *window, WinInstanceData *instData )
 		{
 
 			end.y = start.y + centerBar->getImageHeight();
-			TheWindowManager->winDrawImage( centerBar, 
+			TheWindowManager->winDrawImage( centerBar,
 																			start.x, start.y,
 																			end.x, end.y );
 			start.y += centerBar->getImageHeight();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -1029,6 +1008,6 @@ void W3DCommandBarHelpPopupDraw( GameWindow *window, WinInstanceData *instData )
 		end.y = pos.y + topSize.y;
 		TheWindowManager->winDrawImage(endBar, start.x, start.y, end.x, end.y);
 	}
-	
+
 
 }
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
index d9f4b8a4aab..5e194c35a32 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DMOTD.cpp //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,7 +45,6 @@
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/NameKeyGenerator.h"
@@ -83,19 +82,19 @@ static NameKeyType closeButtonID = NAMEKEY_INVALID;
 WindowMsgHandledType MOTDSystem( GameWindow *window, UnsignedInt msg,
 								 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
-			
+
 			// load id's needed
 			closeButtonID = TheNameKeyGenerator->nameToKey( "MOTD.wnd:CloseMOTD" );
 
 			break;
 
-		}  // end create
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -103,7 +102,7 @@ WindowMsgHandledType MOTDSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// ------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -111,19 +110,19 @@ WindowMsgHandledType MOTDSystem( GameWindow *window, UnsignedInt msg,
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
 
-			if( controlID == closeButtonID )					
+			if( controlID == closeButtonID )
 				window->winHide( !window->winIsHidden() );
 
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
-	
-}  // end MOTDSystem
+
+}
 
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp
index 53c51bd20af..6579e5d5955 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DMainMenu.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Apr 2002
@@ -37,7 +37,7 @@
 //	Filename: 	W3DMainMenu.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The Draw Routine for the main menu
 //
 //-----------------------------------------------------------------------------
@@ -92,7 +92,7 @@ static void advancePosition(GameWindow *window, const Image *image, UnsignedInt
 		return;
 
 	static Bool goingForward = TRUE;
-	
+
 	ICoord2D pos, size;
 	if(!window)
 	{
@@ -107,14 +107,14 @@ static void advancePosition(GameWindow *window, const Image *image, UnsignedInt
 		window->winGetSize(&size.x,&size.y);
 	}
 	static Int Width = size.x + image->getImageWidth();
-	
-	static Int x = -800;
+
+	static Int x = -DEFAULT_DISPLAY_WIDTH;
 	static Int y = pos.y - (image->getImageHeight()/2);
 
 	static UnsignedInt m_startTime = timeGetTime();
 	Int time = timeGetTime() - m_startTime;
 	Real percentDone = INT_TO_REAL(time) / 10000;
-	
+
 	if(goingForward)
 	{
 		if(percentDone >= 1)
@@ -158,33 +158,33 @@ void W3DMainMenuDraw( GameWindow *window, WinInstanceData *instData )
 	//W3DGameWinDefaultDraw( window, instData );
 
 	//R:83 G:78 B:52
-	
+
 	static UnsignedInt color = BrownishColor;
 	static UnsignedInt colorDrop = GameMakeColor(38,30,21,255);
 	ICoord2D pos, size;
-	Int height = TheDisplay->getHeight();	
+	Int height = TheDisplay->getHeight();
 
 	window->winGetScreenPosition(&pos.x, &pos.y);
 	window->winGetSize(&size.x,&size.y);
 
-	
+
 
 	IRegion2D	topHorizontal1 ={pos.x, pos.y, pos.x + size.x, pos.y	};
 	IRegion2D	topHorizontal1drop ={pos.x, pos.y+1, pos.x + size.x, pos.y+1	};
 
-	IRegion2D	topHorizontal2 ={pos.x, pos.y + (size.y * .1) , pos.x + size.x, pos.y + (size.y * .1)	};
-	IRegion2D	topHorizontal2drop ={pos.x, pos.y + (size.y * .12) , pos.x + size.x, pos.y + (size.y * .12)	};
+	IRegion2D	topHorizontal2 ={pos.x, pos.y + Int(size.y * .1) , pos.x + size.x, pos.y + Int(size.y * .1)	};
+	IRegion2D	topHorizontal2drop ={pos.x, pos.y + Int(size.y * .12) , pos.x + size.x, pos.y + Int(size.y * .12)	};
 
-	IRegion2D	bottomHorizontal1={pos.x, pos.y + (size.y * .9), pos.x + size.x, pos.y + (size.y * .9)	};
-	IRegion2D	bottomHorizontal1drop={pos.x, pos.y + (size.y * .92), pos.x + size.x, pos.y + (size.y * .92)	};
+	IRegion2D	bottomHorizontal1={pos.x, pos.y + Int(size.y * .9), pos.x + size.x, pos.y + Int(size.y * .9)	};
+	IRegion2D	bottomHorizontal1drop={pos.x, pos.y + Int(size.y * .92), pos.x + size.x, pos.y + Int(size.y * .92)	};
 
 	IRegion2D	bottomHorizontal2= {pos.x, pos.y + size.y, pos.x + size.x, pos.y + size.y 	};
 	IRegion2D	bottomHorizontal2drop= {pos.x, pos.y + size.y + 1, pos.x + size.x, pos.y + size.y + 1	};
 
-	IRegion2D	verticle1 ={pos.x + (size.x * .225), pos.y , pos.x + (size.x * .225), height 	};
-	IRegion2D	verticle2 ={pos.x + (size.x * .445), pos.y, pos.x + (size.x * .445), height 	};
-	IRegion2D	verticle3 ={pos.x + (size.x * .6662), pos.y, pos.x + (size.x * .6662), height 	};
-	IRegion2D	verticle4 ={pos.x + (size.x * .885), pos.y , pos.x + (size.x * .885), height 	};
+	IRegion2D	verticle1 ={pos.x + Int(size.x * .225), pos.y , pos.x + Int(size.x * .225), height 	};
+	IRegion2D	verticle2 ={pos.x + Int(size.x * .445), pos.y, pos.x + Int(size.x * .445), height 	};
+	IRegion2D	verticle3 ={pos.x + Int(size.x * .6662), pos.y, pos.x + Int(size.x * .6662), height 	};
+	IRegion2D	verticle4 ={pos.x + Int(size.x * .885), pos.y , pos.x + Int(size.x * .885), height 	};
 //	static IRegion2D	verticle5 ={pos.x + (size.x * .7250), pos.y + (size.y * .12), pos.x + (size.x * .7250), pos.y + (size.y * .86) 	};
 //	static IRegion2D	verticle6 ={pos.x + (size.x * .9062), pos.y + (size.y * .12), pos.x + (size.x * .9062), pos.y + (size.y * .86) 	};
 
@@ -210,7 +210,7 @@ void W3DMainMenuDraw( GameWindow *window, WinInstanceData *instData )
 
 
 
-	
+
 	advancePosition(NULL, TheMappedImageCollection->findImageByName("MainMenuPulse"),pos.x,pos.y,size.x, size.y);
 
 	//TheDisplay->drawLine();
@@ -222,33 +222,33 @@ void W3DMainMenuFourDraw( GameWindow *window, WinInstanceData *instData )
 	//W3DGameWinDefaultDraw( window, instData );
 
 	//R:83 G:78 B:52
-	
+
 	static UnsignedInt color = BrownishColor;
 	static UnsignedInt colorDrop = GameMakeColor(38,30,21,255);
 	ICoord2D pos, size;
-	Int height = TheDisplay->getHeight();	
+	Int height = TheDisplay->getHeight();
 
 	window->winGetScreenPosition(&pos.x, &pos.y);
 	window->winGetSize(&size.x,&size.y);
 
-	
+
 
 	IRegion2D	topHorizontal1 ={pos.x, pos.y, pos.x + size.x, pos.y	};
 	IRegion2D	topHorizontal1drop ={pos.x, pos.y+1, pos.x + size.x, pos.y+1	};
 
-	IRegion2D	topHorizontal2 ={pos.x, pos.y + (size.y * .1) , pos.x + size.x, pos.y + (size.y * .1)	};
-	IRegion2D	topHorizontal2drop ={pos.x, pos.y + (size.y * .12) , pos.x + size.x, pos.y + (size.y * .12)	};
+	IRegion2D	topHorizontal2 ={pos.x, pos.y + Int(size.y * .1) , pos.x + size.x, pos.y + Int(size.y * .1)	};
+	IRegion2D	topHorizontal2drop ={pos.x, pos.y + Int(size.y * .12) , pos.x + size.x, pos.y + Int(size.y * .12)	};
 
-	IRegion2D	bottomHorizontal1={pos.x, pos.y + (size.y * .9), pos.x + size.x, pos.y + (size.y * .9)	};
-	IRegion2D	bottomHorizontal1drop={pos.x, pos.y + (size.y * .92), pos.x + size.x, pos.y + (size.y * .92)	};
+	IRegion2D	bottomHorizontal1={pos.x, pos.y + Int(size.y * .9), pos.x + size.x, pos.y + Int(size.y * .9)	};
+	IRegion2D	bottomHorizontal1drop={pos.x, pos.y + Int(size.y * .92), pos.x + size.x, pos.y + Int(size.y * .92)	};
 
 	IRegion2D	bottomHorizontal2= {pos.x, pos.y + size.y, pos.x + size.x, pos.y + size.y 	};
 	IRegion2D	bottomHorizontal2drop= {pos.x, pos.y + size.y + 1, pos.x + size.x, pos.y + size.y + 1	};
 
-	IRegion2D	verticle1 ={pos.x + (size.x * .295), pos.y , pos.x + (size.x * .295), height 	};
-	IRegion2D	verticle2 ={pos.x + (size.x * .59), pos.y, pos.x + (size.x * .59), height 	};
+	IRegion2D	verticle1 ={pos.x + Int(size.x * .295), pos.y , pos.x + Int(size.x * .295), height 	};
+	IRegion2D	verticle2 ={pos.x + Int(size.x * .59), pos.y, pos.x + Int(size.x * .59), height 	};
 	//IRegion2D	verticle3 ={pos.x + (size.x * .6662), pos.y, pos.x + (size.x * .6662), height 	};
-	IRegion2D	verticle4 ={pos.x + (size.x * .885), pos.y , pos.x + (size.x * .885), height 	};
+	IRegion2D	verticle4 ={pos.x + Int(size.x * .885), pos.y , pos.x + Int(size.x * .885), height 	};
 //	static IRegion2D	verticle5 ={pos.x + (size.x * .7250), pos.y + (size.y * .12), pos.x + (size.x * .7250), pos.y + (size.y * .86) 	};
 //	static IRegion2D	verticle6 ={pos.x + (size.x * .9062), pos.y + (size.y * .12), pos.x + (size.x * .9062), pos.y + (size.y * .86) 	};
 
@@ -274,7 +274,7 @@ void W3DMainMenuFourDraw( GameWindow *window, WinInstanceData *instData )
 
 
 
-	
+
 	advancePosition(NULL, TheMappedImageCollection->findImageByName("MainMenuPulse"),pos.x,pos.y,size.x, size.y);
 
 	//TheDisplay->drawLine();
@@ -294,32 +294,32 @@ void W3DMetalBarMenuDraw( GameWindow *window, WinInstanceData *instData )
 //	TheDisplay->enableClipping(FALSE);
 }
 
-	
+
 	//W3DGameWinDefaultDraw( window, instData );
 //
 //	//R:83 G:78 B:52
-//	
-//	
+//
+//
 ////	UnsignedInt color = GameMakeColor(113,108,82,212);
 //	ICoord2D pos, size;
-//	
+//
 //	window->winGetScreenPosition(&pos.x, &pos.y);
 //	window->winGetSize(&size.x,&size.y);
 //
 //	const Image *image = TheMappedImageCollection->findImageByName("LogoGlow");
-//	
+//
 //	if(!image)
 //		return;
 //
 //	Int Width = size.x + image->getImageWidth();
-//	
+//
 //	static Int x = pos.x - image->getImageWidth();
 //	static Int y = pos.y - (image->getImageHeight()/2);
 //
 //	static UnsignedInt m_startTime = timeGetTime();
 //	Int time = timeGetTime() - m_startTime;
 //	Real percentDone = INT_TO_REAL(time) / 15624;
-//	
+//
 //	if(percentDone >= 1)
 //	{
 ////			y = pos.y + size.y - (image->getImageHeight()/2) - 2;
@@ -341,7 +341,7 @@ void W3DMetalBarMenuDraw( GameWindow *window, WinInstanceData *instData )
 //		alpha = ((1-percentDone) * 2) * 255;
 //	else
 //		alpha = ( percentDone * 2) * 255;
-//		
+//
 //	TheDisplay->drawImage(image,x, y , x + image->getImageWidth(), y + image->getImageHeight(), GameMakeColor(255,255,255,alpha));
 //	//TheDisplay->drawImage(image,x, y , x + image->getImageWidth(), y + image->getImageHeight(), GameMakeColor(255,200,250,alpha));
 //	TheDisplay->enableClipping(FALSE );
@@ -353,7 +353,7 @@ void W3DClockDraw( GameWindow *window, WinInstanceData *instData )
 {
 	W3DGameWinDefaultDraw( window, instData );
 	ICoord2D pos, size;
-	
+
 	window->winGetScreenPosition(&pos.x, &pos.y);
 	window->winGetSize(&size.x,&size.y);
 
@@ -366,21 +366,21 @@ void W3DClockDraw( GameWindow *window, WinInstanceData *instData )
 	UnicodeString temp;
 	temp.translate(datestr);
 	instData->setText(temp);
-	
+
 	DisplayString *dString;
 	dString = instData->getTextDisplayString();
-	
-	
+
+
 	dString->setFont(TheFontLibrary->getFont("Arial",16,0));
-	
+
 	Int textWidth, textHeight;
 	ICoord2D  textPos;
 	IRegion2D clockClipRegion;
 	// sanity
-		
+
 	// how much space will this text take up
 	dString->getSize( &textWidth, &textHeight );
-		
+
 	//Init the clip region
 	clockClipRegion.lo.x = pos.x + 1;
 	clockClipRegion.lo.y = pos.y + 1;
@@ -404,7 +404,7 @@ void W3DMainMenuMapBorder( GameWindow *window, WinInstanceData *instData )
 		BORDER_LINE_SIZE		= 20,
 	};
 	//( Int x, Int y, Int width, Int height )
-	
+
 // save original x, y
 	Int x, y, width, height;
 	window->winGetScreenPosition(&x, &y);
@@ -418,7 +418,7 @@ void W3DMainMenuMapBorder( GameWindow *window, WinInstanceData *instData )
 	Int x2, y2;			// used for simultaneous drawing of line pairs
 	Int size = 20;
 	Int halfSize = size / 2;
-	
+
 	const Image *image = NULL;
 
 	// Draw Horizontal Lines
@@ -430,24 +430,24 @@ void W3DMainMenuMapBorder( GameWindow *window, WinInstanceData *instData )
 	image = TheMappedImageCollection->findImageByName("FrameCornerHorizontal");
 	if(image)
 	{
-		
+
 		for( x=(originalX + 10); x <= x2; x += BORDER_LINE_SIZE )
 		{
-			
+
 			TheDisplay->drawImage( image,
 														 x, y, x + size, y + size );
 			TheDisplay->drawImage( image,
 														 x, y2, x + size, y2 + size );
 
 		}
-	
+
 
 		x2 = maxX - BORDER_CORNER_SIZE;
 
 		// x == place to draw remainder if any
 		if( (x2 - x) >= (BORDER_LINE_SIZE / 2) )
 		{
-			
+
 			//Blit Half piece
 			TheDisplay->drawImage( image,
 														 x, y, x + halfSize, y + size );
@@ -457,7 +457,7 @@ void W3DMainMenuMapBorder( GameWindow *window, WinInstanceData *instData )
 			x += (BORDER_LINE_SIZE / 2);
 
 		}
-	
+
 
 		// x2 - x ... must now be less than a half piece
 		// check for equals and if not blit an adjusted half piece border pieces have
@@ -545,7 +545,7 @@ void W3DMainMenuMapBorder( GameWindow *window, WinInstanceData *instData )
 	y = maxY - BORDER_CORNER_SIZE;
 	TheDisplay->drawImage(TheMappedImageCollection->findImageByName("FrameCornerLR"),
 												 x, y, x + size, y + size );
- 
+
 	TheDisplay->enableClipping(FALSE);
 
 }
@@ -555,7 +555,7 @@ void W3DMainMenuMapBorder( GameWindow *window, WinInstanceData *instData )
 // W3DMainMenuButtonDropShadowDraw ===============================================
 /** Draw pushbutton with user supplied images */
 //=============================================================================
-void W3DMainMenuButtonDropShadowDraw( GameWindow *window, 
+void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 																	 WinInstanceData *instData )
 {
 	const Image *leftImage, *rightImage, *centerImage;
@@ -594,7 +594,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 
 		}
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -613,7 +613,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 
 		}
 
-	}  // end else if, hilited and enabled
+	}
 	else
 	{
 
@@ -632,10 +632,10 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 
 		}
 
-	}  // end else, enabled only
+	}
 
 	// sanity, we need to have these images to make it look right
-	if( leftImage == NULL || rightImage == NULL || 
+	if( leftImage == NULL || rightImage == NULL ||
 			centerImage == NULL )
 		return;
 
@@ -658,7 +658,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 
 	// get width we have to draw our repeating center in
 	centerWidth = rightStart.x - leftEnd.x;
-	
+
 	if( centerWidth <= 0)
 	{
 //		TheDisplay->setClipRegion(&clipRegion);
@@ -678,7 +678,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 	}
 	else
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerImage->getImageWidth();
 
@@ -691,12 +691,12 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 		{
 
 			end.x = start.x + centerImage->getImageWidth();
-			TheWindowManager->winDrawImage( centerImage, 
+			TheWindowManager->winDrawImage( centerImage,
 																			start.x, start.y,
 																			end.x, end.y );
 			start.x += centerImage->getImageWidth();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -728,7 +728,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 		end.y = start.y + size.y;
 		TheWindowManager->winDrawImage(rightImage, start.x, start.y, end.x, end.y);
 	}
-	
+
 	// draw the button text
 	if( instData->getTextLength() )
 		drawText( window, instData );
@@ -764,7 +764,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 			pData->drawClock = NO_CLOCK;
 			window->winSetUserData(pData);
 		}
-	
+
 		if( pData->drawBorder && pData->colorBorder != GAME_COLOR_UNDEFINED )
 		{
 			TheDisplay->drawOpenRect(start.x - 1, start.y - 1, size.x + 2, size.y + 2, 1, pData->colorBorder);
@@ -772,7 +772,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 	}
 
 //	TheDisplay->enableClipping(FALSE);
-}  // end W3DGadgetPushButtonImageDraw
+}
 
 
 // drawButtonText =============================================================
@@ -801,17 +801,17 @@ static void drawText( GameWindow *window, WinInstanceData *instData )
 	{
 		textColor = window->winGetDisabledTextColor();
 		dropColor = window->winGetDisabledTextBorderColor();
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		textColor = window->winGetHiliteTextColor();
 		dropColor = window->winGetHiliteTextBorderColor();
-	}  // end else if, hilited
+	}
 	else
 	{
 		textColor = window->winGetEnabledTextColor();
 		dropColor = window->winGetEnabledTextBorderColor();
-	}  // end enabled only
+	}
 
 	// set our font to that of our parent if not the same
 	if( text->getFont() != window->winGetFont() )
@@ -827,7 +827,7 @@ static void drawText( GameWindow *window, WinInstanceData *instData )
 	// draw it
 	text->draw( textPos.x, textPos.y, textColor, dropColor );
 
-}  // end drawButtonText
+}
 
 // W3DMainMenuRandomTextDraw ==================================================
 /** Specialized drawing function for the random text */
@@ -848,29 +848,29 @@ void W3DMainMenuRandomTextDraw( GameWindow *window, WinInstanceData *instData )
 
   if( !(tData->text && (textColor != WIN_COLOR_UNDEFINED)) )
 		return;
-	
+
 	DisplayString *text = tData->text;
 	//Init the clip region
 	textclipRegion.lo.x = origin.x + 1;
 	textclipRegion.lo.y = origin.y + 1;
 	textclipRegion.hi.x = origin.x + size.x - 1;
 	textclipRegion.hi.y = origin.y + size.y - 1;
-	
+
 	// how much space will this text take up
 	text->getSize( &textWidth, &textHeight );
-	
+
 	// draw the text
 	textPos.x = origin.x;
 	textPos.y = origin.y + (size.y / 2) - (textHeight / 2);
 	text->setClipRegion(&textclipRegion);
 	text->draw( textPos.x, textPos.y, textColor, textOutlineColor );
-  
+
 }
 void W3DThinBorderDraw( GameWindow *window, WinInstanceData *instData )
 {
 	ICoord2D start, size;
 	const Image *image;
-	
+
 	//W3DGameWinDefaultDraw( window, instData );
 //	TheDisplay->setClipRegion(&clipRegion);
 	window->winGetScreenPosition( &start.x, &start.y );
@@ -887,7 +887,7 @@ void W3DThinBorderDraw( GameWindow *window, WinInstanceData *instData )
 		end.y = begin.y + size.y;
 		TheWindowManager->winDrawImage( image, begin.x, begin.y, end.x, end.y );
 
-	}  // end if
+	}
 	// get window position
 
 //	TheDisplay->drawOpenRect(start.x - 1, start.y - 1, size.x + 2, size.y + 2, 1, BrownishColor);
@@ -916,10 +916,10 @@ void W3DMainMenuInit( WindowLayout *layout, void *userData )
 	NameKeyType buttonUSAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSA" );
 	NameKeyType buttonGLAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLA" );
 	NameKeyType buttonChinaID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChina" );
-	NameKeyType skirmishID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSkirmish") );
-	NameKeyType onlineID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonOnline") );
-	NameKeyType networkID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonNetwork") );
-	
+	NameKeyType skirmishID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSkirmish" );
+	NameKeyType onlineID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonOnline" );
+	NameKeyType networkID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonNetwork" );
+
 	GameWindow *button = TheWindowManager->winGetWindowFromId( parent, skirmishID );
 	if (button)
 		button->winSetDrawFunc(W3DMainMenuButtonDropShadowDraw);
@@ -933,7 +933,7 @@ void W3DMainMenuInit( WindowLayout *layout, void *userData )
 //GameWindow *getUpdate = TheWindowManager->winGetWindowFromId( parent, getUpdateID );
 		//	if (getUpdate)
 		//		getUpdate->winSetDrawFunc(W3DMainMenuButtonDropShadowDraw);
-		
+
 	GameWindow *buttonUSA = TheWindowManager->winGetWindowFromId( parent, buttonUSAID );
 	if (buttonUSA)
 		buttonUSA->winSetDrawFunc(W3DMainMenuButtonDropShadowDraw);
@@ -984,7 +984,7 @@ void W3DMainMenuInit( WindowLayout *layout, void *userData )
 	if(win)
 		win->winSetDrawFunc(W3DMainMenuButtonDropShadowDraw);
 
-	GameWindow *clipRegionWin = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder") ));
+	GameWindow *clipRegionWin = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder" ));
 	Int x,y,width,height;
 	clipRegionWin->winGetScreenPosition(&x, &y);
 	clipRegionWin->winGetSize(&width, &height);
@@ -999,4 +999,4 @@ void W3DMainMenuInit( WindowLayout *layout, void *userData )
 void W3DCreditsMenuDraw( GameWindow *window, WinInstanceData *instData )
 {
 	TheCredits->draw();
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp
index 1b152e1962f..f321f803e6c 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DCheckBox.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -86,17 +86,17 @@ static void drawCheckBoxText( GameWindow *window, WinInstanceData *instData )
 	{
 		textColor = window->winGetDisabledTextColor();
 		dropColor = window->winGetDisabledTextBorderColor();
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		textColor = window->winGetHiliteTextColor();
 		dropColor = window->winGetHiliteTextBorderColor();
-	}  // end else if, hilited
+	}
 	else
 	{
 		textColor = window->winGetEnabledTextColor();
 		dropColor = window->winGetEnabledTextBorderColor();
-	}  // end enabled only
+	}
 
 	// set our font to that of our parent if not the same
 	if( text->getFont() != window->winGetFont() )
@@ -112,7 +112,7 @@ static void drawCheckBoxText( GameWindow *window, WinInstanceData *instData )
 	// draw it
 	text->draw( textPos.x, textPos.y, textColor, dropColor );
 
-}  // end drawCheckBoxText
+}
 
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
 
@@ -162,11 +162,11 @@ void W3DGadgetCheckBoxDraw( GameWindow *window, WinInstanceData *instData )
 				boxBorder		= GadgetCheckBoxGetDisabledUncheckedBoxBorderColor( window );
 		}
 
-	}  // end if
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
-		// hilited background 
+		// hilited background
 		backColor			= GadgetCheckBoxGetHiliteColor( window );
 		backBorder		= GadgetCheckBoxGetHiliteBorderColor( window );
 
@@ -182,11 +182,11 @@ void W3DGadgetCheckBoxDraw( GameWindow *window, WinInstanceData *instData )
 			boxBorder		= GadgetCheckBoxGetHiliteUncheckedBoxBorderColor( window );
 		}
 
-	}  // end else if
+	}
 	else
 	{
 
-		// enabled background 
+		// enabled background
 		backColor			= GadgetCheckBoxGetEnabledColor( window );
 		backBorder		= GadgetCheckBoxGetEnabledBorderColor( window );
 
@@ -202,14 +202,14 @@ void W3DGadgetCheckBoxDraw( GameWindow *window, WinInstanceData *instData )
 			boxBorder		= GadgetCheckBoxGetEnabledUncheckedBoxBorderColor( window );
 		}
 
-	}  // end else
+	}
 
 	// draw background border
 	start.x = origin.x;
 	start.y = origin.y;
 	end.x = start.x + size.x;
 	end.y = start.y + size.y;
-	TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw the background
@@ -217,7 +217,7 @@ void W3DGadgetCheckBoxDraw( GameWindow *window, WinInstanceData *instData )
 	start.y++;
 	end.x--;
 	end.y--;
-	TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw box border
@@ -225,25 +225,25 @@ void W3DGadgetCheckBoxDraw( GameWindow *window, WinInstanceData *instData )
 	start.y = origin.y + (size.y / 3);
 	end.x = start.x + (size.y / 3);
 	end.y = start.y + (size.y / 3);
-	TheWindowManager->winOpenRect( boxBorder, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winOpenRect( boxBorder, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw "x" for button
 	if( boxColor != WIN_COLOR_UNDEFINED )
 	{
 
-		TheWindowManager->winDrawLine( boxColor, WIN_DRAW_LINE_WIDTH, 
+		TheWindowManager->winDrawLine( boxColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
-		TheWindowManager->winDrawLine( boxColor, WIN_DRAW_LINE_WIDTH, 
+		TheWindowManager->winDrawLine( boxColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, end.y, end.x, start.y );
 
-	}  // end if
+	}
 
 	// draw the button text
 	if( instData->getTextLength() )
 		drawCheckBoxText( window, instData );
 
-}  // end W3DGadgetCheckBoxDraw
+}
 
 // W3DGadgetCheckBoxImageDraw =================================================
 /** Draw check box with user supplied images */
@@ -283,11 +283,11 @@ void W3DGadgetCheckBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		else
 				boxImage		= GadgetCheckBoxGetDisabledUncheckedBoxImage( window );
 
-	}  // end if
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
-		// hilited background 
+		// hilited background
 //		backgroundImage	= GadgetCheckBoxGetHiliteImage( window );
 
 		// check box
@@ -296,11 +296,11 @@ void W3DGadgetCheckBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		else
 			boxImage		= GadgetCheckBoxGetHiliteUncheckedBoxImage( window );
 
-	}  // end else if
+	}
 	else
 	{
 
-		// enabled background 
+		// enabled background
 //		backgroundImage	= GadgetCheckBoxGetEnabledImage( window );
 
 		// check box
@@ -309,11 +309,11 @@ void W3DGadgetCheckBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		else
 			boxImage		= GadgetCheckBoxGetEnabledUncheckedBoxImage( window );
 
-	}  // end else
+	}
 
 	// draw background image
 //	if( backgroundImage )
-//		TheWindowManager->winDrawImage( backgroundImage, start.x, start.y, 
+//		TheWindowManager->winDrawImage( backgroundImage, start.x, start.y,
 //																		end.x, end.y );
 
 	// draw the box image
@@ -324,13 +324,13 @@ void W3DGadgetCheckBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		start.y = origin.y +  3;
 		end.x = start.x + (size.y - 6);
 		end.y = start.y + (size.y - 6);
-		TheWindowManager->winDrawImage( boxImage, start.x, start.y, 
+		TheWindowManager->winDrawImage( boxImage, start.x, start.y,
 																	  end.x, end.y );
 
-	}  // end if
-		
+	}
+
 	// draw the text
 	if( instData->getTextLength() )
 		drawCheckBoxText( window, instData );
 
-}  // end W3DGadgetCheckBoxImageDraw
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp
index 898728d6331..062c966d6b6 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DComboBox.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -102,37 +102,37 @@ void W3DGadgetComboBoxDraw( GameWindow *window, WinInstanceData *instData )
 		border				= GadgetComboBoxGetDisabledBorderColor( window );
 		titleColor		= window->winGetDisabledTextColor();
 		titleBorder		= window->winGetDisabledTextBorderColor();
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		background		= GadgetComboBoxGetHiliteColor( window );
 		border				= GadgetComboBoxGetHiliteBorderColor( window );
 		titleColor		= window->winGetHiliteTextColor();
 		titleBorder		= window->winGetHiliteTextBorderColor();
-	}  // end else if, hilited
+	}
 	else
 	{
 		background		= GadgetComboBoxGetEnabledColor( window );
 		border				= GadgetComboBoxGetEnabledBorderColor( window );
 		titleColor		= window->winGetEnabledTextColor();
 		titleBorder		= window->winGetEnabledTextBorderColor();
-	}  // end else, enabled
+	}
 
 	// Draw the title
 	if( title && title->getTextLength() )
 	{
-	
+
 		// set the font of this text to that of the window if not already
 		if( title->getFont() != window->winGetFont() )
 			title->setFont( window->winGetFont() );
-			
+
 		// draw the text
-		title->draw( x + 1, y, titleColor, titleBorder );		
+		title->draw( x + 1, y, titleColor, titleBorder );
 
 		y += fontHeight + 1;
 		height -= fontHeight + 1;
 
-	}  // end if
+	}
 
 	// draw the back border
 	if( border != WIN_COLOR_UNDEFINED )
@@ -142,10 +142,10 @@ void W3DGadgetComboBoxDraw( GameWindow *window, WinInstanceData *instData )
 	// draw background
 	if( background != WIN_COLOR_UNDEFINED )
 		TheWindowManager->winFillRect( background, WIN_DRAW_LINE_WIDTH,
-																	 x + 1, y + 1, 
+																	 x + 1, y + 1,
 																	 x + width - 1, y + height - 1 );
 
-}  // end W3DGadgetComboBoxDraw
+}
 
 // W3DGadgetComboBoxImageDraw ==================================================
 /** Draw combo box with user supplied images */
@@ -196,11 +196,11 @@ void W3DGadgetComboBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		start.y = y + instData->m_imageOffset.y;
 		end.x = start.x + width;
 		end.y = start.y + height;
-		TheWindowManager->winDrawImage( image, 
-																		start.x, start.y, 
+		TheWindowManager->winDrawImage( image,
+																		start.x, start.y,
 																		end.x, end.y );
 
-	}  // end if
+	}
 
 	// Draw the title
 	if( title && title->getTextLength() )
@@ -216,8 +216,8 @@ void W3DGadgetComboBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		y += TheWindowManager->winFontHeight( instData->getFont() );
 		height -= TheWindowManager->winFontHeight( instData->getFont() ) + 1;
 
-	}  // end if
+	}
 
 
-}  // end W3DGadgetComboBoxImageDraw
+}
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp
index 48314c84c6a..b58f44730bb 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp
@@ -24,21 +24,21 @@
 
 // FILE: .cpp /////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
-// Project:   
+// Project:
 //
 // File name: .cpp
 //
-// Created:   
+// Created:
 //
-// Desc:      
+// Desc:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -68,11 +68,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // W3DGadgetHorizontalSliderDraw ==============================================
 /** Draw colored horizontal slider using standard graphics */
@@ -93,21 +88,21 @@ void W3DGadgetHorizontalSliderDraw( GameWindow *window, WinInstanceData *instDat
 		backBorder		= GadgetSliderGetDisabledBorderColor( window );
 		backColor			= GadgetSliderGetDisabledColor( window );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
 		backBorder		= GadgetSliderGetHiliteBorderColor( window );
 		backColor			= GadgetSliderGetHiliteColor( window );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
 		backBorder		= GadgetSliderGetEnabledBorderColor( window );
 		backColor			= GadgetSliderGetEnabledColor( window );
 
-	}  // end else, enabled
+	}
 
 	// draw background border and rect over whole control
 	if( backBorder != WIN_COLOR_UNDEFINED )
@@ -120,7 +115,7 @@ void W3DGadgetHorizontalSliderDraw( GameWindow *window, WinInstanceData *instDat
 		TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 	if( backColor != WIN_COLOR_UNDEFINED )
 	{
 
@@ -131,15 +126,15 @@ void W3DGadgetHorizontalSliderDraw( GameWindow *window, WinInstanceData *instDat
 		TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 
-}  // end W3DGadgetHorizontalSliderDraw
+}
 
 // W3DGadgetHorizontalSliderImageDraw =========================================
 /** Draw horizontal slider with user supplied images */
 //=============================================================================
-void W3DGadgetHorizontalSliderImageDraw( GameWindow *window, 
+void W3DGadgetHorizontalSliderImageDraw( GameWindow *window,
 																				 WinInstanceData *instData )
 {
 	const Image *fillSquare, *blankSquare, *highlightSquare;
@@ -154,8 +149,8 @@ void W3DGadgetHorizontalSliderImageDraw( GameWindow *window,
 	fillSquare = GadgetSliderGetDisabledImageLeft( window );
 
 	SliderData *s = (SliderData *)window->winGetUserData();
-	
-	Real xMulti = INT_TO_REAL(TheDisplay->getWidth()) / 800;
+
+	Real xMulti = INT_TO_REAL(TheDisplay->getWidth()) / DEFAULT_DISPLAY_WIDTH;
 
 	// figure out how many boxes we draw for this slider
 	Int numBoxes = 0;
@@ -192,7 +187,7 @@ void W3DGadgetHorizontalSliderImageDraw( GameWindow *window,
 		{
 			backgroundStart.x = origin.x + highlightOffset.x + i*(boxWidth+boxPadding);
 			backgroundEnd.x = backgroundStart.x + boxWidth + boxPadding;
-			TheWindowManager->winDrawImage( highlightSquare, 
+			TheWindowManager->winDrawImage( highlightSquare,
 																		backgroundStart.x, backgroundStart.y,
 																		backgroundEnd.x, backgroundEnd.y );
 		}
@@ -204,7 +199,7 @@ void W3DGadgetHorizontalSliderImageDraw( GameWindow *window,
 	{
 		start.x = origin.x + i*(boxWidth+boxPadding);
 		end.x = start.x + boxWidth;
-		TheWindowManager->winDrawImage( fillSquare, 
+		TheWindowManager->winDrawImage( fillSquare,
 																	start.x, start.y,
 																	end.x, end.y );
 	}
@@ -212,7 +207,7 @@ void W3DGadgetHorizontalSliderImageDraw( GameWindow *window,
 	{
 		start.x = origin.x + i*(boxWidth+boxPadding);
 		end.x = start.x + boxWidth;
-		TheWindowManager->winDrawImage( blankSquare, 
+		TheWindowManager->winDrawImage( blankSquare,
 																	start.x, start.y,
 																	end.x, end.y );
 	}
@@ -221,7 +216,7 @@ void W3DGadgetHorizontalSliderImageDraw( GameWindow *window,
 // W3DGadgetHorizontalSliderImageDraw =========================================
 /** Draw horizontal slider with user supplied images */
 //=============================================================================
-void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window, 
+void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 																				 WinInstanceData *instData )
 {
 	const Image *fillSquare, *blankSquare, *highlightSquare;//, *progressArrow;
@@ -233,9 +228,9 @@ void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 	window->winGetSize( &size.x, &size.y );
 
 	SliderData *s = (SliderData *)window->winGetUserData();
-	
-	Real xMulti = INT_TO_REAL(TheDisplay->getWidth()) / 800;
-	Real yMulti = INT_TO_REAL(TheDisplay->getHeight())/ 600;
+
+	Real xMulti = INT_TO_REAL(TheDisplay->getWidth()) / DEFAULT_DISPLAY_WIDTH;
+	Real yMulti = INT_TO_REAL(TheDisplay->getHeight()) / DEFAULT_DISPLAY_HEIGHT;
 	// get image offset
 	xOffset = instData->m_imageOffset.x;
 	yOffset = instData->m_imageOffset.y;
@@ -265,12 +260,12 @@ void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 
 		while(backgroundStart.x < origin.x + size.x)
 		{
-			TheWindowManager->winDrawImage( highlightSquare, 
+			TheWindowManager->winDrawImage( highlightSquare,
 																		backgroundStart.x, backgroundStart.y,
 																		backgroundEnd.x, backgroundEnd.y );
 			backgroundStart.x = backgroundEnd.x;
 			backgroundEnd.x = backgroundStart.x + highlightSquare->getImageWidth() * xMulti;
-		}		
+		}
 		tmp.format(L"\n  bsX = %d, beX = %d (%d < %d+%d or %d?)", backgroundStart.x, backgroundEnd.x,
 			backgroundStart.x, origin.x, size.x, origin.x + size.x);
 		tooltip.concat(tmp);
@@ -287,7 +282,7 @@ void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 
 	while(start.x <= origin.x + (s->numTicks * (s->position - s->minVal)) && end.x < origin.x + size.x && s->position != s->minVal)
 	{
-		TheWindowManager->winDrawImage( fillSquare, 
+		TheWindowManager->winDrawImage( fillSquare,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x = end.x + 2;
@@ -300,7 +295,7 @@ void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 
 	while(end.x < origin.x + size.x )
 	{
-		TheWindowManager->winDrawImage( blankSquare, 
+		TheWindowManager->winDrawImage( blankSquare,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x = end.x + 2;
@@ -319,7 +314,7 @@ void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 //		start.y = origin.y + fillSquare->getImageHeight()/3*2;
 //		end.y = start.y + progressArrow->getImageHeight();
 //		end.x	= start.x + progressArrow->getImageWidth();
-//		TheWindowManager->winDrawImage( progressArrow, 
+//		TheWindowManager->winDrawImage( progressArrow,
 //																			start.x, start.y,
 //																			end.x, end.y );
 //	}
@@ -329,7 +324,7 @@ void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 // W3DGadgetHorizontalSliderImageDraw =========================================
 /** Draw horizontal slider with user supplied images */
 //=============================================================================
-void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window, 
+void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 																				 WinInstanceData *instData )
 {
 	const Image *leftImageLeft, *rightImageLeft, *centerImageLeft, *smallCenterImageLeft;
@@ -359,7 +354,7 @@ void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 //		centerImageRight = centerImageLeft				= GadgetSliderGetDisabledImageCenter( window );
 //		smallCenterImageRight = smallCenterImageLeft	= GadgetSliderGetDisabledImageSmallCenter( window );
 
-	}  // end if, disabled
+	}
 	else //if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -373,12 +368,12 @@ void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 		centerImageRight				= GadgetSliderGetEnabledImageCenter( window );
 		smallCenterImageRight	= GadgetSliderGetEnabledImageSmallCenter( window );
 
-	}  // end else, enabled
+	}
 
 	// sanity, we need to have these images to make it look right
-	if( leftImageLeft == NULL || rightImageLeft == NULL || 
+	if( leftImageLeft == NULL || rightImageLeft == NULL ||
 			centerImageLeft == NULL || smallCenterImageLeft == NULL ||
-			leftImageRight == NULL || rightImageRight == NULL || 
+			leftImageRight == NULL || rightImageRight == NULL ||
 			centerImageRight == NULL || smallCenterImageRight == NULL )
 		return;
 
@@ -411,7 +406,7 @@ void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 	start.x = leftEnd.x;
 	start.y = origin.y + size.y - leftSize.y + yOffset;
 	end.y =origin.y + size.y + yOffset;
-	
+
 	clipLeft.lo.x = origin.x;
 	clipLeft.lo.y = rightStart.y;
 	clipLeft.hi.y = leftEnd.y;
@@ -427,17 +422,17 @@ void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 
 		end.x = start.x + centerImageLeft->getImageWidth();
 		TheDisplay->setClipRegion(&clipLeft);
-		TheWindowManager->winDrawImage( centerImageLeft, 
+		TheWindowManager->winDrawImage( centerImageLeft,
 																		start.x, start.y,
 																		end.x, end.y );
 		TheDisplay->setClipRegion(&clipRight);
-		TheWindowManager->winDrawImage( centerImageRight, 
+		TheWindowManager->winDrawImage( centerImageRight,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x += centerImageLeft->getImageWidth();
 
-	}  // end for i
-	
+	}
+
 	//
 	// how many small repeating pieces will fit in the gap from where the
 	// center repeating bar stopped and the right image, draw them
@@ -460,8 +455,8 @@ void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 																		end.x, end.y );
 		start.x += smallCenterImageLeft->getImageWidth();
 
-	}  // end for i
-	
+	}
+
 	// draw left end
 	start.x = origin.x + xOffset;
 	start.y = rightStart.y;
@@ -480,5 +475,5 @@ void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 	TheWindowManager->winDrawImage(rightImageRight, start.x, start.y, end.x, end.y);
 
 	TheDisplay->enableClipping(FALSE);
-}  // end W3DGadgetHorizontalSliderImageDraw
+}
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DListBox.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DListBox.cpp
index 6c2c1501062..de19dceee59 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DListBox.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DListBox.cpp
@@ -25,12 +25,12 @@
 
 // FILE: W3DListBox.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -71,8 +71,8 @@
 // drawHiliteBar ==============================================================
 /** Draw image for the hilite bar */
 //=============================================================================
-static void drawHiliteBar( const Image *left, const Image *right, 
-													 const Image *center, const Image *smallCenter, 
+static void drawHiliteBar( const Image *left, const Image *right,
+													 const Image *center, const Image *smallCenter,
 													 Int startX, Int startY,
 													 Int endX, Int endY )
 {
@@ -127,12 +127,12 @@ static void drawHiliteBar( const Image *left, const Image *right,
 	{
 
 		end.x = start.x + center->getImageWidth();
-		TheWindowManager->winDrawImage( center, 
+		TheWindowManager->winDrawImage( center,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x += center->getImageWidth();
 
-	}  // end for i
+	}
 
 	//
 	// how many small repeating pieces will fit in the gap from where the
@@ -160,9 +160,9 @@ static void drawHiliteBar( const Image *left, const Image *right,
 																			end.x, end.y );
 			start.x += smallCenter->getImageWidth();
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 	TheDisplay->enableClipping(FALSE);
 	// draw left end
 	start.x = startX + xOffset;
@@ -176,7 +176,7 @@ static void drawHiliteBar( const Image *left, const Image *right,
 	end.y = start.y + barWindowSize.y;
 	TheWindowManager->winDrawImage(right, start.x, start.y, end.x, end.y);
 
-}  // end drawHiliteBar
+}
 
 // drawListBoxText ============================================================
 /** Draw the text for a listbox */
@@ -216,7 +216,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 	{
 
 		if( i > 0 )
-			if( list->listData[(i - 1)].listHeight > 
+			if( list->listData[(i - 1)].listHeight >
 					(list->displayPos + list->displayHeight) )
 				break;
 
@@ -257,7 +257,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 		// this item is selected, draw the selection color or image
 		if( selected )
 		{
-			
+
 			if( useImages )
 			{
 				const Image *left, *right, *center, *smallCenter;
@@ -270,7 +270,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 					center			= GadgetListBoxGetDisabledSelectedItemImageCenter( window );
 					smallCenter = GadgetListBoxGetDisabledSelectedItemImageSmallCenter( window );
 
-				}  // end if
+				}
 				else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 				{
 
@@ -278,8 +278,8 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 					right				= GadgetListBoxGetHiliteSelectedItemImageRight( window );
 					center			= GadgetListBoxGetHiliteSelectedItemImageCenter( window );
 					smallCenter = GadgetListBoxGetHiliteSelectedItemImageSmallCenter( window );
-				
-				}  // end else if
+
+				}
 				else
 				{
 
@@ -288,7 +288,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 					center			= GadgetListBoxGetEnabledSelectedItemImageCenter( window );
 					smallCenter = GadgetListBoxGetEnabledSelectedItemImageSmallCenter( window );
 
-				}  // end else
+				}
 
 				// draw select image across area
 
@@ -309,7 +309,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 				if( left && right && center && smallCenter )
 					drawHiliteBar( left, right, center, smallCenter, start.x + 1, start.y, end.x , end.y );
 
-			}  // end if, use images
+			}
 			else
 			{
 				Color selectColor = WIN_COLOR_UNDEFINED,
@@ -319,17 +319,17 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 				{
 					selectColor  = GadgetListBoxGetDisabledSelectedItemColor( window );
 					selectBorder = GadgetListBoxGetDisabledSelectedItemBorderColor( window );
-				}  // end if, disabled
+				}
 				else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 				{
 					selectColor  = GadgetListBoxGetHiliteSelectedItemColor( window );
 					selectBorder = GadgetListBoxGetHiliteSelectedItemBorderColor( window );
-				}  // end else if, hilited
+				}
 				else
 				{
 					selectColor  = GadgetListBoxGetEnabledSelectedItemColor( window );
 					selectBorder = GadgetListBoxGetEnabledSelectedItemBorderColor( window );
-				}  // end else, enabled
+				}
 
 				// draw border
 
@@ -348,7 +348,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 					start.y = clipRegion.lo.y;
 
 				if( selectBorder != WIN_COLOR_UNDEFINED )
-					TheWindowManager->winOpenRect( selectBorder,	
+					TheWindowManager->winOpenRect( selectBorder,
 																				 WIN_DRAW_LINE_WIDTH,
 																				 start.x, start.y,
 																				 end.x, end.y );
@@ -375,13 +375,13 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 																				 start.x, start.y,
 																				 end.x, end.y );
 
-			}  // end else, draw selection with colors
+			}
+
+		}
+
 
-		}  // end if
 
-		
 
-		
 		Color dropColor = TheWindowManager->winMakeColor( 0, 0, 0, 255 );
 		DisplayString *string;
 
@@ -406,7 +406,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 					columnRegion.lo.y = clipRegion.lo.y;
 				if( columnRegion.hi.y > clipRegion.hi.y )
 					columnRegion.hi.y = clipRegion.hi.y;
-				
+
 				// Display the Text Case;
 				if(cells[j].cellType == LISTBOX_TEXT)
 				{
@@ -425,11 +425,11 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 													drawY,
 													textColor,
 													dropColor );
-									
+
 					}
 					else
 					{
-					
+
 						// make sure the font of the text is the same as the windows
 						if( string->getFont() != window->winGetFont() )
 							string->setFont( window->winGetFont() );
@@ -440,8 +440,8 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 													drawY,
 													textColor,
 													dropColor );
-					}//else
-				}// if
+					}
+				}
 				else if(cells[j].cellType == LISTBOX_IMAGE && cells[j].data)
 				{
 					Int width, height;
@@ -468,16 +468,16 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 					offsetY++;
 					if(offsetX <x+1)
 						offsetX = x+1;
-					TheDisplay->setClipRegion( &columnRegion );					
-					TheWindowManager->winDrawImage( (const Image *)cells[j].data, 
+					TheDisplay->setClipRegion( &columnRegion );
+					TheWindowManager->winDrawImage( (const Image *)cells[j].data,
 																offsetX, offsetY,
 																offsetX + width, offsetY + height,cells[j].color );
 
-				}//else
+				}
 				columnX = columnX + list->columnWidth[j];
-			}// for
-		}//if
-		
+			}
+		}
+
 
 		drawY += listLineHeight;
 		TheDisplay->enableClipping(FALSE);
@@ -486,7 +486,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 //	TheWindowManager->winSetClipRegion( clipRegion.lo.x, clipRegion.lo.y,
 //																			clipRegion.hi.x, clipRegion.hi.y );
 
-}  // end drawListBoxText
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -521,37 +521,37 @@ void W3DGadgetListBoxDraw( GameWindow *window, WinInstanceData *instData )
 		border				= GadgetListBoxGetDisabledBorderColor( window );
 		titleColor		= window->winGetDisabledTextColor();
 		titleBorder		= window->winGetDisabledTextBorderColor();
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		background		= GadgetListBoxGetHiliteColor( window );
 		border				= GadgetListBoxGetHiliteBorderColor( window );
 		titleColor		= window->winGetHiliteTextColor();
 		titleBorder		= window->winGetHiliteTextBorderColor();
-	}  // end else if, hilited
+	}
 	else
 	{
 		background		= GadgetListBoxGetEnabledColor( window );
 		border				= GadgetListBoxGetEnabledBorderColor( window );
 		titleColor		= window->winGetEnabledTextColor();
 		titleBorder		= window->winGetEnabledTextBorderColor();
-	}  // end else, enabled
+	}
 
 	// Draw the title
 	if( title && title->getTextLength() )
 	{
-	
+
 		// set the font of this text to that of the window if not already
 		if( title->getFont() != window->winGetFont() )
 			title->setFont( window->winGetFont() );
-			
+
 		// draw the text
-		title->draw( x + 1, y, titleColor, titleBorder );		
+		title->draw( x + 1, y, titleColor, titleBorder );
 
 		y += fontHeight + 1;
 		height -= fontHeight + 1;
 
-	}  // end if
+	}
 
 	// draw the back border
 	if( border != WIN_COLOR_UNDEFINED )
@@ -561,7 +561,7 @@ void W3DGadgetListBoxDraw( GameWindow *window, WinInstanceData *instData )
 	// draw background
 	if( background != WIN_COLOR_UNDEFINED )
 		TheWindowManager->winFillRect( background, WIN_DRAW_LINE_WIDTH,
-																	 x + 1, y + 1, 
+																	 x + 1, y + 1,
 																	 x + width - 1, y + height - 1 );
 
 	// If ScrollBar was requested ... adjust width.
@@ -572,14 +572,14 @@ void W3DGadgetListBoxDraw( GameWindow *window, WinInstanceData *instData )
 		list->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 		width -= (sliderSize.x +3);
 
-	}  // end if
+	}
 
 	// draw the text
 	drawListBoxText( window, instData, x, y + 4 , width, height-4, TRUE );
 
-	
 
-}  // end W3DGadgetListBoxDraw
+
+}
 
 // W3DGadgetListBoxImageDraw ==================================================
 /** Draw list box with user supplied images */
@@ -609,7 +609,7 @@ void W3DGadgetListBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		list->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 		width -= sliderSize.x;
 
-	}  // end if
+	}
 
 	// get the image
 	if( BitIsSet( window->winGetStatus(), WIN_STATUS_ENABLED ) == FALSE )
@@ -640,11 +640,11 @@ void W3DGadgetListBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		start.y = y + instData->m_imageOffset.y;
 		end.x = start.x + width;
 		end.y = start.y + height;
-		TheWindowManager->winDrawImage( image, 
-																		start.x, start.y, 
+		TheWindowManager->winDrawImage( image,
+																		start.x, start.y,
 																		end.x, end.y );
 
-	}  // end if
+	}
 
 	// Draw the title
 	if( title && title->getTextLength() )
@@ -660,12 +660,12 @@ void W3DGadgetListBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		y += TheWindowManager->winFontHeight( instData->getFont() );
 		height -= TheWindowManager->winFontHeight( instData->getFont() ) + 1;
 
-	}  // end if
+	}
 
 	// draw the listbox text
 	drawListBoxText( window, instData, x, y+4, width, height-4, TRUE );
 
-	
 
-}  // end W3DGadgetListBoxImageDraw
+
+}
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp
index 4e9c5bf03fd..e8a97d81054 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DProgressBar.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -89,21 +89,21 @@ void W3DGadgetProgressBarDraw( GameWindow *window, WinInstanceData *instData )
 		backBorder	= GadgetProgressBarGetDisabledBorderColor( window );
 		barColor		= GadgetProgressBarGetDisabledBarColor( window );
 		barBorder		= GadgetProgressBarGetDisabledBarBorderColor( window );
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		backColor		= GadgetProgressBarGetHiliteColor( window );
 		backBorder	= GadgetProgressBarGetHiliteBorderColor( window );
 		barColor		= GadgetProgressBarGetHiliteBarColor( window );
 		barBorder		= GadgetProgressBarGetHiliteBarBorderColor( window );
-	}  // end else if, hilited
+	}
 	else
 	{
 		backColor		= GadgetProgressBarGetEnabledColor( window );
 		backBorder	= GadgetProgressBarGetEnabledBorderColor( window );
 		barColor		= GadgetProgressBarGetEnabledBarColor( window );
 		barBorder		= GadgetProgressBarGetEnabledBarBorderColor( window );
-	}  // end else, enabled
+	}
 
 	// draw background border
 	if( backBorder != WIN_COLOR_UNDEFINED )
@@ -116,7 +116,7 @@ void W3DGadgetProgressBarDraw( GameWindow *window, WinInstanceData *instData )
 		TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw background fill
 	if( backColor != WIN_COLOR_UNDEFINED )
@@ -129,7 +129,7 @@ void W3DGadgetProgressBarDraw( GameWindow *window, WinInstanceData *instData )
 		TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw the progress so far
 	if( progress )
@@ -149,7 +149,7 @@ void W3DGadgetProgressBarDraw( GameWindow *window, WinInstanceData *instData )
 																		 start.x, start.y, end.x, end.y );
 			}
 
-		}  // end if
+		}
 
 		// draw bar fill
 		if( barColor != WIN_COLOR_UNDEFINED )
@@ -161,23 +161,23 @@ void W3DGadgetProgressBarDraw( GameWindow *window, WinInstanceData *instData )
 			end.y = start.y + size.y - 2;
 //			TheWindowManager->winOpenRect( barColor, WIN_DRAW_LINE_WIDTH,
 //																		 start.x, start.y, end.x, end.y );
-			
+
 			if(end.x- start.x > 1  )
 			{
 				TheWindowManager->winFillRect( barColor,WIN_DRAW_LINE_WIDTH,
 																		 start.x, start.y, end.x, end.y );
-			
+
 				TheWindowManager->winDrawLine(GameMakeColor(255,255,255,255),WIN_DRAW_LINE_WIDTH, start.x, start.y, end.x, start.y);
 				TheWindowManager->winDrawLine(GameMakeColor(200,200,200,255),WIN_DRAW_LINE_WIDTH, start.x, start.y, start.x, end.y);
 			}
 
-		}  // end if
+		}
+
+	}
 
-	}  // end if
 
-  
 
-}  // end W3DGadgetProgressBarDraw
+}
 
 // W3DGadgetProgressBarImageDraw ==============================================
 /** Draw Progress Bar with user supplied images */
@@ -214,7 +214,7 @@ void W3DGadgetProgressBarImageDrawA( GameWindow *window, WinInstanceData *instDa
 	Int x = origin.x;
 	for( i = 0; i < pieces; i ++)
 	{
-				
+
 				TheWindowManager->winDrawImage( barCenter,
 																				x, origin.y,
 																				x + width, origin.y + size.y );
@@ -227,7 +227,7 @@ void W3DGadgetProgressBarImageDrawA( GameWindow *window, WinInstanceData *instDa
 void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instData )
 {
 	ICoord2D origin, size, start, end;
-	const Image *backLeft, *backRight, *backCenter, 
+	const Image *backLeft, *backRight, *backCenter,
 				 *barRight, *barCenter;//*backSmallCenter,*barLeft,, *barSmallCenter;
 	Int progress = (Int)window->winGetUserData();
 	Int xOffset, yOffset;
@@ -254,7 +254,7 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 		//backSmallCenter	= GadgetProgressBarGetDisabledImageSmallCenter( window );
 		//barSmallCenter	= GadgetProgressBarGetDisabledBarImageSmallCenter( window );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -267,7 +267,7 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 		//backSmallCenter	= GadgetProgressBarGetHiliteImageSmallCenter( window );
 		//barSmallCenter	= GadgetProgressBarGetHiliteBarImageSmallCenter( window );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
@@ -280,7 +280,7 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 		//backSmallCenter	= GadgetProgressBarGetEnabledImageSmallCenter( window );
 		//barSmallCenter	= GadgetProgressBarGetEnabledBarImageSmallCenter( window );
 
-	}  // end else, enabled
+	}
 
 	// sanity
 	if( backLeft == NULL || backRight == NULL ||
@@ -320,12 +320,12 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 	{
 
 		end.x = start.x + backCenter->getImageWidth();
-		TheWindowManager->winDrawImage( backCenter, 
+		TheWindowManager->winDrawImage( backCenter,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x += backCenter->getImageWidth();
 
-	}  // end for i
+	}
 
 	//
 	// how many small repeating pieces will fit in the gap from where the
@@ -336,7 +336,7 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 //	pieces = centerWidth / backCenter->getImageWidth() + 1;
 //	end.y = start.y + size.y;
 //	IRegion2D clipRegion;
-//	
+//
 //	TheDisplay->setClipRegion()
 //	for( i = 0; i < pieces; i++ )
 //	{
@@ -378,12 +378,12 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 	end.y = start.y + size.y;
 	TheWindowManager->winDrawImage(backRight, start.x, start.y, end.x, end.y);
 
-	
+
 	ICoord2D barWindowSize;  // end point of bar from window origin
 
 	barWindowSize.x = ((size.x - 20) * progress) / 100;
 	barWindowSize.y = size.y;
-		
+
 	pieces = barWindowSize.x / barCenter->getImageWidth();
  	// draw the pieces
 	start.x = origin.x +10;
@@ -393,25 +393,24 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 	{
 
 		end.x = start.x + barCenter->getImageWidth();
-		TheWindowManager->winDrawImage( barCenter, 
+		TheWindowManager->winDrawImage( barCenter,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x += barCenter->getImageWidth();
 
-	}  // end for i
+	}
 	start.x = origin.x + 10 + barCenter->getImageWidth() * pieces;
 	//pieces = (size.x - barWindowSize.x -20) / barRight->getImageWidth();
-	//Changed By Saad for flashing grey piece
 	pieces = ((size.x - 20) / barCenter->getImageWidth()) - pieces;
 	for( i = 0; i < pieces; i++ )
 	{
 
 		end.x = start.x + barRight->getImageWidth();
-		TheWindowManager->winDrawImage( barRight, 
+		TheWindowManager->winDrawImage( barRight,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x += barRight->getImageWidth();
 
-	}  // end for i
+	}
 
-}  // end W3DGadgetProgressBarImageDraw
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp
index 23ae42355b3..fb5f3390dc8 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp
@@ -25,12 +25,12 @@
 
 // FILE: W3DPushButton.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -58,11 +58,6 @@
 #include "W3DDevice/GameClient/W3DGadget.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off) 
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -106,17 +101,17 @@ static void drawButtonText( GameWindow *window, WinInstanceData *instData )
 	{
 		textColor = window->winGetDisabledTextColor();
 		dropColor = window->winGetDisabledTextBorderColor();
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		textColor = window->winGetHiliteTextColor();
 		dropColor = window->winGetHiliteTextBorderColor();
-	}  // end else if, hilited
+	}
 	else
 	{
 		textColor = window->winGetEnabledTextColor();
 		dropColor = window->winGetEnabledTextBorderColor();
-	}  // end enabled only
+	}
 
 	// set our font to that of our parent if not the same
 	if( text->getFont() != window->winGetFont() )
@@ -132,7 +127,7 @@ static void drawButtonText( GameWindow *window, WinInstanceData *instData )
 	// draw it
 	text->draw( textPos.x, textPos.y, textColor, dropColor );
 
-}  // end drawButtonText
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -168,7 +163,7 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 			border		= GadgetButtonGetDisabledBorderColor( window );
 		}
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -183,7 +178,7 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 			border		= GadgetButtonGetHiliteBorderColor( window );
 		}
 
-	}  // end else if, hilited and enabled
+	}
 	else
 	{
 
@@ -198,7 +193,7 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 			border		= GadgetButtonGetEnabledBorderColor( window );
 		}
 
-	}  // end else, enabled only
+	}
 
 	// compute draw position
 	start.x = origin.x;
@@ -213,7 +208,7 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 		TheWindowManager->winOpenRect( border, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	if( color != WIN_COLOR_UNDEFINED )
 	{
@@ -226,7 +221,7 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 		TheWindowManager->winFillRect( color, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw the button text
 	if( instData->getTextLength() )
@@ -237,7 +232,7 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 	{
 		TheDisplay->drawVideoBuffer( instData->m_videoBuffer, origin.x, origin.y, origin.x + size.x, origin.y + size.y );
 	}
-	
+
 	PushButtonData *pData = (PushButtonData *)window->winGetUserData();
 	if( pData )
 	{
@@ -260,14 +255,14 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 			pData->drawClock = NO_CLOCK;
 			window->winSetUserData(pData);
 		}
-		
+
 		if( pData->drawBorder && pData->colorBorder != GAME_COLOR_UNDEFINED )
 		{
 			TheDisplay->drawOpenRect(origin.x -1, origin.y - 1, size.x + 2, size.y + 2,1 , pData->colorBorder);
 		}
 	}
 
-}  // end W3DGadgetPushButtonDraw
+}
 
 
 
@@ -275,12 +270,12 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 // W3DGadgetPushButtonImageDraw ===============================================
 /** Draw pushbutton with user supplied images */
 //=============================================================================
-void W3DGadgetPushButtonImageDraw( GameWindow *window, 
+void W3DGadgetPushButtonImageDraw( GameWindow *window,
 																	 WinInstanceData *instData )
 {
 	// if we return NULL then we'll call the one picture drawing code, if we return a value
 	// then we'll call the 3 picture drawing code
-	if( GadgetButtonGetMiddleEnabledImage( window ) ) 
+	if( GadgetButtonGetMiddleEnabledImage( window ) )
 	{
 		if( BitIsSet( instData->getState(), WIN_STATUS_USE_OVERLAY_STATES ) )
 		{
@@ -306,7 +301,7 @@ void W3DGadgetPushButtonImageDraw( GameWindow *window,
 	}
 }
 
-void W3DGadgetPushButtonImageDrawOne( GameWindow *window, 
+void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 																	 WinInstanceData *instData )
 {
 	const Image *image = NULL;
@@ -330,7 +325,7 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 			else
 				image			= GadgetButtonGetDisabledImage( window );
 
-		}  // end if, disabled
+		}
 		else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 		{
 
@@ -339,13 +334,13 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 			else
 				image			= GadgetButtonGetHiliteImage( window );
 
-		}  // end else if, hilited and enabled
+		}
 		else
 		{
 
 			if( BitIsSet( instData->getState(), WIN_STATE_SELECTED ) )
 				image			= GadgetButtonGetHiliteSelectedImage( window );
-		}  // end else, enabled only
+		}
 	}
 
 
@@ -370,7 +365,7 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 		Int colorMultiplier = 0xffffffff;
 
 		if(BitIsSet( window->winGetStatus(), WIN_STATUS_USE_OVERLAY_STATES ) )
-		{	
+		{
 			//we're using a new drawing system which does "grayscale" disabled buttons using original color artwork.
 			if( !BitIsSet( window->winGetStatus(), WIN_STATUS_ENABLED ) )
 			{
@@ -390,7 +385,7 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 			}
 		}
 		TheDisplay->drawImage( image, start.x, start.y, end.x, end.y, colorMultiplier, drawMode );
-	}  // end if
+	}
 
 	// draw the button text
 	if( instData->getTextLength() )
@@ -415,7 +410,7 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 			//Render the overlay image now.
 			TheDisplay->drawImage( pData->overlayImage, start.x, start.y, start.x + size.x, start.y + size.y );
 		}
-		
+
 		if( pData->drawClock )
 		{
 			if( pData->drawClock == NORMAL_CLOCK )
@@ -429,10 +424,10 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 			pData->drawClock = NO_CLOCK;
 			window->winSetUserData(pData);
 		}
-		
+
 		if( pData->drawBorder && pData->colorBorder != GAME_COLOR_UNDEFINED )
 		{
-			
+
 			TheDisplay->drawOpenRect(start.x - 1, start.y - 1, size.x + 2, size.y + 2, 1, pData->colorBorder);
 
 		}
@@ -446,7 +441,7 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 		static const Image *hilitedOverlayIcon = TheMappedImageCollection->findImageByName( "Cameo_push" );
 		TheDisplay->drawImage( hilitedOverlayIcon, start.x, start.y, start.x + size.x, start.y + size.y );
 	}
-	
+
 	if( BitIsSet( window->winGetStatus(), WIN_STATUS_USE_OVERLAY_STATES ) )
 	{
 		image = NULL;
@@ -477,7 +472,7 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 			}
 		}
 	}
-}  // end W3DGadgetPushButtonImageDraw
+}
 
 
 void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *instData )
@@ -519,7 +514,7 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 
 		}
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -538,7 +533,7 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 
 		}
 
-	}  // end else if, hilited and enabled
+	}
 	else
 	{
 
@@ -557,10 +552,10 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 
 		}
 
-	}  // end else, enabled only
+	}
 
 	// sanity, we need to have these images to make it look right
-	if( leftImage == NULL || rightImage == NULL || 
+	if( leftImage == NULL || rightImage == NULL ||
 			centerImage == NULL )
 		return;
 
@@ -583,7 +578,7 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 
 	// get width we have to draw our repeating center in
 	centerWidth = rightStart.x - leftEnd.x;
-	
+
 	if( centerWidth <= 0)
 	{
 		// draw left end
@@ -602,7 +597,7 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 	}
 	else
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerImage->getImageWidth();
 
@@ -614,12 +609,12 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 		{
 
 			end.x = start.x + centerImage->getImageWidth();
-			TheWindowManager->winDrawImage( centerImage, 
+			TheWindowManager->winDrawImage( centerImage,
 																			start.x, start.y,
 																			end.x, end.y );
 			start.x += centerImage->getImageWidth();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -650,7 +645,7 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 		end.y = start.y + size.y;
 		TheWindowManager->winDrawImage(rightImage, start.x, start.y, end.x, end.y);
 	}
-	
+
 	// draw the button text
 	if( instData->getTextLength() )
 		drawButtonText( window, instData );
@@ -688,7 +683,7 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 			pData->drawClock = NO_CLOCK;
 			window->winSetUserData(pData);
 		}
-		
+
 		if( pData->drawBorder && pData->colorBorder != GAME_COLOR_UNDEFINED )
 		{
 			TheDisplay->drawOpenRect(start.x - 1, start.y - 1, size.x + 2, size.y + 2, 1, pData->colorBorder);
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DRadioButton.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DRadioButton.cpp
index 9f84153696d..e13bf6fa405 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DRadioButton.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DRadioButton.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DRadioButton.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -86,17 +86,17 @@ static void drawRadioButtonText( GameWindow *window, WinInstanceData *instData )
 	{
 		textColor = window->winGetDisabledTextColor();
 		dropColor = window->winGetDisabledTextBorderColor();
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		textColor = window->winGetHiliteTextColor();
 		dropColor = window->winGetHiliteTextBorderColor();
-	}  // end else if, hilited
+	}
 	else
 	{
 		textColor = window->winGetEnabledTextColor();
 		dropColor = window->winGetEnabledTextBorderColor();
-	}  // end enabled only
+	}
 
 	// set our font to that of our parent if not the same
 	if( text->getFont() != window->winGetFont() )
@@ -112,7 +112,7 @@ static void drawRadioButtonText( GameWindow *window, WinInstanceData *instData )
 	// draw it
 	text->draw( textPos.x, textPos.y, textColor, dropColor );
 
-}  // end drawRadioButtonText
+}
 
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
 
@@ -162,11 +162,11 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 				boxBorder		= GadgetRadioGetDisabledUncheckedBoxBorderColor( window );
 		}
 
-	}  // end if
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
-		// hilited background 
+		// hilited background
 		backColor			= GadgetRadioGetHiliteColor( window );
 		backBorder		= GadgetRadioGetHiliteBorderColor( window );
 
@@ -182,11 +182,11 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 			boxBorder		= GadgetRadioGetHiliteUncheckedBoxBorderColor( window );
 		}
 
-	}  // end else if
+	}
 	else
 	{
 
-		// enabled background 
+		// enabled background
 		backColor			= GadgetRadioGetEnabledColor( window );
 		backBorder		= GadgetRadioGetEnabledBorderColor( window );
 
@@ -202,14 +202,14 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 			boxBorder		= GadgetRadioGetEnabledUncheckedBoxBorderColor( window );
 		}
 
-	}  // end else
+	}
 
 	// draw background border
 	start.x = origin.x;
 	start.y = origin.y;
 	end.x = start.x + size.x;
 	end.y = start.y + size.y;
-	TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw the background
@@ -217,17 +217,17 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 	start.y++;
 	end.x--;
 	end.y--;
-	TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 
-	
+
 	// draw box border
 	start.x = origin.x + size.y;
 	start.y = origin.y;
 	end.x = start.x;
 	end.y = start.y + size.y;
-	TheWindowManager->winDrawLine( backBorder, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winDrawLine( backBorder, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw box for button
@@ -235,7 +235,7 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 	start.y = origin.y + 1;
 	end.x	= origin.x + size.y -1;
 	end.y = origin.y + size.y -1;
-	TheWindowManager->winFillRect( boxColor, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winFillRect( boxColor, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw box border
@@ -243,7 +243,7 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 	start.y = origin.y;
 	end.x = start.x;
 	end.y = start.y + size.y;
-	TheWindowManager->winDrawLine( backBorder, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winDrawLine( backBorder, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw box for button
@@ -251,18 +251,18 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 	start.y = origin.y + 1;
 	end.x	= origin.x + size.x -1;
 	end.y = origin.y + size.y -1;
-	TheWindowManager->winFillRect( boxColor, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winFillRect( boxColor, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 	// draw the button text
 	if( instData->getTextLength() )
 		drawRadioButtonText( window, instData );
 
-	
 
-}  // end W3DGadgetRadioButtonDraw
+
+}
 
 
-void W3DGadgetRadioButtonImageDraw( GameWindow *window, 
+void W3DGadgetRadioButtonImageDraw( GameWindow *window,
 																	WinInstanceData *instData )
 {
 	const Image *leftImage, *rightImage, *centerImage;
@@ -286,7 +286,7 @@ void W3DGadgetRadioButtonImageDraw( GameWindow *window,
 		leftImage					= GadgetRadioGetSelectedImage( window );
 		centerImage				= GadgetRadioGetSelectedUncheckedBoxImage( window );
 		rightImage				= GadgetRadioGetSelectedCheckedBoxImage( window );
-		
+
 	}
 	else if( BitIsSet( window->winGetStatus(), WIN_STATUS_ENABLED ) == FALSE )
 	{
@@ -294,27 +294,27 @@ void W3DGadgetRadioButtonImageDraw( GameWindow *window,
 		leftImage					= GadgetRadioGetDisabledImage( window );
 		centerImage				= GadgetRadioGetDisabledUncheckedBoxImage( window );
 		rightImage				= GadgetRadioGetDisabledCheckedBoxImage( window );
-		
-	}  // end if
+
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
-		// hilited background 
+		// hilited background
 		leftImage					= GadgetRadioGetHiliteImage( window );
 		centerImage				= GadgetRadioGetHiliteUncheckedBoxImage( window );
 		rightImage				= GadgetRadioGetHiliteCheckedBoxImage( window );
-		
-	}  // end else if
+
+	}
 	else
 	{
-		// enabled background 
+		// enabled background
 		leftImage					= GadgetRadioGetEnabledImage( window );
 		centerImage				= GadgetRadioGetEnabledUncheckedBoxImage( window );
 		rightImage				= GadgetRadioGetEnabledCheckedBoxImage( window );
-		
-	}  // end else
+
+	}
 
 	// sanity, we need to have these images to make it look right
-	if( leftImage == NULL || centerImage == NULL || 
+	if( leftImage == NULL || centerImage == NULL ||
 			rightImage == NULL )
 		return;
 
@@ -347,7 +347,7 @@ void W3DGadgetRadioButtonImageDraw( GameWindow *window,
 	start.x = leftEnd.x;
 	start.y = origin.y + yOffset;
 	end.y =origin.y + size.y + yOffset;
-	
+
 	clipLeft.lo.x = leftEnd.x;
 	clipLeft.lo.y = origin.y;
 	clipLeft.hi.y = leftEnd.y;
@@ -355,17 +355,17 @@ void W3DGadgetRadioButtonImageDraw( GameWindow *window,
 
 
 	TheDisplay->setClipRegion(&clipLeft);
-	
+
 	for( i = 0; i < pieces; i++ )
 	{
 		end.x = start.x + centerImage->getImageWidth();
-		TheWindowManager->winDrawImage( centerImage, 
+		TheWindowManager->winDrawImage( centerImage,
 																		start.x, start.y,
-																		end.x, end.y );	
+																		end.x, end.y );
 		start.x += centerImage->getImageWidth();
-	}  // end for i
-	
-	TheDisplay->enableClipping(FALSE);	
+	}
+
+	TheDisplay->enableClipping(FALSE);
 	// draw left end
 	start.x = origin.x + xOffset;
 	start.y = origin.y + yOffset;
@@ -382,6 +382,6 @@ void W3DGadgetRadioButtonImageDraw( GameWindow *window,
 	if( instData->getTextLength() )
 		drawRadioButtonText( window, instData );
 
-	
-}  // end W3DGadgetHorizontalSliderImageDraw
+
+}
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp
index 407ac1242b2..84c4e9ff1d8 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DStaticText.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -70,11 +70,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // drawStaticTextText =========================================================
 /** Draw the text for a static text window */
@@ -90,16 +85,16 @@ static void drawStaticTextText( GameWindow *window, WinInstanceData *instData,
 	// sanity
 	if( text == NULL || text->getTextLength() == 0 )
 		return;
-	
+
 	// get window position and size
 	window->winGetScreenPosition( &origin.x, &origin.y );
 	window->winGetSize( &size.x, &size.y );
-	
+
 	// Set the text Wrap width
 	wordWrap = size.x - 10;
 	//if(wordWrap == 89)
 	//	wordWrap = 95;
-	text->setWordWrap(wordWrap);	
+	text->setWordWrap(wordWrap);
 	if( BitIsSet(window->winGetStatus(), WIN_STATUS_WRAP_CENTERED)		)
 		text->setWordWrapCentered(TRUE);
 	else
@@ -112,13 +107,13 @@ static void drawStaticTextText( GameWindow *window, WinInstanceData *instData,
 
 	// how much space will this text take up
 	text->getSize( &textWidth, &textHeight );
-		
+
 	//Init the clip region
 	clipRegion.lo.x = origin.x ;
 	clipRegion.lo.y = origin.y ;
 	clipRegion.hi.x = origin.x + size.x ;
 	clipRegion.hi.y = origin.y + size.y;
-	
+
 	if( tData->centered )
 	{
 
@@ -127,7 +122,7 @@ static void drawStaticTextText( GameWindow *window, WinInstanceData *instData,
 		text->setClipRegion(&clipRegion);
 		text->draw( textPos.x, textPos.y, textColor, textDropColor );
 
-	}  // end if
+	}
 	else
 	{
 
@@ -137,10 +132,10 @@ static void drawStaticTextText( GameWindow *window, WinInstanceData *instData,
 		text->setClipRegion(&clipRegion);
 		text->draw( textPos.x, textPos.y, textColor, textDropColor );
 
-	}  // end else
+	}
 
 
-}  // end drawStaticTextText
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -168,7 +163,7 @@ void W3DGadgetStaticTextDraw( GameWindow *window, WinInstanceData *instData )
 		textColor					= window->winGetDisabledTextColor();
 		textOutlineColor	= window->winGetDisabledTextBorderColor();
 
-	}  // end if, disabled
+	}
 	else
 	{
 
@@ -177,7 +172,7 @@ void W3DGadgetStaticTextDraw( GameWindow *window, WinInstanceData *instData )
 		textColor					= window->winGetEnabledTextColor();
 		textOutlineColor	= window->winGetEnabledTextBorderColor();
 
-	}  // end else, enabled
+	}
 
 	// draw the back border
 	if( backBorder != WIN_COLOR_UNDEFINED )
@@ -187,10 +182,10 @@ void W3DGadgetStaticTextDraw( GameWindow *window, WinInstanceData *instData )
 		start.y = origin.y;
 		end.x = start.x + size.x;
 		end.y = start.y + size.y;
-		TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH, 
+		TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw the back fill area
 	if( backColor != WIN_COLOR_UNDEFINED )
@@ -202,15 +197,15 @@ void W3DGadgetStaticTextDraw( GameWindow *window, WinInstanceData *instData )
 		end.y = start.y + size.y - 2;
 		TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
-	}  // end if
+	}
 
 	// draw the text
   if( tData->text && (textColor != WIN_COLOR_UNDEFINED) )
 		drawStaticTextText( window, instData, textColor, textOutlineColor );
 
-  
 
-}  // end W3DGadgetStaticTextDraw
+
+}
 
 // W3DGadgetStaticTextImageDraw ===============================================
 /** Draw colored text field with user supplied images */
@@ -234,7 +229,7 @@ void W3DGadgetStaticTextImageDraw( GameWindow *window, WinInstanceData *instData
 		textColor					= window->winGetDisabledTextColor();
 		textOutlineColor	= window->winGetDisabledTextBorderColor();
 
-	}  // end if, disabled
+	}
 	else
 	{
 
@@ -242,7 +237,7 @@ void W3DGadgetStaticTextImageDraw( GameWindow *window, WinInstanceData *instData
 		textColor					= window->winGetEnabledTextColor();
 		textOutlineColor	= window->winGetEnabledTextBorderColor();
 
-	}  // end else, enabled
+	}
 
 	// draw the back image
 	if( image )
@@ -254,13 +249,13 @@ void W3DGadgetStaticTextImageDraw( GameWindow *window, WinInstanceData *instData
 		end.y = start.y + size.y;
 		TheWindowManager->winDrawImage( image, start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw the text
   if( tData->text && (textColor != WIN_COLOR_UNDEFINED) )
 		drawStaticTextText( window, instData, textColor, textOutlineColor );
 
-  
 
-}  // end W3DGadgetStaticTextImageDraw
+
+}
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTabControl.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTabControl.cpp
index 6631690eb01..30f356cfa48 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTabControl.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTabControl.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DTabControl.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -115,17 +115,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabZero( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabZero( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 0 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabZero( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabZero( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabZero( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabZero( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -149,17 +149,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabOne( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabOne( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 1 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabOne( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabOne( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabOne( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabOne( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -183,17 +183,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabTwo( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabTwo( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 2 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabTwo( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabTwo( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabTwo( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabTwo( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -217,17 +217,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabThree( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabThree( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 3 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabThree( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabThree( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabThree( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabThree( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -251,17 +251,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabFour( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabFour( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 4 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabFour( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabFour( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabFour( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabFour( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -285,17 +285,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabFive( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabFive( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 5 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabFive( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabFive( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabFive( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabFive( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -319,17 +319,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabSix( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabSix( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 6 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabSix( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabSix( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabSix( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabSix( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -353,17 +353,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabSeven( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabSeven( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 7 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabSeven( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabSeven( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabSeven( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabSeven( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -378,12 +378,12 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		}
 	}
 
-}  // end W3DGadgetTabControlDraw
+}
 
 // W3DGadgetRadioButtonImageDraw ==============================================
 /** Draw tabs with user supplied images */
 //=============================================================================
-void W3DGadgetTabControlImageDraw( GameWindow *tabControl, 
+void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																	WinInstanceData *instData )
 {
 	ICoord2D origin, size;
@@ -425,15 +425,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[0] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabZero( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 0 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabZero( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabZero( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -441,7 +441,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -454,15 +454,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[1] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabOne( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 1 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabOne( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabOne( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -470,7 +470,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -483,15 +483,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[2] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabTwo( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 2 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabTwo( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabTwo( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -499,7 +499,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -512,15 +512,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[3] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabThree( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 3 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabThree( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabThree( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -528,7 +528,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -541,15 +541,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[4] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabFour( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 4 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabFour( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabFour( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -557,7 +557,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -570,15 +570,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[5] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabFive( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 5 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabFive( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabFive( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -586,7 +586,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -599,15 +599,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[6] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabSix( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 6 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabSix( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabSix( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -615,7 +615,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -628,15 +628,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[7] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabSeven( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 7 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabSeven( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabSeven( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -644,9 +644,9 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
 
-}  // end W3DGadgetTabControlImageDraw
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp
index 527ebcc5e27..dba4d4f1e78 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DTextEntry.cpp /////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -53,11 +53,6 @@
 #include "W3DDevice/GameClient/W3DGadget.h"
 #include "W3DDevice/GameClient/W3DDisplay.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // DEFINES ////////////////////////////////////////////////////////////////////
 
@@ -75,7 +70,7 @@
 
 // drawTextEntryText ==========================================================
 //=============================================================================
-static void drawTextEntryText( GameWindow *window, WinInstanceData *instData,	
+static void drawTextEntryText( GameWindow *window, WinInstanceData *instData,
 															 Color textColor, Color textDropColor,
 															 Color compositeColor, Color compositeDropColor,
 															 Int x, Int y, Int width, Int fontHeight )
@@ -162,7 +157,7 @@ static void drawTextEntryText( GameWindow *window, WinInstanceData *instData,
 			cursorPos = textWidth + x;
 		}
 		else
-		{	
+		{
 			Int div = textWidth / (width / 2) - 1;
 			text->draw(x - (div * (width/2)), y, textColor, textDropColor);
 			cursorPos = textWidth - (div * (width/2)) + x;
@@ -204,12 +199,12 @@ static void drawTextEntryText( GameWindow *window, WinInstanceData *instData,
 		parent = NULL;
 
 	if( (window == TheWindowManager->winGetFocus() || (parent && parent == TheWindowManager->winGetFocus())) && ((drawCnt++ >> 3) & 0x1) )
-		TheWindowManager->winFillRect( textColor, WIN_DRAW_LINE_WIDTH, 
-																	 cursorPos, origin.y + 3, 
+		TheWindowManager->winFillRect( textColor, WIN_DRAW_LINE_WIDTH,
+																	 cursorPos, origin.y + 3,
 																	 cursorPos + 2, origin.y + size.y - 3 );
-	window->winSetCursorPosition( cursorPos + 2 - origin.x, 0 ); 
+	window->winSetCursorPosition( cursorPos + 2 - origin.x, 0 );
 
-}  // end drawTextEntryText
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -222,7 +217,7 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 {
 	EntryData *e = (EntryData *)window->winGetUserData();
 	ICoord2D origin, size, start, end;
-	Color backBorder, backColor, textColor, textBorder, 
+	Color backBorder, backColor, textColor, textBorder,
 			compositeColor, compositeBorder;
 
 	// cancel unichar flag
@@ -243,7 +238,7 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 		backColor		= GadgetTextEntryGetDisabledColor( window );
 		backBorder	= GadgetTextEntryGetDisabledBorderColor( window );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -254,7 +249,7 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 		backColor		= GadgetTextEntryGetHiliteColor( window );
 		backBorder	= GadgetTextEntryGetHiliteBorderColor( window );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
@@ -265,7 +260,7 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 		backColor		= GadgetTextEntryGetEnabledColor( window );
 		backBorder	= GadgetTextEntryGetEnabledBorderColor( window );
 
-	}  // end else, just enabled
+	}
 
 	// draw the back border
 	if( backBorder != WIN_COLOR_UNDEFINED )
@@ -278,7 +273,7 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 		TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw the filled back
 	if( backColor != WIN_COLOR_UNDEFINED )
@@ -291,7 +286,7 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 		TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw the text
 	Int fontHeight = TheWindowManager->winFontHeight( instData->getFont() );
@@ -309,9 +304,9 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 	drawTextEntryText( window, instData, textColor, textBorder, compositeColor, compositeBorder,
 										 start.x, start.y, width, fontHeight );
 
-	
 
-}  // end W3DGadgetTextEntryDraw
+
+}
 
 // W3DGadgetTextEntryImageDraw ================================================
 /** Draw horizontal slider with user supplied images */
@@ -350,7 +345,7 @@ void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData
 		centerImage				= GadgetTextEntryGetDisabledImageCenter( window );
 		smallCenterImage	= GadgetTextEntryGetDisabledImageSmallCenter( window );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -363,7 +358,7 @@ void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData
 		centerImage				= GadgetTextEntryGetHiliteImageCenter( window );
 		smallCenterImage	= GadgetTextEntryGetHiliteImageSmallCenter( window );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
@@ -376,7 +371,7 @@ void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData
 		centerImage				= GadgetTextEntryGetEnabledImageCenter( window );
 		smallCenterImage	= GadgetTextEntryGetEnabledImageSmallCenter( window );
 
-	}  // end else, just enabled
+	}
 
 	// get image sizes for the ends
 	ICoord2D leftSize, rightSize;
@@ -409,12 +404,12 @@ void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData
 	{
 
 		end.x = start.x + centerImage->getImageWidth();
-		TheWindowManager->winDrawImage( centerImage, 
+		TheWindowManager->winDrawImage( centerImage,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x += centerImage->getImageWidth();
 
-	}  // end for i
+	}
 
 	//
 	// how many small repeating pieces will fit in the gap from where the
@@ -433,7 +428,7 @@ void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData
 																		end.x, end.y );
 		start.x += smallCenterImage->getImageWidth();
 
-	}  // end for i
+	}
 
 	// draw left end
 	start.x = origin.x + xOffset;
@@ -463,6 +458,6 @@ void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData
 	drawTextEntryText( window, instData, textColor, textBorder, compositeColor, compositeBorder,
 										 start.x, start.y, width, fontHeight );
 
-	
 
-}  // end W3DGadgetTextEntryImageDraw
+
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp
index ca07705b753..8884b0f095d 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp
@@ -24,21 +24,21 @@
 
 // FILE: .cpp /////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
-// Project:   
+// Project:
 //
 // File name: .cpp
 //
-// Created:   
+// Created:
 //
-// Desc:      
+// Desc:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -72,7 +72,7 @@
 // W3DGadgetVerticalSliderDraw ================================================
 /** Draw colored vertical slider using standard graphics */
 //=============================================================================
-void W3DGadgetVerticalSliderDraw( GameWindow *window, 
+void W3DGadgetVerticalSliderDraw( GameWindow *window,
 																	WinInstanceData *instData )
 {
 	Color backBorder, backColor;
@@ -89,21 +89,21 @@ void W3DGadgetVerticalSliderDraw( GameWindow *window,
 		backBorder		= GadgetSliderGetDisabledBorderColor( window );
 		backColor			= GadgetSliderGetDisabledColor( window );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
 		backBorder		= GadgetSliderGetHiliteBorderColor( window );
 		backColor			= GadgetSliderGetHiliteColor( window );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
 		backBorder		= GadgetSliderGetEnabledBorderColor( window );
 		backColor			= GadgetSliderGetEnabledColor( window );
 
-	}  // end else, enabled
+	}
 
 	// draw background border and rect over whole control
 	if( backBorder != WIN_COLOR_UNDEFINED )
@@ -116,7 +116,7 @@ void W3DGadgetVerticalSliderDraw( GameWindow *window,
 		TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 	if( backColor != WIN_COLOR_UNDEFINED )
 	{
 
@@ -127,16 +127,16 @@ void W3DGadgetVerticalSliderDraw( GameWindow *window,
 		TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
+
 
-	
 
-}  // end W3DGadgetVerticalSliderDraw
+}
 
 // W3DGadgetVerticalSliderImageDraw ===========================================
 /** Draw vertical slider with user supplied images */
 //=============================================================================
-void W3DGadgetVerticalSliderImageDraw( GameWindow *window, 
+void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 																			 WinInstanceData *instData )
 {
 	const Image *topImage, *bottomImage, *centerImage, *smallCenterImage;
@@ -161,7 +161,7 @@ void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 		centerImage				= GadgetSliderGetDisabledImageCenter( window );
 		smallCenterImage	= GadgetSliderGetDisabledImageSmallCenter( window );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -170,7 +170,7 @@ void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 		centerImage				= GadgetSliderGetHiliteImageCenter( window );
 		smallCenterImage	= GadgetSliderGetHiliteImageSmallCenter( window );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
@@ -179,10 +179,10 @@ void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 		centerImage				= GadgetSliderGetEnabledImageCenter( window );
 		smallCenterImage	= GadgetSliderGetEnabledImageSmallCenter( window );
 
-	}  // end else, enabled
+	}
 
 	// sanity, we need to have these images to make it look right
-	if( topImage == NULL || bottomImage == NULL || 
+	if( topImage == NULL || bottomImage == NULL ||
 			centerImage == NULL || smallCenterImage == NULL )
 		return;
 
@@ -241,7 +241,7 @@ void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 			start.y += centerImage->getImageHeight();
 			end.y += centerImage->getImageHeight();
 
-		}  // end for i
+		}
 
 		//
 		// how many small repeating pieces will fit in the gap from where the
@@ -260,7 +260,7 @@ void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 			start.y += smallCenterImage->getImageHeight();
 			end.y += smallCenterImage->getImageHeight();
 
-		}  // end for i
+		}
 
 		// draw top end
 		start.x = origin.x + xOffset;
@@ -274,8 +274,8 @@ void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 		end.y = start.y + bottomSize.y;
 		TheWindowManager->winDrawImage(bottomImage, start.x, start.y, end.x, end.y);
 	}
-	
 
-}  // end W3DGadgetVerticalSliderImageDraw
+
+}
 
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
index def7a7bcc67..836a338bcd0 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DGameFont.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -73,56 +73,33 @@
 //=============================================================================
 Bool W3DFontLibrary::loadFontData( GameFont *font )
 {
-	FontCharsClass *fontChar;
-
 	// sanity
 	if( font == NULL )
 		return FALSE;
 
-	if ((UnsignedInt)font->pointSize > 100)	//sanity check the size - anything over 100 is probably wrong. -MW
-		fontChar = NULL;
-	else
-	{	// get the font data from the asset manager
-		fontChar = WW3DAssetManager::
-									Get_Instance()->Get_FontChars( font->nameString.str(), font->pointSize,
-																								 font->bold ? true : false );
-	}
+	const char* name = font->nameString.str();
+	const Int size = font->pointSize;
+	const Bool bold = font->bold;
+
+	// get the font data from the asset manager
+	FontCharsClass *fontChar = WW3DAssetManager::Get_Instance()->Get_FontChars( name, size, bold );
 
 	if( fontChar == NULL )
 	{
-
-		DEBUG_LOG(( "W3D load font: unable to find font '%s' from asset manager\n",
-						 font->nameString.str() ));
-		DEBUG_ASSERTCRASH(fontChar, ("Missing or Corrupted Font.  Pleas see log for details"));
+		DEBUG_CRASH(( "Unable to find font '%s' in Asset Manager", name ));
 		return FALSE;
-
-	}  // end if
+	}
 
 	// assign font data
 	font->fontData = fontChar;
 	font->height = fontChar->Get_Char_Height();
 
-	FontCharsClass *unicodeFontChar = NULL;
-
-	// load unicode of same point size
-	if(TheGlobalLanguageData)
-		unicodeFontChar = WW3DAssetManager::
-									Get_Instance()->Get_FontChars( TheGlobalLanguageData->m_unicodeFontName.str(), font->pointSize,
-																								 font->bold ? true : false );
-	else
-		unicodeFontChar = WW3DAssetManager::
-									Get_Instance()->Get_FontChars( "Arial Unicode MS", font->pointSize,
-																								 font->bold ? true : false );
-
-	if ( unicodeFontChar )
-	{
-		fontChar->AlternateUnicodeFont = unicodeFontChar;
-	}
+	// load Unicode of same point size
+	name = TheGlobalLanguageData ? TheGlobalLanguageData->m_unicodeFontName.str() : "Arial Unicode MS";
+	fontChar->AlternateUnicodeFont = WW3DAssetManager::Get_Instance()->Get_FontChars( name, size, bold );
 
-	// all done and loaded
 	return TRUE;
-
-}  // end loadFont
+}
 
 // W3DFontLibrary::releaseFontData ============================================
 /** Release font data */
@@ -137,10 +114,11 @@ void W3DFontLibrary::releaseFontData( GameFont *font )
 		if(((FontCharsClass *)(font->fontData))->AlternateUnicodeFont)
 			((FontCharsClass *)(font->fontData))->AlternateUnicodeFont->Release_Ref();
 		((FontCharsClass *)(font->fontData))->Release_Ref();
+
+		font->fontData = NULL;
 	}
-	font->fontData = NULL;
-	
-}  // end releaseFont
+
+}
 
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
index 254117e55e0..7fa36bca028 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DGameWindow.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -81,41 +81,41 @@ static const Image *borderPieces[NUM_BORDER_PIECES] = { 0 };
 static void initBorders( void )
 {
 
-	borderPieces[ BORDER_CORNER_UL ] = 
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerUL" ) );
+	borderPieces[ BORDER_CORNER_UL ] =
+						TheMappedImageCollection->findImageByName( "BorderCornerUL" );
 
 	borderPieces[ BORDER_CORNER_UR ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerUR" ) );
+						TheMappedImageCollection->findImageByName( "BorderCornerUR" );
 
 	borderPieces[ BORDER_CORNER_LL ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerLL" ) );
+						TheMappedImageCollection->findImageByName( "BorderCornerLL" );
 
 	borderPieces[ BORDER_CORNER_LR ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerLR" ) );
+						TheMappedImageCollection->findImageByName( "BorderCornerLR" );
 
 	borderPieces[ BORDER_VERTICAL_LEFT ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderLeft" ) );
+						TheMappedImageCollection->findImageByName( "BorderLeft" );
 
 	borderPieces[ BORDER_VERTICAL_LEFT_SHORT ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderLeftShort" ) );
+						TheMappedImageCollection->findImageByName( "BorderLeftShort" );
 
 	borderPieces[ BORDER_HORIZONTAL_TOP ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderTop" ) );
+						TheMappedImageCollection->findImageByName( "BorderTop" );
 
 	borderPieces[ BORDER_HORIZONTAL_TOP_SHORT ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderTopShort" ) );
+						TheMappedImageCollection->findImageByName( "BorderTopShort" );
 
 	borderPieces[ BORDER_VERTICAL_RIGHT ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderRight" ) );
+						TheMappedImageCollection->findImageByName( "BorderRight" );
 
 	borderPieces[ BORDER_VERTICAL_RIGHT_SHORT ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderRightShort" ) );
+						TheMappedImageCollection->findImageByName( "BorderRightShort" );
 
 	borderPieces[ BORDER_HORIZONTAL_BOTTOM ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderBottom" ) );
+						TheMappedImageCollection->findImageByName( "BorderBottom" );
 
 	borderPieces[ BORDER_HORIZONTAL_BOTTOM_SHORT ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderBottomShort" ) );
+						TheMappedImageCollection->findImageByName( "BorderBottomShort" );
 
 	bordersInit = TRUE;
 
@@ -128,7 +128,7 @@ void W3DGameWindow::blitBorderRect( Int x, Int y, Int width, Int height )
 	Int Offset = 15;
 	Int OffsetLower = 5;
 	// init image loc if needed
-	if( bordersInit == FALSE )	
+	if( bordersInit == FALSE )
 		initBorders();
 
 	// save original x, y
@@ -161,7 +161,7 @@ void W3DGameWindow::blitBorderRect( Int x, Int y, Int width, Int height )
 	// x == place to draw remainder if any
 	if( (x2 - x) >= (BORDER_LINE_SIZE / 2) )
 	{
-		
+
 		//Blit Half piece
 		TheDisplay->drawImage( borderPieces[ BORDER_HORIZONTAL_TOP_SHORT ],
 													 x, y, x + halfSize, y + size );
@@ -253,7 +253,7 @@ void W3DGameWindow::blitBorderRect( Int x, Int y, Int width, Int height )
 	TheDisplay->drawImage( borderPieces[ BORDER_CORNER_LR ],
 												 x, y, x + size, y + size );
 
-}  // end blitBorderRect
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -272,14 +272,14 @@ W3DGameWindow::W3DGameWindow( void )
 	m_needPolyDraw = FALSE;
 	m_newTextPos = FALSE;
 
-}  // end W3DGameWindow
+}
 
 // W3DGameWindow::~W3DGameWindow ==============================================
 //=============================================================================
 W3DGameWindow::~W3DGameWindow( void )
 {
 
-}  // end ~W3DGameWindow
+}
 
 // W3DGameWinDefaultDraw ======================================================
 /** The default redraw callback.  Draws the background using either
@@ -293,10 +293,10 @@ void W3DGameWinDefaultDraw( GameWindow *window, WinInstanceData *instData )
 	ICoord2D size;
 	W3DGameWindow *w3dWindow = (W3DGameWindow *)window;
 
-	/** @todo NOTE that we're making a W3DGameWindow cast here, it seems 
-	logical because we are in a W3D draw function so it's reasonable to assume 
-	that we have a W3DGameWindow.  However, we may want to revisit this 
-	type of casting in the future, we have the same problems with the 
+	/** @todo NOTE that we're making a W3DGameWindow cast here, it seems
+	logical because we are in a W3D draw function so it's reasonable to assume
+	that we have a W3DGameWindow.  However, we may want to revisit this
+	type of casting in the future, we have the same problems with the
 	ObjectModules where we cast object modules for their individual methods.
 	Also note that the other W3D implementations of GUI controls are making
 	a similar cast for their device implementation functions */
@@ -330,9 +330,9 @@ void W3DGameWinDefaultDraw( GameWindow *window, WinInstanceData *instData )
 			end.y = start.y + size.y;
 			TheWindowManager->winDrawImage( image, start.x, start.y, end.x, end.y );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 		Color color, borderColor;
@@ -344,39 +344,39 @@ void W3DGameWinDefaultDraw( GameWindow *window, WinInstanceData *instData )
 			color				= window->winGetDisabledColor( 0 );
 			borderColor = window->winGetDisabledBorderColor( 0 );
 
-		}  // end if
+		}
 		else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 		{
 
 			color				= window->winGetHiliteColor( 0 );
 			borderColor = window->winGetHiliteBorderColor( 0 );
 
-		}  // end else if
+		}
 		else
 		{
 
 			color				= window->winGetEnabledColor( 0 );
 			borderColor = window->winGetEnabledBorderColor( 0 );
 
-		}  // end else
+		}
 
 		//
 		// draw the border at the edges
 		//
 		if( borderColor != WIN_COLOR_UNDEFINED )
-			TheWindowManager->winOpenRect( borderColor, borderWidth, 
-																		 origin.x, origin.y, 
+			TheWindowManager->winOpenRect( borderColor, borderWidth,
+																		 origin.x, origin.y,
 																		 origin.x + size.x, origin.y + size.y );
 
 		// draw filled background
 		if( color != WIN_COLOR_UNDEFINED )
-			TheWindowManager->winFillRect( color, borderWidth, 
+			TheWindowManager->winFillRect( color, borderWidth,
 																		 origin.x + borderWidth,
 																		 origin.y + borderWidth,
 																		 origin.x + size.x - borderWidth,
 																		 origin.y + size.y - borderWidth );
 
-	}  // end else
+	}
 
 	// if we have a video buffer, draw the video buffer
 	if ( instData->m_videoBuffer )
@@ -388,7 +388,7 @@ void W3DGameWinDefaultDraw( GameWindow *window, WinInstanceData *instData )
 		TheDisplay->drawVideoBuffer( instData->m_videoBuffer, pos.x, pos.y, pos.x + size.x, pos.y + size.y );
 	}
 
-}  // end W3DGameWinDefaultDraw
+}
 
 // W3DGameWindow::winDrawBorder ===============================================
 //=============================================================================
@@ -436,7 +436,7 @@ void W3DGameWindow::winDrawBorder( void )
 					{
 						Int textWidth = 0;
 
-						TheWindowManager->winGetTextSize( m_instData.getFont(), 
+						TheWindowManager->winGetTextSize( m_instData.getFont(),
 																							m_instData.getText(),
 																							&textWidth, NULL, 0 );
 						width -= textWidth + 6;
@@ -486,7 +486,7 @@ void W3DGameWindow::winDrawBorder( void )
 						child->winGetSize( &size.x, &size.y );
 						sliderAdjustment = size.y;
 
-					}  // end if
+					}
 
 					if( m_instData.getTextLength() )
 						labelAdjustment = 4;
@@ -511,20 +511,23 @@ void W3DGameWindow::winDrawBorder( void )
 					found = TRUE;
 					break;
 
-			}  // end switch
+			}
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end WinDrawBorder
+}
 
 // W3DGameWindow::winSetFont ==================================================
-/** Set the font for a widow */
+/** Set the font for a window */
 //=============================================================================
 void W3DGameWindow::winSetFont( GameFont *font )
 {
 
+	if (font == NULL)
+		return;
+
 	// extending functionality
 	GameWindow::winSetFont( font );
 
@@ -534,7 +537,7 @@ void W3DGameWindow::winSetFont( GameFont *font )
 	// this is a visual change
 	m_needPolyDraw = TRUE;
 
-}  // end WinSetFont
+}
 
 // W3DGameWindow::winSetText ==================================================
 /** Set the text for window */
@@ -552,8 +555,8 @@ Int W3DGameWindow::winSetText( UnicodeString newText )
 	m_needPolyDraw = TRUE;
 
 	return WIN_ERR_OK;
-		
-}  // end WinSetText
+
+}
 
 // W3DGameWindow::winSetPosition ==============================================
 /** Set window position */
@@ -576,7 +579,7 @@ Int W3DGameWindow::winSetPosition( Int x, Int y )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetPosition
+}
 
 // W3DGameWindow::getTextSize =================================================
 /** Get the size of the text in our inst data */
@@ -590,7 +593,7 @@ void W3DGameWindow::getTextSize( Int *width, Int *height )
 	if( height )
 		*height = extents.Y;
 
-}  // end getTextSize
+}
 
 // W3DGameWindow::getTextLoc ==================================================
 // Set our text rendering location */
@@ -611,9 +614,9 @@ void W3DGameWindow::setTextLoc( Int x, Int y )
 		m_textPos.y = y;
 		m_newTextPos = TRUE;
 
-	}  // end if
+	}
 
-}  // end setTextLoc
+}
 
 // W3DGameWindow::drawText ====================================================
 /** Draw the text in our 2d sentence renderer */
@@ -629,7 +632,7 @@ void W3DGameWindow::drawText( Color color )
 		m_newTextPos = FALSE;
 		needDraw = TRUE;
 
-	}  // end if
+	}
 
 	// if color switch, set new color
 	if( m_currTextColor != color )
@@ -638,13 +641,13 @@ void W3DGameWindow::drawText( Color color )
 		m_currTextColor = color;
 		needDraw = TRUE;
 
-	}  // end if
+	}
 
 	// draw the quads if needed
 	if( needDraw || m_needPolyDraw )
 	{
 		UnsignedInt outline = TheWindowManager->winMakeColor( 0, 0, 0, 255 );
-	
+
 		m_textRenderer.Reset_Polys();
 		m_textRenderer.Set_Location( Vector2( m_textPos.x + 1, m_textPos.y + 1 ) );
 		m_textRenderer.Draw_Sentence( outline );
@@ -654,10 +657,10 @@ void W3DGameWindow::drawText( Color color )
 
 		m_needPolyDraw = FALSE;
 
-	}  // end if
+	}
 
 	// do the render
 	m_textRenderer.Render();
 
-}  // end drawText
+}
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
index be1d44cf491..0643a02b749 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
@@ -43,14 +43,14 @@
 W3DGameWindowManager::W3DGameWindowManager( void )
 {
 
-}  // end W3DGameWindowManager
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DGameWindowManager::~W3DGameWindowManager( void )
 {
 
-}  // end ~W3DGameWindowManager
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -60,5 +60,5 @@ void W3DGameWindowManager::init( void )
 	// extend
 	GameWindowManager::init();
 
-}  // end init
+}
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp
deleted file mode 100644
index 39613903fda..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp
+++ /dev/null
@@ -1,4497 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Heightmap.cpp ////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: Heightmap.cpp
-//
-// Created:   Mark W., John Ahlquist, April/May 2001
-//
-// Desc:      Draw the terrain and scorchmarks in a scene.
-//
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-//         Includes                                                      
-//-----------------------------------------------------------------------------
-#include "W3DDevice/GameClient/HeightMap.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assetmgr.h>
-#include <texture.h>
-#include <tri.h>
-#include <colmath.h>
-#include <coltest.h>
-#include <rinfo.h>
-#include <camera.h>
-#include <d3dx8core.h>
-#include "Common/GlobalData.h"
-#include "Common/PerfTimer.h"
-
-#include "GameClient/TerrainVisual.h"
-#include "GameClient/View.h"
-#include "GameClient/Water.h"
-
-#include "GameLogic/AIPathfind.h"
-#include "GameLogic/TerrainLogic.h"
-#include "W3DDevice/GameClient/TerrainTex.h"
-#include "W3DDevice/GameClient/W3DDynamicLight.h"
-#include "W3DDevice/GameClient/W3DScene.h"
-#include "W3DDevice/GameClient/W3DTerrainTracks.h"
-#include "W3DDevice/GameClient/W3DBibBuffer.h"
-#include "W3DDevice/GameClient/W3DTreeBuffer.h"
-#include "W3DDevice/GameClient/W3DRoadBuffer.h"
-#include "W3DDevice/GameClient/W3DBridgeBuffer.h"
-#include "W3DDevice/GameClient/W3DWaypointBuffer.h"
-#include "W3DDevice/GameClient/W3DCustomEdging.h"
-#include "W3DDevice/GameClient/WorldHeightMap.h"
-#include "W3DDevice/GameClient/W3DShaderManager.h"
-#include "W3DDevice/GameClient/W3DShadow.h"
-#include "W3DDevice/GameClient/W3DWater.h"
-#include "W3DDevice/GameClient/W3DShroud.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/light.h"
-#include "WW3D2/scene.h"
-#include "W3DDevice/GameClient/W3DPoly.h"
-#include "W3DDevice/GameClient/W3DCustomScene.h"
-
-#include "Common/PerfTimer.h"
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.		 
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#define no_OPTIMIZED_HEIGHTMAP_LIGHTING	01
-// Doesn't work well.  jba.
-
-//-----------------------------------------------------------------------------
-//         Private Data                                                     
-//-----------------------------------------------------------------------------
-#define SC_DETAIL_BLEND ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
-	ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_ENABLE, ShaderClass::DETAILCOLOR_SCALE, ShaderClass::DETAILALPHA_DISABLE) )
-
-static ShaderClass detailOpaqueShader(SC_DETAIL_BLEND);
-
-//-----------------------------------------------------------------------------
-//         Global Functions & Data                                              
-//-----------------------------------------------------------------------------
-/// The one-of for the terrain rendering object.
-HeightMapRenderObjClass *TheTerrainRenderObject=NULL;
-
-/** Entry point so that trees can be drawn at the appropriate point in the rendering pipe for 
-    transparent objects. */
-void DoTrees(RenderInfoClass & rinfo)
-{
-	if (TheTerrainRenderObject) {
-		TheTerrainRenderObject->renderTrees(&rinfo.Camera);
-	}
-}
-
-void oversizeTheTerrain(Int amount)
-{
-	if (TheTerrainRenderObject) 
-	{
-		TheTerrainRenderObject->oversizeTerrain(amount);
-	}
-}
-
-#define DEFAULT_MAX_FRAME_EXTRABLEND_TILES		256	//default number of terrain tiles rendered per call (must fit in one VB)
-#define DEFAULT_MAX_MAP_EXTRABLEND_TILES		2048	//default size of array allocated to hold all map extra blend tiles.
-#define DEFAULT_MAX_BATCH_SHORELINE_TILES		512	//maximum number of terrain tiles rendered per call (must fit in one VB)
-#define DEFAULT_MAX_MAP_SHORELINE_TILES		4096	//default size of array allocated to hold all map shoreline tiles.
-
-#define ADJUST_FROM_INDEX_TO_REAL(k) ((k-m_map->getBorderSize())*MAP_XY_FACTOR)
-inline Int IABS(Int x) {	if (x>=0) return x; return -x;};
-
-//-----------------------------------------------------------------------------
-//         Private Functions                                               
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// HeightMapRenderObjClass::freeMapResources
-//=============================================================================
-/** Frees the w3d resources used to draw the terrain. */
-//=============================================================================
-Int HeightMapRenderObjClass::freeMapResources(void)
-{
-#ifdef DO_SCORCH
-	freeScorchBuffers();
-#endif
-	REF_PTR_RELEASE(m_indexBuffer);
-	if (m_vertexBufferTiles) {
-		for (int i=0; i<m_numVertexBufferTiles; i++)
-			REF_PTR_RELEASE(m_vertexBufferTiles[i]);
-		delete[] m_vertexBufferTiles;
-		m_vertexBufferTiles = NULL;
-	}
-	if (m_vertexBufferBackup) {
-		for (int i=0; i<m_numVertexBufferTiles; i++)
-			delete[] m_vertexBufferBackup[i];
-		delete[] m_vertexBufferBackup;
-		m_vertexBufferBackup = NULL;
-	}
-	m_numVertexBufferTiles = 0;
-#ifdef PRE_TRANSFORM_VERTEX
-	if (m_xformedVertexBuffer) {
-		for (int i=0; i<m_numVertexBufferTiles; i++)
-			m_xformedVertexBuffer[i]->Release();
-		delete[] m_xformedVertexBuffer;
-		m_xformedVertexBuffer = NULL;
-	}
-#endif
-	REF_PTR_RELEASE(m_vertexMaterialClass);
-	REF_PTR_RELEASE(m_stageZeroTexture);
-	REF_PTR_RELEASE(m_stageOneTexture);
-	REF_PTR_RELEASE(m_stageTwoTexture);
-	REF_PTR_RELEASE(m_stageThreeTexture);
-	REF_PTR_RELEASE(m_destAlphaTexture);
-	REF_PTR_RELEASE(m_map);
-
-	return 0;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::doTheLight
-//=============================================================================
-/** Calculates the diffuse lighting for a vertex in the terrain, taking all of the
-static lights into account as well.  It is possible to just use the normal in the 
-vertex and let D3D do the lighting, but it is slower to render, and can only 
-handle 4 lights at this point. */
-//=============================================================================
-void HeightMapRenderObjClass::doTheLight(VERTEX_FORMAT *vb, Vector3*light, Vector3*normal, RefRenderObjListIterator *pLightsIterator, UnsignedByte alpha)
-{
-#ifdef USE_NORMALS
-	vb->nx = normal->X;
-	vb->ny = normal->Y;
-	vb->nz = normal->Z;
-#else
-	Real shadeR, shadeG, shadeB;
-	Real shade;
-	shadeR = TheGlobalData->m_terrainAmbient[0].red;	//only the first terrain light contributes to ambient
-	shadeG = TheGlobalData->m_terrainAmbient[0].green;
-	shadeB = TheGlobalData->m_terrainAmbient[0].blue;
-
-	if (pLightsIterator) {
-		for (pLightsIterator->First(); !pLightsIterator->Is_Done(); pLightsIterator->Next())
-		{		
-			LightClass *pLight = (LightClass*)pLightsIterator->Peek_Obj();
-			Vector3 lightDirection(vb->x, vb->y, vb->z);
-			Real factor = 1.0f;
-			switch(pLight->Get_Type()) {
-			case LightClass::POINT:
-			case LightClass::SPOT: {
-					Vector3 lightLoc = pLight->Get_Position();
-					lightDirection -= lightLoc;
-					double range, midRange;
-					pLight->Get_Far_Attenuation_Range(midRange, range);
-					if (vb->x < lightLoc.X-range) continue;
-					if (vb->x > lightLoc.X+range) continue;
-					if (vb->y < lightLoc.Y-range) continue;
-					if (vb->y > lightLoc.Y+range) continue;
-					Real dist = lightDirection.Length();
-					if (dist >= range) continue;
-					if (midRange < 0.1) continue;
-#if 1
-					factor = 1.0f - (dist - midRange) / (range - midRange);
-#else
-					// f = 1.0 / (atten0 + d*atten1 + d*d/atten2);
-					if (fabs(range-midRange)<1e-5)	{
-						// if the attenuation range is too small assume uniform with cutoff
-						factor = 1.0;
-					}	else  {
-						factor = 1.0f/(0.1+dist/midRange + 5.0f*dist*dist/(range*range));
-					}
-#endif
-					factor = WWMath::Clamp(factor,0.0f,1.0f);
-				} 
-				break;
-			case LightClass::DIRECTIONAL:
-				lightDirection = pLight->Get_Transform().Get_Z_Vector();
-				factor = 1.0;
-				break;
-			};
-			lightDirection.Normalize();
-			Vector3 lightRay(-lightDirection.X, -lightDirection.Y, -lightDirection.Z);
-			shade = Vector3::Dot_Product(lightRay, *normal); 
-			shade *= factor;
-			Vector3 diffuse;
-			pLight->Get_Diffuse(&diffuse);
-			Vector3 ambient;
-			pLight->Get_Ambient(&ambient);
-			if (shade > 1.0) shade = 1.0;
-			if(shade < 0.0f) shade = 0.0f;
-			shadeR += shade*diffuse.X;
-			shadeG += shade*diffuse.Y;
-			shadeB += shade*diffuse.Z;		
-			shadeR += factor*ambient.X;
-			shadeG += factor*ambient.Y;
-			shadeB += factor*ambient.Z;		
-
-		}
-	} 
-	// Add in global diffuse value.
-	const RGBColor *terrainDiffuse;
-	for (Int lightIndex=0; lightIndex < TheGlobalData->m_numGlobalLights; lightIndex++)
-	{
-		shade = Vector3::Dot_Product(light[lightIndex], *normal); 
-		if (shade > 1.0) shade = 1.0;
-		if(shade < 0.0f) shade = 0.0f;
-		terrainDiffuse=&TheGlobalData->m_terrainDiffuse[lightIndex];
-		shadeR += shade*terrainDiffuse->red;
-		shadeG += shade*terrainDiffuse->green;
-		shadeB += shade*terrainDiffuse->blue;
-	}
-
-	if (shadeR > 1.0) shadeR = 1.0;
-	if(shadeR < 0.0f) shadeR = 0.0f;
-	if (shadeG > 1.0) shadeG = 1.0;
-	if(shadeG < 0.0f) shadeG = 0.0f;
-	if (shadeB > 1.0) shadeB = 1.0;
-	if(shadeB < 0.0f) shadeB = 0.0f;
-
-	if (m_useDepthFade && vb->z <= TheGlobalData->m_waterPositionZ)
-	{	//height is below water level
-		//reduce lighting values based on light fall off as it travels through water.
-		float depthScale = (1.4f - vb->z)/TheGlobalData->m_waterPositionZ;
-		shadeR *= 1.0f - depthScale * (1.0f-m_depthFade.X);
-		shadeG *= 1.0f - depthScale * (1.0f-m_depthFade.Y);
-		shadeB *= 1.0f - depthScale * (1.0f-m_depthFade.Z);
-	}
-
-	shadeR*=255.0f;
-	shadeG*=255.0f;
-	shadeB*=255.0f;
-	vb->diffuse = REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16) | ((Int)alpha << 24);
-#endif
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::doTheDynamicLight
-//=============================================================================
-/** Calculates the diffuse lighting as affected by dynamic lighting. */
-//=============================================================================
-UnsignedInt HeightMapRenderObjClass::doTheDynamicLight(VERTEX_FORMAT *vb, VERTEX_FORMAT *vbMirror, Vector3*light, Vector3*normal,  W3DDynamicLight *pLights[], Int numLights)
-{
-#ifdef USE_NORMALS
-	return;
-#else
-	Real shadeR, shadeG, shadeB;
-	Int diffuse = vbMirror->diffuse;
-#ifdef RTS_DEBUG
-	//vbMirror->diffuse += 30;	// Shows which vertexes are geting touched by dynamic light. debug only.
-#endif
-	
-	// (gth) avoiding the extra divides (compiler unfortunately didn't do this automatically...)
-	const float oo255 = (1.0f/255.0f);  
-	shadeR = ((diffuse>>16)&0x00FF) * oo255;
-	shadeG = ((diffuse>>8)&0x00FF) * oo255;
-	shadeB = (diffuse&0x00FF) * oo255;
-
-	Int alpha = (diffuse>>24)&0x00FF;
-	Int k;
-	for (k=0; k<numLights; k++) {
-		W3DDynamicLight *pLight = pLights[k];
-		if (!pLight->isEnabled()) {
-			continue; // he is turned off.
-		}
-		Vector3 lightDirection(vbMirror->x, vbMirror->y, vbMirror->z);
-		Real factor = 1.0f;
-		switch(pLight->Get_Type()) {	  
-		case LightClass::POINT:
-		case LightClass::SPOT: {
-				Vector3 lightLoc = pLight->Get_Position();
-				lightDirection -= lightLoc;
-				double range, midRange;
-				pLight->Get_Far_Attenuation_Range(midRange, range);
-				Real dist = lightDirection.Length();
-				if (dist >= range) continue;
-				if (midRange < 0.1) continue;
-				factor = 1.0f - (dist - midRange) / (range - midRange);
-				factor = WWMath::Clamp(factor,0.0f,1.0f);
-
-				// (gth) normalize here since we have the length
-				lightDirection /= dist;
-			} 
-			break;
-		case LightClass::DIRECTIONAL:
-			pLight->Get_Spot_Direction(lightDirection);
-			factor = 1.0;
-			break;
-		};
-		
-		// (gth) unneeded due to above normalization
-		//lightDirection.Normalize();
-
-		Vector3 lightRay(-lightDirection.X, -lightDirection.Y, -lightDirection.Z);
-		Real shade = Vector3::Dot_Product(lightRay, *normal); 
-		shade *= factor;
-		Vector3 diffuse;
-		pLight->Get_Diffuse(&diffuse);
-		Vector3 ambient;
-		pLight->Get_Ambient(&ambient);
-		if (shade > 1.0) shade = 1.0;
-		if(shade < 0.0f) shade = 0.0f;
-		shadeR += shade*diffuse.X;
-		shadeG += shade*diffuse.Y;
-		shadeB += shade*diffuse.Z;		
-		shadeR += factor*ambient.X;
-		shadeG += factor*ambient.Y;
-		shadeB += factor*ambient.Z;		
-
-	} 
-	if (shadeR > 1.0) shadeR = 1.0;
-	if(shadeR < 0.0f) shadeR = 0.0f;
-	if (shadeG > 1.0) shadeG = 1.0;
-	if(shadeG < 0.0f) shadeG = 0.0f;
-	if (shadeB > 1.0) shadeB = 1.0;
-	if(shadeB < 0.0f) shadeB = 0.0f;
-	shadeR*=255.0f;
-	shadeG*=255.0f;
-	shadeB*=255.0f;
-
-//	(gth) faster float to int conversion, return the result so we can re-use it.
-//	vb->diffuse=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16) | ((int)alpha << 24);
-	UnsignedInt light_val = WWMath::Float_To_Int_Chop(shadeB) | (WWMath::Float_To_Int_Chop(shadeG) << 8) | (WWMath::Float_To_Int_Chop(shadeR) << 16) | ((int)alpha << 24);
-	vb->diffuse = light_val;
-	return light_val;
-
-#endif
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::getXWithOrigin
-//=============================================================================
-/** Gets the x index that corresponds to the data.  For example, if the columns
-are shifted by 3, index 3 is actually the first row of polygons, or 0.  Yes it
-is confusing, but it makes sliding the map 10x faster.  */
-//=============================================================================
-Int HeightMapRenderObjClass::getXWithOrigin(Int x)
-{
-	x -= m_originX;
-	if (x<0) x+= m_x-1;
-	if (x>= m_x-1) x-=m_x-1;
-#ifdef RTS_DEBUG
-	DEBUG_ASSERTCRASH (x>=0, ("X out of range."));
-	DEBUG_ASSERTCRASH (x<m_x-1, ("X out of range."));
-#endif
-	if (x<0) x = 0;
-	if (x>= m_x-1) x=m_x-1;
-	return x;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::getYWithOrigin
-//=============================================================================
-/** Gets the y index that corresponds to the data.  For example, if the rows
-are shifted by 3, index 3 is actually the first row of polygons, or 0.  Yes it
-is confusing, but it makes sliding the map 10x faster.  */
-//=============================================================================
-Int HeightMapRenderObjClass::getYWithOrigin(Int y)
-{
-	y -= m_originY;
-	if (y<0) y+= m_y-1;
-	if (y>= m_y-1) y-=m_y-1;
-#ifdef RTS_DEBUG
-	DEBUG_ASSERTCRASH (y>=0, ("Y out of range."));
-	DEBUG_ASSERTCRASH (y<m_y-1, ("Y out of range."));
-#endif
-	if (y<0) y = 0;
-	if (y>= m_y-1) y=m_y-1;
-	return y;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::updateVB
-//=============================================================================
-/** Update a rectangular block of the given Vertex Buffer. 
-data is expected to be an array same dimensions as current heightmap
-mapped into this VB.
-*/
-//=============================================================================
-Int HeightMapRenderObjClass::updateVB(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator)
-{
-	Int i,j;
-	Vector3 lightRay[MAX_GLOBAL_LIGHTS];
-	const Coord3D *lightPos;
-	Int xCoord, yCoord;
-	Int vn0,un0,vp1,up1;
-	Vector3 l2r,n2f,normalAtTexel;
-	Int	vertsPerRow=(VERTEX_BUFFER_TILE_LENGTH)*4;	//vertices per row of VB
-
-	Int cellOffset = 1;
-	if (m_halfResMesh) {
-		cellOffset = 2;
-	}
-
-	REF_PTR_SET(m_map, pMap);	//update our heightmap pointer in case it changed since last call.
-	if (m_vertexBufferTiles && pMap)
-	{
-#ifdef RTS_DEBUG
-		assert(x0 >= originX && y0 >= originY && x1>x0 && y1>y0 && x1<=originX+VERTEX_BUFFER_TILE_LENGTH && y1<=originY+VERTEX_BUFFER_TILE_LENGTH);
-#endif 
-
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
-		VERTEX_FORMAT *vbHardware = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();
-		VERTEX_FORMAT *vBase = (VERTEX_FORMAT*)data;
-		// Note that we are building the vertex buffer data in the memory buffer, data.
-		// At the bottom, we will copy the final vertex data for one cell into the 
-		// hardware vertex buffer. 
-		
-		for (j=y0; j<y1; j++)
-		{
-			VERTEX_FORMAT *vb = vBase;
-			if (m_halfResMesh) {
-				if (j&1) continue;
-				vb += ((j-originY)/2)*vertsPerRow/2;	//skip to correct row in vertex buffer
-				vb += ((x0-originX)/2)*4;		//skip to correct vertex in row.
-			} else {
-				vb += (j-originY)*vertsPerRow;	//skip to correct row in vertex buffer
-				vb += (x0-originX)*4;		//skip to correct vertex in row.
-			}
-			vn0 = getYWithOrigin(j)-cellOffset;
-			if (vn0 < -pMap->getDrawOrgY())
-				vn0=-pMap->getDrawOrgY();
-			vp1 = getYWithOrigin(j+cellOffset)+cellOffset;
-			if (vp1 >= pMap->getYExtent()-pMap->getDrawOrgY())
-				vp1=pMap->getYExtent()-pMap->getDrawOrgY()-1;
-
-			yCoord = getYWithOrigin(j)+pMap->getDrawOrgY();
-			for (i=x0; i<x1; i++)
-			{
-				if (m_halfResMesh) {
-					if (i&1) continue;
-				}
-				un0 = getXWithOrigin(i)-cellOffset;
-				if (un0 < -pMap->getDrawOrgX())
-					un0=-pMap->getDrawOrgX();
-				up1 = getXWithOrigin(i+cellOffset)+cellOffset;
-				if (up1 >= pMap->getXExtent()-pMap->getDrawOrgX())
-					up1=pMap->getXExtent()-pMap->getDrawOrgX()-1;
-				xCoord = getXWithOrigin(i)+pMap->getDrawOrgX();
-
-				//update the 4 vertices in this block
-				float U[4], V[4];
-				UnsignedByte alpha[4];
-				float UA[4], VA[4];
-				Bool flipForBlend = false;			 // True if the blend needs the triangles flipped.
-
-				if (pMap) {
-					pMap->getUVData(getXWithOrigin(i),getYWithOrigin(j),U, V, m_halfResMesh);
-					pMap->getAlphaUVData(getXWithOrigin(i),getYWithOrigin(j), UA, VA, alpha, &flipForBlend, m_halfResMesh);
-				} 
-
-
-				for (Int lightIndex=0; lightIndex < TheGlobalData->m_numGlobalLights; lightIndex++)
-				{
-					lightPos=&TheGlobalData->m_terrainLightPos[lightIndex];
-					lightRay[lightIndex].Set(-lightPos->x,-lightPos->y,	-lightPos->z);
-				}
-
-				//top-left sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset, getYWithOrigin(j)) - pMap->getDisplayHeight(un0, getYWithOrigin(j))));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i), (getYWithOrigin(j)+cellOffset)) - pMap->getDisplayHeight(getXWithOrigin(i), vn0)));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				vb->x=xCoord;
-				vb->y=yCoord;
-				vb->z=  ((float)pMap->getDisplayHeight(getXWithOrigin(i), getYWithOrigin(j)))*MAP_HEIGHT_SCALE;
-				vb->x = ADJUST_FROM_INDEX_TO_REAL(vb->x);
-				vb->y = ADJUST_FROM_INDEX_TO_REAL(vb->y);
-				vb->u1=U[0];
-				vb->v1=V[0];
-				vb->u2=UA[0];
-				vb->v2=VA[0];
-				doTheLight(vb, lightRay, &normalAtTexel, pLightsIterator, alpha[0]);
-				vb++;
-
-				//top-right sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(up1 , getYWithOrigin(j) ) - pMap->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , (getYWithOrigin(j)+cellOffset) ) - pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , vn0 )));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				vb->x=xCoord+cellOffset;
-				vb->y=yCoord;
-				vb->z=  ((float)pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset, getYWithOrigin(j)))*MAP_HEIGHT_SCALE;
-				vb->x = ADJUST_FROM_INDEX_TO_REAL(vb->x);
-				vb->y = ADJUST_FROM_INDEX_TO_REAL(vb->y);
-				vb->u1=U[1];
-				vb->v1=V[1];
-				vb->u2=UA[1];
-				vb->v2=VA[1];
-				doTheLight(vb, lightRay, &normalAtTexel, pLightsIterator, alpha[1]);
-				vb++;
-
-				//bottom-right sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(up1 , (getYWithOrigin(j)+cellOffset) ) - pMap->getDisplayHeight(getXWithOrigin(i) , (getYWithOrigin(j)+cellOffset) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , vp1 ) - pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , getYWithOrigin(j) )));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				vb->x=xCoord+cellOffset;
-				if (yCoord + 1 == pMap->getDrawOrgY() + m_y - 1) { 
-					vb->y=yCoord+1;
-				} else {
-					vb->y=yCoord+cellOffset;
-				}
-				vb->z=  ((float)pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset, getYWithOrigin(j)+cellOffset))*MAP_HEIGHT_SCALE;
-				vb->x = ADJUST_FROM_INDEX_TO_REAL(vb->x);
-				vb->y = ADJUST_FROM_INDEX_TO_REAL(vb->y);
-				vb->u1=U[2];
-				vb->v1=V[2];
-				vb->u2=UA[2];
-				vb->v2=VA[2];
-				doTheLight(vb, lightRay, &normalAtTexel, pLightsIterator, alpha[2]);
-				vb++;
-
-				//bottom-left sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , (getYWithOrigin(j)+cellOffset) ) - pMap->getDisplayHeight(un0 , (getYWithOrigin(j)+cellOffset) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i) , vp1 ) - pMap->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				if (xCoord == pMap->getDrawOrgX()) { 
-					vb->x=xCoord;
-					//if (vb->x < 0) vb->x = 0;
-				} else {
-					vb->x=xCoord;
-				}
-				if (yCoord + 1 == pMap->getDrawOrgY() + m_y - 1) { 
-					vb->y=yCoord+1;
-				} else {
-					vb->y=yCoord+cellOffset;
-				}
-				vb->z=  ((float)pMap->getDisplayHeight(getXWithOrigin(i), getYWithOrigin(j)+cellOffset))*MAP_HEIGHT_SCALE;
-				vb->x = ADJUST_FROM_INDEX_TO_REAL(vb->x);
-				vb->y = ADJUST_FROM_INDEX_TO_REAL(vb->y);
-				vb->u1=U[3];
-				vb->v1=V[3];
-				vb->u2=UA[3];
-				vb->v2=VA[3];
-				doTheLight(vb, lightRay, &normalAtTexel, pLightsIterator, alpha[3]);
-				vb++;
-
-				VERTEX_FORMAT *pCurVertices = vb-4;
-#ifdef FLIP_TRIANGLES // jba - reduces "diamonding" in some cases, not others.  Better cliffs, though.
-				VERTEX_FORMAT tmpVertex;
-				if (flipForBlend) {
-					tmpVertex = pCurVertices[0];
-					pCurVertices[0] = pCurVertices[1];
-					pCurVertices[1] = pCurVertices[2];
-					pCurVertices[2] = pCurVertices[3];
-					pCurVertices[3] = tmpVertex;
-				}
-#endif
-
-				if (m_showImpassableAreas) {
-					// Color impassable cells "red"
-					DEBUG_ASSERTCRASH(PATHFIND_CELL_SIZE_F == MAP_XY_FACTOR, ("Pathfind must be terrain cell size, or this code needs reworking.  John A."));
-					Real borderHiX = (pMap->getXExtent()-2*pMap->getBorderSize())*MAP_XY_FACTOR;
-					Real borderHiY = (pMap->getYExtent()-2*pMap->getBorderSize())*MAP_XY_FACTOR;
-					Bool border = pCurVertices[0].x == -MAP_XY_FACTOR || pCurVertices[0].y == -MAP_XY_FACTOR;
-					Bool cliffMapped = pMap->isCliffMappedTexture(getXWithOrigin(i), getYWithOrigin(j));
-					if (pCurVertices[0].x == borderHiX) {
-						border = true;
-					}
-					if (pCurVertices[0].y == borderHiY) {
-						border = true;
-					}
-					Bool isCliff = pMap->getCliffState(getXWithOrigin(i)+pMap->getDrawOrgX(), getYWithOrigin(j)+pMap->getDrawOrgY())
-												 || showAsVisibleCliff(getXWithOrigin(i) + pMap->getDrawOrgX(), getYWithOrigin(j)+pMap->getDrawOrgY());
-
-					if ( isCliff || border || cliffMapped) {
-						Int cellX, cellY;
-						for (cellX=0; cellX<2; cellX++) {
-							for (cellY=0; cellY<2; cellY++) {
-								Int vertex = cellX+2*cellY;
-								if (border) {
-									Bool doBorder = false;
-									if (pCurVertices[vertex].y >= 0 && pCurVertices[vertex].y <= borderHiY) {
-										if (pCurVertices[vertex].x == 0 || pCurVertices[vertex].x == borderHiX) {
-											doBorder = true;
-										}
-									}
-									if (pCurVertices[vertex].x >= 0 && pCurVertices[vertex].x <= borderHiX) {
-										if (pCurVertices[vertex].y == 0 || pCurVertices[vertex].y == borderHiY) {
-											doBorder = true;
-										}
-									}
-									if (doBorder) {
-										pCurVertices[vertex].diffuse &= 0xFF0000ff; // blue with alpha.
-									}
-								} else if (isCliff) {
-									pCurVertices[vertex].diffuse &= 0xFFFF0000; // red with alpha.
-								}
-								if (cliffMapped && vertex==0) {
-									pCurVertices[vertex].diffuse &= 0xFF000000; // Black.
-									pCurVertices[vertex].diffuse |= 0xff00; // Add green.
-								}
-							}
-						}
-					}
-				}
-
-				// Note - We have been building the vertex buffer in the memory location.
-				// Now copy the set of vertices into the hardware buffer.
-				// We don't copy the whole vertex buffer because we often update only
-				// a couple of rows and its a lot faster to just copy the ones that change.
-				Int offset = pCurVertices - vBase;
-				memcpy(vbHardware+offset, pCurVertices, 4*sizeof(VERTEX_FORMAT));
-			}
-		}
-		return 0; //success.
-	}
-	return -1;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::updateVBForLight
-//=============================================================================
-/** Update the dynamic lighting values only in a rectangular block of the given Vertex Buffer. 
-The vertex locations and texture coords are unchanged.
-*/
-Int HeightMapRenderObjClass::updateVBForLight(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights)
-{
-
-#if (OPTIMIZED_HEIGHTMAP_LIGHTING)	// (gth) if optimizations are enabled, jump over to the "optimized" version of this function.
-	return updateVBForLightOptimized( pVB, data, x0, y0, x1, y1, originX, originY, pLights, numLights );
-#endif	
-	
-	Int i,j,k;
-	Int vn0,un0,vp1,up1;
-	Vector3 l2r,n2f,normalAtTexel;
-	Int	vertsPerRow=(VERTEX_BUFFER_TILE_LENGTH)*4;	//vertices per row of VB
-
-	if (m_vertexBufferTiles && m_map)
-	{
-#ifdef RTS_DEBUG
-		assert(x0 >= originX && y0 >= originY && x1>x0 && y1>y0 && x1<=originX+VERTEX_BUFFER_TILE_LENGTH && y1<=originY+VERTEX_BUFFER_TILE_LENGTH);
-#endif 
-
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
-		VERTEX_FORMAT *vBase = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();
-		VERTEX_FORMAT *vb;
-		
-		for (j=y0; j<y1; j++)
-		{
-			if (m_halfResMesh) {
-				if (j&1) continue;
-			}
-			Int yCoord = getYWithOrigin(j)+m_map->getDrawOrgY()-m_map->getBorderSize();
-			Bool intersect = false;
-			for (k=0; k<numLights; k++) {
-				if (pLights[k]->m_minY <= yCoord+1 && 
-					pLights[k]->m_maxY >= yCoord) {
-					intersect = true;
-				}
-				if (pLights[k]->m_prevMinY <= yCoord+1 && 
-					pLights[k]->m_prevMaxY >= yCoord) {
-					intersect = true;
-				}
-			}
-			if (!intersect) {
-				continue;
-			}
-			vn0 = getYWithOrigin(j)-1;
-			if (vn0 < -m_map->getDrawOrgY())
-				vn0=-m_map->getDrawOrgY();
-			vp1 = getYWithOrigin(j+1)+1;
-			if (vp1 >= m_map->getYExtent()-m_map->getDrawOrgY())
-				vp1=m_map->getYExtent()-m_map->getDrawOrgY()-1;
-
-			for (i=x0; i<x1; i++)
-			{
-				if (m_halfResMesh) {
-					if (i&1) continue;
-				}
-				Int xCoord = getXWithOrigin(i)+m_map->getDrawOrgX()-m_map->getBorderSize();
-				Bool intersect = false;
-				for (k=0; k<numLights; k++) {
-					if (pLights[k]->m_minX <= xCoord+1 && 
-						pLights[k]->m_maxX >= xCoord &&
-						pLights[k]->m_minY <= yCoord+1 && 
-						pLights[k]->m_maxY >= yCoord) {
-						intersect = true;
-					}
-					if (pLights[k]->m_prevMinX <= xCoord+1 && 
-						pLights[k]->m_prevMaxX >= xCoord &&
-						pLights[k]->m_prevMinY <= yCoord+1 && 
-						pLights[k]->m_prevMaxY >= yCoord) {
-						intersect = true;
-					}
-				}
-				if (!intersect) {
-					continue;
-				}
-				// vb is the pointer to the vertex in the hardware dx8 vertex buffer.
-				Int offset = (j-originY)*vertsPerRow+4*(i-originX);
-				if (m_halfResMesh) {
-					offset = (j-originY)*vertsPerRow/4+2*(i-originX);
-				}
-				vb = vBase + offset;	//skip to correct row in vertex buffer
-				// vbMirror is the pointer to the vertex in our memory based copy.
-				// The important point is that we can read out of our copy to get the original
-				// diffuse color, and xyz location.  It is VERY SLOW to read out of the 
-				// hardware vertex buffer, possibly worse... jba.
-				VERTEX_FORMAT *vbMirror = ((VERTEX_FORMAT*)data)  + offset;
-				un0 = getXWithOrigin(i)-1;
-				if (un0 < -m_map->getDrawOrgX())
-					un0=-m_map->getDrawOrgX();
-				up1 = getXWithOrigin(i+1)+1;
-				if (up1 >= m_map->getXExtent()-m_map->getDrawOrgX())
-					up1=m_map->getXExtent()-m_map->getDrawOrgX()-1;
-
-				Vector3 lightRay(0,0,0);
-
-				//top-left sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1, getYWithOrigin(j)) - m_map->getDisplayHeight(un0, getYWithOrigin(j))));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i), (getYWithOrigin(j)+1)) - m_map->getDisplayHeight(getXWithOrigin(i), vn0)));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				vb++;	vbMirror++;
-
-				//top-right sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(up1 , getYWithOrigin(j) ) - m_map->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(getXWithOrigin(i)+1 , vn0 )));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				vb++;	vbMirror++;
-
-				//bottom-right sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(up1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(getXWithOrigin(i) , (getYWithOrigin(j)+1) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , vp1 ) - m_map->getDisplayHeight(getXWithOrigin(i)+1 , getYWithOrigin(j) )));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				vb++;	vbMirror++;
-
-				//bottom-left sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(un0 , (getYWithOrigin(j)+1) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i) , vp1 ) - m_map->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				vb++;	vbMirror++;
-			}
-		}
-		return 0; //success.
-	}
-	return -1;
-}
-
-
-Int HeightMapRenderObjClass::updateVBForLightOptimized(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights)
-{
-	Int i,j,k;
-	Int vn0,un0,vp1,up1;
-	Vector3 l2r,n2f,normalAtTexel;
-	Int	vertsPerRow=(VERTEX_BUFFER_TILE_LENGTH)*4;	//vertices per row of VB
-
-	if (m_vertexBufferTiles && m_map)
-	{
-#ifdef RTS_DEBUG
-		assert(x0 >= originX && y0 >= originY && x1>x0 && y1>y0 && x1<=originX+VERTEX_BUFFER_TILE_LENGTH && y1<=originY+VERTEX_BUFFER_TILE_LENGTH);
-#endif 
-
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
-		VERTEX_FORMAT *vBase = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();
-		VERTEX_FORMAT *vb;
-		
-		//
-		// (gth) the optimization in this function is to take advantage of verts in the same
-		// x,y position who have already computed their lighting.  To do this, we need to set up
-		// some offsets in the vertex buffer.  I've computed these offsets to be consistent with
-		// the formula's that Generals is using but in the case of the "half-res-mesh" I'm not
-		// sure things are correct...
-		//
-		Int quad_right_offset;
-		Int quad_below_offset;
-		Int quad_below_right_offset;
-
-		if (m_halfResMesh == false) {
-			// offset = (j-originY)*vertsPerRow+4*(i-originX);
-			quad_right_offset = 4;
-			quad_below_offset = vertsPerRow;
-			quad_below_right_offset = vertsPerRow + 4;
-
-		} else {
-			// offset = (j-originY)*vertsPerRow/4+2*(i-originX);
-			quad_right_offset = 2;
-			quad_below_offset = vertsPerRow/4;
-			quad_below_right_offset = vertsPerRow/4 + 2;
-		}
-
-		// 
-		// i,j loop over the quads affected by the light.  Each quad has its *own* 4 vertices.  This
-		// means that for any vertex position on the map, there are actually 4 copies of the vertex. 
-		//
-		for (j=y0; j<y1; j++)
-		{
-			if (m_halfResMesh) {
-				if (j&1) continue;
-			}
-			Int yCoord = getYWithOrigin(j)+m_map->getDrawOrgY()-m_map->getBorderSize();
-			Bool intersect = false;
-			for (k=0; k<numLights; k++) {
-				if (pLights[k]->m_minY <= yCoord+1 && 
-					pLights[k]->m_maxY >= yCoord) {
-					intersect = true;
-				}
-				if (pLights[k]->m_prevMinY <= yCoord+1 && 
-					pLights[k]->m_prevMaxY >= yCoord) {
-					intersect = true;
-				}
-			}
-			if (!intersect) {
-				continue;
-			}
-			vn0 = getYWithOrigin(j)-1;
-			if (vn0 < -m_map->getDrawOrgY())
-				vn0=-m_map->getDrawOrgY();
-			vp1 = getYWithOrigin(j+1)+1;
-			if (vp1 >= m_map->getYExtent()-m_map->getDrawOrgY())
-				vp1=m_map->getYExtent()-m_map->getDrawOrgY()-1;
-
-			for (i=x0; i<x1; i++)
-			{
-				if (m_halfResMesh) {
-					if (i&1) continue;
-				}
-				Int xCoord = getXWithOrigin(i)+m_map->getDrawOrgX()-m_map->getBorderSize();
-				Bool intersect = false;
-				for (k=0; k<numLights; k++) {
-					if (pLights[k]->m_minX <= xCoord+1 && 
-						pLights[k]->m_maxX >= xCoord &&
-						pLights[k]->m_minY <= yCoord+1 && 
-						pLights[k]->m_maxY >= yCoord) {
-						intersect = true;
-					}
-					if (pLights[k]->m_prevMinX <= xCoord+1 && 
-						pLights[k]->m_prevMaxX >= xCoord &&
-						pLights[k]->m_prevMinY <= yCoord+1 && 
-						pLights[k]->m_prevMaxY >= yCoord) {
-						intersect = true;
-					}
-				}
-				if (!intersect) {
-					continue;
-				}
-				// vb is the pointer to the vertex in the hardware dx8 vertex buffer.
-				Int offset = (j-originY)*vertsPerRow+4*(i-originX);
-				if (m_halfResMesh) {
-					offset = (j-originY)*vertsPerRow/4+2*(i-originX);
-				}
-				vb = vBase + offset;	//skip to correct row in vertex buffer
-				// vbMirror is the pointer to the vertex in our memory based copy.
-				// The important point is that we can read out of our copy to get the original
-				// diffuse color, and xyz location.  It is VERY SLOW to read out of the 
-				// hardware vertex buffer, possibly worse... jba.
-				VERTEX_FORMAT *vbMirror = ((VERTEX_FORMAT*)data)  + offset;
-				VERTEX_FORMAT *vbaseMirror = ((VERTEX_FORMAT*)data);
-				un0 = getXWithOrigin(i)-1;
-				if (un0 < -m_map->getDrawOrgX())
-					un0=-m_map->getDrawOrgX();
-				up1 = getXWithOrigin(i+1)+1;
-				if (up1 >= m_map->getXExtent()-m_map->getDrawOrgX())
-					up1=m_map->getXExtent()-m_map->getDrawOrgX()-1;
-
-				Vector3 lightRay(0,0,0);
-
-				//
-				// (gth) Following the set of rules below lets us take advantage of lighting values that have
-				// been previously computed.  The idea is to copy them ahead to future quads that will need them
-				// and then not compute them when we get to those quads.  This also avoids having to read-back
-				// from the vertex buffer but we do jump around in memory... probably bad anyway, maybe we should
-				// compute into a temporary buffer and copy all at once...
-				//
-				unsigned long light_copy;
-
-				// top-left sample -> only compute when i==0 and j==0 
-				if ((i==x0) && (j==y0)) {
-					l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1, getYWithOrigin(j)) - m_map->getDisplayHeight(un0, getYWithOrigin(j))));
-					n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i), (getYWithOrigin(j)+1)) - m_map->getDisplayHeight(getXWithOrigin(i), vn0)));
-					Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-					doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				} 
-				vb++;	vbMirror++;
-
-				//top-right sample -> compute when j==0, then copy to (right,0)
-				if (j==y0) {
-					l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(up1 , getYWithOrigin(j) ) - m_map->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
-					n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(getXWithOrigin(i)+1 , vn0 )));
-					Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-					light_copy = doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				
-					if (i < x1-1) {
-						// copy light to (right,0)
-						(vBase + offset + quad_right_offset)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_right_offset)->diffuse&0xff000000) ;
-					}
-				} 
-				vb++;	vbMirror++;
-
-				//bottom-right sample -> always compute, then copy to (right,3), (down,1), (down+right,0)
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(up1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(getXWithOrigin(i) , (getYWithOrigin(j)+1) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , vp1 ) - m_map->getDisplayHeight(getXWithOrigin(i)+1 , getYWithOrigin(j) )));
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-				light_copy = doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				
-				if (i < x1-1) {
-					// copy light to (right,3)
-					//(vBase + offset + quad_right_offset + 3)->diffuse = light_copy;
-					(vBase + offset + quad_right_offset + 3)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_right_offset + 3)->diffuse&0xff000000) ;
-				}
-				if (j < y1-1) {
-					// copy light to (down,1)
-					//(vBase + offset + quad_below_offset + 1)->diffuse = light_copy;
-					(vBase + offset + quad_right_offset + 1)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_right_offset + 1)->diffuse&0xff000000) ;
-				}
-				if ((i < x1-1) && (j < y1-1)) {
-					// copy light to (right+down,0)
-					//(vBase + offset + quad_below_right_offset)->diffuse = light_copy;
-					(vBase + offset + quad_right_offset)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_right_offset)->diffuse&0xff000000) ;
-				}
-				vb++;	vbMirror++;
-
-				//bottom-left sample -> compute when i==0, otherwise copy from (left,2)
-				if (i==x0) {
-					l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(un0 , (getYWithOrigin(j)+1) )));
-					n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i) , vp1 ) - m_map->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
-					Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-					light_copy = doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-
-					if (j < y1-1) {
-						// copy light to (down,0)
-						//(vBase + offset + quad_below_offset)->diffuse = light_copy;
-						(vBase + offset + quad_below_offset)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_below_offset)->diffuse&0xff000000) ;
-					}
-				} 
-				vb++;	vbMirror++;
-			}
-		}
-		return 0; //success.
-	}
-	return -1;
-}
-
-
-
-//=============================================================================
-// HeightMapRenderObjClass::doPartialUpdate
-//=============================================================================
-/** Updates a partial block of vertices from [x0,y0 to x1,y1]
-The coordinates in partialRange are map cell coordinates, relative to the entire map.
-The vertex coordinates and texture coordinates, as well as static lighting are updated.
-*/
-void HeightMapRenderObjClass::doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator)
-{	
-	// Adjust range into the current drawn map range.
-	Int minX = partialRange.lo.x - htMap->getDrawOrgX();
-	Int maxX = partialRange.hi.x - htMap->getDrawOrgX();
-	Int minY = partialRange.lo.y - htMap->getDrawOrgY();
-	Int maxY = partialRange.hi.y - htMap->getDrawOrgY();
-	if (minX<0) minX = 0;
-	if (minY<0) minY = 0;
-	if (maxX > m_x-1) maxX = m_x-1;
-	if (maxY > m_y-1) maxY = m_y-1;
-	if (maxX < minX) return;
-	if (maxY < minY) return;
-	if (m_originX == 0 && m_originY == 0) {
-		// simple case.
-		updateBlock(minX, minY, maxX, maxY,
-								htMap, pLightsIterator);
-	}
-	else
-	{
-		minY = minY+m_originY;
-		maxY = maxY+m_originY;
-
-		if (minY> m_y-1) {
-			minY -= m_y-1;
- 			maxY -= m_y-1;
-		}
-		if (maxY > m_y-1) {
-			maxY -= m_y-1;
-			updateBlock(0, minY, m_x-1, m_y-1, htMap, pLightsIterator);
-			updateBlock(0, 0, m_x-1, maxY, htMap, pLightsIterator);
-		} else {
-			updateBlock(0, minY, m_x-1, maxY, htMap, pLightsIterator);
-		}
-	}
-
-	if (!m_extraBlendTilePositions)
-	{	//Need to allocate memory
-		m_extraBlendTilePositions = NEW Int[DEFAULT_MAX_MAP_EXTRABLEND_TILES];
-		m_extraBlendTilePositionsSize = DEFAULT_MAX_MAP_EXTRABLEND_TILES;
-	}
-	
-	//Find list of all extra blend tiles used on map.  These are tiles with 3 materials/textures
-	//over the same tile and require an extra render pass.
-
-	Int i, j;
-	//First remove any existing extra blend tiles within this partial region
-	for (j=0; j<m_numExtraBlendTiles; j++)
-	{	Int x = m_extraBlendTilePositions[j] & 0xffff;
-		Int y = m_extraBlendTilePositions[j] >> 16;
-		if (x >= partialRange.lo.x && x < partialRange.hi.x &&
-			y >= partialRange.lo.y && y < partialRange.hi.y)
-		{	//this tile is inside region being updated so remove it by shifting tile array
-			memcpy(m_extraBlendTilePositions+j,m_extraBlendTilePositions+j+1,(m_numExtraBlendTiles-1-j)*sizeof(Int));
-			m_numExtraBlendTiles--;
-			j--;	//need to look at index j again because this tile was removed
-		}
-	}
-
-	for (j=partialRange.lo.y; j<partialRange.hi.y; j++)
-		for (i=partialRange.lo.x; i<partialRange.hi.x; i++)
-		{
-			if (j<0 || i<0) continue;
-			Real U[4],V[4];
-			UnsignedByte alpha[4];
-			Bool flipState,cliffState;
-			if (htMap->getExtraAlphaUVData(i,j,U,V,alpha,&flipState, &cliffState))
-			{	if (m_numExtraBlendTiles >= m_extraBlendTilePositionsSize)
-				{	//no more room to store extra blend tiles so enlarge the buffer.
-					Int *tempPositions=NEW Int[m_extraBlendTilePositionsSize+512];
-					memcpy(tempPositions, m_extraBlendTilePositions, m_extraBlendTilePositionsSize*sizeof(Int));
-					delete [] m_extraBlendTilePositions;
-					//enlarge by more tiles to reduce memory trashing
-					m_extraBlendTilePositions = tempPositions;
-					m_extraBlendTilePositionsSize += 512;
-				}
-				//Pack x and y position into single integer since maps are limited in size
-				m_extraBlendTilePositions[m_numExtraBlendTiles]=i | (j <<16);
-				m_numExtraBlendTiles++;
-			}
-		}
-	updateShorelineTiles(partialRange.lo.x,partialRange.lo.y,partialRange.hi.x,partialRange.hi.y,htMap);
-
-	updateViewImpassableAreas(TRUE, minX, maxX, minY, maxY);
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::updateBlock
-//=============================================================================
-/** Updates a block of vertices from [x0,y0 to x1,y1]
-The vertex coordinates and texture coordinates, as well as static lighting are updated.
-*/
-Int HeightMapRenderObjClass::updateBlock(Int x0, Int y0, Int x1, Int y1,  WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator)
-{	
-#ifdef RTS_DEBUG
-	DEBUG_ASSERTCRASH(x0>=0&&y0>=0 && x1<m_x && y1<m_y && x0<=x1 && y0<=y1, ("Invalid updates."));
-#endif
-	Invalidate_Cached_Bounding_Volumes();
-	if (pMap && m_treeBuffer != NULL) {
-		REF_PTR_SET(m_stageZeroTexture, pMap->getTerrainTexture());
-		REF_PTR_SET(m_stageOneTexture, pMap->getAlphaTerrainTexture());
-	}
-
-	Int i,j;
-	DX8VertexBufferClass	**pVB;
-	Int originX,originY;
-	//step through each vertex buffer that needs updating
-	for (j=0; j<m_numVBTilesY; j++)
-	{
-		originY=j*VERTEX_BUFFER_TILE_LENGTH;	//location of this VB on the large full-size heightmap
-		Int yMin, yMax;
-		yMin = originY;
-		if (y0>yMin) yMin = y0;
-		yMax = originY+VERTEX_BUFFER_TILE_LENGTH;
-		if (y1<yMax) yMax = y1;
-		if (yMin >= yMax) {
-			continue;
-		}
-		for (i=0; i<m_numVBTilesX; i++)
-		{	
-			originX=i*VERTEX_BUFFER_TILE_LENGTH;	//location of this VB on the large full-size heightmap
-			Int xMin, xMax;
-			xMin = originX;
-			if (xMin<x0) xMin = x0;
-			xMax = originX+VERTEX_BUFFER_TILE_LENGTH;
-			if (xMax>x1) xMax = x1;
-			if (xMin >= xMax) {
-				continue;
-			}
-			pVB=m_vertexBufferTiles+j*m_numVBTilesX+i;	//point to correct row/column of vertex buffers 
-			char **pData = m_vertexBufferBackup+j*m_numVBTilesX+i;
-			updateVB(*pVB, *pData, xMin, yMin, xMax, yMax, originX, originY, pMap, pLightsIterator);
-		}
-	}
-
-	return 0;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::getTileBoundingBox
-//=============================================================================
-/** Calculate the bounding box for given terrain tile.  Right now each terrain tile is equivalent
-to one of the vertex buffers holding heightmap vertices. */
-//=============================================================================
-AABoxClass & HeightMapRenderObjClass::getTileBoundingBox(AABoxClass *aabox, Int x, Int y)
-{
-	Vector3 vmin;
-	Vector3 vmax;
-	Int xOffset = 0;
-	Int yOffset = 0;
-	if (m_map) {
-		xOffset = m_map->getDrawOrgX();
-		yOffset = m_map->getDrawOrgY();
-	}
-
-	vmin.Set(x*VERTEX_BUFFER_TILE_LENGTH+xOffset,y*VERTEX_BUFFER_TILE_LENGTH+yOffset,m_minHeight);
-	vmax.Set((x+1)*VERTEX_BUFFER_TILE_LENGTH+xOffset,(y+1)*VERTEX_BUFFER_TILE_LENGTH+yOffset,m_maxHeight);
-
-	aabox->Init_Min_Max(vmin,vmax);
-	return *aabox;
-}
-
-#ifdef DO_SCORCH
-//=============================================================================
-// HeightMapRenderObjClass::drawScorches
-//=============================================================================
-/** Draws the scorch marks. */
-//=============================================================================
-void HeightMapRenderObjClass::drawScorches(void)
-{
-	updateScorches();
-	if (m_curNumScorchIndices == 0) {
-		return;
-	}
-	DX8Wrapper::Set_Index_Buffer(m_indexScorch,0);
-	DX8Wrapper::Set_Vertex_Buffer(m_vertexScorch);
-
-	DX8Wrapper::Set_Texture(0,m_scorchTexture);
-	if (Is_Hidden() == 0) {
-		DX8Wrapper::Draw_Triangles(	0,m_curNumScorchIndices/3, 0,	m_curNumScorchVertices);
-	}
-}
-#endif
-
-
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// HeightMapRenderObjClass::~HeightMapRenderObjClass
-//=============================================================================
-/** Destructor. Releases w3d assets. */
-//=============================================================================
-HeightMapRenderObjClass::~HeightMapRenderObjClass(void)
-{
-	freeMapResources();
-	if (m_treeBuffer) {
-		delete m_treeBuffer;
- 		m_treeBuffer = NULL;
-	}
-	if (m_bibBuffer) {
-		delete m_bibBuffer;
- 		m_bibBuffer = NULL;
-	}
-#ifdef TEST_CUSTOM_EDGING
-	if (m_customEdging) {
-		delete m_customEdging;
- 		m_customEdging = NULL;
-	}
-#endif
-#ifdef DO_ROADS
-	if (m_roadBuffer) {
-		delete m_roadBuffer;
- 		m_roadBuffer = NULL;
-	}
-#endif
-	if (m_bridgeBuffer) {
-		delete m_bridgeBuffer;
-	}
-
-	if( m_waypointBuffer )
-	{
-		delete m_waypointBuffer;
-	}
-	if (m_shroud) {
-		delete m_shroud;
-	}
-	if (m_extraBlendTilePositions)
-		delete [] m_extraBlendTilePositions;
-	if (m_shoreLineTilePositions)
-		delete [] m_shoreLineTilePositions;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::HeightMapRenderObjClass
-//=============================================================================
-/** Constructor. Mostly nulls out the member variables. */
-//=============================================================================
-HeightMapRenderObjClass::HeightMapRenderObjClass(void)
-{
-	m_x=0;
-	m_y=0;
-	m_needFullUpdate = false;
-	m_showImpassableAreas = false;
-	m_originX = 0;
-	m_originY = 0;
-	m_updating = false;
-	//Set height to the maximum value that can be stored.
-	//We should refine this with actual value.
-	m_maxHeight=(pow(256.0, sizeof(HeightSampleType))-1.0)*MAP_HEIGHT_SCALE;
-	m_minHeight=0;
-	m_numExtraBlendTiles=0;
-	m_extraBlendTilePositions=NULL;
-	m_extraBlendTilePositionsSize=0;
-	m_shoreLineTilePositions=NULL;
-	m_numShoreLineTiles=0;
-	m_shoreLineTilePositionsSize=0;
-	m_currentMinWaterOpacity = -1.0f;
-
-	m_numVertexBufferTiles=0;
-	m_indexBuffer=NULL;
-	m_vertexMaterialClass=NULL;
-#ifdef PRE_TRANSFORM_VERTEX
-	m_xformedVertexBuffer = NULL;
-#endif
-	m_stageZeroTexture=NULL;
-	m_stageOneTexture=NULL;
-	m_stageTwoTexture=NULL;
-	m_stageThreeTexture=NULL;
-	m_destAlphaTexture=NULL;
-	m_vertexBufferTiles=NULL;
-	m_vertexBufferBackup=NULL;
-	m_map=NULL;
-	m_depthFade.X = 0.0f;
-	m_depthFade.Y = 0.0f;
-	m_depthFade.Z = 0.0f;
-	m_useDepthFade = false;
-	m_disableTextures = false;
-	TheTerrainRenderObject = this;
-
-	m_treeBuffer = NULL;
-	m_bibBuffer = NULL;
-#ifdef TEST_CUSTOM_EDGING
-	m_customEdging = NULL;
-#endif
-	m_bridgeBuffer = NULL;
-	m_waypointBuffer = NULL;
-#ifdef DO_ROADS
-	m_roadBuffer = NULL;
-#endif
-#ifdef DO_SCORCH
-	m_vertexScorch = NULL;
-	m_indexScorch = NULL;
-	m_scorchTexture = NULL;
-	clearAllScorches();
-	m_shroud = NULL;
-#endif
-	m_bridgeBuffer = NEW W3DBridgeBuffer;
-
-	if (TheGlobalData->m_headless)
-		return;
-
-	m_treeBuffer = NEW W3DTreeBuffer;
-
-	m_bibBuffer = NEW W3DBibBuffer;
-
-	m_curImpassableSlope = 45.0f;	// default to 45 degrees.
-
-#ifdef TEST_CUSTOM_EDGING
-	m_customEdging = NEW W3DCustomEdging;
-#endif
-	m_waypointBuffer = NEW W3DWaypointBuffer;
-#ifdef DO_ROADS
-	m_roadBuffer = NEW W3DRoadBuffer;
-#endif
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_shroudOn)
-		m_shroud = NEW W3DShroud;
-#else
-	m_shroud = NEW W3DShroud;
-#endif
-	DX8Wrapper::SetCleanupHook(this);
-}
-
-
-//=============================================================================
-// HeightMapRenderObjClass::adjustTerrainLOD
-//=============================================================================
-/** Adjust the terrain Level Of Detail.  If adj > 0 , increases LOD 1 step, if 
-adj < 0 decreases it one step, if adj==0, then just sets up for the current LOD */
-//=============================================================================
-void HeightMapRenderObjClass::adjustTerrainLOD(Int adj) 
-{
-	if (adj>0 && TheGlobalData->m_terrainLOD<TERRAIN_LOD_MAX) TheWritableGlobalData->m_terrainLOD=(TerrainLOD)(TheGlobalData->m_terrainLOD+1);
-	if (adj<0 && TheGlobalData->m_terrainLOD>TERRAIN_LOD_MIN) TheWritableGlobalData->m_terrainLOD=(TerrainLOD)(TheGlobalData->m_terrainLOD-1);
-
-	switch (TheGlobalData->m_terrainLOD) {
-		case	TERRAIN_LOD_MIN: TheWritableGlobalData->m_useCloudMap = false;
-									TheWritableGlobalData->m_useLightMap = false ;
-									TheWritableGlobalData->m_useWaterPlane = false;
-									TheWritableGlobalData->m_stretchTerrain = false;
-									TheWritableGlobalData->m_useHalfHeightMap = true;
-									break;
-		case TERRAIN_LOD_HALF_CLOUDS: TheWritableGlobalData->m_useCloudMap = true;
-									TheWritableGlobalData->m_useLightMap = true;
-									TheWritableGlobalData->m_useWaterPlane = false;
-									TheWritableGlobalData->m_stretchTerrain = false;
-									TheWritableGlobalData->m_useHalfHeightMap = true;
-									break;
-		case TERRAIN_LOD_STRETCH_NO_CLOUDS: TheWritableGlobalData->m_useCloudMap = false;
-									TheWritableGlobalData->m_useLightMap = false;
-									TheWritableGlobalData->m_useWaterPlane = false;
-									TheWritableGlobalData->m_stretchTerrain = true;
-									TheWritableGlobalData->m_useHalfHeightMap = false;
-									break;
-		case TERRAIN_LOD_STRETCH_CLOUDS: TheWritableGlobalData->m_useCloudMap = true;
-									TheWritableGlobalData->m_useLightMap = true;
-									TheWritableGlobalData->m_useWaterPlane = false;
-									TheWritableGlobalData->m_stretchTerrain = true;
-									TheWritableGlobalData->m_useHalfHeightMap = false;
-									break;
-		case TERRAIN_LOD_NO_CLOUDS: TheWritableGlobalData->m_useCloudMap = false;
-									TheWritableGlobalData->m_useLightMap = false;
-									TheWritableGlobalData->m_useWaterPlane = false;
-									TheWritableGlobalData->m_stretchTerrain = false;
-									TheWritableGlobalData->m_useHalfHeightMap = false;
-									break;
-		default:
-		case TERRAIN_LOD_NO_WATER: TheWritableGlobalData->m_useCloudMap = true;
-									TheWritableGlobalData->m_useLightMap = true;
-									TheWritableGlobalData->m_useWaterPlane = false;
-									TheWritableGlobalData->m_stretchTerrain = false;
-									TheWritableGlobalData->m_useHalfHeightMap = false;
-									break;
-		case TERRAIN_LOD_MAX: TheWritableGlobalData->m_useCloudMap = true;
-									TheWritableGlobalData->m_useLightMap = true;
-									TheWritableGlobalData->m_useWaterPlane = true;
-									TheWritableGlobalData->m_stretchTerrain = false;
-									TheWritableGlobalData->m_useHalfHeightMap = false;
-									break;
-	}
-	if (m_map==NULL) return;
-	m_map->setDrawOrg(m_map->getDrawOrgX(), m_map->getDrawOrgX());
-	if (m_shroud)
-		m_shroud->reset();	//need reset here since initHeightData will load new shroud.
-	this->initHeightData(m_map->getDrawWidth(), 
-											m_map->getDrawHeight(), m_map, NULL);
-	staticLightingChanged();
-	if (TheTacticalView) {
-		TheTacticalView->setAngle(TheTacticalView->getAngle() + 1);
-		TheTacticalView->setAngle(TheTacticalView->getAngle() - 1);
-	}
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::ReleaseResources
-//=============================================================================
-/** Releases all w3d assets, to prepare for Reset device call. */
-//=============================================================================
-void HeightMapRenderObjClass::ReleaseResources(void)
-{
-	if (m_treeBuffer) {
-		m_treeBuffer->freeTreeBuffers();
-	}
-	if (m_bibBuffer) {
-		m_bibBuffer->freeBibBuffers();
-	}
-#ifdef TEST_CUSTOM_EDGING
-	if (m_customEdging)
-		m_customEdging ->freeEdgingBuffers();
-#endif
-	if (m_bridgeBuffer) {
-		m_bridgeBuffer->freeBridgeBuffers();
-	}
-
-	if( m_waypointBuffer )
-	{
-		m_waypointBuffer->freeWaypointBuffers();
-	}
-	// We need to save the map.
-	WorldHeightMap *pMap=NULL;
-	REF_PTR_SET(pMap, m_map);
-	freeMapResources();
-	m_map = pMap; // ref_ptr_set has already incremented the ref count.
-	if (TheWaterRenderObj)
-		TheWaterRenderObj->ReleaseResources();
-	if (TheTerrainTracksRenderObjClassSystem)
-		TheTerrainTracksRenderObjClassSystem->ReleaseResources();
-	if (TheW3DShadowManager)
-		TheW3DShadowManager->ReleaseResources();
-	if (m_shroud)
-	{	m_shroud->reset();
-		m_shroud->ReleaseResources();
-	}
-
-	//Release any resources that may be used by custom pixel/vertex shaders
-	W3DShaderManager::shutdown();
-#ifdef DO_ROADS
-	if (m_roadBuffer) {
-		m_roadBuffer->freeRoadBuffers();
-	}		  
-#endif
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::ReAcquireResources
-//=============================================================================
-/** Reallocates all W3D assets after a reset.. */
-//=============================================================================
-void HeightMapRenderObjClass::ReAcquireResources(void)
-{
-	W3DShaderManager::init();	//reaquire resources which may be needed by custom shaders
-
-	if (TheWaterRenderObj)
-		TheWaterRenderObj->ReAcquireResources();
-
-	if (TheTerrainTracksRenderObjClassSystem)
-		TheTerrainTracksRenderObjClassSystem->ReAcquireResources();
-
-	if (TheW3DShadowManager)
-		TheW3DShadowManager->ReAcquireResources();
-	if (m_shroud)
-		m_shroud->ReAcquireResources();
-
-	Int x = m_x;
-	Int y = m_y;
-
-	if (m_map)
-	{
-		this->initHeightData(x,y,m_map, NULL);
-		// Tell lights to update next time through.
-		m_needFullUpdate = true;
-	}
-
-	if (m_treeBuffer) {
-		m_treeBuffer->allocateTreeBuffers();
-	}
-	if (m_bibBuffer) {
-		m_bibBuffer->allocateBibBuffers();
-	}
-#ifdef TEST_CUSTOM_EDGING
-	if (m_customEdging)
-		m_customEdging ->allocateEdgingBuffers();
-#endif
-	if (m_bridgeBuffer) {
-		m_bridgeBuffer->allocateBridgeBuffers();
-	}
-
-	//Waypoint buffers are done dynamically. One line, one node (just rendered multiple times accessing other data).
-	//Internally creates it if needed.
-
-#ifdef DO_ROADS
-	if (m_roadBuffer) {
-		m_roadBuffer->allocateRoadBuffers();
-		m_roadBuffer->loadRoads();
-	}
-#endif
-
-	if (TheTacticalView)
-	{	TheTacticalView->forceRedraw();	//force map to update itself for the current camera position.
-		//for some reason we need to do it twice otherwise we sometimes end up with a black map until
-		//the player moves.
-		TheTacticalView->forceRedraw();
-	}
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::updateMacroTexture
-//=============================================================================
-/** Updates the macro noise/lightmap texture (pass 3) */
-//=============================================================================
-void HeightMapRenderObjClass::updateMacroTexture(AsciiString textureName)
-{
-	m_macroTextureName = textureName;
-	// Release texture.
-	REF_PTR_RELEASE(m_stageThreeTexture);
-	// Reallocate texture.
-	m_stageThreeTexture=NEW LightMapTerrainTextureClass(m_macroTextureName);	
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::reset
-//=============================================================================
-/** Updates the macro noise/lightmap texture (pass 3) */
-//=============================================================================
-void HeightMapRenderObjClass::reset(void)
-{
-	if (m_treeBuffer) {
-		m_treeBuffer->clearAllTrees();
-	}
-	clearAllScorches();
-#ifdef TEST_CUSTOM_EDGING
-	if (m_customEdging)
-		m_customEdging ->clearAllEdging();
-#endif
-#ifdef DO_ROADS
-	if (m_roadBuffer) {
-		m_roadBuffer->clearAllRoads();
-	}
-#endif
-	if (m_bridgeBuffer) {
-		m_bridgeBuffer->clearAllBridges();
-	}
-
-	if (m_bibBuffer) {
-		m_bibBuffer->clearAllBibs();
-	}
-
-	m_showAsVisibleCliff.clear();
-
-	if (m_shroud)
-	{	m_shroud->reset();
-		m_shroud->setBorderShroudLevel((W3DShroudLevel)TheGlobalData->m_shroudAlpha);	//assume border is always black at start.
-	}
-}
-
-/**@todo: Ray intersection needs to be optimized with some sort of grid-tracing
-(ala line drawing).  We should also try making the search in a front->back order
-relative to the ray so we can early exit as soon as we have a hit.
-*
-//=============================================================================
-// HeightMapRenderObjClass::Cast_Ray
-//=============================================================================
-/** Return intersection of a ray with the heightmap mesh.
-This is a quick version that just checks every polygon inside
-a 2D bounding rectangle of the ray projected onto the heightfield plane.
-For most of our view-picking cases the ray in almost perpendicular to the
-map plane so this is very quick (small bounding box).  But it can become slow
-for arbitrary rays such as those used in AI visbility checks.(2 units on
-opposite corners of the map would check every polygon in the map).
-*/
-//=============================================================================
-bool HeightMapRenderObjClass::Cast_Ray(RayCollisionTestClass & raytest)
-{
-	TriClass tri;
-	Bool hit = false;
-	Int X,Y;
-	Vector3 normal,P0,P1,P2,P3;
-
-	if (!m_map)
-		return false;	//need valid pointer to heightmap samples
-//HeightSampleType *pData = m_map->getDataPtr();
-	//Clip ray to extents of heightfield
-	AABoxClass hbox;
-	LineSegClass lineseg,lineseg2;
-	CastResultStruct	result;
-	Int StartCellX = 0;
-	Int EndCellX = 0;
- 	Int StartCellY = 0;
-	Int EndCellY = 0;
-	const Int overhang = 2*VERTEX_BUFFER_TILE_LENGTH+m_map->getBorderSize(); // Allow picking past the edge for scrolling & objects.
- 	Vector3 minPt(MAP_XY_FACTOR*(-overhang), MAP_XY_FACTOR*(-overhang), -MAP_XY_FACTOR);
-	Vector3 maxPt(MAP_XY_FACTOR*(m_map->getXExtent()+overhang), 
-		MAP_XY_FACTOR*(m_map->getYExtent()+overhang), MAP_HEIGHT_SCALE*m_map->getMaxHeightValue()+MAP_XY_FACTOR);
-	MinMaxAABoxClass mmbox(minPt, maxPt);
-	hbox.Init(mmbox);
-
-	lineseg=raytest.Ray;
-
-	//Set initial ray endpoints
-	P0 = raytest.Ray.Get_P0();
-	P1 = raytest.Ray.Get_P1();
-	result.ComputeContactPoint=true;
-
-	Int p;
-	for (p=0; p<3; p++) {
-		//find intersection point of ray and terrain bounding box
-		result.Reset();
-		result.ComputeContactPoint=true;
-		if (CollisionMath::Collide(lineseg,hbox,&result))
-		{	//ray intersects terrain or starts inside the terrain.
-			if (!result.StartBad)	//check if start point inside terrain
-				P0 = result.ContactPoint;			//make intersection point the new start of the ray.
-
-			//reverse direction of original ray and clip again to extent of
-			//heightmap
-			result.Fraction=1.0f;	//reset the result
-			result.StartBad=false;
-			lineseg2.Set(lineseg.Get_P1(),lineseg.Get_P0());	//reverse line segment
-			if (CollisionMath::Collide(lineseg2,hbox,&result))
-			{	if (!result.StartBad)	//check if end point inside terrain
-					P1 = result.ContactPoint;	//make intersection point the new end pont of ray
-			}
-		} else {
-			if (p==0) return(false);
-			break;
-		}
-
-		// Take the 2D bounding box of ray and check heights
-		// inside this box for intersection.
-		if (P0.X > P1.X) {	//flip start/end points
-			StartCellX = REAL_TO_INT_FLOOR(P1.X/MAP_XY_FACTOR);
-			EndCellX = REAL_TO_INT_CEIL(P0.X/MAP_XY_FACTOR);
-		}	else {
-			StartCellX = REAL_TO_INT_FLOOR(P0.X/MAP_XY_FACTOR);
-			EndCellX = REAL_TO_INT_CEIL(P1.X/MAP_XY_FACTOR);
-		}
-		if (P0.Y > P1.Y) {	//flip start/end points
-			StartCellY = REAL_TO_INT_FLOOR(P1.Y/MAP_XY_FACTOR);
-			EndCellY = REAL_TO_INT_CEIL(P0.Y/MAP_XY_FACTOR);
-		}	else {
-			StartCellY = REAL_TO_INT_FLOOR(P0.Y/MAP_XY_FACTOR);
-			EndCellY = REAL_TO_INT_CEIL(P1.Y/MAP_XY_FACTOR);
-		}
-
-		Int i, j, minHt, maxHt;
-
-		minHt = m_map->getMaxHeightValue();
-		maxHt = 0;
-
-		for (j=StartCellY; j<=EndCellY; j++) {
-			for (i=StartCellX; i<=EndCellX; i++) {
-				Short cur = getClipHeight(i+m_map->getBorderSize(),j+m_map->getBorderSize());
-				if (cur<minHt) minHt = cur;
-				if (maxHt<cur) maxHt = cur;
-			}
-		}
-		Vector3 minPt(MAP_XY_FACTOR*(StartCellX-1), MAP_XY_FACTOR*(StartCellY-1), MAP_HEIGHT_SCALE*(minHt-1));
-		Vector3 maxPt(MAP_XY_FACTOR*(EndCellX+1), MAP_XY_FACTOR*(EndCellY+1), MAP_HEIGHT_SCALE*(maxHt+1));
-		MinMaxAABoxClass mmbox(minPt, maxPt);
-		hbox.Init(mmbox);
-	}
-
-	raytest.Result->ComputeContactPoint=true;	//tell CollisionMath that we need point.
-
-	// Adjust indexes into the bordered height map.
-
-	StartCellX += m_map->getBorderSize();
-	EndCellX += m_map->getBorderSize();
-	StartCellY += m_map->getBorderSize();
-	EndCellY += m_map->getBorderSize();
-
-	Int offset;
-	for (offset = 1; offset < 5; offset *= 3) {
-		for (Y=StartCellY-offset; Y<=EndCellY+offset; Y++) { 
-			//if (Y<0) continue;
-			//if (Y>=m_map->getYExtent()-1) continue;
-
-			for (X=StartCellX-offset; X<=EndCellX+offset; X++) {
-				//test the 2 triangles in this cell
-				//	3-----2
-				//  |    /|
-				//  |  /  |
-				//	|/    |
-				//  0-----1
-
-				//bottom triangle first
-				P0.X=ADJUST_FROM_INDEX_TO_REAL(X);
-				P0.Y=ADJUST_FROM_INDEX_TO_REAL(Y);
-				P0.Z=MAP_HEIGHT_SCALE*(float)getClipHeight(X, Y);
-
-				P1.X=ADJUST_FROM_INDEX_TO_REAL(X+1);
-				P1.Y=ADJUST_FROM_INDEX_TO_REAL(Y);
-				P1.Z=MAP_HEIGHT_SCALE*(float)getClipHeight(X+1, Y);
-
-				P2.X=ADJUST_FROM_INDEX_TO_REAL(X+1);
-				P2.Y=ADJUST_FROM_INDEX_TO_REAL(Y+1);
-				P2.Z=MAP_HEIGHT_SCALE*(float)getClipHeight(X+1, Y+1);
-
-				P3.X=ADJUST_FROM_INDEX_TO_REAL(X);
-				P3.Y=ADJUST_FROM_INDEX_TO_REAL(Y+1);
-				P3.Z=MAP_HEIGHT_SCALE*(float)getClipHeight(X, Y+1);
-
-
-				tri.V[0] = &P0; 
-				tri.V[1] = &P1;
-				tri.V[2] = &P2;
-				
-				tri.N = &normal;
-
-				tri.Compute_Normal();
-
-				hit = hit || (Bool)CollisionMath::Collide(raytest.Ray, tri, raytest.Result);
-
-				if (raytest.Result->StartBad)
-					return true;
-
-				//top triangle
-				tri.V[0] = &P2; 
-				tri.V[1] = &P3;
-				tri.V[2] = &P0;
-				
-				tri.N = &normal;
-
-				tri.Compute_Normal();
-
-				hit = hit || (Bool)CollisionMath::Collide(raytest.Ray, tri, raytest.Result);
-
-				if (hit)
-					raytest.Result->SurfaceType = SURFACE_TYPE_DEFAULT;	///@todo: WW3D uses this to return dirt, grass, etc.  Do we need this?
-			}
-			// Don't break.  It is possible to intersect 2 triangles, and the second is closer. if (hit) break;
-		}
-		// Don't break.  It is possible to intersect 2 triangles, and the second is closer. if (hit) break;
-	}
-	return hit;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::getHeightMapHeight
-//=============================================================================
-/** return the height and normal of the triangle plane containing given location within heightmap. */
-//=============================================================================
-Real HeightMapRenderObjClass::getHeightMapHeight(Real x, Real y, Coord3D* normal) const
-{
-	if (m_map == NULL)
-	{
-		if (normal)
-		{	
-			// return a default normal pointing up
-			normal->x = 0.0f;
-			normal->y = 0.0f;
-			normal->z = 1.0f;
-		}
-		return 0;
-	}
-
-	float height;
-
-	//	3-----2
-	//  |    /|
-	//  |  /  |
-	//	|/    |
-	//  0-----1
-	//Find surrounding grid points
-	
-	const Real MAP_XY_FACTOR_INV = 1.0f / MAP_XY_FACTOR;
-
-	float xdiv = x * MAP_XY_FACTOR_INV;
-	float ydiv = y * MAP_XY_FACTOR_INV;
-
-	float ixf = floorf(xdiv);
-	float iyf = floorf(ydiv);
-
-	float fx = xdiv - ixf; //get fraction
-	float fy = ydiv - iyf; //get fraction
-
-	// since ixf & iyf are already floor'ed, we can use the fastest f->i conversion we have...
-	Int	ix = REAL_TO_INT_FLOOR(ixf) + m_map->getBorderSize();
-	Int	iy = REAL_TO_INT_FLOOR(iyf) + m_map->getBorderSize();
-	Int xExtent = m_map->getXExtent();
-
-	// Check for extent-3, not extent-1: we go into the next row/column of data for smoothed triangle points, so extent-1
-	// goes off the end...
-	if (ix > (xExtent-3) || iy > (m_map->getYExtent()-3) || iy < 1 || ix < 1)
-	{	
-		// sample point is not on the heightmap
-		if (normal)
-		{	
-			// return a default normal pointing up
-			normal->x = 0.0f;
-			normal->y = 0.0f;
-			normal->z = 1.0f;
-		}
-		return getClipHeight(ix, iy) * MAP_HEIGHT_SCALE;
-	}
-
-	const UnsignedByte* data = m_map->getDataPtr();
-	int idx = ix + iy*xExtent;
-	float p0 = data[idx];
-	float p2 = data[idx + xExtent + 1];
-	if (fy > fx) // test if we are in the upper triangle
-	{	
-		float p3 = data[idx + xExtent];
-		height = (p3 + (1.0f-fy)*(p0-p3) + fx*(p2-p3)) * MAP_HEIGHT_SCALE;
-	}
-	else
-	{	
-		// we are in the lower triangle
-		float p1 = data[idx + 1];
-		height = (p1 + fy*(p2-p1) + (1.0f-fx)*(p0-p1)) * MAP_HEIGHT_SCALE;
-	}
-	if (normal) {
-		//		9		  8
-		//
-		//10	3-----2		7
-		//	  |    /|
-		//	  |  /  |
-		//		|/    |
-		//11	0-----1		6
-		//
-		//		4			5
-		//Find surrounding grid points for smoothed normals.
- 		int idx4 = ix + (iy-1)*xExtent;
- 		int idx0 = ix + iy*xExtent;
- 		int idx3 = ix + iy*xExtent+xExtent;
-		int idx9 = ix + (iy+2)*xExtent;
-		UnsignedByte d0, d1, d2, d3, d4, d5, d6, d7, d8, d9, d10, d11;
-		d0 = data[idx0];
-		d1 = data[idx0+1];
-		d2 = data[idx3+1];
-		d3 = data[idx3];
-		d4 = data[idx4];
-		d5 = data[idx4+1];
-		d6 = data[idx0+2];
-		d7 = data[idx3+2];
-		d8 = data[idx9+1];
-		d9 = data[idx9];
-		d10 = data[idx3-1];
-		d11 = data[idx0-1];
-
-		Real deltaZ_X0 = d1-d11;
-		Real deltaZ_X1 = d6-d0;
-		Real deltaZ_X2 = d7-d3;
-		Real deltaZ_X3 = d6-d0;
-
-		Real deltaZ_Y0 = d3-d4;
-		Real deltaZ_Y1 = d2-d5;
-		Real deltaZ_Y2 = d8-d1;
-		Real deltaZ_Y3 = d9-d0;
-
-		// Interpolate to get the smoothed valued.
-		Real deltaZ_X_Left = deltaZ_X0*(1.0f-fx) + fx*deltaZ_X3;
-		Real deltaZ_X_Right = deltaZ_X1*(1.0f-fx) + fx*deltaZ_X2;
-		Real deltaZ_X = deltaZ_X_Left*(1.0-fy) + fy*deltaZ_X_Right;
-
-		Real deltaZ_Y_Left = deltaZ_Y0*(1.0f-fx) + fx*deltaZ_Y3;
-		Real deltaZ_Y_Right = deltaZ_Y1*(1.0f-fx) + fx*deltaZ_Y2;
-		Real deltaZ_Y = deltaZ_Y_Left*(1.0-fy) + fy*deltaZ_Y_Right;
-
-
-
-			Vector3 l2r, n2f, normalAtTexel;
-			l2r.Set(2*MAP_XY_FACTOR/MAP_HEIGHT_SCALE, 0, deltaZ_X);
-			n2f.Set(0, 2*MAP_XY_FACTOR/MAP_HEIGHT_SCALE, deltaZ_Y);
-			Vector3::Normalized_Cross_Product(l2r,n2f, &normalAtTexel);
-			normal->x = normalAtTexel.X;
-			normal->y = normalAtTexel.Y;
-			normal->z = normalAtTexel.Z;
-
-	}
-
-
-	return height;
-}
-
-//=============================================================================
-Bool HeightMapRenderObjClass::isClearLineOfSight(const Coord3D& pos, const Coord3D& posOther) const
-{
-	if (m_map == NULL)
-		return false;	// doh. should not happen.
-
-#define DO_BRESENHAM
-#ifdef DO_BRESENHAM
-
-	/*
-		this is WAY faster, though not quite as accurate... however, the inaccuracy
-		is pretty minimal, so we really should force other code to live with it. (srj)
-	*/
-	const Real MAP_XY_FACTOR_INV = 1.0f / MAP_XY_FACTOR;
-
-	Int borderSize = m_map->getBorderSize();
-	Int start_x = REAL_TO_INT_FLOOR(pos.x * MAP_XY_FACTOR_INV) + borderSize;
-	Int start_y = REAL_TO_INT_FLOOR(pos.y * MAP_XY_FACTOR_INV) + borderSize;
-	Int end_x = REAL_TO_INT_FLOOR(posOther.x * MAP_XY_FACTOR_INV) + borderSize;
-	Int end_y = REAL_TO_INT_FLOOR(posOther.y * MAP_XY_FACTOR_INV) + borderSize;
-	Int delta_x = abs(end_x - start_x);			// The difference between the x's
-	Int delta_y = abs(end_y - start_y);			// The difference between the y's
-	Int x = start_x;												// Start x off at the first pixel
-	Int y = start_y;												// Start y off at the first pixel
-
-	Int xinc1, xinc2;
-	if (end_x >= start_x)								// The x-values are increasing
-	{
-		xinc1 = 1;
-		xinc2 = 1;
-	}
-	else																// The x-values are decreasing
-	{
-		xinc1 = -1;
-		xinc2 = -1;
-	}
-
-	Int yinc1, yinc2;
-	if (end_y >= start_y)               // The y-values are increasing
-	{
-		yinc1 = 1;
-		yinc2 = 1;
-	}
-	else																// The y-values are decreasing
-	{
-		yinc1 = -1;
-		yinc2 = -1;
-	}
-
-	Int den, num, numadd, numpixels;
-
-	Bool checkY = true;
-	if (delta_x >= delta_y)							// There is at least one x-value for every y-value
-	{
-		xinc1 = 0;												// Don't change the x when numerator >= denominator
-		yinc2 = 0;												// Don't change the y for every iteration
-		den = delta_x;
-		num = delta_x / 2;
-		numadd = delta_y;
-		numpixels = delta_x;							// There are more x-values than y-values
-	}
-	else																// There is at least one y-value for every x-value
-	{
-		checkY = false;
-		xinc2 = 0;												// Don't change the x for every iteration
-		yinc1 = 0;												// Don't change the y when numerator >= denominator
-		den = delta_y;
-		num = delta_y / 2;
-		numadd = delta_x;
-		numpixels = delta_y;							// There are more y-values than x-values
-	}
-
-	Real nsInv = 1.0f / numpixels;
-	Real z = pos.z;
-	Real dz = posOther.z - z;
-	Real zinc = dz * nsInv;
-
-	Bool result = true;
-	const UnsignedByte* data = m_map->getDataPtr();
-	Int xExtent = m_map->getXExtent();
-	Int yExtent = m_map->getYExtent();
-	for (Int curpixel = 0; curpixel < numpixels; curpixel++)
-	{
-		if (x < 0 || 
-				y < 0 ||
-				x >= xExtent-1 ||
-				y >= yExtent-1)
-		{
-			// once we go off the map, we're done
-			break;
-		}
-
-		Int idx = x + y*xExtent;
-		float height = data[idx];
-		height = __max(height, data[idx + 1]);
-		height = __max(height, data[idx + xExtent]);
-		height = __max(height, data[idx + xExtent + 1]);
-		height *= MAP_HEIGHT_SCALE;
-
-		// if terrainHeight > z, we can't see, so punt.
-		// add a little fudge to account for slop.
-		const Real LOS_FUDGE = 0.5f;
-		if (height > z + LOS_FUDGE)
-		{
-			result = false;
-			break;
-		}
-
-		// we're above the max height of the terrain and still looking up, so we're done.
-		// (don't bother for reverse test, since that doesn't generally happen)
-		if (z >= getMaxHeight() && zinc > 0.0f)
-		{
-			break;
-		}
-
-		z += zinc;
-
-		// continue with the maintenance.
-		num += numadd;										// Increase the numerator by the top of the fraction
-		if (num >= den)										// Check if numerator >= denominator
-		{
-			num -= den;											// Calculate the new numerator value
-			x += xinc1;											// Change the x as appropriate
-			y += yinc1;											// Change the y as appropriate
-		}
-		x += xinc2;												// Change the x as appropriate
-		y += yinc2;												// Change the y as appropriate
-	}
-	
-	return result;
-
-#else
-
-	// walk a line from obj to objOther and
-	// find the highest point in between 'em. while
-	// we're doing this, also estimate the point on the
-	// line at the same x,y as the high-terrain-point.
-
-	Real fx = pos.x;
-	Real fy = pos.y;
-	Real fz = pos.z;
-	Real fdx = posOther.x - fx;
-	Real fdy = posOther.y - fy;
-	Real fdz = posOther.z - fz;
-
-	// What's the largest step size that will be accurate enough?
-	// Currently we use a step size of about 2 "feet", which
-	// seems acceptable accuracy. If performance here is inadequate,
-	// we can try increasing the step size, but be sure to retest
-	// accuracy.
-	Real len = ceilf(sqrtf(fdx*fdx + fdy*fdy));
-	const Real STEP_LEN = 2.0f;
-	Int numSteps = REAL_TO_INT_CEIL(len / STEP_LEN);
-	if (numSteps < 1) numSteps = 1;
-	Real fnsInv = 1.0f / numSteps;
-	Real fxinc = fdx * fnsInv;
-	Real fyinc = fdy * fnsInv;
-	Real fzinc = fdz * fnsInv;
-	while (numSteps--)
-	{
-		Real terrainHeight = getHeightMapHeight( fx, fy, NULL );
-
-		// if terrainHeight > fz, we can't see, so punt.
-		// add a little fudge to account for slop.
-		const Real LOS_FUDGE = 0.5f;
-		if (terrainHeight > fz + LOS_FUDGE)
-		{
-			return false;
-		}
-
-		// we're above the max height of the terrain and still looking up, so we're done.
-		// (don't bother for reverse test, since that doesn't generally happen)
-		if (fz >= getMaxHeight() && fzinc > 0.0f)
-		{
-			return true;
-		}
-
-		fx += fxinc;
-		fy += fyinc;
-		fz += fzinc;
-
-	}
-
-	return true;
-#endif
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::getMaxCellHeight
-//=============================================================================
-/** Returns maximum height of the 4 corners containing the given point */
-//=============================================================================
-Real HeightMapRenderObjClass::getMaxCellHeight(Real x, Real y) const
-{
-	float p0,p1,p2,p3;
-	float height;
-
-	//	3-----2
-	//  |    /|
-	//  |  /  |
-	//	|/    |
-	//  0-----1
-	//Find surrounding grid points
-
-	if (m_map == NULL)
-	{	//sample point is not on the heightmap
-		return 0.0f;	//return default height
-	}
-	Int offset = 1;
-	Int iX = x/MAP_XY_FACTOR;
-	Int iY = y/MAP_XY_FACTOR;
-	iX += m_map->getBorderSize();
-	iY += m_map->getBorderSize();
-	if (iX<0) iX = 0;
-	if (iY<0) iY = 0;
-	if (iX >= (m_map->getXExtent()-1)) {
-		iX = m_map->getXExtent()-2;
-	}
-	if (iY >= (m_map->getYExtent()-1)) {
-		iY = m_map->getYExtent()-2;
-	}
-	if (m_halfResMesh) {
-		offset = 2;
-		iX = (iX/2)*2;
-		iY = (iY/2)*2;
-	}
-	UnsignedByte *data = m_map->getDataPtr();
-	p0=data[iX+iY*m_map->getXExtent()]*MAP_HEIGHT_SCALE;
-	p1=data[(iX+offset)+iY*m_map->getXExtent()]*MAP_HEIGHT_SCALE;
-	p2=data[(iX+offset)+(iY+offset)*m_map->getXExtent()]*MAP_HEIGHT_SCALE;
-	p3=data[iX+(iY+offset)*m_map->getXExtent()]*MAP_HEIGHT_SCALE;
-
-	height=p0;
-	height=__max(height,p1);
-	height=__max(height,p2);
-	height=__max(height,p3);
-
-	return height;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::isCliffCell
-//=============================================================================
-/** Returns true if the cell containing the point is a cliff cell */
-//=============================================================================
-Bool HeightMapRenderObjClass::isCliffCell(Real x, Real y)
-{
-
-	if (m_map == NULL)
-	{	//sample point is not on the heightmap
-		return false;
-	}
-	Int iX = x/MAP_XY_FACTOR;
-	Int iY = y/MAP_XY_FACTOR;
-	iX += m_map->getBorderSize();
-	iY += m_map->getBorderSize();
-	if (iX<0) iX = 0;
-	if (iY<0) iY = 0;
-	if (iX >= (m_map->getXExtent()-1)) {
-		iX = m_map->getXExtent()-2;
-	}
-	if (iY >= (m_map->getYExtent()-1)) {
-		iY = m_map->getYExtent()-2;
-	}
-	return m_map->getCliffState(iX, iY);
-}
-
-//=============================================================================
-//=============================================================================
-Bool HeightMapRenderObjClass::showAsVisibleCliff(Int xIndex, Int yIndex) const
-{
-	Int xSize = m_map->getXExtent();
-
-	return m_showAsVisibleCliff[xIndex + yIndex * xSize];
-}
-
-//=============================================================================
-//=============================================================================
-Bool HeightMapRenderObjClass::evaluateAsVisibleCliff(Int xIndex, Int yIndex, Real valuesGreaterThanRad)
-{
-	// This one never changes, so don't bother recomputing it.
-	static const Real distance[4] = 
-	{
-		0.0f,
-		1.0 * MAP_XY_FACTOR,
-		sqrt(2.0f) * MAP_XY_FACTOR,
-		1.0 * MAP_XY_FACTOR,
-	};
-
-	// Note: getHeight will protect us from going out of bounds by returning 0 if we give it
-	// a value outside of its bounds.
-	UnsignedByte bytes[4] = 
-	{ 
-		m_map->getHeight(xIndex + 0, yIndex + 0), 
-		m_map->getHeight(xIndex + 1, yIndex + 0), 
-		m_map->getHeight(xIndex + 1, yIndex + 1), 
-		m_map->getHeight(xIndex + 0, yIndex + 1),
-	};
-
-	Real heights[4] = 
-	{
-		INT_TO_REAL(bytes[0]) * MAP_HEIGHT_SCALE,
-		INT_TO_REAL(bytes[1]) * MAP_HEIGHT_SCALE,
-		INT_TO_REAL(bytes[2]) * MAP_HEIGHT_SCALE,
-		INT_TO_REAL(bytes[3]) * MAP_HEIGHT_SCALE,
-	};
-
-	Bool anyImpassable = FALSE;	
-
-	for (Int i = 1; i < 4 && !anyImpassable; ++i) {
-		if (fabs((heights[i] - heights[0]) / distance[i]) > valuesGreaterThanRad) {
-			anyImpassable = TRUE;
-		}
-	}
-
-	return anyImpassable;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::oversizeTerrain
-//=============================================================================
-/** Sets the terrain oversize amount. */
-//=============================================================================
-void HeightMapRenderObjClass::oversizeTerrain(Int tilesToOversize) 
-{
-	Int width = WorldHeightMap::NORMAL_DRAW_WIDTH;
-	Int height = WorldHeightMap::NORMAL_DRAW_HEIGHT;
-	if (tilesToOversize>0 && tilesToOversize<5) 
-	{
-		width += 32*tilesToOversize;
-		height += 32*tilesToOversize;
-		if (width>m_map->getXExtent()) 
-			width = m_map->getXExtent();
-		if (height>m_map->getYExtent()) 
-			height = m_map->getYExtent();
-	}
-	Int dx = width-m_map->getDrawWidth();
-	Int dy = height-m_map->getDrawHeight();
- 	m_map->setDrawWidth(width);
-	m_map->setDrawHeight(height);
-	dx /= 2;
-	dy /= 2;
-	Int newOrgX = m_map->getDrawOrgX()-dx;
-	Int newOrgy = m_map->getDrawOrgY()-dy;
-	if (newOrgX<0) newOrgX=0;
-	if (newOrgy<0) newOrgy=0;
-	m_map->setDrawOrg(newOrgX,newOrgy);
-	m_originX = 0;
-	m_originY = 0;
-	if (m_shroud)
-		m_shroud->reset();
-	//delete m_shroud;
-	//m_shroud = NULL;
-	initHeightData(m_map->getDrawWidth(), m_map->getDrawHeight(), m_map, NULL);		 
-	m_needFullUpdate = true;
-}
-
-
-
-//=============================================================================
-// HeightMapRenderObjClass::Get_Obj_Space_Bounding_Sphere
-//=============================================================================
-/** WW3D method that returns object bounding sphere used in frustum culling*/
-//=============================================================================
-void HeightMapRenderObjClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
-{
-	Vector3	ObjSpaceCenter((float)m_x*0.5f*MAP_XY_FACTOR,(float)m_y*0.5f*MAP_XY_FACTOR,(float)m_minHeight+(m_maxHeight-m_minHeight)*0.5f);
-	float length = ObjSpaceCenter.Length();
-	
-	if (m_map) {
-		ObjSpaceCenter.X += m_map->getDrawOrgX()*MAP_XY_FACTOR;
-		ObjSpaceCenter.Y += m_map->getDrawOrgY()*MAP_XY_FACTOR;
-	}
-	sphere.Init(ObjSpaceCenter, length);
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::Get_Obj_Space_Bounding_Box
-//=============================================================================
-/** WW3D method that returns object bounding box used in collision detection*/
-//=============================================================================
-void HeightMapRenderObjClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
-{
-	Vector3	minPt(0,0,m_minHeight);
-	Vector3	maxPt((float)m_x*MAP_XY_FACTOR,(float)m_y*MAP_XY_FACTOR,(float)m_maxHeight);
-	if (m_map) {
-		minPt.X += m_map->getDrawOrgX()*MAP_XY_FACTOR;
-		minPt.Y += m_map->getDrawOrgY()*MAP_XY_FACTOR;
-		maxPt.X += m_map->getDrawOrgX()*MAP_XY_FACTOR;
-		maxPt.Y += m_map->getDrawOrgY()*MAP_XY_FACTOR;
-	}
-	MinMaxAABoxClass minMaxBox(minPt, maxPt);
-
-	box.Init(minMaxBox);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Get the 3D extent of the terrain visible through the camera.  Return value
-	is false if no part of terrain is visible.  This function returns a worse
-	case bounding volume based on lowest/highest points in entire terrain.  It
-	does not optimize the volume to heights actually visible.  Unlike some of
-	the other methods, this function is guaranteed not to miss any visible
-	polygons.  The ignoreMaxHeight flag is used to return a box that uses the
-	camera position as the maximum height instead of the terrain - good for getting
-	a volume enclosing things that can float above terrain.
- */
-//-------------------------------------------------------------------------------------------------
-Bool HeightMapRenderObjClass::getMaximumVisibleBox(const FrustumClass &frustum, AABoxClass *box, Bool ignoreMaxHeight)
-{
-	//create a plane from the lowest point on the terrain
-	PlaneClass	groundPlane(Vector3(0,0,1), m_minHeight);
-
-	//clip each side of the view frustum to ground plane
-	float clipFraction;
-	Vector3 ClippedCorners[8];
-	ClippedCorners[0]=frustum.Corners[0];
-	for (Int i=0; i<4; i++)
-	{	ClippedCorners[i]=frustum.Corners[i];
-		if (groundPlane.Compute_Intersection(frustum.Corners[i],frustum.Corners[i+4],&clipFraction))
-		{	//edge intersects the terrain
-			ClippedCorners[i+4]=frustum.Corners[i]+(frustum.Corners[i+4]-frustum.Corners[i])*clipFraction;
-		}
-		else
-			ClippedCorners[i+4]=frustum.Corners[i+4];
-	}
-
-	if (box)
-		box->Init(ClippedCorners,8);
-
-	return TRUE;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::Class_ID
-//=============================================================================
-/** returns the class id, so the scene can tell what kind of render object it has. */
-//=============================================================================
-Int HeightMapRenderObjClass::Class_ID(void) const
-{
-	return RenderObjClass::CLASSID_TILEMAP;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::Clone
-//=============================================================================
-/** Not used, but required virtual method. */
-//=============================================================================
-RenderObjClass *	 HeightMapRenderObjClass::Clone(void) const
-{
-	assert(false);
-	return NULL;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::loadRoadsAndBridges
-//=============================================================================
-/** Loads the roads from the map objects. */
-//=============================================================================
-void HeightMapRenderObjClass::loadRoadsAndBridges(W3DTerrainLogic *pTerrainLogic, Bool saveGame)
-{	
-	if (DX8Wrapper::_Get_D3D_Device8() && (DX8Wrapper::_Get_D3D_Device8()->TestCooperativeLevel()) != D3D_OK)
-		return;	//device not ready to render anything
-
-#ifdef DO_ROADS
-	if (m_roadBuffer) {
-		m_roadBuffer->loadRoads();
-	}
-#endif
-	if (m_bridgeBuffer) {
-		m_bridgeBuffer->loadBridges(pTerrainLogic, saveGame);
-	}
-}
-
-// ============================================================================
-// HeightMapRenderObjClass::worldBuilderUpdateBridgeTowers
-// ============================================================================
-/** The worldbuilder has it's own method here to update the visual representation
-	* of the bridge towers */
-// ============================================================================
-void HeightMapRenderObjClass::worldBuilderUpdateBridgeTowers( W3DAssetManager *assetManager,
-																															SimpleSceneClass *scene )
-{
-
-	if( m_bridgeBuffer )
-		m_bridgeBuffer->worldBuilderUpdateBridgeTowers( assetManager, scene );
-
-}
-
-void HeightMapRenderObjClass::setShoreLineDetail(void)
-{
-	if (!m_map)
-		return;
-
-	Int m_mapDX=m_map->getXExtent();
-	Int m_mapDY=m_map->getYExtent();
-
-	//Find all shoreline tiles so they can get extra alpha blend
-	updateShorelineTiles(0,0,m_mapDX-1,m_mapDY-1,m_map);
-}
-
-/**Scan through our map and record all tiles which cross a water plane and are within visible depth under
-water.*/
-void HeightMapRenderObjClass::updateShorelineTiles(Int minX, Int minY, Int maxX, Int maxY, WorldHeightMap *pMap)
-{
-	Int border = pMap->getBorderSize();
-
-	//Clamp region to valid terrain tiles
-	if (minX<0)
-		minX = 0;
-	if (minY<0)
-		minY = 0;
-	if (maxX > (pMap->getXExtent() - 1))
-		maxX = (pMap->getXExtent() - 1);
-	if (maxY > (pMap->getYExtent() - 1))
-		maxY = (pMap->getYExtent() - 1);
-
-	if (!m_shoreLineTilePositions)
-	{	//Need to allocate memory
-		m_shoreLineTilePositions = NEW shoreLineTileInfo[DEFAULT_MAX_MAP_SHORELINE_TILES];
-		m_shoreLineTilePositionsSize = DEFAULT_MAX_MAP_SHORELINE_TILES;
-	}
-	
-	//Find list of all extra blend tiles used on map.  These are tiles with 3 materials/textures
-	//over the same tile and require an extra render pass.
-
-	//First remove any existing extra blend tiles within this partial region
-	Int j=0;
-	for (; j<m_numShoreLineTiles; j++)
-	{	Int x = m_shoreLineTilePositions[j].m_xy & 0xffff;
-		Int y = m_shoreLineTilePositions[j].m_xy >> 16;
-		if (x >= minX && x < maxX &&
-			y >= minY && y < maxY)
-		{	//this tile is inside region being updated so remove it by shifting tile array
-			memcpy(m_shoreLineTilePositions+j,m_shoreLineTilePositions+j+1,(m_numShoreLineTiles-1-j)*sizeof(shoreLineTileInfo));
-			m_numShoreLineTiles--;
-			j--;	//look at current tile again since it was removed.
-		}
-	}
-
-	if (TheWaterTransparency->m_transparentWaterDepth == 0 || !TheGlobalData->m_showSoftWaterEdge)
-		return;
-
-	Int waterSide;
-	Real waterZ0,waterZ1,waterZ2,waterZ3;
-	Real terrainZ0, terrainZ1, terrainZ2, terrainZ3;
-	//Figure out maximum depth of water before we reach the m_minWaterOpacity value.  Depths greater than this don't need
-	//custom shoreline tiles because they will get their opacity from the default value stored in the frame buffer during
-	//a screen clear operation.
-	Real transparentDepth=TheWaterTransparency->m_transparentWaterDepth*TheWaterTransparency->m_minWaterOpacity;
-	Real depthScaleFactor = 1.0f/transparentDepth;
-
-	for (j=minY; j<maxY; j++)
-		for (Int i=minX; i<maxX; i++)
-		{
-				waterSide=(waterZ0=TheWaterRenderObj->getWaterHeight((i-border)*MAP_XY_FACTOR,(j-border)*MAP_XY_FACTOR)) > ((terrainZ0=MAP_HEIGHT_SCALE*pMap->getHeight(i,j)));
-				waterSide |=((waterZ1=TheWaterRenderObj->getWaterHeight((i-border+1)*MAP_XY_FACTOR,(j-border)*MAP_XY_FACTOR)) > ((terrainZ1=MAP_HEIGHT_SCALE*pMap->getHeight(i+1,j)))) << 1;
-				waterSide |=((waterZ2=TheWaterRenderObj->getWaterHeight((i-border+1)*MAP_XY_FACTOR,(j-border+1)*MAP_XY_FACTOR)) > ((terrainZ2=MAP_HEIGHT_SCALE*pMap->getHeight(i+1,j+1)))) << 2;
-				waterSide |=((waterZ3=TheWaterRenderObj->getWaterHeight((i-border)*MAP_XY_FACTOR,(j-border+1)*MAP_XY_FACTOR)) > ((terrainZ3=MAP_HEIGHT_SCALE*pMap->getHeight(i,j+1)))) << 3;
-
-				if (!waterSide || (waterZ0*waterZ1*waterZ2*waterZ3) <= 0)
-					continue;	//all verts are on positive (surface) side of water so don't need blending.  Or one of them is outside the water plane bounds (waterHeight <= 0!)
-
-				//Check if mix of under/over water vertices or some vertices within depth fade region.
-				if (waterSide < 0xf || (waterZ0 - terrainZ0) < transparentDepth ||
-					(waterZ1 - terrainZ1) < transparentDepth || (waterZ2 - terrainZ2) < transparentDepth
-					|| (waterZ3 - terrainZ3) < transparentDepth)
-				{	//add tile to set that needs shoreline blending.
-					if (m_numShoreLineTiles >= m_shoreLineTilePositionsSize)
-					{	//no more room to store extra blend tiles so enlarge the buffer.
-						shoreLineTileInfo *tempPositions=NEW shoreLineTileInfo[m_shoreLineTilePositionsSize+512];
-						memcpy(tempPositions, m_shoreLineTilePositions, m_shoreLineTilePositionsSize*sizeof(shoreLineTileInfo));
-						delete [] m_shoreLineTilePositions;
-						//enlarge by more tiles to reduce memory trashing
-						m_shoreLineTilePositions = tempPositions;
-						m_shoreLineTilePositionsSize += 512;
-					}
-					//Pack x and y position into single integer since maps are limited in size
-					shoreLineTileInfo *shoreInfo=&m_shoreLineTilePositions[m_numShoreLineTiles];
-					shoreInfo->m_xy=i | (j <<16);
-					shoreInfo->t0=(waterZ0 - terrainZ0)*depthScaleFactor;
-					shoreInfo->t1=(waterZ1 - terrainZ1)*depthScaleFactor;
-					shoreInfo->t2=(waterZ2 - terrainZ2)*depthScaleFactor;
-					shoreInfo->t3=(waterZ3 - terrainZ3)*depthScaleFactor;
-					m_numShoreLineTiles++;
-				}
-		}
-}
-
-/** Generate a lookup table for arbitrary angled impassable area viewing. */
-void HeightMapRenderObjClass::updateViewImpassableAreas(Bool partial, Int minX, Int maxX, Int minY, Int maxY)
-{
-	Int xSize = m_map->getXExtent();
-	Int ySize = m_map->getYExtent();
-	if (m_showAsVisibleCliff.size() != xSize * ySize) {
-		m_showAsVisibleCliff.resize(xSize * ySize);
-	}
-
-	if (!partial) {
-		minX = 0;
-		minY = 0;
-		maxX = xSize;
-		maxY = ySize;
-	}
-
-	// save calculating the tangent over and over again.
-	Real tanImpassableRad = tan(m_curImpassableSlope / 360.f * 2 * PI);
-	for (Int j = minY; j < maxY; ++j) {
-		for (Int i = minX; i < maxX; ++i) {
-			m_showAsVisibleCliff[i + j * xSize] = evaluateAsVisibleCliff(i, j, tanImpassableRad);
-		}
-	}
-}
-
-/** Generate a lookup table which can be used to generate an
-alpha value from a given set of uv coordinates.  Currently used
-for smoothing water/terrain border*/
-void HeightMapRenderObjClass::initDestAlphaLUT(void)
-{
-	if (!m_destAlphaTexture)
-		return;
-
-	SurfaceClass *surf=m_destAlphaTexture->Get_Surface_Level();
-
-	if (surf)
-	{
-		Int pitch;
-		UnsignedInt *pData=(UnsignedInt*)surf->Lock(&pitch);
-
-		Int maxOpacity=(Int)(TheWaterTransparency->m_minWaterOpacity * 255.0f);
-		Int alpha;
-
-		if (pData)
-		{
-			//Fill texture with alpha gradient
-			for (Int x=0; x<256; x++)
-			{	
-				alpha = x;
-				if (alpha > maxOpacity)
-					alpha = maxOpacity;
-				*pData=(alpha<<24)|0x00ffffff;
-				pData++;
-			}
-			surf->Unlock();
-		}
-
-		m_destAlphaTexture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-		m_destAlphaTexture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-		REF_PTR_RELEASE(surf);
-		m_currentMinWaterOpacity = TheWaterTransparency->m_minWaterOpacity;
-	}
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::initHeightData
-//=============================================================================
-/** Allocate a heightmap of x by y vertices and fill with initial height values.
-Also allocates all rendering resources such as vertex buffers, index buffers, 
-shaders, and materials.*/
-//=============================================================================
-Int HeightMapRenderObjClass::initHeightData(Int x, Int y, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator)
-{	
-	Int i,j;
-//	Int	vertsPerRow=x*2-2;
-//	Int	vertsPerColumn=y*2-2;
-
-	REF_PTR_SET(m_map,pMap);	//update our heightmap pointer in case it changed since last call.
-
-	if (m_shroud)
-		m_shroud->init(m_map,TheGlobalData->m_partitionCellSize,TheGlobalData->m_partitionCellSize);
-#ifdef DO_ROADS
-	if (m_roadBuffer)
-		m_roadBuffer->setMap(m_map);
-#endif
-	HeightSampleType *data = NULL;
-	if (pMap) {
-		data = pMap->getDataPtr();
-	}
-
-	m_numExtraBlendTiles = 0;
-	m_numShoreLineTiles = 0;
-	//Do some preprocessing on map to extract useful data
-	if (pMap)
-	{
-		//Find min/max values for all terrain heights, useful for rendering optimization
-		Int m_mapDX=pMap->getXExtent();
-		Int m_mapDY=pMap->getYExtent();
-		Int i, j, minHt, maxHt;
-
-		minHt = pMap->getMaxHeightValue();
-		maxHt = 0;
-
-		for (j=0; j<m_mapDY; j++) {
-			for (i=0; i<m_mapDX; i++) {
-				Short cur = pMap->getHeight(i,j);
-				if (cur<minHt) minHt = cur;
-				if (maxHt<cur) maxHt = cur;
-			}
-		}
-		m_minHeight = minHt * MAP_HEIGHT_SCALE;
-		m_maxHeight = maxHt * MAP_HEIGHT_SCALE;
-
-		if (!m_extraBlendTilePositions)
-		{	//Need to allocate memory
-			m_extraBlendTilePositions = NEW Int[DEFAULT_MAX_MAP_EXTRABLEND_TILES];
-			m_extraBlendTilePositionsSize = DEFAULT_MAX_MAP_EXTRABLEND_TILES;
-		}
-		
-		//Find list of all extra blend tiles used on map.  These are tiles with 3 materials/textures
-		//over the same tile and require an extra render pass.
-		for (j=0; j<(m_mapDY-1); j++)
-			for (i=0; i<(m_mapDX-1); i++)
-			{
-				Real U[4],V[4];
-				UnsignedByte alpha[4];
-				Bool flipState,cliffState;
-				if (pMap->getExtraAlphaUVData(i,j,U,V,alpha,&flipState, &cliffState))
-				{	if (m_numExtraBlendTiles >= m_extraBlendTilePositionsSize)
-					{	//no more room to store extra blend tiles so enlarge the buffer.
-						Int *tempPositions=NEW Int[m_extraBlendTilePositionsSize+512];
-						memcpy(tempPositions, m_extraBlendTilePositions, m_extraBlendTilePositionsSize*sizeof(Int));
-						delete [] m_extraBlendTilePositions;
-						//enlarge by more tiles to reduce memory trashing
-						m_extraBlendTilePositions = tempPositions;
-						m_extraBlendTilePositionsSize += 512;
-					}
-					//Pack x and y position into single integer since maps are limited in size
-					m_extraBlendTilePositions[m_numExtraBlendTiles]=i | (j <<16);
-					m_numExtraBlendTiles++;
-				}
-			}
-
-		//Find all shoreline tiles so they can get extra alpha blend
-		updateShorelineTiles(0,0,m_mapDX-1,m_mapDY-1,pMap);
-		if (TheWaterTransparency->m_minWaterOpacity != m_currentMinWaterOpacity)
-			initDestAlphaLUT();
-	}
-
-	Set_Force_Visible(TRUE);	//terrain is always visible.
-	m_halfResMesh = TheGlobalData->m_useHalfHeightMap;
-	m_originX = 0;
-	m_originY = 0;
-	m_needFullUpdate = true;
-
-	m_scorchesInBuffer = 0; 
-	m_curNumScorchVertices=0;
-	m_curNumScorchIndices=0;
-	// If the size changed, we need to allocate.
-	Bool needToAllocate = (x != m_x || y != m_y);
-	// If the textures aren't allocated (usually because of a hardware reset) need to allocate.
-	if (m_stageOneTexture == NULL && m_treeBuffer) {
-		needToAllocate = true;
-	}
-	if (data && needToAllocate && m_treeBuffer != NULL)
-	{	//requested heightmap different from old one.
-		//allocate a new one.
-		freeMapResources();	//free old data and ib/vb
-		REF_PTR_SET(m_map,pMap);	//update our heightmap pointer in case it changed since last call.
-		m_stageTwoTexture=NEW CloudMapTerrainTextureClass;
-		m_stageThreeTexture=NEW LightMapTerrainTextureClass(m_macroTextureName);
-		m_destAlphaTexture=MSGNEW("TextureClass") TextureClass(256,1,WW3D_FORMAT_A8R8G8B8,MIP_LEVELS_1);
-		initDestAlphaLUT();
-#ifdef DO_SCORCH
-		allocateScorchBuffers();
-#endif
-
-		//Create static index buffers.  These will index the vertex buffers holding the map.
-		m_indexBuffer=NEW_REF(DX8IndexBufferClass,(VERTEX_BUFFER_TILE_LENGTH*VERTEX_BUFFER_TILE_LENGTH*2*3));
-
-		// Fill up the IB
-		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
-		UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-			
-		for (j=0; j<(VERTEX_BUFFER_TILE_LENGTH*VERTEX_BUFFER_TILE_LENGTH*4); j+=VERTEX_BUFFER_TILE_LENGTH*4)
-		{
-			for (i=j; i<(j+VERTEX_BUFFER_TILE_LENGTH*4); i+=4)	//4 vertices per 2x2 block
-			{
-				ib[0]=i;
-				ib[1]=i+2;
-				ib[2]=i+3;
-
-				ib[3]=i;
-				ib[4]=i+1;
-				ib[5]=i+2;
-
-				ib+=6;	//skip the 6 indices we just filled
-			}
-		}
-
-		//Get number of vertex buffers needed to hold current map
-		//First round dimensions to next multiple of VERTEX_BUFFER_TILE_LENGTH since that's our
-		//blocksize
-		m_numVBTilesX=1;
-		for (i=VERTEX_BUFFER_TILE_LENGTH+1; i<x;)
-		{	i+=VERTEX_BUFFER_TILE_LENGTH;
-			m_numVBTilesX++;
-		}
-		m_numVBTilesY=1;
-		for (j=VERTEX_BUFFER_TILE_LENGTH+1; j<y;)
-		{	j+=VERTEX_BUFFER_TILE_LENGTH;
-			m_numVBTilesY++;
-		}
-
-		m_numBlockColumnsInLastVB=(x-1)%VERTEX_BUFFER_TILE_LENGTH;	//right border within last VB
-		m_numBlockRowsInLastVB=(y-1)%VERTEX_BUFFER_TILE_LENGTH;	//bottom border within last VB
-
-		m_numVertexBufferTiles=m_numVBTilesX*m_numVBTilesY;
-		m_x=x;
-		m_y=y;
-		m_vertexBufferTiles = NEW DX8VertexBufferClass*[m_numVertexBufferTiles];
-		m_vertexBufferBackup = NEW char *[m_numVertexBufferTiles];
-
-		Int numVertex = VERTEX_BUFFER_TILE_LENGTH*2*VERTEX_BUFFER_TILE_LENGTH*2;
-
-#ifdef PRE_TRANSFORM_VERTEX
-		D3DDEVICE_CREATION_PARAMETERS parms;
-		DX8Wrapper::_Get_D3D_Device8()->GetCreationParameters(&parms);
-		Bool softwareVertexProcessing = 0!=(parms.BehaviorFlags&D3DCREATE_SOFTWARE_VERTEXPROCESSING);
-		if (m_xformedVertexBuffer == NULL && softwareVertexProcessing) {
-			m_xformedVertexBuffer = NEW IDirect3DVertexBuffer8*[m_numVertexBufferTiles];
-		}
-#endif
-
-		for (i=0; i<m_numVertexBufferTiles; i++) {
-#ifdef USE_NORMALS	 
-			m_vertexBufferTiles[i]=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZNUV2,numVertex,DX8VertexBufferClass::USAGE_DEFAULT));
-#else
-			m_vertexBufferTiles[i]=NEW_REF(DX8VertexBufferClass,(DX8_VERTEX_FORMAT,numVertex,DX8VertexBufferClass::USAGE_DEFAULT));
-#endif
-			m_vertexBufferBackup[i] = NEW char[numVertex*sizeof(VERTEX_FORMAT)];
-#ifdef PRE_TRANSFORM_VERTEX
-			if (m_xformedVertexBuffer) {
-				DX8Wrapper::_Get_D3D_Device8()->CreateVertexBuffer(
-					D3DXGetFVFVertexSize(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2)*numVertex,
-					D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC,
-					D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2,
-					D3DPOOL_DEFAULT,
-					&m_xformedVertexBuffer[i]);
-			}
-#endif
-		} 
-
-		//go with a preset material for now.
-#ifdef USE_NORMALS
-		m_vertexMaterialClass= NEW VertexMaterialClass();
-		m_vertexMaterialClass->Set_Shininess(0.0);
-		m_vertexMaterialClass->Set_Ambient(1,1,1);		  
-		m_vertexMaterialClass->Set_Diffuse(1,1,1);
-		m_vertexMaterialClass->Set_Specular(0,0,0);
-		m_vertexMaterialClass->Set_Opacity(0);
-		m_vertexMaterialClass->Set_Lighting(true);
-#else
-		m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-#endif
-
-		m_shaderClass = detailOpaqueShader;	//		ShaderClass::_PresetOpaqueShader;
-	}
-
-	updateBlock(0,0,x-1,y-1,pMap,pLightsIterator);
-
-	return 0;
-}
-
-#ifdef DO_SCORCH
-//=============================================================================
-// HeightMapRenderObjClass::freeScorchBuffers
-//=============================================================================
-/** Frees the vertex buffers for scorches.*/
-//=============================================================================
-void HeightMapRenderObjClass::freeScorchBuffers(void)
-{
-	REF_PTR_RELEASE(m_vertexScorch);
-	REF_PTR_RELEASE(m_indexScorch);
-	REF_PTR_RELEASE(m_scorchTexture);
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::allocateScorchBuffers
-//=============================================================================
-/** Allocates the vertex buffer and texture for scorches.*/
-//=============================================================================
-void HeightMapRenderObjClass::allocateScorchBuffers(void)
-{
-	m_vertexScorch=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZDUV1,MAX_SCORCH_VERTEX,DX8VertexBufferClass::USAGE_DEFAULT));
-	m_indexScorch=NEW_REF(DX8IndexBufferClass,(MAX_SCORCH_INDEX));
-	m_scorchTexture=NEW ScorchTextureClass;
-	m_scorchesInBuffer = 0; // If we just allocated the buffers, we got no scorches in the buffer.
-	m_curNumScorchVertices=0;
-	m_curNumScorchIndices=0;
-#ifdef RTS_DEBUG
-	Vector3 loc(4*MAP_XY_FACTOR,4*MAP_XY_FACTOR,0);
-	addScorch(loc, 1*MAP_XY_FACTOR, SCORCH_1);
-	loc.Y += 10*MAP_XY_FACTOR;
-	loc.X += 5*MAP_XY_FACTOR;
-	addScorch(loc, 3*MAP_XY_FACTOR, SCORCH_1);
-#endif
-
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::updateScorches
-//=============================================================================
-/** Builds the vertex buffer data for drawing the scorches.*/
-//=============================================================================
-void HeightMapRenderObjClass::updateScorches(void)
-{
-	if (m_scorchesInBuffer > 1) {
-		return;
-	}
-	if (!m_indexScorch || !m_vertexScorch) {
-		return;
-	}
-	m_curNumScorchVertices = 0;
-	m_curNumScorchIndices = 0;
-	DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexScorch);
-	UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-	UnsignedShort *curIb = ib;
-
-	DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexScorch);
-	VertexFormatXYZDUV1 *vb = (VertexFormatXYZDUV1*)lockVtxBuffer.Get_Vertex_Array();
-	VertexFormatXYZDUV1 *curVb = vb;
-
-	Int curScorch;
-	Real shadeR, shadeG, shadeB;
-	shadeR = TheGlobalData->m_terrainAmbient[0].red;
-	shadeG = TheGlobalData->m_terrainAmbient[0].green;
-	shadeB = TheGlobalData->m_terrainAmbient[0].blue;
-	shadeR += TheGlobalData->m_terrainDiffuse[0].red/2;
-	shadeG += TheGlobalData->m_terrainDiffuse[0].green/2;
-	shadeB += TheGlobalData->m_terrainDiffuse[0].blue/2;
-	shadeR*=255.0f;
-	shadeG*=255.0f;
-	shadeB*=255.0f;
-	Int diffuse=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16) | ((int)255 << 24);
-	m_scorchesInBuffer = 0;
-	for (curScorch=m_numScorches-1; curScorch>=0; curScorch--) {
-		m_scorchesInBuffer++;
-		Real radius = m_scorches[curScorch].radius;
-		Vector3 loc = m_scorches[curScorch].location;
-		Int type = m_scorches[curScorch].scorchType;
-		if (type<0) {
-			type = 0;
-		}
-		if (type >= SCORCH_MARKS_IN_TEXTURE) {
-			type = 0;
-		}
-		Real amtToFloat = 0;
-		if (m_halfResMesh) {
-			amtToFloat = MAP_HEIGHT_SCALE/8;
-		}
-
-		Int minX = REAL_TO_INT_FLOOR((loc.X-radius)/MAP_XY_FACTOR);
-		Int minY = REAL_TO_INT_FLOOR((loc.Y-radius)/MAP_XY_FACTOR);
-		if (minX<-m_map->getBorderSize()) minX=-m_map->getBorderSize();
-		if (minY<-m_map->getBorderSize()) minY=-m_map->getBorderSize();
-		Int maxX = REAL_TO_INT_CEIL((loc.X+radius)/MAP_XY_FACTOR);
-		Int maxY = REAL_TO_INT_CEIL((loc.Y+radius)/MAP_XY_FACTOR);
-		maxX++; maxY++;
-		if (maxX > m_map->getXExtent()-m_map->getBorderSize()) {
-			maxX = m_map->getXExtent()-m_map->getBorderSize();
-		}
-		if (maxY > m_map->getYExtent()-m_map->getBorderSize()) {
-			maxY = m_map->getYExtent()-m_map->getBorderSize();
-		}
-		Int startVertex = m_curNumScorchVertices;
-		Int i, j;
-		for (j=minY; j<maxY; j++) {
-			for (i=minX; i<maxX; i++) {
-				if (m_curNumScorchVertices >= MAX_SCORCH_VERTEX) return;
-				curVb->diffuse = diffuse;
-				Real theZ; 
-				theZ = amtToFloat+((float)getClipHeight(i+m_map->getBorderSize(),j+m_map->getBorderSize())*MAP_HEIGHT_SCALE);
-				if (m_halfResMesh) {
-					theZ = amtToFloat + this->getMaxCellHeight(i, j);
-					Real amt2 = amtToFloat + getMaxCellHeight(i-1, j-1);
-					if (amt2 > theZ) {
-						theZ = amt2;
-					}
-				}
-				// The scorchmarks are spaced out by 1.5 in the texture.
-				Real uOffset = (type%SCORCH_PER_ROW) * 1.5f;
-				Real vOffset = (type/SCORCH_PER_ROW) * 1.5f;
-				Real X = i*MAP_XY_FACTOR; 
-				Real Y = j*MAP_XY_FACTOR;
-				curVb->u1 = (uOffset + 0.5f + (X - loc.X)/(2*radius)) / (SCORCH_PER_ROW+1);
-				curVb->v1 = (vOffset + 0.5f + (Y - loc.Y)/(2*radius)) / (SCORCH_PER_ROW+1);
-				curVb->x = X;
-				curVb->y = Y;
-				curVb->z = theZ;
-				curVb++;
-				m_curNumScorchVertices++;
-			}
-		}
-		Int yOffset = maxX-minX;
-		for (j=0; j<maxY-minY-1; j++) {
-			for (i=0; i<maxX-minX-1; i++) {
-				if (m_curNumScorchIndices+6 > MAX_SCORCH_INDEX) return;
-				Int xNdx = i+minX+m_map->getBorderSize();
-				Int yNdx = j+minY+m_map->getBorderSize();
-				Bool flipForBlend = m_map->getFlipState(xNdx, yNdx);
-#if 0
-				UnsignedByte alpha[4];
-				float UA[4], VA[4];
-				m_map->getAlphaUVData(xNdx, yNdx, UA, VA, alpha, &flipForBlend, false);
-#endif
-				if (flipForBlend) {
-					*curIb++ = startVertex + j*yOffset + i+1;
- 					*curIb++ = startVertex + j*yOffset + i+yOffset;
-					*curIb++ = startVertex + j*yOffset + i;
- 					*curIb++ = startVertex + j*yOffset + i+1;
- 					*curIb++ = startVertex + j*yOffset + i+1+yOffset;
-					*curIb++ = startVertex + j*yOffset + i+yOffset;
-				}	
-				else 
-				{
-					*curIb++ = startVertex + j*yOffset + i;
-					*curIb++ = startVertex + j*yOffset + i+1+yOffset;
-					*curIb++ = startVertex + j*yOffset + i+yOffset;
-					*curIb++ = startVertex + j*yOffset + i;
-					*curIb++ = startVertex + j*yOffset + i+1;
-					*curIb++ = startVertex + j*yOffset + i+1+yOffset;
-				}
-				m_curNumScorchIndices+=6;
-			}
-		}
-	}
-
-}
-
-#endif
-
-//=============================================================================
-// HeightMapRenderObjClass::clearAllScorches
-//=============================================================================
-/** Removes all scorches. */
-//=============================================================================
-void HeightMapRenderObjClass::clearAllScorches(void)
-{
-#ifdef DO_SCORCH
-	m_numScorches=0;
-	m_scorchesInBuffer=0;	
-#endif	
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::addScorch
-//=============================================================================
-/** Adds a scorch mark. */
-//=============================================================================
-void HeightMapRenderObjClass::addScorch(Vector3 location, Real radius, Scorches type)
-{
-#ifdef DO_SCORCH
-	if (m_numScorches >= MAX_SCORCH_MARKS) {
-		Int i;
-		for (i=0; i<MAX_SCORCH_MARKS-1; i++) {
-			m_scorches[i] = m_scorches[i+1];
-		}
-		m_numScorches--;
-	}
-
-	Int i;
-	Real limit = radius/4;
-	for (i=0; i<m_numScorches; i++) {		
-		if ( abs(location.X-m_scorches[i].location.X) < limit &&  
-				 abs(location.Y-m_scorches[i].location.Y) < limit && 
-				 abs(radius - m_scorches[i].radius) < limit &&
-				 m_scorches[i].scorchType == type) {
-			return; // basically a duplicate.
-		}
-	}
-
-	m_scorches[m_numScorches].location = location;
-	m_scorches[m_numScorches].radius = radius;
-	m_scorches[m_numScorches].scorchType = type;
-	m_numScorches++;
-	m_scorchesInBuffer = 0; // force buffer regenerations.
-#endif	
-}
-
-
-//=============================================================================
-// HeightMapRenderObjClass::getStaticDiffuse
-//=============================================================================
-/** Gets the static diffuse color value for a terrain vertex.*/
-//=============================================================================
-Int HeightMapRenderObjClass::getStaticDiffuse(Int x, Int y)
-{	
-
-	if (x<0) x = 0;
-	if (y<0) y = 0;
-	if (x >= m_map->getXExtent())
-		x=m_map->getXExtent()-1;
-	if (y >= m_map->getYExtent())
-		y=m_map->getYExtent()-1;
-	if (m_halfResMesh) {
-		x&=0xffffffe;
-		y&=0xffffffe;
-	}
-
-	if (m_map == NULL) {
-		return(0);
-	}
-
-	Vector3 l2r,n2f,normalAtTexel;
-	Int vn0,un0,vp1,up1;
-	Int cellOffset = 1;
-	if (m_halfResMesh) {
-		cellOffset = 2;
-	}
-
-	vn0 = y-cellOffset;
-	vp1 = y+cellOffset;
-	if (vp1 >= m_map->getYExtent())
-		vp1=m_map->getYExtent()-1;
-	if (vn0<0) vn0 = 0;
-	un0 = x-cellOffset;
-	up1 = x+cellOffset;
-	if (un0 < 0)
-		un0=0;
-	if (up1 >= m_map->getXExtent())
-		up1=m_map->getXExtent()-1;
-
-	Vector3 lightRay[MAX_GLOBAL_LIGHTS];
-	const Coord3D *lightPos;
-
-	for (Int lightIndex=0; lightIndex < TheGlobalData->m_numGlobalLights; lightIndex++)
-	{
-		lightPos=&TheGlobalData->m_terrainLightPos[lightIndex];
-		lightRay[lightIndex].Set(-lightPos->x,-lightPos->y,	-lightPos->z);
-	}
-
-	//top-left sample
-	l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getHeight(up1, y) - m_map->getHeight(un0, y)));
-	n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getHeight(x, vp1) - m_map->getHeight(x, vn0)));
-	
-#ifdef ALLOW_TEMPORARIES
-	normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-	Vector3::Normalized_Cross_Product(l2r,n2f, &normalAtTexel);
-#endif
-
-	VERTEX_FORMAT vertex;
-	vertex.x=ADJUST_FROM_INDEX_TO_REAL(x);
-	vertex.y=ADJUST_FROM_INDEX_TO_REAL(y);
-
-	vertex.z=  ((float)m_map->getHeight(x,y))*MAP_HEIGHT_SCALE;
-	vertex.u1=0;
-	vertex.v1=0;
-	vertex.u2=1;
-	vertex.v2=1;
-
-	RTS3DScene *pMyScene = (RTS3DScene *)Scene;
-	if (pMyScene) {
-		RefRenderObjListIterator *it = pMyScene->createLightsIterator();
-		doTheLight(&vertex, lightRay, &normalAtTexel, it, 1.0f);
-		if (it) {
-		 pMyScene->destroyLightsIterator(it);
-		 it = NULL;
-		}
-	} else {
-		doTheLight(&vertex, lightRay, &normalAtTexel, NULL, 1.0f);
-	}
-#ifdef USE_NORMALS
-	return(0xffffffff);
-#else 
-	return vertex.diffuse;
-#endif
-
-#define not_VERTS_MATCH
-#ifdef VERTS_MATCH
-	Int i,j;
-	if (m_halfResMesh) {
-		x&=0xffffffe;
-		y&=0xffffffe;
-	}
-	Real X = x*MAP_XY_FACTOR;
-	Real Y = y*MAP_XY_FACTOR;
-	// This code digs the diffuse out of the vertex buffer.
-	// It makes sense if the road vertexes match the terrain.
-	// However, they don't match anymore. jba.
-
-	Int yCoordMin = m_map->getDrawOrgY();
-	Int yCoordMax = m_y+m_map->getDrawOrgY()-1;
-	Int xCoordMin = m_map->getDrawOrgX();
-	Int xCoordMax = m_x+m_map->getDrawOrgX()-1;	
-	if (x<xCoordMin || y<yCoordMin || x> xCoordMax || y>yCoordMax) {
-		return(0);
-	}
-	if (x==xCoordMax) x--;
-	if (y==yCoordMax) y--;
-	x -= xCoordMin;
-	y -= yCoordMin;
-
-	y += m_originY;
-	if (y<0) y+= m_y-1;
-	if (y> m_y-1) y-=m_y-1;
-	if (y<0) y = 0;
-	if (y>= m_y-1) y=m_y-1;
-												  
-	x += m_originX;
-	if (x<0) x+= m_x-1;
-	if (x> m_x-1) x-=m_x-1;
-	if (x<0) x = 0;
-	if (x>= m_x-1) x=m_x-1;
-	i = 0;
-	while (x>VERTEX_BUFFER_TILE_LENGTH) {
-		i++;
-		x -= VERTEX_BUFFER_TILE_LENGTH;
-	}
-	if (x==VERTEX_BUFFER_TILE_LENGTH) x--;
-	j = 0;
-	while (y>VERTEX_BUFFER_TILE_LENGTH) {
-		j++;
-		y -= VERTEX_BUFFER_TILE_LENGTH;
-	}
-	if (y==VERTEX_BUFFER_TILE_LENGTH) y--;
-
-	char **pData = m_vertexBufferBackup+j*m_numVBTilesX+i;
-	Int	vertsPerRow=(VERTEX_BUFFER_TILE_LENGTH)*4;	//vertices per row of VB
-
-	if (m_halfResMesh) {
-		x/=2;
-		y/=2;
-		vertsPerRow /= 2;
-	}
-
-	VERTEX_FORMAT *vbMirror = ((VERTEX_FORMAT*)(*pData))  + (y)*vertsPerRow+4*(x);
-	if ( vbMirror[0].x==X && vbMirror[0].y==Y) {
-		return(vbMirror[0].diffuse);
-	}
-	if ( vbMirror[3].x==X && vbMirror[3].y==Y) {
-		return(vbMirror[3].diffuse);
-	}
-	if ( vbMirror[1].x==X && vbMirror[1].y==Y) {
-		return(vbMirror[1].diffuse);
-	}
-	if ( vbMirror[2].x==X && vbMirror[2].y==Y) {
-		return(vbMirror[2].diffuse);
-	}
-#ifdef RTS_DEBUG
-	char buf[256];
-	sprintf(buf, "(%f,%f) -> mirror (%f, %f)\n", X, Y, vbMirror->x, vbMirror->y);
-	::OutputDebugString(buf);
-#endif
-	return(vbMirror->diffuse);
-#endif
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::On_Frame_Update
-//=============================================================================
-/** Updates the diffuse color values in the vertices as affected by the dynamic lights.*/
-//=============================================================================
-void HeightMapRenderObjClass::On_Frame_Update(void)
-{	
-
-	Int i,j,k;
-	DX8VertexBufferClass	**pVB;
-	Int originX,originY;
-	if (Scene==NULL) return;
-	RTS3DScene *pMyScene = (RTS3DScene *)Scene;
-
-
-	RefRenderObjListIterator pDynamicLightsIterator(pMyScene->getDynamicLights());
-	if (m_map == NULL) {
-		return;
-	}
-
-#ifdef DO_UNIT_TIMINGS  		  
-#pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
-	return;
-#endif
-
-#ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_disableTerrain) {
-		return;
-	}
-#endif
-
-	Int numDynaLights=0;
-	W3DDynamicLight *enabledLights[MAX_ENABLED_DYNAMIC_LIGHTS];
-
-	Int yCoordMin = m_map->getDrawOrgY();
-	Int yCoordMax = m_y+m_map->getDrawOrgY();
-	Int xCoordMin = m_map->getDrawOrgX();
-	Int xCoordMax = m_x+m_map->getDrawOrgX();
-
-	for (pDynamicLightsIterator.First(); !pDynamicLightsIterator.Is_Done(); pDynamicLightsIterator.Next())
-	{		
-		W3DDynamicLight *pLight = (W3DDynamicLight*)pDynamicLightsIterator.Peek_Obj();
-		pLight->m_processMe = false;
-		if (pLight->m_enabled || pLight->m_priorEnable) {
-			Real range = pLight->Get_Attenuation_Range();
-			if (pLight->m_priorEnable) {
-				pLight->m_prevMinX = pLight->m_minX;
-				pLight->m_prevMinY = pLight->m_minY;
-				pLight->m_prevMaxX = pLight->m_maxX;
-				pLight->m_prevMaxY = pLight->m_maxY;
-			} 
-			Vector3	pos = pLight->Get_Position();
-			pLight->m_minX = (pos.X-range)/MAP_XY_FACTOR;
-			pLight->m_maxX = (pos.X+range)/MAP_XY_FACTOR+1.0f;
-			pLight->m_minY = (pos.Y-range)/MAP_XY_FACTOR;
-			pLight->m_maxY = (pos.Y+range)/MAP_XY_FACTOR+1.0f;
-			if (!pLight->m_priorEnable) {
-				pLight->m_prevMinX = pLight->m_minX;
-				pLight->m_prevMinY = pLight->m_minY;
-				pLight->m_prevMaxX = pLight->m_maxX;
-				pLight->m_prevMaxY = pLight->m_maxY;
-			} 
-
-			if (pLight->m_minX < xCoordMax && 
-					pLight->m_minY < yCoordMax &&
-					pLight->m_maxX > xCoordMin && 
-					pLight->m_maxY > yCoordMin) {
-				pLight->m_processMe = TRUE;
-			} else if (pLight->m_prevMinX < xCoordMax && 
-					pLight->m_prevMinY < yCoordMax &&
-					pLight->m_prevMaxX > xCoordMin && 
-					pLight->m_prevMaxY > yCoordMin) {
-				pLight->m_processMe = TRUE;
-			} else {
-				pLight->m_processMe = false;
-			}
-			if (pLight->m_processMe) {
-				enabledLights[numDynaLights] = pLight;
-				numDynaLights++;
-				if (numDynaLights == MAX_ENABLED_DYNAMIC_LIGHTS) {
-					break;
-				}
-			}
-		}
-		pLight->m_priorEnable = pLight->m_enabled;
-	}
-	if (numDynaLights > 0) {
-		//step through each vertex buffer that needs updating
-		for (j=0; j<m_numVBTilesY; j++)
-		{
-			originY=j*VERTEX_BUFFER_TILE_LENGTH;	//location of this VB on the large full-size heightmap
-			Int yMin, yMax;
-			yMin = originY;
-			yMax = originY+VERTEX_BUFFER_TILE_LENGTH;
-			Bool intersect = false;
-			Int yCoordMin = getYWithOrigin(yMin)+m_map->getDrawOrgY()-m_map->getBorderSize();
-			Int yCoordMax = getYWithOrigin(yMax-1)+m_map->getDrawOrgY()+1-m_map->getBorderSize();
-			if (yCoordMax>yCoordMin) {
-				// no wrap occurred.
-				for (k=0; k<numDynaLights; k++) {
-					if (enabledLights[k]->m_minY < yCoordMax && 
-						enabledLights[k]->m_maxY > yCoordMin) {
-						intersect = true;
-						break;
-					}
-					if (enabledLights[k]->m_prevMinY < yCoordMax && 
-						enabledLights[k]->m_prevMaxY > yCoordMin) {
-						intersect = true;
-						break;
-					}
-				}
-			} else {
-				// wrap occurred, so we are outside of this range.
-				int tmp=yCoordMin;
-				yCoordMin = yCoordMax;
-				yCoordMax = tmp;
-				for (k=0; k<numDynaLights; k++) {
-					if (enabledLights[k]->m_minY <=  yCoordMin || 
-						enabledLights[k]->m_maxY >= yCoordMax) {
-						intersect = true;
-						break;
-					}
-					if (enabledLights[k]->m_prevMinY <=  yCoordMin || 
-						enabledLights[k]->m_prevMaxY >= yCoordMax) {
-						intersect = true;
-						break;
-					}
-				}
-			}
-			if (!intersect) {
-				continue;
-			}
-
-			for (i=0; i<m_numVBTilesX; i++)
-			{	
-				originX=i*VERTEX_BUFFER_TILE_LENGTH;	//location of this VB on the large full-size heightmap
-				Int xMin, xMax;
-				xMin = originX;
-				xMax = originX+VERTEX_BUFFER_TILE_LENGTH;
-
-				Bool intersect = false;
-				Int xCoordMin = getXWithOrigin(xMin)+m_map->getDrawOrgX()-m_map->getBorderSize();
-				Int xCoordMax = getXWithOrigin(xMax-1)+m_map->getDrawOrgX()+1-m_map->getBorderSize();
-				if (xCoordMax>xCoordMin) {
-					// no wrap occurred.
-					for (k=0; k<numDynaLights; k++) {
-						if (enabledLights[k]->m_minX < xCoordMax && 
-							enabledLights[k]->m_maxX > xCoordMin) {
-							intersect = true;
-							break;
-						}
-						if (enabledLights[k]->m_prevMinX < xCoordMax && 
-							enabledLights[k]->m_prevMaxX > xCoordMin) {
-							intersect = true;
-							break;
-						}
-					}
-				} else {
-					// wrap occurred, so we are outside of this range.
-					int tmp=xCoordMin;
-					xCoordMin = xCoordMax;
-					xCoordMax = tmp;
-					for (k=0; k<numDynaLights; k++) {
-						if (enabledLights[k]->m_minX <=  xCoordMin || 
-							enabledLights[k]->m_maxX >= xCoordMax) {
-							intersect = true;
-							break;
-						}
-						if (enabledLights[k]->m_prevMinX <=  xCoordMin ||
-							enabledLights[k]->m_prevMaxX >= xCoordMax) {
-							intersect = true;
-							break;
-						}
-					}
-				}
-				if (!intersect) {
-					continue;
-				}
-				pVB=m_vertexBufferTiles+j*m_numVBTilesX+i;	//point to correct row/column of vertex buffers 
-				char **pData = m_vertexBufferBackup+j*m_numVBTilesX+i;
-				updateVBForLight(*pVB, *pData, xMin, yMin, xMax, yMax, originX,originY, enabledLights, numDynaLights);
-			}
-		}
-	}
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::addTree
-//=============================================================================
-/** Adds a tree to the tree buffer.*/
-//=============================================================================
-void HeightMapRenderObjClass::addTree(Coord3D location, Real scale, Real angle, 
-																			AsciiString name, Bool visibleInMirror)
-{
-	m_treeBuffer->addTree(location, scale, angle, name, visibleInMirror); 
-};
-
-//=============================================================================
-// HeightMapRenderObjClass::addTerrainBib
-//=============================================================================
-/** Adds a terrainBib to the bib buffer.*/
-//=============================================================================
-void HeightMapRenderObjClass::addTerrainBib(Vector3 corners[4], 
-																						ObjectID id, Bool highlight)
-{
-	if (m_bibBuffer)
-		m_bibBuffer->addBib(corners, id, highlight); 
-};
-
-//=============================================================================
-// HeightMapRenderObjClass::addTerrainBib
-//=============================================================================
-/** Adds a terrainBib to the bib buffer.*/
-//=============================================================================
-void HeightMapRenderObjClass::addTerrainBibDrawable(Vector3 corners[4], 
-																						DrawableID id, Bool highlight)
-{
-	if (m_bibBuffer)
-		m_bibBuffer->addBibDrawable(corners, id, highlight); 
-};
-
-//=============================================================================
-// HeightMapRenderObjClass::removeAllTerrainBibs
-//=============================================================================
-/** Removes all terrainBib highlighting from the bib buffer.*/
-//=============================================================================
-void HeightMapRenderObjClass::removeTerrainBibHighlighting()
-{
-	if (m_bibBuffer)
-		m_bibBuffer->removeHighlighting(  ); 
-};
-
-//=============================================================================
-// HeightMapRenderObjClass::removeAllTerrainBibs
-//=============================================================================
-/** Removes all terrainBibs from the bib buffer.*/
-//=============================================================================
-void HeightMapRenderObjClass::removeAllTerrainBibs()
-{
-	if (m_bibBuffer)
-		m_bibBuffer->clearAllBibs(  ); 
-};
-
-//=============================================================================
-// HeightMapRenderObjClass::removeTerrainBib
-//=============================================================================
-/** Removes a terrainBib from the bib buffer.*/
-//=============================================================================
-void HeightMapRenderObjClass::removeTerrainBib(ObjectID id)
-{
-	if (m_bibBuffer)
-		m_bibBuffer->removeBib( id ); 
-};
-
-//=============================================================================
-// HeightMapRenderObjClass::removeTerrainBib
-//=============================================================================
-/** Removes a terrainBib from the bib buffer.*/
-//=============================================================================
-void HeightMapRenderObjClass::removeTerrainBibDrawable(DrawableID id)
-{
-	if (m_bibBuffer)
-		m_bibBuffer->removeBibDrawable( id ); 
-};
-
-//=============================================================================
-// HeightMapRenderObjClass::staticLightingChanged
-//=============================================================================
-/** Notification that all lighting needs to be recalculated. */
-//=============================================================================
-void HeightMapRenderObjClass::staticLightingChanged( void )
-{
-	// Cause the terrain to get updated with new lighting.
-	m_needFullUpdate = true;
-
-	// Cause the scorches to get updated with new lighting.
-	m_scorchesInBuffer = 0; // If we just allocated the buffers, we got no scorches in the buffer.
-	m_curNumScorchVertices=0;
-	m_curNumScorchIndices=0;
-
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::setTimeOfDay
-//=============================================================================
-/** When the time of day changes, the lighting changes and we need to update. */
-//=============================================================================
-void HeightMapRenderObjClass::setTimeOfDay( TimeOfDay tod )
-{		 
-	staticLightingChanged();
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::Notify_Added
-//=============================================================================
-/** W3D render object method, we use it to add ourselves to tthe update 
-list, so On_Frame_Update gets called. */
-//=============================================================================
-void HeightMapRenderObjClass::Notify_Added(SceneClass * scene)
-{
-	RenderObjClass::Notify_Added(scene);
-	scene->Register(this,SceneClass::ON_FRAME_UPDATE);
-}
-
-
-
-#define CENTER_LIMIT 2
-#define BIG_JUMP 16
-#define WIDE_STEP 32
-
-static Int visMinX, visMinY, visMaxX, visMaxY;
-static Bool check(const FrustumClass & frustum, WorldHeightMap *pMap, Int x, Int y) 
-{
-	if (x<0 || y<0) return(false);
-	if (x>= pMap->getXExtent() || y>= pMap->getYExtent()) return(false);
-	if (x >= visMinX && y >= visMinY && x <=visMaxX && y <= visMaxY) {
-		return(true);
-	}
-	Int height = pMap->getHeight(x, y);
-	Vector3 loc((x-pMap->getBorderSize())*MAP_XY_FACTOR, (y-pMap->getBorderSize())*MAP_XY_FACTOR, height*MAP_HEIGHT_SCALE);
-	if (CollisionMath::Overlap_Test(frustum,loc) == CollisionMath::INSIDE) {
-		if (x<visMinX) visMinX=x;
-		if (x>visMaxX) visMaxX=x;
-		if (y<visMinY) visMinY=y;
-		if (y>visMaxY) visMaxY=y;
-		return(true);
-	}
-	return(false);
-}
-
-static void calcVis(const FrustumClass & frustum, WorldHeightMap *pMap, Int minX, Int minY, Int maxX, Int maxY, Int limit)
-{
-	if (maxX-minX<2) return;
-	if (maxY-minY<2) return;
-	if (minX >=visMinX && minY >= visMinY && maxX <=visMaxX && maxY <= visMaxY) {
-		return;
-	}
-	Int midX = (minX+maxX)/2;
-	Int midY = (minY+maxY)/2;
-	Bool recurse1 = maxX-minX>=limit;
-	Bool recurse2 = recurse1;
-	Bool recurse3 = recurse1;
-	Bool recurse4 = recurse1;	 
-	/* boxes are:
-
-			1     2
-
-
-			3			4 */
-
-	if (check(frustum, pMap, midX, maxY)) {
-		recurse1=true;
-		recurse2=true;
-	}
-	if (check(frustum, pMap, midX, minY)) {
-		recurse3=true;
-		recurse4=true;
-	}
-	if (check(frustum, pMap, midX, midY)) {
-		recurse1=true;
-		recurse2=true;
-		recurse3=true;
-		recurse4=true;
-	}
-	if (check(frustum, pMap, minX, midY)) {
-		recurse1=true;
-		recurse3=true;
-	}
-	if (check(frustum, pMap, maxX, midY)) {
-		recurse2=true;
-		recurse4=true;
-	}
-	if (recurse1) {
-		calcVis(frustum, pMap, minX, midY, midX, maxY, limit);
-	}
-	if (recurse2) {
-		calcVis(frustum, pMap, midX, midY, maxX, maxY, limit);
-	}
-	if (recurse3) {
-		calcVis(frustum, pMap, minX, minY, midX, midY, limit);
-	}
-	if (recurse4) {
-		calcVis(frustum, pMap, midX, minY, maxX, midY, limit);
-	}
-}
-
-
-//=============================================================================
-// HeightMapRenderObjClass::updateCenter
-//=============================================================================
-/** Updates the positioning of the drawn portion of the height map in the 
-heightmap.  As the view slides around, this determines what is the actually
-rendered portion of the terrain.  Only a 96x96 section is rendered at any time, 
-even though maps can be up to 1024x1024.  This function determines which subset
-is rendered. */
-//=============================================================================
-void HeightMapRenderObjClass::updateCenter(CameraClass *camera , RefRenderObjListIterator *pLightsIterator)
-{
-	if (m_map==NULL) {
-		return;
-	}
-	if (m_updating) {
-		return;
-	}
-
-	if (m_vertexBufferTiles ==NULL)
-		return;		//did not initialize resources yet.
-
-	m_treeBuffer->doFullUpdate();	// Tell the trees to update for view change.
-
-#ifdef TEST_CUSTOM_EDGING
-	m_customEdging->doFullUpdate();
-#endif
-
-	m_updating = true;
-	if (m_needFullUpdate) {
-		m_needFullUpdate = false;
-		updateBlock(0, 0, m_x-1, m_y-1, m_map, pLightsIterator);
-#ifdef DO_ROADS
-		if (m_roadBuffer) {
-			m_roadBuffer->updateLighting();
-		}
-#endif
-		m_bridgeBuffer->doFullUpdate();
-		m_bridgeBuffer->updateCenter(camera, pLightsIterator);
-		m_updating = false;
-		return;
-	}
-	m_bridgeBuffer->updateCenter(camera, pLightsIterator);
-
-	if (m_x >= m_map->getXExtent() && m_y >= m_map->getYExtent()) {
-		m_updating = false;
-		return; // no need to center. 
-	}
-
-	Int cellOffset = 1;
-	if (m_halfResMesh) {
-		cellOffset = 2;
-	}
-	// determine the ray corresponding to the camera and distance to projection plane
-	Matrix3D camera_matrix = camera->Get_Transform();
-	
-	Vector3 camera_location  = camera->Get_Position();
-
-	Vector3 rayLocation;
-	Vector3 rayDirection;
-	Vector3 rayDirectionPt;
-	// the projected ray has the same origin as the camera
-	rayLocation = camera_location; 
-	// determine the location of the screen coordinate in camera-model space
-	const ViewportClass &viewport = camera->Get_Viewport();
-	Int i, j, minHt;
-
-	Real intersectionZ;
-	minHt = m_map->getMaxHeightValue();
-	for (i=0; i<m_x; i++) {
-		for (j=0; j<m_y; j++) {
-			Short cur = m_map->getDisplayHeight(i,j);
-			if (cur<minHt) minHt = cur;
-		}
-	}
-	intersectionZ = (float)minHt;
-//	float aspect = camera->Get_Aspect_Ratio();
-
-	Vector2 min,max;
-	camera->Get_View_Plane(min,max);
-	float xscale = (max.X - min.X);
-	float yscale = (max.Y - min.Y);
-
-	float zmod = -1.0; // Scene->vpd; // Note: view plane distance is now always 1.0 from the camera
-	float minX = 200000;
-	float maxX = -minX;
-	float minY = 200000;
-	float maxY = -minY;
-	for (i=0; i<2; i++) {
-		for (j=0; j<2; j++) {
-			float xmod = (-i + 0.5 + viewport.Min.X) * zmod * xscale;// / aspect;
-			float ymod = (j - 0.5 - viewport.Min.Y) * zmod * yscale;// * aspect;
-
-			// transform the screen coordinates by the camera's matrix into world coordinates.
-			float x = zmod * camera_matrix[0][2] + xmod * camera_matrix[0][0] + ymod * camera_matrix[0][1];
-			float y = zmod * camera_matrix[1][2] + xmod * camera_matrix[1][0] + ymod * camera_matrix[1][1];
-			float z = zmod * camera_matrix[2][2] + xmod * camera_matrix[2][0] + ymod * camera_matrix[2][1];
-
-			rayDirection.Set(x,y,z);
-			rayDirection.Normalize();
-			rayDirectionPt = rayLocation+rayDirection;
-
-			x = Vector3::Find_X_At_Z(intersectionZ, rayLocation, rayDirectionPt);
-			y = Vector3::Find_Y_At_Z(intersectionZ, rayLocation, rayDirectionPt);
-			if (x<minX) minX = x;
-			if (x>maxX) maxX = x;
-			if (y<minY) minY = y;
-			if (y>maxY) maxY = y;
-		}
-	}
-
-	// convert back to cell indexes.
-	minX /= MAP_XY_FACTOR;
-	maxX /= MAP_XY_FACTOR;
-	minY /= MAP_XY_FACTOR;
-	maxY /= MAP_XY_FACTOR;
-
-	minX += m_map->getBorderSize();
-	maxX += m_map->getBorderSize();
-	minY += m_map->getBorderSize();
-	maxY += m_map->getBorderSize();
-
-	visMinX = m_map->getXExtent();
-	visMinY = m_map->getYExtent();
-	visMaxX = 0;
-	visMaxY = 0;
-
-	///< @todo find out why values go out of range
-	if (minX<0) minX=0;
-	if (minY<0) minY=0;
-	if (maxX > visMinX) maxX = visMinX;
-	if (maxY > visMinY) maxY = visMinY;
-
-	const FrustumClass & frustum = camera->Get_Frustum();
-	Int limit = (maxX-minX)/2;
-	if (limit > WIDE_STEP/2) {
-		limit=WIDE_STEP/2;
-	}
-	calcVis(frustum, m_map, minX-WIDE_STEP/2, minY-WIDE_STEP/2, maxX+WIDE_STEP/2, maxY+WIDE_STEP/2, limit);
-
-	if (m_map) {
-		Int newOrgX;
-		if (visMaxX-visMinX > m_x) {
-			newOrgX = (maxX+minX)/2-m_x/2.0;	
-		} else {
-			newOrgX = (visMaxX+visMinX)/2-m_x/2.0;
-		}
-
-		Int newOrgY;
-		if (visMaxY - visMinY > m_y) {
-			newOrgY = visMinY+1;	
-		}	else {
-			newOrgY = (visMaxY+visMinY)/2-m_y/2.0;
-		}																															  
-		if (TheTacticalView->getFieldOfView() != 0) {
-			newOrgX = (visMaxX+visMinX)/2-m_x/2.0;
-			newOrgY = (visMaxY+visMinY)/2-m_y/2.0;
-		}
-		if (m_halfResMesh) {
-			newOrgX &= 0xFFFFFFFE;
-			newOrgY &= 0xFFFFFFFE;
-		}
-		Int deltaX = newOrgX - m_map->getDrawOrgX();
-		Int deltaY = newOrgY - m_map->getDrawOrgY();
-		if (IABS(deltaX) > m_x/2 || IABS(deltaY)>m_x/2) {
-			m_map->setDrawOrg(newOrgX, newOrgY);
-			m_originY = 0;
-			m_originX = 0;
-			updateBlock(0, 0, m_x-1, m_y-1, m_map, pLightsIterator); 
-			m_updating = false;
-			return;
-		}
-
-		if (abs(deltaX)>CENTER_LIMIT || abs(deltaY)>CENTER_LIMIT) {
-			if (abs(deltaY) >= CENTER_LIMIT) {
-				if (m_map->setDrawOrg(m_map->getDrawOrgX(), newOrgY)) {
-					Int minY = 0;
-					Int maxY = 0;
-					deltaY -= newOrgY - m_map->getDrawOrgY(); 
-					m_originY += deltaY;
-					if (m_originY >= m_y-1) m_originY -= m_y-1;
-					if (deltaY<0) {
-						minY = m_originY;
-						maxY = m_originY-deltaY;
-					} else {
-						minY = m_originY - deltaY;
-						maxY = m_originY;
-					}
-					minY-=cellOffset;
-					if (m_originY < 0) m_originY += m_y-1;
-					if (minY<0) {
-						minY += m_y-1;
-						if (minY<0) minY = 0;
-						updateBlock(0, minY, m_x-1, m_y-1, m_map, pLightsIterator);
-						updateBlock(0, 0, m_x-1, maxY, m_map, pLightsIterator);
-					} else {
-						updateBlock(0, minY, m_x-1, maxY, m_map, pLightsIterator);
-					}
-				}
-				// It is much more efficient to update a cople of columns one frame, and then
-				// a couple of rows.  So if we aren't "jumping" to a new view, and have done X
-				// recently, return.
-				if (abs(deltaX) < BIG_JUMP && !m_doXNextTime) {
-					m_updating = false;
-					m_doXNextTime = true;
-					return;	// Only do the y this frame.  Do x next frame.  jba.
-				}
-			}
-			if (abs(deltaX) > CENTER_LIMIT) {
-				m_doXNextTime = false;
-				newOrgX = m_map->getDrawOrgX() + deltaX;
-				if (m_map->setDrawOrg(newOrgX, m_map->getDrawOrgY())) {
-					Int minX = 0;
-					Int maxX = 0;
-					deltaX -= newOrgX - m_map->getDrawOrgX(); 
-					m_originX += deltaX;
-					if (m_originX >= m_x-1) m_originX -= m_x-1;
-					if (deltaX<0) {
-						minX = m_originX;
-						maxX = m_originX-deltaX;
-					} else {
-						minX = m_originX - deltaX;
-						maxX = m_originX;
-					}
-					minX-=cellOffset;
-					maxX+=cellOffset;
-					if (m_originX < 0) m_originX += m_x-1;
-					if (minX<0) {
-						minX += m_x-1;
-						if (minX<0) minX = 0;
-						updateBlock(minX,0,m_x-1, m_y-1, m_map, pLightsIterator);
-						updateBlock(0,0,maxX, m_y-1, m_map, pLightsIterator);
-					} else {
-						updateBlock(minX,0,maxX, m_y-1, m_map, pLightsIterator);
-					}
-				}
-			} 
-		}
-	}
-	m_updating = false;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::Render
-//=============================================================================
-/** Renders (draws) the terrain. */
-//=============================================================================
-//DECLARE_PERF_TIMER(Terrain_Render)
-
-void HeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
-{
-	//USE_PERF_TIMER(Terrain_Render)
-	
-	Int i,j,devicePasses;
-	W3DShaderManager::ShaderTypes st;
-	Bool doCloud = TheGlobalData->m_useCloudMap;
-
-	Matrix3D tm(Transform);
-#if 0 // There is some weirdness sometimes with the dx8 static buffers.
-			// This usually fixes terrain flashing.  jba.
-	static Int delay = 1;
-	delay --;
-	if (delay<1) {
-		delay = 1;
-		static Int ndx = -1;
-		ndx++;
-		if (ndx>=m_numVertexBufferTiles) {
-			ndx = 0;
-		}
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexBufferTiles[ndx]);
-		VERTEX_FORMAT *vb = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();	
-		vb = 0;
-	}
-#endif
-	// If there are trees, tell them to draw at the transparent time to draw.
-	if (m_treeBuffer) {
-		m_treeBuffer->setIsTerrain();
-	}
-
-
-#ifdef DO_UNIT_TIMINGS
-#pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
-	return;
-#endif
-
-#ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_disableTerrain) {
-		return;
-	}
-#endif
-
-	DX8Wrapper::Set_Light_Environment(rinfo.light_environment);
-
-	// Force shaders to update.
-	m_stageTwoTexture->restore();
-	DX8Wrapper::Set_Texture(0,NULL);
-	DX8Wrapper::Set_Texture(1,NULL);
-	ShaderClass::Invalidate();
-
-	//	tm.Scale(ObjSpaceExtent);
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-
-	//Apply the shader and material
-
-	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
-
-	Bool doMultiPassWireFrame=FALSE;
-
-	if (((RTS3DScene *)rinfo.Camera.Get_User_Data())->getCustomPassMode() == SCENE_PASS_ALPHA_MASK ||
-		((SceneClass *)rinfo.Camera.Get_User_Data())->Get_Extra_Pass_Polygon_Mode() == SceneClass::EXTRA_PASS_CLEAR_LINE)
-	{
-			if (WW3D::Is_Texturing_Enabled())
-			{	//first pass where we just fill the z-buffer
-
-				devicePasses=1;	//one pass solid, next in wireframe.
-				doMultiPassWireFrame=TRUE;
-
-				if (rinfo.Additional_Pass_Count())
-				{
-					rinfo.Peek_Additional_Pass(0)->Install_Materials();
-					renderTerrainPass(&rinfo.Camera);
-					rinfo.Peek_Additional_Pass(0)->UnInstall_Materials();
-					return;
-				}
-			}
-			else
-			{	//wireframe pass
-				//Set to vertex diffuse lighting
-				DX8Wrapper::Set_Material(m_vertexMaterialClass);
-				//Set shader to non-textured solid color from vertex
-				DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueSolidShader);
-				devicePasses=1;	//one pass solid, next in wireframe.
-				DX8Wrapper::Apply_Render_State_Changes();
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_TFACTOR );
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_TEXTUREFACTOR,0xff808080);
-				doMultiPassWireFrame=TRUE;
-				renderTerrainPass(&rinfo.Camera);
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_TEXTUREFACTOR,0xff008000);
-				return;
-			}
-	}
-	else
-	{
-		DX8Wrapper::Set_Material(m_vertexMaterialClass);
-		DX8Wrapper::Set_Shader(m_shaderClass);
-
-		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT) {
-			doCloud = false;
-		}
-
- 		st=W3DShaderManager::ST_TERRAIN_BASE; //set default shader
- 		
- 		//set correct shader based on current settings
- 		if (!ShaderClass::Is_Backface_Culling_Inverted())
- 		{	//not reflection pass
- 			if (TheGlobalData->m_useLightMap && doCloud)
- 			{	st=W3DShaderManager::ST_TERRAIN_BASE_NOISE12;
- 			}
- 			else
- 			if (TheGlobalData->m_useLightMap)
- 			{	//lightmap only
- 				st=W3DShaderManager::ST_TERRAIN_BASE_NOISE2;
- 			}
- 			else
- 			if (doCloud)
- 			{	//cloudmap only
- 				st=W3DShaderManager::ST_TERRAIN_BASE_NOISE1;
- 			}
- 		}
- 		else
- 		{	//reflection pass, just do base texture
- 			st=W3DShaderManager::ST_TERRAIN_BASE;
- 		}
- 
- 		//Find number of passes required to render current shader
- 		devicePasses=W3DShaderManager::getShaderPasses(st);
- 
- 		if (m_disableTextures)
- 			devicePasses=1;	//force to 1 lighting-only pass
- 
- 		//Specify all textures that this shader may need.
- 		W3DShaderManager::setTexture(0,m_stageZeroTexture);
- 		W3DShaderManager::setTexture(1,m_stageZeroTexture);
- 		W3DShaderManager::setTexture(2,m_stageTwoTexture);	//cloud
- 		W3DShaderManager::setTexture(3,m_stageThreeTexture);//noise
-		//Disable writes to destination alpha channel (if there is one)
-		if (DX8Wrapper::getBackBufferFormat() == WW3D_FORMAT_A8R8G8B8)
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
-	}
-
-	Int pass;
- 	for (pass=0; pass<devicePasses; pass++) {
-#ifdef TIMING_TESTS
-#endif
-		if (!doMultiPassWireFrame)	//multi-pass wireframe doesn't use regular shaders.
-		{
- 			if (m_disableTextures ) {
- 				DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaque2DShader);
- 				DX8Wrapper::Set_Texture(0,NULL);
-   			} else {
- 				W3DShaderManager::setShader(st, pass);
-			}
-		}
-
-		for (j=0; j<m_numVBTilesY; j++)
-			for (i=0; i<m_numVBTilesX; i++)
-			{
-				static int count = 0;
-				count++;
-				Int numPolys = VERTEX_BUFFER_TILE_LENGTH*VERTEX_BUFFER_TILE_LENGTH*2;
-				Int numVertex = (VERTEX_BUFFER_TILE_LENGTH*2)*(VERTEX_BUFFER_TILE_LENGTH*2);
-				if (m_halfResMesh) {
-					numPolys /= 4;
-					numVertex /= 4;
-				}
-				DX8Wrapper::Set_Vertex_Buffer(m_vertexBufferTiles[j*m_numVBTilesX+i]);
-#ifdef PRE_TRANSFORM_VERTEX
-				if (m_xformedVertexBuffer && pass==0) {
-					// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
-					DX8Wrapper::Apply_Render_State_Changes();
-					int code = DX8Wrapper::_Get_D3D_Device8()->ProcessVertices(0, 0, numVertex, m_xformedVertexBuffer[j*m_numVBTilesX+i], 0); 
-					::OutputDebugString("did process vertex\n");
-				}
-				if (m_xformedVertexBuffer) {
-					// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
-					DX8Wrapper::Apply_Render_State_Changes();
-					DX8Wrapper::_Get_D3D_Device8()->SetStreamSource(
-						0,
-						m_xformedVertexBuffer[j*m_numVBTilesX+i],
-						D3DXGetFVFVertexSize(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2));
-					DX8Wrapper::_Get_D3D_Device8()->SetVertexShader(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2);
-				}
-#endif				
-				if (Is_Hidden() == 0) {
-					DX8Wrapper::Draw_Triangles(	0,numPolys, 0,	numVertex);
-				}
-
-			}
-	}		
-
-	if (!doMultiPassWireFrame)
-	{
-		if (pass)	//shader was applied at least once?
- 			W3DShaderManager::resetShader(st);
-
-		//Draw feathered shorelines
-		renderShoreLines(&rinfo.Camera);
-
-		//Do additional pass over any tiles that have 3 textures blended together.
-		if (TheGlobalData->m_use3WayTerrainBlends)
-			renderExtraBlendTiles();
-
-	#ifdef TEST_CUSTOM_EDGING
-		// Draw edging just before last pass.
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Set_Texture(1,NULL);
-		m_stageTwoTexture->restore();
-		Int yCoordMin = m_map->getDrawOrgY();
-		Int yCoordMax = m_y+m_map->getDrawOrgY()-1;
-		Int xCoordMin = m_map->getDrawOrgX();
-		Int xCoordMax = m_x+m_map->getDrawOrgX()-1;	
-		m_customEdging->drawEdging(m_map, xCoordMin, xCoordMax, yCoordMin, yCoordMax, 
-			m_stageZeroTexture, doCloud?m_stageTwoTexture:NULL, TheGlobalData->m_useLightMap?m_stageThreeTexture:NULL);
-	#endif
-	#ifdef DO_ROADS
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Set_Texture(1,NULL);
-		m_stageTwoTexture->restore();
-
-		ShaderClass::Invalidate();
-		if (!ShaderClass::Is_Backface_Culling_Inverted()) {
-			DX8Wrapper::Set_Material(m_vertexMaterialClass);
-			if (Scene) {
-				RTS3DScene *pMyScene = (RTS3DScene *)Scene;
-				RefRenderObjListIterator pDynamicLightsIterator(pMyScene->getDynamicLights());
-				m_roadBuffer->drawRoads(&rinfo.Camera, doCloud?m_stageTwoTexture:NULL, TheGlobalData->m_useLightMap?m_stageThreeTexture:NULL,
-					m_disableTextures,xCoordMin-m_map->getBorderSize(), xCoordMax-m_map->getBorderSize(), yCoordMin-m_map->getBorderSize(), yCoordMax-m_map->getBorderSize(), &pDynamicLightsIterator);
-			}
-		}
-	#endif
-
-	#ifdef DO_SCORCH
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Set_Texture(1,NULL);
-		m_stageTwoTexture->restore();
-
-		ShaderClass::Invalidate();
-		if (!ShaderClass::Is_Backface_Culling_Inverted()) {
-			drawScorches();
-		}
-	#endif
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Set_Texture(1,NULL);
-		m_stageTwoTexture->restore();
-		ShaderClass::Invalidate();
-		DX8Wrapper::Apply_Render_State_Changes();
-
-		m_bridgeBuffer->drawBridges(&rinfo.Camera, m_disableTextures, m_stageTwoTexture);
-
-		if (TheTerrainTracksRenderObjClassSystem)
-			TheTerrainTracksRenderObjClassSystem->flush();
-
-		if (m_shroud && rinfo.Additional_Pass_Count())
-		{
-			rinfo.Peek_Additional_Pass(0)->Install_Materials();
-			renderTerrainPass(&rinfo.Camera);
-			rinfo.Peek_Additional_Pass(0)->UnInstall_Materials();
-		}
-
-		ShaderClass::Invalidate();
-		DX8Wrapper::Apply_Render_State_Changes();
-	}
-	else
-			m_bridgeBuffer->drawBridges(&rinfo.Camera, m_disableTextures, m_stageTwoTexture);
-
-	m_waypointBuffer->drawWaypoints(rinfo);
-
-	m_bibBuffer->renderBibs();
-
-	// We do some custom blending, so tell the shader class to reset everything.
-	DX8Wrapper::Set_Texture(0,NULL);
-	DX8Wrapper::Set_Texture(1,NULL);
-	m_stageTwoTexture->restore();
-	ShaderClass::Invalidate();
-	DX8Wrapper::Set_Material(NULL);
-
-}
-
-/**Render parts of terrain that are along the coast line and have vertices directly under the
-water plane.  Applying a custom render to these polygons allows for a smoother land->water
-transition*/
-void HeightMapRenderObjClass::renderShoreLines(CameraClass *pCamera)
-{
-	if (!TheGlobalData->m_showSoftWaterEdge || TheWaterTransparency->m_transparentWaterDepth==0 || m_numShoreLineTiles == 0)
-		return;
-
-	//Check if video card is capable of using this effect
-	if (DX8Wrapper::getBackBufferFormat() != WW3D_FORMAT_A8R8G8B8)
-		return;	//can't apply effect on cards without destination alpha
-
-	Int vertexCount = 0;
-	Int indexCount = 0;
-	Int xExtent = m_map->getXExtent();
-	Int border = m_map->getBorderSize();
-	Int drawEdgeY=m_map->getDrawOrgY()+m_map->getDrawHeight()-1;
-	Int drawEdgeX=m_map->getDrawOrgX()+m_map->getDrawWidth()-1;
-	if (drawEdgeX > (m_map->getXExtent()-1))
-		drawEdgeX = m_map->getXExtent()-1;
-	if (drawEdgeY > (m_map->getYExtent()-1))
-		drawEdgeY = m_map->getYExtent()-1;
-	Int drawStartX=m_map->getDrawOrgX();
-	Int drawStartY=m_map->getDrawOrgY();
-	const UnsignedByte* data = m_map->getDataPtr();
-	Int j=0;
-
-	ShaderClass unlitShader=ShaderClass::_PresetOpaque2DShader;
-	unlitShader.Set_Depth_Compare(ShaderClass::PASS_LEQUAL);
-	DX8Wrapper::Set_Shader(unlitShader);
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);
-	DX8Wrapper::Set_Texture(0,m_destAlphaTexture);
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,Matrix3D(1));
-	//Enabled writes to destination alpha only
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_ALPHA);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
-
-	while (j != m_numShoreLineTiles)
-	{
-		{	//Need to put this in another code block so vb/ib gets automatically locked/unlocked by destructors
-			DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,DEFAULT_MAX_BATCH_SHORELINE_TILES*4);
-			DynamicIBAccessClass ib_access(BUFFER_TYPE_DYNAMIC_DX8,DEFAULT_MAX_BATCH_SHORELINE_TILES*6);
-
-			DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-			VertexFormatXYZNDUV2 *vb= lock.Get_Formatted_Vertex_Array();
-			DynamicIBAccessClass::WriteLockClass lockib(&ib_access);
-			UnsignedShort *ib=lockib.Get_Index_Array();
-			if (!ib || !vb)
-			{	DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
-				return;
-			}
-
-			//Loop over visible terrain and extract all the tiles that need shoreline blend
-			for (; j<m_numShoreLineTiles; j++)
-			{
-				if (vertexCount >= (DEFAULT_MAX_BATCH_SHORELINE_TILES*4))
-					break;	//no room in vertex buffer
-
-				shoreLineTileInfo *shoreInfo=&m_shoreLineTilePositions[j];
-
-				Int x = shoreInfo->m_xy & 0xffff;
-				Int y = shoreInfo->m_xy >> 16;
-
-				if (x >= drawStartX && x < drawEdgeX &&	y >= drawStartY && y < drawEdgeY)
-				{	//this tile is inside visible region
-
-					Int idx = x+y*xExtent;
-
-					Real p0=data[idx]*MAP_HEIGHT_SCALE;
-					Real p1=data[idx+1]*MAP_HEIGHT_SCALE;
-					Real p2=data[idx + 1 + xExtent]*MAP_HEIGHT_SCALE;
-					Real p3=data[idx + xExtent]*MAP_HEIGHT_SCALE;
-
-					vb->x=(x-border)*MAP_XY_FACTOR;	 
-					vb->y=(y-border)*MAP_XY_FACTOR;
-					vb->z=p0;
-					vb->u1=shoreInfo->t0;
-					vb->v1=0;
-					vb++;
-
-					vb->x=(x+1-border)*MAP_XY_FACTOR;	 
-					vb->y=(y-border)*MAP_XY_FACTOR;
-					vb->z=p1;
-					vb->u1=shoreInfo->t1;
-					vb->v1=0;
-					vb++;
-
-					vb->x=(x+1-border)*MAP_XY_FACTOR;	 
-					vb->y=(y+1-border)*MAP_XY_FACTOR;
-					vb->z=p2;
-					vb->u1=shoreInfo->t2;
-					vb->v1=0;
-					vb++;
-
-					vb->x=(x-border)*MAP_XY_FACTOR;	 
-					vb->y=(y+1-border)*MAP_XY_FACTOR;
-					vb->z=p3;
-					vb->u1=shoreInfo->t3;
-					vb->v1=0;
-					vb++;
-					
-					if (m_map->getFlipState(x,y))
-					{
-						ib[0]=1+vertexCount;
-						ib[1]=3+vertexCount;
-						ib[2]=0+vertexCount;
-						ib[3]=1+vertexCount;
-						ib[4]=2+vertexCount;
-						ib[5]=3+vertexCount;
-					}
-					else
-					{
-						ib[0]=0+vertexCount;
-						ib[1]=2+vertexCount;
-						ib[2]=3+vertexCount;
-						ib[3]=0+vertexCount;
-						ib[4]=1+vertexCount;
-						ib[5]=2+vertexCount;
-					}
-					ib += 6;
-					vertexCount +=4;
-					indexCount +=6;
-				}
-			}
-
-			DX8Wrapper::Set_Index_Buffer(ib_access,0);
-			DX8Wrapper::Set_Vertex_Buffer(vb_access);
-		}//lock and fill ib/vb
-
-		if (indexCount > 0 && vertexCount > 0)
-			DX8Wrapper::Draw_Triangles(	0,indexCount/3, 0,	vertexCount);	//draw a quad, 2 triangles, 4 verts
-		vertexCount=0;
-		indexCount=0;
-	}//for all shore tiles
-
-	//Disable writes to destination alpha
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
-	ShaderClass::Invalidate();
-}
-
-///Performs additional terrain rendering pass, blending in the black shroud texture.
-void HeightMapRenderObjClass::renderTerrainPass(CameraClass *pCamera)
-{
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,Matrix3D(1));
-
-	//Apply the shader and material
-	
-	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
-
-	for (Int j=0; j<m_numVBTilesY; j++)
-		for (Int i=0; i<m_numVBTilesX; i++)
-		{
-			static int count = 0;
-			count++;
-			Int numPolys = VERTEX_BUFFER_TILE_LENGTH*VERTEX_BUFFER_TILE_LENGTH*2;
-			Int numVertex = (VERTEX_BUFFER_TILE_LENGTH*2)*(VERTEX_BUFFER_TILE_LENGTH*2);
-			if (m_halfResMesh) {
-				numPolys /= 4;
-				numVertex /= 4;
-			}
-			DX8Wrapper::Set_Vertex_Buffer(m_vertexBufferTiles[j*m_numVBTilesX+i]);
-#ifdef PRE_TRANSFORM_VERTEX
-			if (m_xformedVertexBuffer && pass==0) {
-				// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
-				DX8Wrapper::Apply_Render_State_Changes();
-				int code = DX8Wrapper::_Get_D3D_Device8()->ProcessVertices(0, 0, numVertex, m_xformedVertexBuffer[j*m_numVBTilesX+i], 0); 
-				::OutputDebugString("did process vertex\n");
-			}
-			if (m_xformedVertexBuffer) {
-				// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
-				DX8Wrapper::Apply_Render_State_Changes();
-				DX8Wrapper::_Get_D3D_Device8()->SetStreamSource(
-					0,
-					m_xformedVertexBuffer[j*m_numVBTilesX+i],
-					D3DXGetFVFVertexSize(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2));
-				DX8Wrapper::_Get_D3D_Device8()->SetVertexShader(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2);
-			}
-#endif				
-			if (Is_Hidden() == 0) {
-				DX8Wrapper::Draw_Triangles(	0,numPolys, 0,	numVertex);
-			}
-		}
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::renderTrees
-//=============================================================================
-/** Renders (draws) the trees. Since the trees are transparent, this has to be
-called after flush. */
-//=============================================================================
-void HeightMapRenderObjClass::renderTrees(CameraClass * camera)
-{
-#ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_disableObjects) {
-		return;
-	}
-#endif
-	if (m_map==NULL) return;
-	if (Scene==NULL) return;
-	if (m_treeBuffer) {
-		Matrix3D tm(Transform);
-		DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-		DX8Wrapper::Set_Material(m_vertexMaterialClass);
-		RTS3DScene *pMyScene = (RTS3DScene *)Scene;
-		RefRenderObjListIterator pDynamicLightsIterator(pMyScene->getDynamicLights());
-		m_treeBuffer->drawTrees(camera, &pDynamicLightsIterator);
-	}
-}
-
-/** Renders an additoinal terrain pass including only those tiles which have more than 2 textures
-blended together.  Used primarily for corner cases where 3 different textures meet.*/
-void HeightMapRenderObjClass::renderExtraBlendTiles(void)
-{
-	Int vertexCount = 0;
-	Int indexCount = 0;
-	Int xExtent = m_map->getXExtent();
-	Int border = m_map->getBorderSize();
-	static Int maxBlendTiles = DEFAULT_MAX_FRAME_EXTRABLEND_TILES;
-
-	if (!m_numExtraBlendTiles)
-		return;	//nothing to draw
-
-	if (maxBlendTiles > 10000)	//we can only fit about 10000 tiles into a single VB.
-		maxBlendTiles = 10000;
-
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,DX8_FVF_XYZNDUV2,maxBlendTiles*4);
-	DynamicIBAccessClass ib_access(BUFFER_TYPE_DYNAMIC_DX8,maxBlendTiles*6);
-	{
-
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* vb= lock.Get_Formatted_Vertex_Array();
-		DynamicIBAccessClass::WriteLockClass lockib(&ib_access);
-		UnsignedShort *ib=lockib.Get_Index_Array();
-
-		if (!vb || !ib) return;
-
-		const UnsignedByte* data = m_map->getDataPtr();
-
-		//Loop over visible terrain and extract all the tiles that need extra blend
-		Int drawEdgeY=m_map->getDrawOrgY()+m_map->getDrawHeight()-1;
-		Int drawEdgeX=m_map->getDrawOrgX()+m_map->getDrawWidth()-1;
-		if (drawEdgeX > (m_map->getXExtent()-1))
-			drawEdgeX = m_map->getXExtent()-1;
-		if (drawEdgeY > (m_map->getYExtent()-1))
-			drawEdgeY = m_map->getYExtent()-1;
-		Int drawStartX=m_map->getDrawOrgX();
-		Int drawStartY=m_map->getDrawOrgY();
-
-		for (Int j=0; j<m_numExtraBlendTiles; j++)
-		{
-			if (vertexCount >= (maxBlendTiles*4))
-				break;	//no room in vertex buffer
-
-			Real U[4],V[4];
-			UnsignedByte alpha[4];
-			Bool flipState,cliffState;
-			Int x = m_extraBlendTilePositions[j] & 0xffff;
-			Int y = m_extraBlendTilePositions[j] >> 16;
-
-			if (x >= drawStartX && x < drawEdgeX &&
-				y >= drawStartY && y < drawEdgeY &&
-				m_map->getExtraAlphaUVData(x,y,U,V,alpha,&flipState, &cliffState))
-			{	//this tile is inside visible region and has 3rd blend layer.
-
-				Int idx = x+y*xExtent;
-
-				Real p0=data[idx]*MAP_HEIGHT_SCALE;
-				Real p1=data[idx+1]*MAP_HEIGHT_SCALE;
-				Real p2=data[idx + 1 + xExtent]*MAP_HEIGHT_SCALE;
-				Real p3=data[idx + xExtent]*MAP_HEIGHT_SCALE;
-				if (cliffState && abs(p0-p2) > abs(p1-p3))	//cliffs sometimes force a flip
-					flipState = TRUE;
-
-				vb->x=(x-border)*MAP_XY_FACTOR;	 
-				vb->y=(y-border)*MAP_XY_FACTOR;
-				vb->z=p0;
-				vb->diffuse=(alpha[0]<<24)|(getStaticDiffuse(x,y) & 0x00ffffff);
-				vb->u1=U[0];
-				vb->v1=V[0];
-				vb++;
-
-				vb->x=(x+1-border)*MAP_XY_FACTOR;	 
-				vb->y=(y-border)*MAP_XY_FACTOR;
-				vb->z=p1;
-				vb->diffuse=(alpha[1]<<24)|(getStaticDiffuse(x+1,y) & 0x00ffffff);
-				vb->u1=U[1];
-				vb->v1=V[1];
-				vb++;
-
-				vb->x=(x+1-border)*MAP_XY_FACTOR;	 
-				vb->y=(y+1-border)*MAP_XY_FACTOR;
-				vb->z=p2;
-				vb->diffuse=(alpha[2]<<24)|(getStaticDiffuse(x+1,y+1) & 0x00ffffff);
-				vb->u1=U[2];
-				vb->v1=V[2];
-				vb++;
-
-				vb->x=(x-border)*MAP_XY_FACTOR;	 
-				vb->y=(y+1-border)*MAP_XY_FACTOR;
-				vb->z=p3;
-				vb->diffuse=(alpha[3]<<24)|(getStaticDiffuse(x,y+1) & 0x00ffffff);
-				vb->u1=U[3];
-				vb->v1=V[3];
-				vb++;
-				
-				if (flipState)
-				{
-					ib[0]=1+vertexCount;
-					ib[1]=3+vertexCount;
-					ib[2]=0+vertexCount;
-					ib[3]=1+vertexCount;
-					ib[4]=2+vertexCount;
-					ib[5]=3+vertexCount;
-				}
-				else
-				{
-					ib[0]=0+vertexCount;
-					ib[1]=2+vertexCount;
-					ib[2]=3+vertexCount;
-					ib[3]=0+vertexCount;
-					ib[4]=1+vertexCount;
-					ib[5]=2+vertexCount;
-				}
-				ib += 6;
-				vertexCount +=4;
-				indexCount +=6;
-			}//tile has 3rd blend layer and is visible
-		}	//for all extre blend tiles
-	}//unlock vertex buffer
-
-	if (vertexCount)
-	{
-		//Check if we couldn't fit all blend tiles into vertex buffer so we can enlarge it for next frame.
-		if (vertexCount == (maxBlendTiles*4))
-			maxBlendTiles += 16;	//enlarge by 16 to reduce trashing.
-		
-		ShaderClass::Invalidate();	//invalidate to force shader to reset since we directly changed states
-		DX8Wrapper::Set_Index_Buffer(ib_access,0);
-		DX8Wrapper::Set_Vertex_Buffer(vb_access);
-		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-		DX8Wrapper::Set_Material(vmat);
-		REF_PTR_RELEASE(vmat);
-		ShaderClass shader=ShaderClass::_PresetOpaqueShader;
-		shader.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);	//disable writes to z
-		DX8Wrapper::Set_Shader(shader);
-
-		if (TheGlobalData->m_use3WayTerrainBlends == 2)
-		{
-			shader.Set_Primary_Gradient(ShaderClass::GRADIENT_DISABLE);	//disable lighting.
-			shader.Set_Texturing(ShaderClass::TEXTURING_DISABLE);		//disable texturing.
-			DX8Wrapper::Set_Shader(shader);
-			DX8Wrapper::Set_Texture(0,NULL);	//debug mode which draws terrain tiles in white.
-			if (Is_Hidden() == 0) {
-				DX8Wrapper::Draw_Triangles(	0,indexCount/3, 0,	vertexCount);	//draw a quad, 2 triangles, 4 verts
-			}
-		}
-		else
-		{
-			W3DShaderManager::setTexture(0,m_stageOneTexture);
-			W3DShaderManager::setTexture(1,m_stageTwoTexture);	//cloud
-			W3DShaderManager::setTexture(2,m_stageThreeTexture);	//noise/lightmap
-
-			W3DShaderManager::ShaderTypes st = W3DShaderManager::ST_ROAD_BASE;
-
-			Bool doCloud = TheGlobalData->m_useCloudMap;
-			if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT) {
-				doCloud = false;
-			}
-
-			if (TheGlobalData->m_useLightMap && doCloud)
- 			{	
-				st = W3DShaderManager::ST_ROAD_BASE_NOISE12;
- 			}
- 			else if (TheGlobalData->m_useLightMap)
- 			{	//lightmap only
- 				st = W3DShaderManager::ST_ROAD_BASE_NOISE2;
- 			}
- 			else if (doCloud)
- 			{	//cloudmap only
- 				st = W3DShaderManager::ST_ROAD_BASE_NOISE1;
- 			}
-
-			Int devicePasses=W3DShaderManager::getShaderPasses(st);
-
-			for (Int pass=0; pass < devicePasses; pass++)
-			{
-				W3DShaderManager::setShader(st, pass);
-				//Draw all this road type.
-				if (Is_Hidden() == 0) {
-					DX8Wrapper::Draw_Triangles(	0,indexCount/3, 0,	vertexCount);	//draw a quad, 2 triangles, 4 verts
-				}
-			}
-			W3DShaderManager::resetShader(st);
-		}
-  }
-}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp
index 50884d18e15..5022bbb876b 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp
@@ -305,7 +305,7 @@ W3DBufferManager::W3DVertexBufferSlot * W3DBufferManager::allocateSlotStorage(VB
 		m_W3DVertexBuffers[fvfType] = &m_W3DEmptyVertexBuffers[m_numEmptyVertexBuffersAllocated];
 		m_W3DVertexBuffers[fvfType]->m_nextVB=pVB;	//link to list
 		m_numEmptyVertexBuffersAllocated++;
-		
+
 		pVB=m_W3DVertexBuffers[fvfType];	//get new list head
 
 		Int vbSize=__max(DEFAULT_VERTEX_BUFFER_SIZE,size);
@@ -425,7 +425,7 @@ W3DBufferManager::W3DIndexBufferSlot * W3DBufferManager::allocateSlotStorage(Int
 		m_W3DIndexBuffers = &m_W3DEmptyIndexBuffers[m_numEmptyIndexBuffersAllocated];
 		m_W3DIndexBuffers->m_nextIB=pIB;	//link to list
 		m_numEmptyIndexBuffersAllocated++;
-		
+
 		pIB=m_W3DIndexBuffers;	//get new list head
 
 		Int ibSize=__max(DEFAULT_INDEX_BUFFER_SIZE,size);
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
index bbd0b18ae2f..49c3c00e9b5 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
@@ -56,13 +56,7 @@
 #include "GameClient/Drawable.h"
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 #include "W3DDevice/GameClient/W3DShadow.h"
-#include "W3DDevice/GameClient/HeightMap.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 /** @todo: We're going to have a pool of a couple rendertargets to use
 in rare cases when dynamic shadows need to be generated.  Maybe we can
@@ -93,19 +87,13 @@ extern int nShadowStartBatchIndex;
 extern int SHADOW_VERTEX_SIZE;
 extern int SHADOW_INDEX_SIZE;
 
-//Bounding rectangle around rendered portion of terrain.
-static Int drawEdgeX=0;
-static Int drawEdgeY=0;
-static Int drawStartX=0;
-static Int drawStartY=0;
-
 //Global streaming vertex buffer with x,y,z,u,v type.
 struct SHADOW_DECAL_VERTEX	//vertex structure passed to D3D
 {
 		float x,y,z;
 		DWORD diffuse;
 		float u,v;
-}; 
+};
 
 #define SHADOW_DECAL_FVF	D3DFVF_XYZ|D3DFVF_TEX1|D3DFVF_DIFFUSE
 
@@ -171,8 +159,8 @@ class W3DShadowTexture : public RefCountClass, public	HashableClass
 
 		const char *		Get_Name(void) const	{ return m_namebuf;}
 		void				Set_Name(const char *name)
-		{	memset(m_namebuf,0,sizeof(m_namebuf));	//pad with zero so always ends with null character.
-			strncpy(m_namebuf,name,sizeof(m_namebuf)-1);
+		{
+			strlcpy(m_namebuf,name,sizeof(m_namebuf));
 		}
 		TextureClass	*getTexture(void)	{ return m_texture;}
 		void					 setTexture(TextureClass *texture)	{m_texture = texture;}
@@ -220,6 +208,10 @@ W3DProjectedShadowManager::W3DProjectedShadowManager(void)
 	m_W3DShadowTextureManager = NULL;
 	m_shadowCamera = NULL;
 	m_shadowContext= NULL;
+	m_drawEdgeX = 0;
+	m_drawEdgeY = 0;
+	m_drawStartX = 0;
+	m_drawStartY = 0;
 }
 
 W3DProjectedShadowManager::~W3DProjectedShadowManager(void)
@@ -246,7 +238,7 @@ void W3DProjectedShadowManager::reset( void )
 
 	m_W3DShadowTextureManager->freeAllTextures();
 
-}  // end Reset
+}
 
 Bool W3DProjectedShadowManager::init( void )
 {
@@ -269,7 +261,7 @@ Bool W3DProjectedShadowManager::ReAcquireResources(void)
 	DEBUG_ASSERTCRASH(m_dynamicRenderTarget == NULL, ("Acquire of existing shadow render target"));
 
 	m_renderTargetHasAlpha=TRUE;
-	if ((m_dynamicRenderTarget=DX8Wrapper::Create_Render_Target (DEFAULT_RENDER_TARGET_WIDTH, DEFAULT_RENDER_TARGET_HEIGHT, true)) == NULL)
+	if ((m_dynamicRenderTarget=DX8Wrapper::Create_Render_Target (DEFAULT_RENDER_TARGET_WIDTH, DEFAULT_RENDER_TARGET_HEIGHT, WW3D_FORMAT_A8R8G8B8)) == NULL)
 	{
 			m_renderTargetHasAlpha=FALSE;
 
@@ -285,10 +277,10 @@ Bool W3DProjectedShadowManager::ReAcquireResources(void)
 
 	if (FAILED(m_pDev->CreateIndexBuffer
 	(
-		SHADOW_DECAL_INDEX_SIZE*sizeof(WORD), 
-		D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC, 
-		D3DFMT_INDEX16, 
-		D3DPOOL_DEFAULT, 
+		SHADOW_DECAL_INDEX_SIZE*sizeof(WORD),
+		D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC,
+		D3DFMT_INDEX16,
+		D3DPOOL_DEFAULT,
 		&shadowDecalIndexBufferD3D
 	)))
 		return FALSE;
@@ -299,9 +291,9 @@ Bool W3DProjectedShadowManager::ReAcquireResources(void)
 		if (FAILED(m_pDev->CreateVertexBuffer
 		(
 			SHADOW_DECAL_VERTEX_SIZE*sizeof(SHADOW_DECAL_VERTEX),
-			D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC, 
+			D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC,
 			0,
-			D3DPOOL_DEFAULT, 
+			D3DPOOL_DEFAULT,
 			&shadowDecalVertexBufferD3D
 		)))
 			return FALSE;
@@ -342,7 +334,7 @@ void W3DProjectedShadowManager::updateRenderTargetTextures(void)
 	for( shadow = m_shadowList; shadow; shadow = shadow->m_next )
 	{	//decals don't need any updates on a per-frame basis since
 		//the image never changes.
-		if (shadow->m_type != SHADOW_DECAL) 
+		if (shadow->m_type != SHADOW_DECAL)
 			shadow->update();
 	}
 }
@@ -354,7 +346,7 @@ Int W3DProjectedShadowManager::renderProjectedTerrainShadow(W3DProjectedShadow *
 	struct SHADOW_VOLUME_VERTEX	//vertex structure passed to D3D
 	{
 		float x,y,z;
-	}; 
+	};
 
 	Int i,j,k;
 	UnsignedByte alpha[4];
@@ -420,7 +412,7 @@ Int W3DProjectedShadowManager::renderProjectedTerrainShadow(W3DProjectedShadow *
 				float ycoord = (float)j * MAP_XY_FACTOR;
 
 				for (i=startX; i <= endX; i++)
-				{	
+				{
 					pvVertices->x=(float)i*MAP_XY_FACTOR;
 					pvVertices->y=ycoord;
 					pvVertices->z=(float)hmap->getHeight(i,j)*MAP_HEIGHT_SCALE;
@@ -492,7 +484,7 @@ Int W3DProjectedShadowManager::renderProjectedTerrainShadow(W3DProjectedShadow *
 		shadowIndexBufferD3D->Unlock();
 
 		m_pDev->SetIndices(shadowIndexBufferD3D,nShadowStartBatchVertex);
-			
+
 		m_pDev->SetTransform(D3DTS_WORLD,(_D3DMATRIX *)&mWorld);
 
 		m_pDev->SetStreamSource(0,shadowVertexBufferD3D,sizeof(SHADOW_VOLUME_VERTEX));
@@ -515,7 +507,7 @@ Int W3DProjectedShadowManager::renderProjectedTerrainShadow(W3DProjectedShadow *
 		m_pDev->SetRenderState( D3DRS_SRCBLEND,  D3DBLEND_DESTCOLOR);
 		m_pDev->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_ZERO );
 
-		
+
 		if (DX8Wrapper::_Is_Triangle_Draw_Enabled())
 		{
 			Debug_Statistics::Record_DX8_Polys_And_Vertices(numPolys,numVerts,ShaderClass::_PresetOpaqueShader);
@@ -556,7 +548,7 @@ enum BlendDirection CPP_11(: Int)
 	B_B,	//visble on bottom
 	B_TL,	//visible on top/left
 	B_BR,	//visible on bottom/right
-	B_TR,	//visible on top/right 
+	B_TR,	//visible on top/right
 	B_BL	//visilbe on bottom/left
 };
 
@@ -587,7 +579,7 @@ static void RenderVBTile(TextureClass *text, Real ox, Real oy, Real ou, Real ov,
 
 	UnsignedShort *ib=lockib.Get_Index_Array();
 
-	vb->x=ox;	 
+	vb->x=ox;
 	vb->y=oy;
 	vb->z=TILE_HEIGHT;
 	vb->diffuse=TILE_DIFFUSE|BDToVA[bd][0];
@@ -595,7 +587,7 @@ static void RenderVBTile(TextureClass *text, Real ox, Real oy, Real ou, Real ov,
 	vb->v1=ov;
 	vb++;
 
-	vb->x=ox;	 
+	vb->x=ox;
 	vb->y=oy-10.0f;
 	vb->z=TILE_HEIGHT;
 	vb->diffuse=TILE_DIFFUSE|BDToVA[bd][1];
@@ -603,7 +595,7 @@ static void RenderVBTile(TextureClass *text, Real ox, Real oy, Real ou, Real ov,
 	vb->v1=ov+0.25f;
 	vb++;
 
-	vb->x=ox+10.0f;	 
+	vb->x=ox+10.0f;
 	vb->y=oy-10.0f;
 	vb->z=TILE_HEIGHT;
 	vb->diffuse=TILE_DIFFUSE|BDToVA[bd][2];
@@ -611,7 +603,7 @@ static void RenderVBTile(TextureClass *text, Real ox, Real oy, Real ou, Real ov,
 	vb->v1=ov+0.25f;
 	vb++;
 
-	vb->x=ox+10.0f;	 
+	vb->x=ox+10.0f;
 	vb->y=oy;
 	vb->z=TILE_HEIGHT;
 	vb->diffuse=TILE_DIFFUSE|BDToVA[bd][3];
@@ -731,7 +723,7 @@ void W3DProjectedShadowManager::flushDecals(W3DShadowTexture *texture, ShadowTyp
 	m_pDev->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
 	m_pDev->SetTextureStageState(0, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
 */
-	 
+
 
 	m_pDev->SetIndices(shadowDecalIndexBufferD3D,nShadowDecalStartBatchVertex);
 	m_pDev->SetTransform(D3DTS_WORLD,(_D3DMATRIX *)&mWorld);
@@ -839,7 +831,7 @@ void W3DProjectedShadowManager::queueDecal(W3DProjectedShadow *shadow)
 				Drawable *draw=((DrawableInfo *)robj->Get_User_Data())->m_drawable;
 				const Object *object=draw->getObject();
 				PathfindLayerEnum objectLayer;
-				if (object && (objectLayer=object->getLayer()) != LAYER_GROUND) 
+				if (object && (objectLayer=object->getLayer()) != LAYER_GROUND)
 				{	//check if object that this decal belongs to is not on the ground (bridge?)
 					layerHeight=BRIDGE_OFFSET_FACTOR+TheTerrainLogic->getLayerHeight(objPos.X,objPos.Y,objectLayer);
 				}
@@ -964,15 +956,15 @@ void W3DProjectedShadowManager::queueDecal(W3DProjectedShadow *shadow)
 		Int	startY=REAL_TO_INT_FLOOR(((objPos.Y+min_y)*mapScaleInv)) + borderSize;
 		Int endY=REAL_TO_INT_CEIL(((objPos.Y+max_y)*mapScaleInv)) + borderSize;
 
-		startX = __max(startX,drawStartX);
-		startX = __min(startX,drawEdgeX);
-		startY = __max(startY,drawStartY);
-		startY = __min(startY,drawEdgeY);
+		startX = __max(startX,m_drawStartX);
+		startX = __min(startX,m_drawEdgeX);
+		startY = __max(startY,m_drawStartY);
+		startY = __min(startY,m_drawEdgeY);
 
-		endX = __max(endX,drawStartX);
-		endX = __min(endX,drawEdgeX);
-		endY = __max(endY,drawStartY);
-		endY = __min(endY,drawEdgeY);
+		endX = __max(endX,m_drawStartX);
+		endX = __min(endX,m_drawEdgeX);
+		endY = __max(endY,m_drawStartY);
+		endY = __min(endY,m_drawEdgeY);
 
 		//Check if decal too large to fit inside 65536 index buffer.
 		//try clipping each direction to < 104 since that's more than
@@ -1044,7 +1036,7 @@ void W3DProjectedShadowManager::queueDecal(W3DProjectedShadow *shadow)
 					hmapVertex.Y=(float)(j-borderSize) * MAP_XY_FACTOR;
 
 					for (i=startX; i <= endX; i++)
-					{	
+					{
 						hmapVertex.X=(float)(i-borderSize)*MAP_XY_FACTOR;
 						hmapVertex.Z=__max((float)hmap->getHeight(i,j)*MAP_HEIGHT_SCALE,layerHeight);
 						pvVertices->x=hmapVertex.X;
@@ -1063,7 +1055,7 @@ void W3DProjectedShadowManager::queueDecal(W3DProjectedShadow *shadow)
 				hmapVertex.Y=(float)(j-borderSize) * MAP_XY_FACTOR;
 
 				for (i=startX; i <= endX; i++)
-				{	
+				{
 					hmapVertex.X=(float)(i-borderSize)*MAP_XY_FACTOR;
 					hmapVertex.Z=(float)hmap->getHeight(i,j)*MAP_HEIGHT_SCALE+0.01f * MAP_XY_FACTOR;
 					pvVertices->x=hmapVertex.X;
@@ -1102,7 +1094,7 @@ void W3DProjectedShadowManager::queueDecal(W3DProjectedShadow *shadow)
 			for (j=startY,rowStart=0; j<endY; j++,rowStart+=vertsPerRow)
 			{
 				for (i=rowStart,k=startX; k<endX; i++,k++)
-				{	
+				{
 					///@todo: fix the winding order in heightmap to be in strip order like above!
 					if (hmap->getFlipState(k,j))
 					{	pvIndices[0]=i+1+nShadowDecalVertsInBatch;
@@ -1281,33 +1273,40 @@ void W3DProjectedShadowManager::queueSimpleDecal(W3DProjectedShadow *shadow)
 
 }
 
+void W3DProjectedShadowManager::prepareShadows()
+{
+	if (!TheTerrainRenderObject)
+		return;
+
+	WorldHeightMap *hmap=TheTerrainRenderObject->getMap();
+
+	if (!hmap)
+		return;
+
+	//Find extents of visible terrain
+	m_drawEdgeY=hmap->getDrawOrgY()+hmap->getDrawHeight()-1;
+	m_drawEdgeX=hmap->getDrawOrgX()+hmap->getDrawWidth()-1;
+	if (m_drawEdgeX > (hmap->getXExtent()-1))
+		m_drawEdgeX = hmap->getXExtent()-1;
+	if (m_drawEdgeY > (hmap->getYExtent()-1))
+		m_drawEdgeY = hmap->getYExtent()-1;
+	m_drawStartX=hmap->getDrawOrgX();
+	m_drawStartY=hmap->getDrawOrgY();
+}
+
 Int W3DProjectedShadowManager::renderShadows(RenderInfoClass & rinfo)
 {
-	///@todo: implement this method.
-	W3DProjectedShadow *shadow;
-	static AABoxClass aaBox;
-	static SphereClass sphere;
 	Int projectionCount=0;
 
+	if (!TheTerrainRenderObject)
+		return projectionCount;
+
 	if (!m_shadowList && !m_decalList)
 		return	projectionCount;	//there are no shadows to render.
 
-	//Find extents of visible terrain
-	if (TheTerrainRenderObject)
-	{
-		WorldHeightMap *hmap=TheTerrainRenderObject->getMap();
-
-		drawEdgeY=hmap->getDrawOrgY()+hmap->getDrawHeight()-1;
-		drawEdgeX=hmap->getDrawOrgX()+hmap->getDrawWidth()-1;
-		if (drawEdgeX > (hmap->getXExtent()-1))
-			drawEdgeX = hmap->getXExtent()-1;
-		if (drawEdgeY > (hmap->getYExtent()-1))
-			drawEdgeY = hmap->getYExtent()-1;
-		drawStartX=hmap->getDrawOrgX();
-		drawStartY=hmap->getDrawOrgY();
-	}
-	else
-		return projectionCount;
+	W3DProjectedShadow *shadow;
+	static AABoxClass aaBox;
+	static SphereClass sphere;
 
 	//According to Nvidia there's a D3D bug that happens if you don't start with a
 	//new dynamic VB each frame - so we force a DISCARD by overflowing the counter.
@@ -1324,7 +1323,7 @@ Int W3DProjectedShadowManager::renderShadows(RenderInfoClass & rinfo)
 		ShadowType lastShadowType = SHADOW_NONE;
 
 		for( shadow = m_shadowList; shadow; shadow = shadow->m_next )
-		{		
+		{
 			if (shadow->m_isEnabled && !shadow->m_isInvisibleEnabled)
 			{
 				if (shadow->m_type & SHADOW_DECAL)
@@ -1420,17 +1419,17 @@ Int W3DProjectedShadowManager::renderShadows(RenderInfoClass & rinfo)
 												rinfo.Pop_Material_Pass();
 												projectionCount++;	//keep track of number of shadow projections
 											}
-									}//robj
-								}//di
-							}	// end for drawmodule 
-					}  // end for obj
+									}
+								}
+							}
+					}
 				}
-			}//shadow is enabled
+			}
 		}
 
 		flushDecals(lastShadowDecalTexture,lastShadowType);	//make sure there are not any unrendered decals left over.
 		TheDX8MeshRenderer.Flush();	//draw all the shadow receiving objects
-	}//rendering shadows
+	}
 	if (m_decalList)
 	{
 		//keep track of active decal texture so we can render all decals at once.
@@ -1438,7 +1437,7 @@ Int W3DProjectedShadowManager::renderShadows(RenderInfoClass & rinfo)
 		ShadowType lastShadowType = SHADOW_NONE;
 
 		for( shadow = m_decalList; shadow; shadow = shadow->m_next )
-		{		
+		{
 			if (shadow->m_isEnabled && !shadow->m_isInvisibleEnabled)
 			{
 				if (lastShadowDecalTexture == NULL)
@@ -1458,7 +1457,7 @@ Int W3DProjectedShadowManager::renderShadows(RenderInfoClass & rinfo)
 					queueDecal(shadow);	//only draw shadow if casting object is visible
 					projectionCount++;
 				}
-			}//shadow is enabled
+			}
 		}
 
 		flushDecals(lastShadowDecalTexture,lastShadowType);	//make sure there are not any unrendered decals left over.
@@ -1477,8 +1476,7 @@ Shadow* W3DProjectedShadowManager::addDecal(Shadow::ShadowTypeInfo *shadowInfo)
 	Real	decalSizeY=0.0f;
 
 	Bool	allowSunDirection=FALSE;
-	Char	texture_name[64];
-	Int nameLen;
+	Char texture_name[ARRAY_SIZE(shadowInfo->m_ShadowName)];
 
 	if (!shadowInfo)
 		return NULL;	//right now we require hardware render-to-texture support
@@ -1486,10 +1484,9 @@ Shadow* W3DProjectedShadowManager::addDecal(Shadow::ShadowTypeInfo *shadowInfo)
 	//simple decal using the premade texture specified.
 	//can be always perpendicular to model's z-axis or projected
 	//onto world geometry.
-	nameLen=strlen(shadowInfo->m_ShadowName);
-	strncpy(texture_name,shadowInfo->m_ShadowName,nameLen);
-	strcpy(texture_name+nameLen,".tga");	//append texture extension
-	
+	strlcpy(texture_name, shadowInfo->m_ShadowName, ARRAY_SIZE(texture_name));
+	strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
+
 	//Check if we previously added a decal using this texture
 	st=m_W3DShadowTextureManager->getTexture(texture_name);
 	if (st == NULL)
@@ -1500,7 +1497,7 @@ Shadow* W3DProjectedShadowManager::addDecal(Shadow::ShadowTypeInfo *shadowInfo)
 		w3dTexture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 		w3dTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
 
-		DEBUG_ASSERTCRASH(w3dTexture != NULL, ("Could not load decal texture: %s\n",texture_name));
+		DEBUG_ASSERTCRASH(w3dTexture != NULL, ("Could not load decal texture: %s",texture_name));
 
 		if (!w3dTexture)
 			return NULL;
@@ -1566,19 +1563,7 @@ Shadow* W3DProjectedShadowManager::addDecal(Shadow::ShadowTypeInfo *shadowInfo)
 		m_decalList = shadow;
 	}
 
-	switch (shadow->m_type)
-	{
-		case SHADOW_DECAL:
-		case SHADOW_ALPHA_DECAL:
-		case SHADOW_ADDITIVE_DECAL:
-			m_numDecalShadows++;
-			break;
-		case SHADOW_PROJECTION:
-			m_numProjectionShadows++;
-		default:
-			break;
-	}
-
+	updateShadowNumbers(shadow->m_type, +1);
 	return shadow;
 }
 
@@ -1595,8 +1580,7 @@ Shadow* W3DProjectedShadowManager::addDecal(RenderObjClass *robj, Shadow::Shadow
 	Real	decalOffsetY=0.0f;
 
 	Bool	allowSunDirection=FALSE;
-	Char	texture_name[64];
-	Int nameLen;
+	Char texture_name[ARRAY_SIZE(shadowInfo->m_ShadowName)];
 
 	if (!robj || !shadowInfo)
 		return NULL;	//right now we require hardware render-to-texture support
@@ -1604,10 +1588,9 @@ Shadow* W3DProjectedShadowManager::addDecal(RenderObjClass *robj, Shadow::Shadow
 	//simple decal using the premade texture specified.
 	//can be always perpendicular to model's z-axis or projected
 	//onto world geometry.
-	nameLen=strlen(shadowInfo->m_ShadowName);
-	strncpy(texture_name,shadowInfo->m_ShadowName,nameLen);
-	strcpy(texture_name+nameLen,".tga");	//append texture extension
-	
+	strlcpy(texture_name, shadowInfo->m_ShadowName, ARRAY_SIZE(texture_name));
+	strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
+
 	//Check if we previously added a decal using this texture
 	st=m_W3DShadowTextureManager->getTexture(texture_name);
 	if (st == NULL)
@@ -1618,7 +1601,7 @@ Shadow* W3DProjectedShadowManager::addDecal(RenderObjClass *robj, Shadow::Shadow
 		w3dTexture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 		w3dTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
 
-		DEBUG_ASSERTCRASH(w3dTexture != NULL, ("Could not load decal texture: %s\n",texture_name));
+		DEBUG_ASSERTCRASH(w3dTexture != NULL, ("Could not load decal texture: %s",texture_name));
 
 		if (!w3dTexture)
 			return NULL;
@@ -1702,19 +1685,7 @@ Shadow* W3DProjectedShadowManager::addDecal(RenderObjClass *robj, Shadow::Shadow
 		m_decalList = shadow;
 	}
 
-	switch (shadow->m_type)
-	{
-		case SHADOW_DECAL:
-		case SHADOW_ALPHA_DECAL:
-		case SHADOW_ADDITIVE_DECAL:
-			m_numDecalShadows++;
-			break;
-		case SHADOW_PROJECTION:
-			m_numProjectionShadows++;
-		default:
-			break;
-	}
-
+	updateShadowNumbers(shadow->m_type, +1);
 	return shadow;
 }
 
@@ -1730,8 +1701,7 @@ W3DProjectedShadow* W3DProjectedShadowManager::addShadow(RenderObjClass *robj, S
 	Real	decalOffsetY=0.0f;
 
 	Bool	allowSunDirection=FALSE;
-	Char	texture_name[64];
-	Int nameLen;
+	Char texture_name[ARRAY_SIZE(shadowInfo->m_ShadowName)];
 
 
 	if (!m_dynamicRenderTarget || !robj || !TheGlobalData->m_useShadowDecals)
@@ -1745,15 +1715,17 @@ W3DProjectedShadow* W3DProjectedShadowManager::addShadow(RenderObjClass *robj, S
 		{		//simple decal using the premade texture specified.
 				//can be always perpendicular to model's z-axis or projected
 				//onto world geometry.
-				nameLen=strlen(shadowInfo->m_ShadowName);
-				if (nameLen <= 1)	//no texture name given, use same as object
-				{	strcpy(texture_name,defaultDecalName);
+				if (strlen(shadowInfo->m_ShadowName) <= 1)	//no texture name given, use same as object
+				{
+					static_assert(ARRAY_SIZE(texture_name) >= ARRAY_SIZE(defaultDecalName), "Incorrect array size");
+					strcpy(texture_name, defaultDecalName);
 				}
 				else
-				{	strncpy(texture_name,shadowInfo->m_ShadowName,nameLen);
-					strcpy(texture_name+nameLen,".tga");	//append texture extension
+				{
+					strlcpy(texture_name, shadowInfo->m_ShadowName, ARRAY_SIZE(texture_name));
+					strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
 				}
-					
+
 				st=m_W3DShadowTextureManager->getTexture(texture_name);
 				if (st == NULL)
 				{
@@ -1791,11 +1763,12 @@ W3DProjectedShadow* W3DProjectedShadowManager::addShadow(RenderObjClass *robj, S
 					//to allow multiple models to share same shadow - for
 					//example, all trees could use same shadow even if slightly
 					//different color, etc.
-					strcpy(texture_name,shadowInfo->m_ShadowName);
+					static_assert(ARRAY_SIZE(texture_name) >= ARRAY_SIZE(shadowInfo->m_ShadowName), "Incorrect array size");
+					strcpy(texture_name, shadowInfo->m_ShadowName);
 				}
 				else
-					strcpy(texture_name,robj->Get_Name());	//not texture name give, assume model name.
-					
+					strlcpy(texture_name, robj->Get_Name(), ARRAY_SIZE(texture_name));	//not texture name give, assume model name.
+
 				st=m_W3DShadowTextureManager->getTexture(texture_name);
 				if (st == NULL)
 				{	//texture doesn't exist, use current render object to create it
@@ -1809,11 +1782,11 @@ W3DProjectedShadow* W3DProjectedShadowManager::addShadow(RenderObjClass *robj, S
 						return NULL;	//could not create the shadow texture
 				}
 				shadowType=SHADOW_PROJECTION;
-		}//SHADOW_PROJECTION
+		}
 	}
 	else
 	{	//no shadow info, assume user wants a projected shadow
-		strcpy(texture_name,robj->Get_Name());
+		strlcpy(texture_name, robj->Get_Name(), ARRAY_SIZE(texture_name));
 
 		st=m_W3DShadowTextureManager->getTexture(texture_name);
 
@@ -1900,17 +1873,7 @@ W3DProjectedShadow* W3DProjectedShadowManager::addShadow(RenderObjClass *robj, S
 		m_shadowList = shadow;
 	}
 
-	switch (shadow->m_type)
-	{
-		case SHADOW_DECAL:
-			m_numDecalShadows++;
-			break;
-		case SHADOW_PROJECTION:
-			m_numProjectionShadows++;
-		default:
-			break;
-	}
-
+	updateShadowNumbers(shadow->m_type, +1);
 	return shadow;
 }
 
@@ -1925,22 +1888,22 @@ W3DProjectedShadow* W3DProjectedShadowManager::createDecalShadow(Shadow::ShadowT
 	Real	decalOffsetX=0.0f;
 	Real	decalOffsetY=0.0f;
 	const Real defaultWidth = 10.0f;
-
-	Char	texture_name[64];
-	Int nameLen;
+	Char texture_name[ARRAY_SIZE(shadowInfo->m_ShadowName)];
 
 	//simple decal using the premade texture specified.
 	//can be always perpendicular to model's z-axis or projected
 	//onto world geometry.
-	nameLen=strlen(shadowInfo->m_ShadowName);
-	if (nameLen <= 1)	//no texture name given, use same as object
-	{	strcpy(texture_name,defaultDecalName);
+	if (strlen(shadowInfo->m_ShadowName) <= 1)	//no texture name given, use same as object
+	{
+		static_assert(ARRAY_SIZE(texture_name) >= ARRAY_SIZE(defaultDecalName), "Incorrect array size");
+		strcpy(texture_name,defaultDecalName);
 	}
 	else
-	{	strncpy(texture_name,shadowInfo->m_ShadowName,nameLen);
-		strcpy(texture_name+nameLen,".tga");	//append texture extension
+	{
+		strlcpy(texture_name, shadowInfo->m_ShadowName, ARRAY_SIZE(texture_name));
+		strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
 	}
-		
+
 	st=m_W3DShadowTextureManager->getTexture(texture_name);
 	if (st == NULL)
 	{
@@ -1973,7 +1936,7 @@ W3DProjectedShadow* W3DProjectedShadowManager::createDecalShadow(Shadow::ShadowT
 	if( shadow == NULL )
 		return NULL;
 
-	shadow->setTexture(0,st);	
+	shadow->setTexture(0,st);
 	shadow->m_type = shadowType;		/// type of projection
 	shadow->m_allowWorldAlign=allowWorldAlign;	/// wrap shadow around world geometry - else align perpendicular to local z-axis.
 
@@ -2030,22 +1993,14 @@ void W3DProjectedShadowManager::removeShadow (W3DProjectedShadow *shadow)
 					prev_shadow->m_next=shadow->m_next;
 				else
 					m_decalList=shadow->m_next;
-				switch (shadow->m_type)
-				{
-					case SHADOW_DECAL:
-						m_numDecalShadows--;
-						break;
-					case SHADOW_PROJECTION:
-						m_numProjectionShadows--;
-					default:
-						break;
-				}
+
+				updateShadowNumbers(shadow->m_type, -1);
 				delete shadow;
 				return;
 			}
-		}  // end for
+		}
 	}
-		
+
 	//search for this shadow
 	for( next_shadow = m_shadowList; next_shadow; prev_shadow=next_shadow, next_shadow = next_shadow->m_next )
 	{
@@ -2055,20 +2010,12 @@ void W3DProjectedShadowManager::removeShadow (W3DProjectedShadow *shadow)
 				prev_shadow->m_next=shadow->m_next;
 			else
 				m_shadowList=shadow->m_next;
-			switch (shadow->m_type)
-			{
-				case SHADOW_DECAL:
-					m_numDecalShadows--;
-					break;
-				case SHADOW_PROJECTION:
-					m_numProjectionShadows--;
-				default:
-					break;
-			}
+
+			updateShadowNumbers(shadow->m_type, -1);
 			delete shadow;
 			return;
 		}
-	}  // end for
+	}
 }
 
 void W3DProjectedShadowManager::removeAllShadows(void)
@@ -2086,7 +2033,7 @@ void W3DProjectedShadowManager::removeAllShadows(void)
 		next_shadow = cur_shadow->m_next;
 		cur_shadow->m_next = NULL;
 		delete cur_shadow;
-	}  // end for
+	}
 
 	next_shadow=m_decalList;
 	cur_shadow=NULL;
@@ -2096,10 +2043,27 @@ void W3DProjectedShadowManager::removeAllShadows(void)
 		next_shadow = cur_shadow->m_next;
 		cur_shadow->m_next = NULL;
 		delete cur_shadow;
-	}  // end for
+	}
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+void W3DProjectedShadowManager::updateShadowNumbers(ShadowType shadowType, Int addNum)
+{
+	switch (shadowType)
+	{
+		case SHADOW_DECAL:
+		case SHADOW_ALPHA_DECAL:
+		case SHADOW_ADDITIVE_DECAL:
+			m_numDecalShadows += addNum;
+			break;
+		case SHADOW_PROJECTION:
+			m_numProjectionShadows += addNum;
+			break;
+		default:
+			break;
+	}
+}
+
+#if defined(RTS_DEBUG)
 void W3DProjectedShadow::getRenderCost(RenderCost & rc) const
 {
 	if (TheGlobalData->m_useShadowDecals && m_isEnabled && !m_isInvisibleEnabled)
@@ -2175,7 +2139,7 @@ void W3DProjectedShadow::updateTexture(Vector3 &lightPos)
 		//Need to copy generated texture into permanent texture.
 		SurfaceClass *oldSurface=m_shadowTexture[0]->getTexture()->Get_Surface_Level();
 		SurfaceClass *newSurface=TheW3DProjectedShadowManager->getRenderTarget()->Get_Surface_Level();
-		
+
 		//Copy shadow from temporary video-memory surface into a permanent texture
 		oldSurface->Copy(0,0,0,0,DEFAULT_RENDER_TARGET_WIDTH,DEFAULT_RENDER_TARGET_HEIGHT,newSurface);
 		REF_PTR_RELEASE(newSurface);
@@ -2271,7 +2235,7 @@ void W3DShadowTexture::updateBounds(Vector3 &lightPos, RenderObjClass *robj)
 		Vector3 lightRay;
 		Real floorZ;
 		Real vectorScale,vectorScaleTemp, vectorScaleMax,length;
-		
+
 		//calculate local bounding box of shadow projection
 		objPos=robj->Get_Position();
 		box=robj->Get_Bounding_Box();
@@ -2332,7 +2296,7 @@ void W3DShadowTexture::updateBounds(Vector3 &lightPos, RenderObjClass *robj)
 		box.Translate(-objPos);	//translate box to object space.
 }
 
-W3DShadowTextureManager::W3DShadowTextureManager(void) 
+W3DShadowTextureManager::W3DShadowTextureManager(void)
 {
 	// Create the hash tables
 	texturePtrTable = NEW HashTableClass( 2048 );
@@ -2372,7 +2336,7 @@ W3DShadowTexture * W3DShadowTextureManager::peekTexture(const char * name)
 
 /** Get texture from cache and increment its reference count */
 W3DShadowTexture * W3DShadowTextureManager::getTexture(const char * name)
-{	
+{
 	W3DShadowTexture * text = peekTexture( name );
 	if ( text != NULL ) {
 		text->Add_Ref();
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp
index b9a71018210..9e5b24fee57 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp
@@ -63,6 +63,12 @@ Vector3 LightPosWorld[ MAX_SHADOW_LIGHTS ] =
 	Vector3( 94.0161f, 50.499f, 200.0f)
 };
 
+void PrepareShadows()
+{
+	if (TheW3DProjectedShadowManager)
+		TheW3DProjectedShadowManager->prepareShadows();
+}
+
 //DECLARE_PERF_TIMER(shadowsRender)
 void DoShadows(RenderInfoClass & rinfo, Bool stencilPass)
 {
@@ -92,7 +98,7 @@ void DoShadows(RenderInfoClass & rinfo, Bool stencilPass)
 		TheW3DShadowManager->queueShadows(FALSE);
 
 }
-	
+
 W3DShadowManager::W3DShadowManager( void )
 {
 	DEBUG_ASSERTCRASH(TheW3DVolumetricShadowManager == NULL && TheW3DProjectedShadowManager == NULL,
@@ -192,7 +198,7 @@ Shadow *W3DShadowManager::addShadow( RenderObjClass *robj, Shadow::ShadowTypeInf
 		default:
 			return NULL;
 	}
-		
+
 	return NULL;
 }
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
index 0c487df9493..94caea0b449 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
@@ -58,11 +58,6 @@
 #include "WW3D2/dx8caps.h"
 #include "GameClient/Drawable.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // Global Variables and Functions /////////////////////////////////////////////
 
@@ -93,7 +88,7 @@ const Real cosAngleToCare = cos ((0.2 * PI) / 180.0);	//1.5 degree difference
 struct SHADOW_STATIC_VOLUME_VERTEX	//vertex structure passed to D3D
 {
 		float x,y,z;
-}; 
+};
 #define SHADOW_STATIC_VOLUME_FVF	D3DFVF_XYZ
 
 #ifdef SV_DEBUG	//in debug mode, dynamic shadows are rendered with random diffuse color
@@ -101,7 +96,7 @@ struct SHADOW_STATIC_VOLUME_VERTEX	//vertex structure passed to D3D
 	{
 			float x,y,z;
 			DWORD diffuse;
-	}; 
+	};
 	#define SHADOW_DYNAMIC_VOLUME_FVF	D3DFVF_XYZ|D3DFVF_DIFFUSE
 #else
 	typedef struct SHADOW_STATIC_VOLUME_VERTEX	SHADOW_DYNAMIC_VOLUME_VERTEX;
@@ -156,14 +151,13 @@ struct Geometry
 		return TRUE;
 	}
 	void Release(void)
-	{	if (m_verts)
-		{	delete [] m_verts;
-			m_verts=NULL;
-		}
-		if (m_indices)
-		{	delete [] m_indices;
-			m_indices=NULL;
-		}
+	{
+		delete [] m_verts;
+		m_verts=NULL;
+
+		delete [] m_indices;
+		m_indices=NULL;
+
 		m_numActivePolygon=m_numPolygon=0;
 		m_numActiveVertex=m_numVertex=0;
 	}
@@ -230,8 +224,8 @@ struct Geometry
 };
 
 // CONST //////////////////////////////////////////////////////////////////////
-const Int MAX_POLYGON_NEIGHBORS = 3;  // we use nothing but triangles for 
-																			// geometry polygons so we have at 
+const Int MAX_POLYGON_NEIGHBORS = 3;  // we use nothing but triangles for
+																			// geometry polygons so we have at
 																			// most 3 neighbors
 const Int NO_NEIGHBOR = -1;  // entry value for neighbor when there isn't one
 
@@ -270,7 +264,7 @@ class W3DShadowGeometryMesh
 	//for the sake of speed, give direct access to classes that need this data.
 	friend class W3DShadowGeometry;
 	friend class W3DVolumetricShadow;
-	
+
 public:
 	W3DShadowGeometryMesh( void );
 	~W3DShadowGeometryMesh( void );
@@ -284,7 +278,7 @@ class W3DShadowGeometryMesh
 		Vector3 vertexList[3];
 		//get vertex indices for this polygon
 		GetPolygonIndex(dwPolyNormId,indexList,3);
-		//get the vertices	
+		//get the vertices
 		GetVertex(indexList[0],&vertexList[0]);
 		GetVertex(indexList[1],&vertexList[1]);
 		GetVertex(indexList[2],&vertexList[2]);
@@ -351,7 +345,7 @@ class W3DShadowGeometryMesh
 							 // in our current geometry.
 	W3DShadowGeometry *m_parentGeometry; // mesh hierarchy containing this mesh.
 
-};	//end of meshInfo
+};
 
 #ifdef DO_TERRAIN_SHADOW_VOLUMES
 
@@ -559,7 +553,7 @@ void W3DVolumetricShadowManager::loadTerrainShadows(void)
 /*	W3DShadow *shadow = NEW W3DShadow;
 	// add to our shadow list through the shadow next links
 	shadow->m_next = m_shadowList;
-	m_shadowList = shadow;	
+	m_shadowList = shadow;
 */
 }
 
@@ -585,13 +579,13 @@ class W3DShadowGeometry : public RefCountClass, public	HashableClass
 
 		const char *		Get_Name(void) const	{ return m_namebuf;}
 		void				Set_Name(const char *name)
-		{	memset(m_namebuf,0,sizeof(m_namebuf));	//pad with zero so always ends with null character.
-			strncpy(m_namebuf,name,sizeof(m_namebuf)-1);
+		{
+			strlcpy(m_namebuf,name,sizeof(m_namebuf));
 		}
 		Int					getMeshCount(void)	{ return m_meshCount;}
 		W3DShadowGeometryMesh	*getMesh(Int index)	{ return &m_meshList[index];}
 
-		
+
 		int GetNumTotalVertex (void)	{	return m_numTotalsVerts;}	///<total number of vertices in all meshes of this geometry
 
 	private:
@@ -602,7 +596,7 @@ class W3DShadowGeometry : public RefCountClass, public	HashableClass
 		Int m_meshCount;							///<number of meshes in hierarchy
 		Int m_numTotalsVerts;						///<number of verts in entire hierarchy
 };
-  
+
 #define MAX_SHADOW_VOLUME_VERTS 16384
 
 Int W3DShadowGeometry::initFromHLOD(RenderObjClass *robj)
@@ -670,12 +664,12 @@ Int W3DShadowGeometry::initFromHLOD(RenderObjClass *robj)
 
 			// build our neighboring polygon information
 			geomMesh->buildPolygonNeighbors();
-			
+
 			geomMesh++;
 			m_meshCount++;
 		}
 	}
-	
+
 //	for (i = 0; i < AdditionalModels.Count(); i++) {
 //		res |= AdditionalModels[i].Model->Cast_Ray(raytest);
 //	}
@@ -757,13 +751,13 @@ Int W3DShadowGeometry::init(RenderObjClass *robj)
 // W3DShadowGeometry =============================================================
 // ============================================================================
 W3DShadowGeometryMesh::W3DShadowGeometryMesh( void )
-{	
+{
 	// init polygon neighbor information
 	m_polyNeighbors = NULL;
 	m_numPolyNeighbors = 0;
 	m_parentVerts = NULL;
 	m_polygonNormals = NULL;
-}  // end W3DShadowGeometry
+}
 
 // ~W3DShadowGeometry ============================================================
 // ============================================================================
@@ -771,13 +765,11 @@ W3DShadowGeometryMesh::~W3DShadowGeometryMesh( void )
 {
 	// remove our neighbor list information allocated
 	deleteNeighbors();
-	if (m_parentVerts) {
-		delete [] m_parentVerts;
-	}
-	if (m_polygonNormals)
-		delete [] m_polygonNormals;
 
-}  // end ~W3DShadowGeometry
+	delete [] m_parentVerts;
+	delete [] m_polygonNormals;
+
+}
 
 // GetPolyNeighbor ============================================================
 // Return the poly neighbor structure at the given index
@@ -793,11 +785,11 @@ PolyNeighbor *W3DShadowGeometryMesh::GetPolyNeighbor( Int polyIndex )
 		assert( 0 );
 		return NULL;
 
-	}  // en dif
+	}
 
 	return &m_polyNeighbors[ polyIndex ];
 
-}  // end GetPolyNeighbor
+}
 
 // buildPolygonNeighbors ======================================================
 // Whenever we set a new geometry we want to build some information about
@@ -828,7 +820,7 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 
 		return;  // nothing to see here people, move along
 
-	}  // end if
+	}
 
 	//
 	// in the event that this geometry can deform on the fly or we are
@@ -847,7 +839,7 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 		if( allocateNeighbors( numPolys ) == FALSE )
 			return;
 
-	}  // end if
+	}
 
 	//
 	// initialize all polygon neighbor information to none and assign our
@@ -863,7 +855,7 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 		for( j = 0; j < MAX_POLYGON_NEIGHBORS; j++ )
 			m_polyNeighbors[ i ].neighbor[ j ].neighborIndex = NO_NEIGHBOR;
 
-	}  // end for i
+	}
 
 	// assign polygon data for each of our polygons
 	for( i = 0; i < m_numPolyNeighbors; i++ )
@@ -919,7 +911,7 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 							{	Vector3 vOtherNorm;
 
 								GetPolygonNormal(j,&vOtherNorm);
-								
+
 								//Check if the 2 polygons face in exactly opposite directions - don't allow this type of neighbor.
 								if (fabs(Vector3::Dot_Product(vOtherNorm,vNorm) + 1.0f) <= 0.01f)
 									continue;
@@ -932,9 +924,9 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 						else
 						{//This is the same poly facing opposite direction.	//assert( 0 );  // should never match 3 vertices!
 							index1=index2=-1;
-							continue; 
+							continue;
 						}
-					}  // end if
+					}
 			if( index1 != -1 && index2 != -1  )
 			{
 				//
@@ -954,7 +946,7 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 
 						break;  // exit for a
 
-					}  // end if
+					}
 
 				//
 				// error condition, if our counter a is at the max number
@@ -974,17 +966,17 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 					pv[0] /= 3.0f;	//find center of polygon
 
 //					sprintf(errorText,"%s: Shadow Polygon with too many neighbors at %f,%f,%f",m_parentGeometry->Get_Name(),pv[0].X,pv[0].Y,pv[0].Z);
-//					DEBUG_LOG(("****%s Shadow Polygon with too many neighbors at %f,%f,%f\n",m_parentGeometry->Get_Name(),pv[0].X,pv[0].Y,pv[0].Z));
+//					DEBUG_LOG(("****%s Shadow Polygon with too many neighbors at %f,%f,%f",m_parentGeometry->Get_Name(),pv[0].X,pv[0].Y,pv[0].Z));
 //					DEBUG_ASSERTCRASH(a != MAX_POLYGON_NEIGHBORS,(errorText));
 				}
 
-			}  // end if
+			}
 
-		}  // end for j
+		}
 
-	}  // end for i
+	}
 
-}  // end buildPolygonNeighbors
+}
 
 // allocateNeighbors ==========================================================
 // Allocate storage for the polygon neighbors and record its size
@@ -1005,14 +997,14 @@ Bool W3DShadowGeometryMesh::allocateNeighbors( Int numPolys )
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// list is now acutally allocated
 	m_numPolyNeighbors = numPolys;
 
 	return TRUE;  // success!
 
-}  // end allocateNeighbors
+}
 
 // deleteNeighbors ============================================================
 // Delete all polygon neighbor storage and information
@@ -1021,20 +1013,15 @@ void W3DShadowGeometryMesh::deleteNeighbors( void )
 {
 
 	// delete list
-	if( m_polyNeighbors )
-	{
-
-		delete [] m_polyNeighbors;
-		m_polyNeighbors = NULL;
-		m_numPolyNeighbors = 0;
-
-	}  // end if
+	delete [] m_polyNeighbors;
+	m_polyNeighbors = NULL;
+	m_numPolyNeighbors = 0;
 
 	// sanity error checking
 	assert( m_numPolyNeighbors == 0 );
 	assert( m_polyNeighbors == NULL );
 
-}  // end deleteNeighbors
+}
 
 //#include "Common/ThingTemplate.h"
 
@@ -1128,10 +1115,10 @@ void W3DVolumetricShadow::updateOptimalExtrusionPadding(void)
 				{
 					terrainPoint = Corners[i] + shadowRay*t;
 					terrainPoint.Z=0;	//ignore height
-					
+
 					Real terrainHeight=TheTerrainRenderObject->getHeightMapHeight(terrainPoint.X,terrainPoint.Y,NULL);
 					if (terrainHeight < (objPos.Z - MAX_SHADOW_EXTRUSION_UNDER_OBJECT_BEFORE_CLAMP))	//check if terrain dips more than 10 units under object.
-					{	
+					{
 						if (j == 0)	//this is the initial point so object must be right on the edge of a cliff.
 						{	baseGroundHeight = terrainHeight;	//force extrusion all the way down cliff.
 							Real tanAngle=tan(OVERHANGING_OBJECT_CLAMP_ANGLE);	//clamp to about 89 degrees or close to vertical lightpos.
@@ -1171,7 +1158,7 @@ void W3DVolumetricShadow::updateOptimalExtrusionPadding(void)
 // getRenderCost ============================================================
 // Returns number of draw calls for this shadow.
 // ============================================================================
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+#if defined(RTS_DEBUG)
 void W3DVolumetricShadow::getRenderCost(RenderCost & rc) const
 {
 	Int drawCount = 0;
@@ -1263,7 +1250,7 @@ void W3DVolumetricShadow::RenderMeshVolume(Int meshIndex, Int lightIndex, const
 	///@todo: W3D always does transpose on all of matrix sets.  Slow???  Better to hack view matrix.
 	Matrix4x4 mWorldTransposed = mWorld.Transpose();
 	m_pDev->SetTransform(D3DTS_WORLD,(_D3DMATRIX *)&mWorldTransposed);
-	
+
 	W3DBufferManager::W3DVertexBufferSlot *vbSlot=m_shadowVolumeVB[lightIndex][ meshIndex ];
 	if (!vbSlot)
 		return;
@@ -1374,7 +1361,7 @@ void W3DVolumetricShadow::RenderDynamicMeshVolume(Int meshIndex, Int lightIndex,
 	shadowIndexBufferD3D->Unlock();
 
 	m_pDev->SetIndices(shadowIndexBufferD3D,nShadowStartBatchVertex);
-	
+
 	Matrix4x4 mWorld(*meshXform);
 	Matrix4x4 mWorldTransposed = mWorld.Transpose();
 	m_pDev->SetTransform(D3DTS_WORLD,(_D3DMATRIX *)&mWorldTransposed);
@@ -1405,7 +1392,7 @@ void W3DVolumetricShadow::RenderMeshVolumeBounds(Int meshIndex, Int lightIndex,
 	SHADOW_DYNAMIC_VOLUME_VERTEX* pvVertices;
 	UnsignedShort *pvIndices;
 	// Vertex Positions as a function of the box extents
-	static Vector3						_BoxVerts[8] = 
+	static Vector3						_BoxVerts[8] =
 	{
 		Vector3(  1.0f, 1.0f, 1.0f ),		// +z ring of 4 verts
 		Vector3( -1.0f, 1.0f, 1.0f ),
@@ -1418,10 +1405,10 @@ void W3DVolumetricShadow::RenderMeshVolumeBounds(Int meshIndex, Int lightIndex,
 		Vector3(  1.0f,-1.0f,-1.0f ),
 	};
 	// Face Connectivity
-	static Vector3i					_BoxFaces[12] = 
+	static Vector3i					_BoxFaces[12] =
 	{
 		Vector3i( 0,1,2 ),		// +z faces
-		Vector3i( 0,2,3 ),		
+		Vector3i( 0,2,3 ),
 		Vector3i( 4,7,6 ),		// -z faces
 		Vector3i( 4,6,5 ),
 		Vector3i( 0,3,7 ),		// +x faces
@@ -1504,7 +1491,7 @@ void W3DVolumetricShadow::RenderMeshVolumeBounds(Int meshIndex, Int lightIndex,
 	if (nShadowIndicesInBuf > (SHADOW_INDEX_SIZE-numIndex))	//check if room for model verts
 	{	//flush the buffer by drawing the contents and re-locking again
 		if (shadowIndexBufferD3D->Lock(0,numIndex*sizeof(short),(unsigned char**)&pvIndices,D3DLOCK_DISCARD) != D3D_OK)
-			return;;
+			return;
 		nShadowIndicesInBuf=0;
 		nShadowStartBatchIndex=0;
 	}
@@ -1533,7 +1520,7 @@ void W3DVolumetricShadow::RenderMeshVolumeBounds(Int meshIndex, Int lightIndex,
 	Matrix4x4 mWorld(1);	//identity since boxes are pre-transformed to world space.
 	Matrix4x4 mWorldTransposed = mWorld.Transpose();
 	m_pDev->SetTransform(D3DTS_WORLD,(_D3DMATRIX *)&mWorldTransposed);
-	
+
 	m_pDev->SetStreamSource(0,shadowVertexBufferD3D,sizeof(SHADOW_DYNAMIC_VOLUME_VERTEX));
 	m_pDev->SetVertexShader(SHADOW_DYNAMIC_VOLUME_FVF);
 
@@ -1581,9 +1568,9 @@ W3DVolumetricShadow::W3DVolumetricShadow( void )
 			m_objectXformHistory[ i ][j].Make_Identity();
 			m_lightPosHistory[ i ][j] = Vector3(0,0,0);
 		}
-	}  // end for i
+	}
 
-}  // end W3DVolumetricShadow
+}
 
 // ~W3DVolumetricShadow ====================================================================
 // W3DVolumetricShadow destructor
@@ -1599,8 +1586,8 @@ W3DVolumetricShadow::~W3DVolumetricShadow( void )
 	// free any shadow volume data
 	for( i = 0; i < MAX_SHADOW_LIGHTS; i++ )
 	{	for (j = 0; j < MAX_SHADOW_CASTER_MESHES; j++)
-		{	if( m_shadowVolume[ i ][j] )
-				delete m_shadowVolume[ i ][j];
+		{
+			delete m_shadowVolume[i][j];
 			if( m_shadowVolumeVB[i][j])
 				TheW3DBufferManager->releaseSlot(m_shadowVolumeVB[i][j]);
 			if( m_shadowVolumeIB[i][j])
@@ -1614,7 +1601,7 @@ W3DVolumetricShadow::~W3DVolumetricShadow( void )
 	m_geometry=NULL;
 	m_robj=NULL;
 
-}  // end ~W3DVolumetricShadow
+}
 
 void W3DVolumetricShadow::SetGeometry( W3DShadowGeometry *geometry )
 {
@@ -1651,13 +1638,13 @@ void W3DVolumetricShadow::SetGeometry( W3DShadowGeometry *geometry )
 			if( allocateSilhouette(i, numNewVertices ) == FALSE )
 				return;
 
-		}  // end if
+		}
 	}
 
 	// assign the new geometry, possible over an old geometry
 	m_geometry = geometry;
 
-}  // end SetGeometry
+}
 
 /**Called once per frame for each object, when necessary it will reconstruct
  the shadow volume for this shadow from the silhouette of the geometry
@@ -1695,19 +1682,19 @@ void W3DVolumetricShadow::Update()
 		//buggies from being flagged as "flying".  We minimize the number of flying units because their shadow
 		//volumes are extruded longer to reach the lowest point on the map.  Regular shadows only extend far
 		//enough to reach the base of the model (presumes base is already touching the ground).
-		Real groundHeight; 
+		Real groundHeight;
 		if (TheTerrainLogic)
 			groundHeight=TheTerrainLogic->getGroundHeight(pos.X,pos.Y);	//logic knows about bridges so use if available.
 		else
 			groundHeight=TheTerrainRenderObject->getHeightMapHeight(pos.X,pos.Y, NULL);
    		if (fabs(pos.Z - groundHeight) >= AIRBORNE_UNIT_GROUND_DELTA)
-   		{	
+   		{
  			Real extent = MAX_SHADOW_LENGTH_EXTRA_AIRBORNE_SCALE_FACTOR * m_robjExtent;
  			if (WWMath::Fabs(pos.X - bcX) > (beX + extent) ||
  				WWMath::Fabs(pos.Y - bcY) > (beY + extent) ||
  				WWMath::Fabs(pos.Z - bcZ) > (beZ + extent))
  				return;	//shadow can't be visible so no point in updating.
- 
+
 			//this unit is above ground, extend shadow volume to reach lowest point on the terrain plus extra bit to make
 			//sure shadow goes under ground.
    			updateVolumes(fabs(pos.Z - TheTerrainRenderObject->getMinHeight()) + SHADOW_EXTRUSION_BUFFER);
@@ -1720,7 +1707,7 @@ void W3DVolumetricShadow::Update()
  				WWMath::Fabs(pos.Y - bcY) > (beY + m_robjExtent) ||
  				WWMath::Fabs(pos.Z - bcZ) > (beZ + m_robjExtent))
  				return;	//shadow can't be visible so no point in updating.
- 
+
 				//check if this object has never had it's extrusion length updated.  Will only be true for
 				//immobile objects because finding an optimal extrusion length is expensive.
 				if (!m_extraExtrusionPadding)
@@ -1732,12 +1719,12 @@ void W3DVolumetricShadow::Update()
 
 	//	floorZ = 2.0f;	//lower slightly so shadows go under ground.
 
-	
+
 		// update delay time
 		lastTime = currentTime;
-	}  // end if
+	}
 
-}  // end Update
+}
 
 /** Update shadow volumes belonging to all meshes of this shadow caster.
 *	Use zoffset to extend shadows below object's base by given amount.
@@ -1767,8 +1754,8 @@ void W3DVolumetricShadow::updateVolumes(Real zoffset)
 			else
 				mesh = (MeshClass *)m_robj;
 
-			if (mesh) 
-			{	
+			if (mesh)
+			{
 				if (!mesh->Is_Not_Hidden_At_All())
 					continue;
 				/**@todo: Getting the transform of the mesh may be forcing a full hierarchy evaluation.
@@ -1819,8 +1806,8 @@ void W3DVolumetricShadow::updateVolumes(Real zoffset)
 					}
 				}
 			}
-		}	// end for j
-	}  // end for, i
+		}
+	}
 }
 
 /*floorZ is the assumed ground height below the model.  The code will try to extrude shadows just long enough to hit this point in order
@@ -1845,7 +1832,7 @@ void W3DVolumetricShadow::updateMeshVolume(Int meshIndex, Int lightIndex, const
 
 	//
 	// build the shadow silhouette and construct shadow volume from
-	// this light location.  The for loop wrapped around this is 
+	// this light location.  The for loop wrapped around this is
 	// theoretical code for future enhancements of multiple lights that
 	// cast shadows
 	//
@@ -1988,7 +1975,7 @@ void W3DVolumetricShadow::updateMeshVolume(Int meshIndex, Int lightIndex, const
 		CollisionMath::OverlapType result=CollisionMath::Overlap_Test(*shadowCameraFrustum,sphere);
 		if (result == CollisionMath::OVERLAPPED)	//do a more accurate test
 			result=CollisionMath::Overlap_Test(*shadowCameraFrustum, box);
-		
+
 		if (result != CollisionMath::OUTSIDE)
 		{
 			//
@@ -2049,7 +2036,7 @@ void W3DVolumetricShadow::updateMeshVolume(Int meshIndex, Int lightIndex, const
 			sphere.Center -= objectCenter;
 			m_shadowVolume[ lightIndex ][meshIndex]->setBoundingSphere(sphere);
 			m_shadowVolume[ lightIndex ][meshIndex]->setVisibleState(Geometry::STATE_VISIBLE);	//this volume needs rendering.
-		}//end if inside view frustum
+		}
 		else
 		if (m_shadowVolume[ lightIndex ][meshIndex])
 		{	//outside view frustum, shadow wasn't updated.
@@ -2059,7 +2046,7 @@ void W3DVolumetricShadow::updateMeshVolume(Int meshIndex, Int lightIndex, const
 			m_shadowVolume[ lightIndex ][meshIndex]->setBoundingSphere(sphere);
 			m_shadowVolume[ lightIndex ][meshIndex]->setVisibleState(Geometry::STATE_INVISIBLE);
 		}
-	}  // end if
+	}
 	else
 	{	//not reconstructing volume, so don't know if visible or not.
 		if (m_shadowVolume[ lightIndex ][meshIndex])
@@ -2070,7 +2057,7 @@ void W3DVolumetricShadow::updateMeshVolume(Int meshIndex, Int lightIndex, const
 // addSilhouetteEdge ==========================================================
 // It has been determined that the polygon neighbor in the "neighborIndex"
 // of "visible" needs to be added to the silhouette.  We will add those two
-// vertex indices to the silhouette in the order they were specified in 
+// vertex indices to the silhouette in the order they were specified in
 // "visible" to assure that the constructed edge is in counter clockwise order
 // ============================================================================
 void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible, PolyNeighbor *hidden )
@@ -2086,7 +2073,7 @@ void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible
 	assert( visible && hidden );
 
 	//
-	// which index in the neighbor list of "visible" refers to the 
+	// which index in the neighbor list of "visible" refers to the
 	// polygon "hidden"
 	//
 	for( i = 0; i < MAX_POLYGON_NEIGHBORS; i++ )
@@ -2098,16 +2085,16 @@ void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible
 			neighborIndex = i;
 			break;  // exit for
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// get the three vertex indices of "visible"
 	geomMesh->GetPolygonIndex( visible->myIndex, visibleIndexList, 3 );
 
 	//
 	// we know that 2 of the 3 vertex indices will be present in the edge.
-	// will construct the edge as follows to ensure we have counter 
+	// will construct the edge as follows to ensure we have counter
 	// clockwise order.  note that this assumes the vertices of the
 	// polygons specified in the geometry are in counter clockwise order,
 	// which they are
@@ -2116,9 +2103,9 @@ void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible
 	// 2) [ v1 Present, v2  Absent, v3 Present ] -> edge = (v3, v1)
 	// 3) [ v1 Present, v2 Present, v3 Absent  ] -> edge = (v1, v2)
 	//
-	if( (visibleIndexList[ 0 ] != 
+	if( (visibleIndexList[ 0 ] !=
 			 visible->neighbor[ neighborIndex ].neighborEdgeIndex[ 0 ]) &&
-			(visibleIndexList[ 0 ] != 
+			(visibleIndexList[ 0 ] !=
 			visible->neighbor[ neighborIndex ].neighborEdgeIndex[ 1 ]) )
 	{
 
@@ -2126,10 +2113,10 @@ void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible
 		edgeStart = visibleIndexList[ 1 ];
 		edgeEnd = visibleIndexList[ 2 ];
 
-	}  // end if
-	else if( (visibleIndexList[ 1 ] != 
+	}
+	else if( (visibleIndexList[ 1 ] !=
 					 visible->neighbor[ neighborIndex ].neighborEdgeIndex[ 0 ]) &&
-					 (visibleIndexList[ 1 ] != 
+					 (visibleIndexList[ 1 ] !=
 					 visible->neighbor[ neighborIndex ].neighborEdgeIndex[ 1 ]) )
 	{
 
@@ -2137,7 +2124,7 @@ void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible
 		edgeStart = visibleIndexList[ 2 ];
 		edgeEnd = visibleIndexList[ 0 ];
 
-	}  // end if
+	}
 	else
 	{
 
@@ -2145,16 +2132,16 @@ void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible
 		edgeStart = visibleIndexList[ 0 ];
 		edgeEnd = visibleIndexList[ 1 ];
 
-	}  // end if
+	}
 
 	// add to silhouette edge list
 	addSilhouetteIndices(meshIndex, edgeStart, edgeEnd );
 
-}  // end addSilhouetteEdge
+}
 
 // addNeighborlessEdges =======================================================
 // Given a polygon neighbor information, it has been determined that this
-// polygon is visible and has edges which are not connected to other 
+// polygon is visible and has edges which are not connected to other
 // polygons, these edges need to be added to the silhouette.  The edge(s)
 // must be added in such an order that we create silhouette edges in a
 // counter clockwise order.
@@ -2205,11 +2192,11 @@ void W3DVolumetricShadow::addNeighborlessEdges(Int meshIndex, PolyNeighbor *us )
 					addEdge = FALSE;
 					break;  // exit for j, no need to search on
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
-		}  // end for j
+		}
 
 		// add the edge if no neighbors have that edge
 		if( addEdge == TRUE )
@@ -2217,11 +2204,11 @@ void W3DVolumetricShadow::addNeighborlessEdges(Int meshIndex, PolyNeighbor *us )
 
 			addSilhouetteIndices(meshIndex, edgeStart, edgeEnd );
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end addNeighborlessEdges
+}
 
 // addSilhouetteIndices =======================================================
 // Add these two indices to the silhouette data
@@ -2238,7 +2225,7 @@ void W3DVolumetricShadow::addSilhouetteIndices(Int meshIndex, Short edgeStart, S
 	assert( m_numSilhouetteIndices[meshIndex] < m_maxSilhouetteEntries[meshIndex] );
 	m_silhouetteIndex[meshIndex][ m_numSilhouetteIndices[meshIndex]++ ] = edgeEnd;
 
-}  // end if
+}
 
 // buildSilhouette ============================================================
 // Given a light position, and our polygon neighbor information this will
@@ -2303,7 +2290,7 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 		if( Vector3::Dot_Product( lightVector, normal ) < 0.0f )
 			BitSet( polyNeighbor->status, POLY_VISIBLE );
 
-	}  // end for i
+	}
 
 	//
 	// check all our polys using our poly neighbors, where one poly neighbor
@@ -2332,8 +2319,8 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 			{
 
 				// get the jth polygon neighbor ... this is "them"
-				otherNeighbor = 
-					geomMesh->GetPolyNeighbor( 
+				otherNeighbor =
+					geomMesh->GetPolyNeighbor(
 						polyNeighbor->neighbor[ j ].neighborIndex );
 
 				//
@@ -2343,10 +2330,10 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 				if( BitIsSet( otherNeighbor->status, POLY_PROCESSED ) )
 					continue;  // for j
 
-			}  // end if
+			}
 
 			//
-			// finally, if our own visible status is different from our 
+			// finally, if our own visible status is different from our
 			// neighbor visible status then that defines an edge we must
 			// add to the silhouette.  Also, a visible polygon that has
 			// no neighbor automatically makes a silhouette edge.  Note that
@@ -2362,16 +2349,16 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 
 					visibleNeighborless = TRUE;
 
-				}  // end if
+				}
 				else if( BitIsSet( otherNeighbor->status, POLY_VISIBLE ) == FALSE )
 				{
 
 					// "we" are visible and "they" are not
 					addSilhouetteEdge(meshIndex, polyNeighbor, otherNeighbor );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else if( otherNeighbor != NULL &&
 							 BitIsSet( otherNeighbor->status, POLY_VISIBLE ) )
 			{
@@ -2379,9 +2366,9 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 				// "they" are visible and "we" are not
 				addSilhouetteEdge(meshIndex, otherNeighbor, polyNeighbor );
 
-			}  // end else
+			}
 
-		}  // end for j
+		}
 
 		//
 		// if this polygon is visible, add any edges that are not
@@ -2392,7 +2379,7 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 
 			addNeighborlessEdges(meshIndex, polyNeighbor );
 
-		}  // end if
+		}
 
 		//
 		// this polyNeighbor is now considered "processed", any other
@@ -2401,20 +2388,20 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 		//
 		BitSet( polyNeighbor->status, POLY_PROCESSED );
 
-	}  // end for i
-	
+	}
+
 	//record number of edge indices contrinuted by this mesh
 	m_numIndicesPerMesh[meshIndex]=m_numSilhouetteIndices[meshIndex]-meshEdgeStart;
-	
-}  // end buildSilhouette
+
+}
 
 // constructVolume ============================================================
 // Given a fresh new geometry class called "shadowVolume" to hold the actual
 // shadow volume data, this method will create the shadow volume polygons
 // given the information in the current silhouette of this Shadow and the
-// light source position.  
+// light source position.
 //
-// The light source should be in object space and the shadow volume polygon 
+// The light source should be in object space and the shadow volume polygon
 // data is also constructed in object space.
 //
 // The polygon we will create for a given edge will be that edge extruded
@@ -2438,7 +2425,7 @@ void W3DVolumetricShadow::constructVolume( Vector3 *lightPosObject,Real shadowEx
 	W3DShadowGeometryMesh *geomMesh;
 
 	// sanity
-	if( volumeIndex < 0 || 
+	if( volumeIndex < 0 ||
 			volumeIndex >= MAX_SHADOW_LIGHTS ||
 			lightPosObject == NULL )
 	{
@@ -2446,7 +2433,7 @@ void W3DVolumetricShadow::constructVolume( Vector3 *lightPosObject,Real shadowEx
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// get the geometry struct we're storing the actual shadow volume data in
 	shadowVolume = m_shadowVolume[ volumeIndex ][meshIndex];
@@ -2458,7 +2445,7 @@ void W3DVolumetricShadow::constructVolume( Vector3 *lightPosObject,Real shadowEx
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// step through each of the silhouette pairs
 	vertexCount = 0;
@@ -2574,7 +2561,7 @@ void W3DVolumetricShadow::constructVolume( Vector3 *lightPosObject,Real shadowEx
 #endif
 				break;	//reached end of all edges
 			}
-	
+
 			//Start a new strip by adding first vertex and extrusion.
 			geomMesh->GetVertex( silhouetteIndices[ i+2 ], &edgeVertex2 );
 			// take one edge point and extrude away from the light
@@ -2641,15 +2628,15 @@ void W3DVolumetricShadow::constructVolume( Vector3 *lightPosObject,Real shadowEx
 
 	shadowVolume->SetNumActivePolygon(polygonCount);
 	shadowVolume->SetNumActiveVertex(vertexCount);
-}  // end constructVolume
+}
 
 // constructVolumeVB ==========================================================
 // Given a fresh new geometry class called "shadowVolume" to hold the actual
 // shadow volume data, this method will create the shadow volume polygons
 // given the information in the current silhouette of this Shadow and the
-// light source position.  
+// light source position.
 //
-// The light source should be in object space and the shadow volume polygon 
+// The light source should be in object space and the shadow volume polygon
 // data is also constructed in object space.
 //
 // The polygon we will create for a given edge will be that edge extruded
@@ -2677,7 +2664,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 	W3DBufferManager::W3DIndexBufferSlot *ibSlot;
 
 	// sanity
-	if( volumeIndex < 0 || 
+	if( volumeIndex < 0 ||
 			volumeIndex >= MAX_SHADOW_LIGHTS ||
 			lightPosObject == NULL )
 	{
@@ -2685,7 +2672,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// get the geometry struct we're storing the actual shadow volume data in
 	shadowVolume = m_shadowVolume[ volumeIndex ][meshIndex];
@@ -2697,7 +2684,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	//*****************************************************************************************/
 	//Do an initial pass through silhouette data to determine the actual vertex/polygon counts.
@@ -2769,7 +2756,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 	#endif
 					break;	//reached end of all edges
 				}
-		
+
 				lastEdgeVertex2Index=vertexCount;
 				lastExtrude2Index=vertexCount + 1;
 				//record start of new strip info
@@ -2800,7 +2787,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 			maxStripLength=__max(maxStripLength,stripLength);
 	#endif
 		}
-	}	//initial pass to determine vertex/polygon counts.
+	}
 	//***********************************************************************************************
 
 	DEBUG_ASSERTCRASH(m_shadowVolumeVB[ volumeIndex ][meshIndex] == NULL,("Updating Existing Static Vertex Buffer Shadow"));
@@ -2833,7 +2820,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 
 		m_shadowVolumeIB[ volumeIndex ][meshIndex]=NULL;
 		m_shadowVolumeVB[ volumeIndex ][meshIndex]=NULL;
-		return; 
+		return;
 	}
 
 	geomMesh = m_geometry->getMesh(meshIndex);
@@ -2929,7 +2916,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 				polygonCount += 2;
 				break;	//reached end of all edges
 			}
-	
+
 			//Start a new strip by adding first vertex and extrusion.
 			geomMesh->GetVertex( silhouetteIndices[ i+2 ], &edgeVertex2 );
 			// take one edge point and extrude away from the light
@@ -2972,7 +2959,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 
 			// add the one new vertex
 			*vb++ = *(VertexFormatXYZ *)&extrude2;
-			
+
 			lastEdgeVertex2Index=vertexCount;
 			lastExtrude2Index=vertexCount+1;
 
@@ -2981,8 +2968,8 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 		}
 	}
 
-//	DEBUG_ASSERTLOG(polygonCount == vertexCount, ("WARNING***Shadow volume mesh not optimal: %s\n",m_geometry->Get_Name()));
-}  // end constructVolume
+//	DEBUG_ASSERTLOG(polygonCount == vertexCount, ("WARNING***Shadow volume mesh not optimal: %s",m_geometry->Get_Name()));
+}
 
 // allocateShadowVolume =======================================================
 // Allocate a space for us to construct the shadow volume in
@@ -3000,10 +2987,10 @@ Bool W3DVolumetricShadow::allocateShadowVolume( Int volumeIndex, Int meshIndex )
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	if ((shadowVolume = m_shadowVolume[ volumeIndex ][meshIndex]) == 0)
-	{	
+	{
 		// poolify
 		shadowVolume = NEW Geometry;		// create the new geometry
 		// we now have one more valid geometry volume
@@ -3019,7 +3006,7 @@ Bool W3DVolumetricShadow::allocateShadowVolume( Int volumeIndex, Int meshIndex )
 		m_shadowVolumeCount[meshIndex]--;
 		return FALSE;
 
-	}  // end if
+	}
 
 	// assign to list
 	m_shadowVolume[ volumeIndex ][meshIndex] = shadowVolume;
@@ -3062,12 +3049,12 @@ Bool W3DVolumetricShadow::allocateShadowVolume( Int volumeIndex, Int meshIndex )
 			delete shadowVolume;
 			return FALSE;
 
-		}  // end if
+		}
 	}
 
 	return TRUE;  // success
 
-}  // end allocateShadowVolume
+}
 
 // deleteShadowVolume =========================================================
 // Free all resources allocated to the shadow volume(s)
@@ -3083,7 +3070,7 @@ void W3DVolumetricShadow::deleteShadowVolume( Int volumeIndex )
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// delete it!
 	for (Int meshIndex=0; meshIndex<MAX_SHADOW_CASTER_MESHES; meshIndex++)
@@ -3097,10 +3084,10 @@ void W3DVolumetricShadow::deleteShadowVolume( Int volumeIndex )
 			// we now have one less shadow volume
 			m_shadowVolumeCount[meshIndex]--;
 
-		}  // end if
+		}
 	}
 
-}  // end deleteShadowVolume
+}
 
 // resetShadowVolume ==========================================================
 // Reset the contents of the shadow volume information.  Since we're using
@@ -3120,7 +3107,7 @@ void W3DVolumetricShadow::resetShadowVolume( Int volumeIndex, Int meshIndex )
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	geometry = m_shadowVolume[ volumeIndex ][meshIndex];
 
@@ -3137,7 +3124,7 @@ void W3DVolumetricShadow::resetShadowVolume( Int volumeIndex, Int meshIndex )
 		geometry->Release();
 	}
 
-}  // end resetShadowVolume
+}
 
 // allocateSilhouette =========================================================
 // Allocate space for new silhouette storage, the number of vertices passed
@@ -3150,7 +3137,7 @@ Bool W3DVolumetricShadow::allocateSilhouette(Int meshIndex, Int numVertices )
 	Int numEntries = numVertices * 5;	///@todo: HACK, HACK... Should be 2!
 
 	// sanity
-	assert( m_silhouetteIndex[meshIndex] == NULL && 
+	assert( m_silhouetteIndex[meshIndex] == NULL &&
 					m_numSilhouetteIndices[meshIndex] == 0 &&
 					numEntries > 0 );
 
@@ -3158,22 +3145,22 @@ Bool W3DVolumetricShadow::allocateSilhouette(Int meshIndex, Int numVertices )
 	m_silhouetteIndex[meshIndex] = NEW short[ numEntries ];
 	if( m_silhouetteIndex[meshIndex] == NULL )
 	{
-	
+
 //		DBGPRINTF(( "Unable to allcoate silhouette storage '%d'\n", numEntries ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
-		
+	}
+
 	// set our list to empty just to be clean
 	m_numSilhouetteIndices[meshIndex] = 0;
-	
+
 	// save the size of our silhouette list
 	m_maxSilhouetteEntries[meshIndex] = numEntries;
 
 	return TRUE;  // success
 
-}  // end allocateSilhouette
+}
 
 // deleteSilhouette ===========================================================
 // Delete all silhouette data and memory allocated
@@ -3181,12 +3168,11 @@ Bool W3DVolumetricShadow::allocateSilhouette(Int meshIndex, Int numVertices )
 void W3DVolumetricShadow::deleteSilhouette( Int meshIndex )
 {
 
-	if( m_silhouetteIndex[meshIndex])
-		delete [] m_silhouetteIndex[meshIndex];
+	delete [] m_silhouetteIndex[meshIndex];
 	m_silhouetteIndex[meshIndex] = NULL;
 	m_numSilhouetteIndices[meshIndex] = 0;
 
-}  // end deletesilhouette
+}
 
 // resetSilhouette ============================================================
 // Resets the silhouette to empty, it does NOT free any of the memory
@@ -3197,7 +3183,7 @@ void W3DVolumetricShadow::resetSilhouette( Int meshIndex )
 
 	m_numSilhouetteIndices[meshIndex] = 0;
 
-}  // end resetSilhouette
+}
 
 // renderStencilShadows =======================================================
 // The stencil buffer now has our shadow information in it, take that
@@ -3213,7 +3199,7 @@ void W3DVolumetricShadowManager::renderStencilShadows( void )
 
 	struct _TRANSLITVERTEX {
 	    D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
+		DWORD color;   // diffuse color
 	} v[4];
 
 	Int xpos, ypos, width, height;
@@ -3268,7 +3254,7 @@ void W3DVolumetricShadowManager::renderStencilShadows( void )
 	// turn off the stencil buffer
 	m_pDev->SetRenderState( D3DRS_STENCILENABLE, FALSE );
 
-}  // end renderStencilShadows
+}
 
 void W3DVolumetricShadowManager::renderShadows( Bool forceStencilFill )
 {
@@ -3277,13 +3263,13 @@ void W3DVolumetricShadowManager::renderShadows( Bool forceStencilFill )
 
  	AABoxClass bbox;
 	SphereClass bsphere;
- 
+
  	//Get a bounding box around our visible universe.  Bounded by terrain and the sky
  	//so much tighter fitting volume than what's actually visible.  This will cull
  	//particles falling under the ground.
- 
+
  	TheTerrainRenderObject->getMaximumVisibleBox(*shadowCameraFrustum, &bbox, TRUE);
- 
+
  	bcX = bbox.Center.X;
  	bcY = bbox.Center.Y;
  	bcZ = bbox.Center.Z;
@@ -3374,7 +3360,7 @@ void W3DVolumetricShadowManager::renderShadows( Bool forceStencilFill )
 		m_pDev->SetRenderState( D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP );
 		m_pDev->SetRenderState( D3DRS_STENCILFAIL,  D3DSTENCILOP_KEEP );
 		m_pDev->SetRenderState( D3DRS_STENCILPASS,  D3DSTENCILOP_INCR );
-		
+
 		m_pDev->SetVertexShader(SHADOW_DYNAMIC_VOLUME_FVF);
 
 		m_pDev->SetRenderState(D3DRS_CULLMODE,D3DCULL_CW);
@@ -3386,7 +3372,7 @@ void W3DVolumetricShadowManager::renderShadows( Bool forceStencilFill )
 
 		m_dynamicShadowVolumesToRender=NULL;	//clear list of pending dynamic shadows
 		W3DVolumetricShadowRenderTask *shadowDynamicTasksStart,*shadowDynamicTask;
-		
+
 		// step through each of our shadows and render
 		for( shadow = m_shadowList; shadow; shadow = shadow->m_next )
 		{
@@ -3406,7 +3392,7 @@ void W3DVolumetricShadowManager::renderShadows( Bool forceStencilFill )
 					numRenderedShadows++;
 				}
 			}
-		}  // end for
+		}
 
 		// Set vertex format to that used by static shadow volumes
 		m_pDev->SetVertexShader(W3DBufferManager::getDX8Format(W3DBufferManager::VBM_FVF_XYZ));
@@ -3501,7 +3487,7 @@ void W3DVolumetricShadowManager::renderShadows( Bool forceStencilFill )
 		DX8Wrapper::Invalidate_Cached_Render_States();
 	}
 
-}  // end RenderShadows
+}
 
 /** This class will manage shadow geometry for each render object.  Shadow geometry may
 be the same as render geometry but doesn't need to be.  This allows lower LOD versions of
@@ -3561,7 +3547,7 @@ void W3DVolumetricShadowManager::invalidateCachedLightPositions(void)
 				shadow->setLightPosHistory(i,meshIndex,vec);
 			}
 		}
-	}  // end for
+	}
 }
 
 // W3DVolumetricShadowManager =============================================================
@@ -3575,7 +3561,7 @@ W3DVolumetricShadowManager::W3DVolumetricShadowManager( void )
 
 	TheW3DBufferManager = NEW W3DBufferManager;
 
-}  // end ShadowManager
+}
 
 // ~W3DVolumetricShadowManager ============================================================
 // ============================================================================
@@ -3590,7 +3576,7 @@ W3DVolumetricShadowManager::~W3DVolumetricShadowManager( void )
 	//all shadows should be freed up at this point but check anyway
 	assert(m_shadowList==NULL);
 
-}  // end ~W3DVolumetricShadowManager
+}
 
 /** Releases all W3D/D3D assets before a reset.. */
 void W3DVolumetricShadowManager::ReleaseResources(void)
@@ -3618,10 +3604,10 @@ Bool W3DVolumetricShadowManager::ReAcquireResources(void)
 
 	if (FAILED(m_pDev->CreateIndexBuffer
 	(
-		SHADOW_INDEX_SIZE*sizeof(WORD), 
-		D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC, 
-		D3DFMT_INDEX16, 
-		D3DPOOL_DEFAULT, 
+		SHADOW_INDEX_SIZE*sizeof(WORD),
+		D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC,
+		D3DFMT_INDEX16,
+		D3DPOOL_DEFAULT,
 		&shadowIndexBufferD3D
 	)))
 		return FALSE;
@@ -3632,9 +3618,9 @@ Bool W3DVolumetricShadowManager::ReAcquireResources(void)
 		if (FAILED(m_pDev->CreateVertexBuffer
 		(
 			SHADOW_VERTEX_SIZE*sizeof(SHADOW_DYNAMIC_VOLUME_VERTEX),
-			D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC, 
+			D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC,
 			0,
-			D3DPOOL_DEFAULT, 
+			D3DPOOL_DEFAULT,
 			&shadowVertexBufferD3D
 		)))
 			return FALSE;
@@ -3653,7 +3639,7 @@ Bool W3DVolumetricShadowManager::ReAcquireResources(void)
 Bool W3DVolumetricShadowManager::init( void )
 {
 	return TRUE;
-}  // end Init
+}
 
 // Reset ======================================================================
 // Reset our list of shadows to empty
@@ -3665,7 +3651,7 @@ void W3DVolumetricShadowManager::reset( void )
 	m_W3DShadowGeometryManager->Free_All_Geoms();
 	TheW3DBufferManager->freeAllBuffers();
 
-}  // end Reset
+}
 
 // addShadow ==================================================================
 // Add the shadows for this hierarchy to the shadow management for
@@ -3720,7 +3706,7 @@ W3DVolumetricShadow* W3DVolumetricShadowManager::addShadow(RenderObjClass *robj,
 
 	// add to our shadow list through the shadow next links
 	shadow->m_next = m_shadowList;
-	m_shadowList = shadow;	
+	m_shadowList = shadow;
 	return shadow;
 }
 
@@ -3747,7 +3733,7 @@ void W3DVolumetricShadowManager::removeShadow(W3DVolumetricShadow *shadow)
 			delete shadow;
 			break;
 		}
-	}  // end for
+	}
 }
 
 /** removeAllShadows ===========================================================
@@ -3767,10 +3753,10 @@ void W3DVolumetricShadowManager::removeAllShadows(void)
 		next_shadow = cur_shadow->m_next;
 		cur_shadow->m_next = NULL;
 		delete cur_shadow;
-	}  // end for
+	}
 }
 
-W3DShadowGeometryManager::W3DShadowGeometryManager(void) 
+W3DShadowGeometryManager::W3DShadowGeometryManager(void)
 {
 	// Create the hash tables
 	GeomPtrTable = NEW HashTableClass( 2048 );
@@ -3810,7 +3796,7 @@ W3DShadowGeometry * W3DShadowGeometryManager::Peek_Geom(const char * name)
 
 /** Get animation from cache and increment its reference count */
 W3DShadowGeometry * W3DShadowGeometryManager::Get_Geom(const char * name)
-{	
+{
 	W3DShadowGeometry * geom = Peek_Geom( name );
 	if ( geom != NULL ) {
 		geom->Add_Ref();
@@ -3893,7 +3879,7 @@ int W3DShadowGeometryManager::Load_Geom(RenderObjClass *robj, const char *name)
 	if (res != TRUE)
 	{	// load failed!
 		newgeom->Release_Ref();
-		//DEBUG_LOG(("****Shadow Volume Creation Failed on %s\n",name));
+		//DEBUG_LOG(("****Shadow Volume Creation Failed on %s",name));
 		goto Error;
 	} else if (Peek_Geom(newgeom->Get_Name()) != NULL)
 	{	// duplicate exists!
@@ -3913,7 +3899,7 @@ int W3DShadowGeometryManager::Load_Geom(RenderObjClass *robj, const char *name)
 /*
 ** Iterator converter from HashableClass to W3DShadowGeometry
 */
-W3DShadowGeometry * W3DShadowGeometryManagerIterator::Get_Current_Geom( void )	
-{ 
-	return (W3DShadowGeometry *)Get_Current(); 
+W3DShadowGeometry * W3DShadowGeometryManagerIterator::Get_Current_Geom( void )
+{
+	return (W3DShadowGeometry *)Get_Current();
 }
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp
deleted file mode 100644
index 77e61f902c2..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp
+++ /dev/null
@@ -1,1206 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: TerrainTex.cpp ////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: TerrainTex.cpp
-//
-// Created:   John Ahlquist, April 2001
-//
-// Desc:      TextureClass overrides to perform custom texturing for the terrain.
-//
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-//         Includes                                                      
-//-----------------------------------------------------------------------------
-#include <stdlib.h>
-
-#include "W3DDevice/GameClient/TerrainTex.h"
-#include "W3DDevice/GameClient/WorldHeightMap.h"
-#include "W3DDevice/GameClient/TileData.h"
-#include "Common/GlobalData.h"
-#include "WW3D2/dx8wrapper.h"
-#include "d3dx8tex.h"
-
-/******************************************************************************
-						TerrainTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// TerrainTextureClass::TerrainTextureClass
-//=============================================================================
-/** Constructor. Calls parent constructor to create a 16 bit per pixel D3D 
-texture of the desired height and mip level. */
-//=============================================================================
-TerrainTextureClass::TerrainTextureClass(int height, MipCountType mipLevelCount) :
-	TextureClass(TEXTURE_WIDTH, height, 
-		WW3D_FORMAT_A1R5G5B5, mipLevelCount )
-{
-}
-
-
-//=============================================================================
-// TerrainTextureClass::update
-//=============================================================================
-/** Sets the tile bitmap data into the texture.  The tiles are placed with 4
-	pixel borders around them, so that when the tiles are scaled and bilinearly
-	interpolated, you don't get seams between the tiles.  */
-//=============================================================================
-int TerrainTextureClass::update(WorldHeightMap *htMap)
-{
-	// D3DTexture is our texture;
-
-	IDirect3DSurface8 *surface_level;
-	D3DSURFACE_DESC surface_desc;
-	D3DLOCKED_RECT locked_rect;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0, &surface_level));
-	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
-	if (surface_desc.Width < TEXTURE_WIDTH) {
-		surface_level->Release();
-		if (surface_desc.Width == 256) {
-			return update256(htMap);
-		}
-		return false;
-	}
-
-	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
-
-	Int tilePixelExtent = TILE_PIXEL_EXTENT;		 
-	Int tilesPerRow = surface_desc.Width/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
-	tilesPerRow *= 2;
-//	Int numRows = surface_desc.Height/(tilePixelExtent+TILE_OFFSET);
-#ifdef RTS_DEBUG
-	//DEBUG_ASSERTCRASH(tilesPerRow*numRows >= htMap->m_numBitmapTiles, ("Too many tiles."));
-	DEBUG_ASSERTCRASH((Int)surface_desc.Width >= tilePixelExtent*tilesPerRow, ("Bitmap too small."));
-#endif
-	if (surface_desc.Format == D3DFMT_A1R5G5B5) {
-#if 0
-		UnsignedInt cellX, cellY;
-		for (cellX = 0; cellX < surface_desc.Width; cellX++) {
-			for (cellY = 0; cellY < surface_desc.Height; cellY++) {
-				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(cellY*surface_desc.Width+cellX)*2;
-				*((Short*)pBGR) = (((255-2*cellY)>>3)<<10) + ((4*cellX)>>4);
-			}
-		}
-#endif
-		Int tileNdx;
-		Int pixelBytes = 2;
-		for (tileNdx=0; tileNdx < htMap->m_numBitmapTiles; tileNdx++) {
-			TileData *pTile = htMap->getSourceTile(tileNdx);
-			if (!pTile) continue;
-			ICoord2D position = pTile->m_tileLocationInTexture;
-			if (position.x<=0) continue; // all real tile offsets start at 2.  jba.
-
-			Int i,j;
-			for (j=0; j<tilePixelExtent; j++) {
-				UnsignedByte *pBGR = pTile->getRGBDataForWidth(tilePixelExtent);
-				pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
-				Int row = position.y+j;
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*surface_desc.Width*pixelBytes;
-
-				Int column = position.x;
-				pBGRX += column*pixelBytes;
-				for (i=0; i<tilePixelExtent; i++) {
-					*((Short*)pBGRX) = 0x8000 + ((pBGR[2]>>3)<<10) + ((pBGR[1]>>3)<<5) + (pBGR[0]>>3);
-					pBGRX +=pixelBytes;
-					pBGR +=TILE_BYTES_PER_PIXEL;
-				}
-			}
-		}
-		// Now draw the 4 pixel border around each tile class.
-		Int texClass;
-		for (texClass=0; texClass<htMap->m_numTextureClasses; texClass++) {
-			Int width = htMap->m_textureClasses[texClass].width;
-			ICoord2D origin = htMap->m_textureClasses[texClass].positionInTexture;
-			if (origin.x<=0) continue;
-			width *= TILE_PIXEL_EXTENT;
-			// Duplicate 4 columns of pixels before and after.
-			Int j;
-			for (j=0; j<width; j++) {
-				Int row = origin.y+j;
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*surface_desc.Width*pixelBytes;
-
-				Int column = origin.x;
-				pBGRX += column*pixelBytes;
-				// copy before
-				memcpy(pBGRX-(4)*pixelBytes, pBGRX+(width-4)*pixelBytes, 4*pixelBytes);
-				// copy after
-				memcpy(pBGRX+(width*pixelBytes), pBGRX, 4*pixelBytes);
-			}
-
-			// Duplicate 4 rows of pixels before and after.
-			for (j=0; j<4; j++) {
-				// copy before.
-				Int row = origin.y-j-1;
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*surface_desc.Width*pixelBytes;
-				UnsignedByte *target = pBGRX+(origin.x-4)*pixelBytes; 
-				memcpy(target, target+width*surface_desc.Width*pixelBytes, (width+8)*pixelBytes);
-				// copy after.
-				row = origin.y+j;
-				pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*surface_desc.Width*pixelBytes;
-				target = pBGRX+(origin.x-4)*pixelBytes; 
-				memcpy(target+width*surface_desc.Width*pixelBytes, target, (width+8)*pixelBytes);
-			}
-
-		}
-
-	}
-	surface_level->UnlockRect();
-	surface_level->Release();
-	DX8_ErrorCode(D3DXFilterTexture(Peek_D3D_Texture(), NULL, 0, D3DX_FILTER_BOX));	
-	if (TheWritableGlobalData->m_textureReductionFactor) {
-		Peek_D3D_Texture()->SetLOD(TheWritableGlobalData->m_textureReductionFactor);
-	}
-	return(surface_desc.Height);
-}
-
-#if 0 // old version.
-//=============================================================================
-// TerrainTextureClass::update
-//=============================================================================
-/** Sets the tile bitmap data into the texture.  The tiles are placed with 4
-	pixel borders around them, so that when the tiles are scaled and bilinearly
-	interpolated, you don't get seams between the tiles.  */
-//=============================================================================
-int TerrainTextureClass::update(WorldHeightMap *htMap)
-{
-	// D3DTexture is our texture;
-
-	IDirect3DSurface8 *surface_level;
-	D3DSURFACE_DESC surface_desc;
-	D3DLOCKED_RECT locked_rect;
-	DX8_ErrorCode(D3DTexture->GetSurfaceLevel(0, &surface_level));
-	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
-	if (surface_desc.Width < TEXTURE_WIDTH) {
-		surface_level->Release();
-		if (surface_desc.Width == 256) {
-			return update256(htMap);
-		}
-		return false;
-	}
-
-	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
-
-	Int tilePixelExtent = TILE_PIXEL_EXTENT;		 
-	Int tilesPerRow = surface_desc.Width/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
-	tilesPerRow *= 2;
-	Int numRows = surface_desc.Height/(tilePixelExtent+TILE_OFFSET);
-#ifdef RTS_DEBUG
-	assert(tilesPerRow*numRows >= htMap->m_numBitmapTiles);
-	assert((Int)surface_desc.Width >= tilePixelExtent*tilesPerRow);
-#endif
-	if (surface_desc.Format == D3DFMT_A1R5G5B5) {
-		Int cellX, cellY;
-#if 0
-		for (cellX = 0; cellX < surface_desc.Width; cellX++) {
-			for (cellY = 0; cellY < surface_desc.Height; cellY++) {
-				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(cellY*surface_desc.Width+cellX)*2;
-				*((Short*)pBGR) = (((255-2*cellY)>>3)<<10) + ((4*cellX)>>4);
-			}
-		}
-#endif
-		Int pixelBytes = 2;
-		for (cellY = 0; cellY < numRows; cellY++) { 
-			for (cellX = 0; cellX < tilesPerRow; cellX++) {
-				Int tileNdx = cellX/2 + (tilesPerRow/2)*(cellY/2);
-				tileNdx *=4;
-				if (cellX&1) tileNdx++;
-				if (!(cellY&1)) tileNdx += 2;
-#define ADD_EXTRA_TILES 1
-#if ADD_EXTRA_TILES // Fills in an extra 2 columns and 1 row of tiles if there is room.
-				if (!htMap->getSourceTile(tileNdx) && htMap->getSourceTile(tileNdx-4)) {
-					tileNdx -= 4;
-				}
-				if (!htMap->getSourceTile(tileNdx) && htMap->getSourceTile(tileNdx-8)) {
-					tileNdx -= 8;
-				}
-				if (!htMap->getSourceTile(tileNdx) && htMap->getSourceTile(tileNdx-2*tilesPerRow)) {
-					tileNdx -= 2*tilesPerRow;
-				}
-#endif
-				if (htMap->getSourceTile(tileNdx)) {
-					Int i,j;
-					for (j=0; j<tilePixelExtent; j++) {
-						UnsignedByte *pBGR = htMap->getSourceTile(tileNdx)->getRGBDataForWidth(tilePixelExtent);
-						pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
-						Int row = cellY*tilePixelExtent+j;
-						row += TILE_OFFSET/2; 
-						row += TILE_OFFSET*(cellY/2);
-						UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-									(row)*surface_desc.Width*pixelBytes;
-
-						Int column = cellX*tilePixelExtent;
-						column += TILE_OFFSET*(cellX/2);
-						pBGRX += column*pixelBytes;
-						pBGRX += (TILE_OFFSET/2)*pixelBytes;
-						for (i=0; i<tilePixelExtent; i++) {
-							*((Short*)pBGRX) = 0x8000 + ((pBGR[2]>>3)<<10) + ((pBGR[1]>>3)<<5) + (pBGR[0]>>3);
-							pBGRX +=pixelBytes;
-							pBGR +=TILE_BYTES_PER_PIXEL;
-						}
-					}
-
-				}
-			}
-
-		}
-
-
-		for (cellY = 0; cellY < numRows; cellY++) {
-			for (cellX = 0; cellX < tilesPerRow; cellX++) {
-			// Duplicate 4 rows of pixels before and after.
-				Int j;
-				for (j=0; j<tilePixelExtent; j++) {
-					Int row = cellY*tilePixelExtent+j;
-					row += TILE_OFFSET/2; 
-					row += TILE_OFFSET*(cellY/2);
-					UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-								(row)*surface_desc.Width*pixelBytes;
-
-					Int column = cellX*tilePixelExtent;
-					column += TILE_OFFSET*(cellX/2);
-					pBGRX += column*pixelBytes;
-					if (cellX&1) {
-						Int bytesToCopy = 4*pixelBytes;
-						if (cellX == tilesPerRow-1) {
-							// last cell, so fill to the end of the texture.
-							Int usedWidth = tilesPerRow*tilePixelExtent + TILE_OFFSET*(tilesPerRow/2);
-							usedWidth *= pixelBytes;
-							bytesToCopy += surface_desc.Width*pixelBytes - usedWidth;
-						}
-						// Copy after. 
-						pBGRX -= tilePixelExtent*pixelBytes;
-						pBGRX += (TILE_OFFSET/2)*pixelBytes;
-						memcpy(pBGRX+(2*tilePixelExtent*pixelBytes), pBGRX, bytesToCopy);
-					} else {
-						// copy before
-						memcpy(pBGRX, pBGRX+(2*tilePixelExtent)*pixelBytes, 4*pixelBytes);
-					}
-				}
-			}
-		}
- 		for (cellY = 0; cellY < numRows; cellY++) {
-			Int rowBytes = surface_desc.Width*pixelBytes; 
-			Int row = cellY*tilePixelExtent;
-			row += TILE_OFFSET/2; 
-			row += TILE_OFFSET*(cellY/2);
-			if ( (cellY&1) == 0) {
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*rowBytes;
-				row += 2*tilePixelExtent;
-				UnsignedByte *pBase = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*rowBytes;
-				memcpy(pBGRX-4*rowBytes, pBase-4*rowBytes, 4*rowBytes);
-			} else {
-				UnsignedByte *pBase = ((UnsignedByte*)locked_rect.pBits) +
-							(row-tilePixelExtent)*rowBytes;
-				row += tilePixelExtent;
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*rowBytes;
-				memcpy(pBGRX, pBase, 4*rowBytes);
-			}
-		}
-		
-	}
-	surface_level->UnlockRect();
-	surface_level->Release();
-	DX8_ErrorCode(D3DXFilterTexture(D3DTexture, NULL, 0, D3DX_FILTER_BOX));	
-	return(surface_desc.Height);
-}
-#endif
-//=============================================================================
-// TerrainTextureClass::update256
-//=============================================================================
-/** Sets the tile bitmap data into the texture.  Handles the special case for voodoos
-	and the like where the max texture size is 256. The tiles are placed with 1
-	pixel borders around them, so that when the tiles are scaled and bilinearly
-	interpolated, you don't get seams between the tiles.  */
-//=============================================================================
-int TerrainTextureClass::update256(WorldHeightMap *htMap)
-{
-	// D3DTexture is our texture;
-
-	IDirect3DSurface8 *surface_level;
-	D3DSURFACE_DESC surface_desc;
-	D3DLOCKED_RECT locked_rect;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0, &surface_level));
-	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
-	if (surface_desc.Width != 256) {
-		surface_level->Release();
-		return surface_desc.Height;
-	}
-
-	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
-
-	Int tilePixelExtent = TILE_PIXEL_EXTENT/4;  // We are going from 1024 to 256, so need to divide all the constants by 4.
-	Int tileOffset = TILE_OFFSET/4;
-	Int tilesPerRow = surface_desc.Width/(2*tilePixelExtent+tileOffset);
-	tilesPerRow *= 2;
-	Int numRows = surface_desc.Height/(tilePixelExtent+tileOffset);
-
-#ifdef RTS_DEBUG
-	assert(tilesPerRow*numRows >= htMap->m_numBitmapTiles);
-	assert((Int)surface_desc.Width >= tilePixelExtent*tilesPerRow);
-#endif
-	if (surface_desc.Format == D3DFMT_A1R5G5B5) {
-		Int cellX, cellY;
-#if 0
-		for (cellX = 0; cellX < surface_desc.Width; cellX++) {
-			for (cellY = 0; cellY < surface_desc.Height; cellY++) {
-				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(cellY*surface_desc.Width+cellX)*2;
-				*((Short*)pBGR) = (((255-2*cellY)>>3)<<10) + ((4*cellX)>>4);
-			}
-		}
-		numRows = 0;
-#endif
-		Int pixelBytes = 2;
-		for (cellY = 0; cellY < numRows; cellY++) { 
-			for (cellX = 0; cellX < tilesPerRow; cellX++) {
-				Int tileNdx = cellX/2 + (tilesPerRow/2)*(cellY/2);
-				tileNdx *=4;
-				if (cellX&1) tileNdx++;
-				if (!(cellY&1)) tileNdx += 2;
-#if ADD_EXTRA_TILES // Fills in an extra 2 columns and 1 row of tiles if there is room.
-				if (!htMap->getSourceTile(tileNdx) && htMap->getSourceTile(tileNdx-4)) {
-					tileNdx -= 4;
-				}
-				if (!htMap->getSourceTile(tileNdx) && htMap->getSourceTile(tileNdx-8)) {
-					tileNdx -= 8;
-				}
-				if (!htMap->getSourceTile(tileNdx) && htMap->getSourceTile(tileNdx-2*tilesPerRow)) {
-					tileNdx -= 2*tilesPerRow;
-				}
-#endif
-				if (htMap->getSourceTile(tileNdx)) {
-					Int i,j;
-					for (j=0; j<tilePixelExtent; j++) {
-						UnsignedByte *pBGR = htMap->getSourceTile(tileNdx)->getRGBDataForWidth(tilePixelExtent);
-						pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
-						Int row = cellY*tilePixelExtent+j;
-						row += tileOffset/2; 
-						row += tileOffset*(cellY/2);
-						UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-									(row)*surface_desc.Width*pixelBytes;
-
-						Int column = cellX*tilePixelExtent;
-						column += tileOffset*(cellX/2);
-						pBGRX += column*pixelBytes;
-						pBGRX += (tileOffset/2)*pixelBytes;
-						for (i=0; i<tilePixelExtent; i++) {
-							*((Short*)pBGRX) = 0x8000 + ((pBGR[2]>>3)<<10) + ((pBGR[1]>>3)<<5) + (pBGR[0]>>3);
-							pBGRX +=pixelBytes;
-							pBGR +=TILE_BYTES_PER_PIXEL;
-						}
-					}
-
-				}
-			}
-
-		}
-
-		for (cellY = 0; cellY < numRows; cellY++) {
-			for (cellX = 0; cellX < tilesPerRow; cellX++) {
-			// Duplicate 1 rows of pixels before and after.
-				Int j;
-				for (j=0; j<tilePixelExtent; j++) {
-					Int row = cellY*tilePixelExtent+j;
-					row += tileOffset/2; 
-					row += tileOffset*(cellY/2);
-					UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-								(row)*surface_desc.Width*pixelBytes;
-
-					Int column = cellX*tilePixelExtent;
-					column += tileOffset*(cellX/2);
-					pBGRX += column*pixelBytes;
-					if (cellX&1) {
-						// Copy after. 
-						pBGRX -= tilePixelExtent*pixelBytes;
-						pBGRX += (tileOffset/2)*pixelBytes;
-
-						Int bytesToCopy = pixelBytes;
-						if (cellX == tilesPerRow-1) {
-							// last cell, so fill to the end of the texture.
-							Int usedWidth = tilesPerRow*tilePixelExtent + tileOffset*(tilesPerRow/2);
-							usedWidth *= pixelBytes;
-							bytesToCopy += surface_desc.Width*pixelBytes - usedWidth;
-						}
-						memcpy(pBGRX+(2*tilePixelExtent*pixelBytes), pBGRX, bytesToCopy);
-						// Copy after. 
-						pBGRX -= tilePixelExtent*pixelBytes;
-						pBGRX += (TILE_OFFSET/2)*pixelBytes;
-					} else {
-						// copy before
-						memcpy(pBGRX, pBGRX+(2*tilePixelExtent)*pixelBytes, pixelBytes);
-					}
-				}
-			}
-		}
- 		for (cellY = 0; cellY < numRows; cellY++) {
-			Int rowBytes = surface_desc.Width*pixelBytes; 
-			Int row = cellY*tilePixelExtent;
-			row += tileOffset/2; 
-			row += tileOffset*(cellY/2);
-			if ( (cellY&1) == 0) {
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*rowBytes;
-				row += 2*tilePixelExtent;
-				UnsignedByte *pBase = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*rowBytes;
-				memcpy(pBGRX-rowBytes, pBase-rowBytes, rowBytes);
-			} else {
-				UnsignedByte *pBase = ((UnsignedByte*)locked_rect.pBits) +
-							(row-tilePixelExtent)*rowBytes;
-				row += tilePixelExtent;
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*rowBytes;
-				memcpy(pBGRX, pBase, rowBytes);
-			}
-		}
-
-	}
-	surface_level->UnlockRect();
-	surface_level->Release();
-	DX8_ErrorCode(D3DXFilterTexture(Peek_D3D_Texture(), NULL, 0, D3DX_FILTER_BOX));
-	// Note - normal width for the terrain texture is 1024.  We are at 256
-	// probably running on a voodoo.  The height we return is scaled up 
-	// to match the expected width of 1024.  jba.
-	return(surface_desc.Height*4);
-}
-
-
-//=============================================================================
-// TerrainTextureClass::Apply
-//=============================================================================
-/** Sets the texture as the current D3D texture, and does some custom setup
-(standard D3D setup, but beyond the scope of W3D).  */
-//=============================================================================
-void TerrainTextureClass::Apply(unsigned int stage)
-{
-	// Do the base apply.
-	TextureClass::Apply(stage);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-	// Now setup the texture pipeline.
-	if (stage==0) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
-
-	}
-}
-
-/******************************************************************************
-						AlphaTerrainTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// AlphaTerrainTextureClass::AlphaTerrainTextureClass
-//=============================================================================
-/** Constructor. Calls parent constructor to creat a throw away 8x8 texture, 
-then uses the base texture's D3D texture. This way the base tiles pass, drawn
-using TerrainTextureClass shares the same texture with the blended edges pass,
-saving lots of texture memory, and preventing seams between blended tiles. */
-//=============================================================================
-AlphaTerrainTextureClass::AlphaTerrainTextureClass( TextureClass *pBaseTex ): 
-	TextureClass(8, 8, 
-		WW3D_FORMAT_A1R5G5B5, MIP_LEVELS_1 )
-{ 
-	// Attach the base texture's d3d texture.
-	IDirect3DTexture8 * d3d_tex = pBaseTex->Peek_D3D_Texture();
-	Set_D3D_Base_Texture(d3d_tex);
-}
-
-
-//=============================================================================
-// AlphaTerrainTextureClass::Apply
-//=============================================================================
-/** Sets the texture as the current D3D texture, and does some custom setup.
-This may be applied in either single pass, as the second texture in the pipe, 
-or multipass.  If stage==0, we are doing multipass and we set up the pipe 
-for a single texture.  If stage==1, then we are doing a single pass, and we
-set up the pipe so that we blend onto the base texture in stage 0.
-(standard D3D setup, but beyond the scope of W3D). */
-//=============================================================================
-void AlphaTerrainTextureClass::Apply(unsigned int stage)
-{
-	// Do the base apply.
-	TextureClass::Apply(stage);
-	
-	// Set the bilinear or trilinear filtering.
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-	// Since we are using multiple distinct tiles, the textures doesn't wrap, so clamp it.
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-	// Now setup the texture pipeline.
-	if (stage==0) {
-		// Modulate the diffuse color with the texture as lighting comes from diffuse.
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 1 );
-		// Blend the result using the alpha. (came from diffuse mod texture)
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-		// Disable stage 2.
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	}	else if (stage==1) {
-
-		if (TheGlobalData && !TheGlobalData->m_multiPassTerrain)
-		{
-			///@todo: Remove 8-Stage Nvidia hack after drivers are fixed.
-			//This method is a backdoor specific to Nvidia based cards.  It will fail on
-			//other hardware.  Allows single pass blend of 2 textures and post modulate diffuse.
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP, D3DTOP_ADD);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_DIFFUSE | D3DTA_COMPLEMENT | D3DTA_ALPHAREPLICATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_ADD);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TFACTOR | D3DTA_COMPLEMENT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-			DX8Wrapper::Set_DX8_Texture(2, NULL);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, 2);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLORARG2, D3DTA_TEXTURE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-			DX8Wrapper::Set_DX8_Texture(3, NULL);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, 3);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLORARG1, D3DTA_DIFFUSE | 0 | D3DTA_ALPHAREPLICATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-			DX8Wrapper::Set_DX8_Texture(4, NULL);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLOROP, D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_TEXCOORDINDEX, 4);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLORARG1, D3DTA_CURRENT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAARG1, D3DTA_CURRENT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-
-			DX8Wrapper::Set_DX8_Texture(5, NULL);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLOROP, D3DTOP_ADD);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_TEXCOORDINDEX, 5);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLORARG1, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAOP,   D3DTOP_ADD);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAARG1, D3DTA_TFACTOR | D3DTA_COMPLEMENT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-			DX8Wrapper::Set_DX8_Texture(6, NULL);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLOROP, D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_TEXCOORDINDEX, 6);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLORARG1, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLORARG2, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-			DX8Wrapper::Set_DX8_Texture(7, NULL);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_TEXCOORDINDEX, 7);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLORARG1, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLORARG2, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-		}
-		else
-		{
-  			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-		}
-	}
-}
-
-
-/******************************************************************************
-						LightMapTerrainTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// LightMapTerrainTextureClass::LightMapTerrainTextureClass
-//=============================================================================
-/** Constructor. Calls parent constructor to load the .tga texture. */
-//=============================================================================
-LightMapTerrainTextureClass::LightMapTerrainTextureClass(AsciiString name, MipCountType mipLevelCount) :
-TextureClass(name.isEmpty()?"TSNoiseUrb.tga":name.str(),name.isEmpty()?"TSNoiseUrb.tga":name.str(), mipLevelCount )
-{ 
-}
-
-#define STRETCH_FACTOR ((float)(1/(63.0*MAP_XY_FACTOR/2))) /* covers 63/2 tiles */		
-
-//=============================================================================
-// LightMapTerrainTextureClass::Apply
-//=============================================================================
-/** Sets the texture as the current D3D texture, and does some custom setup.
-The LightMapTerrainTextureClass may be applied by itself, or with the 
-CloudMapTerrainTextureClass.  This may be applied in either single pass, 
-as the second texture in the pipe, 
-or multipass.  If stage==0, we are doing multipass and we set up the pipe 
-for a single texture.  If stage==1, then we are doing a single pass, and we
-set up the pipe so that we blend onto the cloud map texture in stage 0.
-Also, texture is mapped using the x/y coordinates of the map, saving us 
-yet another set of uv coordinates.
-(standard D3D setup, but beyond the scope of W3D). */
-//=============================================================================
-void LightMapTerrainTextureClass::Apply(unsigned int stage)
-{
-	// Do the base apply.
-	TextureClass::Apply(stage);
-	/* previous setup */
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-	// Disable 3rd stage just in case.
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-	// Now setup the texture pipeline.
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG2, D3DTA_CURRENT );
-	if (stage == 0) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
-		//Disable second stage
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	}
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	// Two output coordinates are used.
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-	Matrix4x4 curView;
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-
-	D3DXMATRIX inv;
-	float det;
-	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-	D3DXMATRIX scale;
-	D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
-	inv *=scale;
-	if (stage==0) {
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&inv));
-	}	if (stage==1) {
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, *((Matrix4x4*)&inv));
-	}
-		
-		
-	if (stage==0) {
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_DESTCOLOR);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
-	} 
-}
-
-
-
-
-
-
-
-
-
-/******************************************************************************
-						AlphaEdgeTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-/**
-* AlphaEdgeTextureClass - Generates the alpha edge blending for terrain.
-*		
-*/
-AlphaEdgeTextureClass::AlphaEdgeTextureClass( int height, MipCountType mipLevelCount) :
-//	TextureClass("EdgingTemplate.tga","EdgingTemplate.tga", mipLevelCount )
-	TextureClass(TEXTURE_WIDTH, height, WW3D_FORMAT_A8R8G8B8, mipLevelCount )
-{ 
-
-}
-
-int AlphaEdgeTextureClass::update256(WorldHeightMap *htMap)
-{
-	return 1;
-}
-
-int AlphaEdgeTextureClass::update(WorldHeightMap *htMap)
-{
-	// D3DTexture is our texture;
-
-	IDirect3DSurface8 *surface_level;
-	D3DSURFACE_DESC surface_desc;
-	D3DLOCKED_RECT locked_rect;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0, &surface_level));
-	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
-	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
-
-	Int tilePixelExtent = TILE_PIXEL_EXTENT; // blend tiles are 1/4 tiles.
-//	Int tilesPerRow = surface_desc.Width / (tilePixelExtent+8);
-
-//	Int numRows = surface_desc.Height/(tilePixelExtent+8);
-
-	if (surface_desc.Format == D3DFMT_A8R8G8B8) {
-#if 1
-#if 1
-		Int cellX, cellY;
-		for (cellX = 0; (UnsignedInt)cellX < surface_desc.Width; cellX++) {
-			for (cellY = 0; cellY < surface_desc.Height; cellY++) {
-				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(cellY*surface_desc.Width+cellX)*4;
-				pBGR[2] = 255-cellY/2;
-				pBGR[0] = cellX/2;
-				pBGR[3] = cellX/2;  // alpha.
-				pBGR[3] = 128;  // alpha.
-			}
-		}
-#endif
-#if 1
-		Int tileNdx;
-		Int pixelBytes = 4;
-		for (tileNdx=0; tileNdx < htMap->m_numEdgeTiles; tileNdx++) {
-			TileData *pTile = htMap->getEdgeTile(tileNdx);
-			if (!pTile) continue;
-			ICoord2D position = pTile->m_tileLocationInTexture;
-			if (position.x<=0) continue; // all real edge offsets start at 4.  jba.
-			Int i,j;
-			Int column = position.x;
-			for (j=0; j<tilePixelExtent; j++) {
-				Int row = position.y+j;
-				UnsignedByte *pBGR = htMap->getEdgeTile(tileNdx)->getRGBDataForWidth(tilePixelExtent);
-				pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*surface_desc.Width*pixelBytes;
-				pBGRX += column*pixelBytes;
-
-				for (i=0; i<tilePixelExtent; i++) {
-					pBGRX[0] = pBGR[0];  //r
-					pBGRX[1] = pBGR[1];	//g
-					pBGRX[2] = pBGR[2];	//b
-					if (pBGR[0]==0 && pBGR[1]==0 && pBGR[2]==0) {
-						pBGRX[3] = 0x80;
-					} else if (pBGR[0]==0xff && pBGR[1]==0xff && pBGR[2]==0xff) {
-						pBGRX[3] = 0x00;
-					}	else {
-						pBGRX[3] = 0xff;
-					}
-						
-					pBGRX += pixelBytes;
-					pBGR += TILE_BYTES_PER_PIXEL;
-				}
-			}
-		}
-#endif
-#endif
-	}
-	surface_level->UnlockRect();
-	surface_level->Release();
-	DX8_ErrorCode(D3DXFilterTexture(Peek_D3D_Texture(), NULL, 0, D3DX_FILTER_BOX));
-	return(surface_desc.Height);
-}
-
-void AlphaEdgeTextureClass::Apply(unsigned int stage)
-{
-	// Do the base apply.
-	TextureClass::Apply(stage);
-	
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-	// Now setup the texture pipeline.
-	if (stage==0) {
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1,   D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 1 );
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-	} else if (stage==1) {
-		// Drawing texture through the mask.
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1,   D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1,   D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2,   D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG2 );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1 );
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_ONE);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
-
-	}
-}
-
-
-/******************************************************************************
-						CloudMapTerrainTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// CloudMapTerrainTextureClass::CloudMapTerrainTextureClass
-//=============================================================================
-/** Constructor. Calls parent constructor to load the .tga texture, and sets
-up the "sliding" parameters for the clouds to slide over the terrain. */
-//=============================================================================
-//@todo - Allow adjustment of the cloud slide rate, and lose the hard coded "cloudmap.tga"
-CloudMapTerrainTextureClass::CloudMapTerrainTextureClass(MipCountType mipLevelCount) :
-	TextureClass("TSCloudMed.tga","TSCloudMed.tga", mipLevelCount )
-{ 
-	Get_Filter().Set_Mip_Mapping( TextureFilterClass::FILTER_TYPE_FAST );
-	m_xSlidePerSecond = -0.02f;	 
-	m_ySlidePerSecond =  1.50f * m_xSlidePerSecond;
-	m_curTick = 0;
-	m_xOffset = 0;
-	m_yOffset = 0;
-
-}
-
-//=============================================================================
-// CloudMapTerrainTextureClass::Apply
-//=============================================================================
-/** Sets the texture as the current D3D texture, and does some custom setup.
-The CloudMapTerrainTextureClass may be applied by itself, or with the 
-LightMapTerrainTexture.  This may be applied in either single pass, 
-as the first texture in the pipe with LightMapTerrainTextureClass as the 
-second stage of the pape, or multipass.  We setup for stage 0, assuming that
-we are the only texture, as LightMapTerrainTexture will adjust for multitexture
-if it is applied to stage 1.
-Also, texture is mapped using the x/y coordinates of the map, saving us 
-yet another set of uv coordinates.
-(standard D3D setup, but beyond the scope of W3D). */
-//=============================================================================
-void CloudMapTerrainTextureClass::Apply(unsigned int stage)
-{
-
-
-	// Do the base apply.
-	TextureClass::Apply(stage);
-	/* previous setup */
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-	// Now setup the texture pipeline.
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	// Two output coordinates are used.
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-	Matrix4x4 curView;
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-
-	D3DXMATRIX inv;
-	float det;
-	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-	D3DXMATRIX scale;
-	D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
-	inv *=scale;
-	D3DXMATRIX offset;
-
-	Int delta = m_curTick;
-	m_curTick = ::GetTickCount();
-	delta = m_curTick-delta;
-	m_xOffset += m_xSlidePerSecond*delta/1000;
-	m_yOffset += m_ySlidePerSecond*delta/1000;
-
-	if (m_xOffset > 1) m_xOffset -= 1;
-	if (m_yOffset > 1) m_yOffset -= 1;
-	if (m_xOffset < -1) m_xOffset += 1;
-	if (m_yOffset < -1) m_yOffset += 1;
-
-
-	D3DXMatrixTranslation(&offset, m_xOffset, m_yOffset,0);
-
-	inv *= offset;
-
-	if (stage==0) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&inv));
-		
-		// Disable 3rd stage just in case.
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_DESTCOLOR);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
-	}	else if (stage==1) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, *((Matrix4x4*)&inv));
-	}
-}
-
-//=============================================================================
-// CloudMapTerrainTextureClass::restore
-//=============================================================================
-/** Cleans up any custom settings to the texturing pipeline that may not be 
-understood by w3d. */
-//=============================================================================
-void CloudMapTerrainTextureClass::restore(void)
-{
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 0 );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-
-
-	if (TheGlobalData && !TheGlobalData->m_multiPassTerrain)
-	{
-		///@todo: Remove 8-Stage Nvidia hack after drivers are fixed.
-		//This method is a backdoor specific to Nvidia based cards.  It will fail on
-		//other hardware.  Allows single pass blend of 2 textures and post modulate diffuse.
-		Int i;
-		for (i=0; i<8; i++) {
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_COLOROP, D3DTOP_DISABLE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_TEXCOORDINDEX, i);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_ALPHAOP,   D3DTOP_DISABLE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-
-			DX8Wrapper::Set_DX8_Texture(i, NULL);
-		}
-	}
-}
-
-/******************************************************************************
-						ScorchTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// ScorchTextureClass::ScorchTextureClass
-//=============================================================================
-/** Constructor. Calls parent constructor to load the .tga texture. */
-//=============================================================================
-/// @todo - get "EXScorch01.tga" from not hard coded location.
-ScorchTextureClass::ScorchTextureClass(MipCountType mipLevelCount) :
-	TextureClass("EXScorch01.tga","EXScorch01.tga", mipLevelCount )
-{ 
-}
-
-//=============================================================================
-// ScorchTextureClass::Apply
-//=============================================================================
-/** Sets the texture as the current D3D texture, and does some custom setup.
-The ScorchTextureClass is applied by iteself, as it's mesh is a subset of the 
-terrain mesh.
-(standard D3D setup, but beyond the scope of W3D). */
-//=============================================================================
-void ScorchTextureClass::Apply(unsigned int stage)
-{
-	// Do the base apply.
-	TextureClass::Apply(stage);
-	// Setup bilinear or trilinear filtering as specified in global data.
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);	
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-	// Now setup the texture pipeline.
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-}
-
-
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/TileData.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/TileData.cpp
deleted file mode 100644
index b019b1fff26..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/TileData.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// TileData.cpp
-// Class to handle tile data.
-// Author: John Ahlquist, April 2001
-
-#include "W3DDevice/GameClient/TileData.h"
-#include "W3DDevice/GameClient/WorldHeightMap.h"
-
-
-
-//
-// TileData - no destructor.
-//
-
-//
-// TileData - create a new texture tile .
-//
-TileData::TileData()
-{
-
-}
-
-#define TILE_PIXEL_EXTENT_MIP1 32
-#define TILE_PIXEL_EXTENT_MIP2 16
-#define TILE_PIXEL_EXTENT_MIP3 8
-#define TILE_PIXEL_EXTENT_MIP4 4
-#define TILE_PIXEL_EXTENT_MIP5 2
-#define TILE_PIXEL_EXTENT_MIP6 1
-
-Bool TileData::hasRGBDataForWidth(Int width) 
-{
-	if (width == TILE_PIXEL_EXTENT) return(true);
-	if (width == TILE_PIXEL_EXTENT_MIP1) return(true);
-	if (width == TILE_PIXEL_EXTENT_MIP2) return(true);
-	if (width == TILE_PIXEL_EXTENT_MIP3) return(true);
-	if (width == TILE_PIXEL_EXTENT_MIP4) return(true);
-	if (width == TILE_PIXEL_EXTENT_MIP5) return(true);
-	if (width == TILE_PIXEL_EXTENT_MIP6) return(true);
-	return(false);
-}
-
-UnsignedByte * TileData::getRGBDataForWidth(Int width) 
-{
-	// default
-	if (width == TILE_PIXEL_EXTENT_MIP1) return(m_tileDataMip32);
-	if (width == TILE_PIXEL_EXTENT_MIP2) return(m_tileDataMip16);
-	if (width == TILE_PIXEL_EXTENT_MIP3) return(m_tileDataMip8);
-	if (width == TILE_PIXEL_EXTENT_MIP4) return(m_tileDataMip4);
-	if (width == TILE_PIXEL_EXTENT_MIP5) return(m_tileDataMip2);
-	if (width == TILE_PIXEL_EXTENT_MIP6) return(m_tileDataMip1);
-	return(m_tileData);
-}
-
-void TileData::updateMips(void) 
-{
-	doMip(m_tileData, TILE_PIXEL_EXTENT, m_tileDataMip32); 
-	doMip(m_tileDataMip32, TILE_PIXEL_EXTENT_MIP1, m_tileDataMip16); 
-	doMip(m_tileDataMip16, TILE_PIXEL_EXTENT_MIP2, m_tileDataMip8); 
-	doMip(m_tileDataMip8, TILE_PIXEL_EXTENT_MIP3, m_tileDataMip4); 
-	doMip(m_tileDataMip4, TILE_PIXEL_EXTENT_MIP4, m_tileDataMip2); 
-	doMip(m_tileDataMip2, TILE_PIXEL_EXTENT_MIP5, m_tileDataMip1); 
-}
-
-
-void TileData::doMip(UnsignedByte *pHiRes, Int hiRow, UnsignedByte *pLoRes) 
-{
-	Int i, j;
-	for (i=0; i<hiRow; i+=2) {
-		for (j=0; j<hiRow; j+=2) {
-			Int pxl;
-			Int ndx = (j*hiRow+i)*TILE_BYTES_PER_PIXEL;
-			Int loNdx = (j/2)*(hiRow/2) + (i/2);
-			loNdx *= TILE_BYTES_PER_PIXEL;
-			Int p;
-			for (p=0; p<TILE_BYTES_PER_PIXEL; p++,ndx++,loNdx++) {
-				pxl = pHiRes[ndx] + pHiRes[ndx+TILE_BYTES_PER_PIXEL] + pHiRes[ndx+TILE_BYTES_PER_PIXEL*hiRow] + pHiRes[ndx+TILE_BYTES_PER_PIXEL*hiRow+TILE_BYTES_PER_PIXEL] +2;
-				pxl /= 4;
-				pLoRes[loNdx] = pxl;
-			}
-		}
-	}
-
-}
-
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp
index 4863745e139..a0143fd001a 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp
@@ -65,15 +65,9 @@
 #include "ffactory.h"
 #include "font3d.h"
 #include "render2dsentence.h"
-#include <stdio.h>
 #include "Common/PerfTimer.h"
 #include "Common/GlobalData.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //---------------------------------------------------------------------
 // Constants
@@ -123,26 +117,26 @@ class W3DPrototypeClass : public MemoryPoolObject, public PrototypeClass
 W3DPrototypeClass::W3DPrototypeClass(RenderObjClass * proto, const AsciiString& name) :
 	Proto(proto),
 	Name(name)
-{ 
-	assert(Proto); 
-	Proto->Add_Ref(); 
+{
+	assert(Proto);
+	Proto->Add_Ref();
 }
 
 //---------------------------------------------------------------------
-W3DPrototypeClass::~W3DPrototypeClass(void)						
-{ 
-	if (Proto) { 
-		Proto->Release_Ref(); 
+W3DPrototypeClass::~W3DPrototypeClass(void)
+{
+	if (Proto) {
+		Proto->Release_Ref();
 		Proto = NULL;
 	}
 }
 
 //---------------------------------------------------------------------
-RenderObjClass * W3DPrototypeClass::Create(void)					
-{ 
-	return (RenderObjClass *)( SET_REF_OWNER( Proto->Clone() ) ); 
+RenderObjClass * W3DPrototypeClass::Create(void)
+{
+	return (RenderObjClass *)( SET_REF_OWNER( Proto->Clone() ) );
 }
-	
+
 //---------------------------------------------------------------------
 // W3DAssetManager
 //---------------------------------------------------------------------
@@ -178,7 +172,7 @@ TextureClass *W3DAssetManager::Get_Texture(
 	/*
 	** Bail if the user isn't really asking for anything
 	*/
-	if (!filename || !*filename) 
+	if (!filename || !*filename)
 	{
 		#ifdef DUMP_PERF_STATS
 		GetPrecisionTimer(&endTime64);
@@ -194,7 +188,7 @@ TextureClass *W3DAssetManager::Get_Texture(
 	** See if the texture has already been loaded.
 	*/
 	TextureClass* tex = TextureHash.Get(lower_case_name);
-	if (tex && texture_format != WW3D_FORMAT_UNKNOWN) 
+	if (tex && texture_format != WW3D_FORMAT_UNKNOWN)
 	{
 		WWASSERT_PRINT(tex->Get_Texture_Format() == texture_format, ("Texture %s has already been loaded with different format",filename));
 	}
@@ -202,7 +196,7 @@ TextureClass *W3DAssetManager::Get_Texture(
 	/*
 	** Didn't have it so we have to create a new texture
 	*/
-	if (!tex) 
+	if (!tex)
 	{
 		tex = NEW_REF(TextureClass, (lower_case_name, NULL, mip_level_count, texture_format, allow_compression));
 		TextureHash.Insert(tex->Get_Texture_Name(),tex);
@@ -211,14 +205,14 @@ TextureClass *W3DAssetManager::Get_Texture(
 //			extern std::vector<std::string>	preloadTextureNamesGlobalHack;
 //			preloadTextureNamesGlobalHack.push_back(tex->Get_Texture_Name());
 //		}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		if (TheGlobalData->m_preloadReport)
-		{	
+		{
 			//loading a new asset and app is requesting a log of all loaded assets.
 			FILE *logfile=fopen("PreloadedAssets.txt","a+");	//append to log
 			if (logfile)
-			{	
-				fprintf(logfile,"TX: %s\n",tex->Get_Texture_Name());
+			{
+				fprintf(logfile,"TX: %s\n",tex->Get_Texture_Name().str());
 				fclose(logfile);
 			}
 		}
@@ -246,7 +240,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(const char* name)
 static inline void Munge_Render_Obj_Name(char *newname, const char *oldname, float scale, const int color, const char *textureName)
 {
 	char lower_case_name[255];
-	strcpy(lower_case_name, oldname);
+	strlcpy(lower_case_name, oldname, ARRAY_SIZE(lower_case_name));
 	_strlwr(lower_case_name);
 
 	if (!textureName)
@@ -259,7 +253,7 @@ static inline void Munge_Render_Obj_Name(char *newname, const char *oldname, flo
 static inline void Munge_Texture_Name(char *newname, const char *oldname, const int color)
 {
 	char lower_case_name[255];
-	strcpy(lower_case_name, oldname);
+	strlcpy(lower_case_name, oldname, ARRAY_SIZE(lower_case_name));
 	_strlwr(lower_case_name);
 	sprintf(newname,"#%d#%s", color, lower_case_name);
 }
@@ -267,7 +261,7 @@ static inline void Munge_Texture_Name(char *newname, const char *oldname, const
 //---------------------------------------------------------------------
 int W3DAssetManager::replaceAssetTexture(RenderObjClass *robj, TextureClass *oldTex, TextureClass *newTex)
 {
-	switch (robj->Class_ID())	{	
+	switch (robj->Class_ID())	{
 	case RenderObjClass::CLASSID_MESH:
 		return replaceMeshTexture(robj, oldTex, newTex);
 		break;
@@ -298,21 +292,21 @@ Int W3DAssetManager::replaceMeshTexture(RenderObjClass *robj, TextureClass *oldT
 	int i;
 	int didReplace=0;
 
-	MeshClass *mesh=(MeshClass*) robj;	
+	MeshClass *mesh=(MeshClass*) robj;
 	MeshModelClass * model = mesh->Get_Model();
 	MaterialInfoClass	*material = mesh->Get_Material_Info();
 
 	for (i=0; i<material->Texture_Count(); i++)
 	{
 		if (material->Peek_Texture(i) == oldTex)
-		{	
+		{
 			model->Replace_Texture(oldTex,newTex);
 			material->Replace_Texture(i,newTex);
 			didReplace=1;
 		}
 	}
 
-	REF_PTR_RELEASE(material);	
+	REF_PTR_RELEASE(material);
 	REF_PTR_RELEASE(model);
 	return didReplace;
 }
@@ -343,7 +337,7 @@ int W3DAssetManager::replacePrototypeTexture(RenderObjClass *robj, const char *
 */
 TextureClass * W3DAssetManager::Find_Texture(const char * name, const int color)
 {
-	char newname[512];	
+	char newname[512];
 	Munge_Texture_Name(newname, name, color);
 
 	// see if we have a cached copy
@@ -357,7 +351,7 @@ TextureClass * W3DAssetManager::Find_Texture(const char * name, const int color)
 //---------------------------------------------------------------------
 TextureClass * W3DAssetManager::Recolor_Texture(TextureClass *texture, const int color)
 {
-	const char *name=texture->Get_Texture_Name();	
+	const char *name=texture->Get_Texture_Name();
 
 	TextureClass *newtex = Find_Texture(name, color);
 	if (newtex) {
@@ -369,7 +363,7 @@ TextureClass * W3DAssetManager::Recolor_Texture(TextureClass *texture, const int
 
 //---------------------------------------------------------------------
 const Int TEAM_COLOR_PALETTE_SIZE = 16;
-const UnsignedShort houseColorScale[TEAM_COLOR_PALETTE_SIZE] = 
+const UnsignedShort houseColorScale[TEAM_COLOR_PALETTE_SIZE] =
 {
 	255,239,223,211,195,174,167,151,135,123,107,91,79,63,47,35
 };
@@ -382,7 +376,7 @@ static void remapPalette16Bit(SurfaceClass::SurfaceDescription *sd, UnsignedShor
 
 	//Generate a new color gradient palette based on reference color
 	for (Int y=0; y<TEAM_COLOR_PALETTE_SIZE; y++)
-	{	
+	{
 		rgb.X=(Real)houseColorScale[y]*v_color.X;
 		rgb.Y=(Real)houseColorScale[y]*v_color.Y;
 		rgb.Z=(Real)houseColorScale[y]*v_color.Z;
@@ -405,7 +399,7 @@ static void remapTexture16Bit(Int dx, Int dy, Int pitch, SurfaceClass::SurfaceDe
 	//Generate a new color gradient palette based on reference color
 	Int y=0;
 	for (; y<TEAM_COLOR_PALETTE_SIZE; y++)
-	{	
+	{
 		rgb.X=(Real)houseColorScale[y]*v_color.X;
 		rgb.Y=(Real)houseColorScale[y]*v_color.Y;
 		rgb.Z=(Real)houseColorScale[y]*v_color.Z;
@@ -450,7 +444,7 @@ static void remapAlphaTexture16Bit(Int dx, Int dy, Int pitch, SurfaceClass::Surf
 #endif
 
 	for (y=0; y<dy; y++)
-	{	
+	{
 		for (x=0; x<dx; x++)
 		{
 			pixel=data[x];
@@ -486,7 +480,7 @@ static void remapPalette32Bit(SurfaceClass::SurfaceDescription *sd, UnsignedInt
 
 	//Generate a new color gradient palette based on reference color
 	for (Int y=0; y<TEAM_COLOR_PALETTE_SIZE; y++)
-	{	
+	{
 		rgb.X=(Real)houseColorScale[y]*v_color.X;
 		rgb.Y=(Real)houseColorScale[y]*v_color.Y;
 		rgb.Z=(Real)houseColorScale[y]*v_color.Z;
@@ -509,7 +503,7 @@ static void remapTexture32Bit(Int dx, Int dy, Int pitch, SurfaceClass::SurfaceDe
 	//Generate a new color gradient palette based on reference color
 	Int y=0;
 	for (; y<TEAM_COLOR_PALETTE_SIZE; y++)
-	{	
+	{
 		rgb.X=(Real)houseColorScale[y]*v_color.X;
 		rgb.Y=(Real)houseColorScale[y]*v_color.Y;
 		rgb.Z=(Real)houseColorScale[y]*v_color.Z;
@@ -601,7 +595,7 @@ void W3DAssetManager::Remap_Palette(SurfaceClass *surface, const int color, Bool
 			remapPalette32Bit(&sd, (UnsignedInt *)bits,color);
 	}
 	else
-	{	
+	{
 		if (useAlpha)
 		{
 			if (size == 2)
@@ -626,18 +620,18 @@ void W3DAssetManager::Remap_Palette(SurfaceClass *surface, const int color, Bool
 //---------------------------------------------------------------------
 TextureClass * W3DAssetManager::Recolor_Texture_One_Time(TextureClass *texture, const int color)
 {
-	const char *name=texture->Get_Texture_Name();	
+	const char *name=texture->Get_Texture_Name();
 
 	// if texture is procedural return NULL
 	if (name && name[0]=='!') return NULL;
 
 	// make sure texture is loaded
-	if (!texture->Is_Initialized())	
-		TextureLoader::Request_High_Priority_Loading(texture, (MipCountType)texture->Get_Mip_Level_Count());
+	if (!texture->Is_Initialized())
+		TextureLoader::Request_Foreground_Loading(texture);
 
 	SurfaceClass::SurfaceDescription desc;
 	SurfaceClass *newsurf, *oldsurf;
-	texture->Get_Level_Description(desc);		
+	texture->Get_Level_Description(desc);
 
 	Int psize;
 	psize=PixelSize(desc);
@@ -661,7 +655,7 @@ TextureClass * W3DAssetManager::Recolor_Texture_One_Time(TextureClass *texture,
 	newtex->Get_Filter().Set_U_Addr_Mode(texture->Get_Filter().Get_U_Addr_Mode());
 	newtex->Get_Filter().Set_V_Addr_Mode(texture->Get_Filter().Get_V_Addr_Mode());
 
-	char newname[512];	
+	char newname[512];
 	Munge_Texture_Name(newname, name, color);
 	newtex->Set_Texture_Name(newname);
 
@@ -683,9 +677,9 @@ __int64 Total_Create_Render_Obj_Time=0;
 */
 RenderObjClass * W3DAssetManager::Create_Render_Obj(
 	const char * name,
-	float scale, 
+	float scale,
 	const int color,
-	const char *oldTexture, 
+	const char *oldTexture,
 	const char *newTexture
 )
 {
@@ -699,7 +693,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 	Bool reallytexture = (oldTexture != NULL && newTexture != NULL);
 
 	// base case, no scale or color
-	if (!reallyscale && !reallycolor && !reallytexture) 
+	if (!reallyscale && !reallycolor && !reallytexture)
 	{
 		RenderObjClass *robj=WW3DAssetManager::Create_Render_Obj(name);
 	#ifdef DUMP_PERF_STATS
@@ -740,12 +734,12 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 	PrototypeClass * proto = Find_Prototype(name);
 
 	Set_WW3D_Load_On_Demand(true); // Auto Load.
-	if (WW3D_Load_On_Demand && proto == NULL) 
-	{	
+	if (WW3D_Load_On_Demand && proto == NULL)
+	{
 		// If we didn't find one, try to load on demand
 		char filename [MAX_PATH];
 		const char *mesh_name = strchr (name, '.');
-		if (mesh_name != NULL) 
+		if (mesh_name != NULL)
 		{
 			lstrcpyn(filename, name, ((int)mesh_name) - ((int)name) + 1);
 			lstrcat(filename, ".w3d");
@@ -754,7 +748,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 		}
 
 		// If we can't find it, try the parent directory
-		if ( Load_3D_Assets( filename ) == false ) 
+		if ( Load_3D_Assets( filename ) == false )
 		{
 			StringClass	new_filename = StringClass("..\\") + filename;
 			Load_3D_Assets( new_filename );
@@ -763,12 +757,12 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 		proto = Find_Prototype(name);		// try again
 	}
 
-	if (proto == NULL) 
+	if (proto == NULL)
 	{
 		static int warning_count = 0;
-		if (++warning_count <= 20) 
+		if (++warning_count <= 20)
 		{
-			WWDEBUG_SAY(("WARNING: Failed to create Render Object: %s\r\n",name));
+			WWDEBUG_SAY(("WARNING: Failed to create Render Object: %s",name));
 		}
 	#ifdef DUMP_PERF_STATS
 		GetPrecisionTimer(&endTime64);
@@ -779,7 +773,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 
 	rendobj = proto->Create();
 
-	if (!rendobj) 
+	if (!rendobj)
 	{
 	#ifdef DUMP_PERF_STATS
 		GetPrecisionTimer(&endTime64);
@@ -790,7 +784,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 
 	Make_Unique(rendobj,reallyscale,reallycolor);
 	if (reallytexture)
-	{	
+	{
 		TextureClass *oldTex = Get_Texture(oldTexture);
 		TextureClass *newTex = Get_Texture(newTexture);
 		replaceAssetTexture(rendobj,oldTex,newTex);
@@ -803,7 +797,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 	if (reallycolor)
 		Recolor_Asset(rendobj,color);
 
-	W3DPrototypeClass *w3dproto = newInstance(W3DPrototypeClass)(rendobj, newname);	
+	W3DPrototypeClass *w3dproto = newInstance(W3DPrototypeClass)(rendobj, newname);
 	rendobj->Release_Ref();
 	Add_Prototype(w3dproto);
 
@@ -826,7 +820,7 @@ int W3DAssetManager::Recolor_Asset(RenderObjClass *robj, const int color)
 	if (TheGlobalData->m_headless)
 		return 0;
 
-	switch (robj->Class_ID())	{	
+	switch (robj->Class_ID())	{
 	case RenderObjClass::CLASSID_MESH:
 		return Recolor_Mesh(robj,color);
 		break;
@@ -849,7 +843,7 @@ int W3DAssetManager::Recolor_Mesh(RenderObjClass *robj, const int color)
 	int didRecolor=0;
 	const char *meshName;
 
-	MeshClass *mesh=(MeshClass*) robj;	
+	MeshClass *mesh=(MeshClass*) robj;
 	MeshModelClass * model = mesh->Get_Model();
 	MaterialInfoClass	*material = mesh->Get_Material_Info();
 
@@ -879,7 +873,7 @@ int W3DAssetManager::Recolor_Mesh(RenderObjClass *robj, const int color)
 		}
 	}
 
-	REF_PTR_RELEASE(material);	
+	REF_PTR_RELEASE(material);
 	REF_PTR_RELEASE(model);
 	return didRecolor;
 }
@@ -949,7 +943,7 @@ bool W3DAssetManager::Load_3D_Assets( const char * filename )
 
 	// Try to find an existing prototype
 	char basename[512];
-	strcpy(basename, filename);
+	strlcpy(basename, filename, ARRAY_SIZE(basename));
 	char *pext = strrchr(basename, '.');	//find file extension
 	if (pext)
 		*pext = '\0';	//drop the extension
@@ -968,13 +962,13 @@ bool W3DAssetManager::Load_3D_Assets( const char * filename )
 
 	bool result = WW3DAssetManager::Load_3D_Assets(filename);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (result && TheGlobalData->m_preloadReport)
-	{	
+	{
 		//loading a new asset and app is requesting a log of all loaded assets.
 		FILE *logfile=fopen("PreloadedAssets.txt","a+");	//append to log
 		if (logfile)
-		{	
+		{
 			StringClass lower_case_name(filename,true);
 			_strlwr(lower_case_name.Peek_Buffer());
 			fprintf(logfile,"3D: %s\n",lower_case_name.str());
@@ -1043,7 +1037,7 @@ void W3DAssetManager::Make_HLOD_Unique(RenderObjClass *robj, Bool geometry, Bool
 */
 void W3DAssetManager::Make_Unique(RenderObjClass *robj, Bool geometry, Bool colors)
 {
-	switch (robj->Class_ID())	{	
+	switch (robj->Class_ID())	{
 	case RenderObjClass::CLASSID_MESH:
 		Make_Mesh_Unique(robj,geometry,colors);
 		break;
@@ -1099,21 +1093,21 @@ void W3DAssetManager::Make_Mesh_Unique(RenderObjClass *robj, Bool geometry, Bool
 
 		//Create unique data for this mesh
 		mesh->Make_Unique();
-		
+
 		MeshModelClass * model = mesh->Get_Model();
 
 		if (colors && isVertexColor)
 		{
 			MaterialInfoClass	*material=mesh->Get_Material_Info();
 			for (i=0; i<material->Vertex_Material_Count(); i++)
-				material->Peek_Vertex_Material(i)->Make_Unique();	
+				material->Peek_Vertex_Material(i)->Make_Unique();
 			REF_PTR_RELEASE(material);
 		}
 
 		if (geometry)
 		{
-			// make geometry unique		
-			model->Make_Geometry_Unique();		
+			// make geometry unique
+			model->Make_Geometry_Unique();
 		}
 
 		REF_PTR_RELEASE(model);
@@ -1131,7 +1125,7 @@ void W3DAssetManager::Report_Used_Prototypes(void)
 		PrototypeClass * proto = Prototypes[count];
 		if (proto->Get_Class_ID() == RenderObjClass::CLASSID_HLOD || proto->Get_Class_ID() == RenderObjClass::CLASSID_MESH)
 		{
-			DEBUG_LOG(("**Unfreed Prototype On Map Reset: %s\n",proto->Get_Name()));
+			DEBUG_LOG(("**Unfreed Prototype On Map Reset: %s",proto->Get_Name()));
 		}
 	}
 }
@@ -1161,7 +1155,7 @@ void W3DAssetManager::Report_Used_FontChars(void)
 	{
 		if (FontCharsList[count]->Num_Refs() >= 1)
 		{
-			DEBUG_LOG(("**Unfreed FontChar On Map Reset: %s\n",FontCharsList[count]->Get_Name()));
+			DEBUG_LOG(("**Unfreed FontChar On Map Reset: %s",FontCharsList[count]->Get_Name()));
 			//FontCharsList[count]->Release_Ref();
 			//FontCharsList.Delete(count);
 		}
@@ -1197,7 +1191,7 @@ void W3DAssetManager::Report_Used_Textures(void)
 		}
 		else
 		{
-			DEBUG_LOG(("**Texture \"%s\" referenced %d times on map reset\n",tex->Get_Texture_Name(),tex->Num_Refs()-1));
+			DEBUG_LOG(("**Texture \"%s\" referenced %d times on map reset",tex->Get_Texture_Name().str(),tex->Num_Refs()-1));
 		}
 	}
 /*	for (unsigned i=0;i<count;++i) {
@@ -1224,7 +1218,7 @@ void W3DAssetManager::Report_Used_Font3DDatas( void )
 		}
 		else
 		{
-			DEBUG_LOG(("**Unfreed Font3DDatas On Map Reset: %s\n",font->Name));
+			DEBUG_LOG(("**Unfreed Font3DDatas On Map Reset: %s",font->Name));
 		}
 	}
 }
@@ -1249,7 +1243,7 @@ void W3DAssetManager::Make_Mesh_Unique(RenderObjClass *robj, Bool geometry, Bool
 		// make all vertex materials unique
 		MaterialInfoClass	*material = mesh->Get_Material_Info();
 		for (i=0; i<material->Vertex_Material_Count(); i++)
-			material->Peek_Vertex_Material(i)->Make_Unique();	
+			material->Peek_Vertex_Material(i)->Make_Unique();
 		REF_PTR_RELEASE(material);
 		// make all color arrays unique
 		model->Make_Color_Array_Unique(0);
@@ -1259,10 +1253,10 @@ void W3DAssetManager::Make_Mesh_Unique(RenderObjClass *robj, Bool geometry, Bool
 		// for the top mip level and then
 		// mip filter instead of converting all mip levels
 	}
-		
+
 	if (geometry)	{
-		// make geometry unique		
-		model->Make_Geometry_Unique();		
+		// make geometry unique
+		model->Make_Geometry_Unique();
 	}
 
 	REF_PTR_RELEASE(model);
@@ -1280,7 +1274,7 @@ void W3DAssetManager::Make_HLOD_Unique(RenderObjClass *robj, Bool geometry, Bool
 
 void W3DAssetManager::Make_Unique(RenderObjClass *robj, Bool geometry, Bool colors)
 {
-	switch (robj->Class_ID())	{	
+	switch (robj->Class_ID())	{
 	case RenderObjClass::CLASSID_MESH:
 		Make_Mesh_Unique(robj,geometry,colors);
 		break;
@@ -1293,7 +1287,7 @@ void W3DAssetManager::Make_Unique(RenderObjClass *robj, Bool geometry, Bool colo
 static inline void Munge_Render_Obj_Name(char *newname, const char *oldname, float scale, const Vector3 &hsv_shift)
 {
 	char lower_case_name[255];
-	strcpy(lower_case_name, oldname);
+	strlcpy(lower_case_name, oldname, ARRAY_SIZE(lower_case_name));
 	_strlwr(lower_case_name);
 	sprintf(newname,"#%s!%gH%gS%gV%g", lower_case_name, scale, hsv_shift.X, hsv_shift.Y, hsv_shift.Z);
 }
@@ -1301,7 +1295,7 @@ static inline void Munge_Render_Obj_Name(char *newname, const char *oldname, flo
 static inline void Munge_Texture_Name(char *newname, const char *oldname, const Vector3 &hsv_shift)
 {
 	char lower_case_name[255];
-	strcpy(lower_case_name, oldname);
+	strlcpy(lower_case_name, oldname, ARRAY_SIZE(lower_case_name));
 	_strlwr(lower_case_name);
 	sprintf(newname,"#%s!H%gS%gV%g", lower_case_name, hsv_shift.X, hsv_shift.Y, hsv_shift.Z);
 }
@@ -1324,7 +1318,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(const char * name,float scal
 
 	if (isGranny)
 	{	//Granny objects share the same prototype since they allow instance scaling.
-		strcpy(newname,name);	//use same name for all granny objects at any scale.
+		strlcpy(newname, name, ARRAY_SIZE(newname));	//use same name for all granny objects at any scale.
 	}
 	Set_WW3D_Load_On_Demand(false); // munged name will never be found in a file.
 	rendobj=WW3DAssetManager::Create_Render_Obj(newname);
@@ -1377,7 +1371,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(const char * name,float scal
 	if (proto == NULL) {
 		static int warning_count = 0;
 		if (++warning_count <= 20) {
-			WWDEBUG_SAY(("WARNING: Failed to create Render Object: %s\r\n",name));
+			WWDEBUG_SAY(("WARNING: Failed to create Render Object: %s",name));
 		}
 		return NULL;		// Failed to find a prototype
 	}
@@ -1385,7 +1379,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(const char * name,float scal
 	rendobj=proto->Create();
 
 	if (!rendobj) return NULL;
-	
+
 	if (!isGranny)
 	{	Make_Unique(rendobj,reallyscale,reallyhsv_shift);
 		if (reallyscale) rendobj->Scale(scale);
@@ -1427,10 +1421,10 @@ TextureClass * W3DAssetManager::Get_Texture_With_HSV_Shift(const char * filename
 		TextureClass *newtex = Find_Texture(filename, hsv_shift);
 
 		if (!newtex) {
-		
+
 			// No cached texture - need to create
 			char lower_case_name[255];
-			strcpy(lower_case_name, filename);
+			strlcpy(lower_case_name, filename, ARRAY_SIZE(lower_case_name));
 			_strlwr(lower_case_name);
 			TextureClass *oldtex = TextureHash.Get(lower_case_name);
 			if (!oldtex) {
@@ -1476,8 +1470,8 @@ void W3DAssetManager::Recolor_Vertex_Material(VertexMaterialClass *vmat, const V
 
 void W3DAssetManager::Recolor_Vertices(unsigned int *color, int count, const Vector3 &hsv_shift)
 {
-	int i;	
-	Vector4 rgba;	
+	int i;
+	Vector4 rgba;
 
 	for (i=0; i<count; i++)
 	{
@@ -1489,7 +1483,7 @@ void W3DAssetManager::Recolor_Vertices(unsigned int *color, int count, const Vec
 
 TextureClass * W3DAssetManager::Recolor_Texture(TextureClass *texture, const Vector3 &hsv_shift)
 {
-	const char *name=texture->Get_Texture_Name();	
+	const char *name=texture->Get_Texture_Name();
 
 	TextureClass *newtex = Find_Texture(name, hsv_shift);
 	if (newtex) {
@@ -1501,21 +1495,21 @@ TextureClass * W3DAssetManager::Recolor_Texture(TextureClass *texture, const Vec
 
 TextureClass * W3DAssetManager::Recolor_Texture_One_Time(TextureClass *texture, const Vector3 &hsv_shift)
 {
-	const char *name=texture->Get_Texture_Name();	
+	const char *name=texture->Get_Texture_Name();
 
 	// if texture is procedural return NULL
 	if (name && name[0]=='!') return NULL;
 
 	// make sure texture is loaded
-	if (!texture->Is_Initialized())	
+	if (!texture->Is_Initialized())
 		TextureLoader::Request_High_Priority_Loading(texture, (MipCountType)texture->Get_Mip_Level_Count());
 
 	SurfaceClass::SurfaceDescription desc;
 	SurfaceClass *newsurf, *oldsurf, *smallsurf;
-	texture->Get_Level_Description(desc);		
+	texture->Get_Level_Description(desc);
 
 	// if texture is monochrome and no value shifting
-	// return NULL	
+	// return NULL
 	smallsurf=texture->Get_Surface_Level((MipCountType)texture->Get_Mip_Level_Count()-1);
 	if (hsv_shift.Z==0.0f && smallsurf->Is_Monochrome())
 	{
@@ -1536,7 +1530,7 @@ TextureClass * W3DAssetManager::Recolor_Texture_One_Time(TextureClass *texture,
 	newtex->Set_U_Addr_Mode(texture->Get_U_Addr_Mode());
 	newtex->Set_V_Addr_Mode(texture->Get_V_Addr_Mode());
 
-	char newname[512];	
+	char newname[512];
 	Munge_Texture_Name(newname, name, hsv_shift);
 	newtex->Set_Texture_Name(newname);
 
@@ -1551,7 +1545,7 @@ TextureClass * W3DAssetManager::Recolor_Texture_One_Time(TextureClass *texture,
 
 TextureClass * W3DAssetManager::Find_Texture(const char * name, const Vector3 &hsv_shift)
 {
-	char newname[512];	
+	char newname[512];
 	Munge_Texture_Name(newname, name, hsv_shift);
 
 	// see if we have a cached copy
@@ -1566,13 +1560,13 @@ void W3DAssetManager::Recolor_Mesh(RenderObjClass *robj, const Vector3 &hsv_shif
 {
 	int i;
 
-	MeshClass *mesh=(MeshClass*) robj;	
+	MeshClass *mesh=(MeshClass*) robj;
 	MeshModelClass * model = mesh->Get_Model();
 	MaterialInfoClass	*material = mesh->Get_Material_Info();
 
 	// recolor vertex material
 	for (i=0; i<material->Vertex_Material_Count(); i++)
-			Recolor_Vertex_Material(material->Peek_Vertex_Material(i),hsv_shift);	
+			Recolor_Vertex_Material(material->Peek_Vertex_Material(i),hsv_shift);
 
 	// recolor color arrays
 	unsigned int * color;
@@ -1596,7 +1590,7 @@ void W3DAssetManager::Recolor_Mesh(RenderObjClass *robj, const Vector3 &hsv_shif
 		}
 	}
 
-	REF_PTR_RELEASE(material);	
+	REF_PTR_RELEASE(material);
 	REF_PTR_RELEASE(model);
 }
 
@@ -1639,7 +1633,7 @@ void W3DAssetManager::Recolor_ParticleEmitter(RenderObjClass *robj, const Vector
 
 void W3DAssetManager::Recolor_Asset(RenderObjClass *robj, const Vector3 &hsv_shift)
 {
-	switch (robj->Class_ID())	{	
+	switch (robj->Class_ID())	{
 	case RenderObjClass::CLASSID_MESH:
 		Recolor_Mesh(robj,hsv_shift);
 		break;
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp
index 92c6a6bb662..eca9c59f7d6 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DBibBuffer.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,12 +43,10 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/W3DBibBuffer.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include "Common/GlobalData.h"
@@ -63,7 +61,7 @@
 #include "WW3D2/meshmdl.h"
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 // A W3D shader that does alpha, texturing, tests zbuffer, doesn't update zbuffer.
 #define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_ALWAYS, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
@@ -75,7 +73,7 @@ static ShaderClass detailAlphaShader(SC_ALPHA_DETAIL);
 
 
 //-----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //-----------------------------------------------------------------------------
 
 
@@ -99,7 +97,7 @@ void W3DBibBuffer::loadBibsInVertexAndIndexBuffers(void)
 	m_curNumNormalBibVertex = 0;
 
 	if (m_numBibs==0) {
-		return;	
+		return;
 	}
 
 	VertexFormatXYZDUV1 *vb;
@@ -133,9 +131,9 @@ void W3DBibBuffer::loadBibsInVertexAndIndexBuffers(void)
 
 	Int diffuse = (REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16) | (255 << 24));
 	Int doHighlight;
-	for (doHighlight=0; doHighlight<=1; doHighlight++) 
+	for (doHighlight=0; doHighlight<=1; doHighlight++)
 	{
-		if (doHighlight==1) 
+		if (doHighlight==1)
 		{
 			m_curNumNormalBibIndices = m_curNumBibIndices;
 			m_curNumNormalBibVertex = m_curNumBibVertices;
@@ -156,8 +154,8 @@ void W3DBibBuffer::loadBibsInVertexAndIndexBuffers(void)
 
 			for (i=0; i<numVertex; i++) {
 
-				// Update the uv values.  The W3D models each have their own texture, and 
-				// we use one texture with all images in one, so we have to change the uvs to 
+				// Update the uv values.  The W3D models each have their own texture, and
+				// we use one texture with all images in one, so we have to change the uvs to
 				// match.
 				Real U, V;
 				Vector3 vLoc=m_bibs[curBib].m_corners[i];
@@ -180,7 +178,7 @@ void W3DBibBuffer::loadBibsInVertexAndIndexBuffers(void)
 				curVb->v1 = V;
 				curVb->x = vLoc.X;
 				curVb->y = vLoc.Y;
-				curVb->z = vLoc.Z;	 
+				curVb->z = vLoc.Z;
 				curVb->diffuse = diffuse;
 				curVb++;
 				m_curNumBibVertices++;
@@ -193,12 +191,12 @@ void W3DBibBuffer::loadBibsInVertexAndIndexBuffers(void)
 			*curIb++ = startVertex + 2;
 			*curIb++ = startVertex + 3;
 			m_curNumBibIndices+=6;
-		}		
+		}
 	}
 }
 
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -320,7 +318,7 @@ void W3DBibBuffer::addBib(Vector3 corners[4], ObjectID id, Bool highlight)
 	}
 	if (bibIndex==m_numBibs) {
 		if (m_numBibs >= MAX_BIBS) {
-			return;  
+			return;
 		}
 		m_numBibs++;
 	}
@@ -358,7 +356,7 @@ void W3DBibBuffer::addBibDrawable(Vector3 corners[4], DrawableID id, Bool highli
 	}
 	if (bibIndex==m_numBibs) {
 		if (m_numBibs >= MAX_BIBS) {
-			return;  
+			return;
 		}
 		m_numBibs++;
 	}
@@ -434,7 +432,7 @@ void W3DBibBuffer::renderBibs()
 	}
 	if (m_curNumBibIndices>m_curNumNormalBibIndices) {
 		DX8Wrapper::Set_Texture(0,m_highlightBibTexture);
-		DX8Wrapper::Draw_Triangles(	m_curNumNormalBibIndices, (m_curNumBibIndices-m_curNumNormalBibIndices)/3, 
+		DX8Wrapper::Draw_Triangles(	m_curNumNormalBibIndices, (m_curNumBibIndices-m_curNumNormalBibIndices)/3,
 						m_curNumNormalBibVertex,	m_curNumBibVertices-m_curNumNormalBibVertex);
 	}
 }
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
index 6697b8c3b34..282706871ef 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DBridgeBuffer.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,12 +43,10 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/W3DBridgeBuffer.h"
 
-#include <stdio.h>
-#include <string.h>
 #include "W3DDevice/GameClient/W3DAssetManager.h"
 #include <texture.h>
 #include "Common/GlobalData.h"
@@ -72,14 +70,9 @@
 #include "WW3D2/meshmdl.h"
 #include "WW3D2/scene.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 // A W3D shader that does alpha, texturing, tests zbuffer, doesn't update zbuffer.
 #define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
@@ -100,7 +93,7 @@ static ShaderClass detailShader(SC_ALPHA_MIRROR);
 #define NO_USE_BRIDGE_NORMALS
 
 //-----------------------------------------------------------------------------
-//         Private Classes                                               
+//         Private Classes
 //-----------------------------------------------------------------------------
 //=============================================================================
 // W3DBridge constructor.
@@ -164,7 +157,7 @@ void W3DBridge::clearBridge(void)
 //=============================================================================
 Bool W3DBridge::cullBridge(CameraClass * camera)
 {
-	///@todo - cull bridges. 
+	///@todo - cull bridges.
 	Bool wasVisible = m_visible;
 
 	m_visible = true;
@@ -191,10 +184,10 @@ void W3DBridge::init(Vector3 fromLoc, Vector3 toLoc, AsciiString bridgeTemplateN
 //=============================================================================
 // W3DBridge::init
 //=============================================================================
-/** Loads a bridge model(if not already loaded) and gets meshes for use at 
+/** Loads a bridge model(if not already loaded) and gets meshes for use at
 specified location.  */
 //=============================================================================
-Bool W3DBridge::load(enum BodyDamageType curDamageState)
+Bool W3DBridge::load(BodyDamageType curDamageState)
 {
 	REF_PTR_RELEASE(m_bridgeTexture);
 	REF_PTR_RELEASE(m_leftMesh);
@@ -219,20 +212,20 @@ Bool W3DBridge::load(enum BodyDamageType curDamageState)
 		default: return false;
 
 		case 	BODY_PRISTINE:
-			strcpy( textureFile, bridge->getTexture().str() );
-			strcpy( modelName, bridge->getBridgeModel().str() );
+			strlcpy(textureFile, bridge->getTexture().str(), ARRAY_SIZE(textureFile));
+			strlcpy(modelName, bridge->getBridgeModel().str(), ARRAY_SIZE(modelName));
 			break;
 		case BODY_DAMAGED:
-			strcpy( textureFile, bridge->getTextureDamaged().str() );
-			strcpy( modelName, bridge->getBridgeModelNameDamaged().str() );
+			strlcpy(textureFile, bridge->getTextureDamaged().str(), ARRAY_SIZE(textureFile));
+			strlcpy(modelName, bridge->getBridgeModelNameDamaged().str(), ARRAY_SIZE(modelName));
 			break;
 		case BODY_REALLYDAMAGED:
-			strcpy( textureFile, bridge->getTextureReallyDamaged().str() );
-			strcpy( modelName, bridge->getBridgeModelNameReallyDamaged().str() );
+			strlcpy(textureFile, bridge->getTextureReallyDamaged().str(), ARRAY_SIZE(textureFile));
+			strlcpy(modelName, bridge->getBridgeModelNameReallyDamaged().str(), ARRAY_SIZE(modelName));
 			break;
 		case BODY_RUBBLE:
-			strcpy( textureFile, bridge->getTextureBroken().str() );
-			strcpy( modelName, bridge->getBridgeModelNameBroken().str() );
+			strlcpy(textureFile, bridge->getTextureBroken().str(), ARRAY_SIZE(textureFile));
+			strlcpy(modelName, bridge->getBridgeModelNameBroken().str(), ARRAY_SIZE(modelName));
 			break;
 	}
 
@@ -241,14 +234,17 @@ Bool W3DBridge::load(enum BodyDamageType curDamageState)
 	char section[_MAX_PATH];
 	char right[_MAX_PATH];
 
+	static_assert(ARRAY_SIZE(left) >= ARRAY_SIZE(section), "Incorrect array size");
+	static_assert(ARRAY_SIZE(section) >= ARRAY_SIZE(modelName), "Incorrect array size");
+	static_assert(ARRAY_SIZE(right) >= ARRAY_SIZE(modelName), "Incorrect array size");
 	strcpy(left, modelName);
-	strcat(left, ".BRIDGE_LEFT");
+	strlcat(left, ".BRIDGE_LEFT", ARRAY_SIZE(left));
 	strcpy(section, modelName);
-	strcat(section, ".BRIDGE_SPAN");
+	strlcat(section, ".BRIDGE_SPAN", ARRAY_SIZE(section));
 	strcpy(right, modelName);
-	strcat(right, ".BRIDGE_RIGHT");
+	strlcat(right, ".BRIDGE_RIGHT", ARRAY_SIZE(right));
 
-	m_bridgeTexture = pMgr->Get_Texture(textureFile,  MIP_LEVELS_3); 
+	m_bridgeTexture = pMgr->Get_Texture(textureFile,  MIP_LEVELS_3);
 	m_leftMtx.Make_Identity();
 	m_rightMtx.Make_Identity();
 	m_sectionMtx.Make_Identity();
@@ -261,18 +257,18 @@ Bool W3DBridge::load(enum BodyDamageType curDamageState)
 		Matrix3D mtx = pSub->Get_Transform();
 		if (0==strnicmp(left, pSub->Get_Name(), strlen(left))) {
 			m_leftMtx = mtx;
-			strcpy(left, pSub->Get_Name());
+			strlcpy(left, pSub->Get_Name(), ARRAY_SIZE(left));
 		}
 		if (0==strnicmp(section, pSub->Get_Name(), strlen(section))) {
 			m_sectionMtx = mtx;
-			strcpy(section, pSub->Get_Name());
+			strlcpy(section, pSub->Get_Name(), ARRAY_SIZE(section));
 		}
 		if (0==strnicmp(right, pSub->Get_Name(), strlen(right))) {
 			m_rightMtx = mtx;
-			strcpy(right, pSub->Get_Name());
+			strlcpy(right, pSub->Get_Name(), ARRAY_SIZE(right));
 		}
 		REF_PTR_RELEASE(pSub);
-		//DEBUG_LOG(("Sub obj name %s\n", pSub->Get_Name()));
+		//DEBUG_LOG(("Sub obj name %s", pSub->Get_Name()));
 	}
 
 	REF_PTR_RELEASE(pObj);
@@ -405,11 +401,11 @@ void W3DBridge::getBridgeInfo(BridgeInfo *pInfo)
 /** Gets the vertex values for a section of a bridge.  */
 //=============================================================================
 Int W3DBridge::getModelVertices(VertexFormatXYZNDUV1 *destination_vb, Int curVertex, Real xOffset,
-																Vector3 &vec, Vector3 &vecNormal, Vector3 &vecZ, Vector3 &offset, 
-																const Matrix3D &mtx, 
+																Vector3 &vec, Vector3 &vecNormal, Vector3 &vecZ, Vector3 &offset,
+																const Matrix3D &mtx,
 																MeshClass *pMesh, RefRenderObjListIterator *pLightsIterator)
 {
-	if (pMesh == NULL) 
+	if (pMesh == NULL)
 		return(0);
 
 	Int i;
@@ -447,12 +443,12 @@ Int W3DBridge::getModelVertices(VertexFormatXYZNDUV1 *destination_vb, Int curVer
 
 		vLoc.X += m_start.X;
 		vLoc.Y += m_start.Y;
-		vLoc.Z += m_start.Z; 
+		vLoc.Z += m_start.Z;
 
 		curVb->x = vLoc.X;
 		curVb->y = vLoc.Y;
 		curVb->z = vLoc.Z;
-		
+
 		VERTEX_FORMAT vb;
 		vb.x = vLoc.X;
 		vb.y = vLoc.Y;
@@ -467,7 +463,7 @@ Int W3DBridge::getModelVertices(VertexFormatXYZNDUV1 *destination_vb, Int curVer
 		curVb->nz = normal.Z;
 #else
 		normal = (normal.X) * vec + normal.Y*vecNormal + normal.Z*vecZ;
-		normal.Normalize();	
+		normal.Normalize();
 		TheTerrainRenderObject->doTheLight(&vb, lightRay, &normal, NULL, 1.0f);
 		curVb->diffuse = vb.diffuse | 0xFF000000;
 #endif
@@ -481,10 +477,10 @@ Int W3DBridge::getModelVertices(VertexFormatXYZNDUV1 *destination_vb, Int curVer
 //=============================================================================
 /** Gets the vertex values for a section of a fixed bridge.  */
 //=============================================================================
-Int W3DBridge::getModelVerticesFixed(VertexFormatXYZNDUV1 *destination_vb, Int curVertex, 
+Int W3DBridge::getModelVerticesFixed(VertexFormatXYZNDUV1 *destination_vb, Int curVertex,
 																const Matrix3D &mtx, MeshClass *pMesh, RefRenderObjListIterator *pLightsIterator)
 {
-	if (pMesh == NULL) 
+	if (pMesh == NULL)
 		return(0);
 
 	Vector3 vec = m_end - m_start;
@@ -509,7 +505,7 @@ Int W3DBridge::getModelVerticesFixed(VertexFormatXYZNDUV1 *destination_vb, Int c
 //=============================================================================
 /** Gets the index values and vertex values for a bridge.  */
 //=============================================================================
-void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatXYZNDUV1 *destination_vb, 
+void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatXYZNDUV1 *destination_vb,
 																		Int *curIndexP, Int *curVertexP, RefRenderObjListIterator *pLightsIterator)
 {
 	Int numI;
@@ -522,13 +518,13 @@ void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatX
 		numV = getModelVerticesFixed(destination_vb, *curVertexP, m_leftMtx, m_leftMesh, pLightsIterator);
 		if (!numV)
 		{	//not enough room for vertices
-			DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.\n") );
+			DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.") );
 			return;
 		}
 		numI = getModelIndices( destination_ib, *curIndexP, *curVertexP, m_leftMesh);
 		if (!numI)
 		{	//not enough room for indices
-			DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.\n") );
+			DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.") );
 			return;
 		}
 		*curIndexP += numI;
@@ -555,7 +551,7 @@ void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatX
 	Vector3 vecZ(-deltaZ, 0, deltaX);
 	vecZ *= m_scale;
 
-	Real spanLength = m_rightMinX - m_leftMaxX; 
+	Real spanLength = m_rightMinX - m_leftMaxX;
 	Int numSpans = 1;
 	if (m_bridgeType != FIXED_BRIDGE) {
 		Real spannable = desiredLength - (m_length-spanLength);
@@ -565,20 +561,20 @@ void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatX
 
 	Real bridgeLength = m_length + (numSpans-1)*spanLength;
 	Real xOffset = -m_leftMinX;
-	
+
 	// Draw the left end.
 	vec /= bridgeLength;
-	numV = getModelVertices(destination_vb, *curVertexP, xOffset, vec, vecNormal, vecZ, m_start, 
+	numV = getModelVertices(destination_vb, *curVertexP, xOffset, vec, vecNormal, vecZ, m_start,
 		m_leftMtx, m_leftMesh, pLightsIterator);
 	if (!numV)
 	{	//not enough room for vertices
-		DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.\n") );
+		DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.") );
 		return;
 	}
 	numI = getModelIndices( destination_ib, *curIndexP, *curVertexP, m_leftMesh);
 	if (!numI)
 	{	//not enough room for indices
-		DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.\n") );
+		DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.") );
 		return;
 	}
 	*curIndexP += numI;
@@ -589,17 +585,17 @@ void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatX
 	Int i;
 	// draw the spans.
 	for (i=0; i<numSpans; i++) {
-		numV = getModelVertices(destination_vb, *curVertexP, xOffset+i*spanLength, vec, vecNormal, vecZ, m_start, 
+		numV = getModelVertices(destination_vb, *curVertexP, xOffset+i*spanLength, vec, vecNormal, vecZ, m_start,
 			m_sectionMtx, m_sectionMesh, pLightsIterator);
 		if (!numV)
 		{	//not enough room for vertices
-			DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.\n") );
+			DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.") );
 			return;
 		}
 		numI = getModelIndices( destination_ib, *curIndexP, *curVertexP, m_sectionMesh);
 		if (!numI)
 		{	//not enough room for indices
-			DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.\n") );
+			DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.") );
 			return;
 		}
 		*curIndexP += numI;
@@ -607,19 +603,19 @@ void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatX
 		m_numVertex += numV;
 		m_numPolygons += numI/3;
 	}
-		
+
 	// Draw the right end.
 	numV = getModelVertices(destination_vb, *curVertexP, xOffset+(numSpans-1)*spanLength, vec, vecNormal, vecZ, m_start,
 		m_rightMtx, m_rightMesh, pLightsIterator);
 	if (!numV)
 	{	//not enough room for vertices
-		DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.\n") );
+		DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.") );
 		return;
 	}
 	numI = getModelIndices( destination_ib, *curIndexP, *curVertexP, m_rightMesh);
 	if (!numI)
 	{	//not enough room for indices
-		DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.\n") );
+		DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.") );
 		return;
 	}
 	*curIndexP += numI;
@@ -636,7 +632,7 @@ void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatX
 //=============================================================================
 Int W3DBridge::getModelIndices(UnsignedShort *destination_ib, Int curIndex, Int vertexOffset, MeshClass *pMesh)
 {
-	if (pMesh == NULL) 
+	if (pMesh == NULL)
 		return(0);
 	Int numPoly = pMesh->Peek_Model()->Get_Polygon_Count();
 	const TriIndex *pPoly =pMesh->Peek_Model()->Get_Polygon_Array();
@@ -654,7 +650,7 @@ Int W3DBridge::getModelIndices(UnsignedShort *destination_ib, Int curIndex, Int
 }
 
 //-----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //-----------------------------------------------------------------------------
 
 ///@todo - Sort bridges by texture for better performance.
@@ -706,13 +702,13 @@ void W3DBridgeBuffer::loadBridgesInVertexAndIndexBuffers(RefRenderObjListIterato
 	Int curBridge;
 
 	for (curBridge=0; curBridge<m_numBridges; curBridge++) {
-		m_bridges[curBridge].getIndicesNVertices(ib, vb, &m_curNumBridgeIndices, 
+		m_bridges[curBridge].getIndicesNVertices(ib, vb, &m_curNumBridgeIndices,
 			&m_curNumBridgeVertices, pLightsIterator);
 	}
 }
 
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -773,7 +769,7 @@ void W3DBridgeBuffer::allocateBridgeBuffers(void)
 #ifdef USE_BRIDGE_NORMALS
 	m_vertexMaterial= NEW VertexMaterialClass();
 	m_vertexMaterial->Set_Shininess(0.0);
-	m_vertexMaterial->Set_Ambient(1,1,1);		  
+	m_vertexMaterial->Set_Ambient(1,1,1);
 	m_vertexMaterial->Set_Diffuse(1,1,1);
 	m_vertexMaterial->Set_Specular(0,0,0);
 	m_vertexMaterial->Set_Emissive(0,0,0);
@@ -816,7 +812,7 @@ void W3DBridgeBuffer::loadBridges(W3DTerrainLogic *pTerrainLogic, Bool saveGame)
 		if (pMapObj->getFlag(FLAG_BRIDGE_POINT1)) {
 			pMapObj2 = pMapObj->getNext();
 			if ( !pMapObj2 || !pMapObj2->getFlag(FLAG_BRIDGE_POINT2)) {
-				DEBUG_LOG(("Missing second bridge point.  Ignoring first.\n"));
+				DEBUG_LOG(("Missing second bridge point.  Ignoring first."));
 			}
 			if (pMapObj2==NULL) break;
 			if (!pMapObj2->getFlag(FLAG_BRIDGE_POINT2)) continue;
@@ -827,7 +823,7 @@ void W3DBridgeBuffer::loadBridges(W3DTerrainLogic *pTerrainLogic, Bool saveGame)
 			to.Z = TheTerrainRenderObject->getHeightMapHeight(to.X, to.Y, NULL) + BRIDGE_FLOAT_AMT;
 			addBridge(from, to, pMapObj->getName(), pTerrainLogic, pMapObj->getProperties());
 			pMapObj = pMapObj2;
-		} 
+		}
 	}
 	if (pTerrainLogic) {
 		pTerrainLogic->updateBridgeDamageStates();
@@ -838,22 +834,22 @@ void W3DBridgeBuffer::loadBridges(W3DTerrainLogic *pTerrainLogic, Bool saveGame)
 //=============================================================================
 static RenderObjClass* createTower( SimpleSceneClass *scene,
 																		W3DAssetManager *assetManager,
-																		MapObject *mapObject, 
-																	  BridgeTowerType type, 
+																		MapObject *mapObject,
+																	  BridgeTowerType type,
 																	  BridgeInfo *bridgeInfo )
 {
 	RenderObjClass* tower = NULL;
 
 	// sanity
 	if( scene == NULL ||
-			assetManager == NULL || 
-			mapObject == NULL || 
-			bridgeInfo == NULL || 
+			assetManager == NULL ||
+			mapObject == NULL ||
+			bridgeInfo == NULL ||
 			type < 0 || type >= BRIDGE_MAX_TOWERS )
 		return NULL;
 
 	// get template for this bridge
-	DEBUG_ASSERTCRASH( TheTerrainRoads, ("createTower: TheTerrainRoads is NULL\n") );
+	DEBUG_ASSERTCRASH( TheTerrainRoads, ("createTower: TheTerrainRoads is NULL") );
 	TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( mapObject->getName() );
 	if( bridgeTemplate == NULL )
 		return NULL;
@@ -869,19 +865,19 @@ static RenderObjClass* createTower( SimpleSceneClass *scene,
 		case BRIDGE_TOWER_TO_RIGHT:		towerPos = bridgeInfo->toRight;			break;
 		default: return NULL;
 
-	}  // end switch
+	}
 
 	// set the Z position to that of the terrain
 	towerPos.z = TheTerrainRenderObject->getHeightMapHeight( towerPos.x, towerPos.y, NULL);
 
 	// find the thing template for the tower we want to construct
 	AsciiString towerTemplateName = bridgeTemplate->getTowerObjectName( type );
-	DEBUG_ASSERTCRASH( TheThingFactory, ("createTower: TheThingFactory is NULL\n") );
+	DEBUG_ASSERTCRASH( TheThingFactory, ("createTower: TheThingFactory is NULL") );
 	const ThingTemplate *towerTemplate = TheThingFactory->findTemplate( towerTemplateName );
 	if( towerTemplate == NULL )
 		return NULL;
-		
-	// find the name of the render object to show	
+
+	// find the name of the render object to show
 	const ModuleInfo& mi = towerTemplate->getDrawModuleInfo( );
 	if( mi.getCount() <= 0 )
 		return NULL;
@@ -921,8 +917,8 @@ static RenderObjClass* createTower( SimpleSceneClass *scene,
 
 //=============================================================================
 //=============================================================================
-static void updateTowerPos( RenderObjClass* tower, 
-														BridgeTowerType type, 
+static void updateTowerPos( RenderObjClass* tower,
+														BridgeTowerType type,
 														BridgeInfo* bridgeInfo )
 {
 
@@ -954,7 +950,7 @@ static void updateTowerPos( RenderObjClass* tower,
 		case BRIDGE_TOWER_TO_RIGHT:		towerPos = bridgeInfo->toRight;			break;
 		default: return;
 
-	}  // end switch
+	}
 
 	// set the position of the tower render object to the position in the world
 	Matrix3D transform;
@@ -981,19 +977,19 @@ void W3DBridgeBuffer::worldBuilderUpdateBridgeTowers( W3DAssetManager *assetMana
 	MapObject *pMapObj;
 	MapObject *pMapObj2;
 
-	for( pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext() ) 
+	for( pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext() )
 	{
 
-		if( pMapObj->getFlag( FLAG_BRIDGE_POINT1 ) ) 
+		if( pMapObj->getFlag( FLAG_BRIDGE_POINT1 ) )
 		{
 
 			pMapObj2 = pMapObj->getNext();
-			if( !pMapObj2 || !pMapObj2->getFlag( FLAG_BRIDGE_POINT2 ) ) 
-				DEBUG_LOG(("Missing second bridge point.  Ignoring first.\n"));
+			if( !pMapObj2 || !pMapObj2->getFlag( FLAG_BRIDGE_POINT2 ) )
+				DEBUG_LOG(("Missing second bridge point.  Ignoring first."));
 
-			if( pMapObj2 == NULL ) 
+			if( pMapObj2 == NULL )
 				break;
-			if( !pMapObj2->getFlag( FLAG_BRIDGE_POINT2 ) ) 
+			if( !pMapObj2->getFlag( FLAG_BRIDGE_POINT2 ) )
 				continue;
 
 			//
@@ -1007,7 +1003,7 @@ void W3DBridgeBuffer::worldBuilderUpdateBridgeTowers( W3DAssetManager *assetMana
 				// find the bridge with the matching name and position ... note we're just matching
 				// (x,y) here cause name and location (without the additional complication of Z) is
 				// really all we have to match bridges.
-				/// @todo integrate the editor with the game ... will never happen tho ... 
+				/// @todo integrate the editor with the game ... will never happen tho ...
 				//
 				if( m_bridges[ i ].getTemplateName() == pMapObj->getName() &&
 						m_bridges[ i ].getStart()->X == pMapObj->getLocation()->x &&
@@ -1035,12 +1031,12 @@ void W3DBridgeBuffer::worldBuilderUpdateBridgeTowers( W3DAssetManager *assetMana
 							towerRenderObj = createTower( scene, assetManager, pMapObj, (BridgeTowerType)j, &bridgeInfo );
 							created = TRUE;
 
-						}  // end if
+						}
 
 						// sanity
-						DEBUG_ASSERTCRASH( towerRenderObj != NULL, ("worldBuilderUpdateBridgeTowers: unable to create tower for bridge '%s'\n",
+						DEBUG_ASSERTCRASH( towerRenderObj != NULL, ("worldBuilderUpdateBridgeTowers: unable to create tower for bridge '%s'",
 															 m_bridges[ i ].getTemplateName().str()) );
-															  
+
 						// update the position of the towers
 						updateTowerPos( towerRenderObj, (BridgeTowerType)j, &bridgeInfo );
 
@@ -1048,16 +1044,16 @@ void W3DBridgeBuffer::worldBuilderUpdateBridgeTowers( W3DAssetManager *assetMana
 						if( created )
 							REF_PTR_RELEASE( towerRenderObj );
 
-					}  // end for j
+					}
 
-				}  // end if
+				}
 
-			}  // end for i
+			}
 
 			// skip the 2nd map object representing the second half of the bridgef
 			pMapObj = pMapObj2;
 
-		} 
+		}
 
 	}
 
@@ -1071,11 +1067,11 @@ void W3DBridgeBuffer::worldBuilderUpdateBridgeTowers( W3DAssetManager *assetMana
 void W3DBridgeBuffer::addBridge(Vector3 fromLoc, Vector3 toLoc, AsciiString name, W3DTerrainLogic *pTerrainLogic, Dict *props)
 {
 	if (m_numBridges >= MAX_BRIDGES) {
-		return;  
+		return;
 	}
 
 	if (!m_initialized) {
-		return;  
+		return;
 	}
 	m_bridges[m_numBridges].init(fromLoc, toLoc, name);
 	if (m_bridges[m_numBridges].load(BODY_PRISTINE)) {
@@ -1128,7 +1124,7 @@ void W3DBridgeBuffer::drawBridges(CameraClass * camera, Bool wireframe, TextureC
 			m_bridges[info.bridgeIndex].setEnabled(true);
 			if (m_bridges[info.bridgeIndex].getDamageState() != info.curDamageState) {
 				changed = true;
-				enum BodyDamageType curState = m_bridges[info.bridgeIndex].getDamageState();
+				BodyDamageType curState = m_bridges[info.bridgeIndex].getDamageState();
 				m_bridges[info.bridgeIndex].setDamageState(info.curDamageState);
 				if (!m_bridges[info.bridgeIndex].load(info.curDamageState)) {
 					// put the old model back.
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp
index c6f59f668ad..7c06301c917 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DCustomEdging.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,12 +43,10 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/W3DCustomEdging.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include "Common/GlobalData.h"
@@ -63,7 +61,7 @@
 #include "WW3D2/meshmdl.h"
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 // A W3D shader that does alpha, texturing, tests zbuffer, doesn't update zbuffer.
 #define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
@@ -95,7 +93,7 @@ static ShaderClass detailOpaqueShader(SC_DETAIL_BLEND);
 
 static ShaderClass mirrorAlphaShader(SC_ALPHA_DETAIL);
 
-// ShaderClass::PASS_ALWAYS, 
+// ShaderClass::PASS_ALWAYS,
 
 #define SC_ALPHA_2D ( SHADE_CNST(PASS_ALWAYS, DEPTH_WRITE_DISABLE, COLOR_WRITE_ENABLE, \
 	SRCBLEND_SRC_ALPHA, DSTBLEND_ONE_MINUS_SRC_ALPHA, FOG_DISABLE, GRADIENT_DISABLE, \
@@ -104,7 +102,7 @@ static ShaderClass mirrorAlphaShader(SC_ALPHA_DETAIL);
 ShaderClass ShaderClass::_PresetAlpha2DShader(SC_ALPHA_2D);
 */
 //-----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -219,9 +217,9 @@ void W3DCustomEdging::loadEdgingsInVertexAndIndexBuffers(WorldHeightMap *pMap, I
 
 					Int diffuse = TheTerrainRenderObject->getStaticDiffuse(column+i, row+j);
 					curVb->diffuse = 0x80000000 + (diffuse&0x00FFFFFF); // set alpha to 5b.
-					Real theZ; 
+					Real theZ;
 					theZ = ((float)pMap->getDataPtr()[cellNdx])*MAP_HEIGHT_SCALE;
-					Real X = (column+i)*MAP_XY_FACTOR; 
+					Real X = (column+i)*MAP_XY_FACTOR;
 					Real Y = (row+j)*MAP_XY_FACTOR;
 					curVb->u2 = uOffset + i*0.25f*range.width();
 					curVb->v2 = vOffset + (1-j)*0.25f*range.height();
@@ -247,8 +245,8 @@ void W3DCustomEdging::loadEdgingsInVertexAndIndexBuffers(WorldHeightMap *pMap, I
  				*curIb++ = startVertex + 1;
  				*curIb++ = startVertex + 1+yOffset;
 				*curIb++ = startVertex + yOffset;
-			}	
-			else 
+			}
+			else
 #endif
 			{
 				*curIb++ = startVertex;
@@ -265,7 +263,7 @@ void W3DCustomEdging::loadEdgingsInVertexAndIndexBuffers(WorldHeightMap *pMap, I
 }
 
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -327,7 +325,7 @@ void W3DCustomEdging::allocateEdgingBuffers(void)
 //=============================================================================
 void W3DCustomEdging::clearAllEdging(void)
 {
-	m_curNumEdgingVertices=0;				  
+	m_curNumEdgingVertices=0;
 	m_curNumEdgingIndices=0;
 	m_anythingChanged = true;
 }
@@ -340,8 +338,8 @@ void W3DCustomEdging::clearAllEdging(void)
 //=============================================================================
 /** Draws the trees.  Uses camera to cull. */
 //=============================================================================
-void W3DCustomEdging::drawEdging(WorldHeightMap *pMap, Int minX, Int maxX, Int minY, Int maxY,  
-		TextureClass * terrainTexture, TextureClass * cloudTexture, TextureClass * noiseTexture) 
+void W3DCustomEdging::drawEdging(WorldHeightMap *pMap, Int minX, Int maxX, Int minY, Int maxY,
+		TextureClass * terrainTexture, TextureClass * cloudTexture, TextureClass * noiseTexture)
 {
 	static Bool foo = false;
 	if (foo) {
@@ -360,8 +358,8 @@ void W3DCustomEdging::drawEdging(WorldHeightMap *pMap, Int minX, Int maxX, Int m
 	DX8Wrapper::Set_Shader(detailAlphaTestShader);
 #ifdef RTS_DEBUG
 	//DX8Wrapper::Set_Shader(detailShader); // shows clipping.
-#endif	
-	
+#endif
+
 	DX8Wrapper::Set_Texture(0,terrainTexture);
 	DX8Wrapper::Set_Texture(1,edgeTex);
 	DX8Wrapper::Apply_Render_State_Changes();
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugDisplay.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
index 6fe8a7030a3..3ddf49f69af 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   Generals
@@ -42,7 +42,7 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include "W3DDevice/GameClient/W3DDebugDisplay.h"
@@ -51,49 +51,49 @@
 #include "GameClient/DisplayString.h"
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 //============================================================================
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp
index 5f68c4fec03..833b6da546e 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DDebugIcons.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,7 +43,7 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 
 #include "W3DDevice/GameClient/W3DDebugIcons.h"
@@ -53,7 +53,7 @@
 #include "Common/MapObject.h"
 #include "WW3D2/dx8wrapper.h"
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 
 // Texturing, no zbuffer, disabled zbuffer write, primary gradient, alpha blending
 #define SC_OPAQUE ( SHADE_CNST(ShaderClass::PASS_ALWAYS, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
@@ -99,12 +99,12 @@ Int				 W3DDebugIcons::m_numDebugIcons = 0;
 W3DDebugIcons::~W3DDebugIcons(void)
 {
 	REF_PTR_RELEASE(m_vertexMaterialClass);
-	if (m_debugIcons) delete m_debugIcons;
+	delete m_debugIcons;
 	m_debugIcons = NULL;
 	m_numDebugIcons = 0;
 }
 
-W3DDebugIcons::W3DDebugIcons(void) 
+W3DDebugIcons::W3DDebugIcons(void)
 
 {
 	//go with a preset material for now.
@@ -116,7 +116,7 @@ W3DDebugIcons::W3DDebugIcons(void)
 bool W3DDebugIcons::Cast_Ray(RayCollisionTestClass & raytest)
 {
 
-	return false;	
+	return false;
 
 }
 
@@ -137,7 +137,7 @@ void W3DDebugIcons::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
 {
 	Vector3	ObjSpaceCenter(TheGlobalData->m_waterExtentX,TheGlobalData->m_waterExtentY,50*MAP_XY_FACTOR);
 	float length = ObjSpaceCenter.Length();
-	
+
 	sphere.Init(ObjSpaceCenter, length);
 }
 
@@ -159,14 +159,14 @@ RenderObjClass * W3DDebugIcons::Clone(void) const
 }
 
 
-void W3DDebugIcons::allocateIconsArray(void) 
+void W3DDebugIcons::allocateIconsArray(void)
 {
 	m_debugIcons = NEW DebugIcon[MAX_ICONS];
-	m_numDebugIcons = 0; 
+	m_numDebugIcons = 0;
 }
 
 
-void W3DDebugIcons::compressIconsArray(void) 
+void W3DDebugIcons::compressIconsArray(void)
 {
 	if (m_debugIcons && m_numDebugIcons > 0) {
 		Int newNum = 0;
@@ -187,7 +187,7 @@ void W3DDebugIcons::addIcon(const Coord3D *pos, Real width, Int numFramesDuratio
 {
 	if (pos==NULL) {
 		if (m_numDebugIcons > maxIcons) {
-			DEBUG_LOG(("Max icons %d\n", m_numDebugIcons));
+			DEBUG_LOG(("Max icons %d", m_numDebugIcons));
 			maxIcons = m_numDebugIcons;
 		}
 		m_numDebugIcons = 0;
@@ -228,7 +228,7 @@ void W3DDebugIcons::Render(RenderInfoClass & rinfo)
 	if (numRect > MAX_RECT) numRect = MAX_RECT;
 	offset+= 0.5f;
 	Int k;
-	for (k=0; k<m_numDebugIcons;) {	
+	for (k=0; k<m_numDebugIcons;) {
 		Int curIndex = 0;
 		Int	numVertex = 0;
 		DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,DX8_FVF_XYZNDUV2,numRect*4);
@@ -262,28 +262,28 @@ void W3DDebugIcons::Render(RenderInfoClass & rinfo)
 			Real halfWidth = m_debugIcons[k].width/2;
 			Int diffuse = clr.getAsInt() | ((int)theAlpha << 24);
 			Coord3D pt1 = m_debugIcons[k].position;
-			vb->x=	pt1.x-halfWidth;	 
+			vb->x=	pt1.x-halfWidth;
 			vb->y=	pt1.y-halfWidth;
 			vb->z=  pt1.z;
 			vb->diffuse=diffuse;	 // b g<<8 r<<16 a<<24.
 			vb->u1=0 ;
 			vb->v1=0 ;
 			vb++;
-			vb->x=	pt1.x+halfWidth;	 
+			vb->x=	pt1.x+halfWidth;
 			vb->y=	pt1.y-halfWidth;
 			vb->z=  pt1.z;
 			vb->diffuse=diffuse;	 // b g<<8 r<<16 a<<24.
 			vb->u1=0 ;
 			vb->v1=0 ;
 			vb++;
-			vb->x=	pt1.x+halfWidth;	 
+			vb->x=	pt1.x+halfWidth;
 			vb->y=	pt1.y+halfWidth;
 			vb->z=  pt1.z;
 			vb->diffuse=diffuse;	 // b g<<8 r<<16 a<<24.
 			vb->u1=0 ;
 			vb->v1=0 ;
 			vb++;
-			vb->x=	pt1.x-halfWidth;	 
+			vb->x=	pt1.x-halfWidth;
 			vb->y=	pt1.y+halfWidth;
 			vb->z=  pt1.z;
 			vb->diffuse=diffuse;	 // b g<<8 r<<16 a<<24.
@@ -299,7 +299,7 @@ void W3DDebugIcons::Render(RenderInfoClass & rinfo)
 			curIndex += 6;
 			numVertex += 4;
 		}
-		}	
+		}
 		if (numVertex == 0) break;
 		DX8Wrapper::Set_Shader(ShaderClass(SC_ALPHA));
 		DX8Wrapper::Set_Index_Buffer(ib_access,0);
@@ -312,4 +312,4 @@ void W3DDebugIcons::Render(RenderInfoClass & rinfo)
 	}
 }
 
-#endif // RTS_DEBUG or RTS_INTERNAL
\ No newline at end of file
+#endif // RTS_DEBUG
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
index 2c2d491ca0e..0d79197c648 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
@@ -34,14 +34,15 @@
 static void drawFramerateBar(void);
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
+#include <numeric>
 #include <stdlib.h>
 #include <windows.h>
 #include <io.h>
 #include <time.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
+#include "Common/FramePacer.h"
 #include "Common/ThingFactory.h"
-#include "Common/GameEngine.h"
 #include "Common/GlobalData.h"
 #include "Common/PerfTimer.h"
 #include "Common/FileSystem.h"
@@ -74,7 +75,7 @@ static void drawFramerateBar(void);
 #include "W3DDevice/GameClient/W3DScene.h"
 #include "W3DDevice/GameClient/W3DTerrainTracks.h"
 #include "W3DDevice/GameClient/W3DWater.h"
-#include "W3DDevice/GameClient/W3DVideobuffer.h"
+#include "W3DDevice/GameClient/W3DVideoBuffer.h"
 #include "W3DDevice/GameClient/W3DShaderManager.h"
 #include "W3DDevice/GameClient/W3DDebugDisplay.h"
 #include "W3DDevice/GameClient/W3DProjectedShadow.h"
@@ -97,8 +98,7 @@ static void drawFramerateBar(void);
 #include "WW3D2/meshmatdesc.h"
 #include "WW3D2/meshmdl.h"
 #include "WW3D2/rddesc.h"
-#include "TARGA.H"
-#include "Lib/BaseType.h"
+#include "TARGA.h"
 
 #include "GameLogic/ScriptEngine.h"		// For TheScriptEngine - jkmcd
 #include "GameLogic/GameLogic.h"
@@ -108,14 +108,8 @@ static void drawFramerateBar(void);
 
 #include "WinMain.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // DEFINE AND ENUMS ///////////////////////////////////////////////////////////
-#define W3D_DISPLAY_DEFAULT_BIT_DEPTH 32
 
 #define no_SAMPLE_DYNAMIC_LIGHT	1
 #ifdef SAMPLE_DYNAMIC_LIGHT
@@ -152,23 +146,17 @@ StatDumpClass::StatDumpClass( const char *fname )
 {
 	char buffer[ _MAX_PATH ];
 	GetModuleFileName( NULL, buffer, sizeof( buffer ) );
-	char *pEnd = buffer + strlen( buffer );
-	while( pEnd != buffer )
+	if (char *pEnd = strrchr(buffer, '\\'))
 	{
-		if( *pEnd == '\\' )
-		{
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+		*pEnd = 0;
 	}
-	AsciiString fullPath;
-	fullPath.format( "%s\\%s", buffer, fname );
-	m_fp = fopen( fullPath.str(), "wt" );
+	// TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.
+	const std::string fullPath = std::string(buffer) + "\\" + fname;
+	m_fp = fopen(fullPath.c_str(), "wt");
 }
 
 //=============================================================================
-//Close the file at the end of the application 
+//Close the file at the end of the application
 //=============================================================================
 StatDumpClass::~StatDumpClass()
 {
@@ -260,7 +248,7 @@ void StatDumpClass::dumpStats()
 	Int onScreenParticleCount = TheParticleSystemManager->getOnScreenParticleCount();
 	fprintf( m_fp, "  Particles: %d in world (%d onscreen)\n", totalParticles, onScreenParticleCount );
 
-	// polygons this frame	
+	// polygons this frame
 	Int polyPerFrame = Debug_Statistics::Get_DX8_Polygons();
 	Int polyPerSecond = (Int)(polyPerFrame * fps);
 	fprintf( m_fp, "  Polygons: %d per frame (%d per second)\n", polyPerFrame, polyPerSecond );
@@ -269,7 +257,7 @@ void StatDumpClass::dumpStats()
 	fprintf( m_fp, "  Vertices: %d\n", Debug_Statistics::Get_DX8_Vertices() );
 
 	//
-	// I'm adjusting the texture memory usage counter by subtracting 
+	// I'm adjusting the texture memory usage counter by subtracting
 	// out the terrain alpha texture (since it's really == terrain texture).
 	//
 	fprintf( m_fp, "  Video RAM: %d\n", Debug_Statistics::Get_Record_Texture_Size() - 1376256 );
@@ -279,11 +267,11 @@ void StatDumpClass::dumpStats()
 
 	fprintf( m_fp, "\n" );
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	TheAudio->audioDebugDisplay( NULL, NULL, m_fp );
 	fprintf( m_fp, "\n" );
 #endif
-	
+
 #ifdef MEMORYPOOL_DEBUG
 	//Report memory usage.
 	TheMemoryPoolFactory->debugMemoryReport( REPORT_FACTORYINFO | REPORT_POOLINFO, 0, 0, m_fp );
@@ -351,7 +339,7 @@ W3DDisplay::W3DDisplay()
 	m_2DScene = NULL;
 	m_3DInterfaceScene = NULL;
 	m_averageFPS = TheGlobalData->m_framesPerSecondLimit;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	m_timerAtCumuFPSStart = 0;
 #endif
 	for (i=0; i<LightEnvironmentClass::MAX_LIGHTS; i++)
@@ -366,7 +354,7 @@ W3DDisplay::W3DDisplay()
 	for (i = 0; i < DisplayStringCount; i++)
 		m_displayStrings[i] = NULL;
 
-}  // end W3DDisplay
+}
 
 // W3DDisplay::~W3DDisplay ====================================================
 /** */
@@ -396,7 +384,7 @@ W3DDisplay::~W3DDisplay()
 		delete m_2DRender;
 		m_2DRender = NULL;
 
-	}  // end if
+	}
 
 	//
 	// delete all our views now since they are W3D views and we need to
@@ -414,7 +402,6 @@ W3DDisplay::~W3DDisplay()
 
 	// shutdown
 	Debug_Statistics::Shutdown_Statistics();
-	TextureLoadTaskClass::shutdown();
 	if (!TheGlobalData->m_headless)
 		W3DShaderManager::shutdown();
 	m_assetManager->Free_Assets();
@@ -427,7 +414,15 @@ W3DDisplay::~W3DDisplay()
 	delete TheW3DFileSystem;
 	TheW3DFileSystem = NULL;
 
-}  // end ~W3DDisplay
+}
+
+// TheSuperHackers @tweak valeronm 20/03/2025 No longer filters resolutions by a 4:3 aspect ratio.
+inline Bool isResolutionSupported(const ResolutionDescClass &res)
+{
+	static const Int minBitDepth = 24;
+
+	return res.Width >= DEFAULT_DISPLAY_WIDTH && res.BitDepth >= minBitDepth;
+}
 
 /*Return number of screen modes supported by the current device*/
 Int W3DDisplay::getDisplayModeCount(void)
@@ -439,7 +434,7 @@ Int W3DDisplay::getDisplayModeCount(void)
 /*	Bool needStencil=false;
 	Bool needDestinationAlpha=false;
 	Int minBitDepth=16;
-	
+
 	//Walk through all resolutions and determine which ones are compatible with other settings
 	//chosen by user.  For example, 32-bit may be required for shadows, occlusion, soft water edge, etc.
 	if (TheGlobalData->m_useShadowVolumes || (TheGlobalData->m_enableBehindBuildingMarkers && TheGameLogic->getShowBehindBuildingMarkers()))
@@ -452,8 +447,8 @@ Int W3DDisplay::getDisplayModeCount(void)
 	for (int res = 0; res < resolutions.Count ();  res ++)
 	{
 		// Is this the resolution we are looking for?
-		if (resolutions[res].BitDepth >= 24 && resolutions[res].Width >= 800 && (fabs((Real)resolutions[res].Width/(Real)resolutions[res].Height - 1.3333f)) < 0.01f)	//only accept 4:3 aspect ratio modes.
-		{	
+		if (isResolutionSupported(resolutions[res]))
+		{
 			numResolutions++;
 		}
 	}
@@ -470,8 +465,8 @@ void W3DDisplay::getDisplayModeDescription(Int modeIndex, Int *xres, Int *yres,
 	for (int res = 0; res < resolutions.Count ();  res ++)
 	{
 		// Is this the resolution we are looking for?
-		if (resolutions[res].BitDepth >= 24 && resolutions[res].Width >= 800 && (fabs((Real)resolutions[res].Width/(Real)resolutions[res].Height - 1.3333f)) < 0.01f)	//only accept 4:3 aspect ratio modes.
-		{	
+		if (isResolutionSupported(resolutions[res]))
+		{
 			if (numResolutions == modeIndex)
 			{	//found the mode
 				*xres=resolutions[res].Width;
@@ -522,7 +517,7 @@ void W3DDisplay::setWidth( UnsignedInt width )
 	// of the screen with (width,height) at the lower right
 	m_2DRender->Set_Coordinate_Range( RectClass( 0, 0, getWidth(), getHeight() ) );
 
-}  // end set width
+}
 
 // W3DDisplay::setHeight ======================================================
 /** Set height of display */
@@ -537,7 +532,7 @@ void W3DDisplay::setHeight( UnsignedInt height )
 	// of the screen with (width,height) at the lower right
 	m_2DRender->Set_Coordinate_Range( RectClass( 0, 0, getWidth(), getHeight() ) );
 
-}  // end set height
+}
 
 // W3DDisplay::initAssets =====================================================
 /** */
@@ -545,7 +540,7 @@ void W3DDisplay::setHeight( UnsignedInt height )
 void W3DDisplay::initAssets( void )
 {
 
-}  // end initAssets
+}
 
 // W3DDisplay::init3DScene ====================================================
 /** */
@@ -553,7 +548,7 @@ void W3DDisplay::initAssets( void )
 void W3DDisplay::init3DScene( void )
 {
 
-}  // end init3DScene
+}
 
 // W3DDisplay::init2DScene ====================================================
 /** This is the 2D scene, you can use it to draw on a 2D plane over the
@@ -562,7 +557,7 @@ void W3DDisplay::init3DScene( void )
 void W3DDisplay::init2DScene( void )
 {
 
-}  // end init2DScene
+}
 
 // W3DDisplay::init ===========================================================
 /** Initialize or re-initialize the W3D display system.  Here we need to
@@ -584,7 +579,7 @@ void W3DDisplay::init( void )
 		/// @todo W3DDisplay needs RE-init logic!
 		return;
 
-	}  // end if
+	}
 	// Override the W3D File system
 	TheW3DFileSystem = NEW W3DFileSystem;
 
@@ -604,7 +599,7 @@ void W3DDisplay::init( void )
 
 		// create our 3D scene
 		m_3DScene =NEW_REF( RTS3DScene, () );
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	#if defined(RTS_DEBUG)
 		if( TheGlobalData->m_wireframe )
 			m_3DScene->Set_Polygon_Mode( SceneClass::LINE );
 	#endif
@@ -637,11 +632,11 @@ void W3DDisplay::init( void )
 		// Note: Don't Add_Render_Object dynamic lights.
 		m_3DScene->addDynamicLight( theDynamicLight );
 	#endif
-		
+
 	}
 
 	// create a new asset manager
-	m_assetManager = NEW W3DAssetManager;	
+	m_assetManager = NEW W3DAssetManager;
 	m_assetManager->Register_Prototype_Loader(&_ParticleEmitterLoader );
 	m_assetManager->Register_Prototype_Loader(&_AggregateLoader);
 	m_assetManager->Set_WW3D_Load_On_Demand( true );
@@ -661,58 +656,91 @@ void W3DDisplay::init( void )
 		WW3D::Enable_Static_Sort_Lists(true);
 		WW3D::Set_Thumbnail_Enabled(false);
 		WW3D::Set_Screen_UV_Bias( TRUE );  ///< this makes text look good :)
-			
+
 		setWindowed( TheGlobalData->m_windowed );
 
 		// create a 2D renderer helper
 		m_2DRender = NEW Render2DClass;
 		DEBUG_ASSERTCRASH( m_2DRender, ("Cannot create Render2DClass") );
 
-		// set our default width and height and bit depth
-		/// @todo we should set this according to options read from a file
-		setWidth( TheGlobalData->m_xResolution );
-		setHeight( TheGlobalData->m_yResolution );
-		setBitDepth( W3D_DISPLAY_DEFAULT_BIT_DEPTH );
-
-		if( WW3D::Set_Render_Device( 0, 
-																 getWidth(), 
-																 getHeight(), 
-																 getBitDepth(), 
-																 getWindowed(), 
-																 true ) != WW3D_ERROR_OK ) 
+		WW3DErrorType renderDeviceError;
+		Int attempt = 0;
+		do
 		{
-			// Getting the device at the default bit depth (32) didn't work, so try
-			// getting a 16 bit display.  (Voodoo 1-3 only supported 16 bit.) jba.
-			setBitDepth( 16 );
-			if( WW3D::Set_Render_Device( 0, 
-																	 getWidth(), 
-																	 getHeight(), 
-																	 getBitDepth(), 
-																	 getWindowed(), 
-																	 true ) != WW3D_ERROR_OK ) 
+			switch (attempt)
 			{
-
-				WW3D::Shutdown();
-				WWMath::Shutdown();
-				throw ERROR_INVALID_D3D;	//failed to initialize.  User probably doesn't have DX 8.1
-				DEBUG_ASSERTCRASH( 0, ("Unable to set render device\n") );
-				return;
+			case 0:
+			{
+				// set our default width and height and bit depth
+				setWidth( TheGlobalData->m_xResolution );
+				setHeight( TheGlobalData->m_yResolution );
+				setBitDepth( DEFAULT_DISPLAY_BIT_DEPTH );
+				break;
 			}
+			case 1:
+			{
+				// Getting the device at the default bit depth (32) didn't work, so try
+				// getting a 16 bit display.  (Voodoo 1-3 only supported 16 bit.) jba.
+				setBitDepth( MIN_DISPLAY_BIT_DEPTH );
+				break;
+			}
+			case 2:
+			{
+				// TheSuperHackers @bugfix xezon 11/06/2025 Now tries a safe default resolution
+				// if the custom resolution did not succeed. This is unlikely to happen but is possible
+				// if the user writes an unsupported resolution in the Option Preferences or if the
+				// graphics adapter does not support the minimum display resolution to begin with.
+				Int xres = DEFAULT_DISPLAY_WIDTH;
+				Int yres = DEFAULT_DISPLAY_HEIGHT;
+				Int bitDepth = DEFAULT_DISPLAY_BIT_DEPTH;
+				Int displayModeCount = getDisplayModeCount();
+				Int displayModeIndex = 0;
+				for (; displayModeIndex < displayModeCount; ++displayModeIndex)
+				{
+					getDisplayModeDescription(displayModeIndex, &xres, &yres, &bitDepth);
+					if (xres * yres >= DEFAULT_DISPLAY_WIDTH * DEFAULT_DISPLAY_HEIGHT)
+						break; // Is good enough. Use it.
+				}
+				TheWritableGlobalData->m_xResolution = xres;
+				TheWritableGlobalData->m_yResolution = yres;
+				setWidth( xres );
+				setHeight( yres );
+				setBitDepth( bitDepth );
+				break;
+			}
+			}
+
+			renderDeviceError = WW3D::Set_Render_Device(
+				0,
+				getWidth(),
+				getHeight(),
+				getBitDepth(),
+				getWindowed(),
+				true );
 
-		}  // end if
+			++attempt;
+		}
+		while (attempt < 3 && renderDeviceError != WW3D_ERROR_OK);
+
+		if (renderDeviceError != WW3D_ERROR_OK)
+		{
+			WW3D::Shutdown();
+			WWMath::Shutdown();
+			throw ERROR_INVALID_D3D;	//failed to initialize.  User probably doesn't have DX 8.1
+			DEBUG_ASSERTCRASH( 0, ("Unable to set render device") );
+			return;
+		}
 
 		//Check if level was never set and default to setting most suitable for system.
 		if (TheGameLODManager->getStaticLODLevel() == STATIC_GAME_LOD_UNKNOWN)
-			TheGameLODManager->setStaticLODLevel(TheGameLODManager->findStaticLODLevel());
+		{
+			TheGameLODManager->setStaticLODLevel(TheGameLODManager->getRecommendedStaticLODLevel());
+		}
 		else
-		{	//Static LOD level was applied during GameLOD manager init except for texture reduction
+		{
+			//Static LOD level was applied during GameLOD manager init except for texture reduction
 			//which needs to be applied here.
-			Int txtReduction=TheWritableGlobalData->m_textureReductionFactor;
-			if (txtReduction > 0)
-			{		WW3D::Set_Texture_Reduction(txtReduction,6);
-					//Tell LOD manager that texture reduction was applied.
-					TheGameLODManager->setCurrentTextureReduction(txtReduction);
-			}
+			TheGameClient->setTextureLOD(TheWritableGlobalData->m_textureReductionFactor);
 		}
 
 		if (TheGlobalData->m_displayGamma != 1.0f)
@@ -743,7 +771,7 @@ void W3DDisplay::init( void )
 					TheGlobalLanguageData->m_nativeDebugDisplay.bold);
 			}
 			else
-				font=TheFontLibrary->getFont( AsciiString("FixedSys"), 8, FALSE );
+				font=TheFontLibrary->getFont( "FixedSys", 8, FALSE );
 
 			m_nativeDebugDisplay->setFont( font );
 			m_nativeDebugDisplay->setFontHeight( 13 );
@@ -759,7 +787,7 @@ void W3DDisplay::init( void )
 	{
 		m_debugDisplayCallback = StatDebugDisplay;
 	}
-}  // end init
+}
 
 // W3DDisplay::reset ===========================================================
 /** Reset the W3D display system.  Here we need to
@@ -798,65 +826,44 @@ void W3DDisplay::reset( void )
 
 const UnsignedInt START_CUMU_FRAME = LOGICFRAMES_PER_SECOND / 2;	// skip first half-sec
 
-/** Update a moving average of the last 30 fps measurements.  Also try to filter out temporary spikes.
-	This code is designed to be used by the GameLOD sytems to determine the correct dynamic LOD setting.
-*/
 void W3DDisplay::updateAverageFPS(void)
 {
-	const Real MaximumFrameTimeCutoff = 0.5f;	//largest frame interval (seconds) we accept before ignoring it as a momentary "spike"
-	const Int FPS_HISTORY_SIZE = 30;	//keep track of the last 30 frames
+	constexpr const Int FPS_HISTORY_SIZE = 30;
 
 	static Int64 lastUpdateTime64 = 0;
 	static Int historyOffset = 0;
-	static Int numSamples = 0;
-	static double fpsHistory[FPS_HISTORY_SIZE];
+	static Real fpsHistory[FPS_HISTORY_SIZE] = {0};
 
-	Int64 freq64 = getPerformanceCounterFrequency();
-	Int64 time64 = getPerformanceCounter();
+	const Int64 freq64 = getPerformanceCounterFrequency();
+	const Int64 time64 = getPerformanceCounter();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGameLogic->getFrame() == START_CUMU_FRAME)
 	{
 		m_timerAtCumuFPSStart = time64;
 	}
 #endif
 
-	Int64 timeDiff = time64 - lastUpdateTime64;
+	const Int64 timeDiff = time64 - lastUpdateTime64;
 
 	// convert elapsed time to seconds
-	double elapsedSeconds = (double)timeDiff/(double)(freq64);
-
-	if (elapsedSeconds <= MaximumFrameTimeCutoff)	//make sure it's not a spike
-	{
-		// append new sameple to fps history.
-		if (historyOffset >= FPS_HISTORY_SIZE)
-			historyOffset = 0;
+	Real elapsedSeconds = (Real)timeDiff/(Real)freq64;
 
-		double currentFPS = 1.0/elapsedSeconds; 
-		fpsHistory[historyOffset++] = currentFPS;
-		numSamples++;
-		if (numSamples > FPS_HISTORY_SIZE)
-			numSamples = FPS_HISTORY_SIZE;
-	}
+	// append new sample to fps history.
+	if (historyOffset >= FPS_HISTORY_SIZE)
+		historyOffset = 0;
 
-	if (numSamples)
-	{	
-		// determine average frame rate over our past history.
-		Real average=0;
-		for (Int i=0,j=historyOffset-1; i<numSamples; i++,j--)
-		{
-			if (j < 0)
-				j=FPS_HISTORY_SIZE-1;	// wrap around to front of buffer
-			average += fpsHistory[j];
-		}
+	m_currentFPS = 1.0f/elapsedSeconds;
+	fpsHistory[historyOffset++] = m_currentFPS;
 
-		m_averageFPS = average / (Real)numSamples;
-	}
+	// determine average frame rate over our past history.
+	const Real sum = std::accumulate(fpsHistory, fpsHistory + FPS_HISTORY_SIZE, 0.0f);
+	m_averageFPS = sum / FPS_HISTORY_SIZE;
 
 	lastUpdateTime64 = time64;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//debug hack to view object under mouse stats
+#if defined(RTS_DEBUG)	//debug hack to view object under mouse stats
 ICoord2D TheMousePos;
 #endif
 
@@ -883,7 +890,7 @@ void W3DDisplay::gatherDebugStats( void )
 				TheGlobalLanguageData->m_nativeDebugDisplay.bold);
 		}
 		else
-			font = TheFontLibrary->getFont( AsciiString("FixedSys"), 8, FALSE );
+			font = TheFontLibrary->getFont( "FixedSys", 8, FALSE );
 
 		for (int i = 0; i < DisplayStringCount; i++)
 		{
@@ -895,11 +902,11 @@ void W3DDisplay::gatherDebugStats( void )
 			}
 		}
 
-	}  // end if
+	}
 
 	if (m_benchmarkDisplayString == NULL)
 	{
-		GameFont *thisFont = TheFontLibrary->getFont( AsciiString("FixedSys"), 8, FALSE );
+		GameFont *thisFont = TheFontLibrary->getFont( "FixedSys", 8, FALSE );
 		m_benchmarkDisplayString = TheDisplayStringManager->newDisplayString();
 		DEBUG_ASSERTCRASH( m_benchmarkDisplayString, ("Failed to create DisplayString") );
 		m_benchmarkDisplayString->setFont( thisFont );
@@ -932,14 +939,14 @@ void W3DDisplay::gatherDebugStats( void )
 	// we update stats on a delay
 	const Real UPDATE_RATE_SECS = 2.0;
 	if( s_timeSinceLastUpdateInSecs >= UPDATE_RATE_SECS || TheGlobalData->m_constantDebugUpdate )
-	{	
+	{
 		UnicodeString unibuffer, unibuffer2;
 		UnicodeString fpsString;
-			
+
 		// setup texture stats
 		Debug_Statistics::Record_Texture_Mode(Debug_Statistics::RECORD_TEXTURE_SIMPLE/*RECORD_TEXTURE_NONE*/);
 
-		// frames per second	
+		// frames per second
 		double fps = (Real)s_framesRenderedSinceLastUpdate / s_timeSinceLastUpdateInSecs;
 		double drawsPerFrame = Debug_Statistics::Get_Draw_Calls(); //(Real)s_drawCallsSinceLastUpdate / (Real)s_framesRenderedSinceLastUpdate;
 		double sortPolysPerFrame = Debug_Statistics::Get_Sorting_Polygons();  //(Real)s_sortedPolysSinceLastUpdate / (Real)s_framesRenderedSinceLastUpdate;
@@ -950,7 +957,7 @@ void W3DDisplay::gatherDebugStats( void )
 		double ms = 1000.0f/fps;
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		double cumuTime = ((double)(time64 - m_timerAtCumuFPSStart) / (double)(freq64));
 		if (cumuTime < 0.0) cumuTime = 0.0;
 		Int numFrames = (Int)TheGameLogic->getFrame() - (Int)START_CUMU_FRAME;
@@ -959,8 +966,8 @@ void W3DDisplay::gatherDebugStats( void )
 
 		//Int LOD = TheGlobalData->m_terrainLOD;
 		//unibuffer.format( L"FPS: %.2f, %.2fms mapLOD=%d [cumu FPS=%.2f] draws: %.2f sort: %.2f", fps, ms, LOD, cumuFPS, drawsPerFrame,sortPolysPerFrame);
-		if (TheGlobalData->m_useFpsLimit) 
-				unibuffer.format( L"%.2f/%d FPS, ", fps, TheGameEngine->getFramesPerSecondLimit());
+		if (TheGlobalData->m_useFpsLimit)
+				unibuffer.format( L"%.2f/%d FPS, ", fps, TheFramePacer->getFramesPerSecondLimit());
 		else
 				unibuffer.format( L"%.2f FPS, ", fps);
 
@@ -970,7 +977,7 @@ void W3DDisplay::gatherDebugStats( void )
 		//Int LOD = TheGlobalData->m_terrainLOD;
 		//unibuffer.format( L"FPS: %.2f, %.2fms mapLOD=%d draws: %.2f sort %.2f", fps, ms, LOD, drawsPerFrame,sortPolysPerFrame);
 		unibuffer.format( L"FPS: %.2f, %.2fms draws: %.2f skins: %.2f sort %.2f", fps, ms, drawsPerFrame,skinDrawsPerFrame,sortPolysPerFrame);
-		if (TheGlobalData->m_useFpsLimit) 
+		if (TheGlobalData->m_useFpsLimit)
 		{
 			unibuffer2.format(L", FPSLock %d",TheGlobalData->m_framesPerSecondLimit);
 			unibuffer.concat(unibuffer2);
@@ -1014,7 +1021,7 @@ void W3DDisplay::gatherDebugStats( void )
 			DX8Wrapper::stats.m_disableObjects = true;
 			DX8Wrapper::stats.m_disableConsole = true;
 			DX8Wrapper::stats.m_debugLinesToShow = 1;
-		} else if (statMode == threeDOverhead) {				 
+		} else if (statMode == threeDOverhead) {
 			threeDOverheadMS = ms;
 			statMode = terrain;
 			DX8Wrapper::stats.m_disableTerrain = false;
@@ -1061,7 +1068,7 @@ void W3DDisplay::gatherDebugStats( void )
 			DX8Wrapper::stats.m_disableConsole = false;
 			DX8Wrapper::stats.m_debugLinesToShow = -1;
 		} else if (!DX8Wrapper::stats.m_showingStats) {
-			// start collecting extended info. 
+			// start collecting extended info.
 			DX8Wrapper::stats.m_showingStats = true;
 			DX8Wrapper::stats.m_disableOverhead = false;
 			DX8Wrapper::stats.m_disableTerrain = true;
@@ -1079,35 +1086,35 @@ void W3DDisplay::gatherDebugStats( void )
 			unibuffer.format(L"FPS: %.2f, %.2fms - Collecting extended stats.", fps, ms);
 		} else if (extendedStats>0) {
 			extendedStats--;
-			unibuffer.format( L"FPS: %.2f, %.2fms - OH %.2fms, Console %.2fms, 3D OH %.2fms, Terrain %.2fms, Obs %.2fms, CPU %.2fms", 
+			unibuffer.format( L"FPS: %.2f, %.2fms - OH %.2fms, Console %.2fms, 3D OH %.2fms, Terrain %.2fms, Obs %.2fms, CPU %.2fms",
 				fps, ms, gameOverheadMS, consoleMS, threeDOverheadMS, terrainMS, objectMS, overlapMS);
 			if (extendedStats==SHOW_STATS_TIME-2) {
 				char bufferA[ 256 ];
-				sprintf( bufferA, "FPS: %.2f, %.2fms - OH %.2fms, Console %.2fms, 3D OH %.2fms, Terrain %.2fms, Obs %.2fms, CPU %.2fms\n", 
+				sprintf( bufferA, "FPS: %.2f, %.2fms - OH %.2fms, Console %.2fms, 3D OH %.2fms, Terrain %.2fms, Obs %.2fms, CPU %.2fms\n",
 					fps, ms, gameOverheadMS, consoleMS, threeDOverheadMS, terrainMS, objectMS, overlapMS);
 				::OutputDebugString(bufferA);
 				if (pListFile) {
 					fprintf(pListFile, "\n%s", bufferA);
-				}				
+				}
 				sprintf( bufferA, "Polygons: per frame %d, per second %d\n", polyPerFrame,
 						(Int)(polyPerFrame*fps));
 				::OutputDebugString(bufferA);
 				if (pListFile) {
 					fprintf(pListFile, "%s", bufferA);
 					fflush(pListFile);
-				}				
+				}
 			}
-		} 
+		}
  		if (pListFile) {
 			fprintf(pListFile, "\nFPS: %.2f, %.2fms\n", fps, ms);
 			fflush(pListFile);
-		}				
+		}
 		if (pListFile) {
 			samples = 0;
 			if (statMode != disabled) {
 				fprintf(pListFile, "Stat%d-", statMode);
-			} 
-		}				
+			}
+		}
 
 #endif
 		// check for debug D3D
@@ -1131,17 +1138,17 @@ void W3DDisplay::gatherDebugStats( void )
 		unibuffer.format(L"Frame: %d", TheGameLogic->getFrame());
 		m_displayStrings[Frame]->setText( unibuffer );
 
-		// polygons this frame	
+		// polygons this frame
 		unibuffer.format( L"Polygons: per frame %d, per second %d", polyPerFrame,
 				(Int)(polyPerFrame*fps));
 		m_displayStrings[Polygons]->setText( unibuffer );
 
 		// vertices this frame
 		unibuffer.format( L"Vertices: %d", Debug_Statistics::Get_DX8_Vertices() );
-		m_displayStrings[Vertices]->setText( unibuffer );		
+		m_displayStrings[Vertices]->setText( unibuffer );
 
 		//
-		// I'm adjusting the texture memory usage counter by subtracting 
+		// I'm adjusting the texture memory usage counter by subtracting
 		// out the terrain alpha texture (since it's really == terrain texture).
 		//
 		unibuffer.format( L"Video RAM: %d", Debug_Statistics::Get_Record_Texture_Size() - 1376256 );
@@ -1154,9 +1161,11 @@ void W3DDisplay::gatherDebugStats( void )
 		s_sortedPolysSinceLastUpdate = 0;
 
 		// terrain stats
-		unibuffer.format( L"3-Way Blends: %d, Shoreline Blends: %d", TheTerrainRenderObject->getNumExtraBlendTiles(),
-			TheTerrainRenderObject->getNumShoreLineTiles());
-		m_displayStrings[TerrainStats]->setText( unibuffer );		
+		unibuffer.format( L"3-Way Blends: %d/%d, Shoreline Blends: %d/%d", TheTerrainRenderObject->getNumExtraBlendTiles(TRUE),
+			TheTerrainRenderObject->getNumExtraBlendTiles(FALSE),
+			TheTerrainRenderObject->getNumShoreLineTiles(TRUE),
+			TheTerrainRenderObject->getNumShoreLineTiles(FALSE));
+		m_displayStrings[TerrainStats]->setText( unibuffer );
 
 		// misc debug info
 		Coord3D camPos;
@@ -1246,7 +1255,7 @@ void W3DDisplay::gatherDebugStats( void )
 		}
 
 		Object *object = NULL;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//debug hack to view object under mouse stats
+#if defined(RTS_DEBUG)	//debug hack to view object under mouse stats
 		Drawable *draw = 	TheTacticalView->pickDrawable(&TheMousePos, FALSE, (PickType)0xffffffff );
 #else
 		Drawable *draw = TheGameClient->findDrawableByID( TheInGameUI->getMousedOverDrawableID() );
@@ -1262,7 +1271,7 @@ void W3DDisplay::gatherDebugStats( void )
 		{
 			unibuffer.concat( L"Moused over object: TERRAIN " );
 		}
-		
+
 		m_displayStrings[ KEY_MOUSE_STATES ]->setText( unibuffer );
 
 		//display the x and y mouse coordinates
@@ -1272,7 +1281,7 @@ void W3DDisplay::gatherDebugStats( void )
 		unibuffer.format( L"Mouse position: screen: (%d, %d), world: (%g, %g, %g)", mouseIO->pos.x, mouseIO->pos.y,
 			worldPos.x, worldPos.y, worldPos.z);
 		m_displayStrings[MousePosition]->setText( unibuffer );
-		
+
 		//display the number of particles in the world and being displayed on screen
 		Int totalParticles = TheParticleSystemManager->getParticleCount();
 		Int onScreenParticleCount = TheParticleSystemManager->getOnScreenParticleCount();
@@ -1318,7 +1327,7 @@ void W3DDisplay::gatherDebugStats( void )
 			// Network outgoing bandwidth stats
 //			unibuffer.format(L"OUT: 0.0 bytes/sec, 0.0 packets/sec");
 //			m_displayStrings[NetOutgoing]->setText( unibuffer );
-      unibuffer.format(L"");
+			unibuffer.clear();
 //			unibuffer.format(L"Network not present");
 			m_displayStrings[NetOutgoing]->setText(unibuffer);
 			m_displayStrings[NetIncoming]->setText(unibuffer);
@@ -1328,7 +1337,7 @@ void W3DDisplay::gatherDebugStats( void )
 
 		// selected object info stats
 		unibuffer.format( L"Select Info: '%d' drawables selected", TheInGameUI->getSelectCount() );
-		
+
 
 
 		//Sorry, guys. I need a special kluge here to get constantdebug results for angry mob.
@@ -1355,13 +1364,13 @@ void W3DDisplay::gatherDebugStats( void )
 												draw->getPosition()->z );
 
 			// (gth) compute some stats about the rendering cost of this drawable
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+#if defined(RTS_DEBUG)
 			RenderCost rcost;
 			for (DrawModule** dm = draw->getDrawModules(); *dm; ++dm)
 			{
 				(*dm)->getRenderCost(rcost);
 			}
-			if (rcost.getDrawCallCount() > 0) 
+			if (rcost.getDrawCallCount() > 0)
 			{
 				unibuffer2.format( L"\ndraw calls: %d(+%d) sort meshes: %d skins: %d  bones: %d",rcost.getDrawCallCount(),rcost.getShadowDrawCount(),rcost.getSortedMeshCount(),rcost.getSkinMeshCount(),rcost.getBoneCount());
 				unibuffer.concat( unibuffer2 );
@@ -1390,7 +1399,7 @@ void W3DDisplay::gatherDebugStats( void )
 
 			//Render ALL modelcondition statii
 
-		}  // end if
+		}
 		m_displayStrings[ SelectedInfo ]->setText( unibuffer );
 
 	}
@@ -1409,7 +1418,7 @@ void W3DDisplay::drawDebugStats( void )
 
 	int linesOfStrings = DisplayStringCount;
 #ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_debugLinesToShow > -1) 
+	if (DX8Wrapper::stats.m_debugLinesToShow > -1)
 	{
 		linesOfStrings = DX8Wrapper::stats.m_debugLinesToShow;
 	}
@@ -1425,7 +1434,7 @@ void W3DDisplay::drawDebugStats( void )
 		y += h;
 	}
 
-}  // end drawDebugStats
+}
 
 // W3DDisplay::drawFPSStats =================================================
 /** Draw the FPS on the screen */
@@ -1469,7 +1478,7 @@ void W3DDisplay::drawCurrentDebugDisplay( void )
 			m_debugDisplayCallback( m_debugDisplay, m_debugDisplayUserData, NULL );
 		}
 	}
-}  // end drawCurrentDebugDisplay
+}
 
 // W3DDisplay::calculateTerrainLOD =================================================
 /** Calculates an adequately speedy terrain Level Of Detail. */
@@ -1478,7 +1487,7 @@ void W3DDisplay::calculateTerrainLOD( void )
 {
 	const Int NUM_SAMPLES=20;
 	const Int NUM_TO_DISCARD=5;
-	
+
 	Int64 freq64 = getPerformanceCounterFrequency();
 
 	char buf[_MAX_PATH];
@@ -1527,7 +1536,7 @@ void W3DDisplay::calculateTerrainLOD( void )
 			::OutputDebugString(buf);
 			if (i>=NUM_TO_DISCARD) {
 				frameTime += timeForFrame;
-				if (i>NUM_TO_DISCARD+1 && 
+				if (i>NUM_TO_DISCARD+1 &&
 					(timeForFrame / ((i+1)-NUM_TO_DISCARD)) > 2*maxTimeLimit) {
 					i++;
 					break;
@@ -1559,11 +1568,22 @@ Real W3DDisplay::getAverageFPS()
 	return m_averageFPS;
 }
 
+Real W3DDisplay::getCurrentFPS()
+{
+	return m_currentFPS;
+}
+
 Int W3DDisplay::getLastFrameDrawCalls()
 {
 	return Debug_Statistics::Get_Draw_Calls();
 }
 
+//=============================================================================
+void W3DDisplay::step()
+{
+	stepViews();
+}
+
 //DECLARE_PERF_TIMER(BigAssRenderLoop)
 
 // W3DDisplay::draw ===========================================================
@@ -1573,7 +1593,6 @@ Int W3DDisplay::getLastFrameDrawCalls()
 void W3DDisplay::draw( void )
 {
 	//USE_PERF_TIMER(W3DDisplay_draw)
-	static UnsignedInt syncTime = 0;
 
 	extern HWND ApplicationHWnd;
 	if (ApplicationHWnd && ::IsIconic(ApplicationHWnd)) {
@@ -1594,7 +1613,7 @@ void W3DDisplay::draw( void )
 		TheGameLODManager->setDynamicLODLevel(DYNAMIC_GAME_LOD_VERY_HIGH);
 	}
 
-	if (TheGlobalData->m_terrainLOD == TERRAIN_LOD_AUTOMATIC && TheTerrainRenderObject) 
+	if (TheGlobalData->m_terrainLOD == TERRAIN_LOD_AUTOMATIC && TheTerrainRenderObject)
 	{
 		calculateTerrainLOD();
 	}
@@ -1611,8 +1630,8 @@ void W3DDisplay::draw( void )
 #endif
 
 	// compute debug statistics for display later
-	if ( m_debugDisplayCallback == StatDebugDisplay 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	if ( m_debugDisplayCallback == StatDebugDisplay
+#if defined(RTS_DEBUG)
 				|| TheGlobalData->m_benchmarkTimer > 0
 #endif
 			)
@@ -1620,7 +1639,7 @@ void W3DDisplay::draw( void )
 		gatherDebugStats();
 	}
 #ifdef EXTENDED_STATS
-	else 
+	else
 	{
 		DX8Wrapper::stats.m_showingStats = false;
 	}
@@ -1643,26 +1662,19 @@ void W3DDisplay::draw( void )
 
 	///@todo: Ask Vegas why the LOD optimizer hangs particle system.
  	//
-  	// Predictive LOD optimizer optimizes the mesh LOD levels to match 
+  	// Predictive LOD optimizer optimizes the mesh LOD levels to match
   	// the given polygon budget
   	//
 	//PredictiveLODOptimizerClass::Optimize_LODs( 5000 );
 
-	Bool freezeTime = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
-	freezeTime = freezeTime || TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript();
-	freezeTime = freezeTime || TheGameLogic->isGamePaused();
-
-	// hack to let client spin fast in network games but still do effects at the same pace. -MDC
-	static UnsignedInt lastFrame = ~0;
-	freezeTime = freezeTime || (lastFrame == TheGameClient->getFrame());
-	lastFrame = TheGameClient->getFrame();
+	Bool freezeTime = TheFramePacer->isTimeFrozen() || TheFramePacer->isGameHalted();
 
 	/// @todo: I'm assuming the first view is our main 3D view.
 	W3DView *primaryW3DView=(W3DView *)getFirstView();
+
 	if (!freezeTime && TheScriptEngine->isTimeFast())
 	{
 		primaryW3DView->updateCameraMovements();  // Update camera motion effects.
-		syncTime += TheW3DFrameLengthInMsec;
 		return;
 	}
 
@@ -1679,7 +1691,7 @@ void W3DDisplay::draw( void )
 
 		//Shroud data is needed to render all other views, so handle this first.
 		if (TheTerrainRenderObject)
-		{	
+		{
 			//update the shroud surface here since it may be needed by reflections
 			if (TheTerrainRenderObject->getMap())	//make sure a valid map is loaded into terrain.
 			{
@@ -1691,51 +1703,25 @@ void W3DDisplay::draw( void )
 		}
 	}
 
-	if (!freezeTime) 
-	{
-		/// @todo Decouple framerate from timestep
-		// for now, use constant time steps to avoid animations running independent of framerate
-		syncTime += TheW3DFrameLengthInMsec;
-		// allow W3D to update its internals
-		//	WW3D::Sync( GetTickCount() );
-	}
-	WW3D::Sync( syncTime );
+	WW3D::Update_Logic_Frame_Time(TheFramePacer->getLogicTimeStepMilliseconds());
 
-	// Fast & Frozen time limits the time to 33 fps.
-	Int minTime = 30;
-	static Int prevTime = timeGetTime(), now;	
+	// TheSuperHackers @info This binds the WW3D update to the logic update.
+	WW3D::Sync(TheGameLogic->hasUpdated());
 
+	static Int now;
 	now=timeGetTime();
-	if (TheTacticalView->getTimeMultiplier()>1) 
+
+	if (TheTacticalView->getTimeMultiplier()>1)
 	{
 		static Int timeMultiplierCounter = 1;
 		timeMultiplierCounter--;
-		if (timeMultiplierCounter>1) 
+		if (timeMultiplierCounter>1)
 			return;
 		timeMultiplierCounter = TheTacticalView->getTimeMultiplier();
 		// limit the framerate, because while fast time is on, the game logic is running as fast as it can.
-	}	
-	else 
-	{
-		now = timeGetTime();
-		prevTime = now - minTime;		 // do the first frame immediately.
-	} 
-
+	}
 
 	do {
-		
-		{
-			if(TheGlobalData->m_loadScreenRender != TRUE)
-			{
-			
-				// limit the framerate
-				while(TheGlobalData->m_useFpsLimit && (now - prevTime) < minTime-1)
-				{
-					now = timeGetTime();
-				}
-				prevTime = now;
-			}
-		}
 
 		// update all views of the world - recomputes data which will affect drawing
 		if (DX8Wrapper::_Get_D3D_Device8() && (DX8Wrapper::_Get_D3D_Device8()->TestCooperativeLevel()) == D3D_OK)
@@ -1768,15 +1754,15 @@ void W3DDisplay::draw( void )
 		{
 			//USE_PERF_TIMER(BigAssRenderLoop)
 			static Bool couldRender = true;
-			if ((TheGlobalData->m_breakTheMovie == FALSE) && (TheGlobalData->m_disableRender == false) && WW3D::Begin_Render( true, true, Vector3( 0.0f, 0.0f, 0.0f ), TheWaterTransparency->m_minWaterOpacity ) == WW3D_ERROR_OK)		
+			if ((TheGlobalData->m_breakTheMovie == FALSE) && (TheGlobalData->m_disableRender == false) && WW3D::Begin_Render( true, true, Vector3( 0.0f, 0.0f, 0.0f ), TheWaterTransparency->m_minWaterOpacity ) == WW3D_ERROR_OK)
 			{
-				
+
 				if(TheGlobalData->m_loadScreenRender == TRUE)
-				{	
+				{
 					TheInGameUI->draw();
 					if( TheMouse )
 						TheMouse->draw();	//keep applying the current cursor style so it remains hidden if needed.
-					WW3D::End_Render();	
+					WW3D::End_Render();
 					continue;
 				}
 				couldRender = true;
@@ -1798,7 +1784,8 @@ void W3DDisplay::draw( void )
 
 				if ( m_videoStream && m_videoBuffer )
 				{
-					drawVideoBuffer( m_videoBuffer, 0, 0, getWidth(), getHeight() );
+					// TheSuperHackers @bugfix Mauller 20/07/2025 scale videos based on screen size so they are shown in their original aspect
+					drawScaledVideoBuffer( m_videoBuffer, m_videoStream );
 				}
 				if( m_copyrightDisplayString )
 				{
@@ -1846,7 +1833,7 @@ void W3DDisplay::draw( void )
 					drawCurrentDebugDisplay();
 				}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 				if (TheGlobalData->m_benchmarkTimer > 0)
 				{
 					drawFPSStats();
@@ -1854,7 +1841,7 @@ void W3DDisplay::draw( void )
 #endif
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 				if (TheGlobalData->m_debugShowGraphicalFramerate)
 				{
 					drawFramerateBar();
@@ -1866,19 +1853,19 @@ void W3DDisplay::draw( void )
 				TheGraphDraw->clear();
 #endif
 				// render is all done!
-				WW3D::End_Render();	
+				WW3D::End_Render();
 			}
 			else
 			{
 				if (couldRender)
 				{
 					couldRender = false;
-					DEBUG_LOG(("Could not do WW3D::Begin_Render()!  Are we ALT-Tabbed out?\n"));
+					DEBUG_LOG(("Could not do WW3D::Begin_Render()!  Are we ALT-Tabbed out?"));
 				}
 			}
 		}
-					
-		if (TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript() || TheGameLogic->isGamePaused())	
+
+		if (TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript() || TheGameLogic->isGamePaused())
 		{
 			freezeTime = false; // We're frozen for debug or for pause, and need to continue out of the loop.
 		}
@@ -1890,7 +1877,7 @@ void W3DDisplay::draw( void )
 		goto AGAIN;
 	}
 #endif
-}  // end draw
+}
 
 #define LETTER_BOX_FADE_TIME	1000.0f		///1000 ms.
 
@@ -1954,13 +1941,19 @@ Bool W3DDisplay::isLetterBoxFading(void)
 	return FALSE;
 }
 
+//WST 10/2/2002 added query function.  JSC Integrated 5/20/03
+Bool W3DDisplay::isLetterBoxed(void)
+{
+	return (m_letterBoxEnabled);
+}
+
 // W3DDisplay::createLightPulse ===============================================
-/** Create a "light pulse" which is a dynamic light that grows, decays 
+/** Create a "light pulse" which is a dynamic light that grows, decays
 	* and vanishes over several frames */
 //=============================================================================
-void W3DDisplay::createLightPulse( const Coord3D *pos, const RGBColor *color, 
-																	 Real innerRadius, Real attenuationWidth, 
-																	 UnsignedInt increaseFrameTime, 
+void W3DDisplay::createLightPulse( const Coord3D *pos, const RGBColor *color,
+																	 Real innerRadius, Real attenuationWidth,
+																	 UnsignedInt increaseFrameTime,
 																	 UnsignedInt decayFrameTime//, Bool donut
 																	 )
 {
@@ -2044,38 +2037,38 @@ void W3DDisplay::setTimeOfDay( TimeOfDay tod )
 // W3DDisplay::drawLine =======================================================
 /** draw a line on the display in pixel coordinates with the specified color */
 //=============================================================================
-void W3DDisplay::drawLine( Int startX, Int startY, 
-													 Int endX, Int endY, 
+void W3DDisplay::drawLine( Int startX, Int startY,
+													 Int endX, Int endY,
 													 Real lineWidth,
 													 UnsignedInt lineColor )
 {
-	
+
 	/// @todo we need to consider the efficiency of the 2D renderer
 	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
-	m_2DRender->Add_Line( Vector2( startX, startY ), Vector2( endX, endY ), 
+	m_2DRender->Add_Line( Vector2( startX, startY ), Vector2( endX, endY ),
 												lineWidth, lineColor );
 	m_2DRender->Render();
 
-}  // end drawLine
+}
 
 // W3DDisplay::drawLine =======================================================
 /** draw a line on the display in pixel coordinates with the specified color */
 //=============================================================================
-void W3DDisplay::drawLine( Int startX, Int startY, 
-													 Int endX, Int endY, 
+void W3DDisplay::drawLine( Int startX, Int startY,
+													 Int endX, Int endY,
 													 Real lineWidth,
 													 UnsignedInt lineColor1,UnsignedInt lineColor2 )
 {
-	
+
 	/// @todo we need to consider the efficiency of the 2D renderer
 	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
-	m_2DRender->Add_Line( Vector2( startX, startY ), Vector2( endX, endY ), 
+	m_2DRender->Add_Line( Vector2( startX, startY ), Vector2( endX, endY ),
 												lineWidth, lineColor1, lineColor2 );
 	m_2DRender->Render();
 
-}  // end drawLine
+}
 
 
 // W3DDisplay::drawOpenRect ===================================================
@@ -2083,7 +2076,7 @@ void W3DDisplay::drawLine( Int startX, Int startY,
 void W3DDisplay::drawOpenRect( Int startX, Int startY, Int width, Int height,
 															 Real lineWidth, UnsignedInt lineColor )
 {
-	
+
 	if (m_isClippedEnabled)
 	{
 		ICoord2D start, end, returnStart, returnEnd;
@@ -2094,7 +2087,7 @@ void W3DDisplay::drawOpenRect( Int startX, Int startY, Int width, Int height,
 		end.y = start.y + height;
 		if(ClipLine2D(&start, &end, &returnStart, &returnEnd, &m_clipRegion ))
 			drawLine( returnStart.x, returnStart.y, returnEnd.x, returnEnd.y, lineWidth, lineColor);
-			
+
 		end.x = start.x + width;
 		end.y = start.y;
 		if(ClipLine2D(&start, &end, &returnStart, &returnEnd, &m_clipRegion ))
@@ -2117,18 +2110,18 @@ void W3DDisplay::drawOpenRect( Int startX, Int startY, Int width, Int height,
 	else
 	{
 		/// @todo we need to consider the efficiency of the 2D renderer
-		m_2DRender->Reset();		
+		m_2DRender->Reset();
 		m_2DRender->Enable_Texturing( FALSE );
-		
-		m_2DRender->Add_Outline( RectClass( startX, startY, 
-																				startX + width, startY + height ), 
+
+		m_2DRender->Add_Outline( RectClass( startX, startY,
+																				startX + width, startY + height ),
 														 lineWidth, lineColor );
 
 		// render it now!
 		m_2DRender->Render();
 	}
 
-}  // end drawOpenRect
+}
 
 // W3DDisplay::drawFillRect ===================================================
 //=============================================================================
@@ -2137,16 +2130,16 @@ void W3DDisplay::drawFillRect( Int startX, Int startY, Int width, Int height,
 {
 
 	/// @todo we need to consider the efficiency of the 2D renderer
-	m_2DRender->Reset();		
+	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
-	m_2DRender->Add_Rect( RectClass( startX, startY, 
-																	 startX + width, startY + height ), 
+	m_2DRender->Add_Rect( RectClass( startX, startY,
+																	 startX + width, startY + height ),
 												0, 0, color );
 
 	// render it now!
 	m_2DRender->Render();
 
-}  // end drawFillRect
+}
 
 void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color)
 {
@@ -2154,7 +2147,7 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 	if(percent < 1 || percent > 100)
 		return;
 
-	m_2DRender->Reset();		
+	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
 
 // The rectanges are numberd as follows
@@ -2163,34 +2156,34 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 //			|----+----|
 //			| 3  | 2  |
 //			|---------| (x + width, y + width)
-//	
+//
 	// we're done, lets just draw one rectangle for it all.
 	if(percent == 100)
 	{
-		m_2DRender->Add_Rect(RectClass( startX, startY, 
+		m_2DRender->Add_Rect(RectClass( startX, startY,
 																		startX + width, startY + height), 0,0, color);
 	}
 	else if( percent> 75)
 	{
 		//rectangle #1 & 2
-		m_2DRender->Add_Rect(RectClass( startX + width/2, startY, 
+		m_2DRender->Add_Rect(RectClass( startX + width/2, startY,
 																		startX + width, startY + height), 0,0, color);
 		// rectangle #3
-		m_2DRender->Add_Rect(RectClass( startX, startY + height/2, 
+		m_2DRender->Add_Rect(RectClass( startX, startY + height/2,
 																		startX + width/2, startY + height), 0,0, color);
 		// draw the part of rectangle 4
 		Real remain = percent - 75;
 		if(remain > 12)
 		{
 			//draw the full triangle
-			m_2DRender->Add_Tri(Vector2(startX, startY), 
+			m_2DRender->Add_Tri(Vector2(startX, startY),
 													Vector2(startX, startY + height/2),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
-			
+
 			// draw the part of triangle
 			Real percentDraw = (Real)(remain - 12)/ 13;
-			m_2DRender->Add_Tri(Vector2(startX, startY), 
+			m_2DRender->Add_Tri(Vector2(startX, startY),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + (width/2 * percentDraw), startY),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2199,7 +2192,7 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 		{
 			// draw the part of triangle
 			Real percentDraw = (Real)(remain)/ 12;
-			m_2DRender->Add_Tri(Vector2(startX, startY + height/2 - (height/2 * percentDraw)), 
+			m_2DRender->Add_Tri(Vector2(startX, startY + height/2 - (height/2 * percentDraw)),
 													Vector2(startX, startY + height/2),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2209,21 +2202,21 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 	else if( percent > 50)
 	{
 		//rectangle #1 & 2
-		m_2DRender->Add_Rect(RectClass( startX + width/2, startY, 
+		m_2DRender->Add_Rect(RectClass( startX + width/2, startY,
 																		startX + width, startY + height), 0,0, color);
 		// draw the part of rectangle 3
 		Real remain = percent - 50;
 		if(remain > 12)
 		{
 			//draw the full triangle
-			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height/2), 
+			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height/2),
 													Vector2(startX, startY + height),
 													Vector2(startX + width/2, startY + height),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
-			
+
 			// draw the part of triangle
 			Real percentDraw = (Real)(remain - 12)/ 13;
-			m_2DRender->Add_Tri(Vector2(startX, startY + height - (height/2 * percentDraw)), 
+			m_2DRender->Add_Tri(Vector2(startX, startY + height - (height/2 * percentDraw)),
 													Vector2(startX, startY + height),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2232,7 +2225,7 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 		{
 			// draw the part of triangle
 			Real percentDraw = (Real)(remain)/ 12;
-			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height),  
+			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width/2 - ( width/2 * percentDraw), startY + height),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2241,21 +2234,21 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 	else if(percent > 25)
 	{
 		// rectangel #1
-		m_2DRender->Add_Rect(RectClass( startX + width/2, startY, 
+		m_2DRender->Add_Rect(RectClass( startX + width/2, startY,
 																		startX + width, startY + height/2), 0,0, color);
 		// draw the part of rectangle 2
 		Real remain = percent - 25;
 		if(remain > 12)
 		{
 			//draw the full triangle
-			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height/2), 
+			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width, startY + height),
 													Vector2(startX + width, startY + height/2),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
-			
+
 			// draw the part of triangle
 			Real percentDraw = (Real)(remain - 12)/ 13;
-			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height/2), 
+			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width - (width/2 * percentDraw), startY + height),
 													Vector2(startX + width, startY + height),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2264,7 +2257,7 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 		{
 			// draw the part of triangle
 			Real percentDraw = (Real)(remain)/ 12;
-			m_2DRender->Add_Tri(Vector2(startX + width, startY + height/2),  
+			m_2DRender->Add_Tri(Vector2(startX + width, startY + height/2),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width, startY + height/2 + ( height/2 * percentDraw)),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2273,19 +2266,19 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 	else
 	{
 				// draw the part of rectangle 1
-		
+
 		if(percent > 12)
 		{
 			//draw the full triangle
-			m_2DRender->Add_Tri(Vector2(startX + width/2, startY), 
+			m_2DRender->Add_Tri(Vector2(startX + width/2, startY),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width, startY),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
-			
+
 			// draw the part of triangle
 			Real percentDraw = (Real)(percent - 12)/ 13;
 			m_2DRender->Add_Tri(Vector2(startX + width, startY),
-													Vector2(startX + width/2, startY + height/2), 
+													Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width, startY + (height/2 * percentDraw)),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
 		}
@@ -2293,7 +2286,7 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 		{
 			// draw the part of triangle
 			Real percentDraw = (Real)(percent)/ 12;
-			m_2DRender->Add_Tri(Vector2(startX + width/2, startY),  
+			m_2DRender->Add_Tri(Vector2(startX + width/2, startY),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width/2 + (width/2 * percentDraw), startY ),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2318,7 +2311,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 	if( percent < 0 || percent > 99 )
 		return;
 
-	m_2DRender->Reset();		
+	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
 
 // The rectanges are numbered as follows
@@ -2327,7 +2320,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 //			|----+----|
 //			| 3  | 2  |
 //			|---------| (x + width, y + width)
-//	
+//
 
 	Int midX = startX + width/2;
 	Int midY = startY + height/2;
@@ -2349,7 +2342,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 
 		//Rectangle #3 & 4
 		m_2DRender->Add_Rect( RectClass( startX, startY, midX, endY ), 0, 0, color );
-		
+
 		//Rectangle #2
 		m_2DRender->Add_Rect( RectClass( midX, midY, endX, endY ), 0, 0, color );
 
@@ -2360,12 +2353,12 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
   		//-----
 
 			//Draw the 2nd half of rectangle #1
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, midY ), Vector2( endX, startY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, midY ), Vector2( endX, startY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 
 			//Draw the last part of the 1st portion of rectangle #1
 			Real percentDraw = (Real)( 13 - percent ) / 13;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, startY ), Vector2( endX - halfWidth * percentDraw, startY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, startY ), Vector2( endX - halfWidth * percentDraw, startY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 		else
@@ -2375,7 +2368,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 
 			//Draw the last part of the 2nd half of rectangle #1
 			Real percentDraw = (Real)( percent - 13 ) / 12;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, midY ), Vector2( endX, startY + halfHeight * percentDraw ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, midY ), Vector2( endX, startY + halfHeight * percentDraw ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 	}
@@ -2394,12 +2387,12 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
   		//-----
 
 			//Draw the 2nd half of rectangle #2
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, endY ), Vector2( endX, endY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, endY ), Vector2( endX, endY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 
 			//Draw the last part of the 1st portion of rectangle #2
 			Real percentDraw = (Real)( percent - 25 ) / 13;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, endY ), Vector2( endX, midY + halfHeight * percentDraw ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, endY ), Vector2( endX, midY + halfHeight * percentDraw ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 		else
@@ -2409,7 +2402,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 
 			//Draw the last part of the 2nd half of rectangle #1
 			Real percentDraw = (Real)( percent - 38 ) / 12;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, endY ), Vector2( endX - halfWidth * percentDraw, endY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, endY ), Vector2( endX - halfWidth * percentDraw, endY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 	}
@@ -2428,12 +2421,12 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
   		//-----
 
 			//Draw the 2nd half of rectangle #3
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, midY ), Vector2( startX, endY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, midY ), Vector2( startX, endY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 
 			//Draw the last part of the 1st portion of rectangle #3
 			Real percentDraw = (Real)( percent - 50 ) / 13;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, endY ), Vector2( midX - halfWidth * percentDraw, endY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, endY ), Vector2( midX - halfWidth * percentDraw, endY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 		else
@@ -2443,7 +2436,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 
 			//Draw the last part of the 2nd half of rectangle #3
 			Real percentDraw = (Real)( percent - 62 ) / 12;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, midY ), Vector2( startX, endY - halfHeight * percentDraw ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, midY ), Vector2( startX, endY - halfHeight * percentDraw ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 	}
@@ -2451,7 +2444,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 	{
 		//75-99%
 		//------
-		
+
 		//Handle rectangle #4 that needs partial rendering.
 		if( percent < 87 )
 		{
@@ -2459,12 +2452,12 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
   		//-----
 
 			//Draw the 2nd half of rectangle #4
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, startY ), Vector2( startX, startY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, startY ), Vector2( startX, startY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 
 			//Draw the last part of the 1st portion of rectangle #4
 			Real percentDraw = (Real)( percent - 75 ) / 13;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, startY ), Vector2( startX, midY - halfHeight * percentDraw ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, startY ), Vector2( startX, midY - halfHeight * percentDraw ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 		else
@@ -2474,7 +2467,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 
 			//Draw the last part of the 2nd half of rectangle #4
 			Real percentDraw = (Real)( percent - 88 ) / 12;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, startY ), Vector2( startX + halfWidth * percentDraw, startY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, startY ), Vector2( startX + halfWidth * percentDraw, startY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 	}
@@ -2488,7 +2481,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 /** Draws an images at the screen coordinates and keeps it within the end
 	* screen coords specified */
 //=============================================================================
-void W3DDisplay::drawImage( const Image *image, Int startX, Int startY, 
+void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 														Int endX, Int endY, Color color, DrawImageMode mode)
 {
 
@@ -2525,6 +2518,7 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 			m_2DRender->Enable_Additive(false);
 			m_2DRender->Enable_Alpha(false);
 			doAlphaReset = TRUE;
+			break;
 		default:
 			break;
 	}
@@ -2555,11 +2549,11 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 			if( BitIsSet( image->getStatus(), IMAGE_STATUS_ROTATED_90_CLOCKWISE ) )
 			{
 
-	
+
 				//
 				//	Clip the polygons to the specified area
 				//
-				
+
 				clipped_rect.Left		= __max (screen_rect.Left, m_clipRegion.lo.x);
 				clipped_rect.Right	= __min (screen_rect.Right, m_clipRegion.hi.x);
 				clipped_rect.Top		= __max (screen_rect.Top, m_clipRegion.lo.y);
@@ -2568,7 +2562,7 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 				//
 				//	Clip the texture to the specified area
 				//
-				
+
 				float percent				= ((clipped_rect.Left - screen_rect.Left) / screen_rect.Width ());
 				clipped_uv_rect.Top		= uv_rect.Top + (uv_rect.Height () * percent);
 
@@ -2584,11 +2578,11 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 			else
 
 			{
-			
+
 				//
 				//	Clip the polygons to the specified area
 				//
-				
+
 				clipped_rect.Left		= __max (screen_rect.Left, m_clipRegion.lo.x);
 				clipped_rect.Right	= __min (screen_rect.Right, m_clipRegion.hi.x);
 				clipped_rect.Top		= __max (screen_rect.Top, m_clipRegion.lo.y);
@@ -2597,7 +2591,7 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 				//
 				//	Clip the texture to the specified area
 				//
-				
+
 				float percent				= ((clipped_rect.Left - screen_rect.Left) / screen_rect.Width ());
 				clipped_uv_rect.Left		= uv_rect.Left + (uv_rect.Width () * percent);
 
@@ -2623,7 +2617,7 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 	if( BitIsSet( image->getStatus(), IMAGE_STATUS_ROTATED_90_CLOCKWISE ) )
 	{
 
-		m_2DRender->Add_Tri( Vector2( screen_rect.Left, screen_rect.Top ), 
+		m_2DRender->Add_Tri( Vector2( screen_rect.Left, screen_rect.Top ),
 												 Vector2( screen_rect.Left, screen_rect.Bottom ),
 												 Vector2( screen_rect.Right, screen_rect.Top ),
 												 Vector2( uv_rect.Right, uv_rect.Top),
@@ -2639,14 +2633,14 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 												 Vector2( uv_rect.Left, uv_rect.Top ),
 												 color );
 
-	}  // end if
+	}
 	else
 	{
 
 		// just draw as normal
 		m_2DRender->Add_Quad( screen_rect, uv_rect, color );
 
-	}  // end else
+	}
 
 	m_2DRender->Render();
 
@@ -2655,7 +2649,7 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 	if (doAlphaReset)
 		m_2DRender->Enable_Alpha(true);
 
-}  // end drawImage
+}
 
 //============================================================================
 // W3DDisplay::createVideoBuffer
@@ -2709,6 +2703,43 @@ VideoBuffer*	W3DDisplay::createVideoBuffer( void )
 	return buffer;
 }
 
+//============================================================================
+// W3DDisplay::drawScaledVideoBuffer
+//============================================================================
+
+void W3DDisplay::drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream )
+{
+	// TheSuperHackers @bugfix Mauller 20/07/2025 scale videos based on screen size so they are shown in their original aspect
+	Real videoAspect = (Real)stream->width() / (Real)stream->height();
+	Real displayAspect = (Real)getWidth() / (Real)getHeight();
+	Bool wideAspect = displayAspect >= videoAspect;
+
+	Int startX = 0;
+	Int endX = 0;
+	Int startY = 0;
+	Int endY = 0;
+
+	if (wideAspect)
+	{
+		// TheSuperHackers @info if we are in a wide aspect, we scale the videos width and fill the height
+		Real heightScale = (Real)getHeight() / (Real)stream->height();
+		startX = (getWidth() / 2.0f) - (stream->width() * heightScale / 2.0f);
+		endX = (getWidth() / 2.0f) + (stream->width() * heightScale / 2.0f);
+
+		endY = getHeight();
+	}
+	else
+	{
+		// TheSuperHackers @info if we are in a narrow aspect, we scale the videos height and fill the width
+		Real widthScale = (Real)getWidth() / (Real)stream->width();
+		startY = (getHeight() / 2.0f) - (stream->height() * widthScale / 2.0f);
+		endY = (getHeight() / 2.0f) + (stream->height() * widthScale / 2.0f);
+
+		endX = getWidth();
+	}
+
+	drawVideoBuffer( buffer, startX, startY, endX, endY );
+}
 
 //============================================================================
 // W3DDisplay::drawVideoBuffer
@@ -2737,7 +2768,7 @@ void W3DDisplay::setClipRegion( IRegion2D *region )
 		m_clipRegion = *region;
 		m_isClippedEnabled = TRUE;
 
-}  // end setClipRegion
+}
 
 //=============================================================================
 /* we don't really need to override this call, since we will soon be called to
@@ -2771,7 +2802,7 @@ void W3DDisplay::setShroudLevel( Int x, Int y, CellShroudStatus setting )
 			TheTerrainRenderObject->getShroud()->setShroudLevel(x, y, (W3DShroudLevel)TheGlobalData->m_fogAlpha );///< @todo placeholder to get feedback on logic work while graphic side being decided
 		else
 			TheTerrainRenderObject->getShroud()->setShroudLevel(x, y, (W3DShroudLevel)TheGlobalData->m_clearAlpha );
-		//Logic is saying shroud.  We can add alpha levels here in client if needed.  
+		//Logic is saying shroud.  We can add alpha levels here in client if needed.
 		// W3DShroud is a 0-255 alpha byte.  Logic shroud is a double reference count.
 	}
 }
@@ -2779,75 +2810,77 @@ void W3DDisplay::setShroudLevel( Int x, Int y, CellShroudStatus setting )
 //=============================================================================
 ///Utility function to dump data into a .BMP file
 static void CreateBMPFile(LPTSTR pszFile, char *image, Int width, Int height)
-{ 
-     HANDLE hf;                 // file handle 
-    BITMAPFILEHEADER hdr;       // bitmap file-header 
-    PBITMAPINFOHEADER pbih;     // bitmap info-header 
-    LPBYTE lpBits;              // memory pointer 
-    DWORD dwTotal;              // total count of bytes 
-    DWORD cb;                   // incremental count of bytes 
-    BYTE *hp;                   // byte pointer 
-    DWORD dwTmp; 
-
-    PBITMAPINFO pbmi; 
-
-    pbmi = (PBITMAPINFO) LocalAlloc(LPTR,sizeof(BITMAPINFOHEADER));
-    pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); 
-    pbmi->bmiHeader.biWidth = width; 
-    pbmi->bmiHeader.biHeight = height; 
-    pbmi->bmiHeader.biPlanes = 1; 
-    pbmi->bmiHeader.biBitCount = 24;
-    pbmi->bmiHeader.biCompression = BI_RGB;
-    pbmi->bmiHeader.biSizeImage = (pbmi->bmiHeader.biWidth + 7) /8 * pbmi->bmiHeader.biHeight * 24;
-    pbmi->bmiHeader.biClrImportant = 0; 
-
-
-    pbih = (PBITMAPINFOHEADER) pbmi; 
-    lpBits = (LPBYTE) image;
-
-    // Create the .BMP file. 
-    hf = CreateFile(pszFile, 
-                   GENERIC_READ | GENERIC_WRITE, 
-                   (DWORD) 0, 
-                    NULL, 
-                   CREATE_ALWAYS, 
-                   FILE_ATTRIBUTE_NORMAL, 
-                   (HANDLE) NULL); 
-    if (hf == INVALID_HANDLE_VALUE) 
-		return;
-    hdr.bfType = 0x4d42;        // 0x42 = "B" 0x4d = "M" 
-    // Compute the size of the entire file. 
-    hdr.bfSize = (DWORD) (sizeof(BITMAPFILEHEADER) + 
-                 pbih->biSize + pbih->biClrUsed 
-                 * sizeof(RGBQUAD) + pbih->biSizeImage); 
-    hdr.bfReserved1 = 0; 
-    hdr.bfReserved2 = 0; 
-
-    // Compute the offset to the array of color indices. 
-    hdr.bfOffBits = (DWORD) sizeof(BITMAPFILEHEADER) + 
-                    pbih->biSize + pbih->biClrUsed 
-                    * sizeof (RGBQUAD); 
-
-    // Copy the BITMAPFILEHEADER into the .BMP file. 
-    if (!WriteFile(hf, (LPVOID) &hdr, sizeof(BITMAPFILEHEADER), 
-        (LPDWORD) &dwTmp,  NULL)) 
-		return;
-
-    // Copy the BITMAPINFOHEADER and RGBQUAD array into the file. 
-    if (!WriteFile(hf, (LPVOID) pbih, sizeof(BITMAPINFOHEADER) + pbih->biClrUsed * sizeof (RGBQUAD),(LPDWORD) &dwTmp, NULL)) 
+{
+	HANDLE hf;                  // file handle
+	BITMAPFILEHEADER hdr;       // bitmap file-header
+	PBITMAPINFOHEADER pbih;     // bitmap info-header
+	LPBYTE lpBits;              // memory pointer
+	DWORD dwTotal;              // total count of bytes
+	DWORD cb;                   // incremental count of bytes
+	BYTE *hp;                   // byte pointer
+	DWORD dwTmp;
+
+	PBITMAPINFO pbmi;
+
+	pbmi = (PBITMAPINFO) LocalAlloc(LPTR,sizeof(BITMAPINFOHEADER));
+	if (pbmi == NULL)
 		return;
 
-    // Copy the array of color indices into the .BMP file. 
-    dwTotal = cb = pbih->biSizeImage; 
-    hp = lpBits; 
-    if (!WriteFile(hf, (LPSTR) hp, (int) cb, (LPDWORD) &dwTmp,NULL)) 
-		return;
+	pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+	pbmi->bmiHeader.biWidth = width;
+	pbmi->bmiHeader.biHeight = height;
+	pbmi->bmiHeader.biPlanes = 1;
+	pbmi->bmiHeader.biBitCount = 24;
+	pbmi->bmiHeader.biCompression = BI_RGB;
+	pbmi->bmiHeader.biSizeImage = (pbmi->bmiHeader.biWidth + 7) /8 * pbmi->bmiHeader.biHeight * 24;
+	pbmi->bmiHeader.biClrImportant = 0;
+
+	pbih = (PBITMAPINFOHEADER) pbmi;
+	lpBits = (LPBYTE) image;
+
+	// Create the .BMP file.
+	hf = CreateFile(pszFile,
+		GENERIC_READ | GENERIC_WRITE,
+		(DWORD) 0,
+		NULL,
+		CREATE_ALWAYS,
+		FILE_ATTRIBUTE_NORMAL,
+		(HANDLE) NULL);
+
+	if (hf != INVALID_HANDLE_VALUE)
+	{
+		hdr.bfType = 0x4d42;        // 0x42 = "B" 0x4d = "M"
+		// Compute the size of the entire file.
+		hdr.bfSize = (DWORD) (sizeof(BITMAPFILEHEADER) +
+									pbih->biSize + pbih->biClrUsed
+									* sizeof(RGBQUAD) + pbih->biSizeImage);
+		hdr.bfReserved1 = 0;
+		hdr.bfReserved2 = 0;
+
+		// Compute the offset to the array of color indices.
+		hdr.bfOffBits = (DWORD) sizeof(BITMAPFILEHEADER) +
+										pbih->biSize + pbih->biClrUsed
+										* sizeof (RGBQUAD);
+
+		// Copy the BITMAPFILEHEADER into the .BMP file.
+		if (WriteFile(hf, (LPVOID) &hdr, sizeof(BITMAPFILEHEADER),
+				(LPDWORD) &dwTmp,  NULL))
+		{
+			// Copy the BITMAPINFOHEADER and RGBQUAD array into the file.
+			if (WriteFile(hf, (LPVOID) pbih, sizeof(BITMAPINFOHEADER) + pbih->biClrUsed * sizeof (RGBQUAD),(LPDWORD) &dwTmp, NULL))
+			{
+				// Copy the array of color indices into the .BMP file.
+				dwTotal = cb = pbih->biSizeImage;
+				hp = lpBits;
+				WriteFile(hf, (LPSTR) hp, (int) cb, (LPDWORD) &dwTmp, NULL);
+			}
+		}
 
-    // Close the .BMP file. 
-     if (!CloseHandle(hf))
-		 return;
+		// Close the .BMP file.
+		CloseHandle(hf);
+	}
 
-    // Free memory. 
+	// Free memory.
 	LocalFree( (HLOCAL) pbmi);
 }
 
@@ -2866,8 +2899,8 @@ void W3DDisplay::takeScreenShot(void)
 #else
 		sprintf( leafname, "%s%.3d.bmp", "sshot", frame_number++);
 #endif
-		strcpy(pathname, TheGlobalData->getPath_UserData().str());
-		strcat(pathname, leafname);
+		strlcpy(pathname, TheGlobalData->getPath_UserData().str(), ARRAY_SIZE(pathname));
+		strlcat(pathname, leafname, ARRAY_SIZE(pathname));
 		if (_access( pathname, 0 ) == -1)
 			done = true;
 	}
@@ -2996,7 +3029,7 @@ void W3DDisplay::toggleMovieCapture(void)
 }
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 
 static FILE *AssetDumpFile=NULL;
 
@@ -3009,7 +3042,7 @@ void dumpMeshAssets(MeshClass *mesh)
 		MeshModelClass *model=mesh->Get_Model();
 		for (int stage=0;stage<MeshMatDescClass::MAX_TEX_STAGES;++stage)
 		{
-			for (int pass=0;pass<model->Get_Pass_Count();++pass) 
+			for (int pass=0;pass<model->Get_Pass_Count();++pass)
 			{
 				if (model->Has_Texture_Array(pass,stage))
 				{
@@ -3017,7 +3050,7 @@ void dumpMeshAssets(MeshClass *mesh)
 					{
 						if ((texture=model->Peek_Texture(i,pass,stage)) != NULL)
 						{
-							fprintf(AssetDumpFile,"\t%s\n",texture->Get_Texture_Name());
+							fprintf(AssetDumpFile,"\t%s\n",texture->Get_Texture_Name().str());
 						}
 					}
 				}
@@ -3025,7 +3058,7 @@ void dumpMeshAssets(MeshClass *mesh)
 				{
 					if ((texture=model->Peek_Single_Texture(pass,stage)) != NULL)
 					{
-						fprintf(AssetDumpFile,"\t%s\n",texture->Get_Texture_Name());
+						fprintf(AssetDumpFile,"\t%s\n",texture->Get_Texture_Name().str());
 					}
 				}
 			}
@@ -3056,7 +3089,7 @@ void dumpHLODAssets(HLodClass *hlod)
 void W3DDisplay::dumpModelAssets(const char *path)
 {
 	if (m_3DScene)
-	{	
+	{
 		AssetDumpFile=fopen(path,"w");
 		if (AssetDumpFile)
 		{
@@ -3096,9 +3129,9 @@ void W3DDisplay::preloadModelAssets( AsciiString model )
 		nameWithExtension.format( "%s.w3d", model.str() );
 		m_assetManager->Load_3D_Assets( nameWithExtension.str() );
 
-	}  // end if
+	}
 
-}  // end preloadModelAssets
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Preload using the W3D asset manager the texture referenced by the string parameter */
@@ -3110,9 +3143,9 @@ void W3DDisplay::preloadTextureAssets( AsciiString texture )
 	{
 		TextureClass *theTexture = m_assetManager->Get_Texture( texture.str() );
 		theTexture->Release_Ref();//release reference
-	}  // end if
+	}
 
-}  // end preloadModelAssets
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -3149,7 +3182,7 @@ void W3DDisplay::doSmartAssetPurgeAndPreload(const char* usageFileName)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 void W3DDisplay::dumpAssetUsage(const char* mapname)
 {
 	if (!m_assetManager || !mapname || !*mapname)
@@ -3173,11 +3206,11 @@ void W3DDisplay::dumpAssetUsage(const char* mapname)
 			break;	// it exists, we're good
 		++idx;
 	}
-	
+
 	FILE *fp = fopen(buf, "w");
 	if (fp)
 	{
-		for (int i=0; i<names.Count(); i++) 
+		for (int i=0; i<names.Count(); i++)
 		{
 			const char* n = names[i];
 			fprintf(fp, "%s\n", n);
@@ -3199,9 +3232,9 @@ static void drawFramerateBar(void)
 	else if (percTime < 0.0f)
 		percTime = 0.0f;
 	Int width = REAL_TO_INT(percTime * TheDisplay->getWidth());
-	UnsignedInt colorToUse = GameMakeColor( REAL_TO_UNSIGNEDBYTE((1.0f - percTime) * 255), 
-																					REAL_TO_UNSIGNEDBYTE(percTime * 255), 
-																					0, 
+	UnsignedInt colorToUse = GameMakeColor( REAL_TO_UNSIGNEDBYTE((1.0f - percTime) * 255),
+																					REAL_TO_UNSIGNEDBYTE(percTime * 255),
+																					0,
 																					0x7F);
 
 	TheDisplay->drawFillRect(1, 1, width, 15, colorToUse);
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp
index 80b67ceeb8e..33775af48ad 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DDisplayString.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -56,11 +56,6 @@
 #include "GameClient/GlobalLanguage.h"
 
 // DEFINES ////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE TYPES //////////////////////////////////////////////////////////////
 
@@ -81,7 +76,7 @@
 //=============================================================================
 W3DDisplayString::W3DDisplayString( void )
 {
-	
+
 	m_textChanged = FALSE;
 	m_textPos.x = 0;
 	m_textPos.y = 0;
@@ -99,8 +94,8 @@ W3DDisplayString::W3DDisplayString( void )
 	m_hotKeyPos.x = 0;
 	m_hotKeyPos.y = 0;
 	m_hotKeyColor = GameMakeColor(255,255,255,255);
-	
-}  // end W3DDisplayString
+
+}
 
 // W3DDisplayString::~W3DDisplayString ========================================
 /** */
@@ -108,7 +103,7 @@ W3DDisplayString::W3DDisplayString( void )
 W3DDisplayString::~W3DDisplayString( void )
 {
 
-}  // end ~W3DDisplayString
+}
 
 // W3DDisplayString::textChanged ==============================================
 /** This method automatically gets called from some methods in the display
@@ -123,12 +118,12 @@ void W3DDisplayString::notifyTextChanged( void )
 	if(TheGlobalLanguageData)
 	{
 		if(TheGlobalLanguageData->m_useHardWrap == TRUE)
-		{	
+		{
 			m_textRenderer.Set_Use_Hard_Word_Wrap(true);
 			m_textRendererHotKey.Set_Use_Hard_Word_Wrap(true);
 		}
 		else
-		{	
+		{
 			m_textRenderer.Set_Use_Hard_Word_Wrap(false);
 			m_textRendererHotKey.Set_Use_Hard_Word_Wrap(false);
 		}
@@ -147,7 +142,7 @@ void W3DDisplayString::notifyTextChanged( void )
 	m_textRenderer.Reset();
 	m_textRendererHotKey.Reset();
 
-}  // end notifyTextChanged
+}
 
 // W3DDisplayString::Draw =====================================================
 /** Draw the text at the specified location in in the specified colors
@@ -166,9 +161,9 @@ void W3DDisplayString::draw( Int x, Int y, Color color, Color dropColor, Int xDr
 	Bool needNewPolys = FALSE;
 
 	// sanity
-	if( getTextLength() == 0 )	
+	if( getTextLength() == 0 )
 		return;  // nothing to draw
-	
+
 	// if our font or text has changed we need to build a new sentence
 	if( m_fontChanged || m_textChanged )
 	{
@@ -191,16 +186,16 @@ void W3DDisplayString::draw( Int x, Int y, Color color, Color dropColor, Int xDr
 		m_textChanged = FALSE;
 		needNewPolys = TRUE;
 
-	}  // end if
+	}
 
 	//
 	// if our position has changed, or our colors have chagned, or our
 	// text data has changed, we need to redo the texture quads
 	//
 	if( needNewPolys ||
-			x != m_textPos.x || 
-			y != m_textPos.y || 
-			color != m_currTextColor || 
+			x != m_textPos.x ||
+			y != m_textPos.y ||
+			color != m_currTextColor ||
 			dropColor != m_currDropColor )
 	{
 
@@ -212,7 +207,7 @@ void W3DDisplayString::draw( Int x, Int y, Color color, Color dropColor, Int xDr
 
 		// reset the quads
 		m_textRenderer.Reset_Polys();
-					
+
 		// draw the shadow
 		m_textRenderer.Set_Location( Vector2( m_textPos.x + xDrop, m_textPos.y + yDrop) );
 		m_textRenderer.Draw_Sentence( m_currDropColor );
@@ -220,7 +215,7 @@ void W3DDisplayString::draw( Int x, Int y, Color color, Color dropColor, Int xDr
 		// draw the text
 		m_textRenderer.Set_Location( Vector2( m_textPos.x, m_textPos.y ) );
 		m_textRenderer.Draw_Sentence( m_currTextColor );
-		
+
 		if(m_useHotKey)
 		{
 			m_textRendererHotKey.Reset_Polys();
@@ -228,8 +223,8 @@ void W3DDisplayString::draw( Int x, Int y, Color color, Color dropColor, Int xDr
 			m_textRendererHotKey.Draw_Sentence( m_hotKeyColor );
 			m_textRendererHotKey.Render();
 		}
-	
-	}  // end if
+
+	}
 
 	// render the text
 	m_textRenderer.Render();
@@ -238,7 +233,7 @@ void W3DDisplayString::draw( Int x, Int y, Color color, Color dropColor, Int xDr
 	if( TheGameClient )
 		usingResources( TheGameClient->getFrame() );
 
-}  // end draw
+}
 
 // W3DDisplayString::getSize ==================================================
 /** Get the render size width and height of the string in this instance
@@ -251,9 +246,9 @@ void W3DDisplayString::getSize( Int *width, Int *height )
 	if( width )
 		*width = m_size.x;
 	if( height )
-		*height = m_size.y;		
+		*height = m_size.y;
 
-}  // end getSize
+}
 
 // DisplayString::appendChar ==================================================
 /** Get text with up to charPos characters, -1 = all characters */
@@ -272,9 +267,9 @@ Int W3DDisplayString::getWidth( Int charPos )
 		const WideChar *text = m_textString.str();
 		WideChar ch;
 
-		while ( (ch = *text++ ) != 0 && ( charPos == -1 || count < charPos ) ) 
+		while ( (ch = *text++ ) != 0 && ( charPos == -1 || count < charPos ) )
 		{
-			if ( ch != (WideChar)'\n' ) 
+			if ( ch != (WideChar)'\n' )
 			{
 				width += font->Get_Char_Spacing( ch );
 			}
@@ -304,7 +299,7 @@ void W3DDisplayString::setFont( GameFont *font )
 
 	// set the font in our renderer
 	m_textRenderer.Set_Font( static_cast<FontCharsClass *>(m_font->fontData) );
-	
+
 	m_textRendererHotKey.Set_Font( static_cast<FontCharsClass *>(TheFontLibrary->getFont(font->nameString,font->pointSize, TRUE)->fontData) );
 	// recompute extents for text with new font
 	computeExtents();
@@ -312,7 +307,7 @@ void W3DDisplayString::setFont( GameFont *font )
 	// set flag telling us the font has changed since last render
 	m_fontChanged = TRUE;
 
-}  // end setFont
+}
 
 // W3DDisplayString::setClipRegion ============================================
 /** Set the clipping region for the text */
@@ -342,9 +337,9 @@ void W3DDisplayString::setClipRegion( IRegion2D *region )
 																								 m_clipRegion.lo.y,
 																								 m_clipRegion.hi.x,
 																								 m_clipRegion.hi.y ) );
-	}  // end if
+	}
 
-}  // end setClipRegion
+}
 
 // W3DDisplayString::computeExtents ===========================================
 /** Update the width and height of our string */
@@ -360,7 +355,7 @@ void W3DDisplayString::computeExtents( void )
 		m_size.x = 0;
 		m_size.y = 0;
 
-	}  // end if
+	}
 	else
 	{
 
@@ -368,9 +363,9 @@ void W3DDisplayString::computeExtents( void )
 		m_size.x = extents.X;
 		m_size.y = extents.Y;
 
-	}  // end else
+	}
 
-}  // end computeExtents
+}
 
 // W3DDisplayString::setWordWrap ===========================================
 /** Set the wordwrap of the m_textRenderer */
@@ -380,7 +375,7 @@ void W3DDisplayString::setWordWrap( Int wordWrap )
 	// set the Word Wrap
 	if(m_textRenderer.Set_Wrapping_Width(wordWrap))
 		notifyTextChanged();
-}// void setWordWrap( Int wordWrap )
+}
 
 void W3DDisplayString::setUseHotkey( Bool useHotkey, Color hotKeyColor )
 {
@@ -398,4 +393,4 @@ void W3DDisplayString::setWordWrapCentered( Bool isCentered )
 	// set the Word Wrap
 	 if( m_textRenderer.Set_Word_Wrap_Centered(isCentered) )
 		notifyTextChanged();
-}// void setWordWrap( Int wordWrap )
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp
index 6d3c134ecd6..459fc1be20e 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp
@@ -38,13 +38,13 @@
 #include "W3DDevice/GameClient/W3DDisplayStringManager.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC FUNCTIONS 
+// PUBLIC FUNCTIONS
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
 W3DDisplayStringManager::W3DDisplayStringManager( void )
 {
-	for (Int i = 0; i < MAX_GROUPS; ++i) 
+	for (Int i = 0; i < MAX_GROUPS; ++i)
 	{
 		m_groupNumeralStrings[i] = NULL;
 	}
@@ -56,7 +56,7 @@ W3DDisplayStringManager::W3DDisplayStringManager( void )
 //-------------------------------------------------------------------------------------------------
 W3DDisplayStringManager::~W3DDisplayStringManager( void )
 {
-	for (Int i = 0; i < MAX_GROUPS; ++i) 
+	for (Int i = 0; i < MAX_GROUPS; ++i)
 	{
 		if (m_groupNumeralStrings[i])
 			freeDisplayString(m_groupNumeralStrings[i]);
@@ -78,8 +78,8 @@ void W3DDisplayStringManager::postProcessLoad( void )
 		TheDrawGroupInfo->m_fontName,
 		TheDrawGroupInfo->m_fontSize,
 		TheDrawGroupInfo->m_fontIsBold );
-	
-	for (Int i = 0; i < MAX_GROUPS; ++i) 
+
+	for (Int i = 0; i < MAX_GROUPS; ++i)
 	{
 		m_groupNumeralStrings[i] = newDisplayString();
 		m_groupNumeralStrings[i]->setFont(font);
@@ -116,11 +116,11 @@ DisplayString *W3DDisplayStringManager::newDisplayString( void )
 	if( newString == NULL )
 	{
 
-		DEBUG_LOG(( "newDisplayString: Could not allcoate new W3D display string\n" ));
+		DEBUG_LOG(( "newDisplayString: Could not allcoate new W3D display string" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// assign a default font
 	if (TheGlobalLanguageData && TheGlobalLanguageData->m_defaultDisplayStringFont.name.isNotEmpty())
@@ -131,7 +131,7 @@ DisplayString *W3DDisplayStringManager::newDisplayString( void )
 			TheGlobalLanguageData->m_defaultDisplayStringFont.bold) );
 	}
 	else
-		newString->setFont( TheFontLibrary->getFont( AsciiString("Times New Roman"), 12, FALSE ) );
+		newString->setFont( TheFontLibrary->getFont( "Times New Roman", 12, FALSE ) );
 
 	// link string to list
 	link( newString );
@@ -139,7 +139,7 @@ DisplayString *W3DDisplayStringManager::newDisplayString( void )
 	// return our new string
 	return newString;
 
-}  // end newDisplayString
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove a display string from the master list and delete the data */
@@ -150,7 +150,7 @@ void W3DDisplayStringManager::freeDisplayString( DisplayString *string )
 	// sanity
 	if( string == NULL )
 		return;
-			
+
 	// unlink
 	unLink( string );
 
@@ -162,7 +162,7 @@ void W3DDisplayStringManager::freeDisplayString( DisplayString *string )
 	// free data
 	deleteInstance(string);
 
-}  // end freeDisplayString
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update method for our display string Manager ... if it's been too
@@ -177,7 +177,7 @@ void W3DDisplayStringManager::update( void )
 	DisplayStringManager::update();
 
 	W3DDisplayString *string = static_cast<W3DDisplayString *>(m_stringList);
-	
+
 	// if the m_currentCheckpoint is valid, use it for the starting point for the search
 	if (m_currentCheckpoint) {
 		string = static_cast<W3DDisplayString *>(m_currentCheckpoint);
@@ -189,7 +189,7 @@ void W3DDisplayStringManager::update( void )
 																					render resources freed */
 
 	int numStrings = 10;
-	// looping through all the strings eats up a lot of ambient time. Instead, 
+	// looping through all the strings eats up a lot of ambient time. Instead,
 	// loop through 10 (arbitrarily chosen) or till the end is hit.
 	while ( numStrings-- && string)
 	{
@@ -216,24 +216,24 @@ void W3DDisplayStringManager::update( void )
 			// in future cleanup passes of this update routine
 			//
 			string->m_lastResourceFrame = 0;
-			
-		}  // end if
+
+		}
 
 		// move to next string
 		string = static_cast<W3DDisplayString *>(string->next());
 
-	}  // end while
-	
+	}
+
 	// reset the starting point for our next search
 	m_currentCheckpoint = string;
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 DisplayString *W3DDisplayStringManager::getGroupNumeralString( Int numeral )
 {
-	if (numeral < 0 || numeral > MAX_GROUPS - 1 ) 
+	if (numeral < 0 || numeral > MAX_GROUPS - 1 )
 	{
-		DEBUG_CRASH(("Numeral '%d' out of range.\n", numeral));
+		DEBUG_CRASH(("Numeral '%d' out of range.", numeral));
 		return m_groupNumeralStrings[0];
 	}
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDynamicLight.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDynamicLight.cpp
index 04ae23e72b1..bf2de4d67f2 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDynamicLight.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDynamicLight.cpp
@@ -43,13 +43,13 @@ W3DDynamicLight::~W3DDynamicLight(void)
 }
 
 void W3DDynamicLight::On_Frame_Update(void)
-{	
+{
 	if (!m_enabled) {
 		return;
 	}
 	Real factor = 1.0f;
 	if (m_curIncreaseFrameCount>0 && m_increaseFrameCount>0) {
-		// increasing 
+		// increasing
 		m_curIncreaseFrameCount--;
 		factor = (m_increaseFrameCount-m_curIncreaseFrameCount)/(Real)m_increaseFrameCount;
 
@@ -84,4 +84,4 @@ void W3DDynamicLight::setFrameFade(UnsignedInt frameIncreaseTime, UnsignedInt de
 	m_targetAmbient = Ambient;
 	m_targetDiffuse = Diffuse;
 	m_targetRange = FarAttenEnd;
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
index 1050a3e7c91..c0df9dc89db 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
@@ -24,8 +24,8 @@
 
 // FILE: W3DFileSystem.cpp ////////////////////////////////////////////////////////////////////////
 //
-// W3D implementation of a file factory.  This replaces the W3D file factory, 
-// and uses GDI assets, so that 
+// W3D implementation of a file factory.  This replaces the W3D file factory,
+// and uses GDI assets, so that
 // W3D files and targa files are loaded using the GDI file interface.
 // Note - this only servers up read only files.
 //
@@ -40,6 +40,7 @@
 // for now we maintain old legacy files
 // #define MAINTAIN_LEGACY_FILES
 
+#include "Common/ArchiveFile.h"
 #include "Common/Debug.h"
 #include "Common/file.h"
 #include "Common/FileSystem.h"
@@ -47,10 +48,11 @@
 #include "Common/MapObject.h"
 #include "Common/Registry.h"
 #include "W3DDevice/GameClient/W3DFileSystem.h"
-// DEFINES ////////////////////////////////////////////////////////////////////////////////////////
 
 #include <io.h>
 
+// DEFINES ////////////////////////////////////////////////////////////////////////////////////////
+
 //-------------------------------------------------------------------------------------------------
 /** Game file access.  At present this allows us to access test assets, assets from
 	* legacy GDI assets, and the current flat directory access for textures, models etc */
@@ -71,12 +73,12 @@ typedef enum
 GameFileClass::GameFileClass( char const *filename )
 {
 
-	m_fileExists = FALSE;
 	m_theFile = NULL;
-	m_filePath[ 0 ] = 0;
+	m_fileExists = FALSE;
+	m_filePath[0] = 0;
 	m_filename[0] = 0;
 
-	if( filename ) 
+	if( filename )
 		Set_Name( filename );
 
 }
@@ -119,71 +121,57 @@ inline static Bool isImageFileType( GameFileType fileType )
 	return (fileType == FILE_TYPE_TGA || fileType == FILE_TYPE_DDS);
 }
 
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+static GameFileType getFileType( char const *filename )
+{
+	if (char const *extension = strrchr( filename, '.' ))
+	{
+		// test the extension to recognize a few key file types
+		if( stricmp( extension, ".w3d" ) == 0 )
+			return FILE_TYPE_W3D;
+		else if( stricmp( extension, ".tga" ) == 0 )
+			return FILE_TYPE_TGA;
+		else if( stricmp( extension, ".dds" ) == 0 )
+			return FILE_TYPE_DDS;
+	}
+
+	return FILE_TYPE_COMPLETELY_UNKNOWN;  // MBL FILE_TYPE_UNKNOWN change due to compile error
+}
+
 //-------------------------------------------------------------------------------------------------
 /** Sets the file name, and finds the GDI asset if present. */
 //-------------------------------------------------------------------------------------------------
 char const * GameFileClass::Set_Name( char const *filename )
 {
 
-	if( Is_Open() ) 
+	if( Is_Open() )
 		Close();
 
 	// save the filename
-	strncpy( m_filename, filename, _MAX_PATH );
-
-	char name[_MAX_PATH];
-	const Int EXT_LEN = 32;
-	char extension[EXT_LEN];
-	extension[0] = 0;
-	strcpy(name, filename);
-	Int i = strlen(name);
-	i--;
-	Int extLen = 1;
-	while(i>0 && extLen < EXT_LEN) {
-		if (name[i] == '.') {
-			strcpy(extension, name+i);
-			name[i] = 0;
-			break;
-		}
-		i--;
-		extLen++;
-	}
-	Int j = 0;
-	// Strip out spaces.
-	for (i=0; name[i]; i++) {
-		if (name[i] != ' ') {
-			name[j] = name[i];
-			j++;
-		}
-	}
-	name[j] = 0;
+	strlcpy( m_filename, filename, _MAX_PATH );
 
-	// test the extension to recognize a few key file types
-	GameFileType fileType = FILE_TYPE_COMPLETELY_UNKNOWN;  // MBL FILE_TYPE_UNKNOWN change due to compile error
-	if( stricmp( extension, ".w3d" ) == 0 )
-		fileType = FILE_TYPE_W3D;
-	else if( stricmp( extension, ".tga" ) == 0 )
-		fileType = FILE_TYPE_TGA;
-	else if( stricmp( extension, ".dds" ) == 0 )
-		fileType = FILE_TYPE_DDS;
+	GameFileType fileType = getFileType(filename);
 
 	// all .w3d files are in W3D_DIR_PATH, all .tga files are in TGA_DIR_PATH
 	if( fileType == FILE_TYPE_W3D )
 	{
 
+		static_assert(ARRAY_SIZE(m_filePath) >= ARRAY_SIZE(W3D_DIR_PATH), "Incorrect array size");
 		strcpy( m_filePath, W3D_DIR_PATH );
-		strcat( m_filePath, filename );
+		strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-	}  // end if
+	}
 	else if( isImageFileType(fileType) )
 	{
 
+		static_assert(ARRAY_SIZE(m_filePath) >= ARRAY_SIZE(TGA_DIR_PATH), "Incorrect array size");
 		strcpy( m_filePath, TGA_DIR_PATH );
-		strcat( m_filePath, filename );
+		strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-	}  // end else if
+	}
 	else
-		strcpy( m_filePath, filename );
+		strlcpy(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
 	// see if the file exists
 	m_fileExists = TheFileSystem->doesFileExist( m_filePath );
@@ -196,22 +184,24 @@ char const * GameFileClass::Set_Name( char const *filename )
 		if( fileType == FILE_TYPE_W3D )
 		{
 
+			static_assert(ARRAY_SIZE(m_filePath) >= ARRAY_SIZE(LEGACY_W3D_DIR_PATH), "Incorrect array size");
 			strcpy( m_filePath, LEGACY_W3D_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end if
+		}
 		else if( isImageFileType(fileType) )
 		{
 
+			static_assert(ARRAY_SIZE(m_filePath) >= ARRAY_SIZE(LEGACY_TGA_DIR_PATH), "Incorrect array size");
 			strcpy( m_filePath, LEGACY_TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end else if
+		}
 
 		// see if the file exists
 		m_fileExists = TheFileSystem->doesFileExist( m_filePath );
 
-	}  // end if
+	}
 	#endif
 
 	// if file is still not found, try the test art folders
@@ -221,23 +211,25 @@ char const * GameFileClass::Set_Name( char const *filename )
 
 		if( fileType == FILE_TYPE_W3D )
 		{
-			
+
+			static_assert(ARRAY_SIZE(m_filePath) >= ARRAY_SIZE(TEST_W3D_DIR_PATH), "Incorrect array size");
 			strcpy( m_filePath, TEST_W3D_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end if
+		}
 		else if( isImageFileType(fileType) )
 		{
 
+			static_assert(ARRAY_SIZE(m_filePath) >= ARRAY_SIZE(TEST_TGA_DIR_PATH), "Incorrect array size");
 			strcpy( m_filePath, TEST_TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end else if
+		}
 
 		// see if the file exists
 		m_fileExists = TheFileSystem->doesFileExist( m_filePath );
 
-	}  // end if
+	}
 	#endif
 
 	// We allow the user to load their own images for various assets (like the control bar)
@@ -246,39 +238,36 @@ char const * GameFileClass::Set_Name( char const *filename )
 		if( fileType == FILE_TYPE_W3D )
 		{
 			sprintf(m_filePath,USER_W3D_DIR_PATH, TheGlobalData->getPath_UserData().str());
-			//strcpy( m_filePath, USER_W3D_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end if
-		if( isImageFileType(fileType) )
+		}
+		else if( isImageFileType(fileType) )
 		{
 			sprintf(m_filePath,USER_TGA_DIR_PATH, TheGlobalData->getPath_UserData().str());
-			//strcpy( m_filePath, USER_TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end else if
+		}
 
 		// see if the file exists
 		m_fileExists = TheFileSystem->doesFileExist( m_filePath );
 
-	}  // end if
+	}
 
 
-	// We Need to be able to "temporarily copy over the map preview for whichever directory it came from
+	// We need to be able to temporarily copy over the map preview for whichever directory it came from
 	if( m_fileExists == FALSE  && TheGlobalData)
 	{
-		if( fileType == FILE_TYPE_TGA ) // just TGA, since we don't dds previews
+		if( fileType == FILE_TYPE_TGA ) // just TGA, since we don't do dds previews
 		{
 			sprintf(m_filePath,MAP_PREVIEW_DIR_PATH, TheGlobalData->getPath_UserData().str());
-			//strcpy( m_filePath, USER_TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end else if
+		}
 
 		// see if the file exists
 		m_fileExists = TheFileSystem->doesFileExist( m_filePath );
 
-	}  // end if
+	}
 
 	// We need to be able to grab images from a localization dir, because Art has a fetish for baked-in text.  Munkee.
 	if( m_fileExists == FALSE )
@@ -287,14 +276,14 @@ char const * GameFileClass::Set_Name( char const *filename )
 		{
 			static const char *localizedPathFormat = "Data/%s/Art/Textures/";
 			sprintf(m_filePath,localizedPathFormat, GetRegistryLanguage().str());
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end else if
+		}
 
 		// see if the file exists
 		m_fileExists = TheFileSystem->doesFileExist( m_filePath );
 
-	}  // end if
+	}
 
 
 
@@ -305,7 +294,7 @@ char const * GameFileClass::Set_Name( char const *filename )
 //-------------------------------------------------------------------------------------------------
 /** If we found a gdi asset, the file is available. */
 //-------------------------------------------------------------------------------------------------
-bool GameFileClass::Is_Available( int forced ) 
+bool GameFileClass::Is_Available( int forced )
 {
 
 	// not maintaining any GDF compatibility, all files should be where the m_filePath says
@@ -324,7 +313,7 @@ bool GameFileClass::Is_Open(void) const
 //-------------------------------------------------------------------------------------------------
 /** Open the named file. */
 //-------------------------------------------------------------------------------------------------
-int  GameFileClass::Open(char const *filename, int rights) 
+int  GameFileClass::Open(char const *filename, int rights)
 {
 	Set_Name(filename);
 	if (Is_Available(false)) {
@@ -336,24 +325,22 @@ int  GameFileClass::Open(char const *filename, int rights)
 //-------------------------------------------------------------------------------------------------
 /** Open the file using the current file name. */
 //-------------------------------------------------------------------------------------------------
-int  GameFileClass::Open(int rights) 
+int  GameFileClass::Open(int rights)
 {
-	if( rights != READ ) 
+	if( rights != READ )
 	{
 		return(false);
 	}
 
-	// just open up the file in m_filePath
 	m_theFile = TheFileSystem->openFile( m_filePath, File::READ | File::BINARY );
 
 	return (m_theFile != NULL);
-
 }
 
 //-------------------------------------------------------------------------------------------------
 /** Read. */
 //-------------------------------------------------------------------------------------------------
-int GameFileClass::Read(void *buffer, int len) 
+int GameFileClass::Read(void *buffer, int len)
 {
 	if (m_theFile) {
 		return m_theFile->read(buffer, len);
@@ -364,7 +351,7 @@ int GameFileClass::Read(void *buffer, int len)
 //-------------------------------------------------------------------------------------------------
 /** Seek. */
 //-------------------------------------------------------------------------------------------------
-int GameFileClass::Seek(int pos, int dir) 
+int GameFileClass::Seek(int pos, int dir)
 {
 	File::seekMode mode = File::CURRENT;
 	switch (dir) {
@@ -382,7 +369,7 @@ int GameFileClass::Seek(int pos, int dir)
 //-------------------------------------------------------------------------------------------------
 /** Size. */
 //-------------------------------------------------------------------------------------------------
-int GameFileClass::Size(void) 
+int GameFileClass::Size(void)
 {
 	if (m_theFile) {
 		return m_theFile->size();
@@ -393,7 +380,7 @@ int GameFileClass::Size(void)
 //-------------------------------------------------------------------------------------------------
 /** Write. */
 //-------------------------------------------------------------------------------------------------
-int GameFileClass::Write(void const *buffer, Int len) 
+int GameFileClass::Write(void const *buffer, Int len)
 {
 #ifdef RTS_DEBUG
 #endif
@@ -403,7 +390,7 @@ int GameFileClass::Write(void const *buffer, Int len)
 //-------------------------------------------------------------------------------------------------
 /** Close. */
 //-------------------------------------------------------------------------------------------------
-void GameFileClass::Close(void) 
+void GameFileClass::Close(void)
 {
 	if (m_theFile) {
 		m_theFile->close();
@@ -418,12 +405,16 @@ void GameFileClass::Close(void)
 extern W3DFileSystem *TheW3DFileSystem = NULL;
 
 //-------------------------------------------------------------------------------------------------
-/** Constructor.  Creating an instance of this class overrices the default 
+/** Constructor.  Creating an instance of this class overrides the default
 W3D file factory.  */
 //-------------------------------------------------------------------------------------------------
 W3DFileSystem::W3DFileSystem(void)
 {
 	_TheFileFactory = this; // override the w3d file factory.
+
+#if RTS_ZEROHOUR && PRIORITIZE_TEXTURES_BY_SIZE
+	reprioritizeTexturesBySize();
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -451,3 +442,79 @@ void W3DFileSystem::Return_File( FileClass *file )
 	delete file;
 }
 
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DFileSystem::reprioritizeTexturesBySize()
+{
+	ArchivedDirectoryInfo* dirInfo = TheArchiveFileSystem->friend_getArchivedDirectoryInfo(TGA_DIR_PATH);
+	if (dirInfo != NULL)
+	{
+		reprioritizeTexturesBySize(*dirInfo);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+// TheSuperHackers @info This function moves the largest texture of its name to the front of the
+// directory info. The algorithm only prioritizes the first item in the multimap, because this is
+// what we currently need:
+// Before: A(256kb) B(128kb) C(512kb)
+// After:  C(512kb) B(128kb) A(256kb)
+//
+// Catered to specific game archives only. This ensures that user created archives are not included
+// for the re-prioritization of textures.
+//-------------------------------------------------------------------------------------------------
+void W3DFileSystem::reprioritizeTexturesBySize(ArchivedDirectoryInfo& dirInfo)
+{
+	const char* const superiorArchive = "Textures.big";
+	const char* const inferiorArchive = "TexturesZH.big";
+
+	ArchivedFileLocationMap::iterator it0;
+	ArchivedFileLocationMap::iterator it1 = dirInfo.m_files.begin();
+	ArchivedFileLocationMap::iterator end = dirInfo.m_files.end();
+
+	if (it1 != end)
+	{
+		it0 = it1;
+		++it1;
+	}
+
+	for (; it1 != end; ++it1)
+	{
+		const AsciiString& file0 = it0->first;
+		const AsciiString& file1 = it1->first;
+
+		if (file0 == file1)
+		{
+			GameFileType type = getFileType(file0.str());
+			if (isImageFileType(type))
+			{
+				ArchiveFile* archive0 = it0->second;
+				ArchiveFile* archive1 = it1->second;
+				FileInfo info0;
+				FileInfo info1;
+				AsciiString filepath(dirInfo.m_path);
+				filepath.concat(file0);
+
+				if (archive0->getFileInfo(filepath, &info0) && archive1->getFileInfo(filepath, &info1))
+				{
+					if (info0.size() < info1.size()
+						&& archive0->getName().endsWithNoCase(inferiorArchive)
+						&& archive1->getName().endsWithNoCase(superiorArchive))
+					{
+						std::swap(it0->second, it1->second);
+
+#if ENABLE_FILESYSTEM_LOGGING
+						DEBUG_LOG(("W3DFileSystem::reprioritizeTexturesBySize - prioritize %s(%ukb) from %s over %s(%ukb) from %s",
+							file1.str(), UnsignedInt(info1.size() / 1024), archive1->getName().str(),
+							file0.str(), UnsignedInt(info0.size() / 1024), archive0->getName().str()));
+#endif
+					}
+				}
+			}
+		}
+		else
+		{
+			it0 = it1;
+		}
+	}
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DGameClient.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DGameClient.cpp
index d2039f40193..11f6372e141 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DGameClient.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DGameClient.cpp
@@ -64,14 +64,14 @@
 W3DGameClient::W3DGameClient()
 {
 
-}  // end W3DGameClient
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DGameClient::~W3DGameClient()
 {
 
-}  // end ~W3DGameClient
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize resources for the w3d game client */
@@ -82,7 +82,7 @@ void W3DGameClient::init( void )
 	// extending initialization routine
 	GameClient::init();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Per frame udpate, note we are extending functionality */
@@ -93,7 +93,7 @@ void W3DGameClient::update( void )
 	// call base
 	GameClient::update();
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset this device client system.  Note we are extending reset functionality from
@@ -105,7 +105,7 @@ void W3DGameClient::reset( void )
 	// call base class
 	GameClient::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** allocate a new drawable using the thing template for initialization.
@@ -115,14 +115,14 @@ void W3DGameClient::reset( void )
 	* in the GameLogic and GameClient themselves */
 //-------------------------------------------------------------------------------------------------
 Drawable *W3DGameClient::friend_createDrawable( const ThingTemplate *tmplate,
-																								DrawableStatus statusBits )
+																								DrawableStatusBits statusBits )
 {
 	Drawable *draw = NULL;
 
 	// sanity
 	if( tmplate == NULL )
 		return NULL;
-	
+
 	draw = newInstance(Drawable)( tmplate, statusBits );
 
 	return draw;
@@ -133,7 +133,7 @@ Drawable *W3DGameClient::friend_createDrawable( const ThingTemplate *tmplate,
 //-------------------------------------------------------------------------------------------------
 void W3DGameClient::addScorch(const Coord3D *pos, Real radius, Scorches type)
 {
-	if (TheTerrainRenderObject) 
+	if (TheTerrainRenderObject)
 	{
 		Vector3 loc(pos->x, pos->y, pos->z);
 		TheTerrainRenderObject->addScorch(loc, radius, type);
@@ -143,8 +143,8 @@ void W3DGameClient::addScorch(const Coord3D *pos, Real radius, Scorches type)
 //-------------------------------------------------------------------------------------------------
 /** create an effect that requires a start and end location */
 //-------------------------------------------------------------------------------------------------
-void W3DGameClient::createRayEffectByTemplate( const Coord3D *start, 
-																		 const Coord3D *end, 
+void W3DGameClient::createRayEffectByTemplate( const Coord3D *start,
+																		 const Coord3D *end,
 																		 const ThingTemplate* tmpl )
 {
 	Drawable *draw = TheThingFactory->newDrawable(tmpl);
@@ -161,10 +161,10 @@ void W3DGameClient::createRayEffectByTemplate( const Coord3D *start,
 
 		// add this ray effect to the list of ray effects
 		TheRayEffects->addRayEffect( draw, start, end );
-			
-	}  // end if
 
-}  // end createRayEffectByTemplate
+	}
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /**  Tell all the drawables what time of day it is now */
@@ -183,7 +183,7 @@ void W3DGameClient::setTimeOfDay( TimeOfDay tod )
 	//tell the display to update its lighting
 	TheDisplay->setTimeOfDay( tod );
 
-}  // end setTimeOfDay
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -193,32 +193,19 @@ void W3DGameClient::setTeamColor(Int red, Int green, Int blue)
 
 	W3DStatusCircle::setColor(red, green, blue);
 
-}  // end setTeamColor
+}
 
 //-------------------------------------------------------------------------------------------------
-/** temporary entry point for adjusting LOD for development testing. */
 //-------------------------------------------------------------------------------------------------
-void W3DGameClient::adjustLOD( Int adj ) 
+void W3DGameClient::setTextureLOD( Int level )
 {
-	if (TheGlobalData == NULL) 
-		return;
-
-	TheWritableGlobalData->m_textureReductionFactor += adj;
-
-	if (TheWritableGlobalData->m_textureReductionFactor > 4)
-		TheWritableGlobalData->m_textureReductionFactor = 4;	//16x less resolution is probably enough.
-	if (TheWritableGlobalData->m_textureReductionFactor < 0)
-		TheWritableGlobalData->m_textureReductionFactor = 0;
+	if (WW3D::Get_Texture_Reduction() != level)
+	{
+		WW3D::Set_Texture_Reduction(level, 6);
 
-	if (WW3D::Get_Texture_Reduction() != TheWritableGlobalData->m_textureReductionFactor)
-	{	WW3D::Set_Texture_Reduction(TheWritableGlobalData->m_textureReductionFactor,6);
-		TheGameLODManager->setCurrentTextureReduction(TheWritableGlobalData->m_textureReductionFactor);
+		//I commented this out because we're no longer using terrain LOD.  So I
+		//stole this function and keys to adjust the texture resolution instead. -MW
+		//if( TheTerrainRenderObject )
+		//	TheTerrainRenderObject->setTextureLOD(level);
 	}
-
-//I commented this out because we're no longer using terrain LOD.  So I
-//stole this function and keys to adjust the texture resolution instead. -MW
-
-//	if( TheTerrainRenderObject ) 
-//		TheTerrainRenderObject->adjustTerrainLOD( adj );
-
-}  // end adjustLOD
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp
index 99090e4b40b..816d96ec8c2 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp
@@ -50,13 +50,8 @@
 #include "WW3D2/ww3d.h"
 #include "WW3D2/hanim.h"
 
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.		 
+#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 #ifdef RTS_DEBUG
@@ -65,7 +60,7 @@
 #include "WW3D2/dx8vertexbuffer.h"
 #include "WW3D2/vertmaterial.h"
 class DebugHintObject : public RenderObjClass
-{	
+{
 
 public:
 
@@ -124,7 +119,7 @@ DebugHintObject::DebugHintObject(void) :
 
 Bool DebugHintObject::Cast_Ray(RayCollisionTestClass & raytest)
 {
-	return false;	
+	return false;
 }
 
 DebugHintObject::DebugHintObject(const DebugHintObject & src)
@@ -174,7 +169,7 @@ void DebugHintObject::freeMapResources(void)
 //Allocate a heightmap of x by y vertices.
 //data must be an array matching this size.
 void DebugHintObject::initData(void)
-{	
+{
 	freeMapResources();	//free old data and ib/vb
 
 	m_indexBuffer = NEW_REF(DX8IndexBufferClass,(3));
@@ -194,7 +189,7 @@ void DebugHintObject::initData(void)
 	m_vertexMaterialClass = VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 
 	//use a multi-texture shader: (text1*diffuse)*text2.
-	m_shaderClass = ShaderClass::ShaderClass(SC_ALPHA);
+	m_shaderClass = ShaderClass(SC_ALPHA);
 }
 
 void DebugHintObject::setLocAndColorAndSize(const Coord3D *loc, Int argb, Int size)
@@ -203,7 +198,7 @@ void DebugHintObject::setLocAndColorAndSize(const Coord3D *loc, Int argb, Int si
 	m_myColor = argb;
 	m_mySize = size;
 
-	if (m_myLoc.z < 0 && TheTerrainRenderObject) 
+	if (m_myLoc.z < 0 && TheTerrainRenderObject)
 	{
 		m_myLoc.z = TheTerrainRenderObject->getHeightMapHeight(m_myLoc.x, m_myLoc.y, NULL);
 	}
@@ -215,7 +210,7 @@ void DebugHintObject::setLocAndColorAndSize(const Coord3D *loc, Int argb, Int si
 
 		Real x1 = m_mySize * 0.866;	// cos(30)
 		Real y1 = m_mySize * 0.5;		// sin(30)
-		
+
 		// note, pts must go in a counterclockwise order!
 		vb[0].x = 0;
 		vb[0].y = m_mySize;
@@ -242,8 +237,8 @@ void DebugHintObject::setLocAndColorAndSize(const Coord3D *loc, Int argb, Int si
 
 void DebugHintObject::Render(RenderInfoClass & rinfo)
 {
-	SphereClass bounds(Vector3(m_myLoc.x, m_myLoc.y, m_myLoc.z), m_mySize); 
-	if (!rinfo.Camera.Cull_Sphere(bounds)) 
+	SphereClass bounds(Vector3(m_myLoc.x, m_myLoc.y, m_myLoc.z), m_mySize);
+	if (!rinfo.Camera.Cull_Sphere(bounds))
 	{
 		DX8Wrapper::Set_Material(m_vertexMaterialClass);
 		DX8Wrapper::Set_Shader(m_shaderClass);
@@ -278,12 +273,12 @@ W3DInGameUI::W3DInGameUI()
 		m_moveHintRenderObj[ i ] = NULL;
 		m_moveHintAnim[ i ] = NULL;
 
-	}  // end for i
+	}
 
 	m_buildingPlacementAnchor = NULL;
 	m_buildingPlacementArrow = NULL;
 
-}  // end W3DInGameUI
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -298,12 +293,12 @@ W3DInGameUI::~W3DInGameUI()
 		REF_PTR_RELEASE( m_moveHintRenderObj[ i ] );
 		REF_PTR_RELEASE( m_moveHintAnim[ i ] );
 
-	}  // end for i
+	}
 
 	REF_PTR_RELEASE( m_buildingPlacementAnchor );
 	REF_PTR_RELEASE( m_buildingPlacementArrow );
 
-}  // end ~W3DInGameUI
+}
 
 // loadText ===================================================================
 /** Load text from the file */
@@ -329,14 +324,14 @@ static void loadText( char *filename, GameWindow *listboxText )
 		line.translate(buffer);
 		line.trim();
 		if (line.isEmpty())
-			line = UnicodeString(L" ");
+			line = L" ";
 		GadgetListBoxAddEntryText(listboxText, line, color, -1, -1);
-	}  // end while
+	}
 
 	// close the file
 	fclose( fp );
 
-}  // end loadText
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -349,21 +344,21 @@ void W3DInGameUI::init( void )
 	// comment because we'll probably want to add this back in.
 /*
 		// create the MOTD
-		GameWindow *motd = TheWindowManager->winCreateFromScript( AsciiString("MOTD.wnd") );
+		GameWindow *motd = TheWindowManager->winCreateFromScript( "MOTD.wnd" );
 		if( motd )
 		{
 			NameKeyType listboxTextID = TheNameKeyGenerator->nameToKey( "MOTD.wnd:ListboxMOTD" );
 			GameWindow *listboxText = TheWindowManager->winGetWindowFromId(motd, listboxTextID);
-	
+
 			loadText( "HelpScreen.txt", listboxText );
-	
+
 			// hide it for now
 			motd->winHide( TRUE );
-	
-		}  // end if*/
-	
-		
-}  // end init
+
+		}
+*/
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update in game UI */
@@ -374,7 +369,7 @@ void W3DInGameUI::update( void )
 	// call base
 	InGameUI::update();
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the in game ui */
@@ -385,7 +380,7 @@ void W3DInGameUI::reset( void )
 	// call base
 	InGameUI::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw member for the W3D implemenation of the game user interface */
@@ -418,9 +413,9 @@ void W3DInGameUI::draw( void )
 			// draw placement angle selection if needed
 			drawPlaceAngle( view );
 
-		}  // end for view
+		}
 
-	}  // end if
+	}
 
 	// repaint all our windows
 
@@ -428,7 +423,7 @@ void W3DInGameUI::draw( void )
 	if (!DX8Wrapper::stats.m_disableConsole) {
 #endif
 
-#ifdef DO_UNIT_TIMINGS	 
+#ifdef DO_UNIT_TIMINGS
 #pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
 	extern Bool g_UT_startTiming;
 	if (!g_UT_startTiming)
@@ -437,12 +432,14 @@ void W3DInGameUI::draw( void )
 	postDraw();
 
 	TheWindowManager->winRepaint();
-	
+
+	postWindowDraw();
+
 #ifdef EXTENDED_STATS
 	}
 #endif
 
-}  // end draw
+}
 
 //-------------------------------------------------------------------------------------------------
 /** draw 2d selection region on screen */
@@ -459,7 +456,7 @@ void W3DInGameUI::drawSelectionRegion( void )
 														width,
 														color );
 
-}  // end drawSelectionRegion
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw the visual feedback for clicking in the world and telling units
@@ -496,7 +493,7 @@ void W3DInGameUI::drawMoveHints( View *view )
 				AsciiString animName;
 				animName.format("%s.%s", TheGlobalData->m_moveHintName.str(), TheGlobalData->m_moveHintName.str());
 				anim = W3DDisplay::m_assetManager->Get_HAnim(animName.str());
-	
+
 				// sanity
 				if( hint == NULL )
 				{
@@ -504,17 +501,17 @@ void W3DInGameUI::drawMoveHints( View *view )
 					DEBUG_CRASH(("unable to create hint"));
 					return;
 
-				}  // end if
+				}
 
 				// asign render objects to GUI data
 				m_moveHintRenderObj[ i ] = hint;
-				
+
 				// note that 'anim' is returned from Get_HAnim with an AddRef, so we don't need to addref it again.
 				// however, we do need to release the contents of moveHintAnim (if any)
 				REF_PTR_RELEASE(m_moveHintAnim[i]);
 				m_moveHintAnim[i] = anim;
-								
-			}  // end if, create render objects
+
+			}
 
 			// show the render object if hidden
 			if( m_moveHintRenderObj[ i ]->Is_Hidden() == 1 ) {
@@ -528,9 +525,9 @@ void W3DInGameUI::drawMoveHints( View *view )
 			// move this hint render object to the position and align with terrain
 			Matrix3D transform;
 			PathfindLayerEnum layer = TheTerrainLogic->alignOnTerrain( 0, m_moveHint[ i ].pos, true, transform );
-			
+
 			Real waterZ;
-			if (layer == LAYER_GROUND && TheTerrainLogic->isUnderwater(m_moveHint[ i ].pos.x, m_moveHint[ i ].pos.y, &waterZ)) 
+			if (layer == LAYER_GROUND && TheTerrainLogic->isUnderwater(m_moveHint[ i ].pos.x, m_moveHint[ i ].pos.y, &waterZ))
 			{
 				Coord3D tmp = m_moveHint[ i ].pos;
 				tmp.z = waterZ;
@@ -563,8 +560,8 @@ void W3DInGameUI::drawMoveHints( View *view )
 					// draw the line
 					TheDisplay->drawLine( start.x, start.y, end.x, end.y, width, color );
 
-				}  // end if
-			}  // end if
+				}
+			}
 #endif
 
 		}
@@ -578,11 +575,11 @@ void W3DInGameUI::drawMoveHints( View *view )
 					W3DDisplay::m_3DScene->Remove_Render_Object( m_moveHintRenderObj[ i ] );
 				}
 
-		}  // end else
+		}
 
-	}  // end for i
+	}
 
-}  // end drawMoveHints
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw visual back for clicking to attack a unit in the world */
@@ -590,7 +587,7 @@ void W3DInGameUI::drawMoveHints( View *view )
 void W3DInGameUI::drawAttackHints( View *view )
 {
 
-}  // end drawAttackHints
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw the angle selection for placing building if needed */
@@ -697,7 +694,7 @@ void W3DInGameUI::drawPlaceAngle( View *view )
 			m_buildingPlacementArrow->Set_Transform( *m_placeIcon[ 0 ]->getTransformMatrix() );
 	}
 
-	
+
 	//m_buildingPlacementArrow->Set_Transform(
 
 	// draw a little box at the start to show the "anchor" point
@@ -732,5 +729,5 @@ void W3DInGameUI::drawPlaceAngle( View *view )
 	//start.y = o.y * size + p.y * (size/2.0f) + end.y;
 	//TheDisplay->drawLine( start.x, start.y, end.x, end.y, width, color );
 
-}  // end drawPlaceAngle
+}
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp
index b5249abaf72..260558f8cb6 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp
@@ -47,11 +47,6 @@
 #include "mutex.h"
 #include "thread.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //Since there can't be more than 1 mouse, might as well keep these static.
 static CriticalSectionClass mutex;
@@ -77,7 +72,7 @@ void MouseThreadClass::Thread_Function()
 
 	//poll mouse and update position
 
-	while (running) 
+	while (running)
 	{
 		isThread=TRUE;
 		if (TheMouse)
@@ -109,7 +104,7 @@ W3DMouse::W3DMouse( void )
 	m_camera = NULL;
 	m_drawing = FALSE;
 
-}  // end Win32Mouse
+}
 
 W3DMouse::~W3DMouse( void )
 {
@@ -126,7 +121,7 @@ W3DMouse::~W3DMouse( void )
 
 	thread.Stop();
 
-}  // end Win32Mouse
+}
 
 void W3DMouse::initPolygonAssets(void)
 {
@@ -184,7 +179,7 @@ Bool W3DMouse::loadD3DCursorTextures(MouseCursor cursor)
 
 	if (!animFrames)
 		return FALSE;	//no animation frames defined.
-	
+
 	const char *baseName=m_cursorInfo[cursor].textureName.str();
 	char FrameName[64];
 
@@ -231,7 +226,7 @@ void W3DMouse::initD3DAssets(void)
 	if (m_currentRedrawMode == RM_DX8 && cursorTextures[1] == NULL && am)
 	{
 		for (Int i=0; i<NUM_MOUSE_CURSORS; i++)
-		{	
+		{
 			for (Int j=0; j < MAX_2D_CURSOR_ANIM_FRAMES; j++)
 			{
 				cursorTextures[i][j]=NULL;//am->Get_Texture(m_cursorInfo[i].textureName.str());
@@ -308,7 +303,7 @@ void W3DMouse::initW3DAssets(void)
 	m_camera->Set_Position( Vector3( 0, 1, 1 ) );
 	Vector2 min = Vector2( -1, -1 );
 	Vector2 max = Vector2( +1, +1 );
-	m_camera->Set_View_Plane( min, max );		
+	m_camera->Set_View_Plane( min, max );
 	m_camera->Set_Clip_Planes( 0.995f, 20.0f );
 	if (m_orthoCamera)
 		m_camera->Set_Projection_Type( CameraClass::ORTHO );
@@ -347,8 +342,8 @@ void W3DMouse::init( void )
 	if (m_currentRedrawMode == RM_DX8)
 		thread.Execute();
 	thread.Set_Priority(0);
-	
-}  // end int
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -359,7 +354,7 @@ void W3DMouse::reset( void )
 	// extend
 	Win32Mouse::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Super basic simplistic cursor */
@@ -382,7 +377,7 @@ void W3DMouse::setCursor( MouseCursor cursor )
 		return;
 	}
 
-	// extend 
+	// extend
 	Mouse::setCursor( cursor );
 
 	// if we're already on this cursor ignore the rest of code to stop cursor flickering.
@@ -406,7 +401,7 @@ void W3DMouse::setCursor( MouseCursor cursor )
 					//Since this type of cursor is updated from a non-D3D thread, we need
 					//to preallocate all surfaces in main thread.
 					loadD3DCursorTextures(cursor);
-				}	
+				}
 			}
 			if (m_currentD3DSurface[0])
 				doImageChange=TRUE;
@@ -473,7 +468,7 @@ void W3DMouse::setCursor( MouseCursor cursor )
 	// save current cursor
 	m_currentCursor = cursor;
 
-}  // end setCursor
+}
 
 extern HWND ApplicationHWnd;
 
@@ -519,7 +514,7 @@ void W3DMouse::draw(void)
 		}
 	}
 	else if (m_currentRedrawMode == RM_POLYGON)
-	{	
+	{
 		const Image *image=cursorImages[m_currentPolygonCursor];
 		if (image)
 		{
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DParticleSys.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DParticleSys.cpp
index 8e27a31eff6..f71bccd308b 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DParticleSys.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DParticleSys.cpp
@@ -33,7 +33,7 @@
 #include "W3DDevice/GameClient/HeightMap.h"
 #include "WW3D2/camera.h"
 
-//------------------------------------------------------------------------------ Performance Timers 
+//------------------------------------------------------------------------------ Performance Timers
 //#include "Common/PerfMetrics.h"
 //#include "Common/PerfTimer.h"
 
@@ -55,7 +55,7 @@ W3DParticleSystemManager::W3DParticleSystemManager()
 	m_pointGroup = NEW PointGroupClass();
 	//m_streakLine = NULL;
 	m_streakLine = NEW StreakLineClass();
-	
+
 	m_posBuffer = NEW_REF( ShareBufferClass<Vector3>, (MAX_POINTS_PER_GROUP, "W3DParticleSystemManager::m_posBuffer") );
 	m_RGBABuffer = NEW_REF( ShareBufferClass<Vector4>, (MAX_POINTS_PER_GROUP, "W3DParticleSystemManager::m_RGBABuffer") );
 	m_sizeBuffer = NEW_REF( ShareBufferClass<float>, (MAX_POINTS_PER_GROUP, "W3DParticleSystemManager::m_sizeBuffer") );
@@ -182,10 +182,10 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 				continue;
 
 			m_fieldParticleCount += ( sys->getPriority() == AREA_EFFECT && sys->m_isGroundAligned != FALSE );
-			
+
 			//@todo lorenzen sez: use pointer arithmetic for these arrays
 			personalities[count] = p->getPersonality();
-			
+
 			posArray[count].X = pos->x;
 			posArray[count].Y = pos->y;
 			posArray[count].Z = pos->z;
@@ -197,9 +197,9 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 			RGBAArray[count].Y = color->green;
 			RGBAArray[count].Z = color->blue;
 			RGBAArray[count].W = p->getAlpha();
-		
+
 			angleArray[count] = (uint8)(p->getAngle() * 255.0f / (2.0f * PI));
-			
+
 			if (++count == MAX_POINTS_PER_GROUP)
 				break;
 		}
@@ -208,8 +208,8 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 			continue;	//this system has no particles to render
 
 		TextureClass *texture = W3DDisplay::m_assetManager->Get_Texture( sys->getParticleTypeName().str() );
-		
-		if ( m_streakLine && sys->isUsingStreak() && (count >= 2) ) 
+
+		if ( m_streakLine && sys->isUsingStreak() && (count >= 2) )
 		{
 			m_streakLine->Reset_Line();
 
@@ -230,9 +230,9 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 					m_streakLine->Set_Shader( ShaderClass::_PresetMultiplicativeSpriteShader );
 					break;
 			}
-			
+
 			//UPDATE THE STREAK'S ARRAYS
-			m_streakLine->Set_LocsWidthsColors( 
+			m_streakLine->Set_LocsWidthsColors(
 				count,
 				m_posBuffer->Get_Array(),
 				m_sizeBuffer->Get_Array(),
@@ -251,9 +251,9 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 
 			//RENDER STREAK!
 			m_streakLine->Render( rinfo );
-			
+
 		}
-		else 
+		else
 		{
 
 			WWASSERT( m_pointGroup );
@@ -297,7 +297,7 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 				}
 				else
 					m_pointGroup->Render( rinfo );
-		
+
 			}
 		}
 
@@ -324,7 +324,7 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 	*/
 
 
-	}// next system
+	}
 
 		/// @todo lorenzen sez: this should be debug only:
 	TheParticleSystemManager->setOnScreenParticleCount(m_onScreenParticleCount);
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPoly.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPoly.cpp
index f409b827316..965d70ac5ea 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPoly.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPoly.cpp
@@ -61,18 +61,18 @@ void ClipPolyClass::Clip(const PlaneClass & plane,ClipPolyClass & dest) const
 
 	// perform clipping
 	prev_point_in_front = !plane.In_Front(Verts[iprev]);		// Note, plane normal is outward so we invert this test
-	for (Int j=0; j<vcount; j++) { 
-		
+	for (Int j=0; j<vcount; j++) {
+
 		cur_point_in_front = !plane.In_Front(Verts[i]);			// Note, plane nomral is out so we invert this test
 		if (prev_point_in_front) {
 
 			if (cur_point_in_front) {
-			
+
 				// Previous vertex was in front of plane and this vertex is in
 				// front of the plane so we emit this vertex.
 				dest.Add_Vertex(Verts[i]);
 
-			} else { 
+			} else {
 
 				// Previous vert was in front, this vert is behind, compute
 				// the intersection and emit the point.
@@ -93,13 +93,13 @@ void ClipPolyClass::Clip(const PlaneClass & plane,ClipPolyClass & dest) const
 				Vector3::Lerp(Verts[iprev],Verts[i],alpha,&int_point);
 				dest.Add_Vertex(int_point);
 				dest.Add_Vertex(Verts[i]);
-			
-			} 
-		} 
+
+			}
+		}
 
 		prev_point_in_front = cur_point_in_front;
 		iprev = i;
-		
+
 		//i = (i+1)%(Verts.Count());
 		i++;
 		if (i>=vcount) {
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
index 86e61d7253a..b8d8db3d90c 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DRoadBuffer.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,12 +43,10 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/W3DRoadBuffer.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include "Common/GlobalData.h"
@@ -70,14 +68,9 @@
 
 static const Real TEE_WIDTH_ADJUSTMENT = 1.03f;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 
 // A W3D shader that does alpha, texturing, tests zbuffer, doesn't update zbuffer.
@@ -105,7 +98,7 @@ static const Real CORNER_RADIUS = 1.5f;
 static const Real TIGHT_CORNER_RADIUS = 0.5f;
 /*
 
-// ShaderClass::PASS_ALWAYS, 
+// ShaderClass::PASS_ALWAYS,
 
 #define SC_ALPHA_2D ( SHADE_CNST(PASS_ALWAYS, DEPTH_WRITE_DISABLE, COLOR_WRITE_ENABLE, \
 	SRCBLEND_SRC_ALPHA, DSTBLEND_ONE_MINUS_SRC_ALPHA, FOG_DISABLE, GRADIENT_DISABLE, \
@@ -115,7 +108,7 @@ ShaderClass ShaderClass::_PresetAlpha2DShader(SC_ALPHA_2D);
 */
 
 /** Calculate the sign of the cross product.  If the tails of the vectors are both placed
-at 0,0, then the cross product can be interpreted as -1 means v2 is to the right of v1, 
+at 0,0, then the cross product can be interpreted as -1 means v2 is to the right of v1,
 1 means v2 is to the left of v1, and 0 means v2 is parallel to v1. */
 
 static Int xpSign(const Vector2 &v1, const Vector2 &v2) {
@@ -126,7 +119,7 @@ static Int xpSign(const Vector2 &v1, const Vector2 &v2) {
 }
 
 //-----------------------------------------------------------------------------
-//         Private Class                                               
+//         Private Class
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -178,7 +171,7 @@ void RoadType::loadTexture(AsciiString path, Int ID)
 	/// @todo - delay loading textures and only load textures referenced by map.
 	WW3DAssetManager *pMgr = W3DAssetManager::Get_Instance();
 
-	m_roadTexture = pMgr->Get_Texture(path.str(), MIP_LEVELS_3); 
+	m_roadTexture = pMgr->Get_Texture(path.str(), MIP_LEVELS_3);
 
 	m_roadTexture->Get_Filter().Set_Mip_Mapping( TextureFilterClass::FILTER_TYPE_BEST );
 
@@ -236,14 +229,11 @@ RoadSegment::RoadSegment(void)
 RoadSegment::~RoadSegment(void)
 {
 	m_numVertex = 0;
-	if (m_vb) {
-		delete[] m_vb;
-	}
-	m_vb= NULL;
+	delete[] m_vb;
+	m_vb = NULL;
+
 	m_numIndex = 0;
-	if (m_ib) {
-		delete[] m_ib;
-	}
+	delete[] m_ib;
 	m_ib = NULL;
 }
 
@@ -256,15 +246,18 @@ RoadSegment::~RoadSegment(void)
 //=============================================================================
 void RoadSegment::SetVertexBuffer(VertexFormatXYZDUV1 *vb, Int numVertex)
 {
-	if (m_vb) {
-		delete[] m_vb;
-		m_vb = NULL;
-		m_numVertex = 0;
-	}
+	delete[] m_vb;
+	m_vb = NULL;
+	m_numVertex = 0;
+
 	Vector3 verts[MAX_SEG_VERTEX];
-	if (numVertex<1 || numVertex > MAX_SEG_VERTEX) return;
+	if (numVertex<1 || numVertex > MAX_SEG_VERTEX)
+		return;
+
 	m_vb = NEW VertexFormatXYZDUV1[numVertex];	// pool[]ify
-	if (!m_vb) return;
+	if (!m_vb)
+		return;
+
 	m_numVertex = numVertex;
 	memcpy(m_vb, vb, numVertex*sizeof(VertexFormatXYZDUV1));
 	Int i;
@@ -284,14 +277,17 @@ void RoadSegment::SetVertexBuffer(VertexFormatXYZDUV1 *vb, Int numVertex)
 //=============================================================================
 void RoadSegment::SetIndexBuffer(UnsignedShort *ib, Int numIndex)
 {
-	if (m_ib) {
-		delete[] m_ib;
-		m_ib = NULL;
-		m_numIndex = 0;
-	}
-	if (numIndex < 1 || numIndex > MAX_SEG_INDEX) return;
+	delete[] m_ib;
+	m_ib = NULL;
+	m_numIndex = 0;
+
+	if (numIndex < 1 || numIndex > MAX_SEG_INDEX)
+		return;
+
 	m_ib = NEW UnsignedShort[numIndex];
-	if (!m_ib) return;
+	if (!m_ib)
+		return;
+
 	m_numIndex = numIndex;
 	memcpy(m_ib, ib, numIndex*sizeof(UnsignedShort));
 }
@@ -343,7 +339,7 @@ void RoadSegment::updateSegLighting(void)
 }
 
 //-----------------------------------------------------------------------------
-//         Private Methods                                               
+//         Private Methods
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -351,7 +347,7 @@ void RoadSegment::updateSegLighting(void)
 //=============================================================================
 /** Loads a tee into the vertex buffer for a road join. */
 //=============================================================================
-void W3DRoadBuffer::loadTee(RoadSegment *pRoad, Vector2 loc1, 
+void W3DRoadBuffer::loadTee(RoadSegment *pRoad, Vector2 loc1,
 														Vector2 loc2, Bool is4Way, Real scale)
 {
 	Vector2 roadVector(loc2.X-loc1.X, loc2.Y-loc1.Y);
@@ -375,16 +371,16 @@ void W3DRoadBuffer::loadTee(RoadSegment *pRoad, Vector2 loc1,
 	Real left = pRoad->m_widthInTexture*scale/2.0f;
 	loadFloatSection(pRoad, loc1, loc2-loc1, teeFactor, left, teeFactor, uOffset, vOffset, scale);
 }
-				
+
 //=============================================================================
 // W3DRoadBuffer::loadAlphaJoin
 //=============================================================================
 /** Loads an alpha join into the vertex buffer for a road join. */
 //=============================================================================
-void W3DRoadBuffer::loadAlphaJoin(RoadSegment *pRoad, Vector2 loc1, 
+void W3DRoadBuffer::loadAlphaJoin(RoadSegment *pRoad, Vector2 loc1,
 														Vector2 loc2,Real scale)
 {
-	
+
 	Vector2 roadVector(loc2.X-loc1.X, loc2.Y-loc1.Y);
 	Vector2 roadNormal(-roadVector.Y, roadVector.X);
 //	Real roadLen = scale;
@@ -414,16 +410,16 @@ void W3DRoadBuffer::loadAlphaJoin(RoadSegment *pRoad, Vector2 loc1,
 	corners[topRight] = corners[topLeft] + roadVector;
 	loadFloat4PtSection(pRoad, loc1, roadNormal, roadVector, corners, uOffset, vOffset, scale, uScale);
 }
-				
+
 //=============================================================================
 // W3DRoadBuffer::loadY
 //=============================================================================
 /** Loads a Y into the vertex buffer for a road join. */
 //=============================================================================
-void W3DRoadBuffer::loadY(RoadSegment *pRoad, Vector2 loc1, 
+void W3DRoadBuffer::loadY(RoadSegment *pRoad, Vector2 loc1,
 														Vector2 loc2,Real scale)
 {
-	
+
 	Vector2 roadVector(loc2.X-loc1.X, loc2.Y-loc1.Y);
 	Vector2 roadNormal(-roadVector.Y, roadVector.X);
 //	Real roadLen = scale;
@@ -453,16 +449,16 @@ void W3DRoadBuffer::loadY(RoadSegment *pRoad, Vector2 loc1,
 	corners[topRight] = corners[topLeft] + roadVector;
 	loadFloat4PtSection(pRoad, loc1, roadNormal, roadVector, corners, uOffset, vOffset, scale, scale);
 }
-				
+
 //=============================================================================
 // W3DRoadBuffer::loadH
 //=============================================================================
 /** Loads a h shaped tee into the vertex buffer for a road join. */
 //=============================================================================
-void W3DRoadBuffer::loadH(RoadSegment *pRoad, Vector2 loc1, 
+void W3DRoadBuffer::loadH(RoadSegment *pRoad, Vector2 loc1,
 														Vector2 loc2, Bool flip, Real scale)
 {
-	
+
 	Vector2 roadVector(loc2.X-loc1.X, loc2.Y-loc1.Y);
 	Vector2 roadNormal(-roadVector.Y, roadVector.X);
 //	Real roadLen = scale;
@@ -480,7 +476,7 @@ void W3DRoadBuffer::loadH(RoadSegment *pRoad, Vector2 loc1,
 	Real roadwidth = scale;
 
 	roadVector *= roadwidth;
-	roadNormal *= roadwidth;																												 
+	roadNormal *= roadwidth;
 
 
 	Vector2	corners[NUM_CORNERS];
@@ -499,15 +495,15 @@ void W3DRoadBuffer::loadH(RoadSegment *pRoad, Vector2 loc1,
 	if (flip) roadNormal = -roadNormal;
 	loadFloat4PtSection(pRoad, loc1, roadNormal, roadVector, corners, uOffset, vOffset, scale, scale);
 }
-				
+
 //=============================================================================
 // W3DRoadBuffer::loadFloatSection
 //=============================================================================
-/** Loads a section of road using a mesh that floats a little above the 
+/** Loads a section of road using a mesh that floats a little above the
 terrain. */
 //=============================================================================
-void W3DRoadBuffer::loadFloatSection(RoadSegment *pRoad, Vector2 loc, 
-														Vector2 roadVector, Real halfHeight, Real left, Real right, 
+void W3DRoadBuffer::loadFloatSection(RoadSegment *pRoad, Vector2 loc,
+														Vector2 roadVector, Real halfHeight, Real left, Real right,
 														Real uOffset, Real vOffset, Real scale)
 {
 	if (m_map==NULL) {
@@ -546,25 +542,25 @@ void W3DRoadBuffer::loadFloatSection(RoadSegment *pRoad, Vector2 loc,
 //=============================================================================
 // W3DRoadBuffer::loadFloat4PtSection
 //=============================================================================
-/** Loads a section of road using a mesh that floats a little above the 
+/** Loads a section of road using a mesh that floats a little above the
 terrain.  The road is loaded into the quadrilateral defined by the
-4 corners points.  loc specifies the point where u==uOffset && v==vOffset, and 
+4 corners points.  loc specifies the point where u==uOffset && v==vOffset, and
 the road vector gives the direction of the road, and the road normal is perpendicular
 to the road normal.  */
 //=============================================================================
-void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc, 
+void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 														Vector2 roadNormal, Vector2 roadVector,
-														Vector2 *cornersP, 
+														Vector2 *cornersP,
 														Real uOffset, Real vOffset, Real uScale, Real vScale)
 {
-	
+
 	const Real FLOAT_AMOUNT = MAP_HEIGHT_SCALE/8;
 	const Real MAX_ERROR = MAP_HEIGHT_SCALE*1.1f;
 	UnsignedShort ib[MAX_SEG_INDEX];
 	VertexFormatXYZDUV1 vb[MAX_SEG_VERTEX];
 	Int numRoadVertices = 0;
 	Int numRoadIndices = 0;
-	
+
 	TRoadSegInfo info;
 	info.loc = loc;
 	info.roadNormal = roadNormal;
@@ -605,7 +601,7 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 
 	if (vCount>maxRows) vCount = maxRows;
 	TColumn prevColumn, curColumn, nextColumn;
-				
+
 	prevColumn.deleted = true;
 	curColumn.deleted = true;
 	Int i, j, k;
@@ -613,7 +609,7 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 	Vector3 origin(v2.X, v2.Y, 0);
 	v2 = cornersP[bottomRight] - cornersP[bottomLeft];
 	Vector3 uVector1(v2.X, v2.Y, 0);
-	v2 = cornersP[topRight] - cornersP[topLeft]; 
+	v2 = cornersP[topRight] - cornersP[topLeft];
 	Vector3 uVector2(v2.X, v2.Y, 0);
 	v2 = cornersP[topLeft];
 	Vector3 origin2(v2.X, v2.Y, 0);
@@ -637,8 +633,8 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 				Real jFactor = ((Real)j / (vCount-1));
 				Real jBarFactor = 1.0f-jFactor;
 				nextColumn.vtx[j] = origin +  (uVector1 * jBarFactor * iFactor) + (uVector2 * jFactor * iFactor) +
-													(vVector1 * iBarFactor * jFactor) + (vVector2 * iFactor * jFactor) ;	
-				Real z = TheTerrainRenderObject->getMaxCellHeight(nextColumn.vtx[j].X, nextColumn.vtx[j].Y); 
+													(vVector1 * iBarFactor * jFactor) + (vVector2 * iFactor * jFactor) ;
+				Real z = TheTerrainRenderObject->getMaxCellHeight(nextColumn.vtx[j].X, nextColumn.vtx[j].Y);
 				if (z<minHeight) minHeight = z;
 				if (z>maxHeight) maxHeight = z;
 				nextColumn.vertexIndex[j] = -1;
@@ -670,11 +666,11 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 				if (prevColumn.collapsed && curColumn.collapsed && nextColumn.collapsed) {
 					Bool okToDelete = false;
 
-					Real theZ = prevColumn.vtx[0].Z * (curColumn.uIndex-prevColumn.uIndex) + 
+					Real theZ = prevColumn.vtx[0].Z * (curColumn.uIndex-prevColumn.uIndex) +
 										nextColumn.vtx[0].Z * (nextColumn.uIndex-curColumn.uIndex);
 					theZ /= nextColumn.uIndex-prevColumn.uIndex;
 					if (theZ >= curColumn.vtx[0].Z && theZ < curColumn.vtx[0].Z + MAX_ERROR) {
-						theZ = prevColumn.vtx[1].Z * (curColumn.uIndex-prevColumn.uIndex) + 
+						theZ = prevColumn.vtx[1].Z * (curColumn.uIndex-prevColumn.uIndex) +
 											nextColumn.vtx[1].Z * (nextColumn.uIndex-curColumn.uIndex);
 						theZ /= nextColumn.uIndex-prevColumn.uIndex;
 						if (theZ >= curColumn.vtx[1].Z && theZ < curColumn.vtx[1].Z + MAX_ERROR) {
@@ -683,7 +679,7 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 					}
 					if (okToDelete) {
 						curColumn.deleted = true;
-					}				
+					}
 				}
 			}
 		}
@@ -726,9 +722,9 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 					}
 					UnsignedShort *curIb = ib+numRoadIndices;
 					if (k==0 || !prevColumn.collapsed) {
-						*curIb++ = prevColumn.vertexIndex[j+1];	
-						*curIb++ = prevColumn.vertexIndex[j];		
-						*curIb++ = curColumn.vertexIndex[k];		
+						*curIb++ = prevColumn.vertexIndex[j+1];
+						*curIb++ = prevColumn.vertexIndex[j];
+						*curIb++ = curColumn.vertexIndex[k];
 						numRoadIndices+=3;
 					}
 					if (j==0 || !curColumn.collapsed) {
@@ -736,9 +732,9 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 						if (curColumn.collapsed && !prevColumn.collapsed) {
 							offset = vCount-1;
 						}
-						*curIb++ = prevColumn.vertexIndex[j+offset];	
-						*curIb++ = curColumn.vertexIndex[k];		
-						*curIb++ = curColumn.vertexIndex[k+1];	
+						*curIb++ = prevColumn.vertexIndex[j+offset];
+						*curIb++ = curColumn.vertexIndex[k];
+						*curIb++ = curColumn.vertexIndex[k+1];
 						numRoadIndices+=3;
 					}
 					if (prevColumn.collapsed && curColumn.collapsed) {
@@ -768,19 +764,19 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 //=============================================================================
 // W3DRoadBuffer::loadLit4PtSection
 //=============================================================================
-/** Loads a section of road using a mesh that floats a little above the 
+/** Loads a section of road using a mesh that floats a little above the
 terrain.  The road is loaded into the quadrilateral defined by the
-4 corners points.  loc specifies the point where u==uOffset && v==vOffset, and 
+4 corners points.  loc specifies the point where u==uOffset && v==vOffset, and
 the road vector gives the direction of the road, and the road normal is perpendicular
 to the road normal.  */
 //=============================================================================
 void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, VertexFormatXYZDUV1 *vb, RefRenderObjListIterator *pDynamicLightsIterator)
 {
-	
+
 	const Real FLOAT_AMOUNT = MAP_HEIGHT_SCALE/8;
 	const Real MAX_ERROR = MAP_HEIGHT_SCALE*1.1f;
 
-	
+
 	if (pRoad->m_uniqueID != m_curUniqueID) {
 		return;
 	}
@@ -807,7 +803,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 	const Int maxLights = 8;
 	LightClass *lights[maxLights];
 
-	for (pDynamicLightsIterator->First(); !pDynamicLightsIterator->Is_Done(); pDynamicLightsIterator->Next()) {		
+	for (pDynamicLightsIterator->First(); !pDynamicLightsIterator->Is_Done(); pDynamicLightsIterator->Next()) {
 			LightClass *pLight = (LightClass*)pDynamicLightsIterator->Peek_Obj();
 			SphereClass bounds = pLight->Get_Bounding_Sphere();
 			if (Spheres_Intersect(pRoad->getBounds(), bounds)) {
@@ -844,7 +840,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 
 	if (vCount>maxRows) vCount = maxRows;
 	TColumn prevColumn, curColumn, nextColumn;
-				
+
 	prevColumn.deleted = true;
 	curColumn.deleted = true;
 	Int i, j, k;
@@ -852,7 +848,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 	Vector3 origin(v2.X, v2.Y, 0);
 	v2 = info.corners[bottomRight] - info.corners[bottomLeft];
 	Vector3 uVector1(v2.X, v2.Y, 0);
-	v2 = info.corners[topRight] - info.corners[topLeft]; 
+	v2 = info.corners[topRight] - info.corners[topLeft];
 	Vector3 uVector2(v2.X, v2.Y, 0);
 	v2 = info.corners[topLeft];
 	Vector3 origin2(v2.X, v2.Y, 0);
@@ -876,8 +872,8 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 				Real jFactor = ((Real)j / (vCount-1));
 				Real jBarFactor = 1.0f-jFactor;
 				nextColumn.vtx[j] = origin +  (uVector1 * jBarFactor * iFactor) + (uVector2 * jFactor * iFactor) +
-													(vVector1 * iBarFactor * jFactor) + (vVector2 * iFactor * jFactor) ;	
-				Real z = TheTerrainRenderObject->getMaxCellHeight(nextColumn.vtx[j].X, nextColumn.vtx[j].Y); 
+													(vVector1 * iBarFactor * jFactor) + (vVector2 * iFactor * jFactor) ;
+				Real z = TheTerrainRenderObject->getMaxCellHeight(nextColumn.vtx[j].X, nextColumn.vtx[j].Y);
 				if (z<minHeight) minHeight = z;
 				if (z>maxHeight) maxHeight = z;
 				nextColumn.vertexIndex[j] = -1;
@@ -909,11 +905,11 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 				if (prevColumn.collapsed && curColumn.collapsed && nextColumn.collapsed) {
 					Bool okToDelete = false;
 
-					Real theZ = prevColumn.vtx[0].Z * (curColumn.uIndex-prevColumn.uIndex) + 
+					Real theZ = prevColumn.vtx[0].Z * (curColumn.uIndex-prevColumn.uIndex) +
 										nextColumn.vtx[0].Z * (nextColumn.uIndex-curColumn.uIndex);
 					theZ /= nextColumn.uIndex-prevColumn.uIndex;
 					if (theZ >= curColumn.vtx[0].Z && theZ < curColumn.vtx[0].Z + MAX_ERROR) {
-						theZ = prevColumn.vtx[1].Z * (curColumn.uIndex-prevColumn.uIndex) + 
+						theZ = prevColumn.vtx[1].Z * (curColumn.uIndex-prevColumn.uIndex) +
 											nextColumn.vtx[1].Z * (nextColumn.uIndex-curColumn.uIndex);
 						theZ /= nextColumn.uIndex-prevColumn.uIndex;
 						if (theZ >= curColumn.vtx[1].Z && theZ < curColumn.vtx[1].Z + MAX_ERROR) {
@@ -922,7 +918,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 					}
 					if (okToDelete) {
 						curColumn.deleted = true;
-					}				
+					}
 				}
 			}
 		}
@@ -969,7 +965,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 						}
 	#endif
 						factor = WWMath::Clamp(factor,0.0f,1.0f);
-						Real shade = 0.5f; 
+						Real shade = 0.5f;
 						shade *= factor;
 						Vector3 diffuse;
 						lights[k]->Get_Diffuse(&diffuse);
@@ -979,10 +975,10 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 						if(shade < 0.0f) shade = 0.0f;
 						shadeR += shade*diffuse.X;
 						shadeG += shade*diffuse.Y;
-						shadeB += shade*diffuse.Z;		
+						shadeB += shade*diffuse.Z;
 						shadeR += factor*ambient.X;
 						shadeG += factor*ambient.Y;
-						shadeB += factor*ambient.Z;		
+						shadeB += factor*ambient.Z;
 					}
 				}
  				if (shadeR > 1.0) shadeR = 1.0;
@@ -1024,9 +1020,9 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 					}
 					UnsignedShort *curIb = ib+m_curNumRoadIndices;
 					if (k==0 || !prevColumn.collapsed) {
-						*curIb++ = prevColumn.vertexIndex[j+1];	
-						*curIb++ = prevColumn.vertexIndex[j];		
-						*curIb++ = curColumn.vertexIndex[k];		
+						*curIb++ = prevColumn.vertexIndex[j+1];
+						*curIb++ = prevColumn.vertexIndex[j];
+						*curIb++ = curColumn.vertexIndex[k];
 						m_curNumRoadIndices+=3;
 					}
 					if (j==0 || !curColumn.collapsed) {
@@ -1034,9 +1030,9 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 						if (curColumn.collapsed && !prevColumn.collapsed) {
 							offset = vCount-1;
 						}
-						*curIb++ = prevColumn.vertexIndex[j+offset];	
-						*curIb++ = curColumn.vertexIndex[k];		
-						*curIb++ = curColumn.vertexIndex[k+1];	
+						*curIb++ = prevColumn.vertexIndex[j+offset];
+						*curIb++ = curColumn.vertexIndex[k];
+						*curIb++ = curColumn.vertexIndex[k+1];
 						m_curNumRoadIndices+=3;
 					}
 					if (prevColumn.collapsed && curColumn.collapsed) {
@@ -1060,7 +1056,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 		curColumn = nextColumn;
 	}
 }
-																 
+
 //=============================================================================
 // W3DRoadBuffer::loadCurve
 //=============================================================================
@@ -1068,7 +1064,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 //=============================================================================
 void W3DRoadBuffer::loadCurve(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Real scale)
 {
-	
+
 	Real uOffset = (4.0f/512.0f);
 	Real vOffset = (255.0f/512.0f);	 // CORNER_RADIUS radius 1.5 curve.
 	if (pRoad->m_curveRadius == TIGHT_CORNER_RADIUS) {
@@ -1097,7 +1093,7 @@ void W3DRoadBuffer::loadCurve(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Re
 	corners[topLeft] = corners[bottomLeft];
  	corners[topLeft] += 2*roadNormal;
 
-	// Tweak a little 
+	// Tweak a little
 	if (pRoad->m_curveRadius == TIGHT_CORNER_RADIUS) {
 		corners[bottomLeft] = loc1 - roadNormal;
 		corners[bottomRight] = corners[bottomLeft];
@@ -1107,7 +1103,7 @@ void W3DRoadBuffer::loadCurve(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Re
 		corners[topLeft] = corners[bottomLeft];
  		corners[topLeft] += 2*roadNormal;
 
-		corners[bottomRight] += roadVector*0.1f;	  
+		corners[bottomRight] += roadVector*0.1f;
 		corners[bottomRight] += roadNormal*0.2f;
 		corners[bottomLeft] -= roadNormal*0.1f;
 		corners[bottomLeft] -= roadVector*0.02f;
@@ -1124,7 +1120,7 @@ void W3DRoadBuffer::loadCurve(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Re
 		corners[topLeft] = corners[bottomLeft];
  		corners[topLeft] += 2*roadNormal;
 
-		corners[bottomRight] += roadVector*0.1f;	  
+		corners[bottomRight] += roadVector*0.1f;
 		corners[bottomRight] += roadNormal*0.4f;
 		corners[bottomLeft] -= roadNormal*0.2f;
 		corners[bottomLeft] -= roadVector*0.02f;
@@ -1137,7 +1133,7 @@ void W3DRoadBuffer::loadCurve(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Re
 	loadFloat4PtSection(pRoad, loc1, roadNormal, roadVector, corners, uOffset, vOffset, scale, scale);
 
 }
-																 																 
+
 //=============================================================================
 // W3DRoadBuffer::preloadRoadSegment
 //=============================================================================
@@ -1145,7 +1141,7 @@ void W3DRoadBuffer::loadCurve(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Re
 //=============================================================================
 void W3DRoadBuffer::preloadRoadSegment(RoadSegment *pRoad)
 {
-	
+
 	Vector2 roadVector = pRoad->m_pt2.loc-pRoad->m_pt1.loc;
 	Vector2 roadNormal(-roadVector.Y, roadVector.X);
 //	Real roadLen = roadVector.Length();
@@ -1162,7 +1158,7 @@ void W3DRoadBuffer::preloadRoadSegment(RoadSegment *pRoad)
 	corners[topLeft] = pRoad->m_pt1.top;
 	corners[bottomRight] = pRoad->m_pt2.bottom;
 	corners[topRight] = pRoad->m_pt2.top;
-	loadFloat4PtSection(pRoad, pRoad->m_pt1.loc, roadNormal, roadVector, corners, uOffset, vOffset, 
+	loadFloat4PtSection(pRoad, pRoad->m_pt1.loc, roadNormal, roadVector, corners, uOffset, vOffset,
 		pRoad->m_scale, pRoad->m_scale);
 
 }
@@ -1180,43 +1176,43 @@ void W3DRoadBuffer::preloadRoadsInVertexAndIndexBuffers()
 
 	Int curRoad;
 
-	// Do road segments.  
+	// Do road segments.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		if (m_roads[curRoad].m_type == SEGMENT) {
 			preloadRoadSegment(&m_roads[curRoad]);
 		}
-	}		
-	// Do curves.	
+	}
+	// Do curves.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		if (m_roads[curRoad].m_type == CURVE) {
 			loadCurve(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc, m_roads[curRoad].m_scale);
 		}
 	}
-	// Do tees.	
+	// Do tees.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		if (m_roads[curRoad].m_type == THREE_WAY_Y) {
-			loadY(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc, 
+			loadY(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc,
 				m_roads[curRoad].m_scale);
 		}
 	}
-	// Do tees.	
+	// Do tees.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		if (m_roads[curRoad].m_type == THREE_WAY_H || m_roads[curRoad].m_type == THREE_WAY_H_FLIP) {
-			loadH(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc, 
+			loadH(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc,
 				m_roads[curRoad].m_type == THREE_WAY_H_FLIP, m_roads[curRoad].m_scale);
 		}
 	}
-	// Do tees.	
+	// Do tees.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		if (m_roads[curRoad].m_type == TEE || m_roads[curRoad].m_type == FOUR_WAY) {
-			loadTee(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc, 
+			loadTee(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc,
 				(m_roads[curRoad].m_type == FOUR_WAY), m_roads[curRoad].m_scale);
 		}
 	}
 	// Do joins.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		if (m_roads[curRoad].m_type == ALPHA_JOIN) {
-			loadAlphaJoin(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc, 
+			loadAlphaJoin(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc,
 				 m_roads[curRoad].m_scale);
 		}
 	}
@@ -1258,7 +1254,7 @@ void W3DRoadBuffer::loadRoadsInVertexAndIndexBuffers()
 			if (m_roads[curRoad].m_type == corner) {
 				loadRoadSegment(ib, vb, &m_roads[curRoad]);
 			}
-		}		
+		}
 	}
 	this->m_roadTypes[m_curRoadType].setNumVertices(m_curNumRoadVertices);
 	this->m_roadTypes[m_curRoadType].setNumIndices(m_curNumRoadIndices);
@@ -1294,7 +1290,7 @@ void W3DRoadBuffer::loadLitRoadsInVertexAndIndexBuffers(RefRenderObjListIterator
 				if (m_roads[curRoad].m_type == corner) {
 					loadLit4PtSection(&m_roads[curRoad], ib, vb, pDynamicLightsIterator);
 				}
-			}		
+			}
 		}
 	}
 	this->m_roadTypes[m_curRoadType].setNumVertices(m_curNumRoadVertices);
@@ -1347,7 +1343,7 @@ void W3DRoadBuffer::moveRoadSegTo(Int fromNdx, Int toNdx)
 {
 	if (fromNdx<0 || fromNdx>=m_numRoads || toNdx<0 || toNdx>=m_numRoads) {
 #ifdef RTS_DEBUG
-		DEBUG_LOG(("bad moveRoadSegTo\n"));
+		DEBUG_LOG(("bad moveRoadSegTo"));
 #endif
 		return;
 	}
@@ -1380,9 +1376,9 @@ void W3DRoadBuffer::checkLinkBefore(Int ndx)
 
 	Vector2 loc2 = m_roads[ndx].m_pt2.loc;
 #ifdef RTS_DEBUG
-	DEBUG_ASSERTLOG(m_roads[ndx].m_pt1.loc == m_roads[ndx+1].m_pt2.loc, ("Bad link\n"));
+	DEBUG_ASSERTLOG(m_roads[ndx].m_pt1.loc == m_roads[ndx+1].m_pt2.loc, ("Bad link"));
 	if (ndx>0) {
-		DEBUG_ASSERTLOG(m_roads[ndx].m_pt2.loc != m_roads[ndx-1].m_pt1.loc, ("Bad Link\n"));
+		DEBUG_ASSERTLOG(m_roads[ndx].m_pt2.loc != m_roads[ndx-1].m_pt1.loc, ("Bad Link"));
 	}
 #endif
 
@@ -1397,7 +1393,7 @@ void W3DRoadBuffer::checkLinkBefore(Int ndx)
 	while (checkNdx < m_numRoads) {
 		if (m_roads[checkNdx].m_pt1.loc == loc2) {
 #ifdef RTS_DEBUG
-			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt1.count==1, ("Bad count\n"));
+			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt1.count==1, ("Bad count"));
 #endif
 			moveRoadSegTo(checkNdx, ndx);
 			loc2 = m_roads[ndx].m_pt2.loc;
@@ -1408,7 +1404,7 @@ void W3DRoadBuffer::checkLinkBefore(Int ndx)
 			if (m_roads[checkNdx].m_pt2.count!=1) {
 				::OutputDebugString("fooey.\n");
 			}
-			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt2.count==1, ("Bad count\n"));
+			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt2.count==1, ("Bad count"));
 #endif
 			flipTheRoad(&m_roads[checkNdx]);
 			moveRoadSegTo(checkNdx, ndx);
@@ -1442,14 +1438,14 @@ void W3DRoadBuffer::checkLinkAfter(Int ndx)
 
 	Vector2 loc1 = m_roads[ndx].m_pt1.loc;
 #ifdef RTS_DEBUG
-	DEBUG_ASSERTLOG(m_roads[ndx].m_pt2.loc == m_roads[ndx-1].m_pt1.loc, ("Bad link\n"));
+	DEBUG_ASSERTLOG(m_roads[ndx].m_pt2.loc == m_roads[ndx-1].m_pt1.loc, ("Bad link"));
 #endif
 
 	Int checkNdx = ndx+1;
 	while (checkNdx < m_numRoads && ndx < m_numRoads-1) {
 		if (m_roads[checkNdx].m_pt2.loc == loc1) {
 #ifdef RTS_DEBUG
-			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt2.count==1, ("Bad count\n"));
+			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt2.count==1, ("Bad count"));
 #endif
 			ndx++;
 			moveRoadSegTo(checkNdx, ndx);
@@ -1457,7 +1453,7 @@ void W3DRoadBuffer::checkLinkAfter(Int ndx)
 			if (m_roads[ndx].m_pt1.count != 1) return;
 		} else if (m_roads[checkNdx].m_pt1.loc == loc1) {
 #ifdef RTS_DEBUG
-			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt1.count==1, ("Wrong m_pt1.count.\n"));
+			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt1.count==1, ("Wrong m_pt1.count."));
 			if ( m_roads[checkNdx].m_pt1.count!=1) {
 				::OutputDebugString("Wrong m_pt1.count.\n");
 			}
@@ -1475,7 +1471,7 @@ void W3DRoadBuffer::checkLinkAfter(Int ndx)
 }
 
 static Bool warnSegments = true;
-#define CHECK_SEGMENTS {if (m_numRoads >= m_maxRoadSegments) { if (warnSegments) DEBUG_LOG(("****** Too many road segments.  Need to increase ini values.  See john a.\n")); warnSegments = false; return;}}
+#define CHECK_SEGMENTS {if (m_numRoads >= m_maxRoadSegments) { if (warnSegments) DEBUG_LOG(("****** Too many road segments.  Need to increase ini values.  See john a.")); warnSegments = false; return;}}
 
 //=============================================================================
 // W3DRoadBuffer::addMapObject
@@ -1513,7 +1509,7 @@ void W3DRoadBuffer::addMapObject(RoadSegment *pRoad, Bool updateTheCounts)
 		if ( (m_roads[i].m_pt1.loc==loc1 && m_roads[i].m_pt2.loc==loc2) ||
 			(m_roads[i].m_pt1.loc==loc2 && m_roads[i].m_pt2.loc==loc1) ) {
 			bothMatch = true;	// identical segment, so discard.
-			break; 
+			break;
 		}
 		if (cur.m_pt1.count==1) {
 			if ((m_roads[i].m_pt1.loc == loc1)) {
@@ -1555,7 +1551,7 @@ void W3DRoadBuffer::addMapObject(RoadSegment *pRoad, Bool updateTheCounts)
 	m_roads[addIndex] = cur;
 	if (flip) {
 		flipTheRoad(&m_roads[addIndex]);
-	} 
+	}
 	m_numRoads++;
 	if (addBefore) {
 		checkLinkBefore(addIndex);
@@ -1580,7 +1576,7 @@ void W3DRoadBuffer::addMapObjects()
 		if (pMapObj->getFlag(FLAG_ROAD_POINT1)) {
 			pMapObj2 = pMapObj->getNext();
 #ifdef RTS_DEBUG
-			DEBUG_ASSERTLOG(pMapObj2 && pMapObj2->getFlag(FLAG_ROAD_POINT2), ("Bad Flag\n"));
+			DEBUG_ASSERTLOG(pMapObj2 && pMapObj2->getFlag(FLAG_ROAD_POINT2), ("Bad Flag"));
 #endif
 			if (pMapObj2==NULL) break;
 			if (!pMapObj2->getFlag(FLAG_ROAD_POINT2)) continue;
@@ -1591,8 +1587,8 @@ void W3DRoadBuffer::addMapObjects()
 				loc2.X += 0.25;
 			}
 			RoadSegment	curRoad;
-			curRoad.m_scale = DEFAULT_ROAD_SCALE; 
-			curRoad.m_widthInTexture = 1.0f; 
+			curRoad.m_scale = DEFAULT_ROAD_SCALE;
+			curRoad.m_widthInTexture = 1.0f;
 			curRoad.m_uniqueID = 1;
 			Bool found = false;
 			TerrainRoadType *road = TheTerrainRoads->findRoad( pMapObj->getName() );
@@ -1602,14 +1598,14 @@ void W3DRoadBuffer::addMapObjects()
 				curRoad.m_scale = road->getRoadWidth();
 				curRoad.m_uniqueID = road->getID();
 				found = TRUE;
-			}  // end if
+			}
 #ifdef LOAD_TEST_ASSETS
 			const Real DEFAULT_SCALE = 30;
 			if (!found) {
 				Int i;
 				for (i=0; i<m_maxRoadTypes; i++) {
 					if (pMapObj->getName() == m_roadTypes[i].getPath()) {
-						curRoad.m_scale = DEFAULT_SCALE; 
+						curRoad.m_scale = DEFAULT_SCALE;
 						curRoad.m_uniqueID = m_roadTypes[i].getUniqueID();
 						found = true;
 					}
@@ -1617,7 +1613,7 @@ void W3DRoadBuffer::addMapObjects()
 			}
 			if (!found && m_curOpenRoad<m_maxRoadTypes) {
 				m_maxUID++;
-				curRoad.m_scale = DEFAULT_SCALE; 
+				curRoad.m_scale = DEFAULT_SCALE;
 				curRoad.m_uniqueID = m_maxUID;
 				m_roadTypes[m_curOpenRoad].loadTexture(pMapObj->getName(), m_maxUID);
 				m_curOpenRoad++;
@@ -1629,12 +1625,12 @@ void W3DRoadBuffer::addMapObjects()
 			curRoad.m_pt2.loc =loc2;
 			curRoad.m_pt2.isAngled = pMapObj2->getFlag(FLAG_ROAD_CORNER_ANGLED);
 			curRoad.m_pt2.isJoin = pMapObj2->getFlag(FLAG_ROAD_JOIN);
-			curRoad.m_type = SEGMENT; 
+			curRoad.m_type = SEGMENT;
 			curRoad.m_curveRadius = pMapObj->getFlag(FLAG_ROAD_CORNER_TIGHT)?TIGHT_CORNER_RADIUS:CORNER_RADIUS;
 
 			addMapObject(&curRoad, true);
 			pMapObj = pMapObj2;
-		} 
+		}
 	}
 	Int curCount = m_numRoads;
 	Int i;
@@ -1756,7 +1752,7 @@ void W3DRoadBuffer::insertTee(Vector2 loc, Int index1, Real scale)
 	TRoadPt *pr2=NULL;
 	TRoadPt *pr3=NULL;
 
-	// pc1-3 point to the center points of the segments.  These are the 
+	// pc1-3 point to the center points of the segments.  These are the
 	// points that are at loc.
 	TRoadPt *pc1=NULL;
 	TRoadPt *pc2=NULL;
@@ -1891,10 +1887,10 @@ void W3DRoadBuffer::insertTee(Vector2 loc, Int index1, Real scale)
 		m_roads[m_numRoads].m_pt2.loc.Set(loc+teeVector);
 		m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 		m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-		m_roads[m_numRoads].m_scale = m_roads[index1].m_scale; 
+		m_roads[m_numRoads].m_scale = m_roads[index1].m_scale;
 		m_roads[m_numRoads].m_widthInTexture = m_roads[index1].m_widthInTexture;
-		m_roads[m_numRoads].m_pt1.count = -3; 
-		m_roads[m_numRoads].m_type = flip?THREE_WAY_H_FLIP:THREE_WAY_H; 
+		m_roads[m_numRoads].m_pt1.count = -3;
+		m_roads[m_numRoads].m_type = flip?THREE_WAY_H_FLIP:THREE_WAY_H;
 		m_roads[m_numRoads].m_uniqueID = m_roads[index1].m_uniqueID;
 		m_numRoads++;
 	} else {
@@ -1928,10 +1924,10 @@ void W3DRoadBuffer::insertTee(Vector2 loc, Int index1, Real scale)
 		m_roads[m_numRoads].m_pt2.loc.Set(loc+teeVector);
 		m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 		m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-		m_roads[m_numRoads].m_scale = m_roads[index1].m_scale; 
+		m_roads[m_numRoads].m_scale = m_roads[index1].m_scale;
 		m_roads[m_numRoads].m_widthInTexture = m_roads[index1].m_widthInTexture;
-		m_roads[m_numRoads].m_pt1.count = -3; 
-		m_roads[m_numRoads].m_type = TEE; 
+		m_roads[m_numRoads].m_pt1.count = -3;
+		m_roads[m_numRoads].m_type = TEE;
 		m_roads[m_numRoads].m_uniqueID = m_roads[index1].m_uniqueID;
 		m_numRoads++;
 	}
@@ -1950,7 +1946,7 @@ Bool W3DRoadBuffer::insertY(Vector2 loc, Int index1, Real scale)
 	TRoadPt *pr2=NULL;
 	TRoadPt *pr3=NULL;
 
-	// pc1-3 point to the center points of the segments.  These are the 
+	// pc1-3 point to the center points of the segments.  These are the
 	// points that are at loc.
 	TRoadPt *pc1=NULL;
 	TRoadPt *pc2=NULL;
@@ -1993,7 +1989,7 @@ Bool W3DRoadBuffer::insertY(Vector2 loc, Int index1, Real scale)
 		}
 	}
 	if (pr2 == NULL || pr3 == NULL) {
-		return false;												 
+		return false;
 	}
 
 	Vector2 v1 = pr1->loc - loc;
@@ -2013,7 +2009,7 @@ Bool W3DRoadBuffer::insertY(Vector2 loc, Int index1, Real scale)
 	Real score12 = 2.0f;
 	Real score13 = 2.0f;
 	Real score32 = 2.0f;
-	
+
 //	const Real cos60 = 0.5f;
 	const Real cos30 = 0.866f;
 	const Real cos45 = 0.707f;
@@ -2128,10 +2124,10 @@ Bool W3DRoadBuffer::insertY(Vector2 loc, Int index1, Real scale)
 	m_roads[m_numRoads].m_pt2.loc.Set(loc+teeVector);
 	m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 	m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-	m_roads[m_numRoads].m_scale = m_roads[index1].m_scale; 
+	m_roads[m_numRoads].m_scale = m_roads[index1].m_scale;
 	m_roads[m_numRoads].m_widthInTexture = m_roads[index1].m_widthInTexture;
-	m_roads[m_numRoads].m_pt1.count = -3; 
-	m_roads[m_numRoads].m_type = THREE_WAY_Y; 
+	m_roads[m_numRoads].m_pt1.count = -3;
+	m_roads[m_numRoads].m_type = THREE_WAY_Y;
 	m_roads[m_numRoads].m_uniqueID = m_roads[index1].m_uniqueID;
 	m_numRoads++;
 
@@ -2144,11 +2140,11 @@ Bool W3DRoadBuffer::insertY(Vector2 loc, Int index1, Real scale)
 //=============================================================================
 // W3DRoadBuffer::offset3Way
 //=============================================================================
-/** Offsets the points coming into a 3 way intersection so that they move to 
+/** Offsets the points coming into a 3 way intersection so that they move to
 the join points of the 3 way intersection. */
 //=============================================================================
-void W3DRoadBuffer::offset3Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector, 
-															 Vector2 teeVector, Real widthInTexture) 
+void W3DRoadBuffer::offset3Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector,
+															 Vector2 teeVector, Real widthInTexture)
 {
 	pc1->loc = loc - upVector;
 	pc2->loc = loc + upVector;
@@ -2195,12 +2191,12 @@ void W3DRoadBuffer::offset3Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2
 //=============================================================================
 // W3DRoadBuffer::offsetH
 //=============================================================================
-/** Offsets the points coming into a 3 way intersection so that they move to 
+/** Offsets the points coming into a 3 way intersection so that they move to
 the join points of the 3 way intersection. */
 //=============================================================================
-void W3DRoadBuffer::offsetH(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, 
-														Vector2 upVector, Vector2 teeVector, 
-														Bool flip, Bool mirror, Real widthInTexture) 
+void W3DRoadBuffer::offsetH(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc,
+														Vector2 upVector, Vector2 teeVector,
+														Bool flip, Bool mirror, Real widthInTexture)
 {
 
 	if (flip != mirror) {
@@ -2267,11 +2263,11 @@ void W3DRoadBuffer::offsetH(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 lo
 //=============================================================================
 // W3DRoadBuffer::offsetY
 //=============================================================================
-/** Offsets the points coming into a 3 way intersection so that they move to 
+/** Offsets the points coming into a 3 way intersection so that they move to
 the join points of the 3 way intersection. */
 //=============================================================================
-void W3DRoadBuffer::offsetY(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector, 
-															 Real widthInTexture) 
+void W3DRoadBuffer::offsetY(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector,
+															 Real widthInTexture)
 {
 	pc3->loc += upVector*0.55f;
 	pc3->top += upVector*0.55f;
@@ -2281,7 +2277,7 @@ void W3DRoadBuffer::offsetY(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 lo
 
 	// Make sure the t vector goes right with respect to the up vector.
 	Vector2 arm = upVector;
-	arm.Rotate(3*PI/4); 
+	arm.Rotate(3*PI/4);
 	Vector2 armNormal(-arm.Y, arm.X);
 	armNormal *= widthInTexture;
 	pc2->loc += arm*1.1f;
@@ -2313,11 +2309,11 @@ void W3DRoadBuffer::offsetY(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 lo
 //=============================================================================
 // W3DRoadBuffer::offset4Way
 //=============================================================================
-/** Offsets the points coming into a 4 way intersection so that they move to 
+/** Offsets the points coming into a 4 way intersection so that they move to
 the join points of the 4 way intersection. */
 //=============================================================================
-void W3DRoadBuffer::offset4Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, TRoadPt *pr3, 
-															 TRoadPt *pc4, Vector2 loc, Vector2 alignVector, Real widthInTexture) 
+void W3DRoadBuffer::offset4Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, TRoadPt *pr3,
+															 TRoadPt *pc4, Vector2 loc, Vector2 alignVector, Real widthInTexture)
 {
 	pc1->loc = loc - alignVector;
 	pc2->loc = loc + alignVector;
@@ -2399,7 +2395,7 @@ void W3DRoadBuffer::insert4Way(Vector2 loc, Int index1, Real scale)
 	TRoadPt *pr3=NULL;
 	TRoadPt *pr4=NULL;
 
-	// pc1-4 point to the center points of the segments.  These are the 
+	// pc1-4 point to the center points of the segments.  These are the
 	// points that are at loc.
 	TRoadPt *pc1=NULL;
 	TRoadPt *pc2=NULL;
@@ -2466,23 +2462,23 @@ void W3DRoadBuffer::insert4Way(Vector2 loc, Int index1, Real scale)
 	Int curPair = 12;
 	Real curDot = dot12;
 	if (dot13<curDot) {
-		curPair = 13; 
+		curPair = 13;
 		curDot = dot13;
 	}
 	if (dot14<curDot) {
-		curPair = 14; 
+		curPair = 14;
 		curDot = dot14;
 	}
 	if (dot23<curDot) {
-		curPair = 23; 
+		curPair = 23;
 		curDot = dot23;
 	}
 	if (dot24<curDot) {
-		curPair = 24; 
+		curPair = 24;
 		curDot = dot24;
 	}
 	if (dot34<curDot) {
-		curPair = 34; 
+		curPair = 34;
 		curDot = dot34;
 	}
 	Bool do12 = (curPair==12);	 // Do segment 1 to 2
@@ -2543,10 +2539,10 @@ void W3DRoadBuffer::insert4Way(Vector2 loc, Int index1, Real scale)
 	m_roads[m_numRoads].m_pt2.loc.Set(loc+alignVector);
 	m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 	m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-	m_roads[m_numRoads].m_scale = m_roads[index1].m_scale; 
-	m_roads[m_numRoads].m_widthInTexture = TEE_WIDTH_ADJUSTMENT; // It is symmetrical. 
-	m_roads[m_numRoads].m_pt1.count = -4; 
-	m_roads[m_numRoads].m_type = FOUR_WAY; 
+	m_roads[m_numRoads].m_scale = m_roads[index1].m_scale;
+	m_roads[m_numRoads].m_widthInTexture = TEE_WIDTH_ADJUSTMENT; // It is symmetrical.
+	m_roads[m_numRoads].m_pt1.count = -4;
+	m_roads[m_numRoads].m_type = FOUR_WAY;
 	m_roads[m_numRoads].m_uniqueID = m_roads[index1].m_uniqueID;
 	m_numRoads++;
 
@@ -2562,7 +2558,7 @@ void W3DRoadBuffer::insert4Way(Vector2 loc, Int index1, Real scale)
 //=============================================================================
 void W3DRoadBuffer::insertTeeIntersections(void)
 {
-	// Insert the tees. 
+	// Insert the tees.
 	Int numRoadSegments = m_numRoads;
 	Int i;
 //	Int segmentStartIndex = -1;
@@ -2572,16 +2568,16 @@ void W3DRoadBuffer::insertTeeIntersections(void)
 		}
 		if (m_roads[i].m_pt1.count==2) {
 			insertTee(m_roads[i].m_pt1.loc, i, m_roads[i].m_scale);
-		}	
+		}
 		if (m_roads[i].m_pt2.count==2) {
 			insertTee(m_roads[i].m_pt2.loc, i, m_roads[i].m_scale);
-		}	
+		}
 		if (m_roads[i].m_pt1.count==3) {
 			insert4Way(m_roads[i].m_pt1.loc, i, m_roads[i].m_scale);
-		}	
+		}
 		if (m_roads[i].m_pt2.count==3) {
 			insert4Way(m_roads[i].m_pt2.loc, i, m_roads[i].m_scale);
-		}	
+		}
 	}
 }
 
@@ -2592,7 +2588,7 @@ void W3DRoadBuffer::insertTeeIntersections(void)
 //=============================================================================
 void W3DRoadBuffer::insertCurveSegments(void)
 {
-	// Insert the curve segments. 
+	// Insert the curve segments.
 	Int numRoadSegments = m_numRoads;
 	Int i;
 	Int segmentStartIndex = -1;
@@ -2622,10 +2618,10 @@ void W3DRoadBuffer::insertCurveSegments(void)
 Int W3DRoadBuffer::findCrossTypeJoinVector(Vector2 loc, Vector2 *joinVector, Int uniqueID)
 {
 	Vector2 newVector = *joinVector;
-	// Insert the curve segments. 
+	// Insert the curve segments.
 	Int numRoadSegments = m_numRoads;
 	Int i;
-	for (i=0; i<numRoadSegments; i++) {	
+	for (i=0; i<numRoadSegments; i++) {
 		// we only want different road types.
 		if (m_roads[i].m_uniqueID == uniqueID) continue;
 		// Only join to straight line segments.
@@ -2681,13 +2677,13 @@ void W3DRoadBuffer::adjustStacking(Int topUniqueID, Int bottomUniqueID)
 	for (i=0; i<m_maxRoadTypes; i++) {
 		if (m_roadTypes[i].getUniqueID() == topUniqueID) break;
 	}
-	DEBUG_ASSERTLOG(i<m_maxRoadTypes, ("***** Wrong unique id- john a should fix.\n"));
+	DEBUG_ASSERTLOG(i<m_maxRoadTypes, ("***** Wrong unique id- john a should fix."));
 	if (i>=m_maxRoadTypes) return;
 
 	for (j=0; j<m_maxRoadTypes; j++) {
 		if (m_roadTypes[j].getUniqueID() == bottomUniqueID) break;
 	}
-	DEBUG_ASSERTLOG(j<m_maxRoadTypes, ("***** Wrong unique id- john a should fix.\n"));
+	DEBUG_ASSERTLOG(j<m_maxRoadTypes, ("***** Wrong unique id- john a should fix."));
 	if (j>=m_maxRoadTypes) return;
 
 	if (m_roadTypes[i].getStacking() > m_roadTypes[j].getStacking()) {
@@ -2711,7 +2707,7 @@ void W3DRoadBuffer::adjustStacking(Int topUniqueID, Int bottomUniqueID)
 //=============================================================================
 void W3DRoadBuffer::insertCrossTypeJoins(void)
 {
-	// Insert the curve segments. 
+	// Insert the curve segments.
 	Int numRoadSegments = m_numRoads;
 	Int i;
 	for (i=0; i<numRoadSegments; i++) {
@@ -2730,7 +2726,7 @@ void W3DRoadBuffer::insertCrossTypeJoins(void)
 		}
 		Vector2 joinVector(1, 0);
 
-		
+
 		Vector2 roadVector(loc2.X-loc1.X, loc2.Y-loc1.Y);
 		roadVector.Normalize();
 		joinVector = roadVector;
@@ -2781,7 +2777,7 @@ void W3DRoadBuffer::insertCrossTypeJoins(void)
 				m_roads[i].m_pt2.top.Set(pInt1.X, pInt1.Y);
 				bottom = m_roads[i].m_pt2.top;
 			}
-		}	 
+		}
 
 		bottom = bottom-top;
 		Real scaleAdjustment = bottom.Length() / (m_roads[i].m_scale * m_roads[i].m_widthInTexture);
@@ -2793,10 +2789,10 @@ void W3DRoadBuffer::insertCrossTypeJoins(void)
 		m_roads[m_numRoads].m_pt2.loc.Set(loc1+joinVector);
 		m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 		m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-		m_roads[m_numRoads].m_scale = m_roads[i].m_scale; 
-		m_roads[m_numRoads].m_widthInTexture = m_roads[i].m_scale * scaleAdjustment;  
-		m_roads[m_numRoads].m_pt1.count = 0; 
-		m_roads[m_numRoads].m_type = ALPHA_JOIN; 
+		m_roads[m_numRoads].m_scale = m_roads[i].m_scale;
+		m_roads[m_numRoads].m_widthInTexture = m_roads[i].m_scale * scaleAdjustment;
+		m_roads[m_numRoads].m_pt1.count = 0;
+		m_roads[m_numRoads].m_type = ALPHA_JOIN;
 		m_roads[m_numRoads].m_uniqueID = m_roads[i].m_uniqueID;
 		m_numRoads++;
 	}
@@ -2922,11 +2918,11 @@ void W3DRoadBuffer::insertCurveSegmentAt(Int ndx1, Int ndx2)
 		Real angle = -PI/6.0f; // -30 degrees.
 		Vector2 pt2 = *pr4;
 		Vector2 pt1 = *pr3;
-		Vector2 direction(pt1.X-pt2.X, pt1.Y-pt2.Y);	
+		Vector2 direction(pt1.X-pt2.X, pt1.Y-pt2.Y);
 		// offset = normal of the vector from pt1 to pt2.
 		Vector2 centerOfCurve(-direction.Y,  direction.X);
 		centerOfCurve.Normalize();
-		centerOfCurve *= m_roads[ndx1].m_curveRadius*m_roads[ndx1].m_scale;	
+		centerOfCurve *= m_roads[ndx1].m_curveRadius*m_roads[ndx1].m_scale;
 		centerOfCurve += pt2;
 
 		rotateAbout(&pt2, centerOfCurve, angle);
@@ -2939,12 +2935,12 @@ void W3DRoadBuffer::insertCurveSegmentAt(Int ndx1, Int ndx2)
 		CHECK_SEGMENTS;
 		m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 		m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-		m_roads[m_numRoads].m_scale = m_roads[ndx1].m_scale; 
-		m_roads[m_numRoads].m_widthInTexture = m_roads[ndx1].m_widthInTexture; 
-		m_roads[m_numRoads].m_type = CURVE; 
+		m_roads[m_numRoads].m_scale = m_roads[ndx1].m_scale;
+		m_roads[m_numRoads].m_widthInTexture = m_roads[ndx1].m_widthInTexture;
+		m_roads[m_numRoads].m_type = CURVE;
 		m_roads[m_numRoads].m_curveRadius = m_roads[ndx1].m_curveRadius;
 		m_roads[m_numRoads].m_uniqueID = m_roads[ndx1].m_uniqueID;
-		m_numRoads++;		
+		m_numRoads++;
 		if (count > 2.0) {
 			Int i;
 			for (i=2; i<count; i++) {
@@ -2957,15 +2953,15 @@ void W3DRoadBuffer::insertCurveSegmentAt(Int ndx1, Int ndx2)
 				m_roads[m_numRoads].m_pt2.loc.Set(pt1);
 				m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 				m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-				m_roads[m_numRoads].m_scale = m_roads[ndx1].m_scale; 
-				m_roads[m_numRoads].m_widthInTexture = m_roads[ndx1].m_widthInTexture; 
-				m_roads[m_numRoads].m_type = CURVE; 
+				m_roads[m_numRoads].m_scale = m_roads[ndx1].m_scale;
+				m_roads[m_numRoads].m_widthInTexture = m_roads[ndx1].m_widthInTexture;
+				m_roads[m_numRoads].m_type = CURVE;
 				m_roads[m_numRoads].m_curveRadius = m_roads[ndx1].m_curveRadius;
 				m_roads[m_numRoads].m_uniqueID = m_roads[ndx1].m_uniqueID;
 				m_numRoads++;
 			}
 		}
-		
+
 		*pr1 = Vector2(pInt3.X, pInt3.Y);
 
 		m_roads[ndx1].m_pt1.last = true;
@@ -2979,9 +2975,9 @@ void W3DRoadBuffer::insertCurveSegmentAt(Int ndx1, Int ndx2)
 			m_roads[m_numRoads].m_pt2.loc.Set(pt1);
 			m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 			m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-			m_roads[m_numRoads].m_scale = m_roads[ndx1].m_scale; 
-			m_roads[m_numRoads].m_widthInTexture = m_roads[ndx1].m_widthInTexture; 
-			m_roads[m_numRoads].m_type = CURVE; 
+			m_roads[m_numRoads].m_scale = m_roads[ndx1].m_scale;
+			m_roads[m_numRoads].m_widthInTexture = m_roads[ndx1].m_widthInTexture;
+			m_roads[m_numRoads].m_type = CURVE;
 			m_roads[m_numRoads].m_curveRadius = m_roads[ndx1].m_curveRadius;
 			m_roads[m_numRoads].m_uniqueID = m_roads[ndx1].m_uniqueID;
 			m_numRoads++;
@@ -3002,9 +2998,9 @@ void W3DRoadBuffer::insertCurveSegmentAt(Int ndx1, Int ndx2)
 		m_roads[ndx2].m_pt2.top = m_roads[ndx2].m_pt2.loc+roadNormal;
 		m_roads[ndx2].m_pt2.bottom = m_roads[ndx2].m_pt2.loc - roadNormal;
 
-	} 
+	}
+
 
-		
 }
 
 //=============================================================================
@@ -3013,19 +3009,19 @@ void W3DRoadBuffer::insertCurveSegmentAt(Int ndx1, Int ndx2)
 /** Rotates ptP about center. */
 //=============================================================================
 void W3DRoadBuffer::rotateAbout(Vector2 *ptP, Vector2 center, Real angle)
-{	 
+{
 	Vector2 offset;
 	offset.X = ptP->X - center.X;
 	offset.Y = ptP->Y - center.Y;
 	Vector2 orgOffset = offset;
 	offset.Rotate(angle);
-	offset.Y -= orgOffset.Y; 
-	offset.X -= orgOffset.X; 
+	offset.Y -= orgOffset.Y;
+	offset.X -= orgOffset.X;
 	*ptP += offset;
 }
 
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -3071,14 +3067,11 @@ W3DRoadBuffer::W3DRoadBuffer(void)	:
 //=============================================================================
 void W3DRoadBuffer::freeRoadBuffers(void)
 {
-	if (m_roads) {
-		delete[] m_roads;
-		m_roads = NULL;
-	}
-	if (m_roadTypes) {
-		delete[] m_roadTypes;
-		m_roadTypes = NULL;
-	}
+	delete[] m_roads;
+	m_roads = NULL;
+
+	delete[] m_roadTypes;
+	m_roadTypes = NULL;
 }
 
 //=============================================================================
@@ -3121,9 +3114,9 @@ void W3DRoadBuffer::allocateRoadBuffers(void)
 				m_maxUID = id;
 #endif // LOAD_TEST_ASSETS
 
-		}  // end if
+		}
 
-	}  // end for road
+	}
 
 #ifdef LOAD_TEST_ASSETS
 	while (i<m_maxRoadTypes && m_roadTypes[i].isAutoLoaded()) {
@@ -3173,7 +3166,7 @@ void W3DRoadBuffer::setMap(WorldHeightMap *pMap)
 void W3DRoadBuffer::loadRoads()
 {
 	if (!m_initialized) {
-		return;  
+		return;
 	}
 	// Free any existing road segments.
 	clearAllRoads();
@@ -3184,6 +3177,7 @@ void W3DRoadBuffer::loadRoads()
 	insertCurveSegments();
 	insertCrossTypeJoins();
 	preloadRoadsInVertexAndIndexBuffers();
+	m_updateBuffers = true;
 	//ticks = ::GetTickCount() - ticks;
 	//char buf[256];
 	//sprintf(buf, "%d road segs, %d milisec.\n", m_numRoads, ticks);
@@ -3201,7 +3195,17 @@ void W3DRoadBuffer::updateLighting(void)
 	// Do road segments.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		m_roads[curRoad].updateSegLighting();
-	}		
+	}
+}
+
+//=============================================================================
+// W3DRoadBuffer::updateCenter
+//=============================================================================
+/** Sets the flag to reload the vertex buffer. */
+//=============================================================================
+void W3DRoadBuffer::updateCenter(void)
+{
+	m_updateBuffers = true;
 }
 
 //=============================================================================
@@ -3261,7 +3265,7 @@ void W3DRoadBuffer::drawRoads(CameraClass * camera, TextureClass *cloudTexture,
 			}
 	#ifdef RTS_DEBUG
 			//DX8Wrapper::Set_Shader(detailShader); // shows clipping.
-	#endif	
+	#endif
 			for (Int pass=0; pass < devicePasses; pass++)
 			{
 				if (!wireframe)
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp
index 2f8633aa94e..2b60391f2c0 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp
@@ -36,6 +36,7 @@
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/PerfTimer.h"
 #include "Common/Player.h"
@@ -63,16 +64,12 @@
 #include "WW3D2/dx8caps.h"
 #include "WW3D2/colorspace.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // DEFINITIONS ////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 ///@todo: Remove these globals since we no longer need W3D to call them for us.
+extern void PrepareShadows();
 extern void DoTrees(RenderInfoClass & rinfo);
 extern void DoShadows(RenderInfoClass & rinfo, Bool stencilPass);
 extern void DoParticles(RenderInfoClass & rinfo);
@@ -97,14 +94,15 @@ RTS3DScene::RTS3DScene()
 	m_numGlobalLights=0;
 	Int i=0;
 	for (; i<LightEnvironmentClass::MAX_LIGHTS; i++)
-	{	m_globalLight[i]=NULL;
+	{
+		m_globalLight[i]=NULL;
 		m_infantryLight[i]=NEW_REF( LightClass, (LightClass::DIRECTIONAL) );
 	}
 
 	m_scratchLight = NEW_REF( LightClass, (LightClass::DIRECTIONAL) );
 //	REF_PTR_SET(m_globalLight[lightIndex], pLight);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if ENABLE_CONFIGURABLE_SHROUD
 	if (TheGlobalData->m_shroudOn)
 		m_shroudMaterialPass = NEW_REF(W3DShroudMaterialPassClass,());
 	else
@@ -133,10 +131,10 @@ RTS3DScene::RTS3DScene()
 	m_heatVisionOnlyPass->Set_Material(heatVisionMtl);
 	m_heatVisionOnlyPass->Set_Shader(heatVisionShader);
 
-	//Allocate memory to hold queue of visible renderobjects that need to be drawn last
+	//Allocate memory to hold queue of visible render objects that need to be drawn last
 	//because they are forced translucent.
 	m_translucentObjectsCount = 0;
-	if (TheGlobalData && TheGlobalData->m_maxVisibleTranslucentObjects)
+	if (TheGlobalData->m_maxVisibleTranslucentObjects > 0)
 		m_translucentObjectsBuffer = NEW RenderObjClass* [TheGlobalData->m_maxVisibleTranslucentObjects];
 	else
 		m_translucentObjectsBuffer = NULL;
@@ -146,21 +144,30 @@ RTS3DScene::RTS3DScene()
 	m_numNonOccluderOrOccludee=0;
 	m_occludedObjectsCount=0;
 
-	m_potentialOccluders=NULL;
-	m_potentialOccludees=NULL;
-	m_nonOccludersOrOccludees=NULL;
+	if (TheGlobalData->m_maxVisibleOccluderObjects > 0)
+		m_potentialOccluders = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccluderObjects];
+	else
+		m_potentialOccluders = NULL;
+
+	if (TheGlobalData->m_maxVisibleOccludeeObjects > 0)
+		m_potentialOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccludeeObjects];
+	else
+		m_potentialOccludees = NULL;
+
+	if (TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects > 0)
+		m_nonOccludersOrOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects];
+	else
+		m_nonOccludersOrOccludees = NULL;
 
 	//Modify the shader to make occlusion transparent
 	ShaderClass shader = PlayerColorShader;
 	shader.Set_Src_Blend_Func(ShaderClass::SRCBLEND_SRC_ALPHA);
 	shader.Set_Dst_Blend_Func(ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA);
 
-    m_potentialOccluders = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccluderObjects];
-	m_potentialOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccludeeObjects];
-	m_nonOccludersOrOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects];
-#ifdef USE_NON_STENCIL_OCCLUSION	
+#ifdef USE_NON_STENCIL_OCCLUSION
 		for (i=0; i<MAX_PLAYER_COUNT; i++)
-		{	m_occludedMaterialPass[i]=NEW_REF(MaterialPassClass,());
+		{
+			m_occludedMaterialPass[i]=NEW_REF(MaterialPassClass,());
 			VertexMaterialClass * vmtl = NEW_REF(VertexMaterialClass,());
 			vmtl->Set_Lighting(true);
 			vmtl->Set_Ambient(0,0,0);	//we're only using emissive so kill all other lights.
@@ -174,7 +181,7 @@ RTS3DScene::RTS3DScene()
 			m_occludedMaterialPass[i]=NULL;
 #endif
 
-}  // end RTS3DScene
+}
 
 //=============================================================================
 // RTS3DScene::~RTS3DScene
@@ -200,23 +207,16 @@ RTS3DScene::~RTS3DScene()
 
 	REF_PTR_RELEASE(m_heatVisionOnlyPass);
 
-	if (m_translucentObjectsBuffer)
-		delete [] m_translucentObjectsBuffer;
-
-	if (m_nonOccludersOrOccludees)
-		delete [] m_nonOccludersOrOccludees;
-
-	if (m_potentialOccludees)
-		delete [] m_potentialOccludees;
-
-	if (m_potentialOccluders)
-		delete [] m_potentialOccluders;
+	delete [] m_translucentObjectsBuffer;
+	delete [] m_nonOccludersOrOccludees;
+	delete [] m_potentialOccludees;
+	delete [] m_potentialOccluders;
 
 	for (i=0; i<MAX_PLAYER_COUNT; i++)
-	{	REF_PTR_RELEASE(m_occludedMaterialPass[i]);
+	{
+		REF_PTR_RELEASE(m_occludedMaterialPass[i]);
 	}
-
-}  // end ~RTS3DScene
+}
 
 
 void	RTS3DScene::setGlobalLight(LightClass *pLight, Int lightIndex)
@@ -248,7 +248,7 @@ void RTS3DScene::flagOccludedObjects(CameraClass * camera)
 	m_occludedObjectsCount=0;
 
 	for (Int i=0; i<m_numPotentialOccludees; i++,occludee++)
-	{	
+	{
 		raytest.Ray.Set(camPosition,(*occludee)->Get_Position());
 
 		RenderObjClass **occluder=m_potentialOccluders;
@@ -263,7 +263,7 @@ void RTS3DScene::flagOccludedObjects(CameraClass * camera)
 
 			// make a vector from the ray origin to the sphere center
 			Vector3 sphere_vector(sphere->Center - raytest.Ray.Get_P0());
-			
+
 			// get the dot product between the sphere_vector and the ray vector
 			Real Alpha = Vector3::Dot_Product(sphere_vector, raytest.Ray.Get_Dir());
 
@@ -271,7 +271,7 @@ void RTS3DScene::flagOccludedObjects(CameraClass * camera)
 
 			if(Beta < 0.0f)
 				continue;	//no intersection
-				
+
 			//Do a more accurate test against object geometry
 			if (robj->Cast_Ray(raytest))
 			{
@@ -280,12 +280,14 @@ void RTS3DScene::flagOccludedObjects(CameraClass * camera)
 				raytest.CollidedRenderObj = robj;
 				hit=TRUE;
 				//reset the result space for next test
-				result.StartBad = false; result.Fraction = 1.0f;
+				result.StartBad = false;
+				result.Fraction = 1.0f;
 				break;
 			}
 		}
 		if (hit)
-		{	//ocludee was blocked by something so flag it for custom rendering
+		{
+			//occludee was blocked by something so flag it for custom rendering
 			DrawableInfo *drawInfo=(DrawableInfo *)(*occludee)->Get_User_Data();
 			drawInfo->m_flags |= DrawableInfo::ERF_IS_OCCLUDED;
 			m_potentialOccludees[m_occludedObjectsCount++] = *occludee;
@@ -339,7 +341,7 @@ Bool RTS3DScene::castRay(RayCollisionTestClass & raytest, Bool testAll, Int coll
 
 			// make a vector from the ray origin to the sphere center
 			Vector3 sphere_vector(sphere->Center - tempRayTest.Ray.Get_P0());
-		
+
 			// get the dot product between the sphere_vector and the ray vector
 			Real Alpha = Vector3::Dot_Product(sphere_vector, tempRayTest.Ray.Get_Dir());
 
@@ -347,7 +349,7 @@ Bool RTS3DScene::castRay(RayCollisionTestClass & raytest, Bool testAll, Int coll
 
 			if(Beta < 0.0f)
 				continue;	//no intersection
-			
+
 			//Do a more accurate test against object geometry
 			if (robj->Cast_Ray(tempRayTest))
 			{
@@ -391,14 +393,13 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
 	m_translucentObjectsCount=0;
 	m_numNonOccluderOrOccludee=0;
 
-	Int currentFrame=0;
-	if (TheGameLogic) currentFrame = TheGameLogic->getFrame();
+	Int currentFrame = TheGameLogic ? TheGameLogic->getFrame() : 0;
 	if (currentFrame <= TheGlobalData->m_defaultOcclusionDelay)
 		currentFrame = TheGlobalData->m_defaultOcclusionDelay+1;	//make sure occlusion is enabled when game starts (frame 0).
 
-
-	if (ShaderClass::Is_Backface_Culling_Inverted()) 
-	{	//we are rendering reflections
+	if (ShaderClass::Is_Backface_Culling_Inverted())
+	{
+		//we are rendering reflections
 		///@todo: Have better flag to detect reflection pass
 
 		// Loop over all top-level RenderObjects in this scene. If the bounding sphere is not in front
@@ -421,7 +422,8 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
 				}
 			}
 			else
-			{	//perform normal culling on non-drawables
+			{
+				//perform normal culling on non-drawables
 				if (robj->Is_Force_Visible()) {
 					robj->Set_Visible(true);
 				} else {
@@ -448,7 +450,8 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
 				bool isVisible=!camera->Cull_Sphere(robj->Get_Bounding_Sphere());
 
 				if (isVisible)
-				{	//need to keep track of occluders and ocludees for subsequent code.
+				{
+					//need to keep track of occluders and occludees for subsequent code.
 					drawInfo = (DrawableInfo *)robj->Get_User_Data();
 					if (drawInfo && (draw=drawInfo->m_drawable) != NULL)
 					{
@@ -460,29 +463,30 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
 						drawInfo->m_flags = DrawableInfo::ERF_IS_NORMAL;	//clear any rendering flags that may be in effect.
 
 						if (draw->getEffectiveOpacity() != 1.0f && m_translucentObjectsCount < TheGlobalData->m_maxVisibleTranslucentObjects)
-						{	drawInfo->m_flags = DrawableInfo::ERF_IS_TRANSLUCENT;	//object is translucent
+						{
+							drawInfo->m_flags = DrawableInfo::ERF_IS_TRANSLUCENT;
 							m_translucentObjectsBuffer[m_translucentObjectsCount++] = robj;
 						}
-						else
-						if (TheGlobalData->m_enableBehindBuildingMarkers && TheGameLogic->getShowBehindBuildingMarkers())
+						else if (TheGlobalData->m_enableBehindBuildingMarkers && TheGameLogic && TheGameLogic->getShowBehindBuildingMarkers())
 						{
 							//visible drawable. Check if it's either an occluder or occludee
 							if (draw->isKindOf(KINDOF_STRUCTURE) && m_numPotentialOccluders < TheGlobalData->m_maxVisibleOccluderObjects)
-							{	//object which could occlude other objects that need to be visible.
+							{
+								//object which could occlude other objects that need to be visible.
 								m_potentialOccluders[m_numPotentialOccluders++]=robj;
 								drawInfo->m_flags |= DrawableInfo::ERF_POTENTIAL_OCCLUDER;
 							}
-							else
-							if (draw->getObject() &&
+							else if (draw->getObject() &&
 									(draw->isKindOf(KINDOF_SCORE) || draw->isKindOf(KINDOF_SCORE_CREATE) || draw->isKindOf(KINDOF_SCORE_DESTROY) || draw->isKindOf(KINDOF_MP_COUNT_FOR_VICTORY)) &&
 									(draw->getObject()->getSafeOcclusionFrame()) <= currentFrame && m_numPotentialOccludees < TheGlobalData->m_maxVisibleOccludeeObjects)
-							{	//object which could be occluded but still needs to be visible.
+							{
+								//object which could be occluded but still needs to be visible.
 								m_potentialOccludees[m_numPotentialOccludees++]=robj;
 								drawInfo->m_flags |= DrawableInfo::ERF_POTENTIAL_OCCLUDEE;
 							}
-							else
-							if (drawInfo->m_flags == DrawableInfo::ERF_IS_NORMAL && m_numNonOccluderOrOccludee < TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects)
-							{	//regular object with no custom effects but still needs to be delayed to get the occlusion feature to work correctly.
+							else if (drawInfo->m_flags == DrawableInfo::ERF_IS_NORMAL && m_numNonOccluderOrOccludee < TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects)
+							{
+								//regular object with no custom effects but still needs to be delayed to get the occlusion feature to work correctly.
 								m_nonOccludersOrOccludees[m_numNonOccluderOrOccludee++]=robj;
 								drawInfo->m_flags |= DrawableInfo::ERF_IS_NON_OCCLUDER_OR_OCCLUDEE;
 							}
@@ -516,10 +520,10 @@ void RTS3DScene::renderSpecificDrawables(RenderInfoClass &rinfo, Int numDrawable
 #ifdef DIRTY_CONDITION_FLAGS
 	StDrawableDirtyStuffLocker lockDirtyStuff;
 #endif
-	Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
-	RefRenderObjListIterator it(&UpdateList);	
+	const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
+	RefRenderObjListIterator it(&UpdateList);
 	// loop through all render objects in the list:
-	for (it.First(&RenderList); !it.Is_Done();) 
+	for (it.First(&RenderList); !it.Is_Done();)
 	{
 		RenderObjClass *robj;
 		// get the render object
@@ -552,7 +556,6 @@ void RTS3DScene::renderSpecificDrawables(RenderInfoClass &rinfo, Int numDrawable
 //=============================================================================
 void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, Int localPlayerIndex)
 {
-
 	Drawable *draw = NULL;
 	DrawableInfo *drawInfo = NULL;
 	Bool drawableHidden=FALSE;
@@ -563,7 +566,8 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 	LightClass **sceneLights=m_globalLight;
 
 	if (robj->Class_ID() == RenderObjClass::CLASSID_IMAGE3D	)
-	{	robj->Render(rinfo);	//notify decals system that this track is visible
+	{
+		robj->Render(rinfo);	//notify decals system that this track is visible
 		return;	//decals are not lit by this system yet so skip rest of lighting
 	}
 
@@ -571,7 +575,8 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 	SphereClass sph = robj->Get_Bounding_Sphere();
 	drawInfo = (DrawableInfo *)robj->Get_User_Data();
 	if (drawInfo)
-	{	draw = drawInfo->m_drawable;
+	{
+		draw = drawInfo->m_drawable;
 		//If we have a drawInfo but not drawable, we must be dealing with
 		//a ghost object which is always fogged.
 		if (!draw)
@@ -593,12 +598,12 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 		obj = draw->getObject();
 		if (obj) {
 			ss = obj->getShroudedStatus(localPlayerIndex);
-			// For objects like planes, that pop out of the shroud, fire, then head back, 
-			// we keep drawing them for 2 seconds after they return to the fogged area, 
+			// For objects like planes, that pop out of the shroud, fire, then head back,
+			// we keep drawing them for 2 seconds after they return to the fogged area,
 			// so the player can see them and missiles chasing them.  jba.
 			if (ss == OBJECTSHROUD_CLEAR) {
 				draw->setShroudClearFrame(TheGameLogic->getFrame());
-			}	else if (ss >= OBJECTSHROUD_FOGGED && draw->getShroudClearFrame()!=0) {
+			}	else if (ss >= OBJECTSHROUD_FOGGED && draw->getShroudClearFrame() != InvalidShroudClearFrame) {
 				UnsignedInt limit = 2*LOGICFRAMES_PER_SECOND;
 				if (obj->isEffectivelyDead()) {
 					limit += 3*LOGICFRAMES_PER_SECOND;
@@ -612,19 +617,22 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
  				return;	//this object was removed by the getShroudedStatus() call.
 		}
 		else
-		{	//drawable with no object so no way to know if it's shrouded.
+		{
+			//drawable with no object so no way to know if it's shrouded.
 			ss = OBJECTSHROUD_CLEAR;	//assume not shrouded/fogged.
 			//Check to see if there is another unrelated object which controls the shroud status
 			//(Hack for prison camps which contain enemy prisoner drawables)
 			if (drawInfo->m_shroudStatusObjectID != INVALID_ID)
-			{	Object *shroudObject=TheGameLogic->findObjectByID(drawInfo->m_shroudStatusObjectID);
+			{
+				Object *shroudObject=TheGameLogic->findObjectByID(drawInfo->m_shroudStatusObjectID);
 				if (shroudObject && shroudObject->getShroudedStatus(localPlayerIndex) >= OBJECTSHROUD_FOGGED)
 					ss = OBJECTSHROUD_SHROUDED;	//we will assume that drawables without objects are 'particle' like and therefore don't need drawing if fogged/shrouded.
 			}
 		}
 
 		if (draw->isKindOf(KINDOF_INFANTRY))
-		{	ambient = m_infantryAmbient;
+		{
+			ambient = m_infantryAmbient;
 			sceneLights = m_infantryLight;
 		}
 
@@ -642,9 +650,9 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 		if ( tintColor || selectionColor )
 		{
 			Vector3 sumTint, temp, restore;
-			
-			sumTint.Set(0,0,0); 
-			
+
+			sumTint.Set(0,0,0);
+
 			if (tintColor)
 				Vector3::Add(sumTint, *tintColor, &sumTint);
 			if (selectionColor)
@@ -661,8 +669,8 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 				lightEnv.Add_Light(*sceneLights[globalLightIndex]);
 				sceneLights[globalLightIndex]->Set_Diffuse( restore );
 
-			} // next light
-			
+			}
+
 			temp = lightEnv.Get_Equivalent_Ambient();
 			Vector3::Add(sumTint, temp, &temp );
 
@@ -678,7 +686,7 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 		}
 
 		//Apply custom render pass for any drawables with heatvision enabled
-		if (draw->getHeatVisionOpacity() != 0 ) 
+		if (draw->getHeatVisionOpacity() != 0 )
 		{
 			rinfo.materialPassEmissiveOverride = draw->getHeatVisionOpacity();
 			if (draw->getStealthLook() == STEALTHLOOK_VISIBLE_DETECTED )
@@ -697,13 +705,15 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 		}
 	}
 	else
-	{	//either no drawable or it is hidden
+	{
+		//either no drawable or it is hidden
 		if (drawableHidden)
 			return;	//don't bother with anything else
 
 		//Render object without a drawable.  Must be either some fluff/debug object or a ghostObject.
 		if (ss == OBJECTSHROUD_FOGGED)
-		{	//Must be ghost object because we don't fog normal things.  Fogged objects always have a predefined
+		{
+			//Must be ghost object because we don't fog normal things.  Fogged objects always have a predefined
 			//lighting environment applied which emulates the look of fog.
 			rinfo.light_environment = &m_foggedLightEnv;
 			robj->Render(rinfo);
@@ -711,7 +721,8 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 			return;
 		}
 		else
-		{	lightEnv.Reset(sph.Center, ambient);
+		{
+			lightEnv.Reset(sph.Center, ambient);
 			for (Int globalLightIndex = 0; globalLightIndex < m_numGlobalLights; globalLightIndex++)
 				lightEnv.Add_Light(*m_globalLight[globalLightIndex]);
 		}
@@ -720,9 +731,9 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 	if (!drawableHidden)
 	{
 		//standard scene lights
-		RefRenderObjListIterator it2(&LightList);	
+		RefRenderObjListIterator it2(&LightList);
 		for (it2.First(); !it2.Is_Done(); it2.Next())
-		{	
+		{
 			LightClass *pLight = (LightClass*)it2.Peek_Obj();
 			SphereClass lSph = pLight->Get_Bounding_Sphere();
 			Bool cull = (pLight->Get_Type() == LightClass::POINT && !Spheres_Intersect(sph, lSph));
@@ -732,9 +743,9 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 		}
 
 		// dynamic lights
-		RefRenderObjListIterator dynaLightIt(&m_dynamicLightList);	
+		RefRenderObjListIterator dynaLightIt(&m_dynamicLightList);
 		for (dynaLightIt.First(); !dynaLightIt.Is_Done(); dynaLightIt.Next())
-		{	
+		{
 			W3DDynamicLight* pDyna = (W3DDynamicLight*)dynaLightIt.Peek_Obj();
 			if (!pDyna->isEnabled()) {
 				continue;
@@ -745,42 +756,44 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 			}
 			lightEnv.Add_Light(*(LightClass*)dynaLightIt.Peek_Obj());
 		}
-		
+
 		lightEnv.Pre_Render_Update(rinfo.Camera.Get_Transform());
 		rinfo.light_environment = &lightEnv;
 
 		if (drawInfo)
 		{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if ENABLE_CONFIGURABLE_SHROUD
 			if (!TheGlobalData->m_shroudOn)
 				ss = OBJECTSHROUD_CLEAR;
 #endif
-			
-			if (m_customPassMode == SCENE_PASS_DEFAULT)	
+
+			if (m_customPassMode == SCENE_PASS_DEFAULT)
 			{
 				if (ss <= OBJECTSHROUD_CLEAR)
+				{
 					robj->Render(rinfo);
+				}
 				else
-				{	
-						rinfo.Push_Material_Pass(m_shroudMaterialPass);
-						robj->Render(rinfo);
-						rinfo.Pop_Material_Pass();
+				{
+					rinfo.Push_Material_Pass(m_shroudMaterialPass);
+					robj->Render(rinfo);
+					rinfo.Pop_Material_Pass();
 				}
 			}
-			else
-			if (m_maskMaterialPass)
-			{	rinfo.Push_Material_Pass(m_maskMaterialPass);
+			else if (m_maskMaterialPass)
+			{
+				rinfo.Push_Material_Pass(m_maskMaterialPass);
 				rinfo.Push_Override_Flags(RenderInfoClass::RINFO_OVERRIDE_ADDITIONAL_PASSES_ONLY);
 				robj->Render(rinfo);
 				rinfo.Pop_Override_Flags();
 				rinfo.Pop_Material_Pass();
 			}
-		}//drawInfo exists so rendering a drawable.
+		}
 		else
 		{
 			robj->Render(rinfo);
 		}
-	}//drawable or robj is not hidden
+	}
 
 	rinfo.light_environment = NULL;
 	if (doExtraMaterialPop)	//check if there is an extra material on the stack from the heatvision effect.
@@ -794,9 +807,14 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 /**Draw everything that was submitted from this scene*/
 void RTS3DScene::Flush(RenderInfoClass & rinfo)
 {
+	// TheSuperHackers @bugfix Now always prepares shadows to guarantee correct state before doing any
+	// shadow draw calls. Originally just drawing shadows for trees would not properly prepare shadows.
+	PrepareShadows();
+
 	//don't draw shadows in this mode because they interfere with destination alpha or are invisible (wireframe)
 	if (m_customPassMode == SCENE_PASS_DEFAULT && Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
 		DoShadows(rinfo, false);	//draw all non-stencil shadows (decals) since they fall under other objects.
+
 	TheDX8MeshRenderer.Flush();	//draw all non-translucent objects.
 
 	//draw all non-translucent objects which were separated because they are hidden and need custom rendering.
@@ -812,10 +830,11 @@ void RTS3DScene::Flush(RenderInfoClass & rinfo)
 	//don't draw shadows in this mode because they interfere with destination alpha
 	if (m_customPassMode == SCENE_PASS_DEFAULT && Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
 		DoShadows(rinfo, true);	//draw all stencil shadows
+
 	WW3D::Render_And_Clear_Static_Sort_Lists(rinfo);	//draws things like water
 
 	if (m_customPassMode == SCENE_PASS_DEFAULT && Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
-		flushTranslucentObjects(rinfo);	//draw all translucent meshes which don't need per-poly sorting.
+		flushTranslucentObjects(rinfo);	//draw all translucent meshes which don't need per-polygon sorting.
 
 	{
 		//USE_PERF_TIMER(translucentRender)
@@ -824,13 +843,13 @@ void RTS3DScene::Flush(RenderInfoClass & rinfo)
 		if (m_customPassMode == SCENE_PASS_DEFAULT && Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
 			DoParticles(rinfo);	//queue up particles for rendering.
 
-		SortingRendererClass::Flush();	//draw sorted translucent polys like particles.
+		SortingRendererClass::Flush();	//draw sorted translucent polygons like particles.
 	}
 	TheDX8MeshRenderer.Clear_Pending_Delete_Lists();
 }
 
 /**Generate a predefined light environment(s) that will be applied to many objects.  Useful for things like totally fogged
-objects and most generaic map objects that are not lit by dynamic lights.*/
+objects and most generic map objects that are not lit by dynamic lights.*/
 void RTS3DScene::updateFixedLightEnvironments(RenderInfoClass & rinfo)
 {
 	//Figure out how dimly lit fogged objects should be compared to fully lit.
@@ -841,13 +860,14 @@ void RTS3DScene::updateFixedLightEnvironments(RenderInfoClass & rinfo)
 		infantryLightScale = TheGlobalData->m_scriptOverrideInfantryLightScale;
 	else
 		infantryLightScale = TheGlobalData->m_infantryLightScale[TheGlobalData->m_timeOfDay];
-	
+
 	//Generate the default light environment
 	m_defaultLightEnv.Reset(Vector3(0,0,0), Get_Ambient_Light());
 	m_foggedLightEnv.Reset(Vector3(0,0,0), Get_Ambient_Light()*foggedLightFrac);
 
 	for (Int globalLightIndex = 0; globalLightIndex < m_numGlobalLights; globalLightIndex++)
-	{	m_defaultLightEnv.Add_Light(*m_globalLight[globalLightIndex]);
+	{
+		m_defaultLightEnv.Add_Light(*m_globalLight[globalLightIndex]);
 		//copy default lighting for infantry so we can tweak it.
 		*m_infantryLight[globalLightIndex]=*m_globalLight[globalLightIndex];
 		m_globalLight[globalLightIndex]->Get_Diffuse(&oldDiffuse);
@@ -912,14 +932,14 @@ void RTS3DScene::Render(RenderInfoClass & rinfo)
 	if (Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
 	{
 		if (m_customPassMode == SCENE_PASS_DEFAULT)
-		{	//Regular rendering pass with no effects
+		{
+			//Regular rendering pass with no effects
 			updatePlayerColorPasses();///@todo: this probably doesn't need to be done each frame.
 			updateFixedLightEnvironments(rinfo);
 			Customized_Render(rinfo);
 			Flush(rinfo);
 		}
-		else
-		if (m_customPassMode == SCENE_PASS_ALPHA_MASK)
+		else if (m_customPassMode == SCENE_PASS_ALPHA_MASK)
 		{
 			//a projected alpha texture which will later be used to determine where
 			//wireframe should be visible.
@@ -943,14 +963,15 @@ void RTS3DScene::Render(RenderInfoClass & rinfo)
 	{
 		Bool old_enable=WW3D::Is_Texturing_Enabled();
 		if (Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_CLEAR_LINE)
-		{	//render scene with solid black color but have destination alpha store
+		{
+			//render scene with solid black color but have destination alpha store
 			//a projected alpha texture which will later be used to determine where
 			//wireframe should be visible.
 			///@todo: Clearing to black may not be needed if the scene already did the clear.
 			DX8Wrapper::Clear(true, false, Vector3(0.0f,0.0f,0.0f),1.0f);	// Clear color but not z
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_ALPHA);
 			DX8Wrapper::Set_DX8_Render_State (D3DRS_ZBIAS, 0);
-			
+
 			//We're only filling the z-buffer so ignore normal textures and state changes to speed things up.
 			m_customPassMode = SCENE_PASS_ALPHA_MASK;
 			m_maskMaterialPass->setAllowUninstall(FALSE);
@@ -960,7 +981,7 @@ void RTS3DScene::Render(RenderInfoClass & rinfo)
 
 			m_maskMaterialPass->setAllowUninstall(TRUE);
 			m_maskMaterialPass->UnInstall_Materials();
-			
+
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
 			WW3D::Enable_Coloring(0xff008000);
 			WW3D::Enable_Texturing(false);
@@ -988,7 +1009,8 @@ void RTS3DScene::Render(RenderInfoClass & rinfo)
 			ShaderClass::Invalidate();
 		}
 		else
-		{	//old W3D custom rendering code.
+		{
+			//old W3D custom rendering code.
 
 			//Disable writes to color buffer to save memory bandwidth - we only need Z.
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,0);
@@ -1040,7 +1062,7 @@ void RTS3DScene::Customized_Render( RenderInfoClass &rinfo )
 	m_translucentObjectsCount = 0;	//start of new frame so no translucent objects
 	m_occludedObjectsCount = 0;
 
-	Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+	const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
 
 #define USE_LIGHT_ENV 1
 
@@ -1051,17 +1073,17 @@ void RTS3DScene::Customized_Render( RenderInfoClass &rinfo )
 	   flagOccludedObjects(&rinfo.Camera);
 #endif
    }
-   Visibility_Checked = false;	
-	
+   Visibility_Checked = false;
+
 
-	RefRenderObjListIterator it(&UpdateList);	
+	RefRenderObjListIterator it(&UpdateList);
 	// allow all objects in the update list to do their "every frame" processing
 	for (it.First(); !it.Is_Done(); it.Next()) {
 		RenderObjClass * robj = it.Peek_Obj();
 		if (robj->Class_ID() == RenderObjClass::CLASSID_TILEMAP)
 			terrainObject=robj;	//found terrain object, store for later.
 		if (!ShaderClass::Is_Backface_Culling_Inverted()) {
-			// If we are doing water mirror, we draw with backface culling inverted.  In this case, 
+			// If we are doing water mirror, we draw with backface culling inverted.  In this case,
 			// we only want to call On_Frame_Update if we aren't drawing water, as otherwise
 			// we get 2 frame updates per frame, and it screws up the particle emitters.
 			it.Peek_Obj()->On_Frame_Update();
@@ -1070,7 +1092,7 @@ void RTS3DScene::Customized_Render( RenderInfoClass &rinfo )
 
 	//terrain needs to be rendered first
 	if (terrainObject)	// Don't check visibility - terrain is always visible. jba.
-	{		
+	{
 		robj=terrainObject;
 		rinfo.light_environment = NULL;		// Terrain is self lit.
 		rinfo.Camera.Set_User_Data(this);	//pass the scene to terrain via user data.
@@ -1080,8 +1102,7 @@ void RTS3DScene::Customized_Render( RenderInfoClass &rinfo )
 			robj->Render(rinfo);
 			rinfo.Pop_Material_Pass();
 		}
-		else
-		if (m_customPassMode == SCENE_PASS_ALPHA_MASK && m_maskMaterialPass)
+		else if (m_customPassMode == SCENE_PASS_ALPHA_MASK && m_maskMaterialPass)
 		{
 			rinfo.Push_Material_Pass(m_maskMaterialPass);
 			robj->Render(rinfo);
@@ -1095,15 +1116,14 @@ void RTS3DScene::Customized_Render( RenderInfoClass &rinfo )
 		return;
 	}
 #ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_disableObjects) { 
+	if (DX8Wrapper::stats.m_disableObjects) {
 		return;
 	}
 #endif
 
 	// loop through all render objects in the list:
-	for (it.First(&RenderList); !it.Is_Done();) 
+	for (it.First(&RenderList); !it.Is_Done();)
 	{
-
 		// get the render object
 		robj = it.Peek_Obj();
  		it.Next();	//advance to next object in case this one gets deleted during renderOneObject().
@@ -1124,20 +1144,22 @@ void RTS3DScene::Customized_Render( RenderInfoClass &rinfo )
 				renderOneObject(rinfo, robj, localPlayerIndex);
 		}
 	}
-	
+
 	//Tell shadow manager to render shadows at the end of this frame
 	//Don't draw shadows if there is no terrain present.
 	if (TheW3DShadowManager && terrainObject && !ShaderClass::Is_Backface_Culling_Inverted() &&
 		Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
+	{
 		TheW3DShadowManager->queueShadows(TRUE);
+	}
 
 	// only render particles once per frame
 	if (terrainObject != NULL && TheParticleSystemManager != NULL &&
 		Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
-	{	TheParticleSystemManager->queueParticleRender();
+	{
+		TheParticleSystemManager->queueParticleRender();
 	}
-
-}  // end Customized_Renderer
+}
 
 /**Convert a player index to a color index, we use this because color indices are
 assigned in left-right binary flipped fashion so as not to occupy lower bits unless
@@ -1156,11 +1178,13 @@ Int playerIndexToColorIndex(Int playerIndex)
 		flippedPosition = NUMBER_PLAYER_COLOR_BITS-1-i;	//correct position of bit after it's flipped left/right
 
 		if (flippedPosition > i)
-		{	//shifting left
+		{
+			//shifting left
 			result |= (tmp & (1<<i))<<(flippedPosition-i);
 		}
 		else
-		{	//shifting right
+		{
+			//shifting right
 			result |= (tmp & (1<<i))>>(i-flippedPosition);
 		}
 	}
@@ -1173,7 +1197,7 @@ void renderStenciledPlayerColor( UnsignedInt color, UnsignedInt stencilRef, Bool
 {
 	struct _TRANSLITVERTEX {
 	    Vector4 p;
-		DWORD color;   // diffuse color    
+		DWORD color;   // diffuse color
 	} v[4];
 
 	Int xpos, ypos, width, height;
@@ -1195,7 +1219,7 @@ void renderStenciledPlayerColor( UnsignedInt color, UnsignedInt stencilRef, Bool
 	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 	DX8Wrapper::Set_Material(vmat);
 	REF_PTR_RELEASE(vmat);
-	DX8Wrapper::Apply_Render_State_Changes();	//force update all renderstates
+	DX8Wrapper::Apply_Render_State_Changes();	//force update all render states
 
 	LPDIRECT3DDEVICE8 m_pDev=DX8Wrapper::_Get_D3D_Device8();
 
@@ -1211,33 +1235,37 @@ void renderStenciledPlayerColor( UnsignedInt color, UnsignedInt stencilRef, Bool
 	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZENABLE, TRUE );
 	DWORD	oldColorWriteEnable=0x12345678;
 	if (clear)
-	{	//we want to clear the stencil buffer to some known value whereever a player index is stored
+	{
+		//we want to clear the stencil buffer to some known value whereever a player index is stored
 		Int occludedMask=TheW3DShadowManager->getStencilShadowMask();
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILREF,      0x80808080 );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILMASK,     occludedMask );	//isolate bits containing occluder|playerIndex
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILWRITEMASK,0xffffffff );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILFUNC,  D3DCMP_LESS );	//only draw to pixels that match the reference value
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILZFAIL, D3DSTENCILOP_REPLACE );	
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILZFAIL, D3DSTENCILOP_REPLACE );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILPASS,  D3DSTENCILOP_REPLACE );	//pixels which had occluded player colors, get MSB set.
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILFAIL,  D3DSTENCILOP_ZERO );	//pixels which had no occluded player colors are cleared.
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC, D3DCMP_NEVER  );	//fail all access to the frame buffer to improve memory bandwidth
 
 		//disable writes to color buffer
 		if (DX8Wrapper::Get_Current_Caps()->Get_DX8_Caps().PrimitiveMiscCaps & D3DPMISCCAPS_COLORWRITEENABLE)
-		{	DX8Wrapper::_Get_D3D_Device8()->GetRenderState(D3DRS_COLORWRITEENABLE, &oldColorWriteEnable);
+		{
+			DX8Wrapper::_Get_D3D_Device8()->GetRenderState(D3DRS_COLORWRITEENABLE, &oldColorWriteEnable);
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,0);
 		}
 		else
-		{	//device does not support disabling writes to color buffer so fake it through alpha blending
+		{
+			//device does not support disabling writes to color buffer so fake it through alpha blending
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE, TRUE);
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_ZERO );
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND, D3DBLEND_ONE );
 		}
 	}
 	else
-	{	DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILREF,      stencilRef );
+	{
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILREF,      stencilRef );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILMASK,     0xffffffff );
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILWRITEMASK,0xffffffff );	
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILWRITEMASK,0xffffffff );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILFUNC,  D3DCMP_EQUAL );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILPASS,  D3DSTENCILOP_KEEP );
@@ -1262,7 +1290,7 @@ void renderStenciledPlayerColor( UnsignedInt color, UnsignedInt stencilRef, Bool
 	if (oldColorWriteEnable != 0x12345678)
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,oldColorWriteEnable);
 
-}  // end renderStencilShadows
+}
 
 #define MAX_VISIBLE_OCCLUDED_PLAYER_OBJECTS	512 //maximum number of occluded objects permitted per player
 void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo)
@@ -1284,14 +1312,15 @@ void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo)
 	//state changes needed when drawing them.
 	Int i=0;
 	for (; i<MAX_PLAYER_COUNT; i++)
-	{	lastPlayerObject[i]=&playerObjects[i][0];
+	{
+		lastPlayerObject[i]=&playerObjects[i][0];
 		playerColorIndex[i]=-1;
 	}
 
 	//Assume no player colors are visible and all stencil bits are free for use by shadows.
 	TheW3DShadowManager->setStencilShadowMask(0);
 
-	Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+	const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
 
 	if (m_numPotentialOccludees && m_numPotentialOccluders)
 	{
@@ -1334,10 +1363,11 @@ void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo)
 		for (k=0; k<MAX_PLAYER_COUNT; k++)
 		{
 			if ((numObjects=lastPlayerObject[k]-&playerObjects[k][0]) != 0)
-			{	
+			{
 				//this player has some objects so draw them using his color index.
 				if (playerColorIndex[k]==-1)	//color index not assigned yet?
-				{	//assign a new color index to this player
+				{
+					//assign a new color index to this player
 					playerColorIndex[k]=playerIndexToColorIndex(usedPlayerColorIndex++);
 					//assign a color to this index by copying it from the controlling player
 					//of all objects in this list.
@@ -1415,7 +1445,8 @@ void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo)
 
 		TheW3DShadowManager->setStencilShadowMask(usedPlayerColorBits);
 		if (numVisiblePlayerColors >= 8 && TheGlobalData->m_useShadowVolumes)
-		{	//for cases where we have 8 or more visible players, we're only left with 3 bits to store
+		{
+			//for cases where we have 8 or more visible players, we're only left with 3 bits to store
 			//stencil shadows.  That's probably not enough since it will only allow 7 overlapping shadows.
 			//So we clear the stencil buffer, leaving only the MSB set on any occluded player pixels so that
 			//shadow code knows not to overwrite these pixels.
@@ -1427,7 +1458,8 @@ void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo)
 	}
 	else
 	if (m_numNonOccluderOrOccludee || m_numPotentialOccluders || m_numPotentialOccludees)
-	{	//no occluded objects so don't need to render anything special.  Just draw the queued up
+	{
+		//no occluded objects so don't need to render anything special.  Just draw the queued up
 		//objects like normal because they were skipped in the main scene traversal.
 
 		RenderObjClass **occludeeList=m_potentialOccludees;
@@ -1469,7 +1501,7 @@ void RTS3DScene::flushOccludedObjects(RenderInfoClass & rinfo)
 
 	if (m_occludedObjectsCount)
 	{
-		Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+		const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
 
 		if (DX8Wrapper::Has_Stencil())	//just in case we have shadows, disable them over occluded pixels.
 		{
@@ -1539,7 +1571,7 @@ void RTS3DScene::flushTranslucentObjects(RenderInfoClass & rinfo)
 
 	if (m_translucentObjectsCount)
 	{
-		Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+		const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
 
 		for (Int i=0; i<m_translucentObjectsCount; i++)
 		{
@@ -1605,21 +1637,21 @@ void RTS3DScene::addDynamicLight(W3DDynamicLight * obj)
 //=============================================================================
 W3DDynamicLight * RTS3DScene::getADynamicLight(void)
 {
-		RefRenderObjListIterator dynaLightIt(&m_dynamicLightList);
-		W3DDynamicLight *pLight;
-		for (dynaLightIt.First(); !dynaLightIt.Is_Done(); dynaLightIt.Next())
-		{		
-			pLight = (W3DDynamicLight*)dynaLightIt.Peek_Obj();
-			if (!pLight->isEnabled()) {
-				pLight->setEnabled(true);
-				return(pLight);
-			}
+	RefRenderObjListIterator dynaLightIt(&m_dynamicLightList);
+	W3DDynamicLight *pLight;
+	for (dynaLightIt.First(); !dynaLightIt.Is_Done(); dynaLightIt.Next())
+	{
+		pLight = (W3DDynamicLight*)dynaLightIt.Peek_Obj();
+		if (!pLight->isEnabled()) {
+			pLight->setEnabled(true);
+			return(pLight);
 		}
-		pLight = NEW_REF(W3DDynamicLight, ());
-		addDynamicLight( pLight );
-		pLight->Release_Ref();
-		pLight->setEnabled(true);
-		return(pLight);
+	}
+	pLight = NEW_REF(W3DDynamicLight, ());
+	addDynamicLight( pLight );
+	pLight->Release_Ref();
+	pLight->setEnabled(true);
+	return(pLight);
 }
 
 //=============================================================================
@@ -1643,7 +1675,7 @@ void RTS3DScene::doRender( CameraClass * cam )
 	DRAW();
 	m_camera = NULL;
 
-}  // end Customized_Render
+}
 
 //=============================================================================
 // RTS3DScene::draw
@@ -1652,15 +1684,12 @@ void RTS3DScene::doRender( CameraClass * cam )
 //=============================================================================
 void RTS3DScene::draw( )
 {
-
 	if (m_camera == NULL) {
 		DEBUG_CRASH(("Null m_camera in RTS3DScene::draw"));
 		return;
 	}
 	WW3D::Render( this, m_camera );
-
-
-}  // end Customized_Render
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1677,7 +1706,7 @@ RTS2DScene::RTS2DScene()
 	setName("RTS2DScene");
 	m_status = NEW_REF( W3DStatusCircle, () );
 	Add_Render_Object( m_status );
-}  // end RTS2DScene
+}
 
 //=============================================================================
 // RTS2DScene::~RTS2DScene
@@ -1688,7 +1717,7 @@ RTS2DScene::~RTS2DScene()
 {
 	this->Remove_Render_Object(m_status);
 	REF_PTR_RELEASE(m_status);
-}  // end ~RTS2DScene
+}
 
 //=============================================================================
 // RTS2DScene::Custimized_Render
@@ -1697,11 +1726,9 @@ RTS2DScene::~RTS2DScene()
 //=============================================================================
 void RTS2DScene::Customized_Render( RenderInfoClass &rinfo )
 {
-
 	// call simple scene class renderer
 	SimpleSceneClass::Customized_Render( rinfo );
-
-}  // end Customized_Render
+}
 
 //=============================================================================
 // RTS2DScene::doRender
@@ -1710,12 +1737,10 @@ void RTS2DScene::Customized_Render( RenderInfoClass &rinfo )
 //=============================================================================
 void RTS2DScene::doRender( CameraClass * cam )
 {
-
 	m_camera = cam;
 	DRAW();
 	m_camera = NULL;
-
-}  // end Customized_Render
+}
 
 //=============================================================================
 // RTS2DScene::draw
@@ -1724,15 +1749,12 @@ void RTS2DScene::doRender( CameraClass * cam )
 //=============================================================================
 void RTS2DScene::draw( )
 {
-
 	if (m_camera == NULL) {
 		DEBUG_CRASH(("Null m_camera in RTS2DScene::draw"));
 		return;
 	}
 	WW3D::Render( this, m_camera );
-
-
-}  // end Customized_Render
+}
 
 
 
@@ -1747,7 +1769,7 @@ void RTS2DScene::draw( )
 //=============================================================================
 RTS3DInterfaceScene::RTS3DInterfaceScene()
 {
-}  // end RTS3DInterfaceScene
+}
 
 //=============================================================================
 // RTS3DInterfaceScene::~RTS3DInterfaceScene
@@ -1756,7 +1778,7 @@ RTS3DInterfaceScene::RTS3DInterfaceScene()
 //=============================================================================
 RTS3DInterfaceScene::~RTS3DInterfaceScene()
 {
-}  // end ~RTS3DInterfaceScene
+}
 
 //=============================================================================
 // RTS3DInterfaceScene::Custimized_Render
@@ -1765,18 +1787,16 @@ RTS3DInterfaceScene::~RTS3DInterfaceScene()
 //=============================================================================
 void RTS3DInterfaceScene::Customized_Render( RenderInfoClass &rinfo )
 {
-
 	// call simple scene class renderer
 	SimpleSceneClass::Customized_Render( rinfo );
-
-}  // end Customized_Render
+}
 
 
 
 /// The following is an :archive" of a partial attempt at detecting the mapshroud hack
 /*
  *
-	
+
 void RTS3DScene::Visibility_Check(CameraClass * camera)
 {
 #ifdef DIRTY_CONDITION_FLAGS
@@ -1799,7 +1819,7 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
 		currentFrame = TheGlobalData->m_defaultOcclusionDelay+1;	//make sure occlusion is enabled when game starts (frame 0).
 
 
-	if (ShaderClass::Is_Backface_Culling_Inverted()) 
+	if (ShaderClass::Is_Backface_Culling_Inverted())
 	{	//we are rendering reflections
 		///@todo: Have better flag to detect reflection pass
 
@@ -1848,7 +1868,7 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
 			} else {
 
 				UnsignedByte isVisible = 0;
-        
+
 
         //Cheater Foil
         isVisible |= (UnsignedByte)(camera->Cull_Sphere(robj->Get_Bounding_Sphere()) == FALSE);
@@ -1856,7 +1876,7 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
         isVisible |= (draw->getFullyObscuredByShroudWithCheatSpy());
 				robj->Set_VisibleWithCheatSpy(isVisible);
 				if (robj->Is_VisibleWithCheatSpy())//this will clear for the bit set above
-          
+
 				{	//need to keep track of occluders and ocludees for subsequent code.
 					drawInfo = (DrawableInfo *)robj->Get_User_Data();
 					if (drawInfo && (draw=drawInfo->m_drawable) != NULL)
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
deleted file mode 100644
index 31019b900c6..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
+++ /dev/null
@@ -1,2916 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DShaderManager.cpp ////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: W3DShaderManager.cpp
-//
-// Created:   Mark Wilczynski, August 2001
-//
-// Desc:      Perform tests on currently selected WW3D/D3D device to determine
-//			  which of our rendering features are supported.  The system allows
-//			  setting up a few custom shaders that are selected based on video
-//			  card features.
-//
-//			  To add a new shader to the system:
-//			  0) Add your shader to the ShaderTypes enum
-//			  1) Create shader using W3DShaderInterface
-//			  2) Repeat step 1 for any alternate shaders
-//			  3) Create list of alternate shaders sorted by order of preference.
-//				 The first shader which passes hardware validation will be selected.
-//			  4) Add list from step 3) to MasterShaderList[].
-//
-//-----------------------------------------------------------------------------
-
-#include "dx8wrapper.h"
-#include "assetmgr.h"
-#include "Lib/BaseType.h"
-#include "Common/file.h"
-#include "Common/FileSystem.h"
-#include "W3DDevice/GameClient/W3DShaderManager.h"
-#include "W3DDevice/GameClient/W3DShroud.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/W3DCustomScene.h"
-#include "GameClient/View.h"
-#include "GameClient/CommandXlat.h"
-#include "GameClient/Display.h"
-#include "GameClient/Water.h"
-#include "GameLogic/GameLogic.h"
-#include "Common/GlobalData.h"
-#include "Common/GameLOD.h"
-#include "d3dx8tex.h"
-#include "dx8caps.h"
-#include "Common/GameLOD.h"
-#include "benchmark.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-/** Interface definition for custom shaders we define in our app.  These shaders can perform more complex
-	operations than those allowed in the WW3D2 shader system.
-*/
-class W3DShaderInterface
-{
-public:
-	Int getNumPasses(void) {return m_numPasses;};	///<return number of passes needed for this shader
-	virtual Int set(Int pass) {return TRUE;};		///<setup shader for the specified rendering pass.
-	 ///do any custom resetting necessary to bring W3D in sync.
-	virtual void reset(void) {
-		ShaderClass::Invalidate();
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);};
-	virtual Int init(void) = 0;			///<perform any one time initialization and validation
-	virtual Int shutdown(void) { return TRUE;};			///<release resources used by shader
-protected:
-	Int m_numPasses;						///<number of passes to complete shader
-};
-
-//this table will contain custom versions of each shader tuned for specific video card and user options.
-static W3DFilterInterface *W3DFilters[FT_MAX];
-static W3DShaderInterface *W3DShaders[W3DShaderManager::ST_MAX];
-static Int W3DShadersPassCount[W3DShaderManager::ST_MAX];	//number of passes for each of the above shaders
-TextureClass *W3DShaderManager::m_Textures[8];
-W3DShaderManager::ShaderTypes W3DShaderManager::m_currentShader;
-FilterTypes W3DShaderManager::m_currentFilter=FT_NULL_FILTER; ///< Last filter that was set.
-Int W3DShaderManager::m_currentShaderPass;
-
-Bool W3DShaderManager::m_renderingToTexture = false;
-IDirect3DSurface8 *W3DShaderManager::m_oldRenderSurface=NULL;	///<previous render target
-IDirect3DTexture8 *W3DShaderManager::m_renderTexture=NULL;		///<texture into which rendering will be redirected.
-IDirect3DSurface8 *W3DShaderManager::m_newRenderSurface=NULL;	///<new render target inside m_renderTexture
-IDirect3DSurface8 *W3DShaderManager::m_oldDepthSurface=NULL;	///<previous depth buffer surface
-/*===========================================================================================*/
-/*=========      Screen Shaders	=============================================================*/
-/*===========================================================================================*/
-
-/*=========  ScreenBWFilter	=============================================================*/
-///converts viewport to black & white.
-
-Int ScreenBWFilter::m_fadeFrames;
-Int ScreenBWFilter::m_curFadeFrame;
-Real ScreenBWFilter::m_curFadeValue;
-Int ScreenBWFilter::m_fadeDirection;
-
-ScreenBWFilter screenBWFilter;
-ScreenBWFilterDOT3 screenBWFilterDOT3;	//slower version for older cards without pixel shaders.
-
-///List of different BW shader implementations in order of preference
-W3DFilterInterface *ScreenBWFilterList[]=
-{
-	&screenBWFilter,
-	&screenBWFilterDOT3,	//slower version for older cards without pixel shaders.
-	NULL
-};
-
-Int ScreenBWFilter::init(void)
-{
-	Int res;
-	HRESULT hr;
-
-	m_dwBWPixelShader = NULL;
-	m_curFadeFrame = 0;
-
-	if (!W3DShaderManager::canRenderToTexture()) {
-		// Have to be able to render to texture.
-		return false;
-	}
-
-	if ((res=W3DShaderManager::getChipset()) != 0)
-	{
-		if (res >= DC_GENERIC_PIXEL_SHADER_1_1)
-		{
-			//this shader needs some assets that need to be loaded
-			//shader decleration
-			DWORD Declaration[]=
-			{
-				(D3DVSD_STREAM(0)),
-				(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
-				(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
-				(D3DVSD_REG(2, D3DVSDT_FLOAT2)), //  Texture Coordinates
-				(D3DVSD_END())
-			};
-
-			//Monochrome pixel shader.
-			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\monochrome.pso", &Declaration[0], 0, false, &m_dwBWPixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			W3DFilters[FT_VIEW_BW_FILTER]=&screenBWFilter;
-
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-Bool ScreenBWFilter::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
-{
-	skipRender = false;
-	W3DShaderManager::startRenderToTexture();
-	return true;
-}
-
-Bool ScreenBWFilter::postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
-{
-	IDirect3DTexture8 * tex =	W3DShaderManager::endRenderToTexture();
-	DEBUG_ASSERTCRASH(tex, ("Require rendered texture."));
-	if (!tex) return false;
-	if (!set(mode)) return false;
-
-	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	struct _TRANS_LIT_TEX_VERTEX {
-		D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
-		float	u;
-		float	v;
-	} v[4];
-
-	Int xpos, ypos, width, height;
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
-	TheTacticalView->getOrigin(&xpos,&ypos);
-	width=TheTacticalView->getWidth();
-	height=TheTacticalView->getHeight();
-
-	//bottom right
-	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top right
-	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
-	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	//bottom left
-	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top left
-	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
-	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	v[0].color = 0xffffffff;
-	v[1].color = 0xffffffff;
-	v[2].color = 0xffffffff;
-	v[3].color = 0xffffffff;
-
-	//draw polygons like this is very inefficient but for only 2 triangles, it's
-	//not worth bothering with index/vertex buffers.
-	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
-
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-
-	reset();
-	return true;
-}
-
-Int ScreenBWFilter::set(enum FilterModes mode)
-{
-	HRESULT hr;
-
-	if (mode > FM_NULL_MODE)
-	{	//rendering a quad with redirected rendering surface tinted by pixel shader
-
-		if (m_fadeDirection > 0)
-		{	//turning effect on
-			m_curFadeFrame++;
-			Int fade = m_curFadeFrame;
-
-			if (fade<m_fadeFrames)
-			{
-				m_curFadeValue = (Real)fade/(Real)m_fadeFrames;
-			}
-			else
-			{
-				m_curFadeFrame = 0;
-				m_curFadeValue = 1.0f;
-				m_fadeDirection = 0;
-			}
-		}
-		else
-		if (m_fadeDirection < 0)
-		{	//turning effect off
-			m_curFadeFrame++;
-			Int fade = m_curFadeFrame;
-			if (fade<m_fadeFrames)
-			{
-				m_curFadeValue = 1.0f - (Real)fade/(Real)m_fadeFrames;
-			}
-			else
-			{	m_curFadeValue = 0.0f;
-				TheTacticalView->setViewFilterMode(FM_NULL_MODE);
-				TheTacticalView->setViewFilter(FT_NULL_FILTER);
-				m_curFadeFrame = 0;
-				m_fadeDirection = 0;
-			}
-		}
-
-		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-		DX8Wrapper::Set_Material(vmat);
-		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		hr=DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBWPixelShader);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(0,   D3DXVECTOR4(0.3f, 0.59f, 0.11f, 1.0f), 1);
-
-		D3DXVECTOR4	color(1.0f,1.0f,1.0f,1.0f);	//multiply color
-
-		if (mode == FM_VIEW_BW_BLACK_AND_WHITE)
-		{	//back & white mode
-			color.x=1.0f;
-			color.y=1.0f;
-			color.z=1.0f;
-		}
-		if (mode == FM_VIEW_BW_RED_AND_WHITE)
-		{	//red is on
-			color.x = 1.0f;
-			color.y = 0.0f;
-			color.z = 0.0f;
-			//inverse red is on
-			//red is on
-//			color.x = 0.0f;
-//			color.y = 1.0f;
-//			color.z = 1.0f;
-		}
-		if (mode == FM_VIEW_BW_GREEN_AND_WHITE)
-		{
-			color.x = 0.0f;
-			color.y = 1.0f;
-			color.z = 0.0f;
-		}
-
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(1,   color, 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(2,	D3DXVECTOR4(m_curFadeValue, m_curFadeValue, m_curFadeValue, 1.0f), 1);
-/*		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(2,   D3DXVECTOR4(150.0f/255.0f, 150.0f/255.0f, 150.0f/255.0f, 0.0f), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(3,   D3DXVECTOR4((765.0f/450.0f)/3, (765.0f/450.0f)/3, (765.0f/450.0f)/3, 1.0f), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(4,   D3DXVECTOR4(0.5f, 0.5f, 0.5f, 0), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(5,   D3DXVECTOR4((60.0f)/255.0f, (60.0f)/255.0f, (60.0f)/255.0f, 0), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(6,   D3DXVECTOR4((157.0f)/255.0f, (157.0f)/255.0f, (157.0f)/255.0f, 0), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(7,   D3DXVECTOR4((30.0f)/255.0f, (30.0f)/255.0f, (30.0f)/255.0f, 0), 1);
-*/
-		return true;
-	}
-	return false;
-}
-
-void ScreenBWFilter::reset(void)
-{
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
-	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(0);	//turn off pixel shader
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-Int ScreenBWFilter::shutdown(void)
-{
-	if (m_dwBWPixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBWPixelShader);
-
-	m_dwBWPixelShader=NULL;
-
-	return TRUE;
-}
-
-/**Alternate version of the above filter which does not require pixel shaders - good for older cards*/
-Int ScreenBWFilterDOT3::init(void)
-{
-	Int res;
-
-	m_curFadeFrame = 0;
-
-	if (!W3DShaderManager::canRenderToTexture()) {
-		// Have to be able to render to texture.
-		return false;
-	}
-
-	if ((res=W3DShaderManager::getChipset()) != 0)
-	{
-			W3DFilters[FT_VIEW_BW_FILTER]=&screenBWFilterDOT3;
-			return TRUE;
-	}
-	return FALSE;
-}
-
-Bool ScreenBWFilterDOT3::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
-{
-	skipRender = false;
-	W3DShaderManager::startRenderToTexture();
-	return true;
-}
-
-Bool ScreenBWFilterDOT3::postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
-{
-	IDirect3DTexture8 * tex =	W3DShaderManager::endRenderToTexture();
-	DEBUG_ASSERTCRASH(tex, ("Require rendered texture."));
-	if (!tex) return false;
-	if (!set(mode)) return false;
-
-	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	struct _TRANS_LIT_TEX_VERTEX {
-		D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
-		float	u;
-		float	v;
-	} v[4];
-
-	Int xpos, ypos, width, height;
-
-	TheTacticalView->getOrigin(&xpos,&ypos);
-	width=TheTacticalView->getWidth();
-	height=TheTacticalView->getHeight();
-
-	//bottom right
-	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top right
-	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
-	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	//bottom left
-	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top left
-	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
-	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	
-	DWORD currentFade=(((Int)((1.0f-m_curFadeValue) * 255.0f))<<24) | 0x00ffffff;	//store alpha value
-
-	v[0].color = currentFade;
-	v[1].color = currentFade;
-	v[2].color = currentFade;
-	v[3].color = currentFade;
-
-	//draw polygons like this is very inefficient but for only 2 triangles, it's
-	//not worth bothering with index/vertex buffers.
-	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
-
-	//Draw B&W version first
-	if (DX8Wrapper::Get_Current_Caps()->Support_Dot3())
-	{	//Override W3D states with customizations for grayscale
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_TEXTUREFACTOR, 0x80A5CA8E);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG0, D3DTA_TFACTOR | D3DTA_ALPHAREPLICATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_TFACTOR | D3DTA_ALPHAREPLICATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_MULTIPLYADD);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_CURRENT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP, D3DTOP_DOTPRODUCT3);
-	}
-	else
-	{	//doesn't have DOT3 blend mode so fake it another way.
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_TEXTUREFACTOR, 0x60606060);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
-	}
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
-
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-
-	//Draw normal view blended by current fade level
-	ShaderClass::Invalidate();	//reset DOT3 blend from above.
-	ShaderClass shader=ShaderClass::_PresetAlphaShader;
-	shader.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);
-	DX8Wrapper::Set_Shader(shader);
-	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-	//replace texture alpha with vertex alpha
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG2);
-
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-
-	reset();
-	return true;
-}
-
-Int ScreenBWFilterDOT3::set(enum FilterModes mode)
-{
-	if (mode > FM_NULL_MODE)
-	{	//rendering a quad with redirected rendering surface tinted by pixel shader
-
-		if (m_fadeDirection > 0)
-		{	//turning effect on
-			m_curFadeFrame++;
-			Int fade = m_curFadeFrame;
-
-			if (fade<m_fadeFrames)
-			{
-				m_curFadeValue = (Real)fade/(Real)m_fadeFrames;
-			}
-			else
-			{
-				m_curFadeFrame = 0;
-				m_curFadeValue = 1.0f;
-				m_fadeDirection = 0;
-			}
-		}
-		else
-		if (m_fadeDirection < 0)
-		{	//turning effect off
-			m_curFadeFrame++;
-			Int fade = m_curFadeFrame;
-			if (fade<m_fadeFrames)
-			{
-				m_curFadeValue = 1.0f - (Real)fade/(Real)m_fadeFrames;
-			}
-			else
-			{	m_curFadeValue = 0.0f;
-				TheTacticalView->setViewFilterMode(FM_NULL_MODE);
-				TheTacticalView->setViewFilter(FT_NULL_FILTER);
-				m_curFadeFrame = 0;
-				m_fadeDirection = 0;
-			}
-		}
-
-		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-		DX8Wrapper::Set_Material(vmat);
-		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		return true;
-	}
-	return false;
-}
-
-void ScreenBWFilterDOT3::reset(void)
-{
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-Int ScreenBWFilterDOT3::shutdown(void)
-{
-	return TRUE;
-}
-
-/*=========  ScreenCrossFadeFilter	=============================================================*/
-///Fades screen between 2 different views of the scene with both being visible at once.
-
-Int ScreenCrossFadeFilter::m_fadeFrames;
-Int ScreenCrossFadeFilter::m_curFadeFrame;
-Real ScreenCrossFadeFilter::m_curFadeValue;
-Int ScreenCrossFadeFilter::m_fadeDirection;
-TextureClass *ScreenCrossFadeFilter::m_fadePatternTexture=NULL;
-Bool ScreenCrossFadeFilter::m_skipRender = FALSE;
-
-ScreenCrossFadeFilter screenCrossFadeFilter;
-
-///List of different BW shader implementations in order of preference
-///@todo: Add a version that doesn't require pixel shader
-W3DFilterInterface *ScreenCrossFadeFilterList[]=
-{
-	&screenCrossFadeFilter,
-	NULL
-};
-
-Int ScreenCrossFadeFilter::init(void)
-{
-	if (!TheDisplay)
-		return FALSE;	//effect is useless without a view so no point initializing for the WB, etc.
-
-	m_curFadeFrame = 0;
-
-	if (!W3DShaderManager::canRenderToTexture())
-		// Have to be able to render to texture.
-		return FALSE;
-
-	//Load an alpha mask texture that will mix foreground/background views.
-	m_fadePatternTexture=WW3DAssetManager::Get_Instance()->Get_Texture("exmask_g.tga");
-	if (!m_fadePatternTexture)
-		return FALSE;
-	m_fadePatternTexture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-	m_fadePatternTexture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-	m_fadePatternTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
-
-	W3DFilters[FT_VIEW_CROSSFADE]=&screenCrossFadeFilter;
-
-	return TRUE;
-}
-
-Bool ScreenCrossFadeFilter::updateFadeLevel(void)
-{
-	if (m_fadeDirection > 0)
-	{	//turning effect on
-		m_curFadeFrame++;
-		Int fade = m_curFadeFrame;
-
-		if (fade<m_fadeFrames)
-		{
-			m_curFadeValue = (Real)fade/(Real)m_fadeFrames;
-		}
-		else
-		{
-			m_curFadeFrame = 0;
-			m_curFadeValue = 1.0f;
-			m_fadeDirection = 0;
-			return false;
-		}
-	}
-	else
-	if (m_fadeDirection < 0)
-	{	//turning effect off
-		Int fade = m_curFadeFrame;
-		if (fade<m_fadeFrames)
-		{
-			m_curFadeValue = 1.0f - (Real)fade/(Real)m_fadeFrames;
-			m_curFadeFrame++;
-		}
-		else
-		{	m_curFadeValue = 0.0f;
-			TheTacticalView->setViewFilterMode(FM_NULL_MODE);
-			TheTacticalView->setViewFilter(FT_NULL_FILTER);
-			m_curFadeFrame = 0;
-			m_fadeDirection = 0;
-			return false;
-		}
-	}
-	return true;
-}
-
-Bool ScreenCrossFadeFilter::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
-{
-	if (updateFadeLevel())
-	{	//if fade has not completed
-		W3DShaderManager::startRenderToTexture();
-		scenePassMode=SCENE_PASS_ALPHA_MASK;
-		skipRender = false;
-		m_skipRender=true;	//tell the postRender function not to draw into framebuffer yet.
-		return true;
-	}
-	//fade must have completed
-	return true;
-}
-
-Bool ScreenCrossFadeFilter::postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
-{
-	IDirect3DTexture8 * tex;
-
-	if (m_skipRender)
-	{
-		//don't render anything to frame buffer because we still need to draw the new scene
-		//that we're fading into.  Okay to render on the next call.
-		m_skipRender = false;
-		doExtraRender = TRUE;
-		tex =	W3DShaderManager::endRenderToTexture();
-		return true;	
-	}
-
-	tex=W3DShaderManager::getRenderTexture();
-
-	DEBUG_ASSERTCRASH(tex, ("Require last rendered texture."));
-	if (!tex) return false;
-	if (!set(mode)) return false;
-
-	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	struct _TRANS_LIT_TEX_VERTEX {
-		D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
-		float	u;
-		float	v;
-		float	u1;
-		float	v1;
-	} v[4];
-
-	Int xpos, ypos, width, height;
-	Real radius = 0.0f;
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
-	if (mode == FM_VIEW_CROSSFADE_CIRCLE)
-	{	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1,m_fadePatternTexture->Peek_D3D_Texture());
-		//Use the current fade level to scale the mask texture, for other modes the texture
-		//comes pre-scaled so doesn't require uv scaling.
-		radius = (1.0f-m_curFadeValue)*2.0f;
-		if (radius <= 0)
-			radius = 0.01f;
-		radius = 0.5f/radius;
-	}
-
-	TheTacticalView->getOrigin(&xpos,&ypos);
-	width=TheTacticalView->getWidth();
-	height=TheTacticalView->getHeight();
-
-/*	Real radius = (1.0f-m_curFadeValue);
-	if (radius <= 0)
-		radius = 0.01f;
-	radius = 25.0f-radius*24.75f;
-*/
-	//bottom right
-	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	v[0].u1 = 0.5f+radius;	v[0].v1 = 0.5f+radius;
-	//top right
-	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
-	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	v[1].u1 = 0.5f+radius;	v[1].v1 = 0.5f-radius;
-	//bottom left
-	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	v[2].u1 = 0.5f-radius;	v[2].v1 = 0.5f+radius;
-	//top left
-	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
-	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	v[3].u1 = 0.5f-radius;	v[3].v1 = 0.5f-radius;
-
-	DWORD diffuse = 0xffffffff;//((Int)((m_curFadeValue) * 255.0f) << 24) | 0x00ffffff;	//store alpha value in vertex diffuse
-
-	v[0].color = diffuse;
-	v[1].color = diffuse;
-	v[2].color = diffuse;
-	v[3].color = diffuse;
-
-	//draw polygons like this is very inefficient but for only 2 triangles, it's
-	//not worth bothering with index/vertex buffers.
-	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX2);
-
-//		m_pDev->SetTextureStageState(0,D3DTSS_MAGFILTER,D3DTEXF_POINT); 
-//		m_pDev->SetTextureStageState(0,D3DTSS_MINFILTER,D3DTEXF_POINT); 
-
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-
-	reset();
-	return true;
-}
-
-Int ScreenCrossFadeFilter::set(enum FilterModes mode)
-{
-	if (mode > FM_NULL_MODE)
-	{	//rendering a quad with redirected rendering surface
-		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-		DX8Wrapper::Set_Material(vmat);
-		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaShader);
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Set_Texture(1,NULL);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-		if (mode == FM_VIEW_CROSSFADE_CIRCLE)
-		{	//cross-fading using circle mask stored in stage 1
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1 );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_MIPFILTER, D3DTEXF_NONE);
-		}
-
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-
-		return true;
-	}
-	return false;
-}
-
-void ScreenCrossFadeFilter::reset(void)
-{
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-Int ScreenCrossFadeFilter::shutdown(void)
-{
-	REF_PTR_RELEASE(m_fadePatternTexture);
-
-	return TRUE;
-}
-
-/*=========  ScreenMotionBlurFilter	=============================================================*/
-///applies motion blur to viewport.
-
-ScreenMotionBlurFilter screenMotionBlurFilter;
-
-Coord3D ScreenMotionBlurFilter::m_zoomToPos;
-Bool ScreenMotionBlurFilter::m_zoomToValid = false;
-
-ScreenMotionBlurFilter::ScreenMotionBlurFilter():
-m_decrement(false),
-m_maxCount(0),
-m_lastFrame(0), 
-m_skipRender(false)
-{
-}
-///List of different motion blur implementations in order of preference
-W3DFilterInterface *ScreenMotionBlurFilterList[]=
-{
-	&screenMotionBlurFilter,
-	NULL
-};
-
-Int ScreenMotionBlurFilter::init(void)
-{
-	if (!W3DShaderManager::canRenderToTexture()) {
-		// Have to be able to render to texture.
-		return false;
-	}
-	W3DFilters[FT_VIEW_MOTION_BLUR_FILTER]=this;
-	return true;
-}
-
-Bool ScreenMotionBlurFilter::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
-{
-	skipRender = m_skipRender;
-	W3DShaderManager::startRenderToTexture();
-	return true;
-}
-
-Bool ScreenMotionBlurFilter::postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
-{
-	IDirect3DTexture8 * tex =	W3DShaderManager::endRenderToTexture();
-	DEBUG_ASSERTCRASH(tex, ("Require rendered texture."));
-	if (!tex) return false;
-	if (!set(mode)) return false;
-
-	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	Bool continueEffect = true;
-	struct _TRANS_LIT_TEX_VERTEX {
-		D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
-		float	u;
-		float	v;
-	} v[4];
-
-	Int xpos, ypos, width, height;
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
-	TheTacticalView->getOrigin(&xpos,&ypos);
-	width=TheTacticalView->getWidth();
-	height=TheTacticalView->getHeight();
-
-	//bottom right
-	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top right
-	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
-	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	//bottom left
-	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top left
-	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
-	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	v[0].color = 0xffffffff;
-	v[1].color = 0xffffffff;
-	v[2].color = 0xffffffff;
-	v[3].color = 0xffffffff;
-
-
-	if (m_additive) {
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ONE);
-	} else { 
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-	}
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
-	//draw polygons like this is very inefficient but for only 2 triangles, it's
-	//not worth bothering with index/vertex buffers.
-	DX8Wrapper::Apply_Render_State_Changes();
-	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
-
-	Coord2D center;
-	center.x = 0.5f;
-	center.y = 0.5f;
-	Bool pan = false;
-	if (mode>=FM_VIEW_MB_PAN_ALPHA) {
-		Real len = sqrt(scrollDelta.x*scrollDelta.x + scrollDelta.y*scrollDelta.y);
-		//center.x += 0.5f * (scrollDelta.x/len);
-		center.y -= 0.5f; // * (scrollDelta.y/len);
-		m_decrement = false;
-		m_maxCount = (len*200*m_panFactor/(Real)DEFAULT_PAN_FACTOR);
-		if (m_maxCount<m_panFactor/2) 
-			m_maxCount = m_panFactor/2;
-		if (m_maxCount>m_panFactor) 
-			m_maxCount=m_panFactor;
-		pan = true;
-		m_priorDelta = scrollDelta;
-	} else if (mode == FM_VIEW_MB_END_PAN_ALPHA) {
-		Real len = sqrt(m_priorDelta.x*m_priorDelta.x + m_priorDelta.y*m_priorDelta.y);
-		center.x += 0.5f * (m_priorDelta.x/len);
-		center.y -= 0.5f * (m_priorDelta.y/len);
-		m_decrement = false;
-		m_maxCount--;
-		if (m_maxCount<2) {
-			continueEffect = false;
-		}
-		pan = true;
-	}
-
-
-	m_skipRender = false;
-	if (!pan && m_lastFrame != TheGameLogic->getFrame()) {
-		if (m_decrement) {
-			m_maxCount-=COUNT_STEP;
-			if (m_maxCount<1) {
-				m_decrement = false;
-				continueEffect = false;
-			}	else {
-				m_skipRender = true;
-			}
-		} else {
-			m_maxCount+=COUNT_STEP;
-			if (m_maxCount>=MAX_COUNT) {
-				m_decrement = true;
-				if (m_doZoomTo && m_zoomToValid) {
-					TheTacticalView->lookAt(&m_zoomToPos);
-				} else {
-					continueEffect = false;
-				}
-			}	else {
-				m_skipRender = true;
-			}
-		}
-	}
-	Int	 i, j;
-	if (!pan) {
-		for (i=0; i<4; i++) {
-			Real factor = 1.0f - (m_maxCount/(Real)MAX_COUNT)*0.90f;
-			factor = sqrt(factor);
-			v[i].u = ((v[i].u-center.x)*factor) + center.x;
-			v[i].v = ((v[i].v-center.y)*factor) + center.y;
-		}
-	}
-	pDev->SetTextureStageState(0,D3DTSS_ALPHAARG1, D3DTA_CURRENT);
-	pDev->SetTextureStageState(0,D3DTSS_ALPHAARG2, D3DTA_TEXTURE);
-	pDev->SetTextureStageState(0,D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-
-	DX8Wrapper::Apply_Render_State_Changes();
-	{
-		Int limit = m_maxCount;
-		if (m_maxCount>30) limit = 30;
-		for (j=0; j<limit; j++) {
-			for (i=0; i<4; i++) {
-				Real factor = 0.99f;
-				if (m_additive) factor = 0.98f;
-				Int alpha = 0x15;
-				if (m_additive) {
-					alpha = 0x09;
-					if (m_maxCount>limit) {
-						alpha += (m_maxCount-limit)/5;
-					}
-					if (m_maxCount==MAX_COUNT) alpha += 60;
-				}
-				v[i].color = (alpha<<24)|0x00ffffff; // 
-				if (pan) {
-					v[i].u = ((v[i].u-center.x)*(factor+.006)) + center.x;
-					v[i].v = ((v[i].v-center.y)*factor) + center.y;
-				} else {
-					v[i].u = ((v[i].u-center.x)*factor) + center.x;
-					v[i].v = ((v[i].v-center.y)*factor) + center.y;
-				}
-			}
-			pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-
-		}
-	}
-	m_lastFrame = TheGameLogic->getFrame();
-	if (pan){
-		m_skipRender = false;
-	}
-	reset();
-	if (!continueEffect) {
-		m_zoomToValid = false;
-	}
-	return continueEffect;
-}
-
-Bool ScreenMotionBlurFilter::setup(enum FilterModes mode)
-{
-
-	m_additive = false;
-
-	if (mode == FM_VIEW_MB_IN_AND_OUT_SATURATE ||
-			mode == FM_VIEW_MB_IN_SATURATE ||
-			mode == FM_VIEW_MB_OUT_SATURATE) {
-		m_additive = true;
-	}
-
-	m_doZoomTo = false;
-	if (mode == FM_VIEW_MB_IN_AND_OUT_SATURATE ||
-			mode == FM_VIEW_MB_IN_AND_OUT_ALPHA ) {
-		m_doZoomTo = true;
-	}
-	if (mode >= FM_VIEW_MB_PAN_ALPHA)	{
-		m_panFactor = (int)mode - FM_VIEW_MB_PAN_ALPHA;
-		if (m_panFactor<1) m_panFactor = DEFAULT_PAN_FACTOR;
-	}
-	m_skipRender = false;
-	if (mode != FM_VIEW_MB_END_PAN_ALPHA) 
-		m_maxCount = 0;
-	m_decrement = false;
-	m_skipRender = false;
-	switch (mode) {
-		case FM_VIEW_MB_OUT_SATURATE:
-		case FM_VIEW_MB_OUT_ALPHA:
-			m_maxCount = MAX_COUNT;
-			m_decrement = TRUE;
-			break;
-	}
-	return true;
-}
-
-Int ScreenMotionBlurFilter::set(enum FilterModes mode)
-{
-	if (mode > FM_NULL_MODE)
-	{	//rendering a quad with redirected rendering surface motion blurred
-
-		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-		DX8Wrapper::Set_Material(vmat);
-		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Set_Texture(1,NULL);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-	}
-	return TRUE;
-}
-
-void ScreenMotionBlurFilter::reset(void)
-{
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-Int ScreenMotionBlurFilter::shutdown(void)
-{
-	return TRUE;
-}
-
-/*===========================================================================================*/
-/*=========      Shroud Shaders	=============================================================*/
-/*===========================================================================================*/
-
-///Shroud layer rendering shader
-class ShroudTextureShader : public W3DShaderInterface
-{
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	Int m_stageOfSet;
-} shroudTextureShader;
-
-///List of different shroud shader implementations in order of preference
-W3DShaderInterface *ShroudShaderList[]=
-{
-	&shroudTextureShader,
-	NULL
-};
-
-//#define SHROUD_STRETCH_FACTOR	(1.0f/MAP_XY_FACTOR)	//1 texel per heightmap cell width
-
-Int ShroudTextureShader::init(void)
-{
-	W3DShaders[W3DShaderManager::ST_SHROUD_TEXTURE]=&shroudTextureShader;
-	W3DShadersPassCount[W3DShaderManager::ST_SHROUD_TEXTURE]=1;
-
-	return TRUE;
-}
-
-//Setup a texture projection in the given stage that applies our shroud.
-Int ShroudTextureShader::set(Int stage)
-{
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-	if (stage < 2)
-		DX8Wrapper::Set_Texture(stage, W3DShaderManager::getShaderTexture(0));
-	else	//stages larger than 1 are not supported by W3D so set them directly
-		DX8Wrapper::Set_DX8_Texture(stage, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
-
-	if (stage == 0)
-	{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaSpriteShader);
-	else
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetMultiplicativeSpriteShader);
-#else
-	DX8Wrapper::Set_Shader(ShaderClass::_PresetMultiplicativeSpriteShader);
-#endif
-	}
-	DX8Wrapper::Apply_Render_State_Changes();
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_EQUAL);
-
-	//We need to scale so shroud texel stretches over one full terrain cell.  Each texel
-	//is 1/128 the size of full texture. (assuming 128x128 vid-mem texture).
-	W3DShroud *shroud;
-	if ((shroud=TheTerrainRenderObject->getShroud()) != 0)
-	{	///@todo: All this code really only need to be done once per camera/view.  Find a way to optimize it out.
-		D3DXMATRIX inv;
-		float det;
-
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-		D3DXMATRIX scale,offset;
-
-		//We need to make all world coordinates be relative to the heightmap data origin since that
-		//is where the shroud begins.
-
-		float xoffset = 0;
-		float yoffset = 0;
-		Real width=shroud->getCellWidth();
-		Real height=shroud->getCellHeight();
-
-		if (TheTerrainRenderObject->getMap())
-		{	//subtract origin position from all coordinates.  Origin is shifted by 1 cell width/height to allow for unused border texels.
-			xoffset = -(float)shroud->getDrawOriginX() + width;
-			yoffset = -(float)shroud->getDrawOriginY() + height;
-		}
-
-		D3DXMatrixTranslation(&offset, xoffset, yoffset,0);
-
-		width = 1.0f/(width*shroud->getTextureWidth());
-		height = 1.0f/(height*shroud->getTextureHeight());
-		D3DXMatrixScaling(&scale, width, height, 1);
-		*((D3DXMATRIX *)&curView) = (inv * offset) * scale;
-		DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), *((Matrix4x4*)&curView));
-	}
-	m_stageOfSet=stage;
-	return TRUE;
-}
-
-void ShroudTextureShader::reset(void)
-{
-	if (m_stageOfSet < MAX_TEXTURE_STAGES)
-		DX8Wrapper::Set_Texture(m_stageOfSet,NULL);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_LESSEQUAL);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(m_stageOfSet,  D3DTSS_TEXCOORDINDEX, m_stageOfSet);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(m_stageOfSet,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);	
-}
-
-///Mask layer rendering shader
-class MaskTextureShader : public W3DShaderInterface
-{
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-} maskTextureShader;
-
-///List of different shroud shader implementations in order of preference
-W3DShaderInterface *MaskShaderList[]=
-{
-	&maskTextureShader,
-	NULL
-};
-
-Int MaskTextureShader::init(void)
-{
-	W3DShaders[W3DShaderManager::ST_MASK_TEXTURE]=&maskTextureShader;
-	W3DShadersPassCount[W3DShaderManager::ST_MASK_TEXTURE]=1;
-
-	return TRUE;
-}
-
-Int MaskTextureShader::set(Int pass)
-{
-	Real fadeLevel=ScreenCrossFadeFilter::getCurrentFadeValue();
-
-	//Use the current fade level to scale the mask texture
-	Real radius = (1.0f-fadeLevel)*2.0f;
-	if (radius <= 0)
-		radius = 0.01f;
-	radius = 0.5f/radius;
-
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-
-	//For now we're always going to project the texture coming from the crossfade effect
-	DX8Wrapper::Set_Texture(0, ScreenCrossFadeFilter::getCurrentMaskTexture());
-	ShaderClass shader=ShaderClass::_PresetOpaqueShader;
-	shader.Set_Primary_Gradient(ShaderClass::GRADIENT_DISABLE);
-	DX8Wrapper::Set_Shader(shader);
-	DX8Wrapper::Apply_Render_State_Changes();
-	Matrix4x4 curView;
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-	D3DXMATRIX inv;
-	float det;
-
-	//Get inverse view matrix so we can transform camera space points back to world space
-	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-	D3DXMATRIX scale,offset,offsetTextureCenter;
-	Coord3D centerPos;
-
-	//Find center of projection (this should be returned from some other filter, etc. but
-	//for now assume terrain location at center of screen.
-	if (TheTacticalView)
-	{	Int xpos,ypos;
-
-		TheTacticalView->getOrigin(&xpos,&ypos);
-
-		ICoord2D screenPos;
-		screenPos.x=(Real)TheTacticalView->getWidth()*0.5f;
-		screenPos.y=(Real)TheTacticalView->getHeight()*0.5f;
-		TheTacticalView->screenToTerrain(&screenPos,&centerPos);
-	}
-
-	D3DXMatrixTranslation(&offset, -centerPos.x, -centerPos.y,0);
-
-	D3DXMatrixTranslation(&offsetTextureCenter, 0.5f, 0.5f, 0);	//shift coordinates so center of projection falls at uv 0.5,0.5
-
-	Real worldTexelWidth=(1.0f-fadeLevel)*25.0f;	//9 worked well for circle but weird shape requires more stretch to cover.
-	Real worldTexelHeight=(1.0f-fadeLevel)*25.0f;
-
-	///@todo: Fix this to work with non 128x128 textures.
-	if (worldTexelWidth != 0 && worldTexelHeight != 0)
-	{	Real widthScale = 1.0f/(worldTexelWidth*128.0f);
-		Real heightScale = 1.0f/(worldTexelHeight*128.0f);
-		D3DXMatrixScaling(&scale, widthScale, heightScale, 1);
-		*((D3DXMATRIX *)&curView) = ((inv * offset) * scale)*offsetTextureCenter;
-	}
-	else
-	{	D3DXMatrixScaling(&scale, 0, 0, 1);	//scaling by 0 will set uv coordinates to 0,0
-		*((D3DXMATRIX *)&curView) = ((inv * offset) * scale);
-	}
-
-	DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&curView));
-
-	return TRUE;
-}
-
-void MaskTextureShader::reset(void)
-{
-	DX8Wrapper::Set_Texture(0,NULL);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);	
-}
-
-/*===========================================================================================*/
-/*=========      Terrain Shaders	=========================================================*/
-/*===========================================================================================*/
-
-///regular terrain shader that should work on all multi-texture video cards (slowest version)
-class TerrainShader2Stage : public W3DShaderInterface
-{
-public:
-	float m_xSlidePerSecond ;	 ///< How far the clouds move per second.
-	float m_ySlidePerSecond ;	 ///< How far the clouds move per second.
-	int	  m_curTick;
-	float m_xOffset;
-	float m_yOffset;
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	void updateNoise1 (D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate=true);	///<generate the uv coordinates for Noise1 (i.e clouds)
-	void updateNoise2 (D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate=true);	///<generate the uv coordinates for Noise2 (i.e lightmap)
-} terrainShader2Stage;
-
-///8 stage terrain shader which only works on certain Nvidia cards.
-class TerrainShader8Stage : public W3DShaderInterface
-{
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int init(void);			///<perform any one time initialization and validation
-} terrainShader8Stage;
-
-//Offsets into constant register pool used by vertex shader
-#define CV_WORLDVIEWPROJ_0	0	//4 vectors for transform of world->clip space.
-
-///Pixel shader based terrain shader - fastest method for the newest cards.
-class TerrainShaderPixelShader : public W3DShaderInterface
-{
-	DWORD					m_dwBasePixelShader;	///<handle to terrain D3D pixel shader
-	DWORD					m_dwBaseNoise1PixelShader;	///<handle to terrain/single noise D3D pixel shader
-	DWORD					m_dwBaseNoise2PixelShader;	///<handle to terrain/double noise D3D pixel shader
-
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Int shutdown(void);			///<release resources used by shader
-} terrainShaderPixelShader;
-
-///List of different terrain shader implementations in order of preference
-W3DShaderInterface *TerrainShaderList[]=
-{
-	&terrainShaderPixelShader,
-	&terrainShader8Stage,
-	&terrainShader2Stage,
-	NULL
-};
-
-Int TerrainShader2Stage::init( void )
-{
-	//initialize settings for uv animated clouds
-	m_xSlidePerSecond = -0.02f;	 
-	m_ySlidePerSecond =  1.50f * m_xSlidePerSecond;
-	m_curTick = 0;
-	m_curTick = WW3D::Get_Sync_Time();//::GetTickCount();
-	m_xOffset = 0;
-	m_yOffset = 0;
-
-	//no special device validation needed - anything in our min spec should handle this.
-
-	W3DShaders[W3DShaderManager::ST_TERRAIN_BASE]=&terrainShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE]=2;
-	W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=&terrainShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=3;
-	W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=&terrainShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=3;
-	W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=&terrainShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=3;
-
-	return TRUE;
-}
-
-void TerrainShader2Stage::reset(void)
-{
-	ShaderClass::Invalidate();
-
-	//Free references to textures
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
-}
-
-void TerrainShader2Stage::updateNoise1(D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate)
-{
-	#define STRETCH_FACTOR ((float)(1/(63.0*MAP_XY_FACTOR/2))) /* covers 63/2 tiles */
-
-	D3DXMATRIX scale;
-
-	D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
-	*destMatrix = *curViewInverse * scale;
-
-	D3DXMATRIX offset;
-
-	Int delta = m_curTick;
-	m_curTick = WW3D::Get_Sync_Time();//::GetTickCount();
-	delta = m_curTick-delta;
-	m_xOffset += m_xSlidePerSecond*delta/1000;
-	m_yOffset += m_ySlidePerSecond*delta/1000;
-
-
-	//m_xOffset += m_xSlidePerSecond*delta/500;
-	//m_yOffset += m_ySlidePerSecond*delta/500;
-
-
-	//m_yOffset = sinf( (float)m_curTick * 0.0001f );
-	//m_xOffset = cosf( (float)m_curTick * 0.0001f );
-
-	if (m_xOffset > 1) m_xOffset -= 1;
-	if (m_yOffset > 1) m_yOffset -= 1;
-	if (m_xOffset < -1) m_xOffset += 1;
-	if (m_yOffset < -1) m_yOffset += 1;
-
-	D3DXMatrixTranslation(&offset, m_xOffset, m_yOffset,0);
-	*destMatrix *= offset;
-}
-
-void TerrainShader2Stage::updateNoise2(D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate)
-{
-			
-	D3DXMATRIX scale;
-
-	D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
-	*destMatrix = *curViewInverse * scale;
-}
-
-Int TerrainShader2Stage::set(Int pass)																											  
-{
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	DX8Wrapper::Apply_Render_State_Changes();
-
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	}
-
-	switch (pass)
-	{
-		case 0:
-			DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-			// Modulate the diffuse color with the texture as lighting comes from diffuse.
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
-			break;
-		case 1:
-			DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-			// Modulate the diffuse color with the texture as lighting comes from diffuse.
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 1 );
-			// Blend the result using the alpha. (came from diffuse mod texture)
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-			// Disable stage 2.
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-			break;
-		case 2:
-			// Noise/cloud pass
-			Matrix4x4 curView;
-			DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-			//these states apply to all noise/cloud combination passes
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-			// Two output coordinates are used.
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-			//blend into frame buffer
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_DESTCOLOR);
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
-
-			
-			D3DXMATRIX inv;
-			float det;
-
-			D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-			if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE12)
-			{
-				//setup cloud pass
-				DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-
-				updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, curView);
-				//clouds always need bilinear filtering
-				DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-				//setup noise pass
-				DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
-
-				updateNoise2(((D3DXMATRIX*)&curView),&inv);
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
-				//noise always needs point/linear filtering.  Why point!?
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-				// Two output coordinates are used.
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-			} //ST_TERRAIN_BASE_NOISE12
-			else
-			{	//only 1 noise or cloud texture
-				// Now setup the texture pipeline.
-				if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE1)
-				{	//setup cloud pass
-					DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-					updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-					DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-					DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-				}
-				else
-				{
-					//setup noise pass
-					DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
-					updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-				}
-
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&curView));
-			}
-			break;
-	}
-
-	return TRUE;
-}
-
-Int TerrainShader8Stage::init( void )
-{	
-	ChipsetType res;
-
-	//this shader will also use the 2Stage shader for some of the passes so initialize it too.
-	if (terrainShader2Stage.init() && (res=W3DShaderManager::getChipset()) >= DC_TNT && res <= DC_GEFORCE2)
-	{
-		W3DShaders[W3DShaderManager::ST_TERRAIN_BASE]=&terrainShader8Stage;
-		W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE]=1;
-		W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=&terrainShader8Stage;
-		W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=2;
-		W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=&terrainShader8Stage;
-		W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=2;
-		W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=&terrainShader8Stage;
-		W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=2;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-Int TerrainShader8Stage::set(Int pass)
-{
-	if (pass == 0)
-	{
-		//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-		DX8Wrapper::Apply_Render_State_Changes();
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-		if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-		} else {
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_POINT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-		}
-		if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		} else {
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		}
-		
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP, D3DTOP_ADD);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_DIFFUSE | D3DTA_COMPLEMENT | D3DTA_ALPHAREPLICATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_ADD);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TFACTOR | D3DTA_COMPLEMENT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-		DX8Wrapper::Set_DX8_Texture(2, NULL);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, 2);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLORARG2, D3DTA_TEXTURE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-		DX8Wrapper::Set_DX8_Texture(3, NULL);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, 3);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLORARG1, D3DTA_DIFFUSE | 0 | D3DTA_ALPHAREPLICATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-		DX8Wrapper::Set_DX8_Texture(4, NULL);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLOROP, D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_TEXCOORDINDEX, 4);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLORARG1, D3DTA_CURRENT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAARG1, D3DTA_CURRENT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-
-		DX8Wrapper::Set_DX8_Texture(5, NULL);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLOROP, D3DTOP_ADD);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_TEXCOORDINDEX, 5);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLORARG1, D3DTA_DIFFUSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAOP,   D3DTOP_ADD);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAARG1, D3DTA_TFACTOR | D3DTA_COMPLEMENT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-		DX8Wrapper::Set_DX8_Texture(6, NULL);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLOROP, D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_TEXCOORDINDEX, 6);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLORARG1, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLORARG2, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-		DX8Wrapper::Set_DX8_Texture(7, NULL);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_TEXCOORDINDEX, 7);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLORARG1, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLORARG2, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-	}
-	else
-	{	//setup cloud noise/pass
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_DISABLE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLOROP, D3DTOP_DISABLE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
-		DX8Wrapper::Invalidate_Cached_Render_States();
-
-		terrainShader2Stage.set(2);
-	}
-	return TRUE;
-}
-
-void TerrainShader8Stage::reset(void)
-{
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLOROP, D3DTOP_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLOROP, D3DTOP_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-Int TerrainShaderPixelShader::shutdown(void)
-{
-	if (m_dwBasePixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBasePixelShader);
-
-	if (m_dwBaseNoise1PixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise1PixelShader);
-
-	if (m_dwBaseNoise2PixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise2PixelShader);
-
-	m_dwBasePixelShader=NULL;
-	m_dwBaseNoise1PixelShader=NULL;
-	m_dwBaseNoise2PixelShader=NULL;
-
-	return TRUE;
-}
-
-Int TerrainShaderPixelShader::init( void )
-{	
-	Int res;
-
-	//this shader will also use the 2Stage shader for some of the passes so initialize it too.
-	if (terrainShader2Stage.init() && (res=W3DShaderManager::getChipset()) >= DC_GENERIC_PIXEL_SHADER_1_1)
-	{
-		if (res >= DC_GENERIC_PIXEL_SHADER_1_1)
-		{
-			//this shader needs some assets that need to be loaded
-			//shader decleration
-			DWORD Declaration[]=
-			{
-				(D3DVSD_STREAM(0)),
-				(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
-				(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
-				(D3DVSD_REG(2, D3DVSDT_FLOAT2)), //  Texture Coordinates
-				(D3DVSD_REG(3, D3DVSDT_FLOAT2)), //  Texture Coordinates
-				(D3DVSD_END())
-			};
-
-			//base version which doesn't apply any noise textures.
-			HRESULT hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\terrain.pso", &Declaration[0], 0, false, &m_dwBasePixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			//version which blends 1 noise texture.
-			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\terrainnoise.pso", &Declaration[0], 0, false, &m_dwBaseNoise1PixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			//version which blends 2 noise textures.
-			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\terrainnoise2.pso", &Declaration[0], 0, false, &m_dwBaseNoise2PixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			W3DShaders[W3DShaderManager::ST_TERRAIN_BASE]=&terrainShaderPixelShader;
-			W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=&terrainShaderPixelShader;
-			W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=&terrainShaderPixelShader;
-			W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=&terrainShaderPixelShader;
-			W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE]=1;
-			W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=1;
-			W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=1;
-			W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=1;
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-Int TerrainShaderPixelShader::set(Int pass)
-{
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	DX8Wrapper::Apply_Render_State_Changes();
-
-	//setup base pass
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-	//tell pixel shader which UV set to use for each stage
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1 );
-
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	}
-
-	if (W3DShaderManager::getCurrentShader() >= W3DShaderManager::ST_TERRAIN_BASE_NOISE1)
-	{	
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-		D3DXMATRIX inv;
-		float det;
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-		// Two output coordinates are used.
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-		
-		if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE12)
-		{	//full shader
-			DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-			DX8Wrapper::_Get_D3D_Device8()->SetTexture(2, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-			DX8Wrapper::_Get_D3D_Device8()->SetTexture(3, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
-			DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise2PixelShader);
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(3, D3DTSS_MINFILTER, D3DTEXF_POINT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(3, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-			terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-			DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, curView);
-
-			terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-			DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE3, curView);
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-			// Two output coordinates are used.
-			DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-		}
-		else
-		{	//single noise texture shader
-			DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise1PixelShader);
-
-			if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE1)
-			{	//cloud map
-				DX8Wrapper::_Get_D3D_Device8()->SetTexture(2, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-				terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-				DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-			}
-			else
-			{	//light map
-				DX8Wrapper::_Get_D3D_Device8()->SetTexture(2, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
-				terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-				DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_POINT);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-			}
-			DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, curView);
-		}
-	}
-	else
-	{	//just base texturing
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBasePixelShader);
-	}
-
-	return TRUE;
-}
-
-void TerrainShaderPixelShader::reset(void)
-{
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(2,NULL);	//release reference to any texture
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,NULL);	//release reference to any texture
-
-	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(0);	//turn off pixel shader
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|2);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|3);
-
-
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-///Cloud layer rendering shader - used for objects similar to terrain which only need the cloud layer.
-class CloudTextureShader : public W3DShaderInterface
-{
-	virtual Int set(Int stage);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	Int m_stageOfSet;
-} cloudTextureShader;
-
-///List of different cloud shader implementations in order of preference
-W3DShaderInterface *CloudShaderList[]=
-{
-	&cloudTextureShader,
-	NULL
-};
-
-Int CloudTextureShader::init(void)
-{
-	W3DShaders[W3DShaderManager::ST_CLOUD_TEXTURE]=&cloudTextureShader;
-	W3DShadersPassCount[W3DShaderManager::ST_CLOUD_TEXTURE]=1;
-
-	return TRUE;
-}
-
-/**Setup a certain texture stage to project our cloud texture*/
-Int CloudTextureShader::set(Int stage)
-{
-	Matrix4x4 curView;
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-	D3DXMATRIX inv;
-	float det;
-
-	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-	//Get a texture matrix that applies the current cloud position
-	terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv,false);	//update curView with texture matrix
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-	DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), curView);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG2, D3DTA_CURRENT );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(stage, W3DShaderManager::getShaderTexture(stage)->Peek_D3D_Texture());
-
-	m_stageOfSet=stage;
-	return TRUE;
-}
-
-void CloudTextureShader::reset(void)
-{
-	//Free reference to texture
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(m_stageOfSet, NULL);
-	//Turn off texture projection
-	DX8Wrapper::Set_DX8_Texture_Stage_State( m_stageOfSet, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( m_stageOfSet, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|m_stageOfSet);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( m_stageOfSet, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( m_stageOfSet, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-}
-
-/*===========================================================================================*/
-/*=========      Road Shaders	=========================================================*/
-/*===========================================================================================*/
-class RoadShaderPixelShader : public W3DShaderInterface
-{
-	DWORD					m_dwBaseNoise2PixelShader;	///<handle to road/double noise D3D pixel shader
-
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Int shutdown(void);			///<release resources used by shader
-} roadShaderPixelShader;
-
-class RoadShader2Stage : public W3DShaderInterface
-{	friend class RoadShaderPixelShader;	//pixel shader version uses some of the same features.
-
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);
-} roadShader2Stage;
-
-///List of different terrain shader implementations in order of preference
-W3DShaderInterface *RoadShaderList[]=
-{
-	&roadShaderPixelShader,
-	&roadShader2Stage,
-	NULL
-};
-
-Int RoadShaderPixelShader::shutdown(void)
-{
-	if (m_dwBaseNoise2PixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise2PixelShader);
-
-	m_dwBaseNoise2PixelShader=NULL;
-
-	return TRUE;
-}
-
-Int RoadShaderPixelShader::init( void )
-{	
-	Int res;
-
-	//this shader will also use the 2Stage shader for some of the passes so initialize it too.
-	if (roadShader2Stage.init() && (res=W3DShaderManager::getChipset()) >= DC_GENERIC_PIXEL_SHADER_1_1)
-	{
-		if (res >= DC_GENERIC_PIXEL_SHADER_1_1)
-		{
-			//this shader needs some assets that need to be loaded
-			//shader decleration
-			DWORD Declaration[]=
-			{
-				(D3DVSD_STREAM(0)),
-				(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
-				(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
-				(D3DVSD_REG(2, D3DVSDT_FLOAT2)), //  Texture Coordinates
-				(D3DVSD_END())
-			};
-
-			//version which blends 2 noise textures.
-			HRESULT hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\roadnoise2.pso", &Declaration[0], 0, false, &m_dwBaseNoise2PixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			//Only set this shader for use in dual noise mode.  The 2Stage shader will take care of
-			//all the other modes.
-			W3DShaders[W3DShaderManager::ST_ROAD_BASE_NOISE12]=&roadShaderPixelShader;
-			W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE_NOISE12]=1;
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-Int RoadShaderPixelShader::set(Int pass)
-{
-	//after we're done with this shader we're going to reset to NULL texture, so set W3D same way.
-	DX8Wrapper::Set_Texture(0,NULL);
-	DX8Wrapper::Set_Texture(1,NULL);
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	DX8Wrapper::Apply_Render_State_Changes();
-	//Directly set texture without W3D knowing... but we'll restore to NULL later.
-	if (W3DShaderManager::getShaderTexture(0))
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
-
-	//tell pixel shader which UV set to use for each stage
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_LESSEQUAL);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_LIGHTING, FALSE);
-
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);	//blend roads into terrain
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-
-	Matrix4x4 curView;
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-	D3DXMATRIX inv;
-	float det;
-	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex)
-	{	DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	}
-	else
-	{	DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	// Two output coordinates are used.
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-	
-	DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(2, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise2PixelShader);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_POINT);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-	terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv, false);	//get texture projection matrix
-	DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
-
-	terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv, false);	//get texture projection matrix
-	DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, curView);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	// Two output coordinates are used.
-	DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-	return TRUE;
-}
-
-void RoadShaderPixelShader::reset(void)
-{
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(2,NULL);	//release reference to any texture
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,NULL);	//release reference to any texture
-
-	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(0);	//turn off pixel shader
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|2);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|3);
-
-
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-Int RoadShader2Stage::init( void )
-{
-	//no special device validation needed - anything in our min spec should handle this.
-	W3DShaders[W3DShaderManager::ST_ROAD_BASE]=&roadShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE]=1;
-	W3DShaders[W3DShaderManager::ST_ROAD_BASE_NOISE1]=&roadShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE_NOISE1]=1;
-	W3DShaders[W3DShaderManager::ST_ROAD_BASE_NOISE2]=&roadShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE_NOISE2]=1;
-	W3DShaders[W3DShaderManager::ST_ROAD_BASE_NOISE12]=&roadShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE_NOISE12]=2;
-
-	return TRUE;
-}
-
-Int RoadShader2Stage::set(Int pass)																											  
-{
-	//after we're done with this shader we're going to reset to NULL texture, so set W3D same way.
-	DX8Wrapper::Set_Texture(0,NULL);
-	DX8Wrapper::Set_Texture(1,NULL);
-	//Force system to apply world/view transforms.
-	DX8Wrapper::Apply_Render_State_Changes();
-
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_LESSEQUAL);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_LIGHTING, FALSE);
-
-	//first texture unit will always contain base road texture
-	if (W3DShaderManager::getShaderTexture(0))
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
-
-	// Modulate the diffuse color with the texture as lighting comes from diffuse.
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);	//blend roads into terrain
-
-	if (pass == 0)
-	{	
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-
-		if (W3DShaderManager::getCurrentShader() >= W3DShaderManager::ST_ROAD_BASE_NOISE1)
-		{	//second texture unit will contain a noise pass
-			Matrix4x4 curView;
-			DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-			D3DXMATRIX inv;
-			float det;
-			D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-			if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex)
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-			else
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-			// Two output coordinates are used.
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-
-			if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_ROAD_BASE_NOISE12)
-			{	//full shader, apply noise 1 in pass 0.
-				DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-				terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv, false);	//get texture projection matrix
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
-			}
-			else
-			{	//single noise texture shader
-				if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_ROAD_BASE_NOISE1)
-				{	//cloud map
-					DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
-					terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv, false);	//update curView with texture matrix
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-				}
-				else
-				{	//light map
-					DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-					terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv, false);	//update curView with texture matrix
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-				}
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
-			}
-		}
-		else
-		{	//just base texturing
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-		}
-	}	//pass 0
-	else
-	{	//pass 1, apply additional noise pass
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-		D3DXMATRIX inv;
-		float det;
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-		if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex)
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		else
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-
-		terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv, false);	//update curView with texture matrix
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-		// Two output coordinates are used.
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-		//Copy alpha channel into stage 1 but mask out color channel by replacing with white.
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		//Force color channel to white by copying the alpha into RGB
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE|D3DTA_ALPHAREPLICATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG2);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_BLENDCURRENTALPHA);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-		//Modulate into existing roads with clouds applied. - only apply where roads are transparent by
-		//using road texture as a mask.
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_ZERO);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_SRCCOLOR);
-
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, curView);
-	}
-
-	return TRUE;
-}
-
-void RoadShader2Stage::reset(void)
-{
-	ShaderClass::Invalidate();
-
-	//Free references to textures
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
-}
-
-/** List of all custom shader lists - each list in this list contains variations of the same
-	shader to allow it to work on different hardware configurations.
-*/
-W3DShaderInterface **MasterShaderList[]=
-{
-	TerrainShaderList,
-	ShroudShaderList,
-	RoadShaderList,
-	MaskShaderList,
-	CloudShaderList,
-	NULL
-};
-
-/** List of all custom filter lists - each list in this list contains variations of the same
-	filter to allow it to work on different hardware configurations.
-*/
-W3DFilterInterface **MasterFilterList[]=
-{
-	ScreenBWFilterList,
-	ScreenMotionBlurFilterList,
-	ScreenCrossFadeFilterList,
-	NULL
-};
-
-// W3DShaderManager::W3DShaderManager =========================================
-/** Constructor - just clears some variables */
-//=============================================================================
-W3DShaderManager::W3DShaderManager(void)
-{
-	m_currentShader = ST_INVALID;
-	m_currentFilter = FT_NULL_FILTER;
-	m_oldRenderSurface = NULL;
-	m_renderTexture = NULL;
-	m_newRenderSurface = NULL;
-	m_oldDepthSurface = NULL;
-	m_renderingToTexture = false;
-	Int i;
-	for (i=0; i<W3DShaderManager::ST_MAX; i++)
-	{	W3DShaders[i]=NULL;
-		W3DShadersPassCount[i]=0;
-	}
-	for (i=0; i<FT_MAX; i++)
-	{	W3DFilters[i]=NULL;
-	}
-	for (i=0; i<8; i++)
-	{
-		m_Textures[i]=NULL;
-	}
-	m_currentShader=(W3DShaderManager::ShaderTypes)-1;
-}
-
-// W3DShaderManager::init =======================================================
-/** Walk through all shaders and find versions suitable for current hardware */
-//=============================================================================
-void W3DShaderManager::init(void)
-{
-	int i,j;
-
-	D3DSURFACE_DESC desc;
-	// For now, check & see if we are gf3 or higher on the food chain.
-
-	Int res=0;
-	if ((res=W3DShaderManager::getChipset()) != 0)
-	{
-		//Some of our effects require an offscreen render target, so try creating it here.
-		HRESULT hr=DX8Wrapper::_Get_D3D_Device8()->GetRenderTarget(&m_oldRenderSurface);
-
-		m_oldRenderSurface->GetDesc(&desc);
-
-		hr=DX8Wrapper::_Get_D3D_Device8()->CreateTexture(desc.Width,desc.Height,1,D3DUSAGE_RENDERTARGET,desc.Format,D3DPOOL_DEFAULT,&m_renderTexture);
-
-		if (hr != S_OK)
-		{
-			if (m_oldRenderSurface) m_oldRenderSurface->Release();
-			m_oldRenderSurface = NULL;
-			m_renderTexture = NULL;
-		} else {
-			hr = m_renderTexture->GetSurfaceLevel(0, &m_newRenderSurface);
-			if (hr != S_OK)
-			{
-				if (m_renderTexture) m_renderTexture->Release();
-				m_renderTexture = NULL;
-				m_newRenderSurface = NULL;
-			}	else {
-				hr = DX8Wrapper::_Get_D3D_Device8()->GetDepthStencilSurface(&m_oldDepthSurface);
-				if (hr != S_OK)
-				{
-					if (m_newRenderSurface) m_newRenderSurface->Release();
-					if (m_renderTexture) m_renderTexture->Release();
-					m_renderTexture = NULL;
-					m_newRenderSurface = NULL;
-					m_oldDepthSurface = NULL;
-				}
-			}
-		}
-	}
-
-	W3DShaderInterface **shaders;
-
-	for (i=0; MasterShaderList[i] != NULL; i++)
-	{	
-		shaders=MasterShaderList[i];
-		for (j=0; shaders[j] != NULL; j++)
-		{
-			if (shaders[j]->init())
-				break;	//found a working shader
-		}
-	}
-	W3DFilterInterface **filters;
-
-	for (i=0; MasterFilterList[i] != NULL; i++)
-	{	
-		filters=MasterFilterList[i];
-		for (j=0; filters[j] != NULL; j++)
-		{
-			if (filters[j]->init())
-				break;	//found a working shader
-		}
-	}
-
-	DEBUG_LOG(("ShaderManager ChipsetID %d\n", res));
-}
-
-// W3DShaderManager::shutdown =======================================================
-/** Any shaders which allocate resources will be allowed to free them */
-//=============================================================================
-void W3DShaderManager::shutdown(void)
-{
-	if (m_newRenderSurface) m_newRenderSurface->Release();
-	if (m_renderTexture) m_renderTexture->Release();
-	if (m_oldRenderSurface) m_oldRenderSurface->Release();
-	if (m_oldDepthSurface) m_oldDepthSurface->Release();
-	m_renderTexture = NULL;
-	m_newRenderSurface = NULL;
-	m_oldDepthSurface = NULL;
-	m_oldRenderSurface = NULL;
-	m_currentShader = ST_INVALID;
-	m_currentFilter = FT_NULL_FILTER;
-	//release any assets associated with a shader (vertex/pixel shaders, textures, etc.)
-	Int i=0;
-	for (; i<W3DShaderManager::ST_MAX; i++) {
-		if (W3DShaders[i]) {
-			W3DShaders[i]->shutdown();
-		}
-	}
-
- 	for ( i=0; i < FT_MAX; i++)
- 	{	
- 		if (W3DFilters[i])
- 		{
- 			W3DFilters[i]->shutdown();
- 		}
-	}
-}
-
-// W3DShaderManager::getShaderPasses =======================================================
-/** Return number of renderig passes required in perform the desired shader on current
-	hardware.  App will need to re-render the polygons this many times to complete the
-	effect.
- */
-//=============================================================================
-Int W3DShaderManager::getShaderPasses(ShaderTypes shader)
-{
-	return W3DShadersPassCount[shader];
-}
-
-// W3DShaderManager::setShader =======================================================
-/** Must call this method before each rendering pass in order to perform proper D3D
-	setup for each shader.
- */
-//=============================================================================
-Int W3DShaderManager::setShader(ShaderTypes shader, Int pass)
-{
-	if (shader == m_currentShader && pass == m_currentShaderPass)
-		return TRUE;	//shader is already set
-	m_currentShader=shader;
-	m_currentShaderPass = pass;
-	if (W3DShaders[shader])
-		return W3DShaders[shader]->set(pass);
-	return FALSE;
-}
-
-// W3DShaderManager::resetShader =======================================================
-/** Must call this method after all polygons and rendering passes have been submitted.
-	This method allows D3D to reset itself to a default state that doesn't conflict
-	with the WW3D2 Shader system.
- */
-//=============================================================================
-void W3DShaderManager::resetShader(ShaderTypes shader)
-{	
-	if (m_currentShader == ST_INVALID)
-		return;	//last shader is already reset.
-	if (W3DShaders[shader])
-		W3DShaders[shader]->reset();
-	m_currentShader = ST_INVALID;
-}
-// W3DShaderManager::filterPreRender =======================================================
-/** Call to view filter shaders before rendering starts.
- */
-//=============================================================================
-Bool W3DShaderManager::filterPreRender(FilterTypes filter, Bool &skipRender, CustomScenePassModes &scenePassMode)
-{
-	if (W3DFilters[filter])
-	{	Bool result=W3DFilters[filter]->preRender(skipRender,scenePassMode);
-		if (result)
-			m_currentFilter = filter;
-		return result;
-	}
-	return FALSE;
-}
-
-// W3DShaderManager::filterPostRender =======================================================
-/** Call to view filter shaders after rendering is complete.
- */
-//=============================================================================
-Bool W3DShaderManager::filterPostRender(FilterTypes filter, enum FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender)
-{
-	if (W3DFilters[filter])
-		return W3DFilters[filter]->postRender(mode, scrollDelta,doExtraRender);
-
-	m_currentFilter = FT_NULL_FILTER;
-	return FALSE;
-}
-
-// W3DShaderManager::filterPostRender =======================================================
-/** Call to view filter shaders after rendering is complete.
- */
-//=============================================================================
-	static Bool filterSetup(FilterTypes filter, enum FilterModes mode);
-Bool W3DShaderManager::filterSetup(FilterTypes filter, enum FilterModes mode)
-{
-	if (W3DFilters[filter])
-		return W3DFilters[filter]->setup(mode);
-	return FALSE;
-}
-
-/*Draws 2 triangles covering the viewport given the current render states*/
-void W3DShaderManager::drawViewport(Int color)
-{
-	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	struct _TRANS_LIT_TEX_VERTEX {
-		D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
-		float	u;
-		float	v;
-	} v[4];
-
-	Int xpos, ypos, width, height;
-
-	TheTacticalView->getOrigin(&xpos,&ypos);
-	width=TheTacticalView->getWidth();
-	height=TheTacticalView->getHeight();
-
-	//bottom right
-	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top right
-	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
-	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	//bottom left
-	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top left
-	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
-	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	v[0].color = color;
-	v[1].color = color;
-	v[2].color = color;
-	v[3].color = color;
-
-	//draw polygons like this is very inefficient but for only 2 triangles, it's
-	//not worth bothering with index/vertex buffers.
-	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
-
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-}
-
-// W3DShaderManager::startRenderToTexture =======================================================
-/** Starts rendering to a texture.
- */
-//=============================================================================
-void W3DShaderManager::startRenderToTexture(void)
-{	
-	DEBUG_ASSERTCRASH(!m_renderingToTexture, ("Already rendering to texture - cannot nest calls."));
-
-	if (m_renderingToTexture || m_newRenderSurface==NULL || m_oldDepthSurface==NULL) return;
-	HRESULT hr = DX8Wrapper::_Get_D3D_Device8()->SetRenderTarget(m_newRenderSurface,m_oldDepthSurface);
-	DEBUG_ASSERTCRASH(hr==S_OK, ("Set target failed unexpectedly."));
-	if (hr != S_OK)
-		return;
-	m_renderingToTexture = true;
-	if (TheGlobalData->m_showSoftWaterEdge)
-	{	//Soft water edges use frame buffer destination alpha so we must clear it to a known value.
-		if (m_currentFilter == FT_VIEW_MOTION_BLUR_FILTER || m_currentFilter == FT_VIEW_CROSSFADE)
-		{	//these filters rely on the previous frame being visible so we must be careful about clearing
-			//frame buffer.  Only clear the alpha channel
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_ALPHA);	//only clear alpha
-			ShaderClass shader=ShaderClass::_PresetOpaqueSolidShader;
-			shader.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);
-			shader.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);
-			DX8Wrapper::Set_Shader(shader);
-
-			VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-			DX8Wrapper::Set_Material(vmat);
-			REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-		
-			drawViewport(0x00ffffff | (((Int)(TheWaterTransparency->m_minWaterOpacity*255.0f)) <<24));
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_RED|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_BLUE);	//disable writes to alpha
-		}
-		else	//normal clear that overwrites everything.
-			DX8Wrapper::Clear(true, false, Vector3( 0.0f, 0.0f, 0.0f ), TheWaterTransparency->m_minWaterOpacity);
-	}
-}
-
-// W3DShaderManager::startRenderToTexture =======================================================
-/** Ends rendering to a texture.
- */
-//=============================================================================
-IDirect3DTexture8 *W3DShaderManager::endRenderToTexture(void)
-{	
-	DEBUG_ASSERTCRASH(m_renderingToTexture, ("Not rendering to texture."));
-	if (!m_renderingToTexture) return NULL;
-	HRESULT hr = DX8Wrapper::_Get_D3D_Device8()->SetRenderTarget(m_oldRenderSurface,m_oldDepthSurface);	//restore original render target
-	DEBUG_ASSERTCRASH(hr==S_OK, ("Set target failed unexpectedly."));
-	if (hr == S_OK)
-	{
-		//assume render target texure will be in stage 0.  Most hardware has "conditional" support for
-		//non-power-of-2 textures so we must force some required states:
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSW, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_MIPFILTER, D3DTEXF_NONE);
-
-		m_renderingToTexture = false;
-	}
-	return m_renderTexture;
-}
-
-/**Returns texture containing the image that was last rendered using any of the effects requiring render target
-textures.  Used mostly for cross-fading effects that need an unmodified version of the view before the effect
-was applied.  NOTE: This texture does not survive device reset.. so quit effect on reset!*/
-IDirect3DTexture8 *W3DShaderManager::getRenderTexture(void)
-{
-	return m_renderTexture;
-}
-
-#define DC_NVIDIA_VENDOR_ID 0x10DE
-#define DC_3DFX_VENDOR_ID	0x121A
-#define DC_ATI_VENDOR_ID	0x1002
-
-// W3DShaderManager::ChipsetType =======================================================
-/** Returns the chipset used by the currently active rendering device.  Can be useful
-	for coding around specific driver bugs.
- */
-//=============================================================================
-ChipsetType W3DShaderManager::getChipset( void )
-{
-	//check if globaldata has an override for current chipset
-	if (TheGlobalData && TheGlobalData->m_chipSetType != DC_UNKNOWN)
-		return (ChipsetType)TheGlobalData->m_chipSetType;
-
-	ChipsetType chip=DC_UNKNOWN;
-	IDirect3D8* d3d8Interface=DX8Wrapper::_Get_D3D8();
-
-	if (d3d8Interface && DX8Wrapper::_Get_D3D_Device8())
-	{
-
-		D3DADAPTER_IDENTIFIER8 did;
-		::ZeroMemory(&did, sizeof(D3DADAPTER_IDENTIFIER8));
-	/*	HRESULT res = */ d3d8Interface->GetAdapterIdentifier(0,D3DENUM_NO_WHQL_LEVEL,&did);
-		
-		if(did.VendorId == DC_NVIDIA_VENDOR_ID)
-		{
-			if (did.DeviceId == 0x20)
-				return DC_TNT;
-   
-			if (did.DeviceId >= 0x28 && did.DeviceId < 0x100)
-				return DC_TNT2;
-
-			if ( (did.DeviceId >= 0x100 && did.DeviceId <= 0x103) ||	//GeForce
-				 (did.DeviceId >= 0x110 && did.DeviceId <= 0x113) ||	//GeForce2 MX
-						 (did.DeviceId >= 0x150 && did.DeviceId <= 0x153) )	//GeForce2
-           		return DC_GEFORCE2;
-
-			if (did.DeviceId >= 0x200 && did.DeviceId < 0x250)
-				return DC_GEFORCE3;
-
-			if (did.DeviceId >= 0x250)
-				return DC_GEFORCE4;
-		}
-		else
-		if(did.VendorId == DC_3DFX_VENDOR_ID)
-		{
-			if (did.DeviceId == 0x0002)
-				return DC_VOODOO2;
-			if (did.DeviceId == 0x0005)
-				return DC_VOODOO3;
-			if (did.DeviceId == 0x0008)	///@todo: Just guessing on this one - find actual Voodoo4 deviceID.
-				return DC_VOODOO4;
-			if (did.DeviceId == 0x0009)
-				return DC_VOODOO5;
-		}
-		else
-		if(did.VendorId == DC_ATI_VENDOR_ID)
-		{
-			if (did.DeviceId == 0x5144)
-				return DC_RADEON;
-			if (did.DeviceId == 0x514C)
-				return DC_RADEON_8500;
-			if (did.DeviceId == 0x4e44)
-				return DC_RADEON_9700;
-		}
-
-		//None of the vendor specific ID's matched so use generic means to classify the card
-		Int maxTextures=DX8Wrapper::Get_Current_Caps()->Get_Max_Simultaneous_Textures();
-		Real pixelShaderVersion;
-
-		char buf[256];
-
-		//Convert version to Real
-		sprintf(buf,"%d.%d",DX8Wrapper::Get_Current_Caps()->Get_Pixel_Shader_Major_Version(),DX8Wrapper::Get_Current_Caps()->Get_Pixel_Shader_Minor_Version());
-		sscanf(buf,"%f",&pixelShaderVersion);
-
-		if (maxTextures >= 4)
-		{	if (pixelShaderVersion >= 1.1f)
-				chip=DC_GENERIC_PIXEL_SHADER_1_1;
-			if (pixelShaderVersion >= 1.4f)
-				chip=DC_GENERIC_PIXEL_SHADER_1_4;
-			if (maxTextures >= 8 && pixelShaderVersion >= 2.0f)
-				chip=DC_GENERIC_PIXEL_SHADER_2_0;
-		}
-	}	//D3D8 interface and device exist. 
-	
-	return chip;
-}
-
-//=============================================================================
-// WaterRenderObjClass::LoadAndCreateShader
-//=============================================================================
-/** Loads and creates a D3D pixel or vertex shader.*/
-//=============================================================================
-HRESULT W3DShaderManager::LoadAndCreateD3DShader(const char* strFilePath, const DWORD* pDeclaration, DWORD Usage, Bool ShaderType, DWORD* pHandle)
-{
-	try
-	{
-		File *file = NULL;
-		HRESULT hr;
-
-		file = TheFileSystem->openFile(strFilePath, File::READ | File::BINARY);
-		if (file == NULL)
-		{
-			OutputDebugString("Could not find file \n" );
-			return E_FAIL;
-		}
-
-		FileInfo fileInfo;
-		TheFileSystem->getFileInfo(AsciiString(strFilePath), &fileInfo);
-		DWORD dwFileSize = fileInfo.sizeLow;
-
-		const DWORD* pShader = (DWORD*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwFileSize);
-		if (!pShader)
-		{
-			OutputDebugString( "Failed to allocate memory to load shader\n " );
-			return E_FAIL;
-		}
-
-		file->read((void *)pShader, dwFileSize);
-
-		file->close();
-		file = NULL;
-
-		if (ShaderType == TRUE)//SHADERTYPE_VERTEX)
-		{
-			hr = DX8Wrapper::_Get_D3D_Device8()->CreateVertexShader(pDeclaration, pShader, pHandle, Usage);
-		}
-		else if (ShaderType == FALSE)//SHADERTYPE_PIXEL)
-		{
-			hr = DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader(pShader, pHandle);
-		}
-
-		HeapFree(GetProcessHeap(), 0, (void*)pShader);
-
-		if (FAILED(hr))
-		{
-			OutputDebugString( "Failed to create shader\n "); 
-			return E_FAIL;
-		}
-	}
-	catch(...)
-	{
-		OutputDebugString( "Error opening file \n" );
-		return E_FAIL;
-	}
-
-	return S_OK;
-}
-
-//For the MP test, we're enforcing high min-spec requirements that need to be verified.
-#define MIN_INTEL_CPU_FREQ	1300
-#define MIN_AMD_CPU_FREQ	1100
-#define MIN_ACCEPTED_FREQUENCY	1300
-#define MIN_ACCEPTED_MEMORY	(1024*1024*256)	//256 MB
-#define MIN_ACCEPTED_TEXTURE_MEMORY	(1024*1024*30)	//30 MB
-
-/**Hack to give gameengine access to this function*/
-Bool testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, Int *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex)
-{
-	return W3DShaderManager::testMinimumRequirements(videoChipType,cpuType,cpuFreq,numRAM,intBenchIndex,floatBenchIndex,memBenchIndex);
-}
-
-Bool W3DShaderManager::testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, Int *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex)
-{
-	if (videoChipType)
-		*videoChipType = getChipset();
-
-	if (cpuType)
-	{
-		*cpuType = XX;	//unknown
-
-		//Check if it's an Athlon
-		if (CPUDetectClass::Get_Processor_Manufacturer() == CPUDetectClass::MANUFACTURER_AMD &&
-				CPUDetectClass::Get_AMD_Processor() >= CPUDetectClass::AMD_PROCESSOR_ATHLON_025)
-				*cpuType = K7;
-
-		//Check if it's a P3
-		if (CPUDetectClass::Get_Processor_Manufacturer() == CPUDetectClass::MANUFACTURER_INTEL &&
-				CPUDetectClass::Get_Intel_Processor() >= CPUDetectClass::INTEL_PROCESSOR_PENTIUM_III_MODEL_7)
-				*cpuType = P3;
-		//Check if it's a P4
-		if (CPUDetectClass::Get_Processor_Manufacturer() == CPUDetectClass::MANUFACTURER_INTEL &&
-				CPUDetectClass::Get_Intel_Processor() >= CPUDetectClass::INTEL_PROCESSOR_PENTIUM4)
-				*cpuType = P4;
-	}
-
-	if (cpuFreq)
-		*cpuFreq=CPUDetectClass::Get_Processor_Speed();
-
-	if (numRAM)
-		*numRAM=CPUDetectClass::Get_Total_Physical_Memory();
-
-	if (intBenchIndex && floatBenchIndex && memBenchIndex)
-	{
-		RunBenchmark(0, NULL, floatBenchIndex, intBenchIndex, memBenchIndex);
-	}
-
-	return TRUE;
-}
-
-/**Try to guess how well the video card will handle the game assuming very fast CPU*/
-StaticGameLODLevel W3DShaderManager::getGPUPerformanceIndex(void)
-{
-	ChipsetType	chipType;
-	StaticGameLODLevel detailSetting=STATIC_GAME_LOD_LOW;	//assume lowest settings for now.
-
-	if ((chipType=getChipset()) != DC_UNKNOWN)
-	{	//a known video card so we can make some assumptions
-		if (chipType >=	DC_GEFORCE2)
-			detailSetting=STATIC_GAME_LOD_LOW;	//these cards need multiple terrain passes.
-		if (chipType >= DC_GENERIC_PIXEL_SHADER_1_1)	//these cards can do terrain in single pass.
-			detailSetting=STATIC_GAME_LOD_HIGH;
-	}
-
-	return detailSetting;
-}
-
-/**We need a hardware independent method to compare different CPU's.  For lack of anything better, we'll
-use time to calculate PIE using a slow random number algorithm.*/
-
-/**Used to test function call overhead*/
-void add(float *sum,float *addend)
-{
-	*sum = *sum + *addend;
-}
-
-/**Returns seconds needed to run the test*/
-Real W3DShaderManager::GetCPUBenchTime(void)
-{
-	float ztot, yran, ymult, ymod, x, y, z, pi, prod;
-    long int low, ixran, itot, j, iprod;
-
-  	__int64 endTime64,freq64,startTime64;
-	QueryPerformanceFrequency((LARGE_INTEGER *)&freq64);
-	QueryPerformanceCounter((LARGE_INTEGER *)&startTime64);
-
-    ztot = 0.0;
-    low = 1;
-    ixran = 1907;
-    yran = 5813.0;
-    ymult = 1307.0;
-    ymod = 5471.0;
-    itot = 560000;	//total iterations. This value ends up running at ~30 fps on our P4-2.2Ghz.
-
-    for(j=1; j<=itot; j++)
-    {
-		iprod = 27611 * ixran;
-		ixran = iprod - 74383*(long int)(iprod/74383);
-		x = (float)ixran / 74383.0;
-		prod = ymult * yran;
-		yran = (prod - ymod*(long int)(prod/ymod));
-		y = yran / ymod;
-		z = x*x + y*y;
-		add(&ztot,&z);
-		if ( z <= 1.0 )
-		{
-		  low = low + 1;
-		}
-	}
-	pi = 4.0 * (float)low/(float)itot;
-
-	QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
-	return ((double)(endTime64-startTime64)/(double)(freq64));
-}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp
index fcb943d2145..2337420cfe4 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp
@@ -42,11 +42,6 @@
 #include "Common/GlobalData.h"
 #include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 
@@ -97,13 +92,13 @@ W3DShroud::W3DShroud(void)
 W3DShroud::~W3DShroud(void)
 {
 	ReleaseResources();
+
 	if (m_pSrcTexture)
 		m_pSrcTexture->Release();
-	m_pSrcTexture=NULL;
-	if (m_finalFogData)
-		delete [] m_finalFogData;
-	if (m_currentFogData)
-		delete [] m_currentFogData;
+
+	delete [] m_finalFogData;
+	delete [] m_currentFogData;
+
 	m_drawFogOfWar=FALSE;
 }
 
@@ -124,7 +119,7 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi
 
 	//Precompute a bounding box for entire shroud layer
 	if (pMap)
-	{	
+	{
 		m_numCellsX = REAL_TO_INT_CEIL((Real)(pMap->getXExtent() - 1 - pMap->getBorderSize()*2)*MAP_XY_FACTOR/m_cellWidth);
 		m_numCellsY = REAL_TO_INT_CEIL((Real)(pMap->getYExtent() - 1 - pMap->getBorderSize()*2)*MAP_XY_FACTOR/m_cellHeight);
 
@@ -133,8 +128,9 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi
 		dstTextureWidth=m_numMaxVisibleCellsX=REAL_TO_INT_FLOOR((Real)(pMap->getDrawWidth()-1)*MAP_XY_FACTOR/m_cellWidth)+1;
 		dstTextureHeight=m_numMaxVisibleCellsY=REAL_TO_INT_FLOOR((Real)(pMap->getDrawHeight()-1)*MAP_XY_FACTOR/m_cellHeight)+1;
 		dstTextureWidth += 2;	//enlarge by 2 pixels so we can have a border color all the way around.
+		unsigned int depth = 1;
 		dstTextureHeight += 2;	//enlarge by 2 pixels so we can have border color all the way around.
-		TextureLoader::Validate_Texture_Size((unsigned int &)dstTextureWidth,(unsigned int &)dstTextureHeight);
+		TextureLoader::Validate_Texture_Size((unsigned int &)dstTextureWidth,(unsigned int &)dstTextureHeight, depth);
 	}
 
 	UnsignedInt srcWidth,srcHeight;
@@ -154,7 +150,7 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi
  	memset(m_finalFogData,0,srcWidth*srcHeight);
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 		m_pSrcTexture = DX8Wrapper::_Create_DX8_Surface(srcWidth,srcHeight, WW3D_FORMAT_A4R4G4B4);
 	else
@@ -178,7 +174,7 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi
 	//clear entire texture to black
 	memset(m_srcTextureData,0,m_srcTexturePitch*srcHeight);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 		fillShroudData(TheGlobalData->m_shroudAlpha);	//initialize shroud to a known value
 #endif
@@ -203,14 +199,17 @@ void W3DShroud::reset()
 {
 	//Free old shroud data since it may no longer fit new map.
 	if (m_pSrcTexture)
+	{
 		m_pSrcTexture->Release();
-	m_pSrcTexture=NULL;
-	if (m_finalFogData)
-		delete [] m_finalFogData;
+		m_pSrcTexture=NULL;
+	}
+
+	delete [] m_finalFogData;
 	m_finalFogData=NULL;
-	if (m_currentFogData)
-		delete [] m_currentFogData;
+
+	delete [] m_currentFogData;
 	m_currentFogData=NULL;
+
 	m_clearDstTexture = TRUE;	//always refill the destination texture after a reset
 }
 
@@ -229,10 +228,10 @@ Bool W3DShroud::ReAcquireResources(void)
 			return TRUE;	//nothing to reaquire since shroud was never initialized with valid data
 
 		DEBUG_ASSERTCRASH( m_pDstTexture == NULL, ("ReAcquire of existing shroud texture"));
-	
+
 		// Create destination texture (stored in video memory).
 		// Since we control the video memory copy, we can do partial updates more efficiently. Or do shift blits.
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 			m_pDstTexture = MSGNEW("TextureClass") TextureClass(m_dstTextureWidth,m_dstTextureHeight,WW3D_FORMAT_A4R4G4B4,MIP_LEVELS_1, TextureClass::POOL_DEFAULT);
 		else
@@ -263,8 +262,8 @@ W3DShroudLevel W3DShroud::getShroudLevel(Int x, Int y)
 	if (x < m_numCellsX && y < m_numCellsY)
 	{
 		UnsignedShort pixel=*(UnsignedShort *)((Byte *)m_srcTextureData + x*2 + y*m_srcTexturePitch);
-		
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 		if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 			//in this mode, alpha channel holds intensity
 			return (W3DShroudLevel)((1.0f-((Real)(pixel >> 12)/15.0f))*255.0f);
@@ -289,7 +288,7 @@ void W3DShroud::setShroudLevel(Int x, Int y, W3DShroudLevel level, Bool textureO
 		if (level < TheGlobalData->m_shroudAlpha)
 			level = TheGlobalData->m_shroudAlpha;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 		{
 			///@todo: optimize this case if we end up using fog shroud.
@@ -328,9 +327,9 @@ void W3DShroud::setShroudLevel(Int x, Int y, W3DShroudLevel level, Bool textureO
 
 //      For those interested, MLorenzen has this bock commented out until he gets back on Mon, Sept. 30 2002
 			// If this code is still here by mid october, nuke it!
-//			UnsignedInt texelRed =  ((*texel >> 8 ) & 0xf8); 
-//			UnsignedInt texelGreen =((*texel >> 3 ) & 0xfc);  
-//			UnsignedInt texelBlue = ((*texel << 3 ) & 0xf8);  
+//			UnsignedInt texelRed =  ((*texel >> 8 ) & 0xf8);
+//			UnsignedInt texelGreen =((*texel >> 3 ) & 0xfc);
+//			UnsignedInt texelBlue = ((*texel << 3 ) & 0xf8);
 //			if (texelRed < texelGreen && texelGreen > texelBlue)
 //			{
 //				bluepixel += redpixel;
@@ -354,7 +353,7 @@ void W3DShroud::fillShroudData(W3DShroudLevel level)
 	if (level < TheGlobalData->m_shroudAlpha)
 		level = TheGlobalData->m_shroudAlpha;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	//convert value to pixel format
 	if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 	{
@@ -388,7 +387,7 @@ void W3DShroud::fillShroudData(W3DShroudLevel level)
 	}
 
 	UnsignedShort *ptr=(UnsignedShort *)m_srcTextureData;
-	Int pitch = m_srcTexturePitch >> 1;	//2 bytes per pointer increment 
+	Int pitch = m_srcTexturePitch >> 1;	//2 bytes per pointer increment
 	for (y=0; y<m_numCellsY; y++)
 	{
 		for (x=0; x<m_numCellsX; x++)
@@ -417,7 +416,7 @@ void W3DShroud::fillBorderShroudData(W3DShroudLevel level, SurfaceClass* pDestSu
 	if (level < TheGlobalData->m_shroudAlpha)
 		level = TheGlobalData->m_shroudAlpha;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	//convert value to pixel format
 	if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 	{
@@ -473,7 +472,7 @@ void W3DShroud::fillBorderShroudData(W3DShroudLevel level, SurfaceClass* pDestSu
 		dstPoint.x=0;
 
 		for (x=0; x<numFullCopies; x++)
-		{	
+		{
 			dstPoint.x = x * srcRect.right;	//advance to next set of pixel in row.
 
 			DX8Wrapper::_Copy_DX8_Rects(
@@ -496,7 +495,7 @@ void W3DShroud::fillBorderShroudData(W3DShroudLevel level, SurfaceClass* pDestSu
 			srcRect.right = oldVal;
 		}
 	}
-	
+
 }
 
 /**Set the shroud color within the border area of the map*/
@@ -525,9 +524,9 @@ void W3DShroud::render(CameraClass *cam)
 	if (DX8Wrapper::_Get_D3D_Device8() && (DX8Wrapper::_Get_D3D_Device8()->TestCooperativeLevel()) != D3D_OK)
 		return;	//device not ready to render anything
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData && TheGlobalData->m_fogOfWarOn != m_drawFogOfWar)
-	{	
+	{
 		//fog state has changed since last time shroud system was initialized
 		reset();
 		ReleaseResources();
@@ -541,10 +540,10 @@ void W3DShroud::render(CameraClass *cam)
 	DEBUG_ASSERTCRASH( m_pSrcTexture != NULL, ("Updating unallocated shroud texture"));
 
 #ifdef LOAD_DUMMY_SHROUD
-	
+
 	static doInit=1;
 	if (doInit)
-	{	
+	{
 		//some temporary code here to debug the shroud.
 
 		///@todo: remove this debug buffer fill.
@@ -585,7 +584,7 @@ void W3DShroud::render(CameraClass *cam)
 		{
 			for (Int x=0; x<desc.Width; x++)
 			{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 				if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 				{
 					dataDest[x]=((TheGlobalData->m_shroudColor.getAsInt()>>4)&0xf) | (((TheGlobalData->m_shroudColor.getAsInt()>>12)&0xf)<<4) | (((TheGlobalData->m_shroudColor.getAsInt()>>20)&0xf)<<8) | ((((255-(dataSrc[x] & 0xff))>>4)&0xf)<<12);
@@ -624,7 +623,7 @@ void W3DShroud::render(CameraClass *cam)
 	Int visEndY=visStartY+REAL_TO_INT_FLOOR((Real)(hm->getDrawHeight()-1)*MAP_XY_FACTOR/m_cellHeight)+1;
 
 	if (visEndX > m_numCellsX)
-	{	
+	{
 		visStartX -= visEndX - m_numCellsX;	//shift visible rectangle to fall within terrain bounds
 		if (visStartX < 0)
 			visStartX = 0;
@@ -632,7 +631,7 @@ void W3DShroud::render(CameraClass *cam)
 	}
 
 	if (visEndY > m_numCellsY)
-	{	
+	{
 		visStartY -= visEndY - m_numCellsY;	//shift visible rectangle to fall within terrain bounds
 		if (visStartY < 0)
 			visStartY = 0;
@@ -650,7 +649,7 @@ void W3DShroud::render(CameraClass *cam)
 	pitch >>= 1;	//we have 2 bytes per pixel, so divide pitch by 2
 
 	Byte *sd=shroudData+visStartY*MAX_MAP_SHROUDSIZE;	//pointer to first shroud row
-	
+
 	for (Int y=visStartY; y<(visStartY+visSizeY); y++)
 	{
 		for (Int x=visStartX; x<(visStartX+visSizeX); x++)
@@ -677,7 +676,7 @@ void W3DShroud::render(CameraClass *cam)
 
 	RECT	srcRect;
 	POINT	dstPoint={1,1};	//first row/column is reserved for border.
-	
+
 	srcRect.left=visStartX;
 	srcRect.top=visStartY;
 	srcRect.right=visEndX;
@@ -692,7 +691,7 @@ void W3DShroud::render(CameraClass *cam)
 	{	//we need to clear unused parts of the destination texture to a known
 		//color in order to keep map border in the state we want.
 		m_clearDstTexture=FALSE;
-		
+
 		fillBorderShroudData(m_boderShroudLevel, pDestSurface);
 	}
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp
index 26be0befb3f..f1dd583f159 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp
@@ -24,9 +24,7 @@
 
 #include "W3DDevice/GameClient/W3DStatusCircle.h"
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include <tri.h>
@@ -65,7 +63,7 @@
 	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
 
 #define VERTEX_BUFFER_TILE_LENGTH	32		//tiles of side length 32 (grid of 33x33 vertices).
-#define VERTS_IN_BLOCK_ROW			(VERTEX_BUFFER_TILE_LENGTH+1)	
+#define VERTS_IN_BLOCK_ROW			(VERTEX_BUFFER_TILE_LENGTH+1)
 
 
 static ShaderClass detailOpaqueShader(SC_ALPHA);
@@ -89,7 +87,7 @@ W3DStatusCircle::W3DStatusCircle(void)
 bool W3DStatusCircle::Cast_Ray(RayCollisionTestClass & raytest)
 {
 
-	return false;	
+	return false;
 
 }
 
@@ -110,7 +108,7 @@ void W3DStatusCircle::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
 {
 	Vector3	ObjSpaceCenter((float)1000*0.5f,(float)1000*0.5f,(float)0);
 	float length = ObjSpaceCenter.Length();
-	
+
 	sphere.Init(ObjSpaceCenter, length);
 }
 
@@ -146,7 +144,7 @@ Int W3DStatusCircle::freeMapResources(void)
 //Allocate a heightmap of x by y vertices.
 //data must be an array matching this size.
 Int W3DStatusCircle::initData(void)
-{	
+{
 	Int i;
 
 	m_needUpdate = true;
@@ -158,7 +156,7 @@ Int W3DStatusCircle::initData(void)
 	// Fill up the IB
 	DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
 	UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-		
+
 	for (i=0; i<3*m_numTriangles; i+=3)
 	{
 		ib[0]=i;
@@ -174,7 +172,7 @@ Int W3DStatusCircle::initData(void)
 	//go with a preset material for now.
 	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 
-	m_shaderClass = ShaderClass::ShaderClass(SC_ALPHA);// _PresetOpaque2DShader;//; //_PresetOpaqueShader;
+	m_shaderClass = ShaderClass(SC_ALPHA);// _PresetOpaque2DShader;//; //_PresetOpaqueShader;
 
 
 	return 0;
@@ -193,17 +191,17 @@ Int W3DStatusCircle::updateCircleVB(void)
 		m_needUpdate = false;
 		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
 		VertexFormatXYZDUV1 *vb = (VertexFormatXYZDUV1*)lockVtxBuffer.Get_Vertex_Array();
-		
+
 		const Real theZ = 0.0f;
 		const Real theRadius = 0.02f;
 		const Int theAlpha = 127;
-	  Int diffuse = m_diffuse + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.		 
+	  Int diffuse = m_diffuse + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.
 		Int limit = m_numTriangles;
 		float curAngle = 0;
 		float deltaAngle = 2*PI/limit;
 		for (i=0; i<limit; i++)
 		{
-			
+
 			shade=0.7f*255.0f;
 			for (k=0; k<3; k++) {
 				vb->z=  theZ;
@@ -219,19 +217,19 @@ Int W3DStatusCircle::updateCircleVB(void)
 					Real angle = curAngle+deltaAngle;
 					if (i==limit-1) {
 						angle = 0;
-					} 
+					}
 					Vector3 vec(theRadius,0,theZ);
 					vec.Rotate_Z(angle);
 					vb->x=	vec.X;
 					vb->y=	vec.Y;
 				}
-				vb->diffuse = diffuse; 
+				vb->diffuse = diffuse;
 				vb->u1=0;
 				vb->v1=0;
 				vb++;
 			}
 			curAngle += deltaAngle;
-			
+
 		}
 		return 0; //success.
 	}
@@ -248,60 +246,60 @@ Int W3DStatusCircle::updateScreenVB(Int diffuse)
 		m_needUpdate = false;
 		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
 		VertexFormatXYZDUV1 *vb = (VertexFormatXYZDUV1*)lockVtxBuffer.Get_Vertex_Array();
-							
+
 		vb->x =	-1;
 		vb->y =	-1;
 		vb->z = 0;
-		vb->diffuse = diffuse; 
+		vb->diffuse = diffuse;
 		vb->u1=0;
 		vb->v1=0;
-		vb++;	
+		vb++;
 
 		vb->x =	1;
 		vb->y =	1;
 		vb->z = 0;
-		vb->diffuse = diffuse; 
+		vb->diffuse = diffuse;
 		vb->u1=0;
 		vb->v1=0;
-		vb++;	
+		vb++;
 
 		vb->x =	-1;
 		vb->y =	1;
 		vb->z = 0;
-		vb->diffuse = diffuse; 
+		vb->diffuse = diffuse;
 		vb->u1=0;
 		vb->v1=0;
-		vb++;	
+		vb++;
 
 		vb->x =	-1;
 		vb->y =	-1;
 		vb->z = 0;
-		vb->diffuse = diffuse; 
+		vb->diffuse = diffuse;
 		vb->u1=0;
 		vb->v1=0;
-		vb++;	
+		vb++;
 
 		vb->x =	1;
 		vb->y =	-1;
 		vb->z = 0;
-		vb->diffuse = diffuse; 
+		vb->diffuse = diffuse;
 		vb->u1=0;
 		vb->v1=0;
-		vb++;	
+		vb++;
 
 		vb->x =	1;
 		vb->y =	1;
 		vb->z = 0;
-		vb->diffuse = diffuse; 
+		vb->diffuse = diffuse;
 		vb->u1=0;
 		vb->v1=0;
-		vb++;	
+		vb++;
 		return 0; //success.
 	}
 	return -1;
 }
 
-void W3DStatusCircle::Render(RenderInfoClass & rinfo)	 
+void W3DStatusCircle::Render(RenderInfoClass & rinfo)
 {
 	if (!TheGameLogic->isInGame() || TheGameLogic->getGameMode() == GAME_SHELL)
 		return;
@@ -351,7 +349,7 @@ void W3DStatusCircle::Render(RenderInfoClass & rinfo)
 	tm.Make_Identity();
 	Real intensity = TheScriptEngine->getFadeValue();
 	Int clr = 255*intensity;
-	Int diffuse = (0xff<<24)|(clr<<16)|(clr<<8)|clr;	 // b g<<8 r<<16 a<<24.		 
+	Int diffuse = (0xff<<24)|(clr<<16)|(clr<<8)|clr;	 // b g<<8 r<<16 a<<24.
 	updateScreenVB(diffuse);
 	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
 	DX8Wrapper::Set_Shader(ShaderClass(SC_ADD));
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
deleted file mode 100644
index 38ce674c733..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
+++ /dev/null
@@ -1,979 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DTerrainTracks.cpp ////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: W3DTerrainTracks.cpp
-//
-// Created:   Mark Wilczynski, May 2001
-//
-// Desc:      Draw track marks on the terrain.  Uses a sequence of connected
-//			  quads that are oriented to fit the terrain and updated when object
-//			  moves.
-//-----------------------------------------------------------------------------
-
-#include "W3DDevice/GameClient/W3DTerrainTracks.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "Common/PerfTimer.h"
-#include "Common/GlobalData.h"
-#include "Common/Debug.h"
-#include "texture.h"
-#include "colmath.h"
-#include "coltest.h"
-#include "rinfo.h"
-#include "camera.h"
-#include "assetmgr.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/scene.h"
-#include "GameLogic/TerrainLogic.h"
-#include "GameLogic/Object.h"
-#include "GameClient/Drawable.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#define BRIDGE_OFFSET_FACTOR	0.25f	//amount to raise tracks above bridges.
-//=============================================================================
-// TerrainTracksRenderObjClass::~TerrainTracksRenderObjClass
-//=============================================================================
-/** Destructor. Releases w3d assets. */
-//=============================================================================
-TerrainTracksRenderObjClass::~TerrainTracksRenderObjClass(void)
-{
-	freeTerrainTracksResources();
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::TerrainTracksRenderObjClass
-//=============================================================================
-/** Constructor. Just nulls out some variables. */
-//=============================================================================
-TerrainTracksRenderObjClass::TerrainTracksRenderObjClass(void)
-{
-	m_stageZeroTexture=NULL;
-	m_lastAnchor=Vector3(0,1,2.25);
-	m_haveAnchor=false;
-	m_haveCap=true;
-	m_topIndex=0;
-	m_bottomIndex=0;
-	m_activeEdgeCount=0;
-	m_totalEdgesAdded=0;
-	m_bound=false;
-	m_ownerDrawable = NULL;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::Get_Obj_Space_Bounding_Sphere
-//=============================================================================
-/** WW3D method that returns object bounding sphere used in frustum culling*/
-//=============================================================================
-void TerrainTracksRenderObjClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
-{	/// @todo: Add code to cull track marks to screen by constantly updating bounding volumes
-	sphere=m_boundingSphere;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::Get_Obj_Space_Bounding_Box
-//=============================================================================
-/** WW3D method that returns object bounding box used in collision detection*/
-//=============================================================================
-void TerrainTracksRenderObjClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
-{
-	box=m_boundingBox;
-}
-
-//=============================================================================
-// MirrorRenderObjClass::Class_ID
-//=============================================================================
-/** returns the class id, so the scene can tell what kind of render object it has. */
-//=============================================================================
-Int TerrainTracksRenderObjClass::Class_ID(void) const
-{
-	return RenderObjClass::CLASSID_IMAGE3D;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::Clone
-//=============================================================================
-/** Not used, but required virtual method. */
-//=============================================================================
-RenderObjClass *	 TerrainTracksRenderObjClass::Clone(void) const
-{
-	assert(false);
-	return NULL;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::freeTerrainTracksResources
-//=============================================================================
-/** Free any W3D resources associated with this object */
-//=============================================================================
-Int TerrainTracksRenderObjClass::freeTerrainTracksResources(void)
-{
-	REF_PTR_RELEASE(m_stageZeroTexture);
-	m_haveAnchor=false;
-	m_haveCap=true;
-	m_topIndex=0;
-	m_bottomIndex=0;
-	m_activeEdgeCount=0;
-	m_totalEdgesAdded=0;
-	m_ownerDrawable = NULL;
-
-	return 0;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::init
-//=============================================================================
-/** Setup size settings and allocate W3D texture */
-//=============================================================================
-void TerrainTracksRenderObjClass::init( Real width, Real length, const Char *texturename)
-{	
-	freeTerrainTracksResources();	//free old data and ib/vb
-
-	m_boundingSphere.Init(Vector3(0,0,0),400*MAP_XY_FACTOR);
-	m_boundingBox.Center.Set(0.0f, 0.0f, 0.0f);
-	m_boundingBox.Extent.Set(400.0f*MAP_XY_FACTOR, 400.0f*MAP_XY_FACTOR, 1.0f);
-	m_width=width;
-	m_length=length;
-	//no sense culling these things since they have very irregular shape and fade
-	//out over time.
-	Set_Force_Visible(TRUE);
-	m_stageZeroTexture=WW3DAssetManager::Get_Instance()->Get_Texture(texturename);
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::addCapEdgeToTrack
-//=============================================================================
-/** Cap the current track (adding an feathered edge) so we're ready to resume
-		the track at a new location.  Used by objects entering FOW where we need to
-		stop adding edges to the track when they enter the fog boundary but resume
-		elsewhere if they become visible again.
-*/
-//=============================================================================
-void TerrainTracksRenderObjClass::addCapEdgeToTrack(Real x, Real y)
-{
-	/// @todo: Have object pass its height and orientation so we can remove extra calls.
-
-	if (m_haveCap)
-	{	//we already have a cap or there are no segments to cap
-		return;
-	}
-
-	if (m_activeEdgeCount == 1)
-	{	//if we only have one edge, then it must be the current anchor edge.
-		//since achnors are caps, there is not point in adding another.
-		m_haveCap=TRUE;
-		m_haveAnchor=false;	//recreate a new anchor when track resumes.
-		return;
-	}
-
-	Vector3	vPos,vZ;
-	Coord3D vZTmp;
-	PathfindLayerEnum objectLayer;
-	Real eHeight;
-
-	if (m_ownerDrawable && (objectLayer=m_ownerDrawable->getObject()->getLayer()) != LAYER_GROUND) 
-		eHeight=BRIDGE_OFFSET_FACTOR+TheTerrainLogic->getLayerHeight(x,y,objectLayer,&vZTmp);
-	else
-		eHeight=TheTerrainLogic->getGroundHeight(x,y,&vZTmp);
-
-	vZ.X = vZTmp.x;
-	vZ.Y = vZTmp.y;
-	vZ.Z = vZTmp.z;
-
-	vPos.X=x;
-	vPos.Y=y;
-	vPos.Z=eHeight;
-
-	Vector3	vDir=Vector3(x,y,eHeight)-m_lastAnchor;
-	Int maxEdgeCount=TheTerrainTracksRenderObjClassSystem->m_maxTankTrackEdges;
-
-	//avoid sqrt() by checking distance squared since last track mark
-	if (vDir.Length2() < sqr(m_length))
-	{	//not far enough from anchor to add track
-		//since this is a  cap, we'll force the previous segment to transparent
-		Int lastAddedEdge=m_topIndex-1;
-		if (lastAddedEdge < 0)
-			lastAddedEdge = maxEdgeCount-1;
-		m_edges[lastAddedEdge].alpha=0.0f;	//force the last added edge to transparent.
-		m_haveCap=TRUE;
-		m_haveAnchor=false;	//recreate a new anchor when track resumes.
-		return;
-	}
-
-	if (m_activeEdgeCount >= maxEdgeCount)
-	{	//no more room in buffer so release oldest edge
-		m_bottomIndex++;
-		m_activeEdgeCount--;
-
-		if (m_bottomIndex >= maxEdgeCount)
-			m_bottomIndex=0;	//roll buffer back to start
-	}
-
-	if (m_topIndex >= maxEdgeCount)
-		m_topIndex=0;	//roll around buffer
-
-	//we traveled far enough from last point.
-	//accept new point
-	vDir.Z=0;	//ignore height
-	vDir.Normalize();
-
-	Vector3	vX;
-
-	Vector3::Cross_Product(vDir,vZ,&vX);
-
-	//calculate left end point
-	edgeInfo& topEdge = m_edges[m_topIndex];
-
-	topEdge.endPointPos[0]=vPos-(m_width*0.5f*vX);	///@todo: try getting height at endpoint
-	topEdge.endPointPos[0].Z += 0.2f * MAP_XY_FACTOR;	//raise above terrain slightly
-
-	if (m_totalEdgesAdded&1)	//every other edge has different set of UV's
-	{	
-		topEdge.endPointUV[0].X=0.0f;
-		topEdge.endPointUV[0].Y=0.0f;
-	}
-	else
-	{	
-		topEdge.endPointUV[0].X=0.0f;
-		topEdge.endPointUV[0].Y=1.0f;
-	}
-
-	//calculate right end point
-	topEdge.endPointPos[1]=vPos+(m_width*0.5f*vX);	///@todo: try getting height at endpoint
-	topEdge.endPointPos[1].Z += 0.2f * MAP_XY_FACTOR;	//raise above terrain slightly
-
-	if (m_totalEdgesAdded&1)	//every other edge has different set of UV's
-	{	
-		topEdge.endPointUV[1].X=1.0f;
-		topEdge.endPointUV[1].Y=0.0f;
-	}
-	else
-	{	
-		topEdge.endPointUV[1].X=1.0f;
-		topEdge.endPointUV[1].Y=1.0f;
-	}
-
-	topEdge.timeAdded=WW3D::Get_Sync_Time();
-	topEdge.alpha=0.0f;	//fully transparent at cap.	
-	m_lastAnchor=vPos;
-	m_activeEdgeCount++;
-	m_totalEdgesAdded++;
-	m_topIndex++;	//make space for new edge
-	m_haveCap=TRUE;
-	m_haveAnchor=false;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::addEdgeToTrack
-//=============================================================================
-/** Try to add an additional segment to track mark.  Will do nothing if distance
-* from last edge is too small.  Will overwrite the oldest edge if maximum track
-* length is reached.  Oldest edges should by faded out by that time.
-*/
-//=============================================================================
-void TerrainTracksRenderObjClass::addEdgeToTrack(Real x, Real y)
-{
-	/// @todo: Have object pass its height and orientation so we can remove extra calls.
-
-	if (!m_haveAnchor)
-	{	//no anchor yet, make this point an anchor.
-		PathfindLayerEnum objectLayer;
-		if (m_ownerDrawable && (objectLayer=m_ownerDrawable->getObject()->getLayer()) != LAYER_GROUND) 
-			m_lastAnchor=Vector3(x,y,TheTerrainLogic->getLayerHeight(x,y,objectLayer)+BRIDGE_OFFSET_FACTOR);
-		else
-			m_lastAnchor=Vector3(x,y,TheTerrainLogic->getGroundHeight(x,y));
-
-		m_haveAnchor=true;
-		m_airborne = true;
-		m_haveCap = true;	//single segment tracks are always capped because nothing is drawn.
-		return;
-	}
-
-	m_haveCap = false;	//have more than 1 segment now so will need to cap if it's interrupted.
-
-	Vector3	vPos,vZ;
-	Coord3D vZTmp;
-	Real eHeight;
-	PathfindLayerEnum objectLayer;
-
-	if (m_ownerDrawable && (objectLayer=m_ownerDrawable->getObject()->getLayer()) != LAYER_GROUND) 
-		eHeight=BRIDGE_OFFSET_FACTOR+TheTerrainLogic->getLayerHeight(x,y,objectLayer,&vZTmp);
-	else
-		eHeight=TheTerrainLogic->getGroundHeight(x,y,&vZTmp);
-
-	vZ.X = vZTmp.x;
-	vZ.Y = vZTmp.y;
-	vZ.Z = vZTmp.z;
-
-	vPos.X=x;
-	vPos.Y=y;
-	vPos.Z=eHeight;
-
-	Vector3	vDir=Vector3(x,y,eHeight)-m_lastAnchor;
-
-	//avoid sqrt() by checking distance squared since last track mark
-	if (vDir.Length2() < sqr(m_length))
-		return;	//not far enough from anchor to add track
-
-	Int maxEdgeCount=TheTerrainTracksRenderObjClassSystem->m_maxTankTrackEdges;
-
-	if (m_activeEdgeCount >= maxEdgeCount)
-	{	//no more room in buffer so release oldest edge
-		m_bottomIndex++;
-		m_activeEdgeCount--;
-
-		if (m_bottomIndex >= maxEdgeCount)
-			m_bottomIndex=0;	//roll buffer back to start
-	}
-
-	if (m_topIndex >= maxEdgeCount)
-		m_topIndex=0;	//roll around buffer
-
-	//we traveled far enough from last point.
-	//accept new point
-	vDir.Z=0;	//ignore height
-	vDir.Normalize();
-
-	Vector3	vX;
-
-	Vector3::Cross_Product(vDir,vZ,&vX);
-
-	edgeInfo& topEdge = m_edges[m_topIndex];
-
-	//calculate left end point
-	topEdge.endPointPos[0]=vPos-(m_width*0.5f*vX);	///@todo: try getting height at endpoint
-	topEdge.endPointPos[0].Z += 0.2f * MAP_XY_FACTOR;	//raise above terrain slightly
-
-	if (m_totalEdgesAdded&1)	//every other edge has different set of UV's
-	{	
-		topEdge.endPointUV[0].X=0.0f;
-		topEdge.endPointUV[0].Y=0.0f;
-	}
-	else
-	{	
-		topEdge.endPointUV[0].X=0.0f;
-		topEdge.endPointUV[0].Y=1.0f;
-	}
-
-	//calculate right end point
-	topEdge.endPointPos[1]=vPos+(m_width*0.5f*vX);	///@todo: try getting height at endpoint
-	topEdge.endPointPos[1].Z += 0.2f * MAP_XY_FACTOR;	//raise above terrain slightly
-
-	if (m_totalEdgesAdded&1)	//every other edge has different set of UV's
-	{	
-		topEdge.endPointUV[1].X=1.0f;
-		topEdge.endPointUV[1].Y=0.0f;
-	}
-	else
-	{	
-		topEdge.endPointUV[1].X=1.0f;
-		topEdge.endPointUV[1].Y=1.0f;
-	}
-
-	topEdge.timeAdded=WW3D::Get_Sync_Time();
-	topEdge.alpha=1.0f;	//fully opaque at start.	
-	if (m_airborne || m_activeEdgeCount <= 1) {
-		topEdge.alpha=0.0f;	//smooth out track restarts by setting transparent
-	}
-	m_airborne = false;
-
-	m_lastAnchor=vPos;
-	m_activeEdgeCount++;
-	m_totalEdgesAdded++;
-	m_topIndex++;	//make space for new edge
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::Render
-//=============================================================================
-/** Does nothing.  Just increments a counter of how many track edges were
-*  requested for rendering this frame.  Actual rendering is done in flush().
-*/
-//=============================================================================
-void TerrainTracksRenderObjClass::Render(RenderInfoClass & rinfo)
-{	///@todo: After adding track mark visibility tests, add visible marks to another list.
-	if (TheGlobalData->m_makeTrackMarks && m_activeEdgeCount >= 2)
-		TheTerrainTracksRenderObjClassSystem->m_edgesToFlush += m_activeEdgeCount;
-}
-
-#define DEFAULT_TRACK_SPACING  (MAP_XY_FACTOR  * 1.4f)
-#define DEFAULT_TRACK_WIDTH	4.0f;
-
-/**Find distance between the "trackfx" bones of the model.  This tells us the correct
-   width for the trackmarks.
-*/
-static Real computeTrackSpacing(RenderObjClass *renderObj)
-{
-	Real trackSpacing = DEFAULT_TRACK_SPACING;
-	Int leftTrack;
-	Int rightTrack;
-
-	if ((leftTrack=renderObj->Get_Bone_Index( "TREADFX01" )) != 0 && (rightTrack=renderObj->Get_Bone_Index( "TREADFX02" )) != 0)
-	{	//both bones found, determine distance between them.
-		Vector3 leftPos,rightPos;
-		leftPos=renderObj->Get_Bone_Transform( leftTrack ).Get_Translation();
-		rightPos=renderObj->Get_Bone_Transform( rightTrack ).Get_Translation();
-		rightPos -= leftPos;	//get distance between centers of tracks
-		trackSpacing = rightPos.Length() + DEFAULT_TRACK_WIDTH;	//add width of each track
-		///@todo: It's assumed that all tank treads have the same width.
-	};
-
-	return trackSpacing;
-}
-
-//=============================================================================
-//TerrainTracksRenderObjClassSystem::bindTrack
-//=============================================================================
-/** Grab a track from the free store. If no free tracks exist, return NULL.
-	As long as a track is bound to an object (like a tank) it is ready to accept
-	updates with additional edges.  Once it is unbound, it will expire and return
-	to the free store once all tracks have faded out.
-
-	Input: width in world units of each track edge (should probably width of vehicle).
-		   length in world units between edges.  Shorter lengths produce more edges and
-		   smoother curves.
-		   texture to use for the tracks - image should be symetrical and include alpha channel.
-*/
-//=============================================================================
-TerrainTracksRenderObjClass *TerrainTracksRenderObjClassSystem::bindTrack( RenderObjClass *renderObject, Real length, const Char *texturename)
-{
-	TerrainTracksRenderObjClass *mod;
-
-	mod = m_freeModules;
-	if( mod )
-	{
-		// take module off the free list
-		if( mod->m_nextSystem )
-			mod->m_nextSystem->m_prevSystem = mod->m_prevSystem;
-		if( mod->m_prevSystem )
-			mod->m_prevSystem->m_nextSystem = mod->m_nextSystem;
-		else
-			m_freeModules = mod->m_nextSystem;
-
-		// put module on the used list
-		mod->m_prevSystem = NULL;
-		mod->m_nextSystem = m_usedModules;
-		if( m_usedModules )
-			m_usedModules->m_prevSystem = mod;
-		m_usedModules = mod;
-
-		mod->init(computeTrackSpacing(renderObject),length,texturename);
-		mod->m_bound=true;
-		m_TerrainTracksScene->Add_Render_Object( mod);
-	}  // end if
-
-	return mod;
-
-}  //end bindTrack
-
-//=============================================================================
-//TerrainTracksRenderObjClassSystem::unbindTrack
-//=============================================================================
-/** Called when an object (i.e Tank) will not lay down any more tracks and
-doesn't need this object anymore.  The track-laying object will be returned
-to pool of available tracks as soon as any remaining track edges have faded out.
-*/
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::unbindTrack( TerrainTracksRenderObjClass *mod )
-{
-	//this object should return to free store as soon as there is nothing
-	//left to render.
-	mod->m_bound=false;
-	mod->m_ownerDrawable = NULL;
-}
-
-//=============================================================================
-//TerrainTracksRenderObjClassSystem::releaseTrack
-//=============================================================================
-/** Returns a track laying object to free store to be used again later.
-*/
-void TerrainTracksRenderObjClassSystem::releaseTrack( TerrainTracksRenderObjClass *mod )
-{
-	if (mod==NULL)
-		return;
-	
-	DEBUG_ASSERTCRASH(mod->m_bound == false, ("mod is bound."));
-
-	// remove module from used list
-	if( mod->m_nextSystem )
-		mod->m_nextSystem->m_prevSystem = mod->m_prevSystem;
-	if( mod->m_prevSystem )
-		mod->m_prevSystem->m_nextSystem = mod->m_nextSystem;
-	else
-		m_usedModules = mod->m_nextSystem;
-
-	// add module to free list
-	mod->m_prevSystem = NULL;
-	mod->m_nextSystem = m_freeModules;
-	if( m_freeModules )
-		m_freeModules->m_prevSystem = mod;
-	m_freeModules = mod;
-	mod->freeTerrainTracksResources();
-	m_TerrainTracksScene->Remove_Render_Object(mod);
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::TerrainTracksRenderObjClassSystem
-//=============================================================================
-/** Constructor. Just nulls out some variables. */
-//=============================================================================
-TerrainTracksRenderObjClassSystem::TerrainTracksRenderObjClassSystem()
-{
-	m_usedModules = NULL;
-	m_freeModules = NULL;
-	m_TerrainTracksScene = NULL;
-	m_edgesToFlush = 0;
-	m_indexBuffer = NULL;
-	m_vertexMaterialClass = NULL;
-	m_vertexBuffer = NULL;
-
-	m_maxTankTrackEdges=TheGlobalData->m_maxTankTrackEdges;
-	m_maxTankTrackOpaqueEdges=TheGlobalData->m_maxTankTrackOpaqueEdges;
-	m_maxTankTrackFadeDelay=TheGlobalData->m_maxTankTrackFadeDelay;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::~TerrainTracksRenderObjClassSystem
-//=============================================================================
-/** Destructor.  Free all pre-allocated track laying render objects*/
-//=============================================================================
-TerrainTracksRenderObjClassSystem::~TerrainTracksRenderObjClassSystem( void )
-{
-
-	// free all data
-	shutdown();
-
-	m_vertexMaterialClass=NULL;
-	m_TerrainTracksScene=NULL;
-
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::ReAcquireResources
-//=============================================================================
-/** (Re)allocates all W3D assets after a reset.. */
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::ReAcquireResources(void)
-{
-	Int i;
-	const Int numModules=TheGlobalData->m_maxTerrainTracks;
-
-	// just for paranoia's sake.
-	REF_PTR_RELEASE(m_indexBuffer);
-	REF_PTR_RELEASE(m_vertexBuffer);
-
-	//Create static index buffers.  These will index the vertex buffers holding the track segments
-	m_indexBuffer=NEW_REF(DX8IndexBufferClass,((m_maxTankTrackEdges-1)*6));
-
-	// Fill up the IB
-	{
-		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
-		UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-
-		for (i=0; i<(m_maxTankTrackEdges-1); i++)
-		{
-			ib[3]=ib[0]=i*2;
-			ib[1]=i*2+1;
-			ib[4]=ib[2]=(i+1)*2+1;
-			ib[5]=(i+1)*2;
-			ib+=6;	//skip the 6 indices we just filled
-		}
-	}
-
-	DEBUG_ASSERTCRASH(numModules*m_maxTankTrackEdges*2 < 65535, ("Too many terrain track edges"));
-
-	m_vertexBuffer=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZDUV1,numModules*m_maxTankTrackEdges*2,DX8VertexBufferClass::USAGE_DYNAMIC));
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::ReleaseResources
-//=============================================================================
-/** (Re)allocates all W3D assets after a reset.. */
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::ReleaseResources(void)
-{
-	REF_PTR_RELEASE(m_indexBuffer);
-	REF_PTR_RELEASE(m_vertexBuffer);
-	// Note - it is ok to not release the material, as it is a w3d object that
-	// has no dx8 resources. jba.
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::init
-//=============================================================================
-/**  initialize the system, allocate all the render objects we will need */
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::init( SceneClass *TerrainTracksScene )
-{
-	const Int numModules=TheGlobalData->m_maxTerrainTracks;
-
-	Int i;
-	TerrainTracksRenderObjClass *mod;
-
-	m_TerrainTracksScene=TerrainTracksScene;
-
-	ReAcquireResources();
-	//go with a preset material for now.
-	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-
-	//use a multi-texture shader: (text1*diffuse)*text2.
-	m_shaderClass = ShaderClass::_PresetAlphaShader;//_PresetATestSpriteShader;//_PresetOpaqueShader;
-
-	// we cannot initialize a system that is already initialized
-	if( m_freeModules || m_usedModules )
-	{
-
-		// system already online!
-		assert( 0 );
-		return;
-
-	}  // end if
-
-	// allocate our modules for this system
-	for( i = 0; i < numModules; i++ )
-	{
-
-		mod = NEW_REF( TerrainTracksRenderObjClass, () );
-
-		if( mod == NULL )
-		{
-
-			// unable to allocate modules needed
-			assert( 0 );
-			return;
-
-		}  // end if
-
-		mod->m_prevSystem = NULL;
-		mod->m_nextSystem = m_freeModules;
-		if( m_freeModules )
-			m_freeModules->m_prevSystem = mod;
-		m_freeModules = mod;
-
-	}  // end for i
-
-}  // end init
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::shutdown
-//=============================================================================
-/** Shutdown and free all memory for this system */
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::shutdown( void )
-{
-	TerrainTracksRenderObjClass *nextMod,*mod;
-
-	//release unbound tracks that may still be fading out
-	mod=m_usedModules;
-
-	while(mod)
-	{
-		nextMod=mod->m_nextSystem;
-
-		if (!mod->m_bound)
-			releaseTrack(mod);
-
-		mod = nextMod;
-	}  // end while
-
-
-	// free all attached things and used modules
-	assert( m_usedModules == NULL );
-
-	// free all module storage
-	while( m_freeModules )
-	{
-
-		nextMod = m_freeModules->m_nextSystem;
-		REF_PTR_RELEASE (m_freeModules);
-		m_freeModules = nextMod;
-
-	}  // end while
-
-	REF_PTR_RELEASE(m_indexBuffer);
-	REF_PTR_RELEASE(m_vertexMaterialClass);
-	REF_PTR_RELEASE(m_vertexBuffer);
-
-}  // end shutdown
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::update
-//=============================================================================
-/** Update the state of all active track marks - fade, expire, etc. */
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::update()
-{
-
-	Int		iTime=WW3D::Get_Sync_Time();
-	Real	iDiff;
-	TerrainTracksRenderObjClass *mod=m_usedModules,*nextMod;
-
-	//first update all the tracks
-	while( mod )
-	{
-		Int i,index;
-		Vector3 *endPoint;
-		Vector2 *endPointUV;
-
-		nextMod = mod->m_nextSystem;
-
-		if (!TheGlobalData->m_makeTrackMarks)
-			mod->m_haveAnchor=false;	//force a track restart next time around.
-
-		for (i=0,index=mod->m_bottomIndex; i<mod->m_activeEdgeCount; i++,index++)
-		{
-			if (index >= m_maxTankTrackEdges)
-				index=0;
-
-			endPoint=&mod->m_edges[index].endPointPos[0];	//left endpoint
-			endPointUV=&mod->m_edges[index].endPointUV[0];
-			iDiff=(float)(iTime-mod->m_edges[index].timeAdded);
-			iDiff = 1.0f - iDiff/(Real)m_maxTankTrackFadeDelay;
-			if (iDiff < 0.0)
-				iDiff=0.0f;
-			if (mod->m_edges[index].alpha>0.0f) {
-				mod->m_edges[index].alpha=iDiff;
-			}
-
-			if (iDiff == 0.0f)
-			{	//this edge was invisible, we can remove it
-				mod->m_bottomIndex++;
-				mod->m_activeEdgeCount--;
-
-				if (mod->m_bottomIndex >= m_maxTankTrackEdges)
-					mod->m_bottomIndex=0;	//roll buffer back to start
-			}
-			if (mod->m_activeEdgeCount == 0 && !mod->m_bound)
-				releaseTrack(mod);
-		}
-		mod = nextMod;
-	}  // end while
-}
-
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::flush
-//=============================================================================
-/** Draw all active track marks for this frame */
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::flush()
-{
-/** @todo: Optimize system by drawing tracks as triangle strips and use dynamic vertex buffer access.
-May also try rendering all tracks with one call to W3D/D3D by grouping them by texture.
-Try improving the fit to vertical surfaces like cliffs.
-*/
-
-	Int	diffuseLight;
-	TerrainTracksRenderObjClass *mod=m_usedModules;
-	if (!mod)
-		return;	//nothing to render
-
-	Int	trackStartIndex;
-	Real distanceFade;
-
-	if (ShaderClass::Is_Backface_Culling_Inverted())
-		return;	//don't render track marks in reflections.
-
-	// adjust shading for time of day.
-	Real shadeR, shadeG, shadeB;
-	shadeR = TheGlobalData->m_terrainAmbient[0].red;
-	shadeG = TheGlobalData->m_terrainAmbient[0].green;
-	shadeB = TheGlobalData->m_terrainAmbient[0].blue;
-	shadeR += TheGlobalData->m_terrainDiffuse[0].red/2;
-	shadeG += TheGlobalData->m_terrainDiffuse[0].green/2;
-	shadeB += TheGlobalData->m_terrainDiffuse[0].blue/2;
-	shadeR*=255.0f;
-	shadeG*=255.0f;
-	shadeB*=255.0f;
-
-	diffuseLight = REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16);
-	Real numFadedEdges=m_maxTankTrackEdges-m_maxTankTrackOpaqueEdges;
-
-	//check if there is anything to draw and fill vertex buffer
-	if (m_edgesToFlush >= 2)
-	{
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexBuffer);
-		VertexFormatXYZDUV1 *verts = (VertexFormatXYZDUV1*)lockVtxBuffer.Get_Vertex_Array();
-		trackStartIndex=0;
-
-		mod=m_usedModules;
-		//Fill our vertex buffer with all the tracks
-		while( mod )
-		{
-			Int i,index;
-			Vector3 *endPoint;
-			Vector2 *endPointUV;
-
-			if (mod->m_activeEdgeCount >= 2 && mod->Is_Really_Visible())
-			{
-				for (i=0,index=mod->m_bottomIndex; i<mod->m_activeEdgeCount; i++,index++)
-				{
-					if (index >= m_maxTankTrackEdges)
-						index=0;
-
-					endPoint=&mod->m_edges[index].endPointPos[0];	//left endpoint
-					endPointUV=&mod->m_edges[index].endPointUV[0];
-		
-					distanceFade=1.0f;
-
-					if ((mod->m_activeEdgeCount -1 -i) >= m_maxTankTrackOpaqueEdges)// && i < (MAX_PER_TRACK_EDGE_COUNT-FORCE_FADE_AT_EDGE))
-					{	//we're getting close to the limit on the number of track pieces allowed
-						//so force it to fade out.
-						distanceFade=1.0f-(float)((mod->m_activeEdgeCount -i)-m_maxTankTrackOpaqueEdges)/numFadedEdges;
-					}
-
-					distanceFade *= mod->m_edges[index].alpha;	//adjust fade with distance from start of track
-
-					verts->x=endPoint->X;
-					verts->y=endPoint->Y;
-					verts->z=endPoint->Z;
-					
-					verts->u1=endPointUV->X;
-					verts->v1=endPointUV->Y;
-
-					//fade the alpha channel with distance
-					verts->diffuse=diffuseLight | ( REAL_TO_INT(distanceFade*255.0f) <<24);
-					verts++;
-
-					endPoint=&mod->m_edges[index].endPointPos[1];	//right endpoint
-					endPointUV=&mod->m_edges[index].endPointUV[1];
-
-					verts->x=endPoint->X;
-					verts->y=endPoint->Y;
-					verts->z=endPoint->Z;
-
-					verts->u1=endPointUV->X;
-					verts->v1=endPointUV->Y;			///@todo: Add diffuse lighting.
-
-					verts->diffuse=diffuseLight | ( REAL_TO_INT(distanceFade*255.0f) <<24);
-					verts++;
-				}//for
-			}// mod has edges to render
-			mod = mod->m_nextSystem;
-		}	//while (mod)
-	}//edges to flush
-
-	//draw the filled vertex buffers
-	if (m_edgesToFlush >= 2)
-	{
-		ShaderClass::Invalidate();
-		DX8Wrapper::Set_Material(m_vertexMaterialClass);
-		DX8Wrapper::Set_Shader(m_shaderClass);
-		DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
-		DX8Wrapper::Set_Vertex_Buffer(m_vertexBuffer);
-
-		trackStartIndex=0;
-		mod=m_usedModules;
-		Matrix3D tm(mod->Transform);
-		DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-		while (mod)
-		{
-			if (mod->m_activeEdgeCount >= 2 && mod->Is_Really_Visible())
-			{
-				DX8Wrapper::Set_Texture(0,mod->m_stageZeroTexture);
-				DX8Wrapper::Set_Index_Buffer_Index_Offset(trackStartIndex);
-				DX8Wrapper::Draw_Triangles(	0,(mod->m_activeEdgeCount-1)*2, 0, mod->m_activeEdgeCount*2);
-
-				trackStartIndex += mod->m_activeEdgeCount*2;
-			}
-			mod=mod->m_nextSystem;
-		}
-	}	//there are some edges to render in pool.
-
-	m_edgesToFlush=0;	//reset count for next flush
-}
-
-/**Removes all remaining tracks from the rendering system*/
-void TerrainTracksRenderObjClassSystem::Reset(void)
-{
-	TerrainTracksRenderObjClass *nextMod,*mod=m_usedModules;
-
-	while(mod)
-	{
-		nextMod=mod->m_nextSystem;
-
-		releaseTrack(mod);
-
-		mod = nextMod;
-	}  // end while
-
-
-	// free all attached things and used modules
-	assert( m_usedModules == NULL );
-	m_edgesToFlush=0;
-}
-
-/**Clear the treads from each track laying object without freeing the objects.
-Mostly used when user changed LOD level*/
-void TerrainTracksRenderObjClassSystem::clearTracks(void)
-{
-	TerrainTracksRenderObjClass *mod=m_usedModules;
-
-	while(mod)
-	{
-		mod->m_haveAnchor=false;
-		mod->m_haveCap=true;
-		mod->m_topIndex=0;
-		mod->m_bottomIndex=0;
-		mod->m_activeEdgeCount=0;
-		mod->m_totalEdgesAdded=0;
-
-		mod = mod->m_nextSystem;
-	}  // end while
-
-	m_edgesToFlush=0;
-}
-
-/**Adjust various paremeters which affect the cost of rendering tracks on the map.
-Parameters are passed via GlobalData*/
-void TerrainTracksRenderObjClassSystem::setDetail(void)
-{
-	//Remove all existing track segments from screen.
-	clearTracks();
-	ReleaseResources();
-
-	m_maxTankTrackEdges=TheGlobalData->m_maxTankTrackEdges;
-	m_maxTankTrackOpaqueEdges=TheGlobalData->m_maxTankTrackOpaqueEdges;
-	m_maxTankTrackFadeDelay=TheGlobalData->m_maxTankTrackFadeDelay;
-
-	//We changed the maximum number of visible edges so re-allocate our resources to match.
-	ReAcquireResources();
-};
-
-TerrainTracksRenderObjClassSystem *TheTerrainTracksRenderObjClassSystem=NULL;	///< singleton for track drawing system.
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
deleted file mode 100644
index 67487cfbf6d..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
+++ /dev/null
@@ -1,825 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DTerrainVisual.cpp /////////////////////////////////////////////////////////////////////
-// W3D implementation details for visual aspects of terrain
-// Author: Colin Day, April 2001
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <windows.h>
-
-#include "Common/GameState.h"
-#include "Common/GlobalData.h"
-#include "Common/PerfTimer.h"
-#include "Common/MapReaderWriterInfo.h"
-#include "Common/ThingTemplate.h"
-#include "Common/WellKnownKeys.h"
-#include "Common/TerrainTypes.h"
-#include "Common/Xfer.h"
-#include "GameClient/Drawable.h"
-#include "GameLogic/Object.h"
-#include "W3DDevice/GameClient/W3DScene.h"
-#include "W3DDevice/GameClient/W3DTerrainVisual.h"
-#include "W3DDevice/GameClient/WorldHeightMap.h"
-#include "W3DDevice/GameClient/W3DWater.h"
-#include "W3DDevice/GameClient/W3DDisplay.h"
-#include "W3DDevice/GameClient/W3DDebugIcons.h"
-#include "W3DDevice/GameClient/W3DTerrainTracks.h"
-#include "W3DDevice/GameClient/W3DShadow.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "WW3D2/light.h"
-#include "WW3D2/rendobj.h"
-#include "WW3D2/coltype.h"
-#include "WW3D2/coltest.h"
-#include "WW3D2/assetmgr.h"
-
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.		 
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DTerrainVisual::W3DTerrainVisual()
-{
-
-	m_terrainRenderObject = NULL;
-	m_terrainHeightMap = NULL;
-	m_waterRenderObject = NULL;
-	TheWaterRenderObj = NULL;
-
-}  // end W3DTerrainVisual
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DTerrainVisual::~W3DTerrainVisual()
-{
-	// release our render object
-	if (TheTerrainRenderObject == m_terrainRenderObject) {
-		TheTerrainRenderObject = NULL;
-	}
-
-	if (TheTerrainTracksRenderObjClassSystem)
-	{
-		delete TheTerrainTracksRenderObjClassSystem;
-		TheTerrainTracksRenderObjClassSystem=NULL;
-	}
-
-	if (TheW3DShadowManager)
-	{	
-		delete TheW3DShadowManager;
-		TheW3DShadowManager=NULL;
-	}
-
-	REF_PTR_RELEASE( m_waterRenderObject );
-	TheWaterRenderObj=NULL;
-	REF_PTR_RELEASE( m_terrainRenderObject );
-	REF_PTR_RELEASE( m_terrainHeightMap );
-}  // end ~W3DTerrainVisual
-
-//-------------------------------------------------------------------------------------------------
-/** init */
-//-------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::init( void )
-{
-
-	// extend
-	TerrainVisual::init();
-	// create a new render object for W3D
-	m_terrainRenderObject = NEW_REF( HeightMapRenderObjClass, () );
-	m_terrainRenderObject->Set_Collision_Type( PICK_TYPE_TERRAIN );
-	TheTerrainRenderObject = m_terrainRenderObject;
-
-	if (!TheGlobalData->m_headless)
-	{
-		// initialize track drawing system
-		TheTerrainTracksRenderObjClassSystem = NEW TerrainTracksRenderObjClassSystem;
-		TheTerrainTracksRenderObjClassSystem->init(W3DDisplay::m_3DScene);
-
-		// initialize object shadow drawing system
-		TheW3DShadowManager = NEW W3DShadowManager;
- 		TheW3DShadowManager->init();
-	
-		// create a water plane render object
-		TheWaterRenderObj=m_waterRenderObject = NEW_REF( WaterRenderObjClass, () );
-		m_waterRenderObject->init(TheGlobalData->m_waterPositionZ, TheGlobalData->m_waterExtentX, TheGlobalData->m_waterExtentY, W3DDisplay::m_3DScene, (WaterRenderObjClass::WaterType)TheGlobalData->m_waterType);	//create a water plane that's 128x128 units
-		m_waterRenderObject->Set_Position(Vector3(TheGlobalData->m_waterPositionX,TheGlobalData->m_waterPositionY,TheGlobalData->m_waterPositionZ));	//place water in world
-
-#ifdef DO_UNIT_TIMINGS
-#pragma MESSAGE("********************* WARNING- Doing UNIT TIMINGS. ")
-#else 
-		if (TheGlobalData->m_waterType == WaterRenderObjClass::WATER_TYPE_1_FB_REFLECTION)
-		{	// add water render object to the pre-pass scene (to be rendered before main scene)
- 			//W3DDisplay::m_prePass3DScene->Add_Render_Object( m_waterRenderObject);
-		}
-		else
-		{	// add water render object to the post-pass scene (to be rendered after main scene)
-			W3DDisplay::m_3DScene->Add_Render_Object( m_waterRenderObject);
-		}
-#endif
-		if (TheGlobalData->m_useCloudPlane)
-			m_waterRenderObject->toggleCloudLayer(true);
-		else
-			m_waterRenderObject->toggleCloudLayer(false);
-	}
-
-	// set the vertex animated water properties
-	Int waterSettingIndex = 0;  // use index 0 settings by default
-	TheTerrainVisual->setWaterGridHeightClamps( NULL, 
-																							TheGlobalData->m_vertexWaterHeightClampLow[ waterSettingIndex ], 
-																							TheGlobalData->m_vertexWaterHeightClampHi[ waterSettingIndex ] );
-	TheTerrainVisual->setWaterTransform( NULL, 
-																			 TheGlobalData->m_vertexWaterAngle[ waterSettingIndex ], 
-																			 TheGlobalData->m_vertexWaterXPosition[ waterSettingIndex ], 
-																			 TheGlobalData->m_vertexWaterYPosition[ waterSettingIndex ], 
-																			 TheGlobalData->m_vertexWaterZPosition[ waterSettingIndex ] );
-	TheTerrainVisual->setWaterGridResolution( NULL, 
-																						TheGlobalData->m_vertexWaterXGridCells[ waterSettingIndex ], 
-																						TheGlobalData->m_vertexWaterYGridCells[ waterSettingIndex ], 
-																						TheGlobalData->m_vertexWaterGridSize[ waterSettingIndex ] );
-	TheTerrainVisual->setWaterAttenuationFactors( NULL, 
-																								TheGlobalData->m_vertexWaterAttenuationA[ waterSettingIndex ], 
-																								TheGlobalData->m_vertexWaterAttenuationB[ waterSettingIndex ], 
-																								TheGlobalData->m_vertexWaterAttenuationC[ waterSettingIndex ], 
-																								TheGlobalData->m_vertexWaterAttenuationRange[ waterSettingIndex ] );	
-	m_isWaterGridRenderingEnabled = FALSE;
-
-}  // end init
-
-//-------------------------------------------------------------------------------------------------
-/** reset */
-//-------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::reset( void )
-{
-
-	// extend
-	TerrainVisual::reset();
-
-	m_terrainRenderObject->reset();
-
-	if (TheW3DShadowManager)
-		TheW3DShadowManager->Reset();
-
-	if (TheTerrainTracksRenderObjClassSystem)
-		TheTerrainTracksRenderObjClassSystem->Reset();
-
-	// reset water render object if present
-	if( m_waterRenderObject )
-	{
-		for (Int i=0; i<5; i++)
-		{
-			//check if this texture was ever changed from default
-			if (m_currentSkyboxTexNames[i] != m_initialSkyboxTexNames[i])
-			{
-				m_waterRenderObject->replaceSkyboxTexture(m_currentSkyboxTexNames[i], m_initialSkyboxTexNames[i]);
-				m_currentSkyboxTexNames[i]=m_initialSkyboxTexNames[i];	//update current state to new texture
-			}
-		}
-
-		m_waterRenderObject->reset();
-	}
-
-}  // end reset
-
-//-------------------------------------------------------------------------------------------------
-/** update */
-//-------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::update( void )
-{
-
-	// extend
-	TerrainVisual::update();
-
-	// if we have a water render object, it has an update method
-	if( m_waterRenderObject )
-		m_waterRenderObject->update();
-
-}  // end update
-
-//-------------------------------------------------------------------------------------------------
-/** load method for W3D visual terrain */
-//-------------------------------------------------------------------------------------------------
-Bool W3DTerrainVisual::load( AsciiString filename )
-{
-	
-#if 0	
-	// (gth) Testing exclusion list asset releasing
-	DynamicVectorClass<StringClass> exclusion_list(8000);
-	
-	WW3DAssetManager::Get_Instance()->Create_Asset_List(exclusion_list);
-
-	exclusion_list.Add(StringClass("avcomanche"));
-	exclusion_list.Add(StringClass("avcomanche_d"));
-	exclusion_list.Add(StringClass("ptdogwood08"));
-	exclusion_list.Add(StringClass("ptdogwood01_b"));
-	exclusion_list.Add(StringClass("ptpalm01"));
-	exclusion_list.Add(StringClass("ptpalm01_b"));
-	exclusion_list.Add(StringClass("avhummer"));
-	exclusion_list.Add(StringClass("avhummer_d"));
-	exclusion_list.Add(StringClass("avleopard"));
-	exclusion_list.Add(StringClass("avleopard_d"));
-
-	WW3DAssetManager::Get_Instance()->Free_Assets_With_Exclusion_List(exclusion_list);
-#endif
-
-	// enhancing functionality specific for W3D terrain
-	if( TerrainVisual::load( filename ) == FALSE )
-		return FALSE;  // failed
-
-	// open the terrain file
-	CachedFileInputStream fileStrm;
-	if( !fileStrm.open(filename) )
-	{
-
-		REF_PTR_RELEASE( m_terrainRenderObject );
-		return FALSE;
-
-	}  // end if
-
-	if( m_terrainRenderObject == NULL )
-		return FALSE;
-
-	REF_PTR_RELEASE( m_terrainHeightMap );
-	ChunkInputStream *pStrm = &fileStrm;
-	// allocate new height map data to read from file
-	m_terrainHeightMap = NEW WorldHeightMap(pStrm);
-
-	// Add any lights loaded by map.
-	MapObject *pMapObj = MapObject::getFirstMapObject();
-	while (pMapObj) 
-	{
-		Dict *d = pMapObj->getProperties();
-		if (pMapObj->isLight()) 
-		{ 
-			Coord3D loc = *pMapObj->getLocation();
-			if (loc.z < 0) {
-				Vector3 vec;
-				loc.z = m_terrainRenderObject->getHeightMapHeight(loc.x, loc.y, NULL);
-				loc.z += d->getReal(TheKey_lightHeightAboveTerrain);
-			}
-			// It is a light, and handled at the device level.  jba.
-			LightClass* lightP = NEW_REF(LightClass, (LightClass::POINT));
-
-			RGBColor c;
-			c.setFromInt(d->getInt(TheKey_lightAmbientColor));
-			lightP->Set_Ambient( Vector3( c.red, c.green, c.blue ) );
-
-			c.setFromInt(d->getInt(TheKey_lightDiffuseColor));
-			lightP->Set_Diffuse( Vector3(  c.red, c.green, c.blue) );
-
-			lightP->Set_Position(Vector3(loc.x, loc.y, loc.z));
-
-			lightP->Set_Far_Attenuation_Range(d->getReal(TheKey_lightInnerRadius), d->getReal(TheKey_lightOuterRadius));
- 			W3DDisplay::m_3DScene->Add_Render_Object(lightP);
-			REF_PTR_RELEASE( lightP );
-		}
-		pMapObj = pMapObj->getNext();
-	}
-
-
-	RefRenderObjListIterator *it = W3DDisplay::m_3DScene ? W3DDisplay::m_3DScene->createLightsIterator() : NULL;
-	// apply the heightmap to the terrain render object
-	m_terrainRenderObject->initHeightData( m_terrainHeightMap->getDrawWidth(), 
-																				 m_terrainHeightMap->getDrawHeight(),
-																				 m_terrainHeightMap,
-																				 it);
-	if (it) {
-	 W3DDisplay::m_3DScene->destroyLightsIterator(it);
-	 it = NULL;
-	}
-	// add our terrain render object to the scene
-	if (W3DDisplay::m_3DScene != NULL)
-		W3DDisplay::m_3DScene->Add_Render_Object( m_terrainRenderObject );
-
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	// Icon drawing utility object for pathfinding.
-	if (W3DDisplay::m_3DScene != NULL)
-	{
-		W3DDebugIcons *icons = NEW W3DDebugIcons;
-		W3DDisplay::m_3DScene->Add_Render_Object( icons );
-		icons->Release_Ref(); // belongs to scene.
-	}
-#endif
-
-#ifdef DO_UNIT_TIMINGS
-#pragma MESSAGE("********************* WARNING- Doing UNIT TIMINGS. ")
-#else 
-	if (m_waterRenderObject)
-	{
-		W3DDisplay::m_3DScene->Add_Render_Object( m_waterRenderObject);
-		m_waterRenderObject->enableWaterGrid(false);
-	}
-#endif
-
-	pMapObj = MapObject::getFirstMapObject();
-	while (pMapObj) 
-	{
-		Dict *d = pMapObj->getProperties();
-		if (pMapObj->isScorch()) {
-			const Coord3D *pos = pMapObj->getLocation();
-			Vector3 loc(pos->x, pos->y, pos->z);
-			Real radius = d->getReal(TheKey_objectRadius);
-			Scorches type = (Scorches)d->getInt(TheKey_scorchType);
-			m_terrainRenderObject->addScorch(loc, radius, type);
-		}
-		pMapObj = pMapObj->getNext();
-	}
-
-	// reset water render object if present
-	if( m_waterRenderObject )
-	{
-		m_waterRenderObject->load();
-	}
-
-	return TRUE;  // success
-
-}  // end load
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::enableWaterGrid( Bool enable )
-{
-
-	//Get default water type
-	m_isWaterGridRenderingEnabled = enable;
-
-	// make the changes in the water render object
-	if( m_waterRenderObject )
-		m_waterRenderObject->enableWaterGrid( enable );
-
-}  // end enableWaterGrid
-
-//-------------------------------------------------------------------------------------------------
-/** intersect the ray with the terrain, if a hit occurs TRUE is returned
-	* and the result point on the terrain is returned in "result" */
-//-------------------------------------------------------------------------------------------------
-Bool W3DTerrainVisual::intersectTerrain( Coord3D *rayStart, 
-																				 Coord3D *rayEnd, 
-																				 Coord3D *result )
-{
-	Bool hit = FALSE;
-
-	// sanity
-	if( rayStart == NULL || rayEnd == NULL )
-		return hit;
-
-	if( m_terrainRenderObject )
-	{
-		CastResultStruct res;
-		LineSegClass lineSeg( Vector3( rayStart->x, rayStart->y, rayStart->z ),
-													Vector3( rayEnd->x, rayEnd->y, rayEnd->z ) );
-		RayCollisionTestClass rayTest( lineSeg, &res );
-
-		hit = m_terrainRenderObject->Cast_Ray( rayTest );
-		if( hit && result )
-		{
-			Vector3 point = rayTest.Result->ContactPoint;
-
-			result->x = point.X;
-			result->y = point.Y;
-			result->z = point.Z;	
-
-		}  // end if
-		
-	}  // end if
-
-	// return hit result
-	return hit;
-
-}  // end intersectTerrain
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::getTerrainColorAt( Real x, Real y, RGBColor *pColor )
-{
-
-	if( m_terrainHeightMap )
-		m_terrainHeightMap->getTerrainColorAt( x, y, pColor );
-
-}  // end getTerrainColorAt
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainType *W3DTerrainVisual::getTerrainTile( Real x, Real y )
-{
-	TerrainType *tile = NULL;
-
-	if( m_terrainHeightMap )
-	{
-		AsciiString tileName = m_terrainHeightMap->getTerrainNameAt( x, y );
-
-		tile = TheTerrainTypes->findTerrain( tileName );
-
-	}  // end if
-
-	return tile;
-
-}  // end getTerrainTile
-
-// ------------------------------------------------------------------------------------------------
-/** set min/max height values allowed in water grid pointed to by waterTable */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setWaterGridHeightClamps( const WaterHandle *waterTable, 
-																								 Real minZ, Real maxZ )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->setGridHeightClamps( minZ, maxZ );
-
-}  // end setWaterGridHeightClamps
-
-// ------------------------------------------------------------------------------------------------
-/** adjust fallof parameters for grid change method */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setWaterAttenuationFactors( const WaterHandle *waterTable, 
-																									 Real a, Real b, Real c, Real range )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->setGridChangeAttenuationFactors( a, b, c, range );
-
-}  // end setWaterAttenuationFactors
-
-// ------------------------------------------------------------------------------------------------
-/** set the water table position and orientation in world space */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setWaterTransform( const WaterHandle *waterTable, 
-																					Real angle, Real x, Real y, Real z )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->setGridTransform( angle, x, y, z );
-
-}  // end setWaterTransform
-
-// ------------------------------------------------------------------------------------------------
-/** set water table transform by matrix */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setWaterTransform( const Matrix3D *transform )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->setGridTransform( transform );
-			
-}  // end setWaterTransform
-
-// ------------------------------------------------------------------------------------------------
-/** get the water transform matrix */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::getWaterTransform( const WaterHandle *waterTable, Matrix3D *transform )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->getGridTransform( transform );
-
-}  // end getWaterTransform
-
-// ------------------------------------------------------------------------------------------------
-/** water grid resolution spacing */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setWaterGridResolution( const WaterHandle *waterTable,
-																							 Real gridCellsX, Real gridCellsY, Real cellSize )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->setGridResolution( gridCellsX, gridCellsY, cellSize );
-
-}  // end setWaterGridResolution
-
-// ------------------------------------------------------------------------------------------------
-/** get water grid resolution spacing */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::getWaterGridResolution( const WaterHandle *waterTable,	
-																							 Real *gridCellsX, Real *gridCellsY, Real *cellSize )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->getGridResolution( gridCellsX, gridCellsY, cellSize );
-
-}  // end getWaterGridResolution
-
-// ------------------------------------------------------------------------------------------------
-/** adjust the water grid in world coords by the delta */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::changeWaterHeight( Real x, Real y, Real delta )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->changeGridHeight( x, y, delta );
-
-}  // end changeWaterHeight
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::addWaterVelocity( Real worldX, Real worldY, 
-																				 Real velocity, Real preferredHeight )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->addVelocity( worldX, worldY, velocity, preferredHeight );
-
-}  // end addWaterVelocity
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-Bool W3DTerrainVisual::getWaterGridHeight( Real worldX, Real worldY, Real *height)
-{
-	Real gridX, gridY;
-
-	if (m_isWaterGridRenderingEnabled && m_waterRenderObject &&
-		m_waterRenderObject->worldToGridSpace(worldX, worldY, gridX, gridY))
-	{	//point falls within grid, return correct height
-		m_waterRenderObject->getGridVertexHeight(REAL_TO_INT(gridX),REAL_TO_INT(gridY),height);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setRawMapHeight(const ICoord2D *gridPos, Int height)
-{
-	if (m_terrainHeightMap) {
-		Int x = gridPos->x+m_terrainHeightMap->getBorderSize();
-		Int y = gridPos->y+m_terrainHeightMap->getBorderSize();
- 		//if (m_terrainHeightMap->getHeight(x,y) != height) //ML changed to prevent scissoring with roads
- 		if (m_terrainHeightMap->getHeight(x,y) > height) 
-		{
-			m_terrainHeightMap->setRawHeight(x, y, height);
-			m_terrainRenderObject->staticLightingChanged();
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::addFactionBibDrawable(Drawable *factionBuilding, Bool highlight, Real extra)
-{
-	if (m_terrainHeightMap) {
-		const Matrix3D * mtx = factionBuilding->getTransformMatrix();
-		Vector3 corners[4];
-		Coord3D pos;
-		pos.set(0,0,0);
-		Real exitWidth = factionBuilding->getTemplate()->getFactoryExitWidth();
-		Real extraWidth = factionBuilding->getTemplate()->getFactoryExtraBibWidth() + extra;
-		const GeometryInfo info = factionBuilding->getTemplate()->getTemplateGeometryInfo();
-		Real sizeX = info.getMajorRadius();
-		Real sizeY = info.getMinorRadius();
-		if (info.getGeomType() != GEOMETRY_BOX) {
-			sizeY = sizeX;
-		}
-		corners[0].Set(pos.x, pos.y, pos.z);
-		corners[0].X -= sizeX+extraWidth;
-		corners[0].Y -= sizeY+extraWidth;
-		corners[1].Set(pos.x, pos.y, pos.z);
-		corners[1].X += sizeX+exitWidth+extraWidth;
-		corners[1].Y -= sizeY+extraWidth;
-		corners[2].Set(pos.x, pos.y, pos.z);
-		corners[2].X += sizeX+exitWidth+extraWidth;
-		corners[2].Y += sizeY+extraWidth;
-		corners[3].Set(pos.x, pos.y, pos.z);
-		corners[3].X -= sizeX+extraWidth;
-		corners[3].Y += sizeY+extraWidth;
-		mtx->Transform_Vector(*mtx, corners[0], &corners[0]);
-		mtx->Transform_Vector(*mtx, corners[1], &corners[1]);
-		mtx->Transform_Vector(*mtx, corners[2], &corners[2]);
-		mtx->Transform_Vector(*mtx, corners[3], &corners[3]);
-		m_terrainRenderObject->addTerrainBibDrawable(corners, factionBuilding->getID(), highlight);
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::addFactionBib(Object *factionBuilding, Bool highlight, Real extra)
-{
-	if (m_terrainHeightMap) {
-		const Matrix3D * mtx = factionBuilding->getTransformMatrix();
-		Vector3 corners[4];
-		Coord3D pos;
-		pos.set(0,0,0);
-		Real exitWidth = factionBuilding->getTemplate()->getFactoryExitWidth();
-		Real extraWidth = factionBuilding->getTemplate()->getFactoryExtraBibWidth() + extra;
-		const GeometryInfo info = factionBuilding->getGeometryInfo();
-		Real sizeX = info.getMajorRadius();
-		Real sizeY = info.getMinorRadius();
-		if (info.getGeomType() != GEOMETRY_BOX) {
-			sizeY = sizeX;
-		}
-		corners[0].Set(pos.x, pos.y, pos.z);
-		corners[0].X -= sizeX+extraWidth;
-		corners[0].Y -= sizeY+extraWidth;
-		corners[1].Set(pos.x, pos.y, pos.z);
-		corners[1].X += sizeX+exitWidth+extraWidth;
-		corners[1].Y -= sizeY+extraWidth;
-		corners[2].Set(pos.x, pos.y, pos.z);
-		corners[2].X += sizeX+exitWidth+extraWidth;
-		corners[2].Y += sizeY+extraWidth;
-		corners[3].Set(pos.x, pos.y, pos.z);
-		corners[3].X -= sizeX+extraWidth;
-		corners[3].Y += sizeY+extraWidth;
-		mtx->Transform_Vector(*mtx, corners[0], &corners[0]);
-		mtx->Transform_Vector(*mtx, corners[1], &corners[1]);
-		mtx->Transform_Vector(*mtx, corners[2], &corners[2]);
-		mtx->Transform_Vector(*mtx, corners[3], &corners[3]);
-		m_terrainRenderObject->addTerrainBib(corners, factionBuilding->getID(), highlight);
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::removeFactionBibDrawable(Drawable *factionBuilding)
-{
-	if (m_terrainHeightMap) {
-		m_terrainRenderObject->removeTerrainBibDrawable(factionBuilding->getID());
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::removeFactionBib(Object *factionBuilding)
-{
-	if (m_terrainHeightMap) {
-		m_terrainRenderObject->removeTerrainBib(factionBuilding->getID());
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::removeAllBibs(void)
-{
-	if (m_terrainHeightMap) {
-		m_terrainRenderObject->removeAllTerrainBibs();
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::removeBibHighlighting(void)
-{
-	if (m_terrainHeightMap) {
-		m_terrainRenderObject->removeTerrainBibHighlighting();
-	}
-}
- 
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setTerrainTracksDetail(void)
-{
-	if (TheTerrainTracksRenderObjClassSystem)
-		TheTerrainTracksRenderObjClassSystem->setDetail();
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setShoreLineDetail(void)
-{
-	if (m_terrainRenderObject) 
-		m_terrainRenderObject->setShoreLineDetail();
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-/// Replace the skybox texture
-void W3DTerrainVisual::replaceSkyboxTextures(const AsciiString *oldTexName[5], const AsciiString *newTexName[5])
-{
-	if (m_waterRenderObject)
-	{
-		for (Int i=0; i<5; i++)
-		{
-			//check if this texture was never changed before and is still using the default art.
-			if (m_initialSkyboxTexNames[i].isEmpty())
-			{	m_initialSkyboxTexNames[i]=*oldTexName[i];
-				m_currentSkyboxTexNames[i]=*oldTexName[i];
-			}
-
-			if (m_currentSkyboxTexNames[i] != *newTexName[i])
-			{	m_waterRenderObject->replaceSkyboxTexture(m_currentSkyboxTexNames[i], *newTexName[i]);
-				m_currentSkyboxTexNames[i]=*newTexName[i];	//update current state to new texture
-			}
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::crc( Xfer *xfer )
-{
-
-	// extend base class
-	TerrainVisual::crc( xfer );
-
-}  // end CRC
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer
-	* Version Info:
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 2;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// extend base class
-	TerrainVisual::xfer( xfer );
-
-	// flag for whether or not the water grid is enabled
-	Bool gridEnabled = m_isWaterGridRenderingEnabled;
-	xfer->xferBool( &gridEnabled );
-	if( gridEnabled != m_isWaterGridRenderingEnabled )
-	{
-
-		DEBUG_CRASH(( "W3DTerrainVisual::xfer - m_isWaterGridRenderingEnabled mismatch\n" ));
-		throw SC_INVALID_DATA;
-
-	}  // end if
-
-	// xfer grid data if enabled
-	if( gridEnabled )
-		xfer->xferSnapshot( m_waterRenderObject );
-
-/*
-	{
-
-		// grid width and height
-		Int width = getGridWidth();
-		Int height = getGridheight();
-		xfer->xferInt( &width );
-		xfer->xferInt( &height );
-		if( width != getGridWidth() )
-		{
-
-			DEBUG_CRASH(( "W3DTerainVisual::xfer - grid width mismatch '%d' should be '%d'\n",
-										width, getGridWidth() ));
-			throw SC_INVALID_DATA;
-
-		}  // end if
-		if( height != getGridHeight() )
-		{
-
-			DEBUG_CRASH(( "W3DTerainVisual::xfer - grid height mismatch '%d' should be '%d'\n",
-										height, getGridHeight() ));
-			throw SC_INVALID_DATA;
-
-		}  // end if
-
-		// write data for each grid
-
-	}  // end if
-*/
-
-	// Write out the terrain height data.
-	if (version >= 2) {
-		UnsignedByte *data = m_terrainHeightMap->getDataPtr();
-		Int len = m_terrainHeightMap->getXExtent()*m_terrainHeightMap->getYExtent();
-		Int xferLen = len;
-		xfer->xferInt(&xferLen);
-		if (len!=xferLen) {
-			DEBUG_CRASH(("Bad height map length."));
-			if (len>xferLen) {
-				len = xferLen;
-			}
-		}
-		xfer->xferUser(data, len);	
-		if (xfer->getXferMode() == XFER_LOAD)	{	
-			// Update the display height map.
-			m_terrainRenderObject->staticLightingChanged();
-		}
-	}
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::loadPostProcess( void )
-{
-
-	// extend base class
-	TerrainVisual::loadPostProcess();
-
-}  // end loadPostProcess
-
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
deleted file mode 100644
index 01ac84bb1dc..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
+++ /dev/null
@@ -1,694 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DTreeBuffer.cpp ////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: W3DTreeBuffer.cpp
-//
-// Created:   John Ahlquist, May 2001
-//
-// Desc:      Draw buffer to handle all the trees in a scene.
-//
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-//         Includes                                                      
-//-----------------------------------------------------------------------------
-#include "W3DDevice/GameClient/W3DTreeBuffer.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <assetmgr.h>
-#include <texture.h>
-#include "Common/GlobalData.h"
-#include "GameClient/ClientRandomValue.h"
-#include "W3DDevice/GameClient/TerrainTex.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/W3DDynamicLight.h"
-#include "WW3D2/camera.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8renderer.h"
-#include "WW3D2/mesh.h"
-#include "WW3D2/meshmdl.h"
-
-//-----------------------------------------------------------------------------
-//         Private Data                                                     
-//-----------------------------------------------------------------------------
-// A W3D shader that does alpha, texturing, tests zbuffer, doesn't update zbuffer.
-#define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
-	ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-static ShaderClass detailAlphaShader(SC_ALPHA_DETAIL);
-
-
-/*
-#define SC_ALPHA_MIRROR ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
-	ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-static ShaderClass mirrorAlphaShader(SC_ALPHA_DETAIL);
-
-// ShaderClass::PASS_ALWAYS, 
-
-#define SC_ALPHA_2D ( SHADE_CNST(PASS_ALWAYS, DEPTH_WRITE_DISABLE, COLOR_WRITE_ENABLE, \
-	SRCBLEND_SRC_ALPHA, DSTBLEND_ONE_MINUS_SRC_ALPHA, FOG_DISABLE, GRADIENT_DISABLE, \
-	SECONDARY_GRADIENT_DISABLE, TEXTURING_ENABLE, DETAILCOLOR_DISABLE, DETAILALPHA_DISABLE, \
-	ALPHATEST_DISABLE, CULL_MODE_ENABLE, DETAILCOLOR_DISABLE, DETAILALPHA_DISABLE) )
-ShaderClass ShaderClass::_PresetAlpha2DShader(SC_ALPHA_2D);
-*/
-//-----------------------------------------------------------------------------
-//         Private Functions                                               
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// W3DTreeBuffer::cull
-//=============================================================================
-/** Culls the trees, marking the visible flag.  If a tree becomes visible, it sets
-it's sortKey */
-//=============================================================================
-void W3DTreeBuffer::cull(CameraClass * camera)
-{
-	Int curTree;
-
-	m_anythingChanged = false;
-	// Calulate the vector direction that the camera is looking at.
-	Matrix3D camera_matrix = camera->Get_Transform();
-	float zmod = -1;
-	float x = zmod * camera_matrix[0][2] ;
-	float y = zmod * camera_matrix[1][2] ;
-	float z = zmod * camera_matrix[2][2] ;
-	m_cameraLookAtVector.Set(x,y,z);
-
-	for (curTree=0; curTree<m_numTrees; curTree++) {
-		Bool doKey = false;	// We calculate the key when a tree becomes visible.
-		Bool visible = !camera->Cull_Sphere(m_trees[curTree].bounds);
-		if (visible!=m_trees[curTree].visible) {
-			m_trees[curTree].visible=visible;
-			m_anythingChanged = true;
-			if (visible) {
-				doKey = true;
-			}
-		}
-		// Also calculate sort key if a tree is visible, and the view changed setting m_updateAllKeys to true.
-		if (doKey || (visible&&m_updateAllKeys)) {
-			// The sort key is essentially the distance of location in the direction of the 
-			// camera look at.
-			m_trees[curTree].sortKey = Vector3::Dot_Product(m_trees[curTree].location, m_cameraLookAtVector); 
-		}
-	}
-	m_updateAllKeys = false;
-}
-
-//=============================================================================
-// W3DTreeBuffer::cullMirror
-//=============================================================================
-/** Culls the trees, marking the visible flag for the mirror view. Unlike cull(),
-doesn't update anything except the visible flag. */
-//=============================================================================
-void W3DTreeBuffer::cullMirror(CameraClass * camera)
-{
-	Int curTree;
-	m_anythingChanged = false;
-	for (curTree=0; curTree<m_numTrees; curTree++) {
-		if (!m_trees[curTree].mirrorVisible) {
-			if (m_trees[curTree].visible) {
-				m_anythingChanged = true;
-			}
-			m_trees[curTree].visible = false;
-			continue;
-		}
-		Bool visible = !camera->Cull_Sphere(m_trees[curTree].bounds);
-		m_trees[curTree].visible=visible;
-	}
-}
-
-//=============================================================================
-// W3DTreeBuffer::sort
-//=============================================================================
-/** Sorts the trees.  Does num_iterations of a bubble sort.  This is good because
-it ends immediately if the trees are already sorted (which is most of the time)
-and will perform a fixed amount of work each frame until it becomes sorted. */
-//=============================================================================
-void W3DTreeBuffer::sort(Int numIterations)
-{
-	// sort in descending order.
-	Int iter;
-	Bool swap = false;
-	for (iter = 0; iter<numIterations; iter++) {
-		Int cur = 0;
-		// Note - only sorts the visible trees.
-		while (cur<m_numTrees-iter && !m_trees[cur].visible) {
-			cur++;
-		}
-		Int i;
-		for (i=cur+1; i<m_numTrees-iter; i++) {
-			if (m_trees[i].visible) {
-				if (m_trees[cur].sortKey > m_trees[i].sortKey) {
-					TTree tmp = m_trees[cur];
-					m_trees[cur] = m_trees[i];
-					m_trees[i] = tmp;
-					swap = true;
-				}
-				cur = i;
-			}
-		}
-		if (!swap) {
-			return;
-		}
-		m_anythingChanged = true;
-	}
-}
-
-//=============================================================================
-// W3DTreeBuffer::doLighting
-//=============================================================================
-/** Calculates the diffuse lighting as affected by dynamic lighting. */
-//=============================================================================
-Int W3DTreeBuffer::doLighting(Vector3 *loc, Real r, Real g, Real b, SphereClass &bounds, RefRenderObjListIterator *pDynamicLightsIterator)
-{
-	if (pDynamicLightsIterator == NULL) {
-		return(REAL_TO_INT(b) | (REAL_TO_INT(g) << 8) | (REAL_TO_INT(r) << 16) | (255 << 24));
-	}
-	Real shadeR, shadeG, shadeB;
-	shadeR = r;
-	shadeG = g;
-	shadeB = b;
-	Bool didLight = false;
-	for (pDynamicLightsIterator->First(); !pDynamicLightsIterator->Is_Done(); pDynamicLightsIterator->Next())
-	{		
-		W3DDynamicLight *pLight = (W3DDynamicLight*)pDynamicLightsIterator->Peek_Obj();
-		if (!pLight->isEnabled()) {
-			continue; // he is turned off.
-		}
-		if (CollisionMath::Overlap_Test(bounds, pLight->Get_Bounding_Sphere()) == CollisionMath::OUTSIDE) {
-			continue; // this tree is outside of the light's influence.
-		}
-		Vector3 lightDirection = *loc;
-		Real factor;
-		switch(pLight->Get_Type()) {
-		case LightClass::POINT:
-		case LightClass::SPOT: {
-				Vector3 lightLoc = pLight->Get_Position();
-				lightDirection -= lightLoc;
-				double range, midRange;
-				pLight->Get_Far_Attenuation_Range(midRange, range);
-				Real dist = lightDirection.Length();
-				if (dist >= range) continue;
-				if (midRange < 0.1) continue;
-				factor = 1.0f - (dist - midRange) / (range - midRange);
-				factor = WWMath::Clamp(factor,0.0f,1.0f);
-			} 
-			break;
-		case LightClass::DIRECTIONAL:
-			pLight->Get_Spot_Direction(lightDirection);
-			factor = 1.0;
-			break;
-		};
-		Real shade = 0.5f * factor; // Assume adjustment for diffuse.
-		Vector3 vDiffuse;
-		pLight->Get_Diffuse(&vDiffuse);
-		Vector3 ambient;
-		pLight->Get_Ambient(&ambient);
-		if (shade > 1.0) shade = 1.0;
-		if(shade < 0.0f) shade = 0.0f;
-		shadeR += shade*vDiffuse.X;
-		shadeG += shade*vDiffuse.Y;
-		shadeB += shade*vDiffuse.Z;		
-		shadeR += factor*ambient.X;
-		shadeG += factor*ambient.Y;
-		shadeB += factor*ambient.Z;		
-		didLight = true;
-	} 
-	if (!didLight) {
-		return(REAL_TO_INT(b) | (REAL_TO_INT(g) << 8) | (REAL_TO_INT(r) << 16) | (255 << 24));
-	}
-	if (shadeR > 1.0) shadeR = 1.0;
-	if(shadeR < 0.0f) shadeR = 0.0f;
-	if (shadeG > 1.0) shadeG = 1.0;
-	if(shadeG < 0.0f) shadeG = 0.0f;
-	if (shadeB > 1.0) shadeB = 1.0;
-	if(shadeB < 0.0f) shadeB = 0.0f;
-	shadeR*=255.0f;
-	shadeG*=255.0f;
-	shadeB*=255.0f;
-	return(REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16) | (255 << 24));
-}
-
-//=============================================================================
-// W3DTreeBuffer::loadTreesInVertexAndIndexBuffers
-//=============================================================================
-/** Loads the trees into the vertex buffer for drawing. */
-//=============================================================================
-void W3DTreeBuffer::loadTreesInVertexAndIndexBuffers(RefRenderObjListIterator *pDynamicLightsIterator)
-{
-	if (!m_indexTree || !m_vertexTree || !m_initialized) {
-		return;
-	}
-	if (!m_anythingChanged) {
-		//return;
-	}
-	m_curNumTreeVertices = 0;
-	m_curNumTreeIndices = 0;
-	VertexFormatXYZDUV1 *vb;
-	UnsignedShort *ib;
-	// Lock the buffers.
-	DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexTree);
-	DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexTree);
-	vb=(VertexFormatXYZDUV1*)lockVtxBuffer.Get_Vertex_Array();
-	ib = lockIdxBuffer.Get_Index_Array();
-	// Add to the index buffer & vertex buffer.
-	Vector2 lookAtVector(m_cameraLookAtVector.X, m_cameraLookAtVector.Y);
-	lookAtVector.Normalize();
-	// We draw from back to front, so we put the indexes in the buffer 
-	// from back to front.
-	UnsignedShort *curIb = ib+MAX_TREE_INDEX;
-
-	VertexFormatXYZDUV1 *curVb = vb;
-
-	Int curTree;
-
-	// Calculate a static lighting value to use for all the trees.
-	Real shadeR, shadeG, shadeB;
-	shadeR = TheGlobalData->m_terrainAmbient[0].red;
-	shadeG = TheGlobalData->m_terrainAmbient[0].green;
-	shadeB = TheGlobalData->m_terrainAmbient[0].blue;
-	shadeR += TheGlobalData->m_terrainDiffuse[0].red;
-	shadeG += TheGlobalData->m_terrainDiffuse[0].green;
-	shadeB += TheGlobalData->m_terrainDiffuse[0].blue;
-	if (shadeR>1.0f) shadeR=1.0f;
-	if (shadeG>1.0f) shadeG=1.0f;
-	if (shadeB>1.0f) shadeB=1.0f;
-	shadeR*=255.0f;
-	shadeG*=255.0f;
-	shadeB*=255.0f;
-
-	for (curTree=0; curTree<m_numTrees; curTree++) {
-
-		if (!m_trees[curTree].visible) continue;
-		Real scale = m_trees[curTree].scale;
-		Vector3 loc = m_trees[curTree].location;
-		Int type = m_trees[curTree].treeType;
-		Real theSin = m_trees[curTree].sin;
-		Real theCos = m_trees[curTree].cos;
-		if (type<0 || m_typeMesh[type] == 0) {
-			type = 0;
-		}
-		Bool doVertexLighting = false;
-
-#if 0 // no dynamic lighting.
-		for (pDynamicLightsIterator->First(); !pDynamicLightsIterator->Is_Done(); pDynamicLightsIterator->Next())
-		{		
-			W3DDynamicLight *pLight = (W3DDynamicLight*)pDynamicLightsIterator->Peek_Obj();
-			if (!pLight->isEnabled()) {
-				continue; // he is turned off.
-			}
-			if (CollisionMath::Overlap_Test(m_trees[curTree].bounds, pLight->Get_Bounding_Sphere()) == CollisionMath::OUTSIDE) {
-				continue; // this tree is outside of the light's influence.
-			}
-			doVertexLighting = true;
-		}
-#endif
-
-		Int diffuse = 0;
-		if (!doVertexLighting) {
-			diffuse = doLighting(&loc, shadeR, shadeG, shadeB, m_trees[curTree].bounds, NULL);
-		}
-
-		Real typeOffset = type*0.5;
-		Int startVertex = m_curNumTreeVertices;
-		Int i, j;
-		Int numVertex = m_typeMesh[type]->Peek_Model()->Get_Vertex_Count();
-		Vector3 *pVert = m_typeMesh[type]->Peek_Model()->Get_Vertex_Array();
-		// If we happen to have too many trees, stop.
-		if (m_curNumTreeVertices+numVertex+2>= MAX_TREE_VERTEX) {
-			break;
-		}
-		Int numIndex = m_typeMesh[type]->Get_Model()->Get_Polygon_Count();
-		const Vector3i *pPoly = m_typeMesh[type]->Get_Model()->Get_Polygon_Array();
-		if (m_curNumTreeIndices+3*numIndex+6 >= MAX_TREE_INDEX) {
-			break;
-		}
-
-		const Vector2*uvs=m_typeMesh[type]->Get_Model()->Get_UV_Array_By_Index(0);
-
-		// If we are doing reduced resolution terrain, do reduced
-		// poly trees.
-		Bool doPanel = (TheGlobalData->m_useHalfHeightMap || TheGlobalData->m_stretchTerrain);
-
-		if (doPanel) {
-			if (m_trees[curTree].rotates) {
-				theSin = -lookAtVector.X;
-				theCos = lookAtVector.Y;
-			}
-			// panel start is index offset, there are 3 index per triangle.
-			if (m_trees[curTree].panelStart/3 + 2 > numIndex) {
-				continue; // not enought polygons for the offset.  jba.
-			}
-			for (j=0; j<6; j++) {
-				i = ((Int *)pPoly)[j+m_trees[curTree].panelStart];
-				if (m_curNumTreeVertices >= MAX_TREE_VERTEX) 
-					break;
-
-				// Update the uv values.  The W3D models each have their own texture, and 
-				// we use one texture with all images in one, so we have to change the uvs to 
-				// match.
-				Real U, V;
-				if (type==SHRUB) {
-					// shrub texture is tucked in the corner
-					U = ((512-64)+uvs[i].U*64.0f)/512.0f;
-					V = ((256-64)+uvs[i].V*64.0f)/256.0f;
-				} else if (type==FENCE) {
-					U = uvs[i].U*0.5f; 
-					V = 1.0f + uvs[i].V;		
-				} else {
-					U = typeOffset+uvs[i].U*0.5f; 
-					V = uvs[i].V;		
-				}
-				curVb->u1 = U;
-				curVb->v1 = V/2.0;
-				Vector3 vLoc;
-				vLoc.X = pVert[i].X*scale*theCos - pVert[i].Z*scale*theSin;
-				vLoc.Y = pVert[i].Z*scale*theCos + pVert[i].X*scale*theSin;
-
-				vLoc.X += loc.X;
-				vLoc.Y += loc.Y;
-				vLoc.Z = loc.Z + pVert[i].Y*scale; // In W3D z is up, in 3dMax y is up.
-
-				curVb->x = vLoc.X;
-				curVb->y = vLoc.Y;
-				curVb->z = vLoc.Z;	 
-				if (doVertexLighting) {
-					curVb->diffuse = doLighting(&vLoc, shadeR, shadeG, shadeB, m_trees[curTree].bounds, pDynamicLightsIterator);
-				} else {
-					curVb->diffuse = diffuse;
-				}
-				curVb++;
-				m_curNumTreeVertices++;
-			}
-
-			for (i=0; i<6; i++) {
-				if (m_curNumTreeIndices+4 > MAX_TREE_INDEX) 
-					break;
-				curIb--;
-				*curIb = startVertex + i;
-				m_curNumTreeIndices++;
-			}
-		} else {
-			for (i=0; i<numVertex; i++) {
-				if (m_curNumTreeVertices >= MAX_TREE_VERTEX) 
-					break;
-
-				// Update the uv values.  The W3D models each have their own texture, and 
-				// we use one texture with all images in one, so we have to change the uvs to 
-				// match.
-				Real U, V;
-				if (type==SHRUB) {
-					// shrub texture is tucked in the corner
-					U = ((512-64)+uvs[i].U*64.0f)/512.0f;
-					V = ((256-64)+uvs[i].V*64.0f)/256.0f;
-				} else if (type==FENCE) {
-					U = uvs[i].U*0.5f; 
-					V = 1.0f + uvs[i].V;		
-				} else {
-					U = typeOffset+uvs[i].U*0.5f; 
-					V = uvs[i].V;		
-				}
-				curVb->u1 = U;
-				curVb->v1 = V/2.0;
-				Vector3 vLoc;
-				vLoc.X = pVert[i].X*scale*theCos - pVert[i].Z*scale*theSin;
-				vLoc.Y = pVert[i].Z*scale*theCos + pVert[i].X*scale*theSin;
-
-				vLoc.X += loc.X;
-				vLoc.Y += loc.Y;
-				vLoc.Z = loc.Z + pVert[i].Y*scale; // In W3D z is up, in 3dMax y is up.
-
-				curVb->x = vLoc.X;
-				curVb->y = vLoc.Y;
-				curVb->z = vLoc.Z;	 
-				if (doVertexLighting) {
-					curVb->diffuse = doLighting(&vLoc, shadeR, shadeG, shadeB, m_trees[curTree].bounds, pDynamicLightsIterator);
-				} else {
-					curVb->diffuse = diffuse;
-				}
-				curVb++;
-				m_curNumTreeVertices++;
-			}
-
-			for (i=0; i<numIndex; i++) {
-				if (m_curNumTreeIndices+4 > MAX_TREE_INDEX) 
-					break;
-				curIb-=3;
-				*curIb++ = startVertex + pPoly[i].I;
-				*curIb++ = startVertex + pPoly[i].J;
-				*curIb++ = startVertex + pPoly[i].K;
- 				curIb-=3;
-				m_curNumTreeIndices+=3;
-			}
-		}		
-	}
-	m_curTreeIndexOffset = curIb - ib;	
-}
-
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// W3DTreeBuffer::~W3DTreeBuffer
-//=============================================================================
-/** Destructor. Releases w3d assets. */
-//=============================================================================
-W3DTreeBuffer::~W3DTreeBuffer(void)
-{
-	freeTreeBuffers();
-	REF_PTR_RELEASE(m_treeTexture);
-	Int i;
-	for (i=0; i<MAX_TYPES; i++) {
-		REF_PTR_RELEASE(m_typeMesh[i]);
-	}
-}
-
-//=============================================================================
-// W3DTreeBuffer::W3DTreeBuffer
-//=============================================================================
-/** Constructor. Sets m_initialized to true if it finds the w3d models it needs
-for the trees. */
-//=============================================================================
-W3DTreeBuffer::W3DTreeBuffer(void)
-{
-	m_initialized = false;
-	///@toto - reactivate this optimization if useful.  jba.
-	return;
-	m_vertexTree = NULL;
-	m_indexTree = NULL;
-	m_treeTexture = NULL;
-	m_curNumTreeVertices=0;
-	m_curNumTreeIndices=0;
-	clearAllTrees();
-	allocateTreeBuffers();
-	Int i;
-	for (i=0; i<MAX_TYPES; i++) {
-		m_typeMesh[i] = 0;
-	}
-	if (WW3DAssetManager::Get_Instance()==NULL)
-		return;  // WorldBuilderTool doesn't initialize the asset manager.  jba.
-
-	m_treeTexture = NEW_REF(TextureClass, ("trees.tga"));
-	m_treeTexture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-	m_treeTexture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-	for (i=0; i<MAX_TYPES; i++) {
-		switch(i) {
-		case 0:
-			m_typeMesh[i] = (MeshClass*)WW3DAssetManager::Get_Instance()->Create_Render_Obj("ALPINETREE.TREE 1" );
-			break;
-		case 1:
-			m_typeMesh[i] = (MeshClass*)WW3DAssetManager::Get_Instance()->Create_Render_Obj("DECIDUOUS.TREE 1" );
-			break;
-		case 2:
-			m_typeMesh[i] = (MeshClass*)WW3DAssetManager::Get_Instance()->Create_Render_Obj("SHRUB.TREE 1" );
-			break;
-		case 3:
-			m_typeMesh[i] = (MeshClass*)WW3DAssetManager::Get_Instance()->Create_Render_Obj("FENCE.PLANE09" );
-			break;
-		}
-		if (m_typeMesh[i] == NULL) continue;
-		Int numVertex = m_typeMesh[i]->Peek_Model()->Get_Vertex_Count();
-		Vector3 *pVert = m_typeMesh[i]->Peek_Model()->Get_Vertex_Array();
-
-		const Matrix3D xfm = m_typeMesh[i]->Get_Transform();
-		SphereClass bounds(pVert, numVertex);
-		// Model is in y up format, so swap y and z.
-		Real tmp;
-		tmp = bounds.Center.Y;
-		bounds.Center.Y = bounds.Center.Z;
-		bounds.Center.Z = tmp;
-		m_typeBounds[i] = bounds;
-	}
-	if (m_typeMesh[0] == NULL) {
-
-		//DEBUG_LOG("!!!!!!!!!!!!*************** W3DTreeBuffer failed to initialize.\n");
-		return;  // didn't initialize.
-	}
-	m_initialized = true;
-}
-
-
-//=============================================================================
-// W3DTreeBuffer::freeTreeBuffers
-//=============================================================================
-/** Frees the index and vertex buffers. */
-//=============================================================================
-void W3DTreeBuffer::freeTreeBuffers(void)
-{
-	REF_PTR_RELEASE(m_vertexTree);
-	REF_PTR_RELEASE(m_indexTree);
-}
-
-//=============================================================================
-// W3DTreeBuffer::allocateTreeBuffers
-//=============================================================================
-/** Allocates the index and vertex buffers. */
-//=============================================================================
-void W3DTreeBuffer::allocateTreeBuffers(void)
-{
-	m_vertexTree=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZDUV1,MAX_TREE_VERTEX+4,DX8VertexBufferClass::USAGE_DYNAMIC));
-	m_indexTree=NEW_REF(DX8IndexBufferClass,(2*MAX_TREE_INDEX+4, DX8IndexBufferClass::USAGE_DYNAMIC));
-	m_curNumTreeVertices=0;
-	m_curNumTreeIndices=0;
-}
-
-//=============================================================================
-// W3DTreeBuffer::clearAllTrees
-//=============================================================================
-/** Removes all trees. */
-//=============================================================================
-void W3DTreeBuffer::clearAllTrees(void)
-{
-	m_numTrees=0;
-}
-
-//=============================================================================
-// W3DTreeBuffer::addTree
-//=============================================================================
-/** Adds a tree.  Name is the W3D model name, supported models are
-ALPINE, DECIDUOUS and SHRUB. */
-//=============================================================================
-void W3DTreeBuffer::addTree(Coord3D loc, Real scale, Real angle, AsciiString name, Bool mirrorVisible)
-{
-	if (m_numTrees >= MAX_TREES) {
-		return;  
-	}
-
-	if (!m_initialized) {
-		return;  
-	}
-
-	TTreeType treeType = ALPINE_TREE;
-	if (!name.compare("DECIDUOUS")) {
-		treeType = DECIDUOUS_TREE;
-	}	else if (!name.compare("SHRUB")) {
-		treeType = SHRUB;
-	}	else if (!name.compare("FENCE")) {
-		treeType = FENCE;
-	}
-	m_trees[m_numTrees].panelStart = 0;
-	Real randomScale = GameClientRandomValueReal( 0.7f, 1.3f );
-	if (treeType == FENCE) {
-		// Fences don't randomly scale & orient
-		m_trees[m_numTrees].sin = WWMath::Sin(angle);
-		m_trees[m_numTrees].scale = scale;
-		m_trees[m_numTrees].cos = WWMath::Cos(angle);
-		m_trees[m_numTrees].rotates = false;
-		m_trees[m_numTrees].panelStart = 48;
-	} else {
-		// Randomizes the scale and orientation of trees.
-		m_trees[m_numTrees].sin = GameClientRandomValueReal( -1.0f, 1.0f );
-		m_trees[m_numTrees].scale = scale*randomScale;
-		m_trees[m_numTrees].cos = WWMath::Sqrt(1.0 - m_trees[m_numTrees].sin*m_trees[m_numTrees].sin);
-		m_trees[m_numTrees].rotates = true;
-	}
-	m_trees[m_numTrees].location = Vector3(loc.x, loc.y, loc.z);
-	m_trees[m_numTrees].treeType = treeType;
-	// Translate the bounding sphere of the model.
-	m_trees[m_numTrees].bounds = m_typeBounds[treeType];
-	m_trees[m_numTrees].bounds.Center *= scale;
-	m_trees[m_numTrees].bounds.Radius *= scale;
-	m_trees[m_numTrees].bounds.Center += m_trees[m_numTrees].location;
-	// Initially set it invisible.  cull will update it's visiblity flag.
-	m_trees[m_numTrees].visible = false;
-	m_trees[m_numTrees].mirrorVisible = mirrorVisible;
-	m_numTrees++;
-}
-
-
-//=============================================================================
-// W3DTreeBuffer::drawTrees
-//=============================================================================
-/** Draws the trees.  Uses camera to cull. */
-//=============================================================================
-void W3DTreeBuffer::drawTrees(CameraClass * camera, RefRenderObjListIterator *pDynamicLightsIterator)
-{
-	if (!m_isTerrainPass) {
-		return;
-	}
-	m_isTerrainPass = false;
-
-	if (ShaderClass::Is_Backface_Culling_Inverted()) { 
-		// Mirror inverts backface culling.
-		cullMirror(camera);
-	} else  { 
-		// Normal draw.
-		cull(camera);
-		// Only sort once per frame.
-		sort(SORT_ITERATIONS_PER_FRAME);
-	}	
-	loadTreesInVertexAndIndexBuffers(pDynamicLightsIterator);
-
-	if (m_curNumTreeIndices == 0) {
-		return;
-	}
-	// Setup the vertex buffer, shader & texture.
-	DX8Wrapper::Set_Index_Buffer(m_indexTree,0);
-	DX8Wrapper::Set_Vertex_Buffer(m_vertexTree);
-	DX8Wrapper::Set_Shader(detailAlphaShader);
-	DX8Wrapper::Set_Texture(0,m_treeTexture);
-	// Draw all the trees.
-	DX8Wrapper::Draw_Triangles(	m_curTreeIndexOffset, m_curNumTreeIndices/3, 0,	m_curNumTreeVertices);
-}
-
-
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
deleted file mode 100644
index 4f7701d094c..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    Video
-//
-// File name: W3DDevice/GameClient/W3DVideoBuffer.cpp
-//
-// Created:   10/23/01 TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/GameMemory.h"
-#include "WW3D2/texture.h"
-#include "WW3D2/textureloader.h"
-#include "W3DDevice/GameClient/W3DVideobuffer.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//============================================================================
-// W3DVideoBuffer::W3DVideoBuffer
-//============================================================================
-
-W3DVideoBuffer::W3DVideoBuffer( VideoBuffer::Type format )
-: VideoBuffer(format),
-	m_texture(NULL),
-	m_surface(NULL)
-{
-
-}
-
-
-//============================================================================
-// W3DVideoBuffer::SetBuffer
-//============================================================================
-
-Bool W3DVideoBuffer::allocate( UnsignedInt width, UnsignedInt height )
-{
-	free();
-
-	m_width = width;
-	m_height = height;
-	m_textureWidth = width;;
-	m_textureHeight = height;;
-	TextureLoader::Validate_Texture_Size( m_textureWidth, m_textureHeight);
-
-	WW3DFormat w3dFormat = TypeToW3DFormat(  m_format );
- 
-	if ( w3dFormat == WW3D_FORMAT_UNKNOWN )
-	{
-		return NULL;	
-	}
-
-	m_texture  = MSGNEW("TextureClass") TextureClass ( m_textureWidth, m_textureHeight, w3dFormat, MIP_LEVELS_1 );
-
-	if ( m_texture == NULL )
-	{
-		return FALSE;
-	}
-
-	if ( lock() == NULL )
-	{
-		free();
-		return FALSE;
-	}
-
-	unlock();
-
-
-	return TRUE;
-}
-
-//============================================================================
-// W3DVideoBuffer::~W3DVideoBuffer
-//============================================================================
-
-W3DVideoBuffer::~W3DVideoBuffer()
-{
-	free();
-}
-
-//============================================================================
-// W3DVideoBuffer::lock
-//============================================================================
-
-void*		W3DVideoBuffer::lock( void )
-{
-	void *mem = NULL;
-
-	if ( m_surface != NULL )
-	{
-		unlock();
-	}
-
-	m_surface = m_texture->Get_Surface_Level();		
-
-	if ( m_surface )
-	{
-		mem = m_surface->Lock( (Int*) &m_pitch );
-	}
-
-	return mem;
-}
-
-//============================================================================
-// W3DVideoBuffer::unlock
-//============================================================================
-
-void		W3DVideoBuffer::unlock( void )
-{
-	if ( m_surface != NULL )
-	{
-		m_surface->Unlock();
-		m_surface->Release_Ref();
-		m_surface = NULL;
-	}
-}
-
-//============================================================================
-// W3DVideoBuffer::valid
-//============================================================================
-
-Bool		W3DVideoBuffer::valid( void )
-{
-	return m_texture != NULL;
-}
-
-//============================================================================
-// W3DVideoBuffer::reset
-//============================================================================
-
-void	W3DVideoBuffer::free( void )
-{
-	unlock();
-
-	if ( m_texture )
-	{
-		unlock();
-		m_texture->Release_Ref();
-		m_texture = NULL;
-	}
-	m_surface = NULL;
-
-	VideoBuffer::free();
-}
-
-
-//============================================================================
-// W3DVideoBuffer::TypeToW3DFormat
-//============================================================================
-
-WW3DFormat W3DVideoBuffer::TypeToW3DFormat( VideoBuffer::Type format )
-{
-	WW3DFormat w3dFormat = WW3D_FORMAT_UNKNOWN;
-	switch ( format )
-	{
-		case TYPE_X8R8G8B8:
-			w3dFormat = WW3D_FORMAT_X8R8G8B8;
-			break;
-
- 		case TYPE_R8G8B8:
-			w3dFormat = WW3D_FORMAT_R8G8B8;
-			break;
-
- 		case TYPE_R5G6B5:
-			w3dFormat = WW3D_FORMAT_R5G6B5;
-			break;
-
- 		case TYPE_X1R5G5B5:
-			w3dFormat = WW3D_FORMAT_X1R5G5B5;
-			break;
-	}
-
-	return w3dFormat;
-}
-
-//============================================================================
-// W3DFormatToType
-//============================================================================
-
-VideoBuffer::Type W3DVideoBuffer::W3DFormatToType( WW3DFormat w3dFormat )
-{
-	Type format = TYPE_UNKNOWN;
-	switch ( w3dFormat )
-	{
-		case WW3D_FORMAT_X8R8G8B8:
-				format = VideoBuffer::TYPE_X8R8G8B8;
-				break;
-		case WW3D_FORMAT_R8G8B8:
-				format = VideoBuffer::TYPE_R8G8B8;
-				break;
-		case WW3D_FORMAT_R5G6B5:
-				format = VideoBuffer::TYPE_R5G6B5;
-				break;
-		case WW3D_FORMAT_X1R5G5B5:
-				format = VideoBuffer::TYPE_X1R5G5B5;
-				break;
-	}
-
-	return format;
-}
\ No newline at end of file
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
deleted file mode 100644
index 594ee890a23..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
+++ /dev/null
@@ -1,3142 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DView.cpp //////////////////////////////////////////////////////////////////////////////
-//
-// W3D implementation of the game view class.  This view allows us to have
-// a "window" into the game world that can change its width, height as 
-// well as camera positioning controls
-//
-// Author: Colin Day, April 2001
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////////////////////////
-#include <stdlib.h>
-#include <windows.h>
-
-// USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "Common/BuildAssistant.h"
-#include "Common/GlobalData.h"
-#include "Common/Module.h"
-#include "Common/RandomValue.h"
-#include "Common/ThingTemplate.h"
-#include "Common/ThingSort.h"
-#include "Common/PerfTimer.h"
-#include "Common/PlayerList.h"
-#include "Common/Player.h"
-
-#include "GameClient/Color.h"
-#include "GameClient/CommandXlat.h"
-#include "GameClient/Drawable.h"
-#include "GameClient/GameClient.h"
-#include "GameClient/GameWindowManager.h"
-#include "GameClient/Image.h"
-#include "GameClient/InGameUI.h"
-#include "GameClient/Line2D.h"
-#include "GameClient/SelectionInfo.h"
-#include "GameClient/Shell.h"
-#include "GameClient/TerrainVisual.h"
-#include "GameClient/Water.h"
-
-#include "GameLogic/AI.h"			///< For AI debug (yes, I'm cheating for now)
-#include "GameLogic/AIPathfind.h"			///< For AI debug (yes, I'm cheating for now)
-#include "GameLogic/ExperienceTracker.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/Module/AIUpdate.h"
-#include "GameLogic/Module/BodyModule.h"
-#include "GameLogic/Module/ContainModule.h"
-#include "GameLogic/Module/OpenContain.h"
-#include "GameLogic/Object.h"
-#include "GameLogic/ScriptEngine.h"
-#include "GameLogic/TerrainLogic.h"									///< @todo This should be TerrainVisual (client side)
-#include "Common/AudioEventInfo.h"
-
-#include "W3DDevice/Common/W3DConvert.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/W3DAssetManager.h"
-#include "W3DDevice/GameClient/W3DDisplay.h"
-#include "W3DDevice/GameClient/W3DScene.h"
-#include "W3DDevice/GameClient/W3DView.h"
-#include "d3dx8math.h"
-#include "W3DDevice/GameClient/W3DShaderManager.h"
-#include "W3DDevice/GameClient/Module/W3DModelDraw.h"
-#include "W3DDevice/GameClient/W3DCustomScene.h"
-
-#include "WW3D2/dx8renderer.h"
-#include "WW3D2/light.h"
-#include "WW3D2/camera.h"
-#include "WW3D2/coltype.h"
-#include "WW3D2/predlod.h"
-#include "WW3D2/ww3d.h"
-
-#include "WinMain.h"  /** @todo Remove this, it's only here because we
-													are using timeGetTime, but we can remove that
-													when we have our own timer */
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-
-
-// 30 fps
-Int TheW3DFrameLengthInMsec = 1000/LOGICFRAMES_PER_SECOND; // default is 33msec/frame == 30fps. but we may change it depending on sys config.
-static const Int MAX_REQUEST_CACHE_SIZE = 40;	// Any size larger than 10, or examine code below for changes. jkmcd.
-static const Real DRAWABLE_OVERSCAN = 75.0f;  ///< 3D world coords of how much to overscan in the 3D screen region
-
-
-
-
-
-
-//=================================================================================================
-inline Real minf(Real a, Real b) { if (a < b) return a; else return b; }
-inline Real maxf(Real a, Real b) { if (a > b) return a; else return b; }
-
-//-------------------------------------------------------------------------------------------------
-// Normalizes angle to +- PI.
-//-------------------------------------------------------------------------------------------------
-static void normAngle(Real &angle)
-{
-	if (angle < -10*PI) {
-		angle = 0;
-	}
-	if (angle > 10*PI) {
-		angle = 0;
-	}
-	while (angle < -PI) {
-		angle += 2*PI;
-	}
-	while (angle > PI) {
-		angle -= 2*PI;
-	}
-}
-
-#define TERRAIN_SAMPLE_SIZE 40.0f
-static Real getHeightAroundPos(Real x, Real y)
-{
-	// terrain height + desired height offset == cameraOffset * actual zoom
-	Real terrainHeight = TheTerrainLogic->getGroundHeight(x, y);
-
-	// find best approximation of max terrain height we can see
-	Real terrainHeightMax = terrainHeight;
-	terrainHeightMax = max(terrainHeightMax, TheTerrainLogic->getGroundHeight(x+TERRAIN_SAMPLE_SIZE, y-TERRAIN_SAMPLE_SIZE));
-	terrainHeightMax = max(terrainHeightMax, TheTerrainLogic->getGroundHeight(x-TERRAIN_SAMPLE_SIZE, y-TERRAIN_SAMPLE_SIZE));
-	terrainHeightMax = max(terrainHeightMax, TheTerrainLogic->getGroundHeight(x+TERRAIN_SAMPLE_SIZE, y+TERRAIN_SAMPLE_SIZE));
-	terrainHeightMax = max(terrainHeightMax, TheTerrainLogic->getGroundHeight(x-TERRAIN_SAMPLE_SIZE, y+TERRAIN_SAMPLE_SIZE));
-
-	return terrainHeightMax;
-}
-
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DView::W3DView()
-{
-	
-	m_3DCamera = NULL;
-	m_2DCamera = NULL;
-	m_groundLevel = 10.0;
-	m_cameraOffset.z = TheGlobalData->m_cameraHeight;
-	m_cameraOffset.y = -(m_cameraOffset.z / tan(TheGlobalData->m_cameraPitch * (PI / 180.0)));
-	m_cameraOffset.x = -(m_cameraOffset.y * tan(TheGlobalData->m_cameraYaw * (PI / 180.0)));
-
-	m_viewFilterMode = FM_NULL_MODE;
-	m_viewFilter = FT_NULL_FILTER;
-	m_isWireFrameEnabled = m_nextWireFrameEnabled = FALSE;
-	m_shakeOffset.x = 0.0f;
-	m_shakeOffset.y = 0.0f;
-	m_shakeIntensity = 0.0f;
-	m_FXPitch = 1.0f;
-	m_freezeTimeForCameraMovement = false;
-	m_cameraHasMovedSinceRequest = true;
-	m_locationRequests.clear();
-	m_locationRequests.reserve(MAX_REQUEST_CACHE_SIZE + 10);	// This prevents the vector from ever re-allocing
-
-}  // end W3DView
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DView::~W3DView()
-{
-
-	REF_PTR_RELEASE( m_2DCamera );
-	REF_PTR_RELEASE( m_3DCamera );
-
-}  // end ~W3DView
-
-//-------------------------------------------------------------------------------------------------
-/** Sets the height of the viewport, while maintaining original camera perspective. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setHeight(Int height)
-{
-	// extend View functionality
-	View::setHeight(height);
-
-	Vector2 vMin,vMax;
-	m_3DCamera->Set_Aspect_Ratio((Real)getWidth()/(Real)height);
- 	m_3DCamera->Get_Viewport(vMin,vMax);
- 	vMax.Y=(Real)(m_originY+height)/(Real)TheDisplay->getHeight();
- 	m_3DCamera->Set_Viewport(vMin,vMax);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Sets the width of the viewport, while maintaining original camera perspective. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setWidth(Int width)
-{
-	// extend View functionality
-	View::setWidth(width);
-
-	Vector2 vMin,vMax;
-	m_3DCamera->Set_Aspect_Ratio((Real)width/(Real)getHeight());
- 	m_3DCamera->Get_Viewport(vMin,vMax);
- 	vMax.X=(Real)(m_originX+width)/(Real)TheDisplay->getWidth();
- 	m_3DCamera->Set_Viewport(vMin,vMax);
-
-	//we want to maintain the same scale, so we'll need to adjust the fov.
-	//default W3D fov for full-screen is 50 degrees.
-	m_3DCamera->Set_View_Plane((Real)width/(Real)TheDisplay->getWidth()*DEG_TO_RADF(50.0f),-1);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Sets location of top-left view corner on display */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setOrigin( Int x, Int y)
-{
-	// extend View functionality
-	View::setOrigin(x,y);
-
-	Vector2 vMin,vMax;
-
- 	m_3DCamera->Get_Viewport(vMin,vMax);
- 	vMin.X=(Real)x/(Real)TheDisplay->getWidth();
-	vMin.Y=(Real)y/(Real)TheDisplay->getHeight();
- 	m_3DCamera->Set_Viewport(vMin,vMax);
-
-	// bottom-right border was also moved my this call, so force an update of extents.
-	setWidth(m_width);
-	setHeight(m_height);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** @todo This is inefficient. We should construct the matrix directly using vectors. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::buildCameraTransform( Matrix3D *transform )
-{
-	Vector3 sourcePos, targetPos;
-
-	Real groundLevel = m_groundLevel; // 93.0f; 
-
-	Real zoom = getZoom();
-	Real angle = getAngle();
-	Real pitch = getPitch();
-	Coord3D pos = *getPosition();
-
-	// add in the camera shake, if any
-	pos.x += m_shakeOffset.x;
-	pos.y += m_shakeOffset.y;
-
-	if (m_cameraConstraintValid)
-	{
-		pos.x = maxf(m_cameraConstraint.lo.x, pos.x);
-		pos.x = minf(m_cameraConstraint.hi.x, pos.x);
-		pos.y = maxf(m_cameraConstraint.lo.y, pos.y);
-		pos.y = minf(m_cameraConstraint.hi.y, pos.y);
-	}
-
-	// set position of camera itself
-	sourcePos.X = m_cameraOffset.x*zoom;
-	sourcePos.Y = m_cameraOffset.y*zoom;
-	sourcePos.Z = m_cameraOffset.z*zoom;
-	
-
-#ifdef NOT_IN_USE
-	if (TheGlobalData->m_isOffsetCameraZ && TheTerrainLogic)
-	{
-		sourcePos.Z += TheTerrainLogic->getGroundHeight(pos.x, pos.y);
-		if (m_prevSourcePosZ != SOURCEPOS_INVALID)
-		{
-			const Real MAX_SPZ_VARIATION = 0.05f;
-			Real spzMin = m_prevSourcePosZ*(1.0-MAX_SPZ_VARIATION);
-			Real spzMax			Coord3D center;
- = m_prevSourcePosZ*(1.0+MAX_SPZ_VARIATION);
-			if (sourcePos.Z < spzMin) sourcePos.Z = spzMin;
-			if (sourcePos.Z > spzMax) sourcePos.Z = spzMax;
-		}
-		m_prevSourcePosZ = sourcePos.Z;
-	}
-#endif
-
-	// camera looking at origin
-	targetPos.X = 0;
-	targetPos.Y = 0;
-	targetPos.Z = 0;
-
-
-	Real factor = 1.0 - (groundLevel/sourcePos.Z );
-
-	// construct a matrix to rotate around the up vector by the given angle
-	Matrix3D angleTransform( Vector3( 0.0f, 0.0f, 1.0f ), angle );
-
-	// construct a matrix to rotate around the horizontal vector by the given angle
-	Matrix3D pitchTransform( Vector3( 1.0f, 0.0f, 0.0f ), pitch );
-
-	// rotate camera position (pitch, then angle)
-#ifdef ALLOW_TEMPORARIES
-	sourcePos = pitchTransform * sourcePos;
-	sourcePos = angleTransform * sourcePos;
-#else
-	pitchTransform.mulVector3(sourcePos);
-	angleTransform.mulVector3(sourcePos);
-#endif
-	sourcePos *= factor;
-
-	// translate to current XY position
-	sourcePos.X += pos.x;
-	sourcePos.Y += pos.y;
-	sourcePos.Z += groundLevel;
-	
-	targetPos.X += pos.x;
-	targetPos.Y += pos.y;
-	targetPos.Z += groundLevel;
-
-	// do m_FXPitch adjustment.
-	Real height = sourcePos.Z - targetPos.Z;
-	height *= m_FXPitch;
-	targetPos.Z = sourcePos.Z - height;
-
-	// build new camera transform
-	transform->Make_Identity();
-	transform->Look_At( sourcePos, targetPos, 0 );
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::calcCameraConstraints()
-{
-//	const Matrix3D& cameraTransform = m_3DCamera->Get_Transform();
-
-//	DEBUG_LOG(("*** rebuilding cam constraints\n"));
-
-	// ok, now check to ensure that we can't see outside the map region,
-	// and twiddle the camera if needed
-	if (TheTerrainLogic)
-	{
-		Region3D mapRegion;
-		TheTerrainLogic->getExtent( &mapRegion );
-		
-	/*
-		Note the following restrictions on camera constraints!
-
-		-- they assume that all maps are height 'm_groundLevel' at the edges.
-				(since you need to add some "buffer" around the edges of your map
-				anyway, this shouldn't be an issue.)
-
-		-- for angles/pitches other than zero, it may show boundaries.
-				since we currently plan the game to be restricted to this,
-				it shouldn't be an issue.
-
-	*/
-		Real maxEdgeZ = m_groundLevel;
-//		const Real BORDER_FUDGE = MAP_XY_FACTOR * 1.414f;
-		Coord3D center, bottom;
-		ICoord2D screen;
-
-		//Pick at the center
-		screen.x=0.5f*getWidth()+m_originX;
-		screen.y=0.5f*getHeight()+m_originY;
-
-		Vector3 rayStart,rayEnd;
-
-		getPickRay(&screen,&rayStart,&rayEnd);
-
-		center.x = Vector3::Find_X_At_Z(maxEdgeZ, rayStart, rayEnd);
-		center.y = Vector3::Find_Y_At_Z(maxEdgeZ, rayStart, rayEnd);
-		center.z = maxEdgeZ;
-
-		screen.y = m_originY+ 0.95f*getHeight();
- 		getPickRay(&screen,&rayStart,&rayEnd);
- 		bottom.x = Vector3::Find_X_At_Z(maxEdgeZ, rayStart, rayEnd);
-		bottom.y = Vector3::Find_Y_At_Z(maxEdgeZ, rayStart, rayEnd);
-		bottom.z = maxEdgeZ;
-		center.x -= bottom.x;
-		center.y -= bottom.y;
-
-		Real offset = center.length();
-
-		if (TheGlobalData->m_debugAI) {
-			offset = -1000; // push out the constraints so we can look at staging areas.
-		}
-
-		m_cameraConstraint.lo.x = mapRegion.lo.x + offset;
-		m_cameraConstraint.hi.x = mapRegion.hi.x - offset;
-		// this looks inverted, but is correct
-		m_cameraConstraint.lo.y = mapRegion.lo.y + offset;
-		m_cameraConstraint.hi.y = mapRegion.hi.y - offset;
-		m_cameraConstraintValid = true;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Returns a world-space ray originating at a given screen pixel position
-	and ending at the far clip plane for current camera.  Screen coordinates
-	assumed in absolute values relative to full display resolution.*/
-//-------------------------------------------------------------------------------------------------
-void W3DView::getPickRay(const ICoord2D *screen, Vector3 *rayStart, Vector3 *rayEnd)
-{
-	Real logX,logY;
-
-	//W3D Screen coordinates are -1 to 1, so we need to do some conversion:
-	PixelScreenToW3DLogicalScreen(screen->x - m_originX,screen->y - m_originY, &logX, &logY,getWidth(),getHeight());
-
-	*rayStart = m_3DCamera->Get_Position();	//get camera location
-	m_3DCamera->Un_Project(*rayEnd,Vector2(logX,logY));	//get world space point
-	*rayEnd -= *rayStart;	//vector camera to world space point
-	rayEnd->Normalize();	//make unit vector
-	*rayEnd *= m_3DCamera->Get_Depth();	//adjust length to reach far clip plane
-	*rayEnd += *rayStart;	//get point on far clip plane along ray from camera.
-}
-
-//-------------------------------------------------------------------------------------------------
-/** set the transform matrix of m_3DCamera, based on m_pos & m_angle */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setCameraTransform( void )
-{
-	if (TheGlobalData->m_headless)
-		return;
-	m_cameraHasMovedSinceRequest = true;
-	Matrix3D cameraTransform( 1 );
-	
-	Real nearZ, farZ;
-	m_3DCamera->Get_Clip_Planes(nearZ, farZ);
-	// Set the near to MAP_XY_FACTOR.  Improves zbuffer resolution.
-	nearZ = MAP_XY_FACTOR; 
-	farZ = 1200.0f;
-
-	if ((TheGlobalData && TheGlobalData->m_drawEntireTerrain) || (m_FXPitch<0.95f || m_zoom>1.05))
-	{	//need to extend far clip plane so entire terrain can be visible
-		farZ *= MAP_XY_FACTOR;
-	}
-
-	m_3DCamera->Set_Clip_Planes(nearZ, farZ);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_useCameraConstraints)
-#endif
-	{
-		if (!m_cameraConstraintValid)
-		{
-			buildCameraTransform(&cameraTransform);
-			m_3DCamera->Set_Transform( cameraTransform );
-			calcCameraConstraints();
-		}
-		DEBUG_ASSERTLOG(m_cameraConstraintValid,("*** cam constraints are not valid!!!\n"));
-
-		if (m_cameraConstraintValid)
-		{
-			Coord3D pos = *getPosition();
-			pos.x = maxf(m_cameraConstraint.lo.x, pos.x);
-			pos.x = minf(m_cameraConstraint.hi.x, pos.x);
-			pos.y = maxf(m_cameraConstraint.lo.y, pos.y);
-			pos.y = minf(m_cameraConstraint.hi.y, pos.y);
-			setPosition(&pos);
-		}
-	}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	m_3DCamera->Set_View_Plane( m_FOV, -1 );
-#endif
-
-	// rebuild it (even if we just did it due to camera constraints)
-	buildCameraTransform( &cameraTransform );
-	m_3DCamera->Set_Transform( cameraTransform );
-
-	if (TheTerrainRenderObject)
-	{
-		RefRenderObjListIterator *it = W3DDisplay::m_3DScene->createLightsIterator();
-		TheTerrainRenderObject->updateCenter(m_3DCamera, it);
-		if (it) 
-		{
-		 W3DDisplay::m_3DScene->destroyLightsIterator(it);
-		 it = NULL;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::init( void )
-{
-	// extend View functionality
-	View::init();
-	setName("W3DView");
-	// set default camera "lookat" point
-	Coord3D pos;
-	pos.x = 87.0f;
-	pos.y = 77.0f;
-	pos.z = 0;
-
-	pos.x *= MAP_XY_FACTOR;
-	pos.y *= MAP_XY_FACTOR;
-
-	setPosition(&pos);
-
-	// create our 3D camera
-	m_3DCamera = NEW_REF( CameraClass, () );
-
-
-	setCameraTransform();
-
-	// create our 2D camera for the GUI overlay
-	m_2DCamera = NEW_REF( CameraClass, () );
-	m_2DCamera->Set_Position( Vector3( 0, 0, 1 ) );
-	Vector2 min = Vector2( -1, -0.75f );
-	Vector2 max = Vector2( +1, +0.75f );
-	m_2DCamera->Set_View_Plane( min, max );		
-	m_2DCamera->Set_Clip_Planes( 0.995f, 2.0f );
-
-	m_cameraConstraintValid = false;
-
-	m_scrollAmountCutoff = TheGlobalData->m_scrollAmountCutoff;
-
-}  // end init
-
-//-------------------------------------------------------------------------------------------------
-const Coord3D& W3DView::get3DCameraPosition() const
-{
-	Vector3 camera = m_3DCamera->Get_Position();
-	static Coord3D pos;
-	pos.set( camera.X, camera.Y, camera.Z );
-	return pos;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::reset( void )
-{
-	View::reset();
-
-	// Just in case...
-	setTimeMultiplier(1); // Set time rate back to 1.
-
-	Coord3D arbitraryPos = { 0, 0, 0 };
-	// Just move the camera to 0, 0, 0. It'll get repositioned at the beginning of the next game
-	// anyways.
-	resetCamera(&arbitraryPos, 1);
-
-	setViewFilter((enum FilterTypes)0);
-
-	Coord2D gb = { 0,0 };
-	setGuardBandBias( &gb );
-}
-
-//-------------------------------------------------------------------------------------------------
-/** draw worker for drawables in the view region */
-//-------------------------------------------------------------------------------------------------
-static void drawDrawable( Drawable *draw, void *userData )
-{
-
-	draw->draw( (View *)userData );
-
-}  // end drawDrawable
-
-// ------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-static void drawTerrainNormal( Drawable *draw, void *userData )
-{
-	UnsignedInt color = GameMakeColor( 255, 255, 0, 255 );
-  if (TheTerrainLogic)
-  {
-    Coord3D pos = *draw->getPosition();
-    Coord3D normal;
-    pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y, &normal);
-    const Real NORMLEN = 20;
-    normal.x = pos.x + normal.x * NORMLEN;
-    normal.y = pos.y + normal.y * NORMLEN;
-    normal.z = pos.z + normal.z * NORMLEN;
-    ICoord2D start, end;
-		TheTacticalView->worldToScreen(&pos, &start);
-		TheTacticalView->worldToScreen(&normal, &end);
-		TheDisplay->drawLine(start.x, start.y, end.x, end.y, 1.0f, color);
-  }
-}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-// ------------------------------------------------------------------------------------------------
-// Draw a crude circle. Appears on top of any world geometry
-// ------------------------------------------------------------------------------------------------
-void drawDebugCircle( const Coord3D & center, Real radius, Real width, Color color )
-{
-  const Real inc = PI/4.0f;
-  Real angle = 0.0f;
-  Coord3D pnt, lastPnt;
-  ICoord2D start, end;
-  Bool endValid, startValid;
-
-  lastPnt.x = center.x + radius * (Real)cos(angle);
-  lastPnt.y = center.y + radius * (Real)sin(angle);
-  lastPnt.z = center.z;
-  endValid = ( TheTacticalView->worldToScreenTriReturn( &lastPnt, &end ) != View::WTS_INVALID );
-  
-  for( angle = inc; angle <= 2.0f * PI; angle += inc )
-  {
-    pnt.x = center.x + radius * (Real)cos(angle);
-    pnt.y = center.y + radius * (Real)sin(angle);
-    pnt.z = center.z;
-    startValid = ( TheTacticalView->worldToScreenTriReturn( &pnt, &start ) != View::WTS_INVALID );
-    
-    if ( startValid && endValid ) 
-      TheDisplay->drawLine( start.x, start.y, end.x, end.y, width, color );
-    
-    lastPnt = pnt;
-    end = start;
-    endValid = startValid;
-  }
-}
-
-void drawDrawableExtents( Drawable *draw, void *userData );  // FORWARD DECLARATION
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-static void drawContainedDrawable( Object *obj, void *userData )
-{
-	Drawable *draw = obj->getDrawable();
-
-	if( draw )
-		drawDrawableExtents( draw, userData );
-
-}  // end drawContainedDrawable
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-static void drawDrawableExtents( Drawable *draw, void *userData )
-{
-	UnsignedInt color = GameMakeColor( 0, 255, 0, 255 );
-
-	switch( draw->getDrawableGeometryInfo().getGeomType() )
-	{
-
-		//---------------------------------------------------------------------------------------------
-		case GEOMETRY_BOX:
-		{
-			Real angle = draw->getOrientation();
-			Real c = (Real)cos(angle);
-			Real s = (Real)sin(angle);
-			Real exc = draw->getDrawableGeometryInfo().getMajorRadius()*c;
-			Real eyc = draw->getDrawableGeometryInfo().getMinorRadius()*c;
-			Real exs = draw->getDrawableGeometryInfo().getMajorRadius()*s;
-			Real eys = draw->getDrawableGeometryInfo().getMinorRadius()*s;
-			Coord3D pts[4];
-			pts[0].x = draw->getPosition()->x - exc - eys;
-			pts[0].y = draw->getPosition()->y + eyc - exs;
-			pts[0].z = 0;
-			pts[1].x = draw->getPosition()->x + exc - eys;
-			pts[1].y = draw->getPosition()->y + eyc + exs;
-			pts[1].z = 0;
-			pts[2].x = draw->getPosition()->x + exc + eys;
-			pts[2].y = draw->getPosition()->y - eyc + exs;
-			pts[2].z = 0;
-			pts[3].x = draw->getPosition()->x - exc + eys;
-			pts[3].y = draw->getPosition()->y - eyc - exs;
-			pts[3].z = 0;
-			Real z = draw->getPosition()->z;
-			for( int i = 0; i < 2; i++ )
-			{
-
-				for (int corner = 0; corner < 4; corner++)
-				{
-					ICoord2D start, end;
-					pts[corner].z = z;
-					pts[(corner+1)&3].z = z;
-					TheTacticalView->worldToScreen(&pts[corner], &start);
-					TheTacticalView->worldToScreen(&pts[(corner+1)&3], &end);
-					TheDisplay->drawLine(start.x, start.y, end.x, end.y, 1.0f, color);
-				}
-
-				z += draw->getDrawableGeometryInfo().getMaxHeightAbovePosition();
-
-			}  // end for i
-
-			break;
-
-		}  // end case box
-
-		//---------------------------------------------------------------------------------------------
-		case GEOMETRY_SPHERE:	// not quite right, but close enough
-		case GEOMETRY_CYLINDER:
-		{ 
-      Coord3D center = *draw->getPosition();
-      const Real radius = draw->getDrawableGeometryInfo().getMajorRadius();
-
-			// draw cylinder
-			for( int i=0; i<2; i++ )
-			{
-        drawDebugCircle( center, radius, 1.0f, color );
-
-        // next time 'round, draw the top of the cylinder
-        center.z += draw->getDrawableGeometryInfo().getMaxHeightAbovePosition();
-			}	// end for i
-
-			// draw centerline
-      ICoord2D start, end;
-      center = *draw->getPosition();
-      TheTacticalView->worldToScreen( &center, &start );
-      center.z += draw->getDrawableGeometryInfo().getMaxHeightAbovePosition();
-      TheTacticalView->worldToScreen( &center, &end );
-			TheDisplay->drawLine( start.x, start.y, end.x, end.y, 1.0f, color );
-
-			break;
-
-		}	// case CYLINDER
-
-	} // end switch
-
-	// draw any extents for things that are contained by this
-	Object *obj = draw->getObject();
-	if( obj )
-	{
-		ContainModuleInterface *contain = obj->getContain();
-
-		if( contain )
-			contain->iterateContained( drawContainedDrawable, userData, FALSE );
-
-	}  // end if
-
-}  // end drawDrawableExtents
-
-
-void drawAudioLocations( Drawable *draw, void *userData );
-// ------------------------------------------------------------------------------------------------
-// Helper for drawAudioLocations
-// ------------------------------------------------------------------------------------------------
-static void drawContainedAudioLocations( Object *obj, void *userData )
-{
-  Drawable *draw = obj->getDrawable();
-  
-  if( draw )
-    drawAudioLocations( draw, userData );
-  
-}  // end drawContainedAudio
-
-
-//-------------------------------------------------------------------------------------------------
-// Draw the location of audio objects in the world
-//-------------------------------------------------------------------------------------------------
-static void drawAudioLocations( Drawable *draw, void *userData )
-{
-  // draw audio for things that are contained by this
-  Object *obj = draw->getObject();
-  if( obj )
-  {
-    ContainModuleInterface *contain = obj->getContain();
-    
-    if( contain )
-      contain->iterateContained( drawContainedAudioLocations, userData, FALSE );
-    
-  }  // end if
-
-  const ThingTemplate * thingTemplate = draw->getTemplate();
-
-  if ( thingTemplate == NULL || thingTemplate->getEditorSorting() != ES_AUDIO )
-  {
-    return; // All done
-  }
-
-  // Copied in hideously inappropriate code copying ways from DrawObject.cpp
-  // Should definately be a global, probably read in from an INI file <gasp>
-  static const Int poleHeight = 20;
-  static const Int flagHeight = 10;
-  static const Int flagWidth = 10;
-  const Color color = GameMakeColor(0x25, 0x25, 0xEF, 0xFF);
-
-  // Draw flag for audio-only objects:
-  //  *
-  //  * *
-  //  *   *
-  //  *     *
-  //  *   *
-  //  * *
-  //  *
-  //  *
-  //  *
-  //  *
-  //  *
-
-  Coord3D worldPoint;
-  ICoord2D start, end;
-
-  worldPoint = *draw->getPosition();
-  TheTacticalView->worldToScreen( &worldPoint, &start );
-  worldPoint.z += poleHeight;
-  TheTacticalView->worldToScreen( &worldPoint, &end );
-  TheDisplay->drawLine( start.x, start.y, end.x, end.y, 1.0f, color );
-  
-  worldPoint.z -= flagHeight / 2;
-  worldPoint.x += flagWidth;
-  TheTacticalView->worldToScreen( &worldPoint, &start );
-  TheDisplay->drawLine( start.x, start.y, end.x, end.y, 1.0f, color );
-
-  worldPoint.z -= flagHeight / 2;
-  worldPoint.x -= flagWidth;
-  TheTacticalView->worldToScreen( &worldPoint, &end );
-  TheDisplay->drawLine( start.x, start.y, end.x, end.y, 1.0f, color );
-}
-
-//-------------------------------------------------------------------------------------------------
-// Draw the radii of sounds attached to any type of object. 
-//-------------------------------------------------------------------------------------------------
-static void drawAudioRadii( const Drawable * drawable )
-{
-  
-  // Draw radii, if sound is playing
-  const AudioEventRTS * ambientSound = drawable->getAmbientSound();
-  
-  if ( ambientSound && ambientSound->isCurrentlyPlaying() )
-  {
-    const AudioEventInfo * ambientInfo = ambientSound->getAudioEventInfo();
-    
-    if ( ambientInfo == NULL )
-    {
-      // I don't think that's right...
-      OutputDebugString( ("Playing sound has NULL AudioEventInfo?\n" ) );
-      
-      if ( TheAudio != NULL )
-      {
-        ambientInfo = TheAudio->findAudioEventInfo( ambientSound->getEventName() );
-      }
-    }
-    
-    if ( ambientInfo != NULL )
-    {
-      // Colors match those used in WorldBuilder
-      drawDebugCircle( *drawable->getPosition(), ambientInfo->m_minDistance, 1.0f, GameMakeColor(0x00, 0x00, 0xFF, 0xFF) );
-      drawDebugCircle( *drawable->getPosition(), ambientInfo->m_maxDistance, 1.0f, GameMakeColor(0xFF, 0x00, 0xFF, 0xFF) );
-    }
-  }
-}
-
-#endif
-
-//-------------------------------------------------------------------------------------------------
-/** An opportunity to draw something after all drawables have been drawn once */
-//-------------------------------------------------------------------------------------------------
-static void drawablePostDraw( Drawable *draw, void *userData )
-{
-	Real FXPitch = TheTacticalView->getFXPitch();
-	if (draw->isDrawableEffectivelyHidden() || FXPitch < 0.0f)
-		return;
-
-	Object* obj = draw->getObject();
-	Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	ObjectShroudStatus ss = (!obj || !TheGlobalData->m_shroudOn) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex);
-#else
-	ObjectShroudStatus ss = (!obj) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex);
-#endif
-	if (ss > OBJECTSHROUD_PARTIAL_CLEAR)
-		return;
-
-	// draw the any "icon" UI for a drawable (health bars, veterency, etc);
-	
-	//*****
-	//@TODO: Create a way to reject this call easily -- like objects that have no compatible modules.
-	//*****
-	//if( draw->getStatusBits() )
-	//{
-			draw->drawIconUI();
-	//}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	// debug collision extents
-	if( TheGlobalData->m_showCollisionExtents )
-	  drawDrawableExtents( draw, userData );
-
-  if ( TheGlobalData->m_showAudioLocations )
-    drawAudioLocations( draw, userData );
-#endif
-
-	// debug terrain normals at object positions
-	if( TheGlobalData->m_showTerrainNormals )
-	  drawTerrainNormal( draw, userData );
-
-	TheGameClient->incrementRenderedObjectCount();
-
-}  // end drawablePostDraw
-
-//-------------------------------------------------------------------------------------------------
-// Display AI debug visuals
-//-------------------------------------------------------------------------------------------------
-static void renderAIDebug( void )
-{
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-Bool W3DView::updateCameraMovements()
-{
-	Bool didUpdate = false;
-
-	if (m_doingZoomCamera)
-	{
-		zoomCameraOneFrame();
-		didUpdate = true;
-	}
-	if (m_doingPitchCamera)
-	{
-		pitchCameraOneFrame();
-		didUpdate = true;
-	}
-	if (m_doingRotateCamera) {	
-		m_previousLookAtPosition = *getPosition();
-		rotateCameraOneFrame();
-		didUpdate = true;
-	} else if (m_doingMoveCameraOnWaypointPath) {
-		m_previousLookAtPosition = *getPosition();
-		moveAlongWaypointPath(TheW3DFrameLengthInMsec);
-		didUpdate = true;
-	}
-	if (m_doingScriptedCameraLock)
-	{
-		didUpdate = true;
-	}
-	return didUpdate;
-}
-
-
-/** This function performs all actions which affect the camera transform or 3D objects
-	rendered in this frame.
-
-   MW: I moved this code out out W3DView::draw() so that we can get final camera and object
-   positions before any rendering begins.  This was necessary so that reflection textures
-   (which update before the main rendering loop) could get a correct version of the scene.
-   Without this change, the reflections were always 1 frame behind the non-reflected view.
-*/
-void W3DView::updateView(void)
-{
-	UPDATE();
-}
-
-//DECLARE_PERF_TIMER(W3DView_updateView)
-void W3DView::update(void)
-{
-	//USE_PERF_TIMER(W3DView_updateView)
-	Bool recalcCamera = false;
-	Bool didScriptedMovement = false;
-#ifdef LOG_FRAME_TIMES
-	__int64 curTime64,freq64;
-	static __int64 prevTime64=0;
-	QueryPerformanceFrequency((LARGE_INTEGER *)&freq64);
-	QueryPerformanceCounter((LARGE_INTEGER *)&curTime64);
-	freq64 /= 1000;
-
-	Int elapsedTimeMs = (curTime64 - prevTime64)/freq64;
-	prevTime64 = curTime64;
-
-#endif
-
-//	Int elapsedTimeMs = TheW3DFrameLengthInMsec; // Assume a constant time flow.  It just works out better.  jba.
-
-	if (TheTerrainRenderObject->doesNeedFullUpdate()) {
-		RefRenderObjListIterator *it = W3DDisplay::m_3DScene->createLightsIterator();
-		TheTerrainRenderObject->updateCenter(m_3DCamera, it);
-		if (it) 
-		{
-		 W3DDisplay::m_3DScene->destroyLightsIterator(it);
-		 it = NULL;
-		}
-	}
-
-	static Real followFactor = -1;
-	ObjectID cameraLock = getCameraLock();
-	if (cameraLock == INVALID_ID) 
-	{
-		followFactor = -1;
-	}
-	if (cameraLock != INVALID_ID)
-	{
-		m_doingMoveCameraOnWaypointPath = false;
-		Object* cameraLockObj = TheGameLogic->findObjectByID(cameraLock);
-		Bool loseLock = false;
-
-		// check if object has been destroyed or is dead -> lose lock
-		if (cameraLockObj == NULL)
-		{
-			loseLock = true;
-		}
-#if 0
-		else
-		{
-			AIUpdateInterface *ai = cameraLockObj->getAIUpdateInterface();
-			if (ai && ai->isDead())
-				loseLock = true;
-		}
-#endif
-
-
-		if (loseLock)
-		{
-			setCameraLock(INVALID_ID);
-			setCameraLockDrawable(NULL);
-			followFactor = -1;
-		}
-		else
-		{
-			if (followFactor<0) {
-				followFactor = 0.05f;
-			} else {
-				followFactor += 0.05f;
-				if (followFactor>1.0f) followFactor = 1.0f;
-			}
-			if (getCameraLockDrawable() != NULL)
-			{
-				Drawable* cameraLockDrawable = (Drawable *)getCameraLockDrawable();
-
-				if (!cameraLockDrawable)
-				{
-					setCameraLockDrawable(NULL);
-				}
-				else
-				{
-					Coord3D pos;
-					Real boundingSphereRadius;
-					Matrix3D transform;
-					// this method must ONLY be called from the client, NEVER From the logic, not even indirectly.
-					if (cameraLockDrawable->clientOnly_getFirstRenderObjInfo(&pos, &boundingSphereRadius, &transform))
-					{
-						Vector3 zaxis(0,0,1);
-
-						Vector3 objPos;
-						objPos.X = pos.x;
-						objPos.Y = pos.y;
-						objPos.Z = pos.z;
-
-						//get position of top of object, assuming world z roughly along local z.
-						objPos += boundingSphereRadius * 1.0f * zaxis;
-						Vector3 objview = transform.Get_X_Vector();	//get view vector of object
-						//move camera back behind object far enough not to intersect bounding sphere
-						Vector3 camtran = objPos - objview * boundingSphereRadius*4.5f;
-
-						Vector3 prevCamTran = m_3DCamera->Get_Position();	//get current camera position.
-
-						Vector3 tranDiff = (camtran - prevCamTran);	//vector old position to new position.
-
-						camtran = prevCamTran + tranDiff * 0.1f;	//slowly move camera to new position.
-
-						Matrix3D camXForm;
-						camXForm.Look_At(camtran,objPos,0);
-						m_3DCamera->Set_Transform(camXForm);
-
-						recalcCamera = false;	//we already did it
-					}
-				}
-			}
-			else
-			{	Coord3D objpos = *cameraLockObj->getPosition();
-				Coord3D curpos = *getPosition();
-				// don't "snap" directly to the pos, but move there smoothly.
-				Real snapThreshSqr = sqr(TheGlobalData->m_partitionCellSize);
-				Real curDistSqr = sqr(curpos.x - objpos.x) + sqr(curpos.y - objpos.y);
-				if ( m_snapImmediate)
-				{
-					// close enough.
-					curpos.x = objpos.x;
-					curpos.y = objpos.y;
-				}
-				else
-				{
-//					Real ratio = 1.0f - snapThreshSqr/curDistSqr;
-					Real dx = objpos.x-curpos.x;
-					Real dy = objpos.y-curpos.y;
-					if (m_lockType == LOCK_TETHER)
-					{
-						//snapThreshSqr = sqr( m_lockDist * TheGlobalData->m_partitionCellSize );
-						if (curDistSqr >= snapThreshSqr)
-						{
-							Real ratio = 1.0f - snapThreshSqr/curDistSqr;
-							
-							// move halfway there.
-							curpos.x += dx*ratio*0.5f;
-							curpos.y += dy*ratio*0.5f;
-						}
-						else
-						{
-							// we're inside our 'play' tolerance.  Move slowly to the obj
-							Real ratio = 0.01f * m_lockDist;
-							Real dx = objpos.x-curpos.x;
-							Real dy = objpos.y-curpos.y;
-							curpos.x += dx*ratio;
-							curpos.y += dy*ratio;
-						}
-					}
-					else
-					{
-						curpos.x += dx*followFactor;
-						curpos.y += dy*followFactor;
-					}
-				}
-				if (!(TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript()) && !TheGameLogic->isGamePaused()) {
-					m_previousLookAtPosition = *getPosition();
-				}
-				setPosition(&curpos);
-
-				if (m_lockType == LOCK_FOLLOW)
-				{
-					// camera follow objects if they are flying
-					if (cameraLockObj->isUsingAirborneLocomotor() && cameraLockObj->isAboveTerrainOrWater())
-					{
-						Matrix3D camXForm;
-						Real oldZRot = m_angle;
-						Real idealZRot = cameraLockObj->getOrientation() - M_PI_2;
-						normAngle(oldZRot);
-						normAngle(idealZRot);
-						Real diff = idealZRot - oldZRot;
-						normAngle(diff);
-
-						if (m_snapImmediate)
-						{
-							m_angle = idealZRot;
-						}
-						else
-						{
-							m_angle += diff * 0.1f;
-						}
-						normAngle(m_angle);
-					}
-				}
-				if (m_snapImmediate)
-					m_snapImmediate = FALSE;
-
-				m_groundLevel = objpos.z;
-				didScriptedMovement = true;
-				recalcCamera = true;
-			}
-		}
-	}	
-
-	if (!(TheScriptEngine->isTimeFrozenDebug()/* || TheScriptEngine->isTimeFrozenScript()*/) && !TheGameLogic->isGamePaused()) {
-		// If we aren't frozen for debug, allow the camera to follow scripted movements.
-		if (updateCameraMovements()) {
-			didScriptedMovement = true;
-			recalcCamera = true;
-		}
-	} else {
-		if (m_doingRotateCamera || m_doingMoveCameraOnWaypointPath || m_doingPitchCamera || m_doingZoomCamera || m_doingScriptedCameraLock) {
-			didScriptedMovement = true; // don't mess up the scripted movement
-		}
-	}
-	//
-	// Process camera shake
-	/// @todo Make this framerate-independent
-	//
-	if (m_shakeIntensity > 0.01f)
-	{
-		m_shakeOffset.x = m_shakeIntensity * m_shakeAngleCos;
-		m_shakeOffset.y = m_shakeIntensity * m_shakeAngleSin;
-
-		// fake a stiff spring/damper
-		const Real dampingCoeff = 0.75f;
-		m_shakeIntensity *= dampingCoeff;
-
-		// spring is so "stiff", it pulls 180 degrees opposite each frame
-		m_shakeAngleCos = -m_shakeAngleCos;
-		m_shakeAngleSin = -m_shakeAngleSin;
-
-		recalcCamera = true;
-	}
-	else
-	{
-		m_shakeIntensity = 0.0f;
-		m_shakeOffset.x = 0.0f;
-		m_shakeOffset.y = 0.0f;
-	}
-
-	/*
-	 * In order to have the camera follow the terrain in a non-dizzying way, we will have a
-	 * "desired height" value that the user sets.  While scrolling, the actual height (set by
-	 * zoom) will not get updated unless we are scrolling uphill and our view either goes
-	 * underground or higher than the max allowed height.  When the camera is at rest (not
-	 * scrolling), the zoom will move toward matching the desired height.
-	 */
-	m_terrainHeightUnderCamera = getHeightAroundPos(m_pos.x, m_pos.y);
-	m_currentHeightAboveGround = m_cameraOffset.z * m_zoom - m_terrainHeightUnderCamera;
-	if (TheTerrainLogic && TheGlobalData && TheInGameUI && m_okToAdjustHeight && !TheGameLogic->isGamePaused())
-	{
-		Real desiredHeight = (m_terrainHeightUnderCamera + m_heightAboveGround);
-		Real desiredZoom = desiredHeight / m_cameraOffset.z;
-  	if (didScriptedMovement || (TheGameLogic->isInReplayGame() && TheGlobalData->m_useCameraInReplay))
-  	{
-  		// if we are in a scripted camera movement, take its height above ground as our desired height.
-  		m_heightAboveGround = m_currentHeightAboveGround;
-			//DEBUG_LOG(("Frame %d: height above ground: %g %g %g %g\n", TheGameLogic->getFrame(), m_heightAboveGround,
-			//	m_cameraOffset.z, m_zoom, m_terrainHeightUnderCamera));
-  	}
-		if (TheInGameUI->isScrolling())
-		{
-			// if scrolling, only adjust if we're too close or too far
-			if (m_scrollAmount.length() < m_scrollAmountCutoff || (m_currentHeightAboveGround < m_minHeightAboveGround) || (TheGlobalData->m_enforceMaxCameraHeight && m_currentHeightAboveGround > m_maxHeightAboveGround))
-			{
-				Real zoomAdj = (desiredZoom - m_zoom)*TheGlobalData->m_cameraAdjustSpeed;
-				if (fabs(zoomAdj) >= 0.0001)	// only do positive
-				{
-					m_zoom += zoomAdj;
-					recalcCamera = true;
-				}
-			}
-		}
-		else
-		{
-			// we're not scrolling; settle toward desired height above ground
-			Real zoomAdj = (m_zoom - desiredZoom)*TheGlobalData->m_cameraAdjustSpeed;
-			Real zoomAdjAbs = fabs(zoomAdj);
-			if (zoomAdjAbs >= 0.0001 && !didScriptedMovement)
-			{
-				//DEBUG_LOG(("W3DView::update() - m_zoom=%g, desiredHeight=%g\n", m_zoom, desiredZoom));
-				m_zoom -= zoomAdj;
-				recalcCamera = true;
-			}
-		}
-	}
-	if (TheScriptEngine->isTimeFast()) {
-		return; // don't draw - makes it faster :) jba.
-	}
-	if (recalcCamera)
-		setCameraTransform();
-
-	Region3D axisAlignedRegion;
-	getAxisAlignedViewRegion(axisAlignedRegion);
-
-	// render all of the visible Drawables
-	/// @todo this needs to use a real region partition or something
-	if (WW3D::Get_Frame_Time())	//make sure some time actually elapsed
-		TheGameClient->iterateDrawablesInRegion( &axisAlignedRegion, drawDrawable, this );
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Find region which contains all drawables in 3D space. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::getAxisAlignedViewRegion(Region3D &axisAlignedRegion)
-{
-	//
-	// get the 4 points in 3D space of the 4 corners of the view, we will use a z = 0.0f
-	// value so that we can get everything ... even stuff below the terrain
-	//
-	Coord3D box[ 4 ];
-	getScreenCornerWorldPointsAtZ( &box[ 0 ], &box[ 1 ], &box[ 2 ], &box[ 3 ], 0.0f );
-
-	//
-	// take those 4 corners projected into the world and create an axis aligned bounding
-	// box, we will use this box to iterate the drawables in 3D space
-	//
-	axisAlignedRegion.lo = box[ 0 ];
-	axisAlignedRegion.hi = box[ 0 ];
-	for( Int i = 0; i < 4; i++ )
-	{
-
-		if( box[ i ].x < axisAlignedRegion.lo.x )
-			axisAlignedRegion.lo.x = box[ i ].x;
-		if( box[ i ].y < axisAlignedRegion.lo.y )
-			axisAlignedRegion.lo.y = box[ i ].y;
-		if( box[ i ].x > axisAlignedRegion.hi.x )
-		  axisAlignedRegion.hi.x = box[ i ].x;
-		if( box[ i ].y > axisAlignedRegion.hi.y )
-		  axisAlignedRegion.hi.y = box[ i ].y;
-
-	}  // end for i
-
-	// low and high regions will be based of the extent of the map
-	Region3D mapExtent;
-	Real safeValue = 999999;
-	TheTerrainLogic->getExtent( &mapExtent );
-	axisAlignedRegion.lo.z = mapExtent.lo.z - safeValue;
-	axisAlignedRegion.hi.z = mapExtent.hi.z + safeValue;
-
-	// we want to overscan a little bit so that we get objects that are partially offscreen
-	axisAlignedRegion.lo.x -= (DRAWABLE_OVERSCAN + m_guardBandBias.x);
-	axisAlignedRegion.lo.y -= (DRAWABLE_OVERSCAN + m_guardBandBias.y + 60.0f );
-	axisAlignedRegion.hi.x += (DRAWABLE_OVERSCAN + m_guardBandBias.x);
-	axisAlignedRegion.hi.y += (DRAWABLE_OVERSCAN + m_guardBandBias.y);
-
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::setFadeParameters(Int fadeFrames, Int direction)
-{
-	ScreenBWFilter::setFadeParameters(fadeFrames, direction);
-	ScreenCrossFadeFilter::setFadeParameters(fadeFrames,direction);
-}
-
-void W3DView::set3DWireFrameMode(Bool enable)
-{
-	m_nextWireFrameEnabled = enable;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Sets the view filter mode. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setViewFilterPos(const Coord3D *pos)
-{
-	ScreenMotionBlurFilter::setZoomToPos(pos);
-}
-//-------------------------------------------------------------------------------------------------
-/** Sets the view filter mode. */
-//-------------------------------------------------------------------------------------------------
-Bool W3DView::setViewFilterMode(enum FilterModes filterMode)
-{
-	FilterModes oldMode = m_viewFilterMode;	//save previous mode in case setup fails.
-
-	m_viewFilterMode = filterMode;
-	if (m_viewFilterMode != FM_NULL_MODE && 
-		m_viewFilter != FT_NULL_FILTER) {
-		if (!W3DShaderManager::filterSetup(m_viewFilter, m_viewFilterMode))
-		{	//setup failed so restore previous mode.
-			m_viewFilterMode = oldMode;
-			return FALSE;
-		}
-	}
-	return TRUE;
-}
-//-------------------------------------------------------------------------------------------------
-/** Sets the view filter. */
-//-------------------------------------------------------------------------------------------------
-Bool W3DView::setViewFilter(enum FilterTypes filter)
-{
-	FilterTypes oldFilter = m_viewFilter;	//save previous filter in case setup fails.
-
-	m_viewFilter = filter;
-	if (m_viewFilterMode != FM_NULL_MODE && 
-		m_viewFilter != FT_NULL_FILTER) {
-		if (!W3DShaderManager::filterSetup(m_viewFilter, m_viewFilterMode))
-		{	//setup failed so restore previous mode.
-			m_viewFilter = oldFilter;
-			return FALSE;
-		};
-	}
-	return TRUE;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Calculates how many pixels we scrolled since last frame for motion blur calculations. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::calcDeltaScroll(Coord2D &screenDelta)
-{
-	screenDelta.x = 0;
-	screenDelta.y = 0;
-	Vector3 prevPos(m_previousLookAtPosition.x,m_previousLookAtPosition.y, m_groundLevel);
-	Vector3 prevScreen;
-	if (m_3DCamera->Project( prevScreen, prevPos ) != CameraClass::INSIDE_FRUSTUM)
-	{
-		return;
-	}
-	Vector3 pos(m_pos.x,m_pos.y, m_groundLevel);
-	Vector3 screen;
-	if (m_3DCamera->Project( screen, pos ) != CameraClass::INSIDE_FRUSTUM)
-	{
-		return;
-	}
-	screenDelta.x = screen.X-prevScreen.X;
-	screenDelta.y = screen.Y-prevScreen.Y;
-}
-
-
-//-------------------------------------------------------------------------------------------------
-/** Draw member for the W3D window, this will literally draw the window 
-  * for this view */
-//-------------------------------------------------------------------------------------------------
-void W3DView::drawView( void )
-{
-	DRAW();
-}
-
-//DECLARE_PERF_TIMER(W3DView_drawView)
-void W3DView::draw( void )
-{
-	//USE_PERF_TIMER(W3DView_drawView)
-	Bool skipRender = false;
-	Bool doExtraRender = false;
-	CustomScenePassModes customScenePassMode  = SCENE_PASS_DEFAULT;
-
-	if (m_viewFilterMode && 
-			m_viewFilter > FT_NULL_FILTER && 
-			m_viewFilter < FT_MAX)
-	{	
-		// Most likely will redirect rendering to a texture.
-		W3DShaderManager::filterPreRender(m_viewFilter, skipRender, customScenePassMode);
-		if (!skipRender && getCameraLock()) 
-		{
-			Object* cameraLockObj = TheGameLogic->findObjectByID(getCameraLock());
-			if (cameraLockObj) 
-			{
-				Drawable *drawable = cameraLockObj->getDrawable();
-				drawable->setDrawableHidden(true);
-			}
-		}
-	}
-
-	if (!skipRender) 
-	{
-		// Render 3D scene from our camera
-		W3DDisplay::m_3DScene->setCustomPassMode(customScenePassMode);
-		if (m_isWireFrameEnabled)
-			W3DDisplay::m_3DScene->Set_Extra_Pass_Polygon_Mode(SceneClass::EXTRA_PASS_CLEAR_LINE);
-		W3DDisplay::m_3DScene->doRender( m_3DCamera );
-		W3DDisplay::m_3DScene->Set_Extra_Pass_Polygon_Mode(SceneClass::EXTRA_PASS_DISABLE);
-		m_isWireFrameEnabled = m_nextWireFrameEnabled;
-	}
-
-	if (m_viewFilterMode && 
-			m_viewFilter > FT_NULL_FILTER && 
-			m_viewFilter < FT_MAX)
-	{	
-		Coord2D deltaScroll;
-		calcDeltaScroll(deltaScroll);
-		Bool continueTheEffect;
-		continueTheEffect = W3DShaderManager::filterPostRender(m_viewFilter, m_viewFilterMode, deltaScroll,doExtraRender);
-		if (!skipRender && getCameraLock()) 
-		{
-			Object* cameraLockObj = TheGameLogic->findObjectByID(getCameraLock());
-			if (cameraLockObj) 
-			{
-				Drawable *drawable = cameraLockObj->getDrawable();
-				drawable->setDrawableHidden(false);
-				RenderInfoClass rinfo(*m_3DCamera);
-				// Apply the camera and viewport (including depth range)
-				m_3DCamera->Apply();
-				TheDX8MeshRenderer.Set_Camera(&rinfo.Camera);
-				W3DDisplay::m_3DScene->renderSpecificDrawables(rinfo, 1, &drawable);
-				WW3D::Flush(rinfo);
-			}
-		}
-		if (!continueTheEffect) 
-		{
-			// shut it down.
-			m_viewFilter = FT_NULL_FILTER;
-			m_viewFilterMode = FM_NULL_MODE;
-		}
-	}
-
-	//Some effects require that we render a modified version of the scene into a texture but also require
-	//an unaltered version in the framebuffer.  So we re-render again into framebuffer after texture rendering
-	//was turned off by filterPostRender().
-	if (doExtraRender)
-	{
-		//Reset to normal scene rendering.
-		//The pass that rendered into a texture may have left the z-buffer in a weird state
-		//so clear it before rendering normal scene.
-		///@todo: Don't clear z-buffer unless shader uses z-bias or anything else that would cause <= z to fail on normal render.
-		DX8Wrapper::Clear(false, true, Vector3(0.0f,0.0f,0.0f), TheWaterTransparency->m_minWaterOpacity);	// Clear z but not color
-		W3DDisplay::m_3DScene->setCustomPassMode(SCENE_PASS_DEFAULT);
-		W3DDisplay::m_3DScene->doRender( m_3DCamera );
-		Coord2D deltaScroll;
-		W3DShaderManager::filterPostRender(m_viewFilter, m_viewFilterMode, deltaScroll, doExtraRender);
-	}
-
-	if( TheGlobalData->m_debugAI )
-	{
-		if (TheAI->pathfinder()->getDebugPath())
-		{
-			// setup screen clipping region
-			IRegion2D clipRegion;
-			clipRegion.lo.x = 0;
-			clipRegion.lo.y = 0;
-			clipRegion.hi.x = getWidth();
-			clipRegion.hi.y = getHeight();
-
-			UnsignedInt color = 0xFFFFFF00;  //0xAARRGGBB
-			ICoord2D start, end;
-			PathNode *prevNode = TheAI->pathfinder()->getDebugPath()->getFirstNode();
-
-			if (worldToScreen( prevNode->getPosition(), &start )) {
-				TheDisplay->drawLine( start.x-3, start.y-3, start.x+3, start.y-3, 1.0f, color );
-				TheDisplay->drawLine( start.x+3, start.y-3, start.x+3, start.y+3, 1.0f, color );
-				TheDisplay->drawLine( start.x+3, start.y+3, start.x-3, start.y+3, 1.0f, color );
-				TheDisplay->drawLine( start.x-3, start.y+3, start.x-3, start.y-3, 1.0f, color );
-			}
-			for( PathNode *node = prevNode->getNext(); node; node = node->getNext() )
-			{
-				Int k;
-				Coord3D s, e;
-				Coord3D delta;
-				s = *node->getPosition();
-				e = *prevNode->getPosition();
-				delta.x = e.x-s.x;
-				delta.y = e.y-s.y;
-				delta.z = e.z-s.z;
-				for (k = 0; k<10; k++) {
-					Real factor1 = (k)/10.0;
-					Real factor2 = (k+1)/10.0;
-					s = *node->getPosition();
-					e = *node->getPosition();
-					s.x += delta.x*factor1;
-					s.y += delta.y*factor1;
-					s.z += delta.z*factor1;
-					e.x += delta.x*factor2;
-					e.y += delta.y*factor2;
-					e.z += delta.z*factor2;
-					Bool onScreen1 = worldToScreen( &e, &end );
-					Bool onScreen2 = worldToScreen( &s, &start );
-					if (!onScreen1 && !onScreen2) {
-						continue; // neither point visible.
-					}
-					ICoord2D clipStart, clipEnd;
-
-					if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) ) {
-						TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y, 1.0f, color );
-					}
-				}
-				prevNode = node;
-				if (node->getNext()) {
-					if (worldToScreen( node->getPosition(), &start )) {
- 						TheDisplay->drawLine( start.x-4, start.y, start.x+3, start.y, 1.0f, color );
-					}
-				}
-			}
-			if (prevNode && worldToScreen( prevNode->getPosition(), &start )) {
- 				TheDisplay->drawLine( start.x-4, start.y, start.x+3, start.y, 1.0f, color );
-				TheDisplay->drawLine( start.x, start.y-4, start.x, start.y+3, 1.0f, color );
-			}
-			color = 0xFFFF0000;  //0xAARRGGBB
-			if (worldToScreen( TheAI->pathfinder()->getDebugPathPosition(), &start )) {
-				TheDisplay->drawLine( start.x-3, start.y, start.x+3, start.y, 1.0f, color );
-				TheDisplay->drawLine( start.x, start.y-3, start.x, start.y+3, 1.0f, color );
-			}
-		}
-
-	}  // end if, show debug AI
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if( TheGlobalData->m_debugCamera )
-	{
-		UnsignedInt c = 0xaaffffff;
-		Coord3D worldPos = *getPosition();
-		worldPos.z = TheTerrainLogic->getGroundHeight(worldPos.x, worldPos.y);
-
-		Coord3D p1, p2;
-		ICoord2D s1, s2;
-		p1 = worldPos;
-		p1.x += TERRAIN_SAMPLE_SIZE;
-		p1.y += TERRAIN_SAMPLE_SIZE;
-		p1.z = TheTerrainLogic->getGroundHeight(p1.x, p1.y);
-		p2 = worldPos;
-		p2.x += TERRAIN_SAMPLE_SIZE;
-		p2.y -= TERRAIN_SAMPLE_SIZE;
-		p2.z = TheTerrainLogic->getGroundHeight(p2.x, p2.y);
-		worldToScreen( &p1, &s1 );
-		worldToScreen( &p2, &s2 );
-		TheDisplay->drawLine(s1.x, s1.y, s2.x, s2.y, 1.0f, c);
-
-		p1 = worldPos;
-		p1.x += TERRAIN_SAMPLE_SIZE;
-		p1.y -= TERRAIN_SAMPLE_SIZE;
-		p1.z = TheTerrainLogic->getGroundHeight(p1.x, p1.y);
-		p2 = worldPos;
-		p2.x -= TERRAIN_SAMPLE_SIZE;
-		p2.y -= TERRAIN_SAMPLE_SIZE;
-		p2.z = TheTerrainLogic->getGroundHeight(p2.x, p2.y);
-		worldToScreen( &p1, &s1 );
-		worldToScreen( &p2, &s2 );
-		TheDisplay->drawLine(s1.x, s1.y, s2.x, s2.y, 1.0f, c);
-
-		p1 = worldPos;
-		p1.x -= TERRAIN_SAMPLE_SIZE;
-		p1.y -= TERRAIN_SAMPLE_SIZE;
-		p1.z = TheTerrainLogic->getGroundHeight(p1.x, p1.y);
-		p2 = worldPos;
-		p2.x -= TERRAIN_SAMPLE_SIZE;
-		p2.y += TERRAIN_SAMPLE_SIZE;
-		p2.z = TheTerrainLogic->getGroundHeight(p2.x, p2.y);
-		worldToScreen( &p1, &s1 );
-		worldToScreen( &p2, &s2 );
-		TheDisplay->drawLine(s1.x, s1.y, s2.x, s2.y, 1.0f, c);
-
-		p1 = worldPos;
-		p1.x -= TERRAIN_SAMPLE_SIZE;
-		p1.y += TERRAIN_SAMPLE_SIZE;
-		p1.z = TheTerrainLogic->getGroundHeight(p1.x, p1.y);
-		p2 = worldPos;
-		p2.x += TERRAIN_SAMPLE_SIZE;
-		p2.y += TERRAIN_SAMPLE_SIZE;
-		p2.z = TheTerrainLogic->getGroundHeight(p2.x, p2.y);
-		worldToScreen( &p1, &s1 );
-		worldToScreen( &p2, &s2 );
-		TheDisplay->drawLine(s1.x, s1.y, s2.x, s2.y, 1.0f, c);
-
-	}
-
-  if ( TheGlobalData->m_showAudioLocations )
-  {
-    // Draw audio radii for ALL drawables, not just those on screen
-    const Drawable * drawable = TheGameClient->getDrawableList();
-
-    while ( drawable != NULL )
-    {
-      drawAudioRadii( drawable );
-      drawable = drawable->getNextDrawable();
-    }
-  }
-#endif // DEBUG or INTERNAL
-
-	Region3D axisAlignedRegion;
-	getAxisAlignedViewRegion(axisAlignedRegion);
-
-	//
-	// there are several things we might want to do as a post pass on the objects after
-	// they are all drawn
-	/// @todo we might want to consider wiping this iterate out if there is nothing to post draw
-	//
-	TheGameClient->resetRenderedObjectCount();
-	TheGameClient->iterateDrawablesInRegion( &axisAlignedRegion, drawablePostDraw, this );
-
-	TheGameClient->flushTextBearingDrawables();
-
-	// Render 2D scene
-	W3DDisplay::m_2DScene->doRender( m_2DCamera );
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::setCameraLock(ObjectID id)
-{		 
-	// If we're disabling camera movements, don't lock onto the object.
-	if (TheGlobalData->m_disableCameraMovement && id!=INVALID_ID) {
-		return;
-	}
-	View::setCameraLock(id);
-	m_doingScriptedCameraLock = FALSE;
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::setSnapMode( CameraLockType lockType, Real lockDist )
-{
-	View::setSnapMode(lockType, lockDist);
-	m_doingScriptedCameraLock = TRUE;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Scroll the view by the given delta in SCREEN COORDINATES, this interface 
-	* assumes we will be scrolling along the X,Y plane */
-//-------------------------------------------------------------------------------------------------
-void W3DView::scrollBy( Coord2D *delta )
-{
-	// if we haven't moved, ignore
-	if( delta && (delta->x != 0 || delta->y != 0) )
-	{
-		const Real SCROLL_RESOLUTION = 250.0f;
-
-		Vector3 world, worldStart, worldEnd;
-		Vector2 screen, start, end;
-
-		m_scrollAmount = *delta;
-
-		screen.X = delta->x;
-		screen.Y = delta->y;
-													  
-		start.X = getWidth();
-		start.Y = getHeight();
-		Real aspect = getHeight() == 0 ? 1 : getWidth()/getHeight();
-		end.X = start.X + delta->x * SCROLL_RESOLUTION;
-		end.Y = start.Y + delta->y * SCROLL_RESOLUTION*aspect;
-
-		m_3DCamera->Device_To_World_Space( start, &worldStart );
-		m_3DCamera->Device_To_World_Space( end, &worldEnd );
-
-		world.X = worldEnd.X - worldStart.X;
-		world.Y = worldEnd.Y - worldStart.Y;
-		world.Z = worldEnd.Z - worldStart.Z;
-
-		// scroll by delta
-		Coord3D pos = *getPosition();
-		pos.x += world.X;
-		pos.y += world.Y;
-		//DEBUG_LOG(("Delta %.2f, %.2f\n", world.X, world.Z));
-		// no change to z
-		setPosition(&pos);
-
-		//m_cameraConstraintValid = false;	// pos change does NOT invalidate cam constraints
-
-		m_doingRotateCamera = false;
-		// set new camera position
-		setCameraTransform();
-
-	}  // end if
-
-}  // end scrollBy
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::forceRedraw()
-{
-
-	// set the camera
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Rotate the view around the up axis to the given angle. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setAngle( Real angle )
-{
-	// Normalize to +-PI.
-	normAngle(angle);
-	// call our base class, we are adding functionality
-	View::setAngle( angle );
-
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_doingRotateCamera = false;
-	m_doingPitchCamera = false;
-	m_doingZoomCamera = false;
-	m_doingScriptedCameraLock = false;
-	// set the camera
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Rotate the view around the horizontal (X) axis to the given angle. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setPitch( Real angle )
-{
-	// call our base class, we are extending functionality
-	View::setPitch( angle );
-
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_doingRotateCamera = false;
-	m_doingPitchCamera = false;
-	m_doingZoomCamera = false;
-	m_doingScriptedCameraLock = false;
-	// set the camera
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Set the view angle & pitch back to default */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setAngleAndPitchToDefault( void )
-{ 
-	// call our base class, we are adding functionality
-	View::setAngleAndPitchToDefault();
-
-	this->m_FXPitch = 1.0;
-
-	// set the camera
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::setDefaultView(Real pitch, Real angle, Real maxHeight)
-{
-	// MDC - we no longer want to rotate maps (design made all of them right to begin with)
-	//	m_defaultAngle = angle * M_PI/180.0f;
-	m_defaultPitchAngle = pitch;
-	m_maxHeightAboveGround = TheGlobalData->m_maxCameraHeight*maxHeight;
-	if (m_minHeightAboveGround > m_maxHeightAboveGround)
-		m_maxHeightAboveGround = m_minHeightAboveGround;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::setHeightAboveGround(Real z)
-{
-	m_heightAboveGround = z;
-
-  // if our zoom is limited, we will stay within a predefined distance from the terrain
-	if( m_zoomLimited )
-	{
-
-		if (m_heightAboveGround < m_minHeightAboveGround)
-			m_heightAboveGround = m_minHeightAboveGround;
-
-		if (m_heightAboveGround > m_maxHeightAboveGround)
-			m_heightAboveGround = m_maxHeightAboveGround;
-
-	}  // end if
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_doingRotateCamera = false;
-	m_doingPitchCamera = false;
-	m_doingZoomCamera = false;
-	m_doingScriptedCameraLock = false;
-	m_cameraConstraintValid = false; // recalc it.
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::setZoom(Real z)
-{
-	m_zoom = z;
-
-	if (m_zoom < m_minZoom)
-		m_zoom = m_minZoom;
-
-	if (m_zoom > m_maxZoom)
-		m_zoom = m_maxZoom;
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_doingRotateCamera = false;
-	m_doingPitchCamera = false;
-	m_doingZoomCamera = false;
-	m_doingScriptedCameraLock = false;
-	m_cameraConstraintValid = false; // recalc it.
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::setZoomToDefault( void )
-{
-	// default zoom has to be max, otherwise players will just zoom to max always
-
-	// terrain height + desired height offset == cameraOffset * actual zoom
-	// find best approximation of max terrain height we can see
-	Real terrainHeightMax = getHeightAroundPos(m_pos.x, m_pos.y);
-
-	Real desiredHeight = (terrainHeightMax + m_maxHeightAboveGround);
-	Real desiredZoom = desiredHeight / m_cameraOffset.z;
-
-	m_mcwpInfo.cameraZoom[2] = desiredZoom;//m_maxZoom;
-	DEBUG_LOG(("W3DView::setZoomToDefault() Current zoom: %g  Desired zoom: %g\n", m_zoom, desiredZoom));
-
-	m_zoom = desiredZoom;
-	m_heightAboveGround = m_maxHeightAboveGround;
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_doingRotateCamera = false;
-	m_doingPitchCamera = false;
-	m_doingZoomCamera = false;
-	m_doingScriptedCameraLock = false;
-	m_cameraConstraintValid = false; // recalc it.
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Set the horizontal field of view angle */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setFieldOfView( Real angle )
-{
-	View::setFieldOfView( angle );
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	// this is only for testing, and recalculating the 
-	// camera every frame is wasteful
-	setCameraTransform();
-#endif
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Using the W3D camera translate the world coordinate to a screen coord.
-	Screen coordinates returned in absolute values relative to full display resolution.  
-  Returns if the point is on screen, off screen, or not transformable */
-//-------------------------------------------------------------------------------------------------
-View::WorldToScreenReturn W3DView::worldToScreenTriReturn( const Coord3D *w, ICoord2D *s )
-{
-	// sanity
-	if( w == NULL || s == NULL )
-    return WTS_INVALID;
-
-	if( m_3DCamera )
-	{
-		Vector3 world;
-		Vector3 screen;
-
-		world.Set( w->x, w->y, w->z );
-		enum CameraClass::ProjectionResType projection = m_3DCamera->Project( screen, world );
-		if (projection != CameraClass::INSIDE_FRUSTUM && projection!=CameraClass::OUTSIDE_FRUSTUM)
-		{
-			// Can't get a valid number if it's beyond the clip planes.  jba
-			s->x = 0;
-			s->y = 0;
-      return WTS_INVALID;
-		}
-
-		//
-		// note that the screen coord returned from the project W3D camera 
-		// gave us a screen coords that range from (-1,-1) bottom left to
-		// (1,1) top right ... we are turning that into (0,0) upper left
-		// coords now
-		//
-		W3DLogicalScreenToPixelScreen( screen.X, screen.Y,
-																	 &s->x, &s->y,
-																	 getWidth(), getHeight());
-		s->x += m_originX;	//convert viewport coordinates to full screen coordinates
-		s->y += m_originY;
-
-//		s->x = (getWidth()  * (screen.X + 1.0f)) / 2.0f;
-//		s->y = (getHeight() * (-screen.Y + 1.0f)) / 2.0f;
-		if (projection != CameraClass::INSIDE_FRUSTUM)
-		{
-      return WTS_OUTSIDE_FRUSTUM;
-		}
-
-    return WTS_INSIDE_FRUSTUM;
-
-	}  // end if
-
-  return WTS_INVALID;
-}  // end worldToScreenTriReturn
-
-//-------------------------------------------------------------------------------------------------
-/** Using the W3D camera translate the screen coord to world coord */
-//-------------------------------------------------------------------------------------------------
-void W3DView::screenToWorld( const ICoord2D *s, Coord3D *w )
-{
-
-	// sanity
-	if( s == NULL || w == NULL )
-		return;
-
-	if( m_3DCamera )
-	{
-		DEBUG_CRASH(("implement me"));
-	}  // end if
-
-}  // end screenToWorld
-
-//-------------------------------------------------------------------------------------------------
-/** all the drawables in the view, that fall within the 2D screen region
-	* will call the callback function.  The number of drawables that passed
-	* the test are returned.
-	Screen coordinates assumed in absolute values relative to full display resolution. */
-//-------------------------------------------------------------------------------------------------
-Int W3DView::iterateDrawablesInRegion( IRegion2D *screenRegion,
-																			 Bool (*callback)( Drawable *draw, void *userData ),
-																			 void *userData )
-{
-	Bool inside = FALSE;
-	Int count = 0;
-	Drawable *draw;
-	Vector3 screen, world;
-	Coord3D pos;
-	Region2D normalizedRegion;
-
-	/** @todo we need to have partitions of which drawables are in the
-	view so we don't have to march through the whole list */
-
-	//
-	// to do this we are projecting the drawable centers onto the screen,
-	// the W3D camera->project method is used to do this and that method
-	// will return normalized screen coords from (-1,-1) bottom left to 
-	// (1,1) top right, normalize our screen region for comparison
-	//
-	/// @todo use fast int->real type casts here later
-
-	Bool regionIsPoint = FALSE;
-
-	if( screenRegion )
-	{
-		if (screenRegion->height() == 0 && screenRegion->width() == 0)
-		{
-			regionIsPoint = TRUE;
-		} 
-
-		normalizedRegion.lo.x = ((Real)(screenRegion->lo.x - m_originX) / (Real)getWidth()) * 2.0f - 1.0f;
-		normalizedRegion.lo.y = -(((Real)(screenRegion->hi.y - m_originY) / (Real)getHeight()) * 2.0f - 1.0f);
-		normalizedRegion.hi.x = ((Real)(screenRegion->hi.x - m_originX) / (Real)getWidth()) * 2.0f - 1.0f;
-		normalizedRegion.hi.y = -(((Real)(screenRegion->lo.y - m_originY) / (Real)getHeight()) * 2.0f - 1.0f);
-
-	}  // end if
-
-
-	Drawable *onlyDrawableToTest = NULL;
-	if (regionIsPoint)
-	{
-		// Allow all drawables to be picked.
-		onlyDrawableToTest = pickDrawable(&screenRegion->lo, TRUE, (PickType) getPickTypesForContext(TheInGameUI->isInForceAttackMode()));
-		if (onlyDrawableToTest == NULL) {
-			return 0;
-		}
-	}
-
-	for( draw = TheGameClient->firstDrawable();
-			 draw;
-			 draw = draw->getNextDrawable() )
-	{
-		if (onlyDrawableToTest)
-		{
-		 draw = onlyDrawableToTest;
-		 inside = TRUE;
-		}
-		else
-		{
-
-			// not inside	
-			inside = FALSE;
-
-			// no screen region, means all drawbles
-			if( screenRegion == NULL )
-				inside = TRUE;
-			else
-			{
-
-				// project the center of the drawable to the screen
-				/// @todo use a real 3D position in the drawable
-				pos = *draw->getPosition();
-				world.X = pos.x;
-				world.Y = pos.y;
-				world.Z = pos.z;
-
-				// project the world point to the screen
-				if( m_3DCamera->Project( screen, world ) == CameraClass::INSIDE_FRUSTUM &&
-						screen.X >= normalizedRegion.lo.x && 
-						screen.X <= normalizedRegion.hi.x &&
-						screen.Y >= normalizedRegion.lo.y && 
-						screen.Y <= normalizedRegion.hi.y )
-				{
-
-					inside = TRUE;
-
-				}  // end if
-			}
-	
-		}  //end else
-
-		// if inside do the callback and count up
-		if( inside )
-		{
-			
-			if( callback( draw, userData ) )
-				++count;
-
-		}  // end if
-
-		// If onlyDrawableToTest, then we should bail out now.
-		if (onlyDrawableToTest != NULL)
-			break;
-
-	}  // end for draw
-
-	return count;
-
-}  // end iterateDrawablesInRegion
-
-//-------------------------------------------------------------------------------------------------
-/** cast a ray from the screen coords into the scene and return a drawable
-  * there if present. Screen coordinates assumed in absolute values relative
-  * to full display resolution. */
-//-------------------------------------------------------------------------------------------------
-Drawable *W3DView::pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType )
-{
-	RenderObjClass *renderObj = NULL;
-	Drawable *draw = NULL;
-	DrawableInfo *drawInfo = NULL;
-
-	// sanity
-	if( screen == NULL )
-		return NULL;
-
-	// don't pick a drawable if there is a window under the cursor
-	GameWindow *window = NULL;
-	if (TheWindowManager)
-		window = TheWindowManager->getWindowUnderCursor(screen->x, screen->y);
-
-	while (window)
-	{
-		// check to see if it or any of its parents are opaque.  If so, we can't select anything.
-		if (!BitIsSet( window->winGetStatus(), WIN_STATUS_SEE_THRU ))
-			return NULL;
-
-		window = window->winGetParent();
-	}
-
-	Vector3 rayStart,rayEnd;
-	getPickRay(screen,&rayStart,&rayEnd);
-
-	LineSegClass lineseg;
-	lineseg.Set(rayStart,rayEnd);
-
-	CastResultStruct result;
-
-	if (forceAttack) 
-		result.ComputeContactPoint = true;
-
-	//Don't check against translucent or hidden objects
-	RayCollisionTestClass raytest(lineseg,&result,COLL_TYPE_ALL,false,false);
-
-	if( W3DDisplay::m_3DScene->castRay( raytest, false, (Int)pickType ) )
-		renderObj = raytest.CollidedRenderObj;
-
-	// for right now there is no drawable data in a render object which is			 	// if we've found a render object, return our drawable associated with it,
-
-	// the terrain, therefore the userdata is NULL
-	/// @todo terrain and picking!
-	if( renderObj )
-		drawInfo = (DrawableInfo *)renderObj->Get_User_Data();
-	if (drawInfo)
-		draw=drawInfo->m_drawable;
-
-	return draw;
-
-}  // end pickDrawable
-
-//-------------------------------------------------------------------------------------------------
-/** convert a pixel (x,y) to a location in the world on the terrain.
-	Screen coordinates assumed in absolute values relative to full display resolution.  */
-//-------------------------------------------------------------------------------------------------
-void W3DView::screenToTerrain( const ICoord2D *screen, Coord3D *world )
-{
-	// sanity
-	if( screen == NULL || world == NULL || TheTerrainRenderObject == NULL )
-		return;
-
-	if (m_cameraHasMovedSinceRequest) {
-		m_locationRequests.clear();
-		m_cameraHasMovedSinceRequest = false;
-	}
-
-	if (m_locationRequests.size() > MAX_REQUEST_CACHE_SIZE) {
-		m_locationRequests.erase(m_locationRequests.begin(), m_locationRequests.begin() + 10);
-	}
-
-
-	// We insert them at the end for speed (no copies needed), but using the princ of locality, we should 
-	// start searching where we most recently inserted
-	for (int i = m_locationRequests.size() - 1; i >= 0; --i) {
-		if (m_locationRequests[i].first.x == screen->x && m_locationRequests[i].first.y == screen->y) {
-			(*world) = m_locationRequests[i].second;
-			return;
-		}
-	}
-
-	Vector3 rayStart,rayEnd;
-	LineSegClass lineseg;
-	CastResultStruct result;
-	Vector3 intersection(0,0,0);
-
-	getPickRay(screen,&rayStart,&rayEnd);
-
-	lineseg.Set(rayStart,rayEnd);
-
-	RayCollisionTestClass raytest(lineseg,&result);
-
-	if( TheTerrainRenderObject->Cast_Ray(raytest) )
-	{
-		// get the point of intersection according to W3D
-		intersection = result.ContactPoint;
-		
-	}  // end if
-
-	// Pick bridges.  
-	Vector3 bridgePt;
-	Drawable *bridge = TheTerrainLogic->pickBridge(rayStart, rayEnd, &bridgePt);
-	if (bridge && bridgePt.Z > intersection.Z) {
-		intersection = bridgePt;
-	}
-
-	world->x = intersection.X;
-	world->y = intersection.Y;
-	world->z = intersection.Z;
-
-	PosRequest req;
-	req.first = (*screen);
-	req.second = (*world);
-	m_locationRequests.push_back(req);	// Insert this request at the end, requires no extra copies
-
-}  // end screenToTerrain
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::lookAt( const Coord3D *o ) 
-{
-	Coord3D pos = *o;
-
-
-// no, don't call the super-lookAt, since it will munge our coords
-// as for a 2d view. just call setPosition.
-//View::lookAt(&pos);
-
-	if (o->z > PATHFIND_CELL_SIZE_F+TheTerrainLogic->getGroundHeight(pos.x, pos.y)) {
-		// Pos.z is not used, so if we want to look at something off the ground, 
-		// we have to look at the spot on the ground such that the object intersects
-		// with the look at vector in the center of the screen.  jba.
-		Vector3 rayStart,rayEnd;
-		LineSegClass lineseg;
-		CastResultStruct result;
-		Vector3 intersection(0,0,0);
-
-		rayStart = m_3DCamera->Get_Position();	//get camera location
-		m_3DCamera->Un_Project(rayEnd,Vector2(0.0f,0.0f));	//get world space point
-		rayEnd -= rayStart;	//vector camera to world space point
-		rayEnd.Normalize();	//make unit vector
-		rayEnd *= m_3DCamera->Get_Depth();	//adjust length to reach far clip plane
-		rayStart.Set(pos.x, pos.y, pos.z);
-		rayEnd += rayStart;	//get point on far clip plane along ray from camera.
-		lineseg.Set(rayStart,rayEnd);
-
-		RayCollisionTestClass raytest(lineseg,&result);
-
-		if( TheTerrainRenderObject->Cast_Ray(raytest) )
-		{
-			// get the point of intersection according to W3D
-			pos.x = result.ContactPoint.X;
-			pos.y = result.ContactPoint.Y;
-			
-		}  // end if
-	}			 
-	pos.z = 0;
-	setPosition(&pos); 
-	m_doingRotateCamera = false;
-	m_doingMoveCameraOnWaypointPath = false;
-	m_doingScriptedCameraLock = false;
-
-	setCameraTransform();
-
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::initHeightForMap( void ) 
-{
-	m_groundLevel = TheTerrainLogic->getGroundHeight(m_pos.x, m_pos.y);
-	const Real MAX_GROUND_LEVEL = 120.0; // jba - starting ground level can't exceed this height.
-	if (m_groundLevel>MAX_GROUND_LEVEL) {
-		m_groundLevel = MAX_GROUND_LEVEL;
-	}
-
-	m_cameraOffset.z = m_groundLevel+TheGlobalData->m_cameraHeight;
-	m_cameraOffset.y = -(m_cameraOffset.z / tan(TheGlobalData->m_cameraPitch * (PI / 180.0)));
-	m_cameraOffset.x = -(m_cameraOffset.y * tan(TheGlobalData->m_cameraYaw * (PI / 180.0)));
-	m_cameraConstraintValid = false;	// possible ground level change invalidates cam constraints
-	setCameraTransform();
-
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Move camera to in an interesting fashion.  Sets up parameters that get
- * evaluated in draw(). */
-//-------------------------------------------------------------------------------------------------
-void W3DView::moveCameraTo(const Coord3D *o, Int milliseconds, Int shutter, Bool orient)
-{
-	m_mcwpInfo.waypoints[0] = *getPosition();	
-	m_mcwpInfo.cameraAngle[0] = getAngle();	
-	m_mcwpInfo.waySegLength[0] = 0;	
-
-	m_mcwpInfo.waypoints[1] = *getPosition();	
-	m_mcwpInfo.waySegLength[1] = 0;	
-
-	m_mcwpInfo.waypoints[2] = *o;	
-	m_mcwpInfo.waySegLength[2] = 0;	
-
-	m_mcwpInfo.numWaypoints = 2;
-	if (milliseconds<1) milliseconds = 1;
-	m_mcwpInfo.totalTimeMilliseconds = milliseconds;
-	m_mcwpInfo.shutter = 1;
-	m_mcwpInfo.curSegment = 1;
-	m_mcwpInfo.curSegDistance = 0;
-	m_mcwpInfo.totalDistance = 0;
-
-	setupWaypointPath(orient);
-	if (m_mcwpInfo.totalTimeMilliseconds==1) {
-		// do it instantly.
-		moveAlongWaypointPath(1);
-		m_doingMoveCameraOnWaypointPath = true;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Rotate the camera */
-//-------------------------------------------------------------------------------------------------
-void W3DView::rotateCamera(Real rotations, Int milliseconds)
-{
-	m_rcInfo.numHoldFrames = 0;
-	m_rcInfo.trackObject = FALSE;
-
-	if (milliseconds<1) milliseconds = 1;
-	m_rcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
-	if (m_rcInfo.numFrames < 1) {
-		m_rcInfo.numFrames = 1;
-	}
-	m_rcInfo.curFrame = 0;
-	m_doingRotateCamera = true;
-	m_rcInfo.angle = 2*PI*rotations/m_rcInfo.numFrames;
-	m_rcInfo.startTimeMultiplier = m_timeMultiplier;
-	m_rcInfo.endTimeMultiplier = m_timeMultiplier;
-
-	m_doingMoveCameraOnWaypointPath = false;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Rotate the camera to follow a unit */
-//-------------------------------------------------------------------------------------------------
-void W3DView::rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds)
-{
-	m_rcInfo.trackObject = TRUE;
-	if (holdMilliseconds<1) holdMilliseconds = 0;
-	m_rcInfo.numHoldFrames = holdMilliseconds/TheW3DFrameLengthInMsec;
-	if (m_rcInfo.numHoldFrames < 1) {
-		m_rcInfo.numHoldFrames = 0;
-	}
-
-	if (milliseconds<1) milliseconds = 1;
-	m_rcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
-	if (m_rcInfo.numFrames < 1) {
-		m_rcInfo.numFrames = 1;
-	}
-	m_rcInfo.curFrame = 0;
-	m_doingRotateCamera = true;
-	m_rcInfo.angle = m_angle; // not used here
-	m_rcInfo.targetObjectID = id;
-	m_rcInfo.startTimeMultiplier = m_timeMultiplier;
-	m_rcInfo.endTimeMultiplier = m_timeMultiplier;
-
-	m_doingMoveCameraOnWaypointPath = false;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Rotate camera to face a location */
-//-------------------------------------------------------------------------------------------------
-void W3DView::rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds)
-{
-	m_rcInfo.numHoldFrames = 0;
-	m_rcInfo.trackObject = FALSE;
-
-
-	if (milliseconds<1) milliseconds = 1;
-	m_rcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
-	if (m_rcInfo.numFrames < 1) {
-		m_rcInfo.numFrames = 1;
-	}
-	Coord3D curPos = *getPosition();
-	Vector3 dir(pLoc->x-curPos.x, pLoc->y-curPos.y, 0);
-	if (dir.Length()<0.1) return;
-	dir.Normalize();
-	Real angle = WWMath::Acos(dir.X);
-	if (dir.Y<0) {
-		angle = -angle;
-	}
-	// Default camera is rotated 90 degrees, so match.
-	angle -= PI/2;
-	normAngle(angle);
-
-	m_rcInfo.curFrame = 0;
-	m_doingRotateCamera = true;
-	m_rcInfo.angle = angle/m_rcInfo.numFrames; // not used here
-	m_rcInfo.targetObjectID = INVALID_ID;
-	m_rcInfo.startTimeMultiplier = m_timeMultiplier;
-	m_rcInfo.endTimeMultiplier = m_timeMultiplier;
-
-	m_doingMoveCameraOnWaypointPath = false;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::zoomCamera( Real finalZoom, Int milliseconds )
-{
-	if (milliseconds<1) milliseconds = 1;
-	m_zcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
-	if (m_zcInfo.numFrames < 1) {
-		m_zcInfo.numFrames = 1;
-	}
-	m_zcInfo.curFrame = 0;
-	m_doingZoomCamera = TRUE;
-	m_zcInfo.startZoom = m_zoom;
-	m_zcInfo.endZoom = finalZoom;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::pitchCamera( Real finalPitch, Int milliseconds )
-{
-	if (milliseconds<1) milliseconds = 1;
-	m_pcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
-	if (m_pcInfo.numFrames < 1) {
-		m_pcInfo.numFrames = 1;
-	}
-	m_pcInfo.curFrame = 0;
-	m_doingPitchCamera = TRUE;
-	m_pcInfo.startPitch = m_FXPitch;
-	m_pcInfo.endPitch = finalPitch;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Sets the final zoom for a camera movement. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::cameraModFinalZoom( Real finalZoom ) 
-{
-
-	if (m_doingRotateCamera) 
-	{
-		Real terrainHeightMax = getHeightAroundPos(m_pos.x, m_pos.y);
-		Real maxHeight = (terrainHeightMax + m_maxHeightAboveGround);
-		Real maxZoom = maxHeight / m_cameraOffset.z;
-
-		zoomCamera( finalZoom*maxZoom, (m_rcInfo.numFrames + m_rcInfo.numHoldFrames - m_rcInfo.curFrame)*TheW3DFrameLengthInMsec );
-	}
-	if (m_doingMoveCameraOnWaypointPath) 
-	{
-		Coord3D pos = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-		Real terrainHeightMax = getHeightAroundPos(pos.x, pos.y);
-		Real maxHeight = (terrainHeightMax + m_maxHeightAboveGround);
-		Real maxZoom = maxHeight / m_cameraOffset.z;
-
-		zoomCamera( finalZoom*maxZoom, m_mcwpInfo.totalTimeMilliseconds - m_mcwpInfo.elapsedTimeMilliseconds );
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Sets the final zoom for a camera movement. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::cameraModFreezeAngle(void) 
-{
-	if (m_doingRotateCamera) {
-		m_rcInfo.angle = 0; // Silly, but consistent.
-		m_rcInfo.targetObjectID = INVALID_ID;
-	}
-	if (m_doingMoveCameraOnWaypointPath) {
-		Int i;
-//		Real curDistance = 0;
-		for (i=0; i<m_mcwpInfo.numWaypoints; i++) {
-			m_mcwpInfo.cameraAngle[i+1] = m_mcwpInfo.cameraAngle[0];
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Sets the look toward point for a camera movement. */
-// ------------------------------------------------------------------------------------------------
-void W3DView::cameraModLookToward(Coord3D *pLoc) 
-{
-	if (m_doingRotateCamera) {
-		return; // Doesn't apply to rotate about a point.
-	}
-	if (m_doingMoveCameraOnWaypointPath) {
-		Int i;
-//		Real curDistance = 0;
-		for (i=2; i<=m_mcwpInfo.numWaypoints; i++) {
-			Coord3D start, mid, end;
-			Real factor = 0.5;
-			start = m_mcwpInfo.waypoints[i-1];
-			start.x += m_mcwpInfo.waypoints[i].x;
-			start.y += m_mcwpInfo.waypoints[i].y;
-			start.x /= 2;
-			start.y /= 2;
-			mid = m_mcwpInfo.waypoints[i];
-			end = m_mcwpInfo.waypoints[i];
-			end.x += m_mcwpInfo.waypoints[i+1].x;
-			end.y += m_mcwpInfo.waypoints[i+1].y;
-			end.x /= 2;
-			end.y /= 2;
-			Coord3D result = start;
-			result.x += factor*(end.x-start.x);
-			result.y += factor*(end.y-start.y);
-			result.x += (1-factor)*factor*(mid.x-end.x + mid.x-start.x);
-			result.y += (1-factor)*factor*(mid.y-end.y + mid.y-start.y);
-			result.z = 0;
-			Vector3 dir(pLoc->x-result.x, pLoc->y-result.y, 0);
-			if (dir.Length()<0.1) continue;
-			dir.Normalize();
-			Real angle = WWMath::Acos(dir.X);
-			if (dir.Y<0) {
-				angle = -angle;
-			}
-			// Default camera is rotated 90 degrees, so match.
-			angle -= PI/2;
-			normAngle(angle);
-			m_mcwpInfo.cameraAngle[i] = angle;
-		}
-		if (m_mcwpInfo.totalTimeMilliseconds==1) {
-			// do it instantly.
-			moveAlongWaypointPath(1);
-			m_doingMoveCameraOnWaypointPath = true;
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Sets the look toward point for the end of a camera movement. */
-// ------------------------------------------------------------------------------------------------
-void W3DView::cameraModFinalMoveTo(Coord3D *pLoc) 
-{
-	if (m_doingRotateCamera) {
-		return; // Doesn't apply to rotate about a point.
-	}
-	if (m_doingMoveCameraOnWaypointPath) {
-		Int i;
-		Coord3D start, delta;
-		start = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-		delta.x = pLoc->x - start.x;
-		delta.y = pLoc->y - start.y;
-		for (i=2; i<=m_mcwpInfo.numWaypoints; i++) {
-			Coord3D result = m_mcwpInfo.waypoints[i];
-			result.x += delta.x;
-			result.y += delta.y;
-			m_mcwpInfo.waypoints[i] = result;
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Sets the look toward point for the end of a camera movement. */
-// ------------------------------------------------------------------------------------------------
-void W3DView::cameraModFinalLookToward(Coord3D *pLoc) 
-{
-	if (m_doingRotateCamera) {
-		return; // Doesn't apply to rotate about a point.
-	}
-	if (m_doingMoveCameraOnWaypointPath) {
-		Int i;
-		Int min = m_mcwpInfo.numWaypoints-1;
-		if (min<2) min=2;
-//		Real curDistance = 0;
-		for (i=min; i<=m_mcwpInfo.numWaypoints; i++) {
-			Coord3D start, mid, end;
-			Real factor = 0.5;
-			start = m_mcwpInfo.waypoints[i-1];
-			start.x += m_mcwpInfo.waypoints[i].x;
-			start.y += m_mcwpInfo.waypoints[i].y;
-			start.x /= 2;
-			start.y /= 2;
-			mid = m_mcwpInfo.waypoints[i];
-			end = m_mcwpInfo.waypoints[i];
-			end.x += m_mcwpInfo.waypoints[i+1].x;
-			end.y += m_mcwpInfo.waypoints[i+1].y;
-			end.x /= 2;
-			end.y /= 2;
-			Coord3D result = start;
-			result.x += factor*(end.x-start.x);
-			result.y += factor*(end.y-start.y);
-			result.x += (1-factor)*factor*(mid.x-end.x + mid.x-start.x);
-			result.y += (1-factor)*factor*(mid.y-end.y + mid.y-start.y);
-			result.z = 0;
-			Vector3 dir(pLoc->x-result.x, pLoc->y-result.y, 0);
-			if (dir.Length()<0.1) continue;
-			dir.Normalize();
-			Real angle = WWMath::Acos(dir.X);
-			if (dir.Y<0) {
-				angle = -angle;
-			}
-			// Default camera is rotated 90 degrees, so match.
-			angle -= PI/2;
-			normAngle(angle);
-			if (i==m_mcwpInfo.numWaypoints) { 
-				m_mcwpInfo.cameraAngle[i] = angle;
-			} else {
-				Real deltaAngle = angle - m_mcwpInfo.cameraAngle[i];
-				normAngle(deltaAngle);
-				angle = m_mcwpInfo.cameraAngle[i] + deltaAngle/2;
-				normAngle(angle);
-				m_mcwpInfo.cameraAngle[i] = angle;
-			}
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Sets the final time multiplier for a camera movement. */
-// ------------------------------------------------------------------------------------------------
-void W3DView::cameraModFinalTimeMultiplier(Int finalMultiplier) 
-{
-	if (m_doingZoomCamera)
-		m_zcInfo.endTimeMultiplier = finalMultiplier;
-	if (m_doingPitchCamera)
-		m_pcInfo.endTimeMultiplier = finalMultiplier;
-	if (m_doingRotateCamera) {
-		m_rcInfo.endTimeMultiplier = finalMultiplier;
-	} else if (m_doingMoveCameraOnWaypointPath) {
-		Int i;
-		Real curDistance = 0;
-		for (i=0; i<m_mcwpInfo.numWaypoints; i++) {
-			curDistance += m_mcwpInfo.waySegLength[i];
-			Real factor2 = curDistance / m_mcwpInfo.totalDistance;
-			Real factor1 = 1.0-factor2;
-			m_mcwpInfo.timeMultiplier[i+1] = REAL_TO_INT_FLOOR(0.5+m_mcwpInfo.timeMultiplier[i+1]*factor1 + finalMultiplier*factor2);
-		}
-	} else {
-		// If we aren't doing a camera movement, just set the time.
-		m_timeMultiplier = finalMultiplier;
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Sets the number of frames to average motion for a camera movement */
-// ------------------------------------------------------------------------------------------------
-void W3DView::cameraModRollingAverage(Int framesToAverage) 
-{
-	if (framesToAverage < 1) framesToAverage = 1;
-	m_mcwpInfo.rollingAverageFrames = framesToAverage;
-}
- 
-// ------------------------------------------------------------------------------------------------
-/** Sets the final pitch for a camera movement. */
-// ------------------------------------------------------------------------------------------------
-void W3DView::cameraModFinalPitch(Real finalPitch) {
-	if (m_doingRotateCamera) {
-		pitchCamera( finalPitch, ((m_rcInfo.numFrames + m_rcInfo.numHoldFrames) - m_rcInfo.curFrame) * TheW3DFrameLengthInMsec );
-	}
-	if (m_doingMoveCameraOnWaypointPath) {
-		pitchCamera( finalPitch, m_mcwpInfo.totalTimeMilliseconds - m_mcwpInfo.elapsedTimeMilliseconds );
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Move camera to a waypoint, resetting the default angle, pitch & zoom along the way.. */
-// ------------------------------------------------------------------------------------------------
-void W3DView::resetCamera(const Coord3D *location, Int milliseconds)
-{
-	moveCameraTo(location, milliseconds, 0, false);
-	m_mcwpInfo.cameraAngle[2] = 0.0; // default angle.
-	m_angle = m_mcwpInfo.cameraAngle[0];
-	m_mcwpInfo.cameraFXPitch[2] = 1.0;
-
-	// terrain height + desired height offset == cameraOffset * actual zoom
-	// find best approximation of max terrain height we can see
-	//Real terrainHeightMax = getHeightAroundPos(m_pos.x, m_pos.y);
-	Real terrainHeightMax = getHeightAroundPos(location->x, location->y);
-
-	Real desiredHeight = (terrainHeightMax + m_maxHeightAboveGround);
-	Real desiredZoom = desiredHeight / m_cameraOffset.z;
-
-	m_mcwpInfo.cameraZoom[2] = desiredZoom;//m_maxZoom;
-
-	//Real terrainHeightMax = getHeightAroundPos(location->x, location->y);
-	//Real desiredHeight = (terrainHeightMax + m_maxHeightAboveGround);
-	//Real desiredZoom = desiredHeight / m_cameraOffset.z;
-	zoomCamera( desiredZoom, milliseconds );	// this isn't right... or is it?
-
-	pitchCamera( 1.0, milliseconds );
-	DEBUG_LOG(("W3DView::resetCamera() Current zoom: %g  Desired zoom: %g  Current pitch: %g  Desired pitch: %g\n",
-		m_zoom, desiredZoom, m_pitchAngle, m_defaultPitchAngle));
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-Bool W3DView::isCameraMovementFinished(void)
-{
-	if (m_viewFilter == FT_VIEW_MOTION_BLUR_FILTER) {
-		// Several of the motion blur effects are similar to camera movements.
-		if (m_viewFilterMode == FM_VIEW_MB_IN_AND_OUT_ALPHA ||
-				m_viewFilterMode == FM_VIEW_MB_IN_AND_OUT_SATURATE ||
-				m_viewFilterMode == FM_VIEW_MB_IN_ALPHA ||
-				m_viewFilterMode == FM_VIEW_MB_OUT_ALPHA ||
-				m_viewFilterMode == FM_VIEW_MB_IN_SATURATE ||
-				m_viewFilterMode == FM_VIEW_MB_OUT_SATURATE ) {
-			return true;
-		}
-	}
-	return !m_doingMoveCameraOnWaypointPath && !m_doingRotateCamera && !m_doingPitchCamera && !m_doingZoomCamera;
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Move camera along a waypoint path in an interesting fashion.  Sets up parameters that get
- * evaluated in draw(). */
- // ------------------------------------------------------------------------------------------------
-void W3DView::moveCameraAlongWaypointPath(Waypoint *pWay, Int milliseconds, Int shutter, Bool orient)
-{
-	const Real MIN_DELTA = MAP_XY_FACTOR;
-
-	m_mcwpInfo.waypoints[0] = *getPosition();	
-	m_mcwpInfo.cameraAngle[0] = getAngle();	
-	m_mcwpInfo.waySegLength[0] = 0;	
-	m_mcwpInfo.waypoints[1] = *getPosition();	
-	m_mcwpInfo.numWaypoints = 1;
-	if (milliseconds<1) milliseconds = 1;
-	m_mcwpInfo.totalTimeMilliseconds = milliseconds;
-	m_mcwpInfo.shutter = shutter/TheW3DFrameLengthInMsec;
-	if (m_mcwpInfo.shutter<1) m_mcwpInfo.shutter = 1;
-
-	while (pWay && m_mcwpInfo.numWaypoints <MAX_WAYPOINTS) {
-		m_mcwpInfo.numWaypoints++;
-		m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints] = *pWay->getLocation();
-		if (pWay->getNumLinks()>0) {
-			pWay = pWay->getLink(0);
-		} else {
-			pWay = NULL;
-		}	
-		Vector3 dir(m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints].x-m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints-1].x, m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints].y-m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints-1].y, 0);
-		if (dir.Length()<MIN_DELTA) {
-			if (pWay) {
-				m_mcwpInfo.numWaypoints--; // drop this one.
-			} else {
-				m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints-1] = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-				m_mcwpInfo.numWaypoints--; // Push this one back.
-			}
-		}
-	}
-	setupWaypointPath(orient);
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Calculates angles and distances for moving along a waypoint path.  Sets up parameters that get
- * evaluated in draw(). */
-// ------------------------------------------------------------------------------------------------
-void W3DView::setupWaypointPath(Bool orient)
-{
-	m_mcwpInfo.curSegment = 1;
-	m_mcwpInfo.curSegDistance = 0;
-	m_mcwpInfo.totalDistance = 0;
-	m_mcwpInfo.rollingAverageFrames = 1;
-	Int i;
-	for (i=1; i<m_mcwpInfo.numWaypoints; i++) {
-		Vector3 dir(m_mcwpInfo.waypoints[i+1].x-m_mcwpInfo.waypoints[i].x, m_mcwpInfo.waypoints[i+1].y-m_mcwpInfo.waypoints[i].y, 0);
-		m_mcwpInfo.waySegLength[i] = dir.Length();
-		m_mcwpInfo.totalDistance += m_mcwpInfo.waySegLength[i];
-		dir.Normalize();
-		Real angle = getAngle();
-		if (orient) {
-			angle = WWMath::Acos(dir.X);
-			if (dir.Y<0) {
-				angle = -angle;
-			}
-
-			// Default camera is rotated 90 degrees, so match.
-			angle -= PI/2;
-			normAngle(angle);
-		}
-		//DEBUG_LOG(("Original Index %d, angle %.2f\n", i, angle*180/PI));
-		m_mcwpInfo.cameraAngle[i] = angle;
-	}
-	m_mcwpInfo.cameraAngle[1] = getAngle();	
-	m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints] = m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints-1];	
-	for (i=m_mcwpInfo.numWaypoints-1; i>1; i--) {
-		m_mcwpInfo.cameraAngle[i] = (m_mcwpInfo.cameraAngle[i] + m_mcwpInfo.cameraAngle[i-1]) / 2;  
-	}
-	m_mcwpInfo.waySegLength[m_mcwpInfo.numWaypoints+1] = m_mcwpInfo.waySegLength[m_mcwpInfo.numWaypoints+1];	
-	if (m_mcwpInfo.totalDistance<1.0) {
-		m_mcwpInfo.waySegLength[m_mcwpInfo.numWaypoints-1] += 1.0-m_mcwpInfo.totalDistance;
-		m_mcwpInfo.totalDistance = 1.0;
-	}
-	Real curDistance = 0;
-	Coord3D finalPos = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-	Real newGround = TheTerrainLogic->getGroundHeight(finalPos.x, finalPos.y);
-	for (i=0; i<=m_mcwpInfo.numWaypoints+1; i++) {
-		Real factor2 = curDistance / m_mcwpInfo.totalDistance;
-		Real factor1 = 1.0-factor2;
-		m_mcwpInfo.cameraFXPitch[i] = m_FXPitch;
-		m_mcwpInfo.cameraZoom[i] = m_zoom;
-		m_mcwpInfo.timeMultiplier[i] = m_timeMultiplier;
-		m_mcwpInfo.groundHeight[i] = m_groundLevel*factor1 + newGround*factor2;
-		curDistance += m_mcwpInfo.waySegLength[i];
-		//DEBUG_LOG(("New Index %d, angle %.2f\n", i, m_mcwpInfo.cameraAngle[i]*180/PI));
-	}
-
-	// Pad the end.
-	m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints+1] = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-	Coord3D cur = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-	Coord3D prev = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints-1];
-	m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints+1].x += cur.x-prev.x;
-	m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints+1].y += cur.y-prev.y;
-	m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints+1] = m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints];	
-	m_mcwpInfo.groundHeight[m_mcwpInfo.numWaypoints+1] = newGround;	
-
-
-	cur = m_mcwpInfo.waypoints[2];
-	prev = m_mcwpInfo.waypoints[1];
-	m_mcwpInfo.waypoints[0].x -= cur.x-prev.x;
-	m_mcwpInfo.waypoints[0].y -= cur.y-prev.y;
-
-	m_doingMoveCameraOnWaypointPath = m_mcwpInfo.numWaypoints>1;
-	m_doingRotateCamera = false;
-
-	m_mcwpInfo.elapsedTimeMilliseconds = 0;
-	m_mcwpInfo.curShutter = m_mcwpInfo.shutter;
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-static Real makeQuadraticS(Real t) 
-{
-	// for t = linear 0-1, convert to quadratic s where 0==0, 0.5==0.5 && 1.0 == 1.0.
-	Real tPrime = t;
-	if (t<0.5) {
-		tPrime = 0.5 * (2*t*2*t);
-	} else {
-		tPrime = (t-0.5)*2;
-		tPrime = WWMath::Sqrt(tPrime);
-		tPrime = 0.5 + 0.5*(tPrime);
-	}
-	return tPrime*0.5 + t*0.5;
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::rotateCameraOneFrame(void)
-{
-	m_rcInfo.curFrame++;
-	if (TheGlobalData->m_disableCameraMovement) {
-		if (m_rcInfo.curFrame >= m_rcInfo.numFrames + m_rcInfo.numHoldFrames) {
-			m_doingRotateCamera = false;
-			m_freezeTimeForCameraMovement = false;
-		}
-		return;
-	}
-
-	if (m_rcInfo.curFrame <= m_rcInfo.numFrames)
-	{
-		// not just holding; do the camera adjustment
-		Real factor = ((Real)m_rcInfo.curFrame)/m_rcInfo.numFrames;
-		if (m_rcInfo.trackObject)
-		{
-			const Object *obj = TheGameLogic->findObjectByID(m_rcInfo.targetObjectID);
-			if (obj)
-			{
-				// object has not been destroyed
-				m_rcInfo.targetObjectPos = *obj->getPosition();
-			}
-
-			Vector3 dir(m_rcInfo.targetObjectPos.x - m_pos.x, m_rcInfo.targetObjectPos.y - m_pos.y, 0);
-			if (dir.Length()>=0.1)
-			{
-				dir.Normalize();
-				Real angle = WWMath::Acos(dir.X);
-				if (dir.Y<0) {
-					angle = -angle;
-				}
-				// Default camera is rotated 90 degrees, so match.
-				angle -= PI/2;
-				normAngle(angle);
-
-				factor = 1.0f / (m_rcInfo.numFrames - m_rcInfo.curFrame + 1);
-				Real angleDiff = (angle - m_angle);
-				normAngle(angleDiff);
-				angleDiff *= factor;
-
-				m_angle += angleDiff;
-			}
-		}
-		else
-		{
-			m_angle += m_rcInfo.angle;
-		}
-		//m_zoom = m_rcInfo.startZoom + (m_rcInfo.endZoom-m_rcInfo.startZoom)*factor;
-		//m_FXPitch = m_rcInfo.startPitch + (m_rcInfo.endPitch-m_rcInfo.startPitch)*factor;
-		normAngle(m_angle);
-		//DEBUG_LOG(("\tm_angle:%g\n", m_angle));
-		m_timeMultiplier = m_rcInfo.startTimeMultiplier + REAL_TO_INT_FLOOR(0.5 + (m_rcInfo.endTimeMultiplier-m_rcInfo.startTimeMultiplier)*factor);
-	}
-	else if (m_rcInfo.curFrame <= m_rcInfo.numFrames + m_rcInfo.numHoldFrames && m_rcInfo.trackObject)
-	{
-		const Object *obj = TheGameLogic->findObjectByID(m_rcInfo.targetObjectID);
-		if (obj)
-		{
-			// object has not been destroyed
-			m_rcInfo.targetObjectPos = *obj->getPosition();
-		}
-
-		Vector3 dir(m_rcInfo.targetObjectPos.x - m_pos.x, m_rcInfo.targetObjectPos.y - m_pos.y, 0);
-		if (dir.Length()>=0.1)
-		{
-			dir.Normalize();
-			Real angle = WWMath::Acos(dir.X);
-			if (dir.Y<0) {
-				angle = -angle;
-			}
-			// Default camera is rotated 90 degrees, so match.
-			angle -= PI/2;
-			normAngle(angle);
-			m_angle = angle;
-		}
-	}
-
-
-	if (m_rcInfo.curFrame >= m_rcInfo.numFrames + m_rcInfo.numHoldFrames) {
-		m_doingRotateCamera = false;
-		m_freezeTimeForCameraMovement = false;
-		//m_zoom = m_rcInfo.endZoom;
-		//m_FXPitch = m_rcInfo.endPitch;
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::zoomCameraOneFrame(void)
-{
-	m_zcInfo.curFrame++;
-	if (TheGlobalData->m_disableCameraMovement) {
-		if (m_zcInfo.curFrame >= m_zcInfo.numFrames) {
-			m_doingZoomCamera = false;
-		}
-		return;
-	}
-	if (m_zcInfo.curFrame <= m_zcInfo.numFrames)
-	{
-		// not just holding; do the camera adjustment
-		Real factor = ((Real)m_zcInfo.curFrame)/m_zcInfo.numFrames;
-		m_zoom = m_zcInfo.startZoom + (m_zcInfo.endZoom-m_zcInfo.startZoom)*factor;
-	}
-
-	if (m_zcInfo.curFrame >= m_zcInfo.numFrames) {
-		m_doingZoomCamera = false;
-		m_zoom = m_zcInfo.endZoom;
-	}
-
-	//DEBUG_LOG(("W3DView::zoomCameraOneFrame() - m_zoom = %g\n", m_zoom));
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::pitchCameraOneFrame(void)
-{
-	m_pcInfo.curFrame++;
-	if (TheGlobalData->m_disableCameraMovement) {
-		if (m_pcInfo.curFrame >= m_pcInfo.numFrames) {
-			m_doingPitchCamera = false;
-		}
-		return;
-	}
-	if (m_pcInfo.curFrame <= m_pcInfo.numFrames)
-	{
-		// not just holding; do the camera adjustment
-		Real factor = ((Real)m_pcInfo.curFrame)/m_pcInfo.numFrames;
-		m_FXPitch = m_pcInfo.startPitch + (m_pcInfo.endPitch-m_pcInfo.startPitch)*factor;
-	}
-
-	if (m_pcInfo.curFrame >= m_pcInfo.numFrames) {
-		m_doingPitchCamera = false;
-		m_FXPitch = m_pcInfo.endPitch;
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::moveAlongWaypointPath(Int milliseconds)
-{
-	m_mcwpInfo.elapsedTimeMilliseconds += milliseconds;
-	if (TheGlobalData->m_disableCameraMovement) {
-		if (m_mcwpInfo.elapsedTimeMilliseconds>m_mcwpInfo.totalTimeMilliseconds) {
-			m_doingMoveCameraOnWaypointPath = false;
-			m_freezeTimeForCameraMovement = false;
-		}
-		return;
-	}
-	if (m_mcwpInfo.elapsedTimeMilliseconds>m_mcwpInfo.totalTimeMilliseconds) {
-		m_doingMoveCameraOnWaypointPath = false;
-		m_freezeTimeForCameraMovement = false;
-		m_angle = m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints];
-		//m_zoom = m_mcwpInfo.cameraZoom[m_mcwpInfo.numWaypoints];
-		//m_FXPitch = m_mcwpInfo.cameraFXPitch[m_mcwpInfo.numWaypoints];
-
-		m_groundLevel = m_mcwpInfo.groundHeight[m_mcwpInfo.numWaypoints];
-		/////////////////////m_cameraOffset.z = m_groundLevel+TheGlobalData->m_cameraHeight;
-		m_cameraOffset.y = -(m_cameraOffset.z / tan(TheGlobalData->m_cameraPitch * (PI / 180.0)));
-		m_cameraOffset.x = -(m_cameraOffset.y * tan(TheGlobalData->m_cameraYaw * (PI / 180.0)));
-
-		Coord3D pos = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-		pos.z = 0;
-		setPosition(&pos);
-		// Note - assuming that the scripter knows what he is doing, we adjust the constraints so that
-		// the scripted action can occur.
-		m_cameraConstraint.lo.x = minf(m_cameraConstraint.lo.x, pos.x);
-		m_cameraConstraint.hi.x = maxf(m_cameraConstraint.hi.x, pos.x);
-		m_cameraConstraint.lo.y = minf(m_cameraConstraint.lo.y, pos.y);
-		m_cameraConstraint.hi.y = maxf(m_cameraConstraint.hi.y, pos.y);
-		return;
-	}
-	Int deltaTime = milliseconds;
-
-	Real distance = m_mcwpInfo.totalDistance * deltaTime / m_mcwpInfo.totalTimeMilliseconds;
-	m_mcwpInfo.curSegDistance += distance;
-	while (m_mcwpInfo.curSegDistance > m_mcwpInfo.waySegLength[m_mcwpInfo.curSegment]) {
-		m_mcwpInfo.curSegDistance -= m_mcwpInfo.waySegLength[m_mcwpInfo.curSegment];
-		m_mcwpInfo.curSegment++;
-		if (m_mcwpInfo.curSegment >= m_mcwpInfo.numWaypoints) { 
-			m_mcwpInfo.totalTimeMilliseconds = 0; // Will end following next frame.
-			return;
-		}
-	}
-	Real avgFactor = 1.0/m_mcwpInfo.rollingAverageFrames;
-	m_mcwpInfo.curShutter--;
-	if (m_mcwpInfo.curShutter>0) {
-		return;
-	}
-	m_mcwpInfo.curShutter = m_mcwpInfo.shutter;
-	Real factor = m_mcwpInfo.curSegDistance / m_mcwpInfo.waySegLength[m_mcwpInfo.curSegment];
-	if (m_mcwpInfo.curSegment == m_mcwpInfo.numWaypoints-1) {
-		avgFactor = avgFactor + (1.0-avgFactor)*factor;
-	}
-	Real angle = getAngle();
-	Real factor1;
-	Real factor2;
-	factor1 = 1.0-factor;
-	//factor1 = makeQuadraticS(factor1);
-	factor2 = 1.0-factor1;
-	Real angle1 = m_mcwpInfo.cameraAngle[m_mcwpInfo.curSegment];
-	Real angle2 = m_mcwpInfo.cameraAngle[m_mcwpInfo.curSegment+1];
-	if (angle2-angle1 > PI) angle1 += 2*PI;
-	if (angle2-angle1 < -PI) angle1 -= 2*PI;
-	angle = angle1 * (factor1) + angle2 * (factor2); 
-
-	normAngle(angle);
-	Real deltaAngle = angle-m_angle;
-	normAngle(deltaAngle);
-	if (fabs(deltaAngle) > PI/10) {
-		DEBUG_LOG(("Huh.\n"));
-	}
-	m_angle += avgFactor*(deltaAngle);
-	normAngle(m_angle);
-
-	/*
-	Real pitchFX = m_mcwpInfo.cameraFXPitch[m_mcwpInfo.curSegment]*factor1 + 
-			m_mcwpInfo.cameraFXPitch[m_mcwpInfo.curSegment+1]*factor2;
-	m_FXPitch += avgFactor*(pitchFX-m_FXPitch);
-
-	Real cameraZoom = m_mcwpInfo.cameraZoom[m_mcwpInfo.curSegment]*factor1 + 
-			m_mcwpInfo.cameraZoom[m_mcwpInfo.curSegment+1]*factor2;
-	m_zoom += avgFactor*(cameraZoom-m_zoom);
-	*/
-
-	Real timeMultiplier = m_mcwpInfo.timeMultiplier[m_mcwpInfo.curSegment]*factor1 + 
-			m_mcwpInfo.timeMultiplier[m_mcwpInfo.curSegment+1]*factor2;
-	m_timeMultiplier = REAL_TO_INT_FLOOR(0.5 + timeMultiplier);
-
-	m_groundLevel = m_mcwpInfo.groundHeight[m_mcwpInfo.curSegment]*factor1 + 
-			m_mcwpInfo.groundHeight[m_mcwpInfo.curSegment+1]*factor2;
-	//////////////m_cameraOffset.z = m_groundLevel+TheGlobalData->m_cameraHeight;
-	m_cameraOffset.y = -(m_cameraOffset.z / tan(TheGlobalData->m_cameraPitch * (PI / 180.0)));
-	m_cameraOffset.x = -(m_cameraOffset.y * tan(TheGlobalData->m_cameraYaw * (PI / 180.0)));
-
-	Coord3D start, mid, end;
-	if (factor<0.5) {
-		start = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment-1];
-		start.x += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment].x;
-		start.y += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment].y;
-		start.x /= 2;
-		start.y /= 2;
-		mid = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment];
-		end = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment];
-		end.x += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1].x;
-		end.y += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1].y;
-		end.x /= 2;
-		end.y /= 2;
-		factor += 0.5;
-	} else {
-		start = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment];
-		start.x += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1].x;
-		start.y += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1].y;
-		start.x /= 2;
-		start.y /= 2;
-		mid = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1];
-		end = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1];
-		end.x += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+2].x;
-		end.y += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+2].y;
-		end.x /= 2;
-		end.y /= 2;
-		factor -= 0.5;
-	}
-
-	Coord3D result = start;
-	result.x += factor*(end.x-start.x);
-	result.y += factor*(end.y-start.y);
-	result.x += (1-factor)*factor*(mid.x-end.x + mid.x-start.x);
-	result.y += (1-factor)*factor*(mid.y-end.y + mid.y-start.y);
-	result.z = 0;
-/*
-	static Real prevGround = 0;
-	DEBUG_LOG(("Dx %.2f, dy %.2f, DeltaANgle = %.2f, %.2f DeltaGround %.2f\n", m_pos.x-result.x, m_pos.y-result.y, deltaAngle, m_groundLevel, m_groundLevel-prevGround));
-	prevGround = m_groundLevel;
-*/
-	setPosition(&result);
-	// Note - assuming that the scripter knows what he is doing, we adjust the constraints so that
-	// the scripted action can occur.
-	m_cameraConstraint.lo.x = minf(m_cameraConstraint.lo.x, result.x);
-	m_cameraConstraint.hi.x = maxf(m_cameraConstraint.hi.x, result.x);
-	m_cameraConstraint.lo.y = minf(m_cameraConstraint.lo.y, result.y);
-	m_cameraConstraint.hi.y = maxf(m_cameraConstraint.hi.y, result.y);
-
-}
-
-
-// ------------------------------------------------------------------------------------------------
-/** Add an impulse force to shake the camera.
- * The camera shake is a simple simulation of an oscillating spring/damper.
- * The idea is that some sort of shock has "pushed" the camera once, as an
- * impluse, after which the camera vibrates back to its rest position.
- * @todo This should be part of "View", not "W3DView". */
-// ------------------------------------------------------------------------------------------------
-void W3DView::shake( const Coord3D *epicenter, CameraShakeType shakeType )
-{
-	Real angle = GameClientRandomValueReal( 0, 2*PI );
-
-	m_shakeAngleCos = (Real)cos( angle );
-	m_shakeAngleSin = (Real)sin( angle );
-
-	Real intensity = 0.0f;
-	switch( shakeType )
-	{
-		case SHAKE_SUBTLE:
-			intensity = TheGlobalData->m_shakeSubtleIntensity;
-			break;
-
-		case SHAKE_NORMAL:
-			intensity = TheGlobalData->m_shakeNormalIntensity;
-			break;
-
-		case SHAKE_STRONG:
-			intensity = TheGlobalData->m_shakeStrongIntensity;
-			break;
-
-		case SHAKE_SEVERE:
-			intensity = TheGlobalData->m_shakeSevereIntensity;
-			break;
-		
-		case SHAKE_CINE_EXTREME:
-			intensity = TheGlobalData->m_shakeCineExtremeIntensity;
-			break;
-
-		case SHAKE_CINE_INSANE:
-			intensity = TheGlobalData->m_shakeCineInsaneIntensity;
-			break;
-	}
-
-	// intensity falls off with distance
-	const Coord3D *viewPos = getPosition();
-	Coord3D d;
-	d.x = epicenter->x - viewPos->x;
-	d.y = epicenter->y - viewPos->y;
-	/// @todo make this 3D once we have the real "lookat" spot
-	//d.z = epicenter->z - viewPos->z;
-
-	Real dist = (Real)sqrt( d.x*d.x + d.y*d.y );
-
-	if (dist > TheGlobalData->m_maxShakeRange)
-		return;
-
-	intensity *= 1.0f - (dist/TheGlobalData->m_maxShakeRange);
-
-	// add intensity and clamp
-	m_shakeIntensity += intensity;
-
-	//const Real maxIntensity = 10.0f;
-	const Real maxIntensity = 3.0f;
-	if (m_shakeIntensity > TheGlobalData->m_maxShakeIntensity)
-		m_shakeIntensity = maxIntensity;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Transformt he screen pixel coord passed in, to a world coordinate at the specified
-	* z value */
-//-------------------------------------------------------------------------------------------------
-void W3DView::screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z )
-{
-	Vector3 rayStart, rayEnd;
-	
-	getPickRay( s, &rayStart, &rayEnd );
-	w->x = Vector3::Find_X_At_Z( z, rayStart, rayEnd );
-	w->y = Vector3::Find_Y_At_Z( z, rayStart, rayEnd );
-	w->z = z;
-
-}  // end screenToWorldAtZ
-
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp
index 24934f9d225..5fe6e86f4e8 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp
@@ -39,7 +39,7 @@
 W3DWebBrowser::W3DWebBrowser() : WebBrowser() {
 }
 
-Bool W3DWebBrowser::createBrowserWindow(const char *tag, GameWindow *win) 
+Bool W3DWebBrowser::createBrowserWindow(const char *tag, GameWindow *win)
 {
 
 	WinInstanceData *winData = win->winGetInstanceData();
@@ -53,7 +53,7 @@ Bool W3DWebBrowser::createBrowserWindow(const char *tag, GameWindow *win)
 	WebBrowserURL *url = findURL( AsciiString(tag) );
 
 	if (url == NULL) {
-		DEBUG_LOG(("W3DWebBrowser::createBrowserWindow - couldn't find URL for page %s\n", tag));
+		DEBUG_LOG(("W3DWebBrowser::createBrowserWindow - couldn't find URL for page %s", tag));
 		return FALSE;
 	}
 
@@ -72,7 +72,7 @@ Bool W3DWebBrowser::createBrowserWindow(const char *tag, GameWindow *win)
 	return TRUE;
 }
 
-void W3DWebBrowser::closeBrowserWindow(GameWindow *win) 
+void W3DWebBrowser::closeBrowserWindow(GameWindow *win)
 {
 	DX8WebBrowser::DestroyBrowser(win->winGetInstanceData()->m_decoratedNameString.str());
 }
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
index 150712c48a8..01e42c7e6e2 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DWaypointBuffer.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   Command & Conquers: Generals
@@ -42,27 +42,27 @@
 //            are rendered after terrain, after roads & bridges, and after
 //            global fog, but before structures, objects, units, trees, etc.
 //            This way if we have two waypoints at the bottom of a hill but
-//            going through the hill, the line won't get cut off. However, 
+//            going through the hill, the line won't get cut off. However,
 //            structures and units on top of paths will render above it. Waypoints
 //            are only shown for selected units while in waypoint plotting mode.
 //
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/W3DWaypointBuffer.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/RandomValue.h"
 #include "Common/ThingFactory.h"
 #include "Common/ThingTemplate.h"
 
+#include "GameClient/ControlBar.h"
 #include "GameClient/Drawable.h"
 #include "GameClient/GameClient.h"
 #include "GameClient/InGameUI.h"
@@ -86,11 +86,6 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //=============================================================================
@@ -229,7 +224,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 			Int numPoints = 0;
 			if( obj )
 			{
-				if ( ! obj->isLocallyControlled())
+				if ( obj->getControllingPlayer() != rts::getObservedOrLocalPlayer())
 					continue;
 
 				ExitInterface *exitInterface = obj->getObjectExitInterface();
@@ -239,13 +234,13 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 					Coord3D exitPoint;
 					if ( ! exitInterface->getExitPosition(exitPoint))
 						exitPoint = *obj->getPosition();
-						
+
 					points[ numPoints ].Set( Vector3( exitPoint.x, exitPoint.y, exitPoint.z ) );
 					numPoints++;
 
 					Bool boxWrap = TRUE;
 					Coord3D naturalRallyPoint;
-					if (exitInterface->getNaturalRallyPoint(naturalRallyPoint, FALSE))//FALSE means "without the extra offset" 
+					if (exitInterface->getNaturalRallyPoint(naturalRallyPoint, FALSE))//FALSE means "without the extra offset"
 					{
 						if( !naturalRallyPoint.equals( exitPoint ) )
 						{
@@ -258,7 +253,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 							boxWrap = FALSE;
 						}
 					}
-					else 
+					else
 						continue; //next drawable
 
 					const Coord3D *rallyPoint = exitInterface->getRallyPoint();
@@ -290,7 +285,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 							//if the rallypoint is closer to the wayoutpoint than it is to the natural rally point then we definitely do not wrap
 							Coord3D rallyToWayOutDelta = wayOutPoint;
 							rallyToWayOutDelta.sub(rallyPoint);
-							if ( (100.0f + rallyToWayOutDelta.length()) > wayOutLength) 
+							if ( (100.0f + rallyToWayOutDelta.length()) > wayOutLength)
 							{
 
 								//if we passed the above idiot test, now lets be sure by testing the dotproduct of the rp against the wayoutpoint
@@ -305,7 +300,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 
 									Real angle = obj->getOrientation();
 									Real c = (Real)cos(angle);
-									Real s = (Real)sin(angle); 
+									Real s = (Real)sin(angle);
 
 									Coord3D NRPToCtrDelta;
 									NRPToCtrDelta.x = naturalRallyPoint.x - ctr->x;
@@ -336,7 +331,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 									cornerToExitDelta.z = 0.0f;
 									Real elbowDistanceNear = 99999.9f;
 									Real elbowDistanceFar = 99999.9f;
-									
+
 									for (UnsignedInt cornerIndex = 0; cornerIndex < 4; ++ cornerIndex)
 									{
 										nearCandidate = &corners[cornerIndex];//for quicker array access
@@ -428,7 +423,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 					m_line->Render( localRinfo );
 
 				}
-				
+
 			}
 		}
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp
deleted file mode 100644
index 7167fb16331..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp
+++ /dev/null
@@ -1,3471 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DWater.cpp /////////////////////////////////////////////////////////////////////////////
-// Created:   Mark Wilczynski, June 2001
-// Desc:      Draw reflective water surface.  Also handles drawing of waves/ripples
-//			  on the surface.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define SCROLL_UV
-										 
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "stdio.h"
-#include "W3DDevice/GameClient/W3DWater.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/W3DShroud.h"
-#include "W3DDevice/GameClient/W3DWaterTracks.h"
-#include "W3DDevice/GameClient/W3DAssetManager.h"
-#include "texture.h"
-#include "assetmgr.h"
-#include "rinfo.h"
-#include "camera.h"
-#include "scene.h"
-#include "dx8wrapper.h"
-#include "light.h"
-#include "d3dx8math.h"
-#include "simplevec.h"
-#include "mesh.h"
-#include "matinfo.h"
-
-#include "Common/GameState.h"
-#include "Common/GlobalData.h"
-#include "Common/PerfTimer.h"
-#include "Common/Xfer.h"
-#include "Common/GameLOD.h"
-
-#include "GameClient/Water.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/PolygonTrigger.h"
-#include "GameLogic/ScriptEngine.h"
-#include "W3DDevice/GameClient/W3DShaderManager.h"
-#include "W3DDevice/GameClient/W3DDisplay.h"
-#include "W3DDevice/GameClient/W3DPoly.h"
-#include "W3DDevice/GameClient/W3DScene.h"
-#include "W3DDevice/GameClient/W3DCustomScene.h"
-
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#define MIPMAP_BUMP_TEXTURE
-
-// DEFINES ////////////////////////////////////////////////////////////////////////////////////////
-#define SKYPLANE_SIZE	(384.0f*MAP_XY_FACTOR)
-#define SKYPLANE_HEIGHT	(30.0f)
-
-#define SKYBODY_TEXTURE	"TSMoonLarg.tga"
-#define SKYBODY_SIZE	45.0f		//extent or radius of sky body
-
-#define SKYBODY_X	150.0f	//location of skybody
-#define SKYBODY_Y	550.0f	//location of skybody
-
-/* in the bay
-#define SKYBODY_X	120.0f			//location of skybody
-#define SKYBODY_Y	75.0f			//location of skybody
-*/
-
-#define SKYBODY_HEIGHT	SKYPLANE_HEIGHT	//altitude of sky body (z-buffer disabled, so can equal sky height).
-
-//GeForce3 water system defines
-#define PATCH_SIZE 15		//number of vertices on patch edge.  Large patches may waste vertices off edge of screen.
-#define PATCH_UV_TILES	42	//number of times the bump map texture is tiled across patch (must be integer!).
-#define PATCH_SCALE (4.0f * MAP_XY_FACTOR)	//horizontal scale factor. Adjust this and size to get desired vertex density.
-#define SEA_REFLECTION_SIZE 256		//dimensions of reflection texture
-
-#define SEA_BUMP_SCALE		(0.06f)		//scales the du/dv offsets stored in bump map (~ amount to perturb)
-#define BUMP_SIZE (50.f)
-#define REFLECTION_FACTOR 0.1f
-
-#define PATCH_WIDTH (PATCH_SIZE-1)	//internal defines
-#define PATCH_UV_SCALE	((Real)PATCH_UV_TILES/(Real)PATCH_WIDTH)	
-
-//3D Grid Mesh Water defines.
-#define WATER_MESH_OPACITY		0.5f
-#define WATER_MESH_X_VERTICES	128
-#define WATER_MESH_Y_VERTICES	128
-#define WATER_MESH_SPACING	MAP_XY_FACTOR	//same as terrain
-
-#ifdef USE_MESH_NORMALS
-#define WATER_MESH_FVF	DX8_FVF_XYZNDUV2
-typedef VertexFormatXYZNDUV2 MaterMeshVertexFormat;
-#else
-#define WATER_MESH_FVF	DX8_FVF_XYZDUV2
-typedef VertexFormatXYZDUV2 MaterMeshVertexFormat;
-#endif
-
-// Converts a FLOAT to a DWORD for use in SetRenderState() calls
-static inline DWORD F2DW( FLOAT f ) { return *((DWORD*)&f); }
-
-#define DRAW_WATER_WAKES
-/// @todo: Fix clipping of objects that intersect the mirror surface
-//#define CLIP_GEOMETRY_TO_PLANE	// this enables clipping of objects that intersect the mirror surfaces
-
-// Some shader combinations that can be useful in rendering water:
-
-// Modulate stage0 with stage1 texture.  Also modulate stage 0 with vertex color.
-#define SC_DETAIL_BLEND ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
-	ShaderClass::SRCBLEND_SRC_ALPHA,ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
-	ShaderClass::TEXTURING_ENABLE, 	ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_ENABLE, ShaderClass::DETAILCOLOR_DETAILBLEND, ShaderClass::DETAILALPHA_DISABLE) )
-
-// Just a z-buffer fill, nothing is written to the color buffer.
-#define SC_ZFILL_BLEND ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_DISABLE, ShaderClass::SRCBLEND_ZERO, \
-	ShaderClass::DSTBLEND_ONE, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::DETAILCOLOR_SCALE, ShaderClass::DETAILALPHA_DISABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_ENABLE, \
-	ShaderClass::DETAILCOLOR_SCALE, ShaderClass::DETAILALPHA_DISABLE) )
-
-// No texturing, just vertex color with vertex alpha
-#define SC_ZFILL_BLENDx ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, \
-	ShaderClass::SRCBLEND_ZERO, ShaderClass::DSTBLEND_SRC_COLOR, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
-	ShaderClass::TEXTURING_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_ENABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-// Modulate blended with vertex alpha modulation
-#define SC_ZFILL_MODULATE_TEX ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
-	ShaderClass::SRCBLEND_ZERO, ShaderClass::DSTBLEND_SRC_COLOR, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
-	ShaderClass::TEXTURING_ENABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-// Alpha blended with vertex alpha modulation
-#define SC_ZFILL_ALPHA_TEX ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
-	ShaderClass::SRCBLEND_SRC_ALPHA, ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_DISABLE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
-	ShaderClass::TEXTURING_ENABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-// Alpha blended with vertex alpha modulation
-#define SC_OPAQUE_TEXONLY ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
-	ShaderClass::SRCBLEND_ONE, ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_DISABLE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
-	ShaderClass::TEXTURING_ENABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-// Alpha blended with vertex alpha modulation
-#define SC_ZFILL_BLEND3 ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
-	ShaderClass::SRCBLEND_SRC_ALPHA, ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
-	ShaderClass::TEXTURING_ENABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-static ShaderClass zFillAlphaShader(SC_ZFILL_BLEND3);
-static ShaderClass blendStagesShader(SC_DETAIL_BLEND);
-
-WaterRenderObjClass *TheWaterRenderObj=NULL; ///<global water rendering object
-
-#define SAFE_RELEASE(p)      { if(p) { (p)->Release(); (p)=NULL; } }
-
-void doSkyBoxSet(Bool startDraw)
-{
-	if (TheWritableGlobalData)
-		TheWritableGlobalData->m_drawSkyBox = startDraw;
-}
-
-
-#define DONUT_SIDES	90
-#define INNER_RADIUS 200.0f
-#define OUTER_RADIUS 250.0f
-#define TEXTURE_REPEAT_COUNT 16
-#define DONUT_HEIGHT	15.0f
-//#define DO_FLAT_DONUT
-#define AMP_SCALE	(30.0f/120.0f)
-#define WAVE_FREQ	0.3f
-#define AMP_SCALE2	(10.0f/120.0f)
-#define NOISE_FREQ	(2.0f*PI/WAVE_FREQ)
-
-#define NOISE_REPEAT_FACTOR ((float)(1.0f/(16.0f)))
-
-					
-static Bool wireframeForDebug = 0;
-
-void WaterRenderObjClass::setupJbaWaterShader(void) 
-{
-	if (!TheWaterTransparency->m_additiveBlend)
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaShader);
-	else
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetAdditiveShader);
-
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);
-	m_riverTexture->Get_Filter().Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_BEST);
-	m_riverTexture->Get_Filter().Set_Min_Filter(TextureFilterClass::FILTER_TYPE_BEST);
-	m_riverTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_BEST);
-
-
-//	Setting *setting=&m_settings[m_tod];	
-
-
-	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_ADD );
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,m_riverAlphaEdge->Peek_D3D_Texture());	
-	DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, 0);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_TEXCOORDINDEX, 1);
-	
-	Bool doSparkles = true;
-
-	if (m_riverWaterPixelShader && doSparkles) {
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1,m_waterSparklesTexture->Peek_D3D_Texture());	
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(2,m_waterNoiseTexture->Peek_D3D_Texture());	
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
- 
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-		// Two output coordinates are used.
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-		D3DXMATRIX inv;
-		float det;
-
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-		D3DXMATRIX scale;
-
-		D3DXMatrixScaling(&scale, NOISE_REPEAT_FACTOR, NOISE_REPEAT_FACTOR,1);
-		D3DXMATRIX destMatrix = inv * scale;
-		D3DXMatrixTranslation(&scale, m_riverVOrigin, m_riverVOrigin,0);
-		destMatrix = destMatrix*scale;
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, *(Matrix4x4*)&destMatrix);
-		
-	}
-	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 1, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 2, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 3, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 3, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	if (m_riverWaterPixelShader){
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(0,   D3DXVECTOR4(REFLECTION_FACTOR, REFLECTION_FACTOR, REFLECTION_FACTOR, 1.0f), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_riverWaterPixelShader);
-	}
-}
-
-
-
-
-//-------------------------------------------------------------------------------------------------
-/** Destructor. Releases w3d assets. */
-//-------------------------------------------------------------------------------------------------
-WaterRenderObjClass::~WaterRenderObjClass(void)
-{
-	REF_PTR_RELEASE(m_meshVertexMaterialClass);
-	REF_PTR_RELEASE(m_vertexMaterialClass);
-	REF_PTR_RELEASE(m_meshLight);
-	REF_PTR_RELEASE(m_alphaClippingTexture);
-	REF_PTR_RELEASE (m_skyBox);
-
-	REF_PTR_RELEASE (m_riverTexture);
-	REF_PTR_RELEASE (m_whiteTexture);
-	REF_PTR_RELEASE (m_waterNoiseTexture);
-	REF_PTR_RELEASE (m_riverAlphaEdge);
-	REF_PTR_RELEASE (m_waterSparklesTexture);
-
-	Int i;
-
-	for(i=0; i<TIME_OF_DAY_COUNT; i++)
-	{	REF_PTR_RELEASE(m_settings[i].skyTexture);
-		REF_PTR_RELEASE(m_settings[i].waterTexture);
-	}
-
-	i=NUM_BUMP_FRAMES;
-	while (i--)
-	{	SAFE_RELEASE( m_pBumpTexture[i]);
-		SAFE_RELEASE( m_pBumpTexture2[i]);
-	}
-
-	if (m_meshData)
-		delete [] m_meshData;
-	m_meshData = NULL;
-	m_meshDataSize = 0;
-
-	//Release strings allocated inside global water settings.
-	for  (i=0; i<TIME_OF_DAY_COUNT; i++)
-	{	WaterSettings[i].m_skyTextureFile.clear();
-		WaterSettings[i].m_waterTextureFile.clear();
-	}
-	deleteInstance((WaterTransparencySetting*)TheWaterTransparency.getNonOverloadedPointer());
-	TheWaterTransparency = NULL;
-	ReleaseResources();
-
-	if (m_waterTrackSystem)
-		delete m_waterTrackSystem;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Constructor. Just nulls out some variables. */
-//-------------------------------------------------------------------------------------------------
-WaterRenderObjClass::WaterRenderObjClass(void)
-{
-	memset( &m_settings, 0, sizeof( m_settings ) );
-	m_dx=0;
-	m_dy=0;
-	m_indexBuffer=NULL;
-	m_waterTrackSystem = NULL;
-	m_doWaterGrid = FALSE;
-	m_meshVertexMaterialClass=NULL;
-	m_meshLight=NULL;
-	m_vertexMaterialClass=NULL;
-	m_alphaClippingTexture=NULL;
-	m_useCloudLayer=true;
-	m_waterType = WATER_TYPE_0_TRANSLUCENT;
-	m_tod=TIME_OF_DAY_AFTERNOON;
-	m_pReflectionTexture=NULL;
-	m_skyBox=NULL;
-	m_vertexBufferD3D=NULL;
-	m_indexBufferD3D=NULL;
-	m_vertexBufferD3DOffset=0;
-
-	m_dwWavePixelShader=NULL;
-	m_dwWaveVertexShader=NULL;
-	m_meshData=NULL;
-	m_meshDataSize = 0;
-	m_meshInMotion = FALSE;
-	m_gridOrigin=Vector2(0,0);
-	m_gridDirectionX=Vector2(1.0f,0.0f);
-	m_gridDirectionY=Vector2(1.0f,0.0f);
-
-	m_gridCellSize=WATER_MESH_SPACING;
-	m_gridCellsX=WATER_MESH_X_VERTICES;
-	m_gridCellsY=WATER_MESH_Y_VERTICES;
-	m_gridWidth = m_gridCellsX * m_gridCellSize;
-	m_gridHeight = m_gridCellsY * m_gridCellSize;
-	
-	Int i=NUM_BUMP_FRAMES;
-	while (i--)
-		m_pBumpTexture[i]=NULL;
-
-	m_riverVOrigin=0;
-	m_riverTexture=NULL;
-	m_whiteTexture=NULL;
-	m_waterNoiseTexture=NULL;
-	m_riverAlphaEdge=NULL;
-	m_waterPixelShader=0;		///<D3D handle to pixel shader.
-	m_riverWaterPixelShader=0;		///<D3D handle to pixel shader.
-	m_trapezoidWaterPixelShader=0;		///<D3D handle to pixel shader.
-	m_waterSparklesTexture=0;
-	m_riverXOffset=0;
-	m_riverYOffset=0;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** WW3D method that returns object bounding sphere used in frustum culling*/
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
-{
-	//Since this object is more of a system (containing lots of water pieces),
-	//let's disable culling by making bounds huge.  Let each piece do it's own cull.
-	Vector3	ObjSpaceCenter(0,0,0);
-//	Vector3	ObjSpaceRadius(m_dx,m_dy,0);
-	Vector3	ObjSpaceRadius(50000,50000,0);
-
-	sphere.Init(ObjSpaceCenter,ObjSpaceRadius.Length());
-}
-
-//-------------------------------------------------------------------------------------------------
-/** WW3D method that returns object bounding box used in collision detection*/
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
-{
-	//Since this object is more of a system (containing lots of water pieces),
-	//let's disable culling by making bounds huge.  Let each piece do it's own cull.
-
-	Vector3	ObjSpaceCenter(0,0,0);
-	Vector3	ObjSpaceExtents(50000,50000,0.001f*m_dy);	//since mirror is a plane, it has no thickness. Set to m_dy/1000.
-
-	box.Init(ObjSpaceCenter,ObjSpaceExtents);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** returns the class id, so the scene can tell what kind of render object it has. */
-//-------------------------------------------------------------------------------------------------
-Int WaterRenderObjClass::Class_ID(void) const
-{
-	return RenderObjClass::CLASSID_UNKNOWN;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Not used, but required virtual method. */
-//-------------------------------------------------------------------------------------------------
-RenderObjClass *	 WaterRenderObjClass::Clone(void) const
-{
-	assert(false);
-	return NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Copies raw bits from pBumpSrc (a regular grayscale texture) into a D3D
-	*   bump-map format. */
-//-------------------------------------------------------------------------------------------------
-HRESULT WaterRenderObjClass::initBumpMap(LPDIRECT3DTEXTURE8 *pTex, TextureClass *pBumpSource)
-{
-    SurfaceClass::SurfaceDescription    d3dsd;
-	SurfaceClass * surf;
-    D3DLOCKED_RECT     d3dlr;
-	DWORD dwSrcPitch;
-	BYTE* pSrc;
-	Int numLevels;
-
-#ifdef MIPMAP_BUMP_TEXTURE
-
-	pBumpSource->Get_Level_Description(d3dsd);
-
-	if (Get_Bytes_Per_Pixel(d3dsd.Format) != 4)
-	{
-		// LORENZEN WAS BUGGED BY THIS, 
-		//		DEBUG_CRASH(("WaterRenderObjClass::Invalid BumpMap format - Was it compressed?") );
-		return S_OK;
-	} 
-
-	if (pBumpSource->Peek_D3D_Texture())
-	{
-		numLevels=pBumpSource->Peek_D3D_Texture()->GetLevelCount();
-	}
-	else
-		return S_OK;
-
-	pTex[0]=DX8Wrapper::_Create_DX8_Texture(d3dsd.Width,d3dsd.Height,WW3D_FORMAT_U8V8,MIP_LEVELS_ALL,D3DPOOL_MANAGED,false);
-
-	for (Int level=0; level < numLevels; level++)
-	{
-		surf=pBumpSource->Get_Surface_Level(level);
-		surf->Get_Description(d3dsd);
-		pSrc=(unsigned char *)surf->Lock((int *)&dwSrcPitch);
-
-		pTex[0]->LockRect( level, &d3dlr, 0, 0 );
-		DWORD dwDstPitch = (DWORD)d3dlr.Pitch;
-		BYTE* pDst       = (BYTE*)d3dlr.pBits;
-
-		for( DWORD y=0; y<d3dsd.Height; y++ )
-		{
-			BYTE* pDstT  = pDst;
-			BYTE* pSrcB0 = (BYTE*)pSrc;
-			BYTE* pSrcB1 = ( pSrcB0 + dwSrcPitch );
-			BYTE* pSrcB2 = ( pSrcB0 - dwSrcPitch );
-
-			if( y == d3dsd.Height-1 )  // Don't go past the last line
-				pSrcB1 = pSrcB0;
-			if( y == 0 )               // Don't go before first line
-				pSrcB2 = pSrcB0;
-
-			for( DWORD x=0; x<d3dsd.Width; x++ )
-			{
-				LONG v00 = 256-*(pSrcB0+0); // Get the current pixel
-				LONG v01 = 256-*(pSrcB0+4); // and the pixel to the right
-				LONG vM1 = 256-*(pSrcB0-4); // and the pixel to the left
-				LONG v10 = 256-*(pSrcB1+0); // and the pixel one line below.
-				LONG v1M = 256-*(pSrcB2+0); // and the pixel one line above.
-
-				LONG iDu = (vM1-v01); // The delta-u bump value
-				LONG iDv = (v1M-v10); // The delta-v bump value
-
-				if( (v00 < vM1) && (v00 < v01) )  // If we are at valley
-				{
-					iDu = vM1-v00;                 // Choose greater of 1st order diffs
-					if( iDu < v00-v01 )
-						iDu = v00-v01;
-				}
-
-				// The luminance bump value (land masses are less shiny)
-				WORD uL = ( v00>1 ) ? 63 : 127;
-
-				switch( D3DFMT_V8U8)//m_BumpMapFormat )
-				{
-					case D3DFMT_V8U8:
-						*pDstT++ = (BYTE)iDu;
-						*pDstT++ = (BYTE)iDv;
-						break;
-
-					case D3DFMT_L6V5U5:
-						*(WORD*)pDstT  = (WORD)( ( (iDu>>3) & 0x1f ) <<  0 );
-						*(WORD*)pDstT |= (WORD)( ( (iDv>>3) & 0x1f ) <<  5 );
-						*(WORD*)pDstT |= (WORD)( ( ( uL>>2) & 0x3f ) << 10 );
-						pDstT += 2;
-						break;
-
-					case D3DFMT_X8L8V8U8:
-						*pDstT++ = (BYTE)iDu;
-						*pDstT++ = (BYTE)iDv;
-						*pDstT++ = (BYTE)uL;
-						*pDstT++ = (BYTE)0L;
-						break;
-				}
-
-				// Move one pixel to the left (src is 32-bpp)
-				pSrcB0+=4;   pSrcB1+=4;   pSrcB2+=4;
-			}
-
-			// Move to the next line
-			pSrc += dwSrcPitch;    pDst += dwDstPitch;
-		}
-
-		pTex[0]->UnlockRect(level);
-		surf->Unlock();
-		REF_PTR_RELEASE (surf);
-	}//for each level
-
-#else
-	surf=pBumpSource->Get_Surface_Level();
-	surf->Get_Description(d3dsd);
-	pSrc=(unsigned char *)surf->Lock((int *)&dwSrcPitch);
-
-    // Create the bumpmap's surface and texture objects
-	m_pBumpTexture[i]=DX8Wrapper::_Create_DX8_Texture(d3dsd.Width,d3dsd.Height,WW3D_FORMAT_U8V8,MIP_LEVELS_1,D3DPOOL_MANAGED,false);
-
-    // Fill the bits of the new texture surface with bits from
-    // a private format.
-
-    m_pBumpTexture[i]->LockRect( 0, &d3dlr, 0, 0 );
-    DWORD dwDstPitch = (DWORD)d3dlr.Pitch;
-    BYTE* pDst       = (BYTE*)d3dlr.pBits;
-
-    for( DWORD y=0; y<d3dsd.Height; y++ )
-    {
-        BYTE* pDstT  = pDst;
-        BYTE* pSrcB0 = (BYTE*)pSrc;
-        BYTE* pSrcB1 = ( pSrcB0 + dwSrcPitch );
-        BYTE* pSrcB2 = ( pSrcB0 - dwSrcPitch );
-
-        if( y == d3dsd.Height-1 )  // Don't go past the last line
-            pSrcB1 = pSrcB0;
-        if( y == 0 )               // Don't go before first line
-            pSrcB2 = pSrcB0;
-
-        for( DWORD x=0; x<d3dsd.Width; x++ )
-        {
-            LONG v00 = 256-*(pSrcB0+0); // Get the current pixel
-            LONG v01 = 256-*(pSrcB0+4); // and the pixel to the right
-            LONG vM1 = 256-*(pSrcB0-4); // and the pixel to the left
-            LONG v10 = 256-*(pSrcB1+0); // and the pixel one line below.
-            LONG v1M = 256-*(pSrcB2+0); // and the pixel one line above.
-
-            LONG iDu = (vM1-v01); // The delta-u bump value
-            LONG iDv = (v1M-v10); // The delta-v bump value
-
-            if( (v00 < vM1) && (v00 < v01) )  // If we are at valley
-            {
-                iDu = vM1-v00;                 // Choose greater of 1st order diffs
-                if( iDu < v00-v01 )
-                    iDu = v00-v01;
-            }
-
-            // The luminance bump value (land masses are less shiny)
-            WORD uL = ( v00>1 ) ? 63 : 127;
-
-            switch( D3DFMT_V8U8)//m_BumpMapFormat )
-            {
-                case D3DFMT_V8U8:
-                    *pDstT++ = (BYTE)iDu;
-                    *pDstT++ = (BYTE)iDv;
-                    break;
-
-                case D3DFMT_L6V5U5:
-                    *(WORD*)pDstT  = (WORD)( ( (iDu>>3) & 0x1f ) <<  0 );
-                    *(WORD*)pDstT |= (WORD)( ( (iDv>>3) & 0x1f ) <<  5 );
-                    *(WORD*)pDstT |= (WORD)( ( ( uL>>2) & 0x3f ) << 10 );
-                    pDstT += 2;
-                    break;
-
-                case D3DFMT_X8L8V8U8:
-                    *pDstT++ = (BYTE)iDu;
-                    *pDstT++ = (BYTE)iDv;
-                    *pDstT++ = (BYTE)uL;
-                    *pDstT++ = (BYTE)0L;
-                    break;
-            }
-
-            // Move one pixel to the left (src is 32-bpp)
-            pSrcB0+=4;   pSrcB1+=4;   pSrcB2+=4;
-        }
-
-        // Move to the next line
-        pSrc += dwSrcPitch;    pDst += dwDstPitch;
-    }
-
-    m_pBumpTexture[i]->UnlockRect(0);
-    surf->Unlock();
-#endif
-
-    return S_OK;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Create and fill a D3D vertex buffer with water surface vertices */
-//-------------------------------------------------------------------------------------------------
-HRESULT WaterRenderObjClass::generateVertexBuffer( Int sizeX, Int sizeY, Int vertexSize, Bool doStatic)
-{
-	m_numVertices=sizeX*sizeY;
-	//Assuming dynamic vertex buffer, allocate maximum multiple of required size to allow rendering from
-	//different parts of the buffer. 5-15-03: Disabled this since we use DISCARD mode instead to avoid Nvidia Runtime bug. -MW
-	//m_numVertices=(65536 / (sizeX*sizeY))*sizeX*sizeY;
-
-	SEA_PATCH_VERTEX* pVertices;
-
-	Setting *setting=&m_settings[m_tod];
-
-	HRESULT hr;
-
-	//default setting for a dynamic vertex buffer
-	D3DPOOL pool = D3DPOOL_DEFAULT;
-	DWORD usage = D3DUSAGE_WRITEONLY | D3DUSAGE_DYNAMIC;
-	DWORD fvf = WATER_MESH_FVF;
-
-	if (doStatic)
-	{	//change settings for a static vertex buffer
-		pool = D3DPOOL_MANAGED;
-		usage = D3DUSAGE_WRITEONLY;
-		fvf=0;// DX8 Docs confusing on this. Say no FVF for vertex shaders. Else DX8_FVF_XYZDUV1;
-		m_numVertices=sizeX*sizeY;
-	}
-
-	if (m_vertexBufferD3D == NULL)
-	{	// Create vertex buffer
-
-		if (FAILED(hr=m_pDev->CreateVertexBuffer
-		(
-			m_numVertices*vertexSize,
-			usage,
-			fvf,
-			pool, 
-			&m_vertexBufferD3D
-		)))
-			return hr;
-	}
-
-	m_vertexBufferD3DOffset=0;
-
-	if (!doStatic)
-		return S_OK;	//only create the buffer, other code will fill it.
-
-	// load results into buffer
-	if (FAILED(hr=m_vertexBufferD3D->Lock
-	(
-		0,
-		m_numVertices*sizeof(SEA_PATCH_VERTEX), 
-		(BYTE**)&pVertices,
-		0//D3DLOCK_DISCARD
-	)))
-		return hr;
-
-	Int x,z;
-	for (z=0; z<sizeY; z++)
-	{
-		for (x=0; x<sizeX; x++)
-		{
-			pVertices->x=(float)x;
-			pVertices->y=m_level;
-			pVertices->z=(float)z;
-
-			pVertices->tu=(float)x*PATCH_UV_SCALE;
-			pVertices->tv=(float)z*PATCH_UV_SCALE;
-			pVertices->c=setting->transparentWaterDiffuse;	//vertex alpha/color
-			pVertices++;
-		}
-	}
-
-	if (FAILED(hr=m_vertexBufferD3D->Unlock())) return hr;
-
-	return S_OK;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Create and fill a D3D index buffer with water surface strip indices */
-//-------------------------------------------------------------------------------------------------
-HRESULT WaterRenderObjClass::generateIndexBuffer(Int sizeX, Int sizeY)
-{
-	HRESULT hr;
-
-	//Will need SizeY-1 strips, each of length SizeX*2 (2 indices per strip segment).
-	//Will also need 2 extra indices to connect each strip to next one (except last strip)
-	//Total index buffer size = (SizeY-1)*(SizeX*2+2) - 2 (drop the extra 2 indices from last strip)
-
-	m_numIndices=(sizeY-1)*(sizeX*2+2) - 2;
-
-	//old way
-
-	// Create index buffer
-	WORD* pIndices;
-
-	if (FAILED(hr=m_pDev->CreateIndexBuffer
-	(
-		(m_numIndices+2)*sizeof(WORD), 
-		D3DUSAGE_WRITEONLY, 
-		D3DFMT_INDEX16, 
-		D3DPOOL_MANAGED, 
-		&m_indexBufferD3D
-	)))
-		return hr;
-
-	if (FAILED(hr=m_indexBufferD3D->Lock
-	(
-		0, 
-		m_numIndices*sizeof(WORD), 
-		(BYTE**)&pIndices, 
-		0
-	)))
-		return hr;
-
-	Int i,j,k;
-
-	for (i=0,j=0,k=0; i<m_numIndices; j++)
-	{
-		for (;k<(sizeX*(j+1)); k++,i+=2)
-		{
-			pIndices[i]=(UnsignedShort) k+sizeX;
-			pIndices[i+1]=(UnsignedShort) k;
-		}
-		//Generate 4 degenerate triangle to connect current strip to next strip/row of map
-		//To do this, we just repeat the last index of first strip and first index of new strip.
-		//Any triangles with repeated vertices will be skipped during rendering.
-		if (i<m_numIndices) //check if there is at least 1 more strip to go
-		{
-			pIndices[i]=k-1;
-			pIndices[i+1]=k+sizeX;
-			i+=2;
-		}
-	}
-
-	/*Old way
-	Int step=1;
-	Int psize=(size-1)/step;
-
-	m_numIndices=psize*((psize+1)*2)+(psize*2)-2;
-
-
-	Int x,z,s_toggle=1;
-	for (z=step; z<size; z+=step)
-	{
-		if (s_toggle)
-		{
-			for (x=0; x<(size-step); x+=step)
-			{
-				*pIndices++=(WORD)((z-0)*size+(x));
-				*pIndices++=(WORD)((z-step)*size+(x));
-			}
-				*pIndices++=(WORD)((z-0)*size+(size-1));
-			*pIndices++=(WORD)((z-step)*size+(size-1));
-			// insert additional degenerate to start next row
-			*pIndices++=pIndices[-2];
-			*pIndices++=pIndices[-1];
-		}
-		else
-		{
-			*pIndices++=(WORD)((z-step)*size+(size-1));
-			*pIndices++=(WORD)((z-0)*size+(size-1));
-			for (x=size-1; x>0; x-=step)
-			{
-				*pIndices++=(WORD)((z-step)*size+(x-step));
-				*pIndices++=(WORD)((z-0)*size+(x-step));
-			}
-			// insert additional degenerate to start next row
-			*pIndices++=pIndices[-1];
-			*pIndices++=pIndices[-1];
-		}
-
-		s_toggle=!s_toggle;
-	}
-*/
-	if (FAILED(hr=m_indexBufferD3D->Unlock())) return hr;
-
-	return S_OK;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Releases all w3d assets, to prepare for Reset device call. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::ReleaseResources(void)
-{
-
-	REF_PTR_RELEASE(m_indexBuffer);
-
-	REF_PTR_RELEASE(m_pReflectionTexture);
-	SAFE_RELEASE(m_vertexBufferD3D);
-	SAFE_RELEASE(m_indexBufferD3D);
-
-	if (m_waterTrackSystem)
-		m_waterTrackSystem->ReleaseResources();
-
-	if (m_dwWavePixelShader)
-		m_pDev->DeletePixelShader(m_dwWavePixelShader);
-
-	if (m_dwWaveVertexShader)
-		m_pDev->DeleteVertexShader(m_dwWaveVertexShader);
-	
-	if (m_waterPixelShader)
-		m_pDev->DeletePixelShader(m_waterPixelShader);
-
-	if (m_trapezoidWaterPixelShader)
-		m_pDev->DeletePixelShader(m_trapezoidWaterPixelShader);
-
-	if (m_riverWaterPixelShader)
-		m_pDev->DeletePixelShader(m_riverWaterPixelShader);
-
-	m_dwWavePixelShader=0;
-	m_dwWaveVertexShader=0;
-	m_waterPixelShader = 0;
-	m_trapezoidWaterPixelShader=0;
-	m_riverWaterPixelShader=0;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** (Re)allocates all W3D assets after a reset.. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::ReAcquireResources(void)
-{
-	HRESULT hr;
-
-	m_indexBuffer=NEW_REF(DX8IndexBufferClass,(6));
-	// Fill up the IB
-	{
-		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
-		UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-		//quad of 2 triangles:
-		//	3-----2
-		//  |    /|
-		//  |  /  |
-		//	|/    |
-		//  0-----1
-		ib[0]=3;
-		ib[1]=0;
-		ib[2]=2;
-		ib[3]=2;
-		ib[4]=0;
-		ib[5]=1;
-	}
-
-	m_pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	//We're using the same grid for either 3D Water Mesh or Pixel/Vertex shader.  Just
-	//allocate the right size depending on usage
-	if (m_meshData)
-	{
-		//Create new grid data
-		if (FAILED(generateIndexBuffer(m_gridCellsX+1,m_gridCellsY+1)))
-			return;
-		if (FAILED(generateVertexBuffer(m_gridCellsX+1,m_gridCellsY+1,sizeof(MaterMeshVertexFormat),false)))
-			return;
-	}
-	else
-	if (m_waterType == WATER_TYPE_2_PVSHADER)
-	{	//pixel/vertex shader based water assets.
-		if (FAILED(hr=generateIndexBuffer(PATCH_SIZE,PATCH_SIZE)))
-			return;
-
-		if (FAILED(hr=generateVertexBuffer(PATCH_SIZE,PATCH_SIZE,sizeof(SEA_PATCH_VERTEX),true)))
-			return;
-
-		//shader decleration
-		DWORD Declaration[]=
-		{
-			(D3DVSD_STREAM(0)),
-			(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
-			(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
-			(D3DVSD_REG(2, D3DVSDT_FLOAT2)), // Bump map texture	
-			(D3DVSD_END())
-		};
-
-		hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\wave.pso", &Declaration[0], 0, false, &m_dwWavePixelShader);
-		if (FAILED(hr))
-			return;
-
-		hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\wave.vso", &Declaration[0], 0, true, &m_dwWaveVertexShader);
-		if (FAILED(hr))
-			return;
-
-		// Create reflection texture
-		m_pReflectionTexture = DX8Wrapper::Create_Render_Target (SEA_REFLECTION_SIZE, SEA_REFLECTION_SIZE);
-	}
-
-	if (m_waterTrackSystem)
-		m_waterTrackSystem->ReAcquireResources();
-
-	if (W3DShaderManager::getChipset() >= DC_GENERIC_PIXEL_SHADER_1_1)
-	{
-		ID3DXBuffer *compiledShader;
-		const char *shader = 
-			"ps.1.1\n \
-			tex t0 \n\
-			tex t1	\n\
-			tex t2	\n\
-			tex t3\n\
-			mul r0,v0,t0 ; blend vertex color into t0. \n\
-			mul r1, t1, t2 ; mul\n\
-			add r0.rgb, r0, t3\n\
-			+mul r0.a, r0, t3\n\
-			add r0.rgb, r0, r1\n";
-		hr = D3DXAssembleShader( shader, strlen(shader), 0, NULL, &compiledShader, NULL);
-		if (hr==0) {
-			hr = 	DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader((DWORD*)compiledShader->GetBufferPointer(), &m_riverWaterPixelShader);
-			compiledShader->Release();
-		}
-		shader = 
-			"ps.1.1\n \
-			tex t0 \n\
-			tex t1	\n\
-			texbem t2, t1 ; use t1 as env map adjustment on t2.\n\
-			mul r0,v0,t0 ; blend vertex color into t0. \n\
-			mul r1.rgb,t2,c0 ; reduce t2 (environment mapped reflection) by constant\n\
-			add r0.rgb, r0, r1";
-		hr = D3DXAssembleShader( shader, strlen(shader), 0, NULL, &compiledShader, NULL);
-		if (hr==0) {
-			hr = 	DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader((DWORD*)compiledShader->GetBufferPointer(), &m_waterPixelShader);
-			compiledShader->Release();
-		}
-		shader = 
-			"ps.1.1\n \
-			tex t0 ;get water texture\n\
-			tex t1 ;get white highlights on black background\n\
-			tex t2 ;get white highlights with more tiling\n\
-			tex t3	; get black shroud \n\
-			mul r0,v0,t0 ; blend vertex color and alpha into base texture. \n\
-			mad r0.rgb, t1, t2, r0	; blend sparkles and noise \n\
-			mul r0.rgb, r0, t3 ; blend in black shroud \n\
-			;\n";
-		hr = D3DXAssembleShader( shader, strlen(shader), 0, NULL, &compiledShader, NULL);
-		if (hr==0) {
-			hr = 	DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader((DWORD*)compiledShader->GetBufferPointer(), &m_trapezoidWaterPixelShader);
-			compiledShader->Release();
-		}
-	}
-
-}
-
-void WaterRenderObjClass::load(void)
-{
-	if (m_waterTrackSystem)
-		m_waterTrackSystem->loadTracks();
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Initializes water with dimensions and parent scene.
-	* During rendering, we will render a water surface of given dimensions
-	* and reflect the parent scene in its surface.  For now, waters are
-	* forced to be rectangles. */
-//-------------------------------------------------------------------------------------------------
-Int WaterRenderObjClass::init(Real waterLevel, Real dx, Real dy, SceneClass *parentScene, WaterType type)
-{
-
-	m_iBumpFrame=0;
-	m_fBumpScale=SEA_BUMP_SCALE;
-
-	m_dx=dx;
-	m_dy=dy;
-	m_level=waterLevel;
-
-	m_LastUpdateTime=timeGetTime();
-	m_uScrollPerMs=0.001f;
-	m_vScrollPerMs=0.001f;
-	m_uOffset=0;
-	m_vOffset=0;
-
-	m_parentScene=parentScene;
-	m_waterType = type;
-
-	/// Hack for now
-	//m_waterType = WATER_TYPE_0_TRANSLUCENT;
-
-	///@todo: calculate a real normal/distance for arbitrary planes.
-	m_planeNormal=Vector3(0,0,1);		//water plane normal
-	m_planeDistance=m_level;	//water plane distance(always at zero for now)
-
-	m_meshLight=NEW_REF(LightClass,(LightClass::DIRECTIONAL));	
-	m_meshLight->Set_Ambient(Vector3(0.1f,0.1f,0.1f));
-	m_meshLight->Set_Diffuse(Vector3(1.0f,1.0f,1.0f));
-	m_meshLight->Set_Specular(Vector3(1.0f,1.0f,1.0f));
-	m_meshLight->Set_Position(Vector3(1000,1000,1000));
-	//testLight->Set_Spot_Direction(Vector3(TheGlobalData->m_terrainLightX,TheGlobalData->m_terrainLightY,TheGlobalData->m_terrainLightZ));
-	m_meshLight->Set_Spot_Direction(Vector3(-0.57f,-0.57f,-0.57f));
-
-	//Setup material for 3D Mesh water.
-	m_meshVertexMaterialClass=NEW_REF(VertexMaterialClass,());
-	m_meshVertexMaterialClass->Set_Shininess(20.0);
-	m_meshVertexMaterialClass->Set_Ambient(1.0f,1.0f,1.0f);
-	m_meshVertexMaterialClass->Set_Diffuse(1.0f,1.0f,1.0f);
-	m_meshVertexMaterialClass->Set_Specular(0.5,0.5,0.5);
-	m_meshVertexMaterialClass->Set_Opacity(WATER_MESH_OPACITY);
-	m_meshVertexMaterialClass->Set_Lighting(true);
-
-	//
-	// assign the data from the WaterSettings[] global to the data for this
-	// render object (we at present only have one water plane)
-	//
-	loadSetting( &m_settings[ TIME_OF_DAY_MORNING ], TIME_OF_DAY_MORNING );
-	loadSetting( &m_settings[ TIME_OF_DAY_AFTERNOON ], TIME_OF_DAY_AFTERNOON );
-	loadSetting( &m_settings[ TIME_OF_DAY_EVENING ], TIME_OF_DAY_EVENING );
-	loadSetting( &m_settings[ TIME_OF_DAY_NIGHT ], TIME_OF_DAY_NIGHT );
-
-	Set_Sort_Level(2);	//force water to be drawn after all other non translucent objects in scene.
-	Set_Force_Visible(TRUE);	//water is always visible since it's a composite object made of multiple planes all over the map.
-
-	ReAcquireResources();
-#if 0	//MD does not support the old bump-mapped water at all so no point loading textures. -MW 8-11-03
-	if (type == WATER_TYPE_2_PVSHADER || (W3DShaderManager::getChipset() >= DC_GENERIC_PIXEL_SHADER_1_1))
-	{	//geforce3 specific water requires some extra D3D assets
-		m_pDev=DX8Wrapper::_Get_D3D_Device8();
-		//save previous thumbnail mode
-		bool thumbnails_enabled = WW3D::Get_Thumbnail_Enabled();
-		WW3D::Set_Thumbnail_Enabled(false);
-
-		//load bump map textures off disk
-		TextureClass *pBumpSource;	//temporary textures in a format W3D understands
-		TextureClass *pBumpSource2;	//temporary textures in a format W3D understands
-		Int i;
-		i=NUM_BUMP_FRAMES;
-		while (i--)
-		{
-			char bump_name[128];
-
-			sprintf(bump_name,"caust%.2d.tga",i);
-			pBumpSource=WW3DAssetManager::Get_Instance()->Get_Texture(bump_name);
-			sprintf(bump_name,"caustS%.2d.tga",i);
-			pBumpSource2=WW3DAssetManager::Get_Instance()->Get_Texture(bump_name);
-			initBumpMap(m_pBumpTexture+i, pBumpSource);
-			initBumpMap(m_pBumpTexture2+i, pBumpSource2);
-			WW3DAssetManager::Get_Instance()->Release_Texture(pBumpSource);
-			WW3DAssetManager::Get_Instance()->Release_Texture(pBumpSource2);
-			REF_PTR_RELEASE(pBumpSource);
-			REF_PTR_RELEASE(pBumpSource2);
-		}
-		//restore previous thumpnail mode
-		WW3D::Set_Thumbnail_Enabled(thumbnails_enabled);
-	}
-#endif
-
-	//Setup material for regular water
-	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	
-
-
-	m_shaderClass = zFillAlphaShader;//ShaderClass::_PresetAlphaShader;ShaderClass::_PresetOpaqueShader;//detailOpaqueShader;
-	m_shaderClass.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);	//water should be visible from both sides
-
-	//Assets used for all types of water
-	m_alphaClippingTexture=WW3DAssetManager::Get_Instance()->Get_Texture(SKYBODY_TEXTURE);
-
-#ifdef CLIP_GEOMETRY_TO_PLANE
-	m_alphaClippingTexture=WW3DAssetManager::Get_Instance()->Get_Texture("alphaclip.tga");
-#endif
-
-	m_skyBox = ((W3DAssetManager*)W3DAssetManager::Get_Instance())->Create_Render_Obj( "new_skybox", TheGlobalData->m_skyBoxScale, 0);
-
-	//Enable clamping on all textures used by the skybox (to reduce corner seams).
-	if (m_skyBox && m_skyBox->Class_ID() == RenderObjClass::CLASSID_MESH)
-	{
-		MeshClass *mesh=(MeshClass*) m_skyBox;
-		MaterialInfoClass	*material = mesh->Get_Material_Info();
-
-		for (Int i=0; i<material->Texture_Count(); i++)
-		{
-			if (material->Peek_Texture(i))
-			{		
-				material->Peek_Texture(i)->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-				material->Peek_Texture(i)->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-			}
-		}
-
-		REF_PTR_RELEASE(material);
-	}
-
-	m_riverTexture=WW3DAssetManager::Get_Instance()->Get_Texture(TheWaterTransparency->m_standingWaterTexture.str()); 
-
-	//For some reason setting a NULL texture does not result in 0xffffffff for pixel shaders so using explicit "white" texture.
-	m_whiteTexture=MSGNEW("TextureClass") TextureClass(1,1,WW3D_FORMAT_A4R4G4B4,MIP_LEVELS_1);
-	SurfaceClass *surface=m_whiteTexture->Get_Surface_Level();
-	surface->DrawPixel(0,0,0xffffffff);
-	REF_PTR_RELEASE(surface);
-
-	m_waterNoiseTexture=WW3DAssetManager::Get_Instance()->Get_Texture("Noise0000.tga");
-	m_riverAlphaEdge=WW3DAssetManager::Get_Instance()->Get_Texture("TWAlphaEdge.tga");
-	m_waterSparklesTexture=WW3DAssetManager::Get_Instance()->Get_Texture("WaterSurfaceBubbles.tga");
-#ifdef DRAW_WATER_WAKES
-	m_waterTrackSystem = NEW WaterTracksRenderSystem;
-	m_waterTrackSystem->init();
-#endif
-
-	return 0;
-}
-
-void WaterRenderObjClass::updateMapOverrides(void)
-{
-	if (m_riverTexture && TheWaterTransparency->m_standingWaterTexture.compareNoCase(m_riverTexture->Get_Texture_Name()) != 0)
-	{
-		REF_PTR_RELEASE(m_riverTexture);
-		m_riverTexture = WW3DAssetManager::Get_Instance()->Get_Texture(TheWaterTransparency->m_standingWaterTexture.str());
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::reset( void )
-{
-
-	// for vertex animated water mesh reset the values
-	if( m_meshData)
-	{
-		Int i, j;
-		WaterMeshData *pData;
-		Int	mx = m_gridCellsX + 1;
-		Int my = m_gridCellsY + 1;
-
-		// go through each mesh point and adjust the height according to the velocity
-		for( j = 0, pData = m_meshData; j < (my + 2); j++ )
-		{	
-
-			for( i = 0; i < (mx + 2); i++ )
-			{
-
-				// areset grid values for this cell
-				pData->velocity = 0.0f;
-				pData->height = 0.0f;
-				pData->preferredHeight = 0.0f;
-				pData->status = WaterRenderObjClass::AT_REST;
-
-				// on to the next one
-				pData++;
-
-			}  // end for i
-
-		}  // end for j
-
-		// mesh data is no longer in motion
-		m_meshInMotion = FALSE;
-
-	}  // end if, water type 3
-
-	if (m_waterTrackSystem)
-		m_waterTrackSystem->reset();
-} 
-
-void WaterRenderObjClass::enableWaterGrid(Bool state)
-{
-	m_doWaterGrid = state;
-
-	m_drawingRiver = false;
-	m_disableRiver = false;
-
-	if (state && m_meshData == NULL)
-	{	//water type has changed, must allocate necessary assets for new water.
-		//contains the current deformed water surface z(height) values.  With 1 vertex invisible border
-		//around surface to speed up normal calculations.
-		m_meshDataSize = (m_gridCellsX+1+2)*(m_gridCellsY+1+2);
-		m_meshData=NEW WaterMeshData[ m_meshDataSize ];
-		memset(m_meshData,0,sizeof(WaterMeshData)*(m_gridCellsX+1+2)*(m_gridCellsY+1+2));
-		reset();
-
-		//Release existing grid data
-		SAFE_RELEASE(m_vertexBufferD3D);
-		SAFE_RELEASE(m_indexBufferD3D);
-
-		//Create new grid data
-		if (FAILED(generateIndexBuffer(m_gridCellsX+1,m_gridCellsY+1)))
-			return;
-		if (FAILED(generateVertexBuffer(m_gridCellsX+1,m_gridCellsY+1,sizeof(MaterMeshVertexFormat),false)))
-			return;
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Update phase for water if we need it.  This called once per client frame reguardless
-	* of how fast the logic framerate is running */
-// ------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::update( void )
-{
-	static UnsignedInt lastLogicFrame = 0;
-	UnsignedInt currLogicFrame = 0;
-	
-	if( TheGameLogic )
-		currLogicFrame = TheGameLogic->getFrame();
-
-	m_riverVOrigin += 0.002f;
-	m_riverXOffset += (Real)(0.0125*33/5000);
-	m_riverYOffset += (Real)(2*0.0125*33/5000);
-	if (m_riverXOffset > 1) m_riverXOffset -= 1;
-	if (m_riverYOffset > 1) m_riverYOffset -= 1;
-	if (m_riverXOffset < -1) m_riverXOffset += 1;
-	if (m_riverYOffset < -1) m_riverYOffset += 1;
- 	m_iBumpFrame++;
-	if (m_iBumpFrame >= NUM_BUMP_FRAMES) {
-		m_iBumpFrame = 0;
-	}
-
-
-
-	// we only process some things if the logic frame has changed
-	if( lastLogicFrame != currLogicFrame )
-	{
-
-		// for vertex animated water we need to update the vector field
-		if( m_doWaterGrid && m_meshInMotion == TRUE )
-		{
-			const Real PREFERRED_HEIGHT_FUDGE = 1.0f;		///< this is close enough to at rest
-			const Real AT_REST_VELOCITY_FUDGE = 1.0f;		///< when we're close enought to at rest height and velocity we will stop
-			const Real WATER_DAMPENING = 0.93f;					///< use with up force of 15.0
-			Int i, j;
-			Int	mx = m_gridCellsX+1;
-			Int my = m_gridCellsY+1;
-			WaterMeshData *pData;
-
-			//
-			// we will mark the mesh as clean now ... if any of the fields are still in motion
-			// they will continue to mark the mesh as dirty so processing continues next frame
-			//
-			m_meshInMotion = FALSE;
-
-			// go through each mesh point and adjust the height according to the velocity
-			for( j = 0, pData = m_meshData; j < (my + 2); j++ )
-			{	
-
-				for( i = 0; i < (mx + 2); i++ )
-				{
-
-					// only pay attention to mesh points that are in motion
-					if( BitIsSet( pData->status, WaterRenderObjClass::IN_MOTION ) )
-					{
-
-						// DAMPENING to slow the changes down
-						pData->velocity *= WATER_DAMPENING;
-
-						// if the height here is below our preferred height, we want to add upward force to counteract it
-						if( pData->height < pData->preferredHeight )
-							pData->velocity -= TheGlobalData->m_gravity * 3.0f;
-						else				
-							pData->velocity += TheGlobalData->m_gravity * 3.0f;
-
-						// adjust the height at this grid location according to the current velocity		
-						pData->height = pData->height + pData->velocity;
-
-						//
-						// if we are close enough to our preferred height and our velocity is small enough
-						// this will be our resting location
-						//
-						if( fabs( pData->height - pData->preferredHeight ) < PREFERRED_HEIGHT_FUDGE &&
-								fabs( pData->velocity ) < AT_REST_VELOCITY_FUDGE )
-						{
-
-							BitClear( pData->status, WaterRenderObjClass::IN_MOTION );
-							pData->height = pData->preferredHeight;
-							pData->velocity = 0.0f;
-
-						}  // end if
-						else
-						{
-
-							// there is still motion in the mesh, we need to process next frame
-							m_meshInMotion = TRUE;
-
-						}  // end else
-
-					}  // end if
-
-					// on to the next one
-					pData++;
-
-				}  // end for i
-
-			}  // end for j
-
-		}  // end if
-
-		// mark the last logic frame we processed on
-		lastLogicFrame = currLogicFrame;
-
-	}  // end if, a logic frame has passed
-
-}  // end update
-
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::replaceSkyboxTexture(const AsciiString& oldTexName, const AsciiString& newTextName)
-{
-	W3DAssetManager* assetManager = ((W3DAssetManager*)W3DAssetManager::Get_Instance());
-
-	assetManager->replacePrototypeTexture(m_skyBox, oldTexName.str(), newTextName.str());
-
-	//Enable clamping on all textures used by the skybox (to reduce corner seams).
-	if (m_skyBox && m_skyBox->Class_ID() == RenderObjClass::CLASSID_MESH)
-	{
-		MeshClass *mesh=(MeshClass*) m_skyBox;
-		MaterialInfoClass	*material = mesh->Get_Material_Info();
-
-		for (Int i=0; i<material->Texture_Count(); i++)
-		{
-			if (material->Peek_Texture(i))
-			{		
-				material->Peek_Texture(i)->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-				material->Peek_Texture(i)->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-			}
-		}
-	}
-
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Adjusts various water/sky rendering settings that depend on time of day. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::setTimeOfDay(TimeOfDay tod)
-{
-	m_tod=tod;
-	if (m_waterType == WATER_TYPE_2_PVSHADER)
-		generateVertexBuffer(PATCH_SIZE,PATCH_SIZE,sizeof(SEA_PATCH_VERTEX),true);	//update the water mesh with new lighting/alpha
-}
-
-//-------------------------------------------------------------------------------------------------
-/**Copies GDF settings dealing with a particular time of day into our own
-	* structures.  Also allocates any required W3D assets (textures). */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::loadSetting( Setting *setting, TimeOfDay timeOfDay )
-{
-	SurfaceClass::SurfaceDescription surfaceDesc;
-
-	// sanity
-	DEBUG_ASSERTCRASH( setting, ("WaterRenderObjClass::loadSetting, NULL setting\n") );
-	
-	// textures
-	setting->skyTexture = WW3DAssetManager::Get_Instance()->Get_Texture( WaterSettings[ timeOfDay ].m_skyTextureFile.str() );
-	setting->waterTexture = WW3DAssetManager::Get_Instance()->Get_Texture( WaterSettings[ timeOfDay ].m_waterTextureFile.str() );
-
-	// texelss per unit
-	setting->skyTexelsPerUnit = WaterSettings[ timeOfDay ].m_skyTexelsPerUnit;
-	setting->waterTexture->Get_Level_Description( surfaceDesc, 0 );
-	setting->skyTexelsPerUnit /= (Real)surfaceDesc.Width;
-
-	// water repeat
-	setting->waterRepeatCount = WaterSettings[ timeOfDay ].m_waterRepeatCount;
-
-	// U and V scroll per ms
-	setting->uScrollPerMs = WaterSettings[ timeOfDay ].m_uScrollPerMs;
-	setting->vScrollPerMs = WaterSettings[ timeOfDay ].m_vScrollPerMs;
-
-	//
-	// vertex colors
-	//
-	// bottom left
-	setting->vertex00Diffuse = (WaterSettings[ timeOfDay ].m_vertex00Diffuse.red << 16) |
-														 (WaterSettings[ timeOfDay ].m_vertex00Diffuse.green << 8) |
-														  WaterSettings[ timeOfDay ].m_vertex00Diffuse.blue;
-	// top left
-	setting->vertex01Diffuse = (WaterSettings[ timeOfDay ].m_vertex01Diffuse.red << 16) |
-														 (WaterSettings[ timeOfDay ].m_vertex01Diffuse.green << 8) |
-														  WaterSettings[ timeOfDay ].m_vertex01Diffuse.blue;
-	// bottom right
-	setting->vertex10Diffuse = (WaterSettings[ timeOfDay ].m_vertex10Diffuse.red << 16) |
-														 (WaterSettings[ timeOfDay ].m_vertex10Diffuse.green << 8) |
-														  WaterSettings[ timeOfDay ].m_vertex10Diffuse.blue;
-	// top right
-	setting->vertex11Diffuse = (WaterSettings[ timeOfDay ].m_vertex11Diffuse.red << 16) |
-														 (WaterSettings[ timeOfDay ].m_vertex11Diffuse.green << 8) |
-														  WaterSettings[ timeOfDay ].m_vertex11Diffuse.blue;
-
-	// diffuse water color
-	setting->waterDiffuse = (WaterSettings[ timeOfDay ].m_waterDiffuseColor.alpha << 24) |
-												  (WaterSettings[ timeOfDay ].m_waterDiffuseColor.red		<< 16) |
-													(WaterSettings[ timeOfDay ].m_waterDiffuseColor.green << 8) |
-												   WaterSettings[ timeOfDay ].m_waterDiffuseColor.blue;
-
-	// transparent water color
-	setting->transparentWaterDiffuse = (WaterSettings[ timeOfDay ].m_transparentWaterDiffuse.alpha << 24) |
-																		 (WaterSettings[ timeOfDay ].m_transparentWaterDiffuse.red	 << 16) |
-																		 (WaterSettings[ timeOfDay ].m_transparentWaterDiffuse.green << 8) |
-																		  WaterSettings[ timeOfDay ].m_transparentWaterDiffuse.blue;
-
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Our water may use effects that require run-time rendered textures.  These
-	*	textures need to be updated before we start rendering to the main screen
-	* render target because D3D doesn't multiple render targets. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::updateRenderTargetTextures(CameraClass *cam)
-{
-	if (m_waterType == WATER_TYPE_2_PVSHADER && getClippedWaterPlane(cam, NULL) &&
-		TheTerrainRenderObject && TheTerrainRenderObject->getMap())
-		renderMirror(cam);	//generate texture containing reflected scene
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Renders the reflected scene into an offscreen texture. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::renderMirror(CameraClass *cam)
-{
-#ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_disableWater) {
-		return;
-	}
-#endif
-	Matrix3D	OldCameraMatrix=cam->Get_Transform();
-	Matrix4x4	FullMatrix4(cam->Get_Transform());	//copy 3x4 matrix into a 4x4
-	Vector3		WaterNormal(0,0,1);	//normal of plane used for reflection
-	Vector4		WaterPlane(WaterNormal.X,WaterNormal.Y,WaterNormal.Z,m_level);
-	Vector3		rRight,rUp,rN,rPos;	//orientation and translation vectors of camera
-
-	Matrix4x4	FullMatrix(FullMatrix4.Transpose());	//swap rows/columns
-
-	//reflect camera right vector
-	Real axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[0],WaterNormal);
-	rRight = (Vector3&)FullMatrix[0] - (2.0f*axis_distance*WaterNormal);
-
-	//reflect camera up vector
-	axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[1],WaterNormal);
-	rUp = (Vector3&)FullMatrix[1] - (2.0f*axis_distance*WaterNormal);
-
-	//reflect camera n vector
-	axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[2],WaterNormal);
-	rN = (Vector3&)FullMatrix[2] - (2.0f*axis_distance*WaterNormal);
-
-	//reflect camera position
-	axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[3],WaterNormal);	//distance cam to origin
-	axis_distance -= WaterPlane.W;	// subtract mirror plane distance to get distance camera to plane
-	rPos = (Vector3&)FullMatrix[3] - (2.0f*axis_distance*WaterNormal);
-
-	//generate a new camera matrix from reflected vectors
-	Matrix3D reflectedTransform(rRight,rUp,rN,rPos);
-
-
-	DX8Wrapper::Set_Render_Target(m_pReflectionTexture);
-
-	// Clear the backbuffer
-	WW3D::Begin_Render(false,true,Vector3(0.0f,0.0f,0.0f));	//clearing only z-buffer since background always filled with clouds
-
-	cam->Set_Transform( reflectedTransform );
-
-	//Force reflected image to be drawn into full texture size - not a viewport inside texture.
-	Vector2 vMin,vMax,vOldMax,vOldMin;
- 	cam->Get_Viewport(vOldMin,vOldMax);
- 	vMax.X=vMax.Y=1.0f;
-	vMin.X=vMin.Y=0.0f;
- 	cam->Set_Viewport(vMin,vMax);
-
-	cam->Apply();	//force an update of all the camera dependent parameters like frustum clip planes
-
-	//flip the winding order of polygons to draw the reflected back sides.
-	ShaderClass::Invert_Backface_Culling(true);
-
-	// Render the scene
-	renderSky();
-	if (m_tod == TIME_OF_DAY_NIGHT)
-		renderSkyBody(&reflectedTransform);
-
-	WW3D::Render(m_parentScene,cam);
-
-	cam->Set_Transform(OldCameraMatrix);	//restore original non-reflected matrix
- 	cam->Set_Viewport(vOldMin,vOldMax);
-
-	cam->Apply();	//force an update of all the camera dependent parameters like frustum clip planes
-
-	ShaderClass::Invert_Backface_Culling(false);
-
-	WW3D::End_Render(false);
-
-	// Change the rendertarget back to the main backbuffer
-	DX8Wrapper::Set_Render_Target((IDirect3DSurface8 *)NULL);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Renders (draws) the water.
-	*	Algorithm:
-	*	Draw reflected scene.
-	*	Draw reflected sky layer(s) and bodies.
-	*	Clear Zbuffer
-	*	Fill Zbuffer by drawing water surface (allows proper sorting into regular scene).
-	*	Draw non-reflected scene (done in regular app render loop).
-	*
-	*	This algorithm doesn't apply to translucent water, which is rendered into a
-	*   texture and rendered at end of scene. */
-//-------------------------------------------------------------------------------------------------
-//DECLARE_PERF_TIMER(Water)
-void WaterRenderObjClass::Render(RenderInfoClass & rinfo)
-{
-	//USE_PERF_TIMER(Water)
-	if (TheTerrainRenderObject && !TheTerrainRenderObject->getMap())
-		return;	//no map has been loaded yet.
-
-	if (((RTS3DScene *)rinfo.Camera.Get_User_Data())->getCustomPassMode() == SCENE_PASS_ALPHA_MASK ||
-		((SceneClass *)rinfo.Camera.Get_User_Data())->Get_Extra_Pass_Polygon_Mode() == SceneClass::EXTRA_PASS_CLEAR_LINE)
-		return;	//water is not drawn in wireframe or custom scene passes
-
-#ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_disableWater) {
-		return;
-	}
-#endif
-	if (ShaderClass::Is_Backface_Culling_Inverted())
-		return;	//the water object will not reflect in itself, so don't do anything if rendering a mirror.
-
-	//this water type needs to rendered after the rest of scene, so buffer it up for later
-
-	// If static sort lists are enabled and this mesh has a sort level, put it on the list instead
-	// of rendering it.
-	unsigned int sort_level = (unsigned int)Get_Sort_Level();
-
-	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level != SORT_LEVEL_NONE) 
-	{	
-		WW3D::Add_To_Static_Sort_List(this, sort_level);
-		return;
-	}
-
-	switch(m_waterType)
-	{
-		case WATER_TYPE_0_TRANSLUCENT:
-		case WATER_TYPE_3_GRIDMESH:
-			//Draw the water surface as a bunch of alpha blended tiles covering areas where water is visible
-			renderWater();
-			if (!m_drawingRiver || m_disableRiver) {
-				renderWaterMesh();	//Draw water surface as 3D deforming mesh if it's enabled on this map.
-			}
-			break;
-
-		case WATER_TYPE_2_PVSHADER:
-			//Pixel/Vertex Shader based water which uses an off-screen rendered reflection texture
-			drawSea(rinfo);	//draw water surface
-			break;
-
-		case WATER_TYPE_1_FB_REFLECTION:
-			{
-				//Normal frame buffer reflection water type. Non translucent.  Legacy code we're not using anymore.
-				Matrix3D	OldCameraMatrix=rinfo.Camera.Get_Transform();
-				Matrix4x4	FullMatrix4(rinfo.Camera.Get_Transform());	//copy 3x4 matrix into a 4x4
-				Vector3		WaterNormal(0,0,1);	//normal of plane used for reflection
-				Vector4		WaterPlane(WaterNormal.X,WaterNormal.Y,WaterNormal.Z,m_level);	//assume distance to origin 0
-				Vector3		rRight,rUp,rN,rPos;	//orientation and translation vectors of camera
-
-				Matrix4x4	FullMatrix(FullMatrix4.Transpose());	//swap rows/columns
-
-				//reflect camera right vector
-				Real axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[0],WaterNormal);
-				rRight = (Vector3&)FullMatrix[0] - (2.0f*axis_distance*WaterNormal);
-
-				//reflect camera up vector
-				axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[1],WaterNormal);
-				rUp = (Vector3&)FullMatrix[1] - (2.0f*axis_distance*WaterNormal);
-
-				//reflect camera n vector
-				axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[2],WaterNormal);
-				rN = (Vector3&)FullMatrix[2] - (2.0f*axis_distance*WaterNormal);
-
-				//reflect camera position
-				axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[3],WaterNormal);	//distance cam to origin
-				axis_distance -= WaterPlane.W;	// subtract mirror plane distance to get distance camera to plane
-				rPos = (Vector3&)FullMatrix[3] - (2.0f*axis_distance*WaterNormal);
-
-				//generate a new camera matrix from reflected vectors
-				Matrix3D reflectedTransform(rRight,rUp,rN,rPos);
-
-				//flip the winding order of polygons to draw the reflected back sides.
-				ShaderClass::Invert_Backface_Culling(true);
-
-			#ifdef CLIP_GEOMETRY_TO_PLANE
-			  // Set a clip plane, so that only objects above the water are reflected
-				WaterPlane.W *= -1.0f;	//flip sign of plane distance for D3D use.
-
-			//	DX8Wrapper::Set_DX8_Clip_Plane( 0, &WaterPlane.X );
-			//	DX8Wrapper::Set_DX8_Render_State(D3DRS_CLIPPLANEENABLE, D3DCLIPPLANE0 );	//turn on first clip plane
-
-				// Alternate Clipping Method using alpha testing hack!
-				/**************************************************************************************/
-
-				D3DXMATRIX inv;
-				D3DXMATRIX clipMatrix;
-				Real det;
-				Matrix4x4 curView;
-
-				//get current view matrix
-				DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-				//get inverse of view matrix(= view to world matrix)
-				D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-				//create clipping matrix by inserting our plane equation into the 1st column
-				D3DXMatrixIdentity(&clipMatrix);
-				clipMatrix(0,0)=WaterNormal.X;
-				clipMatrix(1,0)=WaterNormal.Y;
-				clipMatrix(2,0)=WaterNormal.Z;
-				clipMatrix(3,0)=WaterPlane.W+0.5f;
-				inv *=clipMatrix;
-
-				// Change texture wrapping mode to 'clamp' for texture stage 1
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-				// Use CameraSpace vertices as input to matrix and use texture wrap mode from stage 1
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION|1);
-				// Two output coordinates are used.
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-				// Set texture generation matrix for stage 1
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, *((Matrix4*)&inv));
-
-				// Disable bilinear filtering
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-
-				// Pass stage 0 texture data untouched(by modulating with white)
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );	//stage 1 texture
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );	//previous stage texture
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );	//module with white => does nothing
-
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );	//stage 1 texture
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );	//previous stage texture
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );	//modulate with clipping texture
-
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHAREF,0x00);
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHAFUNC,D3DCMP_NOTEQUAL);	//pass pixels who's alpha is not zero
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHATESTENABLE, true);	//test pixels if transparent(clipped) before rendering.
-
-				// Set clipping texture
-				m_alphaClippingTexture->Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-				m_alphaClippingTexture->Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-				m_alphaClippingTexture->Set_Min_Filter(TextureFilterClass::FILTER_TYPE_NONE);
-				m_alphaClippingTexture->Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_NONE);
-				m_alphaClippingTexture->Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
-
-				DX8Wrapper::Set_Texture(0,m_alphaClippingTexture);
-
-				//TODO: Will have to make sure that the shader system is not resetting my stage 1 setup
-				//while rendering the scene
-
-				/*************************************************************************************/
-			#endif
-
-			#if 0	// No longer do simple rendering.
-				if (TheGlobalData->m_useWaterPlane)
-				{
-					//@todo : Would it be better to create a new camera or change the transform of the
-					//existing one?
-					rinfo.Camera.Set_Transform( reflectedTransform );
-					rinfo.Camera.Apply();	//force an update of all the camera dependent parameters like frustum clip planes
-
-					if(m_useCloudLayer)
-					{	
-						if (TheGlobalData && TheGlobalData->m_drawEntireTerrain)
-							m_skyBox->Render(rinfo);
-						else
-						{
-							renderSky();
-							if (m_tod == TIME_OF_DAY_NIGHT)
-								renderSkyBody(&reflectedTransform);
-						}
-					}
-
-					WW3D::Render(m_parentScene,&rinfo.Camera);
-
-					rinfo.Camera.Set_Transform(OldCameraMatrix);	//restore original non-reflected matrix
-					rinfo.Camera.Apply();	//force an update of all the camera dependent parameters like frustum clip planes
-
-					//clear the z-buffer to remove changes made by objects inside mirror
-					DX8Wrapper::Clear(false,true,Vector3(0.1f,0.1f,0.1f));
-				}
-			#endif
-
-			#ifdef CLIP_GEOMETRY_TO_PLANE
-				//restore default culling mode
-			//	DX8Wrapper::Set_DX8_Render_State(D3DRS_CLIPPLANEENABLE, 0 );	//turn off first clip plane
-
-				//disable texture coordinate generation
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHATESTENABLE, false);	//disable alpha testing
-			#endif
-
-				ShaderClass::Invert_Backface_Culling(false);	//return culling back to normal
-
-				ShaderClass::Invalidate();	//reset shading system so it forces full state set.
-
-				renderWater();
-			}	//WATER_TYPE_1
-
-		default:
-			break;
-	}//switch
-
-	if (TheGlobalData && TheGlobalData->m_drawSkyBox)
-	{	//center skybox around camera
-		Vector3 pos=rinfo.Camera.Get_Position();
-		pos.Z = TheGlobalData->m_skyBoxPositionZ;
-		m_skyBox->Set_Position(pos);
-		m_skyBox->Render(rinfo);
-	}
-
-	//Clean up after any pixel shaders.
-	//Force render state apply so that the "NULL" texture gets applied to D3D, thus releasing shroud reference count.
-	DX8Wrapper::Apply_Render_State_Changes();
-	DX8Wrapper::Invalidate_Cached_Render_States();
-
-	if (m_waterTrackSystem)
-		m_waterTrackSystem->flush(rinfo);
-
-//	renderWaterMesh();
-//	renderWaterWave();
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Clips the water plane to the current camera frustum and returns a bounding
-	* box enclosing the clipped plane.  Returns false if water plane is not visible. */
-//-------------------------------------------------------------------------------------------------
-Bool WaterRenderObjClass::getClippedWaterPlane(CameraClass *cam, AABoxClass *box)
-{
-	const FrustumClass & frustum = cam->Get_Frustum();
-
-	ClipPolyClass	ClippedPoly0;
-	ClipPolyClass	ClippedPoly1;
-
-	///@todo: generate proper sized polygon
-	ClippedPoly0.Reset();
-	ClippedPoly0.Add_Vertex(Vector3(0,0,m_level));
-	ClippedPoly0.Add_Vertex(Vector3(0,m_dy,m_level));
-	ClippedPoly0.Add_Vertex(Vector3(m_dx,m_dy,m_level));
-	ClippedPoly0.Add_Vertex(Vector3(m_dx,0,m_level));
-
-	//clip against all 6 frustum planes
-	ClippedPoly0.Clip(frustum.Planes[0],ClippedPoly1);
-	ClippedPoly1.Clip(frustum.Planes[1],ClippedPoly0);
-	ClippedPoly0.Clip(frustum.Planes[2],ClippedPoly1);
-	ClippedPoly1.Clip(frustum.Planes[3],ClippedPoly0);
-	ClippedPoly0.Clip(frustum.Planes[4],ClippedPoly1);
-	ClippedPoly1.Clip(frustum.Planes[5],ClippedPoly0);
-
-	Int final_vcount = ClippedPoly0.Verts.Count();
-
-	//make sure the polygon is visible
-	if (final_vcount >= 3)
-	{	
-		//find axis aligned bounding box around visible polygon
-		if (box)
-  			box->Init(&(ClippedPoly0.Verts[0]),final_vcount);
-		return TRUE;
-	}
-
-	return FALSE;	//water plane is not visible
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Draws the water surface using a custom D3D vertex/pixel shader and a
-	* reflection texture.  Only tested to work on GeForce3. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::drawSea(RenderInfoClass & rinfo)
-{
-	AABoxClass	seaBox;
-
-	if (!getClippedWaterPlane(&rinfo.Camera,&seaBox))
-		return;	//the sea is not visible
-
-	D3DXMATRIX matProj, matView, matWW3D;
-
-	//create a transform which will flip the y and z coordinates to fit our system
-	memset(&matWW3D,0,sizeof(D3DMATRIX));
-	matWW3D._11=1.0f;
-	matWW3D._32=1.0f;
-	matWW3D._23=1.0f;
-	matWW3D._44=1.0f;
-
-	Matrix3D tm(Transform);
-
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
-	DX8Wrapper::Set_Texture(0,NULL);	//we'll be setting our own textures, so reset W3D
-	DX8Wrapper::Set_Texture(1,NULL);	//we'll be setting our own textures, so reset W3D
-
-
-	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-	Vector3 camTran;
-
-	rinfo.Camera.Get_Transform().Get_Translation(&camTran);
-
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, *(Matrix4x4*)&matView);
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_PROJECTION, *(Matrix4x4*)&matProj);
-
-	//default setup from Kenny's demo
-	m_pDev->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	m_pDev->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-	m_pDev->SetTextureStageState( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE);
-	m_pDev->SetTextureStageState( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, 0 );
-
-	m_pDev->SetTextureStageState( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	m_pDev->SetTextureStageState( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-	m_pDev->SetTextureStageState( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE);
-	m_pDev->SetTextureStageState( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 1, D3DTSS_TEXCOORDINDEX, 1 );
-
-	m_pDev->SetTextureStageState( 2, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	m_pDev->SetTextureStageState( 2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|2);
-
-	m_pDev->SetTextureStageState( 3, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	m_pDev->SetTextureStageState( 3, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|3);
-
-//	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-//	m_pDev->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-//	m_pDev->SetTextureStageState( 0, D3DTSS_MIPFILTER, D3DTEXF_POINT );
-
-//	m_pDev->SetTextureStageState( 1, D3DTSS_MINFILTER, D3DTEXF_POINT );
-//	m_pDev->SetTextureStageState( 1, D3DTSS_MAGFILTER, D3DTEXF_POINT );
-//	m_pDev->SetTextureStageState( 1, D3DTSS_MIPFILTER, D3DTEXF_NONE );
-	//end of default setup
-
-	m_pDev->SetTextureStageState(0, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	m_pDev->SetTextureStageState(0, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-	m_pDev->SetRenderState( D3DRS_WRAP0, D3DWRAP_U | D3DWRAP_V);
-
-	m_pDev->SetTextureStageState(1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	m_pDev->SetTextureStageState(1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-	m_pDev->SetTexture( 0, m_pBumpTexture[m_iBumpFrame]);
-#ifdef MIPMAP_BUMP_TEXTURE
-	m_pDev->SetTextureStageState( 0, D3DTSS_MIPFILTER, D3DTEXF_POINT );
-	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-#endif
-	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVMAT00, F2DW(m_fBumpScale) );
-	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVMAT01, F2DW(0.0f) );
-	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVMAT10, F2DW(0.0f) );
-	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVMAT11, F2DW(m_fBumpScale) );
-	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVLSCALE, F2DW(1.0f) );
-	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVLOFFSET, F2DW(0.0f) );
-
-	m_pDev->SetTextureStageState( 2, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 2, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-	m_pDev->SetRenderState(D3DRS_ZWRITEENABLE , FALSE);
-
-	D3DXMATRIX mat;
-	memset(&mat,0,sizeof(D3DXMATRIX));
-
-	mat._11 = 0.5f; mat._12 = -0.5f; mat._13 = 0.5f;   mat._14=0.5f;
-	mat._21 = 0.5f; mat._22 = 0.5f; mat._23 = 0.0f;   mat._24=0.0f;
-	mat._31 = 0.0f; mat._32 = 0.0f; mat._33 = 0.0f;   mat._34=1.0f;
-	mat._41 = 0.0f; mat._42 = 0.0f; mat._43 = 0.0f;   mat._44=1.0f;
-
-	m_pDev->SetVertexShaderConstant(CV_TEXPROJ_0, &mat, 4);
-
-	// Setup constants
-	m_pDev->SetVertexShaderConstant(CV_ZERO,   D3DXVECTOR4(0.0f, 0.0f, 0.0f, 0.0f), 1);
-	m_pDev->SetVertexShaderConstant(CV_ONE,    D3DXVECTOR4(1.0f, 1.0f, 1.0f, 1.0f), 1);
-
-	m_pDev->SetVertexShader(m_dwWaveVertexShader);
-	m_pDev->SetPixelShader(m_dwWavePixelShader);
-
-//	Make reflection brighter to compensate for darker coloring on sea floor
-//	m_pDev->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_ONE );
-//	m_pDev->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_SRCCOLOR );
-
-	m_pDev->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_SRCALPHA );
-	m_pDev->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA );
-
-	m_pDev->SetRenderState(D3DRS_ALPHABLENDENABLE , TRUE);
-	m_pDev->SetTexture( 1, m_pReflectionTexture->Peek_D3D_Texture());
-
-//	m_pDev->SetRenderState(D3DRS_FILLMODE,D3DFILL_WIREFRAME);//LORENZEN
-
-	Int patchX,patchY,startX,startY;
-
-	D3DXMATRIX patchMatrix;
-	memset(&patchMatrix,0,sizeof(D3DXMATRIX));
-	patchMatrix._11=PATCH_SCALE;
-	patchMatrix._22=1.0f;
-	patchMatrix._33=PATCH_SCALE;
-	patchMatrix._44=1.0f;
-
-	m_pDev->SetStreamSource(0,m_vertexBufferD3D,sizeof(WaterRenderObjClass::SEA_PATCH_VERTEX));
-	m_pDev->SetIndices(m_indexBufferD3D,0);
-
-	for (startY=patchY=(seaBox.Center.Y-seaBox.Extent.Y)/(PATCH_WIDTH*PATCH_SCALE); (patchY*PATCH_WIDTH*PATCH_SCALE)<(seaBox.Center.Y+seaBox.Extent.Y); patchY++)
-	{
-		for (startX=patchX=(seaBox.Center.X-seaBox.Extent.X)/(PATCH_WIDTH*PATCH_SCALE); (patchX*PATCH_WIDTH*PATCH_SCALE)<(seaBox.Center.X+seaBox.Extent.X); patchX++)
-		{
-			D3DXMATRIX matWorldViewProj, matTemp, matTempWorld;
-			patchMatrix._41=(float)(patchX*PATCH_WIDTH*PATCH_SCALE );
-			patchMatrix._43=(float)(patchY*PATCH_WIDTH*PATCH_SCALE );
-			//convert the default D3D coordinate system into ours
-			D3DXMatrixMultiply(&matTempWorld, &patchMatrix, &matWW3D);
-
-			D3DXMatrixMultiply(&matTemp, &matTempWorld, &matView);
-			D3DXMatrixMultiply(&matWorldViewProj, &matTemp, &matProj);
-			//matrices must be transposed before loading into vertex shader registers
-			D3DXMatrixTranspose(&matWorldViewProj, &matWorldViewProj);
-			m_pDev->SetVertexShaderConstant(CV_WORLDVIEWPROJ_0, &matWorldViewProj, 4);	//pass transform matrix into shader
-
-			m_pDev->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,0,m_numVertices,0,m_numIndices);
-		}
-	}
-//	m_pDev->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
-	m_pDev->SetRenderState(D3DRS_ALPHABLENDENABLE , FALSE);
-	m_pDev->SetTexture( 0, NULL);	//release reference to bump texture
-	m_pDev->SetTexture( 1, NULL);	//release reference to reflection texture
-	m_pDev->SetTexture( 2, NULL);	//release reference to reflection texture
-
-	m_pDev->SetTextureStageState( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	m_pDev->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-	m_pDev->SetTextureStageState( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	m_pDev->SetTextureStageState( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
-	m_pDev->SetRenderState(D3DRS_ZWRITEENABLE , TRUE);
-
-	m_pDev->SetTextureStageState(1, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	m_pDev->SetTextureStageState(1, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-	m_pDev->SetRenderState( D3DRS_WRAP0, 0);	//turn off texture wrapping
-
-	m_pDev->SetTextureStageState( 0, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 2, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 2, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-	//Restore old transforms
-	DX8Wrapper::_Set_DX8_Transform(D3DTS_VIEW, *(Matrix4x4*)&matView);
-	DX8Wrapper::_Set_DX8_Transform(D3DTS_PROJECTION, *(Matrix4x4*)&matProj);
-
-	m_pDev->SetPixelShader(0);	//turn off pixel shader
-	m_pDev->SetVertexShader(DX8_FVF_XYZDUV1);	//turn off custom vertex shader
-
-	DX8Wrapper::Invalidate_Cached_Render_States();
-
-	if (TheTerrainRenderObject->getShroud())
-	{
-		//do second pass to apply the shroud on water plane
-		W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
-		W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 0);
-		m_pDev->SetStreamSource(0,m_vertexBufferD3D,sizeof(WaterRenderObjClass::SEA_PATCH_VERTEX));
-		m_pDev->SetIndices(m_indexBufferD3D,0);
-		for (startY=patchY=(seaBox.Center.Y-seaBox.Extent.Y)/(PATCH_WIDTH*PATCH_SCALE); (patchY*PATCH_WIDTH*PATCH_SCALE)<(seaBox.Center.Y+seaBox.Extent.Y); patchY++)
-		{
-			for (startX=patchX=(seaBox.Center.X-seaBox.Extent.X)/(PATCH_WIDTH*PATCH_SCALE); (patchX*PATCH_WIDTH*PATCH_SCALE)<(seaBox.Center.X+seaBox.Extent.X); patchX++)
-			{
-				D3DXMATRIX matTemp;
-				patchMatrix._41=(float)(patchX*PATCH_WIDTH*PATCH_SCALE);
-				patchMatrix._43=(float)(patchY*PATCH_WIDTH*PATCH_SCALE);
-
-				D3DXMatrixMultiply(&matTemp, &patchMatrix, &matWW3D);
-
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_WORLD, *(Matrix4x4*)&matTemp);
-
-				m_pDev->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,0,m_numVertices,0,m_numIndices);
-			}
-		}
-		W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-	}
-
-}
-
-
-#define FEATHER_LAYER_COUNT (5.0f)
-#define FEATHER_THICKNESS   (4.0f)
-
-//-------------------------------------------------------------------------------------------------
-/** Renders (draws) the water surface.*/
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::renderWater(void)
-{
-	for (PolygonTrigger *pTrig=PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
-		if (pTrig->isWaterArea()) {
-			if (pTrig->getNumPoints()>2) {
-				if (pTrig->isRiver()) {
-					drawRiverWater(pTrig);
-					continue;
-				} 
-				Int k;
-				for (k=1; k<pTrig->getNumPoints()-1; k=k+2) {
-					ICoord3D pt3 = *pTrig->getPoint(0);
-					ICoord3D pt2 = *pTrig->getPoint(k);
-					ICoord3D pt1 = *pTrig->getPoint(k+1);
-					ICoord3D pt0 = *pTrig->getPoint(k+1);
-					if (k+2<pTrig->getNumPoints()) {
-						pt0 = *pTrig->getPoint(k+2);
-					}
-					Vector3 points[4];
-					points[0].Set(pt0.x, pt0.y, pt0.z);
-					points[1].Set(pt1.x, pt1.y, pt1.z);
-					points[2].Set(pt2.x, pt2.y, pt2.z);
-					points[3].Set(pt3.x, pt3.y, pt3.z);
-
-					if ( TheGlobalData->m_featherWater )
-					{
-						for (int r = 0; r < TheGlobalData->m_featherWater; ++r)
-						{
-							drawTrapezoidWater(points);
-							points[0].Z += (FEATHER_THICKNESS/TheGlobalData->m_featherWater);
-						}
-					}
-
-					else
-						drawTrapezoidWater(points);
-
-
-				}
-			}
-		}
-	}
-
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Renders (draws) the sky plane.  Will apply current time-of-day settings including
-	* some simple UV scrolling animation. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::renderSky(void)
-{
-	Int timeNow,timeDiff;
-	Real fu,fv;
-
-	Setting *setting=&m_settings[m_tod];
-
-	timeNow=timeGetTime();
-
-	timeDiff=timeNow-m_LastUpdateTime;
-	m_LastUpdateTime=timeNow;
-
-	m_uOffset += timeDiff * setting->uScrollPerMs * setting->skyTexelsPerUnit;
-	m_vOffset += timeDiff * setting->vScrollPerMs * setting->skyTexelsPerUnit;
-
-	//clamp uv coordinate into 0,1 range
-	m_uOffset = m_uOffset - (Real)((Int) m_uOffset);
-	m_vOffset = m_vOffset - (Real)((Int) m_vOffset);
-
-	fu= m_uOffset + (SKYPLANE_SIZE * 2) * setting->skyTexelsPerUnit;
-	fv= m_vOffset + (SKYPLANE_SIZE * 2) * setting->skyTexelsPerUnit;
-
-
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);
-
-	ShaderClass m_shader2=ShaderClass::_PresetOpaqueShader;
-	m_shader2.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);
-	m_shader2.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);	//no need to check against z-buffer, sky always rendered first.
-	m_shader2.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);	//sky is always behind everything so no need to update z-buffer
-
-	DX8Wrapper::Set_Shader(m_shader2);
-
-	DX8Wrapper::Set_Texture(0,setting->skyTexture);
-
-	//draw an infinite sky plane
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,4);
-	{
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* verts=lock.Get_Formatted_Vertex_Array();
-		if(verts)
-		{
-			verts[0].x=-SKYPLANE_SIZE;
-			verts[0].y=SKYPLANE_SIZE;
-			verts[0].z=SKYPLANE_HEIGHT;
-			verts[0].u1=m_uOffset;
-			verts[0].v1=fv;
-			verts[0].diffuse=setting->vertex01Diffuse;
-	
-			verts[1].x=SKYPLANE_SIZE;
-			verts[1].y=SKYPLANE_SIZE;
-			verts[1].z=SKYPLANE_HEIGHT;
-			verts[1].u1=fu;
-			verts[1].v1=fv;
-			verts[1].diffuse=setting->vertex11Diffuse;
-	
-			verts[2].x=SKYPLANE_SIZE;
-			verts[2].y=-SKYPLANE_SIZE;
-			verts[2].z=SKYPLANE_HEIGHT;
-			verts[2].u1=fu;
-			verts[2].v1=m_vOffset;
-			verts[2].diffuse=setting->vertex10Diffuse;
-	
-			verts[3].x=-SKYPLANE_SIZE;
-			verts[3].y=-SKYPLANE_SIZE;
-			verts[3].z=SKYPLANE_HEIGHT;
-			verts[3].u1=m_uOffset;
-			verts[3].v1=m_vOffset;
-			verts[3].diffuse=setting->vertex00Diffuse;
-		}
-	}
-
-	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
-	DX8Wrapper::Set_Vertex_Buffer(vb_access);
-
-	Matrix3D tm(1);
-	tm.Set_Translation(Vector3(0,0,0));
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-
-	DX8Wrapper::Draw_Triangles(	0,2, 0,	4);	//draw a quad, 2 triangles, 4 verts
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Renders (draws) the sky body.  Used for moon and sun.  We rotate the image
-	* so that it always faces the camera.  This removes perspective and helps hide that
-	* it's a flat image. */
-//-------------------------------------------------------------------------------------------------
-///	@todo: Add code to render properly sorted sun sky body.
-void WaterRenderObjClass::renderSkyBody(Matrix3D *mat)
-{	
-	Vector3 cPos;
-
-	Vector3 pView,pRight,pUp,pPos(SKYBODY_X,SKYBODY_Y,SKYBODY_HEIGHT);
-
-	mat->Get_Translation(&cPos);
-
-	pView=cPos-pPos;	//billboard to camera
-	pView.Normalize();	//particle view direction
-
-	Vector3 WorldUp(0,0,-1);	///@todo: hacked so only works for reflections across xy plane
-
-#ifdef ALLOW_TEMPORARIES
-	Vector3 rotAxis=Vector3::Cross_Product(WorldUp,pView);	//get axis of rotation.
-	rotAxis.Normalize();
-#else
-	Vector3 rotAxis;
-	Vector3::Normalized_Cross_Product(WorldUp, pView, &rotAxis);	
-#endif
-
-	Real angle=Vector3::Dot_Product(WorldUp,pView);
-
-	angle = acos(angle);
-
-
-	Matrix3D tm(1);
-	tm.Set(rotAxis,angle);
-	tm.Adjust_Translation(Vector3(SKYBODY_X,SKYBODY_Y,SKYBODY_HEIGHT));
-
-
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-
-
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);
-
-	ShaderClass m_shader2=ShaderClass::_PresetAlphaShader;
-	m_shader2.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);
-	m_shader2.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);	//no need to check against z-buffer, sky always rendered first.
-	m_shader2.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);	//sky is always behind everything so no need to update z-buffer
-
-	DX8Wrapper::Set_Shader(m_shader2);
-
-
-//	DX8Wrapper::Set_Shader(ShaderClass::/*_PresetAdditiveShader*//*_PresetOpaqueShader*/_PresetAlphaShader);
-//	DX8Wrapper::Set_Texture(0,setting->skyBodyTexture);
-
-	DX8Wrapper::Set_Texture(0,m_alphaClippingTexture);
-
-	//draw an infinite sky plane
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,4);
-	{
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* verts=lock.Get_Formatted_Vertex_Array();
-		if(verts)
-		{
-			verts[0].x=-SKYBODY_SIZE;
-			verts[0].y=SKYBODY_SIZE;
-			verts[0].z=0;
-			verts[0].u2=0;
-			verts[0].v2=1;
-			verts[0].diffuse=0xffffffff;
-	
-			verts[1].x=SKYBODY_SIZE;
-			verts[1].y=SKYBODY_SIZE;
-			verts[1].z=0;
-			verts[1].u2=1;
-			verts[1].v2=1;
-			verts[1].diffuse=0xffffffff;
-	
-			verts[2].x=SKYBODY_SIZE;
-			verts[2].y=-SKYBODY_SIZE;
-			verts[2].z=0;
-			verts[2].u2=1;
-			verts[2].v2=0;
-			verts[2].diffuse=0xffffffff;
-	
-			verts[3].x=-SKYBODY_SIZE;
-			verts[3].y=-SKYBODY_SIZE;
-			verts[3].z=0;
-			verts[3].u2=0;
-			verts[3].v2=0;
-			verts[3].diffuse=0xffffffff;
-		}
-	}
-
-	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
-	DX8Wrapper::Set_Vertex_Buffer(vb_access);
-
-	DX8Wrapper::Draw_Triangles(	0,2, 0,	4);	//draw a quad, 2 triangles, 4 verts
-}
-
-//Defines for procedural water animation.
-#define WATER_FREQ	(2.0*3.2831/4.0)	//2pi (full cycle) cover 4 units
-#define WATER_AMP	(1.0f)
-#define	WATER_OFFSET (0.1f)
-
-//-------------------------------------------------------------------------------------------------
-/** Renders (draws) the water surface mesh geometry.
-	*	This is a work-in-progress!  Do not use this code! */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::renderWaterMesh(void)
-{
-
-	if (!m_doWaterGrid)
-		return;	//the water grid is disabled.
-
-	//According to Nvidia there's a D3D bug that happens if you don't start with a
-	//new dynamic VB each frame - so we force a DISCARD by overflowing the counter.
-	m_vertexBufferD3DOffset = 0xffff;
-
-	Setting *setting=&m_settings[m_tod];
-
-	WaterMeshData *pData;
-	Int	mx=m_gridCellsX+1;
-	Int my=m_gridCellsY+1;
-	Int i,j;
-	
-	Real cellSizeX=m_gridCellSize;
-	Real cellSizeY=m_gridCellSize;
-//	Real	uScale2=5.0f*setting->waterRepeatCount/(128.0f)*cellSizeX/10.0f;
-//	Real	vScale2=5.0f*setting->waterRepeatCount/(128.0f)*cellSizeY/10.0f;
-
-	//Old waterRepeatCount settings in INI were based on 128x128 water grid of cellsize=10
-	//Scale values to correct size.
-	Real	uScale=setting->waterRepeatCount/(128.0f)*cellSizeX/10.0f*0.2f;
-	Real	vScale=setting->waterRepeatCount/(128.0f)*cellSizeY/10.0f*0.2f;
-
-	Vector3	nx(cellSizeX*2.0f,0,0);
-	Vector3 ny(0,cellSizeY*2.0f,0);
-	Vector3 C;
-
-#ifdef DO_WATER_SIMULATION		//Debug code used to create a dummy water animation
-	//
-	// Mark: If you re-enable this water simulation, you might want to consider moving
-	// this code to the update() method of the water render object (Colin)
-	//
-
-	static Real PhasePerFrameX=0.1f;
-	static Real PhasePerFrameY=0.1f;
-
-	//update the mesh heights for this frame (update buffer is 2 samples wider/taller due to border)
-	for (j=0,pData=m_meshData; j<(my+2); j++)
-	{	
-		for (i=0; i<(mx+2); i++)
-		{
-			//*pData = WATER_AMP * sin(WATER_FREQ*(0.7f*i + 0.7f*j) - PhasePerFrame);
-
-			pData->height=WATER_OFFSET+WATER_AMP*(sin((float)i*WATER_FREQ*0.4+PhasePerFrameX*0.5)+sin((float)i*WATER_FREQ*0.6+PhasePerFrameX*0.2)+sin((float)j*WATER_FREQ+PhasePerFrameX)+sin((float)j*WATER_FREQ*0.7+PhasePerFrameX*0.3));
-//			*pData=WATER_OFFSET+WATER_AMP*(sin((float)i*WATER_FREQ*0.4+PhasePerFrameX*0.5)+sin((float)i*WATER_FREQ*0.6+PhasePerFrameX*0.2)+sin((float)j*WATER_FREQ+PhasePerFrameX)+sin((float)j*WATER_FREQ*0.7+PhasePerFrameX*0.3));
-			pData++;
-		}
-	}
-
-	PhasePerFrameX -= 0.08f;
-	PhasePerFrameY -= 0.1f;
-#endif
-
-	MaterMeshVertexFormat *vb;
-	if (m_vertexBufferD3DOffset < m_numVertices)
-	{	//we have room in current VB, append new verts
-		if(m_vertexBufferD3D->Lock(m_vertexBufferD3DOffset*sizeof(MaterMeshVertexFormat),mx*my*sizeof(MaterMeshVertexFormat),(unsigned char**)&vb,D3DLOCK_NOOVERWRITE) != D3D_OK)
-			return;
-	}
-	else
-	{	//ran out of room in last VB, request a substitute VB.
-		if(m_vertexBufferD3D->Lock(0,mx*my*sizeof(MaterMeshVertexFormat),(unsigned char**)&vb,D3DLOCK_DISCARD) != D3D_OK)
-			return;
-		m_vertexBufferD3DOffset=0;	//reset start of page to first vertex
-	}
-	Int diffuse;
-	diffuse = setting->waterDiffuse&0x00ffffff;
-	Int alpha = (setting->waterDiffuse & 0xff000000)>>24;
-	// Reduce alpha for wave mesh
-	alpha -= 0x20;
-	diffuse |= alpha<<24;
-
-	//I pulled some of these constants out of the loops for speed:
-	Real uvCosScale=0.02*cos(3*m_riverVOrigin);
-	Real sinOffset=25*m_riverVOrigin;
-	Real originScale=m_riverVOrigin/vScale; 
-	Real bumpSizeDiv=cellSizeY/BUMP_SIZE;
-	Real bumpSizeDiv2=0.3f*cellSizeY/BUMP_SIZE;
-
-	//Data has a 1 vertex padding all around it so we don't need to special-case edges.  Improves performance
-	for (j=0,pData=m_meshData+mx+2+1; j<my; j++,pData+=2)	//skip 2 horizontal border samples after each row
-	{	
-		Real y=(float)j*cellSizeY;
-		Real v1Offset=m_riverVOrigin+(float)j*vScale + uvCosScale*WWMath::Fast_Sin(sinOffset+y*PI/(8*MAP_XY_FACTOR));
-		Real v2Offset=((float)j+originScale)*bumpSizeDiv + (float)j*bumpSizeDiv2;
-
-		for (i=0; i<mx; i++)
-		{
-			//compute normal by looking at 4 vertex neightbors
-#ifdef USE_MESH_NORMALS
-			nx.Z=(pData+1)->height - (pData-1)->height;
-			ny.Z=(pData+mx+2)->height - (pData-mx-2)->height;
-//			nx.Z=*(pData+1)-*(pData-1);
-//			ny.Z=*(pData+mx+2)-*(pData-mx-2);
-			Vector3::Cross_Product(nx,ny,&C);
-			C.Normalize();
-			vb->nx = C.X;
-			vb->ny = C.X;
-			vb->nz = C.X;
-#endif
-			Real x = (float)i*cellSizeX;
-			vb->x=	x;
-			vb->y=	y;
-			vb->z=  pData->height;//WATER_OFFSET+WATER_AMP*(sin((float)i*WATER_FREQ+PhasePerFrame)+cos((float)j*WATER_FREQ+PhasePerFrame));
-
-			vb->diffuse = diffuse;
-#ifdef SCROLL_UV
-//			vb->diffuse=0x80ffffff;
-			vb->u1=(float)i*uScale;
-			vb->v1=v1Offset;
-
-			//old slow version
-			//vb->v1=m_riverVOrigin+(float)j*vScale + 0.02*cos(3*m_riverVOrigin)*sin(25*m_riverVOrigin+y*PI/(8*MAP_XY_FACTOR));
-
-//			vb->u2=m_initialGridU2+(float)i*uScale2;
-//			vb->v2=m_initialGridV2+(float)j*vScale2;
-#else
-			vb->u1=(float)i*uScale;
-			vb->v1=(float)j*vScale;
-#endif
-			vb->u2=(float)(i)*cellSizeX/BUMP_SIZE; 
-			vb->v2=v2Offset;
-			//old slow code
-			//vb->v2=(float)(j+m_riverVOrigin/vScale )*cellSizeY/BUMP_SIZE+ 0.3f*(float)j*cellSizeY/BUMP_SIZE;
-			vb++;
-			pData++;
-		}
-	}
-
-	m_vertexBufferD3D->Unlock();
-
-	Matrix3D tm(Transform);
-
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
-	DX8Wrapper::Set_Material(m_meshVertexMaterialClass);
-
-	ShaderClass::CullModeType oldCullMode=m_shaderClass.Get_Cull_Mode();
-
-	ShaderClass::DepthMaskType oldDepthMask=m_shaderClass.Get_Depth_Mask();
-	m_shaderClass.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);	//disable writing to z-buffer to prevent particle clipping.
-
-	m_shaderClass.Set_Cull_Mode(ShaderClass::CULL_MODE_ENABLE);	//water should be visible from both sides
-
-	DX8Wrapper::Set_Shader(m_shaderClass);
-#if 1
-	setupFlatWaterShader();
-#else 
-	//DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
-	DX8Wrapper::Set_Texture(0,setting->waterTexture);
-	DX8Wrapper::Set_Texture(1,setting->waterTexture);
-
-	DX8Wrapper::Set_Light(0,*m_meshLight);
-	DX8Wrapper::Set_Light(1,NULL);
-	DX8Wrapper::Set_Light(2,NULL);
-	DX8Wrapper::Set_Light(3,NULL);
-/*
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_AMBIENT,0);	//turn off scene ambient
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_SPECULARENABLE,TRUE);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_LOCALVIEWER,TRUE); 
-*/
-
-	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-#endif
-
-
-//	m_pDev->SetRenderState(D3DRS_ZFUNC,D3DCMP_ALWAYS);	//used to display grid under map.
-
-	m_pDev->SetIndices(m_indexBufferD3D,m_vertexBufferD3DOffset);
-	m_pDev->SetStreamSource(0,m_vertexBufferD3D,sizeof(MaterMeshVertexFormat));
-	m_pDev->SetVertexShader(WATER_MESH_FVF);
-
-
-	if (TheTerrainRenderObject->getShroud() && !m_trapezoidWaterPixelShader)
-	{	//we have a shroud to apply and can't do it inside the pixel shader.
-		//so do it in stage1
-		W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
-		W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 1);
-
-		//modulate with shroud texture
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );	//stage 1 texture
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );	//previous stage texture
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-
-		//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
-		//write to the zbuffer.  Change to LESSEQUAL.
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
-		m_pDev->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,0,mx*my,0,m_numIndices-2);
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
-		W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-	}
-	else
-		m_pDev->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,0,mx*my,0,m_numIndices-2);
-	
-	Debug_Statistics::Record_DX8_Polys_And_Vertices(m_numIndices-2,mx*my,ShaderClass::_PresetOpaqueShader);
-
-//	m_pDev->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
-
-	if (m_trapezoidWaterPixelShader) DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(NULL);
-
-	m_vertexBufferD3DOffset += mx*my;	//advance past vertices already in buffer
-
-	DX8Wrapper::Set_Texture(0,NULL);
-	DX8Wrapper::Set_Texture(1,NULL);
-	ShaderClass::Invalidate();
-	m_shaderClass.Set_Cull_Mode(oldCullMode);	//water should be visible from both sides
-
-	// restore shader to old mask
-	m_shaderClass.Set_Depth_Mask(oldDepthMask);	 
-
-	//W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-
-}
-
-inline void WaterRenderObjClass::setGridVertexHeight(Int x, Int y, Real value)
-{
-	DEBUG_ASSERTCRASH( x < (m_gridCellsX+1) && y < (m_gridCellsY+1), ("Invalid Water Mesh Coordinates\n") );
-
-	if (m_meshData)
-	{
-		m_meshData[(y+1)*(m_gridCellsX+1+2)+x+1].height = value;
-	}
-}
-
-void WaterRenderObjClass::setGridHeightClamps(Real minz, Real maxz)
-{
-	m_minGridHeight = minz;
-	m_maxGridHeight = maxz;
-}
-
-void WaterRenderObjClass::addVelocity( Real worldX, Real worldY, 
-																			 Real zVelocity, Real preferredHeight )
-{
-
-	if( m_doWaterGrid)
-	{
-		Real gx,gy;
-		Real minX,maxX,minY,maxY;
-		Int x,y;
-		WaterMeshData *meshPoint;
-		m_disableRiver = true;
-
-		//check if center falls within grid bounds
-		if (worldToGridSpace(worldX, worldY, gx, gy))
-		{	
-		
-			//find extents of influence
-			minX = floorf(gx - m_gridChangeMaxRange);
-			if (minX < 0 )
-				minX = 0;	//clamp extent to fall within box
-			maxX = ceilf(gx + m_gridChangeMaxRange);
-			if (maxX > m_gridCellsX)
-				maxX = m_gridCellsX;	//clamp extent to fall within box
-
-			minY = floorf(gy - m_gridChangeMaxRange);
-			if (minY < 0 )
-				minY = 0;	//clamp extent to fall within box
-			maxY = ceilf(gy + m_gridChangeMaxRange);
-			if (maxY > m_gridCellsY)
-				maxY = m_gridCellsY;	//clamp extent to fall within box
-
-			for (y=minY; y<=maxY; y++)
-			{
-				for (x=minX; x<=maxX; x++)
-				{	
-
-					// get the mesh point that we're concerned with
-					meshPoint = &m_meshData[ (y + 1) * (m_gridCellsX + 1 + 2) + x + 1 ];
-
-					// we now have a new preferred height
-					meshPoint->preferredHeight = preferredHeight;
-
-					//
-					// set the velocity of this point based on the distance from the center of the
-					// "core" point for this call
-					//
-					meshPoint->velocity = meshPoint->velocity + zVelocity;				
-
-					// this point is now "in motion"
-					BitSet( meshPoint->status, WaterRenderObjClass::IN_MOTION );
-
-				}
-			}
-
-			//
-			// the mesh data is now dirty, we need to pass through the velocity field
-			// during an update phase to update the positions
-			//
-			m_meshInMotion = TRUE;
-
-		}
-
-	}  // end if, water type is 3
-
-}
-
-void WaterRenderObjClass::changeGridHeight(Real wx, Real wy, Real delta)
-{
-	Real gx,gy;
-	Real *oldData;
-	Real newData;
-	Real distance;
-	Real minX,maxX,minY,maxY;
-	Int x,y;
-	
-	//check if center falls within grid bounds
-	if (worldToGridSpace(wx, wy, gx, gy))
-	{	//find extents of influence
-		minX = floorf(gx - m_gridChangeMaxRange);
-		if (minX < 0 )
-			minX = 0;	//clamp extent to fall within box
-		maxX = ceilf(gx + m_gridChangeMaxRange);
-		if (maxX > m_gridCellsX)
-			maxX = m_gridCellsX;	//clamp extent to fall within box
-
-		minY = floorf(gy - m_gridChangeMaxRange);
-		if (minY < 0 )
-			minY = 0;	//clamp extent to fall within box
-		maxY = ceilf(gy + m_gridChangeMaxRange);
-		if (maxY > m_gridCellsY)
-			maxY = m_gridCellsY;	//clamp extent to fall within box
-
-		for (y=minY; y<=maxY; y++)
-		{
-			for (x=minX; x<=maxX; x++)
-			{	oldData = &m_meshData[(y+1)*(m_gridCellsX+1+2)+x+1].height;
-				distance = (gx - (Real)x)*(gx - (Real)x) + (gy - (Real)y)*(gy - (Real)y);
-				distance = sqrt(distance);
-				newData = *oldData + 1.0f/(m_gridChangeAtt0+m_gridChangeAtt1*distance+distance*distance*m_gridChangeAtt2)*delta;
-				//Clamp to min/max values
-				if (newData < m_minGridHeight)
-					newData = m_minGridHeight;
-				if (newData > m_maxGridHeight)
-					newData = m_maxGridHeight;
-				*oldData = newData;
-			}
-		}
-	}
-}
-
-void WaterRenderObjClass::setGridChangeAttenuationFactors(Real a, Real b, Real c, Real range)
-{
-	m_gridChangeAtt0 = a;
-	m_gridChangeAtt1 = b;
-	m_gridChangeAtt2 = c;
-	m_gridChangeMaxRange = range/m_gridCellSize;	//convert range to grid space
-}
-
-void WaterRenderObjClass::setGridTransform(Real angle, Real x, Real y, Real z)
-{
-	m_gridDirectionX = Vector2(1.0f,0.0f);
-
-	m_gridOrigin.X = x;
-	m_gridOrigin.Y = y;
-
-	Matrix3D xform(1);
-	xform.Rotate_Z(angle);
-
-	m_gridDirectionX.X = xform.Get_X_Vector().X;
-	m_gridDirectionX.Y = xform.Get_X_Vector().Y;
-
-	m_gridDirectionY.X = xform.Get_Y_Vector().X;
-	m_gridDirectionY.Y = xform.Get_Y_Vector().Y;
-
-	xform.Set_Translation(Vector3(x,y,z));
-	Set_Transform(xform);
-}
-
-void WaterRenderObjClass::setGridTransform(const Matrix3D *transform )
-{
-
-	if( transform )
-		Set_Transform( *transform );
-
-}
-
-void WaterRenderObjClass::getGridTransform(Matrix3D *transform )
-{
-
-	if( transform )
-		*transform = Get_Transform();
-
-}
-
-void WaterRenderObjClass::setGridResolution(Real gridCellsX, Real gridCellsY, Real cellSize)
-{
-	m_gridCellSize=cellSize;
-
-	if (m_gridCellsX != gridCellsX || m_gridCellsY != gridCellsY)
-	{	//resolution has changed
-		m_gridCellsX=gridCellsX;
-		m_gridCellsY=gridCellsY;
-
-		if (m_meshData)
-		{	
-
-			delete [] m_meshData;//free previously allocated grid and allocate new size
-			m_meshData = NULL;	 // must set to NULL so that we properly re-allocate
-			m_meshDataSize = 0;
-
-			Bool enable = m_doWaterGrid;
-			enableWaterGrid(true);	// allocates buffers.
-			m_doWaterGrid = enable;
-
-		}
-	}
-}
-
-void WaterRenderObjClass::getGridResolution( Real *gridCellsX, Real *gridCellsY, Real *cellSize )
-{
-
-	if( gridCellsX )
-		*gridCellsX = m_gridCellsX;
-	if( gridCellsY )
-		*gridCellsY = m_gridCellsY;
-	if( cellSize )
-		*cellSize = m_gridCellSize;
-
-}
-
-static Real wobble(Real baseV, Real offset, Bool wobble)
-{
-	if (!wobble) return 0;
-	offset = sin(2*PI*baseV - 3*offset);
-	return offset/22;
-}
-
-/**Utility function used to query water heights in a manner that works in both RTS and WB.*/
-Real WaterRenderObjClass::getWaterHeight(Real x, Real y)
-{
-	const WaterHandle *waterHandle = NULL;
-	Real waterZ = 0.0f;
-	ICoord3D iLoc;
-
-	iLoc.x = REAL_TO_INT_FLOOR( x + 0.5f );
-	iLoc.y = REAL_TO_INT_FLOOR( y + 0.5f );
-	iLoc.z = 0;
-
-	for( PolygonTrigger *pTrig = PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext() ) 
-	{
-
-		if( !pTrig->isWaterArea() ) 
-			continue;
-
-		// See if point is in a water area
-		if( pTrig->pointInTrigger( iLoc ) ) 
-		{
-
-			if( pTrig->getPoint( 0 )->z >= waterZ )
-			{
-
-				waterZ = pTrig->getPoint( 0 )->z;
-				waterHandle = pTrig->getWaterHandle();
-
-			}  // end if
-
-		}  // end if
-
-	}  // end for
-
-	if (waterHandle)
-		return waterHandle->m_polygon->getPoint( 0 )->z;
-	return INVALID_WATER_HEIGHT;	//point not underwater
-}
-
-//-------------------------------------------------------------------------------------------------
-//Draw a many sided river polygon.
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::drawRiverWater(PolygonTrigger *pTrig)
-{
-	DX8Wrapper::Invalidate_Cached_Render_States();	///@todo: Figure out why rivers don't draw without reset of all states.
-
-	Int rectangleCount = pTrig->getNumPoints()/2;
-	rectangleCount--;
-
-	Real bumpFactor = 5;
-	static Bool doWobble = true;
-
-	if (m_disableRiver) return;
-	m_drawingRiver = true;
-
-	//allocate 2 triangles per side with 3 indices per triangle
-	DynamicIBAccessClass ib_access(BUFFER_TYPE_DYNAMIC_DX8,(rectangleCount+1)*2*3);
-	{
-		DynamicIBAccessClass::WriteLockClass lockib(&ib_access);
- 		UnsignedShort *curIb = lockib.Get_Index_Array();
-		for (Int i=0; i<rectangleCount; i++)
-		{
-			//triangle 1
-			curIb[0] = i*2;
-			curIb[1] = i*2+1;
-			curIb[2] = i*2+3;
-
-			//triangle 2
-			curIb[3] = i*2;
-			curIb[4] = i*2+3;
-			curIb[5] = i*2+2;
-
-			curIb += 6;	//skip the 6 indices we just added.
-		}
-	}
-
-
-	Real shadeR=TheWaterTransparency->m_standingWaterColor.red;
-	Real shadeG=TheWaterTransparency->m_standingWaterColor.green;
-	Real shadeB=TheWaterTransparency->m_standingWaterColor.blue;
-
-	//If the water color is not overridden, use legacy lighting code.
-	if ( shadeR==1.0f && shadeG==1.0f && shadeB==1.0f)
-	{
-		shadeR = TheGlobalData->m_terrainAmbient[0].red;
-		shadeG = TheGlobalData->m_terrainAmbient[0].green;
-		shadeB = TheGlobalData->m_terrainAmbient[0].blue;
-
-		//Add in diffuse lighting from each terrain light
-		for (Int lightIndex=0; lightIndex < TheGlobalData->m_numGlobalLights; lightIndex++)
-		{
-			if (-TheGlobalData->m_terrainLightPos[lightIndex].z > 0)
-			{	shadeR += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].red;
-				shadeG += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].green;
-				shadeB += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].blue;
-			}
-		}
-
-		//Get water material colors
-		Real waterShadeR = (m_settings[m_tod].waterDiffuse & 0xff) / 255.0f;
-		Real waterShadeG = ((m_settings[m_tod].waterDiffuse >> 8) & 0xff) / 255.0f;
-		Real waterShadeB = ((m_settings[m_tod].waterDiffuse >> 16) & 0xff) / 255.0f;
-
-		shadeR=shadeR*waterShadeR*255.0f;
-		shadeG=shadeG*waterShadeG*255.0f;
-		shadeB=shadeB*waterShadeB*255.0f;
-	}
-	else
-	{
-		shadeR=shadeR*255.0f;
-		shadeG=shadeG*255.0f;
-		shadeB=shadeB*255.0f;
-
-		if (shadeR == 0 && shadeG == 0 && shadeB == 0)
-		{	//special case where we disable lighting
-			shadeR=255;
-			shadeG=255;
-			shadeB=255;
-		}
-	}
-
-	Int diffuse=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16);
-
-	//Keep diffuse from lighting calculations but substitute custom alpha
-	diffuse |= m_settings[m_tod].waterDiffuse & 0xff000000;	//copy alpha/opacity from ini setting
-
-	Int innerNdx = pTrig->getRiverStart();
-	Int outerNdx = innerNdx+1;
-
-	Real endLen=0;
-	Real totalLen=0;
-	Int i;
-	for (i=0; i<pTrig->getNumPoints()-1; i++) {
-		ICoord3D innerPt = *pTrig->getPoint(i);
-		ICoord3D outerPt = *pTrig->getPoint(i+1);
-		Real dx = innerPt.x-outerPt.x;
-		Real dy = innerPt.y-outerPt.y;
-		Real curLen = sqrt(dx*dx+dy*dy);
-		totalLen += curLen;
-		if ( i==innerNdx) {
-			endLen = curLen;
-		}
-	}
-	bumpFactor = endLen/BUMP_SIZE;
-
-	Real lengthOfRiver = (totalLen/2)-endLen;
-	Real repeatCount = lengthOfRiver / (endLen); 
-
-	Real vScale=(Real)repeatCount/(Real)rectangleCount;
-
-#define HEIGHT_TO_USE (0.5f)
-	if (innerNdx >= pTrig->getNumPoints()-1) return;
-	//allocate 2 vertices per side
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,(rectangleCount+1)*2);
-	{
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* vb=lock.Get_Formatted_Vertex_Array();
-
-		Real constA=3*m_riverVOrigin;
-
-		for (i=0; i<(pTrig->getNumPoints()/2); i++)
-		{
-			Real x,y;
-			ICoord3D innerPt = *pTrig->getPoint(outerNdx);
-			ICoord3D outerPt = *pTrig->getPoint(innerNdx);
-			outerNdx++;
-			innerNdx--;
-			if (innerNdx<0) {
-				innerNdx = pTrig->getNumPoints()-1;
-			}
-			if (outerNdx >= pTrig->getNumPoints()) {
-				outerNdx = 0;
-			}
-			x=innerPt.x;
-			y=innerPt.y;
-
-			vb->x=x;
-			vb->y=y;
-
-			vb->z=innerPt.z;
-			vb->diffuse= diffuse;
-	
-			Real wobbleConst=-m_riverVOrigin+vScale*(Real)i + WWMath::Fast_Sin(2*PI*(vScale*(Real)i) - constA)/22.0f;
- 			//old slower version
-			//vb->v1=-m_riverVOrigin+vScale*(Real)i + wobble(vScale*i, m_riverVOrigin, doWobble);
-			vb->v1=wobbleConst;
-			vb->u1=HEIGHT_TO_USE ;
-			//old slower version
-			//vb->v2 = -m_riverVOrigin+vScale*(Real)i + wobble(vScale*i, m_riverVOrigin, doWobble);
-			vb->v2=wobbleConst;
-			vb->u2 = 1.0f;
-			vb->nx = 0;
-			vb->ny = 0;
-			vb->nz = 1.0f;
-			vb++;
-
-			x=outerPt.x;
-			y=outerPt.y;
-
-			vb->x=x;
-			vb->y=y;
-			vb->z=outerPt.z;
-			vb->diffuse= diffuse;
- 			//old slower version
-			//vb->v1=-m_riverVOrigin+vScale*(Real)i + wobble(vScale*i, m_riverVOrigin, doWobble);
-			vb->v1=wobbleConst;
-			vb->u1=0;
-			//old slower version
- 			//vb->v2 = -m_riverVOrigin+vScale*(Real)i + wobble(vScale*i, m_riverVOrigin, doWobble);
-			vb->v2 =wobbleConst;
-			vb->u2 = 0;
-			vb->nx = 0;
-			vb->ny = 0;
-			vb->nz = 1.0f;
-			vb++;
-
-		}
-	}
-
-	Matrix3D tm(1);
-
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
-	DX8Wrapper::Set_Index_Buffer(ib_access,0);
-	DX8Wrapper::Set_Vertex_Buffer(vb_access);
-	DX8Wrapper::Set_Texture(0,m_riverTexture);	//set to blue
-
-	setupJbaWaterShader();
-
-	//In additive blending we need to use the alpha at the edges of river to darken
-	//rgb instead.
-	if (TheWaterTransparency->m_additiveBlend)
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA );
-
-	if (m_riverWaterPixelShader) DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_riverWaterPixelShader);
- 	DWORD cull;
-	DX8Wrapper::_Get_D3D_Device8()->GetRenderState(D3DRS_CULLMODE, &cull);
-	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-
-
-
-	if (wireframeForDebug) {
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_WIREFRAME);
-	}
-	DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);
-	if (wireframeForDebug) {
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
-	}
-
-	if (m_riverWaterPixelShader) DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(NULL);
-
-	//restore blend mode to what W3D expects.
-	if (TheWaterTransparency->m_additiveBlend)
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_ONE );
-
-	//do second pass to apply the shroud on water plane
-	if (TheTerrainRenderObject->getShroud())
-	{
-		W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
-		W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 0);
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-		//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
-		//write to the zbuffer.  Change to LESSEQUAL.
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
-		DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
-		W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-	}
-	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, cull);
-
-
-}
-
-void WaterRenderObjClass::setupFlatWaterShader(void) 
-{
-	//Setup shroud to render in same pass as water
-	if (m_trapezoidWaterPixelShader)
-	{	if (TheTerrainRenderObject->getShroud())
-		{
-			W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
-			//Use stage 3 to apply the shroud
-			W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 3);
-			m_pDev->SetTextureStageState( 3, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-			m_pDev->SetTextureStageState( 3, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-			m_pDev->SetTextureStageState( 3, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-			m_pDev->SetTextureStageState( 3, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-			//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
-			//write to the zbuffer.  Change to LESSEQUAL.
-			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
-		}
-		else
-		{	//Assume no shroud, so stage 3 will be "NULL" texture but using actual white because
-			//pixel shader on GF4 generates random colors with SetTexture(3,NULL).
-			DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,m_whiteTexture->Peek_D3D_Texture());	
-		}
-	}
-
-	DX8Wrapper::Set_Texture(0,m_riverTexture);
-	if (!TheWaterTransparency->m_additiveBlend)
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaShader);
-	else
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetAdditiveShader);
-
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);
-	m_riverTexture->Get_Filter().Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_BEST);
-	m_riverTexture->Get_Filter().Set_Min_Filter(TextureFilterClass::FILTER_TYPE_BEST);
-	m_riverTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_BEST);
-
-	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_ADD );
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, 0);
-	
-	Bool doSparkles = true;
-
-	if (m_trapezoidWaterPixelShader && doSparkles) {
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1,m_waterSparklesTexture->Peek_D3D_Texture());	
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(2,m_waterNoiseTexture->Peek_D3D_Texture());	
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
- 
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-		// Two output coordinates are used.
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-		D3DXMATRIX inv;
-		float det;
-
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-		D3DXMATRIX scale;
-
-		D3DXMatrixScaling(&scale, NOISE_REPEAT_FACTOR, NOISE_REPEAT_FACTOR,1);
-		D3DXMATRIX destMatrix = inv * scale;
-		D3DXMatrixTranslation(&scale, m_riverVOrigin, m_riverVOrigin,0);
-		destMatrix = destMatrix*scale;
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, *(Matrix4x4*)&destMatrix);
-
-	}
-	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 1, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 2, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	if (m_trapezoidWaterPixelShader){
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(0,   D3DXVECTOR4(REFLECTION_FACTOR, REFLECTION_FACTOR, REFLECTION_FACTOR, 1.0f), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_trapezoidWaterPixelShader);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-//Draw a 4 sided flat water area.
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::drawTrapezoidWater(Vector3 points[4])
-{
-	Vector3 origin(points[0]);
-	Vector3 uVec1(points[1]);
-	Vector3 vVec1(points[3]);
-	Vector3 uVec2(points[2]);
-	Vector3 vVec2(points[2]);
-	uVec2 -= vVec1;
-	vVec2	-= uVec1;
-	uVec1 -= origin;
-	vVec1 -= origin;
-	Int uCount = (uVec1.Length()+uVec2.Length()) / (8*MAP_XY_FACTOR);
-	if (uCount<1) uCount = 1;
-	Int vCount = (vVec1.Length()+vVec2.Length()) / (8*MAP_XY_FACTOR);
-	if (vCount<1) vCount = 1;	
-
-	if (uCount>50) uCount = 50;
-	if (vCount>50) vCount = 50;
-
-	static Bool doWobble = true;
-
-	Int rectangleCount = uCount*vCount;
-
-	uCount++;
-	vCount++;
-
-	Int i, j;
-	//allocate 2 triangles per side with 3 indices per triangle
-	DynamicIBAccessClass ib_access(BUFFER_TYPE_DYNAMIC_DX8,(rectangleCount+1)*2*3);
-	{
-		DynamicIBAccessClass::WriteLockClass lockib(&ib_access);
- 		UnsignedShort *curIb = lockib.Get_Index_Array();
-		for (j=0; j<vCount-1; j++)
-		{	for (i=0; i<uCount-1; i++)
-			{
-				//triangle 1
-				curIb[0] = (j)*uCount + i;
-				curIb[1] = (j+1)*uCount + i+1;
-				curIb[2] = (j+1)*uCount + i;
-
-				//triangle 2
-				curIb[3] = (j)*uCount + i;
-				curIb[4] = (j)*uCount + i+1;
-				curIb[5] = (j+1)*uCount + i+1;
-
-				curIb += 6;	//skip the 6 indices we just added.
-			}
-		}
-	}
-
-	Real	waterFactor=150;
-	Real shadeR=TheWaterTransparency->m_standingWaterColor.red;
-	Real shadeG=TheWaterTransparency->m_standingWaterColor.green;
-	Real shadeB=TheWaterTransparency->m_standingWaterColor.blue;
-
-	//If the water color is not overridden, use legacy lighting code.
-	if ( shadeR==1.0f && shadeG==1.0f && shadeB==1.0f)
-	{
-		shadeR = TheGlobalData->m_terrainAmbient[0].red;
-		shadeG = TheGlobalData->m_terrainAmbient[0].green;
-		shadeB = TheGlobalData->m_terrainAmbient[0].blue;
-
-		//Add in diffuse lighting from each terrain light
-		for (Int lightIndex=0; lightIndex < TheGlobalData->m_numGlobalLights; lightIndex++)
-		{
-			if (-TheGlobalData->m_terrainLightPos[lightIndex].z > 0)
-			{	shadeR += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].red;
-				shadeG += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].green;
-				shadeB += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].blue;
-			}
-		}
-
-		//Get water material colors
-		Real waterShadeR = (m_settings[m_tod].waterDiffuse & 0xff) / 255.0f;
-		Real waterShadeG = ((m_settings[m_tod].waterDiffuse >> 8) & 0xff) / 255.0f;
-		Real waterShadeB = ((m_settings[m_tod].waterDiffuse >> 16) & 0xff) / 255.0f;
-
-		shadeR=shadeR*waterShadeR*255.0f;
-		shadeG=shadeG*waterShadeG*255.0f;
-		shadeB=shadeB*waterShadeB*255.0f;
-	}
-	else
-	{
-		shadeR=shadeR*255.0f;
-		shadeG=shadeG*255.0f;
-		shadeB=shadeB*255.0f;
-
-		if (shadeR == 0 && shadeG == 0 && shadeB == 0)
-		{	//special case where we disable lighting
-			shadeR=255;
-			shadeG=255;
-			shadeB=255;
-		}
-	}
-
-	Int diffuse=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16);
-
-	//Keep diffuse from lighting calculations but substitute custom alpha
-	diffuse |= m_settings[m_tod].waterDiffuse & 0xff000000;	//copy alpha/opacity from ini setting
-
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,(rectangleCount+1)*2);
-
-//#define WAVY_WATER
-//#define FEATHER_LAYER_COUNT (3) //LORENZEN
-//#define FEATHER_LAYER_THICKNESS (2.5f)
-//#define FEATHER_WATER
-
-//#ifdef WAVY_WATER // the NEW WATER a'la LORENZEN
-	if ( TheGlobalData->m_featherWater )
-	{
-
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* vb=lock.Get_Formatted_Vertex_Array();
-
-		Real phase = 0;
-		Real mapCoeff = PI/(4*MAP_XY_FACTOR);
-		Real wave = 0;
-		Real amplitude = 0.5f;
-
-		//The first (high order) byte is the Alpha value for this patch
-		// It needs to be set proportional to the number of feather layers
-		// this comes from TheGlobalData->m_featherWater, which is a count of layers
-
-
-		Int Alpha = 0;
-		if ( TheGlobalData->m_featherWater == 5) Alpha = 80;
-		if ( TheGlobalData->m_featherWater == 4) Alpha = 110;
-		if ( TheGlobalData->m_featherWater == 3) Alpha = 140;
-		if ( TheGlobalData->m_featherWater == 2) Alpha = 200;
-		if ( TheGlobalData->m_featherWater == 1) Alpha = 255;
-
-		//Keep diffuse from lighting calculations but substitute custom alpha
-		Int customDiffuse = (diffuse & 0x00ffffff) | (Alpha<< 24);//(0x80 << 16)|(0x90 << 8)|0xa0;
-
-		for (j=0; j<vCount; j++)
-		{
-			Real dv = j;
-			dv /= (vCount-1);
-			for (i=0; i<uCount; i++)
-			{
-				Real du = i;
-				du /= (uCount-1);
-				Vector3 vertex = origin;
-				vertex += uVec1*du;
-				vertex += vVec1*dv;
-				vertex += (dv)*(du)*(vVec2-vVec1);
-
-				vb->x=vertex.X;
-				vb->y=vertex.Y;
-
-				// common to all the waving effects
-				phase = 25 * m_riverVOrigin + vertex.X * mapCoeff;
-				wave = (sin(phase) - 1.0f) * amplitude;
-
-				vb->z = (vertex.Z + wave);
-				vb->diffuse = customDiffuse;
-				vb->u1 = (vertex.X/waterFactor) + 0.02*cos(11*m_riverVOrigin)*wave;
-				vb->v1 = (vertex.Y/waterFactor) + 0.02*cos(5*m_riverVOrigin)*wave;
-				vb->u2 = vertex.X/BUMP_SIZE;
-				vb->v2 = vertex.Y/BUMP_SIZE + 0.3f*vertex.X/BUMP_SIZE;
-				vb->nx = 0;
-				vb->ny = 0;
-				vb->nz = 1.0f;
-				vb++;
-			}
-		}
-	}
-//#else // STILL THE OLD FLAT WATER
-	else
-
-	{
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* vb=lock.Get_Formatted_Vertex_Array();
-
-		//Pulling some constants out of the inner loops to improve performance -MW
-		Real constA=0.02*cos(11*m_riverVOrigin);
-		Real constB=0.02*cos(5*m_riverVOrigin);
-		Real constC=25*m_riverVOrigin;
-		Real ooWaterFactor = 1.0f/waterFactor;
-		const Real constD=PI/(4*MAP_XY_FACTOR);
-		Real constE=1.0f/(Real)(vCount-1);
-		Real constF=1.0f/(Real)(uCount-1);
-
-		for (j=0; j<vCount; j++)
-		{
-			Real dv = (Real)j * constE;
-
-			for (i=0; i<uCount; i++)
-			{
-				Real du = (Real)i * constF;
-				Vector3 vertex = origin;
-				vertex += uVec1*du;
-				vertex += vVec1*dv;
-				vertex += (dv)*(du)*(vVec2-vVec1);
-
-				vb->x=vertex.X;
-				vb->y=vertex.Y;
-				vb->z=vertex.Z;
-
-				vb->diffuse= diffuse;
-				//Old slower version
- 				//vb->u1=(vertex.X/waterFactor) + 0.02*cos(11*m_riverVOrigin)*sin(25*m_riverVOrigin+vertex.X*PI/(4*MAP_XY_FACTOR));
- 				//vb->v1=(vertex.Y/waterFactor) + 0.02*cos(5*m_riverVOrigin)*sin(25*m_riverVOrigin+vertex.Y*PI/(4*MAP_XY_FACTOR));
-				vb->u1=vertex.X*ooWaterFactor + constA*WWMath::Fast_Sin(constC+vertex.X*constD);
-				vb->v1=vertex.Y*ooWaterFactor + constB*WWMath::Fast_Sin(constC+vertex.Y*constD);
-				vb->u2 = vertex.X/BUMP_SIZE;
-				//Old slower version
- 				//vb->v2 = vertex.Y/BUMP_SIZE + 0.3f*vertex.X/BUMP_SIZE;
-				vb->v2 = (vertex.Y+0.3f*vertex.X)/BUMP_SIZE;
-				vb->nx = 0;
-				vb->ny = 0;
-				vb->nz = 1.0f;
-				vb++;
-			}
-		}
-	}
-
-//#endif // OLD VS NEW WATER
-
-
-
-	Matrix3D tm(1);
-
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
-	DX8Wrapper::Set_Index_Buffer(ib_access,0);
-	DX8Wrapper::Set_Vertex_Buffer(vb_access);
-
-	setupFlatWaterShader();// lorenzen sez use the alpha shader
-
-	//If video card supports it and it's enabled, feather the water edge using destination alpha
-	if (DX8Wrapper::getBackBufferFormat() == WW3D_FORMAT_A8R8G8B8 && TheGlobalData->m_showSoftWaterEdge && TheWaterTransparency->m_transparentWaterDepth !=0)
-	{		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_DESTALPHA );
-			if (!TheWaterTransparency->m_additiveBlend)
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND, D3DBLEND_INVDESTALPHA );
-	}
-
-
- 	DWORD cull;
-	DX8Wrapper::_Get_D3D_Device8()->GetRenderState(D3DRS_CULLMODE, &cull);
-	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-
-
-
-//#ifdef FEATHER_WATER // the NEW WATER a'la LORENZEN
-
-//	int layer = 0;//LORENZEN
-//	for (layer = 0; layer < FEATHER_LAYER_COUNT; ++layer)//LORENZEN
-//#endif // FEATHER_WATER
-	{
-//#ifdef WAVY_WATER // the NEW WATER a'la LORENZEN
-
-		//increment the depth of the water's surface for every vert in the buffer
-//#ifdef  FEATHER_WATER
-//		VertexFormatXYZNDUV2 *vertBuf = vertexBufferStart;
-//		while (vertBuf < vertexBufferStart + vCount * uCount)
-//		{
-//			vertBuf->z *= FEATHER_LAYER_THICKNESS;
-//			++vertBuf;
-//		}
-//#endif // FEATHER_WATER
-//#endif //WAVY_WATER
-		DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);//lorenzen thinks this is where to itereate the soft shoreline effect
-	}
-
-
-
-
-	if (false) {
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_WIREFRAME);
-		m_pDev->SetRenderState(D3DRS_ALPHABLENDENABLE , false);
-		DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);
-		m_pDev->SetRenderState(D3DRS_ALPHABLENDENABLE , true);
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
-	}
-
-	if (m_riverWaterPixelShader) DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(NULL);
-	//Restore alpha blend to default values since we may have changed them to feather edges.
-	if (!TheWaterTransparency->m_additiveBlend)
-	{	DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA );
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA );
-	}
-	else
-	{
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_ONE );
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND, D3DBLEND_ONE );
-	}
-
-	if (TheTerrainRenderObject->getShroud())
-	{
-		if (m_trapezoidWaterPixelShader)
-		{	//shroud was applied in stage3 of main pass so just need to restore state here.
-			W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-			DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,NULL);	//free possible reference to shroud texture
-			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
-		}
-		else
-		{	//do second pass to apply the shroud on water plane for cards that can't do it in main pass.
-			W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
-			W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 0);
-			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-			//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
-			//write to the zbuffer.  Change to LESSEQUAL.
-			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
-			DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);
-			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
-			W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-		}
-	}
-	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, cull);
-}
-
-
-
-//-------------------------------------------------------------------------------------------------
-//debug version where moon rotates with the camera	(always upright on screen)
-//-------------------------------------------------------------------------------------------------
-#if 0
-void WaterRenderObjClass::renderSkyBody(Matrix3D *mat)
-{	
-	Vector3 vRight,vUp,V0,V1,V2,V3;
-
-	mat->Get_X_Vector(&vRight);
-	mat->Get_Y_Vector(&vUp);
-
-	//calculate offsets from quad center to each of the 4 corners
-	//	0-----1
-	//  |    /|
-	//  |  /  |
-	//	|/    |
-	//  3-----2
-	V0=-vRight+vUp;
-	V2=vRight+vUp;
-	V2=vRight-vUp;
-	V3=-vRight-vUp;
-
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);
-	DX8Wrapper::Set_Shader(ShaderClass::/*_PresetAdditiveShader*//*_PresetOpaqueShader*/_PresetAlphaShader);
-//	DX8Wrapper::Set_Texture(0,setting->skyBodyTexture);
-
-	DX8Wrapper::Set_Texture(0,m_alphaClippingTexture);
-
-	//draw an infinite sky plane
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,4);
-	{
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* verts=lock.Get_Formatted_Vertex_Array();
-		if(verts)
-		{
-			verts[0].x=SKYBODY_SIZE*V0.X;
-			verts[0].y=SKYBODY_SIZE*V0.Y;
-			verts[0].z=SKYBODY_SIZE*V0.Z;
-			verts[0].u2=0;
-			verts[0].v2=1;
-			verts[0].diffuse=0xffffffff;
-	
-			verts[1].x=SKYBODY_SIZE*V1.X;
-			verts[1].y=SKYBODY_SIZE*V1.Y;
-			verts[1].z=SKYBODY_SIZE*V1.Z;
-			verts[1].u2=1;
-			verts[1].v2=1;
-			verts[1].diffuse=0xffffffff;
-	
-			verts[2].x=SKYBODY_SIZE*V2.X;
-			verts[2].y=SKYBODY_SIZE*V2.Y;
-			verts[2].z=SKYBODY_SIZE*V2.Z;
-			verts[2].u2=1;
-			verts[2].v2=0;
-			verts[2].diffuse=0xffffffff;
-	
-			verts[3].x=SKYBODY_SIZE*V3.X;
-			verts[3].y=SKYBODY_SIZE*V3.Y;
-			verts[3].z=SKYBODY_SIZE*V3.Z;
-			verts[3].u2=0;
-			verts[3].v2=0;
-			verts[3].diffuse=0xffffffff;
-		}
-	}
-
-	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
-	DX8Wrapper::Set_Vertex_Buffer(vb_access);
-
-	Matrix3D tm(1);
-	//set postion of skybody in world
-//	tm.Set_Translation(Vector3(40,0,0));
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-
-	DX8Wrapper::Draw_Triangles(	0,2, 0,	4);	//draw a quad, 2 triangles, 4 verts
-}
-#endif
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::crc( Xfer *xfer )
-{
-
-}  // end crc
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer
-	* Version Info:
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// grid cells x
-	Int cellsX = m_gridCellsX;
-	xfer->xferInt( &cellsX );
-	if( cellsX != m_gridCellsX )
-	{
-
-		DEBUG_CRASH(( "WaterRenderObjClass::xfer - cells X mismatch\n" ));
-		throw SC_INVALID_DATA;
-
-	}  // end if
-	
-	// grid cells Y
-	Int cellsY = m_gridCellsY;
-	xfer->xferInt( &cellsY );
-	if( cellsY != m_gridCellsY )
-	{
-	
-		DEBUG_CRASH(( "WaterRenderObjClass::xfer - cells Y mismatch\n" ));
-		throw SC_INVALID_DATA;
-
-	}  // end if
-
-	// xfer each of the mesh data points
-	for( UnsignedInt i = 0; i < m_meshDataSize; ++i )
-	{
-
-		// height
-		xfer->xferReal( &m_meshData[ i ].height );
-
-		// velocity
-		xfer->xferReal( &m_meshData[ i ].velocity );
-
-		// status
-		xfer->xferUnsignedByte( &m_meshData[ i ].status );
-
-		// preferred height
-		xfer->xferUnsignedByte( &m_meshData[ i ].preferredHeight );
-
-	}  // end for, i
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::loadPostProcess( void )
-{
-
-}  // end loadPostProcess
-
-
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
deleted file mode 100644
index 8967d104aa2..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
+++ /dev/null
@@ -1,1298 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DWaterTracks.cpp ////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: W3DWaterTracks.cpp
-//
-// Created:   Mark Wilczynski, July 2001
-//
-// Desc:      Draw waves and splash marks on water surface.  System allows for
-//			  some simple animation : dynamic uv coordinates, scaling, scrolling,
-//			  and alpha.
-//-----------------------------------------------------------------------------
-
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/W3DWaterTracks.h"
-#include "GameClient/InGameUI.h"
-#include "GameLogic/TerrainLogic.h"
-#include "Common/GlobalData.h"
-#include "Common/UnicodeString.h"
-#include "Common/file.h"
-#include "Common/FileSystem.h"
-#include "texture.h"
-#include "colmath.h"
-#include "coltest.h"
-#include "rinfo.h"
-#include "camera.h"
-#include "assetmgr.h"
-#include "WW3D2/dx8wrapper.h"
-
-//#pragma optimize("", off)
-
-//#define ALLOW_WATER_TRACK_EDIT
-
-//number of vertex pages allocated - allows double buffering of vertex updates.
-//while one is being rendered, another is being updated.  Improves HW parallelism.
-#define WATER_VB_PAGES	1000
-#define WATER_STRIP_X	2		//vertex resolution of each strip
-#define WATER_STRIP_Y	2		
-#define SYNC_WAVES			//all the waves are in sync - movement resets at same time.
-//#define DEFAULT_FINAL_WAVE_WIDTH	28.0f
-//#define DEFAULT_FINAL_WAVE_HEIGHT	18.0f
-//#define DEFAULT_SECOND_WAVE_TIME_OFFSET 6267	//should always be half of totalMs
-
-WaterTracksRenderSystem *TheWaterTracksRenderSystem=NULL;	///< singleton for track drawing system.
-
-static Bool pauseWaves=FALSE;
-
-enum waveType CPP_11(: Int)
-{
-	WaveTypeFirst,
-	WaveTypePond=WaveTypeFirst,
-	WaveTypeOcean,
-	WaveTypeCloseOcean,	//same as above but appears much closer to beach.
-	WaveTypeCloseOceanDouble,	//same as above but waves much sloser together.
-	WaveTypeRadial,
-	WaveTypeLast = WaveTypeRadial,
-	WaveTypeStationary,
-	WaveTypeMax,
-};
-
-struct waveInfo
-{
-	Real m_finalWidth;				//final width of of wave when it reaches beach.
-	Real m_finalHeight;				//final height of wave after it stretched out on beach.
-	Real m_waveDistance;			//distance away from beach where wave starts.
-	Real m_initialVelocity;
-	Int m_fadeMs;					//time to fade out wave after it stops on shore.
-	Real m_initialWidthFraction;	//fraction of m_finalWidth when wave first appears.
-	Real m_initialHeightWidthFraction;	//fraction of initial width to use as the initial height.
-	Int m_timeToCompress;			//time for back of wave to continue moving forward after front starts retreating.
-	Int m_secondWaveTimeOffset;		//time for second wave to start.  Should always be half of first wave's TotalMs.
-	const char *m_textureName;			//name of texture to use on wave.
-	const char *m_waveTypeName;			//name of this wave type.
-};
-
-waveInfo waveTypeInfo[WaveTypeMax]=
-{
-	{28.0f, 18.0f, 25.0f, 0.018f, 900, 0.01f, 0.18f, 1500, 0,"wave256.tga","Pond"},	//pond
-	{55.0f, 36.0f, 80.0f, 0.015f, 2000, 0.5f, 0.18f, 1000, 6267,"wave256.tga","Ocean"},	//ocean
-	{55.0f, 36.0f, 80.0f, 0.015f, 2000, 0.05f, 0.18f, 1000, 6267,"wave256.tga","Close Ocean"},
-	{55.0f, 36.0f, 80.0f, 0.015f, 4000, 0.01f, 0.18f, 2000, 6267,"wave256.tga","Close Ocean Double"},
-	{55.0f, 27.0f, 80.0f, 0.015f, 2000, 0.01f, 8.0f, 2000, 5367,"wave256.tga","Radial"},
-};
-
-//=============================================================================
-// WaterTracksObj::~WaterTracksObj
-//=============================================================================
-/** Destructor. Releases w3d assets. */
-//=============================================================================
-WaterTracksObj::~WaterTracksObj(void)
-{
-	freeWaterTracksResources();
-}
-
-//=============================================================================
-// WaterTracksObj::WaterTracksObj
-//=============================================================================
-/** Constructor. Just nulls out some variables. */
-//=============================================================================
-WaterTracksObj::WaterTracksObj(void)
-{
-	m_stageZeroTexture=NULL;
-	m_bound=false;
-	m_initTimeOffset=0;
-}
-
-//=============================================================================
-// WaterTracksObj::Get_Obj_Space_Bounding_Sphere
-//=============================================================================
-/** WW3D method that returns object bounding sphere used in frustum culling*/
-//=============================================================================
-void WaterTracksObj::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
-{	/// @todo: Add code to cull track marks to screen by constantly updating bounding volumes
-	sphere=m_boundingSphere;
-}
-
-//=============================================================================
-// WaterTracksObj::Get_Obj_Space_Bounding_Box
-//=============================================================================
-/** WW3D method that returns object bounding box used in collision detection*/
-//=============================================================================
-void WaterTracksObj::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
-{
-	box=m_boundingBox;
-}
-
-//=============================================================================
-// WaterTracksObj::freeWaterTracksResources
-//=============================================================================
-/** Free any W3D resources associated with this object */
-//=============================================================================
-Int WaterTracksObj::freeWaterTracksResources(void)
-{
-	REF_PTR_RELEASE(m_stageZeroTexture);
-	return 0;
-}
-
-//=============================================================================
-// WaterTracksObj::init
-//=============================================================================
-/** Setup size settings and allocate W3D texture
-*	The width/length define the size of the polygon quad which will contain
-*	the specified texture.
- */
-//=============================================================================
-void WaterTracksObj::init( Real width, Real length, const Vector2 &start, const Vector2 &end, const Char *texturename, Int waveTimeOffset)
-{	
-	freeWaterTracksResources();	//free old resources used by this track
-
-	//save original settings used to create this wave
-	m_initStartPos = start;
-	m_initEndPos = end;
-	m_initTimeOffset = waveTimeOffset;
-
-	m_boundingSphere.Init(Vector3(0,0,0),400);
-	m_boundingBox.Center.Set(0.0f, 0.0f, 0.0f);
-	m_boundingBox.Extent.Set(400.0f, 400.0f, 1.0f);
-	m_x=WATER_STRIP_X;
-	m_y=WATER_STRIP_Y;
-	m_elapsedMs=m_initTimeOffset;
-	m_startPos=start;
-	m_perpDir=m_waveDir=end-start;
-	m_perpDir.Rotate(-1.57079632679f);	//get vector perpendicular to wave motion.
-	m_perpDir.Normalize();
-
-	m_waveDir=m_perpDir;
-	m_waveDir.Rotate(PI/2);	//get vector along wave travel direction.
-	//move back by width of wave so start point turns into maximum reach of wave.
-	//m_startPos -= m_waveDir*m_width;
-	//move back initial tip off of wave a couple units off the final position
-	//to give it some room to travel. Travel vector is stored in m_waveDir.
-	m_waveDistance = waveTypeInfo[m_type].m_waveDistance;	//total distance traveled by wave front
-
-	m_waveDir *= m_waveDistance;
-	m_startPos -= m_waveDir;	//move start point down away from shoreline
-
-	m_initialVelocity=waveTypeInfo[m_type].m_initialVelocity;			//velocity per ms
-	m_totalMs = m_waveDistance/m_initialVelocity; //amount of time for wave to travel complete distance
-
-	m_fadeMs = waveTypeInfo[m_type].m_fadeMs;		//time for wave to fade out after it stops on beach
-
-	m_waveInitialWidth=length * waveTypeInfo[m_type].m_initialWidthFraction;///<width of wave segment when it first appears
-	m_waveInitialHeight=m_waveInitialWidth * waveTypeInfo[m_type].m_initialHeightWidthFraction;	///<height of wave segment when it first appears
-	m_waveFinalWidth=length;	///<width of wave segment at full size
-	m_waveFinalHeight=width;		///<final height of unstretched wave
-
-	//get total time for front to complete its cycle
-	m_timeToReachBeach=(m_waveDistance - m_waveFinalHeight)/m_initialVelocity;
-	m_frontSlowDownAcc= -(m_initialVelocity*m_initialVelocity)/(2*m_waveFinalHeight);	//deceleration of wave after it hits land
-	m_timeToStop = -m_initialVelocity/m_frontSlowDownAcc;
-	m_timeToRetreat = sqrt(fabs(2.0f*m_waveFinalHeight/m_frontSlowDownAcc));
-	m_totalMs = m_timeToReachBeach + m_timeToStop + m_timeToRetreat;	//total time that wave front is on screen
-	m_backSlowDownAcc = (2.0f*m_waveInitialHeight/(m_timeToStop*m_timeToStop));//((m_waveInitialHeight - m_velocity*m_timeToStop)*2.0f)/(m_timeToStop*m_timeToStop);
-	m_timeToCompress = waveTypeInfo[m_type].m_timeToCompress;	//time for back of wave to continue moving forward after front starts retreating.
-
-
-	if (m_type == WaveTypeStationary)
-	{	//this is a stationary wave slightly behind starting point
-		m_timeToRetreat = 1000; //time to fade out.
-		m_totalMs = m_timeToReachBeach + m_timeToStop+m_fadeMs+m_timeToRetreat;	//trigger when other wave stops.
-		m_startPos = start;
-		m_fadeMs = 1000;		//time for wave to fade out after it stops on beach
-	}
-
-	m_stageZeroTexture=WW3DAssetManager::Get_Instance()->Get_Texture(texturename);
-}
-
-//=============================================================================
-// WaterTracksObj::init
-//=============================================================================
-/** Setup size settings and allocate W3D texture
-*	Alternate version of init where:
-*	(start, end) define a vector perpendicular to wave travel.  The length of this
-*	vector is used as the length of the wave segment.  The line between start-end
-*	defines the maximum distance the wave will reach.
- */
-//=============================================================================
-void WaterTracksObj::init( Real width, const Vector2 &start, const Vector2 &end, const Char *texturename)
-{	
-	freeWaterTracksResources();	//free old resources used by this track
-	m_boundingSphere.Init(Vector3(0,0,0),400);
-	m_boundingBox.Center.Set(0.0f, 0.0f, 0.0f);
-	m_boundingBox.Extent.Set(400.0f, 400.0f, 1.0f);
-	m_perpDir=end-start;
-	m_startPos=start + m_perpDir*0.5f;	//move start point to middle
-	Real length=m_perpDir.Length();
-	m_perpDir *= 1.0f/length;	//normalize it.
-	m_waveDir=m_perpDir;
-	m_waveDir.Rotate(PI/2);	//get vector along wave travel direction.
-	m_startPos -= m_waveDir*width;	//move back by width of wave
-	m_waveDir *= 1.3f*MAP_XY_FACTOR;	//travel 4 units
-	m_startPos -= m_waveDir;	//move start point down away from shoreline
-	m_x=WATER_STRIP_X;
-	m_y=WATER_STRIP_Y;
-	m_elapsedMs=0;
-	m_initialVelocity=0.001f*MAP_XY_FACTOR;		//velocity per ms
-	m_totalMs=m_waveDir.Length()/m_initialVelocity;
-	m_fadeMs = 3000;		//time for wave to fade out after it stops on beach
-
-	m_stageZeroTexture=WW3DAssetManager::Get_Instance()->Get_Texture(texturename);
-}
-
-//=============================================================================
-// WaterTracksObj::update
-//=============================================================================
-/** Update state of object - advance animations and other states.
- */
-//=============================================================================
-Int WaterTracksObj::update(Int msElapsed)
-{
-#ifdef	ALLOW_WATER_TRACK_EDIT
-//	if (pauseWaves)
-//		m_elapsedMs = m_timeToReachBeach+m_timeToStop;
-//	else
-#endif
-
-	//nothing to do here...most of the work is done on render.
-	m_elapsedMs += msElapsed;	//advance time for this update
-
-	///@todo: Should check in here if we are done with this object are return FALSE to free it.
-	//	return FALSE;
-
-	return TRUE;	//assume we had an update
-}
-
-#define waveInitialV = 0.01f
-#define waveAcceleration = -0.01f
-
-//=============================================================================
-// WaterTracksObj::render
-//=============================================================================
-/** Draws the object in it's current state.
- */
-//=============================================================================
-
-Int WaterTracksObj::render(DX8VertexBufferClass	*vertexBuffer, Int batchStart)
-{
-	VertexFormatXYZDUV1 *vb;
-	Vector2	waveTailOrigin,waveFrontOrigin;
-	Real	ooWaveDirLen=1.0f/m_waveDir.Length();	//one over length
-	Real	waterHeight;
-	Real	waveAlpha;
-	Real	widthFrac;
-	Real	heightFrac;
-
-	if (batchStart < (WATER_VB_PAGES*WATER_STRIP_X*WATER_STRIP_Y-m_x*m_y))
-	{	//we have room in current VB, append new verts
-		if(vertexBuffer->Get_DX8_Vertex_Buffer()->Lock(batchStart*vertexBuffer->FVF_Info().Get_FVF_Size(),m_x*m_y*vertexBuffer->FVF_Info().Get_FVF_Size(),(unsigned char**)&vb,D3DLOCK_NOOVERWRITE) != D3D_OK)
-			return batchStart;
-	}
-	else
-	{	//ran out of room in last VB, request a substitute VB.
-		if(vertexBuffer->Get_DX8_Vertex_Buffer()->Lock(0,m_x*m_y*vertexBuffer->FVF_Info().Get_FVF_Size(),(unsigned char**)&vb,D3DLOCK_DISCARD) != D3D_OK)
-			return batchStart;
-		batchStart=0;	//reset start of page to first vertex
-	}
-
-	//Adjust wave position in a non-linear way so that it slows down as it hits the target.  Using 1/4 sine wave
-	//seems to work okay since it maxes out at 1.0 at our final position.
-	//Real	timeFrac=(Real)m_elapsedMs/(Real)m_totalMs;//sinf(0.5f*3.14159f*(Real)m_elapsedMs/(Real)m_totalMs);
-
-	//Real displacement=m_elapsedMs*waveInitialV+0.5*waveAcceleration*m_elapsed*m_elapsed;
-
-	heightFrac=1.0f;
-	widthFrac = 1.0f;
-
-	if (m_type == WaveTypeStationary)
-	{	//stationary wave
-		waveFrontOrigin = m_startPos;
-		waveFrontOrigin -= m_perpDir*m_waveFinalWidth*0.5f;	//offset to left edge of wave
-		waveTailOrigin = waveFrontOrigin - m_waveFinalHeight * ooWaveDirLen*m_waveDir;
-		waveAlpha = 0.0f;
-
-		if (m_elapsedMs >= m_totalMs)
-			m_elapsedMs = 0;	//done with effect*/
-		if (m_elapsedMs > (m_timeToReachBeach + m_timeToStop -1000 + m_fadeMs))
-		{	//fading out
-			waveAlpha = m_elapsedMs-(m_timeToReachBeach + m_timeToStop - 1000 +m_fadeMs);//(m_totalMs-m_timeToRetreat -m_fadeMs - m_elapsedMs)/m_fadeMs;
-			waveAlpha = waveAlpha / m_timeToRetreat;
-			waveAlpha = 1.0f - waveAlpha;
-			if (waveAlpha < 0.0f)
-				waveAlpha = 0.0f;
-		}
-		else
-		if (m_elapsedMs > (m_timeToReachBeach + m_timeToStop - 1000))
-		{	//start fading up
-			
-			waveAlpha = m_elapsedMs-(m_timeToReachBeach + m_timeToStop - 1000);//(m_totalMs-m_timeToRetreat -m_fadeMs - m_elapsedMs)/m_fadeMs;
-			waveAlpha = waveAlpha / m_fadeMs;
-			if (waveAlpha > 1.0f)
-				waveAlpha = 1.0f;
-		}
-	}
-	else
-	{	//moving wave
-
-		//get coordinate of top left of wave strip
-		if (m_elapsedMs < m_timeToReachBeach)
-		{	//wave has not reached beach yet so position only depends on velocity
-			waveAlpha = m_elapsedMs / m_timeToReachBeach;
-			widthFrac = waveAlpha;
-			widthFrac=(m_waveInitialWidth + widthFrac* (m_waveFinalWidth-m_waveInitialWidth))/m_waveFinalWidth;
-
-			waveFrontOrigin = m_startPos + m_initialVelocity*m_elapsedMs*ooWaveDirLen*m_waveDir;
-			waveFrontOrigin -= m_perpDir*m_waveFinalWidth*0.5f*widthFrac;	//offset to left edge of wave
-			//Tail of wave will be behind the front by fixed amount.
-			waveTailOrigin = waveFrontOrigin - m_waveInitialHeight * ooWaveDirLen*m_waveDir;
-		}
-		else	//wave has reached beach and is decelerating
-		if (m_elapsedMs < m_totalMs)
-		{	waveAlpha = 1.0f;
-			widthFrac = 1.0f;
-			//Get position of wave when it hit the beach
-			waveFrontOrigin = m_startPos + m_initialVelocity*m_timeToReachBeach*ooWaveDirLen*m_waveDir;
-			waveTailOrigin = waveFrontOrigin;	//store position for calculating tail position
-			//Add movement after it hit the beach	
-			Real elapsedMs=m_elapsedMs - m_timeToReachBeach;
-			waveFrontOrigin += (m_initialVelocity*elapsedMs+0.5f*m_frontSlowDownAcc*elapsedMs*elapsedMs)*ooWaveDirLen*m_waveDir;
-			waveFrontOrigin -= m_perpDir*m_waveFinalWidth*0.5f*widthFrac;	//offset to left edge of wave
-
-			Real timeSinceBacktrack = m_elapsedMs - m_timeToReachBeach - m_timeToStop;
-			if (timeSinceBacktrack < 0)
-				timeSinceBacktrack = 0;
-			waveAlpha = timeSinceBacktrack/m_fadeMs;
-			if (waveAlpha > 1.0f)
-				waveAlpha = 1.0f;
-
-			waveAlpha = 1.0f - waveAlpha;
-
-			//Get position of tail when front hits the beach.
-			waveTailOrigin -= m_waveInitialHeight * ooWaveDirLen*m_waveDir;
-
-			if (m_elapsedMs > (m_timeToReachBeach+m_timeToStop+m_timeToCompress))
-			{	elapsedMs=elapsedMs;	///@todo: bug?
-				waveTailOrigin += (0.5f*m_backSlowDownAcc*(m_timeToStop+m_timeToCompress)*(m_timeToStop+m_timeToCompress))*ooWaveDirLen*m_waveDir;
-				//get time since wave should have stopped moving forward
-				Real newElapsed = m_elapsedMs - (m_timeToReachBeach+m_timeToStop+m_timeToCompress);
-				waveTailOrigin += (0.5f*m_frontSlowDownAcc*newElapsed*newElapsed)*ooWaveDirLen*m_waveDir;
-			}
-			else
-	//		if (m_elapsedMs < (m_totalMs-m_timeToRetreat))
-				//find position of tail including slowdown after it hit the beach
-	//		waveTailOrigin += (m_initialVelocity*elapsedMs+0.5f*m_backSlowDownAcc*elapsedMs*elapsedMs)*ooWaveDirLen*m_waveDir;
-			waveTailOrigin += (0.5f*m_backSlowDownAcc*elapsedMs*elapsedMs)*ooWaveDirLen*m_waveDir;
-
-			waveTailOrigin -= m_perpDir*m_waveFinalWidth*0.5f*widthFrac;	//offset to left edge of wave
-		}
-		else
-		{	m_elapsedMs = 0;
-			waveAlpha = m_elapsedMs / m_timeToReachBeach;
-			widthFrac = waveAlpha;
-			widthFrac=(m_waveInitialWidth + widthFrac* (m_waveFinalWidth-m_waveInitialWidth))/m_waveFinalWidth;
-
-			waveFrontOrigin = m_startPos + m_initialVelocity*m_elapsedMs*ooWaveDirLen*m_waveDir;
-			waveFrontOrigin -= m_perpDir*m_waveFinalWidth*0.5f*widthFrac;	//offset to left edge of wave
-			//Tail of wave will be behind the front by fixed amount.
-			waveTailOrigin = waveFrontOrigin - m_waveInitialHeight * ooWaveDirLen*m_waveDir;
-		}
-	}
-
-	//First insert tail of wave:
-	Vector2 testPoint(waveTailOrigin);
-	TheTerrainLogic->isUnderwater(testPoint.X,testPoint.Y,&waterHeight);
-	vb->x=	testPoint.X;
-	vb->y=	testPoint.Y;
-	vb->z=waterHeight+1.5f;
-	vb->diffuse=(REAL_TO_INT(waveAlpha*255.0f)<<24) |0xffffff;
-	if (m_flipU)
-		vb->u1=1;	
-	else
-		vb->u1=0;	
-	vb->v1=0;	
-	vb++;
-	testPoint.Set(waveTailOrigin + m_perpDir*m_waveFinalWidth*widthFrac);
-	vb->x=	testPoint.X;
-	vb->y=	testPoint.Y;
-	vb->z=waterHeight+1.5f;
-	vb->diffuse=(REAL_TO_INT(waveAlpha*255.0f)<<24) |0xffffff;
-	if (m_flipU)
-		vb->u1=0.0f;
-	else
-		vb->u1=1.0f;
-	vb->v1=0;
-	vb++;
-	//insert front of wave
-	testPoint.Set(waveFrontOrigin);
-	vb->x=	testPoint.X;
-	vb->y=	testPoint.Y;
-	vb->z=waterHeight+1.5f;
-	vb->diffuse=(REAL_TO_INT(waveAlpha*255.0f)<<24) |0xffffff;
-	if (m_flipU)
-		vb->u1=1;
-	else
-		vb->u1=0;
-	vb->v1=1.0f;
-	vb++;
-	testPoint.Set(waveFrontOrigin + m_perpDir*m_waveFinalWidth*widthFrac);
-	vb->x=	testPoint.X;
-	vb->y=	testPoint.Y;
-	vb->z=waterHeight+1.5f;
-	vb->diffuse=(REAL_TO_INT(waveAlpha*255.0f)<<24) |0xffffff;
-	if (m_flipU)
-		vb->u1=0;
-	else
-		vb->u1=1.0f;
-	vb->v1=1.0f;
-	vb++;
-
-	vertexBuffer->Get_DX8_Vertex_Buffer()->Unlock();
-
-	Int idxCount=(m_y-1)*(m_x*2+2) - 2;	//index count
-
-	DX8Wrapper::Set_Index_Buffer(TheWaterTracksRenderSystem->m_indexBuffer,batchStart);
-	DX8Wrapper::Draw_Strip(0,idxCount-2,0,m_x*m_y);	//there are always n-2 primitives for n index strip.
-
-	return batchStart+m_x*m_y;	//return new offset into unused area of vertex buffer
-}
-
-//=============================================================================
-//WaterTracksRenderSystem::bindTrack
-//=============================================================================
-/** Grab a track from the free store. If no free tracks exist, return NULL.
-	As long as a track is bound to an object (like a tank) it is ready to accept
-	updates with additional edges.  Once it is unbound, it will expire and return
-	to the free store once all tracks have faded out.
-*/
-//=============================================================================
-WaterTracksObj *WaterTracksRenderSystem::bindTrack(waveType type)
-{
-	WaterTracksObj *mod,*nextmod,*prevmod;
-
-	mod = m_freeModules;
-	if( mod )
-	{
-		// take module off the free list
-		if( mod->m_nextSystem )
-			mod->m_nextSystem->m_prevSystem = mod->m_prevSystem;
-		if( mod->m_prevSystem )
-			mod->m_prevSystem->m_nextSystem = mod->m_nextSystem;
-		else
-			m_freeModules = mod->m_nextSystem;
-
-		mod->m_type=type;
-
-		// put module on the used list (sorted next to similar types)
-		nextmod=NULL,prevmod=NULL;
-		for( nextmod = m_usedModules; nextmod; prevmod=nextmod,nextmod = nextmod->m_nextSystem )
-		{
-			if (nextmod->m_type==type)
-			{	//found start of other shadows using same texture, insert new shadow here.
-				mod->m_nextSystem=nextmod;
-				mod->m_prevSystem=prevmod;
-				nextmod->m_prevSystem=mod;
-				if (prevmod)
-				{	prevmod->m_nextSystem=mod;
-				}
-				else
-					m_usedModules=mod;
-				break;
-			}
-		}
-
-		if (nextmod==NULL)
-		{	//shadow with new texture. Add to top of list.
-			mod->m_nextSystem = m_usedModules;
-			if (m_usedModules)
-				m_usedModules->m_prevSystem=mod;
-			m_usedModules = mod;
-		}
-	
-		mod->m_bound=true;
-	}  // end if
-
-	#ifdef SYNC_WAVES
-	nextmod=m_usedModules;
-
-	while(nextmod)
-	{
-		nextmod->m_elapsedMs=nextmod->m_initTimeOffset;
-		nextmod=nextmod->m_nextSystem;
-	}  // end while
-	#endif
-
-	return mod;
-}  //end bindTrack
-
-//=============================================================================
-//WaterTracksRenderSystem::unbindTrack
-//=============================================================================
-/** Called when an object (i.e Tank) will not lay down any more tracks and
-doesn't need this object anymore.  The track-laying object will be returned
-to pool of available tracks as soon as any remaining track edges have faded out.
-*/
-//=============================================================================
-void WaterTracksRenderSystem::unbindTrack( WaterTracksObj *mod )
-{
-	//this object should return to free store as soon as there is nothing
-	//left to render.
-	mod->m_bound=false;
-	releaseTrack(mod);
-}
-
-//=============================================================================
-//WaterTracksRenderSystem::releaseTrack
-//=============================================================================
-/** Returns a track laying object to free store to be used again later.
-*/
-void WaterTracksRenderSystem::releaseTrack( WaterTracksObj *mod )
-{
-	if (mod==NULL)
-		return;
-	
-	assert(mod->m_bound == false);
-
-	// remove module from used list
-	if( mod->m_nextSystem )
-		mod->m_nextSystem->m_prevSystem = mod->m_prevSystem;
-	if( mod->m_prevSystem )
-		mod->m_prevSystem->m_nextSystem = mod->m_nextSystem;
-	else
-		m_usedModules = mod->m_nextSystem;
-
-	// add module to free list
-	mod->m_prevSystem = NULL;
-	mod->m_nextSystem = m_freeModules;
-	if( m_freeModules )
-		m_freeModules->m_prevSystem = mod;
-	m_freeModules = mod;
-	mod->freeWaterTracksResources();
-}
-
-//=============================================================================
-// WaterTracksRenderSystem::WaterTracksRenderSystem
-//=============================================================================
-/** Constructor. Just nulls out some variables. */
-//=============================================================================
-WaterTracksRenderSystem::WaterTracksRenderSystem()
-{
-	m_usedModules = NULL;
-	m_freeModules = NULL;
-	m_indexBuffer = NULL;
-	m_vertexMaterialClass = NULL;
-	m_vertexBuffer = NULL;
-	m_stripSizeX=WATER_STRIP_X;
-	m_stripSizeY=WATER_STRIP_Y;
-	m_batchStart=0;
-	TheWaterTracksRenderSystem = this;	//only allow one instance of this object.
-}
-
-//=============================================================================
-// WaterTracksRenderSystem::~WaterTracksRenderSystem
-//=============================================================================
-/** Destructor.  Free all pre-allocated track laying render objects*/
-//=============================================================================
-WaterTracksRenderSystem::~WaterTracksRenderSystem( void )
-{
-
-	// free all data
-	shutdown();
-
-	m_vertexMaterialClass=NULL;
-
-}
-
-//=============================================================================
-// WaterTracksRenderSystem::ReAcquireResources
-//=============================================================================
-/** (Re)allocates all W3D assets after a reset.. */
-//=============================================================================
-void WaterTracksRenderSystem::ReAcquireResources(void)
-{
-	Int i,j,k;
-//	const Int numModules=16;	///@todo: Get a value out of gdf
-
-	// just for paranoia's sake.
-	REF_PTR_RELEASE(m_indexBuffer);
-	REF_PTR_RELEASE(m_vertexBuffer);
-
-	//Will need m_y-1 strips, each of length m_x*2.
-	//Will also need 2 extra indices to connect each strip to next one (except last strip)
-	//Total index buffer size = (m_y-1)*(m_x*2+2) - 2 (drop the extra 2 indices from last strip)
-
-	Int idxCount=(m_stripSizeY-1)*(m_stripSizeX*2+2) - 2;
-
-	m_indexBuffer=NEW_REF(DX8IndexBufferClass,(idxCount));
-
-	// Fill up the IB
-	{
-		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
-		UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-		
-		for (i=0,j=0,k=0; i<idxCount; j++)
-		{
-			for (;k<(m_stripSizeX*(j+1)); k++,i+=2)
-			{
-				ib[i]=(UnsignedShort) k+m_stripSizeX;
-				ib[i+1]=(UnsignedShort) k;
-			}
-			//Generate 4 degenerate triangle to connect current strip to next strip/row of map
-			//To do this, we just repeat the last index of first strip and first index of new strip.
-			//Any triangles with repeated vertices will be skipped during rendering.
-			if (i<idxCount) //check if there is at least 1 more strip to go
-			{
-				ib[i]=k-1;
-				ib[i+1]=k+m_stripSizeX;
-				i+=2;
-			}
-		}
-	}
-
-	m_vertexBuffer=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZDUV1,m_stripSizeX*m_stripSizeY*WATER_VB_PAGES,DX8VertexBufferClass::USAGE_DYNAMIC));
-	m_batchStart=0;
-}
-
-//=============================================================================
-// WaterTracksRenderSystem::ReleaseResources
-//=============================================================================
-/** (Re)allocates all W3D assets after a reset.. */
-//=============================================================================
-void WaterTracksRenderSystem::ReleaseResources(void)
-{
-	REF_PTR_RELEASE(m_indexBuffer);
-	REF_PTR_RELEASE(m_vertexBuffer);
-	// Note - it is ok to not release the material, as it is a w3d object that
-	// has no dx8 resources. jba.
-}
-
-//=============================================================================
-// WaterTracksRenderSystem::init
-//=============================================================================
-/**  initialize the system, allocate all the render objects we will need */
-//=============================================================================
-void WaterTracksRenderSystem::init(void)
-{
-	const Int numModules=2000;	///@todo: Get a value out of gdf
-	Int i;
-	WaterTracksObj *mod;
-
-	m_stripSizeX=WATER_STRIP_X;	///@todo: grab these out of gdf or define
-	m_stripSizeY=WATER_STRIP_Y;
-	m_level=TheGlobalData->m_waterPositionZ;
-
-	ReAcquireResources();
-	//go with a preset material for now.
-	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-
-	//use a multi-texture shader:
-	m_shaderClass = ShaderClass::_PresetAlphaShader;
-	m_shaderClass.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);	//water should be visible from both sides
-
-	// we cannot initialize a system that is already initialized
-	if( m_freeModules || m_usedModules )
-	{
-
-		// system already online!
-		assert( 0 );
-		return;
-
-	}  // end if
-
-	// allocate our modules for this system
-	for( i = 0; i < numModules; i++ )
-	{
-
-		mod = NEW WaterTracksObj;
-
-		if( mod == NULL )
-		{
-
-			// unable to allocate modules needed
-			assert( 0 );
-			return;
-
-		}  // end if
-
-		mod->m_prevSystem = NULL;
-		mod->m_nextSystem = m_freeModules;
-		if( m_freeModules )
-			m_freeModules->m_prevSystem = mod;
-		m_freeModules = mod;
-
-	}  // end for i
-
-}  // end init
-
-void WaterTracksRenderSystem::reset(void)
-{
-	WaterTracksObj *nextMod,*mod;
-
-	//release unbound tracks that may still be fading out
-	mod=m_usedModules;
-
-	while(mod)
-	{
-		nextMod=mod->m_nextSystem;
-		mod->m_bound=false;
-		releaseTrack(mod);
-
-		mod = nextMod;
-	}  // end while
-
-
-	// free all attached things and used modules
-	assert( m_usedModules == NULL );
-}
-
-//=============================================================================
-// WaterTracksRenderSystem::shutdown
-//=============================================================================
-/** Shutdown and free all memory for this system */
-//=============================================================================
-void WaterTracksRenderSystem::shutdown( void )
-{
-	WaterTracksObj *nextMod,*mod;
-
-	//release unbound tracks that may still be fading out
-	mod=m_usedModules;
-
-	while(mod)
-	{
-		nextMod=mod->m_nextSystem;
-
-		if (!mod->m_bound)
-			releaseTrack(mod);
-
-		mod = nextMod;
-	}  // end while
-
-
-	// free all attached things and used modules
-	assert( m_usedModules == NULL );
-
-	// free all module storage
-	while( m_freeModules )
-	{
-
-		nextMod = m_freeModules->m_nextSystem;
-		delete m_freeModules;
-		m_freeModules = nextMod;
-
-	}  // end while
-
-	REF_PTR_RELEASE(m_indexBuffer);
-	REF_PTR_RELEASE(m_vertexMaterialClass);
-	REF_PTR_RELEASE(m_vertexBuffer);
-
-}  // end shutdown
-
-//=============================================================================
-// WaterTracksRenderSystem::update
-//=============================================================================
-/** Update the state of all active track marks - fade, expire, etc. */
-//=============================================================================
-void WaterTracksRenderSystem::update()
-{
-
-	static  Int iLastTime=timeGetTime();
-	WaterTracksObj *mod=m_usedModules,*nextMod;
-
-	Int timeDiff = timeGetTime()-iLastTime;
-	iLastTime += timeDiff;
-
-	//Lock framerate to 30 fps
-	timeDiff = 1.0f/30.0f*1000.0f;
-
-	//first update all the tracks
-	while( mod )
-	{
-		nextMod = mod->m_nextSystem;
-
-		if (!mod->m_bound || (!mod->update(timeDiff) && !mod->m_bound))
-		{ //object is not longer updating and is unbound so ok to release it.
-			releaseTrack(mod);
-		}
-
-		mod = nextMod;
-	}  // end while
-}
-
-
-void TestWaterUpdate(void);
-void setFPMode( void );
-
-//=============================================================================
-// WaterTracksRenderSystem::flush
-//=============================================================================
-/** Draw all active track marks for this frame */
-//=============================================================================
-void WaterTracksRenderSystem::flush(RenderInfoClass & rinfo)
-{
-/** @todo: Optimize system by drawing tracks as triangle strips and use dynamic vertex buffer access.
-May also try rendering all tracks with one call to W3D/D3D by grouping them by texture.
-Try improving the fit to vertical surfaces like cliffs.
-*/
-	Int	diffuseLight;
-
-	if (TheGlobalData->m_usingWaterTrackEditor)
-		TestWaterUpdate();
-
-	update();	//update positions of all the tracks
-
-	rinfo.Camera.Apply();
-
-	if (!m_usedModules || ShaderClass::Is_Backface_Culling_Inverted())
-		return;	//don't render track marks in reflections.
-
-	//According to Nvidia there's a D3D bug that happens if you don't start with a
-	//new dynamic VB each frame - so we force a DISCARD by overflowing the counter.
-	m_batchStart = 0xffff;
-
-	// adjust shading for time of day.
-	Real shadeR, shadeG, shadeB;
-	shadeR = TheGlobalData->m_terrainAmbient[0].red;
-	shadeG = TheGlobalData->m_terrainAmbient[0].green;
-	shadeB = TheGlobalData->m_terrainAmbient[0].blue;
-	shadeR += TheGlobalData->m_terrainDiffuse[0].red/2;
-	shadeG += TheGlobalData->m_terrainDiffuse[0].green/2;
-	shadeB += TheGlobalData->m_terrainDiffuse[0].blue/2;
-	shadeR*=255.0f;
-	shadeG*=255.0f;
-	shadeB*=255.0f;
-
-	diffuseLight=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16);
-
-	Matrix3D tm(1);	///set to identity
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
-
-	DX8Wrapper::Set_Material(m_vertexMaterialClass);
-	DX8Wrapper::Set_Shader(m_shaderClass);
-
-	DX8Wrapper::Set_Vertex_Buffer(m_vertexBuffer);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZBIAS,8);
-
-	Int LastTextureType=-1;
-
-	WaterTracksObj *mod=m_usedModules;
-
-	while( mod )
-	{
-		if (LastTextureType != mod->m_type)
-			DX8Wrapper::Set_Texture(0,mod->m_stageZeroTexture);
-
-		Int vertsRendered=mod->render(m_vertexBuffer,m_batchStart);
-
-		m_batchStart = vertsRendered;	//advance past vertices already in buffer
-
-		mod = mod->m_nextSystem;
-	}	//while (mod)
-
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZBIAS,0);
-}
-
-WaterTracksObj *WaterTracksRenderSystem::findTrack(Vector2 &start, Vector2 &end, waveType type)
-{
-	WaterTracksObj *mod=m_usedModules;
-
-	while( mod )
-	{
-		if (mod->m_initEndPos == end &&
-			mod->m_initStartPos == start &&
-			mod->m_type == type)
-			return mod;
-		mod = mod->m_nextSystem;
-	}	//while (mod)
-	return NULL;
-}
-void WaterTracksRenderSystem::saveTracks(void)
-{
-
-	if (!TheTerrainLogic)
-		return;
-
-	AsciiString fileName=TheTerrainLogic->getSourceFilename();
-	char path[256];
-
-	strcpy(path,fileName.str());
-	Int len=strlen(path);
-
-	strcpy(path+len-4,".wak");
-
-	WaterTracksObj *umod;
-	Int trackCount=0;
-
-	FILE *fp=fopen(path,"wb");
-
-	if (fp)
-	{
-		umod=m_usedModules;
-		while(umod)
-		{	if (umod->m_initTimeOffset == 0)
-			{	//only save the primary wave front, second layer is added automatically.
-				fwrite(&umod->m_initStartPos,sizeof(umod->m_startPos),1,fp);
-				fwrite(&umod->m_initEndPos,sizeof(umod->m_perpDir),1,fp);
-				fwrite(&umod->m_type,sizeof(umod->m_type),1,fp);
-	//			fwrite(&umod->m_initTimeOffset,sizeof(umod->m_initTimeOffset),1,fp);
-				trackCount++;
-			}
-			umod=umod->m_nextSystem;
-		}  // end while
-		fwrite(&trackCount,sizeof(trackCount),1,fp);
-		fclose(fp);
-	}
-}
-
-void WaterTracksRenderSystem::loadTracks(void)
-{
-
-	if (!TheTerrainLogic)
-		return;
-
-	AsciiString fileName=TheTerrainLogic->getSourceFilename();
-	char path[256];
-
-	strcpy(path,fileName.str());
-	Int len=strlen(path);
-
-	strcpy(path+len-4,".wak");
-
-	File *file = TheFileSystem->openFile(path, File::READ | File::BINARY);
-	WaterTracksObj *umod;
-	Int trackCount=0;
-	Int flipU=0;
-	Vector2 startPos,endPos;
-	waveType wtype;
-
-	if (file)
-	{
-		file->seek(-4,File::END);
-		file->read(&trackCount,sizeof(trackCount));
-		file->seek(0, File::START);
-		for (Int i=0; i<trackCount; i++)
-		{
-		tryagain:
-			file->read(&startPos,sizeof(startPos));
-			file->read(&endPos,sizeof(endPos));
-			file->read(&wtype,sizeof(wtype));
-			//Check if this track already exists.
-			if (findTrack(startPos,endPos,wtype))
-			{	i++;
-				goto tryagain;
-			}
-
-			umod=TheWaterTracksRenderSystem->bindTrack(wtype);
-			if (umod)
-			{	//umod->init(1.5f*MAP_XY_FACTOR,Vector2(0,0),Vector2(1,1),"wave256.tga");
-				flipU ^= 1;	//toggle flip state
-				umod->init(waveTypeInfo[wtype].m_finalHeight,waveTypeInfo[wtype].m_finalWidth,startPos,endPos,waveTypeInfo[wtype].m_textureName,0);
-				umod->m_flipU=flipU;
-
-				if (waveTypeInfo[wtype].m_secondWaveTimeOffset)	//check if we need a second wave to follow
-				{
-					umod=TheWaterTracksRenderSystem->bindTrack(wtype);
-					if (umod)
-					{
-						umod->init(waveTypeInfo[wtype].m_finalHeight,waveTypeInfo[wtype].m_finalWidth,startPos,endPos,waveTypeInfo[wtype].m_textureName,waveTypeInfo[wtype].m_secondWaveTimeOffset);
-						umod->m_flipU = !flipU;
-					}
-				}
-			}
-		}
-		file->close();
-	}
-
-#if 0	//Obsolete code used before there was another editor to place waves.
-	//Look for all waypoints that start with "waveStart_"
-	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext())
-	{
-		if (way->getName().startsWith("waveStart_") && way->getNumLinks() == 1)
-		{
-			Waypoint *nextWay = way->getLink(0);
-			Coord3D startPos = *way->getLocation();
-			Coord3D endPos = *nextWay->getLocation();
-
-			//initialize surface layer (1)
-			WaterTracksObj *umod=TheWaterTracksRenderSystem->bindTrack(1);
-			if (umod)
-			{
-				umod->init(DEFAULT_FINAL_WAVE_HEIGHT,DEFAULT_FINAL_WAVE_WIDTH,Vector2(startPos.x,startPos.y),Vector2(endPos.x,endPos.y),"wave1.tga",0);
-			}
-/*
-			//initialize foam layer (0)
-			umod=TheWaterTracksRenderSystem->bindTrack(0);
-			if (umod)
-			{
-				umod->init(2.5f*MAP_XY_FACTOR,5.0f*MAP_XY_FACTOR,Vector2(startPos.x,startPos.y),Vector2(endPos.x,endPos.y),"wave2.tga");
-//				umod->m_fadeMs += 1500;	//take extra 500 ms to fade out wave.
-//				umod->m_retreatFrac = 1.0f;	//don't move wave back after it hits final position.
-			}*/
-		}
-	}
-#endif
-}
-
-/**@todo: this is a quick hack for adding/removing/testing breaking waves inside the client.
-Will need to move this code to an external editor at some pont. */
-#include "GameClient/Display.h"
-
-extern HWND ApplicationHWnd;
-
-//TODO: Fix editor so it actually draws the wave segment instead of line while editing
-//Could freeze all the water while editing?  Or keep setting elapsed time on current segment.
-//Have to make it so seamless merge of segments at final position.
-static void TestWaterUpdate(void)
-{
-	static Int doInit=1;
-	static WaterTracksObj *track=NULL,*track2=NULL;
-	static Int trackEditMode=0;
-	static waveType currentWaveType = WaveTypeOcean;
-	POINT	screenPoint;
-	POINT	endPoint;
-	static POINT	mouseAnchor;
-	static Int		haveStart=0;
-	static Int		haveEnd=0;
-	static Coord3D	terrainPointStart,terrainPointEnd;
-	//flags to tell me when the user lets go of a key
-	static Int trackEditModeReset=1;
-	static Int addPointReset=1;
-	static Int deleteTrackReset=1;
-	static Int saveTracksReset=1;
-	static Int loadTracksReset=1;
-	static Int changeTypeReset=1;
-
-	pauseWaves=FALSE;
-
-	if (doInit)
-	{	//create the system
-		doInit=0;
-
-//		TheWaterTracksRenderSystem = NEW (WaterTracksRenderSystem);
-//		TheWaterTracksRenderSystem->init();
-
-		//create a dummy track
-//		track=TheWaterTracksRenderObjClassSystem->bindTrack(0);
-//		track->init(1.5f,8.0f,Vector2(147.0f,67.0f),Vector2(146.9f,68.6f),"wave2.tga");
-
-//		track=TheWaterTracksRenderObjClassSystem->bindTrack(0);
-//		track->init(1.5f,8.0f,Vector2(139.0f,66.0f),Vector2(138.8f,67.6f),"wave2.tga");
-	}
-
-	if (GetAsyncKeyState(VK_F5) & 0x8001)	//check if F5 pressed since last call
-	{	
-		if (trackEditModeReset)
-		{
-			if (trackEditMode)
-			{
-				UnicodeString string;
-				string.format(L"Leaving Water Track Edit Mode");
-				TheInGameUI->message(string);
-			}
-			else
-			{
-				UnicodeString string;
-				string.format(L"Entering Water Track Edit Mode");
-				TheInGameUI->message(string);
-
-				string.format(L"Wave Type: %hs",waveTypeInfo[currentWaveType].m_waveTypeName);
-				TheInGameUI->message(string);
-			}
-
-			trackEditMode ^= 1;	//toggle editor on/off
-
-			if (trackEditMode == 0)
-			{	//editor was turned off, save changes
-				haveStart=0;
-				haveEnd=0;
-			}
-			trackEditModeReset=0;
-		}
-	}
-	else
-		trackEditModeReset=1;
-
-	if (trackEditMode)
-	{   //we are in wave edit mode
-
-		if (GetCursorPos(&screenPoint))	//read mouse position
-		{
-			ScreenToClient( ApplicationHWnd, &screenPoint);
-
-			if (GetAsyncKeyState(VK_F6) & 0x8001)
-			{
-				if (addPointReset)
-				{
-					if (!haveStart)
-					{	mouseAnchor=screenPoint;
-						TheTacticalView->screenToTerrain( (ICoord2D *)&screenPoint, &terrainPointStart);
-						haveStart=1;
-						UnicodeString string;
-						string.format(L"Added Start");
-						TheInGameUI->message(string);
-					}
-					else
-					{
-						endPoint=screenPoint;
-						TheTacticalView->screenToTerrain( (ICoord2D *)&screenPoint, &terrainPointEnd);
-						haveEnd=1;
-						//Have enough info to add a wave now
-						track=TheWaterTracksRenderSystem->bindTrack(currentWaveType);
-						if (track)
-						{//	track->init(1.5f*MAP_XY_FACTOR,Vector2(terrainPointStart.x,terrainPointStart.y),Vector2(terrainPointEnd.x,terrainPointEnd.y),"wave256.tga");
-							//Generate valid input for the 2 points
-							Vector2 startPoint(terrainPointStart.x,terrainPointStart.y);
-							Vector2 endPoint(terrainPointEnd.x,terrainPointEnd.y);
-							Vector2 midPoint = endPoint - startPoint;
-							Vector2 m_perpDir = midPoint;
-							m_perpDir.Rotate(1.57079632679f);	//get vector perpendicular to wave motion.
-							m_perpDir.Normalize();
-							midPoint = startPoint + (midPoint)*0.5f;
-							Vector2 dirMidPoint = midPoint + m_perpDir;
-
-							track->init(waveTypeInfo[currentWaveType].m_finalHeight,waveTypeInfo[currentWaveType].m_finalWidth,Vector2(midPoint.X,midPoint.Y),Vector2(dirMidPoint.X,dirMidPoint.Y),waveTypeInfo[currentWaveType].m_textureName,0);
-
-							if (waveTypeInfo[currentWaveType].m_secondWaveTimeOffset)
-							{
-								//Add a second track slightly behind this one
-								track2=TheWaterTracksRenderSystem->bindTrack(currentWaveType);
-								if (track2)
-								{
-									track2->init(waveTypeInfo[currentWaveType].m_finalHeight,waveTypeInfo[currentWaveType].m_finalWidth,Vector2(midPoint.X,midPoint.Y),Vector2(dirMidPoint.X,dirMidPoint.Y),waveTypeInfo[currentWaveType].m_textureName,waveTypeInfo[currentWaveType].m_secondWaveTimeOffset);
-								}
-							}
-
-							UnicodeString string;
-							string.format(L"Added End");
-							TheInGameUI->message(string);
-						}
-						haveStart=0;	//reset for next segment
-						haveEnd=0;
-					}
-					addPointReset=0;
-				}
-			}
-			else
-				addPointReset=1;
-
-			if (GetAsyncKeyState(VK_DELETE) & 0x8001)
-			{	//delete last segment added
-				if (deleteTrackReset && track)
-				{	deleteTrackReset=0;
-					TheWaterTracksRenderSystem->unbindTrack(track);
-					if (track2)
-						TheWaterTracksRenderSystem->unbindTrack(track2);
-					haveStart=0;	//reset for next segment
-					haveEnd=0;
-					track=NULL;
-					track2=NULL;
-				}
-			}
-			else
-				deleteTrackReset=1;
-
-			if (GetAsyncKeyState(VK_INSERT) & 0x8001)
-			{	//change current wave type
-				if (changeTypeReset)
-				{	changeTypeReset=0;
-					currentWaveType = (waveType)((Int)currentWaveType + 1);
-					if (currentWaveType > WaveTypeLast)
-						currentWaveType = WaveTypeFirst;
-
-					UnicodeString string;
-					string.format(L"Wave Type: %hs",waveTypeInfo[currentWaveType].m_waveTypeName);
-					TheInGameUI->message(string);
-				}
-			}
-			else
-				changeTypeReset=1;
-
-			if (GetAsyncKeyState(VK_F7) & 0x8001)
-			{	//save all segments added
-				if (saveTracksReset)
-				{	saveTracksReset=0;
-					TheWaterTracksRenderSystem->saveTracks();
-					haveStart=0;	//reset for next segment
-					haveEnd=0;
-					track=NULL;
-					track2=NULL;
-					UnicodeString string;
-					string.format(L"Saved Tracks");
-					TheInGameUI->message(string);
-				}
-			}
-			else
-				saveTracksReset=1;
-
-			if (GetAsyncKeyState(VK_F8) & 0x8001)
-			{	//load tracks for map
-				if (loadTracksReset)
-				{	loadTracksReset=0;
-					TheWaterTracksRenderSystem->reset();
-					TheWaterTracksRenderSystem->loadTracks();
-					haveStart=0;	//reset for next segment
-					haveEnd=0;
-					track=NULL;
-					track2=NULL;
-					UnicodeString string;
-					string.format(L"Loaded Tracks");
-					TheInGameUI->message(string);
-				}
-			}
-			else
-				saveTracksReset=1;
-		};
-
-		if (haveStart && !haveEnd)
-		{	//draw a guide line
-//			View *tacticalView = TheDisplay->getFirstView();
-//			tacticalView->worldToScreen( &m_moveHint[i].pos, &pos );
-
-			TheTacticalView->screenToTerrain( (ICoord2D *)&screenPoint, &terrainPointEnd);
-			//Check if point is within correct distance of start
-			Real xdiff=terrainPointEnd.x - terrainPointStart.x;
-			Real ydiff=terrainPointEnd.y - terrainPointStart.y;
-			if (sqrt (xdiff * xdiff + ydiff * ydiff) <= waveTypeInfo[currentWaveType].m_finalWidth)
-			{	TheDisplay->drawLine(mouseAnchor.x, mouseAnchor.y, screenPoint.x, screenPoint.y,1,0xffccccff);
-				DX8Wrapper::Invalidate_Cached_Render_States();
-				ShaderClass::Invalidate();
-			}
-
-			pauseWaves=TRUE;
-
-//			char buffer[64];
-//			sprintf(buffer,"\n%d,%d,%d,%d",mouseAnchor.x, mouseAnchor.y, screenPoint.x, screenPoint.y);
-//			OutputDebugString (buffer);
-		}
-	}
-}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvp
deleted file mode 100644
index 6468dcd0df3..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvp
+++ /dev/null
@@ -1,54 +0,0 @@
-;
-;	Command & Conquer Generals(tm)
-;	Copyright 2025 Electronic Arts Inc.
-;
-;	This program is free software: you can redistribute it and/or modify
-;	it under the terms of the GNU General Public License as published by
-;	the Free Software Foundation, either version 3 of the License, or
-;	(at your option) any later version.
-;
-;	This program is distributed in the hope that it will be useful,
-;	but WITHOUT ANY WARRANTY; without even the implied warranty of
-;	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;	GNU General Public License for more details.
-;
-;	You should have received a copy of the GNU General Public License
-;	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-;
-
-;////////////////////////////////////////////////////////////////////////////////
-;//																																						 //
-;//  (c) 2001-2003 Electronic Arts Inc.																				 //
-;//																																						 //
-;////////////////////////////////////////////////////////////////////////////////
-
-; Waves pixel shader
-; Kenny Mitchell April 2001
-; Modified July 2001 Mark Wilczynski
-
-; Declare pixel shader version 1.1
-ps.1.1
-
-; Define t0 as a standard 3-vector from bumpmap
-tex t0
-
-; Perform EMBM to get a local normal bump reflection.
-texbem t1, t0       ; compute new (u,v) values
-
-#ifndef DO_WATER_ALPHA_TEXTURE
-
-; result goes in output color multiplied by diffuse
-mul r0, t1, v0
-
-#else
-
-;alternate version which uses a third texture which provides per-pixel alpha.
-; result goes in output color multiplied by diffuse
-tex t2	; get alpha texture
-mul r0.rgb, t1, v0
-+mul r0.a, t2, v0
-
-#endif
-
-
-
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvv b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvv
deleted file mode 100644
index c33486962fc..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvv
+++ /dev/null
@@ -1,72 +0,0 @@
-;
-;	Command & Conquer Generals(tm)
-;	Copyright 2025 Electronic Arts Inc.
-;
-;	This program is free software: you can redistribute it and/or modify
-;	it under the terms of the GNU General Public License as published by
-;	the Free Software Foundation, either version 3 of the License, or
-;	(at your option) any later version.
-;
-;	This program is distributed in the hope that it will be useful,
-;	but WITHOUT ANY WARRANTY; without even the implied warranty of
-;	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;	GNU General Public License for more details.
-;
-;	You should have received a copy of the GNU General Public License
-;	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-;
-
-;////////////////////////////////////////////////////////////////////////////////
-;//																																					   //
-;//  (c) 2001-2003 Electronic Arts Inc.																				 //
-;//																																						 //
-;////////////////////////////////////////////////////////////////////////////////
-
-; Waves vertex shader
-; Kenny Mitchell April 2001
-; Modified July 2001 Mark Wilczynski
-
-#define CV_ZERO 0
-#define CV_ONE 1
-
-#define CV_WORLDVIEWPROJ_0 2
-#define CV_WORLDVIEWPROJ_1 3
-#define CV_WORLDVIEWPROJ_2 4
-#define CV_WORLDVIEWPROJ_3 5
-
-#define CV_TEXPROJ_0 6
-#define CV_TEXPROJ_1 7
-#define CV_TEXPROJ_2 8
-#define CV_TEXPROJ_3 9
-#define CV_PATCH_SCALE_OFFSET 10
-
-#define V_POSITION v0
-#define V_DIFFUSE v1
-#define V_TEXTURE v2
-#define V_TEXTURE2 v3
-
-vs.1.1
-
-; Below is Kenny's new optimized version
-; Transform position to clip space and output it
-dp4 r0.x, V_POSITION, c[CV_WORLDVIEWPROJ_0]
-dp4 r0.y, V_POSITION, c[CV_WORLDVIEWPROJ_1]
-dp4 r0.z, V_POSITION, c[CV_WORLDVIEWPROJ_2]
-dp4 r0.w, V_POSITION, c[CV_WORLDVIEWPROJ_3]
-
-mov oPos, r0
-
-; get 1/w and multiply it onto x and y
-rcp r1.w, r0.w
-mul r1.xy, r0.xy, r1.w
-
-; scale/flip/offset tex coords to screen
-mad oT1.xy, r1.xy, c[CV_TEXPROJ_0].xy,c[CV_TEXPROJ_0].zw
-
-mov oT0, V_TEXTURE
-mov oD0, V_DIFFUSE
-
-#ifdef DO_WATER_ALPHA_TEXTURE
-;generate uv coordinates for a third texture (alpha channel)
-mad oT2.xy,v0.xz,c[CV_PATCH_SCALE_OFFSET].zw,c[CV_PATCH_SCALE_OFFSET].xy
-#endif
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
deleted file mode 100644
index ead813f657d..00000000000
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
+++ /dev/null
@@ -1,2171 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// WorldHeightMap.cpp
-// Class to encapsulate height map.
-// Author: John Ahlquist, April 2001
-
-#define INSTANTIATE_WELL_KNOWN_KEYS
-
-#include "windows.h"
-#include "stdlib.h"
-#include <string.h>
-#include "Common/STLTypedefs.h"
-
-#include "Common/DataChunk.h"
-//#include "Common/GameFileSystem.h"
-#include "Common/FileSystem.h" // for LOAD_TEST_ASSETS
-#include "Common/GlobalData.h"
-#include "Common/MapReaderWriterInfo.h"
-#include "Common/TerrainTypes.h"
-#include "Common/ThingFactory.h"
-#include "Common/ThingTemplate.h"
-#include "Common/WellKnownKeys.h"
-
-#include "GameLogic/PolygonTrigger.h"
-#include "GameLogic/SidesList.h"
-
-#include "W3DDevice/GameClient/WorldHeightMap.h"
-#include "W3DDevice/GameClient/TileData.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/TerrainTex.h"
-#include "W3DDevice/GameClient/W3DShadow.h"
-
-#include "Common/file.h"
-
-#define K_OBSOLETE_HEIGHT_MAP_VERSION 8
-
-#define PATHFIND_CLIFF_SLOPE_LIMIT_F	9.8f	
-
-// -----------------------------------------------------------
-static AsciiString validateName(AsciiString n, Int flags)
-{
-
-	return n;
-
-}
-
-/* ********* GDIFileStream class ****************************/
-class GDIFileStream : public InputStream
-{
-protected:
-	File* m_file;
-public:
-	GDIFileStream(File* pFile):m_file(pFile) {};
-	virtual Int read(void *pData, Int numBytes) {
-			return(m_file->read(pData, numBytes));
-	};
-};
-
-
-/* ********* MapObject class ****************************/
-/*static*/ MapObject *MapObject::TheMapObjectListPtr = NULL;
-/*static*/ Dict MapObject::TheWorldDict;
-
-MapObject::MapObject(Coord3D loc, AsciiString name, Real angle, Int flags, const Dict* props,
-										 const ThingTemplate *thingTemplate )
-{
-	m_objectName = validateName( name, flags );
-	m_thingTemplate = thingTemplate;
-	m_nextMapObject = NULL;
-	m_location = loc;
-	m_angle = normalizeAngle(angle);
-	m_color = (0xff)<<8; // Bright green.
-	m_flags = flags;
-	m_renderObj = NULL;
-	m_shadowObj = NULL;
-	m_runtimeFlags = 0;
-
-	if (props)
-	{
-		m_properties = *props;
-		if (thingTemplate && !props->known(TheKey_objectSelectable, Dict::DICT_BOOL)) {
-			Bool selectable = thingTemplate->isKindOf(KINDOF_SELECTABLE);
-			m_properties.setBool(TheKey_objectSelectable, selectable);
-		}
-	} 
-	else 
-	{
-		m_properties.setInt(TheKey_objectInitialHealth, 100);
-		m_properties.setBool(TheKey_objectEnabled, true);
-		m_properties.setBool(TheKey_objectIndestructible, false);
-		m_properties.setBool(TheKey_objectUnsellable, false);
-		m_properties.setBool(TheKey_objectPowered, true);
-		m_properties.setBool(TheKey_objectRecruitableAI, true);
-		m_properties.setBool(TheKey_objectTargetable, false );
-		
-		Bool selectable = false;
-		if (thingTemplate) {
-			selectable = thingTemplate->isKindOf(KINDOF_SELECTABLE);
-		}
-		m_properties.setBool(TheKey_objectSelectable, selectable);
-	}
-
-	for( Int i = 0; i < BRIDGE_MAX_TOWERS; ++i )
-		setBridgeRenderObject( (BridgeTowerType)i, NULL );
-
-}	
-
-
-MapObject::~MapObject(void)
-{
-	setRenderObj(NULL);
-	setShadowObj(NULL);
-	if (m_nextMapObject) {
-		MapObject *cur = m_nextMapObject;
-		MapObject *next;
-		while (cur) {
-			next = cur->getNext();
-			cur->setNextMap(NULL); // prevents recursion. 
-			deleteInstance(cur);
-			cur = next;
-		}
-	}
-	for( Int i = 0; i < BRIDGE_MAX_TOWERS; ++i )	
-		setBridgeRenderObject( (BridgeTowerType)i, NULL );
-
-}
-
-MapObject *MapObject::duplicate(void)
-{
-	MapObject *pObj = newInstance( MapObject)(m_location, m_objectName, m_angle, m_flags, &m_properties, m_thingTemplate);
-	pObj->setColor(getColor());
-	pObj->m_runtimeFlags = m_runtimeFlags;
-	return pObj;
-}
-
-void MapObject::setRenderObj(RenderObjClass *pObj)
-{
-	REF_PTR_SET(m_renderObj, pObj);
-}
-
-void MapObject::setBridgeRenderObject( BridgeTowerType type, RenderObjClass* renderObj )
-{
-
-	if( type >= 0 && type < BRIDGE_MAX_TOWERS )
-		REF_PTR_SET( m_bridgeTowers[ type ], renderObj );
-
-}
-
-RenderObjClass* MapObject::getBridgeRenderObject( BridgeTowerType type )
-{
-
-	if( type >= 0 && type < BRIDGE_MAX_TOWERS )
-		return m_bridgeTowers[ type ];
-	return NULL;
-
-}
-
-void MapObject::validate(void)
-{
-	verifyValidTeam();
-	verifyValidUniqueID();
-}
-
-void MapObject::verifyValidTeam(void)
-{
-	// if this map object has a valid team, then do nothing.
-	// if it has an invalid team, the place it on the default neutral team, (by clearing the 
-	// existing team name.)
-	Bool exists;
-	AsciiString teamName = getProperties()->getAsciiString(TheKey_originalOwner, &exists);
-	if (exists) {
-		Bool valid = false;
-
-		int numSides = TheSidesList->getNumTeams();
-
-		for (int i = 0; i < numSides; ++i) {
-			TeamsInfo *teamInfo = TheSidesList->getTeamInfo(i);
-			if (!teamInfo) {
-				continue;
-			}
-			
-			Bool itBetter;
-			AsciiString testAgainstTeamName = teamInfo->getDict()->getAsciiString(TheKey_teamName, &itBetter);
-			if (itBetter) {
-				if (testAgainstTeamName.compare(teamName) == 0) {
-					valid = true;
-				}
-			}
-		}
-
-		if (!valid) {
-			getProperties()->remove(TheKey_originalOwner);
-		}
-	}
-}
-
-void MapObject::verifyValidUniqueID(void)
-{
-	Bool exists;
-	AsciiString uniqueID = getProperties()->getAsciiString(TheKey_uniqueID, &exists);
-	MapObject *obj = MapObject::getFirstMapObject();
-
-	// -1 is the sentinel
-	int highestIndex = -1;
-
-	while (obj) {
-		if (obj == this) {
-			// the first object is THIS OBJECT, cause we've already been added. 
-			obj = obj->getNext();
-			continue;
-		}
-
-		if (obj->isWaypoint()) {
-			// waypoints throw this off. Sad but true. :-(
-			obj = obj->getNext();
-			continue;
-		}
-
-		Bool iterateExists;
-		AsciiString tempStr = obj->getProperties()->getAsciiString(TheKey_uniqueID, &iterateExists);
-		const char* lastSpace = tempStr.reverseFind(' ');
-
-		int testIndex = -1; 
-		if (lastSpace) {
-			testIndex = atoi(lastSpace);
-		}
-
-		if (testIndex > highestIndex) {
-			highestIndex = testIndex;
-		}
-		break;
-	}
-
-	int indexOfThisObject = highestIndex + 1;
-	
-	const char* thingName;
-	if (getThingTemplate()) {
-		thingName = getThingTemplate()->getName().str();
-	} else if (isWaypoint()) {
-		thingName = getWaypointName().str();
-	} else {
-		thingName = getName().str();
-	}
-	const char* pName = thingName;
-
-	while (*thingName) {
-		if ((*thingName) == '/') {
-			pName = thingName + 1;
-		}
-		++thingName;
-	}
-
-	AsciiString newID;
-	if (isWaypoint()) {
-		newID.format("%s", pName);
-	} else {
-		newID.format("%s %d", pName, indexOfThisObject);
-	}
-	getProperties()->setAsciiString(TheKey_uniqueID, newID);
-}
-
-void MapObject::fastAssignAllUniqueIDs(void)
-{
-	// here's what we do. Take all of them, push them onto a stack. Then, pop each one, setting its id.
-	// should be much faster than what we currently do.
-
-	MapObject *pMapObj = getFirstMapObject();
-
-	std::stack<MapObject*> objStack;
-	Int actualNumObjects = 0;
-	
-	while (pMapObj) {
-		++actualNumObjects;
-		objStack.push(pMapObj);
-		pMapObj = pMapObj->getNext();
-	}
-
-	Int indexOfThisObject = 0;
-	while (actualNumObjects) {
-		MapObject *obj = objStack.top();
-		
-
-		const char* thingName;
-		if (obj->getThingTemplate()) {
-			thingName = obj->getThingTemplate()->getName().str();
-		} else if (obj->isWaypoint()) {
-			thingName = obj->getWaypointName().str();
-		} else {
-			thingName = obj->getName().str();
-		}
-		const char* pName = thingName;
-
-		while (*thingName) {
-			if ((*thingName) == '/') {
-				pName = thingName + 1;
-			}
-			++thingName;
-		}
-
-		AsciiString newID;
-		if (obj->isWaypoint()) {
-			newID.format("%s", pName);
-		} else {
-			newID.format("%s %d", pName, indexOfThisObject);
-		}
-
-		obj->getProperties()->setAsciiString(TheKey_uniqueID, newID);
-		objStack.pop();
-	
-		++indexOfThisObject;
-		--actualNumObjects;
-	}
-}
-
-
-
-void MapObject::setThingTemplate(const ThingTemplate *thing)
-{
-	m_thingTemplate = thing;
-	m_objectName = thing->getName();
-}
-
-
-void MapObject::setName(AsciiString name)
-{
-	m_objectName = name;
-}
-
-WaypointID MapObject::getWaypointID() { return (WaypointID)getProperties()->getInt(TheKey_waypointID); }
-AsciiString MapObject::getWaypointName() { return getProperties()->getAsciiString(TheKey_waypointName); }
-void MapObject::setWaypointID(Int i) { getProperties()->setInt(TheKey_waypointID, i); }
-void MapObject::setWaypointName(AsciiString n) { getProperties()->setAsciiString(TheKey_waypointName, n); }
-
-/*static */ Int MapObject::countMapObjectsWithOwner(const AsciiString& n)
-{
-	Int count = 0;
-	for (MapObject *pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
-	{
-		if (pMapObj->getProperties()->getAsciiString(TheKey_originalOwner) == n)
-			++count;
-	}
-	return count;
-}
-
-//-------------------------------------------------------------------------------------------------
-const ThingTemplate *MapObject::getThingTemplate( void ) const
-{
-	if (m_thingTemplate)
-		return (const ThingTemplate*) m_thingTemplate->getFinalOverride(); 
-	
-	return NULL;
-}
-
-
-/* ********* WorldHeightMap class ****************************/
-
-
-//
-// WorldHeightMap destructor .
-//
-WorldHeightMap::~WorldHeightMap(void)
-{
-	if (m_data) {
-		delete[](m_data);
-		m_data = NULL;
-	}
-	if (m_tileNdxes) {
-		delete[](m_tileNdxes);
-		m_tileNdxes = NULL;
-	}
-	if (m_blendTileNdxes) {
-		delete[](m_blendTileNdxes);
-		m_blendTileNdxes = NULL;
-	}
-	if (m_extraBlendTileNdxes) {
-		delete[](m_extraBlendTileNdxes);
-		m_extraBlendTileNdxes = NULL;
-	}
-	if (m_cliffInfoNdxes) {
-		delete[](m_cliffInfoNdxes);
-		m_cliffInfoNdxes = NULL;
-	}
-	if (m_cellFlipState)
-	{	delete[](m_cellFlipState);
-		m_cellFlipState = NULL;
-	}
-	if (m_cellCliffState)
-	{	delete[](m_cellCliffState);
-		m_cellCliffState = NULL;
-	}
-	int i;
-	for (i=0; i<NUM_SOURCE_TILES; i++) {
-		REF_PTR_RELEASE(m_sourceTiles[i]);
-		REF_PTR_RELEASE(m_edgeTiles[i]);
-	}
-	REF_PTR_RELEASE(m_terrainTex);
-	REF_PTR_RELEASE(m_alphaTerrainTex);
-	REF_PTR_RELEASE(m_alphaEdgeTex);
-}
-
-void WorldHeightMap::freeListOfMapObjects(void)
-{
-	if (MapObject::TheMapObjectListPtr) 
-	{
-		deleteInstance(MapObject::TheMapObjectListPtr);
-		MapObject::TheMapObjectListPtr = NULL;
-	}
-	MapObject::getWorldDict()->clear();
-}
-
-
-/**
- WorldHeightMap - create a new height map for class WorldHeightMap.
- Note that there is 1 m_numBlendedTiles, which is the implied
- transparent tile for non-blended tiles.
-*/
-WorldHeightMap::WorldHeightMap():
-	m_width(0), m_height(0),  m_dataSize(0), m_data(NULL), m_cellFlipState(NULL), 
-	m_drawOriginX(0), m_drawOriginY(0), 
-	m_numTextureClasses(0),	
-	m_drawWidthX(NORMAL_DRAW_WIDTH), m_drawHeightY(NORMAL_DRAW_HEIGHT), 
-	m_tileNdxes(NULL), m_blendTileNdxes(NULL), m_extraBlendTileNdxes(NULL), m_cliffInfoNdxes(NULL),
-	m_terrainTexHeight(1), m_alphaTexHeight(1),	m_cellCliffState(NULL),
-#ifdef EVAL_TILING_MODES
-	m_tileMode(TILE_4x4),
-#endif
-	m_numCliffInfo(1),
-	m_terrainTex(NULL), m_alphaTerrainTex(NULL), m_numBitmapTiles(0), m_numBlendedTiles(1)
-{
-	Int i;
-	for (i=0; i<NUM_SOURCE_TILES; i++) {
-		m_sourceTiles[i] = NULL;
-		m_edgeTiles[i] = NULL;
-	}
-
-	TheSidesList->validateSides();
-}
-
-#ifdef EVAL_TILING_MODES
-static Bool ParseFunkyTilingDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	WorldHeightMap *pThis = (WorldHeightMap *)userData;
-	*((Int *)&pThis->m_tileMode) = file.readInt();
-	return true;
-}
-#endif
-
-/**
-* WorldHeightMap - read a height map from a file.
-* Format is  Chunky.
-*
-*	Input: ChunkInputStream, 
-*		
-*/
-WorldHeightMap::WorldHeightMap(ChunkInputStream *pStrm, Bool logicalDataOnly):
-	m_width(0), m_height(0),  m_dataSize(0), m_data(NULL), m_cellFlipState(NULL), 
-	m_drawOriginX(0),	m_cellCliffState(NULL), m_drawOriginY(0),
-	m_numTextureClasses(0),	
-	m_drawWidthX(NORMAL_DRAW_WIDTH), m_drawHeightY(NORMAL_DRAW_HEIGHT), 
-	m_tileNdxes(NULL), m_blendTileNdxes(NULL), m_extraBlendTileNdxes(NULL), m_cliffInfoNdxes(NULL),
-	m_terrainTexHeight(1), m_alphaTexHeight(1),
-#ifdef EVAL_TILING_MODES
-	m_tileMode(TILE_4x4),
-#endif
-	m_numCliffInfo(1),
-	m_terrainTex(NULL), m_alphaTerrainTex(NULL), m_numBitmapTiles(0), m_numBlendedTiles(1)
-{
-
-	int i;
-	for (i=0; i<NUM_SOURCE_TILES; i++) {
-		m_sourceTiles[i]=NULL;
-		m_edgeTiles[i]=NULL;
-	}
-	if (TheGlobalData && TheGlobalData->m_stretchTerrain) {
-		m_drawWidthX=STRETCH_DRAW_WIDTH;
-		m_drawHeightY=STRETCH_DRAW_HEIGHT;
-	}
-
-	DataChunkInput file( pStrm );
-
-	if (logicalDataOnly) {
-		file.registerParser( AsciiString("HeightMapData"), AsciiString::TheEmptyString, ParseSizeOnlyInChunk );
-		file.registerParser( AsciiString("WorldInfo"), AsciiString::TheEmptyString, ParseWorldDictDataChunk );
-		file.registerParser( AsciiString("ObjectsList"), AsciiString::TheEmptyString, ParseObjectsDataChunk );
-		freeListOfMapObjects(); // just in case.
-		file.registerParser( AsciiString("PolygonTriggers"), AsciiString::TheEmptyString, PolygonTrigger::ParsePolygonTriggersDataChunk );
-		PolygonTrigger::deleteTriggers(); // just in case.
-		TheSidesList->emptySides();
-		file.registerParser(AsciiString("SidesList"), AsciiString::TheEmptyString,	SidesList::ParseSidesDataChunk );
-	}	else {
-		file.registerParser( AsciiString("HeightMapData"), AsciiString::TheEmptyString, ParseHeightMapDataChunk );
-		file.registerParser( AsciiString("BlendTileData"), AsciiString::TheEmptyString, ParseBlendTileDataChunk );
-#ifdef EVAL_TILING_MODES
-		file.registerParser( AsciiString("FUNKY_TILING"), AsciiString::TheEmptyString, ParseFunkyTilingDataChunk );
-#endif
-		file.registerParser( AsciiString("GlobalLighting"), AsciiString::TheEmptyString, ParseLightingDataChunk );
-	}
-	if (!file.parse(this)) {
-		throw(ERROR_CORRUPT_FILE_FORMAT);
-	}
-	// patch bad maps. 
-	if (!logicalDataOnly) {
-		for(i=0; i<m_dataSize; i++) {
-			if (m_cliffInfoNdxes[i]<0 || m_cliffInfoNdxes[i]>= m_numCliffInfo) {
-				m_cliffInfoNdxes[i] = 0;		
-			}
-			if (m_blendTileNdxes[i]<0 || m_blendTileNdxes[i]>= m_numBlendedTiles) {
-				m_blendTileNdxes[i] = 0;		
-			}
-			if (m_extraBlendTileNdxes[i]<0 || m_extraBlendTileNdxes[i]>= m_numBlendedTiles) {
-				m_extraBlendTileNdxes[i] = 0;		
-			}
-		}
-	}
-	if (TheGlobalData && TheGlobalData->m_drawEntireTerrain) {
-		m_drawWidthX=m_width;
-		m_drawHeightY=m_height;
-	}
-	if (m_drawWidthX > m_width) {
-		m_drawWidthX = m_width;
-	}
-	if (m_drawHeightY > m_height) {
-		m_drawHeightY = m_height;
-	}
-
-	TheSidesList->validateSides();
-}
-
-/** Optimized version of method to get triangle flip state of a terrain cell.  Use this
-*	instead of getAlphaUVData() whenever possible.
-*/
-Bool WorldHeightMap::getFlipState(Int xIndex, Int yIndex) const
-{
-	if (xIndex<0 || yIndex<0) return false;
-	if (yIndex>=m_height) return false;
-	if (xIndex>=m_width) return false;
-	if (!m_cellFlipState) return false;
-	return m_cellFlipState[yIndex*m_flipStateWidth + (xIndex >> 3)] & (1<<(xIndex&0x7));
-}
-
-/** Get whether the cell is a cliff cell (impassable to ground vehicles).
-*/
-Bool WorldHeightMap::getCliffState(Int xIndex, Int yIndex) const
-{
-	if (xIndex<0 || yIndex<0) return false;
-	if (yIndex>=m_height) return false;
-	if (xIndex>=m_width) return false;
-	if (!m_cellCliffState) return false;
-	return m_cellCliffState[yIndex*m_flipStateWidth + (xIndex >> 3)] & (1<<(xIndex&0x7));
-}
-
-//=============================================================================
-// setCliffState
-//=============================================================================
-/** Sets the cliff state for a given cell. */
-//=============================================================================
-void WorldHeightMap::setCliffState(Int xIndex, Int yIndex, Bool state) 
-{
-	if (xIndex<0 || yIndex<0) return;
-	if (yIndex>=m_height) return;
-	if (xIndex>=m_width) return;
-	if (!m_cellCliffState) return;
-	UnsignedByte	flagByte = m_cellCliffState[yIndex*m_flipStateWidth + (xIndex >> 3)];
-	UnsignedByte flagMask = (1<<(xIndex&0x7));
-	if (state) {
-		flagByte |= flagMask;
-	} else {
-		flagByte &= (~flagMask);
-	}
-	m_cellCliffState[yIndex*m_flipStateWidth + (xIndex >> 3)] = flagByte;
-}
-
-Bool WorldHeightMap::ParseWorldDictDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	Dict d = file.readDict();
-	*MapObject::getWorldDict() = d;
-	Bool exists;
-	Int theWeather = MapObject::getWorldDict()->getInt(TheKey_weather, &exists);
-	if (exists) {
-		TheWritableGlobalData->m_weather = (Weather) theWeather;
-	}
-	return true;
-}
-
-/**
-* WorldHeightMap::ParseLightingDataChunk - read a global lights chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseLightingDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-		TheWritableGlobalData->m_timeOfDay = (TimeOfDay)file.readInt();
-		Int i;
-		GlobalData::TerrainLighting	initLightValues	= { { 0,0,0},{0,0,0},{0,0,-1.0f}};
-
-		// initialize the directions of the lights to not be totally invalid, in case old maps are read
-		for (i=0; i<4; i++) {
-			for (Int j=0;j<MAX_GLOBAL_LIGHTS; j++) {
-				TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j]=initLightValues;
-				TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j]=initLightValues;
-			}
-		}
-
-		for (i=0; i<4; i++) {
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].ambient.red = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].ambient.green = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].ambient.blue = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].diffuse.red = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].diffuse.green = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].diffuse.blue = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].lightPos.x = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].lightPos.y = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].lightPos.z = file.readReal();
-
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].ambient.red = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].ambient.green = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].ambient.blue = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].diffuse.red = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].diffuse.green = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].diffuse.blue = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].lightPos.x = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].lightPos.y = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].lightPos.z = file.readReal();
-
-			if (info->version >= K_LIGHTING_VERSION_2) {
-				for (Int j=1; j<3; j++)	//added support for 2 extra object lights
-				{
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].ambient.red = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].ambient.green = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].ambient.blue = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].diffuse.red = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].diffuse.green = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].diffuse.blue = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].lightPos.x = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].lightPos.y = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].lightPos.z = file.readReal();
-				}
-			}
-			if (info->version >= K_LIGHTING_VERSION_3) {
-				for (Int j=1; j<3; j++)	//added support for 2 extra terrain lights
-				{
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].ambient.red = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].ambient.green = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].ambient.blue = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].diffuse.red = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].diffuse.green = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].diffuse.blue = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].lightPos.x = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].lightPos.y = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].lightPos.z = file.readReal();
-				}
-			}
-		}
-		if (!file.atEndOfChunk()) {
-			UnsignedInt shadowColor = file.readInt();
-			if (TheW3DShadowManager) {
-				TheW3DShadowManager->setShadowColor(shadowColor);
-			}
-		}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
-	return true;
-}
-
-/**
-* WorldHeightMap::ParseObjectsDataChunk - read a height map chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	file.m_currentObject = NULL;
-	file.registerParser( AsciiString("Object"), info->label, ParseObjectDataChunk );
-	return (file.parse(userData));
-}
-
-/**
-* WorldHeightMap::ParseHeightMapData - read a height map chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseHeightMapDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	WorldHeightMap *pThis = (WorldHeightMap *)userData;
-	return pThis->ParseHeightMapData(file, info, userData);
-}
-
-/**
-* WorldHeightMap::ParseHeightMapData - read a height map chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseHeightMapData(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	m_width = file.readInt();
-	m_height = file.readInt();
-	if (info->version >= K_HEIGHT_MAP_VERSION_3) {
-		m_borderSize = file.readInt();
-	} else {
-		m_borderSize = 0;
-	}
-
-	if (info->version >= K_HEIGHT_MAP_VERSION_4) {
-		Int numBorders = file.readInt();
-		m_boundaries.resize(numBorders);
-		for (int i = 0; i < numBorders; ++i) {
-			m_boundaries[i].x = file.readInt();
-			m_boundaries[i].y = file.readInt();
-		}
-	} else {
-		m_boundaries.resize(1);
-		m_boundaries[0].x = m_width - 2 * m_borderSize;
-		m_boundaries[0].y = m_height - 2 * m_borderSize;
-	}
-
-	m_dataSize = file.readInt();
-	m_data = MSGNEW("WorldHeightMap_ParseHeightMapData") UnsignedByte[m_dataSize];
-	if (m_dataSize <= 0 || (m_dataSize != (m_width*m_height))) {
-		throw ERROR_CORRUPT_FILE_FORMAT	;
-	}
-	file.readArrayOfBytes((char *)m_data, m_dataSize);
-	// Resize me. 
-	if (info->version == K_HEIGHT_MAP_VERSION_1) {
-		Int newWidth = (m_width+1)/2;
-		Int newHeight = (m_height+1)/2;
-		Int i, j;
-		for (i=0; i<newHeight; i++) {
-			for (j=0; j<newWidth; j++) {
-				m_data[i*newWidth+j] = m_data[2*i*m_width+2*j];
-			}
-		}
-	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
-	return true;
-}
-
-/**
-* WorldHeightMap::ParseHeightMapData - read a height map chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseSizeOnlyInChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	WorldHeightMap *pThis = (WorldHeightMap *)userData;
-	return pThis->ParseSizeOnly(file, info, userData);
-}
-
-/**
-* WorldHeightMap::ParseHeightMapData - read a height map chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseSizeOnly(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	m_width = file.readInt();
-	m_height = file.readInt();
-	if (info->version >= K_HEIGHT_MAP_VERSION_3) {
-		m_borderSize = file.readInt();
-	} else {
-		m_borderSize = 0;
-	}
-
-	if (info->version >= K_HEIGHT_MAP_VERSION_4) {
-		Int numBorders = file.readInt();
-		m_boundaries.resize(numBorders);
-		for (int i = 0; i < numBorders; ++i) {
-			m_boundaries[i].x = file.readInt();
-			m_boundaries[i].y = file.readInt();
-		}
-	} else {
-		m_boundaries.resize(1);
-		m_boundaries[0].x = m_width - 2 * m_borderSize;
-		m_boundaries[0].y = m_height - 2 * m_borderSize;
-	}
-
-	m_dataSize = file.readInt();
-	m_data = MSGNEW("WorldHeightMap_ParseSizeOnly") UnsignedByte[m_dataSize];
-	if (m_dataSize <= 0 || (m_dataSize != (m_width*m_height))) {
-		throw ERROR_CORRUPT_FILE_FORMAT	;
-	}
-	file.readArrayOfBytes((char *)m_data, m_dataSize);
-	// Resize me. 
-	if (info->version == K_HEIGHT_MAP_VERSION_1) {
-		Int newWidth = (m_width+1)/2;
-		Int newHeight = (m_height+1)/2;
-		Int i, j;
-		for (i=0; i<newHeight; i++) {
-			for (j=0; j<newWidth; j++) {
-				m_data[i*newWidth+j] = m_data[2*i*m_width+2*j];
-			}
-		}
-		m_width = newWidth;
-		m_height = newHeight;
-	}
-	return true;
-}
-
-/**
-* WorldHeightMap::ParseBlendTileDataChunk - read a blend tile info chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseBlendTileDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	WorldHeightMap *pThis = (WorldHeightMap *)userData;
-	return pThis->ParseBlendTileData(file, info, userData);
-}
-
-/** Function to read in the tiles for a texture class. */
-void WorldHeightMap::readTexClass(TXTextureClass *texClass, TileData **tileData) 
-{
-	char path[_MAX_PATH];
-	path[0] = 0;
-	File *theFile = NULL;
-
-	// get the file from the description in TheTerrainTypes
-	TerrainType *terrain = TheTerrainTypes->findTerrain( texClass->name );
-	char texturePath[ _MAX_PATH ];
-	if (terrain==NULL) 
-	{
-#ifdef LOAD_TEST_ASSETS
-		theFile = TheFileSystem->openFile( texClass->name.str(), File::READ|File::BINARY);
-#endif
-	} 
-	else 
-	{
-		sprintf( texturePath, "%s%s", TERRAIN_TGA_DIR_PATH, terrain->getTexture().str() );
-		theFile = TheFileSystem->openFile( texturePath, File::READ|File::BINARY);
-	}
-
-	if (theFile != NULL) {
-		GDIFileStream theStream(theFile);
-		InputStream *pStr = &theStream;
-		Int numTiles = WorldHeightMap::countTiles(pStr);
-		theFile->seek(0, File::START);
-		if (numTiles >= texClass->numTiles) { 
-			numTiles = texClass->numTiles;
-			Int width;
-			for (width = 10; width >= 1; width--) {
-				if (numTiles >= width*width) {
-					numTiles = width*width;
-					break;
-				}
-			}
-			WorldHeightMap::readTiles(pStr, tileData+texClass->firstTile, width);						
-		}
-		theFile->close();
-	}
-}
-
-/**
-* WorldHeightMap::ParseBlendTileData - read a blend tile info chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseBlendTileData(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	Int len = file.readInt();
-	if (m_dataSize != len) {
-		throw ERROR_CORRUPT_FILE_FORMAT	;
-	}
-	m_tileNdxes = MSGNEW("WorldHeightMap_ParseBlendTileData") Short[m_dataSize];
-	m_cliffInfoNdxes = MSGNEW("WorldHeightMap_ParseBlendTileData") Short[m_dataSize]; 
-	m_blendTileNdxes = MSGNEW("WorldHeightMap_ParseBlendTileData") Short[m_dataSize];
-	m_extraBlendTileNdxes = MSGNEW("WorldHeightMap_ParseBlendTileData") Short[m_dataSize];
-	// Note - we have one less cell than the width & height. But for paranoia, allocate
-	// extra row. jba.
-	// 
-	Int numBytesX = (m_width+1)/8;	//how many bytes to fit all bitflags
-	Int numBytesY = m_height;	
-
-	m_flipStateWidth=numBytesX;
-
-	m_cellFlipState	= MSGNEW("WorldHeightMap_getTerrainTexture") UnsignedByte[numBytesX*numBytesY];
-	m_cellCliffState	= MSGNEW("WorldHeightMap_getTerrainTexture") UnsignedByte[numBytesX*numBytesY];
-	memset(m_cellFlipState,0,numBytesX*numBytesY);	//clear all flags
-	memset(m_cellCliffState,0,numBytesX*numBytesY);	//clear all flags
-
-	file.readArrayOfBytes((char*)m_tileNdxes, m_dataSize*sizeof(Short));
-	file.readArrayOfBytes((char*)m_blendTileNdxes, m_dataSize*sizeof(Short));
-	if (info->version >= K_BLEND_TILE_VERSION_6) {
-		file.readArrayOfBytes((char*)m_extraBlendTileNdxes, m_dataSize*sizeof(Short));
-		//Allow clearing of extra blend tiles via ini and resaving of map.
-		//Useful for flushing out initial maps made with buggy 3-way blending.
-		if (!TheGlobalData->m_use3WayTerrainBlends)
-			memset(m_extraBlendTileNdxes,0,m_dataSize*sizeof(Short));		
-	} 
-	if (info->version >= K_BLEND_TILE_VERSION_5) {
-		file.readArrayOfBytes((char*)m_cliffInfoNdxes, m_dataSize*sizeof(Short));
-	} 
-	if (info->version >= K_BLEND_TILE_VERSION_7) {
-		file.readArrayOfBytes((char*)m_cellCliffState, m_height*m_flipStateWidth);
-	} else {
-		initCliffFlagsFromHeights();
-	}
-	m_numBitmapTiles = file.readInt();
-	DEBUG_ASSERTCRASH(m_numBitmapTiles>0 && m_numBitmapTiles<2048, ("Unlikely numBitmapTiles."));
-	m_numBlendedTiles = file.readInt();
-	DEBUG_ASSERTCRASH(m_numBlendedTiles>0 && m_numBlendedTiles<NUM_BLEND_TILES+1, ("Unlikely numBlendedTiles."));
-	if (info->version >= K_BLEND_TILE_VERSION_5) {
-		m_numCliffInfo = file.readInt();
-	} else {
-		m_numCliffInfo = 1;	// cliffInfo[0] is the default info.
-	}
-// --> file loading here
-	int i;
-	m_numTextureClasses	= file.readInt();
-	DEBUG_ASSERTCRASH(m_numTextureClasses>0 && m_numTextureClasses<200, ("Unlikely m_numTextureClasses."));
-	for (i=0; i<m_numTextureClasses; i++) {
-		m_textureClasses[i].globalTextureClass = -1;
-		m_textureClasses[i].firstTile = file.readInt();
-		m_textureClasses[i].numTiles = file.readInt();
-		m_textureClasses[i].width = file.readInt();
-
-		// legacy GDF data
-		// used to read "m_textureClasses[i].isGDF = file.readInt();"
-	/*	Int legacy = */ file.readInt();
-
-		m_textureClasses[i].name = file.readAsciiString();
-		readTexClass(&m_textureClasses[i], m_sourceTiles);
-	}
-	m_numEdgeTextureClasses = 0;
-	m_numEdgeTiles = 0;
-	if (info->version >= K_BLEND_TILE_VERSION_4) {
-		m_numEdgeTiles	= file.readInt();
-		m_numEdgeTextureClasses	= file.readInt();
-		for (i=0; i<m_numEdgeTextureClasses; i++) {
-			m_edgeTextureClasses[i].globalTextureClass = -1;
-			m_edgeTextureClasses[i].firstTile = file.readInt();
-			m_edgeTextureClasses[i].numTiles = file.readInt();
-			m_edgeTextureClasses[i].width = file.readInt();
-			m_edgeTextureClasses[i].name = file.readAsciiString();
-			readTexClass(&m_edgeTextureClasses[i], m_edgeTiles);
-		}
-	}
-	for (i=1; i<m_numBlendedTiles; i++) {
-		Int flag;
-		m_blendedTiles[i].blendNdx = file.readInt();
-		m_blendedTiles[i].horiz = file.readByte();
-		m_blendedTiles[i].vert = file.readByte();
-		m_blendedTiles[i].rightDiagonal = file.readByte();
-		m_blendedTiles[i].leftDiagonal = file.readByte();
-		m_blendedTiles[i].inverted = file.readByte();
-		//Allow clearing of extra blend tiles via ini and resaving of map.
-		//Useful for flushing out initial maps made with buggy 3-way blending.
-		if (!TheGlobalData->m_use3WayTerrainBlends)
-			m_blendedTiles[i].inverted &= ~FLIPPED_MASK;	//filter out extra flips from 3-way
-
-		if (info->version >= K_BLEND_TILE_VERSION_3) {
-			m_blendedTiles[i].longDiagonal = file.readByte();
-		} else {
-			m_blendedTiles[i].longDiagonal = false;
-		}
-		if (info->version >= K_BLEND_TILE_VERSION_4) {
-			m_blendedTiles[i].customBlendEdgeClass = file.readInt();
-		} else {
-			m_blendedTiles[i].customBlendEdgeClass = -1;
-		}
-		
-		flag = file.readInt();
-		DEBUG_ASSERTCRASH(flag==FLAG_VAL, ("Invalid format."));
-		if (flag != FLAG_VAL) {
-			throw ERROR_CORRUPT_FILE_FORMAT;
-		}
-	}
-	if (info->version >= K_BLEND_TILE_VERSION_5) {
-		for (i=1; i<m_numCliffInfo; i++) {
-			m_cliffInfo[i].tileIndex = file.readInt();
-			m_cliffInfo[i].u0 = file.readReal();
-			m_cliffInfo[i].v0 = file.readReal();
-			m_cliffInfo[i].u1 = file.readReal();
-			m_cliffInfo[i].v1 = file.readReal();
-			m_cliffInfo[i].u2 = file.readReal();
-			m_cliffInfo[i].v2 = file.readReal();
-			m_cliffInfo[i].u3 = file.readReal();
-			m_cliffInfo[i].v3 = file.readReal();
-			m_cliffInfo[i].flip = file.readByte();
-			m_cliffInfo[i].mutant = file.readByte();
-		}
-	}
-	// Resize me. 
-	if (info->version == K_BLEND_TILE_VERSION_1) {
-		Int newWidth = (m_width+1)/2;
-		Int newHeight = (m_height+1)/2;
-		Int i, j;
-		for (i=0; i<newHeight; i++) {
-			for (j=0; j<newWidth; j++) {
-				m_tileNdxes[i*newWidth+j] = m_tileNdxes[2*i*m_width+2*j];
-				m_blendTileNdxes[i*newWidth+j] = 0;
-				m_extraBlendTileNdxes[i*newWidth+j] = 0;
-				m_cliffInfoNdxes[i*newWidth+j] = 0;	 
-			}
-		}
-		m_numBlendedTiles = 1;
-		m_numCliffInfo = 1;
-		m_width= newWidth;
-		m_height = newHeight;
-		m_dataSize = m_width*m_height;
-	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
-	return true;
-}
-
-
-/**
-* WorldHeightMap::ParseObjectData - read a object info chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	WorldHeightMap *pThis = (WorldHeightMap *)file.m_userData;
-	return pThis->ParseObjectData(file, info, userData, info->version >= K_OBJECTS_VERSION_2);
-}
-
-/**
-* WorldHeightMap::ParseObjectData - read a object info chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseObjectData(DataChunkInput &file, DataChunkInfo *info, void *userData, Bool readDict)
-{
-	MapObject *pPrevious = (MapObject *)file.m_currentObject;
-
-	Coord3D loc;
-	loc.x = file.readReal();
-	loc.y = file.readReal();
-	loc.z = file.readReal();
-
-	Real minZ = -100*MAP_XY_FACTOR;
-	Real maxZ = (255*10)*MAP_HEIGHT_SCALE;
-
-	if (info->version <= K_OBJECTS_VERSION_2) {
-		loc.z = 0;
-	}
-
-	Real angle = file.readReal();
-	Int flags = file.readInt(); 
-	AsciiString name = file.readAsciiString();
-	Dict d;
-	if (readDict)
-	{
-		d = file.readDict();
-	}		 
-
-	if (loc.z<minZ || loc.z>maxZ) {
-		DEBUG_LOG(("Removing object at z height %f\n", loc.z));
-		return true;
-	}
-
-	MapObject *pThisOne;
-	
-	// create the map object
-	pThisOne = newInstance( MapObject )( loc, name, angle, flags, &d, 
-														TheThingFactory->findTemplate( name ) );
-
-//DEBUG_LOG(("obj %s owner %s\n",name.str(),d.getAsciiString(TheKey_originalOwner).str()));
-
-	if (pThisOne->getProperties()->getType(TheKey_waypointID) == Dict::DICT_INT)
-		pThisOne->setIsWaypoint();
-
-	if (pThisOne->getProperties()->getType(TheKey_lightHeightAboveTerrain) == Dict::DICT_REAL)
-		pThisOne->setIsLight();
-
-	if (pThisOne->getProperties()->getType(TheKey_scorchType) == Dict::DICT_INT)
-		pThisOne->setIsScorch();
-	
-
-	if (pPrevious) {
-		DEBUG_ASSERTCRASH(MapObject::TheMapObjectListPtr != NULL && pPrevious->getNext() == NULL, ("Bad linkage."));
-		pPrevious->setNextMap(pThisOne);
-	}	else {
-		DEBUG_ASSERTCRASH(MapObject::TheMapObjectListPtr == NULL, ("Bad linkage."));
-		MapObject::TheMapObjectListPtr = pThisOne;
-	}
-	file.m_currentObject = pThisOne;
-	return true;
-}
-
-
-
-// Targa format:  Header
-
-typedef struct {
-	UnsignedByte	idLength;
-	UnsignedByte	colorMapType; // 0 = rgb, 1 = indexed.
-	UnsignedByte	imageType; //0x1 = indexed, 0x2 = rgb, 0x8 = rle.
-	UnsignedByte	colorMapInfo[5]; // we ignore, only do rgb.
-	Short			xOrigin;
-	Short			yOrigin;
-	Short			imageWidth;
-	Short			imageHeight;
-	UnsignedByte	pixelDepth;
-	UnsignedByte	flags; //  &0x0F = alpha channel bits, &0x10 is right to left flag,
-						   // 0x20 is top to bottom flag.  (0x0? is left to right, bottom to top)
-						   // 0x3? is top to bottom, right to left.
-} TTargaHeader;
-
-// followed by idLength bytes of ascii data
-
-// followed by pixel data
-
-// followed by optional data.
-
-
-
-/// Count how many tiles come in from a targa file.
-Int WorldHeightMap::countTiles(InputStream *pStr)
-{
-	TTargaHeader hdr;
-	Int len = pStr->read(&hdr,sizeof(hdr));
-	if (len!=sizeof(hdr)) return(0);
-	Int tileWidth = hdr.imageWidth/TILE_PIXEL_EXTENT;
-	Int tileHeight = hdr.imageHeight/TILE_PIXEL_EXTENT;
-
-	if (hdr.colorMapType != 0) {
-		return(0); // we don't do indexed at this time. jba.
-	}
-	if (hdr.imageType != 0x2 && hdr.imageType != 0xA) {
-		return(0); // we don't do indexed at this time. jba.
-	}
-
-	if (hdr.pixelDepth < 24) return(false);
-	if (hdr.pixelDepth > 32) return(false);
-	// 3x3 gives 9, 
-	// 2x2 gives 4, 
-	// 1x1 gives 1, 
-	// else 0;
-	if (tileWidth>10 || tileHeight>10) return(0);  // don't do huge images, or bad files.
-	if (tileWidth>=10 && tileHeight >=10) return(100);
-	if (tileWidth>=9 && tileHeight >=9) return(81);
-	if (tileWidth>=8 && tileHeight >=8) return(64);
-	if (tileWidth>=7 && tileHeight >=7) return(49);
-	if (tileWidth>=6 && tileHeight >=6) return(36);
-	if (tileWidth>=5 && tileHeight >=5) return(25);
-	if (tileWidth>=4 && tileHeight >=4) return(16);
-	if (tileWidth>=3 && tileHeight >=3) return(9);
-	if (tileWidth>=2 && tileHeight >=2) return(4);
-	if (tileWidth>=1 && tileHeight >=1) return(1);
-	return(0);
-}
-/*Break down a .tga file into a collection of tiles.  numRows * numRows total tiles.*/
-Bool WorldHeightMap::readTiles(InputStream *pStr, TileData **tiles, Int numRows)
-{
-	TTargaHeader hdr;
-	pStr->read(&hdr, sizeof(hdr));
-	Int tileWidth = hdr.imageWidth/TILE_PIXEL_EXTENT;
-	Int tileHeight = hdr.imageHeight/TILE_PIXEL_EXTENT; 
-
-	if (tileWidth<numRows && tileHeight<numRows) {
-		return(false);
-	}
-	Bool compressed = false;
-	if (hdr.imageType & 0x08) {
-		compressed = true;
-	}
-	int row = 0;
-	int column = 0;
-	int bytesPerPixel = (hdr.pixelDepth+7)/8;
-	if (bytesPerPixel < 3) return(false);
-	if (bytesPerPixel > 4) return(false);
-	int i;
-	for (i=0; i<numRows*numRows; i++) {
-		if (tiles[i] == NULL) 
-			tiles[i] = MSGNEW("WorldHeightMap_readTiles") TileData;	
-	}
-	UnsignedByte buf[4];
-	int repeatCount = 0;
-//	Bool read = false;
-	Bool running = false;
-	for (row = 0; row < numRows*TILE_PIXEL_EXTENT; row++) {
-		for (column=0; column<hdr.imageWidth; column++) {
-			UnsignedByte r, g, b;
-			if (compressed && repeatCount==0) {
-				UnsignedByte flag;
-				pStr->read(&flag, 1);
-				repeatCount = flag&0x7f;
-				repeatCount++;
-				if (flag&0x80) {
-					running = true;
-					pStr->read(buf, bytesPerPixel);
-				} else {
-					running = false;
-				}
-			}
-			if (compressed) repeatCount--;
-			if (!running) {
-				pStr->read(buf, bytesPerPixel);
-			}
-			if (column >= (numRows*TILE_PIXEL_EXTENT)) continue;
-			r = buf[2]; g = buf[1]; b = buf[0];
-			
-			int tileNdx = (column/TILE_PIXEL_EXTENT) + numRows*(row/TILE_PIXEL_EXTENT);
-			int pixelNdx = (column%TILE_PIXEL_EXTENT) + TILE_PIXEL_EXTENT*(row%TILE_PIXEL_EXTENT);
-
-			UnsignedByte *pixel = tiles[tileNdx]->getDataPtr();
-
-			pixel += pixelNdx*TILE_BYTES_PER_PIXEL;
-			*pixel++ = b; 
-			*pixel++ = g;
-			*pixel++ = r;
-			*pixel = 0xFF; // solid alpha.
-
-		}
-		DEBUG_ASSERTCRASH(repeatCount==0, ("Invalid tga."));
-	}
-	for (i=0; i<numRows*numRows; i++) {
-		tiles[i]->updateMips();
-	}
-	return(true);
-}
-
-
-
-/** updateTileTexturePositions - assigns each tile a location in the texture.
-*/
-Int WorldHeightMap::updateTileTexturePositions(Int *edgeHeight)
-{
-	Int i, j;
-	Int maxHeight = 0;
-	const Int tilesPerRow = TEXTURE_WIDTH/(TILE_PIXEL_EXTENT+TILE_OFFSET);
-
-	Bool availableGrid[tilesPerRow][tilesPerRow];
-	Int row, column;
-	for (row=0; row<tilesPerRow; row++) {
-		for (column=0; column<tilesPerRow; column++) {
-			availableGrid[row][column] = true;
-		}
-	}
-
-	for (i=0; i<m_numBitmapTiles; i++) {
-		if (m_sourceTiles[i]) {
-			m_sourceTiles[i]->m_tileLocationInTexture.x = 0;
-			m_sourceTiles[i]->m_tileLocationInTexture.y = 0;
-		}
-	}	 
-
-	/* put the normal tiles into the terrain texture */
-	Int texClass;
-	Int tileWidth;
-	for (tileWidth = tilesPerRow; tileWidth>0; tileWidth--) {
-		for (texClass=0; texClass<m_numTextureClasses; texClass++) {
-			Int width = m_textureClasses[texClass].width;
-			if (width != tileWidth) continue;
-			// Find an available block of space.
-			Bool found = false;
-			for (row=0; row<tilesPerRow-width+1 && !found; row++) {
-				for (column=0; column<tilesPerRow-width+1 && !found; column++) {
-					if (availableGrid[row][column]) {
-						Bool open = true;
-						for (i=0; i<width && open; i++) {
-							for (j=0; j<width&&open; j++) {
-								if (!availableGrid[row+j][column+i]) {
-									open = false;
-								}
-							}
-						}
-						if (open) found = true;
-						break;
-					}
-				}
-				if (found) break;
-			}
-			if (!found) {
-				m_textureClasses[texClass].positionInTexture.x = 0;
-				m_textureClasses[texClass].positionInTexture.y = 0;
-				continue;
-			}
-
-			Int xOrigin = TILE_OFFSET/2 + column*(TILE_PIXEL_EXTENT+TILE_OFFSET);
-			Int yOrigin = TILE_OFFSET/2 + row*(TILE_PIXEL_EXTENT+TILE_OFFSET);
-			m_textureClasses[texClass].positionInTexture.x = xOrigin;
-			m_textureClasses[texClass].positionInTexture.y = yOrigin;
-			Int classHeight = yOrigin + width*TILE_PIXEL_EXTENT+ TILE_OFFSET/2;
-			if (maxHeight < classHeight) maxHeight = classHeight;
-
-			for (i=0; i<width; i++) {
-				for (j=0; j<width; j++) {
-					availableGrid[row+j][column+i] = false;
-					Int baseNdx = m_textureClasses[texClass].firstTile + i + j*width;
-					// In case we are just checking for room...
-					if (m_sourceTiles[baseNdx] == NULL) continue;
-					Int x = xOrigin + i*TILE_PIXEL_EXTENT;
-					Int y = yOrigin + (width-j-1)*TILE_PIXEL_EXTENT;
-					m_sourceTiles[baseNdx]->m_tileLocationInTexture.x = x;
-					m_sourceTiles[baseNdx]->m_tileLocationInTexture.y = y;
-				}
-			}
-		}
-	}
-
-	for (i=0; i<m_numBitmapTiles; i++) {
-		if (m_edgeTiles[i]) {
-			m_edgeTiles[i]->m_tileLocationInTexture.x = 0;
-			m_edgeTiles[i]->m_tileLocationInTexture.y = 0;
-		}
-	}	 
-
-	/* put the blend edge tiles into the blend edges texture */
-	Int maxEdgeHeight = 0;
-	// Reset the grid, cause we're using a different texture now.
-	for (row=0; row<tilesPerRow; row++) {
-		for (column=0; column<tilesPerRow; column++) {
-			availableGrid[row][column] = true;
-		}
-	}
-	for (texClass=0; texClass<m_numEdgeTextureClasses; texClass++) {
-		Int width = m_edgeTextureClasses[texClass].width;
-		// Find an available block of space.
-		Bool found = false;
-		for (row=0; row<tilesPerRow-width+1 && !found; row++) {
-			for (column=0; column<tilesPerRow-width+1 && !found; column++) {
-				if (availableGrid[row][column]) {
-					Bool open = true;
-					for (i=0; i<width && open; i++) {
-						for (j=0; j<width&&open; j++) {
-							if (!availableGrid[row+j][column+i]) {
-								open = false;
-							}
-						}
-					}
-					if (open) found = true;
-					break;
-				}
-			}
-			if (found) break;
-		}
-		if (!found) {
-			m_edgeTextureClasses[texClass].positionInTexture.x = 0;
-			m_edgeTextureClasses[texClass].positionInTexture.y = 0;
-			continue;
-		}
-
-		Int xOrigin = TILE_OFFSET/2 + column*(TILE_PIXEL_EXTENT+TILE_OFFSET);
-		Int yOrigin = TILE_OFFSET/2 + row*(TILE_PIXEL_EXTENT+TILE_OFFSET);
-		m_edgeTextureClasses[texClass].positionInTexture.x = xOrigin;
-		m_edgeTextureClasses[texClass].positionInTexture.y = yOrigin;
-		Int classHeight = yOrigin + width*TILE_PIXEL_EXTENT+ TILE_OFFSET/2;
-		if (maxEdgeHeight < classHeight) maxEdgeHeight = classHeight;
-
-		for (i=0; i<width; i++) {
-			for (j=0; j<width; j++) {
-				availableGrid[row+j][column+i] = false;
-				Int baseNdx = m_edgeTextureClasses[texClass].firstTile + i + j*width;
-				// In case we are just checking for room...
-				if (m_edgeTiles[baseNdx] == NULL) continue;
-				Int x = xOrigin + i*TILE_PIXEL_EXTENT;
-				Int y = yOrigin + (width-j-1)*TILE_PIXEL_EXTENT;
-				// Use negative offsets to differentiate between tiles & edges.
-				m_edgeTiles[baseNdx]->m_tileLocationInTexture.x = x;
-				m_edgeTiles[baseNdx]->m_tileLocationInTexture.y = y;
-			}
-		}
-	}
-	if (edgeHeight) *edgeHeight = maxEdgeHeight;
-	return maxHeight;
-}
-
-/** getUVData - Gets the texture coordinates to use.  See getTerrainTexture.
-*/
-void WorldHeightMap::getUVForNdx(Int tileNdx, float *minU, float *minV, float *maxU, float*maxV, Bool fullTile)
-{
-	Short baseNdx = tileNdx>>2;
-	if (m_sourceTiles[baseNdx] == NULL) {
-		// Missing texture.
-		*minU = *minV = *maxU = *maxV = 0.0f;
-		return;
-	}
-	ICoord2D pos = m_sourceTiles[baseNdx]->m_tileLocationInTexture;
-	*minU = pos.x;
-	*minV = pos.y;
-	*maxU = *minU+TILE_PIXEL_EXTENT; 
-	*maxV = *minV+TILE_PIXEL_EXTENT;
-#ifdef EVAL_TILING_MODES 
-	if (m_tileMode == TILE_8x8) {
-		*maxU = *minU+TILE_PIXEL_EXTENT/2.0f; 
-		*maxV = *minV+TILE_PIXEL_EXTENT/2.0f;
-	} else if (m_tileMode == TILE_6x6) {
-		*maxU = *minU+2.0f*TILE_PIXEL_EXTENT/3.0f; 
-		*maxV = *minV+2.0f*TILE_PIXEL_EXTENT/3.0f;
-	} else {
-		*maxU = *minU+TILE_PIXEL_EXTENT; 
-		*maxV = *minV+TILE_PIXEL_EXTENT;
-	}
-#endif
-	*minU/=TEXTURE_WIDTH;
-	*minV/=m_terrainTexHeight;
-	*maxU/=TEXTURE_WIDTH;
-	*maxV/=m_terrainTexHeight;
-	if (!fullTile) {
-		// Tiles are 64x64 pixels, height grids map to 32x32. 
-		// So get the proper quadrant of the tile.
-		Real midX = (*minU+*maxU)/2;
-		Real midY = (*minV+*maxV)/2;
-		if (tileNdx&2) {		// y's are flipped.
-			*maxV = midY;
-		} else {
-			*minV = midY;
-		}
-		if (tileNdx&1) {
-			*minU = midX;
-		} else {
-			*maxU = midX;
-		}
-	}
-}
-
-/** getUVData - Gets the texture coordinates to use.  See getTerrainTexture.
-*/
-void WorldHeightMap::getUVForBlend(Int edgeClass, Region2D *range)
-{
-	ICoord2D pos = m_edgeTextureClasses[edgeClass].positionInTexture;
-	Int width = m_edgeTextureClasses[edgeClass].width;
-	range->lo.x = (Real)pos.x/TEXTURE_WIDTH;
-	range->lo.y = (Real)pos.y/m_alphaEdgeHeight;
-	range->hi.x = ((Real)pos.x + width*TILE_PIXEL_EXTENT)/TEXTURE_WIDTH;
-	range->hi.y = ((Real)pos.y + width*TILE_PIXEL_EXTENT)/m_alphaEdgeHeight;
-}
-
-/// Get whether something is cliff indexed with the offset that HeightMapRenderObjClass uses built in.
-Bool WorldHeightMap::isCliffMappedTexture(Int x, Int y) { 
-	Int ndx = x+m_drawOriginX+m_width*(y+m_drawOriginY);
-	if (ndx>=0 && ndx<m_dataSize) {
-		return m_cliffInfoNdxes[ndx] != 0;
-	}
-	return false;
-};
-
-/** getUVData - Gets the texture coordinates to use.  See getTerrainTexture.
-		xIndex and yIndex are the integer coorddinates into the height map.
-		U and V are the texture coordiantes for the 4 corners of a height map cell.
-		fullTile is true if we are doing 1/2 resolution height map, and require a full
-		tile to texture  a cell.  Otherwise, we use quarter tiles per cell.
-*/
-Bool WorldHeightMap::getUVData(Int xIndex, Int yIndex, float U[4], float V[4], Bool fullTile)
-{
-#define dont_SHOW_THE_TEXTURE_FOR_DEBUG 1
-#if SHOW_THE_TEXTURE_FOR_DEBUG
-		// This is debug code that just shows the generated texture laid on the terrain.
-		// For debugging ;) jba.
-		xIndex += m_drawOriginX;
-		yIndex += m_drawOriginY;
-		float nU= xIndex;
-		float xU = xIndex+1;
-		float nV = 48-yIndex-1;
-		float xV = 48-yIndex;
-		float k = 48;
-		nU /= k;
-		xU /= k;
-		k = k*m_terrainTexHeight/TEXTURE_WIDTH;
-		nV /= k;
-		xV /= k;
-		U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
-		V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
-		return(true);
-#else
-	xIndex += m_drawOriginX;
-	yIndex += m_drawOriginY;
-	Int ndx = (yIndex*m_width)+xIndex;
-	if ((ndx<m_dataSize) && m_tileNdxes) {
-		Short tileNdx = m_tileNdxes[ndx];
-		return getUVForTileIndex(ndx, tileNdx, U, V, fullTile);
-	}
-	return false;
-#endif
-}
-
-/** getUVForTileIndex - Gets the texture coordinates to use.  See getTerrainTexture.
-		ndx is the index into the linear height array.
-		tileNdx is the index into the texture tiles array.
-		U and V are the texture coordiantes for the 4 corners of a height map cell.
-		fullTile is true if we are doing 1/2 resolution height map, and require a full
-		tile to texture  a cell.  Otherwise, we use quarter tiles per cell.
-*/
-
-Bool WorldHeightMap::getUVForTileIndex(Int ndx, Short tileNdx, float U[4], float V[4], Bool fullTile)
-{
-	Real nU, nV, xU, xV;
-	nU=nV=xU=xV = 0.0f;
-	Int tilesPerRow = TEXTURE_WIDTH/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
-	tilesPerRow *= 4;
-
-	if ((ndx<m_dataSize) && m_tileNdxes) {
-		getUVForNdx(tileNdx, &nU, &nV, &xU, &xV, fullTile);
-		U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
-		V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
-		if (TheGlobalData && !TheGlobalData->m_adjustCliffTextures) {
-			return false;
-		}
-		if (nU==0.0) {
-			return false; // missing texture.
-		}
-		if (fullTile) {
-			return false;
-		}
-		if (m_cliffInfoNdxes[ndx]) {
-			TCliffInfo info = m_cliffInfo[m_cliffInfoNdxes[ndx]]; 
-			Bool tilesMatch = false;
-			Int ndx1 = tileNdx>>2;
-			Int ndx2 = info.tileIndex>>2;
-			Int i;
-			for (i=0; i<this->m_numTextureClasses; i++) {
-				if (ndx1 >= m_textureClasses[i].firstTile && ndx1 < m_textureClasses[i].firstTile + m_textureClasses[i].numTiles) {
-					tilesMatch = ndx2 >= m_textureClasses[i].firstTile && ndx2 < m_textureClasses[i].firstTile + m_textureClasses[i].numTiles;
-					//tilesMatch = true;
-					break;
-				}
-			}
-			if (tilesMatch) {
-				Real minU = m_textureClasses[i].positionInTexture.x;
-				Real maxV = m_textureClasses[i].positionInTexture.y + m_textureClasses[i].width*TILE_PIXEL_EXTENT;
-				minU/=TEXTURE_WIDTH;
-				maxV/=m_terrainTexHeight;
-				Real vFactor = TEXTURE_WIDTH/m_terrainTexHeight;
-				U[0] = info.u0+minU;
-				U[1] = info.u1+minU;
-				U[2] = info.u2+minU;
-				U[3] = info.u3+minU;
-				V[0] = info.v0*vFactor+maxV;
-				V[1] = info.v1*vFactor+maxV;
-				V[2] = info.v2*vFactor+maxV;
-				V[3] = info.v3*vFactor+maxV;
-				return info.flip;
-			}
-		}
-#define DO_OLD_UV
-#ifdef DO_OLD_UV
-// old uv adjustment for cliffs 
-		static Real STRETCH_LIMIT = 1.5f;	 // If it is stretching less than this, don't adjust.
-		static Real TILE_LIMIT = 4.0;			// Our tiles are currently 4 cells wide & tall, so dont'
-																			// adjust to more than 4.0.
-
-		static Real TALL_STRETCH_LIMIT = 2.0f; 
-		static Real DIAMOND_STRETCH_LIMIT = 2.4f;
-		static Real HEIGHT_SCALE = MAP_HEIGHT_SCALE / MAP_XY_FACTOR;
-
-		Real nU, nV, xU, xV;
-		nU=nV=xU=xV = 0.0f;
-		Int tilesPerRow = TEXTURE_WIDTH/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
-		tilesPerRow *= 4;
-
-
-		getUVForNdx(tileNdx, &nU, &nV, &xU, &xV, fullTile);
-		U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
-		V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
-		if (TheGlobalData && !TheGlobalData->m_adjustCliffTextures) {
-			return false;
-		}
-		if (nU==0.0) {
-			return false; // missing texture.
-		}
-		if (fullTile) {
-			return false;
-		}
-		// check for excessive heights. 
-		if (ndx < this->m_dataSize - m_width - 1) {
-			Int h0 = m_data[ndx];
-			Int h1 = m_data[ndx+1];
-			Int h2 = m_data[ndx+m_width+1];
-			Int h3 = m_data[ndx+m_width];
-			Int minH, maxH;
-			minH = maxH = h0;
-			if (minH>h1) minH = h1;
-			if (maxH<h1) maxH = h1;
-			if (minH>h2) minH = h2;
-			if (maxH<h2) maxH = h2;
-			if (minH>h3) minH = h3;
-			if (maxH<h3) maxH = h3;
-//			Int avgH = (h1+h2+h3+h0+2)/4;
-			Int deltaH = maxH-minH;
-			Int below = 0;
-			Int above = 0;
-			Int belowLimit = minH+(2*deltaH+1)/3;
-			Int aboveLimit = minH+(deltaH+1)/3;
-			if (h0<belowLimit) below++;
-			if (h1<belowLimit) below++;
-			if (h2<belowLimit) below++;
-			if (h3<belowLimit) below++;
-			if (h0>aboveLimit) above++;
-			if (h1>aboveLimit) above++;
-			if (h2>aboveLimit) above++;
-			if (h3>aboveLimit) above++;
-			if (deltaH*HEIGHT_SCALE < STRETCH_LIMIT) { 
-				return false;
-			}
-
-			Short baseNdx = tileNdx>>2;
-			Short texClass;
-			for (texClass=0; texClass<m_numTextureClasses; texClass++) {
-				if (m_textureClasses[texClass].firstTile<0) {
-					continue;
-				}
-				// see if the blend tile is in a texture class, and get the right tile for xIndex, yIndex.
-				if (baseNdx >= m_textureClasses[texClass].firstTile && 
-					baseNdx < m_textureClasses[texClass].firstTile+m_textureClasses[texClass].numTiles) {
-					break;
-				}
-			}
-			if (texClass>= m_numTextureClasses) return false;
-			Real nUb, nVb, xUb, xVb;
-			nUb = m_textureClasses[texClass].positionInTexture.x;
-			nVb = m_textureClasses[texClass].positionInTexture.y;
-			xUb = nUb+m_textureClasses[texClass].width*TILE_PIXEL_EXTENT; 
-			xVb = nVb+m_textureClasses[texClass].width*TILE_PIXEL_EXTENT;
-			nUb/=TEXTURE_WIDTH;
-			nVb/=m_terrainTexHeight;
-			xUb/=TEXTURE_WIDTH;
-			xVb/=m_terrainTexHeight;
-			// Now covers texture bounds.
-			// too much stretch.
-			Real divisor = TILE_LIMIT/(deltaH*HEIGHT_SCALE);
-			if (divisor > TILE_LIMIT) divisor = TILE_LIMIT;
-			if (divisor < 1.0f) divisor = 1.0f;
-			Real deltaV = (xVb-nVb); 
-//			Real deltaU = (xUb-nUb); 
-
-			if (above != 1 && below != 1 && (above!=2 || below != 2)) {
-				// diamond shaped.  Use default if it is not too stretched, as
-				// the fix is not that appealing either.
-				if (deltaH*HEIGHT_SCALE < DIAMOND_STRETCH_LIMIT) { 
-					return false;
-				}
-			}
-
-			if (below==1 || above>below) { //(avgH > minH + (2*deltaH+2)/3) 
-				// we got one low guy.
-				if (h0==minH) {
-					V[0] = nV+deltaV/divisor;
-				} else if (h1 == minH) {
-					V[1] = nV+deltaV/divisor;
-				}	else if (h2 == minH) {
-					V[2] = xV-deltaV/divisor;
-				} else if (h3 == minH) {
-					V[3] = xV-deltaV/divisor;
-				}
-#if 0
-				nU = nV = xU = xV = 1.0f;
-				U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
-				V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
-				return false;
-#endif
-			}	else if (above==1 || below>above) { //(avgH < minH + (deltaH+1)/3) 
-				// we got one high guy
-				if (h0==maxH) {
-					V[0] = nV+deltaV/divisor;
-				} else if (h1 == maxH) {
-					V[1] = nV+deltaV/divisor;
-				}	else if (h2 == maxH) {
-					V[2] = xV-deltaV/divisor;
-				} else if (h3 == maxH) {
-					V[3] = xV-deltaV/divisor;
-				}
-#if 0
-				nU = nV = xU = xV = 0.0f;
-				U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
-				V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
-				return false;
-#endif
-			} else {
-				// we got two up and two down.
-				if (deltaH*HEIGHT_SCALE < TALL_STRETCH_LIMIT) { 
-					return false;
-				}
-#if 0
-				nU = nV = xU = xV = 0.0f;
-				U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
-				V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
-				return;
-#endif
-				Real dx = (h3-h2)*HEIGHT_SCALE;
-				dx = sqrt(1+dx*dx); // lenght of the bottom of the cell
-				Real dy =	(h3-h0)*HEIGHT_SCALE;
-				dy = sqrt(1+dy*dy); // length of the left side.
-				if (dx<STRETCH_LIMIT) dx = 1.0f; // don't make a seam unless there is great stretch. 
-				if (dy<STRETCH_LIMIT) dy = 1.0f; // don't make a seam unless there is great stretch. 
-				if (dx>TILE_LIMIT) dx = TILE_LIMIT; // don't tile past the texture's edge. 
-				if (dy>TILE_LIMIT) dy = TILE_LIMIT; // don't tile past the texture's edge. 
-				dx *= xU-nU;
-				dy *= xV-nV;
-				U[0] = nU; U[1] = nU+dx; U[2] = nU+dx; U[3] = nU;
-				V[0] = nV+dy; V[1] = nV+dy; V[2] = nV; V[3] = nV;
-				if (below==1) {
-					below = 1;
-				}
-				// recalc for point 1.
-				dx = (h1-h0)*HEIGHT_SCALE;
-				dx = sqrt(1+dx*dx); // lenght of the bottom of the cell
-				dy =	(h2-h1)*HEIGHT_SCALE;
-				dy = sqrt(1+dy*dy); // length of the left side.
-				if (dx<STRETCH_LIMIT) dx = 1.0f; // don't make a seam unless there is great stretch. 
-				if (dy<STRETCH_LIMIT) dy = 1.0f; // don't make a seam unless there is great stretch. 
-				if (dx>TILE_LIMIT) dx = TILE_LIMIT; // don't tile past the texture's edge. 
-				if (dy>TILE_LIMIT) dy = TILE_LIMIT; // don't tile past the texture's edge. 
-				dx *= xU-nU;
-				dy *= xV-nV;
-				U[1] = U[0]+dx;
-				V[1] = V[3] + dy;
-			}
-			// Make sure we are within the texture;
-			Real adjU = 0;
-			Real adjV = 0;
-			Int i;
-			for (i=0; i<4; i++) {
-				if (nVb - V[i] > adjV) adjV = nVb - V[i];
-			}
-			for (i=0; i<4; i++) {
-				V[i] += adjV;
-			}
-			adjV = 0;
-			for (i=0; i<4; i++) {
-				if (U[i] - xUb > adjU) adjU = U[i]-xUb;
-				if (V[i] - xVb > adjV) adjV = V[i]-xVb;
-			}
-			for (i=0; i<4; i++) {
-				U[i] -= adjU;
-				V[i] -= adjV;
-			}
-		}	
-		return true;
-// 
-#endif
-
-	}	
-	return false;
-}
-
-///@todo: Are the different "if" cases mutually exclusive?  If so, should add else statements.
-Bool WorldHeightMap::getExtraAlphaUVData(Int xIndex, Int yIndex, float U[4], float V[4], UnsignedByte alpha[4], Bool *needFlip, Bool *cliff)
-{
-	Int ndx = (yIndex*m_width)+xIndex;
-	*needFlip = FALSE;
-	*cliff = FALSE;
-
-	if ( (ndx>=0) && (ndx<m_dataSize) && m_tileNdxes) {
-		Short blendNdx = m_extraBlendTileNdxes[ndx];
-		if (blendNdx == 0) {
-			return FALSE;
-		} else {
-			*cliff = getUVForTileIndex(ndx, m_blendedTiles[blendNdx].blendNdx, U, V, FALSE);
-			alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
-			if (m_blendedTiles[blendNdx].horiz) {
-				// Horizontals don't need flipping unless forced because of 3way blend
-				// and a diagonal in base blend layer.
-				*needFlip = m_blendedTiles[blendNdx].inverted & FLIPPED_MASK;
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					alpha[0] = alpha[3] = 255;
-				} else {
-					alpha[1] = alpha[2] = 255;
-				}
-			}
-			if (m_blendedTiles[blendNdx].vert) {
-				// Verticals don't need flipping unless forced because of 3way blend
-				// and a diagonal in base blend layer.
-				*needFlip = m_blendedTiles[blendNdx].inverted & FLIPPED_MASK;
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					alpha[0] = alpha[1] = 255;
-				} else {
-					alpha[2] = alpha[3]  = 255;
-				}
-			}
-			if (m_blendedTiles[blendNdx].rightDiagonal) {
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					alpha[1] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[0] = 255;
-						alpha[2] = 255;
-					}
-				} else {
-					// Uninverted right diagonals need flipping.
-					*needFlip = TRUE;
-					alpha[2] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[1] = 255;
-						alpha[3] = 255;
-					}
-				}
-			}
-			if (m_blendedTiles[blendNdx].leftDiagonal) {
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					// Inverted left diagonals need flipping.
-					*needFlip = TRUE;
-					alpha[0] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[1] = 255;
-						alpha[3] = 255;
-					}
-				} else {
-					alpha[3] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[0] = 255;
-						alpha[2] = 255;
-					}
-				}
-			}
-			if (m_blendedTiles[blendNdx].customBlendEdgeClass>=0) {
-				alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
-				// No alpha blend, so never need to flip.
-				*needFlip = FALSE;
-			}
-		}
-	}
-
-	return TRUE;
-}
-
-/** getUVData - Gets the texture coordinates to use with the alpha texture.  
-		xIndex and yIndex are the integer coorddinates into the height map.
-		U and V are the texture coordiantes for the 4 corners of a height map cell.
-		fullTile is true if we are doing 1/2 resolution height map, and require a full
-		tile to texture  a cell.  Otherwise, we use quarter tiles per cell.
-		flip is set if we need to flip the diagonal across the cell to make the 
-		alpha coordinates blend properly.  Filling a square with 2 triangles is not symmetrical :)
-*/
-void WorldHeightMap::getAlphaUVData(Int xIndex, Int yIndex, float U[4], float V[4], 
-																		UnsignedByte alpha[4], Bool *flip, Bool fullTile)
-{
-	xIndex += m_drawOriginX;
-	yIndex += m_drawOriginY;
-	Int ndx = (yIndex*m_width)+xIndex;
-	Bool stretchedForCliff = false;
-	Bool needFlip = false;
-
-	if ((ndx<m_dataSize) && m_tileNdxes) {
-		Short blendNdx = m_blendTileNdxes[ndx];
-		if (fullTile) blendNdx = 0;
-		if (blendNdx == 0) {
-			stretchedForCliff = getUVForTileIndex(ndx, m_tileNdxes[ndx], U, V, fullTile);		
-			alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
-			// No alpha blend, so never need to flip.
-			needFlip = false;
-		} else {
-			stretchedForCliff = getUVForTileIndex(ndx, m_blendedTiles[blendNdx].blendNdx, U, V, fullTile);
-			alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
-			if (m_blendedTiles[blendNdx].horiz) {
-				// Horizontals don't need flipping unless forced because of 3way blend.
-				needFlip = m_blendedTiles[blendNdx].inverted & FLIPPED_MASK;
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					alpha[0] = alpha[3] = 255;
-				} else {
-					alpha[1] = alpha[2] = 255;
-				}
-			}
-			if (m_blendedTiles[blendNdx].vert) {
-				// Verticals don't need flipping unless forced because of 3way blend.
-				needFlip = m_blendedTiles[blendNdx].inverted & FLIPPED_MASK;
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					alpha[0] = alpha[1] = 255;
-				} else {
-					alpha[2] = alpha[3]  = 255;
-				}
-			}
-			if (m_blendedTiles[blendNdx].rightDiagonal) {
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					alpha[1] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[0] = 255;
-						alpha[2] = 255;
-					}
-				} else {
-					// Uninverted right diagonals need flipping.
-					needFlip = true;
-					alpha[2] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[1] = 255;
-						alpha[3] = 255;
-					}
-				}
-			}
-			if (m_blendedTiles[blendNdx].leftDiagonal) {
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					// Inverted left diagonals need flipping.
-					needFlip = true;
-					alpha[0] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[1] = 255;
-						alpha[3] = 255;
-					}
-				} else {
-					alpha[3] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[0] = 255;
-						alpha[2] = 255;
-					}
-				}
-			}
-			if (m_blendedTiles[blendNdx].customBlendEdgeClass>=0) {
-				alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
-				// No alpha blend, so never need to flip.
-				needFlip = false;
-			}
-		}
-	}
-	if (stretchedForCliff) {
-		// If we had to stretch for clif, check heights.
-		Int p0=getHeight(xIndex, yIndex);
-		Int p1=getHeight(xIndex+1, yIndex);
-		Int p2=getHeight(xIndex+1, yIndex+1);
-		Int p3=getHeight(xIndex, yIndex+1);
-		Int dz1 = abs(p0-p2);
-		Int dz2 = abs(p1-p3);
-		needFlip = dz1>dz2;
-	}
-#ifdef FLIP_TRIANGLES
-	*flip = needFlip;
-#endif
-}
-
-TextureClass *WorldHeightMap::getTerrainTexture(void)
-{
-	if (m_terrainTex == NULL) {
-		Int edgeHeight;
-		Int height = updateTileTexturePositions(&edgeHeight);
-		Int pow2Height = 1;
-		while (pow2Height<height) {
-			pow2Height *=2;
-		}
-		REF_PTR_RELEASE(m_terrainTex);
-		m_terrainTex = MSGNEW("WorldHeightMap_getTerrainTexture") TerrainTextureClass(pow2Height);
-		m_terrainTexHeight = m_terrainTex->update(this);
-		char buf[64];
-		sprintf(buf, "Base tex height %d\n", pow2Height);
-		DEBUG_LOG((buf));
-		REF_PTR_RELEASE(m_alphaTerrainTex);
-		m_alphaTerrainTex = MSGNEW("WorldHeightMap_getTerrainTexture") AlphaTerrainTextureClass(m_terrainTex);
-
-		pow2Height = 1;
-		while (pow2Height<edgeHeight) {
-			pow2Height *=2;
-		}
-		REF_PTR_RELEASE(m_alphaEdgeTex);
-		m_alphaEdgeTex = MSGNEW("WorldHeightMap_getTerrainTexture") AlphaEdgeTextureClass(pow2Height);
-		m_alphaEdgeHeight = m_alphaEdgeTex->update(this);
-
-		//Generate lookup table for determining triangle order in each terrain cell.
-		//Not the best place to put this but getAlphaUVData() requires a valid terrain
-		//texture to return valid values.
-
-		for (Int y=0; y<(m_height-1); y++)
-			for (Int x=0; x<(m_width-1); x++)
-			{
-				UnsignedByte alpha[4];
-				float UA[4], VA[4];
-				Bool flipForBlend;
-
-				getAlphaUVData(x, y, UA, VA, alpha, &flipForBlend, false);
-
-				m_cellFlipState[y*m_flipStateWidth+(x>>3)] |= flipForBlend << (x & 0x7);
-				DEBUG_ASSERTCRASH ((y*m_flipStateWidth+(x>>3)) < (m_flipStateWidth * m_height), ("Bad range"));
-			}
-	}
-
-	return m_terrainTex;
-}
-
-TextureClass *WorldHeightMap::getAlphaTerrainTexture(void)
-{
-	if (m_alphaTerrainTex == NULL) {
-		getTerrainTexture();
-	}
-	return m_alphaTerrainTex;
-}
-	
-TextureClass *WorldHeightMap::getEdgeTerrainTexture(void)
-{
-	if (m_alphaEdgeTex == NULL) {
-		getTerrainTexture();
-	}
-	return m_alphaEdgeTex;
-}
-	
-Bool WorldHeightMap::setDrawOrg(Int xOrg, Int yOrg)
-{
-	Int newX, newY;
-	Int newWidth, newHeight;
-	newX = xOrg;
-	newY = yOrg;
-	newWidth = m_drawWidthX;
-	newHeight = m_drawHeightY;
-	if (TheGlobalData && TheGlobalData->m_stretchTerrain) {
-		newWidth=STRETCH_DRAW_WIDTH;
-		newHeight=STRETCH_DRAW_HEIGHT;
-	}
-	if (TheGlobalData && TheGlobalData->m_drawEntireTerrain) {
-		newWidth=m_width;
-		newHeight=m_height;
-	}
-	if (newWidth > m_width) newWidth = m_width;
-	if (newHeight > m_height) newHeight = m_height;
-	if (newX > m_width - newWidth) newX = m_width-newWidth; 
-	if (newX<0) newX=0;
-	if (newY > m_height - newHeight) newY = m_height - newHeight; 
-	if (newY<0) newY=0;
-	Bool anythingDifferent = (m_drawOriginX!=newX) ||
-										 (m_drawOriginY!=newY) ||
-										 (m_drawWidthX!=newWidth) ||
-										 (m_drawHeightY!=newHeight) ;
-
-	if (anythingDifferent) {
-		m_drawOriginX=newX;
-		m_drawOriginY=newY;
-		m_drawWidthX=newWidth;
-		m_drawHeightY=newHeight;
-		return(true);
-	}
-	return(false);
-}
-
-/** Gets global texture class. */
-Int WorldHeightMap::getTextureClass(Int xIndex, Int yIndex, Bool baseClass)
-{
-	Int ndx = (yIndex*m_width)+xIndex;
-	DEBUG_ASSERTCRASH((ndx>=0 && ndx<this->m_dataSize),("oops"));
-	if (ndx<0 || ndx >= this->m_dataSize) return(-1);
-	Int textureNdx = m_tileNdxes[ndx];
-	if (!baseClass && (m_blendTileNdxes[ndx] != 0 || m_extraBlendTileNdxes[ndx] != 0)) {
-		return(-1);  // blended, so not of the original class.
-	}
-	return getTextureClassFromNdx(textureNdx);
-}
-
-
-/** Sets all the cliff flags in map based on height. */
-void WorldHeightMap::initCliffFlagsFromHeights()
-{
-	Int xIndex, yIndex;
-
-	for (xIndex=0; xIndex<m_width-1; xIndex++) {
-		for (yIndex=0; yIndex<m_height-1; yIndex++) {
-			setCellCliffFlagFromHeights(xIndex, yIndex);
-		}
-	}
-}
-
-/** Sets the cliff flag for a cell based on height. */
-void WorldHeightMap::setCellCliffFlagFromHeights(Int xIndex, Int yIndex)
-{
-	Real height1 = getHeight(xIndex, yIndex)*MAP_HEIGHT_SCALE;
-	Real height2 = getHeight(xIndex+1, yIndex)*MAP_HEIGHT_SCALE;
-	Real height3 = getHeight(xIndex, yIndex+1)*MAP_HEIGHT_SCALE;
-	Real height4 = getHeight(xIndex+1, yIndex+1)*MAP_HEIGHT_SCALE;
-	Real minZ = height1;
-	if (minZ > height2) minZ = height2;
-	if (minZ > height3) minZ = height3;
-	if (minZ > height4) minZ = height4;
-	Real maxZ = height1;
-	if (maxZ < height2) maxZ = height2;
-	if (maxZ < height3) maxZ = height3;
-	if (maxZ < height4) maxZ = height4;
-	const Real cliffRange = PATHFIND_CLIFF_SLOPE_LIMIT_F;	
-	Bool isCliff = (maxZ-minZ > cliffRange);
-	setCliffState(xIndex, yIndex, isCliff);
-
-}
-
-/** Gets global texture class. */
-Int WorldHeightMap::getTextureClassFromNdx(Int tileNdx) 
-{
-	Int i;
-	tileNdx = tileNdx>>2;
-	for (i=0; i<m_numTextureClasses; i++) {
-		if (m_textureClasses[i].firstTile<0) {
-			continue;
-		}
-		// see if the blend tile is in a texture class, and get the right tile for xIndex, yIndex.
-		if (tileNdx >= m_textureClasses[i].firstTile && 
-			tileNdx < m_textureClasses[i].firstTile+m_textureClasses[i].numTiles) {
-			return(m_textureClasses[i].globalTextureClass);
-		}
-	}
-	return(-1);
-}
-
-TXTextureClass WorldHeightMap::getTextureFromIndex( Int textureIndex )
-{
-	return m_textureClasses[textureIndex];
-}
-
-void WorldHeightMap::getTerrainColorAt(Real x, Real y, RGBColor *pColor)
-{
-	Int xIndex = REAL_TO_INT_FLOOR(x/MAP_XY_FACTOR);
-	Int yIndex = REAL_TO_INT_FLOOR(y/MAP_XY_FACTOR);
-	xIndex += m_borderSize;
-	yIndex += m_borderSize;
-	pColor->red = pColor->green = pColor->blue = 0;
-	if (xIndex<0) xIndex = 0;
-	if (yIndex<0) yIndex = 0;
-	if (xIndex >= m_width) xIndex = m_width-1;
-	if (yIndex >= m_height) yIndex = m_height-1;
-	Int ndx = (yIndex*m_width)+xIndex;
-	if (ndx<0 || ndx >= this->m_dataSize) return;
-	Int tileNdx = m_tileNdxes[ndx];
-	tileNdx = tileNdx>>2;	 // We pack 4 grids into a tile.
-
-	TileData *pTile = getSourceTile(tileNdx);
-	if (pTile) {
-		// pTile contains the bitmap data for 4 squares.
-		// Get the data mipped down to one pixel for the tile.
-		UnsignedByte *pData = pTile->getRGBDataForWidth(1);
-		// Data is in microsoft bgra format.
-		pColor->red = pData[2]/255.0;
-		pColor->green = pData[1]/255.0;
-		pColor->blue = pData[0]/255.0;
-	}
-}	
-
-AsciiString WorldHeightMap::getTerrainNameAt(Real x, Real y)
-{
-	Int xIndex = REAL_TO_INT_FLOOR(x/MAP_XY_FACTOR);
-	Int yIndex = REAL_TO_INT_FLOOR(y/MAP_XY_FACTOR);
-	xIndex += m_borderSize;
-	yIndex += m_borderSize;
-	if (xIndex<0) xIndex = 0;
-	if (yIndex<0) yIndex = 0;
-	if (xIndex >= m_width) xIndex = m_width-1;
-	if (yIndex >= m_height) yIndex = m_height-1;
-	Int ndx = (yIndex*m_width)+xIndex;
-	if (ndx<0 || ndx >= this->m_dataSize) return AsciiString::TheEmptyString;
-	Int tileNdx = m_tileNdxes[ndx];
-	tileNdx = tileNdx>>2;	 // We pack 4 grids into a tile.
-
-	Int i;
-	for (i=0; i<this->m_numTextureClasses; i++) {
-		if (tileNdx >= m_textureClasses[i].firstTile && tileNdx < m_textureClasses[i].firstTile + m_textureClasses[i].numTiles) {
-			return(m_textureClasses[i].name);
-		}
-	}
-	return AsciiString::TheEmptyString;
-}	
-
-
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGameLogic.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGameLogic.cpp
index fd66255e7f0..132698778db 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGameLogic.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGameLogic.cpp
@@ -25,7 +25,7 @@
 // FILE: W3DGameLogic.cpp /////////////////////////////////////////////////////
 //
 // W3D game logic class, there shouldn't be a lot of new functionality
-// in this class, but there are certain things that need to have close 
+// in this class, but there are certain things that need to have close
 // knowledge of each other like ther logical and visual terrain
 //
 // Author: Colin Day, April 2001
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
index 57c904e9878..ec1e2521ac2 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
@@ -44,6 +44,7 @@
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 #include "W3DDevice/GameClient/W3DAssetManager.h"
 #include "W3DDevice/GameClient/W3DDisplay.h"
+#include "W3DDevice/GameClient/W3DScene.h"
 #include "W3DDevice/GameLogic/W3DGhostObject.h"
 #include "WW3D2/rendobj.h"
 #include "WW3D2/hlod.h"
@@ -51,11 +52,6 @@
 #include "WW3D2/matinfo.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 /**This class will hold all information about a W3D RenderObject needed to
 reconstruct it if necessary*/
@@ -65,8 +61,11 @@ class W3DRenderObjectSnapshot : public Snapshot
 
 	W3DRenderObjectSnapshot(RenderObjClass *m_parentRobj, DrawableInfo *drawInfo, Bool cloneParentRobj = TRUE);
 	~W3DRenderObjectSnapshot() {REF_PTR_RELEASE(m_robj);}
-	inline void update(RenderObjClass *robj, DrawableInfo *drawInfo, Bool cloneParentRobj=TRUE);	///<refresh the current snapshot with latest state
-	inline void addToScene(void);	///< add this fogged renderobject to the scene.
+
+	inline void update(RenderObjClass *robj, DrawableInfo *drawInfo, Bool cloneParentRobj = TRUE);	///<refresh the current snapshot with latest state
+	inline Bool addToScene(void); ///< add this fogged render object to the scene.
+	inline Bool removeFromScene(); ///< remove this fogged render object from the scene.
+
 protected:
 
 	virtual void crc( Xfer *xfer );
@@ -92,17 +91,19 @@ void disableUVAnimations(RenderObjClass *robj)
 		//Also disable any animations that may be playing using mappers (texture scrolling)
 		for (Int i=0; i < robj->Get_Num_Sub_Objects(); i++)
 		{
-			RenderObjClass *subObj=robj->Get_Sub_Object(i);
+			RenderObjClass *subObj = robj->Get_Sub_Object(i);
 			if (subObj && subObj->Class_ID() == RenderObjClass::CLASSID_MESH)
-			{	//check if sub-object has the correct material to do texture scrolling.
-				MaterialInfoClass *mat=subObj->Get_Material_Info();
+			{
+				//check if sub-object has the correct material to do texture scrolling.
+				MaterialInfoClass *mat = subObj->Get_Material_Info();
 				if (mat)
-				{	for (Int j=0; j<mat->Vertex_Material_Count(); j++)
+				{
+					for (Int j=0; j<mat->Vertex_Material_Count(); j++)
 					{
-						VertexMaterialClass *vmaterial=mat->Peek_Vertex_Material(j);
-						LinearOffsetTextureMapperClass *mapper=(LinearOffsetTextureMapperClass *)vmaterial->Peek_Mapper();
+						VertexMaterialClass *vmaterial = mat->Peek_Vertex_Material(j);
+						LinearOffsetTextureMapperClass *mapper = (LinearOffsetTextureMapperClass *)vmaterial->Peek_Mapper();
 						if (mapper && mapper->Mapper_ID() == TextureMapperClass::MAPPER_ID_LINEAR_OFFSET)
-						{	
+						{
 							subObj->Set_User_Data(&animationDisableOverride);	//tell W3D about custom material settings
 						}
 					}
@@ -123,8 +124,7 @@ void W3DRenderObjectSnapshot::update(RenderObjClass *robj, DrawableInfo *drawInf
 
 	if( cloneParentRobj == TRUE )
 	{
-
-		m_robj=robj->Clone();
+		m_robj = robj->Clone();
 		m_robj->Set_ObjectColor(robj->Get_ObjectColor());
 #ifdef DEBUG_FOG_MEMORY
 		m_robjName = m_robj->Get_Name();
@@ -132,28 +132,40 @@ void W3DRenderObjectSnapshot::update(RenderObjClass *robj, DrawableInfo *drawInf
 		//Set cloned object to same state as original object.
 		m_robj->Set_Transform(robj->Get_Transform());
 		if (robj->Class_ID() == RenderObjClass::CLASSID_HLOD)
-		{	
+		{
 			float frame,mult;
 			int mode,numFrames;
 
-			HAnimClass *hanim=((HLodClass *)robj)->Peek_Animation_And_Info(frame,numFrames,mode,mult);
+			HAnimClass *hanim = ((HLodClass *)robj)->Peek_Animation_And_Info(frame,numFrames,mode,mult);
 			m_robj->Set_Animation(hanim,frame);
 			disableUVAnimations(m_robj);
-		}	//HLOD
+		}
 	}
 	else
-		m_robj=robj;
+	{
+		m_robj = robj;
+	}
 
 	m_robj->Set_User_Data(drawInfo);
+}
 
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+Bool W3DRenderObjectSnapshot::addToScene(void)
+{
+	if (!m_robj->Is_In_Scene())
+	{
+		W3DDisplay::m_3DScene->Add_Render_Object(m_robj);
+		return true;
+	}
+	return false;
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void W3DRenderObjectSnapshot::addToScene(void)
+Bool W3DRenderObjectSnapshot::removeFromScene()
 {
-	if (W3DDisplay::m_3DScene != NULL)
-		((SimpleSceneClass *)W3DDisplay::m_3DScene)->Add_Render_Object(m_robj);
+	return m_robj->Remove();
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -161,8 +173,8 @@ void W3DRenderObjectSnapshot::addToScene(void)
 W3DRenderObjectSnapshot::W3DRenderObjectSnapshot(RenderObjClass *robj, DrawableInfo *drawInfo,
 																								 Bool cloneParentRobj)
 {
-	m_robj=NULL;
-	m_next=NULL;
+	m_robj = NULL;
+	m_next = NULL;
 	update(robj, drawInfo, cloneParentRobj);
 }
 
@@ -171,8 +183,7 @@ W3DRenderObjectSnapshot::W3DRenderObjectSnapshot(RenderObjClass *robj, DrawableI
 // ------------------------------------------------------------------------------------------------
 void W3DRenderObjectSnapshot::crc( Xfer *xfer )
 {
-
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -181,14 +192,13 @@ void W3DRenderObjectSnapshot::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 void W3DRenderObjectSnapshot::xfer( Xfer *xfer )
 {
-
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_robj, ("W3DRenderObjectSnapshot::xfer - invalid m_robj\n") );
+	DEBUG_ASSERTCRASH( m_robj, ("W3DRenderObjectSnapshot::xfer - invalid m_robj") );
 
 	// transform on the main render object
 	Matrix3D transform;
@@ -204,40 +214,37 @@ void W3DRenderObjectSnapshot::xfer( Xfer *xfer )
 	Bool visible;
 	RenderObjClass *subObject;
 	AsciiString subObjectName;
+
 	for( Int i = 0; i < subObjectCount; ++i )
 	{
-
 		//
 		// when saving we get sub objects by index and xfer their name, when loading
 		// we read the name and find that sub object
 		//
 		if( xfer->getXferMode() == XFER_SAVE )
 		{
-
 			// get sub object
 			subObject = m_robj->Get_Sub_Object( i );
 
 			// xfer sub object name which is unique among those in this render object
 			subObjectName.set( subObject->Get_Name() );
 			xfer->xferAsciiString( &subObjectName );
-
-		}  // end if, save
+		}
 		else
 		{
-
 			// read sub object name
 			xfer->xferAsciiString( &subObjectName );
 
 			// find this sub object on the object
 			subObject = m_robj->Get_Sub_Object_By_Name( subObjectName.str() );
 
-		}  // end else load
+		}
 
 		//
 		// NOTE that the remainder of this xfer code works on a sub object only *if*
 		// it is present.  It is possible that in future patches we change the artwork
 		// for some objects which could remove sub objects for which we have data saved
-		// for in the save game file.  If we encounter data in the save file for 
+		// for in the save game file.  If we encounter data in the save file for
 		// sub objects that are no longer in the artwork we just read the data and
 		// throw it away
 		//
@@ -259,23 +266,20 @@ void W3DRenderObjectSnapshot::xfer( Xfer *xfer )
 		// need to tell W3D that this sub object transforms are ok
 		if( subObject )
 		{
-
 			// need to cast to HLod if we can to validate the hierarchy
 			if( subObject->Class_ID() == RenderObjClass::CLASSID_HLOD )
 				((HLodClass *)subObject)->Friend_Set_Hierarchy_Valid( TRUE );
-
-		}  // end if
+		}
 
 		// release reference to sub object
 		if( subObject )
 			REF_PTR_RELEASE( subObject );
-
-	}  // end for, i
+	}
 
 	// tell W3D that the transforms for our sub objects are all OK cause we've done them ourselves
 	m_robj->Set_Sub_Object_Transforms_Dirty( FALSE );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -283,15 +287,14 @@ void W3DRenderObjectSnapshot::xfer( Xfer *xfer )
 void W3DRenderObjectSnapshot::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 W3DGhostObject::W3DGhostObject()
 {
-
-	for (Int i=0; i< MAX_PLAYER_COUNT; i++) 
-		m_parentSnapshots[i]=NULL;
+	for (Int i = 0; i < MAX_PLAYER_COUNT; i++)
+		m_parentSnapshots[i] = NULL;
 
 	m_drawableInfo.m_drawable = NULL;
 	m_drawableInfo.m_flags = 0;
@@ -300,40 +303,51 @@ W3DGhostObject::W3DGhostObject()
 
 	m_nextSystem = NULL;
 	m_prevSystem = NULL;
-
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 W3DGhostObject::~W3DGhostObject()
 {
-#ifdef DEBUG_FOG_MEMORY
-	for (Int i=0; i<MAX_PLAYER_COUNT; i++)
+#ifdef DEBUG_CRASHING
+	if (TheGhostObjectManager->trackAllPlayers())
 	{
-		DEBUG_ASSERTCRASH(m_parentSnapshots[i] == NULL, ("Delete of non-empty GhostObject"));
+		for (Int i = 0; i < MAX_PLAYER_COUNT; i++)
+		{
+			DEBUG_ASSERTCRASH(m_parentSnapshots[i] == NULL, ("Delete of non-empty GhostObject"));
+		}
+	}
+	else
+	{
+		DEBUG_ASSERTCRASH(m_parentSnapshots[TheGhostObjectManager->getLocalPlayerIndex()] == NULL, ("Delete of non-empty GhostObject"));
 	}
-#else
-	DEBUG_ASSERTCRASH(m_parentSnapshots[TheGhostObjectManager->getLocalPlayerIndex()] == NULL, ("Delete of non-empty GhostObject"));
 #endif
 }
 
 // ------------------------------------------------------------------------------------------------
-/** Record the current state of the renderobjects used by this parent object
+/** Record the current state of the render objects used by this parent object
 so we can display cached state when player is looking at fogged object.
 Should only be called when object enters the fogged state.*/
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::snapShot(int playerIndex)
 {
-#ifndef DEBUG_FOG_MEMORY
-	if (playerIndex != TheGhostObjectManager->getLocalPlayerIndex())
-		return;	//we only snapshot things for the initial local player because local player can't change in non-debug game.
-#endif
+	DEBUG_ASSERTCRASH(TheGhostObjectManager->trackAllPlayers() || playerIndex == TheGhostObjectManager->getLocalPlayerIndex(),
+		("We are supposed to only snapshot things for the initial local player because local player can't change in non-debug game."));
+
+	Drawable *draw = m_parentObject->getDrawable();
 
-	Drawable *draw=m_parentObject->getDrawable();
 	if (draw->isDrawableEffectivelyHidden())
 		return;	//don't bother to snapshot things which nobody can see.
-	
-	W3DRenderObjectSnapshot *snap=m_parentSnapshots[playerIndex],*prevSnap=NULL;
+
+	//After we remove the unfogged object, we also disable
+	//anything that should be hidden inside fog - shadow, particles, etc.
+	draw->setFullyObscuredByShroud(true);
+
+	// TheSuperHackers @bugfix Definitely keep this shrouded from here on until the shroud becomes clear again.
+	draw->setShroudClearFrame(InvalidShroudClearFrame);
+
+	W3DRenderObjectSnapshot *snap = m_parentSnapshots[playerIndex];
+	W3DRenderObjectSnapshot *prevSnap = NULL;
 
 	//walk through all W3D render objects used by this object
 	for (DrawModule ** dm = draw->getDrawModules(); *dm; ++dm)
@@ -341,24 +355,25 @@ void W3DGhostObject::snapShot(int playerIndex)
 		const ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
 		if (di)
 		{
-			W3DModelDraw *w3dDraw= (W3DModelDraw *)di;
-			RenderObjClass *robj=NULL;
+			W3DModelDraw *w3dDraw = (W3DModelDraw *)di;
+			RenderObjClass *robj = w3dDraw->getRenderObject();
 
-			robj=w3dDraw->getRenderObject();
 			//robj may be null for modules which have no render objects such
 			//as for build-ups that are currently disabled.
 			if (robj)
 			{
 				if (snap == NULL)
-				{	
+				{
 					snap = NEW W3DRenderObjectSnapshot(robj, &m_drawableInfo);	// poolify
 					if (prevSnap)
-						prevSnap->m_next=snap;
+						prevSnap->m_next = snap;
 					else
-						m_parentSnapshots[playerIndex]=snap;
+						m_parentSnapshots[playerIndex] = snap;
 				}
 				else
-					m_parentSnapshots[playerIndex]->update(robj, &m_drawableInfo);
+				{
+					snap->update(robj, &m_drawableInfo);
+				}
 
 				//Adding and removing render objects to the scene is expensive
 				//so only do it for the real player watching the screen.  There is
@@ -370,7 +385,7 @@ void W3DGhostObject::snapShot(int playerIndex)
 					snap->addToScene();
 				}
 
-				prevSnap=snap;
+				prevSnap = snap;
 				snap = snap->m_next;
 			}
 		}
@@ -378,16 +393,17 @@ void W3DGhostObject::snapShot(int playerIndex)
 
 	//Check if we captured at least one snapshot
 	if (snap != m_parentSnapshots[playerIndex])
-	{	//save off other info we may need in case the parent object is destroyed.
+	{
+		//save off other info we may need in case the parent object is destroyed.
 		///@todo: We're going to ignore the case where each player index could be
-		//looking at a different geometry info/orientation because ghostobjects
+		//looking at a different geometry info/orientation because ghost objects
 		//are supposed to be used on immobile buildings.
-		m_parentGeometryType=m_parentObject->getGeometryInfo().getGeomType();
-		m_parentGeometryIsSmall=m_parentObject->getGeometryInfo().getIsSmall();
-		m_parentGeometryMajorRadius=m_parentObject->getGeometryInfo().getMajorRadius();
-		m_parentGeometryminorRadius=m_parentObject->getGeometryInfo().getMinorRadius();
-		m_parentPosition=*m_parentObject->getPosition();
-		m_parentAngle=m_parentObject->getOrientation();
+		m_parentGeometryType = m_parentObject->getGeometryInfo().getGeomType();
+		m_parentGeometryIsSmall = m_parentObject->getGeometryInfo().getIsSmall();
+		m_parentGeometryMajorRadius = m_parentObject->getGeometryInfo().getMajorRadius();
+		m_parentGeometryminorRadius = m_parentObject->getGeometryInfo().getMinorRadius();
+		m_parentPosition = *m_parentObject->getPosition();
+		m_parentAngle = m_parentObject->getOrientation();
 	}
 }
 
@@ -396,30 +412,32 @@ void W3DGhostObject::snapShot(int playerIndex)
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::removeParentObject(void)
 {
-
 	// sanity
 	if( m_parentObject == NULL )
 		return;
 
-	Drawable *draw=m_parentObject->getDrawable();
+	Drawable *draw = m_parentObject->getDrawable();
+	if (!draw)
+		return;
 
 	//After we remove the unfogged object, we also disable
 	//anything that should be hidden inside fog - shadow, particles, etc.
 	draw->setFullyObscuredByShroud(true);
 
+	// TheSuperHackers @bugfix Definitely keep this shrouded from here on until the shroud becomes clear again.
+	draw->setShroudClearFrame(InvalidShroudClearFrame);
+
 	//walk through all W3D render objects used by this object
 	for (DrawModule ** dm = draw->getDrawModules(); *dm; ++dm)
 	{
 		const ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
 		if (di)
 		{
-			W3DModelDraw *w3dDraw= (W3DModelDraw *)di;
-			RenderObjClass *robj=NULL;
-
-			robj=w3dDraw->getRenderObject();
+			W3DModelDraw *w3dDraw = (W3DModelDraw *)di;
+			RenderObjClass *robj = w3dDraw->getRenderObject();
 			if (robj)
 			{
-				DEBUG_ASSERTCRASH(robj->Peek_Scene() != NULL, ("Removing GhostObject parent not in scene "));
+				DEBUG_ASSERTCRASH(robj->Peek_Scene() != NULL, ("Removing GhostObject parent not in scene"));
 				robj->Remove();
 			}
 		}
@@ -433,7 +451,11 @@ void W3DGhostObject::restoreParentObject(void)
 {
 	if (TheGlobalData->m_headless)
 		return;
-	Drawable *draw=m_parentObject->getDrawable();
+
+	if (!m_parentObject)
+		return;
+
+	Drawable *draw = m_parentObject->getDrawable();
 	if (!draw)
 		return;
 
@@ -446,19 +468,19 @@ void W3DGhostObject::restoreParentObject(void)
 		const ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
 		if (di)
 		{
-			W3DModelDraw *w3dDraw= (W3DModelDraw *)di;
-			RenderObjClass *robj=NULL;
+			W3DModelDraw *w3dDraw = (W3DModelDraw *)di;
+			RenderObjClass *robj = w3dDraw->getRenderObject();
 
-			robj=w3dDraw->getRenderObject();
 			//robj may be null for modules which have no render objects such
 			//as for build-ups that are currently disabled.
 			if (robj)
-			{	//if we have a render object that's not in the scene, it must have been
+			{
+				//if we have a render object that's not in the scene, it must have been
 				//removed by the ghost object manager, so restore it.  If we have a render
 				//object that is in the scene, then it was probably added because the model
 				//changed while the object was ghosted (for damage states, garrison, etc.).
-				if (robj->Peek_Scene() == NULL)
-					((SimpleSceneClass *)W3DDisplay::m_3DScene)->Add_Render_Object(robj);
+				if (!robj->Is_In_Scene())
+					W3DDisplay::m_3DScene->Add_Render_Object(robj);
 			}
 		}
 	}
@@ -468,31 +490,15 @@ void W3DGhostObject::restoreParentObject(void)
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::freeAllSnapShots(void)
 {
-	Int playerIndex;
-
-#ifdef DEBUG_FOG_MEMORY
-	for (playerIndex=0; playerIndex<MAX_PLAYER_COUNT; playerIndex++)
-#else
-	playerIndex = TheGhostObjectManager->getLocalPlayerIndex();
-#endif
-		if (m_parentSnapshots[playerIndex])
-		{	//if we have a snapshot for this object, remove it from
-			//scene.
-			removeFromScene(playerIndex);
-
-			//Restore actual objects assuming they are still alive.
-			if (m_parentObject)
-				restoreParentObject();
-
-			W3DRenderObjectSnapshot *snap=m_parentSnapshots[playerIndex];
-			W3DRenderObjectSnapshot *nextSnap;
-			while (snap)
-			{	nextSnap = snap->m_next;
-				delete snap;
-				snap = nextSnap;
-			}
-			m_parentSnapshots[playerIndex]=NULL;
-		}
+	if (TheGhostObjectManager->trackAllPlayers())
+	{
+		for (Int playerIndex = 0; playerIndex < MAX_PLAYER_COUNT; playerIndex++)
+			freeSnapShot(playerIndex);
+	}
+	else
+	{
+		freeSnapShot(TheGhostObjectManager->getLocalPlayerIndex());
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -500,13 +506,9 @@ void W3DGhostObject::freeAllSnapShots(void)
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::freeSnapShot(int playerIndex)
 {
-#ifndef DEBUG_FOG_MEMORY
-	if (playerIndex != TheGhostObjectManager->getLocalPlayerIndex())
-		return;	//we only snapshot things for the local player
-#endif
-
 	if (m_parentSnapshots[playerIndex])
-	{	//if we have a snapshot for this object, remove it from
+	{
+		//if we have a snapshot for this object, remove it from
 		//scene and put back the original object if it still exists.
 		if (playerIndex == TheGhostObjectManager->getLocalPlayerIndex())
 		{
@@ -517,18 +519,18 @@ void W3DGhostObject::freeSnapShot(int playerIndex)
 			removeFromScene(playerIndex);
 
 			//Restore actual objects assuming they are still alive.
-			if (m_parentObject)
-				restoreParentObject();
+			restoreParentObject();
 		}
 
-		W3DRenderObjectSnapshot *snap=m_parentSnapshots[playerIndex];
+		W3DRenderObjectSnapshot *snap = m_parentSnapshots[playerIndex];
 		W3DRenderObjectSnapshot *nextSnap;
 		while (snap)
-		{	nextSnap = snap->m_next;
+		{
+			nextSnap = snap->m_next;
 			delete snap;
 			snap = nextSnap;
 		}
-		m_parentSnapshots[playerIndex]=NULL;
+		m_parentSnapshots[playerIndex] = NULL;
 	}
 }
 
@@ -543,54 +545,44 @@ void W3DGhostObject::updateParentObject(Object *object, PartitionData *mod)
 // ------------------------------------------------------------------------------------------------
 /**Remove the dummy render objects from scene that belong to given player*/
 // ------------------------------------------------------------------------------------------------
-void W3DGhostObject::removeFromScene(int playerIndex)
+Bool W3DGhostObject::removeFromScene(int playerIndex)
 {
-	W3DRenderObjectSnapshot *snap=m_parentSnapshots[playerIndex];
+	W3DRenderObjectSnapshot *snap = m_parentSnapshots[playerIndex];
+
+	Bool removed = false;
 
 	while (snap)
 	{
-		snap->m_robj->Remove();
-		snap=snap->m_next;
+		removed |= snap->removeFromScene();
+		snap = snap->m_next;
 	}
+
+	return removed;
 }
 
 // ------------------------------------------------------------------------------------------------
 /**Add the dummy render objects to scene so player sees the correct version within the fog*/
 // ------------------------------------------------------------------------------------------------
-void W3DGhostObject::addToScene(int playerIndex)
+Bool W3DGhostObject::addToScene(int playerIndex)
 {
-	W3DRenderObjectSnapshot *snap=m_parentSnapshots[playerIndex];
+	W3DRenderObjectSnapshot *snap = m_parentSnapshots[playerIndex];
+
+	Bool added = false;
 
 	while (snap)
 	{
-		((SimpleSceneClass *)W3DDisplay::m_3DScene)->Add_Render_Object(snap->m_robj);
-		snap=snap->m_next;
+		added |= snap->addToScene();
+		snap = snap->m_next;
 	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DGhostObject::release(void)
-{
-	W3DRenderObjectSnapshot *snap,*nextSnap;
 
-	for (Int i=0; i<MAX_PLAYER_COUNT; i++)
-	{	snap = m_parentSnapshots[i];
-		while (snap)
-		{
-			nextSnap=snap->m_next;
-			delete snap;
-			snap=nextSnap;
-		}
-		m_parentSnapshots[i]=NULL;
-	}
+	return added;
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void W3DGhostObject::getShroudStatus(int playerIndex)
+ObjectShroudStatus W3DGhostObject::getShroudStatus(int playerIndex)
 {
-	m_partitionData->getShroudedStatus(playerIndex); 
+	return m_partitionData->getShroudedStatus(playerIndex);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -598,11 +590,9 @@ void W3DGhostObject::getShroudStatus(int playerIndex)
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::crc( Xfer *xfer )
 {
-
 	// extend base class
 	GhostObject::crc( xfer );
-
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -611,7 +601,6 @@ void W3DGhostObject::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::xfer( Xfer *xfer )
 {
-
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
@@ -619,7 +608,7 @@ void W3DGhostObject::xfer( Xfer *xfer )
 
 	// extend base class
 	GhostObject::xfer( xfer );
-	
+
 	// xfer the drawable info object id
 	xfer->xferObjectID( &m_drawableInfo.m_shroudStatusObjectID );
 
@@ -631,40 +620,35 @@ void W3DGhostObject::xfer( Xfer *xfer )
 	xfer->xferDrawableID( &drawableID );
 	if( xfer->getXferMode() == XFER_LOAD )
 	{
-
 		// reconnect the drawable pointer
 		m_drawableInfo.m_drawable = TheGameClient->findDrawableByID( drawableID );
 
 		// sanity
 		if( drawableID != INVALID_DRAWABLE_ID && m_drawableInfo.m_drawable == NULL )
-			DEBUG_CRASH(( "W3DGhostObject::xfer - Unable to find drawable for ghost object\n" ));
-
-	}  // end if
+			DEBUG_CRASH(( "W3DGhostObject::xfer - Unable to find drawable for ghost object" ));
+	}
 
 	//
 	// no need to mess with this "circular" back into itself pointer to the ghost object
 	// because it is already valid and assigned upon creation of this ghost object
 	//
 	// m_drawableInfo.m_ghostObject <--- no need to mess with this
-	
+
 	// xfer snapshot array
 	UnsignedByte snapshotCount;
 	for( Int i = 0; i < MAX_PLAYER_COUNT; ++i )
 	{
-
 		// count the snapshots at this index
 		snapshotCount = 0;
 		W3DRenderObjectSnapshot *objectSnapshot = m_parentSnapshots[ i ];
 		while( objectSnapshot )
 		{
-		
 			// increment count
 			snapshotCount++;
 
 			// on to the next snapshot
 			objectSnapshot = objectSnapshot->m_next;
-
-		}  // end while
+		}
 
 		// xfer the snapshot count at this index
 		xfer->xferUnsignedByte( &snapshotCount );
@@ -675,24 +659,21 @@ void W3DGhostObject::xfer( Xfer *xfer )
 		//
 		if( snapshotCount == 0 && m_parentSnapshots[ i ] != NULL )
 		{
-
-			DEBUG_CRASH(( "W3DGhostObject::xfer - m_parentShapshots[ %d ] has data present but the count from the xfer stream is empty\n" ));
+			DEBUG_CRASH(( "W3DGhostObject::xfer - m_parentShapshots[ %d ] has data present but the count from the xfer stream is empty", i ));
 			throw INI_INVALID_DATA;
-
-		}  // end if
+		}
 
 		// xfer each of the snapshots at this index
 		Real scale;
 		UnsignedInt color;
 		AsciiString name;
+
 		if( xfer->getXferMode() == XFER_SAVE )
 		{
-
 			// iterate through list
 			objectSnapshot = m_parentSnapshots[ i ];
 			while( objectSnapshot )
 			{
-
 				// write name from render object
 				name.set( objectSnapshot->m_robj->Get_Name() );
 				xfer->xferAsciiString( &name );
@@ -710,10 +691,8 @@ void W3DGhostObject::xfer( Xfer *xfer )
 
 				// onto the next
 				objectSnapshot = objectSnapshot->m_next;
-
-			}  // end while
-
-		}  // end if, save
+			}
+		}
 		else
 		{
 			RenderObjClass *renderObject;
@@ -721,7 +700,6 @@ void W3DGhostObject::xfer( Xfer *xfer )
 
 			for( UnsignedByte j = 0; j < snapshotCount; ++j )
 			{
-
 				// read render object name
 				xfer->xferAsciiString( &name );
 
@@ -750,19 +728,16 @@ void W3DGhostObject::xfer( Xfer *xfer )
 
 				// add snapshot to the scene
 				objectSnapshot->addToScene();
-										
-			}  // end for, j	
-
-		}  // end else, load
-
-	}  // end for, i
+			}
+		}
+	}
 
 	//
 	// since there is a snapshot for this object, there cannot be a regular object/drawable
 	// in the world, we need to remove it
 	//
-	if( m_parentObject && 
-			m_parentSnapshots[ ThePlayerList->getLocalPlayer()->getPlayerIndex() ] != NULL &&
+	if( m_parentObject &&
+			m_parentSnapshots[TheGhostObjectManager->getLocalPlayerIndex()] != NULL &&
 			xfer->getXferMode() == XFER_LOAD )
 		removeParentObject();
 
@@ -778,15 +753,12 @@ void W3DGhostObject::xfer( Xfer *xfer )
 	ObjectShroudStatus status;
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
-
 		// iterate through all array points
 		for( playerIndex = 0; playerIndex < MAX_PLAYER_COUNT; ++playerIndex )
 		{
-
 			// is this a location with any info
 			if( m_parentSnapshots[ playerIndex ] )
 			{
-
 				// write this index
 				xfer->xferUnsignedByte( &playerIndex );
 
@@ -797,12 +769,9 @@ void W3DGhostObject::xfer( Xfer *xfer )
 				// write previous shroudedness
 				status = m_partitionData->friend_getShroudednessPrevious( playerIndex );
 				xfer->xferUser( &status, sizeof( ObjectShroudStatus ) );
-
-			}  // end if, snapshot list here exists
-
-		}  // end for, i
-
-	}  // end if, save
+			}
+		}
+	}
 	else
 	{
 		UnsignedByte i;
@@ -821,32 +790,25 @@ void W3DGhostObject::xfer( Xfer *xfer )
 			// read shroudedness previous and set
 			xfer->xferUser( &status, sizeof( ObjectShroudStatus ) );
 			m_partitionData->friend_setShroudednessPrevious( playerIndex, status );
-
-		}  // end for, i
-
-	}  // end else load
-		
-}  // end xfer
+		}
+	}
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::loadPostProcess( void )
 {
-
 	// extend base class
 	GhostObject::loadPostProcess();
-
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 W3DGhostObjectManager::W3DGhostObjectManager(void)
 {
-
 	m_freeModules = NULL;
 	m_usedModules = NULL;
-	
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -854,15 +816,15 @@ W3DGhostObjectManager::W3DGhostObjectManager(void)
 W3DGhostObjectManager::~W3DGhostObjectManager()
 {
 	reset();	//make sure it's empty
-	
+
 	W3DGhostObject *mod = m_freeModules;
 	W3DGhostObject *nextmod;
 
 	while (mod)
 	{
-		nextmod=mod->m_nextSystem;
+		nextmod = mod->m_nextSystem;
 		delete mod;
-		mod=nextmod;
+		mod = nextmod;
 	}
 }
 
@@ -870,30 +832,32 @@ W3DGhostObjectManager::~W3DGhostObjectManager()
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObjectManager::reset(void)
 {
+	GhostObjectManager::reset();
+
 	W3DGhostObject *mod = m_usedModules;
 	W3DGhostObject *nextmod;
 
 	//Remove any orphaned modules that were not deleted with their parent object because player had fogged memory of them.
 	while (mod)
 	{
-		nextmod=mod->m_nextSystem;
+		nextmod = mod->m_nextSystem;
 		if (!mod->m_parentObject)	//make sure it has no parent object
 		{
 			ThePartitionManager->unRegisterGhostObject(mod);
 			removeGhostObject(mod);
 		}
-		mod=nextmod;
+		mod = nextmod;
 	}
 
 	DEBUG_ASSERTCRASH(m_usedModules == NULL, ("Reset of Non-Empty GhostObjectManager"));
 
 	//Delete any remaining modules (should be none)
-	mod=m_usedModules;
+	mod = m_usedModules;
 	while (mod)
 	{
-		nextmod=mod->m_nextSystem;
+		nextmod = mod->m_nextSystem;
 		removeGhostObject(mod);
-		mod=nextmod;
+		mod = nextmod;
 	}
 }
 
@@ -928,27 +892,22 @@ void W3DGhostObjectManager::removeGhostObject(GhostObject *object)
 // ------------------------------------------------------------------------------------------------
 GhostObject *W3DGhostObjectManager::addGhostObject(Object *object, PartitionData *pd)
 {
-
 	// we disabled adding new ghost objects - used during map border resizing and loading
 	if (m_lockGhostObjects || m_saveLockGhostObjects )
 		return NULL;
 
-#ifdef DEBUG_FOG_MEMORY
+#if defined(DEBUG_FOG_MEMORY) && defined(DEBUG_CRASHING)
 	// sanity
 	if( object != NULL )
 	{
-
 		W3DGhostObject *sanity = m_usedModules;
 		while( sanity )
 		{
-
-			DEBUG_ASSERTCRASH( sanity->m_parentObject != object,	
-												 ("W3DGhostObjectManager::addGhostObject - Duplicate ghost object detected\n") );
+			DEBUG_ASSERTCRASH( sanity->m_parentObject != object,
+				("W3DGhostObjectManager::addGhostObject - Duplicate ghost object detected") );
 			sanity = sanity->m_nextSystem;
-
-		}  // end while
-
-	}  // end if
+		}
+	}
 #endif
 
 	W3DGhostObject *mod = m_freeModules;
@@ -974,46 +933,75 @@ GhostObject *W3DGhostObjectManager::addGhostObject(Object *object, PartitionData
 	m_usedModules = mod;
 
 	//Copy settings from parent object
-	mod->m_parentObject=object;
-	mod->m_drawableInfo.m_drawable=NULL;	//these dummy render objects don't have drawables.
+	mod->m_parentObject = object;
+	mod->m_drawableInfo.m_drawable = NULL;	//these dummy render objects don't have drawables.
 	mod->m_drawableInfo.m_ghostObject = mod;
-	mod->m_partitionData=pd;
+	mod->m_partitionData = pd;
 
 	return mod;
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void W3DGhostObjectManager::setLocalPlayerIndex(int index)
+void W3DGhostObjectManager::setLocalPlayerIndex(int playerIndex)
 {
+	const int oldPlayerIndex = getLocalPlayerIndex();
+
+	if (playerIndex == oldPlayerIndex)
+		return;
+
+	GhostObjectManager::setLocalPlayerIndex(playerIndex);
+
 	//Whenever we switch local players, we need to remove all ghost objects belonging
 	//to another player from the map.  We then insert the current local player's
 	//ghost objects into the map.
+	// TheSuperHackers @bugfix xezon 06/09/2025 This function now properly
+	// updates ghost objects and real objects when changing players.
 
 	W3DGhostObject *mod = m_usedModules;
 
 	while (mod)
 	{
-		mod->removeFromScene(m_localPlayer);
-		if (mod->m_parentSnapshots[index])
-		{	//new player has his own snapshot
-			if (!mod->m_parentSnapshots[m_localPlayer] && mod->m_parentObject)
-			{	//previous player didn't have a snapshot so real object must
-				//have been in the scene.  Replace it with our snapshot.
-				mod->removeParentObject();
-			}
-			mod->addToScene(index);
+		const Bool oldGhostRemoved = mod->removeFromScene(oldPlayerIndex);
+		const ObjectShroudStatus newShroudStatus = mod->getShroudStatus(playerIndex);
+		Bool newGhostAdded = false;
+
+		if (newShroudStatus >= OBJECTSHROUD_FOGGED)
+		{
+			newGhostAdded = mod->addToScene(playerIndex);
 		}
-		//new player doesn't have a snapshot which means restore original object
-		//if it was replaced by a snapshot by the previous player.
-		else
-		if (mod->m_parentSnapshots[m_localPlayer] && mod->m_parentObject)
+
+		if (oldGhostRemoved && !newGhostAdded)
+		{
 			mod->restoreParentObject();
-	
-		mod=mod->m_nextSystem;
+		}
+		else if (!oldGhostRemoved && newGhostAdded)
+		{
+			mod->removeParentObject();
+		}
+
+		mod = mod->m_nextSystem;
 	}
 
-	m_localPlayer = index;
+	// TheSuperHackers @bugfix xezon 06/09/2025 This function now properly updates
+	// all real objects when changing players without waiting for another logic step.
+	// This is particularly noticeable when changing the player while the game is paused.
+	for (Drawable* draw = TheGameClient->firstDrawable(); draw != NULL; draw = draw->getNextDrawable())
+	{
+		Object* obj = draw->getObject();
+		if (obj == NULL)
+			continue;
+
+		const ObjectShroudStatus shroudStatus = obj->getShroudedStatus(playerIndex);
+		const Bool shrouded = shroudStatus >= OBJECTSHROUD_FOGGED;
+		draw->setFullyObscuredByShroud(shrouded);
+
+		if (shrouded)
+		{
+			// TheSuperHackers @bugfix Definitely keep this shrouded from here on until the shroud becomes clear again.
+			draw->setShroudClearFrame(InvalidShroudClearFrame);
+		}
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -1022,40 +1010,48 @@ a GhostObject in case any players didn't see the death and have a fogged view of
 We need to manually determine if these orphaned GhostObjects ever become visible and are no longer
 needed*/
 // ------------------------------------------------------------------------------------------------
-void W3DGhostObjectManager::updateOrphanedObjects(int *playerIndexList, int numNonLocalPlayers)
+void W3DGhostObjectManager::updateOrphanedObjects(int *playerIndexList, int playerIndexCount)
 {
-
 	W3DGhostObject *mod = m_usedModules, *nextmod;
 	int numStoredSnapshots;
 
 	while (mod)
 	{
-		//updating the shroud status of this ghostobject could remove
+		//updating the shroud status of this ghost object could remove
 		//it from the scene if it becomes visible but parent object is gone.
-		nextmod=mod->m_nextSystem;
+		nextmod = mod->m_nextSystem;
 		if (!mod->m_parentObject)
-		{	
-			numStoredSnapshots=0;
-#ifdef DEBUG_FOG_MEMORY
-			for (int i=0; i<numNonLocalPlayers; i++, playerIndexList++)
+		{
+			numStoredSnapshots = 0;
+
+			if (playerIndexList != NULL && playerIndexCount > 0)
 			{
-				if (mod->m_parentSnapshots[*playerIndexList])
-					mod->getShroudStatus(*playerIndexList);
-				if (mod->m_parentSnapshots[*playerIndexList])
-					numStoredSnapshots++;
+				int* playerIndex = playerIndexList;
+				int* const playerIndexEnd = playerIndexList + playerIndexCount;
+				for (; playerIndex < playerIndexEnd; ++playerIndex)
+				{
+					if (mod->m_parentSnapshots[*playerIndex])
+						mod->getShroudStatus(*playerIndex);
+
+					if (mod->m_parentSnapshots[*playerIndex])
+						numStoredSnapshots++;
+				}
 			}
-#endif
+
 			mod->getShroudStatus(m_localPlayer);
+
 			if (mod->m_parentSnapshots[m_localPlayer])
 					numStoredSnapshots++;
+
 			if (!numStoredSnapshots)
-			{	ThePartitionManager->unRegisterGhostObject(mod);
-				mod->m_partitionData=NULL;
+			{
+				ThePartitionManager->unRegisterGhostObject(mod);
+				mod->m_partitionData = NULL;
 				removeGhostObject(mod);
 			}
 		}
 
-		mod=nextmod;
+		mod = nextmod;
 	}
 }
 
@@ -1071,7 +1067,8 @@ void W3DGhostObjectManager::releasePartitionData(void)
 
 	while (mod)
 	{
-		nextmod=mod->m_nextSystem;
+		nextmod = mod->m_nextSystem;
+
 		//if module has no parent object, then its holding a ghost object which
 		//needs to have it's own partition data.
 		if (!mod->m_parentObject)
@@ -1080,7 +1077,8 @@ void W3DGhostObjectManager::releasePartitionData(void)
 			mod->m_partitionData = NULL;
 		}
 		else
-		{	//The parent object will handle unregistering so just tell to break the
+		{
+			//The parent object will handle unregistering so just tell to break the
 			//ghost object link.
 			mod->friend_getPartitionData()->friend_setGhostObject(NULL);
 			mod->m_partitionData = NULL;
@@ -1100,28 +1098,30 @@ void W3DGhostObjectManager::restorePartitionData(void)
 	while (mod)
 	{
 		nextmod=mod->m_nextSystem;
+
 		//if module has no parent object, then its holding a ghost object which
 		//needs to have it's own partition data.
 		if (mod->m_parentObject)
 		{
 			//restore into parent's partition data
 			mod->m_parentObject->friend_getPartitionData()->friend_setGhostObject(mod);
-			mod->m_partitionData=mod->m_parentObject->friend_getPartitionData();
+			mod->m_partitionData = mod->m_parentObject->friend_getPartitionData();
 		}
 		else
-		{	
+		{
 			//restore into our own partition data
 			ThePartitionManager->registerGhostObject(mod);
 		}
 
 		//set partition data to reflect that we've seen a fogged version
 		//of this object if one exists.
-		for (Int i=0; i<MAX_PLAYER_COUNT; i++)
-		{	if (mod->m_parentSnapshots[i])
+		for (Int i = 0; i < MAX_PLAYER_COUNT; i++)
+		{
+			if (mod->m_parentSnapshots[i])
 				mod->m_partitionData->friend_setShroudednessPrevious(i,OBJECTSHROUD_FOGGED);
 		}
 
-		mod=nextmod;
+		mod = nextmod;
 	}
 }
 
@@ -1130,11 +1130,9 @@ void W3DGhostObjectManager::restorePartitionData(void)
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObjectManager::crc( Xfer *xfer )
 {
-
 	// extend base class
 	GhostObjectManager::crc( xfer );
-
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -1143,7 +1141,6 @@ void W3DGhostObjectManager::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObjectManager::xfer( Xfer *xfer )
 {
-
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
@@ -1165,11 +1162,9 @@ void W3DGhostObjectManager::xfer( Xfer *xfer )
 	ObjectID objectID;
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
-
 		// iterate all ghost objects
 		for( w3dGhostObject = m_usedModules; w3dGhostObject; w3dGhostObject = w3dGhostObject->m_nextSystem )
 		{
-
 			// write out object ID
 			if( w3dGhostObject->m_parentObject )
 				objectID = w3dGhostObject->m_parentObject->getID();
@@ -1179,80 +1174,68 @@ void W3DGhostObjectManager::xfer( Xfer *xfer )
 
 			// write out ghost object data
 			xfer->xferSnapshot( w3dGhostObject );
-
-		}  // end for, ghostObject
-
-	}  // end if, saving
+		}
+	}
 	else
 	{
-
 		// sanity, there should be no ghost objects loaded at this time
-		DEBUG_ASSERTCRASH( m_usedModules == NULL, 
-											 ("W3DGhostObjectManager::xfer - The used module list is not NULL upon load, but should be!\n") );
+		DEBUG_ASSERTCRASH( m_usedModules == NULL,
+			("W3DGhostObjectManager::xfer - The used module list is not NULL upon load, but should be!") );
 
 		// now it's time to unlock the ghost objects for loading
 		DEBUG_ASSERTCRASH( m_saveLockGhostObjects == TRUE,
-											 ("W3DGhostObjectManager::xfer - Ghost object manager is not save locked, but should be\n") );
+			("W3DGhostObjectManager::xfer - Ghost object manager is not save locked, but should be") );
+
 		TheGhostObjectManager->saveLockGhostObjects( FALSE );
 
 		// read all ghost objects
 		GhostObject *ghostObject;
 		Object *object;
+
 		for( UnsignedShort i = 0; i < count; ++i )
 		{
-
 			// read object id
 			xfer->xferObjectID( &objectID );
-					
+
 			// get object from id
 			object = TheGameLogic->findObjectByID( objectID );
 
 			// create ghost object data
 			if( object )
 			{
-				
 				// create ghost object
 				ghostObject = addGhostObject( object, object->friend_getPartitionData() );
 
 				// sanity
-				DEBUG_ASSERTCRASH( ghostObject != NULL, 
-													 ("W3DGhostObjectManager::xfer - Could not create ghost object for object '%s'\n", 
-													 object->getTemplate()->getName().str()) );
+				DEBUG_ASSERTCRASH( ghostObject != NULL,
+					("W3DGhostObjectManager::xfer - Could not create ghost object for object '%s'", object->getTemplate()->getName().str()) );
 
 				// link the ghost object and logical object togehter through partition/ghostObject dat
 				DEBUG_ASSERTCRASH( object->friend_getPartitionData()->getGhostObject() == NULL,
-													 ("W3DGhostObjectManager::xfer - Ghost object already on object '%s'\n",
-													  object->getTemplate()->getName().str()) );
-				object->friend_getPartitionData()->friend_setGhostObject( ghostObject );
+					("W3DGhostObjectManager::xfer - Ghost object already on object '%s'", object->getTemplate()->getName().str()) );
 
-			}  // end if
+				object->friend_getPartitionData()->friend_setGhostObject( ghostObject );
+			}
 			else
 			{
-
 				// create object with no object or partition data
 				ghostObject = addGhostObject( NULL, NULL );
 
 				// register ghost object object with partition system and fill out partition data
 				ThePartitionManager->registerGhostObject( ghostObject );
-
-			}  // end else
+			}
 
 			// read ghost object data
 			xfer->xferSnapshot( ghostObject );
-
-		}  // end for, i
-
-	}  // end else, loading
-
-}  // end xfer
+		}
+	}
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObjectManager::loadPostProcess( void )
 {
-
 	// extend base class
 	GhostObjectManager::loadPostProcess();
-
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
index c5dd176b569..6ece16cdf7a 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
@@ -41,11 +41,6 @@
 #include "GameLogic/AI.h"
 #include "GameLogic/AIPathfind.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -53,8 +48,8 @@ W3DTerrainLogic::W3DTerrainLogic():
 m_mapMinZ(0),
 m_mapMaxZ(1)
 {
-	m_mapData = NULL; 
-}  // end W3DTerrainLogic
+	m_mapData = NULL;
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -63,7 +58,7 @@ W3DTerrainLogic::~W3DTerrainLogic()
 
 	// free terrain data
 
-}  // end W3DTerrainLogic
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Device DEPENDENT implementation init details for logical terrain */
@@ -78,7 +73,7 @@ void W3DTerrainLogic::init( void )
 	m_mapMinZ = 0;
 	m_mapMaxZ = 1;
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -91,7 +86,7 @@ void W3DTerrainLogic::reset( void )
 	m_mapMinZ = 0;
 	m_mapMaxZ = 1;
 	WorldHeightMap::freeListOfMapObjects();
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** newMap */
@@ -101,7 +96,7 @@ void W3DTerrainLogic::newMap( Bool saveGame )
 
 	TheTerrainRenderObject->loadRoadsAndBridges( this, saveGame );
 	TerrainLogic::newMap( saveGame );
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -109,7 +104,7 @@ void W3DTerrainLogic::newMap( Bool saveGame )
 void W3DTerrainLogic::update( void )
 {
 	TerrainLogic::update();
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Device DEPENDENT implementation for load details of logical terrain.
@@ -122,23 +117,6 @@ Bool W3DTerrainLogic::loadMap( AsciiString filename , Bool query )
 
 	WorldHeightMap *terrainHeightMap;				///< holds raw heightmap data samples
 
-	char	tempBuf[_MAX_PATH];
-	char	filenameBuf[_MAX_PATH];
-	int length = 0;
-
-	strcpy(tempBuf, filename.str());
-
-	length = strlen( tempBuf );
-	if( length >= 4 )
-	{
-		memset( filenameBuf, '\0', _MAX_PATH);
-		strncpy( filenameBuf, tempBuf, length - 4);
-	}
-
-//	const char *fname = filename.reverseFind('\\');
-//	if (fname)
-//		filename = fname+1;
-
 	CachedFileInputStream fileStrm;
 	if ( !fileStrm.open(filename) )
 	{
@@ -192,12 +170,12 @@ Bool W3DTerrainLogic::loadMap( AsciiString filename , Bool query )
 
 	return TRUE;  // success
 
-}  // end load
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the 3D extent of the terrain in world coordinates */
 //-------------------------------------------------------------------------------------------------
-void W3DTerrainLogic::getExtent( Region3D *extent ) const 
+void W3DTerrainLogic::getExtent( Region3D *extent ) const
 {
 	extent->lo.x = 0.0f;
 
@@ -205,7 +183,7 @@ void W3DTerrainLogic::getExtent( Region3D *extent ) const
 
 	// Note - m_boundaries are stored in height map grids wide, so we have to
 	// multiply by the grid width.
-	if (m_boundaries.size() > 0) {
+	if (!m_boundaries.empty()) {
 		extent->hi.x = m_boundaries[m_activeBoundary].x*MAP_XY_FACTOR;
 		extent->hi.y = m_boundaries[m_activeBoundary].y*MAP_XY_FACTOR;
 	} else {
@@ -249,7 +227,7 @@ void W3DTerrainLogic::getMaximumPathfindExtent( Region3D *extent ) const
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void W3DTerrainLogic::getExtentIncludingBorder( Region3D *extent ) const 
+void W3DTerrainLogic::getExtentIncludingBorder( Region3D *extent ) const
 {
 	extent->lo.x = 0.0f;
 	extent->lo.y = 0.0f;
@@ -264,10 +242,10 @@ void W3DTerrainLogic::getExtentIncludingBorder( Region3D *extent ) const
 //-------------------------------------------------------------------------------------------------
 Bool W3DTerrainLogic::isClearLineOfSight(const Coord3D& pos, const Coord3D& posOther) const
 {
-	if (TheTerrainRenderObject) 
+	if (TheTerrainRenderObject)
 	{
 		return TheTerrainRenderObject->isClearLineOfSight(pos, posOther);
-	}	
+	}
 	else
 	{
 		return false;
@@ -283,14 +261,14 @@ Real W3DTerrainLogic::getGroundHeight( Real x, Real y, Coord3D* normal ) const
 #ifdef USE_THE_TERRAIN_OBJECT
 	// TheSuperHackers @logic-client-separation helmutbuhler 11/04/2025
 	// W3DTerrainLogic shouldn't depend on TheTerrainRenderObject!
-	if (TheTerrainRenderObject) 
+	if (TheTerrainRenderObject)
 	{
 		return TheTerrainRenderObject->getHeightMapHeight(x,y,normal);
-	}	
-	else 
+	}
+	else
 	{
 		if (normal)
-		{	
+		{
 			//return a default normal pointing up
 			normal->x=0.0f;
 			normal->y=0.0f;
@@ -299,7 +277,7 @@ Real W3DTerrainLogic::getGroundHeight( Real x, Real y, Coord3D* normal ) const
 		return 0;
 	}
 #endif
-}  // end getHight
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the height considering the layer. */
@@ -311,7 +289,7 @@ Real W3DTerrainLogic::getLayerHeight( Real x, Real y, PathfindLayerEnum layer, C
 	if (!TheTerrainRenderObject)
 	{
 		if (normal)
-		{	
+		{
 			//return a default normal pointing up
 			normal->x=0.0f;
 			normal->y=0.0f;
@@ -322,15 +300,15 @@ Real W3DTerrainLogic::getLayerHeight( Real x, Real y, PathfindLayerEnum layer, C
 
 	Real height = TheTerrainRenderObject->getHeightMapHeight(x,y,normal);
 
-	if (layer != LAYER_GROUND) 
+	if (layer != LAYER_GROUND)
 	{
 		Coord3D loc;
 		loc.x = x;
 		loc.y = y;
 		loc.z = height;
-		if (layer == LAYER_WALL) 
+		if (layer == LAYER_WALL)
 		{
-			if (!clip || TheAI->pathfinder()->isPointOnWall(&loc)) 
+			if (!clip || TheAI->pathfinder()->isPointOnWall(&loc))
 			{
 				return TheAI->pathfinder()->getWallHeight();
 			}
@@ -340,10 +318,10 @@ Real W3DTerrainLogic::getLayerHeight( Real x, Real y, PathfindLayerEnum layer, C
 			}
 		}
 		Bridge* pBridge;
-		if ((pBridge = findBridgeLayerAt(&loc, layer, clip)) != 0) 
+		if ((pBridge = findBridgeLayerAt(&loc, layer, clip)) != 0)
 		{
 			Real bridgeHeight = pBridge->getBridgeHeight(&loc, normal);
-			if (bridgeHeight > height) 
+			if (bridgeHeight > height)
 			{
 				return bridgeHeight;	// Don't return bridge height if it's in the ground.
 			}
@@ -353,7 +331,7 @@ Real W3DTerrainLogic::getLayerHeight( Real x, Real y, PathfindLayerEnum layer, C
 	return height;
 
 #endif
-}  // end getLayerHeight
+}
 
 //-------------------------------------------------------------------------------------------------
 /** W3D isCliffCell for terrain logic */
@@ -364,7 +342,7 @@ Bool W3DTerrainLogic::isCliffCell( Real x, Real y) const
 	// W3DTerrainLogic shouldn't depend on TheTerrainRenderObject!
 	return TheTerrainRenderObject->isCliffCell(x,y);
 
-}  // end isCliffCell
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -375,7 +353,7 @@ void W3DTerrainLogic::crc( Xfer *xfer )
 	// extend base class
 	TerrainLogic::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer
@@ -389,11 +367,11 @@ void W3DTerrainLogic::xfer( Xfer *xfer )
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
-	
+
 	// extend base class
 	TerrainLogic::xfer( xfer );
-		
-}  // end xfer
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -404,4 +382,4 @@ void W3DTerrainLogic::loadPostProcess( void )
 	// extend base class
 	TerrainLogic::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp
deleted file mode 100644
index f260af84c3b..00000000000
--- a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-////// Win32BIGFile.cpp /////////////////////////
-// Bryan Cleveland, August 2002
-/////////////////////////////////////////////////////
-
-#include "Common/LocalFile.h"
-#include "Common/LocalFileSystem.h"
-#include "Common/RAMFile.h"
-#include "Common/StreamingArchiveFile.h"
-#include "Common/GameMemory.h"
-#include "Common/PerfTimer.h"
-#include "Win32Device/Common/Win32BIGFile.h"
-
-//============================================================================
-// Win32BIGFile::Win32BIGFile
-//============================================================================
-
-Win32BIGFile::Win32BIGFile()
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::~Win32BIGFile
-//============================================================================
-
-Win32BIGFile::~Win32BIGFile()
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::openFile
-//============================================================================
-
-File* Win32BIGFile::openFile( const Char *filename, Int access ) 
-{
-	const ArchivedFileInfo *fileInfo = getArchivedFileInfo(AsciiString(filename));
-
-	if (fileInfo == NULL) {
-		return NULL;
-	}
-
-	RAMFile *ramFile = NULL;
-	
-	if (BitIsSet(access, File::STREAMING)) 
-		ramFile = newInstance( StreamingArchiveFile );
-	else 
-		ramFile = newInstance( RAMFile );
-
-	ramFile->deleteOnClose();
-	if (ramFile->openFromArchive(m_file, fileInfo->m_filename, fileInfo->m_offset, fileInfo->m_size) == FALSE) {
-		ramFile->close();
-		ramFile = NULL;
-		return NULL;
-	}
-
-	if ((access & File::WRITE) == 0) {
-		// requesting read only access. Just return the RAM file.
-		return ramFile;
-	}
-
-	// whoever is opening this file wants write access, so copy the file to the local disk
-	// and return that file pointer.
-
-	File *localFile = TheLocalFileSystem->openFile(filename, access);
-	if (localFile != NULL) {
-		ramFile->copyDataToFile(localFile);
-	}
-
-	ramFile->close();
-	ramFile = NULL;
-
-	return localFile;
-}
-
-//============================================================================
-// Win32BIGFile::closeAllFiles
-//============================================================================
-
-void Win32BIGFile::closeAllFiles( void )
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::getName
-//============================================================================
-
-AsciiString Win32BIGFile::getName( void )
-{
-	return m_name;
-}
-
-//============================================================================
-// Win32BIGFile::getPath
-//============================================================================
-
-AsciiString Win32BIGFile::getPath( void )
-{
-	return m_path;
-}
-
-//============================================================================
-// Win32BIGFile::setSearchPriority
-//============================================================================
-
-void Win32BIGFile::setSearchPriority( Int new_priority )
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::close
-//============================================================================
-
-void Win32BIGFile::close( void )
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::getFileInfo
-//============================================================================
-
-Bool Win32BIGFile::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const 
-{
-	const ArchivedFileInfo *tempFileInfo = getArchivedFileInfo(filename);
-
-	if (tempFileInfo == NULL) {
-		return FALSE;
-	}
-
-	TheLocalFileSystem->getFileInfo(AsciiString(m_file->getName()), fileInfo);
-
-	// fill in the size info.  Since the size can't be bigger than a JUNK file, the high Int will always be 0.
-	fileInfo->sizeHigh = 0;
-	fileInfo->sizeLow = tempFileInfo->m_size;
-
-	return TRUE;
-}
-
diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
deleted file mode 100644
index 94730ba482e..00000000000
--- a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//////// Win32BIGFileSystem.h ///////////////////////////
-// Bryan Cleveland, August 2002
-/////////////////////////////////////////////////////////////
-
-#include "Common/AudioAffect.h"
-#include "Common/ArchiveFile.h"
-#include "Common/ArchiveFileSystem.h"
-#include "Common/file.h"
-#include "Common/GameAudio.h"
-#include "Common/GameMemory.h"
-#include "Common/LocalFileSystem.h"
-#include "Win32Device/Common/Win32BIGFile.h"
-#include "Win32Device/Common/Win32BIGFileSystem.h"
-#include "Utility/endian_compat.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-static const char *BIGFileIdentifier = "BIGF";
-
-Win32BIGFileSystem::Win32BIGFileSystem() : ArchiveFileSystem() {
-}
-
-Win32BIGFileSystem::~Win32BIGFileSystem() {
-}
-
-void Win32BIGFileSystem::init() {
-	DEBUG_ASSERTCRASH(TheLocalFileSystem != NULL, ("TheLocalFileSystem must be initialized before TheArchiveFileSystem."));
-	if (TheLocalFileSystem == NULL) {
-		return;
-	}
-
-	loadBigFilesFromDirectory("", "*.big");
-}
-
-void Win32BIGFileSystem::reset() {
-}
-
-void Win32BIGFileSystem::update() {
-}
-
-void Win32BIGFileSystem::postProcessLoad() {
-}
-
-ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
-	File *fp = TheLocalFileSystem->openFile(filename, File::READ | File::BINARY);
-	AsciiString archiveFileName;
-	archiveFileName = filename;
-	archiveFileName.toLower();
-	Int archiveFileSize = 0;
-	Int numLittleFiles = 0;
-
-	DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - opening BIG file %s\n", filename));
-
-	if (fp == NULL) {
-		DEBUG_CRASH(("Could not open archive file %s for parsing", filename));
-		return NULL;
-	}
-
-	AsciiString asciibuf;
-	char buffer[_MAX_PATH];
-	fp->read(buffer, 4); // read the "BIG" at the beginning of the file.
-	buffer[4] = 0;
-	if (strcmp(buffer, BIGFileIdentifier) != 0) {
-		DEBUG_CRASH(("Error reading BIG file identifier in file %s", filename));
-		fp->close();
-		fp = NULL;
-		return NULL;
-	}
-
-	// read in the file size.
-	fp->read(&archiveFileSize, 4);
-
-	DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - size of archive file is %d bytes\n", archiveFileSize));
-
-//	char t;
-
-	// read in the number of files contained in this BIG file.
-	// change the order of the bytes cause the file size is in reverse byte order for some reason.
-	fp->read(&numLittleFiles, 4);
-	numLittleFiles = betoh(numLittleFiles);
-
-	DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - %d are contained in archive\n", numLittleFiles));
-//	for (Int i = 0; i < 2; ++i) {
-//		t = buffer[i];
-//		buffer[i] = buffer[(4-i)-1];
-//		buffer[(4-i)-1] = t;
-//	}
-
-	// seek to the beginning of the directory listing.
-	fp->seek(0x10, File::START);
-	// read in each directory listing.
-	ArchivedFileInfo *fileInfo = NEW ArchivedFileInfo;
-	// TheSuperHackers @fix Mauller 23/04/2025 Create new file handle when necessary to prevent memory leak
-	ArchiveFile *archiveFile = NEW Win32BIGFile;
-
-	for (Int i = 0; i < numLittleFiles; ++i) {
-		Int filesize = 0;
-		Int fileOffset = 0;
-		fp->read(&fileOffset, 4);
-		fp->read(&filesize, 4);
-
-		filesize = betoh(filesize);
-		fileOffset = betoh(fileOffset);
-
-		fileInfo->m_archiveFilename = archiveFileName;
-		fileInfo->m_offset = fileOffset;
-		fileInfo->m_size = filesize;
-		
-		// read in the path name of the file.
-		Int pathIndex = -1;
-		do {
-			++pathIndex;
-			fp->read(buffer + pathIndex, 1);
-		} while (buffer[pathIndex] != 0);
-
-		Int filenameIndex = pathIndex;
-		while ((filenameIndex >= 0) && (buffer[filenameIndex] != '\\') && (buffer[filenameIndex] != '/')) {
-			--filenameIndex;
-		}
-
-		fileInfo->m_filename = (char *)(buffer + filenameIndex + 1);
-		fileInfo->m_filename.toLower();
-		buffer[filenameIndex + 1] = 0;
-
-		AsciiString path;
-		path = buffer;
-
-		AsciiString debugpath;
-		debugpath = path;
-		debugpath.concat(fileInfo->m_filename);
-//		DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - adding file %s to archive file %s, file number %d\n", debugpath.str(), fileInfo->m_archiveFilename.str(), i));
-
-		archiveFile->addFile(path, fileInfo);
-	}
-
-	archiveFile->attachFile(fp);
-
-	delete fileInfo;
-	fileInfo = NULL;
-
-	// leave fp open as the archive file will be using it.
-
-	return archiveFile;
-}
-
-void Win32BIGFileSystem::closeArchiveFile(const Char *filename) {
-	// Need to close the specified big file
-	ArchiveFileMap::iterator it =  m_archiveFileMap.find(filename);
-	if (it == m_archiveFileMap.end()) {
-		return;
-	}
-
-	if (stricmp(filename, MUSIC_BIG) == 0) {
-		// Stop the current audio
-		TheAudio->stopAudio(AudioAffect_Music);
-
-		// No need to turn off other audio, as the lookups will just fail.
-	}
-	DEBUG_ASSERTCRASH(stricmp(filename, MUSIC_BIG) == 0, ("Attempting to close Archive file '%s', need to add code to handle its shutdown correctly.", filename));
-
-	// may need to do some other processing here first.
-	
-	delete (it->second);
-	m_archiveFileMap.erase(it);
-}
-
-void Win32BIGFileSystem::closeAllArchiveFiles() {
-}
-
-void Win32BIGFileSystem::closeAllFiles() {
-}
-
-Bool Win32BIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite) {
-
-	FilenameList filenameList;
-	TheLocalFileSystem->getFileListInDirectory(dir, AsciiString(""), fileMask, filenameList, TRUE);
-
-	Bool actuallyAdded = FALSE;
-	FilenameListIter it = filenameList.begin();
-	while (it != filenameList.end()) {
-		ArchiveFile *archiveFile = openArchiveFile((*it).str());
-
-		if (archiveFile != NULL) {
-			DEBUG_LOG(("Win32BIGFileSystem::loadBigFilesFromDirectory - loading %s into the directory tree.\n", (*it).str()));
-			loadIntoDirectoryTree(archiveFile, *it, overwrite);
-			m_archiveFileMap[(*it)] = archiveFile;
-			DEBUG_LOG(("Win32BIGFileSystem::loadBigFilesFromDirectory - %s inserted into the archive file map.\n", (*it).str()));
-			actuallyAdded = TRUE;
-		}
-
-		it++;
-	}
-
-	return actuallyAdded;
-}
diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32CDManager.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32CDManager.cpp
index b0cb3445b78..d15828036cc 100644
--- a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32CDManager.cpp
+++ b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32CDManager.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   Generals
@@ -42,7 +42,7 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include "windows.h"
@@ -53,49 +53,49 @@
 #include "Win32Device/Common/Win32CDManager.h"
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 
@@ -140,8 +140,8 @@ void Win32CDDrive::refreshInfo( void )
 	{
 		m_diskName.clear();
 		m_disk = CD::NO_DISK;
-		
-		if (mayRequireUpdate) 
+
+		if (mayRequireUpdate)
 			TheFileSystem->unloadMusicFilesFromCD();
 	}
 
diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32GameEngine.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32GameEngine.cpp
index 0844c7fb55b..03801ec67a7 100644
--- a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32GameEngine.cpp
+++ b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32GameEngine.cpp
@@ -25,7 +25,7 @@
 // FILE: W3DGameEngine.cpp ////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, April 2001
 // Description:
-//   Implementation of the Win32 game engine, this is the highest level of 
+//   Implementation of the Win32 game engine, this is the highest level of
 //   the game application, it creates all the devices we will use for the game
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -65,7 +65,7 @@ void Win32GameEngine::init( void )
 	// extending functionality
 	GameEngine::init();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the system */
@@ -76,10 +76,10 @@ void Win32GameEngine::reset( void )
 	// extending functionality
 	GameEngine::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Update the game engine by updating the GameClient and 
+/** Update the game engine by updating the GameClient and
 	* GameLogic singletons. */
 //-------------------------------------------------------------------------------------------------
 void Win32GameEngine::update( void )
@@ -105,7 +105,7 @@ void Win32GameEngine::update( void )
 			}
 
 			// If we are running a multiplayer game, keep running the logic.
-			// There is code in the client to skip client redraw if we are 
+			// There is code in the client to skip client redraw if we are
 			// iconic.  jba.
 			if (TheGameEngine->getQuitting() || TheGameLogic->isInInternetGame() || TheGameLogic->isInLanGame()) {
 				break; // keep running.
@@ -116,7 +116,7 @@ void Win32GameEngine::update( void )
 	// allow windows to perform regular windows maintenance stuff like msgs
 	serviceWindowsOS();
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This function may be called from within this application to let
@@ -156,8 +156,8 @@ void Win32GameEngine::serviceWindowsOS( void )
 		TranslateMessage( &msg );
 		DispatchMessage( &msg );
 		TheMessageTime = 0;
-			
-	}  // end while
 
-}  // end ServiceWindowsOS
+	}
+
+}
 
diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32LocalFile.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32LocalFile.cpp
deleted file mode 100644
index a7bca23c87d..00000000000
--- a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32LocalFile.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//////// Win32LocalFile.cpp ///////////////////////////
-// Bryan Cleveland, August 2002
-///////////////////////////////////////////////////////
-
-#include "Win32Device/Common/Win32LocalFile.h"
-
-Win32LocalFile::Win32LocalFile() : LocalFile() {
-}
-
-Win32LocalFile::~Win32LocalFile() {
-}
diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp
deleted file mode 100644
index 3c274e4b9ed..00000000000
--- a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////// Win32LocalFileSystem.cpp /////////////////////////
-// Bryan Cleveland, August 2002
-////////////////////////////////////////////////////////////
-
-#include <windows.h>
-#include "Common/AsciiString.h"
-#include "Common/GameMemory.h"
-#include "Common/PerfTimer.h"
-#include "Win32Device/Common/Win32LocalFileSystem.h"
-#include "Win32Device/Common/Win32LocalFile.h"
-#include <io.h>
-
-Win32LocalFileSystem::Win32LocalFileSystem() : LocalFileSystem() 
-{
-}
-
-Win32LocalFileSystem::~Win32LocalFileSystem() {
-}
-
-//DECLARE_PERF_TIMER(Win32LocalFileSystem_openFile)
-File * Win32LocalFileSystem::openFile(const Char *filename, Int access /* = 0 */) 
-{
-	//USE_PERF_TIMER(Win32LocalFileSystem_openFile)
-
-	// sanity check
-	if (strlen(filename) <= 0) {
-		return NULL;
-	}
-
-	if (access & File::WRITE) {
-		// if opening the file for writing, we need to make sure the directory is there
-		// before we try to create the file.
-		AsciiString string;
-		string = filename;
-		AsciiString token;
-		AsciiString dirName;
-		string.nextToken(&token, "\\/");
-		dirName = token;
-		while ((token.find('.') == NULL) || (string.find('.') != NULL)) {
-			createDirectory(dirName);
-			string.nextToken(&token, "\\/");
-			dirName.concat('\\');
-			dirName.concat(token);
-		}
-	}
-
-	// TheSuperHackers @fix Mauller 21/04/2025 Create new file handle when necessary to prevent memory leak
-	Win32LocalFile *file = newInstance( Win32LocalFile );	
-
-	if (file->open(filename, access) == FALSE) {
-		file->close();
-		deleteInstance(file);
-		file = NULL;
-	} else {
-		file->deleteOnClose();
-	}
-
-// this will also need to play nice with the STREAMING type that I added, if we ever enable this
-
-// srj sez: this speeds up INI loading, but makes BIG files unusable. 
-// don't enable it without further tweaking.
-//
-// unless you like running really slowly.
-//	if (!(access&File::WRITE)) {
-//		// Return a ramfile.
-//		RAMFile *ramFile = newInstance( RAMFile );
-//		if (ramFile->open(file)) {
-//			file->close(); // is deleteonclose, so should delete.
-//			ramFile->deleteOnClose();
-//			return ramFile;
-//		}	else {
-//			ramFile->close();
-//			deleteInstance(ramFile);
-//		}
-//	}
-
-	return file;
-}
-
-void Win32LocalFileSystem::update() 
-{
-}
-
-void Win32LocalFileSystem::init() 
-{
-}
-
-void Win32LocalFileSystem::reset() 
-{
-}
-
-//DECLARE_PERF_TIMER(Win32LocalFileSystem_doesFileExist)
-Bool Win32LocalFileSystem::doesFileExist(const Char *filename) const
-{
-	//USE_PERF_TIMER(Win32LocalFileSystem_doesFileExist)
-	if (_access(filename, 0) == 0) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-void Win32LocalFileSystem::getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList & filenameList, Bool searchSubdirectories) const
-{
-	HANDLE fileHandle = NULL;
-	WIN32_FIND_DATA findData;
-
-	char search[_MAX_PATH];
-	AsciiString asciisearch;
-	asciisearch = originalDirectory;
-	asciisearch.concat(currentDirectory);
-	asciisearch.concat(searchName);
-	strcpy(search, asciisearch.str());
-
-	Bool done = FALSE;
-
-	fileHandle = FindFirstFile(search, &findData);
-	done = (fileHandle == INVALID_HANDLE_VALUE);
-
-	while (!done)	{
-		if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-				(strcmp(findData.cFileName, ".") && strcmp(findData.cFileName, ".."))) {
-			// if we haven't already, add this filename to the list.
-				// a stl set should only allow one copy of each filename
-				AsciiString newFilename;
-				newFilename = originalDirectory;
-				newFilename.concat(currentDirectory);
-				newFilename.concat(findData.cFileName);
-				if (filenameList.find(newFilename) == filenameList.end()) {
-					filenameList.insert(newFilename);
-				}
-		}
-
-		done = (FindNextFile(fileHandle, &findData) == 0);
-	}
-	FindClose(fileHandle);
-
-	if (searchSubdirectories) {
-		AsciiString subdirsearch;
-		subdirsearch = originalDirectory;
-		subdirsearch.concat(currentDirectory);
-		subdirsearch.concat("*.");
-		fileHandle = FindFirstFile(subdirsearch.str(), &findData);
-		done = fileHandle == INVALID_HANDLE_VALUE;
-
-		while (!done) {
-			if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-					(strcmp(findData.cFileName, ".") && strcmp(findData.cFileName, ".."))) {
-
-					AsciiString tempsearchstr;
-					tempsearchstr.concat(currentDirectory);
-					tempsearchstr.concat(findData.cFileName);
-					tempsearchstr.concat('\\');
-					
-					// recursively add files in subdirectories if required.
-					getFileListInDirectory(tempsearchstr, originalDirectory, searchName, filenameList, searchSubdirectories);
-			}
-
-			done = (FindNextFile(fileHandle, &findData) == 0);
-		}
-
-		FindClose(fileHandle);
-	}
-
-}
-
-Bool Win32LocalFileSystem::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const 
-{
-	WIN32_FIND_DATA findData;
-	HANDLE findHandle = NULL;
-	findHandle = FindFirstFile(filename.str(), &findData);
-
-	if (findHandle == INVALID_HANDLE_VALUE) {
-		return FALSE;
-	}
-
-	fileInfo->timestampHigh = findData.ftLastWriteTime.dwHighDateTime;
-	fileInfo->timestampLow = findData.ftLastWriteTime.dwLowDateTime;
-	fileInfo->sizeHigh = findData.nFileSizeHigh;
-	fileInfo->sizeLow = findData.nFileSizeLow;
-
-	FindClose(findHandle);
-
-	return TRUE;
-}
-
-Bool Win32LocalFileSystem::createDirectory(AsciiString directory) 
-{
-	if ((directory.getLength() > 0) && (directory.getLength() < _MAX_DIR)) {
-		return (CreateDirectory(directory.str(), NULL) != 0);
-	}
-	return FALSE;
-}
diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp
index 761a98b7857..3511d609d78 100644
--- a/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp
+++ b/Generals/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp
@@ -37,10 +37,6 @@
 #include "Common/UnicodeString.h"
 #include "GameClient/GameText.h"
 
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 extern HWND ApplicationHWnd;
@@ -53,7 +49,7 @@ static void RTSFlagsToOSFlags(UnsignedInt buttonFlags, UnsignedInt otherFlags, U
 	if (BitIsSet(buttonFlags, OSDBT_OK)) {
 		outWindowsFlags |= MB_OK;
 	}
-	
+
 	if (BitIsSet(buttonFlags, OSDBT_CANCEL)) {
 		outWindowsFlags |= MB_OKCANCEL;
 	}
@@ -101,17 +97,17 @@ OSDisplayButtonType OSDisplayWarningBox(AsciiString p, AsciiString m, UnsignedIn
 
 	UnsignedInt windowsOptionsFlags = 0;
 	RTSFlagsToOSFlags(buttonFlags, otherFlags, windowsOptionsFlags);
-	
+
 	// @todo Make this return more than just ok/cancel - jkmcd
 	// (we need a function to translate back the other way.)
 	Int returnResult = 0;
-	if (TheSystemIsUnicode) 
+	if (TheSystemIsUnicode)
 	{
 		returnResult = ::MessageBoxW(NULL, mesgStr.str(), promptStr.str(), windowsOptionsFlags);
-	} 
-	else 
+	}
+	else
 	{
-		// However, if we're using the default version of the message box, we need to 
+		// However, if we're using the default version of the message box, we need to
 		// translate the string into an AsciiString
 		AsciiString promptA, mesgA;
 		promptA.translate(promptStr);
@@ -123,7 +119,17 @@ OSDisplayButtonType OSDisplayWarningBox(AsciiString p, AsciiString m, UnsignedIn
 
 	if (returnResult == IDOK) {
 		return OSDBT_OK;
-	} 
+	}
 
 	return OSDBT_CANCEL;
 }
+
+//-------------------------------------------------------------------------------------------------
+void OSDisplaySetBusyState(Bool busyDisplay, Bool busySystem)
+{
+	EXECUTION_STATE state = ES_CONTINUOUS;
+	state |= busyDisplay ? ES_DISPLAY_REQUIRED : 0;
+	state |= busySystem ? ES_SYSTEM_REQUIRED : 0;
+
+	::SetThreadExecutionState(state);
+}
diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIKeyboard.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIKeyboard.cpp
index be810e08d64..f0b7d39b155 100644
--- a/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIKeyboard.cpp
+++ b/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIKeyboard.cpp
@@ -47,7 +47,7 @@ struct ErrorLookup
 	HRESULT error;
 	const char *string;
 };
-static ErrorLookup errorLookup[] = 
+static ErrorLookup errorLookup[] =
 {
 { (HRESULT)DIERR_ACQUIRED, "DIERR_ACQUIRED" },
 { (HRESULT)DIERR_ALREADYINITIALIZED, "DIERR_ALREADYINITIALIZED" },
@@ -73,7 +73,7 @@ static ErrorLookup errorLookup[] =
 { (HRESULT)DIERR_NOTFOUND, "DIERR_NOTFOUND" },
 { (HRESULT)DIERR_NOTINITIALIZED, "DIERR_NOTINITIALIZED" },
 { (HRESULT)DIERR_OBJECTNOTFOUND, "DIERR_OBJECTNOTFOUND" },
-{ (HRESULT)DIERR_OLDDIRECTINPUTVERSION, "DIERR_OLDDIRECTINPUTVERSION" }, 
+{ (HRESULT)DIERR_OLDDIRECTINPUTVERSION, "DIERR_OLDDIRECTINPUTVERSION" },
 { (HRESULT)DIERR_OTHERAPPHASPRIO, "DIERR_OTHERAPPHASPRIO" },
 { (HRESULT)DIERR_OUTOFMEMORY, "DIERR_OUTOFMEMORY" },
 { (HRESULT)DIERR_READONLY, "DIERR_READONLY" },
@@ -100,14 +100,14 @@ static void printReturnCode( char *label, HRESULT hr )
 
 		if( error->error == hr )
 		{
-			DEBUG_LOG(( "%s: '%s' - '0x%08x'\n", label, error->string, hr ));
+			DEBUG_LOG(( "%s: '%s' - '0x%08x'", label, error->string, hr ));
 			break;
 		}
 		error++;
 
 	}
 
-}  // end printReturnCode
+}
 
 //-------------------------------------------------------------------------------------------------
 /** create our interface to the direct input keybard */
@@ -119,18 +119,18 @@ void DirectInputKeyboard::openKeyboard( void )
 	// create our interface to direct input
 	hr = DirectInput8Create( ApplicationHInstance,
 													 DIRECTINPUT_VERSION,
-													 IID_IDirectInput8, 
+													 IID_IDirectInput8,
 													 (void **)&m_pDirectInput,
 													 NULL );
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openKeyboard: DirectInputCreate failed\r\n" ));
+		DEBUG_LOG(( "ERROR - openKeyboard: DirectInputCreate failed" ));
 		assert( 0 );
 		closeKeyboard();
 		return;
 
-	}  // end if
+	}
 
 	// obtain an interface to the system keyboard device
 	hr = m_pDirectInput->CreateDevice( GUID_SysKeyboard,
@@ -139,42 +139,42 @@ void DirectInputKeyboard::openKeyboard( void )
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openKeyboard: Unabled to create keyboard device\n" ));
+		DEBUG_LOG(( "ERROR - openKeyboard: Unabled to create keyboard device" ));
 		assert( 0 );
 		closeKeyboard();
 		return;
 
-	}  // end if
+	}
 
 	// set the data format for the keyboard
 	hr = m_pKeyboardDevice->SetDataFormat( &c_dfDIKeyboard );
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openKeyboard: Unabled to set data format for keyboard\n" ));
+		DEBUG_LOG(( "ERROR - openKeyboard: Unabled to set data format for keyboard" ));
 		assert( 0 );
 		closeKeyboard();
 		return;
 
-	}  // end if
+	}
 
 	/// @todo Check the cooperative level of keyboard for NT, 2000, DX8 etc ...
 	// set the cooperative level for the keyboard, must be non-exclusive for
 	// NT support, but we should check with the latest versions of DirectX
 	// on 2000 etc
 	//
-	hr = m_pKeyboardDevice->SetCooperativeLevel( ApplicationHWnd, 
-																							 DISCL_FOREGROUND | 
+	hr = m_pKeyboardDevice->SetCooperativeLevel( ApplicationHWnd,
+																							 DISCL_FOREGROUND |
 																							 DISCL_NONEXCLUSIVE );
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openKeyboard: Unabled to set cooperative level\n" ));
+		DEBUG_LOG(( "ERROR - openKeyboard: Unabled to set cooperative level" ));
 		assert( 0 );
 		closeKeyboard();
 		return;
 
-	}  // end if
+	}
 
   // set the keyboard buffer size
 	DIPROPDWORD prop;
@@ -187,29 +187,29 @@ void DirectInputKeyboard::openKeyboard( void )
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openKeyboard: Unable to set keyboard buffer size property\n" ));
+		DEBUG_LOG(( "ERROR - openKeyboard: Unable to set keyboard buffer size property" ));
 		assert( 0 );
 		closeKeyboard();
 		return;
 
-	}  // end if
+	}
 
 	// acquire the keyboard
 	hr = m_pKeyboardDevice->Acquire();
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openKeyboard: Unable to acquire keyboard device\n" ));
-		// Note - This can happen in windowed mode, and we can re-acquire later.  So don't 
+		DEBUG_LOG(( "ERROR - openKeyboard: Unable to acquire keyboard device" ));
+		// Note - This can happen in windowed mode, and we can re-acquire later.  So don't
 		// close the keyboard. jba.
 		// closeKeyboard();
 		return;
 
-	}  // end if
+	}
 
-	DEBUG_LOG(( "OK - Keyboard initialized successfully.\n" ));
+	DEBUG_LOG(( "OK - Keyboard initialized successfully." ));
 
-}  // end openKeyboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** close the direct input keyboard */
@@ -223,21 +223,21 @@ void DirectInputKeyboard::closeKeyboard( void )
 		m_pKeyboardDevice->Unacquire();
 		m_pKeyboardDevice->Release();
 		m_pKeyboardDevice = NULL;
-		DEBUG_LOG(( "OK - Keyboard deviced closed\n" ));
+		DEBUG_LOG(( "OK - Keyboard deviced closed" ));
 
-	}  // end if
+	}
 	if( m_pDirectInput )
 	{
 
 		m_pDirectInput->Release();
 		m_pDirectInput = NULL;
-		DEBUG_LOG(( "OK - Keyboard direct input interface closed\n" ));
+		DEBUG_LOG(( "OK - Keyboard direct input interface closed" ));
 
-	}  // end if
+	}
 
-	DEBUG_LOG(( "OK - Keyboard shutdown complete\n" ));
+	DEBUG_LOG(( "OK - Keyboard shutdown complete" ));
 
-}  // end closeKeyboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get a single keyboard event from direct input */
@@ -251,7 +251,6 @@ void DirectInputKeyboard::getKey( KeyboardIO *key )
 	HRESULT hr;
 
 	assert( key );
-	key->sequence = 0;
 	key->key = KEY_NONE;
 
 	if( m_pKeyboardDevice )
@@ -296,9 +295,9 @@ void DirectInputKeyboard::getKey( KeyboardIO *key )
 
 						break;
 
-					}  // end, got the keyboard back OK
+					}
 
-				}  // end switch
+				}
 
 				return;
 
@@ -306,7 +305,7 @@ void DirectInputKeyboard::getKey( KeyboardIO *key )
 			default:
 				return;
 
-		}  // end switch( hr )
+		}
 
 		// no keys returned
 		if( num == 0 )
@@ -315,22 +314,27 @@ void DirectInputKeyboard::getKey( KeyboardIO *key )
 		// set the key
 		key->key = (UnsignedByte)(kbdat.dwOfs & 0xFF);
 
-		// sequence
-		key->sequence = kbdat.dwSequence;
-
 		//
 		// state of key, note we are setting the key state here with an assignment
 		// and not a bit set of the up/down state, this is the "start"
 		// of building this "key"
 		//
-		key->state = (( kbdat.dwData & 0x0080 ) ? KEY_STATE_DOWN : KEY_STATE_UP);
+		if( kbdat.dwData & 0x0080 )
+		{
+			key->state = KEY_STATE_DOWN;
+			key->keyDownTimeMsec = kbdat.dwTimeStamp;
+		}
+		else
+		{
+			key->state = KEY_STATE_UP;
+		}
 
 		// set status as unused (unprocessed)
 		key->status = KeyboardIO::STATUS_UNUSED;
 
-	}  // end if, we have a DI keyboard device
+	}
 
-}  // end getKey
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -354,7 +358,7 @@ DirectInputKeyboard::DirectInputKeyboard( void )
 		m_modifiers &= ~KEY_STATE_CAPSLOCK;
 	}
 
-}  // end DirectInputKeyboard
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -364,7 +368,7 @@ DirectInputKeyboard::~DirectInputKeyboard( void )
 	// close keyboard and release all resource
 	closeKeyboard();
 
-}  // end ~DirectInputKeyboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** initialize the keyboard */
@@ -378,7 +382,7 @@ void DirectInputKeyboard::init( void )
 	// open the direct input keyboard
 	openKeyboard();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset keyboard system */
@@ -389,7 +393,7 @@ void DirectInputKeyboard::reset( void )
 	// extend functionality
 	Keyboard::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** called once per frame to update the keyboard state */
@@ -409,10 +413,10 @@ void DirectInputKeyboard::update( void )
 		m_pKeyboardDevice->GetDeviceData( sizeof( DIDEVICEOBJECTDATA ),
 																			NULL, &items, 0 );
 
-	}  // end if
+	}
 */
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return TRUE if the caps lock key is down/hilighted */
@@ -422,4 +426,4 @@ Bool DirectInputKeyboard::getCapsState( void )
 
 	return BitIsSet( GetKeyState( VK_CAPITAL ), 0X01);
 
-}  // end getCapsState
+}
diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp
index 233a605ce8b..0df595f04ca 100644
--- a/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp
+++ b/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp
@@ -54,12 +54,12 @@ void DirectInputMouse::openMouse( void )
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openMouse: Unabled to create direct input interface\n" ));
+		DEBUG_LOG(( "ERROR - openMouse: Unabled to create direct input interface" ));
 		assert( 0 );
 		closeMouse();
 		return;
 
-	}  // end if
+	}
 
 	// create a device for the system mouse
 	hr = m_pDirectInput->CreateDevice( GUID_SysMouse,
@@ -68,24 +68,24 @@ void DirectInputMouse::openMouse( void )
 	if( FAILED( hr ) )
 	{
 
-			DEBUG_LOG(( "ERROR - openMouse: Unable to create mouse device\n" ));
+			DEBUG_LOG(( "ERROR - openMouse: Unable to create mouse device" ));
 			assert( 0 );
 			closeMouse();
 			return;
 
-	}  // end if
+	}
 
 	// set the data format for the mouse
 	hr = m_pMouseDevice->SetDataFormat( &c_dfDIMouse );
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openMouse: Unabled to set mouse data format\n" ));
+		DEBUG_LOG(( "ERROR - openMouse: Unabled to set mouse data format" ));
 		assert( 0 );
 		closeMouse();
 		return;
 
-	}  // end if
+	}
 
 	// set the mouse cooperative level
 	hr = m_pMouseDevice->SetCooperativeLevel( ApplicationHWnd,
@@ -94,15 +94,15 @@ void DirectInputMouse::openMouse( void )
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openMouse: Unabled to set coop level\n" ));
+		DEBUG_LOG(( "ERROR - openMouse: Unabled to set coop level" ));
 		assert( 0 );
 		closeMouse();
 		return;
 
-	}  // end if
+	}
 
 	// set the mouse buffer size
-	DIPROPDWORD prop;		
+	DIPROPDWORD prop;
 	prop.diph.dwSize = sizeof( DIPROPDWORD );
 	prop.diph.dwHeaderSize = sizeof( DIPROPHEADER );
 	prop.diph.dwObj = 0;
@@ -112,24 +112,24 @@ void DirectInputMouse::openMouse( void )
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openMouse: Unabled to set buffer property\n" ));
+		DEBUG_LOG(( "ERROR - openMouse: Unabled to set buffer property" ));
 		assert( 0 );
 		closeMouse();
 		return;
 
-	}  // end if
+	}
 
 	// acquire the mouse
 	hr = m_pMouseDevice->Acquire();
 	if( FAILED( hr ) )
 	{
-	
-		DEBUG_LOG(( "ERROR - openMouse: Unabled to acquire mouse\n" ));
+
+		DEBUG_LOG(( "ERROR - openMouse: Unabled to acquire mouse" ));
 		assert( 0 );
 		closeMouse();
 		return;
 
-	}  // end if
+	}
 
 	// get some information about the mouse
 	DIDEVCAPS diDevCaps;
@@ -139,9 +139,9 @@ void DirectInputMouse::openMouse( void )
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "WARNING - openMouse: Cann't get capabilities of mouse for button setup\n" ));
+		DEBUG_LOG(( "WARNING - openMouse: Cann't get capabilities of mouse for button setup" ));
 
-	}  // end if
+	}
 	else
 	{
 
@@ -150,14 +150,14 @@ void DirectInputMouse::openMouse( void )
 		m_numAxes = (UnsignedByte)diDevCaps.dwAxes;
 		m_forceFeedback = BitIsSet( diDevCaps.dwFlags, DIDC_FORCEFEEDBACK );
 
-		DEBUG_LOG(( "OK - Mouse info: Buttons = '%d', Force Feedback = '%s', Axes = '%d'\n",
+		DEBUG_LOG(( "OK - Mouse info: Buttons = '%d', Force Feedback = '%s', Axes = '%d'",
 						 m_numButtons, m_forceFeedback ? "Yes" : "No", m_numAxes ));
 
-	}  // end else
-	
-	DEBUG_LOG(( "OK - Mouse initialized successfully\n" ));
+	}
 
-}  // end openMouse
+	DEBUG_LOG(( "OK - Mouse initialized successfully" ));
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Release any resources for our direct input mouse */
@@ -172,9 +172,9 @@ void DirectInputMouse::closeMouse( void )
 		m_pMouseDevice->Unacquire();
 		m_pMouseDevice->Release();
 		m_pMouseDevice = NULL;
-		DEBUG_LOG(( "OK - Mouse device closed\n" ));
+		DEBUG_LOG(( "OK - Mouse device closed" ));
 
-	}  // end if
+	}
 
 	// release our direct input interface for the mouse
 	if( m_pDirectInput )
@@ -182,13 +182,13 @@ void DirectInputMouse::closeMouse( void )
 
 		m_pDirectInput->Release();
 		m_pDirectInput = NULL;
-		DEBUG_LOG(( "OK - Mouse direct input interface closed\n" ));
+		DEBUG_LOG(( "OK - Mouse direct input interface closed" ));
 
-	}  // end if
+	}
 
-	DEBUG_LOG(( "OK - Mouse shutdown complete\n" ));
+	DEBUG_LOG(( "OK - Mouse shutdown complete" ));
 
-}  // end closeMouse
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get a single mouse event from the device */
@@ -202,7 +202,7 @@ UnsignedByte DirectInputMouse::getMouseEvent( MouseIO *result, Bool flush )
 
 	/* set these to defaults */
 	result->leftState = result->middleState = result->rightState = FALSE;
-	result->leftFrame = result->middleFrame = result->rightFrame = 0;
+	result->leftState = result->middleState = result->rightState = MBS_None;
 	result->pos.x = result->pos.y = result->wheelPos = 0;
 
 	if( m_pMouseDevice )
@@ -254,7 +254,7 @@ UnsignedByte DirectInputMouse::getMouseEvent( MouseIO *result, Bool flush )
 					default:
 						break;
 
-				}  // end switch
+				}
 
 				break;
 			}
@@ -264,36 +264,33 @@ UnsignedByte DirectInputMouse::getMouseEvent( MouseIO *result, Bool flush )
 //				DBGPRINTF(("GetMouseEvent: GetDeviceData Error: %X.\r\n", hr ));
 				break;
 
-		}  // end switch
+		}
 
-	}  // end if
+	}
 
 	return mouseResult;
 
-}  // end getMouseEvent
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Map the direct input codes to our own mouse format */
 //-------------------------------------------------------------------------------------------------
-void DirectInputMouse::mapDirectInputMouse( MouseIO *mouse, 
+void DirectInputMouse::mapDirectInputMouse( MouseIO *mouse,
 																						DIDEVICEOBJECTDATA *mdat )
 {
 
 	switch( mdat->dwOfs )
 	{
 		case DIMOFS_BUTTON0:
-			mouse->leftState = (( mdat->dwData & 0x0080 ) ? TRUE : FALSE);
-			mouse->leftFrame = mdat->dwSequence;
+			mouse->leftState = (( mdat->dwData & 0x0080 ) ? MBS_Down : MBS_Up);
 			break;
 
 		case DIMOFS_BUTTON1:
-			mouse->rightState = (( mdat->dwData & 0x0080 ) ? TRUE : FALSE);
-			mouse->rightFrame = mdat->dwSequence;
+			mouse->rightState = (( mdat->dwData & 0x0080 ) ? MBS_Down : MBS_Up);
 			break;
 
 		case DIMOFS_BUTTON2:
-			mouse->middleState = (( mdat->dwData & 0x0080 ) ? TRUE : FALSE);
-			mouse->middleFrame = mdat->dwSequence;
+			mouse->middleState = (( mdat->dwData & 0x0080 ) ? MBS_Down : MBS_Up);
 			break;
 
 		case DIMOFS_BUTTON3:
@@ -312,7 +309,7 @@ void DirectInputMouse::mapDirectInputMouse( MouseIO *mouse,
 			break;
 	}
 
-}  // end mapDirectInputMouse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -326,7 +323,7 @@ DirectInputMouse::DirectInputMouse( void )
 	m_pDirectInput = NULL;
 	m_pMouseDevice = NULL;
 
-}  // end DirectInputMouse
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -337,7 +334,7 @@ DirectInputMouse::~DirectInputMouse( void )
 	closeMouse();
 //	ShowCursor( TRUE );
 
-}  // end ~DirectInputMouse
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the direct input mouse device */
@@ -359,7 +356,7 @@ void DirectInputMouse::init( void )
 	SetCursorPos( p.x, p.y );
 //	ShowCursor( FALSE );
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset direct input mouse */
@@ -370,7 +367,7 @@ void DirectInputMouse::reset( void )
 	// extend
 	Mouse::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update the mouse position and button data, this is called once per
@@ -396,7 +393,7 @@ void DirectInputMouse::update( void )
 	ScreenToClient( ApplicationHWnd, &p );
 	moveMouse( p.x, p.y, MOUSE_MOVE_ABSOLUTE );
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the limits which the mouse is allowed to move around in.  We
@@ -424,13 +421,13 @@ void DirectInputMouse::setMouseLimits( void )
 
 		// get the window rect
 		GetWindowRect( ApplicationHWnd, &windowRect );
-	
+
 		// keep the cursor clipped to these coords when running windowed
 		ClipCursor( &windowRect );
 
-	}  // end if
+	}
 
-}  // end setMouseLimits
+}
 
 //-------------------------------------------------------------------------------------------------
 /** set the cursor position for windows OS */
@@ -450,7 +447,7 @@ void DirectInputMouse::setPosition( Int x, Int y )
 	// set the window mouse
 	SetCursorPos( p.x, p.y );
 
-}  // end setPosition
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Super basic simplistic cursor */
@@ -485,12 +482,12 @@ void DirectInputMouse::setCursor( MouseCursor cursor )
 			SetCursor( LoadCursor( NULL, IDC_CROSS ) );
 			break;
 
-	}  // end switch
+	}
 
 	// save current cursor
 	m_currentCursor = cursor;
 
-}  // end setCursor
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Capture the mouse to our application */
@@ -500,7 +497,7 @@ void DirectInputMouse::capture( void )
 
 	SetCapture( ApplicationHWnd );
 
-}  // end capture
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Release the mouse capture for our app window */
@@ -510,4 +507,4 @@ void DirectInputMouse::releaseCapture( void )
 
 	ReleaseCapture();
 
-}  // end releaseCapture
+}
diff --git a/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp b/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp
index d6a80e85fdc..533c0d908a9 100644
--- a/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp
+++ b/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp
@@ -37,11 +37,6 @@
 #include "Win32Device/GameClient/Win32Mouse.h"
 #include "WinMain.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // EXTERN /////////////////////////////////////////////////////////////////////////////////////////
 extern Win32Mouse *TheWin32Mouse;
@@ -53,7 +48,7 @@ HCURSOR cursorResources[Mouse::NUM_MOUSE_CURSORS][MAX_2D_CURSOR_DIRECTIONS];
 
 //-------------------------------------------------------------------------------------------------
 /** Get a mouse event from the buffer if available, we need to translate
-	* from the windows message meanings to our own internal mouse 
+	* from the windows message meanings to our own internal mouse
 	* structure */
 //-------------------------------------------------------------------------------------------------
 UnsignedByte Win32Mouse::getMouseEvent( MouseIO *result, Bool flush )
@@ -80,7 +75,7 @@ UnsignedByte Win32Mouse::getMouseEvent( MouseIO *result, Bool flush )
 	// got event OK and all done with this one
 	return MOUSE_OK;
 
-}  // end getMouseEvent
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Translate a win32 mouse event to our own event info */
@@ -90,136 +85,115 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
 	UINT msg = m_eventBuffer[ eventIndex ].msg;
 	WPARAM wParam = m_eventBuffer[ eventIndex ].wParam;
 	LPARAM lParam = m_eventBuffer[ eventIndex ].lParam;
-	UnsignedInt frame;
-
-	//
-	// get the current input frame from the client, if we don't have
-	// a client (like in the GUI editor) we just use frame 1 so it
-	// registers with the system
-	//
-	if( TheGameClient )
-		frame = TheGameClient->getFrame();
-	else
-		frame = 1;
 
 	// set these to defaults
-	result->leftState = result->middleState = result->rightState = MBS_Up;
-	result->leftFrame = result->middleFrame = result->rightFrame = 0;
+	result->leftState = result->middleState = result->rightState = MBS_None;
 	result->pos.x = result->pos.y = result->wheelPos = 0;
 
 	// Time is the same for all events
 	result->time = m_eventBuffer[ eventIndex ].time;
-	
+
 	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case WM_LBUTTONDOWN:
 		{
-			
+
 			result->leftState = MBS_Down;
-			result->leftFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end left button down
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_LBUTTONUP:
 		{
 
 			result->leftState = MBS_Up;
-			result->leftFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end left button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_LBUTTONDBLCLK:
 		{
 
 			result->leftState = MBS_DoubleClick;
-			result->leftFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end left button double click
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MBUTTONDOWN:
 		{
 
 			result->middleState = MBS_Down;
-			result->middleFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end middle button down
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MBUTTONUP:
 		{
 
 			result->middleState = MBS_Up;
-			result->middleFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end middle button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MBUTTONDBLCLK:
 		{
 
 			result->middleState = MBS_DoubleClick;
-			result->middleFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end middle button double click
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_RBUTTONDOWN:
 		{
 
 			result->rightState = MBS_Down;
-			result->rightFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end right button down
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_RBUTTONUP:
 		{
 
 			result->rightState = MBS_Up;
-			result->rightFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end right button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_RBUTTONDBLCLK:
 		{
 
 			result->rightState = MBS_DoubleClick;
-			result->rightFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end right button double click
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MOUSEMOVE:
@@ -229,7 +203,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end mouse move
+		}
 
 		// ------------------------------------------------------------------------
 		case 0x020A:	// WM_MOUSEWHEEL
@@ -240,28 +214,28 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
 			p.x = LOWORD( lParam );
 			p.y = HIWORD( lParam );
 			ScreenToClient( ApplicationHWnd, &p );
-	
+
 			// note the short cast here to keep signed information in tact
 			result->wheelPos = (Short)HIWORD( wParam );
 			result->pos.x = p.x;
 			result->pos.y = p.y;
 			break;
 
-		}  // end mouse wheel
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 		{
 
-			DEBUG_CRASH(( "translateEvent: Unknown Win32 mouse event [%d,%d,%d]\n",
+			DEBUG_CRASH(( "translateEvent: Unknown Win32 mouse event [%d,%d,%d]",
 							 msg, wParam, lParam ));
 			return;
 
-		}  // end default
+		}
 
-	}  // end switch on message at event index in buffer
+	}
 
-}  // end translateEvent
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -283,7 +257,7 @@ Win32Mouse::Win32Mouse( void )
 			cursorResources[i][j]=NULL;
 	m_directionFrame=0; //points up.
 	m_lostFocus = FALSE;
-}  // end Win32Mouse
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -293,7 +267,7 @@ Win32Mouse::~Win32Mouse( void )
 	// remove our global reference that was for the WndProc() only
 	TheWin32Mouse = NULL;
 
-}  // end ~Win32Mouse
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize our device */
@@ -311,7 +285,7 @@ void Win32Mouse::init( void )
 	//
 	m_inputMovesAbsolute = TRUE;
 
-}  // end int
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -322,7 +296,7 @@ void Win32Mouse::reset( void )
 	// extend
 	Mouse::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update, called once per frame */
@@ -330,10 +304,10 @@ void Win32Mouse::reset( void )
 void Win32Mouse::update( void )
 {
 
-	// extend 
+	// extend
 	Mouse::update();
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Add a window message event along with its WPARAM and LPARAM parameters
@@ -361,7 +335,7 @@ void Win32Mouse::addWin32Event( UINT msg, WPARAM wParam, LPARAM lParam, DWORD ti
 	if( m_nextFreeIndex >= Mouse::NUM_MOUSE_EVENTS )
 		m_nextFreeIndex = 0;
 
-}  // end addWin32Event
+}
 
 extern HINSTANCE ApplicationHInstance;
 
@@ -373,6 +347,20 @@ void Win32Mouse::setVisibility(Bool visible)
 	Win32Mouse::setCursor(getMouseCursor());
 }
 
+//-------------------------------------------------------------------------------------------------
+void Win32Mouse::loseFocus()
+{
+	Mouse::loseFocus();
+	m_lostFocus = true;
+}
+
+//-------------------------------------------------------------------------------------------------
+void Win32Mouse::regainFocus()
+{
+	Mouse::regainFocus();
+	m_lostFocus = false;
+}
+
 /**Preload all the cursors we may need during the game.  This must be done before the D3D device
 is created to avoid cursor corruption on buggy ATI Radeon cards. */
 void Win32Mouse::initCursorResources(void)
@@ -388,7 +376,7 @@ void Win32Mouse::initCursorResources(void)
 					sprintf(resourcePath,"data\\cursors\\%s%d.ANI",m_cursorInfo[cursor].textureName.str(),direction);
 				else
 					sprintf(resourcePath,"data\\cursors\\%s.ANI",m_cursorInfo[cursor].textureName.str());
-				
+
 				// check for a MOD cursor.
 				Bool loaded = FALSE;
 				if (TheGlobalData->m_modDir.isNotEmpty())
@@ -408,7 +396,7 @@ void Win32Mouse::initCursorResources(void)
 
 				if (!loaded)
 					cursorResources[cursor][direction]=LoadCursorFromFile(resourcePath);
-				DEBUG_ASSERTCRASH(cursorResources[cursor][direction], ("MissingCursor %s\n",resourcePath));
+				DEBUG_ASSERTCRASH(cursorResources[cursor][direction], ("MissingCursor %s",resourcePath));
 			}
 		}
 //		SetCursor(cursorResources[cursor][m_directionFrame]);
@@ -431,12 +419,12 @@ void Win32Mouse::setCursor( MouseCursor cursor )
 	else
 	{
 		SetCursor(cursorResources[cursor][m_directionFrame]);
-	}  // end switch
+	}
 
 	// save current cursor
 	m_currentWin32Cursor=m_currentCursor = cursor;
-	
-}  // end setCursor
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Capture the mouse to our application */
@@ -444,24 +432,41 @@ void Win32Mouse::setCursor( MouseCursor cursor )
 void Win32Mouse::capture( void )
 {
 
-//	SetCapture( ApplicationHWnd );
-
-}  // end capture
-
-//-------------------------------------------------------------------------------------------------
-/** Release the mouse capture for our app window */
-//-------------------------------------------------------------------------------------------------
-void Win32Mouse::releaseCapture( void )
-{
-
-//	ReleaseCapture();
+	RECT rect;
+	::GetClientRect(ApplicationHWnd, &rect);
 
-}  // end releaseCapture
+	POINT leftTop;
+	leftTop.x = rect.left;
+	leftTop.y = rect.top;
 
+	POINT rightBottom;
+	rightBottom.x = rect.right;
+	rightBottom.y = rect.bottom;
 
+	::ClientToScreen(ApplicationHWnd, &leftTop);
+	::ClientToScreen(ApplicationHWnd, &rightBottom);
 
+	rect.left = leftTop.x;
+	rect.top = leftTop.y;
+	rect.right = rightBottom.x;
+	rect.bottom = rightBottom.y;
 
+	if (::ClipCursor(&rect))
+	{
+		onCursorCaptured(true);
+	}
 
+}
 
+//-------------------------------------------------------------------------------------------------
+/** Release the mouse capture for our app window */
+//-------------------------------------------------------------------------------------------------
+void Win32Mouse::releaseCapture( void )
+{
 
+	if (::ClipCursor(NULL))
+	{
+		onCursorCaptured(false);
+	}
 
+}
diff --git a/Generals/Code/Libraries/Include/Lib/BaseType.h b/Generals/Code/Libraries/Include/Lib/BaseType.h
index ea94cf2fc37..ea7efe1f5ba 100644
--- a/Generals/Code/Libraries/Include/Lib/BaseType.h
+++ b/Generals/Code/Libraries/Include/Lib/BaseType.h
@@ -26,11 +26,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // tell the compiler to only load this file once
-#pragma once
-
 
-#ifndef _BASE_TYPE_H_
-#define _BASE_TYPE_H_
+#pragma once
 
 #include "Lib/BaseTypeCore.h"
 #include "Lib/trig.h"
@@ -68,7 +65,7 @@ inline Real deg2rad(Real rad) { return rad * (PI/180); }
 //-----------------------------------------------------------------------------
 // For twiddling bits
 //-----------------------------------------------------------------------------
-// TheSuperHackers @compile xezon 22/03/2025 Renames BitTest to BitIsSet to prevent conflict with BitTest macro from winnt.h
+// TheSuperHackers @build xezon 22/03/2025 Renames BitTest to BitIsSet to prevent conflict with BitTest macro from winnt.h
 #define BitIsSet( x, i ) ( ( (x) & (i) ) != 0 )
 #define BitSet( x, i ) ( (x) |= (i) )
 #define BitClear( x, i ) ( (x ) &= ~(i) )
@@ -76,7 +73,7 @@ inline Real deg2rad(Real rad) { return rad * (PI/180); }
 
 //-------------------------------------------------------------------------------------------------
 
-// note, this function depends on the cpu rounding mode, which we set to CHOP every frame, 
+// note, this function depends on the cpu rounding mode, which we set to CHOP every frame,
 // but apparently tends to be left in unpredictable modes by various system bits of
 // code, so use this function with caution -- it might not round in the way you want.
 __forceinline long fast_float2long_round(float f)
@@ -95,6 +92,52 @@ __forceinline long fast_float2long_round(float f)
 	return i;
 }
 
+// super fast float trunc routine, works always (independent of any FPU modes)
+// code courtesy of Martin Hoffesommer (grin)
+__forceinline float fast_float_trunc(float f)
+{
+#if defined(_MSC_VER) && _MSC_VER < 1300
+  _asm
+  {
+    mov ecx,[f]
+    shr ecx,23
+    mov eax,0xff800000
+    xor ebx,ebx
+    sub cl,127
+    cmovc eax,ebx
+    sar eax,cl
+    and [f],eax
+  }
+  return f;
+#else
+  unsigned x = *(unsigned *)&f;
+  unsigned char exp = x >> 23;
+  int mask = exp < 127 ? 0 : 0xff800000;
+  exp -= 127;
+  mask >>= exp & 31;
+  x &= mask;
+  return *(float *)&x;
+#endif
+}
+
+// same here, fast floor function
+__forceinline float fast_float_floor(float f)
+{
+  static unsigned almost1=(126<<23)|0x7fffff;
+  if (*(unsigned *)&f &0x80000000)
+    f-=*(float *)&almost1;
+  return fast_float_trunc(f);
+}
+
+// same here, fast ceil function
+__forceinline float fast_float_ceil(float f)
+{
+  static unsigned almost1=(126<<23)|0x7fffff;
+  if ( (*(unsigned *)&f &0x80000000)==0)
+    f+=*(float *)&almost1;
+  return fast_float_trunc(f);
+}
+
 //-------------------------------------------------------------------------------------------------
 #define REAL_TO_INT(x)						((Int)(x))
 #define REAL_TO_UNSIGNEDINT(x)		((UnsignedInt)(x))
@@ -103,14 +146,18 @@ __forceinline long fast_float2long_round(float f)
 #define REAL_TO_BYTE(x)						((Byte)(x))
 #define REAL_TO_UNSIGNEDBYTE(x)		((UnsignedByte)(x))
 #define REAL_TO_CHAR(x)						((Char)(x))
-#define DOUBLE_TO_REAL(x)					((Real) (x))
-#define DOUBLE_TO_INT(x)					((Int) (x))
-#define INT_TO_REAL(x)						((Real) (x))
+#define DOUBLE_TO_REAL(x)					((Real)(x))
+#define DOUBLE_TO_INT(x)					((Int)(x))
+#define INT_TO_REAL(x)						((Real)(x))
 
 // once we've ceiled/floored, trunc and round are identical, and currently, round is faster... (srj)
 #define REAL_TO_INT_CEIL(x)				(fast_float2long_round(ceilf(x)))
 #define REAL_TO_INT_FLOOR(x)			(fast_float2long_round(floorf(x)))
 
+#define FAST_REAL_TRUNC(x)        fast_float_trunc(x)
+#define FAST_REAL_CEIL(x)         fast_float_ceil(x)
+#define FAST_REAL_FLOOR(x)        fast_float_floor(x)
+
 //--------------------------------------------------------------------
 // Derived type definitions
 //--------------------------------------------------------------------
@@ -119,7 +166,7 @@ __forceinline long fast_float2long_round(float f)
 // so they can be used within unions.
 
 // real-valued range defined by low and high values
-struct RealRange 
+struct RealRange
 {
 	Real lo, hi;							// low and high values of the range
 
@@ -132,7 +179,7 @@ struct RealRange
 	}
 };
 
-struct Coord2D 
+struct Coord2D
 {
 	Real x, y;
 
@@ -147,7 +194,7 @@ struct Coord2D
 			y /= len;
 		}
 	}
-	
+
 	Real toAngle( void );  ///< turn 2D vector into angle (where angle 0 is down the +x axis)
 
 };
@@ -196,9 +243,9 @@ inline Real Coord2D::toAngle( void )
 
 	return value;
 
-}  // end toAngle
+}
 
-struct ICoord2D 
+struct ICoord2D
 {
 	Int x, y;
 
@@ -222,7 +269,7 @@ struct IRegion2D
 };
 
 
-struct Coord3D 
+struct Coord3D
 {
 	Real x, y, z;
 
@@ -240,14 +287,14 @@ struct Coord3D
 			z /= len;
 		}
 	}
-	
+
 	static void crossProduct( const Coord3D *a, const Coord3D *b, Coord3D *r )
 	{
 		r->x = (a->y * b->z - a->z * b->y);
 		r->y = (a->z * b->x - a->x * b->z);
 		r->z = (a->x * b->y - a->y * b->x);
 	}
-	
+
 	void zero( void )
 	{
 		x = 0.0f;
@@ -261,21 +308,21 @@ struct Coord3D
 		y += a->y;
 		z += a->z;
 	}
-	
+
 	void sub( const Coord3D *a )
 	{
 		x -= a->x;
 		y -= a->y;
 		z -= a->z;
 	}
-	
+
 	void set( const Coord3D *a )
 	{
 		x = a->x;
 		y = a->y;
 		z = a->z;
 	}
-	
+
 	void set( Real ax, Real ay, Real az )
 	{
 		x = ax;
@@ -292,7 +339,7 @@ struct Coord3D
 
 	Bool equals( const Coord3D &r )
 	{
-		return (x == r.x && 
+		return (x == r.x &&
 						y == r.y &&
 						z == r.z);
 	}
@@ -305,7 +352,7 @@ struct Coord3D
 	}
 };
 
-struct ICoord3D 
+struct ICoord3D
 {
 	Int x, y, z;
 
@@ -330,12 +377,12 @@ struct Region3D
 	void zero() { lo.zero(); hi.zero(); }
 	Bool isInRegionNoZ( const Coord3D *query ) const
 	{
-		return (lo.x < query->x) && (query->x < hi.x) 
+		return (lo.x < query->x) && (query->x < hi.x)
 						&& (lo.y < query->y) && (query->y < hi.y);
 	}
 	Bool isInRegionWithZ( const Coord3D *query ) const
 	{
-		return (lo.x < query->x) && (query->x < hi.x) 
+		return (lo.x < query->x) && (query->x < hi.x)
 						&& (lo.y < query->y) && (query->y < hi.y)
 						&& (lo.z < query->z) && (query->z < hi.z);
 	}
@@ -355,7 +402,7 @@ struct RGBColor
 {
 	Real red, green, blue;		// range between 0 and 1
 
-	inline Int getAsInt() const
+	Int getAsInt() const
 	{
 		return
 			((Int)(red * 255.0) << 16) |
@@ -363,7 +410,7 @@ struct RGBColor
 			((Int)(blue * 255.0) << 0);
 	}
 
-	inline void setFromInt(Int c)
+	void setFromInt(Int c)
 	{
 		red = ((c >> 16) & 0xff) / 255.0f;
 		green = ((c >>  8) & 0xff) / 255.0f;
@@ -385,5 +432,3 @@ struct RGBAColorInt
 	UnsignedInt red, green, blue, alpha;  // range between 0 and 255
 
 };
-
-#endif // _BASE_TYPE_H_
diff --git a/Generals/Code/Libraries/Include/Lib/trig.h b/Generals/Code/Libraries/Include/Lib/trig.h
index 03bb52577d9..569f1ff3496 100644
--- a/Generals/Code/Libraries/Include/Lib/trig.h
+++ b/Generals/Code/Libraries/Include/Lib/trig.h
@@ -21,13 +21,10 @@
 // Author: Sondra Iverson, March 1998
 // Converted to Generals by Matthew D. Campbell, February 2002
 
-#ifndef _TRIG_H_
-#define _TRIG_H_
+#pragma once
 
 Real Sin(Real);
 Real Cos(Real);
 Real Tan(Real);
 Real ACos(Real);
 Real ASin(Real x);
-
-#endif // _TRIG_H_
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
index e4e14e3d9a8..0a51c6d9648 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
@@ -15,8 +15,8 @@ set(WW3D2_SRC
     #assetstatus.h
     #bitmaphandler.cpp
     #bitmaphandler.h
-    bmp2d.cpp
-    bmp2d.h
+    #bmp2d.cpp
+    #bmp2d.h
     boxrobj.cpp
     boxrobj.h
     #bwrender.cpp
@@ -54,8 +54,8 @@ set(WW3D2_SRC
     #dx8polygonrenderer.h
     dx8renderer.cpp
     dx8renderer.h
-    dx8texman.cpp
-    dx8texman.h
+    #dx8texman.cpp
+    #dx8texman.h
     dx8vertexbuffer.cpp
     dx8vertexbuffer.h
     #dx8webbrowser.cpp
@@ -79,7 +79,7 @@ set(WW3D2_SRC
     hlod.cpp
     hlod.h
     #hmdldef.cpp
-    #hmdldef.H
+    #hmdldef.h
     hmorphanim.cpp
     hmorphanim.h
     hrawanim.cpp
@@ -104,8 +104,8 @@ set(WW3D2_SRC
     mapper.h
     #matinfo.cpp
     #matinfo.h
-    matpass.cpp
-    matpass.h
+    #matpass.cpp
+    #matpass.h
     matrixmapper.cpp
     matrixmapper.h
     mesh.cpp
@@ -195,18 +195,18 @@ set(WW3D2_SRC
     #stripoptimizer.h
     #surfaceclass.cpp
     #surfaceclass.h
-    texproject.cpp
-    texproject.h
+    #texproject.cpp
+    #texproject.h
     #textdraw.cpp
     #textdraw.h
-    texture.cpp
-    texture.h
-    texturefilter.cpp
-    texturefilter.h
-    textureloader.cpp
-    textureloader.h
-    texturethumbnail.cpp
-    texturethumbnail.h
+    #texture.cpp
+    #texture.h
+    #texturefilter.cpp
+    #texturefilter.h
+    #textureloader.cpp
+    #textureloader.h
+    #texturethumbnail.cpp
+    #texturethumbnail.h
     vertmaterial.cpp
     vertmaterial.h
     #visrasterizer.cpp
@@ -233,6 +233,20 @@ set_target_properties(g_ww3d2 PROPERTIES OUTPUT_NAME ww3d2)
 
 target_sources(g_ww3d2 PRIVATE ${WW3D2_SRC})
 
+target_compile_definitions(g_ww3d2 PRIVATE
+    $<$<BOOL:${IS_VS6_BUILD}>:WINVER=0x0500>
+)
+
+target_precompile_headers(g_ww3d2 PRIVATE
+    dx8wrapper.h
+    [["always.h"]]
+    [["STLUtils.h"]]
+    [["win.h"]]
+    [["WWCommon.h"]]
+    [["wwstring.h"]]
+    <windows.h>
+)
+
 target_link_libraries(g_ww3d2 PRIVATE
     corei_ww3d2
     g_wwcommon
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp
index 941b3dd5d56..dfefb10afde 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp
@@ -61,7 +61,6 @@
 #include "chunkio.h"
 #include "w3d_file.h"
 #include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 
 #undef WWASSERT
@@ -80,8 +79,8 @@ const float COINCIDENCE_EPSILON = 0.001f;
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-AABTreeBuilderClass::AABTreeBuilderClass(void) : 
-	Root(NULL), 
+AABTreeBuilderClass::AABTreeBuilderClass(void) :
+	Root(NULL),
 	CurPolyIndex(0),
 	PolyCount(0),
 	Polys(NULL),
@@ -103,8 +102,8 @@ AABTreeBuilderClass::AABTreeBuilderClass(void) :
  * HISTORY:                                                                                    *
  *   5/19/2000  gth : Created.                                                                 *
  *=============================================================================================*/
-AABTreeBuilderClass::~AABTreeBuilderClass(void) 
-{ 
+AABTreeBuilderClass::~AABTreeBuilderClass(void)
+{
 	Reset();
 }
 
@@ -123,19 +122,14 @@ AABTreeBuilderClass::~AABTreeBuilderClass(void)
  *=============================================================================================*/
 void AABTreeBuilderClass::Reset(void)
 {
-	if (Root) { 
-		delete Root; Root = NULL; 
-	} 
+	delete Root;
+	Root = NULL;
 
-	if (Verts != NULL) {
-		delete[] Verts;
-		Verts = NULL;
-	}
+	delete[] Verts;
+	Verts = NULL;
 
-	if (Polys != NULL) {
-		delete[] Polys;
-		Polys = NULL;
-	}
+	delete[] Polys;
+	Polys = NULL;
 }
 
 /***********************************************************************************************
@@ -232,7 +226,7 @@ void AABTreeBuilderClass::Build_Tree(CullNodeStruct * node,int polycount,int * p
 	SplitChoiceStruct sc;
 
 	sc = Select_Splitting_Plane(polycount,polyindices);
-	
+
 	/*
 	** If the algorithm could not separate any polys, just install the polys
 	** in this node and terminate.  TODO: explore how this happens.
@@ -277,7 +271,7 @@ void AABTreeBuilderClass::Build_Tree(CullNodeStruct * node,int polycount,int * p
 		Build_Tree(node->Front,arrays.FrontCount,arrays.FrontPolys);
 		arrays.FrontPolys = NULL;
 	}
-	
+
 	/*
 	** Build a back tree if necessary. Remember that the build function
 	** deletes the tile array.
@@ -305,7 +299,7 @@ void AABTreeBuilderClass::Build_Tree(CullNodeStruct * node,int polycount,int * p
  * HISTORY:                                                                                    *
  *   6/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-AABTreeBuilderClass::SplitChoiceStruct 
+AABTreeBuilderClass::SplitChoiceStruct
 AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices)
 {
 	WWASSERT(polyindices != NULL);
@@ -314,14 +308,14 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices)
 
 	SplitChoiceStruct best_plane_stats;
 	SplitChoiceStruct considered_plane_stats;
-	
+
 	/*
 	** Try putting axis-aligned planes through some random vertices
 	*/
 	for (int trys = 0; trys < MIN(NUM_TRYS,polycount); trys++) {
 
 		AAPlaneClass plane;
-		
+
 		/*
 		** Select a random poly and vertex index;
 		*/
@@ -329,7 +323,7 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices)
 		int vert_index = rand() % 3;
 		const TriIndex * polyverts = Polys + poly_index;
 		const Vector3 * vert = Verts + (*polyverts)[vert_index];
-		
+
 		/*
 		** Select a random plane
 		*/
@@ -365,7 +359,7 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices)
  * HISTORY:                                                                                    *
  *   6/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-AABTreeBuilderClass::SplitChoiceStruct 
+AABTreeBuilderClass::SplitChoiceStruct
 AABTreeBuilderClass::Compute_Plane_Score(int polycount,int * polyindices,const AAPlaneClass & plane)
 {
 	/*
@@ -380,16 +374,16 @@ AABTreeBuilderClass::Compute_Plane_Score(int polycount,int * polyindices,const A
 
 		switch(Which_Side(plane,polyindices[i])) {
 
-			case FRONT:	
+			case FRONT:
 			case ON:
 			case BOTH:
 				{
-					sc.FrontCount++;		
+					sc.FrontCount++;
 					Update_Min_Max(polyindices[i],sc.FMin,sc.FMax );
 					break;
 				}
 
-			case BACK:		
+			case BACK:
 				{
 					sc.BackCount++;
 					Update_Min_Max(polyindices[i],sc.BMin,sc.BMax );
@@ -397,21 +391,21 @@ AABTreeBuilderClass::Compute_Plane_Score(int polycount,int * polyindices,const A
 				}
 		}
 	}
-	
+
 	/*
 	** Inflate the box a tiny amount so that we never
 	** get volumes of zero!
 	*/
 	sc.BMin -= Vector3(WWMATH_EPSILON,WWMATH_EPSILON,WWMATH_EPSILON);
 	sc.BMax += Vector3(WWMATH_EPSILON,WWMATH_EPSILON,WWMATH_EPSILON);
-	
+
 	/*
 	** Compute the cost.
 	*/
 	float back_cost = (sc.BMax.X - sc.BMin.X) * (sc.BMax.Y - sc.BMin.Y) * (sc.BMax.Z - sc.BMin.Z) * sc.BackCount;
 	float front_cost = (sc.FMax.X - sc.FMin.X) * (sc.FMax.Y - sc.FMin.Y) * (sc.FMax.Z - sc.FMin.Z) * sc.FrontCount;
 	sc.Cost = front_cost + back_cost;
-	
+
 	if ((sc.FrontCount == 0) || (sc.BackCount == 0)) {
 		sc.Cost = FLT_MAX;
 	}
@@ -432,7 +426,7 @@ AABTreeBuilderClass::Compute_Plane_Score(int polycount,int * polyindices,const A
  * HISTORY:                                                                                    *
  *   6/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-AABTreeBuilderClass::OverlapType 
+AABTreeBuilderClass::OverlapType
 AABTreeBuilderClass::Which_Side(const AAPlaneClass & plane,int poly_index)
 {
 	/*
@@ -440,13 +434,13 @@ AABTreeBuilderClass::Which_Side(const AAPlaneClass & plane,int poly_index)
 	*/
 	int mask = 0;
 	for (int vi=0; vi<3; vi++) {
-		
+
 		const Vector3 & point = Verts[ Polys[poly_index][vi] ];
 		float delta = point[plane.Normal] - plane.Dist;
-		
+
 		if (delta > COINCIDENCE_EPSILON) {
 			mask |= POS;
-		} 
+		}
 		if (delta < -COINCIDENCE_EPSILON) {
 			mask |= NEG;
 		}
@@ -454,7 +448,7 @@ AABTreeBuilderClass::Which_Side(const AAPlaneClass & plane,int poly_index)
 	}
 
 	/*
-	** Now evaluate the status of all of the verts to determine whether the 
+	** Now evaluate the status of all of the verts to determine whether the
 	** triangle is in front, behind, on or overlapping the plane
 	*/
 
@@ -507,7 +501,7 @@ void AABTreeBuilderClass::Split_Polys
 )
 {
 	/*
-	** Note that this routine arrays of polygons. The caller is then responsible for keeping 
+	** Note that this routine arrays of polygons. The caller is then responsible for keeping
 	** track of the memory this routine allocates.
 	*/
 	if (sc.FrontCount > 0) {
@@ -525,7 +519,7 @@ void AABTreeBuilderClass::Split_Polys
 
 		switch(Which_Side(sc.Plane,polyindices[i])) {
 
-			case FRONT: 
+			case FRONT:
 			case ON:
 			case BOTH:
 				arrays->FrontPolys[arrays->FrontCount++] = polyindices[i];
@@ -538,7 +532,7 @@ void AABTreeBuilderClass::Split_Polys
 	}
 
 	/*
-	** when we are all done, the counts should match. 
+	** when we are all done, the counts should match.
 	*/
 	WWASSERT(arrays->FrontCount == sc.FrontCount);
 	WWASSERT(arrays->BackCount == sc.BackCount);
@@ -589,7 +583,7 @@ void AABTreeBuilderClass::Compute_Bounding_Box(CullNodeStruct * node)
 
 		if (node->Front->Min.Y < node->Min.Y) node->Min.Y = node->Front->Min.Y;
 		if (node->Front->Max.Y > node->Max.Y) node->Max.Y = node->Front->Max.Y;
-		
+
 		if (node->Front->Min.Z < node->Min.Z) node->Min.Z = node->Front->Min.Z;
 		if (node->Front->Max.Z > node->Max.Z) node->Max.Z = node->Front->Max.Z;
 	}
@@ -603,7 +597,7 @@ void AABTreeBuilderClass::Compute_Bounding_Box(CullNodeStruct * node)
 
 		if (node->Back->Min.Y < node->Min.Y) node->Min.Y = node->Back->Min.Y;
 		if (node->Back->Max.Y > node->Max.Y) node->Max.Y = node->Back->Max.Y;
-		
+
 		if (node->Back->Min.Z < node->Min.Z) node->Min.Z = node->Back->Min.Z;
 		if (node->Back->Max.Z > node->Max.Z) node->Max.Z = node->Back->Max.Z;
 	}
@@ -633,7 +627,7 @@ int AABTreeBuilderClass::Assign_Index(CullNodeStruct * node,int index)
 {
 	/*
 	** This function is used to assign a sequential index to
-	** each node in the tree.  The AABTree stores its nodes in 
+	** each node in the tree.  The AABTree stores its nodes in
 	** an array so this index is used to determine which slot
 	** in the array to put each node into.
 	*/
@@ -666,9 +660,9 @@ int AABTreeBuilderClass::Assign_Index(CullNodeStruct * node,int index)
  *   6/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 int AABTreeBuilderClass::Node_Count(void)
-{	
+{
 	if (Root) {
-		return Node_Count_Recursive(Root,0);	
+		return Node_Count_Recursive(Root,0);
 	} else {
 		return 0;
 	}
@@ -687,8 +681,8 @@ int AABTreeBuilderClass::Node_Count(void)
  * HISTORY:                                                                                    *
  *   10/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-int AABTreeBuilderClass::Poly_Count(void) 
-{ 
+int AABTreeBuilderClass::Poly_Count(void)
+{
 	return PolyCount;
 }
 
@@ -891,7 +885,7 @@ void AABTreeBuilderClass::Build_W3D_AABTree_Recursive
 	newnode->Max.X = node->Max.X;
 	newnode->Max.Y = node->Max.Y;
 	newnode->Max.Z = node->Max.Z;
-	
+
 	/*
 	** If this is a non-leaf node, set up the child indices, otherwise set up the polygon indices
 	*/
@@ -900,7 +894,7 @@ void AABTreeBuilderClass::Build_W3D_AABTree_Recursive
 		WWASSERT(node->Back != NULL);		// if we have one child, we better have both!
 		newnode->FrontOrPoly0 = node->Front->Index;
 		newnode->BackOrPolyCount = node->Back->Index;
-	
+
 	} else {
 
 		newnode->FrontOrPoly0 = cur_poly | 0x80000000;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h
index 17fffcfc52a..9098dfb60ee 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h
@@ -36,13 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef AABTREEBUILDER_H
-#define AABTREEBUILDER_H
 
 #include "always.h"
 #include "vector3.h"
@@ -65,18 +59,18 @@ struct W3dMeshAABTreeNode;
 class AABTreeBuilderClass
 {
 public:
-	
+
 	AABTreeBuilderClass(void);
 	~AABTreeBuilderClass(void);
 
 	void					Build_AABTree(int polycount,TriIndex * polys,int vertcount,Vector3 * verts);
 	void					Export(ChunkSaveClass & csave);
-	
+
 	int					Node_Count(void);
 	int					Poly_Count(void);
 
-	enum 
-	{ 
+	enum
+	{
 		MIN_POLYS_PER_NODE =		4,
 		SMALL_VERTEX =				-100000,
 		BIG_VERTEX =				100000
@@ -89,14 +83,14 @@ class AABTreeBuilderClass
 	** wasteful in terms of memory footprint and number of allocations than the
 	** streamlined version found in the actual AABTreeClass.
 	*/
-	struct CullNodeStruct 
+	struct CullNodeStruct
 	{
 		CullNodeStruct(void) : Index(0),Min(0,0,0),Max(0,0,0),Front(NULL),Back(NULL),PolyCount(0),PolyIndices(NULL) {}
-		~CullNodeStruct(void) 
+		~CullNodeStruct(void)
 		{
-			if (Front) { delete Front; } 
-			if (Back) { delete Back; }
-			if (PolyIndices) { delete[] PolyIndices; }
+			delete Front;
+			delete Back;
+			delete[] PolyIndices;
 		}
 
 		int						Index;
@@ -113,7 +107,7 @@ class AABTreeBuilderClass
 	*/
 	struct SplitChoiceStruct
 	{
-		SplitChoiceStruct(void) : 
+		SplitChoiceStruct(void) :
 			Cost(FLT_MAX),
 			FrontCount(0),
 			BackCount(0),
@@ -121,10 +115,10 @@ class AABTreeBuilderClass
 			BMax(SMALL_VERTEX,SMALL_VERTEX,SMALL_VERTEX),
 			FMin(BIG_VERTEX,BIG_VERTEX,BIG_VERTEX),
 			FMax(SMALL_VERTEX,SMALL_VERTEX,SMALL_VERTEX),
-			Plane(AAPlaneClass::XNORMAL,0) 
+			Plane(AAPlaneClass::XNORMAL,0)
 		{
 		}
-		
+
 		float						Cost;				// try to minimize this!
 		int						FrontCount;		// number of polys in front of the plane
 		int						BackCount;		// number of polys behind the plane
@@ -137,7 +131,7 @@ class AABTreeBuilderClass
 
 	struct SplitArraysStruct
 	{
-		SplitArraysStruct(void) : 
+		SplitArraysStruct(void) :
 			FrontCount(0),
 			BackCount(0),
 			FrontPolys(NULL),
@@ -180,14 +174,14 @@ class AABTreeBuilderClass
 	void								Update_Min(int poly_index,Vector3 & set_min);
 	void								Update_Max(int poly_index,Vector3 & set_max);
 	void								Update_Min_Max(int poly_index, Vector3 & set_min, Vector3 & set_max);
-	
+
 	void								Build_W3D_AABTree_Recursive(CullNodeStruct *	node,
 											W3dMeshAABTreeNode * w3dnodes,
 											uint32 * poly_indices,
 											int & cur_node,
 											int &	cur_poly);
 	/*
-	** Tree 
+	** Tree
 	*/
 	CullNodeStruct *				Root;
 	int								CurPolyIndex;
@@ -202,9 +196,3 @@ class AABTreeBuilderClass
 
 	friend class AABTreeClass;
 };
-
-
-
-
-#endif //AABTREEBUILDER_H
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
index fe4e4753ccf..32a40db2f52 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
@@ -89,7 +89,7 @@ Animatable3DObjClass::Animatable3DObjClass(const char * htree_name) :
   ModeAnim.Motion=NULL;
 	ModeAnim.Frame=0.0f;
 	ModeAnim.PrevFrame=0.0f;
-	ModeAnim.LastSyncTime=WW3D::Get_Sync_Time();
+	ModeAnim.LastSyncTime=WW3D::Get_Logic_Time_Milliseconds();
 	ModeAnim.frameRateMultiplier=1.0;	// 020607 srj -- added
 	ModeAnim.animDirection=1.0;	// 020607 srj -- added
 	ModeInterp.Motion0=NULL;
@@ -100,7 +100,7 @@ Animatable3DObjClass::Animatable3DObjClass(const char * htree_name) :
 	ModeInterp.Frame1=0.0f;
 	ModeInterp.Percentage=0.0f;
 	ModeCombo.AnimCombo=NULL;
-  
+
 	/*
 	** Store a pointer to the htree
 	*/
@@ -114,7 +114,7 @@ Animatable3DObjClass::Animatable3DObjClass(const char * htree_name) :
 		if (source != NULL) {
 			HTree = W3DNEW HTreeClass(*source);
 		} else {
-			WWDEBUG_SAY(("Unable to find HTree: %s\r\n",htree_name));
+			WWDEBUG_SAY(("Unable to find HTree: %s",htree_name));
 			HTree = W3DNEW HTreeClass;
 			HTree->Init_Default();
 		}
@@ -145,7 +145,7 @@ Animatable3DObjClass::Animatable3DObjClass(const Animatable3DObjClass & src) :
 	ModeAnim.Motion=NULL;
 	ModeAnim.Frame=0.0f;
 	ModeAnim.PrevFrame=0.0f;
-	ModeAnim.LastSyncTime=WW3D::Get_Sync_Time();
+	ModeAnim.LastSyncTime=WW3D::Get_Logic_Time_Milliseconds();
 	ModeAnim.frameRateMultiplier=1.0;	// 020607 srj -- added
 	ModeAnim.animDirection=1.0;	// 020607 srj -- added
 	ModeInterp.Motion0=NULL;
@@ -177,9 +177,7 @@ Animatable3DObjClass::~Animatable3DObjClass(void)
 {
 	Release();
 
-	if (HTree) {
-		delete HTree;
-	}
+	delete HTree;
 }
 
 
@@ -196,12 +194,9 @@ Animatable3DObjClass::~Animatable3DObjClass(void)
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 Animatable3DObjClass & Animatable3DObjClass::operator = (const Animatable3DObjClass & that)
-{ 
+{
 	if (&that != this) {
 		Release();
-		if (HTree) {
-			delete HTree;
-		}
 
 		CompositeRenderObjClass::operator = (that);
 
@@ -210,7 +205,7 @@ Animatable3DObjClass & Animatable3DObjClass::operator = (const Animatable3DObjCl
 		ModeAnim.Motion = NULL;
 		ModeAnim.Frame = 0.0f;
 		ModeAnim.PrevFrame = 0.0f;
-		ModeAnim.LastSyncTime = WW3D::Get_Sync_Time();
+		ModeAnim.LastSyncTime = WW3D::Get_Logic_Time_Milliseconds();
 		ModeAnim.frameRateMultiplier=1.0;	// 020607 srj -- added
 		ModeAnim.animDirection=1.0;	// 020607 srj -- added
 		ModeInterp.Motion0 = NULL;
@@ -222,9 +217,10 @@ Animatable3DObjClass & Animatable3DObjClass::operator = (const Animatable3DObjCl
 		ModeInterp.Percentage = 0.0f;
 		ModeCombo.AnimCombo = NULL;
 
+		delete HTree;
 		HTree = W3DNEW HTreeClass(*that.HTree);
 	}
-	return *this; 
+	return *this;
 }
 
 /***********************************************************************************************
@@ -239,7 +235,7 @@ Animatable3DObjClass & Animatable3DObjClass::operator = (const Animatable3DObjCl
  * HISTORY:                                                                                    *
  *   12/8/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-void Animatable3DObjClass::Release( void ) 
+void Animatable3DObjClass::Release( void )
 {
 	switch (CurMotionMode) {
 
@@ -293,13 +289,12 @@ void Animatable3DObjClass::Render(RenderInfoClass & rinfo)
 		return;
 	}
 
-	if ( CurMotionMode == SINGLE_ANIM ) {
-		if ( ModeAnim.AnimMode != ANIM_MODE_MANUAL ) {
-			Single_Anim_Progress();
-		}
-	}
+	//
+	// Force the hierarchy to be recalculated for single animations.
+	//
+	const bool isSingleAnim = CurMotionMode == SINGLE_ANIM && ModeAnim.AnimMode != ANIM_MODE_MANUAL;
 
-	if (!Is_Hierarchy_Valid() || Are_Sub_Object_Transforms_Dirty()) {
+	if (isSingleAnim || !Is_Hierarchy_Valid() || Are_Sub_Object_Transforms_Dirty()) {
 		Update_Sub_Object_Transforms();
 	}
 }
@@ -320,13 +315,12 @@ void Animatable3DObjClass::Special_Render(SpecialRenderInfoClass & rinfo)
 {
 	if (HTree == NULL) return;
 
-	if ( CurMotionMode == SINGLE_ANIM ) {
-		if ( ModeAnim.AnimMode != ANIM_MODE_MANUAL ) {
-			Single_Anim_Progress();
-		}
-	}
+	//
+	// Force the hierarchy to be recalculated for single animations.
+	//
+	const bool isSingleAnim = CurMotionMode == SINGLE_ANIM && ModeAnim.AnimMode != ANIM_MODE_MANUAL;
 
-	if (!Is_Hierarchy_Valid()) {
+	if (isSingleAnim || !Is_Hierarchy_Valid()) {
 		Update_Sub_Object_Transforms();
 	}
 }
@@ -345,9 +339,9 @@ void Animatable3DObjClass::Special_Render(SpecialRenderInfoClass & rinfo)
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Set_Transform(const Matrix3D &m)
-{ 
-	CompositeRenderObjClass::Set_Transform(m); 
-	Set_Hierarchy_Valid(false); 
+{
+	CompositeRenderObjClass::Set_Transform(m);
+	Set_Hierarchy_Valid(false);
 }
 
 
@@ -364,9 +358,9 @@ void Animatable3DObjClass::Set_Transform(const Matrix3D &m)
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Set_Position(const Vector3 &v)
-{ 
-	CompositeRenderObjClass::Set_Position(v); 
-	Set_Hierarchy_Valid(false); 
+{
+	CompositeRenderObjClass::Set_Position(v);
+	Set_Hierarchy_Valid(false);
 }
 
 
@@ -480,7 +474,7 @@ void Animatable3DObjClass::Set_Animation(HAnimClass * motion, float frame, int m
 		ModeAnim.Motion = motion;
 		ModeAnim.PrevFrame = ModeAnim.Frame;
 		ModeAnim.Frame = frame;
-		ModeAnim.LastSyncTime = WW3D::Get_Sync_Time();
+		ModeAnim.LastSyncTime = WW3D::Get_Logic_Time_Milliseconds();
 		ModeAnim.frameRateMultiplier=1.0;	// 020607 srj -- added
 		ModeAnim.animDirection=1.0;	// 020607 srj -- added
 
@@ -490,7 +484,7 @@ void Animatable3DObjClass::Set_Animation(HAnimClass * motion, float frame, int m
 			ModeAnim.animDirection = 1.0f;	//assume playing forwards
 		else
 			ModeAnim.animDirection = -1.0f;	//reverse animation playback
- 
+
 		const char* sound_name = AnimatedSoundMgrClass::Get_Embedded_Sound_Name(motion);
 		if (sound_name) {
 			int bone_index = Get_Bone_Index(sound_name);
@@ -502,7 +496,7 @@ void Animatable3DObjClass::Set_Animation(HAnimClass * motion, float frame, int m
 	}
 
 	Set_Hierarchy_Valid(false);
-}	
+}
 
 
 /***********************************************************************************************
@@ -518,7 +512,7 @@ void Animatable3DObjClass::Set_Animation(HAnimClass * motion, float frame, int m
  *   12/8/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Set_Animation
-( 
+(
 	HAnimClass * motion0,
 	float frame0,
 	HAnimClass * motion1,
@@ -571,7 +565,7 @@ void Animatable3DObjClass::Set_Animation
  *   12/8/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Set_Animation
-( 
+(
 	HAnimComboClass * anim_combo
 )
 {
@@ -583,7 +577,7 @@ void Animatable3DObjClass::Set_Animation
 
 	if (anim_combo) {
 		int count = anim_combo->Get_Num_Anims();
-		for (int index = 0; index < count; index ++) {				
+		for (int index = 0; index < count; index ++) {
 			HAnimClass *motion = anim_combo->Peek_Motion(index);
 
 			const char* sound_name = AnimatedSoundMgrClass::Get_Embedded_Sound_Name(motion);
@@ -593,7 +587,7 @@ void Animatable3DObjClass::Set_Animation
 			}
 		}
 	}
-}						 
+}
 
 
 /***********************************************************************************************
@@ -635,7 +629,7 @@ const Matrix3D &	Animatable3DObjClass::Get_Bone_Transform(const char * bonename)
 	if (HTree) {
 		WWASSERT(HTree);
 		WWASSERT(bonename);
-		
+
 		int idx = HTree->Get_Bone_Index(bonename);
 		return Get_Bone_Transform(idx);
 	} else {
@@ -689,9 +683,9 @@ const Matrix3D &	Animatable3DObjClass::Get_Bone_Transform(int boneindex)
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Capture_Bone(int boneindex)
-{ 
+{
 	if (HTree) {
-		HTree->Capture_Bone(boneindex); 
+		HTree->Capture_Bone(boneindex);
 	}
 }
 
@@ -709,9 +703,9 @@ void Animatable3DObjClass::Capture_Bone(int boneindex)
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Release_Bone(int boneindex)
-{ 
+{
 	if (HTree) {
-		HTree->Release_Bone(boneindex); 
+		HTree->Release_Bone(boneindex);
 	}
 }
 
@@ -728,10 +722,10 @@ void Animatable3DObjClass::Release_Bone(int boneindex)
  * HISTORY:                                                                                    *
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
-bool Animatable3DObjClass::Is_Bone_Captured(int boneindex) const					
-{ 
+bool Animatable3DObjClass::Is_Bone_Captured(int boneindex) const
+{
 	if (HTree) {
-		return HTree->Is_Bone_Captured(boneindex); 
+		return HTree->Is_Bone_Captured(boneindex);
 	} else {
 		return false;
 	}
@@ -751,8 +745,8 @@ bool Animatable3DObjClass::Is_Bone_Captured(int boneindex) const
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Control_Bone(int bindex,const Matrix3D & objtm,bool world_space_translation)
-{ 
-#ifdef WWDEBUG	
+{
+#ifdef WWDEBUG
 	for (int j=0; j<3; j++) {
 		for (int i=0; i<4; i++) {
 			WWASSERT(WWMath::Is_Valid_Float(objtm[j][i]));
@@ -761,7 +755,7 @@ void Animatable3DObjClass::Control_Bone(int bindex,const Matrix3D & objtm,bool w
 #endif
 
 	if (HTree) {
-		HTree->Control_Bone(bindex,objtm,world_space_translation); 
+		HTree->Control_Bone(bindex,objtm,world_space_translation);
 		Set_Hierarchy_Valid(false);
 	}
 }
@@ -781,7 +775,7 @@ void Animatable3DObjClass::Control_Bone(int bindex,const Matrix3D & objtm,bool w
 void Animatable3DObjClass::Update_Sub_Object_Transforms(void)
 {
 	/*
-	** The RenderObj impementation will cause our 'container' 
+	** The RenderObj implementation will cause our 'container'
 	** to update if we are not valid yet
 	*/
 	CompositeRenderObjClass::Update_Sub_Object_Transforms();
@@ -796,12 +790,12 @@ void Animatable3DObjClass::Update_Sub_Object_Transforms(void)
 			break;
 
 		case SINGLE_ANIM:
-			
+
 			if ( ModeAnim.AnimMode != ANIM_MODE_MANUAL ) {
 				Single_Anim_Progress();
 			}
 			Anim_Update(Transform,ModeAnim.Motion,ModeAnim.Frame);
-			
+
 			/*
 			**	Play any sounds that are triggered by this frame of animation
 			*/
@@ -825,7 +819,7 @@ void Animatable3DObjClass::Update_Sub_Object_Transforms(void)
 				ModeInterp.PrevFrame1 = AnimatedSoundMgrClass::Trigger_Sound(ModeInterp.Motion1, ModeInterp.PrevFrame1, ModeInterp.Frame1, HTree->Get_Transform(ModeInterp.Motion1->Get_Embedded_Sound_Bone_Index()));
 			}
 
-  			break;
+			break;
 
 		case MULTIPLE_ANIM:
 		{
@@ -835,7 +829,7 @@ void Animatable3DObjClass::Update_Sub_Object_Transforms(void)
 			**	Play any sounds that are triggered by this frame of animation
 			*/
 			int count = ModeCombo.AnimCombo->Get_Num_Anims();
-			for (int index = 0; index < count; index ++) {				
+			for (int index = 0; index < count; index ++) {
 				HAnimClass *motion = ModeCombo.AnimCombo->Peek_Motion(index);
 
 				if ( motion != NULL && motion->Has_Embedded_Sounds() ) {
@@ -843,7 +837,7 @@ void Animatable3DObjClass::Update_Sub_Object_Transforms(void)
 																				ModeCombo.AnimCombo->Get_Frame(index), HTree->Get_Transform(motion->Get_Embedded_Sound_Bone_Index()));
 					ModeCombo.AnimCombo->Set_Prev_Frame(index, prev_frame);
 				}
-				
+
 			}
 			break;
 		}
@@ -876,14 +870,14 @@ bool Animatable3DObjClass::Simple_Evaluate_Bone(int boneindex, Matrix3D *tm) con
 	//	Only do this for simple animations
 	//
 	if (CurMotionMode == SINGLE_ANIM) {
-		
+
 		//
 		//	Determine which frame we should be on, then use this
 		// information to determine the bone's transform.
 		//
 		float curr_frame = Compute_Current_Frame ();
 		retval = Simple_Evaluate_Bone (boneindex, curr_frame, tm);
-	
+
 	} else {
 
 		*tm = Transform;
@@ -917,7 +911,7 @@ bool Animatable3DObjClass::Simple_Evaluate_Bone(int boneindex, float frame, Matr
 	if (HTree != NULL) {
 		if (CurMotionMode == SINGLE_ANIM) {
 			retval = HTree->Simple_Evaluate_Pivot (ModeAnim.Motion, boneindex, frame, Get_Transform (), tm);
-		} 
+		}
 	} else {
 		*tm = Transform;
 	}
@@ -949,31 +943,36 @@ float Animatable3DObjClass::Compute_Current_Frame(float *newDirection) const
 		{
 			frame = ModeAnim.Frame;
 
-			//
-			//	Compute the current frame based on elapsed time.
-			//
 			if (ModeAnim.AnimMode != ANIM_MODE_MANUAL) {
-				float sync_time_diff = WW3D::Get_Sync_Time() - ModeAnim.LastSyncTime;
-				float delta = ModeAnim.Motion->Get_Frame_Rate() * ModeAnim.frameRateMultiplier * ModeAnim.animDirection * sync_time_diff * 0.001f;
-				frame += delta;
+				//
+				//	Compute the current frame based on elapsed time.
+				//	TheSuperHackers @info Is using elapsed time because frame computation is not guaranteed to be called every render frame!
+				//
+				// TheSuperHackers @tweak The animation render update is now decoupled from the logic step.
+				const float syncMilliseconds = WW3D::Get_Logic_Time_Milliseconds() - ModeAnim.LastSyncTime;
+				const float animMilliseconds = ModeAnim.Motion->Get_Frame_Rate() * ModeAnim.frameRateMultiplier * ModeAnim.animDirection * syncMilliseconds;
+				const float animSeconds = animMilliseconds * 0.001f;
+				frame += animSeconds;
 
 				//
 				//	Wrap the frame
 				//
+				const int numFrames = ModeAnim.Motion->Get_Num_Frames() - 1;
+
 				switch (ModeAnim.AnimMode)
 				{
 					case ANIM_MODE_ONCE:
-						if (frame >= ModeAnim.Motion->Get_Num_Frames() - 1) {
-							frame = ModeAnim.Motion->Get_Num_Frames() - 1;
+						if (frame >= numFrames) {
+							frame = numFrames;
 						}
 						break;
 					case ANIM_MODE_LOOP:
-						if ( frame >= ModeAnim.Motion->Get_Num_Frames() - 1 ) {
-							frame -= ModeAnim.Motion->Get_Num_Frames() - 1;
-						}
-						// If it is still too far out, reset
-						if ( frame >= ModeAnim.Motion->Get_Num_Frames() - 1 ) {
-							frame = 0;
+						if ( frame >= numFrames ) {
+							frame -= numFrames;
+							// If it is still too far out, reset
+							if ( frame >= numFrames ) {
+								frame = 0;
+							}
 						}
 						break;
 					case ANIM_MODE_ONCE_BACKWARDS:	//play animation one time but backwards
@@ -983,22 +982,22 @@ float Animatable3DObjClass::Compute_Current_Frame(float *newDirection) const
 						break;
 					case ANIM_MODE_LOOP_BACKWARDS:	//play animation backwards in a loop
 						if ( frame < 0 ) {
-							frame += ModeAnim.Motion->Get_Num_Frames() - 1;
-						}
-						// If it is still too far out, reset
-						if ( frame < 0 ) {
-							frame = ModeAnim.Motion->Get_Num_Frames() - 1;
+							frame += numFrames;
+							// If it is still too far out, reset
+							if ( frame < 0 ) {
+								frame = numFrames;
+							}
 						}
 						break;
 					case ANIM_MODE_LOOP_PINGPONG:
 						if (ModeAnim.animDirection >= 1.0f)
 						{	//playing forwards, reverse direction
-							if (frame >= (ModeAnim.Motion->Get_Num_Frames() - 1))
+							if (frame >= numFrames)
 							{	//step backwards in animation by excess time
-								frame = (ModeAnim.Motion->Get_Num_Frames() - 1)*2 - frame;
+								frame = numFrames * 2 - frame;
 								// If it is still too far out, reset
-								if ( frame >= ModeAnim.Motion->Get_Num_Frames() - 1 )
-									frame = (ModeAnim.Motion->Get_Num_Frames() - 1);
+								if ( frame >= numFrames - 1 )
+									frame = numFrames;
 								direction = ModeAnim.animDirection * -1.0f;
 							}
 						}
@@ -1008,7 +1007,7 @@ float Animatable3DObjClass::Compute_Current_Frame(float *newDirection) const
 							{	//step forwards in animation by excess time
 								frame = -frame;
 								// If it is still too far out, reset
-								if ( frame >= ModeAnim.Motion->Get_Num_Frames() - 1 )
+								if ( frame >= numFrames )
 										frame = 0;
 								direction = ModeAnim.animDirection * -1.0f;
 							}
@@ -1019,10 +1018,10 @@ float Animatable3DObjClass::Compute_Current_Frame(float *newDirection) const
 		}
 		break;
 	}
-  
+
 	if (newDirection)
 		*newDirection = direction;
-	return frame;	  
+	return frame;
 }
 
 /***********************************************************************************************
@@ -1042,27 +1041,14 @@ void Animatable3DObjClass::Single_Anim_Progress (void)
 	//
 	//	Update the current frame (only works in "SINGLE_ANIM" mode!)
 	//
-	if (CurMotionMode == SINGLE_ANIM) {
-		
-		// 
-		// Update the frame number and sync time
-		//
-		float oldprev = ModeAnim.PrevFrame;
-		ModeAnim.PrevFrame		= ModeAnim.Frame;
-		ModeAnim.Frame				= Compute_Current_Frame(&ModeAnim.animDirection);
-		ModeAnim.LastSyncTime	= WW3D::Get_Sync_Time();
-	
-		if (ModeAnim.Frame == ModeAnim.PrevFrame) {
-			// This function was somehow called twice per frame.
-			// Since ModeAnim.Frame hasn't changed, reset the ModeAnim.PrevFrame.
-			// If you don't do this sounds won't be triggered properly because Frame and PrevFrame will be the same.
-			ModeAnim.PrevFrame = oldprev;
-		}
-		//
-		// Force the heirarchy to be recalculated
-		//
-		Set_Hierarchy_Valid (false);
-	}
+	WWASSERT(CurMotionMode == SINGLE_ANIM);
+
+	//
+	// Update the frame number and sync time
+	//
+	ModeAnim.PrevFrame		= ModeAnim.Frame;
+	ModeAnim.Frame				= Compute_Current_Frame(&ModeAnim.animDirection);
+	ModeAnim.LastSyncTime	= WW3D::Get_Logic_Time_Milliseconds();
 }
 
 
@@ -1081,7 +1067,7 @@ void Animatable3DObjClass::Single_Anim_Progress (void)
 bool	Animatable3DObjClass::Is_Animation_Complete( void ) const
 {
 	if (CurMotionMode == SINGLE_ANIM) {
-	
+
 		if ( ModeAnim.AnimMode == ANIM_MODE_ONCE ) {
 			return ( ModeAnim.Frame == ModeAnim.Motion->Get_Num_Frames() - 1 );
 		}
@@ -1120,16 +1106,14 @@ void Animatable3DObjClass::Set_Animation_Frame_Rate_Multiplier(float multiplier)
 
 // (gth) TESTING DYNAMICALLY SWAPPING SKELETONS!
 
-void Animatable3DObjClass::Set_HTree(HTreeClass * new_htree) 
-{ 
+void Animatable3DObjClass::Set_HTree(HTreeClass * new_htree)
+{
 	WWMEMLOG(MEM_ANIMATION);
 	// try to ensure that the htree we're using has the same structure...
-	WWASSERT(new_htree->Num_Pivots() == HTree->Num_Pivots()); 
-	
+	WWASSERT(new_htree->Num_Pivots() == HTree->Num_Pivots());
+
 	// just assign it...
-	if (HTree != NULL) {
-		delete HTree;
-	}
+	delete HTree;
 	HTree = W3DNEW HTreeClass(*new_htree);
 }
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h
index 9de98c0ec7e..1e2ad69f8f9 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h
@@ -38,12 +38,7 @@
  *   Animatable3DObjClass::Combo_Update -- Animation update for a combination of anims         *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef ANIMOBJ_H
-#define ANIMOBJ_H
 
 #include "always.h"
 #include "composite.h"
@@ -97,7 +92,7 @@ class Animatable3DObjClass : public CompositeRenderObjClass
 	virtual void					Set_Animation_Frame_Rate_Multiplier(float multiplier);	// 020607 srj -- added
 
 	virtual HAnimClass *	Peek_Animation_And_Info(float& frame, int& numFrames, int& mode, float& mult);	// 020710 srj -- added
-	
+
 	virtual HAnimClass *			Peek_Animation( void );
 	virtual bool					Is_Animation_Complete( void ) const;
 	virtual int						Get_Num_Bones(void);
@@ -110,10 +105,10 @@ class Animatable3DObjClass : public CompositeRenderObjClass
 	virtual bool					Is_Bone_Captured(int boneindex) const;
 	virtual void					Control_Bone(int bindex,const Matrix3D & objtm,bool world_space_translation = false);
 	virtual const HTreeClass *	Get_HTree(void) const { return HTree; }
-	
+
 	//
 	//	Simple bone evaluation methods for when the caller doesn't want
-	// to update the heirarchy, but needs to know the transform of
+	// to update the hierarchy, but needs to know the transform of
 	// a bone at a given frame.
 	//
 	virtual bool					Simple_Evaluate_Bone(int boneindex, Matrix3D *tm) const;
@@ -153,14 +148,14 @@ class Animatable3DObjClass : public CompositeRenderObjClass
 	void								Combo_Update(	const Matrix3D & root,
 															HAnimComboClass *anim);
 
-	// flag to kep track of whether the hierarchy tree transforms are currently valid
+	// flag to keep track of whether the hierarchy tree transforms are currently valid
 	bool								Is_Hierarchy_Valid(void) const				{ return IsTreeValid; }
 	void								Set_Hierarchy_Valid(bool onoff) const  	{ IsTreeValid = onoff; }
 
-	// Progress anims for single anim (loop and once)
+	// Progress animations for single anim (loop and once)
 	void								Single_Anim_Progress( void );
 
-	// Release any anims
+	// Release any animations
 	void								Release( void );
 
 protected:
@@ -170,7 +165,7 @@ class Animatable3DObjClass : public CompositeRenderObjClass
 
 	// Hierarchy Tree
 	HTreeClass *					HTree;
-	
+
 	// Animation state for the next frame.  When we add more flexible motion
 	// compositing, add a new state and its associated data to the union below
 	enum {
@@ -190,14 +185,14 @@ class Animatable3DObjClass : public CompositeRenderObjClass
 			float		  				Frame;
 			float						PrevFrame;
 			int						AnimMode;
-			mutable int				LastSyncTime;
+			int								LastSyncTime;
 			float							animDirection;
 			float							frameRateMultiplier;	// 020607 srj -- added
-		} ModeAnim;				  
+		} ModeAnim;
 
 		// CurMotionMode == DOUBLE_ANIM
 		struct {
-			
+
 			HAnimClass *			Motion0;
 			HAnimClass *			Motion1;
 			float		  				Frame0;
@@ -211,9 +206,9 @@ class Animatable3DObjClass : public CompositeRenderObjClass
 		struct {
 			HAnimComboClass *		AnimCombo;
 		} ModeCombo;
-  
+
 	};
-	
+
 	friend class SkinClass;
 };
 
@@ -262,9 +257,11 @@ inline void Animatable3DObjClass::Anim_Update(const Matrix3D & root,HAnimClass *
 	** Apply motion to the base pose
 	*/
 	if ((motion) && (HTree)) {
-		if (ModeAnim.Motion->Class_ID() == HAnimClass::CLASSID_HRAWANIM)
-			HTree->Anim_Update(Transform,(HRawAnimClass*)ModeAnim.Motion,ModeAnim.Frame);
+#if !WW3D_ENABLE_RAW_ANIM_INTERPOLATION
+		if (motion->Class_ID() == HAnimClass::CLASSID_HRAWANIM)
+			HTree->Anim_Update_Without_Interpolation(root,(HRawAnimClass*)motion,frame);
 		else
+#endif
 			HTree->Anim_Update(root,motion,frame);
 	}
 	Set_Hierarchy_Valid(true);
@@ -322,7 +319,3 @@ inline void Animatable3DObjClass::Combo_Update( const Matrix3D & root, HAnimComb
 	}
 	Set_Hierarchy_Valid(true);
 }
-
-
-
-#endif //ANIMOBJ_H
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
index 334cd38265b..15afd75578c 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
@@ -16,23 +16,27 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* $Header: /Commando/Code/ww3d2/assetmgr.cpp 36    8/24/01 3:23p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando                                                     * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/assetmgr.cpp                           $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 8/22/01 6:54p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 36                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/* $Header: /Commando/Code/ww3d2/assetmgr.cpp 43    11/01/01 1:11a Jani_p $ */
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando                                                     *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/assetmgr.cpp                           $*
+ *                                                                                             *
+ *                   Org Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
+ *                     $Modtime:: 08/05/02 10:14a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 46                                                          $*
+ *                                                                                             *
+ * 06/27/02 KM Texture class abstraction																			*
+ * 08/05/02 KM Texture class redesign (revisited)
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   WW3DAssetManager::WW3DAssetManager -- Constructor                                         *
  *   WW3DAssetManager::~WW3DAssetManager -- Destructor                                         *
  *   WW3DAssetManager::Free -- free all memory (un-needed?)                                    *
@@ -64,11 +68,11 @@
  *   WW3DAssetManager::Find_Prototype_Loader -- find the loader that handles this chunk type   *
  *   WW3DAssetManager::Add_Prototype -- adds the prototype to the hash table                   *
  *   WW3DAssetManager::Find_Prototype -- searches the hash table for the prototype             *
- *   WW3DAssetManager::Open_Texture_File_Cache -- Turn on the texture cache system.            * 
- *   WW3DAssetManager::Close_Texture_File_Cache -- Turn off the texture cache system.          * 
- *   CachedTextureFileClass::getMipmapData -- get data for texture - check to see if in cache. * 
- *   CachedTextureFileClass::getMipmapLevelPartial -- not yet implemented                      * 
- *   CachedTextureFileClass::setupDefaultValues -- loads texture in to get default data.       * 
+ *   WW3DAssetManager::Open_Texture_File_Cache -- Turn on the texture cache system.            *
+ *   WW3DAssetManager::Close_Texture_File_Cache -- Turn off the texture cache system.          *
+ *   CachedTextureFileClass::getMipmapData -- get data for texture - check to see if in cache. *
+ *   CachedTextureFileClass::getMipmapLevelPartial -- not yet implemented                      *
+ *   CachedTextureFileClass::setupDefaultValues -- loads texture in to get default data.       *
  *   WW3DAssetManager::Get_Streaming_Texture -- Gets a streaming texture.                      *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
@@ -105,11 +109,9 @@
 #include "dx8renderer.h"
 #include "metalmap.h"
 #include "w3dexclusionlist.h"
-#include <INI.H>
+#include <INI.h>
 #include <windows.h>
-#include <stdio.h>
 #include <d3dx8core.h>
-#include "texture.h"
 #include "wwprofile.h"
 #include "assetstatus.h"
 #include "ringobj.h"
@@ -195,7 +197,7 @@ class Font3DDataIterator : public AssetIterator
  *                                                                                             *
  * HISTORY:                                                                                    *
  *   12/21/97   GTH : Created.                                                                 *
- *   05/10/1999 SKB : Add TextureCache                                                         * 
+ *   05/10/1999 SKB : Add TextureCache                                                         *
  *=============================================================================================*/
 WW3DAssetManager::WW3DAssetManager(void) :
 	PrototypeLoaders		(PROTOLOADERS_VECTOR_SIZE),
@@ -227,10 +229,10 @@ WW3DAssetManager::WW3DAssetManager(void) :
 	Register_Prototype_Loader(&_DazzleLoader);
 	Register_Prototype_Loader (&_RingLoader);
 	Register_Prototype_Loader (&_SphereLoader);
-	
+
 	// allocate the hash table and clear it.
 	PrototypeHashTable = W3DNEWARRAY PrototypeClass * [PROTOTYPE_HASH_TABLE_SIZE];
-	memset(PrototypeHashTable,0,sizeof(PrototypeClass *) * PROTOTYPE_HASH_TABLE_SIZE);		
+	memset(PrototypeHashTable,0,sizeof(PrototypeClass *) * PROTOTYPE_HASH_TABLE_SIZE);
 }
 
 
@@ -248,15 +250,13 @@ WW3DAssetManager::WW3DAssetManager(void) :
  *=============================================================================================*/
 WW3DAssetManager::~WW3DAssetManager(void)
 {
-	if (MetalManager) delete MetalManager;
+	delete MetalManager;
+
 	Free();
 	TheInstance = NULL;
 
-	// If we need to, free the hash table
-	if (PrototypeHashTable != NULL) {
-		delete [] PrototypeHashTable;
-		PrototypeHashTable = NULL;
-	}
+	delete [] PrototypeHashTable;
+	PrototypeHashTable = NULL;
 }
 
 static void Create_Number_String(StringClass& number, unsigned value)
@@ -284,13 +284,13 @@ void	WW3DAssetManager::Load_Procedural_Textures()
 		ini.Load("metals.ini");
 		MetalManager=W3DNEW MetalMapManagerClass(ini);
 	}
-	
-	count=MetalManager->Metal_Map_Count();		
+
+	count=MetalManager->Metal_Map_Count();
 	for (i=0; i<count; i++)
 	{
 		TextureClass *tex=MetalManager->Get_Metal_Map(i);
 		TextureHash.Insert(tex->Get_Texture_Name(),tex);
-	}	
+	}
 }
 
 static void Log_Textures(bool inited,unsigned& total_count, unsigned& total_mem)
@@ -324,7 +324,7 @@ static void Log_Textures(bool inited,unsigned& total_count, unsigned& total_mem)
 		case D3DFMT_A8L8: tex_format="D3DFMT_A8L8"; break;
 		case D3DFMT_A4L4: tex_format="D3DFMT_A4L4"; break;
 		case D3DFMT_V8U8: tex_format="D3DFMT_V8U8"; break;
-		case D3DFMT_L6V5U5: tex_format="D3DFMT_L6V5U5"; break;  
+		case D3DFMT_L6V5U5: tex_format="D3DFMT_L6V5U5"; break;
 		case D3DFMT_X8L8V8U8: tex_format="D3DFMT_X8L8V8U8"; break;
 		case D3DFMT_Q8W8V8U8: tex_format="D3DFMT_Q8W8V8U8"; break;
 		case D3DFMT_V16U16: tex_format="D3DFMT_V16U16"; break;
@@ -352,16 +352,16 @@ static void Log_Textures(bool inited,unsigned& total_count, unsigned& total_mem)
 		StringClass number;
 		Create_Number_String(number,texmem);
 
-		WWDEBUG_SAY(("%32s	%4d * %4d (%15s), init %d, size: %14s bytes, refs: %d\n",
-			tex->Get_Texture_Name(),
+		WWDEBUG_SAY(("%32s	%4d * %4d (%15s), init %d, size: %14s bytes, refs: %d",
+			tex->Get_Texture_Name().str(),
 			desc.Width,
 			desc.Height,
-			tex_format,
+			tex_format.str(),
 			tex->Is_Initialized(),
-			number,
+			number.str(),
 			tex->Num_Refs()));
 
-	}	
+	}
 }
 
 void WW3DAssetManager::Log_Texture_Statistics()
@@ -372,32 +372,32 @@ void WW3DAssetManager::Log_Texture_Statistics()
 	unsigned total_uninitialized_count=0;
 	StringClass number;
 
-	WWDEBUG_SAY(("\nInitialized textures ------------------------------------------\n\n"));
+	WWDEBUG_SAY(("\nInitialized textures ------------------------------------------\n"));
 	Log_Textures(true,total_initialized_count,total_initialized_tex_mem);
 
 	Create_Number_String(number,total_initialized_tex_mem);
-	WWDEBUG_SAY(("\n%d initialized textures, totalling %14s bytes\n\n",
+	WWDEBUG_SAY(("\n%d initialized textures, totalling %14s bytes\n",
 		total_initialized_count,
-		number));
+		number.str()));
 
-	WWDEBUG_SAY(("\nUn-initialized textures ---------------------------------------\n\n"));
+	WWDEBUG_SAY(("\nUn-initialized textures ---------------------------------------\n"));
 	Log_Textures(false,total_uninitialized_count,total_uninitialized_tex_mem);
 
 	Create_Number_String(number,total_uninitialized_tex_mem);
-	WWDEBUG_SAY(("\n%d un-initialized textures, totalling, totalling %14s bytes\n\n",
+	WWDEBUG_SAY(("\n%d un-initialized textures, totalling, totalling %14s bytes\n",
 		total_uninitialized_count,
-		number));
+		number.str()));
 /*
 	RenderObjIterator * rite=WW3DAssetManager::Get_Instance()->Create_Render_Obj_Iterator();
 	if (rite) {
 		for (rite->First(); !rite->Is_Done(); rite->Next()) {
-//			RenderObjClass * robj=Create_Render_Obj(rite->Current_Item_Name());	
+//			RenderObjClass * robj=Create_Render_Obj(rite->Current_Item_Name());
 //			if (robj) {
 //
 //				robj->Release_Ref();
 //			}
 			if (rite->Current_Item_Class_ID()==RenderObjClass::CLASSID_HMODEL) {
-				WWDEBUG_SAY(("robj: %s\n",rite->Current_Item_Name()));
+				WWDEBUG_SAY(("robj: %s",rite->Current_Item_Name()));
 			}
 		}
 
@@ -435,7 +435,7 @@ void WW3DAssetManager::Free(void)
  *                                                                                             *
  * HISTORY:                                                                                    *
  *   12/21/97   GTH : Created.                                                                 *
- *   05/10/1999 SKB : Close down texture cache file.                                           * 
+ *   05/10/1999 SKB : Close down texture cache file.                                           *
  *=============================================================================================*/
 void WW3DAssetManager::Free_Assets(void)
 {
@@ -452,9 +452,9 @@ void WW3DAssetManager::Free_Assets(void)
 			proto->DeleteSelf();
 		}
 	}
-	
+
 	// clear the prototype hash table
-	memset(PrototypeHashTable,0,sizeof(PrototypeClass *) * PROTOTYPE_HASH_TABLE_SIZE);	
+	memset(PrototypeHashTable,0,sizeof(PrototypeClass *) * PROTOTYPE_HASH_TABLE_SIZE);
 
 	// delete all of the anims and trees
 	HAnimManager.Free_All_Anims();
@@ -506,7 +506,7 @@ void WW3DAssetManager::Release_Unused_Assets(void)
  * WARNINGS:                                                                                   *
  *                                                                                             *
  * HISTORY:                                                                                    *
- *   12/12/2002 GH  : Created.                                                                 * 
+ *   12/12/2002 GH  : Created.                                                                 *
  *=============================================================================================*/
 void WW3DAssetManager::Free_Assets_With_Exclusion_List(const DynamicVectorClass<StringClass> & exclusion_names)
 {
@@ -515,7 +515,7 @@ void WW3DAssetManager::Free_Assets_With_Exclusion_List(const DynamicVectorClass<
 
 	// Build an exclusion list object that will do the real filtering work for us
 	W3DExclusionListClass exclusion_list(exclusion_names);
-   
+
 	// temporary vector to hold the prototypes that get excluded from being deleted.
 	// grow by the initial size so we don't waste lots of time re-allocating!
 	const int DEFAULT_EXCLUDE_ARRAY_SIZE = 8000;
@@ -527,25 +527,25 @@ void WW3DAssetManager::Free_Assets_With_Exclusion_List(const DynamicVectorClass<
 	for (; i<Prototypes.Count(); i++) {
 
 		PrototypeClass * proto = Prototypes[i];
-		if (proto != NULL) {		
+		if (proto != NULL) {
 
 			// If this prototype is excluded, copy the pointer, otherwise delete it.
 			if (exclusion_list.Is_Excluded(proto)) {
-				//WWDEBUG_SAY(("excluding %s\n",proto->Get_Name()));
+				//WWDEBUG_SAY(("excluding %s",proto->Get_Name()));
 				exclude_array.Add(proto);
 			} else {
-				//WWDEBUG_SAY(("deleting %s\n",proto->Get_Name()));
+				//WWDEBUG_SAY(("deleting %s",proto->Get_Name()));
 				proto->DeleteSelf();
 			}
 			Prototypes[i] = NULL;
 		}
 	}
-	
+
 	// reset the array now that we've gotten rid of everything.
 	Prototypes.Reset_Active();
 
 	// clear the prototype hash table
-	memset(PrototypeHashTable,0,sizeof(PrototypeClass *) * PROTOTYPE_HASH_TABLE_SIZE);	
+	memset(PrototypeHashTable,0,sizeof(PrototypeClass *) * PROTOTYPE_HASH_TABLE_SIZE);
 
 	// re-add the prototypes that we saved
 	for (i=0; i<exclude_array.Count(); i++) {
@@ -577,7 +577,7 @@ void WW3DAssetManager::Free_Assets_With_Exclusion_List(const DynamicVectorClass<
  * render object contained within them!                                                        *
  *                                                                                             *
  * HISTORY:                                                                                    *
- *   12/12/2002 GH  : Created.                                                                 * 
+ *   12/12/2002 GH  : Created.                                                                 *
  *=============================================================================================*/
 void WW3DAssetManager::Create_Asset_List(DynamicVectorClass<StringClass> & model_list)
 {
@@ -621,7 +621,7 @@ bool WW3DAssetManager::Load_3D_Assets( const char * filename )
 		if ( file->Is_Available() ) {
 			result = WW3DAssetManager::Load_3D_Assets( *file );
 		} else {
-			WWDEBUG_SAY(("Missing asset '%s'.\n", filename));
+			WWDEBUG_SAY(("Missing asset '%s'.", filename));
 		}
 		_TheFileFactory->Return_File( file );
 	}
@@ -664,7 +664,7 @@ bool WW3DAssetManager::Load_3D_Assets(FileClass & w3dfile)
 			case W3D_CHUNK_MORPH_ANIMATION:
 				HAnimManager.Load_Anim(cload);
 				break;
-        
+
 			default:
 				Load_Prototype(cload);
 				break;
@@ -722,7 +722,7 @@ bool WW3DAssetManager::Load_Prototype(ChunkLoadClass & cload)
 		/*
 		** Warn user about an unknown chunk type
 		*/
-		WWDEBUG_SAY(("Unknown chunk type encountered!  Chunk Id = %d\r\n",chunk_id));
+		WWDEBUG_SAY(("Unknown chunk type encountered!  Chunk Id = %d",chunk_id));
 		return false;
 	}
 
@@ -733,7 +733,7 @@ bool WW3DAssetManager::Load_Prototype(ChunkLoadClass & cload)
 	if (newproto != NULL) {
 
 		if (!Render_Obj_Exists(newproto->Get_Name())) {
-				
+
 			/*
 			** Add the new, unique prototype to our list
 			*/
@@ -742,25 +742,25 @@ bool WW3DAssetManager::Load_Prototype(ChunkLoadClass & cload)
 		} else {
 
 			/*
-			** Warn the user about a name collision with this prototype 
+			** Warn the user about a name collision with this prototype
 			** and dump it
 			*/
-			WWDEBUG_SAY(("Render Object Name Collision: %s\r\n",newproto->Get_Name()));
+			WWDEBUG_SAY(("Render Object Name Collision: %s",newproto->Get_Name()));
 			newproto->DeleteSelf();
 			newproto = NULL;
 			return false;
 		}
-	
+
 	} else {
 
 		/*
-		** Warn user that a prototype was not generated from this 
+		** Warn user that a prototype was not generated from this
 		** chunk type
 		*/
-		WWDEBUG_SAY(("Could not generate prototype!  Chunk  = %d\r\n",chunk_id));
+		WWDEBUG_SAY(("Could not generate prototype!  Chunk  = %d",chunk_id));
 		return false;
 	}
-	
+
 	return true;
 }
 
@@ -815,7 +815,7 @@ RenderObjClass * WW3DAssetManager::Create_Render_Obj(const char * name)
 		// Note - objects named "#..." are scaled cached objects, so don't warn...
 		if (name[0] != '#') {
 			if (++warning_count <= 20) {
-				WWDEBUG_SAY(("WARNING: Failed to create Render Object: %s\r\n",name));
+				WWDEBUG_SAY(("WARNING: Failed to create Render Object: %s",name));
 			}
 			AssetStatusClass::Peek_Instance()->Report_Missing_RObj(name);
 		}
@@ -904,7 +904,7 @@ void WW3DAssetManager::Release_Render_Obj_Iterator(RenderObjIterator * it)
 AssetIterator * WW3DAssetManager::Create_HAnim_Iterator(void)
 {
 	return W3DNEW HAnimIterator();
-}														
+}
 
 
 /***********************************************************************************************
@@ -967,7 +967,7 @@ HAnimClass *	WW3DAssetManager::Get_HAnim(const char * name)
 	HAnimClass * anim = HAnimManager.Get_Anim(name);
 
 	if (WW3D_Load_On_Demand && anim == NULL) {	// If we didn't find it, try to load on demand
-		
+
 		if ( !HAnimManager.Is_Missing( name ) ) {	// if this is NOT a known missing anim
 
 			AssetStatusClass::Peek_Instance()->Report_Load_On_Demand_HAnim(name);
@@ -977,7 +977,7 @@ HAnimClass *	WW3DAssetManager::Get_HAnim(const char * name)
 			if (animname != NULL) {
 				sprintf( filename, "%s.w3d", animname+1);
 			} else {
-				WWDEBUG_SAY(( "Animation %s has no . in the name\n", name ));
+				WWDEBUG_SAY(( "Animation %s has no . in the name", name ));
 				WWASSERT( 0 );
 				return NULL;
 			}
@@ -997,7 +997,7 @@ HAnimClass *	WW3DAssetManager::Get_HAnim(const char * name)
 	}
 
 	return anim;
-}										 
+}
 
 
 /***********************************************************************************************
@@ -1021,7 +1021,7 @@ HTreeClass *	WW3DAssetManager::Get_HTree(const char * name)
 	HTreeClass * htree = HTreeManager.Get_Tree(name);
 
 	if (WW3D_Load_On_Demand && htree == NULL) {	// If we didn't find it, try to load on demand
-		
+
 		AssetStatusClass::Peek_Instance()->Report_Load_On_Demand_HTree(name);
 
 		char filename[ MAX_PATH ];
@@ -1044,46 +1044,6 @@ HTreeClass *	WW3DAssetManager::Get_HTree(const char * name)
 	return htree;
 }
 
-/***********************************************************************************************
- * WW3DAssetManager::Get_Bumpmap_Based_On_Texture -- Generate a bumpmap from texture. The      *
- * resulting texture is stored to the hash table so that any further requests will share it.   *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/31/2001  NH : Created.                                                                  *
- *=============================================================================================*/
-
-TextureClass* WW3DAssetManager::Get_Bumpmap_Based_On_Texture(TextureClass* texture)
-{
-	WWASSERT(texture->Get_Texture_Name() && strlen(texture->Get_Texture_Name()));
-	StringClass bump_name="__Bumpmap-";
-	bump_name+=texture->Get_Texture_Name();
-	_strlwr(bump_name.Peek_Buffer());	// lower case
-
-	/*
-	** See if the texture has already been generated.
-	*/
-
-	TextureClass* tex = TextureHash.Get(bump_name);
-
-	/*
-	** Didn't have it so we have to create a new texture
-	*/
-	if (!tex) {
-		tex = NEW_REF(BumpmapTextureClass,(texture));
-		tex->Set_Texture_Name(bump_name);
-		TextureHash.Insert(tex->Get_Texture_Name(),tex);
-	}
-
-	tex->Add_Ref();
-	return tex;
-}
-
 /***********************************************************************************************
  * WW3DAssetManager::Get_Texture -- get a TextureClass from the specified file                 *
  *                                                                                             *
@@ -1098,7 +1058,7 @@ TextureClass* WW3DAssetManager::Get_Bumpmap_Based_On_Texture(TextureClass* textu
  *=============================================================================================*/
 TextureClass * WW3DAssetManager::Get_Texture
 (
-	const char * filename, 
+	const char * filename,
 	MipCountType mip_level_count,
 	WW3DFormat texture_format,
 	bool allow_compression,
@@ -1111,7 +1071,7 @@ TextureClass * WW3DAssetManager::Get_Texture
 	/*
 	** We cannot currently mip-map bumpmaps
 	*/
-	if (texture_format==WW3D_FORMAT_U8V8) 
+	if (texture_format==WW3D_FORMAT_U8V8)
 	{
 		mip_level_count=MIP_LEVELS_1;
 	}
@@ -1119,7 +1079,7 @@ TextureClass * WW3DAssetManager::Get_Texture
 	/*
 	** Bail if the user isn't really asking for anything
 	*/
-	if ((filename == NULL) || (strlen(filename) == 0)) 
+	if ((filename == NULL) || (strlen(filename) == 0))
 	{
 		return NULL;
 	}
@@ -1131,7 +1091,7 @@ TextureClass * WW3DAssetManager::Get_Texture
 	** See if the texture has already been loaded.
 	*/
 	TextureClass* tex = TextureHash.Get(lower_case_name);
-	if (tex && texture_format!=WW3D_FORMAT_UNKNOWN) 
+	if (tex && (tex->Is_Initialized() == true) && (texture_format!=WW3D_FORMAT_UNKNOWN))
 	{
 		WWASSERT_PRINT(tex->Get_Texture_Format()==texture_format,("Texture %s has already been loaded with different format",filename));
 	}
@@ -1139,12 +1099,26 @@ TextureClass * WW3DAssetManager::Get_Texture
 	/*
 	** Didn't have it so we have to create a new texture
 	*/
-	if (!tex) 
+	if (!tex)
 	{
 		if (type==TextureBaseClass::TEX_REGULAR)
 		{
-			tex = NEW_REF (TextureClass, (lower_case_name, NULL, mip_level_count, texture_format, allow_compression));
+			tex = NEW_REF (TextureClass, (lower_case_name, NULL, mip_level_count, texture_format, allow_compression, allow_reduction));
+		}
+		else if (type==TextureBaseClass::TEX_CUBEMAP)
+		{
+			tex = NEW_REF (CubeTextureClass, (lower_case_name, NULL, mip_level_count, texture_format, allow_compression, allow_reduction));
+		}
+		else if (type==TextureBaseClass::TEX_VOLUME)
+		{
+			tex = NEW_REF (VolumeTextureClass, (lower_case_name, NULL, mip_level_count, texture_format, allow_compression, allow_reduction));
 		}
+		else
+		{
+			WWASSERT_PRINT(false, ("Unhandled case"));
+			return NULL;
+		}
+
 		TextureHash.Insert(tex->Get_Texture_Name(),tex);
 	}
 
@@ -1259,7 +1233,7 @@ void WW3DAssetManager::Log_All_Textures(void)
 	WWDEBUG_SAY((
 		"Lightmap textures: %d\n\n"
 		"size     name\n"
-		"--------------------------------------\n"
+		"--------------------------------------"
 		,
 		TextureClass::_Get_Total_Lightmap_Texture_Count()));
 
@@ -1275,7 +1249,7 @@ void WW3DAssetManager::Log_All_Textures(void)
 		else {
 			tmp+=" ";
 		}
-		WWDEBUG_SAY(("%4.4dkb %s%s\n",bytes/1024,tmp,t->Get_Texture_Name()));
+		WWDEBUG_SAY(("%4.4dkb %s%s",bytes/1024,tmp.str(),t->Get_Texture_Name().str()));
 	}
 
 	// Log procedural textures -------------------------------
@@ -1283,7 +1257,7 @@ void WW3DAssetManager::Log_All_Textures(void)
 	WWDEBUG_SAY((
 		"Procedural textures: %d\n\n"
 		"size     name\n"
-		"--------------------------------------\n"
+		"--------------------------------------"
 		,
 		TextureClass::_Get_Total_Procedural_Texture_Count()));
 
@@ -1299,7 +1273,7 @@ void WW3DAssetManager::Log_All_Textures(void)
 		else {
 			tmp+=" ";
 		}
-		WWDEBUG_SAY(("%4.4dkb %s%s\n",bytes/1024,tmp,t->Get_Texture_Name()));
+		WWDEBUG_SAY(("%4.4dkb %s%s",bytes/1024,tmp.str(),t->Get_Texture_Name().str()));
 	}
 
 	// Log "ordinary" textures -------------------------------
@@ -1307,7 +1281,7 @@ void WW3DAssetManager::Log_All_Textures(void)
 	WWDEBUG_SAY((
 		"Ordinary textures: %d\n\n"
 		"size     name\n"
-		"--------------------------------------\n"
+		"--------------------------------------"
 		,
 		TextureClass::_Get_Total_Texture_Count()-TextureClass::_Get_Total_Lightmap_Texture_Count()-TextureClass::_Get_Total_Procedural_Texture_Count()));
 
@@ -1324,7 +1298,7 @@ void WW3DAssetManager::Log_All_Textures(void)
 		else {
 			tmp+=" ";
 		}
-		WWDEBUG_SAY(("%4.4dkb %s%s\n",bytes/1024,tmp,t->Get_Texture_Name()));
+		WWDEBUG_SAY(("%4.4dkb %s%s",bytes/1024,tmp.str(),t->Get_Texture_Name().str()));
 	}
 
 }
@@ -1368,7 +1342,7 @@ Font3DDataClass * WW3DAssetManager::Get_Font3DData( const char *name )
 	// loop through and see if the Font3D we are looking for has already been
 	// allocated and thus we can just return it.
 	for (	SLNode<Font3DDataClass> *node = Font3DDatas.Head(); node; node = node->Next()) {
-		if (!stricmp(name, node->Data()->Name)) {
+		if (stricmp(name, node->Data()->Name) == 0) {
 			node->Data()->Add_Ref();
 			return node->Data();
 		}
@@ -1482,12 +1456,17 @@ FontCharsClass *	WW3DAssetManager::Get_FontChars( const char * name, int point_s
 		}
 	}
 
-	// If one hasn't been found, create it
+	// If one hasn't been found, try create it
 	FontCharsClass * font = NEW_REF( FontCharsClass, () );
-	font->Initialize_GDI_Font( name, point_size, is_bold );
-	font->Add_Ref();
-	FontCharsList.Add( font );			// add it to the list	
-	return font;							// return it
+	if (font->Initialize_GDI_Font( name, point_size, is_bold ))
+	{
+		font->Add_Ref();
+		FontCharsList.Add( font );
+		return font;
+	}
+
+	font->Release_Ref();
+	return NULL;
 }
 
 
@@ -1610,14 +1589,14 @@ void WW3DAssetManager::Remove_Prototype(PrototypeClass *proto)
 		const char *pname = proto->Get_Name ();
 		bool bfound = false;
 		PrototypeClass *prev = NULL;
-		int hash = CRC_Stringi(pname) & PROTOTYPE_HASH_MASK;				
+		int hash = CRC_Stringi(pname) & PROTOTYPE_HASH_MASK;
 		for (PrototypeClass *test = PrototypeHashTable[hash];
 			  (test != NULL) && (bfound == false);
 			  test = test->friend_getNextHash()) {
-			
+
 			// Is this the prototype?
 			if (::stricmp (test->Get_Name(), pname) == 0) {
-				
+
 				// Remove this prototype from the linked list for this hash index.
 				if (prev == NULL) {
 					PrototypeHashTable[hash] = test->friend_getNextHash();
@@ -1691,7 +1670,7 @@ PrototypeClass * WW3DAssetManager::Find_Prototype(const char * name)
 	if (stricmp(name,"NULL") == 0) {
 		return &(_NullPrototype);
 	}
-	
+
 	// Find the prototype
 	int hash = CRC_Stringi(name) & PROTOTYPE_HASH_MASK;
 	PrototypeClass * test = PrototypeHashTable[hash];
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h
index 36e8446dee3..f3f1ca83f79 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h
@@ -17,37 +17,31 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/assetmgr.h 19    12/17/01 7:55p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando                                                     * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/assetmgr.h                             $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 12/15/01 4:14p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 19                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando                                                     *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/assetmgr.h                             $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 12/15/01 4:14p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 19                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef ASSETMGR_H
-#define ASSETMGR_H
 
 #include "always.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "htreemgr.h"
 #include "hanimmgr.h"
-#include "SLIST.H"
+#include "SLIST.h"
 #include "texture.h"
 #include "hashtemplate.h"
 #include "simplevec.h"
@@ -116,7 +110,7 @@ class RenderObjIterator : public AssetIterator
 	WW3DAssetManager
 
 	This object is the manager of all of the 3D data.  Load your meshes, animations,
-	etc etc using the Load_3D_Assets function.  
+	etc etc using the Load_3D_Assets function.
 
 	WARNING: hierarchy trees should be loaded before the meshes and animations
 	which attach to them.
@@ -124,15 +118,15 @@ class RenderObjIterator : public AssetIterator
 	-------------------------------------------------------------------------------------
 	Dec 11, 1997, Asset Manager Brainstorming:
 
-	- WW3DAssetManager will be diferentiated from other game data asset managers
+	- WW3DAssetManager will be differentiated from other game data asset managers
 	(sounds, strings, etc) because they behave differently and serve different
 	purposes
 
 	- WW3D creates "clones" from the blueprints it has of render objects whereas
-	Our commando data asset manager will provide the data (file images) for the 
+	Our commando data asset manager will provide the data (file images) for the
 	blueprints.  Maybe the CommandoDataManager could deal in MemoryFileClasses.
 	Or void * and then the ww3d manager could convert to MemoryFiles...
-	
+
 	- Future caching: In the case that we want to implement a caching system,
 	assets must be "released" when not in use.
 
@@ -154,7 +148,7 @@ class RenderObjIterator : public AssetIterator
 	the 3d asset manager may find that it needs another asset (such as a hierarchy tree).
 	It will then recurse, and ask for that asset.
 
-	- Copy Mode will go away.  It will be internally set based on whether the mesh 
+	- Copy Mode will go away.  It will be internally set based on whether the mesh
 	contains vertex animation.  All other render objects will simply "Clone".
 
 	- Commando will derive a Cmdo3DAssetManager which knows about the special chunks
@@ -163,14 +157,14 @@ class RenderObjIterator : public AssetIterator
 	-------------------------------------------------------------------------------------
 	July 28, 1998
 
-	- Exposed the prototype system and added prototype loaders (PrototypeClass and 
+	- Exposed the prototype system and added prototype loaders (PrototypeClass and
 	PrototypeLoaderClass in proto.h).  This now allows the user to install his own
-	loaders for new render object types. 
+	loaders for new render object types.
 
 	- Simplified the interface by removing the special purpose creation functions,
-	leaving only the Create_Render_Obj function.  
-	
-	- In certain cases some users need to know what kind of render object was created 
+	leaving only the Create_Render_Obj function.
+
+	- In certain cases some users need to know what kind of render object was created
 	so we added a Class_ID mechanism to RenderObjClass.
 
 	- Class_ID for render objects is not enough.  Need the asset iterator to be able
@@ -178,6 +172,10 @@ class RenderObjIterator : public AssetIterator
 	the prototype class needs to be able to tell you the class ID.  Actually this
 	code only seems to be used by tools such as SView but is needed anyway...
 
+	-------------------------------------------------------------------------------------
+	TheSuperHackers @fix xezon 08/11/2025
+	The Asset Manager will now return null when it cannot find or create a valid font
+	with the given inputs. This way the user knows that the requested font is unusable.
 */
 
 
@@ -203,7 +201,7 @@ class WW3DAssetManager
 	**	WW3DAssetManager::Get_Instance();
 	*/
 	static WW3DAssetManager *		Get_Instance(void) { return TheInstance; }
-	static void							Delete_This(void) { if (TheInstance) delete TheInstance; TheInstance=NULL; }
+	static void							Delete_This(void) { delete TheInstance; TheInstance=NULL; }
 
 	/*
 	** Load data from any type of w3d file
@@ -230,7 +228,7 @@ class WW3DAssetManager
 	/*
 	** create me an instance of one of the prototype render objects
 	*/
-	virtual RenderObjClass *		Create_Render_Obj(const char * name);	
+	virtual RenderObjClass *		Create_Render_Obj(const char * name);
 
 	/*
 	** query if there is a render object with the specified name
@@ -264,14 +262,13 @@ class WW3DAssetManager
 
 	virtual TextureClass *			Get_Texture
 	(
-		const char * filename, 
+		const char * filename,
 		MipCountType mip_level_count=MIP_LEVELS_ALL,
 		WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN,
 		bool allow_compression=true,
 		TextureBaseClass::TexAssetType type=TextureBaseClass::TEX_REGULAR,
 		bool allow_reduction=true
 	);
-	TextureClass*						Get_Bumpmap_Based_On_Texture(TextureClass* texture);
 
 	virtual void						Release_All_Textures(void);
 	virtual void						Release_Unused_Textures(void);
@@ -281,12 +278,12 @@ class WW3DAssetManager
 
 	/*
 	** Access to Font3DInstances. (These are not saved, we just use the
-	** asset manager as a convienient way to create them.)
+	** asset manager as a convenient way to create them.)
 	*/
 	virtual Font3DInstanceClass * Get_Font3DInstance( const char * name);
 
 	/*
-	** Access to FontChars. Used by Render2DSentenceClass
+	** Access to FontChars. Used by Render2DSentenceClass. Can return null.
 	*/
 	virtual FontCharsClass *		Get_FontChars( const char * name, int point_size, bool is_bold = false );
 
@@ -304,7 +301,7 @@ class WW3DAssetManager
 	virtual void						Register_Prototype_Loader(PrototypeLoaderClass * loader);
 
 	/*
-	**	The Add_Prototype is public so that we can add prototypes for procedurally 
+	**	The Add_Prototype is public so that we can add prototypes for procedurally
 	** generated objects to the asset manager.
 	*/
 	void									Add_Prototype(PrototypeClass * newproto);
@@ -349,7 +346,7 @@ class WW3DAssetManager
 	/*
 	** Compile time control over the dynamic arrays:
 	*/
-	enum 
+	enum
 	{
 		PROTOLOADERS_VECTOR_SIZE =	32,
 		PROTOLOADERS_GROWTH_RATE =	16,
@@ -364,7 +361,7 @@ class WW3DAssetManager
 	** them into prototypes.
 	*/
 	DynamicVectorClass < PrototypeLoaderClass * >			PrototypeLoaders;
-	
+
 	/*
 	** Prototypes
 	** These objects are abstract factories for named render objects.  Prototypes is
@@ -376,10 +373,10 @@ class WW3DAssetManager
 	** Prototype Hash Table
 	** This structure is simply used to speed up the name lookup for prototypes
 	*/
-	enum 
-	{ 
-		PROTOTYPE_HASH_TABLE_SIZE =	4096, 
-		PROTOTYPE_HASH_BITS =			12, 
+	enum
+	{
+		PROTOTYPE_HASH_TABLE_SIZE =	4096,
+		PROTOTYPE_HASH_BITS =			12,
 		PROTOTYPE_HASH_MASK =			0x00000FFF
 	};
 
@@ -437,5 +434,3 @@ class WW3DAssetManager
 	// Font3DInstance need access to the Font3DData
 	friend class Font3DInstanceClass;
 };
-
-#endif
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp
deleted file mode 100644
index fa7c3850fa5..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Commando/G                               * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/bmp2d.cpp          $* 
- *                                                                         * 
- *                      $Author:: Naty_h                                  $* 
- *                                                                         * 
- *                     $Modtime:: 4/13/01 1:37p                           $* 
- *                                                                         * 
- *                    $Revision:: 10                                      $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include "bmp2d.h"
-#include "pot.h"
-#include "ww3d.h"
-#include "texture.h"
-#include "surfaceclass.h"
-
-Bitmap2DObjClass::Bitmap2DObjClass
-(
-	const char *filename,
-	float screen_x,
-	float screen_y,
-	bool center,
-	bool additive,
-	bool colorizable,
-	int usable_width,
-	int usable_height,
-	bool ignore_alpha
-)
-	:	DynamicScreenMeshClass(2, 4)
-{
-	
-	int resw, resh, resbits;
-	bool windowed;
-	
-	// find the resolution (for centering and pixel to pixel translation)
-	WW3D::Get_Device_Resolution(resw, resh, resbits, windowed);
-	// This should be the correct way to do things
-	// but other code expects an aspect ratio of 1.0
-	// Hector Yee 2/22/01
-	// Set_Aspect(resh/(float)resw);
-	
-
-	// load up the surfaces file name
-	SurfaceClass *surface=NEW_REF(SurfaceClass,(filename));	
-
-	SurfaceClass::SurfaceDescription sd;
-	surface->Get_Description(sd);
-
-	if (usable_width == -1)
-		usable_width = sd.Width;
-	if (usable_height == -1)
-		usable_height = sd.Height;
-
-	// if we requested the image to be centered around a point adjust the
-	// coordinates accordingly.
-	if (center) {
-		screen_x -= ((float)usable_width  / resw) / 2;
-		screen_y -= ((float)usable_height / resh) / 2;
-	}
-
-	// The image will be broken down into square textures. The size of these
-	// textures will be the smallest POT (power of two) which is equal or
-	// greater than the smaller dimension of the image. Also, the pieces can
-	// never be larger than 256 texels because some rendering devices don't
-	// support textures larger than that.
-	int surf_w = usable_width;
-	int surf_h = usable_height;
-	int piece = Find_POT(MIN(surf_w, surf_h));
-	piece = MIN(piece, 256);
-
-	// now take the image in question and break it down into
-	// "piece"x"piece"-pixel polygons and calculate the number of textures
-	// based from those calculations.
-	int mw = (surf_w & (piece - 1)) ? (surf_w / piece)+1 : (surf_w /piece);
-	int mh = (surf_h & (piece - 1)) ? (surf_h / piece)+1 : (surf_h /piece);
-	
-	// for every square texture it takes four vertexes to express the two
-	// polygons.
-	Resize(mw * mh *2, mw * mh * 4);
-
-	// Set shader to additive if requested, else alpha or opaque depending on
-	// whether the texture has an alpha channel. Sorting is always set so that
-	// sortbias can be used to determine occlusion between the various 2D
-	// elements.
-	ShaderClass shader;
-
-	if (additive) {
-		shader = ShaderClass::_PresetAdditive2DShader;
-	} else {
-		if (ignore_alpha == false && Has_Alpha(sd.Format)) {
-			shader = ShaderClass::_PresetAlpha2DShader;
-		} else {
-			shader = ShaderClass::_PresetOpaque2DShader;
-		}
-	}
-
-	Enable_Sort();
-
-
-	// If we want to be able to colorize this bitmap later (by setting
-	// emissive color for the vertex material, or via a vertex emissive color
-	// array) we need to enable the primary gradient in the shader (it is
-	// disabled in the 2D presets), and set an appropriate vertex material.
-	if (colorizable) {
-		shader.Set_Primary_Gradient(ShaderClass::GRADIENT_MODULATE);
-		VertexMaterialClass *vertex_material = NEW_REF( VertexMaterialClass, ());
-		vertex_material->Set_Ambient(0.0f, 0.0f, 0.0f);
-		vertex_material->Set_Diffuse(0.0f, 0.0f, 0.0f);
-		vertex_material->Set_Specular(0.0f, 0.0f, 0.0f);
-		vertex_material->Set_Emissive(1.0f, 1.0f, 1.0f);
-		Set_Vertex_Material(vertex_material, true);
-		vertex_material->Release_Ref();
-	}
-
-	// Set desired shader.
-	Set_Shader(shader);
-
-	// loop through the rows and columns of the image and make valid
-	// textures from the pieces.
-	for (int lpy = 0, tlpy=0; lpy < mh; lpy++, tlpy += piece) {
-		for (int lpx = 0, tlpx = 0; lpx < mw; lpx++, tlpx += piece) {
-
-			// figure the desired width and height of the texture (max "piece")
-			int iw				= MIN(piece, usable_width - (tlpx));
-			int ih				= MIN(piece, usable_height - (tlpy));
-			int pot				= MAX(Find_POT(iw), Find_POT(ih));
-
-			// create the texture and turn MIP-mapping off.
-			SurfaceClass *piece_surface=NEW_REF(SurfaceClass,(pot,pot,sd.Format));			
-			piece_surface->Copy(0,0,tlpx,tlpy,pot,pot,surface);
-			TextureClass *piece_texture =NEW_REF(TextureClass,(piece_surface,MIP_LEVELS_1));			
-			piece_texture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-			piece_texture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-			REF_PTR_RELEASE(piece_surface);			
-
-			// calculate our actual texture coordinates based on the difference between
-			// the width and height of the texture and the width and height the font
-			// occupys.
-			float tw = (float)iw / (float)pot;
-			float th = (float)ih / (float)pot;
-
-			// convert image width and image height to normalized values
-			float vw = (float)iw / (float)resw;
-			float vh = (float)ih / (float)resh;
-
-			// figure out the screen space x and y positions of the object in question.
-			float x	= screen_x + (((float)tlpx) / (float)resw);
-			float y	= screen_y + (((float)tlpy) / (float)resh);
-			
-			Set_Texture(piece_texture);
-			Begin_Tri_Strip();
-				Vertex( x, 			y, 		0, 	0, 	0);
-				Vertex( x + vw, 	y, 		0, 	tw, 	0);
-				Vertex( x, 			y + vh, 	0, 	0, 	th);
-				Vertex( x + vw, 	y + vh, 	0, 	tw, 	th);
-			End_Tri_Strip();
-
-			// release our reference to the texture
-			REF_PTR_RELEASE(piece_texture);			
-		}
-	}
-	REF_PTR_RELEASE(surface);	
-
-	Set_Dirty();
-}
-
-Bitmap2DObjClass::Bitmap2DObjClass
-(
-	TextureClass *texture,
-	float screen_x,
-	float screen_y,
-	bool center,
-	bool additive,
-	bool colorizable,
-	bool ignore_alpha
-)
-	:	DynamicScreenMeshClass(2, 4)
-{
-	int resw, resh, resbits;
-	bool windowed;
-
-	// find the resolution (for centering and pixel to pixel translation)
-	WW3D::Get_Device_Resolution(resw, resh, resbits, windowed);
-	// This should be the correct way to do things
-	// but other code expects an aspect ratio of 1.0
-	// Hector Yee 2/22/01
-	//Set_Aspect(resh/(float)resw);
-
-	// Find the dimensions of the texture:
-//	SurfaceClass::SurfaceDescription sd;
-//	texture->Get_Level_Description(sd);
-		
-	// convert image width and image height to normalized values
-	float vw = (float) texture->Get_Width() / (float)resw;
-	float vh = (float) texture->Get_Height() / (float)resh;
-
-	// if we requested the image to be centered around a point adjust the
-	// coordinates accordingly.
-	if (center) {
-		screen_x -= vw / 2;
-		screen_y -= vh / 2;
-	}
-
-	// Set shader to additive if requested, else alpha or opaque depending on whether the texture
-	// has an alpha channel. Sorting is never set - if you wish to sort these types of objects you
-	// should use static sort levels (note that static sort levels are not implemented for these
-	// objects yet, but it should be very simple to do).
-	ShaderClass shader;
-
-	if (additive) {
-		shader = ShaderClass::_PresetAdditive2DShader;
-	} else {
-		if (ignore_alpha == false && Has_Alpha(texture->Get_Texture_Format())) {
-			shader = ShaderClass::_PresetAlpha2DShader;
-		} else {
-			shader = ShaderClass::_PresetOpaque2DShader;
-		}
-	}
-	Disable_Sort();
-
-	// If we want to be able to colorize this bitmap later (by setting
-	// emissive color for the vertex material, or via a vertex emissive color
-	// array) we need to enable the primary gradient in the shader (it is
-	// disabled in the 2D presets), and set an appropriate vertex material.
-	if (colorizable) {
-		shader.Set_Primary_Gradient(ShaderClass::GRADIENT_MODULATE);
-		VertexMaterialClass *vertex_material = NEW_REF( VertexMaterialClass, ());
-		vertex_material->Set_Ambient(0.0f, 0.0f, 0.0f);
-		vertex_material->Set_Diffuse(0.0f, 0.0f, 0.0f);
-		vertex_material->Set_Specular(0.0f, 0.0f, 0.0f);
-		vertex_material->Set_Emissive(1.0f, 1.0f, 1.0f);
-		Set_Vertex_Material(vertex_material, true);
-		vertex_material->Release_Ref();
-	}
-
-	// Set desired shader.
-	Set_Shader(shader);
-
-	// Set texture to requested texture:
-	Set_Texture(texture);
-
-	Begin_Tri_Strip();
-		Vertex( screen_x,			screen_y,		0,	0,		0);
-		Vertex( screen_x + vw, 	screen_y,		0,	1.0,	0);
-		Vertex( screen_x, 		screen_y + vh,	0,	0,		1.0);
-		Vertex( screen_x + vw, 	screen_y + vh,	0,	1.0,	1.0);
-	End_Tri_Strip();
-
-	Set_Dirty();
-}
-
-RenderObjClass * Bitmap2DObjClass::Clone(void) const
-{
-	return NEW_REF( Bitmap2DObjClass, (*this));
-}
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h
deleted file mode 100644
index c61ce8d4635..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Commando/G                               * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/bmp2d.h            $* 
- *                                                                         * 
- *                      $Author:: Hector_y                                $* 
- *                                                                         * 
- *                     $Modtime:: 2/21/01 1:31p                           $* 
- *                                                                         * 
- *                    $Revision:: 3                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef BMP2D_H
-#define BMP2D_H
-
-#include "dynamesh.h"
-
-class Bitmap2DObjClass : public DynamicScreenMeshClass
-{
-	public:
-		Bitmap2DObjClass(const char *filename, float norm_x, float norm_y,
-			bool center, bool additive, bool colorizable = false, int width = -1, int height = -1, bool ignore_alpha = false);
-		Bitmap2DObjClass(TextureClass *texture, float norm_x, float norm_y,
-			bool center, bool additive, bool colorizable = false, bool ignore_alpha = false);
-		Bitmap2DObjClass( const Bitmap2DObjClass & src) : DynamicScreenMeshClass(src) {}
-
-		virtual RenderObjClass * 	Clone(void) const;
-		virtual int						Class_ID(void) const { return CLASSID_BITMAP2D; }
-};
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp
index c261051a6ed..829cb1406c9 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp
@@ -110,10 +110,10 @@
 #define NUM_BOX_FACES	12
 
 // Face Connectivity
-static TriIndex					_BoxFaces[NUM_BOX_FACES] = 
+static TriIndex					_BoxFaces[NUM_BOX_FACES] =
 {
 	TriIndex( 0,1,2 ),		// +z faces
-	TriIndex( 0,2,3 ),		
+	TriIndex( 0,2,3 ),
 	TriIndex( 4,7,6 ),		// -z faces
 	TriIndex( 4,6,5 ),
 	TriIndex( 0,3,7 ),		// +x faces
@@ -127,7 +127,7 @@ static TriIndex					_BoxFaces[NUM_BOX_FACES] =
 };
 
 // Vertex Positions as a function of the box extents
-static Vector3						_BoxVerts[NUM_BOX_VERTS] = 
+static Vector3						_BoxVerts[NUM_BOX_VERTS] =
 {
 	Vector3(  1.0f, 1.0f, 1.0f ),		// +z ring of 4 verts
 	Vector3( -1.0f, 1.0f, 1.0f ),
@@ -307,8 +307,8 @@ const char * BoxRenderObjClass::Get_Name(void) const
 void BoxRenderObjClass::Set_Name(const char * name)
 {
 	WWASSERT(name != NULL);
-	WWASSERT(strlen(name) < 2*W3D_NAME_LEN);
-	strcpy(Name,name);
+	size_t nameLen = strlcpy(Name, name, ARRAY_SIZE(Name));
+	(void)nameLen; WWASSERT(nameLen < ARRAY_SIZE(Name));
 }
 
 
@@ -385,7 +385,7 @@ void BoxRenderObjClass::Shutdown(void)
 {
 	WWASSERT(IsInitted == true);
 	REF_PTR_RELEASE(_BoxMaterial);
-	
+
 	IsInitted = false;
 }
 
@@ -456,10 +456,10 @@ void BoxRenderObjClass::render_box(RenderInfoClass & rinfo,const Vector3 & cente
 		}
 
 		/*
-		** Dump the box vertices into the sorting dynamic vertex buffer. 
+		** Dump the box vertices into the sorting dynamic vertex buffer.
 		*/
 		DWORD color = DX8Wrapper::Convert_Color(Color,Opacity);
-		
+
 		int buffer_type = BUFFER_TYPE_DYNAMIC_SORTING;
 
 		DynamicVBAccessClass vbaccess(buffer_type,dynamic_fvf_type,NUM_BOX_VERTS);
@@ -474,7 +474,7 @@ void BoxRenderObjClass::render_box(RenderInfoClass & rinfo,const Vector3 & cente
 				vb->x=verts[i][0];
 				vb->y=verts[i][1];
 				vb->z=verts[i][2];
-				
+
 				// Normals
 				vb->nx=_BoxVertexNormals[i][0];
 				vb->ny=_BoxVertexNormals[i][1];
@@ -507,12 +507,12 @@ void BoxRenderObjClass::render_box(RenderInfoClass & rinfo,const Vector3 & cente
 		DX8Wrapper::Set_Material(_BoxMaterial);
 		DX8Wrapper::Set_Shader(_BoxShader);
 		DX8Wrapper::Set_Texture(0,NULL);
-		
+
 		DX8Wrapper::Set_Index_Buffer(ibaccess,0);
 		DX8Wrapper::Set_Vertex_Buffer(vbaccess);
 
 		SphereClass sphere;
-		Get_Obj_Space_Bounding_Sphere(sphere); 
+		Get_Obj_Space_Bounding_Sphere(sphere);
 
 		DX8Wrapper::Draw_Triangles(buffer_type,0,NUM_BOX_FACES,0,NUM_BOX_VERTS);
 	}
@@ -536,7 +536,7 @@ void BoxRenderObjClass::render_box(RenderInfoClass & rinfo,const Vector3 & cente
 void BoxRenderObjClass::vis_render_box(SpecialRenderInfoClass & rinfo,const Vector3 & center,const Vector3 & extent)
 {
 	if (!IsInitted) return;
-	
+
 	static Vector3 verts[NUM_BOX_VERTS];
 
 	// compute the vertex positions
@@ -874,7 +874,7 @@ bool AABoxRenderObjClass::Cast_OBBox(OBBoxCollisionTestClass & boxtest)
 bool AABoxRenderObjClass::Intersect_AABox(AABoxIntersectionTestClass & boxtest)
 {
 	if ((Get_Collision_Type() & boxtest.CollisionType) == 0) return false;
-	return CollisionMath::Intersection_Test(CachedBox,boxtest.Box);	
+	return CollisionMath::Intersection_Test(CachedBox,boxtest.Box);
 }
 
 
@@ -1250,7 +1250,7 @@ bool OBBoxRenderObjClass::Cast_OBBox(OBBoxCollisionTestClass & boxtest)
 bool OBBoxRenderObjClass::Intersect_AABox(AABoxIntersectionTestClass & boxtest)
 {
 	if ((Get_Collision_Type() & boxtest.CollisionType) == 0) return false;
-	return CollisionMath::Intersection_Test(CachedBox,boxtest.Box);	
+	return CollisionMath::Intersection_Test(CachedBox,boxtest.Box);
 }
 
 
@@ -1359,7 +1359,7 @@ int BoxPrototypeClass::Get_Class_ID(void) const
 		return RenderObjClass::CLASSID_AABOX;
 	}
 }
-	
+
 RenderObjClass * BoxPrototypeClass::Create(void)
 {
 	if (Definition.Attributes & W3D_BOX_ATTRIBUTE_ORIENTED) {
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h
index 54318ec3eb2..2ef2495017d 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef BOXROBJ_H
-#define BOXROBJ_H
 
 #include "always.h"
 #include "rendobj.h"
@@ -54,14 +49,14 @@ class VertexMaterialClass;
 /**
 ** BoxRenderObjClass: base class for AABox and OBBox collision boxes
 **
-** NOTE: these render objects were designed from the start to be used for 
+** NOTE: these render objects were designed from the start to be used for
 ** collision boxes.  They are designed to normally never render unless you
 ** set the display mask and then, all boxes of that type will render.
 ** The display mask is 'AND'ed with the collision bits in the base render
 ** object class to determine if the box should be rendered.  WW3D provides
 ** an interface for setting this mask in your app.
 **
-** NOTE2: AABoxRenderObjClass is an axis-aligned box which will be positioned 
+** NOTE2: AABoxRenderObjClass is an axis-aligned box which will be positioned
 ** at a world-space offset (its local center) from the origin of the transform.
 ** This is done because AABoxes are used for rotationally invariant collision
 ** detection so we don't want the boxes to move around as the object rotates.
@@ -70,10 +65,10 @@ class VertexMaterialClass;
 **
 ** NOTE3: OBBoxRenderObjClass is an oriented box which is aligned with its transform
 ** but can have a center point that is offest from the transform's origin.
-** 
+**
 */
 class BoxRenderObjClass : public RenderObjClass
-{	
+{
 
 public:
 
@@ -90,7 +85,7 @@ class BoxRenderObjClass : public RenderObjClass
 
 	static void							Init(void);
 	static void							Shutdown(void);
-	
+
 	static void							Set_Box_Display_Mask(int mask);
 	static int							Get_Box_Display_Mask(void);
 
@@ -101,7 +96,7 @@ class BoxRenderObjClass : public RenderObjClass
 	const Vector3 &					Get_Local_Extent(void) { return ObjSpaceExtent; }
 
 protected:
-	
+
 	virtual void						update_cached_box(void) = 0;
 	void									render_box(RenderInfoClass & rinfo,const Vector3 & center,const Vector3 & extent);
 	void									vis_render_box(SpecialRenderInfoClass & rinfo,const Vector3 & center,const Vector3 & extent);
@@ -146,13 +141,13 @@ class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass
 	AABoxRenderObjClass & operator = (const AABoxRenderObjClass &);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
 	virtual void					Render(RenderInfoClass & rinfo);
 	virtual void					Special_Render(SpecialRenderInfoClass & rinfo);
-	virtual void 					Set_Transform(const Matrix3D &m); 
+	virtual void 					Set_Transform(const Matrix3D &m);
 	virtual void 					Set_Position(const Vector3 &v);
 	virtual bool					Cast_Ray(RayCollisionTestClass & raytest);
 	virtual bool					Cast_AABox(AABoxCollisionTestClass & boxtest);
@@ -163,23 +158,23 @@ class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass
    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & box) const;
 
 	/////////////////////////////////////////////////////////////////////////////
-	// AABoxRenderObjClass Interface 
+	// AABoxRenderObjClass Interface
 	/////////////////////////////////////////////////////////////////////////////
 	const AABoxClass &			Get_Box(void);
 
 protected:
-	
+
 	virtual void					update_cached_box(void);
 
 	AABoxClass						CachedBox;
 
 };
 
-inline const AABoxClass & AABoxRenderObjClass::Get_Box(void) 
-{ 
+inline const AABoxClass & AABoxRenderObjClass::Get_Box(void)
+{
 	Validate_Transform();
 	update_cached_box();
-	return CachedBox; 
+	return CachedBox;
 }
 
 /*
@@ -197,13 +192,13 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass
 	OBBoxRenderObjClass & operator = (const OBBoxRenderObjClass &);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
 	virtual void					Render(RenderInfoClass & rinfo);
 	virtual void					Special_Render(SpecialRenderInfoClass & rinfo);
-	virtual void 					Set_Transform(const Matrix3D &m); 
+	virtual void 					Set_Transform(const Matrix3D &m);
 	virtual void 					Set_Position(const Vector3 &v);
 	virtual bool					Cast_Ray(RayCollisionTestClass & raytest);
 	virtual bool					Cast_AABox(AABoxCollisionTestClass & boxtest);
@@ -214,14 +209,14 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass
    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & box) const;
 
 	/////////////////////////////////////////////////////////////////////////////
-	// OBBoxRenderObjClass Interface 
+	// OBBoxRenderObjClass Interface
 	/////////////////////////////////////////////////////////////////////////////
 	OBBoxClass &					Get_Box(void);
 
 protected:
-	
+
 	virtual void					update_cached_box(void);
-	
+
 	OBBoxClass						CachedBox;
 
 };
@@ -259,9 +254,3 @@ class BoxPrototypeClass : public W3DMPO, public PrototypeClass
 ** Instance of the loader which the asset manager installs
 */
 extern BoxLoaderClass			_BoxLoader;
-
-
-
-
-#endif
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp
index 706721d057a..aadd17ced0c 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                    Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 24                                                          $*
@@ -117,7 +117,7 @@ CameraClass::CameraClass(void) :
  *   3/21/98    GTH : Created.                                                                 *
  *   4/13/2001  hy : added in copy code for new member functions                               *
  *=============================================================================================*/
-CameraClass::CameraClass(const CameraClass & src) : 
+CameraClass::CameraClass(const CameraClass & src) :
 	RenderObjClass(src),
 	Projection(src.Projection),
 	Viewport(src.Viewport),
@@ -154,7 +154,7 @@ CameraClass & CameraClass::operator = (const CameraClass & that)
 {
 	if (this != &that) {
 		RenderObjClass::operator = (that);
-	
+
 		Projection = that.Projection;
 		Viewport = that.Viewport;
 		ViewPlane = that.ViewPlane;
@@ -165,13 +165,13 @@ CameraClass & CameraClass::operator = (const CameraClass & that)
 		NearClipBBox = that.NearClipBBox;
 		ProjectionTransform = that.ProjectionTransform;
 		CameraInvTransform = that.CameraInvTransform;
-		
+
 		// just being paraniod in case any parent class doesn't completely copy the entire state...
 		FrustumValid = false;
 	}
 
 	return * this;
-}  	
+}
 
 
 /***********************************************************************************************
@@ -261,10 +261,10 @@ void CameraClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
  * HISTORY:                                                                                    *
  *   5/29/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-void CameraClass::Set_Transform(const Matrix3D &m)	
-{ 
+void CameraClass::Set_Transform(const Matrix3D &m)
+{
 	RenderObjClass::Set_Transform(m);
-	FrustumValid = false; 
+	FrustumValid = false;
 }
 
 
@@ -283,9 +283,9 @@ void CameraClass::Set_Transform(const Matrix3D &m)
  *   5/29/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 void CameraClass::Set_Position(const Vector3 &v)
-{ 
-	RenderObjClass::Set_Position(v); 
-	FrustumValid = false; 
+{
+	RenderObjClass::Set_Position(v);
+	FrustumValid = false;
 }
 
 
@@ -329,17 +329,17 @@ void CameraClass::Set_View_Plane(float hfov,float vfov)
 
 	float width_half = tan(hfov/2.0);
 	float height_half = 0.0f;
-	
-	if (vfov == -1) {									
+
+	if (vfov == -1) {
 		height_half = (1.0f / AspectRatio) * width_half;		// use the aspect ratio
 	} else {
 		height_half = tan(vfov/2.0);
 		AspectRatio = width_half / height_half;					// or, initialize the aspect ratio
 	}
-	
+
 	ViewPlane.Min.Set(-width_half,-height_half);
 	ViewPlane.Max.Set(width_half,height_half);
-	
+
 	FrustumValid = false;
 }
 
@@ -424,7 +424,7 @@ CameraClass::ProjectionResType CameraClass::Project(Vector3 & dest,const Vector3
 
 	if ((dest.X < -1.0f) || (dest.X > 1.0f) || (dest.Y < -1.0f) || (dest.Y > 1.0f)) {
 		return OUTSIDE_FRUSTUM;
-	}	
+	}
 
 	return INSIDE_FRUSTUM;
 }
@@ -445,7 +445,7 @@ CameraClass::ProjectionResType CameraClass::Project(Vector3 & dest,const Vector3
  * HISTORY:                                                                                    *
  *   11/17/2000 gth : Created.                                                                 *
  *=============================================================================================*/
-CameraClass::ProjectionResType 
+CameraClass::ProjectionResType
 CameraClass::Project_Camera_Space_Point(Vector3 & dest,const Vector3 & cam_point) const
 {
 	Update_Frustum();
@@ -467,7 +467,7 @@ CameraClass::Project_Camera_Space_Point(Vector3 & dest,const Vector3 & cam_point
 
 	if ((dest.X < -1.0f) || (dest.X > 1.0f) || (dest.Y < -1.0f) || (dest.Y > 1.0f)) {
 		return OUTSIDE_FRUSTUM;
-	}	
+	}
 
 	return INSIDE_FRUSTUM;
 }
@@ -497,7 +497,7 @@ void CameraClass::Un_Project(Vector3 & dest,const Vector2 & view_point) const
 	*/
 	float vpdx = ViewPlane.Max.X - ViewPlane.Min.X;
 	float vpdy = ViewPlane.Max.Y - ViewPlane.Min.Y;
-	
+
 	Vector3 point;
 	point.X = ViewPlane.Min.X + vpdx * (view_point.X + 1.0f) * 0.5f;
 	point.Y = ViewPlane.Min.Y + vpdy * (view_point.Y + 1.0f) * 0.5f;
@@ -505,7 +505,7 @@ void CameraClass::Un_Project(Vector3 & dest,const Vector2 & view_point) const
 
 	Matrix3D::Transform_Vector(Transform,point,&dest);
 }
-	
+
 
 /***********************************************************************************************
  * CameraClass::Transform_To_View_Space -- transforms the given world space point to camera sp *
@@ -524,7 +524,7 @@ void CameraClass::Transform_To_View_Space(Vector3 & dest,const Vector3 & ws_poin
 	Update_Frustum();
 	Matrix3D::Transform_Vector(CameraInvTransform,ws_point,&dest);
 }
-	
+
 
 /***********************************************************************************************
  * CameraClass::Rotate_To_View_Space -- rotates the given world space vector to camera space   *
@@ -561,8 +561,8 @@ void CameraClass::Rotate_To_View_Space(Vector3 & dest,const Vector3 & ws_vector)
 const OBBoxClass & CameraClass::Get_Near_Clip_Bounding_Box(void) const
 {
 	Update_Frustum();
-	return NearClipBBox;	
-}	
+	return NearClipBBox;
+}
 
 
 /***********************************************************************************************
@@ -639,7 +639,7 @@ void CameraClass::Update_Frustum(void) const
 															znear_dist, zfar_dist );
 
 	} else {
-		
+
 		ProjectionTransform.Init_Ortho( vpmin.X,vpmax.X,vpmin.Y,vpmax.Y,znear_dist,zfar_dist);
 
 	}
@@ -676,7 +676,7 @@ void CameraClass::Device_To_View_Space(const Vector2 & device_coord,Vector3 * se
 	Vector2 vs_min;
 	Vector2 vs_max;
 	Get_View_Plane(vs_min,vs_max);
-	
+
 	// mapping from the viewport coordinates to view space coordinates
 	set_view->X = vs_min.X + (ndev.X - Viewport.Min.X) * (vs_max.X - vs_min.X) / (Viewport.Width());
 	set_view->Y = vs_max.Y - (ndev.Y - Viewport.Min.Y) * (vs_max.Y - vs_min.Y) / (Viewport.Height());
@@ -723,7 +723,7 @@ void CameraClass::Apply(void)
 	int width,height,bits;
 	bool windowed;
 	WW3D::Get_Render_Target_Resolution(width,height,bits,windowed);
-	
+
 	D3DVIEWPORT8 vp;
 	vp.X = (DWORD)(Viewport.Min.X * (float)width);
 	vp.Y = (DWORD)(Viewport.Min.Y * (float)height);
@@ -739,40 +739,40 @@ void CameraClass::Apply(void)
 	DX8Wrapper::Set_Transform(D3DTS_VIEW,CameraInvTransform);
 }
 
-void CameraClass::Set_Clip_Planes(float znear,float zfar)						
-{ 
+void CameraClass::Set_Clip_Planes(float znear,float zfar)
+{
 	FrustumValid = false;
 	ZNear = znear;
 	ZFar = zfar;
 }
 
-void CameraClass::Get_Clip_Planes(float & znear,float & zfar) const		
-{ 
+void CameraClass::Get_Clip_Planes(float & znear,float & zfar) const
+{
 	znear = ZNear;
 	zfar = ZFar;
 }
 
-float CameraClass::Get_Horizontal_FOV(void) const 
-{ 
+float CameraClass::Get_Horizontal_FOV(void) const
+{
 	float width = ViewPlane.Max.X - ViewPlane.Min.X;
 	return 2*WWMath::Atan2(width,2.0);
 }
 
-float CameraClass::Get_Vertical_FOV(void) const 
-{ 
+float CameraClass::Get_Vertical_FOV(void) const
+{
 	float height = ViewPlane.Max.Y - ViewPlane.Min.Y;
 	return 2*WWMath::Atan2(height,2.0);
 }
 
-float CameraClass::Get_Aspect_Ratio(void) const 
-{ 
+float CameraClass::Get_Aspect_Ratio(void) const
+{
 	return AspectRatio;
 }
 
 void CameraClass::Get_Projection_Matrix(Matrix4x4 * set_tm)
 {
 	WWASSERT(set_tm != NULL);
-	
+
 	Update_Frustum();
 	*set_tm = ProjectionTransform;
 }
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h
index 29970301b93..db25bf92605 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                    Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 14                                                          $*
@@ -43,12 +43,7 @@
  *   CameraClass::Get_View_Space_Frustum_Corners -- returns the corners of the view space frus *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef CAMERA_H
-#define CAMERA_H
 
 #include "always.h"
 #include "rendobj.h"
@@ -69,11 +64,11 @@ class RenderInfoClass;
 */
 class ViewportClass
 {
-public:	
+public:
 	ViewportClass(void) : Min(0,0), Max(1,1)													{ }
 	ViewportClass(const Vector2 & min,const Vector2 & max) : Min(min), Max(max)	{ }
 	ViewportClass(const ViewportClass & vp) : Min(vp.Min), Max(vp.Max)				{ }
-	
+
 	float	Width(void)	const																			{ return Max.X - Min.X; }
 	float Height(void) const																		{ return Max.Y - Min.Y; }
 
@@ -88,15 +83,15 @@ class ViewportClass
 ** space, the parameters of the perspective projection, and the viewport
 ** on screen that the result is mapped into.
 **
-** Cameras are not "rendered" and do not need to be "added" to a scene.  A 
-** CameraClass is passed into the WW3D::Render(...) function.  The reason 
-** they are render objects is so that they can be inserted onto the bone of 
+** Cameras are not "rendered" and do not need to be "added" to a scene.  A
+** CameraClass is passed into the WW3D::Render(...) function.  The reason
+** they are render objects is so that they can be inserted onto the bone of
 ** some animation and move with the animation...
 **
-** For all of the projection functions (Matrix4x4, ProjectorClass (used by 
-** decals and texture projections), and CameraClass) I followed the OpenGL 
-** convention of passing positive distances for your clip planes even though 
-** in a right-handed coordinate system your z values are negative after 
+** For all of the projection functions (Matrix4x4, ProjectorClass (used by
+** decals and texture projections), and CameraClass) I followed the OpenGL
+** convention of passing positive distances for your clip planes even though
+** in a right-handed coordinate system your z values are negative after
 ** transformation to camera space.  So Set_Clip_Planes expects positive distances
 ** to your near and far clip planes.
 **
@@ -128,15 +123,15 @@ class CameraClass : public RenderObjClass
 	virtual ~CameraClass(void);
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const { return CLASSID_CAMERA; }
-		
+
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface -  Rendering, cameras don't "render"
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void					Render(RenderInfoClass & rinfo) { }
-			
+
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - "Scene Graph"
-	// Cameras cache their frustum description, this is invalidated whenever 
+	// Cameras cache their frustum description, this is invalidated whenever
 	// the transform/position is changed
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void 					Set_Transform(const Matrix3D &m);
@@ -157,7 +152,7 @@ class CameraClass : public RenderObjClass
 	// Setting the projection type
 	void								Set_Projection_Type(ProjectionType ptype);
 	ProjectionType					Get_Projection_Type(void);
-	
+
 	// Setting the clipping ranges in world space distances
 	void								Set_Clip_Planes(float znear,float zfar);
 	void								Get_Clip_Planes(float & znear,float & zfar) const;
@@ -166,13 +161,13 @@ class CameraClass : public RenderObjClass
 	void								Set_Zbuffer_Range(float znear,float zfar) {ZBufferMin = znear;ZBufferMax=zfar;}
 	void								Get_Zbuffer_Range(float & znear,float & zfar) const {znear=ZBufferMin;zfar=ZBufferMax;}
 
-	// Methods for setting the View Plane.  
+	// Methods for setting the View Plane.
 	// NOTE: View plane is always at a distance of 1.0 from the eye.
 	void								Set_View_Plane(const Vector2 & min,const Vector2 & max);
 	void								Set_View_Plane(float hfov,float vfov = -1);
 	void								Set_Aspect_Ratio(float width_to_height);
 
-	// Methods for querying the View Plane settings.		
+	// Methods for querying the View Plane settings.
 	void								Get_View_Plane(Vector2 & set_min,Vector2 & set_max) const;
 	float								Get_Horizontal_FOV(void) const;
 	float								Get_Vertical_FOV(void) const;
@@ -196,20 +191,20 @@ class CameraClass : public RenderObjClass
 	void								Set_Viewport(const Vector2 & min,const Vector2 & max);
 	void								Get_Viewport(Vector2 & set_min,Vector2 & set_max) const;
 	const ViewportClass &		Get_Viewport(void) const;
-	
+
 	void								Set_Depth_Range(float zstart = 0.0f,float zend = 1.0f);
 	void								Get_Depth_Range(float * set_zstart,float * set_zend) const;
 
-	// Culling for various bounding volumes.  These functions will return true if the 
+	// Culling for various bounding volumes.  These functions will return true if the
 	// given primitive is culled (i.e. it is *outside* the view frustum)
 	bool								Cull_Sphere(const SphereClass & sphere) const;
 	bool								Cull_Sphere_On_Frustum_Sides(const SphereClass & sphere) const;
 	bool								Cull_Box(const AABoxClass & box) const;
 
 	// Various properties of the camera's frustum:  These funcitons return a
-	// pointer to the internal storage of the descriptions.  there will be 
-	// 6 frustum planes, 8 corner points, see the implementations of these 
-	// functions for definitions on which points/planes are associated with 
+	// pointer to the internal storage of the descriptions.  there will be
+	// 6 frustum planes, 8 corner points, see the implementations of these
+	// functions for definitions on which points/planes are associated with
 	// each index.  Better yet, just use the Frustum object.
 	const FrustumClass &			Get_Frustum(void) const;
 	const PlaneClass *			Get_Frustum_Planes(void) const;
@@ -218,9 +213,9 @@ class CameraClass : public RenderObjClass
 	const PlaneClass *			Get_View_Space_Frustum_Planes(void) const;
 	const Vector3 *				Get_View_Space_Frustum_Corners(void) const;
 	const OBBoxClass &			Get_Near_Clip_Bounding_Box(void) const;
-	
+
 	// Methods for transforming/projecting points between various coordinate systems
-	// associated with this camera.  
+	// associated with this camera.
 	// "Device Space" - pixel coordinate
 	// "View Space" - 3D space where the view point is at 0,0,0 and the view plane is at z=-1.0
 	// "World Space" - 3D world coordinate system.
@@ -235,7 +230,7 @@ class CameraClass : public RenderObjClass
 	static void	Convert_Old(Vector3 &pos);
 
 protected:
-	
+
 	void								Update_Frustum(void) const;
 
 	ProjectionType					Projection;		// projection type, orthographic or perspective
@@ -256,8 +251,8 @@ class CameraClass : public RenderObjClass
 };
 
 
-inline float CameraClass::Get_Depth(void) const 
-{ 
+inline float CameraClass::Get_Depth(void) const
+{
 	return ZFar;
 }
 
@@ -272,16 +267,16 @@ inline CameraClass::ProjectionType CameraClass::Get_Projection_Type(void)
 	return Projection;
 }
 
-inline void CameraClass::Set_Viewport(const Vector2 & min,const Vector2 & max)		
-{ 
-	Viewport.Min = min; Viewport.Max = max; 
+inline void CameraClass::Set_Viewport(const Vector2 & min,const Vector2 & max)
+{
+	Viewport.Min = min; Viewport.Max = max;
 	FrustumValid = false;
 }
 
-inline void	CameraClass::Get_Viewport(Vector2 & set_min,Vector2 & set_max) const	
-{ 
-	set_min = Viewport.Min; 
-	set_max = Viewport.Max; 
+inline void	CameraClass::Get_Viewport(Vector2 & set_min,Vector2 & set_max) const
+{
+	set_min = Viewport.Min;
+	set_max = Viewport.Max;
 }
 
 inline void	CameraClass::Set_Depth_Range(float zmin,float zmax)
@@ -300,9 +295,9 @@ inline void	CameraClass::Get_Depth_Range(float * set_zmin,float * set_zmax) cons
 	}
 }
 
-inline const ViewportClass & CameraClass::Get_Viewport(void) const											
-{ 
-	return Viewport; 
+inline const ViewportClass & CameraClass::Get_Viewport(void) const
+{
+	return Viewport;
 }
 
 inline bool CameraClass::Cull_Sphere(const SphereClass & sphere) const
@@ -381,7 +376,7 @@ CameraClass::Get_Frustum_Planes(void) const
  * HISTORY:                                                                                    *
  *   5/29/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-inline const Vector3 * 
+inline const Vector3 *
 CameraClass::Get_Frustum_Corners(void) const
 {
 	const FrustumClass & frustum = Get_Frustum();
@@ -451,6 +446,3 @@ inline const Vector3 * CameraClass::Get_View_Space_Frustum_Corners(void) const
 	const FrustumClass & frustum = Get_View_Space_Frustum();
 	return frustum.Corners;
 }
-
-
-#endif
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
index 61156e1580c..de63c6bdd62 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Jani Penttinen                                               *
  *                                                                                             *
- *                       $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 32                                                          $*
@@ -48,12 +48,12 @@
 #include "assetmgr.h"
 #include "Vector3i.h"
 #include "quat.h"
-#include "INI.H"
+#include "INI.h"
 #include "Point.h"
 #include "rinfo.h"
 #include "vertmaterial.h"
 #include "chunkio.h"
-#include "WWFILE.H"
+#include "WWFILE.h"
 #include "inisup.h"
 #include "persistfactory.h"
 #include "ww3dids.h"
@@ -64,7 +64,6 @@
 #include "texture.h"
 #include "scene.h"
 #include "wwprofile.h"
-#include <cstdio>
 #include <limits.h>
 
 
@@ -311,7 +310,7 @@ const Vector2 DazzleINIClass::Get_Vector2(char const *section, char const *entry
 	return defvalue;
 }
 
-const Vector3 DazzleINIClass::Get_Vector3(char const *section, char const * entry, const Vector3 & defvalue ) 
+const Vector3 DazzleINIClass::Get_Vector3(char const *section, char const * entry, const Vector3 & defvalue )
 {
 	if (section != NULL && entry != NULL) {
 		INIEntry * entryptr = Find_Entry(section, entry);
@@ -669,7 +668,8 @@ void DazzleRenderObjClass::Init_Type(const DazzleInitClass& i)
 		unsigned new_count=i.type+1;
 		DazzleTypeClass** new_types=W3DNEWARRAY DazzleTypeClass*[new_count];
 		unsigned a=0;
-		for (;a<type_count;++a) {
+		unsigned copy_count = min(type_count, new_count);
+		for (;a<copy_count;++a) {
 			new_types[a]=types[a];
 		}
 		for (;a<new_count;++a) {
@@ -693,7 +693,8 @@ void DazzleRenderObjClass::Init_Lensflare(const LensflareInitClass& i)
 		unsigned new_count=i.type+1;
 		LensflareTypeClass** new_lensflares=W3DNEWARRAY LensflareTypeClass*[new_count];
 		unsigned a=0;
-		for (;a<lensflare_count;++a) {
+		unsigned copy_count = min(lensflare_count, new_count);
+		for (;a<copy_count;++a) {
 			new_lensflares[a]=lensflares[a];
 		}
 		for (;a<new_count;++a) {
@@ -938,8 +939,7 @@ void DazzleRenderObjClass::Render(RenderInfoClass & rinfo)
 			const DazzleTypeClass* params=types[type];
 			params->Calculate_Intensities(dazzle_intensity,dazzle_size,current_halo_intensity,camera_dir,current_dir,current_distance);
 
-			unsigned time_ms=WW3D::Get_Frame_Time();
-			if (time_ms==0) time_ms=1;
+			float time_ms=WW3D::Get_Logic_Frame_Time_Milliseconds();
 			float weight=pow(params->ic.history_weight,time_ms);
 
 			if (dazzle_intensity>0.0f) {
@@ -1010,9 +1010,6 @@ void DazzleRenderObjClass::Render_Dazzle(CameraClass* camera)
 		screen_x_scale=h/w;
 	}
 
-//	unsigned time_ms=WW3D::Get_Frame_Time();
-//	if (time_ms==0) time_ms=1;
-
 	float halo_scale_x=types[type]->ic.halo_scale_x;
 	float halo_scale_y=types[type]->ic.halo_scale_y;
 	float dazzle_scale_x=types[type]->ic.dazzle_scale_x;
@@ -1377,7 +1374,7 @@ PersistClass *	DazzlePersistFactoryClass::Load(ChunkLoadClass & cload) const
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		};
 		cload.Close_Chunk();
@@ -1397,9 +1394,9 @@ PersistClass *	DazzlePersistFactoryClass::Load(ChunkLoadClass & cload) const
 	*/
 	if (new_obj == NULL) {
 		static int count = 0;
-		if ( ++count < 10 ) {
-			WWDEBUG_SAY(("DazzlePersistFactory failed to create dazzle of type: %s!!\r\n",dazzle_type));
-			WWDEBUG_SAY(("Replacing it with a NULL render object!\r\n"));
+		if ( count++ < 10 ) {
+			WWDEBUG_SAY(("DazzlePersistFactory failed to create dazzle of type: %s!!",dazzle_type));
+			WWDEBUG_SAY(("Replacing it with a NULL render object!"));
 		}
 		new_obj = WW3DAssetManager::Get_Instance()->Create_Render_Obj("NULL");
 	}
@@ -1479,9 +1476,6 @@ void DazzleLayerClass::Render(CameraClass* camera)
 
 	camera->Apply();
 
-	unsigned time_ms=WW3D::Get_Frame_Time();
-	if (time_ms==0) time_ms=1;
-
 	DX8Wrapper::Set_Material(NULL);
 
 	for (unsigned type=0;type<type_count;++type) {
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h
index baf52ff14bc..5c59019771e 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DAZZLE_H
-#define DAZZLE_H
 
 #include "always.h"
 #include "vector3.h"
@@ -150,8 +145,8 @@ class DazzleTypeClass
 public:
 
 	virtual void Calculate_Intensities(
-		float& dazzle_intensity, 
-		float& dazzle_size, 
+		float& dazzle_intensity,
+		float& dazzle_size,
 		float& halo_intensity,
 		const Vector3& camera_dir,
 		const Vector3& dazzle_dir,
@@ -183,7 +178,7 @@ class DazzleLayerClass {
 	friend DazzleRenderObjClass;
 
 	public:
-	
+
 		DazzleLayerClass(void);
 		~DazzleLayerClass(void);
 
@@ -236,7 +231,7 @@ class LensflareTypeClass
 class INIClass;
 
 class DazzleRenderObjClass : public RenderObjClass
-{	
+{
 	friend DazzleLayerClass;
 
 	DazzleRenderObjClass * succ;
@@ -255,7 +250,7 @@ class DazzleRenderObjClass : public RenderObjClass
 	bool on_list;	// This is used to avoid insterting a dazzle into a list twice.
 	float radius;	// Used to cast rays against
 	unsigned int creation_time;
-	
+
 	static bool	_dazzle_rendering_enabled;
 
 //	static void Draw_Debug_Dazzle(int idx);
@@ -274,17 +269,17 @@ class DazzleRenderObjClass : public RenderObjClass
 	const DazzleRenderObjClass* Succ() const { return succ; }
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void)	const { return CLASSID_DAZZLE; }
-	
+
 	virtual void					Render(RenderInfoClass & rinfo);
 	virtual void Special_Render(SpecialRenderInfoClass & rinfo);
-	virtual void 					Set_Transform(const Matrix3D &m); 
+	virtual void 					Set_Transform(const Matrix3D &m);
    virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;
    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & box) const;
-	virtual void					Scale(float scale) 															{ radius*=scale; };	
+	virtual void					Scale(float scale) 															{ radius*=scale; };
 
 	void Set_Dazzle_Color(const Vector3& col) { dazzle_color=col; }
 	void Set_Halo_Color(const Vector3& col) { halo_color=col; }
@@ -354,7 +349,7 @@ class DazzleVisibilityClass
 
 /**
 ** DazzlePrototypeClass
-** This description object is generated when reading a W3D_CHUNK_DAZZLE.  It stores the 
+** This description object is generated when reading a W3D_CHUNK_DAZZLE.  It stores the
 ** information needed to construct a particular instance of a dazzle.  Prototypes are
 ** stored in the asset manager and used to construct render objects when needed.
 */
@@ -363,14 +358,14 @@ class DazzlePrototypeClass : public W3DMPO, public PrototypeClass
 	W3DMPO_GLUE(DazzlePrototypeClass)
 public:
 	DazzlePrototypeClass(void) : DazzleType(0)				{ }
-	
+
 	virtual const char *			Get_Name(void) const			{ return Name; }
 	virtual int								Get_Class_ID(void) const	{ return RenderObjClass::CLASSID_DAZZLE; }
 	virtual RenderObjClass *	Create(void);
 	virtual void							DeleteSelf()							{ delete this; }
 
 	WW3DErrorType					Load_W3D(ChunkLoadClass & cload);
-	
+
 private:
 
 	StringClass				Name;
@@ -380,7 +375,7 @@ class DazzlePrototypeClass : public W3DMPO, public PrototypeClass
 
 /**
 ** DazzleLoaderClass
-** An instance of this class is registered with the asset manager and handles loading W3D_CHUNK_DAZZLE.  
+** An instance of this class is registered with the asset manager and handles loading W3D_CHUNK_DAZZLE.
 ** It creates DazzlePrototypes from the data in the chunk.
 */
 class DazzleLoaderClass : public PrototypeLoaderClass
@@ -394,5 +389,3 @@ class DazzleLoaderClass : public PrototypeLoaderClass
 };
 
 extern DazzleLoaderClass		_DazzleLoader;
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp
index c027c5f6e0c..300d9132700 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp
@@ -24,7 +24,6 @@
 #include "dx8wrapper.h"
 #include "bitmaphandler.h"
 #include "colorspace.h"
-#include <string.h>
 #include <ddraw.h>
 
 // ----------------------------------------------------------------------------
@@ -47,15 +46,15 @@ DDSFileClass::DDSFileClass(const char* name,unsigned reduction_factor)
 	DateTime(0),
 	CubeFaceSize(0)
 {
-	strncpy(Name,name,sizeof(Name));
+	strlcpy(Name,name,sizeof(Name));
 	// The name could be given in .tga or .dds format, so ensure we're opening .dds...
 	int len=strlen(Name);
 	Name[len-3]='d';
 	Name[len-2]='d';
 	Name[len-1]='s';
 
-	file_auto_ptr file(_TheFileFactory,Name);	
-	if (!file->Is_Available()) 
+	file_auto_ptr file(_TheFileFactory,Name);
+	if (!file->Is_Available())
 	{
 		return;
 	}
@@ -63,7 +62,7 @@ DDSFileClass::DDSFileClass(const char* name,unsigned reduction_factor)
 	int result=file->Open();
 	if (!result)
 	{
-		WWASSERT("File would not open\n");
+		WWASSERT("File would not open");
 		return;
 	}
 
@@ -73,17 +72,17 @@ DDSFileClass::DDSFileClass(const char* name,unsigned reduction_factor)
 	unsigned read_bytes=file->Read(header,4);
 	if (!read_bytes)
 	{
-		WWASSERT("File loading failed trying to read header\n");
+		WWASSERT("File loading failed trying to read header");
 		return;
 	}
 	// Now, we read DDSURFACEDESC2 defining the compressed data
 	read_bytes=file->Read(&SurfaceDesc,sizeof(LegacyDDSURFACEDESC2));
 	// Verify the structure size matches the read size
-	if (read_bytes==0 || read_bytes!=SurfaceDesc.Size) 
+	if (read_bytes==0 || read_bytes!=SurfaceDesc.Size)
 	{
 		StringClass tmp(0,true);
-		tmp.Format("File %s loading failed.\nTried to read %d bytes, got %d. (SurfDesc.size=%d)\n",name,sizeof(LegacyDDSURFACEDESC2),read_bytes,SurfaceDesc.Size);
-		WWASSERT_PRINT(0,tmp);
+		tmp.Format("File %s loading failed.\nTried to read %d bytes, got %d. (SurfDesc.size=%d)",name,sizeof(LegacyDDSURFACEDESC2),read_bytes,SurfaceDesc.Size);
+		WWASSERT_PRINT(0,tmp.str());
 		return;
 	}
 
@@ -154,19 +153,19 @@ DDSFileClass::DDSFileClass(const char* name,unsigned reduction_factor)
 	LevelSizes=W3DNEWARRAY unsigned[MipLevels];
 	LevelOffsets=W3DNEWARRAY unsigned[MipLevels];
 	unsigned level=0;
-	for (;level<ReductionFactor;++level) 
+	for (;level<ReductionFactor;++level)
 	{
-		if (level_size>16) 
+		if (level_size>16)
 		{	// If surface is bigger than one block (8 or 16 bytes)...
 			level_size/=level_mip_dec;
 		}
 	}
-	for (level=0;level<MipLevels;++level) 
+	for (level=0;level<MipLevels;++level)
 	{
 		LevelSizes[level]=level_size;
 		LevelOffsets[level]=level_offset;
 		level_offset+=level_size;
-		if (level_size>16) 
+		if (level_size>16)
 		{	// If surface is bigger than one block (8 or 16 bytes)...
 			level_size/=level_mip_dec;
 		}
@@ -189,7 +188,7 @@ DDSFileClass::DDSFileClass(const char* name,unsigned reduction_factor)
 	// be a problem. The new version of ddsfile from Vegas actually has removed this check entirely.
 	int expected_size=level_offset+SurfaceDesc.Size+4;
 	if (expected_size!=file->Size()) {
-		WWDEBUG_SAY(("Warning: file % size is not consistent with the data (file size should be %d but was %d)\n",Name,expected_size,file->Size()));
+		WWDEBUG_SAY(("Warning: file % size is not consistent with the data (file size should be %d but was %d)",Name,expected_size,file->Size()));
 	}
 #endif
 	file->Close();
@@ -206,7 +205,7 @@ DDSFileClass::~DDSFileClass()
 
 unsigned DDSFileClass::Get_Width(unsigned level) const
 {
-	WWASSERT(level<MipLevels); 
+	WWASSERT(level<MipLevels);
 	unsigned width=Width>>level;
 	if (width<4) width=4;
 	return width;
@@ -214,7 +213,7 @@ unsigned DDSFileClass::Get_Width(unsigned level) const
 
 unsigned DDSFileClass::Get_Height(unsigned level) const
 {
-	WWASSERT(level<MipLevels); 
+	WWASSERT(level<MipLevels);
 	unsigned height=Height>>level;
 	if (height<4) height=4;
 	return height;
@@ -230,26 +229,26 @@ unsigned DDSFileClass::Get_Depth(unsigned level) const
 
 const unsigned char* DDSFileClass::Get_Memory_Pointer(unsigned level) const
 {
-	WWASSERT(level<MipLevels); 
+	WWASSERT(level<MipLevels);
 	return DDSMemory+LevelOffsets[level];
 }
 
 unsigned DDSFileClass::Get_Level_Size(unsigned level) const
 {
-	WWASSERT(level<MipLevels); 
+	WWASSERT(level<MipLevels);
 	return LevelSizes[level];
 }
 
 // For some reason DX-Tex tool doesn't fill the surface size field, so we need to calculate it...
 unsigned DDSFileClass::Calculate_DXTC_Surface_Size
 (
-	unsigned width, 
-	unsigned height, 
+	unsigned width,
+	unsigned height,
 	WW3DFormat format
 )
 {
 	unsigned level_size=(width/4)*(height/4);
-	switch (format) 
+	switch (format)
 	{
 	case WW3D_FORMAT_DXT1:
 		level_size*=8;
@@ -272,8 +271,8 @@ bool DDSFileClass::Load()
 	if (DDSMemory) return false;
 	if (!LevelSizes || !LevelOffsets) return false;
 
-	file_auto_ptr file(_TheFileFactory,Name);	
-	if (!file->Is_Available()) 
+	file_auto_ptr file(_TheFileFactory,Name);
+	if (!file->Is_Available())
 	{
 		return false;
 	}
@@ -296,11 +295,11 @@ bool DDSFileClass::Load()
 	);
 
 	unsigned skipped_offset=0;
-	for (unsigned i=0;i<ReductionFactor;++i) 
+	for (unsigned i=0;i<ReductionFactor;++i)
 	{
 		skipped_offset+=level_size;
 		size-=level_size;
-		if (level_size>16) 
+		if (level_size>16)
 		{	// If surface is bigger than one block (8 or 16 bytes)...
 			level_size/=4;
 		}
@@ -310,7 +309,7 @@ bool DDSFileClass::Load()
 	unsigned seek_size=file->Seek(SurfaceDesc.Size+4+skipped_offset);
 	WWASSERT(seek_size==(SurfaceDesc.Size+4+skipped_offset));
 
-	if (size && size<0x80000000) 
+	if (size && size<0x80000000)
 	{
 		// Allocate memory for the data excluding the headers
 		DDSMemory=MSGW3DNEWARRAY("DDSMemory") unsigned char[size];
@@ -389,10 +388,10 @@ void DDSFileClass::Copy_Level_To_Surface(unsigned level,IDirect3DSurface8* d3d_s
 void DDSFileClass::Copy_Level_To_Surface
 (
 	unsigned level,
-	WW3DFormat dest_format, 
-	unsigned dest_width, 
-	unsigned dest_height, 
-	unsigned char* dest_surface, 
+	WW3DFormat dest_format,
+	unsigned dest_width,
+	unsigned dest_height,
+	unsigned char* dest_surface,
 	unsigned dest_pitch,
 	const Vector3& hsv_shift
 )
@@ -402,7 +401,7 @@ void DDSFileClass::Copy_Level_To_Surface
 
 	if (!DDSMemory || !Get_Memory_Pointer(level))
 	{
-		WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing\n");
+		WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing");
 		return;
 	}
 
@@ -417,8 +416,8 @@ void DDSFileClass::Copy_Level_To_Surface
 				for (unsigned y=0;y<dest_height;y+=4) {
 					for (unsigned x=0;x<dest_width;x+=4) {
 						unsigned cols=*src_ptr++;		// Bytes 1-4 of color block
-						unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-						unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+						unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+						unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 						Recolor(col0,hsv_shift);
 						Recolor(col1,hsv_shift);
 						col0=ARGB8888_To_RGB565(col0);
@@ -438,8 +437,8 @@ void DDSFileClass::Copy_Level_To_Surface
 						*dest_ptr++=*src_ptr++;		// Bytes 1-4 of alpha block
 						*dest_ptr++=*src_ptr++;		// Bytes 5-8 of alpha block
 						unsigned cols=*src_ptr++;		// Bytes 1-4 of color block
-						unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-						unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+						unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+						unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 						Recolor(col0,hsv_shift);
 						Recolor(col1,hsv_shift);
 						col0=ARGB8888_To_RGB565(col0);
@@ -479,8 +478,8 @@ void DDSFileClass::Copy_Level_To_Surface
 //							*dest_ptr++=*src_ptr++;		// Bytes 1-4 of color block
 
 							unsigned cols=*src_ptr++;	// Bytes 1-4 of color block
-							unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-							unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+							unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+							unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 							Recolor(col0,hsv_shift);
 							Recolor(col1,hsv_shift);
 							col0=ARGB8888_To_RGB565(col0);
@@ -518,7 +517,7 @@ void DDSFileClass::Copy_Level_To_Surface
 					}
 				}
 				if (Format==WW3D_FORMAT_DXT1 && contains_alpha) {
-					WWDEBUG_SAY(("Warning: DXT1 format should not contain alpha information - file %s\n",Name));
+					WWDEBUG_SAY(("Warning: DXT1 format should not contain alpha information - file %s",Name));
 				}
 			}
 		}
@@ -557,28 +556,28 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
 
 	if (!DDSMemory || !Get_CubeMap_Memory_Pointer(face,level))
 	{
-		WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing\n");
+		WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing");
 		return;
 	}
 
 	// If the format and size is a match just copy the contents
 	bool has_hsv_shift = hsv_shift[0]!=0.0f || hsv_shift[1]!=0.0f || hsv_shift[2]!=0.0f;
-	if (dest_format==Format && dest_width==Get_Width(level) && dest_height==Get_Height(level)) 
+	if (dest_format==Format && dest_width==Get_Width(level) && dest_height==Get_Height(level))
 	{
 		// If hue shift, we can't just copy...
-		if (has_hsv_shift) 
+		if (has_hsv_shift)
 		{
-			if (Format==WW3D_FORMAT_DXT1) 
+			if (Format==WW3D_FORMAT_DXT1)
 			{
 				const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_CubeMap_Memory_Pointer(face,level));
 				unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-				for (unsigned y=0;y<dest_height;y+=4) 
+				for (unsigned y=0;y<dest_height;y+=4)
 				{
-					for (unsigned x=0;x<dest_width;x+=4) 
+					for (unsigned x=0;x<dest_width;x+=4)
 					{
 						unsigned cols=*src_ptr++;		// Bytes 1-4 of color block
-						unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-						unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+						unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+						unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 						Recolor(col0,hsv_shift);
 						Recolor(col1,hsv_shift);
 						col0=ARGB8888_To_RGB565(col0);
@@ -590,19 +589,19 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
 					}
 				}
 			}
-			else if (Format==WW3D_FORMAT_DXT5) 
+			else if (Format==WW3D_FORMAT_DXT5)
 			{
 				const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_CubeMap_Memory_Pointer(face,level));
 				unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-				for (unsigned y=0;y<dest_height;y+=4) 
+				for (unsigned y=0;y<dest_height;y+=4)
 				{
-					for (unsigned x=0;x<dest_width;x+=4) 
+					for (unsigned x=0;x<dest_width;x+=4)
 					{
 						*dest_ptr++=*src_ptr++;		// Bytes 1-4 of alpha block
 						*dest_ptr++=*src_ptr++;		// Bytes 5-8 of alpha block
 						unsigned cols=*src_ptr++;		// Bytes 1-4 of color block
-						unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-						unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+						unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+						unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 						Recolor(col0,hsv_shift);
 						Recolor(col1,hsv_shift);
 						col0=ARGB8888_To_RGB565(col0);
@@ -614,7 +613,7 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
 					}
 				}
 			}
-			else 
+			else
 			{
 				WWASSERT(0);
 			}
@@ -626,32 +625,32 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
 			memcpy(dest_surface,Get_CubeMap_Memory_Pointer(face,level),compressed_size);
 		}
 	}
-	else 
+	else
 	{
 		// If size matches, copy each pixel linearly with color space conversion
-		if (dest_width==Get_Width(level) && dest_height==Get_Height(level)) 
+		if (dest_width==Get_Width(level) && dest_height==Get_Height(level))
 		{
 			// An exception here - if the source format is DXT1 and the destination
 			// is DXT2, just copy the contents and create an empty alpha channel.
 			// This is needed on NVidia cards that have problems with DXT1 compression.
-			if (Format==WW3D_FORMAT_DXT1 && dest_format==WW3D_FORMAT_DXT2) 
+			if (Format==WW3D_FORMAT_DXT1 && dest_format==WW3D_FORMAT_DXT2)
 			{
 				// If hue shift, we can't just copy...
-				if (has_hsv_shift) 
+				if (has_hsv_shift)
 				{
 					const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_CubeMap_Memory_Pointer(face,level));
 					unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-					for (unsigned y=0;y<dest_height;y+=4) 
+					for (unsigned y=0;y<dest_height;y+=4)
 					{
-						for (unsigned x=0;x<dest_width;x+=4) 
+						for (unsigned x=0;x<dest_width;x+=4)
 						{
 							*dest_ptr++=0xffffffff;		// Bytes 1-4 of alpha block
 							*dest_ptr++=0xffffffff;		// Bytes 5-8 of alpha block
 //							*dest_ptr++=*src_ptr++;		// Bytes 1-4 of color block
 
 							unsigned cols=*src_ptr++;	// Bytes 1-4 of color block
-							unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-							unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+							unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+							unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 							Recolor(col0,hsv_shift);
 							Recolor(col1,hsv_shift);
 							col0=ARGB8888_To_RGB565(col0);
@@ -663,13 +662,13 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
 						}
 					}
 				}
-				else 
+				else
 				{
 					const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_CubeMap_Memory_Pointer(face,level));
 					unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-					for (unsigned y=0;y<dest_height;y+=4) 
+					for (unsigned y=0;y<dest_height;y+=4)
 					{
-						for (unsigned x=0;x<dest_width;x+=4) 
+						for (unsigned x=0;x<dest_width;x+=4)
 						{
 							*dest_ptr++=0xffffffff;		// Bytes 1-4 of alpha block
 							*dest_ptr++=0xffffffff;		// Bytes 5-8 of alpha block
@@ -679,24 +678,24 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
 					}
 				}
 			}
-			else 
+			else
 			{
 				unsigned dest_bpp=Get_Bytes_Per_Pixel(dest_format);
 
 				// Copy 4x4 block at a time
 				bool contains_alpha=false;
-				for (unsigned y=0;y<dest_height;y+=4) 
+				for (unsigned y=0;y<dest_height;y+=4)
 				{
 					unsigned char* dest_ptr=dest_surface;
 					dest_ptr+=y*dest_pitch;
-					for (unsigned x=0;x<dest_width;x+=4,dest_ptr+=dest_bpp*4) 
+					for (unsigned x=0;x<dest_width;x+=4,dest_ptr+=dest_bpp*4)
 					{
 						contains_alpha|=Get_4x4_Block(dest_ptr,dest_pitch,dest_format,level,x,y,hsv_shift);
 					}
 				}
-				if (Format==WW3D_FORMAT_DXT1 && contains_alpha) 
+				if (Format==WW3D_FORMAT_DXT1 && contains_alpha)
 				{
-					WWDEBUG_SAY(("Warning: DXT1 format should not contain alpha information - file %s\n",Name));
+					WWDEBUG_SAY(("Warning: DXT1 format should not contain alpha information - file %s",Name));
 				}
 			}
 		}
@@ -727,7 +726,7 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 
 	if (!DDSMemory || !Get_Volume_Memory_Pointer(level))
 	{
-		WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing\n");
+		WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing");
 		return;
 	}
 
@@ -736,22 +735,22 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 
 	// If the format and size is a match just copy the contents
 	bool has_hsv_shift = hsv_shift[0]!=0.0f || hsv_shift[1]!=0.0f || hsv_shift[2]!=0.0f;
-	if (dest_format==Format && dest_width==Get_Width(level) && dest_height==Get_Height(level)) 
+	if (dest_format==Format && dest_width==Get_Width(level) && dest_height==Get_Height(level))
 	{
 		// If hue shift, we can't just copy...
-		if (has_hsv_shift) 
+		if (has_hsv_shift)
 		{
-			if (Format==WW3D_FORMAT_DXT1) 
+			if (Format==WW3D_FORMAT_DXT1)
 			{
 				const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_Volume_Memory_Pointer(level));
 				unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-				for (unsigned y=0;y<dest_height;y+=4) 
+				for (unsigned y=0;y<dest_height;y+=4)
 				{
-					for (unsigned x=0;x<dest_width;x+=4) 
+					for (unsigned x=0;x<dest_width;x+=4)
 					{
 						unsigned cols=*src_ptr++;		// Bytes 1-4 of color block
-						unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-						unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+						unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+						unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 						Recolor(col0,hsv_shift);
 						Recolor(col1,hsv_shift);
 						col0=ARGB8888_To_RGB565(col0);
@@ -763,19 +762,19 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 					}
 				}
 			}
-			else if (Format==WW3D_FORMAT_DXT5) 
+			else if (Format==WW3D_FORMAT_DXT5)
 			{
 				const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_Volume_Memory_Pointer(level));
 				unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-				for (unsigned y=0;y<dest_height;y+=4) 
+				for (unsigned y=0;y<dest_height;y+=4)
 				{
-					for (unsigned x=0;x<dest_width;x+=4) 
+					for (unsigned x=0;x<dest_width;x+=4)
 					{
 						*dest_ptr++=*src_ptr++;		// Bytes 1-4 of alpha block
 						*dest_ptr++=*src_ptr++;		// Bytes 5-8 of alpha block
 						unsigned cols=*src_ptr++;		// Bytes 1-4 of color block
-						unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-						unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+						unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+						unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 						Recolor(col0,hsv_shift);
 						Recolor(col1,hsv_shift);
 						col0=ARGB8888_To_RGB565(col0);
@@ -787,44 +786,44 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 					}
 				}
 			}
-			else 
+			else
 			{
 				WWASSERT(0);
 			}
 
 		}
-		else 
+		else
 		{
 			unsigned compressed_size=Get_Level_Size(level);
 			memcpy(dest_surface,Get_Volume_Memory_Pointer(level),compressed_size);
 		}
 	}
-	else 
+	else
 	{
 		// If size matches, copy each pixel linearly with color space conversion
-		if (dest_width==Get_Width(level) && dest_height==Get_Height(level)) 
+		if (dest_width==Get_Width(level) && dest_height==Get_Height(level))
 		{
 			// An exception here - if the source format is DXT1 and the destination
 			// is DXT2, just copy the contents and create an empty alpha channel.
 			// This is needed on NVidia cards that have problems with DXT1 compression.
-			if (Format==WW3D_FORMAT_DXT1 && dest_format==WW3D_FORMAT_DXT2) 
+			if (Format==WW3D_FORMAT_DXT1 && dest_format==WW3D_FORMAT_DXT2)
 			{
 				// If hue shift, we can't just copy...
-				if (has_hsv_shift) 
+				if (has_hsv_shift)
 				{
 					const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_Volume_Memory_Pointer(level));
 					unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-					for (unsigned y=0;y<dest_height;y+=4) 
+					for (unsigned y=0;y<dest_height;y+=4)
 					{
-						for (unsigned x=0;x<dest_width;x+=4) 
+						for (unsigned x=0;x<dest_width;x+=4)
 						{
 							*dest_ptr++=0xffffffff;		// Bytes 1-4 of alpha block
 							*dest_ptr++=0xffffffff;		// Bytes 5-8 of alpha block
 //							*dest_ptr++=*src_ptr++;		// Bytes 1-4 of color block
 
 							unsigned cols=*src_ptr++;	// Bytes 1-4 of color block
-							unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-							unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+							unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+							unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 							Recolor(col0,hsv_shift);
 							Recolor(col1,hsv_shift);
 							col0=ARGB8888_To_RGB565(col0);
@@ -836,13 +835,13 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 						}
 					}
 				}
-				else 
+				else
 				{
 					const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_Volume_Memory_Pointer(level));
 					unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-					for (unsigned y=0;y<dest_height;y+=4) 
+					for (unsigned y=0;y<dest_height;y+=4)
 					{
-						for (unsigned x=0;x<dest_width;x+=4) 
+						for (unsigned x=0;x<dest_width;x+=4)
 						{
 							*dest_ptr++=0xffffffff;		// Bytes 1-4 of alpha block
 							*dest_ptr++=0xffffffff;		// Bytes 5-8 of alpha block
@@ -852,7 +851,7 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 					}
 				}
 			}
-			else 
+			else
 			{
 				WWASSERT(0);
 			/*	todo
@@ -862,18 +861,18 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 				bool contains_alpha=false;
 				for (unsigned z=0;z<dest_depth;z++)
 				{
-					for (unsigned y=0;y<dest_height;y+=4) 
+					for (unsigned y=0;y<dest_height;y+=4)
 					{
 						unsigned char* dest_ptr=dest_surface;
 						row_ptr+=y*row_pitch;
-						for (unsigned x=0;x<dest_width;x+=4,dest_ptr+=dest_bpp*4) 
+						for (unsigned x=0;x<dest_width;x+=4,dest_ptr+=dest_bpp*4)
 						{
 							contains_alpha|=Get_4x4_Block(dest_ptr,dest_pitch,dest_format,level,x,y,hsv_shift);
 						}
 					}
-					if (Format==WW3D_FORMAT_DXT1 && contains_alpha) 
+					if (Format==WW3D_FORMAT_DXT1 && contains_alpha)
 					{
-						WWDEBUG_SAY(("Warning: DXT1 format should not contain alpha information - file %s\n",Name));
+						WWDEBUG_SAY(("Warning: DXT1 format should not contain alpha information - file %s",Name));
 					}
 				}*/
 			}
@@ -994,10 +993,10 @@ unsigned DDSFileClass::Get_Pixel(unsigned level,unsigned x,unsigned y) const
 			}
 			WWASSERT(alpha_index<8);
 
-			// 8-alpha or 6-alpha block?    
+			// 8-alpha or 6-alpha block?
 			unsigned alpha_value=0;
-			if (alpha0>alpha1) {    
-				// 8-alpha block:  derive the other six alphas.    
+			if (alpha0>alpha1) {
+				// 8-alpha block:  derive the other six alphas.
 				// Bit code 000 = alpha_0, 001 = alpha_1, others are interpolated.
 				switch (alpha_index) {
 				case 0: alpha_value=alpha0; break;
@@ -1007,11 +1006,11 @@ unsigned DDSFileClass::Get_Pixel(unsigned level,unsigned x,unsigned y) const
 				case 4: alpha_value=(4*alpha0+3*alpha1+3) / 7; break;    // bit code 100
 				case 5: alpha_value=(3*alpha0+4*alpha1+3) / 7; break;    // bit code 101
 				case 6: alpha_value=(2*alpha0+5*alpha1+3) / 7; break;    // bit code 110
-				case 7: alpha_value=(1*alpha0+6*alpha1+3) / 7; break;    // bit code 111  
+				case 7: alpha_value=(1*alpha0+6*alpha1+3) / 7; break;    // bit code 111
 				}
-			}    
-			else {  
-				// 6-alpha block.    
+			}
+			else {
+				// 6-alpha block.
 				// Bit code 000 = alpha_0, 001 = alpha_1, others are interpolated.
 				switch (alpha_index) {
 				case 0: alpha_value=alpha0; break;
@@ -1158,14 +1157,14 @@ bool DDSFileClass::Get_4x4_Block(
 			alphas[0]=alpha_block[0];
 			alphas[1]=alpha_block[1];
 
-			// 8-alpha or 6-alpha block?    
-			if (alphas[0]>alphas[1]) {    
+			// 8-alpha or 6-alpha block?
+			if (alphas[0]>alphas[1]) {
 				alphas[2]=(6*alphas[0]+1*alphas[1]+3) / 7;   // bit code 010
 				alphas[3]=(5*alphas[0]+2*alphas[1]+3) / 7;   // bit code 011
 				alphas[4]=(4*alphas[0]+3*alphas[1]+3) / 7;   // bit code 100
 				alphas[5]=(3*alphas[0]+4*alphas[1]+3) / 7;   // bit code 101
 				alphas[6]=(2*alphas[0]+5*alphas[1]+3) / 7;   // bit code 110
-				alphas[7]=(1*alphas[0]+6*alphas[1]+3) / 7;   // bit code 111  
+				alphas[7]=(1*alphas[0]+6*alphas[1]+3) / 7;   // bit code 111
 			}
 			else {
 				alphas[2]=(4*alphas[0]+1*alphas[1]+2) / 5;   // Bit code 010
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h
index d871916a099..2b3b92a10ef 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h
@@ -18,12 +18,7 @@
 
 // 08/06/02 KM Added cube map and volume texture support
 
-#ifndef DDSFILE_H
-#define DDSFILE_H
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
 #include "always.h"
 #include "ww3dformat.h"
@@ -41,10 +36,10 @@ struct IDirect3DVolume8;
 // ----------------------------------------------------------------------------
 
 struct LegacyDDCOLORKEY
-{ 
-	unsigned ColorSpaceLowValue; 
-	unsigned ColorSpaceHighValue; 
-}; 
+{
+	unsigned ColorSpaceLowValue;
+	unsigned ColorSpaceHighValue;
+};
 
 // ----------------------------------------------------------------------------
 //
@@ -58,7 +53,7 @@ struct LegacyDDSCAPS2
 	unsigned Caps;
 	unsigned Caps2;
 	unsigned Caps3;
-	unsigned Caps4; 
+	unsigned Caps4;
 };
 
 // ----------------------------------------------------------------------------
@@ -70,47 +65,47 @@ struct LegacyDDSCAPS2
 
 struct LegacyDDPIXELFORMAT
 {
-	unsigned Size; 
-	unsigned Flags; 
-	unsigned FourCC; 
-	union 
-	{ 
-		unsigned RGBBitCount; 
-		unsigned YUVBitCount; 
-		unsigned ZBufferBitDepth; 
-		unsigned AlphaBitDepth; 
+	unsigned Size;
+	unsigned Flags;
+	unsigned FourCC;
+	union
+	{
+		unsigned RGBBitCount;
+		unsigned YUVBitCount;
+		unsigned ZBufferBitDepth;
+		unsigned AlphaBitDepth;
 		unsigned LuminanceBitCount;
 		unsigned BumpBitCount;
 	};
-	union 
-	{ 
-		unsigned RBitMask; 
-		unsigned YBitMask; 
+	union
+	{
+		unsigned RBitMask;
+		unsigned YBitMask;
 		unsigned StencilBitDepth;
 		unsigned LuminanceBitMask;
 		unsigned BumpDuBitMask;
 	};
-	union 
-	{ 
-		unsigned GBitMask; 
-		unsigned UBitMask; 
+	union
+	{
+		unsigned GBitMask;
+		unsigned UBitMask;
 		unsigned ZBitMask;
 		unsigned BumpDvBitMask;
 	};
-	union 
-	{ 
-		unsigned BBitMask; 
-		unsigned VBitMask; 
+	union
+	{
+		unsigned BBitMask;
+		unsigned VBitMask;
 		unsigned StencilBitMask;
 		unsigned BumpLuminanceBitMask;
 	};
-	union 
-	{ 
-		unsigned RGBAlphaBitMask; 
-		unsigned YUVAlphaBitMask; 
+	union
+	{
+		unsigned RGBAlphaBitMask;
+		unsigned YUVAlphaBitMask;
 		unsigned LuminanceAlphaBitMask;
-		unsigned RGBZBitMask; 
-		unsigned YUVZBitMask; 
+		unsigned RGBZBitMask;
+		unsigned YUVZBitMask;
 	};
 };
 
@@ -223,10 +218,10 @@ class DDSFileClass
 	void Copy_Level_To_Surface(unsigned level,IDirect3DSurface8* d3d_surface,const Vector3& hsv_shift=Vector3(0.0f,0.0f,0.0f));
 	void Copy_Level_To_Surface(
 		unsigned level,
-		WW3DFormat dest_format, 
-		unsigned dest_width, 
-		unsigned dest_height, 
-		unsigned char* dest_surface, 
+		WW3DFormat dest_format,
+		unsigned dest_width,
+		unsigned dest_height,
+		unsigned char* dest_surface,
 		unsigned dest_pitch,
 		const Vector3& hsv_shift=Vector3(0.0f,0.0f,0.0f));
 
@@ -258,7 +253,7 @@ class DDSFileClass
 		unsigned slice_pitch,
 		const Vector3& hsv_shift=Vector3(0.0f,0.0f,0.0f)
 	);
-	
+
 	// Get pixel in A8R8G8B8 format. This isn't the fastest possible way of reading data from DDS.
 	unsigned Get_Pixel(unsigned level,unsigned x,unsigned y) const;
 
@@ -279,5 +274,3 @@ class DDSFileClass
 };
 
 // ----------------------------------------------------------------------------
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp
index ab8407a21d0..b97dfdbf0cf 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 24                                                          $*
@@ -68,13 +68,13 @@
 
 /**
 ** DecalPolyClass - This class is used to clip polygons as they are
-** added to a RigidDecalMesh. 
+** added to a RigidDecalMesh.
 **
 ** Data needed to add a poly to the decal mesh:
 ** connectivity - generated on the fly after the poly is clipped
 ** planeeq - constant for entire poly, copy from source after done
 ** verts - plug into DecalPolyClass, clip, pull back out
-** vnorms - plug into DecalPolyClass, clip, copy back out 
+** vnorms - plug into DecalPolyClass, clip, copy back out
 ** texcoords - compute after poly is clipped
 ** material - contstant for entire poly, get from generator
 ** shader - constant for entire poly, get from generator
@@ -115,7 +115,7 @@ void DecalPolyClass::Clip(const PlaneClass & plane,DecalPolyClass & dest) const
 	int iprev = Verts.Count() - 1;
 	bool cur_point_in_front;
 	bool prev_point_in_front;
-	
+
 	float alpha;
 	Vector3 int_point;
 	Vector3 int_normal;
@@ -126,22 +126,22 @@ void DecalPolyClass::Clip(const PlaneClass & plane,DecalPolyClass & dest) const
 	prev_point_in_front = true;
 #endif
 
-	for (int j=0; j<Verts.Count(); j++) { 
-		
+	for (int j=0; j<Verts.Count(); j++) {
+
 		cur_point_in_front = plane.In_Front(Verts[i]);
 #if DISABLE_CLIPPING
-		cur_point_in_front = true;		
+		cur_point_in_front = true;
 #endif
 
 		if (prev_point_in_front) {
 
 			if (cur_point_in_front) {
-			
+
 				// Previous vertex was in front of plane and this vertex is in
 				// front of the plane so we emit this vertex.
 				dest.Add_Vertex(Verts[i],VertNorms[i]);
 
-			} else { 
+			} else {
 
 				// Previous vert was in front, this vert is behind, compute
 				// the intersection and emit the point.
@@ -164,9 +164,9 @@ void DecalPolyClass::Clip(const PlaneClass & plane,DecalPolyClass & dest) const
 				Vector3::Lerp(VertNorms[iprev],VertNorms[i],alpha,&int_normal);
 				dest.Add_Vertex(int_point,int_normal);
 				dest.Add_Vertex(Verts[i],VertNorms[i]);
-			
-			} 
-		} 
+
+			}
+		}
 
 		prev_point_in_front = cur_point_in_front;
 		iprev = i;
@@ -264,7 +264,7 @@ RigidDecalMeshClass::~RigidDecalMeshClass(void)
 		DecalSystem->Decal_Mesh_Destroyed(Decals[i].DecalID,this);
 	}
 
-	// Release all of our references.  The memory in the arrays will automatically be 
+	// Release all of our references.  The memory in the arrays will automatically be
 	// released by the SimpleDynVecClass...
 	for (i=0; i<Polys.Count(); i++) {
 		REF_PTR_RELEASE(Textures[i]);
@@ -291,7 +291,7 @@ RigidDecalMeshClass::~RigidDecalMeshClass(void)
 void RigidDecalMeshClass::Render(void)
 {
 	if ((Decals.Count() == 0) || (WW3D::Are_Decals_Enabled() == false)) return;
-	
+
 	/*
 	** Install the mesh'es transform.  NOTE, this could go wrong if someone changes the
 	** transform between the time that the mesh is rendered and the time that the decal
@@ -303,12 +303,12 @@ void RigidDecalMeshClass::Render(void)
 	** Copy the vertices into the dynamic vb
 	*/
 	DynamicVBAccessClass dynamic_vb(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,Verts.Count());
-	{	
+	{
 		DynamicVBAccessClass::WriteLockClass lock(&dynamic_vb);
 		VertexFormatXYZNDUV2 * vertex = lock.Get_Formatted_Vertex_Array();
 
 		for (int i=0; i<Verts.Count(); i++) {
-			
+
 			vertex->x = Verts[i].X;
 			vertex->y = Verts[i].Y;
 			vertex->z = Verts[i].Z;
@@ -328,7 +328,7 @@ void RigidDecalMeshClass::Render(void)
 			vertex++;
 		}
 	}
-	
+
 	/*
 	** Copy the indices into the dynamic ib
 	*/
@@ -357,11 +357,11 @@ void RigidDecalMeshClass::Render(void)
 		DX8Wrapper::Set_Vertex_Buffer(dynamic_vb);
 		DX8Wrapper::Draw_Triangles(	3*cur_poly_index,
 												(next_poly_index - cur_poly_index), // poly count
-												Polys[cur_poly_index].I, 
+												Polys[cur_poly_index].I,
 												1 + Polys[next_poly_index-1].K - Polys[cur_poly_index].I);
 		cur_poly_index = next_poly_index;
 	}
-		
+
 }
 
 
@@ -387,10 +387,10 @@ int RigidDecalMeshClass::Process_Material_Run(int start_index)
 	DX8Wrapper::Set_Shader(Shaders[start_index]);
 
 	int next_index = start_index;
-	while (	(next_index < Polys.Count()) && 
+	while (	(next_index < Polys.Count()) &&
 				(Textures[next_index] == Textures[start_index]) &&
 				(Shaders[next_index] == Shaders[start_index]) &&
-				(VertexMaterials[next_index] == VertexMaterials[start_index])) 
+				(VertexMaterials[next_index] == VertexMaterials[start_index]))
 	{
 		next_index++;
 	}
@@ -436,7 +436,7 @@ bool RigidDecalMeshClass::Create_Decal
 
 	int i,j;
 	WWASSERT(generator->Peek_Decal_System() == DecalSystem);
-	
+
 	/*
 	** If any polys were collected, add a new MeshDecalStruct
 	*/
@@ -450,7 +450,7 @@ bool RigidDecalMeshClass::Create_Decal
 	newdecal.FaceCount = 0;								// init facecount to zero
 	newdecal.VertexStartIndex = Verts.Count();	// start vertices at the end of the current array
 	newdecal.VertexCount = 0;							// init vertcount to zero
-	
+
 	/*
 	** Grab pointers to the parent mesh's components
 	*/
@@ -463,12 +463,12 @@ bool RigidDecalMeshClass::Create_Decal
 	** Grab a pointer to the material settings
 	*/
 	MaterialPassClass * material = generator->Get_Material();
-	
+
 	/*
 	** Set up the generator for our coordinate system
 	*/
 	generator->Set_Mesh_Transform(Parent->Get_Transform());
-	
+
 	/*
 	** Compute the clipping planes
 	*/
@@ -477,13 +477,13 @@ bool RigidDecalMeshClass::Create_Decal
 
 	Matrix3x3::Rotate_Vector(localbox.Basis,Vector3(localbox.Extent.X,0,0),&extent);
 	Vector3 direction(localbox.Basis.Get_X_Vector());
-	
+
 	planes[0].Set(-direction,localbox.Center + extent);
 	planes[1].Set(direction,localbox.Center - extent);
-	
+
 	Matrix3x3::Rotate_Vector(localbox.Basis,Vector3(0,localbox.Extent.Y,0),&extent);
 	direction.Set(localbox.Basis.Get_Y_Vector());
-	
+
 	planes[2].Set(-direction,localbox.Center + extent);
 	planes[3].Set(direction,localbox.Center - extent);
 
@@ -576,11 +576,11 @@ bool RigidDecalMeshClass::Create_Decal
 		** tell the generator that we added a decal
 		*/
 		generator->Add_Mesh(Parent);
-	} 
+	}
 
 	material->Release_Ref();
-	
-#ifdef WWDEBUG	
+
+#ifdef WWDEBUG
 	/*
 	** Some paranoid debug code: ensure all tris have valid vertex indices
 	*/
@@ -635,7 +635,7 @@ bool RigidDecalMeshClass::Delete_Decal(uint32 id)
 	DecalStruct * decal = &Decals[decal_index];
 
 	/*
-	** Remove all geometry used by this decal 
+	** Remove all geometry used by this decal
 	*/
 	Polys.Delete_Range(decal->FaceStartIndex,decal->FaceCount);
 	Verts.Delete_Range(decal->VertexStartIndex,decal->VertexCount);
@@ -673,7 +673,7 @@ bool RigidDecalMeshClass::Delete_Decal(uint32 id)
 	}
 	Decals.Delete(decal_index);
 
-#ifdef WWDEBUG	
+#ifdef WWDEBUG
 	/*
 	** Some paranoid debug code: ensure all tris have valid vertex indices
 	*/
@@ -695,8 +695,8 @@ bool RigidDecalMeshClass::Delete_Decal(uint32 id)
 
 /*
 ** Temporary Buffers
-** These buffers are used by the skin code for temporary storage of the deformed vertices and 
-** vertex normals.  
+** These buffers are used by the skin code for temporary storage of the deformed vertices and
+** vertex normals.
 */
 static SimpleVecClass<Vector3>	_TempVertexBuffer;
 static SimpleVecClass<Vector3>	_TempNormalBuffer;
@@ -746,7 +746,7 @@ SkinDecalMeshClass::~SkinDecalMeshClass(void)
 		DecalSystem->Decal_Mesh_Destroyed(Decals[i].DecalID,this);
 	}
 
-	// Release all of our references.  The memory in the arrays will automatically be 
+	// Release all of our references.  The memory in the arrays will automatically be
 	// released by the SimpleDynVecClass...
 	for (i=0; i<Polys.Count(); i++) {
 		REF_PTR_RELEASE(Textures[i]);
@@ -779,7 +779,7 @@ void SkinDecalMeshClass::Render(void)
 	*/
 	MeshModelClass * model = Parent->Peek_Model();
 	if (model->Get_Flag(MeshModelClass::SORT)) {
-		WWDEBUG_SAY(("ERROR: decals applied to a sorted mesh!\n"));
+		WWDEBUG_SAY(("ERROR: decals applied to a sorted mesh!"));
 		return;
 	}
 
@@ -790,7 +790,7 @@ void SkinDecalMeshClass::Render(void)
 
 	/*
 	** Skin decals have to get the deformed vertices of their parent meshes.  For this
-	** reason, decals on skins is not a very good idea...  
+	** reason, decals on skins is not a very good idea...
 	*/
 	_TempVertexBuffer.Uninitialised_Grow(model->Get_Vertex_Count());
 	_TempNormalBuffer.Uninitialised_Grow(model->Get_Vertex_Count());
@@ -800,7 +800,7 @@ void SkinDecalMeshClass::Render(void)
 	** Copy the vertices into the dynamic vb
 	*/
 	DynamicVBAccessClass dynamic_vb(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,ParentVertexIndices.Count());
-	{	
+	{
 		DynamicVBAccessClass::WriteLockClass lock(&dynamic_vb);
 		VertexFormatXYZNDUV2 * vertex = lock.Get_Formatted_Vertex_Array();
 
@@ -821,7 +821,7 @@ void SkinDecalMeshClass::Render(void)
 
 			vertex->u2 = 0.0f;
 			vertex->v2 = 0.0f;
-			
+
 			vertex++;
 		}
 	}
@@ -854,9 +854,9 @@ void SkinDecalMeshClass::Render(void)
 		DX8Wrapper::Set_Vertex_Buffer(dynamic_vb);
 		DX8Wrapper::Draw_Triangles(3*cur_poly_index,
 											(next_poly_index - cur_poly_index), // poly count
-											Polys[cur_poly_index].I, 
+											Polys[cur_poly_index].I,
 											1 + Polys[next_poly_index-1].K - Polys[cur_poly_index].I);
-		
+
 		cur_poly_index = next_poly_index;
 	}
 }
@@ -884,10 +884,10 @@ int SkinDecalMeshClass::Process_Material_Run(int start_index)
 	DX8Wrapper::Set_Shader(Shaders[start_index]);
 
 	int next_index = start_index;
-	while (	(next_index < Polys.Count()) && 
+	while (	(next_index < Polys.Count()) &&
 				(Textures[next_index] == Textures[start_index]) &&
 				(Shaders[next_index] == Shaders[start_index]) &&
-				(VertexMaterials[next_index] == VertexMaterials[start_index])) 
+				(VertexMaterials[next_index] == VertexMaterials[start_index]))
 	{
 		next_index++;
 	}
@@ -917,7 +917,7 @@ bool SkinDecalMeshClass::Create_Decal(DecalGeneratorClass * generator,
 
 	// The dynamically updated vertex locations are needed - we have no static geometry
 	WWASSERT(world_vertex_locs);
-	
+
 	/*
 	** If any polys were collected, add a new MeshDecalStruct
 	*/
@@ -931,7 +931,7 @@ bool SkinDecalMeshClass::Create_Decal(DecalGeneratorClass * generator,
 	newdecal.FaceCount = 0;												// init facecount to zero
 	newdecal.VertexStartIndex = ParentVertexIndices.Count();	// start vertices at the end of the current array
 	newdecal.VertexCount = 0;											// init vertcount to zero
-	
+
 	/*
 	** Grab pointers to the parent mesh's components
 	*/
@@ -942,12 +942,12 @@ bool SkinDecalMeshClass::Create_Decal(DecalGeneratorClass * generator,
 	** Grab a pointer to the material settings
 	*/
 	MaterialPassClass * material = generator->Get_Material();
-	
+
 	/*
 	** Set up the generator for the world coordinate system (the deformed vertices are in worldspace)
 	*/
 	generator->Set_Mesh_Transform(Matrix3D::Identity);
-	
+
 	/*
 	** Generate the faces and per-face info (remember to add-ref's)
 	** TODO: rewrite this to take advantage of vertex sharing...
@@ -957,7 +957,7 @@ bool SkinDecalMeshClass::Create_Decal(DecalGeneratorClass * generator,
 	for (i = 0; i < apt.Count(); i++) {
 		int offset = first_vert + i * 3;
 		Polys.Add(TriIndex(offset, offset + 1, offset + 2), face_size_hint);
-		
+
 		Shaders.Add(material->Peek_Shader(), face_size_hint);
 		Textures.Add(material->Get_Texture(), face_size_hint);		// Get_Texture gives us a reference...
 	}
@@ -999,7 +999,7 @@ bool SkinDecalMeshClass::Create_Decal(DecalGeneratorClass * generator,
 	*/
 	generator->Add_Mesh(Parent);
 
-#ifdef WWDEBUG	
+#ifdef WWDEBUG
 	/*
 	** Some paranoid debug code: ensure all tris have valid vertex indices
 	*/
@@ -1014,8 +1014,8 @@ bool SkinDecalMeshClass::Create_Decal(DecalGeneratorClass * generator,
 		WWASSERT (Polys[poly_idx].K >= 0);
 	}
 #endif
-	
-	// WWDEBUG_SAY(("Decal mesh now has: %d polys\r\n",Polys.Count()));
+
+	// WWDEBUG_SAY(("Decal mesh now has: %d polys",Polys.Count()));
 	return true;
 }
 
@@ -1052,7 +1052,7 @@ bool SkinDecalMeshClass::Delete_Decal(uint32 id)
 	DecalStruct * decal = &Decals[decal_index];
 
 	/*
-	** Remove all geometry used by this decal 
+	** Remove all geometry used by this decal
 	*/
 	Polys.Delete_Range(decal->FaceStartIndex, decal->FaceCount);
 	ParentVertexIndices.Delete_Range(decal->VertexStartIndex, decal->VertexCount);
@@ -1089,7 +1089,7 @@ bool SkinDecalMeshClass::Delete_Decal(uint32 id)
 	}
 	Decals.Delete(decal_index);
 
-#ifdef WWDEBUG	
+#ifdef WWDEBUG
 	/*
 	** Some paranoid debug code: ensure all tris have valid vertex indices
 	*/
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h
index 21bd5665dc4..dc66cdb5a3d 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h
@@ -36,17 +36,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DECALMSH_H
-#define DECALMSH_H
 
 #include "always.h"
 #include "bittype.h"
 #include "simplevec.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "vector2.h"
 #include "vector3.h"
 #include "Vector3i.h"
@@ -79,7 +74,7 @@ class TextureClass;
 class DecalMeshClass : public RefCountClass
 {
 public:
-	
+
 	DecalMeshClass(MeshClass * parent,DecalSystemClass * system);
 	virtual ~DecalMeshClass(void);
 
@@ -106,7 +101,7 @@ class DecalMeshClass : public RefCountClass
 	void														Set_Next_Visible(DecalMeshClass * mesh) { NextVisible = mesh; }
 
 protected:
-	
+
 	/*
 	** Members
 	*/
@@ -124,7 +119,7 @@ class DecalMeshClass : public RefCountClass
 class RigidDecalMeshClass : public DecalMeshClass
 {
 public:
-	
+
 	RigidDecalMeshClass(MeshClass * parent,DecalSystemClass * system);
 	virtual ~RigidDecalMeshClass(void);
 
@@ -169,14 +164,14 @@ class RigidDecalMeshClass : public DecalMeshClass
 	** Decal Organization
 	*/
 	struct DecalStruct
-	{	
+	{
 		uint32	DecalID;
 		uint16	VertexStartIndex;
 		uint16	VertexCount;
 		uint16	FaceStartIndex;
 		uint16	FaceCount;
 	};
-	
+
 	SimpleDynVecClass<DecalStruct>					Decals;
 };
 
@@ -189,7 +184,7 @@ class RigidDecalMeshClass : public DecalMeshClass
 class SkinDecalMeshClass : public DecalMeshClass
 {
 public:
-	
+
 	SkinDecalMeshClass(MeshClass * parent,DecalSystemClass * system);
 	virtual ~SkinDecalMeshClass(void);
 
@@ -233,14 +228,14 @@ class SkinDecalMeshClass : public DecalMeshClass
 	** Decal Organization
 	*/
 	struct DecalStruct
-	{	
+	{
 		uint32	DecalID;
 		uint16	VertexStartIndex;
 		uint16	VertexCount;
 		uint16	FaceStartIndex;
 		uint16	FaceCount;
 	};
-	
+
 	SimpleDynVecClass<DecalStruct>					Decals;
 };
 
@@ -288,7 +283,3 @@ inline uint32 SkinDecalMeshClass::Get_Decal_ID(int decal_index)
 {
 	return Decals[decal_index].DecalID;
 }
-
-
-#endif //DECALMSH_H
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.cpp
index f8c67f1906a..4b151ba7653 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Hector Yee                                                   *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 31                                                          $*
@@ -54,7 +54,7 @@ enum {
 };
 
 
-static const char* VendorNames[]={
+static const char* const VendorNames[]={
 	"Unknown",
 	"NVidia",
 	"ATI",
@@ -67,6 +67,7 @@ static const char* VendorNames[]={
 	"CirrusLogic",
 	"Rendition"
 };
+static_assert(ARRAY_SIZE(VendorNames) == DX8Caps::VENDOR_COUNT, "Incorrect array size");
 
 DX8Caps::VendorIdType DX8Caps::Define_Vendor(unsigned vendor_id)
 {
@@ -259,11 +260,11 @@ DX8Caps::DeviceTypeATI DX8Caps::Get_ATI_Device(unsigned device_id)
 	case 0x4C45:
 	case 0x4C46: return DEVICE_ATI_RAGE_128_MOBILITY_M3;
 
-	case 0x5041: 
-	case 0x5042: 
-	case 0x5043: 
-	case 0x5044: 
-	case 0x5045: 
+	case 0x5041:
+	case 0x5042:
+	case 0x5043:
+	case 0x5044:
+	case 0x5045:
 	case 0x5046: return DEVICE_ATI_RAGE_128_PRO_GL;
 
 	case 0x5047:
@@ -299,10 +300,10 @@ DX8Caps::DeviceTypeATI DX8Caps::Get_ATI_Device(unsigned device_id)
 
 	case 0x5157: return DEVICE_ATI_R7500;
 
-	case 0x5245: 
-	case 0x5246: 
-	case 0x534B: 
-	case 0x534C: 
+	case 0x5245:
+	case 0x5246:
+	case 0x534B:
+	case 0x534C:
 	case 0x534D: return DEVICE_ATI_RAGE_128_GL;
 
 	case 0x524B:
@@ -438,7 +439,7 @@ DX8Caps::DeviceTypeMatrox DX8Caps::Get_Matrox_Device(unsigned device_id)
 	default: return DEVICE_MATROX_UNKNOWN;
 	}
 }
- 
+
 DX8Caps::DeviceTypePowerVR DX8Caps::Get_PowerVR_Device(unsigned device_id)
 {
 	switch (device_id) {
@@ -469,8 +470,8 @@ DX8Caps::DeviceTypeIntel DX8Caps::Get_Intel_Device(unsigned device_id)
 
 DX8Caps::DX8Caps(
 	IDirect3D8* direct3d,
-	IDirect3DDevice8* D3DDevice, 
-	WW3DFormat display_format, 
+	IDirect3DDevice8* D3DDevice,
+	WW3DFormat display_format,
 	const D3DADAPTER_IDENTIFIER8& adapter_id)
 	:
 	Direct3D(direct3d),
@@ -503,9 +504,9 @@ void DX8Caps::Init_Caps(IDirect3DDevice8* D3DDevice)
 		SupportTnL=true;
 
 		D3DDevice->SetRenderState(D3DRS_SOFTWAREVERTEXPROCESSING,FALSE);
-		DX8CALL(GetDeviceCaps(&hwVPCaps));	
+		DX8CALL(GetDeviceCaps(&hwVPCaps));
 	} else {
-		SupportTnL=false;			
+		SupportTnL=false;
 	}
 }
 
@@ -526,7 +527,7 @@ void DX8Caps::Compute_Caps(WW3DFormat display_format, const D3DADAPTER_IDENTIFIE
 		SupportNPatches=false;
 	}
 
-	if ((caps.TextureOpCaps&D3DTEXOPCAPS_DOTPRODUCT3)==D3DTEXOPCAPS_DOTPRODUCT3) 
+	if ((caps.TextureOpCaps&D3DTEXOPCAPS_DOTPRODUCT3)==D3DTEXOPCAPS_DOTPRODUCT3)
 	{
 		SupportDot3=true;
 	} else {
@@ -534,10 +535,13 @@ void DX8Caps::Compute_Caps(WW3DFormat display_format, const D3DADAPTER_IDENTIFIE
 	}
 
 	supportGamma=((swVPCaps.Caps2&D3DCAPS2_FULLSCREENGAMMA)==D3DCAPS2_FULLSCREENGAMMA);
+	SupportPointSprites = (caps.MaxPointSize > 1.0f);
 
 	MaxTexturesPerPass=MAX_TEXTURE_STAGES;
 
 	Check_Texture_Format_Support(display_format,caps);
+	Check_Render_To_Texture_Support(display_format,caps);
+	Check_Depth_Stencil_Support(display_format,caps);
 	Check_Texture_Compression_Support(caps);
 	Check_Bumpmap_Support(caps);
 	Check_Shader_Support(caps);
@@ -633,9 +637,9 @@ void DX8Caps::Check_Render_To_Texture_Support(WW3DFormat display_format,const D3
 */
 void DX8Caps::Check_Depth_Stencil_Support(WW3DFormat display_format, const D3DCAPS8& caps)
 {
-	if (display_format==WW3D_FORMAT_UNKNOWN) 
+	if (display_format==WW3D_FORMAT_UNKNOWN)
 	{
-		for (unsigned i=0;i<WW3D_ZFORMAT_COUNT;++i) 
+		for (unsigned i=0;i<WW3D_ZFORMAT_COUNT;++i)
 		{
 			SupportDepthStencilFormat[i]=false;
 		}
@@ -643,14 +647,14 @@ void DX8Caps::Check_Depth_Stencil_Support(WW3DFormat display_format, const D3DCA
 	}
 
 	D3DFORMAT d3d_display_format=WW3DFormat_To_D3DFormat(display_format);
-	
-	for (unsigned i=0;i<WW3D_ZFORMAT_COUNT;++i) 
+
+	for (unsigned i=0;i<WW3D_ZFORMAT_COUNT;++i)
 	{
-		if (i==WW3D_ZFORMAT_UNKNOWN) 
+		if (i==WW3D_ZFORMAT_UNKNOWN)
 		{
 			SupportDepthStencilFormat[i]=false;
 		}
-		else 
+		else
 		{
 			WW3DZFormat format=(WW3DZFormat)i;
 			SupportDepthStencilFormat[i]=SUCCEEDED
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h
index 28c1b983b1f..69a793ae812 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Hector Yee                                                   *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 24                                                          $*
@@ -37,12 +37,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef DX8CAPS_H
-#define DX8CAPS_H
 
 #include "always.h"
 #include "ww3dformat.h"
@@ -69,7 +64,9 @@ class DX8Caps
 		VENDOR_3DFX,
 		VENDOR_3DLABS,
 		VENDOR_CIRRUSLOGIC,
-		VENDOR_RENDITION
+		VENDOR_RENDITION,
+
+		VENDOR_COUNT
 	};
 
 	enum DeviceTypeATI {
@@ -211,13 +208,14 @@ class DX8Caps
 	static void Shutdown(void);
 
 	void Compute_Caps(WW3DFormat display_format, const D3DADAPTER_IDENTIFIER8& adapter_id);
-	bool Support_TnL() const { return SupportTnL; };	
+	bool Support_TnL() const { return SupportTnL; };
 	bool Support_DXTC() const { return SupportDXTC; }
 	bool Support_Gamma() const { return supportGamma; }
 	bool Support_NPatches() const { return SupportNPatches; }
 	bool Support_Bump_Envmap() const { return SupportBumpEnvmap; }
 	bool Support_Bump_Envmap_Luminance() const { return SupportBumpEnvmapLuminance; }
 	bool Support_Dot3() const { return SupportDot3; }
+	bool Support_PointSprites() const { return SupportPointSprites; }
 	int Get_Max_Textures_Per_Pass() const { return MaxTexturesPerPass; }
 
 	// -------------------------------------------------------------------------
@@ -268,7 +266,7 @@ class DX8Caps
 
 	D3DCAPS8 hwVPCaps;
 	D3DCAPS8 swVPCaps;
-	bool SupportTnL;	
+	bool SupportTnL;
 	bool SupportDXTC;
 	bool supportGamma;
 	bool SupportNPatches;
@@ -278,12 +276,10 @@ class DX8Caps
 	bool SupportRenderToTextureFormat[WW3D_FORMAT_COUNT];
 	bool SupportDepthStencilFormat[WW3D_ZFORMAT_COUNT];
 	bool SupportDot3;
+	bool SupportPointSprites;
 	int MaxTexturesPerPass;
 	int VertexShaderVersion;
 	int PixelShaderVersion;
 	int MaxSimultaneousTextures;
 	IDirect3D8* Direct3D; // warning XDK name conflict KJM
 };
-
-
-#endif
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp
index 1894fb5010e..a30cf97d23d 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp
@@ -25,14 +25,14 @@ static unsigned Get_FVF_Vertex_Size(unsigned FVF)
 	return D3DXGetFVFVertexSize(FVF);
 }
 
-FVFInfoClass::FVFInfoClass(unsigned FVF_) 
+FVFInfoClass::FVFInfoClass(unsigned FVF_)
 	:
 	FVF(FVF_),
 	fvf_size(Get_FVF_Vertex_Size(FVF))
 {
 	location_offset=0;
 	blend_offset=location_offset;
-	
+
 	if ((FVF&D3DFVF_XYZ)==D3DFVF_XYZ) blend_offset+=3*sizeof(float);
 	normal_offset=blend_offset;
 
@@ -46,7 +46,7 @@ FVFInfoClass::FVFInfoClass(unsigned FVF_)
 	if ((FVF&D3DFVF_DIFFUSE)==D3DFVF_DIFFUSE) specular_offset+=sizeof(DWORD);
 	texcoord_offset[0]=specular_offset;
 
-	if ((FVF&D3DFVF_SPECULAR)==D3DFVF_SPECULAR) texcoord_offset[0]+=sizeof(DWORD);	
+	if ((FVF&D3DFVF_SPECULAR)==D3DFVF_SPECULAR) texcoord_offset[0]+=sizeof(DWORD);
 
 	for (unsigned int i=1; i<D3DDP_MAXTEXCOORD; i++)
 	{
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
index 1564ad43309..dc004e925b2 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Jani Penttinen                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 5:06p                                             $*
  *                                                                                             *
  *                    $Revision:: 7                                                          $*
@@ -39,13 +39,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8_FVF_H
-#define DX8_FVF_H
 
 #include "always.h"
 #include <d3d8.h>
@@ -260,31 +254,28 @@ class FVFInfoClass : public W3DMPO
 	unsigned							location_offset;
 	unsigned							normal_offset;
 	unsigned							blend_offset;
-	unsigned							texcoord_offset[D3DDP_MAXTEXCOORD];	
+	unsigned							texcoord_offset[D3DDP_MAXTEXCOORD];
 	unsigned							diffuse_offset;
 	unsigned							specular_offset;
 public:
 	FVFInfoClass(unsigned FVF);
 
-	inline unsigned Get_Location_Offset() const { return location_offset; }
-	inline unsigned Get_Normal_Offset() const { return normal_offset; }
+	unsigned Get_Location_Offset() const { return location_offset; }
+	unsigned Get_Normal_Offset() const { return normal_offset; }
 #ifdef WWDEBUG
-	inline unsigned Get_Tex_Offset(unsigned int n) const { WWASSERT(n<D3DDP_MAXTEXCOORD); return texcoord_offset[n]; }	
+	inline unsigned Get_Tex_Offset(unsigned int n) const { WWASSERT(n<D3DDP_MAXTEXCOORD); return texcoord_offset[n]; }
 #else
-	inline unsigned Get_Tex_Offset(unsigned int n) const { return texcoord_offset[n]; }	
+	unsigned Get_Tex_Offset(unsigned int n) const { return texcoord_offset[n]; }
 #endif
 
-	inline unsigned Get_Diffuse_Offset() const { return diffuse_offset; }
-	inline unsigned Get_Specular_Offset() const { return specular_offset; }
-	inline unsigned Get_FVF() const { return FVF; }
-	inline unsigned Get_FVF_Size() const { return fvf_size; }
+	unsigned Get_Diffuse_Offset() const { return diffuse_offset; }
+	unsigned Get_Specular_Offset() const { return specular_offset; }
+	unsigned Get_FVF() const { return FVF; }
+	unsigned Get_FVF_Size() const { return fvf_size; }
 
 	void Get_FVF_Name(StringClass& fvfname) const;	// For debug purposes
 
 	// for enabling vertex shaders
-	inline void Set_FVF(unsigned fvf) const { FVF=fvf; }
-	inline void Set_FVF_Size(unsigned size) const { fvf_size=size; }
+	void Set_FVF(unsigned fvf) const { FVF=fvf; }
+	void Set_FVF_Size(unsigned size) const { fvf_size=size; }
 };
-
-
-#endif
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp
index 68e6a1f8bb5..7e818fcbed9 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp
@@ -49,12 +49,12 @@
 static bool _DynamicSortingIndexArrayInUse=false;
 static SortingIndexBufferClass* _DynamicSortingIndexArray;
 static unsigned short _DynamicSortingIndexArraySize=0;
-static unsigned short _DynamicSortingIndexArrayOffset=0;	
+static unsigned short _DynamicSortingIndexArrayOffset=0;
 
 static bool _DynamicDX8IndexBufferInUse=false;
 static DX8IndexBufferClass* _DynamicDX8IndexBuffer=NULL;
 static unsigned short _DynamicDX8IndexBufferSize=DEFAULT_IB_SIZE;
-static unsigned short _DynamicDX8IndexBufferOffset=0;	
+static unsigned short _DynamicDX8IndexBufferOffset=0;
 
 static int _IndexBufferCount;
 static int _IndexBufferTotalIndices;
@@ -79,8 +79,8 @@ IndexBufferClass::IndexBufferClass(unsigned type_, unsigned short index_count_)
 	_IndexBufferTotalIndices+=index_count;
 	_IndexBufferTotalSize+=index_count*sizeof(unsigned short);
 #ifdef VERTEX_BUFFER_LOG
-	WWDEBUG_SAY(("New IB, %d indices, size %d bytes\n",index_count,index_count*sizeof(unsigned short)));
-	WWDEBUG_SAY(("Total IB count: %d, total %d indices, total size %d bytes\n",
+	WWDEBUG_SAY(("New IB, %d indices, size %d bytes",index_count,index_count*sizeof(unsigned short)));
+	WWDEBUG_SAY(("Total IB count: %d, total %d indices, total size %d bytes",
 		_IndexBufferCount,
 		_IndexBufferTotalIndices,
 		_IndexBufferTotalSize));
@@ -93,8 +93,8 @@ IndexBufferClass::~IndexBufferClass()
 	_IndexBufferTotalIndices-=index_count;
 	_IndexBufferTotalSize-=index_count*sizeof(unsigned short);
 #ifdef VERTEX_BUFFER_LOG
-	WWDEBUG_SAY(("Delete IB, %d indices, size %d bytes\n",index_count,index_count*sizeof(unsigned short)));
-	WWDEBUG_SAY(("Total IB count: %d, total %d indices, total size %d bytes\n",
+	WWDEBUG_SAY(("Delete IB, %d indices, size %d bytes",index_count,index_count*sizeof(unsigned short)));
+	WWDEBUG_SAY(("Total IB count: %d, total %d indices, total size %d bytes",
 		_IndexBufferCount,
 		_IndexBufferTotalIndices,
 		_IndexBufferTotalSize));
@@ -118,7 +118,7 @@ unsigned IndexBufferClass::Get_Total_Allocated_Memory()
 
 void IndexBufferClass::Add_Engine_Ref() const
 {
-	engine_refs++; 
+	engine_refs++;
 }
 
 void IndexBufferClass::Release_Engine_Ref() const
@@ -141,14 +141,14 @@ void IndexBufferClass::Copy(unsigned int* indices,unsigned first_index,unsigned
 		DX8IndexBufferClass::AppendLockClass l(this,first_index,count);
 		unsigned short* inds=l.Get_Index_Array();
 		for (unsigned v=0;v<count;++v) {
-			*inds++=unsigned short(*indices++);
+			*inds++=(unsigned short)(*indices++);
 		}
 	}
 	else {
 		DX8IndexBufferClass::WriteLockClass l(this);
 		unsigned short* inds=l.Get_Index_Array();
 		for (unsigned v=0;v<count;++v) {
-			*inds++=unsigned short(*indices++);
+			*inds++=(unsigned short)(*indices++);
 		}
 	}
 }
@@ -376,7 +376,7 @@ void DynamicIBAccessClass::_Deinit()
 	REF_PTR_RELEASE(_DynamicSortingIndexArray);
 	_DynamicSortingIndexArrayInUse=false;
 	_DynamicSortingIndexArraySize=0;
-	_DynamicSortingIndexArrayOffset=0;	
+	_DynamicSortingIndexArrayOffset=0;
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
index e3f24a6811c..a13bda71330 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
@@ -36,16 +36,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8INDEXBUFFER_H
-#define DX8INDEXBUFFER_H
 
 #include "always.h"
 #include "wwdebug.h"
-#include "refcount.h"
 #include "sphere.h"
 
 class DX8Wrapper;
@@ -68,13 +62,13 @@ class IndexBufferClass : public W3DMPO, public RefCountClass
 	void Copy(unsigned int* indices,unsigned start_index,unsigned index_count);
 	void Copy(unsigned short* indices,unsigned start_index,unsigned index_count);
 
-	inline unsigned short Get_Index_Count() const { return index_count; }
+	unsigned short Get_Index_Count() const { return index_count; }
 
-	inline unsigned Type() const { return type; }
+	unsigned Type() const { return type; }
 
 	void Add_Engine_Ref() const;
 	void Release_Engine_Ref() const;
-	inline unsigned Engine_Refs() const { return engine_refs; }
+	unsigned Engine_Refs() const { return engine_refs; }
 
 	class WriteLockClass
 	{
@@ -119,7 +113,7 @@ class DynamicIBAccessClass : public W3DMPO
 	friend SortingRendererClass;
 
 	unsigned Type;
-	unsigned short IndexCount;	
+	unsigned short IndexCount;
 	unsigned short IndexBufferOffset;
 	IndexBufferClass* IndexBuffer;
 
@@ -144,7 +138,7 @@ class DynamicIBAccessClass : public W3DMPO
 	class WriteLockClass
 	{
 		DynamicIBAccessClass* DynamicIBAccess;
-		unsigned short* Indices;		
+		unsigned short* Indices;
 	public:
 		WriteLockClass(DynamicIBAccessClass* ib_access);
 		~WriteLockClass();
@@ -179,8 +173,8 @@ class DX8IndexBufferClass : public IndexBufferClass
 	void Copy(unsigned int* indices,unsigned start_index,unsigned index_count);
 	void Copy(unsigned short* indices,unsigned start_index,unsigned index_count);
 
-	inline IDirect3DIndexBuffer8* Get_DX8_Index_Buffer()	{ return index_buffer; }
-	
+	IDirect3DIndexBuffer8* Get_DX8_Index_Buffer()	{ return index_buffer; }
+
 private:
 	IDirect3DIndexBuffer8*	index_buffer;		// actual dx8 index buffer
 };
@@ -203,6 +197,3 @@ class SortingIndexBufferClass : public IndexBufferClass
 protected:
 	unsigned short* index_buffer;
 };
-
-#endif //DX8INDEXBUFFER_H
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp
index 4e03b53863f..687b972af38 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp
@@ -93,7 +93,7 @@ typedef MultiListIterator<PolyRemover>		PolyRemoverListIterator;
 ** for this frame.  Since MeshClass instances can share meshmodels
 ** (and therefore their dx8 polygon renderers) this record contains
 ** a pointer to the polygon renderer and the MeshClass instance that
-** it is being rendered for. 
+** it is being rendered for.
 */
 class PolyRenderTaskClass : public AutoPoolClass<PolyRenderTaskClass, 256>
 {
@@ -133,7 +133,7 @@ DEFINE_AUTO_POOL(PolyRenderTaskClass, 256);
 ** MatPassTaskClass
 ** This is the record of a material pass that needs to be rendered on
 ** a particular mesh.  These are linked into the FVF container which
-** contains the mesh model.  They are also pooled to remove memory 
+** contains the mesh model.  They are also pooled to remove memory
 ** allocation overhead.
 */
 class MatPassTaskClass : public AutoPoolClass<MatPassTaskClass, 256>
@@ -155,10 +155,10 @@ class MatPassTaskClass : public AutoPoolClass<MatPassTaskClass, 256>
 		MaterialPass->Release_Ref();
 		Mesh->Release_Ref();
 	}
-	
+
 	MaterialPassClass *	Peek_Material_Pass(void)							{ return MaterialPass; }
 	MeshClass *				Peek_Mesh(void)										{ return Mesh; }
-	
+
 	MatPassTaskClass *	Get_Next_Visible(void)								{ return NextVisible; }
 	void						Set_Next_Visible(MatPassTaskClass * mpr)		{ NextVisible = mpr; }
 
@@ -186,7 +186,7 @@ inline static bool Equal_Material(const VertexMaterialClass* mat1,const VertexMa
 DX8TextureCategoryClass::DX8TextureCategoryClass(
 	DX8FVFCategoryContainer* container_,
 	TextureClass** texs,
-	ShaderClass shd, 
+	ShaderClass shd,
 	VertexMaterialClass* mat,
 	int pass_)
 	:
@@ -199,8 +199,8 @@ DX8TextureCategoryClass::DX8TextureCategoryClass(
 	WWASSERT(pass>=0);
 	WWASSERT(pass<DX8FVFCategoryContainer::MAX_PASSES);
 
-
-	for (int a=0;a<MAX_TEXTURE_STAGES;++a) {
+	for (int a=0;a<MeshMatDescClass::MAX_TEX_STAGES;++a)
+	{
 		textures[a]=NULL;
 		REF_PTR_SET(textures[a],texs[a]);
 	}
@@ -214,11 +214,14 @@ DX8TextureCategoryClass::~DX8TextureCategoryClass()
 	while (DX8PolygonRendererClass* p_renderer=PolygonRendererList.Get_Head()) {
 		TheDX8MeshRenderer.Unregister_Mesh_Type(p_renderer->Get_Mesh_Model_Class());
 	}
-	for (int a=0;a<MAX_TEXTURE_STAGES;++a) {
+	for (int a=0;a<MeshMatDescClass::MAX_TEX_STAGES;++a)
+	{
 		REF_PTR_RELEASE(textures[a]);
 	}
 
 	REF_PTR_RELEASE(material);
+
+	DEBUG_ASSERTCRASH(render_task_head == NULL, ("~DX8TextureCategoryClass: Leaking render tasks"));
 }
 
 void DX8TextureCategoryClass::Add_Render_Task(DX8PolygonRendererClass * p_renderer,MeshClass * p_mesh)
@@ -295,7 +298,7 @@ void DX8FVFCategoryContainer::Render_Procedural_Material_Passes(void)
 	while (mpr != NULL) {
 
    		MeshClass * mesh = mpr->Peek_Mesh();
-  	
+
    		if (mesh->Get_Base_Vertex_Offset() == VERTEX_BUFFER_OVERFLOW)	//check if this mesh is valid
    		{	//skip this mesh so it gets rendered later after vertices are filled in.
  	        last_mpr = mpr;
@@ -326,19 +329,19 @@ void DX8TextureCategoryClass::Log(bool only_visible)
 {
 #ifdef ENABLE_CATEGORY_LOG
 	StringClass work(255,true);
-	work.Format("	DX8TextureCategoryClass\n");
+	work.Format("	DX8TextureCategoryClass");
 	WWDEBUG_SAY((work));
 
 	StringClass work2(255,true);
 	for (int stage=0;stage<MAX_TEXTURE_STAGES;++stage) {
-		work2.Format("	texture[%d]: %x (%s)\n", stage, textures[stage], textures[stage] ? textures[stage]->Get_Name() : "-");
+		work2.Format("\n	texture[%d]: %x (%s)", stage, textures[stage], textures[stage] ? textures[stage]->Get_Name() : "-");
 		work+=work2;
 	}
-	work2.Format("	material: %x (%s)\n	shader: %x\n", material, material ? material->Get_Name() : "-", shader);
+	work2.Format("\n	material: %x (%s)\n	shader: %x", material, material ? material->Get_Name() : "-", shader);
 	work+=work2;
 	WWDEBUG_SAY((work));
 
-	work.Format("	%8s %8s %6s %6s %6s %5s %s\n",
+	work.Format("	%8s %8s %6s %6s %6s %5s %s",
 		"idx_cnt",
 		"poly_cnt",
 		"i_offs",
@@ -350,7 +353,7 @@ void DX8TextureCategoryClass::Log(bool only_visible)
 
 	DX8PolygonRendererListIterator it(&PolygonRendererList);
 	while (!it.Is_Done()) {
-	
+
 		DX8PolygonRendererClass* p_renderer = it.Peek_Obj();
 
 		PolyRenderTaskClass * prtc=render_task_head;
@@ -444,7 +447,7 @@ DX8TextureCategoryClass* DX8FVFCategoryContainer::Find_Matching_Texture_Category
 
 DX8TextureCategoryClass* DX8FVFCategoryContainer::Find_Matching_Texture_Category(
 		VertexMaterialClass* vmat,
-		unsigned pass,		
+		unsigned pass,
 		DX8TextureCategoryClass* ref_category)
 {
 	// Find texture category which matches ref_category's properties but has 'vmat' on given pass
@@ -456,8 +459,8 @@ DX8TextureCategoryClass* DX8FVFCategoryContainer::Find_Matching_Texture_Category
 			dest_tex_category=dest_it.Peek_Obj();
 			bool all_textures_same = true;
 			for (unsigned int s = 0; s < MeshMatDescClass::MAX_TEX_STAGES; s++)
-				all_textures_same = all_textures_same && (dest_tex_category->Peek_Texture(s) == ref_category->Peek_Texture(s));			
-			if (all_textures_same &&				
+				all_textures_same = all_textures_same && (dest_tex_category->Peek_Texture(s) == ref_category->Peek_Texture(s));
+			if (all_textures_same &&
 				dest_tex_category->Get_Shader()==ref_category->Get_Shader()) {
 				return dest_tex_category;
 			}
@@ -486,7 +489,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Texture(
 	// and move them to destination category.
 	TextureCategoryListIterator src_it(&texture_category_list[pass]);
 	while (!src_it.Is_Done()) {
-		DX8TextureCategoryClass* src_tex_category=src_it.Peek_Obj();		
+		DX8TextureCategoryClass* src_tex_category=src_it.Peek_Obj();
 		if (src_tex_category->Peek_Texture(stage)==texture) {
 			foundtexture=true;
 			DX8PolygonRendererListIterator poly_it(&polygon_renderer_list);
@@ -495,7 +498,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Texture(
 				DX8PolygonRendererClass* polygon_renderer=poly_it.Peek_Obj();
 				DX8TextureCategoryClass *prc=polygon_renderer->Get_Texture_Category();
 
-				if (prc==src_tex_category) {					
+				if (prc==src_tex_category) {
 					DX8TextureCategoryClass* dest_tex_category=Find_Matching_Texture_Category(new_texture,pass,stage,src_tex_category);
 
 					if (!dest_tex_category) {
@@ -511,7 +514,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Texture(
 							src_tex_category->Get_Shader(),
 							const_cast<VertexMaterialClass*>(src_tex_category->Peek_Material()),
 							pass);
-		
+
 						/*
 						** Add the texture category object into the list, immediately after any existing
 						** texture category object which uses the same texture.  This will result in
@@ -538,16 +541,16 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Texture(
 					rem->src=src_tex_category;
 					rem->dest=dest_tex_category;
 					rem->pr=polygon_renderer;
-					prl.Add(rem);					
+					prl.Add(rem);
 				}
 				poly_it.Next();
-			} // while			
-		} //if src_texture==texture
+			}
+		}
 		else
 			// quit loop if we've got a texture change
 			if (foundtexture) break;
 		src_it.Next();
-	} // while
+	}
 
 	PolyRemoverListIterator prli(&prl);
 
@@ -555,7 +558,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Texture(
 	{
 		PolyRemover *rem=prli.Peek_Obj();
 		rem->src->Remove_Polygon_Renderer(rem->pr);
-		rem->dest->Add_Polygon_Renderer(rem->pr);		
+		rem->dest->Add_Polygon_Renderer(rem->pr);
 		prli.Remove_Current_Object();
 		delete rem;
 	}
@@ -580,7 +583,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Material(
 	TextureCategoryListIterator src_it(&texture_category_list[pass]);
 	while (!src_it.Is_Done()) {
 		DX8TextureCategoryClass* src_tex_category=src_it.Peek_Obj();
-		if (src_tex_category->Peek_Material()==vmat) {			
+		if (src_tex_category->Peek_Material()==vmat) {
 			DX8PolygonRendererListIterator poly_it(&polygon_renderer_list);
 			while (!poly_it.Is_Done()) {
 				// If source texture category contains polygon renderer, move to destination category
@@ -594,7 +597,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Material(
 						TextureClass * tmp_textures[MeshMatDescClass::MAX_TEX_STAGES];
 						for (int s=0;s<MeshMatDescClass::MAX_TEX_STAGES;++s) {
 							tmp_textures[s]=src_tex_category->Peek_Texture(s);
-						}						
+						}
 
 						DX8TextureCategoryClass * new_tex_category=W3DNEW DX8TextureCategoryClass(
 							this,
@@ -602,7 +605,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Material(
 							src_tex_category->Get_Shader(),
 							const_cast<VertexMaterialClass*>(new_vmat),
 							pass);
-		
+
 						/*
 						** Add the texture category object into the list, immediately after any existing
 						** texture category object which uses the same texture.  This will result in
@@ -632,12 +635,12 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Material(
 					prl.Add(rem);
 				}
 				poly_it.Next();
-			} // while			
-		} // if 
+			}
+		}
 		else
 			if (foundtexture) break;
 		src_it.Next();
-	} // while
+	}
 
 	PolyRemoverListIterator prli(&prl);
 
@@ -645,7 +648,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Material(
 	{
 		PolyRemover *rem=prli.Peek_Obj();
 		rem->src->Remove_Polygon_Renderer(rem->pr);
-		rem->dest->Add_Polygon_Renderer(rem->pr);		
+		rem->dest->Add_Polygon_Renderer(rem->pr);
 		prli.Remove_Current_Object();
 		delete rem;
 	}
@@ -669,7 +672,7 @@ unsigned DX8FVFCategoryContainer::Define_FVF(MeshModelClass* mmc,bool enable_lig
 	if (mmc->Get_Color_Array(1,false)) {
 		fvf|=D3DFVF_SPECULAR;
 	}
-	
+
 	switch (tex_coord_count) {
 	default:
 	case 0:
@@ -715,27 +718,27 @@ void DX8RigidFVFCategoryContainer::Log(bool only_visible)
 {
 #ifdef ENABLE_CATEGORY_LOG
 	StringClass work(255,true);
-	work.Format("DX8RigidFVFCategoryContainer --------------\n");
+	work.Format("DX8RigidFVFCategoryContainer --------------");
 	WWDEBUG_SAY((work));
 	if (vertex_buffer) {
 		StringClass fvfname(255,true);
 		vertex_buffer->FVF_Info().Get_FVF_Name(fvfname);
-		work.Format("VB size (used/total): %d/%d FVF: %s\n",used_vertices,vertex_buffer->Get_Vertex_Count(),fvfname);
+		work.Format("VB size (used/total): %d/%d FVF: %s",used_vertices,vertex_buffer->Get_Vertex_Count(),fvfname);
 		WWDEBUG_SAY((work));
 	}
 	else {
-		WWDEBUG_SAY(("EMPTY VB\n"));
+		WWDEBUG_SAY(("EMPTY VB"));
 	}
 	if (index_buffer) {
-		work.Format("IB size (used/total): %d/%d\n",used_indices,index_buffer->Get_Index_Count());
+		work.Format("IB size (used/total): %d/%d",used_indices,index_buffer->Get_Index_Count());
 		WWDEBUG_SAY((work));
 	}
 	else {
-		WWDEBUG_SAY(("EMPTY IB\n"));
+		WWDEBUG_SAY(("EMPTY IB"));
 	}
 
 	for (unsigned p=0;p<passes;++p) {
-		WWDEBUG_SAY(("Pass: %d\n",p));
+		WWDEBUG_SAY(("Pass: %d",p));
 
 		TextureCategoryListIterator it(&texture_category_list[p]);
 		while (!it.Is_Done()) {
@@ -760,9 +763,9 @@ void DX8RigidFVFCategoryContainer::Render(void)
 	DX8Wrapper::Set_Vertex_Buffer(vertex_buffer);
 	DX8Wrapper::Set_Index_Buffer(index_buffer,0);
 
-	SNAPSHOT_SAY(("DX8RigidFVFCategoryContainer::Render()\n"));
+	SNAPSHOT_SAY(("DX8RigidFVFCategoryContainer::Render()"));
 	for (unsigned p=0;p<passes;++p) {
-		SNAPSHOT_SAY(("Pass: %d\n",p));
+		SNAPSHOT_SAY(("Pass: %d",p));
 		while (DX8TextureCategoryClass * tex = visible_texture_category_list[p].Remove_Head()) {
 			tex->Render();
 		}
@@ -781,7 +784,7 @@ bool DX8RigidFVFCategoryContainer::Check_If_Mesh_Fits(MeshModelClass* mmc)
 	unsigned required_polygons=mmc->Get_Polygon_Count();
 	if (mmc->Get_Gap_Filler()) {
 		required_polygons+=mmc->Get_Gap_Filler()->Get_Polygon_Count();
-	} 
+	}
 	unsigned required_indices=required_polygons*3*mmc->Get_Pass_Count();
 	unsigned available_indices=index_buffer->Get_Index_Count()-used_indices;
 	if (
@@ -909,7 +912,7 @@ class Vertex_Split_Table
 	{
 		if (mmc->Has_Shader_Array(pass)) {
 			ShaderClass shader;
-			
+
 			if (idx>=unsigned(mmc->Get_Polygon_Count())) {
 				WWASSERT(mmc->Get_Gap_Filler());
 				shader=mmc->Get_Gap_Filler()->Get_Shader_Array(pass)[idx-mmc->Get_Polygon_Count()];
@@ -983,7 +986,7 @@ void DX8RigidFVFCategoryContainer::Add_Mesh(MeshModelClass* mmc_)
 	for (i=0; i<split_table.Get_Vertex_Count(); i++)
 	{
 		*(Vector3*)(vb+fi.Get_Location_Offset())=locs[i];
-		
+
 		if ((FVF&D3DFVF_NORMAL)==D3DFVF_NORMAL && norms) {
 			*(Vector3*)(vb+fi.Get_Normal_Offset())=norms[i];
 		}
@@ -995,7 +998,7 @@ void DX8RigidFVFCategoryContainer::Add_Mesh(MeshModelClass* mmc_)
 				*(unsigned int*)(vb+fi.Get_Diffuse_Offset()) = 0xFFFFFFFF;
 			}
 		}
-		
+
 		if ((FVF&D3DFVF_SPECULAR)==D3DFVF_SPECULAR) {
 			if (specular) {
 				*(unsigned int*)(vb+fi.Get_Specular_Offset())=specular[i];
@@ -1006,7 +1009,7 @@ void DX8RigidFVFCategoryContainer::Add_Mesh(MeshModelClass* mmc_)
 
 		vb+=fi.Get_FVF_Size();
 	}
-	
+
 
 	/*
 	** Append the UV coordinates to the vertex buffer
@@ -1036,7 +1039,7 @@ void DX8RigidFVFCategoryContainer::Add_Mesh(MeshModelClass* mmc_)
 	if ((FVF&D3DFVF_TEX8) == D3DFVF_TEX8) {
 		uvcount = 8;
 	}
-	
+
 	for (int j=0; j<uvcount; j++) {
 		unsigned char *vb=(unsigned char*) l.Get_Vertex_Array();
 		const Vector2*uvs=split_table.Get_UV_Array(j);
@@ -1045,7 +1048,7 @@ void DX8RigidFVFCategoryContainer::Add_Mesh(MeshModelClass* mmc_)
 			{
 				*(Vector2*)(vb+fi.Get_Tex_Offset(j))=uvs[i];
 				vb+=fi.Get_FVF_Size();
-			}		
+			}
 		}
 	}
 
@@ -1084,10 +1087,10 @@ void DX8FVFCategoryContainer::Insert_To_Texture_Category(
 	}
 
 	if (!fit_in_existing_category) {
-		
+
 		DX8TextureCategoryClass * new_tex_category=W3DNEW DX8TextureCategoryClass(this,texs,shader,mat,pass);
 		used_indices+=new_tex_category->Add_Mesh(split_table,vertex_offset,used_indices,index_buffer,pass);
-		
+
 		/*
 		** Add the texture category object into the list, immediately after any existing
 		** texture category object which uses the same texture.  This will result in
@@ -1147,14 +1150,14 @@ struct Textures_Material_And_Shader_Booking_Struct
 void DX8FVFCategoryContainer::Generate_Texture_Categories(Vertex_Split_Table& split_table,unsigned vertex_offset)
 {
 	int polygon_count=split_table.Get_Polygon_Count();
-	int index_count=polygon_count*3*split_table.Get_Pass_Count(); 
+	int index_count=polygon_count*3*split_table.Get_Pass_Count();
 
 	/*
 	** If we don't have an index buffer yet, allocate one.  Make it hold at least 12000 entries,
-	** more if the mesh requires it.  
+	** more if the mesh requires it.
 	*/
 	if (!index_buffer) {
-		int ib_size=12000;  
+		int ib_size=12000;
 		if (ib_size<index_count) ib_size=index_count;
 		if (sorting) {
 			index_buffer=NEW_REF(SortingIndexBufferClass,(ib_size));
@@ -1173,8 +1176,10 @@ void DX8FVFCategoryContainer::Generate_Texture_Categories(Vertex_Split_Table& sp
 
 		for (int i=0;i<polygon_count;++i) {
 			TextureClass* textures[MeshMatDescClass::MAX_TEX_STAGES];
-			WWASSERT(MAX_TEXTURE_STAGES==MeshMatDescClass::MAX_TEX_STAGES);
-			for (int stage=0;stage<MeshMatDescClass::MAX_TEX_STAGES;stage++) {
+			// disabled this assert as MAX_TEXTURE_STAGES is now 8, but legacy MeshMat::MAX_TEX_STAGES is still 2
+	//		WWASSERT(MAX_TEXTURE_STAGES==MeshMatDescClass::MAX_TEX_STAGES);
+			for (int stage=0;stage<MeshMatDescClass::MAX_TEX_STAGES;stage++)
+			{
 				textures[stage]=split_table.Peek_Texture(i,pass,stage);
 			}
 			VertexMaterialClass* mat=split_table.Peek_Material(i,pass);
@@ -1212,15 +1217,15 @@ void DX8SkinFVFCategoryContainer::Log(bool only_visible)
 {
 #ifdef ENABLE_CATEGORY_LOG
 	StringClass work(255,true);
-	work.Format("DX8SkinFVFCategoryContainer --------------\n");
+	work.Format("DX8SkinFVFCategoryContainer --------------");
 	WWDEBUG_SAY((work));
 
 	if (index_buffer) {
-		work.Format("IB size (used/total): %d/%d\n",used_indices,index_buffer->Get_Index_Count());
+		work.Format("IB size (used/total): %d/%d",used_indices,index_buffer->Get_Index_Count());
 		WWDEBUG_SAY((work));
 	}
 	else {
-		WWDEBUG_SAY(("EMPTY IB\n"));
+		WWDEBUG_SAY(("EMPTY IB"));
 	}
 
 	for (unsigned pass=0;pass<passes;++pass) {
@@ -1237,9 +1242,9 @@ void DX8SkinFVFCategoryContainer::Log(bool only_visible)
 
 void DX8SkinFVFCategoryContainer::Render(void)
 {
-	SNAPSHOT_SAY(("DX8SkinFVFCategoryContainer::Render()\n"));
+	SNAPSHOT_SAY(("DX8SkinFVFCategoryContainer::Render()"));
 	if (!Anything_To_Render()) {
-		SNAPSHOT_SAY(("Nothing to render\n"));
+		SNAPSHOT_SAY(("Nothing to render"));
 		return;
 	}
 	AnythingToRender=false;
@@ -1258,7 +1263,7 @@ void DX8SkinFVFCategoryContainer::Render(void)
 		sorting ? BUFFER_TYPE_DYNAMIC_SORTING : BUFFER_TYPE_DYNAMIC_DX8,
 		dynamic_fvf_type,
 		maxVertexCount);
-	SNAPSHOT_SAY(("DynamicVBAccess - %s - %d vertices\n",sorting ? "sorting" : "non-sorting",VisibleVertexCount));
+	SNAPSHOT_SAY(("DynamicVBAccess - %s - %d vertices",sorting ? "sorting" : "non-sorting",VisibleVertexCount));
 
 	unsigned int renderedVertexCount=0;
 
@@ -1289,7 +1294,7 @@ void DX8SkinFVFCategoryContainer::Render(void)
 
 				DX8_RECORD_SKIN_RENDER(mesh->Get_Num_Polys(),mesh_vertex_count);
 
-				if (_TempVertexBuffer.Length() < mesh_vertex_count) _TempVertexBuffer.Resize(mesh_vertex_count); 
+				if (_TempVertexBuffer.Length() < mesh_vertex_count) _TempVertexBuffer.Resize(mesh_vertex_count);
 				if (_TempNormalBuffer.Length() < mesh_vertex_count) _TempNormalBuffer.Resize(mesh_vertex_count);
 
 				Vector3* loc=&(_TempVertexBuffer[0]);
@@ -1342,19 +1347,19 @@ void DX8SkinFVFCategoryContainer::Render(void)
 				mesh->Set_Base_Vertex_Offset(vertex_offset);
 				vertex_offset+=mesh_vertex_count;
 				renderedVertexCount += mesh_vertex_count;
-				
+
 				mesh = mesh->Peek_Next_Visible_Skin();
-			}	//while
-		}//lock
+			}
+		}
 
-		SNAPSHOT_SAY(("Set vb: %x ib: %x\n",vb,index_buffer));
+		SNAPSHOT_SAY(("Set vb: %x ib: %x",&vb.FVF_Info(),index_buffer));
 
 		DX8Wrapper::Set_Vertex_Buffer(vb);
 		DX8Wrapper::Set_Index_Buffer(index_buffer,0);
 
 		//Flush the meshes which fit in the vertex buffer, applying all texture variations
 		for (unsigned pass=0;pass<passes;++pass) {
-			SNAPSHOT_SAY(("Pass: %d\n",pass));
+			SNAPSHOT_SAY(("Pass: %d",pass));
 
 			TextureCategoryListIterator it(&visible_texture_category_list[pass]);
 			while (!it.Is_Done()) {
@@ -1364,7 +1369,7 @@ void DX8SkinFVFCategoryContainer::Render(void)
 		}
 
 		Render_Procedural_Material_Passes();
-	}//while
+	}
 
 	//remove all the rendered data from queues
 	for (unsigned pass=0;pass<passes;++pass) {
@@ -1391,7 +1396,7 @@ bool DX8SkinFVFCategoryContainer::Check_If_Mesh_Fits(MeshModelClass* mmc)
 	return false;
 }
 
-void DX8SkinFVFCategoryContainer::clearVisibleSkinList() 
+void DX8SkinFVFCategoryContainer::clearVisibleSkinList()
 {
 	while (VisibleSkinHead != NULL)
 	{
@@ -1404,11 +1409,11 @@ void DX8SkinFVFCategoryContainer::clearVisibleSkinList()
 	VisibleVertexCount = 0;
 }
 
-void DX8SkinFVFCategoryContainer::Add_Visible_Skin(MeshClass * mesh) 
+void DX8SkinFVFCategoryContainer::Add_Visible_Skin(MeshClass * mesh)
 {
 	if (mesh->Peek_Next_Visible_Skin() != NULL || mesh == VisibleSkinTail)
 	{
-		DEBUG_CRASH(("Mesh %s is already a visible skin, and we tried to add it again... please notify Mark W or Steven J immediately!\n",mesh->Get_Name()));
+		DEBUG_CRASH(("Mesh %s is already a visible skin, and we tried to add it again... please notify Mark W or Steven J immediately!",mesh->Get_Name()));
 		return;
 	}
 	if (VisibleSkinHead == NULL)
@@ -1424,7 +1429,7 @@ void DX8SkinFVFCategoryContainer::Add_Visible_Skin(MeshClass * mesh)
 void DX8SkinFVFCategoryContainer::Reset()
 {
 	clearVisibleSkinList();
-	
+
 	for (unsigned pass=0;pass<passes;++pass) {
 		while (DX8TextureCategoryClass* texture_category=texture_category_list[pass].Peek_Head()) {
 			delete texture_category;
@@ -1543,12 +1548,12 @@ unsigned DX8TextureCategoryClass::Add_Mesh(
 					for (unsigned i=0;i<index_count;++i) {
 						unsigned short idx;
 
-						idx=unsigned short(strip[i+1]);
+						idx=(unsigned short)(strip[i+1]);
 						vmin=MIN(vmin,idx);
 						vmax=MAX(vmax,idx);
 						*dst_indices++=idx;
 					}
-					
+
 					/*
 					** Remember the min and max vertex indices that these polygons used (for optimization)
 					*/
@@ -1590,28 +1595,28 @@ unsigned DX8TextureCategoryClass::Add_Mesh(
 				if (all_textures_same && Equal_Material(mat,material) && shd==shader) {
 					unsigned short idx;
 
-					idx=unsigned short(src_indices[i][0]+vertex_offset);
+					idx=(unsigned short)(src_indices[i][0]+vertex_offset);
 					vmin=MIN(vmin,idx);
 					vmax=MAX(vmax,idx);
 					*dst_indices++=idx;
 //					WWDEBUG_SAY(("%d, ",idx));
 
-					idx=unsigned short(src_indices[i][1]+vertex_offset);
+					idx=(unsigned short)(src_indices[i][1]+vertex_offset);
 					vmin=MIN(vmin,idx);
 					vmax=MAX(vmax,idx);
 					*dst_indices++=idx;
 //					WWDEBUG_SAY(("%d, ",idx));
 
-					idx=unsigned short(src_indices[i][2]+vertex_offset);
+					idx=(unsigned short)(src_indices[i][2]+vertex_offset);
 					vmin=MIN(vmin,idx);
 					vmax=MAX(vmax,idx);
 					*dst_indices++=idx;
-//					WWDEBUG_SAY(("%d\n",idx));
+//					WWDEBUG_SAY(("%d",idx));
 				}
 			}
 
 			WWASSERT((vmax-vmin)<split_table.Get_Mesh_Model_Class()->Get_Vertex_Count());
-			
+
 			/*
 			** Remember the min and max vertex indices that these polygons used (for optimization)
 			*/
@@ -1632,7 +1637,7 @@ void DX8TextureCategoryClass::Render(void)
 	#endif
 
 		for (unsigned i=0;i<MAX_TEXTURE_STAGES;++i) {
-			SNAPSHOT_SAY(("Set_Texture(%d,%s)\n",i,Peek_Texture(i) ? Peek_Texture(i)->Get_Texture_Name() : "NULL"));
+			SNAPSHOT_SAY(("Set_Texture(%d,%s)",i,Peek_Texture(i) ? Peek_Texture(i)->Get_Texture_Name().str() : "NULL"));
 			DX8Wrapper::Set_Texture(i,Peek_Texture(i));
 		}
 
@@ -1640,11 +1645,11 @@ void DX8TextureCategoryClass::Render(void)
 	}
 	#endif
 
-	SNAPSHOT_SAY(("Set_Material(%s)\n",Peek_Material() ? Peek_Material()->Get_Name() : "NULL"));
+	SNAPSHOT_SAY(("Set_Material(%s)",Peek_Material() ? Peek_Material()->Get_Name() : "NULL"));
 	VertexMaterialClass *vmaterial=(VertexMaterialClass *)Peek_Material();	//ugly cast from const but we'll restore it after changes so okay. -MW
 	DX8Wrapper::Set_Material(vmaterial);
 
-	SNAPSHOT_SAY(("Set_Shader(%x)\n",Get_Shader()));
+	SNAPSHOT_SAY(("Set_Shader(%x)",Get_Shader().Get_Bits()));
 	ShaderClass theShader = Get_Shader();
 
 	//Setup an alpha blend version of this shader just in case it's needed. -MW
@@ -1681,7 +1686,7 @@ void DX8TextureCategoryClass::Render(void)
 		*/
 		DX8PolygonRendererClass * renderer = prt->Peek_Polygon_Renderer();
 		MeshClass * mesh = prt->Peek_Mesh();
-		
+
 		if (mesh->Get_Base_Vertex_Offset() == VERTEX_BUFFER_OVERFLOW)	//check if this mesh is valid
 		{	//skip this mesh so it gets rendered later after vertices are filled in.
 			last_prt = prt;
@@ -1690,9 +1695,9 @@ void DX8TextureCategoryClass::Render(void)
 			continue;
 		}
 
-		SNAPSHOT_SAY(("mesh = %s\n",mesh->Get_Name()));
+		SNAPSHOT_SAY(("mesh = %s",mesh->Get_Name()));
 
-		#ifdef WWDEBUG	
+		#ifdef WWDEBUG
 		// Debug rendering: if it exists, expose prelighting on this mesh by disabling all base textures.
 		if (WW3D::Expose_Prelit()) {
 			switch (mesh->Peek_Model()->Get_Flag (MeshGeometryClass::PRELIT_MASK)) {
@@ -1700,7 +1705,7 @@ void DX8TextureCategoryClass::Render(void)
 				unsigned i;
 
 				case MeshGeometryClass::PRELIT_VERTEX:
-					
+
 					// Disable texturing on all stages and passes.
 					for (i = 0; i < MAX_TEXTURE_STAGES; i++) {
 						DX8Wrapper::Set_Texture (i, NULL);
@@ -1708,7 +1713,7 @@ void DX8TextureCategoryClass::Render(void)
 					break;
 
 				case MeshGeometryClass::PRELIT_LIGHTMAP_MULTI_PASS:
-					
+
 					// Disable texturing on all but the last pass.
 					if (pass == mesh->Peek_Model()->Get_Pass_Count() - 1) {
 						for (i = 0; i < MAX_TEXTURE_STAGES; i++) {
@@ -1722,7 +1727,7 @@ void DX8TextureCategoryClass::Render(void)
 					break;
 
 				case MeshGeometryClass::PRELIT_LIGHTMAP_MULTI_TEXTURE:
-					
+
 					// Disable texturing on all but the zeroth stage of each pass.
 					DX8Wrapper::Set_Texture (0, Peek_Texture (0));
 					for (i = 1; i < MAX_TEXTURE_STAGES; i++) {
@@ -1745,11 +1750,11 @@ void DX8TextureCategoryClass::Render(void)
 		*/
 		LightEnvironmentClass * lenv = mesh->Get_Lighting_Environment();
 		if (lenv != NULL) {
-			SNAPSHOT_SAY(("LightEnvironment, lights: %d\n",lenv->Get_Light_Count()));
+			SNAPSHOT_SAY(("LightEnvironment, lights: %d",lenv->Get_Light_Count()));
 			DX8Wrapper::Set_Light_Environment(lenv);
 		}
 		else {
-			SNAPSHOT_SAY(("No light environment\n"));
+			SNAPSHOT_SAY(("No light environment"));
 		}
 
 		/*
@@ -1760,11 +1765,11 @@ void DX8TextureCategoryClass::Render(void)
 		Matrix3D tmp_world;
 
 		if (mesh->Peek_Model()->Get_Flag(MeshModelClass::ALIGNED)) {
-			SNAPSHOT_SAY(("Camera mode ALIGNED\n"));
+			SNAPSHOT_SAY(("Camera mode ALIGNED"));
 
 			Vector3 mesh_position;
 			Vector3 camera_z_vector;
-			
+
 			TheDX8MeshRenderer.Peek_Camera()->Get_Transform().Get_Z_Vector(&camera_z_vector);
 			mesh->Get_Transform().Get_Translation(&mesh_position);
 
@@ -1772,8 +1777,8 @@ void DX8TextureCategoryClass::Render(void)
 			world_transform = &tmp_world;
 
 		} else if (mesh->Peek_Model()->Get_Flag(MeshModelClass::ORIENTED)) {
-			SNAPSHOT_SAY(("Camera mode ORIENTED\n"));
-		
+			SNAPSHOT_SAY(("Camera mode ORIENTED"));
+
 			Vector3 mesh_position;
 			Vector3 camera_position;
 
@@ -1782,10 +1787,10 @@ void DX8TextureCategoryClass::Render(void)
 
 			tmp_world.Obj_Look_At(mesh_position,camera_position,0.0f);
 			world_transform = &tmp_world;
-		
+
 		} else if (mesh->Peek_Model()->Get_Flag(MeshModelClass::SKIN)) {
-			SNAPSHOT_SAY(("Set world identity (for skin)\n"));
-			
+			SNAPSHOT_SAY(("Set world identity (for skin)"));
+
 			tmp_world.Make_Identity();
 			world_transform = &tmp_world;
 			identity=true;
@@ -1793,15 +1798,15 @@ void DX8TextureCategoryClass::Render(void)
 
 
 		if (identity) {
-			SNAPSHOT_SAY(("Set_World_Identity\n"));
+			SNAPSHOT_SAY(("Set_World_Identity"));
 			DX8Wrapper::Set_World_Identity();
 		}
 		else {
-			SNAPSHOT_SAY(("Set_World_Transform\n"));
+			SNAPSHOT_SAY(("Set_World_Transform"));
 			DX8Wrapper::Set_Transform(D3DTS_WORLD,*world_transform);
 		}
 
-		
+
 //--------------------------------------------------------------------
 		if (mesh->Get_ObjectScale() != 1.0f)
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_NORMALIZENORMALS, TRUE);
@@ -1893,11 +1898,22 @@ void DX8TextureCategoryClass::Render(void)
 	}
 
 	if (!renderTasksRemaining)
-	{	WWASSERT(!render_task_head);
+	{
+		WWASSERT(!render_task_head);
 		Clear_Render_List();
 	}
 }
 
+void DX8TextureCategoryClass::Clear_Render_List()
+{
+	while (render_task_head != NULL)
+	{
+		PolyRenderTaskClass* next = render_task_head->Get_Next_Visible();
+		delete render_task_head;
+		render_task_head = next;
+	}
+}
+
 
 DX8MeshRendererClass::DX8MeshRendererClass()
 	:
@@ -1910,11 +1926,7 @@ DX8MeshRendererClass::DX8MeshRendererClass()
 
 DX8MeshRendererClass::~DX8MeshRendererClass()
 {
-	Invalidate(true);
-	Clear_Pending_Delete_Lists();
-	if (texture_category_container_list_skin != NULL) {
-		delete texture_category_container_list_skin;
-	}
+	Shutdown();
 }
 
 void DX8MeshRendererClass::Init(void)
@@ -1924,6 +1936,8 @@ void DX8MeshRendererClass::Init(void)
 
 void DX8MeshRendererClass::Shutdown(void)
 {
+	camera = NULL;
+	visible_decal_meshes = NULL;
 	Invalidate(true);
 	Clear_Pending_Delete_Lists();
 	_TempVertexBuffer.Clear();	//free memory
@@ -1980,7 +1994,7 @@ void DX8MeshRendererClass::Register_Mesh_Type(MeshModelClass* mmc)
 {
 	WWMEMLOG(MEM_GEOMETRY);
 #ifdef ENABLE_CATEGORY_LOG
-	WWDEBUG_SAY(("Registering mesh: %s (%d polys, %d verts + %d gap polygons)\n",mmc->Get_Name(),mmc->Get_Polygon_Count(),mmc->Get_Vertex_Count(),mmc->Get_Gap_Filler_Polygon_Count()));
+	WWDEBUG_SAY(("Registering mesh: %s (%d polys, %d verts + %d gap polygons)",mmc->Get_Name(),mmc->Get_Polygon_Count(),mmc->Get_Vertex_Count(),mmc->Get_Gap_Filler_Polygon_Count()));
 #endif
 	bool skin=(mmc->Get_Flag(MeshModelClass::SKIN) && mmc->VertexBoneLink);
 	bool sorting=((!!mmc->Get_Flag(MeshModelClass::SORT)) && WW3D::Is_Sorting_Enabled());
@@ -2004,7 +2018,7 @@ void DX8MeshRendererClass::Register_Mesh_Type(MeshModelClass* mmc)
 		DX8FVFCategoryContainer * new_container=W3DNEW DX8SkinFVFCategoryContainer(sorting);
 		texture_category_container_list_skin->Add_Tail(new_container);
 		new_container->Add_Mesh(mmc);
-	
+
 	} else {
 
 		/*
@@ -2051,7 +2065,7 @@ void DX8MeshRendererClass::Register_Mesh_Type(MeshModelClass* mmc)
 				_RegisteredMeshList.Add_Tail(mmc);
 			}
 			else {
-				WWDEBUG_SAY(("Error: Register_Mesh_Type failed! file: %s line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Error: Register_Mesh_Type failed! file: %s line: %d",__FILE__,__LINE__));
 			}
 		}
 	}
@@ -2086,7 +2100,7 @@ void DX8MeshRendererClass::Flush(void)
 {
 	WWPROFILE("DX8MeshRenderer::Flush");
 	if (!camera) return;
-	Log_Statistics_String(true);	
+	Log_Statistics_String(true);
 
 	for (int i=0;i<texture_category_container_lists_rigid.Count();++i) {
 		Render_FVF_Category_Container_List(*texture_category_container_lists_rigid[i]);
@@ -2111,7 +2125,7 @@ void DX8MeshRendererClass::Add_To_Render_List(DecalMeshClass * decalmesh)
 void DX8MeshRendererClass::Render_Decal_Meshes(void)
 {
 	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZBIAS,8);
-	
+
 	DecalMeshClass * decal_mesh = visible_decal_meshes;
 	while (decal_mesh != NULL) {
 		decal_mesh->Render();
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h
index 3b04c62b227..1bd4dc0a670 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h
@@ -36,19 +36,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8_RENDERER_H
-#define DX8_RENDERER_H
 
 #include "always.h"
 #include "wwstring.h"
 #include "simplevec.h"
-#include "refcount.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "dx8list.h"
 #include "shader.h"
 #include "dx8wrapper.h"
@@ -83,9 +76,9 @@ class DX8TextureCategoryClass : public MultiListObjectClass
 	int												pass;
 	TextureClass *									textures[MAX_TEXTURE_STAGES];
 	ShaderClass										shader;
-	VertexMaterialClass *						material;					
+	VertexMaterialClass *						material;
 	DX8PolygonRendererList						PolygonRendererList;
-	DX8FVFCategoryContainer*					container;	
+	DX8FVFCategoryContainer*					container;
 
 	PolyRenderTaskClass *						render_task_head;			// polygon renderers queued for rendering
 	static bool											m_gForceMultiply;  // Forces opaque materials to use the multiply blend - pseudo transparent effect.  jba.
@@ -99,10 +92,10 @@ class DX8TextureCategoryClass : public MultiListObjectClass
 
 	void									Render(void);
 	bool									Anything_To_Render() { return (render_task_head != NULL); }
-	void									Clear_Render_List() { render_task_head = NULL; }
+	void									Clear_Render_List();
 
 	TextureClass *						Peek_Texture(int stage)	{ return textures[stage]; }
-	const VertexMaterialClass *	Peek_Material() { return material; }	
+	const VertexMaterialClass *	Peek_Material() { return material; }
 	ShaderClass							Get_Shader() { return shader; }
 
 	DX8PolygonRendererList&			Get_Polygon_Renderer_List() { return PolygonRendererList; }
@@ -117,7 +110,7 @@ class DX8TextureCategoryClass : public MultiListObjectClass
 
 	void Remove_Polygon_Renderer(DX8PolygonRendererClass* p_renderer);
 	void Add_Polygon_Renderer(DX8PolygonRendererClass* p_renderer,DX8PolygonRendererClass* add_after_this=NULL);
-	
+
 
 	DX8FVFCategoryContainer * Get_Container(void) { return container; }
 
@@ -142,7 +135,7 @@ class DX8FVFCategoryContainer : public MultiListObjectClass
 
 	TextureCategoryList									texture_category_list[MAX_PASSES];
 	TextureCategoryList									visible_texture_category_list[MAX_PASSES];
-	
+
 	MatPassTaskClass *									visible_matpass_head;
 	MatPassTaskClass *									visible_matpass_tail;
 
@@ -153,7 +146,7 @@ class DX8FVFCategoryContainer : public MultiListObjectClass
 	unsigned													uv_coordinate_channels;
 	bool														sorting;
 	bool														AnythingToRender;
-	
+
 	void Generate_Texture_Categories(Vertex_Split_Table& split_table,unsigned vertex_offset);
 	void Insert_To_Texture_Category(
 		Vertex_Split_Table& split_table,
@@ -173,11 +166,11 @@ class DX8FVFCategoryContainer : public MultiListObjectClass
 
 	DX8TextureCategoryClass* Find_Matching_Texture_Category(
 		VertexMaterialClass* vmat,
-		unsigned pass,		
+		unsigned pass,
 		DX8TextureCategoryClass* ref_category);
 
 public:
-	
+
 	DX8FVFCategoryContainer(unsigned FVF,bool sorting);
 	virtual ~DX8FVFCategoryContainer();
 
@@ -204,9 +197,9 @@ class DX8FVFCategoryContainer : public MultiListObjectClass
 	virtual void Log(bool only_visible)=0;
 	virtual bool Check_If_Mesh_Fits(MeshModelClass* mmc)=0;
 
-	inline unsigned Get_FVF() const { return FVF; }
-	
-	inline void Add_Visible_Texture_Category(DX8TextureCategoryClass * tex_category,int pass) 
+	unsigned Get_FVF() const { return FVF; }
+
+	void Add_Visible_Texture_Category(DX8TextureCategoryClass * tex_category,int pass)
 	{
 		WWASSERT(pass<MAX_PASSES);
 		WWASSERT(tex_category != NULL);
@@ -216,8 +209,8 @@ class DX8FVFCategoryContainer : public MultiListObjectClass
 	}
 
 	void Add_Visible_Material_Pass(MaterialPassClass * pass,MeshClass * mesh);
-	
-	
+
+
 };
 
 bool DX8FVFCategoryContainer::Anything_To_Render()
@@ -292,7 +285,7 @@ class DX8SkinFVFCategoryContainer: public DX8FVFCategoryContainer
 /**
 ** DX8MeshRendererClass
 ** This object is controller for the entire DX8 mesh rendering system.  It organizes mesh
-** fragments into groups based on FVF, texture, and material.  During rendering, a list of 
+** fragments into groups based on FVF, texture, and material.  During rendering, a list of
 ** the visible mesh fragments is composed and rendered.  There is a global instance of this
 ** class called TheDX8MeshRenderer that should be used for all mesh rendering.
 */
@@ -339,5 +332,3 @@ class DX8MeshRendererClass
 };
 
 extern DX8MeshRendererClass TheDX8MeshRenderer;
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.cpp
deleted file mode 100644
index 4c82f5cbe3c..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : DX8 Texture Manager                                          *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/dx8texman.cpp                          $*
- *                                                                                             *
- *              Original Author:: Hector Yee                                                   *
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 06/27/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 4                                                           $*
- *                                                                                             *
- * 06/27/02 KM Texture class abstraction																			*
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *   DX8TextureManagerClass::Shutdown -- Shuts down the texture manager                        *
- *   DX8TextureManagerClass::Add -- Adds a texture to be managed                               *
- *   DX8TextureManagerClass::Remove -- Removes a texture from being managed                    *
- *   DX8TextureManagerClass::Release_Textures -- Releases the internal d3d texture             *
- *   DX8TextureManagerClass::Recreate_Textures -- Reallocates lost textures                    *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-// This class manages textures that are in the default pool
-// ensuring that they are released on device loss
-// and created on device reset
-
-// Note: It does NOT addref to textures because it is called in the texture
-// destructor
-
-#include "dx8texman.h"
-
-TextureTrackerList DX8TextureManagerClass::Managed_Textures;
-
-
-/***********************************************************************************************
- * DX8TextureManagerClass::Shutdown -- Shuts down the texture manager                          *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/25/2001  hy : Created.                                                                  *
- *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
- *=============================================================================================*/
-void DX8TextureManagerClass::Shutdown()
-{
-	while (!Managed_Textures.Is_Empty())
-	{
-		TextureTrackerClass *track=Managed_Textures.Remove_Head();
-		delete track;
-		track=NULL;
-	}
-}
-
-/***********************************************************************************************
- * DX8TextureManagerClass::Add -- Adds a texture to be managed                                 *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/25/2001  hy : Created.                                                                  *
- *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
- *=============================================================================================*/
-void DX8TextureManagerClass::Add(TextureTrackerClass *track)
-{
-	// this function should only be called by the texture constructor
-	Managed_Textures.Add(track);
-}
-
-
-/***********************************************************************************************
- * DX8TextureManagerClass::Remove -- Removes a texture from being managed                      *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/25/2001  hy : Created.                                                                  *
- *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
- *=============================================================================================*/
-void DX8TextureManagerClass::Remove(TextureBaseClass *tex)
-{
-	// this function should only be called by the texture destructor
-	TextureTrackerListIterator it(&Managed_Textures);
-
-	while (!it.Is_Done())
-	{
-		TextureTrackerClass *track=it.Peek_Obj();		
-		if (track->Get_Texture()==tex)
-		{			
-			it.Remove_Current_Object();
-			delete track;
-			break;
-		}
-		it.Next();
-	}
-}
-
-
-/***********************************************************************************************
- * DX8TextureManagerClass::Release_Textures -- Releases the internal d3d texture               *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/25/2001  hy : Created.                                                                  *
- *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
- *=============================================================================================*/
-void DX8TextureManagerClass::Release_Textures()
-{
-	TextureTrackerListIterator it(&Managed_Textures);
-
-	while (!it.Is_Done())
-	{
-		TextureTrackerClass *track=it.Peek_Obj();		
-		track->Release();
-		it.Next();
-	}
-}
-
-
-/***********************************************************************************************
- * DX8TextureManagerClass::Recreate_Textures -- Reallocates lost textures                      *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/25/2001  hy : Created.                                                                  *
- *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
- *=============================================================================================*/
-void DX8TextureManagerClass::Recreate_Textures()
-{
-	TextureTrackerListIterator it(&Managed_Textures);
-
-	while (!it.Is_Done())
-	{
-		TextureTrackerClass *track=it.Peek_Obj();
-		track->Recreate();
-		track->Get_Texture()->Set_Dirty();
-		it.Next();
-	}
-}
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h
deleted file mode 100644
index cef92a6f614..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : DX8 Texture Manager                                          *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/dx8texman.h                            $*
- *                                                                                             *
- *              Original Author:: Hector Yee                                                   *
- *                                                                                             *
- *                      $Author:: Jani_p                                                      $*
- *                                                                                             *
- *                     $Modtime:: 7/26/01 5:12p                                               $*
- *                                                                                             *
- *                    $Revision:: 3                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef DX8TEXTUREMANAGER_H
-#define DX8TEXTUREMANAGER_H
-
-#include "always.h"
-#include "texture.h"
-#include "dx8wrapper.h"
-#include "ww3dformat.h"
-#include "dx8list.h"
-#include "ww3dformat.h"
-#include "multilist.h"
-
-class DX8TextureManagerClass;
-
-class TextureTrackerClass : public MultiListObjectClass
-{
-public:
-	TextureTrackerClass
-	(
-		unsigned int w, 
-		unsigned int h, 
-		MipCountType count,
-		TextureBaseClass *tex
-	)
-	: Width(w),
-	  Height(h),
-	  Mip_level_count(count),
-	  Texture(tex)
-	{
-	}
-
-	virtual void Recreate() const =0;
-
-	void Release()
-	{
-		Texture->Set_D3D_Base_Texture(NULL);
-	}
-
-	TextureBaseClass* Get_Texture() const { return Texture; }
-
-
-protected:
-
-	unsigned int Width;
-	unsigned int Height;
-	MipCountType Mip_level_count;
-	TextureBaseClass *Texture;
-};
-
-class DX8TextureTrackerClass : public TextureTrackerClass
-{
-public:
-	DX8TextureTrackerClass
-	(
-		unsigned int w, 
-		unsigned int h, 
-		WW3DFormat format,
-		MipCountType count,
-		TextureBaseClass *tex,
-		bool rt
-	) 
-	: TextureTrackerClass(w,h,count,tex), Format(format), RenderTarget(rt)
-	{
-	}
-
-	virtual void Recreate() const
-	{
-		WWASSERT(Texture->Peek_D3D_Base_Texture()==NULL);
-		Texture->Poke_Texture
-		(
-			DX8Wrapper::_Create_DX8_Texture
-			(
-				Width,
-				Height,
-				Format,
-				Mip_level_count,
-				D3DPOOL_DEFAULT,
-				RenderTarget
-			)
-		);
-	}
-
-private:
-	WW3DFormat Format;
-	bool RenderTarget;
-};
-
-class DX8TextureManagerClass
-{
-public:
-	static void Shutdown();
-	static void Add(TextureTrackerClass *track);
-	static void Remove(TextureBaseClass *tex);
-	static void Release_Textures();
-	static void Recreate_Textures();
-private:
-	static TextureTrackerList Managed_Textures;
-};
-
-#endif // ifdef TEXTUREMANAGER
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp
index 54aa268ed53..fc99aa0fc01 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp
@@ -51,7 +51,7 @@ static bool _DynamicSortingVertexArrayInUse=false;
 //static VertexFormatXYZNDUV2* _DynamicSortingVertexArray=NULL;
 static SortingVertexBufferClass* _DynamicSortingVertexArray=NULL;
 static unsigned short _DynamicSortingVertexArraySize=0;
-static unsigned short _DynamicSortingVertexArrayOffset=0;	
+static unsigned short _DynamicSortingVertexArrayOffset=0;
 
 static bool _DynamicDX8VertexBufferInUse=false;
 static DX8VertexBufferClass* _DynamicDX8VertexBuffer=NULL;
@@ -86,8 +86,8 @@ VertexBufferClass::VertexBufferClass(unsigned type_, unsigned FVF, unsigned shor
 	_VertexBufferTotalVertices+=VertexCount;
 	_VertexBufferTotalSize+=VertexCount*fvf_info->Get_FVF_Size();
 #ifdef VERTEX_BUFFER_LOG
-	WWDEBUG_SAY(("New VB, %d vertices, size %d bytes\n",VertexCount,VertexCount*fvf_info->Get_FVF_Size()));
-	WWDEBUG_SAY(("Total VB count: %d, total %d vertices, total size %d bytes\n",
+	WWDEBUG_SAY(("New VB, %d vertices, size %d bytes",VertexCount,VertexCount*fvf_info->Get_FVF_Size()));
+	WWDEBUG_SAY(("Total VB count: %d, total %d vertices, total size %d bytes",
 		_VertexBufferCount,
 		_VertexBufferTotalVertices,
 		_VertexBufferTotalSize));
@@ -103,8 +103,8 @@ VertexBufferClass::~VertexBufferClass()
 	_VertexBufferTotalSize-=VertexCount*fvf_info->Get_FVF_Size();
 
 #ifdef VERTEX_BUFFER_LOG
-	WWDEBUG_SAY(("Delete VB, %d vertices, size %d bytes\n",VertexCount,VertexCount*fvf_info->Get_FVF_Size()));
-	WWDEBUG_SAY(("Total VB count: %d, total %d vertices, total size %d bytes\n",
+	WWDEBUG_SAY(("Delete VB, %d vertices, size %d bytes",VertexCount,VertexCount*fvf_info->Get_FVF_Size()));
+	WWDEBUG_SAY(("Total VB count: %d, total %d vertices, total size %d bytes",
 		_VertexBufferCount,
 		_VertexBufferTotalVertices,
 		_VertexBufferTotalSize));
@@ -163,7 +163,7 @@ VertexBufferClass::WriteLockClass::WriteLockClass(VertexBufferClass* VertexBuffe
 		{
 		StringClass fvf_name;
 		VertexBuffer->FVF_Info().Get_FVF_Name(fvf_name);
-		WWDEBUG_SAY(("VertexBuffer->Lock(start_index: 0, index_range: 0(%d), fvf_size: %d, fvf: %s)\n",
+		WWDEBUG_SAY(("VertexBuffer->Lock(start_index: 0, index_range: 0(%d), fvf_size: %d, fvf: %s)",
 			VertexBuffer->Get_Vertex_Count(),
 			VertexBuffer->FVF_Info().Get_FVF_Size(),
 			fvf_name));
@@ -193,7 +193,7 @@ VertexBufferClass::WriteLockClass::~WriteLockClass()
 	switch (VertexBuffer->Type()) {
 	case BUFFER_TYPE_DX8:
 #ifdef VERTEX_BUFFER_LOG
-		WWDEBUG_SAY(("VertexBuffer->Unlock()\n"));
+		WWDEBUG_SAY(("VertexBuffer->Unlock()"));
 #endif
 		DX8_Assert();
 		DX8_ErrorCode(static_cast<DX8VertexBufferClass*>(VertexBuffer)->Get_DX8_Vertex_Buffer()->Unlock());
@@ -228,7 +228,7 @@ VertexBufferClass::AppendLockClass::AppendLockClass(VertexBufferClass* VertexBuf
 		{
 		StringClass fvf_name;
 		VertexBuffer->FVF_Info().Get_FVF_Name(fvf_name);
-		WWDEBUG_SAY(("VertexBuffer->Lock(start_index: %d, index_range: %d, fvf_size: %d, fvf: %s)\n",
+		WWDEBUG_SAY(("VertexBuffer->Lock(start_index: %d, index_range: %d, fvf_size: %d, fvf: %s)",
 			start_index,
 			index_range,
 			VertexBuffer->FVF_Info().Get_FVF_Size(),
@@ -260,7 +260,7 @@ VertexBufferClass::AppendLockClass::~AppendLockClass()
 	case BUFFER_TYPE_DX8:
 		DX8_Assert();
 #ifdef VERTEX_BUFFER_LOG
-		WWDEBUG_SAY(("VertexBuffer->Unlock()\n"));
+		WWDEBUG_SAY(("VertexBuffer->Unlock()"));
 #endif
 		DX8_ErrorCode(static_cast<DX8VertexBufferClass*>(VertexBuffer)->Get_DX8_Vertex_Buffer()->Unlock());
 		break;
@@ -314,8 +314,8 @@ DX8VertexBufferClass::DX8VertexBufferClass(unsigned FVF, unsigned short vertex_c
 
 DX8VertexBufferClass::DX8VertexBufferClass(
 	const Vector3* vertices,
-	const Vector3* normals, 
-	const Vector2* tex_coords, 
+	const Vector3* normals,
+	const Vector2* tex_coords,
 	unsigned short VertexCount,
 	UsageType usage)
 	:
@@ -334,9 +334,9 @@ DX8VertexBufferClass::DX8VertexBufferClass(
 
 DX8VertexBufferClass::DX8VertexBufferClass(
 	const Vector3* vertices,
-	const Vector3* normals, 
+	const Vector3* normals,
 	const Vector4* diffuse,
-	const Vector2* tex_coords, 
+	const Vector2* tex_coords,
 	unsigned short VertexCount,
 	UsageType usage)
 	:
@@ -357,7 +357,7 @@ DX8VertexBufferClass::DX8VertexBufferClass(
 DX8VertexBufferClass::DX8VertexBufferClass(
 	const Vector3* vertices,
 	const Vector4* diffuse,
-	const Vector2* tex_coords, 
+	const Vector2* tex_coords,
 	unsigned short VertexCount,
 	UsageType usage)
 	:
@@ -376,7 +376,7 @@ DX8VertexBufferClass::DX8VertexBufferClass(
 
 DX8VertexBufferClass::DX8VertexBufferClass(
 	const Vector3* vertices,
-	const Vector2* tex_coords, 
+	const Vector2* tex_coords,
 	unsigned short VertexCount,
 	UsageType usage)
 	:
@@ -395,9 +395,9 @@ DX8VertexBufferClass::DX8VertexBufferClass(
 DX8VertexBufferClass::~DX8VertexBufferClass()
 {
 #ifdef VERTEX_BUFFER_LOG
-	WWDEBUG_SAY(("VertexBuffer->Release()\n"));
+	WWDEBUG_SAY(("VertexBuffer->Release()"));
 	_DX8VertexBufferCount--;
-	WWDEBUG_SAY(("Current vertex buffer count: %d\n",_DX8VertexBufferCount));
+	WWDEBUG_SAY(("Current vertex buffer count: %d",_DX8VertexBufferCount));
 #endif
 	VertexBuffer->Release();
 }
@@ -416,7 +416,7 @@ void DX8VertexBufferClass::Create_Vertex_Buffer(UsageType usage)
 #ifdef VERTEX_BUFFER_LOG
 	StringClass fvf_name;
 	FVF_Info().Get_FVF_Name(fvf_name);
-	WWDEBUG_SAY(("CreateVertexBuffer(fvfsize=%d, vertex_count=%d, D3DUSAGE_WRITEONLY|%s|%s, fvf: %s, %s)\n",
+	WWDEBUG_SAY(("CreateVertexBuffer(fvfsize=%d, vertex_count=%d, D3DUSAGE_WRITEONLY|%s|%s, fvf: %s, %s)",
 		FVF_Info().Get_FVF_Size(),
 		VertexCount,
 		usage&USAGE_DYNAMIC ? "D3DUSAGE_DYNAMIC" : "-",
@@ -424,7 +424,7 @@ void DX8VertexBufferClass::Create_Vertex_Buffer(UsageType usage)
 		fvf_name,
 		dynamic ? "D3DPOOL_DEFAULT" : "D3DPOOL_MANAGED"));
 	_DX8VertexBufferCount++;
-	WWDEBUG_SAY(("Current vertex buffer count: %d\n",_DX8VertexBufferCount));
+	WWDEBUG_SAY(("Current vertex buffer count: %d",_DX8VertexBufferCount));
 #endif
 
 	unsigned usage_flags=
@@ -448,7 +448,7 @@ void DX8VertexBufferClass::Create_Vertex_Buffer(UsageType usage)
 		return;
 	}
 
-	WWDEBUG_SAY(("Vertex buffer creation failed, trying to release assets...\n"));
+	WWDEBUG_SAY(("Vertex buffer creation failed, trying to release assets..."));
 
 	// Vertex buffer creation failed.  Must be out of memory. Try releasing all our D3D assets and re-creating
 	// them.
@@ -468,7 +468,7 @@ void DX8VertexBufferClass::Create_Vertex_Buffer(UsageType usage)
 		&VertexBuffer);
 
 	if (SUCCEEDED(ret)) {
-		WWDEBUG_SAY(("...Vertex buffer creation succesful\n"));
+		WWDEBUG_SAY(("...Vertex buffer creation succesful"));
 	}
 
 	// If it still fails it is fatal
@@ -734,7 +734,7 @@ DynamicVBAccessClass::~DynamicVBAccessClass()
 		_DynamicSortingVertexArrayInUse=false;
 		_DynamicSortingVertexArrayOffset+=VertexCount;
 	}
-	
+
 	REF_PTR_RELEASE (VertexBuffer);
 }
 
@@ -777,7 +777,7 @@ void DynamicVBAccessClass::Allocate_DX8_Dynamic_Buffer()
 		}
 
 		_DynamicDX8VertexBuffer=NEW_REF(DX8VertexBufferClass,(
-			dynamic_fvf_type, 
+			dynamic_fvf_type,
 			_DynamicDX8VertexBufferSize,
 			(DX8VertexBufferClass::UsageType)usage));
 		_DynamicDX8VertexBufferOffset=0;
@@ -829,7 +829,7 @@ DynamicVBAccessClass::WriteLockClass::WriteLockClass(DynamicVBAccessClass* dynam
 		dx8_lock++;
 		StringClass fvf_name;
 		DynamicVBAccess->VertexBuffer->FVF_Info().Get_FVF_Name(fvf_name);
-		WWDEBUG_SAY(("DynamicVertexBuffer->Lock(start_index: %d, index_range: %d, fvf_size: %d, fvf: %s)\n",
+		WWDEBUG_SAY(("DynamicVertexBuffer->Lock(start_index: %d, index_range: %d, fvf_size: %d, fvf: %s)",
 			DynamicVBAccess->VertexBufferOffset,
 			DynamicVBAccess->Get_Vertex_Count(),
 			DynamicVBAccess->VertexBuffer->FVF_Info().Get_FVF_Size(),
@@ -868,7 +868,7 @@ DynamicVBAccessClass::WriteLockClass::~WriteLockClass()
 #ifdef VERTEX_BUFFER_LOG
 		dx8_lock--;
 		WWASSERT(!dx8_lock);
-		WWDEBUG_SAY(("DynamicVertexBuffer->Unlock()\n"));
+		WWDEBUG_SAY(("DynamicVertexBuffer->Unlock()"));
 #endif
 		DX8_Assert();
 		DX8_ErrorCode(static_cast<DX8VertexBufferClass*>(DynamicVBAccess->VertexBuffer)->Get_DX8_Vertex_Buffer()->Unlock());
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
index 32d7a2bc54f..7419128a238 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
@@ -36,16 +36,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8VERTEXBUFFER_H
-#define DX8VERTEXBUFFER_H
 
 #include "always.h"
 #include "wwdebug.h"
-#include "refcount.h"
 #include "dx8fvf.h"
 
 const unsigned dynamic_fvf_type=D3DFVF_XYZ|D3DFVF_NORMAL|D3DFVF_TEX2|D3DFVF_DIFFUSE;
@@ -88,13 +82,13 @@ class VertexBufferClass : public W3DMPO, public RefCountClass
 	virtual ~VertexBufferClass();
 public:
 
-	inline const FVFInfoClass& FVF_Info() const { return *fvf_info; }
-	inline unsigned short Get_Vertex_Count() const { return VertexCount; }
-	inline unsigned Type() const { return type; }
+	const FVFInfoClass& FVF_Info() const { return *fvf_info; }
+	unsigned short Get_Vertex_Count() const { return VertexCount; }
+	unsigned Type() const { return type; }
 
 	void Add_Engine_Ref() const;
 	void Release_Engine_Ref() const;
-	inline unsigned Engine_Refs() const { return engine_refs; } 
+	unsigned Engine_Refs() const { return engine_refs; }
 
 	class WriteLockClass : public VertexBufferLockClass
 	{
@@ -178,7 +172,7 @@ class DynamicVBAccessClass
 	public:
 		WriteLockClass(DynamicVBAccessClass* vb_access);
 		~WriteLockClass();
-		
+
 		// Use this function to get a pointer to the first vertex you can write into.
 		// If we ever change the format used by DynamicVBAccessClass, then the
 		// return type of this function will change and we'll easily find all code
@@ -259,6 +253,3 @@ class SortingVertexBufferClass : public VertexBufferClass
 public:
 	SortingVertexBufferClass(unsigned short VertexCount);
 };
-
-
-#endif //DX8VERTEXBUFFER_H
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
index a0cb18850a9..b6696957880 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
@@ -32,6 +32,7 @@
  *                                                                                             *
  *                    $Revision:: 134                                                         $*
  *                                                                                             *
+ * 08/05/02 KM Texture class redesign
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  *   DX8Wrapper::_Update_Texture -- Copies a texture from system memory to video memory        *
@@ -41,7 +42,7 @@
 //#define CREATE_DX8_FPU_PRESERVE
 #define WW3D_DEVTYPE D3DDEVTYPE_HAL
 
-#if defined(_MSC_VER) && _MSC_VER < 1300
+#if !defined(WINVER) || WINVER < 0x0500
 #undef WINVER
 #define WINVER 0x0500 // Required to access GetMonitorInfo in VC6.
 #endif
@@ -71,7 +72,6 @@
 #include "textureloader.h"
 #include "missingtexture.h"
 #include "thread.h"
-#include <stdio.h>
 #include <d3dx8core.h>
 #include "pot.h"
 #include "wwprofile.h"
@@ -80,7 +80,7 @@
 #include "formconv.h"
 #include "dx8texman.h"
 #include "bound.h"
-#include "dx8webbrowser.h"
+#include "DbgHelpGuard.h"
 
 
 const int DEFAULT_RESOLUTION_WIDTH = 640;
@@ -126,8 +126,11 @@ LightEnvironmentClass*		DX8Wrapper::Light_Environment							= NULL;
 RenderInfoClass*				DX8Wrapper::Render_Info									= NULL;
 
 DWORD								DX8Wrapper::Vertex_Processing_Behavior				= 0;
+ZTextureClass*					DX8Wrapper::Shadow_Map[MAX_SHADOW_MAPS];
+
 Vector3							DX8Wrapper::Ambient_Color;
 // shader system additions KJM ^
+
 bool								DX8Wrapper::world_identity;
 unsigned							DX8Wrapper::RenderStates[256];
 unsigned							DX8Wrapper::TextureStageStates[MAX_TEXTURE_STAGES][32];
@@ -141,7 +144,9 @@ D3DCOLOR							DX8Wrapper::FogColor										= 0;
 IDirect3D8 *					DX8Wrapper::D3DInterface								= NULL;
 IDirect3DDevice8 *			DX8Wrapper::D3DDevice									= NULL;
 IDirect3DSurface8 *			DX8Wrapper::CurrentRenderTarget						= NULL;
+IDirect3DSurface8 *			DX8Wrapper::CurrentDepthBuffer						= NULL;
 IDirect3DSurface8 *			DX8Wrapper::DefaultRenderTarget						= NULL;
+IDirect3DSurface8 *			DX8Wrapper::DefaultDepthBuffer						= NULL;
 bool								DX8Wrapper::IsRenderToTexture							= false;
 
 unsigned							DX8Wrapper::matrix_changes								= 0;
@@ -231,7 +236,7 @@ void Non_Fatal_Log_DX8_ErrorCode(unsigned res,const char * file,int line)
 		sizeof(tmp));
 
 	if (new_res==D3D_OK) {
-		WWDEBUG_SAY(("DX8 Error: %s, File: %s, Line: %d\n",tmp,file,line));
+		WWDEBUG_SAY(("DX8 Error: %s, File: %s, Line: %d",tmp,file,line));
 	}
 }
 
@@ -262,21 +267,28 @@ bool DX8Wrapper::Init(void * hwnd, bool lite)
 {
 	WWASSERT(!IsInitted);
 
+	// zero memory
+	memset(Textures,0,sizeof(IDirect3DBaseTexture8*)*MAX_TEXTURE_STAGES);
+	memset(RenderStates,0,sizeof(unsigned)*256);
+	memset(TextureStageStates,0,sizeof(unsigned)*32*MAX_TEXTURE_STAGES);
 	memset(Vertex_Shader_Constants,0,sizeof(Vector4)*MAX_VERTEX_SHADER_CONSTANTS);
 	memset(Pixel_Shader_Constants,0,sizeof(Vector4)*MAX_PIXEL_SHADER_CONSTANTS);
+	memset(&render_state,0,sizeof(RenderStateStruct));
+	memset(Shadow_Map,0,sizeof(ZTextureClass*)*MAX_SHADOW_MAPS);
+
 	/*
 	** Initialize all variables!
 	*/
 	_Hwnd = (HWND)hwnd;
 	_MainThreadID=ThreadClass::_Get_Current_Thread_ID();
-	WWDEBUG_SAY(("DX8Wrapper main thread: 0x%x\n",_MainThreadID));
+	WWDEBUG_SAY(("DX8Wrapper main thread: 0x%x",_MainThreadID));
 	CurRenderDevice = -1;
 	ResolutionWidth = DEFAULT_RESOLUTION_WIDTH;
 	ResolutionHeight = DEFAULT_RESOLUTION_HEIGHT;
 	// Initialize Render2DClass Screen Resolution
 	Render2DClass::Set_Screen_Resolution( RectClass( 0, 0, ResolutionWidth, ResolutionHeight ) );
 	BitDepth = DEFAULT_BIT_DEPTH;
-	IsWindowed = false;	
+	IsWindowed = false;
 	DX8Wrapper_IsWindowed = false;
 
 	for (int light=0;light<4;++light) CurrentDX8LightEnables[light]=false;
@@ -295,7 +307,7 @@ bool DX8Wrapper::Init(void * hwnd, bool lite)
 	D3DInterface = NULL;
 	D3DDevice = NULL;
 
-	WWDEBUG_SAY(("Reset DX8Wrapper statistics\n"));
+	WWDEBUG_SAY(("Reset DX8Wrapper statistics"));
 	Reset_Statistics();
 
 	Invalidate_Cached_Render_States();
@@ -311,8 +323,14 @@ bool DX8Wrapper::Init(void * hwnd, bool lite)
 		/*
 		** Create the D3D interface object
 		*/
-		WWDEBUG_SAY(("Create Direct3D8\n"));
-		D3DInterface = Direct3DCreate8Ptr(D3D_SDK_VERSION);		// TODO: handle failure cases...
+		WWDEBUG_SAY(("Create Direct3D8"));
+		{
+			// TheSuperHackers @bugfix xezon 13/06/2025 Front load the system dbghelp.dll to prevent
+			// the graphics driver from potentially loading the old game dbghelp.dll and then crashing the game process.
+			DbgHelpGuard dbgHelpGuard;
+
+			D3DInterface = Direct3DCreate8Ptr(D3D_SDK_VERSION);		// TODO: handle failure cases...
+		}
 		if (D3DInterface == NULL) {
 			return(false);
 		}
@@ -321,9 +339,9 @@ bool DX8Wrapper::Init(void * hwnd, bool lite)
 		/*
 		** Enumerate the available devices
 		*/
-		WWDEBUG_SAY(("Enumerate devices\n"));
+		WWDEBUG_SAY(("Enumerate devices"));
 		Enumerate_Devices();
-		WWDEBUG_SAY(("DX8Wrapper Init completed\n"));
+		WWDEBUG_SAY(("DX8Wrapper Init completed"));
 	}
 
 	return(true);
@@ -346,9 +364,9 @@ void DX8Wrapper::Shutdown(void)
 	if (CurrentCaps)
 	{
 		int max=CurrentCaps->Get_Max_Textures_Per_Pass();
-		for (int i = 0; i < max; i++) 
+		for (int i = 0; i < max; i++)
 		{
-			if (Textures[i]) 
+			if (Textures[i])
 			{
 				Textures[i]->Release();
 				Textures[i] = NULL;
@@ -368,7 +386,7 @@ void DX8Wrapper::Shutdown(void)
 
 	_RenderDeviceNameTable.Clear();		 // note - Delete_All() resizes the vector, causing a reallocation.  Clear is better. jba.
 	_RenderDeviceShortNameTable.Clear();
-	_RenderDeviceDescriptionTable.Clear();	
+	_RenderDeviceDescriptionTable.Clear();
 
 	DX8Caps::Shutdown();
 	IsInitted = false;		// 010803 srj
@@ -385,7 +403,7 @@ void DX8Wrapper::Do_Onetime_Device_Dependent_Inits(void)
 	** Initalize any other subsystems inside of WW3D
 	*/
 	MissingTexture::_Init();
-	TextureFilterClass::_Init_Filters();
+	TextureFilterClass::_Init_Filters((TextureFilterClass::TextureFilterMode)WW3D::Get_Texture_Filter());
 	TheDX8MeshRenderer.Init();
 	BoxRenderObjClass::Init();
 	VertexMaterialClass::Init();
@@ -437,9 +455,9 @@ void DX8Wrapper::Invalidate_Cached_Render_States(void)
 	for (a=0;a<sizeof(RenderStates)/sizeof(unsigned);++a) {
 		RenderStates[a]=0x12345678;
 	}
-	for (a=0;a<MAX_TEXTURE_STAGES;++a) 
+	for (a=0;a<MAX_TEXTURE_STAGES;++a)
 	{
-		for (int b=0; b<32;b++) 
+		for (int b=0; b<32;b++)
 		{
 			TextureStageStates[a][b]=0x12345678;
 		}
@@ -493,10 +511,8 @@ void DX8Wrapper::Do_Onetime_Device_Dependent_Shutdowns(void)
 	TheDX8MeshRenderer.Shutdown();
 	MissingTexture::_Deinit();
 
-	if (CurrentCaps) {
-		delete CurrentCaps;
-		CurrentCaps=NULL;
-	}
+	delete CurrentCaps;
+	CurrentCaps=NULL;
 
 }
 
@@ -506,7 +522,7 @@ bool DX8Wrapper::Create_Device(void)
 	WWASSERT(D3DDevice==NULL);	// for now, once you've created a device, you're stuck with it!
 
 	D3DCAPS8 caps;
-	if 
+	if
 	(
 		FAILED
 		(
@@ -523,25 +539,25 @@ bool DX8Wrapper::Create_Device(void)
 	}
 
 	::ZeroMemory(&CurrentAdapterIdentifier, sizeof(D3DADAPTER_IDENTIFIER8));
-	
+
 	if
 	(
 		FAILED
-		( 
+		(
 			D3DInterface->GetAdapterIdentifier
 			(
 				CurRenderDevice,
 				D3DENUM_NO_WHQL_LEVEL,
 				&CurrentAdapterIdentifier
 			)
-			)	
-	) 
+			)
+	)
 	{
 		return false;
 	}
 
 	Vertex_Processing_Behavior=D3DCREATE_SOFTWARE_VERTEXPROCESSING;
-	if (caps.DevCaps&D3DDEVCAPS_HWTRANSFORMANDLIGHT) 
+	if (caps.DevCaps&D3DDEVCAPS_HWTRANSFORMANDLIGHT)
 	{
 		Vertex_Processing_Behavior=D3DCREATE_MIXED_VERTEXPROCESSING;
 	}
@@ -560,6 +576,10 @@ bool DX8Wrapper::Create_Device(void)
 	Vertex_Processing_Behavior|=D3DCREATE_FPU_PRESERVE;
 #endif
 
+	// TheSuperHackers @bugfix xezon 13/06/2025 Front load the system dbghelp.dll to prevent
+	// the graphics driver from potentially loading the old game dbghelp.dll and then crashing the game process.
+	DbgHelpGuard dbgHelpGuard;
+
 	HRESULT hr=D3DInterface->CreateDevice
 	(
 		CurRenderDevice,
@@ -567,14 +587,16 @@ bool DX8Wrapper::Create_Device(void)
 		_Hwnd,
 		Vertex_Processing_Behavior,
 		&_PresentParameters,
-		&D3DDevice 
+		&D3DDevice
 	);
 
-	if (FAILED(hr)) 
+	if (FAILED(hr))
 	{
 		return false;
 	}
 
+	dbgHelpGuard.deactivate();
+
 	/*
 	** Initialize all subsystems
 	*/
@@ -584,10 +606,12 @@ bool DX8Wrapper::Create_Device(void)
 
 bool DX8Wrapper::Reset_Device(bool reload_assets)
 {
-	WWDEBUG_SAY(("Resetting device.\n"));
+	WWDEBUG_SAY(("Resetting device."));
 	DX8_THREAD_ASSERT();
 	if ((IsInitted) && (D3DDevice != NULL)) {
 		// Release all non-MANAGED stuff
+		WW3D::_Invalidate_Textures();
+		
 		Set_Vertex_Buffer (NULL);
 		Set_Index_Buffer (NULL, 0);
 		if (m_pCleanupHook) {
@@ -618,10 +642,10 @@ bool DX8Wrapper::Reset_Device(bool reload_assets)
 		}
 		Invalidate_Cached_Render_States();
 		Set_Default_Global_Render_States();
-		WWDEBUG_SAY(("Device reset completed\n"));
+		WWDEBUG_SAY(("Device reset completed"));
 		return true;
 	}
-	WWDEBUG_SAY(("Device reset failed\n"));
+	WWDEBUG_SAY(("Device reset failed"));
 	return false;
 }
 
@@ -800,7 +824,7 @@ void DX8Wrapper::Get_Format_Name(unsigned int format, StringClass *tex_format)
 		case D3DFMT_A8L8: *tex_format="D3DFMT_A8L8"; break;
 		case D3DFMT_A4L4: *tex_format="D3DFMT_A4L4"; break;
 		case D3DFMT_V8U8: *tex_format="D3DFMT_V8U8"; break;
-		case D3DFMT_L6V5U5: *tex_format="D3DFMT_L6V5U5"; break;  
+		case D3DFMT_L6V5U5: *tex_format="D3DFMT_L6V5U5"; break;
 		case D3DFMT_X8L8V8U8: *tex_format="D3DFMT_X8L8V8U8"; break;
 		case D3DFMT_Q8W8V8U8: *tex_format="D3DFMT_Q8W8V8U8"; break;
 		case D3DFMT_V16U16: *tex_format="D3DFMT_V16U16"; break;
@@ -849,7 +873,7 @@ void DX8Wrapper::Resize_And_Position_Window()
 		{
 			::SetWindowPos(_Hwnd, HWND_TOPMOST, 0, 0, width, height, SWP_NOSIZE | SWP_NOMOVE);
 
-			DEBUG_LOG(("Window resized to w:%d h:%d\n", width, height));
+			DEBUG_LOG(("Window resized to w:%d h:%d", width, height));
 		}
 		else
 		{
@@ -872,7 +896,7 @@ void DX8Wrapper::Resize_And_Position_Window()
 
 			::SetWindowPos (_Hwnd, NULL, left, top, width, height, SWP_NOZORDER);
 
-			DEBUG_LOG(("Window positioned to x:%d y:%d, resized to w:%d h:%d\n", left, top, width, height));
+			DEBUG_LOG(("Window positioned to x:%d y:%d, resized to w:%d h:%d", left, top, width, height));
 		}
 	}
 }
@@ -892,14 +916,14 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
 	} else if (dev != -1) {
 		CurRenderDevice = dev;
 	}
-	
+
 	/*
-	** If user doesn't want to change res, set the res variables to match the 
+	** If user doesn't want to change res, set the res variables to match the
 	** current resolution
 	*/
 	if (width != -1)		ResolutionWidth = width;
 	if (height != -1)		ResolutionHeight = height;
-	
+
 	// Initialize Render2DClass Screen Resolution
 	Render2DClass::Set_Screen_Resolution( RectClass( 0, 0, ResolutionWidth, ResolutionHeight ) );
 
@@ -907,14 +931,14 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
 	if (windowed != -1)	IsWindowed = (windowed != 0);
 	DX8Wrapper_IsWindowed = IsWindowed;
 
-	WWDEBUG_SAY(("Attempting Set_Render_Device: name: %s (%s:%s), width: %d, height: %d, windowed: %d\n",
-		_RenderDeviceNameTable[CurRenderDevice],_RenderDeviceDescriptionTable[CurRenderDevice].Get_Driver_Name(),
+	WWDEBUG_SAY(("Attempting Set_Render_Device: name: %s (%s:%s), width: %d, height: %d, windowed: %d",
+		_RenderDeviceNameTable[CurRenderDevice].str(),_RenderDeviceDescriptionTable[CurRenderDevice].Get_Driver_Name(),
 		_RenderDeviceDescriptionTable[CurRenderDevice].Get_Driver_Version(),ResolutionWidth,ResolutionHeight,(IsWindowed ? 1 : 0)));
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	// PWG 4/13/2000 - changed so that if you say to resize the window it resizes
 	// regardless of whether its windowed or not as OpenGL resizes its self around
-	// the caption and edges of the window type you provide, so its important to 
+	// the caption and edges of the window type you provide, so its important to
 	// push the client area to be the size you really want.
 	// if ( resize_window && windowed ) {
 	if (resize_window) {
@@ -923,16 +947,16 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
 #endif
 	//must be either resetting existing device or creating a new one.
 	WWASSERT(reset_device || D3DDevice == NULL);
-	
+
 	/*
-	** Initialize values for D3DPRESENT_PARAMETERS members. 	
+	** Initialize values for D3DPRESENT_PARAMETERS members.
 	*/
 	::ZeroMemory(&_PresentParameters, sizeof(D3DPRESENT_PARAMETERS));
 
 	_PresentParameters.BackBufferWidth = ResolutionWidth;
 	_PresentParameters.BackBufferHeight = ResolutionHeight;
 	_PresentParameters.BackBufferCount = IsWindowed ? 1 : 2;
-	
+
 	_PresentParameters.MultiSampleType = D3DMULTISAMPLE_NONE;
 	_PresentParameters.SwapEffect = IsWindowed ? D3DSWAPEFFECT_DISCARD : D3DSWAPEFFECT_FLIP;		// Shouldn't this be D3DSWAPEFFECT_FLIP?
 	_PresentParameters.hDeviceWindow = _Hwnd;
@@ -940,14 +964,14 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
 
 	_PresentParameters.EnableAutoDepthStencil = TRUE;				// Driver will attempt to match Z-buffer depth
 	_PresentParameters.Flags=0;											// We're not going to lock the backbuffer
-	
+
 	_PresentParameters.FullScreen_PresentationInterval = D3DPRESENT_INTERVAL_DEFAULT;
 	_PresentParameters.FullScreen_RefreshRateInHz = D3DPRESENT_RATE_DEFAULT;
 
 	/*
 	** Set up the buffer formats.  Several issues here:
 	** - if in windowed mode, the backbuffer must use the current display format.
-	** - the depth buffer must use 
+	** - the depth buffer must use
 	*/
 	if (IsWindowed) {
 
@@ -1023,19 +1047,19 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
 	Get_Format_Name(DisplayFormat,&displayFormat);
 	Get_Format_Name(_PresentParameters.BackBufferFormat,&backbufferFormat);
 
-	WWDEBUG_SAY(("Using Display/BackBuffer Formats: %s/%s\n",displayFormat,backbufferFormat));
-	
+	WWDEBUG_SAY(("Using Display/BackBuffer Formats: %s/%s",displayFormat.str(),backbufferFormat.str()));
+
 	bool ret;
 
 	if (reset_device)
 	{
-		WWDEBUG_SAY(("DX8Wrapper::Set_Render_Device is resetting the device.\n"));
+		WWDEBUG_SAY(("DX8Wrapper::Set_Render_Device is resetting the device."));
 		ret = Reset_Device(restore_assets);	//reset device without restoring data - we're likely switching out of the app.
 	}
 	else
 		ret = Create_Device();
 
-	WWDEBUG_SAY(("Reset/Create_Device done, reset_device=%d, restore_assets=%d\n", reset_device, restore_assets));
+	WWDEBUG_SAY(("Reset/Create_Device done, reset_device=%d, restore_assets=%d", reset_device, restore_assets));
 
 	return ret;
 }
@@ -1103,7 +1127,7 @@ void DX8Wrapper::Set_Swap_Interval(int swap)
 		default: _PresentParameters.FullScreen_PresentationInterval = D3DPRESENT_INTERVAL_ONE ; break;
 	}
 
-	WWDEBUG_SAY(("DX8Wrapper::Set_Swap_Interval is resetting the device.\n"));
+	WWDEBUG_SAY(("DX8Wrapper::Set_Swap_Interval is resetting the device."));
 	Reset_Device();
 }
 
@@ -1173,7 +1197,7 @@ bool DX8Wrapper::Set_Device_Resolution(int width,int height,int bits,int windowe
 			Resize_And_Position_Window();
 		}
 #pragma message("TODO: support changing windowed status and changing the bit depth")
-		WWDEBUG_SAY(("DX8Wrapper::Set_Device_Resolution is resetting the device.\n"));
+		WWDEBUG_SAY(("DX8Wrapper::Set_Device_Resolution is resetting the device."));
 		return Reset_Device();
 	} else {
 		return false;
@@ -1227,7 +1251,7 @@ bool DX8Wrapper::Registry_Save_Render_Device( const char *sub_key, int device, i
 
 	if ( !registry->Is_Valid() ) {
 		delete registry;
-		WWDEBUG_SAY(( "Error getting Registry\n" ));
+		WWDEBUG_SAY(( "Error getting Registry" ));
 		return false;
 	}
 
@@ -1258,12 +1282,12 @@ bool DX8Wrapper::Registry_Load_Render_Device( const char * sub_key, bool resize_
 													TextureBitDepth) &&
 			(*name != 0))
 	{
-		WWDEBUG_SAY(( "Device %s (%d X %d) %d bit windowed:%d\n", name,width,height,depth,windowed));
+		WWDEBUG_SAY(( "Device %s (%d X %d) %d bit windowed:%d", name,width,height,depth,windowed));
 
 		if (TextureBitDepth==16 || TextureBitDepth==32) {
-//			WWDEBUG_SAY(( "Texture depth %d\n", TextureBitDepth));
+//			WWDEBUG_SAY(( "Texture depth %d", TextureBitDepth));
 		} else {
-			WWDEBUG_SAY(( "Invalid texture depth %d, switching to 16 bits\n", TextureBitDepth));
+			WWDEBUG_SAY(( "Invalid texture depth %d, switching to 16 bits", TextureBitDepth));
 			TextureBitDepth=16;
 		}
 
@@ -1274,7 +1298,7 @@ bool DX8Wrapper::Registry_Load_Render_Device( const char * sub_key, bool resize_
 		return true;
 	}
 
-	WWDEBUG_SAY(( "Error getting Registry\n" ));
+	WWDEBUG_SAY(( "Error getting Registry" ));
 
 	return Set_Any_Render_Device();
 }
@@ -1386,7 +1410,7 @@ bool DX8Wrapper::Find_Color_Mode(D3DFORMAT colorbuffer, int resx, int resy, UINT
 	{
 		D3DInterface->EnumAdapterModes(D3DADAPTER_DEFAULT, i, &dmode);
 		if (dmode.Width==rx && dmode.Height==ry && dmode.Format==colorbuffer) {
-			WWDEBUG_SAY(("Found valid color mode.  Width = %d Height = %d Format = %d\r\n",dmode.Width,dmode.Height,dmode.Format));
+			WWDEBUG_SAY(("Found valid color mode.  Width = %d Height = %d Format = %d",dmode.Width,dmode.Height,dmode.Format));
 			found=true;
 		}
 		i++;
@@ -1396,7 +1420,7 @@ bool DX8Wrapper::Find_Color_Mode(D3DFORMAT colorbuffer, int resx, int resy, UINT
 
 	// no match
 	if (!found) {
-		WWDEBUG_SAY(("Failed to find a valid color mode\r\n"));
+		WWDEBUG_SAY(("Failed to find a valid color mode"));
 		return false;
 	}
 
@@ -1426,47 +1450,47 @@ bool DX8Wrapper::Find_Z_Mode(D3DFORMAT colorbuffer,D3DFORMAT backbuffer, D3DFORM
 	if (Test_Z_Mode(colorbuffer,backbuffer,D3DFMT_D24S8))
 	{
 		*zmode=D3DFMT_D24S8;
-		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D24S8\n"));
+		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D24S8"));
 		return true;
 	}
 
 	if (Test_Z_Mode(colorbuffer,backbuffer,D3DFMT_D32))
 	{
 		*zmode=D3DFMT_D32;
-		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D32\n"));
+		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D32"));
 		return true;
 	}
 
 	if (Test_Z_Mode(colorbuffer,backbuffer,D3DFMT_D24X8))
 	{
 		*zmode=D3DFMT_D24X8;
-		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D24X8\n"));
+		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D24X8"));
 		return true;
 	}
 
 	if (Test_Z_Mode(colorbuffer,backbuffer,D3DFMT_D24X4S4))
 	{
 		*zmode=D3DFMT_D24X4S4;
-		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D24X4S4\n"));
+		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D24X4S4"));
 		return true;
 	}
 
 	if (Test_Z_Mode(colorbuffer,backbuffer,D3DFMT_D16))
 	{
 		*zmode=D3DFMT_D16;
-		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D16\n"));
+		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D16"));
 		return true;
 	}
 
 	if (Test_Z_Mode(colorbuffer,backbuffer,D3DFMT_D15S1))
 	{
 		*zmode=D3DFMT_D15S1;
-		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D15S1\n"));
+		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D15S1"));
 		return true;
 	}
 
 	// can't find a match
-	WWDEBUG_SAY(("Failed to find a valid zbuffer mode\r\n"));
+	WWDEBUG_SAY(("Failed to find a valid zbuffer mode"));
 	return false;
 }
 
@@ -1476,7 +1500,7 @@ bool DX8Wrapper::Test_Z_Mode(D3DFORMAT colorbuffer,D3DFORMAT backbuffer, D3DFORM
 	if (FAILED(D3DInterface->CheckDeviceFormat(D3DADAPTER_DEFAULT,WW3D_DEVTYPE,
 		colorbuffer,D3DUSAGE_DEPTHSTENCIL,D3DRTYPE_SURFACE,zmode)))
 	{
-		WWDEBUG_SAY(("CheckDeviceFormat failed.  Colorbuffer format = %d  Zbufferformat = %d\n",colorbuffer,zmode));
+		WWDEBUG_SAY(("CheckDeviceFormat failed.  Colorbuffer format = %d  Zbufferformat = %d",colorbuffer,zmode));
 		return false;
 	}
 
@@ -1484,7 +1508,7 @@ bool DX8Wrapper::Test_Z_Mode(D3DFORMAT colorbuffer,D3DFORMAT backbuffer, D3DFORM
 	if(FAILED(D3DInterface->CheckDepthStencilMatch(D3DADAPTER_DEFAULT, WW3D_DEVTYPE,
 		colorbuffer,backbuffer,zmode)))
 	{
-		WWDEBUG_SAY(("CheckDepthStencilMatch failed.  Colorbuffer format = %d  Backbuffer format = %d Zbufferformat = %d\n",colorbuffer,backbuffer,zmode));
+		WWDEBUG_SAY(("CheckDepthStencilMatch failed.  Colorbuffer format = %d  Backbuffer format = %d Zbufferformat = %d",colorbuffer,backbuffer,zmode));
 		return false;
 	}
 	return true;
@@ -1569,7 +1593,7 @@ void DX8Wrapper::Begin_Scene(void)
 #if ENABLE_EMBEDDED_BROWSER
 	DX8WebBrowser::Update();
 #endif
-	
+
 	DX8CALL(BeginScene());
 
 	DX8WebBrowser::Update();
@@ -1609,7 +1633,7 @@ void DX8Wrapper::End_Scene(bool flip_frames)
 		if (hr==D3DERR_DEVICELOST) {
 			hr=_Get_D3D_Device8()->TestCooperativeLevel();
 			if (hr==D3DERR_DEVICENOTRESET) {
-				WWDEBUG_SAY(("DX8Wrapper::End_Scene is resetting the device.\n"));
+				WWDEBUG_SAY(("DX8Wrapper::End_Scene is resetting the device."));
 				Reset_Device();
 			}
 			else {
@@ -1647,28 +1671,28 @@ void DX8Wrapper::Flip_To_Primary(void)
 			HRESULT hr = _Get_D3D_Device8()->TestCooperativeLevel();
 
 			if (FAILED(hr)) {
-				WWDEBUG_SAY(("TestCooperativeLevel Failed!\n"));
+				WWDEBUG_SAY(("TestCooperativeLevel Failed!"));
 
 				if (D3DERR_DEVICELOST == hr) {
 					IsDeviceLost=true;
-					WWDEBUG_SAY(("DEVICELOST: Cannot flip to primary.\n"));
+					WWDEBUG_SAY(("DEVICELOST: Cannot flip to primary."));
 					return;
 				}
 				IsDeviceLost=false;
 
 				if (D3DERR_DEVICENOTRESET == hr) {
-					WWDEBUG_SAY(("DEVICENOTRESET\n"));
+					WWDEBUG_SAY(("DEVICENOTRESET"));
 					Reset_Device();
 					resetAttempts++;
 				}
 			} else {
-				WWDEBUG_SAY(("Flipping: %ld\n", FrameCount));
+				WWDEBUG_SAY(("Flipping: %ld", FrameCount));
 				hr = _Get_D3D_Device8()->Present(NULL, NULL, NULL, NULL);
 
 				if (SUCCEEDED(hr)) {
 					IsDeviceLost=false;
 					FrameCount++;
-					WWDEBUG_SAY(("Flip to primary succeeded %ld\n", FrameCount));
+					WWDEBUG_SAY(("Flip to primary succeeded %ld", FrameCount));
 				}
 				else {
 					IsDeviceLost=true;
@@ -1893,7 +1917,7 @@ void DX8Wrapper::Draw(
 	if (DrawPolygonLowBoundLimit && DrawPolygonLowBoundLimit>=polygon_count) return;
 
 	DX8_THREAD_ASSERT();
-	SNAPSHOT_SAY(("DX8 - draw\n"));
+	SNAPSHOT_SAY(("DX8 - draw"));
 
 	Apply_Render_State_Changes();
 
@@ -1903,55 +1927,55 @@ void DX8Wrapper::Draw(
 #ifdef MESH_RENDER_SNAPSHOT_ENABLED
 	if (WW3D::Is_Snapshot_Activated()) {
 		unsigned long passes=0;
-		SNAPSHOT_SAY(("ValidateDevice: "));
+		SNAPSHOT_SAY(("ValidateDevice:"));
 		HRESULT res=D3DDevice->ValidateDevice(&passes);
 		switch (res) {
 		case D3D_OK:
-			SNAPSHOT_SAY(("OK\n"));
+			SNAPSHOT_SAY(("OK"));
 			break;
 
 		case D3DERR_CONFLICTINGTEXTUREFILTER:
-			SNAPSHOT_SAY(("D3DERR_CONFLICTINGTEXTUREFILTER\n"));
+			SNAPSHOT_SAY(("D3DERR_CONFLICTINGTEXTUREFILTER"));
 			break;
 		case D3DERR_CONFLICTINGTEXTUREPALETTE:
-			SNAPSHOT_SAY(("D3DERR_CONFLICTINGTEXTUREPALETTE\n"));
+			SNAPSHOT_SAY(("D3DERR_CONFLICTINGTEXTUREPALETTE"));
 			break;
 		case D3DERR_DEVICELOST:
-			SNAPSHOT_SAY(("D3DERR_DEVICELOST\n"));
+			SNAPSHOT_SAY(("D3DERR_DEVICELOST"));
 			break;
 		case D3DERR_TOOMANYOPERATIONS:
-			SNAPSHOT_SAY(("D3DERR_TOOMANYOPERATIONS\n"));
+			SNAPSHOT_SAY(("D3DERR_TOOMANYOPERATIONS"));
 			break;
 		case D3DERR_UNSUPPORTEDALPHAARG:
-			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDALPHAARG\n"));
+			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDALPHAARG"));
 			break;
 		case D3DERR_UNSUPPORTEDALPHAOPERATION:
-			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDALPHAOPERATION\n"));
+			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDALPHAOPERATION"));
 			break;
 		case D3DERR_UNSUPPORTEDCOLORARG:
-			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDCOLORARG\n"));
+			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDCOLORARG"));
 			break;
 		case D3DERR_UNSUPPORTEDCOLOROPERATION:
-			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDCOLOROPERATION\n"));
+			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDCOLOROPERATION"));
 			break;
 		case D3DERR_UNSUPPORTEDFACTORVALUE:
-			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDFACTORVALUE\n"));
+			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDFACTORVALUE"));
 			break;
 		case D3DERR_UNSUPPORTEDTEXTUREFILTER:
-			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDTEXTUREFILTER\n"));
+			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDTEXTUREFILTER"));
 			break;
 		case D3DERR_WRONGTEXTUREFORMAT:
-			SNAPSHOT_SAY(("D3DERR_WRONGTEXTUREFORMAT\n"));
+			SNAPSHOT_SAY(("D3DERR_WRONGTEXTUREFORMAT"));
 			break;
 		default:
-			SNAPSHOT_SAY(("UNKNOWN Error\n"));
+			SNAPSHOT_SAY(("UNKNOWN Error"));
 			break;
 		}
 	}
 #endif	// MESH_RENDER_SHAPSHOT_ENABLED
 
 
-	SNAPSHOT_SAY(("DX8 - draw %d polygons (%d vertices)\n",polygon_count,vertex_count));
+	SNAPSHOT_SAY(("DX8 - draw %d polygons (%d vertices)",polygon_count,vertex_count));
 
 	if (vertex_count<3) {
 		min_vertex_index=0;
@@ -2079,38 +2103,38 @@ void DX8Wrapper::Draw_Strip(
 
 void DX8Wrapper::Apply_Render_State_Changes()
 {
-	SNAPSHOT_SAY(("DX8Wrapper::Apply_Render_State_Changes()\n"));
-	
+	SNAPSHOT_SAY(("DX8Wrapper::Apply_Render_State_Changes()"));
+
 	if (!render_state_changed) return;
 	if (render_state_changed&SHADER_CHANGED) {
-		SNAPSHOT_SAY(("DX8 - apply shader\n"));
+		SNAPSHOT_SAY(("DX8 - apply shader"));
 		render_state.shader.Apply();
 	}
 
 	unsigned mask=TEXTURE0_CHANGED;
 	int i=0;
-	for (;i<CurrentCaps->Get_Max_Textures_Per_Pass();++i,mask<<=1) 
+	for (;i<CurrentCaps->Get_Max_Textures_Per_Pass();++i,mask<<=1)
 	{
-		if (render_state_changed&mask) 
+		if (render_state_changed&mask)
 		{
-			SNAPSHOT_SAY(("DX8 - apply texture %d\n",i));
+			SNAPSHOT_SAY(("DX8 - apply texture %d",i));
 
-			if (render_state.Textures[i]) 
+			if (render_state.Textures[i])
 			{
 				render_state.Textures[i]->Apply(i);
 			}
-			else 
+			else
 			{
 				TextureBaseClass::Apply_Null(i);
 			}
 		}
 	}
 
-	if (render_state_changed&MATERIAL_CHANGED) 
+	if (render_state_changed&MATERIAL_CHANGED)
 	{
-		SNAPSHOT_SAY(("DX8 - apply material\n"));
+		SNAPSHOT_SAY(("DX8 - apply material"));
 		VertexMaterialClass* material=const_cast<VertexMaterialClass*>(render_state.material);
-		if (material) 
+		if (material)
 		{
 			material->Apply();
 		}
@@ -2122,20 +2146,20 @@ void DX8Wrapper::Apply_Render_State_Changes()
 		unsigned mask=LIGHT0_CHANGED;
 		for (unsigned index=0;index<4;++index,mask<<=1) {
 			if (render_state_changed&mask) {
-				SNAPSHOT_SAY(("DX8 - apply light %d\n",index));
+				SNAPSHOT_SAY(("DX8 - apply light %d",index));
 				if (render_state.LightEnable[index]) {
-#ifdef MESH_RENDER_SNAPSHOT_ENABLED		
+#ifdef MESH_RENDER_SNAPSHOT_ENABLED
 					if ( WW3D::Is_Snapshot_Activated() ) {
 						D3DLIGHT8 * light = &(render_state.Lights[index]);
 						static const char * _light_types[] = { "Unknown", "Point","Spot", "Directional" };
-						WWASSERT((light->Type >= 0) && (light->Type <= 3));					
+						WWASSERT((light->Type >= 0) && (light->Type <= 3));
 
-						SNAPSHOT_SAY((" type = %s amb = %4.2f,%4.2f,%4.2f  diff = %4.2f,%4.2f,%4.2f spec = %4.2f, %4.2f, %4.2f\n",
+						SNAPSHOT_SAY((" type = %s amb = %4.2f,%4.2f,%4.2f  diff = %4.2f,%4.2f,%4.2f spec = %4.2f, %4.2f, %4.2f",
 							_light_types[light->Type],
 							light->Ambient.r,light->Ambient.g,light->Ambient.b,
 							light->Diffuse.r,light->Diffuse.g,light->Diffuse.b,
 							light->Specular.r,light->Specular.g,light->Specular.b ));
-						SNAPSHOT_SAY((" pos = %f, %f, %f  dir = %f, %f, %f\n",
+						SNAPSHOT_SAY((" pos = %f, %f, %f  dir = %f, %f, %f",
 							light->Position.x, light->Position.y, light->Position.z,
 							light->Direction.x, light->Direction.y, light->Direction.z ));
 					}
@@ -2145,22 +2169,22 @@ void DX8Wrapper::Apply_Render_State_Changes()
 				}
 				else {
 					Set_DX8_Light(index,NULL);
-					SNAPSHOT_SAY((" clearing light to NULL\n"));
+					SNAPSHOT_SAY((" clearing light to NULL"));
 				}
 			}
 		}
 	}
 
 	if (render_state_changed&WORLD_CHANGED) {
-		SNAPSHOT_SAY(("DX8 - apply world matrix\n"));
+		SNAPSHOT_SAY(("DX8 - apply world matrix"));
 		_Set_DX8_Transform(D3DTS_WORLD,render_state.world);
 	}
 	if (render_state_changed&VIEW_CHANGED) {
-		SNAPSHOT_SAY(("DX8 - apply view matrix\n"));
+		SNAPSHOT_SAY(("DX8 - apply view matrix"));
 		_Set_DX8_Transform(D3DTS_VIEW,render_state.view);
 	}
 	if (render_state_changed&VERTEX_BUFFER_CHANGED) {
-		SNAPSHOT_SAY(("DX8 - apply vb change\n"));
+		SNAPSHOT_SAY(("DX8 - apply vb change"));
 		if (render_state.vertex_buffer) {
 			switch (render_state.vertex_buffer_type) {//->Type()) {
 			case BUFFER_TYPE_DX8:
@@ -2184,7 +2208,7 @@ void DX8Wrapper::Apply_Render_State_Changes()
 		}
 	}
 	if (render_state_changed&INDEX_BUFFER_CHANGED) {
-		SNAPSHOT_SAY(("DX8 - apply ib change\n"));
+		SNAPSHOT_SAY(("DX8 - apply ib change"));
 		if (render_state.index_buffer) {
 			switch (render_state.index_buffer_type) {//->Type()) {
 			case BUFFER_TYPE_DX8:
@@ -2211,7 +2235,7 @@ void DX8Wrapper::Apply_Render_State_Changes()
 
 	render_state_changed&=((unsigned)WORLD_IDENTITY|(unsigned)VIEW_IDENTITY);
 
-	SNAPSHOT_SAY(("DX8Wrapper::Apply_Render_State_Changes() - finished\n"));
+	SNAPSHOT_SAY(("DX8Wrapper::Apply_Render_State_Changes() - finished"));
 }
 
 IDirect3DTexture8 * DX8Wrapper::_Create_DX8_Texture
@@ -2354,7 +2378,7 @@ IDirect3DTexture8 * DX8Wrapper::_Create_DX8_Texture
 	tex_surface->Release();
 
 	// Create mipmaps if needed
-	if (mip_level_count!=MIP_LEVELS_1) 
+	if (mip_level_count!=MIP_LEVELS_1)
 	{
 		DX8_ErrorCode(D3DXFilterTexture(texture, NULL, 0, D3DX_FILTER_BOX));
 	}
@@ -2363,6 +2387,305 @@ IDirect3DTexture8 * DX8Wrapper::_Create_DX8_Texture
 
 }
 
+/*!
+ * KJM create depth stencil texture
+ */
+IDirect3DTexture8 * DX8Wrapper::_Create_DX8_ZTexture
+(
+	unsigned int width,
+	unsigned int height,
+	WW3DZFormat zformat,
+	MipCountType mip_level_count,
+	D3DPOOL pool
+)
+{
+	DX8_THREAD_ASSERT();
+	DX8_Assert();
+	IDirect3DTexture8* texture = NULL;
+
+	D3DFORMAT zfmt=WW3DZFormat_To_D3DFormat(zformat);
+
+	unsigned ret=DX8Wrapper::_Get_D3D_Device8()->CreateTexture
+	(
+		width,
+		height,
+		mip_level_count,
+		D3DUSAGE_DEPTHSTENCIL,
+		zfmt,
+		pool,
+		&texture
+	);
+
+	if (ret==D3DERR_NOTAVAILABLE)
+	{
+		Non_Fatal_Log_DX8_ErrorCode(ret,__FILE__,__LINE__);
+		return NULL;
+	}
+
+	// If ran out of texture ram, try invalidating some textures and mesh cache.
+	if (ret==D3DERR_OUTOFVIDEOMEMORY)
+	{
+		WWDEBUG_SAY(("Error: Out of memory while creating render target. Trying to release assets..."));
+		// Free all textures that haven't been used in the last 5 seconds
+		TextureClass::Invalidate_Old_Unused_Textures(5000);
+
+		// Invalidate the mesh cache
+		WW3D::_Invalidate_Mesh_Cache();
+
+		ret=DX8Wrapper::_Get_D3D_Device8()->CreateTexture
+		(
+			width,
+			height,
+			mip_level_count,
+			D3DUSAGE_DEPTHSTENCIL,
+			zfmt,
+			pool,
+			&texture
+		);
+
+		if (SUCCEEDED(ret))
+		{
+			WWDEBUG_SAY(("...Render target creation succesful."));
+		}
+		else
+		{
+			WWDEBUG_SAY(("...Render target creation failed."));
+		}
+		if (ret==D3DERR_OUTOFVIDEOMEMORY)
+		{
+			Non_Fatal_Log_DX8_ErrorCode(ret,__FILE__,__LINE__);
+			return NULL;
+		}
+	}
+
+	DX8_ErrorCode(ret);
+
+	texture->AddRef(); // don't release this texture
+
+	// Just return the texture, no reduction
+	// allowed for render targets.
+
+	return texture;
+}
+
+/*!
+ * KJM create cube map texture
+ */
+IDirect3DCubeTexture8* DX8Wrapper::_Create_DX8_Cube_Texture
+(
+	unsigned int width,
+	unsigned int height,
+	WW3DFormat format,
+	MipCountType mip_level_count,
+	D3DPOOL pool,
+	bool rendertarget
+)
+{
+	WWASSERT(width==height);
+	DX8_THREAD_ASSERT();
+	DX8_Assert();
+	IDirect3DCubeTexture8* texture=NULL;
+
+	// Paletted textures not supported!
+	WWASSERT(format!=D3DFMT_P8);
+
+	// NOTE: If 'format' is not supported as a texture format, this function will find the closest
+	// format that is supported and use that instead.
+
+	// Render target may return NOTAVAILABLE, in
+	// which case we return NULL.
+	if (rendertarget)
+	{
+		unsigned ret=D3DXCreateCubeTexture
+		(
+			DX8Wrapper::_Get_D3D_Device8(),
+			width,
+			mip_level_count,
+			D3DUSAGE_RENDERTARGET,
+			WW3DFormat_To_D3DFormat(format),
+			pool,
+			&texture
+		);
+
+		if (ret==D3DERR_NOTAVAILABLE)
+		{
+			Non_Fatal_Log_DX8_ErrorCode(ret,__FILE__,__LINE__);
+			return NULL;
+		}
+
+		// If ran out of texture ram, try invalidating some textures and mesh cache.
+		if (ret==D3DERR_OUTOFVIDEOMEMORY)
+		{
+			WWDEBUG_SAY(("Error: Out of memory while creating render target. Trying to release assets..."));
+			// Free all textures that haven't been used in the last 5 seconds
+			TextureClass::Invalidate_Old_Unused_Textures(5000);
+
+			// Invalidate the mesh cache
+			WW3D::_Invalidate_Mesh_Cache();
+
+			ret=D3DXCreateCubeTexture
+			(
+				DX8Wrapper::_Get_D3D_Device8(),
+				width,
+				mip_level_count,
+				D3DUSAGE_RENDERTARGET,
+				WW3DFormat_To_D3DFormat(format),
+				pool,
+				&texture
+			);
+
+			if (SUCCEEDED(ret))
+			{
+				WWDEBUG_SAY(("...Render target creation succesful."));
+			}
+			else
+			{
+				WWDEBUG_SAY(("...Render target creation failed."));
+			}
+			if (ret==D3DERR_OUTOFVIDEOMEMORY)
+			{
+				Non_Fatal_Log_DX8_ErrorCode(ret,__FILE__,__LINE__);
+				return NULL;
+			}
+		}
+
+		DX8_ErrorCode(ret);
+		// Just return the texture, no reduction
+		// allowed for render targets.
+		return texture;
+	}
+
+	// We should never run out of video memory when allocating a non-rendertarget texture.
+	// However, it seems to happen sometimes when there are a lot of textures in memory and so
+	// if it happens we'll release assets and try again (anything is better than crashing).
+	unsigned ret=D3DXCreateCubeTexture
+	(
+		DX8Wrapper::_Get_D3D_Device8(),
+		width,
+		mip_level_count,
+		0,
+		WW3DFormat_To_D3DFormat(format),
+		pool,
+		&texture
+	);
+
+	// If ran out of texture ram, try invalidating some textures and mesh cache.
+	if (ret==D3DERR_OUTOFVIDEOMEMORY)
+	{
+		WWDEBUG_SAY(("Error: Out of memory while creating texture. Trying to release assets..."));
+		// Free all textures that haven't been used in the last 5 seconds
+		TextureClass::Invalidate_Old_Unused_Textures(5000);
+
+		// Invalidate the mesh cache
+		WW3D::_Invalidate_Mesh_Cache();
+
+		ret=D3DXCreateCubeTexture
+		(
+			DX8Wrapper::_Get_D3D_Device8(),
+			width,
+			mip_level_count,
+			0,
+			WW3DFormat_To_D3DFormat(format),
+			pool,
+			&texture
+		);
+		if (SUCCEEDED(ret))
+		{
+			WWDEBUG_SAY(("...Texture creation succesful."));
+		}
+		else
+		{
+			StringClass format_name(0,true);
+			Get_WW3D_Format_Name(format, format_name);
+			WWDEBUG_SAY(("...Texture creation failed. (%d x %d, format: %s, mips: %d",width,height,format_name.str(),mip_level_count));
+		}
+
+	}
+	DX8_ErrorCode(ret);
+
+	return texture;
+}
+
+/*!
+ * KJM create volume texture
+ */
+IDirect3DVolumeTexture8* DX8Wrapper::_Create_DX8_Volume_Texture
+(
+	unsigned int width,
+	unsigned int height,
+	unsigned int depth,
+	WW3DFormat format,
+	MipCountType mip_level_count,
+	D3DPOOL pool
+)
+{
+	DX8_THREAD_ASSERT();
+	DX8_Assert();
+	IDirect3DVolumeTexture8* texture=NULL;
+
+	// Paletted textures not supported!
+	WWASSERT(format!=D3DFMT_P8);
+
+	// NOTE: If 'format' is not supported as a texture format, this function will find the closest
+	// format that is supported and use that instead.
+
+
+	// We should never run out of video memory when allocating a non-rendertarget texture.
+	// However, it seems to happen sometimes when there are a lot of textures in memory and so
+	// if it happens we'll release assets and try again (anything is better than crashing).
+	unsigned ret=D3DXCreateVolumeTexture
+	(
+		DX8Wrapper::_Get_D3D_Device8(),
+		width,
+		height,
+		depth,
+		mip_level_count,
+		0,
+		WW3DFormat_To_D3DFormat(format),
+		pool,
+		&texture
+	);
+
+	// If ran out of texture ram, try invalidating some textures and mesh cache.
+	if (ret==D3DERR_OUTOFVIDEOMEMORY)
+	{
+		WWDEBUG_SAY(("Error: Out of memory while creating texture. Trying to release assets..."));
+		// Free all textures that haven't been used in the last 5 seconds
+		TextureClass::Invalidate_Old_Unused_Textures(5000);
+
+		// Invalidate the mesh cache
+		WW3D::_Invalidate_Mesh_Cache();
+
+		ret=D3DXCreateVolumeTexture
+		(
+			DX8Wrapper::_Get_D3D_Device8(),
+			width,
+			height,
+			depth,
+			mip_level_count,
+			0,
+			WW3DFormat_To_D3DFormat(format),
+			pool,
+			&texture
+		);
+		if (SUCCEEDED(ret))
+		{
+			WWDEBUG_SAY(("...Texture creation succesful."));
+		}
+		else
+		{
+			StringClass format_name(0,true);
+			Get_WW3D_Format_Name(format, format_name);
+			WWDEBUG_SAY(("...Texture creation failed. (%d x %d, format: %s, mips: %d",width,height,format_name.str(),mip_level_count));
+		}
+
+	}
+	DX8_ErrorCode(ret);
+
+	return texture;
+}
+
+
 IDirect3DSurface8 * DX8Wrapper::_Create_DX8_Surface(unsigned int width, unsigned int height, WW3DFormat format)
 {
 	DX8_THREAD_ASSERT();
@@ -2403,11 +2726,11 @@ IDirect3DSurface8 * DX8Wrapper::_Create_DX8_Surface(const char *filename_)
 			// If file not found, try the dds format
 			// else create a surface with missing texture in it
 			char compressed_name[200];
-			strncpy(compressed_name,filename_, 200);
+			strlcpy(compressed_name,filename_, sizeof(compressed_name));
 			char *ext = strstr(compressed_name, ".");
-			if ( (strlen(ext)==4) && 
-				  ( (ext[1] == 't') || (ext[1] == 'T') ) && 
-				  ( (ext[2] == 'g') || (ext[2] == 'G') ) && 
+			if ( ext && (strlen(ext)==4) &&
+				  ( (ext[1] == 't') || (ext[1] == 'T') ) &&
+				  ( (ext[2] == 'g') || (ext[2] == 'G') ) &&
 				  ( (ext[3] == 'a') || (ext[3] == 'A') ) ) {
 				ext[1]='d';
 				ext[2]='d';
@@ -2552,7 +2875,7 @@ void DX8Wrapper::Set_Light(unsigned index,const LightClass &light)
 //
 void DX8Wrapper::Set_Light_Environment(LightEnvironmentClass* light_env)
 {
-	if (light_env) 
+	if (light_env)
 	{
 		int light_count = light_env->Get_Light_Count();
 		unsigned int color=Convert_Color(light_env->Get_Equivalent_Ambient(),0.0f);
@@ -2565,12 +2888,12 @@ void DX8Wrapper::Set_Light_Environment(LightEnvironmentClass* light_env)
 #endif
 		}
 
-		D3DLIGHT8 light;		
+		D3DLIGHT8 light;
 		int l=0;
 		for (;l<light_count;++l) {
-			
+
 			::ZeroMemory(&light, sizeof(D3DLIGHT8));
-			
+
 			light.Type=D3DLIGHT_DIRECTIONAL;
 			(Vector3&)light.Diffuse=light_env->Get_Light_Diffuse(l);
 			Vector3 dir=-light_env->Get_Light_Direction(l);
@@ -2581,7 +2904,7 @@ void DX8Wrapper::Set_Light_Environment(LightEnvironmentClass* light_env)
 				(Vector3&)light.Ambient=light_env->getPointAmbient(l);
 				light.Position = (const D3DVECTOR&)light_env->getPointCenter(l);
 				light.Range = light_env->getPointOrad(l);
-				
+
 				// Inverse linear light 1/(1+D)
 				double a,b;
 				b = light_env->getPointOrad(l);
@@ -2593,7 +2916,7 @@ void DX8Wrapper::Set_Light_Environment(LightEnvironmentClass* light_env)
 				else
 					// this will cause the light to drop to half intensity at the first far attenuation
 					light.Attenuation1=(float) 0.1/a;
-	
+
 				light.Attenuation2=8.0f/(b*b);
 			}
 
@@ -2645,10 +2968,24 @@ SurfaceClass * DX8Wrapper::_Get_DX8_Back_Buffer(unsigned int num)
 
 
 TextureClass *
-DX8Wrapper::Create_Render_Target (int width, int height, bool alpha)
+DX8Wrapper::Create_Render_Target (int width, int height, WW3DFormat format)
 {
 	DX8_THREAD_ASSERT();
 	DX8_Assert();
+	number_of_DX8_calls++;
+
+	// Use the current display format if format isn't specified
+	if (format==WW3D_FORMAT_UNKNOWN) {
+		D3DDISPLAYMODE mode;
+		DX8CALL(GetDisplayMode(&mode));
+		format=D3DFormat_To_WW3DFormat(mode.Format);
+	}
+
+	// If render target format isn't supported return NULL
+	if (!Get_Current_Caps()->Support_Render_To_Texture_Format(format)) {
+		WWDEBUG_SAY(("DX8Wrapper - Render target format is not supported"));
+		return NULL;
+	}
 
 	//
 	//	Note: We're going to force the width and height to be powers of two and equal
@@ -2670,71 +3007,136 @@ DX8Wrapper::Create_Render_Target (int width, int height, bool alpha)
 	width = height = poweroftwosize;
 
 	//
-	//	Get the current format of the display
+	//	Attempt to create the render target
 	//
-	D3DDISPLAYMODE mode;
-	DX8CALL(GetDisplayMode(&mode));
+	TextureClass * tex = NEW_REF(TextureClass,(width,height,format,MIP_LEVELS_1,TextureClass::POOL_DEFAULT,true));
 
-	// If the user requested a render-target texture and this device does not support that
-	// feature, return NULL
-	HRESULT hr;
+	// 3dfx drivers are lying in the CheckDeviceFormat call and claiming
+	// that they support render targets!
+	if (tex->Peek_D3D_Base_Texture() == NULL)
+	{
+		WWDEBUG_SAY(("DX8Wrapper - Render target creation failed!"));
+		REF_PTR_RELEASE(tex);
+	}
+
+	return tex;
+}
+
+//**********************************************************************************************
+//! Create render target with associated depth stencil buffer
+/*! KJM
+*/
+void DX8Wrapper::Create_Render_Target
+(
+	int width,
+	int height,
+	WW3DFormat format,
+	WW3DZFormat zformat,
+	TextureClass** target,
+	ZTextureClass** depth_buffer
+)
+{
+	DX8_THREAD_ASSERT();
+	DX8_Assert();
+	number_of_DX8_calls++;
 
-	if (alpha)
+	// Use the current display format if format isn't specified
+	if (format==WW3D_FORMAT_UNKNOWN)
 	{
-			//user wants a texture with destination alpha channel - only 1 such format
-			//ever exists on current hardware	- D3DFMT_A8R8G8B8
-			hr = D3DInterface->CheckDeviceFormat(	D3DADAPTER_DEFAULT,
-																	WW3D_DEVTYPE,
-																	mode.Format,
-																	D3DUSAGE_RENDERTARGET,
-																	D3DRTYPE_TEXTURE,
-																	D3DFMT_A8R8G8B8 );
-			mode.Format=D3DFMT_A8R8G8B8;
+		*target=NULL;
+		*depth_buffer=NULL;
+		return;
+/*		D3DDISPLAYMODE mode;
+		DX8CALL(GetDisplayMode(&mode));
+		format=D3DFormat_To_WW3DFormat(mode.Format);*/
 	}
-	else
+
+	// If render target format isn't supported return NULL
+	if (!Get_Current_Caps()->Support_Render_To_Texture_Format(format) ||
+		 !Get_Current_Caps()->Support_Depth_Stencil_Format(zformat))
 	{
-			hr = D3DInterface->CheckDeviceFormat(	D3DADAPTER_DEFAULT,
-																	WW3D_DEVTYPE,
-																	mode.Format,
-																	D3DUSAGE_RENDERTARGET,
-																	D3DRTYPE_TEXTURE,
-																	mode.Format );
+		WWDEBUG_SAY(("DX8Wrapper - Render target with depth format is not supported"));
+		return;
 	}
 
-	number_of_DX8_calls++;
-	if (hr != D3D_OK) {
-		WWDEBUG_SAY(("DX8Wrapper - Driver cannot create render target!\n"));
-		return NULL;
+	//	Note: We're going to force the width and height to be powers of two and equal
+	const D3DCAPS8& dx8caps=Get_Current_Caps()->Get_DX8_Caps();
+	float poweroftwosize = width;
+	if (height > 0 && height < width)
+	{
+		poweroftwosize = height;
 	}
+	poweroftwosize = ::Find_POT (poweroftwosize);
+
+	if (poweroftwosize>dx8caps.MaxTextureWidth)
+	{
+		poweroftwosize=dx8caps.MaxTextureWidth;
+	}
+
+	if (poweroftwosize>dx8caps.MaxTextureHeight)
+	{
+		poweroftwosize=dx8caps.MaxTextureHeight;
+	}
+
+	width = height = poweroftwosize;
 
-	//
 	//	Attempt to create the render target
-	//	
-	DX8_Assert();
-	WW3DFormat format=D3DFormat_To_WW3DFormat(mode.Format);
-	TextureClass * tex = NEW_REF(TextureClass,(width,height,format,MIP_LEVELS_1,TextureClass::POOL_DEFAULT,true));
+	TextureClass* tex=NEW_REF(TextureClass,(width,height,format,MIP_LEVELS_1,TextureClass::POOL_DEFAULT,true));
 
 	// 3dfx drivers are lying in the CheckDeviceFormat call and claiming
 	// that they support render targets!
-	if (tex->Peek_D3D_Base_Texture() == NULL) 
+	if (tex->Peek_D3D_Base_Texture() == NULL)
 	{
-		WWDEBUG_SAY(("DX8Wrapper - Render target creation failed!\r\n"));
+		WWDEBUG_SAY(("DX8Wrapper - Render target creation failed!"));
 		REF_PTR_RELEASE(tex);
 	}
 
-	return tex;
-}
+	*target=tex;
 
+	// attempt to create the depth stencil buffer
+	*depth_buffer=NEW_REF
+	(
+		ZTextureClass,
+		(
+			width,
+			height,
+			zformat,
+			MIP_LEVELS_1,
+			TextureClass::POOL_DEFAULT
+		)
+	);
+}
 
-void
-DX8Wrapper::Set_Render_Target
-(TextureClass * texture)
+/*!
+ * Set render target
+ * KM Added optional custom z target
+ */
+void DX8Wrapper::Set_Render_Target_With_Z
+(
+	TextureClass* texture,
+	ZTextureClass* ztexture
+)
 {
-	WWASSERT(texture != NULL);
-	SurfaceClass * surf = texture->Get_Surface_Level();
-	WWASSERT(surf != NULL);
-	Set_Render_Target(surf->Peek_D3D_Surface()); 
-	REF_PTR_RELEASE(surf);
+	WWASSERT(texture!=NULL);
+	IDirect3DSurface8 * d3d_surf = texture->Get_D3D_Surface_Level();
+	WWASSERT(d3d_surf != NULL);
+
+	IDirect3DSurface8* d3d_zbuf=NULL;
+	if (ztexture!=NULL)
+	{
+
+		d3d_zbuf=ztexture->Get_D3D_Surface_Level();
+		WWASSERT(d3d_zbuf!=NULL);
+		Set_Render_Target(d3d_surf,d3d_zbuf);
+		d3d_zbuf->Release();
+	}
+	else
+	{
+		Set_Render_Target(d3d_surf,true);
+	}
+	d3d_surf->Release();
+
+	IsRenderToTexture = true;
 }
 
 void
@@ -2752,7 +3154,7 @@ DX8Wrapper::Set_Render_Target(IDirect3DSwapChain8 *swap_chain)
 	//
 	//	Set this back buffer as the render targer
 	//
-	Set_Render_Target (render_target);
+	Set_Render_Target (render_target, true);
 
 	//
 	//	Release our hold on the back buffer
@@ -2768,50 +3170,71 @@ DX8Wrapper::Set_Render_Target(IDirect3DSwapChain8 *swap_chain)
 }
 
 void
-DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target)
+DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target, bool use_default_depth_buffer)
 {
+//#ifndef _XBOX
 	DX8_THREAD_ASSERT();
 	DX8_Assert();
 
-	//
-	//	We'll need the depth buffer later...
-	//
-	IDirect3DSurface8 *depth_buffer = NULL;
-	DX8CALL(GetDepthStencilSurface (&depth_buffer));
-
 	//
 	//	Should we restore the default render target set a new one?
 	//
-	if (render_target == NULL || render_target == DefaultRenderTarget) 
+	if (render_target == NULL || render_target == DefaultRenderTarget)
 	{
+		// If there is currently a custom render target, default must NOT be NULL.
+		if (CurrentRenderTarget)
+		{
+			WWASSERT(DefaultRenderTarget!=NULL);
+		}
 
 		//
 		//	Restore the default render target
 		//
-		if (DefaultRenderTarget != NULL) 
+		if (DefaultRenderTarget != NULL)
 		{
-			DX8CALL(SetRenderTarget (DefaultRenderTarget, depth_buffer));
+			DX8CALL(SetRenderTarget (DefaultRenderTarget, DefaultDepthBuffer));
 			DefaultRenderTarget->Release ();
 			DefaultRenderTarget = NULL;
+			if (DefaultDepthBuffer)
+			{
+				DefaultDepthBuffer->Release ();
+				DefaultDepthBuffer = NULL;
+			}
 		}
 
 		//
 		//	Release our hold on the "current" render target
 		//
-		if (CurrentRenderTarget != NULL) 
+		if (CurrentRenderTarget != NULL)
 		{
 			CurrentRenderTarget->Release ();
 			CurrentRenderTarget = NULL;
 		}
 
-	} 
-	else if (render_target != CurrentRenderTarget) 
+		if (CurrentDepthBuffer!=NULL)
+		{
+			CurrentDepthBuffer->Release();
+			CurrentDepthBuffer=NULL;
+		}
+
+	}
+	else if (render_target != CurrentRenderTarget)
 	{
+		WWASSERT(DefaultRenderTarget==NULL);
+
+		//
+		//	We'll need the depth buffer later...
+		//
+		if (DefaultDepthBuffer == NULL)
+		{
+//		IDirect3DSurface8 *depth_buffer = NULL;
+			DX8CALL(GetDepthStencilSurface (&DefaultDepthBuffer));
+		}
 
 		//
 		//	Get a pointer to the default render target (if necessary)
 		//
-		if (DefaultRenderTarget == NULL) 
+		if (DefaultRenderTarget == NULL)
 		{
 			DX8CALL(GetRenderTarget (&DefaultRenderTarget));
 		}
@@ -2819,38 +3242,166 @@ DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target)
 		//
 		//	Release our hold on the old "current" render target
 		//
-		if (CurrentRenderTarget != NULL) 
+		if (CurrentRenderTarget != NULL)
 		{
 			CurrentRenderTarget->Release ();
 			CurrentRenderTarget = NULL;
 		}
 
+		if (CurrentDepthBuffer!=NULL)
+		{
+			CurrentDepthBuffer->Release();
+			CurrentDepthBuffer=NULL;
+		}
+
 		//
 		//	Keep a copy of the current render target (for housekeeping)
 		//
 		CurrentRenderTarget = render_target;
 		WWASSERT (CurrentRenderTarget != NULL);
-		if (CurrentRenderTarget != NULL) 
+		if (CurrentRenderTarget != NULL)
 		{
 			CurrentRenderTarget->AddRef ();
 
 			//
 			//	Switch render targets
-			//			
-			DX8CALL(SetRenderTarget (CurrentRenderTarget, depth_buffer));
+			//
+			if (use_default_depth_buffer)
+			{
+				DX8CALL(SetRenderTarget (CurrentRenderTarget, DefaultDepthBuffer));
+			}
+			else
+			{
+				DX8CALL(SetRenderTarget (CurrentRenderTarget, NULL));
+			}
 		}
 	}
 
 	//
 	//	Free our hold on the depth buffer
 	//
-	if (depth_buffer != NULL) {
-		depth_buffer->Release ();
-		depth_buffer = NULL;
-	}
+//	if (depth_buffer != NULL) {
+//		depth_buffer->Release ();
+//		depth_buffer = NULL;
+//	}
 
 	IsRenderToTexture = false;
 	return ;
+//#endif // XBOX
+}
+
+
+//**********************************************************************************************
+//! Set render target with depth stencil buffer
+/*! KJM
+*/
+void DX8Wrapper::Set_Render_Target
+(
+	IDirect3DSurface8* render_target,
+	IDirect3DSurface8* depth_buffer
+)
+{
+//#ifndef _XBOX
+	DX8_THREAD_ASSERT();
+	DX8_Assert();
+
+	//
+	//	Should we restore the default render target set a new one?
+	//
+	if (render_target == NULL || render_target == DefaultRenderTarget)
+	{
+		// If there is currently a custom render target, default must NOT be NULL.
+		if (CurrentRenderTarget)
+		{
+			WWASSERT(DefaultRenderTarget!=NULL);
+		}
+
+		//
+		//	Restore the default render target
+		//
+		if (DefaultRenderTarget != NULL)
+		{
+			DX8CALL(SetRenderTarget (DefaultRenderTarget, DefaultDepthBuffer));
+			DefaultRenderTarget->Release ();
+			DefaultRenderTarget = NULL;
+			if (DefaultDepthBuffer)
+			{
+				DefaultDepthBuffer->Release ();
+				DefaultDepthBuffer = NULL;
+			}
+		}
+
+		//
+		//	Release our hold on the "current" render target
+		//
+		if (CurrentRenderTarget != NULL)
+		{
+			CurrentRenderTarget->Release ();
+			CurrentRenderTarget = NULL;
+		}
+
+		if (CurrentDepthBuffer!=NULL)
+		{
+			CurrentDepthBuffer->Release();
+			CurrentDepthBuffer=NULL;
+		}
+	}
+	else if (render_target != CurrentRenderTarget)
+	{
+		WWASSERT(DefaultRenderTarget==NULL);
+
+		//
+		//	We'll need the depth buffer later...
+		//
+		if (DefaultDepthBuffer == NULL)
+		{
+//		IDirect3DSurface8 *depth_buffer = NULL;
+			DX8CALL(GetDepthStencilSurface (&DefaultDepthBuffer));
+		}
+
+		//
+		//	Get a pointer to the default render target (if necessary)
+		//
+		if (DefaultRenderTarget == NULL)
+		{
+			DX8CALL(GetRenderTarget (&DefaultRenderTarget));
+		}
+
+		//
+		//	Release our hold on the old "current" render target
+		//
+		if (CurrentRenderTarget != NULL)
+		{
+			CurrentRenderTarget->Release ();
+			CurrentRenderTarget = NULL;
+		}
+
+		if (CurrentDepthBuffer!=NULL)
+		{
+			CurrentDepthBuffer->Release();
+			CurrentDepthBuffer=NULL;
+		}
+
+		//
+		//	Keep a copy of the current render target (for housekeeping)
+		//
+		CurrentRenderTarget = render_target;
+		CurrentDepthBuffer = depth_buffer;
+		WWASSERT (CurrentRenderTarget != NULL);
+		if (CurrentRenderTarget != NULL)
+		{
+			CurrentRenderTarget->AddRef ();
+			CurrentDepthBuffer->AddRef();
+
+			//
+			//	Switch render targets
+			//
+			DX8CALL(SetRenderTarget (CurrentRenderTarget, CurrentDepthBuffer));
+		}
+	}
+
+	IsRenderToTexture=true;
+//#endif // XBOX
 }
 
 
@@ -2913,7 +3464,7 @@ void DX8Wrapper::Set_Gamma(float gamma,float bright,float contrast,bool calibrat
 	DWORD flag=(calibrate?D3DSGR_CALIBRATE:D3DSGR_NO_CALIBRATION);
 
 	D3DGAMMARAMP ramp;
-	float			 limit;	
+	float			 limit;
 
 	// IML: I'm not really sure what the intent of the 'limit' variable is. It does not produce useful results for my purposes.
 	if (uselimit) {
@@ -2955,8 +3506,8 @@ void DX8Wrapper::Set_Gamma(float gamma,float bright,float contrast,bool calibrat
 */
 void DX8Wrapper::Apply_Default_State()
 {
-	SNAPSHOT_SAY(("DX8Wrapper::Apply_Default_State()\n"));
-	
+	SNAPSHOT_SAY(("DX8Wrapper::Apply_Default_State()"));
+
 	// only set states used in game
 	Set_DX8_Render_State(D3DRS_ZENABLE, TRUE);
 //	Set_DX8_Render_State(D3DRS_FILLMODE, D3DFILL_SOLID);
@@ -3048,7 +3599,7 @@ void DX8Wrapper::Apply_Default_State()
 		Set_DX8_Texture_Stage_State(i, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
 		Set_DX8_Texture_Stage_State(i, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
 		Set_DX8_Texture_Stage_State(i, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-	
+
 		/*Set_DX8_Texture_Stage_State(i, D3DTSS_BUMPENVMAT00, 0);
 		Set_DX8_Texture_Stage_State(i, D3DTSS_BUMPENVMAT01, 0);
 		Set_DX8_Texture_Stage_State(i, D3DTSS_BUMPENVMAT10, 0);
@@ -3057,7 +3608,7 @@ void DX8Wrapper::Apply_Default_State()
 		Set_DX8_Texture_Stage_State(i, D3DTSS_BUMPENVLOFFSET, 0);*/
 
 		Set_DX8_Texture_Stage_State(i, D3DTSS_TEXCOORDINDEX, i);
-		
+
 
 		Set_DX8_Texture_Stage_State(i, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
 		Set_DX8_Texture_Stage_State(i, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
@@ -3081,11 +3632,11 @@ void DX8Wrapper::Apply_Default_State()
 	VertexMaterialClass::Apply_Null();
 
 	for (unsigned index=0;index<4;++index) {
-		SNAPSHOT_SAY(("Clearing light %d to NULL\n",index));
+		SNAPSHOT_SAY(("Clearing light %d to NULL",index));
 		Set_DX8_Light(index,NULL);
 	}
 
-	// set up simple default TSS 
+	// set up simple default TSS
 	Vector4 vconst[MAX_VERTEX_SHADER_CONSTANTS];
 	memset(vconst,0,sizeof(Vector4)*MAX_VERTEX_SHADER_CONSTANTS);
 	Set_Vertex_Shader_Constant(0, vconst, MAX_VERTEX_SHADER_CONSTANTS);
@@ -3397,6 +3948,7 @@ void DX8Wrapper::Get_DX8_Texture_Stage_State_Value_Name(StringClass& name, D3DTE
 
 	case D3DTSS_TEXTURETRANSFORMFLAGS:
 		name=Get_DX8_Texture_Transform_Flag_Name(value);
+		break;
 
 	// Floating point values
 	case D3DTSS_MIPMAPLODBIAS:
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h
index dae6c6d1a77..f72ce2e13ee 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h
@@ -36,12 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8_WRAPPER_H
-#define DX8_WRAPPER_H
 
 #include "always.h"
 #include "dllist.h"
@@ -70,7 +65,7 @@
 #define	VALUE_NAME_RENDER_DEVICE_WINDOWED			"RenderDeviceWindowed"
 #define	VALUE_NAME_RENDER_DEVICE_TEXTURE_DEPTH		"RenderDeviceTextureDepth"
 
-const unsigned MAX_TEXTURE_STAGES=2;
+const unsigned MAX_TEXTURE_STAGES=8;
 const unsigned MAX_VERTEX_STREAMS=2;
 const unsigned MAX_VERTEX_SHADER_CONSTANTS=96;
 const unsigned MAX_PIXEL_SHADER_CONSTANTS=8;
@@ -354,6 +349,37 @@ class DX8Wrapper
 	** Resources
 	*/
 
+	static IDirect3DVolumeTexture8* _Create_DX8_Volume_Texture
+	(
+		unsigned int width,
+		unsigned int height,
+		unsigned int depth,
+		WW3DFormat format,
+		MipCountType mip_level_count,
+		D3DPOOL pool=D3DPOOL_MANAGED
+	);
+
+	static IDirect3DCubeTexture8* _Create_DX8_Cube_Texture
+	(
+		unsigned int width,
+		unsigned int height,
+		WW3DFormat format,
+		MipCountType mip_level_count,
+		D3DPOOL pool=D3DPOOL_MANAGED,
+		bool rendertarget=false
+	);
+
+
+	static IDirect3DTexture8* _Create_DX8_ZTexture
+	(
+		unsigned int width,
+		unsigned int height,
+		WW3DZFormat zformat,
+		MipCountType mip_level_count,
+		D3DPOOL pool=D3DPOOL_MANAGED
+	);
+
+
 	static IDirect3DTexture8 * _Create_DX8_Texture
 	(
 		unsigned int width,
@@ -441,15 +467,32 @@ class DX8Wrapper
 	static IDirect3DSwapChain8 *	Create_Additional_Swap_Chain (HWND render_window);
 
 	/*
-	** Render target interface
+	** Render target interface. If render target format is WW3D_FORMAT_UNKNOWN, current display format is used.
 	*/
-	static TextureClass *	Create_Render_Target (int width, int height, bool alpha=false);
-	
-	static void					Set_Render_Target (TextureBaseClass * texture);
-	static void					Set_Render_Target (IDirect3DSurface8 *render_target);
+	static TextureClass *	Create_Render_Target (int width, int height, WW3DFormat format = WW3D_FORMAT_UNKNOWN);
+
+	static void					Set_Render_Target (IDirect3DSurface8 *render_target, bool use_default_depth_buffer = false);
+	static void					Set_Render_Target (IDirect3DSurface8* render_target, IDirect3DSurface8* dpeth_buffer);
+
 	static void					Set_Render_Target (IDirect3DSwapChain8 *swap_chain);
 	static bool					Is_Render_To_Texture(void) { return IsRenderToTexture; }
 
+	// for depth map support KJM V
+	static void Create_Render_Target
+	(
+		int width,
+		int height,
+		WW3DFormat format,
+		WW3DZFormat zformat,
+		TextureClass** target,
+		ZTextureClass** depth_buffer
+	);
+	static void					Set_Render_Target_With_Z (TextureClass * texture, ZTextureClass* ztexture=NULL);
+
+	static void Set_Shadow_Map(int idx, ZTextureClass* ztex) { Shadow_Map[idx]=ztex; }
+	static ZTextureClass* Get_Shadow_Map(int idx) { return Shadow_Map[idx]; }
+	// for depth map support KJM ^
+
 	// shader system udpates KJM v
 	static void Apply_Default_State();
 
@@ -586,7 +629,7 @@ class DX8Wrapper
 	static int								TextureBitDepth;
 	static bool								IsWindowed;
 	static D3DFORMAT					DisplayFormat;
-	
+
 	static D3DMATRIX						old_world;
 	static D3DMATRIX						old_view;
 	static D3DMATRIX						old_prj;
@@ -602,6 +645,9 @@ class DX8Wrapper
 	static RenderInfoClass*				Render_Info;
 
 	static DWORD							Vertex_Processing_Behavior;
+
+	static ZTextureClass*				Shadow_Map[MAX_SHADOW_MAPS];
+
 	static Vector3							Ambient_Color;
 	// shader system updates KJM ^
 
@@ -636,7 +682,10 @@ class DX8Wrapper
 	static IDirect3DDevice8 *			D3DDevice;				//d3ddevice8;
 
 	static IDirect3DSurface8 *			CurrentRenderTarget;
+	static IDirect3DSurface8 *			CurrentDepthBuffer;
 	static IDirect3DSurface8 *			DefaultRenderTarget;
+	static IDirect3DSurface8 *			DefaultDepthBuffer;
+
 	static unsigned							DrawPolygonLowBoundLimit;
 
 	static bool								IsRenderToTexture;
@@ -701,11 +750,11 @@ WWINLINE void DX8Wrapper::_Set_DX8_Transform(D3DTRANSFORMSTATETYPE transform,con
 {
 	WWASSERT(transform<=D3DTS_WORLD);
 #if 0 // (gth) this optimization is breaking generals because they set the transform behind our backs.
-	if (m!=DX8Transforms[transform]) 
+	if (m!=DX8Transforms[transform])
 #endif
 	{
 		DX8Transforms[transform]=m;
-		SNAPSHOT_SAY(("DX8 - SetTransform %d [%f,%f,%f,%f][%f,%f,%f,%f][%f,%f,%f,%f][%f,%f,%f,%f]\n",transform,m[0][0],m[0][1],m[0][2],m[0][3],m[1][0],m[1][1],m[1][2],m[1][3],m[2][0],m[2][1],m[2][2],m[2][3],m[3][0],m[3][1],m[3][2],m[3][3]));
+		SNAPSHOT_SAY(("DX8 - SetTransform %d [%f,%f,%f,%f][%f,%f,%f,%f][%f,%f,%f,%f][%f,%f,%f,%f]",transform,m[0][0],m[0][1],m[0][2],m[0][3],m[1][0],m[1][1],m[1][2],m[1][3],m[2][0],m[2][1],m[2][2],m[2][3],m[3][0],m[3][1],m[3][2],m[3][3]));
 		DX8_RECORD_MATRIX_CHANGE();
 		DX8CALL(SetTransform(transform,(D3DMATRIX*)&m));
 	}
@@ -717,11 +766,11 @@ WWINLINE void DX8Wrapper::_Set_DX8_Transform(D3DTRANSFORMSTATETYPE transform,con
 	WWASSERT(transform<=D3DTS_WORLD);
 	Matrix4x4 mtx(m);
 #if 0 // (gth) this optimization is breaking generals because they set the transform behind our backs.
-	if (mtx!=DX8Transforms[transform]) 
+	if (mtx!=DX8Transforms[transform])
 #endif
 	{
 		DX8Transforms[transform]=mtx;
-		SNAPSHOT_SAY(("DX8 - SetTransform %d [%f,%f,%f,%f][%f,%f,%f,%f][%f,%f,%f,%f]\n",transform,m[0][0],m[0][1],m[0][2],m[0][3],m[1][0],m[1][1],m[1][2],m[1][3],m[2][0],m[2][1],m[2][2],m[2][3]));
+		SNAPSHOT_SAY(("DX8 - SetTransform %d [%f,%f,%f,%f][%f,%f,%f,%f][%f,%f,%f,%f]",transform,m[0][0],m[0][1],m[0][2],m[0][3],m[1][0],m[1][1],m[1][2],m[1][3],m[2][0],m[2][1],m[2][2],m[2][3]));
 		DX8_RECORD_MATRIX_CHANGE();
 		DX8CALL(SetTransform(transform,(D3DMATRIX*)&m));
 	}
@@ -787,7 +836,7 @@ WWINLINE void DX8Wrapper::Set_DX8_Material(const D3DMATERIAL8* mat)
 {
 	DX8_RECORD_MATERIAL_CHANGE();
 	WWASSERT(mat);
-	SNAPSHOT_SAY(("DX8 - SetMaterial\n"));
+	SNAPSHOT_SAY(("DX8 - SetMaterial"));
 	DX8CALL(SetMaterial(mat));
 }
 
@@ -798,13 +847,13 @@ WWINLINE void DX8Wrapper::Set_DX8_Light(int index, D3DLIGHT8* light)
 		DX8CALL(SetLight(index,light));
 		DX8CALL(LightEnable(index,TRUE));
 		CurrentDX8LightEnables[index]=true;
-		SNAPSHOT_SAY(("DX8 - SetLight %d\n",index));
+		SNAPSHOT_SAY(("DX8 - SetLight %d",index));
 	}
 	else if (CurrentDX8LightEnables[index]) {
 		DX8_RECORD_LIGHT_CHANGE();
 		CurrentDX8LightEnables[index]=false;
 		DX8CALL(LightEnable(index,FALSE));
-		SNAPSHOT_SAY(("DX8 - DisableLight %d\n",index));
+		SNAPSHOT_SAY(("DX8 - DisableLight %d",index));
 	}
 }
 
@@ -817,9 +866,9 @@ WWINLINE void DX8Wrapper::Set_DX8_Render_State(D3DRENDERSTATETYPE state, unsigne
 	if (WW3D::Is_Snapshot_Activated()) {
 		StringClass value_name(0,true);
 		Get_DX8_Render_State_Value_Name(value_name,state,value);
-		SNAPSHOT_SAY(("DX8 - SetRenderState(state: %s, value: %s)\n",
+		SNAPSHOT_SAY(("DX8 - SetRenderState(state: %s, value: %s)",
 			Get_DX8_Render_State_Name(state),
-			value_name));
+			value_name.str()));
 	}
 #endif
 
@@ -846,10 +895,10 @@ WWINLINE void DX8Wrapper::Set_DX8_Texture_Stage_State(unsigned stage, D3DTEXTURE
 	if (WW3D::Is_Snapshot_Activated()) {
 		StringClass value_name(0,true);
 		Get_DX8_Texture_Stage_State_Value_Name(value_name,state,value);
-		SNAPSHOT_SAY(("DX8 - SetTextureStageState(stage: %d, state: %s, value: %s)\n",
+		SNAPSHOT_SAY(("DX8 - SetTextureStageState(stage: %d, state: %s, value: %s)",
 			stage,
 			Get_DX8_Texture_Stage_State_Name(state),
-			value_name));
+			value_name.str()));
 	}
 #endif
 
@@ -867,7 +916,7 @@ WWINLINE void DX8Wrapper::Set_DX8_Texture(unsigned int stage, IDirect3DBaseTextu
 
 	if (Textures[stage]==texture) return;
 
-	SNAPSHOT_SAY(("DX8 - SetTexture(%x) \n",texture));
+	SNAPSHOT_SAY(("DX8 - SetTexture(%x) ",texture));
 
 	if (Textures[stage]) Textures[stage]->Release();
 	Textures[stage] = texture;
@@ -1138,7 +1187,7 @@ WWINLINE void DX8Wrapper::Set_Shader(const ShaderClass& shader)
 #ifdef MESH_RENDER_SNAPSHOT_ENABLED
 	StringClass str;
 #endif
-	SNAPSHOT_SAY(("DX8Wrapper::Set_Shader(%s)\n",shader.Get_Description(str)));
+	SNAPSHOT_SAY(("DX8Wrapper::Set_Shader(%s)",shader.Get_Description(str).str()));
 }
 
 
@@ -1240,7 +1289,7 @@ WWINLINE void DX8Wrapper::Get_Transform(D3DTRANSFORMSTATETYPE transform, Matrix4
 
 WWINLINE const D3DLIGHT8& DX8Wrapper::Peek_Light(unsigned index)
 {
-	return render_state.Lights[index];;
+	return render_state.Lights[index];
 }
 
 WWINLINE bool DX8Wrapper::Is_Light_Enabled(unsigned index)
@@ -1272,7 +1321,7 @@ WWINLINE void DX8Wrapper::Set_Render_State(const RenderStateStruct& state)
 }
 
 WWINLINE void DX8Wrapper::Release_Render_State()
-{	
+{
 	if (render_state.index_buffer) {
 		render_state.index_buffer->Release_Engine_Ref();
 	}
@@ -1342,6 +1391,3 @@ WWINLINE RenderStateStruct& RenderStateStruct::operator= (const RenderStateStruc
 
 	return *this;
 }
-
-
-#endif
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp
index f95ee66157e..fa9af0c8db7 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp
@@ -17,37 +17,36 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/hanimmgr.cpp 1     1/22/01 3:36p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/hanimmgr.cpp                           $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 1/08/01 10:04a                                              $* 
- *                                                                                             * 
- *                    $Revision:: 1                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   HAnimManagerClass::HAnimManagerClass -- constructor                                       * 
- *   HAnimManagerClass::~HAnimManagerClass -- destructor                                       * 
- *   HAnimManagerClass::Load_Anim -- loads a set of motion data from a file                    * 
- *   HAnimManagerClass::Get_Anim_ID -- looks up the ID of a named Hierarchy Animation          * 
- *   HAnimManagerClass::Get_Anim -- returns a pointer to the specified animation data          * 
- *   HAnimManagerClass::Get_Anim -- returns a pointer to the specified Hierarchy Animation     * 
- *   HAnimManagerClass::Free -- de-allocate all memory in use                                  * 
- *   HAnimManagerClass::Free_All_Anims -- de-allocate all currently loaded animations          * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/hanimmgr.cpp                           $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 1/08/01 10:04a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   HAnimManagerClass::HAnimManagerClass -- constructor                                       *
+ *   HAnimManagerClass::~HAnimManagerClass -- destructor                                       *
+ *   HAnimManagerClass::Load_Anim -- loads a set of motion data from a file                    *
+ *   HAnimManagerClass::Get_Anim_ID -- looks up the ID of a named Hierarchy Animation          *
+ *   HAnimManagerClass::Get_Anim -- returns a pointer to the specified animation data          *
+ *   HAnimManagerClass::Get_Anim -- returns a pointer to the specified Hierarchy Animation     *
+ *   HAnimManagerClass::Free -- de-allocate all memory in use                                  *
+ *   HAnimManagerClass::Free_All_Anims -- de-allocate all currently loaded animations          *
  *   HAnimManagerClass::Load_Raw_Anim -- Load a raw anim                                       *
  *   HAnimManagerClass::Load_Compressed_Anim -- load a compressed animation                    *
  *	  HAnimManagerClass::Add_Anim -- Adds an externally created animation to the manager		  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "hanimmgr.h"
-#include <string.h>
 #include "hanim.h"
 #include "hrawanim.h"
 #include "hcanim.h"
@@ -58,19 +57,19 @@
 #include "animatedsoundmgr.h"
 
 
-/*********************************************************************************************** 
- * HAnimManagerClass::HAnimManagerClass -- constructor                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::HAnimManagerClass -- constructor                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-HAnimManagerClass::HAnimManagerClass(void) 
+HAnimManagerClass::HAnimManagerClass(void)
 {
 	// Create the hash tables
 	AnimPtrTable = W3DNEW HashTableClass( 2048 );
@@ -78,17 +77,17 @@ HAnimManagerClass::HAnimManagerClass(void)
 }
 
 
-/*********************************************************************************************** 
- * HAnimManagerClass::~HAnimManagerClass -- destructor                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::~HAnimManagerClass -- destructor                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HAnimManagerClass::~HAnimManagerClass(void)
 {
@@ -103,23 +102,23 @@ HAnimManagerClass::~HAnimManagerClass(void)
 }
 
 
-/*********************************************************************************************** 
- * HAnimManagerClass::Load_Anim -- loads a set of motion data from a file                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::Load_Anim -- loads a set of motion data from a file                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HAnimManagerClass::Load_Anim(ChunkLoadClass & cload)
 {
 	WWMEMLOG(MEM_ANIMATION);
 
-	switch (cload.Cur_Chunk_ID()) 
+	switch (cload.Cur_Chunk_ID())
 	{
 	case W3D_CHUNK_ANIMATION:
 		return Load_Raw_Anim(cload);
@@ -266,17 +265,17 @@ int HAnimManagerClass::Load_Compressed_Anim(ChunkLoadClass & cload)
 	return 1;
 }
 
-/*********************************************************************************************** 
- * HAnimManagerClass::Peek_Anim -- returns a pointer to the specified animation data            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::Peek_Anim -- returns a pointer to the specified animation data            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HAnimClass * HAnimManagerClass::Peek_Anim(const char * name)
 {
@@ -284,20 +283,20 @@ HAnimClass * HAnimManagerClass::Peek_Anim(const char * name)
 }
 
 
-/*********************************************************************************************** 
- * HAnimManagerClass::Get_Anim -- returns a pointer to the specified animation data            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::Get_Anim -- returns a pointer to the specified animation data            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HAnimClass * HAnimManagerClass::Get_Anim(const char * name)
-{	
+{
 	HAnimClass * anim = Peek_Anim( name );
 	if ( anim != NULL ) {
 		anim->Add_Ref();
@@ -306,17 +305,17 @@ HAnimClass * HAnimManagerClass::Get_Anim(const char * name)
 }
 
 
-/*********************************************************************************************** 
- * HAnimManagerClass::Free_All_Anims -- de-allocate all currently loaded animations            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::Free_All_Anims -- de-allocate all currently loaded animations            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HAnimManagerClass::Free_All_Anims(void)
 {
@@ -330,18 +329,18 @@ void HAnimManagerClass::Free_All_Anims(void)
 	// Then clear the table
 	AnimPtrTable->Reset();
 }
-	
-/*********************************************************************************************** 
- * HAnimManagerClass::Free_All_Anims_With_Exclusion_List -- release animations not in the list * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   12/12/2002 GH  : Created.                                                                 * 
+
+/***********************************************************************************************
+ * HAnimManagerClass::Free_All_Anims_With_Exclusion_List -- release animations not in the list *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/12/2002 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HAnimManagerClass::Free_All_Anims_With_Exclusion_List(const W3DExclusionListClass & exclusion_list)
 {
@@ -351,29 +350,29 @@ void HAnimManagerClass::Free_All_Anims_With_Exclusion_List(const W3DExclusionLis
 		HAnimClass *anim = it.Get_Current_Anim();
 
 		if ((anim->Num_Refs() == 1) && (exclusion_list.Is_Excluded(anim) == false)) {
-			//WWDEBUG_SAY(("deleting HAnim %s\n",anim->Get_Name()));
+			//WWDEBUG_SAY(("deleting HAnim %s",anim->Get_Name()));
 			AnimPtrTable->Remove(anim);
 			anim->Release_Ref();
 		}
 		//else
 		//{
-		//	WWDEBUG_SAY(("keeping HAnim %s (ref %d)\n",anim->Get_Name(),anim->Num_Refs()));
+		//	WWDEBUG_SAY(("keeping HAnim %s (ref %d)",anim->Get_Name(),anim->Num_Refs()));
 		//}
 	}
 }
 
 
-/*********************************************************************************************** 
- * HAnimManagerClass::Create_Asset_List -- Create a list of the W3D files that are loaded      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   12/12/2002 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::Create_Asset_List -- Create a list of the W3D files that are loaded      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/12/2002 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HAnimManagerClass::Create_Asset_List(DynamicVectorClass<StringClass> & exclusion_list)
 {
@@ -385,24 +384,24 @@ void HAnimManagerClass::Create_Asset_List(DynamicVectorClass<StringClass> & excl
 		// Anims are named in the format: <skeleton>.<animname>
 		const char * anim_name = anim->Get_Name();
 		const char * filename = strchr(anim_name,'.');
-		if (filename != NULL) {	
+		if (filename != NULL) {
 			exclusion_list.Add(StringClass(filename+1));
 		}
 	}
 }
 
 
-/*********************************************************************************************** 
+/***********************************************************************************************
  * HAnimManagerClass::Add_Anim -- Adds an externally created animation to the manager			  *
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/31/2000 PDS  : Created.                                                                * 
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/31/2000 PDS  : Created.                                                                *
  *=============================================================================================*/
 bool HAnimManagerClass::Add_Anim(HAnimClass *new_anim)
 {
@@ -450,8 +449,8 @@ void	HAnimManagerClass::Reset_Missing( void )
 /*
 ** Iterator converter from HashableClass to HAnimClass
 */
-HAnimClass * HAnimManagerIterator::Get_Current_Anim( void )	
-{ 
-	return (HAnimClass *)Get_Current(); 
+HAnimClass * HAnimManagerIterator::Get_Current_Anim( void )
+{
+	return (HAnimClass *)Get_Current();
 }
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h
index a2ce231d51f..fbe3a47b2e8 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h
@@ -17,36 +17,30 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/hanimmgr.h 1     1/22/01 3:36p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/hanimmgr.h                             $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 1/08/01 10:04a                                              $* 
- *                                                                                             * 
- *                    $Revision:: 1                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/hanimmgr.h                             $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 1/08/01 10:04a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HANIMMGR_H
-#define HANIMMGR_H
 
 #include "always.h"
 #include "hash.h"
 #include "wwstring.h"
-#include "Vector.H"
+#include "Vector.h"
 
 class HAnimClass;
 class ChunkLoadClass;
@@ -113,5 +107,3 @@ class HAnimManagerIterator : public HashTableIteratorClass {
 	HAnimManagerIterator( HAnimManagerClass & manager ) : HashTableIteratorClass( *manager.AnimPtrTable ) {}
 	HAnimClass * Get_Current_Anim( void );
 };
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
index f2e720560d8..2287e2a6dc1 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
@@ -128,12 +128,11 @@
 
 #include "hlod.h"
 #include "assetmgr.h"
-#include "hmdldef.H"
+#include "hmdldef.h"
 #include "w3derr.h"
 #include "chunkio.h"
 #include "predlod.h"
 #include "rinfo.h"
-#include <string.h>
 #include <win.h>
 #include "sphere.h"
 #include "boxrobj.h"
@@ -145,14 +144,14 @@
 HLodLoaderClass			_HLodLoader;
 
 
-/** 
+/**
 ** ProxyRecordClass
 ** This is a structure that contains the data describing a single "proxy" object.  These
 ** are used for application purposes and simply provide a way for the assets to associate
 ** a string with a bone index.
 */
 class ProxyRecordClass
-{	
+{
 public:
 	ProxyRecordClass(void) : BoneIndex(0)
 	{
@@ -165,7 +164,7 @@ class ProxyRecordClass
 	void					Init(const W3dHLodSubObjectStruct & w3d_data)
 	{
 		BoneIndex = w3d_data.BoneIndex;
-		strncpy(Name,w3d_data.Name,sizeof(Name));
+		strlcpy(Name,w3d_data.Name,sizeof(Name));
 	}
 
 	int					Get_Bone_Index(void)		{ return BoneIndex; }
@@ -224,9 +223,9 @@ PrototypeClass *HLodLoaderClass::Load_W3D( ChunkLoadClass &cload )
 		delete def;
 		return NULL;
 	} else {
-		// ok, accept this model! 
+		// ok, accept this model!
 		HLodPrototypeClass *proto = W3DNEW HLodPrototypeClass(def);
-		return proto;	
+		return proto;
 	}
 	return NULL;
 }
@@ -248,9 +247,9 @@ PrototypeClass *HLodLoaderClass::Load_W3D( ChunkLoadClass &cload )
  * HISTORY:                                                                                    *
  *   1/26/00    gth : Created.                                                                 *
  *=============================================================================================*/
-RenderObjClass * HLodPrototypeClass::Create(void)			
-{ 
-	HLodClass * hlod = NEW_REF( HLodClass , ( *Definition ) ); 
+RenderObjClass * HLodPrototypeClass::Create(void)
+{
+	HLodClass * hlod = NEW_REF( HLodClass , ( *Definition ) );
 	return hlod;
 }
 
@@ -270,7 +269,7 @@ RenderObjClass * HLodPrototypeClass::Create(void)
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-HLodDefClass::HLodDefClass(void) : 
+HLodDefClass::HLodDefClass(void) :
 	Name(NULL),
 	HierarchyTreeName(NULL),
 	LodCount(0),
@@ -337,20 +336,14 @@ HLodDefClass::~HLodDefClass(void)
  *=============================================================================================*/
 void HLodDefClass::Free(void)
 {
-	if (Name) {
-		::free(Name);
-		Name = NULL;
-	}
+	::free(Name);
+	Name = NULL;
 
-	if (HierarchyTreeName) {
-		::free(HierarchyTreeName);
-		HierarchyTreeName = NULL;
-	}
+	::free(HierarchyTreeName);
+	HierarchyTreeName = NULL;
 
-	if (Lod) {
-		delete[] Lod;
-		Lod = NULL;
-	}
+	delete[] Lod;
+	Lod = NULL;
 	LodCount = 0;
 
 	REF_PTR_RELEASE(ProxyArray);
@@ -387,7 +380,7 @@ void HLodDefClass::Initialize(HLodClass &src_lod)
 	LodCount = src_lod.Get_LOD_Count ();
 	WWASSERT (LodCount > 0);
 	if (LodCount > 0) {
-		
+
 		// Allocate an array large enough to hold all the LODs and
 		// loop through each LOD.
 		Lod = W3DNEWARRAY SubObjectArrayClass[LodCount];
@@ -396,13 +389,13 @@ void HLodDefClass::Initialize(HLodClass &src_lod)
 			// Fill in the maximum screen size for this LOD
 			Lod[index].MaxScreenSize = src_lod.Get_Max_Screen_Size (index);
 			Lod[index].ModelCount = src_lod.Get_Lod_Model_Count (index);
-			
-			// Loop through all the models that compose this LOD and generate a 
+
+			// Loop through all the models that compose this LOD and generate a
 			// list of model's and the bones they live on
 			char **model_names = W3DNEWARRAY char *[Lod[index].ModelCount];
 			int *bone_indicies = W3DNEWARRAY int[Lod[index].ModelCount];
 			for (int model_index = 0; model_index < Lod[index].ModelCount; model_index ++) {
-				
+
 				// Record information about this model (if possible)
 				RenderObjClass *prender_obj = src_lod.Peek_Lod_Model (index, model_index);
 				if (prender_obj != NULL) {
@@ -419,7 +412,7 @@ void HLodDefClass::Initialize(HLodClass &src_lod)
 			Lod[index].BoneIndex = bone_indicies;
 		}
 	}
-	
+
 	return;
 }
 
@@ -443,11 +436,11 @@ WW3DErrorType HLodDefClass::Save(ChunkSaveClass & csave)
 
 	// Begin a chunk that identifies an aggregate
 	if (csave.Begin_Chunk (W3D_CHUNK_HLOD) == TRUE) {
-		
+
 		// Attempt to save the different sections of the aggregate definition
 		if ((Save_Header (csave) == WW3D_ERROR_OK) &&
 			 (Save_Lod_Array (csave) == WW3D_ERROR_OK)) {
-			
+
 			// Success!
 			ret_val = WW3D_ERROR_OK;
 		}
@@ -480,25 +473,25 @@ WW3DErrorType HLodDefClass::Save_Header(ChunkSaveClass &csave)
 
 	// Begin a chunk that identifies the aggregate
 	if (csave.Begin_Chunk (W3D_CHUNK_HLOD_HEADER) == TRUE) {
-		
+
 		// Fill the header structure
 		W3dHLodHeaderStruct header = { 0 };
 		header.Version = W3D_CURRENT_HLOD_VERSION;
 		header.LodCount = LodCount;
-		
+
 		// Copy the name to the header
 		::lstrcpyn (header.Name, Name, sizeof (header.Name));
 		header.Name[sizeof (header.Name) - 1] = 0;
 
 		// Copy the hierarchy tree name to the header
 		::lstrcpyn (header.HierarchyName, HierarchyTreeName, sizeof (header.HierarchyName));
-		header.HierarchyName[sizeof (header.HierarchyName) - 1] = 0;		
+		header.HierarchyName[sizeof (header.HierarchyName) - 1] = 0;
 
 		// Write the header out to the chunk
 		if (csave.Write (&header, sizeof (header)) == sizeof (header)) {
 
 			// Success!
-			ret_val = WW3D_ERROR_OK;			
+			ret_val = WW3D_ERROR_OK;
 		}
 
 		// End the header chunk
@@ -528,7 +521,7 @@ WW3DErrorType HLodDefClass::Save_Lod_Array(ChunkSaveClass &csave)
 	bool success = true;
 	for (int lod_index = 0;
 		  (lod_index < LodCount) && success;
-		  lod_index ++) {		
+		  lod_index ++) {
 		success = Lod[lod_index].Save_W3D (csave);
 	}
 
@@ -577,18 +570,18 @@ WW3DErrorType HLodDefClass::Save_Aggregate_Array(ChunkSaveClass & csave)
  *=============================================================================================*/
 WW3DErrorType HLodDefClass::Load_W3D(ChunkLoadClass & cload)
 {
-	/* 
+	/*
 	** First make sure we release any memory in use
 	*/
 	Free();
 
-	if (read_header(cload) == FALSE) {        
+	if (read_header(cload) == FALSE) {
 	  return WW3D_ERROR_LOAD_FAILED;
 	}
 
 	/*
 	**	Loop through all the LODs and read the info from its chunk
-	*/    
+	*/
 	for (int iLOD = 0; iLOD < LodCount; iLOD ++) {
 
 		/*
@@ -611,7 +604,7 @@ WW3DErrorType HLodDefClass::Load_W3D(ChunkLoadClass & cload)
 	** Parse the rest of the chunks
 	*/
 	while (cload.Open_Chunk()) {
-		switch(cload.Cur_Chunk_ID()) 
+		switch(cload.Cur_Chunk_ID())
 		{
 			case W3D_CHUNK_HLOD_AGGREGATE_ARRAY:
 				Aggregates.Load_W3D(cload);
@@ -622,7 +615,7 @@ WW3DErrorType HLodDefClass::Load_W3D(ChunkLoadClass & cload)
 		}
 		cload.Close_Chunk();
 	}
-	
+
 	return WW3D_ERROR_OK;
 }
 
@@ -694,7 +687,7 @@ bool HLodDefClass::read_proxy_array(ChunkLoadClass & cload)
 
 	W3dHLodArrayHeaderStruct header;
 	if (cload.Read(&header,sizeof(header)) != sizeof(header)) return false;
-	
+
 	if (!cload.Close_Chunk()) return false;
 
 	ProxyArray = NEW_REF(ProxyArrayClass,(header.ModelCount));
@@ -727,11 +720,11 @@ bool HLodDefClass::read_proxy_array(ChunkLoadClass & cload)
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-HLodDefClass::SubObjectArrayClass::SubObjectArrayClass(void) : 
+HLodDefClass::SubObjectArrayClass::SubObjectArrayClass(void) :
 	MaxScreenSize(NO_MAX_SCREEN_SIZE),
 	ModelCount(0),
 	ModelName(NULL),
-	BoneIndex(NULL) 
+	BoneIndex(NULL)
 {
 }
 
@@ -769,7 +762,7 @@ HLodDefClass::SubObjectArrayClass::~SubObjectArrayClass(void)
 void HLodDefClass::SubObjectArrayClass::Reset(void)
 {
 	MaxScreenSize = NO_MAX_SCREEN_SIZE;
-	
+
 	if (ModelName != NULL) {
 		for (int imodel=0; imodel<ModelCount;imodel++) {
 			free(ModelName[imodel]);
@@ -777,10 +770,9 @@ void HLodDefClass::SubObjectArrayClass::Reset(void)
 		delete[] ModelName;
 		ModelName = NULL;
 	}
-	if (BoneIndex != NULL) {
-		delete[] BoneIndex;
-		BoneIndex = NULL;
-	}
+
+	delete[] BoneIndex;
+	BoneIndex = NULL;
 
 	ModelCount = 0;
 }
@@ -805,14 +797,17 @@ bool HLodDefClass::SubObjectArrayClass::Load_W3D(ChunkLoadClass & cload)
 	*/
 	if (!cload.Open_Chunk()) return false;
 	if (cload.Cur_Chunk_ID() != W3D_CHUNK_HLOD_SUB_OBJECT_ARRAY_HEADER) return false;
-	
+
 	W3dHLodArrayHeaderStruct header;
 	if (cload.Read(&header,sizeof(header)) != sizeof(header)) return false;
-	
+
 	if (!cload.Close_Chunk()) return false;
 
 	ModelCount = header.ModelCount;
 	MaxScreenSize = header.MaxScreenSize;
+
+	DEBUG_ASSERTCRASH(ModelName == NULL, ("HLodDefClass::SubObjectArrayClass::Load_W3D: Leaking ModelName"));
+	DEBUG_ASSERTCRASH(BoneIndex == NULL, ("HLodDefClass::SubObjectArrayClass::Load_W3D: Leaking BoneIndex"));
 	ModelName = W3DNEWARRAY char * [ModelCount];
 	BoneIndex = W3DNEWARRAY int [ModelCount];
 
@@ -849,7 +844,7 @@ bool HLodDefClass::SubObjectArrayClass::Load_W3D(ChunkLoadClass & cload)
 bool HLodDefClass::SubObjectArrayClass::Save_W3D(ChunkSaveClass &csave)
 {
 	// Assume error
-	bool ret_val = false;	
+	bool ret_val = false;
 
 	// Begin a chunk that identifies the LOD array
 	if (csave.Begin_Chunk (W3D_CHUNK_HLOD_LOD_ARRAY) == TRUE) {
@@ -860,7 +855,7 @@ bool HLodDefClass::SubObjectArrayClass::Save_W3D(ChunkSaveClass &csave)
 			W3dHLodArrayHeaderStruct header = { 0 };
 			header.ModelCount = ModelCount;
 			header.MaxScreenSize = MaxScreenSize;
-			
+
 			// Write the LOD header structure out to the chunk
 			ret_val = (csave.Write (&header, sizeof (header)) == sizeof (header));
 
@@ -874,14 +869,14 @@ bool HLodDefClass::SubObjectArrayClass::Save_W3D(ChunkSaveClass &csave)
 			for (int index = 0;
 				  (index < ModelCount) && ret_val;
 				  index ++) {
-			
+
 				// Save this LOD sub-obj to the chunk
 				ret_val &= (csave.Begin_Chunk (W3D_CHUNK_HLOD_SUB_OBJECT) == TRUE);
 				if (ret_val) {
-					
+
 					W3dHLodSubObjectStruct info = { 0 };
 					info.BoneIndex = BoneIndex[index];
-					
+
 					// Copy this model name into the structure
 					::lstrcpyn (info.Name, ModelName[index], sizeof (info.Name));
 					info.Name[sizeof (info.Name) - 1] = 0;
@@ -891,7 +886,7 @@ bool HLodDefClass::SubObjectArrayClass::Save_W3D(ChunkSaveClass &csave)
 
 					// End the sub-obj chunk
 					csave.End_Chunk ();
-				}			
+				}
 			}
 		}
 
@@ -917,7 +912,7 @@ bool HLodDefClass::SubObjectArrayClass::Save_W3D(ChunkSaveClass &csave)
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-HLodClass::HLodClass(void) : 
+HLodClass::HLodClass(void) :
 	Animatable3DObjClass(NULL),
 	LodCount(0),
 	CurLod(0),
@@ -945,7 +940,7 @@ HLodClass::HLodClass(void) :
  * HISTORY:                                                                                    *
  *   1/26/00    gth : Created.                                                                 *
  *=============================================================================================*/
-HLodClass::HLodClass(const HLodClass & src) : 
+HLodClass::HLodClass(const HLodClass & src) :
 	Animatable3DObjClass(src),
 	LodCount(0),
 	CurLod(0),
@@ -994,10 +989,10 @@ HLodClass::HLodClass(const char * name,RenderObjClass ** lods,int count) :
 	WWASSERT(name != NULL);
 	WWASSERT(lods != NULL);
 	WWASSERT((count > 0) && (count < 256));
-	
+
 	// Set the name
 	Set_Name(name);
-	
+
 	LodCount = count;
 	WWASSERT(LodCount >= 1);
 	Lod = W3DNEWARRAY ModelArrayClass[LodCount];
@@ -1024,22 +1019,22 @@ HLodClass::HLodClass(const char * name,RenderObjClass ** lods,int count) :
 		RenderObjClass * lod_obj = lods[lod_index];
 		WWASSERT(lod_obj);
 
-		if (	(lod_obj->Class_ID() == RenderObjClass::CLASSID_HMODEL) || 
+		if (	(lod_obj->Class_ID() == RenderObjClass::CLASSID_HMODEL) ||
 				(lod_obj->Class_ID() == RenderObjClass::CLASSID_HLOD) ||
 				(lod_obj->Get_Num_Sub_Objects() > 1) ) {
-			
+
 			// here we insert all sub-objects of this render object into the current LOD array
 			while (lod_obj->Get_Num_Sub_Objects() > 0) {
 
 				RenderObjClass * sub_obj = lod_obj->Get_Sub_Object(0);
 				int boneindex = lod_obj->Get_Sub_Object_Bone_Index(sub_obj);
-				lod_obj->Remove_Sub_Object(sub_obj);				
-				
+				lod_obj->Remove_Sub_Object(sub_obj);
+
 				Add_Lod_Model(lod_index,sub_obj,boneindex);
 
 				sub_obj->Release_Ref();
 			}
-		
+
 		} else {
 
 			// just insert the render object as the sole member of the current LOD array.  This
@@ -1110,7 +1105,7 @@ HLodClass::HLodClass(const HLodDefClass & def) :
 
 	// Add Models to the ModelArrays
 	for (int ilod=0; ilod < def.LodCount; ilod++) {
-		
+
 		Lod[ilod].MaxScreenSize = def.Lod[ilod].MaxScreenSize;
 
 		for (int imodel=0; imodel < def.Lod[ilod].ModelCount; imodel++) {
@@ -1125,7 +1120,7 @@ HLodClass::HLodClass(const HLodDefClass & def) :
 	}
 
 	Recalculate_Static_LOD_Factors();
-	
+
 	// Add aggregates to this model
 	for (int iagg=0; iagg<def.Aggregates.ModelCount; iagg++) {
 		RenderObjClass * robj = WW3DAssetManager::Get_Instance()->Create_Render_Obj(def.Aggregates.ModelName[iagg]);
@@ -1168,7 +1163,7 @@ HLodClass::HLodClass(const HLodDefClass & def) :
  * HISTORY:                                                                                    *
  *   1/26/00    gth : Created.                                                                 *
  *=============================================================================================*/
-HLodClass::HLodClass(const HModelDefClass & def) : 
+HLodClass::HLodClass(const HModelDefClass & def) :
 	Animatable3DObjClass(def.BasePoseName),
 	LodCount(0),
 	CurLod(0),
@@ -1183,7 +1178,7 @@ HLodClass::HLodClass(const HModelDefClass & def) :
 {
 	// Set the name
 	Set_Name(def.Get_Name());
-	
+
 	// This is a "simple" HLod, only one LOD
 	LodCount = 1;
 	Lod = W3DNEWARRAY ModelArrayClass[1];
@@ -1198,7 +1193,7 @@ HLodClass::HLodClass(const HModelDefClass & def) :
 	// no lod size clamping
 	Lod[0].MaxScreenSize = NO_MAX_SCREEN_SIZE;
 
-	// create the sub-objects 
+	// create the sub-objects
 	int imodel;
 	for (imodel=0; imodel < def.SubObjectCount; ++imodel) {
 		RenderObjClass * robj = WW3DAssetManager::Get_Instance()->Create_Render_Obj(def.SubObjects[imodel].RenderObjName);
@@ -1259,16 +1254,16 @@ HLodClass & HLodClass::operator = (const HLodClass & that)
 		// Value has LodCount + 1 entries so PostIncrementValue can always use
 		// Value[CurLod + 1] (the last entry wil be AT_MAX_LOD).
 		Value = W3DNEWARRAY float[LodCount + 1];
-		WWASSERT(Value);		
-		
+		WWASSERT(Value);
+
 		for (lod=0; lod<LodCount;lod++) {
 			Lod[lod].Resize(that.Lod[lod].Count());
 			Lod[lod].MaxScreenSize = that.Lod[lod].MaxScreenSize;
 
 			for (model = 0; model < that.Lod[lod].Count(); model++) {
-				
+
 				ModelNodeClass newnode;
-				newnode.Model = that.Lod[lod][model].Model->Clone();	
+				newnode.Model = that.Lod[lod][model].Model->Clone();
 				newnode.BoneIndex = that.Lod[lod][model].BoneIndex;
 				newnode.Model->Set_Container(this);
 				if (Is_In_Scene()) {
@@ -1283,7 +1278,7 @@ HLodClass & HLodClass::operator = (const HLodClass & that)
 		for (model = 0; model < that.AdditionalModels.Count(); model++) {
 
 			ModelNodeClass newnode;
-			newnode.Model = that.AdditionalModels[model].Model->Clone();	
+			newnode.Model = that.AdditionalModels[model].Model->Clone();
 			newnode.BoneIndex = that.AdditionalModels[model].BoneIndex;
 			newnode.Model->Set_Container(this);
 			if (Is_In_Scene()) {
@@ -1355,29 +1350,25 @@ void HLodClass::Free(void)
 
 			RenderObjClass * robj = Lod[lod][model].Model;
 			Lod[lod][model].Model = NULL;
-			
+
 			WWASSERT(robj);
 			robj->Set_Container(NULL);
 			robj->Release_Ref();
-		
+
 		}
 
 		Lod[lod].Delete_All();
 	}
-	if (Lod != NULL) {
-		delete[] Lod;
-		Lod = NULL;
-	}
+
+	delete[] Lod;
+	Lod = NULL;
 	LodCount = 0;
 
-	if (Cost != NULL) {
-		delete[] Cost;
-		Cost = NULL;
-	}
-	if (Value != NULL) {
-		delete[] Value;
-		Value = NULL;
-	}
+	delete[] Cost;
+	Cost = NULL;
+
+	delete[] Value;
+	Value = NULL;
 
 	for (model = 0; model < AdditionalModels.Count(); model++) {
 		RenderObjClass * robj = AdditionalModels[model].Model;
@@ -1431,18 +1422,18 @@ void HLodClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
 	//
 	int count = Lod[LodCount - 1].Count ();
 	if (BoundingBoxIndex >= 0 && BoundingBoxIndex < count) {
-		
+
 		RenderObjClass *mesh = Lod[LodCount - 1][BoundingBoxIndex].Model;
 		if (mesh != NULL && mesh->Class_ID () == RenderObjClass::CLASSID_OBBOX) {
-			
+
 			OBBoxRenderObjClass *obbox_mesh = (OBBoxRenderObjClass *)mesh;
-			
+
 			//
 			//	Determine what the box's transform 'should' be this frame.
 			// Note:  We do this because some animation types don't update
 			// unless they are visible.
 			//
-			Matrix3D box_tm; 
+			Matrix3D box_tm;
 			Simple_Evaluate_Bone (Lod[LodCount - 1][BoundingBoxIndex].BoneIndex, &box_tm);
 
 			//
@@ -1457,7 +1448,7 @@ void HLodClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
 
 			box_to_hlod_tm.Transform_Center_Extent_AABox(	obbox_mesh->Get_Local_Center(),
 																			obbox_mesh->Get_Local_Extent(),
-																			&box.Center,&box.Extent);							
+																			&box.Center,&box.Extent);
 		}
 
 	} else {
@@ -1467,7 +1458,7 @@ void HLodClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
 
 
 /***********************************************************************************************
- * HLodClass::Get_Obj_Space_Bounding_Sphere -- Use the bounding box mesh to calculate a sphere.* 
+ * HLodClass::Get_Obj_Space_Bounding_Sphere -- Use the bounding box mesh to calculate a sphere.*
  *                                                                                             *
  * INPUT:                                                                                      *
  *                                                                                             *
@@ -1488,7 +1479,7 @@ void HLodClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
 
 
 /***********************************************************************************************
- * HLodClass::Get_Obj_Space_Bounding_Sphere -- Use the bounding box mesh to calculate a sphere.* 
+ * HLodClass::Get_Obj_Space_Bounding_Sphere -- Use the bounding box mesh to calculate a sphere.*
  *                                                                                             *
  * INPUT:                                                                                      *
  *                                                                                             *
@@ -1507,7 +1498,7 @@ const SphereClass &HLodClass::Get_Bounding_Sphere(void) const
 		//
 		SphereClass sphere;
 		Get_Obj_Space_Bounding_Sphere (sphere);
-		
+
 		//
 		//	Transform the sphere into world coords and return the sphere
 		//
@@ -1516,7 +1507,7 @@ const SphereClass &HLodClass::Get_Bounding_Sphere(void) const
 #else
 		Get_Transform().mulVector3(sphere.Center, CachedBoundingSphere.Center);
 #endif
-		CachedBoundingSphere.Radius = sphere.Radius;	
+		CachedBoundingSphere.Radius = sphere.Radius;
 	} else {
 		Animatable3DObjClass::Get_Bounding_Sphere ();
 	}
@@ -1546,7 +1537,7 @@ const AABoxClass &HLodClass::Get_Bounding_Box(void) const
 		//
 		AABoxClass box;
 		Get_Obj_Space_Bounding_Box (box);
-		
+
 		//
 		//	Transform the bounding box to world coordinates
 		//
@@ -1594,7 +1585,7 @@ void HLodClass::Set_Max_Screen_Size(int lod_index, float size)
 		// Ensure lod is no less than minimum allowed
 		if (CurLod < minlod) Set_LOD_Level(minlod);
 	}
-	
+
 	return ;
 }
 
@@ -1623,7 +1614,7 @@ float HLodClass::Get_Max_Screen_Size(int lod_index) const
 		// Get the screen size for this LOD
 		size = Lod[lod_index].MaxScreenSize;
 	}
-	
+
 	// Return the LOD's screen size to the caller
 	return size;
 }
@@ -1696,7 +1687,7 @@ int HLodClass::Get_Lod_Model_Count(int lod_index) const
 		// Get the number of models in this Lod
 		count = Lod[lod_index].Count ();
 	}
-	
+
 	// Return the number of models that compose this Lod
 	return count;
 }
@@ -1728,7 +1719,7 @@ RenderObjClass *HLodClass::Peek_Lod_Model(int lod_index, int model_index) const
 		// Get a pointer to the requested model
 		pmodel = Lod[lod_index][model_index].Model;
 	}
-	
+
 	// Return a pointer to the requested model
 	return pmodel;
 }
@@ -1763,7 +1754,7 @@ RenderObjClass *HLodClass::Get_Lod_Model(int lod_index, int model_index) const
 			pmodel->Add_Ref ();
 		}
 	}
-	
+
 	// Return the number of models that compose this Lod
 	return pmodel;
 }
@@ -1795,7 +1786,7 @@ int HLodClass::Get_Lod_Model_Bone(int lod_index, int model_index) const
 		// Get the bone that this model resides on
 		bone_index = Lod[lod_index][model_index].BoneIndex;
 	}
-	
+
 	// Return the bone that this model resides on
 	return bone_index;
 }
@@ -1844,7 +1835,7 @@ RenderObjClass * HLodClass::Peek_Additional_Model (int model_index) const
 		// Get a pointer to the requested model
 		pmodel = AdditionalModels[model_index].Model;
 	}
-	
+
 	// Return a pointer to the requested model
 	return pmodel;
 }
@@ -1878,7 +1869,7 @@ RenderObjClass * HLodClass::Get_Additional_Model (int model_index) const
 			pmodel->Add_Ref ();
 		}
 	}
-	
+
 	// Return a pointer to the requested model
 	return pmodel;
 }
@@ -1909,7 +1900,7 @@ int HLodClass::Get_Additional_Model_Bone (int model_index) const
 		// Get the bone that this model resides on
 		bone_index = AdditionalModels[model_index].BoneIndex;
 	}
-	
+
 	// Return the bone that this model resides on
 	return bone_index;
 }
@@ -1935,7 +1926,7 @@ bool HLodClass::Is_NULL_Lod_Included(void) const
 	if ((LodCount > 0) && (Lod[0][0].Model != NULL)) {
 		included = (Lod[0][0].Model->Class_ID () == RenderObjClass::CLASSID_NULL);
 	}
-	
+
 	// Return the true/false result code
 	return included;
 }
@@ -1963,7 +1954,7 @@ void HLodClass::Include_NULL_Lod(bool include)
 
 			RenderObjClass * robj = Lod[index][model].Model;
 			Lod[index][model].Model = NULL;
-			
+
 			WWASSERT(robj);
 			robj->Set_Container (NULL);
 			robj->Release_Ref ();
@@ -1971,7 +1962,7 @@ void HLodClass::Include_NULL_Lod(bool include)
 
 		// Resize the lod array
 		LodCount -= 1;
-		Lod[index].Delete_All ();		
+		Lod[index].Delete_All ();
 		ModelArrayClass *temp_lods = W3DNEWARRAY ModelArrayClass[LodCount];
 		for (index = 0; index < LodCount; index ++) {
 			temp_lods[index] = Lod[index + 1];
@@ -1990,7 +1981,7 @@ void HLodClass::Include_NULL_Lod(bool include)
 		Value = temp_value;
 		Cost = temp_cost;
 		CurLod = (CurLod >= LodCount) ? (LodCount - 1) : CurLod;
-		
+
 	} else if (include && (Is_NULL_Lod_Included () == false)) {
 
 		// Tag the NULL render object onto the end
@@ -2073,19 +2064,19 @@ bool HLodClass::Get_Proxy (int index, ProxyClass &proxy) const
 	bool retval = false;
 
 	if (ProxyArray != NULL) {
-		
+
 		//
 		//	Lookup the proxy's transform
 		//
 		HTree->Base_Update(Get_Transform());
 		Matrix3D transform = HTree->Get_Transform((*ProxyArray)[index].Get_Bone_Index());
 		Set_Hierarchy_Valid(false);
-		
+
 		//
 		//	Pass the data onto the proxy object
 		//
 		proxy.Set_Transform(transform);
-		proxy.Set_Name((*ProxyArray)[index].Get_Name());		
+		proxy.Set_Name((*ProxyArray)[index].Get_Name());
 		retval = true;
 
 	} else {
@@ -2221,7 +2212,7 @@ void HLodClass::Special_Render(SpecialRenderInfoClass & rinfo)
  *=============================================================================================*/
 void HLodClass::Set_Transform(const Matrix3D &m)
 {
-	Animatable3DObjClass::Set_Transform(m); 
+	Animatable3DObjClass::Set_Transform(m);
 	Set_Sub_Object_Transforms_Dirty(true);
 }
 
@@ -2240,7 +2231,7 @@ void HLodClass::Set_Transform(const Matrix3D &m)
  *=============================================================================================*/
 void HLodClass::Set_Position(const Vector3 &v)
 {
-	Animatable3DObjClass::Set_Position(v); 
+	Animatable3DObjClass::Set_Position(v);
 	Set_Sub_Object_Transforms_Dirty(true);
 }
 
@@ -2389,7 +2380,7 @@ int HLodClass::Remove_Sub_Object(RenderObjClass * removeme)
 		return 0;
 	}
 
-	// find the sub-object 
+	// find the sub-object
 	bool found = false;
 	bool iscurrent = false;
 
@@ -2418,7 +2409,7 @@ int HLodClass::Remove_Sub_Object(RenderObjClass * removeme)
 			iscurrent = true;
 		}
 	}
-	
+
 	if (found) {
 
 		// clear the object's container pointer
@@ -2490,7 +2481,7 @@ RenderObjClass * HLodClass::Get_Sub_Object_On_Bone(int index,int boneindex) cons
 	int count = 0;
 	for (int lod = 0; lod < LodCount; lod++) {
 		for (int model = 0; model < Lod[lod].Count(); model++) {
-			if (Lod[lod][model].BoneIndex == boneindex) {				
+			if (Lod[lod][model].BoneIndex == boneindex) {
 				if (count == index) {
 					Lod[lod][model].Model->Add_Ref();
 					return Lod[lod][model].Model;
@@ -2500,7 +2491,7 @@ RenderObjClass * HLodClass::Get_Sub_Object_On_Bone(int index,int boneindex) cons
 		}
 	}
 	for (int model = 0; model < AdditionalModels.Count(); model++) {
-		if (AdditionalModels[model].BoneIndex == boneindex) {			
+		if (AdditionalModels[model].BoneIndex == boneindex) {
 			if (count == index) {
 				AdditionalModels[model].Model->Add_Ref();
 				return AdditionalModels[model].Model;
@@ -2565,7 +2556,7 @@ int HLodClass::Add_Sub_Object_To_Bone(RenderObjClass * subobj,int boneindex)
 	if ((boneindex < 0) || (boneindex >= HTree->Num_Pivots())) return 0;
 
 	subobj->Set_LOD_Bias(LODBias);
-	
+
 	ModelNodeClass newnode;
 	newnode.Model = subobj;
 	newnode.Model->Add_Ref();
@@ -2583,7 +2574,7 @@ int HLodClass::Add_Sub_Object_To_Bone(RenderObjClass * subobj,int boneindex)
 	if (Is_In_Scene()) {
 		subobj->Notify_Added(Scene);
 	}
-	
+
 	return result;
 }
 
@@ -2602,7 +2593,7 @@ int HLodClass::Add_Sub_Object_To_Bone(RenderObjClass * subobj,int boneindex)
  *=============================================================================================*/
 void HLodClass::Set_Animation(void)
 {
-	Animatable3DObjClass::Set_Animation(); 
+	Animatable3DObjClass::Set_Animation();
 	Set_Sub_Object_Transforms_Dirty(true);
 }
 
@@ -2758,7 +2749,7 @@ bool HLodClass::Cast_OBBox(OBBoxCollisionTestClass & boxtest)
 	if (Are_Sub_Object_Transforms_Dirty ()) {
 		Update_Sub_Object_Transforms ();
 	}
-	
+
 	bool res = false;
 	int i;
 
@@ -3274,7 +3265,7 @@ void HLodClass::Scale(float scale)
 			Lod[lod][model].Model->Scale(scale);
 		}
 	}
-	
+
 	for (model = 0; model < AdditionalModels.Count(); model++) {
 		AdditionalModels[model].Model->Scale(scale);
 	}
@@ -3360,14 +3351,14 @@ void HLodClass::Update_Sub_Object_Transforms(void)
 	** Put the computed transforms into our sub objects.
 	*/
 	int lod,model;
-	
+
 	for (lod = 0; lod < LodCount; lod++) {
 		for (model = 0; model < Lod[lod].Count(); model++) {
 
 			RenderObjClass * robj = Lod[lod][model].Model;
 			int bone = Lod[lod][model].BoneIndex;
 
-			robj->Set_Transform(HTree->Get_Transform(bone)); 
+			robj->Set_Transform(HTree->Get_Transform(bone));
 			robj->Set_Animation_Hidden(!HTree->Get_Visibility(bone));
 			robj->Update_Sub_Object_Transforms();
 		}
@@ -3378,7 +3369,7 @@ void HLodClass::Update_Sub_Object_Transforms(void)
 		RenderObjClass * robj = AdditionalModels[model].Model;
 		int bone = AdditionalModels[model].BoneIndex;
 
-		robj->Set_Transform(HTree->Get_Transform(bone)); 
+		robj->Set_Transform(HTree->Get_Transform(bone));
 		robj->Set_Animation_Hidden(!HTree->Get_Visibility(bone));
 		robj->Update_Sub_Object_Transforms();
 	}
@@ -3419,7 +3410,7 @@ void HLodClass::Update_Obj_Space_Bounding_Volumes(void)
 	int index = high_lod.Count ();
 	while (index -- && BoundingBoxIndex == -1) {
 		RenderObjClass *model = high_lod[index].Model;
-		
+
 		//
 		//	Is this an OBBox mesh?
 		//
@@ -3434,7 +3425,7 @@ void HLodClass::Update_Obj_Space_Bounding_Volumes(void)
 			//
 			//	Does the name match the designator we are looking for?
 			//
-			if (::stricmp (name, "BOUNDINGBOX") == 0) {				
+			if (::stricmp (name, "BOUNDINGBOX") == 0) {
 				BoundingBoxIndex = index;
 			}
 		}
@@ -3459,15 +3450,15 @@ void HLodClass::Update_Obj_Space_Bounding_Volumes(void)
 	MinMaxAABoxClass box;
 
 	HTree->Base_Update(Matrix3D(1));
-	
+
 	robj = Get_Sub_Object(0);
 	WWASSERT(robj);
-	
+
 	const Matrix3D & bonetm = HTree->Get_Transform(Get_Sub_Object_Bone_Index(robj));
 	robj->Get_Obj_Space_Bounding_Sphere(sphere);
 	sphere.Transform(bonetm);
 	robj->Get_Obj_Space_Bounding_Box(obj_aabox);
-	
+
 	box.Init(obj_aabox);
 	box.Transform(bonetm);
 
@@ -3476,15 +3467,15 @@ void HLodClass::Update_Obj_Space_Bounding_Volumes(void)
 	for (i=1; i<Get_Num_Sub_Objects(); i++) {
 		robj = Get_Sub_Object(i);
 		WWASSERT(robj);
-		
+
 		const Matrix3D & bonetm = HTree->Get_Transform(Get_Sub_Object_Bone_Index(robj));
-		
+
 		SphereClass tmpsphere;
 		robj->Get_Obj_Space_Bounding_Sphere(tmpsphere);
 		tmpsphere.Transform(bonetm);
 		sphere.Add_Sphere(tmpsphere);
 
-		AABoxClass tmpbox; 
+		AABoxClass tmpbox;
 		robj->Get_Obj_Space_Bounding_Box(tmpbox);
 		tmpbox.Transform(bonetm);
 		box.Add_Box(tmpbox);
@@ -3517,7 +3508,7 @@ void HLodClass::Update_Obj_Space_Bounding_Volumes(void)
  *   1/26/00    gth : Created.                                                                 *
  *=============================================================================================*/
 void HLodClass::Add_Lod_Model(int lod, RenderObjClass * robj, int boneindex)
-{		
+{
 	WWASSERT(robj != NULL);
 
 	ModelNodeClass newnode;
@@ -3626,13 +3617,13 @@ void HLodClass::Set_Hidden(int onoff)
 	//
 	int additional_count = AdditionalModels.Count();
 	for (int index = 0; index < additional_count; index ++) {
-		
+
 		//
 		//	Is this a particle emitter?
 		//
 		RenderObjClass *model = AdditionalModels[index].Model;
 		if (model->Class_ID () == RenderObjClass::CLASSID_PARTICLEEMITTER) {
-			
+
 			//
 			//	Pass the hidden bit onto the emitter
 			//
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
index 2cb3a87abb9..c4de3202164 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
@@ -34,38 +34,14 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HLOD_H
-#define HLOD_H
 
-#ifndef ANIMOBJ_H
 #include "animobj.h"
-#endif
-
-#ifndef VECTOR_H
-#include "Vector.H"
-#endif
-
-#ifndef SNAPPTS_H
+#include "Vector.h"
 #include "snapPts.h"
-#endif
-
-#ifndef PROTO_H
 #include "proto.h"
-#endif
-
-#ifndef W3DERR_H
 #include "w3derr.h"
-#endif
-
-#ifndef __PROXY_H
 #include "proxy.h"
-#endif
-
 
 class DistLODClass;
 class HModelClass;
@@ -107,7 +83,7 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void					Set_Max_Screen_Size(int lod_index, float size);
 	virtual float					Get_Max_Screen_Size(int lod_index) const;
-	
+
 	virtual int						Get_Lod_Count(void) const;
 	virtual int						Get_Lod_Model_Count (int lod_index) const;
 	virtual RenderObjClass *	Peek_Lod_Model (int lod_index, int model_index) const;
@@ -143,12 +119,12 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 	virtual void					Notify_Added(SceneClass * scene);
 	virtual void					Notify_Removed(SceneClass * scene);
 
-	virtual int						Get_Num_Sub_Objects(void) const; 					
+	virtual int						Get_Num_Sub_Objects(void) const;
 	virtual RenderObjClass *	Get_Sub_Object(int index) const;
 	virtual int						Add_Sub_Object(RenderObjClass * subobj);
 	virtual int						Remove_Sub_Object(RenderObjClass * robj);
 
-	virtual int						Get_Num_Sub_Objects_On_Bone(int boneindex) const;							
+	virtual int						Get_Num_Sub_Objects_On_Bone(int boneindex) const;
 	virtual RenderObjClass *	Get_Sub_Object_On_Bone(int index,int boneindex) const;
 	virtual int						Get_Sub_Object_Bone_Index(RenderObjClass * subobj) const;
 	virtual int						Get_Sub_Object_Bone_Index(int LodIndex, int ModelIndex)	const;
@@ -206,7 +182,7 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	virtual void					Create_Decal(DecalGeneratorClass * generator);
 	virtual void					Delete_Decal(uint32 decal_id);
-	
+
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Attributes, Options, Properties, etc
 	/////////////////////////////////////////////////////////////////////////////
@@ -229,9 +205,9 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 	virtual void					Update_Obj_Space_Bounding_Volumes(void);
 
 protected:
-	
-	
-	class ModelNodeClass 
+
+
+	class ModelNodeClass
 	{
 	public:
 		RenderObjClass *			Model;
@@ -240,7 +216,7 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 		bool operator != (const ModelNodeClass & that) { return !operator == (that); }
 	};
 
-	class ModelArrayClass : public DynamicVectorClass<ModelNodeClass> 
+	class ModelArrayClass : public DynamicVectorClass<ModelNodeClass>
 	{
 	public:
 		ModelArrayClass(void) : MaxScreenSize(NO_MAX_SCREEN_SIZE), NonPixelCost(0.0f),
@@ -250,7 +226,7 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 		float							PixelCostPerArea;	// PixelCostPerArea * area(normalized) + NonPixelCost = total Cost
 		float							BenefitFactor;		// BenefitFactor * area(normalized) = Benefit
 	};
-	
+
 	// Lod Render Objects, basically one of the LOD Models will be rendered. Typically
 	// each model in an HLodModel will be a mesh or a "simple" HLod (one with a single LOD)
 	int								LodCount;
@@ -263,7 +239,7 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 	//
 	int								BoundingBoxIndex;
 
-	float *							Cost;					// Cost array (recalculated every frame) 
+	float *							Cost;					// Cost array (recalculated every frame)
 	float *							Value;				// Value array (recalculated every frame)
 
 	// Additional Models, these models have been linked to one of the bones in this
@@ -277,7 +253,7 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 	SnapPointsClass *				SnapPoints;
 
 	// possible array of proxy objects (names and bone indexes for application defined usage)
-	ProxyArrayClass *				ProxyArray; 
+	ProxyArrayClass *				ProxyArray;
 
 	// Current LOD Bias (affects recalculation of the Value array)
 	float								LODBias;
@@ -297,7 +273,7 @@ class HLodLoaderClass : public PrototypeLoaderClass
 
 /**
 ** HLodDefClass
-** This description object is generated when reading a W3D_CHUNK_HLOD.  It 
+** This description object is generated when reading a W3D_CHUNK_HLOD.  It
 ** directly describes the contents of an HLod model.
 */
 class HLodDefClass : public W3DMPO
@@ -335,7 +311,7 @@ class HLodDefClass : public W3DMPO
 	{
 	public:
 		SubObjectArrayClass(void);
-		~SubObjectArrayClass(void);		
+		~SubObjectArrayClass(void);
 		void		Reset(void);
 		void		operator = (const SubObjectArrayClass & that);
 
@@ -371,12 +347,12 @@ class HLodPrototypeClass : public W3DMPO, public PrototypeClass
 	W3DMPO_GLUE(HLodPrototypeClass)
 public:
 	HLodPrototypeClass( HLodDefClass *def )					{ Definition = def; }
-	
+
 	virtual const char *			Get_Name(void) const			{ return Definition->Get_Name(); }
 	virtual int								Get_Class_ID(void) const	{ return RenderObjClass::CLASSID_HLOD; }
 	virtual RenderObjClass *	Create(void);
 	virtual void							DeleteSelf()							{ delete this; }
-	
+
 	HLodDefClass *					Get_Definition(void) const	{ return Definition; }
 
 protected:
@@ -390,6 +366,3 @@ class HLodPrototypeClass : public W3DMPO, public PrototypeClass
 ** Instance of the loaders which the asset manager install
 */
 extern HLodLoaderClass			_HLodLoader;
-
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
index 2ca7540465c..f30f54eb303 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
@@ -100,7 +100,7 @@ void TimeCodedMorphKeysClass::Get_Morph_Info(float morph_frame,int * pose_frame0
 		*pose_frame0 = *pose_frame1 = Keys[0].PoseFrame;
 		*fraction = 0.0f;
 		return;
-	} 
+	}
 
 	if (morph_frame >= Keys[Keys.Count ()-1].MorphFrame) {
 		*pose_frame0 = *pose_frame1 = Keys[Keys.Count ()-1].PoseFrame;
@@ -127,13 +127,13 @@ uint32 TimeCodedMorphKeysClass::get_index(float frame)
 
 		// special case for end packets
 		if (CachedIdx == (uint32)Keys.Count ()-1) return(CachedIdx);
-		
+
 		// check if the requested time is still in the cached interval
 		if (frame < Keys[CachedIdx + 1].MorphFrame) return(CachedIdx);
 
 		// do one time look-ahead before reverting to a search
 		CachedIdx++;
-	
+
 		// again, special case the end interval
 		if (CachedIdx == (uint32)Keys.Count ()-1) return(CachedIdx);
 
@@ -156,10 +156,10 @@ uint32 TimeCodedMorphKeysClass::binary_search_index(float req_frame)
 	int leftIdx = 0;
 	int rightIdx = Keys.Count ();
 	int idx,dx;
-	
+
 	// binary search for the desired interval
 	for (;;) {
-	
+
 		// if we've zeroed in on the interval, return the left index
 		dx = rightIdx - leftIdx;
 		if (dx == 1) {
@@ -185,7 +185,7 @@ uint32 TimeCodedMorphKeysClass::binary_search_index(float req_frame)
 
 
 /*********************************************************************************************
-** 
+**
 ** HMorphAnimClass Implementation
 **
 *********************************************************************************************/
@@ -200,7 +200,7 @@ HMorphAnimClass::HMorphAnimClass(void) :
 	PivotChannel(NULL)
 {
 	memset(Name,0,sizeof(Name));
-	memset(AnimName,0,sizeof(AnimName));	
+	memset(AnimName,0,sizeof(AnimName));
 	memset(HierarchyName,0,sizeof(HierarchyName));
 }
 
@@ -219,15 +219,11 @@ void HMorphAnimClass::Free(void)
 		PoseData = NULL;
 	}
 
-	if (MorphKeyData != NULL) {
-		delete[] MorphKeyData;
-		MorphKeyData = NULL;
-	}
+	delete[] MorphKeyData;
+	MorphKeyData = NULL;
 
-	if (PivotChannel != NULL) {
-		delete[] PivotChannel;
-		PivotChannel = NULL;
-	}
+	delete[] PivotChannel;
+	PivotChannel = NULL;
 }
 
 
@@ -257,7 +253,7 @@ static int Build_List_From_String
 			  (entry != NULL) && (entry[1] != 0);
 			  entry = ::strstr (entry, delimiter))
 		{
-			
+
 			//
 			// Move past the current delimiter (if necessary)
 			//
@@ -268,14 +264,14 @@ static int Build_List_From_String
 			// Increment the count of entries
 			count ++;
 		}
-	
+
 		if (count > 0) {
 
 			//
 			// Allocate enough StringClass objects to hold all the strings in the list
 			//
 			(*string_list) = W3DNEWARRAY StringClass[count];
-		
+
 			//
 			// Parse the string and pull out its entries.
 			//
@@ -284,7 +280,7 @@ static int Build_List_From_String
 				  (entry != NULL) && (entry[1] != 0);
 				  entry = ::strstr (entry, delimiter))
 			{
-				
+
 				//
 				// Move past the current delimiter (if necessary)
 				//
@@ -296,7 +292,7 @@ static int Build_List_From_String
 				// Copy this entry into its own string
 				//
 				StringClass entry_string = entry;
-				char *delim_start = ::strstr (entry_string.Peek_Buffer(), delimiter);				
+				char *delim_start = ::strstr (entry_string.Peek_Buffer(), delimiter);
 				if (delim_start != NULL) {
 					delim_start[0] = 0;
 				}
@@ -304,7 +300,7 @@ static int Build_List_From_String
 				//
 				// Add this entry to our list
 				//
-				if ((entry_string.Get_Length () > 0) || (count == 0)) {
+				if ((!entry_string.Is_Empty()) || (count == 0)) {
 					(*string_list)[count++] = entry_string;
 				}
 			}
@@ -314,7 +310,7 @@ static int Build_List_From_String
 			(*string_list) = W3DNEWARRAY StringClass[count];
 			(*string_list)[0] = buffer;
 		}
-				
+
 	}
 
 	//
@@ -329,7 +325,7 @@ bool Is_Number (const char *str)
 	bool retval = true;
 
 	while (retval && str[0] != NULL){
-		retval = ((str[0] >= '0' && str[0] <= '9') || str[0] == '-' || str[0] == '.'); 
+		retval = ((str[0] >= '0' && str[0] <= '9') || str[0] == '-' || str[0] == '.');
 		str ++;
 	}
 
@@ -347,9 +343,8 @@ bool HMorphAnimClass::Import(const char *hierarchy_name, TextFileClass &text_des
 	//
 	// Copy the hierarchy name into a class variable
 	//
-	::strncpy (HierarchyName, hierarchy_name, W3D_NAME_LEN);
-	HierarchyName[W3D_NAME_LEN - 1] = 0;
-	
+	::strlcpy(HierarchyName, hierarchy_name, W3D_NAME_LEN);
+
 	//
 	// Attempt to load the new base pose
 	//
@@ -378,13 +373,13 @@ bool HMorphAnimClass::Import(const char *hierarchy_name, TextFileClass &text_des
 
 		WWASSERT (ChannelCount > 0);
 		if (ChannelCount > 0) {
-			
+
 			//
 			// Allocate and initialize each animation channel
 			//
 			PoseData			= W3DNEWARRAY HAnimClass *[ChannelCount];
 			MorphKeyData	= W3DNEWARRAY TimeCodedMorphKeysClass[ChannelCount];
-			for (int index = 0; index < ChannelCount; index ++) {				
+			for (int index = 0; index < ChannelCount; index ++) {
 				StringClass channel_anim_name;
 				channel_anim_name.Format ("%s.%s", HierarchyName, (const char *)column_list[index + 1]);
 				PoseData[index] = WW3DAssetManager::Get_Instance()->Get_HAnim (channel_anim_name);
@@ -415,7 +410,7 @@ bool HMorphAnimClass::Import(const char *hierarchy_name, TextFileClass &text_des
 					//
 					for (int index = 1; index < list_count; index ++) {
 						StringClass &channel_frame = channel_list[index];
-						
+
 						//
 						// If this channel contains a valid number, then record
 						// its animation frame
@@ -426,16 +421,14 @@ bool HMorphAnimClass::Import(const char *hierarchy_name, TextFileClass &text_des
 					}
 
 					FrameCount = frame + 1;
-				}				
+				}
 
 				//
 				// Cleanup
 				//
-				if (channel_list != NULL) {
-					delete [] channel_list;
-					channel_list = NULL;
-				}
-			}			
+				delete [] channel_list;
+				channel_list = NULL;
+			}
 
 			//
 			// Allocate the pivot channel list
@@ -447,10 +440,8 @@ bool HMorphAnimClass::Import(const char *hierarchy_name, TextFileClass &text_des
 		//
 		// Cleanup
 		//
-		if (column_list != NULL) {
-			delete [] column_list;
-			column_list = NULL;
-		}
+		delete [] column_list;
+		column_list = NULL;
 	}
 
 	return retval;
@@ -463,13 +454,13 @@ void HMorphAnimClass::Resolve_Pivot_Channels(void)
 	//
 	//	Loop over all the pivots in the HTree
 	//
-	for (int pivot = 0; pivot < NumNodes; pivot ++) {		
+	for (int pivot = 0; pivot < NumNodes; pivot ++) {
 		PivotChannel[pivot] = 0;
 
 		//
 		// Find out which animation channel affects this pivot
 		//
-		for (int channel = 0; channel < ChannelCount; channel ++) {			
+		for (int channel = 0; channel < ChannelCount; channel ++) {
 			if (PoseData[channel]->Is_Node_Motion_Present (pivot)) {
 				PivotChannel[pivot] = channel;
 			}
@@ -484,7 +475,7 @@ void HMorphAnimClass::Set_Name(const char * name)
 	//
 	// Copy the full name
 	//
-	::strcpy (Name, name);
+	strlcpy(Name, name, ARRAY_SIZE(Name));
 
 	//
 	// Try to find the separator (a period)
@@ -492,14 +483,14 @@ void HMorphAnimClass::Set_Name(const char * name)
 	StringClass full_name	= name;
 	char *separator			= ::strchr (full_name.Peek_Buffer(), '.');
 	if (separator != NULL) {
-		
+
 		//
 		// Null out the separator and copy the two names
 		// into our two buffers
 		//
 		separator[0] = 0;
-		::strcpy (AnimName, separator + 1);
-		::strcpy (HierarchyName, full_name);
+		strlcpy(AnimName, separator + 1, ARRAY_SIZE(AnimName));
+		strlcpy(HierarchyName, full_name, ARRAY_SIZE(HierarchyName));
 	}
 
 	return ;
@@ -522,7 +513,7 @@ int HMorphAnimClass::Create_New_Morph(const int channels, HAnimClass *anim[])
 	if (anim == NULL) {
 		return LOAD_ERROR;
 	}
-	
+
 	// set up info
 	//	FrameCount = anim[0]->Get_Num_Frames();
 	//	FrameRate = anim[0]->Get_Frame_Rate();
@@ -542,7 +533,7 @@ int HMorphAnimClass::Create_New_Morph(const int channels, HAnimClass *anim[])
 	// Resolve the pivots so that they correspond to the proper morphing channels
 	memset(PivotChannel,0,NumNodes * sizeof(uint32));
 	Resolve_Pivot_Channels();
-	
+
 	// Signal successful process
 	return OK;
 }
@@ -558,11 +549,14 @@ int HMorphAnimClass::Load_W3D(ChunkLoadClass & cload)
 	cload.Read(&header,sizeof(header));
 	cload.Close_Chunk();
 
-	strncpy(AnimName,header.Name,sizeof(AnimName));
-   strncpy(HierarchyName,header.HierarchyName,sizeof(HierarchyName));
-	strcpy(Name,HierarchyName);
-	strcat(Name,".");
-	strcat(Name,AnimName);
+	static_assert(ARRAY_SIZE(AnimName) >= ARRAY_SIZE(header.Name), "Incorrect array size");
+	static_assert(ARRAY_SIZE(HierarchyName) >= ARRAY_SIZE(header.HierarchyName), "Incorrect array size");
+	static_assert(ARRAY_SIZE(Name) >= ARRAY_SIZE(HierarchyName), "Incorrect array size");
+	strcpy(AnimName, header.Name);
+	strcpy(HierarchyName, header.HierarchyName);
+	strcpy(Name, HierarchyName);
+	strlcat(Name, ".", ARRAY_SIZE(Name));
+	strlcat(Name, AnimName, ARRAY_SIZE(Name));
 
 	HTreeClass * base_pose = WW3DAssetManager::Get_Instance()->Get_HTree(HierarchyName);
 	if (base_pose == NULL) {
@@ -582,14 +576,14 @@ int HMorphAnimClass::Load_W3D(ChunkLoadClass & cload)
 	// read in the rest of the chunks
 	int cur_channel = 0;
 	while (cload.Open_Chunk()) {
-		switch(cload.Cur_Chunk_ID()) 
+		switch(cload.Cur_Chunk_ID())
 		{
 		case W3D_CHUNK_MORPHANIM_CHANNEL:
 			read_channel(cload,cur_channel++);
 			break;
 
 		case W3D_CHUNK_MORPHANIM_PIVOTCHANNELDATA:
-			cload.Read(PivotChannel,cload.Cur_Chunk_Length());	
+			cload.Read(PivotChannel,cload.Cur_Chunk_Length());
 			break;
 		};
 		cload.Close_Chunk();
@@ -609,7 +603,7 @@ void HMorphAnimClass::read_channel(ChunkLoadClass & cload,int channel)
 	WWASSERT(cload.Cur_Chunk_ID() == W3D_CHUNK_MORPHANIM_POSENAME);
 	cload.Read(anim_name.Get_Buffer(cload.Cur_Chunk_Length()),cload.Cur_Chunk_Length());
 	cload.Close_Chunk();
-	
+
 	//StringClass channel_anim_name;
 	//channel_anim_name.Format ("%s.%s", HierarchyName, anim_name);
 	PoseData[channel] = WW3DAssetManager::Get_Instance()->Get_HAnim(anim_name);
@@ -624,21 +618,22 @@ void HMorphAnimClass::read_channel(ChunkLoadClass & cload,int channel)
 
 int HMorphAnimClass::Save_W3D(ChunkSaveClass & csave)
 {
-	// W3D objects write their own wrapper chunks 
+	// W3D objects write their own wrapper chunks
 	csave.Begin_Chunk(W3D_CHUNK_MORPH_ANIMATION);
-	
+
 	// init the header data
 	W3dMorphAnimHeaderStruct header;
-	memset(&header,0,sizeof(header));
-	strncpy(header.Name,AnimName,sizeof(header.Name));
-	strncpy(header.HierarchyName,HierarchyName,sizeof(header.HierarchyName));
+	static_assert(ARRAY_SIZE(header.Name) >= ARRAY_SIZE(AnimName), "Incorrect array size");
+	static_assert(ARRAY_SIZE(header.HierarchyName) >= ARRAY_SIZE(HierarchyName), "Incorrect array size");
+	strcpy(header.Name, AnimName);
+	strcpy(header.HierarchyName, HierarchyName);
 
 	header.FrameCount = FrameCount;
 	header.FrameRate = FrameRate;
 	header.ChannelCount = ChannelCount;
 
 	// write out the animation header
-	csave.Begin_Chunk(W3D_CHUNK_MORPHANIM_HEADER);	
+	csave.Begin_Chunk(W3D_CHUNK_MORPHANIM_HEADER);
 	csave.Write(&header,sizeof(header));
 	csave.End_Chunk();
 
@@ -679,7 +674,7 @@ void HMorphAnimClass::Get_Translation(Vector3& trans,int pividx,float frame) con
 	int pose_frame0,pose_frame1;
 	float fraction;
 	MorphKeyData[channel].Get_Morph_Info(frame,&pose_frame0,&pose_frame1,&fraction);
-	
+
 	Vector3 t0;
 	PoseData[channel]->Get_Translation(t0,pividx,pose_frame0);
 	Vector3 t1;
@@ -693,7 +688,7 @@ void HMorphAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) con
 	int pose_frame0,pose_frame1;
 	float fraction;
 	MorphKeyData[channel].Get_Morph_Info(frame,&pose_frame0,&pose_frame1,&fraction);
-	
+
 	Quaternion q0;
 	PoseData[channel]->Get_Orientation(q0,pividx,pose_frame0);
 	Quaternion q1;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h
index 42c4183a76b..984fc2c4cfe 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h
@@ -36,12 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HMORPHANIM_H
-#define HMORPHANIM_H
 
 #include "always.h"
 #include "hanim.h"
@@ -56,13 +51,13 @@ class TextFileClass;
 
 	HMorphAnimClass
 
-	This is an animation format designed for facial animation.  It basically morphs the 
+	This is an animation format designed for facial animation.  It basically morphs the
 	htree between a set of poses.  These animations are created by exporting an
 	HRawAnimClass which contains the poses, using Magpie to create a text file
 	describing which pose to use on each frame, and finally using W3dView to combine
 	the data into an HMorphAnimClass.
 
-	There can be multiple channels for the morphing.  For example, some of the 
+	There can be multiple channels for the morphing.  For example, some of the
 	bones can be controlled by the "phoneme" poses (e.g. mouth) while other bones are
 	controlled by the "expression" poses (e.g. eyebrows)
 
@@ -72,13 +67,13 @@ class HMorphAnimClass : public HAnimClass
 {
 
 public:
-	
+
 	enum
 	{
 		OK,
 		LOAD_ERROR
 	};
-	
+
 	HMorphAnimClass(void);
 	~HMorphAnimClass(void);
 
@@ -94,8 +89,6 @@ class HMorphAnimClass : public HAnimClass
 	float							Get_Frame_Rate()									{ return FrameRate; }
 	float							Get_Total_Time()									{ return (float)FrameCount / FrameRate; }
 
-//	Vector3						Get_Translation(int pividx,float frame);
-//	Quaternion					Get_Orientation(int pividx,float frame);
 	void							Get_Translation(Vector3& translation, int pividx,float frame) const;
 	void							Get_Orientation(Quaternion& orientation, int pividx,float frame) const;
 	void							Get_Transform(Matrix3D& transform, int pividx,float frame) const;
@@ -114,7 +107,7 @@ class HMorphAnimClass : public HAnimClass
 
 protected:
 
-	void							Free(void);	
+	void							Free(void);
 	void							read_channel(ChunkLoadClass & cload,int channel);
 	void							write_channel(ChunkSaveClass & csave,int channel);
 	void							Resolve_Pivot_Channels(void);
@@ -122,7 +115,7 @@ class HMorphAnimClass : public HAnimClass
 	char							Name[2*W3D_NAME_LEN];
 	char							AnimName[W3D_NAME_LEN];
 	char							HierarchyName[W3D_NAME_LEN];
-	
+
 	int							FrameCount;								// number of frames in the animation
 	float							FrameRate;								// framerate for playback
 	int							ChannelCount;							// number of independent morphing channels
@@ -131,16 +124,16 @@ class HMorphAnimClass : public HAnimClass
 	HAnimClass **					PoseData;		// pointer to pose for each morph channel
 	TimeCodedMorphKeysClass *	MorphKeyData;	// morph keys for each channel
 	uint32 *							PivotChannel;	// controlling channel for each pivot/bone
-	
+
 };
 
 
 /*********************************************************************************************
-** 
+**
 ** TimeCodedMorphKeysClass
 ** This class basically stores a vector of morph keys.  An HMorphAnimClass contains
 ** one of these for each independent morphing channel.  For example, the facial animation
-** stuff generates HMorphAnims which contain 2 channels, one which specifies what the 
+** stuff generates HMorphAnims which contain 2 channels, one which specifies what the
 ** "phoneme" bones are doing and one which specifies what the "expression" bones are doing.
 **
 *********************************************************************************************/
@@ -152,7 +145,7 @@ class TimeCodedMorphKeysClass
 	TimeCodedMorphKeysClass(void);
 	~TimeCodedMorphKeysClass(void);
 
-	bool					Load_W3D(ChunkLoadClass & cload);		
+	bool					Load_W3D(ChunkLoadClass & cload);
 	bool					Save_W3D(ChunkSaveClass & csave);
 	void					Get_Morph_Info(float morph_frame,int * pose_frame0,int * pose_frame1,float * fraction);
 
@@ -173,7 +166,7 @@ class TimeCodedMorphKeysClass
 		uint32	MorphFrame;				// morph animation frame index
 		uint32	PoseFrame;				// which pose frame to use at this time
 	};
-	
+
 	SimpleDynVecClass<MorphKeyStruct>	Keys;	// morph key data
 	uint32				CachedIdx;					// last accessed index
 
@@ -184,9 +177,3 @@ class TimeCodedMorphKeysClass
 
 	friend class HMorphAnimClass;
 };
-
-
-
-#endif
-
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
index c2a297f1747..b4dcf09fe14 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
@@ -34,17 +34,17 @@
  *                                                                                             *
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
- *   HRawAnimClass::HRawAnimClass -- constructor                                                     * 
- *   HRawAnimClass::~HRawAnimClass -- Destructor                                                     * 
- *   HRawAnimClass::Free -- De-allocates all memory in use                                        * 
- *   HRawAnimClass::Load -- Loads hierarchy animation from a file                                 * 
- *   HRawAnimClass::read_channel -- Reads in a single channel of motion                           * 
- *   HRawAnimClass::add_channel -- Adds a motion channel to the animation                         * 
- *   HRawAnimClass::Get_Translation -- returns the translation vector for the given frame         * 
- *   HRawAnimClass::Get_Orientation -- returns a quaternion for the orientation of the pivot      * 
- *   HRawAnimClass::Get_XRotation -- Returns the X euler angle for the given pivot, frame         * 
- *   HRawAnimClass::Get_YRotation -- returns the Y Euler angle for the given pivot, frame         * 
- *   HRawAnimClass::Get_ZRotation -- returns the Z Euler angle for the given pivot, frame         * 
+ *   HRawAnimClass::HRawAnimClass -- constructor                                                     *
+ *   HRawAnimClass::~HRawAnimClass -- Destructor                                                     *
+ *   HRawAnimClass::Free -- De-allocates all memory in use                                        *
+ *   HRawAnimClass::Load -- Loads hierarchy animation from a file                                 *
+ *   HRawAnimClass::read_channel -- Reads in a single channel of motion                           *
+ *   HRawAnimClass::add_channel -- Adds a motion channel to the animation                         *
+ *   HRawAnimClass::Get_Translation -- returns the translation vector for the given frame         *
+ *   HRawAnimClass::Get_Orientation -- returns a quaternion for the orientation of the pivot      *
+ *   HRawAnimClass::Get_XRotation -- Returns the X euler angle for the given pivot, frame         *
+ *   HRawAnimClass::Get_YRotation -- returns the Y Euler angle for the given pivot, frame         *
+ *   HRawAnimClass::Get_ZRotation -- returns the Z Euler angle for the given pivot, frame         *
  *   HRawAnimClass::read_bit_channel -- read a bit channel from the file                          *
  *   HRawAnimClass::add_bit_channel -- install a bit channel into the animation                   *
  *   HRawAnimClass::Get_Visibility -- return visibility state for given pivot/frame               *
@@ -67,7 +67,7 @@
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-NodeMotionStruct::NodeMotionStruct() : 
+NodeMotionStruct::NodeMotionStruct() :
 	X(NULL),
 	Y(NULL),
 	Z(NULL),
@@ -94,44 +94,28 @@ NodeMotionStruct::NodeMotionStruct() :
  *=============================================================================================*/
 NodeMotionStruct::~NodeMotionStruct()
 {
-	if (X != NULL) {
-		delete X;
-	}
-	if (Y != NULL) {
-		delete Y;
-	}
-	if (Z != NULL) {
-		delete Z;
-	}
-	if (XR != NULL) {
-		delete XR;
-	}
-	if (YR != NULL) {
-		delete YR;
-	}
-	if (ZR != NULL) {
-		delete ZR;
-	}
-	if (Q != NULL) {
-		delete Q;
-	}
-	if (Vis != NULL) {
-		delete Vis;
-	}
+	delete X;
+	delete Y;
+	delete Z;
+	delete XR;
+	delete YR;
+	delete ZR;
+	delete Q;
+	delete Vis;
 }
 
 
-/*********************************************************************************************** 
- * HRawAnimClass::HRawAnimClass -- constructor                                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::HRawAnimClass -- constructor                                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HRawAnimClass::HRawAnimClass(void) :
 	NumFrames(0),
@@ -144,17 +128,17 @@ HRawAnimClass::HRawAnimClass(void) :
 }
 
 
-/*********************************************************************************************** 
- * HRawAnimClass::~HRawAnimClass -- Destructor                                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::~HRawAnimClass -- Destructor                                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HRawAnimClass::~HRawAnimClass(void)
 {
@@ -162,44 +146,42 @@ HRawAnimClass::~HRawAnimClass(void)
 }
 
 
-/*********************************************************************************************** 
- * HRawAnimClass::Free -- De-allocates all memory in use                                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::Free -- De-allocates all memory in use                                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HRawAnimClass::Free(void)
 {
-	if (NodeMotion != NULL) {
-		delete[] NodeMotion;
-		NodeMotion = NULL;
-	}
+	delete[] NodeMotion;
+	NodeMotion = NULL;
 }
 
 
-/*********************************************************************************************** 
- * HRawAnimClass::Load -- Loads hierarchy animation from a file                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::Load -- Loads hierarchy animation from a file                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HRawAnimClass::Load_W3D(ChunkLoadClass & cload)
 {
 	bool pre30 = false;
 
-	/* 
+	/*
 	** First make sure we release any memory in use
 	*/
 	Free();
@@ -229,15 +211,13 @@ int HRawAnimClass::Load_W3D(ChunkLoadClass & cload)
 		pre30 = true;
 	}
 
-	strcpy(Name,aheader.HierarchyName);
-	strcat(Name,".");
-	strcat(Name,aheader.Name);
+	static_assert(ARRAY_SIZE(Name) >= ARRAY_SIZE(aheader.HierarchyName), "Incorrect array size");
+	strcpy(Name, aheader.HierarchyName);
+	strlcat(Name, ".", ARRAY_SIZE(Name));
+	strlcat(Name, aheader.Name, ARRAY_SIZE(Name));
 
-	// TSS chasing crash bug 05/26/99
-   WWASSERT(HierarchyName != NULL);
-   WWASSERT(aheader.HierarchyName != NULL);
-   WWASSERT(sizeof(HierarchyName) >= W3D_NAME_LEN);
-   strncpy(HierarchyName,aheader.HierarchyName,W3D_NAME_LEN);
+	static_assert(ARRAY_SIZE(HierarchyName) >= ARRAY_SIZE(aheader.HierarchyName), "Incorrect array size");
+	strcpy(HierarchyName, aheader.HierarchyName);
 
 	HTreeClass * base_pose = WW3DAssetManager::Get_Instance()->Get_HTree(HierarchyName);
 	if (base_pose == NULL) {
@@ -266,31 +246,31 @@ int HRawAnimClass::Load_W3D(ChunkLoadClass & cload)
 			case W3D_CHUNK_ANIMATION_CHANNEL:
 				if (!read_channel(cload,&newchan,pre30)) {
 					goto Error;
-				}			
+				}
 
-				// (gth) if the channel is referring to a node which is outside the range, 
+				// (gth) if the channel is referring to a node which is outside the range,
 				// just throw away the channel.  This probably means the animation must
 				// be re-exported
 				if (newchan->Get_Pivot() < NumNodes) {
 					add_channel(newchan);
 				} else {
-					WWDEBUG_SAY(("Animation %s referring to missing Bone! Please re-export.\n",Name));
+					WWDEBUG_SAY(("Animation %s referring to missing Bone! Please re-export.",Name));
 					delete newchan;
 				}
 				break;
-	
+
 			case W3D_CHUNK_BIT_CHANNEL:
 				if (!read_bit_channel(cload,&newbitchan,pre30)) {
 					goto Error;
 				}
 
-				// (gth) if the channel is referring to a node which is outside the range, 
+				// (gth) if the channel is referring to a node which is outside the range,
 				// just throw away the channel.  This probably means the animation must
 				// be re-exported
 				if (newbitchan->Get_Pivot() < NumNodes) {
 					add_bit_channel(newbitchan);
 				} else {
-					WWDEBUG_SAY(("Animation %s referring to missing Bone! Please re-export.\n",Name));
+					WWDEBUG_SAY(("Animation %s referring to missing Bone! Please re-export.",Name));
 					delete newbitchan;
 				}
 				break;
@@ -310,41 +290,41 @@ int HRawAnimClass::Load_W3D(ChunkLoadClass & cload)
 
 }
 
-/*********************************************************************************************** 
- * HRawAnimClass::read_channel -- Reads in a single channel of motion                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::read_channel -- Reads in a single channel of motion                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool HRawAnimClass::read_channel(ChunkLoadClass & cload,MotionChannelClass * * newchan,bool pre30)
 {
 	*newchan = W3DNEW MotionChannelClass;
-	bool result = (*newchan)->Load_W3D(cload);	
-	
+	bool result = (*newchan)->Load_W3D(cload);
+
 	if (result && pre30) {
 		(*newchan)->PivotIdx += 1;
 	}
-	
+
 	return result;
 }
 
-/*********************************************************************************************** 
- * HRawAnimClass::add_channel -- Adds a motion channel to the animation                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::add_channel -- Adds a motion channel to the animation                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HRawAnimClass::add_channel(MotionChannelClass * newchan)
 {
@@ -399,12 +379,12 @@ void HRawAnimClass::add_channel(MotionChannelClass * newchan)
 bool HRawAnimClass::read_bit_channel(ChunkLoadClass & cload,BitChannelClass * * newchan,bool pre30)
 {
 	*newchan = W3DNEW BitChannelClass;
-	bool result = (*newchan)->Load_W3D(cload);	
+	bool result = (*newchan)->Load_W3D(cload);
 
 	if (result && pre30) {
 		(*newchan)->PivotIdx += 1;
 	}
-	
+
 	return result;
 }
 
@@ -433,17 +413,17 @@ void HRawAnimClass::add_bit_channel(BitChannelClass * newchan)
 	}
 }
 
-/*********************************************************************************************** 
- * HRawAnimClass::Get_Translation -- returns the translation vector for the given fr              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::Get_Translation -- returns the translation vector for the given fr              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HRawAnimClass::Get_Translation(Vector3& trans, int pividx, float frame ) const
 {
@@ -491,24 +471,24 @@ void HRawAnimClass::Get_Translation(Vector3& trans, int pividx, float frame ) co
 	if (motion->Y != NULL) {
 		motion->Y->Get_Vector((int)frame1,&(trans1[1]));
 	}
-	if (motion->Z != NULL) {				
+	if (motion->Z != NULL) {
 		motion->Z->Get_Vector((int)frame1,&(trans1[2]));
 	}
 
 	Vector3::Lerp( trans0, trans1, ratio, &trans );
 }
 
-/*********************************************************************************************** 
- * HRawAnimClass::Get_Orientation -- returns a quaternion for the orientation of the              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::Get_Orientation -- returns a quaternion for the orientation of the              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HRawAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) const
 {
@@ -519,7 +499,7 @@ void HRawAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) const
 	float ratio = frame - (float)frame0;
 	WWASSERT( (ratio >= -WWMATH_EPSILON) && (ratio < 1.0f + WWMATH_EPSILON) );
 
-	if ( frame1 >= NumFrames ) 
+	if ( frame1 >= NumFrames )
 	{
 		frame1 = 0;
 	}
@@ -529,7 +509,7 @@ void HRawAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) const
 	Quaternion q0, q1;
 
 	MotionChannelClass* mc = NodeMotion[pividx].Q;
-	if (mc != NULL) 
+	if (mc != NULL)
 	{
 		mc->Get_Vector_As_Quat((int)frame0, q0);
 		mc->Get_Vector_As_Quat((int)frame1, q1);
@@ -540,11 +520,11 @@ void HRawAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) const
 		q1.Set();
 	}
 
-	if ( ratio == 0.0f ) 
+	if ( ratio == 0.0f )
 	{
 		q = q0;
 	}
-	else if ( ratio == 1.0f ) 
+	else if ( ratio == 1.0f )
 	{
 		q = q1;
 	}
@@ -577,17 +557,17 @@ void HRawAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) const
 #endif
 }
 
-/*********************************************************************************************** 
- * HRawAnimClass::Get_Transform -- returns the transform matrix for the given frame            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::Get_Transform -- returns the transform matrix for the given frame            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HRawAnimClass::Get_Transform(Matrix3D& mtx, int pividx, float frame ) const
 {
@@ -685,7 +665,7 @@ bool HRawAnimClass::Get_Visibility(int pividx,float frame)
  * HISTORY:                                                                                    *
  *   3/23/99    EHC : Created.                                                                 *
  *=============================================================================================*/
-bool HRawAnimClass::Is_Node_Motion_Present(int pividx) 
+bool HRawAnimClass::Is_Node_Motion_Present(int pividx)
 {
 	WWASSERT((pividx >= 0) && (pividx < NumNodes));
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h
index 40b99338339..7e1642a12cd 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h
@@ -36,16 +36,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HRAWANIM_H
-#define HRAWANIM_H
 
 #include "always.h"
 #include "hanim.h"
- 
+
 class MotionChannelClass;
 class BitChannelClass;
 
@@ -64,7 +59,7 @@ struct NodeMotionStruct
 
 	BitChannelClass *			Vis;
 };
- 
+
 /**********************************************************************************
 
 	HRawAnimClass
@@ -79,13 +74,13 @@ class HRawAnimClass : public HAnimClass
 {
 
 public:
-	
+
 	enum
 	{
 		OK,
 		LOAD_ERROR
 	};
-	
+
 	HRawAnimClass(void);
 	~HRawAnimClass(void);
 
@@ -97,8 +92,6 @@ class HRawAnimClass : public HAnimClass
 	float							Get_Frame_Rate() { return FrameRate; }
 	float							Get_Total_Time() { return (float)NumFrames / FrameRate; }
 
-//	Vector3						Get_Translation(int pividx,float frame);
-//	Quaternion					Get_Orientation(int pividx,float frame);
 	void							Get_Translation(Vector3& translation, int pividx,float frame) const;
 	void							Get_Orientation(Quaternion& orientation, int pividx,float frame) const;
 	void							Get_Transform(Matrix3D& transform, int pividx,float frame) const;
@@ -120,14 +113,14 @@ class HRawAnimClass : public HAnimClass
 
 	char							Name[2*W3D_NAME_LEN];
 	char							HierarchyName[W3D_NAME_LEN];
-	
+
 	int							NumFrames;
 	int							NumNodes;
 	float							FrameRate;
 
 	NodeMotionStruct *		NodeMotion;
 
-	void Free(void);	
+	void Free(void);
 	bool read_channel(ChunkLoadClass & cload,MotionChannelClass * * newchan,bool pre30);
 	void add_channel(MotionChannelClass * newchan);
 
@@ -135,9 +128,3 @@ class HRawAnimClass : public HAnimClass
 	void add_bit_channel(BitChannelClass * newchan);
 
 };
-
-
-
-
-#endif
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp
index 2b30b931227..c0c8fdec4df 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp
@@ -17,52 +17,51 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/htreemgr.cpp 1     1/22/01 3:36p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/htreemgr.cpp                           $* 
- *                                                                                             * 
- *                       Author:: Byon_g                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 1/08/01 10:04a                                              $* 
- *                                                                                             * 
- *                    $Revision:: 1                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   HTreeManagerClass::HTreeManagerClass -- constructor                                       * 
- *   HTreeManagerClass::~HTreeManagerClass -- destructor                                       * 
- *   HTreeManagerClass::Free -- de-allocate all memory in use                                  * 
- *   HTreeManagerClass::Free_All_Trees -- de-allocates all hierarchy trees currently loaded    * 
- *   HTreeManagerClass::Load_Tree -- load a hierarchy tree from a file                         * 
- *   HTreeManagerClass::Get_Tree_ID -- look up the ID of a named hierarchy tree                * 
- *   HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree              * 
- *   HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree              * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/htreemgr.cpp                           $*
+ *                                                                                             *
+ *                       Author:: Byon_g                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 1/08/01 10:04a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   HTreeManagerClass::HTreeManagerClass -- constructor                                       *
+ *   HTreeManagerClass::~HTreeManagerClass -- destructor                                       *
+ *   HTreeManagerClass::Free -- de-allocate all memory in use                                  *
+ *   HTreeManagerClass::Free_All_Trees -- de-allocates all hierarchy trees currently loaded    *
+ *   HTreeManagerClass::Load_Tree -- load a hierarchy tree from a file                         *
+ *   HTreeManagerClass::Get_Tree_ID -- look up the ID of a named hierarchy tree                *
+ *   HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree              *
+ *   HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
 #include "htreemgr.h"
-#include <string.h>
 #include "htree.h"
 #include "chunkio.h"
 #include "wwmemlog.h"
 #include "w3dexclusionlist.h"
 
 
-/*********************************************************************************************** 
- * HTreeManagerClass::HTreeManagerClass -- constructor                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::HTreeManagerClass -- constructor                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HTreeManagerClass::HTreeManagerClass(void) :
 	NumTrees(0)
@@ -72,74 +71,72 @@ HTreeManagerClass::HTreeManagerClass(void) :
 	}
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::~HTreeManagerClass -- destructor                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::~HTreeManagerClass -- destructor                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HTreeManagerClass::~HTreeManagerClass(void)
 {
 	Free();
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Free -- de-allocate all memory in use                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Free -- de-allocate all memory in use                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HTreeManagerClass::Free(void)
 {
 	Free_All_Trees();
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Free_All_Trees -- de-allocates all hierarchy trees currently loaded      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Free_All_Trees -- de-allocates all hierarchy trees currently loaded      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HTreeManagerClass::Free_All_Trees(void)
 {
 	for (int treeidx=0; treeidx < MAX_TREES; treeidx++) {
-		if (TreePtr[treeidx] != NULL) {
-			delete TreePtr[treeidx];
-			TreePtr[treeidx] = NULL;
-		}
+		delete TreePtr[treeidx];
+		TreePtr[treeidx] = NULL;
 	}
 	NumTrees = 0;
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Free_All_Trees_With_Exclusion_List -- de-allocates all trees not in list * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   12/12/2002 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Free_All_Trees_With_Exclusion_List -- de-allocates all trees not in list *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/12/2002 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HTreeManagerClass::Free_All_Trees_With_Exclusion_List(const W3DExclusionListClass & exclusion_list)
 {
@@ -150,16 +147,16 @@ void HTreeManagerClass::Free_All_Trees_With_Exclusion_List(const W3DExclusionLis
 	int treeidx=0;
 	for (; treeidx < MAX_TREES; treeidx++) {
 		if (TreePtr[treeidx] != NULL) {
-			
+
 			if (exclusion_list.Is_Excluded(TreePtr[treeidx])) {
 
-				//WWDEBUG_SAY(("excluding tree %s\n",TreePtr[treeidx]->Get_Name()));
+				//WWDEBUG_SAY(("excluding tree %s",TreePtr[treeidx]->Get_Name()));
 				TreePtr[new_tail] = TreePtr[treeidx];
 				new_tail++;
 
 			} else {
-				
-				//WWDEBUG_SAY(("deleting tree %s\n",TreePtr[treeidx]->Get_Name()));
+
+				//WWDEBUG_SAY(("deleting tree %s",TreePtr[treeidx]->Get_Name()));
 				delete TreePtr[treeidx];
 				TreePtr[treeidx] = NULL;
 			}
@@ -168,17 +165,17 @@ void HTreeManagerClass::Free_All_Trees_With_Exclusion_List(const W3DExclusionLis
 	NumTrees = new_tail;
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Load_Tree -- load a hierarchy tree from a file                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Load_Tree -- load a hierarchy tree from a file                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HTreeManagerClass::Load_Tree(ChunkLoadClass & cload)
 {
@@ -190,14 +187,14 @@ int HTreeManagerClass::Load_Tree(ChunkLoadClass & cload)
 	}
 
 	if (newtree->Load_W3D(cload) != HTreeClass::OK) {
-		
+
 		// load failed, delete and return error
 		delete newtree;
 		goto Error;
 
 	} else if (Get_Tree_ID(newtree->Get_Name()) != -1) {
-		
-		// tree with this name already exists, reject it!	
+
+		// tree with this name already exists, reject it!
 		delete newtree;
 		goto Error;
 
@@ -216,17 +213,17 @@ int HTreeManagerClass::Load_Tree(ChunkLoadClass & cload)
 
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Get_Tree_ID -- look up the ID of a named hierarchy tree                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Get_Tree_ID -- look up the ID of a named hierarchy tree                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HTreeManagerClass::Get_Tree_ID(const char * name)
 {
@@ -238,17 +235,17 @@ int HTreeManagerClass::Get_Tree_ID(const char * name)
 	return -1;
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Get_Tree_Name -- look up the name of a id'd hierarchy tree                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Get_Tree_Name -- look up the name of a id'd hierarchy tree                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 char *HTreeManagerClass::Get_Tree_Name(const int idx)
 {
@@ -263,17 +260,17 @@ char *HTreeManagerClass::Get_Tree_Name(const int idx)
 
 
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HTreeClass * HTreeManagerClass::Get_Tree(const char * name)
 {
@@ -287,17 +284,17 @@ HTreeClass * HTreeManagerClass::Get_Tree(const char * name)
 }
 
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HTreeClass * HTreeManagerClass::Get_Tree(int id)
 {
@@ -306,4 +303,4 @@ HTreeClass * HTreeManagerClass::Get_Tree(int id)
 	} else {
 		return NULL;
 	}
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h
index 53a48eb844d..981c5db91c5 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h
@@ -17,31 +17,25 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/htreemgr.h 1     1/22/01 3:36p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/htreemgr.h                             $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 1/08/01 10:04a                                              $* 
- *                                                                                             * 
- *                    $Revision:: 1                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/htreemgr.h                             $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 1/08/01 10:04a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HTREEMGR_H
-#define HTREEMGR_H
 
 #include "always.h"
 #include "bittype.h"
@@ -90,6 +84,3 @@ class HTreeManagerClass
 	HTreeClass *				TreePtr[MAX_TREES];		// TODO: no no! make this dynamic...
 
 };
-
-
-#endif
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.cpp
index a4d47c22b88..7ab894984dc 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.cpp
@@ -78,7 +78,7 @@ SimplePersistFactoryClass<LightClass,WW3D_PERSIST_CHUNKID_LIGHT>	_LightFactory;
 /*
 ** Chunk ID's used by LightClass's save-load support (different from the W3D file format...)
 */
-enum 
+enum
 {
 	LIGHT_CHUNK_W3DFILE						= 0x02157100,			// (w3d format light)
 	LIGHT_CHUNK_VARIABLES,												// other state not stored in the w3d format
@@ -102,7 +102,7 @@ enum
  *   3/21/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 LightClass::LightClass(LightType type) :
-	Type(type),	
+	Type(type),
 	Flags(0),
 	CastShadows(false),
 	Intensity(1.0f),
@@ -139,7 +139,7 @@ LightClass::LightClass(LightType type) :
  *   3/21/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 LightClass::LightClass(const LightClass & src) :
-	Type(src.Type),	
+	Type(src.Type),
 	Flags(src.Flags),
 	CastShadows(src.CastShadows),
 	Intensity(src.Intensity),
@@ -175,7 +175,7 @@ LightClass & LightClass::operator = (const LightClass & that)
 	if (this != &that) {
 		RenderObjClass::operator = (that);
 
-		Type = that.Type;	
+		Type = that.Type;
 		Flags = that.Flags;
 		CastShadows = that.CastShadows;
 		Intensity = that.Intensity;
@@ -341,7 +341,7 @@ WW3DErrorType LightClass::Load_W3D(ChunkLoadClass & cload)
 		Type = SPOT;
 		break;
 	}
-	
+
 	Enable_Shadows((lightinfo.Attributes & W3D_LIGHT_ATTRIBUTE_CAST_SHADOWS) == W3D_LIGHT_ATTRIBUTE_CAST_SHADOWS);
 	Set_Intensity(lightinfo.Intensity);
 
@@ -358,7 +358,7 @@ WW3DErrorType LightClass::Load_W3D(ChunkLoadClass & cload)
 	Vector3								vec;
 
 	while (cload.Open_Chunk()) {
-		switch(cload.Cur_Chunk_ID()) 
+		switch(cload.Cur_Chunk_ID())
 		{
 		case W3D_CHUNK_SPOT_LIGHT_INFO:
 			cload.Read(&spotinfo,sizeof(spotinfo));
@@ -367,7 +367,7 @@ WW3DErrorType LightClass::Load_W3D(ChunkLoadClass & cload)
 			W3dUtilityClass::Convert_Vector(spotinfo.SpotDirection,&vec);
 			Set_Spot_Direction(vec);
 			break;
-		
+
 		case W3D_CHUNK_NEAR_ATTENUATION:
 			cload.Read(&atteninfo,sizeof(atteninfo));
 			Set_Flag(NEAR_ATTENUATION,true);
@@ -407,8 +407,8 @@ WW3DErrorType LightClass::Save_W3D(ChunkSaveClass & csave)
 
 	W3dLightStruct lightinfo;
 	memset(&lightinfo,0,sizeof(lightinfo));
-	
-	switch (Type) 
+
+	switch (Type)
 	{
 	case POINT:
 		lightinfo.Attributes |= W3D_LIGHT_ATTRIBUTE_POINT;
@@ -432,9 +432,9 @@ WW3DErrorType LightClass::Save_W3D(ChunkSaveClass & csave)
 	W3dUtilityClass::Convert_Color(color,(&lightinfo.Diffuse));
 	Get_Specular(&color);
 	W3dUtilityClass::Convert_Color(color,(&lightinfo.Specular));
-	
+
 	lightinfo.Intensity = Get_Intensity();
-	
+
 	csave.Write(&lightinfo,sizeof(lightinfo));
 	csave.End_Chunk();
 
@@ -449,13 +449,13 @@ WW3DErrorType LightClass::Save_W3D(ChunkSaveClass & csave)
 		spotinfo.SpotDirection.Y = SpotDirection.Y;
 		spotinfo.SpotDirection.Z = SpotDirection.Z;
 		csave.Write(&spotinfo,sizeof(spotinfo));
-		
+
 		csave.End_Chunk();
 	}
 
 	if (Get_Flag(NEAR_ATTENUATION)) {
 		csave.Begin_Chunk(W3D_CHUNK_NEAR_ATTENUATION);
-		
+
 		double start,end;
 		Get_Near_Attenuation_Range(start,end);
 
@@ -470,7 +470,7 @@ WW3DErrorType LightClass::Save_W3D(ChunkSaveClass & csave)
 
 	if (Get_Flag(FAR_ATTENUATION)) {
 		csave.Begin_Chunk(W3D_CHUNK_FAR_ATTENUATION);
-		
+
 		double start,end;
 		Get_Far_Attenuation_Range(start,end);
 
@@ -484,7 +484,7 @@ WW3DErrorType LightClass::Save_W3D(ChunkSaveClass & csave)
 	}
 
 	csave.End_Chunk();
-	
+
 	return WW3D_ERROR_OK;
 }
 
@@ -503,7 +503,7 @@ WW3DErrorType LightClass::Save_W3D(ChunkSaveClass & csave)
  *=============================================================================================*/
 const PersistFactoryClass & LightClass::Get_Factory (void) const
 {
-	return _LightFactory;	
+	return _LightFactory;
 }
 
 
@@ -565,12 +565,12 @@ bool LightClass::Load (ChunkLoadClass &cload)
 					switch(cload.Cur_Micro_Chunk_ID()) {
 						READ_MICRO_CHUNK(cload,LIGHT_VARIABLE_TRANSFORM,tm);
 					}
-					cload.Close_Micro_Chunk();	
+					cload.Close_Micro_Chunk();
 				}
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h
index af685283bc5..4e0099d19c0 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef LIGHT_H
-#define LIGHT_H
 
 #include "always.h"
 #include "rendobj.h"
@@ -51,14 +45,14 @@ class ChunkSaveClass;
 
 
 /**
-** LightClass 
-** This "render object" is a light source.  
+** LightClass
+** This "render object" is a light source.
 */
 class LightClass : public RenderObjClass
 {
 public:
-	
-	enum LightType 
+
+	enum LightType
 	{
 		POINT = 0,
 		DIRECTIONAL,
@@ -68,7 +62,7 @@ class LightClass : public RenderObjClass
 	enum FlagsType
 	{
 		NEAR_ATTENUATION				= 0,
-		FAR_ATTENUATION,					
+		FAR_ATTENUATION,
 	};
 
 	LightClass(LightType type = POINT);
@@ -84,7 +78,7 @@ class LightClass : public RenderObjClass
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void			Render(RenderInfoClass & rinfo)							{ }
 	virtual bool			Is_Vertex_Processor(void)									{ return true; }
-	
+
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - "Scene Graph"
 	// Lights register themselves with the scene as VertexProcessors.
@@ -103,7 +97,7 @@ class LightClass : public RenderObjClass
 	// LightClass Interface
 	/////////////////////////////////////////////////////////////////////////////
 	LightType				Get_Type() {return (Type);}
-	
+
 	void						Set_Intensity(float inten) { Intensity = inten; }
 	float						Get_Intensity(void) const { return Intensity; }
 
@@ -120,8 +114,8 @@ class LightClass : public RenderObjClass
 	void						Get_Far_Attenuation_Range(double& fStart, double& fEnd) const	{ fStart = FarAttenStart; fEnd = FarAttenEnd; }
 	void						Set_Near_Attenuation_Range(double nStart, double nEnd)			{ NearAttenStart = nStart; NearAttenEnd = nEnd; }
 	void						Get_Near_Attenuation_Range(double& nStart, double& nEnd)	const	{ nStart = NearAttenStart; nEnd = NearAttenEnd; }
-	float						Get_Attenuation_Range(void) const										{ return FarAttenEnd; } 
-	
+	float						Get_Attenuation_Range(void) const										{ return FarAttenEnd; }
+
 	/////////////////////////////////////////////////////////////////////////////
 	// Control over the light flags
 	/////////////////////////////////////////////////////////////////////////////
@@ -167,17 +161,15 @@ class LightClass : public RenderObjClass
 	Vector3					Ambient;
 	Vector3					Diffuse;
 	Vector3					Specular;
-	
+
 	float						NearAttenStart;
 	float						NearAttenEnd;
 	float						FarAttenStart;
 	float						FarAttenEnd;
-	
+
 	float						SpotAngle;
 	float						SpotAngleCos;
 	float						SpotExponent;
 	Vector3					SpotDirection;
 	//bool						Donut; ///does this light only apply at edges
 };
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp
index 594e54c7b20..55d3eb322d4 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp
@@ -69,8 +69,8 @@ void LightEnvironmentClass::InputLightStruct::Init
 	const Vector3 & object_center
 )
 {
-	m_point = false; 
-	switch(light.Get_Type()) 
+	m_point = false;
+	switch(light.Get_Type())
 	{
 	case LightClass::POINT:
 	case LightClass::SPOT:
@@ -102,14 +102,14 @@ void LightEnvironmentClass::InputLightStruct::Init_From_Point_Or_Spot_Light
 	*/
 	double atten_start,atten_end;
 	light.Get_Far_Attenuation_Range(atten_start,atten_end);
-	
+
 	float atten = 1.0f - (dist - atten_start) / (atten_end - atten_start);
 	atten = WWMath::Clamp(atten,0.0f,1.0f);
 
 
 
 	if (light.Get_Type() == LightClass::SPOT) {
-		
+
 		Vector3 spot_dir;
 		light.Get_Spot_Direction(spot_dir);
 		Matrix3D::Rotate_Vector(light.Get_Transform(),spot_dir,&spot_dir);
@@ -127,7 +127,7 @@ void LightEnvironmentClass::InputLightStruct::Init_From_Point_Or_Spot_Light
 	light.Get_Ambient(&Ambient);
 	light.Get_Diffuse(&Diffuse);
 
-	m_point = (light.Get_Type() == LightClass::POINT); 
+	m_point = (light.Get_Type() == LightClass::POINT);
 	m_center = light.Get_Position();
 	m_innerRadius = atten_start;
 	m_outerRadius = atten_end;
@@ -139,7 +139,7 @@ void LightEnvironmentClass::InputLightStruct::Init_From_Point_Or_Spot_Light
 		DiffuseRejected = false;
 		Ambient *= atten;
 		Diffuse *= atten;
-		
+
 	} else {
 
 		DiffuseRejected = true;
@@ -169,7 +169,7 @@ float LightEnvironmentClass::InputLightStruct::Contribution(void)
 {
 	return Diffuse.Length2();
 }
-	
+
 
 /************************************************************************************************
 **
@@ -185,7 +185,7 @@ void LightEnvironmentClass::OutputLightStruct::Init
 {
 	Diffuse = input.Diffuse;
 	Matrix3D::Inverse_Rotate_Vector(camera_tm,input.Direction,&Direction);
-}	
+}
 
 
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h
index 283cc387efe..832d2ce4d65 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h
@@ -36,12 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef LIGHTENVIRONMENT_H
-#define LIGHTENVIRONMENT_H
 
 #include "always.h"
 #include "vector3.h"
@@ -57,7 +52,7 @@ class LightClass;
 ** is to collect all of the point light sources affecting an object at any given time and
 ** create temporary directional light sources representing them.  Any distance or directional
 ** attenuation will be precalculated into the overall intensity of the light and a vector from
-** the light source to the center of the bounding sphere of the model will be used as the 
+** the light source to the center of the bounding sphere of the model will be used as the
 ** directional component.
 ** In addition, the engine will provide the ambient component which will be determined by
 ** a combination of the ambient setting for the level and sampling the light maps in the area.
@@ -69,7 +64,7 @@ class LightClass;
 ** - we need the direction of the lights in eye-space
 ** - the ambient light from all lights should be added into the ambient light (not just scene)
 */
-class LightEnvironmentClass 
+class LightEnvironmentClass
 {
 public:
 
@@ -92,19 +87,19 @@ class LightEnvironmentClass
 	void					Pre_Render_Update(const Matrix3D & camera_tm);
 
 	/*
-	** Accessors 
+	** Accessors
 	*/
 	const Vector3 &	Get_Equivalent_Ambient(void) const			{ return OutputAmbient; }
 	void Set_Output_Ambient(Vector3& oa) { OutputAmbient = oa; }
 	int					Get_Light_Count(void) const					{ return LightCount; }
 	const Vector3 &	Get_Light_Direction(int i)	const				{ return InputLights[i].Direction; }
-	const Vector3 &	Get_Light_Diffuse(int i) const				{ return InputLights[i].Diffuse; }	
+	const Vector3 &	Get_Light_Diffuse(int i) const				{ return InputLights[i].Diffuse; }
 
-	bool isPointLight(int i) const {return InputLights[i].m_point;} 
-	float getPointIrad(int i) const {return InputLights[i].m_innerRadius;} 
-	float getPointOrad(int i) const {return InputLights[i].m_outerRadius;} 
-	const Vector3 &	getPointDiffuse(int i) const				{ return InputLights[i].m_diffuse; }	
-	const Vector3 &	getPointAmbient(int i) const				{ return InputLights[i].m_ambient; }	
+	bool isPointLight(int i) const {return InputLights[i].m_point;}
+	float getPointIrad(int i) const {return InputLights[i].m_innerRadius;}
+	float getPointOrad(int i) const {return InputLights[i].m_outerRadius;}
+	const Vector3 &	getPointDiffuse(int i) const				{ return InputLights[i].m_diffuse; }
+	const Vector3 &	getPointAmbient(int i) const				{ return InputLights[i].m_ambient; }
  	const Vector3 &	getPointCenter(int i)	const				{ return InputLights[i].m_center; }
 
 	/*
@@ -130,7 +125,7 @@ class LightEnvironmentClass
 		Vector3			Ambient;
 		Vector3			Diffuse;
 		bool				DiffuseRejected;
-		
+
 		bool				m_point;
 		Vector3			m_center;
 		float				m_innerRadius;
@@ -139,11 +134,11 @@ class LightEnvironmentClass
 		Vector3			m_diffuse;
 
 	};
-	
+
 	struct OutputLightStruct
 	{
 		void				Init(const InputLightStruct & input,const Matrix3D & camera_tm);
-		
+
 		Vector3			Direction;						// direction to the light.
 		Vector3			Diffuse;							// diffuse color * attenuation
 	};
@@ -159,7 +154,3 @@ class LightEnvironmentClass
 	OutputLightStruct	OutputLights[MAX_LIGHTS];	// ouput lights
 
 };
-
-
-#endif //LIGHTENVIRONMENT_H
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp
index 6958f24d78a..5133de59b86 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp
@@ -16,28 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/mapper.cpp         $* 
- *                                                                         * 
- *                  $Org Author:: Hector_y                                $* 
- *                                                                         * 
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/mapper.cpp         $*
+ *                                                                         *
+ *                  $Org Author:: Hector_y                                $*
+ *                                                                         *
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
- *                                                                         * 
- *                    $Revision:: 33                                      $* 
- *                                                                         * 
+ *                                                                         *
+ *                    $Revision:: 33                                      $*
+ *                                                                         *
  * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "mapper.h"
 #include "ww3d.h"
-#include "INI.H"
+#include "INI.h"
 #include "chunkio.h"
 #include "w3derr.h"
 #include "meshmatdesc.h"
@@ -103,11 +103,11 @@ void LinearOffsetTextureMapperClass::Apply(int uv_array_index)
 
 	// ensure both coordinates of offset are in [0, 1] range:
 	offset_u = offset_u - WWMath::Floor(offset_u);
-	offset_v = offset_v - WWMath::Floor(offset_v);	
+	offset_v = offset_v - WWMath::Floor(offset_v);
 
 	// Set up the offset matrix
 	Matrix3D m(true);
-	
+
 	// According to the docs this should work since its 2D
 	// otherwise change to translate
 	m[0].Z=offset_u;
@@ -117,7 +117,7 @@ void LinearOffsetTextureMapperClass::Apply(int uv_array_index)
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),m);
 
 	// Disable Texgen
-	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);	
+	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);
 
 	// Tell rasterizer to expect 2D texture coordinates
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
@@ -143,10 +143,10 @@ ScaleTextureMapperClass::ScaleTextureMapperClass(unsigned int stage) :
 }
 
 ScaleTextureMapperClass::ScaleTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage) :
-	TextureMapperClass(stage)	
+	TextureMapperClass(stage)
 {
 	Scale.U = ini.Get_Float(section, "UScale", 1.0f);
-	Scale.V = ini.Get_Float(section, "VScale", 1.0f);	
+	Scale.V = ini.Get_Float(section, "VScale", 1.0f);
 }
 
 ScaleTextureMapperClass::ScaleTextureMapperClass(const ScaleTextureMapperClass & src) :
@@ -158,14 +158,14 @@ ScaleTextureMapperClass::ScaleTextureMapperClass(const ScaleTextureMapperClass &
 void ScaleTextureMapperClass::Apply(int uv_array_index)
 {
 	// Set up the scale matrix
-	Matrix3D m(true);	
-	
+	Matrix3D m(true);
+
 	m[0].X=Scale.U;
 	m[1].Y=Scale.V;
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),m);
 
 	// Disable Texgen
-	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);	
+	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);
 
 	// Tell rasterizer to expect 2D texture coordinates
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
@@ -190,7 +190,7 @@ GridTextureMapperClass::GridTextureMapperClass(const INIClass &ini, const char *
 }
 
 GridTextureMapperClass::GridTextureMapperClass(const GridTextureMapperClass & src) :
-	TextureMapperClass(src),	
+	TextureMapperClass(src),
 	Sign(src.Sign),
 	MSPerFrame(src.MSPerFrame),
 	OOGridWidth(src.OOGridWidth),
@@ -209,7 +209,7 @@ void GridTextureMapperClass::Apply(int uv_array_index)
 
 	// Set up the offset matrix
 	Matrix3D m(true);
-	
+
 	// According to the docs this should work since its 2D
 	// otherwise change to translate
 	m[0].Z = u_offset;
@@ -217,7 +217,7 @@ void GridTextureMapperClass::Apply(int uv_array_index)
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage), m);
 
 	// Disable Texgen
-	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU | uv_array_index);	
+	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU | uv_array_index);
 
 	// Tell rasterizer to expect 2D texture coordinates
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
@@ -295,18 +295,18 @@ RotateTextureMapperClass::RotateTextureMapperClass(float rad_per_sec, const Vect
 {
 }
 
-RotateTextureMapperClass::RotateTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage) :	
+RotateTextureMapperClass::RotateTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage) :
 	ScaleTextureMapperClass(ini,section,stage),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	CurrentAngle(0.0f)
 {
-	RadiansPerSec=2*WWMATH_PI*ini.Get_Float(section,"Speed",0.1f);	
+	RadiansPerSec=2*WWMATH_PI*ini.Get_Float(section,"Speed",0.1f);
 	Center.U=ini.Get_Float(section,"UCenter",0.0f);
 	Center.V=ini.Get_Float(section,"VCenter",0.0f);
 }
 
 RotateTextureMapperClass::RotateTextureMapperClass(const RotateTextureMapperClass & src) :
-	ScaleTextureMapperClass(src),	
+	ScaleTextureMapperClass(src),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	RadiansPerSec(src.RadiansPerSec),
 	CurrentAngle(0.0f),
@@ -322,9 +322,9 @@ void RotateTextureMapperClass::Apply(int uv_array_index)
 
 	CurrentAngle+=RadiansPerSec * delta / 1000.0f;
 	CurrentAngle=fmodf(CurrentAngle,2*WWMATH_PI);
-	if (CurrentAngle<0.0f) CurrentAngle+=2*WWMATH_PI;	
+	if (CurrentAngle<0.0f) CurrentAngle+=2*WWMATH_PI;
 
-	// Set up the rotation matrix	
+	// Set up the rotation matrix
 	float c,s;
 	c=WWMath::Cos(CurrentAngle);
 	s=WWMath::Sin(CurrentAngle);
@@ -335,12 +335,12 @@ void RotateTextureMapperClass::Apply(int uv_array_index)
 	// add center
 	// then scale
 	m[0].Set(Scale.X*c,-Scale.X*s,-Scale.X*(c*Center.U-s*Center.V-Center.U),0.0f);
-	m[1].Set(Scale.Y*s,Scale.Y*c,-Scale.Y*(s*Center.U+c*Center.V-Center.V),0.0f);	
+	m[1].Set(Scale.Y*s,Scale.Y*c,-Scale.Y*(s*Center.U+c*Center.V-Center.V),0.0f);
 
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),m);
 
 	// Disable Texgen
-	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);	
+	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);
 
 	// Tell rasterizer to expect 2D texture coordinates
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
@@ -362,22 +362,22 @@ SineLinearOffsetTextureMapperClass::SineLinearOffsetTextureMapperClass(const INI
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	CurrentAngle(0.0f)
 {
-	UAFP.X = ini.Get_Float(section, "UAmp", 1.0f);	
+	UAFP.X = ini.Get_Float(section, "UAmp", 1.0f);
 	UAFP.Y = ini.Get_Float(section, "UFreq", 1.0f);
-	UAFP.Z = ini.Get_Float(section, "UPhase", 0.0f);	
+	UAFP.Z = ini.Get_Float(section, "UPhase", 0.0f);
 
-	VAFP.X = ini.Get_Float(section, "VAmp", 1.0f);	
+	VAFP.X = ini.Get_Float(section, "VAmp", 1.0f);
 	VAFP.Y = ini.Get_Float(section, "VFreq", 1.0f);
 	VAFP.Z = ini.Get_Float(section, "VPhase", 0.0f);
 }
 
 SineLinearOffsetTextureMapperClass::SineLinearOffsetTextureMapperClass(const SineLinearOffsetTextureMapperClass & src) :
-	TextureMapperClass(src),	
+	TextureMapperClass(src),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	UAFP(src.UAFP),
 	VAFP(src.VAFP),
 	CurrentAngle(0.0f)
-{	
+{
 }
 
 void SineLinearOffsetTextureMapperClass::Apply(int uv_array_index)
@@ -393,11 +393,11 @@ void SineLinearOffsetTextureMapperClass::Apply(int uv_array_index)
 
 	// ensure both coordinates of offset are in [0, 1] range:
 	offset_u = offset_u - WWMath::Floor(offset_u);
-	offset_v = offset_v - WWMath::Floor(offset_v);	
+	offset_v = offset_v - WWMath::Floor(offset_v);
 
 	// Set up the offset matrix
 	Matrix3D m(true);
-	
+
 	// According to the docs this should work since its 2D
 	// otherwise change to translate
 	m[0].Z=offset_u;
@@ -405,7 +405,7 @@ void SineLinearOffsetTextureMapperClass::Apply(int uv_array_index)
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),m);
 
 	// Disable Texgen
-	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);	
+	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);
 
 	// Tell rasterizer to expect 2D texture coordinates
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
@@ -428,18 +428,18 @@ StepLinearOffsetTextureMapperClass::StepLinearOffsetTextureMapperClass(const INI
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	CurrentStep(0.0f,0.0f)
 {
-	Step.U = ini.Get_Float(section, "UStep", 0.0f);	
-	Step.V = ini.Get_Float(section, "VStep", 0.0f);	
-	StepsPerSec = ini.Get_Float(section, "SPS", 0.0f);	
+	Step.U = ini.Get_Float(section, "UStep", 0.0f);
+	Step.V = ini.Get_Float(section, "VStep", 0.0f);
+	StepsPerSec = ini.Get_Float(section, "SPS", 0.0f);
 }
 
 StepLinearOffsetTextureMapperClass::StepLinearOffsetTextureMapperClass(const StepLinearOffsetTextureMapperClass & src) :
-	TextureMapperClass(src),	
+	TextureMapperClass(src),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	Step(src.Step),
 	StepsPerSec(src.StepsPerSec),
 	CurrentStep(0.0f,0.0f)
-{	
+{
 }
 
 void StepLinearOffsetTextureMapperClass::Apply(int uv_array_index)
@@ -453,14 +453,14 @@ void StepLinearOffsetTextureMapperClass::Apply(int uv_array_index)
 		LastUsedSyncTime=now;
 		CurrentStep+=Step*StepsPerSec;
 	}
-	
+
 	// ensure both coordinates of offset are in [0, 1] range:
 	CurrentStep.U -= WWMath::Floor(CurrentStep.U);
-	CurrentStep.V -= WWMath::Floor(CurrentStep.V);	
+	CurrentStep.V -= WWMath::Floor(CurrentStep.V);
 
 	// Set up the offset matrix
 	Matrix3D m(true);
-	
+
 	// According to the docs this should work since its 2D
 	// otherwise change to translate
 	m[0].Z=CurrentStep.U;
@@ -468,7 +468,7 @@ void StepLinearOffsetTextureMapperClass::Apply(int uv_array_index)
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),m);
 
 	// Disable Texgen
-	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);	
+	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);
 
 	// Tell rasterizer to expect 2D texture coordinates
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
@@ -487,13 +487,13 @@ ZigZagLinearOffsetTextureMapperClass::ZigZagLinearOffsetTextureMapperClass(const
 	TextureMapperClass(stage),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	Speed(speed),
-	Period(period)	
+	Period(period)
 {
 }
 
 ZigZagLinearOffsetTextureMapperClass::ZigZagLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage) :
 	TextureMapperClass(stage),
-	LastUsedSyncTime(WW3D::Get_Sync_Time())	
+	LastUsedSyncTime(WW3D::Get_Sync_Time())
 {
 	Speed.U = ini.Get_Float(section, "UPerSec", 0.0f);
 	Speed.V = ini.Get_Float(section, "VPerSec", 0.0f);
@@ -501,11 +501,11 @@ ZigZagLinearOffsetTextureMapperClass::ZigZagLinearOffsetTextureMapperClass(const
 }
 
 ZigZagLinearOffsetTextureMapperClass::ZigZagLinearOffsetTextureMapperClass(const ZigZagLinearOffsetTextureMapperClass & src) :
-	TextureMapperClass(src),	
-	LastUsedSyncTime(WW3D::Get_Sync_Time()),	
+	TextureMapperClass(src),
+	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	Speed(src.Speed),
 	Period(src.Period)
-{	
+{
 }
 
 void ZigZagLinearOffsetTextureMapperClass::Apply(int uv_array_index)
@@ -516,9 +516,9 @@ void ZigZagLinearOffsetTextureMapperClass::Apply(int uv_array_index)
 
 	if (time>Period)
 	{
-		LastUsedSyncTime=now;		
+		LastUsedSyncTime=now;
 	}
-	
+
 	float offset_u,offset_v;
 
 	float half_period=0.5f*Period;
@@ -534,11 +534,11 @@ void ZigZagLinearOffsetTextureMapperClass::Apply(int uv_array_index)
 
 	// ensure both coordinates of offset are in [0, 1] range:
 	offset_u = offset_u - WWMath::Floor(offset_u);
-	offset_v = offset_v - WWMath::Floor(offset_v);	
+	offset_v = offset_v - WWMath::Floor(offset_v);
 
 	// Set up the offset matrix
 	Matrix3D m(true);
-	
+
 	// According to the docs this should work since its 2D
 	// otherwise change to translate
 	m[0].Z=offset_u;
@@ -546,7 +546,7 @@ void ZigZagLinearOffsetTextureMapperClass::Apply(int uv_array_index)
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),m);
 
 	// Disable Texgen
-	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);	
+	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);
 
 	// Tell rasterizer to expect 2D texture coordinates
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
@@ -581,7 +581,7 @@ void ClassicEnvironmentMapperClass::Apply(int uv_array_index)
 
 	// Tell rasterizer to expect 2D matrices
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
-	
+
 }
 
 void EnvironmentMapperClass::Apply(int uv_array_index)
@@ -592,7 +592,7 @@ void EnvironmentMapperClass::Apply(int uv_array_index)
 	// and ignore the Z component
 	Matrix3D matenv(	0.25f, 0.0f, 0.0f, 0.5f,
 							0.0f, 0.25f, 0.0f, 0.5f,
-							0.0f, 0.0f, 1.0f, 0.0f );	
+							0.0f, 0.0f, 1.0f, 0.0f );
 
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),matenv);
 
@@ -601,7 +601,7 @@ void EnvironmentMapperClass::Apply(int uv_array_index)
 
 	// Tell rasterizer to expect 2D matrices
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
-	
+
 }
 
 EdgeMapperClass::EdgeMapperClass(unsigned int stage) :
@@ -648,7 +648,7 @@ void EdgeMapperClass::Apply(int uv_array_index)
 	// uses it to index the texture
 	Matrix3D matenv(	0.0f, 0.0f, 0.5f, 0.5f,
 							0.0f, 0.0f, 0.0f, VOffset,
-							0.0f, 0.0f, 1.0f, 0.0f );	
+							0.0f, 0.0f, 1.0f, 0.0f );
 
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),matenv);
 
@@ -660,7 +660,7 @@ void EdgeMapperClass::Apply(int uv_array_index)
 
 	// Tell rasterizer to expect 2D matrices
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
-	
+
 }
 
 void EdgeMapperClass::Reset(void)
@@ -678,16 +678,16 @@ void WSClassicEnvironmentMapperClass::Apply(int uv_array_index)
 							0.0f, 0.5f, 0.0f, 0.5f,
 							0.0f, 0.0f, 1.0f, 0.0f );
 
-	// multiply by inverse of view transform	
+	// multiply by inverse of view transform
 	Matrix4x4 mat;
-	DX8Wrapper::Get_Transform(D3DTS_VIEW,mat);	
+	DX8Wrapper::Get_Transform(D3DTS_VIEW,mat);
 	Matrix3D mat2(mat[0].X,mat[1].X,mat[2].X,0.0f,
 					  mat[0].Y,mat[1].Y,mat[2].Y,0.0f,
-					  mat[0].Z,mat[1].Z,mat[2].Z,0.0f);		
+					  mat[0].Z,mat[1].Z,mat[2].Z,0.0f);
 #ifdef ALLOW_TEMPORARIES
-	matenv=matenv*mat2;	
+	matenv=matenv*mat2;
 #else
-	matenv.postMul(mat2);	
+	matenv.postMul(mat2);
 #endif
 
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),matenv);
@@ -697,7 +697,7 @@ void WSClassicEnvironmentMapperClass::Apply(int uv_array_index)
 
 	// Tell rasterizer to expect 2D matrices
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
-	
+
 }
 
 void WSEnvironmentMapperClass::Apply(int uv_array_index)
@@ -708,28 +708,28 @@ void WSEnvironmentMapperClass::Apply(int uv_array_index)
 	// and ignore the Z component
 	Matrix3D matenv(	0.25f, 0.0f, 0.0f, 0.5f,
 							0.0f, 0.25f, 0.0f, 0.5f,
-							0.0f, 0.0f, 1.0f, 0.0f );		
+							0.0f, 0.0f, 1.0f, 0.0f );
 
-	// multiply by inverse of view transform	
-	Matrix4x4 mat;	
-	DX8Wrapper::Get_Transform(D3DTS_VIEW,mat);		
+	// multiply by inverse of view transform
+	Matrix4x4 mat;
+	DX8Wrapper::Get_Transform(D3DTS_VIEW,mat);
 	Matrix3D mat2(mat[0].X,mat[1].X,mat[2].X,0.0f,
 					  mat[0].Y,mat[1].Y,mat[2].Y,0.0f,
-					  mat[0].Z,mat[1].Z,mat[2].Z,0.0f);						  	
+					  mat[0].Z,mat[1].Z,mat[2].Z,0.0f);
 #ifdef ALLOW_TEMPORARIES
-	matenv=matenv*mat2;	
+	matenv=matenv*mat2;
 #else
-	matenv.postMul(mat2);	
+	matenv.postMul(mat2);
 #endif
 
-	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),matenv);	
+	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),matenv);
 
 	// Get camera reflection
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR);
 
 	// Tell rasterizer to expect 2D matrices
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
-	
+
 }
 
 void ScreenMapperClass::Apply(int uv_array_index)
@@ -741,12 +741,12 @@ void ScreenMapperClass::Apply(int uv_array_index)
 
 	// ensure both coordinates of offset are in [0, 1] range:
 	offset_u = offset_u - WWMath::Floor(offset_u);
-	offset_v = offset_v - WWMath::Floor(offset_v);	
+	offset_v = offset_v - WWMath::Floor(offset_v);
 
-	// multiply by projection matrix	
+	// multiply by projection matrix
 	// followed by scale and translation
-	Matrix4x4 mat;	
-	DX8Wrapper::Get_Transform(D3DTS_PROJECTION,mat);	
+	Matrix4x4 mat;
+	DX8Wrapper::Get_Transform(D3DTS_PROJECTION,mat);
 	mat[0]*=Scale.X; // entire row since we're pre-multiplying
 	mat[1]*=Scale.Y;
 	Vector4 last(mat[3]); // this gets the w
@@ -756,7 +756,7 @@ void ScreenMapperClass::Apply(int uv_array_index)
 	last*=offset_v;
 	mat[1]+=last;
 
-	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),mat);	
+	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),mat);
 
 	// Get camera space position
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACEPOSITION);
@@ -778,11 +778,11 @@ void GridClassicEnvironmentMapperClass::Apply(int uv_array_index)
 	float u_offset, v_offset;
 	calculate_uv_offset(&u_offset, &v_offset);
 
-	float del = 0.5f * OOGridWidth;	
-	// Set up the offset matrix		
+	float del = 0.5f * OOGridWidth;
+	// Set up the offset matrix
 	Matrix3D tform(	del,	0.0f,	0.0f,	u_offset + del,
 							0.0f,	del,	0.0f,	v_offset + del,
-							0.0f,	0.0f,	1.0f,	0.0f				);		
+							0.0f,	0.0f,	1.0f,	0.0f				);
 
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),tform);
 
@@ -802,17 +802,17 @@ void GridEnvironmentMapperClass::Apply(int uv_array_index)
 
 	// Set up the offset matrix
 	Matrix3D m(true);
-	
+
 	// According to the docs this should work since its 2D
 	// otherwise change to translate
 	m[0].Z = u_offset;
 	m[1].Z = v_offset;
-	
-	float del=0.5f * OOGridWidth;	
-	// Set up the offset matrix		
+
+	float del=0.5f * OOGridWidth;
+	// Set up the offset matrix
 	Matrix3D tform(	del,	0.0f,	0.0f,	u_offset + del,
 							0.0f,	del,	0.0f,	v_offset + del,
-							0.0f,	0.0f,	1.0f,	0.0f				);		
+							0.0f,	0.0f,	1.0f,	0.0f				);
 
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),tform);
 
@@ -825,7 +825,7 @@ void GridEnvironmentMapperClass::Apply(int uv_array_index)
 
 RandomTextureMapperClass::RandomTextureMapperClass(float fps, unsigned int stage):
 	TextureMapperClass(stage),
-	FPS(fps),	
+	FPS(fps),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	Speed(0.0f,0.0f)
 {
@@ -835,10 +835,10 @@ RandomTextureMapperClass::RandomTextureMapperClass(float fps, unsigned int stage
 }
 
 RandomTextureMapperClass::RandomTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage):
-	TextureMapperClass(stage),	
+	TextureMapperClass(stage),
 	LastUsedSyncTime(WW3D::Get_Sync_Time())
 {
-	FPS = ini.Get_Float(section, "FPS", 0.0f);	
+	FPS = ini.Get_Float(section, "FPS", 0.0f);
 	CurrentAngle=WWMATH_PI*(rand() & 2047)/1024.0f;
 	Center.U=(rand() & 2047)/2048.0f;
 	Center.V=(rand() & 2047)/2048.0f;
@@ -849,7 +849,7 @@ RandomTextureMapperClass::RandomTextureMapperClass(const INIClass &ini, const ch
 
 RandomTextureMapperClass::RandomTextureMapperClass(const RandomTextureMapperClass & src):
 	TextureMapperClass(src),
-	FPS(src.FPS),	
+	FPS(src.FPS),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	Speed(src.Speed)
 {
@@ -861,10 +861,10 @@ RandomTextureMapperClass::RandomTextureMapperClass(const RandomTextureMapperClas
 void RandomTextureMapperClass::Apply(int uv_array_index)
 {
 	// Set up the random matrix
-	Matrix3D m(true);	
+	Matrix3D m(true);
 
 	unsigned int delta=0;
-	
+
 	if (FPS!=0.0f)
 	{
 		float ms_per_frame=1000/FPS;
@@ -877,7 +877,7 @@ void RandomTextureMapperClass::Apply(int uv_array_index)
 			Center.U=(rand() & 2047)/2048.0f;
 			Center.V=(rand() & 2047)/2048.0f;
 		}
-	}	
+	}
 
 	m.Rotate_Z(CurrentAngle);
 	float uoff=Center.U + delta*Speed.U*0.001f;
@@ -890,7 +890,7 @@ void RandomTextureMapperClass::Apply(int uv_array_index)
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),m);
 
 	// Disable Texgen
-	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);	
+	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);
 
 	// Tell rasterizer to expect 2D texture coordinates
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
@@ -907,17 +907,17 @@ BumpEnvTextureMapperClass::BumpEnvTextureMapperClass(float rad_per_sec, float sc
 {
 }
 
-BumpEnvTextureMapperClass::BumpEnvTextureMapperClass(INIClass &ini, const char *section, unsigned int stage) :	
+BumpEnvTextureMapperClass::BumpEnvTextureMapperClass(INIClass &ini, const char *section, unsigned int stage) :
 	LinearOffsetTextureMapperClass(ini,section,stage),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	CurrentAngle(0.0f)
 {
-	RadiansPerSecond = 2*WWMATH_PI*ini.Get_Float(section,"BumpRotation",0.0f);	
+	RadiansPerSecond = 2*WWMATH_PI*ini.Get_Float(section,"BumpRotation",0.0f);
 	ScaleFactor = ini.Get_Float(section,"BumpScale",1.0f);
 }
 
 BumpEnvTextureMapperClass::BumpEnvTextureMapperClass(const BumpEnvTextureMapperClass & src) :
-	LinearOffsetTextureMapperClass(src),	
+	LinearOffsetTextureMapperClass(src),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	CurrentAngle(0.0f),
 	RadiansPerSecond(src.RadiansPerSecond),
@@ -960,7 +960,7 @@ void Reset_All_Texture_Mappers(RenderObjClass *robj, bool make_unique)
 {
 
 	if (robj->Class_ID()==RenderObjClass::CLASSID_MESH) {
-		MeshClass *mesh=(MeshClass*) robj;	
+		MeshClass *mesh=(MeshClass*) robj;
 		MaterialInfoClass *minfo = robj->Get_Material_Info();
 		if (minfo && minfo->Has_Time_Variant_Texture_Mappers()) {
 			if (make_unique) {
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
index fb383bea9dc..26a2057cf48 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
@@ -16,38 +16,32 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/mapper.h           $* 
- *                                                                         * 
- *                     $Org Author:: Greg_h                                  $* 
- *                                                                         * 
- *                       $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/mapper.h           $*
+ *                                                                         *
+ *                     $Org Author:: Greg_h                                  $*
+ *                                                                         *
+ *                       $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
- *                                                                         * 
- *                    $Revision:: 26                                      $* 
- *                                                                         * 
+ *                                                                         *
+ *                    $Revision:: 26                                      $*
+ *                                                                         *
  * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef VERTEXMAPPER_H
-#define VERTEXMAPPER_H
-
-#include "refcount.h"
+#include "always.h"
 #include "w3d_file.h"
 #include "w3derr.h"
-#include "wwdebug.h"
 #include "vector2.h"
 #include "vector3.h"
 #include "ww3d.h"
@@ -113,7 +107,7 @@ class TextureMapperClass : public W3DMPO, public RefCountClass
 class ScaleTextureMapperClass : public TextureMapperClass
 {
 	W3DMPO_GLUE(ScaleTextureMapperClass)
-public:	
+public:
 	ScaleTextureMapperClass(unsigned int stage);
 	ScaleTextureMapperClass(const Vector2 &scale, unsigned int stage);
 	ScaleTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -162,7 +156,7 @@ class LinearOffsetTextureMapperClass : public ScaleTextureMapperClass
 	}
 	void Set_LastUsedSyncTime(unsigned int time) { LastUsedSyncTime = time;}
 	unsigned int Get_LastUsedSyncTime() { return LastUsedSyncTime;}
-	
+
 protected:
 	Vector2			CurrentUVOffset;		// Current UV offset
 	Vector2			UVOffsetDeltaPerMS;	// Amount to increase offset each millisec
@@ -191,8 +185,8 @@ class GridTextureMapperClass : public TextureMapperClass
 
 	void Set_Frame(unsigned int frame) { CurrentFrame=frame; }
 	void Set_Frame_Per_Second(float fps);
-	
-protected:	
+
+protected:
 	// Utility functions
 	void initialize(float fps, unsigned int gridwidth_log2);
 	void update_temporal_state(void);
@@ -314,7 +308,7 @@ class ZigZagLinearOffsetTextureMapperClass : public TextureMapperClass
 
 private:
 	Vector2 Speed;								// Speed of zigzag
-	float Period;								// Time taken for a period	
+	float Period;								// Time taken for a period
 	unsigned int	LastUsedSyncTime;		// Sync time last used to update offset
 };
 
@@ -409,7 +403,7 @@ class GridClassicEnvironmentMapperClass : public GridTextureMapperClass
 class GridEnvironmentMapperClass : public GridTextureMapperClass
 {
 	W3DMPO_GLUE(GridEnvironmentMapperClass)
-public:	
+public:
 	GridEnvironmentMapperClass(float fps,unsigned int gridwidth, unsigned int stage):GridTextureMapperClass(fps,gridwidth,stage) { }
 	GridEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini,section,stage) { }
 	GridEnvironmentMapperClass(const GridTextureMapperClass & src) : GridTextureMapperClass(src) { }
@@ -497,5 +491,3 @@ class BumpEnvTextureMapperClass : public LinearOffsetTextureMapperClass
 ** Utility functions
 */
 void Reset_All_Texture_Mappers(RenderObjClass *robj, bool make_unique);
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.cpp
deleted file mode 100644
index ea4a07e65c4..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3d                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/matpass.cpp                            $*
- *                                                                                             *
- *              Original Author:: Greg Hjelstrom                                               *
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 06/27/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 8                                                           $*
- *                                                                                             *
- * 06/27/02 KM Changes to max texture stage caps															*
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *   MaterialPassClass::MaterialPassClass -- Constructor                                       *
- *   MaterialPassClass::~MaterialPassClass -- Destructor                                       *
- *   MaterialPassClass::Install_Materials -- Plug our material settings into D3D               *
- *   MaterialPassClass::Set_Texture -- Set texture to use                                      *
- *   MaterialPassClass::Set_Shader -- Set the shader to use                                    *
- *   MaterialPassClass::Set_Material -- set vertex material to use                             * 
- *   MaterialPassClass::Get_Texture -- Get a pointer to the texture                            *
- *   MaterialPassClass::Get_Material -- get the vertex material                                *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-#include "matpass.h"
-#include "vertmaterial.h"
-#include "shader.h"
-#include "texture.h"
-#include "statistics.h"
-#include "dx8wrapper.h"
-
-
-bool MaterialPassClass::EnablePerPolygonCulling = true;
-
-
-/***********************************************************************************************
- * MaterialPassClass::MaterialPassClass -- Constructor                                         *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/26/2001  gth : Created.                                                                 *
- *=============================================================================================*/
-MaterialPassClass::MaterialPassClass(void) : 
-	Shader(0),
-	Material(NULL),
-	CullVolume(NULL),
-	EnableOnTranslucentMeshes(true)
-{
-	for (int i=0; i<MAX_TEX_STAGES; i++) {
-		Texture[i] = NULL;
-	}
-}
-
-/***********************************************************************************************
- * MaterialPassClass::~MaterialPassClass -- Destructor                                         *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *	  06/27/02   kjm : Changes to max texture stage caps															*
- *=============================================================================================*/
-MaterialPassClass::~MaterialPassClass(void)
-{
-	for (int i=0; i<MAX_TEX_STAGES; i++) {
-		REF_PTR_RELEASE(Texture[i]);
-	}
-	REF_PTR_RELEASE(Material);
-}
-
-
-/***********************************************************************************************
- * MaterialPassClass::Install_Materials -- Plug our material settings into D3D                 *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *   2/26/2001  gth : Changed to Install_Materials                                             *
- *=============================================================================================*/
-void MaterialPassClass::Install_Materials(void) const
-{
-	DX8Wrapper::Set_Material(Peek_Material());
-	DX8Wrapper::Set_Shader(Peek_Shader());
-	for (int i=0;i<DX8Wrapper::Get_Current_Caps()->Get_Max_Textures_Per_Pass();++i) 
-	{
-		DX8Wrapper::Set_Texture(i,Peek_Texture(i));
-	}
-}
-
-
-/***********************************************************************************************
- * MaterialPassClass::Set_Texture -- Set texture to use                                        *
- *                                                                                             *
- * INPUT:                                                                                      *
- * tex - pointer to the texture for this material pass (or NULL)                               *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *=============================================================================================*/
-void MaterialPassClass::Set_Texture(TextureClass * tex,int stage)
-{
-	WWASSERT(stage >= 0);
-	WWASSERT(stage < MAX_TEX_STAGES);
-
-	REF_PTR_SET(Texture[stage],tex);
-}
-
-
-/***********************************************************************************************
- * MaterialPassClass::Set_Shader -- Set the shader to use                                      *
- *                                                                                             *
- * INPUT:                                                                                      *
- * shader - shader for this material pass                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *=============================================================================================*/
-void MaterialPassClass::Set_Shader(ShaderClass shader)
-{
-	Shader = shader;
-	Shader.Enable_Fog ("MaterialPassClass");
-}
-
-
-/***********************************************************************************************
- * MaterialPassClass::Set_Material -- set vertex material to use                               *
- *                                                                                             *
- * INPUT:                                                                                      *
- * mat - pointer to the vertex material this material pass uses                                *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *=============================================================================================*/
-void MaterialPassClass::Set_Material(VertexMaterialClass * mat)
-{
-	REF_PTR_SET(Material,mat);
-}
-
-
-/***********************************************************************************************
- * MaterialPassClass::Get_Texture -- Get a pointer to the texture                              *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- * reference counted pointer to the texture this material pass is using                        *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *=============================================================================================*/
-TextureClass * MaterialPassClass::Get_Texture(int stage) const
-{
-	WWASSERT(stage >= 0);
-	WWASSERT(stage < MAX_TEX_STAGES);
-	
-	if (Texture[stage]) {
-		Texture[stage]->Add_Ref();
-	}
-	return Texture[stage];
-}
-
-
-/***********************************************************************************************
- * MaterialPassClass::Get_Material -- get the vertex material                                  *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- * reference counted pointer to the vertex material being used by this material pass           *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *=============================================================================================*/
-VertexMaterialClass * MaterialPassClass::Get_Material(void) const
-{
-	if (Material) {
-		Material->Add_Ref();
-	}
-	return Material;
-}
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h
deleted file mode 100644
index 14c7a958420..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : ww3d                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/matpass.h                              $*
- *                                                                                             *
- *              Original Author:: Greg Hjelstrom                                               *
- *                                                                                             *
- *                      $Author:: Greg_h                                                      $*
- *                                                                                             *
- *                     $Modtime:: 5/13/01 11:25a                                              $*
- *                                                                                             *
- *                    $Revision:: 5                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef MATPASS_H
-#define MATPASS_H
-
-#ifndef REFCOUNT_H
-#include "refcount.h"
-#endif
-
-#ifndef SHADER_H
-#include "shader.h"
-#endif
-
-#ifndef WWDEBUG_H
-#include "wwdebug.h"
-#endif
-
-
-class TextureClass;
-class VertexMaterialClass;
-class MeshModelClass;
-class OBBoxClass;
-
-/**
-** MaterialPassClass
-**
-** This class wraps all of the data needed to describe an additional
-** material pass for any object.  The motivation for this class is to
-** implement certain types of special effects.  All data needed to 
-** apply the pass should be generated procedurally.  Typically a 
-** vertex processor will be used to generate any needed u-v's or vertex
-** colors.  Alternatively, we could add the option to request to
-** re-use the model's existing u-v's or vertex colors.
-**
-**
-*/
-class MaterialPassClass : public RefCountClass
-{
-public:
-
-	MaterialPassClass(void);
-	~MaterialPassClass(void);
-
-	/// MW: Had to make this virtual so app can perform direct/custom D3D setup.
-	virtual void	Install_Materials(void) const;
-	virtual void	UnInstall_Materials(void) const { };	///< reset/cleanup D3D states
-
-	void							Set_Texture(TextureClass * Texture,int stage = 0);
-	void							Set_Shader(ShaderClass shader);
-	void							Set_Material(VertexMaterialClass * mat);
-
-	TextureClass *				Get_Texture(int stage = 0) const;
-	VertexMaterialClass *	Get_Material(void) const;
-
-	TextureClass *				Peek_Texture(int stage = 0) const;
-	ShaderClass					Peek_Shader(void)	const							{ return Shader; }
-	VertexMaterialClass *	Peek_Material(void) const						{ return Material; }	
-
-	void							Set_Cull_Volume(OBBoxClass * volume)		{ CullVolume = volume; }
-	OBBoxClass *				Get_Cull_Volume(void) const					{ return CullVolume; }
-	
-	void							Enable_On_Translucent_Meshes(bool onoff)	{ EnableOnTranslucentMeshes = onoff; }
-	bool							Is_Enabled_On_Translucent_Meshes(void)		{ return EnableOnTranslucentMeshes; }
-
-	static void					Enable_Per_Polygon_Culling(bool onoff)		{ EnablePerPolygonCulling = onoff; }
-	static bool					Is_Per_Polygon_Culling_Enabled(void)		{ return EnablePerPolygonCulling; }
-
-protected:
-	
-	enum { MAX_TEX_STAGES = 2 };
-
-	TextureClass *				Texture[MAX_TEX_STAGES];
-	ShaderClass					Shader;
-	VertexMaterialClass *	Material;
-	bool							EnableOnTranslucentMeshes;
-
-	OBBoxClass *				CullVolume;
-	static bool					EnablePerPolygonCulling;
-
-};
-
-
-inline TextureClass * MaterialPassClass::Peek_Texture(int stage) const
-{	
-	WWASSERT(stage >= 0);
-	WWASSERT(stage < MAX_TEX_STAGES);
-	return Texture[stage];
-}
-
-
-#endif // MATPASS_H
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp
index 23b474a5028..c79c159e47c 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp
@@ -67,7 +67,7 @@ MatrixMapperClass::MatrixMapperClass(int stage) :
 	ViewToTexture(true),
 	ViewToPixel(true),
 	GradientUCoord(0.5f)
-{	
+{
 	ViewSpaceProjectionNormal = Vector3(0.0f,0.0f,0.0f);
 }
 
@@ -103,7 +103,7 @@ void MatrixMapperClass::Set_Texture_Transform(const Matrix3D & view_to_texture,f
  *=============================================================================================*/
 void	MatrixMapperClass::Set_Texture_Transform(const Matrix4x4 & view_to_texture,float texsize)
 {
-	ViewToTexture=view_to_texture;	
+	ViewToTexture=view_to_texture;
 
 	Update_View_To_Pixel_Transform(texsize);
 }
@@ -123,9 +123,9 @@ void	MatrixMapperClass::Set_Texture_Transform(const Matrix4x4 & view_to_texture,
 void MatrixMapperClass::Update_View_To_Pixel_Transform(float tex_size)
 {
 	/*
-	** Create a ViewToPixel matrix which also does all of the offseting and flipping that has 
+	** Create a ViewToPixel matrix which also does all of the offseting and flipping that has
 	** to take place to get the actual texture coordinates.
-	** 
+	**
 	** Here is a description of the math:
 	** If you transform eye-space points with the ViewToTexture matrix, you then need to compute:
 	** s = ((x/w) + 1.0f) * 0.5f * ((texwid-2)/texwid)
@@ -140,7 +140,7 @@ void MatrixMapperClass::Update_View_To_Pixel_Transform(float tex_size)
 	** | 0 -K 0 K |
 	** | 0  0 1 0 |
 	** | 0  0 0 1 |
-	** 
+	**
 	** The code below manually "optimally" pre-multiplies this matrix with the ViewToTexture matrix
 	**
 	** In addition, the z-coordinate is modified so that it goes from 0 to 1 rather than -1 to +1.
@@ -207,14 +207,14 @@ void MatrixMapperClass::Apply(int uv_array_index)
 {
 	Matrix4x4 m;
 
-	switch (Type) 
+	switch (Type)
 	{
 	case ORTHO_PROJECTION:
 		/*
 		** Orthographic projection
 		*/
 		DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0 + Stage),ViewToPixel);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(uv_array_index,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACEPOSITION);		
+		DX8Wrapper::Set_DX8_Texture_Stage_State(uv_array_index,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACEPOSITION);
 		DX8Wrapper::Set_DX8_Texture_Stage_State(uv_array_index,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
 		break;
 	case PERSPECTIVE_PROJECTION:
@@ -225,13 +225,13 @@ void MatrixMapperClass::Apply(int uv_array_index)
 		m[1]=ViewToPixel[1];
 		m[2]=ViewToPixel[3];
 		DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0 + Stage),m);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(uv_array_index,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACEPOSITION);		
+		DX8Wrapper::Set_DX8_Texture_Stage_State(uv_array_index,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACEPOSITION);
 		DX8Wrapper::Set_DX8_Texture_Stage_State(uv_array_index,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_PROJECTED|D3DTTFF_COUNT3);
 		break;
 	case DEPTH_GRADIENT:
 		/*
-		** Depth gradient, Set up second stage texture coordinates to 
-		** apply a depth gradient to the projection.  Note that the 
+		** Depth gradient, Set up second stage texture coordinates to
+		** apply a depth gradient to the projection.  Note that the
 		** depth values have been set up to vary from 0 to 1 in the
 		** Update_View_To_Pixel_Transform function.
 		*/
@@ -251,10 +251,10 @@ void MatrixMapperClass::Apply(int uv_array_index)
 		m[0].Set(0,0,0,GradientUCoord);
 		m[1].Set(ViewSpaceProjectionNormal.X,ViewSpaceProjectionNormal.Y,ViewSpaceProjectionNormal.Z, 0);
 		DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0 + Stage),m);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(uv_array_index,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACENORMAL);		
+		DX8Wrapper::Set_DX8_Texture_Stage_State(uv_array_index,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACENORMAL);
 		DX8Wrapper::Set_DX8_Texture_Stage_State(uv_array_index,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
 		break;
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h
index 62a6a3bda14..1e9f8ecc21d 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 8                                                           $*
@@ -37,9 +37,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef MATRIXMAPPER_H
-#define MATRIXMAPPER_H
+#pragma once
 
 #include "always.h"
 #include "bittype.h"
@@ -50,7 +48,7 @@
 // Hector Yee 1/29/01
 
 /**
-** MatrixMapperClass.  Does the chore of computing the u-v coorinates for 
+** MatrixMapperClass.  Does the chore of computing the u-v coorinates for
 ** a projected texture.  Note that this VP must be "baby-sat" by something
 ** external to ensure that its ViewToTexture transform is up-to-date.  I
 ** use it in the TexProjectClass to implement projected textures.
@@ -58,7 +56,7 @@
 ** NOTE: for projected textures, the equation for computing a valid ViewToTexture
 ** transform is as follows (assuming my usual column vectors, etc):
 **                                                        -1
-** ViewToTexture = Projection * Mwrld-shadow * Mwrld-camera 
+** ViewToTexture = Projection * Mwrld-shadow * Mwrld-camera
 */
 class MatrixMapperClass : public TextureMapperClass
 {
@@ -82,8 +80,8 @@ class MatrixMapperClass : public TextureMapperClass
 	** Interface
 	*/
 	void						Set_Flag(uint32 flag,bool onoff);
-	bool						Get_Flag(uint32 flag) const;	
-	
+	bool						Get_Flag(uint32 flag) const;
+
 	void						Set_Type(MappingType type);
 	MappingType				Get_Type(void);
 
@@ -101,7 +99,7 @@ class MatrixMapperClass : public TextureMapperClass
 	virtual void			Apply(int uv_array_index);
 
 protected:
-	
+
 	void						Update_View_To_Pixel_Transform(float texsize);
 
 	uint32					Flags;
@@ -112,18 +110,18 @@ class MatrixMapperClass : public TextureMapperClass
 	float						GradientUCoord;
 };
 
-inline void MatrixMapperClass::Set_Flag(uint32 flag,bool onoff)	
-{ 
-	if (onoff) { 
-		Flags |= flag; 
-	} else { 
-		Flags &= ~flag; 
-	} 
+inline void MatrixMapperClass::Set_Flag(uint32 flag,bool onoff)
+{
+	if (onoff) {
+		Flags |= flag;
+	} else {
+		Flags &= ~flag;
+	}
 }
 
 inline bool MatrixMapperClass::Get_Flag(uint32 flag) const
-{ 
-	return (Flags & flag) == flag; 
+{
+	return (Flags & flag) == flag;
 }
 
 inline void MatrixMapperClass::Set_Type(MappingType type)
@@ -137,8 +135,6 @@ inline MatrixMapperClass::MappingType MatrixMapperClass::Get_Type(void)
 }
 
 inline const Matrix4x4 & MatrixMapperClass::Get_Texture_Transform(void) const
-{ 
-	return ViewToTexture; 
+{
+	return ViewToTexture;
 }
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp
index 55ac38b10e5..178db80b333 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /VSS_Sync/ww3d2/mesh.cpp 56    8/29/01 9:50p Vss_sync $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MESH.CPP                                                     * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/11/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 12, 1997 [GH]                                           * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MESH.cpp                                                     *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/11/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 12, 1997 [GH]                                           *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   MeshClass::MeshClass -- Constructor for MeshClass                                         *
  *   MeshClass::MeshClass -- Copy Constructor for MeshClass                                    *
  *	  MeshClass::operator == -- assignment operator for MeshClass                               *
@@ -47,7 +47,7 @@
  *   MeshClass::Scale -- Scales the mesh                                                       *
  *   MeshClass::Scale -- Scales the mesh                                                       *
  *   MeshClass::Init -- Init the mesh from a MeshBuilder object                                *
- *   MeshClass::Load -- creates a mesh out of a mesh chunk in a .w3d file                      * 
+ *   MeshClass::Load -- creates a mesh out of a mesh chunk in a .w3d file                      *
  *   MeshClass::Cast_Ray -- compute a ray intersection with this mesh                          *
  *   MeshClass::Cast_AABox -- cast an AABox against this mesh                                  *
  *   MeshClass::Cast_OBBox -- Cast an obbox against this mesh                                  *
@@ -55,18 +55,18 @@
  *   MeshClass::Intersect_OBBox -- test for intersection with the given OBBox                  *
  *   MeshClass::Generate_Culling_Tree -- Generates a hierarchical culling tree for the mesh    *
  *   MeshClass::Direct_Load -- read the w3d file directly into this mesh object                *
- *   MeshClass::read_chunks -- read all of the chunks from the .wtm file                       * 
- *	  MeshClass::read_vertices -- reads the vertex chunk                                        * 
+ *   MeshClass::read_chunks -- read all of the chunks from the .wtm file                       *
+ *	  MeshClass::read_vertices -- reads the vertex chunk                                        *
  *   MeshClass::read_texcoords -- read in the texture coordinates chunk                        *
  *   MeshClass::install_texture_coordinates -- installs the given u-v's in each channel that is*
- *   MeshClass::read_vertex_normals -- reads a surrender normal chunk from the wtm file        * 
+ *   MeshClass::read_vertex_normals -- reads a surrender normal chunk from the wtm file        *
  *   MeshClass::read_v3_materials -- Reads in version 3 materials.                             *
  *   MeshClass::read_map -- Reads definition of a texture map from the file                    *
  *   MeshClass::read_triangles -- read the triangles chunk                                     *
  *   MeshClass::read_per_tri_materials -- read the material indices for each triangle          *
- *   MeshClass::read_user_text -- read in the user text chunk                                  * 
- *   MeshClass::read_vertex_colors -- read in the vertex colors chunk                          * 
- *   MeshClass::read_vertex_influences -- read in the vertex influences chunk                  * 
+ *   MeshClass::read_user_text -- read in the user text chunk                                  *
+ *   MeshClass::read_vertex_colors -- read in the vertex colors chunk                          *
+ *   MeshClass::read_vertex_influences -- read in the vertex influences chunk                  *
  *   MeshClass::Get_Material_Info -- returns a pointer to the material info                    *
  *   MeshClass::Create_Decal -- creates a decal on this mesh                                   *
  *   MeshClass::Delete_Decal -- removes a decal from this mesh                                 *
@@ -88,7 +88,6 @@
 
 #include "mesh.h"
 #include <assert.h>
-#include <string.h>
 #include "w3d_file.h"
 #include "assetmgr.h"
 #include "w3derr.h"
@@ -118,7 +117,6 @@
 #include "dx8renderer.h"
 #include "visrasterizer.h"
 #include "wwmemlog.h"
-#include <stdio.h>
 #include <wwprofile.h>
 
 
@@ -126,7 +124,7 @@ bool MeshClass::Legacy_Meshes_Fogged = true;
 
 /*
 ** This #define causes the collision code to always recompute the triangle normals rather
-** than using the ones in the model. 
+** than using the ones in the model.
 ** TODO: ensure that the models have unit normals and start re-using them again or write
 ** collision code to handle non-unit normals!
 */
@@ -237,7 +235,7 @@ MeshClass & MeshClass::operator = (const MeshClass & that)
  * HISTORY:                                                                                    *
  *   1/6/98     GTH : Created.                                                                 *
  *=============================================================================================*/
-MeshClass::~MeshClass(void) 
+MeshClass::~MeshClass(void)
 {
 	Free();
 }
@@ -315,8 +313,8 @@ RenderObjClass * MeshClass::Clone(void) const
  *   5/15/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 const char * MeshClass::Get_Name(void) const
-{ 
-	return Model->Get_Name(); 
+{
+	return Model->Get_Name();
 }
 
 
@@ -350,8 +348,8 @@ void MeshClass::Set_Name(const char * name)
  *   5/15/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 uint32 MeshClass::Get_W3D_Flags(void)
-{ 
-	return Model->W3dAttributes; 
+{
+	return Model->W3dAttributes;
 }
 
 
@@ -368,9 +366,9 @@ uint32 MeshClass::Get_W3D_Flags(void)
  *   5/15/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 const char * MeshClass::Get_User_Text(void) const
-{ 
-	return Model->Get_User_Text(); 
-}		
+{
+	return Model->Get_User_Text();
+}
 
 
 /***********************************************************************************************
@@ -386,11 +384,11 @@ const char * MeshClass::Get_User_Text(void) const
  *   5/20/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 MaterialInfoClass * MeshClass::Get_Material_Info(void)
-{ 
+{
 	if (Model) {
 		if (Model->MatInfo) {
 			Model->MatInfo->Add_Ref();
-			return Model->MatInfo; 
+			return Model->MatInfo;
 		}
 	}
 	return NULL;
@@ -437,7 +435,7 @@ void MeshClass::Scale(float scale)
 	Make_Unique();
 	Model->Make_Geometry_Unique();
 	Model->Scale(sc);
-	
+
    Invalidate_Cached_Bounding_Volumes();
 
    // Now update the object space bounding volumes of this object's container:
@@ -469,7 +467,7 @@ void MeshClass::Scale(float scalex, float scaley, float scalez)
 	Make_Unique();
 	Model->Make_Geometry_Unique();
 	Model->Scale(sc);
-	
+
    Invalidate_Cached_Bounding_Volumes();
 
    // Now update the object space bounding volumes of this object's container:
@@ -551,9 +549,9 @@ void MeshClass::Create_Decal(DecalGeneratorClass * generator)
 	if (Is_Translucent() && (generator->Is_Applied_To_Translucent_Meshes() == false)) {
 		return;
 	}
-	
+
 	if (!Model->Get_Flag(MeshGeometryClass::SKIN)) {
-		
+
 		// Rigid mesh
 		Matrix3D modeltm_inv;
 		OBBoxClass localbox;
@@ -564,7 +562,7 @@ void MeshClass::Create_Decal(DecalGeneratorClass * generator)
 		// generate apt, if it is not empty, add a decal.
 		SimpleDynVecClass<uint32> temp_apt;
 		Model->Generate_Rigid_APT(localbox, temp_apt);
-		
+
 		if (temp_apt.Count() > 0) {
 			if (DecalMesh == NULL) {
 				DecalMesh =		NEW_REF(RigidDecalMeshClass, (this, generator->Peek_Decal_System()));
@@ -573,8 +571,8 @@ void MeshClass::Create_Decal(DecalGeneratorClass * generator)
 		}
 
 	} else {
-		
-		WWDEBUG_SAY(("PERFORMANCE WARNING: Decal being applied to a SKIN mesh!\r\n"));
+
+		WWDEBUG_SAY(("PERFORMANCE WARNING: Decal being applied to a SKIN mesh!"));
 
 		// Skin
 		// The deformed worldspace vertices are used both for the APT and in Create_Decal() to
@@ -591,7 +589,7 @@ void MeshClass::Create_Decal(DecalGeneratorClass * generator)
 
 		// We compare the worldspace box vs. the worldspace vertices
 		Model->Generate_Skin_APT(worldbox, temp_apt, dst_vert);
-		
+
 		// if it is not empty, add a decal
 		if (temp_apt.Count() > 0) {
 			if (DecalMesh == NULL) {
@@ -682,10 +680,10 @@ void MeshClass::Render(RenderInfoClass & rinfo)
 		const FrustumClass & frustum=rinfo.Camera.Get_Frustum();
 
 		if (	Model->Get_Flag(MeshGeometryClass::SKIN) ||
-				CollisionMath::Overlap_Test(frustum,Get_Bounding_Box())!=CollisionMath::OUTSIDE ) 
+				CollisionMath::Overlap_Test(frustum,Get_Bounding_Box())!=CollisionMath::OUTSIDE )
 		{
 			bool rendered_something = false;
-			
+
 			/*
 			** If this mesh model has never been rendered, we need to generate the DX8 datastructures
 			*/
@@ -737,7 +735,7 @@ void MeshClass::Render(RenderInfoClass & rinfo)
 			** for rendering
 			*/
 			for (int i=0; i<rinfo.Additional_Pass_Count(); i++) {
-				
+
 				MaterialPassClass * matpass = rinfo.Peek_Additional_Pass(i);
 
 				if ((!Is_Translucent()) || (matpass->Is_Enabled_On_Translucent_Meshes())) {
@@ -818,7 +816,7 @@ void MeshClass::Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass *
 		pass->Install_Materials();
 		DX8Wrapper::Set_Index_Buffer(ib,0);
 
-		SNAPSHOT_SAY(("Set_World_Identity\n"));
+		SNAPSHOT_SAY(("Set_World_Identity"));
 		DX8Wrapper::Set_World_Identity();
 
 		DX8PolygonRendererListIterator it(&Model->PolygonRendererList);
@@ -842,29 +840,29 @@ void MeshClass::Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass *
 		pass->UnInstall_Materials();
 
 	} else if ((pass->Get_Cull_Volume() != NULL) && (MaterialPassClass::Is_Per_Polygon_Culling_Enabled())) {
-		
+
 		/*
-		** Generate the APT 
+		** Generate the APT
 		*/
 		static SimpleDynVecClass<uint32> temp_apt;
 		temp_apt.Delete_All(false);
-			
+
 		Matrix3D modeltminv;
 		Get_Transform().Get_Orthogonal_Inverse(modeltminv);
-		
+
 		OBBoxClass localbox;
 		OBBoxClass::Transform(modeltminv,*(pass->Get_Cull_Volume()),&localbox);
 
 		Vector3 view_dir;
 		localbox.Basis.Get_Z_Vector(&view_dir);
 		view_dir = -view_dir;
-			
+
 		if (Model->Has_Cull_Tree()) {
 			Model->Generate_Rigid_APT(localbox,view_dir,temp_apt);
 		} else {
 			Model->Generate_Rigid_APT(view_dir,temp_apt);
 		}
-	
+
 		if (temp_apt.Count() > 0) {
 
 			int buftype = BUFFER_TYPE_DYNAMIC_DX8;
@@ -909,7 +907,7 @@ void MeshClass::Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass *
 			*/
 			int vertex_offset = Model->PolygonRendererList.Peek_Head()->Get_Vertex_Offset();
 			pass->Install_Materials();
-			
+
 			DX8Wrapper::Set_Transform(D3DTS_WORLD,Get_Transform());
 			DX8Wrapper::Set_Index_Buffer(dynamic_ib,vertex_offset);
 
@@ -921,8 +919,8 @@ void MeshClass::Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass *
 			//MW: Need uninstall custom materials in case they leave D3D in unknown state
 			pass->UnInstall_Materials();
 		}
-	} else {		
-		
+	} else {
+
 		/*
 		** Normal mesh case, render polys with this mesh's transform
 		*/
@@ -945,7 +943,7 @@ void MeshClass::Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass *
 		pass->Install_Materials();
 		DX8Wrapper::Set_Index_Buffer(ib,0);
 
-		SNAPSHOT_SAY(("Set_World_Transform\n"));
+		SNAPSHOT_SAY(("Set_World_Transform"));
 		DX8Wrapper::Set_Transform(D3DTS_WORLD,Transform);
 
 		DX8PolygonRendererListIterator it(&Model->PolygonRendererList);
@@ -955,7 +953,7 @@ void MeshClass::Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass *
 				it.Peek_Obj()->Render(BaseVertexOffset);
 			it.Next();
 		}
-		
+
 		if (oldOpacity >= 0)
 		{	//opacity was modified for this mesh instance, so need to restore the material setting which may be shared
 			//among other instances.
@@ -989,9 +987,9 @@ void MeshClass::Special_Render(SpecialRenderInfoClass & rinfo)
 	if ((Is_Not_Hidden_At_All() == false) && (rinfo.RenderType != SpecialRenderInfoClass::RENDER_SHADOW)) {
 		return;
 	}
-	
+
 	if (rinfo.RenderType == SpecialRenderInfoClass::RENDER_VIS) {
-	
+
 		WWASSERT(rinfo.VisRasterizer != NULL);
 		if (Model->Get_Flag(MeshModelClass::SKIN) == 0) {
 
@@ -1081,17 +1079,17 @@ void MeshClass::Make_Unique(bool force_meshmdl_clone)
 	REF_PTR_RELEASE(newmesh);
 }
 
-/*********************************************************************************************** 
- * MeshClass::Load -- creates a mesh out of a mesh chunk in a .w3d file                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * 																														  * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/12/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshClass::Load -- creates a mesh out of a mesh chunk in a .w3d file                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * 																														  *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/12/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WW3DErrorType MeshClass::Load_W3D(ChunkLoadClass & cload)
 {
@@ -1107,7 +1105,7 @@ WW3DErrorType MeshClass::Load_W3D(ChunkLoadClass & cload)
 	*/
 	Model = NEW_REF(MeshModelClass,());
 	if (Model == NULL) {
-		WWDEBUG_SAY(("MeshClass::Load - Failed to allocate model\r\n"));
+		WWDEBUG_SAY(("MeshClass::Load - Failed to allocate model"));
 		return WW3D_ERROR_LOAD_FAILED;
 	}
 
@@ -1125,7 +1123,7 @@ WW3DErrorType MeshClass::Load_W3D(ChunkLoadClass & cload)
 	int col_bits = (Model->W3dAttributes & W3D_MESH_FLAG_COLLISION_TYPE_MASK) >> W3D_MESH_FLAG_COLLISION_TYPE_SHIFT;
 	Set_Collision_Type( col_bits << 1 );
 	Set_Hidden(Model->W3dAttributes & W3D_MESH_FLAG_HIDDEN);
-	
+
 	/*
 	** Indicate whether this mesh is translucent.  The mesh is considered translucent
 	** if sorting has been enabled (alpha blending on pass 0) or if pass0 contains alpha-test.
@@ -1189,7 +1187,7 @@ bool MeshClass::Cast_Ray(RayCollisionTestClass & raytest)
 			Vector3 mesh_position;
 			world.Get_Translation(&mesh_position);
 			world.Obj_Look_At(mesh_position,mesh_position - raytest.Ray.Get_Dir(),0.0f);
-	} else if (Model->Get_Flag(MeshModelClass::ORIENTED)) {		
+	} else if (Model->Get_Flag(MeshModelClass::ORIENTED)) {
 			Vector3 mesh_position;
 			world.Get_Translation(&mesh_position);
 			world.Obj_Look_At(mesh_position,raytest.Ray.Get_P0(),0.0f);
@@ -1199,9 +1197,9 @@ bool MeshClass::Cast_Ray(RayCollisionTestClass & raytest)
 	RayCollisionTestClass objray(raytest,world_to_obj);
 
 	WWASSERT(Model);
-	
+
 	bool hit = Model->Cast_Ray(objray);
-	
+
 	// transform result back into original coordinate system
 	if (hit) {
 		raytest.CollidedRenderObj = this;
@@ -1210,7 +1208,7 @@ bool MeshClass::Cast_Ray(RayCollisionTestClass & raytest)
 			Matrix3D::Transform_Vector(world,raytest.Result->ContactPoint, &(raytest.Result->ContactPoint));
 		}
 	}
-	
+
 	return hit;
 }
 
@@ -1428,12 +1426,12 @@ void MeshClass::Add_Dependencies_To_List
 	//
 	MaterialInfoClass *material = Get_Material_Info ();
 	if (material != NULL) {
-		
+
 		//
 		// Loop through all the textures and add their filenames to our list
 		//
 		for (int index = 0; index < material->Texture_Count (); index ++) {
-			
+
 			//
 			//	Add this texture's filename to the list
 			//
@@ -1442,7 +1440,7 @@ void MeshClass::Add_Dependencies_To_List
 				file_list.Add (texture->Get_Full_Path ());
 			}
 		}
-		
+
 		//
 		// Release our hold on the material information object
 		//
@@ -1516,15 +1514,15 @@ void Set_MeshModel_Flag(RenderObjClass *robj, int flag, int onoff)
 }
 
 int MeshClass::Get_Sort_Level(void) const
-{ 
+{
 	if (Model) {
 		return (Model->Get_Sort_Level());
 	}
 	return(SORT_LEVEL_NONE);
-}	
+}
 
 void MeshClass::Set_Sort_Level(int level)
-{ 
+{
 	if (Model) {
 		Model->Set_Sort_Level(level);
 	}
@@ -1538,7 +1536,7 @@ int MeshClass::Get_Draw_Call_Count(void) const
 		if (prcount > 0) {
 			return prcount;
 		}
-		
+
 		// Otherwise if we have textures, return the number of textures (e.g. dont have prs when sorting)
 		if ((Model->MatInfo != NULL) && (Model->MatInfo->Texture_Count() > 0)) {
 			return Model->MatInfo->Texture_Count();
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
index da29a46fc3e..c1633d5a0ea 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
@@ -17,31 +17,25 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/mesh.h 16    11/07/01 5:50p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MESH.H                                                       * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/11/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 11, 1997 [GH]                                           * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MESH.h                                                       *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/11/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 11, 1997 [GH]                                           *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MESH_H
-#define MESH_H
 
 #include "always.h"
 #include "rendobj.h"
@@ -82,7 +76,7 @@ class MeshClass : public W3DMPO, public RenderObjClass
 	virtual ~MeshClass(void);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const { return CLASSID_MESH; }
@@ -95,13 +89,13 @@ class MeshClass : public W3DMPO, public RenderObjClass
 
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Collision Detection
-	/////////////////////////////////////////////////////////////////////////////	
+	/////////////////////////////////////////////////////////////////////////////
 	virtual bool					Cast_Ray(RayCollisionTestClass & raytest);
 	virtual bool					Cast_AABox(AABoxCollisionTestClass & boxtest);
 	virtual bool					Cast_OBBox(OBBoxCollisionTestClass & boxtest);
 	virtual bool					Intersect_AABox(AABoxIntersectionTestClass & boxtest);
 	virtual bool					Intersect_OBBox(OBBoxIntersectionTestClass & boxtest);
-   
+
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Bounding Volumes
 	/////////////////////////////////////////////////////////////////////////////
@@ -114,9 +108,9 @@ class MeshClass : public W3DMPO, public RenderObjClass
 	virtual void					Scale(float scale);
 	virtual void					Scale(float scalex, float scaley, float scalez);
 	virtual MaterialInfoClass * Get_Material_Info(void);
-	
+
    virtual int						Get_Sort_Level(void) const;
-   virtual void					Set_Sort_Level(int level);	
+   virtual void					Set_Sort_Level(int level);
 
 
 	/////////////////////////////////////////////////////////////////////////////
@@ -124,7 +118,7 @@ class MeshClass : public W3DMPO, public RenderObjClass
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void					Create_Decal(DecalGeneratorClass * generator);
 	virtual void					Delete_Decal(uint32 decal_id);
-	
+
 	/////////////////////////////////////////////////////////////////////////////
 	// MeshClass Interface
 	/////////////////////////////////////////////////////////////////////////////
@@ -149,7 +143,7 @@ class MeshClass : public W3DMPO, public RenderObjClass
 
 	void								Set_Lighting_Environment(LightEnvironmentClass * light_env) { if (light_env) {m_localLightEnv=*light_env;LightEnvironment = &m_localLightEnv;} else {LightEnvironment = NULL;} }
 	LightEnvironmentClass *		Get_Lighting_Environment(void) { return LightEnvironment; }
-	inline float	Get_Alpha_Override(void) { return m_alphaOverride;}
+	float	Get_Alpha_Override(void) { return m_alphaOverride;}
 
 	void								Set_Next_Visible_Skin(MeshClass * next_visible) { NextVisibleSkin = next_visible; }
 	MeshClass *						Peek_Next_Visible_Skin(void) { return NextVisibleSkin; }
@@ -208,6 +202,3 @@ inline MeshModelClass * MeshClass::Peek_Model(void)
 // model. This is useful for stuff like making a RenderObjects' polys sort.
 //void Set_MeshModel_Flag(RenderObjClass *robj, MeshModelClass::FlagsType flag, int onoff);
 void Set_MeshModel_Flag(RenderObjClass *robj, int flag, int onoff);
-
-#endif /*MESH_H*/
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp
index 7ed0791ae8c..db16e9d09f2 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp
@@ -61,7 +61,6 @@
 #include "meshbuild.h"
 #include "uarray.h"
 #include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 
 
@@ -83,7 +82,7 @@ static int vertex_compare(const void *elem1, const void *elem2);
 
 typedef int (*COMPARE_FUNC_TYPE)(const void * elem1,const void * elem2);
 
-COMPARE_FUNC_TYPE Texture_Compare_Funcs[MeshBuilderClass::MAX_PASSES][MeshBuilderClass::MAX_STAGES] = 
+COMPARE_FUNC_TYPE Texture_Compare_Funcs[MeshBuilderClass::MAX_PASSES][MeshBuilderClass::MAX_STAGES] =
 {
 	{ pass0_stage0_compare, pass0_stage1_compare },
 	{ pass1_stage0_compare, pass1_stage1_compare },
@@ -95,7 +94,7 @@ COMPARE_FUNC_TYPE Texture_Compare_Funcs[MeshBuilderClass::MAX_PASSES][MeshBuilde
 /************************************************************************************
 **
 ** FaceHasherClass, support class for the unique faces hash table.  The unique
-** faces table is going to detect exactly duplicated faces and discard them.  It 
+** faces table is going to detect exactly duplicated faces and discard them.  It
 ** appears that the artists occasionally accidentally duplicate a face which causes
 ** problems in the stripping algorithm...
 **
@@ -104,40 +103,40 @@ class FaceHasherClass : public HashCalculatorClass<MeshBuilderClass::FaceClass>
 {
 public:
 
-	virtual bool	Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) 
+	virtual bool	Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b)
 	{
 		// Note: if we want this to detect duplicates that are "rotated", must change
 		// both this function and the Compute_Hash function...
-		return 
+		return
 		(
-			(a.VertIdx[0] == b.VertIdx[0]) && 
-			(a.VertIdx[1] == b.VertIdx[1]) && 
+			(a.VertIdx[0] == b.VertIdx[0]) &&
+			(a.VertIdx[1] == b.VertIdx[1]) &&
 			(a.VertIdx[2] == b.VertIdx[2])
 		);
 	}
 
 	virtual void	Compute_Hash(const MeshBuilderClass::FaceClass & item)
 	{
-		HashVal = (int)(item.VertIdx[0]*12345.6f + item.VertIdx[1]*1714.38484f + item.VertIdx[2]*27561.3f)&1023; 
+		HashVal = (int)(item.VertIdx[0]*12345.6f + item.VertIdx[1]*1714.38484f + item.VertIdx[2]*27561.3f)&1023;
 	}
 
-	virtual int		Num_Hash_Bits(void) 
-	{ 
-		return 10;  
+	virtual int		Num_Hash_Bits(void)
+	{
+		return 10;
 	}
-	
+
 	virtual int		Num_Hash_Values(void)
 	{
-		return 1;	
+		return 1;
 	}
-	
+
 	virtual int		Get_Hash_Value(int /*index*/)
 	{
 		return HashVal;
 	}
 
 private:
-	
+
 	int HashVal;
 
 };
@@ -154,12 +153,12 @@ class VertexArrayClass
 {
 public:
 
-	enum 
-	{ 
+	enum
+	{
 		HASH_TABLE_SIZE = 4096,
 	};
 
-	VertexArrayClass(int maxsize,int match_normals = 0) 
+	VertexArrayClass(int maxsize,int match_normals = 0)
 	{
 		Verts = NULL;
 		assert(maxsize > 0);
@@ -217,9 +216,9 @@ class VertexArrayClass
 
 		for (x = xstart - EPSILON; x <= xstart + EPSILON + 0.0000001; x+= EPSILON) {
 			for (y = ystart - EPSILON; y <= ystart + EPSILON + 0.000001; y+= EPSILON) {
-				
+
 				hash = compute_hash((float)x,(float)y);
-		
+
 				if (hash != lasthash) {
 					MeshBuilderClass::VertClass * test_vert = HashTable[hash];
 					while (test_vert) {
@@ -227,13 +226,13 @@ class VertexArrayClass
 						if (Verts_Shading_Match(vert,*test_vert)) {
 							if (shadeindex == 0xFFFFFFFF) {
 								shadeindex = test_vert->UniqueIndex;
-							
+
 								// mask the "master" smoothed vertex's smoothing group with our
 								// face's smoothing group since we are going to be smoothed with it.
 								Verts[shadeindex].SharedSmGroup &= vert.SmGroup;
 							}
 						}
-							
+
 						if (Verts_Match(vert,*test_vert)) {
 							return test_vert->UniqueIndex;
 						}
@@ -263,10 +262,10 @@ class VertexArrayClass
 			Verts[newindex].ShadeIndex = shadeindex;
 
 		}
-		
+
 		// This is a new vertex, store the face's smoothing group with it
 		//Verts[newindex].SmoothingGroup = face_smooth_group;
-		
+
 		// And add to the hash table
 		x = (vert.Position.X - Center.X) / Extent.X;
 		y = (vert.Position.Y - Center.Y) / Extent.Y;
@@ -304,7 +303,7 @@ class VertexArrayClass
 			if (v0.DiffuseIllumination[pass] != v1.DiffuseIllumination[pass]) return 0;
 			if (v0.Alpha[pass] != v1.Alpha[pass]) return 0;
 			if (v0.VertexMaterialIndex[pass] != v1.VertexMaterialIndex[pass]) return 0;
-			
+
 		}
 
 		// texcoords must match for all passes and stages
@@ -325,13 +324,13 @@ class VertexArrayClass
 	{
 		float dv = (v0.Position - v1.Position).Length();
 		int smgroup_match = ((v0.SmGroup & v1.SmGroup) || (v0.SmGroup == v1.SmGroup));
-	
-		if (	(dv < EPSILON) && 
+
+		if (	(dv < EPSILON) &&
 				(smgroup_match) &&
-				(v0.Id == v1.Id)) 
+				(v0.Id == v1.Id))
 		{
 			return 1;
-		} 
+		}
 		return 0;
 	}
 
@@ -354,7 +353,7 @@ class VertexArrayClass
 
 	MeshBuilderClass::VertClass * *	HashTable;
 	int										MatchNormals;
-	
+
 	Vector3									Center;
 	Vector3									Extent;
 
@@ -390,7 +389,7 @@ void MeshBuilderClass::VertClass::Reset(void)
 	MaxVertColIndex = 0;
 
 	for (int pass = 0; pass < MeshBuilderClass::MAX_PASSES; pass++) {
-		
+
 		DiffuseColor[pass].Set(1,1,1);
 		SpecularColor[pass].Set(1,1,1);
 		DiffuseIllumination[pass].Set(0,0,0);
@@ -495,8 +494,8 @@ bool MeshBuilderClass::FaceClass::Is_Degenerate(void)
 				return true;
 			}
 
-			if (	(Verts[v0].Position.X == Verts[v1].Position.X) && 
-					(Verts[v0].Position.Y == Verts[v1].Position.Y) && 
+			if (	(Verts[v0].Position.X == Verts[v1].Position.X) &&
+					(Verts[v0].Position.Y == Verts[v1].Position.Y) &&
 					(Verts[v0].Position.Z == Verts[v1].Position.Z) )
 			{
 				return true;
@@ -569,7 +568,7 @@ MeshBuilderClass::MeshBuilderClass(int pass_count,int face_count_guess,int face_
 	PolyOrderStage(0),
 	WorldInfo (NULL)
 {
-	Reset(pass_count,face_count_guess,face_count_growth_rate);		
+	Reset(pass_count,face_count_guess,face_count_growth_rate);
 }
 
 /***********************************************************************************************
@@ -605,15 +604,11 @@ MeshBuilderClass::~MeshBuilderClass(void)
  *=============================================================================================*/
 void MeshBuilderClass::Free(void)
 {
-	if (Faces != NULL) {
-		delete[] Faces;
-		Faces = NULL;
-	}
+	delete[] Faces;
+	Faces = NULL;
 
-	if (Verts != NULL) {
-		delete Verts;
-		Verts = NULL;
-	}
+	delete Verts;
+	Verts = NULL;
 
 	FaceCount = 0;
 	VertCount = 0;
@@ -637,7 +632,7 @@ void MeshBuilderClass::Free(void)
 void MeshBuilderClass::Reset(int passcount,int face_count_guess,int face_count_growth_rate)
 {
 	Free();
-	
+
 	State = STATE_ACCEPTING_INPUT;
 	PassCount = passcount;
 	AllocFaceCount = face_count_guess;
@@ -671,11 +666,11 @@ int MeshBuilderClass::Add_Face(const FaceClass & face)
 
 	// copy the face
 	Faces[CurFace] = face;
-	
+
 	// calculate the normal
 	Faces[CurFace].Compute_Plane();
 
-	// set the "add index" 
+	// set the "add index"
 	Faces[CurFace].AddIndex = CurFace;
 
 	// copy the smoothing group into each vert
@@ -823,7 +818,7 @@ void MeshBuilderClass::Compute_Vertex_Normals(void)
 			int shadeindex = Verts[vertindex].ShadeIndex;
 			Verts[shadeindex].Normal += Faces[faceidx].Normal;
 		}
-	}	
+	}
 
 	/*
 	** Smooth this mesh with neighboring meshes!
@@ -863,7 +858,7 @@ void MeshBuilderClass::Remove_Degenerate_Faces(void)
 	int faceidx;
 	FaceHasherClass facehasher;
 	UniqueArrayClass<MeshBuilderClass::FaceClass> uniquefaces(FaceCount,FaceCount/4,&facehasher);
-	
+
 	for (faceidx = 0; faceidx < FaceCount; faceidx++) {
 		if (!Faces[faceidx].Is_Degenerate()) {
 			uniquefaces.Add(Faces[faceidx]);
@@ -908,7 +903,7 @@ void MeshBuilderClass::Compute_Mesh_Stats(void)
 	int	vmat_index[MAX_PASSES];
 
 	Stats.Reset();
-	
+
 	for (pass = 0; pass<MAX_PASSES; pass++) {
 		for (stage = 0; stage < MAX_STAGES; stage++) {
 			tex_index[pass][stage] = Faces[0].TextureIndex[pass][stage];
@@ -918,7 +913,7 @@ void MeshBuilderClass::Compute_Mesh_Stats(void)
 	}
 
 	for (pass = 0; pass<MAX_PASSES; pass++) {
-		
+
 		for (stage = 0; stage<MAX_STAGES; stage++) {
 			for (face_index=0; face_index < FaceCount; face_index++) {
 				if (Faces[face_index].TextureIndex[pass][stage] != tex_index[pass][stage]) {
@@ -964,7 +959,7 @@ void MeshBuilderClass::Compute_Mesh_Stats(void)
 				break;
 			}
 		}
-	
+
 		for (vert_index=0; vert_index < VertCount; vert_index++) {
 			if (Verts[vert_index].DiffuseIllumination[pass] != Vector3(0,0,0)) {
 				Stats.HasDiffuseIllumination[pass] = true;
@@ -972,7 +967,7 @@ void MeshBuilderClass::Compute_Mesh_Stats(void)
 			}
 		}
 
-		
+
 		for (stage = 0; stage<MAX_STAGES; stage++) {
 			for (face_index=0; face_index < FaceCount; face_index++) {
 				if (Faces[face_index].TextureIndex[pass][stage] != -1) {
@@ -1090,7 +1085,7 @@ void MeshBuilderClass::Compute_Bounding_Sphere(Vector3 * set_center,float * set_
 			zmax.X = Verts[i].Position.X; zmax.Y = Verts[i].Position.Y; zmax.Z = Verts[i].Position.Z;
 		}
 	}
-	
+
 	// xspan = distance between the 2 points xmin and xmax squared.
 	// same goes for yspan and zspan.
 	dx = xmax.X - xmin.X;
@@ -1126,7 +1121,7 @@ void MeshBuilderClass::Compute_Bounding_Sphere(Vector3 * set_center,float * set_
 		dia2 = zmax;
 	}
 
-	
+
 	// Compute initial center and radius and radius squared
 	Vector3 center;
 	center.X = (dia1.X + dia2.X) / 2.0f;
@@ -1140,7 +1135,7 @@ void MeshBuilderClass::Compute_Bounding_Sphere(Vector3 * set_center,float * set_
 	double radsqr = dx*dx + dy*dy + dz*dz;
 	double radius = sqrt(radsqr);
 
-	
+
 	// SECOND PASS:
 	// Increment current sphere if any points fall outside of it.
 	for (i=0; i<VertCount; i++) {
@@ -1148,15 +1143,15 @@ void MeshBuilderClass::Compute_Bounding_Sphere(Vector3 * set_center,float * set_
 		dx = Verts[i].Position.X - center.X;
 		dy = Verts[i].Position.Y - center.Y;
 		dz = Verts[i].Position.Z - center.Z;
-		
+
 		double testrad2 = dx*dx + dy*dy + dz*dz;
 
 		if (testrad2 > radsqr) {
-			
+
 			// this point was outside the old sphere, compute a new
 			// center point and radius which contains this point
 			double testrad = sqrt(testrad2);
-			
+
 			// adjust center and radius
 			radius = (radius + testrad) / 2.0;
 			radsqr = radius * radius;
@@ -1199,7 +1194,7 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	}
 
 	VertexArrayClass unique_verts(FaceCount * 3,match_normals);
-	
+
 	/*
 	** Find the min and max of the array of vertices
 	*/
@@ -1208,7 +1203,7 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 
 	for (faceidx = 0; faceidx < FaceCount; faceidx++) {
 		for (facevertidx = 0; facevertidx < 3; facevertidx++) {
-			
+
 			minv.Update_Min(Faces[faceidx].Verts[facevertidx].Position);
 			maxv.Update_Max(Faces[faceidx].Verts[facevertidx].Position);
 		}
@@ -1224,9 +1219,9 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	*/
 	for (faceidx = 0; faceidx < FaceCount; faceidx++) {
 		for (facevertidx = 0; facevertidx < 3; facevertidx++) {
-			Faces[faceidx].VertIdx[facevertidx] = 
+			Faces[faceidx].VertIdx[facevertidx] =
 				unique_verts.Submit_Vertex(Faces[faceidx].Verts[facevertidx]);
-		}		
+		}
 	}
 
 	/*
@@ -1244,7 +1239,7 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	for (vertidx=0; vertidx<VertCount;vertidx++) {
 		Verts[vertidx] = unique_verts[vertidx];
 	}
-	
+
 	/*
 	** Build a new array of faces, removing degenerate faces
 	*/
@@ -1262,12 +1257,12 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 
 	/*
 	** An "Optimal" mesh will follow the following rules:
-	** 
+	**
 	** Triangle Ordering:
 	** - Triangles are in strip order
 	** - Triangles are sorted by textures and detail textures in all passes (!?)
 	** - Triangles are sorted by shader in all passes(!)
-	** 
+	**
 	** Vertex Ordering:
 	** - Skin matrix order if the mesh is being "skinned"
    ** - Few vertex material switches
@@ -1275,7 +1270,7 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	**
 	** All verts should use the same data fields in each pass (alpha, dcg, ect)
 	** All triangles must use same number of passes.
-	** 
+	**
 	** Here is how I will attempt to get as "close as possible" to this
 	** - find the pass and stage which has the "worst-case" number of textures
 	**   and sort all polys with respect to the textures in that pass and stage
@@ -1288,14 +1283,14 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	** We should throw up a warning flag in the asset manager whenever we encounter
 	** a mesh which uses more than one of these per pass...
 	*/
-	Compute_Mesh_Stats();	
+	Compute_Mesh_Stats();
 	Stats.UVSplitCount = unique_verts.UVSplits;
 
 	/*
 	** Sort the polys by texture
 	*/
 	qsort(Faces,FaceCount,sizeof(FaceClass),Texture_Compare_Funcs[PolyOrderPass][PolyOrderStage]);
-		
+
 	/*
 	** Sort the vertices by bone index and vertex material
 	*/
@@ -1328,21 +1323,21 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
  *=============================================================================================*/
 void MeshBuilderClass::Strip_Optimize_Mesh(void)
 {
-	WingedEdgeStruct *		edgehash[512];		
+	WingedEdgeStruct *		edgehash[512];
 	WingedEdgeStruct *		edgetab			= W3DNEWARRAY WingedEdgeStruct[FaceCount*3];
 	WingedEdgePolyStruct *	pedges			= W3DNEWARRAY WingedEdgePolyStruct[FaceCount];
-	
+
 	FaceClass *					newpolys			= W3DNEWARRAY FaceClass[FaceCount];
 	int *							newmat			= W3DNEWARRAY int[FaceCount];
 	int *							premap			= W3DNEWARRAY int[FaceCount];
 	int *							vtimestamp		= W3DNEWARRAY int[VertCount];
-	
+
 	int							vcount			= 0;
 	int							polysinserted	= 0;
 	int							lastmat			= 0;
 	int							edgecount		= 0;
 	int							i,j;
-	
+
 	// init the tables
 	memset(edgehash,0,sizeof(WingedEdgeStruct *) * 512);
 	memset(edgetab,0,sizeof(WingedEdgeStruct) * FaceCount * 3);
@@ -1352,12 +1347,12 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 	for (i=0; i<VertCount; i++) {
 		vtimestamp[i] = -1;
 	}
-	
+
 	// Build the edge table for the mesh
 	// Oct 20,1998: modifying so that every place we were looking at the
 	// material index, we now use TextureIndex[PolyOrderPass][PolyOrderStage]
 	for (i=0; i<FaceCount; i++) {
-		
+
 		int mat = Faces[i].TextureIndex[PolyOrderPass][PolyOrderStage];
 
 		for (j=0; j<3; j++) {
@@ -1371,7 +1366,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 
 			v0 = j;
 			if (v0 < 2) v1 = v0+1; else v1 = 0;
-			
+
 			v0 = Faces[i].VertIdx[v0];
 			v1 = Faces[i].VertIdx[v1];
 
@@ -1391,7 +1386,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 
 				// found the edge
 				edge->Poly[1] = i;
-			
+
 			} else {
 
 				// create new edge and link it to hash table
@@ -1403,7 +1398,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 				edge->Poly[0] = i;
 				edge->Poly[1] = -1;
 				edge->MaterialIdx  = mat;
-			}			
+			}
 
 			pedges[i].Edge[j] = edge;
 		}
@@ -1424,8 +1419,8 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 
 		// first attempt to minimize material switches by choosing a polygon with same material
 		// as the starting poly. Basically what we want is the poly with same material with
-		// least shared edges and most recent vertices (as we'd like to start the strip from 
-		// a 'corner polygon'). This pass is done only if mesh has multiple materials. 
+		// least shared edges and most recent vertices (as we'd like to start the strip from
+		// a 'corner polygon'). This pass is done only if mesh has multiple materials.
 		// The second pass scans through all polygons.
 
 		// this loop is O(N*N) -> might turn a bit nasty on larger meshes. Try
@@ -1435,18 +1430,18 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 		{
 			// loop through all polygons
 			for (i = 0; i < FaceCount; i++) {
-			
+
 				// if polygon not picked yet
 				if (premap[i]==-1) {
 
 					// if material mismatch, cannot choose poly (except in pass 1)
-					if (findpass == 0 && Faces[i].TextureIndex[PolyOrderPass][PolyOrderStage] != lastmat)		
+					if (findpass == 0 && Faces[i].TextureIndex[PolyOrderPass][PolyOrderStage] != lastmat)
 						continue;
 
 					// calculate number of shared edges
 					for (c = 0, j = 0; j < 3; j++) {
-						
-						// if edge j is shared by two tris, 
+
+						// if edge j is shared by two tris,
 						// use a weight factor of vCount for each edge
 						if (pedges[i].Edge[j]->Poly[1] >= 0) {
 							c += (vcount+1);
@@ -1489,7 +1484,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 		for (int edge_index = 0; (edge_index < 3) && !found_shared_edge; edge_index++) {
 
 			for (int side_index = 0; (side_index < 2) && !found_shared_edge; side_index++) {
-				
+
 				// if this polygon is not the startpoly and it is not "taken", then this edge is ok!
 				int poly = pedges[startpoly].Edge[edge_index]->Poly[side_index];
 				if ((poly != -1) && (poly != startpoly) && (premap[poly] == -1)) {
@@ -1499,7 +1494,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 					for (int vidx=0; vidx<3; vidx++) {
 						if (	(newpoly->VertIdx[vidx] != pedges[startpoly].Edge[edge_index]->Vertex[0]) &&
 								(newpoly->VertIdx[vidx] != pedges[startpoly].Edge[edge_index]->Vertex[1])) {
-						
+
 								first_vert = newpoly->VertIdx[vidx];
 								break;
 						}
@@ -1512,16 +1507,16 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 						newpoly->VertIdx[0] = newpoly->VertIdx[1];
 						newpoly->VertIdx[1] = newpoly->VertIdx[2];
 						newpoly->VertIdx[2] = tmp;
-					}	
+					}
 
-					// ok, we found a shareable edge and adjusted our poly so the strip 
+					// ok, we found a shareable edge and adjusted our poly so the strip
 					// will start with it.  Now break out of this loop...
 					found_shared_edge = true;
 					break;
 				}
 			}
 		}
-		
+
 		// if a shared edge wasn't found, just copy the poly
 		if (!found_shared_edge) {
 			newpolys[polysinserted] = Faces[startpoly];
@@ -1538,9 +1533,9 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 		}
 
 		// If we have no shared edges, this is a lone poly, start another strip
-		if (pedges[startpoly].Edge[0]->Poly[1] == -1 &&					
+		if (pedges[startpoly].Edge[0]->Poly[1] == -1 &&
 			pedges[startpoly].Edge[1]->Poly[1] == -1 &&
-			pedges[startpoly].Edge[2]->Poly[1] == -1) 
+			pedges[startpoly].Edge[2]->Poly[1] == -1)
 				continue;
 
 		// Build the strip starting from the polygon chosen in the previous loop
@@ -1557,16 +1552,16 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 			nextpoly		= -1;
 
 			for (i = 0; i < 3; i++) {
-				
+
 				// if edge 'i' of startpoly matches the vertices in the fifo
 				if	((pedges[startpoly].Edge[i]->Vertex[0] == vFIFO[0] && pedges[startpoly].Edge[i]->Vertex[1] == vFIFO[1]) ||
 					(pedges[startpoly].Edge[i]->Vertex[1] == vFIFO[0] && pedges[startpoly].Edge[i]->Vertex[0] == vFIFO[1]))
 				{
 
 					for (j = 0; j < 2; j++) {
-						
+
 						// if poly 'j' attached to this edge has not been used already, use it!
-						if (pedges[startpoly].Edge[i]->Poly[j] > -1 && 
+						if (pedges[startpoly].Edge[i]->Poly[j] > -1 &&
 							premap[pedges[startpoly].Edge[i]->Poly[j]] == -1)
 						{
 							nextpoly = pedges[startpoly].Edge[i]->Poly[j];
@@ -1580,7 +1575,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 			break;
 
 			found:;
-	
+
 			// now, find the new vertex (two verts are on the edge, find the third)
 			int nw = -1;
 			for (i = 0; i < 3; i++) {
@@ -1626,7 +1621,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 		}
 	}
 
-	// Use the premap array to get the rest of the info into the new face table, 
+	// Use the premap array to get the rest of the info into the new face table,
 	for (i=0; i<FaceCount; i++) {
 
 		int old_idx = i;
@@ -1693,7 +1688,7 @@ void MeshBuilderClass::Grow_Face_Array(void)
 	for (int i=0; i<oldcount; i++) {
 		Faces[i] = oldfaces[i];
 	}
-	
+
 	delete[] oldfaces;
 }
 
@@ -1752,7 +1747,7 @@ int face_material_compare(const void *elem1, const void *elem2 )
 {
 	MeshBuilderClass::FaceClass * f0 = (MeshBuilderClass::FaceClass *)elem1;
 	MeshBuilderClass::FaceClass * f1 = (MeshBuilderClass::FaceClass *)elem2;
-	
+
 	if (f0->TextureIndex[0][0] < f1->TextureIndex[0][0]) return -1;
 	if (f0->TextureIndex[0][0] > f1->TextureIndex[0][0]) return 1;
 	return 0;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h
index 6d13dd5aced..bf07f427bde 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h
@@ -26,24 +26,19 @@
  *                                                                                             *
  *                   Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 9:23a                                              $*
  *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- * 
+ *
  * 06/27/02 KM Shader system MAX plugin updates                                       *
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MESHBUILD_H
-#define MESHBUILD_H
 
 #include	"always.h"
 #include "vector2.h"
@@ -64,7 +59,7 @@ class WorldInfoClass
 		WorldInfoClass(void)				{ }
 		virtual ~WorldInfoClass(void)	{ }
 
-		// Public methods		
+		// Public methods
 		virtual Vector3	Get_Shared_Vertex_Normal (Vector3 pos, int smgroup) = 0;
 		virtual bool		Are_Meshes_Smoothed (void) const { return true; }
 };
@@ -86,7 +81,7 @@ class WorldInfoClass
 ** 2. Loop through the verts, looking at each one using Get_Vertex
 ** 3. Loop through the faces, looking at each one using Get_Face
 **
-** *NOTE*  This class is meant to be relatively self-sufficient.  It is used in a 
+** *NOTE*  This class is meant to be relatively self-sufficient.  It is used in a
 ** variety of different applications which are built on completely different
 ** code-bases.  Do not introduce dependencies into this module lightly! :-)
 */
@@ -98,7 +93,7 @@ class MeshBuilderClass
 	enum {
 		STATE_ACCEPTING_INPUT = 0,		// mesh builder is accepting input triangles
 		STATE_MESH_PROCESSED,			// mesh builder has processed the mesh
-	
+
 		MAX_PASSES = 4,					// maximum number of material passes supported
 		MAX_STAGES = 2,					// maximum number of texture stages supported in a single pass
 	};
@@ -110,12 +105,12 @@ class MeshBuilderClass
 	~MeshBuilderClass(void);
 
 	/*
-	** VertClass.  The MeshBuilder deals with vertices in this format.  
+	** VertClass.  The MeshBuilder deals with vertices in this format.
 	*/
 	class VertClass
 	{
 	public:
-		VertClass(void)		{ Reset(); } 
+		VertClass(void)		{ Reset(); }
 		void						Reset(void);
 
 	public:
@@ -127,8 +122,8 @@ class MeshBuilderClass
 		int						BoneIndex;			// bone influence if the mesh is a skin
 
 		int						MaxVertColIndex;	// Index into the Max mesh.vertCol array of this vertex.
-		
-		Vector2					TexCoord[MAX_PASSES][MAX_STAGES];				
+
+		Vector2					TexCoord[MAX_PASSES][MAX_STAGES];
 		Vector3					DiffuseColor[MAX_PASSES];			// diffuse color
 		Vector3					SpecularColor[MAX_PASSES];			// specular color
 		Vector3					DiffuseIllumination[MAX_PASSES];	// pre-calced diffuse illum
@@ -144,7 +139,7 @@ class MeshBuilderClass
 		int						UniqueIndex;		// used internally!
 		int						ShadeIndex;			// used internally!
 		VertClass *				NextHash;			// used internally!
-	
+
 	};
 
 	/*
@@ -157,7 +152,7 @@ class MeshBuilderClass
 	public:
 		FaceClass(void)		{ Reset(); }
 		void						Reset(void);									// reset this face
-		
+
 	public:
 		VertClass				Verts[3];										// array of 3 verts
 		int						SmGroup;											// smoothing group
@@ -171,7 +166,7 @@ class MeshBuilderClass
 		int						VertIdx[3];			// set by builder: "optimized" vertex indices
 		Vector3					Normal;		 		// set by builder: Face normal
 		float32					Dist;			 		// set by builder: Plane distance
-	
+
 		void						Compute_Plane(void);
 		bool						operator != (const FaceClass & that)		{ return !(*this == that); }
 		bool						operator == (const FaceClass & /*that*/)	{ return false; }
@@ -179,27 +174,27 @@ class MeshBuilderClass
 
 		friend class MeshBuilderClass;
 	};
-	
+
 	/*
 	** To "build" a mesh:
 	** 1. Reset the builder with the approximate number of polys you're going to sumbit, etc.
 	** 3. Submit each face in the form of a FaceClass, set only the fields you need (leave others at default)
 	** 4. Call Build_Mesh
-	*/ 
+	*/
 	void							Reset(int pass_count,int face_count_guess,int face_count_growth_rate);
 	int							Add_Face(const FaceClass & face);
 	void							Build_Mesh(bool compute_normals);
 
 	/*
-	** Optional controls: 
+	** Optional controls:
 	** If one of your passes has more textures than another, you may wish to do the
-	** stripping and sorting based on that channel.  By default, everything will 
+	** stripping and sorting based on that channel.  By default, everything will
 	** be stripped and sorted based on pass 0, stage 0
 	** Sort_Vertices can be used to order the vertices arbitrarily.  I use it to
 	** sort them according to the bone they are attached for skin meshes.
 	*/
 	void							Set_Polygon_Ordering_Channel(int pass,int texstage);
-	
+
 	/*
 	** To use the results:
 	** 1. Call Get_Vertex_Count and Get_Face_Count to get the counts
@@ -237,9 +232,9 @@ class MeshBuilderClass
 	*/
 	WorldInfoClass *			Peek_World_Info(void) const						{ return WorldInfo; }
 	void							Set_World_Info(WorldInfoClass *world_info)	{ WorldInfo = world_info; }
-	
+
 	/*
-	** Mesh Stats, mainly lots of flags for whether this mesh has various 
+	** Mesh Stats, mainly lots of flags for whether this mesh has various
 	** channels of information.
 	*/
 	struct MeshStatsStruct
@@ -251,7 +246,7 @@ class MeshBuilderClass
 		bool		HasVertexMaterial[MAX_PASSES];					// has at least one vert material in given pass
 
 		bool		HasPerPolyTexture[MAX_PASSES][MAX_STAGES];	// has 2+ textures in given pass/stage
-		bool		HasPerPolyShader[MAX_PASSES];						// has 2+ shaders in given pass 
+		bool		HasPerPolyShader[MAX_PASSES];						// has 2+ shaders in given pass
 		bool		HasPerVertexMaterial[MAX_PASSES];				// has 2+ vertex materials in given pass
 
 		bool		HasDiffuseColor[MAX_PASSES];						// has diffuse colors in given pass
@@ -350,7 +345,7 @@ inline const MeshBuilderClass::VertClass & MeshBuilderClass::Get_Vertex(int inde
 	assert(State == STATE_MESH_PROCESSED);
 	assert(index >= 0);
 	assert(index < VertCount);
-	return Verts[index];	
+	return Verts[index];
 }
 
 inline const MeshBuilderClass::FaceClass & MeshBuilderClass::Get_Face(int index) const
@@ -366,7 +361,7 @@ inline MeshBuilderClass::VertClass & MeshBuilderClass::Get_Vertex(int index)
 	assert(State == STATE_MESH_PROCESSED);
 	assert(index >= 0);
 	assert(index < VertCount);
-	return Verts[index];	
+	return Verts[index];
 }
 
 inline MeshBuilderClass::FaceClass & MeshBuilderClass::Get_Face(int index)
@@ -382,5 +377,3 @@ inline const MeshBuilderClass::MeshStatsStruct & MeshBuilderClass::Get_Mesh_Stat
 	assert(State == STATE_MESH_PROCESSED);
 	return Stats;
 }
-
-#endif
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
index c622a74a05b..221307965e6 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
@@ -210,7 +210,7 @@ MeshGeometryClass & MeshGeometryClass::operator = (const MeshGeometryClass & tha
 		REF_PTR_SET(MeshName,that.MeshName);
 		REF_PTR_SET(UserText,that.UserText);
 		REF_PTR_SET(Poly,that.Poly);
-		REF_PTR_SET(PolySurfaceType,that.PolySurfaceType);		
+		REF_PTR_SET(PolySurfaceType,that.PolySurfaceType);
 		REF_PTR_SET(Vertex,that.Vertex);
 		REF_PTR_SET(VertexNorm,that.VertexNorm);
 		REF_PTR_SET(PlaneEq,that.PlaneEq);
@@ -263,7 +263,7 @@ void MeshGeometryClass::Reset_Geometry(int polycount,int vertcount)
 	REF_PTR_RELEASE(MeshName);
 	REF_PTR_RELEASE(UserText);
 	REF_PTR_RELEASE(Poly);
-	REF_PTR_RELEASE(PolySurfaceType);	
+	REF_PTR_RELEASE(PolySurfaceType);
 	REF_PTR_RELEASE(Vertex);
 	REF_PTR_RELEASE(VertexNorm);
 	REF_PTR_RELEASE(PlaneEq);
@@ -310,7 +310,7 @@ const char * MeshGeometryClass::Get_Name(void) const
 {
 	if (MeshName) {
 		return MeshName->Get_Array();
-	} 
+	}
 	return NULL;
 }
 
@@ -401,7 +401,7 @@ void MeshGeometryClass::Get_Bounding_Box(AABoxClass * set_box)
 	WWASSERT(set_box != NULL);
 	set_box->Center = (BoundBoxMax + BoundBoxMin) * 0.5f;
 	set_box->Extent = (BoundBoxMax - BoundBoxMin) * 0.5f;
-}	
+}
 
 
 /***********************************************************************************************
@@ -449,7 +449,7 @@ void MeshGeometryClass::Generate_Rigid_APT(const Vector3 & view_dir, SimpleDynVe
 		tri.V[1] = &(loc[ polys[poly_counter][1] ]);
 		tri.V[2] = &(loc[ polys[poly_counter][2] ]);
 		tri.N = (Vector3*)&(norms[poly_counter]);
-		
+
 		if (Vector3::Dot_Product(*tri.N,view_dir) < 0.0f) {
 			apt.Add(poly_counter);
 		}
@@ -489,7 +489,7 @@ void MeshGeometryClass::Generate_Rigid_APT(const OBBoxClass & local_box, SimpleD
 			tri.V[1] = &(loc[ polys[poly_counter][1] ]);
 			tri.V[2] = &(loc[ polys[poly_counter][2] ]);
 			tri.N = (Vector3*)&(norms[poly_counter]);
-				
+
 			if (CollisionMath::Intersection_Test(local_box, tri)) {;
 				apt.Add(poly_counter);
 			}
@@ -528,11 +528,11 @@ void MeshGeometryClass::Generate_Rigid_APT(const OBBoxClass & local_box,const Ve
 			tri.V[1] = &(loc[ polys[poly_counter][1] ]);
 			tri.V[2] = &(loc[ polys[poly_counter][2] ]);
 			tri.N = (Vector3*)&(norms[poly_counter]);
-				
+
 			if (Vector3::Dot_Product(*tri.N,viewdir) < 0.0f) {
 				if (CollisionMath::Intersection_Test(local_box,tri)) {
 					apt.Add(poly_counter);
-				} 
+				}
 			}
 		}
 	}
@@ -571,7 +571,7 @@ void MeshGeometryClass::Generate_Skin_APT(const OBBoxClass & world_box, SimpleDy
 		// in the Intersection_Test, so we set it to a dummy value.
 		static const Vector3 dummy_vec(0.0f, 0.0f, 1.0f);
 		tri.N = &dummy_vec;
-			
+
 		if (CollisionMath::Intersection_Test(world_box,tri)) {;
 			apt.Add(poly_counter);
 		}
@@ -648,7 +648,7 @@ bool MeshGeometryClass::Cast_Ray(RayCollisionTestClass & raytest)
 	return hit;
 }
 
- 
+
 /***********************************************************************************************
  * MeshGeometryClass::Cast_AABox -- cast an AABox against this mesh                            *
  *                                                                                             *
@@ -664,7 +664,7 @@ bool MeshGeometryClass::Cast_Ray(RayCollisionTestClass & raytest)
 bool MeshGeometryClass::Cast_AABox(AABoxCollisionTestClass & boxtest)
 {
 	bool hit = false;
-	
+
 	if (CullTree) {
 		hit = CullTree->Cast_AABox(boxtest);
 	} else {
@@ -674,7 +674,7 @@ bool MeshGeometryClass::Cast_AABox(AABoxCollisionTestClass & boxtest)
 	return hit;
 }
 
-  
+
 /***********************************************************************************************
  * MeshGeometryClass::Cast_OBBox -- Cast an obbox against this mesh                            *
  *                                                                                             *
@@ -700,7 +700,7 @@ bool MeshGeometryClass::Cast_OBBox(OBBoxCollisionTestClass & boxtest)
 	return hit;
 }
 
-  
+
 /***********************************************************************************************
  * MeshGeometryClass::Intersect_OBBox -- test for intersection with the given OBBox            *
  *                                                                                             *
@@ -751,26 +751,26 @@ bool MeshGeometryClass::Cast_World_Space_AABox(AABoxCollisionTestClass & boxtest
 	** that these compares are done
 	*/
 	bool hit = false;
-	
+
 	if ((transform[0][0] == 1.0f) && (transform[1][1] == 1.0f)) {
 
 		hit = cast_aabox_identity(boxtest,-transform.Get_Translation());
-	
+
 	} else if ((transform[0][1] == -1.0f) && (transform[1][0] == 1.0f)) {
-	
+
 		// this mesh has been rotated 90 degrees about z
 		hit = cast_aabox_z90(boxtest,-transform.Get_Translation());
-	
+
 	} else if ((transform[0][0] == -1.0f) && (transform[1][1] == -1.0f)) {
-	
+
 		// this mesh has been rotated 180
 		hit = cast_aabox_z180(boxtest,-transform.Get_Translation());
-	
+
 	} else if ((transform[0][1] == 1.0f) && (transform[1][0] == -1.0f)) {
-	
-		// this mesh has been rotated 270 
+
+		// this mesh has been rotated 270
 		hit = cast_aabox_z270(boxtest,-transform.Get_Translation());
-	
+
 	} else {
 
 		/*
@@ -825,7 +825,7 @@ int MeshGeometryClass::cast_semi_infinite_axis_aligned_ray(const Vector3 & start
 	if (CullTree) {
 		count = CullTree->Cast_Semi_Infinite_Axis_Aligned_Ray(start_point, axis_dir, flags);
 	} else {
-	
+
 		const Vector3 * loc = Get_Vertex_Array();
 		const Vector4 * plane = Get_Plane_Array();
 		const TriIndex * polyverts = Get_Polygon_Array();
@@ -852,7 +852,7 @@ int MeshGeometryClass::cast_semi_infinite_axis_aligned_ray(const Vector3 & start
 		*/
 		int poly_count = Get_Polygon_Count();
 		for (int poly_counter=0; poly_counter < poly_count; poly_counter++) {
-		
+
 			const Vector3 &v0 = loc[ polyverts[poly_counter][0] ];
 			const Vector3 &v1 = loc[ polyverts[poly_counter][1] ];
 			const Vector3 &v2 = loc[ polyverts[poly_counter][2] ];
@@ -961,7 +961,7 @@ bool MeshGeometryClass::cast_aabox_z180(AABoxCollisionTestClass & boxtest, const
 	} else {
 		hit = cast_aabox_brute_force(newbox);
 	}
-	
+
 	// if we hit something, we need to rotate the normal back out of the mesh coordinate system
 	if (hit) {
 		// rotating the normal by 180 degrees about Z
@@ -1039,19 +1039,19 @@ bool MeshGeometryClass::intersect_obbox_brute_force(OBBoxIntersectionTestClass &
 	** Loop over each polygon
 	*/
 	for (int srtri=0; srtri < Get_Polygon_Count(); srtri++) {
-	
+
 		tri.V[0] = &(loc[ polyverts[srtri][0] ]);
 		tri.V[1] = &(loc[ polyverts[srtri][1] ]);
 		tri.V[2] = &(loc[ polyverts[srtri][2] ]);
 
-#ifdef COMPUTE_NORMALS					
+#ifdef COMPUTE_NORMALS
 		static Vector3 _normal;
 		tri.N = &_normal;
 		tri.Compute_Normal();
 #else
 		tri.N = (Vector3 *)&(norms[srtri]);
 #endif
-		
+
 		if (CollisionMath::Intersection_Test(localtest.Box, tri)) {
 			return true;
 		}
@@ -1089,25 +1089,25 @@ bool MeshGeometryClass::cast_ray_brute_force(RayCollisionTestClass & raytest)
 	*/
 	bool hit = false;
 	for (srtri=0; srtri < Get_Polygon_Count(); srtri++) {
-	
+
 		// TODO: find a better way to do this?
 		tri.V[0] = &(loc[ polyverts[srtri][0] ]);
 		tri.V[1] = &(loc[ polyverts[srtri][1] ]);
 		tri.V[2] = &(loc[ polyverts[srtri][2] ]);
 
-#ifdef COMPUTE_NORMALS					
+#ifdef COMPUTE_NORMALS
 		static Vector3 _normal;
 		tri.N = &_normal;
 		tri.Compute_Normal();
 #else
 		tri.N = (Vector3 *)&(norms[srtri]);
 #endif
-		
+
 		hit = hit | CollisionMath::Collide(raytest.Ray, tri, raytest.Result);
 		if (hit) {
 			raytest.Result->SurfaceType = Get_Poly_Surface_Type (srtri);
 		}
-	
+
 		if (raytest.Result->StartBad) return true;
 
 	}
@@ -1149,7 +1149,7 @@ bool MeshGeometryClass::cast_aabox_brute_force(AABoxCollisionTestClass & boxtest
 		tri.V[1] = &(loc[ polyverts[srtri][1] ]);
 		tri.V[2] = &(loc[ polyverts[srtri][2] ]);
 
-#ifdef COMPUTE_NORMALS					
+#ifdef COMPUTE_NORMALS
 		static Vector3 _normal;
 		tri.N = &_normal;
 		tri.Compute_Normal();
@@ -1207,7 +1207,7 @@ bool MeshGeometryClass::cast_obbox_brute_force(OBBoxCollisionTestClass & boxtest
 		tri.V[1] = &(loc[ polyverts[srtri][1] ]);
 		tri.V[2] = &(loc[ polyverts[srtri][2] ]);
 
-#ifdef COMPUTE_NORMALS					
+#ifdef COMPUTE_NORMALS
 		static Vector3 _normal;
 		tri.N = &_normal;
 		tri.Compute_Normal();
@@ -1305,18 +1305,18 @@ void MeshGeometryClass::Compute_Vertex_Normals(Vector3 * vnorm)
 			vnorm[poly[pidx].I].X += peq[pidx].X;
 			vnorm[poly[pidx].I].Y += peq[pidx].Y;
 			vnorm[poly[pidx].I].Z += peq[pidx].Z;
-			
+
 			vnorm[poly[pidx].J].X += peq[pidx].X;
 			vnorm[poly[pidx].J].Y += peq[pidx].Y;
 			vnorm[poly[pidx].J].Z += peq[pidx].Z;
-			
+
 			vnorm[poly[pidx].K].X += peq[pidx].X;
 			vnorm[poly[pidx].K].Y += peq[pidx].Y;
 			vnorm[poly[pidx].K].Z += peq[pidx].Z;
 		}
-	
+
 	} else {
-	
+
 		VectorProcessorClass::Clear (vnorm, VertexCount);
 
 		for (int pidx = 0; pidx < PolyCount; pidx++)	{
@@ -1427,15 +1427,15 @@ Vector3 * MeshGeometryClass::get_vert_normals(void)
  *   6/14/2001  gth : Created.                                                                 *
  *=============================================================================================*/
 const Vector3 * MeshGeometryClass::Get_Vertex_Normal_Array(void)
-{ 
+{
 #if (OPTIMIZE_VNORM_RAM)
 	Compute_Vertex_Normals(get_vert_normals());
-	return get_vert_normals(); 
+	return get_vert_normals();
 #else
 	if (Get_Flag(DIRTY_VNORMALS)) {
 		Compute_Vertex_Normals(get_vert_normals());
 	}
-	return get_vert_normals(); 
+	return get_vert_normals();
 #endif
 }
 
@@ -1483,7 +1483,7 @@ Vector4 * MeshGeometryClass::get_planes(bool create)
  *   6/14/2001  gth : Created.                                                                 *
  *=============================================================================================*/
 const Vector4 * MeshGeometryClass::Get_Plane_Array(bool create)
-{ 
+{
 #if (OPTIMIZE_PLANEEQ_RAM)
 	Vector4 * planes = get_planes(create);
 	Compute_Plane_Equations(planes);
@@ -1539,7 +1539,8 @@ void MeshGeometryClass::Generate_Culling_Tree(void)
 	{
 		AABTreeBuilderClass builder;
 		builder.Build_AABTree(PolyCount,Poly->Get_Array(),VertexCount,Vertex->Get_Array());
-	
+
+		DEBUG_ASSERTCRASH(CullTree == NULL, ("MeshGeometryClass::Generate_Culling_Tree: Leaking CullTree"));
 		CullTree = NEW_REF(AABTreeClass,(&builder));
 		CullTree->Set_Mesh(this);
 	}
@@ -1566,19 +1567,19 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 	/*
 	** This function will initialize this MeshGeometryClass from the contents of a W3D file.
 	** Note that derived classes need to completely replace this function; only re-using the individual
-	** chunk handling functions.  
+	** chunk handling functions.
 	*/
 
 	/*
 	**	Open the first chunk, it should be the mesh header
 	*/
 	cload.Open_Chunk();
-	
+
 	if (cload.Cur_Chunk_ID() != W3D_CHUNK_MESH_HEADER3) {
-		WWDEBUG_SAY(("Old format mesh mesh, no longer supported.\n"));
+		WWDEBUG_SAY(("Old format mesh mesh, no longer supported."));
 		goto Error;
 	}
-	
+
 	W3dMeshHeader3Struct header;
 	if (cload.Read(&header,sizeof(W3dMeshHeader3Struct)) != sizeof(W3dMeshHeader3Struct)) {
 		goto Error;
@@ -1590,22 +1591,22 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 	*/
 	char *	tmpname;
 	int		namelen;
-	
+
 	Reset_Geometry(header.NumTris,header.NumVertices);
-	
+
 	namelen = strlen(header.ContainerName);
 	namelen += strlen(header.MeshName);
 	namelen += 2;
-	W3dAttributes = header.Attributes;	
+	W3dAttributes = header.Attributes;
 	SortLevel = header.SortLevel;
 	tmpname = W3DNEWARRAY char[namelen];
 	memset(tmpname,0,namelen);
 
 	if (strlen(header.ContainerName) > 0) {
 		strcpy(tmpname,header.ContainerName);
-		strcat(tmpname,".");
+		strcat(tmpname, ".");
 	}
-	strcat(tmpname,header.MeshName);
+	strcat(tmpname, header.MeshName);
 
 	Set_Name(tmpname);
 
@@ -1626,7 +1627,7 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 	*/
 	if (header.Version >= W3D_MAKE_VERSION(4,1)) {
 		int geometry_type = header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK;
-		switch (geometry_type) 
+		switch (geometry_type)
 		{
 			case W3D_MESH_FLAG_GEOMETRY_TYPE_NORMAL:
 				break;
@@ -1639,7 +1640,7 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 			case W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN:
 				Set_Flag(SKIN,true);
 				break;
-		} 
+		}
 	}
 
 	if (header.Attributes & W3D_MESH_FLAG_TWO_SIDED) {
@@ -1660,7 +1661,7 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 
 		uint16 * links = get_bone_links();
 		WWASSERT(links);
-		
+
 		for (int bi = 0; bi < Get_Vertex_Count(); bi++) {
 			links[bi] += 1;
 		}
@@ -1670,7 +1671,7 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 	** If this mesh is collideable and no AABTree was in the file, generate one now
 	*/
 	if (	(((W3dAttributes & W3D_MESH_FLAG_COLLISION_TYPE_MASK) >> W3D_MESH_FLAG_COLLISION_TYPE_SHIFT) != 0) &&
-			(CullTree == NULL)) 
+			(CullTree == NULL))
 	{
 		Generate_Culling_Tree();
 	}
@@ -1698,7 +1699,7 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
  * HISTORY:                                                                                    *
  *   11/9/2000  gth : Created.                                                                 *
  *=============================================================================================*/
-WW3DErrorType MeshGeometryClass::read_chunks(ChunkLoadClass & cload) 
+WW3DErrorType MeshGeometryClass::read_chunks(ChunkLoadClass & cload)
 {
 	/*
 	**	Read in the chunk header
@@ -1730,7 +1731,7 @@ WW3DErrorType MeshGeometryClass::read_chunks(ChunkLoadClass & cload)
 			case W3D_CHUNK_MESH_USER_TEXT:
 					error = read_user_text(cload);
 					break;
-			
+
 			case W3D_CHUNK_VERTEX_INFLUENCES:
 					error = read_vertex_influences(cload);
 					break;
@@ -1746,8 +1747,8 @@ WW3DErrorType MeshGeometryClass::read_chunks(ChunkLoadClass & cload)
 			default:
 					break;
 
-		}	
-		
+		}
+
 		cload.Close_Chunk();
 
 		if (error != WW3D_ERROR_OK) {
@@ -1782,13 +1783,13 @@ WW3DErrorType MeshGeometryClass::read_vertices(ChunkLoadClass & cload)
 		if (cload.Read(&vert,sizeof(W3dVectorStruct)) != sizeof(W3dVectorStruct)) {
 			return WW3D_ERROR_LOAD_FAILED;
 		}
-		
+
 		loc[i].X = vert.X;
 		loc[i].Y = vert.Y;
 		loc[i].Z = vert.Z;
 	}
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 
@@ -1818,7 +1819,7 @@ WW3DErrorType MeshGeometryClass::read_vertex_normals(ChunkLoadClass & cload)
 		mdlnorms[i].Set(norm.X,norm.Y,norm.Z);
 	}
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 
@@ -1867,7 +1868,7 @@ WW3DErrorType MeshGeometryClass::read_triangles(ChunkLoadClass & cload)
 		surface_types[i] = (uint8)(tri.Attributes);
 	}
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 
@@ -1896,7 +1897,7 @@ WW3DErrorType MeshGeometryClass::read_user_text(ChunkLoadClass & cload)
 	if (UserText != NULL) {
 		return WW3D_ERROR_OK;
 	}
-	
+
 	/*
 	** Allocate the buffer and read in the text
 	*/
@@ -1906,7 +1907,7 @@ WW3DErrorType MeshGeometryClass::read_user_text(ChunkLoadClass & cload)
 		return WW3D_ERROR_LOAD_FAILED;
 	}
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 
@@ -1933,11 +1934,11 @@ WW3DErrorType MeshGeometryClass::read_vertex_influences(ChunkLoadClass & cload)
 		if (cload.Read(&vinf,sizeof(W3dVertInfStruct)) != sizeof(W3dVertInfStruct)) {
 			return WW3D_ERROR_LOAD_FAILED;
 		}
-		links[i] = vinf.BoneIdx;		
-	}	
+		links[i] = vinf.BoneIdx;
+	}
 	Set_Flag(SKIN,true);
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 
@@ -1993,17 +1994,17 @@ void MeshGeometryClass::Scale(const Vector3 &sc)
 {
 	WWASSERT(Vertex);
 	Vector3 * vert = Vertex->Get_Array();
-	
+
 	for (int i=0;i<VertexCount; i++) {
 		vert[i].X *= sc.X;
 		vert[i].Y *= sc.Y;
 		vert[i].Z *= sc.Z;
 	}
-		
+
 	BoundBoxMin.Scale(sc);
 	BoundBoxMax.Scale(sc);
 	BoundSphereCenter.Scale(sc);
-	
+
 	float max;
 	max = (sc.X > sc.Y)	? sc.X	: sc.Y;
 	max = (max > sc.Z)	? max		: sc.Z;
@@ -2015,4 +2016,4 @@ void MeshGeometryClass::Scale(const Vector3 &sc)
 	}
 	// pnormals are plane equations...
 	Set_Flag(DIRTY_PLANES,true);
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
index 897520fffcc..15474c20faf 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
@@ -36,11 +36,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef MESHGEOMETRY_H
-#define MESHGEOMETRY_H
+#pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "bittype.h"
 #include "simplevec.h"
 #include "sharebuf.h"
@@ -68,7 +66,7 @@ typedef Vector3i TriIndex;
 ** The following two defines control two space-saving optimizations.  In Renegade I've found
 ** that the plane equations are about 8% of the geometry space and vertex normals are about 10%
 ** so I'm trying to see if we can get by without them.  The plane equations are mainly used
-** by collision detection functions and those are culled pretty well.  Anyway, collision is 
+** by collision detection functions and those are culled pretty well.  Anyway, collision is
 ** already so expensive that adding a cross product to it doesn't seem to matter.
 **
 ** NOTE: currently with optimizations enabled, memory gets trashed if you use OPTIMIZE_VNORM_RAM
@@ -80,8 +78,8 @@ typedef Vector3i TriIndex;
 
 /**
 ** MeshGeometryClass
-** This class encapsulates the geometry data for a triangle mesh. 
-*/ 
+** This class encapsulates the geometry data for a triangle mesh.
+*/
 
 class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListObjectClass
 {
@@ -106,7 +104,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 		DISABLE_BOUNDING_SPHERE				= 0x00000040,
 		DISABLE_PLANE_EQ						= 0x00000080,
 		TWO_SIDED								= 0x00000100,
-	
+
 		ALIGNED									= 0x00000200,
 		SKIN										= 0x00000400,
 		ORIENTED									= 0x00000800,
@@ -141,7 +139,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 	Vector3 *					Get_Vertex_Array(void)										{ WWASSERT(Vertex); return Vertex->Get_Array(); }
 	const Vector3 *			Get_Vertex_Normal_Array(void);
 	const Vector4 *			Get_Plane_Array(bool create = true);
-	void							Compute_Plane(int pidx,PlaneClass * set_plane) const;	
+	void							Compute_Plane(int pidx,PlaneClass * set_plane) const;
 	const uint32 *				Get_Vertex_Shade_Index_Array(bool create = true)	{ return get_shade_indices(create); }
 	const uint16 *				Get_Vertex_Bone_Links(void)								{ return get_bone_links(); }
 	uint8 *						Get_Poly_Surface_Type_Array(void)						{ WWASSERT(PolySurfaceType); return PolySurfaceType->Get_Array(); }
@@ -152,7 +150,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 
 	// exposed culling support
 	bool							Has_Cull_Tree(void)											{ return CullTree != NULL; }
-	
+
 	void							Generate_Rigid_APT(const Vector3 & view_dir, SimpleDynVecClass<uint32> & apt);
 	void							Generate_Rigid_APT(const OBBoxClass & local_box, SimpleDynVecClass<uint32> & apt);
 	void							Generate_Rigid_APT(const OBBoxClass & local_box, const Vector3 & view_dir, SimpleDynVecClass<uint32> & apt);
@@ -182,7 +180,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 	void							Scale(const Vector3 &sc);
 
 protected:
-	
+
 	// internal accessor functions that are not exposed to the user (non-const...)
 	TriIndex *					get_polys(void);
 	Vector3 *					get_vert_normals(void);
@@ -197,7 +195,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 	bool							cast_aabox_z90(AABoxCollisionTestClass & boxtest,const Vector3 & trans);
 	bool							cast_aabox_z180(AABoxCollisionTestClass & boxtest,const Vector3 & trans);
 	bool							cast_aabox_z270(AABoxCollisionTestClass & boxtest,const Vector3 & trans);
-	
+
 	bool							intersect_obbox_brute_force(OBBoxIntersectionTestClass & localtest);
 	bool							cast_ray_brute_force(RayCollisionTestClass & raytest);
 	bool							cast_aabox_brute_force(AABoxCollisionTestClass & boxtest);
@@ -209,7 +207,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 	virtual void				Compute_Bounds(Vector3 * verts);
 	void							Generate_Culling_Tree(void);
 
-	// W3D chunk reading	
+	// W3D chunk reading
 	WW3DErrorType				read_chunks(ChunkLoadClass & cload);
 	WW3DErrorType				read_vertices(ChunkLoadClass & cload);
 	WW3DErrorType				read_vertex_normals(ChunkLoadClass & cload);
@@ -219,18 +217,18 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 	WW3DErrorType				read_vertex_shade_indices(ChunkLoadClass & cload);
 	WW3DErrorType				read_aabtree(ChunkLoadClass &cload);
 
-	
+
 	// General info
 	ShareBufferClass<char> *							MeshName;
 	ShareBufferClass<char> *							UserText;
 	int														Flags;
 	char														SortLevel;
 	uint32													W3dAttributes;
-	
+
 	// Geometry
 	int														PolyCount;
 	int														VertexCount;
-		
+
 	ShareBufferClass<TriIndex> *						Poly;
 	ShareBufferClass<Vector3> *						Vertex;
 	ShareBufferClass<Vector3> *						VertexNorm;
@@ -286,6 +284,3 @@ inline uint8 MeshGeometryClass::Get_Poly_Surface_Type(int poly_index) const
 	uint8 *type = PolySurfaceType->Get_Array();
 	return type[poly_index];
 }
-
-#endif //MESHGEOMETRY_H
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp
index bec7511723f..55561099f08 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp
@@ -427,7 +427,7 @@ void MeshMatDescClass::Init_Alternate(MeshMatDescClass & default_materials,MeshM
 				Material[pass] = NEW_REF(VertexMaterialClass,(*(default_materials.Material[pass])));
 			} else {
 				if (default_materials.MaterialArray[pass]) {
-					WWDEBUG_SAY(("Unimplemented case: mesh has more than one default vertex material but no alternate vertex materials have been defined.\r\n"));
+					WWDEBUG_SAY(("Unimplemented case: mesh has more than one default vertex material but no alternate vertex materials have been defined."));
 				}
 				Material[pass] = NULL;
 			}
@@ -857,7 +857,7 @@ void MeshMatDescClass::Post_Load_Process(bool lighting_enabled,MeshModelClass *
 			VertexMaterialClass * mtl = Peek_Material(0,pass);
 
 			for (int vidx=0; vidx<VertexCount; vidx++) {
-				
+
 				mtl = Peek_Material(vidx,pass);
 				if (mtl != prev_mtl) {
 					prev_mtl = mtl;
@@ -871,7 +871,7 @@ void MeshMatDescClass::Post_Load_Process(bool lighting_enabled,MeshModelClass *
 				diffuse.Z *= mtl_diffuse.Z;
 				diffuse.W *= mtl_opacity;
 				diffuse_array[vidx]=DX8Wrapper::Convert_Color(diffuse);
-			
+
 			}
 		}
 */		/*
@@ -897,7 +897,7 @@ void MeshMatDescClass::Post_Load_Process(bool lighting_enabled,MeshModelClass *
 				emissive.Y *= mtl_emissive.Y;
 				emissive.Z *= mtl_emissive.Z;
 				emissive_array[vidx]=DX8Wrapper::Convert_Color(emissive);
-			
+
 			}
 		}
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h
index 82d58ce2793..29266923896 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h
@@ -36,8 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef MESHMATDESC_H
-#define MESHMATDESC_H
+#pragma once
 
 #include "always.h"
 #include "vector2.h"
@@ -63,7 +62,7 @@ class MeshMatDescClass : public W3DMPO
 	W3DMPO_GLUE(MeshMatDescClass)
 public:
 
-	enum 
+	enum
 	{
 		MAX_PASSES = 4,
 		MAX_TEX_STAGES = 2,
@@ -104,7 +103,7 @@ class MeshMatDescClass : public W3DMPO
 
 	int							Get_UV_Array_Count(void);
 	Vector2 *					Get_UV_Array_By_Index(int index, bool create = true);
-	
+
 	unsigned*					Get_DCG_Array(int pass);
 	unsigned*					Get_DIG_Array(int pass);
 	void							Set_DCG_Source(int pass,VertexMaterialClass::ColorSourceType source);
@@ -121,15 +120,15 @@ class MeshMatDescClass : public W3DMPO
 	** the "Get" functions add a reference before returning the pointer (if appropriate)
 	*/
 	VertexMaterialClass *	Get_Single_Material(int pass=0) const;
-	TextureClass *				Get_Single_Texture(int pass=0,int stage=0) const;	
+	TextureClass *				Get_Single_Texture(int pass=0,int stage=0) const;
 	ShaderClass					Get_Single_Shader(int pass=0) const;
 
 	/*
-	** the "Peek" functions just return the pointer and it's the caller's responsibility to 
+	** the "Peek" functions just return the pointer and it's the caller's responsibility to
 	** maintain a reference to an object with a reference to the data
 	*/
 	VertexMaterialClass *	Peek_Single_Material(int pass=0) const;
-	TextureClass *				Peek_Single_Texture(int pass=0,int stage=0) const;	
+	TextureClass *				Peek_Single_Texture(int pass=0,int stage=0) const;
 
 	void							Set_Material(int vidx,VertexMaterialClass * vmat,int pass=0);
 	void							Set_Shader(int pidx,ShaderClass shader,int pass=0);
@@ -147,10 +146,10 @@ class MeshMatDescClass : public W3DMPO
 	*/
 	bool							Has_UV(int pass,int stage)					{ return UVSource[pass][stage] != -1; }
 	bool							Has_Color_Array(int array)					{ return ColorArray[array] != NULL; }
-	
+
 	bool							Has_Texture_Data(int pass,int stage)	{ return (Texture[pass][stage] != NULL) || (TextureArray[pass][stage] != NULL); }
-	bool							Has_Shader_Data(int pass)					{ return (Shader[pass] != NullShader) || (ShaderArray[pass] != NULL); }					
-	bool							Has_Material_Data(int pass)				{ return (Material[pass] != NULL) || (MaterialArray[pass] != NULL); }				
+	bool							Has_Shader_Data(int pass)					{ return (Shader[pass] != NullShader) || (ShaderArray[pass] != NULL); }
+	bool							Has_Material_Data(int pass)				{ return (Material[pass] != NULL) || (MaterialArray[pass] != NULL); }
 
 	/*
 	** "Get" functions for Materials, Textures, and Shaders when there are more than one (per-polygon or per-vertex)
@@ -176,7 +175,7 @@ class MeshMatDescClass : public W3DMPO
 	void							Make_Color_Array_Unique(int index);
 
 	/*
-	** Post-Load processing, configures all materials to use the correct passes and 
+	** Post-Load processing, configures all materials to use the correct passes and
 	** material color sources, etc.
 	*/
 	void							Post_Load_Process(bool enable_lighting = true,MeshModelClass * parent = NULL);
@@ -190,22 +189,22 @@ class MeshMatDescClass : public W3DMPO
 	static ShaderClass NullShader;	// Used to mark no shader data
 
 protected:
-	
+
 	void							Configure_Material(VertexMaterialClass * mtl,int pass,bool lighting_enabled);
 	void							Disable_Backface_Culling(void);
 	void							Delete_Pass(int pass);
 
 	int													PassCount;
 	int													VertexCount;
-	int													PolyCount;	
+	int													PolyCount;
 
 	// u-v coordinates
 	UVBufferClass *									UV[MAX_UV_ARRAYS];
 	int													UVSource[MAX_PASSES][MAX_TEX_STAGES];
 
-	// vertex color arrays, we support two arrays: each can only be used on the 
+	// vertex color arrays, we support two arrays: each can only be used on the
 	// first pass.
-	ShareBufferClass<unsigned> *					ColorArray[2];	
+	ShareBufferClass<unsigned> *					ColorArray[2];
 	VertexMaterialClass::ColorSourceType		DCGSource[MAX_PASSES];
 	VertexMaterialClass::ColorSourceType		DIGSource[MAX_PASSES];
 
@@ -226,7 +225,7 @@ class MeshMatDescClass : public W3DMPO
 /**
 ** MatBufferClass
 ** This is a ShareBufferClass of pointers to vertex materials.  Should be written as a template...
-** Get and Peek work like normal, and all non-NULL pointers will be released when the buffer 
+** Get and Peek work like normal, and all non-NULL pointers will be released when the buffer
 ** is destroyed.
 */
 class MatBufferClass : public ShareBufferClass < VertexMaterialClass * >
@@ -248,7 +247,7 @@ class MatBufferClass : public ShareBufferClass < VertexMaterialClass * >
 
 /**
 ** TexBufferClass
-** This is a ShareBufferClass of pointers to textures.  Works just like MatBufferClass but with 
+** This is a ShareBufferClass of pointers to textures.  Works just like MatBufferClass but with
 ** TextureClass's...
 */
 class TexBufferClass : public ShareBufferClass < TextureClass * >
@@ -257,7 +256,7 @@ class TexBufferClass : public ShareBufferClass < TextureClass * >
 public:
 	TexBufferClass(int count, const char* msg) : ShareBufferClass<TextureClass *>(count, msg) { Clear(); }
 	TexBufferClass(const TexBufferClass & that);
-	~TexBufferClass(void);						
+	~TexBufferClass(void);
 
 	void				Set_Element(int index,TextureClass * mat);
 	TextureClass *	Get_Element(int index);
@@ -318,7 +317,7 @@ inline void MeshMatDescClass::Set_UV_Source(int pass,int stage,int sourceindex)
 	WWASSERT(pass < MAX_PASSES);
 	WWASSERT(stage >= 0);
 	WWASSERT(stage < MAX_TEX_STAGES);
-	UVSource[pass][stage] = sourceindex;	
+	UVSource[pass][stage] = sourceindex;
 }
 
 inline int MeshMatDescClass::Get_UV_Source(int pass,int stage)
@@ -479,7 +478,7 @@ inline bool MeshMatDescClass::Has_Texture_Array(int pass,int stage) const
 	return (TextureArray[pass][stage] != NULL);
 }
 
-inline void MeshMatDescClass::Disable_Backface_Culling(void) 
+inline void MeshMatDescClass::Disable_Backface_Culling(void)
 {
 	for (int pass = 0; pass < PassCount; pass++) {
 		Shader[pass].Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);
@@ -490,6 +489,3 @@ inline void MeshMatDescClass::Disable_Backface_Culling(void)
 		}
 	}
 }
-
-#endif //MESHMATDESC_H
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp
index 49d1bdc3380..275c79e2343 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp
@@ -49,8 +49,8 @@
 
 /*
 ** Temporary Buffers
-** These buffers are used by the skin code for temporary storage of the deformed vertices and 
-** vertex normals.  
+** These buffers are used by the skin code for temporary storage of the deformed vertices and
+** vertex normals.
 */
 static DynamicVectorClass<Vector3>	_TempVertexBuffer;
 static DynamicVectorClass<Vector3>	_TempNormalBuffer;
@@ -76,9 +76,9 @@ MeshModelClass::MeshModelClass(void) :
 
 	DefMatDesc = W3DNEW MeshMatDescClass;
 	CurMatDesc = DefMatDesc;
-	
+
 	MatInfo = NEW_REF( MaterialInfoClass, () );
-	
+
 	return ;
 }
 
@@ -106,13 +106,9 @@ MeshModelClass::~MeshModelClass(void)
 	Reset(0,0,0);
 	REF_PTR_RELEASE(MatInfo);
 
-	if (DefMatDesc != NULL) {
-		delete DefMatDesc;
-	}
-	if (AlternateMatDesc != NULL) {
-		delete AlternateMatDesc;
-	}
-	return ;
+	delete DefMatDesc;
+	delete AlternateMatDesc;
+
 }
 
 MeshModelClass & MeshModelClass::operator = (const MeshModelClass & that)
@@ -127,10 +123,8 @@ MeshModelClass & MeshModelClass::operator = (const MeshModelClass & that)
 		*DefMatDesc = *(that.DefMatDesc);
 		CurMatDesc = DefMatDesc;
 
-		if (AlternateMatDesc != NULL) {
-			delete AlternateMatDesc;
-			AlternateMatDesc = NULL;
-		}
+		delete AlternateMatDesc;
+		AlternateMatDesc = NULL;
 
 		if (that.AlternateMatDesc != NULL) {
 			AlternateMatDesc = W3DNEW MeshMatDescClass(*(that.AlternateMatDesc));
@@ -138,11 +132,11 @@ MeshModelClass & MeshModelClass::operator = (const MeshModelClass & that)
 
 		clone_materials(that);
 
-		if (GapFiller) {
-			delete GapFiller;
-				GapFiller=NULL;
-		}
-		if (that.GapFiller) GapFiller=W3DNEW GapFillerClass(*that.GapFiller);
+		delete GapFiller;
+			GapFiller=NULL;
+
+		if (that.GapFiller)
+			GapFiller=W3DNEW GapFillerClass(*that.GapFiller);
 	}
 	return * this;
 }
@@ -162,10 +156,10 @@ void MeshModelClass::Reset(int polycount,int vertcount,int passcount)
 
 	MatInfo->Reset();
 	DefMatDesc->Reset(polycount,vertcount,passcount);
-	if (AlternateMatDesc != NULL) {
-		delete AlternateMatDesc;
-		AlternateMatDesc = NULL;
-	}
+
+	delete AlternateMatDesc;
+	AlternateMatDesc = NULL;
+
 	CurMatDesc = DefMatDesc;
 
 	return ;
@@ -178,7 +172,7 @@ void MeshModelClass::Register_For_Rendering()
 		if (WW3D::Get_NPatches_Gap_Filling_Mode()!=WW3D::NPATCHES_GAP_FILLING_DISABLED) {
 			Init_For_NPatch_Rendering();
 		}
-		else if (GapFiller) {
+		else {
 			delete GapFiller;
 			GapFiller=NULL;
 		}
@@ -187,7 +181,7 @@ void MeshModelClass::Register_For_Rendering()
 		if (WW3D::Get_NPatches_Gap_Filling_Mode()==WW3D::NPATCHES_GAP_FILLING_FORCE) {
 			Init_For_NPatch_Rendering();
 		}
-		else if (GapFiller) {
+		else {
 			delete GapFiller;
 			GapFiller=NULL;
 		}
@@ -228,7 +222,7 @@ void MeshModelClass::Replace_VertexMaterial(VertexMaterialClass* vmat,VertexMate
 {
 	WWASSERT(vmat);
 	WWASSERT(new_vmat);
-	
+
 	for (int pass=0;pass<Get_Pass_Count();++pass) {
 		if (Has_Material_Array(pass)) {
 			for (int i=0;i<Get_Vertex_Count();++i) {
@@ -248,7 +242,7 @@ void MeshModelClass::Replace_VertexMaterial(VertexMaterialClass* vmat,VertexMate
 		if (fvf_category) {
 			fvf_category->Change_Polygon_Renderer_Material(PolygonRendererList,vmat,new_vmat,pass);
 		}
-	}	
+	}
 }
 
 DX8FVFCategoryContainer* MeshModelClass::Peek_FVF_Category_Container()
@@ -309,7 +303,7 @@ void MeshModelClass::get_deformed_vertices(Vector3 *dst_vert, Vector3 *dst_norm,
 		const Matrix3D & tm = htree->Get_Transform(bonelink[vi]);
 
 		// Make a copy so we can set the translation to zero
-		Matrix3D mytm=tm;		
+		Matrix3D mytm=tm;
 
 		int idx=bonelink[vi];
 		int cnt;
@@ -348,7 +342,7 @@ void MeshModelClass::compose_deformed_vertex_buffer(
 		const Matrix3D & tm = htree->Get_Transform(bonelink[vi]);
 
 		// Make a copy so we can set the translation to zero
-		Matrix3D mytm=tm;		
+		Matrix3D mytm=tm;
 
 		int idx=bonelink[vi];
 		int cnt;
@@ -389,7 +383,7 @@ void MeshModelClass::get_deformed_screenspace_vertices(Vector4 *dst_vert,const R
 
 	Vector3 * src_vert = Vertex->Get_Array();
 	int vertex_count=Get_Vertex_Count();
-	
+
 	if (Get_Flag(SKIN) && VertexBoneLink && htree) {
 		uint16 * bonelink = VertexBoneLink->Get_Array();
 		for (int vi = 0; vi < vertex_count;) {
@@ -426,13 +420,13 @@ void MeshModelClass::Make_Geometry_Unique()
 	ShareBufferClass<Vector3> * unique_verts = NEW_REF(ShareBufferClass<Vector3>,(*Vertex));
 	REF_PTR_SET(Vertex,unique_verts);
 	REF_PTR_RELEASE(unique_verts);
-	
+
 	ShareBufferClass<Vector3> * norms = NEW_REF(ShareBufferClass<Vector3>,(*VertexNorm));
 	REF_PTR_SET(VertexNorm,norms);
 	REF_PTR_RELEASE(norms);
 
 #if (!OPTIMIZE_PLANEEQ_RAM)
-	ShareBufferClass<Vector4> * peq = NEW_REF(ShareBufferClass<Vector4>,(*PlaneEq, "MeshModelClass::PlaneEq"));	
+	ShareBufferClass<Vector4> * peq = NEW_REF(ShareBufferClass<Vector4>,(*PlaneEq, "MeshModelClass::PlaneEq"));
 	REF_PTR_SET(PlaneEq,peq);
 	REF_PTR_RELEASE(peq);
 #endif
@@ -453,10 +447,10 @@ void MeshModelClass::Enable_Alternate_Material_Description(bool onoff)
 	if ((onoff == true) && (AlternateMatDesc != NULL)) {
 		if (CurMatDesc != AlternateMatDesc) {
 			CurMatDesc = AlternateMatDesc;
-			
+
 			if (Get_Flag(SORT) && WW3D::Is_Munge_Sort_On_Load_Enabled())
 				compute_static_sort_levels();
-			
+
 			// TODO: Invalidate just this meshes DX8 data!!!
 			TheDX8MeshRenderer.Invalidate();
 		}
@@ -524,7 +518,7 @@ struct TriangleSide
 	}
 	TriangleSide() {}
 
-	bool operator== (const TriangleSide& s) 
+	bool operator== (const TriangleSide& s)
 	{
 		unsigned i=*(unsigned*)&loc1[0]^*(unsigned*)&s.loc1[0];
 		i|=*(unsigned*)&loc1[1]^*(unsigned*)&s.loc1[1];
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h
index 826b7ecd566..2a48ea3b171 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MESHMDL_H
-#define MESHMDL_H
 
 #include "vector2.h"
 #include "vector3.h"
@@ -100,13 +94,13 @@ struct VertexFormatXYZNDUV2;
 ** Copy/Add_Ref Rules:
 ** The purpose of this model was to share data between models whenever possible.  To this
 ** end, some of the arrays of data are handled differently:
-** 
+**
 ** ALWAYS SHARED: These are *ALWAYS* Add_Ref'd and thus all point to the same array
 ** Poly - Connectivity of a mesh are always shared (cannot be changed at runtime)
 ** VertexShadeIdx - Shade indices of a mesh are always shared (cannot be changed at runtime)
 ** VertexInfluences - Vertex bone attachments are always shared (cannot be changed at runtime)
 **
-** SHARED UNTIL SCALED, SKIN DEFORMED, or DAMAGED:  
+** SHARED UNTIL SCALED, SKIN DEFORMED, or DAMAGED:
 ** Vertex - vertex positions must be copied if any are moved...
 ** VertexNorm - vertex normals cannot be shared if a vertex is moved
 ** PlaneEq - plane equations cannot be shared if a vertex is moved
@@ -156,16 +150,16 @@ class MeshModelClass : public MeshGeometryClass
 	W3DMPO_GLUE(MeshModelClass)
 	GapFillerClass* GapFiller;
 
-public:	
+public:
 
 	MeshModelClass(void);
 	MeshModelClass(const MeshModelClass & that);
 	~MeshModelClass(void);
-	
+
 	MeshModelClass & operator = (const MeshModelClass & that);
 	void							Reset(int polycount,int vertcount,int passcount);
 	void							Register_For_Rendering();
-	void							Shadow_Render(SpecialRenderInfoClass & rinfo,const Matrix3D & tm,const HTreeClass * htree);	
+	void							Shadow_Render(SpecialRenderInfoClass & rinfo,const Matrix3D & tm,const HTreeClass * htree);
 
 	/////////////////////////////////////////////////////////////////////////////////////
 	// Material interface, All of these functions call through to the current
@@ -173,7 +167,7 @@ class MeshModelClass : public MeshGeometryClass
 	/////////////////////////////////////////////////////////////////////////////////////
 	void							Set_Pass_Count(int passes)														{ CurMatDesc->Set_Pass_Count(passes); }
 	int							Get_Pass_Count(void) const														{ return CurMatDesc->Get_Pass_Count(); }
-	
+
 	const Vector2 *			Get_UV_Array(int pass = 0, int stage = 0)									{ return CurMatDesc->Get_UV_Array(pass,stage); }
 	int							Get_UV_Array_Count(void)														{ return CurMatDesc->Get_UV_Array_Count(); }
 	const Vector2 *			Get_UV_Array_By_Index(int index)												{ return CurMatDesc->Get_UV_Array_By_Index(index, false); }
@@ -191,10 +185,10 @@ class MeshModelClass : public MeshGeometryClass
 
 	// the "Get" functions add a reference before returning the pointer (if appropriate)
 	VertexMaterialClass *	Get_Single_Material(int pass=0) const										{ return CurMatDesc->Get_Single_Material(pass); }
-	TextureClass *				Get_Single_Texture(int pass=0,int stage=0) const						{ return CurMatDesc->Get_Single_Texture(pass,stage); }	
+	TextureClass *				Get_Single_Texture(int pass=0,int stage=0) const						{ return CurMatDesc->Get_Single_Texture(pass,stage); }
 	ShaderClass					Get_Single_Shader(int pass=0) const											{ return CurMatDesc->Get_Single_Shader(pass); }
 
-	// the "Peek" functions just return the pointer and it's the caller's responsibility to 
+	// the "Peek" functions just return the pointer and it's the caller's responsibility to
 	// maintain a reference to an object with a reference to the data
 	VertexMaterialClass *	Peek_Single_Material(int pass=0) const										{ return CurMatDesc->Peek_Single_Material(pass); }
 	TextureClass *				Peek_Single_Texture(int pass=0,int stage=0) const						{ return CurMatDesc->Peek_Single_Texture(pass,stage); }
@@ -331,7 +325,7 @@ class MeshModelClass : public MeshGeometryClass
 	void install_materials(MeshLoadContextClass * loadinfo);
 	void clone_materials(const MeshModelClass & srcmesh);
 	void install_alternate_material_desc(MeshLoadContextClass * context);
-	
+
 	// Material Descriptions
 	// DefMatDesc - the default material description, allocated in constructor, always present.
 	// AlternateMatDes - an optional alternate material description, allocated at load time if needed
@@ -342,7 +336,7 @@ class MeshModelClass : public MeshGeometryClass
 
 	// Collection of the unique materials in the mesh
 	MaterialInfoClass	*									MatInfo;
-	
+
 	// DX8 Mesh rendering system data
 	DX8PolygonRendererList								PolygonRendererList;
 
@@ -367,27 +361,22 @@ class MeshModelClass : public MeshGeometryClass
 
 #if 0
 inline void	MeshModelClass::Apply_Deformation (float percent, bool additive)
-{	
+{
 	MeshDeformer.Apply (*this, percent, additive);
 }
 
 inline void	MeshModelClass::Apply_Deformation (int set_index, float percent, bool additive)
-{	
+{
 	MeshDeformer.Apply (*this, set_index, percent, additive);
 }
 
 inline void	MeshModelClass::Apply_Deformation (const Vector3 &point, float percent, bool additive)
-{	
+{
 	MeshDeformer.Apply (*this, point, percent, additive);
 }
 
 inline void	MeshModelClass::Apply_Deformation (const SphereClass &sphere, float percent, bool additive)
-{	
+{
 	MeshDeformer.Apply (*this, sphere, percent, additive);
 }
 #endif
-
-
-
-#endif
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
index 4d72ffacfef..c2bfcf76913 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
@@ -34,15 +34,15 @@
  * Functions:                                                                                  *
  *   MeshModelClass::Load_W3D -- Load a mesh from a W3D file                                   *
  *   MeshModelClass::read_chunks -- read all of the chunks for a mesh                          *
- *   MeshModelClass::read_vertices -- reads the vertex chunk                                   * 
+ *   MeshModelClass::read_vertices -- reads the vertex chunk                                   *
  *   MeshModelClass::read_texcoords -- read in the texture coordinates chunk                   *
- *   MeshModelClass::read_vertex_normals -- reads a vertex normal chunk from the w3d file      * 
+ *   MeshModelClass::read_vertex_normals -- reads a vertex normal chunk from the w3d file      *
  *   MeshModelClass::read_v3_materials -- Reads in version 3 materials.                        *
  *   MeshModelClass::read_triangles -- read the triangles chunk                                *
  *   MeshModelClass::read_per_tri_materials -- read the material indices for each triangle     *
- *   MeshModelClass::read_user_text -- read in the user text chunk                             * 
- *   MeshModelClass::read_vertex_colors -- read in the vertex colors chunk                     * 
- *   MeshModelClass::read_vertex_influences -- read in the vertex influences chunk             * 
+ *   MeshModelClass::read_user_text -- read in the user text chunk                             *
+ *   MeshModelClass::read_vertex_colors -- read in the vertex colors chunk                     *
+ *   MeshModelClass::read_vertex_influences -- read in the vertex influences chunk             *
  *   MeshModelClass::read_vertex_shade_indices -- read the shade index chunk                   *
  *   MeshModelClass::read_material_info -- read the material info chunk                        *
  *   MeshModelClass::read_shaders -- read the shaders chunk                                    *
@@ -90,8 +90,6 @@
 #include "realcrc.h"
 #include "dx8wrapper.h"
 
-#include <stdio.h>
-
 #ifdef _UNIX
 #include "osdep/osdep.h"
 #endif
@@ -117,7 +115,7 @@ class MeshLoadContextClass : public W3DMPO
 private:
 	MeshLoadContextClass(void);
 	~MeshLoadContextClass(void);
-	
+
 	W3dTexCoordStruct *		Get_Texcoord_Array(void);
 
 	int							Add_Shader(ShaderClass shader);
@@ -127,13 +125,13 @@ class MeshLoadContextClass : public W3DMPO
 	ShaderClass					Peek_Shader(int index)											{ return Shaders[index]; }
 	VertexMaterialClass *	Peek_Vertex_Material(int index)								{ return VertexMaterials[index]; }
 	TextureClass *				Peek_Texture(int index)											{ return Textures[index]; }
-	
+
 	int							Shader_Count(void)												{ return Shaders.Count(); }
 	int							Vertex_Material_Count(void)									{ return VertexMaterials.Count(); }
 	int							Texture_Count(void)												{ return Textures.Count(); }
 
 	/*
-	** Legacy material support.  
+	** Legacy material support.
 	*/
 	void							Add_Legacy_Material(ShaderClass shader,VertexMaterialClass * vmat,TextureClass * tex);
 	ShaderClass					Peek_Legacy_Shader(int legacy_material_index);
@@ -152,7 +150,7 @@ class MeshLoadContextClass : public W3DMPO
 	** for linking the emissive material color to an array seems poor, We're just going to multiply
 	** the DIG array into the DCG array (or make it the DCG array).  Now, to properly support the
 	** "alternate material set", we have to know whether we've already encountered a DIG chunk so
-	** these flags provide that functionality. 
+	** these flags provide that functionality.
 	*/
 	void							Notify_Loaded_DIG_Chunk(bool onoff = true)				{ LoadedDIG = onoff; }
 	bool							Already_Loaded_DIG(void)										{ return LoadedDIG; }
@@ -162,16 +160,16 @@ class MeshLoadContextClass : public W3DMPO
 	struct LegacyMaterialClass
 	{
 		LegacyMaterialClass(void) : VertexMaterialIdx(0),ShaderIdx(0),TextureIdx(0)	{ }
-		~LegacyMaterialClass(void)	{ }		
+		~LegacyMaterialClass(void)	{ }
 		void		Set_Name(const char * name) { Name=name; }
-		
+
 		StringClass Name;
 		int		VertexMaterialIdx;
 		int		ShaderIdx;
 		int		TextureIdx;
 	};
-	
-	
+
+
 	W3dMeshHeader3Struct		Header;
 	W3dTexCoordStruct *		TexCoords;
 	W3dMaterialInfoStruct	MatInfo;
@@ -185,11 +183,11 @@ class MeshLoadContextClass : public W3DMPO
 	DynamicVectorClass < ShaderClass >					Shaders;
 	DynamicVectorClass < VertexMaterialClass * >		VertexMaterials;
 	DynamicVectorClass < unsigned long >				VertexMaterialCrcs;
-	DynamicVectorClass < TextureClass * >				Textures;			
+	DynamicVectorClass < TextureClass * >				Textures;
 
 	/*
-	** Alternate material data.  Any alternate material data will be loaded into 
-	** this MeshMatDescClass object.  When loading is finished, an alternate MeshMatDescClass 
+	** Alternate material data.  Any alternate material data will be loaded into
+	** this MeshMatDescClass object.  When loading is finished, an alternate MeshMatDescClass
 	** will be allocated in the mesh model.  This MeshMatDescClass will be initialized to be
 	** identical to the default MeshMatDescClass and then any data contained in this
 	** MeshMatDescClass will replace the relevant arrays.
@@ -244,12 +242,12 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 	**	Open the first chunk, it should be the mesh header
 	*/
 	cload.Open_Chunk();
-	
+
 	if (cload.Cur_Chunk_ID() != W3D_CHUNK_MESH_HEADER3) {
-		WWDEBUG_SAY(("Old format mesh mesh, no longer supported.\n"));
+		WWDEBUG_SAY(("Old format mesh mesh, no longer supported."));
 		goto Error;
 	}
-	
+
 	context = W3DNEW MeshLoadContextClass;
 
 	if (cload.Read(&(context->Header),sizeof(W3dMeshHeader3Struct)) != sizeof(W3dMeshHeader3Struct)) {
@@ -262,22 +260,22 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 	*/
 	char *	tmpname;
 	int		namelen;
-	
+
 	Reset(context->Header.NumTris,context->Header.NumVertices,1);
-	
+
 	namelen = strlen(context->Header.ContainerName);
 	namelen += strlen(context->Header.MeshName);
 	namelen += 2;
-	W3dAttributes = context->Header.Attributes;	
+	W3dAttributes = context->Header.Attributes;
 	SortLevel = context->Header.SortLevel;
 	tmpname = W3DNEWARRAY char[namelen];
 	memset(tmpname,0,namelen);
 
 	if (strlen(context->Header.ContainerName) > 0) {
 		strcpy(tmpname,context->Header.ContainerName);
-		strcat(tmpname,".");
+		strcat(tmpname, ".");
 	}
-	strcat(tmpname,context->Header.MeshName);
+	strcat(tmpname, context->Header.MeshName);
 
 	Set_Name(tmpname);
 
@@ -301,7 +299,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 	*/
 	if (context->Header.Version >= W3D_MAKE_VERSION(4,1)) {
 		int geometry_type = context->Header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK;
-		switch (geometry_type) 
+		switch (geometry_type)
 		{
 			case W3D_MESH_FLAG_GEOMETRY_TYPE_NORMAL:
 				break;
@@ -315,7 +313,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 				Set_Flag(SKIN,true);
 				Set_Flag(ALLOW_NPATCHES,true);
 				break;
-		} 
+		}
 	}
 
 	if (context->Header.Attributes & W3D_MESH_FLAG_TWO_SIDED) {
@@ -344,7 +342,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 					Set_Flag (PRELIT_LIGHTMAP_MULTI_TEXTURE, true);
 					break;
 				}
-				// Else fall thru...
+				FALLTHROUGH; // Else fall thru...
 
 			case WW3D::PRELIT_MODE_LIGHTMAP_MULTI_PASS:
 				if (context->Header.Attributes & W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_PASS) {
@@ -352,7 +350,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 					Set_Flag (PRELIT_LIGHTMAP_MULTI_PASS, true);
 					break;
 				}
-				// Else fall thru...
+				FALLTHROUGH; // Else fall thru...
 
 			case WW3D::PRELIT_MODE_VERTEX:
 				if (context->Header.Attributes & W3D_MESH_FLAG_PRELIT_VERTEX) {
@@ -360,7 +358,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 					Set_Flag (PRELIT_VERTEX, true);
 					break;
 				}
-				// Else fall thru...
+				FALLTHROUGH; // Else fall thru...
 
 			default:
 
@@ -371,7 +369,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 		}
 
 	} else {
-		
+
 		// For backwards compatibility, test for obsolete lightmap flag.
 		if (context->Header.Attributes & OBSOLETE_W3D_MESH_FLAG_LIGHTMAPPED) {
 			Set_Flag (PRELIT_LIGHTMAP_MULTI_PASS, true);
@@ -390,7 +388,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 
 		uint16 * links = get_bone_links();
 		WWASSERT(links);
-		
+
 		for (int bi = 0; bi < Get_Vertex_Count(); bi++) {
 			links[bi] += 1;
 		}
@@ -400,7 +398,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 	** If this mesh is collideable and no AABTree was in the file, generate one now
 	*/
 	if (	(((W3dAttributes & W3D_MESH_FLAG_COLLISION_TYPE_MASK) >> W3D_MESH_FLAG_COLLISION_TYPE_SHIFT) != 0) &&
-			(CullTree == NULL)) 
+			(CullTree == NULL))
 	{
 		Generate_Culling_Tree();
 	}
@@ -440,7 +438,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
  * HISTORY:                                                                                    *
  *   2/16/99    GTH : Created.                                                                 *
  *=============================================================================================*/
-WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContextClass * context) 
+WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContextClass * context)
 {
 	/*
 	**	Read in the chunk header
@@ -458,7 +456,7 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
 
 			case W3D_CHUNK_VERTICES:
 					// call up to MeshGeometryClass
-					error = read_vertices(cload);		
+					error = read_vertices(cload);
 					break;
 
 			case W3D_CHUNK_SURRENDER_NORMALS:
@@ -472,20 +470,20 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
 					break;
 
 			case O_W3D_CHUNK_MATERIALS:
-			case O_W3D_CHUNK_MATERIALS2:		
-					WWDEBUG_SAY(( "Obsolete material chunk encountered in mesh: %s.%s\r\n", context->Header.ContainerName,context->Header.MeshName));
+			case O_W3D_CHUNK_MATERIALS2:
+					WWDEBUG_SAY(( "Obsolete material chunk encountered in mesh: %s.%s", context->Header.ContainerName,context->Header.MeshName));
 					WWASSERT(0);
 					break;
 
 			case W3D_CHUNK_MATERIALS3:
-					WWDEBUG_SAY(( "Obsolete material chunk encountered in mesh: %s.%s\r\n", context->Header.ContainerName,context->Header.MeshName));
+					WWDEBUG_SAY(( "Obsolete material chunk encountered in mesh: %s.%s", context->Header.ContainerName,context->Header.MeshName));
 					error = read_v3_materials(cload,context);
 					break;
-				
+
 			case O_W3D_CHUNK_SURRENDER_TRIANGLES:
-					WWASSERT_PRINT( 0, "Obsolete Triangle Chunk Encountered!\r\n" );
+					WWASSERT_PRINT( 0, "Obsolete Triangle Chunk Encountered!" );
 					break;
-			
+
 			case W3D_CHUNK_TRIANGLES:
 					// call up to MeshGeometryClass
 					error = read_triangles(cload);
@@ -499,7 +497,7 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
 					// call up to MeshGeometryClass
 					error = read_user_text(cload);
 					break;
-			
+
 			case W3D_CHUNK_VERTEX_COLORS:
 					error = read_vertex_colors(cload,context);
 					break;
@@ -535,11 +533,11 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
 					break;
 
 			case W3D_CHUNK_DEFORM:
-					WWDEBUG_SAY(("Obsolete deform chunk encountered in mesh: %s.%s\r\n", context->Header.ContainerName,context->Header.MeshName));
+					WWDEBUG_SAY(("Obsolete deform chunk encountered in mesh: %s.%s", context->Header.ContainerName,context->Header.MeshName));
 					break;
-			
+
 			case W3D_CHUNK_DAMAGE:
-					WWDEBUG_SAY(("Obsolete damage chunk encountered in mesh: %s.%s\r\n", context->Header.ContainerName,context->Header.MeshName));
+					WWDEBUG_SAY(("Obsolete damage chunk encountered in mesh: %s.%s", context->Header.ContainerName,context->Header.MeshName));
 					break;
 
 			case W3D_CHUNK_PRELIT_UNLIT:
@@ -548,7 +546,7 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
 			case W3D_CHUNK_PRELIT_LIGHTMAP_MULTI_TEXTURE:
 					read_prelit_material (cload, context);
 					break;
-			
+
 			case W3D_CHUNK_AABTREE:
 					// call up to MeshGeometryClass
 					read_aabtree(cload);
@@ -557,8 +555,8 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
 			default:
 					break;
 
-		}	
-		
+		}
+
 		cload.Close_Chunk();
 
 		if (error != WW3D_ERROR_OK) {
@@ -603,11 +601,11 @@ WW3DErrorType MeshModelClass::read_texcoords(ChunkLoadClass & cload,MeshLoadCont
 			}
 			uvarray[i].Set(texcoord.U,1.0f - texcoord.V);
 		}
-	
+
 		DefMatDesc->Install_UV_Array(context->CurPass,context->CurTexStage,uvarray,elementcount);
 	}
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 /***********************************************************************************************
@@ -645,7 +643,7 @@ WW3DErrorType MeshModelClass::read_v3_materials(ChunkLoadClass & cload,MeshLoadC
 		** W3D_MATERIAL3_SC_MAP - specular color map
 		** W3D_MATERIAL3_SI_MAP - specular illumination map
 		*/
-		VertexMaterialClass *		vmat = NULL;	
+		VertexMaterialClass *		vmat = NULL;
 		ShaderClass						shader;
 		TextureClass *					tex = NULL;
 		char								name[256];
@@ -677,7 +675,7 @@ WW3DErrorType MeshModelClass::read_v3_materials(ChunkLoadClass & cload,MeshLoadC
 			if (shader.Get_Dst_Blend_Func() != ShaderClass::DSTBLEND_ZERO) {
 				Set_Flag(MeshModelClass::SORT,true);
 			}
-	
+
 		if (!cload.Close_Chunk()) goto Error;
 
 		/*
@@ -706,7 +704,7 @@ WW3DErrorType MeshModelClass::read_v3_materials(ChunkLoadClass & cload,MeshLoadC
 				if (!cload.Close_Chunk()) goto Error;
 
 				if ( mapinfo.FrameCount > 1 ) {
-					WWDEBUG_SAY(("ERROR: Obsolete Animated Texture detected in model: %s\r\n",context->Header.MeshName));
+					WWDEBUG_SAY(("ERROR: Obsolete Animated Texture detected in model: %s",context->Header.MeshName));
 				}
 
 				tex = WW3DAssetManager::Get_Instance()->Get_Texture(filename);
@@ -738,9 +736,9 @@ WW3DErrorType MeshModelClass::read_v3_materials(ChunkLoadClass & cload,MeshLoadC
 						if (cload.Cur_Chunk_ID() != W3D_CHUNK_MAP3_INFO) goto Error;
 						if (cload.Read(&mapinfo,sizeof(W3dMap3Struct)) != sizeof(W3dMap3Struct)) goto Error;
 					if (!cload.Close_Chunk()) goto Error;
-			
+
 					if ( mapinfo.FrameCount > 1 ) {
-						WWDEBUG_SAY(("ERROR: Obsolete Animated Texture detected in model: %s\r\n",context->Header.MeshName));
+						WWDEBUG_SAY(("ERROR: Obsolete Animated Texture detected in model: %s",context->Header.MeshName));
 					}
 
 					tex = WW3DAssetManager::Get_Instance()->Get_Texture(filename);
@@ -762,7 +760,7 @@ WW3DErrorType MeshModelClass::read_v3_materials(ChunkLoadClass & cload,MeshLoadC
 			vmat->Set_Ambient( color );
 			vmat->Set_Diffuse( Vector3( 0, 0, 0 ) );
 		}
-		
+
 		context->Add_Legacy_Material(shader,vmat,tex);
 
 		vmat->Release_Ref();
@@ -791,7 +789,7 @@ WW3DErrorType MeshModelClass::read_v3_materials(ChunkLoadClass & cload,MeshLoadC
 		Set_Single_Shader(context->Peek_Shader(0),0);
 	}
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 
 Error:
 
@@ -862,24 +860,24 @@ WW3DErrorType MeshModelClass::read_per_tri_materials(ChunkLoadClass & cload,Mesh
 }
 
 
-/*********************************************************************************************** 
- * MeshModelClass::read_vertex_colors -- read in the vertex colors chunk                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshModelClass::read_vertex_colors -- read in the vertex colors chunk                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/28/1997 GH  : Created.                                                                 *
  *   2/16/99    GTH : Moved into MeshModelClass                                                *
  *=============================================================================================*/
 WW3DErrorType MeshModelClass::read_vertex_colors(ChunkLoadClass & cload,MeshLoadContextClass * context)
 {
 	/*
 	** The W3D file format supports arbitrary vertex color arrays for each pass; however since
-	** our conversion to hardware T&L, we only support two unique color arrays.  So here is 
+	** our conversion to hardware T&L, we only support two unique color arrays.  So here is
 	** what is happening in this function:
 	**
 	** 1 - If this is the first diffuse color array we've encountered, load the values
@@ -901,11 +899,11 @@ WW3DErrorType MeshModelClass::read_vertex_colors(ChunkLoadClass & cload,MeshLoad
 			Vector4 col;
 			col.Set((float)color.R / 255.0f,(float)color.G / 255.0f,(float)color.B / 255.0f, 1.0f);
 			dcg[i]=DX8Wrapper::Convert_Color(col);
-		}	
+		}
 	}
 	CurMatDesc->Set_DCG_Source(context->CurPass,VertexMaterialClass::COLOR1);
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 
@@ -1004,7 +1002,7 @@ WW3DErrorType MeshModelClass::read_vertex_materials(ChunkLoadClass & cload,MeshL
  *   3/05/99	 PDS : Broke the guts of this function into a util function in texture.cpp		  *
  *=============================================================================================*/
 WW3DErrorType MeshModelClass::read_textures(ChunkLoadClass & cload,MeshLoadContextClass * context)
-{	
+{
 	// Keep reading textures until there are no more...
 	for (TextureClass *newtex = ::Load_Texture (cload);
 		  newtex != NULL;
@@ -1100,16 +1098,16 @@ WW3DErrorType MeshModelClass::read_vertex_material_ids(ChunkLoadClass & cload,Me
 	}
 
 	/*
-	** This chunk will either have a single index in it or an array of indices 
+	** This chunk will either have a single index in it or an array of indices
 	** with the length equal to the vertex count.
 	*/
 	uint32 vmat;
 #if (!MESH_SINGLE_MATERIAL_HACK)
 	if (cload.Cur_Chunk_Length() == 1*sizeof(uint32)) {
-		
+
 		cload.Read(&vmat,sizeof(uint32));
 		matdesc->Set_Single_Material(context->Peek_Vertex_Material(vmat),context->CurPass);
-	
+
 	} else {
 
 		for (int i=0; i<Get_Vertex_Count(); i++) {
@@ -1156,13 +1154,13 @@ WW3DErrorType MeshModelClass::read_shader_ids(ChunkLoadClass & cload,MeshLoadCon
 	uint32 shaderid;
 #if (!MESH_SINGLE_MATERIAL_HACK)
 	if (cload.Cur_Chunk_Length() == 1*sizeof(uint32)) {
-		
+
 		cload.Read(&shaderid,sizeof(shaderid));
 		ShaderClass shader = context->Peek_Shader(shaderid);
 		matdesc->Set_Single_Shader(shader,context->CurPass);
 
 		// turn on sorting of pass 0 has non-zero dest blend (unless alpha testing on)
-		if (	(context->CurPass == 0) && 
+		if (	(context->CurPass == 0) &&
 				(shader.Get_Dst_Blend_Func() != ShaderClass::DSTBLEND_ZERO) &&
 				(shader.Get_Alpha_Test() == ShaderClass::ALPHATEST_DISABLE) &&
 				(SortLevel == SORT_LEVEL_NONE) )
@@ -1173,16 +1171,16 @@ WW3DErrorType MeshModelClass::read_shader_ids(ChunkLoadClass & cload,MeshLoadCon
 			Set_Flag(SORT,true);
 #endif
 		}
-		
+
 	} else {
-		
+
 		for (int i=0; i<Get_Polygon_Count(); i++) {
 			cload.Read(&shaderid,sizeof(uint32));
 			ShaderClass shader = context->Peek_Shader(shaderid);
 			matdesc->Set_Shader(i,shader,context->CurPass);
 
 			// turn on sorting of pass 0 has non-zero dest blend (unless alpha testing on)
-			if (	(context->CurPass == 0) && 
+			if (	(context->CurPass == 0) &&
 				(shader.Get_Dst_Blend_Func() != ShaderClass::DSTBLEND_ZERO) &&
 				(shader.Get_Alpha_Test() == ShaderClass::ALPHATEST_DISABLE) &&
 				(SortLevel == SORT_LEVEL_NONE) )
@@ -1203,7 +1201,7 @@ WW3DErrorType MeshModelClass::read_shader_ids(ChunkLoadClass & cload,MeshLoadCon
 		matdesc->Set_Single_Shader(shader,context->CurPass);
 
 		// turn on sorting of pass 0 has non-zero dest blend (unless alpha testing on)
-		if (	(context->CurPass == 0) && 
+		if (	(context->CurPass == 0) &&
 				(shader.Get_Dst_Blend_Func() != ShaderClass::DSTBLEND_ZERO) &&
 				(shader.Get_Alpha_Test() == ShaderClass::ALPHATEST_DISABLE) &&
 				(SortLevel == SORT_LEVEL_NONE) )
@@ -1246,7 +1244,7 @@ WW3DErrorType MeshModelClass::read_dcg(ChunkLoadClass & cload,MeshLoadContextCla
 
 	/*
 	** The W3D file format supports arbitrary vertex color arrays for each pass; however since
-	** our conversion to hardware T&L, we only support two unique color arrays.  So here is 
+	** our conversion to hardware T&L, we only support two unique color arrays.  So here is
 	** what is happening in this function:
 	**
 	** 1 - If this is the first diffuse color array we've encountered, load the values.
@@ -1269,7 +1267,7 @@ WW3DErrorType MeshModelClass::read_dcg(ChunkLoadClass & cload,MeshLoadContextCla
 			dcg[i]=DX8Wrapper::Convert_Color(col);
 		}
 	} else if (context->PrelitChunkID==W3D_CHUNK_PRELIT_VERTEX) {
-		
+
 		W3dRGBAStruct color;
 		unsigned * dcg = matdesc->Get_Color_Array(0);
 
@@ -1315,7 +1313,7 @@ WW3DErrorType MeshModelClass::read_dig(ChunkLoadClass & cload,MeshLoadContextCla
 
 	/*
 	** It appears that there isn't wide support for having the emissive material color source
-	** be a vertex color array so when there is a pre-existing color array, I'm just multiplying 
+	** be a vertex color array so when there is a pre-existing color array, I'm just multiplying
 	** the DIG values into it.
 	*/
 	W3dRGBAStruct color;
@@ -1387,7 +1385,7 @@ WW3DErrorType MeshModelClass::read_texture_stage(ChunkLoadClass & cload,MeshLoad
 	while (cload.Open_Chunk()) {
 
 		WW3DErrorType error = WW3D_ERROR_OK;
-		
+
 		switch(cload.Cur_Chunk_ID()) {
 			case W3D_CHUNK_TEXTURE_IDS:
 				error = read_texture_ids(cload,context);
@@ -1457,7 +1455,7 @@ WW3DErrorType MeshModelClass::read_texture_ids(ChunkLoadClass & cload,MeshLoadCo
 			cload.Read(&texid,sizeof(uint32));
 			if (texid != 0xffffffff) {
 				matdesc->Set_Texture(i,context->Peek_Texture(texid),pass,stage);
-			} 
+			}
 		}
 	}
 #else
@@ -1491,7 +1489,7 @@ WW3DErrorType MeshModelClass::read_stage_texcoords(ChunkLoadClass & cload,MeshLo
 	unsigned				elementcount;
 	Vector2			  *uvs;
 	W3dTexCoordStruct texcoord;
-	
+
 	/*
 	** Determine whether this chunk should be read into the default or alternate material description
 	*/
@@ -1505,7 +1503,7 @@ WW3DErrorType MeshModelClass::read_stage_texcoords(ChunkLoadClass & cload,MeshLo
 	*/
 	elementcount = cload.Cur_Chunk_Length() / sizeof (W3dTexCoordStruct);
 	uvs = context->Get_Temporary_UV_Array(elementcount);
-	
+
 	if (uvs != NULL) {
 		for (unsigned i = 0; i < elementcount; i++) {
 			cload.Read (&texcoord, sizeof (texcoord));
@@ -1519,7 +1517,7 @@ WW3DErrorType MeshModelClass::read_stage_texcoords(ChunkLoadClass & cload,MeshLo
 	return (WW3D_ERROR_OK);
 }
 
-	
+
 /***********************************************************************************************
  * MeshModelClass::read_per_face_texcoord_ids -- read uv indices for given (pass,stage).		  *
  *                                                                                             *
@@ -1536,7 +1534,7 @@ WW3DErrorType MeshModelClass::read_stage_texcoords(ChunkLoadClass & cload,MeshLo
 WW3DErrorType MeshModelClass::read_per_face_texcoord_ids (ChunkLoadClass &cload, MeshLoadContextClass *context)
 {
 	unsigned size;
-	
+
 	/*
 	** Determine whether this chunk should be read into the default or alternate material description
 	*/
@@ -1551,9 +1549,9 @@ WW3DErrorType MeshModelClass::read_per_face_texcoord_ids (ChunkLoadClass &cload,
 	*/
 	size = sizeof (Vector3i) * Get_Polygon_Count();
 	if (cload.Cur_Chunk_Length() == size) {
-			
+
 //		Vector3i *uvindices;
-//	
+//
 //		uvindices = matdesc->Get_UVIndex_Array (context->CurPass, true);
 //		WWASSERT (uvindices != NULL);
 
@@ -1562,7 +1560,7 @@ WW3DErrorType MeshModelClass::read_per_face_texcoord_ids (ChunkLoadClass &cload,
 //delete[] uvindices;
 		cload.Seek(size);
 		return (WW3D_ERROR_OK);
-		
+
 	} else {
 		return (WW3D_ERROR_LOAD_FAILED);
 	}
@@ -1585,7 +1583,7 @@ WW3DErrorType MeshModelClass::read_prelit_material (ChunkLoadClass &cload, MeshL
 {
 	// If this chunk ID matches the selected prelit chunk ID then load it, otherwise skip it.
 	if (cload.Cur_Chunk_ID() == context->PrelitChunkID) {
-	
+
 		// While there are chunks in the prelit material chunk wrapper...
 		while (cload.Open_Chunk()) {
 
@@ -1614,21 +1612,21 @@ WW3DErrorType MeshModelClass::read_prelit_material (ChunkLoadClass &cload, MeshL
 					break;
 
 				default:
-					
+
 					// Unknown chunk.
 					break;
-			}	
+			}
 			cload.Close_Chunk();
 			if (error != WW3D_ERROR_OK) return (error);
 		}
 	}
-	
+
 	return (WW3D_ERROR_OK);
 }
 
 
 /***********************************************************************************************
- * MeshModelClass::post_process -- post loading, perform any processing on this model.			  *			
+ * MeshModelClass::post_process -- post loading, perform any processing on this model.			  *
  *                                                                                             *
  * INPUT:                                                                                      *
  *                                                                                             *
@@ -1643,10 +1641,10 @@ WW3DErrorType MeshModelClass::read_prelit_material (ChunkLoadClass &cload, MeshL
 void MeshModelClass::post_process()
 {
 #if 0
-	// we want to allow this now due to usage of the static sort 
+	// we want to allow this now due to usage of the static sort
 	// Ensure no sorting, multipass meshes (for they are abomination...)
 	if (DefMatDesc->Get_Pass_Count() > 1 && Get_Flag(SORT)) {
-		WWDEBUG_SAY(( "Turning SORT off for multipass mesh %s\n",Get_Name() ));
+		WWDEBUG_SAY(( "Turning SORT off for multipass mesh %s",Get_Name() ));
 		Set_Flag(SORT, false);
 	}
 #endif
@@ -1662,7 +1660,7 @@ void MeshModelClass::post_process()
 	}
 
 	// fog activation.
-	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) { 
+	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) {
 		post_process_fog();
 	}
 
@@ -1734,7 +1732,7 @@ void MeshModelClass::post_process_fog(void)
 
 				return;
 			}
-				
+
 			// Analyze the mesh to determine if it is the shiny mask effect and if it is, fix it up appropriately.
 			bool shiny_mask_effect = shader0.Get_Src_Blend_Func() == ShaderClass::SRCBLEND_ONE &&
 											 shader0.Get_Dst_Blend_Func() == ShaderClass::DSTBLEND_ZERO &&
@@ -1749,7 +1747,7 @@ void MeshModelClass::post_process_fog(void)
 			}
 		}
 	}
-		
+
 	// Mesh is not one of the special two-pass combinations. Apply a per-pass generic fix-up.
 	for (int pass = 0; pass < DefMatDesc->PassCount; pass++) {
 		DefMatDesc->Shader [pass].Enable_Fog (Get_Name());
@@ -1769,7 +1767,7 @@ unsigned int MeshModelClass::get_sort_flags(int pass) const
 		for (int tri = 0; tri < CurMatDesc->ShaderArray[pass]->Get_Count(); tri++) {
 			scat = CurMatDesc->ShaderArray[pass]->Get_Element(tri).Get_SS_Category();
 			flags |= (1 << scat);
-		}			
+		}
 	} else {
 		scat = Get_Single_Shader(pass).Get_SS_Category();
 		flags |= (1 << scat);
@@ -1814,7 +1812,7 @@ void MeshModelClass::compute_static_sort_levels(void)
 	case (SSCAT_ADDITIVE_BF | SSCAT_ALPHA_TEST_BF):
 		SortLevel = SORT_LEVEL_BIN2;
 		break;
-		
+
 	default:
 		SortLevel = SORT_LEVEL_BIN1;
 		break;
@@ -1830,7 +1828,7 @@ void MeshModelClass::install_materials(MeshLoadContextClass * context)
 	** If alternate material chunks were loaded, initialize the AlternateMatDesc
 	*/
 	install_alternate_material_desc(context);
-	
+
 	/*
 	** Finish configuring the vertex materials and color arrays.
 	*/
@@ -1920,10 +1918,9 @@ MeshLoadContextClass::~MeshLoadContextClass(void)
 {
 	int i;
 
-	if (TexCoords != NULL) {
-		delete TexCoords;
-		TexCoords = NULL;
-	}
+	delete TexCoords;
+	TexCoords = NULL;
+
 	for (i=0; i<Textures.Count(); i++) {
 		Textures[i]->Release_Ref();
 	}
@@ -1971,10 +1968,10 @@ W3dTexCoordStruct * MeshLoadContextClass::Get_Texcoord_Array(void)
  * HISTORY:                                                                                    *
  *   12/10/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-int MeshLoadContextClass::Add_Shader(ShaderClass shader)								
-{ 
+int MeshLoadContextClass::Add_Shader(ShaderClass shader)
+{
 	int index = Shaders.Count();
-	Shaders.Add(shader); 
+	Shaders.Add(shader);
 	return index;
 }
 
@@ -1991,12 +1988,12 @@ int MeshLoadContextClass::Add_Shader(ShaderClass shader)
  * HISTORY:                                                                                    *
  *   12/10/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-int MeshLoadContextClass::Add_Vertex_Material(VertexMaterialClass * vmat)			
-{ 
+int MeshLoadContextClass::Add_Vertex_Material(VertexMaterialClass * vmat)
+{
 	WWASSERT(vmat != NULL);
 	vmat->Add_Ref();
 	int index = VertexMaterials.Count();
-	VertexMaterials.Add(vmat); 
+	VertexMaterials.Add(vmat);
 	return index;
 }
 
@@ -2013,12 +2010,12 @@ int MeshLoadContextClass::Add_Vertex_Material(VertexMaterialClass * vmat)
  * HISTORY:                                                                                    *
  *   12/10/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-int MeshLoadContextClass::Add_Texture(TextureClass * tex)							
-{ 
+int MeshLoadContextClass::Add_Texture(TextureClass * tex)
+{
 	WWASSERT(tex != NULL);
 	tex->Add_Ref();
 	int index = Textures.Count();
-	Textures.Add(tex); 
+	Textures.Add(tex);
 	return index;
 }
 
@@ -2058,7 +2055,7 @@ void MeshLoadContextClass::Add_Legacy_Material(ShaderClass shader,VertexMaterial
 	if (vmat == NULL) {
 		mat->VertexMaterialIdx = -1;
 	} else {
-		unsigned long crc = vmat->Get_CRC();	
+		unsigned long crc = vmat->Get_CRC();
 		int vi=0;
 		for (; vi<VertexMaterialCrcs.Count(); vi++) {
 			if (VertexMaterialCrcs[vi] == crc) break;
@@ -2093,7 +2090,7 @@ void MeshLoadContextClass::Add_Legacy_Material(ShaderClass shader,VertexMaterial
 
 
 /***********************************************************************************************
- * MeshLoadContextClass::Peek_Legacy_Shader -- returns a legacy shader								  *		
+ * MeshLoadContextClass::Peek_Legacy_Shader -- returns a legacy shader								  *
  *                                                                                             *
  * This function does the re-indexing to go from the legacy shader index to the actual shader  *
  * index and then returns that shader                                                          *
@@ -2239,13 +2236,13 @@ WW3DErrorType MeshModelClass::Save_W3D(ChunkSaveClass & csave)
 
 WW3DErrorType MeshModelClass::write_chunks(ChunkSaveClass & csave,MeshSaveContextClass * context)
 {
-	
+
 	// write the header
 	write_header(csave,context);
 	write_user_text(csave,context);
 
 	// write the geometry
-	write_triangles(csave,context);	
+	write_triangles(csave,context);
 	write_vertices(csave,context);
 	write_vertex_normals(csave,context);
 	write_vertex_shade_indices(csave,context);
@@ -2270,13 +2267,13 @@ WW3DErrorType MeshModelClass::write_header(ChunkSaveClass & csave,MeshSaveContex
 {
 	W3dMeshHeader3Struct header;
 	memset(&header,0,sizeof(header));
-	
+
 	// Set names
 	if (MeshName) {
 
 		char * name = MeshName->Get_Array();
 		char * mesh_name = strchr(name,'.');
-		
+
 		int hierarchy_name_len = 0;
 		if (mesh_name == NULL) {
 			mesh_name = name;
@@ -2284,9 +2281,9 @@ WW3DErrorType MeshModelClass::write_header(ChunkSaveClass & csave,MeshSaveContex
 			hierarchy_name_len = (int)mesh_name - (int)name;
 			mesh_name++;
 		}
-		assert( hierarchy_name_len <= W3D_NAME_LEN);
-		strncpy( header.MeshName, mesh_name, W3D_NAME_LEN);
-		strncpy( header.ContainerName, name, hierarchy_name_len);
+		assert( hierarchy_name_len < W3D_NAME_LEN);
+		strlcpy( header.MeshName, mesh_name, W3D_NAME_LEN);
+		strlcpy( header.ContainerName, name, hierarchy_name_len + 1);
 	} else {
 		sprintf(header.MeshName,"UnNamed");
 	}
@@ -2357,7 +2354,7 @@ WW3DErrorType MeshModelClass::write_triangles(ChunkSaveClass & csave,MeshSaveCon
 			tri.Normal.Z = 		poly_eq[i].Z;
 			tri.Dist =				poly_eq[i].W;
 		} else {
-			
+
 			Vector3 a,b,normal;
 			Vector3 * verts = Vertex->Get_Array();
 			const Vector3 & p0= verts[poly_verts[i][0]];
@@ -2376,7 +2373,7 @@ WW3DErrorType MeshModelClass::write_triangles(ChunkSaveClass & csave,MeshSaveCon
 
 		if (csave.Write(&tri,sizeof(W3dTriStruct)) != sizeof(W3dTriStruct)) {
 			return WW3D_ERROR_SAVE_FAILED;
-		} 
+		}
 	}
 
 	if (!csave.End_Chunk()) {
@@ -2391,7 +2388,7 @@ WW3DErrorType MeshModelClass::write_vertices(ChunkSaveClass & csave,MeshSaveCont
 	if (!csave.Begin_Chunk(W3D_CHUNK_VERTICES)) {
 		return WW3D_ERROR_SAVE_FAILED;
 	}
-	
+
 	WWASSERT(Get_Vertex_Count() > 0);
 	Vector3 * verts = Vertex->Get_Array();
 
@@ -2401,12 +2398,12 @@ WW3DErrorType MeshModelClass::write_vertices(ChunkSaveClass & csave,MeshSaveCont
    	vert.X = verts[i].X;
 		vert.Y = verts[i].Y;
 		vert.Z = verts[i].Z;
-		
+
 		if (csave.Write(&(vert),sizeof(W3dVectorStruct)) != sizeof(W3dVectorStruct)) {
 			return WW3D_ERROR_SAVE_FAILED;
 		}
 	}
-	
+
 	if (!csave.End_Chunk()) {
 		return WW3D_ERROR_SAVE_FAILED;
 	}
@@ -2419,21 +2416,21 @@ WW3DErrorType MeshModelClass::write_vertex_normals(ChunkSaveClass & csave,MeshSa
 	if (!csave.Begin_Chunk(W3D_CHUNK_VERTEX_NORMALS)) {
 		return WW3D_ERROR_SAVE_FAILED;
 	}
-	
+
 	const Vector3 * verts = Get_Vertex_Normal_Array();
-	
+
 	for (int i=0; i<Get_Vertex_Count(); i++) {
 
 		W3dVectorStruct vert;
    	vert.X = verts[i].X;
 		vert.Y = verts[i].Y;
 		vert.Z = verts[i].Z;
-		
+
 		if (csave.Write(&(vert),sizeof(W3dVectorStruct)) != sizeof(W3dVectorStruct)) {
 			return WW3D_ERROR_SAVE_FAILED;
 		}
 	}
-	
+
 	if (!csave.End_Chunk()) {
 		return WW3D_ERROR_SAVE_FAILED;
 	}
@@ -2539,9 +2536,9 @@ WW3DErrorType MeshModelClass::write_vertex_materials(ChunkSaveClass & csave,Mesh
 {
 	if (context->Materials.Get_Vertex_Material_Count() <= 0) return WW3D_ERROR_OK;
 	if (!csave.Begin_Chunk(W3D_CHUNK_VERTEX_MATERIALS)) return WW3D_ERROR_SAVE_FAILED;
-	
+
 	for (int vi=0; vi<context->Materials.Get_Vertex_Material_Count(); vi++) {
-		
+
 		csave.Begin_Chunk(W3D_CHUNK_VERTEX_MATERIAL);
 		VertexMaterialClass * vmat = context->Materials.Peek_Vertex_Material(vi);
 		vmat->Save_W3D(csave);
@@ -2556,7 +2553,7 @@ WW3DErrorType MeshModelClass::write_textures(ChunkSaveClass & csave,MeshSaveCont
 {
 	if (context->Materials.Get_Texture_Count() <= 0) return WW3D_ERROR_OK;
 	if (!csave.Begin_Chunk(W3D_CHUNK_TEXTURES)) return WW3D_ERROR_SAVE_FAILED;
-	
+
 	for (int ti=0; ti<context->Materials.Get_Texture_Count(); ti++) {
 		TextureClass * tex = context->Materials.Peek_Texture(ti);
 		Save_Texture(tex,csave);
@@ -2588,14 +2585,14 @@ WW3DErrorType MeshModelClass::write_material_pass(ChunkSaveClass & csave,MeshSav
 WW3DErrorType MeshModelClass::write_vertex_material_ids(ChunkSaveClass & csave,MeshSaveContextClass * context)
 {
 	// first check if all vertex material pointers are Null (is this legal?)
-	if (	(DefMatDesc->Material[context->CurPass] == NULL) && 
+	if (	(DefMatDesc->Material[context->CurPass] == NULL) &&
 			(DefMatDesc->MaterialArray[context->CurPass] == NULL)) return WW3D_ERROR_OK;
 
 	csave.Begin_Chunk(W3D_CHUNK_VERTEX_MATERIAL_IDS);
 
 	uint32 id = 0;
 	if (DefMatDesc->MaterialArray[context->CurPass] == NULL) {
-		
+
 		id = context->Materials.Find_Vertex_Material(DefMatDesc->Material[context->CurPass]);
 		csave.Write(&id,sizeof(id));
 
@@ -2619,12 +2616,12 @@ WW3DErrorType MeshModelClass::write_shader_ids(ChunkSaveClass & csave,MeshSaveCo
 
 	uint32 id = 0;
 	if (DefMatDesc->ShaderArray[context->CurPass] == NULL) {
-		
+
 		id = context->Materials.Find_Shader(DefMatDesc->Shader[context->CurPass]);
 		csave.Write(&id,sizeof(id));
 
 	} else {
-		
+
 		ShaderClass * array = DefMatDesc->ShaderArray[context->CurPass]->Get_Array();
 		for (int pi=0; pi<Get_Polygon_Count(); pi++) {
 			id = context->Materials.Find_Shader(array[pi]);
@@ -2640,7 +2637,7 @@ WW3DErrorType MeshModelClass::write_scg(ChunkSaveClass & csave,MeshSaveContextCl
 {
 	if (DefMatDesc->SCG[context->CurPass] == NULL) return WW3D_ERROR_OK;
 	csave.Begin_Chunk(W3D_CHUNK_SCG);
-	
+
 	W3dRGBAStruct color;
 	Vector4 * color_array = DefMatDesc->SCG[context->CurPass]->Get_Array();
 	for (int vi=0; vi<Get_Vertex_Count(); vi++) {
@@ -2686,7 +2683,7 @@ WW3DErrorType MeshModelClass::write_texture_stage(ChunkSaveClass & csave,MeshSav
 {
 	if (	(DefMatDesc->Texture[context->CurPass][context->CurStage] == NULL) &&
 			(DefMatDesc->TextureArray[context->CurPass][context->CurStage] == NULL)) return WW3D_ERROR_OK;
-	
+
 	csave.Begin_Chunk(W3D_CHUNK_TEXTURE_STAGE);
 	write_texture_ids(csave,context);
 	write_stage_texcoords(csave,context);
@@ -2699,15 +2696,15 @@ WW3DErrorType MeshModelClass::write_texture_stage(ChunkSaveClass & csave,MeshSav
 WW3DErrorType MeshModelClass::write_texture_ids(ChunkSaveClass & csave,MeshSaveContextClass * context)
 {
 	csave.Begin_Chunk(W3D_CHUNK_TEXTURE_IDS);
-	
+
 	uint32 id = 0;
 	if (DefMatDesc->TextureArray[context->CurPass][context->CurStage] == NULL) {
-		
+
 		id = context->Materials.Find_Texture(DefMatDesc->Texture[context->CurPass][context->CurStage]);
 		csave.Write(&id,sizeof(id));
 
 	} else {
-		
+
 		srTextureIFace ** array = DefMatDesc->TextureArray[context->CurPass][context->CurStage]->Get_Array();
 		for (int pi=0; pi<Get_Polygon_Count(); pi++) {
 			id = context->Materials.Find_Texture(array[pi]);
@@ -2731,7 +2728,7 @@ WW3DErrorType MeshModelClass::write_stage_texcoords(ChunkSaveClass & csave,MeshS
 
 		tex.U = array[vi].X;
 		tex.V = 1.0f - array[vi].Y;
-		
+
 		csave.Write(&tex,sizeof(tex));
 	}
 
@@ -2739,4 +2736,4 @@ WW3DErrorType MeshModelClass::write_stage_texcoords(ChunkSaveClass & csave,MeshS
 	return WW3D_ERROR_OK;
 }
 
-#endif // 0 (disabled mesh saving code)
\ No newline at end of file
+#endif // 0 (disabled mesh saving code)
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp
index 3159d11b1c1..ec512b35208 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp
@@ -17,26 +17,26 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/motchan.cpp 3     5/05/01 7:10p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/motchan.cpp                            $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 5/05/01 6:28p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   MotionChannelClass::MotionChannelClass -- constructor                                     * 
- *   MotionChannelClass::~MotionChannelClass -- destructor                                     * 
- *   MotionChannelClass::Free -- de-allocates all memory in use                                * 
- *   MotionChannelClass::Load -- loads a motion channel from a file                            * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/motchan.cpp                            $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 5/05/01 6:28p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   MotionChannelClass::MotionChannelClass -- constructor                                     *
+ *   MotionChannelClass::~MotionChannelClass -- destructor                                     *
+ *   MotionChannelClass::Free -- de-allocates all memory in use                                *
+ *   MotionChannelClass::Load -- loads a motion channel from a file                            *
  *   BitChannelClass::BitChannelClass -- Constructor for BitChannelClass                       *
  *   BitChannelClass::~BitChannelClass -- Destructor for BitChannelClass                       *
  *   BitChannelClass::Free -- Free all "external" memory in use                                *
@@ -47,7 +47,7 @@
 #include "motchan.h"
 #include "w3d_file.h"
 #include "chunkio.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "wwmath.h"
 #include "quat.h"
 
@@ -75,20 +75,20 @@ static float filtertable[FILTER_TABLE_SIZE] = {
 	10000000.0f,
 
 };
-static bool table_valid = false; 
-
-
-/*********************************************************************************************** 
- * MotionChannelClass::MotionChannelClass -- constructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+static bool table_valid = false;
+
+
+/***********************************************************************************************
+ * MotionChannelClass::MotionChannelClass -- constructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 MotionChannelClass::MotionChannelClass(void) :
 	PivotIdx(0),
@@ -100,62 +100,60 @@ MotionChannelClass::MotionChannelClass(void) :
 {
 }
 
-/*********************************************************************************************** 
- * MotionChannelClass::~MotionChannelClass -- destructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionChannelClass::~MotionChannelClass -- destructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 MotionChannelClass::~MotionChannelClass(void)
 {
 	Free();
 }
 
-/*********************************************************************************************** 
- * MotionChannelClass::Free -- de-allocates all memory in use                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionChannelClass::Free -- de-allocates all memory in use                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void MotionChannelClass::Free(void)
 {
-	if (Data) {
-		delete[] Data;
-		Data = NULL;
-	}
+	delete[] Data;
+	Data = NULL;
 }
 
 
-/*********************************************************************************************** 
- * MotionChannelClass::Load -- loads a motion channel from a file                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionChannelClass::Load -- loads a motion channel from a file                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool MotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 {
 	int size = cload.Cur_Chunk_Length();
 	unsigned int datasize = (size - sizeof(W3dAnimChannelStruct));
 	unsigned int num_floats = (datasize / sizeof(float32)) + 1;
-  
+
 	W3dAnimChannelStruct chan;
 	if (cload.Read(&chan,sizeof(W3dAnimChannelStruct)) != sizeof(W3dAnimChannelStruct)) {
 		return false;
@@ -169,11 +167,11 @@ bool MotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 
 	Data = MSGW3DNEWARRAY("MotionChannelClass::Data") float32[num_floats];
 	Data[0] = chan.Data[0];
-	
+
 	if (cload.Read(&(Data[1]),datasize) != datasize) {
 		Free();
 		return false;
-	}	
+	}
 	return true;
 }
 
@@ -233,10 +231,8 @@ BitChannelClass::~BitChannelClass(void)
  *=============================================================================================*/
 void BitChannelClass::Free(void)
 {
-	if (Bits != NULL) {
-		delete[] Bits;
-		Bits = NULL;
-	}
+	delete[] Bits;
+	Bits = NULL;
 }
 
 
@@ -255,7 +251,7 @@ void BitChannelClass::Free(void)
 bool BitChannelClass::Load_W3D(ChunkLoadClass & cload)
 {
 	Free();
-	
+
 	int chunk_size = cload.Cur_Chunk_Length();
 
 	W3dBitChannelStruct chan;
@@ -279,29 +275,29 @@ bool BitChannelClass::Load_W3D(ChunkLoadClass & cload)
 	assert(Bits);
 
 	Bits[0] = chan.Data[0];
-	
+
 	if (bytesleft > 0) {
 		if (cload.Read(&(Bits[1]),bytesleft) != bytesleft) {
 			Free();
 			return false;
-		}	
+		}
 	}
 
 	return true;
 }
 
 
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::TimeCodedMotionChannelClass -- constructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::TimeCodedMotionChannelClass -- constructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 TimeCodedMotionChannelClass::TimeCodedMotionChannelClass(void) :
 	PivotIdx(0),
@@ -315,55 +311,53 @@ TimeCodedMotionChannelClass::TimeCodedMotionChannelClass(void) :
 {
 }
 
-/*********************************************************************************************** 
- * MotionChannelClass::~MotionChannelClass -- destructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionChannelClass::~MotionChannelClass -- destructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 TimeCodedMotionChannelClass::~TimeCodedMotionChannelClass(void)
 {
 	Free();
 }
 
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::Free -- de-allocates all memory in use                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::Free -- de-allocates all memory in use                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void TimeCodedMotionChannelClass::Free(void)
 {
-	if (Data) {
-		delete[] Data;
-		Data = NULL;
-	}
+	delete[] Data;
+	Data = NULL;
 }
 
 
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::Load -- loads a motion channel from a file                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::Load -- loads a motion channel from a file                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool TimeCodedMotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 {
@@ -375,8 +369,8 @@ bool TimeCodedMotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 	if (cload.Read(&chan,sizeof(W3dTimeCodedAnimChannelStruct)) != sizeof(W3dTimeCodedAnimChannelStruct)) {
 		return false;
 	}
-						
-	NumTimeCodes = chan.NumTimeCodes;          
+
+	NumTimeCodes = chan.NumTimeCodes;
 	VectorLen    = chan.VectorLen;
 	Type 		    = chan.Flags;
 	PivotIdx     = chan.Pivot;
@@ -386,54 +380,54 @@ bool TimeCodedMotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 
 	Data = MSGW3DNEWARRAY("TimeCodedMotionChannelClass::Data") uint32[numInts];
 	Data[0] = chan.Data[0];
-	
+
 	if (cload.Read(&(Data[1]), datasize) != datasize) {
 		Free();
 		return false;
-	}	
+	}
 	return true;
 }
 
 
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::Get_Vector -- returns the vector for the specified frame #              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::Get_Vector -- returns the vector for the specified frame #              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void	TimeCodedMotionChannelClass::Get_Vector(float32 frame,float * setvec)
-{		
-	
+{
+
   uint32	tc0;
-  
+
   tc0 = frame;
-	
-  uint32 pidx = get_index( tc0 );						
+
+  uint32 pidx = get_index( tc0 );
   uint32 p2idx;
-  
+
   if (pidx == ((NumTimeCodes - 1) * PacketSize))  {
-  	
-     float32 *frm = (float32 *) &Data[pidx+1];	 									
-                           
+
+     float32 *frm = (float32 *) &Data[pidx+1];
+
 		for (int i=0; i < VectorLen; i++)  {
-	  	
+
 	   	setvec[i] = frm[i];
-	     
-	  }               
-     
-     return;		  
-             
+
+	  }
+
+     return;
+
   }
   else {
   	p2idx = pidx + PacketSize;
   }
-  
+
   uint32 time = Data[p2idx];
 
    if (time & W3D_TIMECODED_BINARY_MOVEMENT_FLAG) {
@@ -446,19 +440,19 @@ void	TimeCodedMotionChannelClass::Get_Vector(float32 frame,float * setvec)
 
   float32 time1 = (Data[pidx]  & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG);
   float32 time2 = (time & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG);
-  
-  float32 ratio = (frame - time1) / (time2 - time1);	
-     
+
+  float32 ratio = (frame - time1) / (time2 - time1);
+
   float32 *frame1 = (float32 *) &Data[pidx+1];
   float32 *frame2 = (float32 *) &Data[p2idx+1];
-  					
+
   for (int i=0; i < VectorLen; i++)  {
-  	
+
      setvec[i] = WWMath::Lerp(frame1[i],frame2[i],ratio);
-     
-  }               
 
-}	// Get_Vector
+  }
+
+}
 
 
 Quaternion TimeCodedMotionChannelClass::Get_QuatVector(float32 frame)
@@ -469,25 +463,25 @@ Quaternion TimeCodedMotionChannelClass::Get_QuatVector(float32 frame)
 	Quaternion q(1);
 
 	uint32	tc0;
-  
+
 	tc0 = frame;
-	
-	uint32 pidx = get_index( tc0 );						
+
+	uint32 pidx = get_index( tc0 );
 	uint32 p2idx;
-  
+
 	if (pidx == ((NumTimeCodes - 1) * PacketSize))  {
-  	
-		float32 *vec = (float32 *) &Data[pidx+1];	 									
-               
+
+		float32 *vec = (float32 *) &Data[pidx+1];
+
 		q.Set(vec[0], vec[1], vec[2], vec[3]);
 
-		return( q );		  
-             
+		return( q );
+
 	}
 	else {
   		p2idx = pidx + PacketSize;
 	}
-  
+
 	uint32 time = Data[p2idx];
 
 	if (time & W3D_TIMECODED_BINARY_MOVEMENT_FLAG) {
@@ -495,18 +489,18 @@ Quaternion TimeCodedMotionChannelClass::Get_QuatVector(float32 frame)
 		float32 *vec = (float32 *) &Data[pidx+1];
 
 		q.Set(vec[0], vec[1], vec[2], vec[3]);
-		
+
 		return( q );
 	}
-	
+
 	float32 time1 = (Data[pidx]  & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG);
 	float32 time2 = (time & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG);
 
-	float32 ratio = (frame - time1) / (time2 - time1);	
-	   
+	float32 ratio = (frame - time1) / (time2 - time1);
+
 	float32 *frame1 = (float32 *) &Data[pidx+1];
 	float32 *frame2 = (float32 *) &Data[p2idx+1];
-  					
+
 	Quaternion q1(1);
 	Quaternion q2(1);
 
@@ -517,25 +511,25 @@ Quaternion TimeCodedMotionChannelClass::Get_QuatVector(float32 frame)
 
 	return( q );
 
-} // Get_QuatVector
+}
 
 
 
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::binary_search_index / returns packet index 				        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   01/27/2000 JGA  : Created.                                                                * 
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::binary_search_index / returns packet index 				        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   01/27/2000 JGA  : Created.                                                                *
  *=============================================================================================*/
 // New version that uses a binary search, and no cache
 uint32 TimeCodedMotionChannelClass::binary_search_index(uint32 timecode)
-{	
+{
 	int leftIdx = 0;
 	int rightIdx = NumTimeCodes - 2;
 	int dx;
@@ -552,7 +546,7 @@ uint32 TimeCodedMotionChannelClass::binary_search_index(uint32 timecode)
 	if (timecode >= time) return(idx);
 
 	for (;;) {
-	
+
 		dx = rightIdx - leftIdx;
 
 		dx>>=1;	// divide by 2
@@ -570,7 +564,7 @@ uint32 TimeCodedMotionChannelClass::binary_search_index(uint32 timecode)
 
 		time = Data[idx + PacketSize] & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG;
 
-		if (timecode < time) return(idx); 
+		if (timecode < time) return(idx);
 
 		if (leftIdx ^ dx) {
 			leftIdx = dx;
@@ -588,23 +582,23 @@ uint32 TimeCodedMotionChannelClass::binary_search_index(uint32 timecode)
 	assert(0);
 	return(0);
 
-}	// binary_search_index
-
-	 
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::get_index / returns packet index												       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   01/27/2000 JGA  : Created.                                                                * 
+}
+
+
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::get_index / returns packet index												       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   01/27/2000 JGA  : Created.                                                                *
  *=============================================================================================*/
 uint32 TimeCodedMotionChannelClass::get_index(uint32 timecode)
-{	
+{
 	assert(CachedIdx <= LastTimeCodeIdx);
 
 	uint32	time;
@@ -630,19 +624,19 @@ uint32 TimeCodedMotionChannelClass::get_index(uint32 timecode)
 
 	return(CachedIdx);
 
-}	// get_index
-   
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::set_identity -- returns an "identity" vector (not really...hmm...)      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+}
+
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::set_identity -- returns an "identity" vector (not really...hmm...)      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void TimeCodedMotionChannelClass::set_identity(float * setvec)
 {
@@ -658,7 +652,7 @@ void TimeCodedMotionChannelClass::set_identity(float * setvec)
 		setvec[0] = 0.0f;
 
 	}
-}	// set_identity
+}
 
 
 /***********************************************************************************************
@@ -714,10 +708,8 @@ TimeCodedBitChannelClass::~TimeCodedBitChannelClass(void)
  *=============================================================================================*/
 void TimeCodedBitChannelClass::Free(void)
 {
-	if (Bits != NULL) {
-		delete[] Bits;
-		Bits = NULL;
-	}
+	delete[] Bits;
+	Bits = NULL;
 }
 
 
@@ -736,15 +728,15 @@ void TimeCodedBitChannelClass::Free(void)
 bool TimeCodedBitChannelClass::Load_W3D(ChunkLoadClass & cload)
 {
 	Free();
-	
+
 	int chunk_size = cload.Cur_Chunk_Length();
 
 	W3dTimeCodedBitChannelStruct chan;
 	if (cload.Read(&chan,sizeof(W3dTimeCodedBitChannelStruct)) != sizeof(W3dTimeCodedBitChannelStruct)) {
 		return false;
 	}
-			 
-	NumTimeCodes = chan.NumTimeCodes;     
+
+	NumTimeCodes = chan.NumTimeCodes;
 	Type 			 = chan.Flags;
 	PivotIdx 	 = chan.Pivot;
 	DefaultVal = chan.DefaultVal;
@@ -758,16 +750,16 @@ bool TimeCodedBitChannelClass::Load_W3D(ChunkLoadClass & cload)
 	assert(Bits);
 
 	Bits[0] = chan.Data[0];
-	
+
 	if (bytesleft > 0) {
 		if (cload.Read(&(Bits[1]),bytesleft) != bytesleft) {
 			Free();
 			return false;
-		}	
+		}
 	}
 
 	return true;
-}	 // Load_W3D
+}
 
 
 /***********************************************************************************************
@@ -783,8 +775,8 @@ bool TimeCodedBitChannelClass::Load_W3D(ChunkLoadClass & cload)
  *   1/21/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 int TimeCodedBitChannelClass::Get_Bit(int frame)
-{		
-	assert(frame >= 0);	 
+{
+	assert(frame >= 0);
 	assert(CachedIdx < NumTimeCodes);
 
 	int time;
@@ -792,47 +784,47 @@ int TimeCodedBitChannelClass::Get_Bit(int frame)
 
 	time = Bits[CachedIdx] & ~W3D_TIMECODED_BIT_MASK;
 
-	
+
 	if (frame >= time) {
-		
+
 		// start from here
 		idx = CachedIdx+1;
 
 	}
 
 	for (;idx < (int) NumTimeCodes ; idx++)  {
-	
+
 		time = Bits[idx] &~W3D_TIMECODED_BIT_MASK;
-     
-		if (frame < time) break;	
-     
-	}  
-  
+
+		if (frame < time) break;
+
+	}
+
 	idx--;
-  
+
 	if (idx < 0) idx = 0;
-  
+
 	CachedIdx = idx;
 
 	return (((Bits[idx] & W3D_TIMECODED_BIT_MASK) == W3D_TIMECODED_BIT_MASK));
-  
-}	 // Get_Bit
+
+}
 
 
 // Begin Adaptive Delta
 
 
-/*********************************************************************************************** 
- * AdaptiveDeltaMotionChannelClass::AdaptiveDeltaMotionChannelClass -- constructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/18/2000 JGA : Created.                                                                 * 
+/***********************************************************************************************
+ * AdaptiveDeltaMotionChannelClass::AdaptiveDeltaMotionChannelClass -- constructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/18/2000 JGA : Created.                                                                 *
  *=============================================================================================*/
 AdaptiveDeltaMotionChannelClass::AdaptiveDeltaMotionChannelClass(void) :
 	PivotIdx(0),
@@ -841,7 +833,7 @@ AdaptiveDeltaMotionChannelClass::AdaptiveDeltaMotionChannelClass(void) :
 	Data(NULL),
 	NumFrames(0),
 	CacheData(NULL),
-	Scale(0.0f)	
+	Scale(0.0f)
 {
 
 	if (false == table_valid) {
@@ -851,7 +843,7 @@ AdaptiveDeltaMotionChannelClass::AdaptiveDeltaMotionChannelClass(void) :
 		{
 			float ratio = i;
 
-			//ratio = ((ratio + 1.0f) / 128.0f); 
+			//ratio = ((ratio + 1.0f) / 128.0f);
 			ratio/=((float) FILTER_TABLE_GEN_SIZE);
 
 			filtertable[i + FILTER_TABLE_GEN_START] = 1.0f - WWMath::Sin( DEG_TO_RAD(90.0f * ratio));
@@ -863,61 +855,56 @@ AdaptiveDeltaMotionChannelClass::AdaptiveDeltaMotionChannelClass(void) :
 
 }
 
-/*********************************************************************************************** 
- * MotionChannelClass::~MotionChannelClass -- destructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/18/1000 JGA : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionChannelClass::~MotionChannelClass -- destructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/18/1000 JGA : Created.                                                                 *
  *=============================================================================================*/
 AdaptiveDeltaMotionChannelClass::~AdaptiveDeltaMotionChannelClass(void)
 {
 	Free();
 }
 
-/*********************************************************************************************** 
- * AdaptiveDeltaMotionChannelClass::Free -- de-allocates all memory in use                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/18/2000 JGA  : Created.                                                                 * 
+/***********************************************************************************************
+ * AdaptiveDeltaMotionChannelClass::Free -- de-allocates all memory in use                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/18/2000 JGA  : Created.                                                                 *
  *=============================================================================================*/
 void AdaptiveDeltaMotionChannelClass::Free(void)
 {
-	if (Data) {
-		delete[] Data;
-		Data = NULL;
-	}
+	delete[] Data;
+	Data = NULL;
 
-	if (CacheData) {
-		delete CacheData;
-		CacheData = NULL;
-	}
-
-}	// Free
+	delete CacheData;
+	CacheData = NULL;
+}
 
 
-/*********************************************************************************************** 
- * AdaptiveDeltaMotionChannelClass::Load -- loads a motion channel from a file                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/18/2000 JGA : Created.                                                                 * 
+/***********************************************************************************************
+ * AdaptiveDeltaMotionChannelClass::Load -- loads a motion channel from a file                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/18/2000 JGA : Created.                                                                 *
  *=============================================================================================*/
 bool AdaptiveDeltaMotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 {
@@ -929,7 +916,7 @@ bool AdaptiveDeltaMotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 	if (cload.Read(&chan,sizeof(W3dAdaptiveDeltaAnimChannelStruct)) != sizeof(W3dAdaptiveDeltaAnimChannelStruct)) {
 		return false;
 	}
-						
+
 	VectorLen   = chan.VectorLen;
 	Type 		   = chan.Flags;
 	PivotIdx    = chan.Pivot;
@@ -940,31 +927,31 @@ bool AdaptiveDeltaMotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 
 	Data = MSGW3DNEWARRAY("AdaptiveDeltaMotionChannelClass::Data") uint32[numInts];
 	Data[0] = chan.Data[0];
-	
+
 	if (cload.Read(&(Data[1]), datasize) != datasize) {
 		Free();
 		return false;
-	}	
+	}
 	return true;
 
-}	// Load_W3D
+}
 
 
-/*********************************************************************************************** 
- * AdaptiveDeltaMotionChannelClass::decompress																  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/23/2000 JGA  : Created.                                                                * 
+/***********************************************************************************************
+ * AdaptiveDeltaMotionChannelClass::decompress																  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/23/2000 JGA  : Created.                                                                *
  *=============================================================================================*/
 #define PACKET_SIZE (9)
 void AdaptiveDeltaMotionChannelClass::decompress(uint32 frame_idx, float *outdata)
-{	  
+{
 	// Start Over from the beginning
 	float *base	= (float *) &Data[0];	// pointer to our true know beginning values
 
@@ -973,7 +960,7 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 frame_idx, float *outdat
 	for(int vi=0; vi<VectorLen; vi++) {
 		// Decompress all the vector indices, since they will probably all be needed
 		unsigned char *pPacket = (unsigned char *) Data;	// pointer to current packet
-		pPacket+= (sizeof(float) * VectorLen);					// skip non-compressed header information 
+		pPacket+= (sizeof(float) * VectorLen);					// skip non-compressed header information
 		pPacket+= PACKET_SIZE * vi;								// skip to the appropriate packet start
 
 		float last_value = base[vi];
@@ -990,7 +977,7 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 frame_idx, float *outdat
 			for (int fi=0; fi < 16; fi++) {
 
 				int pi = fi>>1;	// create packet index
-		  
+
 				int factor;			// factor, contains extracted nybble -8 to +7
 
 				if (fi & 1) {
@@ -1008,7 +995,7 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 frame_idx, float *outdat
 				}
 
 				// Convert to Floating Point
-			
+
 				float ffactor = factor;
 
 				float delta = ffactor * filter;
@@ -1021,27 +1008,27 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 frame_idx, float *outdat
 				}
 				frame++;
 
-			} // for fi < 16
+			}
 
 			if (done) break;	// we're at the desired frame
 
 			pPacket+= ((PACKET_SIZE * VectorLen) - 1);	// skip to next packet
 
-		} // for frame_idx
-      
+		}
+
       outdata[vi] = last_value;
 
-	} // for vi=0; vi < 4
+	}
+
+}
 
-} // decompress, from beginning
-				  
 void AdaptiveDeltaMotionChannelClass::decompress(uint32 src_idx, float *srcdata, uint32 frame_idx, float *outdata)
-{	 		
+{
 	// Contine decompressing from src_idx, up to frame_idx
-   
-   assert(src_idx < frame_idx);											  
+
+   assert(src_idx < frame_idx);
    src_idx++;
-   
+
 	float *base	= (float *) &Data[0];	// pointer to our true know beginning values
    base += VectorLen;						// skip header information
 
@@ -1051,11 +1038,11 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 src_idx, float *srcdata,
 		// Decompress all the vector indices, since they will probably all be needed
 		unsigned char *pPacket = (unsigned char *) base;	// pointer to current packet
 		pPacket+= PACKET_SIZE * vi;								// skip to the appropriate packet start
-		pPacket+= (PACKET_SIZE * VectorLen) * ((src_idx-1)>>4); // skip out to current packet				 
-               
-      // initial filter index 
-      int fi = (src_idx-1) & 0xF;          
-                   
+		pPacket+= (PACKET_SIZE * VectorLen) * ((src_idx-1)>>4); // skip out to current packet
+
+      // initial filter index
+      int fi = (src_idx-1) & 0xF;
+
 		float last_value = srcdata[vi];
 
 		for (uint32 frame=src_idx; frame<=frame_idx;) {
@@ -1070,7 +1057,7 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 src_idx, float *srcdata,
 			for (fi; fi < 16; fi++) {
 
 				int pi = fi>>1;	// create packet index
-		  
+
 				int factor;			// factor, contains extracted nybble -8 to +7
 
 				if (fi & 1) {
@@ -1088,7 +1075,7 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 src_idx, float *srcdata,
 				}
 
 				// Convert to Floating Point
-			
+
 				float ffactor = factor;
 
 				float delta = ffactor * filter;
@@ -1101,33 +1088,33 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 src_idx, float *srcdata,
 				}
 				frame++;
 
-			} // for fi < 16
+			}
          fi = 0;
 
 			if (done) break;	// we're at the desired frame
 
 			pPacket+= ((PACKET_SIZE * VectorLen) - 1);	// skip to next packet
 
-		} // for frame_idx
-      
+		}
+
       outdata[vi] = last_value;
 
-	} // for vi=0; vi < 4
-   
-} // decompress, from continuation											
-                           
-
-/*********************************************************************************************** 
- * AdaptiveDeltaMotionChannelClass::getframe returns decompressed data for frame/vectorindex   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/18/2000 JGA  : Created.                                                                 * 
+	}
+
+}
+
+
+/***********************************************************************************************
+ * AdaptiveDeltaMotionChannelClass::getframe returns decompressed data for frame/vectorindex   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/18/2000 JGA  : Created.                                                                 *
  *=============================================================================================*/
 float AdaptiveDeltaMotionChannelClass::getframe(uint32 frame_idx, uint32 vector_idx)
 {
@@ -1144,72 +1131,72 @@ float AdaptiveDeltaMotionChannelClass::getframe(uint32 frame_idx, uint32 vector_
 	if ((CacheFrame+1) == frame_idx) {
 		return(CacheData[vector_idx + VectorLen]);
 	}
-		
+
 	if (frame_idx < CacheFrame)  {
 		// Requested Frame isn't cached, so cache it, and frame_idx+1, and return the decompressed data
       // from frame_idx
-      
+
       decompress(frame_idx, &CacheData[0]);
-      
+
       if (frame_idx != (NumFrames - 1))  {
       	decompress(frame_idx, &CacheData[0], frame_idx+1, &CacheData[VectorLen]);
       }
-      
-      CacheFrame = frame_idx;	
-         
+
+      CacheFrame = frame_idx;
+
       return(CacheData[vector_idx]);
-	}	 
-   
+	}
+
    // Copy last known Cached data down
-   
+
    if (frame_idx == (CacheFrame + 2))  {
-   	
+
       // Sliding window
    	memcpy(&CacheData[0], &CacheData[VectorLen], VectorLen * sizeof(float));
-      
+
       CacheFrame++;
-      
+
       decompress(CacheFrame, &CacheData[0], frame_idx, &CacheData[VectorLen]);
-      
+
     	return(CacheData[VectorLen + vector_idx]);
    }
-   
+
    // Else just use last known frame to decompress forwards
-   
+
    assert(VectorLen <= 4);
-   
+
    float temp[4];
-   
+
    memcpy(&temp[0], &CacheData[VectorLen], VectorLen * sizeof(float));
-   
+
    decompress(CacheFrame, &temp[0], frame_idx, &CacheData[0]);
-   CacheFrame = frame_idx;																	  
-   
+   CacheFrame = frame_idx;
+
    if (frame_idx != (NumFrames - 1))  {
-   	decompress(CacheFrame, &CacheData[0], frame_idx+1, &CacheData[VectorLen]);	
+   	decompress(CacheFrame, &CacheData[0], frame_idx+1, &CacheData[VectorLen]);
    }
-   
+
    return(CacheData[vector_idx]);
 
-} // getframe
-
-/*********************************************************************************************** 
- * AdaptiveDeltaMotionChannelClass::Get_Vector -- returns the vector for the specified frame # * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/18/2000 JGA  : Created.                                                                 * 
+}
+
+/***********************************************************************************************
+ * AdaptiveDeltaMotionChannelClass::Get_Vector -- returns the vector for the specified frame # *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/18/2000 JGA  : Created.                                                                 *
  *=============================================================================================*/
 void	AdaptiveDeltaMotionChannelClass::Get_Vector(float32 frame,float * setvec)
-{		
+{
 
 	uint32 frame1 = frame;
-	
+
 	float ratio = frame - frame1;
 
 	float value1 = getframe(frame1);
@@ -1218,7 +1205,7 @@ void	AdaptiveDeltaMotionChannelClass::Get_Vector(float32 frame,float * setvec)
    *setvec = WWMath::Lerp(value1,value2,ratio);
 
 
-}	// Get_Vector
+}
 
 
 //
@@ -1251,7 +1238,7 @@ Quaternion AdaptiveDeltaMotionChannelClass::Get_QuatVector(float32 frame)
 
 	return( q );
 
-} // Get_QuatVector
+}
 
 
 // EOF - motchan.cpp
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h
index b502e52aad0..5a3e7a9b0c8 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h
@@ -17,31 +17,25 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/motchan.h 2     6/29/01 6:41p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/motchan.h                              $* 
- *                                                                                             * 
- *                      $Author:: Jani_p                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 6/27/01 6:29p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 2                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/motchan.h                              $*
+ *                                                                                             *
+ *                      $Author:: Jani_p                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 6/27/01 6:29p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MOTCHAN_H
-#define MOTCHAN_H
 
 #include "always.h"
 #include "bittype.h"
@@ -71,7 +65,7 @@ class MotionChannelClass : public W3DMPO
 	MotionChannelClass(void);
 	~MotionChannelClass(void);
 
-	bool	Load_W3D(ChunkLoadClass & cload);		
+	bool	Load_W3D(ChunkLoadClass & cload);
 	WWINLINE int Get_Type(void) const { return Type; }
 	WWINLINE int Get_Pivot(void) const { return PivotIdx; }
 	WWINLINE void Get_Vector(int frame,float * setvec) const;
@@ -86,7 +80,7 @@ class MotionChannelClass : public W3DMPO
 	uint32	PivotIdx;			// what pivot is this channel applied to
 	uint32	Type;					// what type of channel is this
 	int		VectorLen;			// size of each individual vector
-	
+
 	float	*	Data;					// pointer to the raw floating point data
 	int		FirstFrame;			// first frame which was non-identity
 	int		LastFrame;			// last frame which was non-identity
@@ -120,7 +114,7 @@ WWINLINE void	MotionChannelClass::Get_Vector(int frame,float * setvec) const
 		set_identity(setvec);
 
 	} else {
-	
+
 		int vframe = frame - FirstFrame;
 
 		for (int i=0; i<VectorLen; i++) {
@@ -137,7 +131,7 @@ WWINLINE void MotionChannelClass::Get_Vector_As_Quat(int frame, Quaternion& quat
 		quat.Set(0.0f, 0.0f, 0.0f, 1.0f);
 
 	} else {
-	
+
 		const float* d = &Data[(frame - FirstFrame) * VectorLen];
 		quat.Set(d[0], d[1], d[2], d[3]);
 
@@ -149,7 +143,7 @@ WWINLINE void MotionChannelClass::Get_Vector_As_Quat(int frame, Quaternion& quat
 /******************************************************************************
 
 	BitChannelClass is used to store a boolean "on/off" value for each frame
-	in an animation.  
+	in an animation.
 
 ******************************************************************************/
 
@@ -190,12 +184,12 @@ WWINLINE int BitChannelClass::Get_Bit(int frame) const
 		return DefaultVal;
 
 	} else {
-	
+
 		int bit = frame - FirstFrame;
 
 		uint8 mask = (uint8)(1 << (bit % 8));
 		return ((*(Bits + (bit/8)) & mask) != 0);
-		
+
 	}
 }
 
@@ -218,7 +212,7 @@ class TimeCodedMotionChannelClass : public W3DMPO
 	TimeCodedMotionChannelClass(void);
 	~TimeCodedMotionChannelClass(void);
 
-	bool	Load_W3D(ChunkLoadClass & cload);		
+	bool	Load_W3D(ChunkLoadClass & cload);
 	int	Get_Type(void) { return Type; }
 	int	Get_Pivot(void) { return PivotIdx; }
 	void	Get_Vector(float32 frame, float * setvec);
@@ -231,12 +225,12 @@ class TimeCodedMotionChannelClass : public W3DMPO
 	uint32	Type;					// what type of channel is this
 	int		VectorLen;			// size of each individual vector
 	uint32	PacketSize;			// size of each packet
-	
+
 	uint32	NumTimeCodes;		// Number of packets
 
 	uint32	LastTimeCodeIdx;	// absolute index to last time code
 	uint32	CachedIdx;			// Last Index Used
-  
+
 	uint32	*	Data;			 	// pointer to packet data
 
 	void 		Free(void);
@@ -256,7 +250,7 @@ class AdaptiveDeltaMotionChannelClass : public W3DMPO
 	AdaptiveDeltaMotionChannelClass(void);
 	~AdaptiveDeltaMotionChannelClass(void);
 
-	bool	Load_W3D(ChunkLoadClass & cload);		
+	bool	Load_W3D(ChunkLoadClass & cload);
 	int	Get_Type(void) { return Type; }
 	int	Get_Pivot(void) { return PivotIdx; }
 	void	Get_Vector(float32 frame, float * setvec);
@@ -268,11 +262,11 @@ class AdaptiveDeltaMotionChannelClass : public W3DMPO
 	uint32	PivotIdx;			// what pivot is this channel applied to
 	uint32	Type;					// what type of channel is this
 	int		VectorLen;			// size of each individual vector
-	
+
 	uint32	NumFrames;			// Number of frames
 
 	float		Scale;				// Scale Filter, this much
-  
+
 	uint32  *Data;				 	// pointer to packet data
 
 	uint32	CacheFrame;
@@ -292,7 +286,7 @@ class AdaptiveDeltaMotionChannelClass : public W3DMPO
 /******************************************************************************
 
 	TimeCodedBitChannelClass is used to store a boolean "on/off" value for each frame
-	in an animation.  
+	in an animation.
 
 ******************************************************************************/
 
@@ -315,7 +309,7 @@ class TimeCodedBitChannelClass : public W3DMPO
 	uint32	PivotIdx;
 	uint32	Type;
 	int		DefaultVal;
-	
+
 	uint32	NumTimeCodes;
 	uint32	CachedIdx;
 
@@ -325,6 +319,3 @@ class TimeCodedBitChannelClass : public W3DMPO
 
 	friend class HCompressedAnimClass;
 };
-
-
-#endif
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.cpp
index d293cf4066a..a08a7853bc4 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.cpp
@@ -38,43 +38,40 @@
 #include "nullrobj.h"
 #include "chunkio.h"
 
-#include <string.h>
-
-
 NullLoaderClass _NullLoader;
 
 
 
 
-Null3DObjClass::Null3DObjClass(const char * name)																	
+Null3DObjClass::Null3DObjClass(const char * name)
 {
-	strcpy(Name, name);
+	strlcpy(Name, name, ARRAY_SIZE(Name));
 }
 
-Null3DObjClass::Null3DObjClass(const Null3DObjClass & src)									
+Null3DObjClass::Null3DObjClass(const Null3DObjClass & src)
 {
 	strcpy(Name, src.Name);
 }
 
-Null3DObjClass & Null3DObjClass::operator = (const Null3DObjClass & that)				
+Null3DObjClass & Null3DObjClass::operator = (const Null3DObjClass & that)
 {
 	strcpy(Name, that.Name);
 
-	RenderObjClass::operator = (that); return *this; 
+	RenderObjClass::operator = (that); return *this;
 }
 
-int Null3DObjClass::Class_ID(void) const													
-{ 
-	return CLASSID_NULL; 
+int Null3DObjClass::Class_ID(void) const
+{
+	return CLASSID_NULL;
 }
 
-RenderObjClass * Null3DObjClass::Clone(void) const									
-{ 
-	return NEW_REF( Null3DObjClass, (*this)); 
+RenderObjClass * Null3DObjClass::Clone(void) const
+{
+	return NEW_REF( Null3DObjClass, (*this));
 }
 
 void Null3DObjClass::Render(RenderInfoClass & rinfo)
-{ 
+{
 }
 
 void Null3DObjClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
@@ -115,4 +112,4 @@ PrototypeClass * NullLoaderClass::Load_W3D (ChunkLoadClass &cload)
 	W3dNullObjectStruct null;
 	cload.Read(&null,sizeof(null));
 	return W3DNEW NullPrototypeClass(null);
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
index 3dc5074d0d3..70706a8a174 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
@@ -34,18 +34,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef NULL_H
-#define NULL_H
 
-#ifndef RENDOBJ_H
 #include "rendobj.h"
-#endif
-
 #include "proto.h"
 
 class Null3DObjClass : public RenderObjClass
@@ -55,7 +46,7 @@ class Null3DObjClass : public RenderObjClass
 	Null3DObjClass(const char * name = "NULL");
 	Null3DObjClass(const Null3DObjClass & src);
 	Null3DObjClass & operator = (const Null3DObjClass & that);
-			
+
 	virtual int						Class_ID(void) const;
 	virtual RenderObjClass *	Clone(void) const;
 	virtual const char *			Get_Name(void) const						{ return Name; }
@@ -99,7 +90,3 @@ class NullLoaderClass : public PrototypeLoaderClass
 ** automatically install at creation time
 */
 extern NullLoaderClass _NullLoader;
-
-
-#endif
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
index 55caafc76b9..feeb891f575 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /VSS_Sync/ww3d2/part_buf.cpp            $* 
- *                                                                         * 
- *                      $Author:: Vss_sync                                $* 
- *                                                                         * 
- *                     $Modtime:: 8/30/01 1:38a                           $* 
- *                                                                         * 
- *                    $Revision:: 19                                      $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /VSS_Sync/ww3d2/part_buf.cpp            $*
+ *                                                                         *
+ *                      $Author:: Vss_sync                                $*
+ *                                                                         *
+ *                     $Modtime:: 8/30/01 1:38a                           $*
+ *                                                                         *
+ *                    $Revision:: 19                                      $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 #include "part_buf.h"
 #include "part_emt.h"
@@ -79,21 +79,21 @@ const float oo_intmax = 1.0f / (float)INT_MAX;
 
 ParticleBufferClass::ParticleBufferClass
 (
-	ParticleEmitterClass *emitter, 
+	ParticleEmitterClass *emitter,
 	unsigned int buffer_size,
-	ParticlePropertyStruct<Vector3> &color, 
+	ParticlePropertyStruct<Vector3> &color,
 	ParticlePropertyStruct<float> &opacity,
-	ParticlePropertyStruct<float> &size, 
+	ParticlePropertyStruct<float> &size,
 	ParticlePropertyStruct<float> &rotation,
 	float orient_rnd,
 	ParticlePropertyStruct<float> &frame,
 	ParticlePropertyStruct<float> &blurtime,
-	Vector3 accel, 
-	float max_age, 
+	Vector3 accel,
+	float max_age,
 	TextureClass *tex,
-	ShaderClass shader, 
+	ShaderClass shader,
 	bool pingpong,
-	int render_mode, 
+	int render_mode,
 	int frame_mode,
 	const W3dEmitterLinePropertiesStruct * line_props
 ) :
@@ -210,7 +210,7 @@ ParticleBufferClass::ParticleBufferClass
 	// These inputs don't need to be range-checked (emitter did that).
 	Accel = accel;
 	HasAccel = (accel.X != 0.0f) || (accel.Y != 0.0f) || (accel.Z != 0.0f);
-   
+
 	// Set up worldspace point group:
 	PointGroup = W3DNEW PointGroupClass();
 	PointGroup->Set_Flag(PointGroupClass::TRANSFORM, true);
@@ -233,7 +233,7 @@ ParticleBufferClass::ParticleBufferClass
 		Position[1] = NEW_REF( ShareBufferClass<Vector3> , (MaxNum, "ParticleBufferClass::Position") );
 	}
 	APT = NEW_REF( ShareBufferClass<unsigned int> , (MaxNum, "ParticleBufferClass::APT") );
-	Velocity = W3DNEWARRAY Vector3[MaxNum]; 
+	Velocity = W3DNEWARRAY Vector3[MaxNum];
 	TimeStamp = W3DNEWARRAY unsigned int[MaxNum];
 
 	// So that the object is ready for use after construction, we will
@@ -562,7 +562,7 @@ ParticleBufferClass::ParticleBufferClass(const ParticleBufferClass & src) :
 		Position[1] = NEW_REF( ShareBufferClass<Vector3> , (MaxNum, "ParticleBufferClass::Position") );
 	}
 	APT = NEW_REF( ShareBufferClass<unsigned int> , (MaxNum, "ParticleBufferClass::APT") );
-	Velocity = W3DNEWARRAY Vector3[MaxNum]; 
+	Velocity = W3DNEWARRAY Vector3[MaxNum];
 	TimeStamp = W3DNEWARRAY unsigned int[MaxNum];
 
 	// So that the object is ready for use after construction, we will
@@ -600,35 +600,35 @@ ParticleBufferClass & ParticleBufferClass::operator = (const ParticleBufferClass
 
 ParticleBufferClass::~ParticleBufferClass(void)
 {
-	if (NewParticleQueue)				delete [] NewParticleQueue;
-	if (ColorKeyFrameTimes)				delete [] ColorKeyFrameTimes;
-	if (ColorKeyFrameValues)			delete [] ColorKeyFrameValues;
-	if (ColorKeyFrameDeltas)			delete [] ColorKeyFrameDeltas;
-	if (AlphaKeyFrameTimes)				delete [] AlphaKeyFrameTimes;
-	if (AlphaKeyFrameValues)			delete [] AlphaKeyFrameValues;
-	if (AlphaKeyFrameDeltas)			delete [] AlphaKeyFrameDeltas;
-	if (SizeKeyFrameTimes)				delete [] SizeKeyFrameTimes;
-	if (SizeKeyFrameValues)				delete [] SizeKeyFrameValues;
-	if (SizeKeyFrameDeltas)				delete [] SizeKeyFrameDeltas;
-	if (RotationKeyFrameTimes)			delete [] RotationKeyFrameTimes;
-	if (RotationKeyFrameValues)		delete [] RotationKeyFrameValues;
-	if (HalfRotationKeyFrameDeltas)	delete [] HalfRotationKeyFrameDeltas;
-	if (OrientationKeyFrameValues)	delete [] OrientationKeyFrameValues;
-	if (FrameKeyFrameTimes)				delete [] FrameKeyFrameTimes;
-	if (FrameKeyFrameValues)			delete [] FrameKeyFrameValues;
-	if (FrameKeyFrameDeltas)			delete [] FrameKeyFrameDeltas;
-	if (BlurTimeKeyFrameTimes)			delete [] BlurTimeKeyFrameTimes;
-	if (BlurTimeKeyFrameValues)		delete [] BlurTimeKeyFrameValues;
-	if (BlurTimeKeyFrameDeltas)		delete [] BlurTimeKeyFrameDeltas;
-	if (RandomColorEntries)				delete [] RandomColorEntries;
-	if (RandomAlphaEntries)				delete [] RandomAlphaEntries;
-	if (RandomSizeEntries)				delete [] RandomSizeEntries;
-	if (RandomRotationEntries)			delete [] RandomRotationEntries;
-	if (RandomOrientationEntries)		delete [] RandomOrientationEntries;
-	if (RandomFrameEntries)				delete [] RandomFrameEntries;
-	if (RandomBlurTimeEntries)			delete [] RandomBlurTimeEntries;
-	
-	if (PointGroup) delete PointGroup;
+	delete [] NewParticleQueue;
+	delete [] ColorKeyFrameTimes;
+	delete [] ColorKeyFrameValues;
+	delete [] ColorKeyFrameDeltas;
+	delete [] AlphaKeyFrameTimes;
+	delete [] AlphaKeyFrameValues;
+	delete [] AlphaKeyFrameDeltas;
+	delete [] SizeKeyFrameTimes;
+	delete [] SizeKeyFrameValues;
+	delete [] SizeKeyFrameDeltas;
+	delete [] RotationKeyFrameTimes;
+	delete [] RotationKeyFrameValues;
+	delete [] HalfRotationKeyFrameDeltas;
+	delete [] OrientationKeyFrameValues;
+	delete [] FrameKeyFrameTimes;
+	delete [] FrameKeyFrameValues;
+	delete [] FrameKeyFrameDeltas;
+	delete [] BlurTimeKeyFrameTimes;
+	delete [] BlurTimeKeyFrameValues;
+	delete [] BlurTimeKeyFrameDeltas;
+	delete [] RandomColorEntries;
+	delete [] RandomAlphaEntries;
+	delete [] RandomSizeEntries;
+	delete [] RandomRotationEntries;
+	delete [] RandomOrientationEntries;
+	delete [] RandomFrameEntries;
+	delete [] RandomBlurTimeEntries;
+
+	delete PointGroup;
 
 	REF_PTR_RELEASE(Position[0]);
 	REF_PTR_RELEASE(Position[1]);
@@ -640,8 +640,9 @@ ParticleBufferClass::~ParticleBufferClass(void)
 	REF_PTR_RELEASE(Frame);
 	REF_PTR_RELEASE(APT);
 
-	if (Velocity)	delete [] Velocity;
-	if (TimeStamp)	delete [] TimeStamp;
+	delete [] Velocity;
+	delete [] TimeStamp;
+
 	if (Emitter) {
 		// We should not have an emitter at this point, since the emitter
 		// should still have a live ref to us if it still exists which would
@@ -656,9 +657,7 @@ ParticleBufferClass::~ParticleBufferClass(void)
 		Emitter = NULL;
 	}
 
-	if (LineRenderer) {
-		delete LineRenderer;
-	}
+	delete LineRenderer;
 
 	// Update Global Count
 	TotalActiveCount--;
@@ -684,15 +683,15 @@ int ParticleBufferClass::Get_Particle_Count(void) const
 
 void ParticleBufferClass::Render(RenderInfoClass & rinfo)
 {
-	WWPROFILE("ParticleBuffer::Render");	
+	WWPROFILE("ParticleBuffer::Render");
 
 	unsigned int sort_level = SORT_LEVEL_NONE;
 
 	if (!WW3D::Is_Sorting_Enabled())
 		sort_level=Get_Shader().Guess_Sort_Level();
 
-	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level!=SORT_LEVEL_NONE) {		
-		
+	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level!=SORT_LEVEL_NONE) {
+
 		WW3D::Add_To_Static_Sort_List(this, sort_level);
 
 	} else {
@@ -831,8 +830,8 @@ void ParticleBufferClass::Render_Particles(RenderInfoClass & rinfo)
 	}
 
 	PointGroup->Set_Arrays(Position[pingpong], Diffuse, apt, Size, Orientation, Frame, active_point_count);
-	Update_Bounding_Box();	
-	PointGroup->Render(rinfo);	
+	Update_Bounding_Box();
+	PointGroup->Render(rinfo);
 }
 
 
@@ -861,7 +860,7 @@ void ParticleBufferClass::Render_Line(RenderInfoClass & rinfo)
 	}
 
 	tmp_points.Delete_All(false);
-	
+
 	for (i = Start; i < sub1_end; i++) {
 		if (PermutationArray[i & 0xF] >= DecimationThreshold) {
 			tmp_points.Add(positions[i]);
@@ -877,7 +876,7 @@ void ParticleBufferClass::Render_Line(RenderInfoClass & rinfo)
 	if (tmp_points.Count() > 0) {
 		SphereClass bounding_sphere;
 		Get_Obj_Space_Bounding_Sphere(bounding_sphere);
-		
+
 		TextureClass * tex = PointGroup->Get_Texture();
 		//LineRenderer.Set_Texture(tex);
 		REF_PTR_RELEASE(tex);
@@ -931,7 +930,7 @@ void ParticleBufferClass::On_Frame_Update(void)
 	if (Emitter) {
 		Emitter->Emit();
 	}
-	
+
 	if (Is_Complete()) {
 		WWASSERT(Scene);
 		Scene->Register(this,SceneClass::RELEASE);
@@ -1114,7 +1113,7 @@ int ParticleBufferClass::Calculate_Cost_Value_Arrays(float screen_area, float *v
 	return minlod;
 }
 
-		
+
 void ParticleBufferClass::Reset_Colors(ParticlePropertyStruct<Vector3> &new_props)
 {
 
@@ -1137,14 +1136,13 @@ void ParticleBufferClass::Reset_Colors(ParticlePropertyStruct<Vector3> &new_prop
 			Color->Release_Ref();
 			Color = NULL;
 		}
-		if (ColorKeyFrameTimes) {
-			delete [] ColorKeyFrameTimes;
-			ColorKeyFrameTimes = NULL;
-		}
-		if (ColorKeyFrameDeltas) {
-			delete [] ColorKeyFrameDeltas;
-			ColorKeyFrameDeltas = NULL;
-		}
+
+		delete [] ColorKeyFrameTimes;
+		ColorKeyFrameTimes = NULL;
+
+		delete [] ColorKeyFrameDeltas;
+		ColorKeyFrameDeltas = NULL;
+
 		if (ColorKeyFrameValues) {
 			if (NumColorKeyFrames > 1) {
 				delete [] ColorKeyFrameValues;
@@ -1183,21 +1181,10 @@ void ParticleBufferClass::Reset_Colors(ParticlePropertyStruct<Vector3> &new_prop
 		// otherwise release and reallocate.
 		unsigned int new_num_color_key_frames = ckey + 1;// Includes start keyframe (keytime == 0).
 		if (new_num_color_key_frames != NumColorKeyFrames) {
-
-			if (ColorKeyFrameTimes) {
-				delete [] ColorKeyFrameTimes;
-				ColorKeyFrameTimes = NULL;
-			}
-			if (ColorKeyFrameValues) {
-				delete [] ColorKeyFrameValues;
-				ColorKeyFrameValues = NULL;
-			}
-			if (ColorKeyFrameDeltas) {
-				delete [] ColorKeyFrameDeltas;
-				ColorKeyFrameDeltas = NULL;
-			}
-
-			NumColorKeyFrames = new_num_color_key_frames;	
+			NumColorKeyFrames = new_num_color_key_frames;
+			delete [] ColorKeyFrameTimes;
+			delete [] ColorKeyFrameValues;
+			delete [] ColorKeyFrameDeltas;
 			ColorKeyFrameTimes = W3DNEWARRAY unsigned int [NumColorKeyFrames];
 			ColorKeyFrameValues = W3DNEWARRAY Vector3 [NumColorKeyFrames];
 			ColorKeyFrameDeltas = W3DNEWARRAY Vector3 [NumColorKeyFrames];
@@ -1297,14 +1284,13 @@ void ParticleBufferClass::Reset_Opacity(ParticlePropertyStruct<float> &new_props
 			Alpha->Release_Ref();
 			Alpha = NULL;
 		}
-		if (AlphaKeyFrameTimes) {
-			delete [] AlphaKeyFrameTimes;
-			AlphaKeyFrameTimes = NULL;
-		}
-		if (AlphaKeyFrameDeltas) {
-			delete [] AlphaKeyFrameDeltas;
-			AlphaKeyFrameDeltas = NULL;
-		}
+
+		delete [] AlphaKeyFrameTimes;
+		AlphaKeyFrameTimes = NULL;
+
+		delete [] AlphaKeyFrameDeltas;
+		AlphaKeyFrameDeltas = NULL;
+
 		if (AlphaKeyFrameValues) {
 			if (NumAlphaKeyFrames > 1) {
 				delete [] AlphaKeyFrameValues;
@@ -1343,21 +1329,10 @@ void ParticleBufferClass::Reset_Opacity(ParticlePropertyStruct<float> &new_props
 		// otherwise release and reallocate.
 		unsigned int new_num_alpha_key_frames = akey + 1;// Includes start keyframe (keytime == 0).
 		if (new_num_alpha_key_frames != NumAlphaKeyFrames) {
-
-			if (AlphaKeyFrameTimes) {
-				delete [] AlphaKeyFrameTimes;
-				AlphaKeyFrameTimes = NULL;
-			}
-			if (AlphaKeyFrameValues) {
-				delete [] AlphaKeyFrameValues;
-				AlphaKeyFrameValues = NULL;
-			}
-			if (AlphaKeyFrameDeltas) {
-				delete [] AlphaKeyFrameDeltas;
-				AlphaKeyFrameDeltas = NULL;
-			}
-
-			NumAlphaKeyFrames = new_num_alpha_key_frames;	
+			NumAlphaKeyFrames = new_num_alpha_key_frames;
+			delete [] AlphaKeyFrameValues;
+			delete [] AlphaKeyFrameTimes;
+			delete [] AlphaKeyFrameDeltas;
 			AlphaKeyFrameTimes = W3DNEWARRAY unsigned int [NumAlphaKeyFrames];
 			AlphaKeyFrameValues = W3DNEWARRAY float [NumAlphaKeyFrames];
 			AlphaKeyFrameDeltas = W3DNEWARRAY float [NumAlphaKeyFrames];
@@ -1454,14 +1429,13 @@ void ParticleBufferClass::Reset_Size(ParticlePropertyStruct<float> &new_props)
 			Size->Release_Ref();
 			Size = NULL;
 		}
-		if (SizeKeyFrameTimes) {
-			delete [] SizeKeyFrameTimes;
-			SizeKeyFrameTimes = NULL;
-		}
-		if (SizeKeyFrameDeltas) {
-			delete [] SizeKeyFrameDeltas;
-			SizeKeyFrameDeltas = NULL;
-		}
+
+		delete [] SizeKeyFrameTimes;
+		SizeKeyFrameTimes = NULL;
+
+		delete [] SizeKeyFrameDeltas;
+		SizeKeyFrameDeltas = NULL;
+
 		if (SizeKeyFrameValues) {
 			if (NumSizeKeyFrames > 1) {
 				delete [] SizeKeyFrameValues;
@@ -1500,21 +1474,10 @@ void ParticleBufferClass::Reset_Size(ParticlePropertyStruct<float> &new_props)
 		// otherwise release and reallocate.
 		unsigned int new_num_size_key_frames = skey + 1;// Includes start keyframe (keytime == 0).
 		if (new_num_size_key_frames != NumSizeKeyFrames) {
-
-			if (SizeKeyFrameTimes) {
-				delete [] SizeKeyFrameTimes;
-				SizeKeyFrameTimes = NULL;
-			}
-			if (SizeKeyFrameValues) {
-				delete [] SizeKeyFrameValues;
-				SizeKeyFrameValues = NULL;
-			}
-			if (SizeKeyFrameDeltas) {
-				delete [] SizeKeyFrameDeltas;
-				SizeKeyFrameDeltas = NULL;
-			}
-
-			NumSizeKeyFrames = new_num_size_key_frames;	
+			NumSizeKeyFrames = new_num_size_key_frames;
+			delete [] SizeKeyFrameTimes;
+			delete [] SizeKeyFrameValues;
+			delete [] SizeKeyFrameDeltas;
 			SizeKeyFrameTimes = W3DNEWARRAY unsigned int [NumSizeKeyFrames];
 			SizeKeyFrameValues = W3DNEWARRAY float [NumSizeKeyFrames];
 			SizeKeyFrameDeltas = W3DNEWARRAY float [NumSizeKeyFrames];
@@ -1623,29 +1586,25 @@ void ParticleBufferClass::Reset_Rotations(ParticlePropertyStruct<float> &new_pro
 	bool rotation_rand_zero = fabs(new_props.Rand) < eps_rotation;
 	if (orientation_rand_zero && rotation_rand_zero && new_props.NumKeyFrames == 0 && fabs(new_props.Start) < eps_rotation) {
 
-		// Release Arrays, 
+		// Release Arrays,
 		REF_PTR_RELEASE(Orientation);
-		if (RotationKeyFrameTimes) {
-			delete [] RotationKeyFrameTimes;
-			RotationKeyFrameTimes = NULL;
-		}
-		if (HalfRotationKeyFrameDeltas) {
-			delete [] HalfRotationKeyFrameDeltas;
-			HalfRotationKeyFrameDeltas = NULL;
-		}
-		if (RotationKeyFrameValues) {
-			delete [] RotationKeyFrameValues;
-			RotationKeyFrameValues = NULL;
-		}
-		if (OrientationKeyFrameValues) {
-			delete [] OrientationKeyFrameValues;
-			OrientationKeyFrameValues = NULL;
-		}
+
+		delete [] RotationKeyFrameTimes;
+		RotationKeyFrameTimes = NULL;
+
+		delete [] HalfRotationKeyFrameDeltas;
+		HalfRotationKeyFrameDeltas = NULL;
+
+		delete [] RotationKeyFrameValues;
+		RotationKeyFrameValues = NULL;
+
+		delete [] OrientationKeyFrameValues;
+		OrientationKeyFrameValues = NULL;
 
 		NumRotationKeyFrames = 0;
 		NumRandomRotationEntriesMinus1 = 0;
 		NumRandomOrientationEntriesMinus1 = 0;
-	
+
 	} else {
 
 		// Create the array if not present
@@ -1671,25 +1630,11 @@ void ParticleBufferClass::Reset_Rotations(ParticlePropertyStruct<float> &new_pro
 		// OrientationKeyFrameValues if the right size, otherwise release and reallocate.
 		unsigned int new_num_key_frames = key + 1;// Includes start keyframe (keytime == 0).
 		if (new_num_key_frames != NumRotationKeyFrames) {
-
-			if (RotationKeyFrameTimes) {
-				delete [] RotationKeyFrameTimes;
-				RotationKeyFrameTimes = NULL;
-			}
-			if (RotationKeyFrameValues) {
-				delete [] RotationKeyFrameValues;
-				RotationKeyFrameValues = NULL;
-			}
-			if (HalfRotationKeyFrameDeltas) {
-				delete [] HalfRotationKeyFrameDeltas;
-				HalfRotationKeyFrameDeltas = NULL;
-			}
-			if (OrientationKeyFrameValues) {
-				delete [] OrientationKeyFrameValues;
-				OrientationKeyFrameValues = NULL;
-			}
-
 			NumRotationKeyFrames = new_num_key_frames;
+			delete [] RotationKeyFrameTimes;
+			delete [] RotationKeyFrameValues;
+			delete [] HalfRotationKeyFrameDeltas;
+			delete [] OrientationKeyFrameValues;
 			RotationKeyFrameTimes = W3DNEWARRAY unsigned int [NumRotationKeyFrames];
 			RotationKeyFrameValues = W3DNEWARRAY float [NumRotationKeyFrames];
 			HalfRotationKeyFrameDeltas = W3DNEWARRAY float [NumRotationKeyFrames];
@@ -1830,7 +1775,7 @@ void ParticleBufferClass::Reset_Frames(ParticlePropertyStruct<float> &new_props)
 	bool frame_rand_zero	= (fabs(new_props.Rand) < eps_frame);
 	if (frame_rand_zero && new_props.NumKeyFrames == 0) {
 
-		// Release Arrays, Reuse KeyFrameValues if the right size, 
+		// Release Arrays, Reuse KeyFrameValues if the right size,
 		// otherwise release and reallocate.
 		REF_PTR_RELEASE(Frame);
 		if (FrameKeyFrameTimes) {
@@ -1853,7 +1798,7 @@ void ParticleBufferClass::Reset_Frames(ParticlePropertyStruct<float> &new_props)
 		NumFrameKeyFrames = 0;
 		NumRandomFrameEntriesMinus1 = 0;
 		FrameKeyFrameValues[0] = new_props.Start;
-	
+
 	} else {
 
 		// Create the array if not present
@@ -1879,21 +1824,10 @@ void ParticleBufferClass::Reset_Frames(ParticlePropertyStruct<float> &new_props)
 		// otherwise release and reallocate.
 		unsigned int new_num_key_frames = key + 1;// Includes start keyframe (keytime == 0).
 		if (new_num_key_frames != NumFrameKeyFrames) {
-
-			if (FrameKeyFrameTimes) {
-				delete [] FrameKeyFrameTimes;
-				FrameKeyFrameTimes = NULL;
-			}
-			if (FrameKeyFrameValues) {
-				delete [] FrameKeyFrameValues;
-				FrameKeyFrameValues = NULL;
-			}
-			if (FrameKeyFrameDeltas) {
-				delete [] FrameKeyFrameDeltas;
-				FrameKeyFrameDeltas = NULL;
-			}
-
-			NumFrameKeyFrames = new_num_key_frames;	
+			NumFrameKeyFrames = new_num_key_frames;
+			delete [] FrameKeyFrameTimes;
+			delete [] FrameKeyFrameValues;
+			delete [] FrameKeyFrameDeltas;
 			FrameKeyFrameTimes = W3DNEWARRAY unsigned int [NumFrameKeyFrames];
 			FrameKeyFrameValues = W3DNEWARRAY float [NumFrameKeyFrames];
 			FrameKeyFrameDeltas = W3DNEWARRAY float [NumFrameKeyFrames];
@@ -1970,7 +1904,7 @@ void ParticleBufferClass::Reset_Frames(ParticlePropertyStruct<float> &new_props)
 void ParticleBufferClass::Reset_Blur_Times(ParticlePropertyStruct<float> &new_blur_times)
 {
 
-	unsigned int i;	// Used in loops	
+	unsigned int i;	// Used in loops
    float oo_intmax = 1.0f / (float)INT_MAX;
 	unsigned int ui_previous_key_time = 0;
 	unsigned int ui_current_key_time = 0;
@@ -1984,16 +1918,15 @@ void ParticleBufferClass::Reset_Blur_Times(ParticlePropertyStruct<float> &new_bl
 	bool blurtime_rand_zero	= (fabs(new_blur_times.Rand) < eps_blur);
 	if (blurtime_rand_zero && new_blur_times.NumKeyFrames == 0) {
 
-		// Release Arrays, Reuse KeyFrameValues if the right size, 
-		// otherwise release and reallocate.		
-		if (BlurTimeKeyFrameTimes) {
-			delete [] BlurTimeKeyFrameTimes;
-			BlurTimeKeyFrameTimes = NULL;
-		}
-		if (BlurTimeKeyFrameDeltas) {
-			delete [] BlurTimeKeyFrameDeltas;
-			BlurTimeKeyFrameDeltas = NULL;
-		}
+		// Release Arrays, Reuse KeyFrameValues if the right size,
+		// otherwise release and reallocate.
+
+		delete [] BlurTimeKeyFrameTimes;
+		BlurTimeKeyFrameTimes = NULL;
+
+		delete [] BlurTimeKeyFrameDeltas;
+		BlurTimeKeyFrameDeltas = NULL;
+
 		if (BlurTimeKeyFrameValues) {
 			if (NumBlurTimeKeyFrames > 1) {
 				delete [] BlurTimeKeyFrameValues;
@@ -2006,7 +1939,7 @@ void ParticleBufferClass::Reset_Blur_Times(ParticlePropertyStruct<float> &new_bl
 		NumBlurTimeKeyFrames = 0;
 		NumRandomBlurTimeEntriesMinus1 = 0;
 		BlurTimeKeyFrameValues[0] = new_blur_times.Start;
-	
+
 	} else {
 
 		// Check times of the keyframes (each keytime must be larger than the
@@ -2027,21 +1960,10 @@ void ParticleBufferClass::Reset_Blur_Times(ParticlePropertyStruct<float> &new_bl
 		// otherwise release and reallocate.
 		unsigned int new_num_key_frames = key + 1;// Includes start keyframe (keytime == 0).
 		if (new_num_key_frames != NumBlurTimeKeyFrames) {
-
-			if (BlurTimeKeyFrameTimes) {
-				delete [] BlurTimeKeyFrameTimes;
-				BlurTimeKeyFrameTimes = NULL;
-			}
-			if (BlurTimeKeyFrameValues) {
-				delete [] BlurTimeKeyFrameValues;
-				BlurTimeKeyFrameValues = NULL;
-			}
-			if (BlurTimeKeyFrameDeltas) {
-				delete [] BlurTimeKeyFrameDeltas;
-				BlurTimeKeyFrameDeltas = NULL;
-			}
-
-			NumBlurTimeKeyFrames = new_num_key_frames;	
+			NumBlurTimeKeyFrames = new_num_key_frames;
+			delete [] BlurTimeKeyFrameTimes;
+			delete [] BlurTimeKeyFrameValues;
+			delete [] BlurTimeKeyFrameDeltas;
 			BlurTimeKeyFrameTimes = new unsigned int [NumBlurTimeKeyFrames];
 			BlurTimeKeyFrameValues = new float [NumBlurTimeKeyFrames];
 			BlurTimeKeyFrameDeltas = new float [NumBlurTimeKeyFrames];
@@ -2146,7 +2068,7 @@ void ParticleBufferClass::Set_Emitter(ParticleEmitterClass *emitter)
 	}
 }
 
-		
+
 NewParticleStruct * ParticleBufferClass::Add_Uninitialized_New_Particle(void)
 {
 	// Note that this function does not initialize the new particle - it
@@ -2255,7 +2177,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 
 	if (PingPongPosition) {
 		int pingpong = WW3D::Get_Frame_Count() & 0x1;
-		position = Position[pingpong]->Get_Array();		
+		position = Position[pingpong]->Get_Array();
 	} else {
 		position = Position[0]->Get_Array();
 	}
@@ -2313,7 +2235,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 				(RotationKeyFrameValues[rkey] + HalfRotationKeyFrameDeltas[rkey] * f_delta_t) * f_delta_t +
 				RandomRotationEntries[part & NumRandomRotationEntriesMinus1] * (float)part_age +
 				RandomOrientationEntries[part & NumRandomOrientationEntriesMinus1];
-			
+
 			orientation[part] = (uint)(((int)(tmp_orient * 256.0f)) & 0xFF);
 		}
 
@@ -2326,7 +2248,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 			float tmp_frame = FrameKeyFrameValues[fkey] +
 				FrameKeyFrameDeltas[fkey] * (float)(part_age - FrameKeyFrameTimes[fkey]) +
 				RandomFrameEntries[part & NumRandomFrameEntriesMinus1];
-			
+
 			frame[part] = (uint)(((int)(tmp_frame)) & 0xFF);
 		}
 
@@ -2341,7 +2263,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 					RandomBlurTimeEntries[part & NumRandomBlurTimeEntriesMinus1];
 			}
 			tailposition[part]=position[part]-Velocity[part]*blur_time*1000;
-		}		
+		}
 	}
 
 	for (part = sub2_start; part < End; part++) {
@@ -2354,7 +2276,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 			// age >= keytime. This loop must terminate because the 0th keytime is 0.
 			for (; part_age < ColorKeyFrameTimes[ckey]; ckey--);
 
-			color[part] = 
+			color[part] =
 					ColorKeyFrameValues[ckey] +
 					ColorKeyFrameDeltas[ckey] * (float)(part_age - ColorKeyFrameTimes[ckey]) +
 					RandomColorEntries[part & NumRandomColorEntriesMinus1];
@@ -2397,7 +2319,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 				(RotationKeyFrameValues[rkey] + HalfRotationKeyFrameDeltas[rkey] * f_delta_t) * f_delta_t +
 				RandomRotationEntries[part & NumRandomRotationEntriesMinus1] * (float)part_age +
 				RandomOrientationEntries[part & NumRandomOrientationEntriesMinus1];
-			
+
 			orientation[part] = (uint)(((int)(tmp_orient * 256.0f)) & 0xFF);
 		}
 
@@ -2410,7 +2332,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 			float tmp_frame = FrameKeyFrameValues[fkey] +
 				FrameKeyFrameDeltas[fkey] * (float)(part_age - FrameKeyFrameTimes[fkey]) +
 				RandomFrameEntries[part & NumRandomFrameEntriesMinus1];
-			
+
 			frame[part] = (uint)(((int)(tmp_frame)) & 0xFF);
 		}
 
@@ -2481,7 +2403,7 @@ void ParticleBufferClass::Update_Bounding_Box(void)
 		min_coords.Y = min_coords.Y <= position[i].Y ? min_coords.Y : position[i].Y;
 		min_coords.Z = min_coords.Z <= position[i].Z ? min_coords.Z : position[i].Z;
 	}
-	
+
 	// Extend by maximum possible particle size:
 	Vector3 size(MaxSize, MaxSize, MaxSize);
 	max_coords += size;
@@ -2536,7 +2458,7 @@ void ParticleBufferClass::Get_New_Particles(void)
 		if (HasAccel) {
 			position[NewEnd] = new_particle.Position +
 									(new_particle.Velocity + 0.5f * Accel * fp_age) * fp_age;
-			
+
 			Velocity[NewEnd] = new_particle.Velocity + (Accel * fp_age);
 		} else {
 			position[NewEnd] =new_particle.Position +
@@ -2728,7 +2650,7 @@ void ParticleBufferClass::Get_Color_Key_Frames (ParticlePropertyStruct<Vector3>
 		//
 		//	Add a keyframe at the very end of the timeline if necessary
 		//
-		if (create_last_keyframe) {			
+		if (create_last_keyframe) {
 			colors.KeyTimes[index - 1] = ((float)MaxAge / 1000);
 
 			//
@@ -2784,7 +2706,7 @@ void ParticleBufferClass::Get_Opacity_Key_Frames (ParticlePropertyStruct<float>
 		//
 		//	Add a keyframe at the very end of the timeline if necessary
 		//
-		if (create_last_keyframe) {			
+		if (create_last_keyframe) {
 			opacities.KeyTimes[index - 1] = ((float)MaxAge / 1000);
 
 			//
@@ -2841,7 +2763,7 @@ void ParticleBufferClass::Get_Size_Key_Frames (ParticlePropertyStruct<float> &si
 		//
 		//	Add a keyframe at the very end of the timeline if necessary
 		//
-		if (create_last_keyframe) {			
+		if (create_last_keyframe) {
 			sizes.KeyTimes[index - 1] = ((float)MaxAge / 1000);
 
 			//
@@ -2903,7 +2825,7 @@ void ParticleBufferClass::Get_Rotation_Key_Frames (ParticlePropertyStruct<float>
 		//
 		//	Add a keyframe at the very end of the timeline if necessary
 		//
-		if (create_last_keyframe) {			
+		if (create_last_keyframe) {
 			rotations.KeyTimes[index - 1] = ((float)MaxAge / 1000);
 
 			//
@@ -2960,7 +2882,7 @@ void ParticleBufferClass::Get_Frame_Key_Frames (ParticlePropertyStruct<float> &f
 		//
 		//	Add a keyframe at the very end of the timeline if necessary
 		//
-		if (create_last_keyframe) {			
+		if (create_last_keyframe) {
 			frames.KeyTimes[index - 1] = ((float)MaxAge / 1000);
 
 			//
@@ -3016,7 +2938,7 @@ void ParticleBufferClass::Get_Blur_Time_Key_Frames (ParticlePropertyStruct<float
 		//
 		//	Add a keyframe at the very end of the timeline if necessary
 		//
-		if (create_last_keyframe) {			
+		if (create_last_keyframe) {
 			blurtimes.KeyTimes[index - 1] = ((float)MaxAge / 1000);
 
 			//
@@ -3054,7 +2976,7 @@ int ParticleBufferClass::Get_Line_Texture_Mapping_Mode(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Get_Texture_Mapping_Mode();
-	} 
+	}
 	return SegLineRendererClass::UNIFORM_WIDTH_TEXTURE_MAP;
 }
 
@@ -3062,7 +2984,7 @@ int ParticleBufferClass::Is_Merge_Intersections(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Is_Merge_Intersections();
-	} 
+	}
 	return false;
 }
 
@@ -3070,7 +2992,7 @@ int ParticleBufferClass::Is_Freeze_Random(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Is_Freeze_Random();
-	} 
+	}
 	return false;
 }
 
@@ -3078,7 +3000,7 @@ int ParticleBufferClass::Is_Sorting_Disabled(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Is_Sorting_Disabled();
-	} 
+	}
 	return false;
 }
 
@@ -3086,7 +3008,7 @@ int ParticleBufferClass::Are_End_Caps_Enabled(void)	const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Are_End_Caps_Enabled();
-	} 
+	}
 	return false;
 }
 
@@ -3094,7 +3016,7 @@ int ParticleBufferClass::Get_Subdivision_Level(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Get_Current_Subdivision_Level();
-	} 
+	}
 	return 0;
 }
 
@@ -3102,7 +3024,7 @@ float ParticleBufferClass::Get_Noise_Amplitude(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Get_Noise_Amplitude();
-	} 
+	}
 	return 0.0f;
 }
 
@@ -3110,7 +3032,7 @@ float ParticleBufferClass::Get_Merge_Abort_Factor(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Get_Merge_Abort_Factor();
-	} 
+	}
 	return 0.0f;
 }
 
@@ -3118,7 +3040,7 @@ float ParticleBufferClass::Get_Texture_Tile_Factor(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Get_Texture_Tile_Factor();
-	} 
+	}
 	return 1.0f;
 }
 
@@ -3126,7 +3048,7 @@ Vector2 ParticleBufferClass::Get_UV_Offset_Rate(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Get_UV_Offset_Rate();
-	} 
+	}
 	return Vector2(0.0f,0.0f);
 }
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h
index ec8e0cebfbd..a70cf24f658 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h
@@ -16,29 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /VSS_Sync/ww3d2/part_buf.h              $* 
- *                                                                         * 
- *                      $Author:: Vss_sync                                $* 
- *                                                                         * 
- *                     $Modtime:: 8/29/01 7:29p                           $* 
- *                                                                         * 
- *                    $Revision:: 9                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /VSS_Sync/ww3d2/part_buf.h              $*
+ *                                                                         *
+ *                      $Author:: Vss_sync                                $*
+ *                                                                         *
+ *                     $Modtime:: 8/29/01 7:29p                           $*
+ *                                                                         *
+ *                    $Revision:: 9                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if defined(_MSC_VER)
-#pragma once
-#endif
 
-#ifndef PART_BUF_H
-#define PART_BUF_H
+#pragma once
 
 #include "rendobj.h"
 #include "pointgr.h"
@@ -101,7 +97,7 @@ class ParticleBufferClass : public RenderObjClass
 		/*
 		** RenderObjClass Interface:
 		*/
-		virtual RenderObjClass * Clone(void) const;		
+		virtual RenderObjClass * Clone(void) const;
 		virtual int Class_ID(void) const { return CLASSID_PARTICLEBUFFER; }
 
 		virtual int Get_Num_Polys(void) const;
@@ -194,7 +190,7 @@ class ParticleBufferClass : public RenderObjClass
 		float						Get_Fade_Time (void) const			{ return (NumColorKeyFrames > 1) ? (((float)ColorKeyFrameTimes[1]) / 1000.0f) : 0.0f; }
 		ShaderClass				Get_Shader (void) const				{ return PointGroup->Get_Shader (); }
 
-		// 
+		//
 		// Line rendering properties.  These functions will always return
 		// a default value if line rendering is not enabled.
 		//
@@ -209,7 +205,7 @@ class ParticleBufferClass : public RenderObjClass
 		float						Get_Texture_Tile_Factor(void) const;
 		Vector2					Get_UV_Offset_Rate(void) const;
 
-		
+
 		// This is a utility function only meant to be called by the particle emitter.
 		unsigned int			Get_Buffer_Size(void) const		{ return MaxNum; }
 
@@ -225,10 +221,10 @@ class ParticleBufferClass : public RenderObjClass
 		// Total Active Particle Buffer Count
 		static unsigned int	Get_Total_Active_Count( void )	{ return TotalActiveCount; }
 
-		// Global control of particle LOD.  
+		// Global control of particle LOD.
 		static void				Set_LOD_Max_Screen_Size(int lod_level,float max_screen_size);
 		static float			Get_LOD_Max_Screen_Size(int lod_level);
-			
+
 	protected:
 
 		virtual void			Update_Cached_Bounding_Volumes(void) const;
@@ -248,7 +244,7 @@ class ParticleBufferClass : public RenderObjClass
 		// Update the visual particle state. This includes updating color/size
 		// for all existing particles. Only needs to happen at rendering time.
 		void Update_Visual_Particle_State(void);
-		
+
 		// Update the bounding box. (Updates the particle state if it needs to).
 		void Update_Bounding_Box(void);
 
@@ -307,7 +303,7 @@ class ParticleBufferClass : public RenderObjClass
 		// the Values array which will have one entry (the constant value).
 		// Note that the rotation and orientation properties are different -
 		// only orientation is used in rendering. The rotation data is only
-		// used to compute the orientations. So the condition is different - 
+		// used to compute the orientations. So the condition is different -
 		// if rotation and orientation randomizers, and all rotation keyframes
 		// are all zero, then all of the arrays will be NULL (including the
 		// Values array).
@@ -359,7 +355,7 @@ class ParticleBufferClass : public RenderObjClass
 		float *			RandomFrameEntries;
 		unsigned int	NumRandomBlurTimeEntriesMinus1;		// 2^n - 1 so can be used as a mask also
 		float *			RandomBlurTimeEntries;
-		
+
 		Vector3			ColorRandom;
 		float				OpacityRandom;
 		float				SizeRandom;
@@ -381,7 +377,7 @@ class ParticleBufferClass : public RenderObjClass
 		// points are active (it is only used if all are not active)..
 		ShareBufferClass<Vector3> *	Position[2];	// Only [0] used unless pingpong enabled
 		ShareBufferClass<Vector4> *	Diffuse;			// passed into point group
-		ShareBufferClass<Vector3> *	Color;			
+		ShareBufferClass<Vector3> *	Color;
 		ShareBufferClass<float> *		Alpha;
 		ShareBufferClass<float> *		Size;
 		ShareBufferClass<uint8> *		Frame;
@@ -420,7 +416,7 @@ class ParticleBufferClass : public RenderObjClass
 
 		// Projected area, used for LOD purposes
 		float									ProjectedArea;
-		
+
 		// Total Active Particle Buffer Count
 		static unsigned int				TotalActiveCount;
 
@@ -429,6 +425,3 @@ class ParticleBufferClass : public RenderObjClass
 		// being per-buffer later if we wish. Default is NO_MAX_SCREEN_SIZE.
 		static float						LODMaxScreenSizes[17];
 };
-
-#endif // PART_BUF_H
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
index 88a2da26bc0..37a1731b0e9 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/part_emt.cpp       $* 
- *                                                                         * 
- *                      $Author:: Naty_h                                  $* 
- *                                                                         * 
- *                     $Modtime:: 8/01/01 3:36p                           $* 
- *                                                                         * 
- *                    $Revision:: 12                                      $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/part_emt.cpp       $*
+ *                                                                         *
+ *                      $Author:: Naty_h                                  $*
+ *                                                                         *
+ *                     $Modtime:: 8/01/01 3:36p                           $*
+ *                                                                         *
+ *                    $Revision:: 12                                      $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "part_emt.h"
@@ -45,8 +45,6 @@
 #include "wwprofile.h"
 #include <limits.h>
 #include <gcd_lcm.h>
-#include "texture.h"
-#include "part_ldr.h"
 
 
 // Global variable which is only used to communicate the worldspace emitter
@@ -67,9 +65,9 @@ bool ParticleEmitterClass::DefaultRemoveOnComplete = true;
 
 ParticleEmitterClass::ParticleEmitterClass(float emit_rate, unsigned int burst_size,
 			Vector3Randomizer *pos_rnd, Vector3 base_vel, Vector3Randomizer *vel_rnd, float out_vel,
-			float vel_inherit_factor, 
+			float vel_inherit_factor,
 			ParticlePropertyStruct<Vector3> &color,
-			ParticlePropertyStruct<float> &opacity, 
+			ParticlePropertyStruct<float> &opacity,
 			ParticlePropertyStruct<float> &size,
 			ParticlePropertyStruct<float> &rotation, float orient_rnd,
 			ParticlePropertyStruct<float> &frames,
@@ -179,15 +177,11 @@ ParticleEmitterClass::~ParticleEmitterClass(void)
 	Buffer->Emitter_Is_Dead();
 	Buffer->Release_Ref();
 
-	if (PosRand != NULL) {
-		delete PosRand;
-		PosRand = NULL;
-	}
+	delete PosRand;
+	PosRand = NULL;
 
-	if (VelRand != NULL) {
-		delete VelRand;
-		VelRand = NULL;
-	}
+	delete VelRand;
+	VelRand = NULL;
 
 	if (NameString != NULL) {
 		::free (NameString);
@@ -216,7 +210,7 @@ ParticleEmitterClass::Create_From_Definition (const ParticleEmitterDefClass &def
 		);
 //			false);	// no compression for particle textures!
 	}
-	
+
 	ShaderClass shader;
 	definition.Get_Shader (shader);
 	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) {
@@ -255,10 +249,10 @@ ParticleEmitterClass::Create_From_Definition (const ParticleEmitterDefClass &def
 	pemitter = NEW_REF( ParticleEmitterClass, (	definition.Get_Emission_Rate (),
 																definition.Get_Burst_Size (),
 																definition.Get_Creation_Volume (),
-																definition.Get_Velocity (), 
+																definition.Get_Velocity (),
 																definition.Get_Velocity_Random (),
 																definition.Get_Outward_Vel (),
-																definition.Get_Vel_Inherit (), 
+																definition.Get_Vel_Inherit (),
 																color_keys,
 																opacity_keys,
 																size_keys,
@@ -270,7 +264,7 @@ ParticleEmitterClass::Create_From_Definition (const ParticleEmitterDefClass &def
 																definition.Get_Lifetime (),
 																0.0f,
 																ptexture,
-																shader, 
+																shader,
 																definition.Get_Max_Emissions (),
 																0,
 																false,
@@ -278,27 +272,24 @@ ParticleEmitterClass::Create_From_Definition (const ParticleEmitterDefClass &def
 																definition.Get_Frame_Mode (),
 																definition.Get_Line_Properties ()) );
 
-	if (color_keys.KeyTimes != NULL) delete [] color_keys.KeyTimes;
-	if (color_keys.Values != NULL) delete [] color_keys.Values;
-	if (opacity_keys.KeyTimes != NULL) delete [] opacity_keys.KeyTimes;
-	if (opacity_keys.Values != NULL) delete [] opacity_keys.Values;
-	if (size_keys.KeyTimes != NULL) delete [] size_keys.KeyTimes;
-	if (size_keys.Values != NULL) delete [] size_keys.Values;
-	if (rotation_keys.KeyTimes != NULL) delete [] rotation_keys.KeyTimes;
-	if (rotation_keys.Values != NULL) delete [] rotation_keys.Values;
-	if (frame_keys.KeyTimes != NULL) delete [] frame_keys.KeyTimes;
-	if (frame_keys.Values != NULL) delete [] frame_keys.Values;
-	if (blur_time_keys.KeyTimes != NULL) delete [] blur_time_keys.KeyTimes;
-	if (blur_time_keys.Values != NULL) delete [] blur_time_keys.Values;
+	delete [] color_keys.KeyTimes;
+	delete [] color_keys.Values;
+	delete [] opacity_keys.KeyTimes;
+	delete [] opacity_keys.Values;
+	delete [] size_keys.KeyTimes;
+	delete [] size_keys.Values;
+	delete [] rotation_keys.KeyTimes;
+	delete [] rotation_keys.Values;
+	delete [] frame_keys.KeyTimes;
+	delete [] frame_keys.Values;
+	delete [] blur_time_keys.KeyTimes;
+	delete [] blur_time_keys.Values;
 
 	// Pass the name along to the emitter
 	pemitter->Set_Name (definition.Get_Name ());
 
 	// release our reference to particle texture.
-	if (ptexture) {
-		REF_PTR_RELEASE(ptexture);
-		ptexture = 0;
-	}
+	REF_PTR_RELEASE(ptexture);
 
 	// Return a pointer to the new emitter
 	return pemitter;
@@ -361,7 +352,7 @@ void ParticleEmitterClass::On_Frame_Update(void)
 			// until it finds a non-NULL Scene), and then adds the particle
 			// buffer to it.
 			if ( BufferSceneNeeded ) {
-			
+
 				if (Is_In_Scene()) {
 					Buffer->Add(Scene);
 					BufferSceneNeeded = false;
@@ -403,7 +394,7 @@ void ParticleEmitterClass::Reset(void)
 
 	// Reset the number of particles to emit
 	ParticlesLeft = MaxParticles;
-	EmitRemain = 0;	
+	EmitRemain = 0;
 	IsComplete = false;
 }
 
@@ -442,21 +433,16 @@ bool ParticleEmitterClass::Is_Stopped(void)
 
 void ParticleEmitterClass::Set_Position_Randomizer(Vector3Randomizer *rand)
 {
-	if (PosRand) {
-		delete PosRand;
-		PosRand =NULL;
-	}
+	delete PosRand;
 	PosRand = rand;
 }
 
 
 void ParticleEmitterClass::Set_Velocity_Randomizer(Vector3Randomizer *rand)
 {
-	if (VelRand) {
-		delete VelRand;
-		VelRand =NULL;
-	}
+	delete VelRand;
 	VelRand = rand;
+
 	if (VelRand) {
 		VelRand->Scale(0.001f);	// Convert from seconds to ms
 	}
@@ -474,7 +460,7 @@ Vector3Randomizer *ParticleEmitterClass::Get_Creation_Volume (void) const
 }
 
 
-Vector3Randomizer *ParticleEmitterClass::Get_Velocity_Random (void) const	
+Vector3Randomizer *ParticleEmitterClass::Get_Velocity_Random (void) const
 {
 	Vector3Randomizer *randomizer = NULL;
 	if (VelRand != NULL) {
@@ -516,7 +502,7 @@ void ParticleEmitterClass::Emit(void)
 	if (Active && !IsComplete) {
 		Quaternion curr_quat;   // Quaternion form of orientation.
 		Vector3 curr_orig;      // Origin.
-	   
+
 	   // Convert current matrix into quaternion + origin form.
 	   curr_quat = Build_Quaternion(Get_Transform());
 	   curr_orig = Get_Transform().Get_Translation();
@@ -537,8 +523,8 @@ void ParticleEmitterClass::Emit(void)
 // is only important to avoid affecting the collision spheres of composite
 // objects into which the emitter is inserted.
 void ParticleEmitterClass::Update_Cached_Bounding_Volumes(void) const
-{ 
-	CachedBoundingSphere.Init(Get_Position(),0.0); 
+{
+	CachedBoundingSphere.Init(Get_Position(),0.0);
 	CachedBoundingBox.Center = Get_Position();
 	CachedBoundingBox.Extent.Set(0,0,0);
 	Validate_Cached_Bounding_Volumes();
@@ -556,12 +542,12 @@ void ParticleEmitterClass::Create_New_Particles(const Quaternion & curr_quat, co
 {
    Quaternion quat;
    Vector3 orig;
-   
+
    // The emit remainder from the previous interval (the time remaining in
 	// the previous interval when the last particle was emitted) is added to
 	// the size of the current frame to yield the time currently available
 	// for emitting particles.
-	unsigned int frametime = WW3D::Get_Frame_Time();
+	unsigned int frametime = WW3D::Get_Sync_Frame_Time();
 	// Since the particles are written into a wraparound buffer, we can take the time modulo a time
 	// constant which represents the time it takes to fill up the entire buffer with new particles.
 	// We will do this so we don't run into performance problems with very large frame times.
@@ -599,9 +585,9 @@ void ParticleEmitterClass::Create_New_Particles(const Quaternion & curr_quat, co
 	} else {
 		InheritedWorldSpaceEmitterVel.Set(0.0, 0.0, 0.0);
 	}
-	
+
    for (; EmitRemain > EmitRate;) {
-		
+
 		// Calculate the new remainder.
 		EmitRemain -= EmitRate;
 
@@ -697,19 +683,19 @@ void ParticleEmitterClass::Initialize_Particle(NewParticleStruct * newpart,
 
 ParticleEmitterDefClass *
 ParticleEmitterClass::Build_Definition (void) const
-{	
+{
 	// Allocate a new emitter definition object
 	ParticleEmitterDefClass *pdefinition = W3DNEW ParticleEmitterDefClass;
 	WWASSERT (pdefinition != NULL);
 	if (pdefinition != NULL) {
-		
+
 		// Set the texture's filename
 		TextureClass *ptexture = Get_Texture ();
 		if (ptexture != NULL) {
 			pdefinition->Set_Texture_Filename (ptexture->Get_Texture_Name());
 			REF_PTR_RELEASE(ptexture);
 		}
-		
+
 		// Now fill the definition with data from this emitter instance
 		pdefinition->Set_Render_Mode (Get_Render_Mode());
 		pdefinition->Set_Frame_Mode (Get_Frame_Mode());
@@ -726,7 +712,7 @@ ParticleEmitterClass::Build_Definition (void) const
 		pdefinition->Set_Outward_Vel (Get_Outwards_Vel ());
 		pdefinition->Set_Vel_Inherit (Get_Velocity_Inherit ());
 		pdefinition->Set_Shader (Get_Shader ());
-		
+
 		//
 		//	Pass the creation volume onto the definition
 		//
@@ -745,8 +731,8 @@ ParticleEmitterClass::Build_Definition (void) const
 		ParticlePropertyStruct<Vector3> colors;
 		Get_Color_Key_Frames (colors);
 		pdefinition->Set_Color_Keyframes (colors);
-		if (colors.KeyTimes != NULL) delete [] colors.KeyTimes;
-		if (colors.Values != NULL) delete [] colors.Values;
+		delete [] colors.KeyTimes;
+		delete [] colors.Values;
 
 		//
 		//	Pass the opacity keyframes onto the definition
@@ -754,8 +740,8 @@ ParticleEmitterClass::Build_Definition (void) const
 		ParticlePropertyStruct<float> opacities;
 		Get_Opacity_Key_Frames (opacities);
 		pdefinition->Set_Opacity_Keyframes (opacities);
-		if (opacities.KeyTimes != NULL) delete [] opacities.KeyTimes;
-		if (opacities.Values != NULL) delete [] opacities.Values;
+		delete [] opacities.KeyTimes;
+		delete [] opacities.Values;
 
 		//
 		//	Pass the size keyframes onto the definition
@@ -763,8 +749,8 @@ ParticleEmitterClass::Build_Definition (void) const
 		ParticlePropertyStruct<float> sizes;
 		Get_Size_Key_Frames (sizes);
 		pdefinition->Set_Size_Keyframes (sizes);
-		if (sizes.KeyTimes != NULL) delete [] sizes.KeyTimes;
-		if (sizes.Values != NULL) delete [] sizes.Values;
+		delete [] sizes.KeyTimes;
+		delete [] sizes.Values;
 
 		//
 		//	Pass the rotation keyframes onto the definition
@@ -772,8 +758,8 @@ ParticleEmitterClass::Build_Definition (void) const
 		ParticlePropertyStruct<float> rotations;
 		Get_Rotation_Key_Frames (rotations);
 		pdefinition->Set_Rotation_Keyframes (rotations, Get_Initial_Orientation_Random());
-		if (rotations.KeyTimes != NULL) delete [] rotations.KeyTimes;
-		if (rotations.Values != NULL) delete [] rotations.Values;
+		delete [] rotations.KeyTimes;
+		delete [] rotations.Values;
 
 		//
 		//	Pass the frame keyframes onto the definition
@@ -781,8 +767,8 @@ ParticleEmitterClass::Build_Definition (void) const
 		ParticlePropertyStruct<float> frames;
 		Get_Frame_Key_Frames (frames);
 		pdefinition->Set_Frame_Keyframes (frames);
-		if (frames.KeyTimes != NULL) delete [] frames.KeyTimes;
-		if (frames.Values != NULL) delete [] frames.Values;
+		delete [] frames.KeyTimes;
+		delete [] frames.Values;
 
 		//
 		//	Pass the blur time keyframes onto the definition
@@ -790,12 +776,12 @@ ParticleEmitterClass::Build_Definition (void) const
 		ParticlePropertyStruct<float> blur_times;
 		Get_Blur_Time_Key_Frames (blur_times);
 		pdefinition->Set_Blur_Time_Keyframes (blur_times);
-		if (blur_times.KeyTimes != NULL) delete [] blur_times.KeyTimes;
-		if (blur_times.Values != NULL) delete [] blur_times.Values;
+		delete [] blur_times.KeyTimes;
+		delete [] blur_times.Values;
 
 
 		//
-		// Set up the line parameters 
+		// Set up the line parameters
 		//
 		pdefinition->Set_Line_Texture_Mapping_Mode(Get_Line_Texture_Mapping_Mode());
 		pdefinition->Set_Merge_Intersections(Is_Merge_Intersections());
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h
index 597d4f275ac..410de23a813 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h
@@ -16,32 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /VSS_Sync/ww3d2/part_emt.h              $* 
- *                                                                         * 
- *                      $Author:: Vss_sync                                $* 
- *                                                                         * 
- *                     $Modtime:: 8/29/01 7:29p                           $* 
- *                                                                         * 
- *                    $Revision:: 10                                      $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /VSS_Sync/ww3d2/part_emt.h              $*
+ *                                                                         *
+ *                      $Author:: Vss_sync                                $*
+ *                                                                         *
+ *                     $Modtime:: 8/29/01 7:29p                           $*
+ *                                                                         *
+ *                    $Revision:: 10                                      $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if defined(_MSC_VER)
-#pragma once
-#endif
 
-#ifndef PART_EMT_H
-#define PART_EMT_H
+#pragma once
 
 #include "rendobj.h"
-#include "RANDOM.H"
+#include "RANDOM.h"
 #include "part_buf.h"
 #include "quat.h"
 #include "w3d_file.h"
@@ -71,11 +67,11 @@ template<class T> struct ParticlePropertyStruct {
 /*
 ** Utility function for copying the contents of one keyframe struct into another.
 */
-template<class T> __inline 
+template<class T> __inline
 void Copy_Emitter_Property_Struct
 (
 	ParticlePropertyStruct<T> &dest,
-	const ParticlePropertyStruct<T> &src	
+	const ParticlePropertyStruct<T> &src
 )
 {
 	dest.Start			= src.Start;
@@ -109,24 +105,24 @@ class ParticleEmitterClass : public RenderObjClass
 
 		// Note: all time/velocity/acceleration quantities use seconds (converted to ms internally)
 		ParticleEmitterClass(float emit_rate, unsigned int burst_size, Vector3Randomizer *pos_rnd,
-			Vector3 base_vel, Vector3Randomizer *vel_rnd, float out_vel, float vel_inherit_factor, 
-			ParticlePropertyStruct<Vector3> &color, 
+			Vector3 base_vel, Vector3Randomizer *vel_rnd, float out_vel, float vel_inherit_factor,
+			ParticlePropertyStruct<Vector3> &color,
 			ParticlePropertyStruct<float> &opacity,
-			ParticlePropertyStruct<float> &size, 
+			ParticlePropertyStruct<float> &size,
 			ParticlePropertyStruct<float> &rotation, float orient_rnd,
 			ParticlePropertyStruct<float> &frames,
 			ParticlePropertyStruct<float> &blur_times,
 			Vector3 accel, float max_age, float future_start, TextureClass *tex,
-			ShaderClass shader = ShaderClass::_PresetAdditiveSpriteShader, 
+			ShaderClass shader = ShaderClass::_PresetAdditiveSpriteShader,
 			int max_particles = 0, int max_buffer_size = -1, bool pingpong = false,
 			int render_mode = W3D_EMITTER_RENDER_MODE_TRI_PARTICLES,
 			int frame_mode = W3D_EMITTER_FRAME_MODE_1x1,
 			const W3dEmitterLinePropertiesStruct * line_props = NULL);
-				
+
 		ParticleEmitterClass(const ParticleEmitterClass & src);
 		ParticleEmitterClass & operator = (const ParticleEmitterClass &);
-		virtual ~ParticleEmitterClass(void);				
-		
+		virtual ~ParticleEmitterClass(void);
+
 		// Creation/serialization methods
 		virtual RenderObjClass *		Clone(void) const;
 		static ParticleEmitterClass * Create_From_Definition (const ParticleEmitterDefClass &definition);
@@ -170,7 +166,7 @@ class ParticleEmitterClass : public RenderObjClass
 		void						Start(void);
 		void						Stop(void);
 		bool						Is_Stopped(void);
-		
+
 		// Change starting position/velocity/acceleration parameters:
 		void Set_Position_Randomizer(Vector3Randomizer *rand);
 		void Set_Velocity_Randomizer(Vector3Randomizer *rand);
@@ -178,7 +174,7 @@ class ParticleEmitterClass : public RenderObjClass
 		void Set_Outwards_Velocity(float out_vel);
 		void Set_Velocity_Inheritance_Factor(float inh_factor);
 		void Set_Acceleration (const Vector3 &acceleration)	{ if (Buffer != NULL) Buffer->Set_Acceleration (acceleration/1000000.0f); }
-	
+
 		// Change visual properties of emitter / buffer:
 		void Reset_Colors(ParticlePropertyStruct<Vector3> &new_props)							{ if (Buffer) Buffer->Reset_Colors(new_props); }
 		void Reset_Opacity(ParticlePropertyStruct<float> &new_props)							{ if (Buffer) Buffer->Reset_Opacity(new_props); }
@@ -207,7 +203,7 @@ class ParticleEmitterClass : public RenderObjClass
 
 		// from RenderObj...
       virtual bool			Is_Complete(void)							{ return IsComplete; }
-		
+
 		// Auto deletion behavior controls
 		bool						Is_Remove_On_Complete_Enabled(void)				{ return RemoveOnComplete; }
 		void						Enable_Remove_On_Complete(bool onoff)			{ RemoveOnComplete = onoff; }
@@ -279,11 +275,11 @@ class ParticleEmitterClass : public RenderObjClass
 
 		// Used to build a list of filenames this emitter is dependent on
 		virtual void			Add_Dependencies_To_List (DynamicVectorClass<StringClass> &file_list, bool textures_only = false);
-		
+
 		// This method is called each time the visiblity state of the emitter changes.
 		virtual void			Update_On_Visibilty (void);
 
-	private:		
+	private:
 
 		// Collision sphere is a point - emitter emits also when not visible,
       // so this is only important to avoid affecting the collision spheres
@@ -320,7 +316,7 @@ class ParticleEmitterClass : public RenderObjClass
 		bool							BufferSceneNeeded;// Does the buffer need a scene?
 		int							ParticlesLeft;		// Particles left to emit
 		int							MaxParticles;		// Total particles to emit
-		bool							IsComplete;			// Completed Emissions		
+		bool							IsComplete;			// Completed Emissions
 		char *						NameString;
 		char *						UserString;
 		bool							RemoveOnComplete;	// Should this emitter destroy itself when it completes?
@@ -339,7 +335,3 @@ class ParticleEmitterClass : public RenderObjClass
 		// all particle emitters.
 		static bool					DebugDisable;
 };
-
-#endif // PART_EMT_H
-
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
index ff05f36f6ce..e25e57244ac 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
@@ -24,7 +24,7 @@
  *                                                                                             *
  *                     $Archive:: /Commando/Code/ww3d2/part_ldr.cpp         $*
  *                                                                                             *
- *                       Author:: Patrick Smith                                                
+ *                       Author:: Patrick Smith
  *                                                                                             *
  *                     $Modtime:: 8/01/01 3:35p                                               $*
  *                                                                                             *
@@ -42,23 +42,12 @@
 #include "texture.h"
 
 #ifndef SAFE_DELETE
-#define SAFE_DELETE(pointer) \
-{ \
-	if (pointer) {	\
-		delete pointer; \
-		pointer = 0; \
-	} \
-}
-#endif //SAFE_DELETE
+#define SAFE_DELETE(pointer) { delete pointer; pointer = NULL; }
+#endif
 
 #ifndef SAFE_DELETE_ARRAY
-#define SAFE_DELETE_ARRAY(pointer)	\
-	if (pointer) {					\
-		delete [] pointer;			\
-		pointer = 0;				\
-	}									\
-
-#endif //SAFE_DELETE
+#define SAFE_DELETE_ARRAY(pointer) { delete [] pointer; pointer = NULL; }
+#endif
 
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -67,8 +56,8 @@
 //
 ParticleEmitterLoaderClass	_ParticleEmitterLoader;
 
-//	This array is declared in "W3D_File.H"
-const char *EMITTER_TYPE_NAMES[EMITTER_TYPEID_COUNT] = 
+//	This array is declared in "W3D_File.h"
+const char *EMITTER_TYPE_NAMES[EMITTER_TYPEID_COUNT] =
 {
 	"Default"
 };
@@ -81,14 +70,14 @@ const char *EMITTER_TYPE_NAMES[EMITTER_TYPEID_COUNT] =
 ParticleEmitterDefClass::ParticleEmitterDefClass (void)
 	:	m_pName (NULL),
 		m_Version (0L),
-		m_pUserString (NULL),	  
+		m_pUserString (NULL),
 		m_iUserType (EMITTER_TYPEID_DEFAULT),
 		m_InitialOrientationRandom (0),
 		m_pCreationVolume (NULL),
 		m_pVelocityRandomizer (NULL)
 {
 	::memset (&m_Info, 0, sizeof (m_Info));
-	::memset (&m_InfoV2, 0, sizeof (m_InfoV2));	
+	::memset (&m_InfoV2, 0, sizeof (m_InfoV2));
 
 	::memset (&m_ColorKeyframes, 0, sizeof (m_ColorKeyframes));
 	::memset (&m_OpacityKeyframes, 0, sizeof (m_OpacityKeyframes));
@@ -108,14 +97,14 @@ ParticleEmitterDefClass::ParticleEmitterDefClass (void)
 ParticleEmitterDefClass::ParticleEmitterDefClass (const ParticleEmitterDefClass &src)
 	:	m_pName (NULL),
 		m_Version (0L),
-		m_pUserString (NULL),	  
+		m_pUserString (NULL),
 		m_iUserType (EMITTER_TYPEID_DEFAULT),
 		m_InitialOrientationRandom (src.m_InitialOrientationRandom),
 		m_pCreationVolume (NULL),
 		m_pVelocityRandomizer (NULL)
 {
 	::memset (&m_Info, 0, sizeof (m_Info));
-	::memset (&m_InfoV2, 0, sizeof (m_InfoV2));	
+	::memset (&m_InfoV2, 0, sizeof (m_InfoV2));
 
 	::memset (&m_ColorKeyframes, 0, sizeof (m_ColorKeyframes));
 	::memset (&m_OpacityKeyframes, 0, sizeof (m_OpacityKeyframes));
@@ -138,15 +127,15 @@ ParticleEmitterDefClass::~ParticleEmitterDefClass (void)
 {
 	// Free the name buffer if necessary
 	if (m_pName != NULL) {
-		
+
 		// free() is used because the buffer was allocated with ::_strdup().
 		::free (m_pName);
 		m_pName = NULL;
-	}	
+	}
 
 	// Free the user-string buffer if necessary
 	if (m_pUserString != NULL) {
-		
+
 		// free() is used because the buffer was allocated with ::malloc() or ::_strdup().
 		::free (m_pUserString);
 		m_pUserString = NULL;
@@ -239,7 +228,7 @@ ParticleEmitterDefClass::Free_Props (void)
 //
 //	Set_Velocity_Random
 //
-void							
+void
 ParticleEmitterDefClass::Set_Velocity_Random (Vector3Randomizer *randomizer)
 {
 	SAFE_DELETE (m_pVelocityRandomizer);
@@ -260,7 +249,7 @@ ParticleEmitterDefClass::Set_Velocity_Random (Vector3Randomizer *randomizer)
 //
 //	Set_Creation_Volume
 //
-void							
+void
 ParticleEmitterDefClass::Set_Creation_Volume (Vector3Randomizer *randomizer)
 {
 	SAFE_DELETE (m_pCreationVolume);
@@ -270,7 +259,7 @@ ParticleEmitterDefClass::Set_Creation_Volume (Vector3Randomizer *randomizer)
 	//	Ensure our persistent structure is up-to-date so it will save correctly
 	//
 	if (m_pCreationVolume != NULL) {
-		Initialize_Randomizer_Struct (*m_pCreationVolume, m_InfoV2.CreationVolume);		
+		Initialize_Randomizer_Struct (*m_pCreationVolume, m_InfoV2.CreationVolume);
 	}
 
 	return ;
@@ -281,11 +270,11 @@ ParticleEmitterDefClass::Set_Creation_Volume (Vector3Randomizer *randomizer)
 //
 //	Set_User_String
 //
-void							
-ParticleEmitterDefClass::Set_User_String (const char *pstring)		
-{ 
-	SAFE_FREE (m_pUserString); 
-	m_pUserString = ::_strdup (pstring); 
+void
+ParticleEmitterDefClass::Set_User_String (const char *pstring)
+{
+	SAFE_FREE (m_pUserString);
+	m_pUserString = ::_strdup (pstring);
 	return ;
 }
 
@@ -294,11 +283,11 @@ ParticleEmitterDefClass::Set_User_String (const char *pstring)
 //
 //	Set_Name
 //
-void							
-ParticleEmitterDefClass::Set_Name (const char *pname)			
-{ 
-	SAFE_FREE (m_pName); 
-	m_pName = ::_strdup (pname); 
+void
+ParticleEmitterDefClass::Set_Name (const char *pname)
+{
+	SAFE_FREE (m_pName);
+	m_pName = ::_strdup (pname);
 	return ;
 }
 
@@ -307,11 +296,11 @@ ParticleEmitterDefClass::Set_Name (const char *pname)
 //
 //	Set_Texture_Filename
 //
-void							
-ParticleEmitterDefClass::Set_Texture_Filename (const char *pname)	
-{ 
-	::lstrcpy (m_Info.TextureFilename, pname); 
-	Normalize_Filename (); 
+void
+ParticleEmitterDefClass::Set_Texture_Filename (const char *pname)
+{
+	::lstrcpy (m_Info.TextureFilename, pname);
+	Normalize_Filename ();
 	return ;
 }
 
@@ -322,14 +311,14 @@ ParticleEmitterDefClass::Set_Texture_Filename (const char *pname)
 //
 void
 ParticleEmitterDefClass::Normalize_Filename (void)
-{	
+{
 	TCHAR path[MAX_PATH];
 	::lstrcpy (path, m_Info.TextureFilename);
 
 	// Find the last occurance of the directory deliminator
 	LPCTSTR filename = ::strrchr (path, '\\');
 	if (filename != NULL) {
-		
+
 		// Increment past the directory deliminator
 		filename ++;
 
@@ -356,9 +345,9 @@ ParticleEmitterDefClass::Load_W3D (ChunkLoadClass &chunk_load)
 	if ((Read_Header (chunk_load) == WW3D_ERROR_OK) &&
 		 (Read_User_Data (chunk_load) == WW3D_ERROR_OK) &&
 		 (Read_Info (chunk_load) == WW3D_ERROR_OK)) {
-		
+
 		if (m_Version > 0x00010000) {
-			
+
 			//
 			// Read the version 2.0 structures from the chunk
 			//
@@ -377,15 +366,15 @@ ParticleEmitterDefClass::Load_W3D (ChunkLoadClass &chunk_load)
 	}
 
 	// (gth) Handle all future additions to the particle emitter file format
-	// in the typical chunk fashion.  
+	// in the typical chunk fashion.
 	while (chunk_load.Open_Chunk() && ret_val == WW3D_ERROR_OK) {
-		
-		switch (chunk_load.Cur_Chunk_ID()) 
+
+		switch (chunk_load.Cur_Chunk_ID())
 		{
 			case W3D_CHUNK_EMITTER_LINE_PROPERTIES:
 				ret_val = Read_Line_Properties(chunk_load);
 				break;
-			
+
 			case W3D_CHUNK_EMITTER_ROTATION_KEYFRAMES:
 				ret_val = Read_Rotation_Keyframes(chunk_load);
 				break;
@@ -398,12 +387,12 @@ ParticleEmitterDefClass::Load_W3D (ChunkLoadClass &chunk_load)
 				ret_val = Read_Blur_Time_Keyframes(chunk_load);
 				break;
 
-				
-			default: 
-				WWDEBUG_SAY(("Unhandled Chunk! File: %s Line: %d\r\n",__FILE__,__LINE__));
+
+			default:
+				WWDEBUG_SAY(("Unhandled Chunk! File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
-		
+
 		chunk_load.Close_Chunk();
 	}
 
@@ -421,15 +410,15 @@ ParticleEmitterDefClass::Initialize_To_Ver2 (void)
 {
 	::memset (&m_Info, 0, sizeof (m_Info));
 	::memset (&m_InfoV2, 0, sizeof (m_InfoV2));
-	
+
 	//
 	//	Set the version 2 values using defaults from version 1
 	//
 	m_InfoV2.BurstSize = 1;
 	m_InfoV2.OutwardVel = 0;
 	m_InfoV2.VelInherit = 0;
-	W3dUtilityClass::Convert_Shader (ShaderClass::_PresetAdditiveSpriteShader, &m_InfoV2.Shader);	
-	
+	W3dUtilityClass::Convert_Shader (ShaderClass::_PresetAdditiveSpriteShader, &m_InfoV2.Shader);
+
 	m_InfoV2.CreationVolume.ClassID = Vector3Randomizer::CLASSID_SOLIDBOX;
 	m_InfoV2.CreationVolume.Value1 = 0;
 	m_InfoV2.CreationVolume.Value2 = 0;
@@ -439,7 +428,7 @@ ParticleEmitterDefClass::Initialize_To_Ver2 (void)
 	m_InfoV2.VelRandom.Value1 = 0;
 	m_InfoV2.VelRandom.Value2 = 0;
 	m_InfoV2.VelRandom.Value3 = 0;
-	
+
 	Free_Props ();
 	return ;
 }
@@ -452,10 +441,10 @@ ParticleEmitterDefClass::Initialize_To_Ver2 (void)
 void
 ParticleEmitterDefClass::Convert_To_Ver2 (void)
 {
-	if (m_Version < 0x00020000) {		
+	if (m_Version < 0x00020000) {
 		m_InfoV2.BurstSize = 1;
 		m_InfoV2.OutwardVel = 0;
-		m_InfoV2.VelInherit = 0;		
+		m_InfoV2.VelInherit = 0;
 
 		//
 		//	Determine which shader to use...
@@ -476,7 +465,7 @@ ParticleEmitterDefClass::Convert_To_Ver2 (void)
 		}
 		W3dUtilityClass::Convert_Shader (shader, &m_InfoV2.Shader);
 
-				
+
 		//
 		//	Convert the randomziers
 		//
@@ -500,7 +489,7 @@ ParticleEmitterDefClass::Convert_To_Ver2 (void)
 
 		//
 		//	Convert the colors, opacities, and sizes
-		//		
+		//
 		Free_Props ();
 		m_ColorKeyframes.Start = RGBA_TO_VECTOR3 (m_Info.StartColor);
 		m_ColorKeyframes.Rand = Vector3 (0, 0, 0);
@@ -618,7 +607,7 @@ ParticleEmitterDefClass::Read_Info (ChunkLoadClass &chunk_load)
 		// Read the chunk straight into our member structure
 		::memset (&m_Info, 0, sizeof (m_Info));
 		if (chunk_load.Read (&m_Info, sizeof (m_Info)) == sizeof (m_Info)) {
-				
+
 			// Success!
 			ret_val = WW3D_ERROR_OK;
 		}
@@ -656,7 +645,7 @@ ParticleEmitterDefClass::Create_Randomizer (W3dVolumeRandomizerStruct &info)
 
 		case Vector3Randomizer::CLASSID_SOLIDCYLINDER:
 			randomizer = W3DNEW Vector3SolidCylinderRandomizer (info.Value1, info.Value2);
-			break;		
+			break;
 	}
 
 	return randomizer;
@@ -696,8 +685,8 @@ ParticleEmitterDefClass::Initialize_Randomizer_Struct
 
 		case Vector3Randomizer::CLASSID_SOLIDCYLINDER:
 			info.Value1 = ((Vector3SolidCylinderRandomizer &)randomizer).Get_Height ();
-			info.Value2 = ((Vector3SolidCylinderRandomizer &)randomizer).Get_Radius ();			
-			break;		
+			info.Value2 = ((Vector3SolidCylinderRandomizer &)randomizer).Get_Radius ();
+			break;
 	}
 
 	return ;
@@ -728,8 +717,8 @@ ParticleEmitterDefClass::Read_InfoV2 (ChunkLoadClass &chunk_load)
 			SAFE_DELETE (m_pCreationVolume);
 			SAFE_DELETE (m_pVelocityRandomizer);
 			m_pCreationVolume = Create_Randomizer (m_InfoV2.CreationVolume);
-			m_pVelocityRandomizer = Create_Randomizer (m_InfoV2.VelRandom);			
-				
+			m_pVelocityRandomizer = Create_Randomizer (m_InfoV2.VelRandom);
+
 			// Success!
 			ret_val = WW3D_ERROR_OK;
 		}
@@ -762,7 +751,7 @@ ParticleEmitterDefClass::Read_Props (ChunkLoadClass &chunk_load)
 		if (chunk_load.Read (&info, sizeof (info)) == sizeof (info)) {
 
 			unsigned int index=0;
-			
+
 			//ParticlePropertyStruct<Vector3>
 			m_ColorKeyframes.NumKeyFrames		= info.ColorKeyframes - 1;
 			m_OpacityKeyframes.NumKeyFrames	= info.OpacityKeyframes - 1;
@@ -794,7 +783,7 @@ ParticleEmitterDefClass::Read_Props (ChunkLoadClass &chunk_load)
 				m_SizeKeyframes.KeyTimes = W3DNEWARRAY float[m_SizeKeyframes.NumKeyFrames];
 				m_SizeKeyframes.Values = W3DNEWARRAY float[m_SizeKeyframes.NumKeyFrames];
 			}
-			
+
 			//
 			//	Read the color keyframes from the chunk
 			//
@@ -841,7 +830,7 @@ ParticleEmitterDefClass::Read_Props (ChunkLoadClass &chunk_load)
 											&m_SizeKeyframes.KeyTimes[index],
 											&m_SizeKeyframes.Values[index]);
 			}
-				
+
 			// Success!
 			ret_val = WW3D_ERROR_OK;
 		}
@@ -874,7 +863,7 @@ ParticleEmitterDefClass::Read_Color_Keyframe
 	//
 	W3dEmitterColorKeyframeStruct key_frame = { 0 };
 	if (chunk_load.Read (&key_frame, sizeof (key_frame)) == sizeof (key_frame)) {
-		
+
 		// Pass the key time to the caller
 		if (key_time != NULL) {
 			(*key_time) = key_frame.Time;
@@ -912,7 +901,7 @@ ParticleEmitterDefClass::Read_Opacity_Keyframe
 	//
 	W3dEmitterOpacityKeyframeStruct key_frame = { 0 };
 	if (chunk_load.Read (&key_frame, sizeof (key_frame)) == sizeof (key_frame)) {
-		
+
 		// Pass the key time to the caller
 		if (key_time != NULL) {
 			(*key_time) = key_frame.Time;
@@ -950,7 +939,7 @@ ParticleEmitterDefClass::Read_Size_Keyframe
 	//
 	W3dEmitterSizeKeyframeStruct key_frame = { 0 };
 	if (chunk_load.Read (&key_frame, sizeof (key_frame)) == sizeof (key_frame)) {
-		
+
 		// Pass the key time to the caller
 		if (key_time != NULL) {
 			(*key_time) = key_frame.Time;
@@ -984,7 +973,7 @@ ParticleEmitterDefClass::Read_Line_Properties(ChunkLoadClass & chunk_load)
 
 		// Read the chunk straight into our member structure
 		if (chunk_load.Read (&m_LineProperties, sizeof (m_LineProperties)) == sizeof (m_LineProperties)) {
-				
+
 			// Success!
 			ret_val = WW3D_ERROR_OK;
 		}
@@ -999,7 +988,7 @@ ParticleEmitterDefClass::Read_Line_Properties(ChunkLoadClass & chunk_load)
 //
 //	Read_Rotation_Keyframes
 //
-WW3DErrorType 
+WW3DErrorType
 ParticleEmitterDefClass::Read_Rotation_Keyframes (ChunkLoadClass &chunk_load)
 {
 	// Assume success
@@ -1019,7 +1008,7 @@ ParticleEmitterDefClass::Read_Rotation_Keyframes (ChunkLoadClass &chunk_load)
 	if (chunk_load.Read(&key,sizeof(key)) == sizeof(key)) {
 		m_RotationKeyframes.Start = key.Rotation;
 	}
-	
+
 	// Allocate the rotation keys
 	if (m_RotationKeyframes.NumKeyFrames > 0) {
 		m_RotationKeyframes.KeyTimes = W3DNEWARRAY float[m_RotationKeyframes.NumKeyFrames];
@@ -1046,7 +1035,7 @@ ParticleEmitterDefClass::Read_Rotation_Keyframes (ChunkLoadClass &chunk_load)
 //
 //	Read_Frame_Keyframes
 //
-WW3DErrorType 
+WW3DErrorType
 ParticleEmitterDefClass::Read_Frame_Keyframes (ChunkLoadClass &chunk_load)
 {
 	// Assume success
@@ -1063,7 +1052,7 @@ ParticleEmitterDefClass::Read_Frame_Keyframes (ChunkLoadClass &chunk_load)
 	if (chunk_load.Read(&key,sizeof(key)) == sizeof(key)) {
 		m_FrameKeyframes.Start = key.Frame;
 	}
-	
+
 	// Allocate the keys
 	m_FrameKeyframes.NumKeyFrames		= header.KeyframeCount;
 	m_FrameKeyframes.Rand				= header.Random;
@@ -1106,7 +1095,7 @@ ParticleEmitterDefClass::Read_Blur_Time_Keyframes (ChunkLoadClass &chunk_load)
 	if (chunk_load.Read(&key,sizeof(key)) == sizeof(key)) {
 		m_BlurTimeKeyframes.Start = key.BlurTime;
 	}
-	
+
 	// Allocate the keys
 	m_BlurTimeKeyframes.NumKeyFrames		= header.KeyframeCount;
 	m_BlurTimeKeyframes.Rand					= header.Random;
@@ -1140,7 +1129,7 @@ ParticleEmitterDefClass::Save_W3D (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies an emitter
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER) == TRUE) {
-		
+
 		// Attempt to save the different sections of the emitter definition
 		if ((Save_Header (chunk_save) == WW3D_ERROR_OK) &&
 			 (Save_User_Data (chunk_save) == WW3D_ERROR_OK) &&
@@ -1176,7 +1165,7 @@ ParticleEmitterDefClass::Save_Header (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the emitter
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_HEADER) == TRUE) {
-		
+
 		// Fill the header structure
 		W3dEmitterHeaderStruct header = { 0 };
 		header.Version = W3D_CURRENT_EMITTER_VERSION;
@@ -1187,7 +1176,7 @@ ParticleEmitterDefClass::Save_Header (ChunkSaveClass &chunk_save)
 		if (chunk_save.Write (&header, sizeof (header)) == sizeof (header))
 		{
 			// Success!
-			ret_val = WW3D_ERROR_OK;			
+			ret_val = WW3D_ERROR_OK;
 		}
 
 		// End the header chunk
@@ -1211,7 +1200,7 @@ ParticleEmitterDefClass::Save_User_Data (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that contains user information
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_USER_DATA) == TRUE) {
-		
+
 		DWORD string_len = m_pUserString ? (::lstrlen (m_pUserString) + 1) : 0;
 
 		// Fill the header structure
@@ -1227,10 +1216,10 @@ ParticleEmitterDefClass::Save_User_Data (ChunkSaveClass &chunk_save)
 
 			// Do we need to write the user string to the file?
 			if (m_pUserString != NULL) {
-				
+
 				// Now write the user string param to the file
 				if (chunk_save.Write (m_pUserString, string_len) != string_len) {
-					
+
 					// Something went wrong
 					ret_val = WW3D_ERROR_SAVE_FAILED;
 				}
@@ -1258,7 +1247,7 @@ ParticleEmitterDefClass::Save_Info (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the generic emitter settings
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_INFO) == TRUE) {
-		
+
 		// Write the settings structure out to the chunk
 		if (chunk_save.Write (&m_Info, sizeof (m_Info)) == sizeof (m_Info))
 		{
@@ -1287,7 +1276,7 @@ ParticleEmitterDefClass::Save_InfoV2 (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the generic emitter settings
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_INFOV2) == TRUE) {
-		
+
 		// Write the settings structure out to the chunk
 		if (chunk_save.Write (&m_InfoV2, sizeof (m_InfoV2)) == sizeof (m_InfoV2))
 		{
@@ -1316,7 +1305,7 @@ ParticleEmitterDefClass::Save_Props (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the generic emitter settings
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_PROPS) == TRUE) {
-		
+
 		//
 		//	Fill in the property struct
 		//
@@ -1326,7 +1315,7 @@ ParticleEmitterDefClass::Save_Props (ChunkSaveClass &chunk_save)
 		info.SizeKeyframes		= m_SizeKeyframes.NumKeyFrames + 1;
 		info.OpacityRandom		= m_OpacityKeyframes.Rand;
 		info.SizeRandom			= m_SizeKeyframes.Rand;
-		VECTOR3_TO_RGBA (m_ColorKeyframes.Rand, info.ColorRandom);		
+		VECTOR3_TO_RGBA (m_ColorKeyframes.Rand, info.ColorRandom);
 
 		//
 		// Write the property structure out to the chunk
@@ -1341,7 +1330,7 @@ ParticleEmitterDefClass::Save_Props (ChunkSaveClass &chunk_save)
 				 (Save_Size_Keyframes (chunk_save) == WW3D_ERROR_OK)) {
 
 				// Success!
-				ret_val = WW3D_ERROR_OK;			
+				ret_val = WW3D_ERROR_OK;
 			}
 		}
 
@@ -1372,13 +1361,13 @@ ParticleEmitterDefClass::Save_Color_Keyframes (ChunkSaveClass &chunk_save)
 	// Write the starting color keyframe to the chunk
 	//
 	if (chunk_save.Write (&info, sizeof (info)) == sizeof (info)) {
-		
+
 		//
 		// Write each of the remaining color keyframes to the chunk
 		//
 		int count = m_ColorKeyframes.NumKeyFrames;
 		bool success = true;
-		for (int index = 0; (index < count) && success; index ++) {			
+		for (int index = 0; (index < count) && success; index ++) {
 			info.Time = m_ColorKeyframes.KeyTimes[index];
 			VECTOR3_TO_RGBA (m_ColorKeyframes.Values[index], info.Color);
 			success = (chunk_save.Write (&info, sizeof (info)) == sizeof (info));
@@ -1410,13 +1399,13 @@ ParticleEmitterDefClass::Save_Opacity_Keyframes (ChunkSaveClass &chunk_save)
 	// Write the starting keyframe to the chunk
 	//
 	if (chunk_save.Write (&info, sizeof (info)) == sizeof (info)) {
-		
+
 		//
 		// Write each of the remaining keyframes to the chunk
 		//
 		int count = m_OpacityKeyframes.NumKeyFrames;
 		bool success = true;
-		for (int index = 0; (index < count) && success; index ++) {			
+		for (int index = 0; (index < count) && success; index ++) {
 			info.Time = m_OpacityKeyframes.KeyTimes[index];
 			info.Opacity = m_OpacityKeyframes.Values[index];
 			success = (chunk_save.Write (&info, sizeof (info)) == sizeof (info));
@@ -1448,13 +1437,13 @@ ParticleEmitterDefClass::Save_Size_Keyframes (ChunkSaveClass &chunk_save)
 	// Write the starting keyframe to the chunk
 	//
 	if (chunk_save.Write (&info, sizeof (info)) == sizeof (info)) {
-		
+
 		//
 		// Write each of the remaining keyframes to the chunk
 		//
 		int count = m_SizeKeyframes.NumKeyFrames;
 		bool success = true;
-		for (int index = 0; (index < count) && success; index ++) {			
+		for (int index = 0; (index < count) && success; index ++) {
 			info.Time = m_SizeKeyframes.KeyTimes[index];
 			info.Size = m_SizeKeyframes.Values[index];
 			success = (chunk_save.Write (&info, sizeof (info)) == sizeof (info));
@@ -1475,7 +1464,7 @@ ParticleEmitterDefClass::Save_Line_Properties (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the line properties
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_LINE_PROPERTIES) == TRUE) {
-		
+
 		// Write the line properties structure out to the chunk
 		if (chunk_save.Write (&m_LineProperties, sizeof (m_LineProperties)) == sizeof (m_LineProperties))
 		{
@@ -1495,7 +1484,7 @@ ParticleEmitterDefClass::Save_Line_Properties (ChunkSaveClass &chunk_save)
 //
 //	Save_Rotation_Keyframes
 // NOTE: Rotation keyframes are saved in a separate chunk unlike color,size,and
-// opacity which are embedded inside the PROPS chunk. 
+// opacity which are embedded inside the PROPS chunk.
 //
 WW3DErrorType
 ParticleEmitterDefClass::Save_Rotation_Keyframes (ChunkSaveClass & chunk_save)
@@ -1512,7 +1501,7 @@ ParticleEmitterDefClass::Save_Rotation_Keyframes (ChunkSaveClass & chunk_save)
 		header.Random = m_RotationKeyframes.Rand;
 		header.OrientationRandom = m_InitialOrientationRandom;
 		chunk_save.Write (&header, sizeof (W3dEmitterRotationHeaderStruct));
-		
+
 		// Write the keyframes
 		bool success = true;
 		W3dEmitterRotationKeyframeStruct key;
@@ -1523,7 +1512,7 @@ ParticleEmitterDefClass::Save_Rotation_Keyframes (ChunkSaveClass & chunk_save)
 		chunk_save.Write (&key, sizeof (key));
 
 		// Write the remaining keyframes
-		for (unsigned int index = 0; (index < header.KeyframeCount) && success; index ++) {			
+		for (unsigned int index = 0; (index < header.KeyframeCount) && success; index ++) {
 			key.Time = m_RotationKeyframes.KeyTimes[index];
 			key.Rotation = m_RotationKeyframes.Values[index];
 			success = (chunk_save.Write (&key, sizeof (key)) == sizeof (key));
@@ -1544,14 +1533,14 @@ ParticleEmitterDefClass::Save_Rotation_Keyframes (ChunkSaveClass & chunk_save)
 //
 //	Save_Frame_Keyframes
 // NOTE: Frame keyframes are saved in a separate chunk unlike color,size,and
-// opacity which are embedded inside the PROPS chunk. 
+// opacity which are embedded inside the PROPS chunk.
 //
 WW3DErrorType
 ParticleEmitterDefClass::Save_Frame_Keyframes (ChunkSaveClass & chunk_save)
 {
 	// Assume error
 	WW3DErrorType ret_val = WW3D_ERROR_SAVE_FAILED;
-	
+
 	// Begin a chunk that identifies the rotation keyframes
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_FRAME_KEYFRAMES) == TRUE) {
 
@@ -1560,7 +1549,7 @@ ParticleEmitterDefClass::Save_Frame_Keyframes (ChunkSaveClass & chunk_save)
 		header.KeyframeCount = m_FrameKeyframes.NumKeyFrames;
 		header.Random = m_FrameKeyframes.Rand;
 		chunk_save.Write (&header, sizeof (W3dEmitterFrameHeaderStruct));
-		
+
 		// Write the keyframes
 		bool success = true;
 		W3dEmitterFrameKeyframeStruct key;
@@ -1571,7 +1560,7 @@ ParticleEmitterDefClass::Save_Frame_Keyframes (ChunkSaveClass & chunk_save)
 		chunk_save.Write (&key, sizeof (key));
 
 		// Write the remaining keyframes
-		for (unsigned int index = 0; (index < header.KeyframeCount) && success; index ++) {			
+		for (unsigned int index = 0; (index < header.KeyframeCount) && success; index ++) {
 			key.Time = m_FrameKeyframes.KeyTimes[index];
 			key.Frame = m_FrameKeyframes.Values[index];
 			success = (chunk_save.Write (&key, sizeof (key)) == sizeof (key));
@@ -1591,14 +1580,14 @@ ParticleEmitterDefClass::Save_Frame_Keyframes (ChunkSaveClass & chunk_save)
 //
 //	Save_Blur_Time_Keyframes
 // NOTE: Blur Time keyframes are saved in a separate chunk unlike color,size,and
-// opacity which are embedded inside the PROPS chunk. 
+// opacity which are embedded inside the PROPS chunk.
 //
 WW3DErrorType
 ParticleEmitterDefClass::Save_Blur_Time_Keyframes (ChunkSaveClass & chunk_save)
 {
 	// Assume error
 	WW3DErrorType ret_val = WW3D_ERROR_SAVE_FAILED;
-	
+
 	// Begin a chunk that identifies the rotation keyframes
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_BLUR_TIME_KEYFRAMES) == TRUE) {
 
@@ -1607,7 +1596,7 @@ ParticleEmitterDefClass::Save_Blur_Time_Keyframes (ChunkSaveClass & chunk_save)
 		header.KeyframeCount = m_BlurTimeKeyframes.NumKeyFrames;
 		header.Random = m_BlurTimeKeyframes.Rand;
 		chunk_save.Write (&header, sizeof (W3dEmitterBlurTimeHeaderStruct));
-		
+
 		// Write the keyframes
 		bool success = true;
 		W3dEmitterBlurTimeKeyframeStruct key;
@@ -1618,7 +1607,7 @@ ParticleEmitterDefClass::Save_Blur_Time_Keyframes (ChunkSaveClass & chunk_save)
 		chunk_save.Write (&key, sizeof (key));
 
 		// Write the remaining keyframes
-		for (unsigned int index = 0; (index < header.KeyframeCount) && success; index ++) {			
+		for (unsigned int index = 0; (index < header.KeyframeCount) && success; index ++) {
 			key.Time = m_BlurTimeKeyframes.KeyTimes[index];
 			key.BlurTime = m_BlurTimeKeyframes.Values[index];
 			success = (chunk_save.Write (&key, sizeof (key)) == sizeof (key));
@@ -1683,7 +1672,7 @@ ParticleEmitterDefClass::Set_Size_Keyframes (ParticlePropertyStruct<float> &keyf
 //
 //	Set_Rotation_Keyframes
 //
-void 
+void
 ParticleEmitterDefClass::Set_Rotation_Keyframes (ParticlePropertyStruct<float> &keyframes, float orient_rnd)
 {
 	SAFE_DELETE_ARRAY (m_RotationKeyframes.KeyTimes);
@@ -1698,7 +1687,7 @@ ParticleEmitterDefClass::Set_Rotation_Keyframes (ParticlePropertyStruct<float> &
 //
 //	Set_Frame_Keyframes
 //
-void 
+void
 ParticleEmitterDefClass::Set_Frame_Keyframes (ParticlePropertyStruct<float> &keyframes)
 {
 	SAFE_DELETE_ARRAY (m_FrameKeyframes.KeyTimes);
@@ -1773,7 +1762,7 @@ ParticleEmitterDefClass::Get_Rotation_Keyframes (ParticlePropertyStruct<float> &
 //
 //	Get_Frame_Keyframes
 //
-void 
+void
 ParticleEmitterDefClass::Get_Frame_Keyframes (ParticlePropertyStruct<float> &keyframes) const
 {
 	::Copy_Emitter_Property_Struct (keyframes, m_FrameKeyframes);
@@ -1816,13 +1805,12 @@ ParticleEmitterLoaderClass::Load_W3D (ChunkLoadClass &chunk_load)
 	// Create a definition object
 	ParticleEmitterDefClass *pdefinition = W3DNEW ParticleEmitterDefClass;
 	if (pdefinition != NULL) {
-		
+
 		// Ask the definition object to load the emitter data
 		if (pdefinition->Load_W3D (chunk_load) != WW3D_ERROR_OK) {
-			
+
 			// Error!  Free the definition
 			delete pdefinition;
-			pdefinition = NULL;
 		} else {
 
 			// Success!  Create a prototype from the definition
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h
index 74107283e02..9d319cf38cf 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h
@@ -24,7 +24,7 @@
  *                                                                                             *
  *                     $Archive:: /Commando/Code/ww3d2/part_ldr.h          $*
  *                                                                                             *
- *                       Author:: Patrick Smith                                                
+ *                       Author:: Patrick Smith
  *                                                                                             *
  *                     $Modtime:: 8/01/01 3:35p                                               $*
  *                                                                                             *
@@ -32,14 +32,7 @@
  *                                                                                             *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __PART_EMT_LDR_H
-#define __PART_EMT_LDR_H
-
 
 #include "proto.h"
 #include "rendobj.h"
@@ -100,7 +93,7 @@ class ParticleEmitterDefClass
 		///////////////////////////////////////////////////////////
 		//
 		//	Public constructors/destructors
-		//		
+		//
 		ParticleEmitterDefClass (void);
 		ParticleEmitterDefClass (const ParticleEmitterDefClass &src);
 		virtual ~ParticleEmitterDefClass (void);
@@ -109,14 +102,14 @@ class ParticleEmitterDefClass
 		///////////////////////////////////////////////////////////
 		//
 		//	Public operators
-		//		
+		//
 		const ParticleEmitterDefClass &operator= (const ParticleEmitterDefClass &src);
 
 
 		///////////////////////////////////////////////////////////
 		//
 		//	Public methods
-		//		
+		//
 		virtual WW3DErrorType	Load_W3D (ChunkLoadClass &chunk_load);
 		virtual WW3DErrorType	Save_W3D (ChunkSaveClass &chunk_save);
 		const char *				Get_Name (void) const					{ return m_pName; }
@@ -146,7 +139,7 @@ class ParticleEmitterDefClass
 		float						Get_Vel_Inherit (void) const			{ return m_InfoV2.VelInherit; }
 
 		virtual void			Set_Render_Mode (int mode)						{ m_InfoV2.RenderMode = mode; } // values in w3d_file.h
-		virtual void			Set_Frame_Mode (int mode)						{ m_InfoV2.FrameMode = mode; } // values in w3d_file.h 
+		virtual void			Set_Frame_Mode (int mode)						{ m_InfoV2.FrameMode = mode; } // values in w3d_file.h
 		virtual void			Set_Texture_Filename (const char *pname);
 		virtual void			Set_Lifetime (float value)						{ m_Info.Lifetime = value; }
 		virtual void			Set_Emission_Rate (float value)				{ m_Info.EmissionRate = value; }
@@ -213,7 +206,7 @@ class ParticleEmitterDefClass
 		float						Get_Merge_Abort_Factor(void) const			{ return m_LineProperties.MergeAbortFactor; }
 		float						Get_Texture_Tile_Factor(void) const			{ return m_LineProperties.TextureTileFactor; }
 		Vector2					Get_UV_Offset_Rate(void) const				{ return Vector2(m_LineProperties.UPerSec,m_LineProperties.VPerSec); }
-		
+
 		virtual void			Set_Line_Texture_Mapping_Mode(int mode);
 		virtual void			Set_Merge_Intersections(int onoff)			{ if (onoff) { m_LineProperties.Flags |= W3D_ELINE_MERGE_INTERSECTIONS; } else { m_LineProperties.Flags &= ~W3D_ELINE_MERGE_INTERSECTIONS; }; }
 		virtual void			Set_Freeze_Random(int onoff)					{ if (onoff) { m_LineProperties.Flags |= W3D_ELINE_FREEZE_RANDOM; } else { m_LineProperties.Flags &= ~W3D_ELINE_FREEZE_RANDOM; }; }
@@ -226,12 +219,12 @@ class ParticleEmitterDefClass
 		virtual void			Set_UV_Offset_Rate(const Vector2 & rate)	{ m_LineProperties.UPerSec = rate.X; m_LineProperties.VPerSec = rate.Y; }
 
 	protected:
-		
+
 		///////////////////////////////////////////////////////////
 		//
 		//	Protected methods
 		//
-		
+
 		//
 		//	Loading methods
 		//
@@ -307,10 +300,10 @@ class ParticleEmitterDefClass
 		Vector3Randomizer *					m_pVelocityRandomizer;
 };
 
-inline void ParticleEmitterDefClass::Set_Line_Texture_Mapping_Mode(int mode)	
-{ 
+inline void ParticleEmitterDefClass::Set_Line_Texture_Mapping_Mode(int mode)
+{
 	m_LineProperties.Flags &= ~W3D_ELINE_TEXTURE_MAP_MODE_MASK;
-	m_LineProperties.Flags |= ((mode << W3D_ELINE_TEXTURE_MAP_MODE_OFFSET) & W3D_ELINE_TEXTURE_MAP_MODE_MASK); 
+	m_LineProperties.Flags |= ((mode << W3D_ELINE_TEXTURE_MAP_MODE_OFFSET) & W3D_ELINE_TEXTURE_MAP_MODE_MASK);
 }
 
 
@@ -319,7 +312,7 @@ inline void ParticleEmitterDefClass::Set_Line_Texture_Mapping_Mode(int mode)
 //
 //	ParticleEmitterPrototypeClass
 //
-class ParticleEmitterPrototypeClass : public W3DMPO, public PrototypeClass 
+class ParticleEmitterPrototypeClass : public W3DMPO, public PrototypeClass
 {
 	W3DMPO_GLUE(ParticleEmitterPrototypeClass)
 	public:
@@ -327,9 +320,9 @@ class ParticleEmitterPrototypeClass : public W3DMPO, public PrototypeClass
 		///////////////////////////////////////////////////////////
 		//
 		//	Public constructors/destructors
-		//		
+		//
 		ParticleEmitterPrototypeClass (ParticleEmitterDefClass *pdef)	{ m_pDefinition = pdef; }
-		
+
 		///////////////////////////////////////////////////////////
 		//
 		//	Public methods
@@ -370,6 +363,3 @@ class ParticleEmitterLoaderClass : public PrototypeLoaderClass
 //	Global variables
 //
 extern ParticleEmitterLoaderClass	_ParticleEmitterLoader;
-
-
-#endif //__PART_EMT_LDR_H
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
index da923295f5b..1856a8c1ef6 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
@@ -35,7 +35,6 @@
 #include "render2d.h"
 #include "mutex.h"
 #include "ww3d.h"
-#include "refcount.h"
 #include "font3d.h"
 #include "rect.h"
 #include "texture.h"
@@ -66,14 +65,14 @@ Render2DClass::Render2DClass( TextureClass* tex ) :
 	IsHidden( false ),
 	IsGrayScale (false)
 {
-	Set_Texture( tex );	
+	Set_Texture( tex );
    Shader = Get_Default_Shader();
 	return ;
 }
 
 Render2DClass::~Render2DClass()
 {
-	REF_PTR_RELEASE(Texture);	
+	REF_PTR_RELEASE(Texture);
 }
 
 ShaderClass
@@ -82,7 +81,7 @@ Render2DClass::Get_Default_Shader( void )
 	ShaderClass shader;
 
    shader.Set_Depth_Mask( ShaderClass::DEPTH_WRITE_DISABLE );
-	shader.Set_Depth_Compare( ShaderClass::PASS_ALWAYS );	
+	shader.Set_Depth_Compare( ShaderClass::PASS_ALWAYS );
 	shader.Set_Dst_Blend_Func( ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA );
 	shader.Set_Src_Blend_Func( ShaderClass::SRCBLEND_SRC_ALPHA );
 	shader.Set_Fog_Func( ShaderClass::FOG_DISABLE );
@@ -104,7 +103,7 @@ void	Render2DClass::Reset(void)
 
 void Render2DClass::Set_Texture(TextureClass* tex)
 {
-	REF_PTR_SET(Texture,tex);	
+	REF_PTR_SET(Texture,tex);
 }
 
 void Render2DClass::Set_Texture( const char * filename)
@@ -121,7 +120,7 @@ void Render2DClass::Set_Texture( const char * filename)
 void Render2DClass::Enable_Grayscale(bool b)
 {
 	IsGrayScale = b;
-}	
+}
 
 void Render2DClass::Enable_Alpha(bool b)
 {
@@ -187,7 +186,7 @@ void	  Render2DClass::Update_Bias( void )
 }
 
 #if 0
-Vector2 Render2DClass::Convert_Vert( const Vector2 & v ) 
+Vector2 Render2DClass::Convert_Vert( const Vector2 & v )
 {
 	Vector2 out;
 
@@ -195,7 +194,7 @@ Vector2 Render2DClass::Convert_Vert( const Vector2 & v )
 	out.X = v.X * CoordinateScale.X + CoordinateOffset.X;
 	out.Y = v.Y * CoordinateScale.Y + CoordinateOffset.Y;
 
-	// Convert to pixels 
+	// Convert to pixels
 	out.X = (out.X + 1.0f) * (Get_Screen_Resolution().Width() * 0.5f);
 	out.Y = (out.Y - 1.0f) * (Get_Screen_Resolution().Height() * -0.5f);
 
@@ -212,7 +211,7 @@ Vector2 Render2DClass::Convert_Vert( const Vector2 & v )
 
 	// Convert back to (-1,1)-(1,-1)
 	out.X = out.X / (Get_Screen_Resolution().Width() * 0.5f) - 1.0f;
-	out.Y = out.Y / (Get_Screen_Resolution().Height() * -0.5f) + 1.0f;	
+	out.Y = out.Y / (Get_Screen_Resolution().Height() * -0.5f) + 1.0f;
 
 	return out;
 }
@@ -239,7 +238,7 @@ void Render2DClass::Convert_Vert( Vector2 & vert_out, float x_in, float y_in )
 
 #endif
 
-void	Render2DClass::Move( const Vector2 & move )	// Move all verts 
+void	Render2DClass::Move( const Vector2 & move )	// Move all verts
 {
 	Vector2 scaled_move;
 	scaled_move.X = move.X * CoordinateScale.X;
@@ -279,7 +278,7 @@ void	Render2DClass::Internal_Add_Quad_UVs( const RectClass & uv )
 	uvs->X = uv.Left;		uvs->Y = uv.Top;			uvs++;
 	uvs->X = uv.Left;		uvs->Y = uv.Bottom;		uvs++;
 	uvs->X = uv.Right;	uvs->Y = uv.Top;			uvs++;
-	uvs->X = uv.Right;	uvs->Y = uv.Bottom;	
+	uvs->X = uv.Right;	uvs->Y = uv.Bottom;
 }
 
 void	Render2DClass::Internal_Add_Quad_Colors( unsigned long color )
@@ -313,7 +312,7 @@ void	Render2DClass::Internal_Add_Quad_HColors( unsigned long color1, unsigned lo
 void	Render2DClass::Internal_Add_Quad_Indicies( int start_vert_index, bool backfaced )
 {
 	unsigned short * indices = Indices.Add_Multiple( 6 );
-	
+
 	if (backfaced ^ (CoordinateScale.X * CoordinateScale.Y > 0)) {
 		*indices++ = start_vert_index + 1;
 		*indices++ = start_vert_index + 0;
@@ -523,7 +522,7 @@ void	Render2DClass::Add_Outline( const RectClass & rect, float width, const Rect
 	Add_Line (Vector2 (rect.Left + 1, rect.Bottom),	Vector2 (rect.Left + 1, rect.Top + 1),		width, color);
 	Add_Line (Vector2 (rect.Left, rect.Top + 1),		Vector2 (rect.Right - 1, rect.Top + 1),			width, color);
 	Add_Line (Vector2 (rect.Right, rect.Top),		Vector2 (rect.Right, rect.Bottom - 1),		width, color);
-	Add_Line (Vector2 (rect.Right, rect.Bottom),	Vector2 (rect.Left + 1, rect.Bottom),	width, color);	
+	Add_Line (Vector2 (rect.Right, rect.Bottom),	Vector2 (rect.Left + 1, rect.Bottom),	width, color);
 }
 
 void Render2DClass::Render(void)
@@ -551,7 +550,7 @@ void Render2DClass::Render(void)
 	vp.MaxZ		= 1;
 	DX8Wrapper::Set_Viewport(&vp);
 
-	
+
 	DX8Wrapper::Set_Texture(0,Texture);
 
 	VertexMaterialClass *vm=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
@@ -576,7 +575,7 @@ void Render2DClass::Render(void)
 			*(unsigned int*)(vb+fi.Get_Diffuse_Offset())=Colors[i];
 			*(Vector2*)(vb+fi.Get_Tex_Offset(0))=UVCoordinates[i];
 			vb+=fi.Get_FVF_Size();
-		}		
+		}
 	}
 
 	DynamicIBAccessClass ib(BUFFER_TYPE_DYNAMIC_DX8,Indices.Count());
@@ -585,7 +584,7 @@ void Render2DClass::Render(void)
 		unsigned short *mem=Lock.Get_Index_Array();
 		for (int i=0; i<Indices.Count(); i++)
 			mem[i]=Indices[i];
-	}	
+	}
 
 	DX8Wrapper::Set_Vertex_Buffer(vb);
 	DX8Wrapper::Set_Index_Buffer(ib,0);
@@ -617,7 +616,7 @@ void Render2DClass::Render(void)
 	else
 		DX8Wrapper::Set_Shader(Shader);
 
-	DX8Wrapper::Draw_Triangles(0,Indices.Count()/3,0,Vertices.Count());	
+	DX8Wrapper::Draw_Triangles(0,Indices.Count()/3,0,Vertices.Count());
 //	SphereClass sphere(Vector3(0.0f,0.0f,0.0f),0.0f);
 //	SortingRendererClass::Insert_Triangles(sphere,0,Indices.Count()/3,0,Vertices.Count());
 
@@ -642,7 +641,7 @@ Render2DTextClass::Render2DTextClass(Font3DInstanceClass *font) :
 {
 	Set_Coordinate_Range( RectClass( -320, -240, 320, 240 ) );
 	Set_Font( font );
-	
+
 	Reset();
 }
 
@@ -684,7 +683,7 @@ void	Render2DTextClass::Draw_Char( WCHAR ch, unsigned long color )
 {
 	float char_spacing	= Font->Char_Spacing( ch );
 	float char_height		= Font->Char_Height();
-	
+
 	//
 	//	Check to see if this character is clipped
 	//
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h
index 12af44aad91..a9bf9a51693 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef RENDER2D_H
-#define RENDER2D_H
 
 #include "always.h"
 #include "simplevec.h"
@@ -115,7 +109,7 @@ class Render2DClass : public W3DMPO
 	void	Enable_Alpha(bool b);
 	void	Enable_Grayscale(bool b);///<added for generals to draw disabled button states - MW
 	void  Enable_Texturing(bool b);
-	
+
 	ShaderClass *			Get_Shader( void ) { return &Shader; }
 	static ShaderClass	Get_Default_Shader( void );
 
@@ -148,7 +142,7 @@ class Render2DClass : public W3DMPO
 	// Z-value support (this is usefull for playing tricks with the z-buffer)
 	void	Set_Z_Value (float z_value)	{ ZValue = z_value; }
 
-	// Move all verts 
+	// Move all verts
 	void	Move( const Vector2 & a );
 
 	// Color access
@@ -204,7 +198,7 @@ class Render2DTextClass : public Render2DClass {
 
 	void	Set_Location( const Vector2 & loc )				{ Location = loc; Cursor = loc; }
 	void	Set_Wrapping_Width (float width)					{ WrapWidth = width; }
-	
+
 	// Clipping support
 	void	Set_Clipping_Rect( const RectClass &rect )	{ ClipRect = rect; IsClippedEnabled = true; }
 	bool	Is_Clipping_Enabled( void ) const				{ return IsClippedEnabled; }
@@ -234,5 +228,3 @@ class Render2DTextClass : public Render2DClass {
 
 	void	Draw_Char( WCHAR ch, unsigned long color );
 };
-
-#endif	// RENDER2D_H
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp
index 6128893f955..cea7f87bceb 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp
@@ -46,7 +46,7 @@
 **
 ***********************************************************************************************/
 RenderInfoClass::RenderInfoClass(CameraClass & cam) :
-	Camera(cam), 
+	Camera(cam),
 	fog_start(0.0f),
 	fog_end(0.0f),
 	fog_scale(0.0f),
@@ -58,7 +58,7 @@ RenderInfoClass::RenderInfoClass(CameraClass & cam) :
 	alphaOverride(1.0f),
 	materialPassAlphaOverride(1.0f),
 	materialPassEmissiveOverride(1.0f)
-{ 
+{
 	// Need to have one entry in the override flags stack, initialize it to default values.
 	OverrideFlag[OverrideFlagLevel]=RINFO_OVERRIDE_DEFAULT;
 }
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h
index 7cbd8c1f092..ac582df4c22 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                   Org Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 16                                                          $*
@@ -37,21 +37,14 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef RINFO_H
-#define RINFO_H
-
 
 #include "always.h"
 #include "bittype.h"
 #include "ww3d.h"
 #include "wwdebug.h"
 #include "shader.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "matrix3d.h"
 #include "matrix4.h"
 
@@ -119,31 +112,31 @@ class RenderInfoClass
 
 };
 
-	
+
 /**
 ** SpecialRenderInfoClass
 ** This structure also contains a "grab-bag" of junk for use by the Special_Render
-** function.  The first use that I have for Special_Render is to implement the 
+** function.  The first use that I have for Special_Render is to implement the
 ** visibility detection algorithm where each object is rendered in such a way
 ** that I can get the 'id' of the object which generated each pixel on the screen.
 ** Another use I have planned for Special_Render is a shadow rendering mode that
-** just draws an object in solid black from the point of view of a light source. 
+** just draws an object in solid black from the point of view of a light source.
 ** This would just need another enum for the RenderType...
-** 
+**
 ** The reason for a Special_Render function is that I didn't want to pollute
 ** the main rendering pipeline with checks for these alternate rendering operations.
-*/	
+*/
 class SpecialRenderInfoClass : public RenderInfoClass
-{	
+{
 
-public:	
+public:
 	SpecialRenderInfoClass(CameraClass & cam,int render_type);
 	~SpecialRenderInfoClass(void);
 
 	// The following fields are only used by the Special_Render function.
 	// this is basically just a place to stick whatever information you need.
-	enum 
-	{ 
+	enum
+	{
 		RENDER_VIS,
 		RENDER_SHADOW
 	};
@@ -163,7 +156,3 @@ class SpecialRenderInfoClass : public RenderInfoClass
 	SpecialRenderInfoClass & operator = (const RenderInfoClass &);
 
 };
-
-
-
-#endif
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp
index b3f5e4c333a..62c73f0488a 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp
@@ -72,7 +72,7 @@
 /*
 ** Chunk ID's used by SceneClass
 */
-enum 
+enum
 {
 	SCENECLASS_CHUNK_VARIABLES			= 0x00042300,
 
@@ -87,7 +87,7 @@ enum
 /*
 ** SimpleSceneIterator
 ** This iterator is used by the SimpleSceneClass to allow
-** the user to iterate through its render objects. 
+** the user to iterate through its render objects.
 */
 class SimpleSceneIterator : public SceneIterator
 {
@@ -101,8 +101,8 @@ class SimpleSceneIterator : public SceneIterator
 
 	SimpleSceneIterator(RefRenderObjListClass * renderlist,bool onlyvis);
 
-	RefRenderObjListIterator	RobjIterator;	
-	SimpleSceneClass *			Scene;	
+	RefRenderObjListIterator	RobjIterator;
+	SimpleSceneClass *			Scene;
 	bool								OnlyVis;
 
 	friend class SimpleSceneClass;
@@ -121,7 +121,7 @@ class SimpleSceneIterator : public SceneIterator
  * HISTORY:                                                                                    *
  *   12/10/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-SceneClass::SceneClass(void) : 
+SceneClass::SceneClass(void) :
 	AmbientLight(0.5f,0.5f,0.5f),
 	PolyRenderMode(FILL),
 	ExtraPassPolyRenderMode(EXTRA_PASS_DISABLE),
@@ -179,7 +179,7 @@ void SceneClass::Add_Render_Object(RenderObjClass * obj)
  * the object...                                                                               *
  *                                                                                             *
  * INPUT:                                                                                      *
- * obj - pointer to the object to remove                                                       * 
+ * obj - pointer to the object to remove                                                       *
  *                                                                                             *
  * OUTPUT:                                                                                     *
  *                                                                                             *
@@ -277,7 +277,7 @@ void SceneClass::Load(ChunkLoadClass & cload)
 {
 	cload.Open_Chunk();
 	if (cload.Cur_Chunk_ID() == SCENECLASS_CHUNK_VARIABLES) {
-		
+
 		while (cload.Open_Micro_Chunk()) {
 			switch(cload.Cur_Micro_Chunk_ID()) {
 				READ_MICRO_CHUNK(cload,SCENECLASS_VARIABLE_AMBIENTLIGHT,AmbientLight);
@@ -291,7 +291,7 @@ void SceneClass::Load(ChunkLoadClass & cload)
 		}
 
 	} else {
-		WWDEBUG_SAY(("Unhandled Chunk: 0x%X in file: %s line: %d\r\n",cload.Cur_Chunk_ID(),__FILE__,__LINE__));
+		WWDEBUG_SAY(("Unhandled Chunk: 0x%X in file: %s line: %d",cload.Cur_Chunk_ID(),__FILE__,__LINE__));
 	}
 	cload.Close_Chunk();
 }
@@ -400,14 +400,14 @@ void SimpleSceneClass::Remove_Render_Object(RenderObjClass * obj)
 void SimpleSceneClass::Register(RenderObjClass * obj,RegType for_what)
 {
 	switch (for_what) {
-		case ON_FRAME_UPDATE:	
-			UpdateList.Add(obj);			
+		case ON_FRAME_UPDATE:
+			UpdateList.Add(obj);
 			break;
-		case LIGHT:	
-			LightList.Add(obj);	
+		case LIGHT:
+			LightList.Add(obj);
 			break;
-		case RELEASE:				
-			ReleaseList.Add(obj);		
+		case RELEASE:
+			ReleaseList.Add(obj);
 			break;
 	};
 }
@@ -415,14 +415,14 @@ void SimpleSceneClass::Register(RenderObjClass * obj,RegType for_what)
 void SimpleSceneClass::Unregister(RenderObjClass * obj,RegType for_what)
 {
 	switch (for_what) {
-		case ON_FRAME_UPDATE:	
-			UpdateList.Remove(obj);			
+		case ON_FRAME_UPDATE:
+			UpdateList.Remove(obj);
 			break;
-		case LIGHT:	
-			LightList.Remove(obj);	
+		case LIGHT:
+			LightList.Remove(obj);
 			break;
-		case RELEASE:				
-			ReleaseList.Remove(obj);		
+		case RELEASE:
+			ReleaseList.Remove(obj);
 			break;
 	}
 }
@@ -484,7 +484,7 @@ void SimpleSceneClass::Visibility_Check(CameraClass * camera)
  *   6/13/2001  gth : Created.                                                                 *
  *=============================================================================================*/
 float SimpleSceneClass::Compute_Point_Visibility
-(	
+(
 	RenderInfoClass & rinfo,
 	const Vector3 & point
 )
@@ -522,7 +522,7 @@ float SimpleSceneClass::Compute_Point_Visibility
  *   12/10/98   GTH : Created.                                                                 *
  *=============================================================================================*/
 void SimpleSceneClass::Customized_Render(RenderInfoClass & rinfo)
-{	
+{
 //	SceneClass::Render(rinfo);
 
    // If visibility has not been checked for this scene since the last
@@ -532,9 +532,9 @@ void SimpleSceneClass::Customized_Render(RenderInfoClass & rinfo)
       // set the visibility bit in all render objects in all layers.
 	   Visibility_Check(&rinfo.Camera);
    }
-   Visibility_Checked = false;	
-	
-	RefRenderObjListIterator it(&UpdateList);	
+   Visibility_Checked = false;
+
+	RefRenderObjListIterator it(&UpdateList);
 
 	// allow all objects in the update list to do their "every frame" processing
 	for (it.First(); !it.Is_Done(); it.Next()) {
@@ -551,14 +551,14 @@ void SimpleSceneClass::Customized_Render(RenderInfoClass & rinfo)
 	DX8Wrapper::Set_Light(2,NULL);
 	DX8Wrapper::Set_Light(3,NULL);
 	for (it.First(&LightList); !it.Is_Done(); it.Next())
-	{		
+	{
 		if (count<4)
 		{
 			DX8Wrapper::Set_Light(count,*(LightClass*)it.Peek_Obj());
 		} else
 		{
 			// Simple scene only supports 4 global lights
-			WWDEBUG_SAY(("Light %d ignored\n",count));
+			WWDEBUG_SAY(("Light %d ignored",count));
 		}
 		count++;
 	}
@@ -580,7 +580,7 @@ void SimpleSceneClass::Post_Render_Processing(RenderInfoClass& rinfo)
 {
 	// process the 'Release' list.  These are objects that have notified us that they
 	// want to be released.  We have to walk this list twice, first un-linking the
-	// object from the scene or its container.  And then removing them all from 
+	// object from the scene or its container.  And then removing them all from
 	// the list.  (this last removal will destroy any auto-created objects)
 	RefRenderObjListIterator it(&ReleaseList);
 	for (it.First(&ReleaseList); !it.Is_Done(); it.Next()) {
@@ -634,7 +634,7 @@ void SimpleSceneClass::Destroy_Iterator(SceneIterator * it)
 }
 
 
-SimpleSceneIterator::SimpleSceneIterator(RefRenderObjListClass * list,bool onlyvis) : 
+SimpleSceneIterator::SimpleSceneIterator(RefRenderObjListClass * list,bool onlyvis) :
 	RobjIterator(list)
 {
 	// TODO: make SimpleSceneIterator able to iterate through only the visible nodes.
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h
index d8737aa8e08..c90d8272303 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h
@@ -34,16 +34,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SCENE_H
-#define SCENE_H
 
 #include "always.h"
-#include "refcount.h"
 #include "vector3.h"
 #include "robjlist.h"
 #include "wwdebug.h"
@@ -83,7 +76,7 @@ class SceneIterator
 **   to surrender when asked in the Render method.
 ** - The ability to add and remove render objects from the scene
 ** - The ability to create an iterator for the user which uses the
-**   SceneIterator interface and allows the user to iterate through 
+**   SceneIterator interface and allows the user to iterate through
 **   all render objects or visible render objects in the scene.
 **
 ** The "registration" interface is used by certain render objects to enable
@@ -185,7 +178,7 @@ class SceneClass : public RefCountClass
 
 protected:
 	virtual void	Render(RenderInfoClass & rinfo);	//Made virtual so we can override -MW
-	
+
 	Vector3						AmbientLight;
 	PolyRenderType				PolyRenderMode;
 	ExtraPassPolyRenderType	ExtraPassPolyRenderMode;
@@ -251,19 +244,17 @@ class SimpleSceneClass : public SceneClass
 																		const Vector3 & point);
 
 protected:
-	
+
    // Has a visibility check been performed since scene was last rendered?
    bool Visibility_Checked;
 
 	RefRenderObjListClass	RenderList;
 	RefRenderObjListClass	UpdateList;
 	RefRenderObjListClass	LightList;
-	RefRenderObjListClass	ReleaseList;	
+	RefRenderObjListClass	ReleaseList;
 
 	friend class SimpleSceneIterator;
 
 	virtual void Customized_Render(RenderInfoClass & rinfo);
 	virtual void Post_Render_Processing(RenderInfoClass& rinfo);
 };
-
-#endif
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp
index 5fbd20fe188..809a7d2660a 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp
@@ -274,7 +274,7 @@ void ShaderClass::Init_From_Material3(const W3dMaterial3Struct & mat3)
  * WARNINGS:                                                                                   *
  *                                                                                             *
  * HISTORY:																												  *
- *		05/02/00    IML : Created.																					  *	
+ *		05/02/00    IML : Created.																					  *
  *=============================================================================================*/
 
 void ShaderClass::Enable_Fog (const char *source)
@@ -287,12 +287,12 @@ void ShaderClass::Enable_Fog (const char *source)
 				Set_Fog_Func (ShaderClass::FOG_WHITE);
 			} else {
 				Report_Unable_To_Fog (source);
-			}	
+			}
 			break;
 
 		case ShaderClass::SRCBLEND_ONE:
 			switch (Get_Dst_Blend_Func()) {
-				
+
 				case ShaderClass::DSTBLEND_ZERO:							// Opaque.
 					Set_Fog_Func (ShaderClass::FOG_ENABLE);
 					break;
@@ -313,7 +313,7 @@ void ShaderClass::Enable_Fog (const char *source)
 				Set_Fog_Func (ShaderClass::FOG_ENABLE);
 			} else {
 				Report_Unable_To_Fog (source);
-			}	
+			}
 			break;
 
 		case ShaderClass::SRCBLEND_ONE_MINUS_SRC_ALPHA:
@@ -321,14 +321,14 @@ void ShaderClass::Enable_Fog (const char *source)
 				Set_Fog_Func (ShaderClass::FOG_ENABLE);
 			} else {
 				Report_Unable_To_Fog (source);
-			}	
+			}
 			break;
 	}
 }
 
 
 /***********************************************************************************************
- * ShaderClass::Report_Unable_To_Fog --																		  *	
+ * ShaderClass::Report_Unable_To_Fog --																		  *
  *                                                                                             *
  * INPUT:                                                                                      *
  *                                                                                             *
@@ -337,15 +337,15 @@ void ShaderClass::Enable_Fog (const char *source)
  * WARNINGS:                                                                                   *
  *                                                                                             *
  * HISTORY:																												  *
- *		10/04/00    IML : Created.																					  *	
+ *		10/04/00    IML : Created.																					  *
  *=============================================================================================*/
 void ShaderClass::Report_Unable_To_Fog (const char *source)
 {
 	#ifdef WWDEBUG
 	static unsigned _reportcount = 0;
 
-	const char		*unabletofogtext		= "WARNING: Unable to fog shader in %s with given blending mode.\r\n";
-	const char		*unabletofogmoretext = "WARNING: Unable to fog additional shaders (further warnings will be suppressed).\r\n";
+	const char		*unabletofogtext		= "WARNING: Unable to fog shader in %s with given blending mode.";
+	const char		*unabletofogmoretext = "WARNING: Unable to fog additional shaders (further warnings will be suppressed).";
 	const unsigned  maxreportcount		= 10;
 
 	// Limit the no. of warning messages to some practical maximum. Suppress all subsequent warnings.
@@ -375,7 +375,7 @@ class Blend
 	bool		useAlpha;
 };
 
-const Blend srcBlendLUT[ShaderClass::SRCBLEND_MAX] = 
+const Blend srcBlendLUT[ShaderClass::SRCBLEND_MAX] =
 {
 	Blend(D3DBLEND_ZERO, false),
 	Blend(D3DBLEND_ONE, false),
@@ -383,7 +383,7 @@ const Blend srcBlendLUT[ShaderClass::SRCBLEND_MAX] =
  	Blend(D3DBLEND_DESTCOLOR, true)
 };
 
-const Blend dstBlendLUT[ShaderClass::DSTBLEND_MAX] = 
+const Blend dstBlendLUT[ShaderClass::DSTBLEND_MAX] =
 {
 	Blend(D3DBLEND_ZERO, false),
 	Blend(D3DBLEND_ONE, false),
@@ -467,7 +467,7 @@ void ShaderClass::Apply()
 		if(Get_Alpha_Test() == ShaderClass::ALPHATEST_ENABLE)
 		{
 			unsigned char alphareference = 0x60;	// Alpha reference value that produces best results with mip-mapped textures.
-			
+
 			if(sf == D3DBLEND_INVSRCALPHA)
 			{
 				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHAREF,0xff - alphareference);
@@ -496,14 +496,14 @@ void ShaderClass::Apply()
 
 			BOOL fm = FALSE;
 			D3DCOLOR fogColor = DX8Wrapper::Get_Fog_Color();
-			
+
 			switch(Get_Fog_Func())
 			{
 			case ShaderClass::FOG_ENABLE:
 				fm = TRUE;
 				break;
 			case ShaderClass::FOG_SCALE_FRAGMENT:
-				fogColor = 0;	
+				fogColor = 0;
 				fm = TRUE;
 				break;
 			case ShaderClass::FOG_WHITE:
@@ -525,19 +525,19 @@ void ShaderClass::Apply()
 		} else {
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_FOGENABLE,FALSE);
 		}
-		
+
 		diff &= ~(ShaderClass::MASK_FOG);
 		if(!diff)
 			return;
 	}
 
 	// Defaults
-	
+
 	D3DTEXTUREOP	PricOp	= D3DTOP_SELECTARG1;
 	DWORD				PricArg1 = D3DTA_DIFFUSE;
 	DWORD				PricArg2 = D3DTA_DIFFUSE;
 
-	D3DTEXTUREOP	PriaOp	 = D3DTOP_SELECTARG1;	
+	D3DTEXTUREOP	PriaOp	 = D3DTOP_SELECTARG1;
 	DWORD			PriaArg1 = D3DTA_DIFFUSE;
 	DWORD			PriaArg2 = D3DTA_DIFFUSE;
 
@@ -579,7 +579,7 @@ void ShaderClass::Apply()
 				PriaArg2 = D3DTA_DIFFUSE;
 				break;
 			case ShaderClass::GRADIENT_ADD:
-				if(!(TextureOpCaps & D3DTEXOPCAPS_ADD))	
+				if(!(TextureOpCaps & D3DTEXOPCAPS_ADD))
 					PricOp = D3DTOP_MODULATE;
 				else
 					PricOp = D3DTOP_ADD;
@@ -615,17 +615,17 @@ void ShaderClass::Apply()
 				}
 				break;
 
-			// Bump map is a hack currently as we only have two stages in use!
-			case ShaderClass::GRADIENT_DOTPRODUCT3:
-				if(TextureOpCaps & D3DTEXOPCAPS_DOTPRODUCT3)
-				{
-					PricOp = D3DTOP_DOTPRODUCT3;
-					PricArg1 = D3DTA_TEXTURE;
-					PricArg2 = D3DTA_DIFFUSE;
-					PriaOp = D3DTOP_DISABLE;
-					PriaArg1 = D3DTA_TEXTURE;
-					PriaArg2 = D3DTA_CURRENT;
-				}
+			case ShaderClass::GRADIENT_MODULATE2X:
+				//Modulate Alpha
+				if(!(TextureOpCaps & D3DTOP_MODULATE2X))
+					PricOp = D3DTOP_MODULATE;
+				else
+					PricOp = D3DTOP_MODULATE2X;
+				PricArg1 = D3DTA_TEXTURE;
+				PricArg2 = D3DTA_DIFFUSE;
+				PriaOp = D3DTOP_MODULATE;
+				PriaArg1 = D3DTA_TEXTURE;
+				PriaArg2 = D3DTA_DIFFUSE;
 				break;
 			}
 		}
@@ -835,7 +835,7 @@ void ShaderClass::Apply()
 	}
 
 	// Enable/disable alpha test
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHATESTENABLE,BOOL(Get_Alpha_Test()));	
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHATESTENABLE,BOOL(Get_Alpha_Test()));
 
 	// Enable/disable stencil test
 	// Not supported yet
@@ -999,7 +999,7 @@ const StringClass& ShaderClass::Get_Description(StringClass& str) const
 	case GRADIENT_ADD: str+="GRADIENT_ADD | "; break;
 	case GRADIENT_BUMPENVMAP: str+="GRADIENT_BUMPENVMAP | "; break;
 	case GRADIENT_BUMPENVMAPLUMINANCE: str+="GRADIENT_BUMPENVMAPLUMINANCE | "; break;
-	case GRADIENT_DOTPRODUCT3: str+="GRADIENT_DOTPRODUCT3 | "; break;
+	case GRADIENT_MODULATE2X: str+="GRADIENT_MODULATE2X | "; break;
 	}
 
 	switch (Get_Secondary_Gradient()) {
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h
index 1094589adf7..e3c1d7ec013 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h
@@ -34,20 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SHADER_H
-#define SHADER_H
 
 #include "always.h"
 
-#if defined (SR_OS_SOLARIS)
-#undef PASS_MAX
-#endif
-
 class DX8Wrapper;
 struct W3dMaterial3Struct;
 class StringClass;
@@ -90,12 +80,11 @@ class ShaderClass
 
 	void	Apply();
 public:
-	
+
 	enum AlphaTestType
 	{
 		ALPHATEST_DISABLE= 0,// disable alpha testing (default)
 		ALPHATEST_ENABLE,		// enable alpha testing
-		ALPHATEST_MAX			// end of enumeration
 	};
 
 	enum DepthCompareType
@@ -104,25 +93,22 @@ class ShaderClass
 		PASS_LESS,        	// pass if incoming less than stored
 		PASS_EQUAL,        	// pass if incoming equal to stored
 		PASS_LEQUAL,			// pass if incoming less than or equal to stored (default)
-		PASS_GREATER,        // pass if incoming greater than stored	
+		PASS_GREATER,        // pass if incoming greater than stored
 		PASS_NOTEQUAL,       // pass if incoming not equal to stored
 		PASS_GEQUAL,			// pass if incoming greater than or equal to stored
 		PASS_ALWAYS,			// pass always
-		PASS_MAX					// end of enumeration
 	};
 
 	enum DepthMaskType
 	{
-		DEPTH_WRITE_DISABLE=0,	// disable depth buffer writes 
+		DEPTH_WRITE_DISABLE=0,	// disable depth buffer writes
 		DEPTH_WRITE_ENABLE,		// enable depth buffer writes		(default)
-		DEPTH_WRITE_MAX			// end of enumeration
 	};
 
 	enum ColorMaskType
 	{
-		COLOR_WRITE_DISABLE=0,	// disable color buffer writes 
+		COLOR_WRITE_DISABLE=0,	// disable color buffer writes
 		COLOR_WRITE_ENABLE,		// enable color buffer writes		(default)
-		COLOR_WRITE_MAX			// end of enumeration
 	};
 
  	enum DetailAlphaFuncType
@@ -131,7 +117,6 @@ class ShaderClass
 		DETAILALPHA_DETAIL,		// other
 		DETAILALPHA_SCALE,		// local * other
 		DETAILALPHA_INVSCALE,	// ~(~local * ~other) = local + (1-local)*other
-		DETAILALPHA_MAX			// end of enumeration
 	};
 
 	enum DetailColorFuncType
@@ -145,22 +130,18 @@ class ShaderClass
 		DETAILCOLOR_SUBR,				// 0110	other - local
 		DETAILCOLOR_BLEND,			// 0111	(localAlpha)*local + (~localAlpha)*other
 		DETAILCOLOR_DETAILBLEND,	//	1000	(otherAlpha)*local + (~otherAlpha)*other
-
-		DETAILCOLOR_MAX				//			end of enumeration
 	};
 
 	enum CullModeType
 	{
 		CULL_MODE_DISABLE=0,
 		CULL_MODE_ENABLE,
-		CULL_MODE_MAX
 	};
 
 	enum NPatchEnableType
 	{
 		NPATCH_DISABLE=0,
 		NPATCH_ENABLE,
-		NPATCH_TYPE_MAX
 	};
 
   	enum DstBlendFuncType
@@ -171,7 +152,8 @@ class ShaderClass
  		DSTBLEND_ONE_MINUS_SRC_COLOR,	// destination pixel multiplied by one minus (i.e. inverse) fragment RGB components
  		DSTBLEND_SRC_ALPHA,        	// destination pixel multiplied by fragment alpha component
  		DSTBLEND_ONE_MINUS_SRC_ALPHA, // destination pixel multiplied by fragment inverse alpha
-		DSTBLEND_MAX						// end of enumeration
+
+		DSTBLEND_MAX
   	};
 
 	enum FogFuncType
@@ -180,41 +162,38 @@ class ShaderClass
  		FOG_ENABLE,        	// apply fog, f*fogColor + (1-f)*fragment
  		FOG_SCALE_FRAGMENT,  // fog scalar value multiplies fragment, (1-f)*fragment
  		FOG_WHITE,				// fog scalar value replaces fragment, f*fogColor
-		FOG_MAX					// end of enumeration
  	};
 
  	enum PriGradientType
  	{
- 		GRADIENT_DISABLE=0,  //	000	disable primary gradient (same as OpenGL 'decal' texture blend)
-		GRADIENT_MODULATE,   //	001	modulate fragment ARGB by gradient ARGB (default)
-		GRADIENT_ADD,        //	010	add gradient RGB to fragment RGB, copy gradient A to fragment A
-		GRADIENT_BUMPENVMAP,	// 011
-		GRADIENT_BUMPENVMAPLUMINANCE,	// 100
-		GRADIENT_DOTPRODUCT3,	// 101
-		GRADIENT_MAX			// end of enumeration
+ 		GRADIENT_DISABLE=0,				//	000	disable primary gradient (same as OpenGL 'decal' texture blend)
+		GRADIENT_MODULATE,				//	001	modulate fragment ARGB by gradient ARGB (default)
+		GRADIENT_ADD,						//	010	add gradient RGB to fragment RGB, copy gradient A to fragment A
+		GRADIENT_BUMPENVMAP,				// 011	environment-mapped bump mapping
+		GRADIENT_BUMPENVMAPLUMINANCE,	// 100	environment-mapped bump mapping with luminance control
+		GRADIENT_MODULATE2X,				// 101	modulate fragment ARGB by gradient ARGB and multiply RGB by 2
  	};
 
 	enum SecGradientType
 	{
 		SECONDARY_GRADIENT_DISABLE=0,	// don't draw secondary gradient (default)
-		SECONDARY_GRADIENT_ENABLE,    // add secondary gradient RGB to fragment RGB 
-		SECONDARY_GRADIENT_MAX			// end of enumeration
+		SECONDARY_GRADIENT_ENABLE,    // add secondary gradient RGB to fragment RGB
 	};
 
-	enum SrcBlendFuncType	
+	enum SrcBlendFuncType
   	{
   		SRCBLEND_ZERO=0,						// fragment not added to color buffer
   		SRCBLEND_ONE,							// fragment added unmodified to color buffer (default)
  		SRCBLEND_SRC_ALPHA,					// fragment RGB components multiplied by fragment A
  		SRCBLEND_ONE_MINUS_SRC_ALPHA,		// fragment RGB components multiplied by fragment inverse (one minus) A
-		SRCBLEND_MAX							// end of enumeration
+
+		SRCBLEND_MAX
   	};
 
 	enum TexturingType
 	{
 		TEXTURING_DISABLE=0, // no texturing (treat fragment initial color as 1,1,1,1)
 		TEXTURING_ENABLE,    // enable texturing
-		TEXTURING_MAX			// end of enumeration
 	};
 
 	enum StaticSortCategoryType
@@ -225,7 +204,7 @@ class ShaderClass
 		SSCAT_OTHER
 	};
 
-	enum														
+	enum
 	{
 		MASK_DEPTHCOMPARE			= (7<<0),			// mask for depth comparison setting
 		MASK_DEPTHMASK				= (1<<3),			// mask for depth mask setting
@@ -255,10 +234,10 @@ class ShaderClass
 	bool operator == (const ShaderClass & s) { return ShaderBits == s.ShaderBits; }
 	bool operator != (const ShaderClass & s) { return ShaderBits != s.ShaderBits; }
 
-	inline unsigned int Get_Bits(void) const
+	unsigned int Get_Bits(void) const
 	{	return ShaderBits; }
 
-	inline int Uses_Alpha(void) const
+	int Uses_Alpha(void) const
 	{
 		// check if alpha test is enabled
 		if (Get_Alpha_Test() != ALPHATEST_DISABLE)
@@ -273,62 +252,62 @@ class ShaderClass
 		return (src == SRCBLEND_SRC_ALPHA || src == SRCBLEND_ONE_MINUS_SRC_ALPHA);
 	}
 
-	inline int	Uses_Fog(void) const
+	int	Uses_Fog(void) const
 	{
 		return (Get_Fog_Func() != FOG_DISABLE);
 	}
 
-	inline int	Uses_Primary_Gradient(void) const
+	int	Uses_Primary_Gradient(void) const
 	{
 		return (Get_Primary_Gradient() != GRADIENT_DISABLE);
 	}
 
-	inline int	Uses_Secondary_Gradient(void) const
+	int	Uses_Secondary_Gradient(void) const
 	{
 		return (Get_Secondary_Gradient() != SECONDARY_GRADIENT_DISABLE);
 	}
 
-	inline int	Uses_Texture(void) const
+	int	Uses_Texture(void) const
 	{ return (Get_Texturing() != TEXTURING_DISABLE); }
 
-	inline int	Uses_Post_Detail_Texture(void) const
+	int	Uses_Post_Detail_Texture(void) const
 	{
 		if (Get_Texturing() == TEXTURING_DISABLE)
 		return false;
 		return ((Get_Post_Detail_Color_Func() != DETAILCOLOR_DISABLE) || (Get_Post_Detail_Alpha_Func() != DETAILALPHA_DISABLE));
 	}
-	
+
 	inline void	Reset(void);
 
-	inline DepthCompareType		Get_Depth_Compare(void)	const								{ return (DepthCompareType)(ShaderBits&MASK_DEPTHCOMPARE>>SHIFT_DEPTHCOMPARE); }
-	inline DepthMaskType			Get_Depth_Mask(void) const									{ return (DepthMaskType)((ShaderBits&MASK_DEPTHMASK)>>SHIFT_DEPTHMASK); }
-	inline ColorMaskType			Get_Color_Mask(void) const									{ return (ColorMaskType)((ShaderBits&MASK_COLORMASK)>>SHIFT_COLORMASK); }
-	inline DetailAlphaFuncType	Get_Post_Detail_Alpha_Func(void) const					{ return (DetailAlphaFuncType)((ShaderBits&MASK_POSTDETAILALPHAFUNC)>>SHIFT_POSTDETAILALPHAFUNC); }
-	inline DetailColorFuncType	Get_Post_Detail_Color_Func(void) const					{ return (DetailColorFuncType)((ShaderBits&MASK_POSTDETAILCOLORFUNC)>>SHIFT_POSTDETAILCOLORFUNC); }
-	inline AlphaTestType			Get_Alpha_Test(void) const									{ return (AlphaTestType)((ShaderBits&MASK_ALPHATEST)>>SHIFT_ALPHATEST); }
-	inline CullModeType			Get_Cull_Mode(void) const									{ return (CullModeType)((ShaderBits&MASK_CULLMODE)>>SHIFT_CULLMODE); }
-	inline DstBlendFuncType		Get_Dst_Blend_Func(void) const							{ return (DstBlendFuncType)((ShaderBits&MASK_DSTBLEND)>>SHIFT_DSTBLEND); }
-	inline FogFuncType			Get_Fog_Func(void) const									{ return (FogFuncType)((ShaderBits&MASK_FOG)>>SHIFT_FOG); }
-	inline PriGradientType		Get_Primary_Gradient(void) const							{ return (PriGradientType)((ShaderBits&MASK_PRIGRADIENT)>>SHIFT_PRIGRADIENT); }
-	inline SecGradientType		Get_Secondary_Gradient(void) const						{ return (SecGradientType)((ShaderBits&MASK_SECGRADIENT)>>SHIFT_SECGRADIENT); }
-	inline SrcBlendFuncType		Get_Src_Blend_Func(void) const							{ return (SrcBlendFuncType)((ShaderBits&MASK_SRCBLEND)>>SHIFT_SRCBLEND); }
-	inline TexturingType			Get_Texturing(void) const									{ return (TexturingType)((ShaderBits&MASK_TEXTURING)>>SHIFT_TEXTURING); }
-	inline NPatchEnableType		Get_NPatch_Enable(void) const								{ return (NPatchEnableType)((ShaderBits&MASK_NPATCHENABLE)>>SHIFT_NPATCHENABLE); }
-
-	inline	void	Set_Depth_Compare(DepthCompareType x)					{ ShaderBits&=~MASK_DEPTHCOMPARE;ShaderBits|=(x<<SHIFT_DEPTHCOMPARE);	}
-	inline	void	Set_Depth_Mask(DepthMaskType x)							{ ShaderBits&=~MASK_DEPTHMASK; ShaderBits|=(x<<SHIFT_DEPTHMASK);	}
-	inline	void	Set_Color_Mask(ColorMaskType x)							{ ShaderBits&=~MASK_COLORMASK; ShaderBits|=(x<<SHIFT_COLORMASK);	}
-	inline	void	Set_Post_Detail_Alpha_Func(DetailAlphaFuncType x)	{ ShaderBits&=~MASK_POSTDETAILALPHAFUNC;ShaderBits|=(x<<SHIFT_POSTDETAILALPHAFUNC);	}
-	inline	void	Set_Post_Detail_Color_Func(DetailColorFuncType x)	{ ShaderBits&=~MASK_POSTDETAILCOLORFUNC;ShaderBits|=(x<<SHIFT_POSTDETAILCOLORFUNC);	}
-	inline	void	Set_Alpha_Test(AlphaTestType x)							{ ShaderBits&=~MASK_ALPHATEST; ShaderBits|=(x<<SHIFT_ALPHATEST);		}
-	inline	void	Set_Cull_Mode(CullModeType x)								{ ShaderBits&=~MASK_CULLMODE; ShaderBits|=(x<<SHIFT_CULLMODE);		}
-	inline	void	Set_Dst_Blend_Func(DstBlendFuncType x)					{ ShaderBits&=~MASK_DSTBLEND; ShaderBits|=(x<<SHIFT_DSTBLEND);		}
-	inline	void	Set_Fog_Func(FogFuncType x)								{ ShaderBits&=~MASK_FOG; ShaderBits|=(x<<SHIFT_FOG);			}
-	inline	void	Set_Primary_Gradient(PriGradientType x)				{ ShaderBits&=~MASK_PRIGRADIENT;ShaderBits|=(x<<SHIFT_PRIGRADIENT);	}
-	inline	void	Set_Secondary_Gradient(SecGradientType x)				{ ShaderBits&=~MASK_SECGRADIENT;ShaderBits|=(x<<SHIFT_SECGRADIENT);	}
-	inline	void	Set_Src_Blend_Func(SrcBlendFuncType x)					{ ShaderBits&=~MASK_SRCBLEND;ShaderBits|=(x<<SHIFT_SRCBLEND);		}
-	inline	void	Set_Texturing(TexturingType x)							{ ShaderBits&=~MASK_TEXTURING; ShaderBits|=(x<<SHIFT_TEXTURING);	}
-	inline	void	Set_NPatch_Enable(NPatchEnableType x)					{ ShaderBits&=~MASK_NPATCHENABLE; ShaderBits|=(x<<SHIFT_NPATCHENABLE);	}
+	DepthCompareType		Get_Depth_Compare(void)	const								{ return (DepthCompareType)(ShaderBits&MASK_DEPTHCOMPARE>>SHIFT_DEPTHCOMPARE); }
+	DepthMaskType			Get_Depth_Mask(void) const									{ return (DepthMaskType)((ShaderBits&MASK_DEPTHMASK)>>SHIFT_DEPTHMASK); }
+	ColorMaskType			Get_Color_Mask(void) const									{ return (ColorMaskType)((ShaderBits&MASK_COLORMASK)>>SHIFT_COLORMASK); }
+	DetailAlphaFuncType	Get_Post_Detail_Alpha_Func(void) const					{ return (DetailAlphaFuncType)((ShaderBits&MASK_POSTDETAILALPHAFUNC)>>SHIFT_POSTDETAILALPHAFUNC); }
+	DetailColorFuncType	Get_Post_Detail_Color_Func(void) const					{ return (DetailColorFuncType)((ShaderBits&MASK_POSTDETAILCOLORFUNC)>>SHIFT_POSTDETAILCOLORFUNC); }
+	AlphaTestType			Get_Alpha_Test(void) const									{ return (AlphaTestType)((ShaderBits&MASK_ALPHATEST)>>SHIFT_ALPHATEST); }
+	CullModeType			Get_Cull_Mode(void) const									{ return (CullModeType)((ShaderBits&MASK_CULLMODE)>>SHIFT_CULLMODE); }
+	DstBlendFuncType		Get_Dst_Blend_Func(void) const							{ return (DstBlendFuncType)((ShaderBits&MASK_DSTBLEND)>>SHIFT_DSTBLEND); }
+	FogFuncType			Get_Fog_Func(void) const									{ return (FogFuncType)((ShaderBits&MASK_FOG)>>SHIFT_FOG); }
+	PriGradientType		Get_Primary_Gradient(void) const							{ return (PriGradientType)((ShaderBits&MASK_PRIGRADIENT)>>SHIFT_PRIGRADIENT); }
+	SecGradientType		Get_Secondary_Gradient(void) const						{ return (SecGradientType)((ShaderBits&MASK_SECGRADIENT)>>SHIFT_SECGRADIENT); }
+	SrcBlendFuncType		Get_Src_Blend_Func(void) const							{ return (SrcBlendFuncType)((ShaderBits&MASK_SRCBLEND)>>SHIFT_SRCBLEND); }
+	TexturingType			Get_Texturing(void) const									{ return (TexturingType)((ShaderBits&MASK_TEXTURING)>>SHIFT_TEXTURING); }
+	NPatchEnableType		Get_NPatch_Enable(void) const								{ return (NPatchEnableType)((ShaderBits&MASK_NPATCHENABLE)>>SHIFT_NPATCHENABLE); }
+
+	void	Set_Depth_Compare(DepthCompareType x)					{ ShaderBits&=~MASK_DEPTHCOMPARE;ShaderBits|=(x<<SHIFT_DEPTHCOMPARE);	}
+	void	Set_Depth_Mask(DepthMaskType x)							{ ShaderBits&=~MASK_DEPTHMASK; ShaderBits|=(x<<SHIFT_DEPTHMASK);	}
+	void	Set_Color_Mask(ColorMaskType x)							{ ShaderBits&=~MASK_COLORMASK; ShaderBits|=(x<<SHIFT_COLORMASK);	}
+	void	Set_Post_Detail_Alpha_Func(DetailAlphaFuncType x)	{ ShaderBits&=~MASK_POSTDETAILALPHAFUNC;ShaderBits|=(x<<SHIFT_POSTDETAILALPHAFUNC);	}
+	void	Set_Post_Detail_Color_Func(DetailColorFuncType x)	{ ShaderBits&=~MASK_POSTDETAILCOLORFUNC;ShaderBits|=(x<<SHIFT_POSTDETAILCOLORFUNC);	}
+	void	Set_Alpha_Test(AlphaTestType x)							{ ShaderBits&=~MASK_ALPHATEST; ShaderBits|=(x<<SHIFT_ALPHATEST);		}
+	void	Set_Cull_Mode(CullModeType x)								{ ShaderBits&=~MASK_CULLMODE; ShaderBits|=(x<<SHIFT_CULLMODE);		}
+	void	Set_Dst_Blend_Func(DstBlendFuncType x)					{ ShaderBits&=~MASK_DSTBLEND; ShaderBits|=(x<<SHIFT_DSTBLEND);		}
+	void	Set_Fog_Func(FogFuncType x)								{ ShaderBits&=~MASK_FOG; ShaderBits|=(x<<SHIFT_FOG);			}
+	void	Set_Primary_Gradient(PriGradientType x)				{ ShaderBits&=~MASK_PRIGRADIENT;ShaderBits|=(x<<SHIFT_PRIGRADIENT);	}
+	void	Set_Secondary_Gradient(SecGradientType x)				{ ShaderBits&=~MASK_SECGRADIENT;ShaderBits|=(x<<SHIFT_SECGRADIENT);	}
+	void	Set_Src_Blend_Func(SrcBlendFuncType x)					{ ShaderBits&=~MASK_SRCBLEND;ShaderBits|=(x<<SHIFT_SRCBLEND);		}
+	void	Set_Texturing(TexturingType x)							{ ShaderBits&=~MASK_TEXTURING; ShaderBits|=(x<<SHIFT_TEXTURING);	}
+	void	Set_NPatch_Enable(NPatchEnableType x)					{ ShaderBits&=~MASK_NPATCHENABLE; ShaderBits|=(x<<SHIFT_NPATCHENABLE);	}
 
 	void	Init_From_Material3(const W3dMaterial3Struct & mat3);
 	void	Enable_Fog (const char *source);
@@ -338,13 +317,13 @@ class ShaderClass
 	int							Guess_Sort_Level(void) const;
 
 	// DX 8 state management routines
-	static inline void	Invalidate() { ShaderDirty=true; }
-	
+	static void	Invalidate() { ShaderDirty=true; }
+
 	// Global backface culling invert.  This interface can be used to globally invert all backface
-	// culling.  This is a global setting and will affect everything being rendered.  Typically it 
-	// should be left alone at the default setting.  Renegade uses this feature to render the entire 
-	// scene's backfacing polygons only; this is used in a VIS-debugging process.  In order for this 
-	// to work, you will have to ww3d::Flush all rendering before changing the setting back.  
+	// culling.  This is a global setting and will affect everything being rendered.  Typically it
+	// should be left alone at the default setting.  Renegade uses this feature to render the entire
+	// scene's backfacing polygons only; this is used in a VIS-debugging process.  In order for this
+	// to work, you will have to ww3d::Flush all rendering before changing the setting back.
 	// NORMAL USERS SHOULD NEVER CALL THESE FUNCTIONS!
 	static void				Invert_Backface_Culling(bool onoff);
 	static bool				Is_Backface_Culling_Inverted(void);
@@ -370,7 +349,7 @@ class ShaderClass
 
 	// Texturing, zbuffer, primary gradient, multiplicative blending
 	static ShaderClass _PresetMultiplicativeShader;
-	
+
 	// Texturing, no zbuffer reading/writing, no gradients, no blending, no
 	// fogging - mostly for opaque 2D objects.
 	static ShaderClass _PresetOpaque2DShader;
@@ -477,5 +456,3 @@ inline void ShaderClass::Reset()
 	Set_Post_Detail_Alpha_Func(DETAILALPHA_DISABLE);
 	Set_NPatch_Enable(NPATCH_DISABLE);
 }
-
-#endif //SHADER_H
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
index f8b0cf9a158..f17ba4de0d1 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
@@ -123,7 +123,7 @@ void QuickSort (
 	do {
 		do { i++; } while (i<r && keys[i]<v);
 		do { j--; } while (j>0 && keys[j]>v);
-		
+
 		WWASSERT(j>=0);
 		WWASSERT(i<=r);
 
@@ -137,7 +137,7 @@ void QuickSort (
 	keys[j]=keys[i];
 	keys[i]=keys[r];
 	keys[r]=t;
-	
+
 	if (i-1>l) QuickSort(array,keys,l,i-1);
 	if (r>i+1) QuickSort(array,keys,i+1,r);
 }
@@ -319,7 +319,7 @@ static ShortVectorIStruct* Get_Polygon_Index_Array(unsigned count)
 
 void SortingRendererClass::Insert_Triangles(
 	const SphereClass& bounding_sphere,
-	unsigned short start_index, 
+	unsigned short start_index,
 	unsigned short polygon_count,
 	unsigned short min_vertex_index,
 	unsigned short vertex_count)
@@ -357,10 +357,10 @@ void SortingRendererClass::Insert_Triangles(
 	D3DXVec3Transform(
 		&transformed_vec,
 		&vec,
-		&mtx); 
+		&mtx);
 	state->transformed_center=Vector3(transformed_vec[0],transformed_vec[1],transformed_vec[2]);
 
-	
+
 	/// @todo lorenzen sez use a bucket sort here... and stop copying so much data so many times
 
 	SortingNodeStruct* node=sorted_list.Head();
@@ -403,7 +403,7 @@ void SortingRendererClass::Insert_Triangles(
 // ----------------------------------------------------------------------------
 
 void SortingRendererClass::Insert_Triangles(
-	unsigned short start_index, 
+	unsigned short start_index,
 	unsigned short polygon_count,
 	unsigned short min_vertex_index,
 	unsigned short vertex_count)
@@ -424,7 +424,7 @@ void Release_Refs(SortingNodeStruct* state)
 	REF_PTR_RELEASE(state->sorting_state.vertex_buffer);
 	REF_PTR_RELEASE(state->sorting_state.index_buffer);
 	REF_PTR_RELEASE(state->sorting_state.material);
-	for (i=0;i<DX8Wrapper::Get_Current_Caps()->Get_Max_Textures_Per_Pass();++i) 
+	for (i=0;i<DX8Wrapper::Get_Current_Caps()->Get_Max_Textures_Per_Pass();++i)
 	{
 		REF_PTR_RELEASE(state->sorting_state.Textures[i]);
 	}
@@ -471,7 +471,7 @@ static void Apply_Render_State(RenderStateStruct& render_state)
 	if (render_state.Textures[6]) render_state.Textures[6]->Apply();
 	if (render_state.Textures[7]) render_state.Textures[7]->Apply();
 */
-	for (int i=0;i<DX8Wrapper::Get_Current_Caps()->Get_Max_Textures_Per_Pass();++i) 
+	for (int i=0;i<DX8Wrapper::Get_Current_Caps()->Get_Max_Textures_Per_Pass();++i)
 	{
 		DX8Wrapper::Set_Texture(i,render_state.Textures[i]);
 	}
@@ -518,7 +518,7 @@ void SortingRendererClass::Flush_Sorting_Pool()
 {
 	if (!overlapping_node_count) return;
 
-	SNAPSHOT_SAY(("SortingSystem - Flush \n"));
+	SNAPSHOT_SAY(("SortingSystem - Flush"));
 
 	unsigned node_id;
 	// Fill dynamic index buffer with sorting index buffer vertices
@@ -688,7 +688,7 @@ void SortingRendererClass::Flush_Sorting_Pool()
 	overlapping_polygon_count=0;
 	overlapping_vertex_count=0;
 
-	SNAPSHOT_SAY(("SortingSystem - Done flushing\n"));
+	SNAPSHOT_SAY(("SortingSystem - Done flushing"));
 
 }
 
@@ -703,7 +703,7 @@ void SortingRendererClass::Flush()
 
 	while (SortingNodeStruct* state=sorted_list.Head()) {
 		state->Remove();
-		
+
 		if ((state->sorting_state.index_buffer_type==BUFFER_TYPE_SORTING || state->sorting_state.index_buffer_type==BUFFER_TYPE_DYNAMIC_SORTING) &&
 			(state->sorting_state.vertex_buffer_type==BUFFER_TYPE_SORTING || state->sorting_state.vertex_buffer_type==BUFFER_TYPE_DYNAMIC_SORTING)) {
 			Insert_To_Sorting_Pool(state);
@@ -783,7 +783,7 @@ void SortingRendererClass::Deinit()
 
 void SortingRendererClass::Insert_VolumeParticle(
 	const SphereClass& bounding_sphere,
-	unsigned short start_index, 
+	unsigned short start_index,
 	unsigned short polygon_count,
 	unsigned short min_vertex_index,
 	unsigned short vertex_count,
@@ -823,14 +823,14 @@ void SortingRendererClass::Insert_VolumeParticle(
 	D3DXVec3Transform(
 		&transformed_vec,
 		&vec,
-		&mtx); 
+		&mtx);
 	state->transformed_center=Vector3(transformed_vec[0],transformed_vec[1],transformed_vec[2]);
 
 
 	// BUT WHAT IS THE DEAL WITH THE VERTCOUNT AND POLYCOUNT BEING N BUT TRANSFORMED CENTER COUNT == 1
 
 	//THE TRANSFORMED CENTER[2] IS THE ZBUFFER DEPTH
-	
+
 	/// @todo lorenzen sez use a bucket sort here... and stop copying so much data so many times
 
 	SortingNodeStruct* node=sorted_list.Head();
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h
index 72993c0a2ce..fec9b565c5b 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SORTING_RENDERER_H
-#define SORTING_RENDERER_H
 
 #include "always.h"
 
@@ -38,20 +33,20 @@ class SortingRendererClass
 public:
 	static void Insert_Triangles(
 		const SphereClass& bounding_sphere,
-		unsigned short start_index, 
+		unsigned short start_index,
 		unsigned short polygon_count,
 		unsigned short min_vertex_index,
 		unsigned short vertex_count);
 
 	static void Insert_Triangles(
-		unsigned short start_index, 
+		unsigned short start_index,
 		unsigned short polygon_count,
 		unsigned short min_vertex_index,
 		unsigned short vertex_count);
 
 	static void Insert_VolumeParticle(
 		const SphereClass& bounding_sphere,
-		unsigned short start_index, 
+		unsigned short start_index,
 		unsigned short polygon_count,
 		unsigned short min_vertex_index,
 		unsigned short vertex_count,
@@ -59,12 +54,9 @@ class SortingRendererClass
 
 	static void Flush();
 	static void Deinit();
-	
+
 	static void SetMinVertexBufferSize( unsigned val );
 
 	static void _Enable_Triangle_Draw(bool enable) { _EnableTriangleDraw=enable; }
 	static bool _Is_Triangle_Draw_Enabled() { return _EnableTriangleDraw; }
 };
-
-#endif
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.cpp
deleted file mode 100644
index ca510e310b0..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.cpp
+++ /dev/null
@@ -1,1356 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/texproject.cpp                         $*
- *                                                                                             *
- *              Original Author:: Greg Hjelstrom                                               *
- *                                                                                             *
- *                      $Author:: Jani_p                                                      $*
- *                                                                                             *
- *                     $Modtime:: 7/23/01 5:31p                                               $*
- *                                                                                             *
- *                    $Revision:: 15                                                          $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *   TexProjectClass::TexProjectClass -- Constructor                                           *
- *   TexProjectClass::~TexProjectClass -- Destructor                                           *
- *   TexProjectClass::Set_Texture_Size -- Set the size of texture to use                       *
- *   TexProjectClass::Get_Texture_Size -- Returns the stored texture size                      *
- *   TexProjectClass::Set_Flag -- Turn specified flag on or off                                *
- *   TexProjectClass::Get_Flag -- Get the current state of specified flag                      *
- *   TexProjectClass::Set_Intensity -- Set the intensity of this projector                     *
- *   TexProjectClass::Get_Intensity -- returns the current "desired" intensity                 *
- *   TexProjectClass::Set_Attenuation -- Set the attenuation factor                            *
- *   TexProjectClass::Get_Attenuation -- Returns the attenuation value                         *
- *   TexProjectClass::Enable_Attenuation -- Set the state of the ATTENUATE flag                *
- *   TexProjectClass::Is_Attenuation_Enabled -- Get the state of the ATTENUATE flag            *
- *   TexProjectClass::Is_Depth_Gradient_Enabled -- returns whether the depth gradient is enabl *
- *   TexProjectClass::Enable_Depth_Gradient -- enable/disable depth gradient                   *
- *   TexProjectClass::Init_Multiplicative -- Initialize this to be a multiplicative texture pr *
- *   TexProjectClass::Is_Intensity_Zero -- check if we can eliminate this projector            *
- *   TexProjectClass::Init_Additive -- Set up the projector to be additive                     *
- *   TexProjectClass::Set_Perspective_Projection -- Set up a perspective projection            *
- *   TexProjectClass::Set_Ortho_Projection -- Set up an orthographic projection                *
- *   TexProjectClass::Set_Texture -- Set the texture to be projected                           *
- *   TexProjectClass::Get_Texture -- Returns the texture being projected                       *
- *   TexProjectClass::Peek_Texture -- Returns the texture being projected                      *
- *   TexProjectClass::Peek_Material_Pass -- Returns the material pass object                   *
- *   TexProjectClass::Compute_Perspective_Projection -- Set up a perspective projection of an  *
- *   TexProjectClass::Compute_Perspective_Projection -- Set up a perspective projection of an  *
- *   TexProjectClass::Compute_Ortho_Projection -- Automatic Orthographic projection            *
- *   TexProjectClass::Compute_Ortho_Projection -- Automatic Orthographic projection            *
- *   TexProjectClass::Compute_Texture -- Generates texture by rendering an object              *
- *   TexProjectClass::Configure_Camera -- setup a camera to match this projector               *
- *   TexProjectClass::Pre_Render_Update -- Prepare the projector for rendering                 *
- *   TexProjectClass::Update_WS_Bounding_Volume -- Recalculate the world-space bounding box    *
- *   TexProjectClass::Get_Surface -- Returns pointer to the texture surface                    *
- *   TexProjectClass::Set_Render_Target -- Install a render target for this projector to use   *
- *   TexProjectClass::Needs_Render_Target -- returns wheter this projector needs a render targ *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-#include "texproject.h"
-#include "vertmaterial.h"
-#include "shader.h"
-#include "texture.h"
-#include "rendobj.h"
-#include "rinfo.h"
-#include "camera.h"
-#include "matpass.h"
-#include "bwrender.h"
-#include "assetmgr.h"
-#include "dx8wrapper.h"
-
-
-// DEBUG DEBUG
-#include "MPU.H"
-
-#define DEBUG_SHADOW_RENDERING					0
-#define DEFAULT_TEXTURE_SIZE						64
-
-const float INTENSITY_RATE_OF_CHANGE			= 1.0f;			// change in intensity per second
-
-
-/*
-** 
-** Shadow mapping:  from pre-projected view coordinates back to world space
-** then to shadow space
-**
-** (1) Vshadow = PShadow * Mwrld-shadow * Vwrld
-** 
-** (2) Vview = Mwrld-camera * Vwrld
-**
-** Using (2) to solve for Vwrld in terms of Vview
-**                -1
-** (3) Mwrld-camera  * Vview = Vwrld
-**
-** Substituting (3) into (1)
-**                                                   -1
-** (4) Vshadow = Pshadow * Mwrld-shadow * Mwrld-camera * Vview
-**
-** ---------------------------------------------------------------------------------
-** 
-** Shadow mapping: from pre-projected view space to world space, to shadow space, 
-** then projecting.
-** 
-** (1) Vshadow = Mwrld-shadow * Vwrld
-**
-** (2) Vview = Mwrld-camera * Vwrld
-**
-** solving (2) for Vwrld:
-**                -1
-** (3) Mwrld-camera * Vview = Vwrld
-**
-** substitute into (1)
-**                                         -1
-** (4) Vshadow = Mwrld-shadow * Mwrld-camera * Vview
-**
-** project shadow
-**                                                         -1
-** (5) Vproj-shadow = Pshadow * (Mwrld-shadow * Mwrld-camera ) * Vview
-**
-** aaah! same thing :-)
-**
-** ---------------------------------------------------------------------------------
-**
-** Shadow mapping:  from pre-projected view coordinates back to obj space
-** then to shadow space
-** 
-** (1) Vshadow = PShadow * Mwrld-shadow * Mobj-wrld * Vobj
-** 
-** (2) Vview = Mwrld-camera * Mobj-wrld * Vobj
-**             -1             -1
-** (3) Mobj-wrld * Mwrld-camera * Vview = Vobj
-**                                                            -1             -1
-** (4) Vshadow = PShadow * Mwrld-shadow * Mobj-wrld * Mobj-wrld * Mwrld-camera * Vview
-**                                                   -1
-** (5) Vshadow = PShadow * Mwrld-shadow * Mvrld-camera * Vview
-**
-**
-** Ideas:
-** - Use Texture Projectors to implement spot lights and stained glass windows
-** - Attenuate texture projections with distance from the projector
-** - Should be able to handle lots of pre-calculated static texture projectors.  They
-**   should cull well and we can pre-generate the textures. 
-**
-** Ideas maybe used in conjunction with texture projections:
-** - Light volumes: the problem is when the volume is cliped it looks funny, we can
-**   fill in the clipped face of a non-translucent object by rendering the backfaces
-** - Use the backface-fill to make the camera slicing through the commando look like
-**   its *really* slicing through the commando :-)
-** - The back-face-fill trick might be able to use el-cheapo screen mapping!
-**  
-*/
-
-
-
-/***********************************************************************************************
- * TexProjectClass::TexProjectClass -- Constructor                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-TexProjectClass::TexProjectClass(void) :
-	Flags(DEFAULT_FLAGS),
-	DesiredIntensity(1.0f),
-	Intensity(1.0f),
-	Attenuation(1.0f),
-	MaterialPass(NULL),
-	Mapper1(NULL),
-	RenderTarget(NULL),
-	HFov(90.0f),
-	VFov(90.0f),
-	XMin(-10.0f),
-	XMax(10.0f),
-	YMin(-10.0f),
-	YMax(10.0f),
-	ZNear(1.0f),
-	ZFar(1000.0f)
-{
-	// set a default texture size
-	Set_Texture_Size(DEFAULT_TEXTURE_SIZE);
-
-	// create a material pass class
-	MaterialPass = NEW_REF(MaterialPassClass,()); 
-	MaterialPass->Set_Cull_Volume(&WorldBoundingVolume);
-
-	// create a vertex material
-	VertexMaterialClass * vmtl = NEW_REF(VertexMaterialClass,());
-	WWASSERT(vmtl != NULL);
-	
-	// Plug our parent's mapper into our vertex material
-	// the mapper for stage1 will be allocated as needed
-	vmtl->Set_Mapper(Mapper);
-
-	MaterialPass->Set_Material(vmtl);
-	vmtl->Release_Ref();
-	vmtl = NULL;
-
-	// by default init our material pass to be multiplicative (shadow)
-	Init_Multiplicative();
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::~TexProjectClass -- Destructor                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-TexProjectClass::~TexProjectClass(void)
-{
-	REF_PTR_RELEASE(Mapper1);
-	REF_PTR_RELEASE(MaterialPass);
-	REF_PTR_RELEASE(RenderTarget);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Texture_Size -- Set the size of texture to use                         *
- *                                                                                             *
- *    This function stores the desired texture size in this TexProjectClass.  Note that        *
- *    this size is only used if you have the TexProjectClass generate a texture.               *
- *                                                                                             *
- * INPUT:                                                                                      *
- *    size - dimension of the texture in pixels                                                *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Texture_Size(int size)
-{
-	WWASSERT(size > 0);
-	WWASSERT(size <= 512);
-	Flags &= ~SIZE_MASK;
-	Flags |= (size << SIZE_SHIFT);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Get_Texture_Size -- Returns the stored texture size                        *
- *                                                                                             *
- *    Returns the size stored in the flags variable.  This can be different than the actual    *
- *    texture's size if you manually installed a texture.  This size is only used when         *
- *    automatically generating a texture as is the case when creating shadows.                 *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-int TexProjectClass::Get_Texture_Size(void)
-{
-	return (Flags & SIZE_MASK) >> SIZE_SHIFT;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Flag -- Turn specified flag on or off                                  *
- *                                                                                             *
- *    See the TexProjectClass header file for valid flags                                      *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Flag(uint32 flag,bool onoff)	
-{ 
-	if (onoff) { 
-		Flags |= flag; 
-	} else { 
-		Flags &= ~flag; 
-	} 
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Get_Flag -- Get the current state of specified flag                        *
- *                                                                                             *
- *    See the TexProjectClass header file for valid flags                                      *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Get_Flag(uint32 flag) const
-{ 
-	return (Flags & flag) == flag; 
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Intensity -- Set the intensity of this projector                       *
- *                                                                                             *
- *    The "intensity" is a value between 0 and 1.  At 0, the projector will have no effect     *
- *    At 1, the projector will be at its highest strength.  The intensity will automatically   *
- *    smoothly interpolate towards the value specified unless you use the immediate option.    *
- *                                                                                             *
- * INPUT:                                                                                      *
- * intensity - desired intensity, 0 <= intensity <= 1                                          *
- * immediate - should the intensity be immediately set to the desired value? (default = false) *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Intensity(float intensity,bool immediate)
-{
-	WWASSERT(intensity <= 1.0f);
-	WWASSERT(intensity >= 0.0f);
-	
-	DesiredIntensity = intensity;
-	if (immediate) {
-		Intensity = DesiredIntensity;
-	}
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Get_Intensity -- returns the current "desired" intensity                   *
- *                                                                                             *
- *    This will return the last value that was sent into this object through Set_Intensity.    *
- *    Note however that the actual intensity used in rendering may not have arrived at         *
- *    that value yet.                                                                          *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-float TexProjectClass::Get_Intensity(void)
-{
-	return DesiredIntensity;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Is_Intensity_Zero -- check if we can eliminate this projector              *
- *                                                                                             *
- *    Only returns true if the current intensity is zero AND the target intensity is zero      *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Is_Intensity_Zero(void)
-{
-	return ((Intensity == 0.0f) && (DesiredIntensity == 0.0f));
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Attenuation -- Set the attenuation factor                              *
- *                                                                                             *
- *    Attenuation scales the intensity.  I use attenuation to make shadows fade away as they   *
- *    get farther away from the light source or from the viewer.                               *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Attenuation(float attenuation)
-{
-	WWASSERT(attenuation >= 0.0f);
-	WWASSERT(attenuation <= 1.0f);
-	Attenuation = attenuation;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Get_Attenuation -- Returns the attenuation value                           *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-float TexProjectClass::Get_Attenuation(void)
-{
-	return Attenuation;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Enable_Attenuation -- Set the state of the ATTENUATE flag                  *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Enable_Attenuation(bool onoff)
-{
-	Set_Flag(ATTENUATE,onoff);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Is_Attenuation_Enabled -- Get the state of the ATTENUATE flag              *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Is_Attenuation_Enabled(void)
-{
-	return Get_Flag(ATTENUATE);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Enable_Depth_Gradient -- enable/disable depth gradient                     *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/25/2000  gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Enable_Depth_Gradient(bool onoff)
-{
-	Set_Flag(USE_DEPTH_GRADIENT,onoff);
-
-	// re-setup the shader settings
-	if (Get_Flag(ADDITIVE)) {
-		Init_Additive();
-	} else {
-		Init_Multiplicative();
-	}
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Is_Depth_Gradient_Enabled -- returns whether the depth gradient is enabled *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/25/2000  gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Is_Depth_Gradient_Enabled(bool onoff)
-{
-	return Get_Flag(USE_DEPTH_GRADIENT);
-}
-
-/***********************************************************************************************
- * TexProjectClass::Init_Multiplicative -- Initialize this to be a multiplicative texture proj *
- *                                                                                             *
- *    Set up the internal materials so that the texture is multiplied with whatever it is      *
- *    projected onto.                                                                          *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Init_Multiplicative(void)
-{	
-	Set_Flag(ADDITIVE,false);
-
-	/*
-	** Set up the shader
-	*/
-	static ShaderClass mult_shader(		SHADE_CNST(	ShaderClass::PASS_LEQUAL,						//depth_compare, 
-																	ShaderClass::DEPTH_WRITE_DISABLE,			//depth_mask, 
-																	ShaderClass::COLOR_WRITE_ENABLE,				//color_mask, 
-																	ShaderClass::SRCBLEND_ZERO,					//src_blend,
-																	ShaderClass::DSTBLEND_SRC_COLOR,				//dst_blend, 
-																	ShaderClass::FOG_DISABLE,						//fog, 
-																	ShaderClass::GRADIENT_ADD,						//pri_grad, 
-																	ShaderClass::SECONDARY_GRADIENT_DISABLE,	//sec_grad, 
-																	ShaderClass::TEXTURING_ENABLE,				//texture, 
-
-																	ShaderClass::ALPHATEST_DISABLE,				//alpha_test, 
-																	ShaderClass::CULL_MODE_ENABLE,				//cull mode
-																	0,														//post_det_color, 
-																	0) );													//post_det_alpha		
-
-	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) {
-		mult_shader.Enable_Fog ("TexProjectClass");
-	}
-
-	if (Get_Flag(USE_DEPTH_GRADIENT)) {
-		
-		/*
-		** enable multi-texturing
-		*/
-		mult_shader.Set_Post_Detail_Color_Func(ShaderClass::DETAILCOLOR_ADD);
-		
-		/*
-		** plug the gradient texture into the second stage
-		*/
-		TextureClass * grad_tex = WW3DAssetManager::Get_Instance()->Get_Texture("MultProjectorGradient.tga");
-		if (grad_tex) {
-			grad_tex->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-			grad_tex->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-			MaterialPass->Set_Texture(grad_tex,1);
-			grad_tex->Release_Ref();
-		} else {
-			WWDEBUG_SAY(("Could not find texture: MultProjectorGradient.tga!\n"));
-		}
-
-	} else {
-		
-		/*
-		** disable multi-texturing
-		*/
-		mult_shader.Set_Post_Detail_Color_Func(ShaderClass::DETAILCOLOR_DISABLE);
-
-		/*
-		** remove the texture from the second stage
-		*/
-		MaterialPass->Set_Texture(NULL,1);
-	}
-
-#if (DEBUG_SHADOW_RENDERING)
-	// invert the shader so we can see what polygons it is hitting
-	mult_shader.Set_Dst_Blend_Func(ShaderClass::DSTBLEND_ONE);
-	mult_shader.Set_Src_Blend_Func(ShaderClass::SRCBLEND_ONE);
-#endif
-
-	MaterialPass->Set_Shader(mult_shader);
-
-	/*
-	** Set up the Vertex Material parameters
-	*/
-	VertexMaterialClass * vmtl = MaterialPass->Peek_Material();
-	vmtl->Set_Ambient(0,0,0);
-	vmtl->Set_Diffuse(0,0,0);
-	vmtl->Set_Specular(0,0,0);
-	vmtl->Set_Emissive(0.0f,0.0f,0.0f);
-	vmtl->Set_Opacity(1.0f);
-	vmtl->Set_Lighting(true); // I need the emissive value to scale the intensity of the shadow
-
-	/*
-	** Set up some mapper settings related to depth gradient
-	*/
-	if (Get_Flag(USE_DEPTH_GRADIENT)) {
-		if (Mapper1 == NULL) {
-			Mapper1 = NEW_REF(MatrixMapperClass,(1));
-		}
-		Mapper1->Set_Type(MatrixMapperClass::DEPTH_GRADIENT);
-		vmtl->Set_Mapper(Mapper1,1);
-	} else {
-		vmtl->Set_Mapper(NULL,1);
-	}
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Init_Additive -- Set up the projector to be additive                       *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Init_Additive(void)
-{
-	Set_Flag(ADDITIVE,true);
-
-	/*
-	** Set up the shader
-	*/
-	static ShaderClass add_shader(		SHADE_CNST(	ShaderClass::PASS_LEQUAL,						//depth_compare, 
-																	ShaderClass::DEPTH_WRITE_DISABLE,			//depth_mask, 
-																	ShaderClass::COLOR_WRITE_ENABLE,				//color_mask, 
-																	ShaderClass::SRCBLEND_ONE,						//src_blend,
-																	ShaderClass::DSTBLEND_ONE,						//dst_blend, 
-																	ShaderClass::FOG_DISABLE,						//fog,
-																	ShaderClass::GRADIENT_MODULATE,				//pri_grad, 
-																	ShaderClass::SECONDARY_GRADIENT_DISABLE,	//sec_grad, 
-																	ShaderClass::TEXTURING_ENABLE,				//texture, 
-																	ShaderClass::ALPHATEST_DISABLE,				//alpha_test, 
-																	ShaderClass::CULL_MODE_ENABLE,				//cullmode, 
-																	ShaderClass::DETAILCOLOR_DISABLE,			//post_det_color, 
-																	ShaderClass::DETAILALPHA_DISABLE) );		//post_det_alpha		
-
-	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) {
-		add_shader.Enable_Fog ("TexProjectClass");
-	}
-
-	/*
-	** Additive projectors always use the normal gradient so they need multi-texturing
-	*/
-	add_shader.Set_Post_Detail_Color_Func(ShaderClass::DETAILCOLOR_SCALE);
-
-	/*
-	** plug in the gradient texture
-	*/
-	TextureClass * grad_tex = WW3DAssetManager::Get_Instance()->Get_Texture("AddProjectorGradient.tga");
-	if (grad_tex) {
-		grad_tex->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-		grad_tex->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-		MaterialPass->Set_Texture(grad_tex,1);
-		grad_tex->Release_Ref();
-	} else {
-		WWDEBUG_SAY(("Could not find texture: AddProjectorGradient.tga!\n"));
-	}
-
-#if (DEBUG_SHADOW_RENDERING)
-	// invert the shader so we can see what polygons it is hitting
-	add_shader.Set_Dst_Blend_Func(ShaderClass::DSTBLEND_SRC_COLOR);
-	add_shader.Set_Src_Blend_Func(ShaderClass::SRCBLEND_ZERO);
-#endif
-	
-	MaterialPass->Set_Shader(add_shader);
-
-	/*
-	** Set up the Vertex Material parameters
-	*/
-	VertexMaterialClass * vmtl = MaterialPass->Peek_Material();
-	vmtl->Set_Ambient(0,0,0);
-	vmtl->Set_Diffuse(0,0,0);
-	vmtl->Set_Specular(0,0,0);
-	vmtl->Set_Emissive(1,1,1);
-	vmtl->Set_Opacity(1.0f);
-	vmtl->Set_Lighting(true); //need emissive to scale the intensity of the projector
-
-	/*
-	** Set up some mapper settings related to depth gradient
-	** Additive texture projections always use the normal gradient
-	*/
-	if (Mapper1 == NULL) {
-		Mapper1 = NEW_REF(MatrixMapperClass,(1));
-	}
-	Mapper1->Set_Type(MatrixMapperClass::NORMAL_GRADIENT);
-	vmtl->Set_Mapper(Mapper1,1);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Texture -- Set the texture to be projected                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Texture(TextureClass * texture)
-{
-	if (texture != NULL) 
-	{
-		texture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-		texture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);	
-		MaterialPass->Set_Texture(texture);
-	}
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Get_Texture -- Returns the texture being projected                         *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- * the pointer is ref-counted!  make sure to keep track of your references                     *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-TextureClass * TexProjectClass::Get_Texture(void) const
-{
-	return MaterialPass->Get_Texture();
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Peek_Texture -- Returns the texture being projected                        *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-TextureClass * TexProjectClass::Peek_Texture(void) const
-{
-	return MaterialPass->Peek_Texture();
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Peek_Material_Pass -- Returns the material pass object                     *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-MaterialPassClass * TexProjectClass::Peek_Material_Pass(void) 
-{
-	return MaterialPass;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Perspective_Projection -- set up a perspective projection              *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/27/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Perspective_Projection(float hfov,float vfov,float znear,float zfar)
-{
-	HFov = hfov;
-	VFov = vfov;
-	ZNear = znear;
-	ZFar = zfar;
-
-	ProjectorClass::Set_Perspective_Projection(hfov,vfov,znear,zfar);
-	Set_Flag(PERSPECTIVE,true);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Ortho_Projection -- set up an orthographic projection                  *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/27/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Ortho_Projection(float xmin,float xmax,float ymin,float ymax,float znear,float zfar)
-{
-	XMin = xmin;
-	XMax = xmax;
-	YMin = ymin;
-	YMax = ymax;
-	ZNear = znear;
-	ZFar = zfar;
-
-	ProjectorClass::Set_Ortho_Projection(xmin,xmax,ymin,ymax,znear,zfar);
-	Set_Flag(PERSPECTIVE,false);
-}
-
-/***********************************************************************************************
- * TexProjectClass::Compute_Perspective_Projection -- Set up a perspective projection of an ob *
- *                                                                                             *
- * This function automates the process of generating the perspective parameters needed to      *
- * tightly bound the projection of an object.                                                  *
- *                                                                                             *
- * INPUT:                                                                                      *
- * model - object which we are created a projection of                                         *
- * lightpos - positional light source                                                          *
- * znear - distance to near clipping plane for the projection (if -1.0, will be generated)     *
- * zfar - distance to far clipping plane for the projection (if -1.0, will be generated)       *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Compute_Perspective_Projection
-(
-	RenderObjClass *	model,
-	const Vector3 &	lightpos,
-	float					znear,
-	float					zfar
-)
-{
-	if (model == NULL) {
-		WWDEBUG_SAY(("Attempting to generate projection for a NULL model\r\n"));
-		return false;
-	}
-
-	AABoxClass box;
-	model->Get_Obj_Space_Bounding_Box(box);
-	const Matrix3D & tm = model->Get_Transform();
-	
-	return Compute_Perspective_Projection(box,tm,lightpos,znear,zfar);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Compute_Perspective_Projection -- Set up a perspective projection of an ob *
- *                                                                                             *
- * This function automates the process of generating the perspective parameters needed to      *
- * tightly bound the projection of an object.                                                  *
- *                                                                                             *
- * INPUT:                                                                                      *
- * obj_box - object space bounding box of the object we are projecting                         *
- * tm - transform of the object we are projecting                                              *
- * lightpos - positional light source                                                          *
- * user_znear - distance to near clipping plane for the projection (if -1.0, will be generated)*
- * user_zfar - distance to far clipping plane for the projection (if -1.0, will be generated)  *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Compute_Perspective_Projection
-(
-	const AABoxClass & obj_box,
-	const Matrix3D & tm,
-	const Vector3 & lightpos,
-	float user_znear,
-	float user_zfar
-)
-{
-	/*
-	** Compute the center of the box in world-space
-	*/
-	Vector3 wrld_center;
-	Matrix3D::Transform_Vector(tm,obj_box.Center,&wrld_center);
-
-	/*
-	** Create a camera transform looking at the object.
-	** Set this as our transform later in this routine.
-	*/
-	Matrix3D texture_tm,texture_tm_inv;
-	texture_tm.Look_At(lightpos,wrld_center,0.0f);
-	texture_tm.Get_Orthogonal_Inverse(texture_tm_inv);
-
-	/*
-	** Calculate the axis-aligned bounding box of the model in the camera's coordinate system.
-	*/
-	AABoxClass box = obj_box;
-	Matrix3D obj_to_world = tm;
-	Matrix3D obj_to_texture;
-	Matrix3D::Multiply(texture_tm_inv,obj_to_world,&obj_to_texture);
-	box.Transform(obj_to_texture);
-
-	/*
-	** If the box is behind the viewpoint or the viewpoint is inside the box
-	** our FOV will be > 180 degrees. Have to give up
-	*/
-	if ((box.Center.Z > 0.0f) || (box.Extent.Z > WWMath::Fabs(box.Center.Z))) {
-		return false;
-	}
-	
-	/*
-	** Compute the frustum parameters. Remember that our z coordinates are negative but the
-	** projection code needs positive z distances.
-	*/
-	float znear = -box.Center.Z; //-(box.Center.Z + obj_box.Extent.Quick_Length());
-	float zfar = -(box.Center.Z - obj_box.Extent.Quick_Length()) * 2.0f;
-
-	if (user_znear != -1.0f) {
-		znear = box.Center.Z + user_znear;
-	}
-	if (user_zfar != -1.0f) {
-		zfar = box.Center.Z + user_zfar;
-	}
-
-	float tan_hfov2 = WWMath::Fabs(box.Extent.X / (box.Center.Z + box.Extent.Z));
-	float tan_vfov2 = WWMath::Fabs(box.Extent.Y / (box.Center.Z + box.Extent.Z));
-	float hfov = 2.0f * WWMath::Atan(tan_hfov2);
-	float vfov = 2.0f * WWMath::Atan(tan_vfov2);
-
-	/*
-	** Plug in the results.  
-	*/
-	Set_Perspective_Projection(hfov,vfov,znear,zfar);
-	Set_Transform(texture_tm);
-	return true;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Compute_Ortho_Projection -- Automatic Orthographic projection              *
- *                                                                                             *
- * Generates the orthographic projection parameters to tightly bound an object                 *
- *                                                                                             *
- * INPUT:                                                                                      *
- * model - object which we are created a projection of                                         *
- * lightdir - directional light source                                                         *
- * znear - distance to near clipping plane for the projection (if -1.0, will be generated)     *
- * zfar - distance to far clipping plane for the projection (if -1.0, will be generated)       *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Compute_Ortho_Projection
-(
-	RenderObjClass *	model,
-	const Vector3 &	lightdir,
-	float					znear,
-	float					zfar
-)
-{
-	if (model == NULL) {
-		WWDEBUG_SAY(("Attempting to generate projection for a NULL model\r\n"));
-		return false;
-	}
-
-	AABoxClass box;
-	model->Get_Obj_Space_Bounding_Box(box);
-	const Matrix3D & tm = model->Get_Transform();
-
-	return Compute_Ortho_Projection(box,tm,lightdir,znear,zfar);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Compute_Ortho_Projection -- Automatic Orthographic projection              *
- *                                                                                             *
- * Generates the orthographic projection parameters to tightly bound an object                 *
- *                                                                                             *
- * INPUT:                                                                                      *
- * obj_box - object space bounding box of the object we are projecting                         *
- * tm - transform of the object we are projecting                                              *
- * lightdir - directional light                                                                *
- * user_znear - distance to near clipping plane for the projection (if -1.0, will be generated)*
- * user_zfar - distance to far clipping plane for the projection (if -1.0, will be generated)  *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Compute_Ortho_Projection
-(
-	const AABoxClass & obj_box,
-	const Matrix3D & tm,
-	const Vector3 & lightdir,
-	float user_znear,
-	float user_zfar
-)
-{
-	/*
-	** Compute the center of the box in world-space
-	*/
-	AABoxClass wrldbox = obj_box;
-	wrldbox.Transform(tm);
-
-	/*
-	** Create a camera transform looking at the object.
-	** Set this as our transform later in this routine.
-	*/
-	Vector3 camera_target = wrldbox.Center;
-	Vector3 camera_position = camera_target - 2.0f * wrldbox.Extent.Length() * lightdir;
-
-	Matrix3D texture_tm,texture_tm_inv;
-	texture_tm.Look_At(camera_position,camera_target,0.0f);
-	texture_tm.Get_Orthogonal_Inverse(texture_tm_inv);
-
-	/*
-	** Calculate the axis-aligned bounding box of the model in the camera's coordinate system.
-	*/
-	AABoxClass box = obj_box;
-	Matrix3D obj_to_world = tm;
-	Matrix3D obj_to_texture;
-	Matrix3D::Multiply(texture_tm_inv,obj_to_world,&obj_to_texture);
-	box.Transform(obj_to_texture);
-
-	/*
-	** Expand the box to help with bounding box errors
-	*/
-	box.Extent *= 1.0f;
-
-	/*
-	** Compute the frustum parameters.  Note that znear and zfar are supposed to
-	** be positive distances for the projection code.
-	*/
-	float znear = -box.Center.Z; //-(box.Center.Z + obj_box.Extent.Quick_Length());
-	float zfar = -(box.Center.Z - obj_box.Extent.Quick_Length()) * 2.0f;
-
-	if (user_znear != -1.0f) {
-		znear = -box.Center.Z + user_znear;
-	}
-	if (user_zfar != -1.0f) {
-		zfar = -box.Center.Z + user_zfar;
-	}
-
-	/*
-	** All done!
-	*/
-	Set_Ortho_Projection(	box.Center.X - box.Extent.X,
-									box.Center.X + box.Extent.X,
-									box.Center.Y - box.Extent.Y,
-									box.Center.Y + box.Extent.Y,
-									znear,
-									zfar	);
-	Set_Transform(texture_tm);
-	return true;
-}
-
-/***********************************************************************************************
- * TexProjectClass::Compute_Texture -- Generates texture by rendering an object                *
- *                                                                                             *
- * INPUT:                                                                                      *
- * model - pointer to the render object to generate a shadow texture for                       *
- * context - shadow render context which has been initialized to <TextureSize> resolution      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Compute_Texture
-(
-	RenderObjClass * model,
-	SpecialRenderInfoClass * context
-)
-{
-	if ((model == NULL) || (context == NULL)) 
-	{
-		return false;
-	}
-	/*
-	** Render to texture
-	*/
-	TextureClass * rtarget = Peek_Render_Target();
-
-	if (rtarget != NULL) 
-	{
-
-		/*
-		** Set the render target
-		*/
-		DX8Wrapper::Set_Render_Target(rtarget);
-
-		/*
-		** Set up the camera
-		*/
-		Configure_Camera(context->Camera);
-		
-		/*
-		** Render the object
-		*/
-		Vector3 color(0.0f,0.0f,0.0f);
-		if (Get_Flag(ADDITIVE) == false) {
-			color.Set(1.0f,1.0f,1.0f);
-		}
-
-		WW3D::Begin_Render(true,true,color);
-		WW3D::Render(*model,*context);
-		WW3D::End_Render(false);
-
-		DX8Wrapper::Set_Render_Target((IDirect3DSurface8 *)NULL);
-
-	}
-
-#if 0
-
-	/*
-	** Render the object with the BW Renderer into our color surface
-	*/
-	BWRenderClass bwr((unsigned char*)shadow_surface->getDataPtr(),tex_size);
-	bwr.Fill(0xff);
-	context->BWRenderer = &bwr;
-	model->Special_Render(*context);
-	context->BWRenderer = NULL;
-#endif
-	return true;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Needs_Render_Target -- returns wheter this projector needs a render target *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/17/2001  gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Needs_Render_Target(void)
-{
-	return Get_Flag(TEXTURE_DIRTY);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Render_Target -- Install a render target for this projector to use     *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/16/2001  gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Render_Target
-(
-	TextureClass* render_target
-)
-{
-	REF_PTR_SET(RenderTarget,render_target);
-	Set_Texture(RenderTarget);
-}
-
-/***********************************************************************************************
- * TexProjectClass::Peek_Render_Target -- Returns pointer to the render target if we have one  *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/5/2001   gth : Created.                                                                 *
- *=============================================================================================*/
-TextureClass* TexProjectClass::Peek_Render_Target
-(
-	void
-)
-{
-	return RenderTarget;
-}
-
-/***********************************************************************************************
- * TexProjectClass::Configure_Camera -- set up a camera to match this projector                *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Configure_Camera(CameraClass & camera)
-{
-	camera.Set_Transform(Transform);
-	camera.Set_Clip_Planes(0.01f,ZFar);
-
-	if (Get_Flag(PERSPECTIVE)) {
-		camera.Set_Projection_Type(CameraClass::PERSPECTIVE);
-		camera.Set_View_Plane(HFov,VFov);
-
-	} else {
-		camera.Set_Projection_Type(CameraClass::ORTHO);
-		camera.Set_View_Plane(Vector2(XMin,YMin),Vector2(XMax,YMax));
-	}
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Pre_Render_Update -- Prepare the projector for rendering                   *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Pre_Render_Update(const Matrix3D & camera)
-{
-	/*
-	** Mview-texture = PShadow * Mwrld-texture * Mcamera-vrld	
-	*/
-	Matrix3D		world_to_texture;
-	Matrix3D		tmp;
-	Matrix4x4	view_to_texture;
-
-	Transform.Get_Orthogonal_Inverse(world_to_texture);
-	Matrix3D::Multiply(world_to_texture,camera,&tmp);
-	Matrix4x4::Multiply(Projection,tmp,&view_to_texture);
-
-	/*
-	** update the current intensity by iterating it towards the desired intensity
-	*/
-	float frame_time = (float)WW3D::Get_Frame_Time() / 1000.0f;
-	float intensity_delta = DesiredIntensity - Intensity;
-	float max_intensity_delta = INTENSITY_RATE_OF_CHANGE * frame_time;
-	
-	if (intensity_delta > max_intensity_delta) {
-		Intensity += max_intensity_delta;
-	} else if (intensity_delta < -max_intensity_delta) {
-		Intensity -= max_intensity_delta;
-	} else {
-		Intensity = DesiredIntensity;
-	}
-
-	float actual_intensity = Intensity * Attenuation;
-
-	/*
-	** install the current intensity
-	*/
-	VertexMaterialClass * vmat = MaterialPass->Peek_Material();
-	if (Get_Flag(ADDITIVE)) {
-		vmat->Set_Emissive(actual_intensity,actual_intensity,actual_intensity);
-	} else {
-		vmat->Set_Emissive(1.0f - actual_intensity,1.0f - actual_intensity,1.0f - actual_intensity);
-	}
-
-	/*
-	** update the mappers
-	*/
-	if (Get_Flag(PERSPECTIVE)) {
-		Mapper->Set_Type(MatrixMapperClass::PERSPECTIVE_PROJECTION);
-	} else {
-		Mapper->Set_Type(MatrixMapperClass::ORTHO_PROJECTION);
-	}
-
-	if (Get_Texture_Size() == 0) {
-//		SurfaceClass::SurfaceDescription surface_desc;
-//		MaterialPass->Peek_Texture()->Get_Level_Description(surface_desc);
-		Set_Texture_Size(MaterialPass->Peek_Texture()->Get_Width());
-		WWASSERT(Get_Texture_Size() != 0);
-	}
-	
-	Mapper->Set_Texture_Transform(view_to_texture,Get_Texture_Size());
-	if (Mapper1) {
-		Mapper1->Set_Texture_Transform(view_to_texture,Get_Texture_Size());
-	}
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Update_WS_Bounding_Volume -- Recalculate the world-space bounding box      *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Update_WS_Bounding_Volume(void)
-{
-	ProjectorClass::Update_WS_Bounding_Volume();
-
-	/*
-	** Tell our culling system that we've changed
-	*/
-	Vector3 extent;
-	WorldBoundingVolume.Compute_Axis_Aligned_Extent(&extent);
-	Set_Cull_Box(AABoxClass(WorldBoundingVolume.Center,extent));
-}
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h
deleted file mode 100644
index 994fec44321..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/texproject.h                           $*
- *                                                                                             *
- *              Original Author:: Greg Hjelstrom                                               *
- *                                                                                             *
- *                      $Author:: Greg_h                                                      $*
- *                                                                                             *
- *                     $Modtime:: 4/23/01 7:29p                                               $*
- *                                                                                             *
- *                    $Revision:: 6                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef TEXPROJECT_H
-#define TEXPROJECT_H
-
-#include "always.h"
-#include "matrix3d.h"
-#include "matrix4.h"
-#include "obbox.h"
-#include "matpass.h"
-#include "matrixmapper.h"
-#include "cullsys.h"
-#include "multilist.h"
-#include "projector.h"
-
-
-class SpecialRenderInfoClass;
-class RenderObjClass;
-class MaterialPassClass;
-class SurfaceClass;
-
-
-
-/**
-** TexProjectClass
-** This class is used to project textures onto object in the world.  It contains
-** a pointer to the texture to be projected, a bounding volume for the projection,
-** and a material pass which can perform the projection.
-**
-** Design Goals:
-** - Texture Projectors should be easy to place in the world and move around.
-**   solution: Store the bounding volume and any other parameters in a coordinate
-**   system local to the projector.  Update the world-space cache whenever needed.
-**   The automatically generated shadow texture projectors are a special case subset 
-**   of the general texture projection code.  For this reason, a local bounding 
-**   volume will be stored and its world-space equivalent will be updated whenever 
-**   needed.  
-**
-** - Texture projectors need to be compatible with the culling systems.
-**   solution: inherit the Cullable interface.
-**
-** - Texture projectors need to be quickly pulled in and out of many lists during
-**   the rendering process.
-**   solution: list system similar to PhysListClass?  I really need to templatize this. 
-**   - done:  MultiListClass!
-**  
-** - Dynamic Texture projectors need to be updated in stages.  Update/recompute only the 
-**   bounding volume first, then defer computing the actual texture until it is
-**   determined that the volume falls into the frustum and is applied to at least one 
-**   object.
-**   solution: Code the bounding volume/projection paramter generation separate from
-**   the texture generation code.  A derived texture projection object. Let texture 
-**   projectors know about the object they are projecting so that they can have that 
-**   object rendered from the desired viewpoint.  Need a 'Dirty' flag and a pointer to 
-**   a 'parent' object.  Perhaps separate this code into a ShadowProjectClass since shadows 
-**   are the only case I can think of that need the ability to re-render their 'parent' 
-**   object.  Everything else should be a static texture-map either generated 'artistically' 
-**   or generated off-line.
-**
-*/
-class TexProjectClass : public ProjectorClass, public CullableClass, public MultiListObjectClass
-{
-public:
-
-	TexProjectClass(void);
-	virtual ~TexProjectClass(void);
-	
-	/*
-	** Material settings
-	*/
-	void						Set_Texture_Size(int size);
-	int						Get_Texture_Size(void);
-	void						Init_Multiplicative(void);
-	void						Init_Additive(void);
-	void						Set_Intensity(float intensity,bool immediate = false);	// 1.0 = on 100%, 0.0 = 'off'
-	float						Get_Intensity(void);
-	bool						Is_Intensity_Zero(void);
-	void						Set_Attenuation(float attenuation);								// 1.0 = on, 0.0 = off
-	float						Get_Attenuation(void);
-	void						Enable_Attenuation(bool onoff);
-	bool						Is_Attenuation_Enabled(void);
-	MaterialPassClass *	Peek_Material_Pass(void);
-
-	/*
-	** Options
-	*/
-	void						Enable_Affect_Dynamic_Objects(bool onoff)				{ Set_Flag(AFFECT_DYNAMIC_OBJS,onoff); }
-	bool						Is_Affect_Dynamic_Objects_Enabled(void)				{ return Get_Flag(AFFECT_DYNAMIC_OBJS); }
-	void						Enable_Affect_Static_Objects(bool onoff)				{ Set_Flag(AFFECT_STATIC_OBJS,onoff); } 
-	bool						Is_Affect_Static_Objects_Enabled(void)					{ return Get_Flag(AFFECT_STATIC_OBJS); }
-	void						Enable_Depth_Gradient(bool onoff);
-	bool						Is_Depth_Gradient_Enabled(bool onoff);
-
-	/*
-	** Manual initialization of a TexProjectClass
-	** 1 - call ProjectorClass::Set_Transform
-	** 2 - call Set_Projection_Perspective -or- Set_Projection_Ortho
-	** 3 - call Set_Texture.
-	*/
-	virtual void			Set_Perspective_Projection(float hfov,float vfov,float znear,float zfar);
-	virtual void			Set_Ortho_Projection(float xmin,float xmax,float ymin,float ymax,float znear,float zfar);
-
-	void						Set_Texture(TextureClass * texture);
-	TextureClass *			Get_Texture(void) const;
-	TextureClass *			Peek_Texture(void) const;
-	
-	/*
-	** Automatic initialization of a TexProjectClass.
-	** First set up your projection parameters, give the projector a render target, then call Compute_Texture
-	*/
-	bool						Compute_Perspective_Projection(RenderObjClass * obj,const Vector3 & lightpos,float znear=-1.0f,float zfar=-1.0f);
-	bool						Compute_Perspective_Projection(const AABoxClass & obj_box,const Matrix3D & tm,const Vector3 & lightpos,float znear=-1.0f,float zfar=-1.0f);
-	
-	bool						Compute_Ortho_Projection(RenderObjClass * obj,const Vector3 & lightdir,float znear=-1.0f,float zfar=-1.0f);
-	bool						Compute_Ortho_Projection(const AABoxClass & obj_box,const Matrix3D & tm,const Vector3 & lightdir,float znear=-1.0f,float zfar=-1.0f);
-
-	bool						Needs_Render_Target(void);
-	void						Set_Render_Target(TextureClass * render_target);
-	TextureClass *			Peek_Render_Target(void);
-
-	bool						Compute_Texture(RenderObjClass * model,SpecialRenderInfoClass * context);
-
-	/*
-	** Prep for rendering, called by the scene prior to usage.
-	*/
-	virtual void			Pre_Render_Update(const Matrix3D & camera);
-
-	/*
-	** virtual interface for getting the pointer of the object that generated this shadow.  
-	** defaults to returning NULL.  This is implemented by some derived classes and used by
-	** the system to prevent a projection from being applied to the object that generated
-	** the projection...  
-	** (gth) feels kludgy, this got a little messy when I moved this code into WW3D from WWPhys
-	*/
-	virtual void *			Get_Projection_Object_ID(void) const { return NULL; }
-
-protected:
-
-	void						Set_Flag(uint32 flag,bool onoff);
-	bool						Get_Flag(uint32 flag) const;
-	virtual void			Update_WS_Bounding_Volume(void);
-	void						Configure_Camera(CameraClass & camera);
-
-	enum FlagsType
-	{
-		PERSPECTIVE				= 0x00000001,		// PERSPECTIVE or ORTHO
-		ADDITIVE					= 0x00000002,		// ADDITIVE or MULTIPLICATIVE
-		TEXTURE_DIRTY			= 0x00000004,		// used by derived DynTexProjectClass		
-		VOLATILE					= 0x00000008,		// this is a volatile texture.
-		ATTENUATE				= 0x00000010,		// this projector should be attenuated based on distance to viewer
-		AFFECT_DYNAMIC_OBJS	= 0x00000020,		// this projector affects dynamic objects
-		AFFECT_STATIC_OBJS	= 0x00000040,		// this projector affects static objects
-		USE_DEPTH_GRADIENT	= 0x00000080,		// fade the projection as a function of depth
-		HAS_RENDER_TARGET		= 0x00000100,		// the texture we have can be a render target
-		SIZE_MASK				= 0xFFF00000,		// desired texture size stored in upper 3 nibbles
-		SIZE_SHIFT				= 20,
-
-		DEFAULT_FLAGS			= ATTENUATE | AFFECT_DYNAMIC_OBJS | AFFECT_STATIC_OBJS | (64<<SIZE_SHIFT)
-	};
-	
-	uint32						Flags;
-
-	/*
-	** Intensity Controls
-	*/
-	float							DesiredIntensity;					// last input desired intensity.
-	float							Intensity;							// basic shadow intensity.  value between 0 and 1
-	float							Attenuation;						// attenuation factor based on distance from camera.  value between 0 and 1
-
-	/*
-	** Material pass to be added to any object that intersects the volume
-	*/
-	MaterialPassClass *		MaterialPass;
-	MatrixMapperClass *		Mapper1;
-	TextureClass *				RenderTarget;
-	
-	/*
-	** I have to remember all of these values so that I can properly initialize a CameraClass
-	** when we do render-to-texture.  Some day we will merge CameraClass and ProjectorClass.
-	*/
-	float							HFov;				// horizontal fov (for perspective mode)
-	float							VFov;				// vertical fov (for perspective mode)
-	float							XMin;				// left x clip plane (for ortho)
-	float							XMax;				// right x clip plane (for ortho)
-	float							YMin;				// bottom y clip plane (for ortho)
-	float							YMax;				// top y clip plane (for ortho)
-	float							ZNear,ZFar;		// z clip planes (for both modes)
-};
-
-
-/*
-** Texture Projector Lists
-*/
-typedef RefMultiListClass<TexProjectClass>		TexProjListClass;
-typedef RefMultiListIterator<TexProjectClass>	TexProjListIterator;
-
-
-#endif
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp
deleted file mode 100644
index af58d03265f..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp
+++ /dev/null
@@ -1,893 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/texture.cpp                            $*
- *                                                                                             *
- *                      $Author:: Jani_p                                                      $*
- *                                                                                             *
- *                     $Modtime:: 8/29/01 7:06p                                               $*
- *                                                                                             *
- *                    $Revision:: 65                                                          $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *   FileListTextureClass::Load_Frame_Surface -- Load source texture                           * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include "texture.h"
-
-#include <d3d8.h>
-#include <stdio.h>
-#include <d3dx8core.h>
-#include "dx8wrapper.h"
-#include "TARGA.H"
-#include <nstrdup.h>
-#include "w3d_file.h"
-#include "assetmgr.h"
-#include "formconv.h"
-#include "textureloader.h"
-#include "missingtexture.h"
-#include "ffactory.h"
-#include "dx8caps.h"
-#include "dx8texman.h"
-#include "meshmatdesc.h"
-
-/*
-** Definitions of static members:
-*/
-
-static unsigned unused_texture_id;
-
-// ----------------------------------------------------------------------------
-
-static int Calculate_Texture_Memory_Usage(const TextureClass* texture,int red_factor=0)
-{
-	// Set performance statistics
-
-	int size=0;
-	IDirect3DTexture8* d3d_texture=const_cast<TextureClass*>(texture)->Peek_D3D_Texture();
-	if (!d3d_texture) return 0;
-	for (unsigned i=red_factor;i<d3d_texture->GetLevelCount();++i) {
-		D3DSURFACE_DESC desc;
-		DX8_ErrorCode(d3d_texture->GetLevelDesc(i,&desc));
-		size+=desc.Size;
-	}
-	return size;
-}
-
-/*************************************************************************
-**                             TextureClass
-*************************************************************************/
-
-TextureClass::TextureClass(unsigned width, unsigned height, WW3DFormat format, MipCountType mip_level_count, PoolType pool,bool rendertarget)
-	:
-	D3DTexture(NULL),
-	texture_id(unused_texture_id++),
-	Initialized(true),
-	Filter(mip_level_count),
-	MipLevelCount(mip_level_count),
-	Pool(pool),
-	Dirty(false),
-	IsLightmap(false),
-	IsProcedural(true),
-	Name(""),
-	TextureFormat(format),
-	IsCompressionAllowed(false),
-	TextureLoadTask(NULL),
-	Width(width),
-	Height(height)
-{
-	switch (format) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	default : break;
-	}
-		
-	D3DPOOL d3dpool=(D3DPOOL)0;
-	switch(pool)
-	{
-	case POOL_DEFAULT		: d3dpool=D3DPOOL_DEFAULT; break;
-	case POOL_MANAGED		: d3dpool=D3DPOOL_MANAGED; break;
-	case POOL_SYSTEMMEM	: d3dpool=D3DPOOL_SYSTEMMEM; break;
-	default: WWASSERT(0);
-	}
-	D3DTexture = DX8Wrapper::_Create_DX8_Texture(width, height, format, mip_level_count,d3dpool,rendertarget);
-	if (pool==POOL_DEFAULT)
-	{
-		Dirty=true;
-		DX8TextureTrackerClass *track=W3DNEW DX8TextureTrackerClass
-		(
-			width, 
-			height, 
-			format, 
-			mip_level_count,
-			this,
-			rendertarget
-		);
-		DX8TextureManagerClass::Add(track);
-	}
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-// ----------------------------------------------------------------------------
-
-TextureClass::TextureClass
-(
-	const char *name,
-	const char *full_path,
-	MipCountType mip_level_count,
-	WW3DFormat texture_format,
-	bool allow_compression)
-	:
-	D3DTexture(NULL),
-	texture_id(unused_texture_id++),
-	Initialized(false),
-	Filter(mip_level_count),
-	MipLevelCount(mip_level_count),
-	Pool(POOL_MANAGED),
-	Dirty(false),
-	IsLightmap(false),
-	IsProcedural(false),
-	TextureFormat(texture_format),
-	IsCompressionAllowed(allow_compression),
-	TextureLoadTask(NULL),
-	Width(0),
-	Height(0)
-{
-	switch (TextureFormat) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	case WW3D_FORMAT_U8V8:		// Bumpmap
-	case WW3D_FORMAT_L6V5U5:	// Bumpmap
-	case WW3D_FORMAT_X8L8V8U8:	// Bumpmap
-		// If requesting bumpmap format that isn't available we'll just return the surface in whatever color
-		// format the texture file is in. (This is illegal case, the format support should always be queried
-		// before creating a bump texture!)
-		if (!DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(TextureFormat)) 
-		{
-			TextureFormat=WW3D_FORMAT_UNKNOWN;
-		}
-		// If bump format is valid, make sure compression is not allowed so that we don't even attempt to load
-		// from a compressed file (quality isn't good enough for bump map). Also disable mipmapping.
-		else 
-		{
-			IsCompressionAllowed=false;
-			MipLevelCount=MIP_LEVELS_1;
-			Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
-		}
-		break;
-	default:	break;
-	}
-
-	WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name\n");
-	int len=strlen(name);
-	for (int i=0;i<len;++i) 
-	{
-		if (name[i]=='+') 
-		{
-			IsLightmap=true;
-
-			// Set bilinear filtering for lightmaps (they are very stretched and
-			// low detail so we don't care for anisotropic or trilinear filtering...)
-			Filter.Set_Min_Filter(TextureFilterClass::FILTER_TYPE_FAST);
-			Filter.Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_FAST);
-			if (mip_level_count!=MIP_LEVELS_1) Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_FAST);
-			break;
-		}
-	}
-	Set_Texture_Name(name);
-	Set_Full_Path(full_path);
-	WWASSERT(name[0]!='\0');
-	if (!WW3D::Is_Texturing_Enabled()) 
-	{
-		Initialized=true;
-		D3DTexture=0;
-	}
-	else if (WW3D::Get_Thumbnail_Enabled()==false || mip_level_count==MIP_LEVELS_1)
-	{
-		Initialized=true;
-		D3DTexture=0;
-		TextureLoader::Request_High_Priority_Loading(this,mip_level_count);
-	}
-	else {
-		Load_Locked_Surface();
-		TextureFormat=texture_format;	// Locked surface may be in a wrong format
-	}
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-// ----------------------------------------------------------------------------
-
-TextureClass::TextureClass(SurfaceClass *surface, MipCountType mip_level_count)
-	:
-	D3DTexture(NULL),
-	texture_id(unused_texture_id++),
-	Initialized(true),
-	Filter(mip_level_count),
-	MipLevelCount(mip_level_count),
-	Pool(POOL_MANAGED),
-	Dirty(false),
-	IsLightmap(false),
-	Name(""),
-	IsProcedural(true),
-	TextureFormat(surface->Get_Surface_Format()),
-	IsCompressionAllowed(false),
-	TextureLoadTask(NULL),
-	Width(0),
-	Height(0)
-{
-	SurfaceClass::SurfaceDescription sd;
-	surface->Get_Description(sd);
-	Width=sd.Width;
-	Height=sd.Height;
-	switch (sd.Format) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	default: break;
-	}
-	
-	D3DTexture = DX8Wrapper::_Create_DX8_Texture(surface->Peek_D3D_Surface(), mip_level_count);
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-// ----------------------------------------------------------------------------
-
-TextureClass::TextureClass(IDirect3DTexture8* d3d_texture)
-	:
-	D3DTexture(d3d_texture),
-	texture_id(unused_texture_id++),
-	Initialized(true),
-	Filter((MipCountType)d3d_texture->GetLevelCount()),
-	MipLevelCount((MipCountType)d3d_texture->GetLevelCount()),
-	Pool(POOL_MANAGED),
-	Dirty(false),
-	IsLightmap(false),
-	Name(""),
-	IsProcedural(true),
-	IsCompressionAllowed(false),
-	TextureLoadTask(NULL),
-	Width(0),
-	Height(0)
-{
-	D3DTexture->AddRef();
-	IDirect3DSurface8* surface;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0,&surface));
-	D3DSURFACE_DESC d3d_desc;
-	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
-	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
-	Width=d3d_desc.Width;
-	Height=d3d_desc.Height;
-	TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
-	switch (TextureFormat) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	default: break;
-	}
-
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-// ----------------------------------------------------------------------------
-
-TextureClass::~TextureClass(void)
-{
-	TextureLoadTaskClass::Release_Instance(TextureLoadTask);
-	TextureLoadTask=NULL;
-
-	if (!Initialized) {
-		WWDEBUG_SAY(("Warning: Texture %s was loaded but never used\n",Get_Texture_Name()));
-	}
-
-	if (D3DTexture) {
-		D3DTexture->Release();
-		D3DTexture = NULL;
-	}
-	DX8TextureManagerClass::Remove(this);
-}
-
-// ----------------------------------------------------------------------------
-
-void TextureClass::Init()
-{
-	// If the texture has already been initialised we should exit now
-	if (Initialized) return;
-
-	TextureLoader::Add_Load_Task(this);
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-void TextureClass::Invalidate()
-{
-	// Don't invalidate procedural textures
-	if (IsProcedural) return;
-
-	// Don't invalidate missing texture
-	if (Is_Missing_Texture()) return;
-
-	if (D3DTexture) {
-		D3DTexture->Release();
-		D3DTexture = NULL;
-	}
-
-	if (!WW3D::Is_Texturing_Enabled()) {
-		Initialized=true;
-		D3DTexture=0;
-	}
-	else if (WW3D::Get_Thumbnail_Enabled()==false || MipLevelCount==MIP_LEVELS_1)
-	{
-		Initialized=true;
-		D3DTexture=0;
-		TextureLoader::Request_High_Priority_Loading(this,MipLevelCount);
-	}
-	else {
-		Initialized=false;
-		Load_Locked_Surface();
-	}
-}
-
-//**********************************************************************************************
-//! Returns a pointer to the d3d texture
-/*! 
-*/
-IDirect3DBaseTexture8 * TextureClass::Peek_D3D_Base_Texture() const 
-{ 	
-	LastAccessed=WW3D::Get_Sync_Time(); 
-	return D3DTexture; 
-}
-
-//**********************************************************************************************
-//! Set the d3d texture pointer.  Handles ref counts properly.
-/*! 
-*/
-void TextureClass::Set_D3D_Base_Texture(IDirect3DBaseTexture8* tex) 
-{ 
-	// (gth) Generals does stuff directly with the D3DTexture pointer so lets
-	// reset the access timer whenever someon messes with this pointer.
-	LastAccessed=WW3D::Get_Sync_Time();
-	
-	if (D3DTexture != NULL) {
-		D3DTexture->Release();
-	}
-	D3DTexture = tex;
-	if (D3DTexture != NULL) {
-		D3DTexture->AddRef();
-	}
-}
-
-// ----------------------------------------------------------------------------
-
-void TextureClass::Load_Locked_Surface()
-{
-	if (D3DTexture) D3DTexture->Release();
-	D3DTexture=0;
-	TextureLoader::Request_Thumbnail(this);
-	Initialized=false;
-}
-
-// ----------------------------------------------------------------------------
-
-bool TextureClass::Is_Missing_Texture()
-{
-	bool flag = false;
-	IDirect3DTexture8 *missing_texture = MissingTexture::_Get_Missing_Texture();
-	
-	if(D3DTexture == missing_texture)
-		flag = true;
-
-	if(missing_texture)
-		missing_texture->Release();
-
-	return flag;
-}
-
-// ----------------------------------------------------------------------------
-
-void TextureClass::Set_Texture_Name(const char * name)
-{
-	Name=name;
-}
-
-// ----------------------------------------------------------------------------
-
-unsigned int TextureClass::Get_Mip_Level_Count(void)
-{
-	if (!D3DTexture) {
-		WWASSERT_PRINT(0, "Get_Mip_Level_Count: D3DTexture is NULL!\n");
-		return 0;
-	}
-
-	return D3DTexture->GetLevelCount();
-}
-
-// ----------------------------------------------------------------------------
-
-void TextureClass::Get_Level_Description(SurfaceClass::SurfaceDescription &surface_desc, unsigned int level)
-{
-	if (!D3DTexture) {
-		WWASSERT_PRINT(0, "Get_Surface_Description: D3DTexture is NULL!\n");
-	}
-
-	D3DSURFACE_DESC d3d_surf_desc;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetLevelDesc(level, &d3d_surf_desc));
-	surface_desc.Format = D3DFormat_To_WW3DFormat(d3d_surf_desc.Format);
-	surface_desc.Height = d3d_surf_desc.Height; 
-	surface_desc.Width = d3d_surf_desc.Width;
-}
-
-// ----------------------------------------------------------------------------
-
-SurfaceClass *TextureClass::Get_Surface_Level(unsigned int level)
-{
-	IDirect3DSurface8 *d3d_surface = NULL;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(level, &d3d_surface));
-	SurfaceClass *surface = W3DNEW SurfaceClass(d3d_surface);
-	d3d_surface->Release();
-	return surface;
-}
-
-// ----------------------------------------------------------------------------
-
-unsigned int TextureClass::Get_Priority(void)
-{
-	if (!D3DTexture) {
-		WWASSERT_PRINT(0, "Get_Priority: D3DTexture is NULL!\n");
-		return 0;
-	}
-
-	return D3DTexture->GetPriority();
-}
-
-// ----------------------------------------------------------------------------
-
-unsigned int TextureClass::Set_Priority(unsigned int priority)
-{
-	if (!D3DTexture) {
-		WWASSERT_PRINT(0, "Set_Priority: D3DTexture is NULL!\n");
-		return 0;
-	}
-
-	return D3DTexture->SetPriority(priority);
-}
-
-unsigned TextureClass::Get_Reduction() const
-{
-	if (MipLevelCount==MIP_LEVELS_1) return 0;
-
-	int reduction=WW3D::Get_Texture_Reduction();
-	if (MipLevelCount && reduction>MipLevelCount) {
-		reduction=MipLevelCount;
-	}
-	return reduction;
-}
-
-// ----------------------------------------------------------------------------
-
-void TextureClass::Apply(unsigned int stage)
-{
-	if (!Initialized) 
-	{
-		Init();
-	}
-	LastAccessed=WW3D::Get_Sync_Time();
-
-	DX8_RECORD_TEXTURE(this);
-
-	// Set texture itself
-	if (WW3D::Is_Texturing_Enabled()) 
-	{
-		DX8Wrapper::Set_DX8_Texture(stage, D3DTexture);
-	}
-	else 
-	{
-		DX8Wrapper::Set_DX8_Texture(stage, NULL);
-	}
-
-	Filter.Apply(stage);
-}
-
-// ----------------------------------------------------------------------------
-
-void TextureClass::Apply_Null(unsigned int stage)
-{
-	// This function sets the render states for a "NULL" texture
-	DX8Wrapper::Set_DX8_Texture(stage, NULL);
-}
-
-// ----------------------------------------------------------------------------
-
-void TextureClass::Apply_New_Surface(bool initialized)
-{
-	if (D3DTexture) D3DTexture->Release();
-	D3DTexture=TextureLoadTask->Peek_D3D_Texture();
-	D3DTexture->AddRef();
-	if (initialized) Initialized=true;
-
-	WWASSERT(D3DTexture);
-	IDirect3DSurface8* surface;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0,&surface));
-	D3DSURFACE_DESC d3d_desc;
-	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
-	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
-//	if (TextureFormat==WW3D_FORMAT_UNKNOWN) {
-		TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
-		Width=d3d_desc.Width;
-		Height=d3d_desc.Height;
-//	}
-//	else {
-//		WWASSERT(D3DFormat_To_WW3DFormat(d3d_desc.Format)==TextureFormat);
-//	}
-	surface->Release();
-}
-
-// ----------------------------------------------------------------------------
-
-unsigned TextureClass::Get_Texture_Memory_Usage() const
-{
-	if (/*!ReductionEnabled || */!Initialized) return Calculate_Texture_Memory_Usage(this,0);
-//	unsigned reduction=WW3D::Get_Texture_Reduction();
-//	if (CurrentReductionFactor>reduction) reduction=CurrentReductionFactor;
-	return Calculate_Texture_Memory_Usage(this,0);//reduction);
-}
-
-// ----------------------------------------------------------------------------
-
-int TextureClass::_Get_Total_Locked_Surface_Size()
-{
-	int total_locked_surface_size=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) {
-
-		// Get the current texture
-		TextureClass* tex=ite.Peek_Value();
-		if (!tex->Initialized) {
-//			total_locked_surface_size+=tex->Get_Non_Reduced_Texture_Memory_Usage();
-			total_locked_surface_size+=tex->Get_Texture_Memory_Usage();
-		}
-	}
-	return total_locked_surface_size;
-}
-
-// ----------------------------------------------------------------------------
-
-int TextureClass::_Get_Total_Texture_Size()
-{
-	int total_texture_size=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) {
-		// Get the current texture
-		TextureClass* tex=ite.Peek_Value();
-		total_texture_size+=tex->Get_Texture_Memory_Usage();
-	}
-	return total_texture_size;
-}
-
-// ----------------------------------------------------------------------------
-
-int TextureClass::_Get_Total_Lightmap_Texture_Size()
-{
-	int total_texture_size=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) {
-		// Get the current texture
-		TextureClass* tex=ite.Peek_Value();
-		if (tex->Is_Lightmap()) {
-			total_texture_size+=tex->Get_Texture_Memory_Usage();
-		}
-	}
-	return total_texture_size;
-}
-
-// ----------------------------------------------------------------------------
-
-int TextureClass::_Get_Total_Procedural_Texture_Size()
-{
-	int total_texture_size=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) {
-		// Get the current texture
-		TextureClass* tex=ite.Peek_Value();
-		if (tex->Is_Procedural()) {
-			total_texture_size+=tex->Get_Texture_Memory_Usage();
-		}
-	}
-	return total_texture_size;
-}
-
-// ----------------------------------------------------------------------------
-
-int TextureClass::_Get_Total_Texture_Count()
-{
-	int texture_count=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) {
-		texture_count++;
-	}
-
-	return texture_count;
-}
-
-// ----------------------------------------------------------------------------
-
-int TextureClass::_Get_Total_Lightmap_Texture_Count()
-{
-	int texture_count=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) {
-		if (ite.Peek_Value()->Is_Lightmap()) {
-			texture_count++;
-		}
-	}
-
-	return texture_count;
-}
-
-// ----------------------------------------------------------------------------
-
-int TextureClass::_Get_Total_Procedural_Texture_Count()
-{
-	int texture_count=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) {
-		if (ite.Peek_Value()->Is_Procedural()) {
-			texture_count++;
-		}
-	}
-
-	return texture_count;
-}
-
-// ----------------------------------------------------------------------------
-
-int TextureClass::_Get_Total_Locked_Surface_Count()
-{
-	int texture_count=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) {
-		// Get the current texture
-		TextureClass* tex=ite.Peek_Value();
-		if (!tex->Initialized) {
-			texture_count++;
-		}
-	}
-
-	return texture_count;
-}
-/*
-bool Validate_Filters(unsigned type)
-{
-	ShaderClass shader=ShaderClass::_PresetOpaqueShader;
-	shader.Apply();
-	DX8Wrapper::Set_DX8_Texture(0, MissingTexture::_Get_Missing_Texture());
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_MINFILTER,_MinTextureFilters[type]);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_MAGFILTER,_MagTextureFilters[type]);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_MIPFILTER,_MipMapFilters[type]);
-	unsigned long passes;
-	HRESULT hres=DX8Wrapper::_Get_D3D_Device8()->ValidateDevice(&passes);
-	return !FAILED(hres);
-}
-*/
-
-
-// Utility functions
-TextureClass* Load_Texture(ChunkLoadClass & cload)
-{
-	// Assume failure
-	TextureClass *newtex = NULL;
-
-	char name[256];
-	if (cload.Open_Chunk () && (cload.Cur_Chunk_ID () == W3D_CHUNK_TEXTURE)) 
-	{
-
-		W3dTextureInfoStruct texinfo;
-		bool hastexinfo = false;
-
-		/*
-		** Read in the texture filename, and a possible texture info structure.
-		*/
-		while (cload.Open_Chunk()) {
-			switch (cload.Cur_Chunk_ID()) {
-				case W3D_CHUNK_TEXTURE_NAME:
-					cload.Read(&name,cload.Cur_Chunk_Length());
-					break;
-
-				case W3D_CHUNK_TEXTURE_INFO:
-					cload.Read(&texinfo,sizeof(W3dTextureInfoStruct));
-					hastexinfo = true;
-					break;
-			};
-			cload.Close_Chunk();
-		}
-		cload.Close_Chunk();
-
-		/*
-		** Get the texture from the asset manager
-		*/
-		if (hastexinfo) 
-		{
-
-			MipCountType mipcount;
-
-			bool no_lod = ((texinfo.Attributes & W3DTEXTURE_NO_LOD) == W3DTEXTURE_NO_LOD);
-
-			if (no_lod) 
-			{
-				mipcount = MIP_LEVELS_1;
-			} 
-			else 
-			{
-				switch (texinfo.Attributes & W3DTEXTURE_MIP_LEVELS_MASK) {
-
-					case W3DTEXTURE_MIP_LEVELS_ALL:
-						mipcount = MIP_LEVELS_ALL;
-						break;
-
-					case W3DTEXTURE_MIP_LEVELS_2:
-						mipcount = MIP_LEVELS_2;
-						break;
-
-					case W3DTEXTURE_MIP_LEVELS_3:
-						mipcount = MIP_LEVELS_3;
-						break;
-
-					case W3DTEXTURE_MIP_LEVELS_4:
-						mipcount = MIP_LEVELS_4;
-						break;
-
-					default:
-						WWASSERT (false);
-						mipcount = MIP_LEVELS_ALL;
-						break;
-				}
-			}
-			newtex = WW3DAssetManager::Get_Instance()->Get_Texture (name, mipcount);
-
-			if (no_lod) 
-			{
-				newtex->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
-			}
-			bool u_clamp = ((texinfo.Attributes & W3DTEXTURE_CLAMP_U) != 0);
-			newtex->Get_Filter().Set_U_Addr_Mode(u_clamp ? TextureFilterClass::TEXTURE_ADDRESS_CLAMP : TextureFilterClass::TEXTURE_ADDRESS_REPEAT);
-			bool v_clamp = ((texinfo.Attributes & W3DTEXTURE_CLAMP_V) != 0);
-			newtex->Get_Filter().Set_V_Addr_Mode(v_clamp ? TextureFilterClass::TEXTURE_ADDRESS_CLAMP : TextureFilterClass::TEXTURE_ADDRESS_REPEAT);
-
-			switch (texinfo.Attributes & W3DTEXTURE_TYPE_MASK) 
-			{
-
-				case W3DTEXTURE_TYPE_COLORMAP:
-					// Do nothing.
-					break;
-
-				case W3DTEXTURE_TYPE_BUMPMAP:
-				{
-					TextureClass *releasetex = newtex;
-
-					// Format is assumed to be a grayscale heightmap. Convert it to a bump map.
-					newtex = WW3DAssetManager::Get_Instance()->Get_Bumpmap_Based_On_Texture (newtex);
-					WW3DAssetManager::Get_Instance()->Release_Texture (releasetex);
-					break;
-				}
-
-				default:
-					WWASSERT (false);
-					break;
-			}
-
-		} else {
-			newtex = WW3DAssetManager::Get_Instance()->Get_Texture(name);
-		}
-
-		WWASSERT(newtex);
-	}
-
-	// Return a pointer to the new texture	
-	return newtex;
-}
-
-// Utility function used by Save_Texture
-void setup_texture_attributes(TextureClass * tex, W3dTextureInfoStruct * texinfo)
-{
-	texinfo->Attributes = 0;
-
-	if (tex->Get_Filter().Get_Mip_Mapping() == TextureFilterClass::FILTER_TYPE_NONE) texinfo->Attributes |= W3DTEXTURE_NO_LOD;
-	if (tex->Get_Filter().Get_U_Addr_Mode() == TextureFilterClass::TEXTURE_ADDRESS_CLAMP) texinfo->Attributes |= W3DTEXTURE_CLAMP_U;
-	if (tex->Get_Filter().Get_V_Addr_Mode() == TextureFilterClass::TEXTURE_ADDRESS_CLAMP) texinfo->Attributes |= W3DTEXTURE_CLAMP_V;
-}
-
-
-void Save_Texture(TextureClass * texture,ChunkSaveClass & csave)
-{
-	const char * filename;
-	W3dTextureInfoStruct texinfo;
-	memset(&texinfo,0,sizeof(texinfo));
-
-	filename = texture->Get_Full_Path();
-
-	setup_texture_attributes(texture, &texinfo);
-
-	csave.Begin_Chunk(W3D_CHUNK_TEXTURE_NAME);
-	csave.Write(filename,strlen(filename)+1);
-	csave.End_Chunk();
-
-	if ((texinfo.Attributes != 0) || (texinfo.AnimType != 0) || (texinfo.FrameCount != 0)) {
-		csave.Begin_Chunk(W3D_CHUNK_TEXTURE_INFO);
-		csave.Write(&texinfo, sizeof(texinfo));
-		csave.End_Chunk();
-	}
-}
-
-// ----------------------------------------------------------------------------
-
-BumpmapTextureClass::BumpmapTextureClass(TextureClass* texture)
-	:
-//	TextureClass(texture->Get_Width(),texture->Get_Height(),texture->Get_Textur4e_Format(),MIP_LEVELS_1)
-	TextureClass(TextureLoader::Generate_Bumpmap(texture))
-{
-//	D3DTexture=TextureLoader::Generate_Bumpmap(texture);
-//		TextureLoader:::Generage_Bumpmap
-}
-
-BumpmapTextureClass::~BumpmapTextureClass()
-{
-}
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h
deleted file mode 100644
index bfc67c16d7f..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/texture.h                              $*
- *                                                                                             *
- *                      $Author:: Jani_p                                                      $*
- *                                                                                             *
- *                     $Modtime:: 8/17/01 9:41a                                               $*
- *                                                                                             *
- *                    $Revision:: 35                                                          $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef TEXTURE_H
-#define TEXTURE_H
-
-#include "always.h"
-#include "refcount.h"
-#include "chunkio.h"
-#include "surfaceclass.h"
-#include "ww3dformat.h"
-#include "wwstring.h"
-#include "texturefilter.h"
-
-struct IDirect3DBaseTexture8;
-struct IDirect3DTexture8;
-
-class DX8Wrapper;
-class TextureLoader;
-class LoaderThreadClass;
-class DX8TextureManagerClass;
-class TextureLoadTaskClass;
-
-/*************************************************************************
-**                             TextureClass
-**
-** This is our texture class. For legacy reasons it contains some
-** information beyond the D3D texture itself, such as texture addressing
-** modes.
-**
-*************************************************************************/
-class TextureClass : public W3DMPO, public RefCountClass
-{
-	W3DMPO_GLUE(TextureClass)
-
-	friend class DX8TextureTrackerClass;  //(gth) so it can call Poke_Texture, 
-
-	friend DX8Wrapper;
-	friend TextureLoader;
-	friend LoaderThreadClass;
-	friend DX8TextureManagerClass;
-
-	public:
-
-		enum PoolType {
-			POOL_DEFAULT=0,
-			POOL_MANAGED,
-			POOL_SYSTEMMEM
-		};
-
-		enum TexAssetType
-		{
-			TEX_REGULAR,
-		};
-
-		// Create texture with desired height, width and format.
-		TextureClass(
-			unsigned width, 
-			unsigned height, 
-			WW3DFormat format,
-			MipCountType mip_level_count=MIP_LEVELS_ALL,
-			PoolType pool=POOL_MANAGED,
-			bool rendertarget=false);
-
-		// Create texture from a file. If format is specified the texture is converted to that format.
-		// Note that the format must be supported by the current device and that a texture can't exist
-		// in the system with the same name in multiple formats.
-		TextureClass(
-			const char *name,
-			const char *full_path=NULL,
-			MipCountType mip_level_count=MIP_LEVELS_ALL,
-			WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN,
-			bool allow_compression=true);
-
-		// Create texture from a surface.
-		TextureClass(
-			SurfaceClass *surface, 
-			MipCountType mip_level_count=MIP_LEVELS_ALL);		
-
-		TextureClass(IDirect3DTexture8* d3d_texture);
-
-		virtual TexAssetType Get_Asset_Type() const { return TEX_REGULAR; }
-
-		virtual ~TextureClass(void);
-
-		// Names
-		void	Set_Texture_Name(const char * name);
-		void	Set_Full_Path(const char * path)			{ FullPath = path; }
-		const char * Get_Texture_Name(void) const		{ return Name; }
-		const char * Get_Full_Path(void) const			{ if (FullPath.Is_Empty ()) return Name; return FullPath; }
-
-		unsigned Get_ID() const { return texture_id; }	// Each textrure has a unique id
-
-		// The number of Mip levels in the texture
-		unsigned int Get_Mip_Level_Count(void);
-	
-		// Note! Width and Height may be zero and may change if texture uses mipmaps
-		int Get_Width() const
-		{
-			return Width;
-		}
-		int Get_Height() const
-		{
-			return Height; 
-		}
-
-		// Get surface description of a Mip level (defaults to the highest-resolution one)
-		void Get_Level_Description(SurfaceClass::SurfaceDescription &surface_desc, unsigned int level = 0);
-
-		TextureFilterClass& Get_Filter() { return Filter; }
-
-		// Get the surface of one of the mipmap levels (defaults to highest-resolution one)
-		SurfaceClass *Get_Surface_Level(unsigned int level = 0);
-
-		// Texture priority affects texture management and caching.
-		unsigned int Get_Priority(void);
-		unsigned int Set_Priority(unsigned int priority);	// Returns previous priority
-
-		// Debug utility functions for returning the texture memory usage
-		unsigned Get_Texture_Memory_Usage() const;
-		bool Is_Initialized() const { return Initialized; }
-		bool Is_Lightmap() const { return IsLightmap; }
-		bool Is_Procedural() const { return IsProcedural; }
-
-		static int _Get_Total_Locked_Surface_Size();
-		static int _Get_Total_Texture_Size();
-		static int _Get_Total_Lightmap_Texture_Size();
-		static int _Get_Total_Procedural_Texture_Size();
-		static int _Get_Total_Locked_Surface_Count();
-		static int _Get_Total_Texture_Count();
-		static int _Get_Total_Lightmap_Texture_Count();
-		static int _Get_Total_Procedural_Texture_Count();
-
-		static void _Set_Default_Min_Filter(TextureFilterClass::FilterType filter);
-		static void _Set_Default_Mag_Filter(TextureFilterClass::FilterType filter);
-		static void _Set_Default_Mip_Filter(TextureFilterClass::FilterType filter);
-
-		// This utility function processes the texture reduction (used during rendering)
-		void Invalidate();
-
-		IDirect3DTexture8 *Peek_D3D_Texture() const { return (IDirect3DTexture8 *)Peek_D3D_Base_Texture(); }
-
-		// texture accessors (dx8)
-		IDirect3DBaseTexture8 *Peek_D3D_Base_Texture() const;
-		void Set_D3D_Base_Texture(IDirect3DBaseTexture8* tex);
-
-		PoolType Get_Pool() const { return Pool; }
-
-		bool Is_Missing_Texture();
-
-		// Support for self managed textures
-		bool Is_Dirty() { WWASSERT(Pool==POOL_DEFAULT); return Dirty; };
-		void Set_Dirty() { WWASSERT(Pool==POOL_DEFAULT); Dirty=true; }
-		void Clean() { Dirty=false; };
-
-		unsigned Get_Reduction() const;
-		WW3DFormat Get_Texture_Format() const { return TextureFormat; }
-		bool Is_Compression_Allowed() const { return IsCompressionAllowed; }
-
-	protected:
-		void Poke_Texture(IDirect3DBaseTexture8* tex) { D3DTexture = tex; }
-
-		// Apply this texture's settings into D3D
-		virtual void Apply(unsigned int stage);
-		void Load_Locked_Surface();
-
-		void Init();
-
-		// Apply a Null texture's settings into D3D
-		static void Apply_Null(unsigned int stage);
-
-		// State not contained in the Direct3D texture object:
-		TextureFilterClass Filter;
-
-		// Direct3D texture object
-		IDirect3DBaseTexture8 *D3DTexture;
-		bool Initialized;
-
-		// Name
-		StringClass Name;
-		StringClass	FullPath;
-
-		// Unique id
-		unsigned texture_id;
-
-		// NOTE: Since "texture wrapping" (NOT TEXTURE WRAP MODE - THIS IS
-		// SOMETHING ELSE) is a global state that affects all texture stages,
-		// and this class only affects its own stage, we will not worry about
-		// it for now. Later (probably when we implement world-oriented
-		// environment maps) we will consider where to put it.
-
-		// For debug purposes the texture sets this true if it is a lightmap texture
-		bool IsLightmap;
-		bool IsProcedural;
-		bool IsCompressionAllowed;
-
-		mutable unsigned LastAccessed;
-		WW3DFormat TextureFormat;
-
-		int Width;
-		int Height;
-
-		// Support for self-managed textures
-
-		PoolType Pool;
-		bool Dirty;
-public:
-		MipCountType MipLevelCount;
-		TextureLoadTaskClass* TextureLoadTask;
-		// Background texture loader will call this when texture has been loaded
-		void Apply_New_Surface(bool initialized);	// If the parameter is true, the texture will be flagged as initialised
-
-};
-
-class BumpmapTextureClass : public TextureClass
-{
-public:
-	// Generate bumpmap texture procedurally from the source texture
-	BumpmapTextureClass(TextureClass* texture);
-	virtual ~BumpmapTextureClass();
-};
-
-// Utility functions for loading and saving texture descriptions from/to W3D files
-TextureClass *Load_Texture(ChunkLoadClass & cload);
-void Save_Texture(TextureClass * texture, ChunkSaveClass & csave);
-
-// TheSuperHackers @todo TextureBaseClass abstraction
-typedef TextureClass TextureBaseClass;
-
-#endif //TEXTURE_H
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.cpp
deleted file mode 100644
index 7e43f20afb7..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: ww3d2/texturefilter.cpp												$*
- *                                                                                             *
- *                  $Org Author:: Kenny Mitchell                                              $*
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 08/05/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 1                                                          $*
- *                                                                                             *
- * 08/05/02 KM Texture filter class abstraction																			*
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include "texturefilter.h"
-#include "dx8wrapper.h"
-#include "meshmatdesc.h"
-
-unsigned _MinTextureFilters[TextureFilterClass::FILTER_TYPE_COUNT];
-unsigned _MagTextureFilters[TextureFilterClass::FILTER_TYPE_COUNT];
-unsigned _MipMapFilters[TextureFilterClass::FILTER_TYPE_COUNT];
-
-/*************************************************************************
-**                             TextureFilterClass
-*************************************************************************/
-TextureFilterClass::TextureFilterClass(MipCountType mip_level_count=MIP_LEVELS_1)
-:	TextureMinFilter(FILTER_TYPE_DEFAULT),
-	TextureMagFilter(FILTER_TYPE_DEFAULT),
-	UAddressMode(TEXTURE_ADDRESS_REPEAT),
-	VAddressMode(TEXTURE_ADDRESS_REPEAT)
-{
-	if (mip_level_count!=MIP_LEVELS_1)
-	{
-		MipMapFilter=FILTER_TYPE_DEFAULT;
-	}
-	else
-	{
-		MipMapFilter=FILTER_TYPE_NONE;
-	}
-}
-
-//**********************************************************************************************
-//! Apply filters (legacy)
-/*!
-*/
-void TextureFilterClass::Apply(unsigned int stage)
-{
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,D3DTSS_MINFILTER,_MinTextureFilters[TextureMinFilter]);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,D3DTSS_MAGFILTER,_MagTextureFilters[TextureMagFilter]);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,D3DTSS_MIPFILTER,_MipMapFilters[MipMapFilter]);
-
-	switch (Get_U_Addr_Mode()) 
-	{
-	case TEXTURE_ADDRESS_REPEAT:
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		break;
-
-	case TEXTURE_ADDRESS_CLAMP:
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-		break;
-	}
-
-	switch (Get_V_Addr_Mode()) 
-	{
-	case TEXTURE_ADDRESS_REPEAT:
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-		break;
-
-	case TEXTURE_ADDRESS_CLAMP:
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-		break;
-	}
-}
-
-//**********************************************************************************************
-//! Init filters (legacy)
-/*!
-*/
-void TextureFilterClass::_Init_Filters(void)
-{
-	const D3DCAPS8& dx8caps=DX8Wrapper::Get_Current_Caps()->Get_DX8_Caps();
-
-	_MinTextureFilters[FILTER_TYPE_NONE]=D3DTEXF_POINT;
-	_MagTextureFilters[FILTER_TYPE_NONE]=D3DTEXF_POINT;
-	_MipMapFilters[FILTER_TYPE_NONE]=D3DTEXF_NONE;
-
-	_MinTextureFilters[FILTER_TYPE_FAST]=D3DTEXF_LINEAR;
-	_MagTextureFilters[FILTER_TYPE_FAST]=D3DTEXF_LINEAR;
-	_MipMapFilters[FILTER_TYPE_FAST]=D3DTEXF_POINT;
-
-	// Jani: Disabling anisotropic filtering as it doesn't seem to work with the latest nVidia drivers.
-	if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MAGFAFLATCUBIC) _MagTextureFilters[FILTER_TYPE_BEST]=D3DTEXF_FLATCUBIC;
-	else if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MAGFANISOTROPIC) _MagTextureFilters[FILTER_TYPE_BEST]=D3DTEXF_ANISOTROPIC;
-	else if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC) _MagTextureFilters[FILTER_TYPE_BEST]=D3DTEXF_GAUSSIANCUBIC;
-	else if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MAGFLINEAR) _MagTextureFilters[FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
-	else if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MAGFPOINT) _MagTextureFilters[FILTER_TYPE_BEST]=D3DTEXF_POINT;
-	else {
-		WWASSERT_PRINT(0,("No magnification filter found!"));
-	}
-
-	if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MINFANISOTROPIC) _MinTextureFilters[FILTER_TYPE_BEST]=D3DTEXF_ANISOTROPIC;
-	else if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MINFLINEAR) _MinTextureFilters[FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
-	else if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MINFPOINT) _MinTextureFilters[FILTER_TYPE_BEST]=D3DTEXF_POINT;
-	else {
-		WWASSERT_PRINT(0,("No minification filter found!"));
-	}
-
-	if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MIPFLINEAR) _MipMapFilters[FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
-	else if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MIPFPOINT) _MipMapFilters[FILTER_TYPE_BEST]=D3DTEXF_POINT;
-	else {
-		WWASSERT_PRINT(0,("No mip filter found!"));
-	}
-
-//_MagTextureFilters[FILTER_TYPE_BEST]=D3DTEXF_FLATCUBIC;
-//	WWASSERT(Validate_Filters(FILTER_TYPE_BEST));
-
-	_MinTextureFilters[FILTER_TYPE_DEFAULT]=_MinTextureFilters[FILTER_TYPE_BEST];
-	_MagTextureFilters[FILTER_TYPE_DEFAULT]=_MagTextureFilters[FILTER_TYPE_BEST];
-	_MipMapFilters[FILTER_TYPE_DEFAULT]=_MipMapFilters[FILTER_TYPE_BEST];
-
-	for (int stage=0;stage<MeshMatDescClass::MAX_TEX_STAGES;++stage) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage,D3DTSS_MAXANISOTROPY,2);
-	}
-}
-
-
-//**********************************************************************************************
-//! Set mip mapping filter (legacy)
-/*!
-*/
-void TextureFilterClass::Set_Mip_Mapping(FilterType mipmap)
-{
-//	if (mipmap != FILTER_TYPE_NONE && Get_Mip_Level_Count() <= 1 && Is_Initialized()) 
-//	{
-//		WWASSERT_PRINT(0, "Trying to enable MipMapping on texture w/o Mip levels!\n");
-//		return;
-//	}
-	MipMapFilter=mipmap;
-}
-
-//**********************************************************************************************
-//! Set default min filter (legacy)
-/*!
-*/
-void TextureFilterClass::_Set_Default_Min_Filter(FilterType filter)
-{
-	_MinTextureFilters[FILTER_TYPE_DEFAULT]=_MinTextureFilters[filter];
-}
-
-
-//**********************************************************************************************
-//! Set default mag filter (legacy)
-/*!
-*/
-void TextureFilterClass::_Set_Default_Mag_Filter(FilterType filter)
-{
-	_MagTextureFilters[FILTER_TYPE_DEFAULT]=_MagTextureFilters[filter];
-}
-
-//**********************************************************************************************
-//! Set default mip filter (legacy)
-/*!
-*/
-void TextureFilterClass::_Set_Default_Mip_Filter(FilterType filter)
-{
-	_MipMapFilters[FILTER_TYPE_DEFAULT]=_MipMapFilters[filter];
-}
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h
deleted file mode 100644
index 1b3ff7a64ff..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: ww3d2/texturefilter.h												$*
- *                                                                                             *
- *                  $Org Author:: Kenny Mitchell                                              $*
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 08/05/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 1                                                          $*
- *                                                                                             *
- * 08/05/02 KM Texture filter class abstraction																			*
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#ifndef TEXTUREFILTER_H
-#define TEXTUREFILTER_H
-
-#ifndef DX8_WRAPPER_H
-//#include "dx8wrapper.h"
-#endif
-
-enum MipCountType 
-{
-	MIP_LEVELS_ALL=0,		// generate all mipmap levels down to 1x1 size
-	MIP_LEVELS_1,			// no mipmapping at all (just one mip level)
-	MIP_LEVELS_2,
-	MIP_LEVELS_3,
-	MIP_LEVELS_4,
-	MIP_LEVELS_5,
-	MIP_LEVELS_6,
-	MIP_LEVELS_7,
-	MIP_LEVELS_8,
-	MIP_LEVELS_10,
-	MIP_LEVELS_11,
-	MIP_LEVELS_12,
-	MIP_LEVELS_MAX			// This isn't to be used (use MIP_LEVELS_ALL instead), it is just an enum for creating static tables etc.
-};
-
-
-// NOTE: Since "texture wrapping" (NOT TEXTURE WRAP MODE - THIS IS
-// SOMETHING ELSE) is a global state that affects all texture stages,
-// and this class only affects its own stage, we will not worry about
-// it for now. Later (probably when we implement world-oriented
-// environment maps) we will consider where to put it.
-
-// This is legacy and should be phased out into wwshade shader states
-// keeping as an abstracted class for now to support this transition later
-class TextureFilterClass
-{
-public:
-
-	enum FilterType 
-	{
-		FILTER_TYPE_NONE,
-		FILTER_TYPE_FAST,
-		FILTER_TYPE_BEST,
-		FILTER_TYPE_DEFAULT,
-		FILTER_TYPE_COUNT
-	};
-
-	enum TextureFilterMode
-	{
-		TEXTURE_FILTER_BILINEAR,
-		TEXTURE_FILTER_TRILINEAR,
-		TEXTURE_FILTER_ANISOTROPIC
-	};
-
-	enum TxtAddrMode
-	{
-		TEXTURE_ADDRESS_REPEAT=0,
-		TEXTURE_ADDRESS_CLAMP
-	};
-
-	TextureFilterClass(MipCountType mip_level_count);
-
-	void Apply(unsigned int stage);
-
-	// Filter and MIPmap settings:
-	FilterType Get_Min_Filter(void) const { return TextureMinFilter; }
-	FilterType Get_Mag_Filter(void) const { return TextureMagFilter; }
-	FilterType Get_Mip_Mapping(void) const { return MipMapFilter; }
-	void Set_Min_Filter(FilterType filter) { TextureMinFilter=filter; }
-	void Set_Mag_Filter(FilterType filter) { TextureMagFilter=filter; }
-	void Set_Mip_Mapping(FilterType mipmap);
-
-	// Texture address mode
-	TxtAddrMode Get_U_Addr_Mode(void) const { return UAddressMode; }
-	TxtAddrMode Get_V_Addr_Mode(void) const { return VAddressMode; }
-	void Set_U_Addr_Mode(TxtAddrMode mode) { UAddressMode=mode; }
-	void Set_V_Addr_Mode(TxtAddrMode mode) { VAddressMode=mode; }
-
-	// This needs to be called after device has been created
-	static void _Init_Filters(void);
-
-	static void _Set_Default_Min_Filter(FilterType filter);
-	static void _Set_Default_Mag_Filter(FilterType filter);
-	static void _Set_Default_Mip_Filter(FilterType filter);
-
-private:
-	// State not contained in the Direct3D texture object:
-	FilterType TextureMinFilter;
-	FilterType TextureMagFilter;
-	FilterType MipMapFilter;
-	TxtAddrMode UAddressMode;
-	TxtAddrMode VAddressMode;
-};
-
-#endif
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
deleted file mode 100644
index eda68049a07..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
+++ /dev/null
@@ -1,1376 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "textureloader.h"
-#include "mutex.h"
-#include "thread.h"
-#include "wwdebug.h"
-#include "texture.h"
-#include "ffactory.h"
-#include "wwstring.h"
-#include	"bufffile.h"
-#include "ww3d.h"
-#include "assetmgr.h"
-#include "dx8wrapper.h"
-#include "dx8caps.h"
-#include "missingtexture.h"
-#include "TARGA.H"
-#include <d3dx8tex.h>
-#include <cstdio>
-#include "wwmemlog.h"
-#include "texture.h"
-#include "formconv.h"
-#include "texturethumbnail.h"
-#include "ddsfile.h"
-#include "bitmaphandler.h"
-
-static TextureLoadTaskClass* LoadListHead;
-static TextureLoadTaskClass* DeferredListHead;
-static TextureLoadTaskClass* FinishedListHead;
-static TextureLoadTaskClass* ThumbnailListHead;
-static TextureLoadTaskClass* DeleteTaskListHead;
-
-TextureLoadTaskClass* TextureLoadTaskClass::FreeTaskListHead;
-
-static bool Is_Format_Compressed(WW3DFormat texture_format,bool allow_compression)
-{
-	// Verify that the user isn't requesting compressed texture without hardware support
-
-	bool compressed=false;
-	if (texture_format!=WW3D_FORMAT_UNKNOWN) {
-		if (!DX8Wrapper::Get_Current_Caps()->Support_DXTC() || !allow_compression) {
-			WWASSERT(texture_format!=WW3D_FORMAT_DXT1);
-			WWASSERT(texture_format!=WW3D_FORMAT_DXT2);
-			WWASSERT(texture_format!=WW3D_FORMAT_DXT3);
-			WWASSERT(texture_format!=WW3D_FORMAT_DXT4);
-			WWASSERT(texture_format!=WW3D_FORMAT_DXT5);
-		}
-		if (texture_format==WW3D_FORMAT_DXT1 ||
-			texture_format==WW3D_FORMAT_DXT2 ||
-			texture_format==WW3D_FORMAT_DXT3 ||
-			texture_format==WW3D_FORMAT_DXT4 ||
-			texture_format==WW3D_FORMAT_DXT5) {
-			compressed=true;
-		}
-	}
-
-	// If hardware supports DXTC compression, load a compressed texture. Proceed only if the texture format hasn't been
-	// defined as non-compressed.
-	compressed|=(
-		texture_format==WW3D_FORMAT_UNKNOWN &&
-		DX8Wrapper::Get_Current_Caps()->Support_DXTC() &&
-		allow_compression);
-
-	return compressed;
-}
-
-// ----------------------------------------------------------------------------
-
-static CriticalSectionClass mutex;
-static class LoaderThreadClass : public ThreadClass
-{
-	TextureLoadTaskClass* Get_Task_From_Load_List();
-
-	static void Add_Task_To_Finished_List(TextureLoadTaskClass* task);
-
-public:
-	LoaderThreadClass() : ThreadClass() {}
-
-	void Thread_Function();
-
-	static void Add_Task_To_Load_List(TextureLoadTaskClass* task);
-
-} thread;
-
-// ----------------------------------------------------------------------------
-
-void TextureLoader::Init()
-{
-	WWASSERT(!thread.Is_Running());
-
-	ThumbnailClass::Init();
-
-	thread.Execute();
-	thread.Set_Priority(-3);
-}
-
-// ----------------------------------------------------------------------------
-
-void TextureLoader::Deinit()
-{
-	CriticalSectionClass::LockClass m(mutex);
-	thread.Stop();
-
-	ThumbnailClass::Deinit();
-}
-
-// ----------------------------------------------------------------------------
-//
-// Modify given texture size to nearest valid size on current hardware.
-//
-// ----------------------------------------------------------------------------
-
-void TextureLoader::Validate_Texture_Size(unsigned& width, unsigned& height)
-{
-	const D3DCAPS8& dx8caps=DX8Wrapper::Get_Current_Caps()->Get_DX8_Caps();
-
-	unsigned poweroftwowidth = 1;
-	while (poweroftwowidth < width) {
-		poweroftwowidth <<= 1;
-	}
-
-	unsigned poweroftwoheight = 1;
-	while (poweroftwoheight < height) {
-		poweroftwoheight <<= 1;
-	}
-
-//	unsigned size = MAX (width, height);
-//	unsigned poweroftwosize = 1;
-//	while (poweroftwosize < size) {
-//		poweroftwosize <<= 1;
-//	}
-
-	if (poweroftwowidth>dx8caps.MaxTextureWidth) {
-		poweroftwowidth=dx8caps.MaxTextureWidth;
-	}
-	if (poweroftwoheight>dx8caps.MaxTextureHeight) {
-		poweroftwoheight=dx8caps.MaxTextureHeight;
-	}
-
-	if (poweroftwowidth>poweroftwoheight) {
-		while (poweroftwowidth/poweroftwoheight>8) {
-			poweroftwoheight*=2;
-		}
-	}
-	else {
-		while (poweroftwoheight/poweroftwowidth>8) {
-			poweroftwowidth*=2;
-		}
-	}
-
-//	width = height = poweroftwosize;
-	width=poweroftwowidth;
-	height=poweroftwoheight;
-}
-
-
-
-IDirect3DTexture8* TextureLoader::Load_Thumbnail(const StringClass& filename,WW3DFormat texture_format)
-{
-	ThumbnailClass* thumb=ThumbnailClass::Peek_Instance(filename);
-	if (!thumb) {
-		thumb=W3DNEW ThumbnailClass(filename);
-		// If load failed, return missing texture
-		if (!thumb->Peek_Bitmap()) {
-			delete thumb;
-			return MissingTexture::_Get_Missing_Texture();
-		}
-	}
-
-	unsigned src_pitch=thumb->Get_Width()*4;	// Thumbs are always 32 bits
-	WW3DFormat dest_format;
-	if (texture_format==WW3D_FORMAT_UNKNOWN) {
-		dest_format=Get_Valid_Texture_Format(WW3D_FORMAT_A8R8G8B8,false); // no compressed formats please
-	}
-	else {
-		dest_format=Get_Valid_Texture_Format(texture_format,false);	// no compressed formats please
-		WWASSERT(dest_format==texture_format);
-	}
-
-	IDirect3DTexture8* d3d_texture = DX8Wrapper::_Create_DX8_Texture(
-		thumb->Get_Width(),
-		thumb->Get_Height(),
-		dest_format,
-		MIP_LEVELS_ALL);
-
-	unsigned level=0;
-	D3DLOCKED_RECT locked_rects[12];
-	WWASSERT(d3d_texture->GetLevelCount()<=12);
-
-	// Lock all surfaces
-	for (level=0;level<d3d_texture->GetLevelCount();++level) {
-		DX8_ErrorCode(
-			d3d_texture->LockRect(
-				level,
-				&locked_rects[level],
-				NULL,
-				0));
-	}
-
-	unsigned char* src_surface=thumb->Peek_Bitmap();
-	WW3DFormat src_format=WW3D_FORMAT_A8R8G8B8;
-	unsigned width=thumb->Get_Width();
-	unsigned height=thumb->Get_Height();
-
-	for (level=0;level<d3d_texture->GetLevelCount()-1;++level) {
-		BitmapHandlerClass::Copy_Image_Generate_Mipmap(
-			width,
-			height,
-			(unsigned char*)locked_rects[level].pBits, 
-			locked_rects[level].Pitch,
-			dest_format,
-			src_surface,
-			src_pitch,
-			src_format,
-			(unsigned char*)locked_rects[level+1].pBits,	// mipmap
-			locked_rects[level+1].Pitch);// mipmap
-
-		src_format=dest_format;
-		src_surface=(unsigned char*)locked_rects[level].pBits;
-		src_pitch=locked_rects[level].Pitch;
-		width>>=1;
-		height>>=1;
-	}
-
-	// Unlock all surfaces
-	for (level=0;level<d3d_texture->GetLevelCount();++level) {
-		DX8_ErrorCode(d3d_texture->UnlockRect(level));
-	}
-
-	return d3d_texture;
-}
-
-static bool Is_Power_Of_Two(unsigned i)
-{
-	if (!i) return false;
-	unsigned n=i;
-	unsigned shift=0;
-	while (n) {
-		shift++;
-		n>>=1;
-	}
-	return ((i>>(shift-1))<<(shift-1))==i;
-}
-
-// ----------------------------------------------------------------------------
-
-// TODO: Legacy - remove this call!
-IDirect3DTexture8* Load_Compressed_Texture(
-	const StringClass& filename, 
-	unsigned reduction_factor,
-	MipCountType mip_level_count,
-	WW3DFormat dest_format)
-{
-	// If DDS file isn't available, use TGA file to convert to DDS.
-
-	DDSFileClass dds_file(filename,reduction_factor);
-	if (!dds_file.Is_Available()) return NULL;
-	if (!dds_file.Load()) return NULL;
-
-	unsigned width=dds_file.Get_Width(0);
-	unsigned height=dds_file.Get_Height(0);
-	unsigned mips=dds_file.Get_Mip_Level_Count();
-
-	// If format isn't defined get the nearest valid texture format to the compressed file format
-	// Note that the nearest valid format could be anything, even uncompressed.
-	if (dest_format==WW3D_FORMAT_UNKNOWN) dest_format=Get_Valid_Texture_Format(dds_file.Get_Format(),true);
-
-	IDirect3DTexture8* d3d_texture = DX8Wrapper::_Create_DX8_Texture(
-		width,
-		height,
-		dest_format,
-		(MipCountType)mips);
-
-	for (unsigned level=0;level<mips;++level) {
-		IDirect3DSurface8* d3d_surface=NULL;
-		WWASSERT(d3d_texture);
-		DX8_ErrorCode(d3d_texture->GetSurfaceLevel(level/*-reduction_factor*/,&d3d_surface));
-		dds_file.Copy_Level_To_Surface(level,d3d_surface);
-		d3d_surface->Release();
-	}
-	return d3d_texture;
-}
-
-// ----------------------------------------------------------------------------
-//
-// Load image to a surface. The function tries to create texture that matches
-// targa format. If suitable format is not available, it selects closest matching
-// format and performs color space conversion.
-//
-// ----------------------------------------------------------------------------
-IDirect3DSurface8* TextureLoader::Load_Surface_Immediate(
-	const StringClass& filename,
-	WW3DFormat texture_format,
-	bool allow_compression)
-{
-	bool compressed=Is_Format_Compressed(texture_format,allow_compression);
-
-	if (compressed) {
-		IDirect3DTexture8* comp_tex=Load_Compressed_Texture(filename,0,MIP_LEVELS_1,WW3D_FORMAT_UNKNOWN);
-		if (comp_tex) {
-			IDirect3DSurface8* d3d_surface=NULL;
-			DX8_ErrorCode(comp_tex->GetSurfaceLevel(0,&d3d_surface));
-			comp_tex->Release();
-			return d3d_surface;
-		}
-	}
-
-	// Make sure the file can be opened. If not, return missing texture.
-	Targa targa;
-	if (TARGA_ERROR_HANDLER(targa.Open(filename, TGA_READMODE),filename)) return MissingTexture::_Create_Missing_Surface();
-
-	// DX8 uses image upside down compared to TGA
-	targa.Header.ImageDescriptor ^= TGAIDF_YORIGIN;
-
-	WW3DFormat src_format,dest_format;
-	unsigned src_bpp=0;
-	Get_WW3D_Format(dest_format,src_format,src_bpp,targa);
-
-	if (texture_format!=WW3D_FORMAT_UNKNOWN) {
-		dest_format=texture_format;
-	}
-
-	// Destination size will be the next power of two square from the larger width and height...
-	unsigned width, height;
-	width=targa.Header.Width;
-	height=targa.Header.Height;
-	unsigned src_width=targa.Header.Width;
-	unsigned src_height=targa.Header.Height;
-
-	// NOTE: We load the palette but we do not yet support paletted textures!
-	char palette[256*4];
-	targa.SetPalette(palette);
-	if (TARGA_ERROR_HANDLER(targa.Load(filename, TGAF_IMAGE, false),filename)) return MissingTexture::_Create_Missing_Surface();
-
-	unsigned char* src_surface=(unsigned char*)targa.GetImage();
-
-	// No paletted destination format allowed
-	unsigned char* converted_surface=NULL;
-	if (src_format==WW3D_FORMAT_A1R5G5B5 || src_format==WW3D_FORMAT_R5G6B5 || src_format==WW3D_FORMAT_A4R4G4B4 ||
-		src_format==WW3D_FORMAT_P8 || src_format==WW3D_FORMAT_L8 || src_width!=width || src_height!=height) {
-		converted_surface=W3DNEWARRAY unsigned char[width*height*4];
-		dest_format=Get_Valid_Texture_Format(WW3D_FORMAT_A8R8G8B8,false);
-		BitmapHandlerClass::Copy_Image(
-			converted_surface, 
-			width,
-			height,
-			width*4,
-			WW3D_FORMAT_A8R8G8B8,//dest_format,
-			src_surface,
-			src_width,
-			src_height,
-			src_width*src_bpp,
-			src_format,
-			(unsigned char*)targa.GetPalette(),
-			targa.Header.CMapDepth>>3,
-			false);
-		src_surface=converted_surface;
-		src_format=WW3D_FORMAT_A8R8G8B8;//dest_format;
-		src_width=width;
-		src_height=height;
-		src_bpp=Get_Bytes_Per_Pixel(src_format);
-	}
-
-	unsigned src_pitch=src_width*src_bpp;
-
-	IDirect3DSurface8* d3d_surface = DX8Wrapper::_Create_DX8_Surface(width,height,dest_format);
-	WWASSERT(d3d_surface);
-	D3DLOCKED_RECT locked_rect;
-	DX8_ErrorCode(
-		d3d_surface->LockRect(
-			&locked_rect,
-			NULL,
-			0));
-
-	BitmapHandlerClass::Copy_Image(
-		(unsigned char*)locked_rect.pBits, 
-		width,
-		height,
-		locked_rect.Pitch,
-		dest_format,
-		src_surface,
-		src_width,
-		src_height,
-		src_pitch,
-		src_format,
-		(unsigned char*)targa.GetPalette(),
-		targa.Header.CMapDepth>>3,
-		false);	// No mipmap
-
-	DX8_ErrorCode(d3d_surface->UnlockRect());
-
-	if (converted_surface) delete[] converted_surface;
-
-	return d3d_surface;
-}
-
-
-// ----------------------------------------------------------------------------
-//
-// Load mipmap levels to a pre-generated and locked texture object based on
-// information in load task object. Try loading from a DDS file first and if
-// that fails try a TGA.
-//
-// ----------------------------------------------------------------------------
-
-void TextureLoader::Load_Mipmap_Levels(TextureLoadTaskClass* task)
-{
-	WWASSERT(task->Peek_D3D_Texture());
-	WWMEMLOG(MEM_TEXTURE);
-
-	if (task->Peek_Texture()->Is_Compression_Allowed()) {
-		DDSFileClass dds_file(task->Peek_Texture()->Get_Full_Path(),task->Get_Reduction());
-		if (dds_file.Is_Available() && dds_file.Load()) {
-			unsigned width=task->Get_Width();
-			unsigned height=task->Get_Height();
-			for (unsigned level=0;level<task->Get_Mip_Level_Count();++level) {
-				WWASSERT(width && height);
-				dds_file.Copy_Level_To_Surface(
-					level,
-					task->Get_Format(),
-					width, 
-					height, 
-					task->Get_Locked_Surface_Ptr(level), 
-					task->Get_Locked_Surface_Pitch(level));
-				width>>=1;
-				height>>=1;
-			}
-			return;
-		}
-	}
-	if (Load_Uncompressed_Mipmap_Levels_From_TGA(task)) return;
-}
-
-// ----------------------------------------------------------------------------
-//
-// Use load task to load texture surface from a targa file. Calculate mipmaps
-// if needed.
-//
-// ----------------------------------------------------------------------------
-
-bool TextureLoader::Load_Uncompressed_Mipmap_Levels_From_TGA(TextureLoadTaskClass* task)
-{
-	if (!task->Get_Mip_Level_Count()) return false;
-	TextureBaseClass* texture=task->Peek_Texture();
-
-	Targa targa;
-	if (TARGA_ERROR_HANDLER(targa.Open(texture->Get_Full_Path(), TGA_READMODE),texture->Get_Full_Path())) {
-		task->Set_Fail(true);
-		return false;
-	}
-	// DX8 uses image upside down compared to TGA
-	targa.Header.ImageDescriptor ^= TGAIDF_YORIGIN;
-
-	WW3DFormat src_format,dest_format;
-	unsigned src_bpp=0;
-	Get_WW3D_Format(dest_format,src_format,src_bpp,targa);
-//	WWASSERT(task->Get_Format()==dest_format);
-	dest_format=task->Get_Format();	// Texture can be requested in different format than the most obvious from the TGA
-
-	char palette[256*4];
-	targa.SetPalette(palette);
-
-	unsigned src_width=targa.Header.Width;
-	unsigned src_height=targa.Header.Height;
-	unsigned width=task->Get_Width();
-	unsigned height=task->Get_Height();
-
-	// NOTE: We load the palette but we do not yet support paletted textures!
-	if (TARGA_ERROR_HANDLER(targa.Load(texture->Get_Full_Path(), TGAF_IMAGE, false),texture->Get_Full_Path())) {
-		task->Set_Fail(true);
-		return false;
-	}
-	unsigned char* src_surface=(unsigned char*)targa.GetImage();
-
-	// No paletted format allowed when generating mipmaps
-	unsigned char* converted_surface=NULL;
-	if (src_format==WW3D_FORMAT_A1R5G5B5 || src_format==WW3D_FORMAT_R5G6B5 || src_format==WW3D_FORMAT_A4R4G4B4 ||
-		src_format==WW3D_FORMAT_P8 || src_format==WW3D_FORMAT_L8 || src_width!=width || src_height!=height) {
-		converted_surface=W3DNEWARRAY unsigned char[width*height*4];
-		dest_format=Get_Valid_Texture_Format(WW3D_FORMAT_A8R8G8B8,false);
-		BitmapHandlerClass::Copy_Image(
-			converted_surface, 
-			width,
-			height,
-			width*4,
-			WW3D_FORMAT_A8R8G8B8,	//dest_format,
-			src_surface,
-			src_width,
-			src_height,
-			src_width*src_bpp,
-			src_format,
-			(unsigned char*)targa.GetPalette(),
-			targa.Header.CMapDepth>>3,
-			false);
-		src_surface=converted_surface;
-		src_format=WW3D_FORMAT_A8R8G8B8;	//dest_format;
-		src_width=width;
-		src_height=height;
-		src_bpp=Get_Bytes_Per_Pixel(src_format);
-	}
-
-	unsigned src_pitch=src_width*src_bpp;
-
-	for (unsigned level=0;level<task->Get_Mip_Level_Count();++level) {
-		WWASSERT(task->Get_Locked_Surface_Ptr(level));
-		BitmapHandlerClass::Copy_Image(
-			task->Get_Locked_Surface_Ptr(level),
-			width,
-			height,
-			task->Get_Locked_Surface_Pitch(level),
-			task->Get_Format(),
-			src_surface,
-			src_width,
-			src_height,
-			src_pitch,
-			src_format,
-			NULL,
-			0,
-			true);
-
-		width>>=1;
-		height>>=1;
-		src_width>>=1;
-		src_height>>=1;
-		if (!width || !height || !src_width || !src_height) break;
-	}
-
-	if (converted_surface) delete[] converted_surface;
-
-	return true;
-}
-
-// ----------------------------------------------------------------------------
-//
-// Return a task from the load list head. The loading thread uses this function
-// to retrieve tasks from the load list.
-//
-// ----------------------------------------------------------------------------
-
-TextureLoadTaskClass* LoaderThreadClass::Get_Task_From_Load_List()
-{
-	CriticalSectionClass::LockClass m(mutex);
-
-	TextureLoadTaskClass* task=LoadListHead;
-	if (task) {
-		LoadListHead=task->Peek_Succ();
-		task->Set_Succ(NULL);
-	}
-	return task;
-}
-
-// ----------------------------------------------------------------------------
-//
-// This function adds a load task to the head of the loading thread task list.
-// The latest added task will be the next processed (There are good reasons
-// for such ordering). The loading thread will process tasks from this list
-// as soons as it can and then move the tasks to finished list.
-//
-// ----------------------------------------------------------------------------
-
-void LoaderThreadClass::Add_Task_To_Load_List(TextureLoadTaskClass* task)
-{
-	CriticalSectionClass::LockClass m(mutex);
-
-	WWASSERT(task->Peek_Succ()==NULL);
-
-	task->Set_Succ(LoadListHead);
-	LoadListHead=task;
-}
-
-// ----------------------------------------------------------------------------
-//
-// After the loading thread is done with the texture, it is moved to the list
-// of finished tasks so that the main thread can then finish up by unlocking
-// the surfaces and applying the changes to the texture class object.
-//
-// ----------------------------------------------------------------------------
-
-void LoaderThreadClass::Add_Task_To_Finished_List(TextureLoadTaskClass* task)
-{
-	CriticalSectionClass::LockClass m(mutex);
-
-	WWASSERT(task->Peek_Succ()==NULL);
-
-	task->Set_Succ(FinishedListHead);
-	FinishedListHead=task;
-}
-
-// ----------------------------------------------------------------------------
-//
-// If we need to find out if the load task list is empty this is the function
-// to use. We can't use Get_Task_From_Load_List() as if the list isn't empty
-// it also removes the head node from the list.
-//
-// ----------------------------------------------------------------------------
-
-bool Is_Load_List_Empty()
-{
-	return !LoadListHead;
-}
-// ----------------------------------------------------------------------------
-//
-// Texture loading thread loads textures that appear in loading_task_list.
-// If the list is empty the thread sleeps.
-//
-// ----------------------------------------------------------------------------
-
-void LoaderThreadClass::Thread_Function()
-{
-	while (running) {
-		TextureLoadTaskClass* task=Get_Task_From_Load_List();
-		if (task) {
-			TextureLoader::Load_Mipmap_Levels(task);
-			Add_Task_To_Finished_List(task);
-		}
-
-		Switch_Thread();
-	}
-}
-
-// ----------------------------------------------------------------------------
-//
-// Update refreshes all completed texture loading tasks
-//
-// ----------------------------------------------------------------------------
-
-TextureLoadTaskClass* Get_Finished_Task()
-{
-	CriticalSectionClass::LockClass m(mutex);
-
-	TextureLoadTaskClass* task=FinishedListHead;
-	if (task) {
-		FinishedListHead=task->Peek_Succ();
-		task->Set_Succ(NULL);
-	}
-	return task;
-}
-
-TextureLoadTaskClass* Get_Thumbnail_Task()
-{
-	CriticalSectionClass::LockClass m(mutex);
-
-	TextureLoadTaskClass* task=ThumbnailListHead;
-	if (task) {
-		ThumbnailListHead=task->Peek_Succ();
-		task->Set_Succ(NULL);
-	}
-	return task;
-}
-
-void Add_Thumbnail_Task(TextureLoadTaskClass* task)
-{
-	CriticalSectionClass::LockClass m(mutex);
-
-	WWASSERT(task->Peek_Succ()==NULL);
-
-	task->Set_Succ(ThumbnailListHead);
-	ThumbnailListHead=task;
-
-}
-
-// ----------------------------------------------------------------------------
-//
-// The main thread's update function deletes tasks from the load task list
-// once a frame.
-//
-// ----------------------------------------------------------------------------
-
-TextureLoadTaskClass* Get_Task_From_Delete_List()
-{
-	WWASSERT(ThreadClass::_Get_Current_Thread_ID()==DX8Wrapper::_Get_Main_Thread_ID());
-
-	TextureLoadTaskClass* task=DeleteTaskListHead;
-	if (task) {
-		DeleteTaskListHead=task->Peek_Succ();
-		task->Set_Succ(NULL);
-	}
-	return task;
-}
-
-// ----------------------------------------------------------------------------
-//
-// When task wants to delete itself it adds itself to a delete list. This list
-// can only be accessed from the main thread.
-//
-// ----------------------------------------------------------------------------
-
-void Add_Task_To_Delete_List(TextureLoadTaskClass* task)
-{
-	WWASSERT(ThreadClass::_Get_Current_Thread_ID()==DX8Wrapper::_Get_Main_Thread_ID());
-
-	WWASSERT(task->Peek_Succ()==NULL);
-
-	task->Set_Succ(DeleteTaskListHead);
-	DeleteTaskListHead=task;
-}
-
-TextureLoadTaskClass* Get_Deferred_Task()
-{
-	CriticalSectionClass::LockClass m(mutex);
-
-	TextureLoadTaskClass* task=DeferredListHead;
-	if (task) {
-		DeferredListHead=task->Peek_Succ();
-		task->Set_Succ(NULL);
-	}
-	return task;
-}
-
-void Add_Deferred_Task(TextureLoadTaskClass* task)
-{
-	CriticalSectionClass::LockClass m(mutex);
-
-	WWASSERT(task->Peek_Succ()==NULL);
-	task->Set_Succ(DeferredListHead);
-	DeferredListHead=task;
-}
-
-void TextureLoader::Flush_Pending_Load_Tasks()
-{
-	while (!Is_Load_List_Empty()) {
-		Update();
-		ThreadClass::Switch_Thread();
-	}
-}
-
-void TextureLoader::Update()
-{
-	WWASSERT_PRINT(DX8Wrapper::_Get_Main_Thread_ID()==ThreadClass::_Get_Current_Thread_ID(),"TextureLoader::Update must be called from the main thread!");
-
-	while (TextureLoadTaskClass* task=Get_Deferred_Task()) {
-		task->Begin_Texture_Load();	// This will add the task to load list
-	}
-
-	while (TextureLoadTaskClass* task=Get_Finished_Task()) {
-		task->End_Load();
-		task->Apply(true);
-		TextureLoadTaskClass::Release_Instance(task);
-	}
-
-	while (TextureLoadTaskClass* task=Get_Thumbnail_Task()) {
-		task->Begin_Thumbnail_Load();
-	}
-
-	while (TextureLoadTaskClass* task=Get_Task_From_Delete_List()) {
-//		delete task;
-		TextureLoadTaskClass::Release_Instance(task);
-	}
-}
-
-// ----------------------------------------------------------------------------
-
-static DWORD VectortoRGBA( D3DXVECTOR3* v, FLOAT fHeight )
-{
-    DWORD r = (DWORD)( 127.0f * v->x + 128.0f );
-    DWORD g = (DWORD)( 127.0f * v->y + 128.0f );
-    DWORD b = (DWORD)( 127.0f * v->z + 128.0f );
-    DWORD a = (DWORD)( 255.0f * fHeight );
-    
-    return( (a<<24L) + (r<<16L) + (g<<8L) + (b<<0L) );
-}
-
-IDirect3DTexture8* TextureLoader::Generate_Bumpmap(TextureBaseClass* texture)
-{
-	WW3DFormat bump_format=WW3D_FORMAT_U8V8;
-	if (!DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(bump_format)) {
-		return MissingTexture::_Get_Missing_Texture();
-	}
-
-	D3DSURFACE_DESC desc;
-	IDirect3DTexture8* src_d3d_tex=texture->Peek_D3D_Texture();
-	WWASSERT(src_d3d_tex);
-	DX8_ErrorCode(src_d3d_tex->GetLevelDesc(0,&desc));
-	unsigned width=desc.Width;
-	unsigned height=desc.Height;
-
-	IDirect3DTexture8* d3d_texture = DX8Wrapper::_Create_DX8_Texture(
-		width,
-		height,
-		bump_format,
-		MIP_LEVELS_1);
-
-	D3DLOCKED_RECT src_locked_rect;
-	DX8_ErrorCode(
-		texture->Peek_D3D_Texture()->LockRect(
-			0,
-			&src_locked_rect,
-			NULL,
-			D3DLOCK_READONLY));
-
-	D3DLOCKED_RECT dest_locked_rect;
-	DX8_ErrorCode(
-		d3d_texture->LockRect(
-			0,
-			&dest_locked_rect,
-			NULL,
-			0));
-
-	WW3DFormat format=D3DFormat_To_WW3DFormat(desc.Format);
-	unsigned bpp=Get_Bytes_Per_Pixel(format);
-
-	for( unsigned y=0; y<desc.Height; y++ )
-	{
-		unsigned char* dest_ptr  = (unsigned char*)dest_locked_rect.pBits;
-		dest_ptr+=y*dest_locked_rect.Pitch;
-		unsigned char* src_ptr_mid = (unsigned char*)src_locked_rect.pBits;
-		src_ptr_mid+=y*src_locked_rect.Pitch;
-		unsigned char* src_ptr_next_line = ( src_ptr_mid + src_locked_rect.Pitch );
-		unsigned char* src_ptr_prev_line = ( src_ptr_mid - src_locked_rect.Pitch );
-
-		if( y == desc.Height-1 )  // Don't go past the last line
-			src_ptr_next_line = src_ptr_mid;
-		if( y == 0 )               // Don't go before first line
-			src_ptr_prev_line = src_ptr_mid;
-
-		for( unsigned x=0; x<desc.Width; x++ )
-		{
-			unsigned pixel00;
-			unsigned pixel01;
-			unsigned pixelM1;
-			unsigned pixel10;
-			unsigned pixel1M;
-
-			BitmapHandlerClass::Read_B8G8R8A8(pixel00,src_ptr_mid,format,NULL,0);
-			BitmapHandlerClass::Read_B8G8R8A8(pixel01,src_ptr_mid+bpp,format,NULL,0);
-			BitmapHandlerClass::Read_B8G8R8A8(pixelM1,src_ptr_mid-bpp,format,NULL,0);
-			BitmapHandlerClass::Read_B8G8R8A8(pixel10,src_ptr_prev_line,format,NULL,0);
-			BitmapHandlerClass::Read_B8G8R8A8(pixel1M,src_ptr_next_line,format,NULL,0);
-
-			// Convert to luminance
-			unsigned char bv00;
-			unsigned char bv01;
-			unsigned char bvM1;
-			unsigned char bv10;
-			unsigned char bv1M;
-			BitmapHandlerClass::Write_B8G8R8A8(&bv00,WW3D_FORMAT_L8,pixel00);
-			BitmapHandlerClass::Write_B8G8R8A8(&bv01,WW3D_FORMAT_L8,pixel01);
-			BitmapHandlerClass::Write_B8G8R8A8(&bvM1,WW3D_FORMAT_L8,pixelM1);
-			BitmapHandlerClass::Write_B8G8R8A8(&bv10,WW3D_FORMAT_L8,pixel10);
-			BitmapHandlerClass::Write_B8G8R8A8(&bv1M,WW3D_FORMAT_L8,pixel1M);
-			int v00=bv00,v01=bv01,vM1=bvM1,v10=bv10,v1M=bv1M;
-
-			int iDu = (vM1-v01); // The delta-u bump value
-			int iDv = (v1M-v10); // The delta-v bump value
-
-			if( (v00 < vM1) && (v00 < v01) )  // If we are at valley
-			{
-				 iDu = vM1-v00;                 // Choose greater of 1st order diffs
-				 if( iDu < v00-v01 )
-					  iDu = v00-v01;
-			}
-
-			// The luminance bump value (land masses are less shiny)
-			unsigned short uL = ( v00>1 ) ? 63 : 127;
-
-			switch( bump_format )
-			{
-			case WW3D_FORMAT_U8V8:
-				*dest_ptr++ = (unsigned char)iDu;
-				*dest_ptr++ = (unsigned char)iDv;
-				break;
-
-			case WW3D_FORMAT_L6V5U5:
-				*(unsigned short*)dest_ptr  = (unsigned short)( ( (iDu>>3) & 0x1f ) <<  0 );
-				*(unsigned short*)dest_ptr |= (unsigned short)( ( (iDv>>3) & 0x1f ) <<  5 );
-				*(unsigned short*)dest_ptr |= (unsigned short)( ( ( uL>>2) & 0x3f ) << 10 );
-				dest_ptr += 2;
-				break;
-
-			case WW3D_FORMAT_X8L8V8U8:
-				*dest_ptr++ = (unsigned char)iDu;
-				*dest_ptr++ = (unsigned char)iDv;
-				*dest_ptr++ = (unsigned char)uL;
-				*dest_ptr++ = (unsigned char)0L;
-				break;
-			}
-
-			// Move one pixel to the left (src is 32-bpp)
-			src_ptr_mid+=bpp;
-			src_ptr_prev_line+=bpp;
-			src_ptr_next_line+=bpp;
-		}
-	}
-
-	DX8_ErrorCode(d3d_texture->UnlockRect(0));
-	DX8_ErrorCode(texture->Peek_D3D_Texture()->UnlockRect(0));
-	return d3d_texture;
-}
-
-// ----------------------------------------------------------------------------
-//
-// Public texture request functions. These functions can be used to request
-// texture loading.
-//
-// ----------------------------------------------------------------------------
-
-void TextureLoader::Add_Load_Task(TextureBaseClass* tc)
-{
-	// If the texture is already being loaded we just exit here.
-	if (tc->TextureLoadTask) return;
-
-	TextureLoadTaskClass* task=TextureLoadTaskClass::Get_Instance(tc,false);
-	task->Begin_Texture_Load();
-}
-
-// ----------------------------------------------------------------------------
-
-void TextureLoader::Request_High_Priority_Loading(
-	TextureBaseClass* tc,
-	MipCountType mip_level_count)
-{
-	TextureLoadTaskClass* task=TextureLoadTaskClass::Get_Instance(tc,true);
-	task->Begin_Texture_Load();
-}
-
-// ----------------------------------------------------------------------------
-
-void TextureLoader::Request_Thumbnail(TextureBaseClass* tc)
-{
-	// If the texture is already being loaded we just exit here.
-	if (tc->TextureLoadTask) return;
-
-	TextureLoadTaskClass* task=TextureLoadTaskClass::Get_Instance(tc,false);
-	task->Begin_Thumbnail_Load();
-}
-
-// ----------------------------------------------------------------------------
-//
-// Texture loader task handler
-//
-// ----------------------------------------------------------------------------
-
-TextureLoadTaskClass::TextureLoadTaskClass()
-	:
-	Texture(0),
-	Succ(0), 
-	D3DTexture(0),
-	Width(0),
-	Height(0),
-	Format(WW3D_FORMAT_UNKNOWN),
-	IsLoading(false),
-	HasFailed(false),
-	MipLevelCount(0),
-	HighPriorityRequested(false),
-	Reduction(0)
-{
-}
-
-// ----------------------------------------------------------------------------
-//
-// Destruct texture load task. The load task deinitialization will fail from
-// any other than the main thread so the task must be either deleted from the
-// main thread or deinitialized in the main thread prior to deleting it in
-// another thread.
-//
-// ----------------------------------------------------------------------------
-
-TextureLoadTaskClass::~TextureLoadTaskClass()
-{
-	Deinit();
-}
-
-void TextureLoadTaskClass::Init(TextureBaseClass* tc,bool high_priority)
-{
-	// Make sure texture has a filename.
-	REF_PTR_SET(Texture,tc);
-	WWASSERT(Texture->Get_Full_Path() != NULL);
-
-	Reduction=Texture->Get_Reduction();
-	HighPriorityRequested=high_priority;
-	IsLoading=false;
-	HasFailed=false;
-	MipLevelCount=tc->MipLevelCount;
-	D3DTexture=0;
-	Width=0;
-	Height=0;
-	Format=Texture->Get_Texture_Format();
-
-	Texture->TextureLoadTask=this;
-	for (int i=0;i<MIP_LEVELS_MAX;++i) {
-		LockedSurfacePtr[i]=NULL;
-		LockedSurfacePitch[i]=0;
-	}
-}
-
-void TextureLoadTaskClass::Deinit()
-{
-	WWASSERT(Succ==NULL);
-	WWASSERT(D3DTexture==NULL);
-	WWASSERT(IsLoading==false);
-	for (int i=0;i<MIP_LEVELS_MAX;++i) {
-		WWASSERT(LockedSurfacePtr[i]==NULL);
-	}
-	if (Texture) {
-		WWASSERT(Texture->TextureLoadTask==this);
-		Texture->TextureLoadTask=NULL;
-	}
-
-	REF_PTR_RELEASE(Texture);
-	WWASSERT(!D3DTexture);
-}
-
-// ----------------------------------------------------------------------------
-//
-//
-//
-// ----------------------------------------------------------------------------
-
-void TextureLoadTaskClass::Begin_Texture_Load()
-{
-	// If we're in main thread, init for loading and add to the load list
-	if (ThreadClass::_Get_Current_Thread_ID()==DX8Wrapper::_Get_Main_Thread_ID()) {
-
-		bool loaded=false;
-		if (Texture->Is_Compression_Allowed()) {
-			DDSFileClass dds_file(Texture->Get_Full_Path(),Get_Reduction());
-			if (dds_file.Is_Available()) {
-				// Destination size will be the next power of two square from the larger width and height...
-				unsigned width, height;
-				width=dds_file.Get_Width(0);
-				height=dds_file.Get_Height(0);
-				TextureLoader::Validate_Texture_Size(width,height);
-
-				// If the size doesn't match, try and see if texture reduction would help... (mainly for
-				// cases where loaded texture is larger than hardware limit)
-				if (width!=dds_file.Get_Width(0) || height!=dds_file.Get_Height(0)) {
-					for (unsigned i=1;i<dds_file.Get_Mip_Level_Count();++i) {
-						unsigned w=dds_file.Get_Width(i);
-						unsigned h=dds_file.Get_Height(i);
-						TextureLoader::Validate_Texture_Size(width,height);
-						if (w==dds_file.Get_Width(i) || h==dds_file.Get_Height(i)) {
-							Reduction+=i;
-							width=w;
-							height=h;
-							break;
-						}
-					}
-				}
-
-				IsLoading=true;
-				Width=width;
-				Height=height;
-				Format=Get_Valid_Texture_Format(dds_file.Get_Format(),Texture->Is_Compression_Allowed());
-
-				unsigned mip_level_count=Get_Mip_Level_Count();
-				// If texture wants all mip levels, take as many as the file contains (not necessarily all)
-				// Otherwise take as many mip levels as the texture wants, not to exceed the count in file...
-				if (!mip_level_count) mip_level_count=dds_file.Get_Mip_Level_Count();
-				else if (mip_level_count>dds_file.Get_Mip_Level_Count()) mip_level_count=dds_file.Get_Mip_Level_Count();
-
-				// Once more, verify that the mip level count is correct (in case it was changed here it might not
-				// match the size...well actually it doesn't have to match but it can't be bigger than the size)
-				unsigned max_mip_level_count=1;
-				unsigned w=4;
-				unsigned h=4;
-				while (w<Width && h<Height) {
-					w+=w;
-					h+=h;
-					max_mip_level_count++;
-				}
-				if (mip_level_count>max_mip_level_count) mip_level_count=max_mip_level_count;
-
-				D3DTexture=DX8Wrapper::_Create_DX8_Texture(Width,Height,Format,(MipCountType)mip_level_count);
-				MipLevelCount=mip_level_count;
-				//Texture->MipLevelCount);
-				loaded=true;
-			}
-		}
-
-		if (!loaded) {
-			Targa targa;
-			if (TARGA_ERROR_HANDLER(targa.Open(Texture->Get_Full_Path(), TGA_READMODE),Texture->Get_Full_Path())) {
-				D3DTexture=MissingTexture::_Get_Missing_Texture();
-				HasFailed=true;
-				IsLoading=false;
-				End_Load();
-				Apply(true);
-				Add_Task_To_Delete_List(this);
-				return;
-			}
-
-
-			unsigned bpp;
-			WW3DFormat src_format,dest_format;
-			Get_WW3D_Format(dest_format,src_format,bpp,targa);
-			if (src_format!=WW3D_FORMAT_A8R8G8B8 &&
-				src_format!=WW3D_FORMAT_R8G8B8 &&
-				src_format!=WW3D_FORMAT_X8R8G8B8) {
-				WWDEBUG_SAY(("Invalid TGA format used in %s - only 24 and 32 bit formats should be used!\n",Texture->Get_Full_Path()));
-			}
-
-			// Destination size will be the next power of two square from the larger width and height...
-			unsigned width=targa.Header.Width, height=targa.Header.Height;
-			int ReductionFactor=Get_Reduction();
-			int MipLevels=0;
-
-			//Figure out how many mip levels this texture will occupy
-			for (int i=width, j=height; i > 0 && j > 0; i>>=1, j>>=1)
-					MipLevels++;
-
-			//Adjust the reduction factor to keep textures above some minimum dimensions
-			if (MipLevels <= WW3D::Get_Texture_Min_Dimension())
-				ReductionFactor=0;
-			else
-			{	int mipToDrop=MipLevels-WW3D::Get_Texture_Min_Dimension();
-				if (ReductionFactor >= mipToDrop)
-					ReductionFactor=mipToDrop;
-			}
-
-			width=targa.Header.Width>>ReductionFactor;
-			height=targa.Header.Height>>ReductionFactor;
-			unsigned ow=width;
-			unsigned oh=height;
-			TextureLoader::Validate_Texture_Size(width,height);
-			if (width!=ow || height!=oh) {
-				WWDEBUG_SAY(("Invalid texture size, scaling required. Texture: %s, size: %d x %d -> %d x %d\n",Texture->Get_Full_Path(),ow,oh,width,height));
-			}
-
-			IsLoading=true;
-			Width=width;
-			Height=height;
-
-			if (Format==WW3D_FORMAT_UNKNOWN) {
-				Format=Get_Valid_Texture_Format(dest_format,false);
-			}
-			else {
-				Format=Get_Valid_Texture_Format(Format,false);
-			}
-
-			D3DTexture=DX8Wrapper::_Create_DX8_Texture(Width,Height,Format,Texture->MipLevelCount);
-		}
-
-		MipLevelCount=D3DTexture->GetLevelCount();
-		for (unsigned i=0;i<MipLevelCount;++i) {
-			D3DLOCKED_RECT locked_rect;
-			DX8_ErrorCode(
-				D3DTexture->LockRect(
-					i,
-					&locked_rect,
-					NULL,
-					0));
-			LockedSurfacePtr[i]=(unsigned char*)locked_rect.pBits;
-			LockedSurfacePitch[i]=locked_rect.Pitch;
-		}
-
-		if (HighPriorityRequested) {
-			TextureLoader::Load_Mipmap_Levels(this);
-			End_Load();
-			Apply(true);
-			Add_Task_To_Delete_List(this);
-		}
-		else {
-			LoaderThreadClass::Add_Task_To_Load_List(this);
-		}
-	}
-	// Otherwise add to deferred list which will be handled by main thread
-	else {
-		Add_Deferred_Task(this);
-	}
-}
-
-/*	file_auto_ptr my_tga_file(_TheFileFactory,Texture->Get_Full_Path());	
-	if (my_tga_file->Is_Available()) {
-		my_tga_file->Open();
-		unsigned size=my_tga_file->Size();
-		char* tga_memory=W3DNEWARRAY char[size];
-		my_tga_file->Read(tga_memory,size);
-		my_tga_file->Close();
-
-		StringClass pth("data\\");
-		pth+=Texture->Get_Texture_Name();
-		RawFileClass tmp_tga_file(pth);
-		tmp_tga_file.Create();
-		tmp_tga_file.Write(tga_memory,size);
-		tmp_tga_file.Close();
-		delete[] tga_memory;
-
-	}
-*/
-
-// ----------------------------------------------------------------------------
-//
-//
-//
-// ----------------------------------------------------------------------------
-
-void TextureLoadTaskClass::Begin_Thumbnail_Load()
-{
-//	CriticalSectionClass::LockClass m(mutex);
-
-	unsigned thread_id=ThreadClass::_Get_Current_Thread_ID();
-	if (thread_id==DX8Wrapper::_Get_Main_Thread_ID()) {
-		WW3DFormat format=Texture->Get_Texture_Format();
-		// No compressed thumbnails
-		switch (format) {
-		case WW3D_FORMAT_DXT1:
-		case WW3D_FORMAT_DXT2:
-		case WW3D_FORMAT_DXT3:
-		case WW3D_FORMAT_DXT4:
-		case WW3D_FORMAT_DXT5:
-			format=WW3D_FORMAT_A8R8G8B8; break;
-		default:
-			break;
-		}
-		D3DTexture=TextureLoader::Load_Thumbnail(Texture->Get_Full_Path(),format);
-
-		// Thumbnail loads are always high priority, so apply immediatelly
-		End_Load();
-		Apply(false);
-		Add_Task_To_Delete_List(this);
-		return;
-	}
-	else {
-		Add_Thumbnail_Task(this);
-	}
-}
-
-// ----------------------------------------------------------------------------
-//
-// Deinit can be called multiple times. If any surfaces are locked this call
-// can only be called from the main thread.
-//
-// ----------------------------------------------------------------------------
-
-void TextureLoadTaskClass::End_Load()
-{
-	for (unsigned i=0;i<MipLevelCount;++i) {
-		if (LockedSurfacePtr[i]) {
-			WWASSERT(ThreadClass::_Get_Current_Thread_ID()==DX8Wrapper::_Get_Main_Thread_ID());
-			DX8_ErrorCode(D3DTexture->UnlockRect(i));
-		}
-		LockedSurfacePtr[i]=NULL;
-	}
-	IsLoading=false;
-
-}
-
-// ----------------------------------------------------------------------------
-//
-// Link the node to another task node. This can only be done if the node isn't
-// linked to something else already. If the node is linked to some other node,
-// the only acceptable parameter to this function is NULL, which will unlink
-// the connection.
-//
-// ----------------------------------------------------------------------------
-
-void TextureLoadTaskClass::Set_Succ(TextureLoadTaskClass* succ)
-{
-	WWASSERT((succ && !Succ) || (!succ));	// Can't set successor pointer if it has been set already
-	Succ=succ; 
-}
-
-// ----------------------------------------------------------------------------
-//
-//
-//
-// ----------------------------------------------------------------------------
-
-void TextureLoadTaskClass::Set_D3D_Texture(IDirect3DTexture8* texture)
-{
-	WWASSERT(D3DTexture==0);
-	D3DTexture=texture;
-}
-
-// ----------------------------------------------------------------------------
-//
-// Apply the D3D texture surface to the client texture. The parameter 'initialize'
-// determines whether the client texture will be set to initialized state or
-// not. Generally thumbnail tasks will not set texture to initialised state but
-// all other loads do.
-//
-// ----------------------------------------------------------------------------
-
-void TextureLoadTaskClass::Apply(bool initialize)
-{
-	WWASSERT(D3DTexture);
-	// Verify that none of the mip levels are locked
-	for (unsigned i=0;i<MipLevelCount;++i) {
-		WWASSERT(LockedSurfacePtr[i]==NULL);
-	}
-
-	Texture->Apply_New_Surface(initialize);
-
-	D3DTexture->Release();
-	D3DTexture=NULL;
-}
-
-// ----------------------------------------------------------------------------
-//
-// Return locked surface pointer at a specific level. The call will
-// assert if level is greater or equal to the number of mip levels or if the
-// requested level has not been locked.
-//
-// ----------------------------------------------------------------------------
-
-unsigned char* TextureLoadTaskClass::Get_Locked_Surface_Ptr(unsigned level)
-{
-	WWASSERT(level<MipLevelCount);
-	WWASSERT(LockedSurfacePtr[level]);
-	return LockedSurfacePtr[level];
-}
-
-// ----------------------------------------------------------------------------
-//
-// Return locked surface pitch (in bytes) at a specific level. The call will
-// assert if level is greater or equal to the number of mip levels or if the
-// requested level has not been locked.
-//
-// ----------------------------------------------------------------------------
-
-unsigned TextureLoadTaskClass::Get_Locked_Surface_Pitch(unsigned level) const
-{
-	WWASSERT(level<MipLevelCount);
-	WWASSERT(LockedSurfacePtr[level]);
-	return LockedSurfacePitch[level];
-}
-
-// ----------------------------------------------------------------------------
-//
-// Load tasks are stored in a pool when they are not used. If the pool is empty
-// a new task is created.
-//
-// ----------------------------------------------------------------------------
-
-TextureLoadTaskClass* TextureLoadTaskClass::Get_Instance(TextureBaseClass* tc, bool high_priority)
-{
-	CriticalSectionClass::LockClass m(mutex);
-
-	TextureLoadTaskClass* task=FreeTaskListHead;
-	if (task) {
-		FreeTaskListHead=task->Peek_Succ();
-		task->Set_Succ(NULL);
-	}
-	else {
-		task=W3DNEW TextureLoadTaskClass();
-	}
-	task->Init(tc,high_priority);
-	return task;
-}
-
-// ----------------------------------------------------------------------------
-//
-// When task is no longer needed it is returned to the pool.
-//
-// ----------------------------------------------------------------------------
-
-void TextureLoadTaskClass::Release_Instance(TextureLoadTaskClass* task)
-{
-	if (!task) return;
-
-	CriticalSectionClass::LockClass m(mutex);
-
-	task->Deinit();
-
-	// Task must not be in any list when it is being freed
-	WWASSERT(task->Peek_Succ()==NULL);
-
-	task->Set_Succ(FreeTaskListHead);
-	FreeTaskListHead=task;
-}
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h
deleted file mode 100644
index 7fd9091edb1..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TEXTURELOADER_H
-#define TEXTURELOADER_H
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#include "always.h"
-#include "texture.h"
-
-class StringClass;
-struct IDirect3DTexture8;
-class TextureLoadTaskClass;
-
-class TextureLoader
-{
-	static void Init_Load_Task(TextureBaseClass* tc);
-
-	static bool Load_Uncompressed_Mipmap_Levels_From_TGA(TextureLoadTaskClass* texture);
-
-public:
-	static void Init();
-	static void Deinit();
-
-	// Modify given texture size to nearest valid size on current hardware.
-	static void Validate_Texture_Size(unsigned& width, unsigned& height);
-
-	// Adds a loading task to the system. The task if processed in a separate
-	// thread as soon as possible. The task will appear in finished tasks list
-	// when it's been completed. The texture will be refreshed on the next
-	// update call after appearing to the finished tasks list.
-	static void Add_Load_Task(TextureBaseClass* tc);
-	static IDirect3DTexture8* Load_Thumbnail(
-		const StringClass& filename,
-		WW3DFormat texture_format);	// Pass WW3D_FORMAT_UNKNOWN if you don't care
-	static void Load_Mipmap_Levels(TextureLoadTaskClass* texture);
-
-	static IDirect3DSurface8* Load_Surface_Immediate(
-		const StringClass& filename,
-		WW3DFormat surface_format,		// Pass WW3D_FORMAT_UNKNOWN if you don't care
-		bool allow_compression);
-
-	// Textures can only be created and locked by the main thread so this function sends a request to the texture
-	// handling system to load the texture immediatelly next time it enters the main thread. If this function
-	// is called from the main thread the texture is loaded immediatelly.
-	static void Request_High_Priority_Loading(
-		TextureBaseClass* texture,
-		MipCountType mip_level_count);
-	static void	Request_Thumbnail(TextureBaseClass* tc);
-
-	static void Update();
-	static void Flush_Pending_Load_Tasks();
-
-	static IDirect3DTexture8* Generate_Bumpmap(TextureBaseClass* texture);
-
-};
-
-// ----------------------------------------------------------------------------
-//
-// Texture loader task handler
-//
-// ----------------------------------------------------------------------------
-
-class TextureLoadTaskClass : public W3DMPO
-{
-	W3DMPO_GLUE(TextureLoadTaskClass)
-
-	static TextureLoadTaskClass* FreeTaskListHead;
-
-	TextureBaseClass* Texture;
-	IDirect3DTexture8 *D3DTexture;
-	unsigned Width;
-	unsigned Height;
-	WW3DFormat Format;
-	unsigned char* LockedSurfacePtr[MIP_LEVELS_MAX];
-	unsigned LockedSurfacePitch[MIP_LEVELS_MAX];
-	unsigned MipLevelCount;
-	unsigned Reduction;
-	TextureLoadTaskClass* Succ;
-	bool IsLoading;
-	bool HasFailed;
-	bool HighPriorityRequested;
-
-	~TextureLoadTaskClass();
-	TextureLoadTaskClass();
-public:
-	static TextureLoadTaskClass* Get_Instance(TextureBaseClass* tc, bool high_priority);
-	static void Release_Instance(TextureLoadTaskClass* task);
-	static void shutdown(void) {TextureLoadTaskClass *pT; while (FreeTaskListHead) {pT = FreeTaskListHead; FreeTaskListHead = pT->Peek_Succ(); pT->Set_Succ(NULL); delete pT;} };
-
-	void Init(TextureBaseClass* tc,bool high_priority);
-	void Deinit();
-
-	unsigned Get_Mip_Level_Count() const { return MipLevelCount; }
-	unsigned Get_Width() const { return Width; }
-	unsigned Get_Height() const { return Height; }
-	WW3DFormat Get_Format() const { return Format; }
-	unsigned Get_Reduction() const { return Reduction; }
-
-	unsigned char* Get_Locked_Surface_Ptr(unsigned level);
-	unsigned Get_Locked_Surface_Pitch(unsigned level) const;
-
-	bool Has_Failed() const { return HasFailed; }
-	void Set_Fail(bool b) { HasFailed=b; }
-
-	// Init the task or put it to a deferred init list if called from outside the main thread
-	void Begin_Texture_Load();
-	void Begin_Thumbnail_Load();
-	void End_Load();		// Deinit must be called before Applying()
-
-	void Apply(bool initialize);
-
-	TextureLoadTaskClass* Peek_Succ() { return Succ; }
-	void Set_Succ(TextureLoadTaskClass* succ);
-
-	TextureBaseClass* Peek_Texture() { return Texture; }
-	IDirect3DTexture8* Peek_D3D_Texture() { return D3DTexture; }
-
-	void Set_D3D_Texture(IDirect3DTexture8* texture);
-};
-
-#endif
-
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
deleted file mode 100644
index 4a9ebd2f2a0..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "texturethumbnail.h"
-#include "hashtemplate.h"
-#include "missingtexture.h"
-#include "TARGA.H"
-#include "ww3dformat.h"
-#include "ddsfile.h"
-#include "textureloader.h"
-#include "bitmaphandler.h"
-#include "ffactory.h"
-
-static HashTemplateClass<StringClass,ThumbnailClass*> thumbnail_hash;
-static bool _ThumbHashModified;
-static unsigned char* _ThumbnailMemory;
-static const char *THUMBNAIL_FILENAME = "thumbnails.dat";
-
-ThumbnailClass::ThumbnailClass(const char* name, unsigned char* bitmap, unsigned w, unsigned h, bool allocated)
-	:
-	Name(name), 
-	Bitmap(bitmap), 
-	Allocated(allocated),
-	Width(w),
-	Height(h)
-{
-	thumbnail_hash.Insert(Name,this);
-}
-
-// ----------------------------------------------------------------------------
-//
-// Load texture and generate mipmap levels if requested. The function tries
-// to create texture that matches targa format. If suitable format is not
-// available, it selects closest matching format and performs color space
-// conversion.
-//
-// ----------------------------------------------------------------------------
-
-ThumbnailClass::ThumbnailClass(const StringClass& filename)
-	:
-	Bitmap(0), 
-	Name(filename), 
-	Allocated(false),
-	Width(0),
-	Height(0)
-{
-	unsigned reduction_factor=3;
-
-	// First, try loading image from a DDS file
-	DDSFileClass dds_file(filename,reduction_factor);
-	if (dds_file.Is_Available() && dds_file.Load()) {
-		Width=dds_file.Get_Width(0);
-		Height=dds_file.Get_Height(0);
-		Bitmap=W3DNEWARRAY unsigned char[Width*Height*4];
-		Allocated=true;
-		dds_file.Copy_Level_To_Surface(
-			0,			// Level
-			WW3D_FORMAT_A8R8G8B8, 
-			Width, 
-			Height, 
-			Bitmap, 
-			Width*4);
-	}
-	// If DDS file can't be used try loading from TGA
-	else {
-		// Make sure the file can be opened. If not, return missing texture.
-		Targa targa;
-		if (TARGA_ERROR_HANDLER(targa.Open(filename,TGA_READMODE),filename)) return;
-
-		// DX8 uses image upside down compared to TGA
-		targa.Header.ImageDescriptor ^= TGAIDF_YORIGIN;
-
-		WW3DFormat src_format,dest_format;
-		unsigned src_bpp=0;
-		Get_WW3D_Format(dest_format,src_format,src_bpp,targa);
-
-		// Destination size will be the next power of two square from the larger width and height...
-		Width=targa.Header.Width>>reduction_factor;
-		Height=targa.Header.Height>>reduction_factor;
-		TextureLoader::Validate_Texture_Size(Width,Height);
-		unsigned src_width=targa.Header.Width;
-		unsigned src_height=targa.Header.Height;
-
-		// NOTE: We load the palette but we do not yet support paletted textures!
-		char palette[256*4];
-		targa.SetPalette(palette);
-		if (TARGA_ERROR_HANDLER(targa.Load(filename, TGAF_IMAGE, false),filename)) return;
-
-		unsigned char* src_surface=(unsigned char*)targa.GetImage();
-
-		Bitmap=W3DNEWARRAY unsigned char[Width*Height*4];
-		Allocated=true;
-
-		dest_format=WW3D_FORMAT_A8R8G8B8;
-		BitmapHandlerClass::Copy_Image(
-			Bitmap, 
-			Width,
-			Height,
-			Width*4,
-			WW3D_FORMAT_A8R8G8B8,
-			src_surface,
-			src_width,
-			src_height,
-			src_width*src_bpp,
-			src_format,
-			(unsigned char*)targa.GetPalette(),
-			targa.Header.CMapDepth>>3,
-			false);
-	}
-
-	_ThumbHashModified=true;
-	thumbnail_hash.Insert(Name,this);
-}
-
-ThumbnailClass::~ThumbnailClass()
-{
-	if (Allocated) delete[] Bitmap;
-	thumbnail_hash.Remove(Name);
-}
-
-ThumbnailClass* ThumbnailClass::Peek_Instance(const StringClass& name)
-{
-	return thumbnail_hash.Get(name);
-}
-
-void ThumbnailClass::Init()
-{
-	WWASSERT(!_ThumbnailMemory);
-
-	// If the thumbnail hash table file is available, init hash table
-#if 0 // don't do thumbnail file.
-	file_auto_ptr thumb_file(_TheFileFactory, THUMBNAIL_FILENAME);
-	if (thumb_file->Is_Available()) {
-		thumb_file->Open(FileClass::READ);
-
-		char tmp[4];
-		thumb_file->Read(tmp,4);
-		if (tmp[0]=='T' && tmp[1]=='M' && tmp[2]=='B' && tmp[3]=='1') {
-
-			int total_thumb_count;
-			int total_header_length;
-			int total_data_length;
-			thumb_file->Read(&total_thumb_count,sizeof(int));
-			thumb_file->Read(&total_header_length,sizeof(int));
-			thumb_file->Read(&total_data_length,sizeof(int));
-			if (total_thumb_count) {
-				WWASSERT(total_data_length && total_header_length);
-				_ThumbnailMemory=W3DNEWARRAY unsigned char[total_data_length];
-				// Load thumbs
-				for (int i=0;i<total_thumb_count;++i) {
-					char name[256];
-					int offset;
-					int width;
-					int height;
-					unsigned long date_time;
-					int name_len;
-					thumb_file->Read(&offset,sizeof(int));
-					thumb_file->Read(&width,sizeof(int));
-					thumb_file->Read(&height,sizeof(int));
-					thumb_file->Read(&date_time,sizeof(unsigned long));
-					thumb_file->Read(&name_len,sizeof(int));
-					WWASSERT(name_len<255);
-					thumb_file->Read(name,name_len);
-					name[name_len]='\0';
-
-
-					// Make sure the file is available and the timestamp matches
-					file_auto_ptr myfile(_TheFileFactory,name);	
-					if (myfile->Is_Available()) {
-						myfile->Open(FileClass::READ);
-						if (date_time==myfile->Get_Date_Time()) {
-							W3DNEW ThumbnailClass(
-								name, 
-								_ThumbnailMemory+offset-total_header_length, 
-								width,
-								height,
-								false);
-						}
-						myfile->Close();
-					}
-				}
-				thumb_file->Read(_ThumbnailMemory,total_data_length);
-			}
-		}
-		thumb_file->Close();
-	}
-#endif
-}
-
-void ThumbnailClass::Deinit()
-{
-	// If the thumbnail hash table was modified, save it to disk
-	HashTemplateIterator<StringClass,ThumbnailClass*> ite(thumbnail_hash);
-	if (_ThumbHashModified) {
-#if 0 // don't write thumbnails.  jba.
-		int total_header_length=0;
-		int total_data_length=0;
-		int total_thumb_count=0;
-		total_header_length+=4;	// header 'TMB1'
-		total_header_length+=4;	// thumb count
-		total_header_length+=4;	// header size
-		total_header_length+=4;	// data length
-
-		for (ite.First();!ite.Is_Done();ite.Next()) {
-			total_header_length+=4;	// int bitmap offset
-			total_header_length+=4;	// int bitmap width
-			total_header_length+=4;	// int bitmap height
-			total_header_length+=4;	// unsigned long date_time
-			total_header_length+=4;	// int name string length
-			ThumbnailClass* thumb=ite.Peek_Value();
-			total_header_length+=strlen(thumb->Get_Name());
-			total_data_length+=thumb->Get_Width()*thumb->Get_Height()*4;
-			total_thumb_count++;
-		}
-		int offset=total_header_length;
-
-		file_auto_ptr thumb_file(_TheWritingFileFactory, THUMBNAIL_FILENAME);
-		if (thumb_file->Is_Available()) {
-			thumb_file->Delete();
-		}
-		thumb_file->Create();
-		thumb_file->Open(FileClass::WRITE);
-
-		char* header="TMB1";
-		thumb_file->Write(header,4);
-		thumb_file->Write(&total_thumb_count,sizeof(int));
-		thumb_file->Write(&total_header_length,sizeof(int));
-		thumb_file->Write(&total_data_length,sizeof(int));
-
-		// Save names and offsets
-		for (ite.First();!ite.Is_Done();ite.Next()) {
-			ThumbnailClass* thumb=ite.Peek_Value();
-			const char* name=thumb->Get_Name();
-			int name_len=strlen(name);
-			int width=thumb->Get_Width();
-			int height=thumb->Get_Height();
-			unsigned long date_time=0;
-			file_auto_ptr myfile(_TheFileFactory,name);	
-			if (myfile->Is_Available()) {
-				myfile->Open(FileClass::READ);
-				date_time=myfile->Get_Date_Time();
-				myfile->Close();
-			}
-			thumb_file->Write(&offset,sizeof(int));
-			thumb_file->Write(&width,sizeof(int));
-			thumb_file->Write(&height,sizeof(int));
-			thumb_file->Write(&date_time,sizeof(unsigned long));
-			thumb_file->Write(&name_len,sizeof(int));
-			thumb_file->Write(name,name_len);
-			offset+=width*height*4;
-		}
-
-		// Save bitmaps
-		offset=total_header_length;
-		for (ite.First();!ite.Is_Done();ite.Next()) {
-			ThumbnailClass* thumb=ite.Peek_Value();
-			int width=thumb->Get_Width();
-			int height=thumb->Get_Height();
-			thumb_file->Write(thumb->Peek_Bitmap(),width*height*4);
-		}
-
-		thumb_file->Close();							
-#endif
-	}
-
-	ite.First();
-	while (!ite.Is_Done()) {
-		ThumbnailClass* thumb=ite.Peek_Value();
-		delete thumb;
-		ite.First();
-	}
-
-	delete [] _ThumbnailMemory;
-	_ThumbnailMemory=NULL;
-}
\ No newline at end of file
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h
deleted file mode 100644
index 905517e5e48..00000000000
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TEXTURETHUMBNAIL_H
-#define TEXTURETHUMBNAIL_H
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#include "always.h"
-#include "wwstring.h"
-
-// ----------------------------------------------------------------------------
-
-class ThumbnailClass
-{
-	StringClass Name;
-	unsigned char* Bitmap;
-	unsigned Width;
-	unsigned Height;
-	bool Allocated;	// if true, destructor will free the memory
-public:
-	ThumbnailClass(const char* name, unsigned char* bitmap, unsigned w, unsigned h, bool allocated);
-	ThumbnailClass(const StringClass& filename);
-	~ThumbnailClass();
-
-	unsigned char* Peek_Bitmap() { return Bitmap; }
-	unsigned Get_Width() const { return Width; }
-	unsigned Get_Height() const { return Height; }
-	const StringClass& Get_Name() const { return Name; }
-
-	static ThumbnailClass* Peek_Instance(const StringClass& name);
-	static void Init();
-	static void Deinit();
-};
-
-// ----------------------------------------------------------------------------
-
-#endif
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
index e427412e846..267d9f33844 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
@@ -43,12 +43,10 @@
 #include "w3d_util.h"
 #include "chunkio.h"
 #include "w3derr.h"
-#include "INI.H"
-#include "XSTRAW.H"
+#include "INI.h"
+#include "XSTRAW.h"
 #include "dx8wrapper.h"
 
-#include <stdio.h>
-#include <string.h>
 
 static unsigned int unique=1;
 
@@ -89,9 +87,9 @@ VertexMaterialClass::VertexMaterialClass(void):
 
 	for (i=0; i<MeshBuilderClass::MAX_STAGES; i++)
 	{
-		Mapper[i]=NULL;		
+		Mapper[i]=NULL;
 		UVSource[i] = i;
-	}	
+	}
 
 #ifdef DYN_MAT8
 	MaterialDyn=W3DNEW DynD3DMATERIAL8;
@@ -132,7 +130,7 @@ VertexMaterialClass::VertexMaterialClass(const VertexMaterialClass & src) :
 		}
 
 		UVSource[i] = src.UVSource[i];
-	}	
+	}
 
 #ifdef DYN_MAT8
 	MaterialDyn=W3DNEW DynD3DMATERIAL8;
@@ -170,7 +168,7 @@ VertexMaterialClass::~VertexMaterialClass(void)
 }
 
 VertexMaterialClass & VertexMaterialClass::operator = (const VertexMaterialClass &src)
-{	
+{
 
 	if (this != &src) {
 		Name=src.Name;
@@ -205,7 +203,7 @@ VertexMaterialClass & VertexMaterialClass::operator = (const VertexMaterialClass
 unsigned long VertexMaterialClass::Compute_CRC(void) const
 {
 	unsigned long crc = 0;
-	
+
 // don't include the name when determining whether two vertex materials match
 //	crc = CRC_Memory(reinterpret_cast<const unsigned char *>(Name.Peek_Buffer()),sizeof(char)*strlen(Name),crc);
 
@@ -231,7 +229,7 @@ unsigned long VertexMaterialClass::Compute_CRC(void) const
 
 void VertexMaterialClass::Get_Ambient(Vector3 * set) const
 {
-	assert(set); 
+	assert(set);
 	*set=Vector3(Material->Ambient.r,Material->Ambient.g,Material->Ambient.b);
 }
 
@@ -240,7 +238,7 @@ void VertexMaterialClass::Set_Ambient(const Vector3 & color)
 	CRCDirty=true;
 	Material->Ambient.r=color.X;
 	Material->Ambient.g=color.Y;
-	Material->Ambient.b=color.Z;	
+	Material->Ambient.b=color.Z;
 }
 
 void VertexMaterialClass::Set_Ambient(float r,float g,float b)
@@ -248,14 +246,14 @@ void VertexMaterialClass::Set_Ambient(float r,float g,float b)
 	CRCDirty=true;
 	Material->Ambient.r=r;
 	Material->Ambient.g=g;
-	Material->Ambient.b=b;	
+	Material->Ambient.b=b;
 }
 
 // Diffuse Get and Sets
 
 void VertexMaterialClass::Get_Diffuse(Vector3 * set) const
 {
-	assert(set); 
+	assert(set);
 	*set=Vector3(Material->Diffuse.r,Material->Diffuse.g,Material->Diffuse.b);
 }
 
@@ -264,7 +262,7 @@ void VertexMaterialClass::Set_Diffuse(const Vector3 & color)
 	CRCDirty=true;
 	Material->Diffuse.r=color.X;
 	Material->Diffuse.g=color.Y;
-	Material->Diffuse.b=color.Z;	
+	Material->Diffuse.b=color.Z;
 }
 
 void VertexMaterialClass::Set_Diffuse(float r,float g,float b)
@@ -272,14 +270,14 @@ void VertexMaterialClass::Set_Diffuse(float r,float g,float b)
 	CRCDirty=true;
 	Material->Diffuse.r=r;
 	Material->Diffuse.g=g;
-	Material->Diffuse.b=b;	
+	Material->Diffuse.b=b;
 }
 
 // Specular Get and Sets
 
 void VertexMaterialClass::Get_Specular(Vector3 * set) const
 {
-	assert(set); 
+	assert(set);
 	*set=Vector3(Material->Specular.r,Material->Specular.g,Material->Specular.b);
 }
 
@@ -288,7 +286,7 @@ void VertexMaterialClass::Set_Specular(const Vector3 & color)
 	CRCDirty=true;
 	Material->Specular.r=color.X;
 	Material->Specular.g=color.Y;
-	Material->Specular.b=color.Z;	
+	Material->Specular.b=color.Z;
 }
 
 void VertexMaterialClass::Set_Specular(float r,float g,float b)
@@ -303,7 +301,7 @@ void VertexMaterialClass::Set_Specular(float r,float g,float b)
 
 void VertexMaterialClass::Get_Emissive(Vector3 * set) const
 {
-	assert(set); 
+	assert(set);
 	*set=Vector3(Material->Emissive.r,Material->Emissive.g,Material->Emissive.b);
 }
 
@@ -349,7 +347,7 @@ void	VertexMaterialClass::Set_Opacity(float o)
 void	VertexMaterialClass::Set_Ambient_Color_Source(ColorSourceType src)
 {
 	CRCDirty=true;
-	switch (src) 
+	switch (src)
 	{
 	case	COLOR1:		AmbientColorSource = D3DMCS_COLOR1; break;
 	case	COLOR2:		AmbientColorSource = D3DMCS_COLOR2; break;
@@ -360,7 +358,7 @@ void	VertexMaterialClass::Set_Ambient_Color_Source(ColorSourceType src)
 void	VertexMaterialClass::Set_Emissive_Color_Source(ColorSourceType src)
 {
 	CRCDirty=true;
-	switch (src) 
+	switch (src)
 	{
 	case	COLOR1:		EmissiveColorSource = D3DMCS_COLOR1; break;
 	case	COLOR2:		EmissiveColorSource = D3DMCS_COLOR2; break;
@@ -371,7 +369,7 @@ void	VertexMaterialClass::Set_Emissive_Color_Source(ColorSourceType src)
 void	VertexMaterialClass::Set_Diffuse_Color_Source(ColorSourceType src)
 {
 	CRCDirty=true;
-	switch (src) 
+	switch (src)
 	{
 	case	COLOR1:		DiffuseColorSource = D3DMCS_COLOR1; break;
 	case	COLOR2:		DiffuseColorSource = D3DMCS_COLOR2; break;
@@ -379,32 +377,32 @@ void	VertexMaterialClass::Set_Diffuse_Color_Source(ColorSourceType src)
 	}
 }
 
-VertexMaterialClass::ColorSourceType 
+VertexMaterialClass::ColorSourceType
 VertexMaterialClass::Get_Ambient_Color_Source(void)
 {
-	switch(AmbientColorSource) 
+	switch(AmbientColorSource)
 	{
 	case D3DMCS_COLOR1:	return COLOR1;
 	case D3DMCS_COLOR2:	return COLOR2;
 	default:					return MATERIAL;
 	}
-}	
+}
 
-VertexMaterialClass::ColorSourceType 
+VertexMaterialClass::ColorSourceType
 VertexMaterialClass::Get_Emissive_Color_Source(void)
 {
-	switch(EmissiveColorSource) 
+	switch(EmissiveColorSource)
 	{
 	case D3DMCS_COLOR1:	return COLOR1;
 	case D3DMCS_COLOR2:	return COLOR2;
 	default:					return MATERIAL;
 	}
-}	
+}
 
-VertexMaterialClass::ColorSourceType	
+VertexMaterialClass::ColorSourceType
 VertexMaterialClass::Get_Diffuse_Color_Source(void)
 {
-	switch(DiffuseColorSource) 
+	switch(DiffuseColorSource)
 	{
 	case D3DMCS_COLOR1:	return COLOR1;
 	case D3DMCS_COLOR2:	return COLOR2;
@@ -433,7 +431,7 @@ int VertexMaterialClass::Get_UV_Source(int stage)
 void VertexMaterialClass::Init_From_Material3(const W3dMaterial3Struct & mat3)
 {
 	Vector3 tmp0,tmp1,tmp2;
-	
+
 	W3dUtilityClass::Convert_Color(mat3.DiffuseColor,&tmp0);
 	W3dUtilityClass::Convert_Color(mat3.DiffuseCoefficients,&tmp1);
 	tmp2.X = tmp0.X * tmp1.X;
@@ -552,11 +550,11 @@ WW3DErrorType VertexMaterialClass::Load_W3D(ChunkLoadClass & cload)
 	}
 
 	// Set up the vertex mapper.  If it is one of the simple
-	// ones, set the pointer to one of the global instances. 
+	// ones, set the pointer to one of the global instances.
 	int mapping = vmat.Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK;
 
 	switch(mapping) {
-		
+
 		case W3DVERTMAT_STAGE0_MAPPING_UV:
 			break;
 
@@ -573,7 +571,7 @@ WW3DErrorType VertexMaterialClass::Load_W3D(ChunkLoadClass & cload)
 				Set_Mapper(mapper);
 				mapper->Release_Ref();
 			}
-			break;		
+			break;
 		case W3DVERTMAT_STAGE0_MAPPING_LINEAR_OFFSET:
 			{
 				LinearOffsetTextureMapperClass *mapper =
@@ -652,7 +650,7 @@ WW3DErrorType VertexMaterialClass::Load_W3D(ChunkLoadClass & cload)
 				Set_Mapper(mapper,0);
 				mapper->Release_Ref();
 			}
-			break;		
+			break;
 
 		case W3DVERTMAT_STAGE0_MAPPING_WS_ENVIRONMENT:
 			{
@@ -708,7 +706,7 @@ WW3DErrorType VertexMaterialClass::Load_W3D(ChunkLoadClass & cload)
 		break;
 
 		default:
-				WWDEBUG_SAY(("Unsupported mapper in %s\n",name));
+				WWDEBUG_SAY(("Unsupported mapper in %s",name));
 			break;
 	}
 
@@ -742,7 +740,7 @@ WW3DErrorType VertexMaterialClass::Load_W3D(ChunkLoadClass & cload)
 			mapper->Release_Ref();
 		}
 		break;
-		
+
 		case W3DVERTMAT_STAGE1_MAPPING_SCREEN:
 		{
 			ScreenMapperClass *mapper =
@@ -812,7 +810,7 @@ WW3DErrorType VertexMaterialClass::Load_W3D(ChunkLoadClass & cload)
 				Set_Mapper(mapper,1);
 				mapper->Release_Ref();
 			}
-			break;		
+			break;
 
 		case W3DVERTMAT_STAGE1_MAPPING_WS_ENVIRONMENT:
 			{
@@ -868,17 +866,17 @@ WW3DErrorType VertexMaterialClass::Load_W3D(ChunkLoadClass & cload)
 			break;
 
 		default:
-			WWDEBUG_SAY(("Unsupported mapper in %s\n",name));
+			WWDEBUG_SAY(("Unsupported mapper in %s",name));
 			break;
 	}
 
 	Vector3 tmp;
 	W3dUtilityClass::Convert_Color(vmat.Ambient,&tmp);
 	Set_Ambient(tmp);
-	
+
 	W3dUtilityClass::Convert_Color(vmat.Diffuse,&tmp);
 	Set_Diffuse(tmp);
-	
+
 	W3dUtilityClass::Convert_Color(vmat.Specular,&tmp);
 	Set_Specular(tmp);
 
@@ -917,8 +915,8 @@ void VertexMaterialClass::Apply(void) const
 		if (Mapper[i]) {
 			Mapper[i]->Apply(UVSource[i]);
 		} else {
-			DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | UVSource[i]);	
-			DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_DISABLE);		
+			DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | UVSource[i]);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_DISABLE);
 		}
 	}
 }
@@ -926,7 +924,7 @@ void VertexMaterialClass::Apply(void) const
 void VertexMaterialClass::Apply_Null(void)
 {
 	int i;
-	static D3DMATERIAL8 default_settings = 
+	static D3DMATERIAL8 default_settings =
 	{
 		{ 1.0f, 1.0f, 1.0f, 1.0f },	// diffuse
 		{ 1.0f, 1.0f, 1.0f, 1.0f },	// ambient
@@ -944,8 +942,8 @@ void VertexMaterialClass::Apply_Null(void)
 
 	// set to default values if no mappers
 	for (i=0; i<MeshBuilderClass::MAX_STAGES; i++) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | i);	
-		DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_DISABLE);		
+		DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | i);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_DISABLE);
 	}
 }
 
@@ -1021,4 +1019,4 @@ VertexMaterialClass * VertexMaterialClass::Get_Preset(PresetType type)
 	WWASSERT(type<PRESET_COUNT);
 	Presets[type]->Add_Ref();
 	return Presets[type];
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
index da0f4059fe6..10e087a4af6 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
@@ -34,17 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VERTMATERIAL_H
-#define VERTMATERIAL_H
 
 #include "always.h"
 
-#include "refcount.h"
 #include "vector3.h"
 #include "w3d_file.h"
 #include "meshbuild.h"
@@ -52,8 +45,6 @@
 #include "mapper.h"
 #include "wwstring.h"
 
-#include <string.h>
-
 class ChunkLoadClass;
 class ChunkSaveClass;
 
@@ -106,8 +97,8 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 		PRELIT_NODIFFUSE,
 		PRESET_COUNT
 	};
-		
-	
+
+
 	VertexMaterialClass(void);
 	VertexMaterialClass(const VertexMaterialClass & src);
 	~VertexMaterialClass(void);
@@ -119,7 +110,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 	** Name Access
 	*/
 	void					Set_Name(const char * name)
-	{	
+	{
 		Name = name;
 	}
 
@@ -154,7 +145,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 	void			Get_Ambient(Vector3 * set_color) const;
 	void			Set_Ambient(const Vector3 & color);
 	void			Set_Ambient(float r,float g,float b);
-	
+
 	void			Get_Diffuse(Vector3 * set_color) const;
 	void			Set_Diffuse(const Vector3 & color);
 	void			Set_Diffuse(float r,float g,float b);
@@ -162,7 +153,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 	void			Get_Specular(Vector3 * set_color) const;
 	void			Set_Specular(const Vector3 & color);
 	void			Set_Specular(float r,float g,float b);
-	
+
 	void			Get_Emissive(Vector3 * set_color) const;
 	void			Set_Emissive(const Vector3 & color);
 	void			Set_Emissive(float r,float g,float b);
@@ -172,8 +163,8 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 
 	/*
 	** Color source control.  Note that if you set one of the sources to be one of
-	** the arrays, then the setting in the material is ignored.  (i.e. if you 
-	** set the diffuse source to array0, then the diffuse color set into the 
+	** the arrays, then the setting in the material is ignored.  (i.e. if you
+	** set the diffuse source to array0, then the diffuse color set into the
 	** vertex material is ignored.
 	*/
 	void					Set_Ambient_Color_Source(ColorSourceType src);
@@ -194,7 +185,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 	int					Get_UV_Source(int stage);
 
 	/*
-	** Mapper control.  
+	** Mapper control.
 	*/
 	inline void							Set_Mapper(TextureMapperClass *mapper,int stage=0);
 	inline TextureMapperClass *	Get_Mapper(int stage=0);
@@ -212,13 +203,13 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 	/*
 	** CRC, used by the loading code to build a list of the unique materials
 	*/
-	inline unsigned long Get_CRC(void) const
+	unsigned long Get_CRC(void) const
 	{
 		if (CRCDirty) {
 			CRC=Compute_CRC();
 			CRCDirty=false;
 		}
-			
+
 		return CRC;
 	}
 
@@ -277,7 +268,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 inline void VertexMaterialClass::Set_Mapper(TextureMapperClass *mapper, int stage)
 {
 	CRCDirty=true;
-	REF_PTR_SET(Mapper[stage],mapper);	
+	REF_PTR_SET(Mapper[stage],mapper);
 }
 
 inline TextureMapperClass * VertexMaterialClass::Get_Mapper(int stage)
@@ -317,6 +308,3 @@ inline bool VertexMaterialClass::Are_Mappers_Time_Variant(void) const
 	}
 	return false;
 }
-
-#endif //VERTMATERIAL_H
-
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h
index 2da572dc5ec..efd0ed87ce8 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h
@@ -17,31 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/w3d_file.h 19    9/12/01 2:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/w3d_file.h                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 9/12/01 2:04p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 19                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/w3d_file.h                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 9/12/01 2:04p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 19                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef W3D_FILE_H
-#define W3D_FILE_H
 
 #include "always.h"
 #include "bittype.h"
@@ -80,50 +74,50 @@ Version 1.0:
 		W3D_CHUNK_TEXCOORDS,				// array of texture coordinates
 		W3D_CHUNK_MATERIALS,				// array of materials
 		W3D_CHUNK_TRIANGLES,				// array of triangles
-		W3D_CHUNK_SURRENDER_TRIANGLES,// array of surrender format tris	
+		W3D_CHUNK_SURRENDER_TRIANGLES,// array of surrender format tris
 		W3D_CHUNK_MESH_USER_TEXT,		// Name of owning hierarchy, text from the MAX comment field
-		
+
 	HIERARCHY TREES - contained the following chunks:
 		W3D_CHUNK_HIERARCHY_HEADER,
 		W3D_CHUNK_PIVOTS,
-		W3D_CHUNK_PIVOT_FIXUPS,		
+		W3D_CHUNK_PIVOT_FIXUPS,
 
-	HIERARCHY ANIMATIONS - contained the following chunks:  
+	HIERARCHY ANIMATIONS - contained the following chunks:
 		W3D_CHUNK_ANIMATION_HEADER,
 		W3D_CHUNK_ANIMATION_CHANNEL,
 
 	MESH CONNECTIONS - (blueprint for a hierarchical model) contained these chunks:
 
-	 
+
 Version 2.0:
 
-	MESHES: 
+	MESHES:
 
 	- Mesh header now contains the hierarchy model name.  The mesh name will be built
 	as <HModelName>.<MeshName> instead of the old convention: <HTreeName>.<Meshname>
 
-	- The material chunk is replaced with a new material structure which contains 
+	- The material chunk is replaced with a new material structure which contains
 	some information for animating materials.
-	
-	- Vertex Influences link vertices of a mesh to bones in a hierarchy, this is 
-	the information needed for skinning.  
-	
+
+	- Vertex Influences link vertices of a mesh to bones in a hierarchy, this is
+	the information needed for skinning.
+
 	- Damage chunks added.  A damage chunk contains	a new set of materials, a set
 	of vertex offsets, and a set of vertex colors.
-	
+
 	Added the following chunks:
 
-		W3D_CHUNK_VERTEX_COLORS,		
-		W3D_CHUNK_VERTEX_INFLUENCES,	
-		W3D_CHUNK_DAMAGE,					
+		W3D_CHUNK_VERTEX_COLORS,
+		W3D_CHUNK_VERTEX_INFLUENCES,
+		W3D_CHUNK_DAMAGE,
 		W3D_CHUNK_DAMAGE_HEADER,
 			W3D_CHUNK_DAMAGE_MATERIALS,
 			W3D_CHUNK_DAMAGE_VERTICES,
 			W3D_CHUNK_DAMAGE_COLORS,
-		W3D_CHUNK_MATERIALS2,		
+		W3D_CHUNK_MATERIALS2,
 
 	MESH CONNECTIONS: Hierarchy models can now contain skins and collision meshes
-	in addition to the normal meshes.  
+	in addition to the normal meshes.
 
 		W3D_CHUNK_COLLISION_CONNECTION,		// collision meshes connected to the hierarchy
 		W3D_CHUNK_SKIN_CONNECTION,				// skins connected to the hierarchy
@@ -143,14 +137,14 @@ Dec 12, 1997
 Feb 6, 1998
 
 	Added W3D_CHUNK_SECTMESH and its sub-chunks.  This will be the file
-	format for the terrain geometry exported from POV's Atlas tool.  
+	format for the terrain geometry exported from POV's Atlas tool.
 
 March 29, 1998 : Version 3.0
 
 	- New material chunk which supports the new features of the 3D engine
 	- Modified HTrees to always have a root transform to remove all of the
 	  special case -1 bone indexes.
-	- Added new mesh types, A mesh can now be categorized as: normal, 
+	- Added new mesh types, A mesh can now be categorized as: normal,
 	  aligned, skin, collision, or shadow.
 
 June 22, 1998
@@ -159,9 +153,9 @@ June 22, 1998
 
 	Adding a new type of object: The 'Tilemap'.  This simple-sounding object
 	is a binary partition tree of tiles where tiles are rectangular regions of
-	space.  In each leaf to the tree, a mesh is referenced.  The tile map is 
+	space.  In each leaf to the tree, a mesh is referenced.  The tile map is
 	made of several chunks:
-	
+
 	- W3D_CHUNK_TILEMAP
 		- W3D_CHUNK_TILEMAP_HEADER
 		- W3D_CHUNK_TILES
@@ -177,7 +171,7 @@ June 22, 1998
 			- W3D_CHUNK_TILE_INSTANCE
 
 October 19, 1998
-	
+
 	Created the w3d_obsolete.h header file and moved everything that I could into
 	it.  This header was getting so messy that even I couldn't understand it so
 	hopefully this helps a little...
@@ -188,10 +182,10 @@ October 19, 1998
 	- per pass vertex diffuse color arrays
 	- per pass vertex specular color arrays
 	- per pass vertex pre-calced diffuse illumination arrays
-	
+
 	In addition, the way you describe the materials for a mesh has *completely*
 	changed.  The new system separates the concepts of VertexMaterial, Texture
-	and Shader.  A VertexMaterial defines the parameters which control the 
+	and Shader.  A VertexMaterial defines the parameters which control the
 	gradient calculations for vertices.  Textures you know about.  Shaders
 	define how the gradients (diffuse and specular) are combined with the texture
 	and the frame buffer.  In addition, a mesh can have several passes; each
@@ -207,13 +201,13 @@ October 19, 1998
 	The culling system changed a bit requiring some re-working of the "Tilemap"
 	so I have removed the tilemap chunks.  At this point in time, all of the AABTree
 	building is being done at run-time.  Once we get the editor a little farther
-	along, we'll define some new chunks for this stuff.  
+	along, we'll define some new chunks for this stuff.
 
 	At this point in time, meshes look like the following.  I've placed an asterisk
 	next to the new chunk types.
 
 	W3D_CHUNK_MESH
-		W3D_CHUNK_MESH_HEADER3					
+		W3D_CHUNK_MESH_HEADER3
 		W3D_CHUNK_MESH_USER_TEXT
 		W3D_CHUNK_VERTICES
 		W3D_CHUNK_VERTEX_NORMALS
@@ -223,7 +217,7 @@ October 19, 1998
 
 *		W3D_CHUNK_MATERIAL_INFO					// how many passes, vertex mtls, shaders, and textures...
 *		W3D_CHUNK_SHADERS							// array of W3dShaderStruct's
-*		W3D_CHUNK_VERTEX_MATERIALS				
+*		W3D_CHUNK_VERTEX_MATERIALS
 *			W3D_CHUNK_VERTEX_MATERIAL
 *				W3D_CHUNK_VERTEX_MATERIAL_NAME
 *				W3D_CHUNK_VERTEX_MATERIAL_INFO
@@ -242,14 +236,14 @@ October 19, 1998
 *			W3D_CHUNK_DCG
 *			W3D_CHUNK_DIG
 *			W3D_CHUNK_SCG
-			
+
 *			W3D_CHUNK_TEXTURE_STAGE
 *				W3D_CHUNK_TEXTURE_IDS
 *				W3D_CHUNK_STAGE_TEXCOORDS
 
 
-	Added a Collection chunk type.  When we export a bunch of independent meshes 
-	(turning off the hierarchy and animation options) this chunk will be added 
+	Added a Collection chunk type.  When we export a bunch of independent meshes
+	(turning off the hierarchy and animation options) this chunk will be added
 	on to the end of the file.  It lists by name each render object that was
 	defined in the file.  Presumably the run-time asset manager will be able
 	to give you a "collection" render object which will be named the same as
@@ -260,8 +254,8 @@ October 19, 1998
 	Added the W3D_CHUNK_POINTS chunk.  This is used to implement "snap points"
 	for the level editor.  It is just an array of points that were found in
 	the max scene (helper object->point).  We make these points co-incide in
-	the level editor to snap objects together.  This chunk can occur inside a 
-	mesh, hmodel, or collection chunk.  When it does, the points should simply 
+	the level editor to snap objects together.  This chunk can occur inside a
+	mesh, hmodel, or collection chunk.  When it does, the points should simply
 	be associated with the model being defined.
 
 August 5, 1999
@@ -284,7 +278,7 @@ March 31, 2000
   different application. Now the information will indicate how a w3d asset with the
   same name as that in the node should pre-transform itself relative to the object
   that contains the transform node.
-  
+
 April 07, 2000
 
   Added W3D_CHUNK_LIGHTSCAPE, W3D_CHUNK_LIGHTSCAPE_LIGHT and W3D_CHUNK_LIGHT_TRANSFORM.
@@ -302,7 +296,7 @@ August 5, 2000
   Added W3D_CHUNK_LIGHT_GLARE and its sub-chunks.  Light glares are going to
   be a new 'geometry type' which simply define points where light glare effects
   should be placed.  The application will supply a callback to the WW3D code
-  which indicates the visibilty of any light glares in the view frustum.  
+  which indicates the visibilty of any light glares in the view frustum.
 
 June 5, 2001
 
@@ -312,7 +306,7 @@ June 5, 2001
 TheSuperHackers @forwardport:
 April 5, 2025
 
-  Added W3D_CHUNK_FX_SHADERS and subchunks, which were added in BFME2. These 
+  Added W3D_CHUNK_FX_SHADERS and subchunks, which were added in BFME2. These
   chunks are used to define usage of a specific shader and pass params.
 
 April 21, 2025
@@ -342,14 +336,14 @@ April 21, 2025
 	W3d to prevent naming conflicts with in-game structures which
 	may be slightly different than the on-disk structures.
 
-	Oct 19,1998: Moved obsolete chunk id's to w3d_obsolete.h, added many 
+	Oct 19,1998: Moved obsolete chunk id's to w3d_obsolete.h, added many
 	new chunk types.
 
 ********************************************************************************/
 
 enum {
 
-	W3D_CHUNK_MESH											=0x00000000,	// Mesh definition 
+	W3D_CHUNK_MESH											=0x00000000,	// Mesh definition
 		W3D_CHUNK_VERTICES								=0x00000002,	// array of vertices (array of W3dVectorStruct's)
 		W3D_CHUNK_VERTEX_NORMALS						=0x00000003,	// array of normals (array of W3dVectorStruct's)
 		W3D_CHUNK_MESH_USER_TEXT						=0x0000000C,	// Text from the MAX comment field (Null terminated string)
@@ -357,7 +351,7 @@ enum {
 		W3D_CHUNK_MESH_HEADER3							=0x0000001F,	//	mesh header contains general info about the mesh. (W3dMeshHeader3Struct)
 		W3D_CHUNK_TRIANGLES								=0x00000020,	// New improved triangles chunk (array of W3dTriangleStruct's)
 		W3D_CHUNK_VERTEX_SHADE_INDICES				=0x00000022,	// shade indexes for each vertex (array of uint32's)
-		
+
 		W3D_CHUNK_PRELIT_UNLIT							=0x00000023,	// optional unlit material chunk wrapper
 		W3D_CHUNK_PRELIT_VERTEX							=0x00000024,	// optional vertex-lit material chunk wrapper
 		W3D_CHUNK_PRELIT_LIGHTMAP_MULTI_PASS		=0x00000025,	// optional lightmapped multi-pass material chunk wrapper
@@ -366,7 +360,7 @@ enum {
 			W3D_CHUNK_MATERIAL_INFO						=0x00000028,	// materials information, pass count, etc (contains W3dMaterialInfoStruct)
 
 			W3D_CHUNK_SHADERS								=0x00000029,	// shaders (array of W3dShaderStruct's)
-			
+
 			W3D_CHUNK_VERTEX_MATERIALS					=0x0000002A,	// wraps the vertex materials
 				W3D_CHUNK_VERTEX_MATERIAL				=0x0000002B,
 					W3D_CHUNK_VERTEX_MATERIAL_NAME	=0x0000002C,	// vertex material name (NULL-terminated string)
@@ -378,7 +372,7 @@ enum {
 				W3D_CHUNK_TEXTURE							=0x00000031,	// wraps a texture definition
 					W3D_CHUNK_TEXTURE_NAME				=0x00000032,	// texture filename (NULL-terminated string)
 					W3D_CHUNK_TEXTURE_INFO				=0x00000033,	// optional W3dTextureInfoStruct
-			
+
 			W3D_CHUNK_MATERIAL_PASS						=0x00000038,	// wraps the information for a single material pass
 				W3D_CHUNK_VERTEX_MATERIAL_IDS			=0x00000039,	// single or per-vertex array of uint32 vertex material indices (check chunk size)
 				W3D_CHUNK_SHADER_IDS						=0x0000003A,	// single or per-tri array of uint32 shader indices (check chunk size)
@@ -396,7 +390,7 @@ enum {
 			W3D_CHUNK_FX_SHADER					=0x00000051,	// a single shader entry
 				W3D_CHUNK_FX_SHADER_INFO		=0x00000052,	// information about the shader to be used (W3dFXShaderInfoStruct)
 				W3D_CHUNK_FX_SHADER_CONSTANT	=0x00000053,	// contains a constant name and value for the shader
-		
+
 		W3D_CHUNK_DEFORM									=0x00000058,	// mesh deform or 'damage' information.
 			W3D_CHUNK_DEFORM_SET							=0x00000059,	// set of deform information
 				W3D_CHUNK_DEFORM_KEYFRAME				=0x0000005A,	// a keyframe of deform information in the set
@@ -406,7 +400,7 @@ enum {
 
 		W3D_CHUNK_VERTEX_TANGENTS = 0x00000060,         // array of tangents (array of W3dVectorStruct's)
 		W3D_CHUNK_VERTEX_BINORMALS = 0x00000061,         // array of binormals (array of W3dVectorStruct's)
-				
+
 		W3D_CHUNK_AABTREE									=0x00000090,	// Axis-Aligned Box Tree for hierarchical polygon culling
 			W3D_CHUNK_AABTREE_HEADER,										// catalog of the contents of the AABTree
 			W3D_CHUNK_AABTREE_POLYINDICES,								// array of uint32 polygon indices with count=mesh.PolyCount
@@ -416,7 +410,7 @@ enum {
 		W3D_CHUNK_HIERARCHY_HEADER,
 		W3D_CHUNK_PIVOTS,
 		W3D_CHUNK_PIVOT_FIXUPS,												// only needed by the exporter...
-	
+
 	W3D_CHUNK_ANIMATION									=0x00000200,	// hierarchy animation data
 		W3D_CHUNK_ANIMATION_HEADER,
 		W3D_CHUNK_ANIMATION_CHANNEL,										// channel of vectors
@@ -426,7 +420,7 @@ enum {
 		W3D_CHUNK_COMPRESSED_ANIMATION_HEADER,							// describes playback rate, number of frames, and type of compression
 		W3D_CHUNK_COMPRESSED_ANIMATION_CHANNEL,						// compressed channel, format dependent on type of compression
 		W3D_CHUNK_COMPRESSED_BIT_CHANNEL,								// compressed bit stream channel, format dependent on type of compression
-        
+
 	W3D_CHUNK_MORPH_ANIMATION							=0x000002C0,	// hierarchy morphing animation data (morphs between poses, for facial animation)
 		W3D_CHUNK_MORPHANIM_HEADER,										// W3dMorphAnimHeaderStruct describes playback rate, number of frames, and type of compression
 		W3D_CHUNK_MORPHANIM_CHANNEL,										// wrapper for a channel
@@ -495,7 +489,7 @@ enum {
 
 	W3D_CHUNK_NULL_OBJECT							=0x00000750,		// defines a NULL object (W3dNullObjectStruct)
 
-	W3D_CHUNK_LIGHTSCAPE								=0x00000800,		// wrapper for lights created with Lightscape.	
+	W3D_CHUNK_LIGHTSCAPE								=0x00000800,		// wrapper for lights created with Lightscape.
 		W3D_CHUNK_LIGHTSCAPE_LIGHT,										// definition of a light created with Lightscape.
 			W3D_CHUNK_LIGHT_TRANSFORM,										// position and orientation (defined as right-handed 4x3 matrix transform W3dLightTransformStruct).
 
@@ -505,7 +499,7 @@ enum {
 
 	W3D_CHUNK_SOUNDROBJ								=0x00000A00,		// description of a sound render object
 		W3D_CHUNK_SOUNDROBJ_HEADER,										// general information such as name and version
-		W3D_CHUNK_SOUNDROBJ_DEFINITION,									// chunk containing the definition of the sound that is to play	
+		W3D_CHUNK_SOUNDROBJ_DEFINITION,									// chunk containing the definition of the sound that is to play
 
 	W3D_CHUNK_SHDMESH									=0x00000B00,		// "Shader mesh" Mesh with multiple sub-meshes that use the scaleable shader system
 		W3D_CHUNK_SHDMESH_NAME,
@@ -574,13 +568,13 @@ struct W3dTexCoordStruct
 /////////////////////////////////////////////////////////////////////////////////////////////
 struct W3dRGBStruct
 {
-	W3dRGBStruct () {} 
+	W3dRGBStruct () {}
 	W3dRGBStruct (uint8 r, uint8 g, uint8 b)
 	{
 		R = r;
 		G = g;
 		B = b;
-	} 
+	}
 
 	void Set (uint8 r, uint8 g, uint8 b)
 	{
@@ -605,7 +599,7 @@ struct W3dRGBStruct
 	{
 		return (!(*this == c));
 	}
-	
+
 	W3dRGBStruct operator += (W3dRGBStruct c)
 	{
 		R = MIN (((unsigned) R) + ((unsigned) c.R), (unsigned) UCHAR_MAX);
@@ -645,10 +639,10 @@ struct W3dRGBAStruct
 /////////////////////////////////////////////////////////////////////////////////////////////
 // MATERIALS
 //
-// Surrender 1.40 significantly changed the way that materials are described.  To 
-// accomodate this, the w3d file format has changed since there are new features and 
-// optimizations that we want to take advangage of.  
-// 
+// Surrender 1.40 significantly changed the way that materials are described.  To
+// accomodate this, the w3d file format has changed since there are new features and
+// optimizations that we want to take advangage of.
+//
 // The VertexMaterial defines parameters which control the calculation of the primary
 // and secondary gradients.  The shader defines how those gradients are combined with
 // the texel and the frame buffer contents.
@@ -743,7 +737,7 @@ struct W3dVertexMaterialStruct
 	{
 		return (!(*this == vm));
 	}
-	
+
 	uint32					Attributes;					// bitfield for the flags defined above
 	W3dRGBStruct			Ambient;
 	W3dRGBStruct			Diffuse;
@@ -754,8 +748,8 @@ struct W3dVertexMaterialStruct
 	float32					Translucency;				// how much light passes through the material. (default = 0)
 };
 
-inline void W3d_Vertex_Material_Reset(W3dVertexMaterialStruct * vmat) 
-{ 
+inline void W3d_Vertex_Material_Reset(W3dVertexMaterialStruct * vmat)
+{
 	vmat->Attributes = 0;
 	vmat->Ambient.R = vmat->Ambient.G = vmat->Ambient.B = 255;
 	vmat->Diffuse.R = vmat->Diffuse.G = vmat->Diffuse.B = 255;
@@ -775,13 +769,13 @@ enum
 	W3DSHADER_DEPTHCOMPARE_PASS_LESS,				// pass if incoming less than stored
 	W3DSHADER_DEPTHCOMPARE_PASS_EQUAL,				// pass if incoming equal to stored
 	W3DSHADER_DEPTHCOMPARE_PASS_LEQUAL,				// pass if incoming less than or equal to stored (default)
-	W3DSHADER_DEPTHCOMPARE_PASS_GREATER,			// pass if incoming greater than stored	
+	W3DSHADER_DEPTHCOMPARE_PASS_GREATER,			// pass if incoming greater than stored
 	W3DSHADER_DEPTHCOMPARE_PASS_NOTEQUAL,			// pass if incoming not equal to stored
 	W3DSHADER_DEPTHCOMPARE_PASS_GEQUAL,				// pass if incoming greater than or equal to stored
 	W3DSHADER_DEPTHCOMPARE_PASS_ALWAYS,				// pass always
 	W3DSHADER_DEPTHCOMPARE_PASS_MAX,					// end of enumeration
 
-	W3DSHADER_DEPTHMASK_WRITE_DISABLE = 0,			// disable depth buffer writes 
+	W3DSHADER_DEPTHMASK_WRITE_DISABLE = 0,			// disable depth buffer writes
 	W3DSHADER_DEPTHMASK_WRITE_ENABLE,				// enable depth buffer writes		(default)
 	W3DSHADER_DEPTHMASK_WRITE_MAX,					// end of enumeration
 
@@ -807,7 +801,7 @@ enum
 	W3DSHADER_PRIGRADIENT_MAX,							// end of enumeration
 
 	W3DSHADER_SECGRADIENT_DISABLE = 0,				// don't draw secondary gradient (default)
-	W3DSHADER_SECGRADIENT_ENABLE,						// add secondary gradient RGB to fragment RGB 
+	W3DSHADER_SECGRADIENT_ENABLE,						// add secondary gradient RGB to fragment RGB
 	W3DSHADER_SECGRADIENT_MAX,							// end of enumeration
 
   	W3DSHADER_SRCBLENDFUNC_ZERO = 0,					// fragment not added to color buffer
@@ -832,7 +826,7 @@ enum
 	W3DSHADER_DETAILCOLORFUNC_ADDSIGNED,			// (local + other - 0.5)
 	W3DSHADER_DETAILCOLORFUNC_ADDSIGNED2X,			// (local + other - 0.5) * 2
 	W3DSHADER_DETAILCOLORFUNC_SCALE2X,				// local * other * 2
-	W3DSHADER_DETAILCOLORFUNC_MODALPHAADDCOLOR,	// local + localAlpha * other	
+	W3DSHADER_DETAILCOLORFUNC_MODALPHAADDCOLOR,	// local + localAlpha * other
 	W3DSHADER_DETAILCOLORFUNC_MAX,					// end of enumeration
 
 	W3DSHADER_DETAILALPHAFUNC_DISABLE = 0,			// local (default)
@@ -853,11 +847,11 @@ enum
 	W3DSHADER_DETAILALPHAFUNC_DEFAULT = W3DSHADER_DETAILALPHAFUNC_DISABLE,
 };
 
-enum PS2_SHADER_SETTINGS { 
+enum PS2_SHADER_SETTINGS {
 	PSS_SRC = 0,
 	PSS_DEST,
 	PSS_ZERO,
-	
+
 	PSS_SRC_ALPHA = 0,
 	PSS_DEST_ALPHA,
 	PSS_ONE,
@@ -875,16 +869,16 @@ enum PS2_SHADER_SETTINGS {
 	PSS_PS2_PRIGRADIENT_HIGHLIGHT2,
 
 
-	PSS_DEPTHCOMPARE_PASS_NEVER = 0,			
-	PSS_DEPTHCOMPARE_PASS_LESS,			
-	PSS_DEPTHCOMPARE_PASS_ALWAYS,	
-	PSS_DEPTHCOMPARE_PASS_LEQUAL,				
+	PSS_DEPTHCOMPARE_PASS_NEVER = 0,
+	PSS_DEPTHCOMPARE_PASS_LESS,
+	PSS_DEPTHCOMPARE_PASS_ALWAYS,
+	PSS_DEPTHCOMPARE_PASS_LEQUAL,
 };
 
 struct W3dShaderStruct
 {
 	W3dShaderStruct(void) {}
-	
+
 	uint8						DepthCompare;
 	uint8						DepthMask;
 	uint8						ColorMask;		// now obsolete and ignored
@@ -903,11 +897,11 @@ struct W3dShaderStruct
 	uint8						pad[1];
 
 	// Required by DynamicVectorClass...
-	inline bool			operator == (const W3dShaderStruct & that) 
-	{		
+	bool			operator == (const W3dShaderStruct & that)
+	{
 		return (
-			(DepthCompare == that.DepthCompare) && 
-			(DepthMask == that.DepthMask) && 
+			(DepthCompare == that.DepthCompare) &&
+			(DepthMask == that.DepthMask) &&
 			/*(ColorMask == that.ColorMask) &&       obsolete*/
 			(DestBlend == that.DestBlend) &&
 			/*(FogFunc == that.FogFunc) &&           obsolete*/
@@ -921,7 +915,7 @@ struct W3dShaderStruct
 			(AlphaTest == that.AlphaTest) );
 	}
 
-	inline bool			operator != (const W3dShaderStruct & that)
+	bool			operator != (const W3dShaderStruct & that)
 	{
 		return !(*this == that);
 	}
@@ -959,7 +953,7 @@ typedef enum
 	CONSTANT_TYPE_BOOL = 7
 } W3D_FX_SHADER_CONSTANT_TYPES;
 
-inline void W3d_Shader_Reset(W3dShaderStruct * s)									{	
+inline void W3d_Shader_Reset(W3dShaderStruct * s)									{
 																										s->DepthCompare = W3DSHADER_DEPTHCOMPARE_PASS_LEQUAL;
 																										s->DepthMask = W3DSHADER_DEPTHMASK_WRITE_ENABLE;
 																										s->ColorMask = 0;	// obsolete
@@ -1011,18 +1005,18 @@ inline int W3d_Shader_Get_PS2_Param_D(const W3dPS2ShaderStruct *s) {return (s->D
 
 inline int W3d_Shader_Get_Depth_Compare(const W3dPS2ShaderStruct * s)				 { return s->DepthCompare; }
 inline int W3d_Shader_Get_Depth_Mask(const W3dPS2ShaderStruct * s)					 { return s->DepthMask; }
-inline int W3d_Shader_Get_Pri_Gradient(const W3dPS2ShaderStruct * s)					 { return s->PriGradient; } 
-inline int W3d_Shader_Get_Texturing(const W3dPS2ShaderStruct * s)						 { return s->Texturing; } 
+inline int W3d_Shader_Get_Pri_Gradient(const W3dPS2ShaderStruct * s)					 { return s->PriGradient; }
+inline int W3d_Shader_Get_Texturing(const W3dPS2ShaderStruct * s)						 { return s->Texturing; }
 inline int W3d_Shader_Get_Alpha_Test(const W3dPS2ShaderStruct * s)					 { return s->AlphaTest; }
 
 
 inline int W3d_Shader_Get_Depth_Compare(const W3dShaderStruct * s)				 { return s->DepthCompare; }
 inline int W3d_Shader_Get_Depth_Mask(const W3dShaderStruct * s)					 { return s->DepthMask; }
 inline int W3d_Shader_Get_Dest_Blend_Func(const W3dShaderStruct * s)				 { return s->DestBlend; }
-inline int W3d_Shader_Get_Pri_Gradient(const W3dShaderStruct * s)					 { return s->PriGradient; } 
-inline int W3d_Shader_Get_Sec_Gradient(const W3dShaderStruct * s)					 { return s->SecGradient; } 
-inline int W3d_Shader_Get_Src_Blend_Func(const W3dShaderStruct * s)				 { return s->SrcBlend; } 
-inline int W3d_Shader_Get_Texturing(const W3dShaderStruct * s)						 { return s->Texturing; } 
+inline int W3d_Shader_Get_Pri_Gradient(const W3dShaderStruct * s)					 { return s->PriGradient; }
+inline int W3d_Shader_Get_Sec_Gradient(const W3dShaderStruct * s)					 { return s->SecGradient; }
+inline int W3d_Shader_Get_Src_Blend_Func(const W3dShaderStruct * s)				 { return s->SrcBlend; }
+inline int W3d_Shader_Get_Texturing(const W3dShaderStruct * s)						 { return s->Texturing; }
 inline int W3d_Shader_Get_Detail_Color_Func(const W3dShaderStruct * s)			 { return s->DetailColorFunc; }
 inline int W3d_Shader_Get_Detail_Alpha_Func(const W3dShaderStruct * s)			 { return s->DetailAlphaFunc; }
 inline int W3d_Shader_Get_Alpha_Test(const W3dShaderStruct * s)					 { return s->AlphaTest; }
@@ -1059,7 +1053,7 @@ inline int W3d_Shader_Get_Post_Detail_Alpha_Func(const W3dShaderStruct * s)	 { r
 #define W3DTEXTURE_HINT_ENVIRONMENT		0x0200		// environment/reflection map
 #define W3DTEXTURE_HINT_SHINY_MASK		0x0300		// shinyness mask map
 
-#define W3DTEXTURE_TYPE_MASK				0x1000	
+#define W3DTEXTURE_TYPE_MASK				0x1000
 #define W3DTEXTURE_TYPE_COLORMAP			0x0000		// Color map.
 #define W3DTEXTURE_TYPE_BUMPMAP			0x1000		// Grayscale heightmap (to be converted to bumpmap).
 
@@ -1173,7 +1167,7 @@ const char * const SURFACE_TYPE_STRINGS[SURFACE_TYPE_MAX] =
 /////////////////////////////////////////////////////////////////////////////////////////////
 #define W3D_MESH_FLAG_NONE										0x00000000		// plain ole normal mesh
 #define W3D_MESH_FLAG_COLLISION_BOX							0x00000001		// (obsolete as of 4.1) mesh is a collision box (should be 8 verts, should be hidden, etc)
-#define W3D_MESH_FLAG_SKIN										0x00000002		// (obsolete as of 4.1) skin mesh 
+#define W3D_MESH_FLAG_SKIN										0x00000002		// (obsolete as of 4.1) skin mesh
 #define W3D_MESH_FLAG_SHADOW									0x00000004		// (obsolete as of 4.1) intended to be projected as a shadow
 #define W3D_MESH_FLAG_ALIGNED									0x00000008		// (obsolete as of 4.1) always aligns with camera
 
@@ -1200,9 +1194,9 @@ const char * const SURFACE_TYPE_STRINGS[SURFACE_TYPE_MAX] =
 #define W3D_MESH_FLAG_GEOMETRY_TYPE_OBBOX					0x00050000		// (4.1+) obbox OBSOLETE!
 #define W3D_MESH_FLAG_GEOMETRY_TYPE_CAMERA_ORIENTED	0x00060000		// (4.1+) camera oriented mesh (points _towards_ camera)
 
-#define W3D_MESH_FLAG_PRELIT_MASK							0x0F000000		// (4.2+) 
+#define W3D_MESH_FLAG_PRELIT_MASK							0x0F000000		// (4.2+)
 #define W3D_MESH_FLAG_PRELIT_UNLIT							0x01000000		// mesh contains an unlit material chunk wrapper
-#define W3D_MESH_FLAG_PRELIT_VERTEX							0x02000000		// mesh contains a precalculated vertex-lit material chunk wrapper 
+#define W3D_MESH_FLAG_PRELIT_VERTEX							0x02000000		// mesh contains a precalculated vertex-lit material chunk wrapper
 #define W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_PASS		0x04000000		// mesh contains a precalculated multi-pass lightmapped material chunk wrapper
 #define W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_TEXTURE	0x08000000		// mesh contains a precalculated multi-texture lightmapped material chunk wrapper
 
@@ -1214,7 +1208,7 @@ const char * const SURFACE_TYPE_STRINGS[SURFACE_TYPE_MAX] =
 	Meshes
 
 	Version 3 Mesh Header, trimmed out some of the junk that was in the
-	previous versions.  
+	previous versions.
 
 ********************************************************************************/
 
@@ -1237,10 +1231,10 @@ const char * const SURFACE_TYPE_STRINGS[SURFACE_TYPE_MAX] =
 
 struct W3dMeshHeader3Struct
 {
-	uint32					Version;							
+	uint32					Version;
 	uint32					Attributes;
-	
-	char						MeshName[W3D_NAME_LEN];		
+
+	char						MeshName[W3D_NAME_LEN];
 	char						ContainerName[W3D_NAME_LEN];
 
 	//
@@ -1256,7 +1250,7 @@ struct W3dMeshHeader3Struct
 
 	uint32					VertexChannels;	// bits for presence of types of per-vertex info
 	uint32					FaceChannels;		// bits for presence of types of per-face info
-	
+
 	//
 	// Bounding volumes
 	//
@@ -1270,7 +1264,7 @@ struct W3dMeshHeader3Struct
 //
 // Vertex Influences.  For "skins" each vertex can be associated with a
 // different bone.
-// 
+//
 struct W3dVertInfStruct
 {
 	uint16					BoneIdx;
@@ -1280,7 +1274,7 @@ struct W3dVertInfStruct
 //
 // Deform information.  Each mesh can have sets of keyframes of
 //	deform info associated with it.
-// 
+//
 struct W3dMeshDeform
 {
 	uint32					SetCount;
@@ -1291,9 +1285,9 @@ struct W3dMeshDeform
 //
 // Deform set information.  Each set is made up of a series
 // of keyframes.
-// 
+//
 struct W3dDeformSetInfo
-{	
+{
 	uint32					KeyframeCount;
 	uint32					flags;
 	uint32					reserved[1];
@@ -1304,7 +1298,7 @@ struct W3dDeformSetInfo
 //
 // Deform keyframe information.  Each keyframe is made up of
 // a set of per-vert deform data.
-// 
+//
 struct W3dDeformKeyframeInfo
 {
 	float32					DeformPercent;
@@ -1315,7 +1309,7 @@ struct W3dDeformKeyframeInfo
 //
 // Deform data.  Contains deform information about a vertex
 // in the mesh.
-// 
+//
 struct W3dDeformData
 {
 	uint32					VertexIndex;
@@ -1324,9 +1318,9 @@ struct W3dDeformData
 	uint32					reserved[2];
 };
 
-// 
+//
 // AABTree header.  Each mesh can have an associated Axis-Aligned-Bounding-Box tree
-// which is used for collision detection and certain rendering algorithms (like 
+// which is used for collision detection and certain rendering algorithms (like
 // texture projection.
 //
 struct W3dMeshAABTreeHeader
@@ -1336,7 +1330,7 @@ struct W3dMeshAABTreeHeader
 	uint32					Padding[6];
 };
 
-// 
+//
 // AABTree Node.  This is a node in the AABTree.
 // If the MSB of FrontOrPoly0 is 1, then the node is a leaf and contains Poly0 and PolyCount
 // else, the node is not a leaf and contains indices to its front and back children.  This matches
@@ -1344,7 +1338,7 @@ struct W3dMeshAABTreeHeader
 //
 struct W3dMeshAABTreeNode
 {
-	W3dVectorStruct		Min;						// min corner of the box 
+	W3dVectorStruct		Min;						// min corner of the box
 	W3dVectorStruct		Max;						// max corner of the box
 	uint32					FrontOrPoly0;			// index of the front child or poly0 (if MSB is set, then leaf and poly0 is valid)
 	uint32					BackOrPolyCount;		// index of the back child or polycount
@@ -1356,12 +1350,12 @@ struct W3dMeshAABTreeNode
 	WHT ( Westwood Hierarchy Tree )
 
 	A hierarchy tree defines a set of coordinate systems which are connected
-	hierarchically.  The header defines the name, number of pivots, etc.  
+	hierarchically.  The header defines the name, number of pivots, etc.
 	The pivots chunk will contain a W3dPivotStructs for each node in the
-	tree.  
-	
+	tree.
+
 	The W3dPivotFixupStruct contains a transform for each MAX coordinate
-	system and our version of that same coordinate system (bone).  It is 
+	system and our version of that same coordinate system (bone).  It is
 	needed when the user exports the base pose using "Translation Only".
 	These are the matrices which go from the MAX rotated coordinate systems
 	to a system which is unrotated in the base pose.  These transformations
@@ -1372,7 +1366,7 @@ struct W3dMeshAABTreeNode
 
 	What are the "fixup" matrices?  These are the transforms which
 	were applied to the base pose when the user wanted to force the
-	base pose to use only matrices with certain properties.  For 
+	base pose to use only matrices with certain properties.  For
 	example, if we wanted the base pose to use translations only,
 	the fixup transform for each node is a transform which when
 	multiplied by the real node's world transform, yeilds a pure
@@ -1390,8 +1384,8 @@ struct W3dHierarchyStruct
 {
 	uint32					Version;
 	char						Name[W3D_NAME_LEN];	// Name of the hierarchy
-	uint32					NumPivots;				
-	W3dVectorStruct		Center;					
+	uint32					NumPivots;
+	W3dVectorStruct		Center;
 };
 
 struct W3dPivotStruct
@@ -1413,9 +1407,9 @@ struct W3dPivotFixupStruct
 
 	WHA (Westwood Hierarchy Animation)
 
-	A Hierarchy Animation is a set of data defining deltas from the base 
+	A Hierarchy Animation is a set of data defining deltas from the base
 	position of a hierarchy tree.  Translation and Rotation channels can be
-	attached to any node of the hierarchy tree which the animation is 
+	attached to any node of the hierarchy tree which the animation is
 	associated with.
 
 ********************************************************************************/
@@ -1427,7 +1421,7 @@ struct W3dPivotFixupStruct
 struct W3dAnimHeaderStruct
 {
 	uint32					Version;
-	char						Name[W3D_NAME_LEN];				
+	char						Name[W3D_NAME_LEN];
 	char						HierarchyName[W3D_NAME_LEN];
 	uint32					NumFrames;
 	uint32					FrameRate;
@@ -1437,7 +1431,7 @@ struct W3dAnimHeaderStruct
 struct W3dCompressedAnimHeaderStruct
 {
 	uint32					Version;
-	char						Name[W3D_NAME_LEN];				
+	char						Name[W3D_NAME_LEN];
 	char						HierarchyName[W3D_NAME_LEN];
 	uint32					NumFrames;
 	uint16					FrameRate;
@@ -1445,7 +1439,7 @@ struct W3dCompressedAnimHeaderStruct
 };
 
 
-enum 
+enum
 {
 	ANIM_CHANNEL_X = 0,
 	ANIM_CHANNEL_Y,
@@ -1481,8 +1475,8 @@ enum
 
 struct W3dAnimChannelStruct
 {
-	uint16					FirstFrame;			
-	uint16					LastFrame;			
+	uint16					FirstFrame;
+	uint16					LastFrame;
 	uint16					VectorLen;			// length of each vector in this channel
 	uint16					Flags;					// channel type.
 	uint16					Pivot;					// pivot affected by this channel
@@ -1490,7 +1484,7 @@ struct W3dAnimChannelStruct
 	float32					Data[1];				// will be (LastFrame - FirstFrame + 1) * VectorLen long
 };
 
-enum 
+enum
 {
 	BIT_CHANNEL_VIS = 0,							// turn meshes on and off depending on anim frame.
 	BIT_CHANNEL_TIMECODED_VIS,
@@ -1499,7 +1493,7 @@ enum
 struct W3dBitChannelStruct
 {
 	uint16					FirstFrame;			// all frames outside "First" and "Last" are assumed = DefaultVal
-	uint16					LastFrame;			
+	uint16					LastFrame;
 	uint16					Flags;					// channel type.
 	uint16					Pivot;					// pivot affected by this channel
 	uint8						DefaultVal;			// default state when outside valid range.
@@ -1521,14 +1515,14 @@ struct W3dTimeCodedAnimChannelStruct
 	uint8						VectorLen;			// length of each vector in this channel
 	uint8						Flags;				// channel type.
 	uint32					Data[1];				// will be (NumTimeCodes * ((VectorLen * sizeof(uint32)) + sizeof(uint32)))
-};								  
+};
 
 // The bit channel is encoded right into the MSB of each time code
 #define W3D_TIMECODED_BIT_MASK	0x80000000
 
 struct W3dTimeCodedBitChannelStruct
 {
-	uint32					NumTimeCodes;  		// number of time coded entries 
+	uint32					NumTimeCodes;  		// number of time coded entries
 	uint16					Pivot;					// pivot affected by this channel
 	uint8						Flags;					// channel type.
 	uint8						DefaultVal;				// default state when outside valid range.
@@ -1551,7 +1545,7 @@ struct W3dAdaptiveDeltaAnimChannelStruct
 // End AdaptiveDelta Structures
 
 /********************************************************************************
-	
+
 	HMorphAnimClass
 
 	This is an animation format which describes morphs between poses in another
@@ -1596,7 +1590,7 @@ struct W3dMorphAnimKeyStruct
 
 	HModel - Hiearchical Model
 
-	A Hierarchy Model is a set of render objects which should be attached to 
+	A Hierarchy Model is a set of render objects which should be attached to
 	bones in a hierarchy tree.  There can be multiple objects per node
 	in the tree.  Or there may be no objects attached to a particular bone.
 
@@ -1619,7 +1613,7 @@ struct W3dHModelHeaderStruct
 	uint32					Version;
 	char						Name[W3D_NAME_LEN];				// Name of this model
 	char						HierarchyName[W3D_NAME_LEN];	// Name of the hierarchy tree this model uses
-	uint16					NumConnections;				
+	uint16					NumConnections;
 };
 
 
@@ -1644,10 +1638,10 @@ struct W3dLODModelHeaderStruct
 {
 	uint32					Version;
 	char						Name[W3D_NAME_LEN];				// Name of this LOD Model
-	uint16					NumLODs;				
+	uint16					NumLODs;
 };
 
-struct W3dLODStruct 
+struct W3dLODStruct
 {
 	char						RenderObjName[2*W3D_NAME_LEN];
 	float32					LODMin;								// "artist" inspired switching distances
@@ -1664,12 +1658,12 @@ struct W3dLODStruct
 	contain a string chunk for the name of each render object in the collection.
 	A collection may also contain a "Snap Points" chunk.
 
-	W3D_CHUNK_COLLECTION								
+	W3D_CHUNK_COLLECTION
 		W3D_CHUNK_COLLECTION_HEADER
 		W3D_CHUNK_SNAP_POINTS
-		W3D_CHUNK_COLLECTION_OBJ_NAME			
-		W3D_CHUNK_COLLECTION_OBJ_NAME			
-		W3D_CHUNK_COLLECTION_OBJ_NAME			
+		W3D_CHUNK_COLLECTION_OBJ_NAME
+		W3D_CHUNK_COLLECTION_OBJ_NAME
+		W3D_CHUNK_COLLECTION_OBJ_NAME
 		...
 
 ********************************************************************************/
@@ -1703,7 +1697,7 @@ struct W3dPlaceholderStruct
 };
 
 
-/*							 
+/*
 ** Transform chunks.  These chunks refer to other W3D files which should be transformed by
 ** this file.  This feature is used to allow user to (for example) lightmap the interior
 ** of a building once and then just transform that into all of our levels that use it.
@@ -1767,7 +1761,7 @@ struct W3dLightTransformStruct
 {
 	float32 Transform [3][4];
 };
-	
+
 
 /********************************************************************************
 
@@ -1873,7 +1867,7 @@ struct W3dEmitterInfoStructV2
 };
 
 // W3D_CHUNK_EMITTER_PROPS
-// Contains a W3dEmitterPropertyStruct followed by a number of color keyframes, 
+// Contains a W3dEmitterPropertyStruct followed by a number of color keyframes,
 // opacity keyframes, and size keyframes
 
 struct W3dEmitterPropertyStruct
@@ -1906,9 +1900,9 @@ struct W3dEmitterSizeKeyframeStruct
 	float32				Size;
 };
 
-// W3D_CHUNK_EMITTER_ROTATION_KEYFRAMES 
+// W3D_CHUNK_EMITTER_ROTATION_KEYFRAMES
 // Contains a W3dEmitterRotationHeaderStruct followed by a number of
-// rotational velocity keyframes.  
+// rotational velocity keyframes.
 struct W3dEmitterRotationHeaderStruct
 {
 	uint32				KeyframeCount;
@@ -1976,7 +1970,7 @@ struct W3dEmitterBlurTimeKeyframeStruct
 struct W3dEmitterLinePropertiesStruct
 {
 	uint32							Flags;
-	uint32							SubdivisionLevel;	
+	uint32							SubdivisionLevel;
 	float32							NoiseAmplitude;
 	float32							MergeAbortFactor;
 	float32							TextureTileFactor;
@@ -2067,14 +2061,14 @@ struct W3dAggregateMiscInfo
 			W3D_CHUNK_HLOD_SUB_OBJECT,										// an object in this level of detail array
 		W3D_CHUNK_HLOD_AGGREGATE_ARRAY,									// array of aggregates, contains W3D_CHUNK_SUB_OBJECT_ARRAY_HEADER and W3D_CHUNK_SUB_OBJECT_ARRAY
 		W3D_CHUNK_HLOD_PROXY_ARRAY,										// array of proxies, used for application-defined purposes
-	
+
 	An HLOD is the basic hierarchical model format used by W3D.  It references
 	an HTree for its hierarchical structure and animation data and several arrays
 	of sub-objects; one for each LOD in the model.  In addition, it can contain
 	an array of "aggregates" which are references to external W3D objects to
 	be automatically attached into it.  And it can have a list of "proxy" objects
 	which can be used for application purposes such as instantiating game objects
-	at the specified transform. 
+	at the specified transform.
 
 ********************************************************************************/
 
@@ -2108,9 +2102,9 @@ struct W3dHLodSubObjectStruct
 
 	Collision boxes are meant to be used for, you guessed it, collision detection.
 	For this reason, they only contain a minimal amount of rendering information
-	(a color).  
+	(a color).
 
-	Axis Aligned - This is a bounding box which is *always* aligned with the world 
+	Axis Aligned - This is a bounding box which is *always* aligned with the world
 	coordinate system.  So, the center point is to be transformed by whatever
 	transformation matrix is being used but the extents always point down the
 	world space x,y, and z axes.  (in effect, you are translating the center).
@@ -2169,8 +2163,8 @@ struct W3dNullObjectStruct
 
 	The only data needed to instantiate a dazzle object is the type-name of
 	the dazzle to use.  The dazzle is always assumed to be at the pivot point
-	of the bone it is attached to (you should enable Export_Transform) for 
-	dazzles.  If the dazzle-type (from dazzle.ini) is directional, then the 
+	of the bone it is attached to (you should enable Export_Transform) for
+	dazzles.  If the dazzle-type (from dazzle.ini) is directional, then the
 	coordinate-system of the bone will define the direction.
 
 ********************************************************************************/
@@ -2232,9 +2226,9 @@ struct W3dSoundRObjHeaderStruct
 */
 struct W3dShdMeshHeaderStruct
 {
-	uint32					Version;							
+	uint32					Version;
 	uint32					Attributes;			// Uses same #defines as Mesh, e.g. W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN
-	
+
 	//
 	// Counts, these can be regarded as an inventory of what is to come in the file.
 	//
@@ -2277,6 +2271,3 @@ struct W3dShdSubMeshHeaderStruct
 ** Include the obsolete structures and chunk ID's
 */
 #include "w3d_obsolete.h"
-
-
-#endif // W3D_FILE_H
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
index edd42ac0d58..38d966e5130 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
@@ -26,14 +26,14 @@
  *                                                                                             *
  *                   Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *								$Modtime:: 08/05/02 10:03a                                             $*
  *                                                                                             *
  *                    $Revision:: 98                                                          $*
  *                                                                                             *
  * 07/01/02 KM Scalable shader library integration				                               *
- * 08/05/02 KM Texture class redesign 
+ * 08/05/02 KM Texture class redesign
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  *   WW3D::Init -- Initialize the WW3D Library                                                 *
@@ -100,7 +100,7 @@
 #include "statistics.h"
 #include "pointgr.h"
 #include "ffactory.h"
-#include "INI.H"
+#include "INI.h"
 #include "dazzle.h"
 #include "meshmdl.h"
 #include "dx8renderer.h"
@@ -108,9 +108,8 @@
 #include "bound.h"
 #include "rddesc.h"
 #include "Vector3i.h"
-#include <cstdio>
 #include "dx8wrapper.h"
-#include "TARGA.H"
+#include "TARGA.h"
 #include "sortingrenderer.h"
 #include "thread.h"
 #include "cpudetect.h"
@@ -118,11 +117,7 @@
 #include "formconv.h"
 #include "animatedsoundmgr.h"
 #include "static_sort_list.h"
-
-
-#ifndef _UNIX
 #include "framgrab.h"
-#endif
 
 
 const char* DAZZLE_INI_FILENAME="DAZZLE.INI";
@@ -165,6 +160,8 @@ const char* DAZZLE_INI_FILENAME="DAZZLE.INI";
 **
 ***********************************************************************************/
 
+float														WW3D::LogicFrameTimeMs = 1000.0f / WWSyncPerSecond; // initialized to something to avoid division by zero on first use
+float															WW3D::FractionalSyncMs = 0.0f;
 unsigned int											WW3D::SyncTime = 0;
 unsigned int											WW3D::PreviousSyncTime = 0;
 bool														WW3D::IsSortingEnabled = true;
@@ -251,14 +248,6 @@ void WW3D::Set_NPatches_Level(unsigned level)
 	NPatchesLevel = level;
 }
 
-void WW3D::Set_Thumbnail_Enabled (bool b)
-{
-	if (ThumbnailEnabled!=b) {
-		ThumbnailEnabled = b;
-		_Invalidate_Textures();
-	}
-}
-
 /***********************************************************************************************
  * WW3D::Init -- Initialize the WW3D Library                                                   *
  *                                                                                             *
@@ -274,7 +263,7 @@ void WW3D::Set_Thumbnail_Enabled (bool b)
 WW3DErrorType WW3D::Init(void *hwnd, char *defaultpal, bool lite)
 {
 	assert(IsInitted == false);
-	WWDEBUG_SAY(("WW3D::Init hwnd = %p\n",hwnd));
+	WWDEBUG_SAY(("WW3D::Init hwnd = %p",hwnd));
 	_Hwnd = (HWND)hwnd;
 	Lite = lite;
 
@@ -282,11 +271,11 @@ WW3DErrorType WW3D::Init(void *hwnd, char *defaultpal, bool lite)
 	** Initialize d3d, this also enumerates the available devices and resolutions.
 	*/
 	Init_D3D_To_WW3_Conversion();
-	WWDEBUG_SAY(("Init DX8Wrapper\n"));
+	WWDEBUG_SAY(("Init DX8Wrapper"));
 	if (!DX8Wrapper::Init(_Hwnd, lite)) {
 		return(WW3D_ERROR_INITIALIZATION_FAILED);
 	}
-	WWDEBUG_SAY(("Allocate Debug Resources\n"));
+	WWDEBUG_SAY(("Allocate Debug Resources"));
 	Allocate_Debug_Resources();
 
  	MMRESULT r=timeBeginPeriod(1);
@@ -296,7 +285,7 @@ WW3DErrorType WW3D::Init(void *hwnd, char *defaultpal, bool lite)
 	** Initialize the dazzle system
 	*/
 	if (!lite) {
-		WWDEBUG_SAY(("Init Dazzles\n"));
+		WWDEBUG_SAY(("Init Dazzles"));
 		FileClass * dazzle_ini_file = _TheFileFactory->Get_File(DAZZLE_INI_FILENAME);
 		if (dazzle_ini_file) {
 			INIClass dazzle_ini(*dazzle_ini_file);
@@ -318,7 +307,7 @@ WW3DErrorType WW3D::Init(void *hwnd, char *defaultpal, bool lite)
 		AnimatedSoundMgrClass::Initialize ();
 		IsInitted = true;
 	}
-	WWDEBUG_SAY(("WW3D Init completed\n"));
+	WWDEBUG_SAY(("WW3D Init completed"));
 	return WW3D_ERROR_OK;
 }
 
@@ -338,7 +327,7 @@ WW3DErrorType WW3D::Init(void *hwnd, char *defaultpal, bool lite)
 WW3DErrorType WW3D::Shutdown(void)
 {
 	assert(Lite || IsInitted == true);
-//	WWDEBUG_SAY(("WW3D::Shutdown\n"));
+//	WWDEBUG_SAY(("WW3D::Shutdown"));
 
 #ifdef WW3D_DX8
 	if (IsCapturing) {
@@ -778,7 +767,7 @@ void WW3D::Set_Texture_Filter(int texture_filter)
 	if (texture_filter<0) texture_filter=0;
 	if (texture_filter>TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC) texture_filter=TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC;
 	TextureFilter=texture_filter;
-	TextureFilterClass::_Init_Filters();
+	TextureFilterClass::_Init_Filters((TextureFilterClass::TextureFilterMode)TextureFilter);
 }
 
 
@@ -804,9 +793,9 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f
 	WWASSERT(IsInitted);
 	HRESULT hr;
 
-	SNAPSHOT_SAY(("==========================================\r\n"));
-	SNAPSHOT_SAY(("========== WW3D::Begin_Render ============\r\n"));
-	SNAPSHOT_SAY(("==========================================\r\n\r\n"));
+	SNAPSHOT_SAY(("=========================================="));
+	SNAPSHOT_SAY(("========== WW3D::Begin_Render ============"));
+	SNAPSHOT_SAY(("==========================================\n"));
 
 	if (DX8Wrapper::_Get_D3D_Device8() && (hr=DX8Wrapper::_Get_D3D_Device8()->TestCooperativeLevel()) != D3D_OK)
 	{
@@ -817,7 +806,7 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f
         // Check if the device needs to be reset
         if( D3DERR_DEVICENOTRESET == hr )
         {
-            WWDEBUG_SAY(("WW3D::Begin_Render is resetting the device.\n"));
+            WWDEBUG_SAY(("WW3D::Begin_Render is resetting the device."));
             DX8Wrapper::Reset_Device();
         }
 
@@ -829,7 +818,7 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f
 	LastFrameMemoryFrees=WWMemoryLogClass::Get_Free_Count();
 	WWMemoryLogClass::Reset_Counters();
 
-	TextureLoader::Update();
+	TextureLoader::Update(network_callback);
 //	TextureClass::_Reset_Time_Stamp();
 	DynamicVBAccessClass::_Reset(true);
 	DynamicIBAccessClass::_Reset(true);
@@ -854,7 +843,7 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f
 		vp.Y = 0;
 		vp.Width = width;
 		vp.Height = height;
-		vp.MinZ = 0.0f;;
+		vp.MinZ = 0.0f;
 		vp.MaxZ = 1.0f;
 		DX8Wrapper::Set_Viewport(&vp);
 		DX8Wrapper::Clear(clear, clearz, color, dest_alpha);
@@ -1112,13 +1101,13 @@ WW3DErrorType WW3D::End_Render(bool flip_frame)
 		Debug_Statistics::End_Statistics();
 	}
 
-	SNAPSHOT_SAY(("==========================================\r\n"));
-	SNAPSHOT_SAY(("========== WW3D::End_Render ==============\r\n"));
-	SNAPSHOT_SAY(("==========================================\r\n\r\n"));
+	SNAPSHOT_SAY(("=========================================="));
+	SNAPSHOT_SAY(("========== WW3D::End_Render =============="));
+	SNAPSHOT_SAY(("==========================================\n"));
 
 	Activate_Snapshot(false);
-	
-	// (gth) I've found some cases where its not safe to rely on our "shadow" copy (of 
+
+	// (gth) I've found some cases where its not safe to rely on our "shadow" copy (of
 	// matrices for example) across multiple frames.  So even though this is slightly
 	// less "optimal", lets just reset the caches each frame.
 	DX8Wrapper::Invalidate_Cached_Render_States();
@@ -1167,6 +1156,12 @@ unsigned int WW3D::Get_Last_Frame_Vertex_Count(void)
 	return Debug_Statistics::Get_DX8_Vertices();
 }
 
+void WW3D::Update_Logic_Frame_Time(float milliseconds)
+{
+	LogicFrameTimeMs = milliseconds;
+	FractionalSyncMs += milliseconds;
+}
+
 
 /***********************************************************************************************
  * WW3D::Sync -- Time sychronization                                                           *
@@ -1180,12 +1175,17 @@ unsigned int WW3D::Get_Last_Frame_Vertex_Count(void)
  * HISTORY:                                                                                    *
  *   3/24/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-void WW3D::Sync(unsigned int sync_time)
+void WW3D::Sync(bool step)
 {
 	PreviousSyncTime = SyncTime;
-   SyncTime = sync_time;
-}
 
+	if (step)
+	{
+		unsigned int integralSyncMs = (unsigned int)FractionalSyncMs;
+		FractionalSyncMs -= integralSyncMs;
+		SyncTime += integralSyncMs;
+	}
+}
 
 /***********************************************************************************************
  * WW3D::Set_Ext_Swap_Interval -- Sets the swap interval the device should aim sync for.       *
@@ -1334,7 +1334,7 @@ void WW3D::Make_Screen_Shot( const char * filename_base , const float gamma, con
 		}
 	}
 
-	WWDEBUG_SAY(( "Creating Screen Shot %s\n", filename ));
+	WWDEBUG_SAY(( "Creating Screen Shot %s", filename ));
 
 	// make the gamma look up table
 	int i;
@@ -1436,7 +1436,7 @@ void WW3D::Make_Screen_Shot( const char * filename_base , const float gamma, con
 				header.biXPelsPerMeter = 0xB12;
 				header.biYPelsPerMeter = 0xB12;
 				int len = ((width * 24 +31) & ~31) /8;
-    
+
 				memset(&fileheader, 0, sizeof(BITMAPFILEHEADER));
 				fileheader.bfType = 19778; // BM
 				fileheader.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER);
@@ -1491,7 +1491,7 @@ void WW3D::Make_Screen_Shot( const char * filename_base , const float gamma, con
  *=============================================================================================*/
 void WW3D::Start_Movie_Capture( const char * filename_base, float frame_rate )
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	if (IsCapturing) {
 		Stop_Movie_Capture();
 	}
@@ -1515,7 +1515,7 @@ void WW3D::Start_Movie_Capture( const char * filename_base, float frame_rate )
 
 	Movie = W3DNEW FrameGrabClass( filename_base, FrameGrabClass::AVI, width, height, depth, frame_rate);
 
-	WWDEBUG_SAY(( "Starting Movie %s\n", filename_base ));
+	WWDEBUG_SAY(( "Starting Movie %s", filename_base ));
 #endif
 }
 
@@ -1534,10 +1534,10 @@ void WW3D::Start_Movie_Capture( const char * filename_base, float frame_rate )
  *=============================================================================================*/
 void WW3D::Stop_Movie_Capture( void )
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	if (IsCapturing) {
 		IsCapturing = false;
-		WWDEBUG_SAY(( "Stoping Movie\n" ));
+		WWDEBUG_SAY(( "Stoping Movie" ));
 
 		WWASSERT( Movie != NULL);
 		delete Movie;
@@ -1692,10 +1692,10 @@ bool WW3D::Is_Movie_Ready()
  *=============================================================================================*/
 void WW3D::Update_Movie_Capture( void )
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	WWASSERT( IsCapturing);
 	WWPROFILE("WW3D::Update_Movie_Capture");
-	WWDEBUG_SAY(( "Updating\n"));
+	WWDEBUG_SAY(( "Updating"));
 
 	// TheSuperHackers @bugfix xezon 21/05/2025 Get the back buffer and create a copy of the surface.
 	// Originally this code took the front buffer and tried to lock it. This does not work when the
@@ -1769,7 +1769,7 @@ void WW3D::Update_Movie_Capture( void )
  *=============================================================================================*/
 float	WW3D::Get_Movie_Capture_Frame_Rate( void )
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	if (IsCapturing) {
 		return Movie->GetFrameRate();
 	}
@@ -2055,4 +2055,4 @@ void WW3D::Reset_Current_Static_Sort_Lists_To_Default(void)
 void WW3D::Set_Gamma(float gamma,float bright,float contrast,bool calibrate)
 {
 	DX8Wrapper::Set_Gamma(gamma,bright,contrast,calibrate);
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h
index 4f5544f19ea..f169690b695 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef WW3D_H
-#define WW3D_H
 
 #include "always.h"
 #include "vector3.h"
@@ -162,16 +156,37 @@ class WW3D
 
 	static void Flip_To_Primary(void);
 
-
+	// TheSuperHackers @info Add amount of milliseconds that the simulation has advanced in this render frame.
+	// This can be a fraction of a logic step.
+	static void Update_Logic_Frame_Time(float milliseconds);
 	/*
 	** Timing
 	** By calling the Sync function, the application can move the ww3d library time forward.  This
 	** will control things like animated uv-offset mappers and render object animations.
 	*/
-	static void					Sync( unsigned int sync_time );
+	static void						Sync(bool step);
+
+	// Total sync time in milliseconds. Advances in full logic time steps only.
 	static unsigned int		Get_Sync_Time(void) { return SyncTime; }
-   static unsigned int     Get_Frame_Time(void) { return SyncTime - PreviousSyncTime; }
-   static unsigned int     Get_Frame_Count(void) { return FrameCount; }
+
+	// Current sync frame time in milliseconds. Can be zero when the logic has not stepped forward in the current render update.
+	static unsigned int		Get_Sync_Frame_Time(void) { return SyncTime - PreviousSyncTime; }
+
+	// Fractional sync frame time. Accumulates for as long as the sync frame is not stepped forward.
+	static unsigned int		Get_Fractional_Sync_Milliseconds() { return (unsigned int)FractionalSyncMs; }
+
+	// Total logic time in milliseconds. Can include fractions of a logic step. Is rounded to integer.
+	static unsigned int		Get_Logic_Time_Milliseconds() { return SyncTime + (unsigned int)FractionalSyncMs; }
+
+	// Logic time step in milliseconds. Can be a fraction of a logic step.
+	static float					Get_Logic_Frame_Time_Milliseconds() { return LogicFrameTimeMs; }
+
+	// Logic time step in seconds. Can be a fraction of a logic step.
+	static float					Get_Logic_Frame_Time_Seconds() { return LogicFrameTimeMs * 0.001f; }
+
+	// Returns the render frame count.
+	static unsigned int		Get_Frame_Count(void) { return FrameCount; }
+
 	static unsigned int		Get_Last_Frame_Poly_Count(void);
 	static unsigned int		Get_Last_Frame_Vertex_Count(void);
 
@@ -213,7 +228,7 @@ class WW3D
 	static void					_Invalidate_Mesh_Cache();
 	static void					_Invalidate_Textures();
 
-	static void					Set_Thumbnail_Enabled(bool b);// { ThumbnailEnabled=b; }
+	static void					Set_Thumbnail_Enabled(bool b) { ThumbnailEnabled=b; }
 	static bool					Get_Thumbnail_Enabled() { return ThumbnailEnabled; }
 
 	static void					Enable_Sorting(bool onoff);
@@ -321,17 +336,23 @@ class WW3D
 	static void					Allocate_Debug_Resources(void);
 	static void					Release_Debug_Resources(void);
 
+	// Logic frame time, in milliseconds
+	static float LogicFrameTimeMs;
+
+	// Accumulated synchronized frame time in milliseconds
+	static float FractionalSyncMs;
+
 	// Timing info:
-   // The absolute synchronized frame time (in milliseconds) supplied by the
-   // application at the start of every frame. Note that wraparound cases
-   // etc. need to be considered.
-	static unsigned int				SyncTime;
+	// The absolute synchronized frame time (in milliseconds) supplied by the
+	// application at the start of every frame. Note that wraparound cases
+	// etc. need to be considered.
+	static unsigned int SyncTime;
 
-   // The previously set absolute sync time - this is used to get the interval between
-   // the most recently set sync time and the previous one. Assuming the
-   // application sets sync time at the start of every frame, this represents
-   // the frame interval.
-   static unsigned int           PreviousSyncTime;
+	// The previously set absolute sync time - this is used to get the interval between
+	// the most recently set sync time and the previous one. Assuming the
+	// application sets sync time at the start of every frame, this represents
+	// the frame interval.
+	static unsigned int PreviousSyncTime;
 
 	static float						PixelCenterX;
 	static float						PixelCenterY;
@@ -447,7 +468,3 @@ struct RenderStatistics
       long     UserStat1;
       long     UserStat2;
 };
-
-
-
-#endif
diff --git a/Generals/Code/Main/CMakeLists.txt b/Generals/Code/Main/CMakeLists.txt
index b4cf5155695..f6b7a4640bd 100644
--- a/Generals/Code/Main/CMakeLists.txt
+++ b/Generals/Code/Main/CMakeLists.txt
@@ -12,7 +12,6 @@ target_link_libraries(g_generals PRIVATE
     comctl32
     d3d8
     d3dx8
-    dbghelplib
     dinput8
     dxguid
     g_gameengine
@@ -29,8 +28,8 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/GeneratedVersion.h
 "#pragma once
 
 #define VERSION_LOCALBUILDNUM 0
-#define VERSION_BUILDUSER \"Someone\"
-#define VERSION_BUILDLOC \"Someplace\"
+#define VERSION_BUILDUSER \"\"
+#define VERSION_BUILDLOC \"\"
 "
 )
 
diff --git a/Generals/Code/Main/WinMain.cpp b/Generals/Code/Main/WinMain.cpp
index 09c51959f0c..3c34a3e81cf 100644
--- a/Generals/Code/Main/WinMain.cpp
+++ b/Generals/Code/Main/WinMain.cpp
@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: WinMain.cpp //////////////////////////////////////////////////////////
-// 
+//
 // Entry point for game application
 //
 // Author: Colin Day, April 2001
@@ -42,6 +42,7 @@
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "WinMain.h"
 #include "Lib/BaseType.h"
+#include "Common/CommandLine.h"
 #include "Common/CriticalSection.h"
 #include "Common/GlobalData.h"
 #include "Common/GameEngine.h"
@@ -63,31 +64,24 @@
 #include "BuildVersion.h"
 #include "GeneratedVersion.h"
 #include "resource.h"
-#include "trim.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
+#ifdef RTS_ENABLE_CRASHDUMP
+#include "Common/MiniDumper.h"
 #endif
 
+
 // GLOBALS ////////////////////////////////////////////////////////////////////
 HINSTANCE ApplicationHInstance = NULL;  ///< our application instance
 HWND ApplicationHWnd = NULL;  ///< our application window handle
-Bool ApplicationIsWindowed = false;
-Win32Mouse *TheWin32Mouse= NULL;  ///< for the WndProc() only
+Win32Mouse *TheWin32Mouse = NULL;  ///< for the WndProc() only
 DWORD TheMessageTime = 0;	///< For getting the time that a message was posted from Windows.
 
 const Char *g_strFile = "data\\Generals.str";
 const Char *g_csfFile = "data\\%s\\Generals.csf";
 const char *gAppPrefix = ""; /// So WB can have a different debug log file name.
 
-#define DEFAULT_XRESOLUTION 800
-#define DEFAULT_YRESOLUTION 600
-
 static Bool gInitializing = false;
 static Bool gDoPaint = true;
-static Bool isWinMainActive = false; 
+static Bool isWinMainActive = false;
 
 static HBITMAP gLoadScreenBitmap = NULL;
 
@@ -95,198 +89,198 @@ static HBITMAP gLoadScreenBitmap = NULL;
 
 #ifdef DEBUG_WINDOWS_MESSAGES
 static const char *messageToString(unsigned int message)
-{	
+{
 	static char name[32];
 
 	switch (message)
 	{
-	case WM_NULL: return "WM_NULL";                     
-	case WM_CREATE: return  "WM_CREATE";               
-	case WM_DESTROY: return  "WM_DESTROY";            
-	case WM_MOVE: return  "WM_MOVE";               
-	case WM_SIZE: return  "WM_SIZE";                 
-	case WM_ACTIVATE: return  "WM_ACTIVATE";             
-	case WM_SETFOCUS: return  "WM_SETFOCUS";             
-	case WM_KILLFOCUS: return  "WM_KILLFOCUS";            
-	case WM_ENABLE: return  "WM_ENABLE";               
-	case WM_SETREDRAW: return  "WM_SETREDRAW";            
-	case WM_SETTEXT: return  "WM_SETTEXT";              
-	case WM_GETTEXT: return  "WM_GETTEXT";              
-	case WM_GETTEXTLENGTH: return  "WM_GETTEXTLENGTH";        
-	case WM_PAINT: return  "WM_PAINT";                
-	case WM_CLOSE: return  "WM_CLOSE";                
-	case WM_QUERYENDSESSION: return  "WM_QUERYENDSESSION";      
-	case WM_QUIT: return  "WM_QUIT";                 
-	case WM_QUERYOPEN: return  "WM_QUERYOPEN";            
-	case WM_ERASEBKGND: return  "WM_ERASEBKGND";           
-	case WM_SYSCOLORCHANGE: return  "WM_SYSCOLORCHANGE";       
-	case WM_ENDSESSION: return  "WM_ENDSESSION";           
-	case WM_SHOWWINDOW: return  "WM_SHOWWINDOW";           
+	case WM_NULL: return "WM_NULL";
+	case WM_CREATE: return  "WM_CREATE";
+	case WM_DESTROY: return  "WM_DESTROY";
+	case WM_MOVE: return  "WM_MOVE";
+	case WM_SIZE: return  "WM_SIZE";
+	case WM_ACTIVATE: return  "WM_ACTIVATE";
+	case WM_SETFOCUS: return  "WM_SETFOCUS";
+	case WM_KILLFOCUS: return  "WM_KILLFOCUS";
+	case WM_ENABLE: return  "WM_ENABLE";
+	case WM_SETREDRAW: return  "WM_SETREDRAW";
+	case WM_SETTEXT: return  "WM_SETTEXT";
+	case WM_GETTEXT: return  "WM_GETTEXT";
+	case WM_GETTEXTLENGTH: return  "WM_GETTEXTLENGTH";
+	case WM_PAINT: return  "WM_PAINT";
+	case WM_CLOSE: return  "WM_CLOSE";
+	case WM_QUERYENDSESSION: return  "WM_QUERYENDSESSION";
+	case WM_QUIT: return  "WM_QUIT";
+	case WM_QUERYOPEN: return  "WM_QUERYOPEN";
+	case WM_ERASEBKGND: return  "WM_ERASEBKGND";
+	case WM_SYSCOLORCHANGE: return  "WM_SYSCOLORCHANGE";
+	case WM_ENDSESSION: return  "WM_ENDSESSION";
+	case WM_SHOWWINDOW: return  "WM_SHOWWINDOW";
 	case WM_WININICHANGE: return "WM_WININICHANGE";
-	case WM_DEVMODECHANGE: return  "WM_DEVMODECHANGE";        
-	case WM_ACTIVATEAPP: return  "WM_ACTIVATEAPP";          
-	case WM_FONTCHANGE: return  "WM_FONTCHANGE";           
-	case WM_TIMECHANGE: return  "WM_TIMECHANGE";           
-	case WM_CANCELMODE: return  "WM_CANCELMODE";           
-	case WM_SETCURSOR: return  "WM_SETCURSOR";            
-	case WM_MOUSEACTIVATE: return  "WM_MOUSEACTIVATE";        
-	case WM_CHILDACTIVATE: return  "WM_CHILDACTIVATE";        
-	case WM_QUEUESYNC: return  "WM_QUEUESYNC";            
-	case WM_GETMINMAXINFO: return  "WM_GETMINMAXINFO";        
-	case WM_PAINTICON: return  "WM_PAINTICON";            
-	case WM_ICONERASEBKGND: return  "WM_ICONERASEBKGND";       
-	case WM_NEXTDLGCTL: return  "WM_NEXTDLGCTL";           
-	case WM_SPOOLERSTATUS: return  "WM_SPOOLERSTATUS";        
-	case WM_DRAWITEM: return  "WM_DRAWITEM";             
-	case WM_MEASUREITEM: return  "WM_MEASUREITEM";          
-	case WM_DELETEITEM: return  "WM_DELETEITEM";           
-	case WM_VKEYTOITEM: return  "WM_VKEYTOITEM";           
-	case WM_CHARTOITEM: return  "WM_CHARTOITEM";           
-	case WM_SETFONT: return  "WM_SETFONT";              
-	case WM_GETFONT: return  "WM_GETFONT";              
-	case WM_SETHOTKEY: return  "WM_SETHOTKEY";            
-	case WM_GETHOTKEY: return  "WM_GETHOTKEY";            
-	case WM_QUERYDRAGICON: return  "WM_QUERYDRAGICON";        
-	case WM_COMPAREITEM: return  "WM_COMPAREITEM";          
-	case WM_COMPACTING: return  "WM_COMPACTING";           
+	case WM_DEVMODECHANGE: return  "WM_DEVMODECHANGE";
+	case WM_ACTIVATEAPP: return  "WM_ACTIVATEAPP";
+	case WM_FONTCHANGE: return  "WM_FONTCHANGE";
+	case WM_TIMECHANGE: return  "WM_TIMECHANGE";
+	case WM_CANCELMODE: return  "WM_CANCELMODE";
+	case WM_SETCURSOR: return  "WM_SETCURSOR";
+	case WM_MOUSEACTIVATE: return  "WM_MOUSEACTIVATE";
+	case WM_CHILDACTIVATE: return  "WM_CHILDACTIVATE";
+	case WM_QUEUESYNC: return  "WM_QUEUESYNC";
+	case WM_GETMINMAXINFO: return  "WM_GETMINMAXINFO";
+	case WM_PAINTICON: return  "WM_PAINTICON";
+	case WM_ICONERASEBKGND: return  "WM_ICONERASEBKGND";
+	case WM_NEXTDLGCTL: return  "WM_NEXTDLGCTL";
+	case WM_SPOOLERSTATUS: return  "WM_SPOOLERSTATUS";
+	case WM_DRAWITEM: return  "WM_DRAWITEM";
+	case WM_MEASUREITEM: return  "WM_MEASUREITEM";
+	case WM_DELETEITEM: return  "WM_DELETEITEM";
+	case WM_VKEYTOITEM: return  "WM_VKEYTOITEM";
+	case WM_CHARTOITEM: return  "WM_CHARTOITEM";
+	case WM_SETFONT: return  "WM_SETFONT";
+	case WM_GETFONT: return  "WM_GETFONT";
+	case WM_SETHOTKEY: return  "WM_SETHOTKEY";
+	case WM_GETHOTKEY: return  "WM_GETHOTKEY";
+	case WM_QUERYDRAGICON: return  "WM_QUERYDRAGICON";
+	case WM_COMPAREITEM: return  "WM_COMPAREITEM";
+	case WM_COMPACTING: return  "WM_COMPACTING";
 	case WM_COMMNOTIFY: return  "WM_COMMNOTIFY";
-	case WM_WINDOWPOSCHANGING: return  "WM_WINDOWPOSCHANGING";    
-	case WM_WINDOWPOSCHANGED: return  "WM_WINDOWPOSCHANGED";     
-	case WM_POWER: return  "WM_POWER";                
-	case WM_COPYDATA: return  "WM_COPYDATA";             
-	case WM_CANCELJOURNAL: return  "WM_CANCELJOURNAL";        
-	case WM_NOTIFY: return  "WM_NOTIFY";               
+	case WM_WINDOWPOSCHANGING: return  "WM_WINDOWPOSCHANGING";
+	case WM_WINDOWPOSCHANGED: return  "WM_WINDOWPOSCHANGED";
+	case WM_POWER: return  "WM_POWER";
+	case WM_COPYDATA: return  "WM_COPYDATA";
+	case WM_CANCELJOURNAL: return  "WM_CANCELJOURNAL";
+	case WM_NOTIFY: return  "WM_NOTIFY";
 	case WM_INPUTLANGCHANGEREQUEST: return  "WM_INPUTLANGCHANGEREQUES";
-	case WM_INPUTLANGCHANGE: return  "WM_INPUTLANGCHANGE";      
-	case WM_TCARD: return  "WM_TCARD";                
-	case WM_HELP: return  "WM_HELP";                 
-	case WM_USERCHANGED: return  "WM_USERCHANGED";          
-	case WM_NOTIFYFORMAT: return  "WM_NOTIFYFORMAT";         
-	case WM_CONTEXTMENU: return  "WM_CONTEXTMENU";          
-	case WM_STYLECHANGING: return  "WM_STYLECHANGING";        
-	case WM_STYLECHANGED: return  "WM_STYLECHANGED";         
-	case WM_DISPLAYCHANGE: return  "WM_DISPLAYCHANGE";        
-	case WM_GETICON: return  "WM_GETICON";              
-	case WM_SETICON: return  "WM_SETICON";              
-	case WM_NCCREATE: return  "WM_NCCREATE";             
-	case WM_NCDESTROY: return  "WM_NCDESTROY";            
-	case WM_NCCALCSIZE: return  "WM_NCCALCSIZE";           
-	case WM_NCHITTEST: return  "WM_NCHITTEST";            
-	case WM_NCPAINT: return  "WM_NCPAINT";              
-	case WM_NCACTIVATE: return  "WM_NCACTIVATE";           
-	case WM_GETDLGCODE: return  "WM_GETDLGCODE";           
-	case WM_SYNCPAINT: return  "WM_SYNCPAINT";            
-	case WM_NCMOUSEMOVE: return  "WM_NCMOUSEMOVE";          
-	case WM_NCLBUTTONDOWN: return  "WM_NCLBUTTONDOWN";        
-	case WM_NCLBUTTONUP: return  "WM_NCLBUTTONUP";          
-	case WM_NCLBUTTONDBLCLK: return  "WM_NCLBUTTONDBLCLK";      
-	case WM_NCRBUTTONDOWN: return  "WM_NCRBUTTONDOWN";        
-	case WM_NCRBUTTONUP: return  "WM_NCRBUTTONUP";          
-	case WM_NCRBUTTONDBLCLK: return  "WM_NCRBUTTONDBLCLK";      
-	case WM_NCMBUTTONDOWN: return  "WM_NCMBUTTONDOWN";        
-	case WM_NCMBUTTONUP: return  "WM_NCMBUTTONUP";          
-	case WM_NCMBUTTONDBLCLK: return  "WM_NCMBUTTONDBLCLK";      
-	case WM_KEYDOWN: return  "WM_KEYDOWN";              
-	case WM_KEYUP: return  "WM_KEYUP";                
-	case WM_CHAR: return  "WM_CHAR";                 
-	case WM_DEADCHAR: return  "WM_DEADCHAR";             
-	case WM_SYSKEYDOWN: return  "WM_SYSKEYDOWN";           
-	case WM_SYSKEYUP: return  "WM_SYSKEYUP";             
-	case WM_SYSCHAR: return  "WM_SYSCHAR";              
-	case WM_SYSDEADCHAR: return  "WM_SYSDEADCHAR";          
-	case WM_KEYLAST: return  "WM_KEYLAST";              
-	case WM_IME_STARTCOMPOSITION: return  "WM_IME_STARTCOMPOSITION"; 
-	case WM_IME_ENDCOMPOSITION: return  "WM_IME_ENDCOMPOSITION";   
-	case WM_IME_COMPOSITION: return  "WM_IME_COMPOSITION";      
-	case WM_INITDIALOG: return  "WM_INITDIALOG";           
-	case WM_COMMAND: return  "WM_COMMAND";              
-	case WM_SYSCOMMAND: return  "WM_SYSCOMMAND";           
-	case WM_TIMER: return  "WM_TIMER";                
-	case WM_HSCROLL: return  "WM_HSCROLL";              
-	case WM_VSCROLL: return  "WM_VSCROLL";              
-	case WM_INITMENU: return  "WM_INITMENU";             
-	case WM_INITMENUPOPUP: return  "WM_INITMENUPOPUP";        
-	case WM_MENUSELECT: return  "WM_MENUSELECT";           
-	case WM_MENUCHAR: return  "WM_MENUCHAR";             
-	case WM_ENTERIDLE: return  "WM_ENTERIDLE";            
-	case WM_CTLCOLORMSGBOX: return  "WM_CTLCOLORMSGBOX";       
-	case WM_CTLCOLOREDIT: return  "WM_CTLCOLOREDIT";         
-	case WM_CTLCOLORLISTBOX: return  "WM_CTLCOLORLISTBOX";      
-	case WM_CTLCOLORBTN: return  "WM_CTLCOLORBTN";          
-	case WM_CTLCOLORDLG: return  "WM_CTLCOLORDLG";          
-	case WM_CTLCOLORSCROLLBAR: return  "WM_CTLCOLORSCROLLBAR";    
-	case WM_CTLCOLORSTATIC: return  "WM_CTLCOLORSTATIC";       
-	case WM_MOUSEMOVE: return  "WM_MOUSEMOVE";            
-	case WM_LBUTTONDOWN: return  "WM_LBUTTONDOWN";          
-	case WM_LBUTTONUP: return  "WM_LBUTTONUP";            
-	case WM_LBUTTONDBLCLK: return  "WM_LBUTTONDBLCLK";        
-	case WM_RBUTTONDOWN: return  "WM_RBUTTONDOWN";          
-	case WM_RBUTTONUP: return  "WM_RBUTTONUP";            
-	case WM_RBUTTONDBLCLK: return  "WM_RBUTTONDBLCLK";        
-	case WM_MBUTTONDOWN: return  "WM_MBUTTONDOWN";          
-	case WM_MBUTTONUP: return  "WM_MBUTTONUP";            
-	case WM_MBUTTONDBLCLK: return  "WM_MBUTTONDBLCLK";        
-//	case WM_MOUSEWHEEL: return  "WM_MOUSEWHEEL";           
-	case WM_PARENTNOTIFY: return  "WM_PARENTNOTIFY";         
-	case WM_ENTERMENULOOP: return  "WM_ENTERMENULOOP";        
-	case WM_EXITMENULOOP: return  "WM_EXITMENULOOP";         
-	case WM_NEXTMENU: return  "WM_NEXTMENU";             
-	case WM_SIZING: return  "WM_SIZING";               
-	case WM_CAPTURECHANGED: return  "WM_CAPTURECHANGED";       
-	case WM_MOVING: return  "WM_MOVING";               
+	case WM_INPUTLANGCHANGE: return  "WM_INPUTLANGCHANGE";
+	case WM_TCARD: return  "WM_TCARD";
+	case WM_HELP: return  "WM_HELP";
+	case WM_USERCHANGED: return  "WM_USERCHANGED";
+	case WM_NOTIFYFORMAT: return  "WM_NOTIFYFORMAT";
+	case WM_CONTEXTMENU: return  "WM_CONTEXTMENU";
+	case WM_STYLECHANGING: return  "WM_STYLECHANGING";
+	case WM_STYLECHANGED: return  "WM_STYLECHANGED";
+	case WM_DISPLAYCHANGE: return  "WM_DISPLAYCHANGE";
+	case WM_GETICON: return  "WM_GETICON";
+	case WM_SETICON: return  "WM_SETICON";
+	case WM_NCCREATE: return  "WM_NCCREATE";
+	case WM_NCDESTROY: return  "WM_NCDESTROY";
+	case WM_NCCALCSIZE: return  "WM_NCCALCSIZE";
+	case WM_NCHITTEST: return  "WM_NCHITTEST";
+	case WM_NCPAINT: return  "WM_NCPAINT";
+	case WM_NCACTIVATE: return  "WM_NCACTIVATE";
+	case WM_GETDLGCODE: return  "WM_GETDLGCODE";
+	case WM_SYNCPAINT: return  "WM_SYNCPAINT";
+	case WM_NCMOUSEMOVE: return  "WM_NCMOUSEMOVE";
+	case WM_NCLBUTTONDOWN: return  "WM_NCLBUTTONDOWN";
+	case WM_NCLBUTTONUP: return  "WM_NCLBUTTONUP";
+	case WM_NCLBUTTONDBLCLK: return  "WM_NCLBUTTONDBLCLK";
+	case WM_NCRBUTTONDOWN: return  "WM_NCRBUTTONDOWN";
+	case WM_NCRBUTTONUP: return  "WM_NCRBUTTONUP";
+	case WM_NCRBUTTONDBLCLK: return  "WM_NCRBUTTONDBLCLK";
+	case WM_NCMBUTTONDOWN: return  "WM_NCMBUTTONDOWN";
+	case WM_NCMBUTTONUP: return  "WM_NCMBUTTONUP";
+	case WM_NCMBUTTONDBLCLK: return  "WM_NCMBUTTONDBLCLK";
+	case WM_KEYDOWN: return  "WM_KEYDOWN";
+	case WM_KEYUP: return  "WM_KEYUP";
+	case WM_CHAR: return  "WM_CHAR";
+	case WM_DEADCHAR: return  "WM_DEADCHAR";
+	case WM_SYSKEYDOWN: return  "WM_SYSKEYDOWN";
+	case WM_SYSKEYUP: return  "WM_SYSKEYUP";
+	case WM_SYSCHAR: return  "WM_SYSCHAR";
+	case WM_SYSDEADCHAR: return  "WM_SYSDEADCHAR";
+	case WM_KEYLAST: return  "WM_KEYLAST";
+	case WM_IME_STARTCOMPOSITION: return  "WM_IME_STARTCOMPOSITION";
+	case WM_IME_ENDCOMPOSITION: return  "WM_IME_ENDCOMPOSITION";
+	case WM_IME_COMPOSITION: return  "WM_IME_COMPOSITION";
+	case WM_INITDIALOG: return  "WM_INITDIALOG";
+	case WM_COMMAND: return  "WM_COMMAND";
+	case WM_SYSCOMMAND: return  "WM_SYSCOMMAND";
+	case WM_TIMER: return  "WM_TIMER";
+	case WM_HSCROLL: return  "WM_HSCROLL";
+	case WM_VSCROLL: return  "WM_VSCROLL";
+	case WM_INITMENU: return  "WM_INITMENU";
+	case WM_INITMENUPOPUP: return  "WM_INITMENUPOPUP";
+	case WM_MENUSELECT: return  "WM_MENUSELECT";
+	case WM_MENUCHAR: return  "WM_MENUCHAR";
+	case WM_ENTERIDLE: return  "WM_ENTERIDLE";
+	case WM_CTLCOLORMSGBOX: return  "WM_CTLCOLORMSGBOX";
+	case WM_CTLCOLOREDIT: return  "WM_CTLCOLOREDIT";
+	case WM_CTLCOLORLISTBOX: return  "WM_CTLCOLORLISTBOX";
+	case WM_CTLCOLORBTN: return  "WM_CTLCOLORBTN";
+	case WM_CTLCOLORDLG: return  "WM_CTLCOLORDLG";
+	case WM_CTLCOLORSCROLLBAR: return  "WM_CTLCOLORSCROLLBAR";
+	case WM_CTLCOLORSTATIC: return  "WM_CTLCOLORSTATIC";
+	case WM_MOUSEMOVE: return  "WM_MOUSEMOVE";
+	case WM_LBUTTONDOWN: return  "WM_LBUTTONDOWN";
+	case WM_LBUTTONUP: return  "WM_LBUTTONUP";
+	case WM_LBUTTONDBLCLK: return  "WM_LBUTTONDBLCLK";
+	case WM_RBUTTONDOWN: return  "WM_RBUTTONDOWN";
+	case WM_RBUTTONUP: return  "WM_RBUTTONUP";
+	case WM_RBUTTONDBLCLK: return  "WM_RBUTTONDBLCLK";
+	case WM_MBUTTONDOWN: return  "WM_MBUTTONDOWN";
+	case WM_MBUTTONUP: return  "WM_MBUTTONUP";
+	case WM_MBUTTONDBLCLK: return  "WM_MBUTTONDBLCLK";
+//	case WM_MOUSEWHEEL: return  "WM_MOUSEWHEEL";
+	case WM_PARENTNOTIFY: return  "WM_PARENTNOTIFY";
+	case WM_ENTERMENULOOP: return  "WM_ENTERMENULOOP";
+	case WM_EXITMENULOOP: return  "WM_EXITMENULOOP";
+	case WM_NEXTMENU: return  "WM_NEXTMENU";
+	case WM_SIZING: return  "WM_SIZING";
+	case WM_CAPTURECHANGED: return  "WM_CAPTURECHANGED";
+	case WM_MOVING: return  "WM_MOVING";
 	case WM_POWERBROADCAST: return  "WM_POWERBROADCAST";
-	case WM_DEVICECHANGE: return  "WM_DEVICECHANGE";         
-	case WM_MDICREATE: return  "WM_MDICREATE";            
-	case WM_MDIDESTROY: return  "WM_MDIDESTROY";           
-	case WM_MDIACTIVATE: return  "WM_MDIACTIVATE";          
-	case WM_MDIRESTORE: return  "WM_MDIRESTORE";           
-	case WM_MDINEXT: return  "WM_MDINEXT";              
-	case WM_MDIMAXIMIZE: return  "WM_MDIMAXIMIZE";          
-	case WM_MDITILE: return  "WM_MDITILE";              
-	case WM_MDICASCADE: return  "WM_MDICASCADE";           
-	case WM_MDIICONARRANGE: return  "WM_MDIICONARRANGE";       
-	case WM_MDIGETACTIVE: return  "WM_MDIGETACTIVE";         
-	case WM_MDISETMENU: return  "WM_MDISETMENU";           
-	case WM_ENTERSIZEMOVE: return  "WM_ENTERSIZEMOVE";        
-	case WM_EXITSIZEMOVE: return  "WM_EXITSIZEMOVE";         
-	case WM_DROPFILES: return  "WM_DROPFILES";            
-	case WM_MDIREFRESHMENU: return  "WM_MDIREFRESHMENU";       
-	case WM_IME_SETCONTEXT: return  "WM_IME_SETCONTEXT";       
-	case WM_IME_NOTIFY: return  "WM_IME_NOTIFY";           
-	case WM_IME_CONTROL: return  "WM_IME_CONTROL";          
-	case WM_IME_COMPOSITIONFULL: return  "WM_IME_COMPOSITIONFULL";  
-	case WM_IME_SELECT: return  "WM_IME_SELECT";           
-	case WM_IME_CHAR: return  "WM_IME_CHAR";             
-	case WM_IME_KEYDOWN: return  "WM_IME_KEYDOWN";          
-	case WM_IME_KEYUP: return  "WM_IME_KEYUP";            
-//	case WM_MOUSEHOVER: return  "WM_MOUSEHOVER";           
-//	case WM_MOUSELEAVE: return  "WM_MOUSELEAVE";           
-	case WM_CUT: return  "WM_CUT";                  
-	case WM_COPY: return  "WM_COPY";                 
-	case WM_PASTE: return  "WM_PASTE";                
-	case WM_CLEAR: return  "WM_CLEAR";                
-	case WM_UNDO: return  "WM_UNDO";                 
-	case WM_RENDERFORMAT: return  "WM_RENDERFORMAT";         
-	case WM_RENDERALLFORMATS: return  "WM_RENDERALLFORMATS";     
-	case WM_DESTROYCLIPBOARD: return  "WM_DESTROYCLIPBOARD";     
-	case WM_DRAWCLIPBOARD: return  "WM_DRAWCLIPBOARD";        
-	case WM_PAINTCLIPBOARD: return  "WM_PAINTCLIPBOARD";       
-	case WM_VSCROLLCLIPBOARD: return  "WM_VSCROLLCLIPBOARD";     
-	case WM_SIZECLIPBOARD: return  "WM_SIZECLIPBOARD";        
-	case WM_ASKCBFORMATNAME: return  "WM_ASKCBFORMATNAME";      
-	case WM_CHANGECBCHAIN: return  "WM_CHANGECBCHAIN";        
-	case WM_HSCROLLCLIPBOARD: return  "WM_HSCROLLCLIPBOARD";     
-	case WM_QUERYNEWPALETTE: return  "WM_QUERYNEWPALETTE";      
-	case WM_PALETTEISCHANGING: return  "WM_PALETTEISCHANGING";    
-	case WM_PALETTECHANGED: return  "WM_PALETTECHANGED";       
-	case WM_HOTKEY: return  "WM_HOTKEY";               
-	case WM_PRINT: return  "WM_PRINT";                
-	case WM_PRINTCLIENT: return  "WM_PRINTCLIENT";          
-	case WM_HANDHELDFIRST: return  "WM_HANDHELDFIRST";        
-	case WM_HANDHELDLAST: return  "WM_HANDHELDLAST";         
-	case WM_AFXFIRST: return  "WM_AFXFIRST";             
-	case WM_AFXLAST: return  "WM_AFXLAST";              
-	case WM_PENWINFIRST: return  "WM_PENWINFIRST";          
+	case WM_DEVICECHANGE: return  "WM_DEVICECHANGE";
+	case WM_MDICREATE: return  "WM_MDICREATE";
+	case WM_MDIDESTROY: return  "WM_MDIDESTROY";
+	case WM_MDIACTIVATE: return  "WM_MDIACTIVATE";
+	case WM_MDIRESTORE: return  "WM_MDIRESTORE";
+	case WM_MDINEXT: return  "WM_MDINEXT";
+	case WM_MDIMAXIMIZE: return  "WM_MDIMAXIMIZE";
+	case WM_MDITILE: return  "WM_MDITILE";
+	case WM_MDICASCADE: return  "WM_MDICASCADE";
+	case WM_MDIICONARRANGE: return  "WM_MDIICONARRANGE";
+	case WM_MDIGETACTIVE: return  "WM_MDIGETACTIVE";
+	case WM_MDISETMENU: return  "WM_MDISETMENU";
+	case WM_ENTERSIZEMOVE: return  "WM_ENTERSIZEMOVE";
+	case WM_EXITSIZEMOVE: return  "WM_EXITSIZEMOVE";
+	case WM_DROPFILES: return  "WM_DROPFILES";
+	case WM_MDIREFRESHMENU: return  "WM_MDIREFRESHMENU";
+	case WM_IME_SETCONTEXT: return  "WM_IME_SETCONTEXT";
+	case WM_IME_NOTIFY: return  "WM_IME_NOTIFY";
+	case WM_IME_CONTROL: return  "WM_IME_CONTROL";
+	case WM_IME_COMPOSITIONFULL: return  "WM_IME_COMPOSITIONFULL";
+	case WM_IME_SELECT: return  "WM_IME_SELECT";
+	case WM_IME_CHAR: return  "WM_IME_CHAR";
+	case WM_IME_KEYDOWN: return  "WM_IME_KEYDOWN";
+	case WM_IME_KEYUP: return  "WM_IME_KEYUP";
+//	case WM_MOUSEHOVER: return  "WM_MOUSEHOVER";
+//	case WM_MOUSELEAVE: return  "WM_MOUSELEAVE";
+	case WM_CUT: return  "WM_CUT";
+	case WM_COPY: return  "WM_COPY";
+	case WM_PASTE: return  "WM_PASTE";
+	case WM_CLEAR: return  "WM_CLEAR";
+	case WM_UNDO: return  "WM_UNDO";
+	case WM_RENDERFORMAT: return  "WM_RENDERFORMAT";
+	case WM_RENDERALLFORMATS: return  "WM_RENDERALLFORMATS";
+	case WM_DESTROYCLIPBOARD: return  "WM_DESTROYCLIPBOARD";
+	case WM_DRAWCLIPBOARD: return  "WM_DRAWCLIPBOARD";
+	case WM_PAINTCLIPBOARD: return  "WM_PAINTCLIPBOARD";
+	case WM_VSCROLLCLIPBOARD: return  "WM_VSCROLLCLIPBOARD";
+	case WM_SIZECLIPBOARD: return  "WM_SIZECLIPBOARD";
+	case WM_ASKCBFORMATNAME: return  "WM_ASKCBFORMATNAME";
+	case WM_CHANGECBCHAIN: return  "WM_CHANGECBCHAIN";
+	case WM_HSCROLLCLIPBOARD: return  "WM_HSCROLLCLIPBOARD";
+	case WM_QUERYNEWPALETTE: return  "WM_QUERYNEWPALETTE";
+	case WM_PALETTEISCHANGING: return  "WM_PALETTEISCHANGING";
+	case WM_PALETTECHANGED: return  "WM_PALETTECHANGED";
+	case WM_HOTKEY: return  "WM_HOTKEY";
+	case WM_PRINT: return  "WM_PRINT";
+	case WM_PRINTCLIENT: return  "WM_PRINTCLIENT";
+	case WM_HANDHELDFIRST: return  "WM_HANDHELDFIRST";
+	case WM_HANDHELDLAST: return  "WM_HANDHELDLAST";
+	case WM_AFXFIRST: return  "WM_AFXFIRST";
+	case WM_AFXLAST: return  "WM_AFXLAST";
+	case WM_PENWINFIRST: return  "WM_PENWINFIRST";
 	case WM_PENWINLAST: return  "WM_PENWINLAST";
 	default: return "WM_UNKNOWN";
 	};
@@ -296,13 +290,13 @@ static const char *messageToString(unsigned int message)
 // WndProc ====================================================================
 /** Window Procedure */
 //=============================================================================
-LRESULT CALLBACK WndProc( HWND hWnd, UINT message, 
+LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 													WPARAM wParam, LPARAM lParam )
 {
 
 	try
 	{
-		// First let the IME manager do it's stuff. 
+		// First let the IME manager do it's stuff.
 		if ( TheIMEManager )
 		{
 			if ( TheIMEManager->serviceIMEMessage( hWnd, message, wParam, lParam ) )
@@ -315,101 +309,122 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 #ifdef	DEBUG_WINDOWS_MESSAGES
 		static msgCount=0;
 		char testString[256];
-		sprintf(testString,"\n%d: %s (%X,%X)", msgCount++,messageToString(message), wParam, lParam); 
+		sprintf(testString,"\n%d: %s (%X,%X)", msgCount++,messageToString(message), wParam, lParam);
 		OutputDebugString(testString);
 #endif
 
 		// handle all window messages
-		switch( message ) 
+		switch( message )
 		{
 			//-------------------------------------------------------------------------
 			case WM_NCHITTEST:
-			// Prevent the user from selecting the menu in fullscreen mode
-            if( !ApplicationIsWindowed )
-                return HTCLIENT;
-            break;
+				// Prevent the user from selecting the menu in fullscreen mode
+				if( !TheGlobalData->m_windowed )
+					return HTCLIENT;
+				break;
 
 			//-------------------------------------------------------------------------
 			case WM_POWERBROADCAST:
-            switch( wParam )
-            {
-                #ifndef PBT_APMQUERYSUSPEND
-                    #define PBT_APMQUERYSUSPEND 0x0000
-                #endif
-                case PBT_APMQUERYSUSPEND:
-                    // At this point, the app should save any data for open
-                    // network connections, files, etc., and prepare to go into
-                    // a suspended mode.
-                    return TRUE;
-
-                #ifndef PBT_APMRESUMESUSPEND
-                    #define PBT_APMRESUMESUSPEND 0x0007
-                #endif
-                case PBT_APMRESUMESUSPEND:
-                    // At this point, the app should recover any data, network
-                    // connections, files, etc., and resume running from when
-                    // the app was suspended.
-                    return TRUE;
-            }
-            break;
+				switch( wParam )
+				{
+					#ifndef PBT_APMQUERYSUSPEND
+						#define PBT_APMQUERYSUSPEND 0x0000
+					#endif
+					case PBT_APMQUERYSUSPEND:
+						// At this point, the app should save any data for open
+						// network connections, files, etc., and prepare to go into
+						// a suspended mode.
+						return TRUE;
+
+					#ifndef PBT_APMRESUMESUSPEND
+						#define PBT_APMRESUMESUSPEND 0x0007
+					#endif
+					case PBT_APMRESUMESUSPEND:
+						// At this point, the app should recover any data, network
+						// connections, files, etc., and resume running from when
+						// the app was suspended.
+						return TRUE;
+				}
+				break;
 			//-------------------------------------------------------------------------
 			case WM_SYSCOMMAND:
-            // Prevent moving/sizing and power loss in fullscreen mode
-            switch( wParam )
-            {
-                case SC_KEYMENU:
-                    // TheSuperHackers @bugfix Mauller 10/05/2025 Always handle this command to prevent halting the game when left Alt is pressed.
-                    return 1;
-                case SC_MOVE:
-                case SC_SIZE:
-                case SC_MAXIMIZE:
-                case SC_MONITORPOWER:
-                    if( FALSE == ApplicationIsWindowed )
-                        return 1;
-                    break;
-            }
-            break;
+				// Prevent moving/sizing and power loss in fullscreen mode
+				switch( wParam )
+				{
+					case SC_KEYMENU:
+						// TheSuperHackers @bugfix Mauller 10/05/2025 Always handle this command to prevent halting the game when left Alt is pressed.
+						return 1;
+					case SC_MOVE:
+					case SC_SIZE:
+					case SC_MAXIMIZE:
+					case SC_MONITORPOWER:
+						if( !TheGlobalData->m_windowed )
+							return 1;
+						break;
+				}
+				break;
 
 			// ------------------------------------------------------------------------
 			case WM_CLOSE:
-			TheGameEngine->checkAbnormalQuitting();
-			TheGameEngine->reset();
-			TheGameEngine->setQuitting(TRUE);
-			_exit(EXIT_SUCCESS);
-			return 0;
+				TheGameEngine->checkAbnormalQuitting();
+				TheGameEngine->reset();
+				TheGameEngine->setQuitting(TRUE);
+				_exit(EXIT_SUCCESS);
+				return 0;
+
+			//-------------------------------------------------------------------------
+			case WM_MOVE:
+			{
+				if (TheMouse)
+					TheMouse->refreshCursorCapture();
+
+				break;
+			}
+
+			//-------------------------------------------------------------------------
+			case WM_SIZE:
+			{
+				// When W3D initializes, it resizes the window.  So stop repainting.
+				if (!gInitializing)
+					gDoPaint = false;
+
+				if (TheMouse)
+					TheMouse->refreshCursorCapture();
+
+				break;
+			}
 
 			// ------------------------------------------------------------------------
 			case WM_SETFOCUS:
 			{
-
 				//
 				// reset the state of our keyboard cause we haven't been paying
 				// attention to the keys while focus was away
 				//
-				if( TheKeyboard )
+				if (TheKeyboard)
 					TheKeyboard->resetKeys();
 
-				if (TheWin32Mouse)
-					TheWin32Mouse->lostFocus(FALSE);
+				if (TheMouse)
+					TheMouse->regainFocus();
 
 				break;
-
-			}  // end set focus
-
-			//-------------------------------------------------------------------------
-			case WM_SIZE:
-				// When W3D initializes, it resizes the window.  So stop repainting.
-				if (!gInitializing) 
-					gDoPaint = false;
-				break;
+			}
 
 			//-------------------------------------------------------------------------
 			case WM_KILLFOCUS:
 			{
-				if (TheKeyboard )
+				if (TheKeyboard)
 					TheKeyboard->resetKeys();
-				if (TheWin32Mouse)
-					TheWin32Mouse->lostFocus(TRUE);
+
+				if (TheMouse)
+				{
+					TheMouse->loseFocus();
+
+					if (TheMouse->isCursorInside())
+					{
+						TheMouse->onCursorMovedOutside();
+					}
+				}
 
 				break;
 			}
@@ -427,47 +442,41 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					// paths that take care of that.
 
 					isWinMainActive = (BOOL) wParam;
-					
+
 					if (TheGameEngine)
 						TheGameEngine->setIsActive(isWinMainActive);
 
 					if (isWinMainActive)
-					{	//restore mouse cursor to our custom version.
+					{
+						//restore mouse cursor to our custom version.
 						if (TheWin32Mouse)
 							TheWin32Mouse->setCursor(TheWin32Mouse->getMouseCursor());
 					}
 				}
 				return 0;
 			}
+
 			//-------------------------------------------------------------------------
 			case WM_ACTIVATE:
 			{
 				Int active = LOWORD( wParam );
 
-				//
-				// when window is becoming deactivated we must release mouse cursor
-				// locks on our region, otherwise set the mouse limit region again
-				// which will clip the cursor to our window
-				//
 				if( active == WA_INACTIVE )
 				{
-
-					ClipCursor( NULL );
 					if (TheAudio)
 						TheAudio->loseFocus();
-				}  // end if
+				}
 				else
 				{
-					if( TheMouse )
-						TheMouse->setMouseLimits();
-
 					if (TheAudio)
 						TheAudio->regainFocus();
 
-				}  // end else
+					// Cursor can only be captured after one of the activation events.
+					if (TheMouse)
+						TheMouse->refreshCursorCapture();
+				}
 				break;
-
-			}  // end case activate
+			}
 
 			//-------------------------------------------------------------------------
 			case WM_KEYDOWN:
@@ -476,22 +485,14 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 				switch( key )
 				{
-
-					//---------------------------------------------------------------------
 					case VK_ESCAPE:
 					{
-
 						PostQuitMessage( 0 );
 						break;
-
-					}  // end VK_ESCAPE
-
-
-				}  // end switch
-
+					}
+				}
 				return 0;
-
-			}  // end WM_KEYDOWN
+			}
 
 			//-------------------------------------------------------------------------
 			case WM_LBUTTONDOWN:
@@ -506,17 +507,18 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			case WM_RBUTTONUP:
 			case WM_RBUTTONDBLCLK:
 			{
-
 				if( TheWin32Mouse )
 					TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
 
 				return 0;
-
-			}  // end WM_LBUTTONDOWN
+			}
 
 			//-------------------------------------------------------------------------
 			case 0x020A: // WM_MOUSEWHEEL
 			{
+				if( TheWin32Mouse == NULL )
+					return 0;
+
 				long x = (long) LOWORD(lParam);
 				long y = (long) HIWORD(lParam);
 				RECT rect;
@@ -526,33 +528,43 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				if( x < rect.left || x > rect.right || y < rect.top || y > rect.bottom )
 					return 0;
 
-				if( TheWin32Mouse )
-					TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
-
+				TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
 				return 0;
-
-			}  // end WM_MOUSEWHEEL
-
+			}
 
 			//-------------------------------------------------------------------------
 			case WM_MOUSEMOVE:
 			{
+				if( TheWin32Mouse == NULL )
+					return 0;
+
+				// ignore when window is not active
+				if( !isWinMainActive )
+					return 0;
+
 				Int x = (Int)LOWORD( lParam );
 				Int y = (Int)HIWORD( lParam );
 				RECT rect;
-//				Int keys = wParam;
 
 				// ignore when outside of client area
 				GetClientRect( ApplicationHWnd, &rect );
 				if( x < rect.left || x > rect.right || y < rect.top || y > rect.bottom )
+				{
+					if ( TheMouse->isCursorInside() )
+					{
+						TheMouse->onCursorMovedOutside();
+					}
 					return 0;
+				}
 
-				if( TheWin32Mouse )
-					TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
+				if( !TheMouse->isCursorInside() )
+				{
+					TheMouse->onCursorMovedInside();
+				}
 
+				TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
 				return 0;
-
-			}  // end WM_MOUSEMOVE
+			}
 
 			//-------------------------------------------------------------------------
 			case WM_SETCURSOR:
@@ -567,7 +579,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				if (gDoPaint) {
 					PAINTSTRUCT paint;
 					HDC dc = ::BeginPaint(hWnd, &paint);
-#if 0  
+#if 0
 					::SetTextColor(dc, RGB(255,255,255));
 					::SetBkColor(dc, RGB(0,0,0));
 					::TextOut(dc, 30, 30, "Loading Command & Conquer Generals...", 37);
@@ -576,7 +588,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						Int savContext = ::SaveDC(dc);
 						HDC tmpDC = ::CreateCompatibleDC(dc);
 						HBITMAP savBitmap = (HBITMAP)::SelectObject(tmpDC, gLoadScreenBitmap);
-						::BitBlt(dc, 0, 0, DEFAULT_XRESOLUTION, DEFAULT_YRESOLUTION, tmpDC, 0, 0, SRCCOPY);
+						::BitBlt(dc, 0, 0, DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_HEIGHT, tmpDC, 0, 0, SRCCOPY);
 						::SelectObject(tmpDC, savBitmap);
 						::DeleteDC(tmpDC);
 						::RestoreDC(dc, savContext);
@@ -589,18 +601,18 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 			case WM_ERASEBKGND:
 			{
-				if (!gDoPaint) 
+				if (!gDoPaint)
 					return TRUE;	//we don't need to erase the background because we always draw entire window.
 				break;
 			}
 
-// Well, it was a nice idea, but we don't get a message for an ejection. 
+// Well, it was a nice idea, but we don't get a message for an ejection.
 // (Really unforunate, actually.) I'm leaving this in in-case some one wants
 // to trap a different device change (for instance, removal of a mouse) - jkmcd
 #if 0
-			case WM_DEVICECHANGE: 
+			case WM_DEVICECHANGE:
 			{
-				if (((UINT) wParam) == DBT_DEVICEREMOVEPENDING) 
+				if (((UINT) wParam) == DBT_DEVICEREMOVEPENDING)
 				{
 					DEV_BROADCAST_HDR *hdr = (DEV_BROADCAST_HDR*) lParam;
 					if (!hdr) {
@@ -616,7 +628,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					// its done. I hate Windows. - jkmcd
 					DEV_BROADCAST_VOLUME *vol = (DEV_BROADCAST_VOLUME*) (hdr);
 
-					// @todo - Yikes. This could cause us all kinds of pain. I don't really want 
+					// @todo - Yikes. This could cause us all kinds of pain. I don't really want
 					// to even think about the stink this could cause us.
 					TheFileSystem->unloadMusicFilesFromCD(vol->dbcv_unitmask);
 					return TRUE;
@@ -624,19 +636,19 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				break;
 			}
 #endif
-		}  // end switch
+		}
 
 	}
 	catch (...)
 	{
-		RELEASE_CRASH(("Uncaught exception in Main::WndProc... probably should not happen\n"));
+		RELEASE_CRASH(("Uncaught exception in Main::WndProc... probably should not happen"));
 		// no rethrow
 	}
 
 //In full-screen mode, only pass these messages onto the default windows handler.
 //Appears to fix issues with dual monitor systems but doesn't seem safe?
 ///@todo: Look into proper support for dual monitor systems.
-/*	if (!ApplicationIsWindowed)
+/*	if (!TheGlobalData->m_windowed)
 	switch (message)
 	{
 		case WM_PAINT:
@@ -650,7 +662,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 	return DefWindowProc( hWnd, message, wParam, lParam );
 
-}  // end WndProc
+}
 
 // initializeAppWindows =======================================================
 /** Register windows class and create application windows. */
@@ -658,21 +670,21 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 static Bool initializeAppWindows( HINSTANCE hInstance, Int nCmdShow, Bool runWindowed )
 {
 	DWORD windowStyle;
-	Int startWidth = DEFAULT_XRESOLUTION,
-			startHeight = DEFAULT_YRESOLUTION;
+	Int startWidth = DEFAULT_DISPLAY_WIDTH,
+			startHeight = DEFAULT_DISPLAY_HEIGHT;
 
 	// register the window class
 
   WNDCLASS wndClass = { CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS, WndProc, 0, 0, hInstance,
                        LoadIcon (hInstance, MAKEINTRESOURCE(IDI_ApplicationIcon)),
-                       NULL/*LoadCursor(NULL, IDC_ARROW)*/, 
+                       NULL/*LoadCursor(NULL, IDC_ARROW)*/,
                        (HBRUSH)GetStockObject(BLACK_BRUSH), NULL,
 	                     TEXT("Game Window") };
   RegisterClass( &wndClass );
 
    // Create our main window
 	windowStyle =  WS_POPUP|WS_VISIBLE;
-	if (runWindowed) 
+	if (runWindowed)
 		windowStyle |= WS_DLGFRAME | WS_CAPTION | WS_SYSMENU;
 	else
 		windowStyle |= WS_EX_TOPMOST | WS_SYSMENU;
@@ -685,34 +697,34 @@ static Bool initializeAppWindows( HINSTANCE hInstance, Int nCmdShow, Bool runWin
 	AdjustWindowRect (&rect, windowStyle, FALSE);
 	if (runWindowed) {
 		// Makes the normal debug 800x600 window center in the screen.
-		startWidth = DEFAULT_XRESOLUTION;
-		startHeight= DEFAULT_YRESOLUTION;
+		startWidth = DEFAULT_DISPLAY_WIDTH;
+		startHeight= DEFAULT_DISPLAY_HEIGHT;
 	}
 
 	gInitializing = true;
 
   HWND hWnd = CreateWindow( TEXT("Game Window"),
                             TEXT("Command and Conquer Generals"),
-                            windowStyle, 
+                            windowStyle,
 														(GetSystemMetrics( SM_CXSCREEN ) / 2) - (startWidth / 2), // original position X
 														(GetSystemMetrics( SM_CYSCREEN ) / 2) - (startHeight / 2),// original position Y
 														// Lorenzen nudged the window higher
-														// so the constantdebug report would 
+														// so the constantdebug report would
 														// not get obliterated by assert windows, thank you.
 														//(GetSystemMetrics( SM_CXSCREEN ) / 2) - (startWidth / 2),   //this works with any screen res
 														//(GetSystemMetrics( SM_CYSCREEN ) / 25) - (startHeight / 25),//this works with any screen res
 														rect.right-rect.left,
 														rect.bottom-rect.top,
-														0L, 
-														0L, 
-														hInstance, 
+														0L,
+														0L,
+														hInstance,
 														0L );
 
 
 	if (!runWindowed)
 	{	SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, 0, 0,SWP_NOSIZE |SWP_NOMOVE);
 	}
-	else 
+	else
 		SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0,SWP_NOSIZE |SWP_NOMOVE);
 
 	SetFocus(hWnd);
@@ -730,76 +742,43 @@ static Bool initializeAppWindows( HINSTANCE hInstance, Int nCmdShow, Bool runWin
 
 	return true;  // success
 
-}  // end initializeAppWindows
+}
 
-char *nextParam(char *newSource, const char *seps)
+// Necessary to allow memory managers and such to have useful critical sections
+static CriticalSection critSec1, critSec2, critSec3, critSec4, critSec5;
+
+// UnHandledExceptionFilter ===================================================
+/** Handler for unhandled win32 exceptions. */
+//=============================================================================
+static LONG WINAPI UnHandledExceptionFilter( struct _EXCEPTION_POINTERS* e_info )
 {
-	static char *source = NULL;
-	if (newSource)
-	{
-		source = newSource;
-	}
-	if (!source)
+	DumpExceptionInfo( e_info->ExceptionRecord->ExceptionCode, e_info );
+#ifdef RTS_ENABLE_CRASHDUMP
+	if (TheMiniDumper && TheMiniDumper->IsInitialized())
 	{
-		return NULL;
+		// Create both minimal and full memory dumps
+		TheMiniDumper->TriggerMiniDumpForException(e_info, DumpType_Minimal);
+		TheMiniDumper->TriggerMiniDumpForException(e_info, DumpType_Full);
 	}
 
-	// find first separator
-	char *first = source;//strpbrk(source, seps);
-	if (first)
-	{
-		// go past separator
-		char *firstSep = strpbrk(first, seps);
-		char firstChar[2] = {0,0};
-		if (firstSep == first)
-		{
-			firstChar[0] = *first;
-			while (*first == firstChar[0]) first++;
-		}
-
-		// find end
-		char *end;
-		if (firstChar[0])
-			end = strpbrk(first, firstChar);
-		else
-			end = strpbrk(first, seps);
-
-		// trim string & save next start pos
-		if (end)
-		{
-			source = end+1;
-			*end = 0;
-
-			if (!*source)
-				source = NULL;
-		}
-		else
-		{
-			source = NULL;
-		}
-
-		if (first && !*first)
-			first = NULL;
-	}
-
-	return first;
+	MiniDumper::shutdownMiniDumper();
+#endif
+	return EXCEPTION_EXECUTE_HANDLER;
 }
 
-// Necessary to allow memory managers and such to have useful critical sections
-static CriticalSection critSec1, critSec2, critSec3, critSec4, critSec5;
-
 // WinMain ====================================================================
 /** Application entry point */
 //=============================================================================
 Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
                       LPSTR lpCmdLine, Int nCmdShow )
 {
+	Int exitcode = 1;
 	try {
 
-		_set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
+		SetUnhandledExceptionFilter( UnHandledExceptionFilter );
 		//
-		// there is something about checkin in and out the .dsp and .dsw files 
-		// that blows the working directory information away on each of the 
+		// there is something about checkin in and out the .dsp and .dsw files
+		// that blows the working directory information away on each of the
 		// developers machines so we're going to hack it for a while and set our
 		// working directory to the directory with the .exe since that's not the
 		// default in a DevStudio project
@@ -811,64 +790,19 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 		TheMemoryPoolCriticalSection = &critSec4;
 		TheDebugLogCriticalSection = &critSec5;
 
+		// initialize the memory manager early
+		initMemoryManager();
+
 		/// @todo remove this force set of working directory later
 		Char buffer[ _MAX_PATH ];
 		GetModuleFileName( NULL, buffer, sizeof( buffer ) );
-		Char *pEnd = buffer + strlen( buffer );
-		while( pEnd != buffer ) 
+		if (Char *pEnd = strrchr(buffer, '\\'))
 		{
-			if( *pEnd == '\\' ) 
-			{
-				*pEnd = 0;
-				break;
-			}
-			pEnd--;
+			*pEnd = 0;
 		}
 		::SetCurrentDirectory(buffer);
 
 
-		/*
-		** Convert WinMain arguments to simple main argc and argv
-		*/
-		int argc = 1;
-		char * argv[20];
-		argv[0] = NULL;
-
-		Bool headless = false;
-
-		char *token;
-		token = nextParam(lpCmdLine, "\" ");
-		while (argc < 20 && token != NULL) {
-			argv[argc++] = strtrim(token);
-
-			//added a preparse step for this flag because it affects window creation style
-			if (stricmp(token, "-win") == 0)
-				ApplicationIsWindowed = true;
-
-			// preparse for headless as well. We need to know about this before we create the window.
-			if (stricmp(token, "-headless") == 0)
-				headless = true;
-
-			token = nextParam(NULL, "\" ");	   
-		}
-
-		if (argc>2 && strcmp(argv[1],"-DX")==0) {  
-			Int i;
-			DEBUG_LOG(("\n--- DX STACK DUMP\n"));
-			for (i=2; i<argc; i++) {
-				Int pc;
-				pc = 0;
-				sscanf(argv[i], "%x",  &pc);
-				char name[_MAX_PATH], file[_MAX_PATH];
-				unsigned int line;
-				unsigned int addr;
-				GetFunctionDetails((void*)pc, name, file, &line, &addr);
-				DEBUG_LOG(("0x%x - %s, %s, line %d address 0x%x\n", pc, name, file, line, addr));
-			}
-			DEBUG_LOG(("\n--- END OF DX STACK DUMP\n"));
-			return 0;
-		}
-
 		#ifdef RTS_DEBUG
 			// Turn on Memory heap tracking
 			int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG );
@@ -887,10 +821,16 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 		// Force to be loaded from a file, not a resource so same exe can be used in germany and retail.
  		gLoadScreenBitmap = (HBITMAP)LoadImage(hInstance, "Install_Final.bmp",	IMAGE_BITMAP, 0, 0, LR_SHARED|LR_LOADFROMFILE);
 
+		CommandLine::parseCommandLineForStartup();
+
+#ifdef RTS_ENABLE_CRASHDUMP
+		// Initialize minidump facilities - requires TheGlobalData so performed after parseCommandLineForStartup
+		MiniDumper::initMiniDumper(TheGlobalData->getPath_UserData());
+#endif
 		// register windows class and create application window
-		if(!headless && initializeAppWindows( hInstance, nCmdShow, ApplicationIsWindowed) == false )
-			return 0;
-		
+		if(!TheGlobalData->m_headless && initializeAppWindows(hInstance, nCmdShow, TheGlobalData->m_windowed) == false)
+			return exitcode;
+
 		// save our application instance for future use
 		ApplicationHInstance = hInstance;
 
@@ -903,11 +843,8 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 		// BGC - initialize COM
 	//	OleInitialize(NULL);
 
-		// start the log
-		DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
-		initMemoryManager();
 
- 
+
 		// Set up version info
 		TheVersion = NEW Version;
 		TheVersion->setVersion(VERSION_MAJOR, VERSION_MINOR, VERSION_BUILDNUM, VERSION_LOCALBUILDNUM,
@@ -925,18 +862,17 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 				ShowWindow(ccwindow, SW_RESTORE);
 			}
 
-			DEBUG_LOG(("Generals is already running...Bail!\n"));
+			DEBUG_LOG(("Generals is already running...Bail!"));
 			delete TheVersion;
 			TheVersion = NULL;
 			shutdownMemoryManager();
-			DEBUG_SHUTDOWN();
-			return 0;
+			return exitcode;
 		}
-		DEBUG_LOG(("Create Generals Mutex okay.\n"));
-		DEBUG_LOG(("CRC message is %d\n", GameMessage::MSG_LOGIC_CRC));
+		DEBUG_LOG(("Create Generals Mutex okay."));
+		DEBUG_LOG(("CRC message is %d", GameMessage::MSG_LOGIC_CRC));
 
 		// run the game main loop
-		GameMain(argc, argv);
+		exitcode = GameMain();
 
 		delete TheVersion;
 		TheVersion = NULL;
@@ -944,30 +880,31 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	#ifdef MEMORYPOOL_DEBUG
 		TheMemoryPoolFactory->debugMemoryReport(REPORT_POOLINFO | REPORT_POOL_OVERFLOW | REPORT_SIMPLE_LEAKS, 0, 0);
 	#endif
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	#if defined(RTS_DEBUG)
 		TheMemoryPoolFactory->memoryPoolUsageReport("AAAMemStats");
 	#endif
 
-		// close the log
 		shutdownMemoryManager();
-		DEBUG_SHUTDOWN();
 
 		// BGC - shut down COM
 	//	OleUninitialize();
-	}	
-	catch (...) 
-	{ 
-	
 	}
+	catch (...)
+	{
 
+	}
+
+#ifdef RTS_ENABLE_CRASHDUMP
+	MiniDumper::shutdownMiniDumper();
+#endif
 	TheAsciiStringCriticalSection = NULL;
 	TheUnicodeStringCriticalSection = NULL;
 	TheDmaCriticalSection = NULL;
 	TheMemoryPoolCriticalSection = NULL;
 
-	return 0;
+	return exitcode;
 
-}  // end WinMain
+}
 
 // CreateGameEngine ===========================================================
 /** Create the Win32 game engine we're going to use */
@@ -983,4 +920,4 @@ GameEngine *CreateGameEngine( void )
 
 	return engine;
 
-}  // end CreateGameEngine
+}
diff --git a/Generals/Code/Main/WinMain.h b/Generals/Code/Main/WinMain.h
index b580e4da60c..ad23e9ffdc8 100644
--- a/Generals/Code/Main/WinMain.h
+++ b/Generals/Code/Main/WinMain.h
@@ -30,8 +30,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __WINMAIN_H_
-#define __WINMAIN_H_
+#pragma once
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
@@ -43,6 +42,3 @@
 extern HINSTANCE ApplicationHInstance;  ///< our application instance
 extern HWND ApplicationHWnd;  ///< our application window handle
 extern Win32Mouse *TheWin32Mouse;  ///< global for win32 mouse only!
-
-#endif  // end __WINMAIN_H_
-
diff --git a/Generals/Code/Main/resource.h b/Generals/Code/Main/resource.h
index 935c58b5c39..aa4284aa261 100644
--- a/Generals/Code/Main/resource.h
+++ b/Generals/Code/Main/resource.h
@@ -6,7 +6,7 @@
 #define IDB_LOAD_SCREEN                 103
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        104
diff --git a/Generals/Code/Tools/GUIEdit/CMakeLists.txt b/Generals/Code/Tools/GUIEdit/CMakeLists.txt
index 5a7b0eb877b..a3c397408c8 100644
--- a/Generals/Code/Tools/GUIEdit/CMakeLists.txt
+++ b/Generals/Code/Tools/GUIEdit/CMakeLists.txt
@@ -46,10 +46,8 @@ target_include_directories(g_guiedit PRIVATE
 )
 
 target_link_libraries(g_guiedit PRIVATE
-    benchmark
     comctl32
     d3d8lib
-    dbghelplib
     g_gameengine
     g_gameenginedevice
     g_wwvegas
diff --git a/Generals/Code/Tools/GUIEdit/Include/DialogProc.h b/Generals/Code/Tools/GUIEdit/Include/DialogProc.h
index 687ce7e0266..aab39897688 100644
--- a/Generals/Code/Tools/GUIEdit/Include/DialogProc.h
+++ b/Generals/Code/Tools/GUIEdit/Include/DialogProc.h
@@ -24,12 +24,12 @@
 
 // FILE: DialogProc.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __DIALOGPROC_H_
-#define __DIALOGPROC_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 
@@ -63,12 +60,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 // EXTERNALS //////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-extern LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message, 
+extern LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message,
 																						 WPARAM wParam, LPARAM lParam );
-extern BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message, 
+extern BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 																						 WPARAM wParam, LPARAM lParam );
-extern BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message, 
+extern BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 																							 WPARAM wParam, LPARAM lParam );
-
-#endif // __DIALOGPROC_H_
-
diff --git a/Generals/Code/Tools/GUIEdit/Include/EditWindow.h b/Generals/Code/Tools/GUIEdit/Include/EditWindow.h
index db5475357ae..8d2a34503ee 100644
--- a/Generals/Code/Tools/GUIEdit/Include/EditWindow.h
+++ b/Generals/Code/Tools/GUIEdit/Include/EditWindow.h
@@ -24,12 +24,12 @@
 
 // FILE: EditWindow.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __EDITWINDOW_H_
-#define __EDITWINDOW_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
 #include <windows.h>
@@ -78,9 +75,9 @@ class EditWindow
 	EditWindow( void );
 	~EditWindow( void );
 
-	/// initialize the edit window singleton 
+	/// initialize the edit window singleton
 	void init( UnsignedInt clientWidth, UnsignedInt clientHeight );
-	void shutdown( void );  ///< free all data 
+	void shutdown( void );  ///< free all data
 	void draw( void );  ///< draw the edit window
 
 	void updatePulse( void );  ///< pulse message from timer
@@ -108,7 +105,7 @@ class EditWindow
 	// **************************************************************************
 
 	/// draw a line on the display in screen coordinates
-	void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	void drawLine( Int startX, Int startY, Int endX, Int endY,
 								 Real lineWidth, UnsignedInt lineColor );
 
 	/// draw a rect border on the display in pixel coordinates with the specified color
@@ -116,11 +113,11 @@ class EditWindow
 										 Real lineWidth, UnsignedInt lineColor );
 
 	/// draw a filled rect on the display in pixel coords with the specified color
-	void drawFillRect( Int startX, Int startY, Int width, Int height, 
+	void drawFillRect( Int startX, Int startY, Int width, Int height,
 										 UnsignedInt color );
 
 	/// draw an image fit within the screen coordinates
-	void drawImage( const Image *image, Int startX, Int startY, 
+	void drawImage( const Image *image, Int startX, Int startY,
 									Int endX, Int endY, Color color = 0xFFFFFFFF );
 
 	/// image clipping support
@@ -133,7 +130,7 @@ class EditWindow
 	void registerEditWindowClass( void );  ///< register class with OS
 
 	/// callback from windows, NOTE that it's static and has no this pointer
-	static LRESULT CALLBACK editProc( HWND hWnd, UINT message, 
+	static LRESULT CALLBACK editProc( HWND hWnd, UINT message,
 																		WPARAM wParam, LPARAM lParam );
 
 	void drawGrid( void );  ///< draw the grid
@@ -157,7 +154,7 @@ class EditWindow
 	static Bool m_classRegistered;  ///< TRUE when we've register with OS
 	static const char *m_className;  ///< name for windows class
 
-	ICoord2D m_size;  ///< width and height of edit window	
+	ICoord2D m_size;  ///< width and height of edit window
 	UnsignedByte m_bitDepth;  ///< bit depth for edit window
 	HWND m_editWindowHWnd;  ///< edit window handle
 
@@ -186,7 +183,7 @@ class EditWindow
 	IRegion2D m_clipRegion;		///< the clipping region for images
 	Bool m_isClippedEnabled;	///<used by 2D drawing operations to define clip re
 
-};  // end EditWindow
+};
 
 ///////////////////////////////////////////////////////////////////////////////
 // INLINING ///////////////////////////////////////////////////////////////////
@@ -203,6 +200,3 @@ inline ICoord2D EditWindow::getDragMoveOrigin( void ) { return m_dragMoveOrigin;
 // EXTERNALS //////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 extern EditWindow *TheEditWindow;  ///< edit window singleton extern
-
-#endif // __EDITWINDOW_H_
-
diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h b/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h
index 6e88287df8c..1de3db82ca7 100644
--- a/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h
+++ b/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h
@@ -29,12 +29,8 @@
 
 #pragma once
 
-#ifndef __GUIEDIT_H_
-#define __GUIEDIT_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include <windows.h>
-#include <stdio.h>
 
 #include "GameClient/GameWindow.h"
 #include "GameClient/WindowLayout.h"
@@ -70,8 +66,6 @@ typedef enum
 	MODE_RESIZE_LEFT,								///< resize dragging left vertical
 	MODE_KEYBOARD_MOVE,							///< moving windows with the Keyboard
 
-	MODE_NUM_MODES									///< keep this last!
-
 } EditMode;
 
 //-------------------------------------------------------------------------------------------------
@@ -80,13 +74,13 @@ typedef enum
 typedef enum
 {
 
-	STATUS_MODE = 0, 
+	STATUS_MODE = 0,
 	STATUS_PART2,			/// change to meaningful name when decided what goes here
 	STATUS_PART3,			/// change to meaningful name when decided what goes here
 	STATUS_PART4,			/// change to meaningful name when decided what goes here
 	STATUS_MOUSE_COORDS,
 
-	STATUS_NUM_PARTS  ///< keep this last!
+	STATUS_NUM_PARTS
 
 } StatusPart;
 
@@ -103,8 +97,6 @@ typedef enum
 	CURSOR_SIZE_WE,
 	CURSOR_WAIT,
 
-	CURSOR_NUM_CURSORS  // keep last
-
 } CursorType;
 
 //-------------------------------------------------------------------------------------------------
@@ -164,7 +156,7 @@ class GUIEdit
 
 	void setUnsaved( Bool unsaved );  ///< set unsaved flag to FALSE or TRUE
 	Bool newLayout( void );  ///< reset editor for new layout
-	
+
 	// grid settings
 	void setGridResolution( Int res );
 	Int getGridResolution( void );
@@ -205,7 +197,7 @@ class GUIEdit
 	// resizing/moving help ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	void dragMoveSelectedWindows( ICoord2D *dragOrigin, ICoord2D *dragDest );  ///< move windows via drag move
 	/// given a position to move a window to, keep it onscreen and inside parent
-	void computeSafeLocation( GameWindow *window, Int x, Int y, 
+	void computeSafeLocation( GameWindow *window, Int x, Int y,
 														Int *safeX, Int *safeY );
 	/// given position and size to move a window to, keep it inside parent and on screen
 	void computeSafeSizeLocation( GameWindow *window,
@@ -216,7 +208,7 @@ class GUIEdit
 	/// compute new size of window using drag-resize logic
 	void computeResizeLocation( EditMode resizeMode,
 														  GameWindow *window,
-														  ICoord2D *resizeOrigin, 
+														  ICoord2D *resizeOrigin,
 														  ICoord2D *resizeDest,
 														  ICoord2D *resultLoc,
 														  ICoord2D *resultSize );
@@ -241,8 +233,8 @@ class GUIEdit
 																	 Int *x, Int *y, Int *width, Int *height );
 
 	GameWindow *newWindow( UnsignedInt windowStyle,
-												 GameWindow *parent, 
-												 Int x, Int y, 
+												 GameWindow *parent,
+												 Int x, Int y,
 												 Int width, Int height );
 	GameWindow *newUserWindow( GameWindow *parent,
 														 Int x, Int y,
@@ -254,31 +246,31 @@ class GUIEdit
 													 Int x, Int y,
 													 Int width, Int height );
 	GameWindow *newRadioButton( GameWindow *parent,
-														  Int x, Int y, 
+														  Int x, Int y,
 															Int width, Int height );
 	GameWindow *newTabControl( GameWindow *parent,
-														  Int x, Int y, 
+														  Int x, Int y,
 															Int width, Int height );
 	GameWindow *newHorizontalSlider( GameWindow *parent,
-																	 Int x, Int y, 
+																	 Int x, Int y,
 																	 Int width, Int height );
 	GameWindow *newVerticalSlider( GameWindow *parent,
-																 Int x, Int y, 
+																 Int x, Int y,
 																 Int width, Int height );
 	GameWindow *newProgressBar( GameWindow *parent,
-														  Int x, Int y, 
+														  Int x, Int y,
 															Int width, Int height );
 	GameWindow *newListbox( GameWindow *parent,
-													Int x, Int y, 
+													Int x, Int y,
 													Int width, Int height );
 	GameWindow *newTextEntry( GameWindow *parent,
-													  Int x, Int y, 
+													  Int x, Int y,
 														Int width, Int height );
 	GameWindow *newStaticText( GameWindow *parent,
-														 Int x, Int y, 
+														 Int x, Int y,
 														 Int width, Int height );
 	GameWindow *newComboBox( GameWindow *parent,
-														 Int x, Int y, 
+														 Int x, Int y,
 														 Int width, Int height );
 
 	// menu options ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -348,7 +340,7 @@ class GUIEdit
 	AsciiString m_layoutUpdateString;	 ///< layout update function name
 	AsciiString m_layoutShutdownString;///< layout shutdown function name
 
-};  // end GUIEdit
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////////////////////////
 inline HWND GUIEdit::getWindowHandle( void ) { return m_appHWnd; }
@@ -378,6 +370,3 @@ inline AsciiString GUIEdit::getLayoutShutdown( void ) { return m_layoutShutdownS
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern GUIEdit *TheEditor;  ///< editor application singleton
-
-#endif // __GUIEDIT_H_
-
diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h
index c8d454734e6..13cd34a10cb 100644
--- a/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h
+++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h
@@ -24,12 +24,12 @@
 
 // FILE: GUIEditColor.h ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GUIEDITCOLOR_H_
-#define __GUIEDITCOLOR_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -67,7 +64,7 @@ struct RGBColorInt
 	Int green;
 	Int blue;
 	Int alpha;
-};  // end RGBColorInt
+};
 
 // RGBColorReal ---------------------------------------------------------------
 /** Colors using 0.0 to 1.0 reals */
@@ -78,7 +75,7 @@ struct RGBColorReal
 	Real green;
 	Real blue;
 	Real alpha;
-};  // end RGBColorReal
+};
 
 // HSVColorReal ---------------------------------------------------------------
 /** Colors using hue, saturation, value using 0.0 to 1.0 reals */
@@ -89,13 +86,10 @@ struct HSVColorReal
   Real saturation;
   Real value;
 	Real alpha;
-};  // end HSVReal
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
 extern RGBColorInt *SelectColor( Int red, Int green, Int blue, Int alpha,
 																 Int mouseX = 0, Int mouseY = 0 );
-
-#endif // __GUIEDITCOLOR_H_
-
diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h
index 9d2966ac5b5..dda18bf3aea 100644
--- a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h
+++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h
@@ -24,12 +24,12 @@
 
 // FILE: GUIEditDisplay.h /////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GUIEDITDISPLAY_H_
-#define __GUIEDITDISPLAY_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -72,9 +69,9 @@ class GUIEditDisplay : public Display
 	virtual void draw( void ) { };
 
 	/// draw a line on the display in pixel coordinates with the specified color
-	virtual void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
 												 Real lineWidth, UnsignedInt lineColor );
-	virtual void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
 												 Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) { }
 	/// draw a rect border on the display in pixel coordinates with the specified color
 	virtual void drawOpenRect( Int startX, Int startY, Int width, Int height,
@@ -88,7 +85,7 @@ class GUIEditDisplay : public Display
 	virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) { }
 
 	/// draw an image fit within the screen coordinates
-	virtual void drawImage( const Image *image, Int startX, Int startY, 
+	virtual void drawImage( const Image *image, Int startX, Int startY,
 													Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA);
 	/// image clipping support
 	virtual void setClipRegion( IRegion2D *region );
@@ -101,14 +98,15 @@ class GUIEditDisplay : public Display
 	virtual VideoBuffer*	createVideoBuffer( void ) { return NULL; }
 
 	/// draw a video buffer fit within the screen coordinates
-	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY, 
+	virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) { }
+	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY,
 																Int endX, Int endY ) { }
 	virtual void takeScreenShot(void){ }
 	virtual void toggleMovieCapture(void) {}
 
 	// methods that we need to stub
 	virtual void setTimeOfDay( TimeOfDay tod ) {}
-	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius, Real attenuationWidth, 
+	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius, Real attenuationWidth,
 																 UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime ) {}
 	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) {}
 	void setBorderShroudLevel(UnsignedByte level){}
@@ -117,24 +115,22 @@ class GUIEditDisplay : public Display
 	virtual void preloadTextureAssets( AsciiString texture ) {}
 	virtual void toggleLetterBox(void) {}
 	virtual void enableLetterBox(Bool enable) {}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void dumpModelAssets(const char *path) {}
 #endif
 	virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) {}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void dumpAssetUsage(const char* mapname) {}
 #endif
 
 	virtual Real getAverageFPS(void) { return 0; }
+	virtual Real getCurrentFPS(void) { return 0; }
 	virtual Int getLastFrameDrawCalls( void ) { return 0; }
 
 protected:
 
-};  // end GUIEditDisplay
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GUIEDITDISPLAY_H_
-
diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h
index 293186567ae..d79cb6085ec 100644
--- a/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h
+++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h
@@ -34,9 +34,6 @@
 
 #pragma once
 
-#ifndef __GUIEDITWINDOWMANAGER_H_
-#define __GUIEDITWINDOWMANAGER_H_
-
 #include <stdlib.h>
 #include "W3DDevice/GameClient/W3DGameWindowManager.h"
 
@@ -88,7 +85,7 @@ class GUIEditWindowManager : public W3DGameWindowManager
 	Bool isWindowInClipboard( GameWindow *window, GameWindow **list );
 	void linkToClipboard( GameWindow *window, GameWindow **list );  ///< add window to clipboard
 	void unlinkFromClipboard( GameWindow *window, GameWindow **list );  ///< remove window from clipboard
-		
+
 	/** remove selected children from the select list that have a parent
 	also in the select list */
 	void removeSupervisedChildSelections( void );
@@ -114,6 +111,3 @@ inline GameWindow *GUIEditWindowManager::getClipboardDupeList( void ) { return m
 
 // EXTERN /////////////////////////////////////////////////////////////////////////////////////////
 extern GUIEditWindowManager *TheGUIEditWindowManager;  ///< editor use only
-
-#endif // __GUIEDITWINDOWMANAGER_H_
-
diff --git a/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h b/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h
index fb9ad276ada..c622a266c8a 100644
--- a/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h
+++ b/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h
@@ -24,12 +24,12 @@
 
 // FILE: HierarchyView.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __HIERARCHYVIEW_H_
-#define __HIERARCHYVIEW_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 #include <commctrl.h>
@@ -102,7 +99,7 @@ class HierarchyView
 	void getDialogPos( ICoord2D *pos );
 	void setDialogSize( ICoord2D *size );
 	void getDialogSize( ICoord2D *size );
-	
+
 	void setDragWindow( GameWindow *window );
 	void setDragTarget( GameWindow *window );
 	GameWindow *getDragWindow( void );
@@ -117,7 +114,7 @@ class HierarchyView
 
 	HTREEITEM treePointToItem( Int x, Int y );  ///< translate mouse pos to item location
 	GameWindow *getWindowFromItem( HTREEITEM treeItem );  ///< get game window from user data in the tree item
-	
+
 protected:
 
 	static LRESULT CALLBACK dialogProc( HWND hWndDialog, UINT message,
@@ -131,12 +128,12 @@ class HierarchyView
 
 	HWND m_dialog;  ///< window handle for our control dialog
 	HWND m_tree;  ///< window handle for the tree control
-	
+
 	GameWindow *m_dragWindow;  ///< for drag drop operations
 	GameWindow *m_dragTarget;  ///< target for drag and drop operations while mouse is moving
 	GameWindow *m_popupTarget;  ///< the target for right mouse popup menus
 
-};  // end HierarchyView
+};
 
 ///////////////////////////////////////////////////////////////////////////////
 // INLINING ///////////////////////////////////////////////////////////////////
@@ -152,6 +149,3 @@ inline GameWindow *HierarchyView::getPopupTarget( void ) { return m_popupTarget;
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
 extern HierarchyView *TheHierarchyView;  ///< singleton for our view
-
-#endif // __CONTROLPALETTE_H_
-
diff --git a/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h b/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h
index ad715eb3396..8cd195b9fcd 100644
--- a/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h
+++ b/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h
@@ -24,12 +24,12 @@
 
 // FILE: LayoutScheme.h ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __LAYOUTSCHEME_H_
-#define __LAYOUTSCHEME_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 
@@ -62,14 +59,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // LayoutScheme ---------------------------------------------------------------
-/** The layout scheme provides a place for default look of newly 
+/** The layout scheme provides a place for default look of newly
 	* created controls and windows */
 //-----------------------------------------------------------------------------
 class LayoutScheme
 {
 
 public:
-	
+
 	LayoutScheme();
 	~LayoutScheme();
 
@@ -121,13 +118,13 @@ class LayoutScheme
 
 	GameFont *m_font;  ///< default font
 
-};  // end LayoutScheme
+};
 
 ///////////////////////////////////////////////////////////////////////////////
 // INLINING ///////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 inline char *LayoutScheme::getSchemeFilename( void ) { return m_schemeFilename; }
-inline void LayoutScheme::setSchemeFilename( char *filename ) { strcpy( m_schemeFilename, filename ); }
+inline void LayoutScheme::setSchemeFilename( char *filename ) { strlcpy(m_schemeFilename, filename, ARRAY_SIZE(m_schemeFilename)); }
 inline Color LayoutScheme::getEnabledTextColor( void ) { return m_enabledText.color; }
 inline Color LayoutScheme::getEnabledTextBorderColor( void ) { return m_enabledText.borderColor; }
 inline Color LayoutScheme::getDisabledTextColor( void ) { return m_disabledText.color; }
@@ -147,6 +144,3 @@ inline GameFont *LayoutScheme::getFont( void ) { return m_font; }
 // EXTERNALS //////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 extern LayoutScheme *TheDefaultScheme;
-
-#endif // end __LAYOUTSCHEME_H_
-
diff --git a/Generals/Code/Tools/GUIEdit/Include/Properties.h b/Generals/Code/Tools/GUIEdit/Include/Properties.h
index 6350c8e12e0..dacacce8251 100644
--- a/Generals/Code/Tools/GUIEdit/Include/Properties.h
+++ b/Generals/Code/Tools/GUIEdit/Include/Properties.h
@@ -24,12 +24,12 @@
 
 // FILE: Properties.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __PROPERTIES_H_
-#define __PROPERTIES_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -80,7 +77,7 @@ typedef enum
 {
 
 	IDENTIFIER_INVALID = 0,  // keep this 0 and keep it first
-	
+
 	FIRST_VALID_IDENTIFIER = 1,
 
 	BUTTON_ENABLED = FIRST_VALID_IDENTIFIER,
@@ -316,45 +313,45 @@ typedef enum
 	TEXT_ENTRY_HILITE_SMALL_CENTER,
 
 	TC_TAB_0_ENABLED,
-	TC_TAB_0_DISABLED,			
-	TC_TAB_0_HILITE,				
-	TC_TAB_1_ENABLED,				
-	TC_TAB_1_DISABLED,			
-	TC_TAB_1_HILITE,				
-	TC_TAB_2_ENABLED,				
-	TC_TAB_2_DISABLED,			
-	TC_TAB_2_HILITE,				
-	TC_TAB_3_ENABLED,				
-	TC_TAB_3_DISABLED,			
-	TC_TAB_3_HILITE,				
+	TC_TAB_0_DISABLED,
+	TC_TAB_0_HILITE,
+	TC_TAB_1_ENABLED,
+	TC_TAB_1_DISABLED,
+	TC_TAB_1_HILITE,
+	TC_TAB_2_ENABLED,
+	TC_TAB_2_DISABLED,
+	TC_TAB_2_HILITE,
+	TC_TAB_3_ENABLED,
+	TC_TAB_3_DISABLED,
+	TC_TAB_3_HILITE,
 	TC_TAB_4_ENABLED,
-	TC_TAB_4_DISABLED,			
-	TC_TAB_4_HILITE,				
-	TC_TAB_5_ENABLED,				
-	TC_TAB_5_DISABLED,			
-	TC_TAB_5_HILITE,				
-	TC_TAB_6_ENABLED,				
-	TC_TAB_6_DISABLED,			
-	TC_TAB_6_HILITE,				
-	TC_TAB_7_ENABLED,				
-	TC_TAB_7_DISABLED,			
-	TC_TAB_7_HILITE,				
-	TAB_CONTROL_ENABLED,		
-	TAB_CONTROL_DISABLED,		
-	TAB_CONTROL_HILITE,			
+	TC_TAB_4_DISABLED,
+	TC_TAB_4_HILITE,
+	TC_TAB_5_ENABLED,
+	TC_TAB_5_DISABLED,
+	TC_TAB_5_HILITE,
+	TC_TAB_6_ENABLED,
+	TC_TAB_6_DISABLED,
+	TC_TAB_6_HILITE,
+	TC_TAB_7_ENABLED,
+	TC_TAB_7_DISABLED,
+	TC_TAB_7_HILITE,
+	TAB_CONTROL_ENABLED,
+	TAB_CONTROL_DISABLED,
+	TAB_CONTROL_HILITE,
 
 	GENERIC_ENABLED,
 	GENERIC_DISABLED,
 	GENERIC_HILITE,
 
-	NUM_STATE_IDENTIFIERS  // keep this last
+	NUM_STATE_IDENTIFIERS
 
 } StateIdentifier;
 
 // ImageAndColorInfo ----------------------------------------------------------
-/** This is a place for us to store image and color information for	
+/** This is a place for us to store image and color information for
 	* all the various states for each of the controls, it makes it easier
-	* for us cause we can just put and get queries in this table and 
+	* for us cause we can just put and get queries in this table and
 	* work with only one set of dialog controls on all the property
 	* dialog windows */
 //-----------------------------------------------------------------------------
@@ -425,6 +422,3 @@ extern Color GetPropsDisabledTextColor( void );
 extern Color GetPropsDisabledTextBorderColor( void );
 extern Color GetPropsHiliteTextColor( void );
 extern Color GetPropsHiliteTextBorderColor( void );
-
-#endif // __PROPERTIES_H_
-
diff --git a/Generals/Code/Tools/GUIEdit/Include/WinMain.h b/Generals/Code/Tools/GUIEdit/Include/WinMain.h
index 6894ec8274d..219ea88a007 100644
--- a/Generals/Code/Tools/GUIEdit/Include/WinMain.h
+++ b/Generals/Code/Tools/GUIEdit/Include/WinMain.h
@@ -24,12 +24,12 @@
 
 // FILE: WinMain.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __WINMAIN_H_
-#define __WINMAIN_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 
@@ -65,6 +62,3 @@
 extern HWND ApplicationHWnd;  ///< application main window handle
 extern HINSTANCE ApplicationHInstance;  ///< application main instance handle
 extern Win32Mouse *TheWin32Mouse;  ///< the mouse for win processing
-
-#endif // __WINMAIN_H_
-
diff --git a/Generals/Code/Tools/GUIEdit/Resource/resource.h b/Generals/Code/Tools/GUIEdit/Resource/resource.h
index 964f89692ab..f0c5de11600 100644
--- a/Generals/Code/Tools/GUIEdit/Resource/resource.h
+++ b/Generals/Code/Tools/GUIEdit/Resource/resource.h
@@ -194,7 +194,7 @@
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        155
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/CallbackEditor.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/CallbackEditor.cpp
index 373ac42488f..84300568e45 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/CallbackEditor.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/CallbackEditor.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: CallbackEditor.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -85,7 +85,7 @@ void SaveCallbacks( GameWindow *window, HWND dialog )
 
 	// get edit data for window
 	GameWindowEditData *editData = window->winGetEditData();
-	DEBUG_ASSERTCRASH( editData, ("No edit data for window saving callbacks!\n") );
+	DEBUG_ASSERTCRASH( editData, ("No edit data for window saving callbacks!") );
 
 	// get the currently selected item from each of the combos and save
 	Int index;
@@ -111,11 +111,11 @@ void SaveCallbacks( GameWindow *window, HWND dialog )
 	SendDlgItemMessage( dialog, COMBO_DRAW, CB_GETLBTEXT, index, (LPARAM)buffer );
 	editData->drawCallbackString = buffer;
 
-	// if there was a window we have a change 
+	// if there was a window we have a change
 	if( window )
 		TheEditor->setUnsaved( TRUE );
 
-}  // end SaveCallbacks
+}
 
 // setCurrentWindow ===========================================================
 /** Set the window passed in as the active window for editing */
@@ -147,12 +147,12 @@ static void setCurrentWindow( GameWindow *window, HWND dialog )
 	//
 	AsciiString name;
 
-	// system 
+	// system
 	if( editData )
 		name = editData->systemCallbackString;
 	if( name.isEmpty() )
 		name = GUIEDIT_NONE_STRING;
-	SendDlgItemMessage( dialog, COMBO_SYSTEM, 
+	SendDlgItemMessage( dialog, COMBO_SYSTEM,
 											CB_SELECTSTRING, -1, (LPARAM)name.str() );
 
 	// input
@@ -161,7 +161,7 @@ static void setCurrentWindow( GameWindow *window, HWND dialog )
 		name = editData->inputCallbackString;
 	if( name.isEmpty() )
 		name = GUIEDIT_NONE_STRING;
-	SendDlgItemMessage( dialog, COMBO_INPUT, 
+	SendDlgItemMessage( dialog, COMBO_INPUT,
 											CB_SELECTSTRING, -1, (LPARAM)name.str() );
 
 	// tooltip
@@ -170,7 +170,7 @@ static void setCurrentWindow( GameWindow *window, HWND dialog )
 		name = editData->tooltipCallbackString;
 	if( name.isEmpty() )
 		name = GUIEDIT_NONE_STRING;
-	SendDlgItemMessage( dialog, COMBO_TOOLTIP, 
+	SendDlgItemMessage( dialog, COMBO_TOOLTIP,
 											CB_SELECTSTRING, -1, (LPARAM)name.str() );
 
 	// draw
@@ -179,7 +179,7 @@ static void setCurrentWindow( GameWindow *window, HWND dialog )
 		name = editData->drawCallbackString;
 	if( name.isEmpty() )
 		name = GUIEDIT_NONE_STRING;
-	SendDlgItemMessage( dialog, COMBO_DRAW, 
+	SendDlgItemMessage( dialog, COMBO_DRAW,
 											CB_SELECTSTRING, -1, (LPARAM)name.str() );
 
 	//
@@ -196,10 +196,10 @@ static void setCurrentWindow( GameWindow *window, HWND dialog )
 		else
 			name = noNameWindowString;
 
-	}  // end if
+	}
 	SetWindowText( GetDlgItem( dialog, STATIC_WINDOW ), name.str() );
 
-}  // end setCurrentWindow
+}
 
 // loadUserWindows ============================================================
 /** Given the window list passed in, load the list box passed with the
@@ -209,7 +209,7 @@ static void loadUserWindows( HWND listbox, GameWindow *root )
 {
 
 	// end recursion
-	if( root == NULL )	
+	if( root == NULL )
 		return;
 
 	// is this a candidate
@@ -235,12 +235,12 @@ static void loadUserWindows( HWND listbox, GameWindow *root )
 		// check the children
 		loadUserWindows( listbox, root->winGetChild() );
 
-	}  // end if
+	}
 
 	// check the rest of the list
 	loadUserWindows( listbox, root->winGetNext() );
 
-}  // end loadUserWindows
+}
 
 //-------------------------------------------------------------------------------------------------
 /** save the layout callbacks */
@@ -265,7 +265,7 @@ static void saveLayoutCallbacks( HWND dialog )
 	SendDlgItemMessage( dialog, COMBO_SHUTDOWN, CB_GETLBTEXT, sel, (LPARAM)buffer );
 	TheEditor->setLayoutShutdown( AsciiString(buffer) );
 
-}  // end saveLayoutCallbacks
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -274,7 +274,7 @@ static void saveLayoutCallbacks( HWND dialog )
 // CallbackEditorDialogProc ===================================================
 /** Dialog procedure for grid settings dialog */
 //=============================================================================
-BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message, 
+BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 																				WPARAM wParam, LPARAM lParam )
 {
 
@@ -295,7 +295,7 @@ BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 			SendDlgItemMessage( hWndDialog, COMBO_DRAW, CB_SETCURSEL, 0, 0 );
 
 			// load the listbox with all the USER windows in the edit window
-			loadUserWindows( GetDlgItem( hWndDialog, LIST_WINDOWS ), 
+			loadUserWindows( GetDlgItem( hWndDialog, LIST_WINDOWS ),
 											 TheWindowManager->winGetWindowList() );
 
 			// no current window
@@ -303,7 +303,7 @@ BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 
 			return TRUE;
 
-		}  // end init dialog
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -318,7 +318,7 @@ BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 				// --------------------------------------------------------------------
 				case LIST_WINDOWS:
 				{
-		
+
 					switch( notifyCode )
 					{
 
@@ -332,9 +332,9 @@ BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 							selected = SendMessage( hWndControl, LB_GETCURSEL, 0, 0 );
 
 							// get the window of the selected listbox item
-							win = (GameWindow *)SendMessage( hWndControl, LB_GETITEMDATA,		
+							win = (GameWindow *)SendMessage( hWndControl, LB_GETITEMDATA,
 																							 selected, 0 );
-							
+
 
 							// sanity
 							DEBUG_ASSERTCRASH( win, ("NULL window set in listbox item data") );
@@ -344,16 +344,16 @@ BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 
 							// set the current window to the new selection
 							setCurrentWindow( win, hWndDialog );
-							
+
 							break;
 
-						}  // end case selection change
+						}
 
-					}  // end switch
+					}
 
 					break;
 
-				}  // end window listbox
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -371,20 +371,20 @@ BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 
           break;
 
-				}  // end ok
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end CallbackEditorDialogProc
+}
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/CheckBoxProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/CheckBoxProperties.cpp
index acfb919af20..b53865f58f5 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/CheckBoxProperties.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/CheckBoxProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: CheckBoxProperties.cpp ///////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -80,7 +80,7 @@ static LRESULT CALLBACK checkBoxPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -93,7 +93,7 @@ static LRESULT CALLBACK checkBoxPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -143,7 +143,7 @@ static LRESULT CALLBACK checkBoxPropertiesCallback( HWND hWndDialog,
 						GadgetCheckBoxSetDisabledCheckedBoxImage( window, info->image );
 						GadgetCheckBoxSetDisabledCheckedBoxColor( window, info->color );
 						GadgetCheckBoxSetDisabledCheckedBoxBorderColor( window, info->borderColor );
-						
+
 						// ----------------------------------------------------------------
 						info = GetStateInfo( CHECK_BOX_HILITE );
 						GadgetCheckBoxSetHiliteImage( window, info->image );
@@ -160,12 +160,12 @@ static LRESULT CALLBACK checkBoxPropertiesCallback( HWND hWndDialog,
 						GadgetCheckBoxSetHiliteCheckedBoxColor( window, info->color );
 						GadgetCheckBoxSetHiliteCheckedBoxBorderColor( window, info->borderColor );
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -174,13 +174,13 @@ static LRESULT CALLBACK checkBoxPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -189,15 +189,15 @@ static LRESULT CALLBACK checkBoxPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end checkBoxPropertiesCallback
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -284,7 +284,7 @@ HWND InitCheckBoxPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitCheckBoxPropertiesDialog
+}
 
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ColorDialog.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ColorDialog.cpp
index 6a45885cdc3..f65f77b0316 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ColorDialog.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ColorDialog.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: ColorDialog.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -100,7 +100,7 @@ HSVColorReal rgbToHSV( RGBColorReal rgbColor )
     max = green;
   if (blue > max)
     max = blue;
-  
+
   min = red;
   if (green < red)
     min = green;
@@ -111,7 +111,7 @@ HSVColorReal rgbToHSV( RGBColorReal rgbColor )
   value = max;
 
   // calculate saturation
-  if (max != 0) 
+  if (max != 0)
     saturation = (max - min) / max;
   else
     saturation = 0;  // saturation is 0 if all RGB are 0
@@ -119,7 +119,7 @@ HSVColorReal rgbToHSV( RGBColorReal rgbColor )
   // calculate hue
   if (saturation == 0)  {
     hue = 0;  // hue is really undefined
-  }  // end if
+  }
   else  {  // chromatic case, determine hue
     Real delta = max - min;
 
@@ -134,7 +134,7 @@ HSVColorReal rgbToHSV( RGBColorReal rgbColor )
     if (hue < 0)
       hue += 360;  // make sure hue is non negative
 
-  }  // end else, chromatic case, determine hue
+  }
 
   // set and return an HSVColor
   hsvColor.hue        = hue;
@@ -155,7 +155,7 @@ HSVColorReal rgbToHSV( RGBColorReal rgbColor )
 
   return hsvColor;
 
-}  // end rgbToHSV
+}
 
 // hsvToRGB ===================================================================
 // Converts the HSV colors passed in to RGB values
@@ -175,22 +175,22 @@ RGBColorReal hsvToRGB( HSVColorReal hsvColor )
   saturation = hsvColor.saturation;
   value = hsvColor.value;
 
-  if( saturation == 0.0f )  
-	{  
+  if( saturation == 0.0f )
+	{
 		// the colors is on the black and white center line
-    if( hue == 0.0f )  
+    if( hue == 0.0f )
 		{  // achromatic color ... there is no hue
       red = green = blue = value;
-    }  // end if, achromatic color .. there is no hue
-    else  
+    }
+    else
 		{
       DEBUG_LOG(( "HSVToRGB error, hue should be undefined" ));
-    }  // end else
+    }
 
-  }  // end if
+  }
   else
 	{
-	 
+
     if( hue == 360.0f )
       hue = 0.0f;
     hue = hue / 60.0f;  // h is now in [0, 6)
@@ -230,9 +230,9 @@ RGBColorReal hsvToRGB( HSVColorReal hsvColor )
         green = p;
         blue = q;
         break;
-    }  // end switch (i)
+    }
 
-  }  // end else, chromatic case
+  }
 
   // store and return and RGB color
   rgbColor.red   = red;
@@ -241,11 +241,11 @@ RGBColorReal hsvToRGB( HSVColorReal hsvColor )
   rgbColor.alpha = hsvColor.alpha;
 
   return rgbColor;
-      
-}  // end hsvToRGB
+
+}
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////
-BOOL CALLBACK SelectColorDlgProc( HWND hWnd, UINT uMsg, 
+BOOL CALLBACK SelectColorDlgProc( HWND hWnd, UINT uMsg,
                                   WPARAM wParam, LPARAM lParam );
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -253,15 +253,15 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWnd, UINT uMsg,
 ///////////////////////////////////////////////////////////////////////////////
 
 // SelectColor ================================================================
-/** Bring up the color selection requestor.  
+/** Bring up the color selection requestor.
 	*
 	* Returns:
 	* Pointer to selected color
-	* NULL for canceled request 
+	* NULL for canceled request
 	*/
 // ============================================================================
 RGBColorInt *SelectColor( Int red, Int green, Int blue, Int alpha,
-													Int mouseX, Int mouseY )  
+													Int mouseX, Int mouseY )
 {
 
   selectedColor.red = red;
@@ -272,18 +272,18 @@ RGBColorInt *SelectColor( Int red, Int green, Int blue, Int alpha,
 	displayPos.x = mouseX;
 	displayPos.y = mouseY;
 
-  if( DialogBox( TheEditor->getInstance(), (LPCTSTR)COLOR_SELECT_DIALOG, 
+  if( DialogBox( TheEditor->getInstance(), (LPCTSTR)COLOR_SELECT_DIALOG,
 								 TheEditor->getWindowHandle(), SelectColorDlgProc ) )
 		return &selectedColor;
   else
     return NULL;
 
-}  // end SelectColor
+}
 
 // SelectColorDlgProc =========================================================
 /** Dialog procedure for color selector dialog */
 // ============================================================================
-BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg, 
+BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
                                   WPARAM wParam, LPARAM lParam )
 {
   static HWND hWndScrollColor1;  // red / hue
@@ -294,11 +294,11 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
   static HWND hWndColorBar2;  // green / saturation
   static HWND hWndColorBar3;  // blue / value
   static HWND hWndPreview;
-              
+
   switch (uMsg)  {
 
     // ------------------------------------------------------------------------
-    case WM_INITDIALOG:  
+    case WM_INITDIALOG:
 		{
 
       // save some window handles for later comparing during processing
@@ -310,9 +310,9 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
       hWndColorBar2    = GetDlgItem( hWndDlg, BUTTON_COLORBAR2 );
       hWndColorBar3    = GetDlgItem( hWndDlg, BUTTON_COLORBAR3 );
       hWndPreview = GetDlgItem (hWndDlg, BUTTON_PREVIEW);
-			
+
       // init the scroll bars and labels to the current color
-			if (mode == MODE_HSV)  
+			if (mode == MODE_HSV)
 			{
 				RGBColorReal rgbColor;
 				HSVColorReal hsvColor;
@@ -333,20 +333,20 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
 
 				// set the scroll bars and labels
 				SetScrollPos (hWndScrollColor1, SB_CTL, (Int) hsvColor.hue, TRUE);
-				SetDlgItemInt (hWndDlg, LABEL_COLOR1,   
+				SetDlgItemInt (hWndDlg, LABEL_COLOR1,
 											 (Int) hsvColor.hue, FALSE);
 				SetScrollPos (hWndScrollColor2, SB_CTL, (Int) hsvColor.saturation, TRUE);
-				SetDlgItemInt (hWndDlg, LABEL_COLOR2,   
+				SetDlgItemInt (hWndDlg, LABEL_COLOR2,
 											 (Int) hsvColor.saturation, FALSE);
 				SetScrollPos (hWndScrollColor3, SB_CTL, (Int) hsvColor.value, TRUE);
-				SetDlgItemInt (hWndDlg, LABEL_COLOR3,   
+				SetDlgItemInt (hWndDlg, LABEL_COLOR3,
 											 (Int) hsvColor.value, FALSE);
 				SetScrollPos (hWndScrollAlpha, SB_CTL, (Int) hsvColor.alpha, TRUE);
-				SetDlgItemInt (hWndDlg, LABEL_ALPHA,   
+				SetDlgItemInt (hWndDlg, LABEL_ALPHA,
 											 (Int) hsvColor.alpha, FALSE);
 
-      }  // end if
-      else  
+      }
+      else
 			{
 
         // init the RGB and intensity scroll bar extents
@@ -355,19 +355,19 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
         SendMessage( hWndScrollColor3, SBM_SETRANGE, 1, 255 );
 				SendMessage( hWndScrollAlpha, SBM_SETRANGE, 0, 255 );
         SetScrollPos (hWndScrollColor1, SB_CTL, selectedColor.red, TRUE);
-        SetDlgItemInt (hWndDlg, LABEL_COLOR1,   
+        SetDlgItemInt (hWndDlg, LABEL_COLOR1,
                        selectedColor.red, FALSE);
         SetScrollPos (hWndScrollColor2, SB_CTL, selectedColor.green, TRUE);
-        SetDlgItemInt (hWndDlg, LABEL_COLOR2,   
+        SetDlgItemInt (hWndDlg, LABEL_COLOR2,
                        selectedColor.green, FALSE);
         SetScrollPos (hWndScrollColor3, SB_CTL, selectedColor.blue, TRUE);
-        SetDlgItemInt (hWndDlg, LABEL_COLOR3,   
+        SetDlgItemInt (hWndDlg, LABEL_COLOR3,
                        selectedColor.blue, FALSE);
         SetScrollPos (hWndScrollAlpha, SB_CTL, selectedColor.alpha, TRUE);
-        SetDlgItemInt (hWndDlg, LABEL_ALPHA,   
+        SetDlgItemInt (hWndDlg, LABEL_ALPHA,
                        selectedColor.alpha, FALSE);
 
-      }  // end else
+      }
 
 			//
 			// move the window to the display position, but keep the whole
@@ -377,12 +377,12 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
 
       return TRUE;
 
-    }  // end case WM_INITDIALOG
+    }
 
     // ------------------------------------------------------------------------
     case WM_DRAWITEM:  {
-      UINT idCtl = (UINT) wParam;             // control identifier 
-      LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT) lParam; // item drawing 
+      UINT idCtl = (UINT) wParam;             // control identifier
+      LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT) lParam; // item drawing
       HWND hWndControl;
       RECT rect;
       ICoord2D center;
@@ -393,31 +393,31 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
       GetClientRect (hWndControl, &rect);
       center.x = (rect.right - rect.left) / 2;
       center.y = (rect.bottom - rect.top) / 2;
-      
+
       // record radius we have to work with
       radius = (rect.right - rect.left) / 2;
 
       switch (idCtl)  {
-    
+
         case BUTTON_PREVIEW:  {
           RGBColorReal rgbColor;
           HSVColorReal hsvColor;
           HBRUSH hBrushOld, hBrushNew;
 
           if (mode == MODE_RGB)  {
-            rgbColor.red =   (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, 
+            rgbColor.red =   (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1,
                                                     NULL, FALSE);
-            rgbColor.green = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2, 
+            rgbColor.green = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2,
                                                     NULL, FALSE);
-            rgbColor.blue =  (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3, 
+            rgbColor.blue =  (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3,
                                                     NULL, FALSE);
-          }  // end if
+          }
           else  {
-            hsvColor.hue        = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, 
+            hsvColor.hue        = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1,
                                                          NULL, FALSE);
-            hsvColor.saturation = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2, 
+            hsvColor.saturation = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2,
                                                          NULL, FALSE);
-            hsvColor.value      = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3, 
+            hsvColor.value      = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3,
                                                          NULL, FALSE);
             // convert to ranges 0 - 1 for RGB conversion
             hsvColor.saturation /= 100.0f;
@@ -427,8 +427,8 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
             rgbColor.red   *= 255;
             rgbColor.green *= 255;
             rgbColor.blue  *= 255;
-          }  // end else
-     
+          }
+
           // create a new brush and select it into DC
           hBrushNew = CreateSolidBrush (RGB ((BYTE) rgbColor.red,
                                              (BYTE) rgbColor.green,
@@ -436,7 +436,7 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           hBrushOld = (HBRUSH)SelectObject( lpdis->hDC, hBrushNew );
 
           // draw the rectangle
-          Rectangle (lpdis->hDC, rect.left, rect.top, 
+          Rectangle (lpdis->hDC, rect.left, rect.top,
                      rect.right, rect.bottom);
 
           // put the old brush back and delete the new one
@@ -447,8 +447,8 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           ValidateRect (hWndControl, NULL);
 
           break;
-          
-        }  // end case BUTTON_PREVIEW
+
+        }
 
         // --------------------------------------------------------------------
         // Draw the bar of either HUE or RED next to the scroll bar
@@ -476,13 +476,13 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
             rgbColor.red   *= 255.0f;
             rgbColor.green *= 255.0f;
             rgbColor.blue  *= 255.0f;
-          }  // end if
+          }
           else  {
             rgbColor.red = 0;
             rgbColor.green = 0;
             rgbColor.blue = 0;
-          }  // end else
-          
+          }
+
           // loop through each horizontal line available in the bar drawing
           // the correct color there
           for (x = 0; x < (rect.right - rect.left) - 1;  x++)  {
@@ -500,16 +500,16 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
               rgbColor.red   *= 255;
               rgbColor.green *= 255;
               rgbColor.blue  *= 255;
-            }  // end if
+            }
             else  {
               rgbColor.red += step;
-            }  // end else
-            
-          }  // end for i
+            }
+
+          }
 
           break;
 
-        }  // end case BUTTON_COLORBAR1
+        }
 
         // --------------------------------------------------------------------
         // Draw the bar of either SATURATION or GREEN next to the scroll bar
@@ -530,7 +530,7 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           // compute the first color, create pen for it, and save the
           // original pen
           if (mode == MODE_HSV)  {
-            hsvColor.hue = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, 
+            hsvColor.hue = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1,
                                                   NULL, FALSE);
             hsvColor.saturation = 1.0f / 100.0f;
             hsvColor.value = 1;
@@ -538,13 +538,13 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
             rgbColor.red   *= 255;
             rgbColor.green *= 255;
             rgbColor.blue  *= 255;
-          }  // end if
+          }
           else  {
             rgbColor.red = 0;
             rgbColor.green = 0;
             rgbColor.blue = 0;
-          }  // end else
-          
+          }
+
           // loop through each horizontal line available in the bar drawing
           // the correct color there
           for (x = 0; x < (rect.right - rect.left) - 1;  x++)  {
@@ -562,16 +562,16 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
               rgbColor.red   *= 255;
               rgbColor.green *= 255;
               rgbColor.blue  *= 255;
-            }  // end if
+            }
             else  {
               rgbColor.green += step;
-            }  // end else
-            
-          }  // end for i
+            }
+
+          }
 
           break;
 
-        }  // end case BUTTON_COLORBAR2
+        }
 
         // --------------------------------------------------------------------
         // Draw the bar of either VALUE or BLUE next to the scroll bar
@@ -592,26 +592,26 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           // compute the first color, create pen for it, and save the
           // original pen
           if (mode == MODE_HSV)  {
-            hsvColor.hue = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, 
+            hsvColor.hue = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1,
                                                   NULL, FALSE);
-            hsvColor.saturation = 
+            hsvColor.saturation =
               (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2, NULL, FALSE) / 100.0f;
             hsvColor.value = 1.0f / 100.0f;
             rgbColor = hsvToRGB (hsvColor);
             rgbColor.red   *= 255.0f;
             rgbColor.green *= 255.0f;
             rgbColor.blue  *= 255.0f;
-          }  // end if
+          }
           else  {
             rgbColor.red = 0;
             rgbColor.green = 0;
             rgbColor.blue = 0;
-          }  // end else
-          
+          }
+
           // loop through each horizontal line available in the bar drawing
           // the correct color there
           for (x = 0; x < (rect.right - rect.left) - 1;  x++)  {
-            
+
             // draw a horizontal row of pixels with this color
             for (y = 0; y < rect.bottom; y++)
               SetPixel (lpdis->hDC, x, y, RGB ((BYTE) rgbColor.red,
@@ -625,31 +625,31 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
               rgbColor.red   *= 255;
               rgbColor.green *= 255;
               rgbColor.blue  *= 255;
-            }  // end if
+            }
             else  {
               rgbColor.blue += step;
-            }  // end else
-            
-          }  // end for i
+            }
+
+          }
 
           break;
 
-        }  // end case BUTTON_COLORBAR3
+        }
 
-      }  // end switch
+      }
 
       return TRUE;
 
-    }  // end case WM_DRAWITEM
+    }
 
     // ------------------------------------------------------------------------
     // horizontal scrolling on the color bars
     // ------------------------------------------------------------------------
-    case WM_HSCROLL:  
+    case WM_HSCROLL:
 		{
-      Int  nScrollCode = (Int) LOWORD (wParam);        // scroll bar value 
+      Int  nScrollCode = (Int) LOWORD (wParam);        // scroll bar value
       Short nPos  = (Short) HIWORD (wParam);   // for thumbtrack only
-      HWND hWndScroll = (HWND) lParam;                // handle of scroll bar 
+      HWND hWndScroll = (HWND) lParam;                // handle of scroll bar
       Int  labelID;         // identifier of the text label for this scroll bar
       Int  thumbPos;        // current thumb position
       Int  minPos, maxPos;  // max and min of this scrollbar
@@ -676,34 +676,34 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           if (thumbPos > minPos)
             thumbPos--;
           break;
-        }  // end case SB_LINELEFT
+        }
         case SB_PAGELEFT:  {
           if (thumbPos - 45 >= minPos)
             thumbPos -= 45;
           else
             thumbPos = minPos;
           break;
-        }  // end case SB_PAGELEFT
+        }
         case SB_LINERIGHT:  {
           if (thumbPos < maxPos)
             thumbPos++;
           break;
-        }  // end case SB_LINERIGHT
+        }
         case SB_PAGERIGHT:  {
           if (thumbPos + 45 < maxPos)
             thumbPos += 45;
           else
             thumbPos = maxPos;
           break;
-        }  // end case SB_PAGERIGHT
+        }
         case SB_THUMBTRACK:  {
           thumbPos = nPos;
           break;
-        }  // end case SB_THUBTRACK
+        }
         default:  {
           return 0;
-        }  // end default
-      }  // end switch nScrollCode
+        }
+      }
 
       // set the new scrollbar position and the text with it
       SendMessage (hWndScroll, SBM_SETPOS, (WPARAM) thumbPos, (LPARAM) TRUE);
@@ -714,31 +714,31 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
       if (hWndScroll == hWndScrollColor1 ||
           hWndScroll == hWndScrollColor2 ||
           hWndScroll == hWndScrollColor3 ||
-					hWndScroll == hWndScrollAlpha )  
+					hWndScroll == hWndScrollAlpha )
 			{
 
         RGBColorReal rgbColor;
         HSVColorReal hsvColor;
 
         if (mode == MODE_RGB)  {
-          rgbColor.red =   (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, 
+          rgbColor.red =   (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1,
                                                   NULL, FALSE);
-          rgbColor.green = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2, 
+          rgbColor.green = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2,
                                                   NULL, FALSE);
-          rgbColor.blue =  (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3, 
+          rgbColor.blue =  (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3,
                                                   NULL, FALSE);
-					rgbColor.alpha = (Real) GetDlgItemInt( hWndDlg, LABEL_ALPHA, 
+					rgbColor.alpha = (Real) GetDlgItemInt( hWndDlg, LABEL_ALPHA,
 																								  NULL, FALSE );
 
-        }  // end if
+        }
         else  {
-          hsvColor.hue        = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, 
+          hsvColor.hue        = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1,
                                                        NULL, FALSE);
-          hsvColor.saturation = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2, 
+          hsvColor.saturation = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2,
                                                        NULL, FALSE);
-          hsvColor.value      = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3, 
+          hsvColor.value      = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3,
                                                        NULL, FALSE);
-					hsvColor.alpha			= (Real) GetDlgItemInt( hWndDlg, LABEL_ALPHA, 
+					hsvColor.alpha			= (Real) GetDlgItemInt( hWndDlg, LABEL_ALPHA,
 																											 NULL, FALSE );
 
           // convert to ranges 0 - 1 for RGB conversion
@@ -749,7 +749,7 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           rgbColor.red   *= 255;
           rgbColor.green *= 255;
           rgbColor.blue  *= 255;
-        }  // end else
+        }
 
         // store the color
         selectedColor.red   = (Int) rgbColor.red;
@@ -770,17 +770,17 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
         UpdateWindow (hWndColorBar2);
         UpdateWindow (hWndColorBar3);
 
-      }  // end if, color bar scroll message
-    
+      }
+
       return 0;
 
-    }  // end case WM_HSCROLL
+    }
 
     // ------------------------------------------------------------------------
     case WM_COMMAND:  {
-//      Int wNotifyCode = HIWORD(wParam); // notification code 
+//      Int wNotifyCode = HIWORD(wParam); // notification code
       Int wID = LOWORD(wParam);         // id of control
-//      HWND hWndControl = (HWND) lParam; // handle of control 
+//      HWND hWndControl = (HWND) lParam; // handle of control
 
       switch (wID)  {
 
@@ -791,8 +791,8 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
 
           EndDialog( hWndDlg, TRUE );  // color selected
           break;
-        
-        }  // end case IDOK
+
+        }
 
         // --------------------------------------------------------------------
         case IDCANCEL:  {
@@ -800,7 +800,7 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           EndDialog( hWndDlg, FALSE );  // selection cancelled
           break;
 
-        }  // end case IDCANCEL
+        }
 
         // --------------------------------------------------------------------
         // Change from RGB mode to HSV mode and vice versa
@@ -844,10 +844,10 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
             mode = MODE_HSV;
 
             // change the text for the button
-            SetWindowText (GetDlgItem (hWndDlg, BUTTON_RGB_HSV), 
+            SetWindowText (GetDlgItem (hWndDlg, BUTTON_RGB_HSV),
                            "Switch to RGB");
 
-          }  // end if, switch to HSV
+          }
           else  {  // switch to RGB
             hsvColor.hue = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, NULL, FALSE);
             hsvColor.saturation = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2, NULL, FALSE);
@@ -880,25 +880,25 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
             SetDlgItemInt (hWndDlg, LABEL_COLOR3, (Int) rgbColor.blue, FALSE);
 
             // change the text for the button
-            SetWindowText (GetDlgItem (hWndDlg, BUTTON_RGB_HSV), 
+            SetWindowText (GetDlgItem (hWndDlg, BUTTON_RGB_HSV),
                            "Switch to HSV");
 
             mode = MODE_RGB;
 
-          }  // end else, switch to RGB
+          }
 
           // invalidate all the vertical color bars so they are redrawn
           InvalidateRect (hWndColorBar1, NULL, TRUE);
           InvalidateRect (hWndColorBar2, NULL, TRUE);
           InvalidateRect (hWndColorBar3, NULL, TRUE);
 
-        }  // end case BUTTON_RGB_HSV
+        }
 
-      }  // end switch (LOWORD (wParam))
+      }
 
       return 0;
 
-    } // end case WM_COMMAND
+    }
 
     // ------------------------------------------------------------------------
     // Only hide the window on a close rather than destroy it since it will
@@ -911,6 +911,6 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
     default:
       return 0;  // for all messages that are not processed
 
-  }  // end of switch (uMsg)
+  }
 
-}  // End of SelectColor
+}
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ComboBoxProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ComboBoxProperties.cpp
index 29732ca07ee..4a31019bc94 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ComboBoxProperties.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ComboBoxProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: ComboBoxProperties.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -88,7 +88,7 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -101,7 +101,7 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -153,7 +153,7 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 					StoreColor( COMBOBOX_LISTBOX_DOWN_BUTTON_HILITE, info->color, info->borderColor );
 					StoreColor( COMBOBOX_LISTBOX_SLIDER_HILITE_TOP, info->color, info->borderColor );
 					StoreColor( COMBOBOX_LISTBOX_SLIDER_THUMB_HILITE, info->color, info->borderColor );
-					
+
 					info = GetStateInfo( COMBOBOX_HILITE_SELECTED_ITEM_LEFT );
 					StoreColor( COMBOBOX_DROP_DOWN_BUTTON_HILITE_PUSHED, info->color, info->borderColor );
 					StoreColor( COMBOBOX_EDIT_BOX_HILITE_LEFT, info->color, info->borderColor );
@@ -164,7 +164,7 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 
 					break;
 
-				}  // end case subcontrol color
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -405,7 +405,7 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 								GadgetButtonSetHiliteSelectedColor( upButton, info->color );
 								GadgetButtonSetHiliteSelectedBorderColor( upButton, info->borderColor );
 
-							}  // end if
+							}
 
 							// down button
 							GameWindow *downButton = GadgetListBoxGetDownButton( listBox );
@@ -445,7 +445,7 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 								GadgetButtonSetHiliteSelectedColor( downButton, info->color );
 								GadgetButtonSetHiliteSelectedBorderColor( downButton, info->borderColor );
 
-							}  // end if
+							}
 
 							// slider
 							GameWindow *slider = GadgetListBoxGetSlider( listBox );
@@ -532,15 +532,15 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 								GadgetSliderSetHiliteSelectedThumbColor( slider, info->color );
 								GadgetSliderSetHiliteSelectedThumbBorderColor( slider, info->borderColor );
 
-							}  // end if
-						} // end if (listBox)
+							}
+						}
 						// save specific list data
 						ComboBoxData *comboData = (ComboBoxData *)window->winGetUserData();
-						
+
 						GadgetComboBoxSetIsEditable(window, IsDlgButtonChecked( hWndDialog, CHECK_IS_EDITABLE ));
 						GadgetComboBoxSetAsciiOnly(window, IsDlgButtonChecked( hWndDialog, CHECK_ASCII_TEXT ));
 						GadgetComboBoxSetLettersAndNumbersOnly(window, IsDlgButtonChecked( hWndDialog, CHECK_LETTERS_AND_NUMBERS ));
-	
+
 						// change in the size of the comboBox
 						Int newMaxChars = GetDlgItemInt( hWndDialog, EDIT_MAX_CHARS, NULL, FALSE );
 						if( newMaxChars != comboData->maxChars)
@@ -551,12 +551,12 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 							GadgetComboBoxSetMaxDisplay( window, newMaxDisplay );
 
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -565,13 +565,13 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -580,15 +580,15 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end comboBoxPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -717,7 +717,7 @@ HWND InitComboBoxPropertiesDialog( GameWindow *window )
 		StoreImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 		image = GadgetListBoxGetHiliteSelectedItemImageSmallCenter( listBox );
 		StoreImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-		
+
 
 
 		// --------------------------------------------------------------------------
@@ -758,7 +758,7 @@ HWND InitComboBoxPropertiesDialog( GameWindow *window )
 			borderColor = GadgetButtonGetHiliteSelectedBorderColor( upButton );
 			StoreImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_HILITE_PUSHED, image, color, borderColor );
 
-		}  // end if
+		}
 
 		// --------------------------------------------------------------------------
 		GameWindow *downButton = GadgetListBoxGetDownButton( listBox );
@@ -798,7 +798,7 @@ HWND InitComboBoxPropertiesDialog( GameWindow *window )
 			borderColor = GadgetButtonGetHiliteSelectedBorderColor( downButton );
 			StoreImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_HILITE_PUSHED, image, color, borderColor );
 
-		}  // end if
+		}
 
 		GameWindow *slider = GadgetListBoxGetSlider( listBox );
 		if( slider )
@@ -882,8 +882,8 @@ HWND InitComboBoxPropertiesDialog( GameWindow *window )
 			borderColor = GadgetSliderGetHiliteSelectedThumbBorderColor( slider );
 			StoreImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_HILITE_PUSHED, image, color, borderColor );
 
-		}  // end if
-	
+		}
+
 		GameWindow *dropDownButton = GadgetComboBoxGetDropDownButton( window );
 		if ( dropDownButton )
 		{
@@ -977,7 +977,7 @@ HWND InitComboBoxPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitComboBoxPropertiesDialog
+}
 
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp
index feda0d52897..4f2f38a36a7 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: GenericProperties.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -48,7 +48,6 @@
 #include <assert.h>
 #include <windows.h>
 #include <commctrl.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
@@ -89,7 +88,7 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -99,8 +98,8 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 		// ------------------------------------------------------------------------
 		case WM_DRAWITEM:
 		{
-      UINT controlID = (UINT)wParam;  // control identifier 
-      LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; // item drawing 
+      UINT controlID = (UINT)wParam;  // control identifier
+      LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; // item drawing
 			RGBColorInt *color = GetControlColor( controlID );
 
 			// we only care about color button controls
@@ -136,11 +135,11 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 				// we have taken care of it
 				return TRUE;
 
-			}  // end if
+			}
 
 			return FALSE;
 
-		}  // end draw item
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -148,7 +147,7 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -167,9 +166,9 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 					{
 						RGBColorInt *newColor;
 						POINT mouse;
-						
+
 						GetCursorPos( &mouse );
-						newColor = SelectColor( currColor->red, currColor->green, 
+						newColor = SelectColor( currColor->red, currColor->green,
 																		currColor->blue, currColor->alpha,
 																		mouse.x, mouse.y );
 
@@ -182,13 +181,13 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 							SetControlColor( controlID, newGameColor );
 							InvalidateRect( hWndControl, NULL, TRUE );
 
-						}  // end if
+						}
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end color buttons
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -239,12 +238,12 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 						color = GameMakeColor( rgbColor->red, rgbColor->green, rgbColor->blue, rgbColor->alpha );
 						window->winSetHiliteBorderColor( 0, color );
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -253,13 +252,13 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -268,15 +267,15 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end genericPropertiesCallback
+}
 
 // InitCallbackCombos =========================================================
 /** load the callbacks combo boxes with the functions that the user cal
@@ -300,7 +299,7 @@ void InitCallbackCombos( HWND dialog, GameWindow *window )
 	{
 		SendMessage( combo, CB_ADDSTRING, 0, (LPARAM)entry->name );
 		entry++;
-	}  // end while
+	}
 	SendMessage( combo, CB_INSERTSTRING, 0, (LPARAM)GUIEDIT_NONE_STRING );
 
 	// select the current function of the window in the combo if present
@@ -318,7 +317,7 @@ void InitCallbackCombos( HWND dialog, GameWindow *window )
 	{
 		SendMessage( combo, CB_ADDSTRING, 0, (LPARAM)entry->name );
 		entry++;
-	}  // end while
+	}
 	SendMessage( combo, CB_INSERTSTRING, 0, (LPARAM)GUIEDIT_NONE_STRING );
 
 	// select the current function of the window in the combo if present
@@ -336,7 +335,7 @@ void InitCallbackCombos( HWND dialog, GameWindow *window )
 	{
 		SendMessage( combo, CB_ADDSTRING, 0, (LPARAM)entry->name );
 		entry++;
-	}  // end while
+	}
 	SendMessage( combo, CB_INSERTSTRING, 0, (LPARAM)GUIEDIT_NONE_STRING );
 
 	// select the current function of the window in the combo if present
@@ -354,13 +353,13 @@ void InitCallbackCombos( HWND dialog, GameWindow *window )
 	{
 		SendMessage( combo, CB_ADDSTRING, 0, (LPARAM)entry->name );
 		entry++;
-	}  // end while
+	}
 	entry = TheFunctionLexicon->getTable( FunctionLexicon::TABLE_GAME_WIN_DEVICEDRAW );
 	while( entry && entry ->key != NAMEKEY_INVALID )
 	{
 		SendMessage( combo, CB_ADDSTRING, 0, (LPARAM)entry->name );
 		entry++;
-	}  // end while
+	}
 	SendMessage( combo, CB_INSERTSTRING, 0, (LPARAM)GUIEDIT_NONE_STRING );
 
 	// select the current function of the window in the combo if present
@@ -417,7 +416,7 @@ void InitCallbackCombos( HWND dialog, GameWindow *window )
 	name = TheEditor->getLayoutShutdown();
 	SendMessage( combo, CB_SELECTSTRING, -1, (LPARAM)name.str() );
 
-}  // end InitCallbackCombos
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -445,7 +444,7 @@ HWND InitUserWinPropertiesDialog( GameWindow *window )
 	// initialize the dialog with values from the window
 	//
 
-	// fill out the image combo boxes	
+	// fill out the image combo boxes
 	LoadImageListComboBox( GetDlgItem( dialog, COMBO_ENABLED_IMAGE ) );
 	LoadImageListComboBox( GetDlgItem( dialog, COMBO_DISABLED_IMAGE ) );
 	LoadImageListComboBox( GetDlgItem( dialog, COMBO_HILITE_IMAGE ) );
@@ -455,15 +454,15 @@ HWND InitUserWinPropertiesDialog( GameWindow *window )
 
 	image = window->winGetEnabledImage( 0 );
 	if( image )
-		SendDlgItemMessage( dialog, COMBO_ENABLED_IMAGE, CB_SELECTSTRING, 
+		SendDlgItemMessage( dialog, COMBO_ENABLED_IMAGE, CB_SELECTSTRING,
 												-1, (LPARAM)image->getName().str() );
 	image = window->winGetDisabledImage( 0 );
 	if( image )
-		SendDlgItemMessage( dialog, COMBO_DISABLED_IMAGE, CB_SELECTSTRING, 
+		SendDlgItemMessage( dialog, COMBO_DISABLED_IMAGE, CB_SELECTSTRING,
 												-1, (LPARAM)image->getName().str() );
 	image = window->winGetHiliteImage( 0 );
 	if( image )
-		SendDlgItemMessage( dialog, COMBO_HILITE_IMAGE, CB_SELECTSTRING, 
+		SendDlgItemMessage( dialog, COMBO_HILITE_IMAGE, CB_SELECTSTRING,
 												-1, (LPARAM)image->getName().str() );
 
 	// initialize the color buttons
@@ -479,7 +478,7 @@ HWND InitUserWinPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitUserWinPropertiesDialog
+}
 
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/GridSettings.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/GridSettings.cpp
index b8d93ee6980..ea0b71c3123 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/GridSettings.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/GridSettings.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: GridSettings.cpp /////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -78,10 +78,10 @@ static void initGridSettings( HWND hWndDialog )
 {
 
 	// set resolution
-	SetDlgItemInt( hWndDialog, EDIT_RESOLUTION, 
+	SetDlgItemInt( hWndDialog, EDIT_RESOLUTION,
 								 TheEditor->getGridResolution(), FALSE );
 
-	// check box for on/off 
+	// check box for on/off
 	if( TheEditor->isGridVisible() == TRUE )
 		CheckDlgButton( hWndDialog, CHECK_VISIBLE, BST_CHECKED );
 
@@ -96,12 +96,12 @@ static void initGridSettings( HWND hWndDialog )
 	RGBColorInt *color = TheEditor->getGridColor();
 	gridColor = *color;
 
-}  // end initGridSettings
+}
 
 // GridSettingsDialogProc =====================================================
 /** Dialog procedure for grid settings dialog */
 //=============================================================================
-BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message, 
+BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 																			WPARAM wParam, LPARAM lParam )
 {
 
@@ -116,13 +116,13 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 			initGridSettings( hWndDialog );
 			return TRUE;
 
-		}  // end init dialog
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_DRAWITEM:
 		{
-      UINT controlID = (UINT)wParam;  // control identifier 
-      LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; // item drawing 
+      UINT controlID = (UINT)wParam;  // control identifier
+      LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; // item drawing
 			RGBColorInt *color = &gridColor;
 
 			// we only care about color button controls
@@ -158,11 +158,11 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 				// we have taken care of it
 				return TRUE;
 
-			}  // end if
+			}
 
 			return FALSE;
 
-		}  // end draw item
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -184,9 +184,9 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 					{
 						RGBColorInt *newColor;
 						POINT mouse;
-						
+
 						GetCursorPos( &mouse );
-						newColor = SelectColor( currColor->red, currColor->green, 
+						newColor = SelectColor( currColor->red, currColor->green,
 																		currColor->blue, currColor->alpha,
 																		mouse.x, mouse.y );
 
@@ -196,13 +196,13 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 							gridColor = *newColor;
 							InvalidateRect( hWndControl, NULL, TRUE );
 
-						}  // end if
+						}
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end color buttons
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -229,7 +229,7 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 
           break;
 
-				}  // end ok
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -238,13 +238,13 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 					EndDialog( hWndDialog, FALSE );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -253,13 +253,13 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 			EndDialog( hWndDialog, FALSE );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end GridSettingsDialogProc
+}
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ListboxProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ListboxProperties.cpp
index d6d9e25ec0f..7d73dea2097 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ListboxProperties.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ListboxProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: ListboxProperties.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -135,7 +135,7 @@ static void addScrollbar( GameWindow *listbox )
 		info = TheDefaultScheme->getImageAndColor( LISTBOX_UP_BUTTON_HILITE_PUSHED );
 		GadgetButtonSetHiliteSelectedImage( upButton, info->image );
 
-	}  // end if
+	}
 
 	GameWindow *downButton = GadgetListBoxGetDownButton( listbox );
 	if( downButton )
@@ -156,7 +156,7 @@ static void addScrollbar( GameWindow *listbox )
 		info = TheDefaultScheme->getImageAndColor( LISTBOX_DOWN_BUTTON_HILITE_PUSHED );
 		GadgetButtonSetHiliteSelectedImage( downButton, info->image );
 
-	}  // end if
+	}
 
 	GameWindow *slider = GadgetListBoxGetSlider( listbox );
 	if( slider )
@@ -211,9 +211,9 @@ static void addScrollbar( GameWindow *listbox )
 		info = TheDefaultScheme->getImageAndColor( LISTBOX_SLIDER_THUMB_HILITE_PUSHED );
 		GadgetSliderSetHiliteSelectedThumbImage( slider, info->image );
 
-	}  // end if, slider
+	}
 
-}  // end addScrollbar
+}
 
 // removeScrollbar ============================================================
 /** Remove all scrollbar constructs froma listbox that has it already */
@@ -237,7 +237,7 @@ static void removeScrollbar( GameWindow *listbox )
 	// remove the scrollbar flag from the listbox data
 	listData->scrollBar = FALSE;
 
-}  // end removeScrollbar
+}
 
 // resizeMaxItems =============================================================
 /** Change the max items that a listbox can accomodate */
@@ -248,7 +248,7 @@ static void resizeMaxItems( GameWindow *listbox, UnsignedInt newMaxItems )
 
 
 
-}  // end resizeMaxItems
+}
 
 // listboxPropertiesCallback ==================================================
 /** Dialog callback for properties */
@@ -265,7 +265,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -278,7 +278,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -318,7 +318,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 					StoreColor( LISTBOX_DOWN_BUTTON_HILITE, info->color, info->borderColor );
 					StoreColor( LISTBOX_SLIDER_HILITE_TOP, info->color, info->borderColor );
 					StoreColor( LISTBOX_SLIDER_THUMB_HILITE, info->color, info->borderColor );
-					
+
 					info = GetStateInfo( LISTBOX_HILITE_SELECTED_ITEM_LEFT );
 					StoreColor( LISTBOX_UP_BUTTON_HILITE_PUSHED, info->color, info->borderColor );
 					StoreColor( LISTBOX_DOWN_BUTTON_HILITE_PUSHED, info->color, info->borderColor );
@@ -326,7 +326,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 
 					break;
 
-				}  // end case subcontrol color
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -432,7 +432,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 							GadgetButtonSetHiliteSelectedColor( upButton, info->color );
 							GadgetButtonSetHiliteSelectedBorderColor( upButton, info->borderColor );
 
-						}  // end if
+						}
 
 						// down button
 						GameWindow *downButton = GadgetListBoxGetDownButton( window );
@@ -472,7 +472,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 							GadgetButtonSetHiliteSelectedColor( downButton, info->color );
 							GadgetButtonSetHiliteSelectedBorderColor( downButton, info->borderColor );
 
-						}  // end if
+						}
 
 						// slider
 						GameWindow *slider = GadgetListBoxGetSlider( window );
@@ -559,7 +559,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 							GadgetSliderSetHiliteSelectedThumbColor( slider, info->color );
 							GadgetSliderSetHiliteSelectedThumbBorderColor( slider, info->borderColor );
 
-						}  // end if
+						}
 
 						// save specific list data
 						ListboxData *listData = (ListboxData *)window->winGetUserData();
@@ -597,7 +597,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 
 						// Multi-column
 						Int newColumns = GetDlgItemInt( hWndDialog, EDIT_NUM_COLUMNS,NULL,FALSE);
-						
+
 						if(newColumns > 1)
 						{
 							Char percentages[200];
@@ -607,13 +607,13 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 								MessageBox(NULL,"You have specified a column amount greater then 1, please enter the same about of percentages","whoops",MB_OK | MB_ICONSTOP | MB_APPLMODAL);
 								break;
 							}
-														
+
 							Int *newPercentages = new Int[newColumns];
 							Int i = 0;
 							Int total = 0;
 							Char *token = strtok( percentages, "," );
 							while( token != NULL )
-							{			
+							{
 								newPercentages[i] = atoi(token);
 								total += newPercentages[i];
 								token = strtok( NULL, "," );
@@ -642,17 +642,17 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 									delete[] newPercentages;
 									return 0;
 								}
-							}						
+							}
 							listData->columnWidthPercentage = newPercentages;
 						}
 						listData->columns = newColumns;
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -661,13 +661,13 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -676,15 +676,15 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end listboxPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -804,7 +804,7 @@ HWND InitListboxPropertiesDialog( GameWindow *window )
 		borderColor = GadgetButtonGetHiliteSelectedBorderColor( upButton );
 		StoreImageAndColor( LISTBOX_UP_BUTTON_HILITE_PUSHED, image, color, borderColor );
 
-	}  // end if
+	}
 
 	// --------------------------------------------------------------------------
 	GameWindow *downButton = GadgetListBoxGetDownButton( window );
@@ -844,7 +844,7 @@ HWND InitListboxPropertiesDialog( GameWindow *window )
 		borderColor = GadgetButtonGetHiliteSelectedBorderColor( downButton );
 		StoreImageAndColor( LISTBOX_DOWN_BUTTON_HILITE_PUSHED, image, color, borderColor );
 
-	}  // end if
+	}
 
 	GameWindow *slider = GadgetListBoxGetSlider( window );
 	if( slider )
@@ -928,7 +928,7 @@ HWND InitListboxPropertiesDialog( GameWindow *window )
 		borderColor = GadgetSliderGetHiliteSelectedThumbBorderColor( slider );
 		StoreImageAndColor( LISTBOX_SLIDER_THUMB_HILITE_PUSHED, image, color, borderColor );
 
-	}  // end if
+	}
 
 	// init listbox specific property section
 	ListboxData *listData = (ListboxData *)window->winGetUserData();
@@ -948,8 +948,8 @@ HWND InitListboxPropertiesDialog( GameWindow *window )
 		sprintf(percentages,"%d",listData->columnWidthPercentage[0]);
 		for(Int i = 1; i < listData->columns; i++ )
 		{
-			strcat(percentages,",");
-			strcat(percentages,itoa(listData->columnWidthPercentage[i],tempStr,10));
+			strlcat(percentages, ",", ARRAY_SIZE(percentages));
+			strlcat(percentages, itoa(listData->columnWidthPercentage[i],tempStr,10), ARRAY_SIZE(percentages));
 		}
 		SetDlgItemText(dialog,EDIT_COLUMN_PERCENT,percentages);
 
@@ -968,7 +968,7 @@ HWND InitListboxPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitListboxPropertiesDialog
+}
 
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/NewLayoutDialog.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/NewLayoutDialog.cpp
index ee4b5279911..8f3206df8f2 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/NewLayoutDialog.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/NewLayoutDialog.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: NewLayoutDialog.cpp //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -77,13 +77,13 @@ static void initNewLayoutDialog( HWND hWndDialog )
 	// set default keyboard focus
 	SetFocus( GetDlgItem( hWndDialog, IDOK ) );
 
-}  // end initNewLayoutDialog
+}
 
 // NewLayoutDialogProc ========================================================
 /** Dialog procedure for the new layout dialog when starting an entire
 	* new layout in the editor */
 //=============================================================================
-LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message, 
+LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message,
 																			WPARAM wParam, LPARAM lParam )
 {
 
@@ -98,7 +98,7 @@ LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message,
 			initNewLayoutDialog( hWndDialog );
 			return FALSE;
 
-		}  // end init dialog
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -119,7 +119,7 @@ LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message,
 
           break;
 
-				}  // end ok
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -128,13 +128,13 @@ LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message,
 					EndDialog( hWndDialog, FALSE );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -143,13 +143,13 @@ LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message,
 			EndDialog( hWndDialog, FALSE );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end NewLayoutDialogProc
+}
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ProgressBarProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ProgressBarProperties.cpp
index 0bb5210613c..9692ada0d91 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ProgressBarProperties.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ProgressBarProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: ProgressBarProperties.cpp ////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -80,7 +80,7 @@ static LRESULT CALLBACK progressBarPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -93,7 +93,7 @@ static LRESULT CALLBACK progressBarPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -181,12 +181,12 @@ static LRESULT CALLBACK progressBarPropertiesCallback( HWND hWndDialog,
 						info = GetStateInfo( PROGRESS_BAR_HILITE_BAR_SMALL_CENTER );
 						GadgetProgressBarSetHiliteBarImageSmallCenter( window, info->image );
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -195,13 +195,13 @@ static LRESULT CALLBACK progressBarPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -210,15 +210,15 @@ static LRESULT CALLBACK progressBarPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end progressBarPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -327,7 +327,7 @@ HWND InitProgressBarPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitProgressBarPropertiesDialog
+}
 
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/PushButtonProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/PushButtonProperties.cpp
index c2842d3c97a..4b34062e485 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/PushButtonProperties.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/PushButtonProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: PushButtonProperties.cpp /////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -80,7 +80,7 @@ static LRESULT CALLBACK pushButtonPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -93,7 +93,7 @@ static LRESULT CALLBACK pushButtonPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -151,12 +151,12 @@ static LRESULT CALLBACK pushButtonPropertiesCallback( HWND hWndDialog,
 						if( IsDlgButtonChecked( hWndDialog, CHECK_RIGHT_CLICK ) )
 							window->winSetStatus( bit );
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -165,13 +165,13 @@ static LRESULT CALLBACK pushButtonPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -180,15 +180,15 @@ static LRESULT CALLBACK pushButtonPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end pushButtonPropertiesCallback
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -260,7 +260,7 @@ HWND InitPushButtonPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitPushButtonPropertiesDialog
+}
 
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp
index be6d0de3a79..762e869b3ed 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: RadioButtonProperties.cpp ////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -45,7 +45,6 @@
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/NameKeyGenerator.h"
@@ -87,7 +86,7 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -100,7 +99,7 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -111,7 +110,7 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
 					SetDlgItemInt( hWndDialog, COMBO_GROUP, 0, FALSE );
 					break;
 
-				}  // end clear group
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -159,7 +158,7 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
 						GadgetRadioSetDisabledCheckedBoxImage( window, info->image );
 						GadgetRadioSetDisabledCheckedBoxColor( window, info->color );
 						GadgetRadioSetDisabledCheckedBoxBorderColor( window, info->borderColor );
-						
+
 						// ----------------------------------------------------------------
 						info = GetStateInfo( RADIO_HILITE );
 						GadgetRadioSetHiliteImage( window, info->image );
@@ -178,15 +177,15 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
 
 						// save group
 						Int group = GetDlgItemInt( hWndDialog, COMBO_GROUP, NULL, FALSE );
-						Int screen = TheNameKeyGenerator->nameToKey( AsciiString(TheEditor->getSaveFilename()) );
+						Int screen = TheNameKeyGenerator->nameToKey( TheEditor->getSaveFilename() );
 						GadgetRadioSetGroup( window, group, screen );
-																	
-					}  // end if
+
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -195,13 +194,13 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -210,15 +209,15 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end radioButtonPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -252,7 +251,7 @@ static void loadExistingGroupsCombo( HWND combo, GameWindow *window )
 		if( SendMessage( combo, CB_FINDSTRINGEXACT, -1, (LPARAM)buffer ) == CB_ERR )
 			SendMessage( combo, CB_ADDSTRING, 0, (LPARAM)buffer );
 
-	}  // end if
+	}
 
 	// search our children
 	GameWindow *child;
@@ -261,8 +260,8 @@ static void loadExistingGroupsCombo( HWND combo, GameWindow *window )
 
 	// search the next in line
 	loadExistingGroupsCombo( combo, window->winGetNext() );
-	
-}  // end loadExistingGroupsCombo
+
+}
 
 // InitRadioButtonPropertiesDialog ============================================
 /** Bring up the radio button properties dialog */
@@ -355,7 +354,7 @@ HWND InitRadioButtonPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitRadioButtonPropertiesDialog
+}
 
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/SliderProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/SliderProperties.cpp
index bed60eb76f0..a02474ed9c6 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/SliderProperties.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/SliderProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: SliderProperties.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -81,7 +81,7 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -94,7 +94,7 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -127,7 +127,7 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 						StoreColor( VSLIDER_THUMB_HILITE, info->color, info->borderColor );
 						StoreColor( VSLIDER_THUMB_HILITE_PUSHED, info->borderColor, info->color );
 
-					}  // end if, vertical slider
+					}
 					else
 					{
 
@@ -143,11 +143,11 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 						StoreColor( HSLIDER_THUMB_HILITE, info->color, info->borderColor );
 						StoreColor( HSLIDER_THUMB_HILITE_PUSHED, info->borderColor, info->color );
 
-					}  // end else horizontal slider
+					}
 
 					break;
 
-				}  // end case subcontrol color
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -172,20 +172,20 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 							GadgetSliderSetEnabledImageTop( window, info->image );
 							GadgetSliderSetEnabledColor( window, info->color );
 							GadgetSliderSetEnabledBorderColor( window, info->borderColor );
-						
+
 							info = GetStateInfo( VSLIDER_ENABLED_BOTTOM );
 							GadgetSliderSetEnabledImageBottom( window, info->image );
-						}  // end if
+						}
 						else
 						{
 							info = GetStateInfo( HSLIDER_ENABLED_LEFT );
 							GadgetSliderSetEnabledImageLeft( window, info->image );
 							GadgetSliderSetEnabledColor( window, info->color );
 							GadgetSliderSetEnabledBorderColor( window, info->borderColor );
-							
+
 							info = GetStateInfo( HSLIDER_ENABLED_RIGHT );
 							GadgetSliderSetEnabledImageRight( window, info->image );
-						}  // end else
+						}
 
 						info = GetStateInfo( vert ? VSLIDER_ENABLED_CENTER : HSLIDER_ENABLED_CENTER );
 						GadgetSliderSetEnabledImageCenter( window, info->image );
@@ -200,20 +200,20 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 							GadgetSliderSetDisabledImageTop( window, info->image );
 							GadgetSliderSetDisabledColor( window, info->color );
 							GadgetSliderSetDisabledBorderColor( window, info->borderColor );
-						
+
 							info = GetStateInfo( VSLIDER_DISABLED_BOTTOM );
 							GadgetSliderSetDisabledImageBottom( window, info->image );
-						}  // end if
+						}
 						else
 						{
 							info = GetStateInfo( HSLIDER_DISABLED_LEFT );
 							GadgetSliderSetDisabledImageLeft( window, info->image );
 							GadgetSliderSetDisabledColor( window, info->color );
 							GadgetSliderSetDisabledBorderColor( window, info->borderColor );
-							
+
 							info = GetStateInfo( HSLIDER_DISABLED_RIGHT );
 							GadgetSliderSetDisabledImageRight( window, info->image );
-						}  // end else
+						}
 
 						info = GetStateInfo( vert ? VSLIDER_DISABLED_CENTER : HSLIDER_DISABLED_CENTER );
 						GadgetSliderSetDisabledImageCenter( window, info->image );
@@ -228,20 +228,20 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 							GadgetSliderSetHiliteImageTop( window, info->image );
 							GadgetSliderSetHiliteColor( window, info->color );
 							GadgetSliderSetHiliteBorderColor( window, info->borderColor );
-						
+
 							info = GetStateInfo( VSLIDER_HILITE_BOTTOM );
 							GadgetSliderSetHiliteImageBottom( window, info->image );
-						}  // end if
+						}
 						else
 						{
 							info = GetStateInfo( HSLIDER_HILITE_LEFT );
 							GadgetSliderSetHiliteImageLeft( window, info->image );
 							GadgetSliderSetHiliteColor( window, info->color );
 							GadgetSliderSetHiliteBorderColor( window, info->borderColor );
-							
+
 							info = GetStateInfo( HSLIDER_HILITE_RIGHT );
 							GadgetSliderSetHiliteImageRight( window, info->image );
-						}  // end else
+						}
 
 						info = GetStateInfo( vert ? VSLIDER_HILITE_CENTER : HSLIDER_HILITE_CENTER );
 						GadgetSliderSetHiliteImageCenter( window, info->image );
@@ -295,17 +295,17 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 							sliderData->minVal = sliderData->maxVal;
 							sliderData->maxVal = temp;
 
-							MessageBox( NULL, "Slider min greated than max, the values were swapped", 
+							MessageBox( NULL, "Slider min greated than max, the values were swapped",
 													"Warning", MB_OK | MB_ICONINFORMATION );
 
-						}  // end if
+						}
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -314,13 +314,13 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -329,15 +329,15 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end sliderPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -478,7 +478,7 @@ HWND InitSliderPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitSliderPropertiesDialog
+}
 
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/StaticTextProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/StaticTextProperties.cpp
index d56f752fb26..2fd0bec921e 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/StaticTextProperties.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/StaticTextProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: StaticTextProperties.cpp /////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -84,7 +84,7 @@ static LRESULT CALLBACK staticTextPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -97,7 +97,7 @@ static LRESULT CALLBACK staticTextPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -112,7 +112,7 @@ static LRESULT CALLBACK staticTextPropertiesCallback( HWND hWndDialog,
 						SetDlgItemText( hWndDialog, BUTTON_CENTERED, "No" );
 					break;
 
-				}  // end centered
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -150,13 +150,13 @@ static LRESULT CALLBACK staticTextPropertiesCallback( HWND hWndDialog,
 						// text data
 						TextData *textData = (TextData *)window->winGetUserData();
 						textData->centered = currCentered;
-						
-					}  // end if
+
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -165,13 +165,13 @@ static LRESULT CALLBACK staticTextPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -180,15 +180,15 @@ static LRESULT CALLBACK staticTextPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end staticTextPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -248,10 +248,10 @@ HWND InitStaticTextPropertiesDialog( GameWindow *window )
 
 	// select the button enabled state for display
 	SwitchToState( STATIC_TEXT_ENABLED, dialog );
-	
+
 	return dialog;
 
-}  // end InitStaticTextPropertiesDialog
+}
 
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp
index 2ca21c5022e..07b2c4da465 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp	
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -44,7 +44,6 @@
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/NameKeyGenerator.h"
@@ -105,7 +104,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -118,7 +117,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -182,7 +181,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 						GadgetTabControlSetEnabledBorderColorBackground( tabControl, info->borderColor );
 
 
-					
+
 						info = GetStateInfo( TC_TAB_0_DISABLED );
 						GadgetTabControlSetDisabledImageTabZero( tabControl, info->image );
 						GadgetTabControlSetDisabledColorTabZero( tabControl, info->color );
@@ -229,7 +228,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 						GadgetTabControlSetDisabledBorderColorBackground( tabControl, info->borderColor );
 
 
-						
+
 
 						info = GetStateInfo( TC_TAB_0_HILITE );
 						GadgetTabControlSetHiliteImageTabZero( tabControl, info->image );
@@ -276,7 +275,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 						GadgetTabControlSetHiliteColorBackground( tabControl, info->color );
 						GadgetTabControlSetHiliteBorderColorBackground( tabControl, info->borderColor );
 
-					
+
 						TabControlData *tabData = (TabControlData *)tabControl->winGetUserData();
 
 						tabData->tabWidth = GetDlgItemInt( hWndDialog, TAB_WIDTH, NULL, FALSE );
@@ -343,12 +342,12 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 						GadgetTabControlShowSubPane( tabControl, tabData->activeTab );
 						GadgetTabControlUpdatePaneNames( tabControl );
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -357,13 +356,13 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -372,15 +371,15 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end tabControlPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -458,7 +457,7 @@ HWND InitTabControlPropertiesDialog( GameWindow *tabControl )
 	StoreImageAndColor( TAB_CONTROL_ENABLED, image, color, borderColor );
 
 
-	
+
 	image = GadgetTabControlGetDisabledImageTabZero( tabControl );
 	color = GadgetTabControlGetDisabledColorTabZero( tabControl );
 	borderColor = GadgetTabControlGetDisabledBorderColorTabZero( tabControl );
@@ -505,7 +504,7 @@ HWND InitTabControlPropertiesDialog( GameWindow *tabControl )
 	StoreImageAndColor( TAB_CONTROL_DISABLED, image, color, borderColor );
 
 
-	
+
 	image = GadgetTabControlGetHiliteImageTabZero( tabControl );
 	color = GadgetTabControlGetHiliteColorTabZero( tabControl );
 	borderColor = GadgetTabControlGetHiliteBorderColorTabZero( tabControl );
@@ -616,7 +615,7 @@ HWND InitTabControlPropertiesDialog( GameWindow *tabControl )
 
 	return dialog;
 
-}  // end InitTabControlPropertiesDialog
+}
 
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TextEntryProperties.cpp b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TextEntryProperties.cpp
index 387b39fa4ea..2d8b21d0188 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TextEntryProperties.cpp	
+++ b/Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TextEntryProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: TextEntryProperties.cpp //////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -80,7 +80,7 @@ static LRESULT CALLBACK textEntryPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -93,7 +93,7 @@ static LRESULT CALLBACK textEntryPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -160,28 +160,28 @@ static LRESULT CALLBACK textEntryPropertiesCallback( HWND hWndDialog,
 							entryData->alphaNumericalOnly = TRUE;
 							entryData->numericalOnly = FALSE;
 
-						}  // end if
+						}
 						else if( IsDlgButtonChecked( hWndDialog, RADIO_NUMBERS ) )
 						{
 
 							entryData->alphaNumericalOnly = FALSE;
 							entryData->numericalOnly = TRUE;
 
-						}  // end else if
+						}
 						else
 						{
 
 							entryData->alphaNumericalOnly = FALSE;
 							entryData->numericalOnly = FALSE;
 
-						}  // end else
+						}
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -190,13 +190,13 @@ static LRESULT CALLBACK textEntryPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -205,15 +205,15 @@ static LRESULT CALLBACK textEntryPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end textEntryPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -294,7 +294,7 @@ HWND InitTextEntryPropertiesDialog( GameWindow *window )
 		CheckDlgButton( dialog, RADIO_LETTERS_AND_NUMBERS, BST_CHECKED );
 	else
 		CheckDlgButton( dialog, RADIO_ANY_TEXT, BST_CHECKED );
-	
+
 	// select the button enabled state for display
 	SwitchToState( TEXT_ENTRY_ENABLED_LEFT, dialog );
 
@@ -304,7 +304,7 @@ HWND InitTextEntryPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitTextEntryPropertiesDialog
+}
 
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp b/Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp
index 2bc66a9a156..fcef3393402 100644
--- a/Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp
+++ b/Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp
@@ -24,12 +24,12 @@
 
 // FILE: EditWindow.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,10 +45,10 @@
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
+#include "Common/FramePacer.h"
 #include "GameClient/Display.h"
 #include "GameClient/GameWindowManager.h"
 #include "W3DDevice/GameClient/W3DFileSystem.h"
@@ -87,10 +87,10 @@ EditWindow *TheEditWindow = NULL;  ///< edit window singleton
 // editProc ===================================================================
 /** Window procedure for the edit window */
 //=============================================================================
-LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message, 
+LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 																			 WPARAM wParam, LPARAM lParam )
 {
-	
+
 	switch( message )
 	{
 
@@ -101,15 +101,15 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 
 			if( TheEditWindow )
 			{
-			
+
 				if( timerID == TIMER_EDIT_WINDOW_PULSE )
 					TheEditWindow->updatePulse();
 
-			}  // end if
+			}
 
 			return 0;
 
-		}  // end timer
+		}
 
 		//-------------------------------------------------------------------------
 		case WM_MOUSEMOVE:
@@ -124,7 +124,7 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 			TheEditWindow->mouseEvent( message, wParam, lParam );
 			return 0;
 
-		}  // end mouse events
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_COMMAND:
@@ -168,11 +168,11 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 					// create new window at that location
 					switch( controlID )
 					{
-						
+
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_WINDOW:
-							TheEditor->newWindow( GWS_USER_WINDOW, 
-																		window, pos.x, pos.y, 
+							TheEditor->newWindow( GWS_USER_WINDOW,
+																		window, pos.x, pos.y,
 																		15 * TheEditor->getGridResolution(),
 																		15 * TheEditor->getGridResolution() );
 							break;
@@ -180,15 +180,15 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_PUSH_BUTTON:
 							TheEditor->newWindow( GWS_PUSH_BUTTON,
-																		window, pos.x, pos.y, 
-																		15 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		15 * TheEditor->getGridResolution(),
 																		3 * TheEditor->getGridResolution() );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_CHECK_BOX:
 							TheEditor->newWindow( GWS_CHECK_BOX,
-																		window, pos.x, pos.y, 
+																		window, pos.x, pos.y,
 																		15 * TheEditor->getGridResolution(),
 																		3 * TheEditor->getGridResolution() );
 							break;
@@ -196,72 +196,72 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_RADIO_BUTTON:
 							TheEditor->newWindow( GWS_RADIO_BUTTON,
-																		window, pos.x, pos.y, 
-																		15 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		15 * TheEditor->getGridResolution(),
 																		3 * TheEditor->getGridResolution() );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_TAB_CONTROL:
 							TheEditor->newWindow( GWS_TAB_CONTROL,
-																		window, pos.x, pos.y, 
-																		45 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		45 * TheEditor->getGridResolution(),
 																		30 * TheEditor->getGridResolution() );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_LISTBOX:
 							TheEditor->newWindow( GWS_SCROLL_LISTBOX,
-																		window, pos.x, pos.y, 
-																		20 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		20 * TheEditor->getGridResolution(),
 																		20 * TheEditor->getGridResolution() );
 							break;
-						
+
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_COMBO_BOX:
 							TheEditor->newWindow( GWS_COMBO_BOX,
-																		window, pos.x, pos.y, 
-																		15 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		15 * TheEditor->getGridResolution(),
 																		3 * TheEditor->getGridResolution() );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_HORIZONTAL_SLIDER:
 							TheEditor->newWindow( GWS_HORZ_SLIDER,
-																		window, pos.x, pos.y, 
-																		20 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		20 * TheEditor->getGridResolution(),
 																		GADGET_SIZE );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_VERTICAL_SLIDER:
 							TheEditor->newWindow( GWS_VERT_SLIDER,
-																		window, pos.x, pos.y, 
-																		GADGET_SIZE, 
+																		window, pos.x, pos.y,
+																		GADGET_SIZE,
 																		20 * TheEditor->getGridResolution() );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_PROGRESS_BAR:
 							TheEditor->newWindow( GWS_PROGRESS_BAR,
-																		window, pos.x, pos.y, 
-																		40 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		40 * TheEditor->getGridResolution(),
 																		GADGET_SIZE );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_TEXT_ENTRY:
 							TheEditor->newWindow( GWS_ENTRY_FIELD,
-																		window, pos.x, pos.y, 
-																		20 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		20 * TheEditor->getGridResolution(),
 																		25 );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_STATIC_TEXT:
 							TheEditor->newWindow( GWS_STATIC_TEXT,
-																		window, pos.x, pos.y, 
-																		15 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		15 * TheEditor->getGridResolution(),
 																		15 * TheEditor->getGridResolution() );
 							break;
 
@@ -281,31 +281,31 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 								InitPropertiesDialog( window, pos.x, pos.y );
 							break;
 
-					}  // end switch
+					}
 
 					break;
 
-				}  // end new window
+				}
 
-			}  // end switch on control id
+			}
 
 			return 0;
 
-		}  // end command
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 		{
-			
+
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch( message )
+	}
 
 	return DefWindowProc( hWnd, message, wParam, lParam );
 
-}  // end editProc
+}
 
 // EditWindow::registerEditWindowClass ========================================
 /** Register a class with the windows OS for an edit window */
@@ -316,7 +316,7 @@ void EditWindow::registerEditWindowClass( void )
 	ATOM atom;
 	HINSTANCE hInst = TheEditor->getInstance();
 
-	wcex.cbSize = sizeof( WNDCLASSEX ); 
+	wcex.cbSize = sizeof( WNDCLASSEX );
 
 	wcex.style					= CS_HREDRAW | CS_VREDRAW;
 	wcex.lpfnWndProc		= (WNDPROC)editProc;
@@ -331,12 +331,12 @@ void EditWindow::registerEditWindowClass( void )
 	wcex.hIconSm				= LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL);
 
 	atom = RegisterClassEx( &wcex );
-	
+
 	// if successfully registered we don't ever need to do this again
 	if( atom != 0 )
 		m_classRegistered = TRUE;
 
-}  // end registerEditWindowClass
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -391,7 +391,7 @@ EditWindow::EditWindow( void )
 	m_clipRegion.hi.y = 0;
 	m_isClippedEnabled = FALSE;
 
-}  // end EditWindow
+}
 
 // EditWindow::~EditWindow ====================================================
 /** */
@@ -402,7 +402,7 @@ EditWindow::~EditWindow( void )
 	// call the shutdown
 	shutdown();
 
-}  // end ~EditWindow
+}
 
 // EditWindow::init ===========================================================
 /** Initialize the edit window */
@@ -472,7 +472,7 @@ void EditWindow::init( UnsignedInt clientWidth, UnsignedInt clientHeight )
 		shutdown();
 		return;
 
-	}  // end if
+	}
 
 	// create asset manager
 	m_assetManager = new WW3DAssetManager;
@@ -485,7 +485,7 @@ void EditWindow::init( UnsignedInt clientWidth, UnsignedInt clientHeight )
 	// set a timer for updating visual pulse drawing
 	SetTimer( m_editWindowHWnd, TIMER_EDIT_WINDOW_PULSE, 5, NULL );
 
-}  // end init
+}
 
 // EditWindow::shutdown =======================================================
 /** Shutdown edit window */
@@ -500,6 +500,7 @@ void EditWindow::shutdown( void )
 	// delete asset manager
 	m_assetManager->Free_Assets();
 	delete m_assetManager;
+	m_assetManager = NULL;
 
 	// shutdown WW3D
 	WW3D::Shutdown();
@@ -518,7 +519,7 @@ void EditWindow::shutdown( void )
 	UnregisterClass( m_className, TheEditor->getInstance() );
 	m_classRegistered = FALSE;
 
-}  // EditWindowShutdown
+}
 
 // EditWindow::updatePulse ====================================================
 /** Update pulse from timer message */
@@ -536,15 +537,15 @@ void EditWindow::updatePulse( void )
 		m_pulse += stepSize;
 		if( m_pulse >= pulseMax )
 			dir = 0;
-	}  // end if
+	}
 	else
 	{
 		m_pulse -= stepSize;
 		if( m_pulse <= pulseMin )
 			dir = 1;
-	}  // end else
+	}
 
-}  // end updatePulse
+}
 
 // EditWindow::mouseEvent =====================================================
 /** A mouse event has occurred from our window procedure */
@@ -579,7 +580,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 		if( mousePrint.y > m_size.y )
 			mousePrint.y = m_size.y;
 
-		sprintf( buffer, "Mouse Location (X = %d, Y = %d)", 
+		sprintf( buffer, "Mouse Location (X = %d, Y = %d)",
 						 mousePrint.x, mousePrint.y );
 		TheEditor->statusMessage( STATUS_MOUSE_COORDS, buffer );
 
@@ -587,20 +588,20 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 		if( GetFocus() != TheEditor->getWindowHandle() )
 			SetFocus( TheEditor->getWindowHandle() );
 
-	}  // end if
+	}
 
 	//
-	// if we're in test mode just pump all input through to the 
+	// if we're in test mode just pump all input through to the
 	// window system so we can see how everything acts
 	//
 	if( TheEditor->getMode() == MODE_TEST_RUN )
 	{
 		if( TheWin32Mouse )
 			TheWin32Mouse->addWin32Event( windowsMessage, wParam, lParam, NO_TIME_FROM_WINDOWS);
-		
+
 		return;
 
-	}  // end if
+	}
 
 	//
 	// If we're in the keyboard move, ignore the mouse
@@ -619,7 +620,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 			//
 			// this is really stupid, but the tree controls just don't
 			// give enough hooks into all the events we need ... it's possible
-			// to be in drag and drop mode due to menus opening up and the 
+			// to be in drag and drop mode due to menus opening up and the
 			// user clicking on blank area etc.  So if the mouse is in the
 			// the edit window just make sure all our drag and drop stuff is
 			// clear in the hierarchy
@@ -634,7 +635,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				// update destination for drag move
 				m_dragMoveDest = mouse;
 
-			}  // end if
+			}
 			else if( m_dragSelecting )
 			{
 
@@ -642,14 +643,14 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				m_selectRegion.hi.x = x;
 				m_selectRegion.hi.y = y;
 
-			}  // end else if
+			}
 			else if( m_resizingWindow )
 			{
 
 					// save the position of our mouse for resizing
 					m_resizeDest = mouse;
 
-			}  // end else if
+			}
 			else
 			{
 
@@ -657,13 +658,13 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				// if we have ONE window selected and are close to an anchor corner
 				// to resize it change the cursor to resize cursor
 				//
-				TheEditWindow->handleResizeAvailable( x, y );
+				handleResizeAvailable( x, y );
 
-			}  // end else
+			}
 
 			break;
 
-		}  // end mouse move
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_LBUTTONDOWN:
@@ -682,7 +683,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 
 			//
 			// if we are in one of the resize modes then this click will
-			// resize the window selected 
+			// resize the window selected
 			//
 			if( TheEditor->getMode() == MODE_RESIZE_TOP_LEFT ||
 					TheEditor->getMode() == MODE_RESIZE_BOTTOM_RIGHT ||
@@ -703,7 +704,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				m_resizeOrigin = mouse;
 				m_resizeDest = mouse;
 
-			}  // end if
+			}
 			else
 			{
 				GameWindow *window = TheEditor->getWindowAtPos( x, y );
@@ -727,7 +728,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 						// select this window
 						TheEditor->selectWindow( window );
 
-					}  // end if
+					}
 					else
 					{
 
@@ -738,7 +739,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 						if( controlDown == TRUE )
 							TheEditor->unSelectWindow( window );
 
-					}  // end else
+					}
 
 					// only proceed into drag mode if we have something selected
 					if( TheEditor->isWindowSelected( window ) )
@@ -755,9 +756,9 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 						// change to drag move mode and switch cursor
 						TheEditor->setMode( MODE_DRAG_MOVE );
 
-					}  // end if
+					}
 
-				}  // end if
+				}
 				else
 				{
 
@@ -768,13 +769,13 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 					m_selectRegion.hi.x = x;
 					m_selectRegion.hi.y = y;
 
-				}  // end else
+				}
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end left button down 
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_LBUTTONUP:
@@ -793,7 +794,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				// go back to normal mode
 				TheEditor->setMode( MODE_EDIT );
 
-			}  // end if
+			}
 			else if( m_dragSelecting )
 			{
 
@@ -803,7 +804,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				// stop a drag selection if in progress
 				m_dragSelecting = FALSE;
 
-			}  // end else
+			}
 			else if( m_resizingWindow )
 			{
 				GameWindow *window = TheEditor->getFirstSelected();
@@ -830,16 +831,16 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 					// resize the window
 					window->winSetSize( resultSize.x, resultSize.y );
 				}
-							
+
 				// go back to normal
 				m_resizingWindow = FALSE;
 				TheEditor->setMode( MODE_EDIT );
 
-			}  // end resizing window
+			}
 
 			break;
 
-		}  // end left button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MBUTTONDOWN:
@@ -847,7 +848,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 
 			break;
 
-		}  // end middle button down
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MBUTTONUP:
@@ -855,7 +856,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 
 			break;
 
-		}  // end middle button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_RBUTTONDOWN:
@@ -869,7 +870,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 
 			// get the window at the click pos
 			window = TheEditor->getWindowAtPos( clickPos.x, clickPos.y );
-					
+
 			//
 			// if there is a window here and it is not part of the selection
 			// list, everything else is unselected
@@ -883,21 +884,21 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				// select this window
 				TheEditor->selectWindow( window );
 
-			}  // end if
+			}
 			else
 			{
 
 				// no window here, clear selections anyway
 				TheEditor->clearSelections();
 
-			}  // end else
-												
+			}
+
 			// open right click menu
-			TheEditWindow->openPopupMenu( clickPos.x, clickPos.y );
+			openPopupMenu( clickPos.x, clickPos.y );
 
 			break;
 
-		}  // end right button down
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_RBUTTONUP:
@@ -905,7 +906,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 
 			break;
 
-		}  // end right button up
+		}
 
 		// ------------------------------------------------------------------------
 		default:
@@ -913,11 +914,11 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch on widnows message
+	}
 
-}  // end mouseEvent
+}
 
 // EditWindow::inCornerTolerance ==============================================
 /** If the 'dest' point is within 'tolerance' distance to the 'source'
@@ -946,10 +947,10 @@ Bool EditWindow::inCornerTolerance( ICoord2D *dest, ICoord2D *source,
 			dest->y >= region.lo.y &&
 			dest->y <= region.hi.y )
 		return TRUE;
-		
+
 	return FALSE;
-		
-}  // end inCornerTolerance
+
+}
 
 // EditWindow::inLineTolerance ================================================
 /** If the 'dest' point is within the region defined around the
@@ -962,7 +963,7 @@ Bool EditWindow::inLineTolerance( ICoord2D *dest,
 	IRegion2D region;
 
 	// sanity
-	if( dest == NULL || lineStart == NULL || lineEnd == NULL )	
+	if( dest == NULL || lineStart == NULL || lineEnd == NULL )
 		return FALSE;
 
 	// setup region
@@ -977,10 +978,10 @@ Bool EditWindow::inLineTolerance( ICoord2D *dest,
 			dest->y >= region.lo.y &&
 			dest->y <= region.hi.y )
 		return TRUE;
-		
+
 	return FALSE;
 
-}  // end inLineTolerance
+}
 
 // EditWindow::handleResizeAvailable ==========================================
 /** Given the mouse position, if it is close enough to a corner of a
@@ -993,7 +994,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 	GameWindow *window;
 	ICoord2D origin, size, mouse, point;
 	const Int tol = 5;
-		
+
 	// if there is zero or more than 1 window selected we can't resize
 	if( TheEditor->selectionCount() != 1 )
 		return;
@@ -1006,7 +1007,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 	window = TheEditor->getFirstSelected();
 	window->winGetScreenPosition( &origin.x, &origin.y );
 	window->winGetSize( &size.x, &size.y );
-		
+
 	// check for around top left corner
 	point = origin;
 	if( inCornerTolerance( &mouse, &point, tol ) == TRUE )
@@ -1015,7 +1016,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_TOP_LEFT );
 		return;
 
-	}  // end if
+	}
 
 	// check for around bottom right corner
 	point.x = origin.x + size.x;
@@ -1026,18 +1027,18 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_BOTTOM_RIGHT );
 		return;
 
-	}  // end if
+	}
 
 	// check for around top right corner
 	point.x = origin.x + size.x;
 	point.y = origin.y;
 	if( inCornerTolerance( &mouse, &point, tol ) == TRUE )
 	{
-		
+
 		TheEditor->setMode( MODE_RESIZE_TOP_RIGHT );
 		return;
 
-	}  // end if
+	}
 
 	// check for around bottom left corner
 	point.x = origin.x;
@@ -1048,7 +1049,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_BOTTOM_LEFT );
 		return;
 
-	}  // end if
+	}
 
 	ICoord2D lineStart, lineEnd;
 
@@ -1062,7 +1063,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_TOP );
 		return;
 
-	}  // end if
+	}
 
 	// check for along bottom edge
 	lineStart.x = origin.x;
@@ -1075,7 +1076,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_BOTTOM );
 		return;
 
-	}  // end if
+	}
 
 	// check for along left edge
 	lineStart = origin;
@@ -1087,7 +1088,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_LEFT );
 		return;
 
-	}  // end if
+	}
 
 	// check for along right edge
 	lineStart.x = origin.x + size.x;
@@ -1100,12 +1101,12 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_RIGHT );
 		return;
 
-	}  // end if
+	}
 
 	// we are not resizing anything at all, set us to normal mode
 	TheEditor->setMode( MODE_EDIT );
 
-}  // end handleResizeAvailable
+}
 
 // EditWindow::drawSeeThruOutlines ============================================
 /** Draw an outline for a window that is see thru so we can still work
@@ -1131,7 +1132,7 @@ void EditWindow::drawSeeThruOutlines( GameWindow *windowList, Color c )
 		// draw a box on the window
 		drawOpenRect( pos.x, pos.y, size.x, size.y, 1, c );
 
-	}  // end if
+	}
 
 	// check window children
 	GameWindow *child;
@@ -1141,7 +1142,7 @@ void EditWindow::drawSeeThruOutlines( GameWindow *windowList, Color c )
 	// go to siblings
 	drawSeeThruOutlines( windowList->winGetNext(), c );
 
-}  // end drawSeeThruOutlines
+}
 
 // EditWindow::drawHiddenOutlines =============================================
 /** Draw an outline for a window that is hidden so we can still work
@@ -1167,7 +1168,7 @@ void EditWindow::drawHiddenOutlines( GameWindow *windowList, Color c )
 			hidden = TRUE;
 		parent = parent->winGetParent();
 
-	}  // end while
+	}
 	if( BitIsSet( windowList->winGetStatus(), WIN_STATUS_HIDDEN ) )
 		hidden = TRUE;
 	if( hidden )
@@ -1182,7 +1183,7 @@ void EditWindow::drawHiddenOutlines( GameWindow *windowList, Color c )
 		// draw a box on the window
 		drawOpenRect( pos.x, pos.y, size.x, size.y, 2, c );
 
-	}  // end if
+	}
 
 	// check window children
 	GameWindow *child;
@@ -1192,7 +1193,7 @@ void EditWindow::drawHiddenOutlines( GameWindow *windowList, Color c )
 	// go to siblings
 	drawHiddenOutlines( windowList->winGetNext(), c );
 
-}  // end drawHiddenOutlines
+}
 
 // EditWindow::drawUIback =====================================================
 /** Draw any visual feedback to the user about selection boxes or windows
@@ -1232,7 +1233,7 @@ void EditWindow::drawUIFeedback( void )
 		drawOpenRect( m_selectRegion.lo.x, m_selectRegion.lo.y,
 		              width, height, selectBoxWidth, selectBoxColor );
 
-	}  // end if
+	}
 
 	// draw select lines on selected windows
 	select = TheEditor->getSelectList();
@@ -1242,7 +1243,7 @@ void EditWindow::drawUIFeedback( void )
 		GameWindow *window;
 		Real windowSelectWidth = 2.0f;
 		Color windowSelectColor;
-		
+
 		windowSelectColor = GameMakeColor( 0, color, 0, 255 );
 
 		// get window properties
@@ -1251,13 +1252,13 @@ void EditWindow::drawUIFeedback( void )
 		window->winGetSize( &size.x, &size.y );
 
 		// draw a box on the window
-		drawOpenRect( origin.x, origin.y, size.x, size.y, 
-									windowSelectWidth, windowSelectColor );		
+		drawOpenRect( origin.x, origin.y, size.x, size.y,
+									windowSelectWidth, windowSelectColor );
 
 		// go to next selection
 		select = select->next;
 
-	}  // end while
+	}
 
 	//
 	// if we're drag moving, draw outlines of all the windows in the
@@ -1293,7 +1294,7 @@ void EditWindow::drawUIFeedback( void )
 				TheEditor->gridSnapLocation( &moveLoc, &moveLoc );
 
 			// keep location legal
-			TheEditor->computeSafeLocation( window, moveLoc.x, moveLoc.y, 
+			TheEditor->computeSafeLocation( window, moveLoc.x, moveLoc.y,
 																			&safeLoc.x, &safeLoc.y );
 
 			// adjust location by parent location if present
@@ -1306,18 +1307,18 @@ void EditWindow::drawUIFeedback( void )
 				safeLoc.x += parentOrigin.x;
 				safeLoc.y += parentOrigin.y;
 
-			}  // end if
+			}
 
 			// draw outline of window at what would be the drag move destination
-			drawOpenRect( safeLoc.x, safeLoc.y, size.x, size.y, 
+			drawOpenRect( safeLoc.x, safeLoc.y, size.x, size.y,
 										outlineWidth, outlineColor );
 
 			// go to next selection
 			select = select->next;
 
-		}  // end while
+		}
 
-	}  // end if
+	}
 
 	// if resizing a window draw that resize representation
 	if( m_resizingWindow )
@@ -1353,13 +1354,13 @@ void EditWindow::drawUIFeedback( void )
 			loc.x += parentOrigin.x;
 			loc.y += parentOrigin.y;
 
-		}  // end if
+		}
 
 		// draw a box for the window at its new location
 		outlineColor = GameMakeColor( m_pulse, m_pulse, m_pulse, 255 );
 		drawOpenRect( loc.x, loc.y, size.x, size.y, outlineWidth, outlineColor );
 
-	}  // end if
+	}
 
 	// draw lines around any drag source and drag targets in the hierarchy view
 	GameWindow *dragSource = TheHierarchyView->getDragWindow();
@@ -1375,14 +1376,14 @@ void EditWindow::drawUIFeedback( void )
 		// draw box
 		drawOpenRect( origin.x, origin.y, size.x, size.y, 2, dragColor );
 
-	}  // end if
+	}
 
 	// drag target
 	GameWindow *dragTarget = TheHierarchyView->getDragTarget();
 	if( dragTarget )
 	{
 		ICoord2D origin, size;
-		
+
 		// get size and position
 		dragTarget->winGetScreenPosition( &origin.x, &origin.y );
 		dragTarget->winGetSize( &size.x, &size.y );
@@ -1390,9 +1391,9 @@ void EditWindow::drawUIFeedback( void )
 		// draw box
 		drawOpenRect( origin.x, origin.y, size.x, size.y, 2, dragColor );
 
-	}  // end if
+	}
 
-}  // end drawUIFeedback
+}
 
 // EditWindow::drawGrid =======================================================
 /** Draw the grid */
@@ -1403,7 +1404,7 @@ void EditWindow::drawGrid( void )
 	Int res = TheEditor->getGridResolution();
 	Int x, y;
 	RGBColorInt *gridColor = TheEditor->getGridColor();
-	Color color = GameMakeColor( gridColor->red, gridColor->green,	
+	Color color = GameMakeColor( gridColor->red, gridColor->green,
 															 gridColor->blue, gridColor->alpha );
 
 	// set us to invert where we draw
@@ -1417,7 +1418,7 @@ void EditWindow::drawGrid( void )
 //		MoveToEx( hdc, 0, y, NULL );
 //		LineTo( hdc, m_size.x, y );
 
-	} 
+	}
 
 	for( x = 0; x < m_size.x; x += res )
 	{
@@ -1426,7 +1427,7 @@ void EditWindow::drawGrid( void )
 //		MoveToEx( hdc, x, 0, NULL );
 //		LineTo( hdc, x, m_size.y );
 
-	} 
+	}
 
 /*
 	for( y = 0; y < m_size.y; y += res )
@@ -1440,32 +1441,28 @@ void EditWindow::drawGrid( void )
 
 //				TheDisplay->drawLine( x, y, x + 1, y + 1, 1, 0xFFFFFFFF );
 
-		}  // end for x
+		}
 
-	}  // end for y
+	}
 */
 
 	// release the dc
 //	ReleaseDC( getWindowHandle(), hdc );
 
-}  // end drawGrid
+}
 
 // EditWindow::draw ===========================================================
 /** Draw the edit window */
 //=============================================================================
 void EditWindow::draw( void )
 {
-	static UnsignedInt syncTime = 0;
-
 	// allow W3D to update its internals
-	WW3D::Sync( syncTime );
-
-	// for now, use constant time steps to avoid animations running independent of framerate
-	syncTime += 50;
+	WW3D::Update_Logic_Frame_Time(TheFramePacer->getLogicTimeStepMilliseconds());
+	WW3D::Sync(WW3D::Get_Fractional_Sync_Milliseconds() >= WWSyncMilliseconds);
 
 	// start render block
-	WW3D::Begin_Render( true, true, Vector3( m_backgroundColor.red, 
-																					 m_backgroundColor.green, 
+	WW3D::Begin_Render( true, true, Vector3( m_backgroundColor.red,
+																					 m_backgroundColor.green,
 																					 m_backgroundColor.blue ) );
 
 	// draw the windows
@@ -1478,7 +1475,8 @@ void EditWindow::draw( void )
 	// render is all done!
 	WW3D::End_Render();
 
-}  // end draw
+	TheFramePacer->update();
+}
 
 // EditWindow::setSize ========================================================
 /** The edit window should now be logically consider this size */
@@ -1496,7 +1494,7 @@ void EditWindow::setSize( ICoord2D *size )
 		TheDisplay->setWidth( m_size.x );
 		TheDisplay->setHeight( m_size.y );
 
-	}  // end if
+	}
 
 	// set the extents for our 2D renderer
 	if( m_2DRender )
@@ -1505,7 +1503,7 @@ void EditWindow::setSize( ICoord2D *size )
 																								 m_size.x,
 																								 m_size.y ) );
 
-}  // end setSize
+}
 
 // EditWindow::openPopupMenu ==================================================
 /** Open the new control menu that comes up when the user right clicks
@@ -1529,7 +1527,7 @@ void EditWindow::openPopupMenu( Int x, Int y )
 		EnableMenuItem( subMenu, POPUP_MENU_PROPERTIES, MF_GRAYED );
 		EnableMenuItem( subMenu, POPUP_MENU_BRING_TO_TOP, MF_GRAYED );
 
-	}  // end if
+	}
 	else
 	{
 
@@ -1537,8 +1535,8 @@ void EditWindow::openPopupMenu( Int x, Int y )
 		EnableMenuItem( subMenu, POPUP_MENU_PROPERTIES, MF_ENABLED );
 		EnableMenuItem( subMenu, POPUP_MENU_BRING_TO_TOP, MF_ENABLED );
 
-	}  // end else
-	
+	}
+
 	//
 	// open up right mouse track menu, note that we have to translate the
 	// x,y of this mouse click which is local to this window into
@@ -1553,69 +1551,69 @@ void EditWindow::openPopupMenu( Int x, Int y )
 	m_popupMenuClickPos.x = x;
 	m_popupMenuClickPos.y = y;
 
-}  // end openPopupMenu
+}
 
 // EditWindow::drawLine =======================================================
 /** draw a line on the display in pixel coordinates with the specified color */
 //=============================================================================
-void EditWindow::drawLine( Int startX, Int startY, 
-													 Int endX, Int endY, 
+void EditWindow::drawLine( Int startX, Int startY,
+													 Int endX, Int endY,
 													 Real lineWidth, UnsignedInt lineColor )
 {
 
 	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
-	m_2DRender->Add_Line( Vector2( startX, startY ), Vector2( endX, endY ), 
+	m_2DRender->Add_Line( Vector2( startX, startY ), Vector2( endX, endY ),
 												lineWidth, lineColor );
 	m_2DRender->Render();
-	
-}  // end drawLIne
+
+}
 
 // EditWindow::drawOpenRect ===================================================
-/** draw a rect border on the display in pixel coordinates with the 
+/** draw a rect border on the display in pixel coordinates with the
 	* specified color */
 //=============================================================================
-void EditWindow::drawOpenRect( Int startX, Int startY, 
+void EditWindow::drawOpenRect( Int startX, Int startY,
 															 Int width, Int height,
 															 Real lineWidth, UnsignedInt lineColor )
 {
 
-	m_2DRender->Reset();		
+	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
-	m_2DRender->Add_Outline( RectClass( startX, startY, 
-																			startX + width, startY + height ), 
+	m_2DRender->Add_Outline( RectClass( startX, startY,
+																			startX + width, startY + height ),
 													 lineWidth, lineColor );
 
 	// render it now!
 	m_2DRender->Render();
 
-}  // end drawOpenRect
+}
 
 // EditWindow::drawFillRect ===================================================
-/** draw a filled rect on the display in pixel coords with the 
+/** draw a filled rect on the display in pixel coords with the
 	* specified color */
 //=============================================================================
-void EditWindow::drawFillRect( Int startX, Int startY, 
+void EditWindow::drawFillRect( Int startX, Int startY,
 															 Int width, Int height,
 															 UnsignedInt color )
 {
 
-	m_2DRender->Reset();		
+	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
-	m_2DRender->Add_Rect( RectClass( startX, startY, 
-																	 startX + width, startY + height ), 
+	m_2DRender->Add_Rect( RectClass( startX, startY,
+																	 startX + width, startY + height ),
 												0, 0, color );
 
 	// render it now!
 	m_2DRender->Render();
 
-}  // end drawFillRect
+}
 
 // EditWindow::drawImage ======================================================
 /** draw an image fit within the screen coordinates */
 //=============================================================================
-void EditWindow::drawImage( const Image *image, 
-														Int startX, Int startY, 
+void EditWindow::drawImage( const Image *image,
+														Int startX, Int startY,
 														Int endX, Int endY,
 														Color color )
 {
@@ -1682,7 +1680,7 @@ void EditWindow::drawImage( const Image *image,
 	if( BitIsSet( image->getStatus(), IMAGE_STATUS_ROTATED_90_CLOCKWISE ) )
 	{
 
-		m_2DRender->Add_Tri( Vector2( screen_rect.Left, screen_rect.Top ), 
+		m_2DRender->Add_Tri( Vector2( screen_rect.Left, screen_rect.Top ),
 												 Vector2( screen_rect.Left, screen_rect.Bottom ),
 												 Vector2( screen_rect.Right, screen_rect.Top ),
 												 Vector2( uv_rect.Right, uv_rect.Top),
@@ -1698,28 +1696,28 @@ void EditWindow::drawImage( const Image *image,
 												 Vector2( uv_rect.Left, uv_rect.Top ),
 												 color );
 
-	}  // end if
+	}
 	else
 	{
 
 		// just draw as normal
 		m_2DRender->Add_Quad( screen_rect, uv_rect, color );
 
-	}  // end else
+	}
 
 	m_2DRender->Render();
 
-}  // end drawImage
+}
 
 // EditWindow::getBackgroundColor =============================================
 /** Get the background color for the edit window */
 //=============================================================================
 RGBColorReal EditWindow::getBackgroundColor( void )
 {
-	
+
 	return m_backgroundColor;
 
-}  // end getBackgroundColor
+}
 
 // EditWindow::setBackgroundColor =============================================
 /** Set the background color for the edit window */
@@ -1729,7 +1727,7 @@ void EditWindow::setBackgroundColor( RGBColorReal color )
 
 	m_backgroundColor = color;
 
-}  // end setBackgroundColor
+}
 
 // EditWindow::notifyWindowDeleted ============================================
 /** A window has been deleted from the editor and the editor is now
@@ -1752,7 +1750,7 @@ void EditWindow::notifyWindowDeleted( GameWindow *window )
 		m_resizingWindow = FALSE;
 		TheEditor->setMode( MODE_EDIT );
 
-	}  // end if
+	}
 
 	// null out picked window if needed
 	if( m_pickedWindow == window )
@@ -1764,4 +1762,4 @@ void EditWindow::notifyWindowDeleted( GameWindow *window )
 	//
 	TheEditor->setMode( MODE_EDIT );
 
-}  // end notifyWindowDeleted
+}
diff --git a/Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp b/Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp
index 7b4e2c8cfbc..2faba87eaf7 100644
--- a/Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp
+++ b/Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GUIEdit.cpp //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -77,8 +77,6 @@
 
 #include "W3DDevice/Common/W3DFunctionLexicon.h"
 #include "W3DDevice/GameClient/W3DGameWindowManager.h"
-#include "W3DDevice/GameClient/W3DDisplay.h"
-#include "W3DDevice/GameClient/W3DGameWindowManager.h"
 #include "W3DDevice/GameClient/W3DGameFont.h"
 #include "W3DDevice/GameClient/W3DDisplayStringManager.h"
 #include "GameClient/Keyboard.h"
@@ -155,7 +153,7 @@ char *GUIEdit::saveAsDialog( void )
 	else
 		return NULL;
 
-}  // end saveAsDialog
+}
 
 // GUIEdit::openDialog ========================================================
 /** Bring up the standard windows browser open dialog and return
@@ -197,12 +195,12 @@ char *GUIEdit::openDialog( void )
 	else
 		return NULL;
 
-}  // end openDialog
+}
 
 // GUIEdit::setUnsaved ========================================================
 /** Set the current contents of the editor as either saved or unsaved,
 	* when we're entering an unsaved state we will put a marker in the title
-	* bar of the app, when leaving an unsaved state we will remove 
+	* bar of the app, when leaving an unsaved state we will remove
 	* that marker */
 //=============================================================================
 void GUIEdit::setUnsaved( Bool unsaved )
@@ -226,7 +224,7 @@ void GUIEdit::setUnsaved( Bool unsaved )
 		sprintf( title, "GUIEdit:  %s  *", filename );
 		SetWindowText( m_appHWnd, title );
 
-	}  // end if
+	}
 	//else if( m_unsaved == TRUE && unsaved == FALSE )
 	else
 	{
@@ -236,12 +234,12 @@ void GUIEdit::setUnsaved( Bool unsaved )
 		sprintf( title, "GUIEdit:  %s", filename );
 		SetWindowText( m_appHWnd, title );
 
-	}  // end else
+	}
 
 	// save the new state we're in
 	m_unsaved = unsaved;
 
-}  // end setUnsaved
+}
 
 // GUIEdit::setSaveFile =======================================================
 /** Set our member variables for the full path and filename passed in
@@ -253,16 +251,16 @@ void GUIEdit::setSaveFile( const char *fullPathAndFilename )
   const char *ptr;
 
 	// copy over the full path and filename
-	strcpy( m_savePathAndFilename, fullPathAndFilename );
+	strlcpy(m_savePathAndFilename, fullPathAndFilename, ARRAY_SIZE(m_savePathAndFilename));
 
 	//
 	// copy everything after the last '\' from the full path, this will
 	// be just the filename with extension
 	//
 	ptr = strrchr( fullPathAndFilename, '\\' ) + 1;
-	strcpy( m_saveFilename, ptr );
+	strlcpy(m_saveFilename, ptr, ARRAY_SIZE(m_saveFilename));
 
-}  // end setSaveFile
+}
 
 // GUIEdit::validateParentForCreate ===========================================
 /** This method is used when creating new windows and gadgets, if a
@@ -277,19 +275,19 @@ Bool GUIEdit::validateParentForCreate( GameWindow *parent )
 	// gadgets are units themselves and should have no user defined
 	// children
 	//
-	if( parent && TheEditor->windowIsGadget( parent ) )
+	if( parent && windowIsGadget( parent ) )
 	{
-		
-		MessageBox( TheEditor->getWindowHandle(),
+
+		MessageBox( getWindowHandle(),
 								"You cannot make a new window as a child to a GUI Gadget Control",
 								"Illegal Parent", MB_OK );
 		return FALSE;
 
-	}  // end if
+	}
 
 	return TRUE;  // ok
 
-}  // end validateParentForCreate
+}
 
 // GUIEdit::findSelectionEntry ================================================
 /** Find selection entry for this window */
@@ -313,11 +311,11 @@ WindowSelectionEntry *GUIEdit::findSelectionEntry( GameWindow *window )
 		// next entry
 		entry = entry->next;
 
-	}  // end while
+	}
 
 	return NULL;  // not found
 
-}  // end findSelectionEntry
+}
 
 // GUIEdit::normalizeRegion ===================================================
 /** Normalize the region so that lo and hi are actually lo and hi */
@@ -336,17 +334,17 @@ void GUIEdit::normalizeRegion( IRegion2D *region )
 			region->hi = region->lo;
 			region->lo = temp;
 
-		}  // end if
+		}
 		else
 		{
-			
+
 			temp = region->hi;
 			region->hi.x = region->lo.x;
 			region->lo.x = temp.x;
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 	else if( region->hi.y < region->lo.y )
 	{
 
@@ -354,9 +352,9 @@ void GUIEdit::normalizeRegion( IRegion2D *region )
 		region->hi.y = region->lo.y;
 		region->lo.y = temp.y;
 
-	}  // end if
+	}
 
-}  // end normalizeRegion
+}
 
 // GUIEdit::selectWindowsInRegion =============================================
 /** Select all the windows that are fully in the region */
@@ -386,7 +384,7 @@ void GUIEdit::selectWindowsInRegion( IRegion2D *region )
 		window->winGetSize( &size.x, &size.y );
 
 		// compare window extents to selection region
-		if( origin.x >= region->lo.x && 
+		if( origin.x >= region->lo.x &&
 				origin.y >= region->lo.y &&
 				origin.x + size.x <= region->hi.x &&
 				origin.y + size.y <= region->hi.y )
@@ -395,14 +393,14 @@ void GUIEdit::selectWindowsInRegion( IRegion2D *region )
 			// add to selection list
 			selectWindow( window );
 
-		}  // end if
+		}
 
 		// go to next window
 		window = window->winGetNext();
 
-	}  // end while
+	}
 
-}  // end selectWindowsInRegion
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -440,37 +438,27 @@ GUIEdit::GUIEdit( void )
 	m_layoutInitString = GUIEDIT_NONE_STRING;
 	m_layoutUpdateString = GUIEDIT_NONE_STRING;
 	m_layoutShutdownString = GUIEDIT_NONE_STRING;
-}  // end GUIEdit
+}
 
 // GUIEdit::~GUIEdit ==========================================================
 /** */
 //=============================================================================
 GUIEdit::~GUIEdit( void )
 {
-	if (TheHeaderTemplateManager)
-	{
-		delete TheHeaderTemplateManager;
-		TheHeaderTemplateManager = NULL;
-	}
+	delete TheHeaderTemplateManager;
+	TheHeaderTemplateManager = NULL;
 
-	if (TheGameText)
-	{
-		delete TheGameText;
-		TheGameText = NULL;
-	}
-	
-	// delete the IME Manager
-//	if ( TheIMEManager )
-//	{
-//		delete TheIMEManager;
-//		TheIMEManager = NULL;
-//	}
+	delete TheGameText;
+	TheGameText = NULL;
 
+	// delete the IME Manager
+//	delete TheIMEManager;
+//	TheIMEManager = NULL;
 
 	// all the shutdown routine
 	shutdown();
 
-}  // end ~GUIEdit
+}
 
 // GUIEdit::init ==============================================================
 /** Initialize all the GUI edit data */
@@ -498,8 +486,6 @@ void GUIEdit::init( void )
 	TheArchiveFileSystem = new Win32BIGFileSystem;
 	TheFileSystem->init();
 
-	TheGlobalLanguageData = new GlobalLanguage;
-	TheGlobalLanguageData->init();
 	//---------------------------------------------------------------------------
 	// GUI tool specific initializations ----------------------------------------
 	//---------------------------------------------------------------------------
@@ -522,14 +508,18 @@ void GUIEdit::init( void )
 	// Game engine specific initializations -------------------------------------
 	//---------------------------------------------------------------------------
 
-	// create the name key generator
+	// create the global data
 	TheWritableGlobalData = new GlobalData;
 	TheWritableGlobalData->init();
 
+	// TheSuperHackers @info global language relies on global data being initialized
+	TheGlobalLanguageData = new GlobalLanguage;
+	TheGlobalLanguageData->init();
+
 	// create the message stream
 	TheMessageStream = new MessageStream;
 	TheMessageStream->init();
-	TheMessageStream->attachTranslator( new WindowTranslator, 10 );	
+	TheMessageStream->attachTranslator( new WindowTranslator, 10 );
 
 	// create the command list
 	TheCommandList = new CommandList;
@@ -611,7 +601,7 @@ void GUIEdit::init( void )
 		TheGameText->init();
 	}
 
-	TheHeaderTemplateManager = new HeaderTemplateManager;	
+	TheHeaderTemplateManager = new HeaderTemplateManager;
 	if(TheHeaderTemplateManager)
 		TheHeaderTemplateManager->init();
 	// create the IME manager
@@ -620,7 +610,7 @@ void GUIEdit::init( void )
 //	{
 //		TheIMEManager->init();
 //	}
-}  // end init
+}
 
 // GUIEdit::shutdown ==========================================================
 /** Shutdown our GUI edit application */
@@ -685,7 +675,7 @@ void GUIEdit::shutdown( void )
 	// delete name key generator
 	delete TheNameKeyGenerator;
 	TheNameKeyGenerator = NULL;
-	
+
 	delete TheGlobalLanguageData;
 	TheGlobalLanguageData = NULL;
 
@@ -715,7 +705,7 @@ void GUIEdit::shutdown( void )
 	TheKeyboard = NULL;
 
 
-}  // end shutdown
+}
 
 // GUIEdit::update ============================================================
 /** Update method for our GUI edit application */
@@ -727,15 +717,15 @@ void GUIEdit::update( void )
 	TheMouse->update();
 
 	// process the mouse if we're in test mode
-	if( TheEditor->getMode() == MODE_TEST_RUN )
+	if( getMode() == MODE_TEST_RUN )
 	{
-		
+
 		// send input through the window system and clear all messages after
 		TheMouse->createStreamMessages();
 		TheMessageStream->propagateMessages();
 		TheCommandList->reset();
 
-	}  // end if
+	}
 
 	// update the window manager itself
 	TheWindowManager->update();
@@ -743,7 +733,7 @@ void GUIEdit::update( void )
 	// draw the edit window
 	TheEditWindow->draw();
 
-}  // end update
+}
 
 // GUIEdit::writeConfigFile ===================================================
 /** Write the guiedit config file */
@@ -757,27 +747,27 @@ Bool GUIEdit::writeConfigFile( const char *filename )
 	if( fp == NULL )
 	{
 
-		DEBUG_LOG(( "writeConfigFile: Unable to open file '%s'\n", filename ));
+		DEBUG_LOG(( "writeConfigFile: Unable to open file '%s'", filename ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
-	// version 
+	// version
 	fprintf( fp, "GUIEdit Config file version '%d'\n", GUIEDIT_CONFIG_VERSION );
 
 	// edit window background color
 	RGBColorReal backColor = TheEditWindow->getBackgroundColor();
-	fprintf( fp, "BACKGROUNDCOLOR = %f %f %f %f\n", 
+	fprintf( fp, "BACKGROUNDCOLOR = %f %f %f %f\n",
 					 backColor.red, backColor.green, backColor.blue, backColor.alpha );
 
 	// grid settings
-	fprintf( fp, "GRIDRESOLUTION = %d\n", TheEditor->getGridResolution() );
-	RGBColorInt *gridColor = TheEditor->getGridColor();
+	fprintf( fp, "GRIDRESOLUTION = %d\n", getGridResolution() );
+	RGBColorInt *gridColor = getGridColor();
 	fprintf( fp, "GRIDCOLOR = %d %d %d %d\n",
 					 gridColor->red, gridColor->green, gridColor->blue, gridColor->alpha );
-	fprintf( fp, "SNAPTOGRID = %d\n", TheEditor->isGridSnapOn() );
-	fprintf( fp, "GRIDVISIBLE = %d\n", TheEditor->isGridVisible() );
+	fprintf( fp, "SNAPTOGRID = %d\n", isGridSnapOn() );
+	fprintf( fp, "GRIDVISIBLE = %d\n", isGridVisible() );
 
 	// write hierarchy position and size
 	ICoord2D pos, size;
@@ -798,7 +788,7 @@ Bool GUIEdit::writeConfigFile( const char *filename )
 
 	return TRUE;
 
-}  // end writeConfigFile
+}
 
 // GUIEdit::readConfigFile ====================================================
 /** Read the guiedit config file */
@@ -812,7 +802,7 @@ Bool GUIEdit::readConfigFile( const char *filename )
 	if( fp == NULL )
 		return TRUE;
 
-	// version 
+	// version
 	Int version;
 	fscanf( fp, "GUIEdit Config file version '%d'\n", &version );
 	if( version != GUIEDIT_CONFIG_VERSION )
@@ -820,22 +810,22 @@ Bool GUIEdit::readConfigFile( const char *filename )
 
 	// edit window background color
 	RGBColorReal backColor;
-	fscanf( fp, "BACKGROUNDCOLOR = %f %f %f %f\n", 
+	fscanf( fp, "BACKGROUNDCOLOR = %f %f %f %f\n",
 				  &backColor.red, &backColor.green, &backColor.blue, &backColor.alpha );
 	TheEditWindow->setBackgroundColor( backColor );
 
 	// grid settings
 	Int intData;
 	fscanf( fp, "GRIDRESOLUTION = %d\n", &intData );
-	TheEditor->setGridResolution( intData );
+	setGridResolution( intData );
 	RGBColorInt gridColor;
 	fscanf( fp, "GRIDCOLOR = %d %d %d %d\n",
 					&gridColor.red, &gridColor.green, &gridColor.blue, &gridColor.alpha );
-	TheEditor->setGridColor( &gridColor );
+	setGridColor( &gridColor );
 	fscanf( fp, "SNAPTOGRID = %d\n", &intData );
-	TheEditor->setGridSnap( intData );
+	setGridSnap( intData );
 	fscanf( fp, "GRIDVISIBLE = %d\n", &intData );
-	TheEditor->setGridVisible( intData );
+	setGridVisible( intData );
 
 	// hierarchy view
 	ICoord2D pos, size;
@@ -863,7 +853,7 @@ Bool GUIEdit::readConfigFile( const char *filename )
 
 	return TRUE;
 
-}  // end readConfigFile
+}
 
 // GUIEdit::readFontFile ======================================================
 /** Read the font file defintitions and load them */
@@ -906,7 +896,7 @@ void GUIEdit::readFontFile( const char *filename )
 			fontBuffer[ index++ ] = c;
 			c = fgetc( fp );
 
-		}  // end while
+		}
 		fontBuffer[ index ] = '\0';
 		c = fgetc( fp );  // the end quite itself
 
@@ -922,15 +912,15 @@ void GUIEdit::readFontFile( const char *filename )
 			sprintf( buffer, "Warning: The font '%s' Size: '%d' Bold: '%d', specified in the config file could not be loaded.  Does that font exist?",
 							 fontBuffer, size, bold );
 			MessageBox( m_appHWnd, buffer, "Cannot Load Font", MB_OK );
-			
-		}  // end if
 
-	}  // end for i
+		}
+
+	}
 
 	// close the file
 	fclose( fp );
 
-}  // end readFontFile
+}
 
 // GUIEdit::writeFontFile =====================================================
 /** If we can, write a file containing a definition of all the fonts
@@ -954,18 +944,18 @@ void GUIEdit::writeFontFile( const char *filename )
 	fprintf( fp, "AVAILABLE_FONT_COUNT = %d\n", count );
 
 	GameFont *font;
-	for( font = TheFontLibrary->firstFont(); 
-			 font; 
+	for( font = TheFontLibrary->firstFont();
+			 font;
 			 font = TheFontLibrary->nextFont( font ) )
 	{
 		fprintf( fp, "AVAILABLEFONT = \"%s\" Size: %d Bold: %d\n",
 						 font->nameString.str(), font->pointSize, font->bold );
-	}  // end for
+	}
 
 	// close the file
 	fclose( fp );
 
-}  // end writeFontFile
+}
 
 // GUIEdit::setMode ===========================================================
 /** Set a new mode for the editor */
@@ -985,14 +975,14 @@ void GUIEdit::setMode( EditMode mode )
 		TheMessageStream->removeTranslator( transID );
 		transID = 0;
 
-	}  // end if
+	}
 
 	// assign new mode
 	m_mode = mode;
 
 	// uncheck menu item for test mode by default
 	unCheckMenuItem( MENU_TEST_MODE );
-	
+
 	// update status message
 	switch( m_mode )
 	{
@@ -1074,9 +1064,9 @@ void GUIEdit::setMode( EditMode mode )
 			statusMessage( STATUS_MODE, "Drag right to resize" );
 			break;
 
-	}  // end switch
+	}
 
-}  // end setMode
+}
 
 // GUIEdit::setCursor =========================================================
 /** Set the cursor to the specified type */
@@ -1123,17 +1113,17 @@ void GUIEdit::setCursor( CursorType type )
 			identifier = IDC_WAIT;
 			break;
 
-	}  // end switchType
+	}
 
 	// set the new cursor
 	SetCursor( LoadCursor( NULL, identifier ) );
 
-}  // end setCursor
+}
 
 // pointInChild ===============================================================
-/** Given a mouse position, get the topmost window at that location. We needed 
+/** Given a mouse position, get the topmost window at that location. We needed
 		to pull this out into it's own special case function since the standard
-		winPointInAnyChild is used by the game and we needed a special case to 
+		winPointInAnyChild is used by the game and we needed a special case to
 		select a disabled control in GUIEdit																		*/
 //=============================================================================
 static GameWindow *pointInChild( Int x, Int y , GameWindow *win)
@@ -1143,38 +1133,38 @@ static GameWindow *pointInChild( Int x, Int y , GameWindow *win)
 	ICoord2D origin;
 	IRegion2D tempRegion;
 	Int tempX, tempY;
-	for( child = win->winGetChild(); child; child = child->winGetNext() ) 
+	for( child = win->winGetChild(); child; child = child->winGetNext() )
 	{
 
 		child->winGetRegion(&tempRegion);
 		origin = tempRegion.lo;
 		parent = child->winGetParent();
 
-		while( parent ) 
+		while( parent )
 		{
 			parent->winGetRegion(&tempRegion);
 			origin.x += tempRegion.lo.x;
 			origin.y += tempRegion.lo.y;
 			parent = parent->winGetParent();
 
-		}  // end while
+		}
 		child->winGetSize(&tempX,&tempY);
 		if( x >= origin.x && x <= origin.x + tempX &&
 				y >= origin.y && y <= origin.y + tempY &&
 				BitIsSet( child->winGetStatus(), WIN_STATUS_HIDDEN ) == FALSE)
 			return child->winPointInChild( x, y );
 
-	}  // end for child
+	}
 
 	// not in any children, must be in parent
 	return win;
 
-}  // end pointInChild
+}
 
 // pointInAnyChild ============================================================
-/** Given a mouse position, get the topmost window at that location. We needed 
+/** Given a mouse position, get the topmost window at that location. We needed
 		to pull this out into it's own special case function since the standard
-		winPointInAnyChild is used by the game and we needed a special case to 
+		winPointInAnyChild is used by the game and we needed a special case to
 		select a disabled control in GUIEdit																		*/
 //=============================================================================
 static GameWindow *pointInAnyChild( Int x, Int y, Bool ignoreHidden, GameWindow *win )
@@ -1184,13 +1174,13 @@ static GameWindow *pointInAnyChild( Int x, Int y, Bool ignoreHidden, GameWindow
 	ICoord2D origin;
 	IRegion2D tempRegion;
 	Int tempX, tempY;
-	for( child = win->winGetChild(); child; child = child->winGetNext() ) 
+	for( child = win->winGetChild(); child; child = child->winGetNext() )
 	{
 		child->winGetRegion(&tempRegion);
 		origin = tempRegion.lo;
 		parent = child->winGetParent();
 
-		while( parent ) 
+		while( parent )
 		{
 
 			parent->winGetRegion(&tempRegion);
@@ -1198,7 +1188,7 @@ static GameWindow *pointInAnyChild( Int x, Int y, Bool ignoreHidden, GameWindow
 			origin.y += tempRegion.lo.y;
 			parent = parent->winGetParent();
 
-		}  // end while
+		}
 		child->winGetSize(&tempX,&tempY);
 		if( x >= origin.x && x <= origin.x + tempX &&
 				y >= origin.y && y <= origin.y + tempY )
@@ -1207,14 +1197,14 @@ static GameWindow *pointInAnyChild( Int x, Int y, Bool ignoreHidden, GameWindow
 			if( !(ignoreHidden == TRUE &&	BitIsSet( child->winGetStatus(), WIN_STATUS_HIDDEN )) )
 				return pointInChild( x, y , child);
 
-		}  // end if
+		}
 
-	}  // end for child
+	}
 
 	// not in any children, must be in parent
 	return win;
 
-}  // end pointInAnyChild
+}
 
 // GUIEdit::getWindowAtPos ====================================================
 /** Given a mouse position, get the topmost window at that location */
@@ -1229,7 +1219,7 @@ GameWindow *GUIEdit::getWindowAtPos( Int x, Int y )
 			 window;
 			 window = window->winGetNext() )
 	{
-	
+
 		// get window region
 		window->winGetRegion( &region );
 
@@ -1240,9 +1230,9 @@ GameWindow *GUIEdit::getWindowAtPos( Int x, Int y )
 			pick = pointInAnyChild( x, y, FALSE, window );
 			break;  // exit for
 
-		}  // end if
+		}
 
-	}  // end for 
+	}
 
 	//
 	// gadget controls are just composed of generic windows and buttons,
@@ -1257,11 +1247,11 @@ GameWindow *GUIEdit::getWindowAtPos( Int x, Int y )
 
 		//
 		// all gadget components are children of their parent, therefore they
-		// all have a parent 
+		// all have a parent
 		//
 		if( parent )
 		{
-		
+
 			if( BitIsSet( parent->winGetStyle(), GWS_VERT_SLIDER |
 																					GWS_HORZ_SLIDER |
 																					GWS_SCROLL_LISTBOX |
@@ -1270,17 +1260,17 @@ GameWindow *GUIEdit::getWindowAtPos( Int x, Int y )
 									)
 				)
 			{
-				
+
 				// the parent is what we care about
 				pick = parent;
-				
+
 				//
 				// the parent is the thing we want to return here, unless we clicked
 				// on the thumb of a scroll list box, that element is implemented as
 				// a slider, therefore in that situation only we want to return the
 				// parent of the slider
 				//
-				if( BitIsSet( parent->winGetStyle(), GWS_HORZ_SLIDER | 
+				if( BitIsSet( parent->winGetStyle(), GWS_HORZ_SLIDER |
 																						GWS_VERT_SLIDER ) )
 				{
 					GameWindow *grandParent = parent->winGetParent();
@@ -1289,7 +1279,7 @@ GameWindow *GUIEdit::getWindowAtPos( Int x, Int y )
 																			GWS_SCROLL_LISTBOX ) )
 						pick = grandParent;
 
-				}  // end if
+				}
 
 				//must check to see of the parent of a scroll box is a combo box
 				if(BitIsSet(pick->winGetStyle(), GWS_SCROLL_LISTBOX))
@@ -1297,24 +1287,24 @@ GameWindow *GUIEdit::getWindowAtPos( Int x, Int y )
 					GameWindow *grandParent = pick->winGetParent();
 					if( grandParent && BitIsSet( grandParent->winGetStyle(), GWS_COMBO_BOX))
 						pick = grandParent;
-				}					
-			}  // end if
+				}
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	return pick;
 
-}  // end getWindowAtPos
+}
 
 // GUIEdit::clipCreationParamsToParent ========================================
 /** when creating child windows we don't want them to exist outside the
-	* parent so we use this to clip them to the the parent size and 
+	* parent so we use this to clip them to the the parent size and
 	* locations */
 //=============================================================================
 void GUIEdit::clipCreationParamsToParent( GameWindow *parent,
-																					Int *x, Int *y, 
+																					Int *x, Int *y,
 																					Int *width, Int *height )
 {
 	IRegion2D parentScreenRegion;
@@ -1364,7 +1354,7 @@ void GUIEdit::clipCreationParamsToParent( GameWindow *parent,
 	*width = newWidth;
 	*height= newHeight;
 
-}  // end clipcreationParamsToParent
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -1385,13 +1375,13 @@ void GUIEdit::deleteAllWindows( void )
 		deleteWindow( window );
 		window = next;
 
-	}  // end while
+	}
 
-}  // end deleteAllWindows
+}
 
 // GUIEdit::removeWindowCleanup ===============================================
 /** This is called on each window before it is deleted or removed from
-	* the active windows in the editor to allow the system to 
+	* the active windows in the editor to allow the system to
 	* cleanup before the delete */
 //=============================================================================
 void GUIEdit::removeWindowCleanup( GameWindow *window )
@@ -1425,7 +1415,7 @@ void GUIEdit::removeWindowCleanup( GameWindow *window )
 	for( child = window->winGetChild(); child; child = child->winGetNext() )
 		removeWindowCleanup( child );
 
-}  // end removeWindowCleanup
+}
 
 // GUIEdit::deleteWindow ======================================================
 /** Delete the window from the editor */
@@ -1442,7 +1432,7 @@ void GUIEdit::deleteWindow( GameWindow *window )
 	// we've changed contents
 	setUnsaved( TRUE );
 
-}  // end deleteWindow
+}
 
 // GUIEdit::newWindow =========================================================
 /** Create a new window of the specified type.  This is the single creation
@@ -1458,7 +1448,7 @@ GameWindow *GUIEdit::newWindow( UnsignedInt windowStyle,
 	// create the appropriate window based on style bit passed in
 	switch( windowStyle )
 	{
-	
+
 		// ------------------------------------------------------------------------
 		case GWS_USER_WINDOW:
 			window = newUserWindow( parent, x, y, width, height );
@@ -1498,7 +1488,7 @@ GameWindow *GUIEdit::newWindow( UnsignedInt windowStyle,
 		case GWS_SCROLL_LISTBOX:
 			window = newListbox( parent, x, y, width, height );
 			break;
-		
+
 		// ------------------------------------------------------------------------
 		case GWS_COMBO_BOX:
 			window = newComboBox( parent, x, y, width, height );
@@ -1521,20 +1511,20 @@ GameWindow *GUIEdit::newWindow( UnsignedInt windowStyle,
 
 		// ------------------------------------------------------------------------
 		default:
-			MessageBox( m_appHWnd, "Unknown window type to newWindow()", "ERROR", 
+			MessageBox( m_appHWnd, "Unknown window type to newWindow()", "ERROR",
 									MB_OK | MB_ICONERROR );
 			break;
 
-	}  // end switch
+	}
 
 	return window;
 
-}  // end newWindow
+}
 
 // GUIEdit::newUserWindow =====================================================
 /** Create a new window at the given location */
 //=============================================================================
-GameWindow *GUIEdit::newUserWindow( GameWindow *parent, Int x, Int y, 
+GameWindow *GUIEdit::newUserWindow( GameWindow *parent, Int x, Int y,
 																		Int width, Int height )
 {
 	UnsignedInt status = WIN_STATUS_ENABLED;
@@ -1587,7 +1577,7 @@ GameWindow *GUIEdit::newUserWindow( GameWindow *parent, Int x, Int y,
 
 	return window;
 
-}  // end newUserWindow
+}
 
 // GUIEdit::newPushButton =====================================================
 /** Create a new push button */
@@ -1669,7 +1659,7 @@ GameWindow *GUIEdit::newPushButton( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -1679,7 +1669,7 @@ GameWindow *GUIEdit::newPushButton( GameWindow *parent,
 
 	return window;
 
-}  // end newPushButton
+}
 
 // GUIEdit::newCheckBox =======================================================
 /** Create a new check box */
@@ -1774,7 +1764,7 @@ GameWindow *GUIEdit::newCheckBox( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -1784,7 +1774,7 @@ GameWindow *GUIEdit::newCheckBox( GameWindow *parent,
 
 	return window;
 
-}  // end newCheckBox
+}
 
 // GUIEdit::newRadioButton ====================================================
 /** Create a new radio button */
@@ -1882,7 +1872,7 @@ GameWindow *GUIEdit::newRadioButton( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -1892,7 +1882,7 @@ GameWindow *GUIEdit::newRadioButton( GameWindow *parent,
 
 	return window;
 
-}  // end newRadioButton
+}
 
 // GUIEdit::newTabControl ====================================================
 /** Create a tab control gadget */
@@ -1986,7 +1976,7 @@ GameWindow *GUIEdit::newTabControl( GameWindow *parent,
 		GadgetTabControlSetEnabledBorderColorBackground( window, info->borderColor );
 
 
-	
+
 		info = TheDefaultScheme->getImageAndColor( TC_TAB_0_DISABLED );
 		GadgetTabControlSetDisabledImageTabZero( window, info->image );
 		GadgetTabControlSetDisabledColorTabZero( window, info->color );
@@ -2033,7 +2023,7 @@ GameWindow *GUIEdit::newTabControl( GameWindow *parent,
 		GadgetTabControlSetDisabledBorderColorBackground( window, info->borderColor );
 
 
-		
+
 
 		info = TheDefaultScheme->getImageAndColor( TC_TAB_0_HILITE );
 		GadgetTabControlSetHiliteImageTabZero( window, info->image );
@@ -2080,7 +2070,7 @@ GameWindow *GUIEdit::newTabControl( GameWindow *parent,
 		GadgetTabControlSetHiliteColorBackground( window, info->color );
 		GadgetTabControlSetHiliteBorderColorBackground( window, info->borderColor );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -2090,13 +2080,13 @@ GameWindow *GUIEdit::newTabControl( GameWindow *parent,
 
 	return window;
 
-}  // end newTabControl
+}
 
 // GUIEdit::newHorizontalSlider ===============================================
 /** Create a new horizontal slider*/
 //=============================================================================
 GameWindow *GUIEdit::newHorizontalSlider( GameWindow *parent,
-																					Int x, Int y, 
+																					Int x, Int y,
 																					Int width, Int height )
 {
 	GameWindow *window;
@@ -2201,7 +2191,7 @@ GameWindow *GUIEdit::newHorizontalSlider( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -2211,13 +2201,13 @@ GameWindow *GUIEdit::newHorizontalSlider( GameWindow *parent,
 
 	return window;
 
-}  // end newHorizontalSlider
+}
 
 // GUIEdit::newVerticlaSlider =================================================
 /** Create a new vertical slider */
 //=============================================================================
 GameWindow *GUIEdit::newVerticalSlider( GameWindow *parent,
-																				Int x, Int y, 
+																				Int x, Int y,
 																				Int width, Int height )
 {
 	GameWindow *window;
@@ -2322,7 +2312,7 @@ GameWindow *GUIEdit::newVerticalSlider( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -2332,13 +2322,13 @@ GameWindow *GUIEdit::newVerticalSlider( GameWindow *parent,
 
 	return window;
 
-}  // end newVerticalSlider
+}
 
 // GUIEdit::newProgressBar ====================================================
 /** Create a new progress bar */
 //=============================================================================
 GameWindow *GUIEdit::newProgressBar( GameWindow *parent,
-																		 Int x, Int y, 
+																		 Int x, Int y,
 																		 Int width, Int height )
 {
 	GameWindow *window;
@@ -2457,7 +2447,7 @@ GameWindow *GUIEdit::newProgressBar( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -2467,13 +2457,13 @@ GameWindow *GUIEdit::newProgressBar( GameWindow *parent,
 
 	return window;
 
-}  // end newProgressBar
+}
 
 // GUIEdit::newListbox ========================================================
 /** Create a new list box */
 //=============================================================================
 GameWindow *GUIEdit::newComboBox( GameWindow *parent,
-																 Int x, Int y, 
+																 Int x, Int y,
 																 Int width, Int height )
 {
 	GameWindow *window;
@@ -2496,12 +2486,12 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 
 	ComboBoxData *comboData = new ComboBoxData;
 	memset ( comboData, 0, sizeof(comboData));
-	
+
 	comboData->entryData = new EntryData;
 	memset ( comboData->entryData, 0, sizeof(EntryData));
 	comboData->listboxData = new ListboxData;
 	memset ( comboData->listboxData, 0, sizeof(ListboxData));
-		
+
 
 	//initialize combo box data
 	comboData->isEditable = TRUE;
@@ -2511,14 +2501,14 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 	comboData->dontHide = FALSE;
 	comboData->asciiOnly = FALSE;
 	comboData->lettersAndNumbersOnly = FALSE;
-		
+
 	//initialize entry data
 	comboData->entryData->maxTextLen = 16;
 	comboData->entryData->alphaNumericalOnly = FALSE;
 	comboData->entryData->aSCIIOnly = FALSE;
 	comboData->entryData->numericalOnly = FALSE;
 
-	
+
 	//initialize listbox data
 	comboData->listboxData->listLength = 10;
 	comboData->listboxData->autoScroll = 0;
@@ -2542,7 +2532,7 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 																								TRUE );
 
 	// set default colors based on the default scheme
-	
+
 	if( window )
 	{
 		ImageAndColorInfo *info;
@@ -2711,7 +2701,7 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 				GadgetButtonSetHiliteSelectedColor( upButton, info->color );
 				GadgetButtonSetHiliteSelectedBorderColor( upButton, info->borderColor );
 
-			}  // end if
+			}
 
 			GameWindow *downButton = GadgetListBoxGetDownButton( listBox );
 			if( downButton )
@@ -2744,7 +2734,7 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 				GadgetButtonSetHiliteSelectedColor( downButton, info->color );
 				GadgetButtonSetHiliteSelectedBorderColor( downButton, info->borderColor );
 
-			}  // end if
+			}
 
 			GameWindow *slider = GadgetListBoxGetSlider( listBox );
 			if( slider )
@@ -2816,7 +2806,7 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 				GadgetSliderSetHiliteSelectedThumbBorderColor( slider, info->borderColor );
 
 				}
-		} //end listbox if
+		}
 		GameWindow *dropDownButton = GadgetComboBoxGetDropDownButton( window );
 		if( dropDownButton )
 		{
@@ -2848,7 +2838,7 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 			GadgetButtonSetHiliteSelectedColor( dropDownButton, info->color );
 			GadgetButtonSetHiliteSelectedBorderColor( dropDownButton, info->borderColor );
 
-		}  // end if
+		}
 
 		Color color, border;
 
@@ -2864,15 +2854,15 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 		color = TheDefaultScheme->getHiliteTextColor();
 		border = TheDefaultScheme->getHiliteTextBorderColor();
 		window->winSetHiliteTextColors( color, border );
-		
+
 		/// @TODO: We still need to set the IME Composite Text colors in TheDefaultScheme
 		window->winSetIMECompositeTextColors( color, border );
 
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
-		
-	}// end if
-	
+
+	}
+
 	// contents have changed
 	setUnsaved( TRUE );
 
@@ -2882,13 +2872,13 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 	return window;
 
 
-} // end newComboBox
+}
 
 // GUIEdit::newListbox ========================================================
 /** Create a new list box */
 //=============================================================================
 GameWindow *GUIEdit::newListbox( GameWindow *parent,
-																 Int x, Int y, 
+																 Int x, Int y,
 																 Int width, Int height )
 {
 	GameWindow *window;
@@ -3012,7 +3002,7 @@ GameWindow *GUIEdit::newListbox( GameWindow *parent,
 			GadgetButtonSetHiliteSelectedColor( upButton, info->color );
 			GadgetButtonSetHiliteSelectedBorderColor( upButton, info->borderColor );
 
-		}  // end if
+		}
 
 		GameWindow *downButton = GadgetListBoxGetDownButton( window );
 		if( downButton )
@@ -3045,7 +3035,7 @@ GameWindow *GUIEdit::newListbox( GameWindow *parent,
 			GadgetButtonSetHiliteSelectedColor( downButton, info->color );
 			GadgetButtonSetHiliteSelectedBorderColor( downButton, info->borderColor );
 
-		}  // end if
+		}
 
 		GameWindow *slider = GadgetListBoxGetSlider( window );
 		if( slider )
@@ -3116,7 +3106,7 @@ GameWindow *GUIEdit::newListbox( GameWindow *parent,
 			GadgetSliderSetHiliteSelectedThumbColor( slider, info->color );
 			GadgetSliderSetHiliteSelectedThumbBorderColor( slider, info->borderColor );
 
-		}  // end if, slider
+		}
 
 		Color color, border;
 
@@ -3135,7 +3125,7 @@ GameWindow *GUIEdit::newListbox( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -3145,13 +3135,13 @@ GameWindow *GUIEdit::newListbox( GameWindow *parent,
 
 	return window;
 
-}	 // end newListbox
+}
 
 // GUIEdit::newTextEntry ======================================================
 /** Create a new text entry */
 //=============================================================================
 GameWindow *GUIEdit::newTextEntry( GameWindow *parent,
-																	 Int x, Int y, 
+																	 Int x, Int y,
 																	 Int width, Int height )
 {
 	GameWindow *window;
@@ -3241,7 +3231,7 @@ GameWindow *GUIEdit::newTextEntry( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -3251,13 +3241,13 @@ GameWindow *GUIEdit::newTextEntry( GameWindow *parent,
 
 	return window;
 
-}  // end newTextEntry
+}
 
 // GUIEdit::newStaticText =====================================================
 /** Create a new static text*/
 //=============================================================================
 GameWindow *GUIEdit::newStaticText( GameWindow *parent,
-																		Int x, Int y, 
+																		Int x, Int y,
 																		Int width, Int height )
 {
 	GameWindow *window;
@@ -3329,7 +3319,7 @@ GameWindow *GUIEdit::newStaticText( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -3339,7 +3329,7 @@ GameWindow *GUIEdit::newStaticText( GameWindow *parent,
 
 	return window;
 
-}  // end newStaticText
+}
 
 // GUIEdit::createStatusBar ===================================================
 /** Create a status bar at the bottom of the editor */
@@ -3352,14 +3342,14 @@ void GUIEdit::createStatusBar( void )
 
 	// create the bar
 	m_statusBarHWnd = CreateStatusWindow( WS_CHILD |
-																				WS_VISIBLE | 
-																				WS_CLIPSIBLINGS | 
-																				CCS_BOTTOM | 
+																				WS_VISIBLE |
+																				WS_CLIPSIBLINGS |
+																				CCS_BOTTOM |
 																				SBARS_SIZEGRIP,
 																				"Ready",
 																				m_appHWnd,
 																				STATUS_BAR_ID );
-	
+
 	// get size of status bar
 	GetWindowRect( m_statusBarHWnd, &rect );
 	width = rect.right - rect.left;
@@ -3373,11 +3363,11 @@ void GUIEdit::createStatusBar( void )
 
 		sizes[ i ] = (i + 1) * (width / STATUS_NUM_PARTS);
 
-	}  // end for i
+	}
 	sizes[ STATUS_NUM_PARTS - 1 ] = -1;  // right edge
   SendMessage( m_statusBarHWnd, SB_SETPARTS, STATUS_NUM_PARTS, (LPARAM)sizes );
 
-}  // end createStatusBar
+}
 
 // GUIEdit::statusMessage =====================================================
 /** Set a message in the status bar */
@@ -3388,17 +3378,17 @@ void GUIEdit::statusMessage( StatusPart part, const char *message )
 	// check for out of bounds part
 	if( part < 0 || part >= STATUS_NUM_PARTS )
 	{
-	
-		DEBUG_LOG(( "Status message part out of range '%d', '%s'\n", part, message ));
+
+		DEBUG_LOG(( "Status message part out of range '%d', '%s'", part, message ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	if( m_statusBarHWnd )
 		SendMessage( m_statusBarHWnd, SB_SETTEXT, part, (LPARAM)message );
 
-}  // end statusMessage
+}
 
 // GUIEdit::createToolbar =====================================================
 /** Create the toolbar for the editor */
@@ -3406,7 +3396,7 @@ void GUIEdit::statusMessage( StatusPart part, const char *message )
 void GUIEdit::createToolbar( void )
 {
 
-}  // end createToolbar
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -3431,7 +3421,7 @@ Bool GUIEdit::newLayout( void )
 
 	return TRUE;
 
-}  // end newLayout
+}
 
 // GUIEdit::menuExit ==========================================================
 /** The user clicked on exit in the menu and wishes to exit the editor */
@@ -3447,7 +3437,7 @@ Bool GUIEdit::menuExit( void )
 	if( m_unsaved )
 	{
 
-		result = MessageBox( m_appHWnd, "Save file before quitting?", 
+		result = MessageBox( m_appHWnd, "Save file before quitting?",
 												 "Save?", MB_YESNOCANCEL );
 		if( result == IDCANCEL )
 			return TRUE;  // no error
@@ -3456,20 +3446,20 @@ Bool GUIEdit::menuExit( void )
 			Bool success;
 
 			// save all our data
-			success = TheEditor->menuSave();
+			success = menuSave();
 
 			//
 			// if we were unable to save file ask them if it's still OK to
 			// quit and lose the data
 			//
 			if( success == FALSE )
-				MessageBox( m_appHWnd, 
-										"File not saved.  If you continue to exit all data will be LOST!", 
+				MessageBox( m_appHWnd,
+										"File not saved.  If you continue to exit all data will be LOST!",
 										"File Not Saved", MB_OK );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// ask them if they really want to quit
 	result = MessageBox( m_appHWnd, "Exit GUIEdit?", "Really Quit?", MB_YESNO );
@@ -3478,14 +3468,14 @@ Bool GUIEdit::menuExit( void )
 
 	return TRUE;
 
-}  // end menuExit
+}
 
 // GUIEdit::menuNew ===========================================================
 /** file->new menu option */
 //=============================================================================
 Bool GUIEdit::menuNew( void )
 {
-	
+
 	//
 	// if the current data is unsaved ask the user if they want to save
 	// before proceeding with a new layout
@@ -3494,7 +3484,7 @@ Bool GUIEdit::menuNew( void )
 	{
 		Int result;
 
-		result = MessageBox( m_appHWnd, 
+		result = MessageBox( m_appHWnd,
 												 "Current data is not saved.  Save before proceeding?",
 												 "Save?",
 												 MB_YESNOCANCEL );
@@ -3518,11 +3508,11 @@ Bool GUIEdit::menuNew( void )
 				if( result == IDNO )
 					return TRUE;  // they chose to proceed anyway, no error
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// reset the layout in the editor
 	strcpy( m_savePathAndFilename, "" );
@@ -3532,7 +3522,7 @@ Bool GUIEdit::menuNew( void )
 
 	return TRUE;
 
-}  // end menuNew
+}
 
 // GUIEdit::stripNameDecorations ==============================================
 /** Strip name decorations of the entire tree of windows */
@@ -3549,7 +3539,6 @@ void GUIEdit::stripNameDecorations( GameWindow *root )
 
 	if( !instData->m_decoratedNameString.isEmpty() )
 	{
-		char nameOnly[ MAX_WINDOW_NAME_LEN ];
 		const char *c;
 
 		// skip past the "filename.wnd:" to the name only
@@ -3560,15 +3549,12 @@ void GUIEdit::stripNameDecorations( GameWindow *root )
 			// skip beyong the scope resolution colon
 			c++;
 
-			// copy the name
-			strcpy( nameOnly, c );
-
 			// put the name only in the decoration field
-			instData->m_decoratedNameString = nameOnly;
+			instData->m_decoratedNameString = c;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// strip from children
 	GameWindow *child;
@@ -3578,7 +3564,7 @@ void GUIEdit::stripNameDecorations( GameWindow *root )
 	// onto the next
 	stripNameDecorations( root->winGetNext() );
 
-}  // end stripNameDecorations
+}
 
 //=============================================================================
 /** After a load, we will restore default callbacks to all user windows
@@ -3600,7 +3586,7 @@ void GUIEdit::revertDefaultCallbacks( GameWindow *root )
 		root->winSetTooltipFunc( TheWindowManager->getDefaultTooltip() );
 		root->winSetDrawFunc( TheWindowManager->getDefaultDraw() );
 
-	}  // end if
+	}
 
 	// do the children
 	revertDefaultCallbacks( root->winGetChild() );
@@ -3608,7 +3594,7 @@ void GUIEdit::revertDefaultCallbacks( GameWindow *root )
 	// do the next window
 	revertDefaultCallbacks( root->winGetNext() );
 
-}  // end revertDefaultCallbacks
+}
 
 // GUIEdit::menuOpen ==========================================================
 /** User has clicked on file->open */
@@ -3625,7 +3611,7 @@ Bool GUIEdit::menuOpen( void )
 	{
 		Int result;
 
-		result = MessageBox( m_appHWnd, 
+		result = MessageBox( m_appHWnd,
 												 "Current data is not saved.  Save before proceeding?",
 												 "Save?",
 												 MB_YESNOCANCEL );
@@ -3649,11 +3635,11 @@ Bool GUIEdit::menuOpen( void )
 				if( result == IDNO )
 					return TRUE;  // they chose to proceed anyway, no error
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// open the standard window file browser
 	filePath = openDialog();
@@ -3667,10 +3653,10 @@ Bool GUIEdit::menuOpen( void )
 	// just the filename in members of the editor
 	//
 	setSaveFile( filePath );
-	
+
 	// clear the contents of the editor
 	newLayout();
-	
+
 	// load the new layout file
 	WindowLayoutInfo info;
 	TheWindowManager->winCreateFromScript( AsciiString(filePath), &info );
@@ -3708,7 +3694,7 @@ Bool GUIEdit::menuOpen( void )
 
 	return TRUE;
 
-}  // end menuOpen
+}
 
 // GUIEdit::menuSave ==========================================================
 /** file->save menu option */
@@ -3729,17 +3715,17 @@ Bool GUIEdit::menuSave( void )
 		// our contents are now considered "unchanged"
 		setUnsaved( FALSE );
 
-	}  // end if
+	}
 	else
 	{
-		
+
 		MessageBox( m_appHWnd, "Layout not saved!", "Error", MB_OK );
 
-	}  // end else
+	}
 
 	return success;
 
-}  // end menuSave
+}
 
 // GUIEdit::menuSaveAs ========================================================
 /** file->saveAs menu option */
@@ -3767,17 +3753,17 @@ Bool GUIEdit::menuSaveAs( void )
 		// our contents are now considered "unchanged"
 		setUnsaved( FALSE );
 
-	}  // end if
+	}
 	else
 	{
-		
+
 		MessageBox( m_appHWnd, "Layout not saved!", "Error", MB_OK );
 
-	}  // end else
+	}
 
 	return success;
 
-}  // end menuSaveAs
+}
 
 // GUIEdit::menuCopy ==========================================================
 /** Copy selected windows into clipboard */
@@ -3791,21 +3777,21 @@ Bool GUIEdit::menuCopy( void )
 	if( select == NULL )
 	{
 
-		MessageBox( m_appHWnd, "You must have windows selected before you can copy them.", 
+		MessageBox( m_appHWnd, "You must have windows selected before you can copy them.",
 								"No Windows Selected", MB_OK );
 		return TRUE;
 
-	}  // end if
+	}
 
 	//
-	// cut the selected windows out of the current window system, and 
+	// cut the selected windows out of the current window system, and
 	// into the clipboard
 	//
 	TheGUIEditWindowManager->copySelectedToClipboard();
 
 	return TRUE;
 
-}  // end menuCopy
+}
 
 // GUIEdit::menuPaste =========================================================
 /** Paste contents of clipboard into current layout */
@@ -3816,7 +3802,7 @@ Bool GUIEdit::menuPaste( void )
 	TheGUIEditWindowManager->pasteClipboard();
 	return TRUE;
 
-}  // end menuPaste
+}
 
 // GUIEdit::menuCut ===========================================================
 /** Cut selected windows into the clipboard */
@@ -3830,21 +3816,21 @@ Bool GUIEdit::menuCut( void )
 	if( select == NULL )
 	{
 
-		MessageBox( m_appHWnd, "You must have windows selected before you can cut.", 
+		MessageBox( m_appHWnd, "You must have windows selected before you can cut.",
 								"No Windows Selected", MB_OK );
 		return TRUE;
 
-	}  // end if
+	}
 
 	//
-	// cut the selected windows out of the current window system, and 
+	// cut the selected windows out of the current window system, and
 	// into the clipboard
 	//
 	TheGUIEditWindowManager->cutSelectedToClipboard();
 
 	return TRUE;
 
-}  // end menuCut
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -3868,7 +3854,7 @@ Bool GUIEdit::isWindowSelected( GameWindow *window )
 	else
 		return FALSE;
 
-}  // end isWindowSelected
+}
 
 // GUIEdit::selectWindow ======================================================
 /** Add window to selection list */
@@ -3890,11 +3876,11 @@ void GUIEdit::selectWindow( GameWindow *window )
 	if( entry == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to allocate selection entry for window\n" ));
+		DEBUG_LOG(( "Unable to allocate selection entry for window" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// fill out information and tie to head of list
 	entry->window = window;
@@ -3908,7 +3894,7 @@ void GUIEdit::selectWindow( GameWindow *window )
 	if( selectionCount() == 1 )
 		TheHierarchyView->selectWindow( window );
 
-}  // end selectWindow
+}
 
 // GUIEdit::unSelectWindow ====================================================
 /** Remove window from the selection list */
@@ -3937,9 +3923,9 @@ void GUIEdit::unSelectWindow( GameWindow *window )
 		// delete the entry
 		delete entry;
 
-	}  // end if
+	}
 
-}  // end unSelectWindow
+}
 
 // GUIEdit::clearSelections ===================================================
 /** Clear the entire selection list */
@@ -3950,7 +3936,7 @@ void GUIEdit::clearSelections( void )
 	while( m_selectList )
 		unSelectWindow( m_selectList->window );
 
-}  // end clearSelections
+}
 
 // GUIEdit::selectionCount ====================================================
 /** How many items are selected */
@@ -3967,11 +3953,11 @@ Int GUIEdit::selectionCount( void )
 		count++;
 		select = select->next;
 
-	}  // end while
+	}
 
 	return count;
 
-}  // end selectionCount
+}
 
 // GUIEdit::notifyNewWindow ===================================================
 /** The passed in window has just been added into the GUI layout.  It
@@ -4005,16 +3991,16 @@ void GUIEdit::notifyNewWindow( GameWindow *window )
 		for( child = window->winGetChild(); child; child = child->winGetNext() )
 			notifyNewWindow( child );
 
-	}  // end if
+	}
 
-}  // end notifyNewWindow
+}
 
 // GUIEdit::deleteSelected ====================================================
 /** Delete the windows in the selection list */
 //=============================================================================
 void GUIEdit::deleteSelected( void )
 {
-	Int count = TheEditor->selectionCount();
+	Int count = selectionCount();
 	Int i;
 	GameWindow **deleteList;
 	WindowSelectionEntry *select;
@@ -4028,12 +4014,12 @@ void GUIEdit::deleteSelected( void )
 	deleteList = new GameWindow *[ count ];
 	if( deleteList == NULL )
 	{
-	
-		DEBUG_LOG(( "Cannot allocate delete list!\n" ));
+
+		DEBUG_LOG(( "Cannot allocate delete list!" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// fill out the delete list
 	for( i = 0, select = m_selectList; i < count; i++, select = select->next )
@@ -4046,17 +4032,17 @@ void GUIEdit::deleteSelected( void )
 	// free memory for the delete list
 	delete [] deleteList;
 
-}  // end deleteSelected
+}
 
 // GUIEdit::bringSelectedToTop ================================================
 /** Bring the selected windows to the top so they draw on top of
-	* other windows.  For window with no parents this brings them to 
+	* other windows.  For window with no parents this brings them to
 	* the top of the window stack for all windows, for child windows it will
 	* bring them to the top of the child list for their parent */
 //=============================================================================
 void GUIEdit::bringSelectedToTop( void )
 {
-	Int count = TheEditor->selectionCount();
+	Int count = selectionCount();
 
 	// no-op
 	if( count == 0 )
@@ -4072,11 +4058,11 @@ void GUIEdit::bringSelectedToTop( void )
 	if( snapshot == NULL )
 	{
 
-		DEBUG_LOG(( "bringSelectedToTop: Unabled to allocate selectList\n" ));
+		DEBUG_LOG(( "bringSelectedToTop: Unabled to allocate selectList" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// take the snapshot
 	Int i;
@@ -4094,19 +4080,19 @@ void GUIEdit::bringSelectedToTop( void )
 		// update the hierarchy to have the new window on the top
 		TheHierarchyView->bringWindowToTop( snapshot[ i ] );
 
-	}  // end for i
+	}
 
 	// delete the snapshot list
 	delete [] snapshot;
 
-}  // end bringSelectedToTop
+}
 
 // GUIEdit::dragMoveSelectedWindows ===========================================
 /** Move all the windows in the selection list from a drag move, note
-	* that we are keeping the positions within the screen and parent 
+	* that we are keeping the positions within the screen and parent
 	* windows */
 //=============================================================================
-void GUIEdit::dragMoveSelectedWindows( ICoord2D *dragOrigin, 
+void GUIEdit::dragMoveSelectedWindows( ICoord2D *dragOrigin,
 																			 ICoord2D *dragDest )
 {
 	WindowSelectionEntry *select;
@@ -4132,22 +4118,22 @@ void GUIEdit::dragMoveSelectedWindows( ICoord2D *dragOrigin,
 		moveLoc.y = origin.y + (dragDest->y - dragOrigin->y);
 
 		// snap move location to grid if on
-		if( (TheEditor->getMode() == MODE_DRAG_MOVE) && TheEditor->isGridSnapOn() )
-			TheEditor->gridSnapLocation( &moveLoc, &moveLoc );
+		if( (getMode() == MODE_DRAG_MOVE) && isGridSnapOn() )
+			gridSnapLocation( &moveLoc, &moveLoc );
 
 		// kee the location legal
 		computeSafeLocation( window, moveLoc.x, moveLoc.y, &safeLoc.x, &safeLoc.y );
-		
+
 		// move the window
 		moveWindowTo( window, safeLoc.x, safeLoc.y );
 
 		// goto next selected window
 		select = select->next;
 
-	}  // end while
+	}
 
 
-}  // end dragMoveSelectedWindows
+}
 
 // GUIEdit::getSelectList =====================================================
 /** Return the selection list */
@@ -4157,7 +4143,7 @@ WindowSelectionEntry *GUIEdit::getSelectList( void )
 
 	return m_selectList;
 
-}  // end getSelectList
+}
 
 // GUIEdit::getFirstSelected ==================================================
 /** Get the first GameWindow * from the selection list */
@@ -4170,7 +4156,7 @@ GameWindow *GUIEdit::getFirstSelected( void )
 
 	return NULL;
 
-}  // end getFirstSelected
+}
 
 // GUIEdit::computeSafeLocation ===============================================
 /** If we attempt to move the window to the given (x,y) it may result
@@ -4217,8 +4203,8 @@ void GUIEdit::computeSafeLocation( GameWindow *window,
 		else if( region.hi.y + dy > parentSize.y )
 			dy = parentSize.y - region.hi.y;
 
-	}  // end else if, parent
-			
+	}
+
 	// Move the window, but keep it completely visible within screen boundaries
 	IRegion2D newRegion;
 	ICoord2D grabSize;
@@ -4248,7 +4234,7 @@ void GUIEdit::computeSafeLocation( GameWindow *window,
 	*safeX = newRegion.lo.x;
 	*safeY = newRegion.lo.y;
 
-}  // end computeSafeLocation
+}
 
 // GUIEdit::computeSafeSizeLocation ===========================================
 /** Like the method computeSafeLocation, this method also takes into
@@ -4274,7 +4260,7 @@ void GUIEdit::computeSafeSizeLocation( GameWindow *window,
 	ICoord2D parentSize;
 	ICoord2D topLeftLimit;
 	ICoord2D bottomRightLimit;
-		
+
 	// get parent window and data is present
 	parent = window->winGetParent();
 	if( parent )
@@ -4283,7 +4269,7 @@ void GUIEdit::computeSafeSizeLocation( GameWindow *window,
 		parent->winGetScreenPosition( &parentLoc.x, &parentLoc.y );
 		parent->winGetSize( &parentSize.x, &parentSize.y );
 
-	}  // end if
+	}
 
 	// upper left corner must be in screen or in parent
 	topLeftLimit.x = 0;  // screen top left
@@ -4311,7 +4297,7 @@ void GUIEdit::computeSafeSizeLocation( GameWindow *window,
 		bottomRightLimit.x = parentLoc.x + parentSize.x;
 		bottomRightLimit.y = parentLoc.y + parentSize.y;
 
-	}  // end if
+	}
 	if( newX + newWidth > bottomRightLimit.x )
 		newWidth = bottomRightLimit.x - newX;
 	if( newY + newHeight > bottomRightLimit.y )
@@ -4328,7 +4314,7 @@ void GUIEdit::computeSafeSizeLocation( GameWindow *window,
 		*safeY = *safeY - parentLoc.y;
 	}
 
-}  // end computeSafeSizeLocation
+}
 
 // GUIEdit::computeResizeLocation =============================================
 /** Given the current resize drag mode, the selected window to resize,
@@ -4338,7 +4324,7 @@ void GUIEdit::computeSafeSizeLocation( GameWindow *window,
 //=============================================================================
 void GUIEdit::computeResizeLocation( EditMode resizeMode,
 																		 GameWindow *window,
-																		 ICoord2D *resizeOrigin, 
+																		 ICoord2D *resizeOrigin,
 																		 ICoord2D *resizeDest,
 																		 ICoord2D *resultLoc,
 																		 ICoord2D *resultSize )
@@ -4372,7 +4358,7 @@ void GUIEdit::computeResizeLocation( EditMode resizeMode,
 			// bottom right is the anchor
 			newX = origin.x + (resizeDest->x - resizeOrigin->x);
 			newY = origin.y + (resizeDest->y - resizeOrigin->y);
-	
+
 			// don't let it become too small or inverted
 			if( newX >= bottomRight.x - sizeLimit )
 				newX = bottomRight.x - sizeLimit;
@@ -4395,7 +4381,7 @@ void GUIEdit::computeResizeLocation( EditMode resizeMode,
 			// don't let it become too small or inverted
 			if( newY >= bottomRight.y - sizeLimit )
 				newY = bottomRight.y - sizeLimit;
-	
+
 			// compute new size
 			newSizeX = resizeDest->x - origin.x;
 			newSizeY = (origin.y + size.y) - resizeDest->y;
@@ -4440,7 +4426,7 @@ void GUIEdit::computeResizeLocation( EditMode resizeMode,
 			// compute new size
 			newSizeX = bottomRight.x - newX;
 			newSizeY = resizeDest->y - origin.y;
-			
+
 			// don't let it go inverted
 			if( newSizeY < sizeLimit )
 				newSizeY = sizeLimit;
@@ -4470,7 +4456,7 @@ void GUIEdit::computeResizeLocation( EditMode resizeMode,
 			// left SIDE is the anchor
 			newX = origin.x;
 			newY = origin.y;
-			
+
 			// compute new size
 			newSizeX = resizeDest->x - origin.x;
 			newSizeY = size.y;
@@ -4500,7 +4486,7 @@ void GUIEdit::computeResizeLocation( EditMode resizeMode,
 
 		// ------------------------------------------------------------------------
 		case MODE_RESIZE_LEFT:
-			
+
 			// right SIDE is the anchor
 			newX = resizeDest->x;
 			newY = origin.y;
@@ -4515,19 +4501,19 @@ void GUIEdit::computeResizeLocation( EditMode resizeMode,
 
 			break;
 
-	}  // end switch( resizeMode )
+	}
 
 	// to finalize the size we must now clip to any parent or the screen
-	computeSafeSizeLocation( window, 
-													 newX, newY, 
+	computeSafeSizeLocation( window,
+													 newX, newY,
 													 newSizeX, newSizeY,
-													 &resultLoc->x, &resultLoc->y, 
+													 &resultLoc->x, &resultLoc->y,
 													 &resultSize->x, &resultSize->y );
 
-}  // end computeResizeLocation
+}
 
 // GUIEdit::moveWindowTo ======================================================
-/** Move the window passed into the the absolute position (x,y), 
+/** Move the window passed into the the absolute position (x,y),
 	* note that there is NO SAFE checking done on that position */
 //=============================================================================
 void GUIEdit::moveWindowTo( GameWindow *window, Int x, Int y )
@@ -4537,9 +4523,9 @@ void GUIEdit::moveWindowTo( GameWindow *window, Int x, Int y )
 	window->winSetPosition( x, y );
 
 	// we've now made a change
-	TheEditor->setUnsaved( TRUE );
+	setUnsaved( TRUE );
 
-}  // end moveWindowTo
+}
 
 // GUIEdit::windowIsGadget ====================================================
 /** Return TRUE if this window is one of our predefined gadtet types */
@@ -4553,7 +4539,7 @@ Bool GUIEdit::windowIsGadget( GameWindow *window )
 
 	return BitIsSet( window->winGetStyle(), GWS_GADGET_WINDOW );
 
-}  // end windowIsGadget
+}
 
 // GUIEdit::gridSnapLocation ==================================================
 /** Given the source input point, return in 'snapped' the closest grid
@@ -4569,7 +4555,7 @@ void GUIEdit::gridSnapLocation( ICoord2D *source, ICoord2D *snapped )
 	snapped->x = (source->x / m_gridResolution) * m_gridResolution;
 	snapped->y = (source->y / m_gridResolution) * m_gridResolution;
 
-}  // end gridSnapLocation
+}
 
 // GUIEdit::checkMenuItem =====================================================
 /** Check the menu item from the guiedit main menu */
@@ -4585,7 +4571,7 @@ void GUIEdit::checkMenuItem( Int item )
 	// check it
 	CheckMenuItem( menu, item, MF_CHECKED );
 
-}  // end checkMenuItem
+}
 
 // GUIEdit::unCheckMenuItem ===================================================
 /** Un-check the menu item from the guiedit main menu */
@@ -4601,7 +4587,7 @@ void GUIEdit::unCheckMenuItem( Int item )
 	// check it
 	CheckMenuItem( menu, item, MF_UNCHECKED );
 
-}  // end unCheckMenuItem
+}
 
 // GUIEdit::isNameDuplicate ===================================================
 /** Is the name passed in found as the name of any window in in the
@@ -4623,7 +4609,7 @@ Bool GUIEdit::isNameDuplicate( GameWindow *root, GameWindow *ignore, AsciiString
 	if( root != ignore )
 		if( instData->m_decoratedNameString == name )
 			return TRUE;  // no need to search anymore
-	
+
 	//You only call this on the first child since the call right after it will handle siblings (depth first)
 	GameWindow *child = root->winGetChild();
 	if( isNameDuplicate( child, ignore, name ) == TRUE )
@@ -4632,7 +4618,7 @@ Bool GUIEdit::isNameDuplicate( GameWindow *root, GameWindow *ignore, AsciiString
 	// check the next window in the list
 	return isNameDuplicate( root->winGetNext(), ignore, name );
 
-}  // end isNameDuplicate
+}
 
 // GUIEdit::loadGUIEditFontLibrary ============================================
 /** Load the set of fonts that we will make available to users in
@@ -4655,12 +4641,12 @@ void GUIEdit::loadGUIEditFontLibrary( FontLibrary *library )
 	library->getFont( times, 10, FALSE );
 	library->getFont( times, 10, TRUE );
 
-}  // end loadGUIEditFontLibrary
+}
 
 // GUIEdit::setShowHiddenOutlines =============================================
 //=============================================================================
 void GUIEdit::setShowHiddenOutlines( Bool show )
-{ 
+{
 
 	m_showHiddenOutlines = show;
 
@@ -4669,19 +4655,19 @@ void GUIEdit::setShowHiddenOutlines( Bool show )
 	else
 		CheckMenuItem( GetMenu( m_appHWnd ), MENU_SHOW_HIDDEN_OUTLINES, MF_UNCHECKED );
 
-}  // end setShowHiddenOutlines
+}
 
 // GUIEdit::setShowSeeThruOutlines ============================================
 //=============================================================================
 void GUIEdit::setShowSeeThruOutlines( Bool show )
-{ 
+{
 
-	m_showSeeThruOutlines = show; 
+	m_showSeeThruOutlines = show;
 
 	if( m_showSeeThruOutlines )
 		CheckMenuItem( GetMenu( m_appHWnd ), MENU_SHOW_SEE_THRU_OUTLINES, MF_CHECKED );
 	else
 		CheckMenuItem( GetMenu( m_appHWnd ), MENU_SHOW_SEE_THRU_OUTLINES, MF_UNCHECKED );
 
-}  // end setShowSeeThruOutlines
+}
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp b/Generals/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp
index cc6d6d8c0d5..0ee39f732b9 100644
--- a/Generals/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp
+++ b/Generals/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp
@@ -24,21 +24,21 @@
 
 // FILE: .cpp /////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
 //
 // File name:  .cpp
 //
-// Created:    
+// Created:
 //
-// Desc:       
+// Desc:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -72,7 +72,7 @@
 GUIEditDisplay::GUIEditDisplay( void )
 {
 
-}  // end GUIEditDisplay
+}
 
 // GUIEditDisplay::~GUIEditDisplay ============================================
 /** */
@@ -80,39 +80,39 @@ GUIEditDisplay::GUIEditDisplay( void )
 GUIEditDisplay::~GUIEditDisplay( void )
 {
 
-}  // end ~GUIEditDisplay
+}
 
 // GUIEditDisplay::drawLine ===================================================
 /** draw a line on the display in pixel coordinates with the specified color */
 //=============================================================================
-void GUIEditDisplay::drawLine( Int startX, Int startY, 
-															 Int endX, Int endY, 
+void GUIEditDisplay::drawLine( Int startX, Int startY,
+															 Int endX, Int endY,
 															 Real lineWidth, UnsignedInt lineColor )
 {
 
 	TheEditWindow->drawLine( startX, startY, endX, endY, lineWidth, lineColor );
-	
-}  // end drawLIne
+
+}
 
 // GUIEditDisplay::drawOpenRect ===============================================
-/** draw a rect border on the display in pixel coordinates with the 
+/** draw a rect border on the display in pixel coordinates with the
 	* specified color */
 //=============================================================================
-void GUIEditDisplay::drawOpenRect( Int startX, Int startY, 
+void GUIEditDisplay::drawOpenRect( Int startX, Int startY,
 																	 Int width, Int height,
 																	 Real lineWidth, UnsignedInt lineColor )
 {
 
-	TheEditWindow->drawOpenRect( startX, startY, width, height, 
+	TheEditWindow->drawOpenRect( startX, startY, width, height,
 															 lineWidth, lineColor );
 
-}  // end drawOpenRect
+}
 
 // GUIEditDisplay::drawFillRect ===============================================
-/** draw a filled rect on the display in pixel coords with the 
+/** draw a filled rect on the display in pixel coords with the
 	* specified color */
 //=============================================================================
-void GUIEditDisplay::drawFillRect( Int startX, Int startY, 
+void GUIEditDisplay::drawFillRect( Int startX, Int startY,
 																	 Int width, Int height,
 																	 UnsignedInt color )
 {
@@ -121,24 +121,24 @@ void GUIEditDisplay::drawFillRect( Int startX, Int startY,
 															 width, height,
 															 color );
 
-}  // end drawFillRect
+}
 
 // GUIEditDisplay::drawImage ==================================================
 /** draw an image fit within the screen coordinates */
 //=============================================================================
-void GUIEditDisplay::drawImage( const Image *image, 
-																Int startX, Int startY, 
-																Int endX, Int endY, 
+void GUIEditDisplay::drawImage( const Image *image,
+																Int startX, Int startY,
+																Int endX, Int endY,
 																Color color, DrawImageMode mode )
 {
 
 	TheEditWindow->drawImage( image,
 														startX, startY,
-														endX, endY, 
+														endX, endY,
 														color );
 
 
-}  // end drawImage
+}
 
 // GUIEditDisplay::setClipRegion ==============================================
 /** sets clipping rectangle for 2D drawing operations */
diff --git a/Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp b/Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp
index f42ad19d6a5..8e00fe565fe 100644
--- a/Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp
+++ b/Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp
@@ -33,7 +33,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include <stdlib.h>
-#include <stdio.h>
 
 #include "Common/Debug.h"
 #include "GameClient/GadgetSlider.h"
@@ -70,11 +69,11 @@ Bool GUIEditWindowManager::isWindowInClipboard( GameWindow *window,
 		if( window == other )
 			return TRUE;  // found
 
-	}  // end for window
+	}
 
 	return FALSE;  // not found
 
-}  // end isWindowInClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Add the window to clipboard list */
@@ -97,7 +96,7 @@ void GUIEditWindowManager::linkToClipboard( GameWindow *window,
 		(*list)->winSetPrev( window );
 	*list = window;
 
-}  // end linkToClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Unlink window from the clipboard list */
@@ -125,7 +124,7 @@ void GUIEditWindowManager::unlinkFromClipboard( GameWindow *window,
 	else
 		*list = next;
 
-}  // end unlinkFromClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove selection entries for child windows that also have ANY of
@@ -157,7 +156,7 @@ void GUIEditWindowManager::removeSupervisedChildSelections( void )
 				parentSelected = TRUE;
 			parent = parent->winGetParent();
 
-		}  // end while
+		}
 
 		//
 		// if there is a parent selected then we can remove this
@@ -166,9 +165,9 @@ void GUIEditWindowManager::removeSupervisedChildSelections( void )
 		if( parentSelected == TRUE )
 			TheEditor->unSelectWindow( window );
 
-	}  // end for select
+	}
 
-}  // end removeSupervisedChildSelections
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Traverse the selected window list, any child windows we encounter
@@ -184,7 +183,7 @@ void GUIEditWindowManager::orphanSelectedChildren( void )
 
 	for( select = TheEditor->getSelectList(); select; select = select->next )
 	{
-			
+
 		// get window information
 		window = select->window;
 		parent = window->winGetParent();
@@ -206,11 +205,11 @@ void GUIEditWindowManager::orphanSelectedChildren( void )
 			//
 			window->winSetPosition( pos.x, pos.y );
 
-		}  // end if, we had a parent
+		}
 
-	}  // end for select
+	}
 
-}  // end orphanSelectedChildren
+}
 */
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -228,7 +227,7 @@ GUIEditWindowManager::GUIEditWindowManager( void )
 	m_copySpacing = 8;
 	m_numCopiesPasted = 0;
 
-}  // end GUIEditWindowManager
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -241,7 +240,7 @@ GUIEditWindowManager::~GUIEditWindowManager( void )
 	// free all data on the clipboard
 	resetClipboard();
 
-}  // end ~GUIEditWindowManager
+}
 
 //-------------------------------------------------------------------------------------------------
 /** initialize the system */
@@ -252,7 +251,7 @@ void GUIEditWindowManager::init( void )
 	// extending functionality
 	W3DGameWindowManager::init();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Destroy a game window */
@@ -275,18 +274,18 @@ Int GUIEditWindowManager::winDestroy( GameWindow *window )
 		// set the edit data to NULL in the window
 		window->winSetEditData( NULL );
 
-	}  // end if
+	}
 
 	// call our base class functionality
 	return W3DGameWindowManager::winDestroy( window );
 
-}  // end winDestroy
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a new window by setting up its parameters and callbacks. */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GUIEditWindowManager::winCreate( GameWindow *parent, 
-																						 UnsignedInt status, 
+GameWindow *GUIEditWindowManager::winCreate( GameWindow *parent,
+																						 UnsignedInt status,
 	 																				   Int x, Int y,
 																						 Int width, Int height,
 																						 GameWinSystemFunc system,
@@ -310,11 +309,11 @@ GameWindow *GUIEditWindowManager::winCreate( GameWindow *parent,
 		// attach edit data to window
 		window->winSetEditData( editData );
 
-	}  // end if
+	}
 
 	return window;
 
-}  // end winCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Destroy all windows in the clipboard */
@@ -346,7 +345,7 @@ void GUIEditWindowManager::resetClipboard( void )
 		//
 		winDestroy( window );
 
-	}  // end for window
+	}
 
 	// immediately process the destroyed windows just to be clean here
 	processDestroyList();
@@ -355,7 +354,7 @@ void GUIEditWindowManager::resetClipboard( void )
 	m_clipboard = NULL;
 	m_numCopiesPasted = 0;
 
-}  // end resetClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is the clipboard empty */
@@ -368,7 +367,7 @@ Bool GUIEditWindowManager::isClipboardEmpty( void )
 
 	return FALSE;
 
-}  // end isClipboardEmtpy
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove the selected windows from the current layout and put them into
@@ -395,7 +394,7 @@ void GUIEditWindowManager::cutSelectedToClipboard( void )
 	if( m_clipboard )
 		TheEditor->deleteSelected();
 
-}  // end cutSelectedToClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Given the current window in a list pointed to by 'root', if that
@@ -424,7 +423,7 @@ void GUIEditWindowManager::duplicateSelected( GameWindow *root )
 			//
 			// if our source window had a parent, that means that the child
 			// was selected, but the parent wasn't.  Therefore the new
-			// duplicate has no parent, but needs to have its position 
+			// duplicate has no parent, but needs to have its position
 			// adjusted to be relative to the screen instead of the now
 			// missing parent
 			//
@@ -439,15 +438,15 @@ void GUIEditWindowManager::duplicateSelected( GameWindow *root )
 				pos.x += parentPos.x;
 				pos.y += parentPos.y;
 				duplicate->winSetPosition( pos.x, pos.y );
-				
-			}  // end if
+
+			}
 
 			// add window to the clipboard
 			linkToClipboard( duplicate, &m_clipboard );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 
@@ -457,12 +456,12 @@ void GUIEditWindowManager::duplicateSelected( GameWindow *root )
 		//
 		duplicateSelected( root->winGetChild() );
 
-	}  // end else
+	}
 
 	// move on to the next window
 	duplicateSelected( root->winGetNext() );
 
-}  // end duplicateSelected
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Copy the selected windows to the clipboard */
@@ -487,7 +486,7 @@ void GUIEditWindowManager::copySelectedToClipboard( void )
 	//
 	duplicateSelected( m_windowList );
 
-}  // end copySelectedToClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Take the string representation of the name of the window passed in,
@@ -502,7 +501,7 @@ void GUIEditWindowManager::incrementName( GameWindow *window )
 	// this I will botch it (cuz I'm currently not sure
 	// how to test it)
 	char name[MAX_WINDOW_NAME_LEN];
-	strcpy(name, instData->m_decoratedNameString.str());
+	strlcpy(name, instData->m_decoratedNameString.str(), ARRAY_SIZE(name));
 
 	Int len = strlen( name );
 	char numberBuffer[ MAX_WINDOW_NAME_LEN ];
@@ -514,11 +513,11 @@ void GUIEditWindowManager::incrementName( GameWindow *window )
 	// trivial case, just append a number to the end and get outta here
 	if( len == 0 )
 	{
-		
-		strcat( name, "1" );
+
+		strlcat(name, "1", ARRAY_SIZE(name));
 		goto cleanup;
 
-	}  // end if
+	}
 
 	//
 	// start from the end of the string and back up to the start picking
@@ -540,16 +539,16 @@ void GUIEditWindowManager::incrementName( GameWindow *window )
 			hasNumberSuffix = TRUE;
 			numberBuffer[ j-- ] = c;
 
-		}  // end if
+		}
 		else
 		{
-			
+
 			numberStartIndex = i + 1;
 			break;  // exit for i
 
-		}  // end else
+		}
 
-	}  // end for i
+	}
 
 	//
 	// if we have a number suffix change it to a number, increment it, and
@@ -577,24 +576,24 @@ void GUIEditWindowManager::incrementName( GameWindow *window )
 				name[ i + numberStartIndex ] = numberBuffer[ i ];
 				charsAdded++;
 
-			}  // end if
+			}
 		}
 		name[ numberStartIndex + charsAdded ] = 0;  // terminate at end of new string
 
-	}  // end if
+	}
 	else
 	{
 
 		// no number at end, easy ... just append a number '1'
-		strcat( name, "1" );
+		strlcat(name, "1", ARRAY_SIZE(name));
 
-	}  // end else
+	}
 
 cleanup:
 
 	instData->m_decoratedNameString = name;
 
-}  // end incrementName
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Validate the names for all the windows and child windows in the copy
@@ -644,9 +643,9 @@ void GUIEditWindowManager::validateClipboardNames( GameWindow *root )
 			MessageBox( TheEditor->getWindowHandle(), buffer, "Error Mapping Names", MB_OK );
 			nameOK = TRUE;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// validate our children names
 	GameWindow *child;
@@ -656,7 +655,7 @@ void GUIEditWindowManager::validateClipboardNames( GameWindow *root )
 	// validate the next window in the list
 	validateClipboardNames( root->winGetNext() );
 
-}  // end validateClipboardNames
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Paste the contents of the clipboard into the window world */
@@ -676,7 +675,7 @@ void GUIEditWindowManager::pasteClipboard( void )
 								MB_OK );
 		return;
 
-	}  // end if
+	}
 
 	// create a duplicate of everything in the clipboard
 	assert( m_clipboardDup == NULL );
@@ -727,7 +726,7 @@ void GUIEditWindowManager::pasteClipboard( void )
 		// notify the hierarchy of the new window added
 		TheHierarchyView->addWindow( window, HIERARCHY_ADD_AT_TOP );
 
-	}  // end for window
+	}
 
 	// the clipboard duplicate list is only for the act of pasting
 	assert( m_clipboardDup == NULL );
@@ -754,13 +753,13 @@ void GUIEditWindowManager::pasteClipboard( void )
 		// notify the editor that each of the windows was created
 		TheEditor->notifyNewWindow( window );
 
-	}  // end while
+	}
 
 	// if we did in fact paste a window then our file contents have changed
 	if( firstWindow )
 		TheEditor->setUnsaved( TRUE );
 
-}  // end pasteClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Convinience funtion to copy the Draw state info for a given instance */
@@ -817,7 +816,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 	if( BitIsSet( style, GWS_PUSH_BUTTON ) )
 	{
 
-		duplicate = 
+		duplicate =
 			TheWindowManager->gogoGadgetPushButton( parent,
 																							status,
 																							pos.x,
@@ -828,7 +827,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 																							source->winGetFont(),
 																							FALSE );
 
-	}  // end if
+	}
 	else if( BitIsSet( style, GWS_RADIO_BUTTON ) )
 	{
 		RadioButtonData *radioData = (RadioButtonData *)source->winGetUserData();
@@ -849,11 +848,11 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 																							 source->winGetFont(),
 																							 FALSE );
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_CHECK_BOX ) )
 	{
 
-		duplicate = 
+		duplicate =
 			TheWindowManager->gogoGadgetCheckbox( parent,
 																						status,
 																						pos.x,
@@ -864,7 +863,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 																						source->winGetFont(),
 																						FALSE );
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_HORZ_SLIDER | GWS_VERT_SLIDER ) )
 	{
 		SliderData *sliderData = (SliderData *)source->winGetUserData();
@@ -901,7 +900,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 
 				instData = thumb->winGetInstanceData();
 				sourceInstData = sourceThumb->winGetInstanceData();
-				
+
 				// do the copy of the colors for each state
 				memcpy( &instData->m_enabledDrawData,
 								&sourceInstData->m_enabledDrawData,
@@ -913,25 +912,25 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 								&sourceInstData->m_hiliteDrawData,
 								sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_COMBO_BOX ) )
 	{
 		ComboBoxData *comboData = (ComboBoxData *)source->winGetUserData();
 		ComboBoxData comboDataCopy;
 
-		memset( &comboDataCopy, 0, sizeof( ComboBoxData ) );		
-		
+		memset( &comboDataCopy, 0, sizeof( ComboBoxData ) );
+
 		comboDataCopy.entryData = new EntryData;
 		memset ( comboDataCopy.entryData, 0, sizeof(EntryData));
 		comboDataCopy.listboxData = new ListboxData;
 		memset ( comboDataCopy.listboxData, 0, sizeof(ListboxData));
 
-	
-		
+
+
 		comboDataCopy.entryCount = comboData->entryCount;
 		comboDataCopy.isEditable = comboData->isEditable;
 		comboDataCopy.maxChars = comboData->maxChars;
@@ -954,10 +953,10 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 		comboDataCopy.entryData->aSCIIOnly = comboData->entryData->aSCIIOnly;
 		comboDataCopy.entryData->maxTextLen = comboData->entryData->maxTextLen;
 		comboDataCopy.entryData->numericalOnly = comboData->entryData->numericalOnly;
-		
-		
 
-		duplicate = 
+
+
+		duplicate =
 			TheWindowManager->gogoGadgetComboBox( parent,
 																					 status,
 																					 pos.x,
@@ -979,7 +978,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 			ComboBoxData *sourceComboData = (ComboBoxData *)source->winGetUserData();
 			WinInstanceData *instData;
 			WinInstanceData *sourceInstData;
-			
+
 
 			// drop down button
 			GameWindow *dropDownButton = comboData->dropDownButton;
@@ -989,7 +988,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 				instData = dropDownButton->winGetInstanceData();
 				sourceInstData = sourceDropDownButton->winGetInstanceData();
 
-				InstDrawCopy(instData,sourceInstData);			
+				InstDrawCopy(instData,sourceInstData);
 			}
 
 			// edit box
@@ -1000,9 +999,9 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 				instData = editBox->winGetInstanceData();
 				sourceInstData = sourceEditBox->winGetInstanceData();
 
-				InstDrawCopy(instData,sourceInstData);			
+				InstDrawCopy(instData,sourceInstData);
 			}
-			
+
 			// ListBox
 			GameWindow *listBox = comboData->listBox;
 			GameWindow *sourceListBox = sourceComboData->listBox;
@@ -1011,17 +1010,17 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 				instData = listBox->winGetInstanceData();
 				sourceInstData = sourceListBox->winGetInstanceData();
 
-				InstDrawCopy(instData,sourceInstData);			
-				
+				InstDrawCopy(instData,sourceInstData);
+
 				// up button
 				GameWindow *upButton = comboData->listboxData->upButton;
 				GameWindow *sourceUpButton = sourceComboData->listboxData->upButton;
 				if( upButton && sourceUpButton )
 				{
-				
+
 					instData = upButton->winGetInstanceData();
 					sourceInstData = sourceUpButton->winGetInstanceData();
-					
+
 					// do the copy of the colors for each state
 					memcpy( &instData->m_enabledDrawData,
 									&sourceInstData->m_enabledDrawData,
@@ -1033,17 +1032,17 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 									&sourceInstData->m_hiliteDrawData,
 									sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-				}  // if
+				}
 
 				// down button
 				GameWindow *downButton = comboData->listboxData->downButton;
 				GameWindow *sourceDownButton = sourceComboData->listboxData->downButton;
 				if( downButton && sourceDownButton )
 				{
-				
+
 					instData = downButton->winGetInstanceData();
 					sourceInstData = sourceDownButton->winGetInstanceData();
-					
+
 					// do the copy of the colors for each state
 					memcpy( &instData->m_enabledDrawData,
 									&sourceInstData->m_enabledDrawData,
@@ -1055,17 +1054,17 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 									&sourceInstData->m_hiliteDrawData,
 									sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-				}  // if
+				}
 
 				// slider
 				GameWindow *slider = comboData->listboxData->slider;
 				GameWindow *sourceSlider = sourceComboData->listboxData->slider;
 				if( slider && sourceSlider )
 				{
-				
+
 					instData = slider->winGetInstanceData();
 					sourceInstData = sourceSlider->winGetInstanceData();
-					
+
 					// do the copy of the colors for each state
 					memcpy( &instData->m_enabledDrawData,
 									&sourceInstData->m_enabledDrawData,
@@ -1085,7 +1084,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 
 						instData = thumb->winGetInstanceData();
 						sourceInstData = sourceThumb->winGetInstanceData();
-						
+
 					// do the copy of the colors for each state
 					memcpy( &instData->m_enabledDrawData,
 									&sourceInstData->m_enabledDrawData,
@@ -1097,15 +1096,15 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 									&sourceInstData->m_hiliteDrawData,
 									sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-					}  // end if
+					}
 
-				}  // if
+				}
 
-			} // if
+			}
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_SCROLL_LISTBOX ) )
 	{
 		ListboxData *listData = (ListboxData *)source->winGetUserData();
@@ -1142,7 +1141,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 		else
 			listDataCopy.columnWidthPercentage = NULL;
 
-		duplicate = 
+		duplicate =
 			TheWindowManager->gogoGadgetListBox( parent,
 																					 status,
 																					 pos.x,
@@ -1170,10 +1169,10 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 			GameWindow *sourceUpButton = sourceListData->upButton;
 			if( upButton && sourceUpButton )
 			{
-			
+
 				instData = upButton->winGetInstanceData();
 				sourceInstData = sourceUpButton->winGetInstanceData();
-				
+
 				// do the copy of the colors for each state
 				memcpy( &instData->m_enabledDrawData,
 								&sourceInstData->m_enabledDrawData,
@@ -1185,17 +1184,17 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 								&sourceInstData->m_hiliteDrawData,
 								sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-			}  // if
+			}
 
 			// down button
 			GameWindow *downButton = listData->downButton;
 			GameWindow *sourceDownButton = sourceListData->downButton;
 			if( downButton && sourceDownButton )
 			{
-			
+
 				instData = downButton->winGetInstanceData();
 				sourceInstData = sourceDownButton->winGetInstanceData();
-				
+
 				// do the copy of the colors for each state
 				memcpy( &instData->m_enabledDrawData,
 								&sourceInstData->m_enabledDrawData,
@@ -1207,17 +1206,17 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 								&sourceInstData->m_hiliteDrawData,
 								sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-			}  // if
+			}
 
 			// slider
 			GameWindow *slider = listData->slider;
 			GameWindow *sourceSlider = sourceListData->slider;
 			if( slider && sourceSlider )
 			{
-			
+
 				instData = slider->winGetInstanceData();
 				sourceInstData = sourceSlider->winGetInstanceData();
-				
+
 				// do the copy of the colors for each state
 				memcpy( &instData->m_enabledDrawData,
 								&sourceInstData->m_enabledDrawData,
@@ -1237,7 +1236,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 
 					instData = thumb->winGetInstanceData();
 					sourceInstData = sourceThumb->winGetInstanceData();
-					
+
 				// do the copy of the colors for each state
 				memcpy( &instData->m_enabledDrawData,
 								&sourceInstData->m_enabledDrawData,
@@ -1249,13 +1248,13 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 								&sourceInstData->m_hiliteDrawData,
 								sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-				}  // end if
+				}
 
-			}  // if
+			}
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_ENTRY_FIELD ) )
 	{
 		EntryData *entryData = (EntryData *)source->winGetUserData();
@@ -1268,7 +1267,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 		entryDataCopy.numericalOnly = entryData->numericalOnly;
 		entryDataCopy.secretText = entryData->secretText;
 
-		duplicate = 
+		duplicate =
 			TheWindowManager->gogoGadgetTextEntry( parent,
 																						 status,
 																						 pos.x,
@@ -1280,7 +1279,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 																						 source->winGetFont(),
 																						 FALSE );
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_STATIC_TEXT ) )
 	{
 		TextData *textData = (TextData *)source->winGetUserData();
@@ -1288,7 +1287,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 
 		textDataCopy.centered = textData->centered;
 
-		duplicate = 
+		duplicate =
 			TheWindowManager->gogoGadgetStaticText( parent,
 																							status,
 																							pos.x,
@@ -1300,22 +1299,22 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 																							source->winGetFont(),
 																							FALSE );
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_PROGRESS_BAR ) )
 	{
-		
-		duplicate = 
+
+		duplicate =
 			TheWindowManager->gogoGadgetProgressBar( parent,
 																							 status,
 																							 pos.x,
 																							 pos.y,
 																							 size.x,
 																							 size.y,
-																							 &instDataCopy, 
+																							 &instDataCopy,
 																							 source->winGetFont(),
 																							 FALSE );
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_USER_WINDOW ) )
 	{
 
@@ -1329,35 +1328,35 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 																						 NULL,
 																						 &instDataCopy );
 
-	}  // end else if
+	}
 	else
 	{
 
-		MessageBox( TheEditor->getWindowHandle(), 
-								"Cannot duplicate window, undefined style.", 
+		MessageBox( TheEditor->getWindowHandle(),
+								"Cannot duplicate window, undefined style.",
 								"Internal Error", MB_OK );
 		assert( 0 );
 		memset( &instDataCopy, 0, sizeof( instDataCopy ) );  // see comment below
 		return NULL;
 
-	}  // end else
+	}
 
 	// sanity
 	if( duplicate == NULL )
 	{
 
-		MessageBox( TheEditor->getWindowHandle(), "Unable to duplicate window", 
+		MessageBox( TheEditor->getWindowHandle(), "Unable to duplicate window",
 								"Internal Error", MB_OK );
 		assert( 0 );
 		memset( &instDataCopy, 0, sizeof( instDataCopy ) );  // see comment below
 		return NULL;
 
-	}  // end if
+	}
 
 	//
 	// since we're using the real window system here to create things, we
 	// want to immediately remove it from the real system list cause we're
-	// not adding windows to the layout, only duplicating windows in 
+	// not adding windows to the layout, only duplicating windows in
 	// isolation.  Note that child windows are linked to their parents
 	// but that is totally isolated in the parent so that's OK and
 	// necessary.
@@ -1376,7 +1375,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 			*editData = *sourceEditData;
 //			memcpy( editData, sourceEditData, sizeof( GameWindowEditData ) );
 
-	}  // end if
+	}
 
 	//
 	// duplicate all the children for the window, except if this window
@@ -1391,7 +1390,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 		for( child = source->winGetChild(); child; child = child->winGetNext() )
 			duplicateWindow( child, duplicate );
 
-	}  // end if
+	}
 
 	//
 	// the inst data copy was literally a copy, now it's going to go out of
@@ -1403,7 +1402,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 	// return the duped window
 	return duplicate;
 
-}  // end duplicateWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a duplicate everything on the clipboard list and put it
@@ -1435,9 +1434,9 @@ void GUIEditWindowManager::createClipboardDuplicate( void )
 		if( duplicate )
 			linkToClipboard( duplicate, &m_clipboardDup );
 
-	}  // end for
+	}
 
-}  // end createClipboardDuplicate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Make the 'target' a child of the 'parent' */
@@ -1473,7 +1472,7 @@ void GUIEditWindowManager::makeChildOf( GameWindow *target,
 		target->winSetPosition( screenPos.x, screenPos.y );
 		return;
 
-	}  // end if
+	}
 
 	// check to see if this is already out parent, nothing to do
 	if( prevParent == parent )
@@ -1489,7 +1488,7 @@ void GUIEditWindowManager::makeChildOf( GameWindow *target,
 								MB_OK );
 		return;
 
-	}  // end if
+	}
 
 	// get the target screen position before the move to child
 	ICoord2D screenPosBeforeMove;
@@ -1522,19 +1521,19 @@ void GUIEditWindowManager::makeChildOf( GameWindow *target,
 	target->winGetScreenPosition( &origin.x, &origin.y );
 
 	// kee the location legal
-	TheEditor->computeSafeLocation( target, origin.x, origin.y, 
+	TheEditor->computeSafeLocation( target, origin.x, origin.y,
 																	&safeLoc.x, &safeLoc.y );
-	
+
 	// move the target
 	TheEditor->moveWindowTo( target, safeLoc.x, safeLoc.y );
-	
-}  // end makeChildOf
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Move the 'windowToMove' to be just in front of the 'aheadOf' window
 	* in either the master window list or in the child list */
 //-------------------------------------------------------------------------------------------------
-void GUIEditWindowManager::moveAheadOf( GameWindow *windowToMove, 
+void GUIEditWindowManager::moveAheadOf( GameWindow *windowToMove,
 																				GameWindow *aheadOf )
 {
 
@@ -1547,7 +1546,7 @@ void GUIEditWindowManager::moveAheadOf( GameWindow *windowToMove,
 	// same place after we're moved
 	//
 	ICoord2D beforeMoveScreenPos;
-	windowToMove->winGetScreenPosition( &beforeMoveScreenPos.x, 
+	windowToMove->winGetScreenPosition( &beforeMoveScreenPos.x,
 																			&beforeMoveScreenPos.y );
 
 	// get the parent of that which we are moving
@@ -1570,14 +1569,14 @@ void GUIEditWindowManager::moveAheadOf( GameWindow *windowToMove,
 		//
 		windowToMove->winSetPosition( pos.x, pos.y );
 
-	}  // end if
+	}
 	else
 	{
 
 		// just take off the main list
 		unlinkWindow( windowToMove );
-	
-	}  // end else
+
+	}
 
 	// insert the window at the specified location
 	insertWindowAheadOf( windowToMove, aheadOf );
@@ -1607,11 +1606,11 @@ void GUIEditWindowManager::moveAheadOf( GameWindow *windowToMove,
 	windowToMove->winGetScreenPosition( &origin.x, &origin.y );
 
 	// kee the location legal
-	TheEditor->computeSafeLocation( windowToMove, origin.x, origin.y, 
+	TheEditor->computeSafeLocation( windowToMove, origin.x, origin.y,
 																	&safeLoc.x, &safeLoc.y );
-	
+
 	// move the target
 	TheEditor->moveWindowTo( windowToMove, safeLoc.x, safeLoc.y );
 
-}  // end moveAheadOf
+}
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/HierarchyView.cpp b/Generals/Code/Tools/GUIEdit/Source/HierarchyView.cpp
index 887c33b708a..c28bdbb1bb1 100644
--- a/Generals/Code/Tools/GUIEdit/Source/HierarchyView.cpp
+++ b/Generals/Code/Tools/GUIEdit/Source/HierarchyView.cpp
@@ -24,12 +24,12 @@
 
 // FILE: HierarchyView.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -46,7 +46,6 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 #include <commctrl.h>
-#include <string.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
@@ -94,7 +93,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
  		{
 // 			Int x = LOWORD( lParam );
 // 			Int y = HIWORD( lParam );
- 
+
  			// record our position
  			RECT rect;
  			POINT p;
@@ -104,11 +103,11 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
  			ScreenToClient( TheEditor->getWindowHandle(), &p );
  			dialogPos.x = p.x;
  			dialogPos.y = p.y;
- 
+
  			return 0;
- 
- 		}  // end move
- 
+
+ 		}
+
 		// ------------------------------------------------------------------------
 		case WM_SIZE:
 		{
@@ -137,17 +136,17 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 					p.x = treeRect.left;
 					p.y = treeRect.top;
 					ScreenToClient( hWndDialog, &p );
-					MoveWindow( tree, border, p.y, 
-											width - (border * 2), (height - border) - p.y, 
+					MoveWindow( tree, border, p.y,
+											width - (border * 2), (height - border) - p.y,
 											TRUE );
 
-				}  // end if
+				}
+
+			}
 
-			}  // end if
-						
 			return 0;
 
-		}  // end size
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MOUSEMOVE:
@@ -183,7 +182,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 					TreeView_SelectItem( TheHierarchyView->getTreeHandle(), overItem );
 
 					//
-					// if this operation is legal set the cross cursor, otherwise 
+					// if this operation is legal set the cross cursor, otherwise
 					// use the "no" cursor
 					//
 					if( TheHierarchyView->validateDragDropOperation( dragWindow, target ) )
@@ -191,13 +190,13 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 					else
 						SetCursor( LoadCursor( NULL, IDC_NO ) );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
 			return 0;
 
-		}  // end mouse move
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_LBUTTONUP:
@@ -235,7 +234,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 					assert( overWindow );
 
 					// do the drag drop if allowed
-					if( TheHierarchyView->validateDragDropOperation( dragWindow, 
+					if( TheHierarchyView->validateDragDropOperation( dragWindow,
 																													 overWindow ) )
 					{
 
@@ -270,21 +269,21 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 							clearDragWindow = FALSE;
 							TheHierarchyView->setPopupTarget( overWindow );
 
-						}  // end if
+						}
 						else
 						{
 
 							// our only option is to move the window here
 							TheGUIEditWindowManager->moveAheadOf( dragWindow, overWindow );
 
-						}  // end else
+						}
 
 						// we've made a change now
 						TheEditor->setUnsaved( TRUE );
 
-					}  // end if
+					}
 
-				}  // end if
+				}
 
 				// window has been dragged and operation complete
 				if( clearDragWindow )
@@ -293,7 +292,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 					TheHierarchyView->setDragWindow( NULL );
 					TheHierarchyView->setDragTarget( NULL );
 
-				}  // end if
+				}
 
 				// release window capture
 				ReleaseCapture();
@@ -301,11 +300,11 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 				// set the cursor back to normal
 				SetCursor( LoadCursor( NULL, IDC_ARROW ) );
 
-			}  // end if, drag in progress
+			}
 
 			return 0;
 
-		}  // end left button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_RBUTTONUP:
@@ -325,7 +324,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 			if( overItem )
 			{
 				GameWindow *overWindow;
-				
+
 				// get the game window from the tree item
 				overWindow = TheHierarchyView->getWindowFromItem( overItem );
 
@@ -351,12 +350,12 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 				screen.y = y;
 				ClientToScreen( hWndDialog, &screen );
 				TrackPopupMenuEx( subMenu, 0, screen.x, screen.y, hWndDialog, NULL );
-				
-			}  // end if
+
+			}
 
 			return 0;
 
-		}  // end right button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_NOTIFY:
@@ -371,11 +370,11 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 				// --------------------------------------------------------------------
 				case TREE_HIERARCHY:
 				{
-				
+
 					// switch on notify code for the tree
 					switch( notifyMessageHandler->code )
 					{
-						
+
 						// ----------------------------------------------------------------
 						case TVN_SELCHANGED:
 						{
@@ -395,23 +394,23 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 								TheEditor->clearSelections();
 								if( window )
 									TheEditor->selectWindow( window );
-			
-							}  // end if
+
+							}
 
 							break;
 
-						}  // end selection changed
+						}
 
 						// ----------------------------------------------------------------
 						case NM_DBLCLK:
 						{
-							
+
 							// get the selected tree item
 							HTREEITEM selected = TreeView_GetSelection( TheHierarchyView->getTreeHandle() );
 							if( selected )
 							{
 								GameWindow *overWindow;
-								
+
 								// get the game window from the tree item
 								overWindow = TheHierarchyView->getWindowFromItem( selected );
 
@@ -434,13 +433,13 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 								menu = LoadMenu( TheEditor->getInstance(), (LPCTSTR)HIERARCHY_POPUP_MENU );
 								subMenu = GetSubMenu( menu, 0 );
 								GetCursorPos( &screen );
-								TrackPopupMenuEx( subMenu, 0, screen.x, screen.y, hWndDialog, NULL );								
+								TrackPopupMenuEx( subMenu, 0, screen.x, screen.y, hWndDialog, NULL );
 
-							}  // end if
+							}
 
 							break;
 
-						}  // end double click
+						}
 
 						// ----------------------------------------------------------------
 						case TVN_BEGINDRAG:
@@ -450,7 +449,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 
 							// get the item being dragged
 							newItem = treeNotify->itemNew;
-							
+
 							// save the window being dragged
 							TheHierarchyView->setDragWindow( (GameWindow *)newItem.lParam );
 							TheHierarchyView->setDragTarget( NULL );
@@ -460,17 +459,17 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 
 							break;
 
-						}  // end begin left mouse drag
+						}
 
-					}  // end switch
+					}
 
-				}  // end hierarchy
+				}
 
-			}  // end switch
+			}
 
 			return 0;
 
-		}  // end notify
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -499,7 +498,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end hierarchy move window in heirarchy
+				}
 
 				// --------------------------------------------------------------------
 				case HIERARCHY_MAKE_CHILD_HERE:
@@ -518,7 +517,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end hierarchy, make child of
+				}
 
 				// --------------------------------------------------------------------
 				case HIERARCHY_POPUP_MOVE:
@@ -545,7 +544,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end move
+				}
 
 				// --------------------------------------------------------------------
 				case HIERARCHY_POPUP_DELETE:
@@ -557,7 +556,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end delete
+				}
 
 				// --------------------------------------------------------------------
 				case HIERARCHY_POPUP_PROPERTIES:
@@ -572,11 +571,11 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 						ScreenToClient( TheEditWindow->getWindowHandle(), &p );
 						InitPropertiesDialog( target, p.x, p.y );
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end properties
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -586,19 +585,19 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
         case IDCANCEL:
           break;
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end dialogProc
+}
 
 // HierarchyView::findItemEntry ===============================================
 /** Workhorse to find the tree item anywhere in the tree with the
@@ -632,13 +631,13 @@ HTREEITEM HierarchyView::findItemEntry( HTREEITEM node, GameWindow *window )
 		if( found )
 			return found;
 
-	}  // end if
+	}
 
 	// not there, check the siblings
-	return findItemEntry( TreeView_GetNextItem( m_tree, node, TVGN_NEXT ), 
+	return findItemEntry( TreeView_GetNextItem( m_tree, node, TVGN_NEXT ),
 												window );
 
-}  // end findItemEntry
+}
 
 // HierarchyView::findTreeEntry ===============================================
 /** Find the game window entry in the hierarchy tree, if found the
@@ -646,15 +645,15 @@ HTREEITEM HierarchyView::findItemEntry( HTREEITEM node, GameWindow *window )
 //=============================================================================
 HTREEITEM HierarchyView::findTreeEntry( GameWindow *window )
 {
-	
+
 	// no-op
 	if( window == NULL )
 		return NULL;
-		
+
 	// get root and search from there
 	return findItemEntry( TreeView_GetRoot( m_tree ), window );
 
-}  // end findTreeEntry
+}
 
 // HierarchyView::addWindowToTree =============================================
 /** Add a single window to the hierarchy tree */
@@ -699,13 +698,13 @@ void HierarchyView::addWindowToTree( GameWindow *window,
 		if( newItem == NULL )
 		{
 
-			DEBUG_LOG(( "Error adding window to tree\n" ));
+			DEBUG_LOG(( "Error adding window to tree" ));
 			assert( 0 );
 			return;
 
-		}  // end if
+		}
 
-	}  // end if, not in already
+	}
 
 	//
 	// add children if requested, but not on gadgets no matter what becuase
@@ -718,14 +717,14 @@ void HierarchyView::addWindowToTree( GameWindow *window,
 		for( child = window->winGetChild(); child; child = child->winGetNext() )
 			addWindowToTree( child, newItem, HIERARCHY_ADD_AT_BOTTOM, TRUE, TRUE );
 
-	}  // end if
+	}
 
 	// add siblings if requested
 	if( addSiblings )
-		addWindowToTree( window->winGetNext(), treeParent, option, 
+		addWindowToTree( window->winGetNext(), treeParent, option,
 										 addChildren, addSiblings );
 
-}  // end addWindowToTree
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -745,7 +744,7 @@ HierarchyView::HierarchyView( void )
 	m_dragTarget = NULL;
 	m_popupTarget = NULL;
 
-}  // end HierarchyView
+}
 
 // HierarchyView::~HierarchyView ==============================================
 /** */
@@ -756,7 +755,7 @@ HierarchyView::~HierarchyView( void )
 	// call the shutdown
 	shutdown();
 
-}  // end ~HierarchyView
+}
 
 // HierarchyView::init =========================================================
 /** Create the control palette */
@@ -769,9 +768,9 @@ void HierarchyView::init( void )
 	// create the modless dialog box
 	m_dialog = CreateDialog( TheEditor->getInstance(),
 													 (LPCSTR)HIERARCHY_DIALOG,
-													 TheEditor->getWindowHandle(), 
+													 TheEditor->getWindowHandle(),
 													 (DLGPROC)dialogProc );
-	
+
 	// display the dialog
 	ShowWindow( m_dialog, SW_SHOW );
 
@@ -799,7 +798,7 @@ void HierarchyView::init( void )
 	// keep a handle to the tree
 	m_tree = GetDlgItem( m_dialog, TREE_HIERARCHY );
 
-}  // end init
+}
 
 // HierarchyView::reset =======================================================
 /** Reset everything about our hierarchy view */
@@ -811,7 +810,7 @@ void HierarchyView::reset( void )
 	HTREEITEM parentItem = TreeView_GetRoot( m_tree );
 	SendMessage( m_tree, TVM_EXPAND, TVE_COLLAPSERESET, (LPARAM)parentItem );
 
-}  // end reset
+}
 
 // HierarchyView::shutdown ====================================================
 /** Destroy the control palette and all data associated with it */
@@ -824,7 +823,7 @@ void HierarchyView::shutdown( void )
 	m_dialog = NULL;
 	m_tree = NULL;
 
-}  // end shutdown
+}
 
 // HierarchyView::getWindowTreeName ===========================================
 /** Given a window, return a string representation for that window in
@@ -861,7 +860,7 @@ char *HierarchyView::getWindowTreeName( GameWindow *window )
 		strcpy( buffer, "Text Entry" );
 	else if( BitIsSet( style, GWS_SCROLL_LISTBOX ) )
 		strcpy( buffer, "Listbox" );
-	else if( BitIsSet( style, GWS_PROGRESS_BAR ) )	
+	else if( BitIsSet( style, GWS_PROGRESS_BAR ) )
 		strcpy( buffer, "Progress Bar" );
 	else if( BitIsSet( style, GWS_USER_WINDOW ) )
 		strcpy( buffer, "User Window" );
@@ -877,21 +876,21 @@ char *HierarchyView::getWindowTreeName( GameWindow *window )
 	if( !instData->m_decoratedNameString.isEmpty() )
 	{
 
-		strcat( buffer, ": " );
-		strcat( buffer, instData->m_decoratedNameString.str() );
+		strlcat(buffer, ": ", ARRAY_SIZE(buffer));
+		strlcat(buffer, instData->m_decoratedNameString.str(), ARRAY_SIZE(buffer));
 
-	}  // end if
+	}
 
 	return buffer;
 
-}  // end getWindowTreeName
+}
 
 // HierarchyView::addWindow ===================================================
 /** Add a window to the hierarchy view AND any of it's children */
 //=============================================================================
 void HierarchyView::addWindow( GameWindow *window, HierarchyOption option )
 {
-	
+
 	// sanity
 	if( window == NULL || m_dialog == NULL )
 		return;
@@ -913,7 +912,7 @@ void HierarchyView::addWindow( GameWindow *window, HierarchyOption option )
 	//
 	InvalidateRect( m_tree, NULL, TRUE );
 
-}  // end addWindow
+}
 
 // HierarchyView::removeWindow ================================================
 /** Remove the window from the hierarchy tree view */
@@ -948,7 +947,7 @@ void HierarchyView::removeWindow( GameWindow *window )
 	// remove it from the tree
 	TreeView_DeleteItem( m_tree, item );
 
-}  // end removeWindow
+}
 
 // HierarchyView::bringWindowToTop ============================================
 /** Bring the window to the top of its parent list in the hierarchy
@@ -966,11 +965,11 @@ void HierarchyView::bringWindowToTop( GameWindow *window )
 	if( item == NULL )
 	{
 
-		DEBUG_LOG(( "Cannot bring window to top, no entry in tree!\n" ));
+		DEBUG_LOG(( "Cannot bring window to top, no entry in tree!" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// remove the entry from the tree
 	removeWindow( window );
@@ -981,7 +980,7 @@ void HierarchyView::bringWindowToTop( GameWindow *window )
 	// add the window as a child of the parent entry at the top of it's list
 	addWindowToTree( window, itemParent, HIERARCHY_ADD_AT_TOP, TRUE, FALSE );
 
-}  // end bringWindowToTop
+}
 
 // HierarchyView::updateWindowName ============================================
 /** A window name may have been updated, reconstruct its hierarchy
@@ -999,11 +998,11 @@ void HierarchyView::updateWindowName( GameWindow *window )
 	if( item == NULL )
 	{
 
-		DEBUG_LOG(( "updateWindowName: No hierarchy entry for window!\n" ));
+		DEBUG_LOG(( "updateWindowName: No hierarchy entry for window!" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// setup the item to modify in the tree
 	TVITEM modify;
@@ -1014,7 +1013,7 @@ void HierarchyView::updateWindowName( GameWindow *window )
 	// modify the item
 	TreeView_SetItem( m_tree, &modify );
 
-}  // end updateWindowName
+}
 
 // HierarchyView::getDialogPos ================================================
 /** Get the dialog position as recorded from the static */
@@ -1028,7 +1027,7 @@ void HierarchyView::getDialogPos( ICoord2D *pos )
 
 	*pos = dialogPos;
 
-}  // end getDialogPos
+}
 
 // HierarchyView::getDialogSize ===============================================
 /** Get the dialog size as recorded from the static */
@@ -1042,7 +1041,7 @@ void HierarchyView::getDialogSize( ICoord2D *size )
 
 	*size = dialogSize;
 
-}  // end getDialogSize
+}
 
 // HierarchyView::setDialogPos ================================================
 /** */
@@ -1054,10 +1053,10 @@ void HierarchyView::setDialogPos( ICoord2D *pos )
 	if( pos )
 		dialogPos = *pos;
 
-	MoveWindow( m_dialog, dialogPos.x, dialogPos.y, 
+	MoveWindow( m_dialog, dialogPos.x, dialogPos.y,
 							dialogSize.x, dialogSize.y, TRUE );
 
-}  // end setDialogPos
+}
 
 // HierarchyView::setDialogSize ===============================================
 /** */
@@ -1069,16 +1068,16 @@ void HierarchyView::setDialogSize( ICoord2D *size )
 	if( size )
 		dialogSize = *size;
 
-	MoveWindow( m_dialog, dialogPos.x, dialogPos.y, 
+	MoveWindow( m_dialog, dialogPos.x, dialogPos.y,
 							dialogSize.x, dialogSize.y, TRUE );
 
-}  // end setDialogSize
+}
 
 // HierarchyView::moveWindowAheadOf ===========================================
 /** Move the window hierarchy representation to be just ahead of the
 	* hierarchy entry of 'aheadOf' */
 //=============================================================================
-void HierarchyView::moveWindowAheadOf( GameWindow *window, 
+void HierarchyView::moveWindowAheadOf( GameWindow *window,
 																			 GameWindow *aheadOf )
 {
 
@@ -1096,18 +1095,18 @@ void HierarchyView::moveWindowAheadOf( GameWindow *window,
 		addWindow( window, HIERARCHY_ADD_AT_TOP );
 		return;
 
-	}  // end if
+	}
 
 	// get the hierarchy item of the aheadOf window
 	HTREEITEM aheadOfItem = findTreeEntry( aheadOf );
 	if( aheadOfItem == NULL )
 	{
 
-		DEBUG_LOG(( "moveWindowAheadOf: aheadOf has no hierarchy entry!\n" ));
+		DEBUG_LOG(( "moveWindowAheadOf: aheadOf has no hierarchy entry!" ));
 		assert( 0 );
 		return;
 
-	}  // end iof
+	}
 
 	//
 	// get the parent item we will be inserting the new entry at, a parent
@@ -1139,11 +1138,11 @@ void HierarchyView::moveWindowAheadOf( GameWindow *window,
 	if( newItem == NULL )
 	{
 
-		DEBUG_LOG(( "moveWindowAheadOf: Error adding window to tree\n" ));
+		DEBUG_LOG(( "moveWindowAheadOf: Error adding window to tree" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	//
 	// add ALL the children of this window as well, do not worry about
@@ -1152,12 +1151,12 @@ void HierarchyView::moveWindowAheadOf( GameWindow *window,
 	if( TheEditor->windowIsGadget( window ) == FALSE )
 	{
 		GameWindow *child = window->winGetChild();
-	
+
 		addWindowToTree( child, newItem, HIERARCHY_ADD_AT_BOTTOM, TRUE, TRUE );
 
-	}  // end if
+	}
 
-}  // end moveWindowAheadOf
+}
 
 // HierarchyView::moveWindowChildOf ===========================================
 /** Move the hierarchy entry for window so that it is now the first
@@ -1180,24 +1179,24 @@ void HierarchyView::moveWindowChildOf( GameWindow *window, GameWindow *parent )
 		addWindow( window, HIERARCHY_ADD_AT_TOP );
 		return;
 
-	}  // end if
+	}
 
 	// find the entry of the parent
 	HTREEITEM parentItem = findTreeEntry( parent );
 	if( parentItem == NULL )
 	{
 
-		DEBUG_LOG(( "moveWindowChildOf: No parent entry\n" ));
+		DEBUG_LOG(( "moveWindowChildOf: No parent entry" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// add the window as child of the parent at the top, dont forget to
 	// also add the children of the window too!
 	addWindowToTree( window, parentItem, HIERARCHY_ADD_AT_TOP, TRUE, FALSE );
 
-}  // end moveWindowChildOf
+}
 
 // HierarchyView::treePointToItem =============================================
 /** Given the location (x,y) in TREE COORDINATES, correlate that to
@@ -1212,9 +1211,9 @@ HTREEITEM HierarchyView::treePointToItem( Int x, Int y )
 	hitTest.pt.y = y;
 	hitTest.hItem = NULL;
 	hitTest.flags = TVHT_ONITEM;
-	return TreeView_HitTest( TheHierarchyView->getTreeHandle(), &hitTest );
+	return TreeView_HitTest( getTreeHandle(), &hitTest );
 
-}  // end treePointToItem
+}
 
 // HierarchyView::getWindowFromItem ===========================================
 /** Get the game window we stored as the user data lParam in the tree
@@ -1240,7 +1239,7 @@ GameWindow *HierarchyView::getWindowFromItem( HTREEITEM treeItem )
 
 	return window;
 
-}  // end getWindowFromItem
+}
 
 // HierarchyView::selectWindow ================================================
 /** Select the tree item */
@@ -1257,7 +1256,7 @@ void HierarchyView::selectWindow( GameWindow *window )
 	TreeView_SelectItem( m_tree, item );
 	TreeView_Expand( m_tree, item, 0 );
 
-}  // end selectWindow
+}
 
 // HierarchyView::validateDragDropOperation ===================================
 /** Return TRUE if the drag drop operation of source onto target
@@ -1281,12 +1280,12 @@ Bool HierarchyView::validateDragDropOperation( GameWindow *source,
 			return FALSE;
 		other = other->winGetParent();
 
-	}  // end while
+	}
 
 	// everything is ok
 	return TRUE;
 
-}  // end validateDragDropOperation
+}
 
 
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp b/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp
index ef558cf7fa9..9ede862b0f7 100644
--- a/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp
+++ b/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp
@@ -24,12 +24,12 @@
 
 // FILE: LayoutScheme.cpp /////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -46,7 +46,6 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
 #include <assert.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
@@ -99,7 +98,7 @@ static void loadSchemeDataToDialog( HWND hWndDialog )
 {
 
 	// load the name of the current scheme
-	SetDlgItemText( hWndDialog, STATIC_CURRENT_SCHEME, 
+	SetDlgItemText( hWndDialog, STATIC_CURRENT_SCHEME,
 									theScheme->getSchemeFilename() );
 
 	// load the state combo box with every option available
@@ -112,7 +111,7 @@ static void loadSchemeDataToDialog( HWND hWndDialog )
 									GWS_HORZ_SLIDER |
 									GWS_VERT_SLIDER |
 									GWS_STATIC_TEXT |
-									GWS_ENTRY_FIELD | 
+									GWS_ENTRY_FIELD |
 									GWS_USER_WINDOW |
 									GWS_COMBO_BOX,
 									GetDlgItem( hWndDialog, COMBO_STATE ) );
@@ -122,7 +121,7 @@ static void loadSchemeDataToDialog( HWND hWndDialog )
 	LoadImageListComboBox( GetDlgItem( hWndDialog, COMBO_IMAGE ) );
 
 	//
-	// load our own internal table of images and colors to the 
+	// load our own internal table of images and colors to the
 	// property dialog tables
 	//
 	Int i;
@@ -137,7 +136,7 @@ static void loadSchemeDataToDialog( HWND hWndDialog )
 												info->color,
 												info->borderColor );
 
-	}  // end for i
+	}
 
 	// switch to the generic state
 	SwitchToState( GENERIC_ENABLED, hWndDialog );
@@ -156,7 +155,7 @@ static void loadSchemeDataToDialog( HWND hWndDialog )
 	SendDlgItemMessage( hWndDialog, COMBO_FONT, CB_RESETCONTENT, 0, 0 );
 	LoadFontCombo( GetDlgItem( hWndDialog, COMBO_FONT ), theScheme->getFont() );
 
-}  // end loadSchemeDataToDialog
+}
 
 // saveData ===================================================================
 //=============================================================================
@@ -179,7 +178,7 @@ static void saveData( HWND hWndDialog )
 																 info->color,
 																 info->borderColor );
 
-	}  // end for i
+	}
 
 	// save default text colors
 	theScheme->setEnabledTextColor( GetPropsEnabledTextColor() );
@@ -192,7 +191,7 @@ static void saveData( HWND hWndDialog )
 	// save the font
 	theScheme->setFont( GetSelectedFontFromCombo( GetDlgItem( hWndDialog, COMBO_FONT ) ) );
 
-}  // end saveData
+}
 
 // saveAsDialog ===============================================================
 /** Bring up the standard windows browser save as dialog and return
@@ -234,7 +233,7 @@ char *saveAsDialog( void )
 	else
 		return NULL;
 
-}  // end saveAsDialog
+}
 
 // openDialog =================================================================
 /** Bring up the standard windows browser open dialog and return
@@ -276,7 +275,7 @@ char *openDialog( void )
 	else
 		return NULL;
 
-}  // end openDialog
+}
 
 // layoutSchemeCallback =======================================================
 /** Dialog callback for layout scheme dialog */
@@ -292,7 +291,7 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 	// this is largely based on the property dialog code so lets just
 	// let the default handle code work here too
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -307,7 +306,7 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 			loadSchemeDataToDialog( hWndDialog );
 			break;
 
-		}  // end init dialog
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -315,7 +314,7 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
-		
+
 			switch( controlID )
 			{
 
@@ -355,7 +354,7 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 
 					break;
 
-				}  // end apply scheme
+				}
 
 				// --------------------------------------------------------------------
 				case BUTTON_SAVE:
@@ -367,15 +366,15 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 
 						saveData( hWndDialog );
 						theScheme->saveScheme( filename );
-						SetDlgItemText( hWndDialog, STATIC_CURRENT_SCHEME, 
+						SetDlgItemText( hWndDialog, STATIC_CURRENT_SCHEME,
 														theScheme->getSchemeFilename() );
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end save
-				
+				}
+
 				// --------------------------------------------------------------------
 				case BUTTON_LOAD:
 				{
@@ -387,25 +386,25 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 						// load the new data
 						if( theScheme->loadScheme( filename ) )
 						{
-										
+
 							// load the dialog engine and items with the current data of the scheme
 							loadSchemeDataToDialog( hWndDialog );
 
-						}  // end if
+						}
 						else
 						{
 
 							MessageBox( TheEditor->getWindowHandle(),
 													"Unable to open scheme file.", "Error", MB_OK );
 
-						}  // end else
+						}
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end load
-							
+				}
+
 				// --------------------------------------------------------------------
 				case IDOK:
 
@@ -421,17 +420,17 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 					EndDialog( hWndDialog, FALSE );
 					break;
 
-			}  // end switch
-				
+			}
+
 			break;
 
-		}  // end command
+		}
 
-	}  // end switch, message
+	}
 
 	return 0;
 
-}  // end layoutSchemeCallback
+}
 
 // LayoutScheme::applyPropertyTablesToWindow ==================================
 /** apply the image and color info stored in the state identifer tables
@@ -478,7 +477,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetButtonSetHiliteSelectedColor( root, info->color );
 		GadgetButtonSetHiliteSelectedBorderColor( root, info->borderColor );
 
-	}  // end if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_RADIO_BUTTON ) )
 	{
 
@@ -521,7 +520,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetRadioSetHiliteCheckedBoxColor( root, info->color );
 		GadgetRadioSetHiliteCheckedBoxBorderColor( root, info->borderColor );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_CHECK_BOX ) )
 	{
 
@@ -564,7 +563,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetCheckBoxSetHiliteCheckedBoxColor( root, info->color );
 		GadgetCheckBoxSetHiliteCheckedBoxBorderColor( root, info->borderColor );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_VERT_SLIDER ) )
 	{
 
@@ -628,7 +627,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetSliderSetHiliteSelectedThumbColor( root, info->color );
 		GadgetSliderSetHiliteSelectedThumbBorderColor( root, info->borderColor );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_HORZ_SLIDER ) )
 	{
 
@@ -692,7 +691,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetSliderSetHiliteSelectedThumbColor( root, info->color );
 		GadgetSliderSetHiliteSelectedThumbBorderColor( root, info->borderColor );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_SCROLL_LISTBOX ) )
 	{
 
@@ -772,7 +771,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 			GadgetButtonSetHiliteSelectedColor( upButton, info->color );
 			GadgetButtonSetHiliteSelectedBorderColor( upButton, info->borderColor );
 
-		}  // end if
+		}
 
 		GameWindow *downButton = GadgetListBoxGetDownButton( root );
 		if( downButton )
@@ -805,7 +804,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 			GadgetButtonSetHiliteSelectedColor( downButton, info->color );
 			GadgetButtonSetHiliteSelectedBorderColor( downButton, info->borderColor );
 
-		}  // end if
+		}
 
 		GameWindow *slider = GadgetListBoxGetSlider( root );
 		if( slider )
@@ -871,9 +870,9 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 			GadgetSliderSetHiliteSelectedThumbColor( slider, info->color );
 			GadgetSliderSetHiliteSelectedThumbBorderColor( slider, info->borderColor );
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_COMBO_BOX ) )
 	{
 		info = GetStateInfo( COMBOBOX_ENABLED );
@@ -950,8 +949,8 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 			GadgetButtonSetHiliteSelectedImage( dropDownButton, info->image );
 			GadgetButtonSetHiliteSelectedColor( dropDownButton, info->color );
 			GadgetButtonSetHiliteSelectedBorderColor( dropDownButton, info->borderColor );
-		}// end if
-		
+		}
+
 		GameWindow *editBox = GadgetComboBoxGetEditBox( root );
 		if ( editBox )
 		{
@@ -987,7 +986,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 			GadgetTextEntrySetHiliteImageCenter( editBox, info->image );
 			info = GetStateInfo( COMBOBOX_EDIT_BOX_HILITE_SMALL_CENTER );
 			GadgetTextEntrySetHiliteImageSmallCenter( editBox, info->image );
-		} // end if
+		}
 
 		GameWindow *listBox = GadgetComboBoxGetListBox( root );
 		if( listBox )
@@ -1068,7 +1067,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 				GadgetButtonSetHiliteSelectedColor( upButton, info->color );
 				GadgetButtonSetHiliteSelectedBorderColor( upButton, info->borderColor );
 
-			}  // end if
+			}
 
 			GameWindow *downButton = GadgetListBoxGetDownButton( listBox );
 			if( downButton )
@@ -1101,7 +1100,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 				GadgetButtonSetHiliteSelectedColor( downButton, info->color );
 				GadgetButtonSetHiliteSelectedBorderColor( downButton, info->borderColor );
 
-			}  // end if
+			}
 
 			GameWindow *slider = GadgetListBoxGetSlider( listBox );
 			if( slider )
@@ -1167,9 +1166,9 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 				GadgetSliderSetHiliteSelectedThumbColor( slider, info->color );
 				GadgetSliderSetHiliteSelectedThumbBorderColor( slider, info->borderColor );
 
-			}  // end if
-		}// end if (combo listbox)
-	}// end if
+			}
+		}
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_ENTRY_FIELD ) )
 	{
 
@@ -1206,7 +1205,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		info = GetStateInfo( TEXT_ENTRY_HILITE_SMALL_CENTER );
 		GadgetTextEntrySetHiliteImageSmallCenter( root, info->image );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_STATIC_TEXT ) )
 	{
 
@@ -1225,7 +1224,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetStaticTextSetHiliteColor( root, info->color );
 		GadgetStaticTextSetHiliteBorderColor( root, info->borderColor );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_PROGRESS_BAR ) )
 	{
 
@@ -1292,7 +1291,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		info = GetStateInfo( PROGRESS_BAR_HILITE_BAR_SMALL_CENTER );
 		GadgetProgressBarSetHiliteBarImageSmallCenter( root, info->image );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_TAB_CONTROL ) )
 	{
 		info = GetStateInfo( TC_TAB_0_ENABLED );
@@ -1341,7 +1340,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetTabControlSetEnabledBorderColorBackground( root, info->borderColor );
 
 
-	
+
 		info = GetStateInfo( TC_TAB_0_DISABLED );
 		GadgetTabControlSetDisabledImageTabZero( root, info->image );
 		GadgetTabControlSetDisabledColorTabZero( root, info->color );
@@ -1388,7 +1387,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetTabControlSetDisabledBorderColorBackground( root, info->borderColor );
 
 
-		
+
 
 		info = GetStateInfo( TC_TAB_0_HILITE );
 		GadgetTabControlSetHiliteImageTabZero( root, info->image );
@@ -1454,10 +1453,10 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		root->winSetHiliteColor( 0, info->color );
 		root->winSetHiliteBorderColor( 0, info->borderColor );
 
-	}  // end else
+	}
 
 	//
-	// apply changes to children of this window, unless this 
+	// apply changes to children of this window, unless this
 	// window is a gadget itself, those are "atomic" units remember ;)
 	//
 	if( TheEditor->windowIsGadget( root ) == FALSE )
@@ -1469,7 +1468,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 	// force an update of the edit window
 	TheEditWindow->draw();
 
-}  // end applyPropertyTablesToWindow
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -1491,7 +1490,7 @@ LayoutScheme::LayoutScheme( void )
 	m_hiliteText.borderColor = GAME_COLOR_UNDEFINED;
 	m_font = NULL;
 
-}  // end LayoutScheme
+}
 
 // LayoutScheme::~LayoutScheme ================================================
 /** */
@@ -1506,16 +1505,16 @@ LayoutScheme::~LayoutScheme( void )
 
 		if( m_imageAndColorTable[ i ].stateNameBuffer )
 		{
-			
+
 			delete [] m_imageAndColorTable[ i ].stateNameBuffer;
 			m_imageAndColorTable[ i ].stateNameBuffer = NULL;
 			m_imageAndColorTable[ i ].stateName = NULL;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end ~LayoutScheme
+}
 
 // LayoutScheme::init =========================================================
 /** Init */
@@ -1528,10 +1527,10 @@ void LayoutScheme::init( void )
 	// just up the default state values
 	for( i = FIRST_VALID_IDENTIFIER; i < NUM_STATE_IDENTIFIERS; i++ )
 	{
-	
+
 		// get info from the static table created for property editing
 		info = GetStateInfo( (StateIdentifier)i );
-		assert( info );	
+		assert( info );
 		m_imageAndColorTable[ i ].windowType = info->windowType;
 		m_imageAndColorTable[ i ].stateID = info->stateID;
 		m_imageAndColorTable[ i ].image = info->image;
@@ -1541,7 +1540,7 @@ void LayoutScheme::init( void )
 		m_imageAndColorTable[ i ].stateName = m_imageAndColorTable[ i ].stateNameBuffer;
 		strcpy(m_imageAndColorTable[ i ].stateNameBuffer, info->stateName );
 
-	}  // end for i
+	}
 
 	// assign a default set of colors
 	UnsignedByte alpha = 255;
@@ -1571,573 +1570,573 @@ void LayoutScheme::init( void )
 	const Image *image;
 
 	// push button
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "PushButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "PushButtonEnabled" );
 	storeImageAndColor( BUTTON_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "PushButtonEnabledSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "PushButtonEnabledSelected" );
 	storeImageAndColor( BUTTON_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "PushButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "PushButtonDisabled" );
 	storeImageAndColor( BUTTON_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "PushButtonDisabledSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "PushButtonDisabledSelected" );
 	storeImageAndColor( BUTTON_DISABLED_PUSHED, image, lightGray, gray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "PushButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "PushButtonHilite" );
 	storeImageAndColor( BUTTON_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "PushButtonHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "PushButtonHiliteSelected" );
 	storeImageAndColor( BUTTON_HILITE_PUSHED, image, yellow, white );
 
 	// radio button
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonEnabled" );
 	storeImageAndColor( RADIO_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonEnabledBoxUnselected" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonEnabledBoxUnselected" );
 	storeImageAndColor( RADIO_ENABLED_UNCHECKED_BOX, image, darkRed, black );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonEnabledBoxSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonEnabledBoxSelected" );
 	storeImageAndColor( RADIO_ENABLED_CHECKED_BOX, image, blue, lightBlue );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonDisabled" );
 	storeImageAndColor( RADIO_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonDisabledBoxUnselected" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonDisabledBoxUnselected" );
 	storeImageAndColor( RADIO_DISABLED_UNCHECKED_BOX, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonDisabledBoxSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonDisabledBoxSelected" );
 	storeImageAndColor( RADIO_DISABLED_CHECKED_BOX, image, darkGray, white );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonHilite" );
 	storeImageAndColor( RADIO_HILITE, image, green, lightGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonHiliteBoxUnselected" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonHiliteBoxUnselected" );
 	storeImageAndColor( RADIO_HILITE_UNCHECKED_BOX, image, darkGreen, lightGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonHiliteBoxSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonHiliteBoxSelected" );
 	storeImageAndColor( RADIO_HILITE_CHECKED_BOX, image, yellow, white );
 
 	// check box
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxEnabled" );
 	storeImageAndColor( CHECK_BOX_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxEnabledBoxUnselected" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxEnabledBoxUnselected" );
 	storeImageAndColor( CHECK_BOX_ENABLED_UNCHECKED_BOX, image, WIN_COLOR_UNDEFINED, lightBlue );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxEnabledBoxSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxEnabledBoxSelected" );
 	storeImageAndColor( CHECK_BOX_ENABLED_CHECKED_BOX, image, blue, lightBlue );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxDisabled" );
 	storeImageAndColor( CHECK_BOX_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxDisabledBoxUnselected" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxDisabledBoxUnselected" );
 	storeImageAndColor( CHECK_BOX_DISABLED_UNCHECKED_BOX, image, WIN_COLOR_UNDEFINED, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxDisabledBoxSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxDisabledBoxSelected" );
 	storeImageAndColor( CHECK_BOX_DISABLED_CHECKED_BOX, image, darkGray, white );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxHilite" );
 	storeImageAndColor( CHECK_BOX_HILITE, image, green, lightGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxHiliteBoxUnselected" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxHiliteBoxUnselected" );
 	storeImageAndColor( CHECK_BOX_HILITE_UNCHECKED_BOX, image, WIN_COLOR_UNDEFINED, lightBlue );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxHiliteBoxSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxHiliteBoxSelected" );
 	storeImageAndColor( CHECK_BOX_HILITE_CHECKED_BOX, image, yellow, white );
 
 	// horz slider
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderEnabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderEnabledLeftEnd" );
 	storeImageAndColor( HSLIDER_ENABLED_LEFT, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderEnabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderEnabledRightEnd" );
 	storeImageAndColor( HSLIDER_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderEnabledRepeatingCenter" );
 	storeImageAndColor( HSLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderEnabledSmallRepeatingCenter" );
 	storeImageAndColor( HSLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderDisabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderDisabledLeftEnd" );
 	storeImageAndColor( HSLIDER_DISABLED_LEFT, image, gray, darkGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderDisabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderDisabledRightEnd" );
 	storeImageAndColor( HSLIDER_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderDisabledRepeatingCenter" );
 	storeImageAndColor( HSLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderDisabledSmallRepeatingCenter" );
 	storeImageAndColor( HSLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderHiliteLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderHiliteLeftEnd" );
 	storeImageAndColor( HSLIDER_HILITE_LEFT, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderHiliteRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderHiliteRightEnd" );
 	storeImageAndColor( HSLIDER_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderHiliteRepeatingCenter" );
 	storeImageAndColor( HSLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderHiliteSmallRepeatingCenter" );
 	storeImageAndColor( HSLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderThumbEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderThumbEnabled" );
 	storeImageAndColor( HSLIDER_THUMB_ENABLED, image, lightRed, red );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderThumbEnabledSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderThumbEnabledSelected" );
 	storeImageAndColor( HSLIDER_THUMB_ENABLED_PUSHED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderThumbDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderThumbDisabled" );
 	storeImageAndColor( HSLIDER_THUMB_DISABLED, image, darkGray, gray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderThumbDisabledSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderThumbDisabledSelected" );
 	storeImageAndColor( HSLIDER_THUMB_DISABLED_PUSHED, image, black, darkGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderThumbHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderThumbHilite" );
 	storeImageAndColor( HSLIDER_THUMB_HILITE, image, green, lightGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderThumbHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderThumbHiliteSelected" );
 	storeImageAndColor( HSLIDER_THUMB_HILITE_PUSHED, image, blue, lightBlue );
 
 	// vert slider
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderEnabledTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderEnabledTopEnd" );
 	storeImageAndColor( VSLIDER_ENABLED_TOP, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderEnabledBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderEnabledBottomEnd" );
 	storeImageAndColor( VSLIDER_ENABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderEnabledRepeatingCenter" );
 	storeImageAndColor( VSLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderEnabledSmallRepeatingCenter" );
 	storeImageAndColor( VSLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderDisabledTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderDisabledTopEnd" );
 	storeImageAndColor( VSLIDER_DISABLED_TOP, image, gray, darkGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderDisabledBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderDisabledBottomEnd" );
 	storeImageAndColor( VSLIDER_DISABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderDisabledRepeatingCenter" );
 	storeImageAndColor( VSLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderDisabledSmallRepeatingCenter" );
 	storeImageAndColor( VSLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderHiliteTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderHiliteTopEnd" );
 	storeImageAndColor( VSLIDER_HILITE_TOP, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderHiliteBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderHiliteBottomEnd" );
 	storeImageAndColor( VSLIDER_HILITE_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderHiliteRepeatingCenter" );
 	storeImageAndColor( VSLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderHiliteSmallRepeatingCenter" );
 	storeImageAndColor( VSLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderThumbEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderThumbEnabled" );
 	storeImageAndColor( VSLIDER_THUMB_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderThumbEnabledSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderThumbEnabledSelected" );
 	storeImageAndColor( VSLIDER_THUMB_ENABLED_PUSHED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderThumbDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderThumbDisabled" );
 	storeImageAndColor( VSLIDER_THUMB_DISABLED, image, darkGray, gray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderThumbDisabledSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderThumbDisabledSelected" );
 	storeImageAndColor( VSLIDER_THUMB_DISABLED_PUSHED, image, black, darkGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderThumbHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderThumbHilite" );
 	storeImageAndColor( VSLIDER_THUMB_HILITE, image, green, lightGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderThumbHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderThumbHiliteSelected" );
 	storeImageAndColor( VSLIDER_THUMB_HILITE_PUSHED, image, blue, lightBlue );
 
 	// listbox
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabled" );
 	storeImageAndColor( LISTBOX_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxEnabledSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemLeftEnd" );
 	storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_LEFT, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxEnabledSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRightEnd" );
 	storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxEnabledSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRepeatingCenter" );
 	storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxEnabledSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabled" );
 	storeImageAndColor( LISTBOX_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxDisabledSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemLeftEnd" );
 	storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_LEFT, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxDisabledSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRightEnd" );
 	storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxDisabledSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRepeatingCenter" );
 	storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxDisabledSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHilite" );
 	storeImageAndColor( LISTBOX_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxHiliteSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemLeftEnd" );
 	storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_LEFT, image, white, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxHiliteSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRightEnd" );
 	storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxHiliteSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRepeatingCenter" );
 	storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxHiliteSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeUpButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" );
 	storeImageAndColor( LISTBOX_UP_BUTTON_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeUpButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" );
 	storeImageAndColor( LISTBOX_UP_BUTTON_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeUpButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" );
 	storeImageAndColor( LISTBOX_UP_BUTTON_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeUpButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" );
 	storeImageAndColor( LISTBOX_UP_BUTTON_DISABLED_PUSHED, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeUpButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHilite" );
 	storeImageAndColor( LISTBOX_UP_BUTTON_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeUpButtonHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHiliteSelected" );
 	storeImageAndColor( LISTBOX_UP_BUTTON_HILITE_PUSHED, image, white, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDownButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" );
 	storeImageAndColor( LISTBOX_DOWN_BUTTON_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDownButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" );
 	storeImageAndColor( LISTBOX_DOWN_BUTTON_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDownButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" );
 	storeImageAndColor( LISTBOX_DOWN_BUTTON_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDownButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" );
 	storeImageAndColor( LISTBOX_DOWN_BUTTON_DISABLED_PUSHED, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDownButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" );
 	storeImageAndColor( LISTBOX_DOWN_BUTTON_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDownButtonHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHiliteSelected" );
 	storeImageAndColor( LISTBOX_DOWN_BUTTON_HILITE_PUSHED, image, white, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeEnabledTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledTopEnd" );
 	storeImageAndColor( LISTBOX_SLIDER_ENABLED_TOP, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeEnabledBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledBottomEnd" );
 	storeImageAndColor( LISTBOX_SLIDER_ENABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledRepeatingCenter" );
 	storeImageAndColor( LISTBOX_SLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledSmallRepeatingCenter" );
 	storeImageAndColor( LISTBOX_SLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDisabledTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledTopEnd" );
 	storeImageAndColor( LISTBOX_SLIDER_DISABLED_TOP, image, gray, darkGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDisabledBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledBottomEnd" );
 	storeImageAndColor( LISTBOX_SLIDER_DISABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledRepeatingCenter" );
 	storeImageAndColor( LISTBOX_SLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledSmallRepeatingCenter" );
 	storeImageAndColor( LISTBOX_SLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeHiliteTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteTopEnd" );
 	storeImageAndColor( LISTBOX_SLIDER_HILITE_TOP, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeHiliteBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteBottomEnd" );
 	storeImageAndColor( LISTBOX_SLIDER_HILITE_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteRepeatingCenter" );
 	storeImageAndColor( LISTBOX_SLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteSmallRepeatingCenter" );
 	storeImageAndColor( LISTBOX_SLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeThumbEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" );
 	storeImageAndColor( LISTBOX_SLIDER_THUMB_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeThumbEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" );
 	storeImageAndColor( LISTBOX_SLIDER_THUMB_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeThumbDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" );
 	storeImageAndColor( LISTBOX_SLIDER_THUMB_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeThumbDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" );
 	storeImageAndColor( LISTBOX_SLIDER_THUMB_DISABLED_PUSHED, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeThumbHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHilite" );
 	storeImageAndColor( LISTBOX_SLIDER_THUMB_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeThumbHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHiliteSelected" );
 	storeImageAndColor( LISTBOX_SLIDER_THUMB_HILITE_PUSHED, image, white, darkGreen );
 
-	// Combo Box 
+	// Combo Box
 	//---------------------------------------------------------------------------
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabled" );
 	storeImageAndColor( COMBOBOX_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxEnabledSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemLeftEnd" );
 	storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_LEFT, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRightEnd" );
 	storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabled" );
 	storeImageAndColor( COMBOBOX_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemLeftEnd" );
 	storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_LEFT, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRightEnd" );
 	storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHilite" );
 	storeImageAndColor( COMBOBOX_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemLeftEnd" );
 	storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_LEFT, image, white, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRightEnd" );
 	storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" );
 	storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" );
 	storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" );
 	storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" );
 	storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_DISABLED_PUSHED, image, lightGray, gray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" );
 	storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" );
 	storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_HILITE_PUSHED, image, yellow, white );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledLeftEnd" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_LEFT, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRightEnd" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledLeftEnd" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_LEFT, image, gray, black );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRightEnd" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteLeftEnd" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_LEFT, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRightEnd" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabled" ) );
+
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemLeftEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_LEFT, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRightEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemLeftEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_LEFT, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRightEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHilite" );
 	storeImageAndColor( COMBOBOX_LISTBOX_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemLeftEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_LEFT, image, white, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRightEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_DISABLED_PUSHED, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHilite" );
 	storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHiliteSelected" );
 	storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_HILITE_PUSHED, image, white, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_DISABLED_PUSHED, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHiliteSelected" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_HILITE_PUSHED, image, white, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledTopEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_TOP, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledBottomEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledTopEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_TOP, image, gray, darkGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledBottomEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteTopEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_TOP, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteBottomEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_DISABLED_PUSHED, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHilite" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHiliteSelected" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_HILITE_PUSHED, image, white, darkGreen );
 
 
 	// progress bar
 	//---------------------------------------------------------------------------
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledLeftEnd" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_LEFT, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledRightEnd" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledSmallRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledBarLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarLeftEnd" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_LEFT, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledBarRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarRightEnd" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledBarRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledBarSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarSmallRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
 	//---------------------------------------------------------------------------
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledLeftEnd" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_LEFT, image, darkGray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledRightEnd" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledSmallRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledBarLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarLeftEnd" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_LEFT, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledBarRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarRightEnd" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledBarRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledBarSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarSmallRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
 	//---------------------------------------------------------------------------
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteLeftEnd" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_LEFT, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteRightEnd" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteSmallRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteBarLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarLeftEnd" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_BAR_LEFT, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteBarRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarRightEnd" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_BAR_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteBarRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_BAR_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteBarSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarSmallRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_BAR_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
 	// static text
 	//---------------------------------------------------------------------------
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "StaticTextEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "StaticTextEnabled" );
 	storeImageAndColor( STATIC_TEXT_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "StaticTextDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "StaticTextDisabled" );
 	storeImageAndColor( STATIC_TEXT_DISABLED, image, darkGray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "StaticTextHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "StaticTextHilite" );
 	storeImageAndColor( STATIC_TEXT_HILITE, image, darkGreen, lightGreen );
 
 	// text entry
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryEnabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledLeftEnd" );
 	storeImageAndColor( TEXT_ENTRY_ENABLED_LEFT, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryEnabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRightEnd" );
 	storeImageAndColor( TEXT_ENTRY_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRepeatingCenter" );
 	storeImageAndColor( TEXT_ENTRY_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledSmallRepeatingCenter" );
 	storeImageAndColor( TEXT_ENTRY_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryDisabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledLeftEnd" );
 	storeImageAndColor( TEXT_ENTRY_DISABLED_LEFT, image, gray, black );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryDisabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRightEnd" );
 	storeImageAndColor( TEXT_ENTRY_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRepeatingCenter" );
 	storeImageAndColor( TEXT_ENTRY_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledSmallRepeatingCenter" );
 	storeImageAndColor( TEXT_ENTRY_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryHiliteLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteLeftEnd" );
 	storeImageAndColor( TEXT_ENTRY_HILITE_LEFT, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryHiliteRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRightEnd" );
 	storeImageAndColor( TEXT_ENTRY_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRepeatingCenter" );
 	storeImageAndColor( TEXT_ENTRY_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteSmallRepeatingCenter" );
 	storeImageAndColor( TEXT_ENTRY_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
 	// Tab Control
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlZeroEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlZeroEnabled" );
 	storeImageAndColor( TC_TAB_0_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlZeroDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlZeroDisabled" );
 	storeImageAndColor( TC_TAB_0_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlZeroHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlZeroHilite" );
 	storeImageAndColor( TC_TAB_0_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlOneEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlOneEnabled" );
 	storeImageAndColor( TC_TAB_1_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlOneDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlOneDisabled" );
 	storeImageAndColor( TC_TAB_1_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlOneHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlOneHilite" );
 	storeImageAndColor( TC_TAB_1_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlTwoEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlTwoEnabled" );
 	storeImageAndColor( TC_TAB_2_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlTwoDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlTwoDisabled" );
 	storeImageAndColor( TC_TAB_2_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlTwoHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlTwoHilite" );
 	storeImageAndColor( TC_TAB_2_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlThreeEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlThreeEnabled" );
 	storeImageAndColor( TC_TAB_3_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlThreeDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlThreeDisabled" );
 	storeImageAndColor( TC_TAB_3_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlThreeHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlThreeHilite" );
 	storeImageAndColor( TC_TAB_3_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlFourEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlFourEnabled" );
 	storeImageAndColor( TC_TAB_4_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlFourDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlFourDisabled" );
 	storeImageAndColor( TC_TAB_4_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlFourHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlFourHilite" );
 	storeImageAndColor( TC_TAB_4_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlFiveEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlFiveEnabled" );
 	storeImageAndColor( TC_TAB_5_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlFiveDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlFiveDisabled" );
 	storeImageAndColor( TC_TAB_5_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlFiveHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlFiveHilite" );
 	storeImageAndColor( TC_TAB_5_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlSixEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlSixEnabled" );
 	storeImageAndColor( TC_TAB_6_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlSixDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlSixDisabled" );
 	storeImageAndColor( TC_TAB_6_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlSixHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlSixHilite" );
 	storeImageAndColor( TC_TAB_6_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlSevenEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlSevenEnabled" );
 	storeImageAndColor( TC_TAB_7_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlSevenDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlSevenDisabled" );
 	storeImageAndColor( TC_TAB_7_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlSevenHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlSevenHilite" );
 	storeImageAndColor( TC_TAB_7_HILITE, image, green, darkGreen );
 
 	storeImageAndColor( TAB_CONTROL_ENABLED, NULL, black, white );
 	storeImageAndColor( TAB_CONTROL_DISABLED, NULL, darkGray, white );
-	storeImageAndColor( TAB_CONTROL_HILITE, NULL, black, white );	
+	storeImageAndColor( TAB_CONTROL_HILITE, NULL, black, white );
 
 	// generic
 	storeImageAndColor( GENERIC_ENABLED, NULL, darkBlue, white );
 	storeImageAndColor( GENERIC_DISABLED, NULL, darkGray, white );
-	storeImageAndColor( GENERIC_HILITE, NULL, lightBlue, white );	
+	storeImageAndColor( GENERIC_HILITE, NULL, lightBlue, white );
 
 	// default text colors
 	m_enabledText.color = white;
@@ -2148,8 +2147,8 @@ void LayoutScheme::init( void )
 	m_hiliteText.borderColor = darkBlue;
 
 	// default font
-	m_font = TheWindowManager->winFindFont( AsciiString("Times New Roman"), 14, FALSE );
-}  // end init
+	m_font = TheWindowManager->winFindFont( "Times New Roman", 14, FALSE );
+}
 
 // LayoutScheme::openDialog ===================================================
 /** Bring up the layout scheme dialog box */
@@ -2166,7 +2165,7 @@ void LayoutScheme::openDialog( void )
 
 	theScheme = NULL;
 
-}  // end openDialog
+}
 
 // LayoutScheme::findEntry ====================================================
 /** Find the entry for the state */
@@ -2178,11 +2177,11 @@ ImageAndColorInfo *LayoutScheme::findEntry( StateIdentifier id )
 	if( id < 0 || id >= NUM_STATE_IDENTIFIERS )
 	{
 
-		DEBUG_LOG(( "Illegal state to to layout 'findEntry' '%d'\n", id ));
+		DEBUG_LOG(( "Illegal state to to layout 'findEntry' '%d'", id ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// search the state table
 	for( Int i = 0; i < NUM_STATE_IDENTIFIERS; i++ )
@@ -2191,11 +2190,11 @@ ImageAndColorInfo *LayoutScheme::findEntry( StateIdentifier id )
 		if( m_imageAndColorTable[ i ].stateID == id )
 			return &m_imageAndColorTable[ i ];
 
-	}  // end for i
+	}
 
 	return NULL;  // not found
 
-}  // end findEntry
+}
 
 // LayoutScheme::getImageAndColor =============================================
 /** Get the color and color info for the state */
@@ -2207,16 +2206,16 @@ ImageAndColorInfo *LayoutScheme::getImageAndColor( StateIdentifier id )
 	if( id < 0 || id >= NUM_STATE_IDENTIFIERS )
 	{
 
-		DEBUG_LOG(( "getImageAndColor: Illegal state '%d'\n", id ));
+		DEBUG_LOG(( "getImageAndColor: Illegal state '%d'", id ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// return the entry for the state
 	return findEntry( id );
 
-}  // end getImageAndColor
+}
 
 // LayoutScheme::storeImageAndColor ===========================================
 /** Store the image and colors of the specific state in our own data array */
@@ -2229,11 +2228,11 @@ void LayoutScheme::storeImageAndColor( StateIdentifier id, const Image *image,
 	if( id < 0 || id >= NUM_STATE_IDENTIFIERS )
 	{
 
-		DEBUG_LOG(( "Illegal state identifier in layout scheme store image and color '%d'\n", id ));
+		DEBUG_LOG(( "Illegal state identifier in layout scheme store image and color '%d'", id ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// store the info
 	ImageAndColorInfo *entry = findEntry( id );
@@ -2244,9 +2243,9 @@ void LayoutScheme::storeImageAndColor( StateIdentifier id, const Image *image,
 		entry->color = color;
 		entry->borderColor = borderColor;
 
-	}  // en dif
+	}
 
-}  // end storeImageAndColor
+}
 
 // LayoutScheme::saveScheme ===================================================
 /** Save the scheme to the filename provided */
@@ -2262,12 +2261,12 @@ Bool LayoutScheme::saveScheme( char *filename )
 	if( fp == NULL )
 	{
 
-		DEBUG_LOG(( "saveScheme: Unable to open file '%s'\n", filename ));
+		DEBUG_LOG(( "saveScheme: Unable to open file '%s'", filename ));
 		MessageBox( TheEditor->getWindowHandle(),
 								"Unable to open scheme for for saving.  Read only?", "Save Error", MB_OK );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// save the filename we're using now
 	setSchemeFilename( filename );
@@ -2311,9 +2310,9 @@ Bool LayoutScheme::saveScheme( char *filename )
 		assert( info );
 
 		// get the color data in more RGB friendly output
-		GameGetColorComponents( info->color, &colorR, &colorG, 
+		GameGetColorComponents( info->color, &colorR, &colorG,
 														&colorB, &colorA );
-		GameGetColorComponents( info->borderColor, &bColorR, &bColorG, 
+		GameGetColorComponents( info->borderColor, &bColorR, &bColorG,
 														&bColorB, &bColorA );
 
 		// output it
@@ -2321,14 +2320,14 @@ Bool LayoutScheme::saveScheme( char *filename )
 						 i, info->image ? info->image->getName().str() : "NONE", colorR, colorG, colorB, colorA,
 						 bColorR, bColorG, bColorB, bColorA );
 
-	}  // end for i
+	}
 
 	// close the file
 	fclose( fp );
 
 	return TRUE;
 
-}  // end saveScheme
+}
 
 // LayoutScheme::loadScheme ===================================================
 /** Load the layout scheme into this class instance */
@@ -2354,12 +2353,12 @@ Bool LayoutScheme::loadScheme( char *filename )
 		if( version != SCHEME_VERSION )
 		{
 
-			DEBUG_LOG(( "loadScheme: Old layout file version '%d'\n", version ));
+			DEBUG_LOG(( "loadScheme: Old layout file version '%d'", version ));
 			MessageBox( TheEditor->getWindowHandle(),
 									"Old layout version, cannot open.", "Old File", MB_OK );
 			return FALSE;
 
-		}  // end if
+		}
 	}
 	// default text colors
 	if (fscanf( fp, "Enabled Text: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
@@ -2405,7 +2404,7 @@ Bool LayoutScheme::loadScheme( char *filename )
 		fontBuffer[ index++ ] = c;
 		c = fgetc( fp );
 
-	}  // end while
+	}
 	fontBuffer[ index ] = '\0';
 	c = fgetc( fp );  // the end quite itself
 
@@ -2434,16 +2433,16 @@ Bool LayoutScheme::loadScheme( char *filename )
 
 				// store the info
 				storeImageAndColor( (StateIdentifier)state,
-														TheMappedImageCollection->findImageByName( AsciiString(  imageBuffer ) ),
+														TheMappedImageCollection->findImageByName( imageBuffer ),
 														GameMakeColor( colorR, colorG, colorB, colorA ),
 														GameMakeColor( bColorR, bColorG, bColorB, bColorA ) );
 			}
-		}  // end for i
+		}
 	}
 	// close the file
 	fclose( fp );
 
 	return TRUE;
 
-}  // end loadScheme
+}
 
diff --git a/Generals/Code/Tools/GUIEdit/Source/Properties.cpp b/Generals/Code/Tools/GUIEdit/Source/Properties.cpp
index e817d869205..3a85e204118 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Properties.cpp
+++ b/Generals/Code/Tools/GUIEdit/Source/Properties.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Properties.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -46,11 +46,10 @@
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
- 
+
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
 #include <assert.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
@@ -83,7 +82,7 @@ static Int enabledTextIndex,
 			 disabledTextIndex,
 			 hiliteTextIndex;
 
-ColorControl colorControlTable[] = 
+ColorControl colorControlTable[] =
 {
 	{ BUTTON_ENABLED_COLOR, { 255, 255, 255, 255 } },
 	{ BUTTON_ENABLED_BORDER_COLOR, { 255, 255, 255, 255 } },
@@ -91,14 +90,14 @@ ColorControl colorControlTable[] =
 	{ BUTTON_DISABLED_BORDER_COLOR, { 255, 255, 255, 255 } },
 	{ BUTTON_HILITE_COLOR, { 255, 255, 255, 255 } },
 	{ BUTTON_HILITE_BORDER_COLOR, { 255, 255, 255, 255 } },
-	
+
 	{ BUTTON_COLOR, 0, },
 	{ BUTTON_BORDER_COLOR, 0 },
 
-	{ 0, { 0, 0, 0, 0 } }  // keep this last!
+	{ 0, { 0, 0, 0, 0 } }
 };
 
-ImageAndColorInfo imageAndColorTable[] = 
+ImageAndColorInfo imageAndColorTable[] =
 {
 	{ GWS_PUSH_BUTTON, BUTTON_ENABLED, "[Button] Enabled (Normal)", NULL, 0, 0 },
 	{ GWS_PUSH_BUTTON, BUTTON_ENABLED_PUSHED, "[Button] Enabled (Pushed)", NULL, 0, 0 },
@@ -205,7 +204,7 @@ ImageAndColorInfo imageAndColorTable[] =
 	{ GWS_SCROLL_LISTBOX, LISTBOX_SLIDER_HILITE_BOTTOM, "[Slider [Listbox]] Hilite Bottom End", NULL, 0, 0 },
 	{ GWS_SCROLL_LISTBOX, LISTBOX_SLIDER_HILITE_CENTER, "[Slider [Listbox]] Hilite Repeating Center", NULL, 0, 0 },
 	{ GWS_SCROLL_LISTBOX, LISTBOX_SLIDER_HILITE_SMALL_CENTER, "[Slider [Listbox]] Hilite Repeating Small Cener", NULL, 0, 0 },
-	
+
 	{ GWS_SCROLL_LISTBOX, LISTBOX_SLIDER_THUMB_ENABLED, "[Slider Thumb [Listbox]] Enabled (Normal)", NULL, 0, 0 },
 	{ GWS_SCROLL_LISTBOX, LISTBOX_SLIDER_THUMB_ENABLED_PUSHED, "[Slider Thumb [Listbox]] Enabled (Pushed)", NULL, 0, 0 },
 	{ GWS_SCROLL_LISTBOX, LISTBOX_SLIDER_THUMB_DISABLED, "[Slider Thumb [Listbox]] Disabled (Normal)", NULL, 0, 0 },
@@ -248,7 +247,7 @@ ImageAndColorInfo imageAndColorTable[] =
 	{ GWS_COMBO_BOX, COMBOBOX_EDIT_BOX_HILITE_RIGHT, "[Text Entry [ComboBox]] Hilite Right End", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_EDIT_BOX_HILITE_CENTER, "[Text Entry [ComboBox]] Hilite Repeating Center", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_EDIT_BOX_HILITE_SMALL_CENTER, "[Text Entry [ComboBox]] Hilite Small Repeating Center", NULL, 0, 0 },
-	
+
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_ENABLED,															"[Listbox [ComboBox]] Enabled Surface", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_LEFT,						"[Listbox [ComboBox]] Enabled Selected Item Left End (or colors)", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_RIGHT,					"[Listbox [ComboBox]] Enabled Selected Item Right End", NULL, 0, 0 },
@@ -289,7 +288,7 @@ ImageAndColorInfo imageAndColorTable[] =
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_SLIDER_HILITE_BOTTOM, "[Slider [Listbox [ComboBox]]] Hilite Bottom End", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_SLIDER_HILITE_CENTER, "[Slider [Listbox [ComboBox]]] Hilite Repeating Center", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_SLIDER_HILITE_SMALL_CENTER, "[Slider [Listbox [ComboBox]]] Hilite Repeating Small Cener", NULL, 0, 0 },
-	
+
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_SLIDER_THUMB_ENABLED, "[Slider Thumb [Listbox [ComboBox]]] Enabled (Normal)", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_SLIDER_THUMB_ENABLED_PUSHED, "[Slider Thumb [Listbox [ComboBox]]] Enabled (Pushed)", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_SLIDER_THUMB_DISABLED, "[Slider Thumb [Listbox [ComboBox]]] Disabled (Normal)", NULL, 0, 0 },
@@ -373,7 +372,7 @@ ImageAndColorInfo imageAndColorTable[] =
 	{ GWS_USER_WINDOW, GENERIC_DISABLED, "[User]Disabled Surface", NULL, 0, 0 },
 	{ GWS_USER_WINDOW, GENERIC_HILITE, "[User]Hilite Surface", NULL, 0, 0 },
 
-	{ 0, IDENTIFIER_INVALID, NULL, NULL, 0, 0 }  // keep this last!
+	{ 0, IDENTIFIER_INVALID, NULL, NULL, 0, 0 }
 
 };
 
@@ -432,12 +431,12 @@ void InitPropertiesDialog( GameWindow *window, Int x, Int y )
 	if( dialog == NULL )
 	{
 
-		DEBUG_LOG(( "Error creating properties dialog\n" ));
+		DEBUG_LOG(( "Error creating properties dialog" ));
 		MessageBox( TheEditor->getWindowHandle(), "Error creating property dialog!", "Error", MB_OK );
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// save the window we're working with
 	TheEditor->setPropertyTarget( window );
@@ -448,7 +447,7 @@ void InitPropertiesDialog( GameWindow *window, Int x, Int y )
 	//
 	PositionWindowOnScreen( dialog, screen.x, screen.y );
 
-}  // end InitPropertiesDialog
+}
 
 // LoadFontCombo ==============================================================
 /** Load the font combo with fonts currently available */
@@ -486,7 +485,7 @@ void LoadFontCombo( HWND comboBox, GameFont *currFont )
 		// attach pointer to font at combo index
 		SendMessage( comboBox, CB_SETITEMDATA, index, (DWORD)font );
 
-	}  // end for font
+	}
 
 	// add a "[None]" at the top index
 	SendMessage( comboBox, CB_INSERTSTRING, 0, (LPARAM)"[None]" );
@@ -497,7 +496,7 @@ void LoadFontCombo( HWND comboBox, GameFont *currFont )
 
 		SendMessage( comboBox, CB_SETCURSEL, 0, 0 );
 
-	}  // end if
+	}
 	else
 	{
 		Int count;
@@ -518,13 +517,13 @@ void LoadFontCombo( HWND comboBox, GameFont *currFont )
 				SendMessage( comboBox, CB_SETCURSEL, i, 0 );
 				break;  // exit for i
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end else
+	}
 
-}  // end LoadFontCombo
+}
 
 // GetSelectedFontFromCombo ===================================================
 /** Based on the combo box selection return the game font associated
@@ -548,7 +547,7 @@ GameFont *GetSelectedFontFromCombo( HWND combo )
 	// get the font from the selected item
 	return (GameFont *)SendMessage( combo, CB_GETITEMDATA, selected, 0 );
 
-}  // end GetSelectedFontFromCombo
+}
 
 // saveFontSelection ==========================================================
 /** Save the font from the currently selected item in the font dialog */
@@ -565,7 +564,7 @@ static void saveFontSelection( HWND combo, GameWindow *window )
 	font = GetSelectedFontFromCombo( combo );
 	window->winSetFont( font );
 
-}  // end saveFontSelection
+}
 
 // saveHeaderSelection ========================================================
 /** Save the Header from the currently selected item in the font dialog */
@@ -592,7 +591,7 @@ static void saveHeaderSelection( HWND comboBox, GameWindow *window )
 	// return the image loc that matches the string
 	window->winGetInstanceData()->m_headerTemplateName.set(buffer);
 
-}  // end ComboBoxSelectionToImage
+}
 
 // loadTooltipTextLabel ==============================================================
 /** Load the edit control with the window text label */
@@ -609,9 +608,9 @@ static void loadTooltipTextLabel( HWND edit, GameWindow *window )
 
 	// load the text
 	WinInstanceData *instData = window->winGetInstanceData();
-	
+
 	SendMessage( edit, WM_SETTEXT, 0, (LPARAM)instData->m_tooltipString.str() );
-}  // end loadTooltipTextLabel
+}
 
 // loadTooltipDelayTextLabel ==============================================================
 /** Load the edit control with the window text label */
@@ -628,9 +627,9 @@ static void loadTooltipDelayTextLabel( HWND dialog, HWND edit, GameWindow *windo
 
 	// load the text
 //	WinInstanceData *instData = window->winGetInstanceData();
-	
+
 //	SetDlgItemInt( dialog, edit, instData->m_tooltipDelay, TRUE );
-}  // end loadTooltipDelayTextLabel
+}
 
 // saveTooltipTextLabel ==============================================================
 /** Save the text label entry */
@@ -649,7 +648,7 @@ static void saveTooltipTextLabel( HWND edit, GameWindow *window )
 	instData->m_tooltipString.set(buffer);
 	instData->setTooltipText(TheGameText->fetch(buffer) );
 
-}  // end saveTooltipTextLabel
+}
 
 // saveTooltipTextLabel ==============================================================
 /** Save the text label entry */
@@ -663,8 +662,8 @@ static void saveTooltipDelayTextLabel(HWND dialog, HWND edit, GameWindow *window
 //  WinInstanceData *instData = window->winGetInstanceData();
 
 //  instData->m_tooltipDelay = GetDlgItemInt( dialog, edit, NULL, TRUE );
-	
-}  // end saveTooltipDelayTextLabel
+
+}
 
 
 // loadTextLabel ==============================================================
@@ -683,7 +682,7 @@ static void loadTextLabel( HWND edit, GameWindow *window )
 	// load the text
 	WinInstanceData *instData = window->winGetInstanceData();
 	SendMessage( edit, WM_SETTEXT, 0, (LPARAM)instData->m_textLabelString.str() );
-}  // end loadTextLabel
+}
 
 // saveTextLabel ==============================================================
 /** Save the text label entry */
@@ -707,7 +706,7 @@ static void saveTextLabel( HWND edit, GameWindow *window )
 	//
 	UnicodeString text;
 	text = TheGameText->fetch( (char *)instData->m_textLabelString.str()); //TheWindowManager->winTextLabelToText( instData->m_textLabelString );
-	
+
 	UnsignedInt style = window->winGetStyle();
 	if( BitIsSet( style, GWS_PUSH_BUTTON ) )
 		GadgetButtonSetText( window, text );
@@ -722,12 +721,12 @@ static void saveTextLabel( HWND edit, GameWindow *window )
 	else
 		window->winSetText( text );
 
-}  // end saveTextLavel
+}
 
 // LoadTextStateCombo =========================================================
 /** Load the text state combo */
 //=============================================================================
-void LoadTextStateCombo( HWND comboBox, 
+void LoadTextStateCombo( HWND comboBox,
 												 Color enabled, Color enabledBorder,
 												 Color disabled, Color disabledBorder,
 												 Color hilite, Color hiliteBorder )
@@ -756,7 +755,7 @@ void LoadTextStateCombo( HWND comboBox,
 	currTextIndex = 0;
 	SendMessage( comboBox, CB_SETCURSEL, currTextIndex, 0 );
 
-}  // end LoadTextStateCombo
+}
 
 // LoadStateCombo =============================================================
 /** Load the state combo box passed in based on the window type
@@ -779,18 +778,18 @@ void LoadStateCombo( UnsignedInt style, HWND comboBox )
 
 		if( BitIsSet( entry->windowType, style ) )
 		{
-			
+
 			// add string
 			index = SendMessage( comboBox, CB_ADDSTRING, 0, (LPARAM)entry->stateName );
 
 			// set the state identifier as the item data of this entry
 			SendMessage( comboBox, CB_SETITEMDATA, index, entry->stateID );
 
-		}  // end if
+		}
 
-	}  // end for entry
+	}
 
-}  // end LoadStateCombo
+}
 
 // CommonDialogInitialize =====================================================
 /** Called from all dialog initializations */
@@ -827,12 +826,12 @@ void CommonDialogInitialize( GameWindow *window, HWND dialog )
 		CheckDlgButton( dialog, CHECK_WRAP_CENTERED, BST_CHECKED );
 	if( BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) )
 		CheckDlgButton( dialog, CHECK_CHECK_LIKE, BST_CHECKED );
-		
+
 	//
 	// limit the window name box to the max name size minus some breathing
 	// room for the filename
 	//
-	SendMessage( GetDlgItem( dialog, EDIT_NAME ), EM_SETLIMITTEXT, 
+	SendMessage( GetDlgItem( dialog, EDIT_NAME ), EM_SETLIMITTEXT,
 							 MAX_WINDOW_NAME_LEN - 16, 0 );
 
 	// set the text explaining the name size limit to the user
@@ -840,7 +839,7 @@ void CommonDialogInitialize( GameWindow *window, HWND dialog )
 	sprintf( buffer, "Name length + layout filename length (.wnd) must not exceed %d characters.",
 					 MAX_WINDOW_NAME_LEN );
 	SetDlgItemText( dialog, STATIC_NAME_MAX, buffer );
-								
+
 	// set name
 	SetDlgItemText( dialog, EDIT_NAME, instData->m_decoratedNameString.str() );
 
@@ -849,7 +848,7 @@ void CommonDialogInitialize( GameWindow *window, HWND dialog )
 
 		// load listbox with image names
 	LoadHeaderTemplateListComboBox( GetDlgItem( dialog, COMBO_HEADER ), instData->m_headerTemplateName);
-	
+
 
 	// load the combo box for available properties
 	LoadStateCombo( window->winGetStyle(), GetDlgItem( dialog, COMBO_STATE ) );
@@ -882,10 +881,10 @@ void CommonDialogInitialize( GameWindow *window, HWND dialog )
 	HWND tooltipDelay = GetDlgItem( dialog, EDIT_TOOLTIP_DELAY );
 	if( tooltipDelay )
     SetDlgItemInt( dialog, EDIT_TOOLTIP_DELAY, instData->m_tooltipDelay, TRUE );
-		
 
 
-}  // end CommonDialogInitialize
+
+}
 
 // validateName ===============================================================
 /** Validate a name before saving it into a window.  All window names
@@ -907,7 +906,7 @@ static Bool validateName( GameWindow *root, GameWindow *exception, char *name )
 		MessageBox( TheEditor->getWindowHandle(), buffer, "Illegal Character", MB_OK );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// if this root window is not the exception window compare name
 	if( root != exception )
@@ -922,10 +921,10 @@ static Bool validateName( GameWindow *root, GameWindow *exception, char *name )
 			MessageBox( TheEditor->getWindowHandle(), buffer, "Duplicate Name", MB_OK );
 			return FALSE;
 
-		}  // end if
+		}
 
 
-	}  // end if
+	}
 
 	// check our children
 	GameWindow *child;
@@ -936,7 +935,7 @@ static Bool validateName( GameWindow *root, GameWindow *exception, char *name )
 	// check the next window in the list
 	return validateName( root->winGetNext(), exception, name );
 
-}  // end validateName
+}
 
 // adjustGadgetDrawMethods ====================================================
 /** Based on the WIN_STATUS_IMAGE, set the draw callbacks to the
@@ -944,7 +943,7 @@ static Bool validateName( GameWindow *root, GameWindow *exception, char *name )
 //=============================================================================
 static void adjustGadgetDrawMethods( Bool useImages, GameWindow *window )
 {
-	
+
 	// sanity
 	if( window == NULL )
 		return;
@@ -983,16 +982,16 @@ static void adjustGadgetDrawMethods( Bool useImages, GameWindow *window )
 			else
 			{
 
-				DEBUG_LOG(( "Unable to adjust draw method, undefined gadget\n" ));
+				DEBUG_LOG(( "Unable to adjust draw method, undefined gadget" ));
 				assert( 0 );
 				return;
 
-			}  // end else
+			}
 
 			// set the image status bit
 			window->winSetStatus( WIN_STATUS_IMAGE );
 
-		}  // end if, image set
+		}
 		else
 		{
 
@@ -1021,24 +1020,24 @@ static void adjustGadgetDrawMethods( Bool useImages, GameWindow *window )
 			else
 			{
 
-				DEBUG_LOG(( "Unable to adjust draw method, undefined gadget\n" ));
+				DEBUG_LOG(( "Unable to adjust draw method, undefined gadget" ));
 				assert( 0 );
 				return;
 
-			}  // end else
+			}
 
 			// clear the image bit
 			window->winClearStatus( WIN_STATUS_IMAGE );
 
-		}  // end else, image not set
-	}//end if window is gadget
+		}
+	}
 
 	// adjust any child gadgets
 	GameWindow *child;
 	for( child = window->winGetChild(); child; child = child->winGetNext() )
 		adjustGadgetDrawMethods( useImages, child );
 
-}  // end adjustGadgetDrawMethods
+}
 
 // SaveCommonDialogProperties =================================================
 /** Save properties common on all dialogs for all windows */
@@ -1148,7 +1147,7 @@ Bool SaveCommonDialogProperties( HWND dialog, GameWindow *window )
   	// save delay text label data if present
 	HWND editTooltipDelayText = GetDlgItem( dialog, EDIT_TOOLTIP_DELAY );
 	if( editTooltipDelayText )
-  	instData->m_tooltipDelay = GetDlgItemInt( dialog, EDIT_TOOLTIP_DELAY, NULL, TRUE ); 
+  	instData->m_tooltipDelay = GetDlgItemInt( dialog, EDIT_TOOLTIP_DELAY, NULL, TRUE );
 
 	HWND headerCombo = GetDlgItem( dialog, COMBO_HEADER );
 	if( headerCombo )
@@ -1158,8 +1157,8 @@ Bool SaveCommonDialogProperties( HWND dialog, GameWindow *window )
 	TheEditor->setUnsaved( TRUE );
 
 	return TRUE;
-								
-}  // end SaveCommonDialogProperties
+
+}
 
 // LoadImageListComboBox ======================================================
 /** Load a combo box with image names from the GUI image collection
@@ -1177,22 +1176,20 @@ void LoadImageListComboBox( HWND comboBox )
 	SendMessage( comboBox, CB_RESETCONTENT, 0, 0 );
 
 	// load the combo box with string names from the GUI image collection
-	for( image = TheMappedImageCollection->firstImage();
-			 image;
-			 image = TheMappedImageCollection->nextImage( image ) )
+  for (unsigned index=0;(image=TheMappedImageCollection->Enum(index))!=NULL;index++)
 	{
 
 		SendMessage( comboBox, CB_ADDSTRING, 0, (LPARAM)image->getName().str() );
 
-	}  // end for image
+	}
 
 	// add a [NONE] at the top of the image lists
 	SendMessage( comboBox, CB_INSERTSTRING, 0, (LPARAM)"[NONE]" );
 
 	// select the [NONE] label
 	SendMessage( comboBox, CB_SETCURSEL, 0, 0 );
-	
-}  // end LoadImageListComboBox
+
+}
 
 // LoadHeaderTemplateListComboBox =============================================
 /** Load a combo box with header template names
@@ -1217,7 +1214,7 @@ void LoadHeaderTemplateListComboBox( HWND comboBox, AsciiString selected )
 
 		SendMessage( comboBox, CB_ADDSTRING, 0, (LPARAM)ht->m_name.str());
 
-	}  // end for image
+	}
 
 	// add a [NONE] at the top of the image lists
 	SendMessage( comboBox, CB_INSERTSTRING, 0, (LPARAM)"[NONE]" );
@@ -1227,9 +1224,9 @@ void LoadHeaderTemplateListComboBox( HWND comboBox, AsciiString selected )
 		SendMessage( comboBox, CB_SETCURSEL, 0, 0 );
 	else
 		SendMessage( comboBox, CB_SELECTSTRING, -1, (LPARAM)selected.str() );
-	
-		
-}  // end LoadHeaderTemplateListComboBox
+
+
+}
 
 
 // ComboBoxSelectionToImage ===================================================
@@ -1238,7 +1235,7 @@ void LoadHeaderTemplateListComboBox( HWND comboBox, AsciiString selected )
 	* image Loc from the GUI collection
 	*
 	* NOTE: The image list combo boxes have a [NONE] at index 0, if that
-	* is selected NULL will be returned 
+	* is selected NULL will be returned
 	*/
 //=============================================================================
 const Image *ComboBoxSelectionToImage( HWND comboBox )
@@ -1261,9 +1258,9 @@ const Image *ComboBoxSelectionToImage( HWND comboBox )
 	SendMessage( comboBox, CB_GETLBTEXT, selected, (LPARAM)buffer );
 
 	// return the image loc that matches the string
-	return TheMappedImageCollection->findImageByName( AsciiString( buffer ) );
+	return TheMappedImageCollection->findImageByName( buffer );
 
-}  // end ComboBoxSelectionToImage
+}
 
 // GetControlColor ============================================================
 /** Search the control color table and return the color for the
@@ -1279,12 +1276,12 @@ RGBColorInt *GetControlColor( UnsignedInt controlID )
 		if( entry->controlID == controlID )
 			return &entry->color;
 
-	}  // end for
+	}
 
 	// not found
 	return NULL;
 
-}  // end GetControlColor
+}
 
 // SetControlColor ============================================================
 /** Set the color in the table with the matching control ID */
@@ -1309,11 +1306,11 @@ void SetControlColor( UnsignedInt controlID, Color color )
 			entry->color.blue = blue;
 			break;
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
-}  // end SetControlColor
+}
 
 // GetStateInfo ===============================================================
 /** Get a image and color state entry */
@@ -1328,11 +1325,11 @@ ImageAndColorInfo *GetStateInfo( StateIdentifier id )
 		if( entry->stateID == id )
 			return entry;
 
-	}  // end for entry
+	}
 
 	return NULL;
 
-}  // end GetStateInfo
+}
 
 // SwitchToState ==============================================================
 /** Switch the image and color combo box to specified state, invalidate
@@ -1351,11 +1348,11 @@ void SwitchToState( StateIdentifier id, HWND dialog )
 	if( info == NULL )
 	{
 
-		DEBUG_LOG(( "Invalid state request\n" ));
+		DEBUG_LOG(( "Invalid state request" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// select the string in the state combo box
 	SendMessage( stateBox, CB_SELECTSTRING, -1, (LPARAM)info->stateName );
@@ -1373,7 +1370,7 @@ void SwitchToState( StateIdentifier id, HWND dialog )
 	InvalidateRect( colorButton, NULL, TRUE );
 	InvalidateRect( borderColorButton, NULL, TRUE );
 
-}  // end SwitchToState
+}
 
 // StoreImageAndColor =========================================================
 /** Store the image and colors in the table */
@@ -1394,11 +1391,11 @@ void StoreImageAndColor( StateIdentifier id, const Image *image,
 			entry->borderColor = borderColor;
 			break;  // exit for
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
-}  // end StoreImageAndColor
+}
 
 // StoreColor =================================================================
 /** Store the colors in the table */
@@ -1417,11 +1414,11 @@ void StoreColor( StateIdentifier id, Color color, Color borderColor )
 			entry->borderColor = borderColor;
 			break;  // exit for
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
-}  // end StoreColor
+}
 
 // GetCurrentStateInfo ========================================================
 /** Get the info on the current state selected in the state combo */
@@ -1442,7 +1439,7 @@ ImageAndColorInfo *GetCurrentStateInfo( HWND dialog )
 
 	return GetStateInfo( stateID );
 
-}  // end GetCurrentStateInfo
+}
 
 // PositionWindowOnScreen =====================================================
 /** Position the window on the screen, but keep the window completely
@@ -1476,13 +1473,13 @@ void PositionWindowOnScreen( HWND window, Int x, Int y )
 		windowPos.y = screenRect.bottom - windowSize.y;
 
 	// place the window
-	MoveWindow( window, windowPos.x, windowPos.y, 
+	MoveWindow( window, windowPos.x, windowPos.y,
 							windowSize.x, windowSize.y, TRUE );
 
 	// show the window
 	ShowWindow( window, SW_SHOW );
 
-}  // end PositionWindowOnScreen
+}
 
 // HandleCommonDialogMessages =================================================
 /** Handle any messages common to all controls on all property dialogs */
@@ -1499,8 +1496,8 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 		// ------------------------------------------------------------------------
 		case WM_DRAWITEM:
 		{
-      UINT controlID = (UINT)wParam;  // control identifier 
-      LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; // item drawing 
+      UINT controlID = (UINT)wParam;  // control identifier
+      LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; // item drawing
 			Color color = GAME_COLOR_UNDEFINED;
 //			ImageAndColorInfo *info = GetCurrentStateInfo( hWndDialog );
 
@@ -1515,9 +1512,9 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 					else
 						color = info->borderColor;
 
-			}  // end if
+			}
 			else if( controlID == BUTTON_TEXT_COLOR || controlID == BUTTON_TEXT_BORDER_COLOR )
-			{		
+			{
 				TextDrawData textDraw = textDrawData[ currTextIndex ];
 
 				if( controlID == BUTTON_TEXT_COLOR )
@@ -1525,7 +1522,7 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 				else
 					color = textDraw.borderColor;
 
-			}  // end else if
+			}
 
 			if( color != GAME_COLOR_UNDEFINED )
 			{
@@ -1537,11 +1534,11 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 				// if this control is disabled just let windows handle drawing
 				if( IsWindowEnabled( hWndControl ) == FALSE )
 				{
-					
+
 					*returnCode = FALSE;
 					break;
 
-				}  // end if
+				}
 
 				// get the color info
 				GameGetColorComponents( color, &r, &g, &b, &a );
@@ -1568,12 +1565,12 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 				used = TRUE;
 				break;
 
-			}  // end if
+			}
 
 			*returnCode = FALSE;
 			break;
 
-		}  // end draw item
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -1581,7 +1578,7 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -1600,11 +1597,11 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 						newState = (StateIdentifier)SendMessage( hWndControl, CB_GETITEMDATA, selected, 0 );
 						SwitchToState( newState, hWndDialog );
 
-					}  // end if
+					}
 					used = TRUE;
 					break;
 
-				}  // end state
+				}
 
 				// --------------------------------------------------------------------
 				case COMBO_TEXT_STATE:
@@ -1621,31 +1618,31 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 						InvalidateRect( GetDlgItem( hWndDialog, BUTTON_TEXT_COLOR ), NULL, TRUE );
 						InvalidateRect( GetDlgItem( hWndDialog, BUTTON_TEXT_BORDER_COLOR ), NULL, TRUE );
 
-					}  // end if
+					}
 					used = TRUE;
 					break;
 
-				}  // end text state
+				}
 
 				// --------------------------------------------------------------------
 				case COMBO_IMAGE:
 				{
-					
+
 					// store image selection changes
 					if( notifyCode == CBN_SELCHANGE )
 					{
 						ImageAndColorInfo *info = GetCurrentStateInfo( hWndDialog );
 						const Image *newImage = ComboBoxSelectionToImage( hWndControl );
 
-						StoreImageAndColor( info->stateID, newImage, 
+						StoreImageAndColor( info->stateID, newImage,
 																info->color, info->borderColor );
 
-					}  // end if
-	
+					}
+
 					used = TRUE;
 					break;
 
-				}  // end image
+				}
 
 				// --------------------------------------------------------------------
 				case BUTTON_COLOR:
@@ -1700,25 +1697,25 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 						// invalidate the color preview
 						InvalidateRect( hWndControl, NULL, TRUE );
 
-					}  // end if
+					}
 
 					used = TRUE;
 					break;
 
-				}  // end color buttons
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       *returnCode = 0;
 			break;
 
-    } // end of WM_COMMAND
+    }
 
-  }  // end of switch
+  }
 
 	return used;
 
-}  // end HandleCommonDialogMessages
+}
 
 // GetProprsEnabledTextColor ==================================================
 //=============================================================================
diff --git a/Generals/Code/Tools/GUIEdit/Source/Save.cpp b/Generals/Code/Tools/GUIEdit/Source/Save.cpp
index e5a028666a7..ecac794fd7d 100644
--- a/Generals/Code/Tools/GUIEdit/Source/Save.cpp
+++ b/Generals/Code/Tools/GUIEdit/Source/Save.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Save.cpp /////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -44,7 +44,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include <stdio.h>
 #include <assert.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -88,7 +87,7 @@ static void fileNewLine( FILE *fp )
 	fprintf( fp, "\n" );
 	fflush( fp );
 
-}  // end fileNewLine
+}
 
 // writeBufferToFile ==========================================================
 /** Write the contents of the buffer to the file */
@@ -106,7 +105,7 @@ static void writeBufferToFile( FILE *fp, char *buffer )
 	//
 	fflush( fp );
 
-}  // end writeBufferToFile
+}
 
 // clearBufferToSpaces ========================================================
 /** Clear the buffer to all spaces */
@@ -118,7 +117,7 @@ static void clearBufferToSpaces( void )
 	for( i = 0; i < BUFFER_SIZE; i++ )
 		buffer[ i ] = ' ';
 
-}  // end clearBufferToSpaces
+}
 
 // saveType ===================================================================
 /** Save type of window */
@@ -159,7 +158,7 @@ static Bool saveType( GameWindow *window, FILE *fp, Int dataIndent )
 
 	return TRUE;
 
-}  // end saveType
+}
 
 // savePosition ===============================================================
 /** Save window position data */
@@ -180,19 +179,19 @@ static Bool savePosition( GameWindow *window, FILE *fp, Int dataIndent )
 	// created them in (the edit window size) so we can scale them by
 	// that ratio if need be
 	//
-	sprintf( &buffer[ dataIndent ], "SCREENRECT = UPPERLEFT: %d %d,\n", 
+	sprintf( &buffer[ dataIndent ], "SCREENRECT = UPPERLEFT: %d %d,\n",
 					 screenRect.lo.x, screenRect.lo.y );
 	writeBufferToFile( fp, buffer );
-	sprintf( &buffer[ dataIndent ], "             BOTTOMRIGHT: %d %d,\n", 
+	sprintf( &buffer[ dataIndent ], "             BOTTOMRIGHT: %d %d,\n",
 					 screenRect.hi.x, screenRect.hi.y );
 	writeBufferToFile( fp, buffer );
-	sprintf( &buffer[ dataIndent ], "             CREATIONRESOLUTION: %d %d;\n", 
+	sprintf( &buffer[ dataIndent ], "             CREATIONRESOLUTION: %d %d;\n",
 					 TheDisplay->getWidth(), TheDisplay->getHeight() );
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
 
-}  // end savePosition
+}
 
 // saveName ===================================================================
 // Save name */
@@ -201,13 +200,13 @@ static Bool saveName( GameWindow *window, FILE *fp, Int dataIndent )
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	sprintf( &buffer[ dataIndent ], "NAME = \"%s:%s\";\n", 
+	sprintf( &buffer[ dataIndent ], "NAME = \"%s:%s\";\n",
 					 TheEditor->getSaveFilename(), instData->m_decoratedNameString.str() );
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
 
-}  // end saveName
+}
 
 // saveStatus =================================================================
 /** Save status information */
@@ -227,31 +226,31 @@ static Bool saveStatus( GameWindow *window, FILE *fp, Int dataIndent )
 		bit = 1 << i;
 		if( BitIsSet( window->winGetStatus(), bit ) )
 		{
-			
+
 			// if this is an additional bit add a +
 			if( bitWritten == TRUE )
-				strcat( buffer, "+");
+				strlcat(buffer, "+", ARRAY_SIZE(buffer));
 
 			// add status name
-			strcat( buffer, WindowStatusNames[ i ] );
+			strlcat(buffer, WindowStatusNames[ i ], ARRAY_SIZE(buffer));
 			bitWritten = TRUE;
 
-		}  // end
+		}
 		i++;
 
-	}  // end while
-	
+	}
+
 	// if no bits written write NONE in the file
 	if( bitWritten == FALSE )
-		strcat( buffer, "NONE" );
+		strlcat(buffer, "NONE", ARRAY_SIZE(buffer));
 
 	// complete line and write
-	strcat( buffer, ";\n" );
+	strlcat(buffer, ";\n", ARRAY_SIZE(buffer));
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
 
-}  // end saveStatus
+}
 
 // saveStyle ==================================================================
 /** Save style information */
@@ -271,31 +270,31 @@ static Bool saveStyle( GameWindow *window, FILE *fp, Int dataIndent )
 		bit = 1 << i;
 		if( BitIsSet( window->winGetStyle(), bit ) )
 		{
-			
+
 			// if this is an additional bit add a +
 			if( bitWritten == TRUE )
-				strcat( buffer, "+");
+				strlcat(buffer, "+", ARRAY_SIZE(buffer));
 
 			// add status name
-			strcat( buffer, WindowStyleNames[ i ] );
+			strlcat(buffer, WindowStyleNames[ i ], ARRAY_SIZE(buffer));
 			bitWritten = TRUE;
 
-		}  // end
+		}
 		i++;
-	
-	}  // end while
+
+	}
 
 	// if no bits written write NONE in the file
 	if( bitWritten == FALSE )
-		strcat( buffer, "NONE" );
+		strlcat(buffer, "NONE", ARRAY_SIZE(buffer));
 
 	// complete line and write
-	strcat( buffer, ";\n" );
+	strlcat(buffer, ";\n", ARRAY_SIZE(buffer));
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
 
-}  // end saveStyle
+}
 
 // saveCallbacks ==============================================================
 /** Save string representations of the window function callbacks into
@@ -341,7 +340,7 @@ static Bool saveCallbacks( GameWindow *window, FILE *fp, Int dataIndent )
 
 	return TRUE;
 
-}  // end saveCallbacks
+}
 
 // saveHeaderTemplate =========================================================
 /** Save HeaderTemplate for a window */
@@ -354,9 +353,9 @@ static Bool  saveHeaderTemplate(GameWindow *window, FILE *fp, Int dataIndent  )
 		headerName = GUIEDIT_NONE_STRING;
 	sprintf( &buffer[ dataIndent ], "HEADERTEMPLATE = \"%s\";\n", headerName.str() );
 	writeBufferToFile( fp, buffer );
-	
+
 	return TRUE;
-} 
+}
 
 // saveFont ===================================================================
 /** Save font name for a window */
@@ -366,17 +365,17 @@ static Bool saveFont( GameWindow *window, FILE *fp, Int dataIndent )
 	GameFont *font = window->winGetFont();
 
 	// if no font data don't write anything
-	if( font == NULL )	
+	if( font == NULL )
 		return TRUE;
 
 	// write the font data
-	sprintf( &buffer[ dataIndent ], "FONT = NAME: \"%s\", SIZE: %d, BOLD: %d;\n", 
+	sprintf( &buffer[ dataIndent ], "FONT = NAME: \"%s\", SIZE: %d, BOLD: %d;\n",
 					 font->nameString.str(), font->pointSize, font->bold );
 	writeBufferToFile( fp, buffer );
-	
+
 	return TRUE;
 
-}  // end saveFont
+}
 
 // saveTooltipText ===================================================================
 /** Save the text for a window */
@@ -391,11 +390,11 @@ static Bool saveTooltipText( GameWindow *window, FILE *fp, Int dataIndent )
 		sprintf( &buffer[ dataIndent ], "TOOLTIPTEXT = \"%s\";\n", instData->m_tooltipString.str() );
 		writeBufferToFile( fp, buffer );
 
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end saveTooltipText
+}
 
 // saveTooltipDelay ===================================================================
 /** Save the delay for a window */
@@ -414,7 +413,7 @@ static Bool saveTooltipDelay( GameWindow *window, FILE *fp, Int dataIndent )
 
 	return TRUE;
 
-}  // end saveTooltipText
+}
 
 // saveText ===================================================================
 /** Save the text for a window */
@@ -430,11 +429,11 @@ static Bool saveText( GameWindow *window, FILE *fp, Int dataIndent )
 		sprintf( &buffer[ dataIndent ], "TEXT = \"%s\";\n", instData->m_textLabelString.str() );
 		writeBufferToFile( fp, buffer );
 
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end saveText
+}
 
 // saveTextColor ==============================================================
 /** Save the text colors for enabled, disable, and hilite with
@@ -470,18 +469,18 @@ static Bool saveTextColor( GameWindow *window, FILE *fp, Int dataIndent )
 			sprintf( &buffer[ dataIndent ], "TEXTCOLOR = ENABLED:  %d %d %d %d, ENABLEDBORDER:  %d %d %d %d,\n",
 							 r, g, b, a, br, bg, bb, ba );
 		else if( i == max - 1 )
-			sprintf( &buffer[ dataIndent ], "            HILITE:   %d %d %d %d, HILITEBORDER:   %d %d %d %d;\n",			
+			sprintf( &buffer[ dataIndent ], "            HILITE:   %d %d %d %d, HILITEBORDER:   %d %d %d %d;\n",
 							 r, g, b, a, br, bg, bb, ba );
 		else
-			sprintf( &buffer[ dataIndent ], "            DISABLED: %d %d %d %d, DISABLEDBORDER: %d %d %d %d,\n",			
+			sprintf( &buffer[ dataIndent ], "            DISABLED: %d %d %d %d, DISABLEDBORDER: %d %d %d %d,\n",
 							 r, g, b, a, br, bg, bb, ba );
 		writeBufferToFile( fp, buffer );
 
-	}  // end for i
+	}
 
 	return TRUE;
 
-}  // end saveTextColor
+}
 
 // tokenIsEnabledData =========================================================
 /** Token refers to enabled draw data */
@@ -501,8 +500,8 @@ static Bool tokenIsEnabledData( const char *token )
 		return TRUE;
 
 	return FALSE;
-	
-}  // end tokenIsEnabledData
+
+}
 
 // tokenIsDisabledData ========================================================
 /** Token refers to Disabled draw data */
@@ -521,8 +520,8 @@ static Bool tokenIsDisabledData( const char *token )
 		return TRUE;
 
 	return FALSE;
-	
-}  // end tokenIsDisabledData
+
+}
 
 // tokenIsHiliteData ==========================================================
 /** Token refers to Hilite draw data */
@@ -541,8 +540,8 @@ static Bool tokenIsHiliteData( const char *token )
 		return TRUE;
 
 	return FALSE;
-	
-}  // end tokenIsHiliteData
+
+}
 
 // saveDrawData ===============================================================
 /** Save the draw data array */
@@ -577,11 +576,11 @@ static Bool saveDrawData( const char *token, GameWindow *window,
 		else
 		{
 
-			DEBUG_LOG(( "Save draw data, unknown token '%s'\n", token ));
+			DEBUG_LOG(( "Save draw data, unknown token '%s'", token ));
 			assert( 0 );
 			return FALSE;
 
-		}  // end else
+		}
 
 		image = drawData->image;
 		GameGetColorComponents( drawData->color, &r, &g, &b, &a );
@@ -599,11 +598,11 @@ static Bool saveDrawData( const char *token, GameWindow *window,
 
 		writeBufferToFile( fp, buffer );
 
-	}  // end for i
+	}
 
 	return TRUE;
 
-}  // end saveDrawData
+}
 
 // saveListboxData ============================================================
 /** Save listbox data to the file */
@@ -616,12 +615,12 @@ static Bool saveListboxData( GameWindow *window, FILE *fp, Int dataIndent )
 	if( listData == NULL )
 	{
 
-		DEBUG_LOG(( "No listbox data to save for window '%d'\n", 
+		DEBUG_LOG(( "No listbox data to save for window '%d'",
 						 window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	sprintf( &buffer[ dataIndent ], "LISTBOXDATA = LENGTH: %d,\n", listData->listLength );
 	writeBufferToFile( fp, buffer );
@@ -641,13 +640,13 @@ static Bool saveListboxData( GameWindow *window, FILE *fp, Int dataIndent )
 	{
 		for(Int i = 0; i < listData->columns; i++ )
 		{
-			sprintf( &buffer[ dataIndent ], "              COLUMNSWIDTH%%: %d,\n", listData->columnWidthPercentage[i] );	
-			writeBufferToFile( fp, buffer );	
+			sprintf( &buffer[ dataIndent ], "              COLUMNSWIDTH%%: %d,\n", listData->columnWidthPercentage[i] );
+			writeBufferToFile( fp, buffer );
 		}
 	}
-	sprintf( &buffer[ dataIndent ], "              FORCESELECT: %d;\n", listData->forceSelect );	
-	writeBufferToFile( fp, buffer );	
-	
+	sprintf( &buffer[ dataIndent ], "              FORCESELECT: %d;\n", listData->forceSelect );
+	writeBufferToFile( fp, buffer );
+
 	// save the up button draw data for the listbox
 	if( listData->upButton )
 	{
@@ -656,7 +655,7 @@ static Bool saveListboxData( GameWindow *window, FILE *fp, Int dataIndent )
 		saveDrawData( "LISTBOXDISABLEDUPBUTTONDRAWDATA", listData->upButton, fp, dataIndent );
 		saveDrawData( "LISTBOXHILITEUPBUTTONDRAWDATA", listData->upButton, fp, dataIndent );
 
-	}  // end if
+	}
 
 	// save down button draw data for listbox
 	if( listData->downButton )
@@ -666,7 +665,7 @@ static Bool saveListboxData( GameWindow *window, FILE *fp, Int dataIndent )
 		saveDrawData( "LISTBOXDISABLEDDOWNBUTTONDRAWDATA", listData->downButton, fp, dataIndent );
 		saveDrawData( "LISTBOXHILITEDOWNBUTTONDRAWDATA", listData->downButton, fp, dataIndent );
 
-	}  // end if
+	}
 
 	// save the slider draw data on the listbox
 	if( listData->slider )
@@ -683,13 +682,13 @@ static Bool saveListboxData( GameWindow *window, FILE *fp, Int dataIndent )
 			saveDrawData( "SLIDERTHUMBDISABLEDDRAWDATA", thumb, fp, dataIndent );
 			saveDrawData( "SLIDERTHUMBHILITEDRAWDATA", thumb, fp, dataIndent );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end saveListboxData
+}
 
 // saveComboBoxData ============================================================
 /** Save Combo Box data to the file */
@@ -702,33 +701,33 @@ static Bool saveComboBoxData( GameWindow *window, FILE *fp, Int dataIndent )
 	if( comboData == NULL )
 	{
 
-		DEBUG_LOG(( "No comboData data to save for window '%d'\n", 
+		DEBUG_LOG(( "No comboData data to save for window '%d'",
 						 window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
-	
+	}
+
 	sprintf( &buffer[ dataIndent ], "COMBOBOXDATA = ISEDITABLE: %d,\n", comboData->isEditable );
 	writeBufferToFile( fp, buffer );
-	sprintf( &buffer[ dataIndent ], "              MAXCHARS: %d,\n", comboData->maxChars );	
-	writeBufferToFile( fp, buffer );	
-	sprintf( &buffer[ dataIndent ], "              MAXDISPLAY: %d,\n", comboData->maxDisplay );	
-	writeBufferToFile( fp, buffer );	
-	sprintf( &buffer[ dataIndent ], "              ASCIIONLY: %d,\n", comboData->asciiOnly );	
-	writeBufferToFile( fp, buffer );	
-	sprintf( &buffer[ dataIndent ], "              LETTERSANDNUMBERS: %d;\n", comboData->lettersAndNumbersOnly );	
-	writeBufferToFile( fp, buffer );	
-	
+	sprintf( &buffer[ dataIndent ], "              MAXCHARS: %d,\n", comboData->maxChars );
+	writeBufferToFile( fp, buffer );
+	sprintf( &buffer[ dataIndent ], "              MAXDISPLAY: %d,\n", comboData->maxDisplay );
+	writeBufferToFile( fp, buffer );
+	sprintf( &buffer[ dataIndent ], "              ASCIIONLY: %d,\n", comboData->asciiOnly );
+	writeBufferToFile( fp, buffer );
+	sprintf( &buffer[ dataIndent ], "              LETTERSANDNUMBERS: %d;\n", comboData->lettersAndNumbersOnly );
+	writeBufferToFile( fp, buffer );
+
 	//Save teh dropDownButton draw data for the combo box
 	if( comboData->dropDownButton )
 	{
-									 
+
 		saveDrawData( "COMBOBOXDROPDOWNBUTTONENABLEDDRAWDATA", comboData->dropDownButton, fp, dataIndent );
 		saveDrawData( "COMBOBOXDROPDOWNBUTTONDISABLEDDRAWDATA", comboData->dropDownButton, fp, dataIndent );
 		saveDrawData( "COMBOBOXDROPDOWNBUTTONHILITEDRAWDATA", comboData->dropDownButton, fp, dataIndent );
 
-	}  // end if
+	}
 
 	if( comboData->editBox )
 	{
@@ -737,7 +736,7 @@ static Bool saveComboBoxData( GameWindow *window, FILE *fp, Int dataIndent )
 		saveDrawData( "COMBOBOXEDITBOXDISABLEDDRAWDATA", comboData->editBox, fp, dataIndent );
 		saveDrawData( "COMBOBOXEDITBOXHILITEDRAWDATA", comboData->editBox, fp, dataIndent );
 
-	}  // end if
+	}
 
 	if(comboData->listBox)
 	{
@@ -746,7 +745,7 @@ static Bool saveComboBoxData( GameWindow *window, FILE *fp, Int dataIndent )
 			saveDrawData( "COMBOBOXLISTBOXENABLEDDRAWDATA", comboData->listBox, fp, dataIndent );
 			saveDrawData( "COMBOBOXLISTBOXDISABLEDDRAWDATA", comboData->listBox, fp, dataIndent );
 			saveDrawData( "COMBOBOXLISTBOXHILITEDRAWDATA", comboData->listBox, fp, dataIndent );
-		
+
 		// save the up button draw data for the listbox
 		if( listData->upButton )
 		{
@@ -755,7 +754,7 @@ static Bool saveComboBoxData( GameWindow *window, FILE *fp, Int dataIndent )
 			saveDrawData( "LISTBOXDISABLEDUPBUTTONDRAWDATA", listData->upButton, fp, dataIndent );
 			saveDrawData( "LISTBOXHILITEUPBUTTONDRAWDATA", listData->upButton, fp, dataIndent );
 
-		}  // end if
+		}
 
 		// save down button draw data for listbox
 		if( listData->downButton )
@@ -765,7 +764,7 @@ static Bool saveComboBoxData( GameWindow *window, FILE *fp, Int dataIndent )
 			saveDrawData( "LISTBOXDISABLEDDOWNBUTTONDRAWDATA", listData->downButton, fp, dataIndent );
 			saveDrawData( "LISTBOXHILITEDOWNBUTTONDRAWDATA", listData->downButton, fp, dataIndent );
 
-		}  // end if
+		}
 
 		// save the slider draw data on the listbox
 		if( listData->slider )
@@ -782,13 +781,13 @@ static Bool saveComboBoxData( GameWindow *window, FILE *fp, Int dataIndent )
 				saveDrawData( "SLIDERTHUMBDISABLEDDRAWDATA", thumb, fp, dataIndent );
 				saveDrawData( "SLIDERTHUMBHILITEDRAWDATA", thumb, fp, dataIndent );
 
-			}  // end if
+			}
 
-		}  // end if
-	}// end if
+		}
+	}
 	return TRUE;
 
-}  // end saveComboBoxData
+}
 
 
 // saveRadioButtonData ========================================================
@@ -802,19 +801,19 @@ static Bool saveRadioButtonData( GameWindow *window, FILE *fp, Int dataIndent )
 	{
 
 
-		DEBUG_LOG(( "No radio button data to save for window '%d'\n", 
+		DEBUG_LOG(( "No radio button data to save for window '%d'",
 						 window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	sprintf( &buffer[ dataIndent ], "RADIOBUTTONDATA = GROUP: %d;\n", radioData->group );
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
 
-}  // end saveRadioButtonData
+}
 
 // saveSliderData =============================================================
 /** Save slider specific data */
@@ -827,12 +826,12 @@ static Bool saveSliderData( GameWindow *window, FILE *fp, Int dataIndent )
 	if( sliderData == NULL )
 	{
 
-		DEBUG_LOG(( "No slider data in window to save for window %d\n", 
+		DEBUG_LOG(( "No slider data in window to save for window %d",
 							window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	sprintf( &buffer[ dataIndent ], "SLIDERDATA = MINVALUE: %d,\n", sliderData->minVal );
 	writeBufferToFile( fp, buffer );
@@ -848,11 +847,11 @@ static Bool saveSliderData( GameWindow *window, FILE *fp, Int dataIndent )
 		saveDrawData( "SLIDERTHUMBDISABLEDDRAWDATA", thumb, fp, dataIndent );
 		saveDrawData( "SLIDERTHUMBHILITEDRAWDATA", thumb, fp, dataIndent );
 
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end saveSliderData
+}
 
 // saveStaticTextData =========================================================
 /** Save static text data entry */
@@ -865,19 +864,19 @@ static Bool saveStaticTextData( GameWindow *window, FILE *fp, Int dataIndent )
 	if( textData == NULL )
 	{
 
-		DEBUG_LOG(( "No text data in window to save for window %d\n", 
+		DEBUG_LOG(( "No text data in window to save for window %d",
 							window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	sprintf( &buffer[ dataIndent ], "STATICTEXTDATA = CENTERED: %d;\n", textData->centered );
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
 
-}  // end saveStaticTextData
+}
 
 // saveTextEntryData ==========================================================
 /** Save static text data entry */
@@ -890,12 +889,12 @@ static Bool saveTextEntryData( GameWindow *window, FILE *fp, Int dataIndent )
 	if( entryData == NULL )
 	{
 
-		DEBUG_LOG(( "No text entry data in window to save for window %d\n", 
+		DEBUG_LOG(( "No text entry data in window to save for window %d",
 							window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	sprintf( &buffer[ dataIndent ], "TEXTENTRYDATA = MAXLEN: %d,\n", entryData->maxTextLen );
 	writeBufferToFile( fp, buffer );
@@ -910,7 +909,7 @@ static Bool saveTextEntryData( GameWindow *window, FILE *fp, Int dataIndent )
 
 	return TRUE;
 
-}  // end saveTextEntryData
+}
 
 // saveTabControlData ==========================================================
 /** Save tab control entry */
@@ -923,12 +922,12 @@ static Bool saveTabControlData( GameWindow *window, FILE *fp, Int dataIndent )
 	if( tabControlData == NULL )
 	{
 
-		DEBUG_LOG(( "No text entry data in window to save for window %d\n", 
+		DEBUG_LOG(( "No text entry data in window to save for window %d",
 							window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	sprintf( &buffer[ dataIndent ], "TABCONTROLDATA = TABORIENTATION: %d,\n", tabControlData->tabOrientation );
 	writeBufferToFile( fp, buffer );
@@ -970,7 +969,7 @@ static Bool saveGadgetData( GameWindow *window, FILE *fp, Int dataIndent )
 		return saveComboBoxData( window, fp, dataIndent );
 	else if( BitIsSet( window->winGetStyle(), GWS_RADIO_BUTTON ) )
 		return saveRadioButtonData( window, fp, dataIndent );
-	else if( BitIsSet( window->winGetStyle(), GWS_VERT_SLIDER | 
+	else if( BitIsSet( window->winGetStyle(), GWS_VERT_SLIDER |
 																					 GWS_HORZ_SLIDER ) )
 		return saveSliderData( window, fp, dataIndent );
 	else if( BitIsSet( window->winGetStyle(), GWS_STATIC_TEXT ) )
@@ -982,7 +981,7 @@ static Bool saveGadgetData( GameWindow *window, FILE *fp, Int dataIndent )
 
 	return TRUE;
 
-}  // end saveGadgetData
+}
 
 // saveWindow =================================================================
 /** Save a single window and any of its child windows.  Note that child
@@ -1027,7 +1026,7 @@ static Bool saveWindow( FILE *fp, GameWindow *window, Int indent )
 	}
 
 	//
-	// save child data if present, we do not save child data of GUI controls 
+	// save child data if present, we do not save child data of GUI controls
 	// themselves, only generic stuff, except for the Tab Control again, which
 	// is the gadget with children exception
 	//
@@ -1041,7 +1040,7 @@ static Bool saveWindow( FILE *fp, GameWindow *window, Int indent )
 			// traverse to end of child list
 			while( child->winGetNext() != NULL )
 				child = child->winGetNext();
-					
+
 			// save children windows in reverse order
 			while( child )
 			{
@@ -1058,30 +1057,30 @@ static Bool saveWindow( FILE *fp, GameWindow *window, Int indent )
 				// previous child
 				child = child->winGetPrev();
 
-			}  // end while
+			}
 
 			// all children saved
 			sprintf( &buffer[ dataIndent ], "ENDALLCHILDREN\n" );
 			writeBufferToFile( fp, buffer );
 
-		}  // end if, children present
+		}
 
-	}  // end if
+	}
 	else
 	{
 
 		// save specific gadget data
 		saveGadgetData( window, fp, dataIndent );
 
-	}  // end else
-			
+	}
+
 	// end of window definition
 	sprintf( &buffer[ indent ], "END\n" );
 	writeBufferToFile( fp, buffer );
 
 	return success;
 
-}  // end saveWindow
+}
 
 // GUIEdit::validateNames =====================================================
 /** Stored in the m_decorated field for each window is a name given
@@ -1094,7 +1093,7 @@ static Bool saveWindow( FILE *fp, GameWindow *window, Int indent )
 //=============================================================================
 void GUIEdit::validateNames( GameWindow *root, char *filename, Bool *valid )
 {
-	
+
 	// the end of recursion
 	if( root == NULL )
 		return;
@@ -1108,35 +1107,35 @@ void GUIEdit::validateNames( GameWindow *root, char *filename, Bool *valid )
 		*valid = FALSE;
 		return;
 
-	}  // end if
+	}
 
 	// check this name for too long
 	WinInstanceData *instData = root->winGetInstanceData();
 	if( strlen( filename ) + instData->m_decoratedNameString.getLength() >= MAX_WINDOW_NAME_LEN )
 	{
 
-		strcat( offendingNames, "[Too Long] " );
-		strcat( offendingNames, filename );
-		strcat( offendingNames, ":" );
-		strcat( offendingNames, instData->m_decoratedNameString.str() );
-		strcat( offendingNames, "\n");
+		strlcat(offendingNames, "[Too Long] ", ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, filename, ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, ":", ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, instData->m_decoratedNameString.str(), ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, "\n", ARRAY_SIZE(offendingNames));
 		*valid = FALSE;
 
-	}  // end if
+	}
 
 	// check for a duplicate filename
-	if( TheEditor->isNameDuplicate( TheWindowManager->winGetWindowList(),
+	if( isNameDuplicate( TheWindowManager->winGetWindowList(),
 																	root, instData->m_decoratedNameString ) )
 	{
 
-		strcat( offendingNames, "[Duplicate] " );
-		strcat( offendingNames, filename );
-		strcat( offendingNames, ":" );
-		strcat( offendingNames, instData->m_decoratedNameString.str() );
-		strcat( offendingNames, "\n" );
+		strlcat(offendingNames, "[Duplicate] ", ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, filename, ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, ":", ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, instData->m_decoratedNameString.str(), ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, "\n", ARRAY_SIZE(offendingNames));
 		*valid = FALSE;
 
-	}  // end if
+	}
 
 	//You only call this on the first child since the call right after it will handle siblings (depth first)
 	GameWindow *child = root->winGetChild();
@@ -1145,7 +1144,7 @@ void GUIEdit::validateNames( GameWindow *root, char *filename, Bool *valid )
 	// onto the next window
 	validateNames( root->winGetNext(), filename, valid );
 
-}  // end validateNames
+}
 
 // GUIEdit::updateRadioScreenIdentifiers ======================================
 /** update all radio button screen identifiers with the new identifier */
@@ -1164,7 +1163,7 @@ void GUIEdit::updateRadioScreenIdentifiers( GameWindow *window, Int screenID )
 
 		GadgetRadioSetGroup( window, radioData->group, screenID );
 
-	}  // end if
+	}
 
 	// check our children
 	GameWindow *child;
@@ -1174,7 +1173,7 @@ void GUIEdit::updateRadioScreenIdentifiers( GameWindow *window, Int screenID )
 	// check the next one
 	updateRadioScreenIdentifiers( window->winGetNext(), screenID );
 
-}  // end updateRadioScreenIdentifiers
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Write layout block for a window file */
@@ -1193,7 +1192,7 @@ static void writeLayoutBlock( FILE *fp )
 	// end marker
 	fprintf( fp, "ENDLAYOUTBLOCK\n" );
 
-}  // end writeLayoutBlock
+}
 
 // GUIEdit::saveData ==========================================================
 /** Save all our data to the file specified in filePath, which is a full
@@ -1229,14 +1228,14 @@ Bool GUIEdit::saveData( char *filePathAndFilename, char *filename )
 	if( valid == FALSE )
 	{
 
-		MessageBox( TheEditor->getWindowHandle(), offendingNames, "Window Name Error", MB_OK );	
+		MessageBox( getWindowHandle(), offendingNames, "Window Name Error", MB_OK );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// update all radio button screen identifiers with the filename
 	updateRadioScreenIdentifiers( TheWindowManager->winGetWindowList(),
-																TheNameKeyGenerator->nameToKey( AsciiString(m_saveFilename) ) );
+																TheNameKeyGenerator->nameToKey( m_saveFilename ) );
 
 	// open the file
 	fp = fopen( filePathAndFilename, "w" );
@@ -1270,14 +1269,14 @@ Bool GUIEdit::saveData( char *filePathAndFilename, char *filename )
 			break;
 		window = window->winGetPrev();
 
-	}  // end while
+	}
 
 	// close the file
 	fclose( fp );
 
 	return success;
 
-}  // end saveData
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
diff --git a/Generals/Code/Tools/GUIEdit/Source/WinMain.cpp b/Generals/Code/Tools/GUIEdit/Source/WinMain.cpp
index c8fae1cf18e..bc6a055d5ea 100644
--- a/Generals/Code/Tools/GUIEdit/Source/WinMain.cpp
+++ b/Generals/Code/Tools/GUIEdit/Source/WinMain.cpp
@@ -24,12 +24,12 @@
 
 // FILE: WinMain.cpp //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -50,8 +50,8 @@
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
+#include "Common/FramePacer.h"
 #include "Common/GameMemory.h"
-#include "Common/GameEngine.h"
 #include "GameClient/GameWindowManager.h"
 #include "Win32Device/GameClient/Win32Mouse.h"
 #include "resource.h"
@@ -128,7 +128,7 @@ static BOOL initInstance( HINSTANCE hInstance, int nCmdShow )
 
 	return TRUE;
 
-}  // end initInstance
+}
 
 // registerClass ==============================================================
 //
@@ -149,7 +149,7 @@ static ATOM registerClass(HINSTANCE hInstance)
 {
 	WNDCLASSEX wcex;
 
-	wcex.cbSize = sizeof( WNDCLASSEX ); 
+	wcex.cbSize = sizeof( WNDCLASSEX );
 
 	wcex.style					= CS_HREDRAW | CS_VREDRAW;
 	wcex.lpfnWndProc		= (WNDPROC)WndProc;
@@ -165,7 +165,7 @@ static ATOM registerClass(HINSTANCE hInstance)
 
 	return RegisterClassEx( &wcex );
 
-}  // registerClass
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -187,27 +187,20 @@ Int APIENTRY WinMain(HINSTANCE hInstance,
 	/// @todo remove this force set of working directory later
 	Char buffer[ _MAX_PATH ];
 	GetModuleFileName( NULL, buffer, sizeof( buffer ) );
-	Char *pEnd = buffer + strlen( buffer );
-	while( pEnd != buffer ) 
+	if (Char *pEnd = strrchr(buffer, '\\'))
 	{
-		if( *pEnd == '\\' ) 
-		{
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buffer);
 
-	// start the log
-	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+	// initialize the memory manager early
 	initMemoryManager();
 
 	// register a class for our window with the OS
 	registerClass( hInstance );
 
 	// Perform application initialization:
-	if( !initInstance( hInstance, nCmdShow ) ) 
+	if( !initInstance( hInstance, nCmdShow ) )
 		return FALSE;
 
 	// load accellerator table
@@ -223,7 +216,9 @@ Int APIENTRY WinMain(HINSTANCE hInstance,
 	TheEditor = new GUIEdit;
 	if( TheEditor == NULL )
 		return FALSE;
-	TheEditor->init();	
+	TheEditor->init();
+
+	TheFramePacer = new FramePacer();
 
 	//
 	// see if we have any messages to process, a NULL window handle tells the
@@ -255,33 +250,34 @@ Int APIENTRY WinMain(HINSTANCE hInstance,
 					TranslateMessage( &msg );
 					DispatchMessage( &msg );
 
-				}  // end if
+				}
 
-			}  // end while
+			}
 
-		}  // end if
+		}
 		else
 		{
 
-			// udpate our universe
+			// update our universe
 			TheEditor->update();
 			Sleep(1);
 
-		}  // end else
-						
-	}  // end while
+		}
+
+	}
 
 	// shutdown GUIEdit data
+	delete TheFramePacer;
+	TheFramePacer = NULL;
+
 	delete TheEditor;
 	TheEditor = NULL;
 
-	// close the log
 	shutdownMemoryManager();
-	DEBUG_SHUTDOWN();
 
 	return msg.wParam;
 
-}  // end WinMain
+}
 
 // WndProc ====================================================================
 //
@@ -294,11 +290,11 @@ Int APIENTRY WinMain(HINSTANCE hInstance,
 //  WM_DESTROY	- post a quit message and return
 //
 //=============================================================================
-LRESULT CALLBACK WndProc( HWND hWnd, UINT message, 
+LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 													WPARAM wParam, LPARAM lParam )
 {
 
-	switch( message ) 
+	switch( message )
 	{
 
 		// ------------------------------------------------------------------------
@@ -310,7 +306,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				SetFocus( hWnd );
 			return 0;
 
-		}  // end move mouse
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_COMMAND:
@@ -383,7 +379,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				case MENU_SHOW_SEE_THRU_OUTLINES:
 					TheEditor->setShowSeeThruOutlines( !TheEditor->getShowSeeThruOutlines() );
 					break;
-														
+
 				// --------------------------------------------------------------------
 				case MENU_TEST_MODE:
 
@@ -397,12 +393,12 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						else
 							TheEditor->setMode( MODE_EDIT );
 
-					}  // end if
-					break;				
-					
+					}
+					break;
+
 				// --------------------------------------------------------------------
 				case MENU_BACKGROUND_COLOR:
-					
+
 					if( TheEditWindow )
 					{
 						RGBColorReal color = TheEditWindow->getBackgroundColor();
@@ -420,16 +416,16 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 																		mouse.x, mouse.y );
 						if( newColor )
 						{
-							
+
 							color.red   = (Real)newColor->red / 255.0f;
 							color.green = (Real)newColor->green / 255.0f;
 							color.blue  = (Real)newColor->blue / 255.0f;
 							color.alpha = (Real)newColor->alpha / 255.0f;
 							TheEditWindow->setBackgroundColor( color );
 
-						}  // end if
+						}
 
-					}  //  end if
+					}
 
 					break;
 
@@ -442,17 +438,17 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						TheDefaultScheme->openDialog();
 					break;
 
-				}  // end scheme
+				}
 
 				// --------------------------------------------------------------------
 				case MENU_ABOUT:
 				{
 
-					DialogBox( ApplicationHInstance, (LPCTSTR)ABOUT_DIALOG, 
+					DialogBox( ApplicationHInstance, (LPCTSTR)ABOUT_DIALOG,
 										 hWnd, (DLGPROC)AboutCallback );
 					break;
 
-				}  // end about
+				}
 
 
 				// --------------------------------------------------------------------
@@ -461,13 +457,13 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 					return DefWindowProc( hWnd, message, wParam, lParam );
 
-				}  // end default
+				}
 
-			}  // end switch( controlID )
+			}
 
 			return 0;
 
-		}  // end command
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_CLOSE:
@@ -477,13 +473,13 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			TheEditor->menuExit();
 			return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_KEYDOWN:
 		{
 			Int virtualKey = wParam;
-//			Int keyData = lParam;	
+//			Int keyData = lParam;
 			Bool controlDown = BitIsSet( GetKeyState( VK_CONTROL ), 0x1000 );
 
 			switch( virtualKey )
@@ -501,7 +497,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 							TheEditor->clearSelections();
 					break;
 
-				}  // end escape
+				}
 
 				// --------------------------------------------------------------------
 				case VK_DELETE:
@@ -512,7 +508,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						TheEditor->deleteSelected();
 					break;
 
-				}  // end delete
+				}
 
 				// --------------------------------------------------------------------
 				case VK_LEFT:
@@ -523,14 +519,14 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					{
 						if(TheEditor->getMode() == MODE_EDIT)
 						{
-					
+
 							if(TheEditor->selectionCount() <= 0 )
 								break;
 							ICoord2D zero;
 							zero.x = zero.y = 0;
 							TheEditWindow->setDragMoveOrigin(&zero);
 							TheEditWindow->setDragMoveDest(&zero);
-							
+
 							TheEditor->setMode(MODE_KEYBOARD_MOVE);
 						}
 						if(TheEditor->getMode() == MODE_KEYBOARD_MOVE)
@@ -545,7 +541,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 							}
 							else
 							{
-								temp.x--;	
+								temp.x--;
 							}
 							TheEditWindow->setDragMoveDest(&temp);
 						}
@@ -553,7 +549,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					}
 					break;
 
-				}  // end Left
+				}
 				// --------------------------------------------------------------------
 				case VK_RIGHT:
 				{
@@ -563,20 +559,20 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					{
 						if(TheEditor->getMode() == MODE_EDIT)
 						{
-					
+
 							if(TheEditor->selectionCount() <= 0 )
 								break;
 							ICoord2D zero;
 							zero.x = zero.y = 0;
 							TheEditWindow->setDragMoveOrigin(&zero);
 							TheEditWindow->setDragMoveDest(&zero);
-							
+
 							TheEditor->setMode(MODE_KEYBOARD_MOVE);
 						}
 						if(TheEditor->getMode() == MODE_KEYBOARD_MOVE)
 						{
 							ICoord2D temp;
-							
+
 							temp = TheEditWindow->getDragMoveDest();
 							if(!controlDown && TheEditor->isGridSnapOn())
 							{
@@ -585,7 +581,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 							}
 							else
 							{
-								temp.x++;	
+								temp.x++;
 							}
 							TheEditWindow->setDragMoveDest(&temp);
 						}
@@ -593,7 +589,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					}
 					break;
 
-				}  // end RIGHT
+				}
 				// --------------------------------------------------------------------
 				case VK_UP:
 				{
@@ -603,14 +599,14 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					{
 						if(TheEditor->getMode() == MODE_EDIT)
 						{
-					
+
 							if(TheEditor->selectionCount() <= 0 )
 								break;
 							ICoord2D zero;
 							zero.x = zero.y = 0;
 							TheEditWindow->setDragMoveOrigin(&zero);
 							TheEditWindow->setDragMoveDest(&zero);
-							
+
 							TheEditor->setMode(MODE_KEYBOARD_MOVE);
 						}
 						if(TheEditor->getMode() == MODE_KEYBOARD_MOVE)
@@ -618,7 +614,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 							ICoord2D temp;
 
 							temp = TheEditWindow->getDragMoveDest();
-							
+
 							if(!controlDown && TheEditor->isGridSnapOn())
 							{
 								temp.y -= TheEditor->getGridResolution();
@@ -626,7 +622,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 							}
 							else
 							{
-								temp.y--;	
+								temp.y--;
 							}
 							TheEditWindow->setDragMoveDest(&temp);
 						}
@@ -634,7 +630,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					}
 					break;
 
-				}  // end Up
+				}
 				// --------------------------------------------------------------------
 				case VK_DOWN:
 				{
@@ -644,14 +640,14 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					{
 						if(TheEditor->getMode() == MODE_EDIT)
 						{
-					
+
 							if(TheEditor->selectionCount() <= 0 )
 								break;
 							ICoord2D zero;
 							zero.x = zero.y = 0;
 							TheEditWindow->setDragMoveOrigin(&zero);
 							TheEditWindow->setDragMoveDest(&zero);
-							
+
 							TheEditor->setMode(MODE_KEYBOARD_MOVE);
 						}
 						if(TheEditor->getMode() == MODE_KEYBOARD_MOVE)
@@ -666,7 +662,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 							}
 							else
 							{
-								temp.y++;	
+								temp.y++;
 							}
 							TheEditWindow->setDragMoveDest(&temp);
 						}
@@ -674,8 +670,8 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					}
 					break;
 
-				}  // end Down
-				
+				}
+
 				// --------------------------------------------------------------------
 				case VK_RETURN:
 				{
@@ -692,13 +688,13 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						TheEditor->setMode( MODE_EDIT );
 					}
 					break;
-				}// end Enter
+				}
 
-			}  // end switch( virtualKey )
+			}
 
 			return 0;
 
-		}  // end key down
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_SIZE:
@@ -726,13 +722,13 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					barY = height - barHeight;
 					MoveWindow( statusBar, barX, barY, barWidth, barHeight, TRUE );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
 			return 0;
 
-		}  // end size
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_PAINT:
@@ -744,7 +740,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			EndPaint(hWnd, &ps);
 			break;
 
-		}  // end paint
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_DESTROY:
@@ -753,7 +749,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			PostQuitMessage(0);
 			break;
 
-		}  // end destroy
+		}
 
 		// ------------------------------------------------------------------------
 		default:
@@ -761,18 +757,18 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 			return DefWindowProc(hWnd, message, wParam, lParam);
 
-		}  // end default
+		}
 
-	}  // end switch( message )
+	}
 
 	return DefWindowProc( hWnd, message, wParam, lParam );
 
-}  // end WndProc
+}
 
 // AboutCallback ==============================================================
 /** Mesage handler for about box. */
 //=============================================================================
-LRESULT CALLBACK AboutCallback( HWND hDlg, UINT message, 
+LRESULT CALLBACK AboutCallback( HWND hDlg, UINT message,
 																WPARAM wParam, LPARAM lParam )
 {
 
@@ -782,7 +778,7 @@ LRESULT CALLBACK AboutCallback( HWND hDlg, UINT message,
 				return TRUE;
 
 		case WM_COMMAND:
-			if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) 
+			if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
 			{
 				EndDialog(hDlg, LOWORD(wParam));
 				return TRUE;
@@ -791,5 +787,5 @@ LRESULT CALLBACK AboutCallback( HWND hDlg, UINT message,
 	}
     return FALSE;
 
-}  // end AboutCallback
+}
 
diff --git a/Generals/Code/Tools/ParticleEditor/CButtonShowColor.cpp b/Generals/Code/Tools/ParticleEditor/CButtonShowColor.cpp
index 4d5762889c5..590c8ef381d 100644
--- a/Generals/Code/Tools/ParticleEditor/CButtonShowColor.cpp
+++ b/Generals/Code/Tools/ParticleEditor/CButtonShowColor.cpp
@@ -22,11 +22,11 @@
 #include "CButtonShowColor.h"
 
 // CButtonShowColor ///////////////////////////////////////////////////////////////////////////////
-void CButtonShowColor::OnPaint() 
+void CButtonShowColor::OnPaint()
 {
 	try {
 		CPaintDC paintDC(this);
-	
+
 		CPen pen(PS_SOLID, 1, 0xFFFFFF00);
 		CBrush brush(RGBtoBGR(m_color.getAsInt()));
 		// Select my stuff
@@ -45,7 +45,7 @@ void CButtonShowColor::OnPaint()
 
 		// Restore the states.
 		paintDC.SelectObject(oldPen);
- 
+
 	} catch (...) {
 		// Unlikely, but possible.
 		return;
diff --git a/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h b/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h
index 83bb8ce6fb1..b11567c6253 100644
--- a/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h
+++ b/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h
@@ -18,9 +18,6 @@
 
 #pragma once
 
-#ifndef _H_CBUTTONSHOWCOLOR_
-#define _H_CBUTTONSHOWCOLOR_
-
 #include "Lib/BaseType.h"
 
 class CButtonShowColor : public CButton
@@ -33,8 +30,8 @@ class CButtonShowColor : public CButton
 		void setColor(Int color) { m_color.setFromInt(color); }
 		void setColor(const RGBColor& color) { m_color = color; }
 		~CButtonShowColor();
-		
-		
+
+
 		static COLORREF RGBtoBGR(Int color);
 		static Int BGRtoRGB(COLORREF color);
 
@@ -44,5 +41,3 @@ class CButtonShowColor : public CButton
 
 	DECLARE_MESSAGE_MAP();
 };
-
-#endif /* _H_CBUTTONSHOWCOLOR_ */
\ No newline at end of file
diff --git a/Generals/Code/Tools/ParticleEditor/CColorAlphaDialog.cpp b/Generals/Code/Tools/ParticleEditor/CColorAlphaDialog.cpp
index 2c9cdcf6173..f37ac48b493 100644
--- a/Generals/Code/Tools/ParticleEditor/CColorAlphaDialog.cpp
+++ b/Generals/Code/Tools/ParticleEditor/CColorAlphaDialog.cpp
@@ -31,33 +31,33 @@
 
 #define		ARBITRARY_BUFF_SIZE		128
 
-static const UINT colorControls[][2] = 
+static const UINT colorControls[][2] =
 {
-	{IDC_PSEd_Color1,	IDC_PSEd_CF1_Frame}, 
-	{IDC_PSEd_Color2,	IDC_PSEd_CF2_Frame}, 
-	{IDC_PSEd_Color3,	IDC_PSEd_CF3_Frame}, 
-	{IDC_PSEd_Color4,	IDC_PSEd_CF4_Frame}, 
-	{IDC_PSEd_Color5,	IDC_PSEd_CF5_Frame}, 
-	{IDC_PSEd_Color6,	IDC_PSEd_CF6_Frame}, 
-	{IDC_PSEd_Color7,	IDC_PSEd_CF7_Frame}, 
+	{IDC_PSEd_Color1,	IDC_PSEd_CF1_Frame},
+	{IDC_PSEd_Color2,	IDC_PSEd_CF2_Frame},
+	{IDC_PSEd_Color3,	IDC_PSEd_CF3_Frame},
+	{IDC_PSEd_Color4,	IDC_PSEd_CF4_Frame},
+	{IDC_PSEd_Color5,	IDC_PSEd_CF5_Frame},
+	{IDC_PSEd_Color6,	IDC_PSEd_CF6_Frame},
+	{IDC_PSEd_Color7,	IDC_PSEd_CF7_Frame},
 	{IDC_PSEd_Color8,	IDC_PSEd_CF8_Frame}
 };
 
-static const UINT alphaControls[][3] = 
+static const UINT alphaControls[][3] =
 {
-	{IDC_PSEd_AF1_Min, IDC_PSEd_AF1_Max, IDC_PSEd_AF1_Frame}, 
-	{IDC_PSEd_AF2_Min, IDC_PSEd_AF2_Max, IDC_PSEd_AF2_Frame}, 
-	{IDC_PSEd_AF3_Min, IDC_PSEd_AF3_Max, IDC_PSEd_AF3_Frame}, 
-	{IDC_PSEd_AF4_Min, IDC_PSEd_AF4_Max, IDC_PSEd_AF4_Frame}, 
-	{IDC_PSEd_AF5_Min, IDC_PSEd_AF5_Max, IDC_PSEd_AF5_Frame}, 
-	{IDC_PSEd_AF6_Min, IDC_PSEd_AF6_Max, IDC_PSEd_AF6_Frame}, 
-	{IDC_PSEd_AF7_Min, IDC_PSEd_AF7_Max, IDC_PSEd_AF7_Frame}, 
+	{IDC_PSEd_AF1_Min, IDC_PSEd_AF1_Max, IDC_PSEd_AF1_Frame},
+	{IDC_PSEd_AF2_Min, IDC_PSEd_AF2_Max, IDC_PSEd_AF2_Frame},
+	{IDC_PSEd_AF3_Min, IDC_PSEd_AF3_Max, IDC_PSEd_AF3_Frame},
+	{IDC_PSEd_AF4_Min, IDC_PSEd_AF4_Max, IDC_PSEd_AF4_Frame},
+	{IDC_PSEd_AF5_Min, IDC_PSEd_AF5_Max, IDC_PSEd_AF5_Frame},
+	{IDC_PSEd_AF6_Min, IDC_PSEd_AF6_Max, IDC_PSEd_AF6_Frame},
+	{IDC_PSEd_AF7_Min, IDC_PSEd_AF7_Max, IDC_PSEd_AF7_Frame},
 	{IDC_PSEd_AF8_Min, IDC_PSEd_AF8_Max, IDC_PSEd_AF8_Frame}
 };
 
 
 
-CColorAlphaDialog::CColorAlphaDialog(UINT nIDTemplate, CWnd* pParentWnd) : 
+CColorAlphaDialog::CColorAlphaDialog(UINT nIDTemplate, CWnd* pParentWnd) :
 										CDialog(nIDTemplate, pParentWnd)
 {}
 
@@ -136,7 +136,7 @@ void CColorAlphaDialog::performUpdate(IN Bool toUI)
 	{ // update the values
 		for (int i = 0; i < MAX_KEYFRAMES; ++i) {
 			ParticleSystemInfo::RandomKeyframe keyFrame;
-			
+
 			pParent->getAlphaRangeFromSystem(i, keyFrame);
 
 			{	// Minimum first
@@ -194,7 +194,7 @@ void CColorAlphaDialog::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -207,7 +207,7 @@ BOOL CColorAlphaDialog::OnInitDialog()
 		if (!item) {
 			continue;
 		}
-		
+
 		item->GetWindowRect(&rect);
 		ScreenToClient(&rect);
 		DWORD style = item->GetStyle();
@@ -215,11 +215,11 @@ BOOL CColorAlphaDialog::OnInitDialog()
 
 		item->DestroyWindow();
 	}
-	
+
 	return CDialog::OnInitDialog();
 }
 
-#define ONCOLORDLG(x) void CColorAlphaDialog::OnColor##x##() { onColorPress( x ); }
+#define ONCOLORDLG(x) void CColorAlphaDialog::OnColor##x() { onColorPress( x ); }
 ONCOLORDLG(1)
 ONCOLORDLG(2)
 ONCOLORDLG(3)
@@ -236,7 +236,7 @@ void CColorAlphaDialog::onColorPress(Int colorPressed)
 	dlg.m_cc.Flags |= (CC_FULLOPEN | CC_ANYCOLOR);
 	dlg.m_cc.lpCustColors = m_customColors;
 	if (dlg.DoModal() == IDOK) {
-		
+
 		m_colorButton[colorPressed - 1].setColor(CButtonShowColor::BGRtoRGB(dlg.GetColor()));
 		static char buff[ARBITRARY_BUFF_SIZE];
 
@@ -272,7 +272,7 @@ void CColorAlphaDialog::onColorPress(Int colorPressed)
 		AfxGetApp()->WriteProfileString("Custom Colors", "Color15", buff);
 		ltoa(m_customColors[15], buff, 10);
 		AfxGetApp()->WriteProfileString("Custom Colors", "Color16", buff);
-		
+
 
 
 		OnParticleSystemEdit();
diff --git a/Generals/Code/Tools/ParticleEditor/CColorAlphaDialog.h b/Generals/Code/Tools/ParticleEditor/CColorAlphaDialog.h
index 31e9b2dfa98..0ba1ac79c90 100644
--- a/Generals/Code/Tools/ParticleEditor/CColorAlphaDialog.h
+++ b/Generals/Code/Tools/ParticleEditor/CColorAlphaDialog.h
@@ -23,7 +23,7 @@
 
 class CColorAlphaDialog : public CDialog
 {
-	protected:	
+	protected:
 		DWORD m_customColors[16];
 		CButtonShowColor m_colorButton[MAX_KEYFRAMES];
 
@@ -34,9 +34,9 @@ class CColorAlphaDialog : public CDialog
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 
 
 	protected:
diff --git a/Generals/Code/Tools/ParticleEditor/CMakeLists.txt b/Generals/Code/Tools/ParticleEditor/CMakeLists.txt
index bf7005ea58a..0ea7325438a 100644
--- a/Generals/Code/Tools/ParticleEditor/CMakeLists.txt
+++ b/Generals/Code/Tools/ParticleEditor/CMakeLists.txt
@@ -42,7 +42,6 @@ target_link_libraries(g_particleeditor PRIVATE
     corei_libraries_source_wwvegas
     corei_libraries_source_wwvegas_wwlib
     d3d8lib
-    dbghelplib
     gi_gameengine_include
     gi_always
     gi_libraries_source_wwvegas
diff --git a/Generals/Code/Tools/ParticleEditor/CParticleEditorPage.h b/Generals/Code/Tools/ParticleEditor/CParticleEditorPage.h
index e61f835b51b..2e933110eb6 100644
--- a/Generals/Code/Tools/ParticleEditor/CParticleEditorPage.h
+++ b/Generals/Code/Tools/ParticleEditor/CParticleEditorPage.h
@@ -18,15 +18,14 @@
 
 #pragma once
 
-
 struct CParticleEditorPage : public CDialog
 {
 	UINT m_templateID;
 	public:
 		CParticleEditorPage(UINT nIDTemplate = 0, CWnd* pParentWnd = NULL);
 		void InitPanel( int templateID );
-		
-		
+
+
 	protected:
 		afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
 		DECLARE_MESSAGE_MAP()
diff --git a/Generals/Code/Tools/ParticleEditor/CSwitchesDialog.cpp b/Generals/Code/Tools/ParticleEditor/CSwitchesDialog.cpp
index 1afa4224b35..4839ed89743 100644
--- a/Generals/Code/Tools/ParticleEditor/CSwitchesDialog.cpp
+++ b/Generals/Code/Tools/ParticleEditor/CSwitchesDialog.cpp
@@ -32,7 +32,7 @@ void CSwitchesDialog::InitPanel( void )
 
 }
 
-// if true, updates the UI from the Particle System. 
+// if true, updates the UI from the Particle System.
 // if false, updates the Particle System from the UI
 void CSwitchesDialog::performUpdate( IN Bool toUI )
 {
@@ -123,7 +123,7 @@ void CSwitchesDialog::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
diff --git a/Generals/Code/Tools/ParticleEditor/CSwitchesDialog.h b/Generals/Code/Tools/ParticleEditor/CSwitchesDialog.h
index 5b677754172..8b2f8df1a1d 100644
--- a/Generals/Code/Tools/ParticleEditor/CSwitchesDialog.h
+++ b/Generals/Code/Tools/ParticleEditor/CSwitchesDialog.h
@@ -30,9 +30,9 @@ class CSwitchesDialog : public CDialog
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 		DebugWindowDialog* GetDWDParent(void) { return (DebugWindowDialog*) GetParent(); }
 
 	protected:
diff --git a/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.cpp b/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.cpp
index 08664ffdc02..4de83a2a1ec 100644
--- a/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.cpp
+++ b/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: EmissionTypePanels.cpp 
+// FILE: EmissionTypePanels.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -61,7 +61,7 @@ void EmissionPanelPoint::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -100,7 +100,7 @@ void EmissionPanelLine::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getLineFromSystem(0, linePoint);
-				
+
 				sprintf(buff, FORMAT_STRING, linePoint);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -115,7 +115,7 @@ void EmissionPanelLine::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getLineFromSystem(1, linePoint);
-				
+
 				sprintf(buff, FORMAT_STRING, linePoint);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -130,7 +130,7 @@ void EmissionPanelLine::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getLineFromSystem(2, linePoint);
-				
+
 				sprintf(buff, FORMAT_STRING, linePoint);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -145,7 +145,7 @@ void EmissionPanelLine::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getLineFromSystem(3, linePoint);
-				
+
 				sprintf(buff, FORMAT_STRING, linePoint);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -160,7 +160,7 @@ void EmissionPanelLine::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getLineFromSystem(4, linePoint);
-				
+
 				sprintf(buff, FORMAT_STRING, linePoint);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -175,7 +175,7 @@ void EmissionPanelLine::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getLineFromSystem(5, linePoint);
-				
+
 				sprintf(buff, FORMAT_STRING, linePoint);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -194,7 +194,7 @@ void EmissionPanelLine::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -237,7 +237,7 @@ void EmissionPanelBox::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getHalfSizeFromSystem(0, halfSize);
-				
+
 				sprintf(buff, FORMAT_STRING, halfSize);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -252,7 +252,7 @@ void EmissionPanelBox::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getHalfSizeFromSystem(1, halfSize);
-				
+
 				sprintf(buff, FORMAT_STRING, halfSize);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -267,7 +267,7 @@ void EmissionPanelBox::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getHalfSizeFromSystem(2, halfSize);
-				
+
 				sprintf(buff, FORMAT_STRING, halfSize);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -285,7 +285,7 @@ void EmissionPanelBox::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -325,7 +325,7 @@ void EmissionPanelSphere::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getHalfSizeFromSystem(0, radius);
-				
+
 				sprintf(buff, FORMAT_STRING, radius);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -343,7 +343,7 @@ void EmissionPanelSphere::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -381,7 +381,7 @@ void EmissionPanelCylinder::performUpdate( IN Bool toUI )
 			Real radius;
 			if (toUI) {
 				pParent->getCylinderRadiusFromSystem(radius);
-				
+
 				sprintf(buff, FORMAT_STRING, radius);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -396,9 +396,9 @@ void EmissionPanelCylinder::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			Real length;
 			if (toUI) {
-				
+
 				pParent->getCylinderLengthFromSystem(length);
-				
+
 				sprintf(buff, FORMAT_STRING, length);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -416,11 +416,11 @@ void EmissionPanelCylinder::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
 BEGIN_MESSAGE_MAP(EmissionPanelCylinder, ISwapablePanel)
 	ON_EN_KILLFOCUS(IDC_PSEd_CylRadius, OnParticleSystemEdit)
 	ON_EN_KILLFOCUS(IDC_PSEd_CylLength, OnParticleSystemEdit)
-END_MESSAGE_MAP()
\ No newline at end of file
+END_MESSAGE_MAP()
diff --git a/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h b/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h
index 72cbe0c9719..5a3be36cca9 100644
--- a/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h
+++ b/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: EmissionTypePanels.h 
+// FILE: EmissionTypePanels.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_EMISSIONTYPEPANELS_
-#define _H_EMISSIONTYPEPANELS_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Resource.h"
@@ -55,9 +53,9 @@ class EmissionPanelPoint : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -73,9 +71,9 @@ class EmissionPanelLine : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -91,9 +89,9 @@ class EmissionPanelBox : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -109,9 +107,9 @@ class EmissionPanelSphere : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -127,12 +125,10 @@ class EmissionPanelCylinder : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif /* _H_EMISSIONTYPEPANELS_ */
diff --git a/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h b/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h
index d27fced56cc..7d3dd89fcbc 100644
--- a/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h
+++ b/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: ISwapablePanel.h 
+// FILE: ISwapablePanel.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -33,8 +33,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_ISWAPABLEPANEL_
-#define _H_ISWAPABLEPANEL_
 
 #include "Lib/BaseType.h"
 
@@ -50,5 +48,3 @@ interface ISwapablePanel : public CDialog
 	virtual void performUpdate( IN Bool toUI ) = 0;
 	virtual void InitPanel( void ) = 0;
 };
-
-#endif /* _H_ISWAPABLEPANEL_ */
diff --git a/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.cpp b/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.cpp
index 84474578d4c..38f8c687dbf 100644
--- a/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.cpp
+++ b/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: MoreParmsDialog.cpp 
+// FILE: MoreParmsDialog.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -251,7 +251,7 @@ void MoreParmsDialog::performUpdate( IN Bool toUI )
 				}
 			}
 		}
-	
+
 		{	// start size rate
 			Real startSizeRate;
 
@@ -281,7 +281,7 @@ void MoreParmsDialog::performUpdate( IN Bool toUI )
 				}
 			}
 		}
-	
+
 		{	// size rate
 			Real sizeRate;
 
@@ -514,7 +514,7 @@ void MoreParmsDialog::performUpdate( IN Bool toUI )
 				}
 			}
 		}
-	
+
 		{	// ping pong wind start angle
 			Real angle;
 
@@ -635,7 +635,7 @@ void MoreParmsDialog::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
diff --git a/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h b/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h
index 6f94ba97373..4cd07683ea5 100644
--- a/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h
+++ b/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: MoreParmsDialog.h 
+// FILE: MoreParmsDialog.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_MOREPARMSDIALOG_
-#define _H_MOREPARMSDIALOG_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Resource.h"
@@ -51,8 +49,8 @@ class MoreParmsDialog : public CDialog
 		virtual ~MoreParmsDialog();
 
 		void InitPanel( void );
-	
-		// if true, updates the UI from the Particle System. 
+
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
 		void performUpdate( IN Bool toUI );
 
@@ -60,5 +58,3 @@ class MoreParmsDialog : public CDialog
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif /* _H_MOREPARMSDIALOG_ */
diff --git a/Generals/Code/Tools/ParticleEditor/ParticleEditor.cpp b/Generals/Code/Tools/ParticleEditor/ParticleEditor.cpp
index 8f5d5f9d2e9..bccb1643894 100644
--- a/Generals/Code/Tools/ParticleEditor/ParticleEditor.cpp
+++ b/Generals/Code/Tools/ParticleEditor/ParticleEditor.cpp
@@ -47,7 +47,7 @@ static char THIS_FILE[] = __FILE__;
 //
 //		It is very important that this macro appear in each
 //		function, prior to any calls into MFC.  This means that
-//		it must appear as the first statement within the 
+//		it must appear as the first statement within the
 //		function, even before any object variable declarations
 //		as their constructors may generate calls into the MFC
 //		DLL.
@@ -105,14 +105,14 @@ void __declspec(dllexport) CreateParticleSystemDialog(void)
 		DebugWindowDialog* tmpWnd;
 		tmpWnd = new DebugWindowDialog;
 		tmpWnd->Create(DebugWindowDialog::IDD, NULL);
-		
+
 		tmpWnd->SetWindowPos(NULL, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOZORDER);
 		tmpWnd->InitPanel();
 		tmpWnd->ShowWindow(SW_SHOW);
 		if (tmpWnd->GetMainWndHWND()) {
 			SetFocus(tmpWnd->GetMainWndHWND());
 		}
-		
+
 		theApp.SetDialogWindow(tmpWnd);
 	} catch (...) { }
 }
@@ -121,8 +121,8 @@ void __declspec(dllexport) DestroyParticleSystemDialog(void)
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->DestroyWindow();
 			delete tmpWnd;
@@ -135,8 +135,8 @@ void __declspec(dllexport) RemoveAllParticleSystems(void)
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->clearAllParticleSystems();
 		}
@@ -147,8 +147,8 @@ void __declspec(dllexport) AppendParticleSystem(const char* particleSystemName)
 {
 	try{
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->addParticleSystem(particleSystemName);
 		}
@@ -159,11 +159,11 @@ void __declspec(dllexport) RemoveAllThingTemplates( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->clearAllThingTemplates();
-		} 
+		}
 	} catch (...) { }
 }
 
@@ -172,8 +172,8 @@ void __declspec(dllexport) AppendThingTemplate( const char* thingTemplateName )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->addThingTemplate(thingTemplateName);
 		}
@@ -185,8 +185,8 @@ Bool __declspec(dllexport) HasUpdatedSelectedParticleSystem( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->hasSelectionChanged();
 		}
@@ -199,8 +199,8 @@ void __declspec(dllexport) GetSelectedParticleSystemName( char *bufferToCopyInto
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->getSelectedSystemName(bufferToCopyInto);
 		}
@@ -211,8 +211,8 @@ void __declspec(dllexport) UpdateCurrentParticleCap( int currentParticleCap )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->updateCurrentParticleCap(currentParticleCap);
 		}
@@ -223,8 +223,8 @@ void __declspec(dllexport) UpdateCurrentNumParticles( int currentParticleCount )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->updateCurrentNumParticles(currentParticleCount);
 		}
@@ -235,8 +235,8 @@ int __declspec(dllexport) GetNewParticleCap( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->getNewParticleCap();
 		}
@@ -249,8 +249,8 @@ void __declspec(dllexport) GetSelectedParticleAsciiStringParm( int parmNum, char
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->getSelectedParticleAsciiStringParm(parmNum, bufferToCopyInto);
 			if (whichTemplate) {
@@ -264,8 +264,8 @@ void __declspec(dllexport) UpdateParticleAsciiStringParm( int parmNum, const cha
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->updateParticleAsciiStringParm(parmNum, bufferToCopyFrom);
 			if (whichTemplate) {
@@ -279,8 +279,8 @@ void __declspec(dllexport) UpdateCurrentParticleSystem( ParticleSystemTemplate *
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->updateCurrentParticleSystem(particleTemplate);
 		}
@@ -291,8 +291,8 @@ void __declspec(dllexport) UpdateSystemUseParameters( ParticleSystemTemplate *pa
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->updateSystemUseParameters(particleTemplate);
 		}
@@ -303,8 +303,8 @@ Bool __declspec(dllexport) ShouldWriteINI( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->shouldWriteINI();
 		}
@@ -317,8 +317,8 @@ Bool __declspec(dllexport) HasRequestedReload( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->hasRequestedReload();
 		}
@@ -331,8 +331,8 @@ Bool __declspec(dllexport) ShouldBusyWait( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->shouldBusyWait();
 		}
@@ -345,8 +345,8 @@ Bool __declspec(dllexport) ShouldUpdateParticleCap( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->shouldUpdateParticleCap();
 		}
@@ -359,8 +359,8 @@ Bool __declspec(dllexport) ShouldReloadTextures( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->shouldReloadTextures();
 		}
@@ -373,8 +373,8 @@ Bool __declspec(dllexport) HasRequestedKillAllSystems( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->shouldKillAllParticleSystems();
 		}
@@ -385,7 +385,7 @@ Bool __declspec(dllexport) HasRequestedKillAllSystems( void )
 
 int __declspec(dllexport) NextParticleEditorBehavior( void )
 {
-	try { 
+	try {
 		if (HasUpdatedSelectedParticleSystem()) {
 			return PEB_UpdateCurrentSystem;
 		}
@@ -401,7 +401,7 @@ int __declspec(dllexport) NextParticleEditorBehavior( void )
 		if (ShouldBusyWait()) {
 			return PEB_BusyWait;
 		}
-		
+
 		if (ShouldUpdateParticleCap()) {
 			return PEB_SetParticleCap;
 		}
diff --git a/Generals/Code/Tools/ParticleEditor/ParticleEditor.h b/Generals/Code/Tools/ParticleEditor/ParticleEditor.h
index 149bf86240e..5c2b350047a 100644
--- a/Generals/Code/Tools/ParticleEditor/ParticleEditor.h
+++ b/Generals/Code/Tools/ParticleEditor/ParticleEditor.h
@@ -19,12 +19,7 @@
 // DebugWindow.h : main header file for the DEBUGWINDOW DLL
 //
 
-#if !defined(AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_)
-#define AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #ifndef __AFXWIN_H__
 	#error include 'stdafx.h' before including this file for PCH
@@ -68,5 +63,3 @@ class CDebugWindowApp : public CWinApp
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_)
diff --git a/Generals/Code/Tools/ParticleEditor/ParticleEditorDialog.cpp b/Generals/Code/Tools/ParticleEditor/ParticleEditorDialog.cpp
index fa81d929c2d..670b92543b1 100644
--- a/Generals/Code/Tools/ParticleEditor/ParticleEditorDialog.cpp
+++ b/Generals/Code/Tools/ParticleEditor/ParticleEditorDialog.cpp
@@ -30,9 +30,9 @@
 
 #define		ARBITRARY_BUFF_SIZE		128
 
-DebugWindowDialog::DebugWindowDialog(UINT nIDTemplate, CWnd* pParentWnd) : CDialog(nIDTemplate, pParentWnd), 
-m_colorAlphaDialog(CColorAlphaDialog::IDD, this), 
-m_switchesDialog(CSwitchesDialog::IDD, this), 
+DebugWindowDialog::DebugWindowDialog(UINT nIDTemplate, CWnd* pParentWnd) : CDialog(nIDTemplate, pParentWnd),
+m_colorAlphaDialog(CColorAlphaDialog::IDD, this),
+m_switchesDialog(CSwitchesDialog::IDD, this),
 m_moreParmsDialog(MoreParmsDialog::IDD, this)
 {
 	mMainWndHWND = ::FindWindow(NULL, "Command & Conquer: Generals");
@@ -40,8 +40,8 @@ m_moreParmsDialog(MoreParmsDialog::IDD, this)
 	m_activeVelocityPage = 0;
 	m_activeParticlePage = 0;
 	m_particleSystem = NULL;
-	
-	
+
+
 	m_changeHasOcurred = false;
 	m_shouldWriteINI = false;
 	m_showColorDlg = false;
@@ -52,13 +52,13 @@ m_moreParmsDialog(MoreParmsDialog::IDD, this)
 	m_shouldUpdateParticleCap = false;
 	m_shouldReloadTextures = false;
 	m_shouldKillAllParticleSystems = false;
-	
+
 	m_emissionTypePanels[0] = new EmissionPanelPoint;
 	m_emissionTypePanels[1] = new EmissionPanelLine;
 	m_emissionTypePanels[2] = new EmissionPanelBox;
 	m_emissionTypePanels[3] = new EmissionPanelSphere;
 	m_emissionTypePanels[4] = new EmissionPanelCylinder;
-	
+
 	m_velocityTypePanels[0] = new VelocityPanelOrtho;
 	m_velocityTypePanels[1] = new VelocityPanelSphere;
 	m_velocityTypePanels[2] = new VelocityPanelHemisphere;
@@ -240,7 +240,7 @@ void DebugWindowDialog::clearAllParticleSystems(void)
 	if (!combo) {
 		return;
 	}
-	
+
 	m_listOfParticleSystems.clear();
 	combo->ResetContent();
 }
@@ -259,7 +259,7 @@ void DebugWindowDialog::appendParticleSystemToList( const std::string &rString )
 	if (!combo) {
 		return;
 	}
-	
+
 	m_listOfParticleSystems.push_front(rString);
 	combo->AddString(rString.c_str());
 }
@@ -302,7 +302,7 @@ Bool DebugWindowDialog::hasSelectionChanged(void)
 		m_changeHasOcurred = false;
 		return true;
 	}
-	
+
 	return false;
 }
 
@@ -336,7 +336,7 @@ void DebugWindowDialog::getSelectedParticleAsciiStringParm( IN int parmNum, OUT
 		return;
 	}
 
-	if (m_particleParmValues[parmNum].length()) {
+	if (!m_particleParmValues[parmNum].empty()) {
 		strcpy(bufferToCopyInto, m_particleParmValues[parmNum].c_str());
 	} else {
 		bufferToCopyInto[0] = 0;
@@ -366,7 +366,7 @@ void DebugWindowDialog::updateColorValueToSystem(IN Int systemNum, IN const RGBC
 	if (systemNum >= MAX_KEYFRAMES || systemNum < 0 || !m_particleSystem) {
 		return;
 	}
-	
+
 	m_particleSystem->m_colorKey[systemNum] = colorFrame;
 }
 
@@ -520,7 +520,7 @@ void DebugWindowDialog::getVelSphereFromSystem( IN Int velNum, OUT Real &radius)
 		case 0: radius = m_particleSystem->m_emissionVelocity.spherical.speed.m_low; return;
 		case 1: radius = m_particleSystem->m_emissionVelocity.spherical.speed.m_high; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::updateVelSphereToSystem( IN Int velNum, IN const Real &radius)
@@ -534,7 +534,7 @@ void DebugWindowDialog::updateVelSphereToSystem( IN Int velNum, IN const Real &r
 		case 0: m_particleSystem->m_emissionVelocity.spherical.speed.m_low = radius; return;
 		case 1: m_particleSystem->m_emissionVelocity.spherical.speed.m_high = radius; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::getVelHemisphereFromSystem( IN Int velNum, OUT Real &radius) const
@@ -548,7 +548,7 @@ void DebugWindowDialog::getVelHemisphereFromSystem( IN Int velNum, OUT Real &rad
 		case 0: radius = m_particleSystem->m_emissionVelocity.hemispherical.speed.m_low; return;
 		case 1: radius = m_particleSystem->m_emissionVelocity.hemispherical.speed.m_high; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::updateVelHemisphereToSystem( IN Int velNum, IN const Real &radius)
@@ -562,7 +562,7 @@ void DebugWindowDialog::updateVelHemisphereToSystem( IN Int velNum, IN const Rea
 		case 0: m_particleSystem->m_emissionVelocity.hemispherical.speed.m_low = radius; return;
 		case 1: m_particleSystem->m_emissionVelocity.hemispherical.speed.m_high = radius; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::getVelOrthoFromSystem( IN Int coordNum, OUT Real& ortho) const
@@ -705,7 +705,7 @@ void DebugWindowDialog::updateDrawableNameToSystem( IN const char* buffer )
 }
 
 void DebugWindowDialog::updateCurrentParticleSystem(ParticleSystemTemplate *particleTemplate )
-{	
+{
 	m_particleSystem = particleTemplate;
 	performUpdate(true);
 }
@@ -727,7 +727,7 @@ void DebugWindowDialog::getInitialDelayFromSystem( IN Int parmNum, OUT Real& ini
 		case 0: initialDelay = m_particleSystem->m_initialDelay.m_low; return;
 		case 1: initialDelay = m_particleSystem->m_initialDelay.m_high; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::updateInitialDelayToSystem( IN Int parmNum, IN const Real& initialDelay )
@@ -741,7 +741,7 @@ void DebugWindowDialog::updateInitialDelayToSystem( IN Int parmNum, IN const Rea
 		case 0: m_particleSystem->m_initialDelay.m_low = initialDelay; return;
 		case 1: m_particleSystem->m_initialDelay.m_high = initialDelay; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::getBurstDelayFromSystem( IN Int parmNum, OUT Real& burstDelay ) const
@@ -755,7 +755,7 @@ void DebugWindowDialog::getBurstDelayFromSystem( IN Int parmNum, OUT Real& burst
 		case 0: burstDelay = m_particleSystem->m_burstDelay.m_low; return;
 		case 1: burstDelay = m_particleSystem->m_burstDelay.m_high; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::updateBurstDelayToSystem( IN Int parmNum, IN const Real& burstDelay )
@@ -1314,7 +1314,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 					m_particleSystem->m_particleType = (ParticleSystemInfo::ParticleType) (selndx + 1);
 				}
 			}
-			
+
 			// do the swap
 			if (selndx != m_activeParticlePage && selndx >= 0) {
 				m_particleTypePanels[m_activeParticlePage]->ShowWindow(SW_HIDE);
@@ -1357,7 +1357,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angleY.m_low = atof(buff);	
+				m_particleSystem->m_angleY.m_low = atof(buff);
 			}
 		}
 
@@ -1368,7 +1368,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angleZ.m_low = atof(buff);	
+				m_particleSystem->m_angleZ.m_low = atof(buff);
 			}
 		}
 
@@ -1379,7 +1379,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angleX.m_high = atof(buff);	
+				m_particleSystem->m_angleX.m_high = atof(buff);
 			}
 		}
 
@@ -1390,7 +1390,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angleY.m_high = atof(buff);	
+				m_particleSystem->m_angleY.m_high = atof(buff);
 			}
 		}
 
@@ -1401,7 +1401,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angleZ.m_high = atof(buff);	
+				m_particleSystem->m_angleZ.m_high = atof(buff);
 			}
 		}
 
@@ -1412,7 +1412,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angularRateX.m_low = atof(buff);	
+				m_particleSystem->m_angularRateX.m_low = atof(buff);
 			}
 		}
 
@@ -1423,7 +1423,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angularRateY.m_low = atof(buff);	
+				m_particleSystem->m_angularRateY.m_low = atof(buff);
 			}
 		}
 
@@ -1434,7 +1434,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angularRateZ.m_low = atof(buff);	
+				m_particleSystem->m_angularRateZ.m_low = atof(buff);
 			}
 		}
 
@@ -1445,7 +1445,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angularRateX.m_high = atof(buff);	
+				m_particleSystem->m_angularRateX.m_high = atof(buff);
 			}
 		}
 
@@ -1456,7 +1456,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angularRateY.m_high = atof(buff);	
+				m_particleSystem->m_angularRateY.m_high = atof(buff);
 			}
 		}
 
@@ -1467,7 +1467,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angularRateZ.m_high = atof(buff);	
+				m_particleSystem->m_angularRateZ.m_high = atof(buff);
 			}
 		}
 	}
@@ -1481,10 +1481,10 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angularDamping.m_low = atof(buff);	
+				m_particleSystem->m_angularDamping.m_low = atof(buff);
 			}
 		}
-	
+
 		pWnd = GetDlgItem(IDC_PSEd_AngleDampingMax);
 		if (pWnd) {
 			if (toUI) {
@@ -1492,10 +1492,10 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angularDamping.m_high = atof(buff);	
+				m_particleSystem->m_angularDamping.m_high = atof(buff);
 			}
 		}
-		
+
 		pWnd = GetDlgItem(IDC_PSEd_VelocityDampingMin);
 		if (pWnd) {
 			if (toUI) {
@@ -1503,10 +1503,10 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_velDamping.m_low = atof(buff);	
+				m_particleSystem->m_velDamping.m_low = atof(buff);
 			}
 		}
-	
+
 		pWnd = GetDlgItem(IDC_PSEd_VelocityDampingMax);
 		if (pWnd) {
 			if (toUI) {
@@ -1514,7 +1514,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_velDamping.m_high = atof(buff);	
+				m_particleSystem->m_velDamping.m_high = atof(buff);
 			}
 		}
 	}
@@ -1528,7 +1528,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_gravity = atof(buff);	
+				m_particleSystem->m_gravity = atof(buff);
 			}
 		}
 	}
@@ -1611,7 +1611,7 @@ void DebugWindowDialog::OnEditMoreParms()
 	} else {
 		m_moreParmsDialog.ShowWindow(SW_HIDE);
 		pButton->SetCheck(FALSE);
-	}	
+	}
 }
 
 Bool DebugWindowDialog::shouldWriteINI( void )
@@ -1619,7 +1619,7 @@ Bool DebugWindowDialog::shouldWriteINI( void )
 	if (m_shouldWriteINI) {
 		m_shouldWriteINI = false;
 		return true;
-	} 
+	}
 
 	return false;
 }
@@ -1711,7 +1711,7 @@ void DebugWindowDialog::updateCurrentParticleCap( IN int particleCap )
 	if (!pWnd) {
 		return;
 	}
-	
+
 	sprintf(buff, "%d", particleCap);
 	pWnd->SetWindowText(buff);
 }
@@ -1737,7 +1737,7 @@ int DebugWindowDialog::getNewParticleCap( void )
 	}
 
 	pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-	
+
 	return atoi(buff);
 }
 
@@ -1754,7 +1754,7 @@ BEGIN_MESSAGE_MAP(DebugWindowDialog, CDialog)
 	ON_BN_CLICKED(IDC_PSEd_EditSwitchesButton, OnEditSwitches)
 	ON_BN_CLICKED(IDC_PSEd_KillAll, OnKillAllParticleSystems)
 
-	ON_CBN_SELCHANGE(IDC_PSEd_Priority, OnParticleSystemEdit)	
+	ON_CBN_SELCHANGE(IDC_PSEd_Priority, OnParticleSystemEdit)
 	ON_CBN_SELCHANGE(IDC_PSEd_EmissionType, OnParticleSystemEdit)
 	ON_CBN_SELCHANGE(IDC_PSEd_VelocityType, OnParticleSystemEdit)
 	ON_CBN_SELCHANGE(IDC_PSEd_ParticleType, OnParticleSystemEdit)
diff --git a/Generals/Code/Tools/ParticleEditor/ParticleEditorDialog.h b/Generals/Code/Tools/ParticleEditor/ParticleEditorDialog.h
index 9c15e90050f..0e62ee6e95c 100644
--- a/Generals/Code/Tools/ParticleEditor/ParticleEditorDialog.h
+++ b/Generals/Code/Tools/ParticleEditor/ParticleEditorDialog.h
@@ -47,7 +47,7 @@ enum SwitchType
 	ST_ONESHOT,
 	ST_ALIGNXY,
 	ST_EMITABOVEGROUNDONLY,
-	ST_PARTICLEUPTOWARDSEMITTER, 
+	ST_PARTICLEUPTOWARDSEMITTER,
 };
 
 class DebugWindowDialog : public CDialog
@@ -56,7 +56,7 @@ class DebugWindowDialog : public CDialog
 		enum {IDD = IDD_PSEd};
 		DebugWindowDialog(UINT nIDTemplate = DebugWindowDialog::IDD, CWnd* pParentWnd = NULL);
 		virtual ~DebugWindowDialog();
-		
+
 		void InitPanel( void );
 		HWND GetMainWndHWND( void );
 		void addParticleSystem( IN const char *particleSystem );
@@ -78,11 +78,11 @@ class DebugWindowDialog : public CDialog
 
 		// The purpose of these is to add as few friends as possible to the particle system classes.
 		// Therefore, this class has ALL the access to ParticleSystems, and dances on the data directly.
-		// Child panels make calls here 
-		void getColorValueFromSystem( IN Int systemNum, 
+		// Child panels make calls here
+		void getColorValueFromSystem( IN Int systemNum,
 																  OUT RGBColorKeyframe &colorFrame ) const;
 
-		void updateColorValueToSystem( IN Int systemNum, 
+		void updateColorValueToSystem( IN Int systemNum,
 																	 IN const RGBColorKeyframe &colorFrame );
 
 		void getAlphaRangeFromSystem( IN Int systemNum,
@@ -108,7 +108,7 @@ class DebugWindowDialog : public CDialog
 
 		void getLineFromSystem( IN Int coordNum, // 0:X1, 1:Y1, 2:Z1, 3:X2, 4:Y2, 5:Z2
 														OUT Real& linePoint ) const;
-		
+
 		void updateLineToSystem( IN Int coordNum, // 0:X, 1:Y, 2:Z, 3:X2, 4:Y2, 5:Z2
 														 IN const Real &linePoint );
 
@@ -126,7 +126,7 @@ class DebugWindowDialog : public CDialog
 
 		void getVelOrthoFromSystem( IN Int coordNum, // 0:Xmin, 1:Ymin, 2:Zmin, 3:Xmax, 4:Ymax, 5:Zmax
 																OUT Real& ortho ) const;
-		
+
 		void updateVelOrthoToSystem( IN Int coordNum, // 0:Xmin, 1:Ymin, 2:Zmin, 3:Xmax, 4:Ymax, 5:Zmax
 																 IN const Real& ortho );
 
@@ -217,10 +217,10 @@ class DebugWindowDialog : public CDialog
 		void updateDriftVelocityToSystem( IN Int parmNum, // 0:min, 1:min
 																	 IN const Real& driftVelocity );
 
-		void getSwitchFromSystem( IN SwitchType switchType, 
+		void getSwitchFromSystem( IN SwitchType switchType,
 															OUT Bool& switchVal ) const;
 
-		void updateSwitchToSystem( IN SwitchType switchType, 
+		void updateSwitchToSystem( IN SwitchType switchType,
 															 IN const Bool& switchVal );
 
 		void getSlaveSystemFromSystem( OUT char *buffer, IN Int bufferSize) const;
@@ -250,10 +250,10 @@ class DebugWindowDialog : public CDialog
 
 
 
-		const std::list<std::string> &getAllThingTemplates( void ) const { return m_listOfThingTemplates; } 
+		const std::list<std::string> &getAllThingTemplates( void ) const { return m_listOfThingTemplates; }
 		const std::list<std::string> &getAllParticleSystems( void ) const { return m_listOfParticleSystems; }
 
-		ParticleSystemTemplate *getCurrentParticleSystem( void ) { return m_particleSystem; } 
+		ParticleSystemTemplate *getCurrentParticleSystem( void ) { return m_particleSystem; }
 
 	protected:
 		HWND			mMainWndHWND;
@@ -262,7 +262,7 @@ class DebugWindowDialog : public CDialog
 		std::list<std::string> m_listOfThingTemplates;
 		std::vector<std::string> m_particleParmValues;
 		std::list<std::string> m_listOfParticleSystems;
-		
+
 		Bool			m_shouldWriteINI;
 		Bool			m_showColorDlg;
 		Bool			m_showSwitchesDlg;
@@ -288,10 +288,10 @@ class DebugWindowDialog : public CDialog
 
 		void appendParticleSystemToList( IN const std::string &rString );
 		void appendThingTemplateToList( IN const std::string &rString );
-		
-		// if true, updates the UI from the Particle System. 
+
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 
 
 	protected:
diff --git a/Generals/Code/Tools/ParticleEditor/ParticleEditorExport.h b/Generals/Code/Tools/ParticleEditor/ParticleEditorExport.h
index 9d435bc4eb0..dfcaf5fef4d 100644
--- a/Generals/Code/Tools/ParticleEditor/ParticleEditorExport.h
+++ b/Generals/Code/Tools/ParticleEditor/ParticleEditorExport.h
@@ -26,7 +26,7 @@ class ParticleSystemTemplate;
 extern "C" {
 	// Called to create the dialog
 	void __declspec(dllexport) CreateParticleSystemDialog( void );
-	
+
 	// Called to (not surprisingly) destroy the dialog (and free the resources)
 	void __declspec(dllexport) DestroyParticleSystemDialog( void );
 
@@ -47,9 +47,8 @@ extern "C" {
 #	define PARM_ParticleTypeName		0x00
 # define PARM_SlaveSystemName			0x01
 #	define PARM_AttachedSystemName	0x02
+# define PARM_NumParms						0x03
 
-// Keep this one last
-# define PARM_NumParms	0x03	
 	// parmNum can be exactly one of the above defines (PARM_*)
 	void __declspec(dllexport) GetSelectedParticleAsciiStringParm( int parmNum, char *bufferToCopyInto, ParticleSystemTemplate **whichTemplate );
 	void __declspec(dllexport) UpdateParticleAsciiStringParm( int parmNum, const char *bufferToCopyFrom, ParticleSystemTemplate **whichTemplate  );
@@ -76,8 +75,8 @@ extern "C" {
 #	define PEB_BusyWait								0xFE
 #	define PEB_Error									0xFF
 
-	
+
 	int __declspec(dllexport) NextParticleEditorBehavior( void );
 
-	
+
 }
diff --git a/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.cpp b/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.cpp
index 219fb3c3ceb..32a0439f485 100644
--- a/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.cpp
+++ b/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: ParticleTypePanels.cpp 
+// FILE: ParticleTypePanels.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -51,12 +51,12 @@ ParticlePanelParticle::ParticlePanelParticle(UINT nIDTemplate, CWnd* pParentWnd)
 void ParticlePanelParticle::InitPanel( void )
 {
 	CFileFind finder;
-	
+
 	CComboBox *pWnd = (CComboBox*) GetDlgItem(IDC_PSEd_ParticleTypeParticle);
 	if (!pWnd) {
 		return;
 	}
-	
+
 	// first, clear out any items.
 	pWnd->ResetContent();
 
@@ -64,7 +64,7 @@ void ParticlePanelParticle::InitPanel( void )
 	findString = PATH;
 	findString += PREFIX;
 	findString += POSTFIX;
-//	DEBUG_LOG(("ParticlePanedParticle::InitPanel - looking for textures, search string is '%s'\n", findString.begin()));
+//	DEBUG_LOG(("ParticlePanedParticle::InitPanel - looking for textures, search string is '%s'", findString.begin()));
 	BOOL bWorkin = finder.FindFile(findString.c_str());
 	while (bWorkin) {
 		bWorkin = finder.FindNextFile();
@@ -106,7 +106,7 @@ void ParticlePanelParticle::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -167,7 +167,7 @@ void ParticlePanelDrawable::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
diff --git a/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h b/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h
index 79e54c17493..93b05b4b5dc 100644
--- a/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h
+++ b/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: ParticleTypePanels.h 
+// FILE: ParticleTypePanels.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_PARTICLETYPEPANELS_
-#define _H_PARTICLETYPEPANELS_
 
 #include "Resource.h"
 #include "ISwapablePanel.h"
@@ -54,9 +52,9 @@ class ParticlePanelParticle : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -73,9 +71,9 @@ class ParticlePanelDrawable : public ISwapablePanel
 		void InitPanel( void );
 		void clearAllThingTemplates( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -91,12 +89,10 @@ class ParticlePanelStreak : public ParticlePanelParticle
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif /* _H_PARTICLETYPEPANELS_ */
diff --git a/Generals/Code/Tools/ParticleEditor/Resource.h b/Generals/Code/Tools/ParticleEditor/Resource.h
index 339412aec9d..795c2d09ab8 100644
--- a/Generals/Code/Tools/ParticleEditor/Resource.h
+++ b/Generals/Code/Tools/ParticleEditor/Resource.h
@@ -176,7 +176,7 @@
 #define ID_FILE_RELOADTEXTURES          32776
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        1019
diff --git a/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.cpp b/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.cpp
index fe9c0bd1bdc..3092ee2aef4 100644
--- a/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.cpp
+++ b/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: ShaderTypePanels.cpp 
+// FILE: ShaderTypePanels.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
diff --git a/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h b/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h
index 87d93fa200b..f3d5ffe6f62 100644
--- a/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h
+++ b/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: ShaderTypePanels.h 
+// FILE: ShaderTypePanels.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,13 +32,8 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_SHADERTYPEPANELS_
-#define _H_SHADERTYPEPANELS_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 // DEFINES ////////////////////////////////////////////////////////////////////
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////
-
-
-#endif /* _H_SHADERTYPEPANELS_ */
diff --git a/Generals/Code/Tools/ParticleEditor/StdAfx.h b/Generals/Code/Tools/ParticleEditor/StdAfx.h
index 0c2ec5bdf55..099ec6dbe05 100644
--- a/Generals/Code/Tools/ParticleEditor/StdAfx.h
+++ b/Generals/Code/Tools/ParticleEditor/StdAfx.h
@@ -21,16 +21,11 @@
 //      are changed infrequently
 //
 
-#if !defined(AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_)
-#define AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
-// TheSuperHackers @compile xezon 24/03/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
+// TheSuperHackers @build xezon 24/03/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
 #define _d3d9TYPES_H_
 
 #include <afxwin.h>         // MFC core and standard components
@@ -75,5 +70,3 @@
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_)
diff --git a/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.cpp b/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.cpp
index 777692c4d23..5adc1e5ea25 100644
--- a/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.cpp
+++ b/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: VelocityTypePanels.cpp 
+// FILE: VelocityTypePanels.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -65,7 +65,7 @@ void VelocityPanelOrtho::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOrthoFromSystem(0, ortho);
-				
+
 				sprintf(buff, FORMAT_STRING, ortho);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -80,7 +80,7 @@ void VelocityPanelOrtho::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOrthoFromSystem(1, ortho);
-				
+
 				sprintf(buff, FORMAT_STRING, ortho);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -95,7 +95,7 @@ void VelocityPanelOrtho::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOrthoFromSystem(2, ortho);
-				
+
 				sprintf(buff, FORMAT_STRING, ortho);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -110,7 +110,7 @@ void VelocityPanelOrtho::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOrthoFromSystem(3, ortho);
-				
+
 				sprintf(buff, FORMAT_STRING, ortho);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -125,7 +125,7 @@ void VelocityPanelOrtho::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOrthoFromSystem(4, ortho);
-				
+
 				sprintf(buff, FORMAT_STRING, ortho);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -140,7 +140,7 @@ void VelocityPanelOrtho::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOrthoFromSystem(5, ortho);
-				
+
 				sprintf(buff, FORMAT_STRING, ortho);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -158,7 +158,7 @@ void VelocityPanelOrtho::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -199,7 +199,7 @@ void VelocityPanelSphere::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelSphereFromSystem(0, radial);
-				
+
 				sprintf(buff, FORMAT_STRING, radial);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -214,7 +214,7 @@ void VelocityPanelSphere::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelSphereFromSystem(1, radial);
-				
+
 				sprintf(buff, FORMAT_STRING, radial);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -232,7 +232,7 @@ void VelocityPanelSphere::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -270,7 +270,7 @@ void VelocityPanelHemisphere::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelHemisphereFromSystem(0, radial);
-				
+
 				sprintf(buff, FORMAT_STRING, radial);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -285,7 +285,7 @@ void VelocityPanelHemisphere::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelHemisphereFromSystem(1, radial);
-				
+
 				sprintf(buff, FORMAT_STRING, radial);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -303,7 +303,7 @@ void VelocityPanelHemisphere::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -340,7 +340,7 @@ void VelocityPanelCylinder::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelCylinderFromSystem(0, cylinder);
-				
+
 				sprintf(buff, FORMAT_STRING, cylinder);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -355,7 +355,7 @@ void VelocityPanelCylinder::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelCylinderFromSystem(1, cylinder);
-				
+
 				sprintf(buff, FORMAT_STRING, cylinder);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -370,7 +370,7 @@ void VelocityPanelCylinder::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelCylinderFromSystem(2, cylinder);
-				
+
 				sprintf(buff, FORMAT_STRING, cylinder);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -385,7 +385,7 @@ void VelocityPanelCylinder::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelCylinderFromSystem(3, cylinder);
-				
+
 				sprintf(buff, FORMAT_STRING, cylinder);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -403,7 +403,7 @@ void VelocityPanelCylinder::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -442,7 +442,7 @@ void VelocityPanelOutward::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOutwardFromSystem(0, outward);
-				
+
 				sprintf(buff, FORMAT_STRING, outward);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -457,7 +457,7 @@ void VelocityPanelOutward::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOutwardFromSystem(1, outward);
-				
+
 				sprintf(buff, FORMAT_STRING, outward);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -472,7 +472,7 @@ void VelocityPanelOutward::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOutwardFromSystem(2, outward);
-				
+
 				sprintf(buff, FORMAT_STRING, outward);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -487,7 +487,7 @@ void VelocityPanelOutward::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOutwardFromSystem(3, outward);
-				
+
 				sprintf(buff, FORMAT_STRING, outward);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -505,7 +505,7 @@ void VelocityPanelOutward::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
diff --git a/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h b/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h
index 5c4cf7822f9..e6b499af11c 100644
--- a/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h
+++ b/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: VelocityTypePanels.h 
+// FILE: VelocityTypePanels.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_VELOCITYTYPEPANELS_
-#define _H_VELOCITYTYPEPANELS_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Resource.h"
@@ -55,9 +53,9 @@ class VelocityPanelOrtho : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -73,9 +71,9 @@ class VelocityPanelSphere : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -91,9 +89,9 @@ class VelocityPanelHemisphere : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -109,9 +107,9 @@ class VelocityPanelCylinder : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -127,12 +125,10 @@ class VelocityPanelOutward : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif /* _H_VELOCITYTYPEPANELS_ */
diff --git a/Generals/Code/Tools/W3DView/CMakeLists.txt b/Generals/Code/Tools/W3DView/CMakeLists.txt
index 80ab604011f..7a3f14db37e 100644
--- a/Generals/Code/Tools/W3DView/CMakeLists.txt
+++ b/Generals/Code/Tools/W3DView/CMakeLists.txt
@@ -8,7 +8,6 @@ target_link_libraries(g_w3dview PRIVATE
     d3d8
     d3d8lib
     d3dx8
-    dbghelplib
     imm32
     milesstub
     Version
diff --git a/Generals/Code/Tools/WorldBuilder/CMakeLists.txt b/Generals/Code/Tools/WorldBuilder/CMakeLists.txt
index 42bd24e67e2..5550bbf9777 100644
--- a/Generals/Code/Tools/WorldBuilder/CMakeLists.txt
+++ b/Generals/Code/Tools/WorldBuilder/CMakeLists.txt
@@ -11,7 +11,6 @@ set(WORLDBUILDER_SRC
     "src/BuildListTool.cpp"
     "src/CameraOptions.cpp"
     "src/CButtonShowColor.cpp"
-    "src/CButtonShowColor.h"
     "src/CellWidth.cpp"
     "src/CFixTeamOwnerDialog.cpp"
     "src/ContourOptions.cpp"
@@ -108,6 +107,7 @@ set(WORLDBUILDER_SRC
     "include/BuildList.h"
     "include/BuildListTool.h"
     "include/CameraOptions.h"
+    "include/CButtonShowColor.h"
     "include/CellWidth.h"
     "include/CFixTeamOwnerDialog.h"
     "include/ContourOptions.h"
@@ -204,14 +204,18 @@ target_include_directories(g_worldbuilder PRIVATE
 
 target_compile_definitions(g_worldbuilder PRIVATE _AFXDLL)
 
+target_precompile_headers(g_worldbuilder PRIVATE
+    [["always.h"]]
+    [["Common/STLTypedefs.h"]]
+    [["StdAfx.h"]]
+    [["WWCommon.h"]]
+)
+
 target_link_libraries(g_worldbuilder PRIVATE
     d3d8lib
-    dbghelplib
     core_browserdispatch
     g_gameengine
     g_gameenginedevice
-    gi_gameengine_include
-    gi_gameenginedevice_include
     gi_always
     imm32
     vfw32
diff --git a/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h b/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h
index c53a08f2c82..7cc7b305f36 100644
--- a/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef AUTOEDGEOUTTOOL_H
-#define AUTOEDGEOUTTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************/
 /**                             AutoEdgeOutTool
-	 Does the BlendEdgesOut tool operation. 
+	 Does the BlendEdgesOut tool operation.
 ***************************************************************************/
 ///  Blend edges out tool.
-class AutoEdgeOutTool : public Tool 
+class AutoEdgeOutTool : public Tool
 {
 public:
 	AutoEdgeOutTool(void);
@@ -43,6 +40,3 @@ class AutoEdgeOutTool : public Tool
 	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 	virtual void activate(); ///< Become the current tool.
 };
-
-
-#endif //TOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h b/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h
index 6a77006de93..b8ee5094786 100644
--- a/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h
+++ b/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_BASEBUILDPROPS_H__71A01D97_E81A_45F8_982D_57D83E5342DF__INCLUDED_)
-#define AFX_BASEBUILDPROPS_H__71A01D97_E81A_45F8_982D_57D83E5342DF__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // BaseBuildProps.h : header file
 //
 
@@ -74,5 +70,3 @@ class BaseBuildProps : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BASEBUILDPROPS_H__71A01D97_E81A_45F8_982D_57D83E5342DF__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h b/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h
index a3a5307815d..14bc29938d8 100644
--- a/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef BLEND_EDGE_TOOL_H
-#define BLEND_EDGE_TOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************/
 /**                             BlendEdgeTool
-	 Does the BlendEdgesOut tool operation. 
+	 Does the BlendEdgesOut tool operation.
 ***************************************************************************/
 ///  Blend edges out tool.
-class BlendEdgeTool : public Tool 
+class BlendEdgeTool : public Tool
 {
 protected:
 	Coord3D m_downPt;
@@ -47,6 +44,3 @@ class BlendEdgeTool : public Tool
 	virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 
 };
-
-
-#endif //TOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h b/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h
index c678e3ea1d6..00f661fa1b4 100644
--- a/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h
+++ b/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_BlendMaterial_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
-#define AFX_BlendMaterial_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // BlendMaterial.h : header file
 //
 
@@ -84,9 +80,7 @@ class BlendMaterial : public COptionsPanel
 public:
 	Bool setTerrainTreeViewSelection(HTREEITEM parent, Int selection);
 
-}; 
+};
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BlendMaterial_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/BorderTool.h b/Generals/Code/Tools/WorldBuilder/include/BorderTool.h
index fc496e75a84..dcf9864c091 100644
--- a/Generals/Code/Tools/WorldBuilder/include/BorderTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/BorderTool.h
@@ -17,6 +17,7 @@
 */
 
 #pragma once
+
 #include "Tool.h"
 
 class BorderTool : public Tool
@@ -27,8 +28,8 @@ class BorderTool : public Tool
 		Bool m_addingNewBorder;
 		Int m_modifyBorderNdx;
 		ModificationType m_modificationType;
-		
-	
+
+
 	public:
 		BorderTool();
 		~BorderTool();
@@ -36,12 +37,12 @@ class BorderTool : public Tool
 		Int getToolID(void) {return m_toolID;}
 		virtual void setCursor(void);
 
-		virtual void activate(); 
-		virtual void deactivate(); 
+		virtual void activate();
+		virtual void deactivate();
 
 		virtual Bool followsTerrain(void) { return false;	}
 
 		virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 		virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 		virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-};
\ No newline at end of file
+};
diff --git a/Generals/Code/Tools/WorldBuilder/include/BrushTool.h b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h
index 278d8a02deb..19c829ca148 100644
--- a/Generals/Code/Tools/WorldBuilder/include/BrushTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef BRUSHTOOL_H
-#define BRUSHTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************/
 /**                             BrushTool
-	 Does the Height Brush tool operation. 
+	 Does the Height Brush tool operation.
 ***************************************************************************/
 ///  Height brush tool.
-class BrushTool : public Tool 
+class BrushTool : public Tool
 {
 protected:
 	WorldHeightMapEdit *m_htMapEditCopy; ///< ref counted.
@@ -64,6 +61,3 @@ class BrushTool : public Tool
 	virtual Bool followsTerrain(void) {return false;};
 
 };
-
-
-#endif //BRUSHTOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/BuildList.h b/Generals/Code/Tools/WorldBuilder/include/BuildList.h
index 000921ca17e..26b7b28e033 100644
--- a/Generals/Code/Tools/WorldBuilder/include/BuildList.h
+++ b/Generals/Code/Tools/WorldBuilder/include/BuildList.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_BuildList_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_)
-#define AFX_BuildList_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // BuildList.h : header file
 //
 
@@ -105,9 +101,7 @@ class BuildList : public COptionsPanel, public PopupSliderOwner
 	virtual void PopSliderChanged(const long sliderID, long theVal);
 	virtual void PopSliderFinished(const long sliderID, long theVal);
 
-}; 
+};
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BuildList_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h b/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h
index d08320cd245..0a4b00ab259 100644
--- a/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef BUILDLISTTOOL_H
-#define BUILDLISTTOOL_H
-
 #include "Tool.h"
 #include "Common/AsciiString.h"
 #include "PickUnitDialog.h"
@@ -33,9 +30,9 @@ class BuildListInfo;
 
 /*************************************************************************/
 /**                             BuildListTool
-	 Does the add item to build list tool operation. 
+	 Does the add item to build list tool operation.
 ***************************************************************************/
-class BuildListTool : public Tool 
+class BuildListTool : public Tool
 {
 protected:
 	CPoint m_downPt2d;
@@ -78,6 +75,3 @@ class BuildListTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual void deactivate(); ///< Become not the current tool.
 };
-
-
-#endif //TOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h b/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h
new file mode 100644
index 00000000000..5b98bb34f6c
--- /dev/null
+++ b/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h
@@ -0,0 +1,41 @@
+/*
+**	Command & Conquer Generals(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+class CButtonShowColor : public CButton
+{
+	protected:
+		RGBColor m_color;
+
+	public:
+		const RGBColor& getColor(void) const { return m_color; }
+		void setColor(Int color) { m_color.setFromInt(color); }
+		void setColor(const RGBColor& color) { m_color = color; }
+		~CButtonShowColor();
+
+
+		static COLORREF RGBtoBGR(Int color);
+		static Int BGRtoRGB(COLORREF color);
+
+
+	protected:
+		afx_msg void OnPaint();
+
+	DECLARE_MESSAGE_MAP();
+};
diff --git a/Generals/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h b/Generals/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h
index af7959e4769..bb77f20cfad 100644
--- a/Generals/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h
+++ b/Generals/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h
@@ -40,4 +40,4 @@ class CFixTeamOwnerDialog : public CDialog
 		AsciiString m_selectedOwner;
 		TeamsInfo *m_ti;
 		SidesList *m_sl;
-};
\ No newline at end of file
+};
diff --git a/Generals/Code/Tools/WorldBuilder/include/CUndoable.h b/Generals/Code/Tools/WorldBuilder/include/CUndoable.h
index ed2dacc3232..9d81a9db14d 100644
--- a/Generals/Code/Tools/WorldBuilder/include/CUndoable.h
+++ b/Generals/Code/Tools/WorldBuilder/include/CUndoable.h
@@ -22,14 +22,10 @@
 
 #pragma once
 
-#ifndef CUNDOABLE_H
-#define CUNDOABLE_H
-
 #include "Lib/BaseType.h"
 #include "../../GameEngine/Include/Common/MapObject.h"
 #include "../../GameEngine/Include/Common/GameCommon.h"
 #include "../../GameEngine/Include/GameLogic/SidesList.h"
-#include "refcount.h"
 #include <vector>
 
 class PolygonTrigger;
@@ -65,7 +61,7 @@ class MapObject;
 **                             CWBDocUndoable
 ***************************************************************************/
 /// Command that saves & restores entire height map.
-/** An undoable that actually undoes something.  Saves and restores the 
+/** An undoable that actually undoes something.  Saves and restores the
 entire height map. */
 class WBDocUndoable : public Undoable
 {
@@ -75,12 +71,12 @@ class WBDocUndoable : public Undoable
 	WorldHeightMapEdit		*mPOldHeightMapData;  ///< ref counted.
 	Bool									m_offsetObjects;			///< If true, apply m_objOffset.
 	Coord3D								m_objOffset;					///< Offset to adjust all objects.
-	
+
 
 public:
 		WBDocUndoable(CWorldBuilderDoc *pDoc, WorldHeightMapEdit *pNewHtMap, Coord3D *pObjOffset = NULL);
 
-		// destructor. 
+		// destructor.
 		~WBDocUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -94,7 +90,7 @@ to the height map.  If it is a linked list, adds all objects. */
 class AddObjectUndoable : public Undoable
 {
 protected:
-	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway. 
+	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway.
 	MapObject				 *m_objectToAdd;
 	Int							  m_numObjects;
 	Bool							m_addedToList;
@@ -102,7 +98,7 @@ class AddObjectUndoable : public Undoable
 public:
 		AddObjectUndoable(CWorldBuilderDoc *pDoc, MapObject *pObjectToAdd);
 
-		// destructor. 
+		// destructor.
 		~AddObjectUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -113,7 +109,7 @@ class AddObjectUndoable : public Undoable
 /** An undoable that actually undoes something.  Modifies an object's
 location and angle. */
 // Helper class
-class MoveInfo 
+class MoveInfo
 {
 public:
 	MoveInfo(MapObject *pObjToMove);
@@ -143,13 +139,13 @@ class MoveInfo
 class ModifyObjectUndoable : public Undoable
 {
 protected:
-	CWorldBuilderDoc*	m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway. 
+	CWorldBuilderDoc*	m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway.
 	MoveInfo*					m_moveList;
 	Bool							m_inval;
 
 public:
 		ModifyObjectUndoable(CWorldBuilderDoc *pDoc);
-		// destructor. 
+		// destructor.
 		~ModifyObjectUndoable(void);
 
 		virtual void Do(void);
@@ -167,7 +163,7 @@ class ModifyObjectUndoable : public Undoable
 /** An undoable that actually undoes something.  Modifies an object's
 flags. */
 // Helper class
-class FlagsInfo 
+class FlagsInfo
 {
 public:
 	FlagsInfo(MapObject *pObjToMove, Int flagMask, Int flagValue );
@@ -186,12 +182,12 @@ class FlagsInfo
 class ModifyFlagsUndoable : public Undoable
 {
 protected:
-	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway. 
+	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway.
 	FlagsInfo *m_flagsList;
 
 public:
 		ModifyFlagsUndoable(CWorldBuilderDoc *pDoc, Int flagMask, Int flagValue);
-		// destructor. 
+		// destructor.
 		~ModifyFlagsUndoable(void);
 
 		virtual void Do(void);
@@ -204,7 +200,7 @@ class SidesListUndoable : public Undoable
 {
 protected:
 	SidesList		m_old, m_new;
-	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway. 
+	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway.
 
 public:
 
@@ -234,7 +230,7 @@ class DictItemUndoable : public Undoable
 	// if you want to just add/modify/remove a single dict item, pass the item's key.
 	// if you want to substitute the entire contents of the new dict, pass NAMEKEY_INVALID.
 	DictItemUndoable(Dict **d, Dict data, NameKeyType key, Int dictsToModify = 1, CWorldBuilderDoc *pDoc = NULL, Bool inval = false);
-	// destructor. 
+	// destructor.
 	~DictItemUndoable(void);
 
 	virtual void Do(void);
@@ -246,7 +242,7 @@ class DictItemUndoable : public Undoable
 ///                            DeleteObjectUndoable
 /** An undoable that actually undoes something.  Deletes an object. */
 // Helper class
-class DeleteInfo 
+class DeleteInfo
 {
 public:
 	DeleteInfo(MapObject *pObjToDelete);
@@ -265,12 +261,12 @@ class DeleteInfo
 class DeleteObjectUndoable : public Undoable
 {
 protected:
-	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway. 
+	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway.
 	DeleteInfo *m_deleteList;
 public:
 		DeleteObjectUndoable(CWorldBuilderDoc *pDoc);
 
-		// destructor. 
+		// destructor.
 		~DeleteObjectUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -285,7 +281,7 @@ class AddPolygonUndoable : public Undoable
 	Bool					 m_isTriggerInList;
 public:
 		AddPolygonUndoable( PolygonTrigger *pTrig);
-		// destructor. 
+		// destructor.
 		~AddPolygonUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -300,7 +296,7 @@ class AddPolygonPointUndoable : public Undoable
 	ICoord3D				m_point;
 public:
 		AddPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt);
-		// destructor. 
+		// destructor.
 		~AddPolygonPointUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -317,7 +313,7 @@ class ModifyPolygonPointUndoable : public Undoable
 	ICoord3D				m_savPoint;
 public:
 		ModifyPolygonPointUndoable(PolygonTrigger *pTrig, Int ndx);
-		// destructor. 
+		// destructor.
 		~ModifyPolygonPointUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -333,7 +329,7 @@ class MovePolygonUndoable : public Undoable
 	ICoord3D				m_offset;
 public:
 		MovePolygonUndoable(PolygonTrigger *pTrig);
-		// destructor. 
+		// destructor.
 		~MovePolygonUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -352,7 +348,7 @@ class InsertPolygonPointUndoable : public Undoable
 	ICoord3D				m_point;
 public:
 		InsertPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt, Int ndx);
-		// destructor. 
+		// destructor.
 		~InsertPolygonPointUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -368,7 +364,7 @@ class DeletePolygonPointUndoable : public Undoable
 	ICoord3D				m_point;
 public:
 		DeletePolygonPointUndoable(PolygonTrigger *pTrig, Int ndx);
-		// destructor. 
+		// destructor.
 		~DeletePolygonPointUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -383,11 +379,8 @@ class DeletePolygonUndoable : public Undoable
 	Bool					 m_isTriggerInList;
 public:
 		DeletePolygonUndoable(PolygonTrigger *pTrig);
-		// destructor. 
+		// destructor.
 		~DeletePolygonUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
 };
-
-
-#endif //CUNDOABLE_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h b/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h
index d7bf887ed55..95863f9cd09 100644
--- a/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_CAMERAOPTIONS_H__4EF4F775_1290_47AE_817F_9340BA3A898C__INCLUDED_)
-#define AFX_CAMERAOPTIONS_H__4EF4F775_1290_47AE_817F_9340BA3A898C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // CameraOptions.h : header file
 //
 
@@ -88,5 +84,3 @@ class CameraOptions : public CDialog, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_CAMERAOPTIONS_H__4EF4F775_1290_47AE_817F_9340BA3A898C__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/CellWidth.h b/Generals/Code/Tools/WorldBuilder/include/CellWidth.h
index 35b487f7381..9b8c8fc88e6 100644
--- a/Generals/Code/Tools/WorldBuilder/include/CellWidth.h
+++ b/Generals/Code/Tools/WorldBuilder/include/CellWidth.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_CELLWIDTH_H__E4023BA4_28DE_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_CELLWIDTH_H__E4023BA4_28DE_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // CellWidth.h : header file
 //
 
@@ -65,5 +61,3 @@ class CellWidth : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_CELLWIDTH_H__E4023BA4_28DE_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h b/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h
index 2b678301338..26f4cffbeea 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ContourOptions_H__7B56E24C_582E_4530_A451_873397C8852D__INCLUDED_)
-#define AFX_ContourOptions_H__7B56E24C_582E_4530_A451_873397C8852D__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ContourOptions.h : header file
 //
 
@@ -86,5 +82,3 @@ class ContourOptions : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ContourOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/DrawObject.h b/Generals/Code/Tools/WorldBuilder/include/DrawObject.h
index 90432b7527f..e2b39381def 100644
--- a/Generals/Code/Tools/WorldBuilder/include/DrawObject.h
+++ b/Generals/Code/Tools/WorldBuilder/include/DrawObject.h
@@ -16,8 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __DRAW_OBJECT_H_
-#define __DRAW_OBJECT_H_
+#pragma once
 
 #include "always.h"
 #include "rendobj.h"
@@ -30,7 +29,7 @@
 #include "Common/AsciiString.h"
 
 // The draw objects draw a circle of diameter 1.0 cells.
-#define THE_RADIUS (0.8f*MAP_XY_FACTOR) 
+#define THE_RADIUS (0.8f*MAP_XY_FACTOR)
 
 class MeshClass;
 class PolygonTrigger;
@@ -40,7 +39,7 @@ class WaterRenderObjClass;
 //
 //
 class DrawObject : public RenderObjClass
-{	
+{
 
 public:
 
@@ -50,13 +49,13 @@ class DrawObject : public RenderObjClass
 	~DrawObject(void);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
 	virtual void					Render(RenderInfoClass & rinfo);
 //	virtual void					Special_Render(SpecialRenderInfoClass & rinfo);
-//	virtual void 					Set_Transform(const Matrix3D &m); 
+//	virtual void 					Set_Transform(const Matrix3D &m);
 //	virtual void 					Set_Position(const Vector3 &v);
 //TODO: MW: do these later - only needed for collision detection
 	virtual Bool					Cast_Ray(RayCollisionTestClass & raytest);
@@ -79,14 +78,14 @@ class DrawObject : public RenderObjClass
 
 	Int freeMapResources(void);
 
-	void setDrawObjects(Bool val, Bool waypoints, Bool poly) { m_drawObjects = val; m_drawWaypoints=waypoints; m_drawPolygonAreas = poly;}	
-	static void setDoBrushFeedback(Bool val) { m_toolWantsFeedback = val; m_meshFeedback=false;}	
-	static void setDoMeshFeedback(Bool val) { m_meshFeedback = val; }	
+	void setDrawObjects(Bool val, Bool waypoints, Bool poly) { m_drawObjects = val; m_drawWaypoints=waypoints; m_drawPolygonAreas = poly;}
+	static void setDoBrushFeedback(Bool val) { m_toolWantsFeedback = val; m_meshFeedback=false;}
+	static void setDoMeshFeedback(Bool val) { m_meshFeedback = val; }
 	static void setDoRampFeedback(Bool val) { m_rampFeedback = val; }
 	static void setDoBoundaryFeedback(Bool val) { m_boundaryFeedback = val; }
 	static void setDoAmbientSoundFeedback(Bool val) { m_ambientSoundFeedback = val; }
-	
-	static void setBrushFeedbackParms(Bool square, Int width, Int featherWidth) 
+
+	static void setBrushFeedbackParms(Bool square, Int width, Int featherWidth)
 														{ m_squareFeedback = square; m_brushWidth=width;
 															m_meshFeedback = false; m_brushFeatherWidth = featherWidth;}
 	static void disableFeedback(void) {m_disableFeedback = true;};
@@ -97,16 +96,16 @@ class DrawObject : public RenderObjClass
 	static void setWaypointDragFeedback(const Coord3D &start, const Coord3D &end);
 	static void setRampFeedbackParms(const Coord3D *start, const Coord3D *end, Real rampWidth);
 	static void stopWaypointDragFeedback();
-	
-	
-	
+
+
+
 
 	MeshClass *peekMesh(void) {return m_moldMesh;};
 	void getMeshBounds(SphereClass *pSphere) {*pSphere = m_moldMeshBounds;};
 
 protected:
 	enum {MAX_RADIUS = 50, NUM_FEEDBACK_VERTEX = 201*201, NUM_FEEDBACK_INDEX = 101*101*6};
-	Int	m_numTriangles;	//dimensions of list 
+	Int	m_numTriangles;	//dimensions of list
 
 	DX8IndexBufferClass				*m_indexBuffer;	///< indices defining a object icon
 	ShaderClass								m_shaderClass; ///< shader or rendering state for heightmap
@@ -169,7 +168,5 @@ class DrawObject : public RenderObjClass
 
 };
 
-void BuildRectFromSegmentAndWidth(const Coord3D* b, const Coord3D* t, Real width, 
+void BuildRectFromSegmentAndWidth(const Coord3D* b, const Coord3D* t, Real width,
 																	Coord3D* outBL, Coord3D* outTL, Coord3D* outBR, Coord3D* outTR);
-
-#endif  // end __DRAW_OBJECT_H_
diff --git a/Generals/Code/Tools/WorldBuilder/include/EditAction.h b/Generals/Code/Tools/WorldBuilder/include/EditAction.h
index 27af4507b06..d060b685f31 100644
--- a/Generals/Code/Tools/WorldBuilder/include/EditAction.h
+++ b/Generals/Code/Tools/WorldBuilder/include/EditAction.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EditAction_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_)
-#define AFX_EditAction_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EditAction.h : header file
 //
 
@@ -80,5 +76,3 @@ class EditAction : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EditAction_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/EditCondition.h b/Generals/Code/Tools/WorldBuilder/include/EditCondition.h
index 21c3f535bba..b6f04353a56 100644
--- a/Generals/Code/Tools/WorldBuilder/include/EditCondition.h
+++ b/Generals/Code/Tools/WorldBuilder/include/EditCondition.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EDITCONDITION_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_)
-#define AFX_EDITCONDITION_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EditCondition.h : header file
 //
 
@@ -79,5 +75,3 @@ class EditCondition : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EDITCONDITION_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h b/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h
index fc662461356..f2dc6770900 100644
--- a/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h
+++ b/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EDITCOORDPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_)
-#define AFX_EDITCOORDPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EditCoordParameter.h : header file
 //
 #include "GameLogic/Scripts.h"
@@ -72,5 +68,3 @@ friend class EditParameter;
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EDITCOORDPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/EditGroup.h b/Generals/Code/Tools/WorldBuilder/include/EditGroup.h
index dd92bd698e9..2a3585f8080 100644
--- a/Generals/Code/Tools/WorldBuilder/include/EditGroup.h
+++ b/Generals/Code/Tools/WorldBuilder/include/EditGroup.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EDITGROUP_H__712F9978_4300_4625_9364_39E903FA3284__INCLUDED_)
-#define AFX_EDITGROUP_H__712F9978_4300_4625_9364_39E903FA3284__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EditGroup.h : header file
 //
 
@@ -65,5 +61,3 @@ class EditGroup : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EDITGROUP_H__712F9978_4300_4625_9364_39E903FA3284__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h b/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h
index cce059a4405..6f1c4dd965d 100644
--- a/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h
+++ b/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EDITOBJPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_)
-#define AFX_EDITOBJPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EditObjectParameter.h : header file
 //
 #include "GameLogic/Scripts.h"
@@ -75,5 +71,3 @@ friend class EditParameter;
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EDITOBJPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/EditParameter.h b/Generals/Code/Tools/WorldBuilder/include/EditParameter.h
index 09e4a05fe53..082e10b3c62 100644
--- a/Generals/Code/Tools/WorldBuilder/include/EditParameter.h
+++ b/Generals/Code/Tools/WorldBuilder/include/EditParameter.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EDITPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_)
-#define AFX_EDITPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EditParameter.h : header file
 //
 #include "GameLogic/Scripts.h"
@@ -59,8 +55,8 @@ class EditParameter : public CDialog
 	static AsciiString getInfoText(Parameter *pParm);
 	static void setCurSidesList(SidesList *sidesListP) {m_sidesListP = sidesListP;};
 	static Bool loadScripts(CComboBox *pCombo, Bool subr, AsciiString match = AsciiString::TheEmptyString);
-	static Bool loadWaypoints(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString); 
-	static Bool loadTransports(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString); 
+	static Bool loadWaypoints(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
+	static Bool loadTransports(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static Bool loadObjectTypeList(CComboBox *pCombo, std::vector<AsciiString> *strings = NULL, AsciiString match = AsciiString::TheEmptyString);
 
 protected:
@@ -69,10 +65,10 @@ class EditParameter : public CDialog
 	static Bool loadCommandButtons(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static Bool loadFontNames(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static void readFontFile( const char *filename );
-	static Bool loadTeams(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString); 
-	static Bool loadTeamOrUnit(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString); 
-	static Bool loadUnits(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString); 
-	static Bool loadBridges(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString); 
+	static Bool loadTeams(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
+	static Bool loadTeamOrUnit(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
+	static Bool loadUnits(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
+	static Bool loadBridges(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static Bool loadObjectType(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static Bool loadAudioType(Parameter::ParameterType comboType, CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static Bool loadMovies(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
@@ -93,17 +89,17 @@ class EditParameter : public CDialog
 	static Bool loadCreateObjectListsParameter(Script *pScr, CComboBox *pCombo, std::vector<AsciiString> *strings, AsciiString match);
 	static Bool loadRevealNames(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static Bool loadRevealNamesParameter(Script *pScr, CComboBox *pCombo, AsciiString match);
-	
+
 	static Bool loadEmoticons( CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString );
 	static AsciiString getCreatedUnitTemplateName(AsciiString unitName);
-	
+
 	void loadCounters(CComboBox *pCombo);
 	void loadConditionParameter(Script *pScr, Parameter::ParameterType type, CComboBox *pCombo);
 	void loadActionParameter(Script *pScr, Parameter::ParameterType type, 	CComboBox *pCombo);
 	void loadFlags(CComboBox *pCombo);
-	
 
-protected:							
+
+protected:
 	Parameter		*m_parameter;
 	static AsciiString m_unitName; //This is the name of the unit that this script command is dedicated to (if applicable).
 	AsciiString m_string;
@@ -129,5 +125,3 @@ class EditParameter : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EDITPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h b/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h
index e3bd72b9a4f..fa38ca049d6 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EXPORTSCRIPTSOPTIONS_H__706D8D87_E01C_431A_ADB8_DFC4CA8A8422__INCLUDED_)
-#define AFX_EXPORTSCRIPTSOPTIONS_H__706D8D87_E01C_431A_ADB8_DFC4CA8A8422__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ExportScriptsOptions.h : header file
 //
 
@@ -60,7 +56,7 @@ class ExportScriptsOptions : public CDialog
 	Bool getDoWaypoints(void) {return m_waypoints;}
 	Bool getDoTriggers(void) {return m_triggers;}
 	Bool getDoAllScripts(void) {return m_allScripts;}
-	
+
 protected:
 
 	// Generated message map functions
@@ -73,5 +69,3 @@ class ExportScriptsOptions : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EXPORTSCRIPTSOPTIONS_H__706D8D87_E01C_431A_ADB8_DFC4CA8A8422__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h b/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h
index 2d5138facd8..44929f34ae2 100644
--- a/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef EYEDROPPERTOOL_H
-#define EYEDROPPERTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************/
 /**                             EyedropperTool
-	 Does the select tile from drawing window tool operation. 
+	 Does the select tile from drawing window tool operation.
 ***************************************************************************/
 ///  Select tile tool.
-class EyedropperTool : public Tool 
+class EyedropperTool : public Tool
 {
 public:
 	EyedropperTool(void);
@@ -43,6 +40,3 @@ class EyedropperTool : public Tool
 	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 	virtual void activate(); ///< Become the current tool.
 };
-
-
-#endif //TOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h b/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h
index fdaa9a14449..2cd482dd5f4 100644
--- a/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_FEATHEROPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
-#define AFX_FEATHEROPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // brushoptions.h : header file
 //
 
@@ -95,5 +91,3 @@ class FeatherOptions : public COptionsPanel	, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_FEATHEROPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h b/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h
index 85fd7f80784..f606a6c8901 100644
--- a/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef FEATHERTOOL_H
-#define FEATHERTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /**************************************************************************/
 /**                             FeatherTool
-	 Does the smooth height map tool operation. 
+	 Does the smooth height map tool operation.
 ***************************************************************************/
 ///  smooth height map tool.
-class FeatherTool : public Tool 
+class FeatherTool : public Tool
 {
 protected:
 	WorldHeightMapEdit *m_htMapEditCopy; //< ref counted.
@@ -56,6 +53,3 @@ class FeatherTool : public Tool
 	virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;};
 	virtual void activate(); ///< Become the current tool.
 };
-
-
-#endif //FEATHERTOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h b/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h
index a05e67d7a24..8c11eefa41e 100644
--- a/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_FenceOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_)
-#define AFX_FenceOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // FenceOptions.h : header file
 //
 
@@ -81,7 +77,7 @@ class FenceOptions : public COptionsPanel
 	Bool							m_customSpacing;
 
 protected:
-	void addObject( MapObject *mapObject, const char *pPath, const char *name, 
+	void addObject( MapObject *mapObject, const char *pPath, const char *name,
 									Int objectNdx, HTREEITEM parent );
 	HTREEITEM findOrAdd(HTREEITEM parent, const char *pLabel);
 	Bool setObjectTreeViewSelection(HTREEITEM parent, Int selection);
@@ -92,9 +88,7 @@ class FenceOptions : public COptionsPanel
 	static Bool hasSelectedObject(void);
 	static Real getFenceSpacing(void) {return m_fenceSpacing;}
 	static Real getFenceOffset(void) {return m_fenceOffset;}
-}; 
+};
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_FenceOptions_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/FenceTool.h b/Generals/Code/Tools/WorldBuilder/include/FenceTool.h
index 04832bea7dc..67b9b3423f2 100644
--- a/Generals/Code/Tools/WorldBuilder/include/FenceTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/FenceTool.h
@@ -22,18 +22,15 @@
 
 #pragma once
 
-#ifndef FenceTool_H
-#define FenceTool_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 class MapObject;
 class Vector3;
 /*************************************************************************/
 /**                             FenceTool
-	 Does the fence tool operation. 
+	 Does the fence tool operation.
 ***************************************************************************/
-class FenceTool : public Tool 
+class FenceTool : public Tool
 {
 protected:
 	CPoint		m_downPt2d;
@@ -48,7 +45,7 @@ class FenceTool : public Tool
 	~FenceTool(void);
 
 protected:
-	void updateMapObjectList(Coord3D downPt, Coord3D curPt, WbView* pView, CWorldBuilderDoc *pDoc, Bool checkPlayers); 
+	void updateMapObjectList(Coord3D downPt, Coord3D curPt, WbView* pView, CWorldBuilderDoc *pDoc, Bool checkPlayers);
 
 public:
 	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
@@ -57,6 +54,3 @@ class FenceTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual void deactivate(); ///< Become not the current tool.
 };
-
-
-#endif //FenceTool_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h b/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h
index 01da734403c..1801fcc33ff 100644
--- a/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h
@@ -22,16 +22,13 @@
 
 #pragma once
 
-#ifndef FloodFillTool_H
-#define FloodFillTool_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /**************************************************************************
                             FloodFillTool
 ***************************************************************************/
 ///  Fill area with texture tool.
-class FloodFillTool : public Tool 
+class FloodFillTool : public Tool
 {
 public:
 	FloodFillTool(void);
@@ -51,6 +48,3 @@ class FloodFillTool : public Tool
 	void setAdjustCliffs(Bool val) {m_adjustCliffTextures = val;}
 
 };
-
-
-#endif //TOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h b/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h
index 2df2657758a..f38d6251bb9 100644
--- a/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_GLOBALLIGHTOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
-#define AFX_GLOBALLIGHTOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // GLOBALLIGHTOPTIONS.h : header file
 //
 
@@ -39,9 +35,9 @@ class GlobalLightOptions : public CDialog	, public PopupSliderOwner
 public:
 	enum {K_TERRAIN=1, K_OBJECTS=2, K_BOTH=3};
 	enum {K_SUN=0, K_ACCENT1=1, K_ACCENT2=2};
-	int kUIRedIDs[3];// = {IDC_RD_EDIT, IDC_RD_EDIT1, IDC_RD_EDIT2}; 
-	int kUIGreenIDs[3];// = {IDC_GD_EDIT, IDC_GD_EDIT1, IDC_GD_EDIT2}; 
-	int kUIBlueIDs[3];// = {IDC_BD_EDIT, IDC_BD_EDIT1, IDC_BD_EDIT2}; 
+	int kUIRedIDs[3];// = {IDC_RD_EDIT, IDC_RD_EDIT1, IDC_RD_EDIT2};
+	int kUIGreenIDs[3];// = {IDC_GD_EDIT, IDC_GD_EDIT1, IDC_GD_EDIT2};
+	int kUIBlueIDs[3];// = {IDC_BD_EDIT, IDC_BD_EDIT1, IDC_BD_EDIT2};
 	CButtonShowColor m_colorButton;
 
 	GlobalLightOptions(CWnd* pParent = NULL);   // standard constructor
@@ -76,7 +72,7 @@ class GlobalLightOptions : public CDialog	, public PopupSliderOwner
 	afx_msg void OnRadioTerrain();
 	afx_msg void OnColorPress();
 	afx_msg void OnResetLights();
-	afx_msg void OnClose(); 
+	afx_msg void OnClose();
 	virtual void OnOK(){return;};  //!< Modeless dialogs don't OK, so eat this for modeless.
 	virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless.
 	//}}AFX_MSG
@@ -139,5 +135,3 @@ class GlobalLightOptions : public CDialog	, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_GLOBALLIGHTOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h b/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h
index 83fd33060d1..22df766d485 100644
--- a/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h
@@ -16,9 +16,6 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef GROVEOPTIONS_H
-#define GROVEOPTIONS_H
-
 #pragma once
 
 #include <map>
@@ -46,7 +43,7 @@ class GroveOptions : public COptionsPanel
 		VecPairNameDisplayName mVecDisplayNames;
 
 		Int	mNumTrees;
-	
+
 	public:
 		GroveOptions(CWnd* pParent = NULL);
 		~GroveOptions();
@@ -78,5 +75,3 @@ class GroveOptions : public COptionsPanel
 };
 
 extern GroveOptions *TheGroveOptions;
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/Tools/WorldBuilder/include/GroveTool.h b/Generals/Code/Tools/WorldBuilder/include/GroveTool.h
index f5000e86d33..3cfbedaa6e7 100644
--- a/Generals/Code/Tools/WorldBuilder/include/GroveTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/GroveTool.h
@@ -21,9 +21,6 @@
 
 #pragma once
 
-#ifndef GroveTool_H
-#define GroveTool_H
-
 #include "Lib/BaseType.h"
 #include "Tool.h"
 #include "Common/MapObject.h"
@@ -31,10 +28,10 @@ class WorldHeightMapEdit;
 
 /*************************************************************************/
 /**                             GroveTool
-	 Does the add a grove of trees tool operation. 
+	 Does the add a grove of trees tool operation.
 ***************************************************************************/
 ///  Add a grove of trees tool.
-class GroveTool : public Tool 
+class GroveTool : public Tool
 {
 protected:
 	enum {HYSTERESIS = 3};
@@ -61,6 +58,3 @@ class GroveTool : public Tool
 	virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 	virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 };
-
-
-#endif //TOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h b/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h
index 37b91fe9433..23643471564 100644
--- a/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h
@@ -22,15 +22,12 @@
 
 #pragma once
 
-#ifndef HandScrollTool_H
-#define HandScrollTool_H
-
 #include "Tool.h"
 /**************************************************************************
                             HandScrollTool
 ***************************************************************************/
 ///  Scroll tool.
-class HandScrollTool : public Tool 
+class HandScrollTool : public Tool
 {
 public:
 	HandScrollTool(void);
@@ -53,6 +50,3 @@ class HandScrollTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual Bool followsTerrain(void) {return false;};
 };
-
-
-#endif //TOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h b/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h
index 4c5e998fc38..6312a67db76 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h
@@ -18,9 +18,6 @@
 
 #pragma once
 
-#ifndef __IMPASSABLEOPTIONS_H__
-#define __IMPASSABLEOPTIONS_H__
-
 class ImpassableOptions : public CDialog
 {
 	public:
@@ -39,12 +36,10 @@ class ImpassableOptions : public CDialog
 		Bool m_showImpassableAreas;
 
 		Bool ValidateSlope();	// Returns TRUE if it was valid, FALSE if it had to adjust it.
-		
+
 	protected:
 		virtual BOOL OnInitDialog();
 		afx_msg void OnAngleChange();
 		afx_msg void OnPreview();
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif /* __IMPASSABLEOPTIONS_H__ */
diff --git a/Generals/Code/Tools/WorldBuilder/include/LayersList.h b/Generals/Code/Tools/WorldBuilder/include/LayersList.h
index 2cc559500da..2dbbcb0dd1b 100644
--- a/Generals/Code/Tools/WorldBuilder/include/LayersList.h
+++ b/Generals/Code/Tools/WorldBuilder/include/LayersList.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: LayersList.h 
+// FILE: LayersList.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_LAYERSLIST_
-#define _H_LAYERSLIST_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Common/AsciiString.h"
@@ -65,14 +63,14 @@ class CLLTreeCtrl : public CTreeCtrl
 	public:
 		AsciiString getLastClickedLayer(void) {	return mLastClickedLayer; }
 		AsciiString getLastClickedObject(void) {	return mLastClickedObject; }
-	
+
 	protected:
 		AsciiString mLastClickedLayer;
 		AsciiString mLastClickedObject;
 		void buildMoveMenu(CMenu* pPopup, UINT firstID);
 		virtual void OnRButtonDown(UINT nFlags, CPoint point);
 		DECLARE_MESSAGE_MAP()
-		
+
 };
 
 
@@ -83,7 +81,7 @@ class LayersList : public CDialog
 
 	public:
 		enum { IDD = IDD_LAYERSLIST };
-		LayersList(UINT nIDTemplate = LayersList::IDD, CWnd *parentWnd = NULL); 
+		LayersList(UINT nIDTemplate = LayersList::IDD, CWnd *parentWnd = NULL);
 		virtual ~LayersList();
 
 		void resetLayers();
@@ -107,7 +105,7 @@ class LayersList : public CDialog
 		const ListLayer& GetAllLayers(void) const { return mLayers; }
 
 		static MapObject *findObjectByUID(AsciiString objectIDToFind);
-		
+
 	protected:
 		AsciiString mCurrentlyEditingLabel;
 		ListLayer mLayers;
@@ -124,15 +122,15 @@ class LayersList : public CDialog
 		static std::string TheDefaultNewLayerName;
 		static const std::string TheUnmutableDefaultLayerName;
 
-		// This function takes an MapObject, and does one of the following: 
-		// 1) Return true if the MapObject can be found, and 
-		//    layerIt points to a valid layer iterator in which the MapObject was found 
-		//    MapObjectIt points to a valid MapObject iterator on the layerIts MapObjectsInLayer member 
+		// This function takes an MapObject, and does one of the following:
+		// 1) Return true if the MapObject can be found, and
+		//    layerIt points to a valid layer iterator in which the MapObject was found
+		//    MapObjectIt points to a valid MapObject iterator on the layerIts MapObjectsInLayer member
 		// 2) Returns false if the MapObject cannot be found.
 		Bool findMapObjectAndList(IN MapObject *MapObjectToFind, OUT ListLayerIt *layerIt = NULL, OUT ListMapObjectPtrIt *MapObjectIt = NULL);
-		
+
 		// This function takes a layer name, and does one of the following:
-		// 1) Return true if the layer can be found, and 
+		// 1) Return true if the layer can be found, and
 		//		layerIt points to a valid layer iterator named layerName
 		// 2) Returns false if the layer cannot be found.
 		Bool findLayerNamed(IN AsciiString layerName, OUT ListLayerIt *layerIt = NULL);
@@ -152,7 +150,7 @@ class LayersList : public CDialog
 		afx_msg void OnMergeObject(UINT commandID);
 		afx_msg void OnMergeViewSelection(UINT commandID);
 
-		
+
 		afx_msg void OnNewLayer();
 		afx_msg void OnDeleteLayer();
 		afx_msg void OnHideShowLayer();
@@ -160,5 +158,3 @@ class LayersList : public CDialog
 };
 
 extern LayersList *TheLayersList;
-
-#endif /* _H_LAYERSLIST_ */
diff --git a/Generals/Code/Tools/WorldBuilder/include/LightOptions.h b/Generals/Code/Tools/WorldBuilder/include/LightOptions.h
index c1dae23118f..e08e6b0759d 100644
--- a/Generals/Code/Tools/WorldBuilder/include/LightOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/LightOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_LightOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_)
-#define AFX_LightOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // LightOptions.h : header file
 //
 #include "OptionsPanel.h"
@@ -78,5 +74,3 @@ class LightOptions : public COptionsPanel
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_LightOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/MainFrm.h b/Generals/Code/Tools/WorldBuilder/include/MainFrm.h
index 27d34951ff9..54e353ee816 100644
--- a/Generals/Code/Tools/WorldBuilder/include/MainFrm.h
+++ b/Generals/Code/Tools/WorldBuilder/include/MainFrm.h
@@ -20,12 +20,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_MAINFRM_H__371EC7AB_29D3_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_MAINFRM_H__371EC7AB_29D3_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "Lib/BaseType.h"
 #include "MyToolbar.h"
@@ -59,9 +54,9 @@ class LayersList;
 
 class CMainFrame : public CFrameWnd
 {
-  DECLARE_DYNAMIC(CMainFrame) 
+  DECLARE_DYNAMIC(CMainFrame)
 
-public:	
+public:
 	CMainFrame();
 
 // Attributes
@@ -118,7 +113,7 @@ class CMainFrame : public CFrameWnd
 	GlobalLightOptions	m_globalLightOptions;
 	CameraOptions				m_cameraOptions;
 	LayersList*					m_layersList;
-	
+
 
 	CWnd							*m_curOptions;
 	Int								m_curOptionsX;
@@ -155,5 +150,3 @@ class CMainFrame : public CFrameWnd
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MAINFRM_H__371EC7AB_29D3_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/MapPreview.h b/Generals/Code/Tools/WorldBuilder/include/MapPreview.h
index 8dfbfeb2e0d..d5aa64c4757 100644
--- a/Generals/Code/Tools/WorldBuilder/include/MapPreview.h
+++ b/Generals/Code/Tools/WorldBuilder/include/MapPreview.h
@@ -18,12 +18,12 @@
 
 // FILE: MapPreview.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Oct 2002
@@ -31,17 +31,14 @@
 //	Filename: 	MapPreview.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __MAP_PREVIEW_H_
-#define __MAP_PREVIEW_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -72,9 +69,9 @@ class MapPreview
 	void interpolateColorForHeight( RGBColor *color, Real height, Real hiZ, Real midZ, Real loZ );
 	Bool mapPreviewToWorld(const ICoord2D *radar, Coord3D *world);
 	void buildMapPreviewTexture( CString tgaName );
-	
+
 	UnsignedInt m_pixelBuffer[MAP_PREVIEW_HEIGHT][MAP_PREVIEW_WIDTH];
-	
+
 
 };
 //-----------------------------------------------------------------------------
@@ -84,5 +81,3 @@ class MapPreview
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __MAP_PREVIEW_H_
diff --git a/Generals/Code/Tools/WorldBuilder/include/MapSettings.h b/Generals/Code/Tools/WorldBuilder/include/MapSettings.h
index 0ee3be00c80..8fc0810a064 100644
--- a/Generals/Code/Tools/WorldBuilder/include/MapSettings.h
+++ b/Generals/Code/Tools/WorldBuilder/include/MapSettings.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_MAPSETTINGS_H__21749744_4DF4_462C_8DD4_FEEC1003DCFE__INCLUDED_)
-#define AFX_MAPSETTINGS_H__21749744_4DF4_462C_8DD4_FEEC1003DCFE__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // MapSettings.h : header file
 //
 
@@ -65,5 +61,3 @@ class MapSettings : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MAPSETTINGS_H__21749744_4DF4_462C_8DD4_FEEC1003DCFE__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h b/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h
index 1a0f7d7fb1a..0e6515be6f1 100644
--- a/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_MESHMOLDOPTIONS_H__D5E62CB9_2830_4FA1_8306_DE18DD971087__INCLUDED_)
-#define AFX_MESHMOLDOPTIONS_H__D5E62CB9_2830_4FA1_8306_DE18DD971087__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // MeshMoldOptions.h : header file
 //
 #include "WBPopupSlider.h"
@@ -114,5 +110,3 @@ class MeshMoldOptions : public COptionsPanel , public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MESHMOLDOPTIONS_H__D5E62CB9_2830_4FA1_8306_DE18DD971087__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h b/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h
index e60c3ee2f6c..e945bb59799 100644
--- a/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef MESHMOLDTOOL_H
-#define MESHMOLDTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************/
 /**                             MeshMoldTool
-	 Does the Mesh Mold tool operation. 
+	 Does the Mesh Mold tool operation.
 ***************************************************************************/
 ///  Height brush tool.
-class MeshMoldTool : public Tool 
+class MeshMoldTool : public Tool
 {
 protected:
 
@@ -65,6 +62,3 @@ class MeshMoldTool : public Tool
 	static void updateMeshLocation(Bool changePreview);
 
 };
-
-
-#endif //MESHMOLDTOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h b/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h
index b32457aef67..d81891a47ba 100644
--- a/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_MoundOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_)
-#define AFX_MoundOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // MoundOptions.h : header file
 //
 #include "WBPopupSlider.h"
@@ -100,5 +96,3 @@ class MoundOptions : public COptionsPanel	, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MoundOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/MoundTool.h b/Generals/Code/Tools/WorldBuilder/include/MoundTool.h
index d9f124d3595..4e57d8eff9e 100644
--- a/Generals/Code/Tools/WorldBuilder/include/MoundTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/MoundTool.h
@@ -22,15 +22,12 @@
 
 #pragma once
 
-#ifndef MOUND_TOOL_H
-#define MOUND_TOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************
 **                             MoundTool
 ***************************************************************************/
-class MoundTool : public Tool 
+class MoundTool : public Tool
 {
 	enum {MIN_DELAY_TIME=60}; // 60 ms minimum delay between applications.
 protected:
@@ -66,10 +63,9 @@ class MoundTool : public Tool
 /*************************************************************************
 **                             DigTool
 ***************************************************************************/
-class DigTool : public MoundTool 
+class DigTool : public MoundTool
 {
 public:
 	DigTool(void);
 
 };
-#endif //MoundTool_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h b/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h
index 79702385793..00d6dee3624 100644
--- a/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h
+++ b/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h
@@ -22,11 +22,6 @@
 
 #pragma once
 
-#ifndef MYTOOLBAR_H
-#define MYTOOLBAR_H
-
-
-
 /*************************************************************************
 **                             CellSizeToolBar
 ***************************************************************************/
@@ -47,7 +42,3 @@ class CellSizeToolBar : public CDialogBar
 	static void CellSizeChanged(Int cellSize);
 
 };
-
-
-
-#endif //MYTOOLBAR_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h b/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h
index 3ca289e4043..9ae6fde449d 100644
--- a/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h
+++ b/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_NEWHEIGHTMAP_H__239CD6A3_2919_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_NEWHEIGHTMAP_H__239CD6A3_2919_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // NewHeightMap.h : header file
 //
 
@@ -85,5 +81,3 @@ class CNewHeightMap : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_NEWHEIGHTMAP_H__239CD6A3_2919_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h b/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h
index 7b91dd526d3..3b94fd9b70d 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ObjectOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_)
-#define AFX_ObjectOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ObjectOptions.h : header file
 //
 
@@ -83,7 +79,7 @@ class ObjectOptions : public COptionsPanel
 	ObjectPreview			m_objectPreview;
 
 protected:
-	void addObject( MapObject *mapObject, const char *pPath,  
+	void addObject( MapObject *mapObject, const char *pPath,
 									Int objectNdx, HTREEITEM parent );
 	HTREEITEM findOrAdd(HTREEITEM parent, const char *pLabel);
 	HTREEITEM findOrDont(const char *pLabel);
@@ -101,9 +97,7 @@ class ObjectOptions : public COptionsPanel
 	static Real getCurObjectHeight(void);
 	static void update();
 	static AsciiString getCurGdfName(void);
-}; 
+};
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ObjectOptions_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h b/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h
index 32cec934425..cc9b5259e90 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_OBJECTPREVIEW_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_)
-#define AFX_OBJECTPREVIEW_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ObjectPreview.h : header file
 //
 
@@ -72,5 +68,3 @@ class ObjectPreview : public CWnd
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OBJECTPREVIEW_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h b/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h
index 3a6b911842d..613f6784741 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef OBJECTTOOL_H
-#define OBJECTTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************/
 /**                             ObjectTool
-	 Does the BlendEdgesOut tool operation. 
+	 Does the BlendEdgesOut tool operation.
 ***************************************************************************/
 ///  Blend edges out tool.
-class ObjectTool : public Tool 
+class ObjectTool : public Tool
 {
 protected:
 	CPoint m_downPt2d;
@@ -53,6 +50,3 @@ class ObjectTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual void deactivate(); ///< Become not the current tool.
 };
-
-
-#endif //TOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/OpenMap.h b/Generals/Code/Tools/WorldBuilder/include/OpenMap.h
index b9539f285bd..80d679ccd8c 100644
--- a/Generals/Code/Tools/WorldBuilder/include/OpenMap.h
+++ b/Generals/Code/Tools/WorldBuilder/include/OpenMap.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_OPENMAP_H__D3FD3B43_B0B7_42F6_BB77_2380A8B9945B__INCLUDED_)
-#define AFX_OPENMAP_H__D3FD3B43_B0B7_42F6_BB77_2380A8B9945B__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // OpenMap.h : header file
 //
 
@@ -76,5 +72,3 @@ class OpenMap : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OPENMAP_H__D3FD3B43_B0B7_42F6_BB77_2380A8B9945B__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h b/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h
index 0299b6c61e0..ff459a0e90c 100644
--- a/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h
+++ b/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_OPTIONSPANEL_H__CB473165_D123_42D9_AE80_32F16928E3AE__INCLUDED_)
-#define AFX_OPTIONSPANEL_H__CB473165_D123_42D9_AE80_32F16928E3AE__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // OptionsPanel.h : header file
 //
 
@@ -68,5 +64,3 @@ class COptionsPanel : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OPTIONSPANEL_H__CB473165_D123_42D9_AE80_32F16928E3AE__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h b/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h
index 90150fe3a77..c6a58c0e320 100644
--- a/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h
+++ b/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_PICKUNITDIALOG_H__B4C16E7D_FEED_472B_95FC_496D4C9006F5__INCLUDED_)
-#define AFX_PICKUNITDIALOG_H__B4C16E7D_FEED_472B_95FC_496D4C9006F5__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // PickUnitDialog.h : header file
 //
 
@@ -112,5 +108,3 @@ class ReplaceUnitDialog : public PickUnitDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PICKUNITDIALOG_H__B4C16E7D_FEED_472B_95FC_496D4C9006F5__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/PointerTool.h b/Generals/Code/Tools/WorldBuilder/include/PointerTool.h
index 698d97200f4..962a46946a6 100644
--- a/Generals/Code/Tools/WorldBuilder/include/PointerTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/PointerTool.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef POINTER_TOOL_H
-#define POINTER_TOOL_H
-
 #include "PolygonTool.h"
 class WorldHeightMapEdit;
 #include "../../GameEngine/Include/Common/MapObject.h"
@@ -32,7 +29,7 @@ class WorldHeightMapEdit;
 class ModifyObjectUndoable;
 /*************************************************************************/
 /**                             PointerTool
-	 Does the select/move tool operation. 
+	 Does the select/move tool operation.
 ***************************************************************************/
 ///  Blend edges out tool.
 class PointerTool : public PolygonTool
@@ -48,7 +45,7 @@ class PointerTool : public PolygonTool
 	Bool m_dragSelect; ///< True if we are drag selecting.
 
 	Bool m_doPolyTool; ///< True if we are using the polygon tool to modify a polygon triggter.
-	
+
 	ModifyObjectUndoable *m_modifyUndoable;	 ///< The modify undoable that is in progress while we track the mouse.
 
 	Bool m_mouseUpRotate;///< True if we are over the "rotate" hotspot.
@@ -77,6 +74,3 @@ class PointerTool : public PolygonTool
 	static void clearSelection(void); ///< Clears the selected objects selected flags.
 	static Bool allowPick(MapObject* pMapObj, WbView* pView);
 };
-
-
-#endif //POINTER_TOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h b/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h
index 0eae135e203..e4f52559fc2 100644
--- a/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef POLYGONTOOL_H
-#define POLYGONTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 class MapObject;
@@ -32,10 +29,10 @@ class PolygonTrigger;
 class MovePolygonUndoable;
 /*************************************************************************/
 /**                             PolygonTool
-	 Does the add/select polygon operation. 
+	 Does the add/select polygon operation.
 ***************************************************************************/
 ///  Select tile tool.
-class PolygonTool : public Tool 
+class PolygonTool : public Tool
 {
 public:
 	PolygonTool(void);
@@ -51,7 +48,7 @@ class PolygonTool : public Tool
 	HCURSOR m_poly_plusCursor;
 	Bool m_poly_mouseUpMove;///< True if we are over the "move" hotspot.
 	HCURSOR m_poly_moveCursor;
-					
+
 	MovePolygonUndoable *m_poly_moveUndoable;
 
 	static Bool		m_poly_isAdding;
@@ -59,7 +56,7 @@ class PolygonTool : public Tool
 	static Bool		m_poly_isActive;
 	static PolygonTrigger *m_poly_curSelectedPolygon;
 
-protected: 
+protected:
 	static Int poly_pickPoint(PolygonTrigger *pTrig, CPoint viewPt, WbView* pView);
 	static Int poly_getInsertIndex(PolygonTrigger *pTrig, Coord3D loc);
 	Bool poly_snapToPoly(Coord3D *pLoc);
@@ -84,7 +81,3 @@ class PolygonTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual void deactivate(); ///< Become not the current tool.
 };
-
-
-#endif //POLYGONTOOL_H
-
diff --git a/Generals/Code/Tools/WorldBuilder/include/RampOptions.h b/Generals/Code/Tools/WorldBuilder/include/RampOptions.h
index 454f16e4949..1d6828ae486 100644
--- a/Generals/Code/Tools/WorldBuilder/include/RampOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/RampOptions.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: RampOptions.h 
+// FILE: RampOptions.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_RAMPOPTIONS_
-#define _H_RAMPOPTIONS_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "OptionsPanel.h"
@@ -62,5 +60,3 @@ class RampOptions : public COptionsPanel
 };
 
 extern RampOptions* TheRampOptions;
-
-#endif /* _H_RAMPOPTIONS_ */
diff --git a/Generals/Code/Tools/WorldBuilder/include/RampTool.h b/Generals/Code/Tools/WorldBuilder/include/RampTool.h
index 5c82447149a..0b5718ac81c 100644
--- a/Generals/Code/Tools/WorldBuilder/include/RampTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/RampTool.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: RampTool.h 
+// FILE: RampTool.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_RAMPTOOL_
-#define _H_RAMPTOOL_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Tool.h"
@@ -41,14 +39,14 @@
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////
 
-class RampTool : public Tool 
+class RampTool : public Tool
 {
 	Coord3D mStartPoint;
 	Coord3D mEndPoint;
 	Coord3D mCurvePoint;
 
 	Bool mIsMouseDown;
-	
+
 	public:
 		RampTool();
 		virtual void activate();
@@ -64,6 +62,3 @@ class RampTool : public Tool
 		void drawFeedback(Coord3D* endPoint);
 		void applyRamp(CWorldBuilderDoc* pDoc);
 };
-
-
-#endif /* _H_RAMPTOOL_ */
diff --git a/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h b/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h
index 159970c260e..1536469cbfa 100644
--- a/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_RoadOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_)
-#define AFX_RoadOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // RoadOptions.h : header file
 //
 
@@ -103,9 +99,7 @@ class RoadOptions : public COptionsPanel
 	static void updateSelection(void);
 	static Bool selectionIsRoadsOnly(void);
 	void applyToSelection(void);
-}; 
+};
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_RoadOptions_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/RoadTool.h b/Generals/Code/Tools/WorldBuilder/include/RoadTool.h
index b58fea32324..1abd0aa7bca 100644
--- a/Generals/Code/Tools/WorldBuilder/include/RoadTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/RoadTool.h
@@ -22,19 +22,16 @@
 
 #pragma once
 
-#ifndef RoadTool_H
-#define RoadTool_H
-
 #include "Tool.h"
 #include "W3DDevice/GameClient/WorldHeightMap.h"
 class WorldHeightMapEdit;
 #define ROAD_SNAP_DISTANCE (1.0f)
 /*************************************************************************/
 /**                             RoadTool
-	 Does the Add a section of road tool operation. 
+	 Does the Add a section of road tool operation.
 ***************************************************************************/
 ///  Road segment tool.
-class RoadTool : public Tool 
+class RoadTool : public Tool
 {
 protected:
 	enum {HYSTERESIS = 3,
@@ -58,6 +55,3 @@ class RoadTool : public Tool
 	virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 	virtual void activate(); ///< Become the current tool.
 };
-
-
-#endif //TOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/SaveMap.h b/Generals/Code/Tools/WorldBuilder/include/SaveMap.h
index fb2f33ae7ae..4a849ff5ec0 100644
--- a/Generals/Code/Tools/WorldBuilder/include/SaveMap.h
+++ b/Generals/Code/Tools/WorldBuilder/include/SaveMap.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SAVEMAP_H__BCE93FF1_DA04_4F63_A483_D89BF1F49E32__INCLUDED_)
-#define AFX_SAVEMAP_H__BCE93FF1_DA04_4F63_A483_D89BF1F49E32__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // SaveMap.h : header file
 //
 
@@ -78,5 +74,3 @@ class SaveMap : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SAVEMAP_H__BCE93FF1_DA04_4F63_A483_D89BF1F49E32__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h b/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h
index fb07819a225..1fdae4e4138 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SCORCHOPTIONS_H__33FD4D9A_2C39_4494_A4EF_A20CEC76A95D__INCLUDED_)
-#define AFX_SCORCHOPTIONS_H__33FD4D9A_2C39_4494_A4EF_A20CEC76A95D__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ScorchOptions.h : header file
 //
 
@@ -80,6 +76,7 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner
 	void changeSize(void);
 	void changeScorch(void);
 	void getAllSelectedDicts(void);
+	Dict** getAllSelectedDictsData();
 
 public:
 	static void update(void);
@@ -93,5 +90,3 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SCORCHOPTIONS_H__33FD4D9A_2C39_4494_A4EF_A20CEC76A95D__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h b/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h
index 5c2b93e59ae..0cdc3039b07 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h
@@ -21,9 +21,6 @@
 
 #pragma once
 
-#ifndef SCORCHTOOL_H
-#define SCORCHTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 class MapObject;
@@ -31,7 +28,7 @@ class MapObject;
 /**                             ScorchTool
 ***************************************************************************/
 ///  Scorch tool.
-class ScorchTool : public Tool 
+class ScorchTool : public Tool
 {
 public:
 	ScorchTool(void);
@@ -40,7 +37,7 @@ class ScorchTool : public Tool
 protected:
 	Coord3D m_mouseDownPt;
 
-protected: 
+protected:
 	MapObject *pickScorch(Coord3D loc);
 
 public:
@@ -51,6 +48,3 @@ class ScorchTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual void deactivate(); ///< Become not the current tool.
 };
-
-
-#endif //SCORCHTOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h
index 2ad043d6c8c..98fc05ef6f7 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SCRIPTACTIONSFALSE_H__227F217F_458B_4020_B6E9_6EB25E228FD5__INCLUDED_)
-#define AFX_SCRIPTACTIONSFALSE_H__227F217F_458B_4020_B6E9_6EB25E228FD5__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ScriptActionsFalse.h : header file
 //
 class Script;
@@ -64,7 +60,7 @@ class ScriptActionsFalse : public CPropertyPage
 	Int					m_index; // Index of whatever is currently selected.
 
 protected:
-	void enableUI(void); 
+	void enableUI(void);
 	void loadList(void);
 	Bool doMoveDown(void);
 
@@ -88,5 +84,3 @@ class ScriptActionsFalse : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SCRIPTACTIONSFALSE_H__227F217F_458B_4020_B6E9_6EB25E228FD5__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h
index d6bafafc125..3f41b7efd7d 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SCRIPTACTIONSTRUE_H__D8CAEC29_8B71_461C_B1B8_DF55624330AA__INCLUDED_)
-#define AFX_SCRIPTACTIONSTRUE_H__D8CAEC29_8B71_461C_B1B8_DF55624330AA__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ScriptActionsTrue.h : header file
 //
 class Script;
@@ -64,7 +60,7 @@ class ScriptActionsTrue : public CPropertyPage
 	Int					m_index; // Index of whatever is currently selected.
 
 protected:
-	void enableUI(void); 
+	void enableUI(void);
 	void loadList(void);
 	Bool doMoveDown(void);
 
@@ -88,5 +84,3 @@ class ScriptActionsTrue : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SCRIPTACTIONSTRUE_H__D8CAEC29_8B71_461C_B1B8_DF55624330AA__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h b/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h
index 246865fb571..6233557c5d6 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ScriptConditionsDlg_H__EEFDFF65_2440_4AFE_B5D6_9E887C8C2DED__INCLUDED_)
-#define AFX_ScriptConditionsDlg_H__EEFDFF65_2440_4AFE_B5D6_9E887C8C2DED__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ScriptConditionsDlg.h : header file
 //
 class Script;
@@ -66,7 +62,7 @@ class ScriptConditionsDlg : public CPropertyPage
 	Int					m_index; // Index of whatever is currently selected.
 
 protected:
-	void enableUI(void); 
+	void enableUI(void);
 	void loadList(void);
 	Int doMoveUp( OrCondition **outWhichNow );
 	Int doMoveDown( OrCondition **outWhichNow );
@@ -93,5 +89,3 @@ class ScriptConditionsDlg : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ScriptConditionsDlg_H__EEFDFF65_2440_4AFE_B5D6_9E887C8C2DED__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h b/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h
index 060f83a52cf..2e3e3055792 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SCRIPTDIALOG_H__885FEF28_85F9_4556_9908_1BEC0B6E4C62__INCLUDED_)
-#define AFX_SCRIPTDIALOG_H__885FEF28_85F9_4556_9908_1BEC0B6E4C62__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ScriptDialog.h : header file
 //
 
@@ -52,7 +48,7 @@ class Parameter;
 class CSDTreeCtrl : public CTreeCtrl
 {
 	public:
-	
+
 	protected:
 		virtual void OnRButtonDown(UINT nFlags, CPoint point);
 		DECLARE_MESSAGE_MAP()
@@ -158,5 +154,3 @@ class ScriptDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SCRIPTDIALOG_H__885FEF28_85F9_4556_9908_1BEC0B6E4C62__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h b/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h
index 8817ff1e494..9ee638472b2 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SCRIPTPROPERTIES_H__CE62125B_9FAB_4EF0_A8B5_36DD5393A2B0__INCLUDED_)
-#define AFX_SCRIPTPROPERTIES_H__CE62125B_9FAB_4EF0_A8B5_36DD5393A2B0__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ScriptProperties.h : header file
 //
 class Script;
@@ -85,5 +81,3 @@ class ScriptProperties : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SCRIPTPROPERTIES_H__CE62125B_9FAB_4EF0_A8B5_36DD5393A2B0__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h b/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h
index aef29494349..a3108838286 100644
--- a/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h
+++ b/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SELECTMACROTEXTURE_H__0AB61BFA_3A67_40CB_A38F_7067F6BA352B__INCLUDED_)
-#define AFX_SELECTMACROTEXTURE_H__0AB61BFA_3A67_40CB_A38F_7067F6BA352B__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // SelectMacrotexture.h : header file
 //
 
@@ -48,7 +44,7 @@ class SelectMacrotexture : public CDialog
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
 	//}}AFX_VIRTUAL
-	
+
 protected:
 	CTreeCtrl		m_textureTreeView;
 
@@ -65,5 +61,3 @@ class SelectMacrotexture : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SELECTMACROTEXTURE_H__0AB61BFA_3A67_40CB_A38F_7067F6BA352B__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h b/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h
index 07092745ccb..1af6e29d513 100644
--- a/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SHADOWOPTIONS_H__25CB23E2_9E42_44D4_BE83_4B89F87746DE__INCLUDED_)
-#define AFX_SHADOWOPTIONS_H__25CB23E2_9E42_44D4_BE83_4B89F87746DE__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ShadowOptions.h : header file
 //
 
@@ -71,5 +67,3 @@ class ShadowOptions : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SHADOWOPTIONS_H__25CB23E2_9E42_44D4_BE83_4B89F87746DE__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h b/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h
index 4eac25f5951..49d935e0403 100644
--- a/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h
+++ b/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h
@@ -18,9 +18,6 @@
 
 #pragma once
 
-#ifndef __SPLASHSCREEN_H__
-#define __SPLASHSCREEN_H__
-
 class SplashScreen : public CDialog
 {
 	protected:
@@ -40,5 +37,3 @@ class SplashScreen : public CDialog
 
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif /* __SPLASHSCREEN_H__ */
diff --git a/Generals/Code/Tools/WorldBuilder/include/StdAfx.h b/Generals/Code/Tools/WorldBuilder/include/StdAfx.h
index e3f06c7e61e..2570c641763 100644
--- a/Generals/Code/Tools/WorldBuilder/include/StdAfx.h
+++ b/Generals/Code/Tools/WorldBuilder/include/StdAfx.h
@@ -21,12 +21,7 @@
 //      are changed infrequently
 //
 
-#if !defined(AFX_STDAFX_H__FBA41347_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_STDAFX_H__FBA41347_2826_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
@@ -34,7 +29,7 @@
 // To prevent pragma errors.
 #include "Lib/BaseType.h"
 
-// TheSuperHackers @compile xezon 24/03/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
+// TheSuperHackers @build xezon 24/03/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
 #define _d3d9TYPES_H_
 
 #include <afxwin.h>         // MFC core and standard components
@@ -44,10 +39,8 @@
 #include <afxcmn.h>			// MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
-
+#include <Utility/stdio_adapter.h>
 
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__FBA41347_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h b/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h
index ebef54943b6..f588f65aaa6 100644
--- a/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h
+++ b/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TEAMBEHAVIOR_H__40A707E0_08CB_4544_9FF1_AF0DACAB02A6__INCLUDED_)
-#define AFX_TEAMBEHAVIOR_H__40A707E0_08CB_4544_9FF1_AF0DACAB02A6__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // TeamBehavior.h : header file
 //
 
@@ -80,5 +76,3 @@ class TeamBehavior : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TEAMBEHAVIOR_H__40A707E0_08CB_4544_9FF1_AF0DACAB02A6__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h b/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h
index 45b9153fd70..40c599c7484 100644
--- a/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h
+++ b/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h
@@ -18,9 +18,6 @@
 
 #pragma once
 
-#ifndef __TEAMGENERIC_H__
-#define __TEAMGENERIC_H__
-
 class Dict;
 
 class TeamGeneric : public CPropertyPage
@@ -37,10 +34,10 @@ class TeamGeneric : public CPropertyPage
 	protected:
 		void _fillComboBoxesWithScripts();
 		void _dictToScripts();
-	
+
 	protected:
 		Dict *m_teamDict;
-		
+
 
 	protected: // Windows Functions
 		virtual BOOL OnInitDialog();
@@ -48,5 +45,3 @@ class TeamGeneric : public CPropertyPage
 		afx_msg void OnScriptAdjust();
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif
\ No newline at end of file
diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h b/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h
index 8f54e1eb32f..58b74c8edb5 100644
--- a/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h
+++ b/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TEAMIDENTITY_H__B37DB2FD_297F_4D0E_AACD_193BE30C6C85__INCLUDED_)
-#define AFX_TEAMIDENTITY_H__B37DB2FD_297F_4D0E_AACD_193BE30C6C85__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // TeamIdentity.h : header file
 //
 class Dict;
@@ -55,7 +51,7 @@ class TeamIdentity : public CPropertyPage
 	Dict		*m_teamDict;
 	SidesList	*m_sides;
 protected:
-	void loadUnitsInfo(int idcMinUnit, NameKeyType keyMinUnit, 
+	void loadUnitsInfo(int idcMinUnit, NameKeyType keyMinUnit,
 								int idcMaxUnit, NameKeyType keyMaxUnit,
 								int idcUnitType, NameKeyType keyUnitType);
 	void OnUnitTypeButton(Int idcUnitType);
@@ -98,5 +94,3 @@ class TeamIdentity : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TEAMIDENTITY_H__B37DB2FD_297F_4D0E_AACD_193BE30C6C85__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h b/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h
index 8dbafdbd84d..cce3eb0069c 100644
--- a/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h
+++ b/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TEAMREINFORCEMENT_H__29B5C0C7_10E8_4869_8B43_815422C51C24__INCLUDED_)
-#define AFX_TEAMREINFORCEMENT_H__29B5C0C7_10E8_4869_8B43_815422C51C24__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // TeamReinforcement.h : header file
 //
 
@@ -70,5 +66,3 @@ class TeamReinforcement : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TEAMREINFORCEMENT_H__29B5C0C7_10E8_4869_8B43_815422C51C24__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h b/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h
index b805824031d..5018911070a 100644
--- a/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h
+++ b/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TERRAINMATERIAL_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
-#define AFX_TERRAINMATERIAL_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // terrainmaterial.h : header file
 //
 
@@ -109,9 +105,7 @@ class TerrainMaterial : public COptionsPanel, public PopupSliderOwner
 	virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial);
 	virtual void PopSliderChanged(const long sliderID, long theVal);
 	virtual void PopSliderFinished(const long sliderID, long theVal);
-}; 
+};
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TERRAINMATERIAL_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h b/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h
index 15f456169f5..6032a53b6f0 100644
--- a/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h
+++ b/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TERRAINMODAL_H__F013E9EF_2DE1_4084_97A8_5B87466535FC__INCLUDED_)
-#define AFX_TERRAINMODAL_H__F013E9EF_2DE1_4084_97A8_5B87466535FC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // TerrainModal.h : header file
 //
 
@@ -82,5 +78,3 @@ class TerrainModal : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TERRAINMODAL_H__F013E9EF_2DE1_4084_97A8_5B87466535FC__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h b/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h
index 3de2cae4d1a..eeb972b450a 100644
--- a/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h
+++ b/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TERRAINSWATCHES_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_)
-#define AFX_TERRAINSWATCHES_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // TerrainSwatches.h : header file
 //
 
@@ -66,5 +62,3 @@ class TerrainSwatches : public CWnd
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TERRAINSWATCHES_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/TileTool.h b/Generals/Code/Tools/WorldBuilder/include/TileTool.h
index d67a99e029b..9d227e538af 100644
--- a/Generals/Code/Tools/WorldBuilder/include/TileTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/TileTool.h
@@ -22,15 +22,12 @@
 
 #pragma once
 
-#ifndef TILETOOL_H
-#define TILETOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************
 **                             TileTool
 ***************************************************************************/
-class TileTool : public Tool 
+class TileTool : public Tool
 {
 protected:
 	WorldHeightMapEdit *m_htMapEditCopy; //< ref counted.
@@ -53,7 +50,7 @@ class TileTool : public Tool
 /*************************************************************************
 **                             BigTileTool
 ***************************************************************************/
-class BigTileTool : public TileTool 
+class BigTileTool : public TileTool
 {
 
 protected:
@@ -69,4 +66,3 @@ class BigTileTool : public TileTool
 	virtual Int getWidth(void) {return m_currentWidth;};
 
 };
-#endif //TOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/Tool.h b/Generals/Code/Tools/WorldBuilder/include/Tool.h
index 3670fc3ef5c..70515caca9d 100644
--- a/Generals/Code/Tools/WorldBuilder/include/Tool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/Tool.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef TOOL_H
-#define TOOL_H
-
 #include "Lib/BaseType.h"
 #include "Common/STLTypedefs.h"
 
@@ -53,7 +50,7 @@ class WbView;
 /*************************************************************************
 **                             Tool
 ***************************************************************************/
-class Tool  
+class Tool
 {
 protected:
 	Int	m_toolID;  //< Tool button ui id in resource.
@@ -83,11 +80,8 @@ class Tool
 	static Real calcRoundBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int featherWidth);
 	static Real calcSquareBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int featherWidth);
 	static void getCenterIndex(Coord3D *docLocP, Int brushWidth, CPoint *center, CWorldBuilderDoc *pDoc);
-	static void getAllIndexesIn(const Coord3D *bl, const Coord3D *br, 
-															const Coord3D *tl, const Coord3D *tr, 
-															Int widthOutside, CWorldBuilderDoc *pDoc, 
+	static void getAllIndexesIn(const Coord3D *bl, const Coord3D *br,
+															const Coord3D *tl, const Coord3D *tr,
+															Int widthOutside, CWorldBuilderDoc *pDoc,
 															VecHeightMapIndexes* allIndices);
 };
-
-
-#endif //TOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h b/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h
index 2c59b0b9d39..129b12204f2 100644
--- a/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h
+++ b/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WBFRAMEWND_H__83965AA4_8750_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_WBFRAMEWND_H__83965AA4_8750_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // WBFrameWnd.h : header file
 //
 
@@ -96,11 +92,9 @@ class CWB3dFrameWnd : public CMainFrame
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
-								
+
 
 /////////////////////////////////////////////////////////////////////////////
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WBFRAMEWND_H__83965AA4_8750_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h b/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h
index adf43afd21d..0cf36b5305b 100644
--- a/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h
+++ b/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h
@@ -16,13 +16,12 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __WBHEIGHTMAP_H_
-#define __WBHEIGHTMAP_H_
+#pragma once
+
+#include "W3DDevice/GameClient/HeightMap.h"
 
-#include "W3DDevice/GameClient/HeightMap.h"	
-	
 class WBHeightMap : public HeightMapRenderObjClass
-{	
+{
 
 public:
 	WBHeightMap(void);
@@ -46,5 +45,3 @@ class WBHeightMap : public HeightMapRenderObjClass
 	Bool m_drawEntireMap;
 	Bool m_flattenHeights;
 };
-
-#endif  // end __WBHEIGHTMAP_H_
diff --git a/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h b/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h
index be37e85118e..733b31b7f21 100644
--- a/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h
+++ b/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WBPopupSliderButton_H__8B217F41_937B_11D1_8CA3_00A024CDC039__INCLUDED_)
-#define AFX_WBPopupSliderButton_H__8B217F41_937B_11D1_8CA3_00A024CDC039__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // WBPopupSliderButton.h : header file
 //
 
@@ -102,7 +98,7 @@ class PopupSlider : public CWnd
 		constructs the object, calls its create method,
 		and starts it running
 	*/
-	static void New(CWnd* pParentWnd, long kind, 
+	static void New(CWnd* pParentWnd, long kind,
 					PopupSliderOwner *pSliderOwner, long sliderID);
 
 // Attributes
@@ -162,7 +158,7 @@ class PopupSlider : public CWnd
 	CPoint mOrigPt;
 	Bool mSetOrigPt;
 	Bool mEverMoved;
-	
+
 	// for the thumb icon
 	HICON mIcon;
 
@@ -180,5 +176,3 @@ class PopupSlider : public CWnd
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WBPopupSliderButton_H__8B217F41_937B_11D1_8CA3_00A024CDC039__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h b/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h
index 0a68f10a3fd..fe2e8fa0837 100644
--- a/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h
+++ b/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef WHeightMapEdit_H
-#define WHeightMapEdit_H
-
 #include "W3DDevice/GameClient/WorldHeightMap.h"
 
 class DataChunkOutput;
@@ -44,7 +41,7 @@ class CProcessNode
 
 #define MAX_TILES_PER_CLASS 100
 /// Struct in memory.
-typedef struct 
+typedef struct
 {
 #ifdef DEBUG_CRASHING
 	Int forDebugOnly_fileTextureClass;
@@ -56,7 +53,7 @@ typedef struct
 	AsciiString filePath;
 	AsciiString uiName;
 	TileData *tiles[MAX_TILES_PER_CLASS];
-	TerrainType *terrainType;	
+	TerrainType *terrainType;
 } TGlobalTextureClass;
 
 
@@ -69,7 +66,7 @@ class WorldHeightMapEdit : public WorldHeightMap
 	Bool m_warnTooManyBlend;  ///< warning message flag.
 
 	// Texture classes.  There is one texture class for each bitmap read in.
-	// A class may have more than one tile.  For example, if the grass bitmap is 
+	// A class may have more than one tile.  For example, if the grass bitmap is
 	// 128x128, it creates 4 64x64 tiles, so the grass texture class will have 4 tiles.
 	static int m_numGlobalTextureClasses;
 	static TGlobalTextureClass m_globalTextureClasses[NUM_TEXTURE_CLASSES];
@@ -91,10 +88,10 @@ class WorldHeightMapEdit : public WorldHeightMap
 	Int getBlendTileNdxForClass(Int xIndex, Int yIndex, Int textureClass);
 	Int getTextureClassFromNdx(Int tileNdx);
 	void getTexClassNeighbors(Int xIndex, Int yIndex, Int textureClass, Int *pSideCount, Int *pTotalCount);
-	void updateForAdjacentCliffs(Int xIndex, Int yIndex, 
+	void updateForAdjacentCliffs(Int xIndex, Int yIndex,
 								UnsignedByte *pProcessed, TCliffInfo &cliffInfo);
 	Bool adjustForTiling(TCliffInfo &cliffInfo, Real textureWidth);
-	void updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex, 
+	void updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 								Int curTileClass, UnsignedByte *pProcessed=NULL);
 
 public: // construction
@@ -136,7 +133,7 @@ class WorldHeightMapEdit : public WorldHeightMap
 
 	Bool isTexClassUsed(Int textureClass);
 	Int getFirstTile(Int textureClass);
-	
+
 	Bool optimizeTiles(void); ///< Optimizes tile allocations.
 
 	void showTileStatusInfo(void); ///< pops up a dialog box with tile mem usage.
@@ -146,7 +143,7 @@ class WorldHeightMapEdit : public WorldHeightMap
 	Bool selectSimilar(void); ///< Selects any dupicate map objects.
 	Bool selectInvalidTeam(void); ///< Selects any objects with invalid teams.
 
-	Bool resize(Int newXSize, Int newYSize, Int newHeight, Int newBorder, Bool anchorTop, Bool anchorBottom, 
+	Bool resize(Int newXSize, Int newYSize, Int newHeight, Int newBorder, Bool anchorTop, Bool anchorBottom,
 							Bool anchorLeft, Bool anchorRight, Coord3D *pObjOffset);
 	Bool remapTextures(void); ///< returns true if the operation had an effect.
 	void reloadTextures(void); ///< Reloads textures from disk.
@@ -157,7 +154,7 @@ class WorldHeightMapEdit : public WorldHeightMap
 	void dbgVerifyAfterUndo(void); ///< Verifies the structures are still consistent.
 	Bool doCliffAdjustment(Int xIndex, Int yIndex);
 	Bool removeCliffMapping(void);
-	
+
 	Int getNumBoundaries(void) const ;
 	void getBoundary(Int ndx, ICoord2D* border) const;
 	void addBoundary(ICoord2D* boundaryToAdd);
@@ -168,5 +165,3 @@ class WorldHeightMapEdit : public WorldHeightMap
 	// outHandle: 0 means BL, 1 means TL, 2 means TR, 3 means BR
 	void findBoundaryNear(Coord3D *pt, float okDistance, Int *outNdx, Int *outHandle);
 };
-
-#endif
diff --git a/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h b/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h
index 78fc9cf2c40..9cf098f0e37 100644
--- a/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WaterOptions_H__6B56E20C_582E_4132_A251_87902218852C__INCLUDED_)
-#define AFX_WaterOptions_H__6B56E20C_582E_4132_A251_87902218852C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // WaterOptions.h : header file
 //
 #include "WBPopupSlider.h"
@@ -104,5 +100,3 @@ class WaterOptions : public COptionsPanel, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WaterOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/WaterTool.h b/Generals/Code/Tools/WorldBuilder/include/WaterTool.h
index 22788f46df2..075dd466f2b 100644
--- a/Generals/Code/Tools/WorldBuilder/include/WaterTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/WaterTool.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef WaterTool_H
-#define WaterTool_H
-
 #include "PolygonTool.h"
 class WorldHeightMapEdit;
 class MapObject;
@@ -32,16 +29,16 @@ class PolygonTrigger;
 class MovePolygonUndoable;
 /*************************************************************************/
 /**                             WaterTool
-	 Does the add/select water polygon operation. 
+	 Does the add/select water polygon operation.
 ***************************************************************************/
 ///  Select tile tool.
-class WaterTool : public PolygonTool 
+class WaterTool : public PolygonTool
 {
 public:
 	WaterTool(void);
 	~WaterTool(void);
 
-protected: 
+protected:
 	static Bool		m_water_isActive;
 
 	Real	m_currentZ;
@@ -62,6 +59,3 @@ class WaterTool : public PolygonTool
 	void fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 	PolygonTrigger *adjustSpacing(PolygonTrigger *trigger, Real spacing);
 };
-
-
-#endif //WaterTool_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h b/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h
index 6e3890384e9..3a4feaabd36 100644
--- a/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WaypointOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_)
-#define AFX_WaypointOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // WaypointOptions.h : header file
 //
 #include "OptionsPanel.h"
@@ -80,7 +76,7 @@ class WaypointOptions : public COptionsPanel
 	Int									 m_originalHeight;
 protected:
 	void updateTheUI(void);
-	void changeWaypointLabel(Int editControlID, NameKeyType key); 
+	void changeWaypointLabel(Int editControlID, NameKeyType key);
 
 public:
 	static void update(void);
@@ -94,5 +90,3 @@ class WaypointOptions : public COptionsPanel
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WaypointOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h b/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h
index 2434da37f70..5ca7deb3a38 100644
--- a/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h
@@ -22,18 +22,15 @@
 
 #pragma once
 
-#ifndef WAYPOINTTOOL_H
-#define WAYPOINTTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 class MapObject;
 /*************************************************************************/
 /**                             WaypointTool
-	 Does the add/select waypoint operation. 
+	 Does the add/select waypoint operation.
 ***************************************************************************/
 ///  Select tile tool.
-class WaypointTool : public Tool 
+class WaypointTool : public Tool
 {
 public:
 	WaypointTool(void);
@@ -44,7 +41,7 @@ class WaypointTool : public Tool
 	Coord3D m_mouseDownPt;
 	static Bool m_isActive;
 
-protected: 
+protected:
 	MapObject *pickWaypoint(Coord3D loc);
 
 public:
@@ -58,6 +55,3 @@ class WaypointTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual void deactivate(); ///< Become not the current tool.
 };
-
-
-#endif //WAYPOINTTOOL_H
diff --git a/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h b/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h
index 866ccf12ca6..5ea8f22dde8 100644
--- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h
+++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h
@@ -19,12 +19,7 @@
 // WorldBuilder.h : main header file for the WORLDBUILDER application
 //
 
-#if !defined(AFX_WORLDBUILDER_H__FBA41345_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_WORLDBUILDER_H__FBA41345_2826_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #ifndef __AFXWIN_H__
 	#error include 'stdafx.h' before including this file for PCH
@@ -64,7 +59,7 @@
 //
 
 // Force maps into a directory structure.
-#define DO_MAPS_IN_DIRECTORIES 1	
+#define DO_MAPS_IN_DIRECTORIES 1
 
 #define NONE_STRING "<none>"
 
@@ -137,11 +132,10 @@ class CWorldBuilderApp : public CWinApp
 	MapObject					*m_pasteMapObjList;	///< List of copied/cut map objects.
 
 protected:
-	void deletePasteObjList(void) 
-	{ 
-		if (m_pasteMapObjList) 
-			deleteInstance(m_pasteMapObjList); 
-		m_pasteMapObjList = NULL; 
+	void deletePasteObjList(void)
+	{
+		deleteInstance(m_pasteMapObjList);
+		m_pasteMapObjList = NULL;
 	};
 
 public:
@@ -197,5 +191,3 @@ inline CWorldBuilderApp *WbApp() { return (CWorldBuilderApp*)::AfxGetApp(); }
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WORLDBUILDER_H__FBA41345_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h
index 4a58b7a8f21..01f04ea8293 100644
--- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h
+++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h
@@ -20,12 +20,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_WORLDBUILDERDOC_H__FBA4134D_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_WORLDBUILDERDOC_H__FBA4134D_2826_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "Lib/BaseType.h"
 #include "Common/MapObject.h"
@@ -65,7 +60,7 @@ class CWorldBuilderDoc : public CDocument
 	std::vector<ICoord2D> m_boundaries;
 
 protected:	// waypoint stuff.
-	MapObject		*m_waypointTable[MAX_WAYPOINTS];							
+	MapObject		*m_waypointTable[MAX_WAYPOINTS];
 	Bool				m_waypointTableNeedsUpdate;
 	struct {
 		Int waypoint1;
@@ -86,7 +81,7 @@ class CWorldBuilderDoc : public CDocument
 	Bool waypointLinkExists(Int waypointID1, Int waypointID2);
 	Bool isWaypointLinked(MapObject *pWay);
 	void updateLinkedWaypointLabels(MapObject *pWay);
-	
+
 	// Boundary stuff
 	Int getNumBoundaries(void) const ;
 	void getBoundary(Int ndx, ICoord2D* border) const;
@@ -134,10 +129,10 @@ class CWorldBuilderDoc : public CDocument
 
 	/// Gets a real xy location from a pixel point.
 	Bool getCellPositionFromCoord(Coord3D pt,  Coord3D *locP);
-	
+
 	/// Gets all of the indices within widthOutside of the rectangle and places them into
 	/// allIndices
-	Bool getAllIndexesInRect(const Coord3D* bl, const Coord3D* br, 
+	Bool getAllIndexesInRect(const Coord3D* bl, const Coord3D* br,
 													 const Coord3D* tl, const Coord3D* tr,
 													 Int widthOutside, VecHeightMapIndexes* allIndices);
 
@@ -213,5 +208,3 @@ class CWorldBuilderDoc : public CDocument
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WORLDBUILDERDOC_H__FBA4134D_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h
index 1abb3d820bd..822473285ea 100644
--- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h
+++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h
@@ -20,12 +20,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_WORLDBUILDERVIEW_H__FBA4134F_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_WORLDBUILDERVIEW_H__FBA4134F_2826_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "Lib/BaseType.h"
 #include "W3DDevice/GameClient/WorldHeightMap.h"
@@ -90,7 +85,7 @@ class CWorldBuilderView : public WbView
 	void drawContours(CDC *pDc, CRgn *pRgn, Int minX, Int maxX, Int minY, Int maxY);
 
 	/// Compound boolean expression.
-	static inline Bool isBetween(Int cur, Int first, Int second) { 
+	static Bool isBetween(Int cur, Int first, Int second) {
 		Bool is = false;
 		if (cur>=first && cur<=second) is = true;
 		if (cur<=first && cur>=second) is = true;
@@ -101,7 +96,7 @@ class CWorldBuilderView : public WbView
 	void interpolate(CPoint *pt, Int ht, CPoint pt1, Int ht1, CPoint pt2, Int ht2);
 
 	/// Draw the object's icon in the dc at a given point.
-	void drawObjectInView(CDC *pDc, MapObject *pMapObj); 
+	void drawObjectInView(CDC *pDc, MapObject *pMapObj);
 
 public:
 	/// Get the current draw size in pixels in the 2d window of one height map cell.
@@ -161,5 +156,3 @@ class CWorldBuilderView : public WbView
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WORLDBUILDERVIEW_H__FBA4134F_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h b/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h
index 1fd337eeb73..2222f54b993 100644
--- a/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h
+++ b/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ADDPLAYERDIALOG_H__96179004_35C9_436A_A302_A777E77F8F04__INCLUDED_)
-#define AFX_ADDPLAYERDIALOG_H__96179004_35C9_436A_A302_A777E77F8F04__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // addplayerdialog.h : header file
 //
 
@@ -71,5 +67,3 @@ class AddPlayerDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ADDPLAYERDIALOG_H__96179004_35C9_436A_A302_A777E77F8F04__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/brushoptions.h b/Generals/Code/Tools/WorldBuilder/include/brushoptions.h
index 8db0bf20c99..fe9a13b1626 100644
--- a/Generals/Code/Tools/WorldBuilder/include/brushoptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/brushoptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_BRUSHOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
-#define AFX_BRUSHOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // brushoptions.h : header file
 //
 
@@ -97,5 +93,3 @@ class BrushOptions : public COptionsPanel	, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BRUSHOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/euladialog.h b/Generals/Code/Tools/WorldBuilder/include/euladialog.h
index e7d973b6485..87eb399ba1d 100644
--- a/Generals/Code/Tools/WorldBuilder/include/euladialog.h
+++ b/Generals/Code/Tools/WorldBuilder/include/euladialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EULADIALOG_H__9F6A134E_C2A3_425E_8485_F90B1A5F9B58__INCLUDED_)
-#define AFX_EULADIALOG_H__9F6A134E_C2A3_425E_8485_F90B1A5F9B58__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // euladialog.h : header file
 //
 
@@ -60,5 +56,3 @@ class EulaDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EULADIALOG_H__9F6A134E_C2A3_425E_8485_F90B1A5F9B58__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h b/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h
index 2d4b924137e..85796292820 100644
--- a/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h
+++ b/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_MAPOBJECTPROPS_H__44517B9E_12AB_4E2C_B49B_D6BB65C59649__INCLUDED_)
-#define AFX_MAPOBJECTPROPS_H__44517B9E_12AB_4E2C_B49B_D6BB65C59649__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // mapobjectprops.h : header file
 //
 
@@ -65,8 +61,9 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner
 // Implementation
 protected:
 	void getAllSelectedDicts(void);
+	Dict** getAllSelectedDictsData();
 
-	static MapObjectProps *TheMapObjectProps; 
+	static MapObjectProps *TheMapObjectProps;
 
 	Dict* m_dictToEdit;
 	std::vector<Dict*> m_allSelectedDicts;
@@ -127,7 +124,7 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner
 	void _DictToDestructible(void);
 	void _DictToUnsellable(void);
 	void _DictToTargetable(void);
-	
+
 	void _DictToPowered(void);
 	void _DictToAggressiveness(void);
 	void _DictToVisibilityRange(void);
@@ -154,5 +151,3 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MAPOBJECTPROPS_H__44517B9E_12AB_4E2C_B49B_D6BB65C59649__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h b/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h
index 0821f92b062..3ec9c410514 100644
--- a/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h
+++ b/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_PLAYERLISTDLG_H__103B4125_78ED_48A8_9DBB_289DDC6B0208__INCLUDED_)
-#define AFX_PLAYERLISTDLG_H__103B4125_78ED_48A8_9DBB_289DDC6B0208__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // playerlistdlg.h : header file
 //
 
@@ -88,5 +84,3 @@ class PlayerListDlg : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PLAYERLISTDLG_H__103B4125_78ED_48A8_9DBB_289DDC6B0208__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/propedit.h b/Generals/Code/Tools/WorldBuilder/include/propedit.h
index 97fd362b6b2..34c9c0beaae 100644
--- a/Generals/Code/Tools/WorldBuilder/include/propedit.h
+++ b/Generals/Code/Tools/WorldBuilder/include/propedit.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_PROPEDIT_H__93C02F45_592B_4CFD_A092_7445559D26EB__INCLUDED_)
-#define AFX_PROPEDIT_H__93C02F45_592B_4CFD_A092_7445559D26EB__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // propedit.h : header file
 //
 
@@ -73,5 +69,3 @@ class PropEdit : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROPEDIT_H__93C02F45_592B_4CFD_A092_7445559D26EB__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h b/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h
index 96c6fd2346e..536bcd4ac7d 100644
--- a/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h
+++ b/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TEAMSDIALOG_H__1410F415_1597_4EAF_AE0B_42DACDEB35B9__INCLUDED_)
-#define AFX_TEAMSDIALOG_H__1410F415_1597_4EAF_AE0B_42DACDEB35B9__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // teamsdialog.h : header file
 //
 
@@ -97,5 +93,3 @@ class CTeamsDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TEAMSDIALOG_H__1410F415_1597_4EAF_AE0B_42DACDEB35B9__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/wbview.h b/Generals/Code/Tools/WorldBuilder/include/wbview.h
index 9ff305cc977..9b8a879c2cd 100644
--- a/Generals/Code/Tools/WorldBuilder/include/wbview.h
+++ b/Generals/Code/Tools/WorldBuilder/include/wbview.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WBVIEW_H__875234A1_8815_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_WBVIEW_H__875234A1_8815_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "Lib/BaseType.h"
 #include "Tool.h"
@@ -98,7 +93,7 @@ class WbView : public CView
 
 	virtual Bool viewToDocCoords(CPoint curPt, Coord3D *newPt, Bool constrained=true) { DEBUG_CRASH(("should not call")); newPt->zero(); return false; }
 	virtual Bool docToViewCoords(Coord3D curPt, CPoint* newPt) { DEBUG_CRASH(("should not call")); return false; }
- 
+
 	virtual Bool viewToDocCoordZ(CPoint curPt, Coord3D *newPt, Real Z) { return viewToDocCoords(curPt, newPt, false); }
 
 	/// Set the center for display.
@@ -245,5 +240,3 @@ class WbView : public CView
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WBVIEW_H__875234A1_8815_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/include/wbview3d.h b/Generals/Code/Tools/WorldBuilder/include/wbview3d.h
index 63006b13ce9..f1f38c74c07 100644
--- a/Generals/Code/Tools/WorldBuilder/include/wbview3d.h
+++ b/Generals/Code/Tools/WorldBuilder/include/wbview3d.h
@@ -20,12 +20,8 @@
 // Class to encapsulate height map.
 // Author: Steven Johnson, Aug 2001
 
-#if !defined(AFX_WBVIEW3D_H__832D8241_87F6_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_WBVIEW3D_H__832D8241_87F6_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // wbview3d.h : header file
 //
 
@@ -39,7 +35,7 @@
 #include "dx8wrapper.h"
 
 //#include "GameLogic/Module/BodyModule.h" -- Yikes... not necessary to include this! (KM)
-enum BodyDamageType; //Ahhhh much better!
+enum BodyDamageType CPP_11(: Int); //Ahhhh much better!
 
 class WorldHeightMap;
 class LayerClass;
@@ -247,7 +243,7 @@ class WbView3d : public WbView, public DX8_CleanupHook
 	virtual void scrollInView(Real x, Real y, Bool end);
 
 	virtual void setDefaultCamera();
-	virtual void rotateCamera(Real delta);	 
+	virtual void rotateCamera(Real delta);
 	virtual void pitchCamera(Real delta);
 	void setCameraPitch(Real absolutePitch);
 	Real getCameraPitch(void);
@@ -275,7 +271,7 @@ class WbView3d : public WbView, public DX8_CleanupHook
 	AsciiString getModelNameAndScale(MapObject *pMapObj, Real *scale, BodyDamageType curDamageState);
 
 	virtual Int getPickPixels(void) {return m_pickPixels;}
-	virtual Bool viewToDocCoordZ(CPoint curPt, Coord3D *newPt, Real Z); 
+	virtual Bool viewToDocCoordZ(CPoint curPt, Coord3D *newPt, Real Z);
 public:
 
 //	void init(CWorldBuilderView *pMainView, HINSTANCE hInstance, CWnd* parent);
@@ -304,5 +300,3 @@ inline Bool WbView3d::getShowWireframe() { return m_showWireframe; }
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WBVIEW3D_H__832D8241_87F6_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/Generals/Code/Tools/WorldBuilder/res/resource.h b/Generals/Code/Tools/WorldBuilder/res/resource.h
index 31232072635..af7dd6d8432 100644
--- a/Generals/Code/Tools/WorldBuilder/res/resource.h
+++ b/Generals/Code/Tools/WorldBuilder/res/resource.h
@@ -691,7 +691,7 @@
 #define IDS_EULA_AGREEMENT5             61480
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
diff --git a/Generals/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp b/Generals/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp
index 750e5bab2dd..7e33d0fda6e 100644
--- a/Generals/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "AutoEdgeOutTool.h"
@@ -34,17 +34,17 @@
 //
 /// Constructor
 AutoEdgeOutTool::AutoEdgeOutTool(void) :
-	Tool(ID_AUTO_EDGE_OUT_TOOL, IDC_AUTO_EDGE_OUT) 
+	Tool(ID_AUTO_EDGE_OUT_TOOL, IDC_AUTO_EDGE_OUT)
 {
 }
-	
+
 /// Destructor
-AutoEdgeOutTool::~AutoEdgeOutTool(void) 
+AutoEdgeOutTool::~AutoEdgeOutTool(void)
 {
 }
 
 /// Shows the brush options panel.
-void AutoEdgeOutTool::activate() 
+void AutoEdgeOutTool::activate()
 {
 	Tool::activate();
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_BLEND_MATERIAL);
@@ -53,7 +53,7 @@ void AutoEdgeOutTool::activate()
 
 /** Execute the tool on mouse down - Create a copy of the height map
 * to edit, blend the edges, and give the undoable command to the doc. */
-void AutoEdgeOutTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void AutoEdgeOutTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/BaseBuildProps.cpp b/Generals/Code/Tools/WorldBuilder/src/BaseBuildProps.cpp
index a1f19bb2278..cd7adaf8f3d 100644
--- a/Generals/Code/Tools/WorldBuilder/src/BaseBuildProps.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/BaseBuildProps.cpp
@@ -66,14 +66,14 @@ BOOL BaseBuildProps::OnInitDialog()
 	// add health
 	CWnd* pHealth = GetDlgItem(IDC_MAPOBJECT_StartingHealthEdit);
 	static char buff[12];
-	sprintf(buff, "%d", m_health);
+	snprintf(buff, ARRAY_SIZE(buff), "%d", m_health);
 	pHealth->SetWindowText(buff);
 
 	CButton* pItem;
 	pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Unsellable);
 	if (pItem) {
 		pItem->SetCheck(m_unsellable);
-	}	
+	}
 
 	return TRUE;
 }
@@ -94,7 +94,7 @@ void BaseBuildProps::setProps(AsciiString name, AsciiString script, Int health,
 	m_unsellable = unsellable;
 }
 
-void BaseBuildProps::OnOK() 
+void BaseBuildProps::OnOK()
 {
 	CComboBox *combo;
 	CWnd* edit;
@@ -104,7 +104,7 @@ void BaseBuildProps::OnOK()
 	edit = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Name);
 	edit->GetWindowText(buf, sizeof(buf)-2);
 	m_name = AsciiString(buf);
-	
+
 	combo = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Script);
 	combo->GetWindowText(buf, sizeof(buf)-2);
 	m_script = AsciiString(buf);
diff --git a/Generals/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp b/Generals/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp
index dd728560f61..4132ba96971 100644
--- a/Generals/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "BlendEdgeTool.h"
@@ -34,18 +34,18 @@
 //
 /// Constructor
 BlendEdgeTool::BlendEdgeTool(void) :
-	Tool(ID_BLEND_EDGE_TOOL, IDC_BLEND_EDGE) 
+	Tool(ID_BLEND_EDGE_TOOL, IDC_BLEND_EDGE)
 {
 }
-	
+
 /// Destructor
-BlendEdgeTool::~BlendEdgeTool(void) 
+BlendEdgeTool::~BlendEdgeTool(void)
 {
 }
 
 
 /** Execute the tool on mouse down - Place an object. */
-void BlendEdgeTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void BlendEdgeTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	Coord3D cpt;
 	pView->viewToDocCoords(viewPt, &cpt);
@@ -54,10 +54,10 @@ void BlendEdgeTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWo
 }
 
 /** Execute the tool on mouse up - Blend an edge.  Left mouse blends the from
-texture to the to texture based on your drag. Right mouse blends the 
-foreground texture in the texture panel on top of the destination tile for 
+texture to the to texture based on your drag. Right mouse blends the
+foreground texture in the texture panel on top of the destination tile for
 custom blends. */
-void BlendEdgeTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void BlendEdgeTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	CPoint from, to;
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/BlendMaterial.cpp b/Generals/Code/Tools/WorldBuilder/src/BlendMaterial.cpp
index e125f865ad9..28484783752 100644
--- a/Generals/Code/Tools/WorldBuilder/src/BlendMaterial.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/BlendMaterial.cpp
@@ -29,7 +29,7 @@
 #include "WorldBuilderDoc.h"
 #include "TileTool.h"
 #include "Common/TerrainTypes.h"
-#include "W3DDevice/GameClient/TerrainTex.h"	  
+#include "W3DDevice/GameClient/TerrainTex.h"
 
 BlendMaterial *BlendMaterial::m_staticThis = NULL;
 
@@ -67,7 +67,7 @@ END_MESSAGE_MAP()
 // BlendMaterial data access method.
 
 /// Set foreground texture and invalidate swatches.
-void BlendMaterial::setBlendTexClass(Int texClass) 
+void BlendMaterial::setBlendTexClass(Int texClass)
 {
 	if (m_staticThis) {
 		m_staticThis->m_currentBlendTexture=texClass;
@@ -88,7 +88,7 @@ Bool BlendMaterial::setTerrainTreeViewSelection(HTREEITEM parent, Int selection)
 		item.mask = TVIF_HANDLE|TVIF_PARAM;
 		item.hItem = child;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_terrainTreeView.GetItem(&item);
 		if (item.lParam == selection) {
 			m_terrainTreeView.SelectItem(child);
@@ -107,7 +107,7 @@ Bool BlendMaterial::setTerrainTreeViewSelection(HTREEITEM parent, Int selection)
 // BlendMaterial message handlers
 
 /// Setup the controls in the dialog.
-BOOL BlendMaterial::OnInitDialog() 
+BOOL BlendMaterial::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -148,7 +148,7 @@ HTREEITEM BlendMaterial::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_terrainTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -163,7 +163,7 @@ HTREEITEM BlendMaterial::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = const_cast<char*>(pLabel);
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_terrainTreeView.InsertItem(&ins);
 	return(child);
 }
@@ -191,26 +191,22 @@ void BlendMaterial::addTerrain(const char *pPath, Int terrainNdx, HTREEITEM pare
 		}
 
 		// set the name in the tree view to that of the entry
-		strcpy( buffer, terrain->getName().str() );
+		strlcpy(buffer, terrain->getName().str(), ARRAY_SIZE(buffer));
 
 		doAdd = TRUE;
 	} else if (terrainNdx==-1) {
-		strcpy(buffer, pPath);
+		strlcpy(buffer, pPath, ARRAY_SIZE(buffer));
 		doAdd = true;
 	} else if (WorldHeightMapEdit::getTexClassIsBlendEdge(terrainNdx)) {
 		parent = findOrAdd( parent, "**EVAL**" );
-		strcpy(buffer, pPath);
+		strlcpy(buffer, pPath, ARRAY_SIZE(buffer));
 		doAdd = true;
-	}  // end if
+	}
 
 //	Int tilesPerRow = TEXTURE_WIDTH/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
 //	Int availableTiles = 4 * tilesPerRow * tilesPerRow;
 //	Int percent = (WorldHeightMapEdit::getTexClassNumTiles(terrainNdx)*100 + availableTiles/2) / availableTiles;
 
-	char label[_MAX_PATH];
-	sprintf(label, "%s", buffer);
-
-
 	if( doAdd )
 	{
 		TVINSERTSTRUCT ins;
@@ -220,8 +216,8 @@ void BlendMaterial::addTerrain(const char *pPath, Int terrainNdx, HTREEITEM pare
 		ins.hInsertAfter = TVI_LAST;
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = terrainNdx;
-		ins.item.pszText = label;
-		ins.item.cchTextMax = strlen(label)+2;				
+		ins.item.pszText = buffer;
+		ins.item.cchTextMax = strlen(buffer)+2;
 		m_terrainTreeView.InsertItem(&ins);
 	}
 
@@ -239,18 +235,18 @@ void BlendMaterial::updateTextures(void)
 	for (i=WorldHeightMapEdit::getNumTexClasses()-1; i>=0; i--) {
 		char path[_MAX_PATH];
 		AsciiString uiName = WorldHeightMapEdit::getTexClassUiName(i);
-		strncpy(path, uiName.str(), _MAX_PATH-2);
+		strlcpy(path, uiName.str(), _MAX_PATH);
 		addTerrain(path, i, TVI_ROOT);
 	}
 	m_updating = false;
 	m_currentBlendTexture = defaultMaterialIndex;
-	setTerrainTreeViewSelection(TVI_ROOT, m_currentBlendTexture);	
+	setTerrainTreeViewSelection(TVI_ROOT, m_currentBlendTexture);
 }
 
 
 
 
-BOOL BlendMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL BlendMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_terrainTreeView.m_hWnd) {
@@ -282,6 +278,6 @@ BOOL BlendMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			}
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/BorderTool.cpp b/Generals/Code/Tools/WorldBuilder/src/BorderTool.cpp
index a4f23b7f309..ad4495ef71c 100644
--- a/Generals/Code/Tools/WorldBuilder/src/BorderTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/BorderTool.cpp
@@ -27,9 +27,9 @@
 
 const long BOUNDARY_PICK_DISTANCE = 5.0f;
 
-BorderTool::BorderTool() : Tool(ID_BORDERTOOL, IDC_POINTER), 
+BorderTool::BorderTool() : Tool(ID_BORDERTOOL, IDC_POINTER),
 													 m_mouseDown(false),
-													 m_addingNewBorder(false), 
+													 m_addingNewBorder(false),
 													 m_modifyBorderNdx(-1)
 
 { }
@@ -93,15 +93,15 @@ void BorderTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 		switch (m_modificationType)
 		{
 			case MOD_TYPE_INVALID: m_modifyBorderNdx = -1; return;
-			case MOD_TYPE_UP:	
-				currentBorder.y = REAL_TO_INT((new3DPoint.y / MAP_XY_FACTOR) + 0.5f); 
+			case MOD_TYPE_UP:
+				currentBorder.y = REAL_TO_INT((new3DPoint.y / MAP_XY_FACTOR) + 0.5f);
 				break;
-			case MOD_TYPE_RIGHT: 
-				currentBorder.x = REAL_TO_INT((new3DPoint.x / MAP_XY_FACTOR) + 0.5f); 
+			case MOD_TYPE_RIGHT:
+				currentBorder.x = REAL_TO_INT((new3DPoint.x / MAP_XY_FACTOR) + 0.5f);
 				break;
-			case MOD_TYPE_FREE: 
-				currentBorder.x = REAL_TO_INT((new3DPoint.x / MAP_XY_FACTOR) + 0.5f); 
-				currentBorder.y = REAL_TO_INT((new3DPoint.y / MAP_XY_FACTOR) + 0.5f); 
+			case MOD_TYPE_FREE:
+				currentBorder.x = REAL_TO_INT((new3DPoint.x / MAP_XY_FACTOR) + 0.5f);
+				currentBorder.y = REAL_TO_INT((new3DPoint.y / MAP_XY_FACTOR) + 0.5f);
 				break;
 		}
 
@@ -125,12 +125,12 @@ void BorderTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 	}
 
 	static Coord3D zero = {0.0f, 0.0f, 0.0f};
-	
+
 	Coord3D groundPt;
 	pView->viewToDocCoords(viewPt, &groundPt);
 	if (groundPt.length() < BOUNDARY_PICK_DISTANCE) {
 		m_addingNewBorder = true;
-		
+
 		ICoord2D initialBoundary = { 1, 1 };
 		pDoc->addBoundary(&initialBoundary);
 		return;
diff --git a/Generals/Code/Tools/WorldBuilder/src/BrushTool.cpp b/Generals/Code/Tools/WorldBuilder/src/BrushTool.cpp
index 0c72781ac34..e3017bdaa7d 100644
--- a/Generals/Code/Tools/WorldBuilder/src/BrushTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/BrushTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "BrushTool.h"
@@ -42,7 +42,7 @@ Int BrushTool::m_brushHeight;
 
 
 
-/// Constructor 
+/// Constructor
 BrushTool::BrushTool(void) :
 	Tool(ID_BRUSH_TOOL, IDC_BRUSH_CROSS)
 {
@@ -54,17 +54,17 @@ BrushTool::BrushTool(void) :
 	m_brushHeight = 0;
 	m_brushSquare = false;
 }
-	
+
 /// Destructor
-BrushTool::~BrushTool(void) 
+BrushTool::~BrushTool(void)
 {
 	REF_PTR_RELEASE(m_htMapEditCopy);
 	REF_PTR_RELEASE(m_htMapFeatherCopy);
 }
 
 /// Set the brush height and notify the height options panel of the change.
-void BrushTool::setHeight(Int height) 
-{ 
+void BrushTool::setHeight(Int height)
+{
 	if (m_brushHeight != height) {
 		m_brushHeight = height;
 		// notify height palette options panel
@@ -73,8 +73,8 @@ void BrushTool::setHeight(Int height)
 };
 
 /// Set the brush width and notify the height options panel of the change.
-void BrushTool::setWidth(Int width) 
-{ 
+void BrushTool::setWidth(Int width)
+{
 	if (m_brushWidth != width) {
 		m_brushWidth = width;
 		// notify brush palette options panel
@@ -84,8 +84,8 @@ void BrushTool::setWidth(Int width)
 };
 
 /// Set the brush feather and notify the height options panel of the change.
-void BrushTool::setFeather(Int feather) 
-{ 
+void BrushTool::setFeather(Int feather)
+{
 	if (m_brushFeather != feather) {
 		m_brushFeather = feather;
 		// notify height palette options panel
@@ -95,7 +95,7 @@ void BrushTool::setFeather(Int feather)
 };
 
 /// Shows the brush options panel.
-void BrushTool::activate() 
+void BrushTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_BRUSH_OPTIONS);
 	DrawObject::setDoBrushFeedback(true);
@@ -105,7 +105,7 @@ void BrushTool::activate()
 /// Start tool.
 /** Setup the tool to start brushing - make a copy of the height map
 to edit, another copy because we need it :), and call mouseMovedDown. */
-void BrushTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void BrushTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -121,9 +121,9 @@ void BrushTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 }
 
 /// End tool.
-/** Finish the tool operation - create a command, pass it to the 
+/** Finish the tool operation - create a command, pass it to the
 doc to execute, and cleanup ref'd objects. */
-void BrushTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void BrushTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -168,7 +168,7 @@ void BrushTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 		if (i<0 || i>=m_htMapEditCopy->getXExtent()) {
 			continue;
 		}
-		for (j=ndx.y-sub; j<ndx.y+add; j++) {					
+		for (j=ndx.y-sub; j<ndx.y+add; j++) {
 			if (j<0 || j>=m_htMapEditCopy->getYExtent()) {
 				continue;
 			}
diff --git a/Generals/Code/Tools/WorldBuilder/src/BuildList.cpp b/Generals/Code/Tools/WorldBuilder/src/BuildList.cpp
index c194295c2ca..3b677d78e54 100644
--- a/Generals/Code/Tools/WorldBuilder/src/BuildList.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/BuildList.cpp
@@ -94,7 +94,7 @@ END_MESSAGE_MAP()
 // BuildList message handlers
 
 /// Setup the controls in the dialog.
-BOOL BuildList::OnInitDialog() 
+BOOL BuildList::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -113,11 +113,11 @@ BOOL BuildList::OnInitDialog()
 }
 
 /// Load the sides in the sides list.
-void BuildList::loadSides(void) 
+void BuildList::loadSides(void)
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_SIDES_COMBO);
 	if (!pCombo) {
-		DEBUG_LOG(("*** BuildList::loadSides Missing resource!!!\n"));
+		DEBUG_LOG(("*** BuildList::loadSides Missing resource!!!"));
 		return;
 	}
 	pCombo->ResetContent();
@@ -137,14 +137,14 @@ void BuildList::loadSides(void)
 }
 
 /// Updates the current side, loading it's build list.
-void BuildList::updateCurSide(void) 
+void BuildList::updateCurSide(void)
 {
 	if (TheSidesList->getNumSides() < 1)
 		return;
 
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_SIDES_COMBO);
 	if (!pCombo) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!!\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!!"));
 		return;
 	}
 	if (m_curSide<0 || m_curSide >= TheSidesList->getNumSides()) {
@@ -153,32 +153,32 @@ void BuildList::updateCurSide(void)
 	if (pCombo->GetCurSel() != m_curSide) {
 		pCombo->SetCurSel(m_curSide);
 	}
-	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	if (!pList) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST"));
 		return;
 	}
 	pList->ResetContent();
-	
+
 	BuildListInfo *pBuild = pSide->getBuildList();
 	while (pBuild) {
-		const char *pName = pBuild->getTemplateName().str(); 
+		const char *pName = pBuild->getTemplateName().str();
 		pList->AddString(pName);
 		pBuild = pBuild->getNext();
 	}
 	OnSelchangeBuildList();
 }
 
-void BuildList::OnSelchangeSidesCombo() 
+void BuildList::OnSelchangeSidesCombo()
 {
 	if (TheSidesList->getNumSides() < 1)
 		return;
 
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_SIDES_COMBO);
 	if (!pCombo) {
-		DEBUG_LOG(("*** BuildList::OnSelchangeSidesCombo Missing resource!!!\n"));
+		DEBUG_LOG(("*** BuildList::OnSelchangeSidesCombo Missing resource!!!"));
 		return;
 	}
 
@@ -191,14 +191,14 @@ void BuildList::OnSelchangeSidesCombo()
 		}
 		OnSelchangeBuildList();
 	}
-	
+
 }
 
-void BuildList::OnMoveUp() 
+void BuildList::OnMoveUp()
 {
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	if (!pList) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST"));
 		return;
 	}
 	m_curBuildList = pList->GetCurSel();
@@ -216,7 +216,7 @@ void BuildList::OnMoveUp()
 		if (pBuildInfo == NULL) return;
 	}
 	Int newSel = m_curBuildList-1;
-	pSide->reorderInBuildList(pBuildInfo, newSel); 
+	pSide->reorderInBuildList(pBuildInfo, newSel);
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	SidesListUndoable *pUndo = new SidesListUndoable(sides, pDoc);
 	pDoc->AddAndDoUndoable(pUndo);
@@ -227,11 +227,11 @@ void BuildList::OnMoveUp()
 	OnSelchangeBuildList();
 }
 
-void BuildList::OnMoveDown() 
+void BuildList::OnMoveDown()
 {
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	if (!pList) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST"));
 		return;
 	}
 	if (m_curBuildList < 0) return;
@@ -248,12 +248,12 @@ void BuildList::OnMoveDown()
 		if (pBuildInfo == NULL) return;
 	}
 	if (pBuildInfo->getNext() == NULL) {
-		// there isn't one to move down after. 
+		// there isn't one to move down after.
 		return;
 	}
 	Int newSel = m_curBuildList+1;
 
-	pSide->reorderInBuildList(pBuildInfo, newSel); 
+	pSide->reorderInBuildList(pBuildInfo, newSel);
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	SidesListUndoable *pUndo = new SidesListUndoable(sides, pDoc);
 	pDoc->AddAndDoUndoable(pUndo);
@@ -263,7 +263,7 @@ void BuildList::OnMoveDown()
 	OnSelchangeBuildList();
 }
 
-void BuildList::OnAddBuilding() 
+void BuildList::OnAddBuilding()
 {
 	BuildListTool::addBuilding();
 }
@@ -301,7 +301,7 @@ void BuildList::setSelectedBuildList(BuildListInfo *pInfo)
 	}
 	Int i;
  	for (i=0; i<TheSidesList->getNumSides(); i++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(i);
 		Int listSel = 0;
 		for (BuildListInfo *pBuild = pSide->getBuildList(); pBuild; pBuild = pBuild->getNext()) {
 			if (pInfo == pBuild) {
@@ -323,19 +323,19 @@ void BuildList::setSelectedBuildList(BuildListInfo *pInfo)
 };
 
 
-void BuildList::OnSelchangeBuildList() 
+void BuildList::OnSelchangeBuildList()
 {
 	if (TheSidesList->getNumSides() < 1)
 		return;
 
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	if (!pList) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST"));
 		return;
 	}
 	m_curBuildList = pList->GetCurSel();
 	Int numBL = pList->GetCount();
-	
+
 	SidesInfo *pSide = NULL;
 	if (TheSidesList) {
 		pSide = TheSidesList->getSideInfo(m_curSide);
@@ -363,7 +363,7 @@ void BuildList::OnSelchangeBuildList()
 
 	// add up energy consumed/produced by objects on the map
 	const ThingTemplate *thingTemplate;
-	for (MapObject *pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+	for (MapObject *pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
 		// get thing template based from map object name
 		thingTemplate = pMapObj->getThingTemplate();
@@ -419,7 +419,7 @@ void BuildList::OnSelchangeBuildList()
 	{
 		energyUsed = 1.0f;
 	}
-	//DEBUG_LOG(("Energy: %d/%d - %g\n", energyConsumption, energyProduction, energyUsed));
+	//DEBUG_LOG(("Energy: %d/%d - %g", energyConsumption, energyProduction, energyUsed));
 	CProgressCtrl *progressWnd = (CProgressCtrl *)GetDlgItem(IDC_POWER);
 	if (progressWnd)
 	{
@@ -449,16 +449,16 @@ void BuildList::OnSelchangeBuildList()
 	PointerTool::clearSelection(); // unselect other stuff.
 	if (pBuildInfo) {
 		CWnd *edit;
-		static char buff[12];
+		static char buff[32];
 		pBuildInfo->setSelected(true);
 
 		m_angle = pBuildInfo->getAngle() * 180/PI;
-		sprintf(buff, "%0.2f", m_angle);
+		snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_angle);
 		edit = GetDlgItem(IDC_MAPOBJECT_Angle);
 		edit->SetWindowText(buff);
 
 		m_height = pBuildInfo->getLocation()->z;
-		sprintf(buff, "%0.2f", m_height);
+		snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_height);
 		edit = GetDlgItem(IDC_MAPOBJECT_ZOffset);
 		edit->SetWindowText(buff);
 
@@ -481,14 +481,14 @@ void BuildList::OnSelchangeBuildList()
 
 }
 
-void BuildList::OnAlreadyBuild() 
+void BuildList::OnAlreadyBuild()
 {
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	if (!pList) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST"));
 		return;
 	}
-	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 	m_curBuildList = pList->GetCurSel();
 	if (m_curBuildList < 0) return;
 	Int count = m_curBuildList;
@@ -504,11 +504,11 @@ void BuildList::OnAlreadyBuild()
 	}
 }
 
-void BuildList::OnDeleteBuilding() 
+void BuildList::OnDeleteBuilding()
 {
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	if (!pList) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST"));
 		return;
 	}
 	m_curBuildList = pList->GetCurSel();
@@ -524,7 +524,7 @@ void BuildList::OnDeleteBuilding()
 		pBuildInfo = pBuildInfo->getNext();
 		if (pBuildInfo == NULL) return;
 	}
-	pSide->removeFromBuildList(pBuildInfo); 
+	pSide->removeFromBuildList(pBuildInfo);
 
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	SidesListUndoable *pUndo = new SidesListUndoable(sides, pDoc);
@@ -536,7 +536,7 @@ void BuildList::OnDeleteBuilding()
 	pList->SetCurSel(-1);
 }
 
-void BuildList::OnSelendokRebuilds() 
+void BuildList::OnSelendokRebuilds()
 {
 	CComboBox *pCombo = (CComboBox *)GetDlgItem(IDC_REBUILDS);
 	if (pCombo==NULL) return;
@@ -547,8 +547,8 @@ void BuildList::OnSelendokRebuilds()
 		nr = BuildListInfo::UNLIMITED_REBUILDS;
 	} else if (sel<6) {
 		nr = sel;
-	} 
-	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+	}
+	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 	if (m_curBuildList < 0) return;
 	Int count = m_curBuildList;
 	BuildListInfo *pBuildInfo = pSide->getBuildList();
@@ -560,7 +560,7 @@ void BuildList::OnSelendokRebuilds()
 	pBuildInfo->setNumRebuilds(nr);
 }
 
-void BuildList::OnEditchangeRebuilds() 
+void BuildList::OnEditchangeRebuilds()
 {
 	CComboBox *pCombo = (CComboBox *)GetDlgItem(IDC_REBUILDS);
 	if (pCombo==NULL) return;
@@ -572,7 +572,7 @@ void BuildList::OnEditchangeRebuilds()
 		Int nr;
 		if (1==sscanf(buffer, "%d", &nr)) {
 		}
-			SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+			SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 			if (m_curBuildList < 0) return;
 			Int count = m_curBuildList;
 			BuildListInfo *pBuildInfo = pSide->getBuildList();
@@ -585,9 +585,9 @@ void BuildList::OnEditchangeRebuilds()
 	}
 }
 
-void BuildList::OnDblclkBuildList() 
+void BuildList::OnDblclkBuildList()
 {
-	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	m_curBuildList = pList->GetCurSel();
 	if (m_curBuildList < 0) return;
@@ -631,18 +631,18 @@ void BuildList::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, lo
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void BuildList::PopSliderChanged(const long sliderID, long theVal)
 {
 //	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	CWnd* edit;
-	static char buff[12];
+	static char buff[32];
 	switch (sliderID) {
 		case IDC_HEIGHT_POPUP:
 			m_height = theVal;
-			sprintf(buff, "%0.2f", m_height);
+			snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_height);
 			edit = GetDlgItem(IDC_MAPOBJECT_ZOffset);
 			edit->SetWindowText(buff);
 			OnChangeZOffset();
@@ -650,7 +650,7 @@ void BuildList::PopSliderChanged(const long sliderID, long theVal)
 
 		case IDC_ANGLE_POPUP:
 			m_angle = theVal;
-			sprintf(buff, "%0.2f", m_angle);
+			snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_angle);
 			edit = GetDlgItem(IDC_MAPOBJECT_Angle);
 			edit->SetWindowText(buff);
 			break;
@@ -659,7 +659,7 @@ void BuildList::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void BuildList::PopSliderFinished(const long sliderID, long theVal)
@@ -673,11 +673,11 @@ void BuildList::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
-void BuildList::OnChangeZOffset() 
+void BuildList::OnChangeZOffset()
 {
 	Real value = 0.0f;
 	CWnd* edit = GetDlgItem(IDC_MAPOBJECT_ZOffset);
@@ -688,7 +688,7 @@ void BuildList::OnChangeZOffset()
 	}
 	m_height = value;
 
-	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	m_curBuildList = pList->GetCurSel();
 	if (m_curBuildList < 0) return;
@@ -706,7 +706,7 @@ void BuildList::OnChangeZOffset()
 	p3View->invalBuildListItemInView(pBuildInfo);
 }
 
-void BuildList::OnChangeAngle() 
+void BuildList::OnChangeAngle()
 {
 	Real angle = 0.0f;
 	CWnd* edit = GetDlgItem(IDC_MAPOBJECT_Angle);
@@ -716,7 +716,7 @@ void BuildList::OnChangeAngle()
 		angle = atof(cstr);
 	}
 	m_angle = angle;
-	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	m_curBuildList = pList->GetCurSel();
 	if (m_curBuildList < 0) return;
@@ -732,47 +732,37 @@ void BuildList::OnChangeAngle()
 	p3View->invalBuildListItemInView(pBuildInfo);
 }
 
-void BuildList::OnExport() 
+void BuildList::OnExport()
 {
 	static FILE *theLogFile = NULL;
 	Bool open = false;
 	try {
-		char dirbuf[ _MAX_PATH ];
-		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
-		char *pEnd = dirbuf + strlen( dirbuf );
-		while( pEnd != dirbuf ) 
+		char buffer[ _MAX_PATH ];
+		::GetModuleFileName( NULL, buffer, sizeof( buffer ) );
+		if (char *pEnd = strrchr(buffer, '\\'))
 		{
-			if( *pEnd == '\\' ) 
-			{
-				*(pEnd + 1) = 0;
-				break;
-			}
-			pEnd--;
+			*(pEnd + 1) = 0;
 		}
 
-		char curbuf[ _MAX_PATH ];
-
-		strcpy(curbuf, dirbuf);
-		SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 		Dict *d = TheSidesList->getSideInfo(m_curSide)->getDict();
 		AsciiString name = d->getAsciiString(TheKey_playerName);
-		strcat(curbuf, name.str());
-		strcat(curbuf, "_BuildList");
-		strcat(curbuf, ".ini");
+		strlcat(buffer, name.str(), ARRAY_SIZE(buffer));
+		strlcat(buffer, "_BuildList.ini", ARRAY_SIZE(buffer));
 
-		theLogFile = fopen(curbuf, "w");
+		theLogFile = fopen(buffer, "w");
 		if (theLogFile == NULL)
 			throw;
 
 		AsciiString tmplname = d->getAsciiString(TheKey_playerFaction);
 		const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(tmplname));
-		DEBUG_ASSERTCRASH(pt != NULL, ("PlayerTemplate %s not found -- this is an obsolete map (please open and resave in WB)\n",tmplname.str()));
-		
+		DEBUG_ASSERTCRASH(pt != NULL, ("PlayerTemplate %s not found -- this is an obsolete map (please open and resave in WB)",tmplname.str()));
+
 		fprintf(theLogFile, ";Skirmish AI Build List\n");
 		fprintf(theLogFile, "SkirmishBuildList %s\n", pt->getSide().str());
 
 		open = true;
-		
+
 		BuildListInfo *pBuildInfo = pSide->getBuildList();
 		while (pBuildInfo) {
 			fprintf(theLogFile, "  Structure %s\n", pBuildInfo->getTemplateName().str());
@@ -795,5 +785,5 @@ void BuildList::OnExport()
 			fclose(theLogFile);
 		}
 	}
-	
+
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/BuildListTool.cpp b/Generals/Code/Tools/WorldBuilder/src/BuildListTool.cpp
index db414923f26..aa520a4105e 100644
--- a/Generals/Code/Tools/WorldBuilder/src/BuildListTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/BuildListTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "BuildListTool.h"
@@ -44,7 +44,7 @@ PickUnitDialog* BuildListTool::m_static_pickBuildingDlg = NULL;
 
 /// Constructor
 BuildListTool::BuildListTool(void) :
-	Tool(ID_BUILD_LIST_TOOL, IDC_BUILD_LIST_TOOL), 
+	Tool(ID_BUILD_LIST_TOOL, IDC_BUILD_LIST_TOOL),
 	m_rotateCursor(NULL),
 	m_pointerCursor(NULL),
 	m_moveCursor(NULL),
@@ -52,9 +52,9 @@ BuildListTool::BuildListTool(void) :
 {
 	m_curObject = NULL;
 }
-	
+
 /// Destructor
-BuildListTool::~BuildListTool(void) 
+BuildListTool::~BuildListTool(void)
 {
 }
 
@@ -88,7 +88,7 @@ Bool BuildListTool::isDoingAdd(void)
 }
 
 /// Shows the object options panel.
-void BuildListTool::addBuilding() 
+void BuildListTool::addBuilding()
 {
 	//PickUnitDialog dlg;
 	//dlg.SetAllowableType(ES_STRUCTURE);
@@ -100,7 +100,7 @@ void BuildListTool::addBuilding()
 }
 
 /// Shows the object options panel.
-void BuildListTool::activate() 
+void BuildListTool::activate()
 {
 	Bool wasActive = m_isActive;
 	m_isActive = true;
@@ -120,7 +120,7 @@ void BuildListTool::activate()
 }
 
 /// Clears the isActive flag.
-void BuildListTool::deactivate() 
+void BuildListTool::deactivate()
 {
 	m_isActive = false;
 	WbView3d *p3View = CWorldBuilderDoc::GetActive3DView();
@@ -133,7 +133,7 @@ void BuildListTool::deactivate()
 }
 
 /** Set the cursor. */
-void BuildListTool::setCursor(void) 
+void BuildListTool::setCursor(void)
 {
 	if (isDoingAdd()) {
 		Tool::setCursor();	// Default cursor is the adding cursor
@@ -156,7 +156,7 @@ void BuildListTool::setCursor(void)
 }
 
 /** Execute the tool on mouse down - Place an object. */
-void BuildListTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void BuildListTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	m_moving = false;
@@ -165,7 +165,7 @@ void BuildListTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWo
 	pView->viewToDocCoords(viewPt, &cpt);
 	m_downPt2d = viewPt;
 	m_downPt3d = cpt;
-	if (isDoingAdd()) return; 
+	if (isDoingAdd()) return;
 	BuildListInfo *pInfo = pView->pickedBuildObjectInView(viewPt);
 	if (pInfo) {
 		m_curObject = pInfo;
@@ -197,11 +197,11 @@ void BuildListTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CW
 		Coord3D loc = cpt;
 		MapObject *pCur = ObjectOptions::getObjectNamed(m_pickBuildingDlg.getPickedUnit());
 		loc.z = 0;
-		if (pCur) { 
+		if (pCur) {
 			// Display the transparent version of this object.
 			p3View->setObjTracking(pCur, loc, 0, true);
 		} else {
-			// Don't display anything. 
+			// Don't display anything.
 			p3View->setObjTracking(NULL, loc, 0, false);
 		}
 		return;
@@ -246,13 +246,13 @@ void BuildListTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CW
 	}
 	p3View->invalBuildListItemInView(m_curObject);
 	m_prevPt3d = cpt;
-	
+
 }
 
 
 
 /** Execute the tool on mouse up - Place an object. */
-void BuildListTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void BuildListTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	if (!isDoingAdd()) {
diff --git a/Generals/Code/Tools/WorldBuilder/src/CButtonShowColor.cpp b/Generals/Code/Tools/WorldBuilder/src/CButtonShowColor.cpp
index 4d5762889c5..590c8ef381d 100644
--- a/Generals/Code/Tools/WorldBuilder/src/CButtonShowColor.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/CButtonShowColor.cpp
@@ -22,11 +22,11 @@
 #include "CButtonShowColor.h"
 
 // CButtonShowColor ///////////////////////////////////////////////////////////////////////////////
-void CButtonShowColor::OnPaint() 
+void CButtonShowColor::OnPaint()
 {
 	try {
 		CPaintDC paintDC(this);
-	
+
 		CPen pen(PS_SOLID, 1, 0xFFFFFF00);
 		CBrush brush(RGBtoBGR(m_color.getAsInt()));
 		// Select my stuff
@@ -45,7 +45,7 @@ void CButtonShowColor::OnPaint()
 
 		// Restore the states.
 		paintDC.SelectObject(oldPen);
- 
+
 	} catch (...) {
 		// Unlikely, but possible.
 		return;
diff --git a/Generals/Code/Tools/WorldBuilder/src/CButtonShowColor.h b/Generals/Code/Tools/WorldBuilder/src/CButtonShowColor.h
deleted file mode 100644
index ff1ba23f6d8..00000000000
--- a/Generals/Code/Tools/WorldBuilder/src/CButtonShowColor.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-**	Command & Conquer Generals(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#ifndef _H_CBUTTONSHOWCOLOR_
-#define _H_CBUTTONSHOWCOLOR_
-
-class CButtonShowColor : public CButton
-{
-	protected:
-		RGBColor m_color;
-
-	public:
-		const RGBColor& getColor(void) const { return m_color; }
-		void setColor(Int color) { m_color.setFromInt(color); }
-		void setColor(const RGBColor& color) { m_color = color; }
-		~CButtonShowColor();
-		
-		
-		static COLORREF RGBtoBGR(Int color);
-		static Int BGRtoRGB(COLORREF color);
-
-
-	protected:
-		afx_msg void OnPaint();
-
-	DECLARE_MESSAGE_MAP();
-};
-
-#endif /* _H_CBUTTONSHOWCOLOR_ */
\ No newline at end of file
diff --git a/Generals/Code/Tools/WorldBuilder/src/CFixTeamOwnerDialog.cpp b/Generals/Code/Tools/WorldBuilder/src/CFixTeamOwnerDialog.cpp
index 92b84414b19..34bfd217067 100644
--- a/Generals/Code/Tools/WorldBuilder/src/CFixTeamOwnerDialog.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/CFixTeamOwnerDialog.cpp
@@ -21,7 +21,6 @@
 #include "CFixTeamOwnerDialog.h"
 #include "GameLogic/SidesList.h"
 #include "Common/WellKnownKeys.h"
-#include "GameLogic/SidesList.h"
 
 static const char* NEUTRAL_NAME_STR = "(neutral)";
 
@@ -88,7 +87,7 @@ void CFixTeamOwnerDialog::OnOK()
 	CListBox *pList = (CListBox*) GetDlgItem(IDC_VALIDTEAMLIST);
 	int curSel = pList->GetCurSel();
 
-	if (curSel < 0) { 
+	if (curSel < 0) {
 		return;
 	}
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/CUndoable.cpp b/Generals/Code/Tools/WorldBuilder/src/CUndoable.cpp
index 3ea61a92067..1ba555be5d3 100644
--- a/Generals/Code/Tools/WorldBuilder/src/CUndoable.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/CUndoable.cpp
@@ -20,7 +20,7 @@
 // Class to handle undo/redo.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "CUndoable.h"
@@ -38,7 +38,7 @@
 #include "wbview3d.h"
 #include "LayersList.h"
 #include "Common/WellKnownKeys.h"
-#include "WorldBuilder.h"	// for MAX_OBJECTS_IN_MAP 
+#include "WorldBuilder.h"	// for MAX_OBJECTS_IN_MAP
 #include "Common/UnicodeString.h"
 
 
@@ -74,13 +74,13 @@ void Undoable::LinkNext(Undoable *pNext)
 //
 void Undoable::Redo(void)
 {
-	Do();  
+	Do();
 }
 
 
 /*************************************************************************
 **                             WBDocUndoable
- An undoable that actually undoes something.  Saves the entire height map 
+ An undoable that actually undoes something.  Saves the entire height map
  state, and restores it.
 ***************************************************************************/
 //
@@ -133,7 +133,7 @@ void WBDocUndoable::Do(void)
 		Int i;
 		// Update build lists.
 		for (i=0; i<TheSidesList->getNumSides(); i++) {
-			SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+			SidesInfo *pSide = TheSidesList->getSideInfo(i);
 			for (BuildListInfo *pBuild = pSide->getBuildList(); pBuild; pBuild = pBuild->getNext()) {
 				// Update.
 				Coord3D loc = *pBuild->getLocation();
@@ -143,7 +143,7 @@ void WBDocUndoable::Do(void)
 				pBuild->setLocation(loc);
 			}
 		}
-		mPDoc->invalObject(NULL); // Inval all objects.	
+		mPDoc->invalObject(NULL); // Inval all objects.
 	}
 	mPNewHeightMapData->dbgVerifyAfterUndo();
 }
@@ -168,7 +168,7 @@ void WBDocUndoable::Redo(void)
 			pCur->setLocation(&loc);
 			pCur = pCur->getNext();
 		}
-		mPDoc->invalObject(NULL); // Inval all objects.	
+		mPDoc->invalObject(NULL); // Inval all objects.
 	}
 	mPNewHeightMapData->dbgVerifyAfterUndo();
 }
@@ -193,7 +193,7 @@ void WBDocUndoable::Undo(void)
 			pCur->setLocation(&loc);
 			pCur = pCur->getNext();
 		}
-		mPDoc->invalObject(NULL); // Inval all objects.	
+		mPDoc->invalObject(NULL); // Inval all objects.
 	}
 	mPOldHeightMapData->dbgVerifyAfterUndo();
 }
@@ -207,7 +207,7 @@ void WBDocUndoable::Undo(void)
 AddObjectUndoable::~AddObjectUndoable(void)
 {
 	m_pDoc = NULL;  // not ref counted.
-	if (m_objectToAdd && !m_addedToList) {
+	if (!m_addedToList) {
 		deleteInstance(m_objectToAdd);
 		m_objectToAdd=NULL;
 	}
@@ -239,8 +239,8 @@ void AddObjectUndoable::Do(void)
 	// Clear selection.
 	PointerTool::clearSelection();
 	m_numObjects = 0;
-	while (pCur) { 
-		if (!pCur->getFlag(FLAG_ROAD_FLAGS) && !pCur->getFlag(FLAG_BRIDGE_FLAGS) && !pCur->isWaypoint()) 
+	while (pCur) {
+		if (!pCur->getFlag(FLAG_ROAD_FLAGS) && !pCur->getFlag(FLAG_BRIDGE_FLAGS) && !pCur->isWaypoint())
 		{
 			pCur->setSelected(true);
 		}
@@ -252,16 +252,16 @@ void AddObjectUndoable::Do(void)
 		return;
 	}
 	pLast->setNextMap(MapObject::getFirstMapObject());
-	
+
 	MapObject::TheMapObjectListPtr	= m_objectToAdd;
 	m_addedToList = true;
 
 	pCur = m_objectToAdd;
 	for (int i = 0; i < m_numObjects; i++) {
-		// validate the object, giving it a valid ID and team.	
+		// validate the object, giving it a valid ID and team.
 		pCur->validate();
 		Dict *props = pCur->getProperties();
-		Bool dontCare;	
+		Bool dontCare;
 		TheLayersList->addMapObjectToLayersList(pCur, props->getAsciiString(TheKey_objectLayer, &dontCare));
 
 		m_pDoc->invalObject(pCur);
@@ -271,13 +271,13 @@ void AddObjectUndoable::Do(void)
 	pCur = MapObject::getFirstMapObject();
 
 	const Int flagsWeDontWant = FLAG_ROAD_FLAGS | FLAG_ROAD_CORNER_ANGLED | FLAG_BRIDGE_FLAGS | FLAG_ROAD_CORNER_TIGHT | FLAG_ROAD_JOIN;
-	
+
 	Int numObjects = 0;
 	while (pCur) {
 		Int flags = pCur->getFlags();
 		if (!(pCur->isWaypoint() || (flags & flagsWeDontWant) != 0))
 			++numObjects;
-		
+
 		pCur = pCur->getNext();
 	}
 
@@ -301,7 +301,7 @@ void AddObjectUndoable::Undo(void)
 	}
 	MapObject *pCur = MapObject::TheMapObjectListPtr;
 	while (pCur && (m_numObjects > 1)) {
-		m_pDoc->invalObject(pCur);	
+		m_pDoc->invalObject(pCur);
 		pCur = pCur->getNext();
 		m_numObjects--;
 	}
@@ -312,7 +312,7 @@ void AddObjectUndoable::Undo(void)
 	}
 	pCur = m_objectToAdd;
 	while (pCur) {
-		m_pDoc->invalObject(pCur);	
+		m_pDoc->invalObject(pCur);
 		// Note : This undoable can add multiple objects, and removes multiple objects.
 		TheLayersList->removeMapObjectFromLayersList(pCur);
 		pCur = pCur->getNext();
@@ -470,7 +470,7 @@ ModifyObjectUndoable::ModifyObjectUndoable(CWorldBuilderDoc *pDoc):
 /// Sets the offset for all the objects in the move list, and moves them there.
 //
 void ModifyObjectUndoable::SetOffset(Real x, Real y)
-{			
+{
 	MoveInfo *pCur = m_moveList;
 	while (pCur) {
 		pCur->SetOffset(m_pDoc, x, y);
@@ -509,7 +509,7 @@ void ModifyObjectUndoable::SetThingTemplate(const ThingTemplate* thing)
 		pCur = pCur->m_next;
 	}
 	m_inval = true;
-	if (m_inval) 
+	if (m_inval)
 	{
 		WbView3d *p3View = m_pDoc->GetActive3DView();
 		p3View->resetRenderObjects();
@@ -525,7 +525,7 @@ void ModifyObjectUndoable::SetName(AsciiString name)
 		pCur = pCur->m_next;
 	}
 	m_inval = true;
-	if (m_inval) 
+	if (m_inval)
 	{
 		WbView3d *p3View = m_pDoc->GetActive3DView();
 		p3View->resetRenderObjects();
@@ -551,7 +551,7 @@ void ModifyObjectUndoable::Redo(void)
 		pCur->DoMove(m_pDoc);
 		pCur = pCur->m_next;
 	}
-	if (m_inval) 
+	if (m_inval)
 	{
 		WbView3d *p3View = m_pDoc->GetActive3DView();
 		p3View->resetRenderObjects();
@@ -569,7 +569,7 @@ void ModifyObjectUndoable::Undo(void)
 		pCur->UndoMove(m_pDoc);
 		pCur = pCur->m_next;
 	}
-	if (m_inval) 
+	if (m_inval)
 	{
 		WbView3d *p3View = m_pDoc->GetActive3DView();
 		p3View->resetRenderObjects();
@@ -609,7 +609,7 @@ FlagsInfo::FlagsInfo( MapObject *pObjToMove, Int flagMask, Int flagValue):
 void FlagsInfo::DoFlags(CWorldBuilderDoc *pDoc)
 {
 	Bool found = false;
-	MapObject *pMapObj; 
+	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj == m_objectToModify) {
 			found = true;
@@ -626,7 +626,7 @@ void FlagsInfo::DoFlags(CWorldBuilderDoc *pDoc)
 void FlagsInfo::UndoFlags(CWorldBuilderDoc *pDoc)
 {
 	Bool found = false;
-	MapObject *pMapObj; 
+	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj == m_objectToModify) {
 			found = true;
@@ -649,9 +649,8 @@ void FlagsInfo::UndoFlags(CWorldBuilderDoc *pDoc)
 ModifyFlagsUndoable::~ModifyFlagsUndoable(void)
 {
 	m_pDoc = NULL;  // not ref counted.
-	if (m_flagsList) {
-		delete m_flagsList;
-	}
+
+	delete m_flagsList;
 	m_flagsList = NULL;
 }
 
@@ -724,7 +723,7 @@ m_pDoc(pDoc)
 	// ensure the new setup is valid. (don't mess with the old one.)
 	Bool modified = m_new.validateSides();
 	(void)modified;
-	DEBUG_ASSERTLOG(!modified,("*** had to clean up sides in SidesListUndoable! (caller should do this)\n"));
+	DEBUG_ASSERTLOG(!modified,("*** had to clean up sides in SidesListUndoable! (caller should do this)"));
 }
 
 SidesListUndoable::~SidesListUndoable()
@@ -857,7 +856,7 @@ void DictItemUndoable::Undo(void)
 ***************************************************************************/
 DeleteInfo::~DeleteInfo(void)
 {
-	if (m_didDelete && m_objectToDelete) {
+	if (m_didDelete) {
 		deleteInstance(m_objectToDelete);
 	}
 	DeleteInfo *pCur = m_next;
@@ -937,9 +936,8 @@ void DeleteInfo::UndoDelete(WorldHeightMapEdit *pMap)
 DeleteObjectUndoable::~DeleteObjectUndoable(void)
 {
 	m_pDoc = NULL;  // not ref counted.
-	if (m_deleteList) {
-		delete m_deleteList;
-	}
+
+	delete m_deleteList;
 	m_deleteList=NULL;
 }
 
@@ -996,7 +994,7 @@ void DeleteObjectUndoable::Do(void)
 	DeleteInfo *pCur = m_deleteList;
 	DeleteInfo *pInvertedList = NULL;
 	while (pCur) {
-		// first, remove it from the Layers list. 
+		// first, remove it from the Layers list.
 		TheLayersList->removeMapObjectFromLayersList(pCur->m_objectToDelete);
 
 		DeleteInfo *tmp;
@@ -1178,7 +1176,7 @@ MovePolygonUndoable::~MovePolygonUndoable(void)
 MovePolygonUndoable::MovePolygonUndoable(PolygonTrigger *pTrig):
 	m_trigger(pTrig)
 {
-	m_offset.x = 0; 
+	m_offset.x = 0;
 	m_offset.y = 0;
 	m_offset.z = 0;
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/CameraOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/CameraOptions.cpp
index 9b2c0d17f8d..a998b7869be 100644
--- a/Generals/Code/Tools/WorldBuilder/src/CameraOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/CameraOptions.cpp
@@ -61,7 +61,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CameraOptions message handlers
 
-void CameraOptions::OnCameraReset() 
+void CameraOptions::OnCameraReset()
 {
 	WbView3d * p3View = CWorldBuilderDoc::GetActive3DView();
 	if (p3View)
@@ -71,17 +71,17 @@ void CameraOptions::OnCameraReset()
 	}
 }
 
-void CameraOptions::OnMove(int x, int y) 
+void CameraOptions::OnMove(int x, int y)
 {
 	CDialog::OnMove(x, y);
-	
+
 	if (this->IsWindowVisible() && !this->IsIconic()) {
 		CRect frameRect;
 		GetWindowRect(&frameRect);
 		::AfxGetApp()->WriteProfileInt(CAMERA_OPTIONS_PANEL_SECTION, "Top", frameRect.top);
 		::AfxGetApp()->WriteProfileInt(CAMERA_OPTIONS_PANEL_SECTION, "Left", frameRect.left);
 	}
-	
+
 }
 
 void CameraOptions::putInt(Int ctrlID, Int val)
@@ -114,7 +114,7 @@ void CameraOptions::putAsciiString(Int ctrlID, AsciiString val)
 	}
 }
 
-BOOL CameraOptions::getReal(Int ctrlID, Real *rVal) 
+BOOL CameraOptions::getReal(Int ctrlID, Real *rVal)
 {
 	CWnd *pEdit = GetDlgItem(ctrlID);
 	char buffer[_MAX_PATH];
@@ -193,7 +193,7 @@ void CameraOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void CameraOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -209,7 +209,7 @@ void CameraOptions::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void CameraOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -222,22 +222,22 @@ void CameraOptions::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
 
-BOOL CameraOptions::OnInitDialog() 
+BOOL CameraOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_pitchPopup.SetupPopSliderButton(this, IDC_PITCH_POPUP, this);
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void CameraOptions::OnChangePitchEdit() 
+void CameraOptions::OnChangePitchEdit()
 {
 	if (m_updating)
 		return;
@@ -251,7 +251,7 @@ void CameraOptions::OnChangePitchEdit()
 	}
 }
 
-void CameraOptions::OnShowWindow(BOOL bShow, UINT nStatus) 
+void CameraOptions::OnShowWindow(BOOL bShow, UINT nStatus)
 {
 	CDialog::OnShowWindow(bShow, nStatus);
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/CellWidth.cpp b/Generals/Code/Tools/WorldBuilder/src/CellWidth.cpp
index 1826611f609..25a4440e3b4 100644
--- a/Generals/Code/Tools/WorldBuilder/src/CellWidth.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/CellWidth.cpp
@@ -50,7 +50,7 @@ void CellWidth::DoDataExchange(CDataExchange* pDX)
 // CellWidth message handlers
 
 /// Get the cell width value from the ui on ok.
-void CellWidth::OnOK() 
+void CellWidth::OnOK()
 {
 	CWnd *combo = GetDlgItem(IDC_CELL_WIDTH);
 	CString val;
@@ -63,15 +63,15 @@ void CellWidth::OnOK()
 
 
 /// Set the initial value of cell width into the combobox.
-BOOL CellWidth::OnInitDialog() 
+BOOL CellWidth::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CWnd *combo = GetDlgItem(IDC_CELL_WIDTH);
 	CString val;
 	val.Format("%d", mCellWidth);
 	if (combo) combo->SetWindowText(val);
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/ContourOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/ContourOptions.cpp
index 9ca17a0ac0f..6309e481e9d 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ContourOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ContourOptions.cpp
@@ -36,7 +36,7 @@ Int ContourOptions::m_contourWidth = 1;
 ContourOptions::ContourOptions(CWnd* pParent /*=NULL*/)
 	: CDialog(ContourOptions::IDD, pParent)
 {
-	//{{AFX_DATA_INIT(ContourOptions) 
+	//{{AFX_DATA_INIT(ContourOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -56,12 +56,12 @@ void ContourOptions::DoDataExchange(CDataExchange* pDX)
 // ContourOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL ContourOptions::OnInitDialog() 
+BOOL ContourOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CWnd *pWnd = GetDlgItem(IDC_SLIDER1);
 	CRect rect;
 	pWnd->GetWindowRect(&rect);
@@ -107,10 +107,10 @@ BOOL ContourOptions::OnInitDialog()
 }
 
 /// Handles slider ui messages.
-/** Gets the info, determines if it is the feather or width slider, 
+/** Gets the info, determines if it is the feather or width slider,
 		gets the new value, and updates the correspondig edit control
 		and the brush tool. */
-void ContourOptions::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
+void ContourOptions::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 {
 	CString str;
 	m_updating = true;
@@ -121,12 +121,12 @@ void ContourOptions::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 			nPos = m_contourStepSlider.GetPos();
 		}
 		m_contourStep = MIN_CONTOUR_STEP + MAX_CONTOUR_STEP - nPos;
-	} else if (offset) { // width 
+	} else if (offset) { // width
 		if (nSBCode != TB_THUMBTRACK) {
 			nPos = m_contourOffsetSlider.GetPos();
 		}
 		m_contourOffset = nPos;
-	} else { // width 
+	} else { // width
 		if (nSBCode != TB_THUMBTRACK) {
 			nPos = m_contourWidthSlider.GetPos();
 		}
@@ -148,7 +148,7 @@ BEGIN_MESSAGE_MAP(ContourOptions, CDialog)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-void ContourOptions::OnShowContours() 
+void ContourOptions::OnShowContours()
 {
 	CWorldBuilderView *pView = CWorldBuilderDoc::GetActive2DView();
 	if (pView) {
diff --git a/Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp b/Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp
index ee68ccb790b..db327f00a1a 100644
--- a/Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp
@@ -20,9 +20,7 @@
 
 #include "DrawObject.h"
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include <tri.h>
@@ -106,7 +104,7 @@ Coord3D	DrawObject::m_rampEndPoint;
 Real DrawObject::m_rampWidth = 0.0f;
 
 
-Bool DrawObject::m_dragWaypointFeedback = false; 
+Bool DrawObject::m_dragWaypointFeedback = false;
 Coord3D DrawObject::m_dragWayStart;
 Coord3D DrawObject::m_dragWayEnd;
 
@@ -161,7 +159,7 @@ DrawObject::DrawObject(void) :
 Bool DrawObject::Cast_Ray(RayCollisionTestClass & raytest)
 {
 
-	return false;	
+	return false;
 
 }
 
@@ -182,7 +180,7 @@ void DrawObject::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
 {
 	Vector3	ObjSpaceCenter(TheGlobalData->m_waterExtentX,TheGlobalData->m_waterExtentY,50*MAP_XY_FACTOR);
 	float length = ObjSpaceCenter.Length();
-	
+
 	sphere.Init(ObjSpaceCenter, length);
 }
 
@@ -213,8 +211,8 @@ Int DrawObject::freeMapResources(void)
 	REF_PTR_RELEASE(m_vertexBufferWater);
 	REF_PTR_RELEASE(m_vertexMaterialClass);
 	REF_PTR_RELEASE(m_vertexFeedback);
-	REF_PTR_RELEASE(m_indexFeedback);	
-	REF_PTR_RELEASE(m_indexWater);	
+	REF_PTR_RELEASE(m_indexFeedback);
+	REF_PTR_RELEASE(m_indexWater);
 	REF_PTR_RELEASE(m_moldMesh);
 	REF_PTR_RELEASE(m_waterDrawObject);
 	TheWaterRenderObj = NULL;
@@ -223,7 +221,7 @@ Int DrawObject::freeMapResources(void)
 }
 
 // Total number of triangles
-#define NUM_TRI 26	 
+#define NUM_TRI 26
 // Number of triangles in the arrow.
 #define NUM_ARROW_TRI 4
 // Number of triangles in the selection pyramid.
@@ -233,7 +231,7 @@ Int DrawObject::freeMapResources(void)
 
 
 Int DrawObject::initData(void)
-{	
+{
 	Int i;
 
 	freeMapResources();	//free old data and ib/vb
@@ -244,7 +242,7 @@ Int DrawObject::initData(void)
 	// Fill up the IB
 	DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
 	UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-		
+
 	for (i=0; i<3*m_numTriangles; i+=3)
 	{
 		ib[0]=i;
@@ -264,10 +262,10 @@ Int DrawObject::initData(void)
 	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 
 	//use a multi-texture shader: (text1*diffuse)*text2.
-	m_shaderClass = ShaderClass::ShaderClass(SC_OPAQUE);//_PresetOpaque2DShader;//ShaderClass(SC_OPAQUE); //_PresetOpaqueShader;
+	m_shaderClass = ShaderClass(SC_OPAQUE);//_PresetOpaque2DShader;//ShaderClass(SC_OPAQUE); //_PresetOpaqueShader;
 
 	m_shaderClass = ShaderClass::_PresetOpaque2DShader;
-	updateForWater();			 
+	updateForWater();
 	updateVB(m_vertexBufferTile1, 255<<8, true, false);
 
 	return 0;
@@ -331,7 +329,7 @@ void DrawObject::updateMeshVB(void)
 	}
 
 #if 0	//this wasn't being used (see below) so I commented it out. -MW
-	Vector3 lightRay=Normalize(Vector3(-TheGlobalData->m_terrainLightPos[0].x, 
+	Vector3 lightRay=Normalize(Vector3(-TheGlobalData->m_terrainLightPos[0].x,
 		-TheGlobalData->m_terrainLightPos[0].y, -TheGlobalData->m_terrainLightPos[0].z));
 #endif
 
@@ -347,7 +345,7 @@ void DrawObject::updateMeshVB(void)
 		curVb->x = vLoc.X;
 		curVb->y = vLoc.Y;
 		curVb->z = vLoc.Z;
-		
+
 		VertexFormatXYZDUV2 vb;
 		vb.x = vLoc.X;
 		vb.y = vLoc.Y;
@@ -355,7 +353,7 @@ void DrawObject::updateMeshVB(void)
 
 #if 1
 		curVb->diffuse = 0x0000ffff | (theAlpha << 24);		// bright cyan.
-#else 
+#else
 		TheTerrainRenderObject->doTheLight(&vb, &lightRay, (Vector3 *)(&pNormal[i]), NULL, 1.0f);
 		vb.diffuse &= 0x0000ffff;
 		curVb->diffuse = vb.diffuse | (theAlpha << 24);
@@ -450,45 +448,45 @@ void DrawObject::updateRampVB(void)
 	Int numVertex = widthVerts * lengthVerts;
 
 /*
-	Generate the rectangle via the function BuildRectFromSegmentAndWidth(...). 
-	Note that for the rectangular case, this is easy, as we simply step along the line at 
-	pre-determined step sizes, with no additional calculation. (IE, we can simply perform 
-	linear interpolation.) However, with the curved case, we will need to recalculate the 
-	value every step along the way. 
- 
- 
+	Generate the rectangle via the function BuildRectFromSegmentAndWidth(...).
+	Note that for the rectangular case, this is easy, as we simply step along the line at
+	pre-determined step sizes, with no additional calculation. (IE, we can simply perform
+	linear interpolation.) However, with the curved case, we will need to recalculate the
+	value every step along the way.
+
+
 	Ultimately, what I'd like to do is to precompute what the terrain is actually going to
 	do, and then use the faux-adjusted vertices, but this is much easier to start from. jkmcd
 */
 	Coord3D coordBL, coordTL, coordBR, coordTR;
-	BuildRectFromSegmentAndWidth(&m_rampStartPoint, &m_rampEndPoint, m_rampWidth, 
+	BuildRectFromSegmentAndWidth(&m_rampStartPoint, &m_rampEndPoint, m_rampWidth,
 															 &coordBL, &coordTL, &coordBR, &coordTR);
 
 	Vector3 bl(coordBL.x, coordBL.y, coordBL.z);
 	Vector3 tl(coordTL.x, coordTL.y, coordTL.z);
 	Vector3 br(coordBR.x, coordBR.y, coordBR.z);
 	Vector3 tr(coordTR.x, coordTR.y, coordTR.z);
-	
+
 	for (i = 0; i < numVertex; i++) {
 		curVb->u1 = INT_TO_REAL(i % widthVerts) / widthVerts;
 		curVb->v1 = INT_TO_REAL(i / lengthVerts) / lengthVerts;
 
 		curVb->diffuse = curVb->diffuse = 0x0000ffff | (theAlpha << 24);		// bright cyan.
-		
+
 		Vector3 vLoc;
-		vLoc.X = (br.X - bl.X) * INT_TO_REAL(i % widthVerts) / (widthVerts  - 1) + 
+		vLoc.X = (br.X - bl.X) * INT_TO_REAL(i % widthVerts) / (widthVerts  - 1) +
 						 (tl.X - bl.X) * INT_TO_REAL(i / lengthVerts) / (lengthVerts - 1) + bl.X;
-		
-		vLoc.Y = (br.Y - bl.Y) * INT_TO_REAL(i % widthVerts) / (widthVerts - 1) + 
+
+		vLoc.Y = (br.Y - bl.Y) * INT_TO_REAL(i % widthVerts) / (widthVerts - 1) +
 						 (tl.Y - bl.Y) * INT_TO_REAL(i / lengthVerts) / (lengthVerts - 1) + bl.Y;
 
-		vLoc.Z = (br.Z - bl.Z) * INT_TO_REAL(i % widthVerts) / (widthVerts - 1) + 
+		vLoc.Z = (br.Z - bl.Z) * INT_TO_REAL(i % widthVerts) / (widthVerts - 1) +
 						 (tl.Z - bl.Z) * INT_TO_REAL(i / lengthVerts) / (lengthVerts - 1) + bl.Z;
 
 		curVb->x = vLoc.X;
 		curVb->y = vLoc.Y;
 		curVb->z = vLoc.Z;
-		
+
 		curVb++;
 		m_feedbackVertexCount++;
 	}
@@ -499,13 +497,13 @@ void DrawObject::updateRampVB(void)
 			(*curIb++) = i * lengthVerts + j;
 			(*curIb++) = (i + 1) * lengthVerts + j;
 			(*curIb++) = (i + 1) * lengthVerts + j + 1;
-			
+
 			(*curIb++) = i * lengthVerts + j;
 			(*curIb++) = (i + 1) * lengthVerts + j + 1;
 			(*curIb++) = (i) * lengthVerts + j + 1;
 			m_feedbackIndexCount += 6;
 		}
-				
+
 	}
 #if 0
 	// Put in the "center anchor"
@@ -1121,7 +1119,7 @@ void DrawObject::updatePolygonVB(PolygonTrigger *pTrig, Bool selected, Bool isOp
 		curVb->x = loc1.x+normal.X;
 		curVb->y = loc1.y+normal.Y;
 		curVb->z = loc1.z;
-		curVb->diffuse = diffuse;  
+		curVb->diffuse = diffuse;
 		curVb++;
 		m_feedbackVertexCount++;
 		curVb->u1 = 0;
@@ -1129,7 +1127,7 @@ void DrawObject::updatePolygonVB(PolygonTrigger *pTrig, Bool selected, Bool isOp
 		curVb->x = loc1.x-normal.X;
 		curVb->y = loc1.y-normal.Y;
 		curVb->z = loc1.z;
-		curVb->diffuse = diffuse;  
+		curVb->diffuse = diffuse;
 		curVb++;
 		m_feedbackVertexCount++;
 		curVb->u1 = 0;
@@ -1137,7 +1135,7 @@ void DrawObject::updatePolygonVB(PolygonTrigger *pTrig, Bool selected, Bool isOp
 		curVb->x = loc2.x+normal.X;
 		curVb->y = loc2.y+normal.Y;
 		curVb->z = loc2.z;
-		curVb->diffuse = diffuse; 
+		curVb->diffuse = diffuse;
 		curVb++;
 		m_feedbackVertexCount++;
 		curVb->u1 = 0;
@@ -1231,13 +1229,13 @@ void DrawObject::updateFeedbackVB(void)
 					curVb->diffuse = 0;
 				}
 			}
-			Real X, Y, theZ; 
+			Real X, Y, theZ;
 			if (doubleResolution) {
-				X = ADJUST_FROM_INDEX_TO_REAL(i)/2.0f + ADJUST_FROM_INDEX_TO_REAL(2*offset+m_cellCenter.x)  / 2.0; 
+				X = ADJUST_FROM_INDEX_TO_REAL(i)/2.0f + ADJUST_FROM_INDEX_TO_REAL(2*offset+m_cellCenter.x)  / 2.0;
 				Y = ADJUST_FROM_INDEX_TO_REAL(j)/2.0f + ADJUST_FROM_INDEX_TO_REAL(2*offset+m_cellCenter.y)  / 2.0;
 				theZ = TheTerrainRenderObject->getHeightMapHeight(X, Y, NULL);
 			} else {
-				X = ADJUST_FROM_INDEX_TO_REAL(i); 
+				X = ADJUST_FROM_INDEX_TO_REAL(i);
 				Y = ADJUST_FROM_INDEX_TO_REAL(j);
 				theZ = TheTerrainRenderObject->getHeightMapHeight(X, Y, NULL);
 			}
@@ -1249,7 +1247,7 @@ void DrawObject::updateFeedbackVB(void)
 			curVb++;
 			m_feedbackVertexCount++;
 		}
-	} 
+	}
 	Int yOffset = maxX-minX;
 	Int halfWidth = yOffset/2;
 	for (j=0; j<maxY-minY-1; j++) {
@@ -1282,7 +1280,7 @@ void DrawObject::updateFeedbackVB(void)
 
 
 /** Calculate the sign of the cross product.  If the tails of the vectors are both placed
-at 0,0, then the cross product can be interpreted as -1 means v2 is to the right of v1, 
+at 0,0, then the cross product can be interpreted as -1 means v2 is to the right of v1,
 1 means v2 is to the left of v1, and 0 means v2 is parallel to v1. */
 
 static Int xpSign(const ICoord3D &v1, const ICoord3D &v2) {
@@ -1299,8 +1297,8 @@ void DrawObject::updateForWater(void)
 {
 }
 
-/* This is a code snippet that starts to attempt to solve the concave area problem, 
-but doesn't, really.  
+/* This is a code snippet that starts to attempt to solve the concave area problem,
+but doesn't, really.
 				const Int maxPoints = 256;
 				Bool pointFlags[256];
 				Int numPoints = pTrig->getNumPoints();
@@ -1374,15 +1372,15 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 	g *= factor;
 	b *= factor;
 	const Int theAlpha = 127;
-	static const Int highlightColors[NUM_HIGHLIGHT] = { ((255<<8) + (255<<16)) , 
+	static const Int highlightColors[NUM_HIGHLIGHT] = { ((255<<8) + (255<<16)) ,
 				((255<<16)), (255<<8) };
 	Int diffuse =  b + (g<<8) + (r<<16) + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.
 	if (pVB )
 	{
-		
+
 		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
 		VertexFormatXYZDUV1 *vb = (VertexFormatXYZDUV1*)lockVtxBuffer.Get_Vertex_Array();
-		
+
 		const Real theZ = 0.0f;
 		Real theRadius = THE_RADIUS;
 		Real halfLineWidth = 0.03f*MAP_XY_FACTOR;
@@ -1417,7 +1415,7 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 					Real angle = curAngle+deltaAngle;
 					if (i==limit-1) {
 						angle = 0;
-					} 
+					}
 					Vector3 vec(theRadius/10,0,theZ);
 					vec.Rotate_Z(angle);
 					vb->x=	vec.X;
@@ -1434,7 +1432,7 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 				vb++;
 			}
 			curAngle += deltaAngle;
-			
+
 		}
 		if (!doArrow) {
 			theRadius /= 20;
@@ -1442,7 +1440,7 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 		}
 		/* Now do the arrow. */
 		for (k=0; k<3; k++) {
-			vb->x=	(k&1)?2*theRadius:0.0f;	 
+			vb->x=	(k&1)?2*theRadius:0.0f;
 			vb->y=	-halfLineWidth + ((k&2)?2*halfLineWidth:0);
 			vb->z=  theZ;
 			vb->diffuse=highlightColors[curHighlight] + (theAlpha<<24);
@@ -1452,7 +1450,7 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 			vb++;
 		}
 		for (k=0; k<3; k++) {
-			vb->x=	(k&1)?0.0f:2*theRadius;	 
+			vb->x=	(k&1)?0.0f:2*theRadius;
 			vb->y=	halfLineWidth - ((k&2)?2*halfLineWidth:0);
 			vb->z=  theZ;
 			vb->diffuse=highlightColors[curHighlight] + (theAlpha<<24);
@@ -1516,7 +1514,7 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 					Real angle = curAngle+deltaAngle;
 					if (i==limit-1) {
 						angle = 0;
-					} 
+					}
 					Vector3 vec(theRadius,0,theZ);
 					vec.Rotate_Z(angle);
 					vb->x=	vec.X;
@@ -1533,13 +1531,13 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 				vb++;
 			}
 			curAngle += deltaAngle;
-			
+
 		}
 #if 0
 		// Now do the highlight triangle.  This is in yellow.
 		for (k=0; k<3; k++) {
-			vb->x = k==0?theRadius:0;	 
-			vb->y = k==1?theRadius:0;	 
+			vb->x = k==0?theRadius:0;
+			vb->y = k==1?theRadius:0;
 			vb->z=  k==2?theZ+SELECT_PYRAMID_HEIGHT:theZ;
 			vb->diffuse= highlightColors[curHighlight] + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.
 			vb->u1=0;
@@ -1548,8 +1546,8 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 			vb++;
 		}
 		for (k=0; k<3; k++) {
-			vb->x = k==1?-theRadius:0;	 
-			vb->y = k==0?theRadius:0;	 
+			vb->x = k==1?-theRadius:0;
+			vb->y = k==0?theRadius:0;
 			vb->z=  k==2?theZ+SELECT_PYRAMID_HEIGHT:theZ;
 			vb->diffuse= highlightColors[curHighlight] + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.
 			vb->u1=0;
@@ -1559,8 +1557,8 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 		}
 
 		for (k=0; k<3; k++) {
-			vb->x = k==1?theRadius:0;	 
-			vb->y = k==0?-theRadius:0;	 
+			vb->x = k==1?theRadius:0;
+			vb->y = k==0?-theRadius:0;
 			vb->z=  k==2?theZ+SELECT_PYRAMID_HEIGHT:theZ;
 			vb->diffuse= highlightColors[curHighlight] + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.
 			vb->u1=0;
@@ -1569,8 +1567,8 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 			vb++;
 		}
 		for (k=0; k<3; k++) {
-			vb->x = k==0?-theRadius:0;	 
-			vb->y = k==1?-theRadius:0;	 
+			vb->x = k==0?-theRadius:0;
+			vb->y = k==1?-theRadius:0;
 			vb->z=  k==2?theZ+SELECT_PYRAMID_HEIGHT:theZ;
 			vb->diffuse= highlightColors[curHighlight] + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.
 			vb->u1=0;
@@ -1585,7 +1583,7 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 }
 
 /** Tells drawobject where the tool is located, so it can draw feedback. */
-void DrawObject::setFeedbackPos(Coord3D pos) 
+void DrawObject::setFeedbackPos(Coord3D pos)
 {
 	m_feedbackPoint = pos;
 	// center on half pixel for even widths.
@@ -1600,7 +1598,7 @@ void DrawObject::setFeedbackPos(Coord3D pos)
 	if (ndx.x != m_cellCenter.x || ndx.y != m_cellCenter.y) {
 		m_cellCenter = ndx;
 		if (m_toolWantsFeedback && !m_disableFeedback) {
-			WbView3d *pView = pDoc->Get3DView();		
+			WbView3d *pView = pDoc->Get3DView();
 			if (pView) {
 				pView->Invalidate(false);
 			}
@@ -1614,19 +1612,13 @@ void DrawObject::setRampFeedbackParms(const Coord3D *start, const Coord3D *end,
 	if (!(start && end)) {
 		return;
 	}
-	
+
 	m_rampStartPoint = *start;
 	m_rampEndPoint = *end;
 	m_rampWidth = rampWidth;
-	
-}
-
 
-// This routine fails to draw poly triggers in some cases when optimized.
-// So just shut it off for now.  The failure case was new doc, add a poly trigger.
-// Adding any other object fixed the problem.	jba
+}
 
-#pragma optimize("", off)
 
 /** Render draws into the current 3d context. */
 void DrawObject::Render(RenderInfoClass & rinfo)
@@ -1659,12 +1651,12 @@ void DrawObject::Render(RenderInfoClass & rinfo)
 				loc.z += TheTerrainRenderObject->getHeightMapHeight(loc.x, loc.y, NULL);
 			}
 			// Cull.
-			SphereClass bounds(Vector3(loc.x, loc.y, loc.z), THE_RADIUS); 
+			SphereClass bounds(Vector3(loc.x, loc.y, loc.z), THE_RADIUS);
 			if (rinfo.Camera.Cull_Sphere(bounds)) {
 				continue;
 			}
 			Bool doArrow = true;
-			if (pMapObj->getFlag(FLAG_ROAD_FLAGS) || pMapObj->getFlag(FLAG_BRIDGE_FLAGS) || pMapObj->isWaypoint()) 
+			if (pMapObj->getFlag(FLAG_ROAD_FLAGS) || pMapObj->getFlag(FLAG_BRIDGE_FLAGS) || pMapObj->isWaypoint())
 			{
 				doArrow = false;
 			}
@@ -1735,7 +1727,7 @@ void DrawObject::Render(RenderInfoClass & rinfo)
 					loc.x = iLoc.x;
 					loc.y = iLoc.y;
 					loc.z = TheTerrainRenderObject->getHeightMapHeight(loc.x, loc.y, NULL);
-					SphereClass bounds(Vector3(loc.x, loc.y, loc.z), THE_RADIUS); 
+					SphereClass bounds(Vector3(loc.x, loc.y, loc.z), THE_RADIUS);
 					if (rinfo.Camera.Cull_Sphere(bounds)) {
 						continue;
 					}
@@ -1787,14 +1779,14 @@ void DrawObject::Render(RenderInfoClass & rinfo)
 	DX8Wrapper::Set_Index_Buffer(NULL,0);	//release reference to vertex buffer
 
  	if (BuildListTool::isActive()) for (i=0; i<TheSidesList->getNumSides(); i++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(i);
 		for (BuildListInfo *pBuild = pSide->getBuildList(); pBuild; pBuild = pBuild->getNext()) {
 			Coord3D loc = *pBuild->getLocation();
 			if (TheTerrainRenderObject) {
 				loc.z += TheTerrainRenderObject->getHeightMapHeight(loc.x, loc.y, NULL);
 			}
 			// Cull.
-			SphereClass bounds(Vector3(loc.x, loc.y, loc.z), THE_RADIUS); 
+			SphereClass bounds(Vector3(loc.x, loc.y, loc.z), THE_RADIUS);
 			if (rinfo.Camera.Cull_Sphere(bounds)) {
 				continue;
 			}
@@ -1823,7 +1815,7 @@ void DrawObject::Render(RenderInfoClass & rinfo)
 				polyCountA -= NUM_ARROW_TRI+NUM_SELECT_TRI;
 			}
 
-#if 1	
+#if 1
 			DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
 			DX8Wrapper::Set_Transform(D3DTS_WORLD,tmXX);
 			DX8Wrapper::Draw_Triangles(	0,polyCountA, 0,	(m_numTriangles*3));
@@ -1933,14 +1925,14 @@ void DrawObject::Render(RenderInfoClass & rinfo)
 	}
 
 }
-#pragma optimize("", on)
 
-void BuildRectFromSegmentAndWidth(const Coord3D* start, const Coord3D* end, Real width, 
+
+void BuildRectFromSegmentAndWidth(const Coord3D* start, const Coord3D* end, Real width,
 																	Coord3D* outBL, Coord3D* outTL, Coord3D* outBR, Coord3D* outTR)
 {
 /*
-	Here's how we're generating the surface to render: 
- 		1) Assign longSeg to be the segment from rampStartPoint to rampStopPoint 
+	Here's how we're generating the surface to render:
+ 		1) Assign longSeg to be the segment from rampStartPoint to rampStopPoint
  		2) Cross product with the segment (0, 0, 1)
  		3) Normalize to get the unit vector (which is in the XY plane.)
  		4) Multiply the unit vector by the ramp width / 2
@@ -1953,7 +1945,7 @@ void BuildRectFromSegmentAndWidth(const Coord3D* start, const Coord3D* end, Real
 		return;
 	}
 
-	// 1) 
+	// 1)
 	Vector3 longSeg;
 	if (start->length() > end->length()) {
 		longSeg.X = end->x - start->x;
@@ -1974,7 +1966,7 @@ void BuildRectFromSegmentAndWidth(const Coord3D* start, const Coord3D* end, Real
 	// 3)
 	unitVec.Normalize();
 
-	// 4) 
+	// 4)
 	unitVec.Scale(Vector3(width, width, width));
 
 	Coord3D bl = { start->x + unitVec.X, start->y + unitVec.Y, start->z + unitVec.Z };
diff --git a/Generals/Code/Tools/WorldBuilder/src/EditAction.cpp b/Generals/Code/Tools/WorldBuilder/src/EditAction.cpp
index a594ca4b710..6c0e522a531 100644
--- a/Generals/Code/Tools/WorldBuilder/src/EditAction.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/EditAction.cpp
@@ -25,11 +25,6 @@
 #include "EditParameter.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 /////////////////////////////////////////////////////////////////////////////
 // EditAction dialog
@@ -64,13 +59,13 @@ END_MESSAGE_MAP()
 // EditAction message handlers
 
 
-BOOL EditAction::OnInitDialog() 
+BOOL EditAction::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
 
 //	CDC *pDc =GetDC();
-	
+
 	CWnd *pWnd = GetDlgItem(IDC_RICH_EDIT_HERE);
 	CRect rect;
 	pWnd->GetWindowRect(&rect);
@@ -101,7 +96,7 @@ BOOL EditAction::OnInitDialog()
 }
 
 
-void EditAction::formatScriptActionText(Int parameterNdx) 
+void EditAction::formatScriptActionText(Int parameterNdx)
 {
 	CHARFORMAT2 cf;
 	m_updating = true;
@@ -177,7 +172,7 @@ void EditAction::formatScriptActionText(Int parameterNdx)
 		GetDlgItem(IDC_WARNINGS_CAPTION)->EnableWindow(true);
 		GetDlgItem(IDC_WARNINGS)->SetWindowText(warningText.str());
 	}
-		
+
 	m_modifiedTextColor = false;
 	m_myEditCtrl.SetSel(startSel, endSel);
 	m_updating = false;
@@ -185,16 +180,16 @@ void EditAction::formatScriptActionText(Int parameterNdx)
 
 
 
-BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
-{																											
-	if (LOWORD(wParam) == IDC_RICH_EDIT_HERE+1) 
+BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
+{
+	if (LOWORD(wParam) == IDC_RICH_EDIT_HERE+1)
 	{
 		NMHDR *pHdr = (NMHDR *)lParam;
-		if (pHdr->hwndFrom == m_myEditCtrl.m_hWnd && pHdr->code == EN_LINK) 
+		if (pHdr->hwndFrom == m_myEditCtrl.m_hWnd && pHdr->code == EN_LINK)
 		{
 			ENLINK *pLink = (ENLINK *)pHdr;
 			CHARRANGE chrg = pLink->chrg;
-			if (pLink->msg == WM_LBUTTONDOWN) 
+			if (pLink->msg == WM_LBUTTONDOWN)
 			{
 				// Determine which parameter.
 				Int numChars = 0;
@@ -202,21 +197,21 @@ BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 				AsciiString strings[MAX_PARMS];
 				Int numStrings = m_action->getUiStrings(strings);
 				Int i;
-				for (i=0; i<MAX_PARMS; i++) 
+				for (i=0; i<MAX_PARMS; i++)
 				{
-					if (i<numStrings) 
+					if (i<numStrings)
 					{
 						curChar += strings[i].getLength();
 					}
-					if (i<m_action->getNumParameters()) 
+					if (i<m_action->getNumParameters())
 					{
 						numChars = m_action->getParameter(i)->getUiText().getLength();
-						if (curChar == chrg.cpMin && curChar+numChars == chrg.cpMax) 
+						if (curChar == chrg.cpMin && curChar+numChars == chrg.cpMax)
 						{
 							//Kris:
-							//Before we edit the parameter, there is a new prerequisite for parameters 
+							//Before we edit the parameter, there is a new prerequisite for parameters
 							//but only a few will ever care. We will store what we perceive as the unit,
-							//and for simplicity, we'll store the first occurrence of the unit, although 
+							//and for simplicity, we'll store the first occurrence of the unit, although
 							//this can change in the future should the need arise.
 							AsciiString unitName;
 							for( int j = 0; j < MAX_PARMS; j++ )
@@ -229,7 +224,7 @@ BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 								}
 							}
 
-							if( EditParameter::edit( m_action->getParameter(i), unitName ) == IDOK ) 
+							if( EditParameter::edit( m_action->getParameter(i), unitName ) == IDOK )
 							{
 								m_myEditCtrl.SetWindowText(m_action->getUiText().str());
 								m_curEditParameter = i;
@@ -243,11 +238,11 @@ BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			}
 			CHARRANGE curChrg;
 			m_myEditCtrl.GetSel(curChrg);
-			if (curChrg.cpMin == chrg.cpMin && curChrg.cpMax == chrg.cpMax) 
+			if (curChrg.cpMin == chrg.cpMin && curChrg.cpMax == chrg.cpMax)
 			{
 				return true;
 			}
-			if (m_modifiedTextColor) 
+			if (m_modifiedTextColor)
 			{
 				formatScriptActionText(-1);
 			}
@@ -261,20 +256,20 @@ BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			m_myEditCtrl.SetSelectionCharFormat(cf);
 			m_modifiedTextColor = true;
 			return true;
-		}	
-		else 	if (pHdr->hwndFrom == m_myEditCtrl.m_hWnd && pHdr->code == EN_SELCHANGE) 
+		}
+		else 	if (pHdr->hwndFrom == m_myEditCtrl.m_hWnd && pHdr->code == EN_SELCHANGE)
 		{
-			if (m_updating) 
+			if (m_updating)
 			{
 				return true;
 			}
 			CHARRANGE curChrg;
 			m_myEditCtrl.GetSel(curChrg);
-			if (curChrg.cpMin == m_curLinkChrg.cpMin && curChrg.cpMax == m_curLinkChrg.cpMax) 
+			if (curChrg.cpMin == m_curLinkChrg.cpMin && curChrg.cpMax == m_curLinkChrg.cpMax)
 			{
 				return true;
 			}
-			if (m_modifiedTextColor) 
+			if (m_modifiedTextColor)
 			{
 				formatScriptActionText(-1);
 			}
@@ -283,11 +278,11 @@ BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
-void EditAction::OnSelchangeScriptActionType() 
+void EditAction::OnSelchangeScriptActionType()
 {
 	CComboBox *pCombo = (CComboBox *)GetDlgItem(IDC_CONDITION_TYPE);
 	Int index = 0;
-	CString str; 
+	CString str;
 	pCombo->GetWindowText(str);
 	Int i;
 	for (i=0; i<ScriptAction::NUM_ITEMS; i++) {
@@ -305,7 +300,7 @@ void EditAction::OnSelchangeScriptActionType()
 
 /** Not actually a timer - just used to send a delayed message to self because rich
 edit control is stupid.  jba. */
-void EditAction::OnTimer(UINT nIDEvent) 
+void EditAction::OnTimer(UINT nIDEvent)
 {
 	formatScriptActionText(m_curEditParameter);
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/EditCondition.cpp b/Generals/Code/Tools/WorldBuilder/src/EditCondition.cpp
index bccf7db1c62..4db1f526984 100644
--- a/Generals/Code/Tools/WorldBuilder/src/EditCondition.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/EditCondition.cpp
@@ -58,13 +58,13 @@ END_MESSAGE_MAP()
 // EditCondition message handlers
 
 
-BOOL EditCondition::OnInitDialog() 
+BOOL EditCondition::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
 
 //	CDC *pDc =GetDC();
-	
+
 	CWnd *pWnd = GetDlgItem(IDC_RICH_EDIT_HERE);
 	CRect rect;
 	pWnd->GetWindowRect(&rect);
@@ -85,7 +85,7 @@ BOOL EditCondition::OnInitDialog()
 			pCmbo->SetCurSel(ndx);
 		}
 	}
-	m_condition->setWarnings(false); 
+	m_condition->setWarnings(false);
 	m_myEditCtrl.SetWindowText(m_condition->getUiText().str());
 	m_myEditCtrl.SetSel(-1, -1);
 	formatConditionText(-1);
@@ -156,11 +156,11 @@ void EditCondition::formatConditionText(Int parameterNdx) {
 	} else {
 		if (cstr.LoadString(IDS_SCRIPT_WARNINGS)) {
 			GetDlgItem(IDC_WARNINGS_CAPTION)->SetWindowText(cstr);
-		} 
+		}
 		GetDlgItem(IDC_WARNINGS_CAPTION)->EnableWindow(true);
 		GetDlgItem(IDC_WARNINGS)->SetWindowText(warningText.str());
 	}
-		
+
 	m_modifiedTextColor = false;
 	m_myEditCtrl.SetSel(startSel, endSel);
 	m_updating = false;
@@ -168,8 +168,8 @@ void EditCondition::formatConditionText(Int parameterNdx) {
 
 
 
-BOOL EditCondition::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
-{																											
+BOOL EditCondition::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
+{
 	if (LOWORD(wParam) == IDC_RICH_EDIT_HERE+1) {
 		NMHDR *pHdr = (NMHDR *)lParam;
 		if (pHdr->hwndFrom == m_myEditCtrl.m_hWnd && pHdr->code == EN_LINK) {
@@ -235,11 +235,11 @@ BOOL EditCondition::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
-void EditCondition::OnSelchangeConditionType() 
+void EditCondition::OnSelchangeConditionType()
 {
 	CComboBox *pCmbo = (CComboBox *)GetDlgItem(IDC_CONDITION_TYPE);
 	Int index = 0;
-	CString str; 
+	CString str;
 	pCmbo->GetWindowText(str);
 	Int i;
 	for (i=0; i<ScriptAction::NUM_ITEMS; i++) {
@@ -256,7 +256,7 @@ void EditCondition::OnSelchangeConditionType()
 
 /** Not actually a timer - just used to send a delayed message to self because rich
 edit control is stupid.  jba. */
-void EditCondition::OnTimer(UINT nIDEvent) 
+void EditCondition::OnTimer(UINT nIDEvent)
 {
 	formatConditionText(m_curEditParameter);
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/EditCoordParameter.cpp b/Generals/Code/Tools/WorldBuilder/src/EditCoordParameter.cpp
index 82ee0db4c48..ddf29114adc 100644
--- a/Generals/Code/Tools/WorldBuilder/src/EditCoordParameter.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/EditCoordParameter.cpp
@@ -56,10 +56,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // EditCoordParameter message handlers
 
-BOOL EditCoordParameter::OnInitDialog() 
+BOOL EditCoordParameter::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CEdit *pEditX = (CEdit *)GetDlgItem(IDC_EDIT_X);
 	CEdit *pEditY = (CEdit *)GetDlgItem(IDC_EDIT_Y);
 	CEdit *pEditZ = (CEdit *)GetDlgItem(IDC_EDIT_Z);
@@ -77,7 +77,7 @@ BOOL EditCoordParameter::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void EditCoordParameter::OnOK() 
+void EditCoordParameter::OnOK()
 {
 	CEdit *pEditX = (CEdit *)GetDlgItem(IDC_EDIT_X);
 	CEdit *pEditY = (CEdit *)GetDlgItem(IDC_EDIT_Y);
@@ -113,7 +113,7 @@ void EditCoordParameter::OnOK()
 	CDialog::OnOK();
 }
 
-void EditCoordParameter::OnCancel() 
+void EditCoordParameter::OnCancel()
 {
 
 	CDialog::OnCancel();
diff --git a/Generals/Code/Tools/WorldBuilder/src/EditGroup.cpp b/Generals/Code/Tools/WorldBuilder/src/EditGroup.cpp
index 6c7a7e07aeb..cb3953b4040 100644
--- a/Generals/Code/Tools/WorldBuilder/src/EditGroup.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/EditGroup.cpp
@@ -55,7 +55,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // EditGroup message handlers
 
-void EditGroup::OnOK() 
+void EditGroup::OnOK()
 {
 	CString name;
 	GetDlgItem(IDC_GROUP_NAME)->GetWindowText(name);
@@ -67,10 +67,10 @@ void EditGroup::OnOK()
 	CDialog::OnOK();
 }
 
-BOOL EditGroup::OnInitDialog() 
+BOOL EditGroup::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CButton *pButton = (CButton*)GetDlgItem(IDC_GROUP_ACTIVE);
 	pButton->SetCheck(m_scriptGroup->isActive()?1:0);
 	pButton = (CButton*)GetDlgItem(IDC_GROUP_SUBROUTINE);
@@ -78,7 +78,7 @@ BOOL EditGroup::OnInitDialog()
 
 	CEdit *pEdit = (CEdit*)GetDlgItem(IDC_GROUP_NAME);
 	pEdit->SetWindowText(m_scriptGroup->getName().str());
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/EditObjectParameter.cpp b/Generals/Code/Tools/WorldBuilder/src/EditObjectParameter.cpp
index ea68756746b..72fa5685923 100644
--- a/Generals/Code/Tools/WorldBuilder/src/EditObjectParameter.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/EditObjectParameter.cpp
@@ -64,10 +64,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // EditObjectParameter message handlers
 
-BOOL EditObjectParameter::OnInitDialog() 
+BOOL EditObjectParameter::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 
 	CWnd *pWnd = GetDlgItem(IDC_OBJECT_TREEVIEW);
 	CRect rect;
@@ -87,7 +87,7 @@ BOOL EditObjectParameter::OnInitDialog()
 	{
 		addObject(tTemplate);
 
-	}  // end for tTemplate
+	}
 
 
 	addObjectLists();
@@ -100,13 +100,12 @@ BOOL EditObjectParameter::OnInitDialog()
 //-------------------------------------------------------------------------------------------------
 void EditObjectParameter::addObject( const ThingTemplate *thingTemplate  )
 {
-	char buffer[ _MAX_PATH ];
 	HTREEITEM parent = TVI_ROOT;
 	const char *leafName;
 	//
 	// if we have an thing template in mapObject, we've read it from the new INI database,
 	// we will sort those items into the tree based on properties of the template that
-	// make it easier for us to browse when building levels 
+	// make it easier for us to browse when building levels
 	//
 	// Feel free to reorganize how this tree is constructed from the template
 	// data at will, whatever makes it easier for design
@@ -117,12 +116,11 @@ void EditObjectParameter::addObject( const ThingTemplate *thingTemplate  )
 		// first check for test sorted objects
 		if( thingTemplate->getEditorSorting() == ES_TEST )
 			parent = findOrAdd( parent, "TEST" );
-	
+
 		// first sort by Side, either create or find the tree item with matching side name
 		AsciiString side = thingTemplate->getDefaultOwningSide();
-		DEBUG_ASSERTCRASH(!side.isEmpty(), ("NULL default side in template\n") );
-		strcpy( buffer, side.str() );
-		parent = findOrAdd( parent, buffer );
+		DEBUG_ASSERTCRASH(!side.isEmpty(), ("NULL default side in template") );
+		parent = findOrAdd( parent, side.str());
 
 		// next tier uses the editor sorting that design can specify in the INI
 		EditorSortingType i = ES_FIRST;
@@ -137,9 +135,9 @@ void EditObjectParameter::addObject( const ThingTemplate *thingTemplate  )
 				parent = findOrAdd( parent, EditorSortingNames[ i ] );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		if( i == ES_NUM_SORTING_TYPES )
 			parent = findOrAdd( parent, "UNSORTED" );
@@ -147,7 +145,7 @@ void EditObjectParameter::addObject( const ThingTemplate *thingTemplate  )
 		// the leaf name is the name of the template
 		leafName = thingTemplate->getName().str();
 
-	}  // end if
+	}
 
 	// add to the tree view
 	if( leafName )
@@ -160,7 +158,7 @@ void EditObjectParameter::addObject( const ThingTemplate *thingTemplate  )
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = 0;
 		ins.item.pszText = (char*)leafName;
-		ins.item.cchTextMax = strlen(leafName)+2;				
+		ins.item.cchTextMax = strlen(leafName)+2;
 		m_objectTreeView.InsertItem(&ins);
 
 	}
@@ -179,7 +177,7 @@ void EditObjectParameter::addObjectLists( )
 
 	std::vector<AsciiString> strings;
 	EditParameter::loadObjectTypeList(NULL, &strings);
-	
+
 	Int numItems = strings.size();
 
 	for (Int i = 0; i < numItems; ++i) {
@@ -197,7 +195,7 @@ void EditObjectParameter::addObjectLists( )
 			ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 			ins.item.lParam = 0;
 			ins.item.pszText = (char*)leafName;
-			ins.item.cchTextMax = strlen(leafName)+2;				
+			ins.item.cchTextMax = strlen(leafName)+2;
 			m_objectTreeView.InsertItem(&ins);
 		}
 	}
@@ -215,7 +213,7 @@ HTREEITEM EditObjectParameter::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_objectTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -230,13 +228,13 @@ HTREEITEM EditObjectParameter::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = (char*)pLabel;
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_objectTreeView.InsertItem(&ins);
 	return(child);
 }
 
 
-void EditObjectParameter::OnOK() 
+void EditObjectParameter::OnOK()
 {
 	char buffer[_MAX_PATH];
 	HTREEITEM hItem = m_objectTreeView.GetSelectedItem();
@@ -250,7 +248,7 @@ void EditObjectParameter::OnOK()
 	item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 	item.hItem = hItem;
 	item.pszText = buffer;
-	item.cchTextMax = sizeof(buffer)-2;				
+	item.cchTextMax = sizeof(buffer)-2;
 	m_objectTreeView.GetItem(&item);
 	AsciiString objName = buffer;
 	// We used to try to find the TT here, but now we don't because we
@@ -259,7 +257,7 @@ void EditObjectParameter::OnOK()
 	CDialog::OnOK();
 }
 
-void EditObjectParameter::OnCancel() 
+void EditObjectParameter::OnCancel()
 {
 
 	CDialog::OnCancel();
diff --git a/Generals/Code/Tools/WorldBuilder/src/EditParameter.cpp b/Generals/Code/Tools/WorldBuilder/src/EditParameter.cpp
index a7c1f1237e0..3f8321d85c9 100644
--- a/Generals/Code/Tools/WorldBuilder/src/EditParameter.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/EditParameter.cpp
@@ -64,11 +64,6 @@
 #include "W3DDevice/GameClient/W3DGameFont.h"
 #include "W3DDevice/GameClient/HeightMap.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // TYPE DEFINES ///////////////////////////////////////////////////////////////////////////////////
 #define WORLDBUILDER_FONT_FILENAME		"GUIEFont.txt"
@@ -110,23 +105,23 @@ END_MESSAGE_MAP()
 // EditParameter message handlers
 SidesList *EditParameter::m_sidesListP = NULL;
 
-Int EditParameter::edit( Parameter *pParm, AsciiString unitName ) 
+Int EditParameter::edit( Parameter *pParm, AsciiString unitName )
 {
-	if (pParm->getParameterType() == Parameter::COORD3D) 
+	if (pParm->getParameterType() == Parameter::COORD3D)
 	{
 		EditCoordParameter editCoordDlg;
 		editCoordDlg.m_parameter = pParm;
 		Int ret = editCoordDlg.DoModal();
 		return ret;
 	}
-	else if (pParm->getParameterType() == Parameter::OBJECT_TYPE) 
+	else if (pParm->getParameterType() == Parameter::OBJECT_TYPE)
 	{
 		EditObjectParameter editObjDlg;
 		editObjDlg.m_parameter = pParm;
 		Int ret = editObjDlg.DoModal();
 		return ret;
 	}
-	else if (pParm->getParameterType() == Parameter::COLOR) 
+	else if (pParm->getParameterType() == Parameter::COLOR)
 	{
 		// convert from aarrggbb to 00bbggrr, with 0% alpha
 		UnsignedInt b = (pParm->getInt() & 0x000000ff);
@@ -160,11 +155,11 @@ Int EditParameter::edit( Parameter *pParm, AsciiString unitName )
 	}
 }
 
-AsciiString EditParameter::getWarningText(Parameter *pParm) 
+AsciiString EditParameter::getWarningText(Parameter *pParm)
 {
 	AsciiString warningText;
 	AsciiString uiString = pParm->getString();
-	if (uiString.isEmpty()) 
+	if (uiString.isEmpty())
 		uiString = "???";
 	switch (pParm->getParameterType()) {
 		default:
@@ -259,7 +254,7 @@ AsciiString EditParameter::getWarningText(Parameter *pParm)
 				warningText.format("Object flag '%s' is unrecognized.", uiString.str());
 			}
 			break;
-	
+
 
 		case Parameter::OBJECT_TYPE_LIST:
 			// No warning is possible.
@@ -279,7 +274,7 @@ AsciiString EditParameter::getWarningText(Parameter *pParm)
 			break;
 		case Parameter::BOOLEAN:
 			break;
-					 
+
 		case Parameter::REAL:
 			break;
 
@@ -312,7 +307,7 @@ AsciiString EditParameter::getWarningText(Parameter *pParm)
 				warningText.format("Track '%s' does not exist.", uiString.str());
 			}
 			break;
-			
+
 		case Parameter::MOVIE:
 			if (!loadMovies(NULL, uiString)) {
 				AsciiString commentFromINI;
@@ -335,7 +330,7 @@ AsciiString EditParameter::getWarningText(Parameter *pParm)
 				warningText.format("Science '%s' does not exist.", uiString.str());
 			}
 			break;
-		
+
 		case Parameter::SCIENCE_AVAILABILITY:
 			if( !loadScienceAvailabilities( NULL, uiString ) )
 			{
@@ -353,14 +348,14 @@ AsciiString EditParameter::getWarningText(Parameter *pParm)
 		case Parameter::COMMANDBUTTON_ALL_ABILITIES:
 			//Not sure if I need to do anything here.
 			break;
-		
-		
+
+
 		case Parameter::BOUNDARY:
 			if (TheTerrainRenderObject->getMap()->getAllBoundaries().size() <= pParm->getInt()) {
 				warningText.format("Border %s does not exist.", BORDER_COLORS[pParm->getInt() % BORDER_COLORS_SIZE]);
-			} 
+			}
 			break;
-		
+
 		case Parameter::BUILDABLE:
 			break;
 
@@ -375,13 +370,13 @@ AsciiString EditParameter::getWarningText(Parameter *pParm)
 
 		case Parameter::FACTION_NAME:
 			break;
-		
+
 		case Parameter::EMOTICON:
 			break;
 
 		case Parameter::REVEALNAME:
 			break;
-			
+
 	}
 	return warningText;
 }
@@ -391,9 +386,9 @@ AsciiString EditParameter::getInfoText(Parameter *pParm)
 {
 	AsciiString infoText;
 	AsciiString uiString = pParm->getString();
-	if (uiString.isEmpty()) 
+	if (uiString.isEmpty())
 		uiString = "???";
-	switch (pParm->getParameterType()) 
+	switch (pParm->getParameterType())
 	{
 		default:
 			DEBUG_CRASH(("Unknown parameter type."));
@@ -469,18 +464,18 @@ AsciiString EditParameter::getInfoText(Parameter *pParm)
 
 
 
-void EditParameter::OnChangeEdit() 
+void EditParameter::OnChangeEdit()
 {
 
 }
 
-void EditParameter::OnEditchangeCombo() 
+void EditParameter::OnEditchangeCombo()
 {
-	
+
 }
 
 
-void EditParameter::loadConditionParameter(Script *pScr, Parameter::ParameterType type, CComboBox *pCombo) 
+void EditParameter::loadConditionParameter(Script *pScr, Parameter::ParameterType type, CComboBox *pCombo)
 {
 	OrCondition *pOr;
 	for (pOr= pScr->getOrCondition(); pOr; pOr = pOr->getNextOrCondition()) {
@@ -506,7 +501,7 @@ void EditParameter::loadConditionParameter(Script *pScr, Parameter::ParameterTyp
 	}
 }
 
-void EditParameter::loadActionParameter(Script *pScr, Parameter::ParameterType type, 	CComboBox *pCombo) 
+void EditParameter::loadActionParameter(Script *pScr, Parameter::ParameterType type, 	CComboBox *pCombo)
 {
 	ScriptAction *pAction;
 	for (pAction = pScr->getAction(); pAction; pAction = pAction->getNext()) {
@@ -521,12 +516,12 @@ void EditParameter::loadActionParameter(Script *pScr, Parameter::ParameterType t
 	}
 }
 
-Bool EditParameter::loadAttackSetParameter(Script *pScr, CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadAttackSetParameter(Script *pScr, CComboBox *pCombo, AsciiString match)
 {
 	ScriptAction *pAction;
 	Bool found = false;
 	for (pAction = pScr->getAction(); pAction; pAction = pAction->getNext()) {
-		// Attack priorities are created by SET_ATTACK_PRIORITY_* actions, but 
+		// Attack priorities are created by SET_ATTACK_PRIORITY_* actions, but
 		// referenced by *_APPLY_PRIORITY actions.  So just load from the SET_... ones.
 		if (pAction->getActionType() != ScriptAction::SET_ATTACK_PRIORITY_KIND_OF &&
 			pAction->getActionType() != ScriptAction::SET_DEFAULT_ATTACK_PRIORITY &&
@@ -548,7 +543,7 @@ Bool EditParameter::loadAttackSetParameter(Script *pScr, CComboBox *pCombo, Asci
 	return found;
 }
 
-Bool EditParameter::loadCreateUnitParameter(Script *pScr, CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadCreateUnitParameter(Script *pScr, CComboBox *pCombo, AsciiString match)
 {
 	ScriptAction *pAction;
 	Bool found = false;
@@ -580,7 +575,7 @@ Bool EditParameter::loadCreateObjectListsParameter(Script *pScr, CComboBox *pCom
 		if (pAction->getActionType() != ScriptAction::OBJECTLIST_ADDOBJECTTYPE) {
 			continue;
 		}
-		
+
 		if (Parameter::OBJECT_TYPE_LIST == pAction->getParameter(0)->getParameterType()) {
 			if (match == pAction->getParameter(0)->getString()) {
 				found = true;
@@ -614,7 +609,7 @@ AsciiString EditParameter::getCreatedUnitTemplateName(AsciiString unitName)
 		ScriptAction *pAction;
 		for (pScr = pSL->getScript(); pScr; pScr=pScr->getNext()) {
 			for (pAction = pScr->getAction(); pAction; pAction = pAction->getNext()) {
-				if (pAction->getActionType() != ScriptAction::CREATE_NAMED_ON_TEAM_AT_WAYPOINT 
+				if (pAction->getActionType() != ScriptAction::CREATE_NAMED_ON_TEAM_AT_WAYPOINT
 						&& pAction->getActionType() != ScriptAction::UNIT_SPAWN_NAMED_LOCATION_ORIENTATION) {
 					continue;
 				}
@@ -661,13 +656,13 @@ AsciiString EditParameter::getCreatedUnitTemplateName(AsciiString unitName)
 						}
 					}
 				}
-			}		
+			}
 		}
 	}
 	return AsciiString::TheEmptyString;
 }
 
-void EditParameter::loadCounters(CComboBox *pCombo) 
+void EditParameter::loadCounters(CComboBox *pCombo)
 {
 	pCombo->ResetContent();
 	Int i;
@@ -690,7 +685,7 @@ void EditParameter::loadCounters(CComboBox *pCombo)
 	}
 }
 
-Bool EditParameter::loadAttackPrioritySets(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadAttackPrioritySets(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) pCombo->ResetContent();
 	Int i;
@@ -728,7 +723,7 @@ Bool EditParameter::loadSpecialPowers(CComboBox *pCombo, AsciiString match)
 		if (!pPower) {
 			continue;
 		}
-		
+
 		AsciiString powerName = pPower->getName();
 		if (pCombo) {
 			pCombo->AddString(powerName.str());
@@ -748,14 +743,14 @@ Bool EditParameter::loadSciences(CComboBox *pCombo, AsciiString match)
 	Bool retVal = false;
 
 	std::vector<AsciiString> v = TheScienceStore->friend_getScienceNames();
-	for (int i = 0; i < v.size(); ++i) 
+	for (int i = 0; i < v.size(); ++i)
 	{
-		if (pCombo) 
+		if (pCombo)
 		{
 			pCombo->AddString(v[i].str());
 		}
 
-		if (match.compare(v[i]) == 0) 
+		if (match.compare(v[i]) == 0)
 		{
 			retVal = true;
 		}
@@ -793,7 +788,7 @@ Bool EditParameter::loadUpgrades(CComboBox *pCombo, AsciiString match)
 	Int numUpgrades = upgradeNames.size();
 
 	for (int i = 0; i < numUpgrades; ++i) {
-		
+
 		AsciiString upgradeName = upgradeNames[i];
 		if (pCombo) {
 			pCombo->AddString(upgradeName.str());
@@ -811,21 +806,21 @@ Bool EditParameter::loadUpgrades(CComboBox *pCombo, AsciiString match)
 Bool EditParameter::loadAbilities( CComboBox *pCombo, AsciiString match )
 {
 	Bool retVal = FALSE;
-	
+
 	MapObject *theUnit;
-	for( theUnit = MapObject::getFirstMapObject(); theUnit; theUnit = theUnit->getNext() ) 
+	for( theUnit = MapObject::getFirstMapObject(); theUnit; theUnit = theUnit->getNext() )
 	{
 		Bool exists;
-		AsciiString objName = theUnit->getProperties()->getAsciiString(TheKey_objectName, &exists); 
-		if( !exists ) 
+		AsciiString objName = theUnit->getProperties()->getAsciiString(TheKey_objectName, &exists);
+		if( !exists )
 		{
 			continue;
 		}
-		if( objName.isEmpty() ) 
+		if( objName.isEmpty() )
 		{
 			continue;
 		}
-		if( theUnit->getFlag(FLAG_BRIDGE_FLAGS) ) 
+		if( theUnit->getFlag(FLAG_BRIDGE_FLAGS) )
 		{
 			continue;
 		}
@@ -834,7 +829,7 @@ Bool EditParameter::loadAbilities( CComboBox *pCombo, AsciiString match )
 			break;
 		}
 	}
-	const ThingTemplate *theTemplate = NULL; 
+	const ThingTemplate *theTemplate = NULL;
 
 	if ( theUnit ) {
 		theTemplate = theUnit->getThingTemplate();
@@ -894,7 +889,7 @@ Bool EditParameter::loadAbilities( CComboBox *pCombo, AsciiString match )
 Bool EditParameter::loadAllAbilities( CComboBox *pCombo, AsciiString match )
 {
 	Bool retVal = FALSE;
-	
+
 	if( !TheControlBar )
 	{
 		// create the command bar
@@ -926,7 +921,7 @@ Bool EditParameter::loadAllAbilities( CComboBox *pCombo, AsciiString match )
 Bool EditParameter::loadEmoticons( CComboBox *pCombo, AsciiString match )
 {
 	Bool retVal = FALSE;
-	
+
 	Anim2DTemplate *animTemplate = TheAnim2DCollection->getTemplateHead();
 	//Iterate through all the definitions
 
@@ -949,7 +944,7 @@ Bool EditParameter::loadEmoticons( CComboBox *pCombo, AsciiString match )
 }
 
 //-------------------------------------------------------------------------------------------------
-void EditParameter::loadFlags(CComboBox *pCombo) 
+void EditParameter::loadFlags(CComboBox *pCombo)
 {
 	pCombo->ResetContent();
 	Int i;
@@ -973,11 +968,11 @@ void EditParameter::loadFlags(CComboBox *pCombo)
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool EditParameter::loadObjectType(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadObjectType(CComboBox *pCombo, AsciiString match)
 {
-	if (pCombo) 
+	if (pCombo)
 		pCombo->ResetContent();
-	
+
 	Bool didMatch = false;
 
 	didMatch = loadObjectTypeList(pCombo, NULL, match);
@@ -988,10 +983,10 @@ Bool EditParameter::loadObjectType(CComboBox *pCombo, AsciiString match)
 		tTemplate;
 		tTemplate = tTemplate->friend_getNextTemplate() )
 	{
-		if (pCombo) 
+		if (pCombo)
 			pCombo->AddString( tTemplate->getName().str());
-		
-		if ((match==tTemplate->getName())) 
+
+		if ((match==tTemplate->getName()))
 			didMatch = true;
 	}
 	return didMatch;
@@ -1062,7 +1057,7 @@ Bool EditParameter::loadRevealNames(CComboBox *pCombo, AsciiString match)
 		}
 	}
 
-	return didMatch;	
+	return didMatch;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1074,7 +1069,7 @@ Bool EditParameter::loadRevealNamesParameter(Script *pScr, CComboBox *pCombo, As
 		if (pAction->getActionType() != ScriptAction::MAP_REVEAL_PERMANENTLY_AT_WAYPOINT) {
 			continue;
 		}
-		
+
 		if (Parameter::REVEALNAME == pAction->getParameter(3)->getParameterType()) {
 			if (match == pAction->getParameter(3)->getString()) {
 				found = true;
@@ -1103,13 +1098,13 @@ Bool EditParameter::loadAudioType(Parameter::ParameterType  comboType, CComboBox
 
 	std::vector<AudioEventInfo *> eventInfos;
 	TheAudio->findAllAudioEventsOfType(type, eventInfos);
-	
+
 	for (int i = 0; i < eventInfos.size(); ++i) {
 		if (eventInfos[i]) {
 			if (pCombo) {
 				pCombo->AddString(eventInfos[i]->m_audioName.str());
 			}
-			
+
 			if (match == eventInfos[i]->m_audioName) {
 				retVal = true;
 			}
@@ -1129,7 +1124,7 @@ Bool EditParameter::loadMovies(CComboBox *pCombo, AsciiString match)
 		if (!pVideo) {
 			continue;
 		}
-		
+
 		AsciiString videoName = pVideo->m_internalName;
 		if (pCombo) {
 			pCombo->AddString(videoName.str());
@@ -1153,7 +1148,7 @@ Bool EditParameter::getMovieComment(AsciiString match, AsciiString& outCommentFr
 		if (!pVideo) {
 			continue;
 		}
-		
+
 		AsciiString videoName = pVideo->m_internalName;
 		if (match == videoName && pVideo->m_commentForWB != AsciiString::TheEmptyString) {
 			outCommentFromINI = pVideo->m_commentForWB;
@@ -1166,7 +1161,7 @@ Bool EditParameter::getMovieComment(AsciiString match, AsciiString& outCommentFr
 
 
 //-------------------------------------------------------------------------------------------------
-Bool EditParameter::loadTriggerAreas(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadTriggerAreas(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) pCombo->ResetContent();
 	Bool didMatch = false;
@@ -1320,7 +1315,7 @@ void EditParameter::readFontFile( const char *filename )
 			fontBuffer[ index++ ] = c;
 			fp->read(&c, 1);
 
-		}  // end while
+		}
 		fontBuffer[ index ] = '\0';
 		fp->read(&c, 1);
 
@@ -1337,21 +1332,21 @@ void EditParameter::readFontFile( const char *filename )
 		{
 			char buffer[ 1024 ];
 
-			sprintf( buffer, "Warning: The font '%s' Size: '%d' Bold: '%d', specified in the config file could not be loaded.  Does that font exist?",
+			snprintf( buffer, ARRAY_SIZE(buffer), "Warning: The font '%s' Size: '%d' Bold: '%d', specified in the config file could not be loaded.  Does that font exist?",
 							 fontBuffer, size, bold );
 			//MessageBox( m_appHWnd, buffer, "Cannot Load Font", MB_OK );
-			
-		}  // end if
 
-	}  // end for i
+		}
+
+	}
 
 	// close the file
 	fp->close();
 	fp = NULL;
 
-}  // end readFontFile
+}
 
-Bool EditParameter::loadWaypoints(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadWaypoints(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) pCombo->ResetContent();
 	Bool didMatch = false;
@@ -1366,7 +1361,7 @@ Bool EditParameter::loadWaypoints(CComboBox *pCombo, AsciiString match)
 	return didMatch;
 }
 
-Bool EditParameter::loadWaypointPaths(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadWaypointPaths(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) pCombo->ResetContent();
 	Bool didMatch = false;
@@ -1419,7 +1414,7 @@ Bool EditParameter::loadObjectFlags(CComboBox *pCombo, AsciiString match)
 	return didMatch;
 }
 
-Bool EditParameter::loadScripts(CComboBox *pCombo, Bool subr, AsciiString match) 
+Bool EditParameter::loadScripts(CComboBox *pCombo, Bool subr, AsciiString match)
 {
 	if (pCombo) pCombo->ResetContent();
 	Int i;
@@ -1451,7 +1446,7 @@ Bool EditParameter::loadScripts(CComboBox *pCombo, Bool subr, AsciiString match)
 	return didMatch;
 }
 
-Bool EditParameter::loadSides(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadSides(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) {
 		pCombo->ResetContent();
@@ -1476,7 +1471,7 @@ Bool EditParameter::loadSides(CComboBox *pCombo, AsciiString match)
 	return didMatch;
 }
 
-Bool EditParameter::loadTeams(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadTeams(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) {
 		pCombo->ResetContent();
@@ -1505,7 +1500,7 @@ Bool EditParameter::loadTeams(CComboBox *pCombo, AsciiString match)
 	return didMatch;
 }
 
-Bool EditParameter::loadTeamOrUnit(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadTeamOrUnit(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) {
 		pCombo->ResetContent();
@@ -1526,11 +1521,11 @@ Bool EditParameter::loadTeamOrUnit(CComboBox *pCombo, AsciiString match)
 		}
 		if (pCombo) pCombo->AddString(name.str());
 		if ((name==match)) didMatch = true;
-	}	
+	}
 	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		Bool exists;
-		AsciiString objName = pMapObj->getProperties()->getAsciiString(TheKey_objectName, &exists); 
+		AsciiString objName = pMapObj->getProperties()->getAsciiString(TheKey_objectName, &exists);
 		if (!exists) continue;
 		if (objName.isEmpty()) continue;
 		if (pCombo) pCombo->AddString(objName.str());
@@ -1541,7 +1536,7 @@ Bool EditParameter::loadTeamOrUnit(CComboBox *pCombo, AsciiString match)
 
 Bool EditParameter::loadUnits(CComboBox *pCombo, AsciiString match)
 {
-	if (pCombo) 
+	if (pCombo)
 	{
 		pCombo->ResetContent();
 		pCombo->AddString(THIS_OBJECT);
@@ -1553,32 +1548,32 @@ Bool EditParameter::loadUnits(CComboBox *pCombo, AsciiString match)
 		didMatch = true;
 	}
 	if( match == ANY_OBJECT )
-	{ 
+	{
 		didMatch=true;
 	}
 
 	MapObject *pMapObj;
-	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
 		Bool exists;
-		AsciiString objName = pMapObj->getProperties()->getAsciiString(TheKey_objectName, &exists); 
-		if (!exists) 
+		AsciiString objName = pMapObj->getProperties()->getAsciiString(TheKey_objectName, &exists);
+		if (!exists)
 		{
 			continue;
 		}
-		if (objName.isEmpty()) 
+		if (objName.isEmpty())
 		{
 			continue;
 		}
-		if (pMapObj->getFlag(FLAG_ROAD_FLAGS)) 
+		if (pMapObj->getFlag(FLAG_ROAD_FLAGS))
 		{
 			continue;
 		}
-		if (pCombo) 
+		if (pCombo)
 		{
 			pCombo->AddString(objName.str());
 		}
-		if (objName == match) 
+		if (objName == match)
 		{
 			didMatch = true;
 		}
@@ -1586,24 +1581,24 @@ Bool EditParameter::loadUnits(CComboBox *pCombo, AsciiString match)
 
 	SidesList *sidesListP = m_sidesListP;
 	Int i;
-	if (sidesListP==NULL) 
+	if (sidesListP==NULL)
 	{
 		sidesListP = TheSidesList;
 	}
 	for (i = 0; i < sidesListP->getNumSides(); i++)
 	{
-		SidesInfo *pSide = sidesListP->getSideInfo(i); 
-	
+		SidesInfo *pSide = sidesListP->getSideInfo(i);
+
 		BuildListInfo *pBI = pSide->getBuildList();
 		while (pBI)
 		{
-			if (pBI->getBuildingName().isNotEmpty()) 
+			if (pBI->getBuildingName().isNotEmpty())
 			{
-				if (pCombo) 
+				if (pCombo)
 				{
 					pCombo->AddString(pBI->getBuildingName().str());
 				}
-				if (pBI->getBuildingName() == match) 
+				if (pBI->getBuildingName() == match)
 				{
 					didMatch = true;
 				}
@@ -1664,7 +1659,7 @@ Bool EditParameter::loadBridges(CComboBox *pCombo, AsciiString match)
 	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		Bool exists;
-		AsciiString objName = pMapObj->getProperties()->getAsciiString(TheKey_objectName, &exists); 
+		AsciiString objName = pMapObj->getProperties()->getAsciiString(TheKey_objectName, &exists);
 		if (!exists) continue;
 		if (objName.isEmpty()) continue;
 		if (pMapObj->getFlag(FLAG_BRIDGE_POINT1)) {
@@ -1677,10 +1672,10 @@ Bool EditParameter::loadBridges(CComboBox *pCombo, AsciiString match)
 	return didMatch;
 }
 
-BOOL EditParameter::OnInitDialog() 
+BOOL EditParameter::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CWnd *pCaption = GetDlgItem(IDC_CAPTION);
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_COMBO);
 	CComboBox *pList = (CComboBox*)GetDlgItem(IDC_LIST);
@@ -1805,7 +1800,7 @@ BOOL EditParameter::OnInitDialog()
 			pList->SetCurSel(m_parameter->getInt());
 			showList = true;
 			break;
-					 
+
 		case Parameter::REAL:
 			captionText = "Real number:";
 			editText.Format("%.2f", m_parameter->getReal());
@@ -1838,7 +1833,7 @@ BOOL EditParameter::OnInitDialog()
 			captionText = "Kind of:";
 			showList = true;
 			for (i=KINDOF_FIRST; i<KINDOF_COUNT; i++) {
-				pList->InsertString(-1, KindOfMaskType::getBitNames()[i-KINDOF_FIRST]);				
+				pList->InsertString(-1, KindOfMaskType::getBitNames()[i-KINDOF_FIRST]);
 			}
 			pList->SetCurSel(m_parameter->getInt());
 			break;
@@ -1867,9 +1862,9 @@ BOOL EditParameter::OnInitDialog()
 			pList->InsertString(-1, "Flank");
 			pList->InsertString(-1, "Special");
 			i = pList->FindStringExact(-1, m_parameter->getString().str());
-			if (i!=CB_ERR) 
+			if (i!=CB_ERR)
 				pList->SetCurSel(i);
-			else 
+			else
 				pList->SetCurSel(0);
 			showList = true;
 			break;
@@ -1920,7 +1915,7 @@ BOOL EditParameter::OnInitDialog()
 			showCombo = true;
 			loadSpecialPowers(pCombo);
 			break;
-		
+
 		case Parameter::SCIENCE:
 			captionText = "Science:";
 			showCombo = true;
@@ -1944,7 +1939,7 @@ BOOL EditParameter::OnInitDialog()
 			showCombo = true;
 			loadAbilities( pCombo );
 			break;
-		
+
 		case Parameter::COMMANDBUTTON_ALL_ABILITIES:
 			captionText = "Ability:";
 			showCombo = true;
@@ -1980,7 +1975,7 @@ BOOL EditParameter::OnInitDialog()
 			for (i = 0; i < 3; ++i) {
 				pList->InsertString(-1, Surfaces[i]);
 			}
-			
+
 			// 0 is invalid for surfaces, so change this to a 3 (which means AIR and GROUND)
 			if (m_parameter->getInt() == 0) {
 				m_parameter->friend_setInt(3);
@@ -2008,7 +2003,7 @@ BOOL EditParameter::OnInitDialog()
 			showList = true;
 			for( i = 0; i < OBJECT_STATUS_COUNT; i++ )
 			{
-				pList->InsertString( -1, ObjectStatusMaskType::getBitNames()[i] );				
+				pList->InsertString( -1, ObjectStatusMaskType::getBitNames()[i] );
 			}
 			pList->SelectString( -1, m_parameter->getString().str() );
 			break;
@@ -2038,7 +2033,7 @@ BOOL EditParameter::OnInitDialog()
 			break;
 		}
 		case Parameter::OBJECT_TYPE_LIST:
-		{	
+		{
 			captionText = "Object type list:";
 			showCombo = true;
 			loadObjectTypeList(pCombo);
@@ -2080,7 +2075,7 @@ BOOL EditParameter::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void EditParameter::OnOK() 
+void EditParameter::OnOK()
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_COMBO);
 	CEdit *pEdit = (CEdit *)GetDlgItem(IDC_EDIT);
@@ -2152,7 +2147,7 @@ void EditParameter::OnOK()
 				return;
 			}
 			break;
-					 
+
 		case Parameter::REAL:
 			pEdit->GetWindowText(txt);
 			Real theReal;
@@ -2191,7 +2186,7 @@ void EditParameter::OnOK()
 			m_parameter->friend_setInt(pList->GetCurSel() + ATTITUDE_SLEEP);
 			break;
 		case Parameter::SKIRMISH_WAYPOINT_PATH:	{
-			CString cstr;			 
+			CString cstr;
 			pList->GetLBText(pList->GetCurSel(), cstr);
 			m_parameter->friend_setString((LPCTSTR)cstr);
 			break;
@@ -2205,7 +2200,7 @@ void EditParameter::OnOK()
 			m_parameter->friend_setString(loadLocalizedText(NULL, comboText));
 			break;
 		case Parameter::BOUNDARY:
-		{	
+		{
 			Int curSel = pCombo->GetCurSel();
 			if (curSel >= 0) {
 				m_parameter->friend_setInt(curSel);
@@ -2228,11 +2223,11 @@ void EditParameter::OnOK()
 		case Parameter::OBJECT_STATUS:
 		{
 			Int curSel = pList->GetCurSel();
-			if( curSel >= 0 ) 
+			if( curSel >= 0 )
 			{
 				m_parameter->friend_setString( ObjectStatusMaskType::getBitNames()[curSel] );
-			} 
-			else 
+			}
+			else
 			{
 				m_parameter->friend_setString( AsciiString::TheEmptyString );
 			}
@@ -2261,7 +2256,7 @@ void EditParameter::OnOK()
 	CDialog::OnOK();
 }
 
-void EditParameter::OnCancel() 
+void EditParameter::OnCancel()
 {
 
 	CDialog::OnCancel();
@@ -2269,7 +2264,7 @@ void EditParameter::OnCancel()
 
 /* This function handles a left click on
    the "preview sound" button */
-void EditParameter::OnPreviewSound() 
+void EditParameter::OnPreviewSound()
 {
 	CString txt;
 	AsciiString comboText;
@@ -2287,7 +2282,7 @@ void EditParameter::OnPreviewSound()
 		event.setEventName(comboText);
 		event.setAudioEventInfo(TheAudio->findAudioEventInfo(comboText));
 		event.generateFilename();
-		
+
 		if (!event.getFilename().isEmpty()) {
 			PlaySound(event.getFilename().str(), NULL, SND_ASYNC | SND_FILENAME | SND_PURGE);
 		}
@@ -2304,7 +2299,7 @@ AsciiString EditParameter::loadLocalizedText(CComboBox *pCombo, AsciiString isSt
 			pCombo->AddString(vec[i].str());
 		}
 	}
-	
+
 	if (isStringInTable != AsciiString::TheEmptyString) {
 		for (int i = 0; i < vec.size(); ++i) {
 			if (isStringInTable.compare(vec[i].str()) == 0) {
diff --git a/Generals/Code/Tools/WorldBuilder/src/EulaDialog.cpp b/Generals/Code/Tools/WorldBuilder/src/EulaDialog.cpp
index 68a796175f3..038f5d440b2 100644
--- a/Generals/Code/Tools/WorldBuilder/src/EulaDialog.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/EulaDialog.cpp
@@ -59,13 +59,13 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // EulaDialog message handlers
 
-BOOL EulaDialog::OnInitDialog() 
+BOOL EulaDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CString theText;
 	theText.LoadString( IDS_EULA_AGREEMENT1 );
-	
+
 	CString concatText;
 	concatText.LoadString( IDS_EULA_AGREEMENT2 );
 	theText += concatText;
@@ -75,13 +75,13 @@ BOOL EulaDialog::OnInitDialog()
 	theText += concatText;
 	concatText.LoadString( IDS_EULA_AGREEMENT5 );
 	theText += concatText;
-	
+
 	CWnd *theEditDialog = GetDlgItem( IDC_EDIT1 );
 	if( theEditDialog )
 	{
 		theEditDialog->SetWindowText( theText );
 	}
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/ExportScriptsOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/ExportScriptsOptions.cpp
index f9b0f955705..fea78fb4385 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ExportScriptsOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ExportScriptsOptions.cpp
@@ -56,10 +56,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ExportScriptsOptions message handlers
 
-void ExportScriptsOptions::OnOK() 
+void ExportScriptsOptions::OnOK()
 {
 	// TODO: Add extra validation here
-	
+
 	CButton *pButton = (CButton*)GetDlgItem(IDC_WAYPOINTS);
 	m_waypoints = pButton->GetCheck()==1;
 	pButton = (CButton*)GetDlgItem(IDC_UNITS);
@@ -72,10 +72,10 @@ void ExportScriptsOptions::OnOK()
 	CDialog::OnOK();
 }
 
-BOOL ExportScriptsOptions::OnInitDialog() 
+BOOL ExportScriptsOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CButton *pButton = (CButton*)GetDlgItem(IDC_WAYPOINTS);
 	pButton->SetCheck(m_waypoints?1:0);
 	pButton = (CButton*)GetDlgItem(IDC_UNITS);
@@ -86,7 +86,7 @@ BOOL ExportScriptsOptions::OnInitDialog()
 	pButton->SetCheck(m_allScripts?1:0);
 	pButton = (CButton*)GetDlgItem(IDC_SELECTED_SCRIPTS);
 	pButton->SetCheck(m_allScripts?0:1);
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/EyedropperTool.cpp b/Generals/Code/Tools/WorldBuilder/src/EyedropperTool.cpp
index 45203c384f4..8b570fbb0e7 100644
--- a/Generals/Code/Tools/WorldBuilder/src/EyedropperTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/EyedropperTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "EyedropperTool.h"
@@ -36,18 +36,18 @@
 //
 /// Constructor
 EyedropperTool::EyedropperTool(void) :
-	Tool(ID_EYEDROPPER_TOOL, IDC_EYEDROPPER) 
+	Tool(ID_EYEDROPPER_TOOL, IDC_EYEDROPPER)
 {
 }
-	
+
 /// Destructor
-EyedropperTool::~EyedropperTool(void) 
+EyedropperTool::~EyedropperTool(void)
 {
 }
 
 
 /// Shows the terrain materials options panel.
-void EyedropperTool::activate() 
+void EyedropperTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_TERRAIN_MATERIAL);
 	TerrainMaterial::setToolOptions(true);
@@ -56,7 +56,7 @@ void EyedropperTool::activate()
 
 /// Perform the tool behavior on mouse down.
 /** Finds the current texture class, and tells the terrain material panel to use it as fg. */
-void EyedropperTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void EyedropperTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/FeatherOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/FeatherOptions.cpp
index 6f0a9ef8272..e8365374079 100644
--- a/Generals/Code/Tools/WorldBuilder/src/FeatherOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/FeatherOptions.cpp
@@ -36,7 +36,7 @@ Int FeatherOptions::m_currentRadius = 1;
 
 FeatherOptions::FeatherOptions(CWnd* pParent /*=NULL*/)
 {
-	//{{AFX_DATA_INIT(FeatherOptions) 
+	//{{AFX_DATA_INIT(FeatherOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -52,8 +52,8 @@ void FeatherOptions::DoDataExchange(CDataExchange* pDX)
 
 /// Sets the feather value in the dialog.
 /** Update the value in the edit control and the slider. */
-void FeatherOptions::setFeather(Int feather) 
-{ 
+void FeatherOptions::setFeather(Int feather)
+{
 	CString buf;
 	buf.Format("%d", feather);
 	m_currentFeather = feather;
@@ -66,8 +66,8 @@ void FeatherOptions::setFeather(Int feather)
 
 /// Sets the rate value in the dialog.
 /** Update the value in the edit control and the slider. */
-void FeatherOptions::setRate(Int rate) 
-{ 
+void FeatherOptions::setRate(Int rate)
+{
 	CString buf;
 	buf.Format("%d", rate);
 	m_currentRate = rate;
@@ -80,8 +80,8 @@ void FeatherOptions::setRate(Int rate)
 
 /// Sets the radius value in the dialog.
 /** Update the value in the edit control and the slider. */
-void FeatherOptions::setRadius(Int radius) 
-{ 
+void FeatherOptions::setRadius(Int radius)
+{
 	CString buf;
 	buf.Format("%d", radius);
 	m_currentRadius = radius;
@@ -97,12 +97,12 @@ void FeatherOptions::setRadius(Int radius)
 // FeatherOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL FeatherOptions::OnInitDialog() 
+BOOL FeatherOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = true;
 	m_featherPopup.SetupPopSliderButton(this, IDC_SIZE_POPUP, this);
 	m_radiusPopup.SetupPopSliderButton(this, IDC_RADIUS_POPUP, this);
@@ -122,7 +122,7 @@ BOOL FeatherOptions::OnInitDialog()
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void FeatherOptions::OnChangeSizeEdit() 
+void FeatherOptions::OnChangeSizeEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SIZE_EDIT);
@@ -134,7 +134,7 @@ void FeatherOptions::OnChangeSizeEdit()
 			if (1==sscanf(buffer, "%d", &width)) {
 				m_currentFeather = width;
 				FeatherTool::setFeather(m_currentFeather);
-				sprintf(buffer, "%.1f FEET.", m_currentFeather*MAP_XY_FACTOR);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentFeather*MAP_XY_FACTOR);
 				pEdit = m_staticThis->GetDlgItem(IDC_WIDTH_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -172,7 +172,7 @@ void FeatherOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMa
 		default:
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void FeatherOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -207,7 +207,7 @@ void FeatherOptions::PopSliderChanged(const long sliderID, long theVal)
 
 		default:
 			break;
-	}	// switch
+	}
 }
 
 void FeatherOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -221,7 +221,7 @@ void FeatherOptions::PopSliderFinished(const long sliderID, long theVal)
 		default:
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/FeatherTool.cpp b/Generals/Code/Tools/WorldBuilder/src/FeatherTool.cpp
index 3bb02e35261..117004025ff 100644
--- a/Generals/Code/Tools/WorldBuilder/src/FeatherTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/FeatherTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "FeatherTool.h"
@@ -46,19 +46,19 @@ FeatherTool::FeatherTool(void) :
 	m_htMapFeatherCopy = NULL;
 	m_htMapRateCopy = NULL;
 }
-	
+
 /// Destructor
-FeatherTool::~FeatherTool(void) 
+FeatherTool::~FeatherTool(void)
 {
 	REF_PTR_RELEASE(m_htMapEditCopy);
-	REF_PTR_RELEASE(m_htMapFeatherCopy); 
-	REF_PTR_RELEASE(m_htMapRateCopy); 
+	REF_PTR_RELEASE(m_htMapFeatherCopy);
+	REF_PTR_RELEASE(m_htMapRateCopy);
 }
 
 
 
 /// Shows the brush options panel.
-void FeatherTool::activate() 
+void FeatherTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_FEATHER_OPTIONS);
 	DrawObject::setDoBrushFeedback(true);
@@ -66,8 +66,8 @@ void FeatherTool::activate()
 }
 
 /// Set the brush feather and notify the height options panel of the change.
-void FeatherTool::setFeather(Int feather) 
-{ 
+void FeatherTool::setFeather(Int feather)
+{
 	if (m_feather != feather) {
 		m_feather = feather;
 		// notify feather palette options panel
@@ -77,8 +77,8 @@ void FeatherTool::setFeather(Int feather)
 };
 
 /// Set the brush feather and notify the height options panel of the change.
-void FeatherTool::setRate(Int rate) 
-{ 
+void FeatherTool::setRate(Int rate)
+{
 	if (m_rate != rate) {
 		m_rate = rate;
 		// notify feather palette options panel
@@ -87,8 +87,8 @@ void FeatherTool::setRate(Int rate)
 };
 
 /// Set the brush feather and notify the height options panel of the change.
-void FeatherTool::setRadius(Int radius) 
-{ 
+void FeatherTool::setRadius(Int radius)
+{
 	if (m_radius != radius) {
 		m_radius = radius;
 		// notify feather palette options panel
@@ -99,7 +99,7 @@ void FeatherTool::setRadius(Int radius)
 /// Start tool.
 /** Setup the tool to start brushing - make a copy of the height map
 to edit, another copy because we need it :), and call mouseMovedDown. */
-void FeatherTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void FeatherTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -121,9 +121,9 @@ void FeatherTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 }
 
 /// End tool.
-/** Finish the tool operation - create a command, pass it to the 
+/** Finish the tool operation - create a command, pass it to the
 doc to execute, and cleanup ref'd objects. */
-void FeatherTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void FeatherTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -165,7 +165,7 @@ void FeatherTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 		if (i<0 || i>=m_htMapEditCopy->getXExtent()) {
 			continue;
 		}
-		for (j=ndx.y-sub; j<ndx.y+add; j++) {					
+		for (j=ndx.y-sub; j<ndx.y+add; j++) {
 			if (j<0 || j>=m_htMapEditCopy->getYExtent()) {
 				continue;
 			}
@@ -222,10 +222,10 @@ void FeatherTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 				total = floor(origHeight*(1.0f-rateF) + total*rateF + 0.5f);
 				m_htMapEditCopy->setHeight(i, j, total);
 				pDoc->invalCell(i, j);
-			} 
+			}
 		}
 	}
-	
+
 	IRegion2D partialRange;
 	partialRange.lo.x = ndx.x - brushWidth;
 	partialRange.hi.x = ndx.x + brushWidth;
diff --git a/Generals/Code/Tools/WorldBuilder/src/FenceOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/FenceOptions.cpp
index 59012bd3469..0b4885ad5c1 100644
--- a/Generals/Code/Tools/WorldBuilder/src/FenceOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/FenceOptions.cpp
@@ -20,9 +20,9 @@
 //
 
 /** The fence options is essentially a front for the object options panel.
-The	fence options panel has a subset of the objects available, and when one is 
+The	fence options panel has a subset of the objects available, and when one is
 selected, makes the current object in the object options panel match this object.
-Then the new object is created by the object options panel, so team parenting and 
+Then the new object is created by the object options panel, so team parenting and
 so forth is all handled in the object options panel.  jba. */
 
 #define DEFINE_EDITOR_SORTING_NAMES
@@ -51,7 +51,7 @@ Int FenceOptions::m_currentObjectIndex=-1;
 Real FenceOptions::m_fenceSpacing=1;
 Real FenceOptions::m_fenceOffset=0;
 
-										 
+
 /////////////////////////////////////////////////////////////////////////////
 // FenceOptions dialog
 
@@ -68,9 +68,7 @@ FenceOptions::FenceOptions(CWnd* pParent /*=NULL*/)
 
 FenceOptions::~FenceOptions(void)
 {
-	if (m_objectsList) {
-		deleteInstance(m_objectsList);
-	}
+	deleteInstance(m_objectsList);
 	m_objectsList = NULL;
 }
 
@@ -134,7 +132,7 @@ void FenceOptions::updateObjectOptions()
 // FenceOptions message handlers
 
 /// Setup the controls in the dialog.
-BOOL FenceOptions::OnInitDialog() 
+BOOL FenceOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -163,7 +161,7 @@ BOOL FenceOptions::OnInitDialog()
 		Color cc = tTemplate->getDisplayColor();
 		pMap->setColor(cc);
 
-	}  // end for tTemplate
+	}
 
 
 	CWnd *pWnd = GetDlgItem(IDC_OBJECT_HEIGHT_EDIT);
@@ -212,7 +210,7 @@ HTREEITEM FenceOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_objectTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -227,7 +225,7 @@ HTREEITEM FenceOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = (char*)pLabel;
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_objectTreeView.InsertItem(&ins);
 	return(child);
 }
@@ -235,10 +233,9 @@ HTREEITEM FenceOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 //-------------------------------------------------------------------------------------------------
 /** Add the object hierarchy paths to the tree view. */
 //-------------------------------------------------------------------------------------------------
-void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const char *name, 
+void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const char *name,
 															 Int terrainNdx, HTREEITEM parent )
 {
-	char buffer[ _MAX_PATH ];
 	const char *leafName = NULL;
 
 	// sanity
@@ -248,7 +245,7 @@ void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const cha
 	//
 	// if we have an thing template in mapObject, we've read it from the new INI database,
 	// we will sort those items into the tree based on properties of the template that
-	// make it easier for us to browse when building levels 
+	// make it easier for us to browse when building levels
 	//
 	// Feel free to reorganize how this tree is constructed from the template
 	// data at will, whatever makes it easier for design
@@ -260,12 +257,11 @@ void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const cha
 		// first check for test sorted objects
 		if( thingTemplate->getEditorSorting() == ES_TEST )
 			parent = findOrAdd( parent, "TEST" );
-	
+
 		// first sort by side, either create or find the tree item with matching side name
 		AsciiString side = thingTemplate->getDefaultOwningSide();
-		DEBUG_ASSERTCRASH( !side.isEmpty(), ("NULL default side in template\n") );
-		strcpy( buffer, side.str() );
-		parent = findOrAdd( parent, buffer );
+		DEBUG_ASSERTCRASH( !side.isEmpty(), ("NULL default side in template") );
+		parent = findOrAdd( parent, side.str());
 
 		// next tier uses the editor sorting that design can specify in the INI
 		EditorSortingType i = ES_FIRST;
@@ -280,9 +276,9 @@ void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const cha
 				parent = findOrAdd( parent, EditorSortingNames[ i ] );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		if( i == ES_NUM_SORTING_TYPES )
 			parent = findOrAdd( parent, "UNSORTED" );
@@ -290,7 +286,7 @@ void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const cha
 		// the leaf name is the name of the template
 		leafName = thingTemplate->getName().str();
 
-	}  // end if
+	}
 
 	// add to the tree view
 	if( leafName )
@@ -303,7 +299,7 @@ void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const cha
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = terrainNdx;
 		ins.item.pszText = (char*)leafName;
-		ins.item.cchTextMax = strlen(leafName)+2;				
+		ins.item.cchTextMax = strlen(leafName)+2;
 		m_objectTreeView.InsertItem(&ins);
 
 	}
@@ -342,13 +338,13 @@ Bool FenceOptions::setObjectTreeViewSelection(HTREEITEM parent, Int selection)
 		item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;
 		item.hItem = child;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_objectTreeView.GetItem(&item);
 		if (item.lParam == selection) {
 			m_objectTreeView.SelectItem(child);
 			return(true);
 		}
-		if (setObjectTreeViewSelection(child, selection)) 
+		if (setObjectTreeViewSelection(child, selection))
 		{
 			updateObjectOptions();
 			return(true);
@@ -359,7 +355,7 @@ Bool FenceOptions::setObjectTreeViewSelection(HTREEITEM parent, Int selection)
 }
 
 
-BOOL FenceOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL FenceOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_objectTreeView.m_hWnd) {
@@ -384,7 +380,7 @@ BOOL FenceOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_objectTreeView.GetItem(&item);
 			if (item.lParam >= 0) {
 				m_currentObjectIndex = item.lParam;
@@ -395,14 +391,14 @@ BOOL FenceOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			updateObjectOptions();
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
 
 
 
-void FenceOptions::OnChangeFenceSpacingEdit() 
+void FenceOptions::OnChangeFenceSpacingEdit()
 {
 	CWnd *pWnd = m_staticThis->GetDlgItem(IDC_FENCE_SPACING_EDIT);
 	if (pWnd) {
diff --git a/Generals/Code/Tools/WorldBuilder/src/FenceTool.cpp b/Generals/Code/Tools/WorldBuilder/src/FenceTool.cpp
index 4832a982c1f..c7d89109b8a 100644
--- a/Generals/Code/Tools/WorldBuilder/src/FenceTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/FenceTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "FenceTool.h"
@@ -45,13 +45,11 @@ FenceTool::FenceTool(void) :
 		m_curObjectWidth = 27.35f;
 		m_curObjectOffset = 0;
 }
-	
+
 /// Destructor
-FenceTool::~FenceTool(void) 
+FenceTool::~FenceTool(void)
 {
-	if (m_mapObjectList) {
-		deleteInstance(m_mapObjectList);
-	}
+	deleteInstance(m_mapObjectList);
 	m_mapObjectList = NULL;
 }
 
@@ -125,7 +123,7 @@ void FenceTool::updateMapObjectList(Coord3D downPt, Coord3D curPt, WbView* pView
 
 
 /// Turn off object tracking.
-void FenceTool::deactivate() 
+void FenceTool::deactivate()
 {
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (pDoc==NULL) return;
@@ -133,7 +131,7 @@ void FenceTool::deactivate()
 	p3View->setObjTracking(NULL, m_downPt3d, 0, false);
 }
 /// Shows the object options panel
-void FenceTool::activate() 
+void FenceTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_FENCE_OPTIONS);
 	DrawObject::setDoBrushFeedback(false);
@@ -145,7 +143,7 @@ void FenceTool::activate()
 }
 
 /** Execute the tool on mouse down - Place an object. */
-void FenceTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void FenceTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -154,10 +152,10 @@ void FenceTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 	pView->snapPoint(&cpt);
 	m_downPt2d = viewPt;
 	m_downPt3d = cpt;
-	if (m_mapObjectList) {
-		deleteInstance(m_mapObjectList);
-		m_mapObjectList = NULL;
-	}
+
+	deleteInstance(m_mapObjectList);
+	m_mapObjectList = NULL;
+
 	if (FenceOptions::hasSelectedObject()) {
 		FenceOptions::update();
 		m_curObjectWidth = FenceOptions::getFenceSpacing();
@@ -167,9 +165,9 @@ void FenceTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 		mouseMoved(m, viewPt, pView, pDoc);
 	}
 }
-																			 
+
 /** Tracking - show the object. */
-void FenceTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void FenceTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 //	Bool justAClick = true;
 	Coord3D cpt;
@@ -186,19 +184,19 @@ void FenceTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 	MapObject *pCur = ObjectOptions::getObjectNamed(AsciiString(ObjectOptions::getCurObjectName()));
 	p3View->setObjTracking(NULL, m_downPt3d, 0, false);
 	loc.z = ObjectOptions::getCurObjectHeight();
-	if (pCur && FenceOptions::hasSelectedObject()) { 
+	if (pCur && FenceOptions::hasSelectedObject()) {
 		// Display the transparent version of this object.
 		m_curObjectOffset = FenceOptions::getFenceOffset();
 		loc.x += m_curObjectOffset;
 		p3View->setObjTracking(pCur, loc, angle, true);
 	} else {
-		// Don't display anything. 
+		// Don't display anything.
 		p3View->setObjTracking(NULL, loc, angle, false);
 	}
 }
 
 /** Execute the tool on mouse up - Place an object. */
-void FenceTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void FenceTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	Coord3D cpt;
diff --git a/Generals/Code/Tools/WorldBuilder/src/FloodFillTool.cpp b/Generals/Code/Tools/WorldBuilder/src/FloodFillTool.cpp
index 33c06cc018f..328370274de 100644
--- a/Generals/Code/Tools/WorldBuilder/src/FloodFillTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/FloodFillTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "FloodFillTool.h"
@@ -43,9 +43,9 @@ FloodFillTool::FloodFillTool(void) :
 	m_cliffCursor(NULL)
 {
 }
-	
+
 /// Destructor
-FloodFillTool::~FloodFillTool(void) 
+FloodFillTool::~FloodFillTool(void)
 {
 	if (m_cliffCursor) {
 		::DestroyCursor(m_cliffCursor);
@@ -54,7 +54,7 @@ FloodFillTool::~FloodFillTool(void)
 
 
 /// Shows the terrain materials options panel.
-void FloodFillTool::activate() 
+void FloodFillTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_TERRAIN_MATERIAL);
 	TerrainMaterial::setToolOptions(true);
@@ -63,7 +63,7 @@ void FloodFillTool::activate()
 }
 
 /** Set the cursor. */
-void FloodFillTool::setCursor(void)   
+void FloodFillTool::setCursor(void)
 {
 	if (m_adjustCliffTextures) {
 		if (m_cliffCursor == NULL) {
@@ -82,7 +82,7 @@ void FloodFillTool::setCursor(void)
 /** Creates a copy of the height map, flood fills it at pt with m_textureClassToDraw which
 has been set by the calling routine.  Then builds
 the command, and passes it to the doc. */
-void FloodFillTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void FloodFillTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	Coord3D cpt;
 	pView->viewToDocCoords(viewPt, &cpt);
@@ -94,7 +94,7 @@ void FloodFillTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 
 	if (m == TRACK_L)
 		m_textureClassToDraw = TerrainMaterial::getFgTexClass();
-	else 
+	else
 		m_textureClassToDraw = TerrainMaterial::getBgTexClass();
 
 //	WorldHeightMapEdit *pMap = pDoc->GetHeightMap();
@@ -113,7 +113,7 @@ void FloodFillTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 		WBDocUndoable *pUndo = new WBDocUndoable(pDoc, htMapEditCopy);
 		pDoc->AddAndDoUndoable(pUndo);
 		REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-	} 
+	}
 	REF_PTR_RELEASE(htMapEditCopy);
 }
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp
index 9919cd9c0de..5cbd61e86f6 100644
--- a/Generals/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp
@@ -34,7 +34,7 @@
 GlobalLightOptions::GlobalLightOptions(CWnd* pParent /*=NULL*/)
 	: CDialog(GlobalLightOptions::IDD, pParent)
 {
-	//{{AFX_DATA_INIT(GlobalLightOptions) 
+	//{{AFX_DATA_INIT(GlobalLightOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -61,8 +61,8 @@ static void calcNewLight(Int lr, Int fb, Vector3 *newLight)
 	newLight->Rotate_Z(zAngle);
 }
 
-void GlobalLightOptions::updateEditFields(void) 
-{ 
+void GlobalLightOptions::updateEditFields(void)
+{
 	m_updating = true;
 	CString str;
 	CWnd *pEdit;
@@ -91,14 +91,14 @@ void GlobalLightOptions::updateEditFields(void)
 	m_updating = false;
 }
 
-void GlobalLightOptions::showLightFeedback(Int lightIndex) 
+void GlobalLightOptions::showLightFeedback(Int lightIndex)
 {
 	Vector3 light(0,0,0);
 	light.X = sin(PI/2.0f+m_angleElevation[lightIndex]/180.0f*PI)*cos(m_angleAzimuth[lightIndex]/180.0f*PI);// -WWMath::Sin(PI*(m_angleLR[lightIndex]-90)/180);
 	light.Y = sin(PI/2.0f+m_angleElevation[lightIndex]/180.0f*PI)*sin(m_angleAzimuth[lightIndex]/180.0f*PI);//-WWMath::Sin(PI*(m_angleFB[lightIndex]-90)/180);
 	light.Z = cos (PI/2.0f+m_angleElevation[lightIndex]/180.0f*PI);
 
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		Coord3D lightRay;
 		lightRay.x=light.X;lightRay.y=light.Y;lightRay.z=light.Z;
@@ -106,8 +106,8 @@ void GlobalLightOptions::showLightFeedback(Int lightIndex)
 	}
 }
 
-void GlobalLightOptions::applyAngle(Int lightIndex) 
-{ 
+void GlobalLightOptions::applyAngle(Int lightIndex)
+{
 	Vector3 light(0,0,0);
 	light.X = sin(PI/2.0f+m_angleElevation[lightIndex]/180.0f*PI)*cos(m_angleAzimuth[lightIndex]/180.0f*PI);// -WWMath::Sin(PI*(m_angleLR[lightIndex]-90)/180);
 	light.Y = sin(PI/2.0f+m_angleElevation[lightIndex]/180.0f*PI)*sin(m_angleAzimuth[lightIndex]/180.0f*PI);//-WWMath::Sin(PI*(m_angleFB[lightIndex]-90)/180);
@@ -129,7 +129,7 @@ void GlobalLightOptions::applyAngle(Int lightIndex)
 	tl.lightPos.y = light.Y;
 	tl.lightPos.z = light.Z;
 
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		pView->setLighting(&tl, m_lighting, lightIndex);
 		Coord3D lightRay;
@@ -142,7 +142,7 @@ static void SpitLights()
 {
 #ifdef DEBUG_LOGGING
 	CString lightstrings[100];
-	DEBUG_LOG(("GlobalLighting\n\n"));
+	DEBUG_LOG(("GlobalLighting\n"));
 	Int redA, greenA, blueA;
 	Int redD, greenD, blueD;
 	Real x, y, z;
@@ -172,9 +172,9 @@ static void SpitLights()
 			y = TheGlobalData->m_terrainLighting[time+TIME_OF_DAY_FIRST][light].lightPos.y;
 			z = TheGlobalData->m_terrainLighting[time+TIME_OF_DAY_FIRST][light].lightPos.z;
 
-			DEBUG_LOG(("TerrainLighting%sAmbient%s = R:%d G:%d B:%d\n", times[time], lights[light], redA, greenA, blueA));
-			DEBUG_LOG(("TerrainLighting%sDiffuse%s = R:%d G:%d B:%d\n", times[time], lights[light], redD, greenD, blueD));
-			DEBUG_LOG(("TerrainLighting%sLightPos%s = X:%0.2f Y:%0.2f Z:%0.2f\n", times[time], lights[light], x, y, z));
+			DEBUG_LOG(("TerrainLighting%sAmbient%s = R:%d G:%d B:%d", times[time], lights[light], redA, greenA, blueA));
+			DEBUG_LOG(("TerrainLighting%sDiffuse%s = R:%d G:%d B:%d", times[time], lights[light], redD, greenD, blueD));
+			DEBUG_LOG(("TerrainLighting%sLightPos%s = X:%0.2f Y:%0.2f Z:%0.2f", times[time], lights[light], x, y, z));
 
 			redA = TheGlobalData->m_terrainObjectsLighting[time+TIME_OF_DAY_FIRST][light].ambient.red*255;
 			greenA = TheGlobalData->m_terrainObjectsLighting[time+TIME_OF_DAY_FIRST][light].ambient.green*255;
@@ -188,50 +188,50 @@ static void SpitLights()
 			y = TheGlobalData->m_terrainObjectsLighting[time+TIME_OF_DAY_FIRST][light].lightPos.y;
 			z = TheGlobalData->m_terrainObjectsLighting[time+TIME_OF_DAY_FIRST][light].lightPos.z;
 
-			DEBUG_LOG(("TerrainObjectsLighting%sAmbient%s = R:%d G:%d B:%d\n", times[time], lights[light], redA, greenA, blueA));
-			DEBUG_LOG(("TerrainObjectsLighting%sDiffuse%s = R:%d G:%d B:%d\n", times[time], lights[light], redD, greenD, blueD));
-			DEBUG_LOG(("TerrainObjectsLighting%sLightPos%s = X:%0.2f Y:%0.2f Z:%0.2f\n", times[time], lights[light], x, y, z));
+			DEBUG_LOG(("TerrainObjectsLighting%sAmbient%s = R:%d G:%d B:%d", times[time], lights[light], redA, greenA, blueA));
+			DEBUG_LOG(("TerrainObjectsLighting%sDiffuse%s = R:%d G:%d B:%d", times[time], lights[light], redD, greenD, blueD));
+			DEBUG_LOG(("TerrainObjectsLighting%sLightPos%s = X:%0.2f Y:%0.2f Z:%0.2f", times[time], lights[light], x, y, z));
 
-			DEBUG_LOG(("\n"));
+			DEBUG_LOG_RAW(("\n"));
 		}
-		DEBUG_LOG(("\n"));
+		DEBUG_LOG_RAW(("\n"));
 	}
 
-	DEBUG_LOG(("GlobalLighting Code\n\n"));
+	DEBUG_LOG(("GlobalLighting Code\n"));
 	for (time=0; time<4; time++) {
 		for (Int light=0; light<3; light++) {
 			Int theTime = time+TIME_OF_DAY_FIRST;
 			GlobalData::TerrainLighting tl = TheGlobalData->m_terrainLighting[theTime][light];
 
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].ambient.red = %0.4ff;\n", theTime, light, tl.ambient.red));
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].ambient.green = %0.4ff;\n", theTime, light, tl.ambient.green));
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].ambient.blue = %0.4ff;\n", theTime, light, tl.ambient.blue));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].ambient.red = %0.4ff;", theTime, light, tl.ambient.red));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].ambient.green = %0.4ff;", theTime, light, tl.ambient.green));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].ambient.blue = %0.4ff;", theTime, light, tl.ambient.blue));
 
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].diffuse.red = %0.4ff;\n", theTime, light, tl.diffuse.red));
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].diffuse.green = %0.4ff;\n", theTime, light, tl.diffuse.green));
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].diffuse.blue = %0.4ff;\n", theTime, light, tl.diffuse.blue));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].diffuse.red = %0.4ff;", theTime, light, tl.diffuse.red));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].diffuse.green = %0.4ff;", theTime, light, tl.diffuse.green));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].diffuse.blue = %0.4ff;", theTime, light, tl.diffuse.blue));
+
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].lightPos.x = %0.4ff;", theTime, light, tl.lightPos.x));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].lightPos.y = %0.4ff;", theTime, light, tl.lightPos.y));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].lightPos.z = %0.4ff;", theTime, light, tl.lightPos.z));
 
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].lightPos.x = %0.4ff;\n", theTime, light, tl.lightPos.x));
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].lightPos.y = %0.4ff;\n", theTime, light, tl.lightPos.y));
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].lightPos.z = %0.4ff;\n", theTime, light, tl.lightPos.z));
-				
 			tl = TheGlobalData->m_terrainObjectsLighting[theTime][light];
 
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].ambient.red = %0.4ff;\n", theTime, light, tl.ambient.red));
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].ambient.green = %0.4ff;\n", theTime, light, tl.ambient.green));
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].ambient.blue = %0.4ff;\n", theTime, light, tl.ambient.blue));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].ambient.red = %0.4ff;", theTime, light, tl.ambient.red));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].ambient.green = %0.4ff;", theTime, light, tl.ambient.green));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].ambient.blue = %0.4ff;", theTime, light, tl.ambient.blue));
 
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].diffuse.red = %0.4ff;\n", theTime, light, tl.diffuse.red));
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].diffuse.green = %0.4ff;\n", theTime, light, tl.diffuse.green));
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].diffuse.blue = %0.4ff;\n", theTime, light, tl.diffuse.blue));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].diffuse.red = %0.4ff;", theTime, light, tl.diffuse.red));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].diffuse.green = %0.4ff;", theTime, light, tl.diffuse.green));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].diffuse.blue = %0.4ff;", theTime, light, tl.diffuse.blue));
 
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].lightPos.x = %0.4ff;\n", theTime, light, tl.lightPos.x));
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].lightPos.y = %0.4ff;\n", theTime, light, tl.lightPos.y));
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].lightPos.z = %0.4ff;\n", theTime, light, tl.lightPos.z));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].lightPos.x = %0.4ff;", theTime, light, tl.lightPos.x));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].lightPos.y = %0.4ff;", theTime, light, tl.lightPos.y));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].lightPos.z = %0.4ff;", theTime, light, tl.lightPos.z));
 
-			DEBUG_LOG(("\n"));
+			DEBUG_LOG_RAW(("\n"));
 		}
-		DEBUG_LOG(("\n"));
+		DEBUG_LOG_RAW(("\n"));
 	}
 #endif
 }
@@ -469,7 +469,7 @@ void GlobalLightOptions::OnResetLights()
 	TheWritableGlobalData->m_terrainObjectsLighting[4][2].lightPos.y = 0.00f;
 	TheWritableGlobalData->m_terrainObjectsLighting[4][2].lightPos.z = -1.00f;
 
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		pView->setLighting(&TheGlobalData->m_terrainLighting[TheGlobalData->m_timeOfDay][K_SUN], K_TERRAIN, K_SUN);
 		pView->setLighting(&TheGlobalData->m_terrainLighting[TheGlobalData->m_timeOfDay][K_ACCENT1], K_TERRAIN, K_ACCENT1);
@@ -488,9 +488,9 @@ void GlobalLightOptions::OnResetLights()
 // GlobalLightOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL GlobalLightOptions::OnInitDialog() 
+BOOL GlobalLightOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	kUIRedIDs[0] = IDC_RD_EDIT;
@@ -539,7 +539,7 @@ BOOL GlobalLightOptions::OnInitDialog()
 
 
 /** Displays the current values in the fields. */
-void GlobalLightOptions::stuffValuesIntoFields(Int lightIndex) 
+void GlobalLightOptions::stuffValuesIntoFields(Int lightIndex)
 {
 	const GlobalData::TerrainLighting *tl;
 	if (m_lighting == K_OBJECTS || m_lighting == K_BOTH) {
@@ -620,7 +620,7 @@ void GlobalLightOptions::stuffValuesIntoFields(Int lightIndex)
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
 
-BOOL GlobalLightOptions::GetInt(Int ctrlID, Int *rVal) 
+BOOL GlobalLightOptions::GetInt(Int ctrlID, Int *rVal)
 {
 	CWnd *pEdit = GetDlgItem(ctrlID);
 	char buffer[_MAX_PATH];
@@ -635,7 +635,7 @@ BOOL GlobalLightOptions::GetInt(Int ctrlID, Int *rVal)
 	return false;
 }
 
-void GlobalLightOptions::PutInt(Int ctrlID, Int val) 
+void GlobalLightOptions::PutInt(Int ctrlID, Int val)
 {
 	CString str;
 	CWnd *pEdit = GetDlgItem(ctrlID);
@@ -645,7 +645,7 @@ void GlobalLightOptions::PutInt(Int ctrlID, Int val)
 	}
 }
 
-void GlobalLightOptions::OnChangeFrontBackEdit() 
+void GlobalLightOptions::OnChangeFrontBackEdit()
 {
 	if (m_updating) return;
 	GetInt(IDC_FB_EDIT, &m_angleAzimuth[K_SUN]);
@@ -661,7 +661,7 @@ void GlobalLightOptions::OnChangeFrontBackEdit()
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the angles. */
-void GlobalLightOptions::OnChangeLeftRightEdit() 
+void GlobalLightOptions::OnChangeLeftRightEdit()
 {
 	if (m_updating) return;
 	GetInt(IDC_LR_EDIT, &m_angleElevation[K_SUN]);
@@ -713,13 +713,13 @@ void GlobalLightOptions::applyColor(Int lightIndex)
 		tl.diffuse.green = ComponentToPercent(clr);
 	if (GetInt(kUIBlueIDs[lightIndex], &clr))
 		tl.diffuse.blue = ComponentToPercent(clr);
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		pView->setLighting(&tl, m_lighting, lightIndex);
 	}
 }
 
-void GlobalLightOptions::OnChangeColorEdit() 
+void GlobalLightOptions::OnChangeColorEdit()
 {
 	if (m_updating) return;
 	applyColor(K_SUN);
@@ -775,7 +775,7 @@ void GlobalLightOptions::GetPopSliderInfo(const long sliderID, long *pMin, long
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void GlobalLightOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -822,7 +822,7 @@ void GlobalLightOptions::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void GlobalLightOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -845,7 +845,7 @@ void GlobalLightOptions::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
@@ -883,7 +883,7 @@ END_MESSAGE_MAP()
 
 
 
-void GlobalLightOptions::OnRadioEverything() 
+void GlobalLightOptions::OnRadioEverything()
 {
 	m_lighting = K_BOTH;
 	stuffValuesIntoFields(K_SUN);
@@ -891,7 +891,7 @@ void GlobalLightOptions::OnRadioEverything()
 	stuffValuesIntoFields(K_ACCENT2);
 }
 
-void GlobalLightOptions::OnRadioObjects() 
+void GlobalLightOptions::OnRadioObjects()
 {
 	m_lighting = K_OBJECTS;
 	stuffValuesIntoFields(K_SUN);
@@ -899,7 +899,7 @@ void GlobalLightOptions::OnRadioObjects()
 	stuffValuesIntoFields(K_ACCENT2);
 }
 
-void GlobalLightOptions::OnRadioTerrain() 
+void GlobalLightOptions::OnRadioTerrain()
 {
 	m_lighting = K_TERRAIN;
 	stuffValuesIntoFields(K_SUN);
@@ -924,7 +924,7 @@ void GlobalLightOptions::OnClose()
 {
 	ShowWindow(SW_HIDE);
 
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		Coord3D lightRay;
 		lightRay.x=0.0f;lightRay.y=0.0f;lightRay.z=-1.0f;	//default light above terrain.
@@ -954,15 +954,15 @@ void GlobalLightOptions::OnShowWindow(BOOL bShow, UINT nStatus)
 #endif
 };
 
-void GlobalLightOptions::OnMove(int x, int y) 
+void GlobalLightOptions::OnMove(int x, int y)
 {
 	CDialog::OnMove(x, y);
-	
+
 	if (this->IsWindowVisible() && !this->IsIconic()) {
 		CRect frameRect;
 		GetWindowRect(&frameRect);
 		::AfxGetApp()->WriteProfileInt(GLOBALLIGHT_OPTIONS_PANEL_SECTION, "Top", frameRect.top);
 		::AfxGetApp()->WriteProfileInt(GLOBALLIGHT_OPTIONS_PANEL_SECTION, "Left", frameRect.left);
 	}
-	
+
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/GroveOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/GroveOptions.cpp
index 1b791c358ad..b0cb541a0fa 100644
--- a/Generals/Code/Tools/WorldBuilder/src/GroveOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/GroveOptions.cpp
@@ -176,11 +176,11 @@ void GroveOptions::_setTreesToLists(void)
 {
 	CString str;
 	for (VecPairNameDisplayNameIt it = mVecDisplayNames.begin(); it != mVecDisplayNames.end(); it++) {
-		// TODO: If/when Models get Display strings, we need to replace the 
+		// TODO: If/when Models get Display strings, we need to replace the
 		// current (str = ...) line with the commented one JKMCD
 		str = it->first.str();
 		//str = GetDisplayNameFromPair(it).str();
-		
+
 		CComboBox* pComboBox = (CComboBox*) GetDlgItem(IDC_Grove_Type1);
 		if (pComboBox) {
 			pComboBox->AddString(str);
@@ -266,35 +266,35 @@ void GroveOptions::_setDefaultRatios(void)
 	CWnd* pWnd = GetDlgItem(IDC_Grove_Per1);
 	if (pWnd) {
 		defaultRatio = AfxGetApp()->GetProfileInt("GroveOptions", "DefaultRatio1", 0);
-		sprintf(buff, "%d", defaultRatio);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", defaultRatio);
 		pWnd->SetWindowText(buff);
 	}
 
 	pWnd = GetDlgItem(IDC_Grove_Per2);
 	if (pWnd) {
 		defaultRatio = AfxGetApp()->GetProfileInt("GroveOptions", "DefaultRatio2", 0);
-		sprintf(buff, "%d", defaultRatio);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", defaultRatio);
 		pWnd->SetWindowText(buff);
 	}
 
 	pWnd = GetDlgItem(IDC_Grove_Per3);
 	if (pWnd) {
 		defaultRatio = AfxGetApp()->GetProfileInt("GroveOptions", "DefaultRatio3", 0);
-		sprintf(buff, "%d", defaultRatio);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", defaultRatio);
 		pWnd->SetWindowText(buff);
 	}
 
 	pWnd = GetDlgItem(IDC_Grove_Per4);
 	if (pWnd) {
 		defaultRatio = AfxGetApp()->GetProfileInt("GroveOptions", "DefaultRatio4", 0);
-		sprintf(buff, "%d", defaultRatio);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", defaultRatio);
 		pWnd->SetWindowText(buff);
 	}
 
 	pWnd = GetDlgItem(IDC_Grove_Per5);
 	if (pWnd) {
 		defaultRatio = AfxGetApp()->GetProfileInt("GroveOptions", "DefaultRatio5", 0);
-		sprintf(buff, "%d", defaultRatio);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", defaultRatio);
 		pWnd->SetWindowText(buff);
 	}
 }
@@ -308,7 +308,7 @@ void GroveOptions::_setDefaultNumTrees(void)
 
 	int defaultNumTrees = AfxGetApp()->GetProfileInt("GroveOptions", "NumberofTrees", 10);
 	static char buff[ARBITRARY_BUFF_SIZE];
-	sprintf(buff, "%d", defaultNumTrees);
+	snprintf(buff, ARRAY_SIZE(buff), "%d", defaultNumTrees);
 
 	pWnd->SetWindowText(buff);
 }
@@ -379,14 +379,14 @@ void GroveOptions::_updateTreeWeights(void)
 
 	pWnd = GetDlgItem(IDC_Grove_PerTotal);
 	if (pWnd) {
-		sprintf(buff, "%d", val);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", val);
 		pWnd->SetWindowText(buff);
 	}
 }
 
 void GroveOptions::_updateTreeCount(void)
 {
-	static char buff[ARBITRARY_BUFF_SIZE];	
+	static char buff[ARBITRARY_BUFF_SIZE];
 	CWnd* pWnd = GetDlgItem(IDC_Grove_NumberTrees);
 	if (pWnd) {
 		pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
@@ -426,7 +426,7 @@ void GroveOptions::_updateGroveMakeup(void)
 			AfxGetApp()->WriteProfileInt("GroveOptions", "TreeType4", curSel);
 		} else if (type == 5) {
 			AfxGetApp()->WriteProfileInt("GroveOptions", "TreeType5", curSel);
-		}		
+		}
 	}
 }
 
@@ -442,7 +442,7 @@ void GroveOptions::_updatePlacementAllowed(void)
 
 	pButt = (CButton*) GetDlgItem(IDC_Grove_AllowWaterPlacement);
 	if (pButt) {
-		AfxGetApp()->WriteProfileInt("GroveOptions", "AllowWaterPlace", pButt->GetCheck()); 
+		AfxGetApp()->WriteProfileInt("GroveOptions", "AllowWaterPlace", pButt->GetCheck());
 	}
 
 
@@ -489,4 +489,4 @@ BEGIN_MESSAGE_MAP(GroveOptions, CDialog)
 	ON_CBN_SELENDOK(IDC_Grove_Type5, _updateGroveMakeup)
 	ON_BN_CLICKED(IDC_Grove_AllowCliffPlacement, _updatePlacementAllowed)
 	ON_BN_CLICKED(IDC_Grove_AllowWaterPlacement, _updatePlacementAllowed)
-END_MESSAGE_MAP()
\ No newline at end of file
+END_MESSAGE_MAP()
diff --git a/Generals/Code/Tools/WorldBuilder/src/GroveTool.cpp b/Generals/Code/Tools/WorldBuilder/src/GroveTool.cpp
index d13f45ab2a8..c53bc119d51 100644
--- a/Generals/Code/Tools/WorldBuilder/src/GroveTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/GroveTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "GroveTool.h"
@@ -80,7 +80,7 @@ void GroveTool::plantTree( Coord3D *pos )
 	int totalValue = TheGroveOptions->getTotalTreePerc();
 	int randVal = GameLogicRandomValue(0, totalValue - 1);
 
-	
+
 	int runningCum = 0;
 	for (int i = 1; i <= 5; ++i) {
 		runningCum +=  TheGroveOptions->getNumType(i);
@@ -97,7 +97,7 @@ void GroveTool::plantTree( Coord3D *pos )
 	addObj(pos, treeName);
 }
 
-void GroveTool::activate() 
+void GroveTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_GROVE_OPTIONS);
 	DrawObject::setDoBrushFeedback(false);
@@ -108,15 +108,15 @@ void GroveTool::activate()
 void GroveTool::plantShrub( Coord3D *pos )
 {
 // TODO: Determine when we can tell something is a shurubbery, and plant it here - jkmcd
-//	addObj(pos, AsciiString("Shrub"));
+//	addObj(pos, "Shrub");
 }
 
 void GroveTool::_plantGroveInBox(CPoint tl, CPoint br, WbView* pView)
 {
 
 	int numTotalTrees = TheGroveOptions->getNumTrees();
-	
-	Coord3D tl3d, tr3d, bl3d;	
+
+	Coord3D tl3d, tr3d, bl3d;
 	pView->viewToDocCoords(tl, &tl3d);
 	pView->viewToDocCoords(CPoint(tl.x, br.y), &bl3d);
 	pView->viewToDocCoords(CPoint(br.x, tl.y), &tr3d);
@@ -141,7 +141,7 @@ void GroveTool::_plantGroveInBox(CPoint tl, CPoint br, WbView* pView)
 
 		tlVec = tlVec + trVec;
 		tlVec = tlVec + blVec;
-		
+
 		Coord3D position;
 
 		position.x = tlVec.X;
@@ -216,9 +216,9 @@ void GroveTool::plantGrove( Coord3D pos, Coord3D prevDir, Real baseHeight, Int l
 				// tree must be on map
 				// tree must not be in the water
 				if (dir.x * prevDir.x + dir.y * prevDir.y >= 0.0f &&
-						normal.z > flatTolerance && 
+						normal.z > flatTolerance &&
 						fabs(childPos.z - baseHeight) < heightTolerance &&
-						childPos.x > 0 && childPos.y > 0 && 
+						childPos.x > 0 && childPos.y > 0 &&
 						childPos.x < bounds.x && childPos.y < bounds.y &&
 						(!localIsUnderwater(childPos.x, childPos.y)))
 					break;
@@ -236,21 +236,19 @@ void GroveTool::plantGrove( Coord3D pos, Coord3D prevDir, Real baseHeight, Int l
 //
 /// Constructor
 GroveTool::GroveTool(void) :
-	Tool(ID_GROVE_TOOL, IDC_GROVE) 
+	Tool(ID_GROVE_TOOL, IDC_GROVE)
 {
 		m_headMapObj = NULL;
 }
-	
+
 /// Destructor
-GroveTool::~GroveTool(void) 
+GroveTool::~GroveTool(void)
 {
-	if (m_headMapObj) {
-		deleteInstance(m_headMapObj);
-	}
+	deleteInstance(m_headMapObj);
 }
 
 /** Execute the tool on mouse down - Place an object. */
-void GroveTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void GroveTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	m_downPt = viewPt;
@@ -258,7 +256,7 @@ void GroveTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 }
 
 /** Execute the tool on mouse up - Place an object. */
-void GroveTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void GroveTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -280,18 +278,18 @@ void GroveTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBui
 			m_headMapObj = NULL; // undoable owns it now.
 		}
 		return;
-	}	
+	}
+
+	Coord3D loc;
 
-	Coord3D loc;  
-	
 	pView->viewToDocCoords(m_downPt, &loc);
 
-	WorldHeightMapEdit *pMap = pDoc->GetHeightMap(); 
+	WorldHeightMapEdit *pMap = pDoc->GetHeightMap();
 	CPoint bounds;
 	bounds.x = pMap->getXExtent()*MAP_XY_FACTOR;
-	bounds.y = pMap->getYExtent()*MAP_XY_FACTOR; 
+	bounds.y = pMap->getYExtent()*MAP_XY_FACTOR;
 //	Real angle = 0;
-	Int depth = 3;		
+	Int depth = 3;
 	Coord3D zeroDir;
 
 	zeroDir.x = 0.0f;
@@ -344,7 +342,7 @@ void GroveTool::addObj(Coord3D *pos, AsciiString name)
 	MapObject *pNew = newInstance( MapObject)(theLoc, pCur->getName(), angle, 0, NULL, pCur->getThingTemplate() );
 	pNew->getProperties()->setAsciiString(TheKey_originalOwner, NEUTRAL_TEAM_INTERNAL_STR);
 	pNew->setNextMap(m_headMapObj);
-	m_headMapObj = pNew;	
+	m_headMapObj = pNew;
 }
 
 
@@ -352,11 +350,11 @@ void GroveTool::addObj(Coord3D *pos, AsciiString name)
 static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 {
 	Coord3D otherPos;
-	
+
 	otherPos = pos;
 	otherPos.x += MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
+
 	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) ||
 		  ((otherPos.z / pos.z / 1) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
@@ -365,8 +363,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos = pos;
 	otherPos.y += MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / 1) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
@@ -374,8 +372,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos = pos;
 	otherPos.y -= MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / 1) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
@@ -383,8 +381,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos = pos;
 	otherPos.x -= MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / 1) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
@@ -393,8 +391,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos.x += MAP_XY_FACTOR;
 	otherPos.y += MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
@@ -403,8 +401,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos.x += MAP_XY_FACTOR;
 	otherPos.y -= MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
@@ -413,8 +411,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos.x -= MAP_XY_FACTOR;
 	otherPos.y -= MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
@@ -423,8 +421,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos.x -= MAP_XY_FACTOR;
 	otherPos.y += MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
diff --git a/Generals/Code/Tools/WorldBuilder/src/HandScrollTool.cpp b/Generals/Code/Tools/WorldBuilder/src/HandScrollTool.cpp
index 83f576da1ee..5da879514f7 100644
--- a/Generals/Code/Tools/WorldBuilder/src/HandScrollTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/HandScrollTool.cpp
@@ -20,7 +20,7 @@
 // Scrolling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "HandScrollTool.h"
@@ -39,22 +39,22 @@ static const Int MAX_SCROLL = 1000;
 
 /// Constructor
 HandScrollTool::HandScrollTool(void) :
-	Tool(ID_HAND_SCROLL_TOOL, IDC_HAND_SCROLL) 
+	Tool(ID_HAND_SCROLL_TOOL, IDC_HAND_SCROLL)
 {
 }
-	
+
 /// Shows the terrain materials options panel.
-void HandScrollTool::activate() 
+void HandScrollTool::activate()
 {
 	return; // Hand scroll tool intentionally doesn't change tool panel.
 }
 
 /// Destructor
-HandScrollTool::~HandScrollTool(void) 	  
+HandScrollTool::~HandScrollTool(void)
 {
 }
 
-void HandScrollTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void HandScrollTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L && m != TRACK_R && m != TRACK_M) return;
 
@@ -97,7 +97,7 @@ void HandScrollTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, C
 		// Scroll dynamically.
 		Coord3D prev, cur;
 		if (pView->viewToDocCoords(m_prevPt2d, &prev, false) &&
-					pView->viewToDocCoords(viewPt, &cur, false)) 
+					pView->viewToDocCoords(viewPt, &cur, false))
 		{
 
 			Real dx = cur.x - prev.x;
@@ -117,7 +117,7 @@ void HandScrollTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, C
 	}
 }
 
-void HandScrollTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void HandScrollTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m == TRACK_M) {
 		// if haven't moved, reset view
diff --git a/Generals/Code/Tools/WorldBuilder/src/ImpassableOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/ImpassableOptions.cpp
index 1f7c7abbc69..5f48de02ae1 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ImpassableOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ImpassableOptions.cpp
@@ -19,7 +19,7 @@
 // ImpassableOptions.cpp
 // Author: John McDonald, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "ImpassableOptions.h"
@@ -28,11 +28,11 @@
 #include "WorldBuilderDoc.h"
 
 //-------------------------------------------------------------------------------------------------
-ImpassableOptions::ImpassableOptions(CWnd* pParent, Real defaultSlope) : 
-	CDialog(ImpassableOptions::IDD, pParent), 
+ImpassableOptions::ImpassableOptions(CWnd* pParent, Real defaultSlope) :
+	CDialog(ImpassableOptions::IDD, pParent),
 	m_slopeToShow(defaultSlope),
 	m_defaultSlopeToShow(defaultSlope)
-{	
+{
 	// nada to do
 	m_showImpassableAreas = TheTerrainRenderObject->getShowImpassableAreas();
 	TheTerrainRenderObject->setShowImpassableAreas(TRUE);
@@ -108,4 +108,4 @@ void ImpassableOptions::OnPreview()
 BEGIN_MESSAGE_MAP(ImpassableOptions, CDialog)
 	ON_EN_UPDATE(IDC_ANGLE, OnAngleChange)
 	ON_BN_CLICKED(IDC_PREVIEW, OnPreview)
-END_MESSAGE_MAP()
\ No newline at end of file
+END_MESSAGE_MAP()
diff --git a/Generals/Code/Tools/WorldBuilder/src/LayersList.cpp b/Generals/Code/Tools/WorldBuilder/src/LayersList.cpp
index 34a1b7ffe35..5a44b9c4646 100644
--- a/Generals/Code/Tools/WorldBuilder/src/LayersList.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/LayersList.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: LayersList.cpp 
+// FILE: LayersList.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -58,7 +58,7 @@ void CLLTreeCtrl::buildMoveMenu(CMenu* moveMenu, UINT firstID)
 
 	// to save the copy
 	const ListLayer& layer = pParent->GetAllLayers();
-	
+
 	ListLayer::const_iterator cit;
 
 	int i = 0;
@@ -108,7 +108,7 @@ void CLLTreeCtrl::OnRButtonDown(UINT nFlags, CPoint point)
 			pPopup->RemoveMenu(3, MF_BYPOSITION);
 			Bool hidden = ll->isLayerHidden(AsciiString(GetItemText(item)));
 			pPopup->CheckMenuItem(ID_HIDECURRENTLAYER, MF_BYCOMMAND | (hidden ? MF_CHECKED : MF_UNCHECKED));
-			
+
 			CMenu *moveMenu = pPopup->GetSubMenu(2);
 			moveMenu->RemoveMenu(0, MF_BYPOSITION);
 			buildMoveMenu(moveMenu, ID_LAYERSLIST_MERGELAYERINTO_BEGIN);
@@ -116,7 +116,7 @@ void CLLTreeCtrl::OnRButtonDown(UINT nFlags, CPoint point)
 			pPopup->EnableMenuItem(ID_DELETECURRENTLAYER, MF_GRAYED);
 			pPopup->RemoveMenu(2, MF_BYPOSITION);
 			pPopup->RemoveMenu(ID_HIDECURRENTLAYER, MF_BYCOMMAND);
-			
+
 			CMenu* moveMenu = pPopup->GetSubMenu(2);
 			moveMenu->RemoveMenu(0, MF_BYPOSITION);
 			buildMoveMenu(moveMenu, ID_LAYERSLIST_MERGEOBJECTINTO_BEGIN);
@@ -138,7 +138,7 @@ END_MESSAGE_MAP()
 // LayersList Implementation //////////////////////////////////////////////////////////////////////
 
 LayersList::LayersList(UINT nIDTemplate, CWnd *parentWnd) : CDialog(nIDTemplate, parentWnd)
-{ 
+{
 	mTree = NULL;
 	resetLayers();
 }
@@ -219,7 +219,7 @@ void LayersList::addLayerNamed(IN AsciiString layerToAdd)
 		DEBUG_CRASH(("Already found a layer named %s", layerToAdd.str()));
 		return;
 	}
-	
+
 	if (layerToAdd.isEmpty()) {
 		return;
 	}
@@ -269,7 +269,7 @@ void LayersList::changeLayerName(IN AsciiString oldLayerName, AsciiString newLay
 }
 
 void LayersList::mergeLayerInto(IN ListLayerIt src, IN ListLayerIt dst)
-{	
+{
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (!pDoc) {
 		return;
@@ -322,11 +322,11 @@ void LayersList::updateUIFromList(void)
 
 //	int index = 0;
 
-	for (ListLayerIt layersIt = mLayers.begin(); layersIt != mLayers.end(); ++layersIt) {		
-		// Add a branch for each Layer. 
+	for (ListLayerIt layersIt = mLayers.begin(); layersIt != mLayers.end(); ++layersIt) {
+		// Add a branch for each Layer.
 		int iconToShow = (layersIt->show ? 0 : 1);
 		HTREEITEM thisBranch = pTree->InsertItem(layersIt->layerName.str(), iconToShow, iconToShow);
-		
+
 		for (ListMapObjectPtrIt objIt = layersIt->objectsInLayer.begin(); objIt != layersIt->objectsInLayer.end(); ++objIt) {
 			Bool exists;
 			AsciiString uniqueID = (*objIt)->getProperties()->getAsciiString(TheKey_uniqueID, &exists);
@@ -335,7 +335,7 @@ void LayersList::updateUIFromList(void)
 			} else {
 				pTree->InsertItem((*objIt)->getName().str(), iconToShow, iconToShow, thisBranch);
 			}
-		}		
+		}
 	}
 }
 
@@ -422,7 +422,7 @@ void LayersList::addMapObjectToLayer(IN MapObject *objectToAdd, IN ListLayerIt *
 		int iconToShow = (layerToAddTo->show ? 0 : 1);
 		mTree->InsertItem(objName.str(), iconToShow, iconToShow, hItem);
 	}
-	
+
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (!pDoc) {
 		return;
@@ -475,7 +475,7 @@ void LayersList::removeMapObjectFromLayer(IN MapObject *objectToRemove, IN ListL
 
 	// layerToRemoveFrom and objectToRemove are now valid. Remove em.
 	layerToRemoveFrom->objectsInLayer.erase(objectBeingRemove);
-	
+
 }
 
 BOOL LayersList::OnInitDialog()
@@ -489,7 +489,7 @@ BOOL LayersList::OnInitDialog()
 	if (!pTree) {
 		return 1;
 	}
-	
+
 	CRect rect;
 	mTree = new CLLTreeCtrl;
 	pTree->GetWindowRect(&rect);
@@ -503,7 +503,7 @@ BOOL LayersList::OnInitDialog()
 	// pTree should == mTree now.
 
 	mImageList.Create(16, 16, ILC_COLOR8, 2, 2);
-	
+
 	mImageList.Add(LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_Show)));
 	mImageList.Add(LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_Hide)));
 
@@ -512,10 +512,10 @@ BOOL LayersList::OnInitDialog()
 
 
 	return 1;
-	
+
 }
 
-// returning 0 means editing can continue. 
+// returning 0 means editing can continue.
 // returning 1 means editing is cancelled
 void LayersList::OnBeginEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult)
 {
@@ -526,7 +526,7 @@ void LayersList::OnBeginEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult)
 	}
 
 	TV_DISPINFO *ptvdi = (TV_DISPINFO*) pNotifyStruct;
-	if (ptvdi == NULL) { 
+	if (ptvdi == NULL) {
 		(*pResult) = 1;
 		return;
 	}
@@ -535,9 +535,9 @@ void LayersList::OnBeginEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult)
 		(*pResult) = 1;
 		return;
 	}
-	
+
 	CString str = pTree->GetItemText(ptvdi->item.hItem);
-	// if we can't find the layer of that name, then 
+	// if we can't find the layer of that name, then
 	if (!findLayerNamed(AsciiString(str))) {
 		// End the editing
 		(*pResult) = 1;
@@ -555,7 +555,7 @@ void LayersList::OnEndEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult)
 	if (!pTree) {
 		return;
 	}
-	
+
 	TV_DISPINFO *ptvdi = (TV_DISPINFO*) pNotifyStruct;
 	if (!ptvdi->item.pszText) {
 		return;
@@ -576,7 +576,7 @@ void LayersList::OnEndEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult)
 	pTree->SetItemText(ptvdi->item.hItem, layerIt->layerName.str());
 
 	mCurrentlyEditingLabel = AsciiString::TheEmptyString;
-	
+
 	return;
 }
 
@@ -588,7 +588,7 @@ void LayersList::OnNewLayer()
 	}
 
 	static char buffer[1024];
-	sprintf(buffer, "%s %d", TheDefaultNewLayerName.c_str(), newLayerNum);
+	snprintf(buffer, ARRAY_SIZE(buffer), "%s %d", TheDefaultNewLayerName.c_str(), newLayerNum);
 	addLayerNamed(buffer);
 
 	HTREEITEM newItem = pTree->InsertItem(buffer, 0, 0);
@@ -659,7 +659,7 @@ HTREEITEM LayersList::findTreeObjectNamed(const AsciiString& objectToFind, HTREE
 	}
 
 	HTREEITEM hItem = mTree->GetChildItem(layerItem);
-	
+
 	while (hItem) {
 		if (objectToFind.compareNoCase(mTree->GetItemText(hItem)) == 0) {
 			return hItem;
@@ -704,7 +704,7 @@ void LayersList::OnHideShowLayer()
 		item = mTree->GetChildItem(item);
 		while (item) {
 			mTree->SetItemImage(item, iconToShow, iconToShow);
-			item = mTree->GetNextSiblingItem(item);	
+			item = mTree->GetNextSiblingItem(item);
 		}
 	}
 
@@ -728,7 +728,7 @@ void LayersList::OnCancel()
 	if (!pTree) {
 		return;
 	}
-	
+
 	// end editing in place with failure
 	TreeView_EndEditLabelNow(pTree->GetSafeHwnd(), true);
 }
@@ -749,20 +749,20 @@ void LayersList::OnMergeLayer(UINT commandID)
 	if (layerOffset < 0) {
 		return;
 	}
-	
+
 	ListLayerIt dstlayerIt = mLayers.begin();
 
 	while (layerOffset && dstlayerIt != mLayers.end()) {
 		++dstlayerIt;
 		--layerOffset;
 	}
-	
+
 	AsciiString lastClickedLayer = mTree->getLastClickedLayer();
 	ListLayerIt srclayerIt = mLayers.begin();
 	while (srclayerIt != mLayers.end() && srclayerIt->layerName.compareNoCase(lastClickedLayer) != 0) {
 		++srclayerIt;
 	}
-	
+
 	if (srclayerIt == mLayers.end()) {
 		return;
 	}
@@ -786,14 +786,14 @@ void LayersList::OnMergeObject(UINT commandID)
 	if (layerOffset < 0) {
 		return;
 	}
-	
+
 	ListLayerIt layerIt = mLayers.begin();
 
 	while (layerOffset && layerIt != mLayers.end()) {
 		++layerIt;
 		--layerOffset;
 	}
-	
+
 	AsciiString lastClickedObj = mTree->getLastClickedObject();
 	MapObject *objToMove = findObjectByUID(lastClickedObj);
 	if (objToMove) {
@@ -807,7 +807,7 @@ void LayersList::OnMergeViewSelection(UINT commandID)
 	if (layerOffset < 0) {
 		return;
 	}
-	
+
 	ListLayerIt layerIt = mLayers.begin();
 
 	while (layerOffset && layerIt != mLayers.end()) {
@@ -821,12 +821,12 @@ void LayersList::OnMergeViewSelection(UINT commandID)
 	while (mapObject) {
 		if (mapObject->isSelected()) {
 			allSelectedObjects.push(mapObject);
-		}	
-		
+		}
+
 		mapObject = mapObject->getNext();
 	}
 
-	while (allSelectedObjects.size() > 0) {
+	while (!allSelectedObjects.empty()) {
 		changeMapObjectLayer(allSelectedObjects.top(), layerIt->layerName);
 		allSelectedObjects.pop();
 	}
diff --git a/Generals/Code/Tools/WorldBuilder/src/LightOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/LightOptions.cpp
index ab7238b6618..788a2cae4ee 100644
--- a/Generals/Code/Tools/WorldBuilder/src/LightOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/LightOptions.cpp
@@ -35,7 +35,7 @@ LightOptions *LightOptions::m_staticThis = NULL;
 
 LightOptions::LightOptions(CWnd* pParent /*=NULL*/)
 {
-	//{{AFX_DATA_INIT(LightOptions) 
+	//{{AFX_DATA_INIT(LightOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -51,8 +51,8 @@ void LightOptions::DoDataExchange(CDataExchange* pDX)
 
 MapObject *LightOptions::getSingleSelectedLight(void)
 {
-	MapObject *pMapObj; 
-	MapObject *theMapObj = NULL; 
+	MapObject *pMapObj;
+	MapObject *theMapObj = NULL;
 //	Bool found = false;
 	Int selCount=0;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
@@ -70,9 +70,9 @@ MapObject *LightOptions::getSingleSelectedLight(void)
 }
 
 
-void LightOptions::updateTheUI(void) 
+void LightOptions::updateTheUI(void)
 {
-	MapObject *theMapObj = getSingleSelectedLight(); 
+	MapObject *theMapObj = getSingleSelectedLight();
 	if (!theMapObj) return;
 	Dict *props = theMapObj->getProperties();
 
@@ -114,7 +114,7 @@ void LightOptions::updateTheUI(void)
 	}
 }
 
-void LightOptions::update(void) 
+void LightOptions::update(void)
 {
 	if (m_staticThis) {
 		m_staticThis->updateTheUI();
@@ -125,12 +125,12 @@ void LightOptions::update(void)
 // LightOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL LightOptions::OnInitDialog() 
+BOOL LightOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = true;
 
 	m_staticThis = this;
@@ -151,9 +151,9 @@ BEGIN_MESSAGE_MAP(LightOptions, COptionsPanel)
 END_MESSAGE_MAP()
 
 
-void LightOptions::OnChangeLightEdit() 
+void LightOptions::OnChangeLightEdit()
 {
-	MapObject *theMapObj = getSingleSelectedLight(); 
+	MapObject *theMapObj = getSingleSelectedLight();
 	if (!theMapObj) return;
 	if (!theMapObj->isLight()) return;
 
@@ -207,7 +207,7 @@ void LightOptions::OnChangeLightEdit()
 	props->setInt(TheKey_lightAmbientColor, lightAmbientColor.getAsInt());
 	props->setInt(TheKey_lightDiffuseColor, lightDiffuseColor.getAsInt());
 
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		pView->invalObjectInView(theMapObj);
 	}
diff --git a/Generals/Code/Tools/WorldBuilder/src/MainFrm.cpp b/Generals/Code/Tools/WorldBuilder/src/MainFrm.cpp
index 86450a5fc22..0501faf23ba 100644
--- a/Generals/Code/Tools/WorldBuilder/src/MainFrm.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/MainFrm.cpp
@@ -75,9 +75,7 @@ CMainFrame::CMainFrame()
 
 CMainFrame::~CMainFrame()
 {
-	if (m_layersList) {
-		delete m_layersList;
-	}
+	delete m_layersList;
 
 	SaveBarState("MainFrame");
 	TheMainFrame = NULL;
@@ -120,12 +118,12 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 #undef WRAP
 	CPoint pos(frameRect.left,frameRect.top+60);
 	this->FloatControlBar(&m_floatingToolBar, pos, CBRS_ALIGN_LEFT);
-	m_floatingToolBar.EnableDocking(CBRS_ALIGN_TOP); 
+	m_floatingToolBar.EnableDocking(CBRS_ALIGN_TOP);
 #endif
 
 	if (!m_wndStatusBar.Create(this) || !m_wndStatusBar.SetIndicators(indicators, sizeof(indicators)/sizeof(UINT)))
 	{
-		DEBUG_CRASH(("Failed to create status bar\n"));
+		DEBUG_CRASH(("Failed to create status bar"));
 	}
 
 	if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP
@@ -161,7 +159,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	m_noOptions.GetWindowRect(&frameRect);
 	if (m_optionsPanelWidth < frameRect.Width()) m_optionsPanelWidth = frameRect.Width();
 	if (m_optionsPanelHeight < frameRect.Height()) m_optionsPanelHeight = frameRect.Height();
-	
+
 	m_terrainMaterial.Create(IDD_TERRAIN_MATERIAL, this);
 	m_terrainMaterial.SetWindowPos(NULL, frameRect.left, frameRect.top,	0, 0, SWP_NOZORDER|SWP_NOSIZE);
 	m_terrainMaterial.GetWindowRect(&frameRect);
@@ -269,12 +267,12 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	m_cameraOptions.Create(IDD_CAMERA_OPTIONS, this);
 	m_cameraOptions.SetWindowPos(NULL, frameRect.left, frameRect.top, 0, 0, SWP_NOZORDER|SWP_NOSIZE);
  	m_cameraOptions.GetWindowRect(&frameRect);
-	
+
 	// now, setup the Layers Panel
 	m_layersList = new LayersList(LayersList::IDD, this);
 	m_layersList->Create(LayersList::IDD, this);
 	m_layersList->ShowWindow(::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "ShowLayersList", 0) ? SW_SHOW : SW_HIDE);
-	
+
 	CRect optionsRect;
 	m_globalLightOptions.GetWindowRect(&optionsRect);
 	m_layersList->SetWindowPos(NULL, optionsRect.left, optionsRect.bottom + 100, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
@@ -285,7 +283,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	} else {
 		DrawObject::disableFeedback();
 	}
-	
+
 	Int autoSave = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "AutoSave", 1);
 	m_autoSave = autoSave != 0;
 	autoSave = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "AutoSaveIntervalSeconds", 120);
@@ -312,7 +310,7 @@ void CMainFrame::adjustWindowSize(void)
 //	Int borderY = ::GetSystemMetrics(SM_CYEDGE);
 	Int viewWidth = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "Width", THREE_D_VIEW_WIDTH);
 	Int viewHeight = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "Height", THREE_D_VIEW_HEIGHT);
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		pView->GetClientRect(&client);
 	}	else {
@@ -323,7 +321,7 @@ void CMainFrame::adjustWindowSize(void)
 		int heightDelta = client.Height() - (viewHeight);
 		this->GetWindowRect(window);
 		Int newWidth = window.Width()-widthDelta;
-		Int newHeight = window.Height()-heightDelta; 
+		Int newHeight = window.Height()-heightDelta;
 	this->SetWindowPos(NULL, 0,
 	0, newWidth, newHeight,
 	SWP_NOMOVE|SWP_NOZORDER); // MainFrm.cpp sets the top and left.
@@ -379,22 +377,22 @@ void CMainFrame::showOptionsDialog(Int dialogID)
 		case IDD_MESHMOLD_OPTIONS:newOptions  = &m_meshMoldOptions; break;
 		case IDD_WAYPOINT_OPTIONS:newOptions  = &m_waypointOptions; break;
 		case IDD_WATER_OPTIONS:newOptions  = &m_waterOptions; break;
-		case IDD_LIGHT_OPTIONS:newOptions  = &m_lightOptions; break;		
-		case IDD_BUILD_LIST_PANEL:newOptions  = &m_buildListOptions; break;		
+		case IDD_LIGHT_OPTIONS:newOptions  = &m_lightOptions; break;
+		case IDD_BUILD_LIST_PANEL:newOptions  = &m_buildListOptions; break;
 		case IDD_GROVE_OPTIONS:newOptions = &m_groveOptions; break;
 		case IDD_RAMP_OPTIONS:newOptions = &m_rampOptions; break;
 		case IDD_SCORCH_OPTIONS:newOptions = &m_scorchOptions; break;
 		case IDD_NO_OPTIONS:newOptions  = &m_noOptions; break;
-		default : break;												 
-	}																						 
+		default : break;
+	}
 	CRect frameRect;
 	if (newOptions && newOptions != m_curOptions) {
 		newOptions->GetWindowRect(&frameRect);
 		if (m_curOptions) {
 			m_curOptions->GetWindowRect(&frameRect);
 		}
-		newOptions->SetWindowPos(m_curOptions, frameRect.left, frameRect.top, 
-			m_optionsPanelWidth, m_optionsPanelHeight, 
+		newOptions->SetWindowPos(m_curOptions, frameRect.left, frameRect.top,
+			m_optionsPanelWidth, m_optionsPanelHeight,
 			SWP_NOZORDER | SWP_NOACTIVATE );
 		::AfxGetApp()->WriteProfileInt(OPTIONS_PANEL_SECTION, "Top", frameRect.top);
 		::AfxGetApp()->WriteProfileInt(OPTIONS_PANEL_SECTION, "Left", frameRect.left);
@@ -406,7 +404,7 @@ void CMainFrame::showOptionsDialog(Int dialogID)
 	}
 }
 
-void CMainFrame::OnEditGloballightoptions() 
+void CMainFrame::OnEditGloballightoptions()
 {
 	m_globalLightOptions.ShowWindow(SW_SHOWNA);
 }
@@ -432,14 +430,14 @@ void CMainFrame::Dump(CDumpContext& dc) const
 
 
 #if DEAD
-	void CMainFrame::OnEditContouroptions() 
+	void CMainFrame::OnEditContouroptions()
 	{
-		ContourOptions contourOptsDialog(this);	
+		ContourOptions contourOptsDialog(this);
 		contourOptsDialog.DoModal();
 	}
 #endif
 
-void CMainFrame::OnMove(int x, int y) 
+void CMainFrame::OnMove(int x, int y)
 {
 	CFrameWnd::OnMove(x, y);
 	if (this->IsWindowVisible() && !this->IsIconic()) {
@@ -450,7 +448,7 @@ void CMainFrame::OnMove(int x, int y)
 	}
 }
 
-void CMainFrame::OnViewBrushfeedback() 
+void CMainFrame::OnViewBrushfeedback()
 {
 	if (DrawObject::isFeedbackEnabled()) {
 		DrawObject::disableFeedback();
@@ -461,12 +459,12 @@ void CMainFrame::OnViewBrushfeedback()
 	}
 }
 
-void CMainFrame::OnUpdateViewBrushfeedback(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewBrushfeedback(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(DrawObject::isFeedbackEnabled()?1:0);
 }
 
-void CMainFrame::OnDestroy() 
+void CMainFrame::OnDestroy()
 {
 	if (m_hAutoSaveTimer) {
 		KillTimer(m_hAutoSaveTimer);
@@ -475,7 +473,7 @@ void CMainFrame::OnDestroy()
 	CFrameWnd::OnDestroy();
 }
 
-void CMainFrame::OnTimer(UINT nIDEvent) 
+void CMainFrame::OnTimer(UINT nIDEvent)
 {
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (pDoc && pDoc->needAutoSave()) {
@@ -489,7 +487,7 @@ void CMainFrame::OnTimer(UINT nIDEvent)
 	}
 }
 
-void CMainFrame::OnEditCameraoptions() 
+void CMainFrame::OnEditCameraoptions()
 {
 	m_cameraOptions.ShowWindow(SW_SHOWNA);
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/MapPreview.cpp b/Generals/Code/Tools/WorldBuilder/src/MapPreview.cpp
index 1ce0db6cb09..114bbda21a8 100644
--- a/Generals/Code/Tools/WorldBuilder/src/MapPreview.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/MapPreview.cpp
@@ -18,12 +18,12 @@
 
 // FILE: MapPreview.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Oct 2002
@@ -31,9 +31,9 @@
 //	Filename: 	MapPreview.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	Contains the code used to generate and save the map preview to 
-//						the map file.  (Original code was taken from the Radar code in 
+//
+//	purpose:	Contains the code used to generate and save the map preview to
+//						the map file.  (Original code was taken from the Radar code in
 //						game engine).
 //
 //-----------------------------------------------------------------------------
@@ -47,7 +47,7 @@
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 #include "WHeightMapEdit.h"
 #include "WorldBuilderDoc.h"
@@ -55,7 +55,7 @@
 #include "W3DDevice/GameClient/HeightMap.h"
 #include "Common/MapReaderWriterInfo.h"
 #include "Common/FileSystem.h"
-#include "WWLib/TARGA.H"
+#include "WWLib/TARGA.h"
 #include "Common/DataChunk.h"
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -82,29 +82,29 @@ void MapPreview::save( CString mapName )
 	chunkWriter.openDataChunk("MapPreview", K_MAPPREVIEW_VERSION_1);
 	chunkWriter.writeInt(MAP_PREVIEW_WIDTH);
 	chunkWriter.writeInt(MAP_PREVIEW_HEIGHT);
-	DEBUG_LOG(("BeginMapPreviewInfo\n"));
+	DEBUG_LOG(("BeginMapPreviewInfo"));
 	for(Int i = 0; i < MAP_PREVIEW_HEIGHT; ++i)
 	{
 		for(Int j = 0; j < MAP_PREVIEW_WIDTH; ++j)
 		{
 			chunkWriter.writeInt(m_pixelBuffer[i][j]);
-			DEBUG_LOG(("x:%d, y:%d, %X\n", j, i, m_pixelBuffer[i][j]));
+			DEBUG_LOG(("x:%d, y:%d, %X", j, i, m_pixelBuffer[i][j]));
 		}
 	}
 	chunkWriter.closeDataChunk();
-	DEBUG_LOG(("EndMapPreviewInfo\n"));
+	DEBUG_LOG(("EndMapPreviewInfo"));
 */
 }
 
-void MapPreview::interpolateColorForHeight( RGBColor *color,	
-																					Real height, 
+void MapPreview::interpolateColorForHeight( RGBColor *color,
+																					Real height,
 																					Real hiZ,
 																					Real midZ,
 																					Real loZ )
 {
 	const Real howBright = 0.30f;  // bigger is brighter (0.0 to 1.0)
 	const Real howDark   = 0.60f;  // bigger is darker (0.0 to 1.0)
-	
+
 	// sanity on map height (flat maps bomb)
 	if (hiZ == midZ)
 		hiZ = midZ+0.1f;
@@ -129,7 +129,7 @@ void MapPreview::interpolateColorForHeight( RGBColor *color,
 		colorTarget.green = color->green + (1.0f - color->green) * howBright;
 		colorTarget.blue = color->blue + (1.0f - color->blue) * howBright;
 
-	}  // end if
+	}
 	else  // interpolate darker
 	{
 
@@ -141,7 +141,7 @@ void MapPreview::interpolateColorForHeight( RGBColor *color,
 		colorTarget.green = color->green + (0.0f - color->green) * howDark;
 		colorTarget.blue = color->blue + (0.0f - color->blue) * howDark;
 
-	}  // end else
+	}
 
 	// interpolate toward the target color
 	color->red = color->red + (colorTarget.red - color->red) * t;
@@ -162,7 +162,7 @@ void MapPreview::interpolateColorForHeight( RGBColor *color,
 	if( color->blue > 1.0f )
 		color->blue = 1.0f;
 
-}  // end interpolateColorForHeight
+}
 
 Bool MapPreview::mapPreviewToWorld(const ICoord2D *radar, Coord3D *world)
 {
@@ -188,7 +188,7 @@ Bool MapPreview::mapPreviewToWorld(const ICoord2D *radar, Coord3D *world)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	WorldHeightMapEdit *pMap = pDoc->GetHeightMap();
 	Real xSample, ySample;
-	
+
 	xSample = INT_TO_REAL(pMap->getXExtent() - (2 * pMap->getBorderSize())) / MAP_PREVIEW_WIDTH;
 	ySample = INT_TO_REAL(pMap->getYExtent() - (2 * pMap->getBorderSize())) / MAP_PREVIEW_HEIGHT;
 	// translate to world
@@ -198,7 +198,7 @@ Bool MapPreview::mapPreviewToWorld(const ICoord2D *radar, Coord3D *world)
 	// find the terrain height here
 //	world->z = pMap->gethigh
 //	TheTerrainLogic->getGroundHeight( world->x, world->y );
-		
+
 	return TRUE;
 
 }
@@ -237,7 +237,7 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 	for(i = 0; i < MAP_PREVIEW_HEIGHT; ++i)
 	{
 		for(j = 0; j < MAP_PREVIEW_WIDTH; ++j)
-		{	
+		{
 			radarPoint.x = j;
 			radarPoint.y = i;
 			mapPreviewToWorld( &radarPoint, &worldPoint );
@@ -251,7 +251,7 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 		}
 	}
 	getTerrainAverageZ = getTerrainAverageZ /terrainCount;
-	
+
 
 
 //	Color paddingColor = GameMakeColor( 100, 100, 100, 255 );
@@ -265,14 +265,14 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 			radarPoint.x = x;
 			radarPoint.y = y;
 			mapPreviewToWorld( &radarPoint, &worldPoint );
-			
+
 
 			// get height of the terrain at this sample point
 			z = pMap->getHeight(worldPoint.x, worldPoint.y);
-			
+
 			// create a color based on the Z height of the map
 			//Real waterZ;
-			
+
 			if( localIsUnderwater( MAP_XY_FACTOR *(worldPoint.x - pMap->getBorderSize()), MAP_XY_FACTOR * ( worldPoint.y - pMap->getBorderSize())) )
 			{
 				const Int waterSamplesAway = 1;		// how many "tiles" from the center tile we will sample away
@@ -297,16 +297,16 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 								radarPoint.x = i;
 								radarPoint.y = j;
 								mapPreviewToWorld( &radarPoint, &worldPoint );
-								
+
 								// get Z at this sample height
 								Real underwaterZ = pMap->getHeight(worldPoint.x, worldPoint.y);
-								
+
 								// get color for this Z and add to our sample color
 								if( localIsUnderwater( MAP_XY_FACTOR *(worldPoint.x - pMap->getBorderSize()), MAP_XY_FACTOR * ( worldPoint.y - pMap->getBorderSize())))
 								{
 
 									// this is our "color" for water
-									color = waterColor;									
+									color = waterColor;
 
 									// interpolate the water color for height in the water table
 									interpolateColorForHeight( &color, underwaterZ, pMap->getMaxHeightValue(),getTerrainAverageZ,  pMap->getMinHeightValue() );
@@ -317,15 +317,15 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 									sampleColor.blue += color.blue;
 									samples++;
 
-								}  // end if
+								}
 
-							}  // end if
+							}
 
-						}  // end for i
+						}
 
-					}  // end if
+					}
 
-				}  // end for j
+				}
 
 				// prevent divide by zeros
 				if( samples == 0 )
@@ -336,7 +336,7 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 				color.green = sampleColor.green / (Real)samples;
 				color.blue = sampleColor.blue / (Real)samples;
 
-			}  // end if
+			}
 			else  // regular terrain ...
 			{
 				const Int samplesAway = 1;  // how many "tiles" from the center tile we will sample away
@@ -368,7 +368,7 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 								pMap->getTerrainColorAt( MAP_XY_FACTOR *(worldPoint.x - pMap->getBorderSize()) ,MAP_XY_FACTOR * ( worldPoint.y - pMap->getBorderSize()), &color );
 
 								// interpolate the color for height
-								interpolateColorForHeight( &color, z, 
+								interpolateColorForHeight( &color, z,
 																						maxHeight, getTerrainAverageZ, minHeight);
 																					 //pMap->getMaxHeightValue(),getTerrainAverageZ,  pMap->getMinHeightValue() );
 
@@ -378,13 +378,13 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 								sampleColor.blue += color.blue;
 								samples++;
 
-							}  // end if
+							}
 
-						}  // end for i
+						}
 
-					}  // end if
+					}
 
-				}  // end for j
+				}
 
 				// prevent divide by zeros
 				if( samples == 0 )
@@ -395,7 +395,7 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 				color.green = sampleColor.green / (Real)samples;
 				color.blue = sampleColor.blue / (Real)samples;
 
-			}  // end else
+			}
 
 			//
 			// draw the pixel for the terrain at this point, note that because of the orientation
@@ -406,11 +406,11 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 			// the sampling and interpolation algorithm for generating pretty looking terrain
 			// and water for the radar is just, well, expensive.
 			//
-			m_pixelBuffer[y][x]= 255 | (REAL_TO_INT(color.red *255) << 8) | (REAL_TO_INT(color.green *255) << 16) | REAL_TO_INT(color.blue * 255)<< 24; 
-			
-		}  // end for x
+			m_pixelBuffer[y][x]= 255 | (REAL_TO_INT(color.red *255) << 8) | (REAL_TO_INT(color.green *255) << 16) | REAL_TO_INT(color.blue * 255)<< 24;
+
+		}
 
-	}  // end for y
+	}
 	{
 		Targa tga;
 		tga.Header.Width = MAP_PREVIEW_WIDTH;
@@ -421,7 +421,7 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 		tga.Save(tgaName,TGAF_IMAGE, FALSE);
 	}
 
-}  // end buildTerrainTexture
+}
 
 
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/MapSettings.cpp b/Generals/Code/Tools/WorldBuilder/src/MapSettings.cpp
index c498ae21b17..bfd863b0611 100644
--- a/Generals/Code/Tools/WorldBuilder/src/MapSettings.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/MapSettings.cpp
@@ -63,15 +63,15 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // MapSettings message handlers
 
-void MapSettings::OnChangeMapTimeofday() 
+void MapSettings::OnChangeMapTimeofday()
 {
 }
 
-void MapSettings::OnChangeMapWeather() 
+void MapSettings::OnChangeMapWeather()
 {
 }
 
-BOOL MapSettings::OnInitDialog() 
+BOOL MapSettings::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -84,8 +84,8 @@ BOOL MapSettings::OnInitDialog()
 		timeofday->AddString(TimeOfDayNames[i]);
 	}
 	timeofday->SetCurSel(TheGlobalData->m_timeOfDay-TIME_OF_DAY_FIRST);
-	
-	
+
+
 	CComboBox *weather = (CComboBox*)GetDlgItem(IDC_MAP_WEATHER);
 	weather->ResetContent();
 	for (i = 0; i < WEATHER_COUNT; i++)
@@ -123,7 +123,7 @@ BOOL MapSettings::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void MapSettings::OnOK() 
+void MapSettings::OnOK()
 {
 	CComboBox *timeofday = (CComboBox*)GetDlgItem(IDC_MAP_TIMEOFDAY);
 	CComboBox *weather = (CComboBox*)GetDlgItem(IDC_MAP_WEATHER);
@@ -148,19 +148,19 @@ void MapSettings::OnOK()
 	CDialog::OnOK();
 }
 
-void MapSettings::OnChangeMapTitle() 
+void MapSettings::OnChangeMapTitle()
 {
 	// TODO: If this is a RICHEDIT control, the control will not
 	// send this notification unless you override the CDialog::OnInitDialog()
 	// function and call CRichEditCtrl().SetEventMask()
 	// with the ENM_CHANGE flag ORed into the mask.
-	
+
 	// TODO: Add your control notification handler code here
-	
+
 }
 
-void MapSettings::OnChangeMapCompression() 
+void MapSettings::OnChangeMapCompression()
 {
 	// TODO: Add your control notification handler code here
-	
+
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/MeshMoldOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/MeshMoldOptions.cpp
index 18229e03412..fc0ec4df85d 100644
--- a/Generals/Code/Tools/WorldBuilder/src/MeshMoldOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/MeshMoldOptions.cpp
@@ -53,12 +53,12 @@ void MeshMoldOptions::DoDataExchange(CDataExchange* pDX)
 }
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL MeshMoldOptions::OnInitDialog() 
+BOOL MeshMoldOptions::OnInitDialog()
 {
 	COptionsPanel::OnInitDialog();
-	
+
 	m_updating = true;
 	m_anglePopup.SetupPopSliderButton(this, IDC_ANGLE_POPUP, this);
 	m_scalePopup.SetupPopSliderButton(this, IDC_SCALE_POPUP, this);
@@ -80,33 +80,21 @@ BOOL MeshMoldOptions::OnInitDialog()
 	m_moldTreeView.ShowWindow(SW_SHOW);
 
 	{
-		char				dirBuf[_MAX_PATH];
-		char				findBuf[_MAX_PATH];
 		char				fileBuf[_MAX_PATH];
 		Int					i;
 
-		strcpy(dirBuf, ".\\data\\Editor\\Molds");
-		int len = strlen(dirBuf);
-
-		if (len > 0 && dirBuf[len - 1] != '\\') {
-			dirBuf[len++] = '\\';
-			dirBuf[len] = 0;
-		}
-		strcpy(findBuf, dirBuf);
-		strcat(findBuf, "*.w3d");
-
 		FilenameList filenameList;
-		TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), AsciiString("*.w3d"), filenameList, FALSE);
+		TheFileSystem->getFileListInDirectory(".\\data\\Editor\\Molds\\", "*.w3d", filenameList, FALSE);
 
-		if (filenameList.size() > 0) {
+		if (!filenameList.empty()) {
 			HTREEITEM child = NULL;
 			FilenameList::iterator it = filenameList.begin();
 			do {
 				AsciiString filename = *it;
 
-				len = filename.getLength();
+				int len = filename.getLength();
 				if (len<5) continue;
-				strcpy(fileBuf, filename.str());
+				strlcpy(fileBuf, filename.str(), ARRAY_SIZE(fileBuf));
 				for (i=strlen(fileBuf)-1; i>0; i--) {
 					if (fileBuf[i] == '.') {
 						// strip off .w3d file extension.
@@ -122,7 +110,7 @@ BOOL MeshMoldOptions::OnInitDialog()
 				ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 				ins.item.lParam = -1;
 				ins.item.pszText = fileBuf;
-				ins.item.cchTextMax = strlen(fileBuf);				
+				ins.item.cchTextMax = strlen(fileBuf);
 				child = m_moldTreeView.InsertItem(&ins);
 
 				++it;
@@ -140,10 +128,10 @@ BOOL MeshMoldOptions::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void MeshMoldOptions::setHeight(Real height) 
-{ 
-	char buffer[50];
-	sprintf(buffer, "%.2f", height);
+void MeshMoldOptions::setHeight(Real height)
+{
+	char buffer[32];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%.2f", height);
 	m_currentHeight = height;
 	if (m_staticThis && !m_staticThis->m_updating) {
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -152,10 +140,10 @@ void MeshMoldOptions::setHeight(Real height)
 	MeshMoldTool::updateMeshLocation(false);
 }
 
-void MeshMoldOptions::setScale(Real scale) 
-{ 
-	char buffer[50];
-	sprintf(buffer, "%d", (int)floor(scale*100));
+void MeshMoldOptions::setScale(Real scale)
+{
+	char buffer[12];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%d", (int)floor(scale*100));
 	m_currentScale = scale;
 	if (m_staticThis && !m_staticThis->m_updating) {
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SCALE_EDIT);
@@ -164,10 +152,10 @@ void MeshMoldOptions::setScale(Real scale)
 	MeshMoldTool::updateMeshLocation(false);
 }
 
-void MeshMoldOptions::setAngle(Int angle) 
-{ 
-	char buffer[50];
-	sprintf(buffer, "%d", angle);
+void MeshMoldOptions::setAngle(Int angle)
+{
+	char buffer[12];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%d", angle);
 	m_currentAngle = angle;
 	if (m_staticThis && !m_staticThis->m_updating) {
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_ANGLE_EDIT);
@@ -205,7 +193,7 @@ void MeshMoldOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pM
 			// uh-oh!
 			DEBUG_CRASH(("Missing ID."));
 			break;
-	}	// switch
+	}
 }
 
 void MeshMoldOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -240,7 +228,7 @@ void MeshMoldOptions::PopSliderChanged(const long sliderID, long theVal)
 		default:
 			DEBUG_CRASH(("Missing ID."));
 			break;
-	}	// switch
+	}
 }
 
 void MeshMoldOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -256,7 +244,7 @@ void MeshMoldOptions::PopSliderFinished(const long sliderID, long theVal)
 		default:
 			DEBUG_CRASH(("Missing ID."));
 			break;
-	}	// switch
+	}
 
 }
 
@@ -276,19 +264,19 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // MeshMoldOptions message handlers
 
-void MeshMoldOptions::OnPreview() 
+void MeshMoldOptions::OnPreview()
 {
 	CButton *pButton = (CButton*)this->GetDlgItem(IDC_PREVIEW);
 	m_doingPreview = (pButton->GetCheck() == 1);
 	MeshMoldTool::updateMeshLocation(true);
 }
 
-void MeshMoldOptions::OnApplyMesh() 
+void MeshMoldOptions::OnApplyMesh()
 {
 	MeshMoldTool::apply(CWorldBuilderDoc::GetActiveDoc());
 }
 
-void MeshMoldOptions::OnChangeScaleEdit() 
+void MeshMoldOptions::OnChangeScaleEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SCALE_EDIT);
@@ -305,7 +293,7 @@ void MeshMoldOptions::OnChangeScaleEdit()
 		}
 }
 
-void MeshMoldOptions::OnChangeHeightEdit() 
+void MeshMoldOptions::OnChangeHeightEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -322,7 +310,7 @@ void MeshMoldOptions::OnChangeHeightEdit()
 		}
 }
 
-void MeshMoldOptions::OnChangeAngleEdit() 
+void MeshMoldOptions::OnChangeAngleEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_ANGLE_EDIT);
@@ -340,7 +328,7 @@ void MeshMoldOptions::OnChangeAngleEdit()
 }
 
 
-BOOL MeshMoldOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL MeshMoldOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_moldTreeView.m_hWnd) {
@@ -353,19 +341,19 @@ BOOL MeshMoldOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_moldTreeView.GetItem(&item);
 			m_meshModelName = AsciiString(buffer);
 			if (m_doingPreview) {
 				MeshMoldTool::updateMeshLocation(false);
 			}
 		}
-	}	
+	}
 	return COptionsPanel::OnNotify(wParam, lParam, pResult);
 }
 
 
-void MeshMoldOptions::OnRaise() 
+void MeshMoldOptions::OnRaise()
 {
 	m_raiseOnly = true;
 	m_lowerOnly = false;
@@ -374,7 +362,7 @@ void MeshMoldOptions::OnRaise()
 	}
 }
 
-void MeshMoldOptions::OnRaiseLower() 
+void MeshMoldOptions::OnRaiseLower()
 {
 	m_raiseOnly = false;
 	m_lowerOnly = false;
@@ -383,7 +371,7 @@ void MeshMoldOptions::OnRaiseLower()
 	}
 }
 
-void MeshMoldOptions::OnLower() 
+void MeshMoldOptions::OnLower()
 {
 	m_raiseOnly = false;
 	m_lowerOnly = true;
diff --git a/Generals/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp b/Generals/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp
index 190c5e00c17..c5ae174c04b 100644
--- a/Generals/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp
@@ -20,13 +20,13 @@
 // Terrain shaping tool for worldbuilder.
 // Author: John Ahlquist, Oct 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "MeshMoldTool.h"
 #include "CUndoable.h"
 #include "MainFrm.h"
-#include "WHeightMapEdit.h"							 
+#include "WHeightMapEdit.h"
 #include "WorldBuilderDoc.h"
 #include "WorldBuilderView.h"
 #include "WorldBuilder.h"
@@ -43,22 +43,22 @@ Bool MeshMoldTool::m_tracking = false;
 Coord3D MeshMoldTool::m_toolPos;
 WorldHeightMapEdit *MeshMoldTool::m_htMapEditCopy = NULL;
 
-/// Constructor 
+/// Constructor
 MeshMoldTool::MeshMoldTool(void) :
 	Tool(ID_MOLD_TOOL, IDC_MOLD_POINTER)
 {
 	m_offsettingZ = false;
 }
-	
+
 /// Destructor
-MeshMoldTool::~MeshMoldTool(void) 
+MeshMoldTool::~MeshMoldTool(void)
 {
 	REF_PTR_RELEASE(m_htMapEditCopy);
 }
 
 
 /// Shows the mesh mold options panel.
-void MeshMoldTool::activate() 
+void MeshMoldTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_MESHMOLD_OPTIONS);
 	m_prevXIndex = -1;
@@ -69,7 +69,7 @@ void MeshMoldTool::activate()
 }
 
 /// Shows the mesh mold options panel.
-void MeshMoldTool::deactivate() 
+void MeshMoldTool::deactivate()
 {
 	m_tracking = false;
 	DrawObject::setDoMeshFeedback(false);
@@ -87,7 +87,7 @@ void MeshMoldTool::deactivate()
 /// Start tool.
 /** Setup the tool to start mesh molding - make a copy of the height map
 to edit, another copy because we need it :), and call mouseMovedDown. */
-void MeshMoldTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void MeshMoldTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	Coord3D cpt;
@@ -112,9 +112,9 @@ void MeshMoldTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 }
 
 /// End tool.
-/** Finish the tool operation - create a command, pass it to the 
+/** Finish the tool operation - create a command, pass it to the
 doc to execute, and cleanup ref'd objects. */
-void MeshMoldTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void MeshMoldTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	m_offsettingZ = false;
@@ -148,8 +148,8 @@ void MeshMoldTool::updateMeshLocation(Bool changePreview)
 		m_toolPos.z = MeshMoldOptions::getHeight();
 		DrawObject::setFeedbackPos(m_toolPos);
 		if (MeshMoldOptions::isDoingPreview() || changePreview) {
-			// doing preview 
-			CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc(); 
+			// doing preview
+			CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 			if (MeshMoldOptions::isDoingPreview()) {
 				applyMesh(pDoc);
 			} else if (m_htMapEditCopy) {
@@ -217,16 +217,16 @@ void MeshMoldTool::applyMesh(CWorldBuilderDoc *pDoc)
 				if (minX<0) minX = 0;
 				if (minY<0) minY = 0;
 				if (maxX > m_htMapEditCopy->getXExtent()) {
-					maxX = m_htMapEditCopy->getXExtent();	 
+					maxX = m_htMapEditCopy->getXExtent();
 				}
 				if (maxY > m_htMapEditCopy->getYExtent()) {
-					maxY = m_htMapEditCopy->getYExtent();	 
+					maxY = m_htMapEditCopy->getYExtent();
 				}
 				Int i, j;
 				for (j=minY; j<maxY; j++) {
 					for (i=minX; i<maxX; i++) {
-						Real X, Y; 
-						X = i*MAP_XY_FACTOR; 
+						Real X, Y;
+						X = i*MAP_XY_FACTOR;
 						X -= m_toolPos.x;
 						Y = j*MAP_XY_FACTOR;
 						Y -= m_toolPos.y;
@@ -245,7 +245,7 @@ void MeshMoldTool::applyMesh(CWorldBuilderDoc *pDoc)
 							Vector3 intersection = castResult.ContactPoint;
 							intersection.Z *= MeshMoldOptions::getScale();
 							Int newHeight = floor( ((intersection.Z+MeshMoldOptions::getHeight())/MAP_HEIGHT_SCALE)+0.5);
-							// check boundary values	
+							// check boundary values
 							if (newHeight < m_htMapEditCopy->getMinHeightValue()) newHeight = m_htMapEditCopy->getMinHeightValue();
 							if (newHeight > m_htMapEditCopy->getMaxHeightValue()) newHeight = m_htMapEditCopy->getMaxHeightValue();
 							Bool apply = true;
@@ -253,11 +253,11 @@ void MeshMoldTool::applyMesh(CWorldBuilderDoc *pDoc)
 								apply = newHeight > m_htMapEditCopy->getHeight(i+border, j+border);
 							} else if (MeshMoldOptions::isLoweringOnly()) {
 								apply = newHeight < m_htMapEditCopy->getHeight(i+border, j+border);
-							} 
+							}
 							if (apply) {
 								m_htMapEditCopy->setHeight(i+border, j+border, newHeight);
 							}
-						}		
+						}
 					}
 				}
 				IRegion2D partialRange;
diff --git a/Generals/Code/Tools/WorldBuilder/src/MoundOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/MoundOptions.cpp
index 6e6c4c0e4e0..8bdc6b806d1 100644
--- a/Generals/Code/Tools/WorldBuilder/src/MoundOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/MoundOptions.cpp
@@ -36,7 +36,7 @@ Int MoundOptions::m_currentFeather = 0;
 
 MoundOptions::MoundOptions(CWnd* pParent /*=NULL*/)
 {
-	//{{AFX_DATA_INIT(MoundOptions) 
+	//{{AFX_DATA_INIT(MoundOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -52,8 +52,8 @@ void MoundOptions::DoDataExchange(CDataExchange* pDX)
 
 /// Sets the feather value in the dialog.
 /** Update the value in the edit control and the slider. */
-void MoundOptions::setFeather(Int feather) 
-{ 
+void MoundOptions::setFeather(Int feather)
+{
 	CString buf;
 	buf.Format("%d", feather);
 	m_currentFeather = feather;
@@ -65,8 +65,8 @@ void MoundOptions::setFeather(Int feather)
 
 /// Sets the brush width value in the dialog.
 /** Update the value in the edit control and the slider. */
-void MoundOptions::setWidth(Int width) 
-{ 
+void MoundOptions::setWidth(Int width)
+{
 	CString buf;
 	buf.Format("%d", width);
 	m_currentWidth = width;
@@ -76,10 +76,10 @@ void MoundOptions::setWidth(Int width)
 	}
 }
 
-void MoundOptions::setHeight(Int height) 
-{ 
-	char buffer[50];
-	sprintf(buffer, "%d", height);
+void MoundOptions::setHeight(Int height)
+{
+	char buffer[12];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%d", height);
 	m_currentHeight = height;
 	if (m_staticThis && !m_staticThis->m_updating) {
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -93,12 +93,12 @@ void MoundOptions::setHeight(Int height)
 // MoundOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL MoundOptions::OnInitDialog() 
+BOOL MoundOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = true;
 	m_brushWidthPopup.SetupPopSliderButton(this, IDC_SIZE_POPUP, this);
 	m_brushFeatherPopup.SetupPopSliderButton(this, IDC_FEATHER_POPUP, this);
@@ -117,7 +117,7 @@ BOOL MoundOptions::OnInitDialog()
 /// Handles feather edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void MoundOptions::OnChangeFeatherEdit() 
+void MoundOptions::OnChangeFeatherEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_FEATHER_EDIT);
@@ -129,7 +129,7 @@ void MoundOptions::OnChangeFeatherEdit()
 			if (1==sscanf(buffer, "%d", &feather)) {
 				m_currentFeather = feather;
 				MoundTool::setFeather(m_currentFeather);
-				sprintf(buffer, "%.1f FEET.", m_currentFeather*MAP_XY_FACTOR);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentFeather*MAP_XY_FACTOR);
 				pEdit = m_staticThis->GetDlgItem(IDC_FEATHER_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -140,7 +140,7 @@ void MoundOptions::OnChangeFeatherEdit()
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void MoundOptions::OnChangeSizeEdit() 
+void MoundOptions::OnChangeSizeEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SIZE_EDIT);
@@ -152,7 +152,7 @@ void MoundOptions::OnChangeSizeEdit()
 			if (1==sscanf(buffer, "%d", &width)) {
 				m_currentWidth = width;
 				MoundTool::setWidth(m_currentWidth);
-				sprintf(buffer, "%.1f FEET.", m_currentWidth*MAP_XY_FACTOR);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentWidth*MAP_XY_FACTOR);
 				pEdit = m_staticThis->GetDlgItem(IDC_WIDTH_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -163,7 +163,7 @@ void MoundOptions::OnChangeSizeEdit()
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void MoundOptions::OnChangeHeightEdit() 
+void MoundOptions::OnChangeHeightEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -175,7 +175,7 @@ void MoundOptions::OnChangeHeightEdit()
 			if (1==sscanf(buffer, "%d", &height)) {
 				m_currentHeight = height;
 				MoundTool::setMoundHeight(m_currentHeight);
-				sprintf(buffer, "%.1f FEET.", m_currentHeight*MAP_HEIGHT_SCALE);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentHeight*MAP_HEIGHT_SCALE);
 				pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -212,7 +212,7 @@ void MoundOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax,
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void MoundOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -249,7 +249,7 @@ void MoundOptions::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void MoundOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -266,7 +266,7 @@ void MoundOptions::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/MoundTool.cpp b/Generals/Code/Tools/WorldBuilder/src/MoundTool.cpp
index 882789ad313..ffcaefc3170 100644
--- a/Generals/Code/Tools/WorldBuilder/src/MoundTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/MoundTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "MoundTool.h"
@@ -41,7 +41,7 @@ Int MoundTool::m_brushFeather;
 
 
 
-/// Constructor 
+/// Constructor
 MoundTool::MoundTool(void) :
 	Tool(ID_BRUSH_ADD_TOOL, IDC_BRUSH_CROSS)
 {
@@ -49,17 +49,17 @@ MoundTool::MoundTool(void) :
 	m_htMapSaveCopy = NULL;
 	m_raising = true;
 }
-	
+
 /// Destructor
-MoundTool::~MoundTool(void) 
+MoundTool::~MoundTool(void)
 {
 	REF_PTR_RELEASE(m_htMapEditCopy);
 	REF_PTR_RELEASE(m_htMapSaveCopy);
 }
 
 
-void MoundTool::setMoundHeight(Int height) 
-{ 
+void MoundTool::setMoundHeight(Int height)
+{
 	if (m_moundHeight != height) {
 		m_moundHeight = height;
 		// notify mound options panel
@@ -68,19 +68,19 @@ void MoundTool::setMoundHeight(Int height)
 	}
 };
 /// Set the brush width and notify the height options panel of the change.
-void MoundTool::setWidth(Int width) 
-{ 
+void MoundTool::setWidth(Int width)
+{
 	if (m_brushWidth != width) {
 		m_brushWidth = width;
 		// notify brush palette options panel
-		MoundOptions::setWidth(width);  
+		MoundOptions::setWidth(width);
 		DrawObject::setBrushFeedbackParms(false, m_brushWidth, m_brushFeather);
 	}
 };
 
 /// Set the brush feather and notify the height options panel of the change.
-void MoundTool::setFeather(Int feather) 
-{ 
+void MoundTool::setFeather(Int feather)
+{
 	if (m_brushFeather != feather) {
 		m_brushFeather = feather;
 		// notify height palette options panel
@@ -91,14 +91,14 @@ void MoundTool::setFeather(Int feather)
 
 
 /// Shows the brush options panel.
-void MoundTool::activate() 
+void MoundTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_MOUND_OPTIONS);
 	DrawObject::setDoBrushFeedback(true);
 	DrawObject::setBrushFeedbackParms(false, m_brushWidth, m_brushFeather);
 }
 
-void MoundTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void MoundTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -115,7 +115,7 @@ void MoundTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 	mouseMoved(m, viewPt, pView, pDoc);
 }
 
-void MoundTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void MoundTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -166,7 +166,7 @@ void MoundTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 		if (i<0 || i>=m_htMapEditCopy->getXExtent()) {
 			continue;
 		}
-		for (j=ndx.y-sub; j<ndx.y+add; j++) {					
+		for (j=ndx.y-sub; j<ndx.y+add; j++) {
 			if (j<0 || j>=m_htMapEditCopy->getYExtent()) {
 				continue;
 			}
@@ -178,24 +178,24 @@ void MoundTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 			float fNewHeight = (blendFactor*(htDelta+curHeight))+((1.0f-blendFactor)*curHeight);
 			Int newHeight = floor(fNewHeight+0.5f);
 
-			// check boundary values	
+			// check boundary values
 			if (newHeight < m_htMapSaveCopy->getMinHeightValue()) newHeight = m_htMapSaveCopy->getMinHeightValue();
 			if (newHeight > m_htMapSaveCopy->getMaxHeightValue()) newHeight = m_htMapSaveCopy->getMaxHeightValue();
 
 			m_htMapEditCopy->setHeight(i, j, newHeight);
 			pDoc->invalCell(i, j);
-#else 
+#else
 			// Previous integer calculated mounding and blending.
 			// If not re-enabled by Dec 2001, delete as obsolete.
 			Int xd = abs( (2*(i-(ndx.x-sub)))+1 - brushWidth);
 			Int yd = abs( (2*(j-(ndx.y-sub)))+1 - brushWidth);
-			
+
 			float delta = (float)sqrt(xd*xd+yd*yd);
 			//Int curHeight = m_htMapSaveCopy->getHeight(i,j);
 			Int curHeight = m_htMapEditCopy->getHeight(i,j);
 			Int newHeight = curHeight + htDelta;
 
-			// check boundary values	
+			// check boundary values
 			if (newHeight < m_htMapSaveCopy->getMinHeightValue()) newHeight = m_htMapSaveCopy->getMinHeightValue();
 			if (newHeight > m_htMapSaveCopy->getMaxHeightValue()) newHeight = m_htMapSaveCopy->getMaxHeightValue();
 
@@ -242,6 +242,6 @@ void MoundTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 DigTool::DigTool(void)
 {
 	m_toolID = ID_BRUSH_SUBTRACT_TOOL;
-	m_raising = false;  // digging. 
+	m_raising = false;  // digging.
 }
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/MyToolbar.cpp b/Generals/Code/Tools/WorldBuilder/src/MyToolbar.cpp
index f309bd41211..3e42d6af2c9 100644
--- a/Generals/Code/Tools/WorldBuilder/src/MyToolbar.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/MyToolbar.cpp
@@ -20,7 +20,7 @@
 // Class to handle cell size slider.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 
 #include "Lib/BaseType.h"
 #include "MyToolbar.h"
@@ -74,13 +74,13 @@ void CellSizeToolBar::SetupSlider(void)
 	m_staticThis = this;
 }
 
-void CellSizeToolBar::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
+void CellSizeToolBar::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 {
 	if (nSBCode != TB_THUMBTRACK) {
 		nPos = m_cellSlider.GetPos();
 	}
 	UnsignedInt i;
-	// invert 
+	// invert
 	nPos = MAX_POS - nPos + MIN_POS;
 	int newSize = 1;
 	for (i=1; i<nPos; i++) {
diff --git a/Generals/Code/Tools/WorldBuilder/src/NewHeightMap.cpp b/Generals/Code/Tools/WorldBuilder/src/NewHeightMap.cpp
index d23d777862f..98d04218089 100644
--- a/Generals/Code/Tools/WorldBuilder/src/NewHeightMap.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/NewHeightMap.cpp
@@ -55,10 +55,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CNewHeightMap message handlers
 
-BOOL CNewHeightMap::OnInitDialog() 
+BOOL CNewHeightMap::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CWnd *edit = GetDlgItem(IDC_INITIAL_HEIGHT);
 	CString val;
 	val.Format("%d", mHeightInfo.initialHeight);
@@ -124,33 +124,33 @@ Bool CNewHeightMap::doAnchorButton(Int buttonID)
 	heightInfo.anchorLeft = false;
 	heightInfo.anchorRight = false;
 	switch(buttonID) {
-		case IDC_CENTER: 
+		case IDC_CENTER:
 		break;
-		case IDC_TOP_LEFT: 
+		case IDC_TOP_LEFT:
 			heightInfo.anchorTop = true;
 			heightInfo.anchorLeft = true;
 		break;
-		case IDC_TOP: 
+		case IDC_TOP:
 			heightInfo.anchorTop = true;
 		break;
-		case IDC_TOP_RIGHT: 
+		case IDC_TOP_RIGHT:
 			heightInfo.anchorTop = true;
 			heightInfo.anchorRight = true;
 		break;
-		case IDC_CENTER_LEFT: 
+		case IDC_CENTER_LEFT:
 			heightInfo.anchorLeft = true;
 		break;
-		case IDC_CENTER_RIGHT: 
+		case IDC_CENTER_RIGHT:
 			heightInfo.anchorRight = true;
 		break;
-		case IDC_BOTTOM: 
+		case IDC_BOTTOM:
 			heightInfo.anchorBottom = true;
 		break;
-		case IDC_BOTTOM_LEFT: 
+		case IDC_BOTTOM_LEFT:
 			heightInfo.anchorBottom = true;
 			heightInfo.anchorLeft = true;
 		break;
-		case IDC_BOTTOM_RIGHT: 
+		case IDC_BOTTOM_RIGHT:
 			heightInfo.anchorBottom = true;
 			heightInfo.anchorRight = true;
 		break;
@@ -186,7 +186,7 @@ Bool CNewHeightMap::doAnchorButton(Int buttonID)
 }
 
 
-void CNewHeightMap::OnOK() 
+void CNewHeightMap::OnOK()
 {
 	CWnd *edit = GetDlgItem(IDC_INITIAL_HEIGHT);
 	CString val;
@@ -213,15 +213,15 @@ void CNewHeightMap::OnOK()
 }
 
 
-BOOL CNewHeightMap::OnCommand(WPARAM wParam, LPARAM lParam) 
+BOOL CNewHeightMap::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 	Int cmd = HIWORD(wParam);
 	if (cmd == BN_CLICKED) {
-		Int idButton = (int) LOWORD(wParam);    // identifier of button 
+		Int idButton = (int) LOWORD(wParam);    // identifier of button
 		if (doAnchorButton(idButton)) {
 			return true;
 		}
 	}
- 	
+
 	return CDialog::OnCommand(wParam, lParam);
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/ObjectOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/ObjectOptions.cpp
index ac78cee7a75..941cee4d117 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ObjectOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ObjectOptions.cpp
@@ -64,9 +64,7 @@ ObjectOptions::ObjectOptions(CWnd* pParent /*=NULL*/)
 
 ObjectOptions::~ObjectOptions(void)
 {
-	if (m_objectsList) {
-		deleteInstance(m_objectsList);
-	}
+	deleteInstance(m_objectsList);
 	m_objectsList = NULL;
 }
 
@@ -101,7 +99,7 @@ static Int findSideListEntryWithPlayerOfSide(AsciiString side)
 		}
 	}
 
-	// DEBUG_CRASH(("no SideList entry found for %s!\n",side.str()));
+	// DEBUG_CRASH(("no SideList entry found for %s!",side.str()));
 	return -1;
 }
 
@@ -218,7 +216,7 @@ static const PlayerTemplate* findFirstPlayerTemplateOnSide(AsciiString side)
 		}
 	}
 
-	DEBUG_CRASH(("no player found for %s!\n",side.str()));
+	DEBUG_CRASH(("no player found for %s!",side.str()));
 	return NULL;
 }
 #endif
@@ -227,12 +225,12 @@ static const PlayerTemplate* findFirstPlayerTemplateOnSide(AsciiString side)
 // ObjectOptions message handlers
 
 /// Setup the controls in the dialog.
-BOOL ObjectOptions::OnInitDialog() 
+BOOL ObjectOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
 	m_updating = true;
-	
+
 //	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 
 
@@ -249,12 +247,12 @@ BOOL ObjectOptions::OnInitDialog()
 		pMap = newInstance( MapObject)( loc, tTemplate->getName(), 0.0f, 0, NULL, tTemplate );
 		pMap->setNextMap( m_objectsList );
 		m_objectsList = pMap;
-			
+
 		// get display color for the editor
 		Color cc = tTemplate->getDisplayColor();
 		pMap->setColor(cc);
 
-	}  // end for tTemplate
+	}
 
 #if 0		// Lights are not working right now.
 	{
@@ -262,10 +260,10 @@ BOOL ObjectOptions::OnInitDialog()
 		char base[1024] = "*Lights/Light";
 		MapObject *pMap = newInstance(MapObject)(pt, AsciiString(base), 0.0f, 0, NULL, NULL );
 		pMap->setIsLight();
-		
+
 		Dict *props = pMap->getProperties();
 		RGBColor tmp;
-		tmp.red = tmp.green = tmp.blue = 1.0f;		
+		tmp.red = tmp.green = tmp.blue = 1.0f;
 		Int tmpi = tmp.getAsInt();
 		props->setReal(TheKey_lightHeightAboveTerrain, 0.0f);
 		props->setReal(TheKey_lightInnerRadius, 15.0f);
@@ -276,32 +274,20 @@ BOOL ObjectOptions::OnInitDialog()
 		pMap->setNextMap(m_objectsList);
 		m_objectsList = pMap;
 	}
-#endif 
+#endif
 #ifdef LOAD_TEST_ASSETS
 	{
-		char				dirBuf[_MAX_PATH];
-		char				findBuf[_MAX_PATH];
 		char				fileBuf[_MAX_PATH];
 		Int					i;
 
-		strcpy(dirBuf, TEST_W3D_DIR_PATH);
-		int len = strlen(dirBuf);
-
-		if (len > 0 && dirBuf[len - 1] != '\\' && dirBuf[len-1] != '/') {
-			dirBuf[len++] = '\\';
-			dirBuf[len] = 0;
-		}
-		strcpy(findBuf, dirBuf);
-		strcat(findBuf, "*.*");
-
 		FilenameList filenameList;
-		TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), AsciiString("*.w3d"), filenameList, FALSE);
+		TheFileSystem->getFileListInDirectory(TEST_W3D_DIR_PATH, "*.w3d", filenameList, FALSE);
 
-		if (filenameList.size() > 0) {
+		if (!filenameList.empty()) {
 			FilenameList::iterator it = filenameList.begin();
 			do {
 				AsciiString filename = *it;
-				len = filename.getLength();
+				int len = filename.getLength();
 				if (len<5) continue;
 				// only do .w3d files
 
@@ -312,8 +298,8 @@ BOOL ObjectOptions::OnInitDialog()
 				}
 
 				strcpy(fileBuf, TEST_STRING);
-				strcat(fileBuf, "/");
-				strcat(fileBuf, token.str());
+				strlcat(fileBuf, "/", ARRAY_SIZE(fileBuf));
+				strlcat(fileBuf, token.str(), ARRAY_SIZE(fileBuf));
 				for (i=strlen(fileBuf)-1; i>0; i--) {
 					if (fileBuf[i] == '.') {
 						// strip off .w3d file extension.
@@ -386,7 +372,7 @@ HTREEITEM ObjectOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_objectTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -401,7 +387,7 @@ HTREEITEM ObjectOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = (char*)pLabel;
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_objectTreeView.InsertItem(&ins);
 	return(child);
 }
@@ -415,7 +401,7 @@ HTREEITEM ObjectOptions::_FindOrDont(const char* pLabel, HTREEITEM startPoint)
 {
 	std::list<HTREEITEM> itemsToEx;
 	itemsToEx.push_back(startPoint);
-	
+
 	while (itemsToEx.front()) {
 		char buffer[_MAX_PATH];
 		HTREEITEM hItem = itemsToEx.front();
@@ -428,19 +414,19 @@ HTREEITEM ObjectOptions::_FindOrDont(const char* pLabel, HTREEITEM startPoint)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_objectTreeView.GetItem(&item);
 
 			const char* strToTest = strrchr(pLabel, '/');
-//		if (strstr((strToTest ? strToTest : pLabel), buffer)) 
-			if (strcmp((strToTest ? strToTest : pLabel), buffer) == 0) 
+//		if (strstr((strToTest ? strToTest : pLabel), buffer))
+			if (strcmp((strToTest ? strToTest : pLabel), buffer) == 0)
 			{
 				return hItem;
 			}
 		} else {
 			// add the first child, the others will be caught by the adding of the siblings
 			itemsToEx.push_back(m_objectTreeView.GetChildItem(hItem));
-		} // Always add the first sibling, if it exists
+		}
 
 		if (m_objectTreeView.GetNextSiblingItem(hItem)) {
 			itemsToEx.push_back(m_objectTreeView.GetNextSiblingItem(hItem));
@@ -453,7 +439,7 @@ HTREEITEM ObjectOptions::_FindOrDont(const char* pLabel, HTREEITEM startPoint)
 //-------------------------------------------------------------------------------------------------
 /** Add the object hierarchy paths to the tree view. */
 //-------------------------------------------------------------------------------------------------
-void ObjectOptions::addObject( MapObject *mapObject, const char *pPath, 
+void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 															 Int terrainNdx, HTREEITEM parent )
 {
 	char buffer[ _MAX_PATH ];
@@ -466,7 +452,7 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 	//
 	// if we have an thing template in mapObject, we've read it from the new INI database,
 	// we will sort those items into the tree based on properties of the template that
-	// make it easier for us to browse when building levels 
+	// make it easier for us to browse when building levels
 	//
 	// Feel free to reorganize how this tree is constructed from the template
 	// data at will, whatever makes it easier for design
@@ -478,12 +464,11 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 		// first check for test sorted objects
 		if( thingTemplate->getEditorSorting() == ES_TEST )
 			parent = findOrAdd( parent, "TEST" );
-	
+
 		// first sort by side, either create or find the tree item with matching side name
 		AsciiString side = thingTemplate->getDefaultOwningSide();
-		DEBUG_ASSERTCRASH( !side.isEmpty(), ("NULL default side in template\n") );
-		strcpy( buffer, side.str() );
-		parent = findOrAdd( parent, buffer );
+		DEBUG_ASSERTCRASH( !side.isEmpty(), ("NULL default side in template") );
+		parent = findOrAdd( parent, side.str());
 
 		// next tier uses the editor sorting that design can specify in the INI
 		EditorSortingType i = ES_FIRST;
@@ -498,9 +483,9 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 				parent = findOrAdd( parent, EditorSortingNames[ i ] );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		if( i == ES_NUM_SORTING_TYPES )
 			parent = findOrAdd( parent, "UNSORTED" );
@@ -508,10 +493,10 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 		// the leaf name is the name of the template
 		leafName = thingTemplate->getName().str();
 
-	}  // end if
-	else 
+	}
+	else
 	{
-	
+
 		// all these old entries we will put in a tree for legacy GDF items
 		parent = findOrAdd( parent, "**TEST MODELS" );
 
@@ -523,7 +508,7 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 			}
 			if (pPath[i] == '/') {
 				pPath+= i+1;
-				i = 0;			
+				i = 0;
 			}
 			buffer[i] = pPath[i];
 			i++;
@@ -534,9 +519,9 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 			buffer[ i ] = 0;
 			leafName = buffer;
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 
 	// add to the tree view
 	if( leafName )
@@ -549,7 +534,7 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = terrainNdx;
 		ins.item.pszText = (char*)leafName;
-		ins.item.cchTextMax = strlen(leafName)+2;				
+		ins.item.cchTextMax = strlen(leafName)+2;
 		m_objectTreeView.InsertItem(&ins);
 
 	}
@@ -567,13 +552,13 @@ Bool ObjectOptions::setObjectTreeViewSelection(HTREEITEM parent, Int selection)
 		item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;
 		item.hItem = child;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_objectTreeView.GetItem(&item);
 		if (item.lParam == selection) {
 			m_objectTreeView.SelectItem(child);
 			return(true);
 		}
-		if (setObjectTreeViewSelection(child, selection)) 
+		if (setObjectTreeViewSelection(child, selection))
 		{
 			strcpy(m_currentObjectName, buffer);
 			updateLabel();
@@ -585,7 +570,7 @@ Bool ObjectOptions::setObjectTreeViewSelection(HTREEITEM parent, Int selection)
 }
 
 
-BOOL ObjectOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL ObjectOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_objectTreeView.m_hWnd) {
@@ -610,7 +595,7 @@ BOOL ObjectOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_objectTreeView.GetItem(&item);
 			if (item.lParam >= 0) {
 				m_currentObjectIndex = item.lParam;
@@ -622,7 +607,7 @@ BOOL ObjectOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			updateLabel();
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
@@ -657,13 +642,13 @@ MapObject *ObjectOptions::duplicateCurMapObjectForPlace(const Coord3D* loc, Real
 	MapObject *pCur = getCurMapObject();
 	if (pCur)
 	{
-		
+
 		Bool found = false;
 		const ThingTemplate* tt = pCur->getThingTemplate();
-		if (checkPlayers) 
+		if (checkPlayers)
 		{
 			AsciiString defaultTeam("team");
-			
+
 			AsciiString objectTeamName = m_curOwnerName;
 			if (objectTeamName != defaultTeam) {
 				TeamsInfo *teamInfo = TheSidesList->findTeamInfo(objectTeamName);
@@ -684,7 +669,7 @@ MapObject *ObjectOptions::duplicateCurMapObjectForPlace(const Coord3D* loc, Real
 				if (!found)
 				{
 					AddPlayerDialog addPlyr(pCur->getThingTemplate()->getDefaultOwningSide());
-					if (addPlyr.DoModal() == IDOK) 
+					if (addPlyr.DoModal() == IDOK)
 					{
 						for (int i = 0; i < TheSidesList->getNumSides(); i++)
 						{
@@ -713,8 +698,8 @@ MapObject *ObjectOptions::duplicateCurMapObjectForPlace(const Coord3D* loc, Real
 		}
 		if (found)
 		{
-			MapObject *pNew = newInstance(MapObject)( *loc, pCur->getName(), angle, 
-																			 pCur->getFlags(), pCur->getProperties(), 
+			MapObject *pNew = newInstance(MapObject)( *loc, pCur->getName(), angle,
+																			 pCur->getFlags(), pCur->getProperties(),
 																			 pCur->getThingTemplate() );
 			pNew->getProperties()->setAsciiString(TheKey_originalOwner, m_curOwnerName);
 			pNew->setColor(pCur->getColor());
@@ -795,7 +780,7 @@ Int ObjectOptions::getObjectNamedIndex(const AsciiString& name)
 }
 
 
-void ObjectOptions::OnEditchangeOwningteam() 
+void ObjectOptions::OnEditchangeOwningteam()
 {
 	CComboBox *list = (CComboBox*)GetDlgItem(IDC_OWNINGTEAM);
 	Int sel = list->GetCurSel();
@@ -826,7 +811,7 @@ void ObjectOptions::selectObject(const MapObject* pObj)
 		item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 		item.hItem = objToSel;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_staticThis->m_objectTreeView.GetItem(&item);
 
 		if (m_staticThis->m_objectTreeView.SelectItem(objToSel)) {
@@ -836,12 +821,12 @@ void ObjectOptions::selectObject(const MapObject* pObj)
 	}
 }
 
-void ObjectOptions::OnCloseupOwningteam() 
+void ObjectOptions::OnCloseupOwningteam()
 {
 	OnEditchangeOwningteam();
 }
 
-void ObjectOptions::OnSelchangeOwningteam() 
+void ObjectOptions::OnSelchangeOwningteam()
 {
 	OnEditchangeOwningteam();
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/ObjectPreview.cpp b/Generals/Code/Tools/WorldBuilder/src/ObjectPreview.cpp
index e0b138657ef..6ed63b1bb4c 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ObjectPreview.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ObjectPreview.cpp
@@ -47,7 +47,7 @@
 
 #include "W3DDevice/GameClient/W3DAssetManager.h"
 #include "WW3D2/dx8wrapper.h"
-#include "WWLib/TARGA.H"
+#include "WWLib/TARGA.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // ObjectPreview
@@ -90,7 +90,7 @@ static UnsignedByte * saveSurface(IDirect3DSurface8 *surface)
 	HRESULT hr=m_pDev->CreateImageSurface(  desc.Width,desc.Height,desc.Format, &tempSurface);
 
 	hr=m_pDev->CopyRects(surface,NULL,0,tempSurface,NULL);
- 
+
 	D3DLOCKED_RECT lrect;
 
 	DX8_ErrorCode(tempSurface->LockRect(&lrect,NULL,D3DLOCK_READONLY));
@@ -197,7 +197,7 @@ static UnsignedByte * generatePreview( const ThingTemplate *tt )
 	}
 	// set render object, or create if we need to
 	if( modelName.isEmpty() == FALSE &&
-			strncmp( modelName.str(), "No ", 3 ) )
+			strncmp( modelName.str(), "No ", 3 ) != 0 )
 	{
 	 	WW3DAssetManager *pMgr = W3DAssetManager::Get_Instance();
 		model = pMgr->Create_Render_Obj(modelName.str());
@@ -218,7 +218,7 @@ static UnsignedByte * generatePreview( const ThingTemplate *tt )
 			}
 
 			// Set the render target
-			DX8Wrapper::Set_Render_Target(objectTexture);
+			DX8Wrapper::Set_Render_Target_With_Z(objectTexture);
 
 			// create the camera
 			Bool orthoCamera = false;
@@ -229,7 +229,7 @@ static UnsignedByte * generatePreview( const ThingTemplate *tt )
 
 			Vector2 minVec = Vector2( -1, -1 );
 			Vector2 maxVec = Vector2( +1, +1 );
-			camera->Set_View_Plane( minVec, maxVec );		
+			camera->Set_View_Plane( minVec, maxVec );
 			camera->Set_Clip_Planes( 0.995f, 600.0f );
 			if (orthoCamera)
 				camera->Set_Projection_Type( CameraClass::ORTHO );
@@ -267,10 +267,10 @@ static UnsignedByte * generatePreview( const ThingTemplate *tt )
 /////////////////////////////////////////////////////////////////////////////
 // ObjectPreview message handlers
 
-void ObjectPreview::OnPaint() 
+void ObjectPreview::OnPaint()
 {
 	CPaintDC dc(this); // device context for painting
-	
+
 	CRect clientRect;
 	GetClientRect(&clientRect);
 
@@ -293,7 +293,7 @@ void ObjectPreview::OnPaint()
 void ObjectPreview::DrawMyTexture(CDC *pDc, int top, int left, Int width, Int height, UnsignedByte *rgbData)
 {
 	// Just blast about some dib bits.
-	
+
 	LPBITMAPINFO pBI;
 //	long bytes = sizeof(BITMAPINFO);
  	pBI = new BITMAPINFO;
@@ -310,9 +310,9 @@ void ObjectPreview::DrawMyTexture(CDC *pDc, int top, int left, Int width, Int he
 	pBI->bmiHeader.biClrImportant = 0;
 
 	//::Sleep(10);
-	//int val=::StretchDIBits(pDc->m_hDC, left, top, width, height, 0, 0, PREVIEW_WIDTH, PREVIEW_HEIGHT, rgbData, pBI, 
+	//int val=::StretchDIBits(pDc->m_hDC, left, top, width, height, 0, 0, PREVIEW_WIDTH, PREVIEW_HEIGHT, rgbData, pBI,
 	//	DIB_RGB_COLORS, SRCCOPY);
-	/*int val=*/::StretchDIBits(pDc->m_hDC, left, top, width, height, PREVIEW_WIDTH/4, PREVIEW_HEIGHT/4, PREVIEW_WIDTH/2, PREVIEW_HEIGHT/2, rgbData, pBI, 
+	/*int val=*/::StretchDIBits(pDc->m_hDC, left, top, width, height, PREVIEW_WIDTH/4, PREVIEW_HEIGHT/4, PREVIEW_WIDTH/2, PREVIEW_HEIGHT/2, rgbData, pBI,
 		DIB_RGB_COLORS, SRCCOPY);
 	delete(pBI);
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/ObjectTool.cpp b/Generals/Code/Tools/WorldBuilder/src/ObjectTool.cpp
index fcff295df23..c8f140bdb54 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ObjectTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ObjectTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "ObjectTool.h"
@@ -39,12 +39,12 @@
 	enum {HYSTERESIS = 3};
 /// Constructor
 ObjectTool::ObjectTool(void) :
-	Tool(ID_PLACE_OBJECT_TOOL, IDC_PLACE_OBJECT) 
+	Tool(ID_PLACE_OBJECT_TOOL, IDC_PLACE_OBJECT)
 {
 }
-	
+
 /// Destructor
-ObjectTool::~ObjectTool(void) 
+ObjectTool::~ObjectTool(void)
 {
 }
 
@@ -58,13 +58,13 @@ Real ObjectTool::calcAngle(Coord3D downPt, Coord3D curPt, WbView* pView)
 	if (dist < 0.1) // check for div-by-zero.
 	{
 		angle = 0;
-	} 
-	else if (abs(dx) > abs(dy)) 
+	}
+	else if (abs(dx) > abs(dy))
 	{
 		angle = acos(	(double)dx / dist);
 		if (dy<0) angle = -angle;
-	} 
-	else 
+	}
+	else
 	{
 		angle = asin(	((double)dy) / dist);
 		if (dx<0) angle = PI-angle;
@@ -81,7 +81,7 @@ Real ObjectTool::calcAngle(Coord3D downPt, Coord3D curPt, WbView* pView)
 
 
 /// Turn off object tracking.
-void ObjectTool::deactivate() 
+void ObjectTool::deactivate()
 {
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (pDoc==NULL) return;
@@ -89,7 +89,7 @@ void ObjectTool::deactivate()
 	p3View->setObjTracking(NULL, m_downPt3d, 0, false);
 }
 /// Shows the object options panel
-void ObjectTool::activate() 
+void ObjectTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_OBJECT_OPTIONS);
 	DrawObject::setDoBrushFeedback(false);
@@ -100,7 +100,7 @@ void ObjectTool::activate()
 }
 
 /** Execute the tool on mouse down - Place an object. */
-void ObjectTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void ObjectTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -111,7 +111,7 @@ void ObjectTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 }
 
 /** Tracking - show the object. */
-void ObjectTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void ObjectTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	Bool justAClick = true;
 	Coord3D cpt;
@@ -131,17 +131,17 @@ void ObjectTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 	WbView3d *p3View = pDoc->GetActive3DView();
 	p3View->setObjTracking(NULL, m_downPt3d, 0, false);
 	loc.z = ObjectOptions::getCurObjectHeight();
-	if (pCur) { 
+	if (pCur) {
 		// Display the transparent version of this object.
 		p3View->setObjTracking(pCur, loc, angle, true);
 	} else {
-		// Don't display anything. 
+		// Don't display anything.
 		p3View->setObjTracking(NULL, loc, angle, false);
 	}
 }
 
 /** Execute the tool on mouse up - Place an object. */
-void ObjectTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void ObjectTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/OpenMap.cpp b/Generals/Code/Tools/WorldBuilder/src/OpenMap.cpp
index fc8e8f6b85f..5810c435c8a 100644
--- a/Generals/Code/Tools/WorldBuilder/src/OpenMap.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/OpenMap.cpp
@@ -33,11 +33,7 @@ OpenMap::OpenMap(TOpenMapInfo *pInfo, CWnd* pParent /*=NULL*/)
 	m_pInfo(pInfo)
 {
 	m_pInfo->browse = false;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	m_usingSystemDir = ::AfxGetApp()->GetProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", TRUE);
-#else
-	m_usingSystemDir = FALSE;
-#endif
 
 	//{{AFX_DATA_INIT(OpenMap)
 		// NOTE: the ClassWizard will add member initialization here
@@ -76,20 +72,20 @@ void OpenMap::OnUserMaps()
 	populateMapListbox( FALSE );
 }
 
-void OpenMap::OnBrowse() 
+void OpenMap::OnBrowse()
 {
 	m_pInfo->browse = true;
 	OnOK();
 }
 
-void OpenMap::OnOK() 
+void OpenMap::OnOK()
 {
 	CListBox *pList = (CListBox *)this->GetDlgItem(IDC_OPEN_LIST);
 	if (pList == NULL) {
 		OnCancel();
 		return;
 	}
-	
+
 	Int sel = pList->GetCurSel();
 	if (sel == LB_ERR) {
 		m_pInfo->browse = true;
@@ -110,9 +106,7 @@ void OpenMap::OnOK()
 void OpenMap::populateMapListbox( Bool systemMaps )
 {
 	m_usingSystemDir = systemMaps;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	::AfxGetApp()->WriteProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", m_usingSystemDir);
-#endif
 
 	HANDLE			hFindFile = 0;
 	WIN32_FIND_DATA			findData;
@@ -124,25 +118,16 @@ void OpenMap::populateMapListbox( Bool systemMaps )
 		strcpy(dirBuf, "Maps\\");
 	else
 	{
-		strcpy(dirBuf, TheGlobalData->getPath_UserData().str());
-		strcat(dirBuf, "Maps\\");
-	}
-
-	int len = strlen(dirBuf);
-
-	if (len > 0 && dirBuf[len - 1] != '\\') {
-		dirBuf[len++] = '\\';
-		dirBuf[len] = 0;
+		snprintf(dirBuf, ARRAY_SIZE(dirBuf), "%sMaps\\", TheGlobalData->getPath_UserData().str());
 	}
 	CListBox *pList = (CListBox *)this->GetDlgItem(IDC_OPEN_LIST);
 	if (pList == NULL) return;
 	pList->ResetContent();
-	strcpy(findBuf, dirBuf);
-	strcat(findBuf, "*.*");
+	snprintf(findBuf, ARRAY_SIZE(findBuf), "%s*.*", dirBuf);
 
 	Bool found = false;
 
-	hFindFile = FindFirstFile(findBuf, &findData); 
+	hFindFile = FindFirstFile(findBuf, &findData);
 	if (hFindFile != INVALID_HANDLE_VALUE) {
 		do {
 			if (strcmp(findData.cFileName, ".") == 0 || strcmp(findData.cFileName, "..") == 0)
@@ -151,11 +136,7 @@ void OpenMap::populateMapListbox( Bool systemMaps )
 				continue;
 			}
 
-			strcpy(fileBuf, dirBuf);
-			strcat(fileBuf, findData.cFileName);
-			strcat(fileBuf, "\\");
-			strcat(fileBuf, findData.cFileName);
-			strcat(fileBuf, ".map");
+			snprintf(fileBuf, ARRAY_SIZE(fileBuf), "%s%s\\%s.map", dirBuf, findData.cFileName, findData.cFileName);
 			try {
 				CFileStatus status;
 				if (CFile::GetStatus(fileBuf, status)) {
@@ -178,7 +159,7 @@ void OpenMap::populateMapListbox( Bool systemMaps )
 	}
 }
 
-BOOL OpenMap::OnInitDialog() 
+BOOL OpenMap::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -190,12 +171,9 @@ BOOL OpenMap::OnInitDialog()
 	if (pUserMaps != NULL)
 		pUserMaps->SetCheck( !m_usingSystemDir );
 
-#if !defined(RTS_DEBUG) && !defined(RTS_INTERNAL)
-	if (pSystemMaps)
-		pSystemMaps->ShowWindow( FALSE );
-	if (pUserMaps)
-		pUserMaps->ShowWindow( FALSE );
-#endif
+	// TheSuperHackers @tweak Originally World Builder has hidden the System Maps tab button in Release builds,
+	// perhaps with the intention to only show User Maps to community users. However, World Builder did release
+	// as a Debug build and always had the System Maps tab, therefore this now shows it always for simplicity.
 
 	populateMapListbox( m_usingSystemDir );
 
@@ -203,7 +181,7 @@ BOOL OpenMap::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void OpenMap::OnDblclkOpenList() 
+void OpenMap::OnDblclkOpenList()
 {
 	OnOK();
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/OptionsPanel.cpp b/Generals/Code/Tools/WorldBuilder/src/OptionsPanel.cpp
index 4d1af528805..1a747e2cd87 100644
--- a/Generals/Code/Tools/WorldBuilder/src/OptionsPanel.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/OptionsPanel.cpp
@@ -59,21 +59,21 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // COptionsPanel message handlers
 
-void COptionsPanel::OnMove(int x, int y) 
+void COptionsPanel::OnMove(int x, int y)
 {
 	CDialog::OnMove(x, y);
-	
+
 	if (this->IsWindowVisible() && !this->IsIconic()) {
 		CRect frameRect;
 		GetWindowRect(&frameRect);
 		::AfxGetApp()->WriteProfileInt(OPTIONS_PANEL_SECTION, "Top", frameRect.top);
 		::AfxGetApp()->WriteProfileInt(OPTIONS_PANEL_SECTION, "Left", frameRect.left);
 	}
-	
+
 }
 
 
-void COptionsPanel::OnEditRedo() 
+void COptionsPanel::OnEditRedo()
 {
 	// Redirect undo/redo to the doc so they get executed.
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
@@ -82,7 +82,7 @@ void COptionsPanel::OnEditRedo()
 	}
 }
 
-void COptionsPanel::OnUpdateEditRedo(CCmdUI* pCmdUI) 
+void COptionsPanel::OnUpdateEditRedo(CCmdUI* pCmdUI)
 {
 	// Redirect undo/redo to the doc so they get executed.
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
@@ -91,7 +91,7 @@ void COptionsPanel::OnUpdateEditRedo(CCmdUI* pCmdUI)
 	}
 }
 
-void COptionsPanel::OnEditUndo() 
+void COptionsPanel::OnEditUndo()
 {
 	// Redirect undo/redo to the doc so they get executed.
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
@@ -100,7 +100,7 @@ void COptionsPanel::OnEditUndo()
 	}
 }
 
-void COptionsPanel::OnUpdateEditUndo(CCmdUI* pCmdUI) 
+void COptionsPanel::OnUpdateEditUndo(CCmdUI* pCmdUI)
 {
 	// Redirect undo/redo to the doc so they get executed.
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
diff --git a/Generals/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp b/Generals/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp
index a44095ae1a5..5f4b9d903ab 100644
--- a/Generals/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp
@@ -49,11 +49,11 @@ ReplaceUnitDialog::ReplaceUnitDialog(CWnd* pParent /*=NULL*/)
 	//}}AFX_DATA_INIT
 }
 
-BOOL ReplaceUnitDialog::OnInitDialog() 
+BOOL ReplaceUnitDialog::OnInitDialog()
 {
 	PickUnitDialog::OnInitDialog();
 	CWnd *pWnd = GetDlgItem(IDC_MISSINGLABEL);
-	if (pWnd) 
+	if (pWnd)
 		pWnd->SetWindowText(m_missingName.str());
 
 	return TRUE;
@@ -94,9 +94,7 @@ PickUnitDialog::PickUnitDialog(UINT id, CWnd* pParent /*=NULL*/)
 
 PickUnitDialog::~PickUnitDialog()
 {
-	if (m_objectsList) {
-		deleteInstance(m_objectsList);
-	}
+	deleteInstance(m_objectsList);
 	m_objectsList = NULL;
 }
 
@@ -115,22 +113,22 @@ BEGIN_MESSAGE_MAP(PickUnitDialog, CDialog)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-void PickUnitDialog::OnMove(int x, int y) 
+void PickUnitDialog::OnMove(int x, int y)
 {
 	CDialog::OnMove(x, y);
-	
+
 	if (this->IsWindowVisible() && !this->IsIconic()) {
 		CRect frameRect;
 		GetWindowRect(&frameRect);
 		::AfxGetApp()->WriteProfileInt(BUILD_PICK_PANEL_SECTION, "Top", frameRect.top);
 		::AfxGetApp()->WriteProfileInt(BUILD_PICK_PANEL_SECTION, "Left", frameRect.left);
 	}
-	
+
 }
 
 Bool PickUnitDialog::IsAllowableType(EditorSortingType sort, Bool isBuildable)
 {
-	if (m_factionOnly && !isBuildable) 
+	if (m_factionOnly && !isBuildable)
 	{
 		return false;
 	}
@@ -153,10 +151,10 @@ void PickUnitDialog::SetupAsPanel(void)
 /////////////////////////////////////////////////////////////////////////////
 // PickUnitDialog message handlers
 
-BOOL PickUnitDialog::OnInitDialog() 
+BOOL PickUnitDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 //	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 
 	// add entries from the thing factory as the available objects to use
@@ -175,7 +173,7 @@ BOOL PickUnitDialog::OnInitDialog()
 		pMap = newInstance(MapObject)( loc, tTemplate->getName(), 0.0f, 0, NULL, tTemplate );
 		pMap->setNextMap( m_objectsList );
 		m_objectsList = pMap;
-	}  // end for tTemplate
+	}
 
 	CWnd *pWnd = GetDlgItem(IDC_OBJECT_HEIGHT_EDIT);
 	if (pWnd) {
@@ -201,7 +199,7 @@ BOOL PickUnitDialog::OnInitDialog()
 		index++;
 		pMap = pMap->getNext();
 	}
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -218,7 +216,7 @@ HTREEITEM PickUnitDialog::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_objectTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -233,12 +231,12 @@ HTREEITEM PickUnitDialog::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = (char*)pLabel;
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_objectTreeView.InsertItem(&ins);
 	return(child);
 }
 
-BOOL PickUnitDialog::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL PickUnitDialog::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_objectTreeView.m_hWnd) {
@@ -263,10 +261,11 @@ BOOL PickUnitDialog::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_objectTreeView.GetItem(&item);
 			if (item.lParam >= 0) {
 				m_currentObjectIndex = item.lParam;
+				static_assert(ARRAY_SIZE(m_currentObjectName) >= ARRAY_SIZE(buffer), "Incorrect array size");
 				strcpy(m_currentObjectName, buffer);
 			}	else if (m_objectTreeView.ItemHasChildren(item.hItem)) {
 				strcpy(m_currentObjectName, "");
@@ -274,7 +273,7 @@ BOOL PickUnitDialog::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			}
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
@@ -293,7 +292,7 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 	//
 	// if we have an thing template in mapObject, we've read it from the new INI database,
 	// we will sort those items into the tree based on properties of the template that
-	// make it easier for us to browse when building levels 
+	// make it easier for us to browse when building levels
 	//
 	// Feel free to reorganize how this tree is constructed from the template
 	// data at will, whatever makes it easier for design
@@ -305,12 +304,11 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 		// first check for test sorted objects
 		if( thingTemplate->getEditorSorting() == ES_TEST )
 			parent = findOrAdd( parent, "TEST" );
-	
+
 		// first sort by side, either create or find the tree item with matching side name
 		AsciiString side = thingTemplate->getDefaultOwningSide();
-		DEBUG_ASSERTCRASH( !side.isEmpty(), ("NULL default side in template\n") );
-		strcpy( buffer, side.str() );
-		parent = findOrAdd( parent, buffer );
+		DEBUG_ASSERTCRASH( !side.isEmpty(), ("NULL default side in template") );
+		parent = findOrAdd( parent, side.str());
 
 		// next tier uses the editor sorting that design can specify in the INI
 		EditorSortingType i = ES_FIRST;
@@ -325,9 +323,9 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 				parent = findOrAdd( parent, EditorSortingNames[ i ] );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		if( i == ES_NUM_SORTING_TYPES )
 			parent = findOrAdd( parent, "UNSORTED" );
@@ -335,10 +333,10 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 		// the leaf name is the name of the template
 		leafName = thingTemplate->getName().str();
 
-	}  // end if
-	else 
+	}
+	else
 	{
-	
+
 		// all these old entries we will put in a tree for legacy GDF items
 		parent = findOrAdd( parent, "**TEST MODELS" );
 
@@ -350,7 +348,7 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 			}
 			if (pPath[i] == '/') {
 				pPath+= i+1;
-				i = 0;			
+				i = 0;
 			}
 			buffer[i] = pPath[i];
 			i++;
@@ -361,9 +359,9 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 			buffer[ i ] = 0;
 			leafName = buffer;
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 
 	// add to the tree view
 	if( leafName )
@@ -376,7 +374,7 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = index;
 		ins.item.pszText = (char*)leafName;
-		ins.item.cchTextMax = strlen(leafName)+2;				
+		ins.item.cchTextMax = strlen(leafName)+2;
 		m_objectTreeView.InsertItem(&ins);
 
 	}
diff --git a/Generals/Code/Tools/WorldBuilder/src/PointerTool.cpp b/Generals/Code/Tools/WorldBuilder/src/PointerTool.cpp
index 467764107b1..7d8490ba11c 100644
--- a/Generals/Code/Tools/WorldBuilder/src/PointerTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/PointerTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "PointerTool.h"
@@ -49,7 +49,7 @@ static void pickAllWaypointsInPath( Int sourceID, Bool select )
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 
 	helper_pickAllWaypointsInPath(sourceID, pDoc, pDoc->getNumWaypointLinks(), alreadyTouched);
-	
+
 	// already touched should now be filled with waypointIDs that want to be un/selected
 	MapObject *pMapObj = MapObject::getFirstMapObject();
 	while (pMapObj) {
@@ -94,12 +94,12 @@ PointerTool::PointerTool(void) :
 	m_moveCursor(NULL)
 {
 	m_toolID = ID_POINTER_TOOL;
-	m_cursorID = IDC_POINTER; 
+	m_cursorID = IDC_POINTER;
 
 }
-	
+
 /// Destructor
-PointerTool::~PointerTool(void) 
+PointerTool::~PointerTool(void)
 {
 	REF_PTR_RELEASE(m_modifyUndoable); // belongs to pDoc now.
 	if (m_rotateCursor) {
@@ -111,16 +111,16 @@ PointerTool::~PointerTool(void)
 }
 
 /// See if a single obj is selected that has properties.
-void PointerTool::checkForPropertiesPanel(void) 
+void PointerTool::checkForPropertiesPanel(void)
 {
 	MapObject *theMapObj = WaypointOptions::getSingleSelectedWaypoint();
 	PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon();
-	MapObject *theLightObj = LightOptions::getSingleSelectedLight(); 
-	MapObject *theObj = MapObjectProps::getSingleSelectedMapObject(); 
+	MapObject *theLightObj = LightOptions::getSingleSelectedLight();
+	MapObject *theObj = MapObjectProps::getSingleSelectedMapObject();
 	if (theMapObj) {
 		CMainFrame::GetMainFrame()->showOptionsDialog(IDD_WAYPOINT_OPTIONS);
 		WaypointOptions::update();
-	} else if (theTrigger) { 
+	} else if (theTrigger) {
 		if (theTrigger->isWaterArea()) {
 			CMainFrame::GetMainFrame()->showOptionsDialog(IDD_WATER_OPTIONS);
 			WaterOptions::update();
@@ -157,7 +157,7 @@ void PointerTool::clearSelection(void) ///< Clears the selected objects selected
 	// Clear selected build list items.
 	Int i;
 	for (i=0; i<TheSidesList->getNumSides(); i++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(i);
 		for (BuildListInfo *pBuild = pSide->getBuildList(); pBuild; pBuild = pBuild->getNext()) {
 			if (pBuild->isSelected()) {
 				pBuild->setSelected(false);
@@ -168,7 +168,7 @@ void PointerTool::clearSelection(void) ///< Clears the selected objects selected
 }
 
 /// Activate.
-void PointerTool::activate() 
+void PointerTool::activate()
 {
 	Tool::activate();
 	m_mouseUpRotate = false;
@@ -181,14 +181,14 @@ void PointerTool::activate()
 }
 
 /// deactivate.
-void PointerTool::deactivate() 
+void PointerTool::deactivate()
 {
 	m_curObject = NULL;
 	PolygonTool::deactivate();
 }
 
 /** Set the cursor. */
-void PointerTool::setCursor(void) 
+void PointerTool::setCursor(void)
 {
 	if (m_mouseUpRotate) {
 		if (m_rotateCursor == NULL) {
@@ -210,7 +210,7 @@ Bool PointerTool::allowPick(MapObject* pMapObj, WbView* pView)
 	EditorSortingType sort = ES_NONE;
 	if (!pMapObj) {
 		return false;
-	} 
+	}
 	const ThingTemplate *tt = pMapObj->getThingTemplate();
 	if (tt && tt->getEditorSorting() == ES_AUDIO) {
 		if (pView->GetPickConstraint() == ES_NONE || pView->GetPickConstraint() == ES_AUDIO) {
@@ -237,12 +237,12 @@ Bool PointerTool::allowPick(MapObject* pMapObj, WbView* pView)
 		if (sort != ES_NONE && sort != pView->GetPickConstraint()) {
 			return false;
 		}
-	} 
+	}
 	return true;
 }
 
 /** Execute the tool on mouse down - Pick an object. */
-void PointerTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void PointerTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -358,7 +358,7 @@ void PointerTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 
 	if (anySelected) {
 		if (m_curObject) {
-			// See if we are picking on the arrow. 
+			// See if we are picking on the arrow.
 			if (pView->picked(m_curObject, cpt) == PICK_ARROW) {
 				m_rotating = true;
 			}
@@ -461,7 +461,7 @@ void PointerTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 	while (curMapObj) {
 		if (curMapObj->isSelected()) {
 			//pDoc->invalObject(curMapObj);			// invaling in all views can be too slow.
-			pView->invalObjectInView(curMapObj);	
+			pView->invalObjectInView(curMapObj);
 		}
 		curMapObj = curMapObj->getNext();
 	}
@@ -480,7 +480,7 @@ void PointerTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 	while (curMapObj) {
 		if (curMapObj->isSelected()) {
 			//pDoc->invalObject(curMapObj);			// invaling in all views can be too slow.
-			pView->invalObjectInView(curMapObj);	
+			pView->invalObjectInView(curMapObj);
 		}
 		curMapObj = curMapObj->getNext();
 	}
@@ -490,9 +490,9 @@ void PointerTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 }
 
 
-/** Execute the tool on mouse up - if modifying, do the modify, 
+/** Execute the tool on mouse up - if modifying, do the modify,
 else update the selection. */
-void PointerTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void PointerTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -544,7 +544,7 @@ void PointerTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 			}
 		}
 
-	} 
+	}
 	checkForPropertiesPanel();
 }
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/PolygonTool.cpp b/Generals/Code/Tools/WorldBuilder/src/PolygonTool.cpp
index 7a940d3510d..c58312ca602 100644
--- a/Generals/Code/Tools/WorldBuilder/src/PolygonTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/PolygonTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "PolygonTool.h"
@@ -48,7 +48,7 @@ enum {SNAP_DISTANCE = 5};
 
 /// Constructor
 PolygonTool::PolygonTool(void) :
-	Tool(ID_POLYGON_TOOL, IDC_POLYGON), 
+	Tool(ID_POLYGON_TOOL, IDC_POLYGON),
 	m_poly_plusCursor(NULL),
 	m_poly_moveCursor(NULL)
 {
@@ -57,7 +57,7 @@ PolygonTool::PolygonTool(void) :
 
 
 /// Destructor
-PolygonTool::~PolygonTool(void) 
+PolygonTool::~PolygonTool(void)
 {
 	if (m_poly_plusCursor) {
 		::DestroyCursor(m_poly_plusCursor);
@@ -68,7 +68,7 @@ PolygonTool::~PolygonTool(void)
 }
 
 /// Clears it's is active flag.
-void PolygonTool::deactivate() 
+void PolygonTool::deactivate()
 {
 	m_poly_dragPointNdx = -1;
 	if (m_poly_curSelectedPolygon) {
@@ -82,7 +82,7 @@ void PolygonTool::deactivate()
 }
 
 /// Shows the terrain materials options panel.
-void PolygonTool::activate() 
+void PolygonTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_WAYPOINT_OPTIONS);
 	WaypointOptions::update();
@@ -119,7 +119,7 @@ Bool PolygonTool::poly_pickPoly(PolygonTrigger *pTrig, Coord3D loc, Int toleranc
 	}
 	if (count>0 && count<8) {
 		return true;
-	}		
+	}
 	return false;
 }
 
@@ -150,7 +150,7 @@ PolygonTrigger *PolygonTool::pickPolygon(Coord3D loc, CPoint viewPt, WbView* pVi
 			return pTrig;
 		}
 	}
-	return NULL; 
+	return NULL;
 }
 
 // Snap to other polys.
@@ -187,7 +187,7 @@ Int PolygonTool::poly_pickPoint(PolygonTrigger *pTrig, CPoint viewPt, WbView* pV
 		cpt.y = iLoc.y;
 		cpt.z = iLoc.z;
 		cpt.z = 0;
-		CPoint screenLoc; 
+		CPoint screenLoc;
 		pView->docToViewCoords(cpt, &screenLoc);
 		Int dx = screenLoc.x-viewPt.x;
 		Int dy = screenLoc.y - viewPt.y;
@@ -242,8 +242,8 @@ Int PolygonTool::poly_getInsertIndex(PolygonTrigger *pTrig, Coord3D loc) {
 }
 
 /** Do the pick on poly triggers. */
-void PolygonTool::poly_pickOnMouseDown(CPoint viewPt, WbView* pView) 
-{						 
+void PolygonTool::poly_pickOnMouseDown(CPoint viewPt, WbView* pView)
+{
 	m_poly_dragPointNdx = -1;
 	if (m_poly_curSelectedPolygon) {
 		Bool found = false;
@@ -274,7 +274,7 @@ void PolygonTool::poly_pickOnMouseDown(CPoint viewPt, WbView* pView)
 
 
 /// Perform the tool behavior on mouse down.
-void PolygonTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void PolygonTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	Coord3D docPt;
@@ -289,8 +289,8 @@ void PolygonTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 }
 
 /// Perform the tool behavior on mouse down.
-void PolygonTool::startMouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
-{	
+void PolygonTool::startMouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
+{
 	// Clear any selected map objects.
 	if (!m_poly_curSelectedPolygon) PointerTool::clearSelection();
 
@@ -305,7 +305,7 @@ void PolygonTool::startMouseDown(TTrackingMode m, CPoint viewPt, WbView* pView,
 	m_poly_moveUndoable = NULL;
 	if (m_poly_curSelectedPolygon==NULL) {
 		// adding a new polygon.
-		m_poly_curSelectedPolygon = newInstance(PolygonTrigger)(32); 
+		m_poly_curSelectedPolygon = newInstance(PolygonTrigger)(32);
 		AsciiString name;
 		name.format("Area %d", m_poly_curSelectedPolygon->getID());
 		m_poly_curSelectedPolygon->setTriggerName(name);
@@ -353,7 +353,7 @@ void PolygonTool::startMouseDown(TTrackingMode m, CPoint viewPt, WbView* pView,
 }
 
 /// Delete the selected polygon or point.
-Bool PolygonTool::deleteSelectedPolygon(void) 
+Bool PolygonTool::deleteSelectedPolygon(void)
 {
 	if (m_poly_curSelectedPolygon) {
 		Bool found = false;
@@ -391,7 +391,7 @@ Bool PolygonTool::deleteSelectedPolygon(void)
 }
 
 /** Set the cursor. */
-void PolygonTool::setCursor(void) 
+void PolygonTool::setCursor(void)
 {
 	if (m_poly_mouseUpPlus || (m_poly_isAdding && m_poly_curSelectedPolygon)) {
 		if (m_poly_plusCursor == NULL) {
@@ -462,7 +462,7 @@ void PolygonTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 }
 
 /** Mouse up - not much. */
-void PolygonTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void PolygonTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	REF_PTR_RELEASE(m_poly_moveUndoable); // belongs to pDoc now.
diff --git a/Generals/Code/Tools/WorldBuilder/src/RampOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/RampOptions.cpp
index 6cf8072f60f..6bf4b22e39f 100644
--- a/Generals/Code/Tools/WorldBuilder/src/RampOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/RampOptions.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: RampOptions.cpp 
+// FILE: RampOptions.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
diff --git a/Generals/Code/Tools/WorldBuilder/src/RampTool.cpp b/Generals/Code/Tools/WorldBuilder/src/RampTool.cpp
index 3cbd0efd1ea..d0764505b35 100644
--- a/Generals/Code/Tools/WorldBuilder/src/RampTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/RampTool.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: RampTool.cpp 
+// FILE: RampTool.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -131,9 +131,9 @@ void RampTool::applyRamp(CWorldBuilderDoc* pDoc)
 	VecHeightMapIndexes indices;
 
 	WorldHeightMapEdit *worldHeightDup = pDoc->GetHeightMap()->duplicate();
-	
+
 	Real width = TheRampOptions->getRampWidth();
-	
+
 	BuildRectFromSegmentAndWidth(&mStartPoint, &mEndPoint, width,
 															 &bl, &tl, &br, &tr);
 
@@ -148,8 +148,8 @@ void RampTool::applyRamp(CWorldBuilderDoc* pDoc)
 	}
 
 	/*
-		This part is pretty straightforward. Determine the U value for the shortest segment from the 
-		index's actual location to the segments from mStartPoint to mEndPoint, and then apply a 
+		This part is pretty straightforward. Determine the U value for the shortest segment from the
+		index's actual location to the segments from mStartPoint to mEndPoint, and then apply a
 		linear gradient factor according to the height from the beginning to the end of mStartPoint
 		and mEndPoint.
 	*/
@@ -157,15 +157,15 @@ void RampTool::applyRamp(CWorldBuilderDoc* pDoc)
 	for (int i = 0; i < indiceCount; ++i) {
 		Coord3D pt;
 		pDoc->getCoordFromCellIndex(indices[i], &pt);
-		
+
 		Real uVal;
 		Coord2D start = { mStartPoint.x, mStartPoint.y };
 		Coord2D end = { mEndPoint.x, mEndPoint.y };
 		Coord2D pt2D = { pt.x, pt.y };
-		
+
 		ShortestDistancePointToSegment2D(&start, &end, &pt2D, NULL, NULL, &uVal);
 		Real height = mStartPoint.z + uVal * (mEndPoint.z - mStartPoint.z);
-		
+
 		worldHeightDup->setHeight(indices[i].x, indices[i].y, (UnsignedByte) (height / MAP_HEIGHT_SCALE));
 	}
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/RoadOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/RoadOptions.cpp
index 0dde8f381c9..68d08204542 100644
--- a/Generals/Code/Tools/WorldBuilder/src/RoadOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/RoadOptions.cpp
@@ -99,10 +99,10 @@ void RoadOptions::updateLabel(void)
 /** Returns true if only one or more roads is selected. */
 Bool RoadOptions::selectionIsRoadsOnly(void)
 {
-//	MapObject *theMapObj = NULL; 
+//	MapObject *theMapObj = NULL;
 	Bool foundRoad = false;
 	Bool foundAnythingElse = false;
-	MapObject *pMapObj; 
+	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj->isSelected()) {
 			if (pMapObj->getFlag(FLAG_ROAD_FLAGS)) {
@@ -118,7 +118,7 @@ Bool RoadOptions::selectionIsRoadsOnly(void)
 /** Returns true if only one or more roads is selected. */
 void RoadOptions::updateSelection(void)
 {
-//	MapObject *theMapObj = NULL; 
+//	MapObject *theMapObj = NULL;
 	Int angled = 0;
 	Int tight = 0;
 	Int broad = 0;
@@ -127,7 +127,7 @@ void RoadOptions::updateSelection(void)
 	Bool multipleNames = false;
 
 	if (!m_staticThis) return;
-	MapObject *pMapObj; 
+	MapObject *pMapObj;
 
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj->isSelected() && pMapObj->getFlag(FLAG_ROAD_FLAGS)) {
@@ -144,7 +144,7 @@ void RoadOptions::updateSelection(void)
 				tight = 1;
 			}	else {
 				broad = 1;
-			}	
+			}
 			if (pMapObj->getFlag(FLAG_ROAD_JOIN)) {
 				join = 1;
 			}
@@ -197,7 +197,7 @@ void RoadOptions::applyToSelection(void)
 		flagVal = FLAG_ROAD_CORNER_ANGLED;
 	} else if (m_tightCurve) {
 		flagVal = FLAG_ROAD_CORNER_TIGHT;
-	}	
+	}
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	ModifyFlagsUndoable *pUndo = new ModifyFlagsUndoable(pDoc, flagMask, flagVal);
 	pDoc->AddAndDoUndoable(pUndo);
@@ -209,7 +209,7 @@ void RoadOptions::applyToSelection(void)
 // RoadOptions message handlers
 
 /// Setup the controls in the dialog.
-BOOL RoadOptions::OnInitDialog() 
+BOOL RoadOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -237,24 +237,17 @@ BOOL RoadOptions::OnInitDialog()
 		index++;
 		m_numberOfRoads++;
 
-	}  // end for raod
+	}
 
 	// load roads from test assets
 #ifdef LOAD_TEST_ASSETS
 	{
-		char				dirBuf[_MAX_PATH];
-		char				findBuf[_MAX_PATH];
 		char				fileBuf[_MAX_PATH];
 
-		strcpy(dirBuf, ROAD_DIRECTORY);
-		int len = strlen(dirBuf);
-
-		strcpy(findBuf, dirBuf);
-
 		FilenameList filenameList;
-		TheFileSystem->getFileListInDirectory(AsciiString(findBuf), AsciiString("*.tga"), filenameList, FALSE);
+		TheFileSystem->getFileListInDirectory(ROAD_DIRECTORY, "*.tga", filenameList, FALSE);
 
-		if (filenameList.size() > 0) {
+		if (!filenameList.empty()) {
 			FilenameList::iterator it = filenameList.begin();
 			do {
 				AsciiString	filename = *it;
@@ -263,7 +256,7 @@ BOOL RoadOptions::OnInitDialog()
 					++it;
 					continue;
 				}
-				len = filename.getLength();
+				int len = filename.getLength();
 				if (len<5) {
 					++it;
 					continue;
@@ -273,9 +266,10 @@ BOOL RoadOptions::OnInitDialog()
 					++it;
 					continue;
 				}
+				static_assert(ARRAY_SIZE(fileBuf) >= ARRAY_SIZE(TEST_STRING), "Incorrect array size");
 				strcpy(fileBuf, TEST_STRING);
-				strcat(fileBuf, "\\");
-				strcat(fileBuf, filename.str());
+				strlcat(fileBuf, "\\", ARRAY_SIZE(fileBuf));
+				strlcat(fileBuf, filename.str(), ARRAY_SIZE(fileBuf));
 				addRoad(fileBuf, index, TVI_ROOT);
 				index++;
 				m_numberOfRoads++;
@@ -289,8 +283,8 @@ BOOL RoadOptions::OnInitDialog()
 	m_numberOfBridges = 0;
 	// add bridge defs from INI
 	TerrainRoadType *bridge;
-	for( bridge = TheTerrainRoads->firstBridge(); 
-			 bridge; 
+	for( bridge = TheTerrainRoads->firstBridge();
+			 bridge;
 			 bridge = TheTerrainRoads->nextBridge( bridge ) )
 	{
 
@@ -298,7 +292,7 @@ BOOL RoadOptions::OnInitDialog()
 		index++;
 		m_numberOfBridges++;
 
-	}  // end for bridge
+	}
 
 	m_currentRoadIndex = 1;
 	setRoadTreeViewSelection(TVI_ROOT, m_currentRoadIndex);
@@ -322,7 +316,7 @@ HTREEITEM RoadOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_roadTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -337,7 +331,7 @@ HTREEITEM RoadOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = const_cast<char*>(pLabel);
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_roadTreeView.InsertItem(&ins);
 	return(child);
 }
@@ -354,7 +348,7 @@ Bool RoadOptions::findAndSelect(HTREEITEM parent, AsciiString label)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_roadTreeView.GetItem(&ins.item);
 		if (label.compare(buffer) == 0) {
 			m_roadTreeView.SelectItem(child);
@@ -387,17 +381,17 @@ void RoadOptions::addRoad(char *pPath, Int terrainNdx, HTREEITEM parent)
 			parent = findOrAdd( parent, "Roads" );
 
 		// set the name to place as the name of the road entry in INI
-		strcpy( buffer, road->getName().str() );
+		strlcpy(buffer, road->getName().str(), ARRAY_SIZE(buffer));
 
 		// do the add
 		doAdd = TRUE;
 
-	}  // end if
+	}
 
 #ifdef LOAD_TEST_ASSETS
 	if (!doAdd && !strncmp(TEST_STRING, pPath, strlen(TEST_STRING))) {
 		parent = findOrAdd(parent, TEST_STRING);
-		strcpy(buffer, pPath + strlen(TEST_STRING) + 1);
+		strlcpy(buffer, pPath + strlen(TEST_STRING) + 1, ARRAY_SIZE(buffer));
 		doAdd = true;
 	}
 #endif
@@ -412,7 +406,7 @@ void RoadOptions::addRoad(char *pPath, Int terrainNdx, HTREEITEM parent)
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = terrainNdx;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = strlen(buffer)+2;				
+		ins.item.cchTextMax = strlen(buffer)+2;
 		m_roadTreeView.InsertItem(&ins);
 	}
 
@@ -429,7 +423,7 @@ Bool RoadOptions::setRoadTreeViewSelection(HTREEITEM parent, Int selection)
 		item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;
 		item.hItem = child;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_roadTreeView.GetItem(&item);
 		if (item.lParam == selection) {
 			m_roadTreeView.SelectItem(child);
@@ -448,22 +442,22 @@ void RoadOptions::SelectConnected(void)
 {
 	std::list<MapObject*> roadSegs;
 	std::list<MapObject*> connectedSegs;
-	for (MapObject* pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+	for (MapObject* pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
-		if (pMapObj->getFlag(FLAG_ROAD_POINT1)) 
+		if (pMapObj->getFlag(FLAG_ROAD_POINT1))
 		{
-			if (pMapObj->isSelected() || pMapObj->getNext() && pMapObj->getNext()->isSelected()) 
+			if (pMapObj->isSelected() || pMapObj->getNext() && pMapObj->getNext()->isSelected())
 			{
 				connectedSegs.push_back(pMapObj);
 			}
-			else 
+			else
 			{
 				roadSegs.push_back(pMapObj);
 			}
 		}
 	}
 	Bool changed = true;
-	while (changed) 
+	while (changed)
 	{
 		changed = false;
 		for (std::list<MapObject*>::iterator it = roadSegs.begin(); it != roadSegs.end(); ++it)
@@ -535,7 +529,7 @@ void RoadOptions::ChangeRoadType(AsciiString newRoad)
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 }
 
-BOOL RoadOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL RoadOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_roadTreeView.m_hWnd) {
@@ -547,7 +541,7 @@ BOOL RoadOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_roadTreeView.GetItem(&item);
 			if (item.lParam >= 0) {
 				m_currentRoadIndex = item.lParam;
@@ -566,33 +560,33 @@ BOOL RoadOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			}
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
 
-void RoadOptions::OnTightCurve() 
+void RoadOptions::OnTightCurve()
 {
 	m_angleCorners = false;
 	m_tightCurve = true;
 	applyToSelection();
 }
 
-void RoadOptions::OnAngled() 
+void RoadOptions::OnAngled()
 {
 	m_angleCorners = true;
 	m_tightCurve = false;
 	applyToSelection();
 }
 
-void RoadOptions::OnBroadCurve() 
+void RoadOptions::OnBroadCurve()
 {
 	m_angleCorners = false;
 	m_tightCurve = false;
 	applyToSelection();
 }
 
-void RoadOptions::OnJoin() 
+void RoadOptions::OnJoin()
 {
 	CButton *pButton = (CButton *)m_staticThis->GetDlgItem(IDC_JOIN);
 	m_doJoin = pButton->GetCheck()==1;
@@ -607,7 +601,7 @@ void RoadOptions::OnJoin()
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 }
 
-void RoadOptions::OnApplyRoad() 
+void RoadOptions::OnApplyRoad()
 {
 	if (m_currentRoadName != AsciiString::TheEmptyString)
 	{
diff --git a/Generals/Code/Tools/WorldBuilder/src/RoadTool.cpp b/Generals/Code/Tools/WorldBuilder/src/RoadTool.cpp
index e7992d263ce..ffb6a3d65d9 100644
--- a/Generals/Code/Tools/WorldBuilder/src/RoadTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/RoadTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "RoadTool.h"
@@ -41,30 +41,30 @@
 //
 /// Constructor
 RoadTool::RoadTool(void) :
-	Tool(ID_ROAD_TOOL, IDC_ROAD) 
+	Tool(ID_ROAD_TOOL, IDC_ROAD)
 {
 	m_mapObj = NULL;
 }
-	
+
 /// Destructor
-RoadTool::~RoadTool(void) 
+RoadTool::~RoadTool(void)
 {
 	m_mapObj = NULL;
 }
 //-----------------------------------------------------------------------------
-//         Public Functions                                               
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 MapObject* RoadTool::findSegment(const Coord3D *pLoc, Coord3D *outLoc)
 {
-	for (MapObject* pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+	for (MapObject* pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
-		if (pMapObj->getFlag(FLAG_ROAD_POINT1)) 
+		if (pMapObj->getFlag(FLAG_ROAD_POINT1))
 		{
 			MapObject* pMapObj2 = pMapObj->getNext();
-			if (pMapObj2==NULL) 
+			if (pMapObj2==NULL)
 				break;
-			if (!pMapObj2->getFlag(FLAG_ROAD_POINT2)) 
+			if (!pMapObj2->getFlag(FLAG_ROAD_POINT2))
 				continue;
 			Coord2D start, end, loc, snapLoc;
 			start.x = pMapObj->getLocation()->x;
@@ -85,7 +85,7 @@ MapObject* RoadTool::findSegment(const Coord3D *pLoc, Coord3D *outLoc)
 			segment.y = loc.y - snapLoc.y;
 			dist = segment.length();
 
-			if (dist < ROAD_SNAP_DISTANCE*MAP_XY_FACTOR) 
+			if (dist < ROAD_SNAP_DISTANCE*MAP_XY_FACTOR)
 			{
 				outLoc->x = snapLoc.x;
 				outLoc->y = snapLoc.y;
@@ -147,7 +147,7 @@ Bool RoadTool::snap(Coord3D *pLoc, Bool skipFirst)
 
 
 /// Shows the road options panel.
-void RoadTool::activate() 
+void RoadTool::activate()
 {
 	PointerTool::clearSelection();
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_ROAD_OPTIONS);
@@ -156,7 +156,7 @@ void RoadTool::activate()
 }
 
 /** Execute the tool on mouse up - Place a road segment. */
-void RoadTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void RoadTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -260,7 +260,7 @@ void RoadTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBu
 		} else if (RoadOptions::isTightCurve()) {
 			pNew1->setFlag(FLAG_ROAD_CORNER_TIGHT);
 			pNew2->setFlag(FLAG_ROAD_CORNER_TIGHT);
-		}	
+		}
 	}
 
 	// Roads belong to the neutral player. :)
@@ -333,7 +333,7 @@ void RoadTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 	pDoc->invalObject(m_mapObj);
 }
 
-void RoadTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void RoadTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	m_mapObj = NULL;
diff --git a/Generals/Code/Tools/WorldBuilder/src/SaveMap.cpp b/Generals/Code/Tools/WorldBuilder/src/SaveMap.cpp
index 4618ee3604a..4214f468044 100644
--- a/Generals/Code/Tools/WorldBuilder/src/SaveMap.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/SaveMap.cpp
@@ -32,11 +32,7 @@ SaveMap::SaveMap(TSaveMapInfo *pInfo, CWnd* pParent /*=NULL*/)
 	: CDialog(SaveMap::IDD, pParent),
 	m_pInfo(pInfo)
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	m_pInfo->usingSystemDir = m_usingSystemDir = ::AfxGetApp()->GetProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", TRUE);
-#else
-	m_pInfo->usingSystemDir = m_usingSystemDir = FALSE;
-#endif
 
 	//{{AFX_DATA_INIT(SaveMap)
 		// NOTE: the ClassWizard will add member initialization here
@@ -75,7 +71,7 @@ void SaveMap::OnUserMaps()
 	populateMapListbox( FALSE );
 }
 
-void SaveMap::OnOK() 
+void SaveMap::OnOK()
 {
 	CWnd *pEdit = GetDlgItem(IDC_SAVE_MAP_EDIT);
 	if (pEdit == NULL) {
@@ -107,12 +103,12 @@ void SaveMap::OnOK()
 	CDialog::OnOK();
 }
 
-void SaveMap::OnCancel() 
+void SaveMap::OnCancel()
 {
 	CDialog::OnCancel();
 }
 
-void SaveMap::OnBrowse() 
+void SaveMap::OnBrowse()
 {
 	m_pInfo->browse = true;
 	CDialog::OnOK();
@@ -121,12 +117,10 @@ void SaveMap::OnBrowse()
 void SaveMap::populateMapListbox( Bool systemMaps )
 {
 	m_pInfo->usingSystemDir = m_usingSystemDir = systemMaps;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	::AfxGetApp()->WriteProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", m_usingSystemDir);
-#endif
 
 	HANDLE			hFindFile = 0;
-	WIN32_FIND_DATA			findData; 
+	WIN32_FIND_DATA			findData;
 	char				dirBuf[_MAX_PATH];
 	char				findBuf[_MAX_PATH];
 	char				fileBuf[_MAX_PATH];
@@ -134,7 +128,7 @@ void SaveMap::populateMapListbox( Bool systemMaps )
 	if (systemMaps)
 		strcpy(dirBuf, ".\\Maps\\");
 	else
-		sprintf(dirBuf, "%sMaps\\", TheGlobalData->getPath_UserData().str());
+		snprintf(dirBuf, ARRAY_SIZE(dirBuf), "%sMaps\\", TheGlobalData->getPath_UserData().str());
 	int len = strlen(dirBuf);
 
 	if (len > 0 && dirBuf[len - 1] != '\\') {
@@ -144,10 +138,9 @@ void SaveMap::populateMapListbox( Bool systemMaps )
 	CListBox *pList = (CListBox *)this->GetDlgItem(IDC_SAVE_LIST);
 	if (pList == NULL) return;
 	pList->ResetContent();
-	strcpy(findBuf, dirBuf);
-	strcat(findBuf, "*.*");
+	snprintf(findBuf, ARRAY_SIZE(findBuf), "%s*.*", dirBuf);
 
-	hFindFile = FindFirstFile(findBuf, &findData); 
+	hFindFile = FindFirstFile(findBuf, &findData);
 	if (hFindFile != INVALID_HANDLE_VALUE) {
 		do {
 			if (strcmp(findData.cFileName, ".") == 0 || strcmp(findData.cFileName, "..") == 0)
@@ -155,11 +148,7 @@ void SaveMap::populateMapListbox( Bool systemMaps )
 			if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
 				continue;
 			}
-			strcpy(fileBuf, dirBuf);
-			strcat(fileBuf, findData.cFileName);
-			strcat(fileBuf, "\\");
-			strcat(fileBuf, findData.cFileName);
-			strcat(fileBuf, ".map");
+			snprintf(fileBuf, ARRAY_SIZE(fileBuf), "%s%s\\%s.map", dirBuf, findData.cFileName, findData.cFileName);
 			try {
 				CFileStatus status;
 				if (CFile::GetStatus(fileBuf, status)) {
@@ -175,7 +164,7 @@ void SaveMap::populateMapListbox( Bool systemMaps )
  	}
 	CEdit *pEdit = (CEdit*)GetDlgItem(IDC_SAVE_MAP_EDIT);
 	if (pEdit != NULL) {
-		strcpy(fileBuf, m_pInfo->filename);
+		strlcpy(fileBuf, m_pInfo->filename, ARRAY_SIZE(fileBuf));
 		Int len = strlen(fileBuf);
 		if (len>4 && stricmp(".map", fileBuf+(len-4)) == 0) {
 			// strip of the .map
@@ -194,13 +183,13 @@ void SaveMap::populateMapListbox( Bool systemMaps )
 	}
 }
 
-void SaveMap::OnSelchangeSaveList() 
+void SaveMap::OnSelchangeSaveList()
 {
 	CListBox *pList = (CListBox *)this->GetDlgItem(IDC_SAVE_LIST);
 	if (pList == NULL) {
 		return;
 	}
-	
+
 	Int sel = pList->GetCurSel();
 	CString filename;
 	if (sel != LB_ERR) {
@@ -213,7 +202,7 @@ void SaveMap::OnSelchangeSaveList()
 	pEdit->SetWindowText(filename);
 }
 
-BOOL SaveMap::OnInitDialog() 
+BOOL SaveMap::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -225,15 +214,12 @@ BOOL SaveMap::OnInitDialog()
 	if (pUserMaps != NULL)
 		pUserMaps->SetCheck( !m_usingSystemDir );
 
-#if !defined(RTS_DEBUG) && !defined(RTS_INTERNAL)
-	if (pSystemMaps)
-		pSystemMaps->ShowWindow( FALSE );
-	if (pUserMaps)
-		pUserMaps->ShowWindow( FALSE );
-#endif
+	// TheSuperHackers @tweak Originally World Builder has hidden the System Maps tab button in Release builds,
+	// perhaps with the intention to only show User Maps to community users. However, World Builder did release
+	// as a Debug build and always had the System Maps tab, therefore this now shows it always for simplicity.
 
 	populateMapListbox( m_usingSystemDir );
 
 	return FALSE;  // return TRUE unless you set the focus to a control
-	              
+
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/ScorchOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/ScorchOptions.cpp
index a3f24eb27b8..12c8ef06c20 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ScorchOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ScorchOptions.cpp
@@ -63,10 +63,10 @@ END_MESSAGE_MAP()
 
 MapObject *ScorchOptions::getSingleSelectedScorch(void)
 {
-	MapObject *theMapObj = NULL; 
+	MapObject *theMapObj = NULL;
 //	Bool found = false;
 	Int selCount=0;
-	MapObject *pMapObj; 
+	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj->isSelected()) {
 			if (pMapObj->isScorch()) {
@@ -82,10 +82,10 @@ MapObject *ScorchOptions::getSingleSelectedScorch(void)
 	return(NULL);
 }
 
-void ScorchOptions::updateTheUI(void) 
+void ScorchOptions::updateTheUI(void)
 {
 	m_updating = true;
-	MapObject *theMapObj = getSingleSelectedScorch(); 
+	MapObject *theMapObj = getSingleSelectedScorch();
 	CString str;
 	CWnd *pEdit;
 	if (theMapObj) {
@@ -102,7 +102,7 @@ void ScorchOptions::updateTheUI(void)
 	m_updating = false;
 }
 
-void ScorchOptions::update(void) 
+void ScorchOptions::update(void)
 {
 	if (m_staticThis) {
 		m_staticThis->updateTheUI();
@@ -112,11 +112,11 @@ void ScorchOptions::update(void)
 /////////////////////////////////////////////////////////////////////////////
 // ScorchOptions message handlers
 
-BOOL ScorchOptions::OnInitDialog() 
+BOOL ScorchOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	m_staticThis = this;
-	
+
 
 	m_radiusPopup.SetupPopSliderButton(this, IDC_SIZE_POPUP, this);
 
@@ -138,7 +138,7 @@ BOOL ScorchOptions::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void ScorchOptions::OnChangeScorchtype() 
+void ScorchOptions::OnChangeScorchtype()
 {
 	if (m_updating)
 		return;
@@ -148,7 +148,7 @@ void ScorchOptions::OnChangeScorchtype()
 	changeScorch();
 }
 
-void ScorchOptions::OnChangeSizeEdit() 
+void ScorchOptions::OnChangeSizeEdit()
 {
 	if (m_updating)
 		return;
@@ -176,7 +176,7 @@ void ScorchOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void ScorchOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -197,7 +197,7 @@ void ScorchOptions::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 	m_updating = false;
 }
 
@@ -212,7 +212,7 @@ void ScorchOptions::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
@@ -222,7 +222,7 @@ void ScorchOptions::changeScorch(void)
 
 	Dict newDict;
 	newDict.setInt(TheKey_scorchType, (Int)m_scorchtype);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
@@ -237,7 +237,7 @@ void ScorchOptions::changeSize(void)
 
 	Dict newDict;
 	newDict.setReal(TheKey_objectRadius, m_scorchsize);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
@@ -256,4 +256,13 @@ void ScorchOptions::getAllSelectedDicts(void)
 		}
 		m_allSelectedDicts.push_back(pMapObj->getProperties());
 	}
-}
\ No newline at end of file
+}
+
+Dict** ScorchOptions::getAllSelectedDictsData()
+{
+#if defined(USING_STLPORT) || __cplusplus < 201103L
+	return !m_allSelectedDicts.empty() ? &m_allSelectedDicts.front() : NULL;
+#else
+	return m_allSelectedDicts.data();
+#endif
+}
diff --git a/Generals/Code/Tools/WorldBuilder/src/ScorchTool.cpp b/Generals/Code/Tools/WorldBuilder/src/ScorchTool.cpp
index deaa9d01371..7dc51c9a8de 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ScorchTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ScorchTool.cpp
@@ -19,7 +19,7 @@
 // ScorchTool.cpp
 // Author: Dennis Griffin, April 2002
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "ScorchTool.h"
@@ -39,22 +39,22 @@
 
 /// Constructor
 ScorchTool::ScorchTool(void) :
-	Tool(ID_SCORCH_TOOL, IDC_SCORCH) 
+	Tool(ID_SCORCH_TOOL, IDC_SCORCH)
 {
 }
-	
+
 /// Destructor
-ScorchTool::~ScorchTool(void) 
+ScorchTool::~ScorchTool(void)
 {
 }
 
 /// Clears it's is active flag.
-void ScorchTool::deactivate() 
+void ScorchTool::deactivate()
 {
 }
 
 /// Shows the terrain materials options panel.
-void ScorchTool::activate() 
+void ScorchTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_SCORCH_OPTIONS);
 	ScorchOptions::update();
@@ -94,12 +94,12 @@ MapObject *ScorchTool::pickScorch(Coord3D loc){
 			return pObj;
 		}
 	}
-	return NULL; 
+	return NULL;
 }
 
 
 /// Perform the tool behavior on mouse down.
-void ScorchTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void ScorchTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	Coord3D docPt;
@@ -111,7 +111,7 @@ void ScorchTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 		ScorchOptions::update();
 	} else {
 		pView->snapPoint(&docPt);
-		MapObject *pNew = newInstance(MapObject)(docPt, AsciiString("Scorch"), 0, 0, NULL, NULL );
+		MapObject *pNew = newInstance(MapObject)(docPt, "Scorch", 0, 0, NULL, NULL );
 		pNew->getProperties()->setAsciiString(TheKey_originalOwner, NEUTRAL_TEAM_INTERNAL_STR);
 		pNew->setSelected(true);
 		pNew->setIsScorch();
@@ -142,7 +142,7 @@ void ScorchTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 }
 
 /** Execute the tool on mouse up - Place an object. */
-void ScorchTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void ScorchTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp
index bd8e93fbcf9..8c226f8bf58 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp
@@ -23,7 +23,7 @@
 #include "WorldBuilder.h"
 #include "ScriptActionsFalse.h"
 #include "GameLogic/Scripts.h"
-#include "EditAction.h"	
+#include "EditAction.h"
 #include "ScriptDialog.h"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -70,7 +70,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ScriptActionsFalse message handlers
 
-BOOL ScriptActionsFalse::OnInitDialog() 
+BOOL ScriptActionsFalse::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_COMMENT);
@@ -104,11 +104,11 @@ void ScriptActionsFalse::loadList(void)
 		}
 		pList->SetCurSel(m_index);
 		OnSelchangeActionList();
-	}	
+	}
 }
 
 
-void ScriptActionsFalse::OnEditAction() 
+void ScriptActionsFalse::OnEditAction()
 {
 	CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
 	if (m_falseAction == NULL) {
@@ -123,26 +123,26 @@ void ScriptActionsFalse::OnEditAction()
 	pList->SetCurSel(m_index);
 }
 
-void ScriptActionsFalse::enableUI() 
+void ScriptActionsFalse::enableUI()
 {
 	CWnd *pWnd = GetDlgItem(IDC_EDIT);
 	pWnd->EnableWindow(m_falseAction!=NULL);
-	
+
 	pWnd = GetDlgItem(IDC_COPY);
 	pWnd->EnableWindow(m_falseAction!=NULL);
 
 	pWnd = GetDlgItem(IDC_DELETE);
 	pWnd->EnableWindow(m_falseAction!=NULL);
-	
+
 	pWnd = GetDlgItem(IDC_MOVE_DOWN);
 	pWnd->EnableWindow(m_falseAction && m_falseAction->getNext());
 
 	pWnd = GetDlgItem(IDC_MOVE_UP);
 	pWnd->EnableWindow(m_falseAction && m_index>0);
-	
+
 }
 
-void ScriptActionsFalse::OnSelchangeActionList() 
+void ScriptActionsFalse::OnSelchangeActionList()
 {
 	m_falseAction = NULL;
 	CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
@@ -163,18 +163,18 @@ void ScriptActionsFalse::OnSelchangeActionList()
 			}
 			m_falseAction = m_falseAction->getNext();
 		}
-	}	
+	}
 	enableUI(); // Enable buttons based on selection.
 }
 
-void ScriptActionsFalse::OnDblclkActionList() 
+void ScriptActionsFalse::OnDblclkActionList()
 {
 	OnEditAction();
 }
 
 
 
-void ScriptActionsFalse::OnNew() 
+void ScriptActionsFalse::OnNew()
 {
 	ScriptAction *pAct = newInstance( ScriptAction)(ScriptAction::DEBUG_MESSAGE_BOX);
 	EditAction aDlg;
@@ -186,7 +186,7 @@ void ScriptActionsFalse::OnNew()
 		} else {
 			pAct->setNextAction(m_script->getFalseAction());
 			m_script->setFalseAction(pAct);
-		} 
+		}
 		m_index++;
 		loadList();
 	} else {
@@ -194,7 +194,7 @@ void ScriptActionsFalse::OnNew()
 	}
 }
 
-void ScriptActionsFalse::OnDelete() 
+void ScriptActionsFalse::OnDelete()
 {
 	if (m_falseAction) {
 		m_script->deleteFalseAction(m_falseAction);
@@ -202,7 +202,7 @@ void ScriptActionsFalse::OnDelete()
 	}
 }
 
-void ScriptActionsFalse::OnCopy() 
+void ScriptActionsFalse::OnCopy()
 {
 	if (m_falseAction) {
 		ScriptAction *pCopy = m_falseAction->duplicate();
@@ -213,7 +213,7 @@ void ScriptActionsFalse::OnCopy()
 	}
 }
 
-Bool ScriptActionsFalse::doMoveDown() 
+Bool ScriptActionsFalse::doMoveDown()
 {
 	if (m_falseAction && m_falseAction->getNext()) {
 		ScriptAction *pNext = m_falseAction->getNext();
@@ -240,7 +240,7 @@ Bool ScriptActionsFalse::doMoveDown()
 	return false;
 }
 
-void ScriptActionsFalse::OnMoveDown() 
+void ScriptActionsFalse::OnMoveDown()
 {
 	if (doMoveDown()) {
 		m_index++;
@@ -248,7 +248,7 @@ void ScriptActionsFalse::OnMoveDown()
 	}
 }
 
-void ScriptActionsFalse::OnMoveUp() 
+void ScriptActionsFalse::OnMoveUp()
 {
 	if (m_falseAction && m_index>0) {
 //		ScriptAction *pNext = m_falseAction;
@@ -266,7 +266,7 @@ void ScriptActionsFalse::OnMoveUp()
 	}
 }
 
-void ScriptActionsFalse::OnChangeEditComment() 
+void ScriptActionsFalse::OnChangeEditComment()
 {
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_COMMENT);
 	CString comment;
diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp
index 4ccdd9c2e07..7513d0f669d 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp
@@ -23,7 +23,7 @@
 #include "WorldBuilder.h"
 #include "ScriptActionsTrue.h"
 #include "GameLogic/Scripts.h"
-#include "EditAction.h"	
+#include "EditAction.h"
 #include "ScriptDialog.h"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -70,7 +70,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ScriptActionsTrue message handlers
 
-BOOL ScriptActionsTrue::OnInitDialog() 
+BOOL ScriptActionsTrue::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_COMMENT);
@@ -104,11 +104,11 @@ void ScriptActionsTrue::loadList(void)
 		}
 		pList->SetCurSel(m_index);
 		OnSelchangeActionList();
-	}	
+	}
 }
 
 
-void ScriptActionsTrue::OnEditAction() 
+void ScriptActionsTrue::OnEditAction()
 {
 	CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
 	if (m_action == NULL) {
@@ -123,26 +123,26 @@ void ScriptActionsTrue::OnEditAction()
 	pList->SetCurSel(m_index);
 }
 
-void ScriptActionsTrue::enableUI() 
+void ScriptActionsTrue::enableUI()
 {
 	CWnd *pWnd = GetDlgItem(IDC_EDIT);
 	pWnd->EnableWindow(m_action!=NULL);
-	
+
 	pWnd = GetDlgItem(IDC_COPY);
 	pWnd->EnableWindow(m_action!=NULL);
 
 	pWnd = GetDlgItem(IDC_DELETE);
 	pWnd->EnableWindow(m_action!=NULL);
-	
+
 	pWnd = GetDlgItem(IDC_MOVE_DOWN);
 	pWnd->EnableWindow(m_action && m_action->getNext());
 
 	pWnd = GetDlgItem(IDC_MOVE_UP);
 	pWnd->EnableWindow(m_action && m_index>0);
-	
+
 }
 
-void ScriptActionsTrue::OnSelchangeActionList() 
+void ScriptActionsTrue::OnSelchangeActionList()
 {
 	m_action = NULL;
 	CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
@@ -163,18 +163,18 @@ void ScriptActionsTrue::OnSelchangeActionList()
 			}
 			m_action = m_action->getNext();
 		}
-	}	
+	}
 	enableUI(); // Enable buttons based on selection.
 }
 
-void ScriptActionsTrue::OnDblclkActionList() 
+void ScriptActionsTrue::OnDblclkActionList()
 {
 	OnEditAction();
 }
 
 
 
-void ScriptActionsTrue::OnNew() 
+void ScriptActionsTrue::OnNew()
 {
 	ScriptAction *pAct = newInstance( ScriptAction)(ScriptAction::DEBUG_MESSAGE_BOX);
 	EditAction aDlg;
@@ -186,7 +186,7 @@ void ScriptActionsTrue::OnNew()
 		} else {
 			pAct->setNextAction(m_script->getAction());
 			m_script->setAction(pAct);
-		} 
+		}
 		m_index++;
 		loadList();
 	} else {
@@ -194,7 +194,7 @@ void ScriptActionsTrue::OnNew()
 	}
 }
 
-void ScriptActionsTrue::OnDelete() 
+void ScriptActionsTrue::OnDelete()
 {
 	if (m_action) {
 		m_script->deleteAction(m_action);
@@ -202,7 +202,7 @@ void ScriptActionsTrue::OnDelete()
 	}
 }
 
-void ScriptActionsTrue::OnCopy() 
+void ScriptActionsTrue::OnCopy()
 {
 	if (m_action) {
 		ScriptAction *pCopy = m_action->duplicate();
@@ -213,7 +213,7 @@ void ScriptActionsTrue::OnCopy()
 	}
 }
 
-Bool ScriptActionsTrue::doMoveDown() 
+Bool ScriptActionsTrue::doMoveDown()
 {
 	if (m_action && m_action->getNext()) {
 		ScriptAction *pNext = m_action->getNext();
@@ -240,7 +240,7 @@ Bool ScriptActionsTrue::doMoveDown()
 	return false;
 }
 
-void ScriptActionsTrue::OnMoveDown() 
+void ScriptActionsTrue::OnMoveDown()
 {
 	if (doMoveDown()) {
 		m_index++;
@@ -248,7 +248,7 @@ void ScriptActionsTrue::OnMoveDown()
 	}
 }
 
-void ScriptActionsTrue::OnMoveUp() 
+void ScriptActionsTrue::OnMoveUp()
 {
 	if (m_action && m_index>0) {
 //		ScriptAction *pNext = m_action;
@@ -266,7 +266,7 @@ void ScriptActionsTrue::OnMoveUp()
 	}
 }
 
-void ScriptActionsTrue::OnChangeEditComment() 
+void ScriptActionsTrue::OnChangeEditComment()
 {
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_COMMENT);
 	CString comment;
diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptConditions.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptConditions.cpp
index 92213d3d003..ab2d3abed18 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ScriptConditions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ScriptConditions.cpp
@@ -72,7 +72,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ScriptConditionsDlg message handlers
 
-BOOL ScriptConditionsDlg::OnInitDialog() 
+BOOL ScriptConditionsDlg::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
 	loadList();
@@ -102,7 +102,7 @@ void ScriptConditionsDlg::loadList(void)
 			Bool first = true;
 			while (pCond) {
 				AsciiString label;
-				if (first) label = "  "; 
+				if (first) label = "  ";
 				else label = "  *AND* ";
 				first = false;
 				label.concat(pCond->getUiText());
@@ -114,11 +114,11 @@ void ScriptConditionsDlg::loadList(void)
 		}
 		if (count>0) pList->SetCurSel(1);
 		OnSelchangeConditionList();
-	}	
+	}
 }
 
 
-void ScriptConditionsDlg::OnEditCondition() 
+void ScriptConditionsDlg::OnEditCondition()
 {
 	CListBox *pList = (CListBox *)GetDlgItem(IDC_CONDITION_LIST);
 	if (m_condition == NULL) {
@@ -134,17 +134,17 @@ void ScriptConditionsDlg::OnEditCondition()
 	if (m_orCondition && m_orCondition->getFirstAndCondition() == m_condition) {
 		first = true;
 	}
-	if (first) label = "  "; 
+	if (first) label = "  ";
 	else label = "    AND ";
 	label.concat(m_condition->getUiText());
 	pList->InsertString(m_index, label.str());
 }
 
-void ScriptConditionsDlg::enableUI() 
+void ScriptConditionsDlg::enableUI()
 {
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_CONDITION);
 	pWnd->EnableWindow(m_condition!=NULL);
-	
+
 	pWnd = GetDlgItem(IDC_COPY);
 	pWnd->EnableWindow(m_condition!=NULL);
 
@@ -180,11 +180,11 @@ void ScriptConditionsDlg::setSel(OrCondition *pOr, Condition *pCond)
 			}
 			m_orCondition = m_orCondition->getNextOrCondition();
 		}
-	}	
+	}
 	enableUI();
 }
 
-void ScriptConditionsDlg::OnSelchangeConditionList() 
+void ScriptConditionsDlg::OnSelchangeConditionList()
 {
 	m_orCondition = NULL;
 	m_condition = NULL;
@@ -193,7 +193,7 @@ void ScriptConditionsDlg::OnSelchangeConditionList()
 		Int count = pList->GetCurSel();
 		m_index = count;
 		if (count<0) return;
-		count+=1; 
+		count+=1;
 		m_orCondition = m_script->getOrCondition();
 		while (m_orCondition) {
 			count--;
@@ -212,16 +212,16 @@ void ScriptConditionsDlg::OnSelchangeConditionList()
 			}
 			m_orCondition = m_orCondition->getNextOrCondition();
 		}
-	}	
+	}
 }
 
-void ScriptConditionsDlg::OnDblclkConditionList() 
+void ScriptConditionsDlg::OnDblclkConditionList()
 {
 	OnEditCondition();
 }
 
 
-void ScriptConditionsDlg::OnOr() 
+void ScriptConditionsDlg::OnOr()
 {
 	OrCondition *pOr = newInstance( OrCondition);
 	if (m_orCondition) {
@@ -230,12 +230,12 @@ void ScriptConditionsDlg::OnOr()
 	} else {
 		pOr->setNextOrCondition(m_script->getOrCondition());
 		m_script->setOrCondition(pOr);
-	}	
+	}
 	loadList();
 	setSel(pOr, NULL);
 }
 
-void ScriptConditionsDlg::OnNew() 
+void ScriptConditionsDlg::OnNew()
 {
 	Condition *pCond = newInstance( Condition)(Condition::CONDITION_TRUE);
 	EditCondition cDlg;
@@ -254,7 +254,7 @@ void ScriptConditionsDlg::OnNew()
 			}
 			pCond->setNextCondition(m_orCondition->getFirstAndCondition());
 			m_orCondition->setFirstAndCondition(pCond);
-		} 
+		}
 		loadList();
 		setSel(pSavOr, pCond);
 	} else {
@@ -262,7 +262,7 @@ void ScriptConditionsDlg::OnNew()
 	}
 }
 
-void ScriptConditionsDlg::OnDelete() 
+void ScriptConditionsDlg::OnDelete()
 {
 	if (m_condition && m_orCondition) {
 		m_orCondition->deleteCondition(m_condition);
@@ -273,7 +273,7 @@ void ScriptConditionsDlg::OnDelete()
 	}
 }
 
-void ScriptConditionsDlg::OnCopy() 
+void ScriptConditionsDlg::OnCopy()
 {
 	if (m_condition) {
 		OrCondition *pSavOr = m_orCondition;
@@ -300,7 +300,7 @@ Int ScriptConditionsDlg::doMoveDown( OrCondition **outWhichNow )
 			pNOr->setFirstAndCondition(m_condition);
 			m_orCondition->removeCondition(m_condition);
 			m_condition->setNextCondition(newNext);
-			
+
 			*outWhichNow = pNOr;
 			return 2;	// we moved 2 indices, not just one.
 		}
@@ -371,11 +371,11 @@ Int ScriptConditionsDlg::doMoveUp( OrCondition **outWhichNow )
 				m_orCondition->removeCondition(m_condition);
 				pNOr->setFirstAndCondition(m_condition);
 			}
-			
+
 			(*outWhichNow) = pNOr;
 			return 2;	// we moved 2 indices, not just one.
 		}
-		
+
 		pPrev->setNextCondition(m_condition->getNext());
 		m_condition->setNextCondition(pPrev);
 
@@ -407,7 +407,7 @@ Int ScriptConditionsDlg::doMoveUp( OrCondition **outWhichNow )
 	return 0;
 }
 
-void ScriptConditionsDlg::OnMoveDown() 
+void ScriptConditionsDlg::OnMoveDown()
 {
 	Condition *pSav = m_condition;
 	OrCondition *pSavOr;
@@ -419,7 +419,7 @@ void ScriptConditionsDlg::OnMoveDown()
 	setSel(pSavOr, pSav);
 }
 
-void ScriptConditionsDlg::OnMoveUp() 
+void ScriptConditionsDlg::OnMoveUp()
 {
 	Condition *pSav = m_condition;
 	OrCondition *pSavOr;
@@ -431,7 +431,7 @@ void ScriptConditionsDlg::OnMoveUp()
 	setSel(pSavOr, pSav);
 }
 
-void ScriptConditionsDlg::OnChangeEditComment() 
+void ScriptConditionsDlg::OnChangeEditComment()
 {
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_COMMENT);
 	CString comment;
diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp
index a06f0c534a0..1cfdb69b091 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp
@@ -52,28 +52,28 @@ ScriptDialog *ScriptDialog::m_staticThis = NULL;
 static AsciiString formatScriptLabel(Script *pScr) {
 	AsciiString fmt;
 	if (pScr->isSubroutine()) {
-		fmt.concat("[S "); 
+		fmt.concat("[S ");
 	} else {
-		fmt.concat("[ns "); 
+		fmt.concat("[ns ");
 	}
 	if (pScr->isActive()) {
-		fmt.concat("A "); 
+		fmt.concat("A ");
 	} else {
-		fmt.concat("na "); 
+		fmt.concat("na ");
 	}
 	if (pScr->isOneShot()) {
-		fmt.concat("D] ["); 
+		fmt.concat("D] [");
 	} else {
-		fmt.concat("nd] ["); 
+		fmt.concat("nd] [");
 	}
 	if (pScr->isEasy()) {
-		fmt.concat("E "); 
-	} 
+		fmt.concat("E ");
+	}
 	if (pScr->isNormal()) {
-		fmt.concat("N "); 
-	} 
+		fmt.concat("N ");
+	}
 	if (pScr->isHard()) {
-		fmt.concat("H]"); 
+		fmt.concat("H]");
 	} else {
 		fmt.concat("]");
 	}
@@ -85,19 +85,19 @@ static AsciiString formatScriptLabel(ScriptGroup *pScrGrp) {
 	AsciiString fmt;
 	if (pScrGrp->isSubroutine())
 	{
-		fmt.concat("[S "); 
+		fmt.concat("[S ");
 	}
 	else
 	{
-		fmt.concat("[ns "); 
+		fmt.concat("[ns ");
 	}
 	if (pScrGrp->isActive())
 	{
-		fmt.concat("A]"); 
+		fmt.concat("A]");
 	}
 	else
 	{
-		fmt.concat("na]"); 
+		fmt.concat("na]");
 	}
 	fmt.concat(pScrGrp->getName().str());
 	return fmt;
@@ -196,7 +196,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ScriptDialog message handlers
 
-void ScriptDialog::OnSelchangedScriptTree(NMHDR* pNMHDR, LRESULT* pResult) 
+void ScriptDialog::OnSelchangedScriptTree(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
 	CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
@@ -205,18 +205,18 @@ void ScriptDialog::OnSelchangedScriptTree(NMHDR* pNMHDR, LRESULT* pResult)
 		m_curSelection.m_objType = ListType::PLAYER_TYPE;
 	} else {
 		m_curSelection.IntToList(pNMTreeView->itemNew.lParam);
-		DEBUG_ASSERTCRASH(m_curSelection.m_playerIndex <m_sides.getNumSides(),("")); 
-		DEBUG_ASSERTCRASH(m_curSelection.m_objType != ListType::BOGUS_TYPE, ("")); 
+		DEBUG_ASSERTCRASH(m_curSelection.m_playerIndex <m_sides.getNumSides(),(""));
+		DEBUG_ASSERTCRASH(m_curSelection.m_objType != ListType::BOGUS_TYPE, (""));
 	}
 	if (!this->m_draggingTreeView) {
-		pTree->SelectDropTarget(pNMTreeView->itemNew.hItem); 
+		pTree->SelectDropTarget(pNMTreeView->itemNew.hItem);
 	}
 	Script *pScript = getCurScript();
 	ScriptGroup *pGroup = getCurGroup();
 
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_SCRIPT);
 	pWnd->EnableWindow(pScript!=NULL || pGroup!=NULL);
-	
+
 	pWnd = GetDlgItem(IDC_COPY_SCRIPT);
 	pWnd->EnableWindow(pScript!=NULL);
 
@@ -277,7 +277,7 @@ Script *ScriptDialog::getCurScript(void)
 				}
 			}
 		}
-	} 
+	}
 	return NULL;
 }
 
@@ -318,7 +318,7 @@ void ScriptDialog::updateScriptWarning(Script *pScript)
 				if (!warning.isEmpty()) {
 					pScript->setWarnings(true);
 					pCondition->setWarnings(true);
-				}	
+				}
 			}
 		}
 	}
@@ -332,7 +332,7 @@ void ScriptDialog::updateScriptWarning(Script *pScript)
 			if (!warning.isEmpty()) {
 				pScript->setWarnings(true);
 				pAction->setWarnings(true);
-			}	
+			}
 		}
 	}
 }
@@ -359,10 +359,10 @@ void ScriptDialog::updateWarnings()
 				}
 			}
 		}
-	}	
+	}
 }
 
-BOOL ScriptDialog::OnInitDialog() 
+BOOL ScriptDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -407,7 +407,7 @@ BOOL ScriptDialog::OnInitDialog()
 	top.top = ::AfxGetApp()->GetProfileInt(SCRIPT_DIALOG_SECTION, "Top", top.top);
 	top.left =::AfxGetApp()->GetProfileInt(SCRIPT_DIALOG_SECTION, "Left", top.left);
 	SetWindowPos(NULL, top.left, top.top, 0, 0, SWP_NOZORDER|SWP_NOSIZE);
-	
+
 	return FALSE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -436,7 +436,7 @@ HTREEITEM ScriptDialog::addPlayer(Int playerIndx)
 	ins.item.stateMask = TVIS_STATEIMAGEMASK ;
 	ins.item.lParam = lt.ListToInt();
 	ins.item.pszText = (char *)fmt.str();
-	ins.item.cchTextMax = 0;				
+	ins.item.cchTextMax = 0;
 	HTREEITEM hItem = pTree->InsertItem(&ins);
 	ScriptList *pSL = m_sides.getSideInfo(playerIndx)->getScriptList();
 	if (pSL) {
@@ -444,7 +444,7 @@ HTREEITEM ScriptDialog::addPlayer(Int playerIndx)
 	}
 	updateIcons(TVI_ROOT);
 	return hItem;
-}		
+}
 
 void ScriptDialog::setIconGroup(HTREEITEM item)
 {
@@ -452,7 +452,7 @@ void ScriptDialog::setIconGroup(HTREEITEM item)
 
 	if (getCurGroup()->isActive())
 		pTree->SetItemState(item, INDEXTOSTATEIMAGEMASK(1), TVIS_STATEIMAGEMASK);
-	
+
 	if (!getCurGroup()->isActive())
 		pTree->SetItemState(item, INDEXTOSTATEIMAGEMASK(5), TVIS_STATEIMAGEMASK);
 
@@ -556,7 +556,7 @@ void ScriptDialog::addScriptList(HTREEITEM hPlayer, Int playerIndex, ScriptList
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 		ins.item.lParam = lt.ListToInt();
 		ins.item.pszText = (char *)fmt.str();
-		ins.item.cchTextMax = 0;				
+		ins.item.cchTextMax = 0;
 		ins.item.state = INDEXTOSTATEIMAGEMASK(1);
 		if (pGroup->hasWarnings()) {
 			ins.item.state = INDEXTOSTATEIMAGEMASK(3);
@@ -589,7 +589,7 @@ void ScriptDialog::addScriptList(HTREEITEM hPlayer, Int playerIndex, ScriptList
 				ins.item.stateMask = TVIS_STATEIMAGEMASK ;
 				ins.item.lParam = lt.ListToInt();
 				ins.item.pszText = (char *)fmt.str();
-				ins.item.cchTextMax = 0;				
+				ins.item.cchTextMax = 0;
 				/*HTREEITEM hItem =*/ pTree->InsertItem(&ins);
 			}
 		}
@@ -619,7 +619,7 @@ void ScriptDialog::addScriptList(HTREEITEM hPlayer, Int playerIndex, ScriptList
 			ins.item.stateMask = TVIS_STATEIMAGEMASK ;
 			ins.item.lParam = lt.ListToInt();
 			ins.item.pszText = (char *)fmt.str();
-			ins.item.cchTextMax = 0;				
+			ins.item.cchTextMax = 0;
 			/*HTREEITEM hItem =*/ pTree->InsertItem(&ins);
 		}
 	}
@@ -634,7 +634,7 @@ void ScriptDialog::reloadPlayer(Int playerIndex, ScriptList *pSL)
 {
 //	Dict *d = m_sides.getSideInfo(playerIndex)->getDict();
 	updateWarnings();
-	
+
 	CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
 	HTREEITEM player = pTree->GetChildItem(TVI_ROOT);
 	while (player != NULL) {
@@ -654,7 +654,7 @@ void ScriptDialog::reloadPlayer(Int playerIndex, ScriptList *pSL)
 	if (!player) return;
 	HTREEITEM child;
 	ListType currentSel = m_curSelection;
-	
+
 	if (currentSel.m_objType == ListType::SCRIPT_IN_GROUP_TYPE) {
 		if (currentSel.m_scriptIndex > 0) {
 			--currentSel.m_scriptIndex;
@@ -719,7 +719,7 @@ HTREEITEM ScriptDialog::findItem(ListType sel, Bool failSafe)
 			DEBUG_ASSERTCRASH(lt.m_objType == ListType::GROUP_TYPE, ("Not group"));
 			group = pTree->GetNextSiblingItem(group);
 		}
-	} 
+	}
 	DEBUG_ASSERTCRASH(group, ("Couldn't find group."));
 	if (!group) return NULL;
 	if (sel.m_objType == ListType::GROUP_TYPE) {
@@ -744,7 +744,7 @@ HTREEITEM ScriptDialog::findItem(ListType sel, Bool failSafe)
 	}
 
 	if (script || !failSafe) {
-		DEBUG_ASSERTCRASH(script, ("Couldn't find script.")); 
+		DEBUG_ASSERTCRASH(script, ("Couldn't find script."));
 		return script;
 	}
 
@@ -752,7 +752,7 @@ HTREEITEM ScriptDialog::findItem(ListType sel, Bool failSafe)
 	return group;
 }
 
-void ScriptDialog::OnNewFolder() 
+void ScriptDialog::OnNewFolder()
 {
 	Int ndx;
 	if (m_curSelection.m_objType == ListType::PLAYER_TYPE) {
@@ -778,7 +778,7 @@ void ScriptDialog::OnNewFolder()
 	updateIcons(TVI_ROOT);
 }
 
-void ScriptDialog::OnNewScript() 
+void ScriptDialog::OnNewScript()
 {
 	Script *pNewScript = newInstance( Script);
 
@@ -816,7 +816,7 @@ void ScriptDialog::OnNewScript()
 		deleteInstance(pNewScript);
 	}
 	updateIcons(TVI_ROOT);
-}		
+}
 
 void ScriptDialog::insertScript(Script *pNewScript)
 {
@@ -859,7 +859,7 @@ void ScriptDialog::insertScript(Script *pNewScript)
 	updateIcons(TVI_ROOT);
 }
 
-void ScriptDialog::OnEditScript() 
+void ScriptDialog::OnEditScript()
 {
 	Script *pScript = getCurScript();
 	ScriptGroup *pGroup = getCurGroup();
@@ -915,7 +915,7 @@ void ScriptDialog::OnEditScript()
 	deleteInstance(pDup);
 }
 
-void ScriptDialog::OnCopyScript() 
+void ScriptDialog::OnCopyScript()
 {
 	Script *pScript = getCurScript();
 	DEBUG_ASSERTCRASH(pScript, ("Null script."));
@@ -928,7 +928,7 @@ void ScriptDialog::OnCopyScript()
 	updateIcons(TVI_ROOT);
 }
 
-void ScriptDialog::OnDelete() 
+void ScriptDialog::OnDelete()
 {
 	Script *pScript = getCurScript();
 	ScriptList *pSL = m_sides.getSideInfo(m_curSelection.m_playerIndex)->getScriptList();
@@ -1039,7 +1039,7 @@ void ScriptDialog::scanParmForWaypointsAndTeams(Parameter *pParm, Bool doUnits,
 		TeamsInfo * pInfo = m_sides.findTeamInfo(teamName);
 		if (pInfo) {
 			pInfo->getDict()->setBool(TheKey_exportWithScript, true);
-		}	 
+		}
 		if (doUnits) {
 			MapObject *pObj;
 			for (pObj = MapObject::getFirstMapObject(); pObj; pObj = pObj->getNext()) {
@@ -1064,7 +1064,7 @@ void ScriptDialog::scanParmForWaypointsAndTeams(Parameter *pParm, Bool doUnits,
 					TeamsInfo * pInfo = m_sides.findTeamInfo(objsTeamName);
 					if (pInfo) {
 						pInfo->getDict()->setBool(TheKey_exportWithScript, true);
-					}	 
+					}
 				}
 			}
 		}
@@ -1106,7 +1106,7 @@ void ScriptDialog::scanForWaypointsAndTeams(Script *pScript, Bool doUnits, Bool
 #define K_PLAYERS_NAMES_FOR_SCRIPTS_VERSION_1 1
 
 /** Write out selected scripts, and possibly waypoints, trigger areas & teams. */
-void ScriptDialog::OnSave() 
+void ScriptDialog::OnSave()
 {
 	Bool doWaypoints = true;
 	Bool doTriggerAreas = true;
@@ -1131,22 +1131,17 @@ void ScriptDialog::OnSave()
 		scripts[i] = NULL;
 	}
 
-	CFileDialog fileDlg(false, ".scb", NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, 
+	CFileDialog fileDlg(false, ".scb", NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
 		"Script files (.scb)|*.scb||", this);
 
 	Int result = fileDlg.DoModal();
 
-	// Open document dialog may change working directory, 
+	// Open document dialog may change working directory,
 	// change it back.
 	char buf[_MAX_PATH];
 	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	if (char *pEnd = strrchr(buf, '\\')) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);
 	if (IDCANCEL==result) {
@@ -1235,8 +1230,8 @@ void ScriptDialog::OnSave()
 
 		/***************OBJECTS DATA ***************/
 		chunkWriter.openDataChunk("ObjectsList", 	K_OBJECTS_VERSION_3);
-			
-		for (pObj = MapObject::getFirstMapObject(); pObj; pObj = pObj->getNext()) 
+
+		for (pObj = MapObject::getFirstMapObject(); pObj; pObj = pObj->getNext())
 		{
 			if (!pObj->getProperties()->getBool(TheKey_exportWithScript)) {
 				continue;
@@ -1247,10 +1242,10 @@ void ScriptDialog::OnSave()
 				chunkWriter.writeReal( loc.y);
 				chunkWriter.writeReal( loc.z);
 				chunkWriter.writeReal( pObj->getAngle());
-				chunkWriter.writeInt(pObj->getFlags()); 
-				chunkWriter.writeAsciiString(pObj->getName());	
+				chunkWriter.writeInt(pObj->getFlags());
+				chunkWriter.writeAsciiString(pObj->getName());
 
-				chunkWriter.writeDict(*pObj->getProperties());	
+				chunkWriter.writeDict(*pObj->getProperties());
 
 			chunkWriter.closeDataChunk();
 		}
@@ -1258,7 +1253,7 @@ void ScriptDialog::OnSave()
 
 		/***************POLYGON TRIGGERS DATA ***************/
 		chunkWriter.openDataChunk("PolygonTriggers", 	K_TRIGGERS_VERSION_3);
-			
+
 			PolygonTrigger *pTrig;
 			Int count = 0;
 			for (pTrig=PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
@@ -1266,15 +1261,15 @@ void ScriptDialog::OnSave()
 					count++;
 				}
 			}
-			chunkWriter.writeInt(count); 
+			chunkWriter.writeInt(count);
 			for (pTrig=PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
 				if (!pTrig->doExportWithScripts()) continue;
-				chunkWriter.writeAsciiString(pTrig->getTriggerName());	
-				chunkWriter.writeInt(pTrig->getID()); 
+				chunkWriter.writeAsciiString(pTrig->getTriggerName());
+				chunkWriter.writeInt(pTrig->getID());
 				chunkWriter.writeByte(pTrig->isWaterArea());
 				chunkWriter.writeByte(pTrig->isRiver());
 				chunkWriter.writeInt(pTrig->getRiverStart());
-				chunkWriter.writeInt(pTrig->getNumPoints()); 
+				chunkWriter.writeInt(pTrig->getNumPoints());
 				Int i;
 				for (i=0; i<pTrig->getNumPoints(); i++) {
 					ICoord3D loc = *pTrig->getPoint(i);
@@ -1293,7 +1288,7 @@ void ScriptDialog::OnSave()
 				}
 			}
 
-			
+
 		chunkWriter.closeDataChunk();
  		/***************WAYPOINTS DATA ***************/
 			CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
@@ -1346,24 +1341,19 @@ void ScriptDialog::OnSave()
 	theFile.Close();
 }
 
-void ScriptDialog::OnLoad() 
+void ScriptDialog::OnLoad()
 {
-	CFileDialog fileDlg(true, ".scb", NULL, 0, 
+	CFileDialog fileDlg(true, ".scb", NULL, 0,
 		"Script files (.scb)|*.scb||", this);
 
 	Int result = fileDlg.DoModal();
 
-	// Open document dialog may change working directory, 
+	// Open document dialog may change working directory,
 	// change it back.
 	char buf[_MAX_PATH];
 	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	if (char *pEnd = strrchr(buf, '\\')) {
+		*pEnd = 0;
 	}
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	::SetCurrentDirectory(buf);
@@ -1374,7 +1364,7 @@ void ScriptDialog::OnLoad()
 	CString path = fileDlg.GetPathName();
 
 	CachedFileInputStream theInputStream;
-	if (theInputStream.open(AsciiString(path))) 
+	if (theInputStream.open(AsciiString(path)))
 	try {
 		ChunkInputStream *pStrm = &theInputStream;
 		DataChunkInput file( pStrm );
@@ -1382,12 +1372,12 @@ void ScriptDialog::OnLoad()
 		m_firstTrigger = NULL;
 		m_waypointBase = pDoc->getNextWaypointID();
 		m_maxWaypoint = m_waypointBase;
-		file.registerParser( AsciiString("PlayerScriptsList"), AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk );
-		file.registerParser( AsciiString("ObjectsList"), AsciiString::TheEmptyString, ParseObjectsDataChunk );
-		file.registerParser( AsciiString("PolygonTriggers"), AsciiString::TheEmptyString, ParsePolygonTriggersDataChunk );
-		file.registerParser( AsciiString("WaypointsList"), AsciiString::TheEmptyString, ParseWaypointDataChunk );
-		file.registerParser( AsciiString("ScriptTeams"), AsciiString::TheEmptyString, ParseTeamsDataChunk );
-		file.registerParser( AsciiString("ScriptsPlayers"), AsciiString::TheEmptyString, ParsePlayersDataChunk );
+		file.registerParser( "PlayerScriptsList", AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk );
+		file.registerParser( "ObjectsList", AsciiString::TheEmptyString, ParseObjectsDataChunk );
+		file.registerParser( "PolygonTriggers", AsciiString::TheEmptyString, ParsePolygonTriggersDataChunk );
+		file.registerParser( "WaypointsList", AsciiString::TheEmptyString, ParseWaypointDataChunk );
+		file.registerParser( "ScriptTeams", AsciiString::TheEmptyString, ParseTeamsDataChunk );
+		file.registerParser( "ScriptsPlayers", AsciiString::TheEmptyString, ParsePlayersDataChunk );
 		if (!file.parse(this)) {
 			throw(ERROR_CORRUPT_FILE_FORMAT);
 		}
@@ -1396,7 +1386,7 @@ void ScriptDialog::OnLoad()
 		CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 		SidesListUndoable *pUndo = new SidesListUndoable(m_sides, pDoc);
 		pDoc->AddAndDoUndoable(pUndo);
-		REF_PTR_RELEASE(pUndo); // belongs to pDoc now.		
+		REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 		m_sides = *TheSidesList;
 
 		if (m_firstReadObject) {
@@ -1478,13 +1468,13 @@ void ScriptDialog::OnLoad()
 /**
 * ScriptDialog::ParseObjectsDataChunk - read an objects chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptDialog::ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
 	file.m_currentObject = NULL;
-	file.registerParser( AsciiString("Object"), info->label, ParseObjectDataChunk );
+	file.registerParser( "Object", info->label, ParseObjectDataChunk );
 	return (file.parse(userData));
 }
 
@@ -1492,8 +1482,8 @@ Bool ScriptDialog::ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *in
 * WorldHeightMap::ParseObjectData - read a object info chunk.
 * Format is the newer CHUNKY format.
 *	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptDialog::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1505,14 +1495,14 @@ Bool ScriptDialog::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *inf
 	loc.y = file.readReal();
 	loc.z = file.readReal();
 	Real angle = file.readReal();
-	Int flags = file.readInt(); 
+	Int flags = file.readInt();
 	AsciiString name = file.readAsciiString();
 	Dict d;
 	d = file.readDict();
 	MapObject *pThisOne;
 
 	// create the map object
-	pThisOne = newInstance( MapObject)( loc, name, angle, flags, &d, 
+	pThisOne = newInstance( MapObject)( loc, name, angle, flags, &d,
 														TheThingFactory->findTemplate( name ) );
 
 	if (pThisOne->getProperties()->getType(TheKey_waypointID) == Dict::DICT_INT) {
@@ -1521,7 +1511,7 @@ Bool ScriptDialog::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *inf
 		if (pThis->m_maxWaypoint < pThisOne->getWaypointID()) pThis->m_maxWaypoint = pThisOne->getWaypointID();
 	}
 
-	DEBUG_LOG(("Adding object %s (%s)\n", name.str(), pThisOne->getProperties()->getAsciiString(TheKey_originalOwner).str()));
+	DEBUG_LOG(("Adding object %s (%s)", name.str(), pThisOne->getProperties()->getAsciiString(TheKey_originalOwner).str()));
 	// Check for duplicates.
 
 	MapObject *pObj;
@@ -1530,7 +1520,7 @@ Bool ScriptDialog::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *inf
 		Coord3D curLoc;
 		curLoc = *pObj->getLocation();
 		Bool locsMatch = (loc.x==curLoc.x&&loc.y==curLoc.y);
-		// If the locations match, and they are both waypoints or both not waypoints, and the names match, 
+		// If the locations match, and they are both waypoints or both not waypoints, and the names match,
 		// They're duplicate.
 		if (locsMatch && (pObj->isWaypoint() == pThisOne->isWaypoint()) && (pObj->getName() == pThisOne->getName())) {
 			duplicate = true;
@@ -1544,7 +1534,7 @@ Bool ScriptDialog::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *inf
  				AsciiString name = WaypointOptions::GenerateUniqueName(pThisOne->getWaypointID());
 				name.concat("-imp");
 			}
-		}	
+		}
 		if (duplicate) break;
 	}
 	if (duplicate) {
@@ -1566,8 +1556,8 @@ Bool ScriptDialog::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *inf
 /**
 * ScriptDialog::ParseWaypointData - read waypoint data chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptDialog::ParseWaypointDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1589,8 +1579,8 @@ Bool ScriptDialog::ParseWaypointDataChunk(DataChunkInput &file, DataChunkInfo *i
 /**
 * ScriptDialog::ParseTeamsDataChunk - read teams data chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptDialog::ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1601,18 +1591,18 @@ Bool ScriptDialog::ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info
 		if (pThis->m_sides.findTeamInfo(teamName)) {
 			continue;
 		}
-		DEBUG_LOG(("Adding team %s\n", teamName.str()));
+		DEBUG_LOG(("Adding team %s", teamName.str()));
 		AsciiString player = teamDict.getAsciiString(TheKey_teamOwner);
 		if (pThis->m_sides.findSideInfo(player)) {
 			// player exists, so just add it.
 			pThis->m_sides.addTeam(&teamDict);
 		} else {
 			AsciiString warning;
-			warning.format("Importing team %s of player %s.  Player %s doesn't exist, Select player..", 
+			warning.format("Importing team %s of player %s.  Player %s doesn't exist, Select player..",
 				teamName.str(), player.str(), player.str());
 
-			::AfxMessageBox(warning.str(), MB_OK);	
-			TeamsInfo ti;	 
+			::AfxMessageBox(warning.str(), MB_OK);
+			TeamsInfo ti;
 			ti.init(&teamDict);
 			CFixTeamOwnerDialog fix(&ti, &pThis->m_sides);
 			if (fix.DoModal() == IDOK) {
@@ -1620,7 +1610,7 @@ Bool ScriptDialog::ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info
 					teamDict.setAsciiString(TheKey_teamOwner, fix.getSelectedOwner());
 				}
 			}
-						
+
 			AsciiString neutralPlayerName; // neutral player name is empty string
 			// player doesn't exist, so add it to the neutral player.
 			teamDict.setAsciiString(TheKey_teamOwner, neutralPlayerName);
@@ -1634,8 +1624,8 @@ Bool ScriptDialog::ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info
 /**
 * ScriptDialog::ParsePlayersDataChunk - read players names data chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptDialog::ParsePlayersDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1654,8 +1644,8 @@ Bool ScriptDialog::ParsePlayersDataChunk(DataChunkInput &file, DataChunkInfo *in
 * ScriptDialog::ParsePolygonTriggersDataChunk - read a polygon triggers chunk.
 * Format is the newer CHUNKY format.
 *	See PolygonTrigger::WritePolygonTriggersDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptDialog::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1668,7 +1658,7 @@ Bool ScriptDialog::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChunk
 	ScriptDialog *pThis = (ScriptDialog *)userData;
 	pThis->m_firstTrigger = NULL;
 	PolygonTrigger *pPrevTrig = NULL;
-	count = file.readInt(); 
+	count = file.readInt();
 	Bool isRiver;
 	Int riverStart;
 	while (count>0) {
@@ -1685,7 +1675,7 @@ Bool ScriptDialog::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChunk
 			isRiver = file.readByte();
 			riverStart = file.readInt();
 		}
-		numPoints = file.readInt(); 
+		numPoints = file.readInt();
 		PolygonTrigger *pTrig = newInstance(PolygonTrigger)(numPoints+1);
 		pTrig->setTriggerName(triggerName);
 		pTrig->setWaterArea(isWater);
@@ -1699,7 +1689,7 @@ Bool ScriptDialog::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChunk
 			loc.z = file.readInt();
 			pTrig->addPoint(loc);
 		}
-		// Check for duplicates. 
+		// Check for duplicates.
 		Bool duplicate = false;
 		PolygonTrigger *pCurrentTrigger;
 		for (pCurrentTrigger=PolygonTrigger::getFirstPolygonTrigger(); pCurrentTrigger; pCurrentTrigger = pCurrentTrigger->getNext()) {
@@ -1727,7 +1717,7 @@ Bool ScriptDialog::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChunk
 }
 
 
-void ScriptDialog::OnDblclkScriptTree(NMHDR* pNMHDR, LRESULT* pResult) 
+void ScriptDialog::OnDblclkScriptTree(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	Script *pScript = getCurScript();
 	ScriptGroup *pGroup = getCurGroup();
@@ -1736,7 +1726,7 @@ void ScriptDialog::OnDblclkScriptTree(NMHDR* pNMHDR, LRESULT* pResult)
 	*pResult = 0;
 }
 
-void ScriptDialog::OnOK() 
+void ScriptDialog::OnOK()
 {
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	SidesListUndoable *pUndo = new SidesListUndoable(m_sides, pDoc);
@@ -1745,13 +1735,13 @@ void ScriptDialog::OnOK()
 	CDialog::OnOK();
 }
 
-void ScriptDialog::OnCancel() 
+void ScriptDialog::OnCancel()
 {
-	
+
 	CDialog::OnCancel();
 }
 
-void ScriptDialog::OnBegindragScriptTree(NMHDR* pNMHDR, LRESULT* pResult) 
+void ScriptDialog::OnBegindragScriptTree(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
 	CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
@@ -1759,62 +1749,62 @@ void ScriptDialog::OnBegindragScriptTree(NMHDR* pNMHDR, LRESULT* pResult)
 	m_curSelection.IntToList(pNMTreeView->itemNew.lParam);
 	if (m_curSelection.m_objType != ListType::PLAYER_TYPE) {
 		m_dragItem = pNMTreeView->itemNew.hItem;
-    pTree->SelectItem(m_dragItem); 
+    pTree->SelectItem(m_dragItem);
 		m_draggingTreeView = true;
  		SetCapture();
 	}
 	*pResult = 0;
 }
 
-void ScriptDialog::OnMouseMove(UINT nFlags, CPoint point) 
+void ScriptDialog::OnMouseMove(UINT nFlags, CPoint point)
 {
 	if (m_draggingTreeView) {
 		CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
- 
-    HTREEITEM htiTarget;  // handle to target item 
-    TVHITTESTINFO tvht;  // hit test information 
+
+    HTREEITEM htiTarget;  // handle to target item
+    TVHITTESTINFO tvht;  // hit test information
 
 		const Int CENTER_OFFSET = 12;
 		point.y -= CENTER_OFFSET;
-    tvht.pt = point; 
+    tvht.pt = point;
     if ((htiTarget = pTree->HitTest( &tvht)) != NULL) {
-			pTree->SelectDropTarget(htiTarget); 
-    } 
+			pTree->SelectDropTarget(htiTarget);
+    }
   }
-	
+
 	CDialog::OnMouseMove(nFlags, point);
 }
 
-void ScriptDialog::OnLButtonUp(UINT nFlags, CPoint point) 
+void ScriptDialog::OnLButtonUp(UINT nFlags, CPoint point)
 {
 	if (m_draggingTreeView) {
 		CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
 		m_draggingTreeView = false;
 
 		ReleaseCapture();
-    HTREEITEM htiTarget;  // handle to target item 
-    TVHITTESTINFO tvht;  // hit test information 
+    HTREEITEM htiTarget;  // handle to target item
+    TVHITTESTINFO tvht;  // hit test information
 
 		const Int CENTER_OFFSET = 12;
 		point.y -= CENTER_OFFSET;
-    tvht.pt = point; 
-    if ((htiTarget = pTree->HitTest( &tvht)) != NULL) { 
-      pTree->SelectItem(htiTarget); 
+    tvht.pt = point;
+    if ((htiTarget = pTree->HitTest( &tvht)) != NULL) {
+      pTree->SelectItem(htiTarget);
 			pTree->SelectDropTarget(htiTarget);
 			doDropOn(m_dragItem, htiTarget);
-    } 
+    }
 	}
 	CDialog::OnLButtonUp(nFlags, point);
 }
 
-void ScriptDialog::doDropOn(HTREEITEM hDrag, HTREEITEM hTarget) 
+void ScriptDialog::doDropOn(HTREEITEM hDrag, HTREEITEM hTarget)
 {
 	if (hDrag == hTarget) return;
 	CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
 	ListType drag;
 	drag.IntToList(pTree->GetItemData(hDrag));
 	ListType target;
-	target.IntToList(pTree->GetItemData(hTarget));			
+	target.IntToList(pTree->GetItemData(hTarget));
 
 	Script *dragScript = NULL;
 	ScriptGroup *dragGroup = NULL;
@@ -1865,7 +1855,7 @@ void ScriptDialog::doDropOn(HTREEITEM hDrag, HTREEITEM hTarget)
 	}
 
 	if (dragScript) {
-		if (pGroup) { 
+		if (pGroup) {
 				pGroup->addScript(dragScript, target.m_scriptIndex);
 		}	else {
 			pSL->addScript(dragScript, target.m_scriptIndex);
@@ -1889,17 +1879,17 @@ void ScriptDialog::doDropOn(HTREEITEM hDrag, HTREEITEM hTarget)
 	updateIcons(TVI_ROOT);
 }
 
-void ScriptDialog::OnMove(int x, int y) 
+void ScriptDialog::OnMove(int x, int y)
 {
 	CDialog::OnMove(x, y);
-	
+
 	if (this->IsWindowVisible() && !this->IsIconic()) {
 		CRect frameRect;
 		GetWindowRect(&frameRect);
 		::AfxGetApp()->WriteProfileInt(SCRIPT_DIALOG_SECTION, "Top", frameRect.top);
 		::AfxGetApp()->WriteProfileInt(SCRIPT_DIALOG_SECTION, "Left", frameRect.left);
 	}
-	
+
 }
 
 /** This function reacts to the selection of "active" from
@@ -1910,17 +1900,17 @@ void ScriptDialog::OnScriptActivate()
 	Bool active;
 	CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
 	HTREEITEM item = findItem(m_curSelection);
-	
+
 	if (getCurScript() != NULL)
 	{
 		/// Updates attributes
 		active = getCurScript()->isActive();
 		getCurScript()->setActive(!active);
-		
+
 		/// Updates screen to reflect change
 		Script *pScript = getCurScript();
 		pTree->SetItemText(item, formatScriptLabel(pScript).str());
-		
+
 		if (getCurScript()->hasWarnings())
 		{
 			pTree->SetItemState(item, INDEXTOSTATEIMAGEMASK(4), TVIS_STATEIMAGEMASK);
diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptProperties.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptProperties.cpp
index f99b1e059d1..64b1c401ea7 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ScriptProperties.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ScriptProperties.cpp
@@ -24,11 +24,6 @@
 #include "ScriptProperties.h"
 #include "GameLogic/Scripts.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 /////////////////////////////////////////////////////////////////////////////
 // ScriptProperties property page
 
@@ -74,12 +69,12 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ScriptProperties message handlers
 
-BOOL ScriptProperties::OnSetActive() 
+BOOL ScriptProperties::OnSetActive()
 {
 	if ( CPropertyPage::OnSetActive()) {
 		CWnd *pWnd = GetDlgItem(IDC_SCRIPT_COMMENT);
 		pWnd->SetWindowText(m_script->getComment().str());
-		
+
 		pWnd = GetDlgItem(IDC_SCRIPT_NAME);
 		pWnd->SetWindowText(m_script->getName().str());
 		enableControls();
@@ -88,7 +83,7 @@ BOOL ScriptProperties::OnSetActive()
 	return false;
 }
 
-void ScriptProperties::enableControls() 
+void ScriptProperties::enableControls()
 {
 	Bool isSubroutine = m_script->isSubroutine();
 	CButton *pButton = (CButton*)GetDlgItem(IDC_SCRIPT_SUBROUTINE);
@@ -121,7 +116,7 @@ void ScriptProperties::enableControls()
 	m_updating = false;
 }
 
-void ScriptProperties::OnChangeScriptComment() 
+void ScriptProperties::OnChangeScriptComment()
 {
 	CWnd *pWnd = GetDlgItem(IDC_SCRIPT_COMMENT);
 	CString comment;
@@ -129,7 +124,7 @@ void ScriptProperties::OnChangeScriptComment()
 	m_script->setComment(AsciiString((LPCTSTR)comment));
 }
 
-void ScriptProperties::OnChangeScriptName() 
+void ScriptProperties::OnChangeScriptName()
 {
 	CWnd *pWnd = GetDlgItem(IDC_SCRIPT_NAME);
 	CString name;
@@ -138,37 +133,37 @@ void ScriptProperties::OnChangeScriptName()
 	GetParent()->SetWindowText(name);
 }
 
-void ScriptProperties::OnScriptActive() 
+void ScriptProperties::OnScriptActive()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_SCRIPT_ACTIVE);
 	m_script->setActive(pButton->GetCheck()==1);
 }
 
-void ScriptProperties::OnOneShot() 
+void ScriptProperties::OnOneShot()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_ONE_SHOT);
 	m_script->setOneShot(pButton->GetCheck()==1);
 }
 
-void ScriptProperties::OnEasy() 
+void ScriptProperties::OnEasy()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_EASY);
 	m_script->setEasy(pButton->GetCheck()==1);
 }
 
-void ScriptProperties::OnHard() 
+void ScriptProperties::OnHard()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_HARD);
 	m_script->setHard(pButton->GetCheck()==1);
 }
 
-void ScriptProperties::OnNormal() 
+void ScriptProperties::OnNormal()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_NORMAL);
 	m_script->setNormal(pButton->GetCheck()==1);
 }
 
-void ScriptProperties::OnScriptSubroutine() 
+void ScriptProperties::OnScriptSubroutine()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_SCRIPT_SUBROUTINE);
 	Bool isSubroutine = pButton->GetCheck()==1;
@@ -178,7 +173,7 @@ void ScriptProperties::OnScriptSubroutine()
 
 }
 
-void ScriptProperties::OnEveryFrame() 
+void ScriptProperties::OnEveryFrame()
 {
 	m_updating = true;
 	CButton *pButton = (CButton*)GetDlgItem(IDC_EVERY_SECOND);
@@ -190,7 +185,7 @@ void ScriptProperties::OnEveryFrame()
 	m_updating = false;
 }
 
-void ScriptProperties::OnEverySecond() 
+void ScriptProperties::OnEverySecond()
 {
 	m_updating = true;
 	CButton *pButton = (CButton*)GetDlgItem(IDC_EVERY_SECOND);
@@ -202,7 +197,7 @@ void ScriptProperties::OnEverySecond()
 	m_updating = false;
 }
 
-void ScriptProperties::OnChangeSecondsEdit() 
+void ScriptProperties::OnChangeSecondsEdit()
 {
 	if (m_updating) return;
 	CButton *pButton = (CButton*)GetDlgItem(IDC_EVERY_SECOND);
diff --git a/Generals/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp b/Generals/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp
index c42555fae3c..d2de095c9e8 100644
--- a/Generals/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp
@@ -58,10 +58,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // SelectMacrotexture message handlers
 
-BOOL SelectMacrotexture::OnInitDialog() 
+BOOL SelectMacrotexture::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CWnd *pWnd = GetDlgItem(IDC_TEXTURE_TREEVIEW);
 	CRect rect;
 	pWnd->GetWindowRect(&rect);
@@ -73,38 +73,27 @@ BOOL SelectMacrotexture::OnInitDialog()
 	m_textureTreeView.ShowWindow(SW_SHOW);
 
 	{
-		char				dirBuf[_MAX_PATH];
-		char				findBuf[_MAX_PATH];
 		char				fileBuf[_MAX_PATH];
 
-		strcpy(dirBuf, "..\\Art\\TestModelsHere");
-		int len = strlen(dirBuf);
-
-		if (len > 0 && dirBuf[len - 1] != '\\') {
-			dirBuf[len++] = '\\';
-			dirBuf[len] = 0;
-		}
-		strcpy(findBuf, dirBuf);
-
 		FilenameList filenameList;
-		TheFileSystem->getFileListInDirectory(AsciiString(findBuf), AsciiString("*.tga"), filenameList, FALSE);
+		TheFileSystem->getFileListInDirectory("..\\TestArt\\", "*.tga", filenameList, FALSE);
 
-		if (filenameList.size() > 0) {
+		if (!filenameList.empty()) {
 			TVINSERTSTRUCT ins;
 			HTREEITEM child = NULL;
 			FilenameList::iterator it = filenameList.begin();
 			do {
 				AsciiString filename = *it;
-				len = filename.getLength();
+				int len = filename.getLength();
 				if (len<5) continue;
-				strcpy(fileBuf, filename.str());
+				strlcpy(fileBuf, filename.str(), ARRAY_SIZE(fileBuf));
 					::memset(&ins, 0, sizeof(ins));
 					ins.hParent = TVI_ROOT;
 					ins.hInsertAfter = TVI_SORT;
 					ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 					ins.item.lParam = -1;
 					ins.item.pszText = fileBuf;
-					ins.item.cchTextMax = strlen(fileBuf);				
+					ins.item.cchTextMax = strlen(fileBuf);
 					child = m_textureTreeView.InsertItem(&ins);
 				++it;
 			} while (it != filenameList.end());
@@ -122,12 +111,12 @@ BOOL SelectMacrotexture::OnInitDialog()
  		}
 	}
 
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-BOOL SelectMacrotexture::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL SelectMacrotexture::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_textureTreeView.m_hWnd) {
@@ -139,10 +128,10 @@ BOOL SelectMacrotexture::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_textureTreeView.GetItem(&item);
 			if (0==strcmp(buffer, DEFAULT)) {
-				TheTerrainRenderObject->updateMacroTexture(AsciiString(""));
+				TheTerrainRenderObject->updateMacroTexture("");
 			} else {
 				TheTerrainRenderObject->updateMacroTexture(AsciiString(buffer));
 			}
diff --git a/Generals/Code/Tools/WorldBuilder/src/ShadowOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/ShadowOptions.cpp
index 3f08ab650e2..b07a6ad140c 100644
--- a/Generals/Code/Tools/WorldBuilder/src/ShadowOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/ShadowOptions.cpp
@@ -61,7 +61,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ShadowOptions message handlers
 
-void ShadowOptions::setShadowColor(void) 
+void ShadowOptions::setShadowColor(void)
 {
 	Int r, g, b, shift;
 
@@ -82,11 +82,11 @@ void ShadowOptions::setShadowColor(void)
 	if (b<0) b = 0;
 
 	UnsignedInt clr = (255<<24) + (r<<16) + (g<<8) + b;
-	DEBUG_LOG(("Setting shadows to %x\n", clr));
+	DEBUG_LOG(("Setting shadows to %x", clr));
 	TheW3DShadowManager->setShadowColor(clr);
 }
 
-void ShadowOptions::OnChangeAlphaEdit() 
+void ShadowOptions::OnChangeAlphaEdit()
 {
 	CWnd *pEdit = GetDlgItem(IDC_ALPHA_EDIT);
 	Real clr;
@@ -100,7 +100,7 @@ void ShadowOptions::OnChangeAlphaEdit()
 	}
 }
 
-void ShadowOptions::OnChangeBaEdit() 
+void ShadowOptions::OnChangeBaEdit()
 {
 	CWnd *pEdit = GetDlgItem(IDC_BA_EDIT);
 	Real clr;
@@ -114,7 +114,7 @@ void ShadowOptions::OnChangeBaEdit()
 	}
 }
 
-void ShadowOptions::OnChangeGaEdit() 
+void ShadowOptions::OnChangeGaEdit()
 {
 	CWnd *pEdit = GetDlgItem(IDC_GA_EDIT);
 	Real clr;
@@ -128,7 +128,7 @@ void ShadowOptions::OnChangeGaEdit()
 	}
 }
 
-void ShadowOptions::OnChangeRaEdit() 
+void ShadowOptions::OnChangeRaEdit()
 {
 	CWnd *pEdit = GetDlgItem(IDC_RA_EDIT);
 	Real clr;
@@ -142,10 +142,10 @@ void ShadowOptions::OnChangeRaEdit()
 	}
 }
 
-BOOL ShadowOptions::OnInitDialog() 
+BOOL ShadowOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	UnsignedInt clr = TheW3DShadowManager->getShadowColor();
 	m_red = ((clr>>16)&0x00FF)/255.0f;
 	m_green = ((clr>>8)&0x00FF)/255.0f;
diff --git a/Generals/Code/Tools/WorldBuilder/src/SplashScreen.cpp b/Generals/Code/Tools/WorldBuilder/src/SplashScreen.cpp
index e99e33524ba..ecd327af6d1 100644
--- a/Generals/Code/Tools/WorldBuilder/src/SplashScreen.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/SplashScreen.cpp
@@ -45,7 +45,7 @@ SplashScreen::SplashScreen()
 	lf.lfQuality = DEFAULT_QUALITY;
 	lf.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
 	strcpy(lf.lfFaceName, "Arial");
-	
+
 	m_font.CreateFontIndirect(&lf);
 }
 
@@ -64,7 +64,7 @@ void SplashScreen::outputText(UINT nIDString)
 	}
 
 	m_loadString = str;
-	
+
 	RedrawWindow(&m_rect, NULL);
 }
 
@@ -74,15 +74,15 @@ void SplashScreen::OnPaint()
 	// we're extending the default behavior
 	CDialog::OnPaint();
 
-	
+
 	CDC *dc = GetDC();
-	
+
 	// Save off the old font
 	CFont *oldFont = dc->SelectObject(&m_font);
 	COLORREF oldRef = dc->SetTextColor(0x00000000);
-	
+
 //	dc->DrawText(m_loadString, m_rect, DT_VCENTER | DT_LEFT);
-	
+
 	// restore the old font
 	dc->SelectObject(oldFont);
 	dc->SetTextColor(oldRef);
diff --git a/Generals/Code/Tools/WorldBuilder/src/TeamBehavior.cpp b/Generals/Code/Tools/WorldBuilder/src/TeamBehavior.cpp
index 8620e063861..27cfbe551a8 100644
--- a/Generals/Code/Tools/WorldBuilder/src/TeamBehavior.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/TeamBehavior.cpp
@@ -68,7 +68,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // TeamBehavior message handlers
 
-void TeamBehavior::updateScript(NameKeyType keyScript, int idcScript) 
+void TeamBehavior::updateScript(NameKeyType keyScript, int idcScript)
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(idcScript);
 	CString txt;
@@ -81,7 +81,7 @@ void TeamBehavior::updateScript(NameKeyType keyScript, int idcScript)
 	m_teamDict->setAsciiString(keyScript, comboText);
 }
 
-void TeamBehavior::setupScript(NameKeyType keyScript, int idcScript) 
+void TeamBehavior::setupScript(NameKeyType keyScript, int idcScript)
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(idcScript);
 	// Load the subroutine scripts into the combo box.
@@ -104,10 +104,10 @@ void TeamBehavior::setupScript(NameKeyType keyScript, int idcScript)
 }
 
 
-BOOL TeamBehavior::OnInitDialog() 
+BOOL TeamBehavior::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
-	
+
 	setupScript(TheKey_teamOnCreateScript, IDC_ON_CREATE_SCRIPT);
 	setupScript(TheKey_teamOnIdleScript, IDC_ON_IDLE_SCRIPT);
 	setupScript(TheKey_teamEnemySightedScript, IDC_ON_ENEMY_SIGHTED);
@@ -160,26 +160,26 @@ BOOL TeamBehavior::OnInitDialog()
 								// EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void TeamBehavior::OnTransportsReturn() 
+void TeamBehavior::OnTransportsReturn()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_TRANSPORTS_RETURN);
 	Bool checked = 	pCheck->GetCheck()==1;
 	m_teamDict->setBool(TheKey_teamTransportsReturn, checked);
 }
 
-void TeamBehavior::OnAvoidThreats() 
+void TeamBehavior::OnAvoidThreats()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_AVOID_THREATS);
 	Bool checked = 	pCheck->GetCheck()==1;
 	m_teamDict->setBool(TheKey_teamAvoidThreats, checked);
 }
 
-void TeamBehavior::OnSelchangeOnEnemySighted() 
+void TeamBehavior::OnSelchangeOnEnemySighted()
 {
 	updateScript(TheKey_teamEnemySightedScript, IDC_ON_ENEMY_SIGHTED);
 }
 
-void TeamBehavior::OnSelchangeOnDestroyed() 
+void TeamBehavior::OnSelchangeOnDestroyed()
 {
 	updateScript(TheKey_teamOnDestroyedScript, IDC_ON_DESTROYED);
 }
@@ -189,12 +189,12 @@ void TeamBehavior::OnSelchangeOnUnitDestroyed()
 	updateScript(TheKey_teamOnUnitDestroyedScript, IDC_ON_UNIT_DESTROYED_SCRIPT);
 }
 
-void TeamBehavior::OnSelchangeOnCreateScript() 
+void TeamBehavior::OnSelchangeOnCreateScript()
 {
 	updateScript(TheKey_teamOnCreateScript, IDC_ON_CREATE_SCRIPT);
 }
 
-void TeamBehavior::OnPerimeterDefense() 
+void TeamBehavior::OnPerimeterDefense()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_PERIMETER_DEFENSE);
 	if( pCheck )
@@ -212,7 +212,7 @@ void TeamBehavior::OnPerimeterDefense()
 	}
 }
 
-void TeamBehavior::OnBaseDefense() 
+void TeamBehavior::OnBaseDefense()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_BASE_DEFENSE);
 	if( pCheck )
@@ -230,7 +230,7 @@ void TeamBehavior::OnBaseDefense()
 	}
 }
 
-void TeamBehavior::OnChangePercentDestroyed() 
+void TeamBehavior::OnChangePercentDestroyed()
 {
 	CWnd *pWnd = GetDlgItem(IDC_PERCENT_DESTROYED);
 	if (pWnd) {
@@ -242,26 +242,26 @@ void TeamBehavior::OnChangePercentDestroyed()
 	}
 }
 
-void TeamBehavior::OnSelchangeEnemyInteractions() 
+void TeamBehavior::OnSelchangeEnemyInteractions()
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_ENEMY_INTERACTIONS);
 	Int mode = pCombo->GetCurSel();
-	if (mode >= 0) { 
+	if (mode >= 0) {
 		m_teamDict->setInt(TheKey_teamAggressiveness, mode + ATTITUDE_SLEEP);
 	}
 }
 
-void TeamBehavior::OnSelchangeOnAllClear() 
+void TeamBehavior::OnSelchangeOnAllClear()
 {
 	updateScript(TheKey_teamAllClearScript, IDC_ON_ALL_CLEAR);
 }
 
-void TeamBehavior::OnSelchangeOnIdleScript() 
+void TeamBehavior::OnSelchangeOnIdleScript()
 {
 	updateScript(TheKey_teamOnIdleScript, IDC_ON_IDLE_SCRIPT);
 }
 
-void TeamBehavior::OnAttackCommonTarget() 
+void TeamBehavior::OnAttackCommonTarget()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_ATTACK_COMMON_TARGET);
 	Bool checked = 	pCheck->GetCheck()==1;
diff --git a/Generals/Code/Tools/WorldBuilder/src/TeamGeneric.cpp b/Generals/Code/Tools/WorldBuilder/src/TeamGeneric.cpp
index 1fb3c6ee91f..803b19d7e57 100644
--- a/Generals/Code/Tools/WorldBuilder/src/TeamGeneric.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/TeamGeneric.cpp
@@ -27,7 +27,7 @@
 #include "Common/Dict.h"
 #include "Common/WellKnownKeys.h"
 
-static const UINT s_allControls[][2] = 
+static const UINT s_allControls[][2] =
 {
 	{ IDC_SCRIPT_PREFIX1,		IDC_TeamGeneric_Script1,	},
 	{ IDC_SCRIPT_PREFIX2,		IDC_TeamGeneric_Script2,	},
@@ -50,7 +50,7 @@ static const UINT s_allControls[][2] =
 
 TeamGeneric::TeamGeneric() : CPropertyPage(TeamGeneric::IDD)
 {
-	
+
 }
 
 BOOL TeamGeneric::OnInitDialog()
@@ -237,4 +237,4 @@ BEGIN_MESSAGE_MAP(TeamGeneric, CPropertyPage)
 	ON_CBN_SELCHANGE(IDC_TeamGeneric_Script14, OnScriptAdjust)
 	ON_CBN_SELCHANGE(IDC_TeamGeneric_Script15, OnScriptAdjust)
 	ON_CBN_SELCHANGE(IDC_TeamGeneric_Script16, OnScriptAdjust)
-END_MESSAGE_MAP()
\ No newline at end of file
+END_MESSAGE_MAP()
diff --git a/Generals/Code/Tools/WorldBuilder/src/TeamIdentity.cpp b/Generals/Code/Tools/WorldBuilder/src/TeamIdentity.cpp
index 244f51892d2..02ab748547f 100644
--- a/Generals/Code/Tools/WorldBuilder/src/TeamIdentity.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/TeamIdentity.cpp
@@ -24,7 +24,7 @@
 #include "TeamIdentity.h"
 #include "EditParameter.h"
 #include "PickUnitDialog.h"
-#include "Common/WellKnownKeys.h"	  
+#include "Common/WellKnownKeys.h"
 #include "Common/ThingTemplate.h"
 #include "Common/ThingFactory.h"
 #include "Common/ThingSort.h"
@@ -84,37 +84,37 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // TeamIdentity message handlers
 
-BOOL TeamIdentity::OnInitDialog() 
+BOOL TeamIdentity::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
-	
+
 	loadUnitsInfo(IDC_MIN_UNIT1, TheKey_teamUnitMinCount1,
 								IDC_MAX_UNIT1, TheKey_teamUnitMaxCount1,
-								IDC_UNIT_TYPE1, TheKey_teamUnitType1); 
+								IDC_UNIT_TYPE1, TheKey_teamUnitType1);
 
 	loadUnitsInfo(IDC_MIN_UNIT2, TheKey_teamUnitMinCount2,
 								IDC_MAX_UNIT2, TheKey_teamUnitMaxCount2,
-								IDC_UNIT_TYPE2, TheKey_teamUnitType2); 
+								IDC_UNIT_TYPE2, TheKey_teamUnitType2);
 
 	loadUnitsInfo(IDC_MIN_UNIT3, TheKey_teamUnitMinCount3,
 								IDC_MAX_UNIT3, TheKey_teamUnitMaxCount3,
-								IDC_UNIT_TYPE3, TheKey_teamUnitType3); 
+								IDC_UNIT_TYPE3, TheKey_teamUnitType3);
 
 	loadUnitsInfo(IDC_MIN_UNIT4, TheKey_teamUnitMinCount4,
 								IDC_MAX_UNIT4, TheKey_teamUnitMaxCount4,
-								IDC_UNIT_TYPE4, TheKey_teamUnitType4); 
+								IDC_UNIT_TYPE4, TheKey_teamUnitType4);
 
 	loadUnitsInfo(IDC_MIN_UNIT5, TheKey_teamUnitMinCount5,
 								IDC_MAX_UNIT5, TheKey_teamUnitMaxCount5,
-								IDC_UNIT_TYPE5, TheKey_teamUnitType5); 
+								IDC_UNIT_TYPE5, TheKey_teamUnitType5);
 
 	loadUnitsInfo(IDC_MIN_UNIT6, TheKey_teamUnitMinCount6,
 								IDC_MAX_UNIT6, TheKey_teamUnitMaxCount6,
-								IDC_UNIT_TYPE6, TheKey_teamUnitType6); 
+								IDC_UNIT_TYPE6, TheKey_teamUnitType6);
 
 	loadUnitsInfo(IDC_MIN_UNIT7, TheKey_teamUnitMinCount7,
 								IDC_MAX_UNIT7, TheKey_teamUnitMaxCount7,
-								IDC_UNIT_TYPE7, TheKey_teamUnitType7); 
+								IDC_UNIT_TYPE7, TheKey_teamUnitType7);
 
 	CComboBox *pCombo = (CComboBox *)GetDlgItem(IDC_HOME_WAYPOINT);
 	Bool exists;
@@ -164,11 +164,11 @@ BOOL TeamIdentity::OnInitDialog()
 	CWnd *pWnd = GetDlgItem(IDC_DESCRIPTION);
 	AsciiString description = m_teamDict->getAsciiString(TheKey_teamDescription, &exists);
 	pWnd->SetWindowText(description.str());
-	
+
 	pWnd = GetDlgItem(IDC_TEAM_NAME);
 	description = m_teamDict->getAsciiString(TheKey_teamName, &exists);
 	pWnd->SetWindowText(description.str());
-	
+
 	pWnd = GetDlgItem(IDC_MAX);
 	Int maxInstances = m_teamDict->getInt(TheKey_teamMaxInstances, &exists);
 	if (!exists) maxInstances = 1;
@@ -223,7 +223,7 @@ BOOL TeamIdentity::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void TeamIdentity::loadUnitsInfo(int idcMinUnit, NameKeyType keyMinUnit, 
+void TeamIdentity::loadUnitsInfo(int idcMinUnit, NameKeyType keyMinUnit,
 								int idcMaxUnit, NameKeyType keyMaxUnit,
 								int idcUnitType, NameKeyType keyUnitType)
 {
@@ -253,7 +253,10 @@ void TeamIdentity::loadUnitsInfo(int idcMinUnit, NameKeyType keyMinUnit,
 
 		// next tier uses the editor sorting bits that design can specify in the INI
 		EditorSortingType sort = tTemplate->getEditorSorting();
-		if (( sort != ES_VEHICLE ) && (sort != ES_INFANTRY)) continue;
+		// TheSuperHackers @tweak DayV 20/07/2025 Allow structures in teams.
+		if (sort != ES_VEHICLE && sort != ES_INFANTRY && sort != ES_STRUCTURE) {
+			continue;
+		}
 
 		Int ndx = pCombo->AddString(tTemplate->getName().str());
 		if (type == tTemplate->getName()) {
@@ -270,11 +273,11 @@ void TeamIdentity::loadUnitsInfo(int idcMinUnit, NameKeyType keyMinUnit,
 }
 
 
-BOOL TeamIdentity::OnCommand(WPARAM wParam, LPARAM lParam) 
+BOOL TeamIdentity::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 
-	Int wNotifyCode = HIWORD(wParam); // notification code 
-	Int wID = LOWORD(wParam);         // item, control, or accelerator identifier 
+	Int wNotifyCode = HIWORD(wParam); // notification code
+	Int wID = LOWORD(wParam);         // item, control, or accelerator identifier
 	NameKeyType key;
 	if (wNotifyCode == EN_CHANGE) {
 		Int editCtrl = wID;
@@ -332,18 +335,18 @@ BOOL TeamIdentity::OnCommand(WPARAM wParam, LPARAM lParam)
 			return true;
 		}
 	}
- 	
+
 	return CPropertyPage::OnCommand(wParam, lParam);
 }
 
-void TeamIdentity::OnAiRecruitable() 
+void TeamIdentity::OnAiRecruitable()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_AI_RECRUITABLE);
 	Bool checked = 	pCheck->GetCheck()==1;
 	m_teamDict->setBool(TheKey_teamIsAIRecruitable, checked);
 }
 
-void TeamIdentity::OnAutoReinforce() 
+void TeamIdentity::OnAutoReinforce()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_AUTO_REINFORCE);
 	Bool checked = 	pCheck->GetCheck()==1;
@@ -351,7 +354,7 @@ void TeamIdentity::OnAutoReinforce()
 }
 
 
-void TeamIdentity::OnChangeDescription() 
+void TeamIdentity::OnChangeDescription()
 {
 	CWnd *pWnd = GetDlgItem(IDC_DESCRIPTION);
 	if (pWnd) {
@@ -362,7 +365,7 @@ void TeamIdentity::OnChangeDescription()
 	}
 }
 
-void TeamIdentity::OnChangeMax() 
+void TeamIdentity::OnChangeMax()
 {
 	CWnd *pWnd = GetDlgItem(IDC_MAX);
 	if (pWnd) {
@@ -373,7 +376,7 @@ void TeamIdentity::OnChangeMax()
 	}
 }
 
-void TeamIdentity::OnChangePriorityDecrease() 
+void TeamIdentity::OnChangePriorityDecrease()
 {
 	CWnd *pWnd = GetDlgItem(IDC_PRIORITY_DECREASE);
 	if (pWnd) {
@@ -384,7 +387,7 @@ void TeamIdentity::OnChangePriorityDecrease()
 	}
 }
 
-void TeamIdentity::OnChangePriorityIncrease() 
+void TeamIdentity::OnChangePriorityIncrease()
 {
 	CWnd *pWnd = GetDlgItem(IDC_PRIORITY_INCREASE);
 	if (pWnd) {
@@ -395,7 +398,7 @@ void TeamIdentity::OnChangePriorityIncrease()
 	}
 }
 
-void TeamIdentity::OnSelchangeProductionCondition() 
+void TeamIdentity::OnSelchangeProductionCondition()
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_PRODUCTION_CONDITION);
 	CString txt;
@@ -408,7 +411,7 @@ void TeamIdentity::OnSelchangeProductionCondition()
 	m_teamDict->setAsciiString(TheKey_teamProductionCondition, comboText);
 }
 
-void TeamIdentity::OnChangeProductionPriority() 
+void TeamIdentity::OnChangeProductionPriority()
 {
 	CWnd *pWnd = GetDlgItem(IDC_PRODUCTION_PRIORITY);
 	if (pWnd) {
@@ -419,7 +422,7 @@ void TeamIdentity::OnChangeProductionPriority()
 	}
 }
 
-void TeamIdentity::OnSelchangeHomeWaypoint() 
+void TeamIdentity::OnSelchangeHomeWaypoint()
 {
 	CComboBox *pCombo = (CComboBox *)GetDlgItem(IDC_HOME_WAYPOINT);
 	CString txt;
@@ -432,11 +435,13 @@ void TeamIdentity::OnSelchangeHomeWaypoint()
 	m_teamDict->setAsciiString(TheKey_teamHome, comboText);
 }
 
-void TeamIdentity::OnUnitTypeButton(Int idcUnitType) 
+void TeamIdentity::OnUnitTypeButton(Int idcUnitType)
 {
 	PickUnitDialog dlg;
 	dlg.SetAllowableType(ES_VEHICLE);
 	dlg.SetAllowableType(ES_INFANTRY);
+	// TheSuperHackers @tweak DayV 20/07/2025 Allow structures in teams.
+	dlg.SetAllowableType(ES_STRUCTURE);
 	if (dlg.DoModal() == IDOK) {
 		AsciiString unit = dlg.getPickedUnit();
 		NameKeyType keyUnitType;
@@ -472,37 +477,37 @@ void TeamIdentity::OnUnitTypeButton(Int idcUnitType)
 
 }
 
-void TeamIdentity::OnUnitType1Button() 
+void TeamIdentity::OnUnitType1Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE1);
 }
 
-void TeamIdentity::OnUnitType2Button() 
+void TeamIdentity::OnUnitType2Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE2);
 }
 
-void TeamIdentity::OnUnitType3Button() 
+void TeamIdentity::OnUnitType3Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE3);
 }
 
-void TeamIdentity::OnUnitType4Button() 
+void TeamIdentity::OnUnitType4Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE4);
 }
 
-void TeamIdentity::OnUnitType5Button() 
+void TeamIdentity::OnUnitType5Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE5);
 }
 
-void TeamIdentity::OnUnitType6Button() 
+void TeamIdentity::OnUnitType6Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE6);
 }
 
-void TeamIdentity::OnUnitType7Button() 
+void TeamIdentity::OnUnitType7Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE7);
 }
@@ -517,18 +522,18 @@ void TeamIdentity::OnExecuteActions()
 	m_teamDict->setBool(TheKey_teamExecutesActionsOnCreate, pButton->GetCheck() ? true : false);
 }
 
-void TeamIdentity::OnChangeTeamName() 
+void TeamIdentity::OnChangeTeamName()
 {
 
 }
 
-void TeamIdentity::OnTeamSingleton() 
+void TeamIdentity::OnTeamSingleton()
 {
 	CButton *singleton = (CButton*)GetDlgItem(IDC_TEAM_SINGLETON);
 	m_teamDict->setBool(TheKey_teamIsSingleton, singleton->GetCheck() != 0);
 }
 
-void TeamIdentity::OnKillfocusTeamName() 
+void TeamIdentity::OnKillfocusTeamName()
 {
 	CWnd *pWnd = GetDlgItem(IDC_TEAM_NAME);
 	if (pWnd) {
@@ -566,7 +571,7 @@ void TeamIdentity::OnKillfocusTeamName()
 	}
 }
 
-void TeamIdentity::OnSelendokTeamowner() 
+void TeamIdentity::OnSelendokTeamowner()
 {
 	CWnd *pWnd = GetDlgItem(IDC_TEAMOWNER);
 	if (pWnd) {
@@ -577,7 +582,7 @@ void TeamIdentity::OnSelendokTeamowner()
 	}
 }
 
-void TeamIdentity::OnChangeTeamBuildFrames() 
+void TeamIdentity::OnChangeTeamBuildFrames()
 {
 	CWnd *pWnd = GetDlgItem(IDC_TEAM_BUILD_FRAMES);
 	if (pWnd) {
@@ -586,5 +591,5 @@ void TeamIdentity::OnChangeTeamBuildFrames()
 		Int idleFrames = atoi(val);
 		m_teamDict->setInt(TheKey_teamInitialIdleFrames, idleFrames);
 	}
-	
+
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/TeamReinforcement.cpp b/Generals/Code/Tools/WorldBuilder/src/TeamReinforcement.cpp
index 07ea96144ea..3ca98b22b2c 100644
--- a/Generals/Code/Tools/WorldBuilder/src/TeamReinforcement.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/TeamReinforcement.cpp
@@ -62,7 +62,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // TeamReinforcement message handlers
 
-BOOL TeamReinforcement::OnInitDialog() 
+BOOL TeamReinforcement::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
 	Bool exists;
@@ -79,7 +79,7 @@ BOOL TeamReinforcement::OnInitDialog()
 		}
 	}
 	pCombo->SetCurSel(stringNdx);
-	
+
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_TEAM_STARTS_FULL);
 	Bool teamStartsFull = m_teamDict->getBool(TheKey_teamStartsFull, &exists);
 	pCheck->SetCheck(teamStartsFull?1:0);
@@ -97,7 +97,7 @@ BOOL TeamReinforcement::OnInitDialog()
 	pCombo = (CComboBox *)GetDlgItem(IDC_VETERANCY);
 	Int value = m_teamDict->getInt(TheKey_teamVeterancy, &exists);
 	pCombo->SetCurSel(value);
-	
+
 	pCombo = (CComboBox *)GetDlgItem(IDC_WAYPOINT_COMBO);
 	EditParameter::loadWaypoints(pCombo);
 	AsciiString homeWaypoint = m_teamDict->getAsciiString(TheKey_teamReinforcementOrigin, &exists);
@@ -109,13 +109,13 @@ BOOL TeamReinforcement::OnInitDialog()
 		}
 	}
 	pCombo->SetCurSel(stringNdx);
-	
+
 
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void TeamReinforcement::OnDeployBy() 
+void TeamReinforcement::OnDeployBy()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_DEPLOY_BY);
 	if (pCheck->GetCheck()) {
@@ -134,14 +134,14 @@ void TeamReinforcement::OnDeployBy()
 	}
 }
 
-void TeamReinforcement::OnTeamStartsFull() 
+void TeamReinforcement::OnTeamStartsFull()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_TEAM_STARTS_FULL);
 	Bool checked = 	pCheck->GetCheck()==1;
 	m_teamDict->setBool(TheKey_teamStartsFull, checked);
 }
 
-void TeamReinforcement::OnSelchangeTransportCombo() 
+void TeamReinforcement::OnSelchangeTransportCombo()
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_TRANSPORT_COMBO);
 	CString txt;
@@ -154,26 +154,26 @@ void TeamReinforcement::OnSelchangeTransportCombo()
 	m_teamDict->setAsciiString(TheKey_teamTransport, comboText);
 }
 
-void TeamReinforcement::OnTransportsExit() 
+void TeamReinforcement::OnTransportsExit()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_TRANSPORTS_EXIT);
 	Bool checked = 	pCheck->GetCheck()==1;
 	m_teamDict->setBool(TheKey_teamTransportsExit, checked);
 }
 
-void TeamReinforcement::OnSelchangeVeterancy() 
+void TeamReinforcement::OnSelchangeVeterancy()
 {
 	CComboBox *owner = (CComboBox*)GetDlgItem(IDC_VETERANCY);
 	static char buf[1024];
 	int curSel = owner->GetCurSel();
-	int value = 0;	
+	int value = 0;
 	if (curSel >= 0) {
 		value=curSel;
 	}
 	m_teamDict->setInt(TheKey_teamVeterancy, value);
 }
 
-void TeamReinforcement::OnSelchangeWaypointCombo() 
+void TeamReinforcement::OnSelchangeWaypointCombo()
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_WAYPOINT_COMBO);
 	CString txt;
diff --git a/Generals/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp b/Generals/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp
index 3e873885c43..beed12aff1f 100644
--- a/Generals/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp
@@ -27,10 +27,10 @@
 #include "TerrainMaterial.h"
 #include "WHeightMapEdit.h"
 #include "WorldBuilderDoc.h"
-#include "TileTool.h"				
+#include "TileTool.h"
 #include "wbview3d.h"
 #include "Common/TerrainTypes.h"
-#include "W3DDevice/GameClient/TerrainTex.h"	  
+#include "W3DDevice/GameClient/TerrainTex.h"
 #include "W3DDevice/GameClient/HeightMap.h"
 
 TerrainMaterial *TerrainMaterial::m_staticThis = NULL;
@@ -79,7 +79,7 @@ END_MESSAGE_MAP()
 // TerrainMaterial data access method.
 
 /// Set foreground texture and invalidate swatches.
-void TerrainMaterial::setFgTexClass(Int texClass) 
+void TerrainMaterial::setFgTexClass(Int texClass)
 {
 	if (m_staticThis) {
 		m_staticThis->m_currentFgTexture=texClass;
@@ -90,7 +90,7 @@ void TerrainMaterial::setFgTexClass(Int texClass)
 
 
 /// Set backgroundground texture and invalidate swatches.
-void TerrainMaterial::setBgTexClass(Int texClass) 
+void TerrainMaterial::setBgTexClass(Int texClass)
 {
 	if (m_staticThis) {
 		m_staticThis->m_currentBgTexture=texClass;
@@ -100,8 +100,8 @@ void TerrainMaterial::setBgTexClass(Int texClass)
 
 /// Sets the setWidth value in the dialog.
 /** Update the value in the edit control and the slider. */
-void TerrainMaterial::setWidth(Int width) 
-{ 
+void TerrainMaterial::setWidth(Int width)
+{
 	CString buf;
 	buf.Format("%d", width);
 	if (m_staticThis && !m_staticThis->m_updating) {
@@ -111,11 +111,11 @@ void TerrainMaterial::setWidth(Int width)
 	}
 }
 
-/// Sets the tool option - single & multi tile use this panel, 
+/// Sets the tool option - single & multi tile use this panel,
 // and only multi tile uses the width.
 /** Update the ui for the tool. */
-void TerrainMaterial::setToolOptions(Bool singleCell) 
-{ 
+void TerrainMaterial::setToolOptions(Bool singleCell)
+{
 	CString buf;
 	if (m_staticThis ) {
 		m_staticThis->m_updating = true;
@@ -179,7 +179,7 @@ Bool TerrainMaterial::setTerrainTreeViewSelection(HTREEITEM parent, Int selectio
 		item.mask = TVIF_HANDLE|TVIF_PARAM;
 		item.hItem = child;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_terrainTreeView.GetItem(&item);
 		if (item.lParam == selection) {
 			m_terrainTreeView.SelectItem(child);
@@ -198,7 +198,7 @@ Bool TerrainMaterial::setTerrainTreeViewSelection(HTREEITEM parent, Int selectio
 // TerrainMaterial message handlers
 
 /// Setup the controls in the dialog.
-BOOL TerrainMaterial::OnInitDialog() 
+BOOL TerrainMaterial::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -251,7 +251,7 @@ HTREEITEM TerrainMaterial::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_terrainTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -266,7 +266,7 @@ HTREEITEM TerrainMaterial::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = const_cast<LPSTR>(pLabel);
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_terrainTreeView.InsertItem(&ins);
 	return(child);
 }
@@ -297,16 +297,16 @@ void TerrainMaterial::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 				parent = findOrAdd( parent, terrainTypeNames[ i ] );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		// set the name in the tree view to that of the entry
-		strcpy( buffer, terrain->getName().str() );
+		strlcpy(buffer, terrain->getName().str(), ARRAY_SIZE(buffer));
 
 		doAdd = TRUE;
-	}  // end if
- 	else if (!WorldHeightMapEdit::getTexClassIsBlendEdge(terrainNdx)) 
+	}
+ 	else if (!WorldHeightMapEdit::getTexClassIsBlendEdge(terrainNdx))
 	{
 
 		// all these old entries we will put in a tree for eval textures
@@ -322,21 +322,21 @@ void TerrainMaterial::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 					parent = findOrAdd(parent, buffer);
 				}
 				pPath+= i+1;
-				i = 0;			
+				i = 0;
 			}
 			buffer[i] = pPath[i];
 			buffer[i+1] = 0;  // terminate at next character
 			doAdd = TRUE;
 			i++;
 		}
-	}  // end else
+	}
 
 	Int tilesPerRow = TEXTURE_WIDTH/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
 	Int availableTiles = 4 * tilesPerRow * tilesPerRow;
 	Int percent = (WorldHeightMapEdit::getTexClassNumTiles(terrainNdx)*100 + availableTiles/2) / availableTiles;
 
 	char label[_MAX_PATH];
-	sprintf(label, "%d%% %s", percent, buffer);
+	snprintf(label, ARRAY_SIZE(label), "%d%% %s", percent, buffer);
 
 
 	if( doAdd )
@@ -352,7 +352,7 @@ void TerrainMaterial::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = terrainNdx;
 		ins.item.pszText = label;
-		ins.item.cchTextMax = strlen(label)+2;				
+		ins.item.cchTextMax = strlen(label)+2;
 		m_terrainTreeView.InsertItem(&ins);
 	}
 
@@ -361,7 +361,7 @@ void TerrainMaterial::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 //* Create the tree view of textures from the textures in pMap. */
 void TerrainMaterial::updateTextures(WorldHeightMapEdit *pMap)
 {
-#if 1 
+#if 1
 	if (m_staticThis) {
 		m_staticThis->m_updating = true;
 		m_staticThis->m_terrainTreeView.DeleteAllItems();
@@ -369,7 +369,7 @@ void TerrainMaterial::updateTextures(WorldHeightMapEdit *pMap)
 		for (i=0; i<pMap->getNumTexClasses(); i++) {
 			char path[_MAX_PATH];
 			AsciiString uiName = pMap->getTexClassUiName(i);
-			strncpy(path, uiName.str(), _MAX_PATH-2);
+			strlcpy(path, uiName.str(), _MAX_PATH);
 			m_staticThis->addTerrain(path, i, TVI_ROOT);
 		}
 		m_staticThis->m_updating = false;
@@ -380,20 +380,20 @@ void TerrainMaterial::updateTextures(WorldHeightMapEdit *pMap)
 }
 
 /** Swap the foreground and background textures. */
-void TerrainMaterial::OnSwapTextures() 
+void TerrainMaterial::OnSwapTextures()
 {
-	
+
 	Int tmp = m_currentFgTexture;
 	m_currentFgTexture = m_currentBgTexture;
 	m_currentBgTexture = tmp;
-	m_terrainSwatches.Invalidate();	
+	m_terrainSwatches.Invalidate();
 	updateTextureSelection();
 }
 
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void TerrainMaterial::OnChangeSizeEdit() 
+void TerrainMaterial::OnChangeSizeEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SIZE_EDIT);
@@ -405,7 +405,7 @@ void TerrainMaterial::OnChangeSizeEdit()
 			if (1==sscanf(buffer, "%d", &width)) {
 				m_currentWidth = width;
 				BigTileTool::setWidth(m_currentWidth);
-				sprintf(buffer, "%.1f FEET.", m_currentWidth*MAP_XY_FACTOR);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentWidth*MAP_XY_FACTOR);
 				pEdit = m_staticThis->GetDlgItem(IDC_WIDTH_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -425,7 +425,7 @@ void TerrainMaterial::GetPopSliderInfo(const long sliderID, long *pMin, long *pM
 			break;
 		default:
 			break;
-	}	// switch
+	}
 }
 
 
@@ -445,7 +445,7 @@ void TerrainMaterial::PopSliderChanged(const long sliderID, long theVal)
 
 		default:
 			break;
-	}	// switch
+	}
 }
 
 void TerrainMaterial::PopSliderFinished(const long sliderID, long theVal)
@@ -456,12 +456,12 @@ void TerrainMaterial::PopSliderFinished(const long sliderID, long theVal)
 
 		default:
 			break;
-	}	// switch
+	}
 
 }
 
 
-BOOL TerrainMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL TerrainMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_terrainTreeView.m_hWnd) {
@@ -489,7 +489,7 @@ BOOL TerrainMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 						// Tried to switch to a too large texture.
 						::AfxMessageBox(IDS_TEXTURE_TOO_LARGE);
 						::AfxGetMainWnd()->SetFocus();
-					} 
+					}
 					m_currentFgTexture = texClass;
 					updateLabel();
 					m_terrainSwatches.Invalidate();
@@ -506,18 +506,18 @@ BOOL TerrainMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			}
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
-void TerrainMaterial::OnImpassable() 
+void TerrainMaterial::OnImpassable()
 {
 	m_paintingPassable = false;
 	CButton *button = (CButton *)GetDlgItem(IDC_PASSABLE);
 	button->SetCheck(0);
 }
 
-void TerrainMaterial::OnPassableCheck() 
+void TerrainMaterial::OnPassableCheck()
 {
 	CButton *owner = (CButton*) GetDlgItem(IDC_PASSABLE_CHECK);
 	Bool isChecked = (owner->GetCheck() != 0);
@@ -546,7 +546,7 @@ void TerrainMaterial::OnPassableCheck()
 	}
 }
 
-void TerrainMaterial::OnPassable() 
+void TerrainMaterial::OnPassable()
 {
 	m_paintingPassable = true;
 	CButton *button = (CButton *)GetDlgItem(IDC_IMPASSABLE);
diff --git a/Generals/Code/Tools/WorldBuilder/src/TerrainModal.cpp b/Generals/Code/Tools/WorldBuilder/src/TerrainModal.cpp
index f77fd0d2a54..c4d6e5a30a2 100644
--- a/Generals/Code/Tools/WorldBuilder/src/TerrainModal.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/TerrainModal.cpp
@@ -80,7 +80,7 @@ void TerrainModal::updateLabel(void)
 }
 
 /// Setup the controls in the dialog.
-BOOL TerrainModal::OnInitDialog() 
+BOOL TerrainModal::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -123,7 +123,7 @@ HTREEITEM TerrainModal::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_terrainTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -138,7 +138,7 @@ HTREEITEM TerrainModal::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = const_cast<LPSTR>(pLabel);
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_terrainTreeView.InsertItem(&ins);
 	return(child);
 }
@@ -168,15 +168,15 @@ void TerrainModal::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 				parent = findOrAdd( parent, terrainTypeNames[ i ] );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-		strcpy( buffer, terrain->getName().str() );
+		strlcpy(buffer, terrain->getName().str(), ARRAY_SIZE(buffer));
 
 		doAdd = TRUE;
-						
-	}  // end if
+
+	}
 	else
 	{
 
@@ -194,7 +194,7 @@ void TerrainModal::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 					parent = findOrAdd(parent, buffer);
 				}
 				pPath+= i+1;
-				i = 0;			
+				i = 0;
 			}
 			buffer[i] = pPath[i];
 			buffer[i+1] = 0;  // terminate at next char
@@ -202,7 +202,7 @@ void TerrainModal::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 			doAdd = TRUE;
 		}
 
-	}  // end else
+	}
 
 	if (doAdd)
 	{
@@ -214,7 +214,7 @@ void TerrainModal::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = terrainNdx;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = strlen(buffer)+2;				
+		ins.item.cchTextMax = strlen(buffer)+2;
 		m_terrainTreeView.InsertItem(&ins);
 	}
 
@@ -234,7 +234,7 @@ void TerrainModal::updateTextures(void)
 		}
 		const char *tName = WorldHeightMapEdit::getTexClassName(i).str();
 		char path[_MAX_PATH];
-		strncpy(path, tName, _MAX_PATH-2);
+		strlcpy(path, tName, _MAX_PATH);
 		addTerrain(path, i, TVI_ROOT);
 	}
 	setTerrainTreeViewSelection(TVI_ROOT, m_currentFgTexture);
@@ -251,7 +251,7 @@ Bool TerrainModal::setTerrainTreeViewSelection(HTREEITEM parent, Int selection)
 		item.mask = TVIF_HANDLE|TVIF_PARAM;
 		item.hItem = child;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_terrainTreeView.GetItem(&item);
 		if (item.lParam == selection) {
 			m_terrainTreeView.SelectItem(child);
@@ -267,7 +267,7 @@ Bool TerrainModal::setTerrainTreeViewSelection(HTREEITEM parent, Int selection)
 
 
 
-BOOL TerrainModal::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL TerrainModal::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_terrainTreeView.m_hWnd) {
@@ -286,7 +286,7 @@ BOOL TerrainModal::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			}
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/TerrainSwatches.cpp b/Generals/Code/Tools/WorldBuilder/src/TerrainSwatches.cpp
index 4de9fb6a7d8..d01ddc7ed7d 100644
--- a/Generals/Code/Tools/WorldBuilder/src/TerrainSwatches.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/TerrainSwatches.cpp
@@ -48,10 +48,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // TerrainSwatches message handlers
 
-void TerrainSwatches::OnPaint() 
+void TerrainSwatches::OnPaint()
 {
 	CPaintDC dc(this); // device context for painting
-	
+
 	CRect clientRect;
 	GetClientRect(&clientRect);
 
@@ -91,7 +91,7 @@ void TerrainSwatches::OnPaint()
 void TerrainSwatches::DrawMyTexture(CDC *pDc, int top, int left, Int width, UnsignedByte *rgbData)
 {
 	// Just blast about some dib bits.
-	
+
 	LPBITMAPINFO pBI;
 //	long bytes = sizeof(BITMAPINFO);
  	pBI = new BITMAPINFO;
@@ -108,7 +108,7 @@ void TerrainSwatches::DrawMyTexture(CDC *pDc, int top, int left, Int width, Unsi
 	pBI->bmiHeader.biClrImportant = 0;
 
 	//::Sleep(10);
-	/*int val=*/::StretchDIBits(pDc->m_hDC, left, top, width, width, 0, 0, width, width, rgbData, pBI, 
+	/*int val=*/::StretchDIBits(pDc->m_hDC, left, top, width, width, 0, 0, width, width, rgbData, pBI,
 		DIB_RGB_COLORS, SRCCOPY);
 	delete(pBI);
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/TileTool.cpp b/Generals/Code/Tools/WorldBuilder/src/TileTool.cpp
index 963b82f5d8a..a5262814966 100644
--- a/Generals/Code/Tools/WorldBuilder/src/TileTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/TileTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "TileTool.h"
@@ -42,15 +42,15 @@ TileTool::TileTool(void) :
 {
 	m_htMapEditCopy = NULL;
 }
-	
+
 /// Destructor
-TileTool::~TileTool(void) 
+TileTool::~TileTool(void)
 {
 	REF_PTR_RELEASE(m_htMapEditCopy);
 }
 
 /// Shows the terrain materials options panel.
-void TileTool::activate() 
+void TileTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_TERRAIN_MATERIAL);
 	TerrainMaterial::setToolOptions(true);
@@ -60,7 +60,7 @@ void TileTool::activate()
 
 
 /// Common mouse down code for left and right clicks.
-void TileTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void TileTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m == TRACK_L)
 		m_textureClassToDraw = TerrainMaterial::getFgTexClass();
@@ -80,7 +80,7 @@ void TileTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBu
 }
 
 /// Common mouse up code for left and right clicks.
-void TileTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void TileTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L && m != TRACK_R) return;
 
@@ -184,14 +184,14 @@ BigTileTool::BigTileTool(void)
 }
 
 /// Shows the terrain materials options panel.
-void BigTileTool::setWidth(Int width) 
+void BigTileTool::setWidth(Int width)
 {
 	m_currentWidth = width;
 	DrawObject::setBrushFeedbackParms(true, m_currentWidth, 0);
 }
 
 /// Shows the terrain materials options panel.
-void BigTileTool::activate() 
+void BigTileTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_TERRAIN_MATERIAL);
 	TerrainMaterial::setToolOptions(false);
diff --git a/Generals/Code/Tools/WorldBuilder/src/Tool.cpp b/Generals/Code/Tools/WorldBuilder/src/Tool.cpp
index 99b0cba967c..4962e7cff48 100644
--- a/Generals/Code/Tools/WorldBuilder/src/Tool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/Tool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 #include "MainFrm.h"
 #include "DrawObject.h"
@@ -32,16 +32,16 @@
 /// Tool class.
 //
 /// Constructor
-Tool::Tool(Int toolID, Int cursorID) 
+Tool::Tool(Int toolID, Int cursorID)
 {
-	m_toolID = toolID; 
+	m_toolID = toolID;
 	m_cursorID = cursorID;
 	m_cursor = NULL;
 }
 
 
 /// Destructor
-Tool::~Tool(void) 
+Tool::~Tool(void)
 {
 	if (m_cursor) {
 		::DestroyCursor(m_cursor);
@@ -50,14 +50,14 @@ Tool::~Tool(void)
 
 
 /// Shows the "no options"  options panel.
-void Tool::activate() 
+void Tool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_NO_OPTIONS);
 	DrawObject::setDoBrushFeedback(false);
 }
 
 
-void Tool::setCursor(void) 
+void Tool::setCursor(void)
 {
 		if (m_cursor == NULL) {
 			m_cursor = AfxGetApp()->LoadCursor(MAKEINTRESOURCE(m_cursorID));
@@ -66,7 +66,7 @@ void Tool::setCursor(void)
 }
 
 /// Calculate the round blend factor.
-/** Calculates the blend amount of the brush.  1.0 means the brush sets the 
+/** Calculates the blend amount of the brush.  1.0 means the brush sets the
 height, 0.0 means no change, and between blends proportionally. */
 Real Tool::calcRoundBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int featherWidth)
 {
@@ -90,12 +90,12 @@ Real Tool::calcRoundBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int
 	if (dist <= featherWidth) {
 		return (featherWidth-dist)/featherWidth;
 	}
-	
+
 	return(0);
 }
 
 /// Calculate the square blend factor.
-/** Calculates the blend amount of the brush.  1.0 means the brush sets the 
+/** Calculates the blend amount of the brush.  1.0 means the brush sets the
 height, 0.0 means no change, and between blends proportionally. */
 Real Tool::calcSquareBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int featherWidth)
 {
@@ -119,7 +119,7 @@ Real Tool::calcSquareBlendFactor(CPoint center, Int x, Int y, Int brushWidth, In
 	if (dist <= featherWidth) {
 		return (featherWidth-dist)/featherWidth;
 	}
-	
+
 	return(0);
 }
 
@@ -138,9 +138,9 @@ void Tool::getCenterIndex(Coord3D *docLocP, Int brushWidth, CPoint *center, CWor
 	}
 }
 
-void Tool::getAllIndexesIn(const Coord3D *bl, const Coord3D *br, 
-													 const Coord3D *tl, const Coord3D *tr, 
-													 Int widthOutside, CWorldBuilderDoc *pDoc, 
+void Tool::getAllIndexesIn(const Coord3D *bl, const Coord3D *br,
+													 const Coord3D *tl, const Coord3D *tr,
+													 Int widthOutside, CWorldBuilderDoc *pDoc,
 													 VecHeightMapIndexes* allIndices)
 {
 	if (!(bl && br && tl && tr && pDoc && allIndices)) {
@@ -148,4 +148,4 @@ void Tool::getAllIndexesIn(const Coord3D *bl, const Coord3D *br,
 	}
 
 	pDoc->getAllIndexesInRect(bl, br, tl, tr, widthOutside, allIndices);
-}
\ No newline at end of file
+}
diff --git a/Generals/Code/Tools/WorldBuilder/src/WBFrameWnd.cpp b/Generals/Code/Tools/WorldBuilder/src/WBFrameWnd.cpp
index 447dbd3225c..3b57d0cb3f7 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WBFrameWnd.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WBFrameWnd.cpp
@@ -55,7 +55,7 @@ BOOL CWBFrameWnd::LoadFrame(UINT nIDResource,
 			SWP_NOZORDER|SWP_NOSIZE);
 		if (!m_cellSizeToolBar.Create(this, IDD_CELL_SLIDER, CBRS_LEFT, IDD_CELL_SLIDER))
 		{
-			DEBUG_CRASH(("Failed to create toolbar\n"));
+			DEBUG_CRASH(("Failed to create toolbar"));
 		}
 		EnableDocking(CBRS_ALIGN_ANY);
 		m_cellSizeToolBar.SetupSlider();
@@ -65,7 +65,7 @@ BOOL CWBFrameWnd::LoadFrame(UINT nIDResource,
 	return(ret);
 }
 
-void CWBFrameWnd::OnMove(int x, int y) 
+void CWBFrameWnd::OnMove(int x, int y)
 {
 	CFrameWnd::OnMove(x, y);
 	if (this->IsWindowVisible() && !this->IsIconic()) {
@@ -127,7 +127,7 @@ BOOL CWB3dFrameWnd::LoadFrame(UINT nIDResource,
 }
 
 
-void CWB3dFrameWnd::OnMove(int x, int y) 
+void CWB3dFrameWnd::OnMove(int x, int y)
 {
 	CFrameWnd::OnMove(x, y);
 	if (this->IsWindowVisible() && !this->IsIconic()) {
@@ -138,7 +138,7 @@ void CWB3dFrameWnd::OnMove(int x, int y)
 	}
 }
 
-void CWB3dFrameWnd::OnWindowPreview1024x768() 
+void CWB3dFrameWnd::OnWindowPreview1024x768()
 {
 	if (m_3dViewWidth == 1024) return;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "Width", 1024);
@@ -146,12 +146,12 @@ void CWB3dFrameWnd::OnWindowPreview1024x768()
 	adjustWindowSize();
 }
 
-void CWB3dFrameWnd::OnUpdateWindowPreview1024x768(CCmdUI* pCmdUI) 
+void CWB3dFrameWnd::OnUpdateWindowPreview1024x768(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_3dViewWidth==1024?1:0);
 }
 
-void CWB3dFrameWnd::OnWindowPreview640x480() 
+void CWB3dFrameWnd::OnWindowPreview640x480()
 {
 	if (m_3dViewWidth == 640) return;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "Width", 640);
@@ -159,12 +159,12 @@ void CWB3dFrameWnd::OnWindowPreview640x480()
 	adjustWindowSize();
 }
 
-void CWB3dFrameWnd::OnUpdateWindowPreview640x480(CCmdUI* pCmdUI) 
+void CWB3dFrameWnd::OnUpdateWindowPreview640x480(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_3dViewWidth==640?1:0);
 }
 
-void CWB3dFrameWnd::OnWindowPreview800x600() 
+void CWB3dFrameWnd::OnWindowPreview800x600()
 {
 	if (m_3dViewWidth == 800) return;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "Width", 800);
@@ -172,7 +172,7 @@ void CWB3dFrameWnd::OnWindowPreview800x600()
 	adjustWindowSize();
 }
 
-void CWB3dFrameWnd::OnUpdateWindowPreview800x600(CCmdUI* pCmdUI) 
+void CWB3dFrameWnd::OnUpdateWindowPreview800x600(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_3dViewWidth==800?1:0);
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/WBHeightMap.cpp b/Generals/Code/Tools/WorldBuilder/src/WBHeightMap.cpp
index 8762e7c196a..ceaf815bc85 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WBHeightMap.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WBHeightMap.cpp
@@ -18,12 +18,12 @@
 
 // FILE: Heightmap.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -37,7 +37,7 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "WBHeightMap.h"
 #include "Common/GlobalData.h"
@@ -47,7 +47,7 @@
 
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -168,7 +168,7 @@ Bool WBHeightMap::Cast_Ray(RayCollisionTestClass & raytest)
 	Int EndCellY;
 	const Int overhang = 2*VERTEX_BUFFER_TILE_LENGTH; // Allow picking past the edge for scrolling & objects.
  	Vector3 minPt(MAP_XY_FACTOR*(-overhang), MAP_XY_FACTOR*(-overhang), -MAP_XY_FACTOR);
-	Vector3 maxPt(MAP_XY_FACTOR*(m_map->getXExtent()+overhang), 
+	Vector3 maxPt(MAP_XY_FACTOR*(m_map->getXExtent()+overhang),
 		MAP_XY_FACTOR*(m_map->getYExtent()+overhang), MAP_HEIGHT_SCALE*m_map->getMaxHeightValue()+MAP_XY_FACTOR);
 	MinMaxAABoxClass mmbox(minPt, maxPt);
 	hbox.Init(mmbox);
@@ -228,7 +228,7 @@ Bool WBHeightMap::Cast_Ray(RayCollisionTestClass & raytest)
 
 	Int offset;
 	for (offset = 1; offset < 5; offset *= 3) {
-		for (Y=StartCellY-offset; Y<=EndCellY+offset; Y++) { 
+		for (Y=StartCellY-offset; Y<=EndCellY+offset; Y++) {
 			//if (Y<0) continue;
 			//if (Y>=m_map->getYExtent()-1) continue;
 
@@ -258,10 +258,10 @@ Bool WBHeightMap::Cast_Ray(RayCollisionTestClass & raytest)
 				P3.Z=THE_Z;
 
 
-				tri.V[0] = &P0; 
+				tri.V[0] = &P0;
 				tri.V[1] = &P1;
 				tri.V[2] = &P2;
-				
+
 				tri.N = &normal;
 
 				tri.Compute_Normal();
@@ -272,10 +272,10 @@ Bool WBHeightMap::Cast_Ray(RayCollisionTestClass & raytest)
 					return true;
 
 				//top triangle
-				tri.V[0] = &P2; 
+				tri.V[0] = &P2;
 				tri.V[1] = &P3;
 				tri.V[2] = &P0;
-				
+
 				tri.N = &normal;
 
 				tri.Compute_Normal();
diff --git a/Generals/Code/Tools/WorldBuilder/src/WBPopupSlider.cpp b/Generals/Code/Tools/WorldBuilder/src/WBPopupSlider.cpp
index 9f94ba35f59..4a3fd07652f 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WBPopupSlider.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WBPopupSlider.cpp
@@ -31,7 +31,7 @@
 
 void WBPopupSliderButton::SetupPopSliderButton
 (
-	CWnd *pParentWnd, 
+	CWnd *pParentWnd,
 	long controlID,
 	PopupSliderOwner *pOwner
 )
@@ -78,7 +78,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // WBPopupSliderButton message handlers
 
-void WBPopupSliderButton::OnLButtonDown(UINT nFlags, CPoint point) 
+void WBPopupSliderButton::OnLButtonDown(UINT nFlags, CPoint point)
 {
 nFlags;
 point;
@@ -207,7 +207,7 @@ void PopupSlider::MoveThumbUnderMouse(int xNew)
 	InvalidateRect(&iconRect, FALSE);
 
 	m_curValue = newVal;
-	
+
 	GetThumbIconRect(&iconRect);
 	iconRect.InflateRect(3, 3);
 	InvalidateRect(&iconRect, FALSE);
@@ -218,12 +218,12 @@ void PopupSlider::MoveThumbUnderMouse(int xNew)
 // PopupSlider static member functions
 
 void PopupSlider::New(CWnd *pParentWnd, long kind,
-						  PopupSliderOwner *pSliderOwner, 
+						  PopupSliderOwner *pSliderOwner,
 						  long sliderID)
 {
 	PopupSlider * pPopupSlider;
 
-	DEBUG_ASSERTCRASH(((SB_HORZ == kind) || (SB_VERT == kind)), 
+	DEBUG_ASSERTCRASH(((SB_HORZ == kind) || (SB_VERT == kind)),
 					("PopupSlider - unexpected kind of slider!"));
 
 	DEBUG_ASSERTCRASH(pSliderOwner, ("slider owner is NULL!"));
@@ -256,12 +256,10 @@ void PopupSlider::New(CWnd *pParentWnd, long kind,
 		member function */
 	} catch (...) {
 		// don't rethrow
-		if (pPopupSlider) {
-			delete pPopupSlider;
-			pPopupSlider = NULL;
-		}
+		delete pPopupSlider;
+		pPopupSlider = NULL;
 
-	}	// catch
+	}
 
 	gPopupSlider = pPopupSlider;
 	// gPopupSlider will be deleted when its PostNcDestroy method is called
@@ -270,7 +268,7 @@ void PopupSlider::New(CWnd *pParentWnd, long kind,
 /////////////////////////////////////////////////////////////////////////////
 // PopupSlider
 
-PopupSlider::PopupSlider() 
+PopupSlider::PopupSlider()
 {
 	mSliderOwner = NULL;
 
@@ -311,7 +309,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // PopupSlider message handlers
 
-BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd) 
+BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd)
 {
 	BOOL retVal;
 
@@ -320,8 +318,8 @@ BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd)
 			throw(-1);
 		}
 
-		mIcon = (HICON) LoadImage(AfxGetResourceHandle(), 
-				MAKEINTRESOURCE(IDI_Thumb), 
+		mIcon = (HICON) LoadImage(AfxGetResourceHandle(),
+				MAKEINTRESOURCE(IDI_Thumb),
 				IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS);
 
 
@@ -339,10 +337,10 @@ BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd)
 		CRect winRect(rect.right - winWidth, rect.bottom, rect.right, rect.bottom + winHeight);
 
 		// we'll just use "this" for the child ID
-		if (FALSE == CWnd::CreateEx(dwExStyle, (LPCTSTR) className, "", 
+		if (FALSE == CWnd::CreateEx(dwExStyle, (LPCTSTR) className, "",
 							  dwStyle, winRect.left, winRect.top,
-							  winRect.Width(), winRect.Height(), 
-							  pParentWnd->GetSafeHwnd(), 
+							  winRect.Width(), winRect.Height(),
+							  pParentWnd->GetSafeHwnd(),
 							  NULL, NULL))
 			throw(-1);
 
@@ -352,7 +350,7 @@ BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd)
 			// Calculate the center of the parent window
 			CPoint parentWindowCenter;
 			GetCursorPos(&parentWindowCenter);
-			
+
 			// Calculate the center of the thumb
 			CRect iconRect;
 			GetThumbIconRect(&iconRect);
@@ -374,7 +372,7 @@ BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd)
 			myWindowRect.OffsetRect(hAdjustToCenter, vAdjustToCenter);
 			SetWindowPos(NULL, myWindowRect.left, myWindowRect.top, myWindowRect.Width(), myWindowRect.Height(), SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOREDRAW);
 		}
-		
+
 		// finally, make sure the window appears on screen
 		//MakeSureWindowIsVisible(GetSafeHwnd());
 		ShowWindow(SW_SHOW);
@@ -386,19 +384,19 @@ BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd)
 	} catch (...) {
 		// don't rethrow
 		retVal = FALSE;
-	}	// catch
+	}
 
 	return retVal;
 }
 
-void PopupSlider::PostNcDestroy() 
+void PopupSlider::PostNcDestroy()
 {
 	if (mSliderOwner && (m_valOnLastFinished != m_curValue)) {
 		mSliderOwner->PopSliderFinished(mSliderID, m_curValue);
 	}
 
 	CWnd::PostNcDestroy();
-	
+
 	// now that the window has gone away, delete ourselves
 	if (gPopupSlider == this) {
 		delete gPopupSlider;
@@ -406,7 +404,7 @@ void PopupSlider::PostNcDestroy()
 	}
 }
 
-void PopupSlider::OnPaint() 
+void PopupSlider::OnPaint()
 {
 	CPaintDC dc(this); // device context for painting
 	CRect rc;
@@ -415,7 +413,7 @@ void PopupSlider::OnPaint()
 	CPen cpen(PS_NULL, 0, RGB(0x00, 0x00, 0x00));
 	CPen *pPenOld;
 	COLORREF ulColor, brColor;
-	
+
 	pCbrOld = dc.SelectObject(&cbr);
 	pPenOld = dc.SelectObject(&cpen);
 
@@ -446,7 +444,7 @@ void PopupSlider::OnPaint()
 	// Do not call CWnd::OnPaint() for painting messages
 }
 
-void PopupSlider::OnLButtonDown(UINT nFlags, CPoint point) 
+void PopupSlider::OnLButtonDown(UINT nFlags, CPoint point)
 {
 nFlags;
 	CRect rc;
@@ -499,11 +497,11 @@ nFlags;
 	}
 }
 
-void PopupSlider::OnLButtonUp(UINT nFlags, CPoint point) 
+void PopupSlider::OnLButtonUp(UINT nFlags, CPoint point)
 {
 	if (mDraggingThumb) {
 		mDraggingThumb = false;
-		
+
 		if (mSliderOwner) {
 			try {
 				mSliderOwner->PopSliderChanged(mSliderID, m_curValue);
@@ -525,7 +523,7 @@ void PopupSlider::OnLButtonUp(UINT nFlags, CPoint point)
 	mClickThrough = false;
 }
 
-void PopupSlider::OnDestroy() 
+void PopupSlider::OnDestroy()
 {
 	mEverMoved = false;
 	ReleaseCapture();
@@ -534,7 +532,7 @@ void PopupSlider::OnDestroy()
 }
 
 
-void PopupSlider::OnMouseMove(UINT nFlags, CPoint point) 
+void PopupSlider::OnMouseMove(UINT nFlags, CPoint point)
 {
 	if (!mSetOrigPt) {
 		mOrigPt = point;
@@ -579,11 +577,11 @@ void PopupSlider::OnMouseMove(UINT nFlags, CPoint point)
 			if (mSliderOwner) {
 				mSliderOwner->PopSliderChanged(mSliderID, m_curValue);
 			}
-		}	// if (PtInRect)
+		}
 	}
 }
 
-void PopupSlider::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) 
+void PopupSlider::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 {
 	CWnd::OnKeyDown(nChar, nRepCnt, nFlags);
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
index d35624e3e74..e667ac3f90c 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
@@ -20,7 +20,7 @@
 // Class to encapsulate height map.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 #include "Common/STLTypedefs.h"
 #include "WHeightMapEdit.h"
@@ -119,9 +119,9 @@ WorldHeightMapEdit::WorldHeightMapEdit(Int width, Int height, UnsignedByte initi
 	m_numCliffInfo = 1;
 	// Note - we have one less cell than the width & height. But for paranoia, allocate
 	// extra row. jba.
-	// 
+	//
 	Int numBytesX = (m_width+1)/8;	//how many bytes to fit all bitflags
-	Int numBytesY = m_height;	
+	Int numBytesY = m_height;
 
 	m_flipStateWidth=numBytesX;
 
@@ -181,7 +181,7 @@ m_warnTooManyBlend(false)
 	m_alphaTexHeight = pThis->m_alphaTexHeight;
 	m_alphaEdgeHeight = pThis->m_alphaEdgeHeight;
 	m_width = pThis->m_width;
-#ifdef EVAL_TILING_MODES																		  
+#ifdef EVAL_TILING_MODES
 	m_tileMode = pThis->m_tileMode;
 #endif
 	m_height = pThis->m_height;
@@ -208,9 +208,9 @@ m_warnTooManyBlend(false)
 	m_cliffInfoNdxes = new Short[m_dataSize];
 	// Note - we have one less cell than the width & height. But for paranoia, allocate
 	// extra row. jba.
-	// 
+	//
 	Int numBytesX = (m_width+1)/8;	//how many bytes to fit all bitflags
-	Int numBytesY = m_height;	
+	Int numBytesY = m_height;
 
 	m_flipStateWidth=numBytesX;
 
@@ -254,7 +254,7 @@ m_warnTooManyBlend(false)
  WorldHeightMapEdit - read a height map from a file.
  Just calls WorldHeightMap::WorldHeightMap(FILE *pStrm),
  then loads the texture classes.
-*/	 
+*/
 WorldHeightMapEdit::WorldHeightMapEdit(ChunkInputStream *pStrm):
 	WorldHeightMap(pStrm),
 	m_warnTooManyTex(false),
@@ -280,7 +280,7 @@ WorldHeightMapEdit::WorldHeightMapEdit(ChunkInputStream *pStrm):
 	// check for missing texture classes.
 	for (i=0; i<m_numTextureClasses; i++) {
 		if (m_textureClasses[i].globalTextureClass < 0) {
-			TerrainModal modalTerrainDlg(m_textureClasses[i].name, this);	
+			TerrainModal modalTerrainDlg(m_textureClasses[i].name, this);
 			if (IDOK==modalTerrainDlg.DoModal()) {
 				Int globalTex = modalTerrainDlg.getNewNdx();
 				m_textureClasses[i].globalTextureClass = globalTex;
@@ -325,13 +325,13 @@ Bool WorldHeightMapEdit::remapTextures(void)
 	Int i;
 	Bool anyChanges;
 	for (i=0; i<m_numTextureClasses; i++) {
-		TerrainModal modalTerrainDlg(m_textureClasses[i].name, this);	
+		TerrainModal modalTerrainDlg(m_textureClasses[i].name, this);
 		if (IDOK==modalTerrainDlg.DoModal()) {
 			Int globalTex = modalTerrainDlg.getNewNdx();
 			m_textureClasses[i].globalTextureClass = globalTex;
 			anyChanges = true;
 			m_textureClasses[i].name = m_globalTextureClasses[globalTex].name;
-		} 
+		}
 	}
 	if (anyChanges) {
 		optimizeTiles();
@@ -343,7 +343,7 @@ Bool WorldHeightMapEdit::remapTextures(void)
 void WorldHeightMapEdit::loadBitmap(char *path, const char *uiName)
 {
 	CachedFileInputStream stream;
-	if (!stream.open(AsciiString(path))) 
+	if (!stream.open(AsciiString(path)))
 	{
 		return;
 	}
@@ -384,11 +384,11 @@ void WorldHeightMapEdit::loadBitmap(char *path, const char *uiName)
 }
 
 /// Load the available bitmap images.
-void WorldHeightMapEdit::loadBaseImages(void) 
+void WorldHeightMapEdit::loadBaseImages(void)
 {
- 
- 	/// @todo - take this out when we are done evaluating terrain textures. 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+
+ 	/// @todo - take this out when we are done evaluating terrain textures.
+#if defined(RTS_DEBUG)
  	loadDirectoryOfImages("..\\TestArt\\TestTerrain");
 #endif
 
@@ -399,14 +399,14 @@ void WorldHeightMapEdit::loadBaseImages(void)
 	     terrain;
 			 terrain = TheTerrainTypes->nextTerrain( terrain ) )
 	{
-		 if (m_numGlobalTextureClasses == NUM_TEXTURE_CLASSES) 
+		 if (m_numGlobalTextureClasses == NUM_TEXTURE_CLASSES)
 		 {
 			 break;
 		 }
 		// load the terrain definition for the WorldBuilder to reference
 		loadImagesFromTerrainType( terrain );
 
-	}  // end for
+	}
 
 }
 
@@ -414,30 +414,27 @@ void WorldHeightMapEdit::loadBaseImages(void)
 void WorldHeightMapEdit::loadDirectoryOfImages(const char *pFilePath)
 {
 	char				dirBuf[_MAX_PATH];
-	char				findBuf[_MAX_PATH];
 	char				fileBuf[_MAX_PATH];
 
-	strcpy(dirBuf, pFilePath);
+	strlcpy(dirBuf, pFilePath, ARRAY_SIZE(dirBuf));
 	int len = strlen(dirBuf);
 
 	if (len > 0 && dirBuf[len - 1] != '\\') {
 		dirBuf[len++] = '\\';
 		dirBuf[len] = 0;
 	}
-	strcpy(findBuf, dirBuf);
 
 	FilenameList filenameList;
-	TheFileSystem->getFileListInDirectory(AsciiString(findBuf), AsciiString("*.*"), filenameList, TRUE);
+	TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), "*.*", filenameList, TRUE);
 
-	if (filenameList.size() == 0) {
+	if (filenameList.empty()) {
 		return;
 	}
 	FilenameList::iterator it = filenameList.begin();
 	do {
 		AsciiString filename = *it;
 
-		strcpy(fileBuf, dirBuf);
-		strcat(fileBuf, filename.str());
+		snprintf(fileBuf, ARRAY_SIZE(fileBuf), "%s%s", dirBuf, filename.str());
 		loadBitmap(fileBuf, filename.str());
 
 		++it;
@@ -457,7 +454,7 @@ void WorldHeightMapEdit::loadImagesFromTerrainType( TerrainType *terrain )
 	char buffer[ _MAX_PATH ];
 
 	// build path to texture file
-	sprintf( buffer, "%s%s", TERRAIN_TGA_DIR_PATH, terrain->getTexture().str() );
+	snprintf( buffer, ARRAY_SIZE(buffer), "%s%s", TERRAIN_TGA_DIR_PATH, terrain->getTexture().str() );
 
 	// create ascii string for texture path
 	AsciiString texturePath( buffer );
@@ -507,10 +504,10 @@ void WorldHeightMapEdit::loadImagesFromTerrainType( TerrainType *terrain )
 	m_globalTextureClasses[ texToUse ].isBlendEdgeTile = terrain->isBlendEdge();
 	m_numGlobalTextureClasses++;
 
-}																													
+}
 
 
-Bool  WorldHeightMapEdit::getRawTileData(Short tileNdx, Int width, 
+Bool  WorldHeightMapEdit::getRawTileData(Short tileNdx, Int width,
 																				 UnsignedByte *buffer, Int bufLen)
 {
 	TileData *pSrc = NULL;
@@ -532,7 +529,7 @@ Bool  WorldHeightMapEdit::getRawTileData(Short tileNdx, Int width,
 			pDestData += j*(width)*TILE_BYTES_PER_PIXEL;
 			UnsignedByte *pSrc = pSrcData;
 			pSrc += (j+yOffset)*width*TILE_BYTES_PER_PIXEL*2;
-			pSrc += xOffset*TILE_BYTES_PER_PIXEL; 
+			pSrc += xOffset*TILE_BYTES_PER_PIXEL;
 			memcpy(pDestData, pSrc, width*TILE_BYTES_PER_PIXEL);
 		}
 		return(true);
@@ -566,7 +563,7 @@ void WorldHeightMapEdit::getTexClassNeighbors(Int xIndex, Int yIndex, Int textur
 		for (j=yIndex-1; j<yIndex+2; j++) {
 			if (i==xIndex && j==yIndex) continue;  // don't count self.
 			// Use x and y for indexing, in case we are along an edge.
-			// If we fall off the edge, clamp to the edge so that 
+			// If we fall off the edge, clamp to the edge so that
 			// tiles on the edge have 8 neighbors too.
 			Int x = i;
 			Int y = j;
@@ -594,27 +591,27 @@ void WorldHeightMapEdit::getTexClassNeighbors(Int xIndex, Int yIndex, Int textur
 
 //
 /// SaveToFile - saves a height map to a file.
-// Format is 
+// Format is
 //		tag - 4 bytes 'HtMp'
 //		version - 2 bytes
 //		width, height, length - 4 byte Int little endian.
-// 
+//
 //		length bytes of map data.
 //		length bytes of tile ndxes.
 //		numBitmapTiles, numBlendedTiles - 4 byte int little endian
 //		numBlendedTiles of tile data.
-//		
-//		
+//
+//
 //
 void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 {
-	// This is the chunk writer stuff.  
+	// This is the chunk writer stuff.
 	int i;
 
 	/**********HEIGHT MAP DATA ***********************/
 	chunkWriter.openDataChunk("HeightMapData", K_HEIGHT_MAP_VERSION_4);
 	Int numBoundaries = m_boundaries.size();
-		chunkWriter.writeInt(m_width);	
+		chunkWriter.writeInt(m_width);
 		chunkWriter.writeInt(m_height);
 		chunkWriter.writeInt(m_borderSize);
 		chunkWriter.writeInt(numBoundaries);
@@ -632,7 +629,7 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 		chunkWriter.writeInt(m_dataSize);
 		chunkWriter.writeArrayOfBytes((char *)m_data, m_dataSize);
 	*/
-		
+
 	chunkWriter.closeDataChunk();
 
 	/***************BLEND TILE DATA ***************/
@@ -654,7 +651,7 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 			chunkWriter.writeInt(m_textureClasses[i].firstTile);
 			chunkWriter.writeInt(m_textureClasses[i].numTiles);
 			chunkWriter.writeInt(m_textureClasses[i].width);
-			chunkWriter.writeInt(0); 
+			chunkWriter.writeInt(0);
 			chunkWriter.writeAsciiString(m_textureClasses[i].name);
 		}
 
@@ -706,7 +703,7 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 	/* important, must write this chunk BEFORE the player-list chunk */
 	MapObject::getWorldDict()->setInt(TheKey_weather, (Int)TheGlobalData->m_weather);
 	chunkWriter.openDataChunk("WorldInfo", K_WORLDDICT_VERSION_1);
-	chunkWriter.writeDict(*MapObject::getWorldDict());	
+	chunkWriter.writeDict(*MapObject::getWorldDict());
 	chunkWriter.closeDataChunk();
 
 	/***************PLAYER DATA ***************/
@@ -715,9 +712,9 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 
 	/***************OBJECTS DATA ***************/
 	chunkWriter.openDataChunk("ObjectsList", 	K_OBJECTS_VERSION_3);
-		
+
 	MapObject *pObj;
-	for (pObj = MapObject::getFirstMapObject(); pObj; pObj = pObj->getNext()) 
+	for (pObj = MapObject::getFirstMapObject(); pObj; pObj = pObj->getNext())
 	{
 		chunkWriter.openDataChunk("Object", 	K_OBJECTS_VERSION_3);
 			Coord3D loc = *pObj->getLocation();
@@ -725,15 +722,15 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 			chunkWriter.writeReal( loc.y);
 			chunkWriter.writeReal( loc.z);
 			chunkWriter.writeReal( pObj->getAngle());
-			chunkWriter.writeInt(pObj->getFlags()); 
-			chunkWriter.writeAsciiString(pObj->getName());	
+			chunkWriter.writeInt(pObj->getFlags());
+			chunkWriter.writeAsciiString(pObj->getName());
 
-			chunkWriter.writeDict(*pObj->getProperties());	
+			chunkWriter.writeDict(*pObj->getProperties());
 
 #ifdef NOT_IN_USE
 			if (pObj->getFlag(FLAG_WAYPOINT)) {
-				chunkWriter.writeInt(pObj->getWaypointID()); 
-				chunkWriter.writeAsciiString(AsciiString(pObj->getWaypointName()));	
+				chunkWriter.writeInt(pObj->getWaypointID());
+				chunkWriter.writeAsciiString(AsciiString(pObj->getWaypointName()));
 			}
 			else if (pObj->getFlag(FLAG_LIGHT)) {
 				TLightInfo info;
@@ -818,7 +815,7 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 		DEBUG_ASSERTCRASH(texClass>=0,("oops"));
 	}
 #endif
-	
+
 }
 
 //
@@ -827,7 +824,7 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 
 WorldHeightMapEdit *WorldHeightMapEdit::duplicate(void)
 {
-	WorldHeightMapEdit *newMap = new WorldHeightMapEdit(this); 
+	WorldHeightMapEdit *newMap = new WorldHeightMapEdit(this);
 	if (newMap->m_data == NULL) {
 		delete newMap;
 		return(NULL);
@@ -837,8 +834,8 @@ WorldHeightMapEdit *WorldHeightMapEdit::duplicate(void)
 
 
 
-Bool WorldHeightMapEdit::setTileNdx(Int xIndex, Int yIndex, Int textureClass, Bool singleTile) 
-{ 
+Bool WorldHeightMapEdit::setTileNdx(Int xIndex, Int yIndex, Int textureClass, Bool singleTile)
+{
 	Int ndx = (yIndex*m_width)+xIndex;
 	Int numClasses = m_numTextureClasses;
 	DEBUG_ASSERTCRASH(ndx>=0 && ndx<this->m_dataSize,("oops"));
@@ -855,7 +852,7 @@ Bool WorldHeightMapEdit::setTileNdx(Int xIndex, Int yIndex, Int textureClass, Bo
 	return (numClasses<m_numTextureClasses);
 }
 /* return index of globalTextureClass corresponding to texture holding this tile*/
-Int WorldHeightMapEdit::getTextureClassFromNdx(Int tileNdx) 
+Int WorldHeightMapEdit::getTextureClassFromNdx(Int tileNdx)
 {
 	Int i;
 	tileNdx = tileNdx>>2;
@@ -864,7 +861,7 @@ Int WorldHeightMapEdit::getTextureClassFromNdx(Int tileNdx)
 			continue;
 		}
 		// see if the blend tile is in a texture class, and get the right tile for xIndex, yIndex.
-		if (tileNdx >= m_textureClasses[i].firstTile && 
+		if (tileNdx >= m_textureClasses[i].firstTile &&
 			tileNdx < m_textureClasses[i].firstTile+m_textureClasses[i].numTiles) {
 			return(m_textureClasses[i].globalTextureClass);
 		}
@@ -905,13 +902,13 @@ Int WorldHeightMapEdit::getTileIndexFromTerrainType( TerrainType *terrain )
 	// not found
 	return -1;
 
-}  // end getTileIndexFromTerrainType
+}
 
 Int WorldHeightMapEdit::allocateTiles(Int textureClass)
 {
 //	int tileNdx = 0;
 	if (textureClass >= 0 && textureClass <m_numGlobalTextureClasses) {
-		Int firstTile = getFirstTile(textureClass); 
+		Int firstTile = getFirstTile(textureClass);
 		if (firstTile >= 0) return firstTile;
 		// hasn't been copied into m_sourceTiles yet.
 		if (this->m_numBitmapTiles + m_globalTextureClasses[textureClass].numTiles>NUM_SOURCE_TILES) {
@@ -939,7 +936,7 @@ Int WorldHeightMapEdit::allocateTiles(Int textureClass)
 		}
 		Int numTiles = m_globalTextureClasses[textureClass].numTiles;
 		for (i=0; i<numTiles; i++) {
-			REF_PTR_SET(m_sourceTiles[m_numBitmapTiles+i],m_globalTextureClasses[textureClass].tiles[i]); 
+			REF_PTR_SET(m_sourceTiles[m_numBitmapTiles+i],m_globalTextureClasses[textureClass].tiles[i]);
 		}
 		m_numBitmapTiles += numTiles;
 		return firstTile;
@@ -952,7 +949,7 @@ Int WorldHeightMapEdit::allocateEdgeTiles(Int globalTextureClass)
 {
 	if (globalTextureClass >= 0 && globalTextureClass <m_numGlobalTextureClasses) {
 		Int localClass;
-		Int firstTile = -1; 
+		Int firstTile = -1;
 		for (localClass=0; localClass<m_numEdgeTextureClasses; localClass++) {
 			Int globalClass = m_edgeTextureClasses[localClass].globalTextureClass;
 			if (globalClass == globalTextureClass) {
@@ -987,7 +984,7 @@ Int WorldHeightMapEdit::allocateEdgeTiles(Int globalTextureClass)
 		}
 		Int numTiles = m_globalTextureClasses[globalTextureClass].numTiles;
 		for (i=0; i<numTiles; i++) {
-			REF_PTR_SET(m_edgeTiles[m_numEdgeTiles+i],m_globalTextureClasses[globalTextureClass].tiles[i]); 
+			REF_PTR_SET(m_edgeTiles[m_numEdgeTiles+i],m_globalTextureClasses[globalTextureClass].tiles[i]);
 		}
 		m_numEdgeTiles += numTiles;
 		return localClass;
@@ -1002,20 +999,20 @@ Int WorldHeightMapEdit::getTileNdxForClass(Int xIndex, Int yIndex, Int textureCl
 {
 	int tileNdx = 0;
 	if (textureClass >= 0 && textureClass <m_numGlobalTextureClasses) {
-		Int firstTile = getFirstTile(textureClass); //search used TextureClasses for one with the same globalTextureIndex 
+		Int firstTile = getFirstTile(textureClass); //search used TextureClasses for one with the same globalTextureIndex
 		DEBUG_ASSERTCRASH(!m_globalTextureClasses[textureClass].isBlendEdgeTile, ("Shouldn't use blend edge tiles for tiling."));
 		if (firstTile == -1) {
 			firstTile = allocateTiles(textureClass);
 		}
 		if (firstTile<0) return 0;
 
-		Int width = m_globalTextureClasses[textureClass].width; 
-		tileNdx = firstTile + ((xIndex/2)%width) + 
+		Int width = m_globalTextureClasses[textureClass].width;
+		tileNdx = firstTile + ((xIndex/2)%width) +
 			width*((yIndex/2)%width);	//2 terrain cells across tile so divide by 2
 		/* there are actually 4 subcells in a tile.  So be funky. :) */
 		tileNdx = tileNdx << 2;
 		Int ySubIndex = yIndex&0x01;
-		Int xSubIndex = xIndex&0x01;;
+		Int xSubIndex = xIndex&0x01;
 		tileNdx += 2*ySubIndex;
 		tileNdx += xSubIndex;
 	}
@@ -1029,7 +1026,7 @@ Int WorldHeightMapEdit::getTileNdxForClass(Int xIndex, Int yIndex, Int textureCl
 Bool WorldHeightMapEdit::canFitTexture(Int textureClass)
 {
 	if (textureClass >= 0 && textureClass <m_numGlobalTextureClasses) {
-		Int firstTile = getFirstTile(textureClass); 
+		Int firstTile = getFirstTile(textureClass);
 		if (firstTile >= 0) return true; // already present.
 		if (this->m_numBitmapTiles + m_globalTextureClasses[textureClass].numTiles>NUM_SOURCE_TILES) {
 			// No room at the inn.
@@ -1057,12 +1054,12 @@ Bool WorldHeightMapEdit::canFitTexture(Int textureClass)
 }
 
 
-void WorldHeightMapEdit::blendTile(Int xIndex, Int yIndex, Int srcXIndex, Int srcYIndex, Int textureClass, Int edgeClass) 
+void WorldHeightMapEdit::blendTile(Int xIndex, Int yIndex, Int srcXIndex, Int srcYIndex, Int textureClass, Int edgeClass)
 {
 	Int ndx = (srcYIndex*m_width)+srcXIndex;
 	Int blendTileNdx = m_tileNdxes[ndx];	//source tile
 
-	ndx = (yIndex*m_width)+xIndex;			
+	ndx = (yIndex*m_width)+xIndex;
 	Int curTileNdx = m_tileNdxes[ndx];		//destination tile
 
 	if (textureClass < 0) {
@@ -1074,13 +1071,13 @@ void WorldHeightMapEdit::blendTile(Int xIndex, Int yIndex, Int srcXIndex, Int sr
 	}
 
 	if (curTileNdx == blendTileNdx) {//destination already contains continuation of source tile so no blend needed.
-		m_tileNdxes[ndx] = blendTileNdx;	
+		m_tileNdxes[ndx] = blendTileNdx;
 		m_blendTileNdxes[ndx] = 0;
 		m_extraBlendTileNdxes[ndx] = 0;
 		return;
 	}
 	//Updates m_blendTileNdxes[] for this coordinate with index into m_blendedTiles[]
-	blendSpecificTiles(xIndex, yIndex, srcXIndex, srcYIndex, curTileNdx, blendTileNdx, false, edgeClass); 
+	blendSpecificTiles(xIndex, yIndex, srcXIndex, srcYIndex, curTileNdx, blendTileNdx, false, edgeClass);
 }
 
 /*Allocate a new blend description or return existing one out of m_blendedTiles[] and increment m_numBlendedTiles*/
@@ -1120,7 +1117,7 @@ Int WorldHeightMapEdit::findOrCreateBlendTile(TBlendTileInfo *pBlendInfo)
 /*Blend blendTileNdx over curTileNdx. Blend from srcIndex to Index coordinates.
 Updates m_blendTileNdxes[] for this coordinate with index into m_blendedTiles[]*/
 void WorldHeightMapEdit::blendSpecificTiles(Int xIndex, Int yIndex, Int srcXIndex, Int srcYIndex,
-									Int curTileNdx, Int blendTileNdx, Bool longDiagonal, Int edgeClass) 
+									Int curTileNdx, Int blendTileNdx, Bool longDiagonal, Int edgeClass)
 {
 	TBlendTileInfo blendInfo;
 	blendInfo.blendNdx=blendTileNdx;	//store the tile that will blend over existing tile
@@ -1219,7 +1216,7 @@ void WorldHeightMapEdit::blendSpecificTiles(Int xIndex, Int yIndex, Int srcXInde
 		The edges are blended out, to whatever texture is already there.
 		If edgeClass == -1, use an alpha blend.  Otherwise, use tile class edgeClass.
 */
-void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClass) 
+void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClass)
 {
 	Int ndx = (yIndex*m_width)+xIndex;
 	Int curTileClass = getTextureClass(xIndex, yIndex);
@@ -1236,9 +1233,9 @@ void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClas
 				}
 			}
 		}
-	}	
+	}
 	if (globalEdgeClass>=0) {
-		localEdgeClass = allocateEdgeTiles(globalEdgeClass); 
+		localEdgeClass = allocateEdgeTiles(globalEdgeClass);
 	}
 
 	Int i,j;
@@ -1273,7 +1270,7 @@ void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClas
 					continue;
 				}
 				if (curTileClass != getTextureClass(i,j, true)) {
-					// This is a not us tile.  If it is mostly surrounded by us, 
+					// This is a not us tile.  If it is mostly surrounded by us,
 					// convert it to us, cause if we blend in from 3 sides, it basically
 					// obliterates it.
 					Int sides, total;
@@ -1325,14 +1322,14 @@ void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClas
 			for (j=pCurNode->m_y-1; j<pCurNode->m_y+2; j++) {
 				if (j<0) continue;
 				if (j>=m_height) continue;
-//				int thisTexClass = 
+//				int thisTexClass =
 				curNdx = (j*m_width)+i;
 				if (pProcessed[curNdx]) {
 					continue;
 				}
 				// If already blended to us skip it.
-				if (m_blendTileNdxes[curNdx] > 0) {					 
-					if (curTileClass == getTextureClassFromNdx(m_blendedTiles[ m_blendTileNdxes[curNdx]].blendNdx)) {					
+				if (m_blendTileNdxes[curNdx] > 0) {
+					if (curTileClass == getTextureClassFromNdx(m_blendedTiles[ m_blendTileNdxes[curNdx]].blendNdx)) {
 						continue;
 					}
 				}
@@ -1346,7 +1343,7 @@ void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClas
 		delete pCurNode;
 	}
 
-	if (pProcessed) delete pProcessed;
+	delete[] pProcessed;
 	pProcessed = NULL;
 }
 
@@ -1356,8 +1353,8 @@ void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClas
 		Used by auto edging.  The texture at xIndex, yIndex is being
 		edged into by surrounding textures of textureClass.
 */
-void WorldHeightMapEdit::blendToThisClass(Int xIndex, Int yIndex, 
-																					Int textureClass, Int edgeClass) 
+void WorldHeightMapEdit::blendToThisClass(Int xIndex, Int yIndex,
+																					Int textureClass, Int edgeClass)
 {
 	Int sides, total;
 	getTexClassNeighbors(xIndex, yIndex, textureClass, &sides, &total);
@@ -1433,7 +1430,7 @@ void WorldHeightMapEdit::blendToThisClass(Int xIndex, Int yIndex,
 					}
 				}
 			}
-		}	
+		}
 
 		Int blendTileNdx = getBlendTileNdxForClass(xIndex, yIndex, textureClass);
 		Int ndx = (yIndex*m_width)+xIndex;
@@ -1457,14 +1454,14 @@ void WorldHeightMapEdit::blendToThisClass(Int xIndex, Int yIndex,
 		Fills the region at xIndex, yIndex with the specified texture. DoReplace forces texture to
 		be replaced on entire map.
 */
-Bool WorldHeightMapEdit::floodFill(Int xIndex, Int yIndex, Int textureClass, Bool doReplace) 
+Bool WorldHeightMapEdit::floodFill(Int xIndex, Int yIndex, Int textureClass, Bool doReplace)
 {
 	Int ndx = (yIndex*m_width)+xIndex;
 	Int curTileClass = getTextureClass(xIndex, yIndex, true);
 	if (curTileClass < 0) {
 		return(false);
 	}
-	
+
 	if (curTileClass == textureClass) {
 		// already filled with this texture.
 		return(false);
@@ -1505,7 +1502,7 @@ Bool WorldHeightMapEdit::floodFill(Int xIndex, Int yIndex, Int textureClass, Boo
 			REF_PTR_RELEASE(m_terrainTex); // need to update the texture.
 			Int numTiles = m_globalTextureClasses[textureClass].numTiles;
 			for (i=0; i<numTiles; i++) {
-				REF_PTR_SET(m_sourceTiles[m_textureClasses[localClass].firstTile+i],m_globalTextureClasses[textureClass].tiles[i]); 
+				REF_PTR_SET(m_sourceTiles[m_textureClasses[localClass].firstTile+i],m_globalTextureClasses[textureClass].tiles[i]);
 			}
 			optimizeTiles();
 			return true;
@@ -1554,7 +1551,7 @@ Bool WorldHeightMapEdit::floodFill(Int xIndex, Int yIndex, Int textureClass, Boo
 				if (i>=m_width-1) continue;
 				for (j=pCurNode->m_y-1; j<pCurNode->m_y+2; j++) {
 					if (j<0) continue;
-					if (j>=m_height-1) continue;	 
+					if (j>=m_height-1) continue;
  					ndx = (j*m_width)+i;
 					blendNdx = m_blendTileNdxes[ndx];
 					if (curTileClass != getTextureClass(i,j,true)) {
@@ -1573,7 +1570,7 @@ Bool WorldHeightMapEdit::floodFill(Int xIndex, Int yIndex, Int textureClass, Boo
 						continue;  // skip corners.
 					}
 					if (curTileClass == getTextureClass(i,j,true)) {
-						// Matches the current fill, so flood into it, 
+						// Matches the current fill, so flood into it,
 						CProcessNode *pNewNode = new CProcessNode(i,j);
 						pNewNode->m_next = pNodesToProcess;
 						pNodesToProcess = pNewNode;
@@ -1658,7 +1655,7 @@ void WorldHeightMapEdit::showTileStatusInfo(void)
 	setHeight
 		This sets the height, and adjusts the cliff flag for the cells affected.
 */
-void WorldHeightMapEdit::setHeight(Int xIndex, Int yIndex, UnsignedByte height) { 
+void WorldHeightMapEdit::setHeight(Int xIndex, Int yIndex, UnsignedByte height) {
 		Int ndx = (yIndex*m_width)+xIndex;
 		if ((ndx>=0) && (ndx<m_dataSize) && m_data) m_data[ndx]=height;
 		setCellCliffFlagFromHeights(xIndex, yIndex);
@@ -1670,7 +1667,7 @@ void WorldHeightMapEdit::setHeight(Int xIndex, Int yIndex, UnsignedByte height)
 
 /******************************************************************
 	optimizeTiles
-		This optimizes the tiles and blend tiles, recalculating them 
+		This optimizes the tiles and blend tiles, recalculating them
 		and removing any unused ones.
 */
 Bool WorldHeightMapEdit::optimizeTiles(void)
@@ -1769,7 +1766,7 @@ Bool WorldHeightMapEdit::optimizeTiles(void)
 			m_extraBlendTileNdxes[i] = newBlendNdx;
 
 		}
-	}		
+	}
 	// Run through all the blend tiles changing tile index to class.
 	for (i=1; i<m_numCliffInfo; i++) {
 		Int texClass  = m_cliffInfo[i].tileIndex;
@@ -1782,13 +1779,13 @@ Bool WorldHeightMapEdit::optimizeTiles(void)
 	return(true);
 }
 
- 
+
 
 /** ****************************************************************
 	resize
 		Changes the size of the height map.
 */
-Bool WorldHeightMapEdit::resize(Int newXSize, Int newYSize, Int newHeight, Int newBorder, Bool anchorTop, Bool anchorBottom, 
+Bool WorldHeightMapEdit::resize(Int newXSize, Int newYSize, Int newHeight, Int newBorder, Bool anchorTop, Bool anchorBottom,
 							Bool anchorLeft, Bool anchorRight, Coord3D *pObjOffset)
 {
 	if (newBorder<0) newBorder = 0;
@@ -1831,18 +1828,18 @@ Bool WorldHeightMapEdit::resize(Int newXSize, Int newYSize, Int newHeight, Int n
 	Short *blendTileNdxes = new Short[newDataSize];
 	Short *extraBlendTileNdxes = new Short[newDataSize];
 	UnsignedByte *data = new UnsignedByte[newDataSize];
-	Short  *cliffInfoNdxes = new Short[newDataSize];  	
-	
+	Short  *cliffInfoNdxes = new Short[newDataSize];
+
 	Int i, j;
 	for (i=0; i<newXSize; i++) {
 		for (j=0; j<newYSize; j++) {
-			Int newNdx = i+j*newXSize;	
+			Int newNdx = i+j*newXSize;
 			Int oldI = i+xOffset;
 			Bool inRange = true;
 			if(oldI>=m_width-1) {
 				oldI=m_width-2;
 				inRange = false;
-			}	
+			}
 			if (oldI<0) {
 				oldI = 0;
 				inRange = false;
@@ -1898,13 +1895,13 @@ Bool WorldHeightMapEdit::resize(Int newXSize, Int newYSize, Int newHeight, Int n
 	// Verify index remapping
 	for(i=0; i<m_dataSize; i++) {
 		if (m_cliffInfoNdxes[i]<0 || m_cliffInfoNdxes[i]>= m_numCliffInfo) {
-			m_cliffInfoNdxes[i] = 0;		
+			m_cliffInfoNdxes[i] = 0;
 		}
 		if (m_blendTileNdxes[i]<0 || m_blendTileNdxes[i]>= m_numBlendedTiles) {
-			m_blendTileNdxes[i] = 0;		
+			m_blendTileNdxes[i] = 0;
 		}
 		if (m_extraBlendTileNdxes[i]<0 || m_extraBlendTileNdxes[i]>= m_numBlendedTiles) {
-			m_extraBlendTileNdxes[i] = 0;		
+			m_extraBlendTileNdxes[i] = 0;
 		}
 	}
 	initCliffFlagsFromHeights();
@@ -1915,7 +1912,7 @@ Bool WorldHeightMapEdit::resize(Int newXSize, Int newYSize, Int newHeight, Int n
 
 
 /** Returns true if the texture class is used in the current
-map.  If false, the texture is not used or loaded in the 
+map.  If false, the texture is not used or loaded in the
 current map. */
 Bool WorldHeightMapEdit::isTexClassUsed(Int textureClass)
 {
@@ -1928,7 +1925,7 @@ Bool WorldHeightMapEdit::isTexClassUsed(Int textureClass)
 	}
 	return(false);
 }
-	 
+
 /** Returns the first tile for a texture class.  If the class is not
 used, returns -1. */
 Int WorldHeightMapEdit::getFirstTile(Int textureClass)
@@ -1942,11 +1939,11 @@ Int WorldHeightMapEdit::getFirstTile(Int textureClass)
 	}
 	return(-1);
 }
-	
- 
+
+
 /**
  dbgVerifyAfterUndo - Verifies that the structure is consistent.
-*/	 
+*/
 void WorldHeightMapEdit::dbgVerifyAfterUndo(void)
 {
 #ifdef DEBUG_CRASHING
@@ -1965,7 +1962,7 @@ void WorldHeightMapEdit::dbgVerifyAfterUndo(void)
 		DEBUG_ASSERTCRASH((m_textureClasses[j].width == m_globalTextureClasses[globalClass].width),("oops"));
 		DEBUG_ASSERTCRASH((m_textureClasses[j].numTiles == m_globalTextureClasses[globalClass].numTiles),("oops"));
 		TileData *pTile = m_sourceTiles[m_textureClasses[j].firstTile];
-		DEBUG_ASSERTCRASH((pTile == m_globalTextureClasses[globalClass].tiles[0]),("oops")); 
+		DEBUG_ASSERTCRASH((pTile == m_globalTextureClasses[globalClass].tiles[0]),("oops"));
 		DEBUG_ASSERTCRASH((j == m_globalTextureClasses[globalClass].forDebugOnly_fileTextureClass),("oops"));
 	}
 
@@ -1978,9 +1975,9 @@ void WorldHeightMapEdit::dbgVerifyAfterUndo(void)
 			DEBUG_ASSERTCRASH((m_textureClasses[localClass].width == m_globalTextureClasses[i].width),("oops"));
 			DEBUG_ASSERTCRASH((m_textureClasses[localClass].numTiles == m_globalTextureClasses[i].numTiles),("oops"));
 			TileData *pTile = m_sourceTiles[m_textureClasses[localClass].firstTile];
-			DEBUG_ASSERTCRASH((pTile == m_globalTextureClasses[i].tiles[0]),("oops")); 
+			DEBUG_ASSERTCRASH((pTile == m_globalTextureClasses[i].tiles[0]),("oops"));
 			DEBUG_ASSERTCRASH((m_textureClasses[localClass].numTiles == m_globalTextureClasses[i].numTiles),("oops"));
-		} 
+		}
 	}
 
 	for (i=0; i<m_numTextureClasses; i++) {
@@ -2101,7 +2098,7 @@ Bool WorldHeightMapEdit::selectSimilar(void)
 	for (selectedObj=firstObj; selectedObj; selectedObj=selectedObj->getNext()) {
 		if (selectedObj->getFlag(FLAG_ROAD_FLAGS)) {
 			continue;
-		} 
+		}
 		if (selectedObj->isSelected()) {
 			anySelected = true;
 			break;
@@ -2118,12 +2115,12 @@ Bool WorldHeightMapEdit::selectSimilar(void)
 
 		if (otherObj->getFlag(FLAG_ROAD_FLAGS)) {
 			continue;
-		} 
+		}
 
 		Bool exists;
 		AsciiString layerName = otherObj->getProperties()->getAsciiString(TheKey_objectLayer, &exists);
 		if (exists && TheLayersList->isLayerHidden(layerName)) {
-			continue;			
+			continue;
 		}
 
 		otherObj->setSelected(true);
@@ -2158,7 +2155,7 @@ Bool WorldHeightMapEdit::selectInvalidTeam(void)
 	for (obj=MapObject::TheMapObjectListPtr; obj; obj=obj->getNext()) {
 		if (obj->getFlag(FLAG_ROAD_FLAGS)) {
 			continue;
-		} 
+		}
 
 		const Dict *d = obj->getProperties();
 		if (d)
@@ -2186,11 +2183,11 @@ Bool WorldHeightMapEdit::selectInvalidTeam(void)
 		}
 	}
 
-	AsciiString report = "";
+	AsciiString report;
 	AsciiString line;
 
 #if 0
-	// I'm removing this because its causing buffer overflows, and we're really interested in 
+	// I'm removing this because its causing buffer overflows, and we're really interested in
 	// teams that are invalid anyways. I've confirmed that this is okay behavior with JL. (jkmcd)
 	for (it=validTeamNames.begin(); it!=validTeamNames.end(); ++it)
 	{
@@ -2208,7 +2205,7 @@ Bool WorldHeightMapEdit::selectInvalidTeam(void)
 
 	if (anySelected)
 	{
-		DEBUG_LOG(("%s\n", report.str()));
+		DEBUG_LOG(("%s", report.str()));
 		MessageBox(NULL, report.str(), "Missing team report", MB_OK);
 	}
 
@@ -2223,7 +2220,7 @@ AsciiString WorldHeightMapEdit::getTexClassUiName(int ndx)
 {
 	return(m_globalTextureClasses[ndx].uiName);
 }
- 
+
 static const Real HEIGHT_SCALE = MAP_HEIGHT_SCALE / MAP_XY_FACTOR;
 static const Real STRETCH_LIMIT = 1.5f;	 // If it is stretching less than this, don't adjust.
 static inline Int IABS(Int x) {	if (x>=0) return x; return -x;};
@@ -2238,7 +2235,7 @@ static Bool debugToggle = true;
 	doCliffAdjustment
 		Does a cliff adjustment the region at xIndex, yIndex.
 */
-Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex) 
+Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 {
 
 	debugToggle = !debugToggle;
@@ -2249,7 +2246,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 		return(false);
 	}
 	Real textureClassExtent = m_globalTextureClasses[curTileClass].width*TILE_PIXEL_EXTENT;
-	textureClassExtent /= TEXTURE_WIDTH; 
+	textureClassExtent /= TEXTURE_WIDTH;
 	Real startU = textureClassExtent/2;	// Center in the texture.
 	Real startV = 0; // We'll adjust the V values later.
 
@@ -2273,13 +2270,13 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 	uvRange.lo.y = 1;
 	uvRange.hi.x = -1;
 	uvRange.hi.y = -1;
-	
+
 
 	pNodesToProcess = new CProcessNode(xIndex, yIndex);
 	while (pNodesToProcess) {
 		CProcessNode *pCurNode = pNodesToProcess;
 		pNodesToProcess = pCurNode->m_next;
-		pCurNode->m_next = NULL;			 
+		pCurNode->m_next = NULL;
 
 		if (pNodesToProcess == NULL) {
 			if (pMutantNodes) {
@@ -2468,11 +2465,11 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 					if (i==pCurNode->m_x && j==pCurNode->m_y) continue;
 					if (i!=pCurNode->m_x && j!=pCurNode->m_y) continue;
 					if (j<0) continue;
-					if (j>=m_height-1) continue;	 
+					if (j>=m_height-1) continue;
  					ndx = (j*m_width)+i;
 					if (pProcessed[ndx]) continue;
 					CProcessNode *pNewNode = new CProcessNode(i,j);
-					DEBUG_LOG(("Adding node %d, %d\n", i, j));
+					DEBUG_LOG(("Adding node %d, %d", i, j));
 					pNodes[k++]	= pNewNode;
 					Real dx, dy;
 					if (i<pCurNode->m_x) {
@@ -2491,10 +2488,10 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 						// top.
 						dx = cliffInfo.u2 - cliffInfo.u3;
 						dy = cliffInfo.v2 - cliffInfo.v3;
-					}	
+					}
 					pNewNode->m_len = dx*dx + dy*dy;
 				}
-			}	
+			}
 			while (k)	{
 				Real maxLen = -1;
 				Int curNdx = -1;
@@ -2506,7 +2503,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 						}
 					}
 				}
-				if (curNdx>=0) { 
+				if (curNdx>=0) {
 					if (cliffInfo.mutant) {
 						pNodes[curNdx]->m_next = pMutantNodes;
 						pMutantNodes = pNodes[curNdx];
@@ -2514,7 +2511,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 					}	else {
 						if (pProcessTail) {
 							pProcessTail->m_next = pNodes[curNdx];
-						} 
+						}
 						pProcessTail = pNodes[curNdx];
 						if (pNodesToProcess == NULL) {
 							pNodesToProcess = pNodes[curNdx];
@@ -2529,7 +2526,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 
 			nodesProcessed++;
 			//if (nodesProcessed>2) break;
-		}	
+		}
 		delete pCurNode;
 	}
 
@@ -2571,7 +2568,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 	removeCliffMapping
 		Removes all cliff adjustments.
 */
-Bool WorldHeightMapEdit::removeCliffMapping(void) 
+Bool WorldHeightMapEdit::removeCliffMapping(void)
 {
 
 	Int ndx;
@@ -2642,14 +2639,14 @@ Bool WorldHeightMapEdit::adjustForTiling( TCliffInfo &cliffInfo, Real textureWid
 	Real uBorder = TEX_PER_CELL * 0.5;
 	if (minU>=uBorder && maxU<textureWidth-uBorder) return true;
 	if (minU>=-delta && maxU<= textureWidth+delta) {
-		if (cliffInfo.u0<uBorder) cliffInfo.u0 = 0; 
-		if (cliffInfo.u1<uBorder) cliffInfo.u1 = 0; 
-		if (cliffInfo.u2<uBorder) cliffInfo.u2 = 0; 
-		if (cliffInfo.u3<uBorder) cliffInfo.u3 = 0; 
-		if (cliffInfo.u0>textureWidth-uBorder) cliffInfo.u0 = textureWidth; 
-		if (cliffInfo.u1>textureWidth-uBorder) cliffInfo.u1 = textureWidth; 
-		if (cliffInfo.u2>textureWidth-uBorder) cliffInfo.u2 = textureWidth; 
-		if (cliffInfo.u3>textureWidth-uBorder) cliffInfo.u3 = textureWidth; 
+		if (cliffInfo.u0<uBorder) cliffInfo.u0 = 0;
+		if (cliffInfo.u1<uBorder) cliffInfo.u1 = 0;
+		if (cliffInfo.u2<uBorder) cliffInfo.u2 = 0;
+		if (cliffInfo.u3<uBorder) cliffInfo.u3 = 0;
+		if (cliffInfo.u0>textureWidth-uBorder) cliffInfo.u0 = textureWidth;
+		if (cliffInfo.u1>textureWidth-uBorder) cliffInfo.u1 = textureWidth;
+		if (cliffInfo.u2>textureWidth-uBorder) cliffInfo.u2 = textureWidth;
+		if (cliffInfo.u3>textureWidth-uBorder) cliffInfo.u3 = textureWidth;
 		return true;
 	}
 
@@ -2663,29 +2660,29 @@ Bool WorldHeightMapEdit::adjustForTiling( TCliffInfo &cliffInfo, Real textureWid
 	}
 	TCliffInfo tmpCliff = cliffInfo;
 //	Bool doOffset = false;
-	Real offset;					 
+	Real offset;
 
-	DEBUG_ASSERTLOG(minU<-delta && maxU > delta, ("Oops, wrong.\n")) ;
+	DEBUG_ASSERTLOG(minU<-delta && maxU > delta, ("Oops, wrong.")) ;
 
 	// Straddles the 0 line.
 	if (maxU > -minU) {
 		offset = -minU;
 		// push min up to 0
-		if (cliffInfo.u0<0) cliffInfo.u0 = 0; 
-		if (cliffInfo.u1<0) cliffInfo.u1 = 0; 
-		if (cliffInfo.u2<0) cliffInfo.u2 = 0; 
-		if (cliffInfo.u3<0) cliffInfo.u3 = 0; 
+		if (cliffInfo.u0<0) cliffInfo.u0 = 0;
+		if (cliffInfo.u1<0) cliffInfo.u1 = 0;
+		if (cliffInfo.u2<0) cliffInfo.u2 = 0;
+		if (cliffInfo.u3<0) cliffInfo.u3 = 0;
 	} else {
 		// push max down to 0, & offset.
 		offset = -maxU;
-		if (cliffInfo.u0>0) cliffInfo.u0 = 0; 
-		if (cliffInfo.u1>0) cliffInfo.u1 = 0; 
-		if (cliffInfo.u2>0) cliffInfo.u2 = 0; 
-		if (cliffInfo.u3>0) cliffInfo.u3 = 0; 
+		if (cliffInfo.u0>0) cliffInfo.u0 = 0;
+		if (cliffInfo.u1>0) cliffInfo.u1 = 0;
+		if (cliffInfo.u2>0) cliffInfo.u2 = 0;
+		if (cliffInfo.u3>0) cliffInfo.u3 = 0;
 		cliffInfo.u0 += textureWidth;
 		cliffInfo.u1 += textureWidth;
 		cliffInfo.u2 += textureWidth;
-		cliffInfo.u3 += textureWidth;	 
+		cliffInfo.u3 += textureWidth;
 	}
 	Real triMinU;
 	Real triMaxU;
@@ -2730,12 +2727,12 @@ Bool WorldHeightMapEdit::adjustForTiling( TCliffInfo &cliffInfo, Real textureWid
 		cliffInfo.u0 = tmpCliff.u0 + offset;
 		cliffInfo.u1 = tmpCliff.u1 + offset;
 		cliffInfo.u2 = tmpCliff.u2 + offset;
-		cliffInfo.u3 = tmpCliff.u3 + offset;	 
+		cliffInfo.u3 = tmpCliff.u3 + offset;
 		if (maxU < -minU) {
 			cliffInfo.u0 += textureWidth;
 			cliffInfo.u1 += textureWidth;
 			cliffInfo.u2 += textureWidth;
-			cliffInfo.u3 += textureWidth;	 
+			cliffInfo.u3 += textureWidth;
 		}
 		cliffInfo.mutant = true;
 	}
@@ -2753,7 +2750,7 @@ static Bool usMatch(Real u1, Real u2) {
 	return false;
 }
 
-void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex, 
+void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 													UnsignedByte *pProcessed, TCliffInfo &cliffInfo)
 {
 #define PROMOTE_DIAGONALS 0	 // Don't promote them.
@@ -2774,7 +2771,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 				if (i==xIndex && j==yIndex) continue;
 				if (i!=xIndex && j!=yIndex) continue;
 				if (j<0) continue;
-				if (j>=m_height-1) continue;	
+				if (j>=m_height-1) continue;
  				Int ndx = (j*m_width)+i;
 				if (!pProcessed[ndx]) continue;
 				if (m_cliffInfoNdxes[ndx]) {
@@ -2788,7 +2785,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 					Bool shifted = false;
 					if (i==xIndex){
 						if (j<yIndex) {
-							// below 
+							// below
 							DEBUG_ASSERTCRASH(!lock1, ("Shouldn't happen."));
 							if (lock0 && !usMatch(tmpCliff.u0, info.u3)) {
 								shifted = true;
@@ -2802,7 +2799,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 								lock0 = lock1 = true;
 							}
 						} else {
-							// above 
+							// above
 							DEBUG_ASSERTCRASH(!lock2, ("Shouldn't happen."));
 							if (lock3 && !usMatch(tmpCliff.u3, info.u0)) {
 								shifted = true;
@@ -2836,7 +2833,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 								lock2 = lock1 = true;
 							}
 						}
-					}	 
+					}
 					if (shifted) tmpCliff.mutant = true;
 				}
 			}
@@ -2869,7 +2866,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 			if (fabs(dUa)<fabs(dUb)) {
 				tmpCliff.u0 = tmpCliff.u2 + dUb;
 				tmpCliff.v0 = tmpCliff.v2 + cliffInfo.v0 - cliffInfo.v2;
-			}	
+			}
 	#endif
 		}
 		if (!lock1) {
@@ -2879,7 +2876,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 				dUa =  cliffInfo.u1 - cliffInfo.u2;
 				tmpCliff.u1 = tmpCliff.u2 + dUa;
 				tmpCliff.v1 = tmpCliff.v2 + cliffInfo.v1 - cliffInfo.v2;
-			}	
+			}
 			if (lock0) {
 				dUa = cliffInfo.u1 - cliffInfo.u0;
 				tmpCliff.u1 = tmpCliff.u0 + dUa;
@@ -2892,7 +2889,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 			if (fabs(dUa)<fabs(dUb)) {
 				tmpCliff.u1 = tmpCliff.u3 + dUb;
 				tmpCliff.v1 = tmpCliff.v3 + cliffInfo.v1 - cliffInfo.v3;
-			}	
+			}
 	#endif
 		}
 		if (!lock2) {
@@ -2902,7 +2899,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 				dUa =  cliffInfo.u2 - cliffInfo.u1;
 				tmpCliff.u2 = tmpCliff.u1 + dUa;
 				tmpCliff.v2 = tmpCliff.v1 + cliffInfo.v2 - cliffInfo.v1;
-			}	
+			}
 			if (lock3) {
 				dUa = cliffInfo.u2 - cliffInfo.u3;
 				tmpCliff.u2 = tmpCliff.u3 + dUa;
@@ -2915,7 +2912,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 			if (fabs(dUa)<fabs(dUb)) {
 				tmpCliff.u2 = tmpCliff.u0 + dUb;
 				tmpCliff.v2 = tmpCliff.v0 + cliffInfo.v2 - cliffInfo.v0;
-			}	
+			}
 	#endif
 		}
 		if (!lock3) {
@@ -2925,7 +2922,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 				dUa =  cliffInfo.u3 - cliffInfo.u2;
 				tmpCliff.u3 = tmpCliff.u2 + dUa;
 				tmpCliff.v3 = tmpCliff.v2 + cliffInfo.v3 - cliffInfo.v2;
-			}	
+			}
 			if (lock0) {
 				dUa = cliffInfo.u3 - cliffInfo.u0;
 				tmpCliff.u3 = tmpCliff.u0 + dUa;
@@ -2938,7 +2935,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 			if (fabs(dUa)<fabs(dUb)) {
 				tmpCliff.u3 = tmpCliff.u1 + dUb;
 				tmpCliff.v3 = tmpCliff.v1 + cliffInfo.v3 - cliffInfo.v1;
-			}	
+			}
 	#endif
 		}
 
@@ -2993,7 +2990,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 					tmpCliff.u0 = tmpCliff.u2 + cliffInfo.u0 - cliffInfo.u2;
 					tmpCliff.v0 = tmpCliff.v2 + cliffInfo.v0 - cliffInfo.v2;
 				}
-			
+
 				if (!lock1) {
 					// Leave 3.
 					tmpCliff.u1 = tmpCliff.u3 + cliffInfo.u1 - cliffInfo.u3;
@@ -3003,7 +3000,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 					tmpCliff.u0 = tmpCliff.u3 + cliffInfo.u0 - cliffInfo.u3;
 					tmpCliff.v0 = tmpCliff.v3 + cliffInfo.v0 - cliffInfo.v3;
 				}
-			
+
 				if (!lock2) {
 					// Leave 0.
 					tmpCliff.u1 = tmpCliff.u0 + cliffInfo.u1 - cliffInfo.u0;
@@ -3013,7 +3010,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 					tmpCliff.u2 = tmpCliff.u0 + cliffInfo.u2 - cliffInfo.u0;
 					tmpCliff.v2 = tmpCliff.v0 + cliffInfo.v2 - cliffInfo.v0;
 				}
-			
+
 				if (!lock3) {
 					// Leave 1.
 					tmpCliff.u0 = tmpCliff.u1 + cliffInfo.u0 - cliffInfo.u1;
@@ -3024,7 +3021,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 					tmpCliff.v2 = tmpCliff.v1 + cliffInfo.v2 - cliffInfo.v1;
 				}
 				tmpCliff.mutant = true;
-			
+
 			}
 		}
 
@@ -3114,7 +3111,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 
 
 
-void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex, 
+void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 													Int curTileClass, UnsignedByte *pProcessed)
 {
 	TCliffInfo tmpCliff;
@@ -3134,7 +3131,7 @@ void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 	}
 	if (!okToProcess) return;
 	Real textureClassExtent = m_globalTextureClasses[curTileClass].width*TILE_PIXEL_EXTENT;
-	textureClassExtent /= TEXTURE_WIDTH; 
+	textureClassExtent /= TEXTURE_WIDTH;
 	Int i, j;
 	for (i=xIndex-1; i<xIndex+2; i+=1) {
 		if (i<0) continue;
@@ -3143,7 +3140,7 @@ void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 			if (i==xIndex && j==yIndex) continue;
 			if (i!=xIndex && j!=yIndex) continue;
 			if (j<0) continue;
-			if (j>=m_height-1) continue;	
+			if (j>=m_height-1) continue;
  			Int ndx = (j*m_width)+i;
 			if (m_cliffInfoNdxes[ndx]) {
 				TCliffInfo info = m_cliffInfo[m_cliffInfoNdxes[ndx]];
@@ -3159,7 +3156,7 @@ void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 				Bool shifted = false;
 				if (i==xIndex){
 					if (j<yIndex) {
-						// below 
+						// below
 						DEBUG_ASSERTCRASH(!lock1, ("Shouldn't happen."));
 						if (lock0 && !usMatch(tmpCliff.u0, info.u3)) {
 							shifted = true;
@@ -3173,7 +3170,7 @@ void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 							lock0 = lock1 = true;
 						}
 					} else {
-						// above 
+						// above
 						DEBUG_ASSERTCRASH(!lock2, ("Shouldn't happen."));
 						if (lock3 && !usMatch(tmpCliff.u3, info.u0)) {
 							shifted = true;
@@ -3225,7 +3222,7 @@ void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 		if (minU>tmpCliff.u3) minU=tmpCliff.u3;
 		if (maxU<tmpCliff.u3) maxU=tmpCliff.u3;
 		if (maxU-minU<delta) {
-			// bad. 
+			// bad.
 			tmpCliff.mutant = true;
 			/* Pick the bigger v */
 			if (tmpCliff.v3 - tmpCliff.v0 > tmpCliff.v2-tmpCliff.v0) {
@@ -3273,8 +3270,8 @@ void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 	}
 
 	if (!gotXVec && !gotYVec) {
-		DEBUG_LOG(("Unexpected.  jba\n"));
-		return; 
+		DEBUG_LOG(("Unexpected.  jba"));
+		return;
 	}
 	if (gotXVec && !gotYVec) {
 		yVec.V = -xVec.U;
@@ -3381,11 +3378,11 @@ void WorldHeightMapEdit::changeBoundary(Int ndx, ICoord2D *border)
 
 void WorldHeightMapEdit::removeLastBoundary(void)
 {
-	if (m_boundaries.size() == 0) {
+	if (m_boundaries.empty()) {
 		DEBUG_CRASH(("Invalid border remove request. jkmcd"));
 		return;
 	}
-	
+
 	m_boundaries.pop_back();
 }
 
@@ -3445,7 +3442,7 @@ void WorldHeightMapEdit::findBoundaryNear(Coord3D *pt, float okDistance, Int *ou
 			return;
 		}
 	}
-	
+
 	(*outNdx) = -1;
 }
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/WaterOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/WaterOptions.cpp
index 8b731dac433..e716b431b42 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WaterOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WaterOptions.cpp
@@ -45,7 +45,7 @@ Bool WaterOptions::m_creatingWaterAreas = false;
 WaterOptions::WaterOptions(CWnd* pParent /*=NULL*/):
 m_moveUndoable(NULL)
 {
-	//{{AFX_DATA_INIT(WaterOptions) 
+	//{{AFX_DATA_INIT(WaterOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -59,10 +59,10 @@ void WaterOptions::DoDataExchange(CDataExchange* pDX)
 	//}}AFX_DATA_MAP
 }
 
-void WaterOptions::setHeight(Int height) 
-{ 
-	char buffer[50];
-	sprintf(buffer, "%d", height);
+void WaterOptions::setHeight(Int height)
+{
+	char buffer[12];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%d", height);
 	m_waterHeight = height;
 	if (m_staticThis && !m_staticThis->m_updating) {
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -70,7 +70,7 @@ void WaterOptions::setHeight(Int height)
 	}
 }
 
-void WaterOptions::updateTheUI(void) 
+void WaterOptions::updateTheUI(void)
 {
 	PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon();
 
@@ -79,7 +79,7 @@ void WaterOptions::updateTheUI(void)
 	if (theTrigger && pWnd) {
 		pWnd->SetWindowText(theTrigger->getTriggerName().str());
 		setHeight(theTrigger->getPoint(0)->z);
-	}	
+	}
 	CButton *pButton = (CButton*)GetDlgItem(IDC_WATER_POLYGON);
 	pButton->SetCheck(m_creatingWaterAreas ? 1:0);
 	Bool isRiver = false;
@@ -91,14 +91,14 @@ void WaterOptions::updateTheUI(void)
 	pButton->EnableWindow(theTrigger!=NULL);
 
 	pWnd = m_staticThis->GetDlgItem(IDC_SPACING);
-	char buffer[_MAX_PATH];
+	char buffer[12];
 	if (pWnd) {
-		sprintf(buffer, "%d", m_waterPointSpacing);
+		snprintf(buffer, ARRAY_SIZE(buffer), "%d", m_waterPointSpacing);
 		pWnd->SetWindowText(buffer);
 	}
 }
 
-void WaterOptions::update(void) 
+void WaterOptions::update(void)
 {
 	if (m_staticThis) {
 		m_staticThis->updateTheUI();
@@ -109,12 +109,12 @@ void WaterOptions::update(void)
 // WaterOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL WaterOptions::OnInitDialog() 
+BOOL WaterOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = true;
 
 	m_waterHeightPopup.SetupPopSliderButton(this, IDC_HEIGHT_POPUP, this);
@@ -130,15 +130,15 @@ BOOL WaterOptions::OnInitDialog()
 BEGIN_MESSAGE_MAP(WaterOptions, COptionsPanel)
 	//{{AFX_MSG_MAP(WaterOptions)
 	ON_CBN_KILLFOCUS(IDC_WATERNAME_EDIT, OnChangeWaterEdit)
-	ON_EN_CHANGE(IDC_HEIGHT_EDIT, OnChangeHeightEdit)	 
-	ON_EN_CHANGE(IDC_SPACING, OnChangeSpacingEdit)	 
+	ON_EN_CHANGE(IDC_HEIGHT_EDIT, OnChangeHeightEdit)
+	ON_EN_CHANGE(IDC_SPACING, OnChangeSpacingEdit)
 	ON_BN_CLICKED(IDC_WATER_POLYGON, OnWaterPolygon)
 	ON_BN_CLICKED(IDC_MAKE_RIVER, OnMakeRiver)
 	ON_CBN_SELENDOK(IDC_WATERNAME_EDIT, OnChangeWaterEdit)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-void WaterOptions::OnChangeWaterEdit() 
+void WaterOptions::OnChangeWaterEdit()
 {
 	PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon();
 
@@ -185,13 +185,13 @@ void WaterOptions::OnChangeWaterEdit()
 }
 
 
-void WaterOptions::OnWaterPolygon() 
+void WaterOptions::OnWaterPolygon()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_WATER_POLYGON);
 	m_creatingWaterAreas = (pButton->GetCheck()==1);
 }
 
-void WaterOptions::OnMakeRiver() 
+void WaterOptions::OnMakeRiver()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_MAKE_RIVER);
 	Bool river = (pButton->GetCheck()==1);
@@ -222,7 +222,7 @@ void WaterOptions::OnMakeRiver()
 				// Now find the other end.
 //				Real sourceWidth = endLen;
 
-				endLen=0;	
+				endLen=0;
 				Int endPoint = 0;
 				for (i=0; i<theTrigger->getNumPoints()-1; i++) {
 					if (i>=newPoint-1 && i<=newPoint+1) continue;
@@ -267,7 +267,7 @@ PolygonTrigger * WaterOptions::adjustCount(PolygonTrigger *trigger, Int firstPt,
 {
 	PolygonTrigger *pNew = newInstance(PolygonTrigger)(trigger->getNumPoints());
 //	Real endLen=0;
-	Real totalLen=0;	
+	Real totalLen=0;
 	Real curSpacingLen = 10;
 	Int curPoint = lastPt;
 	ICoord3D pt;
@@ -278,7 +278,7 @@ PolygonTrigger * WaterOptions::adjustCount(PolygonTrigger *trigger, Int firstPt,
 		if (curPoint>=trigger->getNumPoints()) {
 			curPoint = 0;
 		}
-	}	
+	}
 
 	curPoint = firstPt;
 	while (curPoint != lastPt) {
@@ -360,7 +360,7 @@ void WaterOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax,
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void WaterOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -386,7 +386,7 @@ void WaterOptions::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void WaterOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -401,7 +401,7 @@ void WaterOptions::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
@@ -413,7 +413,7 @@ void WaterOptions::startUpdateHeight(void)
 		return;
 	}
 	if (!theTrigger->isWaterArea()) {
-		REF_PTR_RELEASE(m_moveUndoable); 
+		REF_PTR_RELEASE(m_moveUndoable);
 		return;
 	}
 	if (m_moveUndoable && theTrigger == m_moveUndoable->getTrigger()) {
@@ -466,7 +466,7 @@ void WaterOptions::endUpdateHeight(void)
  /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void WaterOptions::OnChangeHeightEdit() 
+void WaterOptions::OnChangeHeightEdit()
 {
 	if (m_updating) return;
 	CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -488,11 +488,11 @@ void WaterOptions::OnChangeHeightEdit()
  /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void WaterOptions::OnChangeSpacingEdit() 
+void WaterOptions::OnChangeSpacingEdit()
 {
 	if (m_updating) return;
 	CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SPACING);
-	char buffer[_MAX_PATH];
+	char buffer[12];
 	if (pEdit) {
 		pEdit->GetWindowText(buffer, sizeof(buffer));
 		Int height;
@@ -500,7 +500,7 @@ void WaterOptions::OnChangeSpacingEdit()
 		if (1==sscanf(buffer, "%d", &height)) {
 			m_waterPointSpacing = height;
 		}	else {
-			sprintf(buffer, "%d", m_waterPointSpacing);
+			snprintf(buffer, ARRAY_SIZE(buffer), "%d", m_waterPointSpacing);
 			pEdit->SetWindowText(buffer);
 		}
 		m_updating = false;
diff --git a/Generals/Code/Tools/WorldBuilder/src/WaterTool.cpp b/Generals/Code/Tools/WorldBuilder/src/WaterTool.cpp
index 3f316ce0ec4..239e003acd7 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WaterTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WaterTool.cpp
@@ -20,7 +20,7 @@
 // Water area tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "WaterTool.h"
@@ -41,9 +41,9 @@
 Bool WaterTool::m_water_isActive = false;
 
 /// Constructor
-WaterTool::WaterTool(void) 
+WaterTool::WaterTool(void)
 {
-	m_toolID = ID_WATER_TOOL; 
+	m_toolID = ID_WATER_TOOL;
 	m_cursorID = IDC_WATER;
 
 	m_currentZ = 0;
@@ -53,7 +53,7 @@ WaterTool::WaterTool(void)
 
 
 /// Destructor
-WaterTool::~WaterTool(void) 
+WaterTool::~WaterTool(void)
 {
 	if (m_poly_plusCursor) {
 		::DestroyCursor(m_poly_plusCursor);
@@ -64,7 +64,7 @@ WaterTool::~WaterTool(void)
 }
 
 /// Clears it's is active flag.
-void WaterTool::deactivate() 
+void WaterTool::deactivate()
 {
 	PolygonTool::deactivate();
 	m_water_isActive = false;
@@ -73,7 +73,7 @@ void WaterTool::deactivate()
 static Bool doIt = false;
 
 /// Shows the no options panel.
-void WaterTool::activate() 
+void WaterTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_WATER_OPTIONS);
 	m_water_isActive = true;
@@ -92,7 +92,7 @@ void WaterTool::activate()
 #define INTENSE_DEBUG
 
 /// Perform the tool behavior on mouse down.
-void WaterTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void WaterTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	if (WaterOptions::getCreatingWaterAreas()) {
@@ -121,7 +121,7 @@ void WaterTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 
 
 /** Set the cursor. */
-void WaterTool::setCursor(void) 
+void WaterTool::setCursor(void)
 {
 	if (m_poly_mouseUpPlus || (m_poly_isAdding && m_poly_curSelectedPolygon)) {
 		if (m_poly_plusCursor == NULL) {
@@ -188,7 +188,7 @@ void WaterTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 }
 
 /** Mouse up - not much. */
-void WaterTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void WaterTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	REF_PTR_RELEASE(m_poly_moveUndoable); // belongs to pDoc now.
@@ -199,7 +199,7 @@ inline static Real mapZtoHeight(UnsignedByte mapZ) {
 }
 
 /// Perform the fill water area on mouse down.
-void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	Int waterHeight = m_currentZ;
 
@@ -219,8 +219,8 @@ void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 	Int i, j;
 	i = ndx.x;
 	j = ndx.y;
-	
-	WorldHeightMapEdit *pMap = pDoc->GetHeightMap(); 
+
+	WorldHeightMapEdit *pMap = pDoc->GetHeightMap();
 	if (i<0 || i>=pMap->getXExtent()-1) return;
 	if (j<0 || j>=pMap->getYExtent()-1) return;
 
@@ -232,7 +232,7 @@ void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 	// Move left till we find an edge.
 	while (i>0) {
 		i--;
-		intMapHeight = pMap->getHeight(i, j);	
+		intMapHeight = pMap->getHeight(i, j);
 		if (waterHeight<mapZtoHeight(intMapHeight)) {
 			break;
 		}
@@ -260,13 +260,13 @@ void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 		intMapHeight = pMap->getHeight(i, j);
 #ifdef INTENSE_DEBUG
 		if (bottom) {
-			DEBUG_LOG(("Bottom %d,%d\n", i, j));
+			DEBUG_LOG(("Bottom %d,%d", i, j));
 		} else if (left) {
-			DEBUG_LOG(("Left %d,%d\n", i, j));
+			DEBUG_LOG(("Left %d,%d", i, j));
 		} else if (right) {
-			DEBUG_LOG(("Right %d,%d\n", i, j));
+			DEBUG_LOG(("Right %d,%d", i, j));
 		} else if (top) {
-			DEBUG_LOG(("Top %d,%d\n", i, j));
+			DEBUG_LOG(("Top %d,%d", i, j));
 		}
 #endif
 		if (bottom) {
@@ -456,12 +456,12 @@ void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 				}
 				pt.x = (i+1)*MAP_XY_FACTOR;
 			}
-		} else { 
+		} else {
 			DEBUG_CRASH(("Logic error. jba.")); // shouldn't get here.
 		}
 		pt.x -= pMap->getBorderSize()*MAP_XY_FACTOR;
 		pt.y -= pMap->getBorderSize()*MAP_XY_FACTOR;
-		pNew->addPoint(pt);	
+		pNew->addPoint(pt);
 		curPoint++;
 		if (firstTime) {
 			startI = i;
@@ -470,7 +470,7 @@ void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 		}
 
 	}
-	
+
 	if (pNew->getNumPoints()>2) {
 		PolygonTrigger *pBetter = adjustSpacing(pNew, WaterOptions::getSpacing());
 		deleteInstance(pNew);
diff --git a/Generals/Code/Tools/WorldBuilder/src/WaypointOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/WaypointOptions.cpp
index 870699f883a..111bb04d8e3 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WaypointOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WaypointOptions.cpp
@@ -42,7 +42,7 @@ WaypointOptions *WaypointOptions::m_staticThis = NULL;
 WaypointOptions::WaypointOptions(CWnd* pParent /*=NULL*/):
 m_moveUndoable(NULL)
 {
-	//{{AFX_DATA_INIT(WaypointOptions) 
+	//{{AFX_DATA_INIT(WaypointOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -58,10 +58,10 @@ void WaypointOptions::DoDataExchange(CDataExchange* pDX)
 
 MapObject *WaypointOptions::getSingleSelectedWaypoint(void)
 {
-	MapObject *theMapObj = NULL; 
+	MapObject *theMapObj = NULL;
 //	Bool found = false;
 	Int selCount=0;
-	MapObject *pMapObj; 
+	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj->isSelected()) {
 			if (pMapObj->isWaypoint()) {
@@ -96,12 +96,12 @@ PolygonTrigger *WaypointOptions::getSingleSelectedPolygon(void)
 	return(NULL);
 }
 
-void WaypointOptions::updateTheUI(void) 
+void WaypointOptions::updateTheUI(void)
 {
 	Tool *curTool = ((CWorldBuilderApp*)AfxGetApp())->getCurTool();
 
 	Bool isWaypointTool = (curTool && (curTool->getToolID() == ID_WAYPOINT_TOOL));
-	MapObject *theMapObj = getSingleSelectedWaypoint(); 
+	MapObject *theMapObj = getSingleSelectedWaypoint();
 	PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon();
 
 	CWnd *pWnd = this->GetDlgItem(IDC_WAYPOINTNAME_EDIT);
@@ -125,11 +125,11 @@ void WaypointOptions::updateTheUI(void)
 
 	if (theTrigger) {
 		pCaption1->ShowWindow(SW_SHOW);
-		pWnd->ShowWindow(SW_SHOW);	
+		pWnd->ShowWindow(SW_SHOW);
 	} else {
 		pCaption1->ShowWindow(SW_HIDE);
 		pCaption2->ShowWindow(SW_HIDE);
-		pWnd->ShowWindow(SW_HIDE);	
+		pWnd->ShowWindow(SW_HIDE);
 	}
 
 	if (pCombo && !theTrigger) {
@@ -186,11 +186,11 @@ void WaypointOptions::updateTheUI(void)
 
 			if (!tempObj)
 				break;
-			
+
 			// if it is a waypoint, add its name to the combo box
 			if (tempObj->isWaypoint())
 				pListWayptNames->AddString(tempObj->getWaypointName().str());
-			
+
 			tempObj = tempObj->getNext();
 		}
 
@@ -220,7 +220,7 @@ void WaypointOptions::updateTheUI(void)
 			// convert the location coordinates to strings
 			locX.format("%f", waypointLocation->x);
 			locY.format("%f", waypointLocation->y);
-			
+
 			// set the window text to reflect the current position of the waypoint
 			pWaypointX->SetWindowText(locX.str());
 			pWaypointY->SetWindowText(locY.str());
@@ -273,7 +273,7 @@ void WaypointOptions::updateTheUI(void)
 	}
 }
 
-void WaypointOptions::update(void) 
+void WaypointOptions::update(void)
 {
 	if (m_staticThis) {
 		m_staticThis->updateTheUI();
@@ -284,12 +284,12 @@ void WaypointOptions::update(void)
 // WaypointOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL WaypointOptions::OnInitDialog() 
+BOOL WaypointOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = true;
 
 	m_staticThis = this;
@@ -321,7 +321,7 @@ void WaypointOptions::OnChangeSelectedWaypoint()
 	if (!currentlySelected)
 		return;
 	currentlySelected->setSelected(false);
-	
+
 	// retrieve information from dialog box, if user-typed -- sel will be -1, otherwise it will be >=0
 	CString theText;
 	CComboBox *pListWayptNames = (CComboBox*)GetDlgItem(IDC_LIST_OF_WAYPOINT_NAMES);
@@ -332,7 +332,7 @@ void WaypointOptions::OnChangeSelectedWaypoint()
 		pListWayptNames->GetWindowText(theText);
 	}
 	AsciiString name((LPCTSTR)theText);
-	
+
 	// find and store the waypoint that corresponds to the information in the dialog box
 	Bool foundWaypoint = false;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
@@ -392,7 +392,7 @@ void WaypointOptions::OnEditWaypointLocationX()
 	newWaypointLocation.x = atof(name.str());
 	newWaypointLocation.y = waypointLocation->y;
 	newWaypointLocation.z = 0;
-	
+
 	// set the new information into both the waypointa and the window
 	waypt->setLocation(&newWaypointLocation);
 }
@@ -424,12 +424,12 @@ void WaypointOptions::OnEditWaypointLocationY()
 	newWaypointLocation.y = atof(name.str());
 	newWaypointLocation.x = waypointLocation->x;
 	newWaypointLocation.z = 0;
-	
+
 	// set the new information into both the waypointa and the window
 	waypt->setLocation(&newWaypointLocation);
 }
 
-Bool WaypointOptions::isUnique(AsciiString name, MapObject* theMapObj) 
+Bool WaypointOptions::isUnique(AsciiString name, MapObject* theMapObj)
 {
 	MapObject *pMapObj;
 	Bool didMatch = false;
@@ -446,7 +446,7 @@ Bool WaypointOptions::isUnique(AsciiString name, MapObject* theMapObj)
 	return (didMatch == false);
 }
 
-AsciiString WaypointOptions::GenerateUniqueName(Int id) 
+AsciiString WaypointOptions::GenerateUniqueName(Int id)
 {
 	AsciiString name;
 	name.format("Waypoint %d", id);
@@ -458,9 +458,9 @@ AsciiString WaypointOptions::GenerateUniqueName(Int id)
 	return name;
 }
 
-void WaypointOptions::OnChangeWaypointnameEdit() 
+void WaypointOptions::OnChangeWaypointnameEdit()
 {
-	MapObject *theMapObj = getSingleSelectedWaypoint(); 
+	MapObject *theMapObj = getSingleSelectedWaypoint();
 	PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon();
 
 	// get the combo box
@@ -514,14 +514,14 @@ void WaypointOptions::OnChangeWaypointnameEdit()
 }
 
 
-void WaypointOptions::OnEditchangeWaypointlabel1Edit() 
+void WaypointOptions::OnEditchangeWaypointlabel1Edit()
 {
 	changeWaypointLabel(IDC_WAYPOINTLABEL1_EDIT, TheKey_waypointPathLabel1);
 }
 
-void WaypointOptions::changeWaypointLabel(Int editControlID, NameKeyType key) 
+void WaypointOptions::changeWaypointLabel(Int editControlID, NameKeyType key)
 {
-	MapObject *theMapObj = getSingleSelectedWaypoint(); 
+	MapObject *theMapObj = getSingleSelectedWaypoint();
 	if (theMapObj==NULL) return;
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (!pDoc->isWaypointLinked(theMapObj)) {
@@ -539,19 +539,19 @@ void WaypointOptions::changeWaypointLabel(Int editControlID, NameKeyType key)
 	}
 }
 
-void WaypointOptions::OnEditchangeWaypointlabel2Edit() 
+void WaypointOptions::OnEditchangeWaypointlabel2Edit()
 {
 	changeWaypointLabel(IDC_WAYPOINTLABEL2_EDIT, TheKey_waypointPathLabel2);
 }
 
-void WaypointOptions::OnEditchangeWaypointlabel3Edit() 
+void WaypointOptions::OnEditchangeWaypointlabel3Edit()
 {
 	changeWaypointLabel(IDC_WAYPOINTLABEL3_EDIT, TheKey_waypointPathLabel3);
 }
 
-void WaypointOptions::OnWaypointBidirectional() 
+void WaypointOptions::OnWaypointBidirectional()
 {
-	MapObject *theMapObj = getSingleSelectedWaypoint(); 
+	MapObject *theMapObj = getSingleSelectedWaypoint();
 	if (theMapObj==NULL) return;
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (!pDoc->isWaypointLinked(theMapObj)) {
diff --git a/Generals/Code/Tools/WorldBuilder/src/WaypointTool.cpp b/Generals/Code/Tools/WorldBuilder/src/WaypointTool.cpp
index 6c6a04d9c13..24568828216 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WaypointTool.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WaypointTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "WaypointTool.h"
@@ -43,23 +43,23 @@ Bool WaypointTool::m_isActive = false;
 
 /// Constructor
 WaypointTool::WaypointTool(void) :
-	Tool(ID_WAYPOINT_TOOL, IDC_WAYPOINT) 
+	Tool(ID_WAYPOINT_TOOL, IDC_WAYPOINT)
 {
 }
-	
+
 /// Destructor
-WaypointTool::~WaypointTool(void) 
+WaypointTool::~WaypointTool(void)
 {
 }
 
 /// Clears it's is active flag.
-void WaypointTool::deactivate() 
+void WaypointTool::deactivate()
 {
 	m_isActive = false;
 }
 
 /// Shows the terrain materials options panel.
-void WaypointTool::activate() 
+void WaypointTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_WAYPOINT_OPTIONS);
 	WaypointOptions::update();
@@ -100,12 +100,12 @@ MapObject *WaypointTool::pickWaypoint(Coord3D loc){
 			return pObj;
 		}
 	}
-	return NULL; 
+	return NULL;
 }
 
 
 /// Perform the tool behavior on mouse down.
-void WaypointTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void WaypointTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	m_downWaypointID = 0;
@@ -119,14 +119,14 @@ void WaypointTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 		WaypointOptions::update();
 	}	else {
 		pView->snapPoint(&docPt);
-		MapObject *pNew = newInstance( MapObject)(docPt, AsciiString("*Waypoints/Waypoint"), 0, 0, NULL, NULL );
+		MapObject *pNew = newInstance( MapObject)(docPt, "*Waypoints/Waypoint", 0, 0, NULL, NULL );
 		Int id = pDoc->getNextWaypointID();
 		AsciiString name = WaypointOptions::GenerateUniqueName(id);
 		pNew->setSelected(true);
 		pNew->setIsWaypoint();
 		pNew->setWaypointID(id);
 		pNew->setWaypointName(name);
-		pNew->getProperties()->setAsciiString(TheKey_originalOwner, AsciiString("team"));
+		pNew->getProperties()->setAsciiString(TheKey_originalOwner, "team");
 		AddObjectUndoable *pUndo = new AddObjectUndoable(pDoc, pNew);
 		pDoc->AddAndDoUndoable(pUndo);
 		REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
@@ -154,7 +154,7 @@ void WaypointTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWo
 }
 
 /** Execute the tool on mouse up - Place an object. */
-void WaypointTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void WaypointTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	DrawObject::stopWaypointDragFeedback();
 	if (m != TRACK_L) return;
@@ -166,7 +166,7 @@ void WaypointTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 	pObj = pickWaypoint(docPt);
 	if (pObj == NULL) {
 		pView->snapPoint(&docPt);
-		MapObject *pNew = newInstance( MapObject)(docPt, AsciiString("*Waypoints/Waypoint"), 0, 0, NULL, NULL );
+		MapObject *pNew = newInstance( MapObject)(docPt, "*Waypoints/Waypoint", 0, 0, NULL, NULL );
 		Int id = pDoc->getNextWaypointID();
 		AsciiString name;
 		name.format("Waypoint %d", id);
@@ -174,25 +174,25 @@ void WaypointTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 		pNew->setIsWaypoint();
 		pNew->setWaypointID(id);
 		pNew->setWaypointName(name);
-		pNew->getProperties()->setAsciiString(TheKey_originalOwner, AsciiString("team"));
+		pNew->getProperties()->setAsciiString(TheKey_originalOwner, "team");
 		AddObjectUndoable *pUndo = new AddObjectUndoable(pDoc, pNew);
 		pDoc->AddAndDoUndoable(pUndo);
 		REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 		pObj = pNew;
 		pNew = NULL; // undoable owns it now.
 	}
-	if (pObj) 
+	if (pObj)
 	{
 		pObj->setSelected(true);
-		if (m_downWaypointID && (pObj->getWaypointID() != m_downWaypointID)) 
+		if (m_downWaypointID && (pObj->getWaypointID() != m_downWaypointID))
 		{
 			Int waypointID = pObj->getWaypointID();
 			// If a link
-			if (pDoc->waypointLinkExists(m_downWaypointID, waypointID)) 
+			if (pDoc->waypointLinkExists(m_downWaypointID, waypointID))
 			{
 				pDoc->removeWaypointLink(m_downWaypointID, waypointID);
-			} 
-			else if (m_downWaypointID != waypointID) 
+			}
+			else if (m_downWaypointID != waypointID)
 			{
 				pDoc->addWaypointLink(m_downWaypointID, waypointID);
 			}
diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
index 7024305a4bf..aa8be4c583b 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
@@ -20,7 +20,6 @@
 //
 
 #include "StdAfx.h"
-#include <eh.h>
 #include "WorldBuilder.h"
 #include "euladialog.h"
 #include "MainFrm.h"
@@ -34,6 +33,7 @@
 
 //#include <wsys/StdFileSystem.h>
 #include "W3DDevice/GameClient/W3DFileSystem.h"
+#include "Common/FramePacer.h"
 #include "Common/GlobalData.h"
 #include "WHeightMapEdit.h"
 //#include "Common/GameFileSystem.h"
@@ -83,19 +83,14 @@
 #include "Win32Device/Common/Win32LocalFileSystem.h"
 #include "Win32Device/Common/Win32BIGFileSystem.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static SubsystemInterfaceList TheSubsystemListRecord;
 
 template<class SUBSYSTEM>
-void initSubsystem(SUBSYSTEM*& sysref, SUBSYSTEM* sys, const char* path1 = NULL, const char* path2 = NULL, const char* dirpath = NULL)
+void initSubsystem(SUBSYSTEM*& sysref, SUBSYSTEM* sys, const char* path1 = NULL, const char* path2 = NULL)
 {
 	sysref = sys;
-	TheSubsystemListRecord.initSubsystem(sys, path1, path2, dirpath, NULL);
+	TheSubsystemListRecord.initSubsystem(sys, path1, path2, NULL);
 }
 
 
@@ -108,7 +103,7 @@ const Char *g_strFile = "data\\Generals.str";
 const Char *g_csfFile = "data\\%s\\Generals.csf";
 
 /////////////////////////////////////////////////////////////////////////////
-// WBGameFileClass - extends the file system a bit so we can get at some 
+// WBGameFileClass - extends the file system a bit so we can get at some
 // wb only data.  jba.
 
 class WBGameFileClass : public GameFileClass
@@ -130,7 +125,7 @@ char const * WBGameFileClass::Set_Name( char const *filename )
 	}
 
 	if (TheFileSystem->doesFileExist(filename)) {
-		strcpy( m_filePath, filename );
+		strlcpy(m_filePath, filename, ARRAY_SIZE(m_filePath));
 		m_fileExists = true;
 	}
 	return m_filename;
@@ -139,7 +134,7 @@ char const * WBGameFileClass::Set_Name( char const *filename )
 
 
 /////////////////////////////////////////////////////////////////////////////
-// WB_W3DFileSystem - extends the file system a bit so we can get at some 
+// WB_W3DFileSystem - extends the file system a bit so we can get at some
 // wb only data.  jba.
 
 class	WB_W3DFileSystem : public W3DFileSystem {
@@ -225,7 +220,7 @@ CWorldBuilderApp::CWorldBuilderApp() :
 	m_tools[10] = &m_pointerTool;
 	m_tools[11] = &m_blendEdgeTool;
 	m_tools[12] = &m_groveTool;
-	m_tools[13] = &m_meshMoldTool;	 
+	m_tools[13] = &m_meshMoldTool;
 	m_tools[14] = &m_roadTool;
 	m_tools[15] = &m_handScrollTool;
 	m_tools[16] = &m_waypointTool;
@@ -264,6 +259,14 @@ CWorldBuilderApp::~CWorldBuilderApp()
 	}
 }
 
+/////////////////////////////////////////////////////////////////////////////
+// Handler for unhandled win32 exceptions.
+
+static LONG WINAPI UnHandledExceptionFilter(struct _EXCEPTION_POINTERS* e_info)
+{
+	DumpExceptionInfo(e_info->ExceptionRecord->ExceptionCode, e_info);
+	return EXCEPTION_EXECUTE_HANDLER;
+}
 
 /////////////////////////////////////////////////////////////////////////////
 // CWorldBuilderApp initialization
@@ -277,18 +280,15 @@ BOOL CWorldBuilderApp::InitInstance()
 	}
 
 	// initialization
-  _set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
+	SetUnhandledExceptionFilter(UnHandledExceptionFilter);
 
-	// start the log
-	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
-	DEBUG_LOG(("starting Worldbuilder.\n"));
-#ifdef RTS_INTERNAL
-	DEBUG_LOG(("RTS_INTERNAL defined.\n"));
-#endif
+	// initialize the memory manager early
+	initMemoryManager();
+
+	DEBUG_LOG(("starting Worldbuilder."));
 #ifdef RTS_DEBUG
-	DEBUG_LOG(("RTS_DEBUG defined.\n"));
+	DEBUG_LOG(("RTS_DEBUG defined."));
 #endif
-	initMemoryManager();
 #ifdef MEMORYPOOL_CHECKPOINTING
 	gFirstCP = TheMemoryPoolFactory->debugSetCheckpoint();
 #endif
@@ -298,7 +298,7 @@ BOOL CWorldBuilderApp::InitInstance()
 	loadWindow.SetWindowText("Loading Worldbuilder");
 	loadWindow.ShowWindow(SW_SHOW);
 	loadWindow.UpdateWindow();
-	
+
 	CRect rect(15, 315, 230, 333);
 	loadWindow.setTextOutputLocation(rect);
 	loadWindow.outputText(IDS_SPLASH_LOADING);
@@ -316,13 +316,8 @@ BOOL CWorldBuilderApp::InitInstance()
 	// Set the current directory to the app directory.
 	char buf[_MAX_PATH];
 	GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	if (char *pEnd = strrchr(buf, '\\')) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);
 
@@ -337,10 +332,12 @@ BOOL CWorldBuilderApp::InitInstance()
 
 	INI ini;
 
-	initSubsystem(TheWritableGlobalData, new GlobalData(), "Data\\INI\\Default\\GameData.ini", "Data\\INI\\GameData.ini");
-	
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	ini.load( AsciiString( "Data\\INI\\GameDataDebug.ini" ), INI_LOAD_MULTIFILE, NULL );
+	initSubsystem(TheWritableGlobalData, new GlobalData(), "Data\\INI\\Default\\GameData", "Data\\INI\\GameData");
+
+	TheFramePacer = new FramePacer();
+
+#if defined(RTS_DEBUG)
+	ini.loadFileDirectory( "Data\\INI\\GameDataDebug", INI_LOAD_MULTIFILE, NULL );
 #endif
 
 #ifdef DEBUG_CRASHING
@@ -350,29 +347,29 @@ BOOL CWorldBuilderApp::InitInstance()
 #if 1
 	// srj sez: put INI into our user data folder, not the ap dir
 	free((void*)m_pszProfileName);
-	strcpy(buf, TheGlobalData->getPath_UserData().str());
-	strcat(buf, "WorldBuilder.ini");
+	strlcpy(buf, TheGlobalData->getPath_UserData().str(), ARRAY_SIZE(buf));
+	strlcat(buf, "WorldBuilder.ini", ARRAY_SIZE(buf));
 #else
-	strcat(buf, "//");
-	strcat(buf, m_pszProfileName);
+	strlcat(buf, "//", ARRAY_SIZE(buf));
+	strlcat(buf, m_pszProfileName, ARRAY_SIZE(buf));
 	free((void*)m_pszProfileName);
 #endif
 	m_pszProfileName = (const char *)malloc(strlen(buf)+2);
 	strcpy((char*)m_pszProfileName, buf);
 
 	// ensure the user maps dir exists
-	sprintf(buf, "%sMaps\\", TheGlobalData->getPath_UserData().str());
+	snprintf(buf, ARRAY_SIZE(buf), "%sMaps\\", TheGlobalData->getPath_UserData().str());
 	CreateDirectory(buf, NULL);
 
 	// read the water settings from INI (must do prior to initing GameClient, apparently)
-	ini.load( AsciiString( "Data\\INI\\Default\\Water.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\Water.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\Water", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Water", INI_LOAD_OVERWRITE, NULL );
 
 	initSubsystem(TheGameText, CreateGameTextInterface());
-	initSubsystem(TheScienceStore, new ScienceStore(), "Data\\INI\\Default\\Science.ini", "Data\\INI\\Science.ini");
-	initSubsystem(TheMultiplayerSettings, new MultiplayerSettings(), "Data\\INI\\Default\\Multiplayer.ini", "Data\\INI\\Multiplayer.ini");
-	initSubsystem(TheTerrainTypes, new TerrainTypeCollection(), "Data\\INI\\Default\\Terrain.ini", "Data\\INI\\Terrain.ini");
-	initSubsystem(TheTerrainRoads, new TerrainRoadCollection(), "Data\\INI\\Default\\Roads.ini", "Data\\INI\\Roads.ini");
+	initSubsystem(TheScienceStore, new ScienceStore(), "Data\\INI\\Default\\Science", "Data\\INI\\Science");
+	initSubsystem(TheMultiplayerSettings, new MultiplayerSettings(), "Data\\INI\\Default\\Multiplayer", "Data\\INI\\Multiplayer");
+	initSubsystem(TheTerrainTypes, new TerrainTypeCollection(), "Data\\INI\\Default\\Terrain", "Data\\INI\\Terrain");
+	initSubsystem(TheTerrainRoads, new TerrainRoadCollection(), "Data\\INI\\Default\\Roads", "Data\\INI\\Roads");
 
 	WorldHeightMapEdit::init();
 
@@ -388,19 +385,19 @@ BOOL CWorldBuilderApp::InitInstance()
 	initSubsystem(TheModuleFactory, (ModuleFactory*)(new W3DModuleFactory()));
 	initSubsystem(TheSidesList, new SidesList());
 	initSubsystem(TheCaveSystem, new CaveSystem());
-	initSubsystem(TheRankInfoStore, new RankInfoStore(), NULL, "Data\\INI\\Rank.ini");
-	initSubsystem(ThePlayerTemplateStore, new PlayerTemplateStore(), "Data\\INI\\Default\\PlayerTemplate.ini", "Data\\INI\\PlayerTemplate.ini");
-	initSubsystem(TheSpecialPowerStore, new SpecialPowerStore(), "Data\\INI\\Default\\SpecialPower.ini", "Data\\INI\\SpecialPower.ini" );
+	initSubsystem(TheRankInfoStore, new RankInfoStore(), NULL, "Data\\INI\\Rank");
+	initSubsystem(ThePlayerTemplateStore, new PlayerTemplateStore(), "Data\\INI\\Default\\PlayerTemplate", "Data\\INI\\PlayerTemplate");
+	initSubsystem(TheSpecialPowerStore, new SpecialPowerStore(), "Data\\INI\\Default\\SpecialPower", "Data\\INI\\SpecialPower" );
 	initSubsystem(TheParticleSystemManager, (ParticleSystemManager*)(new W3DParticleSystemManager()));
-	initSubsystem(TheFXListStore, new FXListStore(), "Data\\INI\\Default\\FXList.ini", "Data\\INI\\FXList.ini");
-	initSubsystem(TheWeaponStore, new WeaponStore(), NULL, "Data\\INI\\Weapon.ini");
-	initSubsystem(TheObjectCreationListStore, new ObjectCreationListStore(), "Data\\INI\\Default\\ObjectCreationList.ini", "Data\\INI\\ObjectCreationList.ini");
-	initSubsystem(TheLocomotorStore, new LocomotorStore(), NULL, "Data\\INI\\Locomotor.ini");
-	initSubsystem(TheDamageFXStore, new DamageFXStore(), NULL, "Data\\INI\\DamageFX.ini");
-	initSubsystem(TheArmorStore, new ArmorStore(), NULL, "Data\\INI\\Armor.ini");
-	initSubsystem(TheThingFactory, new ThingFactory(), "Data\\INI\\Default\\Object.ini", NULL, "Data\\INI\\Object");
-	initSubsystem(TheCrateSystem, new CrateSystem(), "Data\\INI\\Default\\Crate.ini", "Data\\INI\\Crate.ini");
-	initSubsystem(TheUpgradeCenter, new UpgradeCenter, "Data\\INI\\Default\\Upgrade.ini", "Data\\INI\\Upgrade.ini");
+	initSubsystem(TheFXListStore, new FXListStore(), "Data\\INI\\Default\\FXList", "Data\\INI\\FXList");
+	initSubsystem(TheWeaponStore, new WeaponStore(), NULL, "Data\\INI\\Weapon");
+	initSubsystem(TheObjectCreationListStore, new ObjectCreationListStore(), "Data\\INI\\Default\\ObjectCreationList", "Data\\INI\\ObjectCreationList");
+	initSubsystem(TheLocomotorStore, new LocomotorStore(), NULL, "Data\\INI\\Locomotor");
+	initSubsystem(TheDamageFXStore, new DamageFXStore(), NULL, "Data\\INI\\DamageFX");
+	initSubsystem(TheArmorStore, new ArmorStore(), NULL, "Data\\INI\\Armor");
+	initSubsystem(TheThingFactory, new ThingFactory(), "Data\\INI\\Default\\Object", "Data\\INI\\Object");
+	initSubsystem(TheCrateSystem, new CrateSystem(), "Data\\INI\\Default\\Crate", "Data\\INI\\Crate");
+	initSubsystem(TheUpgradeCenter, new UpgradeCenter, "Data\\INI\\Default\\Upgrade", "Data\\INI\\Upgrade");
 	initSubsystem(TheAnim2DCollection, new Anim2DCollection ); //Init's itself.
 
 	TheSubsystemListRecord.postProcessLoadAll();
@@ -411,11 +408,13 @@ BOOL CWorldBuilderApp::InitInstance()
 	DEBUG_ASSERTCRASH(!TheGlobalData->m_useHalfHeightMap, ("TheGlobalData->m_useHalfHeightMap : Don't use this setting in WB."));
 	TheWritableGlobalData->m_useHalfHeightMap = false;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	// WB never uses the shroud.
+#if ENABLE_CONFIGURABLE_SHROUD
+	// WB never uses the shroud. With shroud, terrain is black.
 	TheWritableGlobalData->m_shroudOn = FALSE;
 #endif
 
+	TheWritableGlobalData->m_isWorldBuilder = TRUE;
+
 	// Change the registry key under which our settings are stored.
 	// TODO: You should modify this string to be something appropriate
 	// such as the name of your company or organization.
@@ -425,20 +424,20 @@ BOOL CWorldBuilderApp::InitInstance()
 
 	// Register the application's document templates.  Document templates
 	//  serve as the connection between documents, frame windows and views.
- 
+
 	m_3dtemplate = new CSingleDocTemplate(
 		IDR_MAPDOC,
 		RUNTIME_CLASS(CWorldBuilderDoc),
-		RUNTIME_CLASS(CWB3dFrameWnd), 
+		RUNTIME_CLASS(CWB3dFrameWnd),
 		RUNTIME_CLASS(WbView3d));
 
 	AddDocTemplate(m_3dtemplate);
 
 #ifdef MDI
-	CMainFrame* pMainFrame = new CMainFrame; 
-	if (!pMainFrame->LoadFrame(IDR_MAPDOC)) 
-		return FALSE; 
-	m_pMainWnd = pMainFrame; 
+	CMainFrame* pMainFrame = new CMainFrame;
+	if (!pMainFrame->LoadFrame(IDR_MAPDOC))
+		return FALSE;
+	m_pMainWnd = pMainFrame;
 #endif
 
 	// Parse command line for standard shell commands, DDE, file open
@@ -461,7 +460,7 @@ BOOL CWorldBuilderApp::InitInstance()
 //	if (!ProcessShellCommand(cmdInfo))
 //		return FALSE;
 
-	selectPointerTool();   
+	selectPointerTool();
 
 	CString openDir = this->GetProfileString(APP_SECTION, OPEN_FILE_DIR);
 	m_currentDirectory = openDir;
@@ -491,7 +490,7 @@ BOOL CWorldBuilderApp::OnCmdMsg(UINT nID, int nCode, void* pExtra,
 				{
 					// Update UI element state
 					CCmdUI *pUI = (CCmdUI*)pExtra;
-					pUI->SetCheck(m_curTool == pTool?1:0);	
+					pUI->SetCheck(m_curTool == pTool?1:0);
 					pUI->Enable(true);
 				}
 				return TRUE;
@@ -509,7 +508,7 @@ BOOL CWorldBuilderApp::OnCmdMsg(UINT nID, int nCode, void* pExtra,
 //=============================================================================
 /** Sets the active tool to the pointer, and clears the selection. */
 //=============================================================================
-void CWorldBuilderApp::selectPointerTool(void) 
+void CWorldBuilderApp::selectPointerTool(void)
 {
 	setActiveTool(&m_pointerTool);
 	// Clear selection.
@@ -521,7 +520,7 @@ void CWorldBuilderApp::selectPointerTool(void)
 //=============================================================================
 /** Sets the active tool, and activates it after deactivating the current tool. */
 //=============================================================================
-void CWorldBuilderApp::setActiveTool(Tool *pNewTool) 
+void CWorldBuilderApp::setActiveTool(Tool *pNewTool)
 {
 	if (m_curTool == pNewTool) {
 		// same tool
@@ -540,7 +539,7 @@ void CWorldBuilderApp::setActiveTool(Tool *pNewTool)
 //=============================================================================
 // CWorldBuilderApp::updateCurTool
 //=============================================================================
-/** Checks to see if any key modifiers (ctrl or alt) are pressed.  If so, 
+/** Checks to see if any key modifiers (ctrl or alt) are pressed.  If so,
 selectes the appropriate tool, else uses the normal tool. */
 //=============================================================================
 void CWorldBuilderApp::updateCurTool(Bool forceHand)
@@ -623,7 +622,7 @@ void CWorldBuilderApp::OnAppAbout()
 /////////////////////////////////////////////////////////////////////////////
 // CWorldBuilderApp message handlers
 
-int CWorldBuilderApp::ExitInstance() 
+int CWorldBuilderApp::ExitInstance()
 {
 
 	WriteProfileString(APP_SECTION, OPEN_FILE_DIR, m_currentDirectory.str());
@@ -635,9 +634,11 @@ int CWorldBuilderApp::ExitInstance()
 
 	WorldHeightMapEdit::shutdown();
 
+	delete TheFramePacer;
+	TheFramePacer = NULL;
+
 	delete TheFileSystem;
 	TheFileSystem = NULL;
-	TextureLoadTaskClass::shutdown();  
 
 	delete TheW3DFileSystem;
 	TheW3DFileSystem = NULL;
@@ -652,20 +653,19 @@ int CWorldBuilderApp::ExitInstance()
 	TheMemoryPoolFactory->debugMemoryReport(REPORT_FACTORYINFO | REPORT_CP_LEAKS | REPORT_CP_STACKTRACE, gFirstCP, lastCP);
 #endif
 	shutdownMemoryManager();
-	DEBUG_SHUTDOWN();
 
 	return CWinApp::ExitInstance();
 }
 
-void CWorldBuilderApp::OnResetWindows() 
+void CWorldBuilderApp::OnResetWindows()
 {
 	if (CMainFrame::GetMainFrame()) {
 		CMainFrame::GetMainFrame()->ResetWindowPositions();
 	}
-	
+
 }
 
-void CWorldBuilderApp::OnFileOpen() 
+void CWorldBuilderApp::OnFileOpen()
 {
 #ifdef DO_MAPS_IN_DIRECTORIES
 	TOpenMapInfo info;
@@ -682,7 +682,7 @@ void CWorldBuilderApp::OnFileOpen()
 #endif
 
 	CFileStatus status;
-	if (m_currentDirectory != AsciiString("")) try {
+	if (!m_currentDirectory.isEmpty()) try {
 		if (CFile::GetStatus(m_currentDirectory.str(), status)) {
 			if (status.m_attribute & CFile::directory) {
 				::SetCurrentDirectory(m_currentDirectory.str());
@@ -693,15 +693,15 @@ void CWorldBuilderApp::OnFileOpen()
 	CWinApp::OnFileOpen();
 }
 
-void CWorldBuilderApp::OnTexturesizingMapclifftextures() 
+void CWorldBuilderApp::OnTexturesizingMapclifftextures()
 {
 	setActiveTool(&m_floodFillTool);
 	m_floodFillTool.setAdjustCliffs(true);
-	
+
 }
 
-void CWorldBuilderApp::OnUpdateTexturesizingMapclifftextures(CCmdUI* pCmdUI) 
+void CWorldBuilderApp::OnUpdateTexturesizingMapclifftextures(CCmdUI* pCmdUI)
 {
 	// TODO: Add your command update UI handler code here
-	
+
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp
index 6c6472486c2..da3eb6fb1c3 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp
@@ -189,17 +189,17 @@ class CachedMFCFileOutputStream : public OutputStream
 		c.pData = tmp;
 		c.size = numBytes;
 		m_cachedChunks.push_back(c);
-		DEBUG_LOG(("Caching %d bytes in chunk %d\n", numBytes, m_cachedChunks.size()));
+		DEBUG_LOG(("Caching %d bytes in chunk %d", numBytes, m_cachedChunks.size()));
 		m_totalBytes += numBytes;
 		return(numBytes);
 	};
 	virtual void flush(void) {
-		while (m_cachedChunks.size() != 0)//!m_cachedChunks.empty())
+		while (!m_cachedChunks.empty())//!m_cachedChunks.empty())
 		{
 			CachedChunk c = m_cachedChunks.front();
 			m_cachedChunks.pop_front();
 			try {
-				DEBUG_LOG(("Flushing %d bytes\n", c.size));
+				DEBUG_LOG(("Flushing %d bytes", c.size));
 				m_file->Write(c.pData, c.size);
 			} catch(...) {}
 			delete[] c.pData;
@@ -223,7 +223,7 @@ class CompressedCachedMFCFileOutputStream : public OutputStream
 		c.pData = tmp;
 		c.size = numBytes;
 		m_cachedChunks.push_back(c);
-		//DEBUG_LOG(("Caching %d bytes in chunk %d\n", numBytes, m_cachedChunks.size()));
+		//DEBUG_LOG(("Caching %d bytes in chunk %d", numBytes, m_cachedChunks.size()));
 		m_totalBytes += numBytes;
 		return(numBytes);
 	};
@@ -232,12 +232,12 @@ class CompressedCachedMFCFileOutputStream : public OutputStream
 			return;
 		UnsignedByte *srcBuffer = NEW UnsignedByte[m_totalBytes];
 		UnsignedByte *insertPos = srcBuffer;
-		while (m_cachedChunks.size() != 0)
+		while (!m_cachedChunks.empty())
 		{
 			CachedChunk c = m_cachedChunks.front();
 			m_cachedChunks.pop_front();
 			try {
-				//DEBUG_LOG(("Flushing %d bytes\n", c.size));
+				//DEBUG_LOG(("Flushing %d bytes", c.size));
 				memcpy(insertPos, c.pData, c.size);
 				insertPos += c.size;
 			} catch(...) {}
@@ -256,9 +256,9 @@ class CompressedCachedMFCFileOutputStream : public OutputStream
 		Int compressedLen = CompressionManager::getMaxCompressedSize( m_totalBytes, compressionToUse );
 		UnsignedByte *destBuffer = NEW UnsignedByte[compressedLen];
 		compressedLen = CompressionManager::compressData( compressionToUse, srcBuffer, m_totalBytes, destBuffer, compressedLen );
-		DEBUG_LOG(("Compressed %d bytes to %d bytes - compression of %g%%\n", m_totalBytes, compressedLen,
+		DEBUG_LOG(("Compressed %d bytes to %d bytes - compression of %g%%", m_totalBytes, compressedLen,
 			compressedLen/(Real)m_totalBytes*100.0f));
-		DEBUG_ASSERTCRASH(compressedLen, ("Failed to compress!\n"));
+		DEBUG_ASSERTCRASH(compressedLen, ("Failed to compress!"));
 		if (compressedLen)
 		{
 			m_file->Write(destBuffer, compressedLen);
@@ -280,7 +280,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 	ar.Flush();
 	m_waypointTableNeedsUpdate = true;
 	if (ar.IsStoring() && m_heightMap)
-	{	
+	{
 		try {
 			Int i;
 			MapPreview mPreview;
@@ -288,7 +288,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 
 			CompressedCachedMFCFileOutputStream theStream(ar.GetFile());
 			DataChunkOutput *chunkWriter = new DataChunkOutput(&theStream);
-			
+
 
 			m_heightMap->saveToFile(*chunkWriter);
  			/***************WAYPOINTS DATA ***************/
@@ -314,7 +314,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 		WorldHeightMapEdit *pOldHeightMap = m_heightMap;
 		CString pth = ar.GetFile()->GetFilePath();
 		CachedFileInputStream theInputStream;
-		if (theInputStream.open(AsciiString((const char *)pth))) 
+		if (theInputStream.open(AsciiString((const char *)pth)))
 		try {
 
 			WbApp()->selectPointerTool();
@@ -332,7 +332,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 				DataChunkInput file( pStrm );
 				if (file.isValidFileType()) {	// Backwards compatible files aren't valid data chunk files.
 					// Read the waypoints.
-					file.registerParser( AsciiString("WaypointsList"), AsciiString::TheEmptyString, ParseWaypointDataChunk );
+					file.registerParser( "WaypointsList", AsciiString::TheEmptyString, ParseWaypointDataChunk );
 					if (!file.parse(this)) {
 						throw(ERROR_CORRUPT_FILE_FORMAT);
 					}
@@ -352,13 +352,13 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 			m_heightMap->optimizeTiles(); // force to optimize tileset
 			SetHeightMap(m_heightMap, true);
 			Coord3D center;
-			center.x = MAP_XY_FACTOR*m_heightMap->getXExtent()/2; 
+			center.x = MAP_XY_FACTOR*m_heightMap->getXExtent()/2;
 			center.y = MAP_XY_FACTOR*m_heightMap->getYExtent()/2;
 			center.x -= m_heightMap->getBorderSize();
 			center.y -= m_heightMap->getBorderSize();
 			/* update objects. */
 			AsciiString startingCamName = TheNameKeyGenerator->keyToName(TheKey_InitialCameraPosition);
-			
+
 			TheLayersList->resetLayers();
 			AsciiString layerName;
 			Bool exists;
@@ -370,7 +370,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 			TheLayersList->disableUpdates();
 			MapObject *pMapObj = MapObject::getFirstMapObject();
 			while (pMapObj) {
-								
+
 				// Then, add it to the Layers List
 				layerName = pMapObj->getProperties()->getAsciiString(TheKey_objectLayer, &exists);
 				if (exists) {
@@ -422,11 +422,11 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 
 AsciiString ConvertName(AsciiString name)
 {
-	char oldName[256];
+	const char* replacePrefix = "Fundamentalist";
+	const size_t offset = name.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
 	char newName[256];
-	strcpy(oldName, name.str());
 	strcpy(newName, "GLA");
-	strcat(newName, oldName+strlen("Fundamentalist"));
+	strlcat(newName, name.str() + offset, ARRAY_SIZE(newName));
 	AsciiString swapName;
 	swapName.set(newName);
 	const ThingTemplate *tt = TheThingFactory->findTemplate(swapName);
@@ -438,11 +438,11 @@ AsciiString ConvertName(AsciiString name)
 
 AsciiString ConvertFaction(AsciiString name)
 {
-	char oldName[256];
+	const char* replacePrefix = "FactionFundamentalist";
+	const size_t offset = name.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
 	char newName[256];
-	strcpy(oldName, name.str());
 	strcpy(newName, "FactionGLA");
-	strcat(newName, oldName+strlen("FactionFundamentalist"));
+	strlcat(newName, name.str() + offset, ARRAY_SIZE(newName));
 	AsciiString swapName;
 	swapName.set(newName);
 	const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(swapName));
@@ -454,7 +454,7 @@ AsciiString ConvertFaction(AsciiString name)
 
 void CWorldBuilderDoc::validate(void)
 {
-	DEBUG_LOG(("Validating\n"));
+	DEBUG_LOG(("Validating"));
 
 	Dict swapDict;
 	Bool changed = false;
@@ -462,16 +462,16 @@ void CWorldBuilderDoc::validate(void)
 
 	// verify/fix the build lists
 	for (int side=0; side<TheSidesList->getNumSides(); side++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(side); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(side);
 
 		AsciiString tmplname = pSide->getDict()->getAsciiString(TheKey_playerFaction);
 		const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(tmplname));
 		if (!pt) {
-			DEBUG_LOG(("Faction %s could not be found in sides list!\n", tmplname.str()));
+			DEBUG_LOG(("Faction %s could not be found in sides list!", tmplname.str()));
 			if (tmplname.startsWith("FactionFundamentalist")) {
 				swapName = ConvertFaction(tmplname);
 				if (swapName != AsciiString::TheEmptyString) {
-					DEBUG_LOG(("Changing Faction from %s to %s\n", tmplname.str(), swapName.str()));
+					DEBUG_LOG(("Changing Faction from %s to %s", tmplname.str(), swapName.str()));
 					pSide->getDict()->setAsciiString(TheKey_playerFaction, swapName);
 				}
 			}
@@ -483,7 +483,7 @@ void CWorldBuilderDoc::validate(void)
 			if (name.startsWith("Fundamentalist")) {
 				swapName = ConvertName(name);
 				if (swapName != AsciiString::TheEmptyString) {
-					DEBUG_LOG(("Changing BuildList from %s to %s\n", name.str(), swapName.str()));
+					DEBUG_LOG(("Changing BuildList from %s to %s", name.str(), swapName.str()));
 					pBuild->setTemplateName(swapName);
 				}
 			}
@@ -498,7 +498,7 @@ void CWorldBuilderDoc::validate(void)
 		if (type.startsWith("Fundamentalist")) {					\
 			swapName = ConvertName(type);										\
 			if (swapName != AsciiString::TheEmptyString) {	\
-				DEBUG_LOG(("Changing Team Ref from %s to %s\n", type.str(), swapName.str())); \
+				DEBUG_LOG(("Changing Team Ref from %s to %s", type.str(), swapName.str())); \
 				teamDict->setAsciiString(key, swapName);			\
 			}																								\
 		}																									\
@@ -533,7 +533,7 @@ void CWorldBuilderDoc::validate(void)
 		// at this point, only objects with models and teams should be left to process
 
 		// start by verifying the ThingTemplate for the object.
-		// swapDict contains a 'history' of missing model swaps done this load, so all objects with a 
+		// swapDict contains a 'history' of missing model swaps done this load, so all objects with a
 		// particular name are replaced with the exact same model.
 		AsciiString name = pMapObj->getName();
 		if (pMapObj->getThingTemplate() == NULL)
@@ -566,14 +566,14 @@ void CWorldBuilderDoc::validate(void)
 				}
 			}
 			swapName = swapDict.getAsciiString(NAMEKEY(name), &exists);
-			if (exists) 
+			if (exists)
 			{
 				const ThingTemplate *tt = TheThingFactory->findTemplate(swapName);
 				if (tt) {
 					changed = true;
 					pMapObj->setName(swapName);
 					pMapObj->setThingTemplate(tt);
-					DEBUG_LOG(("Changing Map Object from %s to %s\n", name.str(), swapName.str()));
+					DEBUG_LOG(("Changing Map Object from %s to %s", name.str(), swapName.str()));
 				}
 			}
 		}
@@ -592,23 +592,23 @@ void CWorldBuilderDoc::validate(void)
 					AsciiString tmplname = pSide->getDict()->getAsciiString(TheKey_playerFaction);
 					const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(tmplname));
 					if (!pt) {
-						DEBUG_LOG(("Faction %s could not be found in sides list!\n", tmplname.str()));
+						DEBUG_LOG(("Faction %s could not be found in sides list!", tmplname.str()));
 						if (tmplname.startsWith("FactionFundamentalist")) {
 							swapName = ConvertFaction(tmplname);
 							if (swapName != AsciiString::TheEmptyString) {
-								DEBUG_LOG(("Changing Faction from %s to %s\n", tmplname.str(), swapName.str()));
+								DEBUG_LOG(("Changing Faction from %s to %s", tmplname.str(), swapName.str()));
 								pSide->getDict()->setAsciiString(TheKey_playerFaction, swapName);
 							}
 						}
 					}
 				} else {
-					DEBUG_LOG(("Side %s could not be found in sides list!\n", teamOwner.str()));
+					DEBUG_LOG(("Side %s could not be found in sides list!", teamOwner.str()));
 				}
 			} else {
-				DEBUG_LOG(("Team %s could not be found in sides list!\n", teamName.str()));
+				DEBUG_LOG(("Team %s could not be found in sides list!", teamName.str()));
 			}
 		} else {
-			DEBUG_LOG(("Object %s does not have a team at all!\n", name.str()));
+			DEBUG_LOG(("Object %s does not have a team at all!", name.str()));
 		}
 	}
 }
@@ -618,13 +618,13 @@ void CWorldBuilderDoc::OnJumpToGame()
 	try {
 		DoFileSave();
 		CString filename;
-		DEBUG_LOG(("strTitle=%s strPathName=%s\n", m_strTitle, m_strPathName));
+		DEBUG_LOG(("strTitle=%s strPathName=%s", m_strTitle, m_strPathName));
 		if (strstr(m_strPathName, TheGlobalData->getPath_UserData().str()) != NULL)
-			filename.Format("%sMaps\\%s", TheGlobalData->getPath_UserData().str(), m_strTitle);
+			filename.Format("%sMaps\\%s", TheGlobalData->getPath_UserData().str(), static_cast<const char*>(m_strTitle));
 		else
-			filename.Format("Maps\\%s", m_strTitle);
+			filename.Format("Maps\\%s", static_cast<const char*>(m_strTitle));
 
-		/*int retval =*/ _spawnl(_P_NOWAIT, "\\projects\\rts\\run\\rtsi.exe", "ignored", "-scriptDebug", "-win", "-file", filename, NULL);
+		/*int retval =*/ _spawnl(_P_NOWAIT, "\\projects\\rts\\run\\rtsi.exe", "ignored", "-scriptDebug", "-win", "-file", static_cast<const char*>(filename), NULL);
 	} catch (...) {
 	}
 }
@@ -764,8 +764,8 @@ BOOL CWorldBuilderDoc::DoSave(LPCTSTR lpszPathName, BOOL bReplace)
 * CWorldBuilderDoc::ParseWaypointDataChunk - read a waypoint chunk.
 * Format is the newer CHUNKY format.
 *	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool CWorldBuilderDoc::ParseWaypointDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -777,8 +777,8 @@ Bool CWorldBuilderDoc::ParseWaypointDataChunk(DataChunkInput &file, DataChunkInf
 * CWorldBuilderDoc::ParseWaypointData - read waypoint data chunk.
 * Format is the newer CHUNKY format.
 *	See WorldBuilderDoc.cpp for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool CWorldBuilderDoc::ParseWaypointData(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -787,7 +787,7 @@ Bool CWorldBuilderDoc::ParseWaypointData(DataChunkInput &file, DataChunkInfo *in
 	for (i=0; i<m_numWaypointLinks; i++) {
 		this->m_waypointLinks[i].waypoint1 = file.readInt();
 		this->m_waypointLinks[i].waypoint2 = file.readInt();
-		//DEBUG_LOG(("Waypoint link from %d to %d\n", m_waypointLinks[i].waypoint1, m_waypointLinks[i].waypoint2));
+		//DEBUG_LOG(("Waypoint link from %d to %d", m_waypointLinks[i].waypoint1, m_waypointLinks[i].waypoint2));
 	}
 	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return true;
@@ -908,7 +908,7 @@ void CWorldBuilderDoc::AddAndDoUndoable(Undoable *pUndo)
 	}
 }
 
-void CWorldBuilderDoc::OnEditRedo() 
+void CWorldBuilderDoc::OnEditRedo()
 {
 	Undoable *pUndo = m_undoList;
 	m_needAutosave = true;
@@ -928,12 +928,12 @@ void CWorldBuilderDoc::OnEditRedo()
 	}
 }
 
-void CWorldBuilderDoc::OnUpdateEditRedo(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateEditRedo(CCmdUI* pCmdUI)
 {
 	pCmdUI->Enable(m_undoList!=NULL && m_curRedo>0);
 }
 
-void CWorldBuilderDoc::OnEditUndo() 
+void CWorldBuilderDoc::OnEditUndo()
 {
 	Undoable *pUndo = m_undoList;
 	m_needAutosave = true;
@@ -959,7 +959,7 @@ void CWorldBuilderDoc::OnTogglePitchAndRotation( void )
 	}
 }
 
-void CWorldBuilderDoc::OnUpdateEditUndo(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateEditUndo(CCmdUI* pCmdUI)
 {
 	Bool canUndo=false;
 	if (m_undoList!=NULL) {
@@ -979,7 +979,7 @@ void CWorldBuilderDoc::OnUpdateEditUndo(CCmdUI* pCmdUI)
 }
 
 
-void CWorldBuilderDoc::OnTsInfo() 
+void CWorldBuilderDoc::OnTsInfo()
 {
 	if (m_heightMap) {
 		m_heightMap->showTileStatusInfo();
@@ -987,7 +987,7 @@ void CWorldBuilderDoc::OnTsInfo()
 }
 
 
-void CWorldBuilderDoc::OnTsCanonical() 
+void CWorldBuilderDoc::OnTsCanonical()
 {
 	if (m_heightMap) {
 
@@ -998,19 +998,19 @@ void CWorldBuilderDoc::OnTsCanonical()
 			updateHeightMap(htMapEditCopy, false, partialRange);
 			WBDocUndoable *pUndo = new WBDocUndoable(this, htMapEditCopy);
 			this->AddAndDoUndoable(pUndo);
-			REF_PTR_RELEASE(pUndo); // belongs to this now.	
+			REF_PTR_RELEASE(pUndo); // belongs to this now.
 		} else {
 			::Beep(1000,500);
 		}
 		REF_PTR_RELEASE(htMapEditCopy);
-	}	
+	}
 }
 
-void CWorldBuilderDoc::OnUpdateTsCanonical(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateTsCanonical(CCmdUI* pCmdUI)
 {
 }
 
-void CWorldBuilderDoc::OnFileResize() 
+void CWorldBuilderDoc::OnFileResize()
 {
 	TNewHeightInfo hi;
 	hi.initialHeight = 8;
@@ -1030,7 +1030,7 @@ void CWorldBuilderDoc::OnFileResize()
 	WorldHeightMapEdit *htMapEditCopy = GetHeightMap()->duplicate();
 	if (htMapEditCopy == NULL) return;
 	Coord3D objOffset;
-	if (htMapEditCopy->resize(hi.xExtent, hi.yExtent, hi.initialHeight, hi.borderWidth, 
+	if (htMapEditCopy->resize(hi.xExtent, hi.yExtent, hi.initialHeight, hi.borderWidth,
 		hi.anchorTop, hi.anchorBottom, hi.anchorLeft, hi.anchorRight, &objOffset)) {  // does all the work.
 		WBDocUndoable *pUndo = new WBDocUndoable(this, htMapEditCopy, &objOffset);
 		this->AddAndDoUndoable(pUndo);
@@ -1054,7 +1054,7 @@ void CWorldBuilderDoc::OnFileResize()
 }
 
 
-void CWorldBuilderDoc::OnTsRemap() 
+void CWorldBuilderDoc::OnTsRemap()
 {
 	if (m_heightMap) {
 		WorldHeightMapEdit *htMapEditCopy = GetHeightMap()->duplicate();
@@ -1069,7 +1069,7 @@ void CWorldBuilderDoc::OnTsRemap()
 			::Beep(1000,500);
 		}
 		REF_PTR_RELEASE(htMapEditCopy);
-	}	
+	}
 }
 
 /* static */ CWorldBuilderDoc *CWorldBuilderDoc::GetActiveDoc()
@@ -1090,7 +1090,7 @@ void CWorldBuilderDoc::OnTsRemap()
 		}
 	}
 
-#else 
+#else
 // only works for SDI, not MDI
 	return (CWorldBuilderDoc*)CMainFrame::GetMainFrame()->GetActiveDocument();
 #endif
@@ -1210,7 +1210,16 @@ BOOL CWorldBuilderDoc::OnNewDocument()
 	m_waypointTableNeedsUpdate = true;
 	m_curWaypointID = 0;
 	WbApp()->selectPointerTool();
+
+	// Make sure that all the old units are removed from the list.
+	// Bug fix by MLL 1/14/03
+	TheLayersList->enableUpdates();
+	TheLayersList->resetLayers();
+	TheLayersList->disableUpdates();
+
+	// TheSuperHackers @bugfix Caball009 20/06/2025 Must not delete polygon triggers before calling enableUpdates.
 	PolygonTrigger::deleteTriggers();
+
 	TheSidesList->clear();
 	TheSidesList->validateSides();
 
@@ -1223,7 +1232,7 @@ BOOL CWorldBuilderDoc::OnNewDocument()
 	// note - mHeight map has ref count of 1.
 
 	// Create a default water area.
-	PolygonTrigger *pTrig = newInstance(PolygonTrigger)(4); 
+	PolygonTrigger *pTrig = newInstance(PolygonTrigger)(4);
 	ICoord3D loc;
 	pTrig->setWaterArea(true);
 	loc.x = -hi.borderWidth*MAP_XY_FACTOR;
@@ -1322,7 +1331,7 @@ void CWorldBuilderDoc::updateHeightMap(WorldHeightMap *htMap, Bool partial, cons
 	}
 }
 
-BOOL CWorldBuilderDoc::OnOpenDocument(LPCTSTR lpszPathName) 
+BOOL CWorldBuilderDoc::OnOpenDocument(LPCTSTR lpszPathName)
 {
 #ifdef ONLY_ONE_AT_A_TIME
 	if (gAlreadyOpen) {
@@ -1330,8 +1339,8 @@ BOOL CWorldBuilderDoc::OnOpenDocument(LPCTSTR lpszPathName)
 		return FALSE;
 	}
 #endif
-	
-	// Open document dialog may change working directory, 
+
+	// Open document dialog may change working directory,
 	// let the app know what it was for future opens, and change it back.
 	char buf[_MAX_PATH];
 	::GetCurrentDirectory(_MAX_PATH, buf);
@@ -1339,43 +1348,41 @@ BOOL CWorldBuilderDoc::OnOpenDocument(LPCTSTR lpszPathName)
 	// clear out map-specific text
 	TheGameText->reset();
 	AsciiString s = lpszPathName;
-	while (s.getLength() && s.getCharAt(s.getLength()-1) != '\\')
-		s.removeLastChar();
+	const char* lastSep = s.reverseFind('\\');
+	if (lastSep != NULL)
+	{
+		s.truncateTo(lastSep - s.str() + 1);
+	}
 	s.concat("map.str");
-	DEBUG_LOG(("Looking for map-specific text in [%s]\n", s.str()));
+	DEBUG_LOG(("Looking for map-specific text in [%s]", s.str()));
 	TheGameText->initMapStringFile(s);
 
 	WbApp()->setCurrentDirectory(AsciiString(buf));
 	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	if (char *pEnd = strrchr(buf, '\\')) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);
 
 	if (!CDocument::OnOpenDocument(lpszPathName))
 		return FALSE;
-	
+
 	Create3DView();
-	
+
 	return TRUE;
 }
 
 //=============================================================================
 // CWorldBuilderView::getCellIndexFromPoint
 //=============================================================================
-/** Given a cursor location, return the x and y index into the height map. 
+/** Given a cursor location, return the x and y index into the height map.
 If the location is outside the height map, returns false. */
 //=============================================================================
 Bool CWorldBuilderDoc::getCellIndexFromCoord(Coord3D cpt, CPoint *ndxP)
 {
 	// Set up default return value.
 	ndxP->x = -1;
-	ndxP->y = -1;	 
+	ndxP->y = -1;
 	Bool inMap = true;
 
 	WorldHeightMapEdit *pMap = GetHeightMap();
@@ -1397,7 +1404,7 @@ Bool CWorldBuilderDoc::getCellIndexFromCoord(Coord3D cpt, CPoint *ndxP)
 	Int yIndex = floor(cpt.y/MAP_XY_FACTOR);
 
 	yIndex += pMap->getBorderSize();
-	
+
 
 	// If negative, outside of map so return default.
 	if (yIndex<0) {
@@ -1436,7 +1443,7 @@ void CWorldBuilderDoc::getCoordFromCellIndex(CPoint ndx, Coord3D* pt)
 // CWorldBuilderView::getAllIndexesInRect
 //=============================================================================
 //=============================================================================
-Bool CWorldBuilderDoc::getAllIndexesInRect(const Coord3D* bl, const Coord3D* br, 
+Bool CWorldBuilderDoc::getAllIndexesInRect(const Coord3D* bl, const Coord3D* br,
 																					 const Coord3D* tl, const Coord3D* tr,
 																					 Int widthOutside, VecHeightMapIndexes* allIndices)
 {
@@ -1447,9 +1454,9 @@ Bool CWorldBuilderDoc::getAllIndexesInRect(const Coord3D* bl, const Coord3D* br,
 	}
 
 	Coord3D center = { (bl->x + tr->x) / 2, (bl->y + tr->y) / 2, (bl->z + tr->z) / 2 };
-	
+
 	allIndices->clear();
-	
+
 	CPoint ndx;
 
 	FindIndexNearest(this, &center, &ndx, PREFER_CENTER);
@@ -1460,21 +1467,21 @@ Bool CWorldBuilderDoc::getAllIndexesInRect(const Coord3D* bl, const Coord3D* br,
 
 	FindIndexNearest(this, &center, &ndx, PREFER_TOP);
 	AddUniqueAndNeighbors(this, bl, br, tl, tr, ndx, allIndices);
-	
+
 	FindIndexNearest(this, &center, &ndx, PREFER_RIGHT);
 	AddUniqueAndNeighbors(this, bl, br, tl, tr, ndx, allIndices);
-	
+
 	FindIndexNearest(this, &center, &ndx, PREFER_BOTTOM);
 	AddUniqueAndNeighbors(this, bl, br, tl, tr, ndx, allIndices);
-	
-	return (allIndices->size() > 0);
+
+	return (!allIndices->empty());
 }
 
 
 //=============================================================================
 // CWorldBuilderView::getCellPositionFromPoint
 //=============================================================================
-/** Given a pixel position, returns the x/y location in the height map.  This 
+/** Given a pixel position, returns the x/y location in the height map.  This
 will return real values, so a position can be 1.7, 2.4 or such.  If the position
 is not over the height map, return -1, -1. */
 //=============================================================================
@@ -1508,7 +1515,7 @@ void CWorldBuilderDoc::getObjArrowPoint(MapObject *pObj, Coord3D *location)
  	float angle = pObj->getAngle();
 	// The arrow starts in the +x direction.
 	Vector3 arrow(1.2f*MAP_XY_FACTOR, 0, 0);
-	// Rotate 
+	// Rotate
 	arrow.Rotate_Z(angle);
 	// Rotated.
 	location->x = arrow.X;
@@ -1519,18 +1526,18 @@ void CWorldBuilderDoc::getObjArrowPoint(MapObject *pObj, Coord3D *location)
 	//location->z += loc.z;
 }
 
-void CWorldBuilderDoc::OnEditLinkCenters() 
+void CWorldBuilderDoc::OnEditLinkCenters()
 {
 	m_linkCenters = !m_linkCenters;
 }
 
-void CWorldBuilderDoc::OnUpdateEditLinkCenters(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateEditLinkCenters(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_linkCenters?1:0);
 }
 
-BOOL CWorldBuilderDoc::CanCloseFrame(CFrameWnd* pFrame) 
-{	
+BOOL CWorldBuilderDoc::CanCloseFrame(CFrameWnd* pFrame)
+{
 	CView *pView = this->Get2DView();
 	if (pView && pView->GetParentFrame() == pFrame) {
 		return true; // can always close the 2d window.
@@ -1538,7 +1545,7 @@ BOOL CWorldBuilderDoc::CanCloseFrame(CFrameWnd* pFrame)
 	return SaveModified();
 }
 
-void CWorldBuilderDoc::OnViewTimeOfDay() 
+void CWorldBuilderDoc::OnViewTimeOfDay()
 {
 	WbView3d * pView = Get3DView();
 	if (pView) {
@@ -1546,7 +1553,7 @@ void CWorldBuilderDoc::OnViewTimeOfDay()
 	}
 }
 
-void CWorldBuilderDoc::OnWindow2dwindow() 
+void CWorldBuilderDoc::OnWindow2dwindow()
 {
 /*
 	CView *pView = this->Get2DView();
@@ -1563,7 +1570,7 @@ void CWorldBuilderDoc::OnWindow2dwindow()
 */
 }
 
-void CWorldBuilderDoc::OnUpdateWindow2dwindow(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateWindow2dwindow(CCmdUI* pCmdUI)
 {
 /*
 	CView *pView = this->Get2DView();
@@ -1574,14 +1581,14 @@ void CWorldBuilderDoc::OnUpdateWindow2dwindow(CCmdUI* pCmdUI)
 //=============================================================================
 // CWorldBuilderDoc::compressWaypointIds
 //=============================================================================
-/** Renumbers the waypoints and the links that reference them, removing any 
+/** Renumbers the waypoints and the links that reference them, removing any
 unused ids. */
 //=============================================================================
 void CWorldBuilderDoc::compressWaypointIds(void)
 {
 	updateWaypointTable();
 	m_curWaypointID = 0;
-	MapObject *pMapObj = NULL; 
+	MapObject *pMapObj = NULL;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj->isWaypoint()) {
 			Int nwpid = getNextWaypointID();
@@ -1628,10 +1635,10 @@ void CWorldBuilderDoc::compressWaypointIds(void)
 // CWorldBuilderDoc::updateWaypointTable
 //=============================================================================
 /** If any waypoints have changed (m_waypointTableNeedsUpdate) updates the waypoint
-table.  The waypoint table is used to locate waypoints by id, without searching 
+table.  The waypoint table is used to locate waypoints by id, without searching
 the objects list. (See getWaypointByID()) */
 //=============================================================================
-void CWorldBuilderDoc::updateWaypointTable(void) 
+void CWorldBuilderDoc::updateWaypointTable(void)
 {
 	if (m_waypointTableNeedsUpdate) {
 		m_waypointTableNeedsUpdate=false;
@@ -1640,7 +1647,7 @@ void CWorldBuilderDoc::updateWaypointTable(void)
 			m_waypointTable[i] = NULL;
 		}
 
-		MapObject *pMapObj = NULL; 
+		MapObject *pMapObj = NULL;
 		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 			if (pMapObj->isWaypoint()) {
 				Int id = pMapObj->getWaypointID();
@@ -1664,7 +1671,7 @@ void CWorldBuilderDoc::updateWaypointTable(void)
 //=============================================================================
 /** Adds a waypoint link between two waypoints, referenced by waypoint id. */
 //=============================================================================
-void CWorldBuilderDoc::addWaypointLink(Int waypointID1, Int waypointID2) 
+void CWorldBuilderDoc::addWaypointLink(Int waypointID1, Int waypointID2)
 {
 	Int i;
 	for (i=0; i<m_numWaypointLinks; i++) {
@@ -1686,7 +1693,7 @@ void CWorldBuilderDoc::addWaypointLink(Int waypointID1, Int waypointID2)
 //=============================================================================
 /** Removes a waypoint link between two waypoints, referenced by waypoint id. */
 //=============================================================================
-void CWorldBuilderDoc::removeWaypointLink(Int waypointID1, Int waypointID2) 
+void CWorldBuilderDoc::removeWaypointLink(Int waypointID1, Int waypointID2)
 {
 	Int i;
 	for (i=0; i<m_numWaypointLinks; i++) {
@@ -1716,7 +1723,7 @@ MapObject *CWorldBuilderDoc::getWaypointByID(Int waypointID)
 			return pObj;
 		}
 		DEBUG_ASSERTCRASH(pObj==NULL, ("Waypoint links to an obj that isn't a waypoint."));
-	} 
+	}
 	return NULL;
 }
 
@@ -1814,12 +1821,12 @@ void CWorldBuilderDoc::updateLWL(MapObject *pWay, MapObject *pSrcWay)
 				if (pObj == pCurWay) {
 					process = true;
 					pNewWay = m_waypointTable[waypointID2];
-				} 
+				}
 				pObj = m_waypointTable[waypointID2];
 				if (pObj == pCurWay) {
 					process = true;
 					pNewWay = m_waypointTable[waypointID1];
-				} 
+				}
 			}
 			if (process) {
 				m_waypointLinks[i].processedFlag = true;
@@ -1836,7 +1843,7 @@ void CWorldBuilderDoc::updateLWL(MapObject *pWay, MapObject *pSrcWay)
 //=============================================================================
 // CWorldBuilderDoc::getWaypointLink
 //=============================================================================
-/** Returns the two waypoint ID's that are linked.  Note that due to edits, one 
+/** Returns the two waypoint ID's that are linked.  Note that due to edits, one
 or both waypoints may have been deleted. */
 //=============================================================================
 void CWorldBuilderDoc::getWaypointLink(Int ndx, Int *waypointID1, Int *waypointID2)
@@ -1852,10 +1859,10 @@ void CWorldBuilderDoc::getWaypointLink(Int ndx, Int *waypointID1, Int *waypointI
 //=============================================================================
 // CWorldBuilderDoc::waypointLinkExists
 //=============================================================================
-/** Returns true if the two waypoint ID's are linked.  Note that due to edits, one 
+/** Returns true if the two waypoint ID's are linked.  Note that due to edits, one
 or both waypoints may have been deleted. */
 //=============================================================================
-Bool CWorldBuilderDoc::waypointLinkExists(Int waypointID1, Int waypointID2) 
+Bool CWorldBuilderDoc::waypointLinkExists(Int waypointID1, Int waypointID2)
 {
 	Int i;
 	for (i=0; i<m_numWaypointLinks; i++) {
@@ -1868,7 +1875,7 @@ Bool CWorldBuilderDoc::waypointLinkExists(Int waypointID1, Int waypointID2)
 }
 
 
-void CWorldBuilderDoc::OnViewReloadtextures() 
+void CWorldBuilderDoc::OnViewReloadtextures()
 {
 	WW3D::_Invalidate_Textures();
 	WorldHeightMapEdit *pMap = GetHeightMap();
@@ -1877,7 +1884,7 @@ void CWorldBuilderDoc::OnViewReloadtextures()
 	updateHeightMap(pMap, false, range);
 }
 
-void CWorldBuilderDoc::OnEditScripts() 
+void CWorldBuilderDoc::OnEditScripts()
 {
 	ScriptDialog script;
 	script.DoModal();
@@ -1893,11 +1900,11 @@ void CWorldBuilderDoc::OnViewHome()
 	MapObject *pMapObj = MapObject::getFirstMapObject();
 
 	// set pos to be the coordinates of the center of the map
-	pos.x = MAP_XY_FACTOR*m_heightMap->getXExtent()/2; 
+	pos.x = MAP_XY_FACTOR*m_heightMap->getXExtent()/2;
 	pos.y = MAP_XY_FACTOR*m_heightMap->getYExtent()/2;
 	pos.x -= MAP_XY_FACTOR*m_heightMap->getBorderSize();
 	pos.y -= MAP_XY_FACTOR*m_heightMap->getBorderSize();
-	
+
 	// if waypoint "InitialCameraPosition" exists, replace pos with the appropriate coordinates
 	while (pMapObj) {
 		if (pMapObj->isWaypoint()) {
@@ -1918,19 +1925,19 @@ void CWorldBuilderDoc::OnViewHome()
 	}
 }
 
-void CWorldBuilderDoc::OnTexturesizingTile4x4() 
+void CWorldBuilderDoc::OnTexturesizingTile4x4()
 {
 #ifdef EVAL_TILING_MODES
 	WorldHeightMapEdit *pMap = GetHeightMap();
 	pMap->m_tileMode = WorldHeightMap::TILE_4x4;
 	IRegion2D range = {0,0,0,0};
 	updateHeightMap(pMap, false, range);
-#else 
+#else
 	::AfxMessageBox("Feature not currently enabled.", MB_OK);
 #endif
 }
 
-void CWorldBuilderDoc::OnUpdateTexturesizingTile4x4(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateTexturesizingTile4x4(CCmdUI* pCmdUI)
 {
 #ifdef EVAL_TILING_MODES
 	WorldHeightMapEdit *pMap = GetHeightMap();
@@ -1938,19 +1945,19 @@ void CWorldBuilderDoc::OnUpdateTexturesizingTile4x4(CCmdUI* pCmdUI)
 #endif
 }
 
-void CWorldBuilderDoc::OnTexturesizingTile6x6() 
+void CWorldBuilderDoc::OnTexturesizingTile6x6()
 {
 #ifdef EVAL_TILING_MODES
 	WorldHeightMapEdit *pMap = GetHeightMap();
 	pMap->m_tileMode = WorldHeightMap::TILE_6x6;
 	IRegion2D range = {0,0,0,0};
 	updateHeightMap(pMap, false, range);
-#else 
+#else
 	::AfxMessageBox("Feature not currently enabled.", MB_OK);
 #endif
 }
 
-void CWorldBuilderDoc::OnUpdateTexturesizingTile6x6(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateTexturesizingTile6x6(CCmdUI* pCmdUI)
 {
 #ifdef EVAL_TILING_MODES
 	WorldHeightMapEdit *pMap = GetHeightMap();
@@ -1958,19 +1965,19 @@ void CWorldBuilderDoc::OnUpdateTexturesizingTile6x6(CCmdUI* pCmdUI)
 #endif
 }
 
-void CWorldBuilderDoc::OnTexturesizingTile8x8() 
+void CWorldBuilderDoc::OnTexturesizingTile8x8()
 {
 #ifdef EVAL_TILING_MODES
 	WorldHeightMapEdit *pMap = GetHeightMap();
 	pMap->m_tileMode = WorldHeightMap::TILE_8x8;
 	IRegion2D range = {0,0,0,0};
 	updateHeightMap(pMap, false, range);
-#else 
+#else
 	::AfxMessageBox("Feature not currently enabled.", MB_OK);
 #endif
 }
 
-void CWorldBuilderDoc::OnUpdateTexturesizingTile8x8(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateTexturesizingTile8x8(CCmdUI* pCmdUI)
 {
 #ifdef EVAL_TILING_MODES
 	WorldHeightMapEdit *pMap = GetHeightMap();
@@ -1981,28 +1988,28 @@ void CWorldBuilderDoc::OnUpdateTexturesizingTile8x8(CCmdUI* pCmdUI)
 static AsciiString formatScriptLabel(Script *pScr) {
 	AsciiString fmt;
 	if (pScr->isSubroutine()) {
-		fmt.concat("[S "); 
+		fmt.concat("[S ");
 	} else {
-		fmt.concat("[ns "); 
+		fmt.concat("[ns ");
 	}
 	if (pScr->isActive()) {
-		fmt.concat("A "); 
+		fmt.concat("A ");
 	} else {
-		fmt.concat("na "); 
+		fmt.concat("na ");
 	}
 	if (pScr->isOneShot()) {
-		fmt.concat("D] ["); 
+		fmt.concat("D] [");
 	} else {
-		fmt.concat("nd] ["); 
+		fmt.concat("nd] [");
 	}
 	if (pScr->isEasy()) {
-		fmt.concat("E "); 
-	} 
+		fmt.concat("E ");
+	}
 	if (pScr->isNormal()) {
-		fmt.concat("N "); 
-	} 
+		fmt.concat("N ");
+	}
 	if (pScr->isHard()) {
-		fmt.concat("H]"); 
+		fmt.concat("H]");
 	} else {
 		fmt.concat("]");
 	}
@@ -2023,8 +2030,8 @@ static void writeScript(FILE *theLogFile, const char * str)
 
 #define DUMP_RAW_DICTS
 #ifdef DUMP_RAW_DICTS
-static void writeRawDict( FILE *theLogFile, const char* nm, const Dict* d ) 
-{ 
+static void writeRawDict( FILE *theLogFile, const char* nm, const Dict* d )
+{
 	if (!d)
 	{
 		fprintf(theLogFile, "Dict %s is null!\n", nm);
@@ -2082,48 +2089,39 @@ static void fprintUnit(FILE *theLogFile, Dict *teamDict, NameKeyType keyMinUnit,
 
 }
 
-void CWorldBuilderDoc::OnDumpDocToText(void) 
+void CWorldBuilderDoc::OnDumpDocToText(void)
 {
-	MapObject *pMapObj = NULL; 
+	MapObject *pMapObj = NULL;
 	const char* vetStrings[] = {"Green", "Regular", "Veteran", "Elite"};
 	const char* aggroStrings[] = {"Passive", "Normal", "Guard", "Hunt", "Agressive", "Sleep"};
 	AsciiString noOwner = "No Owner";
 	static FILE *theLogFile = NULL;
 	Bool open = false;
 	try {
-		char dirbuf[ _MAX_PATH ];
-		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
-		char *pEnd = dirbuf + strlen( dirbuf );
-		while( pEnd != dirbuf ) 
+		char curbuf[_MAX_PATH];
+		GetModuleFileName(NULL, curbuf, sizeof(curbuf));
+		if (char *pEnd = strrchr(curbuf, '\\'))
 		{
-			if( *pEnd == '\\' ) 
-			{
-				*(pEnd + 1) = 0;
-				break;
-			}
-			pEnd--;
+			*(pEnd + 1) = 0;
 		}
 
-		char curbuf[ _MAX_PATH ];
-
-		strcpy(curbuf, dirbuf);
-		strcat(curbuf, m_strTitle);
-		strcat(curbuf, ".txt");
+		strlcat(curbuf, m_strTitle, ARRAY_SIZE(curbuf));
+		strlcat(curbuf, ".txt", ARRAY_SIZE(curbuf));
 
 		theLogFile = fopen(curbuf, "w");
 		if (theLogFile == NULL)
 			throw;
 
 		open = true;
-		
+
 		fprintf(theLogFile,"\n\n\nDump of Doc Contents\n");
 
 #ifdef DUMP_RAW_DICTS
-	
+
 		writeRawDict(theLogFile, "WorldDict", MapObject::getWorldDict());
 
 		fprintf(theLogFile,"Raw Map Object\n");
-		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 		{
 			Dict *d = pMapObj->getProperties();
 			TeamsInfo *teamInfo = TheSidesList->findTeamInfo(d->getAsciiString(TheKey_originalOwner));
@@ -2226,7 +2224,7 @@ void CWorldBuilderDoc::OnDumpDocToText(void)
 			}
 		}
 		fprintf(theLogFile,"End of Units\n");
-		
+
 		fprintf(theLogFile,"\nObject Types summary\n");
 		{
 			Int totalObjectCount = 0;
@@ -2247,23 +2245,23 @@ void CWorldBuilderDoc::OnDumpDocToText(void)
 
 			fprintf(theLogFile, "Total Map Objects (with ThingTemplates): %d\n", totalObjectCount);
 
-			while (mapOfTemplates.size() > 0) {
+			while (!mapOfTemplates.empty()) {
 				std::map<AsciiString, Int>::iterator storedIt = mapOfTemplates.begin();
-				
+
 				for (it = mapOfTemplates.begin(); it != mapOfTemplates.end(); ++it) {
 					if (storedIt->second < it->second) {
 						storedIt = it;
 					}
 				}
 
-				fprintf(theLogFile, "Map Object: %s, Instances: %d\n", storedIt->first.str(), storedIt->second); 
-				
-				// Now, erase it. 
+				fprintf(theLogFile, "Map Object: %s, Instances: %d\n", storedIt->first.str(), storedIt->second);
+
+				// Now, erase it.
 				mapOfTemplates.erase(storedIt);
 			}
 		}
 		fprintf(theLogFile,"\nEnd of Object Types summary\n");
-		
+
 		// dump the waypoints
 		fprintf(theLogFile,"\nWaypoints\n");
 		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
@@ -2351,7 +2349,7 @@ writeRawDict( theLogFile, "TeamInfo",ti->getDict() );
 #endif
 				if (ti->getDict()->getAsciiString(TheKey_teamOwner) == name)
 				{
-					Bool exists;														
+					Bool exists;
 					AsciiString teamName = ti->getDict()->getAsciiString(TheKey_teamName);
 					AsciiString waypoint = ti->getDict()->getAsciiString(TheKey_teamHome, &exists);
 					CString pri;
@@ -2385,7 +2383,7 @@ writeRawDict( theLogFile, "TeamInfo",ti->getDict() );
 					if (script.isEmpty()) script="<none>";
 					fprintf(theLogFile, " OnAllClear='%s'\n", script.str());
 				}
-			}								
+			}
 		}
 		fprintf(theLogFile,"End of Teams\n");
 
@@ -2503,14 +2501,14 @@ void FindIndexNearest(CWorldBuilderDoc* pDoc, const Coord3D* point, CPoint* outN
 			break;
 		}
 	};
-	
+
 	pDoc->getCellIndexFromCoord(testPoint, outNdx);
 }
 
 Bool IndexInRect(CWorldBuilderDoc* pDoc, const Coord3D* bl, const Coord3D* tl, const Coord3D* br, const Coord3D* tr, CPoint* index)
 {
 	Coord3D testPoint;
-	pDoc->getCoordFromCellIndex(*index, &testPoint);	
+	pDoc->getCoordFromCellIndex(*index, &testPoint);
 	return PointInsideRect3D(bl, tl, br, tr, &testPoint);
 }
 
@@ -2535,7 +2533,7 @@ Bool AddUniqueAndNeighbors(CWorldBuilderDoc* pDoc, const Coord3D* bl, const Coor
 	// first left
 	ndx.x += 1;
 	AddUniqueAndNeighbors(pDoc, bl, tl, br, tr, ndx, allIndices);
-	
+
 	// then right
 	ndx.x -= 2;
 	AddUniqueAndNeighbors(pDoc,bl, tl, br, tr, ndx, allIndices);
@@ -2548,12 +2546,12 @@ Bool AddUniqueAndNeighbors(CWorldBuilderDoc* pDoc, const Coord3D* bl, const Coor
 	// then bottom
 	ndx.y -= 2;
 	AddUniqueAndNeighbors(pDoc, bl, tl, br, tr, ndx, allIndices);
-	
+
 	return true;
 }
 
 
-void CWorldBuilderDoc::OnRemoveclifftexmapping() 
+void CWorldBuilderDoc::OnRemoveclifftexmapping()
 {
 	if (::AfxMessageBox(IDS_CONFIRM_REMOVE_CLIFF_MAPPING, MB_YESNO) == IDYES) {
 		if (m_heightMap) {
@@ -2565,10 +2563,10 @@ void CWorldBuilderDoc::OnRemoveclifftexmapping()
 				updateHeightMap(htMapEditCopy, false, partialRange);
 				WBDocUndoable *pUndo = new WBDocUndoable(this, htMapEditCopy);
 				this->AddAndDoUndoable(pUndo);
-				REF_PTR_RELEASE(pUndo); // belongs to this now.	
-			} 
+				REF_PTR_RELEASE(pUndo); // belongs to this now.
+			}
 			REF_PTR_RELEASE(htMapEditCopy);
-		}	
+		}
 	}
 }
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilderView.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilderView.cpp
index be53dd5c05f..171d50879a2 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilderView.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilderView.cpp
@@ -18,12 +18,12 @@
 
 // FILE: WorldBuilderView.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 
 #include "StdAfx.h"
@@ -57,7 +57,7 @@
 #include "Common/Debug.h"
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 #define ROUND(x) (Int)(floor((x)+0.5))
 
@@ -65,7 +65,7 @@
 // CWorldBuilderView
 
 //-----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //-----------------------------------------------------------------------------
 
 /////////////////////////////////////////////////////////////////////////////
@@ -90,7 +90,7 @@ CWorldBuilderView::CWorldBuilderView() :
 
 	show = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "ShowTexture", 1);
 	m_showTexture = (show!=0);
-	
+
 
 }
 
@@ -103,11 +103,11 @@ BOOL CWorldBuilderView::PreCreateWindow(CREATESTRUCT& cs)
 	return WbView::PreCreateWindow(cs);
 }
 
-int CWorldBuilderView::OnCreate(LPCREATESTRUCT lpCreateStruct) 
+int CWorldBuilderView::OnCreate(LPCREATESTRUCT lpCreateStruct)
 {
 	if (WbView::OnCreate(lpCreateStruct) == -1)
 		return -1;
-	
+
 	return 0;
 }
 
@@ -160,10 +160,10 @@ void CWorldBuilderView::setCellSize(Int cellSize)
 	}
 }
 
-void CWorldBuilderView::setCenterInView(Real x, Real y) 
+void CWorldBuilderView::setCenterInView(Real x, Real y)
 {
 	if (x != m_centerPt.X || y != m_centerPt.Y) {
-		m_centerPt.X=x; 
+		m_centerPt.X=x;
 		m_centerPt.Y=y;
 		adjustDocSize();
 		Invalidate();
@@ -177,7 +177,7 @@ void CWorldBuilderView::setShowContours(Bool show)
 	Invalidate();
 }
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -259,11 +259,11 @@ DWORD CWorldBuilderView::getColorForHeight(UnsignedByte ht)
 //=============================================================================
 /** This draws the window. */
 //=============================================================================
-void CWorldBuilderView::OnPaint() 
+void CWorldBuilderView::OnPaint()
 {
 	CWorldBuilderDoc* pDoc = WbDoc();
 	ASSERT_VALID(pDoc);
-	
+
 	// If we are editing with a tool, draw the map being edited, if one exists.
 	WorldHeightMapEdit *pMap = getTrackingHeightMap();
 
@@ -326,7 +326,7 @@ void CWorldBuilderView::OnPaint()
 		dc.FillSolidRect(&rect, RGB(255,255,255));
 	}
 	if (minJ == 0) {
-		rect = clientRect; // Do bottom. 
+		rect = clientRect; // Do bottom.
 		rect.top = (pMap->getYExtent())*m_cellSize;
 		dc.FillSolidRect(&rect, RGB(255,255,255));
 	}
@@ -398,7 +398,7 @@ void CWorldBuilderView::OnPaint()
 			rect.left = lpt.x - m_cellSize;
 			rect.right = lpt.x + m_cellSize;
 			// If visible in the update region, draw it.
-			if (updateRgn.RectInRegion(&rect)) 
+			if (updateRgn.RectInRegion(&rect))
 			{
 				drawObjectInView(&dc, pMapObj);
 			}
@@ -471,14 +471,14 @@ void CWorldBuilderView::drawObjectInView(CDC *pDc, MapObject *pMapObj)
 	savPen = pDc->SelectObject(&ovalPen);
 	savBrush = pDc->SelectObject(&brush);
 	// Draw the object's circle.
-	pDc->Ellipse(&circle);	 
+	pDc->Ellipse(&circle);
 
 	// Draw the arrow
 	Int delta = (m_cellSize+4)/4;
 	Int smallDelta = (delta+4)/4;
-	
+
  	float angle = pMapObj->getAngle();
-	
+
 	Vector3 head1(m_cellSize - delta, smallDelta, 0);
 	Vector3 head2(m_cellSize - delta, -smallDelta, 0);
 	head1.Rotate_Z(-angle);
@@ -544,7 +544,7 @@ void CWorldBuilderView::drawContours(CDC *pDc, CRgn *pRgn, Int minX, Int maxX, I
 {
 	CWorldBuilderDoc* pDoc = WbDoc();
 	ASSERT_VALID(pDoc);
-	
+
 	WorldHeightMapEdit *pMap = getTrackingHeightMap();
 	// We do cell and cell+1 in the loop, so trim back the max limits.
 	if (maxX == pMap->getXExtent()) maxX--;
@@ -552,7 +552,7 @@ void CWorldBuilderView::drawContours(CDC *pDc, CRgn *pRgn, Int minX, Int maxX, I
 
 	Int curHeight;
 	Bool didWater = false;  // We do the water level first, then step through the contours.
-	for (curHeight = ContourOptions::getContourOffset(); curHeight < 255; 
+	for (curHeight = ContourOptions::getContourOffset(); curHeight < 255;
 		curHeight+= ContourOptions::getContourStep()) {
 		Bool doingWater = false;
 		CPen pen;
@@ -724,13 +724,13 @@ void CWorldBuilderView::drawContours(CDC *pDc, CRgn *pRgn, Int minX, Int maxX, I
 			curHeight = ContourOptions::getContourOffset() - ContourOptions::getContourStep();
 		}
 	}
-}	
+}
 
 
 //=============================================================================
 // CWorldBuilderView::interpolate
 //=============================================================================
-/** Given 2 points, pt1 and pt2, with different height valus ht1 and ht2, 
+/** Given 2 points, pt1 and pt2, with different height valus ht1 and ht2,
 determines where the height ht occurs along the line. */
 //=============================================================================
 void CWorldBuilderView::interpolate(CPoint *pt, Int ht, CPoint pt1, Int ht1, CPoint pt2, Int ht2)
@@ -749,11 +749,11 @@ void CWorldBuilderView::interpolate(CPoint *pt, Int ht, CPoint pt1, Int ht1, CPo
 	pt->x = (pt1.x*d1 + pt2.x*d2)/delta;
 	pt->y = (pt1.y*d1 + pt2.y*d2)/delta;
 }
-	
+
 //=============================================================================
 // CWorldBuilderView::drawMyTexture
 //=============================================================================
-/** Draws the tile data rgbData at pRect.  The tile data is square 4 byte 
+/** Draws the tile data rgbData at pRect.  The tile data is square 4 byte
 data, width pixels wide and tall. */
 //=============================================================================
 void CWorldBuilderView::drawMyTexture(CDC *pDc, CRect *pRect, Int width, UnsignedByte *rgbData)
@@ -772,7 +772,7 @@ void CWorldBuilderView::drawMyTexture(CDC *pDc, CRect *pRect, Int width, Unsigne
 	bi.bmiHeader.biClrUsed = 0;
 	bi.bmiHeader.biClrImportant = 0;
 
-	/*int val=*/::StretchDIBits(pDc->m_hDC, pRect->left, pRect->top, pRect->Width(), pRect->Height(), 0, 0, width, width, rgbData, &bi, 
+	/*int val=*/::StretchDIBits(pDc->m_hDC, pRect->left, pRect->top, pRect->Width(), pRect->Height(), 0, 0, width, width, rgbData, &bi,
 		DIB_RGB_COLORS, SRCCOPY);
 }
 
@@ -782,7 +782,7 @@ void CWorldBuilderView::drawMyTexture(CDC *pDc, CRect *pRect, Int width, Unsigne
 //=============================================================================
 /** Invalidates the pixel area for the height map call at a particular location. */
 //=============================================================================
-void CWorldBuilderView::invalidateCellInView(int xIndex, int yIndex) 
+void CWorldBuilderView::invalidateCellInView(int xIndex, int yIndex)
 {
 	CWorldBuilderDoc* pDoc = WbDoc();
 	ASSERT_VALID(pDoc);
@@ -793,7 +793,7 @@ void CWorldBuilderView::invalidateCellInView(int xIndex, int yIndex)
 	// Flip the y.
 	cell.bottom = (pMap->getYExtent()-yIndex)*m_cellSize;
 	// Adjust for scrolling.
-	cell.bottom -= mYScrollOffset; 
+	cell.bottom -= mYScrollOffset;
 	cell.top = cell.bottom-m_cellSize;
 	// Convert to pixel coord.
 	cell.left = xIndex*m_cellSize;
@@ -852,7 +852,7 @@ void CWorldBuilderView::adjustDocSize()
 //=============================================================================
 /** Standard window handler method for when the window size changes. */
 //=============================================================================
-void CWorldBuilderView::OnSize(UINT nType, int cx, int cy) 
+void CWorldBuilderView::OnSize(UINT nType, int cx, int cy)
 {
 	// Do parent class processing.
 	WbView::OnSize(nType, cx, cy);
@@ -865,7 +865,7 @@ void CWorldBuilderView::OnSize(UINT nType, int cx, int cy)
 //=============================================================================
 /** Standard window handler method for when the vertical scroll bar is used. */
 //=============================================================================
-void CWorldBuilderView::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
+void CWorldBuilderView::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 {
 	int scrollPixels=0;
 	// Based on the opcode, determine how may pixels to scroll.
@@ -886,7 +886,7 @@ void CWorldBuilderView::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBa
 //=============================================================================
 /** Standard window handler method for when the horizontal scroll bar is used. */
 //=============================================================================
-void CWorldBuilderView::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
+void CWorldBuilderView::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 {
 	int scrollPixels=0;
 
@@ -907,7 +907,7 @@ void CWorldBuilderView::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBa
 //=============================================================================
 /** Scrolls the window. */
 //=============================================================================
-void CWorldBuilderView::scrollInView(Real xScroll, Real yScroll, Bool end) 
+void CWorldBuilderView::scrollInView(Real xScroll, Real yScroll, Bool end)
 {
 	// Calculate new scroll offset.
 	Int newOffset = mXScrollOffset + xScroll*m_cellSize;
@@ -950,7 +950,7 @@ void CWorldBuilderView::scrollInView(Real xScroll, Real yScroll, Bool end)
 
 
 /** Toggles the show grid flag and invals the window. */
-void CWorldBuilderView::OnShowGrid() 
+void CWorldBuilderView::OnShowGrid()
 {
 	mShowGrid = !mShowGrid;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowGrid", mShowGrid?1:0);
@@ -958,17 +958,17 @@ void CWorldBuilderView::OnShowGrid()
 }
 
 /** Sets the check in the menu to match the show grid flag. */
-void CWorldBuilderView::OnUpdateShowGrid(CCmdUI* pCmdUI) 
+void CWorldBuilderView::OnUpdateShowGrid(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(mShowGrid?1:0);
 	// Note - grid doesn't show if the cell size < 4, so disable.
 	pCmdUI->Enable(m_cellSize>=MIN_GRID_SIZE);
-	
+
 }
 
 #if DEAD
 /** Toggles the show contours flag and invals the window. */
-void CWorldBuilderView::OnViewShowcontours() 
+void CWorldBuilderView::OnViewShowcontours()
 {
 	m_showContours = !m_showContours;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowContours", m_showContours?1:0);
@@ -976,17 +976,17 @@ void CWorldBuilderView::OnViewShowcontours()
 }
 
 /** Sets the check in the menu to match the show contours flag. */
-void CWorldBuilderView::OnUpdateViewShowcontours(CCmdUI* pCmdUI) 
+void CWorldBuilderView::OnUpdateViewShowcontours(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showContours?1:0);
 	// Note - contours don't show if the cell size < 4, so disable.
 	pCmdUI->Enable(m_cellSize>=MIN_GRID_SIZE);
 }
-#endif 
+#endif
 
 
 /** Toggles the show texture flag and invals the window. */
-void CWorldBuilderView::OnViewShowtexture() 
+void CWorldBuilderView::OnViewShowtexture()
 {
 	m_showTexture = !m_showTexture;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowTexture", m_showTexture?1:0);
@@ -994,7 +994,7 @@ void CWorldBuilderView::OnViewShowtexture()
 }
 
 /** Sets the check in the menu to match the show texture flag. */
-void CWorldBuilderView::OnUpdateViewShowtexture(CCmdUI* pCmdUI) 
+void CWorldBuilderView::OnUpdateViewShowtexture(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showTexture?1:0);
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/addplayerdialog.cpp b/Generals/Code/Tools/WorldBuilder/src/addplayerdialog.cpp
index dfdeeb49f87..0c0abb1afa6 100644
--- a/Generals/Code/Tools/WorldBuilder/src/addplayerdialog.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/addplayerdialog.cpp
@@ -62,11 +62,11 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // AddPlayerDialog message handlers
 
-void AddPlayerDialog::OnOK() 
-{	
+void AddPlayerDialog::OnOK()
+{
 	CComboBox *faction = (CComboBox*)GetDlgItem(IDC_COMBO1);
 
-	if (faction) 
+	if (faction)
 	{
 		// get the text out of the combo. If it is user-typed, sel will be -1, otherwise it will be >=0
 		CString theText;
@@ -76,9 +76,8 @@ void AddPlayerDialog::OnOK()
 		} else {
 			faction->GetWindowText(theText);
 		}
-		AsciiString name((LPCTSTR)theText);
 
-		const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(name));
+		const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY((LPCTSTR)theText));
 		if (pt)
 		{
 			m_addedSide = pt ? pt->getName() : AsciiString::TheEmptyString;
@@ -91,23 +90,23 @@ void AddPlayerDialog::OnOK()
 			CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 			SidesListUndoable *pUndo = new SidesListUndoable(newSides, pDoc);
 			pDoc->AddAndDoUndoable(pUndo);
-			REF_PTR_RELEASE(pUndo); // belongs to pDoc now.	
+			REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 		}
 	}
 
 	CDialog::OnOK();
 }
 
-void AddPlayerDialog::OnCancel() 
+void AddPlayerDialog::OnCancel()
 {
 	m_addedSide.clear();
 	CDialog::OnCancel();
 }
 
-BOOL AddPlayerDialog::OnInitDialog() 
+BOOL AddPlayerDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CComboBox *factions = (CComboBox*)GetDlgItem(IDC_COMBO1);
 	factions->ResetContent();
 	if (ThePlayerTemplateStore)
@@ -122,12 +121,12 @@ BOOL AddPlayerDialog::OnInitDialog()
 		}
 	}
 	factions->SetCurSel(0);
-	
-	return TRUE; 
+
+	return TRUE;
 }
 
-void AddPlayerDialog::OnEditchangeCombo1() 
+void AddPlayerDialog::OnEditchangeCombo1()
 {
 	// TODO: Add your control notification handler code here
-	
+
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/brushoptions.cpp b/Generals/Code/Tools/WorldBuilder/src/brushoptions.cpp
index 6b2c2dcd276..030a00630b6 100644
--- a/Generals/Code/Tools/WorldBuilder/src/brushoptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/brushoptions.cpp
@@ -36,7 +36,7 @@ Int BrushOptions::m_currentFeather = 0;
 
 BrushOptions::BrushOptions(CWnd* pParent /*=NULL*/)
 {
-	//{{AFX_DATA_INIT(BrushOptions) 
+	//{{AFX_DATA_INIT(BrushOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -52,8 +52,8 @@ void BrushOptions::DoDataExchange(CDataExchange* pDX)
 
 /// Sets the feather value in the dialog.
 /** Update the value in the edit control and the slider. */
-void BrushOptions::setFeather(Int feather) 
-{ 
+void BrushOptions::setFeather(Int feather)
+{
 	CString buf;
 	buf.Format("%d", feather);
 	m_currentFeather = feather;
@@ -65,8 +65,8 @@ void BrushOptions::setFeather(Int feather)
 
 /// Sets the brush width value in the dialog.
 /** Update the value in the edit control and the slider. */
-void BrushOptions::setWidth(Int width) 
-{ 
+void BrushOptions::setWidth(Int width)
+{
 	CString buf;
 	buf.Format("%d", width);
 	m_currentWidth = width;
@@ -76,10 +76,10 @@ void BrushOptions::setWidth(Int width)
 	}
 }
 
-void BrushOptions::setHeight(Int height) 
-{ 
-	char buffer[50];
-	sprintf(buffer, "%d", height);
+void BrushOptions::setHeight(Int height)
+{
+	char buffer[12];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%d", height);
 	m_currentHeight = height;
 	if (m_staticThis && !m_staticThis->m_updating) {
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -93,12 +93,12 @@ void BrushOptions::setHeight(Int height)
 // BrushOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL BrushOptions::OnInitDialog() 
+BOOL BrushOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = true;
 	m_brushWidthPopup.SetupPopSliderButton(this, IDC_SIZE_POPUP, this);
 	m_brushFeatherPopup.SetupPopSliderButton(this, IDC_FEATHER_POPUP, this);
@@ -117,7 +117,7 @@ BOOL BrushOptions::OnInitDialog()
 /// Handles feather edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void BrushOptions::OnChangeFeatherEdit() 
+void BrushOptions::OnChangeFeatherEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_FEATHER_EDIT);
@@ -129,7 +129,7 @@ void BrushOptions::OnChangeFeatherEdit()
 			if (1==sscanf(buffer, "%d", &feather)) {
 				m_currentFeather = feather;
 				BrushTool::setFeather(m_currentFeather);
-				sprintf(buffer, "%.1f FEET.", m_currentFeather*MAP_XY_FACTOR);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentFeather*MAP_XY_FACTOR);
 				pEdit = m_staticThis->GetDlgItem(IDC_FEATHER_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -140,7 +140,7 @@ void BrushOptions::OnChangeFeatherEdit()
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void BrushOptions::OnChangeSizeEdit() 
+void BrushOptions::OnChangeSizeEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SIZE_EDIT);
@@ -152,7 +152,7 @@ void BrushOptions::OnChangeSizeEdit()
 			if (1==sscanf(buffer, "%d", &width)) {
 				m_currentWidth = width;
 				BrushTool::setWidth(m_currentWidth);
-				sprintf(buffer, "%.1f FEET.", m_currentWidth*MAP_XY_FACTOR);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentWidth*MAP_XY_FACTOR);
 				pEdit = m_staticThis->GetDlgItem(IDC_WIDTH_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -163,7 +163,7 @@ void BrushOptions::OnChangeSizeEdit()
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void BrushOptions::OnChangeHeightEdit() 
+void BrushOptions::OnChangeHeightEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -175,7 +175,7 @@ void BrushOptions::OnChangeHeightEdit()
 			if (1==sscanf(buffer, "%d", &height)) {
 				m_currentHeight = height;
 				BrushTool::setHeight(m_currentHeight);
-				sprintf(buffer, "%.1f FEET.", m_currentHeight*MAP_HEIGHT_SCALE);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentHeight*MAP_HEIGHT_SCALE);
 				pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -212,7 +212,7 @@ void BrushOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax,
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void BrushOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -249,7 +249,7 @@ void BrushOptions::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void BrushOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -266,7 +266,7 @@ void BrushOptions::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/mapobjectprops.cpp b/Generals/Code/Tools/WorldBuilder/src/mapobjectprops.cpp
index 70180337def..59d8b883631 100644
--- a/Generals/Code/Tools/WorldBuilder/src/mapobjectprops.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/mapobjectprops.cpp
@@ -51,7 +51,7 @@ void MapObjectProps::makeMain()
 		TheMapObjectProps = this;
 }
 
-MapObjectProps::MapObjectProps(Dict* dictToEdit, const char* title, CWnd* pParent /*=NULL*/) : 
+MapObjectProps::MapObjectProps(Dict* dictToEdit, const char* title, CWnd* pParent /*=NULL*/) :
 	COptionsPanel(MapObjectProps::IDD, pParent),
 	m_dictToEdit(dictToEdit),
 	m_title(title),
@@ -59,7 +59,7 @@ MapObjectProps::MapObjectProps(Dict* dictToEdit, const char* title, CWnd* pParen
 {
 	//{{AFX_DATA_INIT(MapObjectProps)
 		// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT	
+	//}}AFX_DATA_INIT
 }
 
 MapObjectProps::~MapObjectProps()
@@ -162,15 +162,15 @@ void MapObjectProps::enableButtons()
 	// do nothing
 }
 
-void MapObjectProps::OnSelchangeProperties() 
+void MapObjectProps::OnSelchangeProperties()
 {
-	
+
 }
 
-BOOL MapObjectProps::OnInitDialog() 
+BOOL MapObjectProps::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	if (m_title)
 		SetWindowText(m_title);
 
@@ -186,15 +186,15 @@ BOOL MapObjectProps::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-/*static*/ void MapObjectProps::update(void) 
+/*static*/ void MapObjectProps::update(void)
 {
-	if (TheMapObjectProps) 
+	if (TheMapObjectProps)
 	{
 		TheMapObjectProps->updateTheUI();
 	}
 }
 
-void MapObjectProps::updateTheUI(void) 
+void MapObjectProps::updateTheUI(void)
 {
 	if (this != TheMapObjectProps) {
 		return;
@@ -205,7 +205,7 @@ void MapObjectProps::updateTheUI(void)
 			continue;
 		}
 
-		m_dictToEdit = pMapObj ? pMapObj->getProperties() : NULL; 
+		m_dictToEdit = pMapObj ? pMapObj->getProperties() : NULL;
 
 		_DictToTeam();
 		_DictToName();
@@ -229,7 +229,7 @@ void MapObjectProps::updateTheUI(void)
 		_DictToTargetable();
 		ShowZOffset(pMapObj);
 		ShowAngle(pMapObj);
-		
+
 		// simply break after the first one that's selected
 		break;
 	}
@@ -237,13 +237,13 @@ void MapObjectProps::updateTheUI(void)
 
 /*static*/ MapObject *MapObjectProps::getSingleSelectedMapObject(void)
 {
-	MapObject *pMapObj; 
-	MapObject *theMapObj = NULL; 
+	MapObject *pMapObj;
+	MapObject *theMapObj = NULL;
 //	Bool found = false;
 	Int selCount=0;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj->isSelected()) {
-			if (!pMapObj->isWaypoint() && !pMapObj->isLight()) 
+			if (!pMapObj->isWaypoint() && !pMapObj->isLight())
 			{
 				theMapObj = pMapObj;
 			}
@@ -256,7 +256,7 @@ void MapObjectProps::updateTheUI(void)
 	return(NULL);
 }
 
-void MapObjectProps::OnEditprop() 
+void MapObjectProps::OnEditprop()
 {
 	int sel = getSel();
 	if (sel == -1 || !m_dictToEdit)
@@ -267,8 +267,8 @@ void MapObjectProps::OnEditprop()
 	AsciiString vstr = getNthValueStr(m_dictToEdit, sel, &enquote);
 	Dict::DataType type = m_dictToEdit->getNthType(sel);
 
-	PropEdit propDlg(&kstr, &type, &vstr, true, this);	
-	if (propDlg.DoModal() == IDOK) 
+	PropEdit propDlg(&kstr, &type, &vstr, true, this);
+	if (propDlg.DoModal() == IDOK)
 	{
 		Dict newDict = DictItemUndoable::buildSingleItemDict(kstr, type, vstr);
 		if (this == TheMapObjectProps)
@@ -278,8 +278,8 @@ void MapObjectProps::OnEditprop()
 			DictItemUndoable *pUndo = new DictItemUndoable(&m_dictToEdit, newDict, newDict.getNthKey(0));
 			pDoc->AddAndDoUndoable(pUndo);
 			REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-		} 
-		else 
+		}
+		else
 		{
 			// we're running modal; just slam it in the dict
 			m_dictToEdit->copyPairFrom(newDict, newDict.getNthKey(0));
@@ -288,7 +288,7 @@ void MapObjectProps::OnEditprop()
 	}
 }
 
-void MapObjectProps::OnNewprop() 
+void MapObjectProps::OnNewprop()
 {
 	if (!m_dictToEdit)
 		return;
@@ -297,8 +297,8 @@ void MapObjectProps::OnNewprop()
 	static Dict::DataType lastNewType = Dict::DICT_BOOL;
 	AsciiString key, value;
 
-	PropEdit propDlg(&key, &lastNewType, &value, false, this);	
-	if (propDlg.DoModal() == IDOK) 
+	PropEdit propDlg(&key, &lastNewType, &value, false, this);
+	if (propDlg.DoModal() == IDOK)
 	{
 		Dict newDict = DictItemUndoable::buildSingleItemDict(key, lastNewType, value);
 		if (this == TheMapObjectProps)
@@ -309,7 +309,7 @@ void MapObjectProps::OnNewprop()
 			pDoc->AddAndDoUndoable(pUndo);
 			REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 		}
-		else 
+		else
 		{
 			// we're running modal; just slam it in the dict
 			m_dictToEdit->copyPairFrom(newDict, newDict.getNthKey(0));
@@ -318,12 +318,12 @@ void MapObjectProps::OnNewprop()
 	}
 }
 
-void MapObjectProps::OnRemoveprop() 
+void MapObjectProps::OnRemoveprop()
 {
 	int sel = getSel();
 	if (sel == -1)
 		return;
-	
+
 	NameKeyType k = m_dictToEdit->getNthKey(sel);
 	if (this == TheMapObjectProps)
 	{
@@ -342,7 +342,7 @@ void MapObjectProps::OnRemoveprop()
 	updateTheUI();
 }
 
-void MapObjectProps::OnDblclkProperties() 
+void MapObjectProps::OnDblclkProperties()
 {
 	OnEditprop();
 }
@@ -369,14 +369,14 @@ void MapObjectProps::_DictToTeam(void)
 		if (name == NEUTRAL_TEAM_INTERNAL_STR)
 			name = NEUTRAL_TEAM_UI_STR;
 		i = owner->FindStringExact(-1, name.str());
-		DEBUG_ASSERTLOG(i >= 0, ("missing team '%s'. Non-fatal (jkmcd)\n", name.str()));
+		DEBUG_ASSERTLOG(i >= 0, ("missing team '%s'. Non-fatal (jkmcd)", name.str()));
 	}
 	owner->SetCurSel(i);
 }
 
 void MapObjectProps::_DictToName(void)
 {
-	AsciiString name = "";
+	AsciiString name;
 	Bool exists;
 	if (m_dictToEdit) {
 		name = m_dictToEdit->getAsciiString(TheKey_objectName, &exists);
@@ -422,7 +422,7 @@ void MapObjectProps::_DictToHealth(void)
 		} else {
 			pItem->SelectString(-1, "Other");
 			static char buff[12];
-			sprintf(buff, "%d", value);
+			snprintf(buff, ARRAY_SIZE(buff), "%d", value);
 			pItem2->SetWindowText(buff);
 			pItem2->EnableWindow(TRUE);
 		}
@@ -465,7 +465,7 @@ void MapObjectProps::_DictToEnabled(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Enabled);
 	if (pItem) {
 		pItem->SetCheck(enabled);
-	}	
+	}
 }
 
 void MapObjectProps::_DictToScript(void)
@@ -473,14 +473,14 @@ void MapObjectProps::_DictToScript(void)
 	if (!m_dictToEdit) {
 		return;
 	}
-	
+
 	Bool exists;
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Script);
 	// Load the subroutine scripts into the combo box.
 	EditParameter::loadScripts(pCombo, true);
 	/*Int stringNdx =*/ pCombo->AddString("<none>");
 	AsciiString script = m_dictToEdit->getAsciiString(TheKey_objectScriptAttachment, &exists);
-	
+
 	if (script.isEmpty()) {
 		pCombo->SelectString(-1, "<none>");
 	} else {
@@ -499,7 +499,7 @@ void MapObjectProps::_DictToDestructible(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Indestructible);
 	if (pItem) {
 		pItem->SetCheck(destructible);
-	}	
+	}
 }
 
 void MapObjectProps::_DictToUnsellable(void)
@@ -513,23 +513,23 @@ void MapObjectProps::_DictToUnsellable(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Unsellable);
 	if (pItem) {
 		pItem->SetCheck(unsellable);
-	}	
+	}
 }
 
 void MapObjectProps::_DictToTargetable()
 {
 	Bool targetable = false;
 	Bool exists;
-	if( m_dictToEdit ) 
+	if( m_dictToEdit )
 	{
 		targetable = m_dictToEdit->getBool( TheKey_objectTargetable, &exists );
 	}
 
 	CButton* pItem = (CButton*) GetDlgItem( IDC_MAPOBJECT_Targetable );
-	if( pItem ) 
+	if( pItem )
 	{
 		pItem->SetCheck( targetable );
-	}	
+	}
 }
 
 void MapObjectProps::_DictToPowered(void)
@@ -543,8 +543,8 @@ void MapObjectProps::_DictToPowered(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Powered);
 	if (pItem) {
 		pItem->SetCheck(powered);
-	}	
-	
+	}
+
 }
 
 void MapObjectProps::_DictToAggressiveness(void)
@@ -582,9 +582,9 @@ void MapObjectProps::_DictToVisibilityRange(void)
 	CWnd* pItem = GetDlgItem(IDC_MAPOBJECT_VisionDistance);
 	if (pItem) {
 		static char buff[12];
-		sprintf(buff, "%d", distance);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", distance);
 		if (distance == 0) {
-			pItem->SetWindowText(""); 
+			pItem->SetWindowText("");
 		} else {
 			pItem->SetWindowText(buff);
 		}
@@ -644,9 +644,9 @@ void MapObjectProps::_DictToShroudClearingDistance(void)
 	CWnd* pItem = GetDlgItem(IDC_MAPOBJECT_ShroudClearingDistance);
 	if (pItem) {
 		static char buff[12];
-		sprintf(buff, "%d", distance);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", distance);
 		if (distance == 0) {
-			pItem->SetWindowText(""); 
+			pItem->SetWindowText("");
 		} else {
 			pItem->SetWindowText(buff);
 		}
@@ -660,11 +660,11 @@ void MapObjectProps::_DictToRecruitableAI(void)
  	if (m_dictToEdit) {
 		recruitableAI  = m_dictToEdit->getBool(TheKey_objectRecruitableAI, &exists);
  	}
-	
+
  	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_RecruitableAI);
  	if (pItem) {
 		pItem->SetCheck(recruitableAI);
-	}	
+	}
 }
 
 void MapObjectProps::_DictToSelectable(void)
@@ -678,7 +678,7 @@ void MapObjectProps::_DictToSelectable(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Selectable);
 	if (pItem) {
 		pItem->SetCheck(selectable);
-	}	
+	}
 }
 
 void MapObjectProps::_DictToStoppingDistance(void)
@@ -691,10 +691,10 @@ void MapObjectProps::_DictToStoppingDistance(void)
 
 	CWnd* pItem = GetDlgItem(IDC_MAPOBJECT_StoppingDistance);
 	if (pItem) {
-		static char buff[12];
-		sprintf(buff, "%g", stoppingDistance);
+		static char buff[32];
+		snprintf(buff, ARRAY_SIZE(buff), "%g", stoppingDistance);
 		pItem->SetWindowText(buff);
-	}	
+	}
 }
 
 void MapObjectProps::_DictToPrebuiltUpgrades(void)
@@ -749,7 +749,7 @@ void MapObjectProps::_DictToPrebuiltUpgrades(void)
 				if (!gmbmd) {
 					continue;
 				}
-				if (gmbmd->m_upgradeMuxData.m_activationUpgradeNames.size() > 0) {
+				if (!gmbmd->m_upgradeMuxData.m_activationUpgradeNames.empty()) {
 					cstr = gmbmd->m_upgradeMuxData.m_activationUpgradeNames[0].str();
 					if (pBox->FindString(-1, cstr) == LB_ERR) {
 						pBox->AddString(cstr);
@@ -770,7 +770,7 @@ void MapObjectProps::_DictToPrebuiltUpgrades(void)
 
 	// Finally, walk through the upgrades that he already has, and select the appropriate members
 	// from the list
-	
+
 	Bool exists;
 	int upgradeNum = 0;
 	AsciiString upgradeString;
@@ -810,7 +810,7 @@ void MapObjectProps::_TeamToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setAsciiString(TheKey_originalOwner, AsciiString(buf));
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	// Update is called by Do
@@ -827,7 +827,7 @@ void MapObjectProps::_NameToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setAsciiString(TheKey_objectName, cstr.GetBuffer(0));
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	// Update is called by Do
@@ -865,7 +865,7 @@ void MapObjectProps::_HealthToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setInt(TheKey_objectInitialHealth, value);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	// Update is called by Do
@@ -874,7 +874,7 @@ void MapObjectProps::_HealthToDict(void)
 void MapObjectProps::_PrebuiltUpgradesToDict(void)
 {
 	getAllSelectedDicts();
-	
+
 	CListBox *pBox = (CListBox *) GetDlgItem(IDC_MAPOBJECT_BuildWithUpgrades);
 	if (!pBox) {
 		return;
@@ -890,7 +890,7 @@ void MapObjectProps::_PrebuiltUpgradesToDict(void)
 			return;
 		}
 	}
-	
+
 	Bool exists;
 	int upgradeNum = 0;
 	AsciiString upgradeString;
@@ -929,7 +929,7 @@ void MapObjectProps::_PrebuiltUpgradesToDict(void)
 
 	// Now, do the Undoable
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, NAMEKEY_INVALID, m_allSelectedDicts.size(), pDoc, true);
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, NAMEKEY_INVALID, m_allSelectedDicts.size(), pDoc, true);
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 }
@@ -944,7 +944,7 @@ void MapObjectProps::_EnabledToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setBool(TheKey_objectEnabled, isChecked);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	// Update is called by Do
@@ -961,10 +961,10 @@ void MapObjectProps::_ScriptToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setAsciiString(TheKey_objectScriptAttachment, AsciiString(buf));
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-	// Update is called by Do	
+	// Update is called by Do
 }
 
 void MapObjectProps::_IndestructibleToDict(void)
@@ -977,10 +977,10 @@ void MapObjectProps::_IndestructibleToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setBool(TheKey_objectIndestructible, isChecked);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-	// Update is called by Do	
+	// Update is called by Do
 }
 
 void MapObjectProps::_UnsellableToDict(void)
@@ -993,11 +993,11 @@ void MapObjectProps::_UnsellableToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setBool(TheKey_objectUnsellable, isChecked);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	// Update is called by Do
-	
+
 }
 
 void MapObjectProps::_TargetableToDict()
@@ -1010,7 +1010,7 @@ void MapObjectProps::_TargetableToDict()
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setBool( TheKey_objectTargetable, isChecked );
-	DictItemUndoable *pUndo = new DictItemUndoable( &m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size() );
+	DictItemUndoable *pUndo = new DictItemUndoable( getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size() );
 	pDoc->AddAndDoUndoable( pUndo );
 	REF_PTR_RELEASE( pUndo ); // belongs to pDoc now.
 	// Update is called by Do
@@ -1027,7 +1027,7 @@ void MapObjectProps::_PoweredToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setBool(TheKey_objectPowered, isChecked);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	// Update is called by Do
@@ -1042,7 +1042,7 @@ void MapObjectProps::_AggressivenessToDict(void)
 	static char buf[1024];
 	owner->GetWindowText(buf, sizeof(buf)-2);
 	int value = 0;
-	
+
 	if (strcmp(buf, "Sleep") == 0) {
 		value = -2;
 	} else if (strcmp(buf, "Passive") == 0) {
@@ -1058,10 +1058,10 @@ void MapObjectProps::_AggressivenessToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setInt(TheKey_objectAggressiveness, value);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-	// Update is called by Do		
+	// Update is called by Do
 }
 
 void MapObjectProps::_VisibilityToDict(void)
@@ -1082,7 +1082,7 @@ void MapObjectProps::_VisibilityToDict(void)
 	if (value != -1) {
 		newDict.setInt(TheKey_objectVisualRange, value);
 	}
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, TheKey_objectVisualRange, m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, TheKey_objectVisualRange, m_allSelectedDicts.size());
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	// Update is called by Do
@@ -1095,7 +1095,7 @@ void MapObjectProps::_VeterancyToDict(void)
 	CComboBox *owner = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Veterancy);
 	static char buf[1024];
 	int curSel = owner->GetCurSel();
-	int value = 0;	
+	int value = 0;
 	if (curSel >= 0) {
 		value=curSel;
 	}
@@ -1103,10 +1103,10 @@ void MapObjectProps::_VeterancyToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setInt(TheKey_objectVeterancy, value);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-	// Update is called by Do	
+	// Update is called by Do
 
 }
 
@@ -1121,10 +1121,10 @@ void MapObjectProps::_WeatherToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setInt(TheKey_objectWeather, curSel);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-	// Update is called by Do	
+	// Update is called by Do
 
 }
 
@@ -1139,17 +1139,17 @@ void MapObjectProps::_TimeToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setInt(TheKey_objectTime, curSel);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-	// Update is called by Do	
+	// Update is called by Do
 
 }
 
 void MapObjectProps::_ShroudClearingDistanceToDict(void)
 {
 	getAllSelectedDicts();
-	
+
 	int value = -1;
 	CWnd* edit = GetDlgItem(IDC_MAPOBJECT_ShroudClearingDistance);
 	edit->EnableWindow(TRUE);
@@ -1164,7 +1164,7 @@ void MapObjectProps::_ShroudClearingDistanceToDict(void)
 	if (value != -1) {
 		newDict.setInt(TheKey_objectShroudClearingDistance, value);
 	}
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, TheKey_objectShroudClearingDistance, m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, TheKey_objectShroudClearingDistance, m_allSelectedDicts.size());
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	// Update is called by Do
@@ -1173,14 +1173,14 @@ void MapObjectProps::_ShroudClearingDistanceToDict(void)
 void MapObjectProps::_RecruitableAIToDict(void)
 {
 	getAllSelectedDicts();
-	
+
 	CButton *owner = (CButton*) GetDlgItem(IDC_MAPOBJECT_RecruitableAI);
 	Bool isChecked = (owner->GetCheck() != 0);
-	
+
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setBool(TheKey_objectRecruitableAI, isChecked);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	// Update is called by Do
@@ -1196,16 +1196,16 @@ void MapObjectProps::_SelectableToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setBool(TheKey_objectSelectable, isChecked);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	// Update is called by Do
 }
 
-void MapObjectProps::_HPsToDict() 
+void MapObjectProps::_HPsToDict()
 {
 	getAllSelectedDicts();
-	
+
 	Int value;
 	static char buf[1024];
 
@@ -1219,7 +1219,7 @@ void MapObjectProps::_HPsToDict()
 	Dict newDict;
 
 	newDict.setInt(TheKey_objectMaxHPs, value);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 }
@@ -1242,7 +1242,7 @@ void MapObjectProps::_StoppingDistanceToDict(void)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	Dict newDict;
 	newDict.setReal(TheKey_objectStoppingDistance, value);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	// Update is called by Do
@@ -1262,9 +1262,9 @@ void MapObjectProps::OnCancel()
 void MapObjectProps::ShowZOffset(MapObject *pMapObj)
 {
 	const Coord3D *loc = pMapObj->getLocation();
-	static char buff[12];
+	static char buff[32];
 	m_height = loc->z;
-	sprintf(buff, "%0.2f", loc->z);
+	snprintf(buff, ARRAY_SIZE(buff), "%0.2f", loc->z);
 	CWnd* edit = GetDlgItem(IDC_MAPOBJECT_ZOffset);
 	edit->SetWindowText(buff);
 }
@@ -1289,8 +1289,8 @@ void MapObjectProps::SetZOffset(void)
 void MapObjectProps::ShowAngle(MapObject *pMapObj)
 {
 	m_angle = pMapObj->getAngle() * 180 / PI;
-	static char buff[12];
-	sprintf(buff, "%0.2f", m_angle);
+	static char buff[32];
+	snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_angle);
 	CWnd* edit = GetDlgItem(IDC_MAPOBJECT_Angle);
 	edit->SetWindowText(buff);
 
@@ -1342,6 +1342,14 @@ void MapObjectProps::getAllSelectedDicts(void)
 	}
 }
 
+Dict** MapObjectProps::getAllSelectedDictsData()
+{
+#if defined(USING_STLPORT) || __cplusplus < 201103L
+	return !m_allSelectedDicts.empty() ? &m_allSelectedDicts.front() : NULL;
+#else
+	return m_allSelectedDicts.data();
+#endif
+}
 
 void MapObjectProps::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial)
 {
@@ -1365,14 +1373,14 @@ void MapObjectProps::GetPopSliderInfo(const long sliderID, long *pMin, long *pMa
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void MapObjectProps::PopSliderChanged(const long sliderID, long theVal)
 {
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	CWnd* edit;
-	static char buff[12];
+	static char buff[32];
 	switch (sliderID) {
 		case IDC_HEIGHT_POPUP:
 			if (!m_posUndoable) {
@@ -1381,7 +1389,7 @@ void MapObjectProps::PopSliderChanged(const long sliderID, long theVal)
 			}
 			m_posUndoable->SetZOffset(theVal);
 			m_height = theVal;
-			sprintf(buff, "%0.2f", m_height);
+			snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_height);
 			edit = GetDlgItem(IDC_MAPOBJECT_ZOffset);
 			edit->SetWindowText(buff);
 			break;
@@ -1393,7 +1401,7 @@ void MapObjectProps::PopSliderChanged(const long sliderID, long theVal)
 			}
 			m_posUndoable->RotateTo(theVal * PI/180);
 			m_angle = theVal;
-			sprintf(buff, "%0.2f", m_angle);
+			snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_angle);
 			edit = GetDlgItem(IDC_MAPOBJECT_Angle);
 			edit->SetWindowText(buff);
 			break;
@@ -1402,7 +1410,7 @@ void MapObjectProps::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void MapObjectProps::PopSliderFinished(const long sliderID, long theVal)
@@ -1418,7 +1426,7 @@ void MapObjectProps::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
diff --git a/Generals/Code/Tools/WorldBuilder/src/playerlistdlg.cpp b/Generals/Code/Tools/WorldBuilder/src/playerlistdlg.cpp
index d21c4e59446..ec1855d77a5 100644
--- a/Generals/Code/Tools/WorldBuilder/src/playerlistdlg.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/playerlistdlg.cpp
@@ -53,7 +53,7 @@ static void fixDefaultTeamName(SidesList& sides, AsciiString oldpname, AsciiStri
 	{
 		tname.set("team");
 		tname.concat(newpname);
-		DEBUG_LOG(("rename team %s -> %s\n",ti->getDict()->getAsciiString(TheKey_teamName).str(),tname.str()));
+		DEBUG_LOG(("rename team %s -> %s",ti->getDict()->getAsciiString(TheKey_teamName).str(),tname.str()));
 		ti->getDict()->setAsciiString(TheKey_teamName, tname);
 		ti->getDict()->setAsciiString(TheKey_teamOwner, newpname);
 	}
@@ -71,7 +71,7 @@ static void updateAllTeams(SidesList& sides, AsciiString oldpname, AsciiString n
 		if (teamInfo) {
 			Bool exists;
 			Dict *dict = teamInfo->getDict();
-			
+
 			AsciiString teamOwner = dict->getAsciiString(TheKey_teamOwner, &exists);
 
 			if (exists && teamOwner.compare(oldpname) == 0) {
@@ -87,7 +87,7 @@ static void ensureValidPlayerName(Dict *d)
 {
 	// ensure there are no illegal chars in it. (in particular, no spaces!)
 	char buf[1024];
-	strcpy(buf, d->getAsciiString(TheKey_playerName).str());
+	strlcpy(buf, d->getAsciiString(TheKey_playerName).str(), ARRAY_SIZE(buf));
 	for (char* p = buf; *p; ++p)
 		if (!islegalplayernamechar(*p))
 			*p = '_';
@@ -118,7 +118,7 @@ static AsciiString UIToInternal(SidesList& sides, const AsciiString& n)
 static Bool containsToken(const AsciiString& cur_allies, const AsciiString& tokenIn)
 {
 	AsciiString name, token;
-	
+
 	name = cur_allies;
 	while (name.nextToken(&token))
 	{
@@ -131,7 +131,7 @@ static Bool containsToken(const AsciiString& cur_allies, const AsciiString& toke
 static AsciiString removeDupsFromEnemies(const AsciiString& cur_allies, const AsciiString& cur_enemies)
 {
 	AsciiString new_enemies, tmp, token;
-	
+
 	tmp = cur_enemies;
 	while (tmp.nextToken(&token))
 	{
@@ -159,7 +159,7 @@ static AsciiString extractFromAlliesList(CListBox *alliesList, SidesList& sides)
 			allies.concat(UIToInternal(sides, nm));
 		}
 	}
-//DEBUG_LOG(("a/e is (%s)\n",allies.str()));
+//DEBUG_LOG(("a/e is (%s)",allies.str()));
 	return allies;
 }
 
@@ -173,7 +173,7 @@ static void buildAlliesList(CListBox *alliesList, SidesList& sides,	const AsciiS
 	{
 		name = sides.getSideInfo(i)->getDict()->getAsciiString(TheKey_playerName);
 		if (name == omitPlayer || name.isEmpty())
-			continue;	
+			continue;
 		name = playerNameForUI(sides, i);
 		alliesList->AddString(name.str());
 	}
@@ -219,7 +219,7 @@ static const char* calcRelationStr(SidesList& sides, int t1, int t2)
 	SidesInfo* ti1;
 	SidesInfo* ti2;
 	AsciiString t2name;
-	
+
 
 	//	we use the relationship between our player's default teams.
 	ti1 = sides.getSideInfo(t1);
@@ -280,7 +280,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // PlayerListDlg message handlers
 
-void PlayerListDlg::OnNewplayer() 
+void PlayerListDlg::OnNewplayer()
 {
 	if (m_sides.getNumSides() >= MAX_PLAYER_COUNT - 1) ///Added -1 so we can always have an observer even for Single player games.
 		return;
@@ -305,13 +305,13 @@ void PlayerListDlg::OnNewplayer()
 	newPlayerDict.setBool(TheKey_playerIsHuman, true);
 	newPlayerDict.setUnicodeString(TheKey_playerDisplayName, pnameu);
 	newPlayerDict.setAsciiString(TheKey_playerFaction, addedPTName);
-	newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString(""));
-	newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString(""));
+	newPlayerDict.setAsciiString(TheKey_playerEnemies, "");
+	newPlayerDict.setAsciiString(TheKey_playerAllies, "");
 
 #ifdef NOT_IN_USE
 	// auto-open the advanced prop editor
 	MapObjectProps editor(&newPlayerDict, "Create New Player", this);
-	if (editor.DoModal() == IDOK) 
+	if (editor.DoModal() == IDOK)
 #endif
 	{
 		if (newPlayerDict.getAsciiString(TheKey_playerName).isEmpty())
@@ -329,10 +329,10 @@ void PlayerListDlg::OnNewplayer()
 			m_curPlayerIdx = m_sides.getNumSides()-1;
 			updateTheUI();
 		}
-	}	
+	}
 }
 
-void PlayerListDlg::OnEditplayer() 
+void PlayerListDlg::OnEditplayer()
 {
 	// TODO: the dialog referenced here has no ok or cancel buttons, so locks the editor
 	// re-enable this routine once it is not a guaranteed hang
@@ -347,7 +347,7 @@ void PlayerListDlg::OnEditplayer()
 
 	Dict playerDictCopy = *playerDict;
 	MapObjectProps editor(&playerDictCopy, "Edit Player", this);
-	if (editor.DoModal() == IDOK) 
+	if (editor.DoModal() == IDOK)
 	{
 		ensureValidPlayerName(&playerDictCopy);
 
@@ -379,14 +379,14 @@ void PlayerListDlg::OnEditplayer()
 	}
 }
 
-void PlayerListDlg::OnRemoveplayer() 
+void PlayerListDlg::OnRemoveplayer()
 {
 	Dict *playerDict = m_sides.getSideInfo(m_curPlayerIdx)->getDict();
 	AsciiString pname = playerDict->getAsciiString(TheKey_playerName);
 	Bool isneutral = pname.isEmpty();
 	if (isneutral)
 		return;
-	
+
 	Int i;
 	Int count = 0;
 	for (i = 0; i < m_sides.getNumTeams(); i++)
@@ -396,7 +396,7 @@ void PlayerListDlg::OnRemoveplayer()
 		{
 			count += MapObject::countMapObjectsWithOwner(tdict->getAsciiString(TheKey_teamName));
 		}
-	} 
+	}
 
 	if (count > 0)
 	{
@@ -419,7 +419,7 @@ void PlayerListDlg::OnRemoveplayer()
 			m_sides.removeTeam(i);
 			goto try_again;
 		}
-	} 
+	}
 
 	Bool modified = m_sides.validateSides();
 	(void)modified;
@@ -427,14 +427,14 @@ void PlayerListDlg::OnRemoveplayer()
 	updateTheUI();
 }
 
-void PlayerListDlg::OnSelchangePlayers() 
+void PlayerListDlg::OnSelchangePlayers()
 {
 	CListBox *list = (CListBox*)GetDlgItem(IDC_PLAYERS);
 	m_curPlayerIdx = list->GetCurSel();
 	updateTheUI();
 }
 
-void PlayerListDlg::updateTheUI(void) 
+void PlayerListDlg::updateTheUI(void)
 {
 	char buffer[1024];
 
@@ -449,7 +449,7 @@ void PlayerListDlg::updateTheUI(void)
 	DEBUG_ASSERTLOG(!modified,("had to clean up sides in PlayerListDlg::updateTheUI! (caller should do this)"));
 
 	if (m_curPlayerIdx < 0) m_curPlayerIdx = 0;
-	if (m_curPlayerIdx >= m_sides.getNumSides()) 
+	if (m_curPlayerIdx >= m_sides.getNumSides())
 		m_curPlayerIdx = m_sides.getNumSides()-1;
 
 	// update player list
@@ -475,7 +475,7 @@ void PlayerListDlg::updateTheUI(void)
 	AsciiString cur_pname = pdict->getAsciiString(TheKey_playerName);
 	UnicodeString cur_pdname = pdict->getUnicodeString(TheKey_playerDisplayName);
 	Bool isNeutral = cur_pname.isEmpty();
-	
+
 	// update player name
 	{
 		CWnd *playername = GetDlgItem(IDC_PLAYERNAME);
@@ -567,11 +567,11 @@ void PlayerListDlg::updateTheUI(void)
 		pname = playerNameForUI(m_sides, i);
 
 		rstr = calcRelationStr(m_sides, m_curPlayerIdx, i);
-		sprintf(buffer, "%s: %s",pname.str(),rstr);
+		snprintf(buffer, ARRAY_SIZE(buffer), "%s: %s",pname.str(),rstr);
 		regardOthers->AddString(buffer);
 
 		rstr = calcRelationStr(m_sides, i, m_curPlayerIdx);
-		sprintf(buffer, "%s: %s",pname.str(),rstr);
+		snprintf(buffer, ARRAY_SIZE(buffer), "%s: %s",pname.str(),rstr);
 		regardMe->AddString(buffer);
 	}
 
@@ -596,10 +596,10 @@ void PlayerListDlg::updateTheUI(void)
 }
 
 
-BOOL PlayerListDlg::OnInitDialog() 
+BOOL PlayerListDlg::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = 0;
 	m_sides = *TheSidesList;
 	m_curPlayerIdx = thePrevCurPlyr;
@@ -616,12 +616,12 @@ BOOL PlayerListDlg::OnInitDialog()
 
 	updateTheUI();
 	PopulateColorComboBox();
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void PlayerListDlg::OnDblclkPlayers() 
+void PlayerListDlg::OnDblclkPlayers()
 {
 	OnEditplayer();
 }
@@ -688,7 +688,7 @@ void PlayerListDlg::OnSelectPlayerColor()
 	CComboBox *pCombo = (CComboBox *)GetDlgItem(IDC_PlayerColorCombo);
 	Dict *playerDict = m_sides.getSideInfo(m_curPlayerIdx)->getDict();
 	if (pCombo && playerDict) {
-		CString str; 
+		CString str;
 		pCombo->GetWindowText(str);
 		Int index = -1;
 		Int numColors = TheMultiplayerSettings->getNumColors();
@@ -715,7 +715,7 @@ void PlayerListDlg::OnSelectPlayerColor()
 	updateTheUI();
 }
 
-void PlayerListDlg::OnSelchangeAllieslist() 
+void PlayerListDlg::OnSelchangeAllieslist()
 {
 	Dict *playerDict = m_sides.getSideInfo(m_curPlayerIdx)->getDict();
 	AsciiString pname = playerDict->getAsciiString(TheKey_playerName);
@@ -737,12 +737,12 @@ void PlayerListDlg::OnSelchangeAllieslist()
 	updateTheUI();
 }
 
-void PlayerListDlg::OnSelchangeEnemieslist() 
+void PlayerListDlg::OnSelchangeEnemieslist()
 {
 	OnSelchangeAllieslist();
 }
 
-void PlayerListDlg::OnOK() 
+void PlayerListDlg::OnOK()
 {
 	Bool modified = m_sides.validateSides();
 	(void)modified;
@@ -754,24 +754,24 @@ void PlayerListDlg::OnOK()
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 
 	thePrevCurPlyr = m_curPlayerIdx;
-	
+
 	CDialog::OnOK();
 }
 
-void PlayerListDlg::OnCancel() 
+void PlayerListDlg::OnCancel()
 {
 	CDialog::OnCancel();
 }
 
-void PlayerListDlg::OnPlayeriscomputer() 
+void PlayerListDlg::OnPlayeriscomputer()
 {
 	CButton *b = (CButton*)GetDlgItem(IDC_PLAYERISCOMPUTER);
 	m_sides.getSideInfo(m_curPlayerIdx)->getDict()->setBool(TheKey_playerIsHuman, b->GetCheck() == 0);
-	
-	updateTheUI();	
+
+	updateTheUI();
 }
 
-void PlayerListDlg::OnEditchangePlayerfaction() 
+void PlayerListDlg::OnEditchangePlayerfaction()
 {
 	CComboBox *faction = (CComboBox*)GetDlgItem(IDC_PLAYERFACTION);
 
@@ -793,7 +793,7 @@ void PlayerListDlg::OnEditchangePlayerfaction()
 	}
 }
 
-void PlayerListDlg::OnChangePlayername() 
+void PlayerListDlg::OnChangePlayername()
 {
 	CWnd *playername = GetDlgItem(IDC_PLAYERNAME);
 	char buf[1024];
@@ -814,7 +814,7 @@ void PlayerListDlg::OnChangePlayername()
 	{
 		pdict->setAsciiString(TheKey_playerName, pnamenew);
 		ensureValidPlayerName(pdict);
-		
+
 		updateAllTeams(m_sides, pnameold, pnamenew);
 		fixDefaultTeamName(m_sides, pnameold, pnamenew);
 	}
@@ -822,14 +822,14 @@ void PlayerListDlg::OnChangePlayername()
 	updateTheUI();
 }
 
-void PlayerListDlg::OnChangePlayerdisplayname() 
+void PlayerListDlg::OnChangePlayerdisplayname()
 {
 	CWnd *playername = GetDlgItem(IDC_PLAYERDISPLAYNAME);
 	char buf[1024];
 	playername->GetWindowText(buf, sizeof(buf)-2);
 
 	Dict *pdict = m_sides.getSideInfo(m_curPlayerIdx)->getDict();
-	
+
 	AsciiString tmp(buf);
 	UnicodeString pnamenew;
 	pnamenew.translate(tmp);
@@ -843,7 +843,7 @@ void PlayerListDlg::OnChangePlayerdisplayname()
 	updateTheUI();
 }
 
-void PlayerListDlg::OnAddskirmishplayers() 
+void PlayerListDlg::OnAddskirmishplayers()
 {
 	// PlyrCivilian
 
@@ -859,8 +859,8 @@ void PlayerListDlg::OnAddskirmishplayers()
 		newPlayerDict.setBool(TheKey_playerIsHuman, false);
 		newPlayerDict.setUnicodeString(TheKey_playerDisplayName, pnameu);
 		newPlayerDict.setAsciiString(TheKey_playerFaction, addedPTName);
-		newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString(""));
-		newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString(""));
+		newPlayerDict.setAsciiString(TheKey_playerEnemies, "");
+		newPlayerDict.setAsciiString(TheKey_playerAllies, "");
 
 		ensureValidPlayerName(&newPlayerDict);
 		m_sides.addSide(&newPlayerDict);
@@ -881,8 +881,8 @@ void PlayerListDlg::OnAddskirmishplayers()
 		newPlayerDict.setBool(TheKey_playerIsHuman, false);
 		newPlayerDict.setUnicodeString(TheKey_playerDisplayName, pnameu);
 		newPlayerDict.setAsciiString(TheKey_playerFaction, addedPTName);
-		newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString(""));
-		newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString(""));
+		newPlayerDict.setAsciiString(TheKey_playerEnemies, "");
+		newPlayerDict.setAsciiString(TheKey_playerAllies, "");
 
 		ensureValidPlayerName(&newPlayerDict);
 		m_sides.addSide(&newPlayerDict);
@@ -903,8 +903,8 @@ void PlayerListDlg::OnAddskirmishplayers()
 		newPlayerDict.setBool(TheKey_playerIsHuman, false);
 		newPlayerDict.setUnicodeString(TheKey_playerDisplayName, pnameu);
 		newPlayerDict.setAsciiString(TheKey_playerFaction, addedPTName);
-		newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString(""));
-		newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString(""));
+		newPlayerDict.setAsciiString(TheKey_playerEnemies, "");
+		newPlayerDict.setAsciiString(TheKey_playerAllies, "");
 
 		ensureValidPlayerName(&newPlayerDict);
 		m_sides.addSide(&newPlayerDict);
@@ -925,8 +925,8 @@ void PlayerListDlg::OnAddskirmishplayers()
 		newPlayerDict.setBool(TheKey_playerIsHuman, false);
 		newPlayerDict.setUnicodeString(TheKey_playerDisplayName, pnameu);
 		newPlayerDict.setAsciiString(TheKey_playerFaction, addedPTName);
-		newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString(""));
-		newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString(""));
+		newPlayerDict.setAsciiString(TheKey_playerEnemies, "");
+		newPlayerDict.setAsciiString(TheKey_playerAllies, "");
 
 		ensureValidPlayerName(&newPlayerDict);
 		m_sides.addSide(&newPlayerDict);
diff --git a/Generals/Code/Tools/WorldBuilder/src/propedit.cpp b/Generals/Code/Tools/WorldBuilder/src/propedit.cpp
index a0d7ce69d9b..fbf93717a8e 100644
--- a/Generals/Code/Tools/WorldBuilder/src/propedit.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/propedit.cpp
@@ -124,43 +124,43 @@ void PropEdit::validate()
 /////////////////////////////////////////////////////////////////////////////
 // PropEdit message handlers
 
-void PropEdit::OnChangeKeyname() 
+void PropEdit::OnChangeKeyname()
 {
 	validate();
 }
 
-void PropEdit::OnEditchangeKeytype() 
+void PropEdit::OnEditchangeKeytype()
 {
 	validate();
 }
 
-void PropEdit::OnCloseupKeytype() 
+void PropEdit::OnCloseupKeytype()
 {
 	validate();
 }
 
-void PropEdit::OnSelchangeKeytype() 
+void PropEdit::OnSelchangeKeytype()
 {
 	validate();
 }
 
-void PropEdit::OnChangeValue() 
+void PropEdit::OnChangeValue()
 {
 	validate();
 }
 
 
-BOOL PropEdit::OnInitDialog() 
+BOOL PropEdit::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CWnd *keyname = GetDlgItem(IDC_KEYNAME);
 	CWnd *valuename = GetDlgItem(IDC_VALUE);
 	CComboBox *keytype = (CComboBox*)GetDlgItem(IDC_KEYTYPE);
 	CButton *valuebool = (CButton*)GetDlgItem(IDC_PROPBOOL);
 
 	++m_updating;
-	keytype->SetCurSel((Int)*m_type);	
+	keytype->SetCurSel((Int)*m_type);
 	keyname->SetWindowText(m_key->str());
 	valuename->SetWindowText(m_value->str());
 	valuebool->SetCheck(strcmp(m_value->str(), "true")==0 ? 1 : 0);
@@ -170,7 +170,7 @@ BOOL PropEdit::OnInitDialog()
 	return TRUE;  // return TRUE unless you set the focus to a control
 }
 
-void PropEdit::OnPropbool() 
+void PropEdit::OnPropbool()
 {
-	validate();	
+	validate();
 }
diff --git a/Generals/Code/Tools/WorldBuilder/src/teamsdialog.cpp b/Generals/Code/Tools/WorldBuilder/src/teamsdialog.cpp
index 0b7688d19b8..1ad5e6a164f 100644
--- a/Generals/Code/Tools/WorldBuilder/src/teamsdialog.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/teamsdialog.cpp
@@ -151,7 +151,7 @@ void CTeamsDialog::updateUI(Int whatToRebuild)
 
 	// constrain team index.
 	if (m_curTeam < 0) m_curTeam = 0;
-	if (m_curTeam >= m_sides.getNumTeams()) 
+	if (m_curTeam >= m_sides.getNumTeams())
 		m_curTeam = m_sides.getNumTeams()-1;
 
 	if (whatToRebuild & REBUILD_TEAMS)
@@ -187,7 +187,7 @@ void CTeamsDialog::updateUI(Int whatToRebuild)
 	--m_updating;
 }
 
-BOOL CTeamsDialog::OnInitDialog() 
+BOOL CTeamsDialog::OnInitDialog()
 {
 	CRect rect;
 
@@ -220,7 +220,7 @@ BOOL CTeamsDialog::OnInitDialog()
 	return TRUE;
 }
 
-void CTeamsDialog::OnOK() 
+void CTeamsDialog::OnOK()
 {
 	Bool modified = m_sides.validateSides();
 	(void)modified;
@@ -232,23 +232,23 @@ void CTeamsDialog::OnOK()
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 
 	thePrevCurTeam = m_curTeam;
-	
+
 	CDialog::OnOK();
 }
 
-void CTeamsDialog::OnCancel() 
+void CTeamsDialog::OnCancel()
 {
 	CDialog::OnCancel();
 }
 
-void CTeamsDialog::OnNewteam() 
+void CTeamsDialog::OnNewteam()
 {
 	Int num = 1;
 	AsciiString tname;
-	do 
+	do
 	{
 		tname.format("team%04d",num++);
-	} 
+	}
 	while (m_sides.findTeamInfo(tname));
 
 	AsciiString oname = m_sides.getTeamInfo(m_curTeam)->getDict()->getAsciiString(TheKey_teamOwner);
@@ -267,7 +267,7 @@ void CTeamsDialog::OnNewteam()
 	updateUI(REBUILD_ALL);
 }
 
-void CTeamsDialog::OnDeleteteam() 
+void CTeamsDialog::OnDeleteteam()
 {
 	if (m_curTeam < 0)
 		return;
@@ -278,7 +278,7 @@ void CTeamsDialog::OnDeleteteam()
 		DEBUG_CRASH(("should not be allowed"));
 		return;
 	}
-	
+
 	AsciiString tname = m_sides.getTeamInfo(m_curTeam)->getDict()->getAsciiString(TheKey_teamName);
 	Int count = MapObject::countMapObjectsWithOwner(tname);
 	if (count > 0)
@@ -293,7 +293,7 @@ void CTeamsDialog::OnDeleteteam()
 	updateUI(REBUILD_ALL);
 }
 
-void CTeamsDialog::OnEditTemplate() 
+void CTeamsDialog::OnEditTemplate()
 {
 	CPropertySheet editDialog;
 	editDialog.Construct("Edit Team:");
@@ -318,7 +318,7 @@ void CTeamsDialog::OnEditTemplate()
 	updateUI(REBUILD_ALL);
 }
 
-void CTeamsDialog::UpdateTeamsList() 
+void CTeamsDialog::UpdateTeamsList()
 {
 	CListCtrl *pList = (CListCtrl *)GetDlgItem(IDC_TEAMS_LIST);
 	pList->DeleteAllItems();
@@ -366,16 +366,16 @@ void CTeamsDialog::UpdateTeamsList()
 			m_curTeam = pList->GetItemData(0);
 			pList->SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
 			pList->EnsureVisible(0, false);
-		} 
+		}
 	}
 }
 
-void CTeamsDialog::OnSelchangePlayerList() 
+void CTeamsDialog::OnSelchangePlayerList()
 {
 	updateUI(REBUILD_ALL);
 }
 
-void CTeamsDialog::OnClickTeamsList(NMHDR* pNMHDR, LRESULT* pResult) 
+void CTeamsDialog::OnClickTeamsList(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	CListCtrl* pList = (CListCtrl*) GetDlgItem(IDC_TEAMS_LIST);
 
@@ -390,7 +390,7 @@ void CTeamsDialog::OnClickTeamsList(NMHDR* pNMHDR, LRESULT* pResult)
 	*pResult = 0;
 }
 
-void CTeamsDialog::OnDblclkTeamsList(NMHDR* pNMHDR, LRESULT* pResult) 
+void CTeamsDialog::OnDblclkTeamsList(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	CListCtrl* pList = (CListCtrl*) GetDlgItem(IDC_TEAMS_LIST);
 
@@ -406,17 +406,17 @@ void CTeamsDialog::OnDblclkTeamsList(NMHDR* pNMHDR, LRESULT* pResult)
 	*pResult = 0;
 }
 
-void CTeamsDialog::OnCopyteam() 
+void CTeamsDialog::OnCopyteam()
 {
 	Dict d = *m_sides.getTeamInfo(m_curTeam)->getDict();
 	AsciiString origName = d.getAsciiString(TheKey_teamName);
 
 	Int num = 1;
 	AsciiString tname;
-	do 
+	do
 	{
 		tname.format("%s.%2d",origName.str(), num++);
-	} 
+	}
 	while (m_sides.findTeamInfo(tname));
 
 	d.setAsciiString(TheKey_teamName, tname);
@@ -425,7 +425,7 @@ void CTeamsDialog::OnCopyteam()
 	updateUI(REBUILD_ALL);
 }
 
-void CTeamsDialog::OnSelectTeamMembers() 
+void CTeamsDialog::OnSelectTeamMembers()
 {
 	Int count = 0;
 	Dict d = *m_sides.getTeamInfo(m_curTeam)->getDict();
@@ -456,7 +456,7 @@ void CTeamsDialog::OnSelectTeamMembers()
 }
 
 /** This function moves a team up the list in the teams list dialog */
-void CTeamsDialog::OnMoveUpTeam() 
+void CTeamsDialog::OnMoveUpTeam()
 {
 	// don't move up if already at top of list
 	if (m_curTeam <= 1)
@@ -515,7 +515,7 @@ void CTeamsDialog::OnMoveUpTeam()
 }
 
 /// This function moves a team down the list in the teams list dialog
-void CTeamsDialog::OnMoveDownTeam() 
+void CTeamsDialog::OnMoveDownTeam()
 {
 	// don't move down if already at bottom of list
 	if (m_curTeam >= m_sides.getNumTeams()-1)
@@ -537,7 +537,7 @@ void CTeamsDialog::OnMoveDownTeam()
 			startRemove = i;
 		}
 
-		/* saves the one right after the selected item, deletes it from the list, 
+		/* saves the one right after the selected item, deletes it from the list,
 		 then adds it to the bottom of the list -- then adds the saved "temp" item
 		 to the bottom of the list */
 		else if (i == (m_curTeam+1)) {
diff --git a/Generals/Code/Tools/WorldBuilder/src/wbview.cpp b/Generals/Code/Tools/WorldBuilder/src/wbview.cpp
index bf6b06db564..d512204cf15 100644
--- a/Generals/Code/Tools/WorldBuilder/src/wbview.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/wbview.cpp
@@ -134,7 +134,7 @@ BEGIN_MESSAGE_MAP(WbView, CView)
 	ON_COMMAND(ID_VIEW_SHOW_TERRAIN, OnShowTerrain)
 	ON_UPDATE_COMMAND_UI(ID_VIEW_SHOW_TERRAIN, OnUpdateShowTerrain)
 	ON_WM_CREATE()
-	
+
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -188,9 +188,9 @@ void WbView::mouseMove(TTrackingMode m, CPoint viewPt)
 {
 	MSG msg;
 	while (::PeekMessage(&msg, m_hWnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE)) {
-		viewPt.x = (short)LOWORD(msg.lParam);  // horizontal position of cursor 
-		viewPt.y = (short)HIWORD(msg.lParam);  // vertical position of cursor 
-		DEBUG_LOG(("Peek mouse %d, %d\n", viewPt.x,  viewPt.y));
+		viewPt.x = (short)LOWORD(msg.lParam);  // horizontal position of cursor
+		viewPt.y = (short)HIWORD(msg.lParam);  // vertical position of cursor
+		DEBUG_LOG(("Peek mouse %d, %d", viewPt.x,  viewPt.y));
 	}
 
 	if (m_trackingMode == TRACK_NONE) {
@@ -225,7 +225,7 @@ void WbView::mouseMove(TTrackingMode m, CPoint viewPt)
 		Int flags = pObj->getFlags();
 		if (!(pObj->isWaypoint() || (flags & flagsWeDontWant) != 0))
 			++totalObjects;
-		else 
+		else
 			++totalWaypoints;
 
 		pObj = pObj->getNext();
@@ -292,7 +292,7 @@ void WbView::mouseUp(TTrackingMode m, CPoint viewPt)
 	if (m_trackingMode == TRACK_NONE)
 		return;
 
-	if (GetCapture() == this) 
+	if (GetCapture() == this)
 	{
 		ReleaseCapture();
 	}
@@ -318,37 +318,37 @@ void WbView::mouseUp(TTrackingMode m, CPoint viewPt)
 	m_trackingMode = TRACK_NONE;
 }
 
-void WbView::OnMouseMove(UINT nFlags, CPoint point) 
+void WbView::OnMouseMove(UINT nFlags, CPoint point)
 {
 	mouseMove(m_trackingMode, point);
 }
 
-void WbView::OnRButtonUp(UINT nFlags, CPoint point) 
+void WbView::OnRButtonUp(UINT nFlags, CPoint point)
 {
 	mouseUp(TRACK_R, point);
 }
 
-void WbView::OnRButtonDown(UINT nFlags, CPoint point) 
+void WbView::OnRButtonDown(UINT nFlags, CPoint point)
 {
 	mouseDown(TRACK_R, point);
 }
 
-void WbView::OnLButtonUp(UINT nFlags, CPoint point) 
+void WbView::OnLButtonUp(UINT nFlags, CPoint point)
 {
 	mouseUp(TRACK_L, point);
 }
 
-void WbView::OnLButtonDown(UINT nFlags, CPoint point) 
+void WbView::OnLButtonDown(UINT nFlags, CPoint point)
 {
 	mouseDown(TRACK_L, point);
 }
 
-void WbView::OnMButtonUp(UINT nFlags, CPoint point) 
+void WbView::OnMButtonUp(UINT nFlags, CPoint point)
 {
 	mouseUp(TRACK_M, point);
 }
 
-void WbView::OnMButtonDown(UINT nFlags, CPoint point) 
+void WbView::OnMButtonDown(UINT nFlags, CPoint point)
 {
 	mouseDown(TRACK_M, point);
 }
@@ -420,12 +420,12 @@ void WbView::constrainCenterPt()
 //=============================================================================
 /** Standard window handler method for updating the cursor. */
 //=============================================================================
-BOOL WbView::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) 
+BOOL WbView::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
 {
 	if (nHitTest == HTCLIENT) {
 		// If we are tracking in our window, update the tool.
 		WbApp()->updateCurTool(false);
-		if (WbApp()->getCurTool()) {                       
+		if (WbApp()->getCurTool()) {
 			// Let the current tool set it's cursor.
 			WbApp()->getCurTool()->setCursor();
 		} else {
@@ -438,9 +438,9 @@ BOOL WbView::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
 	return(CView::OnSetCursor(pWnd, nHitTest, message));
 }
 
- 
+
 /** Handles the delete menu action. */
-void WbView::OnEditDelete() 
+void WbView::OnEditDelete()
 {
 	if (PolygonTool::isActive() || m_showPolygonTriggers) {
 		if (PolygonTool::deleteSelectedPolygon()) {
@@ -457,9 +457,9 @@ void WbView::OnEditDelete()
 
 /** Handles the key down event.  Currently, handles delete keys, and checks
 for updates to the current tool. */
-void WbView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) 
+void WbView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 {
-	if (nChar == VK_DELETE || nChar == VK_BACK) {	
+	if (nChar == VK_DELETE || nChar == VK_BACK) {
 		OnEditDelete();
 	}
 	WbApp()->updateCurTool(false);
@@ -468,15 +468,15 @@ void WbView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 
 /** Handles the key up event.  Currently, handles delete keys, and checks
 for updates to the current tool. */
-void WbView::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags) 
+void WbView::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags)
 {
 	WbApp()->updateCurTool(false);
 	OnSetCursor(this,HTCLIENT,0);
 }
 
-void WbView::OnEditCopy() 
+void WbView::OnEditCopy()
 {
-	MapObject *pTheCopy = NULL;	
+	MapObject *pTheCopy = NULL;
 	MapObject *pTmp = NULL;
 
 	MapObject *pObj = MapObject::getFirstMapObject();
@@ -513,26 +513,26 @@ void WbView::OnEditCopy()
 	pTheCopy = NULL; // belongs to the app.
 }
 
-void WbView::OnUpdateEditCopy(CCmdUI* pCmdUI) 
+void WbView::OnUpdateEditCopy(CCmdUI* pCmdUI)
 {
-	pCmdUI->Enable();	
+	pCmdUI->Enable();
 }
 
-void WbView::OnEditCut() 
+void WbView::OnEditCut()
 {
 	OnEditCopy();
 	OnEditDelete();
 }
 
-void WbView::OnUpdateEditCut(CCmdUI* pCmdUI) 
+void WbView::OnUpdateEditCut(CCmdUI* pCmdUI)
 {
-	pCmdUI->Enable();	
+	pCmdUI->Enable();
 }
 
-void WbView::OnEditPaste() 
+void WbView::OnEditPaste()
 {
 	CWorldBuilderDoc* pDoc = WbDoc();
-	MapObject *pTheCopy = NULL;	
+	MapObject *pTheCopy = NULL;
 	MapObject *pTmp = NULL;
 
 	/* First, clear the selection. */
@@ -543,7 +543,7 @@ void WbView::OnEditPaste()
 		pTmp = pObj->duplicate();
 		pTmp->setNextMap(pTheCopy);
 		pTmp->validate();
-		
+
 		pTheCopy = pTmp;
 		pTmp->setSelected(true);
 		pObj = pObj->getNext();
@@ -556,7 +556,7 @@ void WbView::OnEditPaste()
 }
 
 /** Toggles the show objects flag and invals the window. */
-void WbView::OnViewShowObjects() 
+void WbView::OnViewShowObjects()
 {
 	m_showObjects = !m_showObjects;
 	Invalidate(false);
@@ -568,48 +568,48 @@ void WbView::OnViewShowObjects()
 }
 
 /** Sets the check in the menu to match the show objects flag. */
-void WbView::OnUpdateViewShowObjects(CCmdUI* pCmdUI) 
+void WbView::OnUpdateViewShowObjects(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showObjects?1:0);
 }
 
-void WbView::OnUpdateEditPaste(CCmdUI* pCmdUI) 
+void WbView::OnUpdateEditPaste(CCmdUI* pCmdUI)
 {
 	MapObject *pTheCopy = WbApp()->getMapObjPasteList();
 	pCmdUI->Enable(pTheCopy != NULL);
 }
 
-void WbView::OnViewSnaptogrid() 
+void WbView::OnViewSnaptogrid()
 {
 	m_snapToGrid = !m_snapToGrid;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "SnapToGrid", m_snapToGrid?1:0);
 }
 
-void WbView::OnUpdateViewSnaptogrid(CCmdUI* pCmdUI) 
+void WbView::OnUpdateViewSnaptogrid(CCmdUI* pCmdUI)
 {
-	pCmdUI->SetCheck(m_snapToGrid?1:0);	
+	pCmdUI->SetCheck(m_snapToGrid?1:0);
 }
 
-void WbView::OnEditSelectdup() 
+void WbView::OnEditSelectdup()
 {
 	WorldHeightMapEdit *pMap = WbDoc()->GetHeightMap();
 	if (pMap==NULL) return;
 	pMap->selectDuplicates();
 }
-void WbView::OnEditSelectsimilar() 
+void WbView::OnEditSelectsimilar()
 {
 	WorldHeightMapEdit *pMap = WbDoc()->GetHeightMap();
 	if (pMap==NULL) return;
 	pMap->selectSimilar();
 }
-void WbView::OnEditSelectinvalidteam() 
+void WbView::OnEditSelectinvalidteam()
 {
 	WorldHeightMapEdit *pMap = WbDoc()->GetHeightMap();
 	if (pMap==NULL) return;
 	pMap->selectInvalidTeam();
 }
 
-void WbView::OnEditReplace() 
+void WbView::OnEditReplace()
 {
 	WorldHeightMapEdit *pMap = WbDoc()->GetHeightMap();
 	if (pMap==NULL) return;
@@ -648,7 +648,7 @@ void WbView::OnEditReplace()
 
 
 /** Shows the selected status of the reflects in mirror flag. */
-void WbView::OnUpdateObjectpropertiesReflectsinmirror(CCmdUI* pCmdUI) 
+void WbView::OnUpdateObjectpropertiesReflectsinmirror(CCmdUI* pCmdUI)
 {
 	Bool reflects = false;
 	Bool multiple = false;
@@ -677,7 +677,7 @@ void WbView::OnUpdateObjectpropertiesReflectsinmirror(CCmdUI* pCmdUI)
 	pCmdUI->SetCheck(val);
 }
 
-void WbView::OnObjectpropertiesReflectsinmirror() 
+void WbView::OnObjectpropertiesReflectsinmirror()
 {
 	Bool reflects = false;
 
@@ -688,7 +688,7 @@ void WbView::OnObjectpropertiesReflectsinmirror()
 		}
 		if (pMapObj->getFlag(FLAG_DRAWS_IN_MIRROR)) {
 			reflects = true;
-		} 
+		}
 	}
 
 	CWorldBuilderDoc* pDoc = WbDoc();
@@ -698,19 +698,19 @@ void WbView::OnObjectpropertiesReflectsinmirror()
 }
 
 // This is actually lock angle - used to be horizontal & vertical, now just 1.
-void WbView::OnLockHorizontal() 
+void WbView::OnLockHorizontal()
 {
 	m_lockAngle = !m_lockAngle;
 }
 
 // This is actually lock angle - used to be horizontal & vertical, now just 1.
-void WbView::OnUpdateLockHorizontal(CCmdUI* pCmdUI) 
+void WbView::OnUpdateLockHorizontal(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_lockAngle?1:0);
 }
 
 // Obsolete. Delete Jan15,2002 if nobody complains about it being missing.  jba.
-void WbView::OnLockVertical() 
+void WbView::OnLockVertical()
 {
 //	m_lockVertical = !m_lockVertical;
 //	if (m_lockVertical) {
@@ -719,59 +719,59 @@ void WbView::OnLockVertical()
 }
 
 // Obsolete. Delete Jan15,2002 if nobody complains about it being missing.  jba.
-void WbView::OnUpdateLockVertical(CCmdUI* pCmdUI) 
+void WbView::OnUpdateLockVertical(CCmdUI* pCmdUI)
 {
 //	pCmdUI->SetCheck(m_lockVertical?1:0);
 }
 
-void WbView::OnEditGloballightoptions() 
+void WbView::OnEditGloballightoptions()
 {
 	CMainFrame::GetMainFrame()->OnEditGloballightoptions();
 
-//	GlobalLightOptions globalLightDialog(this);	
+//	GlobalLightOptions globalLightDialog(this);
 //	globalLightDialog.DoModal();
 //	Coord3D lightRay;
 //	lightRay.x=0.0f;lightRay.y=0.0f;lightRay.z=-1.0f;	//default light above terrain.
 //	doLightFeedback(false,lightRay,0);	//turn off the light direction indicator
 }
 
-void WbView::OnViewShowwaypoints() 
+void WbView::OnViewShowwaypoints()
 {
 	m_showWaypoints = !m_showWaypoints;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowWaypoints", m_showWaypoints?1:0);
 	PointerTool::clearSelection();
 }
 
-void WbView::OnUpdateViewShowwaypoints(CCmdUI* pCmdUI) 
+void WbView::OnUpdateViewShowwaypoints(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showWaypoints?1:0);
 }
 
-void WbView::OnViewShowpolygontriggers() 
+void WbView::OnViewShowpolygontriggers()
 {
 	m_showPolygonTriggers = !m_showPolygonTriggers;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowPolygonTriggers", m_showPolygonTriggers?1:0);
 }
 
-void WbView::OnUpdateViewShowpolygontriggers(CCmdUI* pCmdUI) 
+void WbView::OnUpdateViewShowpolygontriggers(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showPolygonTriggers?1:0);
 }
 
-void WbView::OnEditPlayerlist() 
+void WbView::OnEditPlayerlist()
 {
 	PlayerListDlg dlg;
 	dlg.DoModal();
 }
 
-void WbView::OnEditWorldinfo() 
+void WbView::OnEditWorldinfo()
 {
 	// TODO jkmcd: are we going to ever use this? If so, implement it.
 #if 0
 	Dict *d = MapObject::getWorldDict();
 	Dict dcopy = *d;
 	MapObjectProps editor(&dcopy, "Edit World Info", NULL);
-	if (editor.DoModal() == IDOK) 
+	if (editor.DoModal() == IDOK)
 	{
 		CWorldBuilderDoc* pDoc = WbDoc();
 		DictItemUndoable *pUndo = new DictItemUndoable(d, dcopy, NAMEKEY_INVALID);
@@ -781,102 +781,102 @@ void WbView::OnEditWorldinfo()
 #endif
 }
 
-void WbView::OnPickStructures() 
+void WbView::OnPickStructures()
 {
 	m_pickConstraint = ES_STRUCTURE;
 }
 
-void WbView::OnUpdatePickStructures(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickStructures(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_STRUCTURE)?1:0);
 }
 
-void WbView::OnPickInfantry() 
+void WbView::OnPickInfantry()
 {
 	m_pickConstraint = ES_INFANTRY;
 }
 
-void WbView::OnUpdatePickInfantry(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickInfantry(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_INFANTRY)?1:0);
 }
 
-void WbView::OnPickVehicles() 
+void WbView::OnPickVehicles()
 {
 	m_pickConstraint = ES_VEHICLE;
 }
 
-void WbView::OnUpdatePickVehicles(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickVehicles(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_VEHICLE)?1:0);
 }
 
-void WbView::OnPickShrubbery() 
+void WbView::OnPickShrubbery()
 {
 	m_pickConstraint = ES_SHRUBBERY;
 }
 
-void WbView::OnUpdatePickShrubbery(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickShrubbery(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_SHRUBBERY)?1:0);
 }
 
-void WbView::OnPickManMade() 
+void WbView::OnPickManMade()
 {
 	m_pickConstraint = ES_MISC_MAN_MADE;
 }
 
-void WbView::OnUpdatePickManMade(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickManMade(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_MISC_MAN_MADE)?1:0);
 }
 
-void WbView::OnPickNatural() 
+void WbView::OnPickNatural()
 {
 	m_pickConstraint = ES_MISC_NATURAL;
 }
 
-void WbView::OnUpdatePickNatural(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickNatural(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_MISC_NATURAL)?1:0);
 }
 
-void WbView::OnPickDebris() 
+void WbView::OnPickDebris()
 {
 	m_pickConstraint = ES_DEBRIS;
 }
 
-void WbView::OnUpdatePickDebris(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickDebris(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_DEBRIS)?1:0);
 }
 
-void WbView::OnPickAnything() 
+void WbView::OnPickAnything()
 {
 	m_pickConstraint = ES_NONE;
 }
 
-void WbView::OnUpdatePickAnything(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickAnything(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_NONE)?1:0);
 }
 
-void WbView::OnPickWaypoints() 
+void WbView::OnPickWaypoints()
 {
 	m_pickConstraint = ES_WAYPOINT;
 }
 
-void WbView::OnUpdatePickWaypoints(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickWaypoints(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_WAYPOINT)?1:0);
 }
 
-void WbView::OnPickRoads() 
+void WbView::OnPickRoads()
 {
 	m_pickConstraint = ES_ROAD;
 }
 
-void WbView::OnUpdatePickRoads(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickRoads(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_ROAD)?1:0);
 }
@@ -891,7 +891,7 @@ void WbView::OnUpdatePickSounds(CCmdUI* pCmdUI)
 	pCmdUI->SetCheck((m_pickConstraint == ES_AUDIO) ? 1 : 0);
 }
 
-void WbView::OnShowNames() 
+void WbView::OnShowNames()
 {
 	m_showNames = m_showNames ? false : true;
 	Invalidate(false);
@@ -903,7 +903,7 @@ void WbView::OnShowNames()
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowNames", m_showNames?1:0);
 }
 
-void WbView::OnUpdateShowNames(CCmdUI* pCmdUI) 
+void WbView::OnUpdateShowNames(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showNames ? 1 : 0);
 }
@@ -913,7 +913,7 @@ void WbView::OnValidationFixTeams()
 	std::vector<Dict *> allTeamDicts;
 	Int numTeams = TheSidesList->getNumTeams();
 	// Get all team dicts in the map
-	for (Int i = 0; i < numTeams; ++i) 
+	for (Int i = 0; i < numTeams; ++i)
 	{
 		allTeamDicts.push_back(TheSidesList->getTeamInfo(i)->getDict());
 	}
@@ -926,7 +926,7 @@ void WbView::OnValidationFixTeams()
 	DictItemUndoable *pUndo = new DictItemUndoable(&allTeamDicts.front(), newDict, newDict.getNthKey(0), allTeamDicts.size(), pDoc, true);
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-	
+
 	// Show a message indicating success.
 	AfxMessageBox(IDS_TEAMS_FIXED);
 }
@@ -949,7 +949,7 @@ void WbView::OnUpdateShowTerrain(CCmdUI* pCmdUI)
 }
 
 
-void WbView::OnEditTeamlist() 
+void WbView::OnEditTeamlist()
 {
 	CTeamsDialog dlg;
 	dlg.DoModal();
diff --git a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp b/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp
index b29b202d74f..52cfb0e994e 100644
--- a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp
@@ -31,7 +31,6 @@
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 #include "agg_def.h"
 #include "part_ldr.h"
-#include "rendobj.h"
 #include "hanim.h"
 #include "dx8wrapper.h"
 #include "dx8indexbuffer.h"
@@ -78,6 +77,7 @@
 #include "WorldBuilder.h"
 #include "wbview3d.h"
 #include "Common/Debug.h"
+#include "Common/FramePacer.h"
 #include "Common/ThingFactory.h"
 #include "GameClient/Water.h"
 #include "Common/WellKnownKeys.h"
@@ -95,11 +95,6 @@
 
 #include <d3dx8.h>
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ----------------------------------------------------------------------------
 // Misc. Forward Declarations
@@ -140,6 +135,7 @@ static void WWDebug_Message_Callback(DebugType type, const char * message)
 {
 #ifdef RTS_DEBUG
 	::OutputDebugString(message);
+	::OutputDebugString("\n");
 #endif
 }
 
@@ -148,6 +144,7 @@ static void WWAssert_Callback(const char * message)
 {
 #ifdef RTS_DEBUG
 	::OutputDebugString(message);
+	::OutputDebugString("\n");
 	::DebugBreak();
 #endif
 }
@@ -186,6 +183,7 @@ class PlaceholderView : public View
 
 	virtual void drawView( void ) {};															///< Render the world visible in this view.
 	virtual void updateView( void ) {};															///< Render the world visible in this view.
+	virtual void stepView() {}; ///< Update view for every fixed time step
 
 	virtual void setZoomLimited( Bool limit ) {}			///< limit the zoom height
 	virtual Bool isZoomLimited( void ) { return TRUE; }							///< get status of zoom limit
@@ -194,7 +192,7 @@ class PlaceholderView : public View
 	virtual Int getWidth( void ) { return m_width; }
 	virtual void setHeight( Int height ) { m_height = height; }
 	virtual Int getHeight( void ) { return m_height; }
-	virtual void setOrigin( Int x, Int y) { m_originX=x; m_originY=y;}				///< Sets location of top-left view corner on display 
+	virtual void setOrigin( Int x, Int y) { m_originX=x; m_originY=y;}				///< Sets location of top-left view corner on display
 	virtual void getOrigin( Int *x, Int *y) { *x=m_originX; *y=m_originY;}			///< Return location of top-left view corner on display
 
 	virtual void forceRedraw() { }
@@ -202,11 +200,11 @@ class PlaceholderView : public View
 	virtual void lookAt( const Coord3D *o ){};														///< Center the view on the given coordinate
 	virtual void initHeightForMap( void ) {};														///<  Init the camera height for the map at the current position.
 	virtual void scrollBy( Coord2D *delta ){};														///< Shift the view by the given delta
-	virtual void moveCameraTo(const Coord3D *o, Int frames, Int shutter, 
+	virtual void moveCameraTo(const Coord3D *o, Int frames, Int shutter,
 														Bool orient) {lookAt(o);};
-	virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, 
+	virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter,
 														Bool orient) {};
-	virtual Bool isCameraMovementFinished(void) {return true;}; 
+	virtual Bool isCameraMovementFinished(void) {return true;};
  	virtual void resetCamera(const Coord3D *location, Int frames) {}; ///< Move camera to location, and reset to default angle & zoom.
  	virtual void rotateCamera(Real rotations, Int frames) {}; ///< Rotate camera about current viewpoint.
 	virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds) {};	///< Rotate camera to face an object, and hold on it
@@ -225,12 +223,12 @@ class PlaceholderView : public View
 	virtual void setDefaultView(Real pitch, Real angle, Real maxHeight) {};
 	virtual void zoomCamera( Real finalZoom, Int milliseconds ) {};
 	virtual void pitchCamera( Real finalPitch, Int milliseconds ) {};
-															
+
 	virtual void setAngle( Real angle ){};																///< Rotate the view around the up axis to the given angle
 	virtual Real getAngle( void ) { return 0; }
 	virtual void setPitch( Real angle ){};																	///< Rotate the view around the horizontal axis to the given angle
 	virtual Real getPitch( void ) { return 0; }							///< Return current camera pitch
-	virtual void setAngleAndPitchToDefault( void ){};													///< Set the view angle back to default 
+	virtual void setAngleAndPitchToDefault( void ){};													///< Set the view angle back to default
 	virtual void getPosition(Coord3D *pos)	{ ;}											///< Return camera position
 
 	virtual Real getHeightAboveGround() { return 1; }
@@ -274,7 +272,7 @@ class PlaceholderView : public View
 	virtual enum FilterTypes	 getViewFilterType(void) {return (enum FilterTypes)0;}			///< Turns on viewport special effect (black & white mode)
 
 	virtual void shake( const Coord3D *epicenter, CameraShakeType shakeType ) {};
-	
+
 	virtual Real getFXPitch( void ) const { return 1.0f; }
 	virtual void forceCameraConstraintRecalc(void) { }
 	virtual void rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds) {};	///< Rotate camera to face an object, and hold on it
@@ -299,7 +297,7 @@ class SkeletonSceneClass : public RTS3DScene
 	SkeletonSceneClass(void) : m_testPass(NULL) { }
 	~SkeletonSceneClass(void) { REF_PTR_RELEASE(m_testPass); }
 
-	void					Set_Material_Pass(MaterialPassClass * pass)	{ REF_PTR_SET(m_testPass, pass); }	
+	void					Set_Material_Pass(MaterialPassClass * pass)	{ REF_PTR_SET(m_testPass, pass); }
 	virtual void Remove_Render_Object(RenderObjClass * obj);
 
 	Bool safeContains(RenderObjClass *obj);
@@ -372,7 +370,7 @@ WbView3d::WbView3d() :
 	m_scene(NULL),
 	m_overlayScene(NULL),
 	m_transparentObjectsScene(NULL),
-	m_baseBuildScene(NULL),	 
+	m_baseBuildScene(NULL),
 	m_objectToolTrackingObj(NULL),
 	m_showObjToolTrackingObj(false),
 	m_camera(NULL),
@@ -404,7 +402,7 @@ WbView3d::WbView3d() :
 	m_showLayersList(false),
 	m_showMapBoundaries(false)
 {
-	TheTacticalView = &bogusTacticalView;  
+	TheTacticalView = &bogusTacticalView;
 	m_actualWinSize.x = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "Width", THREE_D_VIEW_WIDTH);
 	m_actualWinSize.y = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "Height", THREE_D_VIEW_HEIGHT);
 	m_cameraOffset.x = m_cameraOffset.y = m_cameraOffset.z = 1;
@@ -453,14 +451,14 @@ void WbView3d::shutdownWW3D(void)
 		}
 
 		if (TheW3DShadowManager)
-		{	
+		{
 			TheW3DShadowManager->removeAllShadows();
 			delete TheW3DShadowManager;
 			TheW3DShadowManager=NULL;
 		}
 		REF_PTR_RELEASE(m_transparentObjectsScene);
 		REF_PTR_RELEASE(m_overlayScene);
-		REF_PTR_RELEASE(m_baseBuildScene);	
+		REF_PTR_RELEASE(m_baseBuildScene);
 		REF_PTR_RELEASE(m_objectToolTrackingObj);
 		REF_PTR_RELEASE(m_scene);
 		REF_PTR_RELEASE(m_camera);
@@ -476,19 +474,16 @@ void WbView3d::shutdownWW3D(void)
 		WWMath::Shutdown();
 	}
 	m_ww3dInited = false;
-	if (m_intersector) {
-		delete m_intersector;
-		m_intersector = NULL;
-	}
 
-	if (m_layer) {
-		delete m_layer;
-		m_layer = NULL;
-	}
-	if (m_buildLayer) {
-		delete m_buildLayer;
-		m_buildLayer = NULL;
-	}
+	delete m_intersector;
+	m_intersector = NULL;
+
+	delete m_layer;
+	m_layer = NULL;
+
+	delete m_buildLayer;
+	m_buildLayer = NULL;
+
 	if (m3DFont) {
 		m3DFont->Release();
 		m3DFont = NULL;
@@ -550,7 +545,7 @@ void WbView3d::ReAcquireResources(void)
 		} else {
 			m3DFont = NULL;
 		}
-		
+
 	} else {
 		m3DFont = NULL;
 	}
@@ -558,7 +553,7 @@ void WbView3d::ReAcquireResources(void)
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::killTheTimer(void) 
+void WbView3d::killTheTimer(void)
 {
 	if (m_timer != NULL) {
 		KillTimer(m_timer);
@@ -567,9 +562,9 @@ void WbView3d::killTheTimer(void)
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::reset3dEngineDisplaySize(Int width, Int height) 
+void WbView3d::reset3dEngineDisplaySize(Int width, Int height)
 {
-	if (m_actualWinSize.x == width && 
+	if (m_actualWinSize.x == width &&
 		m_actualWinSize.y == height) {
 		return;
 	}
@@ -589,12 +584,12 @@ void WbView3d::reset3dEngineDisplaySize(Int width, Int height)
 void WbView3d::initAssets()
 {
 
-	m_assetManager = new W3DAssetManager;	
+	m_assetManager = new W3DAssetManager;
 	m_assetManager->Register_Prototype_Loader(&_ParticleEmitterLoader );
 	m_assetManager->Register_Prototype_Loader(&_AggregateLoader);
 	m_assetManager->Set_WW3D_Load_On_Demand(true);
 }
-	
+
 // ----------------------------------------------------------------------------
 #define TERRAIN_SAMPLE_SIZE 40.0f
 static Real getHeightAroundPos(WBHeightMap *heightMap, Real x, Real y)
@@ -622,7 +617,7 @@ void WbView3d::setupCamera()
 		Real zAbs = zOffset + zPos;
 		if (zAbs<0) zAbs = -zAbs;
 		if (zAbs<0.01) zAbs = 0.01f;
-		//DEBUG_LOG(("zOffset = %.2f, zAbs = %.2f, zPos = %.2f\n", zOffset, zAbs, zPos));	
+		//DEBUG_LOG(("zOffset = %.2f, zAbs = %.2f, zPos = %.2f", zOffset, zAbs, zPos));
 		if (zOffset > 0) {
 			zOffset *= zAbs;
 		}	else if (zOffset < -0.3f) {
@@ -631,7 +626,7 @@ void WbView3d::setupCamera()
 		if (zOffset < -0.6f) {
 			zOffset = -0.3f + zOffset/2.0f;
 		}
-		//DEBUG_LOG(("zOffset = %.2f\n", zOffset));
+		//DEBUG_LOG(("zOffset = %.2f", zOffset));
 		zoom = zAbs;
 	}
 
@@ -645,7 +640,7 @@ void WbView3d::setupCamera()
 	pos.y = m_centerPt.Y* MAP_XY_FACTOR;
 	pos.z = m_centerPt.Z* MAP_XY_FACTOR;
 
-	Real groundLevel = getHeightAroundPos(m_heightMapRenderObj, pos.x, pos.y);  
+	Real groundLevel = getHeightAroundPos(m_heightMapRenderObj, pos.x, pos.y);
 
 	// set position of camera itself
 	/*
@@ -686,7 +681,7 @@ void WbView3d::setupCamera()
 	sourcePos.X += pos.x;
 	sourcePos.Y += pos.y;
 	sourcePos.Z += pos.z+groundLevel;
-	
+
 	targetPos.X += pos.x;
 	targetPos.Y += pos.y;
 	targetPos.Z += pos.z+groundLevel;
@@ -701,7 +696,7 @@ void WbView3d::setupCamera()
 	m_cameraSource = sourcePos;
 	m_cameraTarget = targetPos;
 	/*
-	DEBUG_LOG(("Camera: pos=(%g,%g) height=%g pitch=%g FXPitch=%g yaw=%g groundLevel=%g\n",
+	DEBUG_LOG(("Camera: pos=(%g,%g) height=%g pitch=%g FXPitch=%g yaw=%g groundLevel=%g",
 		targetPos.X, targetPos.Y,
 		m_actualHeightAboveGround,
 		pitch,
@@ -741,10 +736,10 @@ void WbView3d::setupCamera()
 // ----------------------------------------------------------------------------
 void WbView3d::init3dScene()
 {
-	// build scene	
+	// build scene
 	REF_PTR_RELEASE(m_overlayScene);
 	REF_PTR_RELEASE(m_transparentObjectsScene);
-	REF_PTR_RELEASE(m_baseBuildScene); 
+	REF_PTR_RELEASE(m_baseBuildScene);
 	REF_PTR_RELEASE(m_scene);
 	REF_PTR_RELEASE(m_camera);
 	REF_PTR_RELEASE(m_heightMapRenderObj);
@@ -763,13 +758,13 @@ void WbView3d::init3dScene()
 	theDynamicLight->Set_Diffuse( Vector3( red, green, blue) );
 	theDynamicLight->Set_Position(Vector3(211, 363, 10));
 	theDynamicLight->Set_Far_Attenuation_Range(5, 15);
-	// Note: Don't Add_Render_Object dynamic lights. 
+	// Note: Don't Add_Render_Object dynamic lights.
 	m_scene->addDynamicLight( theDynamicLight );
 #endif
 	m_overlayScene = NEW_REF(SkeletonSceneClass,());
 	m_baseBuildScene = NEW_REF(SkeletonSceneClass,());
 	m_transparentObjectsScene = NEW_REF(SkeletonSceneClass,());
-//	m_scene->Set_Polygon_Mode(SceneClass::LINE);	
+//	m_scene->Set_Polygon_Mode(SceneClass::LINE);
 	m_scene->Set_Ambient_Light(Vector3(0.5f,0.5f,0.5f));
 	m_overlayScene->Set_Ambient_Light(Vector3(0.5f,0.5f,0.5f));
 	m_baseBuildScene->Set_Ambient_Light(Vector3(0.5f,0.5f,0.5f));
@@ -783,7 +778,7 @@ void WbView3d::init3dScene()
 void WbView3d::resetRenderObjects()
 {
 	if (!m_scene) return;
-	if (TheW3DShadowManager) {	
+	if (TheW3DShadowManager) {
 		TheW3DShadowManager->removeAllShadows();
 	}
 
@@ -809,7 +804,7 @@ void WbView3d::resetRenderObjects()
 	m_baseBuildScene->Destroy_Iterator(sceneIter);
 	MapObject *pMapObj = MapObject::getFirstMapObject();
 	// Erase references to render objs that have been removed.
-	while (pMapObj) 
+	while (pMapObj)
 	{
 		pMapObj->setRenderObj(NULL);
 		pMapObj = pMapObj->getNext();
@@ -817,7 +812,7 @@ void WbView3d::resetRenderObjects()
 
 	Int i;
 	for (i=0; i<TheSidesList->getNumSides(); i++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(i);
 		BuildListInfo *pBuild = pSide->getBuildList();
 		while (pBuild) {
 			pBuild->setRenderObj(NULL);
@@ -838,7 +833,7 @@ void WbView3d::resetRenderObjects()
 // ----------------------------------------------------------------------------
 void WbView3d::stepTimeOfDay()
 {
-	TheWritableGlobalData->m_timeOfDay = (TimeOfDay)(TheGlobalData->m_timeOfDay+1); 
+	TheWritableGlobalData->m_timeOfDay = (TimeOfDay)(TheGlobalData->m_timeOfDay+1);
 	if (TheGlobalData->m_timeOfDay >= TIME_OF_DAY_COUNT) {
 		TheWritableGlobalData->m_timeOfDay = TIME_OF_DAY_FIRST;
 	}
@@ -851,12 +846,12 @@ void WbView3d::setLighting(const GlobalData::TerrainLighting *tl, Int whichLight
 {
 	if (whichLighting == GlobalLightOptions::K_TERRAIN) {
 		TheWritableGlobalData->m_terrainLighting[TheGlobalData->m_timeOfDay][whichLight]= *tl;
-	} else if (whichLighting == GlobalLightOptions::K_OBJECTS) { 
+	} else if (whichLighting == GlobalLightOptions::K_OBJECTS) {
 		TheWritableGlobalData->m_terrainObjectsLighting[TheGlobalData->m_timeOfDay][whichLight]	= *tl;
-	} else if (whichLighting == GlobalLightOptions::K_BOTH) { 
+	} else if (whichLighting == GlobalLightOptions::K_BOTH) {
 		TheWritableGlobalData->m_terrainObjectsLighting[TheGlobalData->m_timeOfDay][whichLight]	= *tl;
 		TheWritableGlobalData->m_terrainLighting[TheGlobalData->m_timeOfDay][whichLight]	= *tl;
-	} 
+	}
 	const GlobalData::TerrainLighting *ol = &TheGlobalData->m_terrainObjectsLighting[TheGlobalData->m_timeOfDay][whichLight];
 	TheWritableGlobalData->setTimeOfDay(TheGlobalData->m_timeOfDay);
 	if( m_globalLight ) {
@@ -869,12 +864,12 @@ void WbView3d::setLighting(const GlobalData::TerrainLighting *tl, Int whichLight
 		if( m_scene && whichLight == 0) {	//only let the first light contribute to ambient
 			m_scene->Set_Ambient_Light( Vector3(ol->ambient.red, ol->ambient.green, ol->ambient.blue) );
 			m_baseBuildScene->Set_Ambient_Light( Vector3(ol->ambient.red, ol->ambient.green, ol->ambient.blue) );
-		}	
+		}
 	}
 	if(TheTerrainRenderObject) {
 		TheTerrainRenderObject->setTimeOfDay(TheGlobalData->m_timeOfDay);
 	}
-	if (TheW3DShadowManager) {	
+	if (TheW3DShadowManager) {
 		TheW3DShadowManager->setTimeOfDay(TheGlobalData->m_timeOfDay);
 	}
 	m_needToLoadRoads = true; // load roads next time we redraw.
@@ -882,7 +877,7 @@ void WbView3d::setLighting(const GlobalData::TerrainLighting *tl, Int whichLight
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::updateLights() 
+void WbView3d::updateLights()
 {
 	++m_updateCount;
 
@@ -899,7 +894,7 @@ void WbView3d::updateLights()
 			m_baseBuildScene->Set_Ambient_Light( Vector3(ol->ambient.red, ol->ambient.green, ol->ambient.blue) );
 		}
 
-		if (TheW3DShadowManager) {	
+		if (TheW3DShadowManager) {
 			TheW3DShadowManager->setTimeOfDay(TheGlobalData->m_timeOfDay);
 		}
 
@@ -928,7 +923,7 @@ void WbView3d::updateLights()
 
 	MapObject *pMapObj = MapObject::getFirstMapObject();
 	while (pMapObj && m_heightMapRenderObj) {
-		if (pMapObj->isLight()) { 
+		if (pMapObj->isLight()) {
 			Coord3D loc = *pMapObj->getLocation();
 			loc.z += m_heightMapRenderObj->getHeightMapHeight(loc.x, loc.y, NULL);
 			RenderObjClass *renderObj= pMapObj->getRenderObj();
@@ -974,7 +969,7 @@ void WbView3d::updateScorches(void)
 	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
-		if (pMapObj->isScorch()) 
+		if (pMapObj->isScorch())
 		{
 			const Coord3D *pos = pMapObj->getLocation();
 			Real radius = pMapObj->getProperties()->getReal(TheKey_objectRadius);
@@ -987,7 +982,7 @@ void WbView3d::updateScorches(void)
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::invalidateCellInView(int xIndex, int yIndex) 
+void WbView3d::invalidateCellInView(int xIndex, int yIndex)
 {
 	Invalidate(false);	/// @todo be smarter about invaling the area
 }
@@ -1005,16 +1000,16 @@ void WbView3d::updateFenceListObjects(MapObject *pObject)
 		RenderObjClass *renderObj=NULL;
 		REF_PTR_SET( renderObj, pMapObj->getRenderObj() );
 		if (!renderObj) {
-			Real scale = 1.0; 
+			Real scale = 1.0;
 			AsciiString modelName = getModelNameAndScale(pMapObj, &scale, BODY_PRISTINE);
 			// set render object, or create if we need to
-			if( renderObj == NULL && modelName.isEmpty() == FALSE && 
-					strncmp( modelName.str(), "No ", 3 ) ) 
+			if( renderObj == NULL && modelName.isEmpty() == FALSE &&
+					strncmp( modelName.str(), "No ", 3 ) != 0 )
 			{
 
 				renderObj = m_assetManager->Create_Render_Obj( modelName.str(), scale, 0);
 
-			}  // end if
+			}
 		}
 
 		if (renderObj) {
@@ -1080,9 +1075,9 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 {
 	Int i;
 	Bool found = false;
-	
+
 	for (i=0; i<TheSidesList->getNumSides(); i++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(i);
 
 		// find which player color we should use
 		Int playerColor = 0xFFFFFF;
@@ -1102,7 +1097,7 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 			if (pBuildToInval == pBuild) {
 				found = true;
 			}
-			if (!found && pBuildToInval) { 
+			if (!found && pBuildToInval) {
 				continue;
 			}
 			if (!BuildListTool::isActive() && !pBuild->isInitiallyBuilt()) {
@@ -1119,10 +1114,10 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 					pBuild->setRenderObj(NULL);
 				}
 			}
-				
+
 			REF_PTR_SET(renderObj, pBuild->getRenderObj());
 			if (!renderObj) {
-				Real scale = 1.0; 
+				Real scale = 1.0;
 				AsciiString thingName = pBuild->getTemplateName();
 				const ThingTemplate *tTemplate = TheThingFactory->findTemplate(thingName);
 
@@ -1132,10 +1127,10 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 					state.clear();
 					modelName = getBestModelName(tTemplate, state);
 					scale = tTemplate->getAssetScale();
-				} 
+				}
 				// set render object, or create if we need to
-				if( renderObj == NULL && modelName.isEmpty() == FALSE && 
-						strncmp( modelName.str(), "No ", 3 ) ) 
+				if( renderObj == NULL && modelName.isEmpty() == FALSE &&
+						strncmp( modelName.str(), "No ", 3 ) != 0 )
 				{
 
 					renderObj = m_assetManager->Create_Render_Obj( modelName.str(), scale, playerColor);
@@ -1145,7 +1140,7 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 						Shadow::ShadowTypeInfo shadowInfo;
 						shadowInfo.allowUpdates=FALSE;	//shadow image will never update
 						shadowInfo.allowWorldAlign=TRUE;	//shadow image will wrap around world objects
-						strcpy(shadowInfo.m_ShadowName,tTemplate->getShadowTextureName().str());
+						strlcpy(shadowInfo.m_ShadowName, tTemplate->getShadowTextureName().str(), ARRAY_SIZE(shadowInfo.m_ShadowName));
 						DEBUG_ASSERTCRASH(shadowInfo.m_ShadowName[0] != '\0', ("this should be validated in ThingTemplate now"));
 						shadowInfo.m_type=(ShadowType)tTemplate->getShadowType();
 						shadowInfo.m_sizeX=tTemplate->getShadowSizeX();
@@ -1154,7 +1149,7 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 						shadowInfo.m_offsetY=tTemplate->getShadowOffsetY();
 						shadowObj=TheW3DShadowManager->addShadow(renderObj, &shadowInfo);
 					}
-				}  // end if
+				}
 			}
 			if (renderObj) {
 				pBuild->setRenderObj(renderObj);
@@ -1190,7 +1185,7 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, BodyDamageType curDamageState)
 {
 	ModelConditionFlags state;
-	switch (curDamageState) 
+	switch (curDamageState)
 	{
 			case BODY_PRISTINE:
 			default:
@@ -1216,7 +1211,7 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 	}
 	Int objWeather = 0;
 	Bool exists;
-	if (pMapObj && pMapObj->getProperties()) 
+	if (pMapObj && pMapObj->getProperties())
 	{
 		objWeather = pMapObj->getProperties()->getInt(TheKey_objectWeather, &exists);
 	}
@@ -1235,7 +1230,7 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 	}
 
 	Int objTime = 0;
-	if (pMapObj && pMapObj->getProperties()) 
+	if (pMapObj && pMapObj->getProperties())
 	{
 		objTime = pMapObj->getProperties()->getInt(TheKey_objectTime, &exists);
 	}
@@ -1253,15 +1248,18 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 			break;
 	}
 
-	AsciiString modelName("No Model Name");
+	AsciiString modelName;
 	*scale = 1.0f;
-	Int i;
+
+#ifdef LOAD_TEST_ASSETS
 	char buffer[ _MAX_PATH ];
-	if (strncmp(TEST_STRING, pMapObj->getName().str(), strlen(TEST_STRING)) == 0) 
+
+	if (strncmp(TEST_STRING, pMapObj->getName().str(), strlen(TEST_STRING)) == 0)
 	{
 		/* Handle test art models here */
-		strcpy(buffer, pMapObj->getName().str());
+		strlcpy(buffer, pMapObj->getName().str(), ARRAY_SIZE(buffer));
 
+		Int i;
 		for (i=0; buffer[i]; i++) {
 			if (buffer[i] == '/') {
 				i++;
@@ -1269,12 +1267,14 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 			}
 		}
 		modelName = buffer+i;
-	}	
-	else 
+	}
+#endif
+
+	if (modelName.isEmpty())
 	{
 		modelName = "No Model Name"; // must be this while GDF exists (it's the default)
 		const ThingTemplate *tTemplate;
-		
+
 		tTemplate = pMapObj->getThingTemplate();
 		if( tTemplate && !(pMapObj->getFlags() & FLAG_DONT_RENDER))
 		{
@@ -1283,8 +1283,8 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 			modelName = getBestModelName(tTemplate, state);
 			*scale = tTemplate->getAssetScale();
 
-		}  // end if
-	}  // end else
+		}
+	}
 	return modelName;
 }
 
@@ -1391,11 +1391,11 @@ void WbView3d::invalObjectInView(MapObject *pMapObjIn)
 
 		}
 		if (!renderObj) {
-			Real scale = 1.0; 
+			Real scale = 1.0;
 			AsciiString modelName = getModelNameAndScale(pMapObj, &scale, curDamageState);
 			// set render object, or create if we need to
-			if( renderObj == NULL && modelName.isEmpty() == FALSE && 
-					strncmp( modelName.str(), "No ", 3 ) ) 
+			if( renderObj == NULL && modelName.isEmpty() == FALSE &&
+					strncmp( modelName.str(), "No ", 3 ) != 0 )
 			{
 
 				if (!getShowModels()) {
@@ -1410,7 +1410,7 @@ void WbView3d::invalObjectInView(MapObject *pMapObjIn)
 					const ThingTemplate *tTemplate = pMapObj->getThingTemplate();
 					if (tTemplate && tTemplate->getShadowType() != SHADOW_NONE && !(pMapObj->getFlags() & FLAG_DONT_RENDER))
 					{	//add correct type of shadow
-						strcpy(shadowInfo.m_ShadowName,tTemplate->getShadowTextureName().str());
+						strlcpy(shadowInfo.m_ShadowName, tTemplate->getShadowTextureName().str(), ARRAY_SIZE(shadowInfo.m_ShadowName));
 						DEBUG_ASSERTCRASH(shadowInfo.m_ShadowName[0] != '\0', ("this should be validated in ThingTemplate now"));
 						shadowInfo.m_type=(ShadowType)tTemplate->getShadowType();
 						shadowInfo.m_sizeX=tTemplate->getShadowSizeX();
@@ -1423,7 +1423,7 @@ void WbView3d::invalObjectInView(MapObject *pMapObjIn)
 						shadowObj=TheW3DShadowManager->addShadow(renderObj, &shadowInfo);
 					}
 				}
-			}  // end if
+			}
 		}
 
 		if (renderObj && !(pMapObj->getFlags() & FLAG_DONT_RENDER)) {
@@ -1475,10 +1475,10 @@ void WbView3d::invalObjectInView(MapObject *pMapObjIn)
 		m_needToLoadRoads = true; // load roads next time we redraw.
 	}
 	if (isLight) {
-		updateLights(); 
+		updateLights();
 	}
 	if (isScorch) {
-		updateScorches(); 
+		updateScorches();
 	}
 	Invalidate(false);
 
@@ -1487,9 +1487,9 @@ void WbView3d::invalObjectInView(MapObject *pMapObjIn)
 
 
 // ----------------------------------------------------------------------------
-void WbView3d::updateHeightMapInView(WorldHeightMap *htMap, Bool partial, const IRegion2D &partialRange) 
+void WbView3d::updateHeightMapInView(WorldHeightMap *htMap, Bool partial, const IRegion2D &partialRange)
 {
-	if (htMap == NULL) 
+	if (htMap == NULL)
 		return;
 
 	++m_updateCount;
@@ -1505,7 +1505,7 @@ void WbView3d::updateHeightMapInView(WorldHeightMap *htMap, Bool partial, const
 
 		Int curTicks = ::GetTickCount();
 
-		RefRenderObjListIterator lightListIt(&m_lightList);	
+		RefRenderObjListIterator lightListIt(&m_lightList);
 		if (partial) {
 			m_heightMapRenderObj->doPartialUpdate(partialRange, htMap, &lightListIt);
 		} else {
@@ -1514,7 +1514,7 @@ void WbView3d::updateHeightMapInView(WorldHeightMap *htMap, Bool partial, const
 				htMap->setDrawWidth(htMap->getXExtent());
 				htMap->setDrawHeight(htMap->getYExtent());
 				m_heightMapRenderObj->initHeightData(htMap->getXExtent(), htMap->getYExtent(), htMap, &lightListIt);
-			} else {	
+			} else {
 				htMap->setDrawWidth(m_partialMapSize);
 				htMap->setDrawHeight(m_partialMapSize);
 				m_heightMapRenderObj->initHeightData(htMap->getDrawWidth(), htMap->getDrawHeight(), htMap, &lightListIt);
@@ -1523,7 +1523,7 @@ void WbView3d::updateHeightMapInView(WorldHeightMap *htMap, Bool partial, const
 		}
 		curTicks = GetTickCount() - curTicks;
 		if (curTicks < 1) curTicks = 1;
-	} 
+	}
 
 	invalObjectInView(NULL);	// update all the map objects, to account for ground changes
 
@@ -1585,7 +1585,7 @@ BuildListInfo *WbView3d::pickedBuildObjectInView(CPoint viewPt)
 	Int i;
 	viewToDocCoords(viewPt, &cpt, false);
  	for (i=0; i<TheSidesList->getNumSides(); i++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(i);
 		for (BuildListInfo *pBuild = pSide->getBuildList(); pBuild; pBuild = pBuild->getNext()) {
 			Coord3D center = *pBuild->getLocation();
 			center.x -= cpt.x;
@@ -1609,7 +1609,7 @@ BuildListInfo *WbView3d::pickedBuildObjectInView(CPoint viewPt)
 		Bool hit = m_intersector->Intersect_Screen_Point_Layer( logX, logY, *m_buildLayer );
 		if( hit ) {
  			for (i=0; i<TheSidesList->getNumSides(); i++) {
-				SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+				SidesInfo *pSide = TheSidesList->getSideInfo(i);
 				for (BuildListInfo *pBuild = pSide->getBuildList(); pBuild; pBuild = pBuild->getNext()) {
 					if (pBuild->getRenderObj() == m_intersector->Result.IntersectedRenderObject) {
 						return pBuild;
@@ -1637,14 +1637,14 @@ Bool WbView3d::viewToDocCoords(CPoint curPt, Coord3D *newPt, Bool constrain)
 	Vector3 intersection(0,0,0);
 	// determine the ray corresponding to the camera and distance to projection plane
 	Matrix3D camera_matrix = m_camera->Get_Transform();
-	
+
 	Vector3 camera_location  = m_camera->Get_Position();
 
 	Vector3 rayLocation;
 	Vector3 rayDirection;
 	Vector3 rayDirectionPt;
 	// the projected ray has the same origin as the camera
-	rayLocation = camera_location; 
+	rayLocation = camera_location;
 	// determine the location of the screen coordinate in camera-model space
 	const ViewportClass &viewport = m_camera->Get_Viewport();
 
@@ -1672,7 +1672,7 @@ Bool WbView3d::viewToDocCoords(CPoint curPt, Coord3D *newPt, Bool constrain)
 	// Note - there are 2 ways to track.  One is for tools (like paint texture)
 	// that follow the terrain.  They want to track the terrain, so the texturing
 	// follows the cursor.  Most tools, however, don't want to jump up & down clifs
-	// and such.  So they use a fixed z plane when tracking, so things don't move 
+	// and such.  So they use a fixed z plane when tracking, so things don't move
 	// depending what you move over.
 	Bool followTerrain = true;
 	if (WbApp()->isCurToolLocked()) {
@@ -1687,8 +1687,8 @@ Bool WbView3d::viewToDocCoords(CPoint curPt, Coord3D *newPt, Bool constrain)
 			intersection = castResult.ContactPoint;
 			m_curTrackingZ = intersection.Z;
 			result = true;
-		}  // end if
-	} 
+		}
+	}
 	if (!result) {
 		intersection.X = Vector3::Find_X_At_Z(m_curTrackingZ, rayLocation, rayDirectionPt);
 		intersection.Y = Vector3::Find_Y_At_Z(m_curTrackingZ, rayLocation, rayDirectionPt);
@@ -1765,14 +1765,14 @@ Bool WbView3d::viewToDocCoordZ(CPoint curPt, Coord3D *newPt, Real theZ)
 	Vector3 intersection(0,0,0);
 	// determine the ray corresponding to the camera and distance to projection plane
 	Matrix3D camera_matrix = m_camera->Get_Transform();
-	
+
 	Vector3 camera_location  = m_camera->Get_Position();
 
 	Vector3 rayLocation;
 	Vector3 rayDirection;
 	Vector3 rayDirectionPt;
 	// the projected ray has the same origin as the camera
-	rayLocation = camera_location; 
+	rayLocation = camera_location;
 	// determine the location of the screen coordinate in camera-model space
 	const ViewportClass &viewport = m_camera->Get_Viewport();
 
@@ -1820,14 +1820,14 @@ void WbView3d::updateHysteresis(void)
 	Vector3 intersection(0,0,0);
 	// determine the ray corresponding to the camera and distance to projection plane
 	Matrix3D camera_matrix = m_camera->Get_Transform();
-	
+
 	Vector3 camera_location  = m_camera->Get_Position();
 
 	Vector3 rayLocation;
 	Vector3 rayDirection;
 	Vector3 rayDirectionPt;
 	// the projected ray has the same origin as the camera
-	rayLocation = camera_location; 
+	rayLocation = camera_location;
 	// determine the location of the screen coordinate in camera-model space
 	const ViewportClass &viewport = m_camera->Get_Viewport();
 
@@ -1923,7 +1923,7 @@ Bool WbView3d::docToViewCoords(Coord3D curPt, CPoint* newPt)
 	GetClientRect(&rClient);
 
 	//
-	// note that the screen coord returned from the project W3D camera 
+	// note that the screen coord returned from the project W3D camera
 	// gave us a screen coords that range from (-1,-1) bottom left to
 	// (1,1) top right ... we are turning that into (0,0) upper left
 	// coords now
@@ -1940,7 +1940,7 @@ Bool WbView3d::docToViewCoords(Coord3D curPt, CPoint* newPt)
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::redraw(void) 
+void WbView3d::redraw(void)
 {
 	if (m_updateCount > 0) {
 		return;
@@ -1954,7 +1954,7 @@ void WbView3d::redraw(void)
 	if (!m_ww3dInited) {
 		return;
 	}
-	
+
 	setupCamera();
 
 	DEBUG_ASSERTCRASH((m_heightMapRenderObj),("oops"));
@@ -1966,27 +1966,33 @@ void WbView3d::redraw(void)
 		}
 		++m_updateCount;
 		Int curTicks = GetTickCount();
-		RefRenderObjListIterator lightListIt(&m_lightList);	
+		RefRenderObjListIterator lightListIt(&m_lightList);
 		m_heightMapRenderObj->updateCenter(m_camera, &lightListIt);
 		--m_updateCount;
 
 		curTicks = GetTickCount()-curTicks;
 //		if (curTicks>2) {
-//			WWDEBUG_SAY(("%d ms for updateCenter, %d FPS\n", curTicks, 1000/curTicks));
+//			WWDEBUG_SAY(("%d ms for updateCenter, %d FPS", curTicks, 1000/curTicks));
 //		}
 	}
 	if (m_drawObject) {
-		m_drawObject->setDrawObjects(m_showObjects, 
+		m_drawObject->setDrawObjects(m_showObjects,
 			m_showWaypoints || WaypointTool::isActive(),
 			m_showPolygonTriggers || PolygonTool::isActive());
 	}
 
-	WW3D::Sync( GetTickCount() );
+	WW3D::Update_Logic_Frame_Time(TheFramePacer->getLogicTimeStepMilliseconds());
+	WW3D::Sync(WW3D::Get_Fractional_Sync_Milliseconds() >= WWSyncMilliseconds);
+
 	m_buildRedMultiplier += (GetTickCount()-m_time)/500.0f;
 	if (m_buildRedMultiplier>4.0f || m_buildRedMultiplier<0) {
 		m_buildRedMultiplier = 0;
 	}
+
 	render();
+
+	TheFramePacer->update();
+
 	m_time = ::GetTickCount();
 }
 
@@ -1997,17 +2003,17 @@ void WbView3d::render()
 
 	if (WW3D::Begin_Render(true,true,Vector3(0.5f,0.5f,0.5f), TheWaterTransparency->m_minWaterOpacity) == WW3D_ERROR_OK)
 	{
-		
+
 		DEBUG_ASSERTCRASH((m_heightMapRenderObj),("oops"));
 
-		
+
 		if (m_heightMapRenderObj) {
 			m_heightMapRenderObj->Set_Hidden((m_showTerrain ? 0 : 1));
 			m_heightMapRenderObj->doTextures(true);
 		}
 		m_scene->Set_Polygon_Mode(SceneClass::FILL);
 		// Render 3D scene
-		WW3D::Render(m_scene,m_camera);	
+		WW3D::Render(m_scene,m_camera);
 		Vector3 amb = m_baseBuildScene->Get_Ambient_Light();
 		Vector3 newAmb(amb);
 		Real mul = m_buildRedMultiplier;
@@ -2016,40 +2022,40 @@ void WbView3d::render()
 		newAmb.X *= mul;
 		newAmb.Y *= gMul;
 		if (newAmb.X>1) newAmb.X = 1;
-		m_baseBuildScene->Set_Ambient_Light(newAmb); 
-		WW3D::Render(m_baseBuildScene,m_camera);	
-		m_baseBuildScene->Set_Ambient_Light(amb); 
+		m_baseBuildScene->Set_Ambient_Light(newAmb);
+		WW3D::Render(m_baseBuildScene,m_camera);
+		m_baseBuildScene->Set_Ambient_Light(amb);
 
 		if (m_showWireframe) {
 			if (m_heightMapRenderObj) {
 				m_heightMapRenderObj->doTextures(false);
 				m_scene->Set_Polygon_Mode(SceneClass::LINE);
 				// Render 3D scene
-				WW3D::Render(m_scene,m_camera);	
-				WW3D::Render(m_baseBuildScene,m_camera);	
+				WW3D::Render(m_scene,m_camera);
+				WW3D::Render(m_baseBuildScene,m_camera);
 				m_heightMapRenderObj->doTextures(true);
 			}
-		} 
+		}
 		if (m_showObjToolTrackingObj && m_objectToolTrackingObj) {
 			m_transparentObjectsScene->Add_Render_Object(m_objectToolTrackingObj);
 			DX8TextureCategoryClass::SetForceMultiply(true);
 			TheDX8MeshRenderer.Enable_Lighting(false);
 			Real lightLevel = 1.0f;
-			m_transparentObjectsScene->Set_Ambient_Light(Vector3(lightLevel,lightLevel,lightLevel)); 
+			m_transparentObjectsScene->Set_Ambient_Light(Vector3(lightLevel,lightLevel,lightLevel));
 			WW3D::Render(m_transparentObjectsScene, m_camera);
 			TheDX8MeshRenderer.Enable_Lighting(true);
 			DX8TextureCategoryClass::SetForceMultiply(false);
 			m_transparentObjectsScene->Remove_Render_Object(m_objectToolTrackingObj);
 		}
-		
+
 		// Draw the 3d obj icons on top of the rest of the data.
-		WW3D::Render(m_overlayScene,m_camera);	
+		WW3D::Render(m_overlayScene,m_camera);
 		//if (mytext) mytext->Render();
 		if (m3DFont) {
 			drawLabels(NULL);
 		}
 
-		
+
 		WW3D::End_Render();
 	}
 	--m_updateCount;
@@ -2147,7 +2153,7 @@ void WbView3d::initWW3D()
 {
 	// only want to do once per instance, but do lazily.
 	if (!m_ww3dInited) {
-		
+
 
 
 		m_ww3dInited = true;
@@ -2157,18 +2163,18 @@ void WbView3d::initWW3D()
 		WW3D::Set_Prelit_Mode(WW3D::PRELIT_MODE_VERTEX);
 
 		initAssets();
-		WW3D::Init(m_hWnd);	
+		WW3D::Init(m_hWnd);
 		WW3D::Set_Prelit_Mode( WW3D::PRELIT_MODE_LIGHTMAP_MULTI_PASS );
 		WW3D::Set_Collision_Box_Display_Mask(0x00);	///<set to 0xff to make collision boxes visible
 
 		bogusTacticalView.setWidth(m_actualWinSize.x);
 		bogusTacticalView.setHeight(m_actualWinSize.y);
 		bogusTacticalView.setOrigin(0,0);
-		if (WW3D::Set_Render_Device(0, m_actualWinSize.x, m_actualWinSize.y, 32, true, true) != WW3D_ERROR_OK) 
+		if (WW3D::Set_Render_Device(0, m_actualWinSize.x, m_actualWinSize.y, 32, true, true) != WW3D_ERROR_OK)
 		{
 			// Getting the device at the default bit depth (32) didn't work, so try
 			// getting a 16 bit display.  (Voodoo 1-3 only supported 16 bit.) jba.
-			if (WW3D::Set_Render_Device(0, m_actualWinSize.x, m_actualWinSize.y, 16, true, true) != WW3D_ERROR_OK) 
+			if (WW3D::Set_Render_Device(0, m_actualWinSize.x, m_actualWinSize.y, 16, true, true) != WW3D_ERROR_OK)
 			{
 				DEBUG_CRASH(("Couldn't set render device."));
 			}
@@ -2201,7 +2207,7 @@ void WbView3d::initWW3D()
 			} else {
 				m3DFont = NULL;
 			}
-			
+
 		} else {
 			m3DFont = NULL;
 		}
@@ -2224,7 +2230,7 @@ void WbView3d::initWW3D()
 		TheWritableGlobalData->m_enableBehindBuildingMarkers = false;	//this is only for the game.
 		if (TheW3DShadowManager==NULL)
 		{	TheW3DShadowManager = new W3DShadowManager;
- 			TheW3DShadowManager->init();			
+ 			TheW3DShadowManager->init();
 		}
 #endif
 		updateLights();
@@ -2236,18 +2242,18 @@ void WbView3d::initWW3D()
 // WbView3d message handlers
 
 // ----------------------------------------------------------------------------
-int WbView3d::OnCreate(LPCREATESTRUCT lpCreateStruct) 
+int WbView3d::OnCreate(LPCREATESTRUCT lpCreateStruct)
 {
 	if (WbView::OnCreate(lpCreateStruct) == -1)
 		return -1;
-	
+
 	// install debug callbacks
 	WWDebug_Install_Message_Handler(WWDebug_Message_Callback);
 	WWDebug_Install_Assert_Handler(WWAssert_Callback);
 
 	m_timer = SetTimer(0, UPDATE_TIME, NULL);
 
-	initWW3D();	
+	initWW3D();
 	TheWritableGlobalData->m_useCloudMap = AfxGetApp()->GetProfileInt("GameOptions", "cloudMap", 0);
 	AfxGetApp()->WriteProfileInt("GameOptions", "cloudMap", TheGlobalData->m_useCloudMap);	// Just in case it wasn't already there
  	m_partialMapSize = AfxGetApp()->GetProfileInt("GameOptions", "partialMapSize", 97);
@@ -2262,8 +2268,8 @@ int WbView3d::OnCreate(LPCREATESTRUCT lpCreateStruct)
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::OnPaint() 
-{	
+void WbView3d::OnPaint()
+{
 
 	PAINTSTRUCT ps;
 	HDC hdc = ::BeginPaint(m_hWnd, &ps);
@@ -2277,7 +2283,7 @@ void WbView3d::OnPaint()
 		m_firstPaint = false;
 	}
 	DX8Wrapper::SetCleanupHook(this);
-	
+
 }
 
 
@@ -2297,7 +2303,7 @@ void WbView3d::drawLabels(HDC hdc)
 
 	// Draw labels.
 	MapObject *pMapObj;
-	if (isNamesVisible()) 
+	if (isNamesVisible())
 	{
 		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 			AsciiString name;
@@ -2326,7 +2332,7 @@ void WbView3d::drawLabels(HDC hdc)
 				pos = *pMapObj->getLocation();
 				pos.z = m_heightMapRenderObj->getHeightMapHeight(pos.x, pos.y, NULL);
 			} else if (pMapObj->getThingTemplate() && !(pMapObj->getFlags() & (FLAG_ROAD_FLAGS|FLAG_BRIDGE_FLAGS)) &&
-								 pMapObj->getRenderObj() == NULL) { 
+								 pMapObj->getRenderObj() == NULL) {
 				name = pMapObj->getThingTemplate()->getName();
 				pos = *pMapObj->getLocation();
 				pos.z += m_heightMapRenderObj->getHeightMapHeight(pos.x, pos.y, NULL);
@@ -2337,8 +2343,8 @@ void WbView3d::drawLabels(HDC hdc)
 				switch(i) {
 					case 0 : break;
 					case 1: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel1, &exists); break;
-					case 2: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel2, &exists);; break;
-					case 3: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel3, &exists);; break;
+					case 2: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel2, &exists); break;
+					case 3: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel3, &exists); break;
 					default: name.clear();
 				}
 				if (!name.isEmpty()) {
@@ -2360,7 +2366,7 @@ void WbView3d::drawLabels(HDC hdc)
 						GetClientRect(&rClient);
 
 						//
-						// note that the screen coord returned from the project W3D camera 
+						// note that the screen coord returned from the project W3D camera
 						// gave us a screen coords that range from (-1,-1) bottom left to
 						// (1,1) top right ... we are turning that into (0,0) upper left
 						// coords now
@@ -2386,8 +2392,8 @@ void WbView3d::drawLabels(HDC hdc)
 							pt.x += 1;
 							rct.top = rct.bottom = pt.y;
 							rct.left = rct.right = pt.x;
-							m3DFont->DrawText(name.str(), name.getLength(), &rct, 
-								DT_LEFT | DT_NOCLIP | DT_TOP | DT_SINGLELINE, 0xAF000000 + (red<<16) + (green<<8)); 
+							m3DFont->DrawText(name.str(), name.getLength(), &rct,
+								DT_LEFT | DT_NOCLIP | DT_TOP | DT_SINGLELINE, 0xAF000000 + (red<<16) + (green<<8));
 
 						} else if (!m3DFont) {
 							//docToViewCoords(pos, &pt);
@@ -2427,7 +2433,7 @@ void WbView3d::drawLabels(HDC hdc)
 
 			if (m_lightFeedbackMesh[lIndex] == NULL)
 			{	char nameBuf[64];
-				sprintf(nameBuf,"WB_LIGHT%d",lIndex+1);
+				snprintf(nameBuf, ARRAY_SIZE(nameBuf), "WB_LIGHT%d", lIndex+1);
 				m_lightFeedbackMesh[lIndex]=WW3DAssetManager::Get_Instance()->Create_Render_Obj(nameBuf);
 			}
 			if (m_lightFeedbackMesh[lIndex]==NULL) {
@@ -2448,7 +2454,7 @@ void WbView3d::drawLabels(HDC hdc)
 				GetClientRect(&rClient);
 
 				//
-				// note that the screen coord returned from the project W3D camera 
+				// note that the screen coord returned from the project W3D camera
 				// gave us a screen coords that range from (-1,-1) bottom left to
 				// (1,1) top right ... we are turning that into (0,0) upper left
 				// coords now
@@ -2468,13 +2474,13 @@ void WbView3d::drawLabels(HDC hdc)
 				rayPoints[1].y= rClient.top+syEnd;
 
 				HPEN pen=CreatePen( PS_SOLID,2, LightColors[lIndex]);
-				HPEN penOld = (HPEN)SelectObject(hdc, pen); 
+				HPEN penOld = (HPEN)SelectObject(hdc, pen);
 				Polyline(hdc,rayPoints,2);
 				SelectObject(hdc, penOld);	//restore previous pen
 				DeleteObject(pen);	//delete new pen
 			}
 #endif	//DRAW_LIGHT_DIRECTION_RAYS
-		}//end for
+		}
 	}
 	else
 	{	if (!m_doLightFeedback)
@@ -2493,14 +2499,14 @@ void WbView3d::drawLabels(HDC hdc)
 
 
 // ----------------------------------------------------------------------------
-void WbView3d::OnSize(UINT nType, int cx, int cy) 
+void WbView3d::OnSize(UINT nType, int cx, int cy)
 {
 	WbView::OnSize(nType, cx, cy);
 
 }
 
 // ----------------------------------------------------------------------------
-BOOL WbView3d::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) 
+BOOL WbView3d::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt)
 {
 	if (m_trackingMode == TRACK_NONE) {
 		m_mouseWheelOffset += zDelta;
@@ -2614,23 +2620,23 @@ Real WbView3d::getCameraPitch(void)
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::OnTimer(UINT nIDEvent) 
+void WbView3d::OnTimer(UINT nIDEvent)
 {
-	if (getLastDrawTime()+UPDATE_TIME<::GetTickCount()) 
+	if (getLastDrawTime()+UPDATE_TIME<::GetTickCount())
 	{
 		Invalidate(false);
 	}
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::OnDestroy() 
+void WbView3d::OnDestroy()
 {
 	killTheTimer();
-	WbView::OnDestroy();	
+	WbView::OnDestroy();
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::OnShowWindow(BOOL bShow, UINT nStatus) 
+void WbView3d::OnShowWindow(BOOL bShow, UINT nStatus)
 {
 	WbView::OnShowWindow(bShow, nStatus);
 }
@@ -2640,7 +2646,7 @@ void WbView3d::OnShowWindow(BOOL bShow, UINT nStatus)
 //=============================================================================
 /** Scrolls the window. */
 //=============================================================================
-void WbView3d::scrollInView(Real xScroll, Real yScroll, Bool end) 
+void WbView3d::scrollInView(Real xScroll, Real yScroll, Bool end)
 {
 	m_centerPt.X += xScroll;
 	m_centerPt.Y += yScroll;
@@ -2652,40 +2658,40 @@ void WbView3d::scrollInView(Real xScroll, Real yScroll, Bool end)
 	CMainFrame::GetMainFrame()->handleCameraChange();
 }
 
-void WbView3d::OnViewShowwireframe() 
+void WbView3d::OnViewShowwireframe()
 {
 	m_showWireframe = !m_showWireframe;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowWireframe", m_showWireframe?1:0);
 }
 
-void WbView3d::OnUpdateViewShowwireframe(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowwireframe(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showWireframe?1:0);
-	
+
 }
 
-BOOL WbView3d::OnEraseBkgnd(CDC* pDC) 
+BOOL WbView3d::OnEraseBkgnd(CDC* pDC)
 {
 	// Never erase the background.  The 3d view always draws the entire
 	// window, so erasing just makes it flicker.  jba.
 	return true; // act like we erased.
 }
 
-void WbView3d::OnViewShowentire3dmap() 
+void WbView3d::OnViewShowentire3dmap()
 {
-	m_showEntireMap = !m_showEntireMap;	
+	m_showEntireMap = !m_showEntireMap;
 	IRegion2D range = {0,0,0,0};
 	this->updateHeightMapInView(WbDoc()->GetHeightMap(), false, range);
 	Invalidate(false);
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowEntireMap", m_showEntireMap?1:0);
 }
 
-void WbView3d::OnUpdateViewShowentire3dmap(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowentire3dmap(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showEntireMap?1:0);
 }
 
-void WbView3d::OnViewShowtopdownview() 
+void WbView3d::OnViewShowtopdownview()
 {
 	m_projection = !m_projection;
 	m_heightMapRenderObj->setFlattenHeights(m_projection);
@@ -2693,84 +2699,84 @@ void WbView3d::OnViewShowtopdownview()
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowTopDownView", m_projection?1:0);
 }
 
-void WbView3d::OnUpdateViewShowtopdownview(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowtopdownview(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_projection?1:0);
 }
 
-void WbView3d::OnViewShowclouds() 
+void WbView3d::OnViewShowclouds()
 {
 	TheWritableGlobalData->m_useCloudMap = !TheGlobalData->m_useCloudMap;
 	AfxGetApp()->WriteProfileInt("GameOptions", "cloudMap", TheGlobalData->m_useCloudMap);
 }
 
-void WbView3d::OnUpdateViewShowclouds(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowclouds(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(TheGlobalData->m_useCloudMap?1:0);
 }
 
-void WbView3d::OnViewShowmacrotexture() 
+void WbView3d::OnViewShowmacrotexture()
 {
 	Bool show = !TheGlobalData->m_useLightMap;
 	TheWritableGlobalData->m_useLightMap = show;
 }
 
-void WbView3d::OnUpdateViewShowmacrotexture(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowmacrotexture(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(TheGlobalData->m_useLightMap?1:0);
 }
 
-void WbView3d::OnEditSelectmacrotexture() 
+void WbView3d::OnEditSelectmacrotexture()
 {
 	SelectMacrotexture dlg;
 
 	// The macrotexture dialog sets the macrotexture in the 3d engine.
 	dlg.DoModal();
-	
+
 }
 
-void WbView3d::OnLookEast() 
+void WbView3d::OnLookEast()
 {
 	m_cameraAngle = -PI/2;
 }
 
-void WbView3d::OnUpdateLookEast(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateLookEast(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_cameraAngle==-PI/2?1:0);
 }
 
-void WbView3d::OnLookNorth() 
+void WbView3d::OnLookNorth()
 {
 	m_cameraAngle = 0;
 }
 
-void WbView3d::OnUpdateLookNorth(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateLookNorth(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_cameraAngle==0?1:0);
 }
 
-void WbView3d::OnLookSouth() 
+void WbView3d::OnLookSouth()
 {
 	m_cameraAngle = PI;
 
 }
 
-void WbView3d::OnUpdateLookSouth(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateLookSouth(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_cameraAngle==PI?1:0);
 }
 
-void WbView3d::OnLookWest() 
+void WbView3d::OnLookWest()
 {
 	m_cameraAngle = PI/2;
 }
 
-void WbView3d::OnUpdateLookWest(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateLookWest(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_cameraAngle==PI/2?1:0);
 }
 
-void WbView3d::OnViewShowshadows() 
+void WbView3d::OnViewShowshadows()
 {
 	m_showShadows = !m_showShadows;
 	if (m_showShadows) {
@@ -2791,7 +2797,7 @@ void WbView3d::OnViewShowshadows()
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowShadows", m_showShadows?1:0);
 }
 
-void WbView3d::OnUpdateViewShowshadows(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowshadows(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showShadows?1:0);
 }
@@ -2838,7 +2844,7 @@ void WbView3d::OnEditMapSettings()
 	}
 }
 
-void WbView3d::OnEditShadows() 
+void WbView3d::OnEditShadows()
 {
 	if (!m_showShadows) {
 		OnViewShowshadows(); // turn them on.
@@ -2847,31 +2853,31 @@ void WbView3d::OnEditShadows()
 	dlg.DoModal();
 }
 
-void WbView3d::OnViewShowModels() 
+void WbView3d::OnViewShowModels()
 {
 	setShowModels(!getShowModels());
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowModels", getShowModels()?1:0);
 	resetRenderObjects();
 	invalObjectInView(NULL);
 }
-void WbView3d::OnUpdateViewShowModels(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowModels(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(getShowModels()?1:0);
 }
 
-void WbView3d::OnViewGarrisoned() 
+void WbView3d::OnViewGarrisoned()
 {
 	setShowGarrisoned(!getShowGarrisoned());
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowGarrisoned", getShowGarrisoned()?1:0);
 	resetRenderObjects();
 	invalObjectInView(NULL);
 }
-void WbView3d::OnUpdateViewGarrisoned(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewGarrisoned(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(getShowGarrisoned()?1:0);
 }
 
-void WbView3d::OnViewShowimpassableareas() 
+void WbView3d::OnViewShowimpassableareas()
 {
 	Bool showImpassable = false;
 	if (TheTerrainRenderObject) {
@@ -2883,7 +2889,7 @@ void WbView3d::OnViewShowimpassableareas()
 	}
 }
 
-void WbView3d::OnUpdateViewShowimpassableareas(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowimpassableareas(CCmdUI* pCmdUI)
 {
 	Bool showImpassable = false;
 	if (TheTerrainRenderObject) {
@@ -2904,72 +2910,72 @@ void WbView3d::OnImpassableAreaOptions()
 				TheTerrainRenderObject->setViewImpassableAreaSlope(opts.GetDefaultSlope());
 			}
 		}
-		
+
 		IRegion2D range = {0,0,0,0};
 		updateHeightMapInView(WbDoc()->GetHeightMap(), false, range);
 	}
 }
 
-void WbView3d::OnViewPartialmapsize96x96() 
+void WbView3d::OnViewPartialmapsize96x96()
 {
 	m_partialMapSize = 97;
 	AfxGetApp()->WriteProfileInt("GameOptions", "partialMapSize", m_partialMapSize);
-	m_showEntireMap = false;	
+	m_showEntireMap = false;
 	IRegion2D range = {0,0,0,0};
 	WbDoc()->GetHeightMap()->setDrawOrg(0, 0);
 	updateHeightMapInView(WbDoc()->GetHeightMap(), false, range);
 	Invalidate(false);
 }
 
-void WbView3d::OnUpdateViewPartialmapsize96x96(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewPartialmapsize96x96(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_partialMapSize == 97?1:0);
 }
 
-void WbView3d::OnViewPartialmapsize192x192() 
+void WbView3d::OnViewPartialmapsize192x192()
 {
 	m_partialMapSize = 192;
 	AfxGetApp()->WriteProfileInt("GameOptions", "partialMapSize", m_partialMapSize);
-	m_showEntireMap = false;	
+	m_showEntireMap = false;
 	IRegion2D range = {0,0,0,0};
 	WbDoc()->GetHeightMap()->setDrawOrg(0, 0);
 	updateHeightMapInView(WbDoc()->GetHeightMap(), false, range);
 	Invalidate(false);
 }
 
-void WbView3d::OnUpdateViewPartialmapsize192x192(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewPartialmapsize192x192(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_partialMapSize == 192?1:0);
 }
 
-void WbView3d::OnViewPartialmapsize160x160() 
+void WbView3d::OnViewPartialmapsize160x160()
 {
 	m_partialMapSize = 161;
 	AfxGetApp()->WriteProfileInt("GameOptions", "partialMapSize", m_partialMapSize);
-	m_showEntireMap = false;	
+	m_showEntireMap = false;
 	IRegion2D range = {0,0,0,0};
 	WbDoc()->GetHeightMap()->setDrawOrg(0, 0);
 	updateHeightMapInView(WbDoc()->GetHeightMap(), false, range);
 	Invalidate(false);
 }
 
-void WbView3d::OnUpdateViewPartialmapsize160x160(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewPartialmapsize160x160(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_partialMapSize == 161?1:0);
 }
 
-void WbView3d::OnViewPartialmapsize128x128() 
+void WbView3d::OnViewPartialmapsize128x128()
 {
 	m_partialMapSize = 129;
 	AfxGetApp()->WriteProfileInt("GameOptions", "partialMapSize", m_partialMapSize);
-	m_showEntireMap = false;	
+	m_showEntireMap = false;
 	IRegion2D range = {0,0,0,0};
 	WbDoc()->GetHeightMap()->setDrawOrg(0, 0);
 	updateHeightMapInView(WbDoc()->GetHeightMap(), false, range);
 	Invalidate(false);
 }
 
-void WbView3d::OnUpdateViewPartialmapsize128x128(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewPartialmapsize128x128(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_partialMapSize == 129?1:0);
 }
@@ -2986,7 +2992,7 @@ void WbView3d::OnViewLayersList()
 	}
 }
 
-void WbView3d::OnUpdateViewLayersList(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewLayersList(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showLayersList ? 1 : 0);
 }
diff --git a/Generals/Run/place_steam_build_here.txt b/Generals/Run/place_steam_build_here.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/GeneralsMD/CMakeLists.txt b/GeneralsMD/CMakeLists.txt
index d7d20ea93a6..2a9a65fb780 100644
--- a/GeneralsMD/CMakeLists.txt
+++ b/GeneralsMD/CMakeLists.txt
@@ -15,22 +15,31 @@ add_subdirectory(Code)
 
 # If we are building on windows for windows, try and get the game install path from the registry.
 if("${CMAKE_HOST_SYSTEM}" MATCHES "Windows" AND "${CMAKE_SYSTEM}" MATCHES "Windows")
-    if(NOT RTS_INSTALL_PREFIX_ZEROHOUR)
-        get_filename_component(RTS_INSTALL_PREFIX_ZEROHOUR  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour;InstallPath]" ABSOLUTE CACHE)
-    endif()
+    include(${CMAKE_SOURCE_DIR}/cmake/registry.cmake)
+
+    # Check the EA App/CD registry path
+    fetch_registry_value(
+        "HKEY_LOCAL_MACHINE/SOFTWARE/Electronic Arts/EA Games/Command and Conquer Generals Zero Hour"
+        "InstallPath"
+        RTS_INSTALL_PREFIX_ZEROHOUR
+        "Zero Hour install path from registry")
 
     # Check the "First Decade" registry path
-    if(NOT RTS_INSTALL_PREFIX_ZEROHOUR OR "${RTS_INSTALL_PREFIX_ZEROHOUR}" STREQUAL "/registry")
-        get_filename_component(RTS_INSTALL_PREFIX_ZEROHOUR  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer The First Decade;zh_folder]" ABSOLUTE CACHE)
-    endif()
+    fetch_registry_value(
+        "HKEY_LOCAL_MACHINE/SOFTWARE/Electronic Arts/EA Games/Command and Conquer The First Decade"
+        "zh_folder"
+        RTS_INSTALL_PREFIX_ZEROHOUR
+        "Zero Hour install path from registry")
 
     # Check the Steam registry path
-    if(NOT RTS_INSTALL_PREFIX_ZEROHOUR OR "${RTS_INSTALL_PREFIX_ZEROHOUR}" STREQUAL "/registry")
-        get_filename_component(RTS_INSTALL_PREFIX_ZEROHOUR  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Electronic Arts\\EA Games\\ZeroHour;installPath]" ABSOLUTE CACHE)
-    endif()
+    fetch_registry_value(
+        "HKEY_LOCAL_MACHINE/SOFTWARE/Electronic Arts/EA Games/ZeroHour"
+        "installPath"
+        RTS_INSTALL_PREFIX_ZEROHOUR
+        "Zero Hour install path from registry")
 endif()
 
-if(RTS_INSTALL_PREFIX_ZEROHOUR AND NOT "${RTS_INSTALL_PREFIX_ZEROHOUR}" STREQUAL "/registry")
+if(RTS_INSTALL_PREFIX_ZEROHOUR)
     install(TARGETS z_generals RUNTIME DESTINATION "${RTS_INSTALL_PREFIX_ZEROHOUR}")
     install(FILES $<TARGET_PDB_FILE:z_generals> DESTINATION "${RTS_INSTALL_PREFIX_ZEROHOUR}" OPTIONAL)
 
@@ -63,7 +72,7 @@ if(RTS_INSTALL_PREFIX_ZEROHOUR AND NOT "${RTS_INSTALL_PREFIX_ZEROHOUR}" STREQUAL
         install(TARGETS z_mapcachebuilder RUNTIME DESTINATION "${RTS_INSTALL_PREFIX_ZEROHOUR}")
         install(FILES $<TARGET_PDB_FILE:z_mapcachebuilder> DESTINATION "${RTS_INSTALL_PREFIX_ZEROHOUR}" OPTIONAL)
     endif()
-    
+
     if(TARGET z_w3dview)
         install(TARGETS z_w3dview RUNTIME DESTINATION "${RTS_INSTALL_PREFIX_ZEROHOUR}")
         install(FILES $<TARGET_PDB_FILE:z_w3dview> DESTINATION "${RTS_INSTALL_PREFIX_ZEROHOUR}" OPTIONAL)
@@ -73,4 +82,8 @@ if(RTS_INSTALL_PREFIX_ZEROHOUR AND NOT "${RTS_INSTALL_PREFIX_ZEROHOUR}" STREQUAL
         install(TARGETS z_wdump RUNTIME DESTINATION "${RTS_INSTALL_PREFIX_ZEROHOUR}")
         install(FILES $<TARGET_PDB_FILE:z_wdump> DESTINATION "${RTS_INSTALL_PREFIX_ZEROHOUR}" OPTIONAL)
     endif()
+else()
+    message(STATUS "Zero Hour install path not found. Registry keys for 'Command and Conquer Generals Zero Hour' not found. "
+                   "Zero Hour targets will be built, but not installed. "
+                   "You can specify the path manually by setting RTS_INSTALL_PREFIX_ZEROHOUR.")
 endif()
diff --git a/GeneralsMD/Code/CMakeLists.txt b/GeneralsMD/Code/CMakeLists.txt
index 856b64d0b76..6973be26073 100644
--- a/GeneralsMD/Code/CMakeLists.txt
+++ b/GeneralsMD/Code/CMakeLists.txt
@@ -1,23 +1,14 @@
 # z stands for Zero Hour, i stands for Interface
-add_library(zi_gameengine INTERFACE)
 add_library(zi_gameengine_include INTERFACE)
-add_library(zi_gameenginedevice_include INTERFACE)
 add_library(zi_libraries_include INTERFACE)
 add_library(zi_libraries_source_wwvegas INTERFACE)
-add_library(zi_libraries_source_wwvegas_ww3d2 INTERFACE)
-add_library(zi_libraries_source_wwvegas_wwmath INTERFACE)
-add_library(zi_libraries_source_wwvegas_wwsaveload INTERFACE)
 add_library(zi_main INTERFACE)
 add_library(zi_always INTERFACE)
 
-target_include_directories(zi_gameengine INTERFACE "GameEngine")
 target_include_directories(zi_gameengine_include INTERFACE "GameEngine/Include")
-target_include_directories(zi_gameenginedevice_include INTERFACE "GameEngineDevice/Source")
+target_link_libraries(zi_gameengine_include INTERFACE corei_gameengine_include)
 target_include_directories(zi_libraries_include INTERFACE "Libraries/Include")
 target_include_directories(zi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
-target_include_directories(zi_libraries_source_wwvegas_ww3d2 INTERFACE "Libraries/Source/WWVegas/WW3D2")
-target_include_directories(zi_libraries_source_wwvegas_wwmath INTERFACE "Libraries/Source/WWVegas/WWMath")
-target_include_directories(zi_libraries_source_wwvegas_wwsaveload INTERFACE "Libraries/Source/WWVegas/WWSaveLoad")
 target_include_directories(zi_main INTERFACE "Main")
 
 target_compile_definitions(zi_always INTERFACE
diff --git a/GeneralsMD/Code/GameEngine/CMakeLists.txt b/GeneralsMD/Code/GameEngine/CMakeLists.txt
index 343a0fe28f4..648ea13dc8e 100644
--- a/GeneralsMD/Code/GameEngine/CMakeLists.txt
+++ b/GeneralsMD/Code/GameEngine/CMakeLists.txt
@@ -1,16 +1,16 @@
 set(GAMEENGINE_SRC
     Include/Common/AcademyStats.h
     Include/Common/ActionManager.h
-    Include/Common/ArchiveFile.h
-    Include/Common/ArchiveFileSystem.h
-    Include/Common/AsciiString.h
-    Include/Common/AudioAffect.h
-    Include/Common/AudioEventInfo.h
-    Include/Common/AudioEventRTS.h
-    Include/Common/AudioHandleSpecialValues.h
-    Include/Common/AudioRandomValue.h
-    Include/Common/AudioRequest.h
-    Include/Common/AudioSettings.h
+#    Include/Common/ArchiveFile.h
+#    Include/Common/ArchiveFileSystem.h
+#    Include/Common/AsciiString.h
+#    Include/Common/AudioAffect.h
+#    Include/Common/AudioEventInfo.h
+#    Include/Common/AudioEventRTS.h
+#    Include/Common/AudioHandleSpecialValues.h
+#    Include/Common/AudioRandomValue.h
+#    Include/Common/AudioRequest.h
+#    Include/Common/AudioSettings.h
     Include/Common/BattleHonors.h
     Include/Common/BezFwdIterator.h
     Include/Common/BezierSegment.h
@@ -21,33 +21,33 @@ set(GAMEENGINE_SRC
     Include/Common/CDManager.h
     Include/Common/ClientUpdateModule.h
     Include/Common/CommandLine.h
-    Include/Common/crc.h
-    Include/Common/CRCDebug.h
+#    Include/Common/crc.h
+#    Include/Common/CRCDebug.h
     Include/Common/CriticalSection.h
     Include/Common/CustomMatchPreferences.h
     Include/Common/DamageFX.h
     Include/Common/DataChunk.h
-    Include/Common/Debug.h
+#    Include/Common/Debug.h
     Include/Common/Dict.h
     Include/Common/Directory.h
     Include/Common/DisabledTypes.h
     Include/Common/DiscreteCircle.h
     Include/Common/DrawModule.h
-    Include/Common/DynamicAudioEventInfo.h
+#    Include/Common/DynamicAudioEventInfo.h
     Include/Common/encrypt.h
     Include/Common/Energy.h
     Include/Common/Errors.h
-    Include/Common/file.h
-    Include/Common/FileSystem.h
+#    Include/Common/file.h
+#    Include/Common/FileSystem.h
     Include/Common/FunctionLexicon.h
-    Include/Common/GameAudio.h
+#    Include/Common/GameAudio.h
     Include/Common/GameCommon.h
 #    Include/Common/GameDefines.h
     Include/Common/GameEngine.h
     Include/Common/GameLOD.h
-    Include/Common/GameMemory.h
-    Include/Common/GameMusic.h
-    Include/Common/GameSounds.h
+#    Include/Common/GameMemory.h
+#    Include/Common/GameMusic.h
+#    Include/Common/GameSounds.h
     Include/Common/GameSpyMiscPreferences.h
     Include/Common/GameState.h
     Include/Common/GameStateMap.h
@@ -63,13 +63,13 @@ set(GAMEENGINE_SRC
     Include/Common/Language.h
     Include/Common/LatchRestore.h
     Include/Common/List.h
-    Include/Common/LocalFile.h
-    Include/Common/LocalFileSystem.h
-    Include/Common/MapObject.h
+#    Include/Common/LocalFile.h
+#    Include/Common/LocalFileSystem.h
+#    Include/Common/MapObject.h
     Include/Common/MapReaderWriterInfo.h
     Include/Common/MessageStream.h
     Include/Common/MiniLog.h
-    Include/Common/MiscAudio.h
+#    Include/Common/MiscAudio.h
     Include/Common/MissionStats.h
     Include/Common/ModelState.h
     Include/Common/Module.h
@@ -77,7 +77,7 @@ set(GAMEENGINE_SRC
     Include/Common/Money.h
     Include/Common/MultiplayerSettings.h
     Include/Common/NameKeyGenerator.h
-    Include/Common/ObjectStatusTypes.h
+#    Include/Common/ObjectStatusTypes.h
     Include/Common/OSDisplay.h
     Include/Common/Overridable.h
     Include/Common/Override.h
@@ -90,16 +90,17 @@ set(GAMEENGINE_SRC
     Include/Common/ProductionPrerequisite.h
     Include/Common/QuickmatchPreferences.h
     Include/Common/QuotedPrintable.h
-    Include/Common/Radar.h
-    Include/Common/RAMFile.h
-    Include/Common/RandomValue.h
+#    Include/Common/Radar.h
+#    Include/Common/RAMFile.h
+#    Include/Common/RandomValue.h
     Include/Common/Recorder.h
+#    Include/Common/ReplaySimulation.h
     Include/Common/Registry.h
     Include/Common/ResourceGatheringManager.h
     Include/Common/Science.h
     Include/Common/ScopedMutex.h
     Include/Common/ScoreKeeper.h
-    Include/Common/simpleplayer.h
+#    Include/Common/simpleplayer.h
     Include/Common/SkirmishBattleHonors.h
     Include/Common/SkirmishPreferences.h
     Include/Common/Snapshot.h
@@ -111,7 +112,7 @@ set(GAMEENGINE_SRC
     Include/Common/StateMachine.h
     Include/Common/StatsCollector.h
     Include/Common/STLTypedefs.h
-    Include/Common/StreamingArchiveFile.h
+#    Include/Common/StreamingArchiveFile.h
     Include/Common/SubsystemInterface.h
     Include/Common/SystemInfo.h
     Include/Common/Team.h
@@ -122,13 +123,14 @@ set(GAMEENGINE_SRC
     Include/Common/ThingSort.h
     Include/Common/ThingTemplate.h
     Include/Common/TunnelTracker.h
-    Include/Common/UnicodeString.h
+#    Include/Common/UnicodeString.h
     Include/Common/UnitTimings.h
     Include/Common/Upgrade.h
-    Include/Common/urllaunch.h
+#    Include/Common/urllaunch.h
     Include/Common/UserPreferences.h
     Include/Common/version.h
     Include/Common/WellKnownKeys.h
+#    Include/Common/WorkerProcess.h
 #    Include/Common/Xfer.h
 #    Include/Common/XferCRC.h
 #    Include/Common/XferDeepCRC.h
@@ -140,7 +142,7 @@ set(GAMEENGINE_SRC
     Include/GameClient/CDCheck.h
     Include/GameClient/ChallengeGenerals.h
     Include/GameClient/ClientInstance.h
-    Include/GameClient/ClientRandomValue.h
+#    Include/GameClient/ClientRandomValue.h
     Include/GameClient/Color.h
     Include/GameClient/CommandXlat.h
     Include/GameClient/ControlBar.h
@@ -197,14 +199,14 @@ set(GAMEENGINE_SRC
     Include/GameClient/Line2D.h
     Include/GameClient/LoadScreen.h
     Include/GameClient/LookAtXlat.h
-    Include/GameClient/MapUtil.h
+#    Include/GameClient/MapUtil.h
     Include/GameClient/MessageBox.h
     Include/GameClient/MetaEvent.h
     Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
     Include/GameClient/Module/BeaconClientUpdate.h
     Include/GameClient/Module/SwayClientUpdate.h
     Include/GameClient/Mouse.h
-    Include/GameClient/ParabolicEase.h
+#    Include/GameClient/ParabolicEase.h
     Include/GameClient/ParticleSys.h
     Include/GameClient/PlaceEventTranslator.h
     Include/GameClient/ProcessAnimateWindow.h
@@ -216,16 +218,16 @@ set(GAMEENGINE_SRC
     Include/GameClient/Shell.h
     Include/GameClient/ShellHooks.h
     Include/GameClient/ShellMenuScheme.h
-    Include/GameClient/Smudge.h
-    Include/GameClient/Snow.h
+#    Include/GameClient/Smudge.h
+#    Include/GameClient/Snow.h
     Include/GameClient/Statistics.h
-    Include/GameClient/TerrainRoads.h
-    Include/GameClient/TerrainVisual.h
-    Include/GameClient/VideoPlayer.h
-    Include/GameClient/View.h
-    Include/GameClient/Water.h
+#    Include/GameClient/TerrainRoads.h
+#    Include/GameClient/TerrainVisual.h
+#    Include/GameClient/VideoPlayer.h
+#    Include/GameClient/View.h
+#    Include/GameClient/Water.h
     Include/GameClient/WindowLayout.h
-    Include/GameClient/WindowVideoManager.h
+#    Include/GameClient/WindowVideoManager.h
     Include/GameClient/WindowXlat.h
     Include/GameClient/WinInstanceData.h
     Include/GameLogic/AI.h
@@ -249,7 +251,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/GhostObject.h
     Include/GameLogic/Locomotor.h
     Include/GameLogic/LocomotorSet.h
-    Include/GameLogic/LogicRandomValue.h
+#    Include/GameLogic/LogicRandomValue.h
     Include/GameLogic/Module/ActiveBody.h
     Include/GameLogic/Module/ActiveShroudUpgrade.h
     Include/GameLogic/Module/AIUpdate.h
@@ -496,73 +498,73 @@ set(GAMEENGINE_SRC
     Include/GameLogic/WeaponSetFlags.h
     Include/GameLogic/WeaponSetType.h
     Include/GameLogic/WeaponStatus.h
-    Include/GameNetwork/Connection.h
-    Include/GameNetwork/ConnectionManager.h
-    Include/GameNetwork/DisconnectManager.h
-    Include/GameNetwork/DownloadManager.h
-    Include/GameNetwork/FileTransfer.h
-    Include/GameNetwork/FirewallHelper.h
-    Include/GameNetwork/FrameData.h
-    Include/GameNetwork/FrameDataManager.h
-    Include/GameNetwork/FrameMetrics.h
-    Include/GameNetwork/GameInfo.h
-    Include/GameNetwork/GameMessageParser.h
-    Include/GameNetwork/GameSpy/BuddyDefs.h
-    Include/GameNetwork/GameSpy/BuddyThread.h
-    Include/GameNetwork/GameSpy/GameResultsThread.h
-    Include/GameNetwork/GameSpy/GSConfig.h
-    Include/GameNetwork/GameSpy/LadderDefs.h
-    Include/GameNetwork/GameSpy/LobbyUtils.h
-    Include/GameNetwork/GameSpy/MainMenuUtils.h
-    Include/GameNetwork/GameSpy/PeerDefs.h
-    Include/GameNetwork/GameSpy/PeerDefsImplementation.h
-    Include/GameNetwork/GameSpy/PeerThread.h
-    Include/GameNetwork/GameSpy/PersistentStorageDefs.h
-    Include/GameNetwork/GameSpy/PersistentStorageThread.h
-    Include/GameNetwork/GameSpy/PingThread.h
-    Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
-    Include/GameNetwork/GameSpy/ThreadUtils.h
-    Include/GameNetwork/GameSpyChat.h
-    Include/GameNetwork/GameSpyGameInfo.h
-    Include/GameNetwork/GameSpyGP.h
-    Include/GameNetwork/GameSpyOverlay.h
-    Include/GameNetwork/GameSpyThread.h
+#    Include/GameNetwork/Connection.h
+#    Include/GameNetwork/ConnectionManager.h
+#    Include/GameNetwork/DisconnectManager.h
+#    Include/GameNetwork/DownloadManager.h
+#    Include/GameNetwork/FileTransfer.h
+#    Include/GameNetwork/FirewallHelper.h
+#    Include/GameNetwork/FrameData.h
+#    Include/GameNetwork/FrameDataManager.h
+#    Include/GameNetwork/FrameMetrics.h
+#    Include/GameNetwork/GameInfo.h
+#    Include/GameNetwork/GameMessageParser.h
+#    Include/GameNetwork/GameSpy/BuddyDefs.h
+#    Include/GameNetwork/GameSpy/BuddyThread.h
+#    Include/GameNetwork/GameSpy/GameResultsThread.h
+#    Include/GameNetwork/GameSpy/GSConfig.h
+#    Include/GameNetwork/GameSpy/LadderDefs.h
+#    Include/GameNetwork/GameSpy/LobbyUtils.h
+#    Include/GameNetwork/GameSpy/MainMenuUtils.h
+#    Include/GameNetwork/GameSpy/PeerDefs.h
+#    Include/GameNetwork/GameSpy/PeerDefsImplementation.h
+#    Include/GameNetwork/GameSpy/PeerThread.h
+#    Include/GameNetwork/GameSpy/PersistentStorageDefs.h
+#    Include/GameNetwork/GameSpy/PersistentStorageThread.h
+#    Include/GameNetwork/GameSpy/PingThread.h
+#    Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
+#    Include/GameNetwork/GameSpy/ThreadUtils.h
+#    Include/GameNetwork/GameSpyChat.h
+#    Include/GameNetwork/GameSpyGameInfo.h
+#    Include/GameNetwork/GameSpyGP.h
+#    Include/GameNetwork/GameSpyOverlay.h
+#    Include/GameNetwork/GameSpyThread.h
     Include/GameNetwork/GUIUtil.h
-    Include/GameNetwork/IPEnumeration.h
-    Include/GameNetwork/LANAPI.h
-    Include/GameNetwork/LANAPICallbacks.h
-    Include/GameNetwork/LANGameInfo.h
-    Include/GameNetwork/LANPlayer.h
-    Include/GameNetwork/NAT.h
-    Include/GameNetwork/NetCommandList.h
-    Include/GameNetwork/NetCommandMsg.h
-    Include/GameNetwork/NetCommandRef.h
-    Include/GameNetwork/NetCommandWrapperList.h
-    Include/GameNetwork/NetPacket.h
-    Include/GameNetwork/NetworkDefs.h
-    Include/GameNetwork/NetworkInterface.h
-    Include/GameNetwork/networkutil.h
-    Include/GameNetwork/RankPointValue.h
-    Include/GameNetwork/Transport.h
-    Include/GameNetwork/udp.h
-    Include/GameNetwork/User.h
-    Include/GameNetwork/WOLBrowser/FEBDispatch.h
-    Include/GameNetwork/WOLBrowser/WebBrowser.h
+#    Include/GameNetwork/IPEnumeration.h
+#    Include/GameNetwork/LANAPI.h
+#    Include/GameNetwork/LANAPICallbacks.h
+#    Include/GameNetwork/LANGameInfo.h
+#    Include/GameNetwork/LANPlayer.h
+#    Include/GameNetwork/NAT.h
+#    Include/GameNetwork/NetCommandList.h
+#    Include/GameNetwork/NetCommandMsg.h
+#    Include/GameNetwork/NetCommandRef.h
+#    Include/GameNetwork/NetCommandWrapperList.h
+#    Include/GameNetwork/NetPacket.h
+#    Include/GameNetwork/NetworkDefs.h
+#    Include/GameNetwork/NetworkInterface.h
+#    Include/GameNetwork/networkutil.h
+#    Include/GameNetwork/RankPointValue.h
+#    Include/GameNetwork/Transport.h
+#    Include/GameNetwork/udp.h
+#    Include/GameNetwork/User.h
+#    Include/GameNetwork/WOLBrowser/FEBDispatch.h
+#    Include/GameNetwork/WOLBrowser/WebBrowser.h
     Include/Precompiled/PreRTS.h
-    Source/Common/Audio/AudioEventRTS.cpp
-    Source/Common/Audio/AudioRequest.cpp
-    Source/Common/Audio/DynamicAudioEventInfo.cpp
-    Source/Common/Audio/GameAudio.cpp
-    Source/Common/Audio/GameMusic.cpp
-    Source/Common/Audio/GameSounds.cpp
-    #Source/Common/Audio/simpleplayer.cpp
-    #Source/Common/Audio/urllaunch.cpp
+#    Source/Common/Audio/AudioEventRTS.cpp
+#    Source/Common/Audio/AudioRequest.cpp
+#    Source/Common/Audio/DynamicAudioEventInfo.cpp
+#    Source/Common/Audio/GameAudio.cpp
+#    Source/Common/Audio/GameMusic.cpp
+#    Source/Common/Audio/GameSounds.cpp
+    #Source/Common/Audio/simpleplayer.cpp # unused
+    #Source/Common/Audio/urllaunch.cpp # unused
     Source/Common/Bezier/BezFwdIterator.cpp
     Source/Common/Bezier/BezierSegment.cpp
     Source/Common/BitFlags.cpp
     Source/Common/CommandLine.cpp
-    Source/Common/crc.cpp
-    Source/Common/CRCDebug.cpp
+#    Source/Common/crc.cpp
+#    Source/Common/CRCDebug.cpp
     Source/Common/DamageFX.cpp
     Source/Common/Dict.cpp
     Source/Common/DiscreteCircle.cpp
@@ -573,7 +575,7 @@ set(GAMEENGINE_SRC
     Source/Common/INI/INI.cpp
     Source/Common/INI/INIAiData.cpp
     Source/Common/INI/INIAnimation.cpp
-    Source/Common/INI/INIAudioEventInfo.cpp
+#    Source/Common/INI/INIAudioEventInfo.cpp
     Source/Common/INI/INICommandButton.cpp
     Source/Common/INI/INICommandSet.cpp
     Source/Common/INI/INIControlBarScheme.cpp
@@ -584,7 +586,7 @@ set(GAMEENGINE_SRC
     Source/Common/INI/INIMapCache.cpp
     Source/Common/INI/INIMapData.cpp
     Source/Common/INI/INIMappedImage.cpp
-    Source/Common/INI/INIMiscAudio.cpp
+#    Source/Common/INI/INIMiscAudio.cpp
     Source/Common/INI/INIModel.cpp
     Source/Common/INI/INIMultiplayer.cpp
     Source/Common/INI/INIObject.cpp
@@ -594,7 +596,7 @@ set(GAMEENGINE_SRC
     Source/Common/INI/INITerrainBridge.cpp
     Source/Common/INI/INITerrainRoad.cpp
     Source/Common/INI/INIUpgrade.cpp
-    Source/Common/INI/INIVideo.cpp
+#    Source/Common/INI/INIVideo.cpp
     Source/Common/INI/INIWater.cpp
     Source/Common/INI/INIWeapon.cpp
     Source/Common/INI/INIWebpageURL.cpp
@@ -605,8 +607,9 @@ set(GAMEENGINE_SRC
     Source/Common/NameKeyGenerator.cpp
     Source/Common/PartitionSolver.cpp
     Source/Common/PerfTimer.cpp
-    Source/Common/RandomValue.cpp
+#    Source/Common/RandomValue.cpp
     Source/Common/Recorder.cpp
+#    Source/Common/ReplaySimulation.cpp
     Source/Common/RTS/AcademyStats.cpp
     Source/Common/RTS/ActionManager.cpp
     Source/Common/RTS/Energy.cpp
@@ -626,19 +629,19 @@ set(GAMEENGINE_SRC
     Source/Common/SkirmishBattleHonors.cpp
     Source/Common/StateMachine.cpp
     Source/Common/StatsCollector.cpp
-    Source/Common/System/ArchiveFile.cpp
-    Source/Common/System/ArchiveFileSystem.cpp
-    Source/Common/System/AsciiString.cpp
+#    Source/Common/System/ArchiveFile.cpp
+#    Source/Common/System/ArchiveFileSystem.cpp
+#    Source/Common/System/AsciiString.cpp
     Source/Common/System/BuildAssistant.cpp
     Source/Common/System/CDManager.cpp
     Source/Common/System/CriticalSection.cpp
     Source/Common/System/DataChunk.cpp
-    Source/Common/System/Debug.cpp
+#    Source/Common/System/Debug.cpp
     Source/Common/System/Directory.cpp
     Source/Common/System/DisabledTypes.cpp
     Source/Common/System/encrypt.cpp
-    Source/Common/System/File.cpp
-    Source/Common/System/FileSystem.cpp
+#    Source/Common/System/File.cpp
+#    Source/Common/System/FileSystem.cpp
     Source/Common/System/FunctionLexicon.cpp
     Source/Common/System/GameCommon.cpp
     #Source/Common/System/GameMemory.cpp
@@ -646,22 +649,22 @@ set(GAMEENGINE_SRC
     Source/Common/System/Geometry.cpp
     Source/Common/System/KindOf.cpp
     Source/Common/System/List.cpp
-    Source/Common/System/LocalFile.cpp
-    Source/Common/System/LocalFileSystem.cpp
+#    Source/Common/System/LocalFile.cpp
+#    Source/Common/System/LocalFileSystem.cpp
     #Source/Common/System/MemoryInit.cpp
-    Source/Common/System/ObjectStatusTypes.cpp
+#    Source/Common/System/ObjectStatusTypes.cpp
     Source/Common/System/QuotedPrintable.cpp
-    Source/Common/System/Radar.cpp
-    Source/Common/System/RAMFile.cpp
+#    Source/Common/System/Radar.cpp
+#    Source/Common/System/RAMFile.cpp
     Source/Common/System/registry.cpp
     Source/Common/System/SaveGame/GameState.cpp
     Source/Common/System/SaveGame/GameStateMap.cpp
     Source/Common/System/Snapshot.cpp
     Source/Common/System/StackDump.cpp
-    Source/Common/System/StreamingArchiveFile.cpp
+#    Source/Common/System/StreamingArchiveFile.cpp
     Source/Common/System/SubsystemInterface.cpp
     Source/Common/System/Trig.cpp
-    Source/Common/System/UnicodeString.cpp
+#    Source/Common/System/UnicodeString.cpp
     Source/Common/System/Upgrade.cpp
 #    Source/Common/System/Xfer.cpp
 #    Source/Common/System/XferCRC.cpp
@@ -676,6 +679,7 @@ set(GAMEENGINE_SRC
     Source/Common/Thing/ThingTemplate.cpp
     Source/Common/UserPreferences.cpp
     Source/Common/version.cpp
+#    Source/Common/WorkerProcess.cpp
     Source/GameClient/ClientInstance.cpp
     Source/GameClient/Color.cpp
     Source/GameClient/Credits.cpp
@@ -786,14 +790,14 @@ set(GAMEENGINE_SRC
     Source/GameClient/GUI/Shell/Shell.cpp
     Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
     Source/GameClient/GUI/WindowLayout.cpp
-    Source/GameClient/GUI/WindowVideoManager.cpp
+#    Source/GameClient/GUI/WindowVideoManager.cpp
     Source/GameClient/GUI/WinInstanceData.cpp
     Source/GameClient/InGameUI.cpp
     Source/GameClient/Input/Keyboard.cpp
     Source/GameClient/Input/Mouse.cpp
     Source/GameClient/LanguageFilter.cpp
     Source/GameClient/Line2D.cpp
-    Source/GameClient/MapUtil.cpp
+#    Source/GameClient/MapUtil.cpp
     Source/GameClient/MessageStream/CommandXlat.cpp
     Source/GameClient/MessageStream/GUICommandTranslator.cpp
     Source/GameClient/MessageStream/HintSpy.cpp
@@ -803,25 +807,25 @@ set(GAMEENGINE_SRC
     Source/GameClient/MessageStream/PlaceEventTranslator.cpp
     Source/GameClient/MessageStream/SelectionXlat.cpp
     Source/GameClient/MessageStream/WindowXlat.cpp
-    Source/GameClient/ParabolicEase.cpp
+#    Source/GameClient/ParabolicEase.cpp
     Source/GameClient/RadiusDecal.cpp
     Source/GameClient/SelectionInfo.cpp
-    Source/GameClient/Snow.cpp
+#    Source/GameClient/Snow.cpp
     Source/GameClient/Statistics.cpp
     Source/GameClient/System/Anim2D.cpp
     Source/GameClient/System/CampaignManager.cpp
-    "Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp"
+#    "Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp"
     Source/GameClient/System/DebugDisplay.cpp
     Source/GameClient/System/Image.cpp
     Source/GameClient/System/ParticleSys.cpp
     Source/GameClient/System/RayEffect.cpp
-    Source/GameClient/System/Smudge.cpp
-    Source/GameClient/Terrain/TerrainRoads.cpp
-    Source/GameClient/Terrain/TerrainVisual.cpp
-    Source/GameClient/VideoPlayer.cpp
-    Source/GameClient/VideoStream.cpp
-    Source/GameClient/View.cpp
-    Source/GameClient/Water.cpp
+#    Source/GameClient/System/Smudge.cpp
+#    Source/GameClient/Terrain/TerrainRoads.cpp
+#    Source/GameClient/Terrain/TerrainVisual.cpp
+#    Source/GameClient/VideoPlayer.cpp
+#    Source/GameClient/VideoStream.cpp
+#    Source/GameClient/View.cpp
+#    Source/GameClient/Water.cpp
     Source/GameLogic/AI/AI.cpp
     Source/GameLogic/AI/AIDock.cpp
     Source/GameLogic/AI/AIGroup.cpp
@@ -1081,67 +1085,69 @@ set(GAMEENGINE_SRC
     Source/GameLogic/System/GameLogic.cpp
     Source/GameLogic/System/GameLogicDispatch.cpp
     Source/GameLogic/System/RankInfo.cpp
-    Source/GameNetwork/Connection.cpp
-    Source/GameNetwork/ConnectionManager.cpp
-    Source/GameNetwork/DisconnectManager.cpp
-    Source/GameNetwork/DownloadManager.cpp
-    Source/GameNetwork/FileTransfer.cpp
-    Source/GameNetwork/FirewallHelper.cpp
-    Source/GameNetwork/FrameData.cpp
-    Source/GameNetwork/FrameDataManager.cpp
-    Source/GameNetwork/FrameMetrics.cpp
-    Source/GameNetwork/GameInfo.cpp
-    Source/GameNetwork/GameMessageParser.cpp
-    #Source/GameNetwork/GameSpyChat.cpp
-    #Source/GameNetwork/GameSpyGameInfo.cpp
-    #Source/GameNetwork/GameSpyGP.cpp
-    Source/GameNetwork/GameSpy/Chat.cpp
-    Source/GameNetwork/GameSpy/GSConfig.cpp
-    Source/GameNetwork/GameSpy/LadderDefs.cpp
-    Source/GameNetwork/GameSpy/LobbyUtils.cpp
-    Source/GameNetwork/GameSpy/MainMenuUtils.cpp
-    Source/GameNetwork/GameSpy/PeerDefs.cpp
-    Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
-    Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
-    Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
-    Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
-    Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
-    Source/GameNetwork/GameSpy/Thread/PingThread.cpp
-    Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
-    Source/GameNetwork/GameSpyOverlay.cpp
+#    Source/GameNetwork/Connection.cpp
+#    Source/GameNetwork/ConnectionManager.cpp
+#    Source/GameNetwork/DisconnectManager.cpp
+#    Source/GameNetwork/DownloadManager.cpp
+#    Source/GameNetwork/FileTransfer.cpp
+#    Source/GameNetwork/FirewallHelper.cpp
+#    Source/GameNetwork/FrameData.cpp
+#    Source/GameNetwork/FrameDataManager.cpp
+#    Source/GameNetwork/FrameMetrics.cpp
+#    Source/GameNetwork/GameInfo.cpp
+#    Source/GameNetwork/GameMessageParser.cpp
+#    #Source/GameNetwork/GameSpyChat.cpp
+#    #Source/GameNetwork/GameSpyGameInfo.cpp
+#    #Source/GameNetwork/GameSpyGP.cpp
+#    Source/GameNetwork/GameSpy/Chat.cpp
+#    Source/GameNetwork/GameSpy/GSConfig.cpp
+#    Source/GameNetwork/GameSpy/LadderDefs.cpp
+#    Source/GameNetwork/GameSpy/LobbyUtils.cpp
+#    Source/GameNetwork/GameSpy/MainMenuUtils.cpp
+#    Source/GameNetwork/GameSpy/PeerDefs.cpp
+#    Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
+#    Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
+#    Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
+#    Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
+#    Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
+#    Source/GameNetwork/GameSpy/Thread/PingThread.cpp
+#    Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
+#    Source/GameNetwork/GameSpyOverlay.cpp
     Source/GameNetwork/GUIUtil.cpp
-    Source/GameNetwork/IPEnumeration.cpp
-    Source/GameNetwork/LANAPI.cpp
-    Source/GameNetwork/LANAPICallbacks.cpp
-    Source/GameNetwork/LANAPIhandlers.cpp
-    Source/GameNetwork/LANGameInfo.cpp
-    Source/GameNetwork/NAT.cpp
-    Source/GameNetwork/NetCommandList.cpp
-    Source/GameNetwork/NetCommandMsg.cpp
-    Source/GameNetwork/NetCommandRef.cpp
-    Source/GameNetwork/NetCommandWrapperList.cpp
-    Source/GameNetwork/NetMessageStream.cpp
-    Source/GameNetwork/NetPacket.cpp
-    Source/GameNetwork/Network.cpp
-    Source/GameNetwork/NetworkUtil.cpp
-    Source/GameNetwork/Transport.cpp
-    Source/GameNetwork/udp.cpp
-    Source/GameNetwork/User.cpp
-    Source/GameNetwork/WOLBrowser/WebBrowser.cpp
+#    Source/GameNetwork/IPEnumeration.cpp
+#    Source/GameNetwork/LANAPI.cpp
+#    Source/GameNetwork/LANAPICallbacks.cpp
+#    Source/GameNetwork/LANAPIhandlers.cpp
+#    Source/GameNetwork/LANGameInfo.cpp
+#    Source/GameNetwork/NAT.cpp
+#    Source/GameNetwork/NetCommandList.cpp
+#    Source/GameNetwork/NetCommandMsg.cpp
+#    Source/GameNetwork/NetCommandRef.cpp
+#    Source/GameNetwork/NetCommandWrapperList.cpp
+#    Source/GameNetwork/NetMessageStream.cpp
+#    Source/GameNetwork/NetPacket.cpp
+#    Source/GameNetwork/Network.cpp
+#    Source/GameNetwork/NetworkUtil.cpp
+#    Source/GameNetwork/Transport.cpp
+#    Source/GameNetwork/udp.cpp
+#    Source/GameNetwork/User.cpp
+#    Source/GameNetwork/WOLBrowser/WebBrowser.cpp
     Source/Precompiled/PreRTS.cpp
 )
 
 if(RTS_GAMEMEMORY_ENABLE)
     # Uses the original Game Memory implementation.
     list(APPEND GAMEENGINE_SRC
-        Source/Common/System/GameMemory.cpp
-        Source/Common/System/MemoryInit.cpp
+#        Source/Common/System/GameMemory.cpp
+#        Source/Common/System/GameMemoryInitDMA_GeneralsMD.inl
+#        Source/Common/System/GameMemoryInitPools_GeneralsMD.inl
+#        Source/Common/System/MemoryInit.cpp
     )
 else()
     # Uses the null implementation when disabled.
     list(APPEND GAMEENGINE_SRC
-        Source/Common/System/GameMemoryNull.cpp
-        Include/Common/GameMemoryNull.h
+#        Source/Common/System/GameMemoryNull.cpp
+#        Include/Common/GameMemoryNull.h
     )
 endif()
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h b/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h
index b180137213a..910b7dc6995 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h
@@ -24,12 +24,12 @@
 
 // FILE: AcademyStats.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Los Angeles                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2003 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Los Angeles
+//
+//                       Confidential Information
+//                Copyright (C) 2003 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -38,16 +38,13 @@
 //
 // Created:    Kris Morness, July 2003
 //
-// Desc:			 Keeps track of various statistics in order to provide advice to 
+// Desc:			 Keeps track of various statistics in order to provide advice to
 //             the player about how to improve playing.
 //
 //-----------------------------------------------------------------------------
 
 #pragma once
 
-#ifndef __ACADEMY_STATS_H
-#define __ACADEMY_STATS_H
-
 #include "Lib/BaseType.h"
 #include "Common/Debug.h"
 #include "Common/Snapshot.h"
@@ -74,8 +71,10 @@ enum AcademyClassificationType CPP_11(: Int)
 	ACT_NONE,
 	ACT_UPGRADE_RADAR,
 	ACT_SUPERPOWER,
+
+	ACT_COUNT
 };
-extern const char *TheAcademyClassificationTypeNames[]; //Change above, change this!
+extern const char *const TheAcademyClassificationTypeNames[]; //Change above, change this!
 
 
 // ----------------------------------------------------------------------------------------------
@@ -241,7 +240,7 @@ class AcademyStats : public Snapshot
 	//25) Did the player use the new alternate interface in the options?
 	//Uses TheGlobalData->m_useAlternateMouse
 
-	//26) Player did not use the new "double click location attack move/guard" 
+	//26) Player did not use the new "double click location attack move/guard"
 	UnsignedInt m_doubleClickAttackMoveOrdersGiven;
 
   //27) Built barracks within 5 minutes?
@@ -275,6 +274,3 @@ class AcademyStats : public Snapshot
 	//35) Did the player ever create a "Firestorm" with his MiGs or Inferno Cannons?
 	UnsignedInt m_firestormsCreated;
 };
-
-#endif // __ACADEMY_STATS_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h b/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h
index 79b1ef1b1d8..125c3d0d120 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h
@@ -24,19 +24,16 @@
 
 // FILE: ActionManager.h //////////////////////////////////////////////////////////////////////////
 // Author: Colin Day
-// Desc:   TheActionManager is a convenient place for us to wrap up all sorts of logical 
+// Desc:   TheActionManager is a convenient place for us to wrap up all sorts of logical
 //				 queries about what objects can do in the world and to other objects.  The purpose
 //				 of having a central place for this logic assists us in making these logical kind
 //				 of queries in the user interface and allows us to use the same code to validate
-//				 commands as they come in over the network interface in order to do the 
+//				 commands as they come in over the network interface in order to do the
 //				 real action.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __ACTIONMANAGER_H_
-#define __ACTIONMANAGER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/SubsystemInterface.h"
 
@@ -111,5 +108,3 @@ class ActionManager : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern ActionManager *TheActionManager;
-
-#endif  // end __ACTIONMANAGER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ArchiveFile.h b/GeneralsMD/Code/GameEngine/Include/Common/ArchiveFile.h
deleted file mode 100644
index 741cf2c1d02..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/ArchiveFile.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/////// ArchiveFile.h ////////////////////
-// Bryan Cleveland, August 2002
-//////////////////////////////////////////
-
-#pragma once
-
-#ifndef __ARCHIVEFILE_H
-#define __ARCHIVEFILE_H
-
-#include "Lib/BaseType.h"
-#include "Common/AsciiString.h"
-#include "Common/ArchiveFileSystem.h"
-
-class File;
-
-/**
-  *	An archive file is itself a collection of sub files. Each file inside the archive file
-	* has a unique name by which it can be accessed. The ArchiveFile object class is the
-	* runtime interface to the mix file and the sub files. Each file inside the mix 
-	* file can be accessed by the openFile().
-	*
-	* ArchiveFile interfaces can be created by the TheArchiveFileSystem object.
-	*/
-//===============================
-
-class ArchiveFile
-{
-public:
-	ArchiveFile();
-	virtual ~ArchiveFile();
-
-	virtual Bool					getFileInfo( const AsciiString& filename, FileInfo *fileInfo) const = 0;	///< fill in the fileInfo struct with info about the file requested.
-	virtual File*					openFile( const Char *filename, Int access = 0) = 0;	///< Open the specified file within the archive file
-	virtual void					closeAllFiles( void ) = 0;									///< Close all file opened in this archive file
-	virtual AsciiString		getName( void ) = 0;												///< Returns the name of the archive file
-	virtual AsciiString		getPath( void ) = 0;												///< Returns full path and name of archive file
-	virtual void					setSearchPriority( Int new_priority ) = 0;	///< Set this archive file's search priority
-	virtual void					close( void ) = 0;													///< Close this archive file
-	void									attachFile(File *file);
-
-	void									getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
-	void									getFileListInDirectory(const DetailedArchivedDirectoryInfo *dirInfo, const AsciiString& currentDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
-
-	void									addFile(const AsciiString& path, const ArchivedFileInfo *fileInfo); ///< add this file to our directory tree.
-
-protected:
-	const ArchivedFileInfo *		getArchivedFileInfo(const AsciiString& filename) const;	///< return the ArchivedFileInfo from the directory tree.
-
-	File *m_file; ///< file pointer to the archive file on disk.  Kept open so we don't have to continuously open and close the file all the time.
-	DetailedArchivedDirectoryInfo m_rootDirectory;
-};
-
-#endif // __ARCHIVEFILE_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ArchiveFileSystem.h b/GeneralsMD/Code/GameEngine/Include/Common/ArchiveFileSystem.h
deleted file mode 100644
index 5d36cdfeb31..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/ArchiveFileSystem.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    Generals
-//
-// Module:     Archive files
-//
-// File name:  Common/ArchiveFileSystem.h
-//
-// Created:    11/26/01 TR
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __ARCHIVEFILESYSTEM_H_
-#define __ARCHIVEFILESYSTEM_H_
-
-#define MUSIC_BIG "Music.big"
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/SubsystemInterface.h"
-#include "Common/AsciiString.h"
-#include "Common/FileSystem.h" // for typedefs, etc.
-#include "Common/STLTypedefs.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-class File;
-class ArchiveFile;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-
-//===============================
-// ArchiveFileSystem
-//===============================
-/**
-  *	Creates and manages ArchiveFile interfaces. ArchiveFiles can be accessed
-	* by calling the openArchiveFile() member. ArchiveFiles can be accessed by
-	* name or by File interface.
-	*
-	* openFile() member searches all Archive files for the specified sub file.
-	*/
-//===============================
-class ArchivedDirectoryInfo;
-class DetailedArchivedDirectoryInfo;
-class ArchivedFileInfo;
-
-typedef std::map<AsciiString, DetailedArchivedDirectoryInfo> DetailedArchivedDirectoryInfoMap;
-typedef std::map<AsciiString, ArchivedDirectoryInfo> ArchivedDirectoryInfoMap;
-typedef std::map<AsciiString, ArchivedFileInfo> ArchivedFileInfoMap;
-typedef std::map<AsciiString, ArchiveFile *> ArchiveFileMap;
-typedef std::map<AsciiString, AsciiString> ArchivedFileLocationMap; // first string is the file name, second one is the archive filename.
-
-class ArchivedDirectoryInfo 
-{
-public:
-	AsciiString								m_directoryName;
-	ArchivedDirectoryInfoMap	m_directories;
-	ArchivedFileLocationMap		m_files;
-
-	void clear()
-	{
-		m_directoryName.clear();
-		m_directories.clear();
-		m_files.clear();
-	}
-
-};
-
-class DetailedArchivedDirectoryInfo 
-{
-public:
-	AsciiString												m_directoryName;
-	DetailedArchivedDirectoryInfoMap	m_directories;
-	ArchivedFileInfoMap								m_files;
-
-	void clear()
-	{
-		m_directoryName.clear();
-		m_directories.clear();
-		m_files.clear();
-	}
-};
-
-class ArchivedFileInfo 
-{
-public:
-	AsciiString m_filename;
-	AsciiString m_archiveFilename;
-	UnsignedInt m_offset;
-	UnsignedInt m_size;
-
-	ArchivedFileInfo()
-	{
-		clear();
-	}
-
-	void clear()
-	{
-		m_filename.clear();
-		m_archiveFilename.clear();
-		m_offset = 0;
-		m_size = 0;
-	}
-};
-
-
-class ArchiveFileSystem : public SubsystemInterface
-{
-	public:
-	ArchiveFileSystem();
-	virtual ~ArchiveFileSystem();
-
-	virtual void init( void ) = 0;
-	virtual void update( void ) = 0;
-	virtual void reset( void ) = 0;
-	virtual void postProcessLoad( void ) = 0;
-
-	// ArchiveFile operations
-	virtual ArchiveFile*	openArchiveFile( const Char *filename ) = 0;		///< Create new or return existing Archive file from file name
-	virtual void					closeArchiveFile( const Char *filename ) = 0;		///< Close the one specified big file.
-	virtual void					closeAllArchiveFiles( void ) = 0;								///< Close all Archivefiles currently open
-
-	// File operations
-	virtual File*					openFile( const Char *filename, Int access = 0);	///< Search Archive files for specified file name and open it if found
-	virtual void					closeAllFiles( void ) = 0;									///< Close all files associated with ArchiveFiles
-	virtual Bool					doesFileExist(const Char *filename) const;		///< return true if that file exists in an archive file somewhere.
-
-	void					getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.  Scans each Archive file.
-	Bool					getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const; ///< see FileSystem.h
-	
-	virtual Bool	loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) = 0;
-
-	// Unprotected this for copy-protection routines
-	AsciiString						getArchiveFilenameForFile(const AsciiString& filename) const;
-	void loadMods( void );
-
-protected:
-	virtual void					loadIntoDirectoryTree(const ArchiveFile *archiveFile, const AsciiString& archiveFilename, Bool overwrite = FALSE );	///< load the archive file's header information and apply it to the global archive directory tree.
-
-	ArchiveFileMap m_archiveFileMap;
-	ArchivedDirectoryInfo m_rootDirectory;
-};
-
-
-extern ArchiveFileSystem *TheArchiveFileSystem;
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-#endif // __ARCHIVEFILESYSTEM_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AsciiString.h b/GeneralsMD/Code/GameEngine/Include/Common/AsciiString.h
deleted file mode 100644
index 9b304aa980f..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/AsciiString.h
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: AsciiString.h 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  AsciiString.h
-//
-// Created:    Steven Johnson, October 2001
-//
-// Desc:       General-purpose string classes
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef ASCIISTRING_H
-#define ASCIISTRING_H
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include "Lib/BaseType.h"
-#include "Common/Debug.h"
-#include "Common/Errors.h"
-
-class UnicodeString;
-
-// -----------------------------------------------------
-/**
-	AsciiString is the fundamental single-byte string type used in the Generals
-	code base, and should be preferred over all other string constructions
-	(e.g., array of char, STL string<>, WWVegas StringClass, etc.)
-
-	Of course, other string setups may be used when necessary or appropriate!
-
-	AsciiString is modeled after the MFC CString class, with some minor
-	syntactic differences to keep in line with our coding conventions.
-
-	Basically, AsciiString allows you to treat a string as an intrinsic
-	type, rather analogous to 'int' -- when passed by value, a new string
-	is created, and modifying the new string doesn't modify the original.
-	This is done fairly efficiently, so that no new memory allocation is done
-	unless the string is actually modified. 
-
-	Naturally, AsciiString handles all memory issues, so there's no need
-	to do anything to free memory... just allow the AsciiString's
-	destructor to run.
-
-	AsciiStrings are suitable for use as automatic, member, or static variables.
-*/
-
-class AsciiString
-{
-private:
-	
-	// Note, this is a Plain Old Data Structure... don't
-	// add a ctor/dtor, 'cuz they won't ever be called.
-	struct AsciiStringData
-	{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		const char* m_debugptr;	// just makes it easier to read in the debugger
-#endif
-		unsigned short	m_refCount;						// reference count
-		unsigned short	m_numCharsAllocated;  // length of data allocated
-		// char m_stringdata[];
-
-		inline char* peek() { return (char*)(this+1); }
-	};
-
-	#ifdef RTS_DEBUG
-	void validate() const;
-	#else
-	inline void validate() const { }
-	#endif
-
-protected:
-	AsciiStringData* m_data;   // pointer to ref counted string data
-
-	char* peek() const;
-	void releaseBuffer();
-	void ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData, const char* strToCpy, const char* strToCat);
-
-public:
-
-	enum 
-	{ 
-		MAX_FORMAT_BUF_LEN = 2048,		///< max total len of string created by format/format_va
-		MAX_LEN = 32767							///< max total len of any AsciiString, in chars
-	};
-
-
-	/**
-		This is a convenient global used to indicate the empty
-		string, so we don't need to construct temporaries
-		for such a common thing.
-	*/
-	static AsciiString TheEmptyString;
-
-	/**
-		Default constructor -- construct a new, empty AsciiString.
-	*/
-	AsciiString();
-	/**
-		Copy constructor -- make this AsciiString identical to the
-		other AsciiString. (This is actually quite efficient, because
-		they will simply share the same string and increment the
-		refcount.)
-	*/
-	AsciiString(const AsciiString& stringSrc);
-	/**
-		Constructor -- from a literal string. Constructs an AsciiString
-		with the given string. Note that a copy of the string is made;
-		the input ptr is not saved. 
-		Note that this is no longer explicit, as the conversion is almost
-		always wanted, anyhow.
-	*/
-	AsciiString(const char* s);
-
-	/**
-		Destructor. Not too exciting... clean up the works and such.
-	*/
-	~AsciiString();
-
-	/**
-		Return the length, in characters (not bytes!), of the string.
-	*/
-	int getLength() const;
-	/**
-		Return true iff the length of the string is zero. Equivalent
-		to (getLength() == 0) but slightly more efficient.
-	*/
-	Bool isEmpty() const;
-	/**
-		Make the string empty. Equivalent to (str = "") but slightly more efficient.
-	*/
-	void clear();
-
-	/**
-		Return the character and the given (zero-based) index into the string.
-		No range checking is done (except in debug mode).
-	*/
-	char getCharAt(int index) const;
-	/**
-		Return a pointer to the (null-terminated) string. Note that this is 
-		a const pointer: do NOT change this! It is imperative that it be 
-		impossible (or at least, really difficuly) for someone to change our
-		private data, since it might be shared amongst other AsciiStrings.
-	*/
-	const char* str() const;
-
-	/**
-		Makes sure there is room for a string of len+1 characters, and
-		returns a pointer to the string buffer.  This ensures that the
-		string buffer is NOT shared.  This is intended for the file reader, 
-		that is reading new strings in from a file. jba.
-	*/
-	char* getBufferForRead(Int len);
-
-	/**
-		Replace the contents of self with the given string.
-		(This is actually quite efficient, because
-		they will simply share the same string and increment the
-		refcount.)
-	*/
-	void set(const AsciiString& stringSrc);
-	/**
-		Replace the contents of self with the given string.
-		Note that a copy of the string is made; the input ptr is not saved.
-	*/
-	void set(const char* s);
-
-	/**
-		replace contents of self with the given string. Note the
-		nomenclature is translate rather than set; this is because
-		not all single-byte strings translate one-for-one into
-		UnicodeStrings, so some data manipulation may be necessary,
-		and the resulting strings may not be equivalent.
-	*/
-	void translate(const UnicodeString& stringSrc);
-
-	/**
-		Concatenate the given string onto self.
-	*/
-	void concat(const AsciiString& stringSrc);
-	/**
-		Concatenate the given string onto self.
-	*/
-	void concat(const char* s);
-	/**
-		Concatenate the given character onto self.
-	*/
-	void concat(const char c);
-
-	/**
-	  Remove leading and trailing whitespace from the string.
-	*/
-	void trim( void );
-
-	/**
-	  Make the string lowercase
-	*/
-	void toLower( void );
-
-	/**
-		Remove the final character in the string. If the string is empty,
-		do nothing. (This is a rather dorky method, but used a lot in 
-		text editing, thus its presence here.)
-	*/
-	void removeLastChar();
-
-	/**
-		Analogous to sprintf() -- this formats a string according to the
-		given sprintf-style format string (and the variable argument list)
-		and stores the result in self.
-	*/
-	void format(AsciiString format, ...);
-	void format(const char* format, ...);
-	/**
-		Identical to format(), but takes a va_list rather than
-		a variable argument list. (i.e., analogous to vsprintf.)
-	*/
-	void format_va(const AsciiString& format, va_list args);
-	void format_va(const char* format, va_list args);
-
-	/**
-		Conceptually identical to strcmp().
-	*/
-	int compare(const AsciiString& stringSrc) const;
-	/**
-		Conceptually identical to strcmp().
-	*/
-	int compare(const char* s) const;
-	/**
-		Conceptually identical to _stricmp().
-	*/
-	int compareNoCase(const AsciiString& stringSrc) const;
-	/**
-		Conceptually identical to _stricmp().
-	*/
-	int compareNoCase(const char* s) const;
-
-	/**
-		Conceptually identical to strchr().
-	*/
-	const char* find(char c) const;
-
-	/**
-		Conceptually identical to strrchr().
-	*/
-	const char* reverseFind(char c) const;
-
-	/**
-		return true iff self starts with the given string.
-	*/
-	Bool startsWith(const char* p) const;
-	inline Bool startsWith(const AsciiString& stringSrc) const { return startsWith(stringSrc.str()); }
-
-	/**
-		return true iff self starts with the given string. (case insensitive)
-	*/
-	Bool startsWithNoCase(const char* p) const;
-	inline Bool startsWithNoCase(const AsciiString& stringSrc) const { return startsWithNoCase(stringSrc.str()); }
-
-	/**
-		return true iff self ends with the given string.
-	*/
-	Bool endsWith(const char* p) const;
-	Bool endsWith(const AsciiString& stringSrc) const { return endsWith(stringSrc.str()); }
-
-	/**
-		return true iff self ends with the given string. (case insensitive)
-	*/
-	Bool endsWithNoCase(const char* p) const;
-	Bool endsWithNoCase(const AsciiString& stringSrc) const { return endsWithNoCase(stringSrc.str()); }
-
-	/**
-		conceptually similar to strtok():
-
-		extract the next seps-delimited token from the front
-		of 'this' and copy it into 'token', returning true if a nonempty
-		token was found. (note that this modifies 'this' as well, stripping
-		the token off!)
-	*/
-	Bool nextToken(AsciiString* token, const char* seps = NULL);
-
-	/**
-		return true iff the string is "NONE" (case-insensitive).
-		Hey, hokey, but we use it a ton.
-	*/
-	Bool isNone() const;
-
-	Bool isNotEmpty() const { return !isEmpty(); }
-	Bool isNotNone() const { return !isNone(); }
-
-//
-// You might think it would be a good idea to overload the * operator
-// to allow for an implicit conversion to an char*. This is
-// (in theory) a good idea, but in practice, there's lots of code
-// that assumes it should check text fields for null, which
-// is meaningless for us, since we never return a null ptr.
-//
-//	operator const char*() const { return str(); }
-//
-
-	AsciiString& operator=(const AsciiString& stringSrc);	///< the same as set()
-	AsciiString& operator=(const char* s);				///< the same as set()
-
-	void debugIgnoreLeaks();
-
-};
-
-// -----------------------------------------------------
-inline char* AsciiString::peek() const
-{
-	DEBUG_ASSERTCRASH(m_data, ("null string ptr"));
-	validate();
-	return m_data->peek();
-}
-
-// -----------------------------------------------------
-inline AsciiString::AsciiString() : m_data(0)
-{
-	validate();
-}
-
-// -----------------------------------------------------
-inline AsciiString::~AsciiString()
-{
-	validate();
-	releaseBuffer();
-}
-
-// -----------------------------------------------------
-inline int AsciiString::getLength() const
-{
-	validate();
-	return m_data ? strlen(peek()) : 0;
-}
-
-// -----------------------------------------------------
-inline Bool AsciiString::isEmpty() const
-{
-	validate();
-	return m_data == NULL || peek()[0] == 0;
-}
-
-// -----------------------------------------------------
-inline void AsciiString::clear()
-{
-	validate();
-	releaseBuffer();
-	validate();
-}
-
-// -----------------------------------------------------
-inline char AsciiString::getCharAt(int index) const
-{
-	DEBUG_ASSERTCRASH(index >= 0 && index < getLength(), ("bad index in getCharAt"));
-	validate();
-	return m_data ? peek()[index] : 0;
-}
-
-// -----------------------------------------------------
-inline const char* AsciiString::str() const
-{
-	validate();
-	static const char TheNullChr = 0;
-	return m_data ? peek() : &TheNullChr;
-}
-
-// -----------------------------------------------------
-inline AsciiString& AsciiString::operator=(const AsciiString& stringSrc)
-{
-	validate();
-	set(stringSrc);
-	validate();
-	return *this;
-}
-
-// -----------------------------------------------------
-inline AsciiString& AsciiString::operator=(const char* s)
-{
-	validate();
-	set(s);
-	validate();
-	return *this;
-}
-
-// -----------------------------------------------------
-inline void AsciiString::concat(const AsciiString& stringSrc)
-{
-	validate();
-	concat(stringSrc.str());
-	validate();
-}
-
-// -----------------------------------------------------
-inline void AsciiString::concat(const char c)
-{
-	validate();
-	/// this can probably be made more efficient, if necessary
-	char tmp[2] = { c, 0 };
-	concat(tmp);
-	validate();
-}
-
-// -----------------------------------------------------
-inline int AsciiString::compare(const AsciiString& stringSrc) const
-{
-	validate();
-	return strcmp(this->str(), stringSrc.str());
-}
-
-// -----------------------------------------------------
-inline int AsciiString::compare(const char* s) const
-{
-	validate();
-	return strcmp(this->str(), s);
-}
-
-// -----------------------------------------------------
-inline int AsciiString::compareNoCase(const AsciiString& stringSrc) const
-{
-	validate();
-	return _stricmp(this->str(), stringSrc.str());
-}
-
-// -----------------------------------------------------
-inline int AsciiString::compareNoCase(const char* s) const
-{
-	validate();
-	return _stricmp(this->str(), s);
-}
-
-// -----------------------------------------------------
-inline const char* AsciiString::find(char c) const
-{
-	return strchr(this->str(), c);
-}
-
-// -----------------------------------------------------
-inline const char* AsciiString::reverseFind(char c) const
-{
-	return strrchr(this->str(), c);
-}
-
-// -----------------------------------------------------
-inline Bool operator==(const AsciiString& s1, const AsciiString& s2)
-{
-	return strcmp(s1.str(), s2.str()) == 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator!=(const AsciiString& s1, const AsciiString& s2)
-{
-	return strcmp(s1.str(), s2.str()) != 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator<(const AsciiString& s1, const AsciiString& s2)
-{
-	return strcmp(s1.str(), s2.str()) < 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator<=(const AsciiString& s1, const AsciiString& s2)
-{
-	return strcmp(s1.str(), s2.str()) <= 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator>(const AsciiString& s1, const AsciiString& s2)
-{
-	return strcmp(s1.str(), s2.str()) > 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator>=(const AsciiString& s1, const AsciiString& s2)
-{
-	return strcmp(s1.str(), s2.str()) >= 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator==(const AsciiString& s1, const char* s2)
-{
-	return strcmp(s1.str(), s2) == 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator!=(const AsciiString& s1, const char* s2)
-{
-	return strcmp(s1.str(), s2) != 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator<(const AsciiString& s1, const char* s2)
-{
-	return strcmp(s1.str(), s2) < 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator<=(const AsciiString& s1, const char* s2)
-{
-	return strcmp(s1.str(), s2) <= 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator>(const AsciiString& s1, const char* s2)
-{
-	return strcmp(s1.str(), s2) > 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator>=(const AsciiString& s1, const char* s2)
-{
-	return strcmp(s1.str(), s2) >= 0;
-}
-
-#endif // ASCIISTRING_H
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AudioAffect.h b/GeneralsMD/Code/GameEngine/Include/Common/AudioAffect.h
deleted file mode 100644
index 492d5d877f7..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/AudioAffect.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// EA Pacific
-// John McDonald, Jr
-// Do not distribute
-#pragma once
-
-#ifndef _AUDIOAFFECT_H_
-#define _AUDIOAFFECT_H_
-
-#include <Lib/BaseType.h>
-
-// if it is set by the options panel, use the system setting parameter. Otherwise, this will be 
-// appended to whatever the current system volume is.
-enum AudioAffect CPP_11(: Int)
-{
-	AudioAffect_Music		= 0x01,
-	AudioAffect_Sound		= 0x02,
-	AudioAffect_Sound3D	= 0x04,
-	AudioAffect_Speech	= 0x08,
-	AudioAffect_All			= (AudioAffect_Music | AudioAffect_Sound | AudioAffect_Sound3D | AudioAffect_Speech),
-
-	AudioAffect_SystemSetting = 0x10,
-};
-
-#endif // _AUDIOAFFECT_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AudioEventInfo.h b/GeneralsMD/Code/GameEngine/Include/Common/AudioEventInfo.h
deleted file mode 100644
index 144cddefdac..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/AudioEventInfo.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: AudioEventInfo.h /////////////////////////////////////////////////////////////////////////
-// AudioEventInfo structure
-// Author: John K. McDonald, March 2002
-
-#pragma once
-#ifndef _H_AUDIOEVENTINFO_
-#define _H_AUDIOEVENTINFO_
-
-#include "Common/AsciiString.h"
-#include "Common/GameMemory.h"
-#include "Common/STLTypedefs.h"
-
-// DEFINES
-#define NO_INTENSIVE_AUDIO_DEBUG
-
-// FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
-struct FieldParse;
-
-// USEFUL DECLARATIONS ////////////////////////////////////////////////////////////////////////////
-enum AudioType CPP_11(: Int)
-{
-	AT_Music,
-	AT_Streaming,
-	AT_SoundEffect
-};
-
-extern const char *theAudioPriorityNames[];
-enum AudioPriority CPP_11(: Int)
-{
-	AP_LOWEST,
-	AP_LOW,
-	AP_NORMAL,
-	AP_HIGH,
-	AP_CRITICAL
-};
-
-extern const char *theSoundTypeNames[];
-enum SoundType CPP_11(: Int)
-{
-	ST_UI										= 0x0001,
-	ST_WORLD								= 0x0002,
-	ST_SHROUDED							= 0x0004,
-	ST_GLOBAL								= 0x0008,
-	ST_VOICE								= 0x0010,
-	ST_PLAYER								= 0x0020,
-	ST_ALLIES								= 0x0040,
-	ST_ENEMIES							= 0x0080,
-	ST_EVERYONE							= 0x0100,	
-};
-
-extern const char *theAudioControlNames[];
-enum AudioControl CPP_11(: Int)
-{
-	AC_LOOP									= 0x0001,
-	AC_RANDOM								= 0x0002,
-	AC_ALL									= 0x0004,
-	AC_POSTDELAY						= 0x0008,
-	AC_INTERRUPT						= 0x0010,
-};
-
-class DynamicAudioEventInfo;
-
-struct AudioEventInfo : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AudioEventInfo, "AudioEventInfo" )
-
-public:
-	AsciiString m_audioName;	// This name matches the name of the AudioEventRTS
-	AsciiString m_filename;		// For music tracks, this is the filename of the track
-
-	Real m_volume;						// Desired volume of this audio
-	Real m_volumeShift;				// Desired volume shift of the audio
-	Real m_minVolume;					// Clamped minimum value, useful when muting sound effects
-	Real m_pitchShiftMin;			// minimum pitch shift value
-	Real m_pitchShiftMax;			// maximum pitch shift value
-	Int m_delayMin;						// minimum delay before we'll fire up another one of these 
-	Int m_delayMax;						// maximum delay before we'll fire up another one of these 
-	Int m_limit;							// Limit to the number of these sounds that can be fired up simultaneously
-	Int m_loopCount;					// number of times to loop this sound
-	
-	AudioPriority m_priority;	// Priority of this sound
-	UnsignedInt m_type;								// Type of sound
-	UnsignedInt m_control;						// control of sound
-
-	std::vector<AsciiString> m_soundsMorning;	// Sounds to play in the wee hours of the morning
-	std::vector<AsciiString> m_sounds;				// Default sounds to play
-	std::vector<AsciiString> m_soundsNight;		// Sounds to play at night
-	std::vector<AsciiString> m_soundsEvening;	// Sounds to play in the evening
-
-	std::vector<AsciiString> m_attackSounds;
-	std::vector<AsciiString> m_decaySounds;
-
-	Real m_lowPassFreq;			// When performing low pass filters, what is the maximum frequency heard, expressed as a percentage?
-	Real m_minDistance;			// less than this distance and the sound behaves as though it is at minDistance
-	Real m_maxDistance;			// greater than this distance and the sound behaves as though it is muted
-
-	AudioType m_soundType;	// This should be either Music, Streaming or SoundEffect
-	
-  
-  // DynamicAudioEventInfo interfacing functions
-  virtual Bool isLevelSpecific() const { return false; } ///< If true, this sound is only defined on the current level and can be deleted when that level ends
-  virtual DynamicAudioEventInfo * getDynamicAudioEventInfo() { return NULL; }  ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
-  virtual const DynamicAudioEventInfo * getDynamicAudioEventInfo() const { return NULL; } ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
-
-  /// Is this a permenant sound? That is, if I start this sound up, will it ever end
-  /// "on its own" or only if I explicitly kill it?
-  Bool isPermanentSound() const { return BitIsSet( m_control, AC_LOOP ) && (m_loopCount == 0 );  }
-  
-	static const FieldParse m_audioEventInfo[];		///< the parse table for INI definition
-	const FieldParse *getFieldParse( void ) const { return m_audioEventInfo; }
-};
-
-#endif /* _H_AUDIOEVENTINFO_ */
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AudioEventRTS.h b/GeneralsMD/Code/GameEngine/Include/Common/AudioEventRTS.h
deleted file mode 100644
index b420f7de86b..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/AudioEventRTS.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: AudioEventRTS.h ///////////////////////////////////////////////////////////////////////////////
-// AudioEventRTS structure
-// Author: John K. McDonald, March 2002
-
-#pragma once
-#ifndef _H_AUDIOEVENTRTS_
-#define _H_AUDIOEVENTRTS_
-
-#include "Common/AsciiString.h"
-#include "Common/GameAudio.h"
-#include "Common/GameMemory.h"
-#include "Common/GameType.h"
-
-// forward declarations ///////////////////////////////////////////////////////////////////////////
-struct AudioEventInfo;
-
-enum OwnerType CPP_11(: Int)
-{
-	OT_Positional,
-	OT_Drawable,
-	OT_Object,
-	OT_Dead,
-	OT_INVALID
-};
-
-enum PortionToPlay CPP_11(: Int)
-{
-	PP_Attack,
-	PP_Sound,
-	PP_Decay,
-	PP_Done
-};
-
-enum AudioPriority CPP_11(: Int);
-
-// This is called AudioEventRTS because AudioEvent is a typedef in ww3d
-// You might want this to be memory pooled (I personally do), but it can't
-// because we allocate them on the stack frequently.
-class AudioEventRTS
-{	
-public:
-	AudioEventRTS( );
-	AudioEventRTS( const AsciiString& eventName );
-	AudioEventRTS( const AsciiString& eventName, ObjectID ownerID );
-	AudioEventRTS( const AsciiString& eventName, DrawableID drawableID );	// Pass 0 for unused if attaching to drawable
-	AudioEventRTS( const AsciiString& eventName, const Coord3D *positionOfAudio );
-
-	virtual ~AudioEventRTS( );
-
-	AudioEventRTS( const AudioEventRTS& right );
-	AudioEventRTS& operator=( const AudioEventRTS& right );
-
-	void setEventName( AsciiString name );
-	const AsciiString& getEventName( void ) const { return m_eventName; }
-
-	// generateFilename is separate from generatePlayInfo because generatePlayInfo should only be called once
-	// per triggered event. generateFilename will be called once per loop, or once to get each filename if 'all' is 
-	// specified.
-	void generateFilename( void );
-	AsciiString getFilename( void );
-
-	// The attack and decay sounds are generated in generatePlayInfo, because they will never be played more
-	// than once during a given sound event.
-	void generatePlayInfo( void );
-	Real getPitchShift( void ) const;
-	Real getVolumeShift( void ) const;
-	AsciiString getAttackFilename( void ) const;
-	AsciiString getDecayFilename( void ) const;
-	Real getDelay( void ) const;
-
-	void decrementDelay( Real timeToDecrement );
-
-	PortionToPlay getNextPlayPortion( void ) const;
-	void advanceNextPlayPortion( void );
-	void setNextPlayPortion( PortionToPlay ptp );
-	
-	void decreaseLoopCount( void );
-	Bool hasMoreLoops( void ) const;
-	
-	void setAudioEventInfo( const AudioEventInfo *eventInfo ) const;
-	const AudioEventInfo *getAudioEventInfo( void ) const;
-	
-	void setPlayingHandle( AudioHandle handle );	// for ID of this audio piece.
-	AudioHandle getPlayingHandle( void ); // for ID of this audio piece
-
-	void setPosition( const Coord3D *pos );
-	const Coord3D* getPosition( void );
-
-	void setObjectID( ObjectID objID );
-	ObjectID getObjectID( void );
-
-	Bool isDead() const { return m_ownerType == OT_Dead; }
-	OwnerType getOwnerType() const { return m_ownerType; }
-	
-	void setDrawableID( DrawableID drawID );
-	DrawableID getDrawableID( void );
-
-	void setTimeOfDay( TimeOfDay tod );
-	TimeOfDay getTimeOfDay( void ) const;
-
-	void setHandleToKill( AudioHandle handleToKill );
-	AudioHandle getHandleToKill( void ) const;
-
-	void setShouldFade( Bool shouldFade );
-	Bool getShouldFade( void ) const;
-
-	void setIsLogicalAudio( Bool isLogicalAudio );
-	Bool getIsLogicalAudio( void ) const;
-
-	Bool isPositionalAudio( void ) const;
-	Bool isCurrentlyPlaying( void ) const;
-
-	AudioPriority getAudioPriority( void ) const;
-	void setAudioPriority( AudioPriority newPriority );
-
-	Real getVolume( void ) const;
-	void setVolume( Real vol );
-
-	Int getPlayerIndex( void ) const;
-	void setPlayerIndex( Int playerNdx );
-
-	Int getPlayingAudioIndex( void ) { return m_playingAudioIndex; };
-	void setPlayingAudioIndex( Int pai )  { m_playingAudioIndex = pai; };
-
-	Bool getUninterruptable( ) const { return m_uninterruptable; }
-	void setUninterruptable( Bool uninterruptable ) { m_uninterruptable = uninterruptable; } 
-
-
-	// This will retrieve the appropriate position based on type.	
-	const Coord3D *getCurrentPosition( void );	
-
-	// This will return the directory leading up to the appropriate type, including the trailing '\\'
-	// If localized is true, we'll append a language specifc directory to the end of the path.
-	AsciiString generateFilenamePrefix( AudioType audioTypeToPlay, Bool localized );
-	AsciiString generateFilenameExtension( AudioType audioTypeToPlay );
-protected:
-	void adjustForLocalization( AsciiString &strToAdjust );
-
-protected:
-	AsciiString m_filenameToLoad;
-	mutable const AudioEventInfo *m_eventInfo;	// Mutable so that it can be modified even on const objects
-	AudioHandle m_playingHandle;
-	
-	AudioHandle m_killThisHandle;		///< Sometimes sounds will canabilize other sounds in order to take their handle away.
-																	///< This is one of those instances.
-
-	AsciiString m_eventName;				///< This should correspond with an entry in Dialog.ini, Speech.ini, or Audio.ini
-	AsciiString m_attackName;				///< This is the filename that should be used during the attack.
-	AsciiString m_decayName;				///< This is the filename that should be used during the decay.
-
-	AudioPriority m_priority;				///< This should be the priority as given by the event info, or the overrided priority.
-	Real m_volume;									///< This is the override for the volume. It will either be the normal 
-	TimeOfDay m_timeOfDay;					///< This should be the current Time Of Day.
-
-	Coord3D m_positionOfAudio;			///< Position of the sound if no further positional updates are necessary
-	union	// These are now unioned.
-	{
-		ObjectID m_objectID;						///< ObjectID of the object that this sound is tied to. Position can be automatically updated from this.
-		DrawableID m_drawableID;				///< DrawableID of the drawable that owns this sound
-	};
-	OwnerType m_ownerType;
-
-	Bool m_shouldFade;							///< This should fade in or out (if it is starting or stopping)
-	Bool m_isLogicalAudio;					///< Should probably only be true for scripted sounds
-	Bool m_uninterruptable;
-
-	// Playing attributes
-	Real m_pitchShift;							///< Pitch shift that should occur on this piece of audio
-	Real m_volumeShift;							///< Volume shift that should occur on this piece of audio
-	Real m_delay;										///< Amount to delay before playing this sound
-	Int m_loopCount;								///< The current loop count value. Only valid if this is a looping type event or the override has been set.
-	Int m_playingAudioIndex;				///< The sound index we are currently playing. In the case of non-random, we increment this to move to the next sound
-	Int m_allCount;									///< If this sound is an ALL type, then this is how many sounds we have played so far.
-	
-	Int m_playerIndex;							///< The index of the player who owns this sound. Used for sounds that should have an owner, but don't have an object, etc.
-
-	PortionToPlay m_portionToPlayNext;	///< Which portion (attack, sound, decay) should be played next?
-};
-
-class DynamicAudioEventRTS : public MemoryPoolObject
-{	
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DynamicAudioEventRTS, "DynamicAudioEventRTS" )		
-public:
-
-	DynamicAudioEventRTS() { }
-	DynamicAudioEventRTS(const AudioEventRTS& a) : m_event(a) { }
-
-	AudioEventRTS	m_event;
-};
-EMPTY_DTOR(DynamicAudioEventRTS)
-
-#endif /* _H_AUDIOEVENTRTS_ */
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h b/GeneralsMD/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h
deleted file mode 100644
index 0c564b4a99c..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/AudioHandleSpecialValues.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// EA Pacific
-// John McDonald, Jr
-// Do not distribute
-
-#pragma once
-
-#ifndef _AUDIOHANDLESPECIALVALUES_H_
-#define _AUDIOHANDLESPECIALVALUES_H_
-
-enum AudioHandleSpecialValues CPP_11(: Int)
-{
-	AHSV_Error					= 0x00,
-	AHSV_NoSound,
-	AHSV_Muted,
-	AHSV_NotForLocal,
-	AHSV_StopTheMusic,
-	AHSV_StopTheMusicFade,
-	AHSV_FirstHandle
-};
-
-#endif // _AUDIOHANDLESPECIALVALUES_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AudioRandomValue.h b/GeneralsMD/Code/GameEngine/Include/Common/AudioRandomValue.h
deleted file mode 100644
index 263189228cd..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/AudioRandomValue.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// AudioRandomValue.h
-// Random number generation system
-// Author: Michael S. Booth, January 1998
-// Split out into separate Logic/Client/Audio headers by MDC Sept 2002
-
-#pragma once
-
-#ifndef _AUDIO_RANDOM_VALUE_H_
-#define _AUDIO_RANDOM_VALUE_H_
-
-#include "Lib/BaseType.h"
-
-// do NOT use these functions directly, rather use the macros below
-extern Int GetGameAudioRandomValue( int lo, int hi, const char *file, int line );
-extern Real GetGameAudioRandomValueReal( Real lo, Real hi, const char *file, int line );
-
-// use these macros to access the random value functions
-#define GameAudioRandomValue( lo, hi ) GetGameAudioRandomValue( lo, hi, __FILE__, __LINE__ )
-#define GameAudioRandomValueReal( lo, hi ) GetGameAudioRandomValueReal( lo, hi, __FILE__, __LINE__ )
-
-//--------------------------------------------------------------------------------------------------------------
-
-#endif // _AUDIO_RANDOM_VALUE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AudioRequest.h b/GeneralsMD/Code/GameEngine/Include/Common/AudioRequest.h
deleted file mode 100644
index 6dd96c9d782..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/AudioRequest.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// EA Pacific
-// John McDonald, Jr
-// Do not distribute
-
-#pragma once
-
-#ifndef _AUDIOREQUEST_H_
-#define _AUDIOREQUEST_H_
-
-#include "Common/GameAudio.h"
-#include "Common/GameMemory.h"
-
-class AudioEventRTS;
-
-enum RequestType CPP_11(: Int)
-{
-	AR_Play,
-	AR_Pause,
-	AR_Stop
-};
-
-struct AudioRequest : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AudioRequest, "AudioRequest" )
-
-public:
-	RequestType m_request;
-	union 
-	{
-		AudioEventRTS *m_pendingEvent;
-		AudioHandle m_handleToInteractOn;
-	};
-	Bool m_usePendingEvent;
-	Bool m_requiresCheckForSample;
-};
-
-#endif // _AUDIOREQUEST_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AudioSettings.h b/GeneralsMD/Code/GameEngine/Include/Common/AudioSettings.h
deleted file mode 100644
index 0a3bfe2efb2..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/AudioSettings.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// EA Pacific
-// John McDonald, Jr
-// Do not distribute
-
-#pragma once
-
-#ifndef _AUDIOSETTINGS_H_
-#define _AUDIOSETTINGS_H_
-
-#include "Common/AsciiString.h"
-
-enum { MAX_HW_PROVIDERS = 4 };
-
-struct AudioSettings
-{
-	AsciiString m_audioRoot;
-	AsciiString m_soundsFolder;
-	AsciiString m_musicFolder;
-	AsciiString m_streamingFolder;
-	AsciiString m_soundsExtension;
-	Bool m_useDigital;
-	Bool m_useMidi;
-	Int m_outputRate;
-	Int m_outputBits;
-	Int m_outputChannels;
-	Int m_sampleCount2D;
-	Int m_sampleCount3D;
-	Int m_streamCount;
-	Int m_globalMinRange;
-	Int m_globalMaxRange;
-	Int m_drawableAmbientFrames;
-	Int m_fadeAudioFrames;
-	UnsignedInt m_maxCacheSize;
-
-	Real m_minVolume;		// At volumes less than this, the sample will be culled.
-	
-	AsciiString m_preferred3DProvider[MAX_HW_PROVIDERS + 1];
-
-	//Defaults actually don't ever get changed!
-	Real m_relative2DVolume;		//2D volume compared to 3D
-	Real m_defaultSoundVolume;
-	Real m_default3DSoundVolume;
-	Real m_defaultSpeechVolume;
-	Real m_defaultMusicVolume;
-	UnsignedInt m_defaultSpeakerType2D;
-	UnsignedInt m_defaultSpeakerType3D;
-
-	//If you want to change a value, store it somewhere else (like here)
-	Real m_preferredSoundVolume;
-	Real m_preferred3DSoundVolume;
-	Real m_preferredSpeechVolume;
-	Real m_preferredMusicVolume;
-
-	//The desired altitude of the microphone to improve panning relative to terrain.
-	Real m_microphoneDesiredHeightAboveTerrain;
-
-	//When tracing a line between the ground look-at-point and the camera, we want
-	//to ensure a maximum percentage, so the microphone never goes behind the camera.
-	Real m_microphoneMaxPercentageBetweenGroundAndCamera;
-
-	//Handles changing sound volume whenever the camera is close to the microphone.
-  Real m_zoomMinDistance;			//If we're closer than the minimum distance, then apply the full bonus no matter how close.
-  Real m_zoomMaxDistance;			//The maximum distance from microphone we need to be before benefiting from any bonus.
-	
-  //NOTE: The higher this value is, the lower normal sounds will be! If you specify a sound volume value of 25%, then sounds will play
-	//between 75% and 100%, not 100% to 125%!
-  Real m_zoomSoundVolumePercentageAmount;	//The amount of sound volume dedicated to zooming.
-};
-
-#endif // _AUDIOSETTINGS_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h b/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h
index 55e44378912..c9a727ce611 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h
@@ -24,12 +24,12 @@
 
 // FILE: BattleHonors.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,17 +37,14 @@
 //	Filename: 	BattleHonors.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __BATTLE_HONORS_H_
-#define __BATTLE_HONORS_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -120,5 +117,3 @@ enum
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __BATTLE_HONORS_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BezFwdIterator.h b/GeneralsMD/Code/GameEngine/Include/Common/BezFwdIterator.h
index 2dcb060e8cc..d3f49c44159 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/BezFwdIterator.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/BezFwdIterator.h
@@ -34,7 +34,7 @@ class BezFwdIterator
 
 		BezierSegment mBezSeg;
 		Coord3D mCurrPoint;
-		
+
 		Coord3D mDq;	// First Derivative
 		Coord3D mDDq;	// Second Derivative
 		Coord3D mDDDq;	// Third Derivative
@@ -42,10 +42,10 @@ class BezFwdIterator
 	public:
 		BezFwdIterator();
 		BezFwdIterator(Int stepsDesired, const BezierSegment *bezSeg);
-	
+
 		void start(void);
 		Bool done(void);
 		const Coord3D& getCurrent(void) const;
 
 		void next(void);
-};
\ No newline at end of file
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h b/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h
index 91ad1768a0a..eb8dd12b6f9 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h
@@ -28,8 +28,6 @@
 // DO NOT DISTRIBUTE
 
 #pragma once
-#ifndef __BEZIERSEGMENT_H__
-#define __BEZIERSEGMENT_H__
 
 #include <d3dx8math.h>
 #include "Common/STLTypedefs.h"
@@ -52,9 +50,9 @@ class BezierSegment
 		BezierSegment(Real cp[12]);
 
 
-		BezierSegment(const Coord3D& cp0, 
-									const Coord3D& cp1, 
-									const Coord3D& cp2, 
+		BezierSegment(const Coord3D& cp0,
+									const Coord3D& cp1,
+									const Coord3D& cp2,
 									const Coord3D& cp3);
 
 		BezierSegment(Coord3D cp[4]);
@@ -69,5 +67,3 @@ class BezierSegment
 	public:	// He get's friendly access.
 		friend class BezFwdIterator;
 };
-
-#endif /* __BEZIERSEGMENT_H__ */
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h b/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h
index 00fb45c6a2e..84b2ec0b70e 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h
@@ -24,14 +24,11 @@
 
 // FILE: BitFlags.h /////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, March 2002
-// Desc:   
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __BitFlags_H_
-#define __BitFlags_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/STLTypedefs.h"
 
@@ -53,10 +50,11 @@ class BitFlags
 {
 private:
 	std::bitset<NUMBITS>				m_bits;
-	static const char*					s_bitNameList[];
 
 public:
-	
+	CPP_11(static constexpr size_t NumBits = NUMBITS);
+	static const char* const s_bitNameList[];
+
 	/*
 		just a little syntactic sugar so that there is no "foo = 0" compatible constructor
 	*/
@@ -65,29 +63,29 @@ class BitFlags
 		kInit = 0
 	};
 
-	inline BitFlags()
+	BitFlags()
 	{
 	}
 
-	inline BitFlags(BogusInitType k, Int idx1)
+	BitFlags(BogusInitType k, Int idx1)
 	{
 		m_bits.set(idx1);
 	}
 
-	inline BitFlags(BogusInitType k, Int idx1, Int idx2)
+	BitFlags(BogusInitType k, Int idx1, Int idx2)
 	{
 		m_bits.set(idx1);
 		m_bits.set(idx2);
 	}
 
-	inline BitFlags(BogusInitType k, Int idx1, Int idx2, Int idx3)
+	BitFlags(BogusInitType k, Int idx1, Int idx2, Int idx3)
 	{
 		m_bits.set(idx1);
 		m_bits.set(idx2);
 		m_bits.set(idx3);
 	}
 
-	inline BitFlags(BogusInitType k, Int idx1, Int idx2, Int idx3, Int idx4)
+	BitFlags(BogusInitType k, Int idx1, Int idx2, Int idx3, Int idx4)
 	{
 		m_bits.set(idx1);
 		m_bits.set(idx2);
@@ -95,7 +93,7 @@ class BitFlags
 		m_bits.set(idx4);
 	}
 
-	inline BitFlags(BogusInitType k, Int idx1, Int idx2, Int idx3, Int idx4, Int idx5)
+	BitFlags(BogusInitType k, Int idx1, Int idx2, Int idx3, Int idx4, Int idx5)
 	{
 		m_bits.set(idx1);
 		m_bits.set(idx2);
@@ -104,11 +102,11 @@ class BitFlags
 		m_bits.set(idx5);
 	}
 
-	inline BitFlags(BogusInitType k, 
-										Int idx1, 
-										Int idx2, 
-										Int idx3, 
-										Int idx4, 
+	BitFlags(BogusInitType k,
+										Int idx1,
+										Int idx2,
+										Int idx3,
+										Int idx4,
 										Int idx5,
 										Int idx6,
 										Int idx7,
@@ -133,36 +131,36 @@ class BitFlags
 		m_bits.set(idx12);
 	}
 
-	inline Bool operator==(const BitFlags& that) const
+	Bool operator==(const BitFlags& that) const
 	{
 		return this->m_bits == that.m_bits;
 	}
 
-	inline Bool operator!=(const BitFlags& that) const
+	Bool operator!=(const BitFlags& that) const
 	{
 		return this->m_bits != that.m_bits;
 	}
 
-	inline void set(Int i, Int val = 1)
+	void set(Int i, Int val = 1)
 	{
 		m_bits.set(i, val);
 	}
 
-	inline Bool test(Int i) const
+	Bool test(Int i) const
 	{
 		return m_bits.test(i);
 	}
 
 	//Tests for any bits that are set in both.
-	inline Bool testForAny( const BitFlags& that ) const
+	Bool testForAny( const BitFlags& that ) const
 	{
 		BitFlags tmp = *this;
 		tmp.m_bits &= that.m_bits;
 		return tmp.m_bits.any();
-	} 
+	}
 
 	//All argument bits must be set in our bits too in order to return TRUE
-	inline Bool testForAll( const BitFlags& that ) const
+	Bool testForAll( const BitFlags& that ) const
 	{
 		DEBUG_ASSERTCRASH( that.any(), ("BitFlags::testForAll is always true if you ask about zero flags.  Did you mean that?") );
 
@@ -173,54 +171,54 @@ class BitFlags
 	}
 
 	//None of the argument bits must be set in our bits in order to return TRUE
-	inline Bool testForNone( const BitFlags& that ) const
+	Bool testForNone( const BitFlags& that ) const
 	{
 		BitFlags tmp = *this;
 		tmp.m_bits &= that.m_bits;
 		return !tmp.m_bits.any();
 	}
 
-	inline Int size() const
+	Int size() const
 	{
 		return m_bits.size();
 	}
 
-	inline Int count() const
+	Int count() const
 	{
 		return m_bits.count();
 	}
 
-	inline Bool any() const
+	Bool any() const
 	{
 		return m_bits.any();
 	}
 
-	inline void flip()
+	void flip()
 	{
 		m_bits.flip();
 	}
 
-	inline void clear()
+	void clear()
 	{
 		m_bits.reset();
 	}
 
-	inline Int countIntersection(const BitFlags& that) const
+	Int countIntersection(const BitFlags& that) const
 	{
 		BitFlags tmp = *this;
 		tmp.m_bits &= that.m_bits;
 		return tmp.m_bits.count();
-	} 
+	}
 
-	inline Int countInverseIntersection(const BitFlags& that) const
+	Int countInverseIntersection(const BitFlags& that) const
 	{
 		BitFlags tmp = *this;
 		tmp.m_bits.flip();
 		tmp.m_bits &= that.m_bits;
 		return tmp.m_bits.count();
-	} 
+	}
 
-	inline Bool anyIntersectionWith(const BitFlags& that) const
+	Bool anyIntersectionWith(const BitFlags& that) const
 	{
 		/// @todo srj -- improve me.
 		BitFlags tmp = that;
@@ -228,40 +226,40 @@ class BitFlags
 		return tmp.m_bits.any();
 	}
 
-	inline void clear(const BitFlags& clr)
+	void clear(const BitFlags& clr)
 	{
 		m_bits &= ~clr.m_bits;
 	}
 
-	inline void set(const BitFlags& set)
+	void set(const BitFlags& set)
 	{
 		m_bits |= set.m_bits;
 	}
 
-	inline void clearAndSet(const BitFlags& clr, const BitFlags& set)
+	void clearAndSet(const BitFlags& clr, const BitFlags& set)
 	{
 		m_bits &= ~clr.m_bits;
 		m_bits |= set.m_bits;
 	}
 
-	inline Bool testSetAndClear(const BitFlags& mustBeSet, const BitFlags& mustBeClear) const
+	Bool testSetAndClear(const BitFlags& mustBeSet, const BitFlags& mustBeClear) const
 	{
 		/// @todo srj -- improve me.
 		BitFlags tmp = *this;
 		tmp.m_bits &= mustBeClear.m_bits;
-		if (tmp.m_bits.any()) 
+		if (tmp.m_bits.any())
 			return false;
 
 		tmp = *this;
 		tmp.m_bits.flip();
 		tmp.m_bits &= mustBeSet.m_bits;
-		if (tmp.m_bits.any()) 
+		if (tmp.m_bits.any())
 			return false;
 
 		return true;
 	}
 
-  static const char** getBitNames()
+  static const char* const* getBitNames()
   {
     return s_bitNameList;
   }
@@ -274,7 +272,7 @@ class BitFlags
   static Int getSingleBitFromName(const char* token)
   {
     Int i = 0;
-	  for(const char** name = s_bitNameList; *name; ++name, ++i )
+	  for(const char* const* name = s_bitNameList; *name; ++name, ++i )
 	  {
 		  if( stricmp( *name, token ) == 0 )
 		  {
@@ -289,13 +287,13 @@ class BitFlags
     return test(i) ? s_bitNameList[i] : NULL;
   }
 
-  Bool setBitByName(const char* token) 
+  Bool setBitByName(const char* token)
   {
     Int i = getSingleBitFromName(token);
 		if (i >= 0)
 		{
       set(i);
-			return true; 
+			return true;
 		}
 		else
 		{
@@ -323,11 +321,8 @@ class BitFlags
 				str->concat( bitName );
 				str->concat( ",\n");
 			}
-		}  
-	} 
+		}
+	}
 
 
 };
-
-#endif // __BitFlags_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h b/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h
index 3557aab3e66..f5796520286 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h
@@ -24,14 +24,11 @@
 
 // FILE: BitFlagsIO.h /////////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, March 2002
-// Desc:   
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __BitFlagsIO_H_
-#define __BitFlagsIO_H_
-
 #include "Common/BitFlags.h"
 #include "Common/INI.h"
 #include "Common/Xfer.h"
@@ -44,7 +41,7 @@ void BitFlags<NUMBITS>::buildDescription( AsciiString* str ) const
 {
 	if ( str == NULL )
 		return;//sanity
- 
+
 	for( Int i = 0; i < size(); ++i )
 	{
 		const char* bitName = getBitNameIfSet(i);
@@ -54,8 +51,8 @@ void BitFlags<NUMBITS>::buildDescription( AsciiString* str ) const
 			str->concat( bitName );
 			str->concat( ",\n");
 		}
-	}  
-} 
+	}
+}
 */
 
 //-------------------------------------------------------------------------------------------------
@@ -182,9 +179,9 @@ void BitFlags<NUMBITS>::xfer(Xfer* xfer)
 			AsciiString bitNameA = bitName;
 			xfer->xferAsciiString( &bitNameA );
 
-		}  // end for i
+		}
 
-	}  // end if, save
+	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
   	// clear the kind of mask data
@@ -210,24 +207,26 @@ void BitFlags<NUMBITS>::xfer(Xfer* xfer)
 				throw XFER_READ_ERROR;
 			}
 
-		}  // end for, i
+		}
 
-	}  // end else if, load
+	}
 	else if( xfer->getXferMode() == XFER_CRC )
 	{
 
 		// just call the xfer implementation on the data values
+#if RETAIL_COMPATIBLE_CRC
 		xfer->xferUser( this, sizeof( this ) );
+#else
+		xfer->xferUser( this, sizeof( *this ) );
+#endif
 
-	}  // end else if, crc
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "BitFlagsXfer - Unknown xfer mode '%d'\n", xfer->getXferMode() ));
+		DEBUG_CRASH(( "BitFlagsXfer - Unknown xfer mode '%d'", xfer->getXferMode() ));
 		throw XFER_MODE_UNKNOWN;
 
-	}  // end else
-
-}  // end xfer
+	}
 
-#endif
+}
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h b/GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h
index 88618b370b6..52eed56e6dc 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h
@@ -18,15 +18,16 @@
 
 
 // jkmcd
+
 #pragma once
 
 struct BorderColor
 {
 	const char *m_colorName;
-	long m_borderColor;
+	unsigned long m_borderColor;
 };
 
-const BorderColor BORDER_COLORS[] = 
+const BorderColor BORDER_COLORS[] =
 {
 	{ "Orange",					0xFFFF8700, },
 	{ "Green",					0xFF00FF00, },
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h b/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h
index 9e455549e4a..f56792d2827 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h
@@ -25,14 +25,11 @@
 // FILE: BuildAssistant.h /////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, February 2002
 // Desc:   Singleton class to encapsulate some of the more common functions or rules
-//				 that apply to building structures and units 
+//				 that apply to building structures and units
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __BUILDASSISTANT_H_
-#define __BUILDASSISTANT_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/STLTypedefs.h"
 #include "Lib/BaseType.h"
@@ -104,7 +101,7 @@ class BuildAssistant : public SubsystemInterface
 {
 
 public:
-	
+
 	struct TileBuildInfo
 	{
 		Int tilesUsed;
@@ -115,10 +112,10 @@ class BuildAssistant : public SubsystemInterface
 	{
 		TERRAIN_RESTRICTIONS		= 0x00000001,	///< Check for basic terrain restrictions
 		CLEAR_PATH							= 0x00000002,	///< Must be able to path find to location
-		NO_OBJECT_OVERLAP				= 0X00000004,	///< Can't overlap enemy objects, or locally controled objects that can't move out of the way			
+		NO_OBJECT_OVERLAP				= 0X00000004,	///< Can't overlap enemy objects, or locally controled objects that can't move out of the way
 		USE_QUICK_PATHFIND			= 0x00000008, ///< Use the quick pathfind method for CLEAR_PATH
 		SHROUD_REVEALED					= 0x00000010,	///< Check to make sure the shroud is revealed
-		NO_ENEMY_OBJECT_OVERLAP	= 0x00000020,	///< Can't overlap enemy objects only.			
+		NO_ENEMY_OBJECT_OVERLAP	= 0x00000020,	///< Can't overlap enemy objects only.
 		IGNORE_STEALTHED				= 0x00000040, ///< Units that we can't see are legal to "build" on. (when moving mouse around)
 		FAIL_STEALTHED_WITHOUT_FEEDBACK = 0x00000080 ///< USE WITH IGNORE_STEALTHED except it will fail without BIB feedback (when clicking to place).
 	};
@@ -141,17 +138,17 @@ class BuildAssistant : public SubsystemInterface
 												 void *funcUserData );
 
 	/// create object from a build and put it in the world now
-	virtual Object *buildObjectNow( Object *constructorObject, const ThingTemplate *what, 
+	virtual Object *buildObjectNow( Object *constructorObject, const ThingTemplate *what,
 																	const Coord3D *pos, Real angle, Player *owningPlayer );
 
 	/// using the "line placement" for objects (like walls etc) create that line of objects line
-	virtual void buildObjectLineNow( Object *constructorObject, const ThingTemplate *what, 
+	virtual void buildObjectLineNow( Object *constructorObject, const ThingTemplate *what,
 																	 const Coord3D *start, const Coord3D *end, Real angle,
 																	 Player *owningPlayer );
 
 	/// query if we can build at this location
 	virtual LegalBuildCode isLocationLegalToBuild( const Coord3D *worldPos,
-																								 const ThingTemplate *build, 
+																								 const ThingTemplate *build,
 																								 Real angle,  // angle to construct 'build' at
 																								 UnsignedInt options,		// use LocationLegalToBuildOptions
 																								 Object *builderObject,
@@ -159,10 +156,10 @@ class BuildAssistant : public SubsystemInterface
 
 	/// query if we can build at this location
 	virtual LegalBuildCode isLocationClearOfObjects( const Coord3D *worldPos,
-																								 const ThingTemplate *build, 
+																								 const ThingTemplate *build,
 																								 Real angle,  // angle to construct 'build' a
 																								 Object *builderObject,
-																								 UnsignedInt options, 
+																								 UnsignedInt options,
 																								 Player *thePlayer);
 
 	/// Adds bib highlighting for this location.
@@ -177,7 +174,7 @@ class BuildAssistant : public SubsystemInterface
 																							Object *builderObject );
 
 	/// return the "scratch pad" array that can be used to create a line of build locations
-	virtual inline Coord3D *getBuildLocations( void ) { return m_buildPositions; }
+	virtual Coord3D *getBuildLocations( void ) { return m_buildPositions; }
 
 	/// is the template a line build object, like a wall
 	virtual Bool isLineBuildTemplate( const ThingTemplate *tTemplate );
@@ -197,24 +194,21 @@ class BuildAssistant : public SubsystemInterface
 
 	/// some objects will be "cleared" automatically when constructing
 	Bool isRemovableForConstruction( Object *obj );
-	
+
 	/// clear the area of removable objects for construction
-	void clearRemovableForConstruction( const ThingTemplate *whatToBuild, 
+	void clearRemovableForConstruction( const ThingTemplate *whatToBuild,
 																			const Coord3D *pos, Real angle );
 
 	/// will move objects that can move out of the way.
 	/// will return false if there are objects that cannot be moved out of the way.
-	Bool moveObjectsForConstruction( const ThingTemplate *whatToBuild, 
+	Bool moveObjectsForConstruction( const ThingTemplate *whatToBuild,
 																	 const Coord3D *pos, Real angle, Player *playerToBuild );
 
 	Coord3D *m_buildPositions;			///< array used to create a line of build locations (think walls)
 	Int m_buildPositionSize;				///< number of elements in the build position array
 	ObjectSellList m_sellList;			///< list of objects currently going through the "sell process"
 
-};  // end BuildAssistant
+};
 
 // EXTERN /////////////////////////////////////////////////////////////////////////////////////////
 extern BuildAssistant *TheBuildAssistant;
-
-#endif // __BUILDASSISTANT_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/CDManager.h b/GeneralsMD/Code/GameEngine/Include/Common/CDManager.h
index 7671183a7fc..8cd22d55d10 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/CDManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/CDManager.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    Generals
@@ -43,12 +43,8 @@
 
 #pragma once
 
-#ifndef _COMMON_CDMANAGER_H_
-#define _COMMON_CDMANAGER_H_
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "Common/List.h"
@@ -79,7 +75,7 @@ namespace CD
 };
 
 //===============================
-// CDDriveInterface 
+// CDDriveInterface
 //===============================
 /**
   *	Interface to a CD ROM drive
@@ -92,7 +88,7 @@ class CDDriveInterface
 
 		virtual ~CDDriveInterface() {};
 
-		virtual void refreshInfo( void ) = 0;					///< Update drive with least 
+		virtual void refreshInfo( void ) = 0;					///< Update drive with least
 
 		virtual AsciiString getDiskName( void ) = 0;	///< Returns the drive path for this drive
 		virtual AsciiString getPath( void ) = 0;			///< Returns the drive path for this drive
@@ -101,7 +97,7 @@ class CDDriveInterface
 };
 
 //===============================
-// CDDrive 
+// CDDrive
 //===============================
 
 class CDDrive : public CDDriveInterface
@@ -116,7 +112,7 @@ class CDDrive : public CDDriveInterface
 		virtual AsciiString getPath( void );			///< Returns the drive path for this drive
 		virtual AsciiString getDiskName( void );	///< Returns the drive path for this drive
 		virtual CD::Disk getDisk( void );					///< Returns ID of current disk in this drive
-		virtual void refreshInfo( void );					///< Update drive with least 
+		virtual void refreshInfo( void );					///< Update drive with least
 
 		// CDDrive operations
 		void setPath( const Char *path );					///< Set the drive's path
@@ -131,7 +127,7 @@ class CDDrive : public CDDriveInterface
 
 
 //===============================
-// CDManagerInterface 
+// CDManagerInterface
 //===============================
 
 class CDManagerInterface : public SubsystemInterface
@@ -155,7 +151,7 @@ class CDManagerInterface : public SubsystemInterface
 // CDManager
 //===============================
 
-class CDManager : public CDManagerInterface 
+class CDManager : public CDManagerInterface
 {
 	public:
 
@@ -182,10 +178,8 @@ class CDManager : public CDManagerInterface
 };
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
 
 extern CDManagerInterface *TheCDManager;
 CDManagerInterface* CreateCDManager( void );
-
-#endif // _COMMON_CDMANAGER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/CRCDebug.h b/GeneralsMD/Code/GameEngine/Include/Common/CRCDebug.h
deleted file mode 100644
index a234243ba17..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/CRCDebug.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// CRCDebug.h ///////////////////////////////////////////////////////////////
-// Macros/functions/etc to help logging values for tracking down sync errors
-// Author: Matthew D. Campbell, June 2002
-
-// no #pragma once - we want to be able to conditionally define NO_DEBUG_CRC in indiv .cpp files
-
-#ifndef __CRCDEBUG_H__
-#define __CRCDEBUG_H__
-
-#include "Common/Debug.h"
-
-#ifndef NO_DEBUG_CRC
-	#ifdef DEBUG_LOGGING
-		#define DEBUG_CRC
-	#endif
-#endif
-
-#ifdef DEBUG_CRC
-
-#include "Common/AsciiString.h"
-#include "GameLogic/GameLogic.h"
-#include "Lib/BaseType.h"
-#include "WWMath/vector3.h"
-#include "WWMath/matrix3d.h"
-
-	#define AS_INT(x) (*(Int *)(&x))
-	#define DUMPVEL DUMPCOORD3DNAMED(&m_vel, "m_vel")
-	#define DUMPACCEL DUMPCOORD3DNAMED(&m_accel, "m_accel")
-	#define DUMPVECTOR3(x) DUMPVECTOR3NAMED(x, #x)
-	#define DUMPVECTOR3NAMED(x, y) dumpVector3(x, y, __FILE__, __LINE__)
-	#define DUMPCOORD3D(x) DUMPCOORD3DNAMED(x, #x)
-	#define DUMPCOORD3DNAMED(x, y) dumpCoord3D(x, y, __FILE__, __LINE__)
-	#define DUMPMATRIX3D(x) DUMPMATRIX3DNAMED(x, #x)
-	#define DUMPMATRIX3DNAMED(x, y) dumpMatrix3D(x, y, __FILE__, __LINE__)
-	#define DUMPREAL(x) DUMPREALNAMED(x, #x)
-	#define DUMPREALNAMED(x, y) dumpReal(x, y, __FILE__, __LINE__)
-
-	extern Int TheCRCFirstFrameToLog;
-	extern UnsignedInt TheCRCLastFrameToLog;
-
-	void dumpVector3(const Vector3 *v, AsciiString name, AsciiString fname, Int line);
-	void dumpCoord3D(const Coord3D *c, AsciiString name, AsciiString fname, Int line);
-	void dumpMatrix3D(const Matrix3D *m, AsciiString name, AsciiString fname, Int line);
-	void dumpReal(Real r, AsciiString name, AsciiString fname, Int line);
-
-	void outputCRCDebugLines( void );
-	void CRCDebugStartNewGame( void );
-	void outputCRCDumpLines( void );
-
-	void addCRCDebugLine(const char *fmt, ...);
-	void addCRCDebugLineNoCounter(const char *fmt, ...);
-	void addCRCDumpLine(const char *fmt, ...);
-	void addCRCGenLine(const char *fmt, ...);
-	#define CRCDEBUG_LOG(x) addCRCDebugLine x
-	#define CRCDUMP_LOG(x) addCRCDumpLine x
-	#define CRCGEN_LOG(x) addCRCGenLine x
-
-	class CRCVerification
-	{
-	public:
-		CRCVerification();
-		~CRCVerification();
-	protected:
-		UnsignedInt m_startCRC;
-	};
-	#define VERIFY_CRC CRCVerification crcVerification;
-
-	extern Int lastCRCDebugFrame;
-	extern Int lastCRCDebugIndex;
-	
-	extern Bool g_verifyClientCRC;
-	extern Bool g_clientDeepCRC;
-
-	extern Bool g_crcModuleDataFromClient;
-	extern Bool g_crcModuleDataFromLogic;
-
-	extern Bool g_keepCRCSaves;
-	extern Bool g_saveDebugCRCPerFrame;
-	extern AsciiString g_saveDebugCRCPerFrameDir;
-
-	extern Bool g_logObjectCRCs;
-
-#else // DEBUG_CRC
-
-	#define DUMPVEL {}
-	#define DUMPACCEL {}
-	#define DUMPVECTOR3(x) {}
-	#define DUMPVECTOR3NAMED(x, y) {}
-	#define DUMPCOORD3D(x) {}
-	#define DUMPCOORD3DNAMED(x, y) {}
-	#define DUMPMATRIX3D(x) {}
-	#define DUMPMATRIX3DNAMED(x, y) {}
-
-	#define DUMPREAL(x) {}
-	#define DUMPREALNAMED(x, y) {}
-
-	#define CRCDEBUG_LOG(x) {}
-	#define CRCDUMP_LOG(x) {}
-	#define CRCGEN_LOG(x) {}
-
-	#define VERIFY_CRC {}
-
-#endif
-
-extern Int NET_CRC_INTERVAL;
-extern Int REPLAY_CRC_INTERVAL;
-extern Bool TheDebugIgnoreSyncErrors;
-
-#endif // __CRCDEBUG_H__
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h b/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h
index 3ce1695ee73..182fd49a120 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: ClientUpdateModule.h /////////////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:	 
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __ClientUpdateModule_H_
-#define __ClientUpdateModule_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include <stdlib.h>
 
@@ -63,7 +60,3 @@ class ClientUpdateModule : public DrawableModule
 inline ClientUpdateModule::ClientUpdateModule( Thing *thing, const ModuleData* moduleData ) : DrawableModule( thing, moduleData ) { }
 inline ClientUpdateModule::~ClientUpdateModule() { }
 //-------------------------------------------------------------------------------------------------
-
-
-#endif // __ClientUpdateModule_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h b/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h
index 6e8997c7dac..48e078dc3dd 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h
@@ -28,9 +28,10 @@
 
 #pragma once
 
-#ifndef _COMMAND_LINE_H_
-#define _COMMAND_LINE_H_
+class CommandLine
+{
+public:
 
-void parseCommandLine(int argc, char *argv[]); ///< Parse command-line parameters
-
-#endif // _COMMAND_LINE_H_
+	static void parseCommandLineForStartup();
+	static void parseCommandLineForEngineInit();
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h b/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h
index f9e6d770ad8..b27261582a5 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __CRITICALSECTION_H__
-#define __CRITICALSECTION_H__
-
 #include "Common/PerfTimer.h"
 
 #ifdef PERF_TIMERS
@@ -59,14 +56,14 @@ class CriticalSection
 		}
 
 	public:	// Use these when entering/exiting a critical section.
-		void enter( void ) 
-		{ 
+		void enter( void )
+		{
 			#ifdef PERF_TIMERS
 			AutoPerfGather a(TheCritSecPerfGather);
 			#endif
 			EnterCriticalSection( &m_windowsCriticalSection );
 		}
-		
+
 		void exit( void )
 		{
 			#ifdef PERF_TIMERS
@@ -80,17 +77,17 @@ class ScopedCriticalSection
 {
 	private:
 		CriticalSection *m_cs;
-	
+
 	public:
 		ScopedCriticalSection( CriticalSection *cs ) : m_cs(cs)
-		{ 
-			if (m_cs) 
+		{
+			if (m_cs)
 				m_cs->enter();
 		}
 
 		virtual ~ScopedCriticalSection( )
-		{ 
-			if (m_cs) 
+		{
+			if (m_cs)
 				m_cs->exit();
 		}
 };
@@ -104,5 +101,3 @@ extern CriticalSection *TheUnicodeStringCriticalSection;
 extern CriticalSection *TheDmaCriticalSection;
 extern CriticalSection *TheMemoryPoolCriticalSection;
 extern CriticalSection *TheDebugLogCriticalSection;
-
-#endif /* __CRITICALSECTION_H__ */
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h
index 20a099e0892..bd16ba4c120 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h
@@ -30,16 +30,13 @@
 
 #pragma once
 
-#ifndef __CUSTOMMATCHPREFERENCES_H__
-#define __CUSTOMMATCHPREFERENCES_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 #include "Common/UserPreferences.h"
 
 //-----------------------------------------------------------------------------
-// CustomMatchPreferences base class 
+// CustomMatchPreferences base class
 //-----------------------------------------------------------------------------
 class CustomMatchPreferences : public UserPreferences
 {
@@ -86,9 +83,7 @@ class CustomMatchPreferences : public UserPreferences
 
   Bool getFactionsLimited(void) const; // Prefers to only use the original 3 sides, not USA Air Force General, GLA Toxin General, et al
   void setFactionsLimited( Bool factionsLimited );
-  
+
   Bool getUseStats( void ) const;
   void setUseStats( Bool useStats );
 };
-
-#endif // __CUSTOMMATCHPREFERENCES_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h b/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h
index 3cdb0689ea3..af9bfadd783 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _DamageFX_H_
-#define _DamageFX_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameCommon.h"
 #include "Common/NameKeyGenerator.h"
@@ -64,7 +61,7 @@ typedef const FXList* ConstFXListPtr;
 
 	-- DamageFX is shared between multiple units; there should generally only be one instance
 	of any particular class. The implication is that it should not require private data storage
-	to do what it needs to do, aside from stuff initialized at object instantiation time. To help 
+	to do what it needs to do, aside from stuff initialized at object instantiation time. To help
 	enforce this, all it's methods are declared 'const'. If you can't implement the damage you
 	need within this framework, please *don't* simply de-const things, because it could lead to very
 	strange side-effects. Instead, the system will have to be enhanced to allow for multiple instances
@@ -107,8 +104,8 @@ class DamageFX
 	struct DFX
 	{
 		Real									m_amountForMajorFX;				///< if damage done is >= this, use major fx
-		ConstFXListPtr				m_majorDamageFXList;			///< fx to make 
-		ConstFXListPtr				m_minorDamageFXList;			///< fx to make 
+		ConstFXListPtr				m_majorDamageFXList;			///< fx to make
+		ConstFXListPtr				m_minorDamageFXList;			///< fx to make
 		UnsignedInt						m_damageFXThrottleTime;
 
 		DFX()
@@ -126,10 +123,10 @@ class DamageFX
 	};
 
 	DFX m_dfx[DAMAGE_NUM_TYPES][LEVEL_COUNT];
-};  
+};
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
 	The "store" used to hold all the DamageFXs in existence. This is usually used when creating
 	an Object (actually, a Body module), but can be used at any time after that. (It is explicitly
 	OK to swap an Object's DamageFX out at any given time.)
@@ -150,7 +147,9 @@ class DamageFXStore : public SubsystemInterface
 	/**
 		Find the DamageFX with the given name. If no such DamageFX exists, return null.
 	*/
-	const DamageFX *findDamageFX( AsciiString name ) const;
+	const DamageFX *findDamageFX( NameKeyType namekey ) const;
+	const DamageFX *findDamageFX( const AsciiString& name ) const;
+	const DamageFX *findDamageFX( const char* name ) const;
 
 	static void parseDamageFXDefinition(INI* ini);
 
@@ -164,6 +163,3 @@ class DamageFXStore : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern DamageFXStore *TheDamageFXStore;
-
-#endif // _DamageFX_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h b/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h
index 8acf22e08f6..438580c5b34 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _DATA_CHUNK_H_
-#define _DATA_CHUNK_H_
-
 #include "Common/GameMemory.h"
 #include "Common/Dict.h"
 #include "Common/MapReaderWriterInfo.h"
@@ -47,7 +44,7 @@ class DataChunkTableOfContents;
 //----------------------------------------------------------------------
 class Mapping : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Mapping, "Mapping")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Mapping, "Mapping")
 public:
 	Mapping*			next;
 	AsciiString		name;
@@ -60,7 +57,7 @@ EMPTY_DTOR(Mapping)
 //----------------------------------------------------------------------
 class OutputChunk : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(OutputChunk, "OutputChunk")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(OutputChunk, "OutputChunk")
 public:
 	OutputChunk*	next;
 	UnsignedInt		id;															// chunk symbol type from table of contents
@@ -73,7 +70,7 @@ EMPTY_DTOR(OutputChunk)
 //----------------------------------------------------------------------
 class InputChunk : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(InputChunk, "InputChunk")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(InputChunk, "InputChunk")
 public:
 	InputChunk*						next;
 	UnsignedInt						id;															// chunk symbol type from table of contents
@@ -117,7 +114,7 @@ class DataChunkTableOfContents
 class DataChunkOutput
 {
 protected:
-	OutputStream*							m_pOut;										// The actual output stream.	
+	OutputStream*							m_pOut;										// The actual output stream.
 	FILE *										m_tmp_file;												// tmp output file stream
 	DataChunkTableOfContents	m_contents;			// table of contents of data chunk types
 	OutputChunk*							m_chunkStack;													// current stack of open data chunks
@@ -157,7 +154,7 @@ typedef Bool (*DataChunkParserPtr)( DataChunkInput &file, DataChunkInfo *info, v
 //----------------------------------------------------------------------
 class UserParser : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(UserParser, "UserParser")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(UserParser, "UserParser")
 public:
 	UserParser *next;
 
@@ -187,7 +184,7 @@ class DataChunkInput
 
 public:
 	void *m_currentObject;														// user parse routines can use this to allow one chunk
-																									// to create an object, and a subsequent chunk to 
+																									// to create an object, and a subsequent chunk to
 																									// parse values into that object.  However, the second
 																									// chunk parser could also create and parse an object
 																									// of its own if this pointer is NULL.
@@ -232,7 +229,3 @@ class DataChunkInput
 
 	NameKeyType readNameKey(void);
 };
-
-
-
-#endif // _DATA_CHUNK_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Debug.h b/GeneralsMD/Code/GameEngine/Include/Common/Debug.h
deleted file mode 100644
index fe873feeaf6..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/Debug.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Debug.h 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  Debug.h
-//
-// Created:    Steven Johnson, August 2001
-//
-// Desc:       Debug Utilities
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __DEBUG_H_
-#define __DEBUG_H_
-
-class AsciiString;
-
-#if defined(RTS_DEBUG) && defined(RTS_INTERNAL)
-	#error "Only one at a time of these should ever be defined"
-#endif
-
-#define NO_RELEASE_DEBUG_LOGGING
-
-#ifdef RELEASE_DEBUG_LOGGING  ///< Creates a DebugLogFile.txt (No I or D) with all the debug log goodness.  Good for startup problems.
-	#define ALLOW_DEBUG_UTILS 1
-	#define DEBUG_LOGGING 1
-	#define DISABLE_DEBUG_CRASHING 1
-	#define DISABLE_DEBUG_STACKTRACE 1
-	#define DISABLE_DEBUG_PROFILE 1
-#endif
-
-// These are stolen from the WW3D Debug file. REALLY useful. :-)
-#define STRING_IT(a) #a																				  
-#define TOKEN_IT(a) STRING_IT(,##a)
-#define MESSAGE(a) message (__FILE__ "(" TOKEN_IT(__LINE__) ") : " a)
-
-// by default, turn on ALLOW_DEBUG_UTILS if RTS_DEBUG is turned on.
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(ALLOW_DEBUG_UTILS) && !defined(DISABLE_ALLOW_DEBUG_UTILS)
-	#define ALLOW_DEBUG_UTILS 1
-#elif defined(DEBUG_LOGGING) || defined(DEBUG_CRASHING) || defined(DEBUG_STACKTRACE) || defined(DEBUG_PROFILE)
-	// TheSuperHackers @tweak also turn on when any of the above options is already set.
-	#define ALLOW_DEBUG_UTILS 1
-#endif
-
-// these are predicated on ALLOW_DEBUG_UTILS, not RTS_DEBUG, and allow you to selectively disable
-// bits of the debug stuff for special builds.
-#if defined(ALLOW_DEBUG_UTILS) && !defined(DEBUG_LOGGING) && !defined(DISABLE_DEBUG_LOGGING)
-	#define DEBUG_LOGGING 1
-#endif
-#if defined(ALLOW_DEBUG_UTILS) && !defined(DEBUG_CRASHING) && !defined(DISABLE_DEBUG_CRASHING)
-	#define DEBUG_CRASHING 1
-#endif
-#if defined(ALLOW_DEBUG_UTILS) && !defined(DEBUG_STACKTRACE) && !defined(DISABLE_DEBUG_STACKTRACE)
-	#define DEBUG_STACKTRACE 1
-	#ifndef DEBUG_LOGGING
-		#define DEBUG_LOGGING 1 // TheSuperHackers @compile Stack trace requires logging.
-	#endif
-#endif
-#if defined(ALLOW_DEBUG_UTILS) && !defined(DEBUG_PROFILE) && !defined(DISABLE_DEBUG_PROFILE)
-	#define DEBUG_PROFILE 1
-#endif
-
-#ifdef __cplusplus
-	#define DEBUG_EXTERN_C extern "C"
-#else
-	#define DEBUG_EXTERN_C extern
-#endif
-
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-
-// INLINING ///////////////////////////////////////////////////////////////////
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
-
-/// @todo: the standard line-to-string trick isn't working correctly in vc6; figure out why
-#define DEBUG_STRING_IT(b)	#b
-#define DEBUG_TOKEN_IT(a)		DEBUG_STRING_IT(a)
-#define DEBUG_FILENLINE			__FILE__ ":" DEBUG_TOKEN_IT(__LINE__)
-
-#ifdef ALLOW_DEBUG_UTILS
-
-	enum 
-	{
-		DEBUG_FLAG_LOG_TO_FILE = 0x01,	
-		DEBUG_FLAG_LOG_TO_CONSOLE = 0x02,
-		DEBUG_FLAG_PREPEND_TIME = 0x04,
-#ifdef RTS_INTERNAL
-		// by default, RTS_INTERNAL builds log to file, but not to console, in the interest
-		// of speed. want console output? just change this line:
-		DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE)
-#else
-		DEBUG_FLAGS_DEFAULT = (DEBUG_FLAG_LOG_TO_FILE | DEBUG_FLAG_LOG_TO_CONSOLE)
-#endif
-	};
-
-	DEBUG_EXTERN_C void DebugInit(int flags);
-	DEBUG_EXTERN_C void DebugShutdown();
-
-	DEBUG_EXTERN_C int DebugGetFlags();
-	DEBUG_EXTERN_C void DebugSetFlags(int flags);
-
-	#define DEBUG_INIT(f)						do { DebugInit(f); } while (0)
-	#define DEBUG_SHUTDOWN()				do { DebugShutdown(); } while (0)
-
-#else
-
-	#define DEBUG_INIT(f)						((void)0)
-	#define DEBUG_SHUTDOWN()				((void)0)
-
-#endif
-
-#ifdef DEBUG_LOGGING
-
-	DEBUG_EXTERN_C void DebugLog(const char *format, ...);
-	DEBUG_EXTERN_C const char* DebugGetLogFileName();
-	DEBUG_EXTERN_C const char* DebugGetLogFileNamePrev();
-
-	// This defines a bitmask of log types that we care about, to allow some flexability
-	// in what gets logged.  This should be extended to asserts, too, but the assert box
-	// is waiting to be rewritten. -MDC 3/19/2003
-	extern unsigned int DebugLevelMask;
-	enum
-	{
-		DEBUG_LEVEL_NET = 0,           // in-game network
-		DEBUG_LEVEL_MAX
-	};
-	extern const char *TheDebugLevels[DEBUG_LEVEL_MAX];
-
-	#define DEBUG_LOG(m)						do { { DebugLog m ; } } while (0)
-	#define DEBUG_LOG_LEVEL(l, m)		do { if (l & DebugLevelMask) { DebugLog m ; } } while (0)
-	#define DEBUG_ASSERTLOG(c, m)		do { { if (!(c)) DebugLog m ; } } while (0)
-
-#else
-
-	#define DEBUG_LOG(m)						((void)0)
-	#define DEBUG_LOG_LEVEL(l, m)		((void)0)
-	#define DEBUG_ASSERTLOG(c, m)		((void)0)
-
-#endif
-
-#ifdef DEBUG_CRASHING
-
-	DEBUG_EXTERN_C void DebugCrash(const char *format, ...);
-
-	/*
-		Yeah, it's a sleazy global, since we can't reasonably add
-		any args to DebugCrash due to the varargs nature of it. 
-		We'll just let it slide in this case...
-	*/
-	DEBUG_EXTERN_C char* TheCurrentIgnoreCrashPtr;
-
-	#define DEBUG_CRASH(m)	\
-		do { \
-			{ \
-				static char ignoreCrash = 0; \
-				if (!ignoreCrash) { \
-					TheCurrentIgnoreCrashPtr = &ignoreCrash; \
-					DebugCrash m ; \
-					TheCurrentIgnoreCrashPtr = NULL; \
-				} \
-			} \
-		} while (0)
-
-	#define DEBUG_ASSERTCRASH(c, m)		do { { if (!(c)) DEBUG_CRASH(m); } } while (0)
-
-	//Note: RELEASE_CRASH(m) is now always defined.
-	//#define RELEASE_CRASH(m)					DEBUG_CRASH((m))
-
-#else
-
-	#define DEBUG_CRASH(m)					((void)0)
-	#define DEBUG_ASSERTCRASH(c, m)	((void)0)
-
-//	DEBUG_EXTERN_C void ReleaseCrash(const char* reason);
-
-//	#define RELEASE_CRASH(m)				do { ReleaseCrash(m); } while (0)
-
-#endif
-
-DEBUG_EXTERN_C void ReleaseCrash(const char* reason);
-DEBUG_EXTERN_C void ReleaseCrashLocalized(const AsciiString& p, const AsciiString& m);
-
-#define RELEASE_CRASH(m)				do { ReleaseCrash(m); } while (0)
-#define RELEASE_CRASHLOCALIZED(p, m)		do { ReleaseCrashLocalized(p, m); } while (0)
-
-
-#ifdef DEBUG_PROFILE
-
-class SimpleProfiler
-{
-private:
-	__int64 m_freq;
-	__int64 m_startThisSession;
-	__int64 m_totalThisSession;
-	__int64 m_totalAllSessions;
-	int			m_numSessions;
-
-public:
-
-	SimpleProfiler();
-	void start();
-	void stop();
-	void stopAndLog(const char *msg, int howOftenToLog, int howOftenToResetAvg);
-	double getTime();				// of most recent session, in milliseconds
-	int getNumSessions();
-	double getTotalTime();	// total over all sessions, in milliseconds
-	double getAverageTime();	// averaged over all sessions, in milliseconds
-
-};
-
-#define BEGIN_PROFILE(uniqueid) \
-	static SimpleProfiler prof_##uniqueid; \
-	prof_##uniqueid.start();
-
-#define END_PROFILE(uniqueid, msg, howoftentolog, howoftentoreset) \
-	prof_##uniqueid.stopAndLog(msg, howoftentolog, howoftentoreset);
-
-#else
-	
-#define BEGIN_PROFILE(uniqueid)
-#define END_PROFILE(uniqueid, msg, howoftentolog, howoftentoreset)
-
-#endif
-
-// MACROS //////////////////////////////////////////////////////////////////
-
-#endif // __DEBUG_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Dict.h b/GeneralsMD/Code/GameEngine/Include/Common/Dict.h
index 828368340d3..295ffd2fae9 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Dict.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Dict.h
@@ -22,14 +22,14 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Dict.h 
+// FILE: Dict.h
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,17 +45,14 @@
 
 #pragma once
 
-#ifndef Dict_H
-#define Dict_H
-
 #include "Common/Errors.h"
 #include "Common/NameKeyGenerator.h"
 
 // -----------------------------------------------------
 /**
-	Dict provides a general utility class for maintaining 
+	Dict provides a general utility class for maintaining
 	a sorted key-value pair list. Keys are currently required
-	to be of type NameKeyType, and data may be Bool, int, real, 
+	to be of type NameKeyType, and data may be Bool, int, real,
 	or string.
 
 	Current implementation keeps the pairs sorted by key, and
@@ -66,8 +63,8 @@
 class Dict
 {
 public:
-	enum 
-	{ 
+	enum
+	{
 		MAX_LEN = 32767							///< max total len of any Dict, in Pairs
 	};
 
@@ -128,7 +125,7 @@ class Dict
 	/**
 		Return there is a pair with the given key and datatype, return true.
 	*/
-	inline Bool known(NameKeyType key, DataType d) const
+	Bool known(NameKeyType key, DataType d) const
 	{
 		return getType(key) == d;
 	}
@@ -141,62 +138,62 @@ class Dict
 
 	/**
 		return the value for the pair with the given key.
-		if there is no pair with the given key, or the value is 
+		if there is no pair with the given key, or the value is
 		not of the correct type, 0 is returned.
 	*/
 	Bool getBool(NameKeyType key, Bool* exists = NULL) const;
 	/**
 		return the value for the pair with the given key.
-		if there is no pair with the given key, or the value is 
+		if there is no pair with the given key, or the value is
 		not of the correct type, 0 is returned.
 	*/
 	Int getInt(NameKeyType key, Bool* exists = NULL) const;
 	/**
 		return the value for the pair with the given key.
-		if there is no pair with the given key, or the value is 
+		if there is no pair with the given key, or the value is
 		not of the correct type, 0 is returned.
 	*/
 	Real getReal(NameKeyType key, Bool* exists = NULL) const;
 	/**
 		return the value for the pair with the given key.
-		if there is no pair with the given key, or the value is 
+		if there is no pair with the given key, or the value is
 		not of the correct type, "" is returned.
 	*/
 	AsciiString getAsciiString(NameKeyType key, Bool* exists = NULL) const;
 	/**
 		return the value for the pair with the given key.
-		if there is no pair with the given key, or the value is 
+		if there is no pair with the given key, or the value is
 		not of the correct type, "" is returned.
 	*/
 	UnicodeString getUnicodeString(NameKeyType key, Bool* exists = NULL) const;
 
 	/**
 		return the value for the pair with the given index.
-		if the index is out of range, or the value is 
+		if the index is out of range, or the value is
 		not of the correct type, 0 is returned.
 	*/
 	Bool getNthBool(Int n) const;
 	/**
 		return the value for the pair with the given index.
-		if the index is out of range, or the value is 
+		if the index is out of range, or the value is
 		not of the correct type, 0 is returned.
 	*/
 	Int getNthInt(Int n) const;
 	/**
 		return the value for the pair with the given index.
-		if the index is out of range, or the value is 
+		if the index is out of range, or the value is
 		not of the correct type, 0 is returned.
 	*/
 	Real getNthReal(Int n) const;
 	/**
 		return the value for the pair with the given index.
-		if the index is out of range, or the value is 
+		if the index is out of range, or the value is
 		not of the correct type, "" is returned.
 	*/
 	AsciiString getNthAsciiString(Int n) const;
 	/**
 		return the value for the pair with the given index.
-		if the index is out of range, or the value is 
+		if the index is out of range, or the value is
 		not of the correct type, "" is returned.
 	*/
 	UnicodeString getNthUnicodeString(Int n) const;
@@ -255,7 +252,7 @@ class Dict
 	void copyPairFrom(const Dict& that, NameKeyType key);
 
 private:
-	
+
 	struct DictPair;
 	struct DictPairData;
 
@@ -266,7 +263,7 @@ class Dict
 	DictPair* findPairByKey(NameKeyType key) const;
 	void releaseData();
 	DictPair *ensureUnique(int numPairsNeeded, Bool preserveData, DictPair *pairToTranslate);
-	
+
 	enum DictPairKeyType
 	{
 		DICTPAIRKEY_ILLEGAL = 0
@@ -281,17 +278,17 @@ class Dict
 		DictPairKeyType		m_key;
 		void*							m_value;
 
-		inline static DictPairKeyType createKey(NameKeyType keyVal, DataType nt)
+		static DictPairKeyType createKey(NameKeyType keyVal, DataType nt)
 		{
 			return (DictPairKeyType)((((UnsignedInt)(keyVal)) << 8) | ((UnsignedInt)nt));
 		}
 
-		inline static DataType getTypeFromKey(DictPairKeyType nk)
+		static DataType getTypeFromKey(DictPairKeyType nk)
 		{
 			return (DataType)(((UnsignedInt)nk) & 0xff);
 		}
 
-		inline static NameKeyType getNameFromKey(DictPairKeyType nk)
+		static NameKeyType getNameFromKey(DictPairKeyType nk)
 		{
 			return (NameKeyType)(((UnsignedInt)nk) >> 8);
 		}
@@ -301,13 +298,13 @@ class Dict
 		void clear();
 		void copyFrom(DictPair* that);
 		void setNameAndType(NameKeyType key, DataType type);
-		inline DataType getType() const { return getTypeFromKey(m_key); }
-		inline NameKeyType getName() const { return getNameFromKey(m_key); }
-		inline Bool* asBool() { return (Bool*)&m_value; }
-		inline Int* asInt() { return (Int*)&m_value; }
-		inline Real* asReal() { return (Real*)&m_value; }
-		inline AsciiString* asAsciiString() { return (AsciiString*)&m_value; }
-		inline UnicodeString* asUnicodeString() { return (UnicodeString*)&m_value; }
+		DataType getType() const { return getTypeFromKey(m_key); }
+		NameKeyType getName() const { return getNameFromKey(m_key); }
+		Bool* asBool() { return (Bool*)&m_value; }
+		Int* asInt() { return (Int*)&m_value; }
+		Real* asReal() { return (Real*)&m_value; }
+		AsciiString* asAsciiString() { return (AsciiString*)&m_value; }
+		UnicodeString* asUnicodeString() { return (UnicodeString*)&m_value; }
 	};
 
 	struct DictPairData
@@ -317,13 +314,13 @@ class Dict
 		unsigned short	m_numPairsUsed;				// length of data allocated
 		//DictPair m_pairs[];
 
-		inline DictPair* peek() { return (DictPair*)(this+1); }
+		DictPair* peek() { return (DictPair*)(this+1); }
 	};
 
 	#ifdef RTS_DEBUG
 	void validate() const;
 	#else
-	inline void validate() const { }
+	void validate() const { }
 	#endif
 
 };
@@ -362,7 +359,3 @@ inline Dict::DataType Dict::getNthType(Int n) const
 		return DICT_NONE;
 	return m_data->peek()[n].getType();
 }
-
-#endif // Dict_H
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Directory.h b/GeneralsMD/Code/GameEngine/Include/Common/Directory.h
index 05293b0a6d4..dce65db078d 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Directory.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Directory.h
@@ -27,10 +27,8 @@
 // Desc:	 Directory info class
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #if (0)
-#pragma once
 
-#ifndef __DIRECTORY_H__
-#define __DIRECTORY_H__
+#pragma once
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/AsciiString.h"
@@ -90,6 +88,4 @@ class Directory
 
 //-------------------------------------------------------------------------------------------------
 
-#endif // __DIRECTORY_H__
-
-#endif
\ No newline at end of file
+#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h
index 840a967851e..2dc05b29628 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h
@@ -25,13 +25,10 @@
 // FILE: DisabledTypes.h //////////////////////////////////////////////////////////////////////////
 // Author: Kris Morness, September 2002
 // Desc:  Defines all the types of disabled statii any given object can have.
-///////////////////////////////////////////////////////////////////////////////////////////////////	
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __DISABLED_TYPES_H_
-#define __DISABLED_TYPES_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
 #include "Common/BitFlags.h"
@@ -53,14 +50,14 @@ enum DisabledType CPP_11(: Int)
 	DISABLED_FREEFALL,    //This unit has been disabled via being in free fall
 
   DISABLED_AWESTRUCK,
-  DISABLED_BRAINWASHED, 
+  DISABLED_BRAINWASHED,
 	DISABLED_SUBDUED,			///< Temporarily shut down by Subdual damage
 	//These ones are specificially for scripts to enable/reenable!
 	DISABLED_SCRIPT_DISABLED,
 	DISABLED_SCRIPT_UNDERPOWERED,
 
 	DISABLED_COUNT,
-	
+
 	DISABLED_ANY = 65535		///< Do not use this value for setting disabled types (read-only)
 };
 
@@ -72,13 +69,13 @@ typedef BitFlags<DISABLED_COUNT>	DisabledMaskType;
 #define MAKE_DISABLED_MASK4(k,a,b,c) DisabledMaskType(DisabledMaskType::kInit, (k), (a), (b), (c))
 #define MAKE_DISABLED_MASK5(k,a,b,c,d) DisabledMaskType(DisabledMaskType::kInit, (k), (a), (b), (c), (d))
 
-inline Bool TEST_DISABLEDMASK(const DisabledMaskType& m, DisabledType t) 
-{ 
-	return m.test(t); 
+inline Bool TEST_DISABLEDMASK(const DisabledMaskType& m, DisabledType t)
+{
+	return m.test(t);
 }
 
-inline Bool TEST_DISABLEDMASK_ANY(const DisabledMaskType& m, const DisabledMaskType& mask) 
-{ 
+inline Bool TEST_DISABLEDMASK_ANY(const DisabledMaskType& m, const DisabledMaskType& mask)
+{
 	return m.anyIntersectionWith(mask);
 }
 
@@ -87,14 +84,14 @@ inline Bool TEST_DISABLEDMASK_MULTI(const DisabledMaskType& m, const DisabledMas
 	return m.testSetAndClear(mustBeSet, mustBeClear);
 }
 
-inline Bool DISABLEDMASK_ANY_SET(const DisabledMaskType& m) 
-{ 
-	return m.any(); 
+inline Bool DISABLEDMASK_ANY_SET(const DisabledMaskType& m)
+{
+	return m.any();
 }
 
-inline void CLEAR_DISABLEDMASK(DisabledMaskType& m) 
-{ 
-	m.clear(); 
+inline void CLEAR_DISABLEDMASK(DisabledMaskType& m)
+{
+	m.clear();
 }
 
 inline void SET_ALL_DISABLEDMASK_BITS(DisabledMaskType& m)
@@ -114,6 +111,3 @@ inline void FLIP_DISABLEDMASK(DisabledMaskType& m)
 extern DisabledMaskType DISABLEDMASK_NONE;	// inits to all zeroes
 extern DisabledMaskType DISABLEDMASK_ALL;		// inits to all bits set.
 void initDisabledMasks();
-
-#endif	// __DISABLED_TYPES_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h b/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h
index 81bd6071191..c85159f365a 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h
@@ -29,12 +29,9 @@
 
 #pragma once
 
-#ifndef __DISCRETECIRCLE_H__
-#define __DISCRETECIRCLE_H__
-
 //-------------------------------------------------------------------------------------------------
 /**
-	One horizontal line of the circle we are going to generate, the points drawn should be from 
+	One horizontal line of the circle we are going to generate, the points drawn should be from
 	(xStart, yPos)-(xEnd, yPos), inclusive.
 */
 struct HorzLine
@@ -54,8 +51,8 @@ typedef VecHorzLine::iterator VecHorzLineIt;
 typedef void (*ScanlineDrawFunc)(Int xStart, Int xEnd, Int yPos, void *otherParms);
 
 /**
-	DiscreteCircle generates a circle centered at xCenter, yCenter, including radius. It generates 
-	horizontal segments for the top half of the circle only, so they need to be duplicated for the 
+	DiscreteCircle generates a circle centered at xCenter, yCenter, including radius. It generates
+	horizontal segments for the top half of the circle only, so they need to be duplicated for the
 	bottom half.
 */
 class DiscreteCircle
@@ -69,11 +66,8 @@ class DiscreteCircle
 		__inline const VecHorzLine &getEdges(void) const { return m_edges; }
 		__inline Int getEdgeCount(void) const { return m_edges.size(); }
 		void drawCircle(ScanlineDrawFunc functionToDrawWith, void *parmToPass);
-		
+
 	protected:
 		void generateEdgePairs(Int xCenter, Int yCenter, Int radius);
 		void removeDuplicates();
 };
-
-#endif /* __DISCRETECIRCLE_H__ */
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h
index 317470d1967..2f9cfd15724 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: DrawModule.h /////////////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:	 
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __DRAWMODULE_H_
-#define __DRAWMODULE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameType.h"
 #include "Common/Module.h"
@@ -67,18 +64,18 @@ class DrawModule : public DrawableModule
 	MAKE_STANDARD_MODULE_MACRO_ABC( DrawModule )
 
 public:
-	
+
 	DrawModule( Thing *thing, const ModuleData* moduleData );
 	static ModuleType getModuleType() { return MODULETYPE_DRAW; }
 	static Int getInterfaceMask() { return MODULEINTERFACE_DRAW; }
-	
+
 	virtual void doDrawModule(const Matrix3D* transformMtx) = 0;
 
 	virtual void setShadowsEnabled(Bool enable) = 0;
 	virtual void releaseShadows(void) = 0;	///< frees all shadow resources used by this module - used by Options screen.
 	virtual void allocateShadows(void) = 0; ///< create shadow resources if not already present. Used by Options screen.
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+#if defined(RTS_DEBUG)
 	virtual void getRenderCost(RenderCost & rc) const { };  ///< estimates the render cost of this draw module
 #endif
 
@@ -87,12 +84,12 @@ class DrawModule : public DrawableModule
 	virtual void setTerrainDecalOpacity(Real o) {};
 
 	virtual void setFullyObscuredByShroud(Bool fullyObscured) = 0;
-	
+
 	virtual Bool isVisible() const { return true; }	///< for limiting tree sway, etc to visible objects
 
 	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle) = 0;
 	virtual void reactToGeometryChange() = 0;
-	
+
 	virtual Bool isLaser() const { return false; }
 
 	// interface acquisition
@@ -166,8 +163,8 @@ class ObjectDrawInterface
 		Find the bone(s) with the given name and return their positions and/or transforms in the given arrays.
 		We look for a bone named "boneNamePrefixQQ", where QQ is 01, 02, 03, etc, starting at the
 		value of "startIndex". Want to look for just a specific boneName with no numeric suffix?
-		just pass zero (0) for startIndex. (no, we never look for "boneNamePrefix00".) 
-		We copy up to 'maxBones' into the array(s), and return the total count found. 
+		just pass zero (0) for startIndex. (no, we never look for "boneNamePrefix00".)
+		We copy up to 'maxBones' into the array(s), and return the total count found.
 
 		NOTE: this returns the positions and transform for the "ideal" model... that is,
 		at its default rotation and scale, located at (0,0,0). You'll have to concatenate
@@ -192,7 +189,7 @@ class ObjectDrawInterface
 	virtual void setSelectable(Bool selectable) = 0;
 
 	/**
-		This call says, "I want the current animation (if any) to take n frames to complete a single cycle". 
+		This call says, "I want the current animation (if any) to take n frames to complete a single cycle".
 		If it's a looping anim, each loop will take n frames. someday, we may want to add the option to insert
 		"pad" frames at the start and/or end, but for now, we always just "stretch" the animation to fit.
 		Note that you must call this AFTER setting the condition codes.
@@ -201,7 +198,7 @@ class ObjectDrawInterface
 
 	/**
 		similar to the above, but assumes that the current state is a "ONCE",
-		and is smart about transition states... if there is a transition state 
+		and is smart about transition states... if there is a transition state
 		"inbetween", it is included in the completion time.
 	*/
 	virtual void setAnimationCompletionTime(UnsignedInt numFrames) = 0;
@@ -209,7 +206,7 @@ class ObjectDrawInterface
 
 	//Kris: Manually set a drawable's current animation to specific frame.
 	virtual void setAnimationFrame( int frame ) = 0;
-	
+
 	/**
 	  This call is used to pause or resume an animation.
 	*/
@@ -219,7 +216,7 @@ class ObjectDrawInterface
 	virtual void showSubObject( const AsciiString& name, Bool show ) = 0;
 
 	/**
-		This call asks, "In the current animation (if any) how far along are you, from 0.0f to 1.0f". 
+		This call asks, "In the current animation (if any) how far along are you, from 0.0f to 1.0f".
 	*/
 #ifdef ALLOW_ANIM_INQUIRIES
 // srj sez: not sure if this is a good idea, for net sync reasons...
@@ -256,7 +253,3 @@ class RenderCost
 	int		m_boneCount;
 	int		m_shadowDrawCount;
 };
-
-
-#endif // __DRAWMODULE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Energy.h b/GeneralsMD/Code/GameEngine/Include/Common/Energy.h
index 56acaf769f8..6887530f704 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Energy.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Energy.h
@@ -24,12 +24,12 @@
 
 // FILE: Energy.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef _ENERGY_H_
-#define _ENERGY_H_
-
 // INLCUDES /////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Snapshot.h"
 
@@ -65,7 +62,7 @@ class Energy : public Snapshot
 {
 
 public:
-	
+
 	Energy();
 
 	// reset energy information to base values.
@@ -73,6 +70,7 @@ class Energy : public Snapshot
 	{
 		m_energyProduction = 0;
 		m_energyConsumption = 0;
+		m_powerSabotagedTillFrame = 0;
 		m_owner = owner;
 	}
 
@@ -83,7 +81,7 @@ class Energy : public Snapshot
 	Int getConsumption() const { return m_energyConsumption; }
 
 	Bool hasSufficientPower(void) const;
-	
+
 	// If adding is false, we're supposed to be removing this.
 	void adjustPower(Int powerDelta, Bool adding);
 
@@ -122,6 +120,3 @@ class Energy : public Snapshot
 	UnsignedInt m_powerSabotagedTillFrame; ///< If power is sabotaged, the frame will be greater than now.
 	Player *m_owner;						///< Tight pointer to the Player I am intrinsic to.
 };
-
-#endif // _ENERGY_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Errors.h b/GeneralsMD/Code/GameEngine/Include/Common/Errors.h
index 2e6d860a09a..4b8316b0876 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Errors.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Errors.h
@@ -22,14 +22,14 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Errors.h 
+// FILE: Errors.h
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __ERRORS_H_
-#define __ERRORS_H_
-
 /**
 	An ErrorCode is the repository for failure modes. In almost all situations,
 	these values will  be THROWN, not returned as error codes. Feel free
@@ -64,9 +61,7 @@ enum ErrorCode CPP_11(: UnsignedInt)
 	ERROR_INVALID_FILE_VERSION	= (ERROR_BASE + 0x0003),		///< Unrecognized file version.
 	ERROR_CORRUPT_FILE_FORMAT		= (ERROR_BASE + 0x0004),		///< Invalid file format.
 	ERROR_BAD_INI								= (ERROR_BASE + 0x0005),		///< Bad INI data.
-	ERROR_INVALID_D3D						= (ERROR_BASE + 0x0006),    ///< Error initing D3D 
+	ERROR_INVALID_D3D						= (ERROR_BASE + 0x0006),    ///< Error initing D3D
 
 	ERROR_LAST
 };
-
-#endif // __ERRORS_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/FileSystem.h b/GeneralsMD/Code/GameEngine/Include/Common/FileSystem.h
deleted file mode 100644
index 381658cfc2d..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/FileSystem.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    GameEngine
-//
-// Module:     IO
-//
-// File name:  FileSystem.h
-//
-// Created:    
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __FILESYSTEM_H
-#define __FILESYSTEM_H
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/STLTypedefs.h"
-#include "Common/SubsystemInterface.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-class File;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-typedef std::set<AsciiString, rts::less_than_nocase<AsciiString> > FilenameList;
-typedef FilenameList::iterator FilenameListIter;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-//#define W3D_DIR_PATH "../FinalArt/W3D/"					///< .w3d files live here
-//#define TGA_DIR_PATH "../FinalArt/Textures/"		///< .tga texture files live here
-//#define TERRAIN_TGA_DIR_PATH "../FinalArt/Terrain/"		///< terrain .tga texture files live here
-#define W3D_DIR_PATH "Art/W3D/"					///< .w3d files live here
-#define TGA_DIR_PATH "Art/Textures/"		///< .tga texture files live here
-#define TERRAIN_TGA_DIR_PATH "Art/Terrain/"		///< terrain .tga texture files live here
-#define MAP_PREVIEW_DIR_PATH "%sMapPreviews/"	///< We need a common place we can copy the map previews to at runtime.
-#define USER_W3D_DIR_PATH "%sW3D/"					///< .w3d files live here
-#define USER_TGA_DIR_PATH "%sTextures/"		///< User .tga texture files live here
-
-// the following defines are only to be used while maintaining legacy compatability
-// with old files until they are completely gone and in the regular art set
-#ifdef MAINTAIN_LEGACY_FILES
-#define LEGACY_W3D_DIR_PATH "../LegacyArt/W3D/"				///< .w3d files live here
-#define LEGACY_TGA_DIR_PATH "../LegacyArt/Textures/"	///< .tga texture files live here
-#endif  // MAINTAIN_LEGACY_FILES
-
-// LOAD_TEST_ASSETS automatically loads w3d assets from the TEST_W3D_DIR_PATH
-// without having to add an INI entry.
-///@todo this allows us to use the test art directory, it should be removed for FINAL release
-#define LOAD_TEST_ASSETS 1
-#ifdef LOAD_TEST_ASSETS
-	#define ROAD_DIRECTORY		"../TestArt/TestRoad/"
-	#define TEST_STRING				"***TESTING"
-// the following directories will be used to look for test art
-#define LOOK_FOR_TEST_ART
-#define TEST_W3D_DIR_PATH "../TestArt/"					///< .w3d files live here
-#define TEST_TGA_DIR_PATH "../TestArt/"		///< .tga texture files live here
-#endif
-
-struct FileInfo {
-	Int sizeHigh;
-	Int sizeLow;
-	Int timestampHigh;
-	Int timestampLow;
-};
-
-//===============================
-// FileSystem
-//===============================
-/**
-  * FileSystem is an interface class for creating specific FileSystem objects.
-  * 
-	* A FileSystem object's implemenation decides what derivative of File object needs to be 
-	* created when FileSystem::Open() gets called.
-	*/
-//===============================
-#include <map>
-
-class FileSystem : public SubsystemInterface
-{
-  FileSystem(const FileSystem&);
-  FileSystem& operator=(const FileSystem&);
-  
-public:
-	FileSystem();
-	virtual	~FileSystem();
-
-	void init();
-	void reset();
-	void update();
-
-	File* openFile( const Char *filename, Int access = 0 );		///< opens a File interface to the specified file
-	Bool doesFileExist(const Char *filename) const;								///< returns TRUE if the file exists.  filename should have no directory.
-	void getFileListInDirectory(const AsciiString& directory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.
-	Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const; ///< fills in the FileInfo struct for the file given. returns TRUE if successful.
-
-	Bool createDirectory(AsciiString directory); ///< create a directory of the given name.
-
-	Bool areMusicFilesOnCD();
-	void loadMusicFilesFromCD();
-	void unloadMusicFilesFromCD();
-protected:
-  mutable std::map<unsigned,bool> m_fileExist;
-};
-
-extern FileSystem*	TheFileSystem;
-
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-
-
-#endif // __WSYS_FILESYSTEM_H
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h b/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h
index 80fd7372c8a..b4873899b9b 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __FUNCTIONLEXICON_H_
-#define __FUNCTIONLEXICON_H_
-
 #include "Common/SubsystemInterface.h"
 #include "Common/NameKeyGenerator.h"
 #include "Common/GameMemory.h"
@@ -68,7 +65,7 @@ class FunctionLexicon : public SubsystemInterface
 		TABLE_WIN_LAYOUT_UPDATE,
 		TABLE_WIN_LAYOUT_SHUTDOWN,
 
-		MAX_FUNCTION_TABLES			// keep this last
+		MAX_FUNCTION_TABLES
 	};
 
 public:
@@ -91,7 +88,7 @@ class FunctionLexicon : public SubsystemInterface
 	// that functions in the tables are unique and that there is a 1 to 1
 	// mapping of a symbol to a function address.  However, when compiling
 	// in release, functions that have the same arguments and the same
-	// body (mainly empty stub functions) get optimized to the 
+	// body (mainly empty stub functions) get optimized to the
 	// SAME ADDRESS.  That destroyes our 1 to 1 mapping so it is something
 	// that we must avoid
 	//
@@ -117,7 +114,7 @@ class FunctionLexicon : public SubsystemInterface
 	/** given a key find the function, the index parameter can limit the search
 	to a single table or to ANY of the tables */
 	void *findFunction( NameKeyType key, TableIndex index );
-	
+
 #ifdef NOT_IN_USE
 	const char *funcToName( void *func, TableEntry *table );  ///< internal searching
 #endif
@@ -125,10 +122,10 @@ class FunctionLexicon : public SubsystemInterface
 
 	TableEntry *m_tables[ MAX_FUNCTION_TABLES ];  ///< the lookup tables
 
-};  // end class FunctionLexicon
+};
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// INLINING 
+// INLINING
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 inline FunctionLexicon::TableEntry *FunctionLexicon::getTable( TableIndex index )
 	{ return m_tables[ index ]; }
@@ -146,9 +143,6 @@ inline WindowLayoutShutdownFunc FunctionLexicon::winLayoutShutdownFunc( NameKeyT
 	{ return (WindowLayoutShutdownFunc)findFunction( key, index ); }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// EXTERNALS 
+// EXTERNALS
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 extern FunctionLexicon *TheFunctionLexicon;  ///< function dictionary external
-
-#endif // end __FUNCTIONLEXICON_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameAudio.h b/GeneralsMD/Code/GameEngine/Include/Common/GameAudio.h
deleted file mode 100644
index fea92a0ee17..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameAudio.h
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    RTS 3
-//
-// File name:  Common/GameAudio.h
-//
-// Created:    5/01/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __COMMON_GAMEAUDIO_H_
-#define __COMMON_GAMEAUDIO_H_
-
-// Includes                                                      
-#include "Lib/BaseType.h"
-#include "Common/STLTypedefs.h"
-#include "Common/SubsystemInterface.h"
-
-
-// Forward Declarations
-
-class AsciiString;
-class AudioEventRTS;
-class DebugDisplayInterface;
-class Drawable;
-class MusicManager;
-class Object;
-class SoundManager;
-
-
-enum AudioAffect CPP_11(: Int);
-enum AudioType CPP_11(: Int);
-
-struct AudioEventInfo;
-struct AudioRequest;
-struct AudioSettings;
-struct MiscAudio;
-
-typedef std::hash_map<AsciiString, AudioEventInfo*, rts::hash<AsciiString>, rts::equal_to<AsciiString> > AudioEventInfoHash;
-typedef AudioEventInfoHash::iterator AudioEventInfoHashIt;
-typedef UnsignedInt AudioHandle;
-
-
-// Defines
-enum
-{
-	PROVIDER_ERROR = 0xFFFFFFFF
-};
-
-// Class AudioManager
-/**
-	The life of audio.
-
-	When audio is requested to play, it is done so in the following manner:
-	1) An AudioEventRTS is created on the stack.
-	2) Its guts are copied from elsewhere (for instance, a ThingTemplate, or MiscAudio).
-	3) It is added to TheAudio via TheAudio->addAudioEvent(...)
-
-	The return value from addAudioEvent can be saved in case the sound needs to loop and/or be 
-	terminated at some point. 
-	
-	To reomve a playing sound, the call TheAudio->removeAudioEvent(...) is used. This will search 
-	the list of currently playing audio for the specified handle, and kill the attached sound. It 
-	will play a decay sound, if one is specified.
-
-	The important functions of TheAudio, are therefore 
-		GameAudio::addAudioEvent()
-		GameAudio::removeAudioEvent()
-	All other functions exist to support these two basic requirements.
-
-	In addition to the fundamental requirements, the audio has a fairly complicated sound management
-	scheme. If all units were always allowed to sound off, the sound engine would be overwhelmed and 
-	would sound awful. Therefore, when an audio event is requested, it goes through a series of 
-	checks to determine if it is near enough to the camera, if it should be heard based on shroud, 
-	local player affiliation, etc. (The entire list of checks is contained in shouldPlayLocally()).
-	
-	In addition, the world and unit audio are never allowed to exceed their footprint, as specified
-	in the audio settings INI file. In order to accomodate this, the audio uses an audio cache. The
-	audio cache will attempt to load a sample, assuming there is enough room. If there is not enough
-	room, then it goes through and finds any samples that are lower priority, and kills them until 
-	enough room is present for the sample. If it cannot free enough room, nothing happens to the 
-	cache.
-
-	Although the audio is multithreaded, most of the operations are performed such that the worst 
-	case scenario for thread miscommunication is that the main thread misses an event for one frame.
-	One specific case of this is the status of playing audio. Because audio is playing 
-	asynchronously, it can complete at any time. When most audio completes, it sets a flag on the 
-	event noting that it has completed. During the next update (from the main thread), anything with
-	that flag set is moved to the stopped list, and then is cleaned up. (Basically, the audio uses 
-	a push model for its multithreadedness, which doesn't require thread safety such as mutexes or 
-	semaphores).
-
-	All in all, the best way to learn how the audio works is to track the lifetime of an event 
-	through the system. This will give a better understanding than all the documentation I could 
-	write.
-
-	-jkmcd 
-	-December 2002
-*/
-
-class AudioManager : public SubsystemInterface
-{
-	public:
-		AudioManager();
-		virtual ~AudioManager();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *userData, FILE *fp = NULL ) = 0;
-#endif
-
-		// From SubsystemInterface
-		virtual void init();
-		virtual void postProcessLoad();
-		virtual void reset();
-		virtual void update();
-
-		// device dependent stop, pause and resume
-		virtual void stopAudio( AudioAffect which ) = 0;
-		virtual void pauseAudio( AudioAffect which ) = 0;
-		virtual void resumeAudio( AudioAffect which ) = 0;
-		virtual void pauseAmbient( Bool shouldPause ) = 0;
-
-		// for focus issues
-		virtual void loseFocus( void );
-		virtual void regainFocus( void );
-
-		// control for AudioEventsRTS
-		virtual AudioHandle addAudioEvent( const AudioEventRTS *eventToAdd );	///< Add an audio event (event must be declared in an INI file)
-		virtual void removeAudioEvent( AudioHandle audioEvent );	///< Remove an audio event, stop for instance.
-		virtual void killAudioEventImmediately( AudioHandle audioEvent ) = 0;
-
-		virtual Bool isValidAudioEvent( const AudioEventRTS *eventToCheck ) const;	///< validate that this piece of audio exists
-		virtual Bool isValidAudioEvent( AudioEventRTS *eventToCheck ) const;	///< validate that this piece of audio exists
-
-		// add tracks during INIification
-		void addTrackName( const AsciiString& trackName );
-		AsciiString nextTrackName(const AsciiString& currentTrack );
-		AsciiString prevTrackName(const AsciiString& currentTrack );
-		
-		// changing music tracks
-		virtual void nextMusicTrack( void ) = 0;
-		virtual void prevMusicTrack( void ) = 0;
-		virtual Bool isMusicPlaying( void ) const = 0;
-		virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const = 0;
-		virtual AsciiString getMusicTrackName( void ) const = 0;
-
-		virtual void setAudioEventEnabled( AsciiString eventToAffect, Bool enable );
-		virtual void setAudioEventVolumeOverride( AsciiString eventToAffect, Real newVolume );
-		virtual void removeAudioEvent( AsciiString eventToRemove );
-		virtual void removeDisabledEvents();
-
-		// Really meant for internal purposes only, but cannot be protected.
-		virtual void getInfoForAudioEvent( const AudioEventRTS *eventToFindAndFill ) const;	// Note: m_eventInfo is Mutable, and so this function will overwrite it if found
-
-		///< Return whether the current audio is playing or not. 
-		///< NOTE NOTE NOTE !!DO NOT USE THIS IN FOR GAMELOGIC PURPOSES!! NOTE NOTE NOTE
-		virtual Bool isCurrentlyPlaying( AudioHandle handle );
-
-		// Device Dependent open and close functions
-		virtual void openDevice( void ) = 0;
-		virtual void closeDevice( void ) = 0;
-		virtual void *getDevice( void ) = 0;
-
-		// Debice Dependent notification functions
-		virtual void notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags ) = 0;
-
-		// Device Dependent enumerate providers functions. It is okay for there to be only 1 provider (Miles provides a maximum of 64.
-		virtual UnsignedInt getProviderCount( void ) const = 0;
-		virtual AsciiString getProviderName( UnsignedInt providerNum ) const = 0;
-		virtual UnsignedInt getProviderIndex( AsciiString providerName ) const = 0;
-		virtual void selectProvider( UnsignedInt providerNdx ) = 0;
-		virtual void unselectProvider( void ) = 0;
-		virtual UnsignedInt getSelectedProvider( void ) const = 0;
-		virtual void setSpeakerType( UnsignedInt speakerType ) = 0;
-		virtual UnsignedInt getSpeakerType( void ) = 0;
-
-		virtual UnsignedInt translateSpeakerTypeToUnsignedInt( const AsciiString& speakerType );
-		virtual AsciiString translateUnsignedIntToSpeakerType( UnsignedInt speakerType );
-
-		// Device Dependent calls to get the number of channels for each type of audio (2-D, 3-D, Streams)
-		virtual UnsignedInt getNum2DSamples( void ) const = 0;
-		virtual UnsignedInt getNum3DSamples( void ) const = 0;
-		virtual UnsignedInt getNumStreams( void ) const = 0;
-
-		// Device Dependent calls to determine sound prioritization info
-		virtual Bool doesViolateLimit( AudioEventRTS *event ) const = 0;
-		virtual Bool isPlayingLowerPriority( AudioEventRTS *event ) const = 0;
-		virtual Bool isPlayingAlready( AudioEventRTS *event ) const = 0;
-		virtual Bool isObjectPlayingVoice( UnsignedInt objID ) const = 0;
-
-		virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume) = 0;
-		virtual void removePlayingAudio( AsciiString eventName ) = 0;
-		virtual void removeAllDisabledAudio() = 0;
-		
-		// Is the audio device on? We can skip a lot of audio processing if not.
-		virtual Bool isOn( AudioAffect whichToGet ) const;
-		virtual void setOn( Bool turnOn, AudioAffect whichToAffect );
-
-		// Set and get the device Volume
-		virtual void setVolume( Real volume, AudioAffect whichToAffect );
-		virtual Real getVolume( AudioAffect whichToGet );
-		
-		// To get a more 3-D feeling from the universe, we adjust the volume of the 3-D samples based 
-		// on zoom.
-		virtual void set3DVolumeAdjustment( Real volumeAdjustment );
-
-    virtual Bool has3DSensitiveStreamsPlaying( void ) const = 0;
-
- 		virtual void *getHandleForBink( void ) = 0;
- 		virtual void releaseHandleForBink( void ) = 0;
-
-		// this function will play an audio event rts by loading it into memory. It should not be used
-		// by anything except for the load screens.
-		virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) = 0;
-
-		// Update Listener position information
-		virtual void setListenerPosition( const Coord3D *newListenerPos, const Coord3D *newListenerOrientation );
-		virtual const Coord3D *getListenerPosition( void ) const;
-
-		virtual AudioRequest *allocateAudioRequest( Bool useAudioEvent );
-		virtual void releaseAudioRequest( AudioRequest *requestToRelease );
-		virtual void appendAudioRequest( AudioRequest *m_request );
-		virtual void processRequestList( void );
-	
-		virtual AudioEventInfo *newAudioEventInfo( AsciiString newEventName );
-    virtual void addAudioEventInfo( AudioEventInfo * newEventInfo );
-		virtual AudioEventInfo *findAudioEventInfo( AsciiString eventName ) const;
-
-		const AudioSettings *getAudioSettings( void ) const;
-		const MiscAudio *getMiscAudio( void ) const;
-
-		// This function should only be called by AudioManager, MusicManager and SoundManager
-		virtual void releaseAudioEventRTS( AudioEventRTS *&eventToRelease );
-
-		// For INI
-		AudioSettings *friend_getAudioSettings( void );
-		MiscAudio *friend_getMiscAudio( void );
-		const FieldParse *getFieldParseTable( void ) const;
-
-		const AudioEventRTS *getValidSilentAudioEvent() const { return m_silentAudioEvent; }
-
-		virtual void setHardwareAccelerated(Bool accel) { m_hardwareAccel = accel; }
-		virtual Bool getHardwareAccelerated() { return m_hardwareAccel; }
-
-		virtual void setSpeakerSurround(Bool surround) { m_surroundSpeakers = surround; }
-		virtual Bool getSpeakerSurround() { return m_surroundSpeakers; }
-
-		virtual void refreshCachedVariables();
-
-		virtual void setPreferredProvider(AsciiString providerNdx) = 0;
-		virtual void setPreferredSpeaker(AsciiString speakerType) = 0;
-
-		// For Scripting
-		virtual Real getAudioLengthMS( const AudioEventRTS *event );
-		virtual Real getFileLengthMS( AsciiString strToLoad ) const = 0;
-
-		// For the file cache to know when to remove files.
-		virtual void closeAnySamplesUsingFile( const void *fileToClose ) = 0;
-		
-		virtual Bool isMusicAlreadyLoaded(void) const;
-		virtual Bool isMusicPlayingFromCD(void) const { return m_musicPlayingFromCD; }
-
-		Bool getDisallowSpeech( void ) const { return m_disallowSpeech; }
-		void setDisallowSpeech( Bool disallowSpeech ) { m_disallowSpeech = disallowSpeech; }	
-
-		// For Worldbuilder, to build lists from which to select
-		virtual void findAllAudioEventsOfType( AudioType audioType, std::vector<AudioEventInfo*>& allEvents );
-    virtual const AudioEventInfoHash & getAllAudioEvents() const { return m_allAudioEventInfo; }
-
-		Real getZoomVolume() const { return m_zoomVolume; }
-	protected:
-
-		// Is the currently selected provider actually HW accelerated?
-		virtual Bool isCurrentProviderHardwareAccelerated();
-	
-		// Is the currently selected speaker type Surround sound?
-		virtual Bool isCurrentSpeakerTypeSurroundSound();
-
-		// Should this piece of audio play on the local machine?
-		virtual Bool shouldPlayLocally(const AudioEventRTS *audioEvent);
-
-		// Set the Listening position for the device
-		virtual void setDeviceListenerPosition( void ) = 0;
-
-		// For tracking purposes
-		virtual AudioHandle allocateNewHandle( void );	
-
-    // Remove all AudioEventInfo's with the m_isLevelSpecific flag
-    virtual void removeLevelSpecificAudioEventInfos( void );
-    
-    void removeAllAudioRequests( void );
-    
-	protected:
-		AudioSettings *m_audioSettings;
-		MiscAudio *m_miscAudio;
-		MusicManager *m_music;
-		SoundManager *m_sound;
-		Coord3D m_listenerPosition;
-		Coord3D m_listenerOrientation;
-		std::list<AudioRequest*> m_audioRequests;
-		std::vector<AsciiString> m_musicTracks;
-
-		AudioEventInfoHash m_allAudioEventInfo;
-		AudioHandle theAudioHandlePool;
-		std::list<std::pair<AsciiString, Real> > m_adjustedVolumes;
-
-		Real m_musicVolume;
-		Real m_soundVolume;
-		Real m_sound3DVolume;
-		Real m_speechVolume;
-
-		Real m_scriptMusicVolume;
-		Real m_scriptSoundVolume;
-		Real m_scriptSound3DVolume;
-		Real m_scriptSpeechVolume;
-		
-		Real m_systemMusicVolume;
-		Real m_systemSoundVolume;
-		Real m_systemSound3DVolume;
-		Real m_systemSpeechVolume;
-		Real m_zoomVolume;
-
-		
-		AudioEventRTS *m_silentAudioEvent;
-		
-		enum { NUM_VOLUME_TYPES = 4 };
-		Real *m_savedValues;
-
-		// Group of 8
-		Bool m_speechOn						: 1;
-		Bool m_soundOn						: 1;
-		Bool m_sound3DOn					: 1;
-		Bool m_musicOn						: 1;
-		Bool m_volumeHasChanged		: 1;
-		Bool m_hardwareAccel			: 1;
-		Bool m_surroundSpeakers		: 1;
-		Bool m_musicPlayingFromCD : 1;
-
-		// Next 8
-		Bool m_disallowSpeech			: 1;
-};
-
-// TheSuperHackers @feature helmutbuhler 17/05/2025
-// AudioManager that does nothing. Used for Headless Mode.
-class AudioManagerDummy : public AudioManager
-{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	virtual void audioDebugDisplay(DebugDisplayInterface* dd, void* userData, FILE* fp) {}
-#endif
-	virtual void stopAudio(AudioAffect which) {}
-	virtual void pauseAudio(AudioAffect which) {}
-	virtual void resumeAudio(AudioAffect which) {}
-	virtual void pauseAmbient(Bool shouldPause) {}
-	virtual void killAudioEventImmediately(AudioHandle audioEvent) {}
-	virtual void nextMusicTrack() {}
-	virtual void prevMusicTrack() {}
-	virtual Bool isMusicPlaying() const { return false; }
-	virtual Bool hasMusicTrackCompleted(const AsciiString& trackName, Int numberOfTimes) const { return false; }
-	virtual AsciiString getMusicTrackName() const { return ""; }
-	virtual void openDevice() {}
-	virtual void closeDevice() {}
-	virtual void* getDevice() { return NULL; }
-	virtual void notifyOfAudioCompletion(UnsignedInt audioCompleted, UnsignedInt flags) {}
-	virtual UnsignedInt getProviderCount(void) const { return 0; };
-	virtual AsciiString getProviderName(UnsignedInt providerNum) const { return ""; }
-	virtual UnsignedInt getProviderIndex(AsciiString providerName) const { return 0; }
-	virtual void selectProvider(UnsignedInt providerNdx) {}
-	virtual void unselectProvider(void) {}
-	virtual UnsignedInt getSelectedProvider(void) const { return 0; }
-	virtual void setSpeakerType(UnsignedInt speakerType) {}
-	virtual UnsignedInt getSpeakerType(void) { return 0; }
-	virtual UnsignedInt getNum2DSamples(void) const { return 0; }
-	virtual UnsignedInt getNum3DSamples(void) const { return 0; }
-	virtual UnsignedInt getNumStreams(void) const { return 0; }
-	virtual Bool doesViolateLimit(AudioEventRTS* event) const { return false; }
-	virtual Bool isPlayingLowerPriority(AudioEventRTS* event) const { return false; }
-	virtual Bool isPlayingAlready(AudioEventRTS* event) const { return false; }
-	virtual Bool isObjectPlayingVoice(UnsignedInt objID) const { return false; }
-	virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume) {}
-	virtual void removePlayingAudio(AsciiString eventName) {}
-	virtual void removeAllDisabledAudio() {}
-	virtual Bool has3DSensitiveStreamsPlaying(void) const { return false; }
-	virtual void* getHandleForBink(void) { return NULL; }
-	virtual void releaseHandleForBink(void) {}
-	virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) {}
-	virtual void setPreferredProvider(AsciiString providerNdx) {}
-	virtual void setPreferredSpeaker(AsciiString speakerType) {}
-	virtual Real getFileLengthMS(AsciiString strToLoad) const { return -1; }
-	virtual void closeAnySamplesUsingFile(const void* fileToClose) {}
-	virtual void setDeviceListenerPosition(void) {}
-};
-
-
-extern AudioManager *TheAudio;
-
-#endif // __COMMON_GAMEAUDIO_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h b/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h
index 7d486703584..5cf1b10b629 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h
@@ -24,12 +24,12 @@
 
 // FILE: GameCommon.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -47,20 +47,17 @@
 
 #pragma once
 
-#ifndef _GAMECOMMON_H_
-#define _GAMECOMMON_H_
-
-
-
 #define DONT_ALLOW_DEBUG_CHEATS_IN_RELEASE ///< Take of the DONT to get cheats back in to release
 
 //#define _CAMPEA_DEMO
 
 // ----------------------------------------------------------------------------------------------
 #include "Lib/BaseType.h"
+#include "WWCommon.h"
+#include "Common/GameDefines.h"
 
 // ----------------------------------------------------------------------------------------------
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 	#define DUMP_PERF_STATS
 #else
 	#define NO_DUMP_PERF_STATS
@@ -69,7 +66,8 @@
 // ----------------------------------------------------------------------------------------------
 enum
 {
-	LOGICFRAMES_PER_SECOND = 30,
+	BaseFps = 30, // The historic base frame rate for this game. This value must never change.
+	LOGICFRAMES_PER_SECOND = WWSyncPerSecond,
 	MSEC_PER_SECOND = 1000
 };
 const Real LOGICFRAMES_PER_MSEC_REAL = (((Real)LOGICFRAMES_PER_SECOND) / ((Real)MSEC_PER_SECOND));
@@ -80,36 +78,36 @@ const Real SECONDS_PER_LOGICFRAME_REAL = 1.0f / LOGICFRAMES_PER_SECONDS_REAL;
 // ----------------------------------------------------------------------------------------------
 // note that this returns a REAL value, not an int... most callers will want to
 // call ceil() on the result, so that partial frames get converted to full frames!
-inline Real ConvertDurationFromMsecsToFrames(Real msec) 
-{	
-	return (msec * LOGICFRAMES_PER_MSEC_REAL); 
+inline Real ConvertDurationFromMsecsToFrames(Real msec)
+{
+	return (msec * LOGICFRAMES_PER_MSEC_REAL);
 }
 
 // ----------------------------------------------------------------------------------------------
-inline Real ConvertVelocityInSecsToFrames(Real distPerMsec) 
-{	
+inline Real ConvertVelocityInSecsToFrames(Real distPerMsec)
+{
 	// this looks wrong, but is the correct conversion factor.
-	return (distPerMsec * SECONDS_PER_LOGICFRAME_REAL); 
+	return (distPerMsec * SECONDS_PER_LOGICFRAME_REAL);
 }
 
 // ----------------------------------------------------------------------------------------------
-inline Real ConvertAccelerationInSecsToFrames(Real distPerSec2) 
-{	
+inline Real ConvertAccelerationInSecsToFrames(Real distPerSec2)
+{
 	// this looks wrong, but is the correct conversion factor.
 	const Real SEC_PER_LOGICFRAME_SQR = (SECONDS_PER_LOGICFRAME_REAL * SECONDS_PER_LOGICFRAME_REAL);
-	return (distPerSec2 * SEC_PER_LOGICFRAME_SQR); 
+	return (distPerSec2 * SEC_PER_LOGICFRAME_SQR);
 }
 
 // ----------------------------------------------------------------------------------------------
-inline Real ConvertAngularVelocityInDegreesPerSecToRadsPerFrame(Real degPerSec) 
-{	
+inline Real ConvertAngularVelocityInDegreesPerSecToRadsPerFrame(Real degPerSec)
+{
 	const Real RADS_PER_DEGREE = PI / 180.0f;
-	return (degPerSec * (SECONDS_PER_LOGICFRAME_REAL * RADS_PER_DEGREE)); 
+	return (degPerSec * (SECONDS_PER_LOGICFRAME_REAL * RADS_PER_DEGREE));
 }
 
 // ----------------------------------------------------------------------------------------------
-enum 
-{ 
+enum
+{
 	MAX_PLAYER_COUNT = 16											///< max number of Players.
 };
 
@@ -126,13 +124,13 @@ enum
 #endif
 
 // ----------------------------------------------------------------------------------------------
-enum 
-{ 
+enum
+{
 	MAX_GLOBAL_GENERAL_TYPES = 9,		///< number of playable General Types, not including the boss)
-	
+
 	/// The start of the playable global generals playertemplates
 	GLOBAL_GENERAL_BEGIN = 5,
-	
+
 	/// The end of the playable global generals
 	GLOBAL_GENERAL_END = (GLOBAL_GENERAL_BEGIN + MAX_GLOBAL_GENERAL_TYPES - 1)
 };
@@ -163,8 +161,6 @@ enum CellShroudStatus CPP_11(: Int)
 	CELLSHROUD_CLEAR,
 	CELLSHROUD_FOGGED,
 	CELLSHROUD_SHROUDED,
-
-	CELLSHROUD_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -177,8 +173,6 @@ enum ObjectShroudStatus CPP_11(: Int)
 	OBJECTSHROUD_FOGGED,				///< object is completely fogged
 	OBJECTSHROUD_SHROUDED,			///< object is completely shrouded
 	OBJECTSHROUD_INVALID_BUT_PREVIOUS_VALID,			///< indeterminate state, will recompute, BUT previous status is valid, don't reset (used for save/load)
-
-	OBJECTSHROUD_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -190,8 +184,8 @@ enum GuardMode CPP_11(: Int)
 };
 
 // ---------------------------------------------------
-enum 
-{ 
+enum
+{
 	NEVER				= 0,
 	FOREVER			= 0x3fffffff			// (we use 0x3fffffff so that we can add offsets and not overflow...
 																//		at 30fps we're still pretty safe!)
@@ -205,7 +199,7 @@ enum
 // NOTE NOTE NOTE: Keep TheVeterencyNames in sync with these.
 enum VeterancyLevel CPP_11(: Int)
 {
-	LEVEL_REGULAR = 0,
+	LEVEL_REGULAR,
 	LEVEL_VETERAN,
 	LEVEL_ELITE,
 	LEVEL_HEROIC,
@@ -213,25 +207,26 @@ enum VeterancyLevel CPP_11(: Int)
 	LEVEL_COUNT,
 	LEVEL_INVALID,
 
-	LEVEL_FIRST = LEVEL_REGULAR,
+	LEVEL_FIRST = 0,
 	LEVEL_LAST = LEVEL_HEROIC
 };
 
 // TheVeterancyNames is defined in GameCommon.cpp
-extern const char *TheVeterancyNames[]; 
+extern const char *const TheVeterancyNames[];
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum CommandSourceType CPP_11(: Int) 
-{ 
+enum CommandSourceType CPP_11(: Int)
+{
 
-	CMD_FROM_PLAYER = 0, 
-	CMD_FROM_SCRIPT, 
+	CMD_FROM_PLAYER = 0,
+	CMD_FROM_SCRIPT,
 	CMD_FROM_AI,
 	CMD_FROM_DOZER,							// Special rare command when the dozer originates a command to attack a mine. Mines are not ai-attackable, and it seems deceitful for the dozer to generate a player or script command. jba.
 	CMD_DEFAULT_SWITCH_WEAPON,	// Special case: A weapon that can be chosen -- this is the default case (machine gun vs flashbang).
 
-};		///< the source of a command
+	COMMAND_SOURCE_TYPE_COUNT
+};
 
 //-------------------------------------------------------------------------------------------------
 enum AbleToAttackType CPP_11(: Int)
@@ -250,7 +245,7 @@ enum AbleToAttackType CPP_11(: Int)
 		(The only current difference between this and ATTACK_NEW_TARGET is that disguised units
 		are force-attackable even when stealthed.)
 	*/
-	ATTACK_NEW_TARGET_FORCED= (_ATTACK_FORCED),	
+	ATTACK_NEW_TARGET_FORCED= (_ATTACK_FORCED),
 
 	/**
 		can we attack if this is continuation of an existing attack?
@@ -271,7 +266,7 @@ enum AbleToAttackType CPP_11(: Int)
 		For example, a unit inside couldn't normally see outside and would fail.
 	*/
 	ATTACK_TUNNEL_NETWORK_GUARD = (_ATTACK_TUNNELNETWORK_GUARD)
-	
+
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -377,7 +372,7 @@ private:																																							\
 		inline ~DLINKHEAD_##LISTNAME()																										\
 			{ DEBUG_ASSERTCRASH(!m_head,("destroying dlinkhead still in a list " #LISTNAME)); }				\
 	};																																									\
-	DLINKHEAD_##LISTNAME m_dlinkhead_##LISTNAME;	
+	DLINKHEAD_##LISTNAME m_dlinkhead_##LISTNAME;
 
 // ----------------------------------------------------------------------------------------------
 #define MAKE_DLINK(OBJCLASS, LISTNAME)	\
@@ -431,11 +426,11 @@ private:																\
 		inline ~DLINK_##LISTNAME()					\
 			{ DEBUG_ASSERTCRASH(!m_prev && !m_next,("destroying dlink still in a list "  #LISTNAME)); } \
 	};																		\
-	DLINK_##LISTNAME m_dlink_##LISTNAME;	
+	DLINK_##LISTNAME m_dlink_##LISTNAME;
 
 // ------------------------------------------------------------------------
 // this is the weird C++ syntax for "call pointer-to-member-function"... see C++ FAQ LITE for details.
-#define callMemberFunction(object,ptrToMember)  ((object).*(ptrToMember)) 
+#define callMemberFunction(object,ptrToMember)  ((object).*(ptrToMember))
 
 // ------------------------------------------------------------------------
 template<class OBJCLASS>
@@ -443,29 +438,29 @@ class DLINK_ITERATOR
 {
 public:
 	// this is the weird C++ syntax for "pointer-to-member-function"
-	typedef OBJCLASS* (OBJCLASS::*GetNextFunc)() const;	
+	typedef OBJCLASS* (OBJCLASS::*GetNextFunc)() const;
 private:
 	OBJCLASS* m_cur;
 	GetNextFunc m_getNextFunc;	// this is the weird C++ syntax for "pointer-to-member-function"
 public:
-	DLINK_ITERATOR(OBJCLASS* cur, GetNextFunc getNextFunc) : m_cur(cur), m_getNextFunc(getNextFunc) 
-	{ 
+	DLINK_ITERATOR(OBJCLASS* cur, GetNextFunc getNextFunc) : m_cur(cur), m_getNextFunc(getNextFunc)
+	{
 	}
-	
+
 	void advance()
-	{ 
+	{
 		if (m_cur)
 			m_cur = callMemberFunction(*m_cur, m_getNextFunc)();
 	}
-	
+
 	Bool done() const
-	{ 
-		return m_cur == NULL; 
+	{
+		return m_cur == NULL;
 	}
 
-	OBJCLASS* cur() const 
-	{ 
-		return m_cur; 
+	OBJCLASS* cur() const
+	{
+		return m_cur;
 	}
 
 };
@@ -484,6 +479,7 @@ enum WhichTurretType CPP_11(: Int)
 
 // ------------------------------------------------------------------------
 // this normalizes an angle to the range -PI...PI.
+// TheSuperHackers @todo DO NOT USE THIS FUNCTION! Use WWMath::Normalize_Angle instead. Delete this.
 extern Real normalizeAngle(Real angle);
 
 // ------------------------------------------------------------------------
@@ -497,14 +493,13 @@ inline Real stdAngleDiff(Real a1, Real a2)
 // NOTE NOTE NOTE: Keep TheRelationShipNames in sync with this enum
 enum Relationship CPP_11(: Int)
 {
-	ENEMIES = 0,
+	ENEMIES,
 	NEUTRAL,
-	ALLIES
+	ALLIES,
+
+	RELATIONSHIP_COUNT
 };
 
 
 // TheRelationShipNames is defined in Common/GameCommon.cpp
-extern const char *TheRelationshipNames[];
-
-#endif // _GAMECOMMON_H_
-
+extern const char *const TheRelationshipNames[];
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h b/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h
index 087e0e8aba7..62d3502eed1 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h
@@ -28,14 +28,9 @@
 
 #pragma once
 
-#ifndef _GAME_ENGINE_H_
-#define _GAME_ENGINE_H_
-
 #include "Common/SubsystemInterface.h"
 #include "Common/GameType.h"
 
-#define DEFAULT_MAX_FPS		45
-
 // forward declarations
 class AudioManager;
 class GameLogic;
@@ -55,26 +50,23 @@ class Radar;
 class WebBrowser;
 class ParticleSystemManager;
 
-/**
- * The implementation of the game engine
- */
 class GameEngine : public SubsystemInterface
 {
-
 public:
 
 	GameEngine( void );
 	virtual ~GameEngine();
 
 	virtual void init( void );								///< Init engine by creating client and logic
-	virtual void init( int argc, char *argv[] );			///< Init engine by creating client and logic
 	virtual void reset( void );								///< reset system to starting state
 	virtual void update( void );							///< per frame update
 
 	virtual void execute( void );											/**< The "main loop" of the game engine.
 																								 It will not return until the game exits. */
-	virtual void setFramesPerSecondLimit( Int fps );	///< Set the maximum rate engine updates are allowed to occur
-	virtual Int  getFramesPerSecondLimit( void );			///< Get maxFPS.  Not inline since it is called from another lib.
+
+	static Bool isTimeFrozen(); ///< Returns true if a script has frozen time.
+	static Bool isGameHalted(); ///< Returns true if the game is paused or the network is stalling.
+
 	virtual void setQuitting( Bool quitting );				///< set quitting status
 	virtual Bool getQuitting(void);						///< is app getting ready to quit.
 
@@ -85,6 +77,12 @@ class GameEngine : public SubsystemInterface
 
 protected:
 
+	virtual void resetSubsystems( void );
+
+	Bool canUpdateGameLogic();
+	Bool canUpdateNetworkGameLogic();
+	Bool canUpdateRegularGameLogic();
+
 	virtual FileSystem *createFileSystem( void );								///< Factory for FileSystem classes
 	virtual LocalFileSystem *createLocalFileSystem( void ) = 0;	///< Factory for LocalFileSystem classes
 	virtual ArchiveFileSystem *createArchiveFileSystem( void ) = 0;	///< Factory for ArchiveFileSystem classes
@@ -99,11 +97,12 @@ class GameEngine : public SubsystemInterface
 	virtual ParticleSystemManager* createParticleSystemManager( void ) = 0;
 	virtual AudioManager *createAudioManager( void ) = 0;				///< Factory for Audio Manager
 
-	Int m_maxFPS;																									///< Maximum frames per second allowed
-  Bool m_quitting;  ///< true when we need to quit the game
-	Bool m_isActive;	///< app has OS focus.
+	Real m_logicTimeAccumulator; ///< Frame time accumulated towards submitting a new logic frame
 
+	Bool m_quitting; ///< true when we need to quit the game
+	Bool m_isActive; ///< app has OS focus.
 };
+
 inline void GameEngine::setQuitting( Bool quitting ) { m_quitting = quitting; }
 inline Bool GameEngine::getQuitting(void) { return m_quitting; }
 
@@ -114,6 +113,4 @@ extern GameEngine *TheGameEngine;
 extern GameEngine *CreateGameEngine( void );
 
 /// The entry point for the game system
-extern void GameMain( int argc, char *argv[] );
-
-#endif // _GAME_ENGINE_H_
+extern Int GameMain();
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h b/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h
index 23462eade48..3eb6c8b3c53 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h
@@ -33,23 +33,26 @@
 
 #pragma once
 
-#ifndef _GAME_LOD_H_
-#define _GAME_LOD_H_
-
 enum ParticlePriorityType CPP_11(: Int);
 
-#define MAX_LOD_PRESETS_PER_LEVEL	32	//number of hardware configs preset for each low,medium,high
+#define MAX_LOD_PRESETS_PER_LEVEL	32	//number of hardware configs preset for each low,medium,high,veryhigh
 #define MAX_BENCH_PROFILES	16
 
 //Make sure this enum stays in sync with GameLODNames[]
 enum StaticGameLODLevel CPP_11(: Int)
 {
 	STATIC_GAME_LOD_UNKNOWN=-1,
+
 	STATIC_GAME_LOD_LOW,
 	STATIC_GAME_LOD_MEDIUM,
 	STATIC_GAME_LOD_HIGH,
+	STATIC_GAME_LOD_VERY_HIGH,
+
 	STATIC_GAME_LOD_CUSTOM,	//make sure this remains last!
-	STATIC_GAME_LOD_COUNT
+
+	STATIC_GAME_LOD_COUNT,
+	STATIC_GAME_LOD_FIRST = 0,
+	STATIC_GAME_LOD_LAST = STATIC_GAME_LOD_CUSTOM - 1,
 };
 
 enum DynamicGameLODLevel CPP_11(: Int)
@@ -69,6 +72,8 @@ enum CpuType CPP_11(: Int)
 	P3,
 	P4,
 	K7,
+
+	CPU_MAX
 };
 
 //Keep this in sync with VideoNames in Gamelod.cpp
@@ -112,7 +117,7 @@ struct StaticGameLODInfo
 	Int m_maxTankTrackFadeDelay;	///<maximum amount of time a tank track segment remains visible.
 	Bool m_useBuildupScaffolds;		///<draw scaffold during structure building.
 	Bool m_useTreeSway;		///<sway trees to simulate wind.
-	Bool m_useEmissiveNightMaterials; ///<perform second lighting pass on night buildings. 
+	Bool m_useEmissiveNightMaterials; ///<perform second lighting pass on night buildings.
 	Bool m_useHeatEffects;			///<draw heat distortion effects (i.e Microwave Tank).
 	Int m_textureReduction;	///<reduce texture resolution by dividing in half n times.
 	Bool m_useFpsLimit;	///<don't lock fps to 30hz
@@ -162,15 +167,13 @@ class GameLODManager
 
 	const char *getStaticGameLODLevelName(StaticGameLODLevel level);
 	const char *getDynamicGameLODLevelName(DynamicGameLODLevel level);
-	StaticGameLODLevel findStaticLODLevel(void);	///< calculate the optimal static LOD level for this system.
+	StaticGameLODLevel getRecommendedStaticLODLevel(void);	///< calculate the optimal static LOD level for this system.
 	Bool setStaticLODLevel(StaticGameLODLevel level);	///< set the current static LOD level.
 	StaticGameLODLevel getStaticLODLevel(void) { return m_currentStaticLOD;}
 	DynamicGameLODLevel findDynamicLODLevel(Real averageFPS);	///<given an average fps, return the optimal dynamic LOD.
 	Bool setDynamicLODLevel(DynamicGameLODLevel level);	///< set the current dynamic LOD level.
 	DynamicGameLODLevel getDynamicLODLevel(void) { return m_currentDynamicLOD;}
 	void init(void);	///<initialize tables of preset LOD's.
-	void setCurrentTextureReduction(Int val) {m_currentTextureReduction = val;}
-	Int getCurrentTextureReduction(void) {return m_currentTextureReduction;}
 	Int getStaticGameLODIndex(AsciiString name);
 	Int getDynamicGameLODIndex(AsciiString name);
 	inline Bool isParticleSkipped(void);
@@ -192,9 +195,11 @@ class GameLODManager
 	BenchProfile m_benchProfiles[MAX_BENCH_PROFILES];
 
 protected:
+	void initStaticLODLevels();
 	void applyStaticLODLevel(StaticGameLODLevel level);
 	void applyDynamicLODLevel(DynamicGameLODLevel level);
 	void refreshCustomStaticLODLevel(void);	///<grabs current globaldata values and makes them the custom detail setting.
+	StaticGameLODLevel getRecommendedTextureLODLevel();
 
 	static const FieldParse m_staticGameLODFieldParseTable[];
 	StaticGameLODLevel m_currentStaticLOD;		///< current value of static LOD.
@@ -214,13 +219,12 @@ class GameLODManager
 	StaticGameLODLevel m_idealDetailLevel;
 	ChipsetType m_videoChipType;
 	CpuType m_cpuType;
-	Int m_numRAM;
+	MemValueType m_numRAM;
 	Int m_cpuFreq;
 	Real m_intBenchIndex;
 	Real m_floatBenchIndex;
 	Real m_memBenchIndex;
 	Real m_compositeBenchIndex;
-	Int m_currentTextureReduction;
 	Int m_reallyLowMHz;
 };
 
@@ -250,4 +254,3 @@ ParticlePriorityType GameLODManager::getMinDynamicParticleSkipPriority(void)
 }
 
 extern GameLODManager *TheGameLODManager;
-#endif // _GAME_LOD_H_
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h b/GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h
deleted file mode 100644
index 557d4ffbc7b..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h
+++ /dev/null
@@ -1,918 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Memory.h 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C); 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  Memory.h
-//
-// Created:    Steven Johnson, August 2001
-//
-// Desc:       Memory manager
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef _GAME_MEMORY_H_ 
-#define _GAME_MEMORY_H_
-
-// Turn off memory pool checkpointing for now.
-#ifndef DISABLE_MEMORYPOOL_CHECKPOINTING
-	#define DISABLE_MEMORYPOOL_CHECKPOINTING 1
-#endif
-
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(MEMORYPOOL_DEBUG_CUSTOM_NEW) && !defined(DISABLE_MEMORYPOOL_DEBUG_CUSTOM_NEW)
-	#define MEMORYPOOL_DEBUG_CUSTOM_NEW
-#endif
-
-//#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL)) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
-#if (defined(RTS_DEBUG)) && !defined(MEMORYPOOL_DEBUG) && !defined(DISABLE_MEMORYPOOL_DEBUG)
-	#define MEMORYPOOL_DEBUG
-#endif
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-#include <new.h>
-#include <stdio.h>
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-	#include <malloc.h>
-#endif
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-
-#include "Lib/BaseType.h"
-#include "Common/Debug.h"
-#include "Common/Errors.h"
-
-// MACROS //////////////////////////////////////////////////////////////////
-
-#ifdef MEMORYPOOL_DEBUG
-
-	// by default, enable free-block-retention for checkpointing in debug mode
-	#if !defined(DISABLE_MEMORYPOOL_CHECKPOINTING) || DISABLE_MEMORYPOOL_CHECKPOINTING == 0
-		#define MEMORYPOOL_CHECKPOINTING
-	#endif
-
-	// by default, enable bounding walls in debug mode (unless we have specifically disabled them)
-	#ifndef DISABLE_MEMORYPOOL_BOUNDINGWALL
-		#define MEMORYPOOL_BOUNDINGWALL
-	#endif
-
-	#if !defined(MEMORYPOOL_STACKTRACE) && !defined(DISABLE_MEMORYPOOL_STACKTRACE)
-		#define MEMORYPOOL_STACKTRACE
-	#endif
-
-	// flags for the memory-report options.
-	enum 
-	{
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-		// ------------------------------------------------------
-		// you usually won't use the _REPORT bits directly; see below for more convenient combinations.
-
-		// you must set at least one of the 'allocate' bits.
-		_REPORT_CP_ALLOCATED_BEFORE			= 0x0001,
-		_REPORT_CP_ALLOCATED_BETWEEN		= 0x0002,
-		_REPORT_CP_ALLOCATED_DONTCARE		= (_REPORT_CP_ALLOCATED_BEFORE|_REPORT_CP_ALLOCATED_BETWEEN),
-
-		// you must set at least one of the 'freed' bits.
-		_REPORT_CP_FREED_BEFORE					= 0x0010,
-		_REPORT_CP_FREED_BETWEEN				= 0x0020,
-		_REPORT_CP_FREED_NEVER					= 0x0040,	// ie, still in existence
-		_REPORT_CP_FREED_DONTCARE				= (_REPORT_CP_FREED_BEFORE|_REPORT_CP_FREED_BETWEEN|_REPORT_CP_FREED_NEVER),
-		// ------------------------------------------------------
-#endif // MEMORYPOOL_CHECKPOINTING
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-		/** display the stacktrace for allocation location for all blocks found. 
-			this bit may be mixed-n-matched with any other flag.
-		*/
-		REPORT_CP_STACKTRACE		= 0x0100,
-#endif
-		
-		/** display stats for each pool, in addition to each block.
-			(this is useful for finding suitable allocation counts for the pools.)
-			this bit may be mixed-n-matched with any other flag.
-		*/
-		REPORT_POOLINFO					= 0x0200, 
-
-		/** report on the overall memory situation (including all pools and dma's).
-			this bit may be mixed-n-matched with any other flag.
-		*/
-		REPORT_FACTORYINFO			= 0x0400,	
-
-		/** report on pools that have overflowed their initial allocation.
-			this bit may be mixed-n-matched with any other flag.
-		*/
-		REPORT_POOL_OVERFLOW		= 0x0800,	
-
-		/** simple-n-cheap leak checking */
-		REPORT_SIMPLE_LEAKS			= 0x1000,
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-		/** report on blocks that were allocated between the checkpoints.
-		 (don't care if they were freed or not.)
-		*/
-		REPORT_CP_ALLOCATES	= (_REPORT_CP_ALLOCATED_BETWEEN | _REPORT_CP_FREED_DONTCARE),	
-
-		/** report on blocks that were freed between the checkpoints.
-		 (don't care when they were allocated.)
-		*/
-		REPORT_CP_FREES			= (_REPORT_CP_ALLOCATED_DONTCARE | _REPORT_CP_FREED_BETWEEN),	
-
-		/** report on blocks that were allocated between the checkpoints, and still exist
-		 (note that this reports *potential* leaks -- some such blocks may be desired)
-		*/
-		REPORT_CP_LEAKS			= (_REPORT_CP_ALLOCATED_BETWEEN | _REPORT_CP_FREED_NEVER),
-
-		/** report on blocks that existed before checkpoint #1 and still exist now.
-		*/
-		REPORT_CP_LONGTERM		= (_REPORT_CP_ALLOCATED_BEFORE | _REPORT_CP_FREED_NEVER),
-		
-		/** report on blocks that were allocated-and-freed between the checkpoints.
-		*/
-		REPORT_CP_TRANSIENT		= (_REPORT_CP_ALLOCATED_BETWEEN | _REPORT_CP_FREED_BETWEEN),
-
-		/** report on all blocks that currently exist
-		*/
-		REPORT_CP_EXISTING		= (_REPORT_CP_ALLOCATED_BEFORE | _REPORT_CP_ALLOCATED_BETWEEN | _REPORT_CP_FREED_NEVER),
-
-		/** report on all blocks that have ever existed (!) (or at least, since the last call
-			to debugResetCheckpoints)
-		*/
-		REPORT_CP_ALL					= (_REPORT_CP_ALLOCATED_DONTCARE | _REPORT_CP_FREED_DONTCARE)
-#endif // MEMORYPOOL_CHECKPOINTING
-		
-	};
-
-#endif // MEMORYPOOL_DEBUG
-
-// TheSuperHackers @compile xezon 30/03/2025 Define DISABLE_GAMEMEMORY to use a null implementations for Game Memory.
-// Useful for address sanitizer checks and other investigations.
-// Is included below the macros so that memory pool debug code can still be used.
-#ifdef DISABLE_GAMEMEMORY
-#include "GameMemoryNull.h"
-#else
-
-#ifdef MEMORYPOOL_DEBUG
-
-	#define DECLARE_LITERALSTRING_ARG1										const char * debugLiteralTagString
-	#define PASS_LITERALSTRING_ARG1												debugLiteralTagString
-	#define DECLARE_LITERALSTRING_ARG2										, const char * debugLiteralTagString
-	#define PASS_LITERALSTRING_ARG2												, debugLiteralTagString
-
-	#define MP_LOC_SUFFIX																/*" [" DEBUG_FILENLINE "]"*/
-
-	#define allocateBlock(ARGLITERAL)										allocateBlockImplementation(ARGLITERAL MP_LOC_SUFFIX)
-	#define allocateBlockDoNotZero(ARGLITERAL)					allocateBlockDoNotZeroImplementation(ARGLITERAL MP_LOC_SUFFIX)
-	#define allocateBytes(ARGCOUNT,ARGLITERAL)					allocateBytesImplementation(ARGCOUNT, ARGLITERAL MP_LOC_SUFFIX)
-	#define allocateBytesDoNotZero(ARGCOUNT,ARGLITERAL)	allocateBytesDoNotZeroImplementation(ARGCOUNT, ARGLITERAL MP_LOC_SUFFIX)
-	#define newInstanceDesc(ARGCLASS,ARGLITERAL)				new(ARGCLASS::ARGCLASS##_GLUE_NOT_IMPLEMENTED, ARGLITERAL MP_LOC_SUFFIX) ARGCLASS
-	#define newInstance(ARGCLASS)												new(ARGCLASS::ARGCLASS##_GLUE_NOT_IMPLEMENTED, __FILE__) ARGCLASS
-
-#else
-
-	#define DECLARE_LITERALSTRING_ARG1
-	#define PASS_LITERALSTRING_ARG1	
-	#define DECLARE_LITERALSTRING_ARG2
-	#define PASS_LITERALSTRING_ARG2
-
-	#define allocateBlock(ARGLITERAL)										allocateBlockImplementation()
-	#define allocateBlockDoNotZero(ARGLITERAL)					allocateBlockDoNotZeroImplementation()
-	#define allocateBytes(ARGCOUNT,ARGLITERAL)					allocateBytesImplementation(ARGCOUNT)
-	#define allocateBytesDoNotZero(ARGCOUNT,ARGLITERAL)	allocateBytesDoNotZeroImplementation(ARGCOUNT)
-	#define newInstanceDesc(ARGCLASS,ARGLITERAL)				new(ARGCLASS::ARGCLASS##_GLUE_NOT_IMPLEMENTED) ARGCLASS
-	#define newInstance(ARGCLASS)												new(ARGCLASS::ARGCLASS##_GLUE_NOT_IMPLEMENTED) ARGCLASS
-
-#endif
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-
-class MemoryPoolSingleBlock;
-class MemoryPoolBlob;
-class MemoryPool;
-class MemoryPoolFactory;
-class DynamicMemoryAllocator;
-class BlockCheckpointInfo;
-
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-/**
-	This class is purely a convenience used to pass optional arguments to initMemoryManager(),
-	and by extension, to createDynamicMemoryAllocator(). You can specify how many sub-pools you
-	want, what size each is, what the allocation counts are to be, etc. Most apps will
-	construct an array of these to pass to initMemoryManager() and never use it elsewhere.
-*/
-struct PoolInitRec
-{
-	const char *poolName;					///< name of the pool; by convention, "dmaPool_XXX" where XXX is allocationSize
-	Int allocationSize;						///< size, in bytes, of the pool.
-	Int initialAllocationCount;		///< initial number of blocks to allocate.
-	Int overflowAllocationCount;	///< when the pool runs out of space, allocate more blocks in this increment
-};
-
-enum 
-{
-	MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS = 8	///< The max number of subpools allowed in a DynamicMemoryAllocator
-};
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-// ----------------------------------------------------------------------------
-/**
-	This class exists purely for coding convenience, and should never be used by external code.
-	It simply allows MemoryPool and DynamicMemoryAllocator to share checkpoint-related
-	code in a seamless way.
-*/
-class Checkpointable
-{
-private:
-	BlockCheckpointInfo	*m_firstCheckpointInfo;		///< head of the linked list of checkpoint infos for this pool/dma
-	Bool								m_cpiEverFailed;					///< flag to detect if we ran out of memory accumulating checkpoint info.
-
-protected:
-
-	Checkpointable();
-	~Checkpointable();
-
-	/// create a new checkpoint info and add it to the list.
-	BlockCheckpointInfo *debugAddCheckpointInfo(
-		const char *debugLiteralTagString,
-		Int allocCheckpoint,
-		Int blockSize
-	);
-
-public:
-	/// dump a checkpoint report to logfile
-	void debugCheckpointReport(Int flags, Int startCheckpoint, Int endCheckpoint, const char *poolName);
-	/// reset all the checkpoints for this pool/dma
-	void debugResetCheckpoints();
-};
-#endif
-
-// ----------------------------------------------------------------------------
-/**
-	A MemoryPool provides a way to efficiently allocate objects of the same (or similar)
-	size. We allocate large a large chunk of memory (a "blob") and subdivide it into
-	even-size chunks, doling these out as needed. If the first blob gets full, we allocate
-	additional blobs as necessary. A given pool can allocate blocks of only one size;
-	if you need a different size, you should use a different pool.
-*/
-class MemoryPool 
-#ifdef MEMORYPOOL_CHECKPOINTING
-	: public Checkpointable
-#endif
-{
-private:
-
-	MemoryPoolFactory	*m_factory;									///< the factory that created us
-	MemoryPool				*m_nextPoolInFactory;				///< linked list node, managed by factory
-	const char				*m_poolName;								///< name of this pool. (literal string; must not be freed)
-	Int								m_allocationSize;						///< size of the blocks allocated by this pool, in bytes
-	Int								m_initialAllocationCount;		///< number of blocks to be allocated in initial blob
-	Int								m_overflowAllocationCount;	///< number of blocks to be allocated in any subsequent blob(s)
-	Int								m_usedBlocksInPool;					///< total number of blocks in use in the pool.
-	Int								m_totalBlocksInPool;				///< total number of blocks in all blobs of this pool (used or not).
-	Int								m_peakUsedBlocksInPool;			///< high-water mark of m_usedBlocksInPool
-	MemoryPoolBlob		*m_firstBlob;								///< head of linked list: first blob for this pool.
-	MemoryPoolBlob		*m_lastBlob;								///< tail of linked list: last blob for this pool. (needed for efficiency)
-	MemoryPoolBlob		*m_firstBlobWithFreeBlocks;	///< first blob in this pool that has at least one unallocated block.
-
-private:
-	/// create a new blob with the given number of blocks.
-	MemoryPoolBlob* createBlob(Int allocationCount);
-
-	/// destroy a blob.
-	Int freeBlob(MemoryPoolBlob *blob);
-
-public:
-
-	// 'public' funcs that are really only for use by MemoryPoolFactory
-	MemoryPool *getNextPoolInList();					///< return next pool in linked list
-	void addToList(MemoryPool **pHead);				///< add this pool to head of the linked list
-	void removeFromList(MemoryPool **pHead);	///< remove this pool from the linked list
-	#ifdef MEMORYPOOL_DEBUG
-		static void debugPoolInfoReport( MemoryPool *pool, FILE *fp = NULL );	///< dump a report about this pool to the logfile
-		const char *debugGetBlockTagString(void *pBlock);		///< return the tagstring for the given block (assumed to belong to this pool)
-		void debugMemoryVerifyPool();												///< perform internal consistency check on this pool.
-		Int debugPoolReportLeaks( const char* owner );
-	#endif
-	#ifdef MEMORYPOOL_CHECKPOINTING
-		void debugResetCheckpoints();												///< throw away all checkpoint information for this pool.
-	#endif
-
-public:
-
-	MemoryPool();
-
-	/// initialize the given memory pool.
-	void init(MemoryPoolFactory *factory, const char *poolName, Int allocationSize, Int initialAllocationCount, Int overflowAllocationCount);
-
-	~MemoryPool();
-
-	/// allocate a block from this pool. (don't call directly; use allocateBlock() macro)
-	void *allocateBlockImplementation(DECLARE_LITERALSTRING_ARG1);
-
-	/// same as allocateBlockImplementation, but memory returned is not zeroed
-	void *allocateBlockDoNotZeroImplementation(DECLARE_LITERALSTRING_ARG1);
-	
-	/// free the block. it is OK to pass null.
-	void freeBlock(void *pMem);
-
-	/// return the factory that created (and thus owns) this pool.
-	MemoryPoolFactory *getOwningFactory();
-
-	/// return the name of this pool. the result is a literal string and must not be freed.
-	const char *getPoolName();
-
-	/// return the block allocation size of this pool.
-	Int getAllocationSize();
-
-	/// return the number of free (available) blocks in this pool.
-	Int getFreeBlockCount();
-
-	/// return the number of blocks in use in this pool.
-	Int getUsedBlockCount();
-
-	/// return the total number of blocks in this pool. [ == getFreeBlockCount() + getUsedBlockCount() ]
-	Int getTotalBlockCount();
-
-	/// return the high-water mark for getUsedBlockCount()
-	Int getPeakBlockCount();
-
-	/// return the initial allocation count for this pool
-	Int getInitialBlockCount();
-
-	Int countBlobsInPool();
-
-	/// if this pool has any empty blobs, return them to the system.
-	Int releaseEmpties();
-
-	/// destroy all blocks and blobs in this pool.
-	void reset();
-
-	#ifdef MEMORYPOOL_DEBUG
-		/// return true iff this block was allocated by this pool.
-		Bool debugIsBlockInPool(void *pBlock);
-	#endif
-};
-
-// ----------------------------------------------------------------------------
-/**
-	The DynamicMemoryAllocator class is used to handle unpredictably-sized
-	allocation requests. It basically allocates a number of (private) MemoryPools,
-	then routes request to the smallest-size pool that will satisfy the request.
-	(Requests too large for any of the pool are routed to the system memory allocator.)
-	You should normally use this in place of malloc/free or (global) new/delete.
-*/
-class DynamicMemoryAllocator 
-#ifdef MEMORYPOOL_CHECKPOINTING
-	: public Checkpointable
-#endif
-{
-private:
-	MemoryPoolFactory					*m_factory;						///< the factory that created us
-	DynamicMemoryAllocator		*m_nextDmaInFactory;	///< linked list node, managed by factory
-	Int												m_numPools;						///< number of subpools (up to MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS)
-	Int												m_usedBlocksInDma;		///< total number of blocks allocated, from subpools and "raw"
-	MemoryPool								*m_pools[MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS];	///< the subpools
-	MemoryPoolSingleBlock			*m_rawBlocks;					///< linked list of "raw" blocks allocated directly from system
-
-	/// return the best pool for the given allocSize, or null if none are suitable
-	MemoryPool *findPoolForSize(Int allocSize);
-
-public:
-
-	// 'public' funcs that are really only for use by MemoryPoolFactory
-
-	DynamicMemoryAllocator *getNextDmaInList();						///< return next dma in linked list
-	void addToList(DynamicMemoryAllocator **pHead);				///< add this dma to the list
-	void removeFromList(DynamicMemoryAllocator **pHead);	///< remove this dma from the list
-	#ifdef MEMORYPOOL_DEBUG
-		Int debugCalcRawBlockBytes(Int *numBlocks);												///< calculate the number of bytes in "raw" (non-subpool) blocks
-		void debugMemoryVerifyDma();												///< perform internal consistency check
-		const char *debugGetBlockTagString(void *pBlock);		///< return the tagstring for the given block (assumed to belong to this dma)
-		void debugDmaInfoReport( FILE *fp = NULL );					///< dump a report about this pool to the logfile
-		Int debugDmaReportLeaks();
-	#endif
-	#ifdef MEMORYPOOL_CHECKPOINTING
-		void debugResetCheckpoints();												///< toss all checkpoint information
-	#endif
-
-public:
-
-	DynamicMemoryAllocator();
-
-	/// initialize the dma. pass 0/null for numSubPool/parms to get some reasonable default subpools.
-	void init(MemoryPoolFactory *factory, Int numSubPools, const PoolInitRec pParms[]);
-	
-	~DynamicMemoryAllocator();
-
-	/// allocate bytes from this pool. (don't call directly; use allocateBytes() macro)
-	void *allocateBytesImplementation(Int numBytes DECLARE_LITERALSTRING_ARG2);
-
-	/// like allocateBytesImplementation, but zeroes the memory before returning
-	void *allocateBytesDoNotZeroImplementation(Int numBytes DECLARE_LITERALSTRING_ARG2);
-
-#ifdef MEMORYPOOL_DEBUG
-	void debugIgnoreLeaksForThisBlock(void* pBlockPtr);
-#endif
-
-	/// free the bytes. (assumes allocated by this dma.)
-	void freeBytes(void* pMem);
-
-	/**
-		return the actual number of bytes that would be allocated 
-		if you tried to allocate the given size. (It will generally be slightly
-		larger than you request.) This lets you use extra space if you're gonna get it anyway...
-		The idea is that you will call this before doing a memory allocation, to see if
-		you got any extra "bonus" space.
-	*/
-	Int getActualAllocationSize(Int numBytes);
-
-	/// destroy all allocations performed by this DMA.
-	void reset();
-
-	Int getDmaMemoryPoolCount() const { return m_numPools; }
-	MemoryPool* getNthDmaMemoryPool(Int i) const { return m_pools[i]; }
-
-	#ifdef MEMORYPOOL_DEBUG
-
-		/// return true iff this block was allocated by this dma
-		Bool debugIsBlockInDma(void *pBlock);
-
-		/// return true iff the pool is a subpool of this dma
-		Bool debugIsPoolInDma(MemoryPool *pool);
-
-	#endif	// MEMORYPOOL_DEBUG
-};
-
-// ----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-enum { MAX_SPECIAL_USED = 256 };
-#endif
-
-// ----------------------------------------------------------------------------
-/**
-	The class that manages all the MemoryPools and DynamicMemoryAllocators.
-	Usually you will create exactly one of these (TheMemoryPoolFactory)
-	and use it for everything.
-*/
-class MemoryPoolFactory
-{
-private:
-	MemoryPool								*m_firstPoolInFactory;		///< linked list of pools
-	DynamicMemoryAllocator		*m_firstDmaInFactory;			///< linked list of dmas
-#ifdef MEMORYPOOL_CHECKPOINTING
-	Int												m_curCheckpoint;					///< most recent checkpoint value
-#endif
-#ifdef MEMORYPOOL_DEBUG
-	Int												m_usedBytes;							///< total bytes in use
-	Int												m_physBytes;							///< total bytes allocated to all pools (includes unused blocks)
-	Int												m_peakUsedBytes;					///< high-water mark of m_usedBytes
-	Int												m_peakPhysBytes;					///< high-water mark of m_physBytes
-	Int												m_usedBytesSpecial[MAX_SPECIAL_USED];
-	Int												m_usedBytesSpecialPeak[MAX_SPECIAL_USED];
-	Int												m_physBytesSpecial[MAX_SPECIAL_USED];
-	Int												m_physBytesSpecialPeak[MAX_SPECIAL_USED];
-#endif
-
-public:
-
-		// 'public' funcs that are really only for use by MemoryPool and friends
-	#ifdef MEMORYPOOL_DEBUG
-		/// adjust the usedBytes and physBytes variables by the given amoun ts.
-		void adjustTotals(const char* tagString, Int usedDelta, Int physDelta);
-	#endif
-	#ifdef MEMORYPOOL_CHECKPOINTING
-		/// return the current checkpoint value.
-		Int getCurCheckpoint() { return m_curCheckpoint; }
-	#endif
-
-public:
-	
-	MemoryPoolFactory();
-	void init();
-	~MemoryPoolFactory();
-
-	/// create a new memory pool with the given settings. if a pool with the given name already exists, return it.
-	MemoryPool *createMemoryPool(const PoolInitRec *parms);
-
-	/// overloaded version of createMemoryPool with explicit parms.
-	MemoryPool *createMemoryPool(const char *poolName, Int allocationSize, Int initialAllocationCount, Int overflowAllocationCount);
-	
-	/// return the pool with the given name. if no such pool exists, return null.
-	MemoryPool *findMemoryPool(const char *poolName);
-
-	/// destroy the given pool.
-	void destroyMemoryPool(MemoryPool *pMemoryPool);
-
-	/// create a DynamicMemoryAllocator with subpools with the given parms.
-	DynamicMemoryAllocator *createDynamicMemoryAllocator(Int numSubPools, const PoolInitRec pParms[]);
-
-	/// destroy the given DynamicMemoryAllocator.
-	void destroyDynamicMemoryAllocator(DynamicMemoryAllocator *dma);
-
-	/// destroy the contents of all pools and dmas. (the pools and dma's are not destroyed, just reset)
-	void reset();
-
-	void memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead = NULL );
-
-	#ifdef MEMORYPOOL_DEBUG
-
-		/// perform internal consistency checking
-		void debugMemoryVerify();
-
-		/// return true iff the block was allocated by any pool or dma owned by this factory.
-		Bool debugIsBlockInAnyPool(void *pBlock);
-
-		/// return the tag string for the block. 
-		const char *debugGetBlockTagString(void *pBlock);
-
-		/// dump a report with the given options to the logfile.
-		void debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp = NULL );
-
-		void debugSetInitFillerIndex(Int index);
-
-	#endif
-	#ifdef MEMORYPOOL_CHECKPOINTING
-		
-		/// set a new checkpoint.
-		Int debugSetCheckpoint();
-
-		/// reset all checkpoint information.
-		void debugResetCheckpoints();
-
-	#endif
-};
-
-// how many bytes are we allowed to 'waste' per pool allocation before the debug code starts yelling at us...
-#define MEMORY_POOL_OBJECT_ALLOCATION_SLOP	16
-
-// ----------------------------------------------------------------------------
-#define GCMP_FIND(ARGCLASS, ARGPOOLNAME) \
-private: \
-	static MemoryPool *getClassMemoryPool() \
-	{ \
-		/* \
-			Note that this static variable will be initialized exactly once: the first time \
-			control flows over this section of code. This allows us to neatly resolve the \
-			order-of-execution problem for static variables, ensuring this is not executed \
-			prior to the initialization of TheMemoryPoolFactory. \
-		*/ \
-		DEBUG_ASSERTCRASH(TheMemoryPoolFactory, ("TheMemoryPoolFactory is NULL\n")); \
-		static MemoryPool *The##ARGCLASS##Pool = TheMemoryPoolFactory->findMemoryPool(ARGPOOLNAME); \
-		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool, ("Pool \"%s\" not found (did you set it up in initMemoryPools?)\n", ARGPOOLNAME)); \
-		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool->getAllocationSize() >= sizeof(ARGCLASS), ("Pool \"%s\" is too small for this class (currently %d, need %d)\n", ARGPOOLNAME, The##ARGCLASS##Pool->getAllocationSize(), sizeof(ARGCLASS))); \
-		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool->getAllocationSize() <= sizeof(ARGCLASS)+MEMORY_POOL_OBJECT_ALLOCATION_SLOP, ("Pool \"%s\" is too large for this class (currently %d, need %d)\n", ARGPOOLNAME, The##ARGCLASS##Pool->getAllocationSize(), sizeof(ARGCLASS))); \
-		return The##ARGCLASS##Pool; \
-	} 
-
-// ----------------------------------------------------------------------------
-#define GCMP_CREATE(ARGCLASS, ARGPOOLNAME, ARGINITIAL, ARGOVERFLOW) \
-private: \
-	static MemoryPool *getClassMemoryPool() \
-	{ \
-		/* \
-			Note that this static variable will be initialized exactly once: the first time \
-			control flows over this section of code. This allows us to neatly resolve the \
-			order-of-execution problem for static variables, ensuring this is not executed \
-			prior to the initialization of TheMemoryPoolFactory. \
-		*/ \
-		DEBUG_ASSERTCRASH(TheMemoryPoolFactory, ("TheMemoryPoolFactory is NULL\n")); \
-		static MemoryPool *The##ARGCLASS##Pool = TheMemoryPoolFactory->createMemoryPool(ARGPOOLNAME, sizeof(ARGCLASS), ARGINITIAL, ARGOVERFLOW); \
-		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool, ("Pool \"%s\" not found (did you set it up in initMemoryPools?)\n", ARGPOOLNAME)); \
-		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool->getAllocationSize() >= sizeof(ARGCLASS), ("Pool \"%s\" is too small for this class (currently %d, need %d)\n", ARGPOOLNAME, The##ARGCLASS##Pool->getAllocationSize(), sizeof(ARGCLASS))); \
-		DEBUG_ASSERTCRASH(The##ARGCLASS##Pool->getAllocationSize() <= sizeof(ARGCLASS)+MEMORY_POOL_OBJECT_ALLOCATION_SLOP, ("Pool \"%s\" is too large for this class (currently %d, need %d)\n", ARGPOOLNAME, The##ARGCLASS##Pool->getAllocationSize(), sizeof(ARGCLASS))); \
-		return The##ARGCLASS##Pool; \
-	} 
-	
-// ----------------------------------------------------------------------------
-#define MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
-protected: \
-	virtual ~ARGCLASS(); \
-public: \
-	enum ARGCLASS##MagicEnum { ARGCLASS##_GLUE_NOT_IMPLEMENTED = 0 }; \
-public: \
-	inline void *operator new(size_t s, ARGCLASS##MagicEnum e DECLARE_LITERALSTRING_ARG2) \
-	{ \
-		DEBUG_ASSERTCRASH(s == sizeof(ARGCLASS), ("The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up correctly")); \
-		return ARGCLASS::getClassMemoryPool()->allocateBlockImplementation(PASS_LITERALSTRING_ARG1); \
-	} \
-public: \
-	/* \
-		Note that this delete operator can't be called directly; it is called \
-		only if the analogous new operator is called, AND the constructor \
-		throws an exception... \
-	*/ \
-	inline void operator delete(void *p, ARGCLASS##MagicEnum e DECLARE_LITERALSTRING_ARG2) \
-	{ \
-		ARGCLASS::getClassMemoryPool()->freeBlock(p); \
-	} \
-protected: \
-	/* \
-		Make normal new and delete protected, so they can't be called by the outside world. \
-		Note that delete is funny, in that it can still be called by the class itself; \
-		this is safe but not recommended, for consistency purposes. More problematically, \
-		it can be called by another class that has declared itself 'friend' to us. \
-		In theory, this shouldn't work, since it may not use the right operator-delete, \
-		and thus the wrong memory pool; in practice, it seems the right delete IS called \
-		in MSVC -- it seems to make operator delete virtual if the destructor is also virtual. \
-		At any rate, this is undocumented behavior as far as I can tell, so we put a big old \
-		crash into operator delete telling people to do the right thing and call deleteInstance \
-		instead -- it'd be nice if we could catch this at compile time, but catching it at \
-		runtime seems to be the best we can do... \
-	*/ \
-	inline void *operator new(size_t s) \
-	{ \
-		DEBUG_CRASH(("This operator new should normally never be called... please use new(char*) instead.")); \
-		DEBUG_ASSERTCRASH(s == sizeof(ARGCLASS), ("The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up correctly")); \
-		throw ERROR_BUG; \
-		return 0; \
-	} \
-	inline void operator delete(void *p) \
-	{ \
-		DEBUG_CRASH(("Please call deleteInstance instead of delete.")); \
-		ARGCLASS::getClassMemoryPool()->freeBlock(p); \
-	} \
-private: \
-	virtual MemoryPool *getObjectMemoryPool() \
-	{ \
-		return ARGCLASS::getClassMemoryPool(); \
-	} \
-public: /* include this line at the end to reset visibility to 'public' */ 
-
-// ----------------------------------------------------------------------------
-#define MEMORY_POOL_GLUE(ARGCLASS, ARGPOOLNAME) \
-	MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
-	GCMP_FIND(ARGCLASS, ARGPOOLNAME)
-
-// ----------------------------------------------------------------------------
-#define MEMORY_POOL_GLUE_WITH_EXPLICIT_CREATE(ARGCLASS, ARGPOOLNAME, ARGINITIAL, ARGOVERFLOW) \
-	MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
-	GCMP_CREATE(ARGCLASS, ARGPOOLNAME, ARGINITIAL, ARGOVERFLOW)
-
-// ----------------------------------------------------------------------------
-#define MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ARGCLASS, ARGPOOLNAME) \
-	MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
-	GCMP_CREATE(ARGCLASS, ARGPOOLNAME, -1, -1)
-
-// ----------------------------------------------------------------------------
-// this is the version for an Abstract Base Class, which will never be instantiated...
-#define MEMORY_POOL_GLUE_ABC(ARGCLASS) \
-protected: \
-	virtual ~ARGCLASS(); \
-public: \
-	enum ARGCLASS##MagicEnum { ARGCLASS##_GLUE_NOT_IMPLEMENTED = 0 }; \
-protected: \
-	inline void *operator new(size_t s, ARGCLASS##MagicEnum e DECLARE_LITERALSTRING_ARG2) \
-	{ \
-		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
-		DEBUG_ASSERTCRASH(s == sizeof(ARGCLASS), ("The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up correctly")); \
-		throw ERROR_BUG; \
-		return 0; \
-	} \
-protected: \
-	inline void operator delete(void *p, ARGCLASS##MagicEnum e DECLARE_LITERALSTRING_ARG2) \
-	{ \
-		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
-	} \
-protected: \
-	inline void *operator new(size_t s) \
-	{ \
-		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
-		DEBUG_ASSERTCRASH(s == sizeof(ARGCLASS), ("The wrong operator new is being called; ensure all objects in the hierarchy have MemoryPoolGlue set up correctly")); \
-		throw ERROR_BUG; \
-		return 0; \
-	} \
-	inline void operator delete(void *p) \
-	{ \
-		DEBUG_CRASH(("this should be impossible to call (abstract base class)")); \
-	} \
-private: \
-	virtual MemoryPool *getObjectMemoryPool() \
-	{ \
-		throw ERROR_BUG; \
-		return 0; \
-	} \
-public: /* include this line at the end to reset visibility to 'public' */ 
-
-
-// ----------------------------------------------------------------------------
-/**
-	This class is provided as a simple and safe way to integrate C++ object allocation
-	into MemoryPool usage. To use it, you must have your class inherit from
-	MemoryPoolObject, then put the macro MEMORY_POOL_GLUE(MyClassName, "MyPoolName")
-	at the start of your class definition. (This does not create the pool itself -- you
-	must create that manually using MemoryPoolFactory::createMemoryPool)
-*/
-class MemoryPoolObject
-{
-protected:
-
-	/** ensure that all destructors are virtual */
-	virtual ~MemoryPoolObject() { }
-
-protected: 
-	inline void *operator new(size_t s) { DEBUG_CRASH(("This should be impossible")); return 0; }
-	inline void operator delete(void *p) { DEBUG_CRASH(("This should be impossible")); }
-
-protected: 
-
-	virtual MemoryPool *getObjectMemoryPool() = 0;
-	
-public: 
-
-	static void deleteInstanceInternal(MemoryPoolObject* mpo) 
-	{	
-		if (mpo)
-		{
-			MemoryPool *pool = mpo->getObjectMemoryPool(); // save this, since the dtor will nuke our vtbl
-			mpo->~MemoryPoolObject();	// it's virtual, so the right one will be called.
-			pool->freeBlock((void *)mpo); 
-		}
-	} 
-};
-
-inline void deleteInstance(MemoryPoolObject* mpo)
-{
-	MemoryPoolObject::deleteInstanceInternal(mpo);
-}
-
-
-// INLINING ///////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-inline MemoryPoolFactory *MemoryPool::getOwningFactory() { return m_factory; }
-inline MemoryPool *MemoryPool::getNextPoolInList() { return m_nextPoolInFactory; }
-inline const char *MemoryPool::getPoolName() { return m_poolName; }
-inline Int MemoryPool::getAllocationSize() { return m_allocationSize; }
-inline Int MemoryPool::getFreeBlockCount() { return getTotalBlockCount() - getUsedBlockCount(); }
-inline Int MemoryPool::getUsedBlockCount() { return m_usedBlocksInPool; }
-inline Int MemoryPool::getTotalBlockCount() { return m_totalBlocksInPool; }
-inline Int MemoryPool::getPeakBlockCount() { return m_peakUsedBlocksInPool; }
-inline Int MemoryPool::getInitialBlockCount() { return m_initialAllocationCount; }
-
-// ----------------------------------------------------------------------------
-inline DynamicMemoryAllocator *DynamicMemoryAllocator::getNextDmaInList() { return m_nextDmaInFactory; }
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
-
-/**
-	Initialize the memory manager. Construct a new MemoryPoolFactory and 
-	DynamicMemoryAllocator and store 'em in the singletons of the relevant
-	names. 
-*/
-extern void initMemoryManager();
-
-/**
-	return true if initMemoryManager() has been called.
-	return false if only preMainInitMemoryManager() has been called.
-*/
-extern Bool isMemoryManagerOfficiallyInited();
-
-/**
-	similar to initMemoryManager, but this should be used if the memory manager must be initialized
-	prior to main() (e.g., from a static constructor). If preMainInitMemoryManager() is called prior
-	to initMemoryManager(), then subsequent calls to either are quietly ignored, AS IS any subsequent
-	call to shutdownMemoryManager() [since there's no safe way to ensure that shutdownMemoryManager
-	will execute after all static destructors].
-
-	(Note: this function is actually not externally visible, but is documented here for clarity.)
-*/
-/* extern void preMainInitMemoryManager(); */
-
-/**
-	Shut down the memory manager. Throw away TheMemoryPoolFactory and 
-	TheDynamicMemoryAllocator.
-*/
-extern void shutdownMemoryManager();
-
-extern MemoryPoolFactory *TheMemoryPoolFactory;
-extern DynamicMemoryAllocator *TheDynamicMemoryAllocator;
-
-/**
-	This function is declared in this header, but is not defined anywhere -- you must provide
-	it in your code. It is called by initMemoryManager() or preMainInitMemoryManager() in order
-	to get the specifics of the subpool for the dynamic memory allocator. (If you just want
-	some defaults, set both return arguments to zero.) The reason for this odd setup is that 
-	we may need to init the memory manager prior to main() [due to static C++ ctors] and
-	this allows us a way to get the necessary parameters.
-*/
-extern void userMemoryManagerGetDmaParms(Int *numSubPools, const PoolInitRec **pParms);
-
-/**
-	This function is declared in this header, but is not defined anywhere -- you must provide
-	it in your code. It is called by initMemoryManager() or preMainInitMemoryManager() in order
-	to initialize the pools to be used. (You can define an empty function if you like.)
-*/
-extern void userMemoryManagerInitPools();
-
-/**
-	This function is declared in this header, but is not defined anywhere -- you must provide
-	it in your code. It is called by createMemoryPool to adjust the allocation size(s) for a 
-	given pool. Note that the counts are in-out parms!
-*/
-extern void userMemoryAdjustPoolSize(const char *poolName, Int& initialAllocationCount, Int& overflowAllocationCount);
-
-#ifdef __cplusplus
-
-#ifndef _OPERATOR_NEW_DEFINED_
-
-	#define _OPERATOR_NEW_DEFINED_
-
-	extern void * __cdecl operator new		(size_t size);
-	extern void __cdecl operator delete		(void *p);
-
-	extern void * __cdecl operator new[]	(size_t size);
-	extern void __cdecl operator delete[]	(void *p);
-
-	// additional overloads to account for VC/MFC funky versions
-	extern void* __cdecl operator new(size_t nSize, const char *, int);
-	extern void __cdecl operator delete(void *, const char *, int);
-
-	extern void* __cdecl operator new[](size_t nSize, const char *, int);
-	extern void __cdecl operator delete[](void *, const char *, int);
-
-#if defined(_MSC_VER) && _MSC_VER < 1300
-	// additional overloads for 'placement new'
-	//inline void* __cdecl operator new							(size_t s, void *p) { return p; }
-	//inline void __cdecl operator delete						(void *, void *p)		{ }
-	inline void* __cdecl operator new[]						(size_t s, void *p) { return p; }
-	inline void __cdecl operator delete[]					(void *, void *p)		{ }
-#endif
-
-#endif
-
-#ifdef MEMORYPOOL_DEBUG_CUSTOM_NEW
-	#define MSGNEW(MSG)		new(MSG, 0)
-	#define NEW						new(__FILE__, __LINE__)
-#else
-	#define MSGNEW(MSG)		new
-	#define NEW						new
-#endif
-
-#endif
-
-class STLSpecialAlloc 
-{
-public:
-	static void* allocate(size_t __n);
-	static void deallocate(void* __p, size_t);
-};
-
-#endif // DISABLE_GAMEMEMORY
-
-
-/**
-	A simple utility class to ensure exception safety; this holds a MemoryPoolObject
-	and deletes it in its destructor. Especially useful for iterators!
-*/
-class MemoryPoolObjectHolder
-{
-private:
-	MemoryPoolObject *m_mpo;
-public:
-	MemoryPoolObjectHolder(MemoryPoolObject *mpo = NULL) : m_mpo(mpo) { }
-	void hold(MemoryPoolObject *mpo) { DEBUG_ASSERTCRASH(!m_mpo, ("already holding")); m_mpo = mpo; }
-	void release() { m_mpo = NULL; }
-	~MemoryPoolObjectHolder() { deleteInstance(m_mpo); }
-};
-
-
-#define EMPTY_DTOR(CLASS) inline CLASS::~CLASS() { }
-
-
-#endif // _GAME_MEMORY_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameMemoryNull.h b/GeneralsMD/Code/GameEngine/Include/Common/GameMemoryNull.h
deleted file mode 100644
index 38de891775f..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameMemoryNull.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 TheSuperHackers
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define allocateBytes(ARGCOUNT,ARGLITERAL)          allocateBytesImplementation(ARGCOUNT)
-#define allocateBytesDoNotZero(ARGCOUNT,ARGLITERAL) allocateBytesDoNotZeroImplementation(ARGCOUNT)
-#define newInstanceDesc(ARGCLASS,ARGLITERAL)        new ARGCLASS
-#define newInstance(ARGCLASS)                       new ARGCLASS
-#define MSGNEW(MSG)                                 new
-#define NEW                                         new
-
-
-/**
-	The DynamicMemoryAllocator class is used to handle unpredictably-sized
-	allocation requests.
-*/
-class DynamicMemoryAllocator
-{
-public:
-
-	/// allocate bytes from this pool. (don't call directly; use allocateBytes() macro)
-	void *allocateBytesImplementation(Int numBytes);
-
-	/// like allocateBytesImplementation, but zeroes the memory before returning
-	void *allocateBytesDoNotZeroImplementation(Int numBytes);
-
-#ifdef MEMORYPOOL_DEBUG
-	void debugIgnoreLeaksForThisBlock(void* pBlockPtr);
-#endif
-
-	/// free the bytes. (assumes allocated by this dma.)
-	void freeBytes(void* pMem);
-
-	/**
-		return the actual number of bytes that would be allocated 
-		if you tried to allocate the given size.
-	*/
-	Int getActualAllocationSize(Int numBytes);
-};
-
-
-/**
-	The class that manages all the MemoryPools and DynamicMemoryAllocators.
-	Usually you will create exactly one of these (TheMemoryPoolFactory)
-	and use it for everything.
-*/
-class MemoryPoolFactory
-{
-public:
-
-	void memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead = NULL );
-
-#ifdef MEMORYPOOL_DEBUG
-
-	void debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp = NULL );
-	void debugSetInitFillerIndex(Int index);
-
-#endif
-};
-
-
-#define MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS) \
-protected: \
-	virtual ~ARGCLASS(); \
-public: /* include this line at the end to reset visibility to 'public' */ 
-
-
-#define MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ARGCLASS, ARGPOOLNAME) \
-	MEMORY_POOL_GLUE_WITHOUT_GCMP(ARGCLASS)
-
-
-// this is the version for an Abstract Base Class, which will never be instantiated...
-#define MEMORY_POOL_GLUE_ABC(ARGCLASS) \
-protected: \
-	virtual ~ARGCLASS(); \
-public: /* include this line at the end to reset visibility to 'public' */ 
-
-
-/**
-	This class is provided as a simple and safe way to integrate C++ object allocation
-	into MemoryPool usage. To use it, you must have your class inherit from
-	MemoryPoolObject, then put the macro MEMORY_POOL_GLUE(MyClassName, "MyPoolName")
-	at the start of your class definition. (This does not create the pool itself -- you
-	must create that manually using MemoryPoolFactory::createMemoryPool)
-*/
-class MemoryPoolObject
-{
-protected:
-
-	/** ensure that all destructors are virtual */
-	virtual ~MemoryPoolObject() { }
-
-public:
-
-	static void deleteInstanceInternal(MemoryPoolObject* mpo) 
-	{
-		delete mpo;
-	}
-};
-
-inline void deleteInstance(MemoryPoolObject* mpo)
-{
-	MemoryPoolObject::deleteInstanceInternal(mpo);
-}
-
-
-/**
-	Initialize the memory manager. Construct a new MemoryPoolFactory and 
-	DynamicMemoryAllocator and store 'em in the singletons of the relevant
-	names. 
-*/
-extern void initMemoryManager();
-
-/**
-	return true if initMemoryManager() has been called.
-	return false if only preMainInitMemoryManager() has been called.
-*/
-extern Bool isMemoryManagerOfficiallyInited();
-
-/**
-	Shut down the memory manager. Throw away TheMemoryPoolFactory and 
-	TheDynamicMemoryAllocator.
-*/
-extern void shutdownMemoryManager();
-
-extern MemoryPoolFactory *TheMemoryPoolFactory;
-extern DynamicMemoryAllocator *TheDynamicMemoryAllocator;
-
-
-// TheSuperHackers @info
-// The new operator overloads will zero all memory after allocation.
-// This replicates the behavior of the original Game Memory implementation and is necessary to avoid crashing the game,
-// where data is not properly zero initialized. Disable these operators when fixing those issues.
-#ifndef DISABLE_GAMEMEMORY_NEW_OPERATORS
-
-extern void * __cdecl operator new(size_t size);
-extern void __cdecl operator delete(void *p);
-
-extern void * __cdecl operator new[](size_t size);
-extern void __cdecl operator delete[](void *p);
-
-// additional overloads to account for VC/MFC funky versions
-extern void* __cdecl operator new(size_t size, const char *, int);
-extern void __cdecl operator delete(void *p, const char *, int);
-
-extern void* __cdecl operator new[](size_t size, const char *, int);
-extern void __cdecl operator delete[](void *p, const char *, int);
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameMusic.h b/GeneralsMD/Code/GameEngine/Include/Common/GameMusic.h
deleted file mode 100644
index f94e94be5ad..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameMusic.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    RTS 3
-//
-// File name:  Common/GameMusic.h
-//
-// Created:    5/01/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __COMMON_GAMEMUSIC_H_
-#define __COMMON_GAMEMUSIC_H_
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/GameAudio.h"
-#include "Common/GameMemory.h"
-
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-class AudioEventRTS;
-struct FieldParse;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-
-//===============================
-// MusicTrack
-//===============================
-
-//-------------------------------------------------------------------------------------------------
-/** The MusicTrack struct holds all information about a music track. 
-	* Place data in TrackInfo that is useful to the game code in determining 
-	* what tracks to play. */
-//-------------------------------------------------------------------------------------------------
-
-class MusicTrack : public MemoryPoolObject
-{
-
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( MusicTrack, "MusicTrack" )
-
-public:
-
-		MusicTrack();
-		// virtual destructor prototype defined by memory pool object
-
-		const FieldParse *getFieldParse( void ) const { return m_musicTrackFieldParseTable; }
-			
-		Int					index;									///< Track index
-		AsciiString name;										///< Logical name of track
-		AsciiString filename;								///< Filename with extension of music track
-		Real				volume;									///< Mixing level for this track
-		Bool				ambient;								///< Game info about this track(public)
-
-		MusicTrack *next;
-		MusicTrack *prev;
-
-	static const FieldParse m_musicTrackFieldParseTable[];		///< the parse table for INI definition
-
-};
-
-class MusicManager
-{
-	public:
-		MusicManager();
-		virtual ~MusicManager();
-
-		void playTrack( AudioEventRTS *eventToUse );
-		void stopTrack( AudioHandle eventToRemove );
-
-		virtual void addAudioEvent(AudioEventRTS *eventToAdd);	// pre-copied
-		virtual void removeAudioEvent( AudioHandle eventToRemove );
-
-		void setVolume( Real m_volume );
-};
-
-#endif // __COMMON_GAMEMUSIC_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameSounds.h b/GeneralsMD/Code/GameEngine/Include/Common/GameSounds.h
deleted file mode 100644
index 9f07c25404b..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameSounds.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    RTS 3
-//
-// File name:  Common/GameSounds.h
-//
-// Created:    5/02/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-#ifndef __COMMON_GAMESOUNDS_H_
-#define __COMMON_GAMESOUNDS_H_
-
-#include "Common/SubsystemInterface.h"
-#include "Common/GameAudio.h"
-#include "Common/GameType.h"
-
-// Forward declarations
-class AudioEventRTS;
-
-class SoundManager : public SubsystemInterface
-{
-	public:
-		SoundManager();
-		virtual ~SoundManager();
-
-		virtual void init( void );										///< Initializes the sounds system
-		virtual void postProcessLoad();
-		virtual void update( void );									///< Services sounds tasks. Called by AudioInterface
-		virtual void reset( void );										///< Reset the sounds system
-
-		virtual void loseFocus( void );								///< Called when application loses focus
-		virtual void regainFocus( void );							///< Called when application regains focus
-		
-		virtual void setListenerPosition( const Coord3D *position );	///< Set the listener position for map3DSound() calculations
-		virtual void setViewRadius( Real viewRadius );///< Sets the radius of the view from the center of the screen in world coordinate units
-		virtual void setCameraAudibleDistance( Real audibleDistance );
-		virtual Real getCameraAudibleDistance( void );
-		
-		virtual void addAudioEvent(AudioEventRTS *&eventToAdd);	// pre-copied
-
-		virtual void notifyOf2DSampleStart( void );
-		virtual void notifyOf3DSampleStart( void );
-
-		virtual void notifyOf2DSampleCompletion( void );
-		virtual void notifyOf3DSampleCompletion( void );
-
-		virtual Int getAvailableSamples( void );
-		virtual Int getAvailable3DSamples( void );
-
-		// empty string means that this sound wasn't found or some error occurred. CHECK FOR EMPTY STRING.
-		virtual AsciiString getFilenameForPlayFromAudioEvent( const AudioEventRTS *eventToGetFrom );
-
-		// called by this class and MilesAudioManager to determine if a sound can still be played
-		virtual Bool canPlayNow( AudioEventRTS *event );
-
-	protected:
-		virtual Bool violatesVoice( AudioEventRTS *event );
-		virtual Bool isInterrupting( AudioEventRTS *event );
-		
-
-	protected:
-		UnsignedInt m_num2DSamples;
-		UnsignedInt m_num3DSamples;
-
-		UnsignedInt m_numPlaying2DSamples;
-		UnsignedInt m_numPlaying3DSamples;
-};
-
-#endif // __COMMON_GAMESOUNDS_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h
index 3dc7f73b833..25bc00d3ff6 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h
@@ -30,16 +30,13 @@
 
 #pragma once
 
-#ifndef __GAMESPYMISCPREFERENCES_H__
-#define __GAMESPYMISCPREFERENCES_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 #include "Common/UserPreferences.h"
 
 //-----------------------------------------------------------------------------
-// GameSpyMiscPreferences base class 
+// GameSpyMiscPreferences base class
 //-----------------------------------------------------------------------------
 class GameSpyMiscPreferences : public UserPreferences
 {
@@ -57,5 +54,3 @@ class GameSpyMiscPreferences : public UserPreferences
 
 	Int getMaxMessagesPerUpdate( void );
 };
-
-#endif // __GAMESPYMISCPREFERENCES_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameState.h b/GeneralsMD/Code/GameEngine/Include/Common/GameState.h
index 16a098c04ed..6d67933dd78 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameState.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameState.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GAME_STATE_H_
-#define __GAME_STATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/STLTypedefs.h"
 #include "Common/Snapshot.h"
@@ -47,7 +44,7 @@ class WindowLayout;
 typedef void (*IterateSaveFileCallback)( AsciiString filename, void *userData );
 
 // ------------------------------------------------------------------------------------------------
-/** The save/load window is used for a variety of formats, using this type during the 
+/** The save/load window is used for a variety of formats, using this type during the
 	* save/load menu initialization you can make that menu allow loading only, or allow
 	* both saving and loading from the same menu */
 // ------------------------------------------------------------------------------------------------
@@ -57,8 +54,6 @@ enum SaveLoadLayoutType CPP_11(: Int)
 	SLLT_SAVE_AND_LOAD,
 	SLLT_LOAD_ONLY,
 	SLLT_SAVE_ONLY,
-
-	SLLT_NUM_TYPES // keep this last, why? don't know, it's not really used, but we like it this way
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -86,8 +81,6 @@ enum SaveFileType CPP_11(: Int)
 {
 	SAVE_FILE_TYPE_NORMAL,		///< a regular save game at any arbitrary point in the game
 	SAVE_FILE_TYPE_MISSION,		///< a save game in between missions (a mission save)
-
-	SAVE_FILE_TYPE_NUM_TYPES
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -163,16 +156,16 @@ class GameState : public SubsystemInterface,
 	virtual void update( void ) { }
 
 	// save game methods
-	SaveCode saveGame( AsciiString filename, 
-										 UnicodeString desc, 
-										 SaveFileType saveType, 
+	SaveCode saveGame( AsciiString filename,
+										 UnicodeString desc,
+										 SaveFileType saveType,
 										 SnapshotType which = SNAPSHOT_SAVELOAD  );  ///< save a game
 	SaveCode missionSave( void );																	 ///< do a in between mission save
 	SaveCode loadGame( AvailableGameInfo gameInfo );							 ///< load a save file
 	SaveGameInfo *getSaveGameInfo( void ) { return &m_gameInfo; }
 
 	// snapshot interaction
-	void addPostProcessSnapshot( Snapshot *snapshot );					///< add snapshot to post process laod	
+	void addPostProcessSnapshot( Snapshot *snapshot );					///< add snapshot to post process laod
 
 	// manipulating files
 	Bool doesSaveGameExist( AsciiString filename );							///< does the save file exist
@@ -217,14 +210,14 @@ class GameState : public SubsystemInterface,
 	{
 		Snapshot *snapshot;								///< the snapshot object that handles this block
 		AsciiString blockName;						///< the block name
-	};	
+	};
 	typedef std::list< SnapshotBlock > SnapshotBlockList;
 	typedef SnapshotBlockList::iterator SnapshotBlockListIterator;
 	void addSnapshotBlock( AsciiString blockName, Snapshot *snapshot, SnapshotType which );
 	SnapshotBlock *findBlockInfoByToken( AsciiString token, SnapshotType which );
 
 	SnapshotBlockList m_snapshotBlockList[SNAPSHOT_MAX];	///< list of snapshot blocks of save file data
-	SaveGameInfo m_gameInfo;						///< save game info struct					
+	SaveGameInfo m_gameInfo;						///< save game info struct
 
 	typedef std::list< Snapshot * > SnapshotList;
 	typedef SnapshotList::iterator SnapshotListIterator;
@@ -237,11 +230,8 @@ class GameState : public SubsystemInterface,
 };
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
-extern GameState *TheGameState;	
-
-
-UnicodeString getUnicodeTimeBuffer(SYSTEMTIME timeVal); 
-UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal); 
+extern GameState *TheGameState;
 
 
-#endif  // end __GAME_STATE_H_
+UnicodeString getUnicodeTimeBuffer(SYSTEMTIME timeVal);
+UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal);
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h b/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h
index f719f95aac2..af4f2587549 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GAME_STATE_MAP_H_
-#define __GAME_STATE_MAP_H_
-
 // INLCUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Snapshot.h"
 #include "Common/SubsystemInterface.h"
@@ -69,5 +66,3 @@ class GameStateMap : public SubsystemInterface,
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern GameStateMap *TheGameStateMap;
-
-#endif  // end __GAME_STATE_MAP_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameType.h b/GeneralsMD/Code/GameEngine/Include/Common/GameType.h
index c969afaaa3f..a079f07f81c 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameType.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameType.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _GAME_TYPE_H_
-#define _GAME_TYPE_H_
-
 #include "Lib/BaseType.h"
 
 // the default size of the world map
@@ -67,17 +64,18 @@ class INI;
 //-------------------------------------------------------------------------------------------------
 enum TimeOfDay CPP_11(: Int)
 {
-	TIME_OF_DAY_INVALID = 0,
-	TIME_OF_DAY_FIRST = 1,
-	TIME_OF_DAY_MORNING = TIME_OF_DAY_FIRST,
+	TIME_OF_DAY_INVALID,
+
+	TIME_OF_DAY_MORNING,
 	TIME_OF_DAY_AFTERNOON,
 	TIME_OF_DAY_EVENING,
 	TIME_OF_DAY_NIGHT,
 
-	TIME_OF_DAY_COUNT					// keep this last
+	TIME_OF_DAY_COUNT,
+	TIME_OF_DAY_FIRST = TIME_OF_DAY_MORNING,
 };
 
-extern const char *TimeOfDayNames[];
+extern const char *const TimeOfDayNames[];
 // defined in Common/GameType.cpp
 
 //-------------------------------------------------------------------------------------------------
@@ -86,21 +84,21 @@ enum Weather CPP_11(: Int)
 	WEATHER_NORMAL = 0,
 	WEATHER_SNOWY = 1,
 
-	WEATHER_COUNT					// keep this last
+	WEATHER_COUNT
 };
 
-extern const char *WeatherNames[];
+extern const char *const WeatherNames[];
 
 enum Scorches CPP_11(: Int)
 {
 	SCORCH_1 = 0,
 	SCORCH_2 = 1,
-	SCORCH_3 = 2, 
-	SCORCH_4 = 3, 
+	SCORCH_3 = 2,
+	SCORCH_4 = 3,
 	SHADOW_SCORCH = 4,
-/*	SCORCH_6 = 5, 
-	SCORCH_7 = 6, 
-	SCORCH_8 = 7, 
+/*	SCORCH_6 = 5,
+	SCORCH_7 = 6,
+	SCORCH_8 = 7,
 
 	CRATER_1 = 8,
 	CRATER_2 = 9,
@@ -111,7 +109,7 @@ enum Scorches CPP_11(: Int)
 	CRATER_7 = 14,
 	CRATER_8 = 15,
 
-	
+
 	MISC_DECAL_1 = 16,
 	MISC_DECAL_2 = 17,
 	MISC_DECAL_3 = 18,
@@ -176,14 +174,14 @@ enum WeaponSlotType CPP_11(: Int)
 	SECONDARY_WEAPON,
 	TERTIARY_WEAPON,
 
-	WEAPONSLOT_COUNT	// keep last
+	WEAPONSLOT_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
 // Pathfind layers - ground is the first layer, each bridge is another. jba.
 // Layer 1 is the ground.
 // Layer 2 is the top layer - bridge if one is present, ground otherwise.
-// Layer 2 - LAYER_LAST -1 are bridges. 
+// Layer 2 - LAYER_LAST -1 are bridges.
 // Layer_WALL is a special "wall" layer for letting units run aroound on top of a wall
 // made of structures.
 // Note that the bridges just index in the pathfinder, so you don't actually
@@ -191,6 +189,3 @@ enum WeaponSlotType CPP_11(: Int)
 enum PathfindLayerEnum CPP_11(: Int) {LAYER_INVALID = 0, LAYER_GROUND = 1, LAYER_WALL = 15, LAYER_LAST=15};
 
 //-------------------------------------------------------------------------------------------------
-
-#endif // _GAME_TYPE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h
index a9c475bbf85..fa4fccad236 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GEOMETRY_H_
-#define __GEOMETRY_H_
-
 #include "Lib/BaseType.h"
 #include "Common/AsciiString.h"
 #include "Common/Snapshot.h"
@@ -42,32 +39,33 @@ class INI;
 /** Geometry type descriptions, keep this in the same order as GeometryNames[] below
 	*
 	* NOTE: Do *NOT* change the order of these defines unless you update the
-	* partition manager ... in particular theCollideTestProcs depend on the 
+	* partition manager ... in particular theCollideTestProcs depend on the
 	* order of this geometry and the fact that the values start at 1
 	*/
 //-------------------------------------------------------------------------------------------------
 enum GeometryType CPP_11(: Int)
 {
-	GEOMETRY_SPHERE = 0,	///< partition/collision testing as sphere. (majorRadius = radius)
+	GEOMETRY_SPHERE,			///< partition/collision testing as sphere. (majorRadius = radius)
 	GEOMETRY_CYLINDER,		///< partition/collision testing as cylinder. (majorRadius = radius, height = height)
 	GEOMETRY_BOX,					///< partition/collision testing as rectangular box (majorRadius = half len in forward dir; minorRadius = half len in side dir; height = height)
 
-	GEOMETRY_NUM_TYPES,  // keep this last
-	GEOMETRY_FIRST = GEOMETRY_SPHERE
+	GEOMETRY_NUM_TYPES,
+	GEOMETRY_FIRST = 0
 };
 
 #ifdef DEFINE_GEOMETRY_NAMES
-static const char *GeometryNames[] = 
+static const char *const GeometryNames[] =
 {
-	"SPHERE",		
-	"CYLINDER",	
-	"BOX",			
+	"SPHERE",
+	"CYLINDER",
+	"BOX",
 	NULL
 };
+static_assert(ARRAY_SIZE(GeometryNames) == GEOMETRY_NUM_TYPES + 1, "Incorrect array size");
 #endif  // end DEFINE_GEOMETRY_NAMES
 
 //-------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 enum ExtentModType CPP_11(: Int)
 {
 	EXTENTMOD_INVALID = 0,
@@ -90,21 +88,21 @@ class GeometryInfo : public Snapshot
 	Real m_height;
 	Real m_majorRadius;
 	Real m_minorRadius;
-	
+
 	Real m_boundingCircleRadius;	///< not in INI file -- size of bounding circle (2d)
 	Real m_boundingSphereRadius;	///< not in INI -- size of bounding sphere (3d)
 
 	void calcBoundingStuff();
 
 protected:
-	
+
 	// snapshot methods
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
 
 public:
-	
+
 	static void parseGeometryType( INI* ini, void * /*instance*/, void *store, const void* /*userData*/ );
 	static void parseGeometryIsSmall( INI* ini, void * /*instance*/, void *store, const void* /*userData*/ );
 	static void parseGeometryHeight( INI* ini, void * /*instance*/, void *store, const void* /*userData*/ );
@@ -113,42 +111,38 @@ class GeometryInfo : public Snapshot
 
 	GeometryInfo(GeometryType type, Bool isSmall, Real height, Real majorRadius, Real minorRadius)
 	{
-		// Added by Sadullah Nader
-		// Initializations missing and needed
 		m_boundingCircleRadius = 0.0f;
 		m_boundingSphereRadius = 0.0f;
-		//
-
 		set(type, isSmall, height, majorRadius, minorRadius);
 	}
 
 	void set(GeometryType type, Bool isSmall, Real height, Real majorRadius, Real minorRadius);
 
 	// bleah, icky but needed for legacy code
-	inline void setMajorRadius(Real majorRadius)
+	void setMajorRadius(Real majorRadius)
 	{
 		m_majorRadius = majorRadius;
 		calcBoundingStuff();
 	}
 
 	// bleah, icky but needed for legacy code
-	inline void setMinorRadius(Real minorRadius)
+	void setMinorRadius(Real minorRadius)
 	{
 		m_minorRadius = minorRadius;
 		calcBoundingStuff();
 	}
 
-	inline GeometryType getGeomType() const { return m_type; }
-	inline Bool getIsSmall() const { return m_isSmall; }
-	inline Real getMajorRadius() const { return m_majorRadius; }	// x-axis
-	inline Real getMinorRadius() const { return m_minorRadius; }	// y-axis
-	
-	// this has been removed and should never need to be called... 
+	GeometryType getGeomType() const { return m_type; }
+	Bool getIsSmall() const { return m_isSmall; }
+	Real getMajorRadius() const { return m_majorRadius; }	// x-axis
+	Real getMinorRadius() const { return m_minorRadius; }	// y-axis
+
+	// this has been removed and should never need to be called...
 	// you should generally call getMaxHeightAbovePosition() instead. (srj)
 	//inline Real getGeomHeight() const { return m_height; }				// z-axis
 
-	inline Real getBoundingCircleRadius() const { return m_boundingCircleRadius; }
-	inline Real getBoundingSphereRadius() const { return m_boundingSphereRadius; }
+	Real getBoundingCircleRadius() const { return m_boundingCircleRadius; }
+	Real getBoundingSphereRadius() const { return m_boundingSphereRadius; }
 
 	Bool isIntersectedByLineSegment(const Coord3D& loc, const Coord3D& from, const Coord3D& to) const;
 
@@ -188,12 +182,9 @@ class GeometryInfo : public Snapshot
 	// given an object with this geom, SET how far above the object's canonical position its max z should extend.
 	void setMaxHeightAbovePosition(Real z);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	void tweakExtents(ExtentModType extentModType, Real extentModAmount);
 	AsciiString getDescriptiveString() const;
 #endif
 
 };
-
-#endif 
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h
index 5c7957e88fc..0ffbd28506b 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _GLOBALDATA_H_
-#define _GLOBALDATA_H_
-
 #include "Common/GameCommon.h"	// ensure we get DUMP_PERF_STATS, or not
 #include "Common/AsciiString.h"
 #include "Common/GameType.h"
@@ -39,12 +36,12 @@
 #include "Common/SubsystemInterface.h"
 #include "GameClient/Color.h"
 #include "Common/STLTypedefs.h"
-#include "Common/GameCommon.h"
 #include "Common/Money.h"
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
 struct FieldParse;
 enum _TerrainLOD CPP_11(: Int);
+class CommandLine;
 class GlobalData;
 class INI;
 class WeaponBonusSet;
@@ -53,13 +50,29 @@ enum AIDebugOptions CPP_11(: Int);
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 
-const Int MAX_GLOBAL_LIGHTS	= 3;
+constexpr const Int MAX_GLOBAL_LIGHTS = 3;
+constexpr const Int SIMULATE_REPLAYS_SEQUENTIAL = -1;
+
+//-------------------------------------------------------------------------------------------------
+class CommandLineData
+{
+	friend class CommandLine;
+	friend class GlobalData;
+
+	CommandLineData()
+		: m_hasParsedCommandLineForStartup(false)
+		, m_hasParsedCommandLineForEngineInit(false)
+	{}
+
+	Bool m_hasParsedCommandLineForStartup;
+	Bool m_hasParsedCommandLineForEngineInit;
+};
 
 //-------------------------------------------------------------------------------------------------
 /** Global data container class
   *	Defines all global game data used by the system
 	* @todo Change this entire system. Otherwise this will end up a huge class containing tons of variables,
-	* and will cause re-compilation dependancies throughout the codebase. 
+	* and will cause re-compilation dependencies throughout the code base.
   * OOPS -- TOO LATE! :) */
 //-------------------------------------------------------------------------------------------------
 class GlobalData : public SubsystemInterface
@@ -70,13 +83,14 @@ class GlobalData : public SubsystemInterface
 	GlobalData();
 	virtual ~GlobalData();
 
-	void init();
-	void reset();
-	void update() { }
+	virtual void init();
+	virtual void reset();
+	virtual void update() { }
 
 	Bool setTimeOfDay( TimeOfDay tod );		///< Use this function to set the Time of day;
 
 	static void parseGameDataDefinition( INI* ini );
+	void parseCustomDefinition();
 
 	//-----------------------------------------------------------------------------------------------
 	struct TerrainLighting
@@ -90,6 +104,8 @@ class GlobalData : public SubsystemInterface
 	//-----------------------------------------------------------------------------------------------
 	//-----------------------------------------------------------------------------------------------
 
+	CommandLineData m_commandLineData;
+
 	AsciiString m_mapName;  ///< hack for now, this whole this is going away
 	AsciiString m_moveHintName;
 	Bool m_useTrees;
@@ -104,7 +120,7 @@ class GlobalData : public SubsystemInterface
 	// TheSuperHackers @feature helmutbuhler 11/04/2025
 	// Run game without graphics, input or audio.
 	Bool m_headless;
-	
+
 	Bool m_windowed;
 	Int m_xResolution;
 	Int m_yResolution;
@@ -136,7 +152,7 @@ class GlobalData : public SubsystemInterface
 	Real m_waterPositionX;
 	Real m_waterPositionY;
 	Real m_waterPositionZ;
-	Real m_waterExtentX;	
+	Real m_waterExtentX;
 	Real m_waterExtentY;
 	Int	m_waterType;
 	Bool m_showSoftWaterEdge;
@@ -166,6 +182,7 @@ class GlobalData : public SubsystemInterface
 	Real m_skyBoxPositionZ;
 	Real m_drawSkyBox;
 	Real m_skyBoxScale;
+	Real m_viewportHeightScale; // The height scale of the tactical view ranging 0..1. Used to hide the world behind the Control Bar.
 	Real m_cameraPitch;
 	Real m_cameraYaw;
 	Real m_cameraHeight;
@@ -200,7 +217,7 @@ class GlobalData : public SubsystemInterface
 	Int m_maxTankTrackEdges;	///<maximum length of tank track
 	Int m_maxTankTrackOpaqueEdges;	///<maximum length of tank track before it starts fading.
 	Int m_maxTankTrackFadeDelay;	///<maximum amount of time a tank track segment remains visible.
-	
+
 	AsciiString m_levelGainAnimationName; ///< The animation to play when a level is gained.
 	Real m_levelGainAnimationDisplayTimeInSeconds;		///< time to play animation for
 	Real m_levelGainAnimationZRisePerSecond;					///< rise animation up while playing
@@ -264,13 +281,13 @@ class GlobalData : public SubsystemInterface
 	Bool m_winCursors;						///< Should we force use of windows cursors?
 	Bool m_constantDebugUpdate;		///< should we update the debug stats constantly, vs every 2 seconds?
 	Bool m_showTeamDot;						///< Shows the little colored team dot representing which team you are controlling.
-	
+
 #ifdef DUMP_PERF_STATS
 	Bool m_dumpPerformanceStatistics;
   Bool  m_dumpStatsAtInterval;///< should I automatically dum stats every in N frames
   Int   m_statsInterval;       ///< if so, how many is N?
 #endif
-	
+
 	Bool m_forceBenchmark;	///<forces running of CPU detection benchmark, even on known cpu's.
 
 	Int m_fixedSeed;							///< fixed random seed for game logic (less than 0 to disable)
@@ -329,9 +346,12 @@ class GlobalData : public SubsystemInterface
 	Real m_cameraAdjustSpeed;					///< Rate at which we adjust camera height
 	Bool m_enforceMaxCameraHeight;		///< Enfoce max camera height while scrolling?
 	Bool m_buildMapCache;
-	AsciiString m_initialFile;				///< If this is specified, load a specific map/replay from the command-line
+	AsciiString m_initialFile;				///< If this is specified, load a specific map from the command-line
 	AsciiString m_pendingFile;				///< If this is specified, use this map at the next game start
 
+	std::vector<AsciiString> m_simulateReplays; ///< If not empty, simulate this list of replays and exit.
+	Int m_simulateReplayJobs; ///< Maximum number of processes to use for simulation, or SIMULATE_REPLAYS_SEQUENTIAL for sequential simulation
+
 	Int m_maxParticleCount;						///< maximum number of particles that can exist
 	Int m_maxFieldParticleCount;			///< maximum number of field-type particles that can exist (roughly)
 	WeaponBonusSet* m_weaponBonusSet;
@@ -349,16 +369,13 @@ class GlobalData : public SubsystemInterface
 
 	Real m_keyboardScrollFactor;			///< Factor applied to game scrolling speed via keyboard scrolling
 	Real m_keyboardDefaultScrollFactor;			///< Factor applied to game scrolling speed via keyboard scrolling
-	
-  Real m_musicVolumeFactor;         ///< Factor applied to loudness of music volume
-  Real m_SFXVolumeFactor;           ///< Factor applied to loudness of SFX volume
-  Real m_voiceVolumeFactor;         ///< Factor applied to loudness of voice volume
-  Bool m_3DSoundPref;               ///< Whether user wants to use 3DSound or not
+	Bool m_drawScrollAnchor;					///< Set that the scroll anchor should be enabled
+	Bool m_moveScrollAnchor;					///< set that the scroll anchor should move
 
 	Bool m_animateWindows;						///< Should we animate window transitions?
 
 	Bool m_incrementalAGPBuf;
-	
+
 	UnsignedInt m_iniCRC;							///< CRC of important INI files
 	UnsignedInt m_exeCRC;							///< CRC of the executable
 
@@ -373,10 +390,10 @@ class GlobalData : public SubsystemInterface
 	Bool m_selectionFlashHouseColor ;  /// skip the house color and just use white.
 
 	Real m_cameraAudibleRadius;				///< If the camera is being used as the position of audio, then how far can we hear?
-	Real m_groupMoveClickToGatherFactor; /** if you take all the selected units and calculate the smallest possible rectangle 
-																			 that contains them all, and click within that, all the selected units will break 
+	Real m_groupMoveClickToGatherFactor; /** if you take all the selected units and calculate the smallest possible rectangle
+																			 that contains them all, and click within that, all the selected units will break
 																			 formation and gather at the point the user clicked (if the value is 1.0). If it's 0.0,
-																			 units will always keep their formation. If it's <1.0, then the user must click a 
+																			 units will always keep their formation. If it's <1.0, then the user must click a
 																			 smaller area within the rectangle to order the gather. */
 
 	Int m_antiAliasBoxValue;          ///< value of selected antialias from combo box in options menu
@@ -387,6 +404,21 @@ class GlobalData : public SubsystemInterface
 	Bool m_saveCameraInReplay;
 	Bool m_useCameraInReplay;
 
+	// TheSuperHackers @feature xezon 09/09/2025 Enable the shroud and everything related for observing individual players in any game mode.
+	// Enabling this does have a performance cost because the ghost object manager must keep track of all relevant objects for all players.
+	Bool m_enablePlayerObserver;
+
+	// TheSuperHackers @feature L3-M 05/09/2025 allow the network latency counter and render fps counter font size to be set, a size of zero disables them
+	Int m_networkLatencyFontSize;
+	Int m_renderFpsFontSize;
+	// TheSuperHackers @feature Mauller 21/06/2025 allow the system time and game time font size to be set, a size of zero disables them
+	Int m_systemTimeFontSize;
+	Int m_gameTimeFontSize;
+
+	// TheSuperHackers @feature L3-M 21/08/2025 toggle the money per minute display, false shows only the original current money
+	Bool m_showMoneyPerMinute;
+	Bool m_allowMoneyPerMinuteForPlayer;
+
 	Real m_shakeSubtleIntensity;			///< Intensity for shaking a camera with SHAKE_SUBTLE
 	Real m_shakeNormalIntensity;			///< Intensity for shaking a camera with SHAKE_NORMAL
 	Real m_shakeStrongIntensity;			///< Intensity for shaking a camera with SHAKE_STRONG
@@ -409,18 +441,21 @@ class GlobalData : public SubsystemInterface
 
   //THis is put on ice until later - M Lorenzen
   //	Int m_cheaterHasBeenSpiedIfMyLowestBitIsTrue; ///< says it all.. this lives near other "colors" cause it is masquerading as one
-	
+
 	AsciiString m_specialPowerViewObjectName;	///< Created when certain special powers are fired so players can watch.
 
+	Real m_objectPlacementOpacity; ///< Sets the opacity of build preview objects.
+	Bool m_objectPlacementShadows; ///< Enables or disables shadows of build preview objects.
+
 	std::vector<AsciiString> m_standardPublicBones;
 
 	Real m_standardMinefieldDensity;
 	Real m_standardMinefieldDistance;
 
-	
+
 	Bool  m_showMetrics;								///< whether or not to show the metrics.
 	Money m_defaultStartingCash;				///< The amount of cash a player starts with by default.
-	
+
 	Bool m_debugShowGraphicalFramerate;		///< Whether or not to show the graphical framerate bar.
 
 	Int m_powerBarBase;										///< Logrithmic base for the power bar scale
@@ -431,7 +466,7 @@ class GlobalData : public SubsystemInterface
 	UnsignedInt m_unlookPersistDuration;	///< How long after unlook until the sighting info executes the undo
 
 	Bool m_shouldUpdateTGAToDDS;					///< Should we attempt to update old TGAs to DDS stuff on loadup?
-  
+
 	UnsignedInt m_doubleClickTimeMS;	///< What is the maximum amount of time that can seperate two clicks in order
 																		///< for us to generate a double click message?
 
@@ -450,22 +485,23 @@ class GlobalData : public SubsystemInterface
 	UnsignedInt m_networkDisconnectTime;			      	///< The number of milliseconds between when the game gets stuck on a frame for a network stall and when the disconnect dialog comes up.
 	UnsignedInt m_networkPlayerTimeoutTime;		      	///< The number of milliseconds between when a player's last keep alive command was recieved and when they are considered disconnected from the game.
 	UnsignedInt	m_networkDisconnectScreenNotifyTime;  ///< The number of milliseconds between when the disconnect screen comes up and when the other players are notified that we are on the disconnect screen.
-	
+
 	Real				m_keyboardCameraRotateSpeed;    ///< How fast the camera rotates when rotated via keyboard controls.
   Int					m_playStats;									///< Int whether we want to log play stats or not, if <= 0 then we don't log
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	Bool m_specialPowerUsesDelay ;
 #endif
   Bool m_TiVOFastMode;            ///< When true, the client speeds up the framerate... set by HOTKEY!
-  
 
+#if defined(RTS_DEBUG) || ENABLE_CONFIGURABLE_SHROUD
+	Bool m_shroudOn;
+#endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	Bool m_wireframe;
 	Bool m_stateMachineDebug;
 	Bool m_useCameraConstraints;
-	Bool m_shroudOn;
 	Bool m_fogOfWarOn;
 	Bool m_jabberOn;
 	Bool m_munkeeOn;
@@ -531,12 +567,14 @@ class GlobalData : public SubsystemInterface
 
 private:
 
+	static UnsignedInt generateExeCRC();
+
 	static const FieldParse s_GlobalDataFieldParseTable[];
 
 	// this is private, since we read the info from Windows and cache it for
 	// future use. No one is allowed to change it, ever. (srj)
 	AsciiString m_userDataDir;
-	
+
 	static GlobalData *m_theOriginal;		///< the original global data instance (no overrides)
 	GlobalData *m_next;									///< next instance (for overrides)
 	GlobalData *newOverride( void );		/** create a new override, copy data from previous
@@ -555,6 +593,9 @@ class GlobalData : public SubsystemInterface
 // singleton
 extern GlobalData* TheWritableGlobalData;
 
+// use TheGlobalData for all read-only accesses
+#if __cplusplus >= 201703L
+inline const GlobalData* const& TheGlobalData = TheWritableGlobalData;
+#else
 #define TheGlobalData ((const GlobalData*)TheWritableGlobalData)
-
 #endif
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h b/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h
index b31e22b3318..47d52abf640 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h
@@ -24,12 +24,12 @@
 
 // FILE: Handicap.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef _HANDICAP_H_
-#define _HANDICAP_H_
-
 #include "Lib/BaseType.h"
 
 // ----------------------------------------------------------------------------------------------
@@ -56,7 +53,7 @@ class ThingTemplate;
 
 // ----------------------------------------------------------------------------------------------
 /**
-	Handicap encapsulates the sets of modifiers to abilities used to balance 
+	Handicap encapsulates the sets of modifiers to abilities used to balance
 	the game and give different abilities to different Players.
 	Conceptually, it's a large set of coefficients (typically, but not necessarily,
 	in the range of 0.0...1.0).
@@ -85,7 +82,7 @@ class Handicap
 	/// reset all handicaps to a default value.
 	void init();
 
-	/** 
+	/**
 		initialize from the fields in the Dict. Note that this does NOT call init()
 		internally, so only those fields that are present in the dict will be set.
 		if you want to ensure all fields are something reasonable, you should call init()
@@ -96,7 +93,7 @@ class Handicap
 	/**
 		return the multiplier for the given Handicap type on the given Object.
 		The Object's type (unit, building, etc.) will generally be examined
-		to determine what value to return. 
+		to determine what value to return.
 	*/
 	Real getHandicap(HandicapType t, const ThingTemplate *tmpl) const;
 
@@ -117,5 +114,3 @@ class Handicap
 
 	static ThingType getBestThingType(const ThingTemplate *tmpl);
 };
-
-#endif // _HANDICAP_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/INI.h b/GeneralsMD/Code/GameEngine/Include/Common/INI.h
index 103626dbf11..613cae14065 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/INI.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/INI.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __INI_H_
-#define __INI_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include <stddef.h>	// for offsetof, which we don't use but everyone who includes us does
 #include "Common/STLTypedefs.h"
@@ -48,7 +45,7 @@ enum ScienceType CPP_11(: Int);
 /** These control the behavior of loading the INI data into items */
 //-------------------------------------------------------------------------------------------------
 enum INILoadType CPP_11(: Int)
-{	
+{
 	INI_LOAD_INVALID,						///< invalid load type
 	INI_LOAD_OVERWRITE,					///< create new or load *over* existing data instance
 	INI_LOAD_CREATE_OVERRIDES,	///< create new or load into *new* override data instance
@@ -91,14 +88,14 @@ enum
 /** Function typedef for parsing data block fields.
 	*
 	* buffer - the character buffer of the line from INI that we are reading and parsing
-	* instance - instance of what we're loading (for example a thingtemplate instance)
+	* instance - instance of what we're loading (for example a ThingTemplate instance)
 	* store - where to store the data parsed, this is a field in the *instance* 'instance'
 	*/
 //-------------------------------------------------------------------------------------------------
 typedef void (*INIFieldParseProc)( INI *ini, void *instance, void *store, const void* userData );
 
 //-------------------------------------------------------------------------------------------------
-typedef const char* ConstCharPtr;
+typedef const char* const ConstCharPtr;
 typedef ConstCharPtr* ConstCharPtrArray;
 
 //-------------------------------------------------------------------------------------------------
@@ -119,7 +116,7 @@ struct FieldParse
 	const void*					userData;					///< field-specific data
 	Int									offset;						///< offset to data field
 
-	inline void set(const char* t, INIFieldParseProc p, const void* u, Int o)
+	void set(const char* t, INIFieldParseProc p, const void* u, Int o)
 	{
 		token = t;
 		parse = p;
@@ -139,21 +136,17 @@ class MultiIniFieldParse
 	Int								m_count;
 
 public:
-	MultiIniFieldParse() : m_count(0) 
-	{ 
-		//Added By Sadullah Nader
-		//Initializations missing and needed
+	MultiIniFieldParse() : m_count(0)
+	{
 		for(Int i = 0; i < MAX_MULTI_FIELDS; i++)
 			m_extraOffset[i] = 0;
-		//
-
 	}
-	
+
 	void add(const FieldParse* f, UnsignedInt e = 0);
 
-	inline Int getCount() const { return m_count; }
-	inline const FieldParse* getNthFieldParse(Int i) const { return m_fieldParse[i]; }
-	inline UnsignedInt getNthExtraOffset(Int i) const { return m_extraOffset[i]; }
+	Int getCount() const { return m_count; }
+	const FieldParse* getNthFieldParse(Int i) const { return m_fieldParse[i]; }
+	UnsignedInt getNthExtraOffset(Int i) const { return m_extraOffset[i]; }
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -175,8 +168,19 @@ class INI
 	INI();
 	~INI();
 
-	void loadDirectory( AsciiString dirName, Bool subdirs, INILoadType loadType, Xfer *pXfer );  ///< load directory of INI files
-	void load( AsciiString filename, INILoadType loadType, Xfer *pXfer );		///< load INI file
+	// TheSuperHackers @feature xezon 19/08/2025
+	// Load a specific INI file by name and/or INI files from a directory (and its subdirectories).
+	// For example "Data\INI\Armor" loads "Data\INI\Armor.ini" and all *.ini files in "Data\INI\Armor".
+	// Throws if not a single INI file is found or one is not read correctly.
+	UnsignedInt loadFileDirectory( AsciiString fileDirName, INILoadType loadType, Xfer *pXfer, Bool subdirs = TRUE );
+
+	// Load INI files from a directory (and its subdirectories).
+	// Throws if one INI file is not read correctly.
+	UnsignedInt loadDirectory( AsciiString dirName, INILoadType loadType, Xfer *pXfer, Bool subdirs = TRUE );
+
+	// Load one specific INI file by name.
+	// Throws if the INI file is not found or is not read correctly.
+	UnsignedInt load( AsciiString filename, INILoadType loadType, Xfer *pXfer );
 
 	static Bool isDeclarationOfType( AsciiString blockType, AsciiString blockName, char *bufferToCheck );
 	static Bool isEndOfBlock( char *bufferToCheck );
@@ -244,19 +248,19 @@ class INI
 	static void parseWindowTransitions( INI* ini );
 	static void parseChallengeModeDefinition( INI* ini );
 
-	inline AsciiString getFilename( void ) const { return m_filename; }
-	inline INILoadType getLoadType( void ) const { return m_loadType; }
-	inline UnsignedInt getLineNum( void ) const { return m_lineNum; }
-	inline const char *getSeps( void ) const { return m_seps; }
-	inline const char *getSepsPercent( void ) const { return m_sepsPercent; }
-	inline const char *getSepsColon( void ) const { return m_sepsColon; }
-	inline const char *getSepsQuote( void ) { return m_sepsQuote; }
-	inline Bool isEOF( void ) const { return m_endOfFile; }
+	AsciiString getFilename( void ) const { return m_filename; }
+	INILoadType getLoadType( void ) const { return m_loadType; }
+	UnsignedInt getLineNum( void ) const { return m_lineNum; }
+	const char *getSeps( void ) const { return m_seps; }
+	const char *getSepsPercent( void ) const { return m_sepsPercent; }
+	const char *getSepsColon( void ) const { return m_sepsColon; }
+	const char *getSepsQuote( void ) { return m_sepsQuote; }
+	Bool isEOF( void ) const { return m_endOfFile; }
 
 	void initFromINI( void *what, const FieldParse* parseTable );
 	void initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList );
 	void initFromINIMultiProc( void *what, BuildMultiIniFieldProc proc );
-	
+
 	static void parseUnsignedByte( INI *ini, void *instance, void *store, const void* userData );
 	static void parseShort( INI *ini, void *instance, void *store, const void* userData );
 	static void parseUnsignedShort( INI *ini, void *instance, void *store, const void* userData );
@@ -316,11 +320,11 @@ class INI
 	static void parseDeathTypeFlags(INI* ini, void* instance, void* store, const void* userData);
 	static void parseVeterancyLevelFlags(INI* ini, void* instance, void* store, const void* userData);
 	static void parseSoundsList( INI* ini, void *instance, void *store, const void* /*userData*/ );
-	
-	
+
+
 	/**
 		return the next token. if seps is null (or omitted), the standard seps are used.
-		
+
 		this will *never* return null; if there are no more tokens, an exception will be thrown.
 	*/
 	const char* getNextToken(const char* seps = NULL);
@@ -334,7 +338,7 @@ class INI
 
 	/**
 		This is called when the next thing you expect is something like:
-			
+
 			Tag:value
 
 		pass "Tag" (without the colon) for 'expected', and you will have the 'value'
@@ -384,7 +388,7 @@ class INI
 
 protected:
 
-	static Bool isValidINIFilename( const char *filename ); ///< is this a valid .ini filename		
+	static Bool isValidINIFilename( const char *filename ); ///< is this a valid .ini filename
 
 	void prepFile( AsciiString filename, INILoadType loadType );
 	void unPrepFile();
@@ -412,9 +416,6 @@ class INI
 	const char *m_blockEndToken;							///< token to represent end of data block
 	Bool m_endOfFile;													///< TRUE when we've hit EOF
 #ifdef DEBUG_CRASHING
-	char m_curBlockStart[ INI_MAX_CHARS_PER_LINE ];	///< first line of cur block
+	char m_curBlockStart[ INI_MAX_CHARS_PER_LINE+1 ];	///< first line of cur block
 #endif
 };
-
-#endif // __INI_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/INIException.h b/GeneralsMD/Code/GameEngine/Include/Common/INIException.h
index ecd9b7353c7..d73af7cd0f6 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/INIException.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/INIException.h
@@ -45,8 +45,6 @@ class INIException
 
 	~INIException()
 	{
-		if (mFailureMessage) {
-			delete [] mFailureMessage;
-		}
+		delete [] mFailureMessage;
 	}
-};
\ No newline at end of file
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h
index 4fd071a03d6..dc223cf4031 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h
@@ -24,12 +24,12 @@
 
 // FILE: IgnorePreferences.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,17 +37,14 @@
 //	Filename: 	IgnorePreferences.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __IGNORE_PREFERENCES_H_
-#define __IGNORE_PREFERENCES_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -82,5 +79,3 @@ class IgnorePreferences : public UserPreferences
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __IGNORE_PREFERENCES_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h b/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h
index 15de5d358aa..6b899dcca5c 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h
@@ -24,14 +24,11 @@
 
 // FILE: KindOf.h //////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, Dec 2001
-// Desc:	 
-///////////////////////////////////////////////////////////////////////////////////////////////////	
+// Desc:
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __KINDOF_H_
-#define __KINDOF_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
 #include "Common/BitFlags.h"
@@ -44,8 +41,8 @@
 enum KindOfType CPP_11(: Int)
 {
 	KINDOF_INVALID = -1,
-	KINDOF_FIRST = 0,
-	KINDOF_OBSTACLE = KINDOF_FIRST,	///< an obstacle to land-based pathfinders
+	
+	KINDOF_OBSTACLE,								///< an obstacle to land-based pathfinders
 	KINDOF_SELECTABLE,							///< Actually means MOUSE-INTERACTABLE (doesn't mean you can select it!)
 	KINDOF_IMMOBILE,								///< fixed in location
 	KINDOF_CAN_ATTACK,							///< can attack
@@ -80,7 +77,7 @@ enum KindOfType CPP_11(: Int)
 	KINDOF_NO_COLLIDE,							///< Never collide with or be collided with
 	KINDOF_REPAIR_PAD,							///< is a repair pad object that can repair other machines
 	KINDOF_HEAL_PAD,								///< is a heal pad object that can heal flesh and bone units
-	KINDOF_STEALTH_GARRISON,				/** enemy teams can't tell that unit is in building.. and if they 
+	KINDOF_STEALTH_GARRISON,				/** enemy teams can't tell that unit is in building.. and if they
 																		garrison that building, they stealth unit will eject. */
 	KINDOF_CASH_GENERATOR,					///< used to check if the unit generates cash... checked by cash hackers and whatever else comes up
 	KINDOF_DRAWABLE_ONLY,						///< template is used only to create drawables (not Objects)
@@ -171,21 +168,21 @@ enum KindOfType CPP_11(: Int)
 	KINDOF_CONSERVATIVE_BUILDING,		///< Conservative structures aren't considered part of your base for sneak attack boundary calculations...
 	KINDOF_IGNORE_DOCKING_BONES,		///< Structure will not look up docking bones. Patch 1.03 hack.
 
-	KINDOF_COUNT										// total number of kindofs
-	
-}; 
+	KINDOF_COUNT,										// total number of kindofs
+	KINDOF_FIRST = 0,
+};
 
 typedef BitFlags<KINDOF_COUNT>	KindOfMaskType;
 
 #define MAKE_KINDOF_MASK(k) KindOfMaskType(KindOfMaskType::kInit, (k))
 
-inline Bool TEST_KINDOFMASK(const KindOfMaskType& m, KindOfType t) 
-{ 
-	return m.test(t); 
+inline Bool TEST_KINDOFMASK(const KindOfMaskType& m, KindOfType t)
+{
+	return m.test(t);
 }
 
-inline Bool TEST_KINDOFMASK_ANY(const KindOfMaskType& m, const KindOfMaskType& mask) 
-{ 
+inline Bool TEST_KINDOFMASK_ANY(const KindOfMaskType& m, const KindOfMaskType& mask)
+{
 	return m.anyIntersectionWith(mask);
 }
 
@@ -194,14 +191,14 @@ inline Bool TEST_KINDOFMASK_MULTI(const KindOfMaskType& m, const KindOfMaskType&
 	return m.testSetAndClear(mustBeSet, mustBeClear);
 }
 
-inline Bool KINDOFMASK_ANY_SET(const KindOfMaskType& m) 
-{ 
-	return m.any(); 
+inline Bool KINDOFMASK_ANY_SET(const KindOfMaskType& m)
+{
+	return m.any();
 }
 
-inline void CLEAR_KINDOFMASK(KindOfMaskType& m) 
-{ 
-	m.clear(); 
+inline void CLEAR_KINDOFMASK(KindOfMaskType& m)
+{
+	m.clear();
 }
 
 inline void SET_ALL_KINDOFMASK_BITS(KindOfMaskType& m)
@@ -219,6 +216,3 @@ inline void FLIP_KINDOFMASK(KindOfMaskType& m)
 extern KindOfMaskType KINDOFMASK_NONE;	// inits to all zeroes
 extern KindOfMaskType KINDOFMASK_FS;		// Initializes all FS types for faction structures.
 void initKindOfMasks();
-
-#endif	// __KINDOF_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h
index 9ff2e4d4002..ca5c7e6519c 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h
@@ -30,16 +30,13 @@
 
 #pragma once
 
-#ifndef __LADDERPREFERENCES_H__
-#define __LADDERPREFERENCES_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 #include "Common/UserPreferences.h"
 
 //-----------------------------------------------------------------------------
-// LadderPreferences base class 
+// LadderPreferences base class
 //-----------------------------------------------------------------------------
 
 class LadderPref
@@ -59,7 +56,7 @@ class LadderPref
 typedef std::map<time_t, LadderPref> LadderPrefMap;
 
 //-----------------------------------------------------------------------------
-// LadderPreferences base class 
+// LadderPreferences base class
 //-----------------------------------------------------------------------------
 class LadderPreferences : public UserPreferences
 {
@@ -76,5 +73,3 @@ class LadderPreferences : public UserPreferences
 private:
 	LadderPrefMap m_ladders;
 };
-
-#endif // __LADDERPREFERENCES_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Language.h b/GeneralsMD/Code/GameEngine/Include/Common/Language.h
index c293ebd83a5..257c60a1d2b 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Language.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Language.h
@@ -24,12 +24,12 @@
 
 // FILE: Language.h ///////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __LANGUAGE_H_
-#define __LANGUAGE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -75,34 +72,9 @@ typedef enum
 
 } LanguageID;
 
-#define GameStrcpy wcscpy
-#define GameStrncpy wcsncpy
-#define GameStrlen wcslen
-#define GameStrcat wcscat
-#define GameStrcmp wcscmp
-#define GameStrncmp wcsncmp
-#define GameStricmp wcsicmp
-#define GameStrnicmp wcsnicmp
-#define GameStrtok wcstok
-#define GameSprintf swprintf
-#define GameVsprintf vswprintf
-/// @todo -- add a non-malloc-based string dup func #define GameStrdup wcsdup
-#define GameAtoi(S) wcstol( (S), NULL, 10)
-#define GameAtod(S) wcstod( (S), NULL )
-#define GameItoa _itow
-#define GameSscanf swscanf
-#define GameStrstr wcsstr 
-#define GameStrchr wcschr
-#define GameIsDigit iswdigit
-#define GameIsAscii iswascii
-#define GameIsAlNum iswalnum
-#define GameIsAlpha iswalpha
 #define GameArrayEnd(array) (array)[(sizeof(array)/sizeof((array)[0]))-1] = 0
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
 extern LanguageID OurLanguage;  ///< our current language definition
-
-#endif // __LANGUAGE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h b/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h
index c18a484ea3a..a3bbe9c2adf 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __LATCHRESTORE_H__
-#define __LATCHRESTORE_H__
-
 /*
 	The purpose of the LatchRestore class is to allow you to override member variables for the scope
 	of a function. Here's the code that this saves:
@@ -92,7 +89,7 @@
 
 */
 
-template <typename T> 
+template <typename T>
 class LatchRestore
 {
 	protected:
@@ -111,7 +108,3 @@ class LatchRestore
 			whereToRestore = valueToRestore;
 		}
 };
-
-
-#endif /* __LATCHRESTORE_H__ */
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/List.h b/GeneralsMD/Code/GameEngine/Include/Common/List.h
index 8a748ccc78a..b13581c861c 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/List.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/List.h
@@ -23,17 +23,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    WSYS Library
 //
-// Module:     
+// Module:
 //
 // File name:  wsys/List.h
 //
@@ -43,17 +43,11 @@
 
 #pragma once
 
-
-#ifndef	__WSYS_LIST_H
-#define	__WSYS_LIST_H
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
-#ifndef _BASE_TYPE_H_
 #include <Lib/BaseType.h>
-#endif
 
 //----------------------------------------------------------------------------
 //           Forward References
@@ -83,7 +77,7 @@ class	LListNode
 		Int						m_pri;					///< Node's priority, used for sorting
 		void					*m_item;				///< Item we are referencing if any
 		Bool					m_autoDelete;		///< destroy() should call delete
-		
+
 	public:
 
 									LListNode();											///< Constructor
@@ -100,7 +94,7 @@ class	LListNode
 		void					setPriority( Int new_pri );				///< Sets node's priority
 		void*					item( void );											///< Returns the item this links to, if any
 		void					setItem( void *item );						///< Make node point to an item
-		void					destroy( void );									///< Delete node 
+		void					destroy( void );									///< Delete node
 		void					autoDelete( void );
 }	;
 
@@ -118,11 +112,11 @@ class	LList
 	public:
 
 		/// Enumeration of list sorting methods
-		enum SortMode	
-			{ 
+		enum SortMode
+			{
 				ASCENDING,  ///< Lower priority numbers to front of list
 				DESCENDING  ///< Higher priority numbers to front of list
-			};			
+			};
 
 	protected:
 
@@ -158,11 +152,11 @@ class	LList
 }	;
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
 
 inline		Bool					LListNode::inList( void ) { return m_prev != this; };
-inline		Bool					LListNode::isHead( void ) { return ( m_item == (void*)&this->m_item ); }; 
+inline		Bool					LListNode::isHead( void ) { return ( m_item == (void*)&this->m_item ); };
 inline		Int						LListNode::priority( void ) { return m_pri; };
 inline		void					LListNode::setPriority( Int new_pri ) { m_pri = new_pri; };
 inline		void					LListNode::autoDelete( void ) { m_autoDelete = TRUE; };
@@ -170,12 +164,10 @@ inline		void*					LListNode::item( void ) { return m_item; };
 inline		void					LListNode::setItem( void *item ) { m_item = item; };
 
 
-inline		void					LList::addToHead( LListNode *new_node ) { m_head.append( new_node); };	
-inline		void					LList::addToTail( LListNode *new_node ) { m_head.insert( new_node); };	
-inline		LListNode*		LList::firstNode( void ) { return m_head.next();} ;												
-inline		LListNode*		LList::lastNode( void ) { return m_head.prev();} ;												
-inline		void					LList::setSortMode( SortMode new_mode ) { m_sortMode = new_mode; };						
-inline		Bool					LList::isEmpty( void ) { return !m_head.inList(); };											
+inline		void					LList::addToHead( LListNode *new_node ) { m_head.append( new_node); };
+inline		void					LList::addToTail( LListNode *new_node ) { m_head.insert( new_node); };
+inline		LListNode*		LList::firstNode( void ) { return m_head.next();} ;
+inline		LListNode*		LList::lastNode( void ) { return m_head.prev();} ;
+inline		void					LList::setSortMode( SortMode new_mode ) { m_sortMode = new_mode; };
+inline		Bool					LList::isEmpty( void ) { return !m_head.inList(); };
 inline		void					LList::destroy( void ) { clear();};
-
-#endif	//	__GDF_LIST_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/LocalFile.h b/GeneralsMD/Code/GameEngine/Include/Common/LocalFile.h
deleted file mode 100644
index 1bfbaf1a96f..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/LocalFile.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    WSYS Library
-//
-// Module:     IO
-//
-// File name:  LocalFile.h
-//
-// Created:    4/23/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __LOCALFILE_H
-#define __LOCALFILE_H
-
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/file.h"
-
-// srj sez: this was purely an experiment in optimization.
-// at the present time, it doesn't appear to be a good one.
-// but I am leaving the code in for now.
-// if still present in 2003, please nuke.
-#define NO_USE_BUFFERED_IO
-#ifdef USE_BUFFERED_IO
-#include <stdio.h>
-#endif
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// LocalFile
-//===============================
-/**
-  *	File abstraction for standard C file operators: open, close, lseek, read, write
-	*/
-//===============================
-
-class LocalFile : public File
-{
-	MEMORY_POOL_GLUE_ABC(LocalFile)		
-	private:
-
-#ifdef USE_BUFFERED_IO
-		FILE* m_file;
-
-		enum { BUF_SIZE = 32768 };
-		char m_vbuf[BUF_SIZE];	
-#else
-		int m_handle;											///< Local C file handle
-#endif
-		
-	public:
-		
-		LocalFile();										
-		//virtual				~LocalFile();
-
-
-		virtual Bool	open( const Char *filename, Int access = 0 );				///< Open a file for access
-		virtual void	close( void );																			///< Close the file
-		virtual Int		read( void *buffer, Int bytes );										///< Read the specified number of bytes in to buffer: See File::read
-		virtual Int		write( const void *buffer, Int bytes );							///< Write the specified number of bytes from the buffer: See File::write
-		virtual Int		seek( Int new_pos, seekMode mode = CURRENT );				///< Set file position: See File::seek
-		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0);				///< moves file position to after the next new-line
-		virtual Bool	scanInt(Int &newInt);																///< return what gets read in as an integer at the current file position.
-		virtual Bool	scanReal(Real &newReal);														///< return what gets read in as a float at the current file position.
-		virtual	Bool	scanString(AsciiString &newString);									///< return what gets read in as a string at the current file position.
-		/**
-			Allocate a buffer large enough to hold entire file, read 
-			the entire file into the buffer, then close the file.
-			the buffer is owned by the caller, who is responsible
-			for freeing is (via delete[]). This is a Good Thing to
-			use because it minimizes memory copies for BIG files.
-		*/
-		virtual char* readEntireAndClose();
-		virtual File* convertToRAMFile();
-
-};
-
-
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-
-#endif // __LOCALFILE_H
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/LocalFileSystem.h b/GeneralsMD/Code/GameEngine/Include/Common/LocalFileSystem.h
deleted file mode 100644
index 0c54a4deba8..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/LocalFileSystem.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/////// LocalFileSystem.h ////////////////////////////////
-// Bryan Cleveland, August 2002
-//////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __LOCALFILESYSTEM_H
-#define __LOCALFILESYSTEM_H
-
-#include "Common/SubsystemInterface.h"
-#include "FileSystem.h" // for typedefs, etc.
-
-class File;
-
-class LocalFileSystem : public SubsystemInterface
-{
-public:
-	virtual ~LocalFileSystem() {}
-
-	virtual void init() = 0;
-	virtual void reset() = 0;
-	virtual void update() = 0;
-
-	virtual File * openFile(const Char *filename, Int access = 0) = 0;
-	virtual Bool doesFileExist(const Char *filename) const = 0;
-	virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const = 0; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.
-	virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const = 0; ///< see FileSystem.h
-	virtual Bool createDirectory(AsciiString directory) = 0; ///< see FileSystem.h
-
-protected:
-};
-
-extern LocalFileSystem *TheLocalFileSystem;
-
-#endif // __LOCALFILESYSTEM_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h b/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h
deleted file mode 100644
index d71a13005da..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-// MapObject.h
-// Class to encapsulate height map.
-// Author: John Ahlquist, April 2001
-
-#pragma once
-
-#ifndef MapObject_H
-#define MapObject_H
-
-#include "Common/Dict.h"
-#include "Common/GameMemory.h"
-#include "GameClient/TerrainRoads.h"
-
-
-
-class WorldHeightMapInterfaceClass
-{
-public:
-
-  virtual Int getBorderSize() = 0;
-  virtual Real getSeismicZVelocity(Int xIndex, Int yIndex) const = 0;
-  virtual void setSeismicZVelocity(Int xIndex, Int yIndex, Real value) = 0; 
-  virtual Real getBilinearSampleSeismicZVelocity( Int x, Int y) = 0;
-
-};
-
-/** MapObject class 
-Not ref counted.  Do not store pointers to this class.  */
-class WorldHeightMap;
-class RenderObjClass;
-class ThingTemplate;
-class Shadow;
-enum WaypointID CPP_11(: Int);
-
-#define MAP_XY_FACTOR			(10.0f)	 //How wide and tall each height map square is in world space.
-#define MAP_HEIGHT_SCALE	(MAP_XY_FACTOR/16.0f)		//divide all map heights by 8.
-
-// m_flags bit values.
-enum {
-	FLAG_DRAWS_IN_MIRROR		= 0x00000001,			 ///< If set, draws in water mirror.
-	FLAG_ROAD_POINT1				= 0x00000002,			 ///< If set, is the first point in a road segment.
-	FLAG_ROAD_POINT2				= 0x00000004,			 ///< If set, is the second point in a road segment.
-	FLAG_ROAD_FLAGS					= (FLAG_ROAD_POINT1|FLAG_ROAD_POINT2),	 ///< If nonzero, object is a road piece.
-	FLAG_ROAD_CORNER_ANGLED	= 0x00000008,			 ///< If set, the road corner is angled rather than curved.
-	FLAG_BRIDGE_POINT1			= 0x00000010,			 ///< If set, is the first point in a bridge.
-	FLAG_BRIDGE_POINT2			= 0x00000020,			 ///< If set, is the second point in a bridge.
-	FLAG_BRIDGE_FLAGS				= (FLAG_BRIDGE_POINT1|FLAG_BRIDGE_POINT2),	 ///< If nonzero, object is a bridge piece.
-	FLAG_ROAD_CORNER_TIGHT	= 0x00000040,     
-	FLAG_ROAD_JOIN					= 0x00000080,			 ///< If set, this road end does a generic alpha join.			
-	FLAG_DONT_RENDER				= 0x00000100			 ///< If set, do not render this object. Only WB pays attention to this. (Right now, anyways)
-};
-
-class MapObject : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(MapObject, "MapObject")		
-
-// friend doesn't play well with MPO -- srj
-//	friend class WorldHeightMap;
-//	friend class WorldHeightMapEdit;
-//	friend class AddObjectUndoable;
-//	friend class DeleteInfo;
-
-	enum
-	{	
-		MO_SELECTED = 0x01,
-		MO_LIGHT = 0x02,
-		MO_WAYPOINT = 0x04,
-		MO_SCORCH = 0x08
-	};
-
-	// This data is currently written out into the map data file.
-	Coord3D								m_location;					///< Location of the center of the object.
-	AsciiString						m_objectName;				///< The object name.
-	const ThingTemplate*	m_thingTemplate; ///< thing template for map object
-	Real									m_angle;						///< positive x is 0 degrees, angle is counterclockwise in degrees.
-	MapObject*						m_nextMapObject;		///< linked list.
-	Int										m_flags;						///< Bit flags.  
-	Dict									m_properties;				///< general property sheet.
-	// This data is runtime data that is used by the worldbuider editor, but 
-	// not saved in the map file.
-	Int										m_color;		 ///< Display color.
-	RenderObjClass*				m_renderObj; ///< object that renders in the 3d scene.
-	Shadow*								m_shadowObj; ///< object that renders shadow in the 3d scene.
-	RenderObjClass*				m_bridgeTowers[ BRIDGE_MAX_TOWERS ];		///< for bridge towers
-	Int										m_runtimeFlags;
-
-public:
-	static MapObject *TheMapObjectListPtr;
-	static Dict TheWorldDict;
-
-public:
-	MapObject(Coord3D loc, AsciiString name, Real angle, Int flags, const Dict* props,
-						const ThingTemplate *thingTemplate );
-	//~MapObject(void);		///< Note that deleting the head of a list deletes all linked objects in the list.
-
-public:
-
-	Dict *getProperties() { return &m_properties; }	///< return the object's property sheet.
-
-	void setNextMap(MapObject *nextMap) {m_nextMapObject = nextMap;} ///< Link the next map object.
-	const Coord3D *getLocation(void) const {return &m_location;} ///< Get the center point.
-	Real getAngle(void) const {return m_angle;} ///< Get the angle.
-	Int getColor(void) const {return m_color;} ///< Gets whatever ui color we set.
-	void setColor(Int color) {m_color=color;} ///< Sets the ui color.
-	AsciiString getName(void) const {return m_objectName;} ///< Gets the object name
-	void setName(AsciiString name); ///< Sets the object name
-	void setThingTemplate( const ThingTemplate* thing ); ///< set template
-	const ThingTemplate *getThingTemplate( void ) const;
-	MapObject *getNext(void) const {return m_nextMapObject;}		 ///< Next map object in the list.  Not a copy, don't delete it.
-	MapObject *duplicate(void);		 ///< Allocates a copy.  Caller is responsible for delete-ing this when done with it.
-
-	void setAngle(Real angle) {m_angle = normalizeAngle(angle);}
-	void setLocation(Coord3D *pLoc) {m_location = *pLoc;}
-	void setFlag(Int flag) {m_flags |= flag;}
-	void clearFlag(Int flag) {m_flags &= (~flag);}
-	Bool getFlag(Int flag) const {return (m_flags&flag)?true:false;}
-	Int getFlags(void) const {return (m_flags);}
-
-	Bool isSelected(void) const {return (m_runtimeFlags & MO_SELECTED) != 0;}
-	void setSelected(Bool sel) { if (sel) m_runtimeFlags |= MO_SELECTED; else m_runtimeFlags &= ~MO_SELECTED; }
-
-	Bool isLight(void) const {return (m_runtimeFlags & MO_LIGHT) != 0;}
-	Bool isWaypoint(void) const {return (m_runtimeFlags & MO_WAYPOINT) != 0;}
-	Bool isScorch(void) const {return (m_runtimeFlags & MO_SCORCH) != 0;}
-
-	void setIsLight() {m_runtimeFlags |= MO_LIGHT;}
-	void setIsWaypoint() { m_runtimeFlags |= MO_WAYPOINT; }
-	void setIsScorch() { m_runtimeFlags |= MO_SCORCH; }
-
-	void setRenderObj(RenderObjClass *pObj);
-	RenderObjClass *getRenderObj(void) const {return m_renderObj;}
-	void setShadowObj(Shadow *pObj)	{m_shadowObj=pObj;}
-	Shadow *getShadowObj(void) const {return m_shadowObj;}
-
-	RenderObjClass* getBridgeRenderObject( BridgeTowerType type );
-	void setBridgeRenderObject( BridgeTowerType type, RenderObjClass* renderObj );
-
-	WaypointID getWaypointID();
-	AsciiString getWaypointName();
-	void setWaypointID(Int i);
-	void setWaypointName(AsciiString n);
-	
-	// calling validate will call verifyValidTeam and verifyValidUniqueID.
-	void validate(void);
-
-	// verifyValidTeam will either place the map object on an approrpriate team, or leave the 
-	// current team (if it is valid)
-	void verifyValidTeam(void);
-
-	// verifyValidUniqueID will ensure that this unit isn't sharing a number with another unit.
-	void verifyValidUniqueID(void);
-
-	// The fast version doesn't attempt to verify uniqueness. It goes 
-	static void fastAssignAllUniqueIDs(void);
-	
-
-	static MapObject *getFirstMapObject(void) { return TheMapObjectListPtr; }
-	static Dict* getWorldDict() { return &TheWorldDict; }
-	static Int countMapObjectsWithOwner(const AsciiString& n);
-};
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h b/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h
index 65fe2d7ecbb..7d9b0ab3cbf 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _MAP_READER_WRITER_INFO_H_
-#define _MAP_READER_WRITER_INFO_H_
-
 #define K_HEIGHT_MAP_VERSION_1	1	// Height map cell = 5.0
 #define K_HEIGHT_MAP_VERSION_2	2	// Height map cell = 10.0
 #define K_HEIGHT_MAP_VERSION_3	3	// Added m_borderSize
@@ -119,8 +116,6 @@ class FileInputStream : public ChunkInputStream
 };
 */
 
-#endif // _MAP_READER_WRITER_INFO_H_
-
 /*
 	rev K_HEIGHT_MAP_VERSION_4
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h
index aac0d19d60f..b0ae5db5e4a 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _MESSAGE_STREAM_H_
-#define _MESSAGE_STREAM_H_
-
 #include "Common/GameCommon.h"	// ensure we get DUMP_PERF_STATS, or not
 #include "Common/SubsystemInterface.h"
 #include "Lib/BaseType.h"
@@ -54,9 +51,9 @@ union GameMessageArgumentType														///< Union of possible data for given
 	Int							integer;
 	Real 						real;
 	Bool						boolean;
-	ObjectID				objectID;									
-	DrawableID			drawableID;									
-	UnsignedInt			teamID;	
+	ObjectID				objectID;
+	DrawableID			drawableID;
+	UnsignedInt			teamID;
 	UnsignedInt			squadID;
 	Coord3D					location;
 	ICoord2D				pixel;
@@ -65,7 +62,7 @@ union GameMessageArgumentType														///< Union of possible data for given
 	WideChar				wChar;
 };
 
-enum GameMessageArgumentDataType CPP_11(: Int) 
+enum GameMessageArgumentDataType CPP_11(: Int)
 {
 	ARGUMENTDATATYPE_INTEGER,
 	ARGUMENTDATATYPE_REAL,
@@ -83,7 +80,7 @@ enum GameMessageArgumentDataType CPP_11(: Int)
 
 class GameMessageArgument : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessageArgument, "GameMessageArgument")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessageArgument, "GameMessageArgument")
 public:
 	GameMessageArgument*				m_next;									///< The next argument
 	GameMessageArgumentType			m_data;									///< The data storage of an argument
@@ -100,13 +97,13 @@ EMPTY_DTOR(GameMessageArgument)
 class GameMessage : public MemoryPoolObject
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessage, "GameMessage")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessage, "GameMessage")
 
 public:
 
 	/// The various messages which can be sent in a MessageStream
 	/// @todo Replace this hardcoded enum with a generalized system that can be easily changed and updated
-	/** @todo Because the Client will run faster than Logic, we'll need "superceding" messages for events 
+	/** @todo Because the Client will run faster than Logic, we'll need "superceding" messages for events
 						such as mouse movements so we only send the latest one over the net */
 	/**	@todo Create two classes of message: raw input messages, and command messages. Raw input messages
 						will be destroyed when they reach the end of the stream, whereas command messages will be
@@ -141,7 +138,7 @@ class GameMessage : public MemoryPoolObject
 		MSG_RAW_KEY_UP,															///< (KeyDefType) the given key was released
 
 		// Refined Mouse messages
-		// NOTE: All processing should attempt to use these refined mouse messages, rather than the 
+		// NOTE: All processing should attempt to use these refined mouse messages, rather than the
 		// RAW_* variants. (Please.) :-) jkmcd
 		MSG_MOUSE_LEFT_CLICK,												///< (pixelRegion, 0 sized means its a point), (Int, modifier keys)
 		MSG_MOUSE_LEFT_DOUBLE_CLICK,								///< (pixelRegion, 0 sized means its a point), (Int, modifier keys)
@@ -158,7 +155,7 @@ class GameMessage : public MemoryPoolObject
 		// solely to provide an abstraction layer useful for keyboard/mouse remapping.
 		// they should NEVER be sent over the network.
 		MSG_BEGIN_META_MESSAGES,										///< Marker to delineate "meta" messages
-		
+
 		MSG_META_SAVE_VIEW1,												///< save current view as the given user-defined view
 		MSG_META_SAVE_VIEW2,												///< save current view as the given user-defined view
 		MSG_META_SAVE_VIEW3,												///< save current view as the given user-defined view
@@ -216,11 +213,12 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_VIEW_TEAM8,												///< center view on given user-defined team (but do not affect selection)
 		MSG_META_VIEW_TEAM9,												///< center view on given user-defined team (but do not affect selection)
 
-		MSG_META_SELECT_MATCHING_UNITS,              ///< selects mathcing units, used for both on screen and across map 
+		MSG_META_SELECT_MATCHING_UNITS,              ///< selects mathcing units, used for both on screen and across map
 		MSG_META_SELECT_NEXT_UNIT,									///< select 'next' unit
 		MSG_META_SELECT_PREV_UNIT,									///< select 'prev' unit
 		MSG_META_SELECT_NEXT_WORKER,                ///< select 'next' worker
 		MSG_META_SELECT_PREV_WORKER,                ///< select 'prev' worker
+		MSG_META_SELECT_NEXT_IDLE_WORKER,                        ///< TheSuperHackers @feature L3-M 03/08/2025 select next idle worker
 		MSG_META_VIEW_COMMAND_CENTER,								///< center view on command center
 		MSG_META_VIEW_LAST_RADAR_EVENT,							///< center view on last radar event
 		MSG_META_SELECT_HERO,                       ///< selects player's hero character, if exists...
@@ -236,12 +234,17 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_CHAT_EVERYONE,											///< send chat msg to everyone (incl. observers)
 		MSG_META_DIPLOMACY,													///< bring up diplomacy screen
 		MSG_META_OPTIONS,														///< bring up options screen
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		MSG_META_HELP,															///< bring up help screen
 #endif
 
+		MSG_META_INCREASE_MAX_RENDER_FPS,						///< TheSuperHackers @feature Increase the max render fps
+		MSG_META_DECREASE_MAX_RENDER_FPS,						///< TheSuperHackers @feature Decrease the max render fps
+		MSG_META_INCREASE_LOGIC_TIME_SCALE,					///< TheSuperHackers @feature Increase the logic time scale
+		MSG_META_DECREASE_LOGIC_TIME_SCALE,					///< TheSuperHackers @feature Decrease the logic time scale
 		MSG_META_TOGGLE_LOWER_DETAILS,							///< toggles graphics options to crappy mode instantly
 		MSG_META_TOGGLE_CONTROL_BAR,								///< show/hide controlbar
+		MSG_META_TOGGLE_PLAYER_OBSERVER,						///< TheSuperHackers @feature Toggle the player observer view in game
 
 		MSG_META_BEGIN_PATH_BUILD,									///< enter path-building mode
 		MSG_META_END_PATH_BUILD,										///< exit path-building mode
@@ -257,11 +260,13 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_TAKE_SCREENSHOT,										///< take screenshot
 		MSG_META_ALL_CHEER,													///< Yay! :)
 		MSG_META_TOGGLE_ATTACKMOVE,									///< enter attack-move mode
-		
+
 		MSG_META_BEGIN_CAMERA_ROTATE_LEFT,
 		MSG_META_END_CAMERA_ROTATE_LEFT,
+		MSG_META_ALT_CAMERA_ROTATE_LEFT,						///< TheSuperHackers @feature Rotate camera in 45 degree increments
 		MSG_META_BEGIN_CAMERA_ROTATE_RIGHT,
 		MSG_META_END_CAMERA_ROTATE_RIGHT,
+		MSG_META_ALT_CAMERA_ROTATE_RIGHT,						///< TheSuperHackers @feature Rotate camera in 45 degree increments
 		MSG_META_BEGIN_CAMERA_ZOOM_IN,
 		MSG_META_END_CAMERA_ZOOM_IN,
 		MSG_META_BEGIN_CAMERA_ZOOM_OUT,
@@ -269,11 +274,13 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_CAMERA_RESET,
     MSG_META_TOGGLE_CAMERA_TRACKING_DRAWABLE,
 		MSG_META_TOGGLE_FAST_FORWARD_REPLAY,				///< Toggle the fast forward feature
-		MSG_META_TOGGLE_PAUSE,											///< TheSuperHackers @feature Toggle game pause (in replay playbacks)
-		MSG_META_STEP_FRAME,												///< TheSuperHackers @feature Step one frame (in replay playbacks)
+		MSG_META_TOGGLE_PAUSE,											///< TheSuperHackers @feature Toggle game pause
+		MSG_META_TOGGLE_PAUSE_ALT,									///< TheSuperHackers @feature Toggle game pause (alternative mapping)
+		MSG_META_STEP_FRAME,												///< TheSuperHackers @feature Step one frame
+		MSG_META_STEP_FRAME_ALT,										///< TheSuperHackers @feature Step one frame (alternative mapping)
 		MSG_META_DEMO_INSTANT_QUIT,									///< bail out of game immediately
 
-    
+
 #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h
     MSG_CHEAT_RUNSCRIPT1,										///< run script named "KEY_F1"
 		MSG_CHEAT_RUNSCRIPT2,										///< run script named "KEY_F2"
@@ -300,7 +307,7 @@ class GameMessage : public MemoryPoolObject
 
 		// META items that are really for debug/demo/development use only...
 		// They do not get built into RELEASE builds.
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS,			///< Toggles showing units behind buildings or not
 		MSG_META_DEMO_TOGGLE_LETTERBOX,							///< enable/disable letterbox mode
 		MSG_META_DEMO_TOGGLE_MESSAGE_TEXT,					///< toggle the text from the UI messages
@@ -340,9 +347,9 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_DEMO_BEGIN_ADJUST_FOV,							///< enter adjust-FOV mode
 		MSG_META_DEMO_END_ADJUST_FOV,								///< exit adjust-FOV mode
 		MSG_META_DEMO_LOCK_CAMERA_TO_PLANES,				///< lock camera to airborne thingies
-		MSG_META_DEMO_REMOVE_PREREQ,								///< Turn of Prerequisite checks in building legality
-		MSG_META_DEMO_INSTANT_BUILD,								///< All building is with a timer of 1
-		MSG_META_DEMO_FREE_BUILD,										///< All building is for 0 money
+		MSG_META_DEMO_REMOVE_PREREQ,								///< Turn off Prerequisite checks in building legality, works in MULTIPLAYER for all humans
+		MSG_META_DEMO_INSTANT_BUILD,								///< All building is with a timer of 1, works in MULTIPLAYER for all humans
+		MSG_META_DEMO_FREE_BUILD,										///< All building is for 0 money, works in MULTIPLAYER for all humans
 		MSG_META_DEMO_RUNSCRIPT1,										///< run script named "KEY_F1"
 		MSG_META_DEMO_RUNSCRIPT2,										///< run script named "KEY_F2"
 		MSG_META_DEMO_RUNSCRIPT3,										///< run script named "KEY_F3"
@@ -395,7 +402,7 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_DEBUG_VTUNE_OFF,										///< turn on/off Vtune
 		MSG_META_DEBUG_TOGGLE_FEATHER_WATER, 			///< toggle lorenzen's feather water
 
-		MSG_META_DEBUG_DUMP_ASSETS,						///< dumps currently used map assets to a file. 
+		MSG_META_DEBUG_DUMP_ASSETS,						///< dumps currently used map assets to a file.
 
 		MSG_NO_DRAW,																///< show/hide all objects to test Drawing code
 		MSG_META_DEMO_TOGGLE_METRICS,								///< Toggle the metrics on/off
@@ -404,10 +411,10 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_DEMO_TOGGLE_THREATDEBUG,						///< Toggle the threat debugger on/off
 		MSG_META_DEMO_TOGGLE_CASHMAPDEBUG,					///< Toggle the cash map debugger on/off
 		MSG_META_DEMO_TOGGLE_GRAPHICALFRAMERATEBAR,	///< Toggle the graphical framerate bar on/off
-		MSG_META_DEMO_GIVE_ALL_SCIENCES,						///< grant all grantable sciences
-		MSG_META_DEMO_GIVE_RANKLEVEL,								///< up one RankLevel
-		MSG_META_DEMO_TAKE_RANKLEVEL,								///< up one RankLevel
-		MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS,		///< give yourself an SPP (but no rank change)
+		MSG_META_DEMO_GIVE_ALL_SCIENCES,						///< grant all available sciences, works in MULTIPLAYER for all humans
+		MSG_META_DEMO_GIVE_RANKLEVEL,								///< up one rank level
+		MSG_META_DEMO_TAKE_RANKLEVEL,								///< up one rank level
+		MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS,		///< give a science purchase point (but no rank change)
 		MSG_META_DEBUG_TOGGLE_NETWORK,							///< toggle between having and not having network traffic.
 		MSG_META_DEBUG_DUMP_PLAYER_OBJECTS,					///< Dump numbers of objects owned by each player to the script debug window
 		MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS,			///< Dump numbers of objects owned by each player to the script debug window, and additional object info
@@ -418,11 +425,11 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_DEBUG_WIN,													///< Instant Win
 		MSG_META_DEMO_TOGGLE_DEBUG_STATS,						///< show/hide the debug stats
 		/// @todo END section to REMOVE (not disable) for release
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // defined(RTS_DEBUG)
 
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 		MSG_META_DEMO_TOGGLE_AUDIODEBUG,						///< show/hide the audio debug info
-#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#endif//defined(RTS_DEBUG)
 #ifdef DUMP_PERF_STATS
 		MSG_META_DEMO_PERFORM_STATISTICAL_DUMP,			///< dump performance stats for this frame to StatisticsDump.txt
 #endif//DUMP_PERF_STATS
@@ -536,7 +543,7 @@ class GameMessage : public MemoryPoolObject
 		MSG_DO_SPECIAL_POWER,												///< do special
 		MSG_DO_SPECIAL_POWER_AT_LOCATION,						///< do special with target location
 		MSG_DO_SPECIAL_POWER_AT_OBJECT,							///< do special at with target object
-		MSG_SET_RALLY_POINT,												///< (objectID, location) 
+		MSG_SET_RALLY_POINT,												///< (objectID, location)
 		MSG_PURCHASE_SCIENCE,												///< purchase a science
 		MSG_QUEUE_UPGRADE,													///< queue the "research" of an upgrade
 		MSG_CANCEL_UPGRADE,													///< cancel the "research" of an upgrade
@@ -544,10 +551,10 @@ class GameMessage : public MemoryPoolObject
 		MSG_CANCEL_UNIT_CREATE,											///< clicked on UI button to cancel production of a unit
 		MSG_DOZER_CONSTRUCT,												/**< building things requires clicking on a dozer
 																										 selecting what to build, selecting where to
-																										 build it ... this construct message will 
+																										 build it ... this construct message will
 																										 start the actual build process */
 		MSG_DOZER_CONSTRUCT_LINE,										///< Like MSG_CONSTRUCT, but for build procesess that occur in a line (like walls)
-		MSG_DOZER_CANCEL_CONSTRUCT,									///< cancel construction of a building 
+		MSG_DOZER_CANCEL_CONSTRUCT,									///< cancel construction of a building
 		MSG_SELL,																		///< sell a structure
 		MSG_EXIT,																		///< WE want to exit from whatever WE are inside of
 		MSG_EVACUATE,																///< Dump out all of OUR contained objects
@@ -565,8 +572,8 @@ class GameMessage : public MemoryPoolObject
 		MSG_ENTER,																	///< Enter object
 		MSG_DOCK,																		///< Dock with this object
 		MSG_DO_MOVETO,															///< location
-		MSG_DO_ATTACKMOVETO,												///< location 
-		MSG_DO_FORCEMOVETO,													///< location 
+		MSG_DO_ATTACKMOVETO,												///< location
+		MSG_DO_FORCEMOVETO,													///< location
 		MSG_ADD_WAYPOINT,														///< location
 		MSG_DO_GUARD_POSITION,											///< Guard with the currently selected group
 		MSG_DO_GUARD_OBJECT,												///< Guard with the currently selected group
@@ -597,7 +604,7 @@ class GameMessage : public MemoryPoolObject
 
 		MSG_BEGIN_DEBUG_NETWORK_MESSAGES = 1900,		///< network messages that exist only in debug/internal builds. all grouped separately.
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 		// all debug/internal-only messages must go here.
 		MSG_DEBUG_KILL_SELECTION,
 		MSG_DEBUG_HURT_OBJECT,
@@ -631,8 +638,8 @@ class GameMessage : public MemoryPoolObject
 	Type getType( void ) const { return m_type; }					///< Return the message type
 	UnsignedByte getArgumentCount( void ) const { return m_argCount; }	///< Return the number of arguments for this msg
 
-	AsciiString getCommandAsAsciiString( void ); ///< returns a string representation of the command type.
-	static AsciiString getCommandTypeAsAsciiString(GameMessage::Type t);
+	const char *getCommandAsString( void ) const; ///< returns a string representation of the command type.
+	static const char *getCommandTypeAsString(GameMessage::Type t);
 
 	Int getPlayerIndex( void ) const { return m_playerIndex; }		///< Return the originating player
 
@@ -700,7 +707,7 @@ class GameMessageList : public SubsystemInterface
 	virtual void reset( void ) { };			///< Reset system
 	virtual void update( void ) { };		///< Update system
 
-	GameMessage *getFirstMessage( void ) { return m_firstMessage; }	///< Return the first message 
+	GameMessage *getFirstMessage( void ) { return m_firstMessage; }	///< Return the first message
 
 	virtual void appendMessage( GameMessage *msg );			///< Add message to end of the list
 	virtual void insertMessage( GameMessage *msg, GameMessage *messageToInsertAfter );	// Insert message after messageToInsertAfter.
@@ -714,7 +721,7 @@ class GameMessageList : public SubsystemInterface
 	GameMessage *m_lastMessage;									///< The last message on the list
 };
 
-/** 
+/**
 	What to do with a GameMessage after a translator has handled it.
 	Use a custom enum (rather than a Bool) to make the code more obvious.
 */
@@ -732,7 +739,7 @@ class GameMessageTranslator
 };
 
 /**
- * A MessageStream contains an ordered list of messages which can have one or more 
+ * A MessageStream contains an ordered list of messages which can have one or more
  * prioritized message handler functions ("translators") attached to it.
  */
 class MessageStream : public GameMessageList
@@ -754,7 +761,7 @@ class MessageStream : public GameMessageList
 	// Methods NOT Inherited ------------------------------------------------------------------------
 	void propagateMessages( void );													///< Propagate messages through attached translators
 
-	/** 
+	/**
 		Attach a translator function to the stream at a priority value. Lower priorities are executed first.
 		Note that MessageStream assumes ownership of the translator, and is responsible for freeing it!
 	*/
@@ -833,5 +840,3 @@ extern CommandList *TheCommandList;
  * construct a valid 2D bounding region.
  */
 extern void buildRegion( const ICoord2D *anchor, const ICoord2D *dest, IRegion2D *region );
-
-#endif // _MESSAGE_STREAM_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MiscAudio.h b/GeneralsMD/Code/GameEngine/Include/Common/MiscAudio.h
deleted file mode 100644
index 5c032f736db..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/MiscAudio.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///MiscAudio.h/////////////////////////////////////////////////////////////////////////////////////
-// This file is for miscellaneous sound hooks that don't have another happy home.
-
-#pragma once
-
-#ifndef _MISCAUDIO_H_
-#define _MISCAUDIO_H_
-
-#include "Common/AudioEventRTS.h"
-
-struct MiscAudio
-{
-	static const FieldParse m_fieldParseTable[];
-	
-	AudioEventRTS m_radarUnitUnderAttackSound;						///< radar sounds to play when unit under attack
-	AudioEventRTS m_radarHarvesterUnderAttackSound;				///< radar sounds to play when harvester under attack
-	AudioEventRTS m_radarStructureUnderAttackSound;				///< radar sounds to play when structure under attack
-	AudioEventRTS m_radarUnderAttackSound;								///< radar sounds to play when ? under attack
-	AudioEventRTS m_radarInfiltrationSound;								///< radar sounds to play when something is infiltrated
-	AudioEventRTS m_radarOnlineSound;											///< radar sounds to play when radar goes online
-	AudioEventRTS m_radarOfflineSound;										///< radar sounds to play when radar goes offline
-	AudioEventRTS m_defectorTimerTickSound;								///< snd to play during transient invulnerability while defecting // lorenzen
-	AudioEventRTS m_defectorTimerDingSound;								///< snd to play when you become vulnerable again // lorenzen
-	AudioEventRTS m_lockonTickSound;											///< snd to play during stealth-fighter-lockon period
-	AudioEventRTS m_allCheerSound;												///< snd to play when user presses 'cheer' key
-	AudioEventRTS m_battleCrySound;												///< snd to play when user presses 'battlecry' key
-	AudioEventRTS m_guiClickSound;												///< snd to play when user presses button in GUI
-	AudioEventRTS m_noCanDoSound;													///< Global "No Can Do" sound
-	AudioEventRTS	m_stealthDiscoveredSound;								///< I have just discovered an enemy stealth unit
-	AudioEventRTS	m_stealthNeutralizedSound;							///< One of my stealthed units has just been discovered by the enemy
-	AudioEventRTS m_moneyDepositSound;										///< Money was deposited in my bank
-	AudioEventRTS m_moneyWithdrawSound;										///< Money was withdrawn from my bank
-	AudioEventRTS m_buildingDisabled;											///< Building has lost power, been hit with an EMP, or disable hacked.
-	AudioEventRTS m_buildingReenabled;										///< Building has recovered from being disabled.
-	AudioEventRTS m_vehicleDisabled;											///< Vehicle has been disabled via EMP or hacker attack.
-	AudioEventRTS m_vehicleReenabled;											///< Vehicle has recovered from being disabled.
-	AudioEventRTS m_splatterVehiclePilotsBrain;						///< Pilot has been sniped by Jarmen Kell.
-	AudioEventRTS m_terroristInCarMoveVoice;							///< Terrorist issues a move order while in a car.
-	AudioEventRTS m_terroristInCarAttackVoice;						///< Terrorist issues attack order while in a car.
-	AudioEventRTS m_terroristInCarSelectVoice;						///< Terrorist is selected while in a car.
-	AudioEventRTS m_crateHeal;														///< When heal crate is picked up.
-	AudioEventRTS m_crateShroud;													///< When shroud crate is picked up.
-	AudioEventRTS m_crateSalvage;													///< When salvage crate is picked up.
-	AudioEventRTS m_crateFreeUnit;												///< When free unit crate is picked up.
-	AudioEventRTS m_crateMoney;														///< When money crate is picked up.
-	AudioEventRTS m_unitPromoted;													///< Unit is promoted.
-	AudioEventRTS m_repairSparks;													///< Battle drone repairs unit.
-	AudioEventRTS m_sabotageShutDownBuilding;											///< When Saboteur hits a building 
-	AudioEventRTS m_sabotageResetTimerBuilding;											///< When Saboteur hits a building 
-	AudioEventRTS m_aircraftWheelScreech;									///< When a jet lands on a runway.
-};
-
-
-#endif /* _MISCAUDIO_H_ */
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h b/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h
index 3d2a1fd09c7..a1cc8e0924b 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h
@@ -24,12 +24,12 @@
 
 // FILE: MissionStats.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,16 +44,13 @@
 
 #pragma once
 
-#ifndef _MISSIONSTATS_H_
-#define _MISSIONSTATS_H_
-
 #include "Lib/BaseType.h"
 #include "Common/GameCommon.h"
 #include "Common/Snapshot.h"
 
 // ----------------------------------------------------------------------------------------------
 /**
-	Class that accumulates stats during a mission. Some of this will be for scoring purposes, 
+	Class that accumulates stats during a mission. Some of this will be for scoring purposes,
 	and some will probably be used by AI to determine future moves.
 
 	@todo: not sure what need to be here. Alas. For now, I have just put in the fields from RA2
@@ -64,7 +61,7 @@ class MissionStats : public Snapshot
 {
 
 public:
-	
+
 	MissionStats();
 
 	/// reset all stats to "nothing".
@@ -85,6 +82,3 @@ class MissionStats : public Snapshot
 	Int m_buildingsLost;													///< how many of our buildings were destroyed?
 	//Int	m_whoLastHurtMe;													///< last Player to destroy one of my units
 };
-
-#endif // _MISSIONSTATS_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h b/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h
index 856c99d1330..84593b60833 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _ModelState_H_
-#define _ModelState_H_
-
 #include "Lib/BaseType.h"
 #include "Common/INI.h"
 #include "Common/BitFlags.h"
@@ -42,45 +39,45 @@
 	THE PROBLEM
 	-----------
 
-	-- there are lots of different states. (consider that structures can be: day/night, snow/nosnow, 
+	-- there are lots of different states. (consider that structures can be: day/night, snow/nosnow,
 	powered/not, garrisoned/empty, damaged/not... you do the math.)
 
-	-- some states are mutually exclusive (idle vs. moving), others are not (snow/nosnow, day/night). 
-	generally, humanoid units have mostly the former, while structure units have mostly the latter. 
+	-- some states are mutually exclusive (idle vs. moving), others are not (snow/nosnow, day/night).
+	generally, humanoid units have mostly the former, while structure units have mostly the latter.
 	The current ModelState system really only supports the mutually-exclusive states well.
 
-	-- we'd rather not have to specify every state in the INI files, BUT we do want to be able 
+	-- we'd rather not have to specify every state in the INI files, BUT we do want to be able
 	to intelligently choose the best model for a given state, whether or not a "real" state exists for it.
 
-	-- it would be desirable to have a unified way of representing "ModelState" so that we don't 
+	-- it would be desirable to have a unified way of representing "ModelState" so that we don't
 	have multiple similar-yet-different systems.
 
 	YUCK, WHAT NOW
 	--------------
 
-	Let's represent the Model State with two dictinct pieces: 
-	
-	-- an "ActionState" piece, representing the mutually-exclusive states, which are almost 
+	Let's represent the Model State with two dictinct pieces:
+
+	-- an "ActionState" piece, representing the mutually-exclusive states, which are almost
 		always an action of some sort
-		
-	-- and a "ConditionState" piece, which is a set of bitflags to indicate the static "condition" 
+
+	-- and a "ConditionState" piece, which is a set of bitflags to indicate the static "condition"
 		of the model.
 
 	Note that these are usually set independently in code, but they are lumped together in order to
 	determine the actual model to be used.
 
-	(Let's require all objects would be required to have an "Idle" ActionState, which is the 
-	normal, just-sitting there condition.) 
+	(Let's require all objects would be required to have an "Idle" ActionState, which is the
+	normal, just-sitting there condition.)
 
-	From a code point of view, this becomes an issue of requesting a certain state, and 
+	From a code point of view, this becomes an issue of requesting a certain state, and
 	finding the best-fit match for it. So, what are the rules for finding a good match?
 
-	-- Action states must match exactly. If the desired action state is not found, then the 
+	-- Action states must match exactly. If the desired action state is not found, then the
 	IDLE state is substituted (but this should generally be considered an error condition).
 
-	-- Condition states choose the match with the closest match among the "Condition" bits in the 
+	-- Condition states choose the match with the closest match among the "Condition" bits in the
 	INI file, based on satisfying the most of the "required" conditions and the fewest of the
-	"forbidden" conditions. 
+	"forbidden" conditions.
 
 */
 
@@ -94,13 +91,11 @@ enum ModelConditionFlagType CPP_11(: Int)
 {
 	MODELCONDITION_INVALID = -1,
 
-	MODELCONDITION_FIRST = 0,
-
 //
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-	MODELCONDITION_TOPPLED = MODELCONDITION_FIRST,
+	MODELCONDITION_TOPPLED,
 	MODELCONDITION_FRONTCRUSHED,
 	MODELCONDITION_BACKCRUSHED,
 	MODELCONDITION_DAMAGED,
@@ -118,7 +113,7 @@ enum ModelConditionFlagType CPP_11(: Int)
 	MODELCONDITION_WEAPONSET_CRATEUPGRADE_ONE,
 	MODELCONDITION_WEAPONSET_CRATEUPGRADE_TWO,
 	MODELCONDITION_WEAPONSET_PLAYER_UPGRADE,
-	MODELCONDITION_DOOR_1_OPENING, 
+	MODELCONDITION_DOOR_1_OPENING,
 	MODELCONDITION_DOOR_1_CLOSING,
 	MODELCONDITION_DOOR_1_WAITING_OPEN,
 	MODELCONDITION_DOOR_1_WAITING_TO_CLOSE,
@@ -189,7 +184,7 @@ enum ModelConditionFlagType CPP_11(: Int)
 
 	//Special model conditions work as following:
 	//Something turns it on... but a timer in the object will turn them off after a given
-	//amount of time. If you add any more special animations, then you'll need to add the 
+	//amount of time. If you add any more special animations, then you'll need to add the
 	//code to turn off the state.
 	MODELCONDITION_SPECIAL_CHEERING,	//When units do a victory cheer (or player initiated cheer).
 
@@ -242,7 +237,8 @@ enum ModelConditionFlagType CPP_11(: Int)
 // existing values!
 //
 
-	MODELCONDITION_COUNT	// keep last!
+	MODELCONDITION_COUNT,
+	MODELCONDITION_FIRST = 0,
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -261,6 +257,3 @@ typedef BitFlags<MODELCONDITION_COUNT> ModelConditionFlags;
 //-------------------------------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------------------------------
-
-#endif // _ModelState_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Module.h b/GeneralsMD/Code/GameEngine/Include/Common/Module.h
index 474baab49d1..e6ea3dd33ce 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Module.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Module.h
@@ -31,9 +31,6 @@
 
 #pragma once
 
-#ifndef __MODULE_H_
-#define __MODULE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "Common/GameMemory.h"
@@ -55,7 +52,7 @@ struct FieldParse;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum ModuleType CPP_11(: Int) 
+enum ModuleType CPP_11(: Int)
 {
 	MODULETYPE_BEHAVIOR = 0,
 
@@ -70,7 +67,7 @@ enum ModuleType CPP_11(: Int)
 	MODULETYPE_CLIENT_UPDATE = 2,
 	// put new drawable module types here
 
-	NUM_MODULE_TYPES,  // keep this last!
+	NUM_MODULE_TYPES,
 
 	FIRST_DRAWABLE_MODULE_TYPE = MODULETYPE_DRAW,
 	LAST_DRAWABLE_MODULE_TYPE = MODULETYPE_CLIENT_UPDATE,
@@ -80,7 +77,7 @@ enum ModuleType CPP_11(: Int)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-enum ModuleInterfaceType CPP_11(: Int) 
+enum ModuleInterfaceType CPP_11(: Int)
 {
 	MODULEINTERFACE_UPDATE					= 0x00000001,
 	MODULEINTERFACE_DIE							= 0x00000002,
@@ -110,14 +107,14 @@ class ModuleData : public Snapshot
 	NameKeyType getModuleTagNameKey() const { return m_moduleTagNameKey; }
 
 	virtual Bool isAiModuleData() const { return false; }
-	
+
 	// ugh, hack
 	virtual const W3DModelDrawModuleData* getAsW3DModelDrawModuleData() const { return NULL; }
 	// ugh, hack
 	virtual const W3DTreeDrawModuleData* getAsW3DTreeDrawModuleData() const { return NULL; }
 	virtual StaticGameLODLevel getMinimumRequiredGameLOD() const { return (StaticGameLODLevel)0;}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
 		// nothing
 	}
@@ -173,7 +170,7 @@ public: \
 	MAKE_STANDARD_MODULE_DATA_MACRO_ABC(cls, clsmd)
 
 //-------------------------------------------------------------------------------------------------
-/** Common interface for thing modules, we want a single common base class 
+/** Common interface for thing modules, we want a single common base class
 	* for all the modules (either object or drawable) so that we can use
 	* a single module factory to handle instancing them ... it's just
 	* convenient this way */
@@ -195,15 +192,15 @@ class Module : public MemoryPoolObject,
 
 	virtual NameKeyType getModuleNameKey() const = 0;
 
-	inline NameKeyType getModuleTagNameKey() const { return getModuleData()->getModuleTagNameKey(); }
+	NameKeyType getModuleTagNameKey() const { return getModuleData()->getModuleTagNameKey(); }
 
 	/** this is called after all the Modules for a given Thing are created; it
 		allows Modules to resolve any inter-Module dependencies.
 	*/
 	virtual void onObjectCreated() { }
-	
+
 	/**
-		this is called whenever a drawable is bound to the object. 
+		this is called whenever a drawable is bound to the object.
 		drawable is NOT guaranteed to be non-null.
 	*/
 	virtual void onDrawableBoundToObject() { }
@@ -217,7 +214,7 @@ class Module : public MemoryPoolObject,
 
 protected:
 
-	inline const ModuleData* getModuleData() const { return m_moduleData; }
+	const ModuleData* getModuleData() const { return m_moduleData; }
 
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
@@ -226,7 +223,7 @@ class Module : public MemoryPoolObject,
 private:
 	const ModuleData* m_moduleData;
 
-};  // end Module
+};
 //-------------------------------------------------------------------------------------------------
 
 
@@ -255,8 +252,8 @@ class ObjectModule : public Module
 
 protected:
 
-	inline Object *getObject() { return m_object; }
-	inline const Object *getObject() const { return m_object; }
+	Object *getObject() { return m_object; }
+	const Object *getObject() const { return m_object; }
 
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
@@ -298,8 +295,8 @@ class DrawableModule : public Module
 
 protected:
 
-	inline Drawable *getDrawable() { return m_drawable; }
-	inline const Drawable *getDrawable() const { return m_drawable; }
+	Drawable *getDrawable() { return m_drawable; }
+	const Drawable *getDrawable() const { return m_drawable; }
 
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
@@ -318,7 +315,3 @@ class DrawableModule : public Module
 //-------------------------------------------------------------------------------------------------
 /** VARIOUS MODULE INTERFACES */
 //-------------------------------------------------------------------------------------------------
-
-
-#endif // __MODULE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h b/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h
index bfecf7970b4..a7af21cd32c 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h
@@ -27,7 +27,7 @@
 // Desc:	 TheModuleFactory is where we actually instance modules for objects
 //				 and drawbles.  Those modules are things such as an UpdateModule
 //			   or DamageModule or DrawModule etc.
-//	
+//
 //				 TheModuleFactory will contain a list of ModuleTemplates, when we
 //				 request a new module, we will look for that template in our
 //				 list and create it
@@ -36,9 +36,6 @@
 
 #pragma once
 
-#ifndef __MODULEFACTORY_H_
-#define __MODULEFACTORY_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include <stdlib.h>
 
@@ -79,7 +76,7 @@ class ModuleFactory : public SubsystemInterface, public Snapshot
 
 	Module *newModule( Thing *thing, const AsciiString& name, const ModuleData* data, ModuleType type );  ///< allocate a new module
 
-	// module-data 
+	// module-data
 	ModuleData* newModuleDataFromINI(INI* ini, const AsciiString& name, ModuleType type, const AsciiString& moduleTag);
 
 	Int findModuleInterfaceMask(const AsciiString& name, ModuleType type);
@@ -122,10 +119,7 @@ class ModuleFactory : public SubsystemInterface, public Snapshot
 	ModuleTemplateMap			m_moduleTemplateMap;
 	ModuleDataList				m_moduleDataList;
 
-};  // end class ModuleFactory
+};
 
 // EXTERN /////////////////////////////////////////////////////////////////////////////////////////
 extern ModuleFactory *TheModuleFactory;  ///< singleton definition
-
-#endif // __MODULEFACTORY_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Money.h b/GeneralsMD/Code/GameEngine/Include/Common/Money.h
index 3f1a797559e..4789fa9301b 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Money.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Money.h
@@ -24,12 +24,12 @@
 
 // FILE: Money.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,13 +44,12 @@
 
 #pragma once
 
-#ifndef _MONEY_H_
-#define _MONEY_H_
-
 #include "Lib/BaseType.h"
 #include "Common/Debug.h"
 #include "Common/Snapshot.h"
 
+class AudioEventRTS;
+
 // ----------------------------------------------------------------------------------------------
 /**
 	How much "money" (Tiberium, Gems, Magic Resource Boxes, whatever) the Player has.
@@ -62,26 +61,31 @@ class Money : public Snapshot
 
 public:
 
-	inline Money() : m_money(0), m_playerIndex(0)
+	Money() : m_playerIndex(0)
 	{
+		init();
 	}
 
 	void init()
 	{
-		m_money = 0;
+		setStartingCash(0);
 	}
 
-	inline UnsignedInt countMoney() const 
-	{ 
-		return m_money; 
+	UnsignedInt countMoney() const
+	{
+		return m_money;
 	}
 
 	/// returns the actual amount withdrawn, which may be less than you want. (sorry, can't go into debt...)
 	UnsignedInt withdraw(UnsignedInt amountToWithdraw, Bool playSound = TRUE);
-	void deposit(UnsignedInt amountToDeposit, Bool playSound = TRUE);
+	void deposit(UnsignedInt amountToDeposit, Bool playSound = TRUE, Bool trackIncome = TRUE);
+
+	void setStartingCash(UnsignedInt amount);
+	void updateIncomeBucket();
+	UnsignedInt getCashPerMinute() const;
 
 	void setPlayerIndex(Int ndx) { m_playerIndex = ndx; }
-	
+
   static void parseMoneyAmount( INI *ini, void *instance, void *store, const void* userData );
 
   // Does the amount of this == the amount of that (compare everything except m_playerIndex)
@@ -91,6 +95,9 @@ class Money : public Snapshot
   }
 
 protected:
+
+	void triggerAudioEvent(const AudioEventRTS& audioEvent);
+
 	// snapshot methods
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
@@ -100,7 +107,7 @@ class Money : public Snapshot
 
 	UnsignedInt m_money;	///< amount of money
 	Int m_playerIndex;	///< what is my player index?
+	UnsignedInt m_incomeBuckets[60];	///< circular buffer of 60 seconds for income tracking
+	UnsignedInt m_currentBucket;
+	UnsignedInt m_cashPerMinute;
 };
-
-#endif // _MONEY_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h b/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h
index e5edfff2463..9590ffda765 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _MULTIPLAYERSETTINGS_H_
-#define _MULTIPLAYERSETTINGS_H_
-
 #include "GameClient/Color.h"
 #include "Common/Money.h"
 
@@ -49,11 +46,11 @@ class MultiplayerColorDefinition
 	static const FieldParse m_colorFieldParseTable[];		///< the parse table for INI definition
 	const FieldParse *getFieldParse( void ) const { return m_colorFieldParseTable; }
 
-	inline AsciiString getTooltipName(void) const { return m_tooltipName; };
-	inline RGBColor getRGBValue(void) const { return m_rgbValue; };
-	inline RGBColor getRGBNightValue(void) const { return m_rgbValueNight; };
-	inline Color getColor(void) const { return m_color; }
-	inline Color getNightColor(void) const { return m_colorNight; }
+	AsciiString getTooltipName(void) const { return m_tooltipName; };
+	RGBColor getRGBValue(void) const { return m_rgbValue; };
+	RGBColor getRGBNightValue(void) const { return m_rgbValueNight; };
+	Color getColor(void) const { return m_color; }
+	Color getNightColor(void) const { return m_colorNight; }
 	void setColor( RGBColor rgb );
 	void setNightColor( RGBColor rgb );
 
@@ -95,14 +92,14 @@ class MultiplayerSettings : public SubsystemInterface
 	MultiplayerColorDefinition * findMultiplayerColorDefinitionByName(AsciiString name);
 	MultiplayerColorDefinition * newMultiplayerColorDefinition(AsciiString name);
 
-	inline Int getStartCountdownTimerSeconds( void ) { return m_startCountdownTimerSeconds; }
-	inline Int getMaxBeaconsPerPlayer( void ) { return m_maxBeaconsPerPlayer; }
-	inline Bool isShroudInMultiplayer( void ) { return m_isShroudInMultiplayer; }
-	inline Bool showRandomPlayerTemplate( void ) { return m_showRandomPlayerTemplate; }
-	inline Bool showRandomStartPos( void ) { return m_showRandomStartPos; }
-	inline Bool showRandomColor( void ) { return m_showRandomColor; }
+	Int getStartCountdownTimerSeconds( void ) { return m_startCountdownTimerSeconds; }
+	Int getMaxBeaconsPerPlayer( void ) { return m_maxBeaconsPerPlayer; }
+	Bool isShroudInMultiplayer( void ) { return m_isShroudInMultiplayer; }
+	Bool showRandomPlayerTemplate( void ) { return m_showRandomPlayerTemplate; }
+	Bool showRandomStartPos( void ) { return m_showRandomStartPos; }
+	Bool showRandomColor( void ) { return m_showRandomColor; }
 
-	inline Int getNumColors( void ) 
+	Int getNumColors( void )
 	{
 		if (m_numColors == 0) {
 			m_numColors = m_colorList.size();
@@ -112,16 +109,16 @@ class MultiplayerSettings : public SubsystemInterface
 	MultiplayerColorDefinition * getColor(Int which);
 
 
-  const Money & getDefaultStartingMoney() const 
-  { 
+  const Money & getDefaultStartingMoney() const
+  {
     DEBUG_ASSERTCRASH( m_gotDefaultStartingMoney, ("You must specify a default starting money amount in multiplayer.ini") );
-    return m_defaultStartingMoney; 
+    return m_defaultStartingMoney;
   }
 
   const MultiplayerStartingMoneyList & getStartingMoneyList() const { return m_startingMoneyList; }
 
   void addStartingMoneyChoice( const Money & money, Bool isDefault );
-    
+
 private:
 	Int m_initialCreditsMin;
 	Int m_initialCreditsMax;
@@ -143,5 +140,3 @@ class MultiplayerSettings : public SubsystemInterface
 
 // singleton
 extern MultiplayerSettings *TheMultiplayerSettings;
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h b/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h
index 380e9fc6f5c..ffa939baf77 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h
@@ -30,31 +30,26 @@
 
 #pragma once
 
-#ifndef __NAMEKEYGENERATOR_H_
-#define __NAMEKEYGENERATOR_H_
-
 #include "Lib/BaseType.h"
 #include "Common/SubsystemInterface.h"
 #include "Common/GameMemory.h"
 #include "Common/AsciiString.h"
 
-//------------------------------------------------------------------------------------------------- 
-/**
-	Note that NameKeyType isn't a "real" enum, but an enum type used to enforce the
-	fact that NameKeys are really magic cookies, and aren't really interchangeable
-	with ints. NAMEKEY_INVALID is always a legal value, but all other values are dynamically
-	determined at runtime. (The generated code is basically identical, of course.)
-*/
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
+// Note that NameKeyType isn't a "real" enum, but an enum type used to enforce the
+// fact that NameKeys are really magic cookies, and aren't really interchangeable
+// with integers. NAMEKEY_INVALID is always a legal value, but all other values are dynamically
+// determined at runtime. (The generated code is basically identical, of course.)
+//-------------------------------------------------------------------------------------------------
 enum NameKeyType CPP_11(: Int)
 {
 	NAMEKEY_INVALID					= 0,
-	NAMEKEY_MAX							= 1<<23,					// max ordinal value of a NameKey (some code relies on these fitting into 24 bits safely)
-	FORCE_NAMEKEYTYPE_LONG	= 0x7fffffff	// a trick to ensure the NameKeyType is a 32-bit int
+	NAMEKEY_MAX							= 1<<23, // max ordinal value of a NameKey (some code relies on these fitting into 24 bits safely)
+	FORCE_NAMEKEYTYPE_LONG	= 0x7fffffff, // a trick to ensure the NameKeyType is a 32-bit int
 };
 
 //-------------------------------------------------------------------------------------------------
-/** A bucket entry for the name key generator */
+// A bucket entry for the name key generator
 //-------------------------------------------------------------------------------------------------
 class Bucket : public MemoryPoolObject
 {
@@ -62,7 +57,7 @@ class Bucket : public MemoryPoolObject
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( Bucket, "NameKeyBucketPool" );
 
 public:
-	
+
 	Bucket();
 //~Bucket();
 
@@ -74,14 +69,14 @@ class Bucket : public MemoryPoolObject
 inline Bucket::Bucket() : m_nextInSocket(NULL), m_key(NAMEKEY_INVALID) { }
 inline Bucket::~Bucket() { }
 
-//------------------------------------------------------------------------------------------------- 
-/** This class implements the conversion of an arbitrary string into a unique
-	* integer "key". Calling the nameToKey() method with the same string is 
-	* guaranteed to return the same key. Also, all keys generated by an 
-	* instance of this class are guaranteed to be unique with respect to that 
-	* instance's catalog of names.  Multiple instances of this class can be 
-	* created to service multiple namespaces. */
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
+// This class implements the conversion of an arbitrary string into a unique
+// integer "key". Calling the nameToKey() method with the same string is
+// guaranteed to return the same key. Also, all keys generated by an
+// instance of this class are guaranteed to be unique with respect to that
+// instance's catalog of names. Multiple instances of this class can be
+// created to service multiple namespaces.
+//-------------------------------------------------------------------------------------------------
 class NameKeyGenerator : public SubsystemInterface
 {
 
@@ -95,23 +90,21 @@ class NameKeyGenerator : public SubsystemInterface
 	virtual void update() { }
 
 	/// Given a string, convert into a unique integer key.
-	NameKeyType nameToKey(const AsciiString& name) { return nameToKey(name.str()); }
-	NameKeyType nameToLowercaseKey(const AsciiString& name) { return nameToLowercaseKey(name.str()); }
+	NameKeyType nameToKey(const AsciiString& name);
+	NameKeyType nameToLowercaseKey(const AsciiString& name);
 
 	/// Given a string, convert into a unique integer key.
 	NameKeyType nameToKey(const char* name);
 	NameKeyType nameToLowercaseKey(const char *name);
 
-	/** 
-		given a key, return the name. this is almost never needed,
-		except for a few rare cases like object serialization. also
-		note that it's not particularly fast; it does a dumb linear
-		search for the key.
-	*/
+	// given a key, return the name. this is almost never needed,
+	// except for a few rare cases like object serialization. also
+	// note that it's not particularly fast; it does a dumb linear
+	// search for the key.
 	AsciiString keyToName(NameKeyType key);
 
-  // Get a string out of the INI. Store it into a NameKeyType
-  static void parseStringAsNameKeyType( INI *ini, void *instance, void *store, const void* userData );
+	// Get a string out of the INI. Store it into a NameKeyType
+	static void parseStringAsNameKeyType( INI *ini, void *instance, void *store, const void* userData );
 
 private:
 
@@ -121,16 +114,26 @@ class NameKeyGenerator : public SubsystemInterface
 		SOCKET_COUNT = 45007
 	};
 
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+	Bool addReservedKey();
+#endif
+
+	NameKeyType nameToKeyImpl(const AsciiString& name);
+	NameKeyType nameToLowercaseKeyImpl(const AsciiString& name);
+	NameKeyType nameToKeyImpl(const char* name);
+	NameKeyType nameToLowercaseKeyImpl(const char *name);
+	NameKeyType createNameKey(UnsignedInt hash, const AsciiString& name);
+
 	void freeSockets();
 
 	Bucket*				m_sockets[SOCKET_COUNT];			///< Catalog of all Buckets already generated
 	UnsignedInt		m_nextID;											///< Next available ID
 
-};  // end class NameKeyGenerator
+};
 
-//------------------------------------------------------------------------------------------------- 
-//           Externals                                                     
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
+//           Externals
+//-------------------------------------------------------------------------------------------------
 extern NameKeyGenerator *TheNameKeyGenerator;  ///< just one namespace for now
 
 // typing "TheNameKeyGenerator->nameToKey()" is awfully wordy. Here are shorter synonyms:
@@ -139,7 +142,7 @@ inline NameKeyType NAMEKEY(const char* name) { return TheNameKeyGenerator->nameT
 
 inline AsciiString KEYNAME(NameKeyType nk) { return TheNameKeyGenerator->keyToName(nk); }
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 class StaticNameKey
 {
 private:
@@ -149,8 +152,5 @@ class StaticNameKey
 	StaticNameKey(const char* p) : m_key(NAMEKEY_INVALID), m_name(p) {}
 	NameKeyType key() const;
 	// ugh, this is a little hokey, but lets us pretend that a StaticNameKey == NameKeyType
-	inline operator NameKeyType() const { return key(); }
+	operator NameKeyType() const { return key(); }
 };
-
-#endif // __NAMEKEYGENERATOR_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h b/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h
index 354e94bce91..f5039a17132 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __OSDISPLAY_H__
-#define __OSDISPLAY_H__
-
 #include "Lib/BaseType.h"
 
 class AsciiString;
@@ -39,8 +36,8 @@ enum OSDisplayButtonType CPP_11(: UnsignedInt)
 {
 	OSDBT_OK										= 0x00000001,
 	OSDBT_CANCEL								= 0x00000002,
-															
-															
+
+
 	OSDBT_ERROR									= 0x80000000
 };
 
@@ -49,7 +46,7 @@ enum OSDisplayOtherFlags CPP_11(: UnsignedInt)
 	OSDOF_SYSTEMMODAL						= 0x00000001,
 	OSDOF_APPLICATIONMODAL			= 0x00000002,
 	OSDOF_TASKMODAL							= 0x00000004,
-	
+
 	OSDOF_EXCLAMATIONICON				= 0x00000008,
 	OSDOF_INFORMATIONICON				= 0x00000010,
 	OSDOF_ERRORICON							= 0x00000011,
@@ -59,8 +56,10 @@ enum OSDisplayOtherFlags CPP_11(: UnsignedInt)
 };
 
 // Display a warning box to the user with the specified localized prompt, message, and
-// buttons. (Feel free to add buttons as appropriate to the enum above). 
+// buttons. (Feel free to add buttons as appropriate to the enum above).
 // This function will return the button pressed to close the dialog.
 OSDisplayButtonType OSDisplayWarningBox(AsciiString p, AsciiString m, UnsignedInt buttonFlags, UnsignedInt otherFlags);
 
-#endif /* __OSDISPLAY_H__ */
\ No newline at end of file
+// TheSuperHackers @feature Tell the Operating System that the game is considered busy
+// and we would not like the display screen and/or system to shut off.
+void OSDisplaySetBusyState(Bool busyDisplay, Bool busySystem);
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h
deleted file mode 100644
index b725f36db8f..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: ObjectStatusTypes.h /////////////////////////////////////////////////////////////////////////
-// Author: Kris, May 2003
-// Desc:   Object status types that are stackable using the BitSet system. Used to be ObjectStatusBits
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __OBJECT_STATUS_TYPES_H
-#define __OBJECT_STATUS_TYPES_H
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Lib/BaseType.h"
-#include "Common/BitFlags.h"
-#include "Common/BitFlagsIO.h"
-
-//-------------------------------------------------------------------------------------------------
-/** Object status types */
-//-------------------------------------------------------------------------------------------------
-enum ObjectStatusTypes CPP_11(: Int)
-{
-	//These are saved. Do not insert or remove any!
-
-	OBJECT_STATUS_NONE,									///< no status bit
-	OBJECT_STATUS_DESTROYED,						///< has been destroyed, pending delete
-	OBJECT_STATUS_CAN_ATTACK,						///< used by garrissoned buildings, is OR'ed with KINDOF_CAN_ATTACK in isAbleToAttack()
-	OBJECT_STATUS_UNDER_CONSTRUCTION,		///< object is being constructed and is not yet complete
-	OBJECT_STATUS_UNSELECTABLE,					///< This is a negative condition since these statuses are overrides.  ie their presence forces the condition, but their absence means nothing
-	OBJECT_STATUS_NO_COLLISIONS,				///< object should be ignored for object-object collisions (but not object-ground); used for thing like collapsing parachutes that are intangible
-	OBJECT_STATUS_NO_ATTACK,						///< Absolute override to being able to attack
-	OBJECT_STATUS_AIRBORNE_TARGET,			///< InTheAir as far as AntiAir weapons are concerned only.
-	OBJECT_STATUS_PARACHUTING,					///< object is on a parachute
-	OBJECT_STATUS_REPULSOR,							///< object repulses "KINDOF_CAN_BE_REPULSED" objects.
-	OBJECT_STATUS_HIJACKED,  						///< unit is in the possesion of an enemy criminal, call the authorities
-	OBJECT_STATUS_AFLAME,								///< This object is on fire.
-	OBJECT_STATUS_BURNED,								///< This object has already burned as much as it can.
-	OBJECT_STATUS_WET,									///< object has been soaked with water
-	OBJECT_STATUS_IS_FIRING_WEAPON,			///< Object is firing a weapon, now. Not true for special attacks. --Lorenzen
-	OBJECT_STATUS_BRAKING,							///< Object is braking, and subverts the physics.
-	OBJECT_STATUS_STEALTHED,						///< Object is currently "stealthed"
-	OBJECT_STATUS_DETECTED,							///< Object is in range of a stealth-detector unit (meaningless if STEALTHED not set)
-	OBJECT_STATUS_CAN_STEALTH,					///< Object has ability to stealth allowing the stealth update module to run.
-	OBJECT_STATUS_SOLD,									///< Object is being sold
-	OBJECT_STATUS_UNDERGOING_REPAIR,		///< Object is awaiting/undergoing a repair order that has been issued
-	OBJECT_STATUS_RECONSTRUCTING,				///< Reconstructing
-	OBJECT_STATUS_MASKED,								///< Masked objects are not selectable and targetable by players or AI
-	OBJECT_STATUS_IS_ATTACKING,					///< Object is in the general Attack state (incl. aim, approach, etc.). Note that IS_FIRING_WEAPON and IS_AIMING_WEAPON is a subset of this!
-	OBJECT_STATUS_IS_USING_ABILITY,			///< Object is in the process of preparing or firing a special ability.
-	OBJECT_STATUS_IS_AIMING_WEAPON,			///< Object is aiming a weapon, now. Not true for special attacks. 
-	OBJECT_STATUS_NO_ATTACK_FROM_AI,		///< attacking this object may not be done from commandSource == CMD_FROM_AI
-	OBJECT_STATUS_IGNORING_STEALTH,			///< temporarily ignoring all stealth bits. (used only for some special-case mine clearing stuff.)
-	OBJECT_STATUS_IS_CARBOMB,						///< Object is now a carbomb.
-	OBJECT_STATUS_DECK_HEIGHT_OFFSET,		///< Object factors deck height on top of ground altitude.
-	OBJECT_STATUS_RIDER1,
-	OBJECT_STATUS_RIDER2,
-	OBJECT_STATUS_RIDER3,
-	OBJECT_STATUS_RIDER4,
-	OBJECT_STATUS_RIDER5,
-	OBJECT_STATUS_RIDER6,
-	OBJECT_STATUS_RIDER7,
-	OBJECT_STATUS_RIDER8,
-	OBJECT_STATUS_FAERIE_FIRE,			///< Anyone shooting at you shoots faster than normal
-  OBJECT_STATUS_MISSILE_KILLING_SELF, ///< Object (likely a missile or bomb) is *BUSTING* its way through the *BUNKER*, building or ground, awaiting death at the bottom.
-	OBJECT_STATUS_REASSIGN_PARKING,			///< Jet is trying to get a better parking assignment.
-	OBJECT_STATUS_BOOBY_TRAPPED,				///< We need to know we have a booby trap on us so we can detonate it from many different code segments
-	OBJECT_STATUS_IMMOBILE,							///< Do not move!
-	OBJECT_STATUS_DISGUISED,						///< Object is disguised (a type of stealth)
-	OBJECT_STATUS_DEPLOYED,							///< Object is deployed.
-	// add more status types here and don't forget to add to the string table ObjectStatusMaskType::s_bitNameList[]
-
-	OBJECT_STATUS_COUNT
-
-};
-
-typedef BitFlags<OBJECT_STATUS_COUNT>	ObjectStatusMaskType;
-
-#define MAKE_OBJECT_STATUS_MASK(k) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k))
-#define MAKE_OBJECT_STATUS_MASK2(k,a) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k), (a))
-#define MAKE_OBJECT_STATUS_MASK3(k,a,b) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k), (a), (b))
-#define MAKE_OBJECT_STATUS_MASK4(k,a,b,c) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k), (a), (b), (c))
-#define MAKE_OBJECT_STATUS_MASK5(k,a,b,c,d) ObjectStatusMaskType(ObjectStatusMaskType::kInit, (k), (a), (b), (c), (d))
-
-inline Bool TEST_OBJECT_STATUS_MASK( const ObjectStatusMaskType& m, ObjectStatusTypes t ) 
-{ 
-	return m.test( t ); 
-}
-
-inline Bool TEST_OBJECT_STATUS_MASK_ANY( const ObjectStatusMaskType& m, const ObjectStatusMaskType& mask ) 
-{ 
-	return m.anyIntersectionWith( mask );
-}
-
-inline Bool TEST_OBJECT_STATUS_MASK_MULTI( const ObjectStatusMaskType& m, const ObjectStatusMaskType& mustBeSet, const ObjectStatusMaskType& mustBeClear )
-{
-	return m.testSetAndClear( mustBeSet, mustBeClear );
-}
-
-inline Bool OBJECT_STATUS_MASK_ANY_SET( const ObjectStatusMaskType& m) 
-{ 
-	return m.any(); 
-}
-
-inline void CLEAR_OBJECT_STATUS_MASK( ObjectStatusMaskType& m ) 
-{ 
-	m.clear(); 
-}
-
-inline void SET_ALL_OBJECT_STATUS_MASK_BITS( ObjectStatusMaskType& m )
-{
-	m.clear( );
-	m.flip( );
-}
-
-inline void FLIP_OBJECT_STATUS_MASK( ObjectStatusMaskType& m )
-{
-	m.flip();
-}
-
-// defined in Common/System/ObjectStatusTypes.cpp
-extern ObjectStatusMaskType OBJECT_STATUS_MASK_NONE;	// inits to all zeroes
-
-#endif /* __OBJECT_STATUS_TYPES_H */
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h b/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h
index 813d29ca2dd..03ae479dd00 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h
@@ -28,14 +28,11 @@
 
 #pragma once
 
-#ifndef _OVERRIDABLE_H_
-#define _OVERRIDABLE_H_
-
 #include "Common/GameMemory.h"
 
 /*
-	In order for something to live in an OVERRIDE<> object, it must be derived from Overridable 
-	(publicly). 
+	In order for something to live in an OVERRIDE<> object, it must be derived from Overridable
+	(publicly).
 
 	This is useful for things like templates, where we want to override the template and make sure
 	that all instances get the updated values (for instance, via map.ini)
@@ -52,7 +49,7 @@ class Overridable : public MemoryPoolObject
 	public:
 		Overridable() : m_nextOverride(NULL), m_isOverride(false) {}
 
-		// return a constant version of m_nextOverride, which can be NULL if there is no 
+		// return a constant version of m_nextOverride, which can be NULL if there is no
 		// override
 		const Overridable *getNextOverride( void ) const
 		{
@@ -120,11 +117,7 @@ class Overridable : public MemoryPoolObject
 };
 
 // cleans up and dangling overrides.
-__inline Overridable::~Overridable() 
+__inline Overridable::~Overridable()
 {
-	if (m_nextOverride) 
-		deleteInstance(m_nextOverride);
+	deleteInstance(m_nextOverride);
 }
-
-
-#endif /* _OVERRIDABLE_H_ */
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Override.h b/GeneralsMD/Code/GameEngine/Include/Common/Override.h
index 30bf2e61e99..45cd955858d 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Override.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Override.h
@@ -28,22 +28,19 @@
 
 #pragma once
 
-#ifndef _OVERRIDE_H_
-#define _OVERRIDE_H_
-
 #include "Common/Overridable.h"
 
 /*
-	An OVERRIDE is a replacement for a pointer of its contained type, ie, rather than containing 
+	An OVERRIDE is a replacement for a pointer of its contained type, ie, rather than containing
 	a LocomotorTemplate*, you would contain an OVERRIDE<LocomotorTemplate>.
 
-	OVERRIDE pretends in all ways (dereference via *, -> and casting to type*) to be a type*, so 
+	OVERRIDE pretends in all ways (dereference via *, -> and casting to type*) to be a type*, so
 	there should be very little code that needs to be rewritten to work with these.
 
 	In order to make something overridable, these are the steps:
 		1) Make the desired class derive from Overridable.
 		2) Make the container class contain an instance of OVERRIDE<Type>
-		3) Make the newOverride function (wherever an override is new'd) request the overridables lastOverride, 
+		3) Make the newOverride function (wherever an override is new'd) request the overridables lastOverride,
 			to ensure that no leaks are created.
 
 		See LocomotorTemplate for an example.
@@ -136,6 +133,3 @@ OVERRIDE<T>::operator const T*( ) const
 {
 	return operator*();
 }
-
-#endif /* _OVERRIDE_H_ */
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h b/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h
index 3cef98ee36d..39c0951281f 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Statistics.h 
+// FILE: Statistics.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -38,8 +38,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_PARTITIONSOLVER_
-#define _H_PARTITIONSOLVER_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 
@@ -78,10 +76,8 @@ class PartitionSolver
 
 	public:
 		PartitionSolver(const EntriesVec& elements, const SpacesVec& spaces, SolutionType solveHow);
-		
+
 		// Solve could potentially take a LONG TIME (as in NEVER complete). This problem is NP-complete.
 		void solve(void);
 		const SolutionVec& getSolution( void ) const;
 };
-
-#endif /* _H_PARTITIONSOLVER_ */
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h b/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h
index 1b09cbe86ec..9d3eb195842 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __PERFMETRICS_H__
-#define __PERFMETRICS_H__
-
 // For load timings
 enum { PERFMETRICS_LOAD_STARTFRAME = 0 };
 enum { PERFMETRICS_LOAD_STOPFRAME = 1 };
@@ -42,7 +39,3 @@ enum { PERFMETRICS_LOGIC_STOPFRAME = 1000 };
 
 // For showing metrics
 enum { PERFMETRICS_BETWEEN_METRICS = 150 };
-
-#endif /* __PERFMETRICS_H__ */
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h b/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h
index 1a1ba1fddbf..b2a4c60d051 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h
@@ -28,12 +28,9 @@
 
 #pragma once
 
-#ifndef __PERFTIMER_H__
-#define __PERFTIMER_H__
-
 #include "Utility/intrin_compat.h"
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	/*
 		NOTE NOTE NOTE: never check this in with this enabled, since there is a nonzero time penalty
 		for running in this mode. Only enable it for local builds for testing purposes! (srj)
@@ -231,8 +228,8 @@ AutoPerfGatherIgnore::~AutoPerfGatherIgnore()
 }
 
 //-------------------------------------------------------------------------------------------------
-#define DECLARE_TOTAL_PERF_TIMER(id)					static PerfGather s_##id(#id, false); 
-#define DECLARE_PERF_TIMER(id)					static PerfGather s_##id(#id); 
+#define DECLARE_TOTAL_PERF_TIMER(id)					static PerfGather s_##id(#id, false);
+#define DECLARE_PERF_TIMER(id)					static PerfGather s_##id(#id);
 #define USE_PERF_TIMER(id)							AutoPerfGather a_##id(s_##id);
 #define IGNORE_PERF_TIMER(id)						AutoPerfGatherIgnore a_##id(s_##id);
 
@@ -248,7 +245,7 @@ class PerfTimer
 	virtual ~PerfTimer( );
 	__forceinline void startTimer( void );
 	__forceinline void stopTimer( void );
-	
+
 protected:
 	Int64 m_startTime;
 
@@ -276,7 +273,7 @@ class PerfTimer
 void PerfTimer::startTimer( void )
 {
 	UnsignedInt frm = (TheGameLogic ? TheGameLogic->getFrame() : m_startFrame);
-	if (frm >= m_startFrame && (m_endFrame == -1 || frm <= m_endFrame)) 
+	if (frm >= m_startFrame && (m_endFrame == -1 || frm <= m_endFrame))
 	{
 		GetPrecisionTimer(&m_startTime);
 	}
@@ -286,7 +283,7 @@ void PerfTimer::startTimer( void )
 void PerfTimer::stopTimer( void )
 {
 	UnsignedInt frm = (TheGameLogic ? TheGameLogic->getFrame() : m_startFrame);
-	if (frm >= m_startFrame && (m_endFrame == -1 || frm <= m_endFrame)) 
+	if (frm >= m_startFrame && (m_endFrame == -1 || frm <= m_endFrame))
 	{
 		Int64 tmp;
 		GetPrecisionTimer(&tmp);
@@ -294,7 +291,7 @@ void PerfTimer::stopTimer( void )
 		++m_callCount;
 		m_lastFrame = frm;
 	}
-	
+
 
 	if (TheGlobalData && TheGlobalData->m_showMetrics && m_endFrame > m_startFrame + PERFMETRICS_BETWEEN_METRICS) {
 		m_endFrame = m_startFrame + PERFMETRICS_BETWEEN_METRICS;
@@ -315,11 +312,9 @@ extern void StatMetricsDisplay( DebugDisplayInterface *dd, void *, FILE *fp );
 
 #else		// PERF_TIMERS
 
-	#define DECLARE_PERF_TIMER(id)					
-	#define  DECLARE_TOTAL_PERF_TIMER(id)					
+	#define DECLARE_PERF_TIMER(id)
+	#define  DECLARE_TOTAL_PERF_TIMER(id)
 	#define USE_PERF_TIMER(id)
-	#define IGNORE_PERF_TIMER(id)	
+	#define IGNORE_PERF_TIMER(id)
 
 #endif	// PERF_TIMERS
-
-#endif /* __PERFTIMER_H__ */
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Player.h b/GeneralsMD/Code/GameEngine/Include/Common/Player.h
index ab3ab4993a0..ad150eb5dfb 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Player.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Player.h
@@ -24,12 +24,12 @@
 
 // FILE: Player.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef _PLAYER_H_
-#define _PLAYER_H_
-
 #include "Common/AcademyStats.h"
 #include "Common/Debug.h"
 #include "Common/Energy.h"
@@ -101,13 +98,14 @@ enum ScienceAvailabilityType CPP_11(: Int)
 };
 
 #ifdef DEFINE_SCIENCE_AVAILABILITY_NAMES
-static const char *ScienceAvailabilityNames[] = 
+static const char *const ScienceAvailabilityNames[] =
 {
 	"Available",
 	"Disabled",
 	"Hidden",
 	NULL
 };
+static_assert(ARRAY_SIZE(ScienceAvailabilityNames) == SCIENCE_AVAILABILITY_COUNT + 1, "Incorrect array size");
 #endif	// end DEFINE_SCIENCE_AVAILABILITY_NAMES
 
 static const Int NUM_HOTKEY_SQUADS = 10;
@@ -121,7 +119,7 @@ typedef Int PlayerIndex;
 // ------------------------------------------------------------------------------------------------
 class KindOfPercentProductionChange : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(KindOfPercentProductionChange, "KindOfPercentProductionChange")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(KindOfPercentProductionChange, "KindOfPercentProductionChange")
 public:
 	KindOfMaskType		m_kindOf;
 	Real							m_percent;
@@ -154,7 +152,7 @@ class PlayerRelationMap : public MemoryPoolObject,
 													public Snapshot
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( PlayerRelationMap, "PlayerRelationMapPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( PlayerRelationMap, "PlayerRelationMapPool" )
 
 public:
 
@@ -175,16 +173,16 @@ class PlayerRelationMap : public MemoryPoolObject,
 
 // ----------------------------------------------------------------------------------------------
 /**
-	A "Player" as an entity that contains the persistent info of the Player, as well as containing 
+	A "Player" as an entity that contains the persistent info of the Player, as well as containing
 	transient mission data.
 
-	Some of the Player's attributes persist between missions, whereas others are "transient" and only 
-	have meaning in a mission, wherein they change a lot (current tech tree state, current buildings 
+	Some of the Player's attributes persist between missions, whereas others are "transient" and only
+	have meaning in a mission, wherein they change a lot (current tech tree state, current buildings
 	built, units trained, money, etc). (For clarity of nomenclature, we'll refer to all "persistent"
 	vs "non-persistent" attributes, since "transient" has an unclear duration.)
 
-	A "Player" consists of an entity controlling a single set of units in a mission. 
-	A Player may be human or computer controlled. 
+	A "Player" consists of an entity controlling a single set of units in a mission.
+	A Player may be human or computer controlled.
 
 	All Players have a (transient) "Player Index" associated which allows us to do some shorthand for
 	representing Players in some cases (mainly in bitfields). This is always a 0-based
@@ -192,8 +190,8 @@ class PlayerRelationMap : public MemoryPoolObject,
 	is that it makes it desirable to limit the maximum number of simultaneous Players
 	to 32, but that seems quite reasonable.
 
-	All persistent data associated with the Player will be saved to local storage and/or 
-	synchronized with one of our servers for online play. 
+	All persistent data associated with the Player will be saved to local storage and/or
+	synchronized with one of our servers for online play.
 
 	Note, simple accessor methods are omitted for brevity... for now, you may infer
 	them from the data structures.
@@ -213,53 +211,53 @@ class Player : public Snapshot
 	virtual ~Player();
 
 	void update();			///< player update opportunity
-	
+
 	void newMap();			///< player after map loaded opportunity
-	
+
 	void init(const PlayerTemplate* pt);
 	void initFromDict(const Dict* d);
 	void setDefaultTeam(void);
 
 	void deletePlayerAI();
 
-	inline UnicodeString getPlayerDisplayName() { return m_playerDisplayName; }
-	inline NameKeyType getPlayerNameKey() const { return m_playerNameKey; }
+	UnicodeString getPlayerDisplayName() { return m_playerDisplayName; }
+	NameKeyType getPlayerNameKey() const { return m_playerNameKey; }
 
-	inline AsciiString getSide() const { return m_side; }
-	inline AsciiString getBaseSide() const { return m_baseSide; }
+	AsciiString getSide() const { return m_side; }
+	AsciiString getBaseSide() const { return m_baseSide; }
 
-	inline const PlayerTemplate* getPlayerTemplate() const { return m_playerTemplate;	}
+	const PlayerTemplate* getPlayerTemplate() const { return m_playerTemplate;	}
 	/// return the Player's Handicap sub-object
-	inline const Handicap *getHandicap() const { return &m_handicap; }
-	inline Handicap *getHandicap() { return &m_handicap; }
+	const Handicap *getHandicap() const { return &m_handicap; }
+	Handicap *getHandicap() { return &m_handicap; }
 
 	/// return the Player's Money sub-object
-	inline Money *getMoney() { return &m_money; }
-	inline const Money *getMoney() const { return &m_money; }
+	Money *getMoney() { return &m_money; }
+	const Money *getMoney() const { return &m_money; }
 
 	UnsignedInt getSupplyBoxValue();///< Many things can affect the alue of a crate, but at heart it is a GlobalData ratio.
 
-	inline Energy *getEnergy() { return &m_energy; }
-	inline const Energy *getEnergy() const { return &m_energy; }
+	Energy *getEnergy() { return &m_energy; }
+	const Energy *getEnergy() const { return &m_energy; }
 
 	// adds a power bonus to this player because of energy upgrade at his power plants
-	inline void addPowerBonus(Object *obj) { m_energy.addPowerBonus(obj); }
-	inline void removePowerBonus(Object *obj) { m_energy.removePowerBonus(obj); }
+	void addPowerBonus(Object *obj) { m_energy.addPowerBonus(obj); }
+	void removePowerBonus(Object *obj) { m_energy.removePowerBonus(obj); }
 
-	inline ResourceGatheringManager *getResourceGatheringManager(){ return m_resourceGatheringManager; }
-	inline TunnelTracker* getTunnelSystem(){ return m_tunnelSystem; }
+	ResourceGatheringManager *getResourceGatheringManager(){ return m_resourceGatheringManager; }
+	TunnelTracker* getTunnelSystem(){ return m_tunnelSystem; }
 
-	inline Color getPlayerColor() const { return m_color; }
-	inline Color getPlayerNightColor() const { return m_nightColor;}
+	Color getPlayerColor() const { return m_color; }
+	Color getPlayerNightColor() const { return m_nightColor;}
 	/// return the type of controller
-	inline PlayerType getPlayerType() const { return m_playerType; }
+	PlayerType getPlayerType() const { return m_playerType; }
 	void setPlayerType(PlayerType t, Bool skirmish);
 
-	inline PlayerIndex getPlayerIndex() const { return m_playerIndex; }
+	PlayerIndex getPlayerIndex() const { return m_playerIndex; }
 
 	/// return a bitmask that is unique to this player.
-	inline PlayerMaskType getPlayerMask() const { return 1 << m_playerIndex; }
-	
+	PlayerMaskType getPlayerMask() const { return 1 << m_playerIndex; }
+
 	/// a convenience function to test the ThingTemplate against the players canBuild flags
 	/// called by canBuild
 	Bool allowedToBuild(const ThingTemplate *tmplate) const;
@@ -269,25 +267,25 @@ class Player : public Snapshot
 
 	// Can we afford to build?
 	Bool canAffordBuild( const ThingTemplate *whatToBuild ) const;
-  
+
   // Check MaxSimultaneousOfType
   Bool canBuildMoreOfType( const ThingTemplate *whatToBuild ) const;
-  
+
 	/// Difficulty level for this player.
 	GameDifficulty getPlayerDifficulty(void) const;
 
 	/** return the player's command center. (must be one of his "normal" ones,
 			not a captured one.)
-			if he has none, return null. 
+			if he has none, return null.
 			if he has multiple, return one arbitrarily. */
 	Object* findNaturalCommandCenter();
-	
+
 	Object* findAnyExistingObjectWithThingTemplate( const ThingTemplate *thing );
 
-	// Finds a short-cut firing special power of specified type returning the first ready power or 
+	// Finds a short-cut firing special power of specified type returning the first ready power or
 	// the most ready if none ready.
 	Object* findMostReadyShortcutSpecialPowerOfType( SpecialPowerType spType );
-	
+
 	//Find specified thing template's most ready weapon.
 	Object* findMostReadyShortcutWeaponForThing( const ThingTemplate *thing, UnsignedInt &mostReadyPercentage );
 	Object* findMostReadyShortcutSpecialPowerForThing( const ThingTemplate *thing, UnsignedInt &mostReadyPercentage );
@@ -303,7 +301,7 @@ class Player : public Snapshot
 	Bool isScienceDisabled( ScienceType t ) const;	///< Can't purchase this science because of script reasons.
 	Bool isScienceHidden( ScienceType t ) const;		///< This science is effectively hidden due to  script reasons.
 
-	//Allows scripts to make specific sciences available, hidden, or disabled. 
+	//Allows scripts to make specific sciences available, hidden, or disabled.
 	void setScienceAvailability( ScienceType science, ScienceAvailabilityType type );
 
 	ScienceAvailabilityType getScienceAvailabilityTypeFromString( const AsciiString& name );
@@ -311,8 +309,8 @@ class Player : public Snapshot
 	/// return t iff the player has all sciences that are prereqs for knowing the given science
 	Bool hasPrereqsForScience(ScienceType t) const;
 
-	Bool hasUpgradeComplete( const UpgradeTemplate *upgradeTemplate );		///< does player have totally done and produced upgrade
-	Bool hasUpgradeComplete( UpgradeMaskType testMask );		///< does player have totally done and produced upgrade
+	Bool hasUpgradeComplete( const UpgradeTemplate *upgradeTemplate ) const;		///< does player have totally done and produced upgrade
+	Bool hasUpgradeComplete( UpgradeMaskType testMask ) const;		///< does player have totally done and produced upgrade
 	UpgradeMaskType getCompletedUpgradeMask() const { return m_upgradesCompleted; }	///< get list of upgrades that are completed
 	Bool hasUpgradeInProduction( const UpgradeTemplate *upgradeTemplate );		///< does player have this upgrade in progress right now
 	Upgrade *addUpgrade( const UpgradeTemplate *upgradeTemplate,
@@ -326,21 +324,24 @@ class Player : public Snapshot
 
 	void onUpgradeCompleted( const UpgradeTemplate *upgradeTemplate );				///< An upgrade just finished, do things like tell all objects to recheck UpgradeModules
 	void onUpgradeRemoved(){}					///< An upgrade just got removed, this doesn't do anything now.
- 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 	/// Prereq disabling cheat key
 	void toggleIgnorePrereqs(){ m_DEMO_ignorePrereqs = !m_DEMO_ignorePrereqs; }
+	void enableIgnorePrereqs(Bool enable) { m_DEMO_ignorePrereqs = enable; }
 	Bool ignoresPrereqs() const { return m_DEMO_ignorePrereqs; }
 
 	/// No cost building cheat key
 	void toggleFreeBuild(){ m_DEMO_freeBuild = !m_DEMO_freeBuild; }
+	void enableFreeBuild(Bool enable) { m_DEMO_freeBuild = enable; }
 	Bool buildsForFree() const { return m_DEMO_freeBuild; }
 
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	/// No time building cheat key
 	void toggleInstantBuild(){ m_DEMO_instantBuild = !m_DEMO_instantBuild; }
+	void enableInstantBuild(Bool enable) { m_DEMO_instantBuild = enable; }
 	Bool buildsInstantly() const { return m_DEMO_instantBuild; }
 #endif
 
@@ -352,7 +353,7 @@ class Player : public Snapshot
 	///< one of my command centers just fired a special power, let us reset timers for all command centers.
 	void resetOrStartSpecialPowerReadyFrame( const SpecialPowerTemplate *temp );
 	///< my new command center wants to init his timers to the status quo
-	UnsignedInt getOrStartSpecialPowerReadyFrame( const SpecialPowerTemplate *temp); 
+	UnsignedInt getOrStartSpecialPowerReadyFrame( const SpecialPowerTemplate *temp);
 	void expressSpecialPowerReadyFrame( const SpecialPowerTemplate *temp, UnsignedInt frame );
 	void addNewSharedSpecialPowerTimer( const SpecialPowerTemplate *temp, UnsignedInt frame );
 
@@ -389,7 +390,7 @@ class Player : public Snapshot
 	/** Return bonus or penalty for construction of this thing.
 	*/
 	Real getProductionCostChangePercent( AsciiString buildTemplateName ) const;
-	
+
 	/** Return bonus or penalty for construction of this thing.
 	*/
 	Real getProductionTimeChangePercent( AsciiString buildTemplateName ) const;
@@ -483,7 +484,7 @@ class Player : public Snapshot
 		simply returns the number of objects owned by this player with a specific KindOfMaskType
 	*/
 	Int countObjects(KindOfMaskType setMask, KindOfMaskType clearMask);
-	
+
 	/// Returns the closest of a given type to the given object
 	Object *findClosestByKindOf( Object *queryObject, KindOfMaskType setMask, KindOfMaskType clearMask );
 
@@ -524,7 +525,7 @@ class Player : public Snapshot
 
 	/**
 		* Iterate all objects that this player has
-		*/	
+		*/
 	void iterateObjects( ObjectIterateFunc func, void *userData ) const;
 
 	/**
@@ -538,7 +539,7 @@ class Player : public Snapshot
 	void addToBuildList(Object *obj);			///< Adds this to the build list.	 Used for factories placed instead of in build list.
 	void addToPriorityBuildList(AsciiString templateName, Coord3D *pos, Real angle);			///< Adds this to the build list.	 Used for factories placed instead of in build list.
 
-	/// get the relationship between this->that. 
+	/// get the relationship between this->that.
 	Relationship getRelationship(const Team *that) const;
 
 	/// set the relationship between this->that. (note that this doesn't affect the that->this relationship.)
@@ -551,14 +552,14 @@ class Player : public Snapshot
 	void removeTeamFromList(TeamPrototype* team);
 
 	typedef std::list<TeamPrototype*> PlayerTeamList;
-	inline const PlayerTeamList* getPlayerTeams() const { return &m_playerTeamPrototypes; }
+	const PlayerTeamList* getPlayerTeams() const { return &m_playerTeamPrototypes; }
 
-	inline Int getMpStartIndex(void) {return m_mpStartIndex;}
+	Int getMpStartIndex(void) {return m_mpStartIndex;}
 
 	/// Set that all units should begin hunting.
 	void setUnitsShouldHunt(Bool unitsShouldHunt, CommandSourceType source);
 	Bool getUnitsShouldHunt() const { return m_unitsShouldHunt; }
-	
+
 	/// All of our units are new spied upon; they sight for the given enemy
 	void setUnitsVisionSpied( Bool setting, KindOfMaskType whichUnits, PlayerIndex byWhom );
 
@@ -576,7 +577,7 @@ class Player : public Snapshot
 
 	/// Build a building near a supply dump with at least cash.  Gets passed to aiPlayer.
 	void buildBySupplies(Int minimumCash, const AsciiString &thingName);
-	
+
 	/// Build an instance of a specific building nearest specified team.  Gets passed to aiPlayer.
 	void buildSpecificBuildingNearestTeam( const AsciiString &thingName, const Team *team );
 
@@ -598,14 +599,14 @@ class Player : public Snapshot
 	/// Enable/Disable the construction of units
 	Bool getCanBuildUnits(void) { return m_canBuildUnits; }
 	void setCanBuildUnits(Bool canProduce) { m_canBuildUnits = canProduce; }
-	
+
 	/// Enable/Disable the construction of base buildings.
 	Bool getCanBuildBase(void) { return m_canBuildBase; }
 	void setCanBuildBase(Bool canProduce) { m_canBuildBase = canProduce; }
 
 	/// Transfer all assets from player that to this
 	void transferAssetsFromThat(Player* that);
-	
+
 	/// Sell everything this player owns.
 	void sellEverythingUnderTheSun(void);
 
@@ -613,12 +614,12 @@ class Player : public Snapshot
 	void ungarrisonAllUnits(CommandSourceType source);
 
 	void setUnitsShouldIdleOrResume(Bool idle);
-	
+
 	Bool isPlayableSide( void ) const;
 
-	Bool isPlayerObserver( void ) const; // Favor !isActive() - this is used for Observer GUI mostly, not in-game stuff
-	Bool isPlayerDead(void) const; // Favor !isActive() - this is used so OCLs don't give us stuff after death.
-	Bool isPlayerActive(void) const;
+	Bool isPlayerObserver( void ) const; // Favor !isPlayerActive() - this is used for Observer GUI mostly, not in-game stuff
+	Bool isPlayerDead(void) const; // Favor !isPlayerActive() - this is used so OCLs don't give us stuff after death.
+	Bool isPlayerActive(void) const; // Player is alive and not observer. !isPlayerActive() is synonymous with observing.
 
 	Bool didPlayerPreorder( void ) const { return m_isPreorder; }
 
@@ -626,7 +627,7 @@ class Player : public Snapshot
 	ScoreKeeper* getScoreKeeper( void ) { return &m_scoreKeeper; }
 
 	/// time to create a hotkey team based on this GameMessage
-	void processCreateTeamGameMessage(Int hotkeyNum, GameMessage *msg);
+	void processCreateTeamGameMessage(Int hotkeyNum, const GameMessage *msg);
 
 	/// time to select a hotkey team based on this GameMessage
 	void processSelectTeamGameMessage(Int hotkeyNum, GameMessage *msg);
@@ -634,7 +635,7 @@ class Player : public Snapshot
 	// add to the player's current selection this hotkey team.
 	void processAddTeamGameMessage(Int hotkeyNum, GameMessage *msg);
 
-	// returns an AIGroup object that is the currently selected group.
+	// fills an AIGroup object that is the currently selected group.
 	void getCurrentSelectionAsAIGroup(AIGroup *group);
 
 	// sets the currently selected group to be the given AIGroup
@@ -645,13 +646,13 @@ class Player : public Snapshot
 
 	// return the requested hotkey squad
 	Squad *getHotkeySquad(Int squadNumber);
-	
+
 	// return the hotkey squad that a unit is in, or NO_HOTKEY_SQUAD if it isn't in one.
 	Int getSquadNumberForObject(const Object *objToFind) const;
-	
+
 	// remove an object from any hotkey squads that its in.
 	void removeObjectFromHotkeySquad(Object *objToRemove);
-	
+
 	void setAttackedBy( Int playerNdx );
 	Bool getAttackedBy( Int playerNdx ) const;
 	UnsignedInt getAttackedFrame(void) {return m_attackedFrame;}  // Return last frame attacked.
@@ -686,7 +687,7 @@ class Player : public Snapshot
 	Int getRankLevel() const							{ return m_rankLevel; }
 	Int getSkillPointsLevelUp() const			{ return m_levelUp;	}
 	Int getSkillPointsLevelDown() const			{ return m_levelDown;	}
-	UnicodeString getGeneralName() const	{ return m_generalName; }	
+	UnicodeString getGeneralName() const	{ return m_generalName; }
 	void setGeneralName( UnicodeString name ){ m_generalName = name;	}
 	/// returns TRUE if rank level really changed.
 	Bool setRankLevel(Int level);
@@ -698,7 +699,7 @@ class Player : public Snapshot
 	Bool addSkillPointsForKill(const Object* killer, const Object* victim);
 
 	void addSciencePurchasePoints(Int delta);
-	
+
 	void setSkillPointsModifier(Real expMod) { m_skillPointsModifier = expMod; }
 	Real getSkillPointsModifier(void) const { return m_skillPointsModifier; }
 
@@ -708,13 +709,13 @@ class Player : public Snapshot
 	/// reset rank to 1.
 	void resetRank();
 
-	/** 
+	/**
 		attempt to purchase the science, but use prereqs, and charge points.
 		return true if successful.
 	*/
 	Bool attemptToPurchaseScience(ScienceType science);
 
-	/** 
+	/**
 		grant the science, ignore prereqs & charge no points,
 		but still restrict you to purchasable sciences (ie, intrinsic and rank sciences
 		are not allowed)
@@ -731,7 +732,7 @@ class Player : public Snapshot
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
-	
+
 	void deleteUpgradeList( void );															///< delete all our upgrades
 
 private:
@@ -774,17 +775,17 @@ class Player : public Snapshot
 	ScienceVec						m_sciences;					///< (SAVE) sciences that we know (either intrinsically or via later purchases)
 	ScienceVec						m_sciencesDisabled;	///< (SAVE) sciences that we are not permitted to purchase "yet". Controlled by mission scripts.
 	ScienceVec						m_sciencesHidden;		///< (SAVE) sciences that aren't shown. Controlled by mission scripts.
-	
+
 	Int										m_rankLevel;			///< (SAVE) our RankLevel, 1...n
 	Int										m_skillPoints;		///< (SAVE) our cumulative SkillPoint total
 	Int										m_sciencePurchasePoints;		///< (SAVE) our unspent SciencePurchasePoint total
 	Int										m_levelUp, m_levelDown;			///< (NO-SAVE) skill points to go up/down a level (runtime only)
 	UnicodeString					m_generalName;		///< (SAVE) This is the name of the general the player is allowed to change.
-	
+
 	PlayerTeamList				m_playerTeamPrototypes;				///< ALL the teams we control, via prototype
 	PlayerRelationMap			*m_playerRelations;						///< allies & enemies
 	TeamRelationMap				*m_teamRelations;							///< allies & enemies
-	
+
 	AcademyStats					m_academyStats;				///< Keeps track of various statistics in order to provide advice to the player about how to improve playing.
 
 	Bool									m_canBuildUnits;		///< whether the current player is allowed to build units
@@ -798,16 +799,16 @@ class Player : public Snapshot
 
 	Bool									m_attackedBy[MAX_PLAYER_COUNT];	///< For each player, have they attacked me?
 	UnsignedInt						m_attackedFrame;	///< Last frame attacked.
-	
+
 	Real									m_cashBountyPercent;
 
 	/// @todo REMOVE (not disable) these cheat keys
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	Bool									m_DEMO_ignorePrereqs;		///< Can I ignore prereq checks?
 	Bool									m_DEMO_freeBuild;				///< Can I build everything for no money?
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	Bool									m_DEMO_instantBuild;		///< Can I build anything in one frame?
 #endif
 
@@ -816,7 +817,7 @@ class Player : public Snapshot
 	typedef std::list<KindOfPercentProductionChange*> KindOfPercentProductionChangeList;
 	typedef KindOfPercentProductionChangeList::iterator KindOfPercentProductionChangeListIt;
 	mutable KindOfPercentProductionChangeList m_kindOfPercentProductionChangeList;
-	
+
 
 	typedef std::list<SpecialPowerReadyTimerType> SpecialPowerReadyTimerList;
 	typedef SpecialPowerReadyTimerList::iterator SpecialPowerReadyTimerListIterator;
@@ -828,5 +829,3 @@ class Player : public Snapshot
 	Bool									m_isPlayerDead;
 	Bool									m_logicalRetaliationModeEnabled;
 };
-
-#endif // _PLAYER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h b/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h
index 49fee39a6f1..7fe0641a246 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h
@@ -24,12 +24,12 @@
 
 // FILE: PlayerList.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef _PLAYERLIST_H_
-#define _PLAYERLIST_H_
-
 #include "Common/SubsystemInterface.h"
 #include "Common/GameCommon.h"
 #include "Common/NameKeyGenerator.h"
@@ -64,7 +61,7 @@ enum AllowPlayerRelationship CPP_11(: Int)
 {
 	ALLOW_SAME_PLAYER			= 0x01,		///< allow only objects of the same player as m_obj
 	ALLOW_ALLIES					= 0x02,		///< allow objects that m_obj considers allies
-	ALLOW_ENEMIES					= 0x04,		///< allow objects that m_obj considers enemy 
+	ALLOW_ENEMIES					= 0x04,		///< allow objects that m_obj considers enemy
 	ALLOW_NEUTRAL					= 0x08		///< allow objects that m_obj considers neutral
 };
 
@@ -112,7 +109,7 @@ class PlayerList : public SubsystemInterface,
 	Player *getNeutralPlayer() { DEBUG_ASSERTCRASH(m_players[0] != NULL, ("null neutral")); return m_players[0]; }
 
 	/**
-		return the Player with the given internal name, or null if none found. 
+		return the Player with the given internal name, or null if none found.
 	*/
 	Player *findPlayerWithNameKey(NameKeyType key);
 
@@ -132,7 +129,7 @@ class PlayerList : public SubsystemInterface,
 		Return the player matching the player mask
 	*/
 	Player *getPlayerFromMask( PlayerMaskType mask );
-	
+
 	/**
 		Get each player in numerical order that this mask represents.
 		Note that maskToAdjust will be adjusted by removing the associated player's mask from it.
@@ -147,8 +144,8 @@ class PlayerList : public SubsystemInterface,
 	void updateTeamStates(void);
 
 	/**
-		a convenience routine to return the players who srcPlayer considers to have one of the 
-		relationships specified in allowedRelationships. Note that allowedRelationships should be 
+		a convenience routine to return the players who srcPlayer considers to have one of the
+		relationships specified in allowedRelationships. Note that allowedRelationships should be
 		a bitwise OR of AllowPlayerRelationship flags.
 	*/
 	PlayerMaskType getPlayersWithRelationship( Int srcPlayerIndex, UnsignedInt allowedRelationships );
@@ -171,5 +168,3 @@ class PlayerList : public SubsystemInterface,
 
 // ----------------------------------------------------------------------------------------------
 extern PlayerList *ThePlayerList;	///< singleton instance of PlayerList
-
-#endif // _PLAYERLIST_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h b/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h
index b23428d09d1..a7839093fea 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h
@@ -24,12 +24,12 @@
 
 // FILE: PlayerTemplate.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef _PLAYERTEMPLATE_H_
-#define _PLAYERTEMPLATE_H_
-
 #include "Common/SubsystemInterface.h"
 #include "Common/GameMemory.h"
 #include "Common/Debug.h"
@@ -77,37 +74,37 @@ class PlayerTemplate
 
 	PlayerTemplate();
 
-	inline void setNameKey(NameKeyType namekey) { m_nameKey = namekey; }
+	void setNameKey(NameKeyType namekey) { m_nameKey = namekey; }
 
-	inline NameKeyType getNameKey() const { DEBUG_ASSERTCRASH(m_nameKey != NAMEKEY_INVALID, ("bad namekey")); return m_nameKey; }
-	inline AsciiString getName() const { return KEYNAME(m_nameKey); }
+	NameKeyType getNameKey() const { DEBUG_ASSERTCRASH(m_nameKey != NAMEKEY_INVALID, ("bad namekey")); return m_nameKey; }
+	AsciiString getName() const { return KEYNAME(m_nameKey); }
 
-	inline UnicodeString getDisplayName() const { return m_displayName; }
+	UnicodeString getDisplayName() const { return m_displayName; }
 
-	inline AsciiString getSide() const { return m_side; }
-	inline AsciiString getBaseSide() const  { return m_baseSide; }
+	AsciiString getSide() const { return m_side; }
+	AsciiString getBaseSide() const  { return m_baseSide; }
 
 	/// return the tech tree for the player.
-	inline const Handicap *getHandicap() const { return &m_handicap; }
+	const Handicap *getHandicap() const { return &m_handicap; }
 
 	/// return the money for the player.
-	inline const Money *getMoney() const { return &m_money; }
-	
-	inline const RGBColor* getPreferredColor() const { return &m_preferredColor; }
+	const Money *getMoney() const { return &m_money; }
+
+	const RGBColor* getPreferredColor() const { return &m_preferredColor; }
 
-	inline AsciiString getStartingBuilding( void ) const { return m_startingBuilding; }
+	AsciiString getStartingBuilding( void ) const { return m_startingBuilding; }
 	AsciiString getStartingUnit( Int i ) const;
 
-	inline const ProductionChangeMap& getProductionCostChanges() const { return m_productionCostChanges; }
-	inline const ProductionChangeMap& getProductionTimeChanges() const { return m_productionTimeChanges; }
-	inline const ProductionVeterancyMap& getProductionVeterancyLevels() const { return m_productionVeterancyLevels; }
-	inline Bool isObserver() const { return m_observer; }
-	inline Bool isPlayableSide() const { return m_playableSide; }
+	const ProductionChangeMap& getProductionCostChanges() const { return m_productionCostChanges; }
+	const ProductionChangeMap& getProductionTimeChanges() const { return m_productionTimeChanges; }
+	const ProductionVeterancyMap& getProductionVeterancyLevels() const { return m_productionVeterancyLevels; }
+	Bool isObserver() const { return m_observer; }
+	Bool isPlayableSide() const { return m_playableSide; }
+
+	AsciiString getScoreScreen (void ) const { return m_scoreScreenImage;	}
+	AsciiString getLoadScreen (void ) const { return m_loadScreenImage;	}
+	AsciiString getBeaconTemplate( void ) const { return m_beaconTemplate; }
 
-	inline AsciiString getScoreScreen (void ) const { return m_scoreScreenImage;	}
-	inline AsciiString getLoadScreen (void ) const { return m_loadScreenImage;	}
-	inline AsciiString getBeaconTemplate( void ) const { return m_beaconTemplate; }
-	
 	const Image *getHeadWaterMarkImage( void ) const;
 	const Image *getFlagWaterMarkImage( void ) const;
 	const Image *getEnabledImage( void ) const;
@@ -116,13 +113,13 @@ class PlayerTemplate
 	//const Image *getPushedImage( void ) const;
 	const Image *getSideIconImage( void ) const;
 	const Image *getGeneralImage( void ) const;
-	inline const AsciiString getTooltip() const { return m_tooltip; }
-	inline const AsciiString getGeneralFeatures( void ) const { return m_strGeneralFeatures; }
+	const AsciiString getTooltip() const { return m_tooltip; }
+	const AsciiString getGeneralFeatures( void ) const { return m_strGeneralFeatures; }
 
 	AsciiString getMedallionNormal() const { return m_strMedallionNormal; }
 	AsciiString getMedallionHilite() const { return m_strMedallionHilite; }
 	AsciiString getMedallionSelected() const { return m_strMedallionSelected; }
-	
+
 	const ScienceVec& getIntrinsicSciences() const { return m_intrinsicSciences; }
 	Int getIntrinsicSciencePurchasePoints() const { return m_intrinsicSPP; }
 	AsciiString getPurchaseScienceCommandSetRank1( void ) const {return m_purchaseScienceCommandSetRank1;	}
@@ -132,11 +129,11 @@ class PlayerTemplate
 	AsciiString getSpecialPowerShortcutCommandSet( void ) const {return m_specialPowerShortcutCommandSet;	}
 	AsciiString getSpecialPowerShortcutWinName( void ) const {return m_specialPowerShortcutWinName;	}
 	Int getSpecialPowerShortcutButtonCount( void ) const {return m_specialPowerShortcutButtonCount;	}
-	
+
 	AsciiString getLoadScreenMusic( void ) const {return m_loadScreenMusic;	}
 	AsciiString getScoreScreenMusic() const { return m_scoreScreenMusic; }
 
-  inline Bool isOldFaction( void ) const { return m_oldFaction; }
+  Bool isOldFaction( void ) const { return m_oldFaction; }
 
 	static const FieldParse* getFieldParse();
 
@@ -181,7 +178,7 @@ class PlayerTemplate
 
 	AsciiString			m_scoreScreenImage;			///< Image that will be shown on the score screen
 	AsciiString			m_loadScreenImage;
-	
+
 	AsciiString			m_headWaterMark;				///< Image that will be the background on the observer control bar
 	AsciiString			m_flagWaterMark;				///< Imabe that will be the background on the observer control bar
 	AsciiString			m_enabledImage;					///< enable button image
@@ -218,11 +215,11 @@ class PlayerTemplateStore : public SubsystemInterface
 
 	const PlayerTemplate* getNthPlayerTemplate(Int i) const;
 	const PlayerTemplate* findPlayerTemplate(NameKeyType namekey) const;
-	inline Int getPlayerTemplateCount() const { return m_playerTemplates.size(); }
+	Int getPlayerTemplateCount() const { return m_playerTemplates.size(); }
 	Int getTemplateNumByName(AsciiString name) const;
-	
+
 	// This function will fill outStringList with all the sides found in all the templates
-	void getAllSideStrings(AsciiStringList *outStringList);	
+	void getAllSideStrings(AsciiStringList *outStringList);
 
 private:
 
@@ -233,5 +230,3 @@ class PlayerTemplateStore : public SubsystemInterface
 
 // ----------------------------------------------------------------------------------------------
 extern PlayerTemplateStore *ThePlayerTemplateStore;	///< singleton instance of PlayerTemplateStore
-
-#endif // _PLAYERTEMPLATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h b/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h
index e63c9cb49c5..ad9d1f833ba 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h
@@ -24,12 +24,12 @@
 
 // FILE: ProductionPrerequisite.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -42,11 +42,8 @@
 
 #pragma once
 
-#ifndef __ProductionPrerequisite_H_
-#define __ProductionPrerequisite_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "Common/GameMemory.h"
 #include "Common/GameCommon.h"
@@ -85,9 +82,9 @@ class ProductionPrerequisite
 	/// return true iff the player satisfies our set of prerequisites
 	Bool isSatisfied(const Player *player) const;
 
-	/** 
-		return the BuildFacilityTemplate, if any. 
-		
+	/**
+		return the BuildFacilityTemplate, if any.
+
 		if this template needs no build facility, null is returned.
 
 		if the template needs a build facility but the given player doesn't have any in existence,
@@ -100,13 +97,13 @@ class ProductionPrerequisite
 	Int getAllPossibleBuildFacilityTemplates(const ThingTemplate* tmpls[], Int maxtmpls) const;
 
 private:
-	
-	enum 
+
+	enum
 	{
 		UNIT_OR_WITH_PREV = 0x01	// if set, unit is "or-ed" with prev unit, so that either one's presence satisfies
 	};
 
-	struct PrereqUnitRec 
+	struct PrereqUnitRec
 	{
 		const ThingTemplate*	unit;
 		Int										flags;
@@ -121,5 +118,3 @@ class ProductionPrerequisite
 };
 
 //-----------------------------------------------------------------------------
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h
index dd3477c5595..9abf5abf809 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h
@@ -30,16 +30,13 @@
 
 #pragma once
 
-#ifndef __QUICKMATCHPREFERENCES_H__
-#define __QUICKMATCHPREFERENCES_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 #include "Common/UserPreferences.h"
 
 //-----------------------------------------------------------------------------
-// QuickMatchPreferences base class 
+// QuickMatchPreferences base class
 //-----------------------------------------------------------------------------
 class QuickMatchPreferences : public UserPreferences
 {
@@ -78,5 +75,3 @@ class QuickMatchPreferences : public UserPreferences
 	void setSide(Int val);
 	Int getSide( void );
 };
-
-#endif // __QUICKMATCHPREFERENCES_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h b/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h
index 67761bbfb3a..5f50ebfbf00 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h
@@ -29,13 +29,8 @@
 
 #pragma once
 
-#ifndef __QUOTEDPRINTABLE_H__
-#define __QUOTEDPRINTABLE_H__
-
 UnicodeString QuotedPrintableToUnicodeString(AsciiString original);
 AsciiString UnicodeStringToQuotedPrintable(UnicodeString original);
 
 AsciiString QuotedPrintableToAsciiString(AsciiString original);
 AsciiString AsciiStringToQuotedPrintable(AsciiString original);
-
-#endif // __QUOTEDPRINTABLE_H__
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/RAMFile.h b/GeneralsMD/Code/GameEngine/Include/Common/RAMFile.h
deleted file mode 100644
index bfe51053cdd..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/RAMFile.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    WSYS Library
-//
-// Module:     IO
-//
-// File name:  wsys/RAMFile.h
-//
-// Created:    11/08/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __RAMFILE_H
-#define __RAMFILE_H
-
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/file.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// RAMFile
-//===============================
-/**
-  *	File abstraction for standard C file operators: open, close, lseek, read, write
-	*/
-//===============================
-
-class RAMFile : public File
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RAMFile, "RAMFile")		
-	protected:
-
-		Char				*m_data;											///< File data in memory
-		Int					m_pos;												///< current read position
-		Int					m_size;												///< size of file in memory
-		
-	public:
-		
-		RAMFile();
-		//virtual				~RAMFile();
-
-
-		virtual Bool	open( const Char *filename, Int access = 0 );				///< Open a file for access
-		virtual void	close( void );																			///< Close the file
-		virtual Int		read( void *buffer, Int bytes );										///< Read the specified number of bytes in to buffer: See File::read
-		virtual Int		write( const void *buffer, Int bytes );							///< Write the specified number of bytes from the buffer: See File::write
-		virtual Int		seek( Int new_pos, seekMode mode = CURRENT );				///< Set file position: See File::seek
-		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0);				///< moves current position to after the next new-line
-
-		virtual Bool	scanInt(Int &newInt);																///< return what gets read as an integer from the current memory position.
-		virtual Bool	scanReal(Real &newReal);														///< return what gets read as a float from the current memory position.
-		virtual Bool	scanString(AsciiString &newString);									///< return what gets read as a string from the current memory position.
-
-		virtual Bool	open( File *file );																	///< Open file for fast RAM access
-		virtual Bool	openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size); ///< copy file data from the given file at the given offset for the given size.
-		virtual Bool	copyDataToFile(File *localFile);										///< write the contents of the RAM file to the given local file.  This could be REALLY slow.
-
-		/**
-			Allocate a buffer large enough to hold entire file, read 
-			the entire file into the buffer, then close the file.
-			the buffer is owned by the caller, who is responsible
-			for freeing is (via delete[]). This is a Good Thing to
-			use because it minimizes memory copies for BIG files.
-		*/
-		virtual char* readEntireAndClose();
-		virtual File* convertToRAMFile();
-};
-
-
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-
-#endif // __WSYS_RAMFILE_H
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Radar.h b/GeneralsMD/Code/GameEngine/Include/Common/Radar.h
deleted file mode 100644
index 6f40897b070..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/Radar.h
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Radar.h //////////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, January 2002
-// Desc:   Logical radar implementation
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __RADAR_H_
-#define __RADAR_H_
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Lib/BaseType.h"
-#include "Common/SubsystemInterface.h"
-#include "Common/GameMemory.h"
-#include "GameClient/Display.h"	// for ShroudLevel
-#include "GameClient/Color.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-class GameWindow;
-class Object;
-class Player;
-class TerrainLogic;
-
-// GLOBAL /////////////////////////////////////////////////////////////////////////////////////////
-//
-// the following is used for the resolution of the radar "cells" ... this is how accurate
-// the radar is and also reflects directly the size of the image we build ... which with
-// WW3D must be a square power of two as well
-//
-enum 
-{ 
-	RADAR_CELL_WIDTH  = 128,	// radar created at this horz resolution
-	RADAR_CELL_HEIGHT = 128   // radar created at this vert resolution
-};
-
-//-------------------------------------------------------------------------------------------------
-/** These event types determine the colors radar events happen in to make it easier for us
-	* to play events with a consistent color scheme */
-//-------------------------------------------------------------------------------------------------
-enum RadarEventType CPP_11(: Int)
-{
-	RADAR_EVENT_INVALID = 0,
-	RADAR_EVENT_CONSTRUCTION,
-	RADAR_EVENT_UPGRADE,
-	RADAR_EVENT_UNDER_ATTACK,
-	RADAR_EVENT_INFORMATION,
-	RADAR_EVENT_BEACON_PULSE,
-	RADAR_EVENT_INFILTRATION, //for defection, hijacking, hacking, carbombing, and other sneaks
-	RADAR_EVENT_BATTLE_PLAN,
-	RADAR_EVENT_STEALTH_DISCOVERED,		// we discovered a stealth unit
-	RADAR_EVENT_STEALTH_NEUTRALIZED,	// our stealth unit has been revealed
-	RADAR_EVENT_FAKE,					//Internally creates a radar event, but doesn't notify the player (unit lost 
-														//for example, so we can use the spacebar to jump to the event).
- 
- 	RADAR_EVENT_NUM_EVENTS  // keep this last
- 	
-};
-
-// PROTOTYPES /////////////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-/** Radar objects are objects that are on the radar, go figure :) */
-//-------------------------------------------------------------------------------------------------
-class RadarObject : public MemoryPoolObject,
-										public Snapshot
-{
-
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( RadarObject, "RadarObject" )
-
-public:
-	
-	RadarObject( void );
-	// destructor prototype defined by memory pool glue
-
-	// color management
-	void setColor( Color c ) { m_color = c; }
-	inline Color getColor( void ) const { return m_color; }
-
-	inline void friend_setObject( Object *obj ) { m_object = obj; }
-	inline Object *friend_getObject( void ) { return m_object; }
-	inline const Object *friend_getObject( void ) const { return m_object; }
-
-	inline void friend_setNext( RadarObject *next ) { m_next = next; }
-	inline RadarObject *friend_getNext( void ) { return m_next; }
-	inline const RadarObject *friend_getNext( void ) const { return m_next; }
-
-	Bool isTemporarilyHidden() const;
-
-protected:
-
-	// snapshot methods
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-	Object *m_object;				///< the object
-	RadarObject *m_next;		///< next radar object
-	Color m_color;					///< color to draw for this object on the radar
-
-};
-
-//-------------------------------------------------------------------------------------------------
-/** Radar priorities.  Keep this in sync with the priority names list below */
-//-------------------------------------------------------------------------------------------------
-enum RadarPriorityType CPP_11(: Int)
-{
-	RADAR_PRIORITY_INVALID,					// a priority that has not been set (in general it won't show up on the radar)
-	RADAR_PRIORITY_NOT_ON_RADAR,		// object specifically forbidden from being on the radar
-	RADAR_PRIORITY_STRUCTURE,				// structure level drawing priority
-	RADAR_PRIORITY_UNIT,						// unit level drawing priority
-	RADAR_PRIORITY_LOCAL_UNIT_ONLY,	// unit priority, but only on the radar if controlled by the local player
-
-	RADAR_PRIORITY_NUM_PRIORITIES		// keep this last
-};
-#ifdef DEFINE_RADAR_PRIORITY_NAMES
-static const char *RadarPriorityNames[] = 
-{
-	"INVALID",											// a priority that has not been set (in general it won't show up on the radar)
-	"NOT_ON_RADAR",									// object specifically forbidden from being on the radar
-	"STRUCTURE",										// structure level drawing priority
-	"UNIT",													// unit level drawing priority
-	"LOCAL_UNIT_ONLY",							// unit priority, but only on the radar if controlled by the local player
-
-	NULL														// keep this last
-};
-#endif  // DEFINE_RADAR_PRIOTITY_NAMES
-
-//-------------------------------------------------------------------------------------------------
-/** Interface for the radar */
-//-------------------------------------------------------------------------------------------------
-class Radar : public Snapshot,
-							public SubsystemInterface
-{
-
-public:
-	
-	Radar( void );
-	virtual ~Radar( void );
-
-	virtual void init( void ) { }														///< subsystem initialization
-	virtual void reset( void );															///< subsystem reset
-	virtual void update( void );														///< subsystem per frame update
-
-	// is the game window parameter the radar window
-	Bool isRadarWindow( GameWindow *window ) { return (m_radarWindow == window) && (m_radarWindow != NULL); }
-
-	Bool radarToWorld( const ICoord2D *radar, Coord3D *world );		///< radar point to world point on terrain
-	Bool radarToWorld2D( const ICoord2D *radar, Coord3D *world );		///< radar point to world point (x,y only!)
-	Bool worldToRadar( const Coord3D *world, ICoord2D *radar );		///< translate world point to radar (x,y)
-	Bool localPixelToRadar( const ICoord2D *pixel, ICoord2D *radar );	///< translate pixel (with UL of radar being (0,0)) to logical radar coords
-	Bool screenPixelToWorld( const ICoord2D *pixel, Coord3D *world ); ///< translate pixel (with UL of the screen being (0,0)) to world position in the world
-	Object *objectUnderRadarPixel( const ICoord2D *pixel );				///< return the object (if any) represented by the pixel coords passed in
-	void findDrawPositions( Int startX, Int startY, Int width, Int height, 
-													ICoord2D *ul, ICoord2D *lr );					///< make translation for screen area of radar square to scaled aspect ratio preserving points inside the radar area
-
-	// priority inquiry
-	Bool isPriorityVisible( RadarPriorityType priority ) const;		///< is the priority passed in a "visible" one on the radar
-
-	// radar events
-	void createEvent( const Coord3D *world, RadarEventType type, Real secondsToLive = 4.0f );	///< create radar event at location in world
-	void createPlayerEvent( Player *player, const Coord3D *world, RadarEventType type, Real secondsToLive = 4.0f );  ///< create radar event using player colors
-
-	Bool getLastEventLoc( Coord3D *eventPos );							///< get last event loc (if any)
-	void tryUnderAttackEvent( const Object *obj );					///< try to make an "under attack" event if it's the proper time
-	void tryInfiltrationEvent( const Object *obj );					///< try to make an "infiltration" event if it's the proper time
- 	Bool tryEvent( RadarEventType event, const Coord3D *pos );	///< try to make a "stealth" event
-
-	// adding and removing objects from the radar
-	void addObject( Object *obj );													///< add object to radar
-	void removeObject( Object *obj );												///< remove object from radar
-	void examineObject( Object *obj );											///< re-examine object and resort if needed
-
-	// radar options
-	void hide( Bool hide ) { m_radarHidden = hide; }				///< hide/unhide the radar
-	Bool isRadarHidden( void ) { return m_radarHidden; }		///< is radar hidden
-	// other radar option methods here like the ability to show a certain
-	// team, show buildings, show units at all, etc
-
-	// forcing the radar on/off regardless of player situation
-	void forceOn( Bool force ) { m_radarForceOn = force; }				///< force the radar to be on
-	Bool isRadarForced( void ) { return m_radarForceOn; }		///< is radar forced on?
-
-	/// refresh the water values for the radar
-	virtual void refreshTerrain( TerrainLogic *terrain );
-
-	/// queue a refresh of the terran at the next available time
-	virtual void queueTerrainRefresh( void );
-
-	virtual void newMap( TerrainLogic *terrain );	///< reset radar for new map
-
-	virtual void draw( Int pixelX, Int pixelY, Int width, Int height ) = 0;	///< draw the radar
-
-	/// empty the entire shroud
-	virtual void clearShroud() = 0;
-
-	/// set the shroud level at shroud cell x,y
-	virtual void setShroudLevel( Int x, Int y, CellShroudStatus setting ) = 0;
-
-protected:
-
-	// snapshot methods
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-	/// internal method for creating a radar event with specific colors
-	void internalCreateEvent( const Coord3D *world, RadarEventType type, Real secondsToLive,
-														const RGBAColorInt *color1, const RGBAColorInt *color2 );
-
-	void deleteListResources( void );			///< delete list radar resources used
-	Bool deleteFromList( Object *obj, RadarObject **list );	///< try to remove object from specific list
-
-	inline Real getTerrainAverageZ() const { return m_terrainAverageZ; }
-	inline Real getWaterAverageZ() const { return m_waterAverageZ; }
-	inline const RadarObject* getObjectList() const { return m_objectList; }
-	inline const RadarObject* getLocalObjectList() const { return m_localObjectList; }
-
-	void clearAllEvents( void );					///< remove all radar events in progress
-
-	// search the object list for an object that maps to the given logical radar coords
-	Object *searchListForRadarLocationMatch( RadarObject *listHead, ICoord2D *radarMatch );
-
-	Bool m_radarHidden;										///< true when radar is not visible
-	Bool m_radarForceOn;									///< true when radar is forced to be on
-	RadarObject *m_objectList;						///< list of objects in the radar
-	RadarObject *m_localObjectList;				/** list of objects for the local player, sorted
-																					* in exactly the same priority as the regular
-																					* object list for all other objects */
-//	typedef std::list<Object*> HeroList;
-//	HeroList m_heroList;		//< list of pointers to objects with radar icon representations
-
-	Real m_terrainAverageZ;								///< average Z for terrain samples
-	Real m_waterAverageZ;									///< average Z for water samples
-
-	//
-	// when dealing with world sampling we will sample at these intervals so that
-	// the whole map can be accounted for within our RADAR_CELL_WIDTH and
-	// RADAR_CELL_HEIGHT resolutions
-	//
-	Real m_xSample;												
-	Real m_ySample;												  
-
-	enum { MAX_RADAR_EVENTS = 64 };
-	struct RadarEvent
-	{
-		RadarEventType type;								///< type of this radar event
-		Bool active;												///< TRUE when event is "active", otherwise it's just historical information in the event array to look through
-		UnsignedInt createFrame;						///< frame event was created on
-		UnsignedInt dieFrame;								///< frame the event will go away on
-		UnsignedInt fadeFrame;							///< start fading out on this frame
-		RGBAColorInt color1;								///< color 1 for drawing
-		RGBAColorInt color2;								///< color 2 for drawing
-		Coord3D worldLoc;										///< location of event in the world
-		ICoord2D radarLoc;									///< 2D radar location of the event
-		Bool soundPlayed;										///< TRUE when we have played the radar sound for this
-	};
-	RadarEvent m_event[ MAX_RADAR_EVENTS ];///< our radar events
-	Int m_nextFreeRadarEvent;							///< index into m_event for where to store the next event
-	Int m_lastRadarEvent;									///< index of the most recent radar event
-
-	GameWindow *m_radarWindow;						///< window we display the radar in
-
-	Region3D m_mapExtent;									///< extents of the current map
-
-	UnsignedInt m_queueTerrainRefreshFrame;  ///< frame we requested the last terrain refresh on
-
-};
-
-// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
-extern Radar *TheRadar;  ///< the radar singleton extern
-
-// TheSuperHackers @feature helmutbuhler 10/04/2025
-// Radar that does nothing. Used for Headless Mode.
-class RadarDummy : public Radar
-{
-public:
-	virtual void draw(Int pixelX, Int pixelY, Int width, Int height) { }
-	virtual void clearShroud() { }
-	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) { }
-};
-
-#endif  // __RADAR_H_
-
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/RandomValue.h b/GeneralsMD/Code/GameEngine/Include/Common/RandomValue.h
deleted file mode 100644
index bc174821ffa..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/RandomValue.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// RandomValue.h
-// Random number generation system
-// Author: Michael S. Booth, January 1998
-
-#pragma once
-
-#ifndef _RANDOM_VALUE_H_
-#define _RANDOM_VALUE_H_
-
-#include "Lib/BaseType.h"
-
-extern void InitRandom( void );
-extern void InitRandom( UnsignedInt seed );
-extern void InitGameLogicRandom( UnsignedInt seed ); ///< Set the GameLogic seed to a known value at game start
-extern UnsignedInt GetGameLogicRandomSeed( void );   ///< Get the seed (used for replays)
-extern UnsignedInt GetGameLogicRandomSeedCRC( void );///< Get the seed (used for CRCs)
-
-//--------------------------------------------------------------------------------------------------------------
-
-#endif // _RANDOM_VALUE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h b/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h
index b776e6acf4d..1ccd56c2847 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h
@@ -22,12 +22,13 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
 #include "Common/MessageStream.h"
 #include "GameNetwork/GameInfo.h"
 
+class File;
+
 /**
   * The ReplayGameInfo class holds information about the replay game and
 	* the contents of its slot list for reconstructing multiplayer games.
@@ -48,6 +49,7 @@ class ReplayGameInfo : public GameInfo
 enum RecorderModeType CPP_11(: Int) {
 	RECORDERMODETYPE_RECORD,
 	RECORDERMODETYPE_PLAYBACK,
+	RECORDERMODETYPE_SIMULATION_PLAYBACK, // Play back replay without any graphics
 	RECORDERMODETYPE_NONE // this is a valid state to be in on the shell map, or in saved games
 };
 
@@ -74,11 +76,13 @@ class RecorderClass : public SubsystemInterface {
 	Bool replayMatchesGameVersion(AsciiString filename); ///< Returns true if the playback is a valid playback file for this version.
 	static Bool replayMatchesGameVersion(const ReplayHeader& header); ///< Returns true if the playback is a valid playback file for this version.
 	AsciiString getCurrentReplayFilename( void );			///< valid during playback only
+	UnsignedInt getPlaybackFrameCount() const { return m_playbackFrameCount; }			///< valid during playback only
 	void stopPlayback();															///< Stops playback.  Its fine to call this even if not playing back a file.
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+	Bool simulateReplay(AsciiString filename);
+#if defined(RTS_DEBUG)
 	Bool analyzeReplay( AsciiString filename );
-	Bool isAnalysisInProgress( void );
 #endif
+	Bool isPlaybackInProgress() const;
 
 public:
 	void handleCRCMessage(UnsignedInt newCRC, Int playerIndex, Bool fromPlayback);
@@ -100,7 +104,7 @@ class RecorderClass : public SubsystemInterface {
 		UnsignedInt iniCRC;
 		time_t startTime;
 		time_t endTime;
-		UnsignedInt frameDuration;
+		UnsignedInt frameCount;
 		Bool quitEarly;
 		Bool desyncGame;
 		Bool playerDiscons[MAX_SLOTS];
@@ -110,11 +114,13 @@ class RecorderClass : public SubsystemInterface {
 	Bool readReplayHeader( ReplayHeader& header );
 
 	RecorderModeType getMode();												///< Returns the current operating mode.
+	Bool isPlaybackMode() const { return m_mode == RECORDERMODETYPE_PLAYBACK || m_mode == RECORDERMODETYPE_SIMULATION_PLAYBACK; }
 	void initControls();															///< Show or Hide the Replay controls
 
-	AsciiString getReplayDir();												///< Returns the directory that holds the replay files.
-	AsciiString getReplayExtention();									///< Returns the file extention for replay files.
-	AsciiString getLastReplayFileName();							///< Returns the filename used for the default replay.
+	static AsciiString getReplayDir();								///< Returns the directory that holds the replay files.
+	static AsciiString getReplayArchiveDir();					///< Returns the directory that holds the archived replay files.
+	static AsciiString getReplayExtention();					///< Returns the file extention for replay files.
+	static AsciiString getLastReplayFileName();				///< Returns the filename used for the default replay.
 
 	GameInfo *getGameInfo( void ) { return &m_gameInfo; }	///< Returns the slot list for playback game start
 
@@ -124,12 +130,15 @@ class RecorderClass : public SubsystemInterface {
 
 	void logPlayerDisconnect(UnicodeString player, Int slot);
 	void logCRCMismatch( void );
+	Bool sawCRCMismatch() const;
 	void cleanUpReplayFile( void );										///< after a crash, send replay/debug info to a central repository
 
+	void setArchiveEnabled(Bool enable) { m_archiveReplays = enable; } ///< Enable or disable replay archiving.
 	void stopRecording();															///< Stop recording and close m_file.
 protected:
 	void startRecording(GameDifficulty diff, Int originalGameMode, Int rankPoints, Int maxFPS);					///< Start recording to m_file.
 	void writeToFile(GameMessage *msg);								///< Write this GameMessage to m_file.
+	void archiveReplay(AsciiString fileName);					///< Move the specified replay file to the archive directory.
 
 	void logGameStart(AsciiString options);
 	void logGameEnd( void );
@@ -149,16 +158,18 @@ class RecorderClass : public SubsystemInterface {
 
 	CullBadCommandsResult cullBadCommands(); ///< prevent the user from giving mouse commands that he shouldn't be able to do during playback.
 
-	FILE *m_file;
+	File* m_file;
 	AsciiString m_fileName;
 	Int m_currentFilePosition;
 	RecorderModeType m_mode;
 	AsciiString m_currentReplayFilename;							///< valid during playback only
+	UnsignedInt m_playbackFrameCount;
 
 	ReplayGameInfo m_gameInfo;
 	Bool m_wasDesync;
 
 	Bool m_doingAnalysis;
+	Bool m_archiveReplays;														///< if true, each replay is archived to the replay archive folder after recording
 
 	Int m_originalGameMode; // valid in replays
 
@@ -166,4 +177,4 @@ class RecorderClass : public SubsystemInterface {
 };
 
 extern RecorderClass *TheRecorder;
-RecorderClass *createRecorder();
\ No newline at end of file
+RecorderClass *createRecorder();
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Registry.h b/GeneralsMD/Code/GameEngine/Include/Common/Registry.h
index 19492702434..9ec63c2c192 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Registry.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Registry.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __REGISTRY_H__
-#define __REGISTRY_H__
-
 #include <Common/AsciiString.h>
 
 /**
@@ -51,5 +48,3 @@ AsciiString GetRegistryLanguage(void); // convenience function
 AsciiString GetRegistryGameName(void); // convenience function
 UnsignedInt GetRegistryVersion(void); // convenience function
 UnsignedInt GetRegistryMapPackVersion(void); // convenience function
-
-#endif // __REGISTRY_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h b/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h
index 210aae5aef8..265081de2bb 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef RESOURCE_GATHER_MANAGER_H
-#define RESOURCE_GATHER_MANAGER_H
-
 #include "Common/GameType.h"
 #include "Common/Snapshot.h"
 
@@ -72,5 +69,3 @@ class ResourceGatheringManager : public MemoryPoolObject,
 	objectIDList m_supplyCenters;
 
 };
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h b/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h
index 59d006b0b65..2736316f560 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h
@@ -24,12 +24,12 @@
 
 // FILE: STLTypedefs.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef __STLTYPEDEFS_H__
-#define __STLTYPEDEFS_H__
-
 //-----------------------------------------------------------------------------
 // srj sez: this must come first, first, first.
 #define _STLP_USE_NEWALLOC					1
@@ -73,6 +70,7 @@ enum DrawableID CPP_11(: Int);
 #include <Utility/hash_map_adapter.h>
 #include <list>
 #include <map>
+#include <numeric>
 #include <queue>
 #include <set>
 #include <stack>
@@ -113,15 +111,15 @@ typedef std::map< NameKeyType, Real, std::less<NameKeyType> > ProductionChangeMa
 typedef std::map< NameKeyType, VeterancyLevel, std::less<NameKeyType> > ProductionVeterancyMap;
 
 // Some useful, common hash and equal_to functors for use with hash_map
-namespace rts 
+namespace rts
 {
-	
-	// Generic hash functor. This should almost always be overridden for 
+
+	// Generic hash functor. This should almost always be overridden for
 	// specific types.
 	template<typename T> struct hash
 	{
 		size_t operator()(const T& __t) const
-		{ 
+		{
 			std::hash<T> tmp;
 			return tmp(__t);
 		}
@@ -152,7 +150,7 @@ namespace rts
 	template<> struct hash<NameKeyType>
 	{
 		size_t operator()(NameKeyType nkt) const
-		{ 
+		{
 			std::hash<UnsignedInt> tmp;
 			return tmp((UnsignedInt)nkt);
 		}
@@ -161,7 +159,7 @@ namespace rts
 	template<> struct hash<DrawableID>
 	{
 		size_t operator()(DrawableID nkt) const
-		{ 
+		{
 			std::hash<UnsignedInt> tmp;
 			return tmp((UnsignedInt)nkt);
 		}
@@ -170,16 +168,30 @@ namespace rts
 	template<> struct hash<ObjectID>
 	{
 		size_t operator()(ObjectID nkt) const
-		{ 
+		{
 			std::hash<UnsignedInt> tmp;
 			return tmp((UnsignedInt)nkt);
 		}
 	};
 
+	template<> struct hash<const Char*>
+	{
+		size_t operator()(const Char* s) const
+		{
+#ifdef USING_STLPORT
+			std::hash<const Char*> hasher;
+			return hasher(s);
+#else
+			std::hash<std::string_view> hasher;
+			return hasher(s);
+#endif
+		}
+	};
+
 	// This is the equal_to overload for char* comparisons. We compare the
 	// strings to determine whether they are equal or not.
 	// Other overloads should go into specific header files, not here (unless
-	// they are ot be used in lots of places.)
+	// they are to be used in lots of places.)
 	template<> struct equal_to<const char*>
 	{
 		Bool operator()(const char* s1, const char* s2) const
@@ -226,6 +238,60 @@ namespace rts
 			return (__t1.compareNoCase(__t2) < 0);
 		}
 	};
-}
 
-#endif /* __STLTYPEDEFS_H__ */
+	// TheSuperHackers @info Structs to help create maps that can use C strings for
+	// lookups without the need to allocate a string.
+	template <typename String>
+	struct string_key
+	{
+		typedef typename String::const_pointer const_pointer;
+
+		static string_key temporary(const_pointer s)
+		{
+			string_key key;
+			key.cstr = s;
+			return key;
+		}
+
+		string_key(const_pointer s)
+			: storage(s)
+			, cstr(storage.str())
+		{}
+
+		string_key(const String& s)
+			: storage(s)
+			, cstr(storage.str())
+		{}
+
+		const_pointer c_str() const
+		{
+			return cstr;
+		}
+
+	private:
+		string_key() {}
+
+		String storage;
+		const_pointer cstr;
+	};
+
+	template <typename String>
+	struct string_key_hash
+	{
+		typedef typename String::const_pointer const_pointer;
+		size_t operator()(const string_key<String>& key) const
+		{
+			return hash<const_pointer>()(key.c_str());
+		}
+	};
+
+	template <typename String>
+	struct string_key_equal
+	{
+		bool operator()(const string_key<String>& a, const string_key<String>& b) const
+		{
+			return strcmp(a.c_str(), b.c_str()) == 0;
+		}
+	};
+
+} // namespace rts
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Science.h b/GeneralsMD/Code/GameEngine/Include/Common/Science.h
index aa84e8fc11a..689b5078452 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Science.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Science.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SCIENCE_H_
-#define __SCIENCE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Overridable.h"
 #include "Common/NameKeyGenerator.h"
@@ -98,8 +95,8 @@ class ScienceStore : public SubsystemInterface
 	/**
 		this is a subtle call, and should ALMOST NEVER be called by external code...
 		this is used to determine if you have the "root" requirements for a given science,
-		and thus could *potentially* obtain it if you got extra prereqs. 
-		
+		and thus could *potentially* obtain it if you got extra prereqs.
+
 		Generally, you should call getPurchasableSciences() instead of this!
 	*/
 	Bool playerHasRootPrereqsForScience(const Player* player, ScienceType st) const;
@@ -109,7 +106,7 @@ class ScienceStore : public SubsystemInterface
 	ScienceType getScienceFromInternalName(const AsciiString& name) const;
 	AsciiString getInternalNameForScience(ScienceType science) const;
 
-	/** return a list of the sciences the given player can purchase now, and a list he might be able to purchase in the future, 
+	/** return a list of the sciences the given player can purchase now, and a list he might be able to purchase in the future,
 		but currently lacks prereqs or points for. (either might be an empty list) */
 	void getPurchasableSciences(const Player* player, ScienceVec& purchasable, ScienceVec& potentiallyPurchasable) const;
 
@@ -134,7 +131,3 @@ class ScienceStore : public SubsystemInterface
 };
 
 extern ScienceStore* TheScienceStore;
-
-
-#endif // __SCIENCE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h b/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h
index 7283ab2530b..c6c85bf9cd6 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h
@@ -23,9 +23,6 @@
 
 #pragma once
 
-#ifndef __SCOPEDMUTEX_H__
-#define __SCOPEDMUTEX_H__
-
 class ScopedMutex
 {
 	private:
@@ -36,7 +33,7 @@ class ScopedMutex
 		{
 			DWORD status = WaitForSingleObject(m_mutex, 500);
 			if (status != WAIT_OBJECT_0) {
-				DEBUG_LOG(("ScopedMutex WaitForSingleObject timed out - status %d\n", status));
+				DEBUG_LOG(("ScopedMutex WaitForSingleObject timed out - status %d", status));
 			}
 		}
 
@@ -45,5 +42,3 @@ class ScopedMutex
 			ReleaseMutex(m_mutex);
 		}
 };
-
-#endif /* __SCOPEDMUTEX_H__ */
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h b/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h
index 286d082a9cb..d0148196885 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h
@@ -24,12 +24,12 @@
 
 // FILE: ScoreKeeper.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jun 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ScoreKeeper.h
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Header file for the scorekeeper class
 //
 //-----------------------------------------------------------------------------
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __SCOREKEEPER_H_
-#define __SCOREKEEPER_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -73,22 +70,22 @@ class ScoreKeeper : public Snapshot
 
 	void reset( Int playerIdx );			///< Zero out the variables
 	Int calculateScore( void );				///< Performs the equation to calculate the score
-	
+
 	void addMoneySpent( Int money );								///< Adds money to the amount spent
 	void addMoneyEarned( Int money );								///< Adds money to the earned amount
-	
+
 	void addObjectBuilt( const Object *o );
 	void addObjectDestroyed( const Object *o );
 	void addObjectLost( const Object *o );
 	void addObjectCaptured( const Object *o );
 
 	void removeObjectBuilt( const Object *o );
-	
+
 	Int getTotalMoneyEarned( void ) { return m_totalMoneyEarned; }
 	Int getTotalMoneySpent( void ) { return m_totalMoneySpent; }
 	Int getTotalUnitsDestroyed( void );
 	Int getTotalUnitsBuilt( void ) { return m_totalUnitsBuilt; }
-	Int getTotalUnitsLost( void ) { return m_totalUnitsLost; } 
+	Int getTotalUnitsLost( void ) { return m_totalUnitsLost; }
 	Int getTotalBuildingsDestroyed( void );
 	Int getTotalBuildingsBuilt( void ) { return m_totalBuildingsBuilt; }
 	Int getTotalBuildingsLost( void ) { return m_totalBuildingsLost; }
@@ -100,7 +97,7 @@ class ScoreKeeper : public Snapshot
 	Int getTotalUnitsBuilt( KindOfMaskType validMask, KindOfMaskType invalidMask );
 
 protected:
-	
+
 	// snapshot methods
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
@@ -129,7 +126,7 @@ class ScoreKeeper : public Snapshot
 	ObjectCountMap m_objectsLost;				///< how many and what kinds of objects did we loose
 	ObjectCountMap m_objectsCaptured;
 	void xferObjectCountMap( Xfer *xfer, ObjectCountMap *map );
-		
+
 };
 
 //-----------------------------------------------------------------------------
@@ -141,5 +138,3 @@ inline void ScoreKeeper::addMoneyEarned( Int money )						{	m_totalMoneyEarned +
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __SCOREKEEPER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h
index 7ed04553dd6..6826ab14f40 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __SKIRMISHBATTLEHONORS_H__
-#define __SKIRMISHBATTLEHONORS_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -44,7 +41,7 @@ class GameWindow;
 class WinInstanceData;
 
 //-----------------------------------------------------------------------------
-// CustomMatchPreferences base class 
+// CustomMatchPreferences base class
 //-----------------------------------------------------------------------------
 class SkirmishBattleHonors : public UserPreferences
 {
@@ -108,5 +105,3 @@ void InsertBattleHonor(GameWindow *list, const Image *image, Bool enabled, Int i
 void BattleHonorTooltip(GameWindow *window,
 												WinInstanceData *instData,
 												UnsignedInt mouse);
-
-#endif // __SKIRMISHBATTLEHONORS_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h
index 70efff47c84..ef1dc739a2b 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h
@@ -30,16 +30,13 @@
 
 #pragma once
 
-#ifndef __SKIRMISHPREFERENCES_H__
-#define __SKIRMISHPREFERENCES_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 #include "Common/UserPreferences.h"
 
 //-----------------------------------------------------------------------------
-// SkirmishPreferences class 
+// SkirmishPreferences class
 //-----------------------------------------------------------------------------
 class SkirmishPreferences : public UserPreferences
 {
@@ -57,12 +54,10 @@ class SkirmishPreferences : public UserPreferences
 	Int getPreferredColor(void);				// convenience function
 	AsciiString getPreferredMap(void);	// convenience function
 	Bool usesSystemMapDir(void);		// convenience function
-  
+
   Bool getSuperweaponRestricted(void) const;
   void setSuperweaponRestricted( Bool superweaponRestricted);
-  
+
   Money getStartingCash(void) const;
   void setStartingCash( const Money &startingCash );
 };
-
-#endif // __SKIRMISHPREFERENCES_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h b/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h
index a27502f0a14..d6f8586f744 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __SNAPSHOT_H_
-#define __SNAPSHOT_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AsciiString.h"
 
@@ -50,7 +47,7 @@ friend class XferSave;
 friend class XferCRC;
 
 public:
-	
+
 	Snapshot( void );
 	~Snapshot( void );
 
@@ -68,6 +65,3 @@ friend class XferCRC;
 	virtual void loadPostProcess( void ) = 0;
 
 };
-
-#endif // __SNAPSHOT_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h b/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h
index 3f1f6966170..829c0cb4deb 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h
@@ -24,26 +24,29 @@
 
 // FILE: SparseMatchFinder.h /////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, March 2002
-// Desc:   
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __SparseMatchFinder_H_
-#define __SparseMatchFinder_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/BitFlags.h"
 #include "Common/STLTypedefs.h"
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	#define SPARSEMATCH_DEBUG
 #else
 	#undef SPARSEMATCH_DEBUG
 #endif
 
+typedef UnsignedInt SparseMatchFinderFlags;
+enum SparseMatchFinderFlags_ CPP_11(: SparseMatchFinderFlags)
+{
+	SparseMatchFinderFlags_NoCopy = 1<<0,
+};
+
 //-------------------------------------------------------------------------------------------------
-template<class MATCHABLE, class BITSET>
+template<class MATCHABLE, class BITSET, SparseMatchFinderFlags FLAGS = 0>
 class SparseMatchFinder
 {
 private:
@@ -99,7 +102,7 @@ class SparseMatchFinder
 	//-------------------------------------------------------------------------------------------------
 	// MEMBER VARS
 	//-------------------------------------------------------------------------------------------------
-	
+
 	mutable MatchMap m_bestMatches;
 	//mutable HashMatchMap m_bestHashMatches;
 
@@ -108,16 +111,16 @@ class SparseMatchFinder
 	//-------------------------------------------------------------------------------------------------
 
 	//-------------------------------------------------------------------------------------------------
-	inline static Int countConditionIntersection(const BITSET& a, const BITSET& b)
+	static Int countConditionIntersection(const BITSET& a, const BITSET& b)
 	{
 		return a.countIntersection(b);
-	} 
+	}
 
 	//-------------------------------------------------------------------------------------------------
-	inline static Int countConditionInverseIntersection(const BITSET& a, const BITSET& b)
+	static Int countConditionInverseIntersection(const BITSET& a, const BITSET& b)
 	{
 		return a.countInverseIntersection(b);
-	} 
+	}
 
 	//-------------------------------------------------------------------------------------------------
 	const MATCHABLE* findBestInfoSlow(const std::vector<MATCHABLE>& v, const BITSET& bits) const
@@ -126,8 +129,8 @@ class SparseMatchFinder
 		Int bestYesMatch = 0;							// want to maximize this
 		Int bestYesExtraneousBits = 999;	// want to minimize this
 
-	#ifdef SPARSEMATCH_DEBUG 
-		Int numDupMatches = 0; 
+	#ifdef SPARSEMATCH_DEBUG
+		Int numDupMatches = 0;
 		AsciiString curBestMatchStr, dupMatchStr;
 	#endif
 
@@ -146,7 +149,7 @@ class SparseMatchFinder
 				Int yesExtraneousBits = countConditionInverseIntersection(bits, yesFlags);
 
 	#ifdef SPARSEMATCH_DEBUG
-				if (yesMatch == bestYesMatch && 
+				if (yesMatch == bestYesMatch &&
 						yesExtraneousBits == bestYesExtraneousBits)
 				{
 					++numDupMatches;
@@ -165,16 +168,16 @@ class SparseMatchFinder
 					curBestMatchStr = it->getDescription();
 	#endif
 				}
-			}	// end for i
+			}
 
-		}	// end for it
+		}
 
 #ifdef SPARSEMATCH_DEBUG
 		if (numDupMatches > 0)
 		{
 			AsciiString curConditionStr;
-			bits.buildDescription(&curConditionStr); 
-			DEBUG_CRASH(("ambiguous model match in findBestInfoSlow \n\nbetween \n(%s)\n<and>\n(%s)\n\n(%d extra matches found)\n\ncurrent bits are (\n%s)\n",
+			bits.buildDescription(&curConditionStr);
+			DEBUG_CRASH(("ambiguous model match in findBestInfoSlow \n\nbetween \n(%s)\n<and>\n(%s)\n\n(%d extra matches found)\n\ncurrent bits are (\n%s)",
 					curBestMatchStr.str(),
 					dupMatchStr.str(),
 					numDupMatches,
@@ -185,9 +188,29 @@ class SparseMatchFinder
 		return result;
 	}
 
-	//-------------------------------------------------------------------------------------------------
 public:
 
+
+	//-------------------------------------------------------------------------------------------------
+	SparseMatchFinder() {}
+	SparseMatchFinder(const SparseMatchFinder& other)
+	{
+		*this = other;
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	SparseMatchFinder& operator=(const SparseMatchFinder& other)
+	{
+		if constexpr ((FLAGS & SparseMatchFinderFlags_NoCopy) == 0)
+		{
+			if (this != &other)
+			{
+				m_bestMatches = other.m_bestMatches;
+			}
+		}
+		return *this;
+	}
+
 	//-------------------------------------------------------------------------------------------------
 	void clear()
 	{
@@ -207,10 +230,10 @@ class SparseMatchFinder
 		if (first != NULL) {
 			return first;
 		}
-		
+
 		const MATCHABLE* info = findBestInfoSlow(v, bits);
 
-		DEBUG_ASSERTCRASH(info != NULL, ("no suitable match for criteria was found!\n"));
+		DEBUG_ASSERTCRASH(info != NULL, ("no suitable match for criteria was found!"));
 		if (info != NULL) {
 			m_bestMatches[bits] = info;
 		}
@@ -219,6 +242,3 @@ class SparseMatchFinder
 	}
 
 };
-
-#endif // __SparseMatchFinder_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h
index 49ccb8c3607..c1aa8e794d6 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __SPECIALPOWER_H_
-#define __SPECIALPOWER_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/GameMemory.h"
@@ -57,25 +54,25 @@ enum AcademyClassificationType CPP_11(: Int);
 
 #define MAKE_SPECIALPOWER_MASK(k) SpecialPowerMaskType(SpecialPowerMaskType::kInit, (k))
 
-inline Bool TEST_SPECIALPOWERMASK(const SpecialPowerMaskType& m, SpecialPowerType t) 
-{ 
-	return m.test(t); 
+inline Bool TEST_SPECIALPOWERMASK(const SpecialPowerMaskType& m, SpecialPowerType t)
+{
+	return m.test(t);
 }
-inline Bool TEST_SPECIALPOWERMASK_ANY(const SpecialPowerMaskType& m, const SpecialPowerMaskType& mask) 
-{ 
+inline Bool TEST_SPECIALPOWERMASK_ANY(const SpecialPowerMaskType& m, const SpecialPowerMaskType& mask)
+{
 	return m.anyIntersectionWith(mask);
 }
 inline Bool TEST_SPECIALPOWERMASK_MULTI(const SpecialPowerMaskType& m, const SpecialPowerMaskType& mustBeSet, const SpecialPowerMaskType& mustBeClear)
 {
 	return m.testSetAndClear(mustBeSet, mustBeClear);
 }
-inline Bool SPECIALPOWERMASK_ANY_SET(const SpecialPowerMaskType& m) 
-{ 
-	return m.any(); 
+inline Bool SPECIALPOWERMASK_ANY_SET(const SpecialPowerMaskType& m)
+{
+	return m.any();
 }
-inline void CLEAR_SPECIALPOWERMASK(SpecialPowerMaskType& m) 
-{ 
-	m.clear(); 
+inline void CLEAR_SPECIALPOWERMASK(SpecialPowerMaskType& m)
+{
+	m.clear();
 }
 inline void SET_SPECIALPOWERMASK( SpecialPowerMaskType& m, SpecialPowerType t, Int val = 1 )
 {
@@ -127,7 +124,7 @@ class SpecialPowerTemplate : public Overridable
 	Bool isShortcutPower() const { return getFO()->m_shortcutPower; }
 	AcademyClassificationType getAcademyClassificationType() const { return m_academyClassificationType; }
 
-private: 
+private:
 
 	const SpecialPowerTemplate* getFO() const { return (const SpecialPowerTemplate*)friend_getFinalOverride(); }
 
@@ -139,7 +136,7 @@ class SpecialPowerTemplate : public Overridable
 	AudioEventRTS			m_initiateSound;			///< sound to play when initiated
 	AudioEventRTS			m_initiateAtLocationSound;		///< sound to play at target location (if any)
 	AcademyClassificationType m_academyClassificationType; ///< A value used by the academy to evaluate advice based on what players do.
-	UnsignedInt				m_detectionTime;			///< (frames) after using infiltration power (defection, etc.), 
+	UnsignedInt				m_detectionTime;			///< (frames) after using infiltration power (defection, etc.),
 																					///< how long it takes for ex comrades to realize it on their own
 	UnsignedInt				m_viewObjectDuration;	///< Lifetime of a looking object we slap down so you can watch the effect
 	Real							m_viewObjectRange;		///< And how far that object can see.
@@ -191,5 +188,3 @@ class SpecialPowerStore : public SubsystemInterface
 
 // EXTERNAL ///////////////////////////////////////////////////////////////////////////////////////
 extern SpecialPowerStore *TheSpecialPowerStore;
-
-#endif  // end __SPECIALPOWER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h
index d3433923b65..fafff1ad213 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h
@@ -27,13 +27,9 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __SPECIALPOWERMASKTYPE_H__
-#define __SPECIALPOWERMASKTYPE_H__
 
 #include "Common/BitFlags.h"
 #include "Common/BitFlagsIO.h"
 #include "Common/SpecialPowerType.h"
 
 typedef BitFlags<SPECIALPOWER_COUNT>	SpecialPowerMaskType;
-
-#endif /* __SPECIALPOWERMASKTYPE_H__ */
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h
index fc592511681..163f410ddb7 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h
@@ -27,8 +27,6 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __SPECIALPOWERTYPE_H__
-#define __SPECIALPOWERTYPE_H__
 
 // ------------------------------------------------------------------------------------------------
 // don't forget to add new strings to SpecialPowerMaskType::s_bitNameList[]
@@ -72,7 +70,7 @@ enum SpecialPowerType CPP_11(: Int)
 	//Special abilities
 	SPECIAL_MISSILE_DEFENDER_LASER_GUIDED_MISSILES,
 	SPECIAL_REMOTE_CHARGES,
-	SPECIAL_TIMED_CHARGES, 
+	SPECIAL_TIMED_CHARGES,
 	SPECIAL_HELIX_NAPALM_BOMB,
 	SPECIAL_HACKER_DISABLE_BUILDING,
 	SPECIAL_TANKHUNTER_TNT_ATTACK,
@@ -96,11 +94,11 @@ enum SpecialPowerType CPP_11(: Int)
 
   SPECIAL_SPECTRE_GUNSHIP,
   SPECIAL_GPS_SCRAMBLER,
-	
+
 	SPECIAL_FRENZY,
 	SPECIAL_SNEAK_ATTACK,
 
-	//Ack, this is ass. These enums fix a bug where new enums were missing for 
+	//Ack, this is ass. These enums fix a bug where new enums were missing for
 	//shortcut powers... but the real clincher was that if you were say USA and
 	//captured a Tank China command center, your US paradrop would be assigned
 	//to the china tank drop and when you tried to fire it from the shortcut
@@ -128,11 +126,9 @@ enum SpecialPowerType CPP_11(: Int)
 	SUPW_SPECIAL_NEUTRON_MISSILE,
 
 	SPECIAL_BATTLESHIP_BOMBARDMENT,
-		
+
 	SPECIALPOWER_COUNT,
 	// don't forget to add new strings to SpecialPowerMaskType::s_bitNameList[]
 };
 
 	// Definition of these names is located in SpecialPower.cpp
-
-#endif /* __SPECIALPOWERTYPE_H__ */
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h b/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h
index e9f994b9c8c..5c2990fe3ab 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h
@@ -24,13 +24,10 @@
 
 #pragma once
 
-#ifndef __STACKDUMP_H_
-#define __STACKDUMP_H_
-
 #ifndef IG_DEGBUG_STACKTRACE
 #define IG_DEBUG_STACKTRACE	1
 #endif // Unsure about this one -ML 3/25/03
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(IG_DEBUG_STACKTRACE)
+#if defined(RTS_DEBUG) || defined(IG_DEBUG_STACKTRACE)
 
 // Writes a stackdump (provide a callback : gets called per line)
 // If callback is NULL then will write using OuputDebugString
@@ -69,4 +66,3 @@ __inline void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info ) {}
 #endif
 
 extern AsciiString g_LastErrorDump;
-#endif // __STACKDUMP_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h
index 7478a97dd62..c23f8023628 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h
@@ -28,17 +28,12 @@
 
 #pragma once
 
-#ifndef _STATE_MACHINE_H_
-#define _STATE_MACHINE_H_
-
 #include "Common/GameMemory.h"
 #include "Common/GameType.h"
 #include "Common/ModelState.h"
 #include "Common/Snapshot.h"
 #include "Common/Xfer.h"
 
-#include "refcount.h"
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -51,9 +46,6 @@ class Object;
 #if defined(RTS_DEBUG)
 	#define STATE_MACHINE_DEBUG
 #endif
-#if defined(RTS_INTERNAL)
-	#define STATE_MACHINE_DEBUG	//uncomment to debug state machines in internal.  jba.
-#endif
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -66,8 +58,8 @@ typedef Bool (*StateTransFuncPtr)( State *state, void* userData );
 /**
  * State return codes
  */
-enum StateReturnType CPP_11(: Int) 
-{ 
+enum StateReturnType CPP_11(: Int)
+{
 	// note that all positive values are reserved for STATE_SLEEP!
 
 	STATE_CONTINUE	= 0,						///< stay in this state (only for update method)
@@ -109,17 +101,17 @@ inline StateReturnType MIN_SLEEP(UnsignedInt encloserSleep, StateReturnType encl
 }
 
 
-/** 
+/**
  * Special argument for onCondition. It means when the given condition
  * becomes true, the state machine will exit and return the given status.
  */
-enum 
-{ 
+enum
+{
 	EXIT_MACHINE_WITH_SUCCESS = 9998,
 	EXIT_MACHINE_WITH_FAILURE = 9999
 };
 
-/** 
+/**
  * Parameters for onExit().
  */
 enum StateExitType CPP_11(: Int)
@@ -161,8 +153,8 @@ class State : public MemoryPoolObject, public Snapshot
 	//Definition of busy -- when explicitly in the busy state. Moving or attacking is not considered busy!
 	virtual Bool isBusy() const { return false; }
 
-	inline StateMachine* getMachine() { return m_machine; }		///< return the machine this state is part of
-	inline StateID getID() const { return m_ID; }			///< get this state's id 
+	StateMachine* getMachine() { return m_machine; }		///< return the machine this state is part of
+	StateID getID() const { return m_ID; }			///< get this state's id
 
 	Object* getMachineOwner();
 	const Object* getMachineOwner() const;
@@ -176,9 +168,9 @@ class State : public MemoryPoolObject, public Snapshot
 #endif
 
 	// for internal use by the StateMachine class ---------------------------------------------------------
-	inline void friend_setID( StateID id ) { m_ID = id; }			///< define this state's id (for use only by StateMachine class)
+	void friend_setID( StateID id ) { m_ID = id; }			///< define this state's id (for use only by StateMachine class)
 	void friend_onSuccess( StateID toStateID ) { m_successStateID = toStateID; }	///< define which state to move to after successful completion
-	void friend_onFailure( StateID toStateID ) { m_failureStateID = toStateID; }	///< define which state to move to after failure 
+	void friend_onFailure( StateID toStateID ) { m_failureStateID = toStateID; }	///< define which state to move to after failure
 	void friend_onCondition( StateTransFuncPtr test, StateID toStateID, void* userData, const char* description = NULL );	///< define when to change state
 	StateReturnType friend_checkForTransitions( StateReturnType status );	///< given a return code, handle state transitions
 	StateReturnType friend_checkForSleepTransitions( StateReturnType status );	///< given a return code, handle state transitions
@@ -192,7 +184,7 @@ class State : public MemoryPoolObject, public Snapshot
 protected:
 	// snapshot interface	 - pure virtual here.
 	// Essentially all the member data gets set up on creation and shouldn't change.
-	// So none of it needs to be saved, and it nicely forces all user states to 
+	// So none of it needs to be saved, and it nicely forces all user states to
 	// remember to implement crc, xfer & loadPostProcess.  jba
 	virtual void crc( Xfer *xfer )=0;
 	virtual void xfer( Xfer *xfer )=0;
@@ -209,12 +201,12 @@ class State : public MemoryPoolObject, public Snapshot
 		const char*					description;							///< description (for debugging purposes)
 #endif
 
-		TransitionInfo(StateTransFuncPtr t, StateID id, void* ud, const char* desc) : 
-			test(t), 
+		TransitionInfo(StateTransFuncPtr t, StateID id, void* ud, const char* desc) :
+			test(t),
 			toStateID(id),
 			userData(ud)
 #ifdef STATE_MACHINE_DEBUG
-			, description(desc) 
+			, description(desc)
 #endif
 		{ }
 	};
@@ -239,7 +231,7 @@ inline State::~State() { }
 /**
  * A finite state machine.
  */
-class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountClass
+class StateMachine : public MemoryPoolObject, public Snapshot
 {
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( StateMachine, "StateMachinePool" );
 
@@ -261,10 +253,14 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 	/** must be called to jump the StateMachine into the default state... this may fail
 		(return a failure code), so it can't be done via the ctor. you MUST call this before
 		using the state machine. */
-	virtual StateReturnType initDefaultState();	
+	virtual StateReturnType initDefaultState();
 
 	virtual StateReturnType setState( StateID newStateID );			///< change the current state of the machine (which may cause further state changes, due to onEnter)
 
+	void Add_Ref() const { m_refCount.Add_Ref(); }
+	void Release_Ref() const { m_refCount.Release_Ref(MemoryPoolObject::deleteInstanceInternal, this); }
+	UnsignedByte Num_Refs() const { return m_refCount.Num_Refs(); }
+
 	StateID getCurrentStateID() const { return m_currentState ? m_currentState->getID() : INVALID_STATE_ID; }	///< return the id of the current state of the machine
 	Bool isInIdleState() const { return m_currentState ? m_currentState->isIdle() : true; }	// stateless things are considered 'idle'
 	Bool isInAttackState() const { return m_currentState ? m_currentState->isAttack() : true; }	// stateless things are considered 'idle'
@@ -282,17 +278,17 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 	 * Lock/unlock this state machine.
 	 * If a machine is locked, it cannot be reset, or given external setStates(), etc.
 	 */
-	void lock(const char* msg) 
+	void lock(const char* msg)
 	{
-		m_locked = true; 
+		m_locked = true;
 #ifdef STATE_MACHINE_DEBUG
 		m_lockedby = msg;
 #endif
 	}
 
-	void unlock() 
-	{ 
-		m_locked = false; 
+	void unlock()
+	{
+		m_locked = false;
 #ifdef STATE_MACHINE_DEBUG
 		m_lockedby = NULL;
 #endif
@@ -314,8 +310,8 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 	const Object *getGoalObject() const;
 	void setGoalPosition( const Coord3D *pos );
 	const Coord3D *getGoalPosition() const { return &m_goalPosition; }
-	Bool isGoalObjectDestroyed() const;  ///< Returns true if we had a goal object, but it has been destroyed. 
-	
+	Bool isGoalObjectDestroyed() const;  ///< Returns true if we had a goal object, but it has been destroyed.
+
 	virtual void halt(void); ///< Stops the state machine & disables it in preparation for deleting it.
 
 	//
@@ -323,7 +319,7 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 	//
 	StateReturnType internalSetState( StateID newStateID );	///< for internal use only - change the current state of the machine
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	UnsignedInt peekSleepTill() const { return m_sleepTill; }
 #endif
 
@@ -334,34 +330,28 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 	inline AsciiString getName() const {return m_name;}
 	virtual AsciiString getCurrentStateName() const { return m_currentState ? m_currentState->getName() : AsciiString::TheEmptyString;}
 #else
-	inline Bool getWantsDebugOutput() const { return false; }
-	inline AsciiString getCurrentStateName() const { return AsciiString::TheEmptyString;}
+	Bool getWantsDebugOutput() const { return false; }
+	AsciiString getCurrentStateName() const { return AsciiString::TheEmptyString;}
 #endif
 
 protected:
 	// snapshot interface
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess();	
-
-	// RefCountClass interface
-	virtual void Delete_This()
-	{
-		MemoryPoolObject::deleteInstanceInternal(this);
-	}
+	virtual void loadPostProcess();
 
 protected:
 
 	/**
-	 * Given a unique (to this machine) integer ID representing a state, and an instance 
+	 * Given a unique (to this machine) integer ID representing a state, and an instance
 	 * of that state, the machine records this as a possible state, and
 	 * internally maps the given integer ID to the state instance.
 	 * These state id's are used to change the machine's state via setState().
 	 */
-	void defineState( StateID id, State *state, 
-										StateID successID, 
+	void defineState( StateID id, State *state,
+										StateID successID,
 										StateID failureID,
-										const StateConditionInfo* conditions = NULL);	
+										const StateConditionInfo* conditions = NULL);
 
 	State* internalGetState( StateID id );
 
@@ -373,7 +363,7 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 
 
 	std::map<StateID, State *>	m_stateMap;			///< the mapping of ids to states
-	Object*											m_owner;				///< object that "owns" this machine 
+	Object*											m_owner;				///< object that "owns" this machine
 
 	UnsignedInt		m_sleepTill;									///< if nonzero, we are sleeping 'till this frame
 
@@ -386,6 +376,8 @@ class StateMachine : public MemoryPoolObject, public Snapshot, public RefCountCl
 	Bool					m_locked;													///< whether this machine is locked or not
 	Bool					m_defaultStateInited;							///< if initDefaultState has been called
 
+	RefCountValue<UnsignedByte> m_refCount;
+
 #ifdef STATE_MACHINE_DEBUG
 	Bool					m_debugOutput;
 	AsciiString		m_name;													///< Human readable name of this state - for debugging.  jba.
@@ -409,7 +401,7 @@ inline const Coord3D* State::getMachineGoalPosition() const { return m_machine->
 */
 class SuccessState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SuccessState, "SuccessState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SuccessState, "SuccessState")
 public:
 	SuccessState( StateMachine *machine ) : State( machine, "SuccessState") { }
 	virtual StateReturnType onEnter() { return STATE_SUCCESS; }
@@ -429,7 +421,7 @@ EMPTY_DTOR(SuccessState)
 */
 class FailureState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FailureState, "FailureState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FailureState, "FailureState")
 public:
 	FailureState( StateMachine *machine ) : State( machine, "FailureState") { }
 	virtual StateReturnType onEnter() { return STATE_FAILURE; }
@@ -441,7 +433,7 @@ class FailureState : public State
 	virtual void loadPostProcess(){};
 };
 EMPTY_DTOR(FailureState)
- 
+
 
 //-----------------------------------------------------------------------------------------------------------
 /**
@@ -449,7 +441,7 @@ EMPTY_DTOR(FailureState)
 */
 class ContinueState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ContinueState, "ContinueState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ContinueState, "ContinueState")
 public:
 	ContinueState( StateMachine *machine ) : State( machine, "ContinueState" ) { }
 	virtual StateReturnType onEnter() { return STATE_CONTINUE; }
@@ -469,7 +461,7 @@ EMPTY_DTOR(ContinueState)
 */
 class SleepState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SleepState, "SleepState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SleepState, "SleepState")
 public:
 	SleepState( StateMachine *machine ) : State( machine, "SleepState" ) { }
 	virtual StateReturnType onEnter() { return STATE_SLEEP_FOREVER; }
@@ -488,8 +480,6 @@ EMPTY_DTOR(SleepState)
 // @todo Replace calls to deleteInstance with RefCountPtr<StateMachine> when so appropriate.
 inline void deleteInstance(StateMachine* machine)
 {
-	machine->Release_Ref();
+	if (machine != NULL)
+		machine->Release_Ref();
 }
-
-
-#endif // _STATE_MACHINE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h b/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h
index 3f76fd55025..a8406990152 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h
@@ -24,12 +24,12 @@
 
 // FILE: StatsCollector.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,7 +37,7 @@
 //	Filename: 	StatsCollector.h
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Convinience class to help with collecting stats.
 //
 //-----------------------------------------------------------------------------
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __STATSCOLLECTOR_H_
-#define __STATSCOLLECTOR_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -70,9 +67,9 @@ class StatsCollector
 public:
 	StatsCollector( void );
 	~StatsCollector( void );
-	
+
 	void reset( void );							///< Reset's all values and writes the file header
-	
+
 	void collectMsgStats( const GameMessage *msg );			///< collects Msg Stats if
 	void collectUnitCountStats( void );									///< cycle through all units and takes count
 	void incrementScrollMoveCount( void );
@@ -83,13 +80,13 @@ class StatsCollector
 	void endScrollTime( void );			///< end our logging on the amount of time we're scrolling
 
 	void update( void );						///< called once a frame to see if we should poll this frame
-	
+
 	void writeFileEnd(void);				///< Write the end of the file
 private:
-	
+
 	void createFileName( void );		///< Create a snazzy filename
 	AsciiString m_statsFileName;		///< store the snazzy filename
-	
+
 	void writeInitialFileInfo(void );		///< write the header file info
 	void writeStatInfo( void );					///< write the stats we're keeping track of
 
@@ -100,7 +97,7 @@ class StatsCollector
 	UnsignedInt m_scrollMapCommands;///< scroll map commands
 	UnsignedInt m_AIUnits;					///< tally of all the AI Units
 	UnsignedInt m_playerUnits;			///< tally of all the player Units
-	
+
 	UnsignedInt m_scrollBeginTime;	///< Begin time in frames
 	UnsignedInt m_scrollTime;				///< our totals for the scrolltime
 	Bool m_isScrolling;							///< flag to make sure we are scrolling
@@ -119,5 +116,3 @@ class StatsCollector
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 extern StatsCollector* TheStatsCollector;			///< we need a singleton
-
-#endif // __STATSCOLLECTOR_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StreamingArchiveFile.h b/GeneralsMD/Code/GameEngine/Include/Common/StreamingArchiveFile.h
deleted file mode 100644
index 8afab6096c6..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/StreamingArchiveFile.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    RTS 3
-//
-// Module:     IO
-//
-// File name:  Common/StreamingArchiveFile.h
-//
-// Created:    11/08/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __STREAMINGARCHIVEFILE_H
-#define __STREAMINGARCHIVEFILE_H
-
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/RAMFile.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// StreamingArchiveFile
-//===============================
-/**
-  *	File abstraction for standard C file operators: open, close, lseek, read, write
-	*/
-//===============================
-
-class StreamingArchiveFile : public RAMFile
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(StreamingArchiveFile, "StreamingArchiveFile")		
-	protected:
-
-		File					*m_file;											///< The archive file that I came from
-		Int						m_startingPos;								///< My starting position in the archive
-		Int						m_size;												///< My length
-		Int						m_curPos;											///< My current position.
-		
-	public:
-		
-		StreamingArchiveFile();
-		//virtual				~StreamingArchiveFile();
-
-
-		virtual Bool	open( const Char *filename, Int access = 0 );				///< Open a file for access
-		virtual void	close( void );																			///< Close the file
-		virtual Int		read( void *buffer, Int bytes );										///< Read the specified number of bytes in to buffer: See File::read
-		virtual Int		write( const void *buffer, Int bytes );							///< Write the specified number of bytes from the buffer: See File::write
-		virtual Int		seek( Int new_pos, seekMode mode = CURRENT );				///< Set file position: See File::seek
-		
-		// Ini's should not be parsed with streaming files, that's just dumb.
-		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0) { DEBUG_CRASH(("Should not call nextLine on a streaming file.\n")); } 
-		virtual Bool	scanInt(Int &newInt) { DEBUG_CRASH(("Should not call scanInt on a streaming file.\n"));  return FALSE; } 
-		virtual Bool	scanReal(Real &newReal) { DEBUG_CRASH(("Should not call scanReal on a streaming file.\n")); return FALSE; } 
-		virtual Bool	scanString(AsciiString &newString) { DEBUG_CRASH(("Should not call scanString on a streaming file.\n")); return FALSE; } 
-
-		virtual Bool	open( File *file );																	///< Open file for fast RAM access
-		virtual Bool	openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size); ///< copy file data from the given file at the given offset for the given size.
-		virtual Bool	copyDataToFile(File *localFile) { DEBUG_CRASH(("Are you sure you meant to copyDataToFile on a streaming file?")); return FALSE; }
-
-		virtual char* readEntireAndClose() { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return NULL; }
-		virtual File* convertToRAMFile() { DEBUG_CRASH(("Are you sure you meant to readEntireAndClose on a streaming file?")); return this; }
-};
-
-
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-
-#endif // __STREAMINGARCHIVEFILE_H
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h b/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h
index f5a109a960d..e7c5725ba1e 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h
@@ -29,11 +29,8 @@
 
 #pragma once
 
-#ifndef __SUBSYSTEMINTERFACE_H_
-#define __SUBSYSTEMINTERFACE_H_
-
 #include "Common/INI.h"
-#include "Common/STLTypedefs.h"	
+#include "Common/STLTypedefs.h"
 
 class Xfer;
 
@@ -44,7 +41,7 @@ class Xfer;
 	*
 	* Nothing about the subsystems is automatic, this interface does not wrap up automated
 	* functions, it is only here to provide a basic interface and rules for behavior
-	* all subsystems 
+	* all subsystems
 	*/
 class SubsystemInterface
 {
@@ -61,7 +58,7 @@ class SubsystemInterface
 
 	//-----------------------------------------------------------------------------------------------
 	/** - Free any resources allocated for this class.
-		* 
+		*
 		* - DO NOT throw exceptions during any destruction ever, and do not call other
 		*		methods that have the possibility of throwing exceptions.  Try to keep it
 		*		simple and keep as much work actually inside the destructor as possible.
@@ -91,7 +88,7 @@ class SubsystemInterface
 		*		re-initialize the resources already allocated.
 		*
 		*	- After a reset, the system does not need to be in EXACTLY the same state as a
-		*		fresh instantiation.  If there are persistent state information for the 
+		*		fresh instantiation.  If there are persistent state information for the
 		*		system make sure you maintain it while restoring or re-initializing other
 		*		transient parts.
 		*/
@@ -103,7 +100,7 @@ class SubsystemInterface
 		*		to service the system.
 		*
 		*	- Note that currently the GameClient and GameLogic will be updating
-		*		at different rates where the logic is running real time, and the 
+		*		at different rates where the logic is running real time, and the
 		*		client will adjust how many loops can be done during one server
 		*		time slice in order to improve performance on low end machines.
 		*/
@@ -124,33 +121,33 @@ class SubsystemInterface
 protected:
 	static Real s_msConsumed;
 	Real m_startTimeConsumed;
-	Real m_curUpdateTime;	
+	Real m_curUpdateTime;
 
 	Real m_startDrawTimeConsumed;
 	Real m_curDrawTime;
 	Bool m_dumpUpdate;
 	Bool m_dumpDraw;
-#else 
-	inline void UPDATE(void) {update();}
-	inline void DRAW(void) {draw();}
+#else
+	void UPDATE(void) {update();}
+	void DRAW(void) {draw();}
 #endif
 protected:
-	AsciiString m_name;	
+	AsciiString m_name;
 public:
 	AsciiString getName(void) {return m_name;}
 	void setName(AsciiString name) {m_name = name;}
 
-};  // end SubsystemInterface
+};
 
 //-------------------------------------------------------------------------------------------------
 class SubsystemInterfaceList
 {
 public:
-	
+
 	SubsystemInterfaceList();
 	~SubsystemInterfaceList();
 
-	void initSubsystem(SubsystemInterface* sys, const char* path1, const char* path2, const char* dirpath, Xfer *pXfer, AsciiString name="");
+	void initSubsystem(SubsystemInterface* sys, const char* path1, const char* path2, Xfer *pXfer, AsciiString name="");
 	void addSubsystem(SubsystemInterface* sys);
 	void removeSubsystem(SubsystemInterface* sys);
 	void postProcessLoadAll();
@@ -169,6 +166,3 @@ class SubsystemInterfaceList
 };
 
 extern SubsystemInterfaceList* TheSubsystemList;
-
-#endif // __SUBSYSTEMINTERFACE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h b/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h
index 9b610718f7c..c2d1f06282e 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h
@@ -28,11 +28,4 @@
 
 #pragma once
 
-#ifndef __SYSTEMINFO_H__
-#define __SYSTEMINFO_H__
-
 extern const Bool TheSystemIsUnicode;
-
-
-
-#endif /* __SYSTEMINFO_H__ */
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Team.h b/GeneralsMD/Code/GameEngine/Include/Common/Team.h
index 900bfa7897a..b5ac00ce11f 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Team.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Team.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _TEAM_H_
-#define _TEAM_H_
-
 #include "Common/GameType.h"
 #include "Common/Snapshot.h"
 #include "Common/Thing.h"
@@ -50,7 +47,7 @@ class TeamRelationMap : public MemoryPoolObject,
 												public Snapshot
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TeamRelationMap, "TeamRelationMapPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TeamRelationMap, "TeamRelationMapPool" )
 
 public:
 
@@ -82,14 +79,14 @@ typedef void (*ObjectIterateFunc)( Object *obj, void *userData );		///< callback
 	-- All Teams (toplevel and subteams) are in the list
 	-- Each TeamDict contains:
 		-- Team Name (an internal ascii str)
-		-- Owning Team (or Player), by Name 
+		-- Owning Team (or Player), by Name
 		-- Misc Flags
 		-- Teams we are allies with, by name (only for toplevel teams)
 		-- Teams we are enemies with, by name (only for toplevel teams)
 
 	-- Note that Players and Teams share the same namespace, so you cannot have a team
-		with the same name as a player (or vice versa). 
-	
+		with the same name as a player (or vice versa).
+
 	-- MapObject Dicts will be revised to have an "owning team" rather than "owning player" entry
 
 	-- BuildLists must also have a way to assign units to Teams, as appropriate
@@ -160,7 +157,7 @@ class TeamTemplateInfo : public Snapshot
 	AsciiString				m_transportUnitType;					///< Unit used to transport the team.
 	AsciiString				m_startReinforceWaypoint;			///< Waypoint where the reinforcement team starts.
 	Bool							m_teamStartsFull;							///< If true, team loads into member transports.
-	Bool							m_transportsExit;							///< True if the transports leave after deploying team.	
+	Bool							m_transportsExit;							///< True if the transports leave after deploying team.
 	VeterancyLevel		m_veterancy;								///< Veterancy level;
 
 	// Production scripts stuff
@@ -182,7 +179,7 @@ class Team : public MemoryPoolObject,
 						 public Snapshot
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Team, "TeamPool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Team, "TeamPool" )
 
 private:
 
@@ -248,14 +245,14 @@ class Team : public MemoryPoolObject,
 	/// return the prototype used to create this team
 	const TeamPrototype *getPrototype( void ) { return m_proto; }
 
-	void setID( TeamID id ) { m_id = id; }	
+	void setID( TeamID id ) { m_id = id; }
 	TeamID getID() const { return m_id; }
 
 	/**
 		 Set the attack priority name for a team.
 	*/
 	void setAttackPriorityName(AsciiString name);
-	
+
 	/**
 		return the player currently controlling this team (backtracking up if necessary)
 	*/
@@ -266,7 +263,7 @@ class Team : public MemoryPoolObject,
 	*/
 	void setControllingPlayer(Player *newController);
 
-	/** 
+	/**
 		Get the team's state
 	*/
 	const AsciiString& getState(void) const {return m_state;}
@@ -276,7 +273,7 @@ class Team : public MemoryPoolObject,
 	*/
 	void getTeamAsAIGroup(AIGroup *pAIGroup);
 
-	/** 
+	/**
 		Get the team's state
 	*/
 	inline const AsciiString& getName() const;
@@ -286,52 +283,52 @@ class Team : public MemoryPoolObject,
 	*/
 	Int getTargetableCount() const;
 
-	/** 
+	/**
 		Set the team's AI state.
 	*/
 	void setState(const AsciiString& state) {m_state = state;}
 
-	/** 
+	/**
 		Set the team's AI recruitablity.
 	*/
 	void setRecruitable(Bool recruitable) {m_isRecruitablitySet = true; m_isRecruitable = recruitable;}
 
-	/** 
+	/**
 		Set the team's target object.
 	*/
 	void setTeamTargetObject(const Object *target) ;
 
-	/** 
+	/**
 		Set the team's target object.
 	*/
-	Object *getTeamTargetObject(void); 
+	Object *getTeamTargetObject(void);
 
-	/** 
+	/**
 		Set the team as active.  A team is considered created when set active.
 	*/
 	void setActive(void) {if (!m_active) { m_created = true;m_active = true;}}
 
-	/** 
+	/**
 		Is this team active?
 	*/
 	Bool isActive(void) {return m_active;}
 
-	/** 
+	/**
 		Is this team just createc?  (stays true one logic frame.)
 	*/
 	Bool isCreated(void) {return m_created;}
 
-	/** 
+	/**
 		Note that a team member entered or exited a trigger area.
 	*/
 	void setEnteredExited(void) {m_enteredOrExited = true;}
 
-	/** 
+	/**
 		Did a team member enter or exit a trigger area.
 	*/
 	Bool didEnterOrExit(void) {return m_enteredOrExited;}
 
-	/** 
+	/**
 		Clear the flag that a team member entered or exited a trigger area.
 		Also checks and executes any onCreate scripts, and clears the created flag.
 	*/
@@ -352,7 +349,7 @@ class Team : public MemoryPoolObject,
 	/**
 		return our relationship with the other team.
 		this is done as follows:
-		
+
 		-- if there's a TeamRelationship between this team and that team, return it.
 		-- otherwise, we use the relationship between our players.
 
@@ -367,7 +364,7 @@ class Team : public MemoryPoolObject,
 	void setOverrideTeamRelationship( TeamID teamID, Relationship r );
 
 	/**
-		remove the special relation (if any) between this and that. 
+		remove the special relation (if any) between this and that.
 		remove all special relations for 'this' if that==null.
 		return true if anything removed.
 	*/
@@ -382,7 +379,7 @@ class Team : public MemoryPoolObject,
 	void setOverridePlayerRelationship( Int playerIndex, Relationship r );
 
 	/**
-		remove the special relation (if any) between this and that. 
+		remove the special relation (if any) between this and that.
 		remove all special relations for 'this' if that==null.
 		return true if anything removed.
 	*/
@@ -395,13 +392,13 @@ class Team : public MemoryPoolObject,
 		the team's list-of-objects only once.
 	*/
 	void countObjectsByThingTemplate(Int numTmplates, const ThingTemplate* const* things, Bool ignoreDead, Int *counts, Bool ignoreUnderConstruction = TRUE ) const;
-	
-	
+
+
 	/**
 		returns the number of buildings on this team, by checking each things' template kindof against KINDOF_STRUCTURE
 	*/
 	Int countBuildings(void);
-	
+
 	/**
 		simply returns the number of objects on this team with a specific KindOfMaskType
 	*/
@@ -440,7 +437,7 @@ class Team : public MemoryPoolObject,
 	/**
 		a convenience routine to quickly check if all the units are idle.
 	*/
-	Bool isIdle(void) const;		
+	Bool isIdle(void) const;
 
 	/**
 		a convenience routine to quickly check if any objects are in a trigger area.
@@ -464,7 +461,7 @@ class Team : public MemoryPoolObject,
 
 	/**
 		a convenience routine to destroy this team. The team goes through all shutdown stuff.
-		Note that this doesn't actually call deleteInstance, the team will actually be 
+		Note that this doesn't actually call deleteInstance, the team will actually be
 		deleted on the next update, if it is a deletable team.
 		IgnoreDead lets you not delete people who are dying anyway.  Needed for scripts.
 	*/
@@ -475,18 +472,18 @@ class Team : public MemoryPoolObject,
 		of the first member of the team
 		*/
 	const Coord3D* getEstimateTeamPosition(void) const;
-	
+
 	/**
 		a convenience routine to move a team's units to another team.
 	*/
 	void transferUnitsTo(Team *newTeam);
 
-	/** 
+	/**
 		a function to kill all members of a team
 	*/
 	void killTeam(void);
 
-	/** 
+	/**
 		a function to make all containers on a team to dump contents
 	*/
 	void evacuateTeam(void);
@@ -497,17 +494,17 @@ class Team : public MemoryPoolObject,
 	const Waypoint *getCurrentWaypoint(void) {return m_currentWaypoint;}
 	void setCurrentWaypoint(const Waypoint *way) {m_currentWaypoint = way;}
 
-	/** 
+	/**
 		Update the generic scripts, allow them to see if they should run, etc.
 	*/
 
 	void updateGenericScripts(void);
-	
+
 };
 
 // ------------------------------------------------------------------------
 /**
-	Note that TeamPrototype is used to hold information that is invariant between 
+	Note that TeamPrototype is used to hold information that is invariant between
 	multiple instances of a given Team (e.g., alliance info).
 
 	However, a TeamPrototype doesn't contain any build-list style info; that is handled
@@ -516,22 +513,22 @@ class Team : public MemoryPoolObject,
 class TeamPrototype : public MemoryPoolObject,
 											public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TeamPrototype, "TeamPrototypePool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TeamPrototype, "TeamPrototypePool" )
 
 public:
 
-	TeamPrototype( TeamFactory *tf, 
-								 const AsciiString& name, 
-								 Player *ownerPlayer, 
-								 Bool isSingleton, 
+	TeamPrototype( TeamFactory *tf,
+								 const AsciiString& name,
+								 Player *ownerPlayer,
+								 Bool isSingleton,
 								 Dict *d,
 								 TeamPrototypeID id );
 	// virtual destructor prototype provided by memory pool object
 
-	inline TeamPrototypeID getID() const { return m_id; }
-	inline const AsciiString& getName() const { return m_name; }
-	inline Bool getIsSingleton() const { return (m_flags & TEAM_SINGLETON) != 0; }
-	inline const TeamTemplateInfo *getTemplateInfo(void) const {return &m_teamTemplate;}
+	TeamPrototypeID getID() const { return m_id; }
+	const AsciiString& getName() const { return m_name; }
+	Bool getIsSingleton() const { return (m_flags & TEAM_SINGLETON) != 0; }
+	const TeamTemplateInfo *getTemplateInfo(void) const {return &m_teamTemplate;}
 	/**
 		return the team's owner (backtracking up if necessary)
 	*/
@@ -541,13 +538,13 @@ class TeamPrototype : public MemoryPoolObject,
 		* Return a team with matching team ID if present
 	*/
 	Team *findTeamByID( TeamID teamID );
-		
+
 	/**
 		set the team's owner. (NULL is not allowed)
 	*/
 	void setControllingPlayer(Player *newController);
 
-	/** 
+	/**
 		Evaluate team's production condition.
 	*/
 	Bool evaluateProductionCondition(void);
@@ -580,7 +577,7 @@ class TeamPrototype : public MemoryPoolObject,
 	/// count the number of teams that have been instanced by this prototype
 	Int countTeamInstances( void );
 
-	/** 
+	/**
 		Checks & clears the flags that a team member entered or exited a trigger area, or was created.
 	*/
 	void updateState(void);
@@ -588,7 +585,7 @@ class TeamPrototype : public MemoryPoolObject,
 	/**
 		a convenience routine to quickly check if any buildings are owned.
 	*/
-	Bool hasAnyBuildings(void) const;		
+	Bool hasAnyBuildings(void) const;
 
 	/**
 		a convenience routine to quickly check if any buildings with a specific KindOfType flag are owned.
@@ -598,12 +595,12 @@ class TeamPrototype : public MemoryPoolObject,
 	/**
 		a convenience routine to quickly check if any units are owned.
 	*/
-	Bool hasAnyUnits(void) const;		
+	Bool hasAnyUnits(void) const;
 
 	/**
 		a convenience routine to quickly check if any objects are owned.
 	*/
-	Bool hasAnyObjects(void) const;		
+	Bool hasAnyObjects(void) const;
 
 	/**
 		a convenience routine to quickly check if any buildfacilities are owned.
@@ -648,7 +645,7 @@ class TeamPrototype : public MemoryPoolObject,
 	{
 		/**
 			if set, this prototype should only produce one team. if there's already a team
-			by this name, newly produced team members are added to it, rather than 
+			by this name, newly produced team members are added to it, rather than
 			put into a new team of the same name.
 		*/
 		TEAM_SINGLETON = 0x01
@@ -663,10 +660,10 @@ class TeamPrototype : public MemoryPoolObject,
 
 	Bool									m_productionConditionAlwaysFalse; ///< Flag set to true if we don't have a production condition.
 	Script								*m_productionConditionScript; ///< Script to evaluate for production condition.
-	
+
 	Bool									m_retrievedGenericScripts;
 	Script								*m_genericScriptsToRun[MAX_GENERIC_SCRIPTS];
-	
+
 	TeamTemplateInfo			m_teamTemplate;						///< Team template info.
 
 	AsciiString						m_attackPriorityName;
@@ -756,5 +753,3 @@ const AsciiString& Team::getName(void) const
 
 
 // ------------------------------------------------------------------------
-
-#endif // _TEAM_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h b/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h
index e5ff47b5017..69ce9299838 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h
@@ -32,14 +32,9 @@
 
 #pragma once
 
-#ifndef __TERRAIN_H_
-#define __TERRAIN_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 
 // DEFINE /////////////////////////////////////////////////////////////////////
 #define MAX_TERRAIN_NAME_LEN 64  ///< max size of map filename with extenstion
-
-#endif  // end __TERRAIN_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h
index eb8585a39af..2c9ea65d222 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __TERRAINTYPE_H_
-#define __TERRAINTYPE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
 #include "Common/SubsystemInterface.h"
@@ -69,11 +66,11 @@ typedef enum
 	TERRAIN_CLIFF,
 	TERRAIN_WOOD,
 	TERRAIN_BLEND_EDGES,
-	
+
 	// New terrain types (for Samm Ivri)
 	TERRAIN_LIVE_DESERT,
 	TERRAIN_DRY_DESERT,
-	TERRAIN_ACCENT_SAND, 
+	TERRAIN_ACCENT_SAND,
 	TERRAIN_TROPICAL_BEACH,
 	TERRAIN_BEACH_PARK,
 	TERRAIN_RUGGED_MOUNTAIN,
@@ -82,19 +79,18 @@ typedef enum
 	TERRAIN_RESIDENTIAL,
 	TERRAIN_RUGGED_SNOW,
 	TERRAIN_FLAT_SNOW,
-	TERRAIN_FIELD, 
+	TERRAIN_FIELD,
 	TERRAIN_ASPHALT,
 	TERRAIN_CONCRETE,
 	TERRAIN_CHINA,
 	TERRAIN_ACCENT_ROCK,
 	TERRAIN_URBAN,
 
-
-	TERRAIN_NUM_CLASSES  // keep this last
+	TERRAIN_NUM_CLASSES
 
 } TerrainClass;
 #ifdef DEFINE_TERRAIN_TYPE_NAMES
-static const char *terrainTypeNames[] = 
+static const char *const terrainTypeNames[] =
 {
 	"NONE",
 	"DESERT_1",
@@ -120,12 +116,12 @@ static const char *terrainTypeNames[] =
 	"SAND",
 	"CLIFF",
 	"WOOD",
-	"BLEND_EDGE", 
+	"BLEND_EDGE",
 
 		// New terrain types (for Samm Ivri)
 	"DESERT_LIVE",
 	"DESERT_DRY",
-	"SAND_ACCENT", 
+	"SAND_ACCENT",
 	"BEACH_TROPICAL",
 	"BEACH_PARK",
 	"MOUNTAIN_RUGGED",
@@ -134,7 +130,7 @@ static const char *terrainTypeNames[] =
 	"RESIDENTIAL",
 	"SNOW_RUGGED",
 	"SNOW_FLAT",
-	"FIELD", 
+	"FIELD",
 	"ASPHALT",
 	"CONCRETE",
 	"CHINA",
@@ -143,6 +139,7 @@ static const char *terrainTypeNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(terrainTypeNames) == TERRAIN_NUM_CLASSES + 1, "Incorrect array size");
 #endif  // end DEFINE_TERRAIN_TYPE_NAMES
 
 //-------------------------------------------------------------------------------------------------
@@ -159,40 +156,40 @@ class TerrainType : public MemoryPoolObject
 	// destructor prototype defined by memory pool glue
 
 	/// get the name for this terrain
-	inline AsciiString getName( void ) { return m_name; }
+	AsciiString getName( void ) { return m_name; }
 
 	/// get whether this terrain is blend edge terrain.
-	inline Bool isBlendEdge( void ) { return m_blendEdgeTexture; }
+	Bool isBlendEdge( void ) { return m_blendEdgeTexture; }
 
 	/// get the type of this terrain
-	inline TerrainClass getClass( void ) { return m_class; }
+	TerrainClass getClass( void ) { return m_class; }
 
 	/// get the construction restrictions
-	inline Bool getRestrictConstruction( void ) { return m_restrictConstruction; }
+	Bool getRestrictConstruction( void ) { return m_restrictConstruction; }
 
 	/// get the texture file for this terrain
-	inline AsciiString getTexture( void ) { return m_texture; }
+	AsciiString getTexture( void ) { return m_texture; }
 
 	/// get next terrain in list, only for use by the terrain collection
-	inline TerrainType *friend_getNext( void ) { return m_next; }
+	TerrainType *friend_getNext( void ) { return m_next; }
 
 	/// set the name for this terrain, for use by terrain collection only
-	inline void friend_setName( AsciiString name ) { m_name = name; }
+	void friend_setName( AsciiString name ) { m_name = name; }
 
 	/// set the next pointer for the terrain list, for use by terrain collection only
-	inline void friend_setNext( TerrainType *next ) { m_next = next; }
+	void friend_setNext( TerrainType *next ) { m_next = next; }
 
 	/// set the texture, for use by terrain collection only
-	inline void friend_setTexture( AsciiString texture ) { m_texture = texture; }
+	void friend_setTexture( AsciiString texture ) { m_texture = texture; }
 
 	/// set the class, for use by terrain collection only
-	inline void friend_setClass( TerrainClass terrainClass ) { m_class = terrainClass; }
+	void friend_setClass( TerrainClass terrainClass ) { m_class = terrainClass; }
 
 	/// set the restrict construction flag, for use by terrain collection only
-	inline void friend_setRestrictConstruction( Bool restrict ) { m_restrictConstruction = restrict; }
+	void friend_setRestrictConstruction( Bool restrict ) { m_restrictConstruction = restrict; }
 
 	/// set whether this terrain is blend edge terrain, for use by terrain collection only
-	inline void friend_setBlendEdge( Bool isBlend ) { m_blendEdgeTexture = isBlend; }
+	void friend_setBlendEdge( Bool isBlend ) { m_blendEdgeTexture = isBlend; }
 
 	/// get the parsing table for INI
 	const FieldParse *getFieldParse( void ) { return m_terrainTypeFieldParseTable; }
@@ -227,7 +224,7 @@ class TerrainTypeCollection : public SubsystemInterface
 	void update() { }
 
 	TerrainType *findTerrain( AsciiString name );		///< find terrain by name
-	TerrainType *newTerrain( AsciiString name );			///< allocate a new terrain 
+	TerrainType *newTerrain( AsciiString name );			///< allocate a new terrain
 
 	/// get first terrain in list
 	TerrainType *firstTerrain( void ) { return m_terrainList; }
@@ -243,6 +240,3 @@ class TerrainTypeCollection : public SubsystemInterface
 
 // EXTERNAL ///////////////////////////////////////////////////////////////////////////////////////
 extern TerrainTypeCollection *TheTerrainTypes;
-
-#endif // __TERRAINTYPE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Thing.h b/GeneralsMD/Code/GameEngine/Include/Common/Thing.h
index a9590666a45..982a401ae69 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Thing.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Thing.h
@@ -24,12 +24,12 @@
 
 // FILE: Thing.h //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -48,13 +48,10 @@
 
 #pragma once
 
-#ifndef __THING_H_
-#define __THING_H_
-
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "Common/GameMemory.h"
 #include "Common/KindOf.h"
@@ -87,10 +84,10 @@ class Thing : public MemoryPoolObject
 {
 	// note, it is explicitly OK to pass null for 'thing' here;
 	// they will check for null and return null in these cases.
-	friend inline Object *AsObject(Thing *thing) { return thing ? thing->asObjectMeth() : NULL; }
-	friend inline Drawable *AsDrawable(Thing *thing) { return thing ? thing->asDrawableMeth() : NULL; }
-	friend inline const Object *AsObject(const Thing *thing) { return thing ? thing->asObjectMeth() : NULL; }
-	friend inline const Drawable *AsDrawable(const Thing *thing) { return thing ? thing->asDrawableMeth() : NULL; }
+	friend Object *AsObject(Thing *thing) { return thing ? thing->asObjectMeth() : NULL; }
+	friend Drawable *AsDrawable(Thing *thing) { return thing ? thing->asDrawableMeth() : NULL; }
+	friend const Object *AsObject(const Thing *thing) { return thing ? thing->asObjectMeth() : NULL; }
+	friend const Drawable *AsDrawable(const Thing *thing) { return thing ? thing->asDrawableMeth() : NULL; }
 
 	MEMORY_POOL_GLUE_ABC(Thing)
 
@@ -98,7 +95,7 @@ class Thing : public MemoryPoolObject
 
 	Thing( const ThingTemplate *thingTemplate );
 
-	/** 
+	/**
 		return the thing template for this thing.
 	*/
 	const ThingTemplate *getTemplate() const;
@@ -119,8 +116,11 @@ class Thing : public MemoryPoolObject
 	// don't want this behavior? then call setTransformMatrix instead.
 	void setOrientation( Real angle );
 
-	inline const Coord3D *getPosition() const { return &m_cachedPos; }
-	inline Real getOrientation() const { return m_cachedAngle; }
+	const Coord3D *getPosition() const { return &m_cachedPos; }
+	Real getOrientation() const { return m_cachedAngle; }
+
+	Bool isPositioned() const;
+
 	const Coord3D *getUnitDirectionVector2D() const;
 	void getUnitDirectionVector2D(Coord3D& dir) const;
 	void getUnitDirectionVector3D(Coord3D& dir) const;
@@ -161,7 +161,7 @@ class Thing : public MemoryPoolObject
 	// since ThingTemplates are shared between many, many Things, the Thing
 	// should never be able to change it.
 	OVERRIDE<ThingTemplate> m_template;	///< reference back to template database
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	AsciiString m_templateName;
 #endif
 	/*
@@ -188,12 +188,9 @@ class Thing : public MemoryPoolObject
 	mutable Real			m_cachedAltitudeAboveTerrainOrWater;
 	mutable Int				m_cacheFlags;
 
-}; 
+};
 
 
 //-----------------------------------------------------------------------------
-//           Externals                                                     
+//           Externals
 //-----------------------------------------------------------------------------
-
-#endif // $label
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h
index 7a05be4829c..facde874381 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h
@@ -24,14 +24,11 @@
 
 // FILE: ThingFactory.h ///////////////////////////////////////////////////////////////////////////
 // Created: Colin Day, April 2001
-// Desc:		This is how we go and make our things, we make our things, we make our things!	
+// Desc:		This is how we go and make our things, we make our things, we make our things!
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __THINGFACTORY_H_
-#define __THINGFACTORY_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
 
@@ -69,30 +66,30 @@ class ThingFactory : public SubsystemInterface
 	/// create a new template with name 'name' and add to template list
 	ThingTemplate *newTemplate( const AsciiString& name );
 
-	// get the first template in our list 
+	// get the first template in our list
 	const ThingTemplate *firstTemplate( void ) { return m_firstTemplate; }
 
-	/** 
+	/**
 		get a template given template database name. return null if not found.
 		note, this is now substantially faster (does a hash-table lookup)
 	*/
 	const ThingTemplate *findTemplate( const AsciiString& name, Bool check = TRUE ) { return findTemplateInternal( name, check ); }
 
-	/** 
+	/**
 		get a template given ID. return null if not found.
 		note, this is not particularly fast (does a linear search).
 	*/
 	const ThingTemplate *findByTemplateID( UnsignedShort id );
 
-	/** request a new object using the given template. 
+	/** request a new object using the given template.
 		this will throw an exception on failure; it will never return null.
 	*/
 	Object *newObject( const ThingTemplate *tmplate, Team *team, ObjectStatusMaskType statusMask = OBJECT_STATUS_MASK_NONE );
 
-	/** request a new drawable using the given template. 
+	/** request a new drawable using the given template.
 		this will throw an exception on failure; it will never return null.
 	*/
-	Drawable *newDrawable(const ThingTemplate *tmplate, DrawableStatus statusBits = DRAWABLE_STATUS_NONE );
+	Drawable *newDrawable(const ThingTemplate *tmplate, DrawableStatusBits statusBits = DRAWABLE_STATUS_DEFAULT );
 
 	static void parseObjectDefinition( INI* ini, const AsciiString& name, const AsciiString& reskinFrom );
 
@@ -103,9 +100,9 @@ class ThingFactory : public SubsystemInterface
 
 	void addTemplate( ThingTemplate *thing );		///< add the template to the DB
 
-	/** 
+	/**
 		create a new template with name 'name', do *NOT* add to template, but instead
-		add as m_override of template 'template' 
+		add as m_override of template 'template'
 
 		Note, this is private, and should always remain so. It should never, ever, ever
 		be called outside of ini parsing code, because if you do, you will tempted to make
@@ -115,26 +112,22 @@ class ThingFactory : public SubsystemInterface
 	ThingTemplate* newOverride( ThingTemplate *thingTemplate );
 
 
-	/** 
+	/**
 		This now does a search through the hashmap, and returns the associated thing template
 		This should speed up load times dramatically, as we've been wasting lots of time in this
 		O(N^2) insertion.
-	
+
 		NOTE: this is protected since it returns a NON-CONST template, and
 		folks outside of the template system itself shouldn't get access...
 	*/
 	ThingTemplate *findTemplateInternal( const AsciiString& name, Bool check = TRUE );
 
 	ThingTemplate					*m_firstTemplate;			///< head of linked list
-	UnsignedShort					m_nextTemplateID;			///< next available ID for templates 
+	UnsignedShort					m_nextTemplateID;			///< next available ID for templates
 
 	ThingTemplateHashMap	m_templateHashMap;		///< all thing templates, for fast lookup.
-		
+
 };
 
 // EXTERN /////////////////////////////////////////////////////////////////////////////////////////
 extern ThingFactory *TheThingFactory;  ///< the template singleton
-
-
-#endif // __THINGFACTORY_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h
index 955b918702e..621f798a871 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h
@@ -29,15 +29,12 @@
 
 #pragma once
 
-#ifndef __THINGSORT_H_
-#define __THINGSORT_H_
+#include "GameCommon.h"
 
 //-------------------------------------------------------------------------------------------------
 enum EditorSortingType CPP_11(: Int)
 {
-	ES_FIRST = 0,
-
-	ES_NONE = ES_FIRST,
+	ES_NONE,
 	ES_STRUCTURE,
 	ES_INFANTRY,
 	ES_VEHICLE,
@@ -52,11 +49,12 @@ enum EditorSortingType CPP_11(: Int)
 	ES_ROAD,						// road objects...should never actually be in the object panel.
 	ES_WAYPOINT,					// waypoint objects...should never actually be in the object panel.
 
-	ES_NUM_SORTING_TYPES      // keep this last
-
+	ES_NUM_SORTING_TYPES,
+	ES_FIRST = 0,
 };
+
 #ifdef DEFINE_EDITOR_SORTING_NAMES
-static const char *EditorSortingNames[] = 
+static const char *const EditorSortingNames[] =
 {
 	"NONE",
 	"STRUCTURE",
@@ -75,7 +73,5 @@ static const char *EditorSortingNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(EditorSortingNames) == ES_NUM_SORTING_TYPES + 1, "Incorrect array size");
 #endif
-
-#endif // __THINGSORT_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h
index 2764437135f..77220fbfb84 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h
@@ -25,16 +25,13 @@
 // FILE: ThingTemplate.h //////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, April 2001
 // Desc:	 Thing templates are a 'roadmap' to creating things
-///////////////////////////////////////////////////////////////////////////////////////////////////	
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __THINGTEMPLATE_H_
-#define __THINGTEMPLATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
- 
+
 #include "Common/AudioEventRTS.h"
 #include "Common/FileSystem.h"
 #include "Common/GameCommon.h"
@@ -82,7 +79,7 @@ typedef std::map<AsciiString, const FXList*> PerUnitFXMap;
 //	INV_IMAGE_HILITE,
 //	INV_IMAGE_PUSHED,
 //
-//	INV_IMAGE_NUM_IMAGES  // keep this last
+//	INV_IMAGE_NUM_IMAGES
 //
 //};
 //-------------------------------------------------------------------------------------------------
@@ -127,7 +124,7 @@ enum ThingTemplateAudioType CPP_11(: Int)
 	TTAUDIO_soundPromotedElite,				///< Sound when unit gets promoted to Elite level
 	TTAUDIO_soundPromotedHero,				///< Sound when unit gets promoted to Hero level
 	TTAUDIO_voiceGarrison,						///< Unit is ordered to enter a garrisonable building
-	TTAUDIO_soundFalling,							///< This sound is actually called on a unit when it is exiting another. 
+	TTAUDIO_soundFalling,							///< This sound is actually called on a unit when it is exiting another.
 																		///< However, there is a soundExit which refers to the container, and this is only used for bombs falling from planes.
 #ifdef ALLOW_SURRENDER
 	TTAUDIO_voiceSurrender,						///< Unit surrenders
@@ -137,7 +134,7 @@ enum ThingTemplateAudioType CPP_11(: Int)
 	TTAUDIO_voiceAttackAir,						///< Unit is ordered to attack an airborne unit
 	TTAUDIO_voiceGuard,								///< Unit is ordered to guard an area
 
-	TTAUDIO_COUNT   // keep last!
+	TTAUDIO_COUNT
 };
 
 class AudioArray
@@ -154,8 +151,7 @@ class AudioArray
 	~AudioArray()
 	{
 		for (Int i = 0; i < TTAUDIO_COUNT; ++i)
-			if (m_audio[i])
-				deleteInstance(m_audio[i]);
+			deleteInstance(m_audio[i]);
 	}
 
 	AudioArray(const AudioArray& that)
@@ -201,10 +197,10 @@ enum BuildCompletionType CPP_11(: Int)
 	BC_APPEARS_AT_RALLY_POINT,	///< unit appears at rally point of its #1 prereq
 	BC_PLACED_BY_PLAYER,				///< unit must be manually placed by player
 
-	BC_NUM_TYPES								// leave this last
+	BC_NUM_TYPES
 };
 #ifdef DEFINE_BUILD_COMPLETION_NAMES
-static const char *BuildCompletionNames[] = 
+static const char *const BuildCompletionNames[] =
 {
 	"INVALID",
 	"APPEARS_AT_RALLY_POINT",
@@ -212,6 +208,7 @@ static const char *BuildCompletionNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(BuildCompletionNames) == BC_NUM_TYPES + 1, "Incorrect array size");
 #endif  // end DEFINE_BUILD_COMPLETION_NAMES
 
 enum BuildableStatus CPP_11(: Int)
@@ -222,11 +219,11 @@ enum BuildableStatus CPP_11(: Int)
 	BSTATUS_NO,
 	BSTATUS_ONLY_BY_AI,
 
-	BSTATUS_NUM_TYPES	// leave this last
+	BSTATUS_NUM_TYPES
 };
 
 #ifdef DEFINE_BUILDABLE_STATUS_NAMES
-static const char *BuildableStatusNames[] = 
+static const char *const BuildableStatusNames[] =
 {
 	"Yes",
 	"Ignore_Prerequisites",
@@ -234,6 +231,7 @@ static const char *BuildableStatusNames[] =
 	"Only_By_AI",
 	NULL
 };
+static_assert(ARRAY_SIZE(BuildableStatusNames) == BSTATUS_NUM_TYPES + 1, "Incorrect array size");
 #endif	// end DEFINE_BUILDABLE_STATUS_NAMES
 
 //-------------------------------------------------------------------------------------------------
@@ -260,15 +258,15 @@ class ModuleInfo
 		Bool inheritable;
     Bool overrideableByLikeKind;
 
-		Nugget(const AsciiString& n, const AsciiString& moduleTag, const ModuleData* d, Int i, Bool inh, Bool oblk) 
-		: first(n), 
-			m_moduleTag(moduleTag), 
-			second(d), 
-			interfaceMask(i), 
-			copiedFromDefault(false), 
+		Nugget(const AsciiString& n, const AsciiString& moduleTag, const ModuleData* d, Int i, Bool inh, Bool oblk)
+		: first(n),
+			m_moduleTag(moduleTag),
+			second(d),
+			interfaceMask(i),
+			copiedFromDefault(false),
 			inheritable(inh),
       overrideableByLikeKind(oblk)
-		{ 
+		{
 		}
 
 	};
@@ -281,12 +279,12 @@ class ModuleInfo
 	void addModuleInfo( ThingTemplate *thingTemplate, const AsciiString& name, const AsciiString& moduleTag, const ModuleData* data, Int interfaceMask, Bool inheritable, Bool overrideableByLikeKind = FALSE );
 	const ModuleInfo::Nugget *getNuggetWithTag( const AsciiString& tag ) const;
 
-	Int getCount() const 
-	{ 
-		return m_info.size(); 
+	Int getCount() const
+	{
+		return m_info.size();
 	}
-	
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 	Bool containsPartialName(const char* n) const
 	{
 		for (size_t i = 0; i < m_info.size(); i++)
@@ -326,9 +324,9 @@ class ModuleInfo
 	// for use only by ThingTemplate::friend_getAIModuleInfo
 	ModuleData* friend_getNthData(Int i);
 
-	void clear() 
-	{ 
-		m_info.clear(); 
+	void clear()
+	{
+		m_info.clear();
 	}
 
 	void setCopiedFromDefault(Bool v)
@@ -348,14 +346,14 @@ class ModuleInfo
 class ThingTemplate : public Overridable
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ThingTemplate, "ThingTemplatePool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ThingTemplate, "ThingTemplatePool" )
 
 private:
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
-	ThingTemplate(const ThingTemplate& that) : m_geometryInfo(that.m_geometryInfo) 
-	{ 
-		DEBUG_CRASH(("This should never be called\n")); 
+	ThingTemplate(const ThingTemplate& that) : m_geometryInfo(that.m_geometryInfo)
+	{
+		DEBUG_CRASH(("This should never be called"));
 	}
 #else
 	ThingTemplate(const ThingTemplate& that) = delete;
@@ -365,7 +363,7 @@ class ThingTemplate : public Overridable
 
 
 	ThingTemplate();
-	
+
 	// copy the guts of that into this, but preserve this' name, id, and list-links.
 	void copyFrom(const ThingTemplate* that);
 
@@ -377,10 +375,10 @@ class ThingTemplate : public Overridable
 	inline AsciiString getLTAName() const { return m_LTAName; }
 #endif
 
-	/** 
+	/**
 		return a unique identifier suitable for identifying this ThingTemplate on machines playing
 		across the net. this should be considered a Magic Cookie and used only for net traffic or
-		similar sorts of things. To convert an id back to a ThingTemplate, use ThingFactory::findByID(). 
+		similar sorts of things. To convert an id back to a ThingTemplate, use ThingFactory::findByID().
 		Note that 0 is always an invalid id.  NOTE that we are not referencing m_override here
 		because even though we actually have multiple templates here representing overrides,
 		we still only conceptually have one template and want to always use one single
@@ -393,29 +391,29 @@ class ThingTemplate : public Overridable
 	// note that m_override is not used here, see getTemplateID(), for it is the same reasons
 	const AsciiString& getName() const { return m_nameString; }  ///< return the name of this template
 
-	/// get the display color (used for the editor)	
+	/// get the display color (used for the editor)
 	Color getDisplayColor() const { return m_displayColor; }
 
-	/// get the editor sorting 
+	/// get the editor sorting
 	EditorSortingType getEditorSorting() const { return (EditorSortingType)m_editorSorting; }
 
 	/// return true iff the template has the specified kindOf flag set.
-	inline Bool isKindOf(KindOfType t) const 
-	{ 
-		return TEST_KINDOFMASK(m_kindof, t); 
+	Bool isKindOf(KindOfType t) const
+	{
+		return TEST_KINDOFMASK(m_kindof, t);
 	}
 
 	/// convenience for doing multiple kindof testing at once.
-	inline Bool isKindOfMulti(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) const 
-	{ 		
+	Bool isKindOfMulti(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) const
+	{
 		return TEST_KINDOFMASK_MULTI(m_kindof, mustBeSet, mustBeClear);
 	}
 
-	inline Bool isAnyKindOf( const KindOfMaskType& anyKindOf ) const
+	Bool isAnyKindOf( const KindOfMaskType& anyKindOf ) const
 	{
 		return TEST_KINDOFMASK_ANY(m_kindof, anyKindOf);
 	}
-	
+
 	/// set the display name
 	const UnicodeString& getDisplayName() const { return m_displayName; }  ///< return display name
 
@@ -429,14 +427,15 @@ class ThingTemplate : public Overridable
 	Real getFenceXOffset() const { return m_fenceXOffset; }  // return fence offset
 
 	Bool isBridge() const { return m_isBridge; }  // return fence offset
+	Bool isBridgeLike() const { return isBridge() || isKindOf(KINDOF_WALK_ON_TOP_OF_WALL); }
 
 	// Only Object can ask this.  Everyone else should ask the Object.  In fact, you really should ask the Object everything.
 	Real friend_calcVisionRange() const { return m_visionRange; }  ///< get vision range
 	Real friend_calcShroudClearingRange() const { return m_shroudClearingRange; }  ///< get vision range for Shroud ONLY (Design requested split)
-	
+
 	//This one is okay to check directly... because it doesn't get effected by bonuses.
 	Real getShroudRevealToAllRange() const { return m_shroudRevealToAllRange; }
-	
+
 	// This function is only for use by the AIUpdateModuleData::parseLocomotorSet function.
 	AIUpdateModuleData *friend_getAIModuleInfo(void);
 
@@ -448,7 +447,7 @@ class ThingTemplate : public Overridable
 
 	const AsciiString& getShadowTextureName( void ) const { return m_shadowTextureName; }
 	UnsignedInt getOcclusionDelay(void) const { return m_occlusionDelay;}
-	
+
 	const ModuleInfo& getBehaviorModuleInfo() const { return m_behaviorModuleInfo; }
 	const ModuleInfo& getDrawModuleInfo() const { return m_drawModuleInfo; }
 	const ModuleInfo& getClientUpdateModuleInfo() const { return m_clientUpdateModuleInfo; }
@@ -513,10 +512,10 @@ class ThingTemplate : public Overridable
 	const FXList* getPerUnitFX(const AsciiString& fxName) const;
 
 	UnsignedInt getThreatValue() const								{ return m_threatValue; }
-	
+
   //-------------------------------------------------------------------------------------------------
   /** If this is not NAMEKEY_INVALID, it indicates that all the templates which return the same name key
-    * should be counted as the same "type" when looking at getMaxSimultaneousOfType(). For instance, 
+    * should be counted as the same "type" when looking at getMaxSimultaneousOfType(). For instance,
     * a Scud Storm and a Scud Storm rebuild hole will return the same value, so that the player
     * can't build another Scud Storm while waiting for the rebuild hole to start rebuilding */
   //-------------------------------------------------------------------------------------------------
@@ -526,7 +525,7 @@ class ThingTemplate : public Overridable
 	void validate();
 
 // The version that does not take an Object argument is labeled friend for use by WorldBuilder.  All game requests
-// for CommandSet must use Object::getCommandSetString, as we have two different sources for dynamic answers. 
+// for CommandSet must use Object::getCommandSetString, as we have two different sources for dynamic answers.
 	const AsciiString& friend_getCommandSetString() const { return m_commandSetString; }
 
 	const std::vector<AsciiString>& getBuildVariations() const { return m_buildVariations; }
@@ -546,30 +545,30 @@ class ThingTemplate : public Overridable
 	// these are intended ONLY for the private use of ThingFactory and do not use
 	// the m_override pointer, it deals only with templates at the "top" level
 	//
-	inline void friend_setTemplateName( const AsciiString& name ) { m_nameString = name; }
-	inline ThingTemplate *friend_getNextTemplate() const { return m_nextThingTemplate; }
-	inline void friend_setNextTemplate(ThingTemplate *tmplate) { m_nextThingTemplate = tmplate; }
-	inline void friend_setTemplateID(UnsignedShort id) { m_templateID = id; }
+	void friend_setTemplateName( const AsciiString& name ) { m_nameString = name; }
+	ThingTemplate *friend_getNextTemplate() const { return m_nextThingTemplate; }
+	void friend_setNextTemplate(ThingTemplate *tmplate) { m_nextThingTemplate = tmplate; }
+	void friend_setTemplateID(UnsignedShort id) { m_templateID = id; }
 
 	Int getEnergyProduction() const { return m_energyProduction; }
 	Int getEnergyBonus() const { return m_energyBonus; }
 
-	// these are NOT publicly available; you should call calcCostToBuild() or calcTimeToBuild() 
+	// these are NOT publicly available; you should call calcCostToBuild() or calcTimeToBuild()
 	// instead, because they will take player handicaps into account.
 	// Int getBuildCost() const { return m_buildCost; }
-	
+
 	Int getRefundValue() const { return m_refundValue; }
 
 	BuildCompletionType getBuildCompletion() const { return (BuildCompletionType)m_buildCompletion; }
 
 	BuildableStatus getBuildable() const;
-	
+
 	Int getPrereqCount() const { return m_prereqInfo.size(); }
 	const ProductionPrerequisite *getNthPrereq(Int i) const { return &m_prereqInfo[i]; }
 
-	/** 
-		return the BuildFacilityTemplate, if any. 
-		
+	/**
+		return the BuildFacilityTemplate, if any.
+
 		if this template needs no build facility, null is returned.
 
 		if the template needs a build facility but the given player doesn't have any in existence,
@@ -619,7 +618,7 @@ class ThingTemplate : public Overridable
 
 	UnsignedByte getCrushableLevel() const { return m_crushableLevel; }
 	UnsignedByte getCrusherLevel() const { return m_crusherLevel; }
-	
+
 	AsciiString getUpgradeCameoName( Int n)const{ return m_upgradeCameoUpgradeNames[n];	}
 
 	const WeaponTemplateSetVector& getWeaponTemplateSets(void) const {return m_weaponTemplateSets;}
@@ -627,7 +626,7 @@ class ThingTemplate : public Overridable
 protected:
 
 	//
-	// these are NOT publicly available; you should call calcCostToBuild() or calcTimeToBuild() 
+	// these are NOT publicly available; you should call calcCostToBuild() or calcTimeToBuild()
 	// instead, because they will take player handicaps into account.
 	//
 	Int getBuildCost() const { return m_buildCost; }
@@ -652,8 +651,8 @@ class ThingTemplate : public Overridable
 
 	static void parseAddModule(INI *ini, void *instance, void *store, const void *userData);
 	static void parseRemoveModule(INI *ini, void *instance, void *store, const void *userData);
-	static void parseReplaceModule(INI *ini, void *instance, void *store, const void *userData);	
-	static void parseInheritableModule(INI *ini, void *instance, void *store, const void *userData);	
+	static void parseReplaceModule(INI *ini, void *instance, void *store, const void *userData);
+	static void parseInheritableModule(INI *ini, void *instance, void *store, const void *userData);
   static void OverrideableByLikeKind(INI *ini, void *instance, void *store, const void *userData);
 
   static void parseMaxSimultaneous(INI *ini, void *instance, void *store, const void *userData);
@@ -694,10 +693,15 @@ class ThingTemplate : public Overridable
 	Int											m_skillPointValues[LEVEL_COUNT];
 	Int											m_experienceValues[LEVEL_COUNT];		///< How much I am worth at each experience level
 	Int											m_experienceRequired[LEVEL_COUNT];	///< How many experience points I need for each level
-	
+
 	//Code renderer handles these states now.
 	//AsciiString							m_inventoryImage[ INV_IMAGE_NUM_IMAGES ];  ///< portrait inventory pictures
 
+	// TheSuperHackers @bugfix Caball009/xezon 06/07/2025 No longer copy SparseMatchFinder to prevent copied instances linking to unrelated data.
+	// This avoids mismatching in certain maps, for example those that spawn units with veterancy.
+	typedef SparseMatchFinder<WeaponTemplateSet, WeaponSetFlags, SparseMatchFinderFlags_NoCopy> WeaponTemplateSetFinder;
+	typedef SparseMatchFinder<ArmorTemplateSet, ArmorSetFlags, SparseMatchFinderFlags_NoCopy> ArmorTemplateSetFinder;
+
 	// ---- STL-sized things
 	std::vector<ProductionPrerequisite>	m_prereqInfo;				///< the unit Prereqs for this tech
 	std::vector<AsciiString>						m_buildVariations;	/**< if we build a unit of this type via script or ui, randomly choose one
@@ -713,7 +717,7 @@ class ThingTemplate : public Overridable
 	ThingTemplate*				m_nextThingTemplate;
 	const ThingTemplate*	m_reskinnedFrom;									///< non NULL if we were generated via a reskin
 	const Image *					m_selectedPortraitImage;		/// portrait image when selected (to display in GUI)
-	const Image	*					m_buttonImage;			
+	const Image	*					m_buttonImage;
 
 	// ---- Real-sized things
 	Real					m_fenceWidth;								///< Fence width for fence type objects.
@@ -726,7 +730,7 @@ class ThingTemplate : public Overridable
 	Real					m_factoryExtraBibWidth;					///< when placing buildings this will be the width of the reserved exit area on the right side.
 	Real					m_buildTime;									///< Seconds to build
 	Real					m_assetScale;
-	Real					m_instanceScaleFuzziness; ///< scale randomization tolerance to init for each Drawable instance, 
+	Real					m_instanceScaleFuzziness; ///< scale randomization tolerance to init for each Drawable instance,
 	Real					m_shadowSizeX;				///< world-space extent of decal shadow texture
 	Real					m_shadowSizeY;				///< world-space extent of decal shadow texture
 	Real					m_shadowOffsetX;			///< world-space offset of decal shadow texture
@@ -774,12 +778,9 @@ class ThingTemplate : public Overridable
 };
 
 //-----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//           Externals                                                     
+//           Externals
 //-----------------------------------------------------------------------------
-
-#endif // __THINGTEMPLATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h b/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h
index cde04a1f850..e1e4236531b 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef TUNNEL_TRACKER_H
-#define TUNNEL_TRACKER_H
-
 #include "Common/GameType.h"
 #include "Common/GameMemory.h"
 #include "Common/Snapshot.h"
@@ -48,7 +45,8 @@ class TunnelTracker : public MemoryPoolObject,
 	void iterateContained( ContainIterateFunc func, void *userData, Bool reverse );
 	UnsignedInt getContainCount() const { return m_containListSize; }
 	Int getContainMax() const;
-	const ContainedItemsList* getContainedItemsList() const { return &m_containList; }	
+	const ContainedItemsList* getContainedItemsList() const { return &m_containList; }
+	void swapContainedItemsList(ContainedItemsList& newList);
 
 	Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const;
 	void addToContainList( Object *obj );				///< add 'obj' to contain list
@@ -61,8 +59,12 @@ class TunnelTracker : public MemoryPoolObject,
 	static void destroyObject( Object *obj, void *userData ); ///< Callback for Iterate Contained system
 	static void healObject( Object *obj, void *frames ); ///< Callback for Iterate Contained system
 
+#if PRESERVE_RETAIL_BEHAVIOR || RETAIL_COMPATIBLE_CRC
 	void healObjects(Real frames);	///< heal all objects within the tunnel
-	
+#else
+	void healObjects();	///< heal all objects within the tunnel
+#endif
+
 	UnsignedInt friend_getTunnelCount() const {return m_tunnelCount;}///< TunnelContains are allowed to ask if they are the last one ahead of deletion time
 
 	const std::list< ObjectID > *getContainerList() const {return &m_tunnelIDs;}
@@ -77,15 +79,16 @@ class TunnelTracker : public MemoryPoolObject,
 	virtual void loadPostProcess( void );
 
 private:
-	
+	void updateFullHealTime();
+
 	std::list< ObjectID > m_tunnelIDs;			///< I have to try to keep track of these because Caves need to iterate on them.
 	ContainedItemsList m_containList;				///< the contained object pointers list
 	std::list< ObjectID > m_xferContainList;///< for loading of m_containList during post processing
 	Int m_containListSize;									///< size of the contain list
 	UnsignedInt m_tunnelCount;							///< How many tunnels have registered so we know when we should kill our contain list
+	UnsignedInt m_framesForFullHeal;				///< How many frames it takes to fully heal a unit
+	Bool m_needsFullHealTimeUpdate;					///< Set to true when needing to recalc full heal time to batch the operation
 
 	ObjectID		m_curNemesisID;							///< If we have team(s) guarding a tunnel network system, this is one of the current targets.
 	UnsignedInt m_nemesisTimestamp;					///< We only keep nemesis for a couple of seconds.
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/UnicodeString.h b/GeneralsMD/Code/GameEngine/Include/Common/UnicodeString.h
deleted file mode 100644
index b0ef11bd8fd..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/UnicodeString.h
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: UnicodeString.h 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  UnicodeString.h
-//
-// Created:    Steven Johnson, October 2001
-//
-// Desc:       General-purpose string classes
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef UNICODESTRING_H
-#define UNICODESTRING_H
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include "Lib/BaseType.h"
-#include "Common/Debug.h"
-#include "Common/Errors.h"
-
-class AsciiString;
-
-// -----------------------------------------------------
-/**
-	UnicodeString is the fundamental double-byte string type used in the Generals
-	code base, and should be preferred over all other string constructions
-	(e.g., array of WideChar, STL string<>, WWVegas StringClass, etc.)
-
-	Of course, other string setups may be used when necessary or appropriate!
-
-	UnicodeString is modeled after the MFC CString class, with some minor
-	syntactic differences to keep in line with our coding conventions.
-
-	Basically, UnicodeString allows you to treat a string as an intrinsic
-	type, rather analogous to 'int' -- when passed by value, a new string
-	is created, and modifying the new string doesn't modify the original.
-	This is done fairly efficiently, so that no new memory allocation is done
-	unless the string is actually modified. 
-
-	Naturally, UnicodeString handles all memory issues, so there's no need
-	to do anything to free memory... just allow the UnicodeString's
-	destructor to run.
-
-	UnicodeStrings are suitable for use as automatic, member, or static variables.
-*/
-
-class UnicodeString
-{
-private:
-	
-	// Note, this is a Plain Old Data Structure... don't
-	// add a ctor/dtor, 'cuz they won't ever be called.
-	struct UnicodeStringData
-	{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		const WideChar* m_debugptr;	// just makes it easier to read in the debugger
-#endif
-		unsigned short	m_refCount;						// reference count
-		unsigned short	m_numCharsAllocated;  // length of data allocated
-		// WideChar m_stringdata[];
-
-		inline WideChar* peek() { return (WideChar*)(this+1); }
-	};
-
-	#ifdef RTS_DEBUG
-	void validate() const;
-	#else
-	inline void validate() const { }
-	#endif
-
-protected:
-	UnicodeStringData* m_data;   // pointer to ref counted string data
-
-	WideChar* peek() const;
-	void releaseBuffer();
-	void ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData, const WideChar* strToCpy, const WideChar* strToCat);
-
-public:
-
-	enum 
-	{ 
-		MAX_FORMAT_BUF_LEN = 2048,		///< max total len of string created by format/format_va
-		MAX_LEN = 32767							///< max total len of any UnicodeString, in chars
-	};
-
-
-	/**
-		This is a convenient global used to indicate the empty
-		string, so we don't need to construct temporaries
-		for such a common thing.
-	*/
-	static UnicodeString TheEmptyString;
-
-	/**
-		Default constructor -- construct a new, empty UnicodeString.
-	*/
-	UnicodeString();
-	/**
-		Copy constructor -- make this UnicodeString identical to the
-		other UnicodeString. (This is actually quite efficient, because
-		they will simply share the same string and increment the
-		refcount.)
-	*/
-	UnicodeString(const UnicodeString& stringSrc);
-	/**
-		Constructor -- from a literal string. Constructs an UnicodeString
-		with the given string. Note that a copy of the string is made;
-		the input ptr is not saved. Note also that this is declared
-		'explicit' to avoid implicit conversions from const-WideChar-*
-		(e.g., as input arguments).
-	*/
-	explicit UnicodeString(const WideChar* s);
-
-	/**
-		Destructor. Not too exciting... clean up the works and such.
-	*/
-	~UnicodeString();
-
-	/**
-		Return the length, in characters (not bytes!), of the string.
-	*/
-	int getLength() const;
-	/**
-		Return true iff the length of the string is zero. Equivalent
-		to (getLength() == 0) but slightly more efficient.
-	*/
-	Bool isEmpty() const;
-	/**
-		Make the string empty. Equivalent to (str = "") but slightly more efficient.
-	*/
-	void clear();
-
-	/**
-		Return the character and the given (zero-based) index into the string.
-		No range checking is done (except in debug mode).
-	*/
-	WideChar getCharAt(int index) const;
-	/**
-		Return a pointer to the (null-terminated) string. Note that this is 
-		a const pointer: do NOT change this! It is imperative that it be 
-		impossible (or at least, really difficuly) for someone to change our
-		private data, since it might be shared amongst other UnicodeStrings.
-	*/
-	const WideChar* str() const;
-
-	/**
-		Makes sure there is room for a string of len+1 characters, and
-		returns a pointer to the string buffer.  This ensures that the
-		string buffer is NOT shared.  This is intended for the file reader, 
-		that is reading new strings in from a file. jba.
-	*/
-	WideChar* getBufferForRead(Int len);
-
-	/**
-		Replace the contents of self with the given string.
-		(This is actually quite efficient, because
-		they will simply share the same string and increment the
-		refcount.)
-	*/
-	void set(const UnicodeString& stringSrc);
-	/**
-		Replace the contents of self with the given string.
-		Note that a copy of the string is made; the input ptr is not saved.
-	*/
-	void set(const WideChar* s);
-
-	/**
-		replace contents of self with the given string. Note the
-		nomenclature is translate rather than set; this is because
-		not all single-byte strings translate one-for-one into
-		UnicodeStrings, so some data manipulation may be necessary,
-		and the resulting strings may not be equivalent.
-	*/
-	void translate(const AsciiString& stringSrc);
-
-	/**
-		Concatenate the given string onto self.
-	*/
-	void concat(const UnicodeString& stringSrc);
-	/**
-		Concatenate the given string onto self.
-	*/
-	void concat(const WideChar* s);
-	/**
-		Concatenate the given character onto self.
-	*/
-	void concat(const WideChar c);
-
-	/**
-	  Remove leading and trailing whitespace from the string.
-	*/
-	void trim( void );
-
-	/**
-		Remove the final character in the string. If the string is empty,
-		do nothing. (This is a rather dorky method, but used a lot in 
-		text editing, thus its presence here.)
-	*/
-	void removeLastChar();
-
-	/**
-		Analogous to sprintf() -- this formats a string according to the
-		given sprintf-style format string (and the variable argument list)
-		and stores the result in self.
-	*/
-	void format(UnicodeString format, ...);
-	void format(const WideChar* format, ...);
-	/**
-		Identical to format(), but takes a va_list rather than
-		a variable argument list. (i.e., analogous to vsprintf.)
-	*/
-	void format_va(const UnicodeString& format, va_list args);
-	void format_va(const WideChar* format, va_list args);
-
-	/**
-		Conceptually identical to wsccmp().
-	*/
-	int compare(const UnicodeString& stringSrc) const;
-	/**
-		Conceptually identical to wsccmp().
-	*/
-	int compare(const WideChar* s) const;
-	/**
-		Conceptually identical to _wcsicmp().
-	*/
-	int compareNoCase(const UnicodeString& stringSrc) const;
-	/**
-		Conceptually identical to _wcsicmp().
-	*/
-	int compareNoCase(const WideChar* s) const;
-
-	/**
-		conceptually similar to strtok():
-
-		extract the next whitespace-delimited token from the front
-		of 'this' and copy it into 'token', returning true if a nonempty
-		token was found. (note that this modifies 'this' as well, stripping
-		the token off!)
-	*/
-	Bool nextToken(UnicodeString* token, UnicodeString delimiters = UnicodeString::TheEmptyString);
-
-//
-// You might think it would be a good idea to overload the * operator
-// to allow for an implicit conversion to an WideChar*. This is
-// in theory a good idea, but in practice, there's lots of code
-// that assumes it should check text fields for null, which
-// is meaningless for us, since we never return a null ptr.
-//
-//	operator const WideChar*() const { return str(); }
-//
-
-	UnicodeString& operator=(const UnicodeString& stringSrc);	///< the same as set()
-	UnicodeString& operator=(const WideChar* s);				///< the same as set()
-};
-
-
-// -----------------------------------------------------
-inline WideChar* UnicodeString::peek() const
-{
-	DEBUG_ASSERTCRASH(m_data, ("null string ptr"));
-	validate();
-	return m_data->peek();
-}
-
-// -----------------------------------------------------
-inline UnicodeString::UnicodeString() : m_data(0)
-{
-	validate();
-}
-
-// -----------------------------------------------------
-inline UnicodeString::~UnicodeString()
-{
-	validate();
-	releaseBuffer();
-}
-
-// -----------------------------------------------------
-inline int UnicodeString::getLength() const
-{
-	validate();
-	return m_data ? wcslen(peek()) : 0;
-}
-
-// -----------------------------------------------------
-inline Bool UnicodeString::isEmpty() const
-{
-	validate();
-	return m_data == NULL || peek()[0] == 0;
-}
-
-// -----------------------------------------------------
-inline void UnicodeString::clear()
-{
-	validate();
-	releaseBuffer();
-	validate();
-}
-
-// -----------------------------------------------------
-inline WideChar UnicodeString::getCharAt(int index) const
-{
-	DEBUG_ASSERTCRASH(index >= 0 && index < getLength(), ("bad index in getCharAt"));
-	validate();
-	return m_data ? peek()[index] : 0;
-}
-
-// -----------------------------------------------------
-inline const WideChar* UnicodeString::str() const
-{
-	validate();
-	static const WideChar TheNullChr = 0;
-	return m_data ? peek() : &TheNullChr;
-}
-
-// -----------------------------------------------------
-inline UnicodeString& UnicodeString::operator=(const UnicodeString& stringSrc)
-{
-	validate();
-	set(stringSrc);
-	validate();
-	return *this;
-}
-
-// -----------------------------------------------------
-inline UnicodeString& UnicodeString::operator=(const WideChar* s)
-{
-	validate();
-	set(s);
-	validate();
-	return *this;
-}
-
-// -----------------------------------------------------
-inline void UnicodeString::concat(const UnicodeString& stringSrc)
-{
-	validate();
-	concat(stringSrc.str());
-	validate();
-}
-
-// -----------------------------------------------------
-inline void UnicodeString::concat(const WideChar c)
-{
-	validate();
-	/// this can probably be made more efficient, if necessary
-	WideChar tmp[2] = { c, 0 };
-	concat(tmp);
-	validate();
-}
-
-// -----------------------------------------------------
-inline int UnicodeString::compare(const UnicodeString& stringSrc) const
-{
-	validate();
-	return wcscmp(this->str(), stringSrc.str());
-}
-
-// -----------------------------------------------------
-inline int UnicodeString::compare(const WideChar* s) const
-{
-	validate();
-	return wcscmp(this->str(), s);
-}
-
-// -----------------------------------------------------
-inline int UnicodeString::compareNoCase(const UnicodeString& stringSrc) const
-{
-	validate();
-	return _wcsicmp(this->str(), stringSrc.str());
-}
-
-// -----------------------------------------------------
-inline int UnicodeString::compareNoCase(const WideChar* s) const
-{
-	validate();
-	return _wcsicmp(this->str(), s);
-}
-
-// -----------------------------------------------------
-inline Bool operator==(const UnicodeString& s1, const UnicodeString& s2)
-{
-	return wcscmp(s1.str(), s2.str()) == 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator!=(const UnicodeString& s1, const UnicodeString& s2)
-{
-	return wcscmp(s1.str(), s2.str()) != 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator<(const UnicodeString& s1, const UnicodeString& s2)
-{
-	return wcscmp(s1.str(), s2.str()) < 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator<=(const UnicodeString& s1, const UnicodeString& s2)
-{
-	return wcscmp(s1.str(), s2.str()) <= 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator>(const UnicodeString& s1, const UnicodeString& s2)
-{
-	return wcscmp(s1.str(), s2.str()) > 0;
-}
-
-// -----------------------------------------------------
-inline Bool operator>=(const UnicodeString& s1, const UnicodeString& s2)
-{
-	return wcscmp(s1.str(), s2.str()) >= 0;
-}
-
-#endif // UNICODESTRING_H
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/UnitTimings.h b/GeneralsMD/Code/GameEngine/Include/Common/UnitTimings.h
index cce45d79aa5..e49be63c644 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/UnitTimings.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/UnitTimings.h
@@ -29,11 +29,4 @@
 
 #pragma once
 
-#ifndef __UNITTIMINGS_H_
-#define __UNITTIMINGS_H_
-
-
 #define dont_DO_UNIT_TIMINGS
-
-#endif 
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h b/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h
index 8a6df4bd515..accd45dc049 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __UPGRADE_H_
-#define __UPGRADE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/INI.h"
@@ -54,7 +51,7 @@ enum UpgradeStatusType CPP_11(: Int)
 	UPGRADE_STATUS_COMPLETE
 };
 
-//The maximum number of upgrades. 
+//The maximum number of upgrades.
 #define UPGRADE_MAX_COUNT 128
 
 typedef BitFlags<UPGRADE_MAX_COUNT>	UpgradeMaskType;
@@ -65,13 +62,13 @@ typedef BitFlags<UPGRADE_MAX_COUNT>	UpgradeMaskType;
 #define MAKE_UPGRADE_MASK4(k,a,b,c) UpgradeMaskType(UpgradeMaskType::kInit, (k), (a), (b), (c))
 #define MAKE_UPGRADE_MASK5(k,a,b,c,d) UpgradeMaskType(UpgradeMaskType::kInit, (k), (a), (b), (c), (d))
 
-inline Bool TEST_UPGRADE_MASK( const UpgradeMaskType& m, Int index ) 
-{ 
-	return m.test( index ); 
+inline Bool TEST_UPGRADE_MASK( const UpgradeMaskType& m, Int index )
+{
+	return m.test( index );
 }
 
-inline Bool TEST_UPGRADE_MASK_ANY( const UpgradeMaskType& m, const UpgradeMaskType& mask ) 
-{ 
+inline Bool TEST_UPGRADE_MASK_ANY( const UpgradeMaskType& m, const UpgradeMaskType& mask )
+{
 	return m.anyIntersectionWith( mask );
 }
 
@@ -80,14 +77,14 @@ inline Bool TEST_UPGRADE_MASK_MULTI( const UpgradeMaskType& m, const UpgradeMask
 	return m.testSetAndClear( mustBeSet, mustBeClear );
 }
 
-inline Bool UPGRADE_MASK_ANY_SET( const UpgradeMaskType& m) 
-{ 
-	return m.any(); 
+inline Bool UPGRADE_MASK_ANY_SET( const UpgradeMaskType& m)
+{
+	return m.any();
 }
 
-inline void CLEAR_UPGRADE_MASK( UpgradeMaskType& m ) 
-{ 
-	m.clear(); 
+inline void CLEAR_UPGRADE_MASK( UpgradeMaskType& m )
+{
+	m.clear();
 }
 
 inline void SET_ALL_UPGRADE_MASK_BITS( UpgradeMaskType& m )
@@ -150,9 +147,9 @@ enum UpgradeType CPP_11(: Int)
 	UPGRADE_TYPE_PLAYER = 0,						// upgrade applies to a player as a whole
 	UPGRADE_TYPE_OBJECT,								// upgrade applies to an object instance only
 
-	NUM_UPGRADE_TYPES,		// keep this last
+	NUM_UPGRADE_TYPES
 };
-extern const char *TheUpgradeTypeNames[]; //Change above, change this!
+extern const char *const TheUpgradeTypeNames[]; //Change above, change this!
 
 //-------------------------------------------------------------------------------------------------
 /** A single upgrade template definition */
@@ -206,7 +203,7 @@ class UpgradeTemplate : public MemoryPoolObject
 	NameKeyType m_nameKey;							///< name key
 	AsciiString m_displayNameLabel;			///< String manager label for UI display name
 	Real m_buildTime;										///< database # for how long it takes to "build" this
-	Int m_cost;													///< cost for production 
+	Int m_cost;													///< cost for production
 	UpgradeMaskType m_upgradeMask;			///< Unique bitmask for this upgrade template
 	AudioEventRTS	m_researchSound;			///< Sound played when upgrade researched.
 	AudioEventRTS	m_unitSpecificSound;	///< Secondary sound played when upgrade researched.
@@ -238,10 +235,11 @@ class UpgradeCenter : public SubsystemInterface
 	void reset( void );												///< subsystem interface
 	void update( void ) { }										///< subsystem interface
 
-	UpgradeTemplate *firstUpgradeTemplate( void );	///< return the first upgrade template
-	const UpgradeTemplate *findUpgradeByKey( NameKeyType key ) const;		///< find upgrade by name key
-	const UpgradeTemplate *findUpgrade( const AsciiString& name ) const;				///< find and return upgrade by name
-	const UpgradeTemplate *findVeterancyUpgrade(VeterancyLevel level) const;				///< find and return upgrade by name
+	UpgradeTemplate *firstUpgradeTemplate( void ); ///< return the first upgrade template
+	const UpgradeTemplate *findUpgradeByKey( NameKeyType key ) const; ///< find upgrade by name key
+	const UpgradeTemplate *findUpgrade( const AsciiString& name ) const; ///< find and return upgrade by name
+	const UpgradeTemplate *findUpgrade( const char* name ) const; ///< find and return upgrade by name
+	const UpgradeTemplate *findVeterancyUpgrade(VeterancyLevel level) const; ///< find and return upgrade by veterancy level
 
 	UpgradeTemplate *newUpgrade( const AsciiString& name );				///< allocate, link, and return new upgrade
 
@@ -266,5 +264,3 @@ class UpgradeCenter : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern UpgradeCenter *TheUpgradeCenter;
-
-#endif  // end __UPGRADE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h
index dfcec0df8cb..7936cfd8ee6 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h
@@ -30,15 +30,14 @@
 
 #pragma once
 
-#ifndef __USERPREFERENCES_H__
-#define __USERPREFERENCES_H__
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 #include "Common/STLTypedefs.h"
 
 class Money;
+typedef UnsignedInt CursorCaptureMode;
+typedef UnsignedInt ScreenEdgeScrollMode;
 
 //-----------------------------------------------------------------------------
 // PUBLIC TYPES ///////////////////////////////////////////////////////////////
@@ -47,7 +46,7 @@ class Money;
 typedef std::map<AsciiString, AsciiString> PreferenceMap;
 
 //-----------------------------------------------------------------------------
-// UserPreferences base class 
+// UserPreferences base class
 //-----------------------------------------------------------------------------
 class UserPreferences : public PreferenceMap
 {
@@ -58,7 +57,7 @@ class UserPreferences : public PreferenceMap
 	// Loads or creates a file with the given name in the user data directory.
 	virtual Bool load(AsciiString fname);
 	virtual Bool write(void);
-	
+
 	Bool getBool(AsciiString key, Bool defaultValue) const;
 	Real getReal(AsciiString key, Real defaultValue) const;
 	Int getInt(AsciiString key, Int defaultValue) const;
@@ -74,7 +73,7 @@ class UserPreferences : public PreferenceMap
 };
 
 //-----------------------------------------------------------------------------
-// OptionsPreferences options menu class 
+// OptionsPreferences options menu class
 //-----------------------------------------------------------------------------
 class OptionPreferences : public UserPreferences
 {
@@ -90,10 +89,21 @@ class OptionPreferences : public UserPreferences
 	void setOnlineIPAddress(AsciiString IP);	// convenience function
 	void setLANIPAddress(UnsignedInt IP);			// convenience function
 	void setOnlineIPAddress(UnsignedInt IP);	// convenience function
+	Bool getArchiveReplaysEnabled() const;		// convenience function
 	Bool getAlternateMouseModeEnabled(void);	// convenience function
 	Bool getRetaliationModeEnabled();					// convenience function
 	Bool getDoubleClickAttackMoveEnabled(void);	// convenience function
 	Real getScrollFactor(void);								// convenience function
+	Bool getDrawScrollAnchor(void);
+	Bool getMoveScrollAnchor(void);
+	Bool getCursorCaptureEnabledInWindowedGame() const;
+	Bool getCursorCaptureEnabledInWindowedMenu() const;
+	Bool getCursorCaptureEnabledInFullscreenGame() const;
+	Bool getCursorCaptureEnabledInFullscreenMenu() const;
+	CursorCaptureMode getCursorCaptureMode() const;
+	Bool getScreenEdgeScrollEnabledInWindowedApp() const;
+	Bool getScreenEdgeScrollEnabledInFullscreenApp() const;
+	ScreenEdgeScrollMode getScreenEdgeScrollMode() const;
 	Bool getSendDelay(void);									// convenience function
 	Int getFirewallBehavior(void);						// convenience function
 	Short getFirewallPortAllocationDelta(void);	// convenience function
@@ -106,8 +116,10 @@ class OptionPreferences : public UserPreferences
 	Real get3DSoundVolume(void);							// convenience function
 	Real getSpeechVolume(void);								// convenience function
 	Real getMusicVolume(void);								// convenience function
+	Real getMoneyTransactionVolume(void) const;
 	Bool saveCameraInReplays(void);
 	Bool useCameraInReplays(void);
+	Bool getPlayerObserverEnabled() const;
 	Int	 getStaticGameDetail(void);	// detail level selected by the user.
 	Int	 getIdealStaticGameDetail(void);	// detail level detected for user.
  	Real getGammaValue(void);
@@ -129,10 +141,19 @@ class OptionPreferences : public UserPreferences
 
 	Int	 getCampaignDifficulty(void);
 	void setCampaignDifficulty( Int diff );
+
+	Int getNetworkLatencyFontSize(void);
+	Int getRenderFpsFontSize(void);
+	Int getSystemTimeFontSize(void);
+	Int getGameTimeFontSize(void);
+
+	Real getResolutionFontAdjustment(void);
+
+	Bool getShowMoneyPerMinute(void) const;
 };
 
 //-----------------------------------------------------------------------------
-// LANPreferences class 
+// LANPreferences class
 //-----------------------------------------------------------------------------
 class LANPreferences : public UserPreferences
 {
@@ -155,5 +176,3 @@ class LANPreferences : public UserPreferences
   void setSuperweaponRestricted( Bool superweaponRestricted);
   void setStartingCash( const Money & startingCash );
 };
-
-#endif // __USERPREFERENCES_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h b/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h
index 5bd6e810d58..419990cbbef 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h
@@ -24,12 +24,12 @@
 
 // FILE: WellKnownKeys.h ///////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef _H_WELLKNOWNKEYS
-#define _H_WELLKNOWNKEYS
-
 #include "Common/NameKeyGenerator.h"
 
 #ifdef INSTANTIATE_WELL_KNOWN_KEYS
@@ -431,7 +428,7 @@ DEFINE_KEY(teamVeterancy)
 /**
 	Which: Team
 	Type: Bool
-	Usage: Does the team execute the actions in 
+	Usage: Does the team execute the actions in
 */
 DEFINE_KEY(teamExecutesActionsOnCreate)
 
@@ -490,7 +487,7 @@ DEFINE_KEY(lightAmbientColor)
 	Type: Int (RGB color in 0xAARRGGBB format)
 	Usage: If unit is a light, Diffuse color.
 */
-DEFINE_KEY(lightDiffuseColor)	
+DEFINE_KEY(lightDiffuseColor)
 
 /**
 	Which: MapObject Properties
@@ -920,5 +917,3 @@ DEFINE_KEY(Player_7_Start)
 DEFINE_KEY(Player_8_Start)
 
 // ---------------------------------------------------------------------------------------
-
-#endif	// _H_WELLKNOWNKEYS
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/crc.h b/GeneralsMD/Code/GameEngine/Include/Common/crc.h
deleted file mode 100644
index ea100421178..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/crc.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// CRC.h ///////////////////////////////////////////////////////////////
-// A class encapsulating CRC calculation
-// Author: Matthew D. Campbell, October 2001
-
-#pragma once
-
-#ifndef _CRC_H_
-#define _CRC_H_
-
-#include "Lib/BaseType.h"
-
-#ifdef RTS_DEBUG
-
-//#include "winsock2.h" // for htonl
-
-class CRC
-{
-public:
-	CRC() { crc = 0; }
-
-	void computeCRC( const void *buf, Int len );		///< Compute the CRC for a buffer, added into current CRC
-	void clear( void ) { crc = 0; }									///< Clears the CRC to 0
-//	UnsignedInt get( void ) { return htonl(crc); }	///< Get the combined CRC
-	UnsignedInt get( void );
-
-#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
-  void set( UnsignedInt v )
-  {
-    crc = v;
-  }
-#endif
-
-private:
-	void addCRC( UnsignedByte val );									///< CRC a 4-byte block
-
-	UnsignedInt crc;
-};
-
-#else
-
-// optimized inline only version
-class CRC
-{
-public:
-	CRC(void) { crc=0; }
-
-  /// Compute the CRC for a buffer, added into current CRC
-	__forceinline void computeCRC( const void *buf, Int len )
-  {
-    if (!buf||len<1)
-      return;
-    
-#if !(defined(_MSC_VER) && _MSC_VER < 1300)
-    // C++ version left in for reference purposes
-	  for (UnsignedByte *uintPtr=(UnsignedByte *)buf;len>0;len--,uintPtr++)
-    {
-    	int hibit;
-    	if (crc & 0x80000000) 
-      {
-		    hibit = 1;
-	    } 
-      else 
-      {
-		    hibit = 0;
-	    }
-
-	    crc <<= 1;
-	    crc += *uintPtr;
-	    crc += hibit;
-    }
-#else
-    // ASM version, verified by comparing resulting data with C++ version data
-    unsigned *crcPtr=&crc;
-    _asm
-    {
-      mov esi,[buf]
-      mov ecx,[len]
-      dec ecx
-      mov edi,[crcPtr]
-      mov ebx,dword ptr [edi]
-      xor eax,eax
-    lp:
-      mov al,byte ptr [esi]
-      shl ebx,1
-      inc esi
-      adc ebx,eax
-      dec ecx
-      jns lp
-      mov dword ptr [edi],ebx
-    };
-#endif
-  }
-
-  /// Clears the CRC to 0
-	void clear( void ) 
-  { 
-    crc = 0; 
-  }									
-
-  ///< Get the combined CRC
-	UnsignedInt get( void ) const
-  {
-    return crc;
-  }
-
-#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
-  void set( UnsignedInt v )
-  {
-    crc = v;
-  }
-#endif
-
-private:
-	UnsignedInt crc;
-};
-
-#endif
-
-#endif // _CRC_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h b/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h
index c7ee67670b7..ff030f10d67 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h
@@ -28,16 +28,9 @@
 
 #pragma once
 
-#ifndef ENCRYPT_HEADER
-#define ENCRYPT_HEADER
-
 // This routine is non-reentrant, as it returns a static buffer!!!
 // Valid input is 4-8 characters, and can contain letters and numbers and '.' and '/'
 
 #define MAX_ENCRYPTED_STRING 8
 
 const char *EncryptString(const char *);
-
-#endif
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/file.h b/GeneralsMD/Code/GameEngine/Include/Common/file.h
deleted file mode 100644
index c81c8c247a8..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/file.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------=
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    WSYS Library
-//
-// Module:     IO
-//
-// File name:  wsys/File.h
-//
-// Created:    4/23/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __FILE_H
-#define __FILE_H
-
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Lib/BaseType.h"
-#include "Common/AsciiString.h"
-#include "Common/GameMemory.h"
-// include FileSystem.h as it will be used alot with File.h
-//#include "Common/FileSystem.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// File
-//===============================
-/**
-  *	File is an interface class for basic file operations.
-	*
-	* All code should use the File class and not its derivatives, unless
-	* absolutely necessary. Also FS::Open should be used to create File objects and open files.
-	*/
-//===============================
-
-class File : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_ABC(File)
-// friend doesn't play well with MPO (srj)
-//	friend class FileSystem;
-
-	public:
-	
-		enum access
-		{
-			NONE			= 0x00000000,				
-			READ			= 0x00000001,				///< Access file for reading
-			WRITE			= 0x00000002,				///< Access file for writing
-			APPEND		= 0x00000004,				///< Seek to end of file on open
-			CREATE		= 0x00000008,				///< Create file if it does not exist
-			TRUNCATE	= 0x00000010,				///< Delete all data in file when opened
-			TEXT			= 0x00000020,				///< Access file as text data
-			BINARY		= 0x00000040,				///< Access file as binary data
-			READWRITE = (READ | WRITE),
-			ONLYNEW		= 0x00000080,				///< Only create file if it does not exist
-			
-			// NOTE: STREAMING is Mutually exclusive with WRITE
-			STREAMING = 0x00000100				///< Do not read this file into a ram file, read it as requested.
-		};
-
-		enum seekMode
-		{
-			START,												///< Seek position is relative to start of file
-			CURRENT,											///< Seek position is relative to current file position
-			END														///< Seek position is relative from the end of the file
-		};
-
-	protected:
-
-		AsciiString	m_nameStr;						///< Stores file name
-		Int					m_access;									///< How the file was opened
-		Bool				m_open;										///< Has the file been opened
-		Bool				m_deleteOnClose;					///< delete File object on close()
-		
-		
-		File();											///< This class can only used as a base class
-		//virtual				~File();
-
-	public:
-		
-
-						Bool	eof();
-		virtual Bool	open( const Char *filename, Int access = 0 );				///< Open a file for access
-		virtual void	close( void );																			///< Close the file !!! File object no longer valid after this call !!!
-
-		virtual Int		read( void *buffer, Int bytes ) = NULL ;						/**< Read the specified number of bytes from the file in to the 
-																																			  *  memory pointed at by buffer. Returns the number of bytes read.
-																																			  *  Returns -1 if an error occured.
-																																			  */
-		virtual Int		write( const void *buffer, Int bytes ) = NULL ;						/**< Write the specified number of bytes from the    
-																																			  *	 memory pointed at by buffer to the file. Returns the number of bytes written.
-																																			  *	 Returns -1 if an error occured.
-																																			  */
-		virtual Int		seek( Int bytes, seekMode mode = CURRENT ) = NULL;	/**< Sets the file position of the next read/write operation. Returns the new file
-																																				*  position as the number of bytes from the start of the file.
-																																				*  Returns -1 if an error occured.
-																																				*
-																																				*  seekMode determines how the seek is done:
-																																				*
-																																				*  START : means seek to the specified number of bytes from the start of the file
-																																				*  CURRENT: means seek the specified the number of bytes from the current file position
-																																				*  END: means seek the specified number of bytes back from the end of the file
-																																				*/
-		virtual void	nextLine(Char *buf = NULL, Int bufSize = 0) = 0;		///< reads until it reaches a new-line character
-
-		virtual Bool	scanInt(Int &newInt) = 0;														///< read an integer from the current file position.
-		virtual Bool	scanReal(Real &newReal) = 0;												///< read a real number from the current file position.
-		virtual Bool	scanString(AsciiString &newString) = 0;							///< read a string from the current file position.
-
-		virtual Bool	print ( const Char *format, ...);										///< Prints formated string to text file
-		virtual Int		size( void );																				///< Returns the size of the file
-		virtual Int		position( void );																		///< Returns the current read/write position
-
-
-		void					setName( const char *name );												///< Set the name of the file
-		const char*		getName( void ) const;															///< Returns a pointer to the name of the file
-		Int						getAccess( void ) const;														///< Returns file's access flags
-
-		void					deleteOnClose ( void );															///< Causes the File object to delete itself when it closes
-
-		/**
-			Allocate a buffer large enough to hold entire file, read 
-			the entire file into the buffer, then close the file.
-			the buffer is owned by the caller, who is responsible
-			for freeing is (via delete[]). This is a Good Thing to
-			use because it minimizes memory copies for BIG files.
-		*/
-		virtual char* readEntireAndClose() = 0;
-		virtual File* convertToRAMFile() = 0;
-};
-
-
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-inline const char* File::getName( void ) const { return m_nameStr.str(); }
-inline void File::setName( const char *name ) { m_nameStr.set(name); }
-inline Int File::getAccess( void ) const { return m_access; }
-inline void File::deleteOnClose( void ) { m_deleteOnClose = TRUE; }
-
-
-
-
-
-#endif // __FILE_H
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/simpleplayer.h b/GeneralsMD/Code/GameEngine/Include/Common/simpleplayer.h
deleted file mode 100644
index d24cde78741..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/simpleplayer.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef SIMPLEPLAYER_H
-#define SIMPLEPLAYER_H
-
-#include "wmsdk.h"
-
-//
-// we preserve a list of "ready-to-free" list of wave headers for the
-// caller to unprepare and free
-//
-typedef struct WAVEHDR_LIST {
-    LPWAVEHDR           pwh;
-    struct WAVEHDR_LIST *next;
-}   WAVEHDR_LIST;
-
-#define SIMPLE_PLAYER_OPEN_EVENT  _T( "45ab58e0-382e-4d1c-ac50-88a5f9601851" )
-#define SIMPLE_PLAYER_CLOSE_EVENT _T( "276095fa-a8e0-48e6-ac61-8b0002345607" )
-#define WMAPLAY_EVENT             _T( "9e828a72-64f3-48f0-9de8-13dafd0cbd3a" )
-///////////////////////////////////////////////////////////////////////////////
-class CSimplePlayer : public IWMReaderCallback
-{
-public:
-    CSimplePlayer( HRESULT* phr );
-    ~CSimplePlayer();
-    
-    virtual HRESULT Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hCompletionEvent, HRESULT *phrCompletion );
-
-//
-// IUnknown Implemenation
-//
-public:
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(
-        REFIID riid,
-        void **ppvObject );
-
-    virtual ULONG STDMETHODCALLTYPE AddRef();
-    virtual ULONG STDMETHODCALLTYPE Release();
-
-//
-// IWMReaderCallback Implemenation
-//
-public:
-    virtual HRESULT STDMETHODCALLTYPE OnSample( 
-        /* [in] */ DWORD dwOutputNum,
-        /* [in] */ QWORD cnsSampleTime,
-        /* [in] */ QWORD cnsSampleDuration,
-        /* [in] */ DWORD dwFlags,
-        /* [in] */ INSSBuffer __RPC_FAR *pSample,
-        /* [in] */ void __RPC_FAR *pvContext);
-    
-    virtual HRESULT STDMETHODCALLTYPE OnStatus( 
-        /* [in] */ WMT_STATUS Status,
-        /* [in] */ HRESULT hr,
-        /* [in] */ WMT_ATTR_DATATYPE dwType,
-        /* [in] */ BYTE __RPC_FAR *pValue,
-        /* [in] */ void __RPC_FAR *pvContext);
-
-//
-// Helper Methods
-//
-protected:
-
-    HRESULT Close();
-
-    void OnWaveOutMsg( UINT uMsg, DWORD dwParam1, DWORD dwParam2 );
-
-    static void CALLBACK WaveProc(
-                          HWAVEOUT hwo,      
-                          UINT uMsg,         
-                          DWORD dwInstance,  
-                          DWORD dwParam1,    
-                          DWORD dwParam2 );
- 
-    HRESULT AddWaveHeader( LPWAVEHDR pwh );
-    void    RemoveWaveHeaders( void );
-
-    CRITICAL_SECTION    m_CriSec;
-    WAVEHDR_LIST       *m_whdrHead;
-
-    LONG    m_cRef;
-    LONG    m_cBuffersOutstanding;
-    BOOL    m_fEof;
-    HANDLE  m_hCompletionEvent;
-
-    IWMReader *m_pReader;
-    IWMHeaderInfo *m_pHeader;
-    HWAVEOUT m_hwo;
-
-    HRESULT *m_phrCompletion;
-
-    HRESULT m_hrOpen;
-    HANDLE m_hOpenEvent;
-    HANDLE m_hCloseEvent;
-
-    union
-    {
-        WAVEFORMATEX m_wfx;
-        BYTE m_WfxBuf[1024];
-    };
-
-    LPWSTR  m_pszUrl;
-
-};
-
-#endif // SIMPLEPLAYER_H
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/urllaunch.h b/GeneralsMD/Code/GameEngine/Include/Common/urllaunch.h
deleted file mode 100644
index 136b6d1412e..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/Common/urllaunch.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef URLLAUNCH_H
-#define URLLAUNCH_H
-
-HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL );
-
-HRESULT LaunchURL( LPCWSTR pszURL );
-
-#endif  // URLLAUNCH_H
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/version.h b/GeneralsMD/Code/GameEngine/Include/Common/version.h
index 044df908db1..5c139fb6145 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/version.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/version.h
@@ -28,35 +28,75 @@
 
 #pragma once
 
-#ifndef __VERSION_H__
-#define __VERSION_H__
+#include <time.h>
 
-/** 
+/**
  * The Version class formats the version number into integer and string
  * values for different parts of the game.
  * @todo: increment build number on compile, and stamp exe with username
  */
+// TheSuperHackers @tweak The Version class now also provides Git information
+// alongside the original Version information.
 class Version
 {
 public:
 	Version();
-	UnsignedInt getVersionNumber( void );						///< Return a 4-byte integer suitable for WOLAPI
-	AsciiString getAsciiVersion( void );						///< Return a human-readable version number
-	UnicodeString getUnicodeVersion( void );				///< Return a human-readable version number
-	UnicodeString getFullUnicodeVersion( void );		///< Return a human-readable version number
-	AsciiString getAsciiBuildTime( void );					///< Return a formated date/time string for build time
-	UnicodeString getUnicodeBuildTime( void );			///< Return a formated date/time string for build time
-	AsciiString getAsciiBuildLocation( void );			///< Return a string with the build location
-	UnicodeString getUnicodeBuildLocation( void );	///< Return a string with the build location
-	AsciiString getAsciiBuildUser( void );					///< Return a string with the build user
-	UnicodeString getUnicodeBuildUser( void );			///< Return a string with the build user
-
-	Bool showFullVersion( void ) { return m_showFullVersion; }
+
+	UnsignedInt getVersionNumber() const;           ///< Return a 4-byte integer suitable for WOLAPI
+
+	AsciiString getAsciiVersion() const;            ///< Return a human-readable game version number
+	UnicodeString getUnicodeVersion() const;        ///< Return a human-readable game version number. Is decorated with localized string
+
+	AsciiString getAsciiBuildTime() const;          ///< Return a formated date/time string for build time
+	UnicodeString getUnicodeBuildTime() const;      ///< Return a formated date/time string for build time. Is decorated with localized string
+
+	AsciiString getAsciiBuildLocation() const;      ///< Return a string with the build location
+	UnicodeString getUnicodeBuildLocation() const;  ///< Return a string with the build location. Is decorated with localized string
+
+	AsciiString getAsciiBuildUser() const;          ///< Return a string with the build user
+	UnicodeString getUnicodeBuildUser() const;      ///< Return a string with the build user. Is decorated with localized string
+
+	static Int getGitCommitCount();                    ///< Returns the git commit count as a number
+	static time_t getGitCommitTime();                  ///< Returns the git head commit time as a UTC timestamp
+	static const char* getGitCommitAuthorName();       ///< Returns the git head commit author name
+
+	AsciiString getAsciiGitCommitCount() const;        ///< Returns the git commit count. Is prefixed with ~ if there were uncommitted changes.
+	UnicodeString getUnicodeGitCommitCount() const;    ///< Returns the git commit count. Is prefixed with ~ if there were uncommitted changes.
+
+	AsciiString getAsciiGitTagOrHash() const;          ///< Returns the git head commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
+	UnicodeString getUnicodeGitTagOrHash() const;      ///< Returns the git head commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
+
+	AsciiString getAsciiGitCommitTime() const;         ///< Returns the git head commit time in YYYY-mm-dd HH:MM:SS format
+	UnicodeString getUnicodeGitCommitTime() const;     ///< Returns the git head commit time in YYYY-mm-dd HH:MM:SS format
+
+	AsciiString getAsciiGitVersion() const;            ///< Returns the git version
+	UnicodeString getUnicodeGitVersion() const;        ///< Returns the git version
+
+	AsciiString getAsciiBuildUserOrGitCommitAuthorName() const;
+	UnicodeString getUnicodeBuildUserOrGitCommitAuthorName() const; ///< Is decorated with localized string
+
+	UnicodeString getUnicodeProductTitle() const;
+	UnicodeString getUnicodeProductVersion() const;
+	UnicodeString getUnicodeProductAuthor() const; ///< Is decorated with localized string
+	UnicodeString getUnicodeProductString() const; ///< Returns a string that contains product title, version and other, if specified. Is decorated with localized string
+	UnicodeString getUnicodeProductVersionHashString() const; ///< Returns a string that contains the product string, game version and hashes. Is decorated with localized string
+
+	Bool showFullVersion() const { return m_showFullVersion; }
 	void setShowFullVersion( Bool val ) { m_showFullVersion = val; }
 
 	void setVersion(Int major, Int minor, Int buildNum,
 		Int localBuildNum, AsciiString user, AsciiString location,
-		AsciiString buildTime, AsciiString buildDate); ///< Set version info
+		AsciiString buildTime, AsciiString buildDate);
+
+private:
+	static AsciiString buildAsciiGitCommitCount();
+	static UnicodeString buildUnicodeGitCommitCount();
+
+	static AsciiString buildAsciiGitTagOrHash();
+	static UnicodeString buildUnicodeGitTagOrHash();
+
+	static AsciiString buildAsciiGitCommitTime();
+	static UnicodeString buildUnicodeGitCommitTime();
 
 private:
 	Int m_major;
@@ -67,9 +107,13 @@ class Version
 	AsciiString m_buildUser;
 	AsciiString m_buildTime;
 	AsciiString m_buildDate;
+	AsciiString m_asciiGitCommitCount;
+	AsciiString m_asciiGitTagOrHash;
+	AsciiString m_asciiGitCommitTime;
+	UnicodeString m_unicodeGitCommitCount;
+	UnicodeString m_unicodeGitTagOrHash;
+	UnicodeString m_unicodeGitCommitTime;
 	Bool m_showFullVersion;
 };
 
-extern Version *TheVersion;	///< The Version singleton
-
-#endif // __VERSION_H__
+extern Version *TheVersion;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h
index c168aa33e61..eed24494d81 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ANIM_2D_H_
-#define __ANIM_2D_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Snapshot.h"
 
@@ -42,7 +39,7 @@ class Image;
 // ------------------------------------------------------------------------------------------------
 enum Anim2DMode CPP_11(: Int)
 {
-	
+
 	ANIM_2D_INVALID = 0,
 	ANIM_2D_ONCE,
 	ANIM_2D_ONCE_BACKWARDS,
@@ -52,11 +49,11 @@ enum Anim2DMode CPP_11(: Int)
 	ANIM_2D_PING_PONG_BACKWARDS,
 	// dont' forget to add new animation mode names to Anim2DModeNames[] below
 
-	ANIM_2D_NUM_MODES						// keep this last please
+	ANIM_2D_NUM_MODES
 
 };
 #ifdef DEFINE_ANIM_2D_MODE_NAMES
-static const char *Anim2DModeNames[] = 
+static const char *const Anim2DModeNames[] =
 {
 	"NONE",
 	"ONCE",
@@ -67,6 +64,7 @@ static const char *Anim2DModeNames[] =
 	"PING_PONG_BACKWARDS",
 	NULL
 };
+static_assert(ARRAY_SIZE(Anim2DModeNames) == ANIM_2D_NUM_MODES + 1, "Incorrect array size");
 #endif
 
 // ------------------------------------------------------------------------------------------------
@@ -74,7 +72,7 @@ static const char *Anim2DModeNames[] =
 // ------------------------------------------------------------------------------------------------
 class Anim2DTemplate : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Anim2DTemplate, "Anim2DTemplate")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Anim2DTemplate, "Anim2DTemplate")
 public:
 
 	Anim2DTemplate( AsciiString name );
@@ -90,7 +88,7 @@ class Anim2DTemplate : public MemoryPoolObject
 	// list access for use by the Anim2DCollection only
 	void friend_setNextTemplate( Anim2DTemplate *animTemplate ) { m_nextTemplate = animTemplate; }
 	Anim2DTemplate *friend_getNextTemplate( void ) const { return m_nextTemplate; };
-	
+
 	// INI methods
 	const FieldParse *getFieldParse( void ) const { return s_anim2DFieldParseTable; }
 	void storeImage( const Image *image );								///< store image in next available slot
@@ -221,5 +219,3 @@ class Anim2DCollection : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern Anim2DCollection *TheAnim2DCollection;
-
-#endif  // end __ANIM_2D_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
index 86a40dd7811..a43b0c8222a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
@@ -24,12 +24,12 @@
 
 // FILE: AnimateWindowManager.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Mar 2002
@@ -37,7 +37,7 @@
 //	Filename: AnimateWindowManager.h
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The Animate Window class will be used by registering a window with
 //						the manager with stating what kind of animation to do. Then on every
 //						update, we'll move the windows.
@@ -47,9 +47,6 @@
 
 #pragma once
 
-#ifndef __ANIMATEWINDOWMANAGER_H_
-#define __ANIMATEWINDOWMANAGER_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -95,12 +92,12 @@ enum AnimTypes CPP_11(: Int)
 } ;
 
 //-----------------------------------------------------------------------------
-// TheSuperHackers @compile xezon 14/03/2025 Puts class into namespace to avoid name collision with AnimateWindow function in WinUser.h
+// TheSuperHackers @build xezon 14/03/2025 Puts class into namespace to avoid name collision with AnimateWindow function in WinUser.h
 namespace wnd
 {
 class AnimateWindow : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AnimateWindow, "AnimateWindow")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AnimateWindow, "AnimateWindow")
 public:
 	AnimateWindow( void );
 	//~AnimateWindow( void );
@@ -141,7 +138,7 @@ class AnimateWindow : public MemoryPoolObject
 
 private:
 	UnsignedInt m_delay;													///< Holds the delay time in which the animation will start (in milliseconds)
-	ICoord2D m_startPos;													///< Holds the starting position of the animation 
+	ICoord2D m_startPos;													///< Holds the starting position of the animation
 																								///<(usuall is also the end position of the animation when the animation is reversed)
 	ICoord2D m_endPos;														///< Holds the target End Position (usually is the same as the rest position)
 	ICoord2D m_curPos;														///< It's Current Position
@@ -169,9 +166,9 @@ class AnimateWindowManager : public SubsystemInterface
 	~AnimateWindowManager( void );
 
 	// Inhertited from subsystem ====================================================================
-	virtual void init( void );			
-	virtual void reset( void );			
-	virtual void update( void );		
+	virtual void init( void );
+	virtual void reset( void );
+	virtual void update( void );
 	//===============================================================================================
 
 	void registerGameWindow(GameWindow *win, AnimTypes animType, Bool needsToFinish, UnsignedInt ms = 0, UnsignedInt delayMs = 0);			// Registers a new window to animate.
@@ -194,7 +191,7 @@ class AnimateWindowManager : public SubsystemInterface
 	ProcessAnimateWindowSlideFromBottomTimed *m_slideFromBottomTimed;		///< Holds the process in which the windows slide from the Bottom in a time-based fashion
 	ProcessAnimateWindowSlideFromTopFast *m_slideFromTopFast;			///< holds the process in wich the windows slide from the top,fast
 	ProcessAnimateWindow *getProcessAnimate( AnimTypes animType);		///< returns the process for the kind of animation we need.
-	
+
 };
 
 //-----------------------------------------------------------------------------
@@ -229,12 +226,10 @@ namespace wnd
 	inline void	AnimateWindow::setNeedsToFinish( Bool needsToFinish)		{ m_needsToFinish = needsToFinish; };
 	inline Bool	AnimateWindow::needsToFinish( void )							{ return m_needsToFinish; };
 } // namespace wnd
-	
+
 	inline Bool AnimateWindowManager::isFinished( void )					{ return !m_needsUpdate;	};
 	inline Bool AnimateWindowManager::isReversed( void )						{ return m_reverse;	};
-	inline Bool AnimateWindowManager::isEmpty( void ){return (m_winList.size() == 0 && m_winMustFinishList.size() == 0);	}
+	inline Bool AnimateWindowManager::isEmpty( void ){return (m_winList.empty() && m_winMustFinishList.empty());	}
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __ANIMATEWINDOWMANAGER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h
index 94d195d451b..067a026f581 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h
@@ -29,12 +29,7 @@
 
 #pragma once
 
-#ifndef __CDCHECK_H_
-#define __CDCHECK_H_
-
 typedef void (*gameStartCallback) (void);
 
 Bool IsFirstCDPresent(void);
 void CheckForCDAtGameStart( gameStartCallback callback );
-
-#endif //__CDCHECK_H_
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h
index 6f001bcc8a9..f82e5a64b07 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h
@@ -24,12 +24,12 @@
 
 // FILE: CampaignManager.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,17 +37,14 @@
 //	Filename: 	CampaignManager.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CAMPAIGN_MANAGER_H_
-#define __CAMPAIGN_MANAGER_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -77,7 +74,7 @@ class Mission : public MemoryPoolObject
 
 public:
 	AsciiString m_name;
-	AsciiString m_mapName;	
+	AsciiString m_mapName;
 	AsciiString m_nextMission;
 	AsciiString m_movieLabel;
 	AsciiString m_missionObjectivesLabel[MAX_OBJECTIVE_LINES];
@@ -94,7 +91,7 @@ class Campaign : public MemoryPoolObject
 public:
 	Campaign( void );
 	//~Campaign( void );
-	
+
 	Mission *newMission( AsciiString name );
 	Mission *getNextMission( Mission *current);
 	Mission *getMission( AsciiString missionName);
@@ -138,13 +135,13 @@ class CampaignManager : public Snapshot
 	const FieldParse *getFieldParse( void ) const { return m_campaignFieldParseTable; }								///< returns the parsing fields
 	static const FieldParse m_campaignFieldParseTable[];																				///< the parse table
 	static void parseMissionPart( INI* ini, void *instance, void *store, const void *userData );					///< Parse the Mission Part
-	
+
 	Campaign *newCampaign(AsciiString name);
 	Bool isVictorious( void ) { return m_victorious; }
 	void SetVictorious( Bool victory ) { m_victorious = victory;	}
 
 	void setRankPoints( Int rankPoints ) { m_currentRankPoints = rankPoints; }
-	Int getRankPoints() const { 
+	Int getRankPoints() const {
 		// All campaign missions, regular and generals' challenge now start each map at rank 0.
 		// This is because they weren't designed with rank persistence in mind, and were primarily
 		// tested in a debug context, with no notion of previous rank.
@@ -176,5 +173,3 @@ class CampaignManager : public Snapshot
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 extern CampaignManager *TheCampaignManager;
-
-#endif // __CAMPAIGN_MANAGER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ChallengeGenerals.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ChallengeGenerals.h
index 69d42f6ac3a..fb8456685e4 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ChallengeGenerals.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ChallengeGenerals.h
@@ -29,10 +29,6 @@
 
 #pragma once
 
-#ifndef __CHALLENGEGENERALS_H_
-#define __CHALLENGEGENERALS_H_
-
-
 // INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameType.h"
 #include "Common/Overridable.h"
@@ -85,7 +81,7 @@ class GeneralPersona
 	{
 	}
 //	~GeneralPersona( void );
-	
+
 	Bool isStartingEnabled() const { return m_bStartsEnabled; }
 	const AsciiString& getBioName() const { return m_strBioName; }
 	const AsciiString& getBioDOB() const { return m_strBioDOB; }
@@ -108,7 +104,7 @@ class GeneralPersona
 	const AsciiString& getRandomTauntSound() const {
 		switch (rand()%3) // don't care about distribution or exactly how random this is
 		{
-			case 0:	return m_strTauntSound1; 
+			case 0:	return m_strTauntSound1;
 			case 1: return m_strTauntSound2;
 		}
 		return m_strTauntSound3;
@@ -140,7 +136,7 @@ class ChallengeGenerals
 	const GeneralPersona* getPlayerGeneralByCampaignName( AsciiString name ) const;
 	const GeneralPersona* getGeneralByGeneralName( AsciiString name ) const;
 	const GeneralPersona* getGeneralByTemplateName( AsciiString name ) const;
-	
+
 	void setCurrentPlayerTemplateNum( Int playerTemplateNum) { m_PlayerTemplateNum = playerTemplateNum; }
 	Int getCurrentPlayerTemplateNum( void ) { return m_PlayerTemplateNum; }
 
@@ -156,5 +152,3 @@ class ChallengeGenerals
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern ChallengeGenerals *TheChallengeGenerals;
 extern ChallengeGenerals *createChallengeGenerals( void );
-
-#endif  // end __CHALLENGEGENERALS_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ClientInstance.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ClientInstance.h
index 74e7add404b..1f1ada1daca 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ClientInstance.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ClientInstance.h
@@ -30,6 +30,15 @@ class ClientInstance
 
 	static bool isInitialized();
 
+	static bool isMultiInstance();
+
+	// Change multi instance on runtime. Must be called before initialize.
+	static void setMultiInstance(bool v);
+
+	// Skips using the primary instance. Must be called before initialize.
+	// Useful when the new process is not meant to collide with another normal Generals process.
+	static void skipPrimaryInstance();
+
 	// Returns the instance index of this game client. Starts at 0.
 	static UnsignedInt getInstanceIndex();
 
@@ -42,6 +51,7 @@ class ClientInstance
 private:
 	static HANDLE s_mutexHandle;
 	static UnsignedInt s_instanceIndex;
+	static Bool s_isMultiInstance;
 };
 
 } // namespace rts
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ClientRandomValue.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ClientRandomValue.h
deleted file mode 100644
index 5a869e701bf..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ClientRandomValue.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// ClientRandomValue.h
-// Random number generation system
-// Author: Michael S. Booth, January 1998
-// Split out into separate Logic/Client/Audio headers by MDC Sept 2002
-
-#pragma once
-
-#ifndef _CLIENT_RANDOM_VALUE_H_
-#define _CLIENT_RANDOM_VALUE_H_
-
-#include "Lib/BaseType.h"
-
-// do NOT use these functions directly, rather use the macros below
-extern Int GetGameClientRandomValue( int lo, int hi, const char *file, int line );
-extern Real GetGameClientRandomValueReal( Real lo, Real hi, const char *file, int line );
-
-// use these macros to access the random value functions
-#define GameClientRandomValue( lo, hi ) GetGameClientRandomValue( lo, hi, __FILE__, __LINE__ )
-#define GameClientRandomValueReal( lo, hi ) GetGameClientRandomValueReal( lo, hi, __FILE__, __LINE__ )
-
-//--------------------------------------------------------------------------------------------------------------
-class CColorAlphaDialog;
-class DebugWindowDialog;
-
-/**
- * A GameClientRandomVariable represents a distribution of random values
- * from which discrete values can be retrieved.
- */
-class GameClientRandomVariable
-{
-public:
-	// NOTE: This class cannot have a constructor or destructor due to its use within unions
-
-	/**
-	 * CONSTANT represents a single, constant, value.
-	 * UNIFORM represents a uniform distribution of random values.
-	 * GAUSSIAN represents a normally distributed set of random values.
-	 * TRIANGULAR represents a distribution of random values in the shape
-	 *		of a triangle, with the peak probability midway between low and high.
-	 * LOW_BIAS represents a distribution of random values with
-	 *		maximum probability at low, and zero probability at high.
-	 * HIGH_BIAS represents a distribution of random values with
-	 *		zero probability at low, and maximum probability at high.
-	 */
-	enum DistributionType 
-	{ 
-		CONSTANT, UNIFORM, GAUSSIAN, TRIANGULAR, LOW_BIAS, HIGH_BIAS
-	};
-
-	static const char *DistributionTypeNames[]; 
-
-	/// define the range of random values, and the distribution of values
-	void setRange( Real low, Real high, DistributionType type = UNIFORM );
-
-	Real getValue( void ) const;														///< return a value from the random distribution
-	inline Real getMinimumValue( void ) const { return m_low; }
-	inline Real getMaximumValue( void ) const { return m_high; }
-	inline DistributionType getDistributionType( void ) const { return m_type; }
-protected:
-	DistributionType m_type;																		///< the kind of random distribution
-	Real m_low, m_high;																					///< the range of random values
-
-	// These two friends are for particle editing.
-	friend CColorAlphaDialog;
-	friend DebugWindowDialog;
-
-};
-
-//--------------------------------------------------------------------------------------------------------------
-
-#endif // _CLIENT_RANDOM_VALUE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h
index d8749e8fd8f..34f4a5f2965 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h
@@ -24,12 +24,12 @@
 
 // FILE: Color.h //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __COLOR_H_
-#define __COLOR_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -68,7 +65,7 @@ typedef Int Color;
 
 inline Color GameMakeColor( UnsignedByte red, UnsignedByte green, UnsignedByte blue, UnsignedByte alpha )
 {
-	return (alpha << 24) | (red << 16) | (green << 8) | (blue); 
+	return (alpha << 24) | (red << 16) | (green << 8) | (blue);
 }
 
 extern void GameGetColorComponents( Color color,
@@ -88,6 +85,3 @@ extern void GameGetColorComponents( Color color,
 extern void GameGetColorComponentsReal( Color color, Real *red, Real *green, Real *blue, Real *alpha );
 
 extern Color GameDarkenColor( Color color, Int percent = 10 );
-
-#endif // __COLOR_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h
index 65381e75f15..2017aba7acb 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef _H_CommandXlat
-#define _H_CommandXlat
-
 #include "GameClient/InGameUI.h"
 
 enum GUICommandType CPP_11(: Int);
@@ -58,7 +55,7 @@ class CommandTranslator : public GameMessageTranslator
 	ICoord2D m_mouseRightDragLift;			// the location of a possible mouse drag end
 	UnsignedInt m_mouseRightDown;	// when the mouse down happened
 	UnsignedInt m_mouseRightUp;		// when the mouse up happened
-  
+
 	GameMessage::Type createMoveToLocationMessage( Drawable *draw, const Coord3D *dest, CommandEvaluateType commandType );
 	GameMessage::Type createAttackMessage( Drawable *draw, Drawable *other, CommandEvaluateType commandType );
 	GameMessage::Type createEnterMessage( Drawable *enter, CommandEvaluateType commandType );
@@ -96,7 +93,7 @@ enum FilterModes CPP_11(: Int)
 	FM_VIEW_CROSSFADE_CIRCLE,	// Fades from previous to current view using expanding circle.
 	FM_VIEW_CROSSFADE_FB_MASK,	// Fades from previous to current using mask stored in framebuffer alpha.
 
-	// These apply to FT_VIEW_MOTION_BLUR_FILTER 
+	// These apply to FT_VIEW_MOTION_BLUR_FILTER
 	FM_VIEW_MB_IN_AND_OUT_ALPHA, // Motion blur filter in and out alpha blur
 	FM_VIEW_MB_IN_AND_OUT_SATURATE, // Motion blur filter in and out saturated blur
 	FM_VIEW_MB_IN_ALPHA, // Motion blur filter in alpha blur
@@ -106,7 +103,7 @@ enum FilterModes CPP_11(: Int)
 	FM_VIEW_MB_END_PAN_ALPHA, // Moton blur on screen pan (for camera tracks object mode)
 
 	FM_VIEW_DEFAULT,	//Default filter that's enabled when all others are off.
-	
+
 	// NOTE: This has to be the last entry in this enum.
 	// Add new entries before this one.  jba.
 	FM_VIEW_MB_PAN_ALPHA, // Moton blur on screen pan (for camera tracks object mode)
@@ -125,5 +122,3 @@ class PickAndPlayInfo
 };
 
 extern void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type msgType, PickAndPlayInfo *info = NULL );
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h
index 08938bc3d36..1d37eb6ee39 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __CONTROLBAR_H_
-#define __CONTROLBAR_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/GameType.h"
@@ -102,12 +99,10 @@ enum CommandOption CPP_11(: Int)
 	USES_MINE_CLEARING_WEAPONSET= 0x00200000,	// uses the special mine-clearing weaponset, even if not current
 	CAN_USE_WAYPOINTS						= 0x00400000, // button has option to use a waypoint path
 	MUST_BE_STOPPED							= 0x00800000, // Unit must be stopped in order to be able to use button.
-
-	NUM_COMMAND_OPTIONS						// keep this last
 };
 
 #ifdef DEFINE_COMMAND_OPTION_NAMES
-static const char *TheCommandOptionNames[] = 
+static const char *const TheCommandOptionNames[] =
 {
 	"NEED_TARGET_ENEMY_OBJECT",
 	"NEED_TARGET_NEUTRAL_OBJECT",
@@ -143,7 +138,7 @@ static const char *TheCommandOptionNames[] =
 #endif  // end DEFINE_COMMAND_OPTION_NAMES
 
 // convenient bit masks to group some command options together
-const UnsignedInt COMMAND_OPTION_NEED_TARGET = 
+const UnsignedInt COMMAND_OPTION_NEED_TARGET =
 					NEED_TARGET_ENEMY_OBJECT |
 					NEED_TARGET_NEUTRAL_OBJECT |
 					NEED_TARGET_ALLY_OBJECT |
@@ -161,7 +156,7 @@ const UnsignedInt COMMAND_OPTION_NEED_OBJECT_TARGET =
 	* on all units, in fact, many commands are for a particular single command.  It will
 	* be up to the command GUI to translate the command assigned to a button into the
 	* appropriate game command and get it across the network to the game logic to perform the
-	* actual command logic 
+	* actual command logic
 	*
 	* IMPORTANT: Make sure the GUICommandType enum and the TheGuiCommandNames[] have the same
 	*						 entries in the same order */
@@ -213,16 +208,16 @@ enum GUICommandType CPP_11(: Int)
 	GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT,			///< do a special power from localPlayer's command center, regardless of selection
 	GUI_COMMAND_SPECIAL_POWER_CONSTRUCT,					///< do a special power using the construct building interface
 	GUI_COMMAND_SPECIAL_POWER_CONSTRUCT_FROM_SHORTCUT, ///< do a shortcut special power using the construct building interface
-	
+
 	GUI_COMMAND_SELECT_ALL_UNITS_OF_TYPE,
 
 	// add more commands here, don't forget to update the string command list below too ...
 
-	GUI_COMMAND_NUM_COMMANDS							// keep this last
+	GUI_COMMAND_NUM_COMMANDS
 };
 
 #ifdef DEFINE_GUI_COMMMAND_NAMES
-static const char *TheGuiCommandNames[] = 
+static const char *const TheGuiCommandNames[] =
 {
 	"NONE",
 	"DOZER_CONSTRUCT",
@@ -262,12 +257,13 @@ static const char *TheGuiCommandNames[] =
 #endif
 	"PLACE_BEACON",
 	"SPECIAL_POWER_FROM_SHORTCUT",
-	"SPECIAL_POWER_CONSTRUCT",					
-	"SPECIAL_POWER_CONSTRUCT_FROM_SHORTCUT", 
+	"SPECIAL_POWER_CONSTRUCT",
+	"SPECIAL_POWER_CONSTRUCT_FROM_SHORTCUT",
 	"SELECT_ALL_UNITS_OF_TYPE",
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheGuiCommandNames) == GUI_COMMAND_NUM_COMMANDS + 1, "Incorrect array size");
 #endif  // end DEFINE_GUI_COMMAND_NAMES
 
 enum CommandButtonMappedBorderType CPP_11(: Int)
@@ -278,21 +274,22 @@ enum CommandButtonMappedBorderType CPP_11(: Int)
 	COMMAND_BUTTON_BORDER_ACTION,
 	COMMAND_BUTTON_BORDER_SYSTEM,
 
-	COMMAND_BUTTON_BORDER_COUNT // keep this last
+	COMMAND_BUTTON_BORDER_COUNT
 };
 
-static const LookupListRec CommandButtonMappedBorderTypeNames[] = 
+static const LookupListRec CommandButtonMappedBorderTypeNames[] =
 {
 	{ "NONE",					COMMAND_BUTTON_BORDER_NONE },
 	{ "BUILD",				COMMAND_BUTTON_BORDER_BUILD },
 	{ "UPGRADE",			COMMAND_BUTTON_BORDER_UPGRADE },
 	{ "ACTION",				COMMAND_BUTTON_BORDER_ACTION },
 	{ "SYSTEM",				COMMAND_BUTTON_BORDER_SYSTEM },
-	
-	{ NULL, 0	}// keep this last!
+
+	{ NULL, 0	}
 };
+static_assert(ARRAY_SIZE(CommandButtonMappedBorderTypeNames) == COMMAND_BUTTON_BORDER_COUNT + 1, "Incorrect array size");
 //-------------------------------------------------------------------------------------------------
-/** Command buttons are used to load the buttons we place on throughout the command bar 
+/** Command buttons are used to load the buttons we place on throughout the command bar
 	* interface in different context sensitive windows depending on the situation and
 	* type of the object selected */
 //-------------------------------------------------------------------------------------------------
@@ -316,7 +313,7 @@ class CommandButton : public Overridable
 	Bool isValidObjectTarget(const Player* sourcePlayer, const Object* targetObj) const;
 	Bool isValidObjectTarget(const Object* sourceObj, const Object* targetObj) const;
 	Bool isValidObjectTarget(const Drawable* source, const Drawable* target) const;
-	
+
 	// Note: It is perfectly valid for either (or both!) of targetObj and targetLocation to be NULL.
 	// This is a convenience function to make several calls to other functions.
 	Bool isValidToUseOn(const Object *sourceObj, const Object *targetObj, const Coord3D *targetLocation, CommandSourceType commandSource) const;
@@ -355,20 +352,20 @@ class CommandButton : public Overridable
 
 	// bleah. shouldn't be const, but is. sue me. (srj)
 	void copyImagesFrom( const CommandButton *button, Bool markUIDirtyIfChanged ) const;
-	
+
 	// bleah. shouldn't be const, but is. sue me. (Kris) -snork!
 	void copyButtonTextFrom( const CommandButton *button, Bool shortcutButton, Bool markUIDirtyIfChanged ) const;
 
 	// bleah. shouldn't be const, but is. sue me. (srj)
 	void setFlashCount(Int c) const { m_flashCount = c; }
-	
+
 	// only for ControlBar!
 	void friend_addToList(CommandButton** list) {	m_next = *list;	*list = this; }
 	CommandButton* friend_getNext() { return m_next; }
 
 private:
 	AsciiString										m_name;												///< template name
-	GUICommandType								m_command;										///< type of command this button 
+	GUICommandType								m_command;										///< type of command this button
 	CommandButton*								m_next;
 	UnsignedInt										m_options;										///< command options (see CommandOption enum)
 	const ThingTemplate*					m_thingTemplate;							///< for commands that use thing templates in command data
@@ -381,7 +378,7 @@ class CommandButton : public Overridable
 	// bleah. shouldn't be mutable, but is. sue me. (Kris) -snork!
 	mutable AsciiString										m_textLabel;									///< string manager text label
 	mutable AsciiString										m_descriptionLabel;						///< The description of the current command, read in from the ini
-	
+
 	AsciiString										m_purchasedLabel;							///< Description for the current command if it has already been purchased.
 	AsciiString										m_conflictingLabel;						///< Description for the current command if it can't be selected due to multually-exclusive choice.
 	WeaponSlotType								m_weaponSlot;									///< for commands that refer to a weapon slot
@@ -405,7 +402,7 @@ class CommandButton : public Overridable
 //-------------------------------------------------------------------------------------------------
 enum { MAX_COMMANDS_PER_SET = 18 };  // user interface max is 14 (but internally it's 18 for script only buttons!)
 enum { MAX_RIGHT_HUD_UPGRADE_CAMEOS = 5};
-enum { 
+enum {
 			 MAX_PURCHASE_SCIENCE_RANK_1 = 4,
 			 MAX_PURCHASE_SCIENCE_RANK_3 = 15,
 			 MAX_PURCHASE_SCIENCE_RANK_8 = 4,
@@ -451,8 +448,6 @@ class SideSelectWindowData
 public:
 	SideSelectWindowData(void)
 	{
-		//Added By Sadullah Nader
-		//Initializations
 		generalSpeak = NULL;
 		m_currColor = 0;
 		m_gereralsNameWin = NULL;
@@ -476,10 +471,9 @@ class SideSelectWindowData
 		m_upgradeLabel3Win = NULL;
 		m_upgradeLabel4Win = NULL;
 		sideWindow = NULL;
-		//
 	}
 	~SideSelectWindowData(void);
-	
+
 	void init( ScienceType science, GameWindow *control );
 	void reset( void );
 	void update( void );
@@ -505,7 +499,7 @@ class SideSelectWindowData
 	GameWindow *m_gereralsNameWin;
 	GameWindow *m_sideNameWin;
 
-	
+
 	GameWindow *m_upgradeLabel1Win;
 	GameWindow *m_upgradeLabel2Win;
 	GameWindow *m_upgradeLabel3Win;
@@ -515,7 +509,7 @@ class SideSelectWindowData
 	GameWindow *m_upgradeImage2Win;
 	GameWindow *m_upgradeImage3Win;
 	GameWindow *m_upgradeImage4Win;
-	
+
 	Image *m_upgradeImage1;
 	Image *m_upgradeImage2;
 	Image *m_upgradeImage3;
@@ -523,7 +517,7 @@ class SideSelectWindowData
 
 	IRegion2D m_leftLineFromButton;
 	IRegion2D m_rightLineFromButton;
-	
+
 	IRegion2D m_upgradeLine1a;
 	IRegion2D m_upgradeLine2a;
 	IRegion2D m_upgradeLine3a;
@@ -533,7 +527,7 @@ class SideSelectWindowData
 	IRegion2D m_upgradeLine2;
 	IRegion2D m_upgradeLine3;
 	IRegion2D m_upgradeLine4;
-	
+
 	IRegion2D m_upgradeLine1MidReg;
 	IRegion2D m_upgradeLine2MidReg;
 	IRegion2D m_upgradeLine3MidReg;
@@ -548,12 +542,12 @@ class SideSelectWindowData
 	ICoord2D m_line1End;
 	ICoord2D m_line2End;
 
-	
+
 	ICoord2D m_upgradeLine1Mid;
 	ICoord2D m_upgradeLine2Mid;
 	ICoord2D m_upgradeLine3Mid;
 	ICoord2D m_upgradeLine4Mid;
-	
+
 	ICoord2D m_upgradeLine1End;
 	ICoord2D m_upgradeLine2End;
 	ICoord2D m_upgradeLine3End;
@@ -588,8 +582,6 @@ enum ControlBarContext CPP_11(: Int)
 	CB_CONTEXT_OBSERVER_INFO,					///< for when we want to populate the player info
 	CB_CONTEXT_OBSERVER_LIST,					///< for when we want to update the observer list
 	CB_CONTEXT_OCL_TIMER,							///< Countdown for OCL spewers
-
-	NUM_CB_CONTEXTS
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -642,7 +634,7 @@ enum ControlBarStages CPP_11(: Int)
 	CONTROL_BAR_STAGE_SQUISHED,				///< squished just for expeirenced players
 	CONTROL_BAR_STAGE_LOW,						///< control bar a la minimalist
 	CONTROL_BAR_STAGE_HIDDEN,					///< yo, where be da control bar at?
-	
+
 	MAX_CONTROL_BAR_STAGES
 };
 
@@ -674,14 +666,14 @@ class ControlBar : public SubsystemInterface
 
 	/** if this button is part of the context sensitive command system, process a button click
 	the gadgetMessage is either a GBM_SELECTED or GBM_SELECTED_RIGHT */
-	CBCommandStatus processContextSensitiveButtonClick( GameWindow *button, 
+	CBCommandStatus processContextSensitiveButtonClick( GameWindow *button,
 																											GadgetGameMessage gadgetMessage );
 
 	/** if this button is part of the context sensitive command system, process the Transition
 	gadgetMessage is either a GBM_MOUSE_LEAVING or GBM_MOUSE_ENTERING */
-	CBCommandStatus processContextSensitiveButtonTransition( GameWindow *button, 
+	CBCommandStatus processContextSensitiveButtonTransition( GameWindow *button,
 																											GadgetGameMessage gadgetMessage );
-	
+
 
 	/// is the drawable the currently selected drawable for the context sensitive UI?
 	Bool isDrivingContextUI( Drawable *draw ) const { return draw == m_currentSelectedDrawable; }
@@ -704,7 +696,9 @@ class ControlBar : public SubsystemInterface
 	void showSpecialPowerShortcut( void );
 	void hideSpecialPowerShortcut( void );
 	void animateSpecialPowerShortcut( Bool isOn );
-	
+
+	void setFullViewportHeight();
+	void setScaledViewportHeight();
 
 	/// set the control bar to the proper scheme based off a player template that's passed in
 	ControlBarSchemeManager *getControlBarSchemeManager( void ) { return m_controlBarSchemeManager; }
@@ -717,7 +711,7 @@ class ControlBar : public SubsystemInterface
 
 	/// We need to sometime change what the images look like depending on what scheme we're using
 	void updateRightHUDImage( const Image *image );
-	
+
 	/// We need to be able to update the command marker image based on which scheme we're using.
 	void updateCommandMarkerImage( const Image *image );
 	void updateSlotExitImage( const Image *image);
@@ -737,12 +731,21 @@ class ControlBar : public SubsystemInterface
 
 	// Initialize the Observer controls Must be called after we've already loaded the window
 	void initObserverControls( void );
-	void setObserverLookAtPlayer (Player *p) { m_observerLookAtPlayer = p;}
-	Player *getObserverLookAtPlayer (void ) { return m_observerLookAtPlayer;}
 	void populateObserverInfoWindow ( void );
 	void populateObserverList( void );
 	Bool isObserverControlBarOn( void ) { return m_isObserverCommandBar;}
-	
+
+	void setObserverLookAtPlayer (Player *player); ///< Sets the looked at player. Used to present information about the player.
+	Player *getObserverLookAtPlayer (void ) const { return m_observerLookAtPlayer; } ///< Returns the looked at player. Can return null.
+
+	void setObservedPlayer(Player *player); ///< Sets the observed player. Used to present the game world as if that player was the local player.
+	Player *getObservedPlayer() const { return m_observedPlayer; } ///< Return the observed player. Can return null.
+
+	/// Returns the currently viewed player. May return NULL if no player is selected while observing.
+	Player* getCurrentlyViewedPlayer();
+	/// Returns the relationship with the currently viewed player. May return NEUTRAL if no player is selected while observing.
+	Relationship getCurrentlyViewedPlayerRelationship(const Team* team);
+
 //	ControlBarResizer *getControlBarResizer( void ) {return m_controlBarResizer;}
 
 	// Functions for repositioning/resizing the control bar
@@ -767,7 +770,7 @@ class ControlBar : public SubsystemInterface
 	void drawTransitionHandler( void );
 	const Image *getArrowImage( void ){ return m_genArrow;	}
 	void setArrowImage( const Image *arrowImage ){ m_genArrow = arrowImage;	}
-	
+
 	void initSpecialPowershortcutBar( Player *player);
 
 	void triggerRadarAttackGlow( void );
@@ -778,7 +781,7 @@ class ControlBar : public SubsystemInterface
 
 protected:
 	void updateRadarAttackGlow ( void );
-	
+
 	void setDefaultControlBarConfig( void );
 	void setSquishedControlBarConfig( void );
 	void setLowControlBarConfig( void );
@@ -786,7 +789,7 @@ class ControlBar : public SubsystemInterface
 
 	/// find existing command button if present
 	CommandButton* findNonConstCommandButton( const AsciiString& name );
-	
+
 	/// allocate a new command button, link to list, initialize to default, and return
 	CommandButton *newCommandButton( const AsciiString& name );
 	CommandButton *newCommandButtonOverride( CommandButton *buttonToOverride );
@@ -848,12 +851,12 @@ class ControlBar : public SubsystemInterface
 	void updateContextBeacon( void );
 	void updateContextUnderConstruction( void );
 	void updateContextOCLTimer( void );
-	
+
 	// the following methods are for the special power shortcut window
 
 	void populateSpecialPowerShortcut( Player *player);
 	void updateSpecialPowerShortcut( void );
-	
+
 	static const Image* calculateVeterancyOverlayForThing( const ThingTemplate *thingTemplate );
 	static const Image* calculateVeterancyOverlayForObject( const Object *obj );
 
@@ -889,7 +892,7 @@ class ControlBar : public SubsystemInterface
 	Drawable *m_currentSelectedDrawable;					///< currently selected drawable for the context sensitive interface
 	ControlBarContext m_currContext;							///< our current displayed context
 
-	DrawableID m_rallyPointDrawableID;						///< rally point drawable for visual rally point 
+	DrawableID m_rallyPointDrawableID;						///< rally point drawable for visual rally point
 
 	Real m_displayedConstructPercent;							///< construct percent last displayed to user
 	UnsignedInt m_displayedOCLTimerSeconds;				///< OCL Timer seconds remaining last displayed to user
@@ -902,7 +905,7 @@ class ControlBar : public SubsystemInterface
 	GameWindow *m_rightHUDUnitSelectParent;
 
 	GameWindow *m_communicatorButton;             ///< button for the communicator
-	
+
 	WindowLayout *m_scienceLayout;								///< the Science window layout
 	GameWindow *m_sciencePurchaseWindowsRank1[ MAX_PURCHASE_SCIENCE_RANK_1 ];			///< command window controls for easy access
 	GameWindow *m_sciencePurchaseWindowsRank3[ MAX_PURCHASE_SCIENCE_RANK_3 ];			///< command window controls for easy access
@@ -920,7 +923,7 @@ class ControlBar : public SubsystemInterface
 	const CommandButton *m_commonCommands[ MAX_COMMANDS_PER_SET ];	///< shared commands we will use for multi-selection
 
 		// removed from multiplayer branch
-	//GameWindow *m_commandMarkers[ MAX_COMMANDS_PER_SET ];			///< When we don't have a command, they want to show an image	
+	//GameWindow *m_commandMarkers[ MAX_COMMANDS_PER_SET ];			///< When we don't have a command, they want to show an image
 // removed from multiplayer branch
 	//void showCommandMarkers( void );													///< function that compare's what's being shown in m_commandWindows and shows the ones that are hidden.
 
@@ -964,11 +967,12 @@ class ControlBar : public SubsystemInterface
 
 	Color m_buildUpClockColor;
 
-	Bool m_isObserverCommandBar;												///< If this is true, the command bar behaves greatly differnt
+	Bool m_isObserverCommandBar;												///< If this is true, the command bar behaves greatly different
 	Player *m_observerLookAtPlayer;											///< The current player we're looking at, Null if we're not looking at anyone.
+	Player *m_observedPlayer;														///< The current player we're observing, Null if we're not observing anyone.
 
 	WindowLayout *m_buildToolTipLayout;										///< The window that will slide on/display tooltips
-	Bool m_showBuildToolTipLayout;											///< every frame we test to see if we aregoing to continue showing this or not.
+	Bool m_showBuildToolTipLayout;											///< every frame we test to see if we are going to continue showing this or not.
 public:
 	void showBuildTooltipLayout( GameWindow *cmdButton );
 	void hideBuildTooltipLayout( void );
@@ -984,7 +988,7 @@ class ControlBar : public SubsystemInterface
 	Color m_commandButtonBorderActionColor;
 	Color m_commandButtonBorderUpgradeColor;
 	Color m_commandButtonBorderSystemColor;
-	
+
 	Color m_commandBarBorderColor;
 
 	void setCommandBarBorder( GameWindow *button, CommandButtonMappedBorderType type);
@@ -1019,24 +1023,21 @@ class ControlBar : public SubsystemInterface
 
 	Bool m_genStarFlash;
 	Int m_lastFlashedAtPointValue;
-	
+
 	ICoord2D m_controlBarForegroundMarkerPos;
 	ICoord2D m_controlBarBackgroundMarkerPos;
-	
+
 	Bool m_radarAttackGlowOn;
 	Int m_remainingRadarAttackGlowFrames;
 	GameWindow *m_radarAttackGlowWindow;
 
-#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG )
+#if defined(RTS_DEBUG)
 	UnsignedInt m_lastFrameMarkedDirty;
 	UnsignedInt m_consecutiveDirtyFrames;
 #endif
 //	ControlBarResizer *m_controlBarResizer;
 
-}; 
+};
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern ControlBar *TheControlBar;
-
-#endif  // end __CONTROLBAR_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h
index a20f5a6d117..089d52d7fad 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarResizer.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,17 +37,14 @@
 //	Filename: 	ControlBarResizer.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CONTROL_BAR_RESIZER_H_
-#define __CONTROL_BAR_RESIZER_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -79,7 +76,7 @@ class ControlBarResizer
 public:
 	ControlBarResizer( void );
 	~ControlBarResizer( void );
-	
+
 	void init( void );
 
 	// parse Functions for the INI file
@@ -88,7 +85,7 @@ class ControlBarResizer
 
 	ResizerWindow *findResizerWindow( AsciiString name ); ///< attempt to find the control bar scheme by it's name
 	ResizerWindow *newResizerWindow( AsciiString name );	///< create a new control bar scheme and return it.
-	
+
 	void sizeWindowsDefault( void );
 	void sizeWindowsAlt( void );
 
@@ -103,5 +100,3 @@ class ControlBarResizer
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __CONTROL_BAR_RESIZER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h
index 907c6d0636a..19f4db31055 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarScheme.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Apr 2002
@@ -37,17 +37,14 @@
 //	Filename: 	ControlBarScheme.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CONTROL_BAR_SCHEME_H_
-#define __CONTROL_BAR_SCHEME_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -86,7 +83,7 @@ class ControlBarSchemeImage
 
 	// m_layer is where the image will get drawn,  everything in layer 0-2 gets drawn during the forground draw
 	// the layers 3-5 gets drawn during the background draw
-	Int m_layer; //layer means how deep the image will be drawn, it's a number between 0-5 with 0 being on top 	
+	Int m_layer; //layer means how deep the image will be drawn, it's a number between 0-5 with 0 being on top
 };
 
 // Class that will hold the information needed for the animations
@@ -128,10 +125,10 @@ class ControlBarScheme
 public:
 	ControlBarScheme( void );
 	~ControlBarScheme( void );
-	
+
 	void init( void );
 	void update( void );
-	void drawForeground( Coord2D multi, ICoord2D offset );	///< draw function to be called within a w3d draw procedure for the foreground 
+	void drawForeground( Coord2D multi, ICoord2D offset );	///< draw function to be called within a w3d draw procedure for the foreground
 	void drawBackground( Coord2D multi, ICoord2D offset );	///< draw function to be called within a w3d draw procedure for the background
 	void reset( void );
 
@@ -142,11 +139,11 @@ class ControlBarScheme
 
 	AsciiString m_name;												///< it's name
 	ICoord2D m_ScreenCreationRes;							///< Used to determine what screen res this will look the best on
-	AsciiString m_side;												///< contain what faction type this command bar was made for (used when selecting command bar by template	
+	AsciiString m_side;												///< contain what faction type this command bar was made for (used when selecting command bar by template
 	Image *m_buttonQueueImage;								///< We'll probably want each one to have it's own image.
 	Image *m_rightHUDImage;										///< We'll probably want each one to have it's own right HUD image.
 	Color m_buildUpClockColor;								///< we can setup the color for the buildup clock if we want
-	
+
 	Color m_borderBuildColor;									///< we can setup the color for the button border colors
 	Color m_borderActionColor;								///< we can setup the color for the button border colors
 	Color m_borderUpgradeColor;								///< we can setup the color for the button border colors
@@ -254,20 +251,20 @@ class ControlBarSchemeManager
 
 	void init( void );						///< Initialize from the INI files
 	void update( void );					///< move the animations if we have any
-	void drawForeground( ICoord2D offset );	///< draw function to be called within a w3d draw procedure for the foreground 
+	void drawForeground( ICoord2D offset );	///< draw function to be called within a w3d draw procedure for the foreground
 	void drawBackground( ICoord2D offset );	///< draw function to be called within a w3d draw procedure for the background
 
 	void setControlBarSchemeByPlayer(Player *p);																				///< Based off the playerTemplate, pick the right scheme for the control bar
 	void setControlBarSchemeByPlayerTemplate( const PlayerTemplate *pt, Bool useSmall = FALSE);
 	void setControlBarScheme(AsciiString schemeName);																										///< SchemeName must be a valid INI entry
-	
+
 	// parse Functions for the INI file
 	const FieldParse *getFieldParse() const { return m_controlBarSchemeFieldParseTable; }								///< returns the parsing fields
 	static const FieldParse m_controlBarSchemeFieldParseTable[];																				///< the parse table
 	static void parseImagePart( INI* ini, void *instance, void *store, const void *userData );					///< Parse the image part of the INI file
 	static void parseAnimatingPart( INI* ini, void *instance, void *store, const void *userData );			///< Parse the animation part of the INI file
-	static void parseAnimatingPartImage( INI* ini, void *instance, void *store, const void *userData );	///< parse the image part of the animation part :) 
-	
+	static void parseAnimatingPartImage( INI* ini, void *instance, void *store, const void *userData );	///< parse the image part of the animation part :)
+
 	ControlBarScheme *findControlBarScheme( AsciiString name ); ///< attempt to find the control bar scheme by it's name
 	ControlBarScheme *newControlBarScheme( AsciiString name );	///< create a new control bar scheme and return it.
 
@@ -275,8 +272,8 @@ class ControlBarSchemeManager
 
 private:
 	ControlBarScheme *m_currentScheme;													///< the current scheme that everythign uses
-	Coord2D m_multiplyer;																	
-	
+	Coord2D m_multiplyer;
+
 	typedef std::list< ControlBarScheme* > ControlBarSchemeList;			///< list of control bar schemes
 	ControlBarSchemeList m_schemeList;
 
@@ -289,5 +286,3 @@ class ControlBarSchemeManager
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __CONTROL_BAR_SCHEME_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h
index e77ab5ebe40..a4a1782e84c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h
@@ -24,12 +24,12 @@
 
 // FILE: Credits.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Dec 2002
@@ -37,7 +37,7 @@
 //	Filename: 	Credits.h
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	header file for the credits
 //
 //-----------------------------------------------------------------------------
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __CREDITS_H_
-#define __CREDITS_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -67,24 +64,26 @@ class DisplayString;
 enum
 {
 CREDIT_STYLE_TITLE = 0,
-CREDIT_STYLE_POSITION, 
+CREDIT_STYLE_POSITION,
 CREDIT_STYLE_NORMAL,
 CREDIT_STYLE_COLUMN,
 CREDIT_STYLE_BLANK,			///< Keep this second to last
-MAX_CREDIT_STYLES				///< Keep this last
+
+MAX_CREDIT_STYLES
 };
 
 enum{ CREDIT_SPACE_OFFSET = 2 };
 
-static const LookupListRec CreditStyleNames[] = 
+static const LookupListRec CreditStyleNames[] =
 {
 	{ "TITLE",					CREDIT_STYLE_TITLE },
 	{ "MINORTITLE",				CREDIT_STYLE_POSITION },
 	{ "NORMAL",			CREDIT_STYLE_NORMAL },
 	{ "COLUMN",				CREDIT_STYLE_COLUMN },
-	
-	{ NULL, 0	}// keep this last!
+	// CREDIT_STYLE_BLANK
+	{ NULL, 0	}
 };
+static_assert(ARRAY_SIZE(CreditStyleNames) == MAX_CREDIT_STYLES, "Incorrect array size");
 
 
 class CreditsLine
@@ -124,7 +123,7 @@ class CreditsManager: public SubsystemInterface
 	static const FieldParse m_creditsFieldParseTable[];																				///< the parse table
 	static void parseBlank( INI* ini, void *instance, void *store, const void *userData );					///< Parse the image part of the INI file
 	static void parseText( INI* ini, void *instance, void *store, const void *userData );					///< Parse the image part of the INI file
-	
+
 	Bool isFinished( void ) { return m_isFinished;	}
 	void addBlank( void );
 	void addText( AsciiString text );
@@ -145,7 +144,7 @@ class CreditsManager: public SubsystemInterface
 	Color			m_titleColor;
 	Color			m_positionColor;
 	Color			m_normalColor;
-	
+
 	Int m_currentStyle;
 
 	Bool m_isFinished;
@@ -163,4 +162,3 @@ class CreditsManager: public SubsystemInterface
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 extern CreditsManager *TheCredits;
-#endif // __CREDITS_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h
index 9d1e61c7899..98dccebbf2d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    Generals
@@ -43,16 +43,12 @@
 
 #pragma once
 
-#ifndef __GAMECLIENT_DEBUGDISPLAY_H
-#define __GAMECLIENT_DEBUGDISPLAY_H
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "Lib/BaseType.h"
-#include <stdio.h>
+#include <Utility/stdio_adapter.h>
 
 
 //----------------------------------------------------------------------------
@@ -67,7 +63,7 @@
 
 
 //===============================
-// DebugDisplayInterface 
+// DebugDisplayInterface
 //===============================
 
 class DebugDisplayInterface
@@ -83,7 +79,6 @@ class DebugDisplayInterface
 			RED,
 			GREEN,
 			BLUE,
-			NUM_COLORS
 		};
 
 		virtual ~DebugDisplayInterface() {};
@@ -106,7 +101,7 @@ class DebugDisplayInterface
 
 
 //===============================
-// DebugDisplay 
+// DebugDisplay
 //===============================
 
 class DebugDisplay : public DebugDisplayInterface
@@ -142,15 +137,11 @@ class DebugDisplay : public DebugDisplayInterface
 
 // displayers
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 extern void AudioDebugDisplay( DebugDisplayInterface *debugDisplay, void *userData, FILE *fp );
 #endif
 
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-
-#endif // __GAMECLIENT_DEBUGDISPLAY_H
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h
index 4248f51fe6f..83547b01d9e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h
@@ -28,13 +28,8 @@
 
 #pragma once
 
-#ifndef __DIPLOMACY_H__
-#define __DIPLOMACY_H__
-
 void PopulateInGameDiplomacyPopup( void );
 void UpdateDiplomacyBriefingText(AsciiString newText, Bool clear);
 
 typedef std::list<AsciiString> BriefingList;
 BriefingList* GetBriefingTextList(void);
-
-#endif // #ifndef __DIPLOMACY_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h
index bf120b7cd78..7cbcde1bac1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __DISCONNECTDIALOG_H
-#define __DISCONNECTDIALOG_H
-
 #include "GameNetwork/DisconnectManager.h"
 
 enum DisconnectMenuStateType CPP_11(: Int) {
@@ -69,15 +65,13 @@ class DisconnectMenu {
 	DisconnectManager *m_disconnectManager;		///< For retrieving status updates from the disconnect manager.
 	DisconnectMenuStateType m_menuState;			///< The current state of the menu screen.
 
-	static const char *m_playerNameTextControlNames[MAX_SLOTS];	///< names of the player name controls in the window.
-	static const char *m_playerTimeoutTextControlNames[MAX_SLOTS]; ///< names of the timeout controls in the window.
-	static const char *m_playerVoteButtonControlNames[MAX_SLOTS];	///< names of the vote button controls in the window.
-	static const char *m_playerVoteCountControlNames[MAX_SLOTS];	///< names of the vote count static text controls in the window.
-	static const char *m_packetRouterTimeoutControlName;	///< name of the packet router timeout control window.
-	static const char *m_packetRouterTimeoutLabelControlName; ///< name of the packet router timeout label control window.
-	static const char *m_textDisplayControlName;	///< name of the text display listbox control window.
+	static const char *const m_playerNameTextControlNames[MAX_SLOTS];	///< names of the player name controls in the window.
+	static const char *const m_playerTimeoutTextControlNames[MAX_SLOTS]; ///< names of the timeout controls in the window.
+	static const char *const m_playerVoteButtonControlNames[MAX_SLOTS];	///< names of the vote button controls in the window.
+	static const char *const m_playerVoteCountControlNames[MAX_SLOTS];	///< names of the vote count static text controls in the window.
+	static const char *const m_packetRouterTimeoutControlName;	///< name of the packet router timeout control window.
+	static const char *const m_packetRouterTimeoutLabelControlName; ///< name of the packet router timeout label control window.
+	static const char *const m_textDisplayControlName;	///< name of the text display listbox control window.
 };
 
 extern DisconnectMenu *TheDisconnectMenu;
-
-#endif // #ifndef __DISCONNECTDIALOG_H
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h
index 92775c7e36a..799633ed043 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h
@@ -28,16 +28,10 @@
 
 #pragma once
 
-#ifndef _GAME_DISPLAY_H_
-#define _GAME_DISPLAY_H_
-
-#include <stdio.h>
 #include "Common/SubsystemInterface.h"
-#include "View.h"
 #include "GameClient/Color.h"
 #include "GameClient/GameFont.h"
-
-class View;
+#include "GameClient/View.h"
 
 struct ShroudLevel
 {
@@ -78,7 +72,7 @@ class Display : public SubsystemInterface
 
 	//---------------------------------------------------------------------------------------
 	// Display attribute methods
-	virtual void setWidth( UnsignedInt width );										///< Sets the width of the display		
+	virtual void setWidth( UnsignedInt width );										///< Sets the width of the display
 	virtual void setHeight( UnsignedInt height );									///< Sets the height of the display
 	virtual UnsignedInt getWidth( void ) { return m_width; }			///< Returns the width of the display
 	virtual UnsignedInt getHeight( void ) { return m_height; }		///< Returns the height of the display
@@ -92,7 +86,7 @@ class Display : public SubsystemInterface
  	virtual void setGamma(Real gamma, Real bright, Real contrast, Bool calibrate) {};
 	virtual Bool testMinSpecRequirements(Bool *videoPassed, Bool *cpuPassed, Bool *memPassed,StaticGameLODLevel *idealVideoLevel=NULL, Real *cpuTime=NULL) {*videoPassed=*cpuPassed=*memPassed=true; return true;}
 	virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) = 0;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void dumpAssetUsage(const char* mapname) = 0;
 #endif
 
@@ -109,6 +103,7 @@ class Display : public SubsystemInterface
 
 	virtual void drawViews( void );																///< Render all views of the world
 	virtual void updateViews ( void );															///< Updates state of world views
+	virtual void stepViews(); ///< Update views for every fixed time step
 
 	virtual VideoBuffer*	createVideoBuffer( void ) = 0;							///< Create a video buffer that can be used for this display
 
@@ -118,17 +113,18 @@ class Display : public SubsystemInterface
 	virtual	Bool isClippingEnabled( void ) = 0;
 	virtual	void enableClipping( Bool onoff ) = 0;
 
+	virtual void step() {}; ///< Do one fixed time step
 	virtual void draw( void );																		///< Redraw the entire display
 	virtual void setTimeOfDay( TimeOfDay tod ) = 0;								///< Set the time of day for this display
-	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real attenuationWidth, 
+	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real attenuationWidth,
 																 UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE
 																 ) = 0;
 
 	/// draw a line on the display in pixel coordinates with the specified color
-	virtual void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
 												 Real lineWidth, UnsignedInt lineColor ) = 0;
 	/// draw a line on the display in pixel coordinates with the specified 2 colors
-	virtual void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
 												 Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) = 0;
 	/// draw a rect border on the display in pixel coordinates with the specified color
 	virtual void drawOpenRect( Int startX, Int startY, Int width, Int height,
@@ -136,20 +132,21 @@ class Display : public SubsystemInterface
 	/// draw a filled rect on the display in pixel coords with the specified color
 	virtual void drawFillRect( Int startX, Int startY, Int width, Int height,
 														 UnsignedInt color ) = 0;
-	
+
 	/// Draw a percentage of a rectange, much like a clock
 	virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) = 0;
 	virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) = 0;
 
 	/// draw an image fit within the screen coordinates
-	virtual void drawImage( const Image *image, Int startX, Int startY, 
+	virtual void drawImage( const Image *image, Int startX, Int startY,
 													Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA) = 0;
 
 	/// draw a video buffer fit within the screen coordinates
-	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY, 
+	virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) = 0;
+	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY,
 													Int endX, Int endY ) = 0;
 
-	/// FullScreen video playback 
+	/// FullScreen video playback
 	virtual void playLogoMovie( AsciiString movieName, Int minMovieLength, Int minCopyrightLength );
 	virtual void playMovie( AsciiString movieName );
 	virtual void stopMovie( void );
@@ -163,7 +160,7 @@ class Display : public SubsystemInterface
 	virtual void clearShroud() = 0;														///< empty the entire shroud
 	virtual void setBorderShroudLevel(UnsignedByte level) = 0;	///<color that will appear in unused border terrain.
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void dumpModelAssets(const char *path) = 0;	///< dump all used models/textures to a file.
 #endif
 	virtual void preloadModelAssets( AsciiString model ) = 0;	///< preload model asset
@@ -181,6 +178,7 @@ class Display : public SubsystemInterface
 	virtual void setCinematicTextFrames( Int frames ) { m_cinematicTextFrames = frames; }
 
 	virtual Real getAverageFPS( void ) = 0;	///< returns the average FPS.
+	virtual Real getCurrentFPS( void ) = 0;	///< returns the current FPS.
 	virtual Int getLastFrameDrawCalls( void ) = 0;  ///< returns the number of draw calls issued in the previous frame
 
 protected:
@@ -220,10 +218,8 @@ extern Display *TheDisplay;
 
 extern void StatDebugDisplay( DebugDisplayInterface *dd, void *, FILE *fp = NULL );
 
-//Added By Saad
 //Necessary for display resolution confirmation dialog box
 //Holds the previous and current display settings
-
 typedef struct _DisplaySettings
 {
 	Int xRes;  //Resolution width
@@ -231,6 +227,3 @@ typedef struct _DisplaySettings
 	Int bitDepth; //Color Depth
 	Bool windowed; //Window mode TRUE: we're windowed, FALSE: we're not windowed
 } DisplaySettings;
-
-
-#endif // _GAME_DISPLAY_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h
index e0ca7336c18..7c206d5b256 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h
@@ -24,12 +24,12 @@
 
 // FILE: DisplayString.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __DISPLAYSTRING_H_
-#define __DISPLAYSTRING_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -100,6 +97,9 @@ class DisplayString : public MemoryPoolObject
 	virtual void setClipRegion( IRegion2D *region );  ///< clip text in this region
 
 	virtual void removeLastChar( void );			///< remove the last character
+	virtual void truncateBy(const Int charCount);	///< remove the last charCount characters
+	virtual void truncateTo(const Int maxLength);	///< remove characters, if needed, until the string is maxLength long excluding null terminator
+
 	virtual void appendChar( WideChar c );		///< append character to end
 
 	DisplayString *next( void );							///< return next string
@@ -108,11 +108,11 @@ class DisplayString : public MemoryPoolObject
 
 	UnicodeString m_textString;
 	GameFont *m_font;			 ///< font to display this string with
-	
+
 	DisplayString *m_next;  ///< for the display string factory list ONLY
 	DisplayString *m_prev;	///< for the display string factory list ONLY
 
-};  // end DisplayString
+};
 
 ///////////////////////////////////////////////////////////////////////////////
 // INLINING ///////////////////////////////////////////////////////////////////
@@ -126,6 +126,3 @@ inline void DisplayString::notifyTextChanged( void ) {}
 inline DisplayString *DisplayString::next( void ) { return m_next; }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __DISPLAYSTRING_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h
index 08b39b96609..bc3b70d56a1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DISPLAYSTRINGMANAGER_H_
-#define __DISPLAYSTRINGMANAGER_H_
-
 #include "Common/SubsystemInterface.h"
 #include "GameClient/DisplayString.h"
 
@@ -66,6 +63,3 @@ class DisplayStringManager : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern DisplayStringManager *TheDisplayStringManager;  ///< singleton extern
-
-#endif // __DISPLAYSTRINGMANAGER_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h
index f3a366a8922..7e2cf1a5ff6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h
@@ -27,8 +27,6 @@
 // Author: John K. McDonald, March 2002
 
 #pragma once
-#ifndef _H_DRAWGROUPINFO_
-#define _H_DRAWGROUPINFO_
 
 struct DrawGroupInfo
 {
@@ -43,14 +41,14 @@ struct DrawGroupInfo
 	Int m_dropShadowOffsetX;
 	Int m_dropShadowOffsetY;
 
-	union 
+	union
 	{
 		Int m_pixelOffsetX;
 		Real m_percentOffsetX;
 	};
 	Bool m_usingPixelOffsetX;
 
-	union 
+	union
 	{
 		Int m_pixelOffsetY;
 		Real m_percentOffsetY;
@@ -58,11 +56,9 @@ struct DrawGroupInfo
 	Bool m_usingPixelOffsetY;
 
 	DrawGroupInfo();
-	
+
 	static const FieldParse s_fieldParseTable[];		///< the parse table for INI definition
 	const FieldParse *getFieldParse( void ) const { return s_fieldParseTable; }
 };
 
 extern DrawGroupInfo *TheDrawGroupInfo;
-
-#endif /* _H_DRAWGROUPINFO */
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h
index 5f1bb3c48f2..b66eb7dc96a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h
@@ -27,8 +27,6 @@
 // Author: Michael S. Booth, March 2001
 
 #pragma once
-#ifndef _DRAWABLE_H_
-#define _DRAWABLE_H_
 
 #include "Common/AudioEventRTS.h"
 #include "Common/GameType.h"
@@ -58,7 +56,7 @@ class Image;
 class DynamicAudioEventInfo;
 enum BodyDamageType CPP_11(: Int);
 
-// this is a very worthwhile performance win. left conditionally defined for now, just 
+// this is a very worthwhile performance win. left conditionally defined for now, just
 // in case, but probably should be made permanent soon. (srj)
 #define DIRTY_CONDITION_FLAGS
 
@@ -70,7 +68,7 @@ enum BodyDamageType CPP_11(: Int);
 
 //-----------------------------------------------------------------------------
 //@TODO -- The drawable icon system needs to be implemented in a proper manner -- KM
-//				 Fact 1: Every drawable in the world shouldn't have to have a pointer 
+//				 Fact 1: Every drawable in the world shouldn't have to have a pointer
 //				 and frame counter for every possible icon type. It should be a dynamic vector.
 //				 Fact 2: It's polling every frame for every object on screen for every possible icon condition...
 // KM : I moved this into Drawable.cpp so I don't have to recompile the entire project
@@ -82,9 +80,8 @@ enum DrawableIconType CPP_11(: Int)
 /** NOTE: This enum MUST appear in the same order as TheDrawableIconNames array to be
 	* indexed correctly using that array */
 	ICON_INVALID = -1,
-	ICON_FIRST = 0,
 
-	ICON_DEFAULT_HEAL = ICON_FIRST,
+	ICON_DEFAULT_HEAL,
 	ICON_STRUCTURE_HEAL,
 	ICON_VEHICLE_HEAL,
 #ifdef ALLOW_DEMORALIZE
@@ -103,27 +100,28 @@ enum DrawableIconType CPP_11(: Int)
 	ICON_ENTHUSIASTIC_SUBLIMINAL,
 	ICON_CARBOMB,
 
-	MAX_ICONS									///< keep this last
+	MAX_ICONS,
+	ICON_FIRST = 0,
 };
 
 //-----------------------------------------------------------------------------
 class DrawableIconInfo : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DrawableIconInfo, "DrawableIconInfo" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DrawableIconInfo, "DrawableIconInfo" )
 public:
 	Anim2D*								m_icon[MAX_ICONS];
 	UnsignedInt						m_keepTillFrame[MAX_ICONS];
 
 	DrawableIconInfo();
 	//~DrawableIconInfo();
-	
+
 	void clear();
 	void killIcon(DrawableIconType t);
 
 };
 
 //-----------------------------------------------------------------------------
-struct TWheelInfo 
+struct TWheelInfo
 {
 	Real m_frontLeftHeightOffset;			 ///< Height offsets for tires due to suspension sway
 	Real m_frontRightHeightOffset;
@@ -137,7 +135,7 @@ struct TWheelInfo
 //-----------------------------------------------------------------------------
 class DrawableLocoInfo : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DrawableLocoInfo, "DrawableLocoInfo" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DrawableLocoInfo, "DrawableLocoInfo" )
 public:
 	Real m_pitch;								///< pitch of the entire drawable
 	Real m_pitchRate;						///< rate of change of pitch
@@ -161,18 +159,18 @@ class DrawableLocoInfo : public MemoryPoolObject
 //-----------------------------------------------------------------------------
 //* TintEnvelope handles the fading of the tint color up, down stable etc...
 //* assumes that 0,0,0, is the color for the AT REST state, used as decay target
-//* works like an ADSR envelope, 
-//* except that SUSTAIN and RELEASE are randomly (or never) triggered, externally 
+//* works like an ADSR envelope,
+//* except that SUSTAIN and RELEASE are randomly (or never) triggered, externally
 class TintEnvelope : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TintEnvelope, "TintEnvelope" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TintEnvelope, "TintEnvelope" )
 public:
 
 	TintEnvelope(void);
 	void update(void);  ///< does all the work
-	void play(const RGBColor *peak, 
-						UnsignedInt atackFrames = DEF_ATTACK_FRAMES, 
-						UnsignedInt decayFrames = DEF_DECAY_FRAMES, 
+	void play(const RGBColor *peak,
+						UnsignedInt attackFrames = DEF_ATTACK_FRAMES,
+						UnsignedInt decayFrames = DEF_DECAY_FRAMES,
 						UnsignedInt sustainAtPeak = DEF_SUSTAIN_FRAMES ); // ask MLorenzen
 	void sustain(void) { m_envState = ENVELOPE_STATE_SUSTAIN; }
 	void release(void) { m_envState = ENVELOPE_STATE_DECAY; }
@@ -190,7 +188,7 @@ class TintEnvelope : public MemoryPoolObject, public Snapshot
 private:
 
 	void setAttackFrames(UnsignedInt frames);
-	void setDecayFrames( UnsignedInt frames); 
+	void setDecayFrames( UnsignedInt frames);
 	void setPeakColor( const RGBColor *peak) {m_peakColor = Vector3( peak->red, peak->green, peak->blue );};
 	void setPeakColor( Real r, Real g, Real b ) {m_peakColor.Set( r, g, b );};
 
@@ -199,14 +197,14 @@ class TintEnvelope : public MemoryPoolObject, public Snapshot
 		ENVELOPE_STATE_REST,
 		ENVELOPE_STATE_ATTACK,
 		ENVELOPE_STATE_DECAY,
-		ENVELOPE_STATE_SUSTAIN ///< RELEASE IS THE LOGICAL COMPLIMENT TO SUSTAIN								
+		ENVELOPE_STATE_SUSTAIN ///< RELEASE IS THE LOGICAL COMPLIMENT TO SUSTAIN
 	};
 
-	Vector3							m_attackRate;		 	///< step amount to make tint turn on slow or fast 
+	Vector3							m_attackRate;		 	///< step amount to make tint turn on slow or fast
 	Vector3							m_decayRate;			///< step amount to make tint turn off slow or fast
 	Vector3							m_peakColor;			///< um, the peak color, what color we are headed toward during attack
 	Vector3							m_currentColor;		///< um, the current color, how we are colored, now
-	UnsignedInt					m_sustainCounter;
+	Real								m_sustainCounter;
 	Byte								m_envState;				///< a randomly switchable SUSTAIN state, release is compliment
 	Bool								m_affect;         ///< set TRUE if this has any effect (has a non 0,0,0 color).
 };
@@ -220,7 +218,7 @@ enum StealthLookType CPP_11(: Int)
 	STEALTHLOOK_DISGUISED_ENEMY,		///< we can have units that are disguised (instead of invisible)
 	STEALTHLOOK_VISIBLE_DETECTED,		///< unit is stealthed and invisible, but a second material pass
 																						///< is added to reveal the invisible unit as with heat vision
-	STEALTHLOOK_VISIBLE_FRIENDLY_DETECTED,		///< unit is stealthed-but-visible due to being detected, 
+	STEALTHLOOK_VISIBLE_FRIENDLY_DETECTED,		///< unit is stealthed-but-visible due to being detected,
 																						///< and rendered in heatvision effect second material pass
 	STEALTHLOOK_INVISIBLE						///< unit is stealthed-and-invisible
 };
@@ -228,14 +226,16 @@ enum StealthLookType CPP_11(: Int)
 // ------------------------------------------------------------------------------------------------
 /** Drawable status bits */
 // ------------------------------------------------------------------------------------------------
-enum DrawableStatus CPP_11(: Int)
+typedef UnsignedInt DrawableStatusBits;
+enum DrawableStatus CPP_11(: DrawableStatusBits)
 {
 	DRAWABLE_STATUS_NONE									= 0x00000000,		///< no status
 	DRAWABLE_STATUS_DRAWS_IN_MIRROR				=	0x00000001,		///< drawable can reflect
 	DRAWABLE_STATUS_SHADOWS								=	0x00000002,		///< use setShadowsEnabled() access method
-	DRAWABLE_STATUS_TINT_COLOR_LOCKED			=	0x00000004,		///< drawable tint color is "locked" and won't fade to normal
 	DRAWABLE_STATUS_NO_STATE_PARTICLES		= 0x00000008,		///< do *not* auto-create particle systems based on model condition
 	DRAWABLE_STATUS_NO_SAVE								= 0x00000010,		///< do *not* save this drawable (UI fluff only). ignored (error, actually) if attached to an object
+
+	DRAWABLE_STATUS_DEFAULT = DRAWABLE_STATUS_SHADOWS,
 };
 
 enum TintStatus CPP_11(: Int)
@@ -266,16 +266,24 @@ enum TerrainDecalType CPP_11(: Int)
 	TERRAIN_DECAL_HORDE_VEHICLE,
 	TERRAIN_DECAL_HORDE_WITH_NATIONALISM_UPGRADE_VEHICLE,
 	TERRAIN_DECAL_CRATE,
-    TERRAIN_DECAL_HORDE_WITH_FANATICISM_UPGRADE,
+#if RTS_GENERALS && RETAIL_COMPATIBLE_XFER_SAVE
+	TERRAIN_DECAL_NONE,
+	TERRAIN_DECAL_HORDE_WITH_FANATICISM_UPGRADE,
+	TERRAIN_DECAL_CHEMSUIT,
+#else
+	TERRAIN_DECAL_HORDE_WITH_FANATICISM_UPGRADE,
 	TERRAIN_DECAL_CHEMSUIT,
 	TERRAIN_DECAL_NONE,
+#endif
 	TERRAIN_DECAL_SHADOW_TEXTURE,	//use the shadow texture as the terrain decal.
 
-	TERRAIN_DECAL_MAX	///< keep this last
+	TERRAIN_DECAL_MAX
 };
 
 //-----------------------------------------------------------------------------
 
+constexpr const UnsignedInt InvalidShroudClearFrame = ~0u;
+
 const Int DRAWABLE_FRAMES_PER_FLASH = LOGICFRAMES_PER_SECOND / 2;
 
 //-----------------------------------------------------------------------------
@@ -287,11 +295,11 @@ class Drawable : public Thing,
 								 public Snapshot
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Drawable, "Drawable" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Drawable, "Drawable" )
 
 public:
 
-	Drawable( const ThingTemplate *thing, DrawableStatus statusBits = DRAWABLE_STATUS_NONE );
+	Drawable( const ThingTemplate *thing, DrawableStatusBits statusBits = DRAWABLE_STATUS_DEFAULT );
 
 	void onDestroy( void );																							///< run from GameClient::destroyDrawable
   void onLevelStart();                                                ///< run from GameLogic::startNewGame
@@ -302,33 +310,33 @@ class Drawable : public Thing,
 
 	void friend_bindToObject( Object *obj ); ///< bind this drawable to an object ID. for use ONLY by GameLogic!
 	void setIndicatorColor(Color color);
-	
+
 	void setTintStatus( TintStatus statusBits ) { BitSet( m_tintStatus, statusBits ); };
 	void clearTintStatus( TintStatus statusBits ) { BitClear( m_tintStatus, statusBits ); };
 	Bool testTintStatus( TintStatus statusBits ) const { return BitIsSet( m_tintStatus, statusBits ); };
 	TintEnvelope *getColorTintEnvelope( void ) { return m_colorTintEnvelope; }
 	void setColorTintEnvelope( TintEnvelope &source ) { if (m_colorTintEnvelope) *m_colorTintEnvelope = source; }
 
-  
+
   void imitateStealthLook( Drawable& otherDraw );
 
 	void setTerrainDecal(TerrainDecalType type);	///<decal that is to appear under the drawable
 	void setTerrainDecalSize(Real x, Real y);
 	void setTerrainDecalFadeTarget(Real target, Real rate = 0.1f);
 
-	inline Object *getObject( void ) { return m_object; }								///< return object ID bound to this drawble
-	inline const Object *getObject( void ) const { return m_object; }		///< return object ID bound to this drawble
+	Object *getObject( void ) { return m_object; }								///< return object ID bound to this drawble
+	const Object *getObject( void ) const { return m_object; }		///< return object ID bound to this drawble
 
-	inline DrawableInfo *getDrawableInfo(void) {return &m_drawableInfo;}
+	DrawableInfo *getDrawableInfo(void) {return &m_drawableInfo;}
 
 	void setDrawableHidden( Bool hidden );																		///< hide or unhide drawable
 	//
 	// note that this is not necessarily the 'get' reflection of setDrawableHidden, since drawables
 	// can spontaneously hide via stealth. (srj)
 	//
-	inline Bool isDrawableEffectivelyHidden() const { return m_hidden || m_hiddenByStealth; }
+	Bool isDrawableEffectivelyHidden() const { return m_hidden || m_hiddenByStealth; }
 
-	void setSelectable( Bool selectable );												///< Changes the drawables selectability	
+	void setSelectable( Bool selectable );												///< Changes the drawables selectability
 	Bool isSelectable( void ) const;
 	Bool isMassSelectable( void ) const;
 
@@ -338,7 +346,7 @@ class Drawable : public Thing,
 
 	void updateDrawableClipStatus( UnsignedInt shotsRemaining, UnsignedInt maxShots, WeaponSlotType slot ); ///< This will do the show/hide work if ProjectileBoneFeedbackEnabled is set.
 	void updateDrawableSupplyStatus( Int maxSupply, Int currentSupply ); ///< This will do visual feedback on Supplies carried
-	
+
 	void notifyDrawableDependencyCleared();///< If any of your draw modules were waiting for something, it's ready now.
 
 	// Override.
@@ -348,7 +356,7 @@ class Drawable : public Thing,
 	const GeometryInfo& getDrawableGeometryInfo() const;
 
 	void reactToBodyDamageStateChange(BodyDamageType newState);
-	
+
 	Real getScale (void) const ;
 
 	// access to modules
@@ -358,6 +366,7 @@ class Drawable : public Thing,
 	ClientUpdateModule const** getClientUpdateModules() const { return (ClientUpdateModule const**)getModuleList(MODULETYPE_CLIENT_UPDATE); }
 	ClientUpdateModule* findClientUpdateModule( NameKeyType key );
 
+	// never returns null
 	DrawModule** getDrawModulesNonDirty();
 	DrawModule** getDrawModules();
 	DrawModule const** getDrawModules() const;
@@ -365,11 +374,11 @@ class Drawable : public Thing,
 	//---------------------------------------------------------------------------
 	void setDrawableStatus( DrawableStatus bit )  { BitSet( m_status, bit ); }
 	void clearDrawableStatus( DrawableStatus bit ) { BitClear( m_status, bit ); }
-	inline Bool testDrawableStatus( DrawableStatus bit ) const { return (m_status & bit) != 0; }
+	Bool testDrawableStatus( DrawableStatus bit ) const { return (m_status & bit) != 0; }
 
 	void setShroudClearFrame( UnsignedInt frame )  { m_shroudClearFrame = frame; }
 	UnsignedInt getShroudClearFrame( void ) { return m_shroudClearFrame; }
- 
+
 	void setShadowsEnabled(Bool enable);
 	Bool getShadowsEnabled() const { return BitIsSet(m_status, DRAWABLE_STATUS_SHADOWS); }
 
@@ -377,18 +386,18 @@ class Drawable : public Thing,
 	void allocateShadows(void); ///< create shadow resources if not already present. Used by Options screen.
 
 	void setFullyObscuredByShroud(Bool fullyObscured);
-	inline Bool getFullyObscuredByShroud(void) {return m_drawableFullyObscuredByShroud;}
+	Bool getFullyObscuredByShroud(void) {return m_drawableFullyObscuredByShroud;}
 
   // Put on ice until later... M Lorenzen
   //	inline UnsignedByte getFullyObscuredByShroudWithCheatSpy(void) {return (UnsignedByte)m_drawableFullyObscuredByShroud | 128;}//8 looks like a zero in most fonts
 
 	Bool getDrawsInMirror() const { return BitIsSet(m_status, DRAWABLE_STATUS_DRAWS_IN_MIRROR) || isKindOf(KINDOF_CAN_CAST_REFLECTIONS); }
 
-	void colorFlash( const RGBColor *color, UnsignedInt decayFrames = DEF_DECAY_FRAMES, UnsignedInt attackFrames = 0, UnsignedInt sustainAtPeak = FALSE );  ///< flash a drawable in the color specified for a short time
+	void colorFlash( const RGBColor *color, UnsignedInt decayFrames = DEF_DECAY_FRAMES, UnsignedInt attackFrames = 0, UnsignedInt sustainAtPeak = 0 );  ///< flash a drawable in the color specified for a short time
 	void colorTint( const RGBColor *color );	 ///< tint this drawable the color specified
 	void setTintEnvelope( const RGBColor *color, Real attack, Real decay );	 ///< how to transition color
 	void flashAsSelected( const RGBColor *color = NULL ); ///< drawable takes care of the details if you spec no color
-	
+
 	/// Return true if drawable has been marked as "selected"
 	Bool isSelected( void ) const {	return m_selected; }
 	void onSelected();														///< Work unrelated to selection that must happen at time of selection
@@ -399,14 +408,14 @@ class Drawable : public Thing,
 	// an "instance" matrix defines the local transform of the Drawable, and is concatenated with the global transform
 	void setInstanceMatrix( const Matrix3D *instance );									///< set the Drawable's instance transform
 	const Matrix3D *getInstanceMatrix( void ) const { return &m_instance; }		///< get drawable instance transform
-	inline Bool isInstanceIdentity() const { return m_instanceIsIdentity; }
+	Bool isInstanceIdentity() const { return m_instanceIsIdentity; }
 
-	inline Real getInstanceScale( void ) const { return m_instanceScale; }		///< get scale that will be applied to instance matrix
+	Real getInstanceScale( void ) const { return m_instanceScale; }		///< get scale that will be applied to instance matrix
 	void setInstanceScale(Real value) { m_instanceScale = value;}	///< set scale that will be applied to instance matrix before rendering.
 
 	const Matrix3D *getTransformMatrix( void ) const;	///< return the world transform
 
-	void draw( View *view );													///< render the drawable to the given view
+	void draw();													///< render the drawable to the given view
 	void updateDrawable();														///< update the drawable
 
 	void drawIconUI( void );													///< draw "icon"(s) needed on drawable (health bars, veterency, etc)
@@ -421,10 +430,10 @@ class Drawable : public Thing,
 	void removeFromList(Drawable **pListHead);
 	void setID( DrawableID id );											///< set this drawable's unique ID
 
-	inline const ModelConditionFlags& getModelConditionFlags( void ) const { return m_conditionState; }
+	const ModelConditionFlags& getModelConditionFlags( void ) const { return m_conditionState; }
 
 	//
-	// NOTE: avoid repeated calls to the set and clear for the condition state as they 
+	// NOTE: avoid repeated calls to the set and clear for the condition state as they
 	// reconstruct and load models which is expensive ... wrap up all our bit flags to
 	// set and clear into one function call
 	//
@@ -438,12 +447,12 @@ class Drawable : public Thing,
 	void replaceModelConditionFlags( const ModelConditionFlags &flags, Bool forceReplace = FALSE );
 
 	Bool handleWeaponFireFX(
-							WeaponSlotType wslot, 
-							Int specificBarrelToUse, 
-							const FXList* fxl, 
-							Real weaponSpeed, 
-							Real recoilAmount, 
-							Real recoilAngle, 
+							WeaponSlotType wslot,
+							Int specificBarrelToUse,
+							const FXList* fxl,
+							Real weaponSpeed,
+							Real recoilAmount,
+							Real recoilAngle,
 							const Coord3D* victimPos,
 							Real damageRadius
 							);
@@ -457,7 +466,7 @@ class Drawable : public Thing,
 	void changedTeam();
 
 	const TWheelInfo *getWheelInfo(void) const { return m_locoInfo ? &m_locoInfo->m_wheelInfo : NULL; }
-	
+
 	const DrawableLocoInfo *getLocoInfo() const { return m_locoInfo; }
 
 	// this method must ONLY be called from the client, NEVER From the logic, not even indirectly.
@@ -467,8 +476,8 @@ class Drawable : public Thing,
 		Find the bone(s) with the given name and return their positions and/or transforms in the given arrays.
 		We look for a bone named "boneNamePrefixQQ", where QQ is 01, 02, 03, etc, starting at the
 		value of "startIndex". Want to look for just a specific boneName with no numeric suffix?
-		just pass zero (0) for startIndex. (no, we never look for "boneNamePrefix00".) 
-		We copy up to 'maxBones' into the array(s), and return the total count found. 
+		just pass zero (0) for startIndex. (no, we never look for "boneNamePrefix00".)
+		We copy up to 'maxBones' into the array(s), and return the total count found.
 
 		NOTE: this returns the positions and transform for the "ideal" model... that is,
 		at its default rotation and scale, located at (0,0,0). You'll have to concatenate
@@ -478,14 +487,14 @@ class Drawable : public Thing,
 	*/
 	Int getPristineBonePositions(const char* boneNamePrefix, Int startIndex, Coord3D* positions, Matrix3D* transforms, Int maxBones) const;
 	Int getCurrentClientBonePositions(const char* boneNamePrefix, Int startIndex, Coord3D* positions, Matrix3D* transforms, Int maxBones) const;
-	
+
 	// this is a special-purpose call for W3DModelDraw. (srj)
 	Bool getCurrentWorldspaceClientBonePositions(const char* boneName, Matrix3D& transform) const;
 
 	Bool getProjectileLaunchOffset(WeaponSlotType wslot, Int specificBarrelToUse, Matrix3D* launchPos, WhichTurretType tur, Coord3D* turretRotPos, Coord3D* turretPitchPos = NULL) const;
 
 	/**
-		This call says, "I want the current animation (if any) to take n frames to complete a single cycle". 
+		This call says, "I want the current animation (if any) to take n frames to complete a single cycle".
 		If it's a looping anim, each loop will take n frames. someday, we may want to add the option to insert
 		"pad" frames at the start and/or end, but for now, we always just "stretch" the animation to fit.
 		Note that you must call this AFTER setting the condition codes.
@@ -493,11 +502,11 @@ class Drawable : public Thing,
 	void setAnimationLoopDuration(UnsignedInt numFrames);
 	/**
 		similar to the above, but assumes that the current state is a "ONCE",
-		and is smart about transition states... if there is a transition state 
+		and is smart about transition states... if there is a transition state
 		"inbetween", it is included in the completion time.
 	*/
 	void setAnimationCompletionTime(UnsignedInt numFrames);
-	
+
 	//Kris: Manually set a drawable's current animation to specific frame.
 	virtual void setAnimationFrame( int frame );
 
@@ -516,32 +525,32 @@ class Drawable : public Thing,
 	// *ONLY* the InGameUI should do the actual drawable selection and de-selection
 	//
 	void friend_setSelected( void );							///< mark drawable as "selected"
-	void friend_clearSelected( void );						///< clear drawable's "selected" 
-	
+	void friend_clearSelected( void );						///< clear drawable's "selected"
+
 	Vector3 * getAmbientLight( void );					///< get color value to add to ambient light when drawing
 	void setAmbientLight( Vector3 *ambient );		///< set color value to add to ambient light when drawing
 
 	const Vector3 * getTintColor( void ) const;					///< get FX color value to add to ALL LIGHTS when drawing
 	const Vector3 * getSelectionColor( void ) const;					///< get FX color value to add to ALL LIGHTS when drawing
 
-	inline TerrainDecalType getTerrainDecalType( void ) const { return m_terrainDecalType; }
+	TerrainDecalType getTerrainDecalType( void ) const { return m_terrainDecalType; }
+
+	void setDrawableOpacity( Real value ) { m_explicitOpacity = value; }	///< set alpha/opacity value used to override defaults when drawing.
 
-	inline void setDrawableOpacity( Real value ) { m_explicitOpacity = value; }	///< set alpha/opacity value used to override defaults when drawing.
-	
 	// note that this is not the 'get' inverse of setDrawableOpacity, since stealthing can also affect the effective opacity!
-	inline Real getEffectiveOpacity() const { return m_explicitOpacity * m_effectiveStealthOpacity; }		///< get alpha/opacity value used to override defaults when drawing.
+	Real getEffectiveOpacity() const { return m_explicitOpacity * m_effectiveStealthOpacity; }		///< get alpha/opacity value used to override defaults when drawing.
 	void setEffectiveOpacity( Real pulseFactor, Real explicitOpacity = -1.0f );
-	
+
 	// this is for the add'l pass fx which operates completely independently of the stealth opacity effects. Draw() does the fading every frame.
-	inline Real getSecondMaterialPassOpacity() const { return m_secondMaterialPassOpacity; }		///< get alpha/opacity value used to render add'l  rendering pass.
+	Real getSecondMaterialPassOpacity() const { return m_secondMaterialPassOpacity; }		///< get alpha/opacity value used to render add'l  rendering pass.
 	void setSecondMaterialPassOpacity( Real op ) { m_secondMaterialPassOpacity = op; }; ///< set alpha/opacity value used to render add'l  rendering pass.
-	
+
 	// both of these assume that you are starting at one extreme 100% or 0% opacity and are trying to go to the other!! -- amit
 	void fadeOut( UnsignedInt frames );		///< fade object out...how gradually this is done is determined by frames
 	void fadeIn( UnsignedInt frames );		///< fade object in...how gradually this is done is determined by frames
 
 	void preloadAssets( TimeOfDay timeOfDay );	///< preload the assets
-	
+
 	Bool isVisible();											///< for limiting tree sway, etc to visible objects
 
 	Bool getShouldAnimate( Bool considerPower ) const;
@@ -563,10 +572,10 @@ class Drawable : public Thing,
 	void killIcon(DrawableIconType t) { if (m_iconInfo) m_iconInfo->killIcon(t); }
 	Bool hasIconInfo() const { return m_iconInfo != NULL; }
 
-  
+
   Bool getReceivesDynamicLights( void ) { return m_receivesDynamicLights; };
   void setReceivesDynamicLights( Bool set ) { m_receivesDynamicLights = set; };
-  
+
   //---------------------------------------------------------------------------------
   // Stuff for overriding ambient sound
   const AudioEventInfo * getBaseSoundAmbientInfo() const; //< Possible starting point if only some parameters are customized
@@ -582,7 +591,7 @@ class Drawable : public Thing,
   Real friend_getStealthOpacity( void ) { return m_stealthOpacity; }
   Real friend_getExplicitOpacity( void ) { return m_explicitOpacity; }
   Real friend_getEffectiveStealthOpacity( void ) { return m_effectiveStealthOpacity; }
-  
+
 protected:
 
 	// snapshot methods
@@ -596,13 +605,13 @@ class Drawable : public Thing,
 	Drawable *asDrawableMeth() { return this; }
 	const Drawable *asDrawableMeth() const { return this; }
 
-	inline Module** getModuleList(ModuleType i)
+	Module** getModuleList(ModuleType i)
 	{
 		Module** m = m_modules[i - FIRST_DRAWABLE_MODULE_TYPE];
 		return m;
 	}
 
-	inline Module* const* getModuleList(ModuleType i) const
+	Module* const* getModuleList(ModuleType i) const
 	{
 		Module** m = m_modules[i - FIRST_DRAWABLE_MODULE_TYPE];
 		return m;
@@ -638,8 +647,12 @@ class Drawable : public Thing,
 	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle);
 	void updateHiddenStatus();
 
+	void replaceModelConditionStateInDrawable();
+
 private:
 
+	const Locomotor* getLocomotor() const;
+
 	// note, these are lazily allocated!
 	TintEnvelope*		m_selectionFlashEnvelope;	///< used for selection flash, works WITH m_colorTintEnvelope
 	TintEnvelope*		m_colorTintEnvelope;			///< house color flashing, etc... works WITH m_selectionFlashEnvelope
@@ -660,17 +673,17 @@ class Drawable : public Thing,
 	Real m_decalOpacity;
 
 	Object *m_object;						///< object (if any) that this drawable represents
-		
+
 	DrawableID m_id;						///< this drawable's unique ID
-	Drawable *m_nextDrawable; 
+	Drawable *m_nextDrawable;
 	Drawable *m_prevDrawable;		///< list links
 
   DynamicAudioEventInfo *m_customSoundAmbientInfo; ///< If not NULL, info about the ambient sound to attach to this object
 
-	UnsignedInt m_status;				///< status bits (see DrawableStatus enum)
+	DrawableStatusBits m_status;		///< status bits (see DrawableStatus enum)
 	UnsignedInt m_tintStatus;				///< tint color status bits (see TintStatus enum)
 	UnsignedInt m_prevTintStatus;///< for edge testing with m_tintStatus
-	
+
 	enum FadingMode
 	{
 		FADING_NONE,
@@ -685,6 +698,8 @@ class Drawable : public Thing,
 
 	DrawableLocoInfo*	m_locoInfo;	// lazily allocated
 
+	PhysicsXformInfo* m_physicsXform;
+
 	DynamicAudioEventRTS*	m_ambientSound;		///< sound module for ambient sound (lazily allocated)
 
 	Module** m_modules[NUM_DRAWABLE_MODULE_TYPES];
@@ -695,7 +710,7 @@ class Drawable : public Thing,
 	Color m_flashColor;					///< color to flash the drawable
 
 	Matrix3D m_instance;				///< The instance matrix that holds the initial/default position & orientation
-	Real m_instanceScale;				///< the uniform scale factor applied to the instance matrix before it is sent to W3D. 
+	Real m_instanceScale;				///< the uniform scale factor applied to the instance matrix before it is sent to W3D.
 
 	DrawableInfo				m_drawableInfo;		///< structure pointed to by W3D render objects so they know which drawable they belong to.
 
@@ -721,14 +736,14 @@ class Drawable : public Thing,
   Bool m_receivesDynamicLights;
 
 #ifdef DIRTY_CONDITION_FLAGS
-	mutable Bool m_isModelDirty;				///< if true, must call replaceModelConditionState() before drawing or accessing drawmodule info
+	Bool m_isModelDirty;				///< if true, must call replaceModelConditionState() before drawing or accessing drawmodule info
 #endif
 
 	//*******************************************
 	//Perhaps we can move this out of Drawable???
 public:
 	static void killStaticImages();
-	
+
 #ifdef DIRTY_CONDITION_FLAGS
 	// only for StDrawableDirtyStuffLocker!
 	static void friend_lockDirtyStuffForIteration();
@@ -759,7 +774,7 @@ class Drawable : public Thing,
 	void drawBattlePlans( const IRegion2D* healthBarRegion );				///< Icons rendering for active battle plan statii
 
 	Bool drawsAnyUIText( void );
-	
+
 	static Bool							s_staticImagesInited;
 	static const Image*			s_veterancyImage[LEVEL_COUNT];
 	static const Image*			s_fullAmmo;
@@ -793,5 +808,3 @@ class StDrawableDirtyStuffLocker
 	}
 };
 #endif
-
-#endif // _DRAWABLE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h
index 96570836b16..356bc358ba9 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h
@@ -27,8 +27,6 @@
 // Author: Mark Wilczynski, August 2002
 
 #pragma once
-#ifndef _DRAWABLEINFO_H_
-#define _DRAWABLEINFO_H_
 
 #include "Common/GameType.h"
 
@@ -45,7 +43,7 @@ struct DrawableInfo
 		ERF_POTENTIAL_OCCLUDEE=	0x00000004,
 		ERF_IS_TRANSLUCENT= 0x00000008,
 		ERF_IS_NON_OCCLUDER_OR_OCCLUDEE = 0x00000010,
-		ERF_DELAYED_RENDER = ERF_IS_TRANSLUCENT|ERF_POTENTIAL_OCCLUDEE, 
+		ERF_DELAYED_RENDER = ERF_IS_TRANSLUCENT|ERF_POTENTIAL_OCCLUDEE,
 	};
 
 	DrawableInfo(void) : m_shroudStatusObjectID(INVALID_ID), m_drawable(NULL), m_ghostObject(NULL), m_flags(ERF_IS_NORMAL) {}
@@ -55,5 +53,3 @@ struct DrawableInfo
 	GhostObject *m_ghostObject;	///<pointer to ghostObject for this drawable used for fogged versions.
 	Int m_flags;	///<extra render settings flags that are tied to render objects with drawables.
 };
-
-#endif // _DRAWABLEINFO_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h b/GeneralsMD/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
index a88dff961f1..2ef62d5d95c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
@@ -47,9 +47,9 @@ class EstablishConnectionsMenu {
 protected:
 	EstablishConnectionsMenuStateType m_menuState;
 
-	static const char *m_playerReadyControlNames[MAX_SLOTS];
-	static const char *m_playerNameControlNames[MAX_SLOTS];
-	static const char *m_playerStatusControlNames[MAX_SLOTS];
+	static const char *const m_playerReadyControlNames[MAX_SLOTS];
+	static const char *const m_playerNameControlNames[MAX_SLOTS];
+	static const char *const m_playerStatusControlNames[MAX_SLOTS];
 };
 
-extern EstablishConnectionsMenu *TheEstablishConnectionsMenu;
\ No newline at end of file
+extern EstablishConnectionsMenu *TheEstablishConnectionsMenu;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h
index 9cabbff279a..9255632b2db 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h
@@ -27,8 +27,6 @@
 // DO NOT DISTRIBUTE
 
 #pragma once
-#ifndef __EVA_H__
-#define __EVA_H__
 
 #include "Common/SubsystemInterface.h"
 #include "Common/AudioEventRTS.h"
@@ -41,9 +39,8 @@ class INI;
 enum EvaMessage CPP_11(: Int)
 {
   EVA_Invalid = -1,
-    
-	EVA_FIRST = 0,
-	EVA_LowPower = EVA_FIRST,
+
+	EVA_LowPower,
 	EVA_InsufficientFunds,
 	EVA_SuperweaponDetected_Own_ParticleCannon,
 	EVA_SuperweaponDetected_Own_Nuke,
@@ -98,9 +95,10 @@ enum EvaMessage CPP_11(: Int)
   EVA_SuperweaponLaunched_Enemy_Sneak_Attack,
 
 	EVA_COUNT,
+	EVA_FIRST = 0,
 };
 
-extern const char *TheEvaMessageNames[];
+extern const char *const TheEvaMessageNames[];
 
 //------------------------------------------------------------------------------------ EvaCheckInfo
 struct EvaSideSounds
@@ -115,7 +113,7 @@ struct EvaSideSounds
 //------------------------------------------------------------------------------------ EvaCheckInfo
 class EvaCheckInfo : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(EvaCheckInfo, "EvaCheckInfo")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(EvaCheckInfo, "EvaCheckInfo")
 
 public:
 	EvaMessage									m_message;
@@ -123,7 +121,7 @@ class EvaCheckInfo : public MemoryPoolObject
 	UnsignedInt									m_framesToExpire;
 	UnsignedInt									m_priority;	// higher priority is more important, and will be played in preference to lower preference
 	std::vector<EvaSideSounds>	m_evaSideSounds;
-	
+
 	EvaCheckInfo();
 
 	static const FieldParse s_evaEventInfo[];		///< the parse table for INI definition
@@ -140,7 +138,7 @@ struct EvaCheck
 	const EvaCheckInfo *m_evaInfo;
 	UnsignedInt m_triggeredOnFrame;
 	UnsignedInt m_timeForNextCheck;
-	Bool m_alreadyPlayed;	
+	Bool m_alreadyPlayed;
 
 		EvaCheck();
 };
@@ -161,7 +159,7 @@ class Eva : public SubsystemInterface
 		typedef std::vector<EvaCheck> EvaCheckVec;
 		typedef EvaCheckVec::iterator EvaCheckVecIt;
 
-		// This list contains things that either want to play, 
+		// This list contains things that either want to play,
 		// or have played and are waiting till they are allowed to check again to play.
 		EvaCheckVec m_checks;
 
@@ -170,12 +168,12 @@ class Eva : public SubsystemInterface
 
 		Player *m_localPlayer;
 
-		// Variables for condition checks go here. 
+		// Variables for condition checks go here.
 		Int m_previousBuildingCount;
 		Int m_previousUnitCount;
 		mutable EvaMessage m_messageBeingTested;	// Used by the generic hooks so they can figure out which flag to test.
 		Bool m_shouldPlay[EVA_COUNT];	// These aren't all used, but some of them are.
-		
+
 		Bool m_enabled;
 
 	public:
@@ -215,5 +213,3 @@ class Eva : public SubsystemInterface
 };
 
 extern Eva *TheEva;
-
-#endif /* __EVA_H__ */
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
index deef9015446..e5317020c48 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __EXTENDEDMESSAGEBOX_H_
-#define __EXTENDEDMESSAGEBOX_H_
-
 #include "GameClient/GameWindowManager.h"
 
 // return codes for message box callbacks
@@ -70,5 +67,3 @@ GameWindow *ExMessageBoxOk					(UnicodeString titleString,UnicodeString bodyStri
 
 GameWindow *ExMessageBoxCancel			(UnicodeString titleString,UnicodeString bodyString, void *userData,
 																		 MessageBoxFunc cancelCallback);
-
-#endif //__EXTENDEDMESSAGEBOX_H_
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/FXList.h b/GeneralsMD/Code/GameEngine/Include/GameClient/FXList.h
index 49f288cb858..31d30ae4fec 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/FXList.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/FXList.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _FXList_H_
-#define _FXList_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
 #include "Common/NameKeyGenerator.h"
@@ -49,24 +46,24 @@ class Matrix3D;
 /**
 	An FXNugget encapsulates a particular type of audio/video effect. FXNuggets are virtually
 	never used on their own, but rather, as a component of an FXList (see below).
-	
+
 	Important notes:
 
 	-- FXNugget is an ABC; all the implementations are (currently) located in FXList.cpp,
 	thought they will probably be spread out more as we add more implementations.
 
-	-- As part of an FXList, an FXNugget is shared between multiple units. The implication is that 
-	an FXNugget should not require private data storage to do what it needs to do, aside from stuff 
-	initialized at FXNugget instantiation time (eg, parameters from an INI file). To help 
+	-- As part of an FXList, an FXNugget is shared between multiple units. The implication is that
+	an FXNugget should not require private data storage to do what it needs to do, aside from stuff
+	initialized at FXNugget instantiation time (eg, parameters from an INI file). To help
 	enforce this, all it's methods are declared 'const'. If you can't implement what you
 	need within this framework, please *don't* simply de-const things, because it could lead to very
 	strange side-effects. Instead, the system will have to be enhanced to allow for multiple instances
 	of each FXNugget.
 
-	-- an individual FXNugget is generally not directly accessible to anyone outside of the	
+	-- an individual FXNugget is generally not directly accessible to anyone outside of the
 	FXList system; in fact, it could probably be a private class, but isn't, mainly for coding convenience.
 
-	-- Unlike most other game systems, FXNuggets can't be overridden by subsequent INI file 
+	-- Unlike most other game systems, FXNuggets can't be overridden by subsequent INI file
 	loads. This isn't really a problem, because all you really need to do to "override" one is to
 	specify a different one.
 */
@@ -92,7 +89,7 @@ class FXNugget : public MemoryPoolObject
 
 private:
 
-};  
+};
 EMPTY_DTOR(FXNugget)
 
 //-------------------------------------------------------------------------------------------------
@@ -100,23 +97,23 @@ EMPTY_DTOR(FXNugget)
 	An FXList is a way of encapsulating a particular set of audio/video effect(s).
 	Lots of other game systems (eg, DamageFX) use FXLists to abstract AV effects into data files
 	(rather than hardcoding them, which would be suboptimal).
-	
+
 	Important notes:
 
 	-- an FXList is specified solely by name, and the only parameters it receives when performing
 	its AV effects are a primary (and optional secondary) object position.
-	
+
 	-- There is no inheritance or overriding of FXLists; if you need an FXList that is nearly-but-not-quite
 	identical to an existing one, you must simply make an entirely new FXList. Realistically, this shouldn't
 	be a problem, since they are pretty simple to specify, and don't consume a lot of memory.
 
-	-- an FXList is shared between multiple units. To help 
+	-- an FXList is shared between multiple units. To help
 	enforce this, all it's methods are declared 'const'. If you can't implement the stuff you
 	need within this framework, please *don't* simply de-const things, because it could lead to very
 	strange side-effects. Instead, the system will have to be enhanced to allow for multiple instances
 	of each FXNugget.
 
-	-- Unlike most other game systems, FXList can't be overridden by subsequent INI file 
+	-- Unlike most other game systems, FXList can't be overridden by subsequent INI file
 	loads. This isn't really a problem, because all you really need to do to "override" one is to
 	specify a different one.
 */
@@ -183,11 +180,11 @@ class FXList
 
 	FXNuggetList m_nuggets;
 
-};  
+};
 
 //-------------------------------------------------------------------------------------------------
 /**
-	The "store" used to hold all the FXLists in existence. 
+	The "store" used to hold all the FXLists in existence.
 */
 class FXListStore : public SubsystemInterface
 {
@@ -206,12 +203,12 @@ class FXListStore : public SubsystemInterface
 		return NULL if no such FXList exists.
 	*/
 	const FXList *findFXList( const char* name ) const;
-	
+
 	static void parseFXListDefinition(INI* ini);
 
 private:
 
-	// use the hashing function for Ints. 
+	// use the hashing function for Ints.
 	typedef std::hash_map< NameKeyType, FXList, rts::hash<NameKeyType>, rts::equal_to<NameKeyType> > FXListMap;
 
 	FXListMap m_fxmap;
@@ -220,6 +217,3 @@ class FXListStore : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern FXListStore *TheFXListStore;
-
-#endif // _FXList_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/FontDesc.h b/GeneralsMD/Code/GameEngine/Include/GameClient/FontDesc.h
index 8b486066a74..2f28dde87f6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/FontDesc.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/FontDesc.h
@@ -27,8 +27,6 @@
 // Author: Mark Wilczynski, October 2002
 
 #pragma once
-#ifndef _FONTDESC_H_
-#define _FONTDESC_H_
 
 #include "Common/GameType.h"
 
@@ -39,5 +37,3 @@ struct FontDesc
 	Int	size;			///<point size
 	Bool bold;			///<is bold?
 };
-
-#endif // _FONTDESC_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICallbacks.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GUICallbacks.h
index 3c42ac30dfe..8eea7273976 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICallbacks.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GUICallbacks.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GUICALLBACKS_H_
-#define __GUICALLBACKS_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/GameWindow.h"
 
@@ -386,7 +383,3 @@ extern WindowMsgHandledType MOTDSystem( GameWindow *window, UnsignedInt msg, Win
 // Message Box --------------------------------------------------------------------------------
 extern WindowMsgHandledType MessageBoxSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 );
 extern WindowMsgHandledType QuitMessageBoxSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 );
-
-
-#endif // __GUICALLBACKS_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h
index 044f164ecf3..9181b04bc5f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h
@@ -31,15 +31,12 @@
 
 #pragma once
 
-#ifndef __GUICOMMANDTRANSLATOR_H_
-#define __GUICOMMANDTRANSLATOR_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/InGameUI.h"
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class GUICommandTranslator : public GameMessageTranslator                          
+class GUICommandTranslator : public GameMessageTranslator
 {
 
 public:
@@ -48,8 +45,4 @@ class GUICommandTranslator : public GameMessageTranslator
 	~GUICommandTranslator( void );
 
 	virtual GameMessageDisposition translateGameMessage( const GameMessage *msg );
-};	
-
-#endif  // end __GUICOMMANDTRANSLATOR_H_
-
-
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Gadget.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Gadget.h
index e8e0d48560c..79a26028f35 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Gadget.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Gadget.h
@@ -24,12 +24,12 @@
 
 // FILE: Gadget.h /////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GADGET_H_
-#define __GADGET_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -90,7 +87,7 @@ enum
 // Gadget window styles, keep in same order as WindowStyleNames[]
 enum
 {
-						
+
 	GWS_PUSH_BUTTON				= 0x00000001,
 	GWS_RADIO_BUTTON			= 0x00000002,
 	GWS_CHECK_BOX					= 0x00000004,
@@ -191,7 +188,7 @@ enum GadgetGameMessage CPP_11(: Int)
 	GCM_GET_SELECTION,
 	GCM_SET_SELECTION,
 	GCM_UPDATE_TEXT,
-	
+
 	// Entry field messages
 	GEM_GET_TEXT,
 	GEM_SET_TEXT,
@@ -226,7 +223,7 @@ enum
 
 // GadgetMsg ------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _GadgetMsg 
+typedef struct _GadgetMsg
 {
 
 	GameWindow *window;           // Originator of message
@@ -237,7 +234,7 @@ typedef struct _GadgetMsg
 
 // SliderMsg ------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _SliderMsg 
+typedef struct _SliderMsg
 {
 
 	GameWindow *window;						// Originator of message
@@ -249,7 +246,7 @@ typedef struct _SliderMsg
 
 // ListboxMsg -----------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _ListboxMsg 
+typedef struct _ListboxMsg
 {
 
 	GameWindow *window;						// Originator of message
@@ -259,7 +256,7 @@ typedef struct _ListboxMsg
 
 // SliderData -----------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _SliderData 
+typedef struct _SliderData
 {
 
 	Int					minVal;						// Minimum slider value
@@ -274,7 +271,7 @@ typedef struct _SliderData
 
 // EntryData ------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _EntryData 
+typedef struct _EntryData
 {
 
 	DisplayString *text;						///< the entry text
@@ -305,7 +302,7 @@ typedef struct _EntryData
 
 // TextData -------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _TextData 
+typedef struct _TextData
 {
 
 	DisplayString *text;  ///< the text data
@@ -322,7 +319,7 @@ typedef struct _ListEntryCell
 {
 	Int cellType;									// Holds either LISTBOX_TEXT or LISTBOX_IMAGE
 	Color						color;				// use this color
-	void						*data;				// pointer to either a DisplayString or an image	
+	void						*data;				// pointer to either a DisplayString or an image
 	void						*userData;		// Attach user data to the cell
 	Int							width;				// Used if this is an image and we don't want to use the default
 	Int							height;				// used if this is an image and we don't want ot use the default
@@ -336,14 +333,14 @@ typedef struct _ListEntryRow
 	// The following fields are for internal use and
 	// should not be initialized by the user
 	Int							listHeight;		// calculated total Height at the bottom of this entry
-	Byte						height;				// Maintain the height of the row
+	Int							height;				// Maintain the height of the row
 	ListEntryCell		*cell;				// Holds the array of ListEntry Cells
-	
+
 } ListEntryRow;
 
 // ListboxData ----------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _ListboxData 
+typedef struct _ListboxData
 {
 
 	Short				listLength;				// Max Number of entries in the list
@@ -362,7 +359,7 @@ typedef struct _ListboxData
 	Bool				audioFeedback;		// Audio click feedback?
 
 	//
-	// The following fields are for internal use and should not be initialized 
+	// The following fields are for internal use and should not be initialized
 	// by the user
 	//
 	Int					*columnWidth;			// Pointer to array of column widths based off of user input
@@ -397,7 +394,7 @@ typedef struct _ComboBoxData
 	ListboxData *listboxData;			// Needed for the listbox component of the combo box
 	EntryData		*entryData;				// Needed for the text entry component of the combo box
 	//
-	// The following fields are for internal use and should not be initialized 
+	// The following fields are for internal use and should not be initialized
 	// by the user
 	//
 	Bool dontHide;								// A flag we'll use that'll determine if we hide the listbox or not when selected
@@ -409,7 +406,7 @@ typedef struct _ComboBoxData
 
 // RadioButtonData ------------------------------------------------------------
 //-----------------------------------------------------------------------------
-typedef struct _RadioButtonData	
+typedef struct _RadioButtonData
 {
 
 	Int screen;  ///< screen identifier
@@ -455,7 +452,7 @@ enum
 	NUM_TAB_PANES = 8,//(MAX_DRAW_DATA - 1)
 };
 
-typedef struct _TabControlData	
+typedef struct _TabControlData
 {
 	//Set in editor
 	Int tabOrientation;
@@ -467,7 +464,7 @@ typedef struct _TabControlData
 
 	GameWindow *subPanes[NUM_TAB_PANES];
 	Bool subPaneDisabled[NUM_TAB_PANES];//tabCount will control how many even exist.  Individual ones can be disabled
-	Int paneBorder; 
+	Int paneBorder;
 
 	//Working computations
 	Int activeTab;
@@ -537,5 +534,3 @@ extern void InformEntry( WideChar c );
 
 // list box stuff
 extern Int GetListboxTopEntry( ListboxData list );
-
-#endif // __GADGET_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetCheckBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetCheckBox.h
index 6353118990a..3935858b452 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetCheckBox.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetCheckBox.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetCheckBox.h /////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -61,9 +61,6 @@
 
 #pragma once
 
-#ifndef __GADGETCHECKBOX_H_
-#define __GADGETCHECKBOX_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -140,6 +137,3 @@ inline Color		 GadgetCheckBoxGetHiliteCheckedBoxColor( GameWindow *g )						{ re
 inline Color		 GadgetCheckBoxGetHiliteCheckedBoxBorderColor( GameWindow *g )			{ return g->winGetHiliteBorderColor( 2 ); }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETCHECKBOX_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h
index 9ac50508046..0c1ac745240 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetComboBox.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GADGETCOMBOBOX_H_
-#define __GADGETCOMBOBOX_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -94,17 +91,17 @@ extern void GadgetComboBoxSetIMECompositeTextColors( GameWindow *comboBox, Color
 // and those slider buttons and thumb as well as the drop down button and edit box.
 //
 extern void GadgetComboBoxSetColors( GameWindow *comboBox,
-																	  Color enabledColor, 
+																	  Color enabledColor,
 																	  Color enabledBorderColor,
-																	  Color enabledSelectedItemColor, 
+																	  Color enabledSelectedItemColor,
 																	  Color enabledSelectedItemBorderColor,
-																	  Color disabledColor, 
+																	  Color disabledColor,
 																	  Color disabledBorderColor,
-																	  Color disabledSelectedItemColor, 
+																	  Color disabledSelectedItemColor,
 																	  Color disabledSelectedItemBorderColor,
-																	  Color hiliteColor, 
+																	  Color hiliteColor,
 																	  Color hiliteBorderColor,
-																	  Color hiliteSelectedItemColor, 
+																	  Color hiliteSelectedItemColor,
 																	  Color hiliteSelectedItemBorderColor );
 
 inline void GadgetComboBoxSetEnabledImage( GameWindow *g, const Image *image )													{ g->winSetEnabledImage( 0, image ); }
@@ -193,6 +190,3 @@ inline GameWindow *GadgetComboBoxGetEditBox( GameWindow *g )
 }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETLISTBOX_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h
index 6f489669767..9823f276f13 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetListBox.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GADGETLISTBOX_H_
-#define __GADGETLISTBOX_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -72,7 +69,8 @@ extern void GadgetListboxCreateScrollbar( GameWindow *listbox );
 extern void GadgetListBoxAddMultiSelect( GameWindow *listbox );
 extern void GadgetListBoxRemoveMultiSelect( GameWindow *listbox );
 extern void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength );
-extern Int  GadgetListBoxGetListLength( GameWindow *listbox );
+extern Int  GadgetListBoxGetListLength( GameWindow *listbox ); ///< Returns the maximum possible number of list entries. Length is synonymous to rows
+extern Int  GadgetListBoxGetMaxSelectedLength( GameWindow *listbox ); ///< Returns the maximum possible number of list entries that can be selected
 extern Int  GadgetListBoxGetNumEntries( GameWindow *listbox );
 extern Int  GadgetListBoxGetNumColumns( GameWindow *listbox );
 extern Int  GadgetListBoxGetColumnWidth( GameWindow *listbox, Int column );
@@ -111,17 +109,17 @@ extern void GadgetListBoxSetAudioFeedback( GameWindow *listbox, Bool enable );
 // and those slider buttons and thumb
 //
 extern void GadgetListBoxSetColors( GameWindow *listbox,
-																	  Color enabledColor, 
+																	  Color enabledColor,
 																	  Color enabledBorderColor,
-																	  Color enabledSelectedItemColor, 
+																	  Color enabledSelectedItemColor,
 																	  Color enabledSelectedItemBorderColor,
-																	  Color disabledColor, 
+																	  Color disabledColor,
 																	  Color disabledBorderColor,
-																	  Color disabledSelectedItemColor, 
+																	  Color disabledSelectedItemColor,
 																	  Color disabledSelectedItemBorderColor,
-																	  Color hiliteColor, 
+																	  Color hiliteColor,
 																	  Color hiliteBorderColor,
-																	  Color hiliteSelectedItemColor, 
+																	  Color hiliteSelectedItemColor,
 																	  Color hiliteSelectedItemBorderColor );
 
 inline void GadgetListBoxSetEnabledImage( GameWindow *g, const Image *image )													{ g->winSetEnabledImage( 0, image ); }
@@ -208,6 +206,3 @@ inline GameWindow *GadgetListBoxGetDownButton( GameWindow *g )
 }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETLISTBOX_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h
index 48b61dca7a7..6d53b156dad 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetProgressBar.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GADGETPROGRESSBAR_H_
-#define __GADGETPROGRESSBAR_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -141,6 +138,3 @@ inline const Image * GadgetProgressBarGetHiliteBarImageCenter( GameWindow *g )
 inline const Image * GadgetProgressBarGetHiliteBarImageSmallCenter( GameWindow *g )	{ return g->winGetHiliteImage( 7 ); }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETPROGRESSBAR_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h
index b525ea438fc..53d485e4d2a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetPushButton.h ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -40,7 +40,7 @@
 //
 // Desc:       Helpful interface for PushButtons
 //
-// PushButton IMAGE/COLOR organization 
+// PushButton IMAGE/COLOR organization
 // When control is enabled:
 //   enabledDrawData[ 0 ] is the background image for the whole enabled control
 //   enabledDrawData[ 1 ] is the enabled, selected button graphic
@@ -58,9 +58,6 @@
 
 #pragma once
 
-#ifndef __GADGETPUSHBUTTON_H_
-#define __GADGETPUSHBUTTON_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -172,6 +169,3 @@ inline void GadgetButtonSetLeftEnabledImage( GameWindow *g, const Image *image )
 inline void GadgetButtonSetMiddleEnabledImage( GameWindow *g, const Image *image )					{ g->winSetEnabledImage( 5, image ); }
 inline void GadgetButtonSetRightEnabledImage( GameWindow *g, const Image *image )					{ g->winSetEnabledImage( 6, image ); }
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETPUSHBUTTON_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h
index 75c6a38ca21..ca4fd500694 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetRadioButton.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -64,9 +64,6 @@
 
 #pragma once
 
-#ifndef __GADGETRADIOBUTTON_H_
-#define __GADGETRADIOBUTTON_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -147,6 +144,3 @@ inline const Image *GadgetRadioGetSelectedCheckedBoxImage( GameWindow *g )
 
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETRADIOBUTTON_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h
index c27f9aa18c8..8eb102efae5 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetSlider.h ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,7 +45,7 @@
 //						 to fill small seams.  Since there are vertical sliders
 //						 and horizontal sliders, the LEFT end of a horizontal
 //						 slider is stored in the same place as the TOP end for a
-//						 vertical slider.  The RIGHT end of a horizontal is 
+//						 vertical slider.  The RIGHT end of a horizontal is
 //						 also equivalent to the BOTTOM end of a vertical one.
 //
 //-----------------------------------------------------------------------------
@@ -53,9 +53,6 @@
 
 #pragma once
 
-#ifndef __GADGETSLIDER_H_
-#define __GADGETSLIDER_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -103,7 +100,7 @@ inline Int GadgetSliderGetPosition( GameWindow *win )
 
 // sliders are drawn from pieces, a left/top, right/bottom, repeating center, and small repeating center
 inline void GadgetSliderSetEnabledImages( GameWindow *g, const Image *left, const Image *right, const Image *center, const Image *smallCenter )
-{ 
+{
 	g->winSetEnabledImage( 0, left );
 	g->winSetEnabledImage( 1, right );
 	g->winSetEnabledImage( 2, center );
@@ -128,7 +125,7 @@ inline Color	GadgetSliderGetEnabledBorderColor( GameWindow *g )			{ return g->wi
 
 // sliders are drawn from pieces, a left/top, right/bottom, repeating center, and small repeating center
 inline void GadgetSliderSetDisabledImages( GameWindow *g, const Image *left, const Image *right, const Image *center, const Image *smallCenter )
-{ 
+{
 	g->winSetDisabledImage( 0, left );
 	g->winSetDisabledImage( 1, right );
 	g->winSetDisabledImage( 2, center );
@@ -153,7 +150,7 @@ inline Color	GadgetSliderGetDisabledBorderColor( GameWindow *g )			{ return g->w
 
 // sliders are drawn from pieces, a left/top, right/bottom, repeating center, and small repeating center
 inline void GadgetSliderSetHiliteImages( GameWindow *g, const Image *left, const Image *right, const Image *center, const Image *smallCenter )
-{ 
+{
 	g->winSetHiliteImage( 0, left );
 	g->winSetHiliteImage( 1, right );
 	g->winSetHiliteImage( 2, center );
@@ -440,6 +437,3 @@ inline Color GadgetSliderGetHiliteSelectedThumbBorderColor( GameWindow *g )
 																						}
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETSLIDER_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h
index 14147891249..325c04b49c6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetStaticText.h ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -40,7 +40,7 @@
 //
 // Desc:       Helpful interface for StaticTexts
 //
-// StaticText IMAGE/COLOR organization 
+// StaticText IMAGE/COLOR organization
 // When control is enabled:
 //   enabledDrawData[ 0 ] is the background image for the whole enabled control
 //
@@ -55,9 +55,6 @@
 
 #pragma once
 
-#ifndef __GADGETSTATICTEXT_H_
-#define __GADGETSTATICTEXT_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -101,6 +98,3 @@ inline Color		 GadgetStaticTextGetHiliteColor( GameWindow *g )								{ return g
 inline Color		 GadgetStaticTextGetHiliteBorderColor( GameWindow *g )					{ return g->winGetHiliteBorderColor( 0 ); }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETSTATICTEXT_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h
index d6a71000f93..d4bb0d9a055 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef __GADGETTABCONTROL_H_
-#define __GADGETTABCONTROL_H_
-
 enum
 {
 	GTC_BACKGROUND = 0,
@@ -274,6 +271,3 @@ inline Color GadgetTabControlGetHiliteBorderColorBackground( GameWindow *g )
 
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETTABCONTROL_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h
index 6635232627c..dde3a09bec7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h
@@ -24,12 +24,12 @@
 
 // FILE: GadgetTextEntry.h ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -40,7 +40,7 @@
 //
 // Desc:       Helpful interface for TextEntrys
 //
-// TextEntry IMAGE/COLOR organization 
+// TextEntry IMAGE/COLOR organization
 //
 // note that windows that have an outlined text field will use the color
 // for the outline specified with the TextBorder... functions
@@ -50,9 +50,6 @@
 
 #pragma once
 
-#ifndef __GADGETTEXTENTRY_H_
-#define __GADGETTEXTENTRY_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -67,9 +64,9 @@ class GameWindow;
 // INLINING ///////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-inline void GadgetTextEntrySetText( GameWindow *g, UnicodeString text ) 
-{ 
-	TheWindowManager->winSendSystemMsg( g, GEM_SET_TEXT, (WindowMsgData)&text, 0 ); 
+inline void GadgetTextEntrySetText( GameWindow *g, UnicodeString text )
+{
+	TheWindowManager->winSendSystemMsg( g, GEM_SET_TEXT, (WindowMsgData)&text, 0 );
 }
 extern UnicodeString GadgetTextEntryGetText( GameWindow *textentry ); ///< Get the text from the text entry field
 extern void GadgetTextEntrySetFont( GameWindow *g, GameFont *font );  ///< set font for window and edit text display strings
@@ -124,6 +121,3 @@ inline Color GadgetTextEntryGetHiliteColor( GameWindow *g )								{ return g->w
 inline Color GadgetTextEntryGetHiliteBorderColor( GameWindow *g )					{ return g->winGetHiliteBorderColor( 0 ); }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GADGETTEXTENTRY_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h
index 3411ab8defe..3a0d32e59f6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _GAME_INTERFACE_H_
-#define _GAME_INTERFACE_H_
-
 #include "Common/GameType.h"
 #include "Common/MessageStream.h"		// for GameMessageTranslator
 #include "Common/Snapshot.h"
@@ -58,7 +55,7 @@ class ChallengeGenerals;
 class SnowManager;
 
 /// Function pointers for use by GameClient callback functions.
-typedef void (*GameClientFuncPtr)( Drawable *draw, void *userData ); 
+typedef void (*GameClientFuncPtr)( Drawable *draw, void *userData );
 //typedef std::hash_map<DrawableID, Drawable *, rts::hash<DrawableID>, rts::equal_to<DrawableID> > DrawablePtrHash;
 //typedef DrawablePtrHash::iterator DrawablePtrHashIt;
 
@@ -74,12 +71,12 @@ class GameClientMessageDispatcher : public GameMessageTranslator
 public:
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
 	virtual ~GameClientMessageDispatcher() { }
-};	
+};
 
 
 //-----------------------------------------------------------------------------
 /**
- * The GameClient class is used to instantiate a singleton which 
+ * The GameClient class is used to instantiate a singleton which
  * implements the interface to all GameClient operations such as Drawable access and user-interface functions.
  */
 class GameClient : public SubsystemInterface,
@@ -99,6 +96,10 @@ class GameClient : public SubsystemInterface,
 	virtual void setFrame( UnsignedInt frame ) { m_frame = frame; }			///< Set the GameClient's internal frame number
 	virtual void registerDrawable( Drawable *draw );										///< Given a drawable, register it with the GameClient and give it a unique ID
 
+	void step(); ///< Do one fixed time step
+
+	void updateHeadless();
+
 	void addDrawableToLookupTable( Drawable *draw );			///< add drawable ID to hash lookup table
 	void removeDrawableFromLookupTable( Drawable *draw );	///< remove drawable ID from hash lookup table
 
@@ -109,13 +110,13 @@ class GameClient : public SubsystemInterface,
 
 	virtual Drawable *firstDrawable( void ) { return m_drawableList; }
 
-	virtual GameMessage::Type evaluateContextCommand( Drawable *draw, 
-																										const Coord3D *pos, 
+	virtual GameMessage::Type evaluateContextCommand( Drawable *draw,
+																										const Coord3D *pos,
 																										CommandTranslator::CommandEvaluateType cmdType );
 	void addTextBearingDrawable( Drawable *tbd );
 	void flushTextBearingDrawables( void);
 	void updateFakeDrawables(void);
-	
+
 	virtual void removeFromRayEffects( Drawable *draw );  ///< remove the drawable from the ray effect system if present
 	virtual void getRayEffectData( Drawable *draw, RayEffectData *effectData );  ///< get ray effect data for a drawable
 	virtual void createRayEffectByTemplate( const Coord3D *start, const Coord3D *end, const ThingTemplate* tmpl ) = 0;  ///< create effect needing start and end location
@@ -127,7 +128,7 @@ class GameClient : public SubsystemInterface,
 
 	virtual void iterateDrawablesInRegion( Region3D *region, GameClientFuncPtr userFunc, void *userData );		///< Calls userFunc for each drawable contained within the region
 
-	virtual Drawable *friend_createDrawable( const ThingTemplate *thing, DrawableStatus statusBits = DRAWABLE_STATUS_NONE ) = 0;
+	virtual Drawable *friend_createDrawable( const ThingTemplate *thing, DrawableStatusBits statusBits = DRAWABLE_STATUS_DEFAULT ) = 0;
 	virtual void destroyDrawable( Drawable *draw );											///< Destroy the given drawable
 
 	virtual void setTimeOfDay( TimeOfDay tod );													///< Tell all the drawables what time of day it is now
@@ -139,7 +140,8 @@ class GameClient : public SubsystemInterface,
 
 	//---------------------------------------------------------------------------
 	virtual void setTeamColor( Int red, Int green, Int blue ) = 0;  ///< @todo superhack for demo, remove!!!
-	virtual void adjustLOD( Int adj ) = 0; ///< @todo hack for evaluation, remove.
+
+	virtual void setTextureLOD( Int level ) = 0;
 
 	virtual void releaseShadows(void);	///< frees all shadow resources used by this module - used by Options screen.
 	virtual void allocateShadows(void); ///< create shadow resources if not already present. Used by Options screen.
@@ -147,7 +149,7 @@ class GameClient : public SubsystemInterface,
   virtual void preloadAssets( TimeOfDay timeOfDay );									///< preload assets
 
 	virtual Drawable *getDrawableList( void ) { return m_drawableList; }
-	
+
 	void resetRenderedObjectCount() { m_renderedObjectCount = 0; }
 	UnsignedInt getRenderedObjectCount() const { return m_renderedObjectCount; }
 	void incrementRenderedObjectCount() { m_renderedObjectCount++; }
@@ -207,15 +209,15 @@ class GameClient : public SubsystemInterface,
 	DrawableTOCEntry *findTOCEntryByName( AsciiString name );	///< find DrawableTOC by name
 	DrawableTOCEntry *findTOCEntryById( UnsignedShort id );		///< find DrawableTOC by id
 	void xferDrawableTOC( Xfer *xfer );												///< save/load drawable TOC for current state of map
-	
+
 	typedef std::list< Drawable* > TextBearingDrawableList;
 	typedef TextBearingDrawableList::iterator TextBearingDrawableListIterator;
 	TextBearingDrawableList m_textBearingDrawableList;	///< the drawables that have registered here during drawablepostdraw
 };
 
 //Kris: Try not to use this if possible. In every case I found in the code base, the status was always Drawable::SELECTED.
-//      There is another iterator already in game that stores JUST selected drawables. Take a look at the efficient 
-//      example, InGameUI::getAllSelectedDrawables(). 
+//      There is another iterator already in game that stores JUST selected drawables. Take a look at the efficient
+//      example, InGameUI::getAllSelectedDrawables().
 #define BEGIN_ITERATE_DRAWABLES_WITH_STATUS(STATUS, DRAW) \
 	do \
 	{ \
@@ -224,7 +226,7 @@ class GameClient : public SubsystemInterface,
 		{ \
 			_xq_nextDrawable = DRAW->getNextDrawable(); \
 			if (DRAW->getStatusFlags() & (STATUS)) \
-			{ 
+			{
 
 #define END_ITERATE_DRAWABLES \
 			} \
@@ -243,7 +245,7 @@ inline Drawable* GameClient::findDrawableByID( const DrawableID id )
 
 //	DrawablePtrHashIt it = m_drawableHash.find(id);
 //	if (it == m_drawableHash.end()) {
-//		// no such drawable	
+//		// no such drawable
 //		return NULL;
 //	}
 //
@@ -265,7 +267,7 @@ extern GameClient *TheGameClient;
 // The game is structurally separated into GameLogic and GameClient.
 // The Logic is responsible for everything that affects the game mechanic and what is synchronized over
 // the network. The Client is responsible for rendering, input, audio and similar stuff.
-// 
+//
 // Unfortunately there are some places in the code that make the Logic depend on the Client.
 // (Search for @logic-client-separation)
 // That means if we want to run the game headless, we cannot just disable the Client. We need to disable
@@ -301,5 +303,3 @@ extern GameClient *TheGameClient;
 //					m_roadBuffer = NULL
 //					m_shroud = NULL
 //		TheRadar = RadarDummy
-
-#endif // _GAME_INTERFACE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h
index 5bf982512a3..08ce4da1ecc 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GAMEFONT_H_
-#define __GAMEFONT_H_
-
 #include "Common/SubsystemInterface.h"
 #include "Lib/BaseType.h"
 #include "Common/AsciiString.h"
@@ -42,7 +39,7 @@
 //-------------------------------------------------------------------------------------------------
 class GameFont : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameFont, "GameFont")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameFont, "GameFont")
 public:
 	GameFont*			next;  ///< for library use
 	AsciiString		nameString;
@@ -97,7 +94,7 @@ class FontLibrary : public SubsystemInterface
 // INLINING ///////////////////////////////////////////////////////////////////////////////////////
 inline Int FontLibrary::getCount( void ) { return m_count; }
 inline GameFont *FontLibrary::firstFont( void ) { return m_fontList; }
-inline GameFont *FontLibrary::nextFont( GameFont *font ) 
+inline GameFont *FontLibrary::nextFont( GameFont *font )
 {
 	if( font )
 		return font->next;
@@ -106,6 +103,3 @@ inline GameFont *FontLibrary::nextFont( GameFont *font )
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern FontLibrary *TheFontLibrary;  ///< font library external
-
-#endif // __GAMEFONT_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h
index 2095ce903a5..c49fc678ddb 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GAMEINFOWINDOW_H_
-#define __GAMEINFOWINDOW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/GameWindow.h"
 #include "GameNetwork/LANGameInfo.h"
@@ -41,6 +38,3 @@ extern void CreateLANGameInfoWindow( GameWindow *sizeAndPosWin );
 extern void DestroyGameInfoWindow(void);
 extern void RefreshGameInfoWindow(GameInfo *gameInfo, UnicodeString gameName);
 extern void HideGameInfoWindow(Bool hide);
-
-#endif // __GAMEINFOWINDOW_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameText.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameText.h
index 2b653f9ce58..500c4ecd22d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameText.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameText.h
@@ -24,12 +24,12 @@
 
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    RTS 3
@@ -42,12 +42,8 @@
 
 #pragma once
 
-#ifndef __GAMECLIENT_GAMETEXT_H_
-#define __GAMECLIENT_GAMETEXT_H_
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
@@ -63,7 +59,7 @@ class UnicodeString;
 typedef std::vector<AsciiString> AsciiStringVec;
 
 //===============================
-// GameTextInterface 
+// GameTextInterface
 //===============================
 /** Game text interface object for localised text.
 	*/
@@ -77,11 +73,29 @@ class GameTextInterface : public SubsystemInterface
 		virtual ~GameTextInterface() {};
 
 		virtual UnicodeString fetch( const Char *label, Bool *exists = NULL ) = 0;		///< Returns the associated labeled unicode text
-		virtual UnicodeString fetch( AsciiString label, Bool *exists = NULL ) = 0;		///< Returns the associated labeled unicode text
+		virtual UnicodeString fetch( AsciiString label, Bool *exists = NULL ) = 0;		///< Returns the associated labeled unicode text ; TheSuperHackers @todo Remove
+		virtual UnicodeString fetchFormat( const Char *label, ... ) = 0;
+
+		// Do not call this directly, but use the FETCH_OR_SUBSTITUTE macro
+		virtual UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText ) = 0;
+		virtual UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... ) = 0;
+		virtual UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args ) = 0;
+
 		// This function is not performance tuned.. Its really only for Worldbuilder. jkmcd
 		virtual AsciiStringVec& getStringsWithLabelPrefix(AsciiString label) = 0;
 
 		virtual void					initMapStringFile( const AsciiString& filename ) = 0;
+
+#if __cplusplus < 201103L // TheSuperHackers @todo Remove function when abandoning VC6
+		inline UnicodeString FETCH_OR_SUBSTITUTE_FORMAT( const Char *label, const WideChar *substituteFormat, ... )
+		{
+			va_list args;
+			va_start(args, substituteFormat);
+			UnicodeString str = fetchOrSubstituteFormatVA(label, substituteFormat, args);
+			va_end(args);
+			return str;
+		}
+#endif
 };
 
 
@@ -89,8 +103,25 @@ extern GameTextInterface *TheGameText;
 extern GameTextInterface* CreateGameTextInterface( void );
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
 
+// TheSuperHackers @info This is meant to be used like:
+// TheGameText->FETCH_OR_SUBSTITUTE("GUI:LabelName", L"Substitute Fallback Text")
+// TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:LabelName", L"Substitute Fallback Text %d %d", 1, 2)
+// The substitute text will be compiled out if ENABLE_GAMETEXT_SUBSTITUTES is not defined.
+#if ENABLE_GAMETEXT_SUBSTITUTES
+
+#define FETCH_OR_SUBSTITUTE(labelA, substituteTextW) fetchOrSubstitute(labelA, substituteTextW)
+#if __cplusplus >= 201103L // TheSuperHackers @todo Remove condition when abandoning VC6
+#define FETCH_OR_SUBSTITUTE_FORMAT(labelA, substituteFormatW, ...) fetchOrSubstituteFormat(labelA, substituteFormatW, __VA_ARGS__)
+#endif
+
+#else
+
+#define FETCH_OR_SUBSTITUTE(labelA, substituteTextW) fetch(labelA)
+#if __cplusplus >= 201103L // TheSuperHackers @todo Remove condition when abandoning VC6
+#define FETCH_OR_SUBSTITUTE_FORMAT(labelA, substituteTextW, ...) fetchFormat(labelA, __VA_ARGS__)
+#endif
 
-#endif // __GAMECLIENT_GAMETEXT_H_
+#endif // ENABLE_GAMETEXT_SUBSTITUTES
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h
index f171a5bb7c5..18f652a9dfb 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h
@@ -24,12 +24,12 @@
 
 // FILE: GameWindow.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __GAMEWINDOW_H_
-#define __GAMEWINDOW_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -83,20 +80,20 @@ enum WindowMsgHandledType CPP_11(: Int) { MSG_IGNORED, MSG_HANDLED };
 
 // callback types -------------------------------------------------------------
 typedef void (*GameWinMsgBoxFunc)( void ); //used for the Message box callbacks.
-typedef void (*GameWinDrawFunc)( GameWindow *, 
+typedef void (*GameWinDrawFunc)( GameWindow *,
 																 WinInstanceData * );
-typedef void (*GameWinTooltipFunc)( GameWindow *, 
-																		WinInstanceData *, 
+typedef void (*GameWinTooltipFunc)( GameWindow *,
+																		WinInstanceData *,
 																		UnsignedInt );
-typedef WindowMsgHandledType (*GameWinInputFunc)( GameWindow *, 
-																	UnsignedInt, 
-																	WindowMsgData, 
+typedef WindowMsgHandledType (*GameWinInputFunc)( GameWindow *,
+																	UnsignedInt,
+																	WindowMsgData,
 																	WindowMsgData );
-typedef WindowMsgHandledType (*GameWinSystemFunc)( GameWindow *, 
-																	 UnsignedInt, 
-																	 WindowMsgData, 
+typedef WindowMsgHandledType (*GameWinSystemFunc)( GameWindow *,
+																	 UnsignedInt,
+																	 WindowMsgData,
 																	 WindowMsgData );
-	 
+
 enum
 {
 
@@ -197,7 +194,7 @@ enum
 	MSG_BOX_YES							= 0x01, //Display the yes button
 	MSG_BOX_NO							= 0x02, //Display the No button
 	MSG_BOX_OK							= 0x08, //Display the Ok button
-	MSG_BOX_CANCEL					= 0x04, //Display the Cancel button	
+	MSG_BOX_CANCEL					= 0x04, //Display the Cancel button
 };
 
 
@@ -263,11 +260,11 @@ friend class GameWindowManager;
 	UnsignedInt winGetStyle( void );  ///< get style bits
 	Int winNextTab( void );  ///< advance focus to next window
 	Int winPrevTab( void );  ///< change focus to previous window
-	Int winSetPosition( Int x, Int y );  ///< set window position                                 
+	Int winSetPosition( Int x, Int y );  ///< set window position
 	Int winGetPosition( Int *x, Int *y );  ///< get window position
 	Int winGetScreenPosition( Int *x, Int *y );  ///< get screen coordinates
 	Int winGetRegion( IRegion2D *region );  ///< get window region
-	Int winSetCursorPosition( Int x, Int y );  ///< set window cursor position                                 
+	Int winSetCursorPosition( Int x, Int y );  ///< set window cursor position
 	Int winGetCursorPosition( Int *x, Int *y );  ///< get window cursor position
 
 	// --------------------------------------------------------------------------
@@ -343,7 +340,7 @@ friend class GameWindowManager;
 
 	// these are for interacting with a group of windows as a shell "screen"
 	void winSetNextInLayout( GameWindow *next );  ///< set next in layout
-	void winSetPrevInLayout( GameWindow *prev );  ///< set prev in layout 
+	void winSetPrevInLayout( GameWindow *prev );  ///< set prev in layout
 	void winSetLayout( WindowLayout *layout );  ///< set layout
 	WindowLayout *winGetLayout( void );  ///< get layout layout
 	GameWindow *winGetNextInLayout( void );  ///< get next window in layout
@@ -360,7 +357,7 @@ friend class GameWindowManager;
 
 	// pick correlation ---------------------------------------------------------
 	Bool winPointInWindow( Int x, Int y );  /**is point inside this window?
-																					also return TRUE if point is in 
+																					also return TRUE if point is in
 																					a child */
 	/** given a piont, return the child window which contains the mouse pointer,
 	if the point is not in a chilc, the function returns the 'window' paramater
@@ -433,7 +430,7 @@ friend class GameWindowManager;
 	// vector of window transitions that have a relation to the current GameWindow
 	std::vector<TransitionWindow*> m_transitionWindows;
 
-};  // end class GameWindow
+};
 
 // TheSuperHackers @feature helmutbuhler 24/04/2025
 // GameWindow that does nothing. Used for Headless Mode.
@@ -458,7 +455,7 @@ class ModalWindow : public MemoryPoolObject
 EMPTY_DTOR(ModalWindow)
 
 // Errors returned by window functions
-enum 
+enum
 {
 
 	WIN_ERR_OK								=  0,	// No Error
@@ -484,26 +481,23 @@ enum
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-extern void GameWinDefaultDraw( GameWindow *window, 
+extern void GameWinDefaultDraw( GameWindow *window,
 																WinInstanceData *instData );
-extern WindowMsgHandledType GameWinDefaultSystem( GameWindow *window, 
-																	UnsignedInt msg, 
-																  WindowMsgData mData1, 
+extern WindowMsgHandledType GameWinDefaultSystem( GameWindow *window,
+																	UnsignedInt msg,
+																  WindowMsgData mData1,
 																	WindowMsgData mData2 );
-extern WindowMsgHandledType GameWinDefaultInput( GameWindow *window, 
+extern WindowMsgHandledType GameWinDefaultInput( GameWindow *window,
 																 UnsignedInt msg,
-																 WindowMsgData mData1, 
+																 WindowMsgData mData1,
 																 WindowMsgData mData2 );
-extern WindowMsgHandledType GameWinBlockInput( GameWindow *window, 
+extern WindowMsgHandledType GameWinBlockInput( GameWindow *window,
 																 UnsignedInt msg,
-																 WindowMsgData mData1, 
+																 WindowMsgData mData1,
 																 WindowMsgData mData2 );
-extern void GameWinDefaultTooltip( GameWindow *window, 
+extern void GameWinDefaultTooltip( GameWindow *window,
 																	 WinInstanceData *instData,
 																	 UnsignedInt mouse );
 
-extern const char *WindowStatusNames[];
-extern const char *WindowStyleNames[];
-
-#endif // __GAMEWINDOW_H_
-
+extern const char *const WindowStatusNames[];
+extern const char *const WindowStyleNames[];
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h
index f5bb8c9883a..38cd12ec2cd 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowGlobal.h ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __GAMEWINDOWGLOBAL_H_
-#define __GAMEWINDOWGLOBAL_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -64,6 +61,3 @@
 ///////////////////////////////////////////////////////////////////////////////
 // EXTERNALS //////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-
-#endif // __GAMEWINDOWGLOBAL_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h
index 960e285a743..d4b6816d374 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowID.h ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -47,9 +47,6 @@
 
 #pragma once
 
-#ifndef __GAMEWINDOWID_H_
-#define __GAMEWINDOWID_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -84,6 +81,3 @@
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GAMEWINDOWID_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h
index fda79052f32..22616dff9d4 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h
@@ -25,16 +25,12 @@
 // FILE: GameWindowManager.h //////////////////////////////////////////////////////////////////////
 // Created:    Colin Day, June 2001
 // Desc:       The game window manager is the interface for interacting with
-//						 the windowing system for purposes of any menus, or GUI 
+//						 the windowing system for purposes of any menus, or GUI
 //						 controls.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __GAMEWINDOWMANAGER_H_
-#define __GAMEWINDOWMANAGER_H_
-
-
 #include "Common/STLTypedefs.h"
 #include "Common/SubsystemInterface.h"
 #include "GameClient/WindowLayout.h"
@@ -70,7 +66,7 @@ class WindowLayoutInfo
 };
 
 //-------------------------------------------------------------------------------------------------
-/** There exists a singleton GameWindowManager that defines how we can 
+/** There exists a singleton GameWindowManager that defines how we can
 	* interact with the game windowing system */
 //-------------------------------------------------------------------------------------------------
 class GameWindowManager : public SubsystemInterface
@@ -145,54 +141,54 @@ friend class GameWindow;
 	//---------------------------------------------------------------------------
 	// gadget creation
 	virtual GameWindow *gogoGadgetPushButton( GameWindow *parent, UnsignedInt status,
-																						Int x, Int y, Int width, Int height,	
-																						WinInstanceData *instData, 
+																						Int x, Int y, Int width, Int height,
+																						WinInstanceData *instData,
 																						GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetCheckbox( GameWindow *parent, UnsignedInt status,
-																					Int x, Int y, Int width, Int height, 
+																					Int x, Int y, Int width, Int height,
 																					WinInstanceData *instData,
 																					GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetRadioButton( GameWindow *parent, UnsignedInt status,
-																						 Int x, Int y, Int width, Int height, 
-																						 WinInstanceData *instData, 
+																						 Int x, Int y, Int width, Int height,
+																						 WinInstanceData *instData,
 																						 RadioButtonData *rData,
 																						 GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetTabControl( GameWindow *parent, UnsignedInt status,
-																						 Int x, Int y, Int width, Int height, 
-																						 WinInstanceData *instData, 
+																						 Int x, Int y, Int width, Int height,
+																						 WinInstanceData *instData,
 																						 TabControlData *rData,
 																						 GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetListBox( GameWindow *parent, UnsignedInt status,
 																				 Int x, Int y, Int width, Int height,
-																				 WinInstanceData *instData, 
+																				 WinInstanceData *instData,
 																				 ListboxData *listboxData,
 																				 GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetSlider( GameWindow *parent, UnsignedInt status,
 																				Int x, Int y, Int width, Int height,
-																				WinInstanceData *instData, 
+																				WinInstanceData *instData,
 																				SliderData *sliderData,
 																				GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetProgressBar( GameWindow *parent, UnsignedInt status,
-																						 Int x, Int y, Int width, Int height, 
+																						 Int x, Int y, Int width, Int height,
 																						 WinInstanceData *instData,
 																						 GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetStaticText( GameWindow *parent, UnsignedInt status,
 																						Int x, Int y, Int width, Int height,
-																						WinInstanceData *instData, 
+																						WinInstanceData *instData,
 																						TextData *textData,
 																						GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetTextEntry( GameWindow *parent, UnsignedInt status,
 																					 Int x, Int y, Int width, Int height,
-																					 WinInstanceData *instData, 
+																					 WinInstanceData *instData,
 																					 EntryData *entryData,
 																					 GameFont *defaultFont, Bool defaultVisual );
 	virtual GameWindow *gogoGadgetComboBox( GameWindow *parent, UnsignedInt status,
 										                              Int x, Int y, Int width, Int height,
-																									WinInstanceData *instData, 
+																									WinInstanceData *instData,
 																									ComboBoxData *comboBoxDataTemplate,
 																								  GameFont *defaultFont, Bool defaultVisual );
 
-	/** Use this method to assign the default images to gadgets as 
+	/** Use this method to assign the default images to gadgets as
 		* they area created */
 	virtual void assignDefaultGadgetLook( GameWindow *gadget,
 																				GameFont *defaultFont,
@@ -226,7 +222,7 @@ friend class GameWindow;
 																	 Bool hideFlag );
 	/// enable all windows in a range of id's (inclusive)
 	virtual void enableWindowsInRange( GameWindow *baseWindow, Int first, Int last,
-																		 Bool enableFlag );	
+																		 Bool enableFlag );
 
 	/// this gets called from winHide() when a window hides itself
 	virtual void windowHiding( GameWindow *window );
@@ -246,7 +242,7 @@ friend class GameWindow;
 														 ICoord2D *mousePos,
 														 void *data );
 	/// process a singke key event
-	virtual WinInputReturnCode winProcessKey( UnsignedByte key, 
+	virtual WinInputReturnCode winProcessKey( UnsignedByte key,
 																						UnsignedByte state );
 	// --------------------------------------------------------------------------
 
@@ -256,6 +252,10 @@ friend class GameWindow;
 	virtual GameWindow *winGetGrabWindow( void );  ///< who is currently 'held' by mouse
 	virtual void winSetLoneWindow( GameWindow *window );  ///< set the open window
 
+	// Finds the top-level window at the mouse position that matches the required and forbidden status masks.
+	virtual GameWindow* findWindowUnderMouse(GameWindow*& toolTipWindow, const ICoord2D* mousePos, unsigned int requiredStatusMask, unsigned int forbiddenStatusMask);
+	static bool isMouseWithinWindow(GameWindow* window, const ICoord2D* mousePos, unsigned int requiredStatusMask, unsigned int forbiddenStatusMask);
+
 	virtual Bool isEnabled( GameWindow *win );  ///< is window or parents enabled
 	virtual Bool isHidden( GameWindow *win );  ///< is parent or parents hidden
 	virtual void addWindowToParent( GameWindow *window, GameWindow *parent );
@@ -271,7 +271,7 @@ friend class GameWindow;
 
 	/** get the window pointer from id, starting at 'window' and searching
 	down the heirarchy.  If 'window' is NULL then all windows will
-	be searched */ 
+	be searched */
 	virtual GameWindow *winGetWindowFromId( GameWindow *window, Int id );
 	virtual Int winCapture( GameWindow *window );  ///< captures the mouse
 	virtual Int winRelease( GameWindow *window );  ///< release mouse capture
@@ -313,14 +313,14 @@ friend class GameWindow;
 	virtual Int winIsAlNum( Int c );  ///< is character alpha-numeric
 	virtual void winFormatText( GameFont *font, UnicodeString text, Color color,
 															Int x, Int y, Int width, Int height );
-	virtual void winGetTextSize( GameFont *font, UnicodeString text, 
+	virtual void winGetTextSize( GameFont *font, UnicodeString text,
 															 Int *width, Int *height, Int maxWidth );
 	virtual UnicodeString winTextLabelToText( AsciiString label );  ///< convert localizable text label to real text
 	virtual GameFont *winFindFont( AsciiString fontName, Int pointSize, Bool bold );  ///< get a font given a name
 
 	/// @todo just for testing, remov this
 	Bool initTestGUI( void );
-	
+
 	virtual GameWindow *getWindowUnderCursor( Int x, Int y, Bool ignoreEnabled = FALSE );	///< find the top window at the given coordinates
 
 	//---------------------------------------------------------------------------
@@ -355,7 +355,7 @@ friend class GameWindow;
 	const Image *m_cursorBitmap;
 	UnsignedInt m_captureFlags;
 
-};  // end GameWindowManager
+};
 
 // INLINE /////////////////////////////////////////////////////////////////////////////////////////
 inline GameWinDrawFunc GameWindowManager::getDefaultDraw( void ) { return GameWinDefaultDraw; }
@@ -367,16 +367,16 @@ inline GameWinTooltipFunc GameWindowManager::getDefaultTooltip( void ) { return
 extern GameWindowManager *TheWindowManager;			///< singleton extern definition
 extern UnsignedInt WindowLayoutCurrentVersion;  ///< current version of our window layouts
 
-// this function lets us generically pass button selections to our parent, we may 
+// this function lets us generically pass button selections to our parent, we may
 // frequently want to do this because we want windows grouped on child windows for
 // convenience, but only want one logical system procedure responding to them all
-extern WindowMsgHandledType PassSelectedButtonsToParentSystem( GameWindow *window, 
+extern WindowMsgHandledType PassSelectedButtonsToParentSystem( GameWindow *window,
 																															 UnsignedInt msg,
-																															 WindowMsgData mData1, 
+																															 WindowMsgData mData1,
 																															 WindowMsgData mData2 );
-extern WindowMsgHandledType PassMessagesToParentSystem( GameWindow *window, 
+extern WindowMsgHandledType PassMessagesToParentSystem( GameWindow *window,
 																															 UnsignedInt msg,
-																															 WindowMsgData mData1, 
+																															 WindowMsgData mData1,
 																															 WindowMsgData mData2 );
 
 // TheSuperHackers @feature helmutbuhler 24/04/2025
@@ -412,6 +412,3 @@ class GameWindowManagerDummy : public GameWindowManager
 	virtual GameWinDrawFunc getTextEntryImageDrawFunc() { return NULL; }
 	virtual GameWinDrawFunc getTextEntryDrawFunc() { return NULL; }
 };
-
-#endif // __GAMEWINDOWMANAGER_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h
index e0d5a43d4af..ab051613529 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowTransitions.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Dec 2002
@@ -37,16 +37,15 @@
 //	Filename: 	GameWindowTransitions.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __GAME_WINDOW_TRANSITIONS_H_
-#define __GAME_WINDOW_TRANSITIONS_H_
+#include "Common/GameCommon.h"
 
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
@@ -84,10 +83,10 @@ CONTROL_BAR_ARROW_TRANSITION,
 SCORE_SCALE_UP_TRANSITION,
 REVERSE_SOUND_TRANSITION,
 
-MAX_TRANSITION_WINDOW_STYLES				///< Keep this last
+MAX_TRANSITION_WINDOW_STYLES
 };
 
-static const LookupListRec TransitionStyleNames[] = 
+static const LookupListRec TransitionStyleNames[] =
 {
 	{ "FLASH",					TRANSITION_FLASH },
 	{ "BUTTONFLASH",		BUTTON_TRANSITION_FLASH },
@@ -104,11 +103,9 @@ static const LookupListRec TransitionStyleNames[] =
 	{ "CONTROLBARARROW",			CONTROL_BAR_ARROW_TRANSITION },
 	{ "SCORESCALEUP",			SCORE_SCALE_UP_TRANSITION },
 	{ "REVERSESOUND",			REVERSE_SOUND_TRANSITION },
-	
-	
-
-	{ NULL, 0	}// keep this last!
+	{ NULL, 0	}
 };
+static_assert(ARRAY_SIZE(TransitionStyleNames) == MAX_TRANSITION_WINDOW_STYLES + 1, "Incorrect array size");
 
 // base class for the transitions
 // inherit off of this adding in all the values
@@ -122,14 +119,14 @@ class Transition
 	virtual void update( Int frame ) = 0;
 	virtual void reverse( void ) = 0;
 	virtual void draw( void ) = 0;
-	
+
 	virtual void skip( void ) = 0;
-	
+
 	void unlinkGameWindow(GameWindow* win) { if ( m_win == win ) m_win = NULL; }
 	Bool isFinished( void ) { return m_isFinished;	}
 	Int getFrameLength( void ){ return m_frameLength;	}
 protected:
-	
+
 	Int m_frameLength;	// how many frames does this thing take.
 	Bool m_isFinished;  // when we finish we set this
 	Bool m_isForward;
@@ -148,9 +145,9 @@ class TextOnFrameTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	TEXTONFRAMETRANSITION_START = 0,
@@ -170,9 +167,9 @@ class ReverseSoundTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	REVERSESOUNDTRANSITION_START = 0,
@@ -193,9 +190,9 @@ class FullFadeTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	FULLFADETRANSITION_START = 0,
@@ -205,7 +202,7 @@ class FullFadeTransition : public Transition
 	ICoord2D m_size;
 	Real m_percent;
 	Int m_drawState;
-	
+
 };
 //-----------------------------------------------------------------------------
 class ControlBarArrowTransition : public Transition
@@ -218,9 +215,9 @@ class ControlBarArrowTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	CONTROLBARARROWTRANSITION_START = 0,
@@ -234,7 +231,7 @@ class ControlBarArrowTransition : public Transition
 	Real m_fadePercent;
 	Int m_drawState;
 	const Image* m_arrowImage;
-	
+
 };
 //-----------------------------------------------------------------------------
 class ScreenFadeTransition : public Transition
@@ -247,9 +244,9 @@ class ScreenFadeTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	SCREENFADETRANSITION_START = 0,
@@ -259,7 +256,7 @@ class ScreenFadeTransition : public Transition
 	ICoord2D m_size;
 	Real m_percent;
 	Int m_drawState;
-	
+
 };
 //-----------------------------------------------------------------------------
 class CountUpTransition : public Transition
@@ -272,9 +269,9 @@ class CountUpTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	COUNTUPTRANSITION_START = 0,
@@ -306,9 +303,9 @@ class TextTypeTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	TEXTTYPETRANSITION_START = 0,
@@ -333,9 +330,9 @@ class MainMenuScaleUpTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	MAINMENUSCALEUPTRANSITION_START = 0,
@@ -363,9 +360,9 @@ class MainMenuMediumScaleUpTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	MAINMENUMEDIUMSCALEUPTRANSITION_START = 0,
@@ -391,9 +388,9 @@ class MainMenuSmallScaleDownTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	MAINMENUSMALLSCALEDOWNTRANSITION_START = 0,
@@ -402,7 +399,7 @@ class MainMenuSmallScaleDownTransition : public Transition
 	MAINMENUSMALLSCALEDOWNTRANSITION_3 = 3,
 	MAINMENUSMALLSCALEDOWNTRANSITION_4 = 4,
 	MAINMENUSMALLSCALEDOWNTRANSITION_5 = 5,
-	MAINMENUSMALLSCALEDOWNTRANSITION_END 
+	MAINMENUSMALLSCALEDOWNTRANSITION_END
 	};
 	ICoord2D m_pos;
 	ICoord2D m_size;
@@ -424,9 +421,9 @@ class ScaleUpTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	SCALEUPTRANSITION_START = 0,
@@ -449,7 +446,7 @@ class ScaleUpTransition : public Transition
 //	SCALEUPTRANSITION_17 = 17,
 //	SCALEUPTRANSITION_18 = 18,
 //	SCALEUPTRANSITION_19 = 19,
-	SCALEUPTRANSITION_END 
+	SCALEUPTRANSITION_END
 	};
 	ICoord2D m_pos;
 	ICoord2D m_size;
@@ -469,9 +466,9 @@ class ScoreScaleUpTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	SCORESCALEUPTRANSITION_START = 0,
@@ -481,7 +478,7 @@ class ScoreScaleUpTransition : public Transition
 	SCORESCALEUPTRANSITION_4 = 4,
 	SCORESCALEUPTRANSITION_5 = 5,
 
-	SCORESCALEUPTRANSITION_END 
+	SCORESCALEUPTRANSITION_END
 	};
 	ICoord2D m_pos;
 	ICoord2D m_size;
@@ -503,9 +500,9 @@ class FadeTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	FADETRANSITION_START = 0,
@@ -518,7 +515,7 @@ class FadeTransition : public Transition
 	FADETRANSITION_FADE_IN_7 = 7,
 	FADETRANSITION_FADE_IN_8 = 8,
 	FADETRANSITION_FADE_IN_9 = 9,
-	FADETRANSITION_END 
+	FADETRANSITION_END
 	};
 	ICoord2D m_pos;
 	ICoord2D m_size;
@@ -538,9 +535,9 @@ class FlashTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	FLASHTRANSITION_START = 0,
@@ -551,7 +548,7 @@ class FlashTransition : public Transition
 	FLASHTRANSITION_FADE_TO_BACKGROUND_2 = 5,
 	FLASHTRANSITION_FADE_TO_BACKGROUND_3 = 6,
 	FLASHTRANSITION_FADE_TO_BACKGROUND_4 = 7,
-	FLASHTRANSITION_END 
+	FLASHTRANSITION_END
 	};
 	ICoord2D m_pos;
 	ICoord2D m_size;
@@ -569,9 +566,9 @@ class ButtonFlashTransition : public Transition
 	virtual void update( Int frame );
 	virtual void reverse( void );
 	virtual void draw( void );
-	
+
 	virtual void skip( void );
-	
+
 protected:
 	enum{
 	BUTTONFLASHTRANSITION_START = 0,
@@ -638,7 +635,7 @@ class TransitionGroup
 	Bool isFinished( void );
 	void reverse( void );
 	void draw( void );
-	
+
 	void skip ( void );
 	AsciiString getName( void ) { return m_name; }
 	void setName( AsciiString name){ m_name = name;	}
@@ -650,7 +647,7 @@ class TransitionGroup
 	typedef std::list<TransitionWindow *> TransitionWindowList;
 	TransitionWindowList m_transitionWindowList;
 	Int m_directionMultiplier;
-	Int m_currentFrame; ///< maintain how long we've spent on this transition;
+	Real m_currentFrame; ///< maintain how long we've spent on this transition (in 30fps-equivalent frames);
 	AsciiString m_name;
 };
 
@@ -696,5 +693,3 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha );
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 extern GameWindowTransitionsHandler *TheTransitionHandler;
-#endif // __GAME_WINDOW_TRANSITIONS_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h
index 42b07b96b0a..d69b73eda4d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h
@@ -24,12 +24,12 @@
 
 // FILE: GlobalLanguage.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,8 +37,8 @@
 //	Filename: 	GlobalLanguage.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	With workingwith different languages, we need some options that 
+//
+//	purpose:	With workingwith different languages, we need some options that
 //						change.  Essentially, this is the global data that's unique to languages
 //
 //-----------------------------------------------------------------------------
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __GLOBAL_LANGUAGE_H_
-#define __GLOBAL_LANGUAGE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -68,6 +65,18 @@ class AsciiString;
 //-----------------------------------------------------------------------------
 class GlobalLanguage : public SubsystemInterface
 {
+public:
+
+	enum ResolutionFontSizeMethod
+	{
+		ResolutionFontSizeMethod_Classic, // Uses the original scaling method. Scales poorly on wide screens and large resolutions.
+		ResolutionFontSizeMethod_ClassicNoCeiling, // Uses the original scaling method, but without ceiling. Works ok for the original Game UI and with large resolutions. Scales poorly on very wide screens.
+		ResolutionFontSizeMethod_Strict, // Uses a strict scaling method. Width and height are strictly bounded on upscales. Works well for accurate UI layouts and with large resolutions.
+		ResolutionFontSizeMethod_Balanced, // Uses a balanced scaling method. Width and height are evenly weighted for upscales. Works well for the original Game UI and with large resolutions.
+
+		ResolutionFontSizeMethod_Default = ResolutionFontSizeMethod_ClassicNoCeiling,
+	};
+
 public:
 
 	GlobalLanguage();
@@ -99,15 +108,17 @@ class GlobalLanguage : public SubsystemInterface
 	FontDesc	m_creditsTitleFont;
 	FontDesc  m_creditsPositionFont;
 	FontDesc  m_creditsNormalFont;
-
 	Real			m_resolutionFontSizeAdjustment;
+	Real			m_userResolutionFontSizeAdjustment;
+	ResolutionFontSizeMethod m_resolutionFontSizeMethod;
 
-	//UnicodeString	m_unicodeFontNameUStr;
-	
+	float getResolutionFontSizeAdjustment() const;
 	Int adjustFontSize(Int theFontSize);	// Adjusts font size for resolution. jba.
 
-	typedef std::list<AsciiString> StringList;					// Used for our font file names that we want to load		
-	typedef StringList::iterator StringListIt;				
+	void parseCustomDefinition();
+
+	typedef std::list<AsciiString> StringList;					// Used for our font file names that we want to load
+	typedef StringList::iterator StringListIt;
 
 	StringList m_localFonts;														// List of the font filenames that are in our local directory
 	static void parseFontFileName( INI *ini, void *instance, void *store, const void* userData );
@@ -121,4 +132,3 @@ class GlobalLanguage : public SubsystemInterface
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 extern GlobalLanguage *TheGlobalLanguageData;
-#endif // __GLOBAL_LANGUAGE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h
index e251b503e75..12ab92af412 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h
@@ -24,12 +24,12 @@
 
 // FILE: GraphDraw.h //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,18 +37,16 @@
 //	Filename: 	GraphDraw.h
 //
 //	author:		John McDonald
-//	
-//	purpose:	Contains the functions to queue up and display a single graph for 
+//
+//	purpose:	Contains the functions to queue up and display a single graph for
 //						each frame. Note: This class is presently only intended for use by
-//						the Performance timers, all though it could be easily adapted for 
+//						the Performance timers, all though it could be easily adapted for
 //						other purposes.
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
-#ifndef __GRAPHDRAW_H__
-#define __GRAPHDRAW_H__
 
 #include "Common/PerfTimer.h"
 #include "Common/STLTypedefs.h"
@@ -85,6 +83,3 @@ extern GraphDraw *TheGraphDraw;
 
 
 #endif /* PERF_TIMERS */
-
-#endif /* __GRAPHDRAW_H__ */
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h
index c80d3a4c274..d7683eeb8d8 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h
@@ -24,12 +24,12 @@
 
 // FILE: HeaderTemplate.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,17 +37,14 @@
 //	Filename: 	HeaderTemplate.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __HEADER_TEMPLATE_H_
-#define __HEADER_TEMPLATE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -76,28 +73,28 @@ class HeaderTemplate
 	AsciiString m_fontName;
 	Int m_point;
 	Bool m_bold;
-	
+
 };
 
 class HeaderTemplateManager
 {
 public:
 	HeaderTemplateManager( void );
-	~HeaderTemplateManager( void );	
+	~HeaderTemplateManager( void );
 
 	void init( void );
-	
+
 	const FieldParse *getFieldParse( void ) const { return m_headerFieldParseTable; }		///< Return the field parse info
 	static const FieldParse m_headerFieldParseTable[];
-	
+
 	HeaderTemplate *findHeaderTemplate( AsciiString name );
 	HeaderTemplate *newHeaderTemplate( AsciiString name );
-	
+
 	GameFont *getFontFromTemplate( AsciiString name );
 	HeaderTemplate *getFirstHeader( void );
 	HeaderTemplate *getNextHeader( HeaderTemplate *ht );
 
-	void headerNotifyResolutionChange(void);
+	void onResolutionChanged(void);
 
 private:
 	void populateGameFonts( void );
@@ -116,4 +113,3 @@ class HeaderTemplateManager
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 extern HeaderTemplateManager *TheHeaderTemplateManager;
-#endif // __HEADER_TEMPLATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h b/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h
index 71687aa7a55..e8c45b0d030 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef _H_HintSpy
-#define _H_HintSpy
-
 #include "GameClient/InGameUI.h"
 
 //-----------------------------------------------------------------------------
@@ -38,6 +35,4 @@ class HintSpyTranslator : public GameMessageTranslator
 public:
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
 	virtual ~HintSpyTranslator() { }
-};	
-
-#endif
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h b/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h
index 8e48d3ce6e5..690b3242527 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h
@@ -25,12 +25,12 @@
 
 // FILE: HotKey.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -38,17 +38,14 @@
 //	Filename: 	HotKey.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __HOT_KEY_H_
-#define __HOT_KEY_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -79,7 +76,7 @@ class HotKey
 public:
 	HotKey( void );
 	GameWindow *m_win;
-	AsciiString m_key;	
+	AsciiString m_key;
 	// we may need a checkmark system.
 };
 
@@ -97,7 +94,7 @@ class HotKeyManager : public SubsystemInterface
 
 	void addHotKey( GameWindow *win, const AsciiString& key);
 	Bool executeHotKey( const AsciiString& key); // called fromt eh HotKeyTranslator
-	
+
 	AsciiString searchHotKey( const AsciiString& label);
 	AsciiString searchHotKey( const UnicodeString& uStr );
 
@@ -113,6 +110,3 @@ extern HotKeyManager *TheHotKeyManager;
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __HOT_KEY_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h
index 13de9eaca08..5d916675274 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    Generals
@@ -43,12 +43,8 @@
 
 #pragma once
 
-#ifndef __GAMECLIENT_IMEMANAGER_H
-#define __GAMECLIENT_IMEMANAGER_H
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "Lib/BaseType.h"
@@ -77,7 +73,7 @@ class IMEManagerInterface : public SubsystemInterface
 	public:
 
 		virtual ~IMEManagerInterface() {};
-		
+
 		virtual void					attach( GameWindow *window ) = 0;		///< attach IME to specified window
 		virtual void					detatch( void ) = 0;								///< detatch IME from current window
 		virtual void					enable( void ) = 0;									///< Enable IME
@@ -87,12 +83,12 @@ class IMEManagerInterface : public SubsystemInterface
 		virtual GameWindow*		getWindow( void ) = 0;							///< Returns the window we are currently attached to
 		virtual Bool					isComposing( void ) = 0;						///< Manager is currently composing new input string
 		virtual void					getCompositionString( UnicodeString &string ) = 0; ///< Return the current composition string
-		virtual Int						getCompositionCursorPosition( void ) =0;			///< Returns the composition cursor position 
+		virtual Int						getCompositionCursorPosition( void ) =0;			///< Returns the composition cursor position
 		virtual Int						getIndexBase( void ) = 0;						///< Get index base for candidate list
 
 
 		virtual Int						getCandidateCount() = 0;						///< Returns the total number of candidates
-		virtual UnicodeString*getCandidate( Int index ) = 0;			///< Returns the candidate string 
+		virtual const UnicodeString* getCandidate( Int index ) = 0;	///< Returns the candidate string
 		virtual Int						getSelectedCandidateIndex() = 0;		///< Returns the indexed of the currently selected candidate
 		virtual Int						getCandidatePageSize() = 0;					///< Returns the page size for the candidates list
 		virtual Int						getCandidatePageStart() = 0;				///< Returns the index of the first visibel candidate
@@ -100,7 +96,7 @@ class IMEManagerInterface : public SubsystemInterface
 
 
 		/// Checks for and service IME messages. Returns TRUE if message serviced
-		virtual Bool serviceIMEMessage(	void *windowsHandle, 
+		virtual Bool serviceIMEMessage(	void *windowsHandle,
 												UnsignedInt message,
 												Int wParam,
 												Int lParam ) = 0;
@@ -113,9 +109,5 @@ extern IMEManagerInterface *CreateIMEManagerInterface( void );
 
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-
-#endif // __GAMECLIENT_IMEMANAGER_H
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h
index fa0f6a9d776..5c791363fde 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __IMAGE_H_
-#define __IMAGE_H_
-
 #include "Common/AsciiString.h"
 #include "Common/GameMemory.h"
 #include "Common/SubsystemInterface.h"
@@ -52,7 +49,7 @@ typedef enum
 
 } ImageStatus;
 #ifdef DEFINE_IMAGE_STATUS_NAMES
-static const char *imageStatusNames[] =
+static const char *const imageStatusNames[] =
 {
 	"ROTATED_90_CLOCKWISE",
 	"RAW_TEXTURE",
@@ -69,7 +66,7 @@ class Image : public MemoryPoolObject
 MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( Image, "Image" );
 
 public:
-	
+
 	Image( void );
 	// virtual desctructor defined by memory pool object
 
@@ -112,13 +109,14 @@ friend class ImageCollection;
 
 	static const FieldParse m_imageFieldParseTable[];		///< the parse table for INI definition
 
-};  // end Image
+};
 
 //-------------------------------------------------------------------------------------------------
 /** A collection of images */
 //-------------------------------------------------------------------------------------------------
 class ImageCollection : public SubsystemInterface
 {
+	typedef std::map<NameKeyType, Image *> ImageMap;
 
 public:
 
@@ -130,24 +128,26 @@ class ImageCollection : public SubsystemInterface
 	virtual void update( void ) { };			///< update system
 
 	void load( Int textureSize );												 ///< load images
-		
-	const Image *findImageByName( const AsciiString& name );					 ///< find image based on name
-	
+
+	const Image *findImage( NameKeyType namekey ) const; ///< find image based on name key
+	const Image *findImageByName( const AsciiString& name ) const; ///< find image based on name
+	const Image *findImageByName( const char* name ) const; ///< find image based on name
+
   /// adds the given image to the collection, transfers ownership to this object
   void addImage(Image *image);
 
   /// enumerates the list of existing images
   Image *Enum(unsigned index)
   {
-    for (std::map<unsigned,Image *>::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
+    for (ImageMap::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
       if (!index--)
         return i->second;
     return NULL;
   }
 
 protected:
-  std::map<unsigned,Image *> m_imageMap;  ///< maps named keys to images
-};  // end ImageCollection
+  ImageMap m_imageMap;  ///< maps named keys to images
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////////////////////////
 inline void Image::setName( AsciiString name ) { m_name = name; }
@@ -169,6 +169,3 @@ inline UnsignedInt Image::getStatus( void ) const { return m_status; }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern ImageCollection *TheMappedImageCollection;  ///< mapped images
-
-#endif // __IMAGE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h
index dc011aacc6f..d30b79567f1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _IN_GAME_UI_H_
-#define _IN_GAME_UI_H_
-
 #include "Common/GameCommon.h"
 #include "Common/GameType.h"
 #include "Common/MessageStream.h"		// for GameMessageTranslator
@@ -77,38 +74,38 @@ enum RadiusCursorType CPP_11(: Int)
 	RADIUSCURSOR_FRIENDLY_SPECIALPOWER,
 	RADIUSCURSOR_OFFENSIVE_SPECIALPOWER,
 	RADIUSCURSOR_SUPERWEAPON_SCATTER_AREA,
-	
-	RADIUSCURSOR_PARTICLECANNON, 
+
+	RADIUSCURSOR_PARTICLECANNON,
 	RADIUSCURSOR_A10STRIKE,
 	RADIUSCURSOR_CARPETBOMB,
 	RADIUSCURSOR_DAISYCUTTER,
 	RADIUSCURSOR_PARADROP,
-	RADIUSCURSOR_SPYSATELLITE, 
+	RADIUSCURSOR_SPYSATELLITE,
 	RADIUSCURSOR_SPECTREGUNSHIP,
 	RADIUSCURSOR_HELIX_NAPALM_BOMB,
 
-	RADIUSCURSOR_NUCLEARMISSILE, 
+	RADIUSCURSOR_NUCLEARMISSILE,
 	RADIUSCURSOR_EMPPULSE,
 	RADIUSCURSOR_ARTILLERYBARRAGE,
 	RADIUSCURSOR_NAPALMSTRIKE,
 	RADIUSCURSOR_CLUSTERMINES,
 
-	RADIUSCURSOR_SCUDSTORM, 
+	RADIUSCURSOR_SCUDSTORM,
 	RADIUSCURSOR_ANTHRAXBOMB,
-	RADIUSCURSOR_AMBUSH, 
+	RADIUSCURSOR_AMBUSH,
 	RADIUSCURSOR_RADAR,
 	RADIUSCURSOR_SPYDRONE,
 	RADIUSCURSOR_FRENZY,
-	
+
 	RADIUSCURSOR_CLEARMINES,
 	RADIUSCURSOR_AMBULANCE,
 
 
-	RADIUSCURSOR_COUNT	// keep last
+	RADIUSCURSOR_COUNT
 };
 
 #ifdef DEFINE_RADIUSCURSOR_NAMES
-static const char *TheRadiusCursorNames[] = 
+static const char *const TheRadiusCursorNames[] =
 {
 	"NONE",
 	"ATTACK_DAMAGE_AREA",
@@ -120,33 +117,34 @@ static const char *TheRadiusCursorNames[] =
 	"OFFENSIVE_SPECIALPOWER", //red
 	"SUPERWEAPON_SCATTER_AREA",//red
 
-	"PARTICLECANNON", 
+	"PARTICLECANNON",
 	"A10STRIKE",
 	"CARPETBOMB",
 	"DAISYCUTTER",
 	"PARADROP",
-	"SPYSATELLITE",  
+	"SPYSATELLITE",
   "SPECTREGUNSHIP",
   "HELIX_NAPALM_BOMB",
 
-	"NUCLEARMISSILE", 
+	"NUCLEARMISSILE",
 	"EMPPULSE",
 	"ARTILLERYBARRAGE",
 	"NAPALMSTRIKE",
 	"CLUSTERMINES",
 
-	"SCUDSTORM", 
+	"SCUDSTORM",
 	"ANTHRAXBOMB",
-	"AMBUSH", 
+	"AMBUSH",
 	"RADAR",
 	"SPYDRONE",
 	"FRENZY",
-	
+
 	"CLEARMINES",
 	"AMBULANCE",
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheRadiusCursorNames) == RADIUSCURSOR_COUNT + 1, "Incorrect array size");
 #endif
 
 // ------------------------------------------------------------------------------------------------
@@ -171,7 +169,7 @@ typedef std::list<Drawable *>::const_iterator DrawableListCIt;
 // ------------------------------------------------------------------------------------------------
 class SuperweaponInfo : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SuperweaponInfo, "SuperweaponInfo")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SuperweaponInfo, "SuperweaponInfo")
 
 private:
 // not saved
@@ -189,10 +187,10 @@ class SuperweaponInfo : public MemoryPoolObject
 		Bool hiddenByScience,
 		Bool ready,
     Bool evaReadyPlayed,
-		const AsciiString& superweaponNormalFont, 
-		Int superweaponNormalPointSize, 
+		const AsciiString& superweaponNormalFont,
+		Int superweaponNormalPointSize,
 		Bool superweaponNormalBold,
-		Color c, 
+		Color c,
 		const SpecialPowerTemplate* spt
 	);
 
@@ -224,7 +222,7 @@ typedef std::map<AsciiString, SuperweaponList> SuperweaponMap;
 // Popup message box
 class PopupMessageData : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PopupMessageData, "PopupMessageData")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PopupMessageData, "PopupMessageData")
 public:
 	UnicodeString		message;
 	Int							x;
@@ -240,7 +238,7 @@ EMPTY_DTOR(PopupMessageData)
 // ------------------------------------------------------------------------------------------------
 class NamedTimerInfo : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NamedTimerInfo, "NamedTimerInfo")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NamedTimerInfo, "NamedTimerInfo")
 public:
 	AsciiString			m_timerName;							///< Timer name, needed on Load to reconstruct Map.
 	UnicodeString		timerText;								///< timer text
@@ -262,7 +260,7 @@ enum {MAX_SUBTITLE_LINES = 4};							///< The maximum number of lines a subtitle
 // Floating Text Data
 class FloatingTextData : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FloatingTextData, "FloatingTextData")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FloatingTextData, "FloatingTextData")
 public:
 	FloatingTextData(void);
 	//~FloatingTextData(void);
@@ -278,7 +276,7 @@ class FloatingTextData : public MemoryPoolObject
 typedef std::list<FloatingTextData *> FloatingTextList;
 typedef FloatingTextList::iterator	FloatingTextListIt;
 
-enum 
+enum
 {
 	DEFAULT_FLOATING_TEXT_TIMEOUT = LOGICFRAMES_PER_SECOND/3,
 };
@@ -318,12 +316,17 @@ typedef WorldAnimationList::iterator WorldAnimationListIterator;
 
 // ------------------------------------------------------------------------------------------------
 /** Basic functionality common to all in-game user interfaces */
-// ------------------------------------------------------------------------------------------------ 
+// ------------------------------------------------------------------------------------------------
 class InGameUI : public SubsystemInterface, public Snapshot
 {
-	
+
 friend class Drawable;	// for selection/deselection transactions
-		
+
+protected:
+
+	typedef std::list<Object*> ObjectList;
+	typedef std::list<Object*>::iterator ObjectListIt;
+
 public:  // ***************************************************************************************
 
 	enum SelectionRules
@@ -355,13 +358,12 @@ friend class Drawable;	// for selection/deselection transactions
 		ACTIONTYPE_COMBATDROP_INTO,
 		ACTIONTYPE_SABOTAGE_BUILDING,
 
-		//Keep last.
 		NUM_ACTIONTYPES
 	};
 
 	InGameUI( void );
 	virtual ~InGameUI( void );
-	
+
 	// Inherited from subsystem interface -----------------------------------------------------------
 	virtual	void init( void );															///< Initialize the in-game user interface
 	virtual void update( void );														///< Update the UI by calling preDraw(), draw(), and postDraw()
@@ -377,17 +379,20 @@ friend class Drawable;	// for selection/deselection transactions
 	// interface for messages to the user
 	// srj sez: passing as const-ref screws up varargs for some reason. dunno why. just pass by value.
 	virtual void messageColor( const RGBColor *rgbColor, UnicodeString format, ... );	///< display a colored message to the user
+	virtual void messageNoFormat( const UnicodeString& message ); ///< display a message to the user
+	virtual void messageNoFormat( const RGBColor *rgbColor, const UnicodeString& message ); ///< display a colored message to the user
 	virtual void message( UnicodeString format, ... );				  ///< display a message to the user
 	virtual void message( AsciiString stringManagerLabel, ... );///< display a message to the user
 	virtual void toggleMessages( void ) { m_messagesOn = 1 - m_messagesOn; }	///< toggle messages on/off
 	virtual Bool isMessagesOn( void ) { return m_messagesOn; }	///< are the display messages on
 	void freeMessageResources( void );				///< free resources for the ui messages
+	void freeCustomUiResources( void );				///< free resources for custom ui elements
 	Color getMessageColor(Bool altColor) { return (altColor)?m_messageColor2:m_messageColor1; }
-	
+
 	// interface for military style messages
 	virtual void militarySubtitle( const AsciiString& label, Int duration );			// time in milliseconds
 	virtual void removeMilitarySubtitle( void );
-	
+
 	// for can't build messages
 	virtual void displayCantBuildMessage( LegalBuildCode lbc ); ///< display message to use as to why they can't build here
 
@@ -401,7 +406,7 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual void createMouseoverHint( const GameMessage *msg );	///< An object is mouse hovered over, start hint if any
 	virtual void createCommandHint( const GameMessage *msg );		///< Used by HintSpy. Someone is selected so generate the right Cursor for the potential action
 	virtual void createGarrisonHint( const GameMessage *msg );  ///< A garrison command has occurred, start graphical "hint"
-	
+
 	virtual void addSuperweapon(Int playerIndex, const AsciiString& powerName, ObjectID id, const SpecialPowerTemplate *powerTemplate);
 	virtual Bool removeSuperweapon(Int playerIndex, const AsciiString& powerName, ObjectID id, const SpecialPowerTemplate *powerTemplate);
 	virtual void objectChangedTeam(const Object *obj, Int oldPlayerIndex, Int newPlayerIndex);	// notification for superweapons, etc
@@ -450,9 +455,10 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual const DrawableList *getAllSelectedDrawables( void ) const;	///< Return the list of all the currently selected Drawable IDs.
 	virtual const DrawableList *getAllSelectedLocalDrawables( void );		///< Return the list of all the currently selected Drawable IDs owned by the current player.
 	virtual Drawable *getFirstSelectedDrawable( void );							///< get the first selected drawable (if any)
-	virtual DrawableID getSoloNexusSelectedDrawableID( void ) { return m_soloNexusSelectedDrawableID; }  ///< Return the one drawable of the nexus if only 1 angry mob is selected 
+	virtual DrawableID getSoloNexusSelectedDrawableID( void ) { return m_soloNexusSelectedDrawableID; }  ///< Return the one drawable of the nexus if only 1 angry mob is selected
 	virtual Bool isDrawableSelected( DrawableID idToCheck ) const;	///< Return true if the selected ID is in the drawable list
-	virtual Bool isAnySelectedKindOf( KindOfType kindOf ) const;		///< is any selected object a kind of 
+	virtual Bool areAllObjectsSelected(const std::vector<Object*>& objectsToCheck) const;	///< Return true if all of the selected objects are in the drawable list
+	virtual Bool isAnySelectedKindOf( KindOfType kindOf ) const;		///< is any selected object a kind of
 	virtual Bool isAllSelectedKindOf( KindOfType kindOf ) const;		///< are all selected objects a kind of
 
 	virtual void setRadiusCursor(RadiusCursorType r, const SpecialPowerTemplate* sp, WeaponSlotType wslot);
@@ -466,20 +472,21 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual void preDraw( void );														///< Logic which needs to occur before the UI renders
 	virtual void draw( void ) = 0;													///< Render the in-game user interface
 	virtual void postDraw( void );													///< Logic which needs to occur after the UI renders
+	virtual void postWindowDraw( void );											///< Logic which needs to occur after the WindowManager has repainted the menus
 
-	/// Ingame video playback 
+	/// Ingame video playback
 	virtual void playMovie( const AsciiString& movieName );
 	virtual void stopMovie( void );
 	virtual VideoBuffer* videoBuffer( void );
 
-	/// Ingame cameo video playback 
+	/// Ingame cameo video playback
 	virtual void playCameoMovie( const AsciiString& movieName );
 	virtual void stopCameoMovie( void );
 	virtual VideoBuffer* cameoVideoBuffer( void );
 
-  // mouse over information	
+  // mouse over information
 	virtual DrawableID getMousedOverDrawableID( void ) const;	///< Get drawble ID of drawable under cursor
-	
+
 	/// Set the ingame flag as to if we have the Quit menu up or not
 	virtual void setQuitMenuVisible( Bool t ) { m_isQuitMenuVisible = t; }
 	virtual Bool isQuitMenuVisible( void ) const { return m_isQuitMenuVisible; }
@@ -505,11 +512,11 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual Int selectMatchingAcrossMap();                            ///< selects matching units across map
 	virtual Int selectMatchingAcrossRegion( IRegion2D *region );			// -1 = no locally-owned selection, 0+ = # of units selected
 
-	virtual Int selectAllUnitsByType(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);                
-	virtual Int selectAllUnitsByTypeAcrossScreen(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);                         
-	virtual Int selectAllUnitsByTypeAcrossMap(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);                            
-	virtual Int selectAllUnitsByTypeAcrossRegion( IRegion2D *region, KindOfMaskType mustBeSet, KindOfMaskType mustBeClear );			
-	
+	virtual Int selectAllUnitsByType(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);
+	virtual Int selectAllUnitsByTypeAcrossScreen(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);
+	virtual Int selectAllUnitsByTypeAcrossMap(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);
+	virtual Int selectAllUnitsByTypeAcrossRegion( IRegion2D *region, KindOfMaskType mustBeSet, KindOfMaskType mustBeClear );
+
 	virtual void buildRegion( const ICoord2D *anchor, const ICoord2D *dest, IRegion2D *region );  ///< builds a region around the specified coordinates
 
 	virtual Bool getDisplayedMaxWarning( void ) { return m_displayedMaxWarning; }
@@ -524,7 +531,7 @@ friend class Drawable;	// for selection/deselection transactions
 	Bool				isDrawableCaptionBold( void )				{ return m_drawableCaptionBold; }
 	Color				getDrawableCaptionColor( void )			{ return m_drawableCaptionColor; }
 
-	inline Bool shouldMoveRMBScrollAnchor( void ) { return m_moveRMBScrollAnchor; }
+	Bool shouldMoveRMBScrollAnchor( void ) { return m_moveRMBScrollAnchor; }
 
 	Bool isClientQuiet( void ) const			{ return m_clientQuiet; }
 	Bool isInWaypointMode( void ) const			{ return m_waypointMode; }
@@ -537,11 +544,11 @@ friend class Drawable;	// for selection/deselection transactions
 	void setForceMoveMode( Bool enabled )		{ m_forceMoveToMode = enabled; }
 	void setForceAttackMode( Bool enabled )		{ m_forceAttackMode = enabled; }
 	void setPreferSelectionMode( Bool enabled )		{ m_preferSelection = enabled; }
-	
+
 	void toggleAttackMoveToMode( void )				{ m_attackMoveToMode = !m_attackMoveToMode; }
 	Bool isInAttackMoveToMode( void ) const		{ return m_attackMoveToMode; }
 	void clearAttackMoveToMode( void )				{ m_attackMoveToMode = FALSE; }
-	
+
 	void setCameraRotateLeft( Bool set )		{ m_cameraRotatingLeft = set; }
 	void setCameraRotateRight( Bool set )		{ m_cameraRotatingRight = set; }
 	void setCameraZoomIn( Bool set )				{ m_cameraZoomingIn = set; }
@@ -557,8 +564,14 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual void addIdleWorker( Object *obj );
 	virtual void removeIdleWorker( Object *obj, Int playerNumber );
 	virtual void selectNextIdleWorker( void );
+	static std::vector<Object*> getUniqueIdleWorkers(const ObjectList& idleWorkers);
 
 	virtual void recreateControlBar( void );
+	virtual void refreshCustomUiResources( void );
+	virtual void refreshNetworkLatencyResources(void);
+	virtual void refreshRenderFpsResources(void);
+	virtual void refreshSystemTimeResources( void );
+	virtual void refreshGameTimeResources( void );
 
 	virtual void disableTooltipsUntil(UnsignedInt frameNum);
 	virtual void clearTooltipsDisabled();
@@ -578,22 +591,28 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual void updateIdleWorker( void );
 	virtual void resetIdleWorker( void );
 
+	void updateRenderFpsString();
+	void drawNetworkLatency(Int &x, Int &y);
+	void drawRenderFps(Int &x, Int &y);
+	void drawSystemTime(Int &x, Int &y);
+	void drawGameTime();
+
 public:
 	void registerWindowLayout(WindowLayout *layout); // register a layout for updates
 	void unregisterWindowLayout(WindowLayout *layout); // stop updates for this layout
 
   void triggerDoubleClickAttackMoveGuardHint( void );
-  
+
 
 public:
 	// World 2D animation methods
-	void addWorldAnimation( Anim2DTemplate *animTemplate, 
+	void addWorldAnimation( Anim2DTemplate *animTemplate,
 													const Coord3D *pos,
 													WorldAnimationOptions options,
 													Real durationInSeconds,
 													Real zRisePerSecond );
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void DEBUG_addFloatingText(const AsciiString& text,const Coord3D * pos, Color color);
 #endif
 
@@ -603,7 +622,7 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
 
-protected: 
+protected:
 
 	// ----------------------------------------------------------------------------------------------
 	// Protected Types ------------------------------------------------------------------------------
@@ -616,16 +635,14 @@ friend class Drawable;	// for selection/deselection transactions
 #ifdef RTS_DEBUG
 		DEBUG_HINT,
 #endif
-		NUM_HINT_TYPES  // keep this one last
 	};
 
 	// mouse mode interface
-	enum MouseMode 
+	enum MouseMode
 	{
 		MOUSEMODE_DEFAULT = 0,
 		MOUSEMODE_BUILD_PLACE,
 		MOUSEMODE_GUI_COMMAND,
-		MOUSEMODE_MAX
 	};
 
 	enum { MAX_MOVE_HINTS = 256 };
@@ -660,9 +677,6 @@ friend class Drawable;	// for selection/deselection transactions
 		Color color;															///< what color should we display the military subtitles
 	};
 
-	typedef std::list<Object *> ObjectList;
-	typedef std::list<Object *>::iterator ObjectListIt;
-	
 	// ----------------------------------------------------------------------------------------------
 	// Protected Methods ----------------------------------------------------------------------------
 	// ----------------------------------------------------------------------------------------------
@@ -684,7 +698,7 @@ friend class Drawable;	// for selection/deselection transactions
 
 	void setMouseCursor(Mouse::MouseCursor c);
 
-	
+
 	void addMessageText( const UnicodeString& formattedMessage, const RGBColor *rgbColor = NULL );  ///< internal workhorse for adding plain text for messages
 	void removeMessageAtIndex( Int i );				///< remove the message at index i
 
@@ -730,9 +744,9 @@ friend class Drawable;	// for selection/deselection transactions
 	Int													m_maxSelectCount;												///< Max number of objects to select
 	UnsignedInt									m_frameSelectionChanged;								///< Frame when the selection last changed.
 
-  Int                         m_duringDoubleClickAttackMoveGuardHintTimer; ///< Frames left to draw the doubleClickFeedbackTimer 
-  Coord3D                     m_duringDoubleClickAttackMoveGuardHintStashedPosition; 
-  
+  Int                         m_duringDoubleClickAttackMoveGuardHintTimer; ///< Frames left to draw the doubleClickFeedbackTimer
+  Coord3D                     m_duringDoubleClickAttackMoveGuardHintStashedPosition;
+
 	// Video playback data
 	VideoBuffer*								m_videoBuffer;			///< video playback buffer
 	VideoStreamInterface*				m_videoStream;			///< Video stream;
@@ -741,6 +755,50 @@ friend class Drawable;	// for selection/deselection transactions
 	VideoBuffer*								m_cameoVideoBuffer;///< video playback buffer
 	VideoStreamInterface*				m_cameoVideoStream;///< Video stream;
 
+	// Network Latency Counter
+	DisplayString *							m_networkLatencyString;
+	AsciiString									m_networkLatencyFont;
+	Int													m_networkLatencyPointSize;
+	Bool												m_networkLatencyBold;
+	Coord2D											m_networkLatencyPosition;
+	Color												m_networkLatencyColor;
+	Color												m_networkLatencyDropColor;
+	UnsignedInt									m_lastNetworkLatencyFrames;
+
+	// Render FPS Counter
+	DisplayString *							m_renderFpsString;
+	DisplayString *							m_renderFpsLimitString;
+	AsciiString									m_renderFpsFont;
+	Int													m_renderFpsPointSize;
+	Bool												m_renderFpsBold;
+	Coord2D											m_renderFpsPosition;
+	Color												m_renderFpsColor;
+	Color												m_renderFpsLimitColor;
+	Color												m_renderFpsDropColor;
+	UnsignedInt									m_renderFpsRefreshMs;
+	UnsignedInt									m_lastRenderFps;
+	UnsignedInt									m_lastRenderFpsLimit;
+	UnsignedInt									m_lastRenderFpsUpdateMs;
+
+	// System Time
+	DisplayString *										m_systemTimeString;
+	AsciiString											m_systemTimeFont;
+	Int													m_systemTimePointSize;
+	Bool												m_systemTimeBold;
+	Coord2D												m_systemTimePosition;
+	Color												m_systemTimeColor;
+	Color												m_systemTimeDropColor;
+
+	// Game Time
+	DisplayString *										m_gameTimeString;
+	DisplayString *										m_gameTimeFrameString;
+	AsciiString											m_gameTimeFont;
+	Int													m_gameTimePointSize;
+	Bool												m_gameTimeBold;
+	Coord2D												m_gameTimePosition;
+	Color												m_gameTimeColor;
+	Color												m_gameTimeDropColor;
+
 	// message data
 	UIMessage										m_uiMessages[ MAX_UI_MESSAGES ];/**< messages to display to the user, the
 																						array is organized with newer messages at
@@ -749,7 +807,7 @@ friend class Drawable;	// for selection/deselection transactions
 	SuperweaponMap							m_superweapons[MAX_PLAYER_COUNT];
 	Coord2D											m_superweaponPosition;
 	Real												m_superweaponFlashDuration;
-	
+
 	// superweapon timer font info
 	AsciiString									m_superweaponNormalFont;
 	Int													m_superweaponNormalPointSize;
@@ -832,22 +890,22 @@ friend class Drawable;	// for selection/deselection transactions
 
 	PopupMessageData *					m_popupMessageData;
 	Color												m_popupMessageColor;
-	
+
  	Bool												m_waypointMode;			///< are we in waypoint plotting mode?
 	Bool												m_forceAttackMode;		///< are we in force attack mode?
 	Bool												m_forceMoveToMode;		///< are we in force move mode?
 	Bool												m_attackMoveToMode;	///< are we in attack move mode?
 	Bool												m_preferSelection;		///< the shift key has been depressed.
 
-	Bool												m_cameraRotatingLeft; 
+	Bool												m_cameraRotatingLeft;
 	Bool 												m_cameraRotatingRight;
 	Bool 												m_cameraZoomingIn;
 	Bool 												m_cameraTrackingDrawable;
 	Bool 												m_cameraZoomingOut;
-	
+
 	Bool												m_drawRMBScrollAnchor;
 	Bool												m_moveRMBScrollAnchor;
-	Bool												m_clientQuiet;         ///< When the user clicks exit,restart, etc. this is set true 
+	Bool												m_clientQuiet;         ///< When the user clicks exit,restart, etc. this is set true
 																												///< to skip some client sounds/fx during shutdown
 
 	// World Animation Data
@@ -870,5 +928,3 @@ friend class Drawable;	// for selection/deselection transactions
 
 // the singleton
 extern InGameUI *TheInGameUI;
-
-#endif // _IN_GAME_UI_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h b/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h
index a04c53a0320..9f1978d20e0 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h
@@ -24,12 +24,12 @@
 
 // FILE: KeyDefs.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -42,10 +42,10 @@
 // Desc:       Basic keyboard key definitions.
 //
 /** @todo NOTE: These key definitions are currently tied directly to the
-*		Direct Input key codes, therefore making these definitions device 
+*		Direct Input key codes, therefore making these definitions device
 *		dependent even though this code lives on the device INdependent side
-*		of the engine.  In the future to be truly device independent we 
-*		need to define our own key codes, and have a translation between 
+*		of the engine.  In the future to be truly device independent we
+*		need to define our own key codes, and have a translation between
 *		what we read from the device to our own system*/
 //
 //-----------------------------------------------------------------------------
@@ -53,9 +53,6 @@
 
 #pragma once
 
-#ifndef __KEYDEFS_H_
-#define __KEYDEFS_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
 #ifndef DIRECTINPUT_VERSION
@@ -105,9 +102,9 @@
 /** The key tables */
 //=============================================================================
 
-enum KeyDefType CPP_11(: Int)
+enum KeyDefType CPP_11(: UnsignedByte)
 {
-	// keypad keys ---------------------------------------------------------------- 
+	// keypad keys ----------------------------------------------------------------
 	KEY_KP0 								= DIK_NUMPAD0,
 	KEY_KP1 								= DIK_NUMPAD1,
 	KEY_KP2 								= DIK_NUMPAD2,
@@ -227,9 +224,14 @@ enum KeyDefType CPP_11(: Int)
 
 	// specials -------------------------------------------------------------------
 	KEY_NONE								= 0x00,		///< to report end of key stream
-	KEY_LOST								= 0xFF		///< to report lost keyboard focus
+	KEY_LOST								= 0xFF,		///< to report lost keyboard focus
 
-};	// end KeyDefType
+};
+
+enum
+{
+	KEY_COUNT = 256
+};
 
 // state for keyboard IO ------------------------------------------------------
 enum
@@ -252,10 +254,8 @@ enum
 	KEY_STATE_SHIFT			= (KEY_STATE_LSHIFT | KEY_STATE_RSHIFT | KEY_STATE_SHIFT2 ),
 	KEY_STATE_ALT				= (KEY_STATE_LALT | KEY_STATE_RALT)
 
-};	// end KeyStateType
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __KEYDEFS_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h
index 45973ed2f76..79a11a6d82d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h
@@ -24,12 +24,12 @@
 
 // FILE: Keyboard.h ///////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __KEYBOARD_H_
-#define __KEYBOARD_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -68,18 +65,20 @@
 struct KeyboardIO
 {
 
-	enum StatusType
+	enum StatusType CPP_11(: UnsignedByte)
 	{
 		STATUS_UNUSED		= 0x00,					// Key has not been used
 		STATUS_USED			= 0x01					// Key has been eaten
 	};
 
-	UnsignedByte	key;										// key data
+	void setUsed() { status = STATUS_USED; }
+
+	UnsignedByte	key;										// KeyDefType, key data
 	UnsignedByte	status;									// StatusType, above
 	UnsignedShort	state;									// KEY_STATE_* in KeyDefs.h
-	UnsignedInt		sequence;								// sequence info from DirectX used for order
+	UnsignedInt		keyDownTimeMsec;				// real-time in milliseconds when key went down
 
-};  // end KeyboardIO
+};
 
 // class Keyboard =============================================================
 /** Keyboard singleton to interface with the keyboard */
@@ -87,38 +86,45 @@ struct KeyboardIO
 class Keyboard : public SubsystemInterface
 {
 
-	enum { KEY_REPEAT_DELAY = 10 };
+	enum
+	{
+		KEY_REPEAT_DELAY_MSEC = 333,	// 10 frames at 30 FPS
+		KEY_REPEAT_INTERVAL_MSEC = 67	// ~2 frames at 30 FPS
+	};
 
 public:
 
 	Keyboard( void );
 	virtual ~Keyboard( void );
 
-	// you may extend the functionanilty of these for your device
-	virtual void init( void );							/**< initialize the keyboard, only extend this 
+	// you may extend the functionality of these for your device
+	virtual void init( void );							/**< initialize the keyboard, only extend this
 																							 functionality, do not replace */
 	virtual void reset( void );							///< Reset keyboard system
-	virtual void update( void );						/**< gather current state of all keys, extend 
+	virtual void update( void );						/**< gather current state of all keys, extend
 																							 this functionality, do not replace */
 	virtual Bool getCapsState( void ) = 0;  ///< get state of caps lock key, return TRUE if down
 
-	virtual void createStreamMessages( void );  /**< given state of device, create 
-																							messages and put them on the 
+	virtual void createStreamMessages( void );  /**< given state of device, create
+																							messages and put them on the
 																							stream for the raw state. */
 	// simplified versions where the caller doesn't care which key type was pressed.
 	Bool isShift();
 	Bool isCtrl();
 	Bool isAlt();
 	Int getModifierFlags() { return m_modifiers; }
-	
+
 	// access methods for key data
 	void resetKeys( void );												///< reset the state of the keys
 	KeyboardIO *getFirstKey( void );							///< get first key ready for processing
-	void setKeyStatusData( UnsignedByte key, 
+	KeyboardIO *findKey( KeyDefType key, KeyboardIO::StatusType status ); ///< get key ready for processing, can return NULL
+	void setKeyStatusData( KeyDefType key,
 												 KeyboardIO::StatusType data );   ///< set key status
-	WideChar translateKey( WideChar keyCode );		///< translte key code to printable UNICODE char
-	WideChar getPrintableKey( UnsignedByte key, Int state );
+	WideChar translateKey( WideChar keyCode );		///< translate key code to printable UNICODE char
+	WideChar getPrintableKey( KeyDefType key, Int state );
 	enum { MAX_KEY_STATES = 3};
+private:
+	void refreshAltKeys() const;									///< refresh the state of the alt keys, necessary after alt tab
 protected:
 
 	/** get the key data for a single key, KEY_NONE should be returned when
@@ -129,10 +135,9 @@ class Keyboard : public SubsystemInterface
 	void initKeyNames( void );  ///< initialize the key names table
 	void updateKeys( void );  ///< update the state of our key data
 	Bool checkKeyRepeat( void );  ///< check for repeating keys
-	UnsignedByte getKeyStatusData( UnsignedByte key );  ///< get key status
-	Bool getKeyStateBit( UnsignedByte key, Int bit );  ///< get key state bit
-	UnsignedInt getKeySequenceData( UnsignedByte key );  ///< get key sequence
-	void setKeyStateData( UnsignedByte key, UnsignedByte data );  ///< get key state
+	UnsignedByte getKeyStatusData( KeyDefType key );  ///< get key status
+	Bool getKeyStateBit( KeyDefType key, Int bit );  ///< get key state bit
+	void setKeyStateData( KeyDefType key, UnsignedByte data );  ///< get key state
 
 	UnsignedShort m_modifiers;
 	// internal keyboard data members
@@ -145,28 +150,24 @@ class Keyboard : public SubsystemInterface
 	//Bool m_rControlState; // 1 if right control is down
 	//Bool m_lAltState;			// 1 if left alt is down
 	//Bool m_rAltState;			// 1 if right alt is down
-	UnsignedByte m_shift2Key;  // what key is the secondary shift key
+	KeyDefType m_shift2Key;  // what key is the secondary shift key
 
 	enum { NUM_KEYS  = 256 };
 	KeyboardIO m_keys[ NUM_KEYS ];  ///< the keys
-	KeyboardIO m_keyStatus[ NUM_KEYS ];  ///< the key status flags
+	KeyboardIO m_keyStatus[ KEY_COUNT ];  ///< the key status flags
 
-	enum { KEY_NAMES_COUNT = 256 };
-	struct 
+	struct
 	{
 
 		WideChar stdKey;
 		WideChar shifted;
 		WideChar shifted2;
 
-	} m_keyNames[ KEY_NAMES_COUNT ];
-	UnsignedInt m_inputFrame;  ///< frame input was gathered on
+	} m_keyNames[ KEY_COUNT ];
 
-};  // end Keyboard
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
 extern Keyboard *TheKeyboard;
-
-#endif // __KEYBOARD_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h b/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h
index 66993280982..ed65bc68ddf 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __LANGUAGEFILTER_H
-#define __LANGUAGEFILTER_H
-
 #include "Common/STLTypedefs.h"
 #include "Common/AsciiString.h"
 #include "Common/UnicodeString.h"
@@ -55,12 +51,7 @@ struct UnicodeStringsEqual
 	Bool operator()(UnicodeString a, UnicodeString b) const
 	{
 		Bool retval = (a.compareNoCase(b) == 0);
-		DEBUG_LOG(("Comparing %ls with %ls, return value is ", a.str(), b.str()));
-		if (retval) {
-			DEBUG_LOG(("true.\n"));
-		} else {
-			DEBUG_LOG(("false.\n"));
-		}
+		DEBUG_LOG(("Comparing %ls with %ls, return value is %s.", a.str(), b.str(), retval ? "true" : "false"));
 		return retval;
 	}
 };
@@ -90,5 +81,3 @@ class LanguageFilter : public SubsystemInterface {
 
 extern LanguageFilter *TheLanguageFilter;
 LanguageFilter * createLanguageFilter();
-
-#endif //#define __LANGUAGEFILTER_H
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h
index e2d1733b4be..ba8031e8d71 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __LINE2D_H_
-#define __LINE2D_H_
-
 typedef std::vector<ICoord2D> Coord2DVector;
 typedef std::vector<ICoord3D> Coord3DVector;
 
@@ -43,8 +40,8 @@ extern Bool ClipLine2D( ICoord2D *p1, ICoord2D *p2, ICoord2D *c1, ICoord2D *c2,
 ///< IntersectLine2D will take two segments delimited by ab and cd and will return whether
 ///< they intersect within the length of ab. They will also return the intersection point out
 ///< intersection if it is non-NULL.
-extern Bool IntersectLine2D( const Coord2D *a, const Coord2D *b, 
-															const Coord2D *c, const Coord2D *d, 
+extern Bool IntersectLine2D( const Coord2D *a, const Coord2D *b,
+															const Coord2D *c, const Coord2D *d,
 															Coord2D *intersection = NULL);
 
 ///< PointInsideRect2D will return true iff inputPoint lies iside of the rectangle specified
@@ -81,11 +78,7 @@ extern Bool PointInsideArea2D( const Coord3D *ptToTest,
 															 Int numPointsInArea);
 
 ///< This function will find the shortest distance between the given segment (ab) and the pt.
-///< It will also give the intersection points on the segment (ab) if desired. 
+///< It will also give the intersection points on the segment (ab) if desired.
 ///< outU will return the U value determined. This is a shortcut for panning
 extern void ShortestDistancePointToSegment2D( const Coord2D *a, const Coord2D *b, const Coord2D *pt,
 																							Real *outDistance, Coord2D *outPosition, Real *outU );
-
-
-#endif // __LINE2D_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h b/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h
index 4b0bbe457e3..a70892d2f57 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _LOADSCREEN_H_
-#define _LOADSCREEN_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -86,9 +83,9 @@ class SinglePlayerLoadScreen : public LoadScreen
 	virtual void init( GameInfo *game );		///< Init the loadscreen
 	virtual void reset( void );		///< Reset the system
 	virtual void update( void )
-	{	
+	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
-	}; 
+	};
 	virtual void update(Int percent);		 ///< Update the state of the progress bar
 	virtual void processProgress(Int playerId, Int percentage)
 	{
@@ -105,12 +102,12 @@ class SinglePlayerLoadScreen : public LoadScreen
 	GameWindow *m_objectiveLines[MAX_OBJECTIVE_LINES];
 	GameWindow *m_unitDesc[MAX_DISPLAYED_UNITS];
 	GameWindow *m_location;
-	
+
 	Int m_currentObjectiveLine;
 	Int m_currentObjectiveLineCharacter;
 	Int m_currentObjectiveWidthOffset;
 	Bool m_finishedObjectiveText;
-	
+
 	UnicodeString m_unicodeObjectiveLines[MAX_OBJECTIVE_LINES];
 
 	VideoBuffer *m_videoBuffer;
@@ -136,9 +133,9 @@ class ChallengeLoadScreen : public LoadScreen
 	virtual void init( GameInfo *game );		///< Init the loadscreen
 	virtual void reset( void );		///< Reset the system
 	virtual void update( void )
-	{	
+	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
-	}; 
+	};
 	virtual void update(Int percent);		 ///< Update the state of the progress bar
 	virtual void processProgress(Int playerId, Int percentage)
 	{
@@ -208,9 +205,9 @@ class ShellGameLoadScreen : public LoadScreen
 	virtual void init( GameInfo *game );		///< Init the loadscreen
 	virtual void reset( void );		///< Reset the system
 	virtual void update( void )
-	{	
+	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
-	}; 
+	};
 	virtual void update(Int percent);		 ///< Update the state of the progress bar
 	virtual void processProgress(Int playerId, Int percentage)
 	{
@@ -236,9 +233,9 @@ class MultiPlayerLoadScreen : public LoadScreen
 	virtual void init( GameInfo *game );		///< Init the loadscreen
 	virtual void reset( void );		///< Reset the system
 	virtual void update( void )
-	{	
+	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
-	}; 
+	};
 	virtual void update(Int percent);		 ///< Update the state of the progress bar
 	void processProgress(Int playerId, Int percentage);
 	virtual void setProgressRange( Int min, Int max ) { }
@@ -267,9 +264,9 @@ class GameSpyLoadScreen : public LoadScreen
 	virtual void init( GameInfo *game );		///< Init the loadscreen
 	virtual void reset( void );		///< Reset the system
 	virtual void update( void )
-	{	
+	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
-	}; 
+	};
 	virtual void update(Int percent);		 ///< Update the state of the progress bar
 	void processProgress(Int playerId, Int percentage);
 	virtual void setProgressRange( Int min, Int max ) { }
@@ -305,9 +302,9 @@ class MapTransferLoadScreen : public LoadScreen
 	virtual void init( GameInfo *game );		///< Init the loadscreen
 	virtual void reset( void );							///< Reset the system
 	virtual void update( void )
-	{	
+	{
 		DEBUG_CRASH(("Call update(Int) instead.  This update isn't supported"));
-	}; 
+	};
 	virtual void update(Int percent);				///< Update the state of the progress bar
 	virtual void processProgress(Int playerId, Int percentage)
 	{
@@ -327,5 +324,3 @@ class MapTransferLoadScreen : public LoadScreen
 	GameWindow *m_timeoutText;
 	Int m_oldTimeout;												///< old val, so we can call processTimeout() every frame and not touch the GUI
 };
-
-#endif //_LOADSCREEN_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h
index 09de3ed5401..db162de3ede 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h
@@ -27,30 +27,41 @@
 
 #pragma once
 
-#ifndef _H_LookAtXlat
-#define _H_LookAtXlat
-
 #include "GameClient/InGameUI.h"
 
+//-----------------------------------------------------------------------------
+// TheSuperHackers @feature The Screen Edge Scrolling can now be enabled or
+// disabled depending on the App being Windowed or Fullscreen.
+typedef UnsignedInt ScreenEdgeScrollMode;
+enum ScreenEdgeScrollMode_ CPP_11(: ScreenEdgeScrollMode)
+{
+	ScreenEdgeScrollMode_EnabledInWindowedApp = 1<<0, // Scroll when touching the edge while the app is windowed
+	ScreenEdgeScrollMode_EnabledInFullscreenApp = 1<<1, // Scroll when touching the edge while the app is fullscreen
+
+	ScreenEdgeScrollMode_Default = ScreenEdgeScrollMode_EnabledInFullscreenApp, // Default based on original game behavior
+};
+
 //-----------------------------------------------------------------------------
 class LookAtTranslator : public GameMessageTranslator
 {
 public:
 	LookAtTranslator();
 	~LookAtTranslator();
+
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
 	virtual const ICoord2D* getRMBScrollAnchor(void); // get m_anchor ICoord2D if we're RMB scrolling
 	Bool hasMouseMovedRecently( void );
 	void setCurrentPos( const ICoord2D& pos );
+	void setScreenEdgeScrollMode(ScreenEdgeScrollMode mode);
 
 	void resetModes(); //Used when disabling input, so when we reenable it we aren't stuck in a mode.
 
 private:
-	enum 
+	enum
 	{
 		MAX_VIEW_LOCS = 8
 	};
-	enum
+	enum ScrollType
 	{
 		SCROLL_NONE = 0,
 		SCROLL_RMB,
@@ -59,20 +70,22 @@ class LookAtTranslator : public GameMessageTranslator
 	};
 	ICoord2D m_anchor;
 	ICoord2D m_originalAnchor;
-	ICoord2D m_currentPos;									
+	ICoord2D m_currentPos;
+	Real m_anchorAngle;
 	Bool m_isScrolling;				// set to true if we are in the act of RMB scrolling
 	Bool m_isRotating;					// set to true if we are in the act of MMB rotating
 	Bool m_isPitching;					// set to true if we are in the act of ALT pitch rotation
 	Bool m_isChangingFOV;			// set to true if we are in the act of changing the field of view
-	UnsignedInt m_timestamp;				// set when button goes down
+	UnsignedInt m_middleButtonDownTimeMsec;				// real-time in milliseconds when middle button goes down
 	DrawableID m_lastPlaneID;
 	ViewLocation m_viewLocation[ MAX_VIEW_LOCS ];
-	Int m_scrollType;
-	void setScrolling( Int );
+	ScrollType m_scrollType;
+	ScreenEdgeScrollMode m_screenEdgeScrollMode;
+	UnsignedInt m_lastMouseMoveTimeMsec;				// real-time in milliseconds when mouse last moved
+
+	void setScrolling( ScrollType scrollType );
 	void stopScrolling( void );
-	UnsignedInt m_lastMouseMoveFrame;
-};	
+	Bool canScrollAtScreenEdge() const;
+};
 
 extern LookAtTranslator *TheLookAtTranslator;
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h b/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h
deleted file mode 100644
index 0561d84f771..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: MapUtil.h /////////////////////////////////////////////////////////
-// Author: Matt Campbell, December 2001
-// Description: Map utility/convenience routines
-////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __MAPUTIL_H__
-#define __MAPUTIL_H__
-
-#include "Common/AsciiString.h"
-#include "Common/UnicodeString.h"
-
-#include "Common/STLTypedefs.h"
-
-class GameWindow;
-class AsciiString;
-struct Coord3D;
-struct FileInfo;
-class Image;
-class DataChunkInput;
-struct DataChunkInfo;
-// This matches the windows timestamp.
-enum { SUPPLY_TECH_SIZE = 15};
-typedef std::list <ICoord2D> ICoord2DList;
-
-class TechAndSupplyImages
-{
-public:
-	ICoord2DList m_techPosList;
-	ICoord2DList m_supplyPosList;
-};
-
-struct WinTimeStamp
-{
-	UnsignedInt m_lowTimeStamp;
-	UnsignedInt m_highTimeStamp;
-};
-
-
-class WaypointMap : public std::map<AsciiString, Coord3D>
-{
-public:
-	void update( void );	///< returns the number of multiplayer start spots found
-	Int m_numStartSpots;
-};
-
-typedef std::list <Coord3D> Coord3DList;
-
-class MapMetaData
-{
-public:
-	UnicodeString m_displayName;
-	AsciiString m_nameLookupTag;
-	Region3D m_extent;
-	Int m_numPlayers;
-	Bool m_isMultiplayer;
-
-	Bool m_isOfficial;
-	UnsignedInt m_filesize;
-	UnsignedInt m_CRC;
-
-	WinTimeStamp m_timestamp;
-
-	WaypointMap m_waypoints;
-	Coord3DList m_supplyPositions;
-	Coord3DList m_techPositions;
-	AsciiString m_fileName;
-};
-
-class MapCache : public std::map<AsciiString, MapMetaData>
-{
-public:
-	MapCache() {}
-	void updateCache( void );
-
-	AsciiString getMapDir() const;
-	AsciiString getUserMapDir() const;
-	AsciiString getMapExtension() const;
-
-	const MapMetaData *findMap(AsciiString mapName);
-
-	// allow us to create a set of shippable maps to be in mapcache.ini.  For use with -buildMapCache.
-	void addShippingMap(AsciiString mapName) { mapName.toLower(); m_allowedMaps.insert(mapName); }
-
-private:
-	Bool clearUnseenMaps( AsciiString dirName );
-	void loadStandardMaps(void);
-	Bool loadUserMaps(void);				// returns true if we needed to (re)parse a map
-//	Bool addMap( AsciiString dirName, AsciiString fname, WinTimeStamp timestamp,
-//		UnsignedInt filesize, Bool isOfficial );	///< returns true if it had to (re)parse the map
-	Bool addMap( AsciiString dirName, AsciiString fname, FileInfo *fileInfo, Bool isOfficial); ///< returns true if it had to (re)parse the map
-	void writeCacheINI( Bool userDir );
-
-	static const char * m_mapCacheName;
-	std::map<AsciiString, Bool> m_seen;
-
-	std::set<AsciiString> m_allowedMaps;
-};
-
-extern MapCache *TheMapCache;
-extern TechAndSupplyImages TheSupplyAndTechImageLocations;
-Int populateMapListbox( GameWindow *listbox, Bool useSystemMaps, Bool isMultiplayer, AsciiString mapToSelect = AsciiString::TheEmptyString );		/// Read a list of maps from the run directory and fill in the listbox.  Return the selected index
-Int populateMapListboxNoReset( GameWindow *listbox, Bool useSystemMaps, Bool isMultiplayer, AsciiString mapToSelect = AsciiString::TheEmptyString );		/// Read a list of maps from the run directory and fill in the listbox.  Return the selected index
-Bool isValidMap( AsciiString mapName, Bool isMultiplayer );						/// Validate a map
-Image *getMapPreviewImage( AsciiString mapName );
-AsciiString getDefaultMap( Bool isMultiplayer );											/// Find a valid map
-AsciiString getDefaultOfficialMap();
-Bool isOfficialMap( AsciiString mapName );
-Bool parseMapPreviewChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-void findDrawPositions( Int startX, Int startY, Int width, Int height, Region3D extent,
-															 ICoord2D *ul, ICoord2D *lr );
-Bool WouldMapTransfer( const AsciiString& mapName );
-#endif // __MAPUTIL_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h
index 46e11158f3d..a3232268b8a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __MESSAGEBOX_H_
-#define __MESSAGEBOX_H_
-
 #include "GameClient/GameWindowManager.h"
 
 GameWindow *MessageBoxYesNo(UnicodeString titleString,UnicodeString bodyString,GameWinMsgBoxFunc yesCallback,GameWinMsgBoxFunc noCallback);  ///< convenience function for displaying a Message box with Yes and No buttons
@@ -47,5 +44,3 @@ GameWindow *MessageBoxOk(UnicodeString titleString,UnicodeString bodyString,Game
 
 
 GameWindow *MessageBoxCancel(UnicodeString titleString,UnicodeString bodyString,GameWinMsgBoxFunc cancelCallback);///< convenience function for displaying a Message box with Cancel button
-
-#endif //__MESSAGEBOX_H_
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h b/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h
index c17cc3a0b17..f096807b8db 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef _H_MetaEvent
-#define _H_MetaEvent
-
 #include "Common/SubsystemInterface.h"
 #include "GameClient/InGameUI.h"
 
@@ -44,10 +41,11 @@ enum MappableKeyCategories CPP_11(: Int)
 	CATEGORY_TEAM,
 	CATEGORY_MISC,
 	CATEGORY_DEBUG,
-	CATEGORY_NUM_CATEGORIES // keep this last
+
+	CATEGORY_NUM_CATEGORIES
 };
 
-static const LookupListRec CategoryListName[] = 
+static const LookupListRec CategoryListName[] =
 {
 	{"CONTROL",						CATEGORY_CONTROL},
 	{"INFORMATION",				CATEGORY_INFORMATION},
@@ -57,7 +55,7 @@ static const LookupListRec CategoryListName[] =
 	{"TEAM",							CATEGORY_TEAM},
 	{"MISC",							CATEGORY_MISC},
 	{"DEBUG",							CATEGORY_DEBUG},
-	{NULL, 0}// keep this last
+	{NULL, 0}
 };
 
 
@@ -69,6 +67,24 @@ static const LookupListRec CategoryListName[] =
 // KeyDefType; this is extremely important to maintain!
 enum MappableKeyType CPP_11(: Int)
 {
+	// keypad keys ----------------------------------------------------------------
+	MK_KP0					= KEY_KP0,
+	MK_KP1					= KEY_KP1,
+	MK_KP2					= KEY_KP2,
+	MK_KP3					= KEY_KP3,
+	MK_KP4					= KEY_KP4,
+	MK_KP5					= KEY_KP5,
+	MK_KP6					= KEY_KP6,
+	MK_KP7					= KEY_KP7,
+	MK_KP8					= KEY_KP8,
+	MK_KP9					= KEY_KP9,
+	MK_KPDEL				= KEY_KPDEL,
+	MK_KPSTAR				= KEY_KPSTAR,
+	MK_KPMINUS			= KEY_KPMINUS,
+	MK_KPPLUS				= KEY_KPPLUS,
+	MK_KPENTER			= KEY_KPENTER,
+	MK_KPSLASH			= KEY_KPSLASH,
+
 	MK_ESC					= KEY_ESC,
 	MK_BACKSPACE		= KEY_BACKSPACE,
 	MK_ENTER				= KEY_ENTER,
@@ -122,16 +138,6 @@ enum MappableKeyType CPP_11(: Int)
 	MK_8						= KEY_8,
 	MK_9						= KEY_9,
 	MK_0						= KEY_0,
-	MK_KP1					= KEY_KP1,
-	MK_KP2					= KEY_KP2,
-	MK_KP3					= KEY_KP3,
-	MK_KP4					= KEY_KP4,
-	MK_KP5					= KEY_KP5,
-	MK_KP6					= KEY_KP6,
-	MK_KP7					= KEY_KP7,
-	MK_KP8					= KEY_KP8,
-	MK_KP9					= KEY_KP9,
-	MK_KP0					= KEY_KP0,
 	MK_MINUS				= KEY_MINUS,
 	MK_EQUAL				= KEY_EQUAL,
 	MK_LBRACKET			= KEY_LBRACKET,
@@ -153,13 +159,30 @@ enum MappableKeyType CPP_11(: Int)
 	MK_PGDN					= KEY_PGDN,
 	MK_INS					= KEY_INS,
 	MK_DEL					= KEY_DEL,
-	MK_KPSLASH			= KEY_KPSLASH,
 	MK_NONE					= KEY_NONE
 
-};	
+};
 
-static const LookupListRec KeyNames[] = 
+static const LookupListRec KeyNames[] =
 {
+	// keypad keys ----------------------------------------------------------------
+	{ "KEY_KP0", MK_KP0 },
+	{ "KEY_KP1", MK_KP1 },
+	{ "KEY_KP2", MK_KP2 },
+	{ "KEY_KP3", MK_KP3 },
+	{ "KEY_KP4", MK_KP4 },
+	{ "KEY_KP5", MK_KP5 },
+	{ "KEY_KP6", MK_KP6 },
+	{ "KEY_KP7", MK_KP7 },
+	{ "KEY_KP8", MK_KP8 },
+	{ "KEY_KP9", MK_KP9 },
+	{ "KEY_KPDEL", MK_KPDEL },
+	{ "KEY_KPSTAR", MK_KPSTAR },
+	{ "KEY_KPMINUS", MK_KPMINUS },
+	{ "KEY_KPPLUS", MK_KPPLUS },
+	{ "KEY_KPENTER", MK_KPENTER },
+	{ "KEY_KPSLASH", MK_KPSLASH },
+
 	{ "KEY_ESC", MK_ESC },
 	{ "KEY_BACKSPACE", MK_BACKSPACE },
 	{ "KEY_ENTER", MK_ENTER },
@@ -213,16 +236,6 @@ static const LookupListRec KeyNames[] =
 	{ "KEY_8", MK_8 },
 	{ "KEY_9", MK_9 },
 	{ "KEY_0", MK_0 },
-	{ "KEY_KP1", MK_KP1 },
-	{ "KEY_KP2", MK_KP2 },
-	{ "KEY_KP3", MK_KP3 },
-	{ "KEY_KP4", MK_KP4 },
-	{ "KEY_KP5", MK_KP5 },
-	{ "KEY_KP6", MK_KP6 },
-	{ "KEY_KP7", MK_KP7 },
-	{ "KEY_KP8", MK_KP8 },
-	{ "KEY_KP9", MK_KP9 },
-	{ "KEY_KP0", MK_KP0 },
 	{ "KEY_MINUS", MK_MINUS },
 	{ "KEY_EQUAL", MK_EQUAL },
 	{ "KEY_LBRACKET", MK_LBRACKET },
@@ -244,9 +257,8 @@ static const LookupListRec KeyNames[] =
 	{ "KEY_PGDN", MK_PGDN },
 	{ "KEY_INS", MK_INS },
 	{ "KEY_DEL", MK_DEL },
-	{ "KEY_KPSLASH", MK_KPSLASH },
 	{ "KEY_NONE", MK_NONE },
-	{ NULL, 0	} // keep this last!
+	{ NULL, 0	}
 };
 
 // -------------------------------------------------------------------------------
@@ -254,16 +266,19 @@ enum MappableKeyTransition CPP_11(: Int)
 {
 	DOWN,
 	UP,
-	DOUBLEDOWN	// if a key transition is repeated immediately, we generate this.
+	DOUBLEDOWN,	// if a key transition is repeated immediately, we generate this.
+
+	MAPPABLE_KEY_TRANSITION_COUNT
 };
 
-static const LookupListRec TransitionNames[] = 
+static const LookupListRec TransitionNames[] =
 {
 	{ "DOWN",				DOWN },
 	{ "UP",					UP },
 	{ "DOUBLEDOWN",	DOUBLEDOWN },
-	{ NULL, 0	}// keep this last!
+	{ NULL, 0	}
 };
+static_assert(ARRAY_SIZE(TransitionNames) == MAPPABLE_KEY_TRANSITION_COUNT + 1, "Incorrect array size");
 
 // -------------------------------------------------------------------------------
 // an easier-to-type subset of the KEY_STATE stuff.
@@ -279,7 +294,7 @@ enum MappableKeyModState CPP_11(: Int)
 	SHIFT_ALT_CTRL		= SHIFT|ALT|CTRL
 };
 
-static const LookupListRec ModifierNames[] = 
+static const LookupListRec ModifierNames[] =
 {
 	{ "NONE",							NONE },
 	{ "CTRL",							CTRL },
@@ -289,7 +304,7 @@ static const LookupListRec ModifierNames[] =
 	{ "SHIFT_CTRL",				SHIFT_CTRL },
 	{ "SHIFT_ALT",				SHIFT_ALT },
 	{ "SHIFT_ALT_CTRL" ,	SHIFT_ALT_CTRL },
-	{ NULL, 0	}// keep this last!
+	{ NULL, 0	}
 };
 
 
@@ -300,14 +315,18 @@ enum CommandUsableInType CPP_11(: Int)
 {
 	COMMANDUSABLE_NONE				= 0,
 
-	COMMANDUSABLE_SHELL				= (1 << 0),
-	COMMANDUSABLE_GAME				= (1 << 1)
+	COMMANDUSABLE_SHELL				= (1 << 0), // Command is usable when in Shell (Menus)
+	COMMANDUSABLE_GAME				= (1 << 1), // Command is usable when not in Shell
+	COMMANDUSABLE_OBSERVER		= (1 << 2), // TheSuperHackers @feature Command is usable when observing
+
+	COMMANDUSABLE_EVERYWHERE = ~0,
 };
 
-static const char* TheCommandUsableInNames[] =
+static const char* const TheCommandUsableInNames[] =
 {
 	"SHELL",
 	"GAME",
+	"OBSERVER",
 
 	NULL
 };
@@ -315,7 +334,7 @@ static const char* TheCommandUsableInNames[] =
 // -------------------------------------------------------------------------------
 class MetaMapRec : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(MetaMapRec, "MetaMapRec")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(MetaMapRec, "MetaMapRec")
 public:
 	MetaMapRec*							m_next;
 	GameMessage::Type				m_meta;						///< the meta-event to emit
@@ -332,7 +351,7 @@ EMPTY_DTOR(MetaMapRec)
 
 
 //-----------------------------------------------------------------------------
-class MetaEventTranslator : public GameMessageTranslator                          
+class MetaEventTranslator : public GameMessageTranslator
 {
 private:
 
@@ -347,7 +366,7 @@ class MetaEventTranslator : public GameMessageTranslator
 	MetaEventTranslator();
 	~MetaEventTranslator();
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
-};	
+};
 
 //-----------------------------------------------------------------------------
 class MetaMap : public SubsystemInterface
@@ -362,7 +381,7 @@ class MetaMap : public SubsystemInterface
 	MetaMapRec *getMetaMapRec(GameMessage::Type t);
 
 public:
-	
+
 	MetaMap();
 	~MetaMap();
 
@@ -380,5 +399,3 @@ class MetaMap : public SubsystemInterface
 };
 
 extern MetaMap *TheMetaMap;
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
index 6fffd55be69..cc1b8dc4d66 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ANIMPARTICLESYSBONEUPDATE_H_
-#define __ANIMPARTICLESYSBONEUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ClientUpdateModule.h"
 
@@ -59,6 +56,3 @@ class AnimatedParticleSysBoneClientUpdate : public ClientUpdateModule
 	UnsignedInt m_life;
 
 };
-
-#endif // __ANIMPARTICLESYSBONEUPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h
index 6c319dbc7ca..06ba80e7e42 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BEACONCLIENTUPDATE_H_
-#define __BEACONCLIENTUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ClientUpdateModule.h"
 
@@ -75,6 +72,3 @@ class BeaconClientUpdate : public ClientUpdateModule
 	UnsignedInt m_lastRadarPulse;
 
 };
-
-#endif // __BEACONCLIENTUPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h
index b1021c0e337..95aa0dcdcb5 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SWAYCLIENTUPDATE_H_
-#define __SWAYCLIENTUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ClientUpdateModule.h"
 
@@ -61,7 +58,7 @@ class SwayClientUpdate : public ClientUpdateModule
 
 	Real			m_curValue;
 	Real			m_curAngle;
-	Real			m_curDelta;	 
+	Real			m_curDelta;
 	Real			m_curAngleLimit;
 	Real			m_leanAngle;							///<Angle that the tree leans away from the wind.
 	Short			m_curVersion;
@@ -70,6 +67,3 @@ class SwayClientUpdate : public ClientUpdateModule
 
 	void updateSway(void);
 };
-
-#endif // __SWAYCLIENTUPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h
index 1b886c5f058..6170da909f1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h
@@ -24,12 +24,12 @@
 
 // FILE: Mouse.h //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __MOUSE_H_
-#define __MOUSE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -59,10 +56,13 @@
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////
 
+enum GameMode CPP_11(: Int);
+
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 
 enum MouseButtonState CPP_11(: Int)
 {
+	MBS_None = -1,
 	MBS_Up = 0,
 	MBS_Down,
 	MBS_DoubleClick,
@@ -106,17 +106,14 @@ struct MouseIO
 								 user while - is down/toward user */
 	ICoord2D deltaPos;  ///< overall change in mouse pointer this frame
 
-	MouseButtonState leftState;					// button state: Up, Down, DoubleClick (Which is also down)
+	MouseButtonState leftState;					// button state: None (no event), Up, Down, DoubleClick
 	Int leftEvent;											// Most important event this frame
-	Int leftFrame;											// last frame button state changed
 
 	MouseButtonState rightState;
 	Int rightEvent;
-	Int rightFrame;
 
 	MouseButtonState middleState;
 	Int middleEvent;
-	Int middleFrame;
 };
 
 class CursorInfo
@@ -139,20 +136,51 @@ class CursorInfo
 	Int						numDirections;	//number of directions for cursors like scrolling/panning.
 };
 
+typedef UnsignedInt CursorCaptureMode;
+enum CursorCaptureMode_ CPP_11(: CursorCaptureMode)
+{
+	CursorCaptureMode_EnabledInWindowedGame = 1<<0, // Captures the cursor when in game while the app is windowed
+	CursorCaptureMode_EnabledInWindowedMenu = 1<<1, // Captures the cursor when in menu while the app is windowed
+	CursorCaptureMode_EnabledInFullscreenGame = 1<<2, // Captures the cursor when in game while the app is fullscreen
+	CursorCaptureMode_EnabledInFullscreenMenu = 1<<3, // Captures the cursor when in menu while the app is fullscreen
+
+	CursorCaptureMode_Default =
+		CursorCaptureMode_EnabledInWindowedGame |
+		CursorCaptureMode_EnabledInFullscreenGame |
+		CursorCaptureMode_EnabledInFullscreenMenu,
+};
+
 // Mouse ----------------------------------------------------------------------
-/** Class interface for working with a mouse pointing device */
+// Class interface for working with a mouse pointing device
+//
+// TheSuperHackers @feature xezon 26/07/2025 Implements mouse cursor capture
+// functionality. The Mouse class handles most of the logic for it internally.
 //-----------------------------------------------------------------------------
 class Mouse : public SubsystemInterface
 {
 
-public:  // enumerations and types
+	// enumerations and types
+
+	typedef UnsignedInt CursorCaptureBlockReasonInt;
+
+	enum CursorCaptureBlockReason
+	{
+		CursorCaptureBlockReason_NoInit,
+		CursorCaptureBlockReason_Paused,
+		CursorCaptureBlockReason_Unfocused,
+		CursorCaptureBlockReadon_CursorIsOutside,
+
+		CursorCaptureBlockReason_Count
+	};
+
+public:
 
 	// ----------------------------------------------------------------------------------------------
 	/** If you update this enum make sure you update CursorININames[] */
 	// ----------------------------------------------------------------------------------------------
 	enum MouseCursor
 	{
-		
+
 		// ***** dont forget to update CursorININames[] *****
 		// ***** dont forget to update CursorININames[] *****
 		// ***** dont forget to update CursorININames[] *****
@@ -217,7 +245,7 @@ class Mouse : public SubsystemInterface
 
 
 		// ***** dont forget to update CursorININames[] *****
-		NUM_MOUSE_CURSORS  // keep this last
+		NUM_MOUSE_CURSORS
 
 	};
 
@@ -228,10 +256,12 @@ class Mouse : public SubsystemInterface
 		RM_W3D,				//W3D model tied to frame rate.
 		RM_POLYGON,		//alpha blended polygon tied to frame rate.
 		RM_DX8,			//hardware cursor independent of frame rate.
-		RM_MAX	// keep this last.
+
+		RM_MAX
 	};
 
-	static const char *RedrawModeName[RM_MAX];
+	static const char *const CursorCaptureBlockReasonNames[];
+	static const char *const RedrawModeName[];
 
 	CursorInfo m_cursorInfo[NUM_MOUSE_CURSORS];
 
@@ -247,16 +277,17 @@ class Mouse : public SubsystemInterface
 	virtual void update( void );  ///< update the state of the mouse position and buttons
 	virtual void initCursorResources(void)=0;	///< needed so Win32 cursors can load resources before D3D device created.
 
-	virtual void createStreamMessages( void );  /**< given state of device, create 
-																									 messages and put them on the 
+	virtual void createStreamMessages( void );  /**< given state of device, create
+																									 messages and put them on the
 																									 stream for the raw state. */
-	
+
 	virtual void draw( void );													///< draw the mouse
 	virtual void setPosition( Int x, Int y );						///< set the mouse position
 	virtual void setCursor( MouseCursor cursor ) = 0;		///< set mouse cursor
 
-	virtual void capture( void ) = 0;					///< capture the mouse
-	virtual void releaseCapture( void ) = 0;  ///< release mouse capture
+	void setCursorCaptureMode(CursorCaptureMode mode); ///< set the rules for the mouse capture
+	void refreshCursorCapture(); ///< refresh the mouse capture
+	Bool isCursorCaptured(); ///< true if the mouse is captured in the game window
 
 	// access methods for the mouse data
 	const MouseIO *getMouseStatus( void ) { return &m_currMouse; }							///< get current mouse status
@@ -271,14 +302,23 @@ class Mouse : public SubsystemInterface
 	virtual void setRedrawMode(RedrawMode mode)	{m_currentRedrawMode=mode;} ///<set cursor drawing method.
 	virtual RedrawMode getRedrawMode(void) { return m_currentRedrawMode; } //get cursor drawing method
 	virtual void setVisibility(Bool visible) { m_visible = visible; } // set visibility for load screens, etc
-	inline Bool getVisibility(void) { return m_visible; } // get visibility state
-	
+	Bool getVisibility(void) { return m_visible; } // get visibility state
+
 	void drawTooltip( void );					///< draw the tooltip text
 	void drawCursorText( void );			///< draw the mouse cursor text
 	Int getCursorIndex( const AsciiString& name );
 	void resetTooltipDelay( void );
 
-	void mouseNotifyResolutionChange(void);
+	virtual void loseFocus(); ///< called when window has lost focus
+	virtual void regainFocus(); ///< called when window has regained focus
+
+	void onCursorMovedOutside(); ///< called when cursor has left game window
+	void onCursorMovedInside(); ///< called when cursor has entered game window
+	Bool isCursorInside() const; ///< true if the mouse is located inside the game window
+
+	void onResolutionChanged(void);
+	void onGameModeChanged(GameMode prev, GameMode next);
+	void onGamePaused(Bool paused);
 
 	Bool isClick(const ICoord2D *anchor, const ICoord2D *dest, UnsignedInt previousMouseClick, UnsignedInt currentMouseClick);
 
@@ -305,10 +345,19 @@ class Mouse : public SubsystemInterface
 	UnsignedInt m_dragTolerance;
 	UnsignedInt m_dragTolerance3D;
 	UnsignedInt m_dragToleranceMS;
-	
+
 
 protected:
 
+	void initCapture();
+	Bool canCapture() const; ///< true if the mouse can be captured
+	void unblockCapture(CursorCaptureBlockReason reason); // unset a reason to block mouse capture
+	void blockCapture(CursorCaptureBlockReason reason); // set a reason to block mouse capture
+	void onCursorCaptured(Bool captured); ///< called when the mouse was successfully captured or released
+
+	virtual void capture( void ) = 0; ///< capture the mouse in the game window
+	virtual void releaseCapture( void ) = 0; ///< release the mouse capture
+
 	/// you must implement getting a buffered mouse event from you device here
 	virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush ) = 0;
 
@@ -325,7 +374,7 @@ class Mouse : public SubsystemInterface
 
 	UnsignedByte m_numButtons;  ///< number of buttons on this mouse
 	UnsignedByte m_numAxes;			///< number of axes this mouse has
-	Bool m_forceFeedback;				///< set to TRUE if mouse supprots force feedback
+	Bool m_forceFeedback;				///< set to TRUE if mouse supports force feedback
 
 	UnicodeString m_tooltipString;	///< tooltip text
 	DisplayString *m_tooltipDisplayString; ///< tooltipDisplayString
@@ -343,16 +392,14 @@ class Mouse : public SubsystemInterface
 	Int m_minY;							///< mouse is locked to this region
 	Int m_maxY;							///< mouse is locked to this region
 
-	UnsignedInt m_inputFrame;				///< frame input was gathered on
-	UnsignedInt m_deadInputFrame;		///< Frame which last input occured
-
 	Bool m_inputMovesAbsolute;			/**< if TRUE, when processing mouse position
 																	chanages the movement will be done treating
 																	the	coords as ABSOLUTE positions and NOT
 																	relative coordinate changes */
 
 	Bool m_visible;	// visibility status
-	
+	Bool m_isCursorCaptured;
+
 	MouseCursor m_currentCursor;		///< current mouse cursor
 
 	DisplayString *m_cursorTextDisplayString;		///< text to display on the cursor (if specified)
@@ -369,7 +416,10 @@ class Mouse : public SubsystemInterface
 
 	Int m_eventsThisFrame;
 
-};  // end class Mouse
+	CursorCaptureMode m_cursorCaptureMode;
+	CursorCaptureBlockReasonInt m_captureBlockReasonBits;
+
+};
 
 // TheSuperHackers @feature helmutbuhler 17/05/2025
 // Mouse that does nothing. Used for Headless Mode.
@@ -388,5 +438,3 @@ class MouseDummy : public Mouse
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
 extern Mouse *TheMouse;  ///< extern mouse singleton definition
-
-#endif // _MOUSE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h
index 663df919af6..c2fd7e89da9 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h
@@ -29,10 +29,6 @@
 
 #pragma once
 
-#ifndef _PARTICLE_SYS_H_
-#define _PARTICLE_SYS_H_
-
-#include <stdio.h>
 #include "Common/AsciiString.h"
 #include "Common/GameMemory.h"
 #include "Common/GameType.h"
@@ -43,9 +39,9 @@
 #include "WWMath/matrix3d.h"		///< @todo Replace with our own matrix library
 #include "Common/STLTypedefs.h"
 
- 
+
 /// @todo Once the client framerate is decoupled, the frame counters within will have to become time-based
- 
+
 class Particle;
 class ParticleSystem;
 class ParticleSystemManager;
@@ -84,7 +80,7 @@ struct RGBColorKeyframe
 
 enum ParticlePriorityType CPP_11(: Int)
 {
-	INVALID_PRIORITY = 0, 
+	INVALID_PRIORITY = 0,
 	PARTICLE_PRIORITY_LOWEST = 1,
 //	FLUFF = PARTICLE_PRIORITY_LOWEST,		///< total and absolute fluff
 //	DEBRIS,		///< debris related particles
@@ -107,8 +103,8 @@ enum ParticlePriorityType CPP_11(: Int)
 	CRITICAL,				///< super special top priority like a superweapon
 	ALWAYS_RENDER,	///< used for logically important display (not just fluff), so must never be culled, regardless of particle cap, lod, etc
 	// !!! *Noting* goes here ... special is the top priority !!!
-	PARTICLE_PRIORITY_HIGHEST = ALWAYS_RENDER,
-	NUM_PARTICLE_PRIORITIES  ///< Keep this last
+	NUM_PARTICLE_PRIORITIES,
+	PARTICLE_PRIORITY_HIGHEST = NUM_PARTICLE_PRIORITIES - 1,
 };
 
 /**
@@ -160,11 +156,11 @@ class ParticleInfo : public Snapshot
  * An individual particle created by a ParticleSystem.
  * NOTE: Particles cannot exist without a parent particle system.
  */
-class Particle : public MemoryPoolObject, 
+class Particle : public MemoryPoolObject,
 								 public ParticleInfo
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( Particle, "ParticlePool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( Particle, "ParticlePool" )
 
 public:
 
@@ -175,20 +171,20 @@ class Particle : public MemoryPoolObject,
 
 	void applyForce( const Coord3D *force );		///< add the given acceleration
 
-	inline const Coord3D *getPosition( void ) { return &m_pos; }
-	inline Real getSize( void ) { return m_size; }
-	inline Real getAngle( void ) { return m_angleZ; }
-	inline Real getAlpha( void ) { return m_alpha; }
-	inline const RGBColor *getColor( void ) { return &m_color; }
-	inline void setColor( RGBColor *color ) { m_color = *color; }
+	const Coord3D *getPosition( void ) { return &m_pos; }
+	Real getSize( void ) { return m_size; }
+	Real getAngle( void ) { return m_angleZ; }
+	Real getAlpha( void ) { return m_alpha; }
+	const RGBColor *getColor( void ) { return &m_color; }
+	void setColor( RGBColor *color ) { m_color = *color; }
 
 	inline Bool isInvisible( void );										///< return true if this particle is invisible
-	inline Bool isCulled (void) {return m_isCulled;}				///< return true if the particle falls off the edge of the screen
-	inline void setIsCulled (Bool enable) { m_isCulled = enable;}		///< set particle to not visible because it's outside view frustum
+	Bool isCulled (void) {return m_isCulled;}				///< return true if the particle falls off the edge of the screen
+	void setIsCulled (Bool enable) { m_isCulled = enable;}		///< set particle to not visible because it's outside view frustum
 
 	void controlParticleSystem( ParticleSystem *sys ) { m_systemUnderControl = sys; }
 	void detachControlledParticleSystem( void ) { m_systemUnderControl = NULL; }
-	
+
 	// get priority of this particle ... which is the priority of the system it belongs to
 	ParticlePriorityType getPriority( void );
 
@@ -244,46 +240,6 @@ class Particle : public MemoryPoolObject,
 
 };
 
-
-//--------------------------------------------------------------------------------------------------------------
-
-#ifdef DEFINE_PARTICLE_SYSTEM_NAMES
-
-/**** NOTE: These MUST be kept in sync with the enumerations below *****/
-
-static const char *ParticleShaderTypeNames[] = 
-{
-	"NONE", "ADDITIVE", "ALPHA", "ALPHA_TEST", "MULTIPLY", NULL
-};
-
-static const char *ParticleTypeNames[] = 
-{
-	"NONE", "PARTICLE", "DRAWABLE", "STREAK", "VOLUME_PARTICLE","SMUDGE", NULL
-};
-
-static const char *EmissionVelocityTypeNames[] =
-{
-	"NONE", "ORTHO", "SPHERICAL", "HEMISPHERICAL", "CYLINDRICAL", "OUTWARD", NULL
-};
-
-static const char *EmissionVolumeTypeNames[] =
-{
-	"NONE", "POINT", "LINE", "BOX", "SPHERE", "CYLINDER", NULL
-};
-
-//"NONE", "FLUFF", "DEBRIS", "NATURE", "WEAPON", "DAMAGE", "SPECIAL"
-static const char *ParticlePriorityNames[] = 
-{
-	"NONE", "WEAPON_EXPLOSION","SCORCHMARK","DUST_TRAIL","BUILDUP","DEBRIS_TRAIL","UNIT_DAMAGE_FX","DEATH_EXPLOSION","SEMI_CONSTANT","CONSTANT","WEAPON_TRAIL","AREA_EFFECT","CRITICAL", "ALWAYS_RENDER", NULL
-};
-
-static const char *WindMotionNames[] = 
-{
-	"NONE", "Unused", "PingPong", "Circular", NULL
-};
-
-#endif
-
 /**
  * All of the properties of a particle system, used by both ParticleSystemTemplates
  * and ParticleSystem classes.
@@ -304,13 +260,15 @@ class ParticleSystemInfo : public Snapshot
 
 	enum ParticleShaderType
 	{
-		INVALID_SHADER=0, ADDITIVE, ALPHA, ALPHA_TEST, MULTIPLY
-	} 
+		INVALID_SHADER=0, ADDITIVE, ALPHA, ALPHA_TEST, MULTIPLY,
+		PARTICLE_SHADER_TYPE_COUNT
+	}
 	m_shaderType;																///< how this particle is rendered
 
 	enum ParticleType
 	{
-		INVALID_TYPE=0, PARTICLE, DRAWABLE, STREAK, VOLUME_PARTICLE, SMUDGE	 ///< is a particle a 2D-screen-facing particle, or a Drawable, or a Segment in a streak?
+		INVALID_TYPE=0, PARTICLE, DRAWABLE, STREAK, VOLUME_PARTICLE, SMUDGE, ///< is a particle a 2D-screen-facing particle, or a Drawable, or a Segment in a streak?
+		PARTICLE_TYPE_COUNT
 	}
 	m_particleType;
 
@@ -346,7 +304,7 @@ class ParticleSystemInfo : public Snapshot
 	typedef Int Color;
 
 	void tintAllColors( Color tintColor );
-	
+
 	GameClientRandomVariable m_colorScale;								///< color coefficient
 
 	GameClientRandomVariable m_burstDelay;								///< time between particle emissions
@@ -366,7 +324,8 @@ class ParticleSystemInfo : public Snapshot
 	// The direction and speed at which particles are emitted
 	enum EmissionVelocityType
 	{
-		INVALID_VELOCITY=0, ORTHO, SPHERICAL, HEMISPHERICAL, CYLINDRICAL, OUTWARD
+		INVALID_VELOCITY=0, ORTHO, SPHERICAL, HEMISPHERICAL, CYLINDRICAL, OUTWARD,
+		EMISSION_VELOCITY_TYPE_COUNT
 	}
 	m_emissionVelocityType;
 
@@ -409,10 +368,11 @@ class ParticleSystemInfo : public Snapshot
 	// Note that the volume is relative to the system's position and orientation
 	enum EmissionVolumeType
 	{
-		INVALID_VOLUME=0, POINT, LINE, BOX, SPHERE, CYLINDER
+		INVALID_VOLUME=0, POINT, LINE, BOX, SPHERE, CYLINDER,
+		EMISSION_VOLUME_TYPE_COUNT
 	}
 	m_emissionVolumeType;												///< the type of volume where particles are created
-	
+
 	union emissionVolumeUnion
 	{
 		// point just uses system's position
@@ -449,7 +409,7 @@ class ParticleSystemInfo : public Snapshot
 	m_emissionVolume;														///< the dimensions of the emission volume
 
 	Bool m_isEmissionVolumeHollow;							///< if true, only create particles at boundary of volume
-	Bool m_isGroundAligned;											///< if true, align with the ground. if false, then do the normal billboarding. 
+	Bool m_isGroundAligned;											///< if true, align with the ground. if false, then do the normal billboarding.
 	Bool m_isEmitAboveGroundOnly;								///< if true, only emit particles when the system is above ground.
 	Bool m_isParticleUpTowardsEmitter;					///< if true, align the up direction to be towards the emitter.
 
@@ -458,7 +418,9 @@ class ParticleSystemInfo : public Snapshot
 		WIND_MOTION_INVALID = 0,
 		WIND_MOTION_NOT_USED,
 		WIND_MOTION_PING_PONG,
-		WIND_MOTION_CIRCULAR
+		WIND_MOTION_CIRCULAR,
+
+		WIND_MOTION_COUNT
 	};
 	WindMotion m_windMotion;				///< motion of the wind angle updating
 	Real m_windAngle;								///< angle of the "wind" associated with this system
@@ -475,13 +437,56 @@ class ParticleSystemInfo : public Snapshot
 
 };
 
+//--------------------------------------------------------------------------------------------------------------
+
+#ifdef DEFINE_PARTICLE_SYSTEM_NAMES
+
+/**** NOTE: These MUST be kept in sync with the enumerations above *****/
+
+static const char *const ParticleShaderTypeNames[] =
+{
+	"NONE", "ADDITIVE", "ALPHA", "ALPHA_TEST", "MULTIPLY", NULL
+};
+static_assert(ARRAY_SIZE(ParticleShaderTypeNames) == ParticleSystemInfo::PARTICLE_SHADER_TYPE_COUNT + 1, "Incorrect array size");
+
+static const char *const ParticleTypeNames[] =
+{
+	"NONE", "PARTICLE", "DRAWABLE", "STREAK", "VOLUME_PARTICLE","SMUDGE", NULL
+};
+static_assert(ARRAY_SIZE(ParticleTypeNames) == ParticleSystemInfo::PARTICLE_TYPE_COUNT + 1, "Incorrect array size");
+
+static const char *const EmissionVelocityTypeNames[] =
+{
+	"NONE", "ORTHO", "SPHERICAL", "HEMISPHERICAL", "CYLINDRICAL", "OUTWARD", NULL
+};
+static_assert(ARRAY_SIZE(EmissionVelocityTypeNames) == ParticleSystemInfo::EMISSION_VELOCITY_TYPE_COUNT + 1, "Incorrect array size");
+
+static const char *const EmissionVolumeTypeNames[] =
+{
+	"NONE", "POINT", "LINE", "BOX", "SPHERE", "CYLINDER", NULL
+};
+static_assert(ARRAY_SIZE(EmissionVolumeTypeNames) == ParticleSystemInfo::EMISSION_VOLUME_TYPE_COUNT + 1, "Incorrect array size");
+
+static const char *const ParticlePriorityNames[] =
+{
+	"NONE", "WEAPON_EXPLOSION","SCORCHMARK","DUST_TRAIL","BUILDUP","DEBRIS_TRAIL","UNIT_DAMAGE_FX","DEATH_EXPLOSION","SEMI_CONSTANT","CONSTANT","WEAPON_TRAIL","AREA_EFFECT","CRITICAL", "ALWAYS_RENDER", NULL
+};
+static_assert(ARRAY_SIZE(ParticlePriorityNames) == NUM_PARTICLE_PRIORITIES + 1, "Incorrect array size");
+
+static const char *const WindMotionNames[] =
+{
+	"NONE", "Unused", "PingPong", "Circular", NULL
+};
+static_assert(ARRAY_SIZE(WindMotionNames) == ParticleSystemInfo::WIND_MOTION_COUNT + 1, "Incorrect array size");
+
+#endif
 
 /**
  * A ParticleSystemTemplate, used by the ParticleSystemManager to instantiate ParticleSystems.
  */
 class ParticleSystemTemplate : public MemoryPoolObject, protected ParticleSystemInfo
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( ParticleSystemTemplate, "ParticleSystemTemplatePool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( ParticleSystemTemplate, "ParticleSystemTemplatePool" )
 
 public:
 	ParticleSystemTemplate( const AsciiString &name );
@@ -500,7 +505,7 @@ class ParticleSystemTemplate : public MemoryPoolObject, protected ParticleSystem
 protected:
 	friend class ParticleSystemManager;					///< @todo remove this friendship
 	friend class ParticleSystem;								///< @todo remove this friendship
-	
+
 	// These friendships are naughty but necessary for particle editing.
 	friend class DebugWindowDialog;							///< @todo remove this friendship when no longer editing particles
 	friend void _updateAsciiStringParmsToSystem(ParticleSystemTemplate *particleTemplate);
@@ -524,19 +529,19 @@ class ParticleSystemTemplate : public MemoryPoolObject, protected ParticleSystem
  * before destroying itself in order to ensure everything can be cleaned up if the system
  * is reset.
  */
-class ParticleSystem : public MemoryPoolObject, 
+class ParticleSystem : public MemoryPoolObject,
 											 public ParticleSystemInfo
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( ParticleSystem, "ParticleSystemPool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( ParticleSystem, "ParticleSystemPool" )
 
 public:
 
-	ParticleSystem( const ParticleSystemTemplate *sysTemplate, 
+	ParticleSystem( const ParticleSystemTemplate *sysTemplate,
 									ParticleSystemID id,
 									Bool createSlaves );			///< create a particle system from a template and assign it this ID
 
-	inline ParticleSystemID getSystemID( void ) const { return m_systemID; }	///< get unique system ID
+	ParticleSystemID getSystemID( void ) const { return m_systemID; }	///< get unique system ID
 
 	void setPosition( const Coord3D *pos );			///< set the position of the particle system
 	void getPosition( Coord3D *pos );				///< get the position of the particle system
@@ -545,7 +550,7 @@ class ParticleSystem : public MemoryPoolObject,
 	void rotateLocalTransformY( Real y );				///< rotate local transform matrix
 	void rotateLocalTransformZ( Real z );				///< rotate local transform matrix
   void setSkipParentXfrm(Bool enable) { m_skipParentXfrm = enable; } ///<disable transforming particle system with parent matrix.
-		
+
 	const Coord3D *getDriftVelocity( void ) { return &m_driftVelocity; }	///< get the drift velocity of the system
 
 	void attachToDrawable( const Drawable *draw );							///< attach this particle system to a Drawable
@@ -592,7 +597,7 @@ class ParticleSystem : public MemoryPoolObject,
 	void setMaster( ParticleSystem *master );  ///< make this a slave with a master
 	ParticleSystem *getMaster( void ) { return m_masterSystem; }
 	const Coord3D *getSlavePositionOffset( void ) { return &m_slavePosOffset; }
-	
+
 	void setSystemLifetime( UnsignedInt frames ) { m_systemLifetimeLeft = frames; }; ///< not the particle life, the system!... Lorenzen
 	void setLifetimeRange( Real min, Real max );
 	Bool isSystemForever() const {return m_isForever;}
@@ -621,8 +626,8 @@ class ParticleSystem : public MemoryPoolObject,
 	void removeParticle( Particle *p );
 	UnsignedInt getParticleCount( void ) const { return m_particleCount; }
 
-	inline ObjectID getAttachedObject( void ) { return m_attachedToObjectID; }
-	inline DrawableID getAttachedDrawable( void ) { return m_attachedToDrawableID; }
+	ObjectID getAttachedObject( void ) { return m_attachedToObjectID; }
+	DrawableID getAttachedDrawable( void ) { return m_attachedToDrawableID; }
 
 	// Access to dynamically changing part of a particle system.
 	void setEmissionVolumeSphereRadius( Real newRadius ) { if (m_emissionVolumeType == SPHERE) m_emissionVolume.sphere.radius = newRadius; }
@@ -736,15 +741,15 @@ class ParticleSystemManager : public SubsystemInterface,
 
 	/// given a template, instantiate a particle system
 	ParticleSystem *createParticleSystem( const ParticleSystemTemplate *sysTemplate,
-																				Bool createSlaves = TRUE );	
+																				Bool createSlaves = TRUE );
 
-	/** given a template, instantiate a particle system. 
+	/** given a template, instantiate a particle system.
 		if attachTo is not null, attach the particle system to the given object.
 		return the particle system's ID, NOT its pointer.
 	*/
 	ParticleSystemID createAttachedParticleSystemID( const ParticleSystemTemplate *sysTemplate,
 																				Object* attachTo,
-																				Bool createSlaves = TRUE );	
+																				Bool createSlaves = TRUE );
 
 	/// find a particle system given a unique system identifier
 	ParticleSystem *findParticleSystem( ParticleSystemID id );
@@ -757,7 +762,7 @@ class ParticleSystemManager : public SubsystemInterface,
 	TemplateMap::iterator endParticleSystemTemplate() { return m_templateMap.end(); }
 	TemplateMap::const_iterator beginParticleSystemTemplate() const { return m_templateMap.begin(); }
 	TemplateMap::const_iterator endParticleSystemTemplate() const { return m_templateMap.end(); }
-	
+
 	/// destroy attached systems to object
 	void destroyAttachedSystems( Object *obj );
 
@@ -773,10 +778,10 @@ class ParticleSystemManager : public SubsystemInterface,
 
 	// @todo const this jkmcd
 	ParticleSystemList &getAllParticleSystems( void ) { return m_allParticleSystemList; }
-	
+
 	virtual void doParticles(RenderInfoClass &rinfo) = 0;
 	virtual void queueParticleRender() = 0;
-	
+
 	virtual void preloadAssets( TimeOfDay timeOfDay );
 
 	// these are only for use by partcle systems to link and unlink themselves
@@ -813,6 +818,3 @@ extern ParticleSystemManager *TheParticleSystemManager;
 
 class DebugDisplayInterface;
 extern void ParticleSystemDebugDisplay( DebugDisplayInterface *dd, void *, FILE *fp = NULL );
-
-
-#endif // _PARTICLE_SYS_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h b/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h
index a180f8b3cd5..188173300dd 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h
@@ -27,13 +27,10 @@
 
 #pragma once
 
-#ifndef _H_PlaceEventTranslator
-#define _H_PlaceEventTranslator
-
 #include "GameClient/InGameUI.h"
 
 //-----------------------------------------------------------------------------
-class PlaceEventTranslator : public GameMessageTranslator                          
+class PlaceEventTranslator : public GameMessageTranslator
 {
 private:
 	UnsignedInt m_frameOfUpButton;
@@ -42,6 +39,4 @@ class PlaceEventTranslator : public GameMessageTranslator
 	PlaceEventTranslator();
 	~PlaceEventTranslator();
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
-};	
-
-#endif
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h
index 470eb5026e1..e498f8907b6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h
@@ -24,12 +24,12 @@
 
 // FILE: ProcessAnimateWindow.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Mar 2002
@@ -37,11 +37,11 @@
 //	Filename: 	ProcessAnimateWindow.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	If a new animation is wanted to be added for the windows, All you 
+//
+//	purpose:	If a new animation is wanted to be added for the windows, All you
 //						have to do is create a new class derived from ProcessAnimateWindow.
 //						Then setup each of the virtual classes to process an AnimateWindow
-//						class.  The Update adn reverse functions get called every frame 
+//						class.  The Update adn reverse functions get called every frame
 //						by the shell and will continue to process the AdminWin until the
 //						isFinished flag on the adminWin is set to true.
 //
@@ -50,9 +50,6 @@
 
 #pragma once
 
-#ifndef __PROCESSANIMATEWINDOW_H_
-#define __PROCESSANIMATEWINDOW_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -265,5 +262,3 @@ Real m_speedUpRatio;  // how fast the windows speed up
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __PROCESSANIMATEWINDOW_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h b/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h
index 5e720d3f545..6a434dc3998 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef _RadiusDecal_H_
-#define _RadiusDecal_H_
-
 #include "Common/GameCommon.h"
 #include "Common/GameType.h"
 #include "GameClient/Color.h"
@@ -56,7 +53,7 @@ class RadiusDecal
 	void xferRadiusDecal( Xfer *xfer );
 
 	// please note: it is very important, for game/net sync reasons, to ensure that
-	// isEmpty() returns the same value, regardless of whether this decal will 
+	// isEmpty() returns the same value, regardless of whether this decal will
 	// be visible to the local player or not.
 	Bool isEmpty() const { return m_empty; }
 	void clear();
@@ -91,5 +88,3 @@ class RadiusDecalTemplate
 
 	static void parseRadiusDecalTemplate(INI* ini, void *instance, void * store, const void* /*userData*/);
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h b/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h
index 61a8b2e2a52..2a2d1bc4171 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RAYEFFECT_H_
-#define __RAYEFFECT_H_
-
 // INCLUDE ////////////////////////////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
 #include "Common/SubsystemInterface.h"
@@ -49,7 +46,7 @@ struct RayEffectData
 	Coord3D startLoc;  ///< start location for ray
 	Coord3D endLoc;  ///< end location for ray
 
-};  // end RayEffectData
+};
 
 //-------------------------------------------------------------------------------------------------
 /** This class maintains all the ray effects visible in the world */
@@ -87,10 +84,7 @@ class RayEffectSystem : public SubsystemInterface
 	};
 	RayEffectData m_effectData[ MAX_RAY_EFFECTS ];  ///< all the ray effects
 
-};  // end RayEffectSystem
+};
 
 // EXTERN /////////////////////////////////////////////////////////////////////////////////////////
 extern RayEffectSystem *TheRayEffects;  ///< the ray effects singleton external
-
-#endif // $label
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h
index 20ca694d1c6..509c5923571 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h
@@ -28,12 +28,9 @@
 
 #pragma once
 
-#ifndef __SELECTIONINFO_H__
-#define __SELECTIONINFO_H__
-
 #include "GameClient/InGameUI.h"
 
-// This structure gives you a rough idea about the counts of the kinds of guys in the 
+// This structure gives you a rough idea about the counts of the kinds of guys in the
 // current selection, and in the selection that would be made.
 struct SelectionInfo
 {
@@ -59,7 +56,7 @@ struct SelectionInfo
 	Bool selectFriends;
 
 
-	SelectionInfo(); 
+	SelectionInfo();
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -67,8 +64,10 @@ struct PickDrawableStruct
 {
 	// List to fill with Drawables. This should be provided by the caller.
 	DrawableList *drawableListToFill;
+
+	Bool isPointSelection;
 	Bool forceAttackMode;
-	
+
 	// Note, this is OR'd with the things we are attempting to select.
 	KindOfMaskType kindofsToMatch;
 
@@ -76,7 +75,7 @@ struct PickDrawableStruct
 };
 
 //-------------------------------------------------------------------------------------------------
-extern Bool contextCommandForNewSelection(const DrawableList *currentlySelectedDrawables, 
+extern Bool contextCommandForNewSelection(const DrawableList *currentlySelectedDrawables,
 																					const DrawableList *newlySelectedDrawables,
 																					SelectionInfo *outSelectionInfo,
 																					Bool selectionIsPoint);
@@ -97,9 +96,6 @@ extern void translatePickTypesToKindof(UnsignedInt pickTypes, KindOfMaskType& ou
 
 //-------------------------------------------------------------------------------------------------
 // Given a drawable, add it to an stl list. Useful for iterateDrawablesInRegion.
-// userData should be a pointer to a PickDrawableStruct, which is defined in 
+// userData should be a pointer to a PickDrawableStruct, which is defined in
 // above.
 extern Bool addDrawableToList( Drawable *draw, void *userData );
-
-
-#endif /* __SELECTIONINFO_H__ */
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h
index 3970cf3bc30..a102bae2c87 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef _H_SelectionXlat
-#define _H_SelectionXlat
-
 #include "GameClient/InGameUI.h"
 
 class ThingTemplate;
@@ -61,27 +58,23 @@ class SelectionTranslator : public GameMessageTranslator
 	Bool selectFriends( Drawable *draw, GameMessage *createTeamMsg, Bool dragSelecting );
 	Bool killThemKillThemAll( Drawable *draw, GameMessage *killThemAllMsg );
 
-  
+
 
 public:
 	SelectionTranslator();
 	~SelectionTranslator();
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
-
-	//Added By Sadullah Nader
 	//added for fix to the drag selection when entering control bar
 	//changes the mode of drag selecting to it's opposite
 	void setDragSelecting(Bool dragSelect);
 	void setLeftMouseButton(Bool state);
-  
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
   Bool m_HandOfGodSelectionMode;
   Bool isHandOfGodSelectionMode( void) { return m_HandOfGodSelectionMode; };
 #endif
 
-};	
+};
 
 Bool CanSelectDrawable( const Drawable *draw, Bool dragSelecting );
 extern SelectionTranslator *TheSelectionTranslator;
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h
index 75c42c21af9..3b8347c9d13 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __SHADOW_H_
-#define __SHADOW_H_
-
 //
 // skeleton definition of shadow types
 //
@@ -40,17 +37,17 @@
 // shadow bit flags, keep this in sync with TheShadowNames
 enum ShadowType CPP_11(: Int)
 {
-	SHADOW_NONE											=	0x00000000, 
+	SHADOW_NONE											=	0x00000000,
 	SHADOW_DECAL										=	0x00000001,		//shadow decal applied via modulate blend
-	SHADOW_VOLUME										=	0x00000002, 
+	SHADOW_VOLUME										=	0x00000002,
 	SHADOW_PROJECTION								=	0x00000004,
 	SHADOW_DYNAMIC_PROJECTION				= 0x00000008,		//extra setting for shadows which need dynamic updates
 	SHADOW_DIRECTIONAL_PROJECTION		= 0x00000010,		//extra setting for shadow decals that rotate with sun direction
 	SHADOW_ALPHA_DECAL							= 0x00000020,		//not really for shadows but for other decal uses. Alpha blended.
-	SHADOW_ADDITIVE_DECAL						= 0x00000040		//not really for shadows but for other decal uses. Additive blended. 
+	SHADOW_ADDITIVE_DECAL						= 0x00000040		//not really for shadows but for other decal uses. Additive blended.
 };
 #ifdef DEFINE_SHADOW_NAMES
-static const char* TheShadowNames[] = 
+static const char* const TheShadowNames[] =
 {
 	"SHADOW_DECAL",
 	"SHADOW_VOLUME",
@@ -73,9 +70,9 @@ class Shadow
 {
 
 public:
-		
+
 		struct	ShadowTypeInfo
-		{	
+		{
 				char	m_ShadowName[64];	//when set, overrides the default model shadow (used mostly for Decals).
 				ShadowType m_type;			//type of shadow
 				Bool	allowUpdates;			//whether to update the shadow image when object/light moves.
@@ -89,7 +86,7 @@ class Shadow
 		Shadow(void) : m_diffuse(0xffffffff), m_color(0xffffffff), m_opacity (0x000000ff), m_localAngle(0.0f) {}
 
 		///<if this is set, then no render will occur, even if enableShadowRender() is enabled. Used by Shroud.
-		void enableShadowInvisible(Bool isEnabled);	
+		void enableShadowInvisible(Bool isEnabled);
 		void enableShadowRender(Bool isEnabled);
 		Bool isRenderEnabled(void) {return m_isEnabled;}
 		Bool isInvisibleEnabled(void) {return m_isInvisibleEnabled;}
@@ -101,22 +98,22 @@ class Shadow
 
 		void setSize(Real sizeX, Real sizeY)
 		{
-			m_decalSizeX = sizeX; 
-			m_decalSizeY = sizeY; 
-			
-			if (sizeX == 0) 
+			m_decalSizeX = sizeX;
+			m_decalSizeY = sizeY;
+
+			if (sizeX == 0)
 				m_oowDecalSizeX = 0;
 			else
 				m_oowDecalSizeX = 1.0f/sizeX ;
 
-			if (sizeY == 0) 
+			if (sizeY == 0)
 				m_oowDecalSizeY = 0;
 			else
 				m_oowDecalSizeY = 1.0f/sizeY ;
 
 		};
 
-		#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+		#if defined(RTS_DEBUG)
 		virtual void getRenderCost(RenderCost & rc) const = 0;
 		#endif
 
@@ -173,7 +170,7 @@ inline void Shadow::setOpacity(Int value)
 }
 
 inline void Shadow::setColor(Color value)
-{ 
+{
 	m_color = value & 0x00ffffff;	//filter out alpha
 
 	if (m_type & SHADOW_ALPHA_DECAL)
@@ -213,6 +210,3 @@ class ProjectedShadowManager
 };
 
 extern ProjectedShadowManager *TheProjectedShadowManager;
-
-#endif // __SHADOW_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h
index 0caf3ed6532..e810ebdf11e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h
@@ -60,10 +60,10 @@
 //
 //		- Init() [OPTIONAL]
 //			This is called as a result of a push or pop operation (see above for more info)
-//			The window layout is loaded from disk and then this Init() 
-//			method is run.  All shell layout Init() methods should show 
+//			The window layout is loaded from disk and then this Init()
+//			method is run.  All shell layout Init() methods should show
 //			the layout windows.  At this point you could move windows
-//			to starting positions, set a state that the Update() method looks at to 
+//			to starting positions, set a state that the Update() method looks at to
 //			"animate" the windows to the desired positions.
 //
 //		- Update() [OPTIONAL]
@@ -77,7 +77,7 @@
 //		- Shutdown() [REQUIRED]
 //			This is called when a layout is popped off the stack, or when a new layout
 //			is pushed on top of this one (see above for more detail on what happens
-//			during the push/pop process).  You can switch into a "shutdown" state and 
+//			during the push/pop process).  You can switch into a "shutdown" state and
 //			animate the layout appropriately in the Update() method for the layout.
 //			When shutdown is actually complete you should hide the all windows in
 //			the layout and then you are REQUIRED to notify the shell by calling
@@ -94,9 +94,6 @@
 
 #pragma once
 
-#ifndef __SHELL_H_
-#define __SHELL_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
@@ -120,11 +117,13 @@ class Shell : public SubsystemInterface
 	~Shell( void );
 
 	// Inhertited from subsystem ====================================================================
-	virtual void init( void );			
-	virtual void reset( void );			
-	virtual void update( void );		
+	virtual void init( void );
+	virtual void reset( void );
+	virtual void update( void );
 	//===============================================================================================
 
+	void recreateWindowLayouts( void );
+
 	void showShellMap(Bool useShellMap );										///< access function to turn on and off the shell map
 
 	void hide( Bool hide );																	///< show/hide all shell layouts
@@ -136,13 +135,11 @@ class Shell : public SubsystemInterface
 	void showShell( Bool runInit = TRUE );									///< init the top of stack
 	void hideShell( void );																	///< shutdown the top of stack
 	WindowLayout *top( void );															///< return top layout
-	
+
 	void shutdownComplete( WindowLayout *layout, Bool impendingPush = FALSE );	///< layout has completed shutdown
 
 	WindowLayout *findScreenByFilename( AsciiString filename );		///< find screen
-	inline Bool isShellActive( void ) { return m_isShellActive; }  ///<	Returns true if the shell is active
-	
-	inline Int getScreenCount(void) { return m_screenCount; }			///< Return the current number of screens
+	Bool isShellActive( void ) { return m_isShellActive; }  ///<	Returns true if the shell is active
 
 	void registerWithAnimateManager( GameWindow *win, AnimTypes animType, Bool needsToFinish, UnsignedInt delayMS = 0);
 	Bool isAnimFinished( void );
@@ -152,6 +149,9 @@ class Shell : public SubsystemInterface
 	void loadScheme( AsciiString name );
 	ShellMenuSchemeManager *getShellMenuSchemeManager( void ) { return m_schemeManager;	}
 
+	Int getScreenCount( void ) const { return m_screenCount; } ///< Return the current number of screens
+	WindowLayout *getScreenLayout( Int index ) const;
+
 	WindowLayout *getSaveLoadMenuLayout( void );		///< create if necessary and return layout for save load menu
 	WindowLayout *getPopupReplayLayout( void );			///< create if necessary and return layout for replay save menu
 	WindowLayout *getOptionsLayout( Bool create );	///< return layout for options menu, create if necessary and we are allowed to.
@@ -159,6 +159,9 @@ class Shell : public SubsystemInterface
 
 protected:
 
+	void construct( void );
+	void deconstruct( void );
+
 	void linkScreen( WindowLayout *screen );								///< link screen to list
 	void unlinkScreen( WindowLayout *screen );							///< remove screen from list
 
@@ -194,12 +197,9 @@ class Shell : public SubsystemInterface
 	WindowLayout *m_popupReplayLayout;											///< replay save menu layout
 	WindowLayout *m_optionsLayout;													///< options menu layout
 
-};  // end class Shell
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern Shell *TheShell;  ///< the shell external interface
-
-#endif // __SHELL_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h
index 36455ad0852..addd9f559bd 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h
@@ -28,15 +28,12 @@
 
 #pragma once
 
-#ifndef SHELLHOOKS_H
-#define SHELLHOOKS_H
-
 //
-// This enumeration holds all the shell script hooks that we currently have, If you are going to 
-// add more, it's important to keep the enum lined up with the names in TheShellHookNames located 
+// This enumeration holds all the shell script hooks that we currently have, If you are going to
+// add more, it's important to keep the enum lined up with the names in TheShellHookNames located
 // in Scripts.cpp.
 //
-enum 
+enum
 {
 	SHELL_SCRIPT_HOOK_MAIN_MENU_CAMPAIGN_SELECTED = 0,
 	SHELL_SCRIPT_HOOK_MAIN_MENU_CAMPAIGN_HIGHLIGHTED,
@@ -77,11 +74,8 @@ enum
 	SHELL_SCRIPT_HOOK_LAN_CLOSED,
 	SHELL_SCRIPT_HOOK_LAN_ENTERED_FROM_GAME,
 
-	SHELL_SCRIPT_HOOK_TOTAL			// Keep this guy last!
+	SHELL_SCRIPT_HOOK_TOTAL
 };
 
-extern const char *TheShellHookNames[];				///< Contains a list of the text representation of the shell hooks Used in WorldBuilder and in the shell.
+extern const char *const TheShellHookNames[];				///< Contains a list of the text representation of the shell hooks Used in WorldBuilder and in the shell.
 void SignalUIInteraction(Int interaction);
-
-#endif // SHELLHOOKS_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h
index 05c8865b578..08265632fd5 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h
@@ -24,12 +24,12 @@
 
 // FILE: ShellMenuScheme.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,17 +37,14 @@
 //	Filename: 	ShellMenuScheme.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __SHELL_MENU_SCHEME_H_
-#define __SHELL_MENU_SCHEME_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -69,8 +66,8 @@ class ShellMenuSchemeLine
 {
 public:
 	ShellMenuSchemeLine( void );
-	~ShellMenuSchemeLine( void );	
-	
+	~ShellMenuSchemeLine( void );
+
 	ICoord2D m_startPos;
 	ICoord2D m_endPos;
 	Int m_width;
@@ -82,7 +79,7 @@ class ShellMenuSchemeImage
 {
 public:
 	ShellMenuSchemeImage( void );
-	~ShellMenuSchemeImage( void );	
+	~ShellMenuSchemeImage( void );
 
 	AsciiString m_name;						///< Name of the image
 	ICoord2D m_position;					///< the position we'll draw it at
@@ -94,25 +91,25 @@ class ShellMenuScheme
 {
 public:
 	ShellMenuScheme( void );
-	~ShellMenuScheme( void );	
-	
+	~ShellMenuScheme( void );
+
 	void draw( void );
 	void addImage( ShellMenuSchemeImage* schemeImage );
 	void addLine( ShellMenuSchemeLine* schemeLine );
-	
+
 
 	AsciiString m_name;
 
 	typedef std::list< ShellMenuSchemeImage* > ShellMenuSchemeImageList;
 	typedef ShellMenuSchemeImageList::iterator ShellMenuSchemeImageListIt;
 	ShellMenuSchemeImageList m_imageList;
-	
+
 	typedef std::list< ShellMenuSchemeLine* > ShellMenuSchemeLineList;
 	typedef ShellMenuSchemeLineList::iterator ShellMenuSchemeLineListIt;
 	ShellMenuSchemeLineList m_lineList;
 
 
-	
+
 
 };
 
@@ -121,12 +118,12 @@ class ShellMenuSchemeManager
 public:
 	ShellMenuSchemeManager( void );
 	~ShellMenuSchemeManager( void );
-	
+
 	void init( void );
 	void update( void );
 
 	void setShellMenuScheme( AsciiString name );
-	
+
 	void draw( void );
 
 	// parse Functions for the INI file
@@ -153,5 +150,3 @@ class ShellMenuSchemeManager
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __SHELL_MENU_SCHEME_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Statistics.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Statistics.h
index 9ab29a4c660..2784870d75d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Statistics.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Statistics.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Statistics.h 
+// FILE: Statistics.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -38,8 +38,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_STATISTICS_
-#define _H_STATISTICS_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
@@ -50,7 +48,7 @@
 
 
 // valueToRun is the value (between 0 and maxValueForVal) to test.
-// mu is designates the steepness of the curve. 
+// mu is designates the steepness of the curve.
 // The return value is a value in [-1, 1]
 extern Real MuLaw(Real valueToRun, Real maxValueForVal, Real mu);
 
@@ -62,5 +60,3 @@ extern Real Normalize(Real valueToNormalize, Real minRange, Real maxRange);
 
 // same as Normalize, except that output will be in the range [outRangeMin, outRangeMax]
 extern Real NormalizeToRange(Real valueToNormalize, Real minRange, Real maxRange, Real outRangeMin, Real outRangeMax);
-
-#endif /* _H_STATISTICS_ */
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainRoads.h b/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainRoads.h
deleted file mode 100644
index a6406ea18d2..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainRoads.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: TerrainRoads.h ///////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, December 2001
-// Desc:   Terrain road descriptions	
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __TERRAINROADS_H_
-#define __TERRAINROADS_H_
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/GameMemory.h"
-#include "Common/SubsystemInterface.h"
-
-#include "GameLogic/Module/BodyModule.h"
-
-
-// FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
-struct FieldParse;
-class AsciiString;
-
-// ------------------------------------------------------------------------------------------------
-/** Bridges have 4 towers around it that the player can attack or use to repair the bridge */
-// ------------------------------------------------------------------------------------------------
-enum BridgeTowerType CPP_11(: Int)
-{
-	BRIDGE_TOWER_FROM_LEFT = 0,
-	BRIDGE_TOWER_FROM_RIGHT,
-	BRIDGE_TOWER_TO_LEFT,
-	BRIDGE_TOWER_TO_RIGHT,
-	BRIDGE_MAX_TOWERS				///< keep this last
-};
-
-// ------------------------------------------------------------------------------------------------
-enum { MAX_BRIDGE_BODY_FX = 3 };
-
-//-------------------------------------------------------------------------------------------------
-/** Terrain road description, good for roads and bridges */
-//-------------------------------------------------------------------------------------------------
-class TerrainRoadType : public MemoryPoolObject
-{
-
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TerrainRoadType, "TerrainRoadType" )
-
-public:
-
-	TerrainRoadType( void );
-	// destructor prototypes defined by memory pool object
-
-	inline AsciiString getName( void ) { return m_name; }
-	inline AsciiString getTexture( void ) { return m_texture; }
-	inline Bool isBridge( void ) { return m_isBridge; }
-	inline UnsignedInt getID( void ) { return m_id; }
-
-	inline Real getRoadWidth( void ) { return m_roadWidth; }
-	inline Real getRoadWidthInTexture( void ) { return m_roadWidthInTexture; }
-
-	inline Real getBridgeScale( void ) { return m_bridgeScale; }
-	inline AsciiString getScaffoldObjectName( void ) { return m_scaffoldObjectName; }
-	inline AsciiString getScaffoldSupportObjectName( void ) { return m_scaffoldSupportObjectName; }
-	inline RGBColor getRadarColor( void ) { return m_radarColor; }
-	inline AsciiString getBridgeModel( void ) { return m_bridgeModelName; }
-	inline AsciiString getBridgeModelNameDamaged( void ) { return m_bridgeModelNameDamaged; }
-	inline AsciiString getBridgeModelNameReallyDamaged( void ) { return m_bridgeModelNameReallyDamaged; }
-	inline AsciiString getBridgeModelNameBroken( void ) { return m_bridgeModelNameBroken; }
-	inline AsciiString getTextureDamaged( void ) { return m_textureDamaged; }
-	inline AsciiString getTextureReallyDamaged( void ) { return m_textureReallyDamaged; }
-	inline AsciiString getTextureBroken( void ) { return m_textureBroken; }
-	inline AsciiString getTowerObjectName( BridgeTowerType tower ) { return m_towerObjectName[ tower ]; }
-	inline AsciiString getDamageToSoundString( BodyDamageType state ) { return m_damageToSoundString[ state ]; }
-	inline AsciiString getDamageToOCLString( BodyDamageType state, Int index ) { return m_damageToOCLString[ state ][ index ]; }
-	inline AsciiString getDamageToFXString( BodyDamageType state, Int index ) { return m_damageToFXString[ state ][ index ]; }
-	inline AsciiString getRepairedToSoundString( BodyDamageType state ) { return m_repairedToSoundString[ state ]; }
-	inline AsciiString getRepairedToOCLString( BodyDamageType state, Int index ) { return m_repairedToOCLString[ state ][ index ]; }
-	inline AsciiString getRepairedToFXString( BodyDamageType state, Int index ) { return m_repairedToFXString[ state ][ index ]; }
-	inline Real getTransitionEffectsHeight( void ) { return m_transitionEffectsHeight; }
-	inline Int getNumFXPerType( void ) { return m_numFXPerType; }
-
-	// friend access methods to be used by the road collection only!
-	inline void friend_setName( AsciiString name ) { m_name = name; }
-	inline void friend_setTexture( AsciiString texture ) { m_texture = texture; }
-	inline void friend_setBridge( Bool isBridge ) { m_isBridge = isBridge; }
-	inline void friend_setID( UnsignedInt id ) { m_id = id; }							
-	inline void friend_setNext( TerrainRoadType *next ) { m_next = next; }
-	inline TerrainRoadType *friend_getNext( void ) { return m_next; }			
-	inline void friend_setRoadWidth( Real width ) { m_roadWidth = width; }	
-	inline void friend_setRoadWidthInTexture( Real width ) { m_roadWidthInTexture = width; }
-	inline void friend_setBridgeScale( Real scale ) { m_bridgeScale = scale; }
-	inline void friend_setScaffoldObjectName( AsciiString name ) { m_scaffoldObjectName = name; }
-	inline void friend_setScaffoldSupportObjectName( AsciiString name ) { m_scaffoldSupportObjectName = name; }
-	inline void friend_setBridgeModelName( AsciiString name ) { m_bridgeModelName = name; }
-	inline void friend_setBridgeModelNameDamaged( AsciiString name ) { m_bridgeModelNameDamaged = name; }
-	inline void friend_setBridgeModelNameReallyDamaged( AsciiString name ) { m_bridgeModelNameReallyDamaged = name; }
-	inline void friend_setBridgeModelNameBroken( AsciiString name ) { m_bridgeModelNameBroken = name; }
-	inline void friend_setTextureDamaged( AsciiString texture ) { m_textureDamaged = texture; }
-	inline void friend_setTextureReallyDamaged( AsciiString texture ) { m_textureReallyDamaged = texture; }
-	inline void friend_setTextureBroken( AsciiString texture ) { m_textureBroken = texture; }
-	inline void friend_setTowerObjectName( BridgeTowerType tower, AsciiString name ) { m_towerObjectName[ tower ] = name; }
-	inline void friend_setDamageToSoundString( BodyDamageType state, AsciiString s ) { m_damageToSoundString[ state ] = s; }
-	inline void friend_setDamageToOCLString( BodyDamageType state, Int index, AsciiString s ) { m_damageToOCLString[ state ][ index ] = s; }
-	inline void friend_setDamageToFXString( BodyDamageType state, Int index, AsciiString s ) { m_damageToFXString[ state ][ index ] = s; }
-	inline void friend_setRepairedToSoundString( BodyDamageType state, AsciiString s ) { m_repairedToSoundString[ state ] = s; }
-	inline void friend_setRepairedToOCLString( BodyDamageType state, Int index, AsciiString s ) { m_repairedToOCLString[ state ][ index ] = s; }
-	inline void friend_setRepairedToFXString( BodyDamageType state, Int index, AsciiString s ) { m_repairedToFXString[ state ][ index ] = s; }
-	inline void friend_setTransitionEffectsHeight( Real height ) { m_transitionEffectsHeight = height; }
-	inline void friend_setNumFXPerType( Int num ) { m_numFXPerType = num; }
-
-	/// get the parsing table for INI
-	const FieldParse *getRoadFieldParse( void ) { return m_terrainRoadFieldParseTable; }
-	const FieldParse *getBridgeFieldParse( void ) { return m_terrainBridgeFieldParseTable; }
-
-protected:
-
-	AsciiString m_name;								///< entry name
-	Bool m_isBridge;									///< true if entry is for a bridge
-	UnsignedInt m_id;									///< unique id
-	TerrainRoadType *m_next;					///< next in road list
-
-	// for parsing from INI
-	static const FieldParse m_terrainRoadFieldParseTable[];		///< the parse table for INI definition
-	static const FieldParse m_terrainBridgeFieldParseTable[];		///< the parse table for INI definition
-	static void parseTransitionToOCL( INI *ini, void *instance, void *store, const void *userData );
-	static void parseTransitionToFX( INI *ini, void *instance, void *store, const void *userData );
-
-	//
-	// *note* I would union the road and bridge data, but unions can't have a copy 
-	// constructor such as the AsciiString does
-	//
-
-	// road data
-	Real m_roadWidth;														///< width of road
-	Real m_roadWidthInTexture;									///< width of road in the texture
-
-	// bridge data
-	Real m_bridgeScale;													///< scale for bridge
-
-	AsciiString m_scaffoldObjectName;						///< scaffold object name
-	AsciiString m_scaffoldSupportObjectName;		///< scaffold support object name
-
-	RGBColor m_radarColor;											///< color for this bridge on the radar
-
-	AsciiString m_bridgeModelName;							///< model name for bridge
-	AsciiString m_texture;											///< texture filename
-
-	AsciiString m_bridgeModelNameDamaged;				///< model name for bridge
-	AsciiString m_textureDamaged;								///< model name for bridge
-
-	AsciiString m_bridgeModelNameReallyDamaged;	///< model name for bridge
-	AsciiString m_textureReallyDamaged;					///< model name for bridge
-
-	AsciiString m_bridgeModelNameBroken;				///< model name for bridge
-	AsciiString m_textureBroken;								///< model name for bridge
-
-	AsciiString m_towerObjectName[ BRIDGE_MAX_TOWERS ];	///< object names for the targetable towers on the bridge
-
-	//
-	// the following strings are for repair/damage transition events, what sounds to 
-	// play and a collection of OCL and FX lists to play over the bridge area
-	//
-	AsciiString m_damageToSoundString[ BODYDAMAGETYPE_COUNT ];
-	AsciiString m_damageToOCLString[ BODYDAMAGETYPE_COUNT ][ MAX_BRIDGE_BODY_FX ];
-	AsciiString m_damageToFXString[ BODYDAMAGETYPE_COUNT ][ MAX_BRIDGE_BODY_FX ];
-	AsciiString m_repairedToSoundString[ BODYDAMAGETYPE_COUNT ];
-	AsciiString m_repairedToOCLString[ BODYDAMAGETYPE_COUNT ][ MAX_BRIDGE_BODY_FX ];
-	AsciiString m_repairedToFXString[ BODYDAMAGETYPE_COUNT ][ MAX_BRIDGE_BODY_FX ];
-	Real m_transitionEffectsHeight;
-	Int m_numFXPerType; ///< for *each* fx/ocl we will make this many of them on the bridge area
-
-};
-
-//-------------------------------------------------------------------------------------------------
-/** Collection of all roads and bridges */
-//-------------------------------------------------------------------------------------------------
-class TerrainRoadCollection : public SubsystemInterface
-{
-
-public:
-	
-	TerrainRoadCollection( void );
-	~TerrainRoadCollection( void );
-
-	void init() { }
-	void reset() { }
-	void update() { }
-
-	TerrainRoadType *findRoad( AsciiString name );		///< find road with matching name
-	TerrainRoadType *newRoad( AsciiString name );			///< allocate new road, assing name, and link to list
-	TerrainRoadType *firstRoad( void ) { return m_roadList; }			///< return first road
-	TerrainRoadType *nextRoad( TerrainRoadType *road );						///< get next road
-
-	TerrainRoadType *findBridge( AsciiString name );	///< find bridge with matching name
-	TerrainRoadType *newBridge( AsciiString name );		///< allocate new bridge, assign name, and link
-	TerrainRoadType *firstBridge( void ) { return m_bridgeList; } ///< return first bridge
-	TerrainRoadType *nextBridge( TerrainRoadType *bridge );				///< get next bridge
-
-	TerrainRoadType *findRoadOrBridge( AsciiString name );				///< search roads and bridges
-
-protected:
-
-	TerrainRoadType *m_roadList;				///< list of available roads
-	TerrainRoadType *m_bridgeList;			///< list of available bridges
-	static UnsignedInt m_idCounter;			///< unique id counter when allocating roads/bridges
-
-};
-
-// EXTERNAL ////////////////////////////////////////////////////////////////////////////////////////
-extern TerrainRoadCollection *TheTerrainRoads;
-
-#endif // __TERRAINROADS_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainVisual.h b/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainVisual.h
deleted file mode 100644
index f6bbae9a2ea..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainVisual.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: TerrainVisual.h //////////////////////////////////////////////////////////////////////////
-// Interface for visual representation of terrain on the client
-// Author: Colin Day, April 2001
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __TERRAINVISUAL_H_
-#define __TERRAINVISUAL_H_
-
-#include "Common/Terrain.h"
-#include "Common/Snapshot.h"
-#include "Common/MapObject.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-class TerrainType;
-class WaterHandle;
-class Matrix3D;
-class Object;
-class Drawable;
-class GeometryInfo;
-
-
-class WorldHeightMap;
-struct SeismicSimulationNode;
-class SeismicSimulationFilterBase;
-
-
-
-
-#define DEFAULT_SEISMIC_SIMULATION_MAGNITUDE (20.0f)
-struct SeismicSimulationNode; // just a forward declaration folks, no cause for alarm
-class SeismicSimulationFilterBase
-{
-public:
-  enum SeismicSimStatusCode CPP_11(: Int)
-  {
-    SEISMIC_STATUS_INVALID,
-    SEISMIC_STATUS_ACTIVE,
-    SEISMIC_STATUS_ZERO_ENERGY,
-  };
-  
-  virtual SeismicSimStatusCode filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node ) = 0;
-  virtual Real applyGravityCallback( Real velocityIn ) = 0;
-};
-
-
-
-
-
-struct SeismicSimulationNode
-{
-  SeismicSimulationNode()
-  {
-    m_center.x    = 0;
-    m_center.y    = 0;
-    m_radius      = 0;
-    m_region.lo.x = 0;
-    m_region.lo.y = 0;
-    m_region.hi.x = 0;
-    m_region.hi.y = 0;
-    m_clean = FALSE;
-    callbackFilter = NULL;
-    m_life = 0;
-    m_magnitude = DEFAULT_SEISMIC_SIMULATION_MAGNITUDE;
-
-  }
-  SeismicSimulationNode( const SeismicSimulationNode &ssn )
-  {
-    m_center.x    = ssn.m_center.x;
-    m_center.y    = ssn.m_center.y;
-    m_radius      = ssn.m_radius;
-    m_region.lo.x = ssn.m_region.lo.x;
-    m_region.lo.y = ssn.m_region.lo.y;
-    m_region.hi.x = ssn.m_region.hi.x;
-    m_region.hi.y = ssn.m_region.hi.y;
-    m_clean       = ssn.m_clean;
-    callbackFilter= ssn.callbackFilter;
-    m_life        = ssn.m_life;
-    m_magnitude   = ssn.m_magnitude;
-
-  }
-  SeismicSimulationNode( const Coord3D* ctr, Real rad, Real mag, SeismicSimulationFilterBase *cbf = NULL )
-  {
-    m_center.x    = REAL_TO_INT_FLOOR(ctr->x/MAP_XY_FACTOR);
-    m_center.y    = REAL_TO_INT_FLOOR(ctr->y/MAP_XY_FACTOR);
-    m_radius      = (rad-1)/MAP_XY_FACTOR;
-    UnsignedInt regionSize = rad/MAP_XY_FACTOR;
-    m_region.lo.x = m_center.x - regionSize;
-    m_region.lo.y = m_center.y - regionSize;
-    m_region.hi.x = m_center.x + regionSize;
-    m_region.hi.y = m_center.y + regionSize;
-    m_clean       = false;
-    callbackFilter= cbf;
-    m_life        = 0;
-    m_magnitude   = mag;
-
-  }
-
-  SeismicSimulationFilterBase::SeismicSimStatusCode handleFilterCallback( WorldHeightMapInterfaceClass *heightMap )
-  {
-    if ( callbackFilter == NULL )
-      return SeismicSimulationFilterBase::SEISMIC_STATUS_INVALID;
-
-    ++m_life;
-
-    return callbackFilter->filterCallback( heightMap, this );
-  }
-
-  Real applyGravity( Real velocityIn )
-  {
-    DEBUG_ASSERTCRASH( callbackFilter, ("SeismicSimulationNode::applyGravity() has no callback filter!") );
-
-    if ( callbackFilter == NULL )
-      return velocityIn;//oops, we have no callback!
-
-    return callbackFilter->applyGravityCallback( velocityIn );
-    
-  }
-
-  IRegion2D   m_region;
-  ICoord2D    m_center;
-  Bool        m_clean;
-  Real        m_magnitude;
-  UnsignedInt m_radius;
-  UnsignedInt m_life;
-  
-  SeismicSimulationFilterBase *callbackFilter;
-  
-};
-typedef std::list<SeismicSimulationNode> SeismicSimulationList;
-typedef SeismicSimulationList::iterator SeismicSimulationListIt;
-
-class DomeStyleSeismicFilter : public SeismicSimulationFilterBase
-{
-  virtual SeismicSimStatusCode filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node );
-  virtual Real applyGravityCallback( Real velocityIn );
-};
-
-
-
-
-
-
-
-//-------------------------------------------------------------------------------------------------
-/** LOD values for terrain, keep this in sync with TerrainLODNames[] */
-//-------------------------------------------------------------------------------------------------
-typedef enum _TerrainLOD CPP_11(: Int)
-{ 
-	TERRAIN_LOD_INVALID								= 0,
-	TERRAIN_LOD_MIN										= 1,  // note that this is less than max
-	TERRAIN_LOD_STRETCH_NO_CLOUDS			= 2,
-	TERRAIN_LOD_HALF_CLOUDS						= 3,
-	TERRAIN_LOD_NO_CLOUDS							= 4,
-	TERRAIN_LOD_STRETCH_CLOUDS				= 5,
-	TERRAIN_LOD_NO_WATER							= 6,
-	TERRAIN_LOD_MAX										= 7,  // note that this is larger than min
-	TERRAIN_LOD_AUTOMATIC							= 8,
-	TERRAIN_LOD_DISABLE								= 9,
-
-	TERRAIN_LOD_NUM_TYPES								// keep this last
-
-} TerrainLOD;
-#ifdef DEFINE_TERRAIN_LOD_NAMES
-static const char * TerrainLODNames[] = 
-{
-	"NONE",
-	"MIN",
-	"STRETCH_NO_CLOUDS",
-	"HALF_CLOUDS",
-	"NO_CLOUDS",
-	"STRETCH_CLOUDS",
-	"NO_WATER",
-	"MAX",
-	"AUTOMATIC",
-	"DISABLE",
-
-	NULL
-};
-#endif  // end DEFINE_TERRAIN_LOD_NAMES
-
-//-------------------------------------------------------------------------------------------------
-/** Device independent implementation for visual terrain */
-//-------------------------------------------------------------------------------------------------
-class TerrainVisual : public Snapshot,
-											public SubsystemInterface
-{
-
-public:
-
-	enum {NumSkyboxTextures = 5};
-
-	TerrainVisual();
-	virtual ~TerrainVisual();
-
-	virtual void init( void );
-	virtual void reset( void );
-	virtual void update( void );
-
-	virtual Bool load( AsciiString filename );
-
-	/// get color of texture on the terrain at location specified
-	virtual void getTerrainColorAt( Real x, Real y, RGBColor *pColor ) = 0;
-
-	/// get the terrain tile type at the world location in the (x,y) plane ignoring Z
-	virtual TerrainType *getTerrainTile( Real x, Real y ) = 0;
-
-	/** intersect the ray with the terrain, if a hit occurs TRUE is returned
-	and the result point on the terrain is returned in "result" */
-	virtual Bool intersectTerrain( Coord3D *rayStart, 
-																 Coord3D *rayEnd, 
-																 Coord3D *result ) { return FALSE; }
-
-	//
-	// water methods
-	//
-	virtual void enableWaterGrid( Bool enable ) = 0;
-	/// set min/max height values allowed in water grid pointed to by waterTable
-	virtual void setWaterGridHeightClamps( const WaterHandle *waterTable, Real minZ, Real maxZ ) = 0;
-	/// adjust fallof parameters for grid change method
-	virtual void setWaterAttenuationFactors( const WaterHandle *waterTable, Real a, Real b, Real c, Real range ) = 0;
-	/// set the water table position and orientation in world space
-	virtual void setWaterTransform( const WaterHandle *waterTable, Real angle, Real x, Real y, Real z ) = 0;
-	virtual void setWaterTransform( const Matrix3D *transform ) = 0;
-	/// get water transform parameters
-	virtual void getWaterTransform( const WaterHandle *waterTable, Matrix3D *transform ) = 0;
-	/// water grid resolution spacing
-	virtual void setWaterGridResolution( const WaterHandle *waterTable, Real gridCellsX, Real gridCellsY, Real cellSize ) = 0;
-	virtual void getWaterGridResolution( const WaterHandle *waterTable, Real *gridCellsX, Real *gridCellsY, Real *cellSize ) = 0;
-	/// adjust the water grid in world coords by the delta
-	virtual void changeWaterHeight( Real x, Real y, Real delta ) = 0;
-	/// adjust the velocity at a water grid point corresponding to the world x,y
-	virtual void addWaterVelocity( Real worldX, Real worldY, Real velocity, Real preferredHeight ) = 0;
-	/// get height of water grid at specified position
-	virtual Bool getWaterGridHeight( Real worldX, Real worldY, Real *height) = 0;
-
-	/// set detail of terrain tracks.
-	virtual void setTerrainTracksDetail(void)=0;
-	virtual void setShoreLineDetail(void)=0;
-		
-	/// Add a bib for an object at location.  
-	virtual void addFactionBib(Object *factionBuilding, Bool highlight, Real extra = 0)=0;
-	/// Remove a bib.  
-	virtual void removeFactionBib(Object *factionBuilding)=0;
-
-	/// Add a bib for a drawable at location.  
-	virtual void addFactionBibDrawable(Drawable *factionBuilding, Bool highlight, Real extra = 0)=0;
-	/// Remove a bib.  
-	virtual void removeFactionBibDrawable(Drawable *factionBuilding)=0;
-
-	virtual void removeAllBibs(void)=0;
-	virtual void removeBibHighlighting(void)=0;
-
-	virtual void removeTreesAndPropsForConstruction(
-		const Coord3D* pos, 
-		const GeometryInfo& geom,
-		Real angle
-	) = 0;
-
-	virtual void addProp(const ThingTemplate *tt, const Coord3D *pos, Real angle) = 0;
-
-	//
-	// Modify height.
-	//
-	virtual void setRawMapHeight(const ICoord2D *gridPos, Int height)=0;
-	virtual Int getRawMapHeight(const ICoord2D *gridPos)=0;
-
-
-  ////////////////////////////////////////////////////
-  ////////////////////////////////////////////////////
-  ////////////////////////////////////////////////////
-#ifdef DO_SEISMIC_SIMULATIONS
-  virtual void updateSeismicSimulations( void ) = 0; /// walk the SeismicSimulationList and, well, do it.
-  virtual void addSeismicSimulation( const SeismicSimulationNode& sim ) = 0;
-#endif
-  virtual WorldHeightMap* getLogicHeightMap( void ) {return NULL;};
-  virtual WorldHeightMap* getClientHeightMap( void ) {return NULL;};
-  ////////////////////////////////////////////////////
-  ////////////////////////////////////////////////////
-  ////////////////////////////////////////////////////
-
-
-
-	/// Replace the skybox texture
-	virtual void replaceSkyboxTextures(const AsciiString *oldTexName[NumSkyboxTextures], const AsciiString *newTexName[NumSkyboxTextures])=0;
-
-protected:
-
-	// snapshot methods
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-	AsciiString m_filenameString;							///< file with terrain data
-
-};  // end class TerrainVisual
-
-// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
-extern TerrainVisual *TheTerrainVisual;  ///< singleton extern
-
-#endif  // end __TERRAINVISUAL_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/VideoPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameClient/VideoPlayer.h
deleted file mode 100644
index d6ac60588b0..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/VideoPlayer.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    Generals
-//
-// File name:  GameClient/VideoPlayer.h
-//
-// Created:    10/22/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __GAMECLIENT_VIDEOPLAYER_H_
-#define __GAMECLIENT_VIDEOPLAYER_H_
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include <Lib/BaseType.h>
-#include "WWMath/rect.h"
-#include "Common/SubsystemInterface.h"
-#include "Common/AsciiString.h"
-#include "Common/INI.h"
-#include "Common/STLTypedefs.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-struct Video;
-class VideoPlayer;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-typedef std::vector<Video>	VecVideo;
-typedef std::vector<Video>::iterator	VecVideoIt;
-
-//----------------------------------------------------------------------------
-//           Video (Struct)                                                   
-//----------------------------------------------------------------------------
-struct Video
-{
-	AsciiString m_filename;																	///< should be filled with the filename on disk
-	AsciiString m_internalName;															///< should be our internal reference name
-	AsciiString m_commentForWB;
-};
-
-//===============================
-// VideoBuffer
-//===============================
-/**
-  * Video buffer interface class. The VideoPlayer uses this buffer abstraction
-	* in order to be able to render a video stream.
-	*/
-//===============================
-
-class VideoBuffer
-{
-	public:
-
-	// Enumeration of buffer pixel formats
-		enum Type
-		{
-			TYPE_UNKNOWN,
-			TYPE_R8G8B8,
-			TYPE_X8R8G8B8,
-			TYPE_R5G6B5,
-			TYPE_X1R5G5B5,
-			NUM_TYPES
-		};
-
-
-	protected:
-
-		UnsignedInt m_xPos;					///< X pixel buffer offset
-		UnsignedInt m_yPos;					///< Y pixel buffer offset
-		UnsignedInt m_width;				///< Buffer visible width
-		UnsignedInt m_height;				///< Buffer height
-		UnsignedInt m_textureWidth;	///< Buffer visible width
-		UnsignedInt m_textureHeight;///< Buffer height
-		UnsignedInt m_pitch;				///< buffer pitch
-
-		Type m_format;			///< buffer pixel format
-
-	public:
-
-		VideoBuffer( Type format );
-		virtual ~VideoBuffer() {};
-
-		virtual	Bool		allocate( UnsignedInt width, UnsignedInt Height ) = 0; ///< Allocate buffer
-		virtual void		free( void ) = 0;			///< Free the buffer
-		virtual	void*		lock( void ) = 0;			///< Returns memory pointer to start of buffer
-		virtual void		unlock( void ) = 0;		///< Release buffer
-		virtual Bool		valid( void ) = 0;		///< Is the buffer valid to use
-
-		UnsignedInt			xPos( void ) { return m_xPos;};///< X pixel offset to draw into
-		UnsignedInt			yPos( void ) { return m_yPos;};///< Y pixel offset to draw into
-		void		setPos( UnsignedInt x, UnsignedInt y ) { m_xPos = x; m_yPos = y;};	///< Set the x and y buffer offset
-		UnsignedInt			width( void ) { return m_width;};		///< Returns pixel width of visible texture
-		UnsignedInt			height( void ) { return m_height;};	///< Returns pixel height of visible texture
-		UnsignedInt			textureWidth( void ) { return m_textureWidth;};		///< Returns pixel width of texture
-		UnsignedInt			textureHeight( void ) { return m_textureHeight;};	///< Returns pixel height of texture
-		UnsignedInt			pitch( void ) { return m_pitch;};		///< Returns buffer pitch in bytes
-		Type		format( void ) { return m_format;};	///< Returns buffer pixel format
-
-		RectClass				Rect( Real x1, Real y1, Real x2, Real y2 );
-
-};
-
-
-//===============================
-// VideoStreamInterface
-//===============================
-/**
-  * Video stream interface class. 
-	*/
-//===============================
-
-class VideoStreamInterface
-{
-	friend class VideoPlayerInterface;
-
-	protected:
-
-		virtual ~VideoStreamInterface(){};								///< only VideoPlayerInterfaces can create these
-
-	public:
-
-
-		virtual	VideoStreamInterface* next( void ) = 0;		///< Returns next open stream
-		virtual void update( void ) = 0;									///< Update stream
-		virtual void close( void ) = 0;										///< Close and free stream
-																											
-		virtual Bool	isFrameReady( void ) = 0;						///< Is the frame ready to be displayed
-		virtual void	frameDecompress( void ) = 0;				///< Render current frame in to buffer
-		virtual void	frameRender( VideoBuffer *buffer ) = 0; ///< Render current frame in to buffer
-		virtual void	frameNext( void ) = 0;							///< Advance to next frame
-		virtual Int		frameIndex( void ) = 0;							///< Returns zero based index of current frame
-		virtual Int		frameCount( void ) = 0;							///< Returns the total number of frames in the stream
-		virtual void	frameGoto( Int index ) = 0;					///< Go to the spcified frame index
-		virtual Int		height( void ) = 0;									///< Return the height of the video
-		virtual Int		width( void ) = 0;									///< Return the width of the video
-
-};
-
-//===============================
-// VideoStream 
-//===============================
-
-
-
-class VideoStream : public VideoStreamInterface
-{
-	friend class VideoPlayer;
-
-	protected:
-
-		VideoPlayer							*m_player;								///< Video player we were created with
-		VideoStream							*m_next;									///< Next open stream
-																											
-		VideoStream();																		///< only VideoPlayer can create these
-		virtual ~VideoStream();
-
-	public:
-
- 		virtual	VideoStreamInterface* next( void );				///< Returns next open stream
-		virtual void update( void );											///< Update stream
-		virtual void close( void );												///< Close and free stream
-																											
-		virtual Bool	isFrameReady( void );								///< Is the frame ready to be displayed
-		virtual void	frameDecompress( void );						///< Render current frame in to buffer
-		virtual void	frameRender( VideoBuffer *buffer ); ///< Render current frame in to buffer
-		virtual void	frameNext( void );									///< Advance to next frame
-		virtual Int		frameIndex( void );									///< Returns zero based index of current frame
-		virtual Int		frameCount( void );									///< Returns the total number of frames in the stream
-		virtual void	frameGoto( Int index );							///< Go to the spcified frame index
-		virtual Int		height( void );											///< Return the height of the video
-		virtual Int		width( void );											///< Return the width of the video
-
-
-};
-
-//===============================
-// VideoPlayerInterface 
-//===============================
-/**
-  *	Interface for video playback.
-	*/
-//===============================
-
-class VideoPlayerInterface : public SubsystemInterface
-{
-
-	public:
-
-		virtual void	init( void ) = 0;														///< Initialize video playback
-		virtual void	reset( void ) = 0;													///< Reset video playback
-		virtual void	update( void ) = 0;													///< Services all video tasks. Should be called frequently
-																															
-		virtual void	deinit( void ) = 0;													///< Close down player
-																															
-		virtual				~VideoPlayerInterface() {};
-																															
-		// service																								
-		virtual void	loseFocus( void ) = 0;											///< Should be called when application loses focus
-		virtual void	regainFocus( void ) = 0;										///< Should be called when application regains focus
-
-		virtual VideoStreamInterface*	open( AsciiString movieTitle ) = 0;	///< Open video file for playback
-		virtual VideoStreamInterface*	load( AsciiString movieTitle ) = 0;	///< Load video file in to memory for playback
-
-		virtual VideoStreamInterface* firstStream( void ) = 0;		///< Return the first open/loaded video stream
-
-		virtual void	closeAllStreams( void ) = 0;								///< Close all open streams
-		virtual void	addVideo( Video* videoToAdd ) = 0;					///< Add a video to the list of videos we can play
-		virtual void	removeVideo( Video* videoToRemove ) = 0;		///< Remove a video to the list of videos we can play
-		virtual Int getNumVideos( void ) = 0;											///< Retrieve info about the number of videos currently listed
-		virtual const Video* getVideo( AsciiString movieTitle ) = 0;	///< Retrieve info about a movie based on internal name
-		virtual const Video* getVideo( Int index ) = 0;						///< Retrieve info about a movie based on index
-
-		virtual const FieldParse *getFieldParse( void ) const = 0;		///< Return the field parse info
-
-		virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) = 0;		///< Notify the video player that they can now ask for an audio handle, or they need to give theirs up.
-};
-
-
-//===============================
-// VideoPlayer
-//===============================
-/**
-  *	Common video playback code.
-	*/
-//===============================
-
-class VideoPlayer : public VideoPlayerInterface
-{
-	protected:
-		VecVideo mVideosAvailableForPlay;
-		VideoStream		*m_firstStream;
-		static const FieldParse m_videoFieldParseTable[];
-
-	public:
-
-		// subsytem requirements
-		virtual void	init( void );														///< Initialize video playback code
-		virtual void	reset( void );													///< Reset video playback
-		virtual void	update( void );													///< Services all audio tasks. Should be called frequently
-																													
-		virtual void	deinit( void );													///< Close down player
-																													
-																													
-		VideoPlayer();																				
-		~VideoPlayer();																				
-																													
-		// service																						
-		virtual void	loseFocus( void );											///< Should be called when application loses focus
-		virtual void	regainFocus( void );										///< Should be called when application regains focus
-																												
-		virtual VideoStreamInterface*	open( AsciiString movieTitle );	///< Open video file for playback
-		virtual VideoStreamInterface*	load( AsciiString movieTitle );	///< Load video file in to memory for playback
-		virtual VideoStreamInterface* firstStream( void );		///< Return the first open/loaded video stream
-		virtual void	closeAllStreams( void );								///< Close all open streams
-
-		virtual void	addVideo( Video* videoToAdd );					///< Add a video to the list of videos we can play
-		virtual void	removeVideo( Video* videoToRemove );		///< Remove a video to the list of videos we can play
-		virtual Int getNumVideos( void );											///< Retrieve info about the number of videos currently listed
-		virtual const Video* getVideo( AsciiString movieTitle );	///< Retrieve info about a movie based on internal name
-		virtual const Video* getVideo( Int index );						///< Retrieve info about a movie based on index
-		virtual const FieldParse *getFieldParse( void ) const { return m_videoFieldParseTable; }		///< Return the field parse info
-
-		virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) { }
-
-		// Implementation specific
-		void remove( VideoStream *stream );										///< remove stream from active list
-		
-};
-
-extern VideoPlayerInterface *TheVideoPlayer;
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-#endif // __GAMECLIENT_VIDEOPLAYER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h b/GeneralsMD/Code/GameEngine/Include/GameClient/View.h
deleted file mode 100644
index 5ce8f763e62..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// View.h /////////////////////////////////////////////////////////////////////////////////////////
-// A "view", or window, into the World
-// Author: Michael S. Booth, February 2001
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef _VIEW_H_
-#define _VIEW_H_
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/GameType.h"
-#include "Common/Snapshot.h"
-#include "Lib/BaseType.h"
-#include "WW3D2/coltype.h"			///< we don't generally do this, but we need the W3D collision types
-
-#define DEFAULT_VIEW_WIDTH 640
-#define DEFAULT_VIEW_HEIGHT 480
-#define DEFAULT_VIEW_ORIGIN_X 0
-#define DEFAULT_VIEW_ORIGIN_Y 0
-
-// FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
-class Drawable;
-class ViewLocation;
-class Thing;
-class Waypoint;
-class LookAtTranslator;
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-enum PickType CPP_11(: Int)
-{
-	PICK_TYPE_TERRAIN						= COLL_TYPE_0,
-	PICK_TYPE_SELECTABLE				= COLL_TYPE_1,
-	PICK_TYPE_SHRUBBERY					= COLL_TYPE_2,
-	PICK_TYPE_MINES							= COLL_TYPE_3,	// mines aren't normally selectable, but workers/dozers need to
-	PICK_TYPE_FORCEATTACKABLE		= COLL_TYPE_4,
-	PICK_TYPE_ALL_DRAWABLES			= (PICK_TYPE_SELECTABLE | PICK_TYPE_SHRUBBERY | PICK_TYPE_MINES | PICK_TYPE_FORCEATTACKABLE)
-};
-
-// ------------------------------------------------------------------------------------------------
-/** The implementation of common view functionality. */
-// ------------------------------------------------------------------------------------------------
-class View : public Snapshot
-{
-
-public:
-
-	/// Add an impulse force to shake the camera
-	enum CameraShakeType 
-	{ 
-		SHAKE_SUBTLE = 0, 
-		SHAKE_NORMAL, 
-		SHAKE_STRONG, 
-		SHAKE_SEVERE, 
-		SHAKE_CINE_EXTREME,		//Added for cinematics ONLY
-		SHAKE_CINE_INSANE,		//Added for cinematics ONLY
-		SHAKE_COUNT 
-	};
-
-  // Return values for worldToScreenTriReturn
-  enum WorldToScreenReturn CPP_11(: Int)
-  {
-    WTS_INSIDE_FRUSTUM = 0, // On the screen (inside frustum of camera)
-    WTS_OUTSIDE_FRUSTUM,    // Return is valid but off the screen (outside frustum of camera)
-    WTS_INVALID,            // No transform possible
-
-    WTS_COUNT
-  };
-
-public:
-
-	View( void );
-	virtual ~View( void );
-
-	virtual void init( void );
-	virtual void reset( void );
-	virtual UnsignedInt getID( void ) { return m_id; }
-
-	virtual void setZoomLimited( Bool limit ) { m_zoomLimited = limit; }			///< limit the zoom height
-	virtual Bool isZoomLimited( void ) { return m_zoomLimited; }							///< get status of zoom limit
-
-	/// pick drawable given the screen pixel coords.  If force attack, picks bridges as well.
-	virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ) = 0;
-
-	/// all drawables in the 2D screen region will call the 'callback'
-	virtual Int iterateDrawablesInRegion( IRegion2D *screenRegion,
-																				Bool (*callback)( Drawable *draw, void *userData ),
-																				void *userData ) = 0;
-
-	/** project the 4 corners of this view into the world and return each point as a parameter,
-			the world points are at the requested Z */
-	virtual void getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
-																							Coord3D *bottomLeft, Coord3D *bottomRight,
-																							Real z );
-
-	virtual void setWidth( Int width ) { m_width = width; }
-	virtual Int getWidth( void ) { return m_width; }
-	virtual void setHeight( Int height ) { m_height = height; }
-	virtual Int getHeight( void ) { return m_height; }
-	virtual void setOrigin( Int x, Int y) { m_originX=x; m_originY=y;}				///< Sets location of top-left view corner on display 
-	virtual void getOrigin( Int *x, Int *y) { *x=m_originX; *y=m_originY;}			///< Return location of top-left view corner on display
-
-	virtual void forceRedraw() = 0;
-
-	virtual void lookAt( const Coord3D *o );														///< Center the view on the given coordinate
-	virtual void initHeightForMap( void ) {};														///<  Init the camera height for the map at the current position.
-	virtual void scrollBy( Coord2D *delta );														///< Shift the view by the given delta
-
-	virtual void moveCameraTo(const Coord3D *o, Int frames, Int shutter, Bool orient, Real easeIn, Real easeOut) { lookAt( o ); }
-	virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, Bool orient, Real easeIn, Real easeOut) { }
-	virtual Bool isCameraMovementFinished( void ) { return TRUE; }
-	virtual void cameraModFinalZoom(Real finalZoom, Real easeIn, Real easeOut){}; ///< Final zoom for current camera movement.
-	virtual void cameraModRollingAverage(Int framesToAverage){}; ///< Number of frames to average movement for current camera movement.
-	virtual void cameraModFinalTimeMultiplier(Int finalMultiplier){}; ///< Final time multiplier for current camera movement.
-	virtual void cameraModFinalPitch(Real finalPitch, Real easeIn, Real easeOut){};	 ///< Final pitch for current camera movement.
-	virtual void cameraModFreezeTime(void){ }					///< Freezes time during the next camera movement.
-	virtual void cameraModFreezeAngle(void){ }					///< Freezes time during the next camera movement.
-	virtual void cameraModLookToward(Coord3D *pLoc){}			///< Sets a look at point during camera movement.
-	virtual void cameraModFinalLookToward(Coord3D *pLoc){}			///< Sets a look at point during camera movement.
-	virtual void cameraModFinalMoveTo(Coord3D *pLoc){ };			///< Sets a final move to.
-
-	// (gth) C&C3 animation controled camera feature
-	virtual void cameraEnableSlaveMode(const AsciiString & thingtemplateName, const AsciiString & boneName) {}
-	virtual void cameraDisableSlaveMode(void) {}
-	virtual	void Add_Camera_Shake(const Coord3D & position,float radius, float duration, float power) {}
-	virtual enum FilterModes getViewFilterMode(void) {return (enum FilterModes)0;}			///< Turns on viewport special effect (black & white mode)
-	virtual enum FilterTypes getViewFilterType(void) {return (enum FilterTypes)0;}			///< Turns on viewport special effect (black & white mode)
-	virtual Bool setViewFilterMode(enum FilterModes filterMode) { return FALSE; }			///< Turns on viewport special effect (black & white mode)
-	virtual void setViewFilterPos(const Coord3D *pos) { };			///<  Passes a position to the special effect filter.
-	virtual Bool setViewFilter(	enum FilterTypes filter) { return FALSE;}			///< Turns on viewport special effect (black & white mode)
-
-	virtual void setFadeParameters(Int fadeFrames, Int direction) { };
-	virtual void set3DWireFrameMode(Bool enable) { };
-
- 	virtual void resetCamera(const Coord3D *location, Int frames, Real easeIn, Real easeOut) {}; ///< Move camera to location, and reset to default angle & zoom.
- 	virtual void rotateCamera(Real rotations, Int frames, Real easeIn, Real easeOut) {}; ///< Rotate camera about current viewpoint.
-	virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut) {};	///< Rotate camera to face an object, and hold on it
-	virtual void rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds, Real easeIn, Real easeOut, Bool reverseRotation) {};	///< Rotate camera to face a location.
-	virtual Bool isTimeFrozen(void){ return false;}					///< Freezes time during the next camera movement.
-	virtual Int	 getTimeMultiplier(void) {return 1;};				///< Get the time multiplier.
-	virtual void setTimeMultiplier(Int multiple) {}; ///< Set the time multiplier.
-	virtual void setDefaultView(Real pitch, Real angle, Real maxHeight) {};
-	virtual void zoomCamera( Real finalZoom, Int milliseconds, Real easeIn, Real easeOut ) {};
-	virtual void pitchCamera( Real finalPitch, Int milliseconds, Real easeIn, Real easeOut ) {};
-
-	virtual void setAngle( Real angle );																///< Rotate the view around the up axis to the given angle
-	virtual Real getAngle( void ) { return m_angle; }
-	virtual void setPitch( Real angle );																///< Rotate the view around the horizontal axis to the given angle
-	virtual Real getPitch( void ) { return m_pitchAngle; }							///< Return current camera pitch
-	virtual void setAngleAndPitchToDefault( void );											///< Set the view angle back to default 
-	virtual void getPosition(Coord3D *pos)	{ *pos=m_pos;}							///< Returns position camera is looking at (z will be zero)
-
-	virtual const Coord3D& get3DCameraPosition() const = 0;							///< Returns the actual camera position
-
-	virtual Real getZoom() { return m_zoom; }
-	virtual void setZoom(Real z) { }
-	virtual Real getHeightAboveGround() { return m_heightAboveGround; }
-	virtual void setHeightAboveGround(Real z) { m_heightAboveGround = z; }
-	virtual void zoomIn( void );																				///< Zoom in, closer to the ground, limit to min
-	virtual void zoomOut( void );																				///< Zoom out, farther away from the ground, limit to max
-	virtual void setZoomToDefault( void ) { }														///< Set zoom to default value
-	virtual Real getMaxZoom( void ) { return m_maxZoom; }								///< return max zoom value
-	virtual void setOkToAdjustHeight( Bool val ) { m_okToAdjustHeight = val; }	///< Set this to adjust camera height
-
-	// for debugging
-	virtual Real getTerrainHeightUnderCamera() { return m_terrainHeightUnderCamera; }
-	virtual void setTerrainHeightUnderCamera(Real z) { m_terrainHeightUnderCamera = z; }
-	virtual Real getCurrentHeightAboveGround() { return m_currentHeightAboveGround; }
-	virtual void setCurrentHeightAboveGround(Real z) { m_currentHeightAboveGround = z; }
-
-	virtual void setFieldOfView( Real angle ) { m_FOV = angle; }				///< Set the horizontal field of view angle
-	virtual Real getFieldOfView( void ) { return m_FOV; }								///< Get the horizontal field of view angle
-
-  Bool worldToScreen( const Coord3D *w, ICoord2D *s ) { return worldToScreenTriReturn( w, s ) == WTS_INSIDE_FRUSTUM; }	///< Transform world coordinate "w" into screen coordinate "s"
-  virtual WorldToScreenReturn worldToScreenTriReturn(const Coord3D *w, ICoord2D *s ) = 0; ///< Like worldToScreen(), but with a more informative return value
-	virtual void screenToWorld( const ICoord2D *s, Coord3D *w ) = 0;										///< Transform screen coordinate "s" into world coordinate "w"
-	virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world ) = 0;  ///< transform screen coord to a point on the 3D terrain
-	virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) = 0;  ///< transform screen point to world point at the specified world Z value
-
-	virtual void getLocation ( ViewLocation *location );								///< write the view's current location in to the view location object
-	virtual void setLocation ( const ViewLocation *location );					///< set the view's current location from to the view location object
-
-
-	virtual void drawView( void ) = 0;															///< Render the world visible in this view.
-	virtual void updateView(void) = 0;					///<called once per frame to determine the final camera and object transforms
-
-
-
-
-	virtual ObjectID getCameraLock() const { return m_cameraLock; }
-	virtual void setCameraLock(ObjectID id) { m_cameraLock = id; m_lockDist = 0.0f; m_lockType = LOCK_FOLLOW; }
-	virtual void snapToCameraLock( void ) { m_snapImmediate = TRUE; }
-	enum CameraLockType { LOCK_FOLLOW, LOCK_TETHER };
-	virtual void setSnapMode( CameraLockType lockType, Real lockDist ) { m_lockType = lockType; m_lockDist = lockDist; }
-
-	virtual Drawable *getCameraLockDrawable() const { return m_cameraLockDrawable; }
-	virtual void setCameraLockDrawable(Drawable *drawable) { m_cameraLockDrawable = drawable; m_lockDist = 0.0f; }
-
-	virtual void setMouseLock( Bool mouseLocked ) { m_mouseLocked = mouseLocked; }					///< lock/unlock the mouse input to the tactical view
-	virtual Bool isMouseLocked( void ) { return m_mouseLocked; }														///< is the mouse input locked to the tactical view?
-
-	/// Add an impulse force to shake the camera
-	virtual void shake( const Coord3D *epicenter, CameraShakeType shakeType ) { };
-
-	virtual Real getFXPitch( void ) const { return 1.0f; }					///< returns the FX pitch angle
-	virtual void forceCameraConstraintRecalc(void) {}
-	virtual void setGuardBandBias( const Coord2D *gb ) = 0;
-
-protected:
-
-	friend class Display;
-
-	// snapshot methods
-	virtual void crc( Xfer *xfer ) { }
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void ) { }
-
-	void setPosition( const Coord3D *pos ) { m_pos = *pos; }					
-	const Coord3D *getPosition( void ) const { return &m_pos; }					
-
-	virtual View *prependViewToList( View *list );							///< Prepend this view to the given list, return the new list
-	virtual View *getNextView( void ) { return m_next; }				///< Return next view in the set
-
-
-	// **********************************************************************************************
-
-	View *m_next;																								///< List links used by the Display class
-
-	UnsignedInt m_id;																						///< Rhe ID of this view
-	static UnsignedInt m_idNext;																///< Used for allocating view ID's for all views
-
-	Coord3D m_pos;																							///< Position of this view, in world coordinates
-	Int m_width, m_height;																			///< Dimensions of the view
-	Int m_originX, m_originY;																		///< Location of top/left view corner
-
-	Real m_angle;																								///< Angle at which view has been rotated about the Z axis
-	Real m_pitchAngle;																					///< Rotation of view direction around horizontal (X) axis
-
-	Real m_maxZoom;																							///< Largest zoom value (minimum actual zoom)
-	Real m_minZoom;																							///< Smallest zoom value (maximum actual zoom)
-	Real m_maxHeightAboveGround;
-	Real m_minHeightAboveGround;
-	Real m_zoom;																								///< Current zoom value
-	Real m_heightAboveGround;																		///< User's desired height above ground
-	Bool m_zoomLimited;																					///< Camera restricted in zoom height
-	Real m_defaultAngle;
-	Real m_defaultPitchAngle;
-	Real m_currentHeightAboveGround;														///< Cached value for debugging
-	Real m_terrainHeightUnderCamera;														///< Cached value for debugging
-
-	ObjectID m_cameraLock;																			///< if nonzero, id of object that the camera should follow
-	Drawable *m_cameraLockDrawable;															///< if nonzero, drawble of object that camera should follow.
-	CameraLockType m_lockType;																	///< are we following or just tethering?
-	Real m_lockDist;																						///< how far can we be when tethered?
-
-	Real m_FOV;																									///< the current field of view angle
-	Bool m_mouseLocked;																					///< is the mouse input locked to the tactical view?
-
-	Bool m_okToAdjustHeight;																		///< Should we attempt to adjust camera height?
-	Bool m_snapImmediate;																				///< Should we immediately snap to the object we're following?
-
-	Coord2D m_guardBandBias; ///< Exttra beefy margins so huge thins can stay "on-screen"
-
-};
-
-// ------------------------------------------------------------------------------------------------
-/** Used to save and restore view position */
-// ------------------------------------------------------------------------------------------------
-class ViewLocation
-{
-	friend class View;
-	friend class LookAtTranslator;
-
-	protected:
-		Bool m_valid;																								///< Is this location valid
-		Coord3D m_pos;																							///< Position of this view, in world coordinates
-		Real m_angle;																								///< Angle at which view has been rotated about the Z axis
-		Real m_pitch;																								///< Angle at which view has been rotated about the Y axis
-		Real m_zoom;																								///< Current zoom value
-
-	public:
-
-		ViewLocation() 
-		{ 
-			m_valid = FALSE;
-			//Added By Sadullah Nader
-			//Initialization(s) inserted
-			m_pos.zero();
-			m_angle = m_pitch = m_zoom = 0.0;
-			//
-		}
-		
-		const Coord3D& getPosition() const { return m_pos; }
-		Bool isValid() const { return m_valid; }
-		Real getAngle() const { return m_angle; }
-		Real getPitch() const { return m_pitch; }
-		Real getZoom() const { return m_zoom; }
-
-		void init(Real x, Real y, Real z, Real angle, Real pitch, Real zoom)
-		{
-			m_pos.x = x;
-			m_pos.y = y;
-			m_pos.z = z;
-			m_angle = angle;
-			m_pitch = pitch;
-			m_zoom = zoom;
-			m_valid = true;
-		}
-};
-
-// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
-extern View *TheTacticalView;		///< the main tactical interface to the game world
-
-#endif // _VIEW_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Water.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Water.h
deleted file mode 100644
index 45207ed6ec6..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/Water.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Water.h //////////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, December 2001
-// Desc:   Water settings
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WATER_H_
-#define __WATER_H_
-
-// INLCLUDES //////////////////////////////////////////////////////////////////////////////////////
-#include "Common/GameType.h"
-#include "Common/Overridable.h"
-#include "Common/Override.h"
-
-//-------------------------------------------------------------------------------------------------
-struct FieldParse;
-
-//-------------------------------------------------------------------------------------------------
-/** This structures keeps the settings for how our water will look */
-//-------------------------------------------------------------------------------------------------
-class WaterSetting
-{
-
-public:
-
-	WaterSetting( void );
-	virtual ~WaterSetting( void );
-
-	/// Get the INI parsing table for loading
-	const FieldParse *getFieldParse( void ) { return m_waterSettingFieldParseTable; }
-
-	static const FieldParse m_waterSettingFieldParseTable[];		///< the parse table for INI definition
-	AsciiString m_skyTextureFile;
-	AsciiString m_waterTextureFile;
-	Int m_waterRepeatCount;
-	Real m_skyTexelsPerUnit;	//texel density of sky plane (higher value repeats texture more).
-	RGBAColorInt m_vertex00Diffuse;
-	RGBAColorInt m_vertex10Diffuse;
-	RGBAColorInt m_vertex11Diffuse;
-	RGBAColorInt m_vertex01Diffuse;
-	RGBAColorInt m_waterDiffuseColor;
-	RGBAColorInt m_transparentWaterDiffuse;
-	Real m_uScrollPerMs;		
-	Real m_vScrollPerMs;
-
-};
-
-//-------------------------------------------------------------------------------------------------
-/** This structure keeps the transparency and vertex settings, which are the same regardless of the
-		time of day. They can be overridden on a per-map basis. */
-//-------------------------------------------------------------------------------------------------
-class WaterTransparencySetting : public Overridable
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( WaterTransparencySetting, "WaterTransparencySetting"  )
-
-	public:
-		Real m_transparentWaterDepth;
-		Real m_minWaterOpacity;
-		RGBColor m_standingWaterColor;
-		RGBColor m_radarColor;
-		Bool m_additiveBlend;
-		AsciiString m_standingWaterTexture;
-		
-		AsciiString m_skyboxTextureN;
-		AsciiString m_skyboxTextureE;
-		AsciiString m_skyboxTextureS;
-		AsciiString m_skyboxTextureW;
-		AsciiString m_skyboxTextureT;
-
-	public:
-		WaterTransparencySetting()
-		{
-			m_transparentWaterDepth = 3.0f;
-			m_minWaterOpacity = 1.0f;
-			m_standingWaterColor.red = 1.0f;
-			m_standingWaterColor.green = 1.0f;
-			m_standingWaterColor.blue = 1.0f;
-			m_radarColor.red = 0.55f;
-			m_radarColor.green = 0.55f;
-			m_radarColor.blue = 1.0f;
-			m_standingWaterTexture = "TWWater01.tga";
-			m_additiveBlend = FALSE;
-
-			m_skyboxTextureN = "TSMorningN.tga";
-			m_skyboxTextureE = "TSMorningE.tga";
-			m_skyboxTextureS = "TSMorningS.tga";
-			m_skyboxTextureW = "TSMorningW.tga";
-			m_skyboxTextureT = "TSMorningT.tga";
-		}
-
-		static const FieldParse m_waterTransparencySettingFieldParseTable[];		///< the parse table for INI definition
-
-		/// Get the INI parsing table for loading
-		const FieldParse *getFieldParse( void ) const { return m_waterTransparencySettingFieldParseTable; }
-};
-
-EMPTY_DTOR(WaterTransparencySetting)
-
-// EXTERNAL ///////////////////////////////////////////////////////////////////////////////////////
-extern WaterSetting WaterSettings[ TIME_OF_DAY_COUNT ];
-
-extern OVERRIDE<WaterTransparencySetting> TheWaterTransparency;
-
-#endif // __WATER_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h b/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h
index 9c0ec3ef03e..0d06d1252f0 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h
@@ -24,12 +24,12 @@
 
 // FILE: WinInstanceData.h ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __WININSTANCEDATA_H_
-#define __WININSTANCEDATA_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -98,7 +95,7 @@ struct TextDrawData
 // NOTE if you add data to this make sure you update winSetInstanceData()
 // NOTE if you add data to this make sure you update winSetInstanceData()
 //-----------------------------------------------------------------------------
-class WinInstanceData 
+class WinInstanceData
 {
 
 public:
@@ -134,7 +131,7 @@ class WinInstanceData
 // NOTE if you add data to this make sure you update winSetInstanceData()
 
 	/** @todo you may want to make these data members protected, they are public
-	because of the legacy of porting all this code in from Nox, but they 
+	because of the legacy of porting all this code in from Nox, but they
 	really should be protected and have the rest of the code use access
 	functions to edit them */
 
@@ -167,10 +164,10 @@ class WinInstanceData
 
 	DisplayString *m_text;				 ///< generic text for any window to display
 	DisplayString *m_tooltip;		 ///< tooltip for display
-	
+
 	//NOTE Video Buffer cannot be transfered to another window.
 	VideoBuffer *m_videoBuffer;			///< Each window can be made to play a video in it.
-	
+
 // NOTE if you add data to this make sure you update winSetInstanceData()
 // NOTE if you add data to this make sure you update winSetInstanceData()
 // NOTE if you add data to this make sure you update winSetInstanceData()
@@ -184,9 +181,9 @@ class WinInstanceData
 ///////////////////////////////////////////////////////////////////////////////
 inline UnsignedInt WinInstanceData::getStyle( void ) { return m_style; }
 inline UnsignedInt WinInstanceData::getStatus( void ) { return m_status; }
-inline UnsignedInt WinInstanceData::getState( void ) { return m_state; }  
-inline GameWindow *WinInstanceData::getOwner( void ) { return m_owner; }  
-inline GameFont		*WinInstanceData::getFont( void ) { return m_font; }    
+inline UnsignedInt WinInstanceData::getState( void ) { return m_state; }
+inline GameWindow *WinInstanceData::getOwner( void ) { return m_owner; }
+inline GameFont		*WinInstanceData::getFont( void ) { return m_font; }
 inline DisplayString *WinInstanceData::getTextDisplayString( void ) { return m_text; }
 inline DisplayString *WinInstanceData::getTooltipDisplayString( void ) { return m_tooltip; }
 inline UnicodeString WinInstanceData::getTooltipText( void )
@@ -216,6 +213,3 @@ inline Int WinInstanceData::getTooltipTextLength( void )
 }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __WININSTANCEDATA_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h
index 719ab1e6392..a4bdf6ce2b5 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __WINDOWLAYOUT_H_
-#define __WINDOWLAYOUT_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
 #include "GameClient/GameWindow.h"
@@ -62,17 +59,17 @@ class WindowLayout : public MemoryPoolObject
 	// ~WindowLayout( void );												///< defined by memory pool glue
 
 	// manipulating screen properties ---------------------------------------------------------------
-	AsciiString getFilename( void );											///< return source window filename
-	Bool load( AsciiString filename );										///< create windows and load from .wnd file
-	void hide( Bool hide );													///< hide/unhide all windows on this screen
-	Bool isHidden( void );													///< return visible state of screen
+	AsciiString getFilename( void ) const;					///< return source window filename
+	Bool load( AsciiString filename );							///< create windows and load from .wnd file
+	void hide( Bool hide );													///< hide/show all windows on this screen
+	Bool isHidden( void ) const;										///< return visible state of screen
 	void bringForward( void );											///< bring all windows in this screen forward
 
 	// manipulating window lists --------------------------------------------------------------------
 	void addWindow( GameWindow *window );						///< add window to screen
 	void removeWindow( GameWindow *window );				///< remove window from screen
 	void destroyWindows( void );										///< destroy all windows in this screen
-	GameWindow *getFirstWindow( void );							///< get first window in list for screen
+	GameWindow *getFirstWindow( void ) const;				///< get first window in list for screen
 
 	// accessing layout callbacks  ------------------------------------------------------------------
 	void runInit( void *userData = NULL );									///< run the init method if available
@@ -98,7 +95,7 @@ class WindowLayout : public MemoryPoolObject
 	Bool m_hidden;																	///< visible state of this screen
 
 	//
-	// These are callbacks you can attach to a "layout file" ... they are not 
+	// These are callbacks you can attach to a "layout file" ... they are not
 	// automatically called when using the WindowManager to load and create
 	// the layout.  You can incorporate when and where init, shutdown and update should
 	// be called for any system or code that is uses these window layouts
@@ -107,12 +104,12 @@ class WindowLayout : public MemoryPoolObject
 	WindowLayoutUpdateFunc	 m_update;							///< update callback
 	WindowLayoutShutdownFunc m_shutdown;						///< shutdown callback
 
-};  // end class WindowLayout
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////////////////////////
-inline AsciiString WindowLayout::getFilename( void ) { return m_filenameString; }
-inline GameWindow *WindowLayout::getFirstWindow( void ) { return m_windowList; }
-inline Bool WindowLayout::isHidden( void ) { return m_hidden; }
+inline AsciiString WindowLayout::getFilename( void ) const { return m_filenameString; }
+inline GameWindow *WindowLayout::getFirstWindow( void ) const { return m_windowList; }
+inline Bool WindowLayout::isHidden( void ) const { return m_hidden; }
 
 inline void WindowLayout::runInit( void *userData ) { if( m_init ) m_init( this, userData ); }
 inline void WindowLayout::runUpdate( void *userData ) { if( m_update ) m_update( this, userData ); }
@@ -121,6 +118,3 @@ inline void WindowLayout::runShutdown( void *userData ) { if( m_shutdown ) m_shu
 inline void WindowLayout::setInit( WindowLayoutInitFunc init ) { m_init = init; }
 inline void WindowLayout::setUpdate( WindowLayoutUpdateFunc update ) { m_update = update; }
 inline void WindowLayout::setShutdown( WindowLayoutShutdownFunc shutdown ) {m_shutdown = shutdown;}
-
-#endif // __WINDOWLAYOUT_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowVideoManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowVideoManager.h
deleted file mode 100644
index 2ba7480eaaf..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowVideoManager.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: WindowVideoManager.h /////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-//	created:	Mar 2002
-//
-//	Filename: 	WindowVideoManager.h
-//
-//	author:		Chris Huybregts
-//	
-//	purpose:	
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WINDOWVIDEOMANAGER_H_
-#define __WINDOWVIDEOMANAGER_H_
-
-//-----------------------------------------------------------------------------
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// USER INCLUDES //////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-class GameWindow;
-class AsciiString;
-class VideoStreamInterface;
-class VideoBuffer;
-
-//-----------------------------------------------------------------------------
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-
-enum WindowVideoPlayType CPP_11(: Int)
-{
-	WINDOW_PLAY_MOVIE_ONCE = 0,
-	WINDOW_PLAY_MOVIE_LOOP,
-	WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME,
-
-	WINDOW_PLAY_MOVIE_COUNT
-};
-
-enum WindowVideoStates CPP_11(: Int)
-{
-	WINDOW_VIDEO_STATE_START = 0,
-	WINDOW_VIDEO_STATE_STOP,
-	WINDOW_VIDEO_STATE_PAUSE,
-	WINDOW_VIDEO_STATE_PLAY,
-	WINDOW_VIDEO_STATE_HIDDEN,
-	
-	WINDOW_VIDEO_STATE_COUNT	
-};
-
-class WindowVideo
-{
-public:
-	WindowVideo( void );
-	~WindowVideo( void );
-	
-	VideoStreamInterface *getVideoStream( void );
-	VideoBuffer *getVideoBuffer( void );
-	GameWindow *getWin( void );
-	AsciiString getMovieName( void );
-	WindowVideoPlayType getPlayType ( void );
-	WindowVideoStates getState( void );
-
-	void setPlayType(WindowVideoPlayType playType);
-	void setWindowState( WindowVideoStates state );
-
-	void init( GameWindow *win, AsciiString movieName, WindowVideoPlayType playType,VideoBuffer *videoBuffer, 
-	VideoStreamInterface *videoStream);
-	
-private:
-	WindowVideoPlayType m_playType;
-	GameWindow *m_win;
-	VideoBuffer *m_videoBuffer;
-	VideoStreamInterface *m_videoStream;
-	AsciiString m_movieName;
-	WindowVideoStates m_state;
-
-};
-
-
-class WindowVideoManager : public SubsystemInterface
-{
-public:
-	WindowVideoManager( void );
-	~WindowVideoManager( void );
-
-	// Inhertited from subsystem ====================================================================
-	virtual void init( void );			
-	virtual void reset( void );			
-	virtual void update( void );		
-	//===============================================================================================
-
-	
-	void playMovie( GameWindow *win, AsciiString movieName, WindowVideoPlayType playType );
-	void hideMovie( GameWindow *win );							///< If the window becomes hidden while we're playing, stop the movie but test to see if we should resume
-	void pauseMovie( GameWindow *win );							///< Pause a movie and display it's current frame
-	void resumeMovie( GameWindow *win );						///< If a movie has been stopped, resume it.
-	void stopMovie( GameWindow *win );							///< Stop a movie
-	void stopAndRemoveMovie( GameWindow *win );			///< Stop a movie, and remove it from the manager
-	void stopAllMovies( void );											///< Stop all playing movies
-	void pauseAllMovies( void );										///< Pauses all movies on their current frame
-	void resumeAllMovies( void );										///< Resume Playing all movies
-	Int getWinState( GameWindow *win );			///< return the current state of the window.
-	
-private:
-
-	typedef const GameWindow* ConstGameWindowPtr;
-	// use special class for hashing, since std::hash won't compile for arbitrary ptrs
-	struct hashConstGameWindowPtr
-	{
-	size_t operator()(ConstGameWindowPtr p) const
-	{
-		std::hash<UnsignedInt> hasher;
-		return hasher((UnsignedInt)p);
-	}
-	};
-
-	typedef std::hash_map< ConstGameWindowPtr, WindowVideo *, hashConstGameWindowPtr, std::equal_to<ConstGameWindowPtr> > WindowVideoMap;
-
-	WindowVideoMap m_playingVideos;								///< List of currently playin Videos
-	//WindowVideoMap m_pausedVideos;									///< List of currently paused Videos
-	Bool m_stopAllMovies;														///< Maintains is we're in a stop all Movies State
-	Bool m_pauseAllMovies;													///< Maintains if we're in a pause all movies state
-
-
-};
-
-//-----------------------------------------------------------------------------
-// INLINING ///////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-inline VideoStreamInterface *WindowVideo::getVideoStream( void ){ return m_videoStream; };
-inline VideoBuffer *WindowVideo::getVideoBuffer( void ){ return m_videoBuffer; };
-inline GameWindow *WindowVideo::getWin( void ){ return m_win; };
-inline AsciiString WindowVideo::getMovieName( void ){ return m_movieName; };
-inline WindowVideoPlayType WindowVideo::getPlayType ( void ){ return m_playType; };
-inline WindowVideoStates WindowVideo::getState( void ){ return m_state; };
-
-inline void WindowVideo::setPlayType(WindowVideoPlayType playType){ m_playType = playType; };
-	
-
-
-//-----------------------------------------------------------------------------
-// EXTERNALS //////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-#endif // __WINDOWVIDEOMANAGER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h
index c3bfb7967ca..ce1714939d7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h
@@ -27,13 +27,10 @@
 
 #pragma once
 
-#ifndef _H_WindowXlat
-#define _H_WindowXlat
-
 #include "GameClient/InGameUI.h"
 
 //-----------------------------------------------------------------------------
-class WindowTranslator : public GameMessageTranslator                          
+class WindowTranslator : public GameMessageTranslator
 {
 private:
 	// nothing
@@ -41,6 +38,4 @@ class WindowTranslator : public GameMessageTranslator
 	WindowTranslator();
 	~WindowTranslator();
 	virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);
-};	
-
-#endif
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h
index c8cb0c8b010..23cf4f94f83 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h
@@ -28,19 +28,17 @@
 
 #pragma once
 
-#ifndef _AI_H_
-#define _AI_H_
-
 #include "Common/Snapshot.h"
 #include "Common/SubsystemInterface.h"
 #include "Common/GameMemory.h"
 #include "Common/GameType.h"
 #include "GameLogic/Damage.h"
 #include "Common/STLTypedefs.h"
+#include "ref_ptr.h"
 
 class AIGroup;
 class AttackPriorityInfo;
-class BuildListInfo;	
+class BuildListInfo;
 class CommandButton;
 class Object;
 class PartitionFilter;
@@ -57,6 +55,12 @@ enum WeaponSetType CPP_11(: Int);
 enum WeaponLockType CPP_11(: Int);
 enum SpecialPowerType CPP_11(: Int);
 
+#if RETAIL_COMPATIBLE_AIGROUP
+typedef AIGroup* AIGroupPtr;
+#else
+typedef RefCountPtr<AIGroup> AIGroupPtr;
+#endif
+
 typedef std::vector<ObjectID> VecObjectID;
 typedef VecObjectID::iterator VecObjectIDIt;
 
@@ -65,7 +69,7 @@ typedef ListObjectPtr::iterator ListObjectPtrIt;
 
 enum AIDebugOptions CPP_11(: Int)
 {
-	AI_DEBUG_NONE = 0, 
+	AI_DEBUG_NONE = 0,
 	AI_DEBUG_PATHS,
 	AI_DEBUG_TERRAIN,
 	AI_DEBUG_CELLS,
@@ -74,7 +78,7 @@ enum AIDebugOptions CPP_11(: Int)
 	AI_DEBUG_END
 };
 
-enum 
+enum
 {
 	// multiply by the owner type, either AI or human
 	AI_VISIONFACTOR_OWNERTYPE = 0x01,
@@ -94,7 +98,7 @@ typedef struct {
 
 class AISideInfo : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AISideInfo, "AISideInfo")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AISideInfo, "AISideInfo")
 public:
 	AISideInfo( void ) : m_easy(0), m_normal(1), m_hard(2), m_next(NULL)
 	{
@@ -104,7 +108,7 @@ class AISideInfo : public MemoryPoolObject
 
 	AsciiString m_side;						///< Name of the side
 	Int					m_easy;						///< Number of gatherers to use in easy, normal & hard
-	Int					m_normal;	
+	Int					m_normal;
 	Int					m_hard;
 	TSkillSet		m_skillSet1;
 	TSkillSet		m_skillSet2;
@@ -118,11 +122,11 @@ EMPTY_DTOR(AISideInfo)
 
 class AISideBuildList : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AISideBuildList, "AISideBuildList")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AISideBuildList, "AISideBuildList")
 public:
-	AISideBuildList( AsciiString side ); 
+	AISideBuildList( AsciiString side );
 	//~AISideBuildList();
-	
+
 	void addInfo(BuildListInfo *info);
 
 public:
@@ -161,36 +165,36 @@ class TAiData : public Snapshot
 	Real m_guardOuterModifierAI;	// Multiply the AI unit's vision by this much == guard outer circle.
 	Real m_guardInnerModifierHuman;	// Multiply the human unit's vision by this much == guard inner circle
 	Real m_guardOuterModifierHuman;	// Multiply the human unit's vision by this much == guard outer circle
-	UnsignedInt m_guardChaseUnitFrames;		// Number of frames for which a unit should 
+	UnsignedInt m_guardChaseUnitFrames;		// Number of frames for which a unit should
 	UnsignedInt m_guardEnemyScanRate;		// rate to scan for enemies while guarding
 	UnsignedInt m_guardEnemyReturnScanRate;		// rate to scan for enemies while guarding but returning
 
 	Real m_wallHeight;				// Height of special wall units can walk on top of.
-	
+
 	Real m_alertRangeModifier;			// When a unit is alert, its range will be modified by this value
 	Real m_aggressiveRangeModifier;	// When a unit is aggressive, its range will be modified by this value
 
 	/* The attack priority distance modifier changes relative values.  The relative priority
 	   is reduced by the distance away, divided by the modifier.
 		 Example: tanks are priority 10, powerplants priority 15, and modifier = 100.0
-		 If a powerplant is 700 feet away from the attacker, and the tank is 
+		 If a powerplant is 700 feet away from the attacker, and the tank is
 		 100 feet, the effective priority for tank is 9 (10-(100/100), and the
 		 effective priority for powerplant is 8 (15 -(700/100).  So the tanks
 		 would be attacked first because their distance weighted priority is greater. */
 	Real m_attackPriorityDistanceModifier; // Distance to reduce a relative AttackPriority by 1.
-	
-	
-	/* 
+
+
+	/*
 		How close to a waypoint does a group of units have to be to consider itself at the waypoint?
 		m_skirmishGroupFudgeValue is multiplied by the number of the units in the group asking if its
 		close enough to determine this.
-		
-		So for instance (if m_skirmishGroupFudgeValue was 5), if 2 units are walking along a path, 
-		they would check to see if they were less than 10 feet away from the waypoint in order 
-		to say they were close enough. A group of 10 units would consider themselves close enough 
+
+		So for instance (if m_skirmishGroupFudgeValue was 5), if 2 units are walking along a path,
+		they would check to see if they were less than 10 feet away from the waypoint in order
+		to say they were close enough. A group of 10 units would consider themselves close enough
 		if they were within 50 feet of the waypoint.
 	*/
-	Real m_skirmishGroupFudgeValue;	
+	Real m_skirmishGroupFudgeValue;
 
 	Real m_maxRecruitDistance; // Maximum distance away that units can be recruited.
 	Real m_skirmishBaseDefenseExtraDistance; ///< instead of building base defenses right on the template bounding circle, push them out this much.
@@ -236,7 +240,7 @@ class TAiData : public Snapshot
 //------------------------------------------------------------------------------------------------------------
 /**
  * The AI subsystem is responsible for the implementation of
- * the Artificial Intelligence of the game.  This includes 
+ * the Artificial Intelligence of the game.  This includes
  * the behaviors or all game entities, pathfinding, etc.
  */
 class AI : public SubsystemInterface, public Snapshot
@@ -249,7 +253,7 @@ class AI : public SubsystemInterface, public Snapshot
 	virtual void reset( void );						///< reset the AI system to prepare for a new map
 	virtual void update( void );					///< do one frame of AI computation
 
-	inline Pathfinder *pathfinder( void ) { return m_pathfinder; }	///< public access to the pathfind system
+	Pathfinder *pathfinder( void ) { return m_pathfinder; }	///< public access to the pathfind system
 	enum
 	{
 		CAN_SEE														=	1 << 0,
@@ -259,7 +263,7 @@ class AI : public SubsystemInterface, public Snapshot
 		WITHIN_ATTACK_RANGE								= 1 << 4,
 		UNFOGGED													= 1 << 5
 	};
-	Object *findClosestEnemy( const Object *me, Real range, UnsignedInt qualifiers, 
+	Object *findClosestEnemy( const Object *me, Real range, UnsignedInt qualifiers,
 		const AttackPriorityInfo *info=NULL, PartitionFilter *optionalFilter=NULL);
 
 	Object *findClosestRepulsor( const Object *me, Real range);
@@ -272,7 +276,7 @@ class AI : public SubsystemInterface, public Snapshot
 	void loadPostProcess( void );
 
 	// AI Groups -----------------------------------------------------------------------------------------------
-	AIGroup *createGroup( void );					///< instantiate a new AI Group
+	AIGroupPtr createGroup( void ); ///< instantiate a new AI Group
 	void destroyGroup( AIGroup *group );	///< destroy the given AI Group
 	AIGroup *findGroup( UnsignedInt id );	///< return the AI Group with the given ID
 
@@ -291,7 +295,7 @@ class AI : public SubsystemInterface, public Snapshot
 	static void parseSkillSet( INI* ini, void *instance, void *store, const void *userData );					///< Parse the image part of the INI file
 	static void parseScience( INI* ini, void *instance, void *store, const void *userData );					///< Parse the image part of the INI file
 
-	inline UnsignedInt getNextGroupID( void ) { return ++m_nextGroupID; }
+	UnsignedInt getNextGroupID( void ) { return ++m_nextGroupID; }
 
 protected:
 	Pathfinder *m_pathfinder;							///< the pathfinding system
@@ -299,7 +303,7 @@ class AI : public SubsystemInterface, public Snapshot
 	TAiData *m_aiData;
 	void newOverride(void);
 	void addSideInfo(AISideInfo *info);
-	
+
 	UnsignedInt m_nextGroupID;
 	FormationID m_nextFormationID;
 };
@@ -311,9 +315,9 @@ class Waypoint;
 class Team;
 class Weapon;
 
-// TheSuperHackers @compile xezon 17/03/2025 Renames AI_PASSIVE to not conflict with macro in ws2def.h
+// TheSuperHackers @build xezon 17/03/2025 Renames AI_PASSIVE to not conflict with macro in ws2def.h
 
-// Note - written out in save/load xfer and .map files, don't change these numbers.  
+// Note - written out in save/load xfer and .map files, don't change these numbers.
 enum AttitudeType CPP_11(: Int)
 {
 	ATTITUDE_SLEEP = -2,
@@ -322,14 +326,14 @@ enum AttitudeType CPP_11(: Int)
 	ATTITUDE_ALERT=1,
 	ATTITUDE_AGGRESSIVE=2,
 	ATTITUDE_INVALID=3
-};		///< AI "attitude" behavior modifiers
+};
 
 enum CommandSourceType CPP_11(: Int);
 
 typedef UnsignedInt CommandSourceMask;
 
 #ifdef DEFINE_COMMANDSOURCEMASK_NAMES
-static const char *TheCommandSourceMaskNames[] = 
+static const char *const TheCommandSourceMaskNames[] =
 {
 	"FROM_PLAYER",
 	"FROM_SCRIPT",
@@ -339,6 +343,7 @@ static const char *TheCommandSourceMaskNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheCommandSourceMaskNames) == COMMAND_SOURCE_TYPE_COUNT + 1, "Incorrect array size");
 #endif
 
 //------------------------------------------------------------------------------------------------------------
@@ -405,8 +410,6 @@ enum AICommandType CPP_11(: Int)	// Stored in save file, do not reorder/renumber
 	AICMD_EVACUATE_INSTANTLY,
 	AICMD_EXIT_INSTANTLY,
 	AICMD_GUARD_RETALIATE,
-
-	AICMD_NUM_COMMANDS	// keep last
 };
 
 struct AICommandParms
@@ -418,8 +421,8 @@ struct AICommandParms
   Object*									m_otherObj;
   const Team*							m_team;
 	std::vector<Coord3D>		m_coords;
-  const Waypoint*         m_waypoint; 
-  const PolygonTrigger*   m_polygon;     
+  const Waypoint*         m_waypoint;
+  const PolygonTrigger*   m_polygon;
   Int											m_intValue;       /// misc usage
   DamageInfo							m_damage;
 	const CommandButton*		m_commandButton;
@@ -438,8 +441,8 @@ class AICommandParmsStorage
   ObjectID								m_otherObj;
   AsciiString							m_teamName;
 	std::vector<Coord3D>		m_coords;
-  const Waypoint*         m_waypoint; 
-  const PolygonTrigger*   m_polygon;     
+  const Waypoint*         m_waypoint;
+  const PolygonTrigger*   m_polygon;
   Int											m_intValue;       /// misc usage
   DamageInfo							m_damage;
 	const CommandButton*  	m_commandButton;
@@ -454,7 +457,7 @@ class AICommandParmsStorage
 
 /**
 	AI interface.  AIGroups, or Objects with an AIUpdate can be given these commands.
-	
+
 	NOTE NOTE NOTE: all of these may be overridden and possibly deferred by various AI classes,
 	so they are NOT ALLOWED TO RETURN ANY VALUES, since the particular command issued might
 	not be executed immediately...
@@ -462,92 +465,92 @@ class AICommandParmsStorage
 class AICommandInterface
 {
 public:
-	
+
 	virtual void aiDoCommand(const AICommandParms* parms) = 0;
 
-	inline void aiMoveToPosition( const Coord3D *pos, CommandSourceType cmdSource )
+	void aiMoveToPosition( const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_MOVE_TO_POSITION, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiMoveToPositionEvenIfSleeping( const Coord3D *pos, CommandSourceType cmdSource )
+	void aiMoveToPositionEvenIfSleeping( const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_MOVE_TO_POSITION_EVEN_IF_SLEEPING, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiMoveToObject( Object *obj, CommandSourceType cmdSource )
+	void aiMoveToObject( Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_MOVE_TO_OBJECT, cmdSource);
 		parms.m_obj = obj;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiTightenToPosition( const Coord3D *pos, CommandSourceType cmdSource )
+	void aiTightenToPosition( const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_TIGHTEN_TO_POSITION, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiMoveToAndEvacuate( const Coord3D *pos, CommandSourceType cmdSource )
+	void aiMoveToAndEvacuate( const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_MOVE_TO_POSITION_AND_EVACUATE, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiMoveToAndEvacuateAndExit( const Coord3D *pos, CommandSourceType cmdSource )
+	void aiMoveToAndEvacuateAndExit( const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_MOVE_TO_POSITION_AND_EVACUATE_AND_EXIT, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiIdle(CommandSourceType cmdSource)
+	void aiIdle(CommandSourceType cmdSource)
 	{
 		AICommandParms parms(AICMD_IDLE, cmdSource);
 		aiDoCommand(&parms);
 	}
 
-	inline void aiBusy(CommandSourceType cmdSource)
+	void aiBusy(CommandSourceType cmdSource)
 	{
 		AICommandParms parms(AICMD_BUSY, cmdSource);
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowWaypointPath( const Waypoint *way, CommandSourceType cmdSource )
+	void aiFollowWaypointPath( const Waypoint *way, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_WAYPOINT_PATH, cmdSource);
 		parms.m_waypoint = way;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowWaypointPathExact( const Waypoint *way, CommandSourceType cmdSource )
+	void aiFollowWaypointPathExact( const Waypoint *way, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_WAYPOINT_PATH_EXACT, cmdSource);
 		parms.m_waypoint = way;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowWaypointPathAsTeam( const Waypoint *way, CommandSourceType cmdSource )
+	void aiFollowWaypointPathAsTeam( const Waypoint *way, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_WAYPOINT_PATH_AS_TEAM, cmdSource);
 		parms.m_waypoint = way;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowWaypointPathExactAsTeam( const Waypoint *way, CommandSourceType cmdSource )
+	void aiFollowWaypointPathExactAsTeam( const Waypoint *way, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_WAYPOINT_PATH_AS_TEAM_EXACT, cmdSource);
 		parms.m_waypoint = way;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowExitProductionPath( const std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource )
+	void aiFollowExitProductionPath( const std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_EXITPRODUCTION_PATH, cmdSource);
 		parms.m_coords = *path;
@@ -555,7 +558,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowPath( const std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource )
+	void aiFollowPath( const std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_PATH, cmdSource);
 		parms.m_coords = *path;
@@ -563,14 +566,14 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowPathAppend( const Coord3D* pos, CommandSourceType cmdSource )
+	void aiFollowPathAppend( const Coord3D* pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_PATH_APPEND, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACK_OBJECT, cmdSource);
 		parms.m_obj = victim;
@@ -578,7 +581,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FORCE_ATTACK_OBJECT, cmdSource);
 		parms.m_obj = victim;
@@ -586,7 +589,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGuardRetaliate( Object *victim, const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiGuardRetaliate( Object *victim, const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GUARD_RETALIATE, cmdSource);
 		parms.m_obj = victim;
@@ -595,7 +598,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackTeam( const Team *team, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiAttackTeam( const Team *team, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACK_TEAM, cmdSource);
 		parms.m_team = team;
@@ -603,7 +606,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACK_POSITION, cmdSource);
 		parms.m_pos = *pos;
@@ -611,7 +614,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackMoveToPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiAttackMoveToPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACKMOVE_TO_POSITION, cmdSource);
 		parms.m_pos = *pos;
@@ -619,7 +622,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackFollowWaypointPath( const Waypoint *way, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiAttackFollowWaypointPath( const Waypoint *way, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACKFOLLOW_WAYPOINT_PATH, cmdSource);
 		parms.m_waypoint = way;
@@ -627,7 +630,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackFollowWaypointPathAsTeam( const Waypoint *way, Int maxShotsToFire, CommandSourceType cmdSource )
+	void aiAttackFollowWaypointPathAsTeam( const Waypoint *way, Int maxShotsToFire, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACKFOLLOW_WAYPOINT_PATH_AS_TEAM, cmdSource);
 		parms.m_waypoint = way;
@@ -635,20 +638,20 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiHunt( CommandSourceType cmdSource )
+	void aiHunt( CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_HUNT, cmdSource);
 		aiDoCommand(&parms);
 	}
 
-	inline void aiAttackArea( const PolygonTrigger *areaToGuard, CommandSourceType cmdSource )
+	void aiAttackArea( const PolygonTrigger *areaToGuard, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ATTACK_AREA, cmdSource);
 		parms.m_polygon = areaToGuard;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiRepair( Object *obj, CommandSourceType cmdSource )
+	void aiRepair( Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_REPAIR, cmdSource);
 		parms.m_obj = obj;
@@ -660,7 +663,7 @@ class AICommandInterface
 	{
 		AICommandParms parms( AICMD_PICK_UP_PRISONER, cmdSource );
 		parms.m_obj = obj;
-		aiDoCommand( &parms );	
+		aiDoCommand( &parms );
 	}
 #endif
 
@@ -673,56 +676,56 @@ class AICommandInterface
 	}
 #endif
 
-	inline void aiResumeConstruction( Object *obj, CommandSourceType cmdSource )
+	void aiResumeConstruction( Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_RESUME_CONSTRUCTION, cmdSource);
 		parms.m_obj = obj;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGetHealed( Object *healDepot, CommandSourceType cmdSource )
+	void aiGetHealed( Object *healDepot, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GET_HEALED, cmdSource);
 		parms.m_obj = healDepot;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGetRepaired( Object *repairDepot, CommandSourceType cmdSource )
+	void aiGetRepaired( Object *repairDepot, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GET_REPAIRED, cmdSource);
 		parms.m_obj = repairDepot;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiEnter( Object *obj, CommandSourceType cmdSource )
+	void aiEnter( Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_ENTER, cmdSource);
 		parms.m_obj = obj;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiDock( Object *obj, CommandSourceType cmdSource )
+	void aiDock( Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_DOCK, cmdSource);
 		parms.m_obj = obj;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiExit( Object *objectToExit, CommandSourceType cmdSource )
+	void aiExit( Object *objectToExit, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_EXIT, cmdSource);
 		parms.m_obj = objectToExit;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiExitInstantly( Object *objectToExit, CommandSourceType cmdSource )
+	void aiExitInstantly( Object *objectToExit, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_EXIT_INSTANTLY, cmdSource);
 		parms.m_obj = objectToExit;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiEvacuate( Bool exposeStealthUnits, CommandSourceType cmdSource )
+	void aiEvacuate( Bool exposeStealthUnits, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_EVACUATE, cmdSource);
 		if( exposeStealthUnits )
@@ -731,8 +734,8 @@ class AICommandInterface
 			parms.m_intValue = 0;
 		aiDoCommand(&parms);
 	}
-	
-	inline void aiEvacuateInstantly( Bool exposeStealthUnits, CommandSourceType cmdSource )
+
+	void aiEvacuateInstantly( Bool exposeStealthUnits, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_EVACUATE_INSTANTLY, cmdSource);
 		if( exposeStealthUnits )
@@ -742,20 +745,20 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiExecuteRailedTransport( CommandSourceType cmdSource )
+	void aiExecuteRailedTransport( CommandSourceType cmdSource )
 	{
 		AICommandParms parms( AICMD_EXECUTE_RAILED_TRANSPORT, cmdSource );
 		aiDoCommand( &parms );
 	}
 
-	inline void aiGoProne( const DamageInfo *damageInfo, CommandSourceType cmdSource )
+	void aiGoProne( const DamageInfo *damageInfo, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GO_PRONE, cmdSource);
 		parms.m_damage = *damageInfo;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGuardPosition( const Coord3D *pos, GuardMode guardMode, CommandSourceType cmdSource )
+	void aiGuardPosition( const Coord3D *pos, GuardMode guardMode, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GUARD_POSITION, cmdSource);
 		parms.m_pos = *pos;
@@ -763,7 +766,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGuardObject( Object *objToGuard, GuardMode guardMode, CommandSourceType cmdSource )
+	void aiGuardObject( Object *objToGuard, GuardMode guardMode, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GUARD_OBJECT, cmdSource);
 		parms.m_obj = objToGuard;
@@ -771,7 +774,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGuardArea( const PolygonTrigger *areaToGuard, GuardMode guardMode, CommandSourceType cmdSource )
+	void aiGuardArea( const PolygonTrigger *areaToGuard, GuardMode guardMode, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GUARD_AREA, cmdSource);
 		parms.m_polygon = areaToGuard;
@@ -779,34 +782,34 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiGuardTunnelNetwork( GuardMode guardMode, CommandSourceType cmdSource )
+	void aiGuardTunnelNetwork( GuardMode guardMode, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_GUARD_TUNNEL_NETWORK, cmdSource);
 		parms.m_intValue = guardMode;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiHackInternet( CommandSourceType cmdSource )
+	void aiHackInternet( CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_HACK_INTERNET, cmdSource);
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFaceObject( Object *target, CommandSourceType cmdSource )
+	void aiFaceObject( Object *target, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FACE_OBJECT, cmdSource);
 		parms.m_obj = target;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFacePosition( const Coord3D *pos, CommandSourceType cmdSource )
+	void aiFacePosition( const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FACE_POSITION, cmdSource);
 		parms.m_pos = *pos;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiRappelInto( Object *target, const Coord3D& pos, CommandSourceType cmdSource )
+	void aiRappelInto( Object *target, const Coord3D& pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_RAPPEL_INTO, cmdSource);
 		parms.m_obj = target;
@@ -814,7 +817,7 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiCombatDrop( Object *target, const Coord3D& pos, CommandSourceType cmdSource )
+	void aiCombatDrop( Object *target, const Coord3D& pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_COMBATDROP, cmdSource);
 		parms.m_obj = target;
@@ -822,22 +825,22 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiDoCommandButton( const CommandButton *commandButton, CommandSourceType cmdSource )
+	void aiDoCommandButton( const CommandButton *commandButton, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_COMMANDBUTTON, cmdSource);
 		parms.m_commandButton = commandButton;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiDoCommandButtonAtPosition( const CommandButton *commandButton, const Coord3D *pos, CommandSourceType cmdSource )
+	void aiDoCommandButtonAtPosition( const CommandButton *commandButton, const Coord3D *pos, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_COMMANDBUTTON_POS, cmdSource);
 		parms.m_pos = *pos;
 		parms.m_commandButton = commandButton;
 		aiDoCommand(&parms);
 	}
-	
-	inline void aiDoCommandButtonAtObject( const CommandButton *commandButton, Object *obj, CommandSourceType cmdSource )
+
+	void aiDoCommandButtonAtObject( const CommandButton *commandButton, Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_COMMANDBUTTON_OBJ, cmdSource);
 		parms.m_obj = obj;
@@ -845,27 +848,27 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiMoveAwayFromUnit( Object *obj, CommandSourceType cmdSource )
+	void aiMoveAwayFromUnit( Object *obj, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_MOVE_AWAY_FROM_UNIT, cmdSource);
 		parms.m_obj = obj;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiWander( const Waypoint *way, CommandSourceType cmdSource )
+	void aiWander( const Waypoint *way, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_WANDER, cmdSource);
 		parms.m_waypoint = way;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiWanderInPlace(CommandSourceType cmdSource)
+	void aiWanderInPlace(CommandSourceType cmdSource)
 	{
 		AICommandParms parms(AICMD_WANDER_IN_PLACE, cmdSource);
 		aiDoCommand(&parms);
 	}
 
-	inline void aiPanic( const Waypoint *way, CommandSourceType cmdSource )
+	void aiPanic( const Waypoint *way, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_PANIC, cmdSource);
 		parms.m_waypoint = way;
@@ -892,6 +895,12 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	void xfer( Xfer *xfer );
 	void loadPostProcess( void );
 
+#if !RETAIL_COMPATIBLE_AIGROUP
+	void Add_Ref() const { m_refCount.Add_Ref(); }
+	void Release_Ref() const { m_refCount.Release_Ref(destroy, this); }
+	UnsignedShort Num_Refs() const { return m_refCount.Num_Refs(); }
+#endif
+
 	void groupMoveToPosition( const Coord3D *pos, Bool addWaypoint, CommandSourceType cmdSource );
 	void groupMoveToAndEvacuate( const Coord3D *pos, CommandSourceType cmdSource );			///< move to given position(s)
 	void groupMoveToAndEvacuateAndExit( const Coord3D *pos, CommandSourceType cmdSource );			///< move to given position & unload transport.
@@ -932,7 +941,7 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	void groupAttackArea( const PolygonTrigger *areaToGuard, CommandSourceType cmdSource ); ///< guard an area
 	void groupHackInternet( CommandSourceType cmdSource );				///< Begin hacking the internet for free cash from the heavens.
 	void groupDoSpecialPower( UnsignedInt specialPowerID, UnsignedInt commandOptions );
-	void groupDoSpecialPowerAtObject( UnsignedInt specialPowerID, Object *object, UnsignedInt commandOptions ); 
+	void groupDoSpecialPowerAtObject( UnsignedInt specialPowerID, Object *object, UnsignedInt commandOptions );
 	void groupDoSpecialPowerAtLocation( UnsignedInt specialPowerID, const Coord3D *location, Real angle, const Object *object, UnsignedInt commandOptions );
 #ifdef ALLOW_SURRENDER
 	void groupSurrender( const Object *objWeSurrenderedTo, Bool surrender, CommandSourceType cmdSource );
@@ -953,7 +962,7 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	void groupOverrideSpecialPowerDestination( SpecialPowerType spType, const Coord3D *loc, CommandSourceType cmdSource );
 
 	void setAttitude( AttitudeType tude );	///< set the behavior modifier for this agent
-	AttitudeType getAttitude( void ) const;				///< get the current behavior modifier state	
+	AttitudeType getAttitude( void ) const;				///< get the current behavior modifier state
 
 	Bool isIdle() const;
 	//Definition of busy -- when explicitly in the busy state. Moving or attacking is not considered busy!
@@ -972,32 +981,34 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	Real getSpeed( void );									///< return the speed of the group's slowest member
 	Bool getCenter( Coord3D *center );				///< compute centroid of group
 	Bool getMinMaxAndCenter( Coord2D *min, Coord2D *max, Coord3D *center );
-	void computeIndividualDestination( Coord3D *dest, const Coord3D *groupDest, 
+	void computeIndividualDestination( Coord3D *dest, const Coord3D *groupDest,
 		Object *obj, const Coord3D *center, Bool isFormation ); ///< compute destination of individual object, based on group destination
 	Int getCount( void );										///< return the number of objects in the group
 	Bool isEmpty( void );										///< returns true if the group has no members
 	void queueUpgrade( const UpgradeTemplate *upgrade );	///< queue an upgrade
 
 	void add( Object *obj );								///< add object to group
-	
-	// returns true if remove destroyed the group for us.
+
+	// Returns true if the group was emptied.
 	Bool remove( Object *obj);
-	
+
+	void removeAll( void );
+
 	// If the group contains any objects not owned by ownerPlayer, return TRUE.
 	Bool containsAnyObjectsNotOwnedByPlayer( const Player *ownerPlayer );
 
-	// Remove any objects that aren't owned by the player, and return true if the group was destroyed due to emptiness
+	// Removes any objects that aren't owned by the player, and returns true if the group was emptied.
 	Bool removeAnyObjectsNotOwnedByPlayer( const Player *ownerPlayer );
-	
+
 	UnsignedInt getID( void );
-		
+
 	///< get IDs for every object in this group
 	const VecObjectID& getAllIDs ( void ) const;
 
 	void recomputeGroupSpeed() { m_dirty = true; }
 
 	void setMineClearingDetail( Bool set );
-	Bool setWeaponLockForGroup( WeaponSlotType weaponSlot, WeaponLockType lockType ); ///< Set the groups' weapon choice.  
+	Bool setWeaponLockForGroup( WeaponSlotType weaponSlot, WeaponLockType lockType ); ///< Set the groups' weapon choice.
 	void releaseWeaponLockForGroup(WeaponLockType lockType);///< Clear each guys weapon choice
 	void setWeaponSetFlag( WeaponSetType wst );
 
@@ -1016,6 +1027,13 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	friend class AI;
 	AIGroup( void );
 
+#if !RETAIL_COMPATIBLE_AIGROUP
+	static void destroy(AIGroup* self)
+	{
+		TheAI->destroyGroup(self);
+	}
+#endif
+
 	void recompute( void );									///< recompute various group info, such as speed, leader, etc
 
 	ListObjectPtr m_memberList;							///< the list of member Objects
@@ -1024,11 +1042,12 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	Real m_speed;														///< maximum speed of group (slowest member)
 	Bool m_dirty;														///< "dirty bit" - if true then group speed, leader, needs recompute
 
+#if !RETAIL_COMPATIBLE_AIGROUP
+	RefCountValue<UnsignedShort> m_refCount; ///< the reference counter
+#endif
+
 	UnsignedInt m_id;												///< the unique ID of this group
 	Path *m_groundPath;											///< Group ground path.
-	
+
 	mutable VecObjectID	m_lastRequestedIDList;			///< this is used so we can return by reference, saving a copy
 };
-
-
-#endif // _AI_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h
index 62e974b6e4c..a50a6de5f5f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h
@@ -28,13 +28,10 @@
 
 #pragma once
 
-#ifndef _AI_DOCK_H_
-#define _AI_DOCK_H_
-
 #include "Common/GameMemory.h"
 #include "GameLogic/AIStateMachine.h"
 
-/** 
+/**
  * The states of the Docking state machine.
  */
 enum
@@ -58,7 +55,7 @@ class AIDockMachine : public StateMachine
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AIDockMachine, "AIDockMachinePool" );
 
 public:
-	/** 
+	/**
 	 * The implementation of this constructor defines the states
 	 * used by this machine.
 	 */
@@ -77,12 +74,12 @@ class AIDockMachine : public StateMachine
 
 };
 
-// Please do not use these states in some other machine.  I know that wouldn't even make sense, but they 
+// Please do not use these states in some other machine.  I know that wouldn't even make sense, but they
 // cast their getMachine to an AIDock machine to store stuff across states so you'd crash.
 //-----------------------------------------------------------------------------------------------------------
 class AIDockApproachState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockApproachState, "AIDockApproachState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockApproachState, "AIDockApproachState")
 public:
 	AIDockApproachState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockApproachState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -99,7 +96,7 @@ EMPTY_DTOR(AIDockApproachState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockWaitForClearanceState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockWaitForClearanceState, "AIDockWaitForClearanceState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockWaitForClearanceState, "AIDockWaitForClearanceState")
 public:
 	AIDockWaitForClearanceState( StateMachine *machine ) : State( machine, "AIDockWaitForClearanceState" ), m_enterFrame(0) { }
 	virtual StateReturnType onEnter( void );
@@ -118,7 +115,7 @@ EMPTY_DTOR(AIDockWaitForClearanceState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockAdvancePositionState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockAdvancePositionState, "AIDockAdvancePositionState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockAdvancePositionState, "AIDockAdvancePositionState")
 public:
 	AIDockAdvancePositionState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockApproachState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -130,7 +127,7 @@ EMPTY_DTOR(AIDockAdvancePositionState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockMoveToEntryState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToEntryState, "AIDockMoveToEntryState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToEntryState, "AIDockMoveToEntryState")
 public:
 	AIDockMoveToEntryState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToEntryState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -142,7 +139,7 @@ EMPTY_DTOR(AIDockMoveToEntryState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockMoveToDockState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToDockState, "AIDockMoveToDockState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToDockState, "AIDockMoveToDockState")
 public:
 	AIDockMoveToDockState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToDockState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -154,7 +151,7 @@ EMPTY_DTOR(AIDockMoveToDockState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockMoveToRallyState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToRallyState, "AIDockMoveToRallyState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToRallyState, "AIDockMoveToRallyState")
 public:
 	AIDockMoveToRallyState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToRallyState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -166,7 +163,7 @@ EMPTY_DTOR(AIDockMoveToRallyState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockProcessDockState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockProcessDockState, "AIDockProcessDockState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockProcessDockState, "AIDockProcessDockState")
 public:
 	AIDockProcessDockState( StateMachine *machine );
 	virtual StateReturnType onEnter( void );
@@ -193,7 +190,7 @@ EMPTY_DTOR(AIDockProcessDockState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockMoveToExitState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToExitState, "AIDockMoveToExitState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockMoveToExitState, "AIDockMoveToExitState")
 public:
 	AIDockMoveToExitState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIDockMoveToExitState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -203,6 +200,3 @@ class AIDockMoveToExitState : public AIInternalMoveToState
 EMPTY_DTOR(AIDockMoveToExitState)
 
 //-----------------------------------------------------------------------------------------------------------
-
-
-#endif // _AI_DOCK_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h
index 0124cba6879..c8b0597bff3 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: AIGuard.h 
+// FILE: AIGuard.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -38,8 +38,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_AIGUARD_
-#define _H_AIGUARD_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
@@ -52,7 +50,7 @@
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 enum
 {
-	// prevent collisions with other states that we might use, (namely AI_IDLE) 
+	// prevent collisions with other states that we might use, (namely AI_IDLE)
 	AI_GUARD_INNER = 5000,					///< Attack anything within this area till death
 	AI_GUARD_IDLE,									///< Wait till something shows up to attack.
 	AI_GUARD_OUTER,									///< Attack anything within this area that has been aggressive, until the timer expires
@@ -80,8 +78,6 @@ class ExitConditions : public AttackExitConditionsInterface
 
 	ExitConditions() : m_attackGiveUpFrame(0), m_conditionsToConsider(0), m_radiusSqr(0.0f)
 	{
-		//Added By Sadullah Nader
-		// Initializations missing and needed
 		m_center.zero();
 	}
 
@@ -110,14 +106,14 @@ class AIGuardMachine : public StateMachine
 	virtual void loadPostProcess();
 
 public:
-	/** 
+	/**
 	 * The implementation of this constructor defines the states
 	 * used by this machine.
 	 */
 	AIGuardMachine( Object *owner );
 	Object* findTargetToGuardByID( void ) { return TheGameLogic->findObjectByID(m_targetToGuard); }
 	void setTargetToGuard( const Object *object ) { m_targetToGuard = object ? object->getID() : INVALID_ID; }
-	
+
 	const Coord3D *getPositionToGuard( void ) const { return &m_positionToGuard; }
 	void setTargetPositionToGuard( const Coord3D *pos) { m_positionToGuard = *pos; }
 
@@ -138,12 +134,12 @@ class AIGuardMachine : public StateMachine
 //--------------------------------------------------------------------------------------
 class AIGuardInnerState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardInnerState, "AIGuardInnerState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardInnerState, "AIGuardInnerState")
 public:
-	AIGuardInnerState( StateMachine *machine ) : State( machine, "AIGuardInner" ) 
-	{ 
-		m_attackState = 0;
-		m_enterState = 0;
+	AIGuardInnerState( StateMachine *machine ) : State( machine, "AIGuardInner" )
+	{
+		m_attackState = NULL;
+		m_enterState = NULL;
 	}
 	virtual Bool isAttack() const { return m_attackState ? m_attackState->isAttack() : FALSE; }
 	virtual StateReturnType onEnter( void );
@@ -157,16 +153,15 @@ class AIGuardInnerState : public State
 private:
 	AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); }
 
-	ExitConditions m_exitConditions; 
+	ExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 	AIEnterState *m_enterState;
 };
-EMPTY_DTOR(AIGuardInnerState)
 
 //--------------------------------------------------------------------------------------
 class AIGuardIdleState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardIdleState, "AIGuardIdleState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardIdleState, "AIGuardIdleState")
 public:
 	AIGuardIdleState( StateMachine *machine ) : State( machine, "AIGuardIdleState" ) { }
 	virtual Bool isAttack() const { return FALSE; }
@@ -190,9 +185,9 @@ EMPTY_DTOR(AIGuardIdleState)
 //--------------------------------------------------------------------------------------
 class AIGuardOuterState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardOuterState, "AIGuardOuterState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardOuterState, "AIGuardOuterState")
 public:
-	AIGuardOuterState( StateMachine *machine ) : State( machine, "AIGuardOuter" ) 
+	AIGuardOuterState( StateMachine *machine ) : State( machine, "AIGuardOuter" )
 	{
 		m_attackState = NULL;
 	}
@@ -208,19 +203,18 @@ class AIGuardOuterState : public State
 private:
 	AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); }
 
-	ExitConditions m_exitConditions; 
+	ExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 };
-EMPTY_DTOR(AIGuardOuterState)
 
 //--------------------------------------------------------------------------------------
 class AIGuardReturnState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardReturnState, "AIGuardReturnState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardReturnState, "AIGuardReturnState")
 private:
 	AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); }
 public:
-	AIGuardReturnState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIGuardReturn" ) 
+	AIGuardReturnState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIGuardReturn" )
 	{
 		m_nextReturnScanTime = 0;
 	}
@@ -242,7 +236,7 @@ EMPTY_DTOR(AIGuardReturnState)
 //--------------------------------------------------------------------------------------
 class AIGuardPickUpCrateState : public AIPickUpCrateState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardPickUpCrateState, "AIGuardPickUpCrateState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardPickUpCrateState, "AIGuardPickUpCrateState")
 public:
 	AIGuardPickUpCrateState( StateMachine *machine );
 	virtual Bool isAttack() const { return FALSE; }
@@ -255,7 +249,7 @@ EMPTY_DTOR(AIGuardPickUpCrateState)
 //--------------------------------------------------------------------------------------
 class AIGuardAttackAggressorState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardAttackAggressorState, "AIGuardAttackAggressorState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardAttackAggressorState, "AIGuardAttackAggressorState")
 public:
 	AIGuardAttackAggressorState( StateMachine *machine );
 	virtual Bool isAttack() const { return m_attackState ? m_attackState->isAttack() : FALSE; }
@@ -269,12 +263,8 @@ class AIGuardAttackAggressorState : public State
 	virtual void loadPostProcess();
 private:
 	AIGuardMachine* getGuardMachine() { return (AIGuardMachine*)getMachine(); }
-	ExitConditions m_exitConditions; 
+	ExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 };
 
-EMPTY_DTOR(AIGuardAttackAggressorState)
-
 //--------------------------------------------------------------------------------------
-
-#endif /* _H_AIGUARD_ */
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h
index 292d95568e4..cc889280cda 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: AIGuardRetaliate.h 
+// FILE: AIGuardRetaliate.h
 /*---------------------------------------------------------------------------*/
 /* Electronic Arts Los Angeles                                               */
 /* Confidential Information	                                                 */
@@ -36,8 +36,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef __AI_GUARD_RETALIATION_H
-#define __AI_GUARD_RETALIATION_H
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
@@ -50,7 +48,7 @@
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 enum
 {
-	// prevent collisions with other states that we might use, (namely AI_IDLE) 
+	// prevent collisions with other states that we might use, (namely AI_IDLE)
 	AI_GUARD_RETALIATE_INNER = 5000,					///< Attack anything within this area till death
 	AI_GUARD_RETALIATE_IDLE,									///< Wait till something shows up to attack.
 	AI_GUARD_RETALIATE_OUTER,									///< Attack anything within this area that has been aggressive, until the timer expires
@@ -78,8 +76,6 @@ class GuardRetaliateExitConditions : public AttackExitConditionsInterface
 
 	GuardRetaliateExitConditions() : m_attackGiveUpFrame(0), m_conditionsToConsider(0), m_radiusSqr(0.0f)
 	{
-		//Added By Sadullah Nader
-		// Initializations missing and needed
 		m_center.zero();
 	}
 
@@ -105,12 +101,12 @@ class AIGuardRetaliateMachine : public StateMachine
 	virtual void loadPostProcess();
 
 public:
-	/** 
+	/**
 	 * The implementation of this constructor defines the states
 	 * used by this machine.
 	 */
 	AIGuardRetaliateMachine( Object *owner );
-	
+
 	virtual Bool isIdle() const;
 
 	const Coord3D *getPositionToGuard( void ) const { return &m_positionToGuard; }
@@ -127,10 +123,10 @@ class AIGuardRetaliateMachine : public StateMachine
 //--------------------------------------------------------------------------------------
 class AIGuardRetaliateInnerState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateInnerState, "AIGuardRetaliateInnerState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateInnerState, "AIGuardRetaliateInnerState")
 public:
-	AIGuardRetaliateInnerState( StateMachine *machine ) : State( machine, "AIGuardRetaliateInner" ) 
-	{ 
+	AIGuardRetaliateInnerState( StateMachine *machine ) : State( machine, "AIGuardRetaliateInner" )
+	{
 		m_attackState = 0;
 		m_enterState = 0;
 	}
@@ -145,16 +141,15 @@ class AIGuardRetaliateInnerState : public State
 private:
 	AIGuardRetaliateMachine* getGuardMachine() { return (AIGuardRetaliateMachine*)getMachine(); }
 
-	GuardRetaliateExitConditions m_exitConditions; 
+	GuardRetaliateExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 	AIEnterState *m_enterState;
 };
-EMPTY_DTOR(AIGuardRetaliateInnerState)
 
 //--------------------------------------------------------------------------------------
 class AIGuardRetaliateIdleState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateIdleState, "AIGuardRetaliateIdleState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateIdleState, "AIGuardRetaliateIdleState")
 public:
 	AIGuardRetaliateIdleState( StateMachine *machine ) : State( machine, "AIGuardRetaliateIdleState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -176,9 +171,9 @@ EMPTY_DTOR(AIGuardRetaliateIdleState)
 //--------------------------------------------------------------------------------------
 class AIGuardRetaliateOuterState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateOuterState, "AIGuardRetaliateOuterState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateOuterState, "AIGuardRetaliateOuterState")
 public:
-	AIGuardRetaliateOuterState( StateMachine *machine ) : State( machine, "AIGuardRetaliateOuter" ) 
+	AIGuardRetaliateOuterState( StateMachine *machine ) : State( machine, "AIGuardRetaliateOuter" )
 	{
 		m_attackState = NULL;
 	}
@@ -193,19 +188,18 @@ class AIGuardRetaliateOuterState : public State
 private:
 	AIGuardRetaliateMachine* getGuardMachine() { return (AIGuardRetaliateMachine*)getMachine(); }
 
-	GuardRetaliateExitConditions m_exitConditions; 
+	GuardRetaliateExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 };
-EMPTY_DTOR(AIGuardRetaliateOuterState)
 
 //--------------------------------------------------------------------------------------
 class AIGuardRetaliateReturnState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateReturnState, "AIGuardRetaliateReturnState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateReturnState, "AIGuardRetaliateReturnState")
 private:
 	AIGuardRetaliateMachine* getGuardMachine() { return (AIGuardRetaliateMachine*)getMachine(); }
 public:
-	AIGuardRetaliateReturnState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIGuardRetaliateReturn" ) 
+	AIGuardRetaliateReturnState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIGuardRetaliateReturn" )
 	{
 		m_nextReturnScanTime = 0;
 	}
@@ -226,7 +220,7 @@ EMPTY_DTOR(AIGuardRetaliateReturnState)
 //--------------------------------------------------------------------------------------
 class AIGuardRetaliatePickUpCrateState : public AIPickUpCrateState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliatePickUpCrateState, "AIGuardRetaliatePickUpCrateState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliatePickUpCrateState, "AIGuardRetaliatePickUpCrateState")
 public:
 	AIGuardRetaliatePickUpCrateState( StateMachine *machine );
 	virtual StateReturnType onEnter( void );
@@ -238,7 +232,7 @@ EMPTY_DTOR(AIGuardRetaliatePickUpCrateState)
 //--------------------------------------------------------------------------------------
 class AIGuardRetaliateAttackAggressorState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateAttackAggressorState, "AIGuardRetaliateAttackAggressorState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateAttackAggressorState, "AIGuardRetaliateAttackAggressorState")
 public:
 	AIGuardRetaliateAttackAggressorState( StateMachine *machine );
 	virtual StateReturnType onEnter( void );
@@ -254,12 +248,8 @@ class AIGuardRetaliateAttackAggressorState : public State
 	virtual void loadPostProcess();
 private:
 	AIGuardRetaliateMachine* getGuardMachine() { return (AIGuardRetaliateMachine*)getMachine(); }
-	GuardRetaliateExitConditions m_exitConditions; 
+	GuardRetaliateExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 };
 
-EMPTY_DTOR(AIGuardRetaliateAttackAggressorState)
-
 //--------------------------------------------------------------------------------------
-
-#endif 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h
index 44d275df887..a76f26cc521 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _PATHFIND_H_
-#define _PATHFIND_H_												 
-
 #include "Common/GameType.h"
 #include "Common/GameMemory.h"
 #include "Common/Snapshot.h"
@@ -82,21 +79,21 @@ class PathNode : public MemoryPoolObject
 	void setNextOptimized( PathNode *node );
 
 	PathNode *getNextOptimized(Coord2D* dir = NULL, Real* dist = NULL)  	///< return next node in optimized path
-	{ 
+	{
 		if (dir)
 			*dir = m_nextOptiDirNorm2D;
 		if (dist)
 			*dist = m_nextOptiDist2D;
-		return m_nextOpti; 
+		return m_nextOpti;
 	}
 
 	const PathNode *getNextOptimized(Coord2D* dir = NULL, Real* dist = NULL) const  	///< return next node in optimized path
-	{ 
+	{
 		if (dir)
 			*dir = m_nextOptiDirNorm2D;
 		if (dist)
 			*dist = m_nextOptiDist2D;
-		return m_nextOpti; 
+		return m_nextOpti;
 	}
 
 	void setCanOptimize(Bool canOpt) { m_canOptimize = canOpt;}
@@ -108,10 +105,10 @@ class PathNode : public MemoryPoolObject
 	/// given a list, append this node, return new list.  slow implementation.
 	/// @todo optimize this
 	PathNode *appendToList( PathNode *list );
-	
+
 	/// given a node, append to this node
 	void append( PathNode *list );
-	
+
 public:
 	mutable Int					m_id; // Used in Path::xfer() to save & recreate the path list.
 
@@ -130,7 +127,7 @@ class PathNode : public MemoryPoolObject
 
 };
 
-// this doesn't actually seem to be a particularly useful win, 
+// this doesn't actually seem to be a particularly useful win,
 // performance-wise, so I didn't enable it. (srj)
 #define NO_CPOP_STARTS_FROM_PREV_SEG
 
@@ -148,7 +145,7 @@ class Path : public MemoryPoolObject, public Snapshot
 {
 public:
 	Path();
-	
+
 	PathNode *getFirstNode( void ) { return m_path; }
 	PathNode *getLastNode( void ) { return m_pathTail; }
 
@@ -208,6 +205,9 @@ class PathfindCellInfo
 {
 	friend class PathfindCell;
 public:
+#if RETAIL_COMPATIBLE_PATHFINDING
+	static void forceCleanPathFindCellInfos(void);
+#endif
 	static void allocateCellInfos(void);
 	static void releaseCellInfos(void);
 
@@ -216,7 +216,7 @@ class PathfindCellInfo
 
 protected:
 	static PathfindCellInfo *s_infoArray;
-	static PathfindCellInfo *s_firstFree;							///< 
+	static PathfindCellInfo *s_firstFree;							///<
 
 
 	PathfindCellInfo *m_nextOpen, *m_prevOpen;						///< for A* "open" list, shared by closed list
@@ -228,13 +228,13 @@ class PathfindCellInfo
 
 	/// have to include cell's coordinates, since cells are often accessed via pointer only
 	ICoord2D m_pos;
-	
+
 	ObjectID m_goalUnitID; ///< The objectID of the ground unit whose goal this is.
 	ObjectID m_posUnitID;  ///< The objectID of the ground unit that is occupying this cell.
 	ObjectID m_goalAircraftID; ///< The objectID of the aircraft whose goal this is.
 
 	ObjectID m_obstacleID;	///< the object ID who overlaps this cell
-	
+
 	UnsignedInt m_isFree:1;
 	UnsignedInt m_blockedByAlly:1;///< True if this cell is blocked by an allied unit.
 	UnsignedInt m_obstacleIsFence:1;///< True if occupied by a fence.
@@ -301,22 +301,22 @@ class PathfindCell
 	UnsignedInt costSoFar( PathfindCell *parent );
 
 	/// put self on "open" list in ascending cost order, return new list
-	PathfindCell *putOnSortedOpenList( PathfindCell *list );		
+	PathfindCell *putOnSortedOpenList( PathfindCell *list );
 
 	/// remove self from "open" list
-	PathfindCell *removeFromOpenList( PathfindCell *list );		
+	PathfindCell *removeFromOpenList( PathfindCell *list );
 
 	/// put self on "closed" list, return new list
-	PathfindCell *putOnClosedList( PathfindCell *list );		
+	PathfindCell *putOnClosedList( PathfindCell *list );
 
 	/// remove self from "closed" list
-	PathfindCell *removeFromClosedList( PathfindCell *list );	
+	PathfindCell *removeFromClosedList( PathfindCell *list );
 
 	/// remove all cells from closed list.
-	static Int releaseClosedList( PathfindCell *list );	
+	static Int releaseClosedList( PathfindCell *list );
 
 	/// remove all cells from closed list.
-	static Int releaseOpenList( PathfindCell *list );	
+	static Int releaseOpenList( PathfindCell *list );
 
 	inline PathfindCell *getNextOpen(void) {return m_info->m_nextOpen?m_info->m_nextOpen->m_cell:NULL;}
 
@@ -339,7 +339,7 @@ class PathfindCell
 	void setParentCellHierarchical(PathfindCell* parent);
 	inline PathfindCell* getParentCell(void) const {return m_info ? m_info->m_pathParent ? m_info->m_pathParent->m_cell : NULL : NULL;}
 
-	Bool startPathfind( PathfindCell *goalCell ); 
+	Bool startPathfind( PathfindCell *goalCell );
 	Bool getPinched(void) const {return m_pinched;}
 	void setPinched(Bool pinch) {m_pinched = pinch;	}
 
@@ -353,7 +353,7 @@ class PathfindCell
 	void setPosUnit(ObjectID unit, const ICoord2D &pos );
 	inline ObjectID getGoalUnit(void) const {ObjectID id = m_info?m_info->m_goalUnitID:INVALID_ID; return id;}
 	inline ObjectID getGoalAircraft(void) const {ObjectID id = m_info?m_info->m_goalAircraftID:INVALID_ID; return id;}
-	inline ObjectID getPosUnit(void) const {ObjectID id = m_info?m_info->m_posUnitID:INVALID_ID; return id;}	
+	inline ObjectID getPosUnit(void) const {ObjectID id = m_info?m_info->m_posUnitID:INVALID_ID; return id;}
 
 	inline ObjectID getObstacleID(void) const {ObjectID id = m_info?m_info->m_obstacleID:INVALID_ID; return id;}
 
@@ -369,7 +369,7 @@ class PathfindCell
 														// you still may be able to if you can cross multiple terrain types.
 	UnsignedShort m_aircraftGoal:1; //< This is an aircraft goal cell.
 	UnsignedShort m_pinched:1; //< This cell is surrounded by obstacle cells.
-	UnsignedByte m_type:4;			///< what type of cell terrain this is.  
+	UnsignedByte m_type:4;			///< what type of cell terrain this is.
 	UnsignedByte m_flags:4;			///< what type of units are in or moving through this cell.
 	UnsignedByte m_connectsToLayer:4;	///< This cell can pathfind onto this layer, if > LAYER_TOP.
   UnsignedByte m_layer:4;					 ///< Layer of this cell.
@@ -410,7 +410,7 @@ class PathfindLayer
 	Bool connectsZones(PathfindZoneManager *zm, const LocomotorSet& locomotorSet,Int zone1, Int zone2);
 	Bool isPointOnWall(ObjectID *wallPieces, Int numPieces, const Coord3D *pt);
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	void doDebugIcons(void) ;
 #endif
 protected:
@@ -443,20 +443,20 @@ enum { PATHFIND_QUEUE_LEN=512};
 
 struct TCheckMovementInfo;
 
-/** 
- * This class is a helper class for zone manager.  It maintains information regarding the 
- * LocomotorSurfaceTypeMask equivalencies within a ZONE_BLOCK_SIZE x ZONE_BLOCK_SIZE area of 
- * cells.  This is used in hierarchical pathfinding to find the best coarse path at the 
+/**
+ * This class is a helper class for zone manager.  It maintains information regarding the
+ * LocomotorSurfaceTypeMask equivalencies within a ZONE_BLOCK_SIZE x ZONE_BLOCK_SIZE area of
+ * cells.  This is used in hierarchical pathfinding to find the best coarse path at the
  * block level.
  */
 class ZoneBlock
 {
-public: 
+public:
 
 	ZoneBlock();
 	~ZoneBlock();  // not virtual, please don't override without making virtual.  jba.
 
-	void blockCalculateZones(	PathfindCell **map, PathfindLayer layers[], const IRegion2D &bounds);	///< Does zone calculations.  
+	void blockCalculateZones(	PathfindCell **map, PathfindLayer layers[], const IRegion2D &bounds);	///< Does zone calculations.
 	zoneStorageType getEffectiveZone(LocomotorSurfaceTypeMask acceptableSurfaces, Bool crusher, zoneStorageType zone) const;
 
 	void clearMarkedPassable(void) {m_markedPassable = false;}
@@ -474,7 +474,7 @@ class ZoneBlock
 	ICoord2D		m_cellOrigin;
 
 	zoneStorageType m_firstZone; // First zone in this block.
-	UnsignedShort m_numZones;	 // Number of zones in this block.  If == 1, there is only one zone, and 
+	UnsignedShort m_numZones;	 // Number of zones in this block.  If == 1, there is only one zone, and
 														 // no zone equivalency arrays will be allocated.
 
 
@@ -490,17 +490,17 @@ typedef ZoneBlock *ZoneBlockP;
 
 /**
  * This class manages the zones in the map.  A zone is an area in the map that
- * is one contiguous type of terrain (clear, cliff, water, building).  If 
- * a unit is in a zone, and wants to move to another location, the destination 
+ * is one contiguous type of terrain (clear, cliff, water, building).  If
+ * a unit is in a zone, and wants to move to another location, the destination
  * zone has to be the same, or it can't get there.
- * There are equivalency tables for meta-zones.  For example, an amphibious craft can 
- * travel through water and clear cells. 
+ * There are equivalency tables for meta-zones.  For example, an amphibious craft can
+ * travel through water and clear cells.
  */
 class PathfindZoneManager
 {
 public:
 	enum {INITIAL_ZONES = 256};
-	enum {ZONE_BLOCK_SIZE = 10};	// Zones are calculated in blocks of 20x20.  This way, the raw zone numbers can be used to 
+	enum {ZONE_BLOCK_SIZE = 10};	// Zones are calculated in blocks of 20x20.  This way, the raw zone numbers can be used to
 	enum {UNINITIALIZED_ZONE = 0};
 																// compute hierarchically between the 20x20 blocks of cells. jba.
 	PathfindZoneManager();
@@ -511,7 +511,7 @@ class PathfindZoneManager
 	Bool needToCalculateZones(void) const {return m_nextFrameToCalculateZones <= TheGameLogic->getFrame() ;} ///< Returns true if the zones need to be recalculated.
  	void markZonesDirty( Bool insert ) ; ///< Called when the zones need to be recalculated.
  	void updateZonesForModify( PathfindCell **map,  PathfindLayer layers[], const IRegion2D &structureBounds, const IRegion2D &globalBounds ) ; ///< Called to recalculate an area when a structure has been removed.
-	void calculateZones(	PathfindCell **map, PathfindLayer layers[], const IRegion2D &bounds);	///< Does zone calculations.  
+	void calculateZones(	PathfindCell **map, PathfindLayer layers[], const IRegion2D &bounds);	///< Does zone calculations.
 	zoneStorageType getEffectiveZone(LocomotorSurfaceTypeMask acceptableSurfaces, Bool crusher, zoneStorageType zone) const;
 	zoneStorageType getEffectiveTerrainZone(zoneStorageType zone) const;
 
@@ -531,7 +531,7 @@ class PathfindZoneManager
 	void setAllPassable(void);
 
 	void setBridge(Int cellX, Int cellY, Bool bridge);
-	Bool interactsWithBridge(Int cellX, Int cellY) const; 
+	Bool interactsWithBridge(Int cellX, Int cellY) const;
 
 private:
 	void allocateZones(void);
@@ -554,35 +554,35 @@ class PathfindZoneManager
 	zoneStorageType *m_hierarchicalZones;
 };
 
-/** 
+/**
  * The pathfinding services interface provides access to the 3 expensive path find calls:
  * findPath, findClosestPath, and findAttackPath.
  * It is only available to units when their ai interface doPathfind method is called.
- * This allows the pathfinder to spread out the pathfinding over a number of frames 
+ * This allows the pathfinder to spread out the pathfinding over a number of frames
  * when a lot of units are trying to pathfind all at the same time.
  */
 class PathfindServicesInterface {
 public:
-	virtual Path *findPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, 
+	virtual Path *findPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 		const Coord3D *to )=0;	///< Find a short, valid path between given locations
 	/** Find a short, valid path to a location NEAR the to location.
 		This succeds when the destination is unreachable (like inside a building).
 		If the destination is unreachable, it will adjust the to point.  */
 	virtual Path *findClosestPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
-		Coord3D *to, Bool blocked, Real pathCostMultiplier, Bool moveAllies )=0;	
+		Coord3D *to, Bool blocked, Real pathCostMultiplier, Bool moveAllies )=0;
 
 	/** Find a short, valid path to a location that obj can attack victim from.  */
 	virtual Path *findAttackPath( const Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
-		const Object *victim, const Coord3D* victimPos, const Weapon *weapon )=0;	
+		const Object *victim, const Coord3D* victimPos, const Weapon *weapon )=0;
 
-	/** Patch to the exiting path from the current position, either because we became blocked, 
+	/** Patch to the exiting path from the current position, either because we became blocked,
   or because we had to move off the path to avoid other units. */
-	virtual Path *patchPath( const Object *obj, const LocomotorSet& locomotorSet, 
+	virtual Path *patchPath( const Object *obj, const LocomotorSet& locomotorSet,
 		Path *originalPath, Bool blocked ) = 0;
 
 	/** Find a short, valid path to a location that is away from the repulsors.  */
-	virtual Path *findSafePath( const Object *obj, const LocomotorSet& locomotorSet, 
-		const Coord3D *from, const Coord3D* repulsorPos1, const Coord3D* repulsorPos2, Real repulsorRadius ) = 0;	
+	virtual Path *findSafePath( const Object *obj, const LocomotorSet& locomotorSet,
+		const Coord3D *from, const Coord3D* repulsorPos1, const Coord3D* repulsorPos2, Real repulsorRadius ) = 0;
 
 };
 
@@ -598,19 +598,19 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 		This succeds when the destination is unreachable (like inside a building).
 		If the destination is unreachable, it will adjust the to point.  */
 	virtual Path *findClosestPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
-		Coord3D *to, Bool blocked, Real pathCostMultiplier, Bool moveAllies );	
+		Coord3D *to, Bool blocked, Real pathCostMultiplier, Bool moveAllies );
 
 	/** Find a short, valid path to a location that obj can attack victim from.  */
 	virtual Path *findAttackPath( const Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
-		const Object *victim, const Coord3D* victimPos, const Weapon *weapon );	
+		const Object *victim, const Coord3D* victimPos, const Weapon *weapon );
 
 	/** Find a short, valid path to a location that is away from the repulsors.  */
-	virtual Path *findSafePath( const Object *obj, const LocomotorSet& locomotorSet, 
-		const Coord3D *from, const Coord3D* repulsorPos1, const Coord3D* repulsorPos2, Real repulsorRadius );	
+	virtual Path *findSafePath( const Object *obj, const LocomotorSet& locomotorSet,
+		const Coord3D *from, const Coord3D* repulsorPos1, const Coord3D* repulsorPos2, Real repulsorRadius );
 
-	/** Patch to the exiting path from the current position, either because we became blocked, 
+	/** Patch to the exiting path from the current position, either because we became blocked,
   or because we had to move off the path to avoid other units. */
-	virtual Path *patchPath( const Object *obj, const LocomotorSet& locomotorSet, 
+	virtual Path *patchPath( const Object *obj, const LocomotorSet& locomotorSet,
 		Path *originalPath, Bool blocked );
 
 public:
@@ -626,7 +626,7 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 
 	Bool clientSafeQuickDoesPathExist( const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to );  ///< Can we build any path at all between the locations	(terrain & buildings check - fast)
 	Bool clientSafeQuickDoesPathExistForUI( const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to );  ///< Can we build any path at all between the locations	(terrain onlyk - fast)
-	Bool slowDoesPathExist( Object *obj, const Coord3D *from, 
+	Bool slowDoesPathExist( Object *obj, const Coord3D *from,
 		const Coord3D *to, ObjectID ignoreObject=INVALID_ID );  ///< Can we build any path at all between the locations	(terrain, buildings & units check - slower)
 
 	Bool queueForPath(ObjectID id);	 ///< The object wants to request a pathfind, so put it on the list to process.
@@ -634,7 +634,7 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 	void forceMapRecalculation( );	///< Force pathfind map recomputation. If region is given, only that area is recomputed
 
 	/** Returns an aircraft path to the goal.  */
-	Path *getAircraftPath( const Object *obj, const Coord3D *to); 
+	Path *getAircraftPath( const Object *obj, const Coord3D *to);
 	Path *findGroundPath( const Coord3D *from, const Coord3D *to, Int pathRadius,
 		Bool crusher);	///< Find a short, valid path of the desired width on the ground.
 
@@ -670,7 +670,7 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 	Bool worldToCell( const Coord3D *pos, ICoord2D *cell );	///< Given a world position, return grid cell coordinate
 
 	const ICoord2D *getExtent(void) const {return &m_extent.hi;}
-	
+
 	void setIgnoreObstacleID( ObjectID objID );					///< if non-zero, the pathfinder will ignore the given obstacle
 
 	Bool validMovementPosition( Bool isCrusher, LocomotorSurfaceTypeMask acceptableSurfaces, PathfindCell *toCell, PathfindCell *fromCell = NULL );		///< Return true if given position is a valid movement location
@@ -684,13 +684,13 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 
 	Bool isAttackViewBlockedByObstacle(const Object* obj, const Coord3D& attackerPos,  const Object* victim, const Coord3D& victimPos);	///< Return true if the straight line between the given points contains any obstacle, and thus blocks vision
 
-	Bool isLinePassable( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces, 
-		PathfindLayerEnum layer, const Coord3D& startWorld, const Coord3D& endWorld, 
+	Bool isLinePassable( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces,
+		PathfindLayerEnum layer, const Coord3D& startWorld, const Coord3D& endWorld,
 		Bool blocked, Bool allowPinched );	///< Return true if the straight line between the given points is passable
 
-	void moveAlliesAwayFromDestination( Object *obj,const Coord3D& destination);	
+	void moveAlliesAwayFromDestination( Object *obj,const Coord3D& destination);
 
-	Bool isGroundPathPassable( Bool isCrusher, const Coord3D& startWorld, PathfindLayerEnum startLayer, 
+	Bool isGroundPathPassable( Bool isCrusher, const Coord3D& startWorld, PathfindLayerEnum startLayer,
 		const Coord3D& endWorld, Int pathDiameter);	///< Return true if the straight line between the given points is passable
 
 	// for debugging
@@ -699,17 +699,20 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 	Path *getDebugPath( void );
 	void setDebugPath( Path *debugpath );
 
+#if RETAIL_COMPATIBLE_PATHFINDING
+	void forceCleanCells(void);
+#endif
 	void cleanOpenAndClosedLists(void);
 
 	// Adjusts the destination to a spot near dest that is not occupied by other units.
-	Bool adjustDestination(Object *obj, const LocomotorSet& locomotorSet, 
+	Bool adjustDestination(Object *obj, const LocomotorSet& locomotorSet,
 		Coord3D *dest, const Coord3D *groupDest=NULL);
 
 	// Adjusts the destination to a spot near dest for landing that is not occupied by other units.
 	Bool adjustToLandingDestination(Object *obj, Coord3D *dest);
 
 	// Adjusts the destination to a spot that can attack target that is not occupied by other units.
-	Bool adjustTargetDestination(const Object *obj, const Object *target, const Coord3D *targetPos, 
+	Bool adjustTargetDestination(const Object *obj, const Object *target, const Coord3D *targetPos,
 		const Weapon *weapon, Coord3D *dest);
 
 	// Adjusts destination to a spot near dest that is possible to path to.
@@ -733,56 +736,56 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 
 protected:
 	virtual Path *internalFindPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to);	///< Find a short, valid path between given locations
-	Path *findHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to, Bool crusher);	
-	Path *findClosestHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to, Bool crusher);	
-	Path *internal_findHierarchicalPath( Bool isHuman, const LocomotorSurfaceTypeMask locomotorSurface, const Coord3D *from, const Coord3D *to, Bool crusher, Bool closestOK);	
+	Path *findHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to, Bool crusher);
+	Path *findClosestHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from, const Coord3D *to, Bool crusher);
+	Path *internal_findHierarchicalPath( Bool isHuman, const LocomotorSurfaceTypeMask locomotorSurface, const Coord3D *from, const Coord3D *to, Bool crusher, Bool closestOK);
 	void processHierarchicalCell( const ICoord2D &scanCell, const ICoord2D &deltaPathfindCell,
-																PathfindCell *parentCell, 
-																PathfindCell *goalCell, zoneStorageType parentZone, 
+																PathfindCell *parentCell,
+																PathfindCell *goalCell, zoneStorageType parentZone,
 																zoneStorageType *examinedZones, Int &numExZones,
 																Bool crusher, Int &cellCount);
-	Bool checkForAdjust(Object *, const LocomotorSet& locomotorSet, Bool isHuman, Int cellX, Int cellY, 
+	Bool checkForAdjust(Object *, const LocomotorSet& locomotorSet, Bool isHuman, Int cellX, Int cellY,
 		PathfindLayerEnum layer, Int iRadius, Bool center,Coord3D *dest, const Coord3D *groupDest) ;
-	Bool checkForLanding(Int cellX, Int cellY, 
+	Bool checkForLanding(Int cellX, Int cellY,
 		PathfindLayerEnum layer, Int iRadius, Bool center,Coord3D *dest) ;
 	Bool checkForTarget(const Object *obj, 	Int cellX, Int cellY, const Weapon *weapon,
 																const Object *victim, const Coord3D *victimPos,
 																Int iRadius, Bool center,Coord3D *dest) ;
-	Bool checkForPossible(Bool isCrusher, Int fromZone,  Bool center, const LocomotorSet& locomotorSet, 
+	Bool checkForPossible(Bool isCrusher, Int fromZone,  Bool center, const LocomotorSet& locomotorSet,
 		Int cellX, Int cellY, PathfindLayerEnum layer, Coord3D *dest, Bool startingInObstacle) ;
 	void getRadiusAndCenter(const Object *obj, Int &iRadius, Bool &center);
 	void adjustCoordToCell(Int cellX, Int cellY, Bool centerInCell, Coord3D &pos, PathfindLayerEnum layer);
 	Bool checkDestination(const Object *obj, Int cellX, Int cellY, PathfindLayerEnum layer, Int iRadius, Bool centerInCell);
 	Bool checkForMovement(const Object *obj, TCheckMovementInfo &info);
-	Bool segmentIntersectsTallBuilding(const PathNode *curNode, PathNode *nextNode,  
+	Bool segmentIntersectsTallBuilding(const PathNode *curNode, PathNode *nextNode,
 		ObjectID ignoreBuilding, Coord3D *insertPos1, Coord3D *insertPos2, Coord3D *insertPos3);	///< Return true if the straight line between the given points intersects a tall building.
 	Bool circleClipsTallBuilding(const Coord3D *from, const Coord3D *to, Real radius, ObjectID ignoreBuilding, Coord3D *adjustTo);	///< Return true if the circle at the end of the line between the given points intersects a tall building.
 
 	enum {NO_ATTACK=0};
 	Int examineNeighboringCells(PathfindCell *parentCell, PathfindCell *goalCell,
-										const LocomotorSet& locomotorSet, Bool isHumanPlayer, 
+										const LocomotorSet& locomotorSet, Bool isHumanPlayer,
 										Bool centerInCell, Int radius, const ICoord2D &startCellNdx,
 										const Object *obj, Int attackDistance);
 
- 	Bool pathDestination( Object *obj, const LocomotorSet& locomotorSet, Coord3D *dest, 
+ 	Bool pathDestination( Object *obj, const LocomotorSet& locomotorSet, Coord3D *dest,
 		PathfindLayerEnum layer, const Coord3D *groupDest);	///< Checks cost between given locations
 
-	Int checkPathCost(Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, 
+	Int checkPathCost(Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 		const Coord3D *to);
 
-	void tightenPath(Object *obj, const LocomotorSet& locomotorSet, Coord3D *from, 
+	void tightenPath(Object *obj, const LocomotorSet& locomotorSet, Coord3D *from,
 		const Coord3D *to);
 
 	/**
-		return 0 to continue iterating the line, nonzero to terminate the iteration. 
+		return 0 to continue iterating the line, nonzero to terminate the iteration.
 		the nonzero result will be returned as the result of iterateCellsAlongLine().
 		iterateCellsAlongLine will return zero if it completes.
 	*/
 	typedef Int (*CellAlongLineProc)(Pathfinder* pathfinder, PathfindCell* from, PathfindCell* to, Int to_x, Int to_y, void* userData);
-	Int iterateCellsAlongLine(const Coord3D& startWorld, const Coord3D& endWorld, 
+	Int iterateCellsAlongLine(const Coord3D& startWorld, const Coord3D& endWorld,
 		PathfindLayerEnum layer, CellAlongLineProc proc, void* userData);
 
-	Int iterateCellsAlongLine(const ICoord2D &start, const ICoord2D &end, 
+	Int iterateCellsAlongLine(const ICoord2D &start, const ICoord2D &end,
 		PathfindLayerEnum layer, CellAlongLineProc proc, void* userData);
 
 	static Int linePassableCallback(Pathfinder* pathfinder, PathfindCell* from, PathfindCell* to, Int to_x, Int to_y, void* userData);
@@ -798,10 +801,10 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 
 	void classifyMap( void );					///< Classify all cells in grid as obstacles, etc
 	void classifyObjectFootprint( Object *obj, Bool insert );	/** Classify the cells under the given object
-																																If 'insert' is true, object is being added 
+																																If 'insert' is true, object is being added
 																																If 'insert' is false, object is being removed */
 	void internal_classifyObjectFootprint( Object *obj, Bool insert );	/** Classify the cells under the given object
-																																If 'insert' is true, object is being added 
+																																If 'insert' is true, object is being added
 																																If 'insert' is false, object is being removed */
 	void classifyFence( Object *obj, Bool insert );	/** Classify the cells under the given fence object. */
 	void classifyUnitFootprint( Object *obj, Bool insert, Bool remove, Bool update );	/** Classify the cells under the given object If 'insert' is true, object is being added */
@@ -809,17 +812,17 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 	void worldToGrid( const Coord3D *pos, ICoord2D *cellIndex );
 
 	Bool evaluateCell(PathfindCell* newCell, PathfindCell *parentCell,
-									const LocomotorSet& locomotorSet, 
-									 Bool centerInCell, Int radius, 
+									const LocomotorSet& locomotorSet,
+									 Bool centerInCell, Int radius,
 									 const Object *obj, Int attackDistance);
 
-	Path *buildActualPath( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces, 
+	Path *buildActualPath( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces,
 		const Coord3D *fromPos, PathfindCell *goalCell, Bool center, Bool blocked );	///< Work backwards from goal cell to construct final path
-	Path *buildGroundPath( Bool isCrusher,const Coord3D *fromPos, PathfindCell *goalCell, 
+	Path *buildGroundPath( Bool isCrusher,const Coord3D *fromPos, PathfindCell *goalCell,
 		Bool center, Int pathDiameter );	///< Work backwards from goal cell to construct final path
 	Path *buildHierachicalPath( const Coord3D *fromPos, PathfindCell *goalCell);	///< Work backwards from goal cell to construct final path
 
-	void  prependCells( Path *path, const Coord3D *fromPos, 
+	void  prependCells( Path *path, const Coord3D *fromPos,
 																	PathfindCell *goalCell, Bool center ); ///< Add pathfind cells to a path.
 
 	void debugShowSearch( Bool pathFound );				///< Show all cells touched in the last search
@@ -827,7 +830,9 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 
 	void checkChangeLayers(PathfindCell *parentCell);
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+	bool checkCellOutsideExtents(ICoord2D& cell);
+
+#if defined(RTS_DEBUG)
 	void doDebugIcons(void) ;
 #endif
 
@@ -875,10 +880,10 @@ inline void Pathfinder::setIgnoreObstacleID( ObjectID objID )
 	m_ignoreObstacleID = objID;
 }
 
-inline void Pathfinder::worldToGrid( const Coord3D *pos, ICoord2D *cellIndex ) 
-{ 
-	cellIndex->x = REAL_TO_INT(pos->x/PATHFIND_CELL_SIZE); 
-	cellIndex->y = REAL_TO_INT(pos->y/PATHFIND_CELL_SIZE); 
+inline void Pathfinder::worldToGrid( const Coord3D *pos, ICoord2D *cellIndex )
+{
+	cellIndex->x = REAL_TO_INT(pos->x/PATHFIND_CELL_SIZE);
+	cellIndex->y = REAL_TO_INT(pos->y/PATHFIND_CELL_SIZE);
 }
 
 inline Bool Pathfinder::validMovementPosition( Bool isCrusher, PathfindLayerEnum layer, const LocomotorSet& locomotorSet, Int x, Int y )
@@ -895,44 +900,44 @@ inline Bool Pathfinder::validMovementPosition( Bool isCrusher, PathfindLayerEnum
 	return validMovementPosition( isCrusher, layer, locomotorSet, x, y );
 }
 
-inline const Coord3D *Pathfinder::getDebugPathPosition( void ) 
-{ 
-	return &debugPathPos; 
+inline const Coord3D *Pathfinder::getDebugPathPosition( void )
+{
+	return &debugPathPos;
 }
 
-inline void Pathfinder::setDebugPathPosition( const Coord3D *pos ) 
-{ 
-	debugPathPos = *pos; 
+inline void Pathfinder::setDebugPathPosition( const Coord3D *pos )
+{
+	debugPathPos = *pos;
 }
 
-inline Path *Pathfinder::getDebugPath( void ) 
-{ 
-	return debugPath; 
+inline Path *Pathfinder::getDebugPath( void )
+{
+	return debugPath;
 }
 
-inline void Pathfinder::addObjectToPathfindMap( class Object *obj ) 
-{ 
-	classifyObjectFootprint( obj, true ); 
+inline void Pathfinder::addObjectToPathfindMap( class Object *obj )
+{
+	classifyObjectFootprint( obj, true );
 }
 
-inline void Pathfinder::removeObjectFromPathfindMap( class Object *obj ) 
-{ 
-	classifyObjectFootprint( obj, false ); 
+inline void Pathfinder::removeObjectFromPathfindMap( class Object *obj )
+{
+	classifyObjectFootprint( obj, false );
 }
 
-inline PathfindCell *Pathfinder::getCell( PathfindLayerEnum layer, Int x, Int y ) 
-{ 
+inline PathfindCell *Pathfinder::getCell( PathfindLayerEnum layer, Int x, Int y )
+{
 	if (x >= m_extent.lo.x && x <= m_extent.hi.x &&
-		y >= m_extent.lo.y && y <= m_extent.hi.y)	
+		y >= m_extent.lo.y && y <= m_extent.hi.y)
 	{
 		PathfindCell *cell = NULL;
-		if (layer > LAYER_GROUND && layer <= LAYER_LAST) 
+		if (layer > LAYER_GROUND && layer <= LAYER_LAST)
 		{
 			cell = m_layers[layer].getCell(x, y);
-			if (cell) 
+			if (cell)
 				return cell;
 		}
-		return &m_map[x][y]; 
+		return &m_map[x][y];
 	}
 	else
 	{
@@ -940,7 +945,7 @@ inline PathfindCell *Pathfinder::getCell( PathfindLayerEnum layer, Int x, Int y
 	}
 }
 
-inline PathfindCell *Pathfinder::getCell( PathfindLayerEnum layer, const Coord3D *pos ) 
+inline PathfindCell *Pathfinder::getCell( PathfindLayerEnum layer, const Coord3D *pos )
 {
 	ICoord2D cell;
 	Bool overflow = worldToCell( pos, &cell );
@@ -980,6 +985,3 @@ inline Bool PathfindCell::isObstaclePresent( ObjectID objID ) const
 
 	return false;
 }
-
-
-#endif // _PATHFIND_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h
index 5c433a614e3..c623b5aba36 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _AI_PLAYER_H_
-#define _AI_PLAYER_H_
-
 #include "Common/GameMemory.h"
 #include "Common/Snapshot.h"
 
@@ -41,7 +38,7 @@ class BuildListInfo;
 /**
  * When a team is selected for training, a list of these
  * "work orders" are created, one for each member of the team.
- * This pairs team members with production buildings to keep 
+ * This pairs team members with production buildings to keep
  * track of who is building what, and allows us to track if
  * a building was destroyed while in the process of training a unit.
  */
@@ -49,7 +46,7 @@ class WorkOrder : public MemoryPoolObject,
 									public Snapshot
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( WorkOrder, "WorkOrder" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( WorkOrder, "WorkOrder" )
 
 public:
 
@@ -94,7 +91,7 @@ class TeamInQueue : public MemoryPoolObject,
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TeamInQueue, "TeamInQueue"  )
 
-private:		
+private:
 
 	MAKE_DLINK(TeamInQueue, TeamBuildQueue)				///< the instances of our prototype
 	MAKE_DLINK(TeamInQueue, TeamReadyQueue)				///< the instances of our prototype
@@ -108,19 +105,16 @@ class TeamInQueue : public MemoryPoolObject,
 
 public:
 
-	TeamInQueue() : 
-		m_workOrders(NULL), 
-		m_team(NULL), 
-		m_nextTeamInQueue(NULL), 
-		m_sentToStartLocation(false), 
-		m_reinforcement(false), 
+	TeamInQueue() :
+		m_workOrders(NULL),
+		m_team(NULL),
+		m_nextTeamInQueue(NULL),
+		m_sentToStartLocation(false),
+		m_reinforcement(false),
 		m_stopQueueing(false),
 		m_reinforcementID(INVALID_ID),
-		//Added By Sadullah Nader
-		//Initialization(s) inserted
 		m_frameStarted(0),
 		m_priorityBuild(FALSE)
-		//		
 	{
 	}
 
@@ -153,12 +147,12 @@ class TeamInQueue : public MemoryPoolObject,
 class AIPlayer : public MemoryPoolObject,
 								 public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AIPlayer, "AIPlayer"  )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AIPlayer, "AIPlayer"  )
 
 public:
 
 	AIPlayer( Player *p );							///< constructor
-	
+
 	virtual Bool computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord3D *pos, Int playerNdx, Real weaponRadius); ///< Calculates best pos for weapon given radius.
 
 public: // AIPlayer interface, may be overridden by AISkirmishPlayer.  jba.
@@ -237,7 +231,7 @@ class AIPlayer : public MemoryPoolObject,
 	virtual void processBaseBuilding( void );		///< do base-building behaviors
 	virtual void processTeamBuilding( void );		///< do team-building behaviors
  	static Int getPlayerSuperweaponValue( Coord3D *center, Int playerNdx, Real radius, Bool includeMilitaryUnits = TRUE );
-// End of aiplayer interface. 
+// End of aiplayer interface.
 
 protected:
 
@@ -259,7 +253,7 @@ class AIPlayer : public MemoryPoolObject,
 	Object *findSupplyCenter(Int minSupplies);
 	static void getPlayerStructureBounds(Region2D *bounds, Int playerNdx, Bool conservative = FALSE );
 
-protected:	 
+protected:
 
 	Player *m_player;									///< the Player we represent
 
@@ -297,8 +291,3 @@ class AIPlayer : public MemoryPoolObject,
 
 	ObjectID m_curWarehouseID;
 };
-
-#endif // _AI_PLAYER_H_
-
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h
index 3f93cc973d3..623e2ef2492 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h
@@ -28,13 +28,10 @@
 
 #pragma once
 
-#ifndef _AI_SKIRMISH_PLAYER_H_
-#define _AI_SKIRMISH_PLAYER_H_
-
 #include "Common/GameMemory.h"
 #include "GameLogic/AIPlayer.h"
 
-class BuildListInfo;	
+class BuildListInfo;
 class SpecialPowerTemplate;
 
 
@@ -43,14 +40,14 @@ class SpecialPowerTemplate;
  */
 class AISkirmishPlayer : public AIPlayer
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AISkirmishPlayer, "AISkirmishPlayer"  )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AISkirmishPlayer, "AISkirmishPlayer"  )
 
 public:	 // AISkirmish specific methods.
 
 	AISkirmishPlayer( Player *p );							///< constructor
 	virtual Bool computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord3D *pos, Int playerNdx, Real weaponRadius); ///< Calculates best pos for weapon given radius.
 
-public:	// AIPlayer interface methods.  
+public:	// AIPlayer interface methods.
 
 	virtual void update();											///< simulates the behavior of a player
 
@@ -118,8 +115,3 @@ class AISkirmishPlayer : public AIPlayer
 	Player			*m_currentEnemy;
 
 };
-
-#endif // _AI_SKIRMISH_PLAYER_H_
-
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h
index 1a5cf974f82..3171df36bcf 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _AI_STATE_MACHINE_H_
-#define _AI_STATE_MACHINE_H_
-
 #include "Lib/BaseType.h"
 
 #include "Common/AudioEventRTS.h"
@@ -53,7 +50,7 @@ class Squad;
 //-----------------------------------------------------------------------------------------------------------
 
 
-/** 
+/**
  * The AI state IDs.
  * Each of these constants will be associated with an instance of a State class
  * in a given StateMachine.
@@ -106,8 +103,6 @@ enum AIStateType CPP_11(: Int)
 	AI_BUSY,																	///< This is a state that things will be in when they are busy doing random stuff that doesn't require AI interaction.
 	AI_EXIT_INSTANTLY,												///< exit this obj, without waiting -- do it in the onEnter! This frame!
 	AI_GUARD_RETALIATE,												///< attacks attacker but with restrictions (hybrid of attack and guard).
-
-	NUM_AI_STATES
 };
 
 //-----------------------------------------------------------------------------------------------------------
@@ -115,12 +110,12 @@ enum AIStateType CPP_11(: Int)
 extern Bool outOfWeaponRangeObject( State *thisState, void* userData );
 extern Bool outOfWeaponRangePosition( State *thisState, void* userData );
 extern Bool wantToSquishTarget( State *thisState, void* userData );
-	
+
 //-----------------------------------------------------------------------------------------------------------
 /**
-  The AI state machine.  This is used by AIUpdate to implement all of the 
+  The AI state machine.  This is used by AIUpdate to implement all of the
   commands in the AICommandInterface.
- 
+
 	NOTE NOTE NOTE NOTE NOTE
 
 	Do NOT subclass this unless you want ALL of the states this machine possesses.
@@ -135,7 +130,7 @@ class AIStateMachine : public StateMachine
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( AIStateMachine, "AIStateMachine" );
 
 public:
-	/** 
+	/**
 	 * The implementation of this constructor defines the states
 	 * used by this machine.
 	 */
@@ -144,7 +139,7 @@ class AIStateMachine : public StateMachine
 	virtual void clear();
 	virtual StateReturnType resetToDefaultState();
 	virtual StateReturnType setState( StateID newStateID );
-	
+
 	/// @todo Rethink state parameter passing. Continuing in this fashion will have a pile of params in the machine (MSB)
 	void setGoalPath( const std::vector<Coord3D>* path );
 	void addToGoalPath( const Coord3D *pathPoint );
@@ -161,7 +156,7 @@ class AIStateMachine : public StateMachine
 	void setGoalAIGroup( const AIGroup *group );
 
 	Squad *getGoalSquad(void);
-	
+
 	StateReturnType setTemporaryState( StateID newStateID, Int frameLimitCoount );			///< change the temporary state of the machine, and number of frames limit.
 	StateID getTemporaryState(void) const {return m_temporaryState?m_temporaryState->getID():INVALID_STATE_ID;}
 
@@ -170,7 +165,7 @@ class AIStateMachine : public StateMachine
 #ifdef STATE_MACHINE_DEBUG
 	virtual AsciiString getCurrentStateName() const ;
 #endif
-	
+
 protected:
 	// snapshot interface
 	virtual void crc( Xfer *xfer );
@@ -182,9 +177,9 @@ class AIStateMachine : public StateMachine
 	const Waypoint *			m_goalWaypoint;
 	Squad *								m_goalSquad;
 
-	/** A temporary state to run for a while (usually AI_MOVE_OUT_OF_THE_WAY).  
+	/** A temporary state to run for a while (usually AI_MOVE_OUT_OF_THE_WAY).
 	Doesn't clear or reset the state machine, so it goes back to doing what it was doing.  jba. */
-	State									*m_temporaryState;			 
+	State									*m_temporaryState;
 	UnsignedInt						m_temporaryStateFramEnd; ///< Last frame to run m_temporaryState.
 };
 
@@ -202,7 +197,6 @@ enum StateType CPP_11(: Int)
 		APPROACH_TARGET,											///< Approach a non-moving target.
 		AIM_AT_TARGET,												///< rotate to face GoalObject or GoalPosition
 		FIRE_WEAPON,													///< fire the machine owner's current weapon
-		NUM_ATTACK_STATES
 	};
 	AttackStateMachine( Object *owner, AIAttackState* att, AsciiString name, Bool follow, Bool attackingObject, Bool forceAttacking );
 
@@ -216,7 +210,7 @@ enum StateType CPP_11(: Int)
 //-----------------------------------------------------------------------------------------------------------
 class AIIdleState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIIdleState, "AIIdleState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIIdleState, "AIIdleState")
 private:
 
 	UnsignedShort m_initialSleepOffset;
@@ -252,10 +246,10 @@ EMPTY_DTOR(AIIdleState)
  */
 class AIInternalMoveToState : public State
 {
-	MEMORY_POOL_GLUE_ABC(AIInternalMoveToState)		
+	MEMORY_POOL_GLUE_ABC(AIInternalMoveToState)
 public:
-	AIInternalMoveToState( StateMachine *machine, AsciiString name ) : State( machine, name ) 
-	{ 
+	AIInternalMoveToState( StateMachine *machine, AsciiString name ) : State( machine, name )
+	{
 		m_goalPosition.zero();
 		m_pathGoalPosition.zero();
 		m_pathTimestamp = 0;
@@ -303,7 +297,7 @@ class AIInternalMoveToState : public State
 	AudioHandle		m_ambientPlayingHandle;							///< Audio handle for the looping sound that we may play.
 	UnsignedInt		m_pathTimestamp;										///< time of last pathfind
 	UnsignedInt		m_blockedRepathTimestamp;						///< time of last blocked pathfind
-	Bool					m_adjustDestinations;								///< Adjust destinations to avoid stacking units on top of each other.  Normally true, but 
+	Bool					m_adjustDestinations;								///< Adjust destinations to avoid stacking units on top of each other.  Normally true, but
 																										//   occasionally false for things like car bombs.
 protected:
 	Bool					m_waitingForPath;										///< If we are waiting for a path.
@@ -317,7 +311,7 @@ EMPTY_DTOR(AIInternalMoveToState)
  */
 class AIRappelState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIRappelState, "AIRappelState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIRappelState, "AIRappelState")
 protected:
 	Real m_rappelRate;
 	Real m_destZ;
@@ -342,7 +336,7 @@ EMPTY_DTOR(AIRappelState)
  */
 class AIBusyState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIBusyState, "AIBusyState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIBusyState, "AIBusyState")
 public:
 	AIBusyState( StateMachine *machine ) : State( machine, "AIBusyState" ) { }
 	virtual StateReturnType onEnter() { return STATE_CONTINUE; }
@@ -364,7 +358,7 @@ EMPTY_DTOR(AIBusyState)
  */
 class AIMoveToState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveToState, "AIMoveToState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveToState, "AIMoveToState")
 protected:
 	Bool m_isMoveTo;
 public:
@@ -381,7 +375,7 @@ EMPTY_DTOR(AIMoveToState)
  */
 class AIMoveOutOfTheWayState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveOutOfTheWayState, "AIMoveOutOfTheWayState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveOutOfTheWayState, "AIMoveOutOfTheWayState")
 public:
 	AIMoveOutOfTheWayState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveOutOfTheWayState" ) { }
 	virtual StateReturnType onEnter();
@@ -399,14 +393,14 @@ EMPTY_DTOR(AIMoveOutOfTheWayState)
  */
 class AIMoveAndTightenState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAndTightenState, "AIMoveAndTightenState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAndTightenState, "AIMoveAndTightenState")
 public:
-	AIMoveAndTightenState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveAndTightenState" ) 
+	AIMoveAndTightenState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveAndTightenState" )
 	{
 		m_checkForPath = false;
 		m_okToRepathTimes = 0;
 	}
-	AIMoveAndTightenState( StateMachine *machine, const char *name ) : AIInternalMoveToState( machine, name ) 
+	AIMoveAndTightenState( StateMachine *machine, const char *name ) : AIInternalMoveToState( machine, name )
 	{
 		m_checkForPath = false;
 		m_okToRepathTimes = 0;
@@ -415,7 +409,7 @@ class AIMoveAndTightenState : public AIInternalMoveToState
 	virtual StateReturnType update();
 protected:
 	virtual Bool computePath();												///< compute the path
-	Int m_okToRepathTimes; 
+	Int m_okToRepathTimes;
 	Bool m_checkForPath;
 protected:
 	// snapshot interface
@@ -431,7 +425,7 @@ EMPTY_DTOR(AIMoveAndTightenState)
  */
 class AIMoveAwayFromRepulsorsState : public AIMoveAndTightenState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAwayFromRepulsorsState, "AIMoveAwayFromRepulsorsState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAwayFromRepulsorsState, "AIMoveAwayFromRepulsorsState")
 public:
 	AIMoveAwayFromRepulsorsState( StateMachine *machine ) : AIMoveAndTightenState( machine, "AIMoveAwayFromRepulsors" ) { }
 	virtual StateReturnType onEnter();
@@ -449,16 +443,16 @@ EMPTY_DTOR(AIMoveAwayFromRepulsorsState)
  */
 class AIAttackApproachTargetState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackApproachTargetState, "AIAttackApproachTargetState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackApproachTargetState, "AIAttackApproachTargetState")
 public:
-	AIAttackApproachTargetState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking ) : 
-		AIInternalMoveToState( machine, "AIAttackApproachTargetState" ), 
+	AIAttackApproachTargetState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking ) :
+		AIInternalMoveToState( machine, "AIAttackApproachTargetState" ),
 		m_follow(follow),
 		m_isAttackingObject(attackingObject),
 		m_isInitialApproach(true),
 		m_isForceAttacking(forceAttacking)
-	{ 
-		// we're setting m_isInitialApproach to true in the constructor because we want the first pass 
+	{
+		// we're setting m_isInitialApproach to true in the constructor because we want the first pass
 		// through this state to allow a unit to attack incidental targets (if it is turreted)
 	}
 	virtual Bool isAttack() const { return TRUE; }
@@ -496,18 +490,18 @@ EMPTY_DTOR(AIAttackApproachTargetState)
  */
 class AIAttackPursueTargetState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackPursueTargetState, "AIAttackPursueTargetState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackPursueTargetState, "AIAttackPursueTargetState")
 public:
-	AIAttackPursueTargetState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking ) : 
-		AIInternalMoveToState( machine, "AIAttackPursueTargetState" ), 
+	AIAttackPursueTargetState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking ) :
+		AIInternalMoveToState( machine, "AIAttackPursueTargetState" ),
 		m_follow(follow),
 		m_isAttackingObject(attackingObject),
 		m_isInitialApproach(true),
 		m_isForceAttacking(forceAttacking),
 		m_approachTimestamp(0),
 		m_stopIfInRange(false)
-	{ 
-		// we're setting m_isInitialApproach to true in the constructor because we want the first pass 
+	{
+		// we're setting m_isInitialApproach to true in the constructor because we want the first pass
 		// through this state to allow a unit to attack incidental targets (if it is turreted)
 	}
 	virtual Bool isAttack() const { return TRUE; }
@@ -545,12 +539,12 @@ EMPTY_DTOR(AIAttackPursueTargetState)
  */
 class AIPickUpCrateState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIPickUpCrateState, "AIPickUpCrateState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIPickUpCrateState, "AIPickUpCrateState")
 public:
-	AIPickUpCrateState( StateMachine *machine ) : 
+	AIPickUpCrateState( StateMachine *machine ) :
 		AIInternalMoveToState( machine, "AIAttackPickUpCrateState" )
-	{ 
-		// we're setting m_isInitialApproach to true in the constructor because we want the first pass 
+	{
+		// we're setting m_isInitialApproach to true in the constructor because we want the first pass
 		// through this state to allow a unit to attack incidental targets (if it is turreted)
 	}
 	virtual StateReturnType onEnter();
@@ -575,7 +569,7 @@ EMPTY_DTOR(AIPickUpCrateState)
  */
  class AIAttackMoveToState : public AIMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackMoveToState, "AIAttackMoveToState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackMoveToState, "AIAttackMoveToState")
 public:
 	AIAttackMoveToState( StateMachine *machine );
 	//virtual ~AIAttackMoveToState();
@@ -608,16 +602,16 @@ EMPTY_DTOR(AIPickUpCrateState)
  */
 class AIFollowWaypointPathState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFollowWaypointPathState, "AIFollowWaypointPathState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFollowWaypointPathState, "AIFollowWaypointPathState")
 public:
-	AIFollowWaypointPathState( StateMachine *machine, Bool asGroup ) : m_isFollowWaypointPathState(true), 
-		m_moveAsGroup(asGroup), AIInternalMoveToState( machine, "AIFollowWaypointPathState" ) 
+	AIFollowWaypointPathState( StateMachine *machine, Bool asGroup ) : m_isFollowWaypointPathState(true),
+		m_moveAsGroup(asGroup), AIInternalMoveToState( machine, "AIFollowWaypointPathState" )
 	{
 		m_angle = 0.0f;
 	}
-	AIFollowWaypointPathState( StateMachine *machine, Bool asGroup, Bool isFollow) : 
-		m_isFollowWaypointPathState(isFollow), m_moveAsGroup(asGroup), AIInternalMoveToState( machine, 
-																"AIFollowWaypointPathState" ) 
+	AIFollowWaypointPathState( StateMachine *machine, Bool asGroup, Bool isFollow) :
+		m_isFollowWaypointPathState(isFollow), m_moveAsGroup(asGroup), AIInternalMoveToState( machine,
+																"AIFollowWaypointPathState" )
 	{
 		m_angle = 0.0f;
 	}
@@ -640,7 +634,7 @@ class AIFollowWaypointPathState : public AIInternalMoveToState
 	Bool m_appendGoalPosition;
 
 	const Bool m_moveAsGroup;
-	// this is necessary because we derive from FollowWaypointPathState, but we do not want to incur the 
+	// this is necessary because we derive from FollowWaypointPathState, but we do not want to incur the
 	// expense of checking RTTI to determine whether we are actually a FollowWaypointPathState or not
 	const Bool m_isFollowWaypointPathState;	// derived classes should set this false.
 
@@ -658,9 +652,9 @@ EMPTY_DTOR(AIFollowWaypointPathState)
  */
 class AIFollowWaypointPathExactState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFollowWaypointPathExactState, "AIFollowWaypointPathExactState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFollowWaypointPathExactState, "AIFollowWaypointPathExactState")
 public:
-	AIFollowWaypointPathExactState( StateMachine *machine, Bool asGroup ) : m_moveAsGroup(asGroup), 
+	AIFollowWaypointPathExactState( StateMachine *machine, Bool asGroup ) : m_moveAsGroup(asGroup),
 		m_lastWaypoint(NULL),
 		AIInternalMoveToState( machine, "AIFollowWaypointPathExactState" ) { }
 	virtual StateReturnType onEnter();
@@ -685,11 +679,11 @@ EMPTY_DTOR(AIFollowWaypointPathExactState)
  */
 class AIAttackFollowWaypointPathState : public AIFollowWaypointPathState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackFollowWaypointPathState, "AIAttackFollowWaypointPathState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackFollowWaypointPathState, "AIAttackFollowWaypointPathState")
 public:
 	AIAttackFollowWaypointPathState( StateMachine *machine, Bool asGroup );
 	//virtual ~AIAttackFollowWaypointPathState();
-	
+
 	virtual Bool isAttack() const { return m_attackFollowMachine ? m_attackFollowMachine->isInAttackState() : FALSE; }
 
 	virtual StateReturnType onEnter();
@@ -715,13 +709,13 @@ class AIAttackFollowWaypointPathState : public AIFollowWaypointPathState
  */
 class AIWanderState : public AIFollowWaypointPathState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWanderState, "AIWanderState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWanderState, "AIWanderState")
 public:
-	AIWanderState( StateMachine *machine ) : AIFollowWaypointPathState( machine, false ) 
-	{ 
+	AIWanderState( StateMachine *machine ) : AIFollowWaypointPathState( machine, false )
+	{
 #ifdef STATE_MACHINE_DEBUG
 		setName("AIWanderState");
-#endif 
+#endif
 		m_timer = 0;
 		m_waitFrames = 0;
 	}
@@ -747,9 +741,9 @@ EMPTY_DTOR(AIWanderState)
  */
 class AIWanderInPlaceState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWanderInPlaceState, "AIWanderInPlaceState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWanderInPlaceState, "AIWanderInPlaceState")
 public:
-	AIWanderInPlaceState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIWanderInPlaceState" ) 
+	AIWanderInPlaceState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIWanderInPlaceState" )
 	{
 		m_origin.zero();
 		m_waitFrames = 0;
@@ -767,7 +761,7 @@ class AIWanderInPlaceState : public AIInternalMoveToState
 
 protected:
 	void computeWanderGoal();
-	Coord3D m_origin;									///< The point we're wandering around.	
+	Coord3D m_origin;									///< The point we're wandering around.
 	Int		m_waitFrames;
 	Int		m_timer;
 };
@@ -779,13 +773,13 @@ EMPTY_DTOR(AIWanderInPlaceState)
  */
 class AIPanicState : public AIFollowWaypointPathState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIPanicState, "AIPanicState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIPanicState, "AIPanicState")
 public:
 	AIPanicState( StateMachine *machine ) : AIFollowWaypointPathState( machine, false)
-	{ 
+	{
 #ifdef STATE_MACHINE_DEBUG
 		setName("AIPanicState");
-#endif	
+#endif
 	}
 	virtual StateReturnType onEnter();
 	virtual StateReturnType update();
@@ -809,10 +803,10 @@ EMPTY_DTOR(AIPanicState)
  */
 class AIFollowPathState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFollowPathState, "AIFollowPathState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFollowPathState, "AIFollowPathState")
 public:
-	AIFollowPathState( StateMachine *machine, AsciiString name = "AIFollowPathState" ) : 
-		m_adjustFinal(true), 
+	AIFollowPathState( StateMachine *machine, AsciiString name = "AIFollowPathState" ) :
+		m_adjustFinal(true),
 		m_adjustFinalOverride(false),
 		m_index(0),
 		m_retryCount(10),
@@ -834,7 +828,7 @@ class AIFollowPathState : public AIInternalMoveToState
 	virtual void loadPostProcess();
 
 private:
-	Int m_index;																		///< current path index	
+	Int m_index;																		///< current path index
 	Bool m_adjustFinal;
 	Bool m_adjustFinalOverride;
 	Int m_retryCount;
@@ -847,9 +841,9 @@ EMPTY_DTOR(AIFollowPathState)
  */
 class AIMoveAndEvacuateState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAndEvacuateState, "AIMoveAndEvacuateState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAndEvacuateState, "AIMoveAndEvacuateState")
 public:
-	AIMoveAndEvacuateState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveAndEvacuateState" ) 
+	AIMoveAndEvacuateState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveAndEvacuateState" )
 	{
 		m_origin.zero();
 	}
@@ -863,7 +857,7 @@ class AIMoveAndEvacuateState : public AIInternalMoveToState
 	virtual void loadPostProcess();
 
 private:
-	Coord3D m_origin;													///< current position - set as goal on exit in case we follow with MoveToAndDelete.	
+	Coord3D m_origin;													///< current position - set as goal on exit in case we follow with MoveToAndDelete.
 };
 EMPTY_DTOR(AIMoveAndEvacuateState)
 
@@ -873,9 +867,9 @@ EMPTY_DTOR(AIMoveAndEvacuateState)
  */
 class AIMoveAndDeleteState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAndDeleteState, "AIMoveAndDeleteState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIMoveAndDeleteState, "AIMoveAndDeleteState")
 public:
-	AIMoveAndDeleteState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveAndDeleteState" ) 
+	AIMoveAndDeleteState( StateMachine *machine ) : AIInternalMoveToState( machine, "AIMoveAndDeleteState" )
 	{
 		m_appendGoalPosition = FALSE;
 	}
@@ -896,15 +890,15 @@ EMPTY_DTOR(AIMoveAndDeleteState)
 //-----------------------------------------------------------------------------------------------------------
 class AIAttackAimAtTargetState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackAimAtTargetState, "AIAttackAimAtTargetState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackAimAtTargetState, "AIAttackAimAtTargetState")
 public:
-	AIAttackAimAtTargetState( StateMachine *machine, Bool attackingObject, Bool forceAttacking ) : 
+	AIAttackAimAtTargetState( StateMachine *machine, Bool attackingObject, Bool forceAttacking ) :
 		State( machine, "AIAttackAimAtTargetState" ),
 		m_isAttackingObject(attackingObject),
 		m_canTurnInPlace(false),
 		m_isForceAttacking(forceAttacking),
 		m_setLocomotor(false)
-	{ 
+	{
 	}
 	virtual Bool isAttack() const { return TRUE; }
 	virtual StateReturnType onEnter();
@@ -926,7 +920,7 @@ EMPTY_DTOR(AIAttackAimAtTargetState)
 //-----------------------------------------------------------------------------------------------------------
 class AIWaitState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWaitState, "AIWaitState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIWaitState, "AIWaitState")
 public:
 	AIWaitState( StateMachine *machine ) : State( machine,"AIWaitState" ) { }
 	virtual StateReturnType update();
@@ -952,12 +946,12 @@ class NotifyWeaponFiredInterface	// an ABC
 //-----------------------------------------------------------------------------------------------------------
 class AIAttackFireWeaponState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackFireWeaponState, "AIAttackFireWeaponState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackFireWeaponState, "AIAttackFireWeaponState")
 public:
-	AIAttackFireWeaponState( StateMachine *machine, NotifyWeaponFiredInterface* att ) : 
-		State( machine, "AIAttackFireWeaponState" ), 
-		m_att(att) 
-	{ 
+	AIAttackFireWeaponState( StateMachine *machine, NotifyWeaponFiredInterface* att ) :
+		State( machine, "AIAttackFireWeaponState" ),
+		m_att(att)
+	{
 	}
 	virtual Bool isAttack() const { return TRUE; }
 	virtual StateReturnType update();
@@ -983,7 +977,7 @@ class AttackExitConditionsInterface
 //-----------------------------------------------------------------------------------------------------------
 class AIAttackState : public State, public NotifyWeaponFiredInterface
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackState, "AIAttackState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackState, "AIAttackState")
 public:
 
 	AIAttackState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking, AttackExitConditionsInterface* attackParameters);
@@ -998,7 +992,7 @@ class AIAttackState : public State, public NotifyWeaponFiredInterface
 	virtual void notifyNewVictimChosen(Object* victim);
 	virtual const Coord3D* getOriginalVictimPos() const { return &m_originalVictimPos; }
 	virtual Bool isWeaponSlotOkToFire(WeaponSlotType wslot) const { return true; }
-	virtual Bool isAttackingObject() const { return m_isAttackingObject; } 
+	virtual Bool isAttackingObject() const { return m_isAttackingObject; }
 	virtual Bool isForceAttacking() const { return m_isForceAttacking; }
 #ifdef STATE_MACHINE_DEBUG
 	virtual AsciiString getName() const ;
@@ -1027,9 +1021,9 @@ class AIAttackState : public State, public NotifyWeaponFiredInterface
 //-----------------------------------------------------------------------------------------------------------
 class AIAttackSquadState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackSquadState, "AIAttackSquadState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackSquadState, "AIAttackSquadState")
 public:
-	AIAttackSquadState( StateMachine *machine, AttackExitConditionsInterface *attackParameters = NULL) : 
+	AIAttackSquadState( StateMachine *machine, AttackExitConditionsInterface *attackParameters = NULL) :
 			State( machine , "AIAttackSquadState") {	}
 	//~AIAttackSquadState();
 
@@ -1056,7 +1050,7 @@ class AIAttackSquadState : public State
 //-----------------------------------------------------------------------------------------------------------
 class AIDeadState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDeadState, "AIDeadState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDeadState, "AIDeadState")
 public:
 	AIDeadState( StateMachine *machine ) : State( machine, "AIDeadState" ) { }
 	virtual StateReturnType onEnter();
@@ -1073,7 +1067,7 @@ EMPTY_DTOR(AIDeadState)
 //-----------------------------------------------------------------------------------------------------------
 class AIDockState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockState, "AIDockState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIDockState, "AIDockState")
 public:
 	AIDockState( StateMachine *machine ) : State( machine, "AIDockState" ), m_dockMachine(NULL), m_usingPrecisionMovement(FALSE) { }
 	//~AIDockState();
@@ -1101,7 +1095,7 @@ class AIDockState : public State
  */
 class AIEnterState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIEnterState, "AIEnterState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIEnterState, "AIEnterState")
 protected:
 	ObjectID m_entryToClear;
 protected:
@@ -1120,7 +1114,7 @@ EMPTY_DTOR(AIEnterState)
 //-----------------------------------------------------------------------------------------------------------
 class AIExitState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIExitState, "AIExitState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIExitState, "AIExitState")
 protected:
 	ObjectID m_entryToClear;
 protected:
@@ -1139,7 +1133,7 @@ EMPTY_DTOR(AIExitState)
 //-----------------------------------------------------------------------------------------------------------
 class AIExitInstantlyState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIExitInstantlyState, "AIExitInstantlyState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIExitInstantlyState, "AIExitInstantlyState")
 protected:
 	ObjectID m_entryToClear;
 protected:
@@ -1162,9 +1156,9 @@ EMPTY_DTOR(AIExitInstantlyState)
  */
 class AIGuardState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardState, "AIGuardState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardState, "AIGuardState")
 public:
-	AIGuardState( StateMachine *machine ) : State( machine, "AIGuardState" ), m_guardMachine(NULL) 
+	AIGuardState( StateMachine *machine ) : State( machine, "AIGuardState" ), m_guardMachine(NULL)
 	{
 		m_guardMachine = NULL;
 	}
@@ -1193,7 +1187,7 @@ class AIGuardState : public State
  */
 class AIGuardRetaliateState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateState, "AIGuardRetaliateState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIGuardRetaliateState, "AIGuardRetaliateState")
 public:
 	AIGuardRetaliateState( StateMachine *machine ) : State( machine, "AIGuardRetaliateState" ), m_guardRetaliateMachine(NULL) {}
 	//~AIGuardRetaliateState();
@@ -1220,9 +1214,9 @@ class AIGuardRetaliateState : public State
  */
 class AITunnelNetworkGuardState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITunnelNetworkGuardState, "AITunnelNetworkGuardState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITunnelNetworkGuardState, "AITunnelNetworkGuardState")
 public:
-	AITunnelNetworkGuardState( StateMachine *machine ) : State( machine, "AITunnelNetworkGuardState" ), m_guardMachine(NULL) 
+	AITunnelNetworkGuardState( StateMachine *machine ) : State( machine, "AITunnelNetworkGuardState" ), m_guardMachine(NULL)
 	{
 		m_guardMachine = NULL;
 	}
@@ -1250,10 +1244,10 @@ class AITunnelNetworkGuardState : public State
  */
 class AIHuntState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIHuntState, "AIHuntState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIHuntState, "AIHuntState")
 public:
-	AIHuntState( StateMachine *machine ) : State( machine, "AIHuntState" ), m_huntMachine(NULL) 
-	{ 
+	AIHuntState( StateMachine *machine ) : State( machine, "AIHuntState" ), m_huntMachine(NULL)
+	{
 		m_nextEnemyScanTime = 0;
 	}
 	//~AIHuntState();
@@ -1283,9 +1277,9 @@ class AIHuntState : public State
  */
 class AIAttackAreaState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackAreaState, "AIAttackAreaState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIAttackAreaState, "AIAttackAreaState")
 public:
-	AIAttackAreaState( StateMachine *machine ) : State( machine, "AIAttackAreaState" ), m_attackMachine(NULL), 
+	AIAttackAreaState( StateMachine *machine ) : State( machine, "AIAttackAreaState" ), m_attackMachine(NULL),
 		m_nextEnemyScanTime(0) { }
 	//~AIAttackAreaState();
 	virtual Bool isAttack() const { return m_attackMachine ? m_attackMachine->isInAttackState() : FALSE; }
@@ -1313,7 +1307,7 @@ class AIAttackAreaState : public State
 //-----------------------------------------------------------------------------------------------------------
 class AIFaceState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFaceState, "AIFaceState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AIFaceState, "AIFaceState")
 public:
 	AIFaceState( StateMachine *machine, Bool obj ) : State( machine, "AIFaceState" ), m_canTurnInPlace(false), m_obj(obj) { }
 	virtual StateReturnType onEnter();
@@ -1330,5 +1324,3 @@ class AIFaceState : public State
 	Bool m_canTurnInPlace;
 };
 EMPTY_DTOR(AIFaceState)
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h
index 31b534430c3..c5a34a6944d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: AITNGuard.h 
+// FILE: AITNGuard.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -38,8 +38,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_AITNGUARD_
-#define _H_AITNGUARD_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
@@ -52,7 +50,7 @@
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 enum
 {
-	// prevent collisions with other states that we might use, (namely AI_IDLE) 
+	// prevent collisions with other states that we might use, (namely AI_IDLE)
 	AI_TN_GUARD_INNER = 5000,					///< Attack anything within this area till death
 	AI_TN_GUARD_IDLE,									///< Wait till something shows up to attack.
 	AI_TN_GUARD_OUTER,									///< Attack anything within this area that has been aggressive, until the timer expires
@@ -95,12 +93,12 @@ class AITNGuardMachine : public StateMachine
 	virtual void loadPostProcess();
 
 public:
-	/** 
+	/**
 	 * The implementation of this constructor defines the states
 	 * used by this machine.
 	 */
 	AITNGuardMachine( Object *owner );
-	
+
 	const Coord3D *getPositionToGuard( void ) const { return &m_positionToGuard; }
 	void setTargetPositionToGuard( const Coord3D *pos) { m_positionToGuard = *pos; }
 
@@ -118,9 +116,12 @@ class AITNGuardMachine : public StateMachine
 //--------------------------------------------------------------------------------------
 class AITNGuardInnerState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardInnerState, "AITNGuardInnerState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardInnerState, "AITNGuardInnerState")
 public:
-	AITNGuardInnerState( StateMachine *machine ) : State( machine, "AITNGuardInner" ) { }
+	AITNGuardInnerState( StateMachine *machine ) : State( machine, "AITNGuardInner" )
+	{
+		m_attackState = NULL;
+	}
 	virtual StateReturnType onEnter( void );
 	virtual StateReturnType update( void );
 	virtual void onExit( StateExitType status );
@@ -132,16 +133,15 @@ class AITNGuardInnerState : public State
 private:
 	AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); }
 
-	TunnelNetworkExitConditions m_exitConditions; 
+	TunnelNetworkExitConditions m_exitConditions;
 	Bool			m_scanForEnemy;
 	AIAttackState *m_attackState;
 };
-EMPTY_DTOR(AITNGuardInnerState)
 
 //--------------------------------------------------------------------------------------
 class AITNGuardIdleState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardIdleState, "AITNGuardIdleState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardIdleState, "AITNGuardIdleState")
 public:
 	AITNGuardIdleState( StateMachine *machine ) : State( machine, "AITNGuardIdleState" ) { }
 	virtual StateReturnType onEnter( void );
@@ -163,9 +163,9 @@ EMPTY_DTOR(AITNGuardIdleState)
 //--------------------------------------------------------------------------------------
 class AITNGuardOuterState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardOuterState, "AITNGuardOuterState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardOuterState, "AITNGuardOuterState")
 public:
-	AITNGuardOuterState( StateMachine *machine ) : State( machine, "AITNGuardOuter" ) 
+	AITNGuardOuterState( StateMachine *machine ) : State( machine, "AITNGuardOuter" )
 	{
 		m_attackState = NULL;
 	}
@@ -180,15 +180,14 @@ class AITNGuardOuterState : public State
 private:
 	AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); }
 
-	TunnelNetworkExitConditions m_exitConditions; 
+	TunnelNetworkExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 };
-EMPTY_DTOR(AITNGuardOuterState)
 
 //--------------------------------------------------------------------------------------
 class AITNGuardReturnState : public AIEnterState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardReturnState, "AITNGuardReturnState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardReturnState, "AITNGuardReturnState")
 private:
 	AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); }
 public:
@@ -215,7 +214,7 @@ EMPTY_DTOR(AITNGuardReturnState)
 //--------------------------------------------------------------------------------------
 class AITNGuardPickUpCrateState : public AIPickUpCrateState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardPickUpCrateState, "AITNGuardPickUpCrateState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardPickUpCrateState, "AITNGuardPickUpCrateState")
 public:
 	AITNGuardPickUpCrateState( StateMachine *machine );
 	virtual StateReturnType onEnter( void );
@@ -227,7 +226,7 @@ EMPTY_DTOR(AITNGuardPickUpCrateState)
 //--------------------------------------------------------------------------------------
 class AITNGuardAttackAggressorState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardAttackAggressorState, "AITNGuardAttackAggressorState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AITNGuardAttackAggressorState, "AITNGuardAttackAggressorState")
 public:
 	AITNGuardAttackAggressorState( StateMachine *machine );
 	virtual StateReturnType onEnter( void );
@@ -240,12 +239,8 @@ class AITNGuardAttackAggressorState : public State
 	virtual void loadPostProcess();
 private:
 	AITNGuardMachine* getGuardMachine() { return (AITNGuardMachine*)getMachine(); }
-	TunnelNetworkExitConditions m_exitConditions; 
+	TunnelNetworkExitConditions m_exitConditions;
 	AIAttackState *m_attackState;
 };
 
-EMPTY_DTOR(AITNGuardAttackAggressorState)
-
 //--------------------------------------------------------------------------------------
-
-#endif /* _H_AIGUARD_ */
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h
index c8183eb6891..b98b2ba8d9e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _Armor_H_
-#define _Armor_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/NameKeyGenerator.h"
 #include "Common/STLTypedefs.h"
@@ -41,7 +38,7 @@
 class ArmorStore;
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
 	An Armor encapsulates the a particular type of actual modifier to damage taken, in order
 	to simulate different materials, and to help make game balance easier to adjust.
 */
@@ -56,8 +53,8 @@ class ArmorTemplate
 
 	/**
 		This is the real "meat" of the class: given a damage type and amount, adjust the damage
-		and return the amount that should be dealt. 
-	*/	
+		and return the amount that should be dealt.
+	*/
 	Real adjustDamage(DamageType t, Real damage) const;
 
 	static void parseArmorCoefficients( INI* ini, void *instance, void* /* store */, const void* userData );
@@ -66,15 +63,15 @@ class ArmorTemplate
 
 private:
 	Real						m_damageCoefficient[DAMAGE_NUM_TYPES];	///< modifiers to damage
-};  
+};
 
 //-------------------------------------------------------------------------------------------------
 class Armor
 {
 public:
 
-	inline Armor(const ArmorTemplate* tmpl = NULL) : m_template(tmpl) 
-	{ 
+	inline Armor(const ArmorTemplate* tmpl = NULL) : m_template(tmpl)
+	{
 	}
 
 	inline Real adjustDamage(DamageType t, Real damage) const
@@ -108,10 +105,12 @@ class ArmorStore : public SubsystemInterface
 	void reset() { }
 	void update() { }
 
+	const ArmorTemplate* findArmorTemplate(NameKeyType namekey) const;
 	/**
 		Find the Armor with the given name. If no such Armor exists, return null.
 	*/
-	const ArmorTemplate* findArmorTemplate(AsciiString name) const;
+	const ArmorTemplate* findArmorTemplate(const AsciiString& name) const;
+	const ArmorTemplate* findArmorTemplate(const char* name) const;
 
 	inline Armor makeArmor(const ArmorTemplate *tmpl) const
 	{
@@ -129,6 +128,3 @@ class ArmorStore : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern ArmorStore *TheArmorStore;
-
-#endif // _Armor_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h
index c84618fb056..6f99fde5fde 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h
@@ -26,13 +26,9 @@
 
 #pragma once
 
-#ifndef _ArmorSet_H_
-#define _ArmorSet_H_
-
 #include "Lib/BaseType.h"
 #include "Common/GameType.h"
 #include "Common/SparseMatchFinder.h"
-#include "Common/SparseMatchFinder.h"
 
 //-------------------------------------------------------------------------------------------------
 class ArmorTemplate;
@@ -53,9 +49,9 @@ enum ArmorSetType CPP_11(: Int)
 	ARMORSET_WEAK_VERSUS_BASEDEFENSES = 4,
 	ARMORSET_SECOND_LIFE = 5,	///< Body Module has marked us as on our second life
 	ARMORSET_CRATE_UPGRADE_ONE, ///< Just like weaponset type from salvage.
-	ARMORSET_CRATE_UPGRADE_TWO, 
+	ARMORSET_CRATE_UPGRADE_TWO,
 
-	ARMORSET_COUNT			///< keep last, please
+	ARMORSET_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -70,25 +66,25 @@ class ArmorTemplateSet
 	const DamageFX* m_fx;
 
 public:
-	inline ArmorTemplateSet()
+	ArmorTemplateSet()
 	{
 		clear();
 	}
 
-	inline void clear()
+	void clear()
 	{
 		m_types.clear();
 		m_template = NULL;
 		m_fx = NULL;
 	}
 
-	inline const ArmorTemplate* getArmorTemplate() const { return m_template; } 
-	inline const DamageFX* getDamageFX() const { return m_fx; } 
+	const ArmorTemplate* getArmorTemplate() const { return m_template; }
+	const DamageFX* getDamageFX() const { return m_fx; }
 
-	inline Int getConditionsYesCount() const { return 1; }
-	inline const ArmorSetFlags& getNthConditionsYes(Int i) const { return m_types; }
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	inline AsciiString getDescription() const { return AsciiString("ArmorTemplateSet"); }
+	Int getConditionsYesCount() const { return 1; }
+	const ArmorSetFlags& getNthConditionsYes(Int i) const { return m_types; }
+#if defined(RTS_DEBUG)
+	inline AsciiString getDescription() const { return "ArmorTemplateSet"; }
 #endif
 
 	void parseArmorTemplateSet( INI* ini );
@@ -96,8 +92,3 @@ class ArmorTemplateSet
 
 //-------------------------------------------------------------------------------------------------
 typedef std::vector<ArmorTemplateSet> ArmorTemplateSetVector;
-
-//-------------------------------------------------------------------------------------------------
-typedef SparseMatchFinder<ArmorTemplateSet, ArmorSetFlags> ArmorTemplateSetFinder;
-
-#endif	// _ArmorSet_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h
index ec66deb2671..63f52d479f6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef CAVE_SYSTEM_H
-#define CAVE_SYSTEM_H
-
 class Object;
 class TunnelTracker; // The player owns one such object for his Tunnels, so instead of duplicating
 // so much code, this SubSystem will manage all of the Cave systems.
@@ -39,7 +36,7 @@ class TunnelTracker; // The player owns one such object for his Tunnels, so inst
 #include "Common/Snapshot.h"
 #include "Common/SubsystemInterface.h"
 
-/** 
+/**
 		System responsible for Crates as code objects - ini, new/delete etc
 */
 class CaveSystem : public SubsystemInterface,
@@ -55,7 +52,7 @@ class CaveSystem : public SubsystemInterface,
 
 	Bool canSwitchIndexToIndex( Int oldIndex, Int newIndex ); // If either Index has guys in it, no, you can't
 	void registerNewCave( Int theIndex );			// All Caves are born with a default index, which could be new
-	void unregisterCave( Int theIndex );				// 
+	void unregisterCave( Int theIndex );				//
 	TunnelTracker *getTunnelTrackerForCaveIndex( Int theIndex );
 
 protected:
@@ -73,4 +70,3 @@ class CaveSystem : public SubsystemInterface,
 };
 
 extern CaveSystem *TheCaveSystem;
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h
index 90ddbb5de0d..01c694803a5 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef CRATE_SYSTEM_H
-#define CRATE_SYSTEM_H
-
 #include "Common/INI.h"
 #include "Common/Overridable.h"
 #include "Common/Override.h"
@@ -48,7 +45,7 @@ typedef std::list< crateCreationEntry >											crateCreationEntryList;
 typedef std::list< crateCreationEntry >::iterator						crateCreationEntryIterator;
 typedef std::list< crateCreationEntry >::const_iterator			crateCreationEntryConstIterator;
 
-/** 
+/**
 		A CrateTemplate is a ini defined set of conditions plus a ThingTemplate that is the Object
 		containing the correct CrateCollide module.
 */
@@ -63,7 +60,7 @@ class CrateTemplate : public Overridable
 	void setName( AsciiString name ) { m_name = name; }
 	AsciiString getName(){ return m_name; }
 
-	inline const FieldParse *getFieldParse() const { return TheCrateTemplateFieldParseTable; }
+	const FieldParse *getFieldParse() const { return TheCrateTemplateFieldParseTable; }
 	static const FieldParse TheCrateTemplateFieldParseTable[];		///< the parse table for INI definition
 
 	static void parseCrateCreationEntry( INI* ini, void *instance, void *store, const void* /*userData*/ );
@@ -84,7 +81,7 @@ class CrateTemplate : public Overridable
 typedef OVERRIDE<CrateTemplate> CrateTemplateOverride;
 
 
-/** 
+/**
 		System responsible for Crates as code objects - ini, new/delete etc
 */
 class CrateSystem : public SubsystemInterface
@@ -103,7 +100,7 @@ class CrateSystem : public SubsystemInterface
 	CrateTemplate *newCrateTemplate( AsciiString name );
 	CrateTemplate *newCrateTemplateOverride( CrateTemplate *crateToOverride );
 
-	
+
 
 	static void parseCrateTemplateDefinition(INI* ini);
 
@@ -113,4 +110,3 @@ class CrateSystem : public SubsystemInterface
 };
 
 extern CrateSystem *TheCrateSystem;
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h
index f1a0a7e96f2..df1b6e5f679 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DAMAGE_H_
-#define __DAMAGE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/BitFlags.h"
 #include "Common/GameType.h"
@@ -48,20 +45,20 @@ class ThingTemplate;
 /** Damage types, keep this in sync with DamageTypeFlags::s_bitNameList[] */
 //-------------------------------------------------------------------------------------------------
 enum DamageType CPP_11(: Int)
-{	
-	DAMAGE_EXPLOSION							= 0,			
-	DAMAGE_CRUSH									= 1,					
+{
+	DAMAGE_EXPLOSION							= 0,
+	DAMAGE_CRUSH									= 1,
 	DAMAGE_ARMOR_PIERCING					= 2,
-	DAMAGE_SMALL_ARMS							= 3,		
-	DAMAGE_GATTLING								= 4,				
-	DAMAGE_RADIATION							= 5,			
-	DAMAGE_FLAME									= 6,					
-	DAMAGE_LASER									= 7,					
-	DAMAGE_SNIPER									= 8,				
-	DAMAGE_POISON									= 9,			
-	DAMAGE_HEALING								= 10,	
+	DAMAGE_SMALL_ARMS							= 3,
+	DAMAGE_GATTLING								= 4,
+	DAMAGE_RADIATION							= 5,
+	DAMAGE_FLAME									= 6,
+	DAMAGE_LASER									= 7,
+	DAMAGE_SNIPER									= 8,
+	DAMAGE_POISON									= 9,
+	DAMAGE_HEALING								= 10,
 	DAMAGE_UNRESISTABLE						= 11,		// this is for scripting to cause 'armorproof' damage
-	DAMAGE_WATER									= 12,	
+	DAMAGE_WATER									= 12,
 	DAMAGE_DEPLOY									= 13,					// for transports to deploy units and order them to all attack.
 	DAMAGE_SURRENDER							= 14,				// if something "dies" to surrender damage, they surrender.... duh!
 	DAMAGE_HACK										= 15,
@@ -73,13 +70,13 @@ enum DamageType CPP_11(: Int)
 	DAMAGE_HAZARD_CLEANUP					= 21,	// special damage type for cleaning up hazards like radiation or bio-poison.
 	DAMAGE_PARTICLE_BEAM					= 22,	// Incinerates virtually everything (insanely powerful orbital beam)
 	DAMAGE_TOPPLING								= 23,	// damage from getting toppled.
-	DAMAGE_INFANTRY_MISSILE				= 24,	
-	DAMAGE_AURORA_BOMB						= 25,	
-	DAMAGE_LAND_MINE							= 26,	
-	DAMAGE_JET_MISSILES						= 27,	
-	DAMAGE_STEALTHJET_MISSILES		= 28,	
-	DAMAGE_MOLOTOV_COCKTAIL				= 29,	
-	DAMAGE_COMANCHE_VULCAN				= 30,	
+	DAMAGE_INFANTRY_MISSILE				= 24,
+	DAMAGE_AURORA_BOMB						= 25,
+	DAMAGE_LAND_MINE							= 26,
+	DAMAGE_JET_MISSILES						= 27,
+	DAMAGE_STEALTHJET_MISSILES		= 28,
+	DAMAGE_MOLOTOV_COCKTAIL				= 29,
+	DAMAGE_COMANCHE_VULCAN				= 30,
 	DAMAGE_SUBDUAL_MISSILE				= 31,	///< Damage that does not kill you, but produces some special effect based on your Body Module. Seperate HP from normal damage.
 	DAMAGE_SUBDUAL_VEHICLE				= 32,
 	DAMAGE_SUBDUAL_BUILDING				= 33,
@@ -90,7 +87,7 @@ enum DamageType CPP_11(: Int)
 
 	// Please note: There is a string array DamageTypeFlags::s_bitNameList[]
 
-	DAMAGE_NUM_TYPES			// keep this last
+	DAMAGE_NUM_TYPES
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -165,12 +162,12 @@ void initDamageTypeFlags();
 /** Death types, keep this in sync with TheDeathNames[] */
 //-------------------------------------------------------------------------------------------------
 enum DeathType CPP_11(: Int)
-{	
+{
 	// note that these DELIBERATELY have (slightly) different names from the damage names,
 	// since there isn't necessarily a one-to-one correspondence. e.g., DEATH_BURNED
 	// can come from DAMAGE_FLAME but also from DAMAGE_PARTICLE_BEAM.
 	DEATH_NORMAL		= 0,
-	DEATH_NONE			= 1,					///< this is a "special case" that can't normally cause death			
+	DEATH_NONE			= 1,					///< this is a "special case" that can't normally cause death
   DEATH_CRUSHED		= 2,
   DEATH_BURNED		= 3,
   DEATH_EXPLODED	= 4,
@@ -182,29 +179,29 @@ enum DeathType CPP_11(: Int)
 	DEATH_DETONATED	= 10,		/**< this is the "death" that occurs when a missile/warhead/etc detonates normally,
 														as opposed to being shot down, etc */
 	DEATH_SPLATTED	= 11,		/**< the death that results from DAMAGE_FALLING */
-	DEATH_POISONED_BETA	= 12,	
+	DEATH_POISONED_BETA	= 12,
 
 	// these are the "extra" types for yet-to-be-defined stuff. Don't bother renaming or adding
 	// or removing these; they are reserved for modders :-)
-	DEATH_EXTRA_2		= 13,	
-	DEATH_EXTRA_3		= 14,	
-	DEATH_EXTRA_4		= 15,	
-	DEATH_EXTRA_5		= 16,	
-	DEATH_EXTRA_6		= 17,	
-	DEATH_EXTRA_7		= 18,	
-	DEATH_EXTRA_8		= 19,	
+	DEATH_EXTRA_2		= 13,
+	DEATH_EXTRA_3		= 14,
+	DEATH_EXTRA_4		= 15,
+	DEATH_EXTRA_5		= 16,
+	DEATH_EXTRA_6		= 17,
+	DEATH_EXTRA_7		= 18,
+	DEATH_EXTRA_8		= 19,
 	DEATH_POISONED_GAMMA = 20,
-	
-	DEATH_NUM_TYPES			// keep this last
+
+	DEATH_NUM_TYPES
 };
 
 #ifdef DEFINE_DEATH_NAMES
-static const char *TheDeathNames[] = 
+static const char *const TheDeathNames[] =
 {
-	"NORMAL",			
-	"NONE",			
-	"CRUSHED",					
-	"BURNED",		
+	"NORMAL",
+	"NONE",
+	"CRUSHED",
+	"BURNED",
 	"EXPLODED",
 	"POISONED",
 	"TOPPLED",
@@ -213,18 +210,19 @@ static const char *TheDeathNames[] =
 	"LASERED",
 	"DETONATED",
 	"SPLATTED",
-	"POISONED_BETA",	
-	"EXTRA_2",	
-	"EXTRA_3",	
-	"EXTRA_4",	
-	"EXTRA_5",	
-	"EXTRA_6",	
-	"EXTRA_7",	
-	"EXTRA_8",	
-	"POISONED_GAMMA",	
+	"POISONED_BETA",
+	"EXTRA_2",
+	"EXTRA_3",
+	"EXTRA_4",
+	"EXTRA_5",
+	"EXTRA_6",
+	"EXTRA_7",
+	"EXTRA_8",
+	"POISONED_GAMMA",
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheDeathNames) == DEATH_NUM_TYPES + 1, "Incorrect array size");
 #endif // end DEFINE_DEATH_NAMES
 
 
@@ -259,21 +257,21 @@ class DamageInfoInput : public Snapshot
 
 public:
 
-	DamageInfoInput( void ) 
-	{ 
-		m_sourceID = INVALID_ID; 
+	DamageInfoInput( void )
+	{
+		m_sourceID = INVALID_ID;
 		m_sourceTemplate = NULL;
 		m_sourcePlayerMask = 0;
-		m_damageType = DAMAGE_EXPLOSION; 
+		m_damageType = DAMAGE_EXPLOSION;
 		m_damageStatusType = OBJECT_STATUS_NONE;
 		m_damageFXOverride = DAMAGE_UNRESISTABLE;
-		m_deathType = DEATH_NORMAL; 
-		m_amount = 0; 
+		m_deathType = DEATH_NORMAL;
+		m_amount = 0;
 		m_kill = FALSE;
-    
-    m_shockWaveVector.zero();	
-    m_shockWaveAmount   = 0.0f;	
-    m_shockWaveRadius   = 0.0f;	
+
+    m_shockWaveVector.zero();
+    m_shockWaveAmount   = 0.0f;
+    m_shockWaveRadius   = 0.0f;
     m_shockWaveTaperOff = 0.0f;
 	}
 
@@ -290,7 +288,7 @@ class DamageInfoInput : public Snapshot
 	// These are used for damage causing shockwave, forcing units affected to be pushed around
 	Coord3D				 m_shockWaveVector;				///< This represents the incoming damage vector
 	Real					 m_shockWaveAmount;				///< This represents the amount of shockwave created by the damage. 0 = no shockwave, 1.0 = shockwave equal to damage.
-	Real					 m_shockWaveRadius;			  ///< This represents the effect radius of the shockwave. 
+	Real					 m_shockWaveRadius;			  ///< This represents the effect radius of the shockwave.
 	Real					 m_shockWaveTaperOff;			///< This represents the taper off effect of the shockwave at the tip of the radius. 0.0 means shockwave is 0% at the radius edge.
 
 
@@ -300,7 +298,7 @@ class DamageInfoInput : public Snapshot
 	virtual void crc( Xfer *xfer ) { }
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void ) { }
-	
+
 };
 
 const Real HUGE_DAMAGE_AMOUNT = 999999.0f;
@@ -313,15 +311,15 @@ class DamageInfoOutput : public Snapshot
 
 public:
 
-	DamageInfoOutput( void ) 
-	{ 
-		m_actualDamageDealt = 0; 
-		m_actualDamageClipped = 0; 
+	DamageInfoOutput( void )
+	{
+		m_actualDamageDealt = 0;
+		m_actualDamageClipped = 0;
 		m_noEffect = false;
 	}
 
-	/** 
-		m_actualDamageDealt is the damage we tried to apply to object (after multipliers and such). 
+	/**
+		m_actualDamageDealt is the damage we tried to apply to object (after multipliers and such).
 		m_actualDamageClipped is the value of m_actualDamageDealt, but clipped to the max health remaining of the obj.
 		example:
 			a mammoth tank fires a round at a small tank, attempting 100 damage.
@@ -329,7 +327,7 @@ class DamageInfoOutput : public Snapshot
 			furthermore, the small tank has only 30 health remaining.
 			so: m_actualDamageDealt = 50, m_actualDamageClipped = 30.
 
-		this distinction is useful, since visual fx really wants to do the fx for "50 damage", 
+		this distinction is useful, since visual fx really wants to do the fx for "50 damage",
 		even though it was more than necessary to kill this object; game logic, on the other hand,
 		may want to know the "clipped" damage for ai purposes.
 	*/
@@ -371,6 +369,3 @@ class DamageInfo : public Snapshot
 	virtual void loadPostProcess( void ){ }
 
 };
-
-#endif // __DAMAGE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h
index 8e3a91003c5..671183d092b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef EXPERIENCE_TRACKER_H
-#define EXPERIENCE_TRACKER_H
-
 #include "Common/GameCommon.h"
 #include "Common/GameType.h"
 #include "Common/GameMemory.h"
@@ -41,7 +38,7 @@ class Object;
 
 class ExperienceTracker : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ExperienceTracker, "ExperienceTrackerPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ExperienceTracker, "ExperienceTrackerPool" )
 public:
 	ExperienceTracker(Object *parent);
 
@@ -49,15 +46,18 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot
 	Int getExperienceValue( const Object* killer ) const;										///< How much do give for being killed
 	Int getCurrentExperience( void ) const { return m_currentExperience; };	///< How much experience do I have at the moment?
 	Bool isTrainable() const;																						///< Can I gain experience?
+	void setTrainable(Bool trainable);																	///< Set whether I can gain experience
+	void resetTrainable();																							///< Set to default trainable state from template
 	Bool isAcceptingExperiencePoints() const;														///< Either I am trainable, or I have a Sink set up
 
 	void setVeterancyLevel( VeterancyLevel newLevel, Bool provideFeedback = TRUE );						///< Set Level to this
-	void setMinVeterancyLevel( VeterancyLevel newLevel );					///< Set Level to AT LEAST this... if we are already >= this level, do nothing.
+	void setMinVeterancyLevel( VeterancyLevel newLevel, Bool provideFeedback = TRUE );					///< Set Level to AT LEAST this... if we are already >= this level, do nothing.
 	void addExperiencePoints( Int experienceGain, Bool canScaleForBonus = TRUE );	///< Gain this many exp.
 	Bool gainExpForLevel(Int levelsToGain, Bool canScaleForBonus = TRUE );			  ///< Gain enough exp to gain a level. return false if can't gain a level.
 	Bool canGainExpForLevel(Int levelsToGain) const;															///< return same value as gainExpForLevel, but don't change anything
 	void setExperienceAndLevel(Int experienceIn, Bool provideFeedback = TRUE );
 	void setExperienceSink( ObjectID sink );											///< My experience actually goes to this person (loose couple)
+	ObjectID getExperienceSink() const;
 
 	Real getExperienceScalar() const { return m_experienceScalar; }
 	void setExperienceScalar( Real scalar ) { m_experienceScalar = scalar; }
@@ -73,6 +73,5 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot
 	Int								m_currentExperience;								///< Number of experience points
 	ObjectID					m_experienceSink;										///< ID of object I have pledged my experience point gains to
 	Real							m_experienceScalar;									///< Scales any experience gained by this multiplier.
+	Bool							m_isTrainable;											///< Can I gain experience?
 };
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h
index 3ffd032d1aa..45faa076575 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h
@@ -29,14 +29,9 @@
 
 #pragma once
 
-#ifndef __FPUCONTROL_H__
-#define __FPUCONTROL_H__
-
 /**
   * setFPMode sets the FPU internal precision and rounding mode.  As DirectX is not guaranteed to
 	* leave the FPU in a good state, we must call this at the start of GameLogic::update() and
 	* anywhere that touches DirectX inside GameLogic loops (LoadScreen).
 	*/
 void setFPMode( void );
-
-#endif // __FPUCONTROL_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h
index f994baee502..237b009bb3e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef FIRING_TRACKER_H
-#define FIRING_TRACKER_H
-
 #include "Common/GameType.h"
 #include "Common/GameMemory.h"
 #include "Common/AudioEventRTS.h"
@@ -52,7 +49,7 @@ class FiringTrackerModuleData : public ModuleData
 class FiringTracker : public UpdateModule
 {
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( FiringTracker, FiringTrackerModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FiringTracker, "FiringTrackerPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FiringTracker, "FiringTrackerPool" )
 public:
 	FiringTracker(Thing *thing, const ModuleData *modData);
 	void shotFired(const Weapon* weaponFired, ObjectID victimID );			///< Owner just fired this weapon at this Object
@@ -91,6 +88,3 @@ class FiringTracker : public UpdateModule
 	UnsignedInt			m_frameToStopLoopingSound;	///< if sound is looping, frame to stop looping it (or zero if not looping)
 	AudioHandle			m_audioHandle;
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h
index d9d8afcabee..c4f7e130737 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h
@@ -29,16 +29,12 @@
 
 #pragma once
 
-#ifndef _GAME_LOGIC_H_
-#define _GAME_LOGIC_H_
-
 #include "Common/GameCommon.h"	// ensure we get DUMP_PERF_STATS, or not
 #include "Common/GameType.h"
 #include "Common/Snapshot.h"
 #include "Common/STLTypedefs.h"
 #include "Common/ObjectStatusTypes.h"
 #include "GameNetwork/NetworkDefs.h"
-#include "Common/STLTypedefs.h"
 #include "GameLogic/Module/UpdateModule.h"	// needed for DIRECT_UPDATEMODULE_ACCESS
 
 /*
@@ -72,7 +68,7 @@ enum BuildableStatus CPP_11(: Int);
 typedef const CommandButton* ConstCommandButtonPtr;
 
 // What kind of game we're in.
-enum
+enum GameMode CPP_11(: Int)
 {
 	GAME_SINGLE_PLAYER,
 	GAME_LAN,
@@ -91,7 +87,7 @@ enum
 
 
 /// Function pointers for use by GameLogic callback functions.
-typedef void (*GameLogicFuncPtr)( Object *obj, void *userData ); 
+typedef void (*GameLogicFuncPtr)( Object *obj, void *userData );
 //typedef std::hash_map<ObjectID, Object *, rts::hash<ObjectID>, rts::equal_to<ObjectID> > ObjectPtrHash;
 //typedef ObjectPtrHash::const_iterator ObjectPtrIter;
 
@@ -99,7 +95,7 @@ typedef std::vector<Object*> ObjectPtrVector;
 
 // ------------------------------------------------------------------------------------------------
 /**
- * The implementation of GameLogic 
+ * The implementation of GameLogic
  */
 class GameLogic : public SubsystemInterface, public Snapshot
 {
@@ -116,14 +112,14 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 	void preUpdate();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	Int getNumberSleepyUpdates() const {return m_sleepyUpdates.size();} //For profiling, so not in Release.
 #endif
 	void processCommandList( CommandList *list );		///< process the command list
 
-	void prepareNewGame( Int gameMode, GameDifficulty diff, Int rankPoints );						///< prepare for new game 
+	void prepareNewGame( GameMode gameMode, GameDifficulty diff, Int rankPoints );						///< prepare for new game
 
-	void logicMessageDispatcher( GameMessage *msg, 
+	void logicMessageDispatcher( GameMessage *msg,
 																			 void *userData );	///< Logic command list processing
 
 	void registerObject( Object *obj );							///< Given an object, register it with the GameLogic and give it a unique ID
@@ -138,6 +134,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	Real getHeight( void );													///< Returns the height of the world
 
 	Bool isInGameLogicUpdate( void ) const { return m_isInUpdate; }
+	Bool hasUpdated() const { return m_hasUpdated; } ///< Returns true if the logic frame has advanced in the current client/render update
 	UnsignedInt getFrame( void );										///< Returns the current simulation frame number
 	UnsignedInt getCRC( Int mode = CRC_CACHED, AsciiString deepCRCFileName = AsciiString::TheEmptyString );		///< Returns the CRC
 
@@ -165,16 +162,17 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 	void updateLoadProgress( Int progress );
 	void deleteLoadScreen( void );
-	
+
 	//Kris: Cut setGameLoading() and replaced with setLoadingMap() and setLoadingSave() -- reason: nomenclature
 	//void setGameLoading( Bool loading ) { m_loadingScene = loading; }
 	void setLoadingMap( Bool loading ) { m_loadingMap = loading; }
 	void setLoadingSave( Bool loading ) { m_loadingSave = loading; }
 	void setClearingGameData( Bool clearing ) { m_clearingGameData = clearing; }
-	
-	void setGameMode( Int mode );
-	Int getGameMode( void );
-	Bool isInGame( void );
+
+	void setGameMode( GameMode mode );
+	GameMode getGameMode( void );
+
+	Bool isInGame( void ); // Includes Shell Game
 	Bool isInLanGame( void );
 	Bool isInSinglePlayerGame( void );
 	Bool isInSkirmishGame( void );
@@ -182,6 +180,9 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	Bool isInInternetGame( void );
 	Bool isInShellGame( void );
 	Bool isInMultiplayerGame( void );
+	Bool isInInteractiveGame() const;
+
+	static Bool isInInteractiveGame(GameMode mode) { return mode != GAME_NONE && mode != GAME_SHELL; }
 
 	//Kris: Cut isLoadingGame() and replaced with isLoadingMap() and isLoadingSave() -- reason: nomenclature
 	//Bool isLoadingGame() const { return m_loadingScene; }		// This is the old function that isn't very clear on it's definition.
@@ -209,6 +210,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	void updateObjectsChangedTriggerAreas(void) {m_frameObjectsChangedTriggerAreas = m_frame;}
 	UnsignedInt getFrameObjectsChangedTriggerAreas(void) {return m_frameObjectsChangedTriggerAreas;}
 
+	void exitGame();
 	void clearGameData(Bool showScoreScreen = TRUE);														///< Clear the game data
 	void closeWindows( void );
 
@@ -217,7 +219,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 	void bindObjectAndDrawable(Object* obj, Drawable* draw);
 
-	void setGamePausedInFrame( UnsignedInt frame );
+	void setGamePausedInFrame( UnsignedInt frame, Bool disableLogicTimeScale );
 	UnsignedInt getGamePauseFrame() const { return m_pauseFrame; }
 	void setGamePaused( Bool paused, Bool pauseMusic = TRUE, Bool pauseInput = TRUE );
 	Bool isGamePaused( void );
@@ -231,12 +233,12 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	UnsignedInt getObjectCount( void );
 
 	Int getRankLevelLimit() const { return m_rankLevelLimit; }
-	void setRankLevelLimit(Int limit) 
-	{ 
+	void setRankLevelLimit(Int limit)
+	{
 		if (limit < 1) limit = 1;
-		m_rankLevelLimit = limit; 
+		m_rankLevelLimit = limit;
 	}
-	
+
 	// We need to allow access to this, because on a restartGame, we need to restart with the settings we started with
 	Int getRankPointsToAddAtGameStart() const { return m_rankPointsToAddAtGameStart; }
 
@@ -249,7 +251,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	void incrementOverallFailedPathfinds() { m_overallFailedPathfinds++; }
 	UnsignedInt getOverallFailedPathfinds() const { return m_overallFailedPathfinds; }
 #endif
-	
+
 	// NOTE: selectObject and deselectObject should be called *only* by logical things, NEVER by the
 	// client. These will cause the client to select or deselect the object, if affectClient is true.
 	// If createToSelection is TRUE, this object causes a new group to be selected.
@@ -268,6 +270,8 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 private:
 
+	void updateDisplayBusyState();
+
 	void pauseGameLogic(Bool paused);
 	void pauseGameSound(Bool paused);
 	void pauseGameMusic(Bool paused);
@@ -283,6 +287,8 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	void remakeSleepyUpdate();
 	void validateSleepyUpdate() const;
 
+	static void createOptimizedTree(const ThingTemplate *thingTemplate, Coord3D *pos, Real angle);
+
 private:
 
 	/**
@@ -300,21 +306,19 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 	Real m_width, m_height;																	///< Dimensions of the world
 	UnsignedInt m_frame;																		///< Simulation frame number
-	
+
 	// CRC cache system -----------------------------------------------------------------------------
 	UnsignedInt	m_CRC;																			///< Cache of previous CRC value
 	std::map<Int, UnsignedInt> m_cachedCRCs;								///< CRCs we've seen this frame
 	Bool m_shouldValidateCRCs;															///< Should we validate CRCs this frame?
 	//-----------------------------------------------------------------------------------------------
-
-	//Added By Sadullah Nader
-	//Used to for load scene
 	//Bool m_loadingScene;
 	Bool m_loadingMap;
 	Bool m_loadingSave;
 	Bool m_clearingGameData;
 
 	Bool m_isInUpdate;
+	Bool m_hasUpdated;
 
 	Int m_rankPointsToAddAtGameStart;
 
@@ -337,7 +341,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	// (for an excellent discussion of priority queues, please see:
 	// http://dogma.net/markn/articles/pq_stl/priority.htm)
 	std::vector<UpdateModulePtr> m_sleepyUpdates;
-	
+
 #ifdef ALLOW_NONSLEEPY_UPDATES
 	// this is a plain old list, not a pq.
 	std::list<UpdateModulePtr> m_normalUpdates;
@@ -349,7 +353,6 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 	ObjectID m_nextObjID;																		///< For allocating object id's
 
-	void setDefaults( Bool loadSaveGame );									///< Set default values of class object
 	void processDestroyList( void );												///< Destroy all pending objects on the destroy list
 
 	void destroyAllObjectsImmediate();											///< destroy, and process destroy list immediately
@@ -358,7 +361,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	virtual TerrainLogic *createTerrainLogic( void );
 	virtual GhostObjectManager *createGhostObjectManager(void);
 
-	Int m_gameMode;
+	GameMode m_gameMode;
 	Int m_rankLevelLimit;
   UnsignedShort m_superweaponRestriction;
 
@@ -372,6 +375,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	Bool m_pauseInput;
 	Bool m_inputEnabledMemory;// Latches used to remember what to restore to after we unpause
 	Bool m_mouseVisibleMemory;
+	Bool m_logicTimeScaleEnabledMemory;
 
 	Bool m_progressComplete[MAX_SLOTS];
 	enum { PROGRESS_COMPLETE_TIMEOUT = 60000 };							///< Timeout we wait for when we've completed our Load
@@ -400,7 +404,7 @@ class GameLogic : public SubsystemInterface, public Snapshot
 	ObjectTOCEntry *findTOCEntryById( UnsignedShort id );		///< find ObjectTOC by id
 	void xferObjectTOC( Xfer *xfer );												///< save/load object TOC for current state of map
 	void prepareLogicForObjectLoad( void );									///< prepare engine for object data from game file
-		
+
 };
 
 // INLINE /////////////////////////////////////////////////////////////////////////////////////////
@@ -410,12 +414,12 @@ inline void GameLogic::setHeight( Real height ) { m_height = height; }
 inline Real GameLogic::getHeight( void ) { return m_height; }
 inline UnsignedInt GameLogic::getFrame( void ) { return m_frame; }
 
-inline Bool GameLogic::isInGame( void ) { return !(m_gameMode == GAME_NONE); }
-inline void GameLogic::setGameMode( Int mode ) { m_gameMode = mode; }
-inline Int  GameLogic::getGameMode( void ) { return m_gameMode; }
+inline Bool GameLogic::isInGame( void ) { return m_gameMode != GAME_NONE; }
+inline GameMode GameLogic::getGameMode( void ) { return m_gameMode; }
 inline Bool GameLogic::isInLanGame( void ) { return (m_gameMode == GAME_LAN); }
 inline Bool GameLogic::isInSkirmishGame( void ) { return (m_gameMode == GAME_SKIRMISH); }
-inline Bool GameLogic::isInMultiplayerGame( void ) { return ((m_gameMode == GAME_LAN) || (m_gameMode == GAME_INTERNET)) ; }
+inline Bool GameLogic::isInMultiplayerGame( void ) { return (m_gameMode == GAME_LAN) || (m_gameMode == GAME_INTERNET) ; }
+inline Bool GameLogic::isInInteractiveGame() const { return isInInteractiveGame(m_gameMode); }
 inline Bool GameLogic::isInReplayGame( void ) { return (m_gameMode == GAME_REPLAY); }
 inline Bool GameLogic::isInInternetGame( void ) { return (m_gameMode == GAME_INTERNET); }
 inline Bool GameLogic::isInShellGame( void ) { return (m_gameMode == GAME_SHELL); }
@@ -429,7 +433,7 @@ inline Object* GameLogic::findObjectByID( ObjectID id )
 //	ObjectPtrHash::iterator it = m_objHash.find(id);
 //	if (it == m_objHash.end())
 //		return NULL;
-//	
+//
 //	return (*it).second;
 	if( (size_t)id < m_objVector.size() )
 		return m_objVector[(size_t)id];
@@ -441,6 +445,3 @@ inline Object* GameLogic::findObjectByID( ObjectID id )
 
 // the singleton
 extern GameLogic *TheGameLogic;
-
-#endif // _GAME_LOGIC_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h
index 5e64f61f1b8..7f2dbf14365 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h
@@ -29,18 +29,11 @@
 
 #pragma once
 
-#ifndef _GHOSTOBJECT_H_
-#define _GHOSTOBJECT_H_
-
 #include "Lib/BaseType.h"
 #include "Common/Snapshot.h"
 
 // #define DEBUG_FOG_MEMORY	///< this define is used to force object snapshots for all players, not just local player.
 
-//Magic pointer value which indicates that a drawable pointer is actually invalid
-//because we're looking at a ghost object.
-#define GHOST_OBJECT_DRAWABLE	0xFFFFFFFF
-
 class Object;
 class PartitionData;
 enum GeometryType CPP_11(: Int);
@@ -54,16 +47,15 @@ class GhostObject : public Snapshot
 	virtual void snapShot(int playerIndex)=0;
 	virtual void updateParentObject(Object *object, PartitionData *mod)=0;
 	virtual void freeSnapShot(int playerIndex)=0;
-	inline PartitionData *friend_getPartitionData(void) const {return m_partitionData;}
-	inline GeometryType getGeometryType(void) const {return m_parentGeometryType;}
-	inline Bool getGeometrySmall(void) const {return m_parentGeometryIsSmall;}
-	inline Real getGeometryMajorRadius(void) const {return m_parentGeometryMajorRadius;}
-	inline Real getGeometryMinorRadius(void) const {return m_parentGeometryminorRadius;}
-	inline Real getParentAngle(void) const {return m_parentAngle;}
-	inline const Coord3D *getParentPosition(void) const {return &m_parentPosition;}
+	PartitionData *friend_getPartitionData(void) const {return m_partitionData;}
+	GeometryType getGeometryType(void) const {return m_parentGeometryType;}
+	Bool getGeometrySmall(void) const {return m_parentGeometryIsSmall;}
+	Real getGeometryMajorRadius(void) const {return m_parentGeometryMajorRadius;}
+	Real getGeometryMinorRadius(void) const {return m_parentGeometryminorRadius;}
+	Real getParentAngle(void) const {return m_parentAngle;}
+	const Coord3D *getParentPosition(void) const {return &m_parentPosition;}
 
 protected:
-
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
@@ -83,26 +75,38 @@ class GhostObjectManager : public Snapshot
 public:
 	GhostObjectManager();
 	virtual ~GhostObjectManager();
+
 	virtual void reset(void);
 	virtual GhostObject *addGhostObject(Object *object, PartitionData *pd);
 	virtual void removeGhostObject(GhostObject *mod);
-	virtual inline void setLocalPlayerIndex(int index) { m_localPlayer = index; }
-	inline int getLocalPlayerIndex(void)	{ return m_localPlayer; }
-	virtual void updateOrphanedObjects(int *playerIndexList, int numNonLocalPlayers);
+	virtual void setLocalPlayerIndex(int playerIndex) { m_localPlayer = playerIndex; }
+	int getLocalPlayerIndex(void)	{ return m_localPlayer; }
+	virtual void updateOrphanedObjects(int *playerIndexList, int playerIndexCount);
 	virtual void releasePartitionData(void);	///<saves data needed to later rebuild partition manager data.
 	virtual void restorePartitionData(void);	///<restores ghost objects into the partition manager.
-	inline void lockGhostObjects(Bool enableLock) {m_lockGhostObjects=enableLock;}	///<temporary lock on creating new ghost objects. Only used by map border resizing!
-	inline void saveLockGhostObjects(Bool enableLock) {m_saveLockGhostObjects=enableLock;}
+	void lockGhostObjects(Bool enableLock) {m_lockGhostObjects=enableLock;}	///<temporary lock on creating new ghost objects. Only used by map border resizing!
+	void saveLockGhostObjects(Bool enableLock) {m_saveLockGhostObjects=enableLock;}
+	inline Bool trackAllPlayers() const; ///< returns whether the ghost object status is tracked for all players or for the local player only
+
 protected:
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
+
 	Int m_localPlayer;
 	Bool m_lockGhostObjects;
 	Bool m_saveLockGhostObjects;	///< used to lock the ghost object system during a save/load
+	Bool m_trackAllPlayers; ///< if enabled, tracks ghost object status for all players, otherwise for the local player only
 };
 
+inline Bool GhostObjectManager::trackAllPlayers() const
+{
+#ifdef DEBUG_FOG_MEMORY
+	return true;
+#else
+	return m_trackAllPlayers;
+#endif
+}
+
 // the singleton
 extern GhostObjectManager *TheGhostObjectManager;
-
-#endif // _GAME_DISPLAY_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h
index af8c7f1a97a..6a3886ea982 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __Locomotor_H_
-#define __Locomotor_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/NameKeyGenerator.h"
 #include "Common/Override.h"
@@ -61,18 +58,22 @@ enum LocomotorAppearance CPP_11(: Int)
 	LOCO_WINGS,
 	LOCO_CLIMBER,			// human climber - backs down cliffs.
 	LOCO_OTHER,
-	LOCO_MOTORCYCLE
+	LOCO_MOTORCYCLE,
+
+	LOCOMOTOR_APPEARANCE_COUNT
 };
 
 enum LocomotorPriority CPP_11(: Int)
 {
-	LOCO_MOVES_BACK=0,				// In a group, this one moves toward the back
-	LOCO_MOVES_MIDDLE=1,			// In a group, this one stays in the middle
-	LOCO_MOVES_FRONT=2				// In a group, this one moves toward the front of the group
+	LOCO_MOVES_BACK,				// In a group, this one moves toward the back
+	LOCO_MOVES_MIDDLE,			// In a group, this one stays in the middle
+	LOCO_MOVES_FRONT,				// In a group, this one moves toward the front of the group
+
+	LOCOMOTOR_PRIORITY_COUNT
 };
 
 #ifdef DEFINE_LOCO_APPEARANCE_NAMES
-static const char *TheLocomotorAppearanceNames[] = 
+static const char *const TheLocomotorAppearanceNames[] =
 {
 	"TWO_LEGS",
 	"FOUR_WHEELS",
@@ -86,6 +87,7 @@ static const char *TheLocomotorAppearanceNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheLocomotorAppearanceNames) == LOCOMOTOR_APPEARANCE_COUNT + 1, "Array size");
 #endif
 
 //-------------------------------------------------------------------------------------------------
@@ -98,11 +100,13 @@ enum LocomotorBehaviorZ CPP_11(: Int)
 	Z_FIXED_SURFACE_RELATIVE_HEIGHT,		// stays fixed at surface-rel height, regardless of physics
 	Z_FIXED_ABSOLUTE_HEIGHT,						// stays fixed at absolute height, regardless of physics
 	Z_RELATIVE_TO_GROUND_AND_BUILDINGS,	// stays fixed at surface-rel height including buildings, regardless of physics
-	Z_SMOOTH_RELATIVE_TO_HIGHEST_LAYER	// try to follow a height relative to the highest layer.
+	Z_SMOOTH_RELATIVE_TO_HIGHEST_LAYER,	// try to follow a height relative to the highest layer.
+
+	LOCOMOTOR_BEHAVIOR_Z_COUNT
 };
 
 #ifdef DEFINE_LOCO_Z_NAMES
-static const char *TheLocomotorBehaviorZNames[] = 
+static const char *const TheLocomotorBehaviorZNames[] =
 {
 	"NO_Z_MOTIVE_FORCE",
 	"SEA_LEVEL",
@@ -115,6 +119,7 @@ static const char *TheLocomotorBehaviorZNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheLocomotorBehaviorZNames) == LOCOMOTOR_BEHAVIOR_Z_COUNT + 1, "Array size");
 #endif
 
 //-------------------------------------------------------------------------------------------------
@@ -187,7 +192,7 @@ class LocomotorTemplate : public Overridable
 	Real											m_uniformAxialDamping;	///< For Attenuating the pitch and roll rates
 	Real											m_turnPivotOffset;			///< should we pivot around noncenter? (-1.0 = rear, 0.0 = center, 1.0 = front)
 	Int												m_airborneTargetingHeight;	///< The height transition at witch I should mark myself as a AA target.
-	
+
 	Real											m_closeEnoughDist;			///< How close we have to approach the end of a path before stopping
 	Bool											m_isCloseEnoughDist3D;	///< And is that calculation 3D, for very rare cases that need to move straight down.
 	Real											m_ultraAccurateSlideIntoPlaceFactor;			///< how much we can fudge turning when ultra-accurate
@@ -210,17 +215,17 @@ class LocomotorTemplate : public Overridable
 
 
 	Real											m_rudderCorrectionDegree;
-	Real											m_rudderCorrectionRate;	
+	Real											m_rudderCorrectionRate;
 	Real											m_elevatorCorrectionDegree;
 	Real											m_elevatorCorrectionRate;
-};	
+};
 
 typedef OVERRIDE<LocomotorTemplate> LocomotorTemplateOverride;
 
 // ---------------------------------------------------------
 class Locomotor : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Locomotor, "Locomotor" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Locomotor, "Locomotor" )
 
 	friend class LocomotorStore;
 
@@ -228,7 +233,7 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 
 	void setPhysicsOptions(Object* obj);
 
-	void locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalPos, 
+	void locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalPos,
 		Real onPathDistToGoal, Real desiredSpeed, Bool *blocked);
 	void locoUpdate_moveTowardsAngle(Object* obj, Real angle);
 	/**
@@ -237,7 +242,7 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 		return true if we can maintain the position without being called every frame (eg, we are
 		resting on the ground), false if not (eg, we are hovering or circling)
 	*/
-	Bool locoUpdate_maintainCurrentPosition(Object* obj); 
+	Bool locoUpdate_maintainCurrentPosition(Object* obj);
 
 	Real getMaxSpeedForCondition(BodyDamageType condition) const;  ///< get max speed given condition
 	Real getMaxTurnRate(BodyDamageType condition) const;  ///< get max turning rate given condition
@@ -245,76 +250,76 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 	Real getMaxLift(BodyDamageType condition) const;  ///< get acceleration given condition
 	Real getBraking() const;  ///< get braking given condition
 
-	inline Real getPreferredHeight() const { return m_preferredHeight;} ///< Just return preferredheight, no damage consideration
-	inline void restorePreferredHeightFromTemplate() { m_preferredHeight = m_template->m_preferredHeight; };
-	inline Real getPreferredHeightDamping() const { return m_preferredHeightDamping;} 
-	inline LocomotorAppearance getAppearance() const { return m_template->m_appearance; }
-	inline LocomotorPriority getMovePriority() const { return m_template->m_movePriority; }
-	inline LocomotorSurfaceTypeMask getLegalSurfaces() const { return m_template->m_surfaces; }
-
-	inline AsciiString getTemplateName() const { return m_template->m_name;}
-	inline Real getMinSpeed() const { return m_template->m_minSpeed;}
-	inline Real getAccelPitchLimit() const { return m_template->m_accelPitchLimit;}	///< Maximum amount we will pitch up or down under acceleration (including recoil.)
-	inline Real getDecelPitchLimit() const { return m_template->m_decelPitchLimit;}	///< Maximum amount we will pitch down under deceleration (including recoil.)
-	inline Real getBounceKick() const { return m_template->m_bounceKick;}						///< How much simulating rough terrain "bounces" a wheel up.
-	inline Real getPitchStiffness() const { return m_template->m_pitchStiffness;}			///< How stiff the springs are forward & back.
-	inline Real getRollStiffness() const { return m_template->m_rollStiffness;}				///< How stiff the springs are side to side.
-	inline Real getPitchDamping() const { return m_template->m_pitchDamping;}	///< How good the shock absorbers are.
-	inline Real getRollDamping() const { return m_template->m_rollDamping;}	///< How good the shock absorbers are.
-	inline Real getPitchByZVelCoef() const { return m_template->m_pitchByZVelCoef;}		///< How much we pitch in response to speed.
-	inline Real getThrustRoll() const { return m_template->m_thrustRoll; }  ///< Thrust roll
-	inline Real getWobbleRate() const { return m_template->m_wobbleRate; }  ///< how fast thrust things "wobble"
-	inline Real getMaxWobble() const { return m_template->m_maxWobble; }  ///< how much thrust things "wobble"
-	inline Real getMinWobble() const { return m_template->m_minWobble; }  ///< how much thrust things "wobble"
-
-	inline Real getForwardVelCoef() const { return m_template->m_forwardVelCoef;}		///< How much we pitch in response to speed.
-	inline Real getLateralVelCoef() const { return m_template->m_lateralVelCoef;}			///< How much we roll in response to speed.
-	inline Real getForwardAccelCoef() const { return m_template->m_forwardAccelCoef;}		///< How much we pitch in response to acceleration.
-	inline Real getLateralAccelCoef() const { return m_template->m_lateralAccelCoef;}			///< How much we roll in response to acceleration.
-	inline Real getUniformAxialDamping() const { return m_template->m_uniformAxialDamping;}			///< How much we roll in response to acceleration.
-	inline Real getTurnPivotOffset() const { return m_template->m_turnPivotOffset;}
-	inline Bool getApply2DFrictionWhenAirborne() const { return m_template->m_apply2DFrictionWhenAirborne; }
-	inline Bool getIsDownhillOnly() const { return m_template->m_downhillOnly; }
-	inline Bool getAllowMotiveForceWhileAirborne() const { return m_template->m_allowMotiveForceWhileAirborne; }
-	inline Int getAirborneTargetingHeight() const { return m_template->m_airborneTargetingHeight; }
-	inline Bool getLocomotorWorksWhenDead() const { return m_template->m_locomotorWorksWhenDead; }
-	inline Bool getStickToGround() const { return m_template->m_stickToGround; }
-	inline Real getCloseEnoughDist() const { return m_closeEnoughDist; }
-	inline Bool isCloseEnoughDist3D() const { return getFlag(IS_CLOSE_ENOUGH_DIST_3D); }
-	inline Bool hasSuspension() const {return m_template->m_hasSuspension;}
-	inline Bool canMoveBackwards() const {return m_template->m_canMoveBackward;}
-	inline Real getMaxWheelExtension() const {return m_template->m_maximumWheelExtension;}
-	inline Real getMaxWheelCompression() const {return m_template->m_maximumWheelCompression;}
-	inline Real getWheelTurnAngle() const {return m_template->m_wheelTurnAngle;}
-
-  
-	inline Real getRudderCorrectionDegree()	  const { return m_template->m_rudderCorrectionDegree;}			///< How much we roll in response to acceleration.
-	inline Real getRudderCorrectionRate()	    const { return m_template->m_rudderCorrectionRate;}			///< How much we roll in response to acceleration.
-	inline Real getElevatorCorrectionDegree() const { return m_template->m_elevatorCorrectionDegree;}			///< How much we roll in response to acceleration.
-	inline Real getElevatorCorrectionRate()	  const { return m_template->m_elevatorCorrectionRate;}			///< How much we roll in response to acceleration.
-
-
-	inline Real getWanderWidthFactor() const {return m_template->m_wanderWidthFactor;}
-	inline Real getWanderAboutPointRadius() const {return m_template->m_wanderAboutPointRadius;}
+	Real getPreferredHeight() const { return m_preferredHeight;} ///< Just return preferredheight, no damage consideration
+	void restorePreferredHeightFromTemplate() { m_preferredHeight = m_template->m_preferredHeight; };
+	Real getPreferredHeightDamping() const { return m_preferredHeightDamping;}
+	LocomotorAppearance getAppearance() const { return m_template->m_appearance; }
+	LocomotorPriority getMovePriority() const { return m_template->m_movePriority; }
+	LocomotorSurfaceTypeMask getLegalSurfaces() const { return m_template->m_surfaces; }
+
+	AsciiString getTemplateName() const { return m_template->m_name;}
+	Real getMinSpeed() const { return m_template->m_minSpeed;}
+	Real getAccelPitchLimit() const { return m_template->m_accelPitchLimit;}	///< Maximum amount we will pitch up or down under acceleration (including recoil.)
+	Real getDecelPitchLimit() const { return m_template->m_decelPitchLimit;}	///< Maximum amount we will pitch down under deceleration (including recoil.)
+	Real getBounceKick() const { return m_template->m_bounceKick;}						///< How much simulating rough terrain "bounces" a wheel up.
+	Real getPitchStiffness() const { return m_template->m_pitchStiffness;}			///< How stiff the springs are forward & back.
+	Real getRollStiffness() const { return m_template->m_rollStiffness;}				///< How stiff the springs are side to side.
+	Real getPitchDamping() const { return m_template->m_pitchDamping;}	///< How good the shock absorbers are.
+	Real getRollDamping() const { return m_template->m_rollDamping;}	///< How good the shock absorbers are.
+	Real getPitchByZVelCoef() const { return m_template->m_pitchByZVelCoef;}		///< How much we pitch in response to speed.
+	Real getThrustRoll() const { return m_template->m_thrustRoll; }  ///< Thrust roll
+	Real getWobbleRate() const { return m_template->m_wobbleRate; }  ///< how fast thrust things "wobble"
+	Real getMaxWobble() const { return m_template->m_maxWobble; }  ///< how much thrust things "wobble"
+	Real getMinWobble() const { return m_template->m_minWobble; }  ///< how much thrust things "wobble"
+
+	Real getForwardVelCoef() const { return m_template->m_forwardVelCoef;}		///< How much we pitch in response to speed.
+	Real getLateralVelCoef() const { return m_template->m_lateralVelCoef;}			///< How much we roll in response to speed.
+	Real getForwardAccelCoef() const { return m_template->m_forwardAccelCoef;}		///< How much we pitch in response to acceleration.
+	Real getLateralAccelCoef() const { return m_template->m_lateralAccelCoef;}			///< How much we roll in response to acceleration.
+	Real getUniformAxialDamping() const { return m_template->m_uniformAxialDamping;}			///< How much we roll in response to acceleration.
+	Real getTurnPivotOffset() const { return m_template->m_turnPivotOffset;}
+	Bool getApply2DFrictionWhenAirborne() const { return m_template->m_apply2DFrictionWhenAirborne; }
+	Bool getIsDownhillOnly() const { return m_template->m_downhillOnly; }
+	Bool getAllowMotiveForceWhileAirborne() const { return m_template->m_allowMotiveForceWhileAirborne; }
+	Int getAirborneTargetingHeight() const { return m_template->m_airborneTargetingHeight; }
+	Bool getLocomotorWorksWhenDead() const { return m_template->m_locomotorWorksWhenDead; }
+	Bool getStickToGround() const { return m_template->m_stickToGround; }
+	Real getCloseEnoughDist() const { return m_closeEnoughDist; }
+	Bool isCloseEnoughDist3D() const { return getFlag(IS_CLOSE_ENOUGH_DIST_3D); }
+	Bool hasSuspension() const {return m_template->m_hasSuspension;}
+	Bool canMoveBackwards() const {return m_template->m_canMoveBackward;}
+	Real getMaxWheelExtension() const {return m_template->m_maximumWheelExtension;}
+	Real getMaxWheelCompression() const {return m_template->m_maximumWheelCompression;}
+	Real getWheelTurnAngle() const {return m_template->m_wheelTurnAngle;}
+
+
+	Real getRudderCorrectionDegree()	  const { return m_template->m_rudderCorrectionDegree;}			///< How much we roll in response to acceleration.
+	Real getRudderCorrectionRate()	    const { return m_template->m_rudderCorrectionRate;}			///< How much we roll in response to acceleration.
+	Real getElevatorCorrectionDegree() const { return m_template->m_elevatorCorrectionDegree;}			///< How much we roll in response to acceleration.
+	Real getElevatorCorrectionRate()	  const { return m_template->m_elevatorCorrectionRate;}			///< How much we roll in response to acceleration.
+
+
+	Real getWanderWidthFactor() const {return m_template->m_wanderWidthFactor;}
+	Real getWanderAboutPointRadius() const {return m_template->m_wanderAboutPointRadius;}
 
 	Real calcMinTurnRadius(BodyDamageType condition, Real* timeToTravelThatDist) const;
 
 	/// this is handy for doing things like forcing helicopters to crash realistically: cut their lift.
-	inline void setMaxLift(Real lift) { m_maxLift = lift; }
-	inline void setMaxSpeed(Real speed) 
-	{ 
-		DEBUG_ASSERTCRASH(!(speed <= 0.0f && m_template->m_appearance == LOCO_THRUST), ("THRUST locos may not have zero speeds!\n")); 
-		m_maxSpeed = speed; 
+	void setMaxLift(Real lift) { m_maxLift = lift; }
+	void setMaxSpeed(Real speed)
+	{
+		DEBUG_ASSERTCRASH(!(speed <= 0.0f && m_template->m_appearance == LOCO_THRUST), ("THRUST locos may not have zero speeds!"));
+		m_maxSpeed = speed;
 	}
-	inline void setMaxAcceleration(Real accel) { m_maxAccel = accel; }
-	inline void setMaxBraking(Real braking) { m_maxBraking = braking; }
-	inline void setMaxTurnRate(Real turn) { m_maxTurnRate = turn; }
-	inline void setAllowInvalidPosition(Bool allow) { setFlag(ALLOW_INVALID_POSITION, allow); }
-	inline void setCloseEnoughDist( Real dist ) { m_closeEnoughDist = dist; }
-	inline void setCloseEnoughDist3D( Bool setting ) { setFlag(IS_CLOSE_ENOUGH_DIST_3D, setting); }
-	inline Bool isInvalidPositionAllowed() const { return getFlag( ALLOW_INVALID_POSITION ); }
+	void setMaxAcceleration(Real accel) { m_maxAccel = accel; }
+	void setMaxBraking(Real braking) { m_maxBraking = braking; }
+	void setMaxTurnRate(Real turn) { m_maxTurnRate = turn; }
+	void setAllowInvalidPosition(Bool allow) { setFlag(ALLOW_INVALID_POSITION, allow); }
+	void setCloseEnoughDist( Real dist ) { m_closeEnoughDist = dist; }
+	void setCloseEnoughDist3D( Bool setting ) { setFlag(IS_CLOSE_ENOUGH_DIST_3D, setting); }
+	Bool isInvalidPositionAllowed() const { return getFlag( ALLOW_INVALID_POSITION ); }
 
-	inline void setPreferredHeight( Real height ) { m_preferredHeight = height; }
+	void setPreferredHeight( Real height ) { m_preferredHeight = height; }
 
 #ifdef CIRCLE_FOR_LANDING
 	/**
@@ -323,25 +328,25 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 	*/
 	inline void setAltitudeChangeThresholdForCircling(Real a) { m_circleThresh = a; }
 #endif
-	
+
 	/**
 		when off (the default), things get to adjust their z-pos as their
-		loco says (in particular, airborne things tend to try to fly at a preferred height). 
+		loco says (in particular, airborne things tend to try to fly at a preferred height).
 
 		when on, they do their best to reach the specified zpos, even if it's not at their preferred height.
 		this is used mainly for force missiles to swoop in on their target, and to force airplane takeoff/landing
 		to go smoothly.
 	*/
-	inline void setUsePreciseZPos(Bool u) { setFlag(PRECISE_Z_POS, u); }
+	void setUsePreciseZPos(Bool u) { setFlag(PRECISE_Z_POS, u); }
 
 	/**
-    when off (the default), units slow down as they approach their target. 
+    when off (the default), units slow down as they approach their target.
 
     when on, units go full speed till the end, and may overshoot their target.
     this is useful mainly in some weird, temporary situations where we know we are
     going to follow this move with another one...	or for carbombs.
 	*/
-	inline void setNoSlowDownAsApproachingDest(Bool u) { setFlag(NO_SLOW_DOWN_AS_APPROACHING_DEST, u); }
+	void setNoSlowDownAsApproachingDest(Bool u) { setFlag(NO_SLOW_DOWN_AS_APPROACHING_DEST, u); }
 
 	/**
     when off (the default), units do their normal stuff.
@@ -354,10 +359,10 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 		For ground units, it also allows units to have a destination off of a pathfing grid.
 
 	*/
-	inline void setUltraAccurate(Bool u) { setFlag(ULTRA_ACCURATE, u); }
-	inline Bool isUltraAccurate() const { return getFlag(ULTRA_ACCURATE); }
+	void setUltraAccurate(Bool u) { setFlag(ULTRA_ACCURATE, u); }
+	Bool isUltraAccurate() const { return getFlag(ULTRA_ACCURATE); }
 
-	inline Bool isMovingBackwards(void) const {return getFlag(MOVING_BACKWARDS);}
+	Bool isMovingBackwards(void) const {return getFlag(MOVING_BACKWARDS);}
 
 	void startMove(void); ///< Indicates that a move is starting, primarily to reset the donut timer. jba.
 
@@ -432,8 +437,8 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 		OFFSET_INCREASING
 	};
 
-	inline Bool getFlag(LocoFlag f) const { return (m_flags & (1 << f)) != 0; }
-	inline void setFlag(LocoFlag f, Bool b) { if (b) m_flags |= (1<<f); else m_flags &= ~(1<<f); }
+	Bool getFlag(LocoFlag f) const { return (m_flags & (1 << f)) != 0; }
+	void setFlag(LocoFlag f, Bool b) { if (b) m_flags |= (1<<f); else m_flags &= ~(1<<f); }
 
 	LocomotorTemplateOverride m_template;		///< the kind of Locomotor this is
 	Coord3D			m_maintainPos;
@@ -482,14 +487,14 @@ class LocomotorStore : public SubsystemInterface
 	const LocomotorTemplate* findLocomotorTemplate(NameKeyType namekey) const;
 	LocomotorTemplate* findLocomotorTemplate(NameKeyType namekey);
 
-	inline Locomotor* newLocomotor(const LocomotorTemplate *tmpl) const
+	Locomotor* newLocomotor(const LocomotorTemplate *tmpl) const
 	{
 		return newInstance(Locomotor)(tmpl);	// my, that was easy
 	}
 
 	// locoTemplate is who we're overriding
 	LocomotorTemplate *newOverride(LocomotorTemplate *locoTemplate);
-	
+
 
 	static void parseLocomotorTemplateDefinition(INI* ini);
 
@@ -505,6 +510,3 @@ class LocomotorStore : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern LocomotorStore *TheLocomotorStore;
-
-#endif // __Locomotor_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h
index 731f0c38859..c4002d35628 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __LocomotorSet_H_
-#define __LocomotorSet_H_
-
 // no, please do NOT include this.
 //#include "GameLogic/Locomotor.h"
 #include "Common/GameCommon.h"
@@ -61,7 +58,7 @@ const LocomotorSurfaceTypeMask NO_SURFACES = (LocomotorSurfaceTypeMask)0x0000;
 const LocomotorSurfaceTypeMask ALL_SURFACES = (LocomotorSurfaceTypeMask)0xffff;
 
 #ifdef DEFINE_SURFACECATEGORY_NAMES
-static const char *TheLocomotorSurfaceTypeNames[] = 
+static const char *const TheLocomotorSurfaceTypeNames[] =
 {
 	"GROUND",
 	"WATER",
@@ -83,7 +80,7 @@ class LocomotorSet : public Snapshot
 	LocomotorVector						m_locomotors;
 	LocomotorSurfaceTypeMask	m_validLocomotorSurfaces;
 	Bool											m_downhillOnly;
-	
+
 	LocomotorSet(const LocomotorSet& that);
 	LocomotorSet& operator=(const LocomotorSet& that);
 
@@ -103,12 +100,10 @@ class LocomotorSet : public Snapshot
 	void addLocomotor(const LocomotorTemplate* lt);
 
 	Locomotor* findLocomotor(LocomotorSurfaceTypeMask t);
-	
+
 	void xferSelfAndCurLocoPtr(Xfer *xfer, Locomotor** loco);
 
-	inline LocomotorSurfaceTypeMask getValidSurfaces() const { return m_validLocomotorSurfaces; }
-	inline Bool isDownhillOnly( void ) const { return m_downhillOnly; };
+	LocomotorSurfaceTypeMask getValidSurfaces() const { return m_validLocomotorSurfaces; }
+	Bool isDownhillOnly( void ) const { return m_downhillOnly; };
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/LogicRandomValue.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/LogicRandomValue.h
deleted file mode 100644
index 4f6d2b99121..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/LogicRandomValue.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// LogicRandomValue.h
-// Random number generation system
-// Author: Michael S. Booth, January 1998
-// Split out into separate Logic/Client/Audio headers by MDC Sept 2002
-
-#pragma once
-
-#ifndef _LOGIC_RANDOM_VALUE_H_
-#define _LOGIC_RANDOM_VALUE_H_
-
-#include "Lib/BaseType.h"
-
-// do NOT use these functions directly, rather use the macros below
-extern Int GetGameLogicRandomValue( int lo, int hi, const char *file, int line );
-extern Real GetGameLogicRandomValueReal( Real lo, Real hi, const char *file, int line );
-
-// use these macros to access the random value functions
-#define GameLogicRandomValue( lo, hi ) GetGameLogicRandomValue( lo, hi, __FILE__, __LINE__ )
-#define GameLogicRandomValueReal( lo, hi ) GetGameLogicRandomValueReal( lo, hi, __FILE__, __LINE__ )
-
-//--------------------------------------------------------------------------------------------------------------
-class CColorAlphaDialog;
-class DebugWindowDialog;
-
-/**
- * A GameLogicRandomVariable represents a distribution of random values
- * from which discrete values can be retrieved.
- */
-class GameLogicRandomVariable
-{
-public:
-	// NOTE: This class cannot have a constructor or destructor due to its use within unions
-
-	/**
-	 * CONSTANT represents a single, constant, value.
-	 * UNIFORM represents a uniform distribution of random values.
-	 * GAUSSIAN represents a normally distributed set of random values.
-	 * TRIANGULAR represents a distribution of random values in the shape
-	 *		of a triangle, with the peak probability midway between low and high.
-	 * LOW_BIAS represents a distribution of random values with
-	 *		maximum probability at low, and zero probability at high.
-	 * HIGH_BIAS represents a distribution of random values with
-	 *		zero probability at low, and maximum probability at high.
-	 */
-	enum DistributionType 
-	{ 
-		CONSTANT, UNIFORM, GAUSSIAN, TRIANGULAR, LOW_BIAS, HIGH_BIAS
-	};
-
-	static const char *DistributionTypeNames[]; 
-
-	/// define the range of random values, and the distribution of values
-	void setRange( Real low, Real high, DistributionType type = UNIFORM );
-
-	Real getValue( void ) const;														///< return a value from the random distribution
-	inline Real getMinimumValue( void ) const { return m_low; }
-	inline Real getMaximumValue( void ) const { return m_high; }
-	inline DistributionType getDistributionType( void ) const { return m_type; }
-protected:
-	DistributionType m_type;																		///< the kind of random distribution
-	Real m_low, m_high;																					///< the range of random values
-
-	// These two friends are for particle editing.
-	friend CColorAlphaDialog;
-	friend DebugWindowDialog;
-
-};
-
-//--------------------------------------------------------------------------------------------------------------
-
-#endif // _LOGIC_RANDOM_VALUE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
index 277801091bd..423977192c1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _AI_UPDATE_H_
-#define _AI_UPDATE_H_
-
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameLogic/AI.h"
 #include "GameLogic/AIStateMachine.h"
@@ -43,7 +40,7 @@ class AttackPriorityInfo;
 class DamageInfo;
 class DozerAIInterface;
 class Object;
-class Path; 
+class Path;
 class PathfindServicesInterface;
 class PathNode;
 class PhysicsBehavior;
@@ -60,6 +57,7 @@ class AssaultTransportAIInterface;
 class JetAIUpdate;
 
 enum AIStateType CPP_11(: Int);
+enum HordeActionType CPP_11(: Int);
 enum ObjectID CPP_11(: Int);
 
 
@@ -84,12 +82,12 @@ enum LocomotorSetType CPP_11(: Int)
 	LOCOMOTORSET_SUPERSONIC,	// set used for high-speed attacks
 	LOCOMOTORSET_SLUGGISH,		// set used for abnormally slow (but not damaged) speeds
 
-	LOCOMOTORSET_COUNT	///< keep last, please
+	LOCOMOTORSET_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
 enum GuardTargetType CPP_11(: Int)
-{ 
+{
 	GUARDTARGET_LOCATION,	// Guard a coord3d
 	GUARDTARGET_OBJECT,		// Guard an object
 	GUARDTARGET_AREA,			// Guard a Polygon trigger
@@ -97,7 +95,7 @@ enum GuardTargetType CPP_11(: Int)
 };
 
 #ifdef DEFINE_LOCOMOTORSET_NAMES
-static const char *TheLocomotorSetNames[] = 
+static const char *const TheLocomotorSetNames[] =
 {
 	"SET_NORMAL",
 	"SET_NORMAL_UPGRADED",
@@ -110,7 +108,8 @@ static const char *TheLocomotorSetNames[] =
 
 	NULL
 };
-#endif 
+static_assert(ARRAY_SIZE(TheLocomotorSetNames) == LOCOMOTORSET_COUNT + 1, "Incorrect array size");
+#endif
 
 enum AutoAcquireStates CPP_11(: Int)
 {
@@ -122,7 +121,7 @@ enum AutoAcquireStates CPP_11(: Int)
 };
 
 #ifdef DEFINE_AUTOACQUIRE_NAMES
-static const char *TheAutoAcquireEnemiesNames[] = 
+static const char *const TheAutoAcquireEnemiesNames[] =
 {
 	"YES",
 	"STEALTHED",
@@ -142,21 +141,21 @@ enum MoodMatrixParameters CPP_11(: Int)
 	MM_Controller_Player		= 0x00000001,
 	MM_Controller_AI				= 0x00000002,
 	MM_Controller_Bitmask		= (MM_Controller_Player | MM_Controller_AI),
-	
+
 	// UnitTypes are mutually exclusive, ie: you cannot be turreted and air at the same time (we do
 	// not make such a distinction, so air takes precedence over turretedness)
 	MM_UnitType_NonTurreted = 0x00000010,
 	MM_UnitType_Turreted		= 0x00000020,
 	MM_UnitType_Air					= 0x00000040,
 	MM_UnitType_Bitmask			= (MM_UnitType_NonTurreted | MM_UnitType_Turreted | MM_UnitType_Air),
-	
+
 	// A unit can be in only one mood at a time.
 	MM_Mood_Sleep						= 0x00000100,
 	MM_Mood_Passive					= 0x00000200,
 	MM_Mood_Normal					= 0x00000400,
 	MM_Mood_Alert						= 0x00000800,
 	MM_Mood_Aggressive			= 0x00001000,
-	MM_Mood_Bitmask					= (MM_Mood_Sleep | MM_Mood_Passive | MM_Mood_Normal | MM_Mood_Alert | MM_Mood_Aggressive) 
+	MM_Mood_Bitmask					= (MM_Mood_Sleep | MM_Mood_Passive | MM_Mood_Normal | MM_Mood_Alert | MM_Mood_Aggressive)
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -202,7 +201,7 @@ class AIUpdateModuleData : public UpdateModuleData
  	UnsignedInt						m_surrenderDuration;					///< when we surrender, how long we stay surrendered.
 #endif
 
-	
+
   AIUpdateModuleData();
 	virtual ~AIUpdateModuleData();
 
@@ -227,7 +226,7 @@ enum AIFreeToExitType CPP_11(: Int) // Note - written out in save/load xfer, don
 };
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * The AIUpdateInterface module contains the interface to the AI system,
  * and performs the actual AI behaviors.
  */
@@ -244,7 +243,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	virtual void privateMoveToObject( Object *obj, CommandSourceType cmdSource );			///< move to given object
 	virtual void privateMoveToAndEvacuate( const Coord3D *pos, CommandSourceType cmdSource );			///< move to given position(s)
 	virtual void privateMoveToAndEvacuateAndExit( const Coord3D *pos, CommandSourceType cmdSource );			///< move to given position & unload transport.
-	virtual void privateIdle(CommandSourceType cmdSource);						///< Enter idle state.	
+	virtual void privateIdle(CommandSourceType cmdSource);						///< Enter idle state.
 	virtual void privateTightenToPosition( const Coord3D *pos, CommandSourceType cmdSource );			///< move to given position(s) tightening the formation.
 	virtual void privateFollowWaypointPath( const Waypoint *way, CommandSourceType cmdSource );///< start following the path from the given point
 	virtual void privateFollowWaypointPathAsTeam( const Waypoint *way, CommandSourceType cmdSource );///< start following the path from the given point
@@ -304,7 +303,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 	// Disabled conditions to process (AI will still process held status)
 	virtual DisabledMaskType getDisabledTypesToProcess() const { return MAKE_DISABLED_MASK( DISABLED_HELD ); }
-	
+
 	// Some very specific, complex behaviors are used by more than one AIUpdate.  Here are their interfaces.
 	virtual DozerAIInterface* getDozerAIInterface() {return NULL;}
 	virtual SupplyTruckAIInterface* getSupplyTruckAIInterface() {return NULL;}
@@ -329,13 +328,13 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 #endif
 
 	virtual void joinTeam( void );			///< This unit just got added to a team & needs to catch up.
-	
+
 	Bool areTurretsLinked() const { return getAIUpdateModuleData()->m_turretsLinked; }
 
-	// this is present solely for some transports to override, so that they can land before 
+	// this is present solely for some transports to override, so that they can land before
 	// allowing people to exit...
 	virtual AIFreeToExitType getAiFreeToExit(const Object* exiter) const { return FREE_TO_EXIT; }
-	
+
 	// this is present solely to allow some special-case things to override, like landed choppers.
 	virtual Bool isAllowedToAdjustDestination() const { return true; }
 	virtual Bool isAllowedToMoveAwayFromUnit() const { return true; }
@@ -353,9 +352,9 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 	virtual void onObjectCreated();
 	virtual void doQuickExit( const std::vector<Coord3D>* path );			///< get out of this Object
-	
+
 	virtual void aiDoCommand(const AICommandParms* parms);
-	
+
 	virtual const Coord3D *getGuardLocation( void ) const { return &m_locationToGuard;	}
 	virtual ObjectID getGuardObject( void ) const { return m_objectToGuard; }
 	virtual const PolygonTrigger *getAreaToGuard( void ) const { return m_areaToGuard; }
@@ -363,15 +362,15 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	virtual void clearGuardTargetType() { m_guardTargetType[1] = m_guardTargetType[0]; m_guardTargetType[0] = GUARDTARGET_NONE; }
 	virtual GuardMode getGuardMode() const { return m_guardMode; }
 
-	virtual Object* construct( const ThingTemplate *what, 
-														 const Coord3D *pos, Real angle, 
+	virtual Object* construct( const ThingTemplate *what,
+														 const Coord3D *pos, Real angle,
 														 Player *owningPlayer,
 														 Bool isRebuild ) { return NULL; }///< construct a building
 
 
 	void ignoreObstacle( const Object *obj );			///< tell the pathfinder to ignore the given object as an obstacle
 	void ignoreObstacleID( ObjectID id );			///< tell the pathfinder to ignore the given object as an obstacle
-	
+
 	AIStateType getAIStateType() const;							///< What general state is the AIState Machine in?
 
 	AsciiString getCurrentStateName(void) const { return m_stateMachine->getCurrentStateName(); }
@@ -392,7 +391,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	virtual void addTargeter(ObjectID id, Bool add) { return; }
 	virtual Bool isTemporarilyPreventingAimSuccess() const { return false; }
 
-	 
+
 	void setPriorWaypointID( UnsignedInt id )   { m_priorWaypointID = id; };
 	void setCurrentWaypointID( UnsignedInt id ) { m_currentWaypointID = id; };
 
@@ -417,10 +416,10 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	virtual void setLocomotorGoalPositionExplicit(const Coord3D& newPos);
 	virtual void setLocomotorGoalOrientation(Real angle);
 	virtual void setLocomotorGoalNone();
-	virtual Bool isDoingGroundMovement(void) const;  ///< True if moving along ground. 
+	virtual Bool isDoingGroundMovement(void) const;  ///< True if moving along ground.
 
 	Bool isValidLocomotorPosition(const Coord3D* pos) const;
-	Bool isAircraftThatAdjustsDestination(void) const;  ///< True if is aircraft that doesn't stack destinations (missles for example do stack destinations.) 
+	Bool isAircraftThatAdjustsDestination(void) const;  ///< True if is aircraft that doesn't stack destinations (missles for example do stack destinations.)
 	Real getCurLocomotorSpeed() const;
 	Real getLocomotorDistanceToGoal();
 	const Locomotor *getCurLocomotor() const {return m_curLocomotor;}
@@ -432,7 +431,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	WhichTurretType getWhichTurretForWeaponSlot(WeaponSlotType wslot, Real* turretAngle, Real* turretPitch = NULL) const;
 	WhichTurretType getWhichTurretForCurWeapon() const;
 	/**
-		return true iff the weapon is on a turret, that turret is trying to aim at the victim, 
+		return true iff the weapon is on a turret, that turret is trying to aim at the victim,
 		BUT is not yet pointing in the right dir.
 	*/
 	Bool isWeaponSlotOnTurretAndAimingAtTarget(WeaponSlotType wslot, const Object* victim) const;
@@ -460,7 +459,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 #endif
 
 public:
-	void doPathfind( PathfindServicesInterface *pathfinder ); 
+	void doPathfind( PathfindServicesInterface *pathfinder );
 	void requestPath( Coord3D *destination, Bool isGoalDestination );	///< Queues a request to pathfind to destination.
 	void requestAttackPath( ObjectID victimID, const Coord3D* victimPos );	///< computes path to attack the current target, returns false if no path
 	void requestApproachPath( Coord3D *destination );	///< computes path to attack the current target, returns false if no path
@@ -468,7 +467,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 	Bool isWaitingForPath(void) const {return m_waitingForPath;}
 	Bool isAttackPath(void) const {return m_isAttackPath;} ///< True if we have a path to an attack location.
-	void cancelPath(void); ///< Called if we no longer need the path. 
+	void cancelPath(void); ///< Called if we no longer need the path.
 	Path* getPath( void ) { return m_path; }				///< return the agent's current path
 	const Path* getPath( void ) const { return m_path; }				///< return the agent's current path
 	void destroyPath( void );												///< destroy the current path, setting it to NULL
@@ -483,8 +482,8 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	Bool isMoving() const;
 	Bool isMovingAwayFrom(Object *obj) const;
 
-	// the following routines should only be called by the AIInternalMoveToState.  
-	// They are used to determine when we are really through moving.  Due to the nature of the beast, 
+	// the following routines should only be called by the AIInternalMoveToState.
+	// They are used to determine when we are really through moving.  Due to the nature of the beast,
 	// we often exit one move state & immediately enter another.  This should not cause a "stop start".
 	// jba.
 	void friend_startingMove(void);
@@ -504,7 +503,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 	const LocomotorSet& getLocomotorSet(void) const {return m_locomotorSet;}
 	void setPathExtraDistance(Real dist) {m_pathExtraDistance = dist;}
-	inline Real getPathExtraDistance() const { return m_pathExtraDistance; }
+	Real getPathExtraDistance() const { return m_pathExtraDistance; }
 
 	virtual Bool chooseLocomotorSet(LocomotorSetType wst);
 
@@ -515,9 +514,9 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 	void setCurPathfindCell(const ICoord2D &cell) {m_pathfindCurCell = cell;}
 	void setPathfindGoalCell(const ICoord2D &cell) {m_pathfindGoalCell = cell;}
-	
+
 	void setPathFromWaypoint(const Waypoint *way, const Coord2D *offset);
-	
+
 	const ICoord2D *getCurPathfindCell(void) const {return &m_pathfindCurCell;}
 	const ICoord2D *getPathfindGoalCell(void) const {return &m_pathfindGoalCell;}
 
@@ -531,20 +530,20 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	void transferAttack(ObjectID fromID, ObjectID toID);
 
 	void setCurrentVictim( const Object *nemesis );			///<  Current victim.
-	Object *getCurrentVictim( void ) const;	
+	Object *getCurrentVictim( void ) const;
 	virtual void notifyVictimIsDead() { }
 
 	// if we are attacking a position (and NOT an object), return it. otherwise return null.
-	const Coord3D *getCurrentVictimPos( void ) const;	
+	const Coord3D *getCurrentVictimPos( void ) const;
 
 	void setLocomotorUpgrade(Bool set);
 
 	// This function is used to notify the unit that it may have a target of opportunity to attack.
 	void wakeUpAndAttemptToTarget( void );
-	
+
 	void resetNextMoodCheckTime( void );
 
-	//Specifically set a frame to check next mood time -- added for the purpose of ordering a stealth combat unit that can't 
+	//Specifically set a frame to check next mood time -- added for the purpose of ordering a stealth combat unit that can't
 	//autoacquire while stealthed, but isn't stealthed and can stealth and is not detected, and the player specifically orders
 	//that unit to stop. In this case, instead of the unit autoacquiring another unit, and preventing him from stealthing,
 	//we will instead delay the autoacquire until later to give him enough time to stealth properly.
@@ -553,7 +552,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	///< States should call this with calledByAI set true to prevent them from checking every frame
 	///< States that are doing idle checks should call with calledDuringIdle set true so that they check their
 
-	Object *getNextMoodTarget( Bool calledByAI, Bool calledDuringIdle );	
+	Object *getNextMoodTarget( Bool calledByAI, Bool calledDuringIdle );
 	UnsignedInt getNextMoodCheckTime() const { return m_nextMoodCheckTime; }
 
 	// This function will return a combination of MoodMatrixParameter flags.
@@ -562,14 +561,18 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	void setAttitude( AttitudeType tude );	///< set the behavior modifier for this agent
 
 	// Common AI "status" effects -------------------------------------------------------------------
-	void evaluateMoraleBonus( void );
+	Bool hasNationalism() const;
+	Bool hasFanaticism() const;
+	void evaluateMoraleBonus( Bool inHorde, Bool allowNationalism, HordeActionType type );
+	void evaluateNationalismBonusClassic( Bool inHorde, Bool allowNationalism );
+	void evaluateNationalismBonus( Bool inHorde, Bool allowNationalism );
 
 #ifdef ALLOW_DEMORALIZE
 	// demoralization ... what a nifty word to write.
 	Bool isDemoralized( void ) const { return m_demoralizedFramesLeft > 0; }
 	void setDemoralized( UnsignedInt durationInFrames );
 #endif
-	
+
 	Bool canPathThroughUnits( void ) const { return m_canPathThroughUnits; }
 	void setCanPathThroughUnits( Bool canPath ) { m_canPathThroughUnits = canPath; if (canPath) m_isBlockedAndStuck=false;}
 
@@ -582,7 +585,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 	void setQueueForPathTime(Int frames);
 
-	// For the attack move, that switches from move to attack, and the attack is CMD_FROM_AI, 
+	// For the attack move, that switches from move to attack, and the attack is CMD_FROM_AI,
 	// while the move is the original command source.  John A.
 	void friend_setLastCommandSource( CommandSourceType source ) {m_lastCommandSource = source;}
 
@@ -592,9 +595,9 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 
 
 protected:
-	
+
 	/*
-		AIUpdates run in the initial phase. 
+		AIUpdates run in the initial phase.
 
 		It's actually quite important that AI (the thing that drives Locomotors) and Physics
 		run in the same order, relative to each other, for a given object; otherwise,
@@ -625,51 +628,51 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	virtual Bool getTreatAsAircraftForLocoDistToGoal() const;
 
 	// yes, protected, NOT public... try to avoid exposing the state machine directly, please
-	inline AIStateMachine* getStateMachine() { return m_stateMachine; }
-	inline const AIStateMachine* getStateMachine() const { return m_stateMachine; }
+	AIStateMachine* getStateMachine() { return m_stateMachine; }
+	const AIStateMachine* getStateMachine() const { return m_stateMachine; }
 
 	void wakeUpNow();
 
 public:
 
-	inline StateID getCurrentStateID() const { return getStateMachine()->getCurrentStateID(); }	///< return the id of the current state of the machine
+	StateID getCurrentStateID() const { return getStateMachine()->getCurrentStateID(); }	///< return the id of the current state of the machine
 /// @ todo -- srj sez: JBA NUKE THIS CODE, IT IS EVIL
-	inline void friend_addToWaypointGoalPath( const Coord3D *pathPoint ) { getStateMachine()->addToGoalPath(pathPoint); }
+	void friend_addToWaypointGoalPath( const Coord3D *pathPoint ) { getStateMachine()->addToGoalPath(pathPoint); }
 
 	// this is intended for use ONLY by W3dWaypointBuffer and AIFollowPathState.
-	inline const Coord3D* friend_getGoalPathPosition( Int index ) const { return getStateMachine()->getGoalPathPosition( index ); }
+	const Coord3D* friend_getGoalPathPosition( Int index ) const { return getStateMachine()->getGoalPathPosition( index ); }
 
 	// this is intended for use ONLY by W3dWaypointBuffer.
 	Int friend_getWaypointGoalPathSize() const;
 
 	// this is intended for use ONLY by W3dWaypointBuffer.
-	inline Int friend_getCurrentGoalPathIndex() const { return m_nextGoalPathIndex; }
+	Int friend_getCurrentGoalPathIndex() const { return m_nextGoalPathIndex; }
 
 	// this is intended for use ONLY by AIFollowPathState.
-	inline void friend_setCurrentGoalPathIndex( Int index ) { m_nextGoalPathIndex = index; }
+	void friend_setCurrentGoalPathIndex( Int index ) { m_nextGoalPathIndex = index; }
 #ifdef DEBUG_LOGGING
 	inline const Coord3D *friend_getRequestedDestination() const { return &m_requestedDestination; }
 	inline const Coord3D *friend_getRequestedDestination2() const { return &m_requestedDestination2; }
 #endif
 
-	inline Object* getGoalObject() { return getStateMachine()->getGoalObject(); }	///< return the id of the current state of the machine
-	inline const Coord3D* getGoalPosition() const { return getStateMachine()->getGoalPosition(); }	///< return the id of the current state of the machine
+	Object* getGoalObject() { return getStateMachine()->getGoalObject(); }	///< return the id of the current state of the machine
+	const Coord3D* getGoalPosition() const { return getStateMachine()->getGoalPosition(); }	///< return the id of the current state of the machine
+
+	WhichTurretType friend_getTurretSync() const { return m_turretSyncFlag; }
+	void friend_setTurretSync(WhichTurretType t) { m_turretSyncFlag = t; }
 
-	inline WhichTurretType friend_getTurretSync() const { return m_turretSyncFlag; }
-	inline void friend_setTurretSync(WhichTurretType t) { m_turretSyncFlag = t; }
+	UnsignedInt getPriorWaypointID ( void ) { return m_priorWaypointID; };
+	UnsignedInt getCurrentWaypointID ( void ) { return m_currentWaypointID; };
 
-	inline UnsignedInt getPriorWaypointID ( void ) { return m_priorWaypointID; };
-	inline UnsignedInt getCurrentWaypointID ( void ) { return m_currentWaypointID; };
+	void clearMoveOutOfWay(void) {m_moveOutOfWay1 = INVALID_ID; m_moveOutOfWay2 = INVALID_ID;}
 
-	inline void clearMoveOutOfWay(void) {m_moveOutOfWay1 = INVALID_ID; m_moveOutOfWay2 = INVALID_ID;}
+	void setTmpValue(Int val) {m_tmpInt = val;}
+	Int getTmpValue(void) {return m_tmpInt;}
 
-	inline void setTmpValue(Int val) {m_tmpInt = val;}
-	inline Int getTmpValue(void) {return m_tmpInt;}
+	Bool getRetryPath(void) {return m_retryPath;}
 
-	inline Bool getRetryPath(void) {return m_retryPath;}
-	
-	inline void setAllowedToChase( Bool allow ) { m_allowedToChase = allow; }
-	inline Bool isAllowedToChase() const { return m_allowedToChase; }
+	void setAllowedToChase( Bool allow ) { m_allowedToChase = allow; }
+	Bool isAllowedToChase() const { return m_allowedToChase; }
 
 	// only for AIStateMachine.
 	virtual void friend_notifyStateMachineChanged();
@@ -713,7 +716,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	Path*				m_path;											///< current path to follow (for moving)
 	ObjectID		m_requestedVictimID;
 	Coord3D			m_requestedDestination;
-	Coord3D			m_requestedDestination2;							
+	Coord3D			m_requestedDestination2;
 	UnsignedInt	m_pathTimestamp;						///< time of path construction
 	ObjectID		m_ignoreObstacleID;					///< ignore this obstacle when pathfinding
 	Real				m_pathExtraDistance;				///< If we are following a waypoint path, there will be extra distance beyond the current path.
@@ -776,7 +779,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	Int						m_tmpInt;
 
 	// -------------------------------------------------------------------
-	Bool				m_doFinalPosition;					///< True if we are moving towards final position in a non-physics kind of way. 
+	Bool				m_doFinalPosition;					///< True if we are moving towards final position in a non-physics kind of way.
 	Bool				m_waitingForPath;						///< True if we have a pathfind request outstanding.
 	Bool				m_isAttackPath;							///< True if we have an attack path.
 	Bool				m_isFinalGoal;							///< True if this path ends at our destination (as opposed to an intermediate point on a waypoint path).
@@ -795,12 +798,9 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	Bool				m_retryPath;								///< If true, we need to try the path a second time.  jba.
 	Bool				m_allowedToChase;						///< Allowed to pursue targets.
 	Bool				m_isInUpdate;								///< If true, we are inside our update method.
-	Bool				m_fixLocoInPostProcess;		
+	Bool				m_fixLocoInPostProcess;
 };
 
 //------------------------------------------------------------------------------------------------------------
 // Inlines
 //
-
-#endif // _AI_UPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h
index 7fff08ac753..0fbd3a7efa5 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ACTIVEBODY_H_
-#define __ACTIVEBODY_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DamageFX.h"
 #include "GameLogic/Module/BodyModule.h"
@@ -48,12 +45,12 @@ class ParticleSystemTemplate;
 //-------------------------------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------------------------------
-class ActiveBodyModuleData : public BodyModuleData 
+class ActiveBodyModuleData : public BodyModuleData
 {
 public:
 	Real m_maxHealth;
 	Real m_initialHealth;
-	
+
 	Real m_subdualDamageCap;								///< Subdual damage will never accumulate past this
 	UnsignedInt m_subdualDamageHealRate;		///< Every this often, we drop subdual damage...
 	Real m_subdualDamageHealAmount;					///< by this much.
@@ -83,7 +80,7 @@ class ActiveBody : public BodyModule
 	virtual Real getHealth() const;													///< get current health
 	virtual BodyDamageType getDamageState() const;
 	virtual void setDamageState( BodyDamageType newState );	///< control damage state directly.  Will adjust hitpoints.
-	virtual void setAflame( Bool setting );///< This is a major change like a damage state.  
+	virtual void setAflame( Bool setting );///< This is a major change like a damage state.
 	virtual UnsignedInt getSubdualDamageHealRate() const;
 	virtual Real getSubdualDamageHealAmount() const;
 	virtual Bool hasAnySubdualDamage() const;
@@ -124,8 +121,8 @@ class ActiveBody : public BodyModule
 	virtual void updateBodyParticleSystems( void );// made public for topple anf building collapse updates -ML
 
 	// Subdual Damage
-	virtual Bool isSubdued() const; 
-	virtual Bool canBeSubdued() const; 
+	virtual Bool isSubdued() const;
+	virtual Bool canBeSubdued() const;
 	virtual void onSubdualChange( Bool isNowSubdued );///< Override this if you want a totally different effect than DISABLED_SUBDUED
 
 protected:
@@ -133,7 +130,7 @@ class ActiveBody : public BodyModule
 	void validateArmorAndDamageFX() const;
 	void doDamageFX( const DamageInfo *damageInfo );
 
-	void createParticleSystems( const AsciiString &boneBaseName, 
+	void createParticleSystems( const AsciiString &boneBaseName,
 															const ParticleSystemTemplate *systemTemplate,
 															Int maxSystems );
 	void deleteAllParticleSystems( void );
@@ -174,6 +171,3 @@ class ActiveBody : public BodyModule
 	mutable const DamageFX*						m_curDamageFX;
 
 };
-
-#endif // __ACTIVEBODY_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h
index a0143d7e36a..285dc25628d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ACTIVE_SHROUD_UPGRADE_H_
-#define __ACTIVE_SHROUD_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -75,6 +72,3 @@ class ActiveShroudUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-#endif // __ACTIVE_SHROUD_UPGRADE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h
index 8ce3590f56c..6ffc8b3060c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ANIMATION_STEERING_UPDATE_H
-#define __ANIMATION_STEERING_UPDATE_H
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -46,11 +43,11 @@ class AnimationSteeringUpdateModuleData : public UpdateModuleData
 
 	AnimationSteeringUpdateModuleData( void );
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse( p );
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MinTransitionTime", INI::parseDurationUnsignedInt, NULL, offsetof( AnimationSteeringUpdateModuleData, m_transitionFrames ) },
 			{ 0, 0, 0, 0 }
@@ -83,5 +80,3 @@ class AnimationSteeringUpdate : public UpdateModule
   ModelConditionFlagType m_currentTurnAnim;
 	UnsignedInt m_nextTransitionFrame;
 };
-
-#endif  // end __ANIMATION_STEERING_UPDATE_H
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h
index 3accb88943d..38998a466ef 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h
@@ -24,12 +24,12 @@
 
 // FILE: ArmorUpgrade.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	July 2002
@@ -37,17 +37,14 @@
 //	Filename: 	ArmorUpgrade.h
 //
 //	author:		Chris Brue
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __ARMOR_UPGRADE_H_
-#define __ARMOR_UPGRADE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -90,5 +87,3 @@ class ArmorUpgrade : public UpgradeModule
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __ARMOR_UPGRADE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
index 1c9574241ae..edcaf28beac 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __ASSAULT_TRANSPORT_AI_UPDATE_H
-#define __ASSAULT_TRANSPORT_AI_UPDATE_H
-
 #include "Common/StateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -58,11 +55,11 @@ class AssaultTransportAIUpdateModuleData : public AIUpdateModuleData
 		m_clearRangeRequiredToContinueAttackMove = 50.0f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     AIUpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MembersGetHealedAtLifeRatio",						INI::parseReal,	NULL, offsetof( AssaultTransportAIUpdateModuleData, m_membersGetHealedAtLifeRatio ) },
 			{ "ClearRangeRequiredToContinueAttackMove", INI::parseReal, NULL, offsetof( AssaultTransportAIUpdateModuleData, m_clearRangeRequiredToContinueAttackMove ) },
@@ -123,6 +120,3 @@ class AssaultTransportAIUpdate : public AIUpdateInterface, public AssaultTranspo
 	Bool							m_isAttackObject;
 	Bool							m_newOccupantsAreNewMembers;
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h
index bb29cee3970..23965134d70 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _ASSISTED_TARGETING_UPDATE_H
-#define _ASSISTED_TARGETING_UPDATE_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -82,6 +79,3 @@ class AssistedTargetingUpdate : public UpdateModule
 
 
 };
-
-#endif 
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h
index e285907a9b3..a70c06b9734 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h
@@ -24,12 +24,12 @@
 
 // FILE: AutoDepositUpdate.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	AutoDepositUpdate.h
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Auto Deposit Update Module
 //
 //-----------------------------------------------------------------------------
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __AUTO_DEPOSIT_UPDATE_H_
-#define __AUTO_DEPOSIT_UPDATE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -90,10 +87,10 @@ class AutoDepositUpdateModuleData : public UpdateModuleData
 		m_upgradeBoost.clear();
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "DepositTiming",					INI::parseDurationUnsignedInt,		NULL, offsetof( AutoDepositUpdateModuleData, m_depositFrame ) },
 			{ "DepositAmount",					INI::parseInt,		NULL, offsetof( AutoDepositUpdateModuleData, m_depositAmount ) },
@@ -140,5 +137,3 @@ class AutoDepositUpdate : public UpdateModule
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __AUTO_DEPOSIT_UPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h
index 714fa9fc522..0ef89bcd787 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __AUTO_FIND_HEALING_UPDATE_H_
-#define __AUTO_FIND_HEALING_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -54,7 +51,7 @@ class AutoFindHealingUpdateModuleData : public ModuleData
 	AutoFindHealingUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -80,7 +77,3 @@ class AutoFindHealingUpdate : public UpdateModule
 protected:
 	Int m_nextScanFrames;
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h
index 000dd605f75..549bcd5fac6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h
@@ -27,15 +27,12 @@
 // Desc:   Update that heals itself
 //------------------------------------------
 // Modified by Kris Morness, September 2002
-// Kris: Added the ability to add effects, radius healing, and restricting the type of objects 
+// Kris: Added the ability to add effects, radius healing, and restricting the type of objects
 //       subjected to the heal (or repair).
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __AutoHealBehavior_H_
-#define __AutoHealBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/ParticleSys.h"
 #include "GameLogic/Module/BehaviorModule.h"
@@ -81,16 +78,16 @@ class AutoHealBehaviorModuleData : public UpdateModuleData
 		m_forbiddenKindOf.clear();
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "StartsActive",	INI::parseBool, NULL, offsetof( AutoHealBehaviorModuleData, m_initiallyActive ) },
 			{ "SingleBurst",	INI::parseBool, NULL, offsetof( AutoHealBehaviorModuleData, m_singleBurst ) },
 			{ "HealingAmount",		INI::parseInt,												NULL, offsetof( AutoHealBehaviorModuleData, m_healingAmount ) },
 			{ "HealingDelay",			INI::parseDurationUnsignedInt,				NULL, offsetof( AutoHealBehaviorModuleData, m_healingDelay ) },
 			{ "Radius",						INI::parseReal,												NULL, offsetof( AutoHealBehaviorModuleData, m_radius ) },
-			{ "KindOf",						KindOfMaskType::parseFromINI,											NULL, offsetof( AutoHealBehaviorModuleData, m_kindOf ) },		
+			{ "KindOf",						KindOfMaskType::parseFromINI,											NULL, offsetof( AutoHealBehaviorModuleData, m_kindOf ) },
 			{ "ForbiddenKindOf",	KindOfMaskType::parseFromINI,											NULL, offsetof( AutoHealBehaviorModuleData, m_forbiddenKindOf ) },
 			{ "RadiusParticleSystemName",					INI::parseParticleSystemTemplate,	NULL, offsetof( AutoHealBehaviorModuleData, m_radiusParticleSystemTmpl ) },
 			{ "UnitHealPulseParticleSystemName",	INI::parseParticleSystemTemplate,	NULL, offsetof( AutoHealBehaviorModuleData, m_unitHealPulseParticleSystemTmpl ) },
@@ -109,7 +106,7 @@ class AutoHealBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class AutoHealBehavior : public UpdateModule, 
+class AutoHealBehavior : public UpdateModule,
 												 public UpgradeMux,
 												 public DamageModuleInterface
 {
@@ -143,8 +140,8 @@ class AutoHealBehavior : public UpdateModule,
 
 protected:
 
-	virtual void upgradeImplementation() 
-	{ 
+	virtual void upgradeImplementation()
+	{
 		setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
 	}
 
@@ -169,8 +166,8 @@ class AutoHealBehavior : public UpdateModule,
 		return getAutoHealBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers;
 	}
 
-	inline Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
-	
+	Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
+
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 
@@ -180,7 +177,7 @@ class AutoHealBehavior : public UpdateModule,
 
 	ParticleSystemID m_radiusParticleSystemID;
 
-	UnsignedInt m_soonestHealFrame;/** I need to record this, because with multiple wake up sources, 
+	UnsignedInt m_soonestHealFrame;/** I need to record this, because with multiple wake up sources,
 																		I can't rely solely on my sleeping.  So this will guard onDamage's wake up.
 																		I could guard the act of healing, but that would defeat the gain of being
 																		a sleepy module.  I never want to run update unless I am going to heal.
@@ -189,6 +186,3 @@ class AutoHealBehavior : public UpdateModule,
 	Bool m_stopped;
 
 };
-
-#endif // __AutoHealBehavior_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h
index 19a10914642..771bbb4d1cb 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h
@@ -24,12 +24,12 @@
 
 // FILE: BaikonurLaunchPower.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	November 2002
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __BAIKONUR_LAUNCH_POWER_H_
-#define __BAIKONUR_LAUNCH_POWER_H_
-
 #include "GameLogic/Module/SpecialPowerModule.h"
 
 class Object;
@@ -64,7 +61,7 @@ class BaikonurLaunchPowerModuleData : public SpecialPowerModuleData
 
 	static void buildFieldParse( MultiIniFieldParse& p );
 
-	AsciiString m_detonationObject;		
+	AsciiString m_detonationObject;
 };
 
 
@@ -85,5 +82,3 @@ class BaikonurLaunchPower : public SpecialPowerModule
 protected:
 
 };
-
-#endif // __BAIKONUR_LAUNCH_POWER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h
index 3c0eeb76f6e..95c8c58f7a0 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BASE_REGENERATE_UPDATE_H_
-#define __BASE_REGENERATE_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameLogic/Module/DamageModule.h"
@@ -81,5 +78,3 @@ class BaseRegenerateUpdate : public UpdateModule,
 private:
 
 };
-
-#endif  // end __BASE_REGENERATE_UPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h
index f553de09ac6..55a301ded9f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BUS_SLOW_DEATH_BEHAVIOR_H_
-#define __BUS_SLOW_DEATH_BEHAVIOR_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/SlowDeathBehavior.h"
@@ -88,6 +85,3 @@ class BattleBusSlowDeathBehavior : public SlowDeathBehavior
 	UnsignedInt m_penaltyDeathFrame;	///< If non zero, kill us with Penalty damage at this frame
 
 };
-
-
-#endif  // end __BUS_SLOW_DEATH_BEHAVIOR_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h
index 181b44e7ce2..8eeed38c7d3 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BATTLE_PLAN_UPDATE_H_
-#define __BATTLE_PLAN_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/SpecialPowerUpdateModule.h"
@@ -86,7 +83,7 @@ class BattlePlanUpdateModuleData : public ModuleData
 	BattlePlanUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -108,7 +105,7 @@ enum BattlePlanStatus CPP_11(: Int)
 
 class BattlePlanBonuses : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(BattlePlanBonuses, "BattlePlanBonuses")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(BattlePlanBonuses, "BattlePlanBonuses")
 public:
 	Real						m_armorScalar;
 	Int							m_bombardment;				//Represents having weapon bonuses for bombardment plan
@@ -162,13 +159,13 @@ class BattlePlanUpdate : public SpecialPowerUpdateModule
 	void recenterTurret();
 	Bool isTurretInNaturalPosition();
 	void setBattlePlan( BattlePlanStatus plan );
-	void createVisionObject();	
+	void createVisionObject();
 
 	BattlePlanStatus m_currentPlan;	//The current battle plan displayed by the building (includes packing & unpacking)
 	BattlePlanStatus m_desiredPlan; //The user desired battle plan
 	BattlePlanStatus m_planAffectingArmy; //The current battle plan that is affecting troops!
 	TransitionStatus m_status;
-	
+
 	UnsignedInt m_nextReadyFrame;
 	SpecialPowerModuleInterface *m_specialPowerModule;
 	Bool				m_invalidSettings;
@@ -190,7 +187,3 @@ class BattlePlanUpdate : public SpecialPowerUpdateModule
 	ObjectID m_visionObjectID;
 
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h
index 03d59283f1c..0290d52b508 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h
@@ -24,14 +24,11 @@
 
 // FILE: BehaviorModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __BehaviorModule_H_
-#define __BehaviorModule_H_
-
 #include "Common/GameType.h"
 #include "Common/Module.h"
 
@@ -91,7 +88,7 @@ class BehaviorModuleData : public ModuleData
 	{
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     ModuleData::buildFieldParse(p);
 	}
@@ -213,15 +210,20 @@ enum RunwayReservationType CPP_11(: Int)
 	RESERVATION_LANDING,
 };
 
+enum
+{
+	InvalidRunway = -1,
+};
+
 //-------------------------------------------------------------------------------------------------
 class ParkingPlaceBehaviorInterface
 {
 public:
 	struct PPInfo
 	{
-		Coord3D		parkingSpace; 
+		Coord3D		parkingSpace;
 		Real			parkingOrientation;
-		Coord3D		runwayPrep; 
+		Coord3D		runwayPrep;
 		Coord3D		runwayStart;
 		Coord3D		runwayEnd;
 		Coord3D		runwayExit;
@@ -232,15 +234,16 @@ class ParkingPlaceBehaviorInterface
 		Real			runwayTakeoffDist;
 		Real			hangarInternalOrient;
 	};
-	virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const = 0; 
-	virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const = 0; 
-	virtual Bool hasReservedSpace(ObjectID id) const = 0; 
+	virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const = 0;
+	virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const = 0;
+	virtual Bool hasReservedSpace(ObjectID id) const = 0;
 	virtual Int  getSpaceIndex( ObjectID id ) const = 0;
 	virtual Bool reserveSpace(ObjectID id, Real parkingOffset, PPInfo* info) = 0;
-	virtual void releaseSpace(ObjectID id) = 0; 
+	virtual void releaseSpace(ObjectID id) = 0;
 	virtual Bool reserveRunway(ObjectID id, Bool forLanding) = 0;
 	virtual void calcPPInfo( ObjectID id, PPInfo *info ) = 0;
-	virtual void releaseRunway(ObjectID id) = 0; 
+	virtual void releaseRunway(ObjectID id) = 0;
+	virtual Int getRunwayIndex(ObjectID id) = 0;
 	virtual Int getRunwayCount() const = 0;
 	virtual ObjectID getRunwayReservation( Int r, RunwayReservationType type = RESERVATION_TAKEOFF ) = 0;
 	virtual void transferRunwayReservationToNextInLineForTakeoff(ObjectID id) = 0;
@@ -279,5 +282,3 @@ class LandMineInterface
 };
 
 //-------------------------------------------------------------------------------------------------
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
index 8bf0dbca1a7..2e9e792cff7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
@@ -24,14 +24,11 @@
 
 // FILE: BodyModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __BODYMODULE_H_
-#define __BODYMODULE_H_
-
 #include "Common/Module.h"
 #include "GameLogic/Damage.h"
 #include "GameLogic/ArmorSet.h"
@@ -44,7 +41,7 @@
 class WeaponTemplate;
 
 //-------------------------------------------------------------------------------------------------
-/** Damage states for structures 
+/** Damage states for structures
 	*
 	* NOTE: the macros below for IS_CONDITION_WORSE and IS_CONDITION_BETTER depend on this
 	* enumeration being in sequential order
@@ -61,7 +58,7 @@ enum BodyDamageType CPP_11(: Int)
 };
 
 #ifdef DEFINE_BODYDAMAGETYPE_NAMES
-static const char* TheBodyDamageTypeNames[] =
+static const char* const TheBodyDamageTypeNames[] =
 {
 	"PRISTINE",
 	"DAMAGED",
@@ -70,6 +67,7 @@ static const char* TheBodyDamageTypeNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheBodyDamageTypeNames) == BODYDAMAGETYPE_COUNT + 1, "Incorrect array size");
 #endif
 
 enum MaxHealthChangeType CPP_11(: Int)
@@ -78,20 +76,25 @@ enum MaxHealthChangeType CPP_11(: Int)
 	PRESERVE_RATIO,
 	ADD_CURRENT_HEALTH_TOO,
 	FULLY_HEAL,
+
+	MAX_HEALTH_CHANGE_COUNT
 };
 
 #ifdef DEFINE_MAXHEALTHCHANGETYPE_NAMES
-static const char* TheMaxHealthChangeTypeNames[] = 
+static const char* const TheMaxHealthChangeTypeNames[] =
 {
 	"SAME_CURRENTHEALTH",
 	"PRESERVE_RATIO",
 	"ADD_CURRENT_HEALTH_TOO",
+	"FULLY_HEAL",
+	NULL
 };
+static_assert(ARRAY_SIZE(TheMaxHealthChangeTypeNames) == MAX_HEALTH_CHANGE_COUNT + 1, "Incorrect array size");
 #endif
 
 
 //
-// is condition A worse than condition B  ... NOTE: this assumes the conditions 
+// is condition A worse than condition B  ... NOTE: this assumes the conditions
 // in BodyDamageType are in sequential order
 //
 // is a worse than b
@@ -109,7 +112,7 @@ class BodyModuleData : public BehaviorModuleData
 	{
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     BehaviorModuleData::buildFieldParse(p);
 	}
@@ -148,7 +151,7 @@ class BodyModuleInterface
 	virtual Real getInitialHealth() const = 0;
 
 	virtual Real getPreviousHealth() const = 0;
-	
+
 	virtual UnsignedInt getSubdualDamageHealRate() const = 0;
 	virtual Real getSubdualDamageHealAmount() const = 0;
 	virtual Bool hasAnySubdualDamage() const = 0;
@@ -156,7 +159,7 @@ class BodyModuleInterface
 
 	virtual BodyDamageType getDamageState() const = 0;
 	virtual void setDamageState( BodyDamageType newState ) = 0;	///< control damage state directly.  Will adjust hitpoints.
-	virtual void setAflame( Bool setting ) = 0;///< This is a major change like a damage state.  
+	virtual void setAflame( Bool setting ) = 0;///< This is a major change like a damage state.
 
 	virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback ) = 0;	///< I just achieved this level right this moment
 
@@ -177,12 +180,12 @@ class BodyModuleInterface
 
 	virtual void setFrontCrushed(Bool v) = 0;
 	virtual void setBackCrushed(Bool v) = 0;
-	
+
 	virtual void applyDamageScalar( Real scalar ) = 0;
 	virtual Real getDamageScalar() const = 0;
 
 	/**
-		Change the module's health by the given delta. Note that 
+		Change the module's health by the given delta. Note that
 		the module's DamageFX and Armor are NOT taken into
 		account, so you should think about what you're bypassing when you
 		call this directly (especially when when decreasing health, since
@@ -250,7 +253,7 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface
 
 	virtual BodyDamageType getDamageState() const = 0;
 	virtual void setDamageState( BodyDamageType newState ) = 0;	///< control damage state directly.  Will adjust hitpoints.
-	virtual void setAflame( Bool setting ) = 0;///< This is a major change like a damage state.  
+	virtual void setAflame( Bool setting ) = 0;///< This is a major change like a damage state.
 
 	virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = FALSE ) = 0;	///< I just achieved this level right this moment
 
@@ -281,7 +284,7 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface
 	virtual Real getDamageScalar() const { return m_damageScalar; }
 
 	/**
-		Change the module's health by the given delta. Note that 
+		Change the module's health by the given delta. Note that
 		the module's DamageFX and Armor are NOT taken into
 		account, so you should think about what you're bypassing when you
 		call this directly (especially when when decreasing health, since
@@ -304,5 +307,3 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface
 };
 inline BodyModule::BodyModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ), m_damageScalar(1.0f) { }
 inline BodyModule::~BodyModule() { }
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h
index 5e6cc2aaca9..aede96065c9 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h
@@ -29,12 +29,9 @@
 
 #pragma once
 
-#ifndef __BONEFXDAMAGE_H_
-#define __BONEFXDAMAGE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 
-#include "GameLogic/Module/DamageModule.h" 
+#include "GameLogic/Module/DamageModule.h"
 
 //#include "GameLogic/Module/BodyModule.h" -- Yikes... not necessary to include this! (KM)
 enum BodyDamageType CPP_11(: Int); //Ahhhh much better!
@@ -57,8 +54,8 @@ class BoneFXDamage : public DamageModule
 	// damage module methods
 	virtual void onDamage( DamageInfo *damageInfo ) { }
 	virtual void onHealing( DamageInfo *damageInfo ) { }
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState );
 
 protected:
@@ -66,5 +63,3 @@ class BoneFXDamage : public DamageModule
 	virtual void onObjectCreated();
 
 };
-
-#endif  // end __BONEFXDAMAGE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h
index 8ed970ec39d..8aea6769866 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BONEFXUPDATE_H_
-#define __BONEFXUPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/ParticleSys.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -39,7 +36,7 @@
 //#include "GameLogic/Module/DamageModule.h" -- Yikes... not necessary to include this! (KM)
 class DamageInfo; //Ahhhh much better!
 
-#include "GameLogic/Module/BodyModule.h" 
+#include "GameLogic/Module/BodyModule.h"
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class Thing;
@@ -99,11 +96,11 @@ class BoneFXUpdateModuleData : public UpdateModuleData
 
 	BoneFXUpdateModuleData( void );
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 
 			{ "DamageFXTypes",				INI::parseDamageTypeFlags, NULL, offsetof( BoneFXUpdateModuleData, m_damageFXTypes ) },
@@ -277,5 +274,3 @@ class BoneFXUpdate : public UpdateModule
 	Bool m_bonesResolved[BODYDAMAGETYPE_COUNT];
 	Bool m_active;
 };
-
-#endif  // end __BONEFXUPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h
index 242cb348fb5..43b5d0bbe95 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BRIDGE_BEHAVIOR_H_
-#define __BRIDGE_BEHAVIOR_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "GameClient/TerrainRoads.h"
@@ -129,7 +126,7 @@ class BridgeBehavior : public UpdateModule,
 	// virtual destructor prototype provided by memory pool declaration
 
 	// module methods
-	static Int getInterfaceMask( void ) { return (MODULEINTERFACE_DAMAGE) | 
+	static Int getInterfaceMask( void ) { return (MODULEINTERFACE_DAMAGE) |
 																							 (MODULEINTERFACE_DIE) |
 																							 (MODULEINTERFACE_UPDATE); }
 	virtual BridgeBehaviorInterface* getBridgeBehaviorInterface( void ) { return this; }
@@ -139,8 +136,8 @@ class BridgeBehavior : public UpdateModule,
 	virtual DamageModuleInterface* getDamage( void ) { return this; }
 	virtual void onDamage( DamageInfo *damageInfo );
 	virtual void onHealing( DamageInfo *damageInfo );
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState );
 
 	// Die methods
@@ -164,17 +161,17 @@ class BridgeBehavior : public UpdateModule,
 
 	void resolveFX( void );
 	void handleObjectsOnBridgeOnDie( void );
-	void doAreaEffects( TerrainRoadType *bridgeTemplate, Bridge *bridge, 
+	void doAreaEffects( TerrainRoadType *bridgeTemplate, Bridge *bridge,
 											const ObjectCreationList *ocl, const FXList *fx );
-	void setScaffoldData( Object *obj, 
-												Real *angle, 
-												Real *sunkenHeight, 
-												const Coord3D *riseToPos, 
-												const Coord3D *buildPos, 
+	void setScaffoldData( Object *obj,
+												Real *angle,
+												Real *sunkenHeight,
+												const Coord3D *riseToPos,
+												const Coord3D *buildPos,
 												const Coord3D *bridgeCenter );
 
-	void getRandomSurfacePosition( TerrainRoadType *bridgeTemplate, 
-																 const BridgeInfo *bridgeInfo, 
+	void getRandomSurfacePosition( TerrainRoadType *bridgeTemplate,
+																 const BridgeInfo *bridgeInfo,
 																 Coord3D *pos );
 
 	ObjectID m_towerID[ BRIDGE_MAX_TOWERS ];		///< the towers that are a part of us
@@ -197,5 +194,3 @@ class BridgeBehavior : public UpdateModule,
 	UnsignedInt m_deathFrame;								///< frame we died on
 
 };
-
-#endif  // end __BRIDGE_DAMAGE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h
index 96bb8851301..42274c74865 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BRIDGE_SCAFFOLD_BEHAVIOR_H_
-#define __BRIDGE_SCAFFOLD_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -112,6 +109,3 @@ class BridgeScaffoldBehavior : public UpdateModule,
 	Coord3D m_targetPos;									///< current target position for our motion type
 
 };
-
-
-#endif  // end __BRIDGE_SCAFFOLD_BEHAVIOR_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h
index 23a0d2cc4b2..a4b9d18f739 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BRIDGE_TOWER_BEHAVIOR_H_
-#define __BRIDGE_TOWER_BEHAVIOR_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DamageModule.h"
@@ -49,7 +46,7 @@ class BridgeTowerBehaviorInterface
 	virtual void setBridge( Object *bridge ) = 0;
 	virtual ObjectID getBridgeID( void ) = 0;
 	virtual void setTowerType( BridgeTowerType type ) = 0;
-	
+
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -81,8 +78,8 @@ class BridgeTowerBehavior : public BehaviorModule,
 	virtual DamageModuleInterface* getDamage() { return this; }
 	virtual void onDamage( DamageInfo *damageInfo );
 	virtual void onHealing( DamageInfo *damageInfo );
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState );
 
 	// Die methods
@@ -95,5 +92,3 @@ class BridgeTowerBehavior : public BehaviorModule,
 	BridgeTowerType m_type;				///< type of tower (positioning) we are
 
 };
-
-#endif  // end __BRIDGE_TOWER_DAMAGE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h
index 9fb4b36e201..5439875ebd2 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __BUNKERBUSTER_BEHAVIOR_H_
-#define __BUNKERBUSTER_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -55,7 +52,7 @@ class BunkerBusterBehaviorModuleData : //public UpdateModuleData
 	static void buildFieldParse( MultiIniFieldParse &p );
 
 	AsciiString m_upgradeRequired;///< Upgrade required to kill garrisoned units
-	const FXList *m_detonationFX;						///< FXList to play upon detonation 
+	const FXList *m_detonationFX;						///< FXList to play upon detonation
   const FXList *m_crashThroughBunkerFX;  ///< FXList to play as the bomb goes smashing through the bunker
   UnsignedInt m_crashThroughBunkerFXFrequency;  ///< How often to play the above FX
 
@@ -102,6 +99,3 @@ class BunkerBusterBehavior : public UpdateModule,
 
   ObjectID m_victimID;
 };
-
-#endif  // end __BUNKERBUSTER_BEHAVIOR_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h
index 547e5b7061c..34b460715f0 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h
@@ -24,29 +24,26 @@
 
 // FILE: CashBountyPower.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
 //
 //	Filename: 	CashBountyPower.h
 //
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CashBountyPower_H_
-#define __CashBountyPower_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -127,5 +124,3 @@ class CashBountyPower : public SpecialPowerModule
 	Real findBounty() const;
 
 };
-
-#endif // __CashBountyPower_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h
index 1aa926fdca2..0eeb3544405 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __CASHHACKSPECIALPOWER_H_
-#define __CASHHACKSPECIALPOWER_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/SpecialPowerModule.h"
 
@@ -85,6 +82,3 @@ class CashHackSpecialPower : public SpecialPowerModule
 	Int findAmountToSteal() const;
 
 };
-
-#endif  // end __CASHHACKSPECIALPOWER_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h
index b7d461d27f2..fca16c556a7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h
@@ -25,15 +25,12 @@
 // FILE: CaveContain.h ////////////////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, July 2002
 // Desc:   A version of OpenContain that overrides where the passengers are stored: one of CaveManager's
-//					entries. Changing entry is a script or ini command.  All queries about capacity and 
+//					entries. Changing entry is a script or ini command.  All queries about capacity and
 //					contents are also redirected.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CAVE_CONTAIN_H_
-#define __CAVE_CONTAIN_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CreateModule.h"
 #include "GameLogic/Module/OpenContain.h"
@@ -52,11 +49,11 @@ class CaveContainModuleData : public OpenContainModuleData
 		m_caveIndexData = 0;// By default, all Caves will be grouped together as number 0
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     OpenContainModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "CaveIndex", INI::parseInt, NULL, offsetof( CaveContainModuleData, m_caveIndexData ) },
 			{ 0, 0, 0, 0 }
@@ -71,7 +68,7 @@ class CaveContain : public OpenContain, public CreateModuleInterface, public Cav
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( CaveContain, "CaveContain" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( CaveContain, CaveContainModuleData )
-	
+
 public:
 
 	CaveContain( Thing *thing, const ModuleData* moduleData );
@@ -103,7 +100,7 @@ class CaveContain : public OpenContain, public CreateModuleInterface, public Cav
 	virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse );
 	virtual UnsignedInt getContainCount() const;
 	virtual Int getContainMax( void ) const;
-	virtual const ContainedItemsList* getContainedItemsList() const;	
+	virtual const ContainedItemsList* getContainedItemsList() const;
 	virtual Bool isKickOutOnCapture(){ return FALSE; }///< Caves and Tunnels don't kick out on capture.
 
 	// override the onDie we inherit from OpenContain
@@ -121,11 +118,9 @@ class CaveContain : public OpenContain, public CreateModuleInterface, public Cav
 
 	void changeTeamOnAllConnectedCaves( Team *newTeam, Bool setOriginalTeams );	///< When one gets captured, all connected ones get captured.  DistributedGarrison.
 
-	Bool m_needToRunOnBuildComplete; 
+	Bool m_needToRunOnBuildComplete;
 	Int m_caveIndex;
 
 	Team *m_originalTeam;												///< our original team before we were garrisoned
 
 };
-
-#endif  // end __CAVE_CONTAIN_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h
index d342c89f24c..4c3bb82e42c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef CHECKPOINT_UPDATE_H
-#define CHECKPOINT_UPDATE_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "Common/KindOf.h"
@@ -52,10 +49,10 @@ class CheckpointUpdateModuleData : public UpdateModuleData
 		m_enemyScanDelayTime = LOGICFRAMES_PER_SECOND;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "ScanDelayTime",		INI::parseDurationUnsignedInt,		NULL, offsetof( CheckpointUpdateModuleData, m_enemyScanDelayTime ) },
 			{ 0, 0, 0, 0 }
@@ -88,6 +85,3 @@ class CheckpointUpdate : public UpdateModule
 	void checkForAlliesAndEnemies( void );
 
 };
-
-#endif // end CHECKPOINT_UPDATE_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
index fa18529f411..0b0279a0464 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
@@ -24,11 +24,8 @@
 
 // ChinookAIUpdate.h //////////
 // Author: Steven Johnson, June 2002
- 
-#pragma once
 
-#ifndef _ChinookAIUpdate_H_
-#define _ChinookAIUpdate_H_
+#pragma once
 
 #include "GameLogic/AIStateMachine.h"
 #include "GameLogic/Module/SupplyTruckAIUpdate.h"
@@ -67,7 +64,7 @@ class ChinookAIUpdateModuleData : public SupplyTruckAIUpdateModuleData
 };
 
 //-------------------------------------------------------------------------------------------------
-enum ChinookFlightStatus CPP_11(: Int) // Stored in save file, don't renumber.  jba. 
+enum ChinookFlightStatus CPP_11(: Int) // Stored in save file, don't renumber.  jba.
 {
 	CHINOOK_TAKING_OFF				= 0,
 	CHINOOK_FLYING						= 1,
@@ -91,7 +88,7 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate
 	virtual UpdateSleepTime update();
  	virtual void aiDoCommand(const AICommandParms* parms);
 	virtual Bool chooseLocomotorSet(LocomotorSetType wst);
-	// this is present solely for some transports to override, so that they can land before 
+	// this is present solely for some transports to override, so that they can land before
 	// allowing people to exit...
 	virtual AIFreeToExitType getAiFreeToExit(const Object* exiter) const;
 	virtual Bool isAllowedToAdjustDestination() const;
@@ -101,7 +98,7 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate
 	// prevent supply-ferry behavior in some cases (eg, when toting passengers)
 	virtual Bool isAvailableForSupplying() const;
 	virtual Bool isCurrentlyFerryingSupplies() const;
-	
+
 	virtual Bool isIdle() const;
 
 	const ChinookAIUpdateModuleData* friend_getData() const { return getChinookAIUpdateModuleData(); }
@@ -109,7 +106,7 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate
 
 	void recordOriginalPosition( const Coord3D &pos ) { m_originalPos.set( &pos ); }
 	const Coord3D* getOriginalPosition() const { return &m_originalPos; }
-	
+
 	Int getUpgradedSupplyBoost() const;
 
 protected:
@@ -140,6 +137,3 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate
 	Coord3D									m_originalPos;
 	Bool										m_hasPendingCommand;
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h
index fc65bc7662d..a94e05adb89 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h
@@ -24,28 +24,25 @@
 
 // FILE: CleanupAreaPower.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	September 2002
 //
 //	Author:		Kris Morness
-//	
-//  Makes use of the cleanup hazard update by augmenting the cleanup range 
+//
+//  Makes use of the cleanup hazard update by augmenting the cleanup range
 //  until there is nothing left to cleanup at which time it goes idle.
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CLEANUP_AREA_POWER_H_
-#define __CLEANUP_AREA_POWER_H_
-
 //-----------------------------------------------------------------------------
 #include "GameLogic/Module/SpecialPowerModule.h"
 
@@ -75,5 +72,3 @@ class CleanupAreaPower : public SpecialPowerModule
 
 	virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions );
 };
-
-#endif 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h
index 9f7f4381e63..8268e7db553 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __CLEANUP_HAZARD_UPDATE_H_
-#define __CLEANUP_HAZARD_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -53,7 +50,7 @@ class CleanupHazardUpdateModuleData : public ModuleData
 	CleanupHazardUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -91,7 +88,3 @@ class CleanupHazardUpdate : public UpdateModule
 	Coord3D m_pos;
 	Real		m_moveRange;
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h
index 3c1afcc5daf..3394bee8860 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h
@@ -24,24 +24,21 @@
 
 // FILE: CollideModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CollideModule_H_
-#define __CollideModule_H_
-
 #include "Common/Module.h"
 #include "GameLogic/Module/BehaviorModule.h"
 
 //-------------------------------------------------------------------------------------------------
 /** OBJECT COLLIDE MODULE
 	- Called when two objects collide (or when object collides with ground)
-	- Note in the 'collide' method that 'other' can be NULL, this indicates a 
+	- Note in the 'collide' method that 'other' can be NULL, this indicates a
 		collision with the ground
-	- Also note the 'collide' method is the response for the object that THIS module 
-		belongs to, we do not need to worry about the collision moudle of 'other', 
+	- Also note the 'collide' method is the response for the object that THIS module
+		belongs to, we do not need to worry about the collision moudle of 'other',
 		it will have its own collide action called separately */
 //-------------------------------------------------------------------------------------------------
 class CollideModuleInterface
@@ -62,7 +59,7 @@ class CollideModuleData : public BehaviorModuleData
 {
 public:
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
 		BehaviorModuleData::buildFieldParse(p);
 	}
@@ -70,7 +67,7 @@ class CollideModuleData : public BehaviorModuleData
 
 
 //-------------------------------------------------------------------------------------------------
-class CollideModule : public BehaviorModule, 
+class CollideModule : public BehaviorModule,
 											public CollideModuleInterface
 {
 
@@ -102,5 +99,3 @@ class CollideModule : public BehaviorModule,
 inline CollideModule::CollideModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { }
 inline CollideModule::~CollideModule() { }
 //-------------------------------------------------------------------------------------------------
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h
index f85d42d3bb8..a9e66f197c7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __COMMAND_BUTTON_HUNT_UPDATE_H_
-#define __COMMAND_BUTTON_HUNT_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -52,7 +49,7 @@ class CommandButtonHuntUpdateModuleData : public ModuleData
 	CommandButtonHuntUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -86,7 +83,3 @@ class CommandButtonHuntUpdate : public UpdateModule
 	AsciiString		m_commandButtonName;
 	const CommandButton *m_commandButton;
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h
index 56eef9bf18e..e034b17685b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _COMMAND_SET_UPGRADE_H
-#define _COMMAND_SET_UPGRADE_H
-
 #include "GameLogic/Module/UpgradeModule.h"
 
 //-----------------------------------------------------------------------------
@@ -69,6 +66,3 @@ class CommandSetUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-#endif // _COMMAND_SET_UPGRADE_H
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
index f44272c0e5a..5a2db53fd1a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h
@@ -24,14 +24,11 @@
 
 // FILE: ContainModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __ContainModule_H_
-#define __ContainModule_H_
-
 #include "Common/Module.h"
 #include "GameLogic/WeaponBonusConditionFlags.h" // Can't forward a typedef.  This should me made a BitFlags class.
 #include "GameLogic/Damage.h"
@@ -80,7 +77,7 @@ typedef void (*ContainIterateFunc)( Object *obj, void *userData );		///< callbac
 class ContainModuleInterface
 {
 public:
-	
+
 	// we have a two basic container types that it is convenient to query and use
 	virtual OpenContain *asOpenContain() = 0;
 
@@ -104,10 +101,10 @@ class ContainModuleInterface
 	virtual Bool isImmuneToClearBuildingAttacks() const = 0;
   virtual Bool isSpecialOverlordStyleContainer() const = 0;
   virtual Bool isAnyRiderAttacking() const = 0;
-	
+
 	///< if my object gets selected, then my visible passengers should, too
 	///< this gets called from
-	virtual void clientVisibleContainedFlashAsSelected() = 0; 
+	virtual void clientVisibleContainedFlashAsSelected() = 0;
 
 
 
@@ -129,7 +126,7 @@ class ContainModuleInterface
 	virtual const Player* getApparentControllingPlayer(const Player* observingPlayer) const = 0;
 
 	virtual void recalcApparentControllingPlayer() = 0;
- 
+
 	//
 	// you will want to override onContaining() and onRemoving() if you need to
 	// do special actions at those event times for your module
@@ -142,18 +139,18 @@ class ContainModuleInterface
 	virtual Int getContainMax() const = 0; ///< The max needs to be virtual, but only two inheritors care.  -1 means "I don't care".
 
 	virtual ExitInterface* getContainExitInterface() = 0;
-	
+
 	virtual void orderAllPassengersToExit( CommandSourceType, Bool instantly ) = 0; ///< All of the smarts of exiting are in the passenger's AIExit. removeAllFrommContain is a last ditch system call, this is the game Evacuate
 	virtual void orderAllPassengersToIdle( CommandSourceType ) = 0; ///< Just like it sounds
 	virtual void orderAllPassengersToHackInternet( CommandSourceType ) = 0; ///< Just like it sounds
 	virtual void markAllPassengersDetected() = 0;										///< Cool game stuff got added to the system calls since this layer didn't exist, so this regains that functionality
- 
+
 	//
 	// interface for containing objects inside of objects.  Objects that are
 	// contained remove their drawable representations entirely from the client
 	//
-	/** 
-		can this container contain this kind of object? 
+	/**
+		can this container contain this kind of object?
 		and, if checkCapacity is TRUE, does this container have enough space left to hold the given unit?
 	*/
 	virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const = 0;
@@ -162,7 +159,7 @@ class ContainModuleInterface
 	virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ) = 0;			///< remove 'obj' from contain list
 	virtual void removeAllContained( Bool exposeStealthUnits = FALSE ) = 0;									///< remove all objects on contain list
 	virtual void killAllContained( void ) = 0;									///< kill all objects on contain list
-  virtual void harmAndForceExitAllContained( DamageInfo *info ) = 0; // apply canned damage against those containes 
+  virtual void harmAndForceExitAllContained( DamageInfo *info ) = 0; // apply canned damage against those containes
 	virtual Bool isEnclosingContainerFor( const Object *obj ) const = 0;	///< Does this type of Contain Visibly enclose its contents?
 	virtual Bool isPassengerAllowedToFire( ObjectID id = INVALID_ID ) const = 0;	///< Hey, can I shoot out of this container?
 	virtual void setPassengerAllowedToFire( Bool permission = TRUE ) = 0;	///< Hey, can I shoot out of this container?
@@ -178,7 +175,8 @@ class ContainModuleInterface
 	virtual const Object *friend_getRider() const = 0; ///< Damn.  The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
 	virtual Real getContainedItemsMass() const = 0;
 	virtual UnsignedInt getStealthUnitsContained() const = 0;
-	
+	virtual UnsignedInt getHeroUnitsContained() const = 0;
+
 	virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ) = 0;
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ) = 0;
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos ) = 0;
@@ -210,5 +208,3 @@ class ContainModuleInterface
 	}
 };
 //-------------------------------------------------------------------------------------------------
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h
index 88fc5435c9f..c748c8ec301 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef CONVERT_TO_CAR_BOMB_CRATE_COLLIDE_H_
-#define CONVERT_TO_CAR_BOMB_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -54,11 +51,11 @@ class ConvertToCarBombCrateCollideModuleData : public CrateCollideModuleData
 		m_fxList = NULL;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "FXList",		INI::parseFXList,		NULL, offsetof( ConvertToCarBombCrateCollideModuleData, m_fxList ) },
 			{ 0, 0, 0, 0 }
@@ -89,5 +86,3 @@ class ConvertToCarBombCrateCollide : public CrateCollide
 	virtual Bool isRailroad() const { return FALSE;};
 	virtual Bool isCarBombCrateCollide() const { return TRUE; }
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h
index ca5b25df722..7abd85627db 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h
@@ -23,19 +23,16 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: ConvertToHijackedVehicleCrateCollide.h 
+//
+// FILE: ConvertToHijackedVehicleCrateCollide.h
 // Author: Mark Lorenzen, July 2002
-// Desc:   A crate (actually a terrorist - mobile crate) that makes the target vehicle switch 
+// Desc:   A crate (actually a terrorist - mobile crate) that makes the target vehicle switch
 //				 sides, and kills its driver
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef CONVERT_TO_HIJACKED_VEHICLE_CRATE_COLLIDE_H_
-#define CONVERT_TO_HIJACKED_VEHICLE_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -54,7 +51,7 @@ class ConvertToHijackedVehicleCrateCollideModuleData : public CrateCollideModule
 		m_rangeOfEffect = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 	}
@@ -83,5 +80,3 @@ class ConvertToHijackedVehicleCrateCollide : public CrateCollide
 
 	virtual Bool isHijackedVehicleCrateCollide() const { return TRUE; }
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h
index 5b4971ecd19..e9d82b2da3e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h
@@ -24,12 +24,12 @@
 
 // FILE: CostModifierUpgrade.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,17 +37,14 @@
 //	Filename: 	CostModifierUpgrade.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __COST_MODIFIER_UPGRADE_H_
-#define __COST_MODIFIER_UPGRADE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -107,7 +104,7 @@ class CostModifierUpgrade : public UpgradeModule
 	// virtual destructor prototype defined by MemoryPoolObject
 
 	virtual void onDelete( void );																///< we have some work to do when this module goes away
-	virtual void onCapture( Player *oldOwner, Player *newOwner ); 
+	virtual void onCapture( Player *oldOwner, Player *newOwner );
 
 protected:
 
@@ -115,5 +112,3 @@ class CostModifierUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-#endif // __COST_MODIFIER_UPGRADE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h
index fbc2b1eed1d..c4ed34504ae 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __COUNTERMEASURES_BEHAVIOR_H
-#define __COUNTERMEASURES_BEHAVIOR_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/ParticleSys.h"
 #include "GameLogic/Module/BehaviorModule.h"
@@ -75,9 +72,9 @@ class CountermeasuresBehaviorModuleData : public UpdateModuleData
 		m_volleyVelocityFactor  = 1.0f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "FlareTemplateName",			INI::parseAsciiString,					NULL, offsetof( CountermeasuresBehaviorModuleData, m_flareTemplateName ) },
 			{ "FlareBoneBaseName",			INI::parseAsciiString,					NULL, offsetof( CountermeasuresBehaviorModuleData, m_flareBoneBaseName ) },
@@ -146,12 +143,12 @@ class CountermeasuresBehavior : public UpdateModule, public UpgradeMux, public C
 	virtual ObjectID calculateCountermeasureToDivertTo( const Object& victim );
 	virtual void reloadCountermeasures();
 	virtual Bool isActive() const;
-	
+
 
 protected:
 
-	virtual void upgradeImplementation() 
-	{ 
+	virtual void upgradeImplementation()
+	{
 		setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
 	}
 
@@ -176,8 +173,8 @@ class CountermeasuresBehavior : public UpdateModule, public UpgradeMux, public C
 		return getCountermeasuresBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers;
 	}
 
-	inline Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
-	
+	Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
+
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 	void launchVolley();
@@ -192,6 +189,3 @@ class CountermeasuresBehavior : public UpdateModule, public UpgradeMux, public C
 	UnsignedInt m_nextVolleyFrame;					//Frame the next volley is fired.
 	UnsignedInt m_reloadFrame;							//The frame countermeasures will be ready to use again.
 };
-
-#endif // __COUNTERMEASURES_BEHAVIOR_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h
index e67494da67b..8cf17d8f14b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef CRATE_COLLIDE_H_
-#define CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CollideModule.h"
 
@@ -42,7 +39,7 @@ class FXList;
 enum ScienceType CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
-class CrateCollideModuleData : public CollideModuleData 
+class CrateCollideModuleData : public CollideModuleData
 {
 public:
 	KindOfMaskType	m_kindof;				///< the kind(s) of units that can be collided with
@@ -52,7 +49,7 @@ class CrateCollideModuleData : public CollideModuleData
 	Bool m_isHumanOnlyPickup;				///< Can this crate only be picked up by a human player?  (Mission thing)
 	ScienceType m_pickupScience;		///< Can only be picked up by a unit whose player has this science
 	FXList *m_executeFX;						///< FXList to play when activated
-	
+
 	AsciiString m_executionAnimationTemplate;				///< Anim2D to play at crate location
 	Real m_executeAnimationDisplayTimeInSeconds;		///< time to play animation for
 	Real m_executeAnimationZRisePerSecond;					///< rise animation up while playing
@@ -99,7 +96,7 @@ enum SabotageVictimType CPP_11(: Int)
 	virtual Bool isSabotageBuildingCrateCollide() const { return FALSE; }
 
   void doSabotageFeedbackFX( const Object *other, SabotageVictimType type = SAB_VICTIM_GENERIC );
-  
+
 protected:
 
 	/// This is the game logic execution function that all real CrateCollides will implement
@@ -109,5 +106,3 @@ enum SabotageVictimType CPP_11(: Int)
 	virtual Bool isValidToExecute( const Object *other ) const;
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h
index 202159c915f..a5c9f2e21de 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _CREATE_CRATE_DIE_H_
-#define _CREATE_CRATE_DIE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "GameLogic/Module/DieModule.h"
@@ -49,8 +46,6 @@ class CreateCrateDieModuleData : public DieModuleData
 
 	CreateCrateDieModuleData()
 	{
-		// Added By Sadullah Nader
-		// Initializations missing and needed
 		m_crateNameList.clear();
 	}
 	~CreateCrateDieModuleData()
@@ -58,11 +53,11 @@ class CreateCrateDieModuleData : public DieModuleData
 		m_crateNameList.clear();
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     DieModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "CrateData",	CreateCrateDieModuleData::parseCrateData,		NULL, NULL },
 			{ 0, 0, 0, 0 }
@@ -86,7 +81,7 @@ class CreateCrateDie : public DieModule
 	CreateCrateDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 private:
 	Bool testCreationChance( CrateTemplate const *currentCrateData );
@@ -96,5 +91,3 @@ class CreateCrateDie : public DieModule
 
 	Object *createCrate( CrateTemplate const *currentCrateData );
 };
-
-#endif 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h
index fe92f10385e..8b6de2d9fc3 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h
@@ -24,14 +24,11 @@
 
 // FILE: CreateModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __CreateModule_H_
-#define __CreateModule_H_
-
 #include "Common/Module.h"
 #include "GameLogic/Module/BehaviorModule.h"
 
@@ -52,7 +49,7 @@ class CreateModuleData : public BehaviorModuleData
 {
 public:
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
 		BehaviorModuleData::buildFieldParse(p);
 	}
@@ -85,5 +82,3 @@ class CreateModule : public BehaviorModule, public CreateModuleInterface
 	Bool m_needToRunOnBuildComplete; ///< Prevent the multiple calling of onBuildComplete
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h
index 63c390d83ec..12f0386c1f1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _CREATE_OBJECT_DIE_H_
-#define _CREATE_OBJECT_DIE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "GameLogic/Module/DieModule.h"
@@ -48,6 +45,7 @@ class CreateObjectDieModuleData : public DieModuleData
 
 	const ObjectCreationList* m_ocl;			///< object creaton list to make
 	Bool m_transferPreviousHealth; ///< Transfers previous health before death to the new object created.
+	Bool m_transferSelection;      ///< Transfers selection state before death to the new object created.
 
 	CreateObjectDieModuleData();
 
@@ -69,9 +67,6 @@ class CreateObjectDie : public DieModule
 	CreateObjectDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-#endif // _CREATE_OBJECT_DIE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h
index 791e567601c..c18289db5b3 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __CrushDie_H_
-#define __CrushDie_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/INI.h"
@@ -67,11 +64,11 @@ class CrushDieModuleData : public DieModuleData
 		}
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     DieModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "TotalCrushSound",					INI::parseAudioEventRTS,			NULL, offsetof( CrushDieModuleData, m_crushSounds[TOTAL_CRUSH] ) },
 			{ "BackEndCrushSound",				INI::parseAudioEventRTS,			NULL, offsetof( CrushDieModuleData, m_crushSounds[BACK_END_CRUSH] ) },
@@ -90,7 +87,7 @@ class CrushDie : public DieModule
 {
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( CrushDie, "CrushDie" )
-	
+
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( CrushDie, CrushDieModuleData );
 
 public:
@@ -98,9 +95,6 @@ class CrushDie : public DieModule
 	CrushDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
-	
-};
-
-#endif // __CrushDie_H_
+	virtual void onDie( const DamageInfo *damageInfo );
 
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h
index bc2cb944c7c..896ead68132 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DAMDIE_H_
-#define __DAMDIE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 
@@ -45,7 +42,7 @@ class DamDieModuleData : public DieModuleData
 	DamDieModuleData( void );
 
 	static void buildFieldParse(MultiIniFieldParse& p);
-		
+
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -61,8 +58,6 @@ class DamDie : public DieModule
 	DamDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prorotype provided by MemoryPoolObject
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-#endif  // end __DAMDIE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
index b8f70f12aec..6555522a816 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
@@ -24,14 +24,11 @@
 
 // FILE: DamageModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __DamageModule_H_
-#define __DamageModule_H_
-
 #include "Common/Module.h"
 #include "GameLogic/Damage.h"
 #include "GameLogic/Module/BehaviorModule.h"
@@ -50,8 +47,8 @@ class DamageModuleInterface
 
 	virtual void onDamage( DamageInfo *damageInfo ) = 0;	///< damage callback
 	virtual void onHealing( DamageInfo *damageInfo ) = 0;	///< healing callback
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState) = 0;  ///< state change callback
 
 };
@@ -67,11 +64,11 @@ class DamageModuleData : public BehaviorModuleData
 	{
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     BehaviorModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 //			{ "DamageTypes", INI::parseDamageTypeFlags, NULL, offsetof( DamageModuleData, m_damageTypes ) },
 			{ 0, 0, 0, 0 }
@@ -103,8 +100,8 @@ class DamageModule : public BehaviorModule, public DamageModuleInterface
 	// damage module callbacks
 	virtual void onDamage( DamageInfo *damageInfo ) = 0;	///< damage callback
 	virtual void onHealing( DamageInfo *damageInfo ) = 0;	///< healing callback
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState) = 0;  ///< state change callback
 
 protected:
@@ -113,5 +110,3 @@ class DamageModule : public BehaviorModule, public DamageModuleInterface
 inline DamageModule::DamageModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { }
 inline DamageModule::~DamageModule() { }
 //-------------------------------------------------------------------------------------------------
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h
index 6f7b5a3f7a9..4d2aea2d39f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _DEFAULT_PRODUCTION_EXIT_UPDATE_H
-#define _DEFAULT_PRODUCTION_EXIT_UPDATE_H
-
 #include "GameLogic/Module/UpdateModule.h"
 #include "Common/INI.h"
 #include "Lib/BaseType.h"
@@ -54,10 +51,10 @@ class DefaultProductionExitUpdateModuleData : public UpdateModuleData
 		m_useSpawnRallyPoint = false;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UnitCreatePoint",		INI::parseCoord3D,		NULL, offsetof( DefaultProductionExitUpdateModuleData, m_unitCreatePoint ) },
 			{ "NaturalRallyPoint",  INI::parseCoord3D,		NULL, offsetof( DefaultProductionExitUpdateModuleData, m_naturalRallyPoint ) },
@@ -129,5 +126,3 @@ inline Bool DefaultProductionExitUpdate::useSpawnRallyPoint( void ) const
 	else
 		return FALSE;
 }
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h
index 69eda06917a..b9d73108919 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h
@@ -24,7 +24,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //
-// FILE: DefectorSpecialPower.h 
+// FILE: DefectorSpecialPower.h
 // Author: Mark Lorenzen, JULY 2002
 // Desc:   General can click command cursor on any enemy, and it becomes his
 //
@@ -32,9 +32,6 @@
 
 #pragma once
 
-#ifndef __DEFECTORSPECIALPOWER_H_
-#define __DEFECTORSPECIALPOWER_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/SpecialPowerModule.h"
 
@@ -81,5 +78,3 @@ class DefectorSpecialPower : public SpecialPowerModule
 protected:
 
 };
-#endif  // end DefectorSpecialPower
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h
index 2c991408d46..436feb28d70 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DELETION_UPDATE_H_
-#define __DELETION_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -48,10 +45,10 @@ class DeletionUpdateModuleData : public UpdateModuleData
 		m_maxFrames = 0.0f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MinLifetime",					INI::parseDurationUnsignedInt,		NULL, offsetof( DeletionUpdateModuleData, m_minFrames ) },
 			{ "MaxLifetime",					INI::parseDurationUnsignedInt,		NULL, offsetof( DeletionUpdateModuleData, m_maxFrames ) },
@@ -86,6 +83,3 @@ class DeletionUpdate : public UpdateModule
 	UnsignedInt m_dieFrame;			///< frame we die on
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h
index c5456999659..84e64d9f047 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _DELIVER_PAYLOAD_AI_UPDATE_H_
-#define _DELIVER_PAYLOAD_AI_UPDATE_H_
-
 #include "Common/StateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameClient/RadiusDecal.h"
@@ -56,7 +53,7 @@ class DeliverPayloadStateMachine : public StateMachine
 //-------------------------------------------------------------------------------------------------
 class ApproachState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ApproachState, "ApproachState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ApproachState, "ApproachState")
 	//Approaching the drop zone
 public:
 	ApproachState( StateMachine *machine ) :State( machine, "ApproachState" ) {}
@@ -73,13 +70,13 @@ EMPTY_DTOR(ApproachState)
 //-------------------------------------------------------------------------------------------------
 class DeliveringState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DeliveringState, "DeliveringState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DeliveringState, "DeliveringState")
 	// Kickin' stuff out the door
 public:
-	DeliveringState( StateMachine *machine ) :State( machine, "DeliveringState" ) 
-	{ 
-		m_dropDelayLeft = 0; 
-		m_didOpen = false; 
+	DeliveringState( StateMachine *machine ) :State( machine, "DeliveringState" )
+	{
+		m_dropDelayLeft = 0;
+		m_didOpen = false;
 	}
 	virtual StateReturnType update();
 	virtual StateReturnType onEnter();
@@ -99,7 +96,7 @@ EMPTY_DTOR(DeliveringState)
 //-------------------------------------------------------------------------------------------------
 class ConsiderNewApproachState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ConsiderNewApproachState, "ConsiderNewApproachState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ConsiderNewApproachState, "ConsiderNewApproachState")
 	//Should I try again?  Has own data to keep track.
 public:
 	ConsiderNewApproachState( StateMachine *machine ) : State( machine, "ConsiderNewApproachState" ), m_numberEntriesToState(0) { }
@@ -120,7 +117,7 @@ EMPTY_DTOR(ConsiderNewApproachState)
 //-------------------------------------------------------------------------------------------------
 class RecoverFromOffMapState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RecoverFromOffMapState, "RecoverFromOffMapState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RecoverFromOffMapState, "RecoverFromOffMapState")
 public:
 	RecoverFromOffMapState( StateMachine *machine ) : State( machine, "RecoverFromOffMapState" ), m_reEntryFrame(0) { }
 	virtual StateReturnType update();
@@ -139,7 +136,7 @@ EMPTY_DTOR(RecoverFromOffMapState)
 //-------------------------------------------------------------------------------------------------
 class HeadOffMapState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeadOffMapState, "HeadOffMapState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeadOffMapState, "HeadOffMapState")
 	//I'm outta here
 public:
   HeadOffMapState( StateMachine *machine ) :State( machine, "HeadOffMapState" ) { facingDirectionUponDelivery.zero(); }
@@ -150,7 +147,7 @@ class HeadOffMapState :  public State
 	virtual void crc( Xfer *xfer ){};
 	virtual void xfer( Xfer *xfer ){XferVersion cv = 1;	XferVersion v = cv; xfer->xferVersion( &v, cv );}
 	virtual void loadPostProcess(){};
-  
+
   Coord3D facingDirectionUponDelivery;
 };
 EMPTY_DTOR(HeadOffMapState)
@@ -158,7 +155,7 @@ EMPTY_DTOR(HeadOffMapState)
 //-------------------------------------------------------------------------------------------------
 class CleanUpState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(CleanUpState, "CleanUpState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(CleanUpState, "CleanUpState")
 	//Made it off map, delete ourselves
 public:
 	CleanUpState( StateMachine *machine ) :State( machine, "CleanUpState" ) {}
@@ -207,20 +204,16 @@ class DeliverPayloadAIUpdateModuleData : public AIUpdateModuleData
 		m_dropOffset.zero();
 		m_dropVariance.zero();
 		m_deliveryDecalRadius = 0;
-		// Added By Sadullah Nader
-		// Initialization missing and needed
-
 		m_putInContainerName.clear();
-		// End Add
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     AIUpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
-			//These values represent script only reinforcements using deliverPayloadViaModuleData()! 
+			//These values represent script only reinforcements using deliverPayloadViaModuleData()!
 			//***********************************************************************************
 			//DO NOT ADD DATA HERE UNLESS YOU ARE SUPPORTING SCRIPTED TEAM REINFORCEMENT DELIVERY
 			//THESE DATA VALUES ARE SPECIFIED ONLY BY FACTIONUNIT.INI
@@ -298,14 +291,9 @@ class DeliverPayloadData
 		m_visiblePayloadWeaponTemplate = NULL;
 		m_selfDestructObject = FALSE;
 		m_deliveryDecalRadius = 0;
-		// Added By Sadullah Nader
-		// Initialization missing and needed  
-		
 		m_visibleDropBoneName.clear();
 		m_visiblePayloadTemplateName.clear();
 		m_visibleSubObjectName.clear();
-		
-		// End Add
 	}
 
 	static const FieldParse* getFieldParse();
@@ -383,6 +371,3 @@ class DeliverPayloadAIUpdate : public AIUpdateInterface
 
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h
index e6f64f3abb8..9085a9c9825 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DEMO_TRAP_UPDATE_H_
-#define __DEMO_TRAP_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -54,11 +51,11 @@ class DemoTrapUpdateModuleData : public ModuleData
 	Bool						m_defaultsToProximityMode;
 	Bool						m_friendlyDetonation;
 	Bool						m_detonateWhenKilled;
-	
+
 	DemoTrapUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -86,7 +83,3 @@ class DemoTrapUpdate : public UpdateModule
 	Int m_nextScanFrames;
 	Bool m_detonated;
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h
index e8e53da9cce..c4ed1c56f2c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DEMORALIZE_SPECIAL_POWER_H_
-#define __DEMORALIZE_SPECIAL_POWER_H_
-
 #ifdef ALLOW_DEMORALIZE
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
@@ -82,6 +79,3 @@ class DemoralizeSpecialPower : public SpecialPowerModule
 };
 
 #endif // ALLOW_DEMORALIZE
-
-
-#endif  // end __DEMORALIZE_SPECIAL_POWER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
index 35e68ebfec4..d50fc085f10 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
@@ -24,14 +24,11 @@
 
 // DeployStyleAIUpdate.h ////////////
 // Author: Kris Morness, August 2002
-// Desc:   State machine that allows deploying/undeploying to control the AI. 
+// Desc:   State machine that allows deploying/undeploying to control the AI.
 //         When deployed, you can't move, when undeployed, you can't attack.
 
 #pragma once
 
-#ifndef __DEPLOY_STYLE_AI_UPDATE_H
-#define __DEPLOY_STYLE_AI_UPDATE_H
-
 #include "Common/StateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -50,8 +47,8 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData
 {
 public:
 	UnsignedInt			m_unpackTime;
-	UnsignedInt			m_packTime;		
-	Bool						m_resetTurretBeforePacking;	
+	UnsignedInt			m_packTime;
+	Bool						m_resetTurretBeforePacking;
 	Bool						m_turretsFunctionOnlyWhenDeployed;
 	Bool						m_turretsMustCenterBeforePacking;
 	Bool						m_manualDeployAnimations;
@@ -62,10 +59,7 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData
 		m_packTime = 0;
 		m_resetTurretBeforePacking = false;
 		m_turretsFunctionOnlyWhenDeployed = false;
-		// Added By Sadullah Nader
-		// Initialization necessary 
 		m_turretsMustCenterBeforePacking = FALSE;
-		// End Add
 		m_manualDeployAnimations = FALSE;
 	}
 
@@ -73,7 +67,7 @@ class DeployStyleAIUpdateModuleData : public AIUpdateModuleData
 	{
 		AIUpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UnpackTime",					INI::parseDurationUnsignedInt,	NULL, offsetof( DeployStyleAIUpdateModuleData, m_unpackTime ) },
 			{ "PackTime",						INI::parseDurationUnsignedInt,	NULL, offsetof( DeployStyleAIUpdateModuleData, m_packTime ) },
@@ -116,6 +110,3 @@ class DeployStyleAIUpdate : public AIUpdateInterface
 	DeployStateTypes				m_state;
 	UnsignedInt							m_frameToWaitForDeploy;
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h
index f3242c5c058..f365c12956c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DestroyDie_H_
-#define __DestroyDie_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 #include "Common/INI.h"
@@ -50,9 +47,6 @@ class DestroyDie : public DieModule
 	DestroyDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-#endif // __DestroyDie_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h
index ff921a6aa17..c71fb130505 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h
@@ -24,14 +24,11 @@
 
 // FILE: DestroyModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __DestroyModule_H_
-#define __DestroyModule_H_
-
 #include "Common/Module.h"
 #include "GameLogic/Module/BehaviorModule.h"
 
@@ -66,5 +63,3 @@ class DestroyModule : public BehaviorModule, public DestroyModuleInterface
 protected:
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h
index 178ddfe1c43..c3a28c08d92 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h
@@ -24,14 +24,11 @@
 
 // FILE: DieModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __DieModule_H_
-#define __DieModule_H_
-
 #include "Common/Module.h"
 #include "GameLogic/Damage.h"
 #include "GameLogic/Module/BehaviorModule.h"
@@ -73,13 +70,13 @@ class DieModuleData : public BehaviorModuleData
 public:
 	DieMuxData			m_dieMuxData;
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
 		BehaviorModuleData::buildFieldParse(p);
 		p.add(DieMuxData::getFieldParse(), offsetof( DieModuleData, m_dieMuxData ));
 	}
 
-	inline Bool isDieApplicable(const Object* obj, const DamageInfo *damageInfo) const { return m_dieMuxData.isDieApplicable(obj, damageInfo); }
+	Bool isDieApplicable(const Object* obj, const DamageInfo *damageInfo) const { return m_dieMuxData.isDieApplicable(obj, damageInfo); }
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -104,9 +101,7 @@ class DieModule : public BehaviorModule, public DieModuleInterface
 
 protected:
 	Bool isDieApplicable(const DamageInfo *damageInfo) const { return getDieModuleData()->isDieApplicable(getObject(), damageInfo); }
-	
+
 };
 inline DieModule::DieModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { }
 inline DieModule::~DieModule() { }
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h
index 163dd59dbdc..92695de6c55 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _DOCK_UPDATE_H_
-#define _DOCK_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "Common/GameMemory.h"
@@ -49,7 +46,7 @@ enum
 };
 
 //-------------------------------------------------------------------------------------------------
-class DockUpdateModuleData : public UpdateModuleData 
+class DockUpdateModuleData : public UpdateModuleData
 {
 public:
 	Int m_numberApproachPositionsData; // A positive number is an absolute, DYNAMIC_APPROACH_VECTOR_FLAG means dynamic vector
@@ -86,8 +83,8 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface
 	*/
 	virtual Bool advanceApproachPosition( Object* docker, Coord3D *position, Int *index );
 
-	/** Return true when it is OK for docker to begin entering the dock 
-			The Dock will lift the restriction on one particular docker on its own, 
+	/** Return true when it is OK for docker to begin entering the dock
+			The Dock will lift the restriction on one particular docker on its own,
 			so you must continually ask.
 	*/
 	virtual Bool isClearToEnter( Object const* docker ) const;
@@ -99,23 +96,23 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface
 
 	/** Give me the point that is the start of your docking path
 			Returning NULL means there is none free
-			All functions take docker as arg so we could have multiple docks on a building.  
+			All functions take docker as arg so we could have multiple docks on a building.
 			Docker is not assumed, it is recorded and checked.
 	*/
-	virtual void getEnterPosition( Object* docker, Coord3D *position );			
+	virtual void getEnterPosition( Object* docker, Coord3D *position );
 
-	/** Give me the middle point of the dock process where the action() happens */	
-	virtual void getDockPosition( Object* docker, Coord3D *position );					
+	/** Give me the middle point of the dock process where the action() happens */
+	virtual void getDockPosition( Object* docker, Coord3D *position );
 
 	/** Give me the point to drive to when I am done */
-	virtual void getExitPosition( Object* docker, Coord3D *position );					
+	virtual void getExitPosition( Object* docker, Coord3D *position );
 
-	virtual void onApproachReached( Object* docker );		///< I have reached the Approach Point.  
-	virtual void onEnterReached( Object* docker );			///< I have reached the Enter Point.  
+	virtual void onApproachReached( Object* docker );		///< I have reached the Approach Point.
+	virtual void onEnterReached( Object* docker );			///< I have reached the Enter Point.
 	virtual void onDockReached( Object* docker );				///< I have reached the Dock point
 	virtual void onExitReached( Object* docker );				///< I have reached the exit.  You are no longer busy
 
-	//The fact that action() is not here is intentional.  This object cannot exist.  You must 
+	//The fact that action() is not here is intentional.  This object cannot exist.  You must
 	//derive off it and implement action().
 
 	virtual void cancelDock( Object* docker );	///< Clear me from any reserved points, and if I was the reason you were Busy, you aren't anymore.
@@ -126,7 +123,7 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface
 	virtual Bool isAllowPassthroughType();	///< Not all docks allow you to path through them in your AIDock machine
 
 	virtual Bool isRallyPointAfterDockType(){return FALSE;} ///< A minority of docks want to give you a final command to their rally point
-	
+
 	virtual void setDockCrippled( Bool setting ); ///< Game Logic can set me as inoperative.  I get to decide what that means.
 
 	virtual UpdateSleepTime update();	///< In charge of lifting dock restriction for one registered as Approached if all is ready
@@ -145,7 +142,7 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface
 
 	VecCoord3D m_approachPositions;
 	ObjectIDVector m_approachPositionOwners;	///< Who is in or at least reserved each spot
-	BoolVector m_approachPositionReached;			///< Which positions have actually been reached 
+	BoolVector m_approachPositionReached;			///< Which positions have actually been reached
 
 	ObjectID m_activeDocker;	///< we could expand this to multiple dock paths since we always get docker in our methods
 	Bool m_dockerInside; ///< This is true while our active docker is between Enter and Exit. This is shorter than activeDocker's lifetime as it doesn't include approach to enter
@@ -153,8 +150,6 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface
 
 	Bool m_dockOpen;  ///< Is the dock open for dockers
 
-	void loadDockPositions();  ///< load all the dock positions 
+	void loadDockPositions();  ///< load all the dock positions
 	Coord3D computeApproachPosition( Int positionIndex, Object *forWhom ); ///< Do a smart lookup of this bone position
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
index e871d8fc01f..2d5d4bd3991 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DOZERAIUPDATE_H_
-#define __DOZERAIUPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -71,12 +68,13 @@ class DozerPrimaryStateMachine : public StateMachine
 enum DozerTask CPP_11(: Int) // These enums are saved in the game save file, so DO NOT renumber them. jba.
 {
 	DOZER_TASK_INVALID = -1,
-	DOZER_TASK_FIRST = 0,
-	DOZER_TASK_BUILD = DOZER_TASK_FIRST,		///< go build something
-	DOZER_TASK_REPAIR = 1,											///< go repair something
-	DOZER_TASK_FORTIFY = 2,											///< go fortify something
 
-	DOZER_NUM_TASKS													// keep this last
+	DOZER_TASK_BUILD,												///< go build something
+	DOZER_TASK_REPAIR,											///< go repair something
+	DOZER_TASK_FORTIFY,											///< go fortify something
+
+	DOZER_NUM_TASKS,												// keep this last
+	DOZER_TASK_FIRST = 0,
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -86,7 +84,8 @@ enum DozerDockPoint CPP_11(: Int)	 // These enums are saved in the game save fil
 	DOZER_DOCK_POINT_START	= 0,
 	DOZER_DOCK_POINT_ACTION	= 1,
 	DOZER_DOCK_POINT_END		= 2,
-	DOZER_NUM_DOCK_POINTS  // keep this one last
+
+	DOZER_NUM_DOCK_POINTS
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -119,8 +118,8 @@ class DozerAIInterface
 	virtual Real getBoredRange( void ) const = 0;							///< when we're bored, we look this far away to do things
 
 	// methods to override for the dozer behaviors
-	virtual Object *construct( const ThingTemplate *what, 
-														 const Coord3D *pos, Real angle, 
+	virtual Object *construct( const ThingTemplate *what,
+														 const Coord3D *pos, Real angle,
 														 Player *owningPlayer,
 														 Bool isRebuild ) = 0;
 
@@ -188,7 +187,7 @@ class DozerAIUpdateModuleData : public AIUpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 /** The Dozer AI Update interface.  Dozers are workers that are capable of building all the
-	* structures available to a player, as well as repairing building, and fortifying 
+	* structures available to a player, as well as repairing building, and fortifying
 	* civilian structures */
 //-------------------------------------------------------------------------------------------------
 class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface
@@ -221,8 +220,8 @@ class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface
 	virtual Real getBoredRange( void ) const;							///< when we're bored, we look this far away to do things
 
 	// methods to override for the dozer behaviors
-	virtual Object* construct( const ThingTemplate *what, 
-														 const Coord3D *pos, Real angle, 
+	virtual Object* construct( const ThingTemplate *what,
+														 const Coord3D *pos, Real angle,
 														 Player *owningPlayer,
 														 Bool isRebuild );								///< construct an object
 
@@ -274,11 +273,11 @@ class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface
 
 	virtual void privateRepair( Object *obj, CommandSourceType cmdSource );	///< repair the target
 	virtual void privateResumeConstruction( Object *obj, CommandSourceType cmdSource );  ///< resume construction on obj
-	
+
 	struct DozerTaskInfo
 	{
 		ObjectID m_targetObjectID;				///< target object ID of task
-		UnsignedInt m_taskOrderFrame;			///< logic frame we decided we wanted to do this task	
+		UnsignedInt m_taskOrderFrame;			///< logic frame we decided we wanted to do this task
 	} m_task[ DOZER_NUM_TASKS ];				///< tasks we want to do indexed by DozerTask
 
 	DozerPrimaryStateMachine *m_dozerMachine;  ///< the custom state machine for Dozer behavior
@@ -303,7 +302,3 @@ class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface
 	void createMachines( void );		///< create our behavior machines we need
 
 };
-
-
-#endif // __DOZERAIUPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h
index 529242e5ee0..ac230ffc2e7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h
@@ -24,13 +24,10 @@
 
 // FILE:		DumbProjectileBehavior.h
 // Author:	Steven Johnson, July 2002
-// Desc:		
+// Desc:
 
 #pragma once
 
-#ifndef _DumbProjectileBehavior_H_
-#define _DumbProjectileBehavior_H_
-
 #include "Common/GameType.h"
 #include "Common/GlobalData.h"
 #include "Common/STLTypedefs.h"
@@ -116,15 +113,12 @@ class DumbProjectileBehavior : public UpdateModule, public ProjectileUpdateInter
 	Int										m_flightPathSegments;			///< number of segments in the flightpath (in case we must regen it)
 	Int										m_currentFlightPathStep;	///< Our current index in the flight path vector.  Quicker than popping off.
 	WeaponBonusConditionFlags		m_extraBonusFlags;
-  
-  Bool                  m_hasDetonated;           ///< 
+
+  Bool                  m_hasDetonated;           ///<
 
 	Bool calcFlightPath(Bool recalcNumSegments);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	void displayFlightPath();	///< Uses little debug icons in worldspace to show the path chosen when it is decided upon
 #endif
 
 };
-
-#endif // _DumbProjectileBehavior_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h
index 505ffd720f8..96b0e953dd2 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DYNAMIC_GEOMETRY_INFO_UPDATE_H_
-#define __DYNAMIC_GEOMETRY_INFO_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Geometry.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -61,7 +58,7 @@ class DynamicGeometryInfoUpdateModuleData : public ModuleData
 	DynamicGeometryInfoUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -102,7 +99,3 @@ class DynamicGeometryInfoUpdate : public UpdateModule
 	Real m_finalMinorRadius;
 
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h
index 28f901b289f..7b84745ca59 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __DYNAMIC_SHROUD_RANGE_UPDATE_H_
-#define __DYNAMIC_SHROUD_RANGE_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameClient/RadiusDecal.h"///< For the pseudo-wireframe decal effect
@@ -127,8 +124,5 @@ class DynamicShroudClearingRangeUpdate : public UpdateModule
 	Real m_currentClearingRange;							///<ToKeepTrackOfWhere We are at
 
 	RadiusDecal m_gridDecal[GRID_FX_DECAL_COUNT];///< For the pseudo-wireframe decal effect
-	
-};
-
-#endif
 
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h
index 4d8435c57be..9e6712b5089 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __EMPUPDATE_H_
-#define __EMPUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -42,7 +39,7 @@
 class EMPUpdateModuleData : public UpdateModuleData
 {
 public:
-	UnsignedInt m_lifeFrames;	
+	UnsignedInt m_lifeFrames;
 	UnsignedInt m_startFadeFrame;
 	UnsignedInt m_disabledDuration;
 	Real				m_startScale; ///< how big I start drawing
@@ -64,7 +61,7 @@ class EMPUpdateModuleData : public UpdateModuleData
 	{
 		m_lifeFrames = 1;
 		m_startFadeFrame = 0;
-		m_startScale = 1.0f; 
+		m_startScale = 1.0f;
 		m_targetScaleMax = 1.0f;
 		m_targetScaleMin = 1.0f;
 		m_startColor.setFromInt(0xffffffff);
@@ -81,10 +78,10 @@ class EMPUpdateModuleData : public UpdateModuleData
     m_victimKindOfNot.clear();
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "Lifetime",	INI::parseDurationUnsignedInt,		NULL, offsetof( EMPUpdateModuleData, m_lifeFrames ) },
 			{ "StartFadeTime",	INI::parseDurationUnsignedInt,		NULL, offsetof( EMPUpdateModuleData, m_startFadeFrame ) },
@@ -103,7 +100,7 @@ class EMPUpdateModuleData : public UpdateModuleData
 
       { "VictimRequiredKindOf", KindOfMaskType::parseFromINI, NULL, offsetof( EMPUpdateModuleData, m_victimKindOf ) },
 		  { "VictimForbiddenKindOf", KindOfMaskType::parseFromINI, NULL, offsetof( EMPUpdateModuleData, m_victimKindOfNot ) },
-      
+
 			{ 0, 0, 0, 0 }
 		};
     p.add(dataFieldParse);
@@ -158,7 +155,7 @@ class EMPUpdate : public UpdateModule
 class LeafletDropBehaviorModuleData : public UpdateModuleData
 {
 public:
-	UnsignedInt m_delayFrames;	
+	UnsignedInt m_delayFrames;
 	UnsignedInt m_disabledDuration;
   Real m_radius;
 	const ParticleSystemTemplate *m_leafletFXParticleSystem;
@@ -172,10 +169,10 @@ class LeafletDropBehaviorModuleData : public UpdateModuleData
     m_leafletFXParticleSystem = NULL;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "Delay",	        INI::parseDurationUnsignedInt,	NULL, offsetof( LeafletDropBehaviorModuleData, m_delayFrames ) },
 			{ "DisabledDuration",	INI::parseDurationUnsignedInt,	NULL, offsetof( LeafletDropBehaviorModuleData, m_disabledDuration ) },
@@ -221,22 +218,3 @@ class LeafletDropBehavior : public UpdateModule,
 	UnsignedInt m_startFrame;			///< frame we die on
   Bool  m_fxFired; ///< have we done our fx yet
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#endif // __EMPUPDATE_H_
-
- 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h
index 50ab55365f1..b2a0e2cc03f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _EjectPilotDie_H_
-#define _EjectPilotDie_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 #include "Common/INI.h"
@@ -68,10 +65,7 @@ class EjectPilotDie : public DieModule
 
 	static void ejectPilot(const ObjectCreationList* ocl, const Object* dyingObject, const Object* damageDealer);
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 	virtual DieModuleInterface* getEjectPilotDieInterface( void ) {return this; }
 
 };
-
-#endif // _EjectPilotDie_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h
index d2dbe978d64..3929983db08 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __EnemyNearUpdate_H_
-#define __EnemyNearUpdate_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "Common/KindOf.h"
@@ -48,10 +45,10 @@ class EnemyNearUpdateModuleData : public UpdateModuleData
 		m_enemyScanDelayTime = LOGICFRAMES_PER_SECOND;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "ScanDelayTime",		INI::parseDurationUnsignedInt,		NULL, offsetof( EnemyNearUpdateModuleData, m_enemyScanDelayTime ) },
 			{ 0, 0, 0, 0 }
@@ -84,6 +81,3 @@ class EnemyNearUpdate : public UpdateModule
 	void checkForEnemies( void );
 
 };
-
-#endif // end __EnemyNearUpdate_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h
index c661dc477f5..eefcea7e94b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __EXPERIENCE_SCALAR_UPGRADE_H_
-#define __EXPERIENCE_SCALAR_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -72,7 +69,3 @@ class ExperienceScalarUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-
-#endif // __DEFAULTDIE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h
index fe690c0f49b..20533a7b503 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FXListDie_H_
-#define __FXListDie_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "GameLogic/Module/DieModule.h"
@@ -47,7 +44,7 @@ class FXList;
 class FXListDieModuleData : public DieModuleData
 {
 public:
-	const FXList					*m_defaultDeathFX;								///< default fx to make 
+	const FXList					*m_defaultDeathFX;								///< default fx to make
 	UpgradeMuxData				m_upgradeMuxData;
 	Bool									m_orientToObject;
 	Bool									m_initiallyActive;
@@ -59,11 +56,11 @@ class FXListDieModuleData : public DieModuleData
 		m_initiallyActive = TRUE; //Patch 1.02 -- Craptacular HACK -- should default to FALSE but only ONE case sets it false out of 847!
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     DieModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "StartsActive",					INI::parseBool, NULL, offsetof( FXListDieModuleData, m_initiallyActive ) },
 			{ "DeathFX",							INI::parseFXList,		NULL, offsetof( FXListDieModuleData, m_defaultDeathFX ) },
@@ -94,7 +91,7 @@ class FXListDie : public DieModule, public UpgradeMux
 	virtual UpgradeModuleInterface* getUpgrade() { return this; }
 	virtual DieModuleInterface* getDie() { return this; }
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 protected:
 
@@ -124,13 +121,9 @@ class FXListDie : public DieModule, public UpgradeMux
 		return getFXListDieModuleData()->m_upgradeMuxData.m_requiresAllTriggers;
 	}
 
-	inline Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
-	
+	Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
+
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 
 };
-
-
-#endif // __FXListDie_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h
index 50cd853898e..2c14a00b3c4 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __FIRE_OCL_AFTER_WEAPON_COOLDOWN_UPDATE_H
-#define __FIRE_OCL_AFTER_WEAPON_COOLDOWN_UPDATE_H
-
 class UpgradeMuxData;
 
 #include "GameLogic/Module/UpdateModule.h"
@@ -101,12 +98,9 @@ class FireOCLAfterWeaponCooldownUpdate : public UpdateModule, public UpgradeMux
 	void fireOCL();
 
 private:
-	
+
 	Bool				m_valid;
 	UnsignedInt m_consecutiveShots;
 	UnsignedInt m_startFrame;
 
 };
-
-#endif // __FIRE_OCL_AFTER_WEAPON_COOLDOWN_UPDATE_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h
index ec658a1c227..7d73089bc4a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FIRE_SPREAD_UPDATE_H_
-#define __FIRE_SPREAD_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -72,10 +69,7 @@ class FireSpreadUpdate : public UpdateModule
 	void startFireSpreading();
 
 protected:
-	
+
 	UnsignedInt calcNextSpreadDelay();
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h
index cc7600c0f44..5d1f6fb04a7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FireWeaponCollide_H_
-#define __FireWeaponCollide_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CollideModule.h"
 #include "GameLogic/Weapon.h"
@@ -80,7 +77,3 @@ class FireWeaponCollide : public CollideModule
 	Bool m_everFired;
 
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h
index 194b82719f8..7e47a548406 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h
@@ -24,12 +24,12 @@
 
 // FILE: FireWeaponPower.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	August 2003
@@ -44,9 +44,6 @@
 
 #pragma once
 
-#ifndef __FIRE_WEAPON_POWER_H
-#define __FIRE_WEAPON_POWER_H
-
 #include "GameLogic/Module/SpecialPowerModule.h"
 
 class Object;
@@ -85,5 +82,3 @@ class FireWeaponPower : public SpecialPowerModule
 protected:
 
 };
-
-#endif // __FIRE_WEAPON_POWER_H
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h
index 5892c42861a..3532abe8552 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FIRE_WEAPON_UPDATE_H_
-#define __FIRE_WEAPON_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameLogic/Weapon.h"
@@ -43,7 +40,7 @@ class FireWeaponUpdateModuleData : public UpdateModuleData
 	const WeaponTemplate* m_weaponTemplate;
   UnsignedInt m_initialDelayFrames;
 	UnsignedInt m_exclusiveWeaponDelay;	///< If non-zero, any other weapon having fired this recently will keep us from doing anything
-	
+
 	FireWeaponUpdateModuleData();
 
 	static void buildFieldParse(MultiIniFieldParse& p);
@@ -70,11 +67,8 @@ class FireWeaponUpdate : public UpdateModule
 protected:
 
 	Bool isOkayToFire();
-	
+
 	Weapon* m_weapon;
   UnsignedInt m_initialDelayFrame;
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h
index ef869f001fd..e675e82a2cb 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FireWeaponWhenDamagedBehavior_H_
-#define __FireWeaponWhenDamagedBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/UpgradeModule.h"
@@ -45,13 +42,13 @@ class FireWeaponWhenDamagedBehaviorModuleData : public UpdateModuleData
 public:
 	UpgradeMuxData				m_upgradeMuxData;
 	Bool									m_initiallyActive;
-	DamageTypeFlags				m_damageTypes;					
-	Real									m_damageAmount;	
-	const WeaponTemplate* m_reactionWeaponPristine;///< fire these weapons only when damage is received				
-	const WeaponTemplate* m_reactionWeaponDamaged;				
-	const WeaponTemplate* m_reactionWeaponReallyDamaged;	
-	const WeaponTemplate* m_reactionWeaponRubble;					
-	const WeaponTemplate*	m_continuousWeaponPristine;///< fire these weapons continuously, versus just onDamage 
+	DamageTypeFlags				m_damageTypes;
+	Real									m_damageAmount;
+	const WeaponTemplate* m_reactionWeaponPristine;///< fire these weapons only when damage is received
+	const WeaponTemplate* m_reactionWeaponDamaged;
+	const WeaponTemplate* m_reactionWeaponReallyDamaged;
+	const WeaponTemplate* m_reactionWeaponRubble;
+	const WeaponTemplate*	m_continuousWeaponPristine;///< fire these weapons continuously, versus just onDamage
 	const WeaponTemplate*	m_continuousWeaponDamaged;
 	const WeaponTemplate*	m_continuousWeaponReallyDamaged;
 	const WeaponTemplate*	m_continuousWeaponRubble;
@@ -63,18 +60,18 @@ class FireWeaponWhenDamagedBehaviorModuleData : public UpdateModuleData
 		m_reactionWeaponDamaged = NULL;
 		m_reactionWeaponReallyDamaged = NULL;
 		m_reactionWeaponRubble = NULL;
-		m_continuousWeaponPristine = NULL; 
-		m_continuousWeaponDamaged = NULL;	
-		m_continuousWeaponReallyDamaged = NULL;	
-		m_continuousWeaponRubble = NULL;	
+		m_continuousWeaponPristine = NULL;
+		m_continuousWeaponDamaged = NULL;
+		m_continuousWeaponReallyDamaged = NULL;
+		m_continuousWeaponRubble = NULL;
 		m_damageTypes = DAMAGE_TYPE_FLAGS_ALL;
 		m_damageAmount = 0;
 	}
 
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "StartsActive",	INI::parseBool, NULL, offsetof( FireWeaponWhenDamagedBehaviorModuleData, m_initiallyActive ) },
 			{ "ReactionWeaponPristine", INI::parseWeaponTemplate, NULL, offsetof(FireWeaponWhenDamagedBehaviorModuleData,				m_reactionWeaponPristine) },
@@ -102,8 +99,8 @@ class FireWeaponWhenDamagedBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class FireWeaponWhenDamagedBehavior : public UpdateModule, 
-																			public UpgradeMux, 
+class FireWeaponWhenDamagedBehavior : public UpdateModule,
+																			public UpgradeMux,
 																			public DamageModuleInterface
 {
 
@@ -132,8 +129,8 @@ class FireWeaponWhenDamagedBehavior : public UpdateModule,
 
 protected:
 
-	virtual void upgradeImplementation() 
-	{ 
+	virtual void upgradeImplementation()
+	{
 		setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
 	}
 
@@ -158,8 +155,8 @@ class FireWeaponWhenDamagedBehavior : public UpdateModule,
 		return getFireWeaponWhenDamagedBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers;
 	}
 
-	inline Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
-	
+	Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
+
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 private:
@@ -173,6 +170,3 @@ class FireWeaponWhenDamagedBehavior : public UpdateModule,
 	Weapon *m_continuousWeaponRubble;
 
 };
-
-#endif // __FireWeaponWhenDamagedBehavior_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h
index 688b6dc7a56..5c666599d54 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FireWeaponWhenDeadBehavior_H_
-#define __FireWeaponWhenDeadBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 
 #include "GameLogic/Module/BehaviorModule.h"
@@ -54,9 +51,9 @@ class FireWeaponWhenDeadBehaviorModuleData : public BehaviorModuleData
 		m_deathWeapon = NULL;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "StartsActive",	INI::parseBool, NULL, offsetof( FireWeaponWhenDeadBehaviorModuleData, m_initiallyActive ) },
 			{ "DeathWeapon", INI::parseWeaponTemplate,	NULL, offsetof( FireWeaponWhenDeadBehaviorModuleData, m_deathWeapon ) },
@@ -72,7 +69,7 @@ class FireWeaponWhenDeadBehaviorModuleData : public BehaviorModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class FireWeaponWhenDeadBehavior : public BehaviorModule, 
+class FireWeaponWhenDeadBehavior : public BehaviorModule,
 																	 public UpgradeMux,
 																	 public DieModuleInterface
 {
@@ -123,11 +120,8 @@ class FireWeaponWhenDeadBehavior : public BehaviorModule,
 		return getFireWeaponWhenDeadBehaviorModuleData()->m_upgradeMuxData.m_requiresAllTriggers;
 	}
 
-	inline Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
-	
+	Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
+
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-#endif // __FireWeaponWhenDeadBehavior_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h
index e3d3e5f0950..6c0761be707 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FIRESTORM_DYNAMIC_GEOMETRY_INFO_UPDATE_H_
-#define __FIRESTORM_DYNAMIC_GEOMETRY_INFO_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Geometry.h"
 #include "GameLogic/Module/DynamicGeometryInfoUpdate.h"
@@ -84,7 +81,3 @@ class FirestormDynamicGeometryInfoUpdate : public DynamicGeometryInfoUpdate
 	Bool m_scorchPlaced;							///< TRUE once we have placed the scorch mark
 	UnsignedInt m_lastDamageFrame;		///< frame we last did damage on
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
index 0074e6266ab..67ab98c966a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FLAMMABLE_UPDATE_H_
-#define __FLAMMABLE_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "GameLogic/Module/DamageModule.h"
@@ -45,8 +42,6 @@ enum FlammabilityStatusType CPP_11(: Int)
 	FS_NORMAL = 0,
 	FS_AFLAME,
 	FS_BURNED,
-
-	FS_NORMAL_COUNT	// keep last
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -54,7 +49,7 @@ class FlammableUpdateModuleData : public UpdateModuleData
 {
 public:
 	UnsignedInt		m_burnedDelay;	///< How long before I am ::Burned.  0 means never
-	UnsignedInt		m_aflameDuration; ///< How long I stay ::Aflame.  Independent of Burned.  
+	UnsignedInt		m_aflameDuration; ///< How long I stay ::Aflame.  Independent of Burned.
 	// When aflame wears out is when I check to be normal or burned,  So my model can
 	// change to burned while I am still aflame.
 	UnsignedInt		m_aflameDamageDelay;	///< While ::Aflame, I take damage this often.  If 0, never.
@@ -96,12 +91,12 @@ class FlammableUpdate : public UpdateModule, public DamageModuleInterface
 	//DamageModuleInterface
 	virtual void onDamage( DamageInfo *damageInfo );
 	virtual void onHealing( DamageInfo *damageInfo ) { }
-	virtual void onBodyDamageStateChange( const DamageInfo *damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo *damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState ) { }
 
 protected:
-	
+
 	UpdateSleepTime calcSleepTime();
 	void doAflameDamage();
 	void startBurningSound();
@@ -113,8 +108,6 @@ class FlammableUpdate : public UpdateModule, public DamageModuleInterface
 	UnsignedInt							m_damageEndFrame;
 	AudioHandle							m_audioHandle;
 	Real										m_flameDamageLimit;
+	ObjectID								m_flameSource;
 	UnsignedInt							m_lastFlameDamageDealt;
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h
index b41c2bb43db..650166809a1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FLIGHT_DECK_BEHAVIOR_H
-#define __FLIGHT_DECK_BEHAVIOR_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -94,7 +91,7 @@ class FlightDeckBehavior : public AIUpdateInterface,
 													 public ParkingPlaceBehaviorInterface,
 													 public DieModuleInterface,
 													 public ExitInterface
-													 
+
 {
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( FlightDeckBehavior, "FlightDeckBehavior" )
@@ -120,7 +117,7 @@ class FlightDeckBehavior : public AIUpdateInterface,
 	virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; }
 	virtual Bool getExitPosition( Coord3D& rallyPoint ) const { return FALSE; }
 	virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) { return FALSE; }
-	virtual void setRallyPoint( const Coord3D *pos ) {}			
+	virtual void setRallyPoint( const Coord3D *pos ) {}
 	virtual const Coord3D *getRallyPoint( void ) const { return NULL;}
 
 	// UpdateModule
@@ -130,15 +127,16 @@ class FlightDeckBehavior : public AIUpdateInterface,
 	virtual void onDie( const DamageInfo *damageInfo );
 
 	// ParkingPlaceBehaviorInterface
-	virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const; 
-	virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const; 
-	virtual Bool hasReservedSpace(ObjectID id) const; 
+	virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const;
+	virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const;
+	virtual Bool hasReservedSpace(ObjectID id) const;
 	virtual Int  getSpaceIndex( ObjectID id ) const;
 	virtual Bool reserveSpace(ObjectID id, Real parkingOffset, PPInfo* info);
-	virtual void releaseSpace(ObjectID id); 
+	virtual void releaseSpace(ObjectID id);
 	virtual Bool reserveRunway(ObjectID id, Bool forLanding);
-	virtual void releaseRunway(ObjectID id); 
+	virtual void releaseRunway(ObjectID id);
 	virtual void calcPPInfo( ObjectID id, PPInfo *info );
+	virtual Int getRunwayIndex(ObjectID id);
 	virtual Int getRunwayCount() const { return m_runways.size(); }
 	virtual ObjectID getRunwayReservation( Int r, RunwayReservationType type );
 	virtual void transferRunwayReservationToNextInLineForTakeoff(ObjectID id);
@@ -178,7 +176,7 @@ class FlightDeckBehavior : public AIUpdateInterface,
 			m_orientation = 0;
 			m_runway = 0;
 			m_objectInSpace = INVALID_ID;
-		} 
+		}
 	};
 
 	struct RunwayInfo
@@ -209,7 +207,7 @@ class FlightDeckBehavior : public AIUpdateInterface,
 
   const ThingTemplate *m_thingTemplate;
 
-  
+
 	std::vector<FlightDeckInfo>		m_spaces;
 	std::vector<RunwayInfo>				m_runways;
 	std::list<HealingInfo>				m_healing;	// note, this list can vary in size, and be larger than the parking space count
@@ -228,6 +226,3 @@ class FlightDeckBehavior : public AIUpdateInterface,
 	Bool													m_rampUp[ MAX_RUNWAYS ];
 
 };
-
-#endif // __FLIGHT_DECK_BEHAVIOR_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h
index cd4abae2db8..7da2cbce24e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __FLOATUPDATE_H_
-#define __FLOATUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -70,9 +67,7 @@ class FloatUpdate : public UpdateModule
 
 protected:
 
-	
+
 	Bool m_enabled;			///< enabled
 
 };
-
-#endif  // end __FLOATUPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h
index 71370e5dfc7..b8c78b631af 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GARRISONCONTAIN_H_
-#define __GARRISONCONTAIN_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 #include "Common/ModelState.h"
@@ -62,18 +59,18 @@ class GarrisonContainModuleData : public OpenContainModuleData
 
 	GarrisonContainModuleData( void );
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     OpenContainModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MobileGarrison", INI::parseBool, NULL, offsetof( GarrisonContainModuleData, m_mobileGarrison ) },
 			{ "HealObjects", INI::parseBool, NULL, offsetof( GarrisonContainModuleData, m_doIHealObjects ) },
 			{ "TimeForFullHeal", INI::parseDurationReal, NULL, offsetof( GarrisonContainModuleData, m_framesForFullHeal ) },
 			{ "InitialRoster", parseInitialRoster, NULL, 0 },
 			{ "ImmuneToClearBuildingAttacks", INI::parseBool, NULL, offsetof( GarrisonContainModuleData, m_immuneToClearBuildingAttacks ) },
-      { "IsEnclosingContainer", INI::parseBool, NULL, offsetof( GarrisonContainModuleData, m_isEnclosingContainer ) },      
+      { "IsEnclosingContainer", INI::parseBool, NULL, offsetof( GarrisonContainModuleData, m_isEnclosingContainer ) },
 
 			{ 0, 0, 0, 0 }
 		};
@@ -86,7 +83,7 @@ class GarrisonContainModuleData : public OpenContainModuleData
 		const char* name = ini->getNextToken();
 		const char* countStr = ini->getNextTokenOrNull();
 		Int count = countStr ? INI::scanInt(countStr) : 1;
-		
+
 		self->m_initialRoster.templateName.set(name);
 		self->m_initialRoster.count = count;
 	};
@@ -128,10 +125,10 @@ class GarrisonContain : public OpenContain
 	virtual void onRemoving( Object *obj );					///< object no longer contains 'obj'
   virtual void onSelling( void );
 
-  
+
 	// A Garrison Contain must eject all passengers when it crosses the ReallyDamaged threshold.
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState);  ///< Die Interface state change callback
 
 	/**
@@ -156,7 +153,7 @@ class GarrisonContain : public OpenContain
 	virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos );
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim );
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos );
-		
+
 	void updateEffects( void );										///< do any effects needed per frame
 	void loadGarrisonPoints( void );							///< load garrison point position data and save for later
 	void putObjectAtBestGarrisonPoint( Object *obj, Object *target, const Coord3D *targetPos );	///< place object at position of the best garrison point to use for its target
@@ -167,7 +164,7 @@ class GarrisonContain : public OpenContain
 	void removeInvalidObjectsFromGarrisonPoints( void );	///< remove objects with invalid targets from valid points
 	void trackTargets( void );										///< keep attackers at the closest garrison point to their active target
 
-  void matchObjectsToGarrisonPoints( void );                ///< Every frame, and whenever anyone enters or leaves 
+  void matchObjectsToGarrisonPoints( void );                ///< Every frame, and whenever anyone enters or leaves
   void positionObjectsAtStationGarrisonPoints( void );  ///< enforce that everybody stays at their pre-assigned space
   void loadStationGarrisonPoints( void );
   Bool pickAStationForMe( const Object *pbj );
@@ -176,7 +173,7 @@ class GarrisonContain : public OpenContain
 	enum { GARRISON_INDEX_INVALID = -1 };
 	Int findConditionIndex( void );										///< find the condition index to use given the current object body state
 	Int getObjectGarrisonPointIndex( Object *obj );		///< get the garrison point index object is at (if present)
-	Int findClosestFreeGarrisonPointIndex( Int conditionIndex, 
+	Int findClosestFreeGarrisonPointIndex( Int conditionIndex,
 																				 const Coord3D *targetPos );  ///< find closest free garrison point to the target location
 
 	void healObjects( void );	///< heal all the objects within me
@@ -195,7 +192,7 @@ class GarrisonContain : public OpenContain
 	//
 	// ----------------------------------------------------------------------------------------------
 	struct GarrisonPointData
-	{	
+	{
 		union
 		{
 			Object *		object;							///< object at this garrison point
@@ -219,13 +216,13 @@ class GarrisonContain : public OpenContain
   };
 
 	// ----------------------------------------------------------------------------------------------
-	enum 
+	enum
 	{
 		GARRISON_POINT_PRISTINE,
 		GARRISON_POINT_DAMAGED,
 		GARRISON_POINT_REALLY_DAMAGED,
 
-		MAX_GARRISON_POINT_CONDITIONS				///< leave this last
+		MAX_GARRISON_POINT_CONDITIONS
 	};
 
 	Team *							m_originalTeam;																///< our original team before we were garrisoned
@@ -234,16 +231,13 @@ class GarrisonContain : public OpenContain
 	Coord3D							m_garrisonPoint[ MAX_GARRISON_POINT_CONDITIONS ][ MAX_GARRISON_POINTS ];		///< the garrison point positions (in world coords) for pristine, damaged, and really damaged
 	Coord3D							m_exitRallyPoint;												///< Point to rally at when exiting structure (if possible)
 
-  std::vector<StationPointData> m_stationPointList; 
+  std::vector<StationPointData> m_stationPointList;
 
 	Bool		m_stationGarrisonPointsInitialized;	///< DO NOT XFER THIS!!!   TRUE once we have loaded the pre-assigned garrison point positions from the art
 	Bool		m_garrisonPointsInitialized;							///< TRUE once we have loaded the garrison point positions from the art
-	Bool		m_hideGarrisonedStateFromNonallies;								///< if T, don't appear to be garrisoned (all stealthy)										
+	Bool		m_hideGarrisonedStateFromNonallies;								///< if T, don't appear to be garrisoned (all stealthy)
 	Bool		m_rallyValid;															///< TRUE when m_exitRallyPoint is valid
 
   EvacDisposition m_evacDisposition;
 
 };
-
-#endif // __GARRISONCONTAIN_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h
index d6ceda2ef01..99a659b2e74 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GenerateMinefieldBehavior_H_
-#define __GenerateMinefieldBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -68,7 +65,7 @@ class GenerateMinefieldBehaviorModuleData : public BehaviorModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class GenerateMinefieldBehavior : public UpdateModule, 
+class GenerateMinefieldBehavior : public UpdateModule,
 																	public DieModuleInterface,
 																	public UpgradeMux
 {
@@ -134,6 +131,3 @@ class GenerateMinefieldBehavior : public UpdateModule,
 	void placeMinesAroundRect(const Coord3D& pos, Real majorRadius, Real minorRadius, const ThingTemplate* mineTemplate);
 	Object* placeMineAt(const Coord3D& pt, const ThingTemplate* mineTemplate, Team* team, const Object* producer);
 };
-
-#endif // __GenerateMinefieldBehavior_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h
index 27abfa8a704..166afd3fb95 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h
@@ -24,12 +24,12 @@
 
 // FILE: GrantScienceUpgrade.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
+//
 //                       Electronic Arts Los Angeles
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2003 - All Rights Reserved                  
-//                                                                          
+//
+//                       Confidential Information
+//                Copyright (C) 2003 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	  August 2, 2003
@@ -37,7 +37,7 @@
 //	Filename: 	GrantScienceUpgrade.cpp
 //
 //	Author:		  Kris Morness
-//	
+//
 //	Purpose:	  Grants specified science once requirements met (typically an upgrade).
 //
 //-----------------------------------------------------------------------------
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GRANT_SCIENCE_UPGRADE_H
-#define __GRANT_SCIENCE_UPGRADE_H
-
 #include "GameLogic/Module/UpgradeModule.h"
 
 //-----------------------------------------------------------------------------
@@ -78,10 +75,7 @@ class GrantScienceUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 private:
-	
+
 	ScienceType m_scienceType;
 
 };
-#endif // _COMMAND_SET_UPGRADE_H
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h
index 9bcec084425..ed0491c3c72 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GrantStealthBehavior_H_
-#define __GrantStealthBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/ParticleSys.h"
 #include "GameLogic/Module/BehaviorModule.h"
@@ -50,9 +47,9 @@ class GrantStealthBehaviorModuleData : public UpdateModuleData
 	Bool									m_initiallyActive;
 	Bool									m_singleBurst;
 	Int										m_healingAmount;
-	Real									m_startRadius; 
-	Real									m_finalRadius; 
-	Real									m_radiusGrowRate; 
+	Real									m_startRadius;
+	Real									m_finalRadius;
+	Real									m_radiusGrowRate;
 	KindOfMaskType				m_kindOf;	//Only these types can heal -- defaults to everything.
 	const ParticleSystemTemplate*				m_radiusParticleSystemTmpl;					//Optional particle system meant to apply to entire effect for entire duration.
 
@@ -65,16 +62,16 @@ class GrantStealthBehaviorModuleData : public UpdateModuleData
 		SET_ALL_KINDOFMASK_BITS( m_kindOf );
 	}
 
-	static void buildFieldParse( MultiIniFieldParse& p ) 
+	static void buildFieldParse( MultiIniFieldParse& p )
 	{
 		UpdateModuleData::buildFieldParse( p );
-    
-		static const FieldParse dataFieldParse[] = 
+
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "StartRadius",						         INI::parseReal,									 NULL, offsetof( GrantStealthBehaviorModuleData, m_startRadius ) },
 			{ "FinalRadius",						         INI::parseReal,									 NULL, offsetof( GrantStealthBehaviorModuleData, m_finalRadius ) },
 			{ "RadiusGrowRate",						       INI::parseReal,									 NULL, offsetof( GrantStealthBehaviorModuleData, m_radiusGrowRate ) },
-			{ "KindOf",						    KindOfMaskType::parseFromINI,					       NULL, offsetof( GrantStealthBehaviorModuleData, m_kindOf ) },		
+			{ "KindOf",						    KindOfMaskType::parseFromINI,					       NULL, offsetof( GrantStealthBehaviorModuleData, m_kindOf ) },
 			{ "RadiusParticleSystemName",				 INI::parseParticleSystemTemplate, NULL, offsetof( GrantStealthBehaviorModuleData, m_radiusParticleSystemTmpl ) },
 			{ 0, 0, 0, 0 }
 		};
@@ -87,7 +84,7 @@ class GrantStealthBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class GrantStealthBehavior : public UpdateModule 
+class GrantStealthBehavior : public UpdateModule
 {
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( GrantStealthBehavior, "GrantStealthBehavior" )
@@ -107,6 +104,3 @@ class GrantStealthBehavior : public UpdateModule
 	ParticleSystemID m_radiusParticleSystemID;
   Real m_currentScanRadius;
 };
-
-#endif // __GrantStealthBehavior_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h
index 799627edde3..bc23fcb8e12 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __GRANTUPGRADECREATE_H_
-#define __GRANTUPGRADECREATE_H_
-
 #define DEFINE_OBJECT_STATUS_NAMES
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
@@ -77,6 +74,3 @@ class GrantUpgradeCreate : public CreateModule
 protected:
 
 };
-
-#endif // __GRANTUPGRADECREATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h
index a9c100b5cb8..48c3f44b91c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __HACK_INTERNET_AI_UPDATE_H
-#define __HACK_INTERNET_AI_UPDATE_H
-
 #include "Common/StateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -45,14 +42,11 @@ class HackInternetStateMachine : public AIStateMachine
 //-------------------------------------------------------------------------------------------------
 class HackInternetState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HackInternetState, "HackInternetState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HackInternetState, "HackInternetState")
 public:
 	HackInternetState( StateMachine *machine ) :State( machine, "HackInternetState" )
 	{
-		//Added By Sadullah Nader
-		//Initializations missing and needed
 		m_framesRemaining = 0;
-		//
 	}
 	virtual StateReturnType update();
 	virtual StateReturnType onEnter();
@@ -72,14 +66,11 @@ EMPTY_DTOR(HackInternetState)
 //-------------------------------------------------------------------------------------------------
 class PackingState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PackingState, "PackingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PackingState, "PackingState")
 public:
 	PackingState( StateMachine *machine ) : State( machine, "PackingState" )
 	{
-		//Added By Sadullah Nader
-		//Initializations inserted
 		m_framesRemaining = 0;
-		//
 	}
 	virtual StateReturnType update();
 	virtual StateReturnType onEnter();
@@ -98,7 +89,7 @@ EMPTY_DTOR(PackingState)
 //-------------------------------------------------------------------------------------------------
 class UnpackingState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(UnpackingState, "UnpackingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(UnpackingState, "UnpackingState")
 public:
 	UnpackingState( StateMachine *machine ) :State( machine, "UnpackingState" )
 	{
@@ -132,7 +123,7 @@ class HackInternetAIUpdateModuleData : public AIUpdateModuleData
 {
 public:
 	UnsignedInt		m_unpackTime;
-	UnsignedInt		m_packTime;				
+	UnsignedInt		m_packTime;
 	UnsignedInt		m_cashUpdateDelay;
 	UnsignedInt		m_cashUpdateDelayFast;
 	UnsignedInt		m_regularCashAmount;
@@ -156,11 +147,11 @@ class HackInternetAIUpdateModuleData : public AIUpdateModuleData
 		m_packUnpackVariationFactor = 0.0f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     AIUpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UnpackTime",					INI::parseDurationUnsignedInt,	NULL, offsetof( HackInternetAIUpdateModuleData, m_unpackTime ) },
 			{ "PackTime",						INI::parseDurationUnsignedInt,	NULL, offsetof( HackInternetAIUpdateModuleData, m_packTime ) },
@@ -224,10 +215,7 @@ class HackInternetAIUpdate : public AIUpdateInterface, public HackInternetAIInte
 protected:
 
 	virtual AIStateMachine* makeStateMachine();
-	
+
 	AICommandParmsStorage		m_pendingCommand;
-	Bool m_hasPendingCommand;	
+	Bool m_hasPendingCommand;
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h
index ee45d85ac14..996c06653a8 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __HEALCONTAIN_H_
-#define __HEALCONTAIN_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 
@@ -58,7 +55,7 @@ class HealContain : public OpenContain
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( HealContain, "HealContain" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( HealContain, HealContainModuleData )
-	
+
 public:
 
 	HealContain( Thing *thing, const ModuleData* moduleData );
@@ -73,5 +70,3 @@ class HealContain : public OpenContain
 	Bool doHeal( Object *obj, UnsignedInt framesForFullHeal );		///< do the heal on an object
 
 };
-
-#endif  // end __HEALCONTAIN_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h
index 2c79a438d9a..e2f8bdcd914 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef HEAL_CRATE_COLLIDE_H_
-#define HEAL_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -56,5 +53,3 @@ class HealCrateCollide : public CrateCollide
 	/// This is the game logic execution function that all real CrateCollides will implement
 	virtual Bool executeCrateBehavior( Object *other );
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h
index 7398929790a..67ce4f20d16 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __HEIGHTDIEUPDATE_H_
-#define __HEIGHTDIEUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -71,7 +68,7 @@ class HeightDieUpdate : public UpdateModule
 	virtual UpdateSleepTime update();
 
 protected:
-	
+
 
 	Bool m_hasDied;							///< TRUE once we have triggered death
 	Bool m_particlesDestroyed;	///< TRUE once we destroy attached systems (so we do it only once)
@@ -79,5 +76,3 @@ class HeightDieUpdate : public UpdateModule
 	UnsignedInt m_earliestDeathFrame; ///< Earliest we are allowed to think about dying
 
 };
-
-#endif  // end __HEIGHTDIEUPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h
index f28fd59eb34..1e3ae0e31a1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __HelicopterSlowDeathBehavior_H_
-#define __HelicopterSlowDeathBehavior_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "GameLogic/Module/SlowDeathBehavior.h"
@@ -113,5 +110,3 @@ class HelicopterSlowDeathBehavior : public SlowDeathBehavior
 	AudioEventRTS m_deathSound;						///< Sound played during death sequence.
 
 };
-
-#endif  // end __HelicopterSlowDeathBehavior_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h
index dca430fd499..fc28147c1f0 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h
@@ -27,15 +27,12 @@
 //  FILE: HelixContain.h ////////////////////////////////////////////////////////////////////////
 //  Author: Mark Lorenzen, April, 2003
 //
-//  Desc:   Contain module that acts as transport normally, but 
+//  Desc:   Contain module that acts as transport normally, but
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __HELIX_CONTAIN_H_
-#define __HELIX_CONTAIN_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/TransportContain.h"
 
@@ -64,14 +61,14 @@ class HelixContain : public TransportContain
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( HelixContain, "HelixContain" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( HelixContain, HelixContainModuleData )
 
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState);  ///< state change callback
 public:
 
 	HelixContain( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
-	
+
 	virtual OpenContain *asOpenContain() { return this; }  ///< treat as open container
 	virtual Bool isHealContain() const { return false; } ///< true when container only contains units while healing (not a transport!)
 	virtual Bool isTunnelContain() const { return FALSE; }
@@ -80,7 +77,7 @@ class HelixContain : public TransportContain
 
 	virtual void onDie( const DamageInfo *damageInfo );  ///< the die callback
 	virtual void onDelete( void );	///< Last possible moment cleanup
-	virtual void onCapture( Player *oldOwner, Player *newOwner ); 
+	virtual void onCapture( Player *oldOwner, Player *newOwner );
 	virtual void onObjectCreated();
   virtual void onContaining( Object *obj, Bool wasSelected  );
   virtual void onRemoving( Object *obj );
@@ -88,7 +85,7 @@ class HelixContain : public TransportContain
 
   virtual UpdateSleepTime update();							///< called once per frame
 
-  
+
  // virtual void onContaining( Object *obj, Bool wasSelected );		///< object now contains 'obj'
 //	virtual void onRemoving( Object *obj );			///< object no longer contains 'obj'
 
@@ -102,10 +99,10 @@ class HelixContain : public TransportContain
 
 	// Friend for our Draw module only.
 	virtual const Object *friend_getRider() const; ///< Damn.  The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
-	
+
 	///< if my object gets selected, then my visible passengers should, too
 	///< this gets called from
-	virtual void clientVisibleContainedFlashAsSelected(); 
+	virtual void clientVisibleContainedFlashAsSelected();
 
   virtual void redeployOccupants();
 
@@ -120,7 +117,7 @@ class HelixContain : public TransportContain
 
     return ContainModuleInterface::getContainerPipsToShow( numTotal, numFull );
   }
-  
+
 	virtual void createPayload();
 
 private:
@@ -129,6 +126,3 @@ class HelixContain : public TransportContain
   ObjectID  m_portableStructureID;
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h
index 6bce4ec7fa2..1ab52a67c19 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __HIGHLANDER_BODY_H
-#define __HIGHLANDER_BODY_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ActiveBody.h"
 
@@ -57,6 +54,3 @@ class HighlanderBody : public ActiveBody
 protected:
 
 };
-
-#endif 
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h
index 7bd10a3d7c6..bbabac53f1d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h
@@ -27,15 +27,12 @@
 //
 // FILE: HijackerUpdate.h /////////////////////////////////////////////////////////////////////////
 // Author: Mark Lorenzen, July 2002
-// Desc:   Allows hijacker to keep with his hijacked vehicle (though hidden) until it dies, then 
+// Desc:   Allows hijacker to keep with his hijacked vehicle (though hidden) until it dies, then
 // to become a hijacker once more
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
- 
-#ifndef __HIJACKER_UPDATE_H
-#define __HIJACKER_UPDATE_H
 
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -48,10 +45,10 @@ class HijackerUpdateModuleData : public UpdateModuleData
 
 	//StickBombUpdateModuleData();
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "AttachToTargetBone",	INI::parseAsciiString,		NULL, offsetof( HijackerUpdateModuleData, m_attachToBone ) },
 			{ "ParachuteName",	INI::parseAsciiString,		NULL, offsetof( HijackerUpdateModuleData, m_parachuteName ) },
@@ -77,8 +74,8 @@ class HijackerUpdate : public UpdateModule
 
 	void setTargetObject( const Object *object );
 	Object* getTargetObject() const;
-	void setUpdate(Bool u ) {m_update = u;} 
-	void setIsInVehicle(Bool i ) {m_isInVehicle = i;} 
+	void setUpdate(Bool u ) {m_update = u;}
+	void setIsInVehicle(Bool i ) {m_isInVehicle = i;}
 
 private:
 
@@ -88,10 +85,7 @@ class HijackerUpdate : public UpdateModule
 	Bool		 m_isInVehicle;
 	Bool		 m_wasTargetAirborne;
 
-//	DieModuleInterface *m_ejectPilotDMI; // point to ejectpilotdiemodule 
+//	DieModuleInterface *m_ejectPilotDMI; // point to ejectpilotdiemodule
 																			 // of target vehicle if it has one
 
 };
-
-#endif // __HIJACKER_UPDATE_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h
index c1ae253ec76..7ff7780860b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h
@@ -31,9 +31,6 @@
 
 #pragma once
 
-#ifndef __HIVE_STRUCTURE_BODY_H
-#define __HIVE_STRUCTURE_BODY_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/StructureBody.h"
 #include "GameLogic/Damage.h"
@@ -49,10 +46,10 @@ class HiveStructureBodyModuleData : public StructureBodyModuleData
 
 	HiveStructureBodyModuleData();
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     StructureBodyModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "PropagateDamageTypesToSlavesWhenExisting",   INI::parseDamageTypeFlags, NULL, offsetof( HiveStructureBodyModuleData, m_damageTypesToPropagateToSlaves ) },
 			{ "SwallowDamageTypesIfSlavesNotExisting",			INI::parseDamageTypeFlags, NULL, offsetof( HiveStructureBodyModuleData, m_damageTypesToSwallow ) },
@@ -81,6 +78,3 @@ class HiveStructureBody : public StructureBody
 
 	virtual void attemptDamage( DamageInfo *damageInfo );		///< try to damage this object
 };
-
-#endif // __HIVE_STRUCTURE_BODY_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h
index 369cf323890..9ec900ce0ac 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __HordeUpdate_H_
-#define __HordeUpdate_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "Common/KindOf.h"
@@ -44,19 +41,41 @@ class UpgradeTemplate;
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 
+// TheSuperHackers @bugfix xezon 15/09/2025 Adds a new horde action to select a fixed implementation.
+//
+// TheSuperHackers @todo If we want more control over the horde setup, then we need to implement
+// filters for separate weapon bonuses and required upgrades. But adding more behavior modules will
+// be a performance concern. Example INI setup:
+//
+// Behavior = HordeUpdate ModuleTag
+//   Action = NATIONALISM
+//   ;ApplyWeaponBonus = NATIONALISM
+//   UpgradeRequired = Upgrade_Nationalism
+// End
+//
 enum HordeActionType CPP_11(: Int)
 {
-	HORDEACTION_HORDE = 0,
+	HORDEACTION_HORDE, ///< Classic action, applies the Horde bonus correctly, but Nationalism and Fanaticism bonuses are not removed after leaving horde.
+	HORDEACTION_HORDE_FIXED, ///< Applies the Horde, Nationalism and Fanaticism bonuses correctly.
+
+	HORDEACTION_COUNT,
 
-	HORDEACTION_COUNT
+#if RETAIL_COMPATIBLE_CRC
+	HORDEACTION_DEFAULT = HORDEACTION_HORDE,
+#else
+	HORDEACTION_DEFAULT = HORDEACTION_HORDE_FIXED, ///< Does not change unmodified retail game behavior, because all its horde update modules explicitly set Action = HORDE.
+#endif
 };
 
 #ifdef DEFINE_HORDEACTION_NAMES
-static const char *TheHordeActionTypeNames[] =
+static const char *const TheHordeActionTypeNames[] =
 {
 	"HORDE",
+	"HORDE_FIXED",
+
 	NULL
 };
+static_assert(ARRAY_SIZE(TheHordeActionTypeNames) == HORDEACTION_COUNT + 1, "Incorrect array size");
 #endif
 
 //-------------------------------------------------------------------------------------------------
@@ -64,20 +83,20 @@ class HordeUpdateModuleData : public ModuleData
 {
 public:
   UnsignedInt								m_updateRate;   ///< how often to recheck our horde status
-	KindOfMaskType						m_kindof;				///< the kind(s) of units that count towards horde-ness
+	KindOfMaskType						m_kindof;				///< the kind(s) of units that count towards hordeness
 	Int												m_minCount;		  ///< min count to get "horde" status
-  Real											m_minDist;      ///< min dist to contribute to horde-ness
+  Real											m_minDist;      ///< min dist to contribute to hordeness
 	Bool											m_alliesOnly;		///< if true, only allied units count towards hordeness
 	Bool											m_exactMatch;		///< if true, only exact same type of units count towards hordeness
 	Real											m_rubOffRadius;///< If I am this close to another guy who is a true hordesman, it'll rub off on me
-	HordeActionType						m_action;				///< what to do if we get horde-ness
-	Bool											m_allowedNationalism; ///< Nationalism is hard ocded.  Yeah!  Add to the goodness with this flag instead of rewriting after Alpha.
-	std::vector<AsciiString>	m_flagSubObjNames;		///< name(s) of the flag subobj
+	HordeActionType						m_action;				///< what to do if we get hordeness
+	Bool											m_allowedNationalism; ///< Nationalism is hard coded.  Yeah!  Add to the goodness with this flag instead of rewriting after Alpha.
+	std::vector<AsciiString>	m_flagSubObjNames;		///< name(s) of the flag sub obj
 
 	HordeUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -87,9 +106,9 @@ class HordeUpdateInterface
 public:
 	virtual Bool isInHorde() const = 0;
 	virtual Bool hasFlag() const = 0;
-	virtual Bool isTrueHordeMember() const = 0; 
+	virtual Bool isTrueHordeMember() const = 0;
 	virtual Bool isAllowedNationalism() const = 0;
-
+	virtual HordeActionType getHordeActionType() const = 0;
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -106,11 +125,13 @@ class HordeUpdate : public UpdateModule, public HordeUpdateInterface
 	HordeUpdateInterface *getHordeUpdateInterface() { return this; }
 
 	virtual void onDrawableBoundToObject();
+	virtual UpdateSleepTime update();	///< update this object's AI
+
 	virtual Bool isInHorde() const { return m_inHorde; }
-	virtual Bool isTrueHordeMember() const { return m_trueHordeMember && m_inHorde; } 
-	virtual Bool isAllowedNationalism() const;
 	virtual Bool hasFlag() const { return m_hasFlag; }
-	virtual UpdateSleepTime update();	///< update this object's AI
+	virtual Bool isTrueHordeMember() const { return m_trueHordeMember && m_inHorde; }
+	virtual Bool isAllowedNationalism() const;
+	virtual HordeActionType getHordeActionType() const { return getHordeUpdateModuleData()->m_action; };
 
 protected:
 
@@ -119,11 +140,8 @@ class HordeUpdate : public UpdateModule, public HordeUpdateInterface
 
 private:
 	UnsignedInt m_lastHordeRefreshFrame; //Just like it sounds
-	Bool				m_inHorde;				 //I amy be a trueMember, or I may merely inherit hordehood from a neighbor who is
-	Bool				m_trueHordeMember; //meaning, I have enough hordesman near me to qualify
+	Bool				m_inHorde;				 //I may be a true member, or I may merely inherit hordehood from a neighbor who is
+	Bool				m_trueHordeMember; //meaning, I have enough hordesmen near me to qualify
 	Bool				m_hasFlag;
 
 };
-
-#endif // __HordeUpdate_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h
index a7a290a3813..b29376bb303 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __IMMORTAL_BODY_H
-#define __IMMORTAL_BODY_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ActiveBody.h"
 
@@ -57,6 +54,3 @@ class ImmortalBody : public ActiveBody
 protected:
 
 };
-
-#endif // __STRUCTUREBODY_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h
index 9f567262c1b..79ca7cd61c8 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __INACTIVEBODY_H_
-#define __INACTIVEBODY_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BodyModule.h"
 
@@ -56,7 +53,7 @@ class InactiveBody : public BodyModule
 	virtual Real getHealth() const;													///< get current health
 	virtual BodyDamageType getDamageState() const;
 	virtual void setDamageState( BodyDamageType newState );	///< control damage state directly.  Will adjust hitpoints.
-	virtual void setAflame( Bool setting ){}///< This is a major change like a damage state.  
+	virtual void setAflame( Bool setting ){}///< This is a major change like a damage state.
 
 	void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback ) { /* nothing */ }
 
@@ -69,6 +66,3 @@ class InactiveBody : public BodyModule
 private:
 	Bool m_dieCalled;
 };
-
-#endif // __INACTIVEBODY_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h
index 36ddc4e7548..8000ecd3ce8 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __InstantDeathBehavior_H_
-#define __InstantDeathBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 
@@ -76,6 +73,3 @@ class InstantDeathBehavior : public DieModule
 	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-#endif // __InstantDeathBehavior_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h
index 5e201cb6e60..8f300b23997 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __INTERNET_HACK_CONTAIN_H
-#define __INTERNET_HACK_CONTAIN_H
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/TransportContain.h"
 
@@ -39,7 +36,7 @@
 class InternetHackContainModuleData : public TransportContainModuleData
 {
 public:
-	
+
 
 	InternetHackContainModuleData();
 
@@ -64,10 +61,7 @@ class InternetHackContain : public TransportContain
 
 protected:
 
-	
+
 private:
 
 };
-
-#endif // __RIDER_CHANGE_CONTAIN_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h
index afb44917590..1840d30a4bf 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h
@@ -24,22 +24,14 @@
 
 // JetAIUpdate.h //////////
 // Author: Steven Johnson, June 2002
- 
-#pragma once
 
-#ifndef _JET_AI_UPDATE_H_
-#define _JET_AI_UPDATE_H_
+#pragma once
 
 #include "Common/STLTypedefs.h"
 #include "Common/GameMemory.h"
 #include "GameLogic/AIStateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -66,9 +58,9 @@ class JetAIUpdateModuleData : public AIUpdateModuleData
 	UnsignedInt							m_lockonTime;											///< time it takes for someone to lock-on to us.
 	AsciiString							m_lockonCursor;										///< template used for lockon.
 	Real										m_lockonInitialDist;							///< how far away the lockon cursor starts.
-	Real										m_lockonFreq;											
+	Real										m_lockonFreq;
 	Real										m_lockonAngleSpin;								///< how many times to spin around it
-	Real										m_lockonBlinky;								
+	Real										m_lockonBlinky;
 	UnsignedInt							m_returnToBaseIdleTime;						///< if we're idle for this long, return to base
 
 	JetAIUpdateModuleData();
@@ -146,7 +138,7 @@ class JetAIUpdate : public AIUpdateInterface
 
 	void pruneDeadTargeters();
 	void positionLockon();
-	
+
 	virtual Bool getTreatAsAircraftForLocoDistToGoal() const;
 	Bool isParkedAt(const Object* obj) const;
 
@@ -184,6 +176,3 @@ class JetAIUpdate : public AIUpdateInterface
 	Bool getFlag(FlagType f) const;
 	void setFlag(FlagType f, Bool v);
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h
index be354f8cd1d..f9d8f8b50fa 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __JET_SLOW_DEATH_BEHAVIOR_H_
-#define __JET_SLOW_DEATH_BEHAVIOR_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "GameLogic/Module/BehaviorModule.h"
@@ -63,7 +60,7 @@ class JetSlowDeathBehaviorModuleData : public SlowDeathBehaviorModuleData
 
 	const FXList *m_fxHitGround;									///< FXList for hit ground
 	const ObjectCreationList *m_oclHitGround;			///< OCL for hit ground
-	
+
 	UnsignedInt m_delayFinalBlowUpFromHitGround;	///< delay (in frames) from hit ground, to final explosion
 	const FXList *m_fxFinalBlowUp;								///< FxList for final blow up
 	const ObjectCreationList *m_oclFinalBlowUp;		///< OCL for final blow up
@@ -105,6 +102,3 @@ class JetSlowDeathBehavior : public SlowDeathBehavior
 	AudioEventRTS m_deathLoopSound;					///< death loop sound
 
 };
-
-
-#endif  // end __JET_SLOW_DEATH_BEHAVIOR_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h
index 8ecf6e13021..539ff20559e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h
@@ -32,9 +32,6 @@
 
 #pragma once
 
-#ifndef __KEEP_OBJECT_DIE_H_
-#define __KEEP_OBJECT_DIE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 #include "Common/INI.h"
@@ -53,9 +50,6 @@ class KeepObjectDie : public DieModule
 	KeepObjectDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-#endif // __KEEP_OBJECT_DIE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
index acd185f223a..f921a04f537 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __LASER_UPDATE_H
-#define __LASER_UPDATE_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ClientUpdateModule.h"
 
@@ -49,13 +46,13 @@ class LaserUpdateModuleData : public ClientUpdateModuleData
 	AsciiString m_particleSystemName;  ///< Used for the muzzle flare while laser active.
 
 	AsciiString m_targetParticleSystemName;  ///< Used for the target effect while laser active.
-	
+
 	Real m_punchThroughScalar;	///< If non-zero, length modifier when we used to have a target object and now don't
 
 	LaserUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -133,7 +130,3 @@ class LaserUpdate : public ClientUpdateModule
 
 	LaserRadiusUpdate m_laserRadius;
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h
index 302144f4e86..7802e2bf50e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __LIFETIMEUPDATE_H_
-#define __LIFETIMEUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -48,10 +45,10 @@ class LifetimeUpdateModuleData : public UpdateModuleData
 		m_maxFrames = 0.0f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MinLifetime",					INI::parseDurationUnsignedInt,		NULL, offsetof( LifetimeUpdateModuleData, m_minFrames ) },
 			{ "MaxLifetime",					INI::parseDurationUnsignedInt,		NULL, offsetof( LifetimeUpdateModuleData, m_maxFrames ) },
@@ -85,6 +82,3 @@ class LifetimeUpdate : public UpdateModule
 
 	UnsignedInt m_dieFrame;
 };
-
-#endif // __LIFETIMEUPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h
index b6c7c25db7b..8650a5a4222 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __LOCKWEAPONCREATE_H_
-#define __LOCKWEAPONCREATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CreateModule.h"
 
@@ -71,6 +68,3 @@ class LockWeaponCreate : public CreateModule
 protected:
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h
index 7c46d12623b..2df6b5e9344 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h
@@ -24,14 +24,11 @@
 
 // FILE: LocomotorSetUpgrade.h /////////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, Aug 2002
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __LocomotorSetUpgrade_H_
-#define __LocomotorSetUpgrade_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -57,7 +54,3 @@ class LocomotorSetUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-
-#endif // __LocomotorSetUpgrade_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h
index c3aebfc167f..d269b87720a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __MAX_HEALTH_UPGRADE_H_
-#define __MAX_HEALTH_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -74,7 +71,3 @@ class MaxHealthUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-
-#endif // __DEFAULTDIE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h
index 9c5405fb8f3..f145d238be8 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __MinefieldBEHAVIOR_H_
-#define __MinefieldBEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/CollideModule.h"
@@ -53,7 +50,7 @@ class MinefieldBehaviorModuleData : public UpdateModuleData
 
 	const WeaponTemplate*	m_detonationWeapon;								///< what happens when we detonate
 	Int										m_detonatedBy;										///< can we be triggered by allies, etc?
-	Bool									m_stopsRegenAfterCreatorDies;	
+	Bool									m_stopsRegenAfterCreatorDies;
 	Bool									m_regenerates;										///< if t, can't be killed normally
 	Bool									m_workersDetonate;								///< if f, workers don't detonate mines
 	UnsignedInt						m_creatorDeathCheckRate;					///< if above is true, how often to check
@@ -67,7 +64,7 @@ class MinefieldBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class MinefieldBehavior : public UpdateModule, 
+class MinefieldBehavior : public UpdateModule,
 													public CollideModuleInterface,
 													public DamageModuleInterface,
 													public DieModuleInterface,
@@ -145,5 +142,3 @@ class MinefieldBehavior : public UpdateModule,
 	UpdateSleepTime calcSleepTime();
 
 };
-
-#endif  // end __MinefieldBEHAVIOR_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h
index b9bbab54f18..f66f9173485 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _MISSILE_AI_UPDATE_H_
-#define _MISSILE_AI_UPDATE_H_
-
 #include "Common/GameType.h"
 #include "Common/GlobalData.h"
 #include "GameLogic/Module/AIUpdate.h"
@@ -49,7 +46,7 @@ class MissileAIUpdateModuleData : public AIUpdateModuleData
 	Bool						m_tryToFollowTarget;	///< if true, attack object, not pos
 	UnsignedInt			m_fuelLifetime;				///< num frames till missile runs out of motive power (0 == inf)
 	UnsignedInt			m_ignitionDelay;			///< delay in frames from when missile is 'fired', to when it starts moving		15
-	Real						m_initialVel;			
+	Real						m_initialVel;
 	Real						m_initialDist;
 	Real						m_diveDistance;				///< If I get this close to my target, start ignoring my preferred height
 	const FXList*		m_ignitionFX;					///< FXList to do when missile 'ignites'
@@ -131,7 +128,7 @@ class MissileAIUpdate : public AIUpdateInterface, public ProjectileUpdateInterfa
 	Bool									m_isArmed;								///< if true, missile will explode on contact
 	Bool									m_noDamage;								///< if true, missile will not cause damage when it detonates. (Used for flares).
 	Bool									m_isJammed;								///< No target, just shooting at a scattered position
-	
+
 	void doPrelaunchState();
 	void doLaunchState();
 	void doIgnitionState();
@@ -147,6 +144,3 @@ class MissileAIUpdate : public AIUpdateInterface, public ProjectileUpdateInterfa
 
 
 };
-
-#endif // _MISSILE_AI_UPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h
index 9a71b239833..30bf8b44b4c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _MissileLauncherBuildingUpdate_H_
-#define _MissileLauncherBuildingUpdate_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/INI.h"
@@ -67,11 +64,11 @@ class MissileLauncherBuildingUpdateModuleData : public UpdateModuleData
 		m_openingFX = m_openFX = m_waitingToCloseFX = m_closingFX = m_closedFX = NULL;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "SpecialPowerTemplate",	INI::parseSpecialPowerTemplate,					NULL, offsetof( MissileLauncherBuildingUpdateModuleData, m_specialPowerTemplate ) },
 			{ "DoorOpenTime",					INI::parseDurationUnsignedInt,	NULL, offsetof( MissileLauncherBuildingUpdateModuleData, m_doorOpenTime ) },
@@ -126,7 +123,7 @@ class MissileLauncherBuildingUpdate : public SpecialPowerUpdateModule
 		DOOR_WAITING_TO_CLOSE,
 		DOOR_CLOSING,
 	};
-	
+
 	void switchToState(DoorStateType dst);
 
 	const SpecialPowerModuleInterface*	m_specialPowerModule;
@@ -135,5 +132,3 @@ class MissileLauncherBuildingUpdate : public SpecialPowerUpdateModule
 	UnsignedInt													m_timeoutFrame;
 	AudioEventRTS												m_openIdleAudio;
 };
-
-#endif // _MissileLauncherBuildingUpdate_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h
index 5b66515b4ba..ce18cf4873f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h
@@ -25,11 +25,8 @@
 // MobMemberSlavedUpdate.h /////////////////////////////////////////////////////////////
 // Will obey to spawner... or die trying... used by angry mob members
 // Author: Mark Lorenzen, August 2002
- 
-#pragma once
 
-#ifndef _MOBMEMBER_SLAVED_UPDATE_H_
-#define _MOBMEMBER_SLAVED_UPDATE_H_
+#pragma once
 
 #define MM_SLAVED_UPDATE_RATE (LOGICFRAMES_PER_SECOND / 8) ///< This is a low priority module that only needs to be called every this many frames
 #define MIN_SQUIRRELLINESS (0.01f)
@@ -52,7 +49,7 @@ class MobMemberSlavedUpdateModuleData : public UpdateModuleData
 	//Example: Currently used by scout drones owned by rangers AND stinger soldiers owned by stinger sites.
 	Int m_mustCatchUpRadius;		//Distance from master I'm allowed when he's idle. If I go too far away, I'll come back.
 	Int m_noNeedToCatchUpRadius;	//Allowable wander distance from master while guarding master.
-	Real m_squirrellinessRatio; 
+	Real m_squirrellinessRatio;
 	UnsignedInt m_catchUpCrisisBailTime; //after this many consecutive frames outside the catchup radius, I will teleport to the nexus
 
 	MobMemberSlavedUpdateModuleData()
@@ -63,10 +60,10 @@ class MobMemberSlavedUpdateModuleData : public UpdateModuleData
 		m_catchUpCrisisBailTime = 999999;//default to very large number
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MustCatchUpRadius",			INI::parseInt,	NULL, offsetof( MobMemberSlavedUpdateModuleData, m_mustCatchUpRadius ) },
 			{ "CatchUpCrisisBailTime",			INI::parseUnsignedInt,	NULL, offsetof( MobMemberSlavedUpdateModuleData, m_catchUpCrisisBailTime ) },
@@ -131,7 +128,5 @@ class MobMemberSlavedUpdate : public UpdateModule, public SlavedUpdateInterface
 	UnsignedInt m_catchUpCrisisTimer;// how many consecutive frames have I remained outside the catchup radius
 	//This is a failsafe to make sure that an individual mobmember does not get isolated from his buddies
 	// thus causing the mob to become invincible, since they will continue to bud around the nexus
-	
-};
-#endif //_MOBMEMBER_AI_UPDATE_H_
 
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h
index 49a14d612c5..a6cb49aa53d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __MOBNEXUSCONTAIN_H_
-#define __MOBNEXUSCONTAIN_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 
@@ -62,7 +59,7 @@ class MobNexusContainModuleData : public OpenContainModuleData
 };
 
 //-------------------------------------------------------------------------------------------------
-class MobNexusContain : public OpenContain, 
+class MobNexusContain : public OpenContain,
 												public TransportPassengerInterface // lorenzen add a MobMemberInterface
 {
 
@@ -99,10 +96,7 @@ class MobNexusContain : public OpenContain,
 protected:
 
 private:
-	
+
 	Int m_extraSlotsInUse;
 
 };
-
-#endif // __MOBNEXUSCONTAIN_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h
index d3e2099ab26..a1adfe69b72 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _MODEL_CONDITION_UPGRADE_H
-#define _MODEL_CONDITION_UPGRADE_H
-
 #include "GameLogic/Module/UpgradeModule.h"
 
 enum ModelConditionFlagType CPP_11(: Int);
@@ -63,6 +60,3 @@ class ModelConditionUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-#endif // _MODEL_CONDITION_UPGRADE_H
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h
index d3aa3949981..ed767becd88 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef MONEY_CRATE_COLLIDE_H_
-#define MONEY_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -53,11 +50,11 @@ class MoneyCrateCollideModuleData : public CrateCollideModuleData
 		m_upgradeBoost.clear();
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MoneyProvided",	INI::parseUnsignedInt,	NULL, offsetof( MoneyCrateCollideModuleData, m_moneyProvided ) },
 			{ "UpgradedBoost",	parseUpgradePair,		NULL, offsetof( MoneyCrateCollideModuleData, m_upgradeBoost ) },
@@ -89,5 +86,3 @@ class MoneyCrateCollide : public CrateCollide
 	Int getUpgradedSupplyBoost( Object *other ) const;
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h
index 9502ec2a7d4..9f972ea26a9 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __NeutronBlastBehavior_H_
-#define __NeutronBlastBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -40,7 +37,7 @@
 class NeutronBlastBehaviorModuleData : public UpdateModuleData
 {
 public:
-	Real m_blastRadius; 
+	Real m_blastRadius;
 	Bool m_isAffectAirborne;
 	Bool m_affectAllies;
 
@@ -51,11 +48,11 @@ class NeutronBlastBehaviorModuleData : public UpdateModuleData
 		m_affectAllies = TRUE;
 	}
 
-	static void buildFieldParse( MultiIniFieldParse& p ) 
+	static void buildFieldParse( MultiIniFieldParse& p )
 	{
 		UpdateModuleData::buildFieldParse( p );
-    
-		static const FieldParse dataFieldParse[] = 
+
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "BlastRadius",		INI::parseReal, NULL, offsetof( NeutronBlastBehaviorModuleData, m_blastRadius ) },
 			{ "AffectAirborne", INI::parseBool, NULL, offsetof( NeutronBlastBehaviorModuleData, m_isAffectAirborne ) },
@@ -71,7 +68,7 @@ class NeutronBlastBehaviorModuleData : public UpdateModuleData
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 class NeutronBlastBehavior : public UpdateModule,
-														 public DieModuleInterface 
+														 public DieModuleInterface
 {
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( NeutronBlastBehavior, "NeutronBlastBehavior" )
@@ -85,7 +82,7 @@ class NeutronBlastBehavior : public UpdateModule,
 	static Int getInterfaceMask() { return UpdateModule::getInterfaceMask() | MODULEINTERFACE_DIE; }
 	virtual DieModuleInterface* getDie() { return this; }
 
-	
+
 	virtual UpdateSleepTime update();
 	virtual void onDie( const DamageInfo *damageInfo );
 
@@ -94,6 +91,3 @@ class NeutronBlastBehavior : public UpdateModule,
 
 	void neutronBlastToObject( Object *obj );
 };
-
-#endif // __NeutronBlastBehavior_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h
index fc977b44c58..fdcd161a874 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __NEUTRONMISSILESlowDeathBehavior_H_
-#define __NEUTRONMISSILESlowDeathBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/SlowDeathBehavior.h"
 
@@ -40,7 +37,7 @@ class FXList;
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 enum NeutronBlast CPP_11(: Int)
-{ 
+{
 	NEUTRON_BLAST_1 = 0,
 	NEUTRON_BLAST_2,
 	NEUTRON_BLAST_3,
@@ -51,7 +48,7 @@ enum NeutronBlast CPP_11(: Int)
 	NEUTRON_BLAST_8,
 	NEUTRON_BLAST_9,
 
-	MAX_NEUTRON_BLASTS  // keep this last
+	MAX_NEUTRON_BLASTS
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -60,7 +57,7 @@ struct BlastInfo
 {
   Bool enabled;					///< this blast is enabled
 	Real delay;						///< delay after death to start the regular blast
-	Real scorchDelay;			///< delay after death to start a scorch blast 
+	Real scorchDelay;			///< delay after death to start a scorch blast
 	Real innerRadius;			///< inner radius of damage
 	Real outerRadius;			///< outer radius of damage
 	Real maxDamage;				///< max amount
@@ -112,5 +109,3 @@ class NeutronMissileSlowDeathBehavior : public SlowDeathBehavior
 	Bool m_scorchPlaced;														///< TRUE once we've placed the scorch mark
 
 };
-
-#endif  // end __NEUTRONMISSILESlowDeathBehavior_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h
index d3a05b3f001..41c6db5a18e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _MISSILE_UPDATE_H_
-#define _MISSILE_UPDATE_H_
-
 #include "GameClient/RadiusDecal.h"
 #include "Common/GameType.h"
 #include "Common/GlobalData.h"
@@ -47,7 +44,7 @@ class NeutronMissileUpdateModuleData : public UpdateModuleData
 {
 public:
 	Real					m_initialDist;
-	Real					m_maxTurnRate;		
+	Real					m_maxTurnRate;
 	Real					m_forwardDamping;
 	Real					m_relativeSpeed;
 	Real					m_targetFromDirectlyAbove;	///< aim first for dest+offset, then dest
@@ -70,7 +67,7 @@ class NeutronMissileUpdateModuleData : public UpdateModuleData
 /**
  * This module encapsulates missile behavior.
  */
-class NeutronMissileUpdate : public UpdateModule, 
+class NeutronMissileUpdate : public UpdateModule,
 	public DieModuleInterface,
 	public ProjectileUpdateInterface
 {
@@ -124,7 +121,7 @@ class NeutronMissileUpdate : public UpdateModule,
 	Coord3D m_vel;
 
 	UnsignedInt m_stateTimestamp;				///< time of state change
-	Bool m_isLaunched;							
+	Bool m_isLaunched;
 	Bool m_isArmed;											///< if true, missile will explode on contact
 	Real m_noTurnDistLeft;				///< when zero, ok to start turning
 	Bool m_reachedIntermediatePos;
@@ -140,6 +137,3 @@ class NeutronMissileUpdate : public UpdateModule,
 
 
 };
-
-#endif // _MISSILE_UPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h
index 15f76e8c710..5fa059cff71 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OCLSPECIALPOWER_H_
-#define __OCLSPECIALPOWER_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/SpecialPowerModule.h"
 #include "Common/Science.h"
@@ -47,6 +44,8 @@ enum OCLCreateLocType CPP_11(: Int)
 	USE_OWNER_OBJECT,
 	CREATE_ABOVE_LOCATION,
 	CREATE_AT_EDGE_FARTHEST_FROM_TARGET,
+
+	OCL_CREATE_LOC_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -71,7 +70,7 @@ class OCLSpecialPowerModuleData : public SpecialPowerModuleData
 	OCLCreateLocType					m_createLoc;
 	Bool											m_isOCLAdjustPositionToPassable; ///< Adjust target to nearest Passable cell
 
-	//We need to know what the final product is going to be for script placement calculations 
+	//We need to know what the final product is going to be for script placement calculations
 	//for construction sites like the sneak attack.
 	AsciiString				m_referenceThingName;
 
@@ -104,5 +103,3 @@ class OCLSpecialPower : public SpecialPowerModule
 
 	const ObjectCreationList* findOCL() const;
 };
-
-#endif  // end __OCLSPECIALPOWER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h
index 94339b26588..3e7e0546a09 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OCL_UPDATE_H_
-#define __OCL_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -56,7 +53,7 @@ class OCLUpdateModuleData : public UpdateModuleData
 	UnsignedInt									m_maxDelay;
 	Bool												m_isCreateAtEdge;				///< Otherwise, it is created on top of myself
 	Bool												m_isFactionTriggered;		///< Faction has to be present before update will happen
-	
+
 	OCLUpdateModuleData();
 
 	static void buildFieldParse(MultiIniFieldParse& p);
@@ -86,7 +83,7 @@ class OCLUpdate : public UpdateModule
 	virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; }
 
 protected:
-	
+
 	UnsignedInt			m_nextCreationFrame;
 	UnsignedInt			m_timerStartedFrame;
 	Bool						m_isFactionNeutral;
@@ -96,6 +93,3 @@ class OCLUpdate : public UpdateModule
 	void setNextCreationFrame();
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h
index cc8f65703d3..eb2786bf1b8 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OBJECTCREATIONUPGRADE_H_
-#define __OBJECTCREATIONUPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -77,6 +74,3 @@ class ObjectCreationUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-#endif // __OBJECTCREATIONUPGRADE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h
index 0c2c84b7b64..8a3985e59a3 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OBJECT_DEFECTION_HELPER_H_
-#define __OBJECT_DEFECTION_HELPER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ObjectHelper.h"
 
@@ -51,7 +48,7 @@ class ObjectDefectionHelper : public ObjectHelper
 {
 
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( ObjectDefectionHelper, ObjectDefectionHelperModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectDefectionHelper, "ObjectDefectionHelperPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectDefectionHelper, "ObjectDefectionHelperPool" )
 
 private:
 
@@ -62,15 +59,12 @@ class ObjectDefectionHelper : public ObjectHelper
 
 public:
 
-	ObjectDefectionHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) 
+	ObjectDefectionHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData )
 	{
-		//Added By Sadullah Nader
-		//Initializations inserted
 		m_defectionDetectionEnd = 0;
 		m_defectionDetectionFlashPhase = FALSE;
 		m_defectionDetectionStart = 0;
 		m_doDefectorFX = FALSE;
-		//
 	}
 	// virtual destructor prototype provided by memory pool object
 
@@ -83,6 +77,3 @@ class ObjectDefectionHelper : public ObjectHelper
 	void startDefectionTimer(UnsignedInt numFrames, Bool withDefectorFX = TRUE);
 
 };
-
-
-#endif  // end __OBJECT_DEFECTION_HELPER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h
index 167990e2a56..cdf4c59607f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OBJECT_HELPER_H_
-#define __OBJECT_HELPER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -51,9 +48,9 @@ class ObjectHelper : public UpdateModule
 
 public:
 
-	ObjectHelper( Thing *thing, const ModuleData *modData ) : 
-		UpdateModule( thing, modData ) 
-	{ 
+	ObjectHelper( Thing *thing, const ModuleData *modData ) :
+		UpdateModule( thing, modData )
+	{
 		setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 	}
 
@@ -64,5 +61,3 @@ class ObjectHelper : public UpdateModule
 	void sleepUntil(UnsignedInt when);
 
 };
-
-#endif  // end __OBJECT_HELPER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h
index d731e9ad924..445c05d3f98 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ObjectRepulsorHelper_H_
-#define __ObjectRepulsorHelper_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ObjectHelper.h"
 
@@ -48,7 +45,7 @@ class ObjectRepulsorHelper : public ObjectHelper
 {
 
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( ObjectRepulsorHelper, ObjectRepulsorHelperModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectRepulsorHelper, "ObjectRepulsorHelper" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectRepulsorHelper, "ObjectRepulsorHelper" )
 
 public:
 
@@ -58,6 +55,3 @@ class ObjectRepulsorHelper : public ObjectHelper
 	virtual UpdateSleepTime update();
 
 };
-
-
-#endif  // end __ObjectRepulsorHelper_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h
index bdf6e29f2b1..34fc3cd8335 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OBJECT_SMC_HELPER_H_
-#define __OBJECT_SMC_HELPER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ObjectHelper.h"
 
@@ -48,7 +45,7 @@ class ObjectSMCHelper : public ObjectHelper
 {
 
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( ObjectSMCHelper, ObjectSMCHelperModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectSMCHelper, "ObjectSMCHelperPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectSMCHelper, "ObjectSMCHelperPool" )
 
 public:
 
@@ -58,6 +55,3 @@ class ObjectSMCHelper : public ObjectHelper
 	virtual UpdateSleepTime update();
 
 };
-
-
-#endif  // end __OBJECT_SMC_HELPER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h
index 9f3a15f7873..0a36cfea973 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OBJECT_WEAPON_STATUS_HELPER_H_
-#define __OBJECT_WEAPON_STATUS_HELPER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ThingTemplate.h"
 #include "GameLogic/Object.h"
@@ -50,7 +47,7 @@ class ObjectWeaponStatusHelper : public ObjectHelper
 {
 
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( ObjectWeaponStatusHelper, ObjectWeaponStatusHelperModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectWeaponStatusHelper, "ObjectWeaponStatusHelperPool" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectWeaponStatusHelper, "ObjectWeaponStatusHelperPool" )
 
 protected:
 
@@ -65,9 +62,9 @@ class ObjectWeaponStatusHelper : public ObjectHelper
 	}
 public:
 
-	ObjectWeaponStatusHelper( Thing *thing, const ModuleData *modData ) : 
-		ObjectHelper( thing, modData ) 
-	{ 
+	ObjectWeaponStatusHelper( Thing *thing, const ModuleData *modData ) :
+		ObjectHelper( thing, modData )
+	{
 		// unlike other helpers, this one needs to start active.
 		DEBUG_ASSERTCRASH(getObject()->getTemplate()->canPossiblyHaveAnyWeapon(), ("should not be instantiated if we have no weapon"));
 		setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
@@ -78,8 +75,6 @@ class ObjectWeaponStatusHelper : public ObjectHelper
 	{
 		getObject()->adjustModelConditionForWeaponStatus();
 		// unlike other helpers, this one must run every frame.
-		return UPDATE_SLEEP_NONE; 
+		return UPDATE_SLEEP_NONE;
 	}
 };
-
-#endif  // end __OBJECT_DEFECTION_HELPER_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h
index 3e3ba8dbd10..3af77883edb 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h
@@ -25,16 +25,13 @@
 // FILE: OpenContain.h ////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, November 2001
 // Desc:   The OpenContainer ContainModule allows objects to be contained inside of other
-//				 objects.  There is a set of functionality that will be common to 
+//				 objects.  There is a set of functionality that will be common to
 //				 all container modules that provides the actual containment
 //				 implementations, those implementations are found here
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __OPENCONTAIN_H_
-#define __OPENCONTAIN_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/CollideModule.h"
@@ -80,17 +77,17 @@ class OpenContainModuleData : public UpdateModuleData
 //-------------------------------------------------------------------------------------------------
 /** An open container can actually contain other objects */
 //-------------------------------------------------------------------------------------------------
-class OpenContain : public UpdateModule, 
-										public ContainModuleInterface, 
-										public CollideModuleInterface, 
-										public DieModuleInterface, 
+class OpenContain : public UpdateModule,
+										public ContainModuleInterface,
+										public CollideModuleInterface,
+										public DieModuleInterface,
 										public DamageModuleInterface,
 										public ExitInterface
 {
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( OpenContain, "OpenContain" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( OpenContain, OpenContainModuleData )
-	
+
 public:
 
 	OpenContain( Thing *thing, const ModuleData* moduleData );
@@ -124,10 +121,10 @@ class OpenContain : public UpdateModule,
 	// DamageModuleInterface
 	virtual void onDamage( DamageInfo *damageInfo ){};	///< damage callback
 	virtual void onHealing( DamageInfo *damageInfo ){};	///< healing callback
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState){};  ///< state change callback
- 
+
 
 	// our object changed position... react as appropriate.
 	virtual void containReactToTransformChange();
@@ -135,18 +132,18 @@ class OpenContain : public UpdateModule,
 	virtual Bool calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3D *targetPos ) { return FALSE; }
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, Object *victim ) { return FALSE; }
 	virtual Bool attemptBestFirePointPosition( Object *source, Weapon *weapon, const Coord3D *targetPos ) { return FALSE; }
-	
+
 	///< if my object gets selected, then my visible passengers should, too
 	///< this gets called from
-	virtual void clientVisibleContainedFlashAsSelected() {}; 
- 
+	virtual void clientVisibleContainedFlashAsSelected() {};
+
 	virtual const Player* getApparentControllingPlayer(const Player* observingPlayer) const { return NULL; }
 	virtual void recalcApparentControllingPlayer() { }
-		
+
 	virtual void onContaining( Object *obj, Bool wasSelected );		///< object now contains 'obj'
 	virtual void onRemoving( Object *obj );			///< object no longer contains 'obj'
 	virtual void onSelling();///< Container is being sold.  Open responds by kicking people out
- 
+
 	virtual void orderAllPassengersToExit( CommandSourceType commandSource, Bool instantly ); ///< All of the smarts of exiting are in the passenger's AIExit. removeAllFrommContain is a last ditch system call, this is the game Evacuate
 	virtual void orderAllPassengersToIdle( CommandSourceType commandSource ); ///< Just like it sounds
 	virtual void orderAllPassengersToHackInternet( CommandSourceType ); ///< Just like it sounds
@@ -159,7 +156,7 @@ class OpenContain : public UpdateModule,
 	virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE );	///< remove 'obj' from contain list
 	virtual void removeAllContained( Bool exposeStealthUnits = FALSE );				///< remove all objects on contain list
 	virtual void killAllContained( void );				///< kill all objects on contain list
-  virtual void harmAndForceExitAllContained( DamageInfo *info ); // apply canned damage against those containes 
+  virtual void harmAndForceExitAllContained( DamageInfo *info ); // apply canned damage against those containes
 	virtual Bool isEnclosingContainerFor( const Object *obj ) const;	///< Does this type of Contain Visibly enclose its contents?
 	virtual Bool isPassengerAllowedToFire( ObjectID id = INVALID_ID ) const;	///< Hey, can I shoot out of this container?
 
@@ -173,10 +170,11 @@ class OpenContain : public UpdateModule,
 	// contain list access
 	virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse );
 	virtual UnsignedInt getContainCount() const { return m_containListSize; }
-	virtual const ContainedItemsList* getContainedItemsList() const { return &m_containList; }	
+	virtual const ContainedItemsList* getContainedItemsList() const { return &m_containList; }
 	virtual const Object *friend_getRider() const{return NULL;} ///< Damn.  The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
 	virtual Real getContainedItemsMass() const;
 	virtual UnsignedInt getStealthUnitsContained() const { return m_stealthUnitsContained; }
+	virtual UnsignedInt getHeroUnitsContained() const { return m_heroUnitsContained; }
 
 	virtual PlayerMaskType getPlayerWhoEntered(void) const { return m_playerEnteredMask; }
 
@@ -188,7 +186,7 @@ class OpenContain : public UpdateModule,
 	virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor );
 	virtual void exitObjectInAHurry( Object *newObj );
 
-	
+
 	virtual void unreserveDoorForExit( ExitDoorType exitDoor ) { /*nothing*/ }
 	virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; };
 
@@ -242,9 +240,9 @@ class OpenContain : public UpdateModule,
 	void scatterToNearbyPosition(Object* obj);
 	void removeFromContainViaIterator( ContainedItemsList::iterator it, Bool exposeStealthUnits = FALSE );  ///< remove item from contain list
 	void removeFromPassengerViaIterator( ContainedItemsList::iterator it );///< remove item from passenger list
-	
-	virtual void doLoadSound();	
-	virtual void doUnloadSound();	
+
+	virtual void doLoadSound();
+	virtual void doUnloadSound();
 	virtual void positionContainedObjectsRelativeToContainer(){}
 
 	virtual void addOrRemoveObjFromWorld(Object* obj, Bool add);
@@ -262,6 +260,8 @@ class OpenContain : public UpdateModule,
 
 	ObjectEnterExitMap	m_objectEnterExitInfo;
 	UnsignedInt					m_stealthUnitsContained;				///< number of stealth units that can't be seen by enemy players.
+	UnsignedInt					m_heroUnitsContained;						///< cached hero count
+	XferVersion					m_xferVersion;									///< version of loaded save file for loadPostProcess
 	Int									m_whichExitPath; ///< Cycles from 1 to n and is used only in modules whose data has numberOfExitPaths > 1.
 	UnsignedInt					m_doorCloseCountdown;						///< When should I shut my door.
 
@@ -272,7 +272,7 @@ class OpenContain : public UpdateModule,
 
 /// @todo srj -- move this to a lazily-allocated subobject
 	enum { MAX_FIRE_POINTS = 32 };
-	ModelConditionFlags	m_conditionState;				///< The Drawables current behavior state	
+	ModelConditionFlags	m_conditionState;				///< The Drawables current behavior state
 	Matrix3D						m_firePoints[ MAX_FIRE_POINTS ];
 	Int									m_firePointStart;												///< start firepoint index to use when building becomes occupied
 	Int									m_firePointNext;												///< next index to place objects at
@@ -284,5 +284,3 @@ class OpenContain : public UpdateModule,
 	Bool								m_loadSoundsEnabled;								///< Don't serialize -- used for disabling sounds during payload creation.
   Bool                m_passengerAllowedToFire;      ///< Newly promoted from the template data to the module for upgrade overriding access
 };
-
-#endif  // end __OPENCONTAIN_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h
index c4c4be45b48..23999c4b10c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h
@@ -31,9 +31,6 @@
 
 #pragma once
 
-#ifndef __OVERCHARGE_BEHAVIOR_H_
-#define __OVERCHARGE_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DamageModule.h"
@@ -70,7 +67,7 @@ class OverchargeBehaviorInterface
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class OverchargeBehavior : public UpdateModule, 
+class OverchargeBehavior : public UpdateModule,
 													 public DamageModuleInterface,
 													 public OverchargeBehaviorInterface
 {
@@ -96,8 +93,8 @@ class OverchargeBehavior : public UpdateModule,
 	// DamageModuleInterface
 	virtual void onDamage( DamageInfo *damageInfo );
 	virtual void onHealing( DamageInfo *damageInfo ) { }
-	virtual void onBodyDamageStateChange( const DamageInfo *damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo *damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState ) { }
 
 
@@ -114,5 +111,3 @@ class OverchargeBehavior : public UpdateModule,
 	Bool m_overchargeActive;				///< Overcharge is currently on/off for this object
 
 };
-
-#endif  // end __OVERCHARGE_BEHAVIOR_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h
index 4e52e264224..8cb487b76e1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __OVERLORD_CONTAIN_H_
-#define __OVERLORD_CONTAIN_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/TransportContain.h"
 #include "GameLogic/GameLogic.h"
@@ -62,14 +59,14 @@ class OverlordContain : public TransportContain
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( OverlordContain, "OverlordContain" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( OverlordContain, OverlordContainModuleData )
 
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState);  ///< state change callback
 public:
 
 	OverlordContain( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
-	
+
 	virtual OpenContain *asOpenContain() { return this; }  ///< treat as open container
 	virtual Bool isGarrisonable() const;	///< can this unit be Garrisoned? (ick)
   virtual Bool isBustable() { return false;};	///< can this container get busted by bunkerbuster? (ick)
@@ -103,20 +100,20 @@ class OverlordContain : public TransportContain
 	virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse );
 	virtual UnsignedInt getContainCount() const;
 	virtual Int getContainMax( void ) const;
-	virtual const ContainedItemsList* getContainedItemsList() const;	
+	virtual const ContainedItemsList* getContainedItemsList() const;
 
 	// Friend for our Draw module only.
 	virtual const Object *friend_getRider() const; ///< Damn.  The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
-	
+
 	///< if my object gets selected, then my visible passengers should, too
 	///< this gets called from
-	virtual void clientVisibleContainedFlashAsSelected(); 
+	virtual void clientVisibleContainedFlashAsSelected();
 
 	virtual Bool getContainerPipsToShow(Int& numTotal, Int& numFull);
 	virtual void createPayload();
 
 private:
-	/**< An empty overlord is a conatiner, but a full one redirects calls to its passengers.  If this returns NULL, 
+	/**< An empty overlord is a conatiner, but a full one redirects calls to its passengers.  If this returns NULL,
 	we are either empty or carrying a non container.
 	*/
 	ContainModuleInterface *getRedirectedContain() const; ///< And this gets what are redirecting to.
@@ -127,6 +124,3 @@ class OverlordContain : public TransportContain
 	Bool m_redirectionActivated;
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
index 7e9b81da82e..f937ba66b6c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __POW_TRUCK_AI_UPDATE_H_
-#define __POW_TRUCK_AI_UPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -58,7 +55,7 @@ class POWTruckAIUpdateModuleData : public AIUpdateModuleData
 // ------------------------------------------------------------------------------------------------
 enum POWTruckTask CPP_11(: Int)	// Stored in save file, do not renumber.  jba.
 {
-	POW_TRUCK_TASK_WAITING						= 0, ///< Waiting for something to do 
+	POW_TRUCK_TASK_WAITING						= 0, ///< Waiting for something to do
 	POW_TRUCK_TASK_FIND_TARGET				= 1, ///< We need to search out a target to collect
 	POW_TRUCK_TASK_COLLECTING_TARGET	= 2, ///< collecting a targeted POW
 	POW_TRUCK_TASK_RETURNING_PRISONERS= 3	///< return all POWs to base
@@ -80,7 +77,7 @@ class POWTruckAIUpdateInterface
 
 //-------------------------------------------------------------------------------------------------
 /** The Dozer AI Update interface.  Dozers are workers that are capable of building all the
-	* structures available to a player, as well as repairing building, and fortifying 
+	* structures available to a player, as well as repairing building, and fortifying
 	* civilian structures */
 //-------------------------------------------------------------------------------------------------
 class POWTruckAIUpdate : public AIUpdateInterface,
@@ -135,7 +132,7 @@ class POWTruckAIUpdate : public AIUpdateInterface,
 	// AIUpdateInterface implementations
 	virtual void privatePickUpPrisoner( Object *prisoner, CommandSourceType cmdSource );
 	virtual void privateReturnPrisoners( Object *prison, CommandSourceType cmdSource );
-	
+
 	POWTruckAIMode m_aiMode;						///< Type of AI, automatic or explicitly controlled be player
 	POWTruckTask m_currentTask;					///< our current task
 	ObjectID m_targetID;								///< Object ID of the target we're going to collect
@@ -146,5 +143,3 @@ class POWTruckAIUpdate : public AIUpdateInterface,
 };
 
 #endif
-
-#endif  // end __POW_TRUCK_AI_UPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h
index 357cf9c93bb..1ef92bb49c2 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __POW_TRUCK_BEHAVIOR_H_
-#define __POW_TRUCK_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 
@@ -45,7 +42,7 @@ class POWTruckBehaviorModuleData : public OpenContainModuleData
 public:
 
 	POWTruckBehaviorModuleData( void );
-	
+
 	static void buildFieldParse( MultiIniFieldParse &p );
 
 };
@@ -65,11 +62,9 @@ class POWTruckBehavior : public OpenContain
 
 	// collide methods
 	virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal );
-	
+
 protected:
 
 };
 
 #endif
-
-#endif  // end __POW_TRUCK_BEHAVIOR_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h
index 0660a9fc498..9aa2b664c74 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __ParachuteContain_H_
-#define __ParachuteContain_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 
@@ -87,7 +84,7 @@ class ParachuteContain : public OpenContain
 	virtual void positionContainedObjectsRelativeToContainer();
 
 private:
-	
+
 	void positionRider(Object* obj);
 	void updateBonePositions();
 	void updateOffsetsFromBones();
@@ -113,6 +110,3 @@ class ParachuteContain : public OpenContain
 	Bool m_needToUpdateParaBones;
 	Bool m_opened;
 };
-
-#endif // __ParachuteContain_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h
index 8def59d5eb7..053d3108e62 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h
@@ -24,14 +24,11 @@
 
 // FILE: ParkingPlaceBehavior.h /////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, June 2002
-// Desc:   
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __ParkingPlaceBehavior_H_
-#define __ParkingPlaceBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -68,7 +65,7 @@ class ParkingPlaceBehaviorModuleData : public UpdateModuleData
 	{
 		UpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "NumRows",						     INI::parseInt,	 NULL, offsetof( ParkingPlaceBehaviorModuleData, m_numRows ) },
 			{ "NumCols",						     INI::parseInt,	 NULL, offsetof( ParkingPlaceBehaviorModuleData, m_numCols ) },
@@ -93,7 +90,7 @@ class ParkingPlaceBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class ParkingPlaceBehavior : public UpdateModule, 
+class ParkingPlaceBehavior : public UpdateModule,
 														 public DieModuleInterface,
 														 public ParkingPlaceBehaviorInterface,
 														 public ExitInterface
@@ -121,7 +118,7 @@ class ParkingPlaceBehavior : public UpdateModule,
 	virtual void unreserveDoorForExit( ExitDoorType exitDoor );
 	virtual void exitObjectByBudding( Object *newObj, Object *budHost ) { return; }
 
-	virtual Bool getExitPosition( Coord3D& rallyPoint ) const;		
+	virtual Bool getExitPosition( Coord3D& rallyPoint ) const;
 	virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const;
 	virtual void setRallyPoint( const Coord3D *pos );			///< define a "rally point" for units to move towards
 	virtual const Coord3D *getRallyPoint( void ) const;			///< define a "rally point" for units to move towards
@@ -133,15 +130,16 @@ class ParkingPlaceBehavior : public UpdateModule,
 	virtual void onDie( const DamageInfo *damageInfo );
 
 	// ParkingPlaceBehaviorInterface
-	virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const; 
-	virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const; 
+	virtual Bool shouldReserveDoorWhenQueued(const ThingTemplate* thing) const;
+	virtual Bool hasAvailableSpaceFor(const ThingTemplate* thing) const;
 	virtual Bool hasReservedSpace(ObjectID id) const;
 	virtual Int  getSpaceIndex( ObjectID id ) const;
 	virtual Bool reserveSpace(ObjectID id, Real parkingOffset, PPInfo* info);
-	virtual void releaseSpace(ObjectID id); 
+	virtual void releaseSpace(ObjectID id);
 	virtual Bool reserveRunway(ObjectID id, Bool forLanding);
-	virtual void releaseRunway(ObjectID id); 
+	virtual void releaseRunway(ObjectID id);
 	virtual void calcPPInfo( ObjectID id, PPInfo *info );
+	virtual Int getRunwayIndex(ObjectID id);
 	virtual Int getRunwayCount() const { return m_runways.size(); }
 	virtual ObjectID getRunwayReservation( Int r, RunwayReservationType type );
 	virtual void transferRunwayReservationToNextInLineForTakeoff(ObjectID id);
@@ -158,15 +156,16 @@ class ParkingPlaceBehavior : public UpdateModule,
 
 	struct ParkingPlaceInfo
 	{
-		Coord3D				m_hangarStart;
-		Real					m_hangarStartOrient;
-		Coord3D				m_location;
-		Coord3D				m_prep;
-		Real					m_orientation;
-		Int						m_runway;
-		ExitDoorType	m_door;
-		ObjectID			m_objectInSpace;
-		Bool					m_reservedForExit;
+		Coord3D      m_hangarStart;
+		Real         m_hangarStartOrient;
+		Coord3D      m_location;
+		Coord3D      m_prep;
+		Real         m_orientation;
+		Int          m_runway;
+		ExitDoorType m_door;
+		ObjectID     m_objectInSpace;
+		Bool         m_reservedForExit;
+		Bool         m_postponedRunwayReservationForTakeoff;
 
 		ParkingPlaceInfo()
 		{
@@ -179,7 +178,8 @@ class ParkingPlaceBehavior : public UpdateModule,
 			m_door = DOOR_NONE_AVAILABLE;
 			m_objectInSpace = INVALID_ID;
 			m_reservedForExit = false;
-		} 
+			m_postponedRunwayReservationForTakeoff = false;
+		}
 	};
 
 	struct RunwayInfo
@@ -203,6 +203,7 @@ class ParkingPlaceBehavior : public UpdateModule,
 	UnsignedInt										m_nextHealFrame;
 	Bool													m_gotInfo;
 
+	Bool postponeRunwayReservation(UnsignedInt spaceIndex, Bool forLanding);
 	void buildInfo();
 	void purgeDead();
 	void resetWakeFrame();
@@ -210,9 +211,6 @@ class ParkingPlaceBehavior : public UpdateModule,
 	ParkingPlaceInfo* findPPI(ObjectID id);
 	ParkingPlaceInfo* findEmptyPPI();
 
-	Coord3D m_heliRallyPoint;		
+	Coord3D m_heliRallyPoint;
 	Bool m_heliRallyPointExists;				///< Only move to the rally point if this is true
 };
-
-#endif // __ParkingPlaceBehavior_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h
index 19c6c157ad5..015813b9a7a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PARTICLE_UPLINK_CANNON_UPDATE_H_
-#define __PARTICLE_UPLINK_CANNON_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "Common/Science.h"
@@ -75,7 +72,7 @@ class ParticleUplinkCannonUpdateModuleData : public ModuleData
 	AsciiString			m_laserBaseLightFlareParticleSystemName;
 	AsciiString			m_laserBaseMediumFlareParticleSystemName;
 	AsciiString			m_laserBaseIntenseFlareParticleSystemName;
-	
+
 	AsciiString			m_fireBoneName;
 	AsciiString			m_particleBeamLaserName;
 
@@ -110,7 +107,7 @@ class ParticleUplinkCannonUpdateModuleData : public ModuleData
 	ParticleUplinkCannonUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -241,7 +238,3 @@ class ParticleUplinkCannonUpdate : public SpecialPowerUpdateModule
 	Bool						m_scriptedWaypointMode;
 	Bool						m_clientShroudedLastFrame;
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h
index e98e5888519..a9d27ac14f7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PASSENGERS_FIRE_UPGRADE_H_
-#define __PASSENGERS_FIRE_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -56,7 +53,3 @@ class PassengersFireUpgrade : public UpgradeModule
 
 
 };
-
-
-#endif // __PASSENGERS_FIRE_UPGRADE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
index 766dfba4594..bd41d3c97f1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _PHYSICSUPDATE_H_
-#define _PHYSICSUPDATE_H_
-
 #include "Common/AudioEventRTS.h"
 #include "Common/GameAudio.h"
 #include "GameLogic/Module/BehaviorModule.h"
@@ -66,7 +63,7 @@ class PhysicsBehaviorModuleData : public UpdateModuleData
 	Real	m_minFallSpeedForDamage;
 	Real	m_fallHeightDamageFactor;
 	Real	m_pitchRollYawFactor;
-  
+
 	const WeaponTemplate* m_vehicleCrashesIntoBuildingWeaponTemplate;
 	const WeaponTemplate* m_vehicleCrashesIntoNonBuildingWeaponTemplate;
 
@@ -75,10 +72,10 @@ class PhysicsBehaviorModuleData : public UpdateModuleData
 };
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Simple rigid body physics update module
  */
-class PhysicsBehavior : public UpdateModule, 
+class PhysicsBehavior : public UpdateModule,
 												public CollideModuleInterface
 {
 
@@ -155,7 +152,7 @@ class PhysicsBehavior : public UpdateModule,
 
 	PhysicsTurningType getTurning(void) const { return m_turning; }		///< 0 = not turning, -1 = turn negative, 1 = turn positive.
 	void setTurning(PhysicsTurningType turning) { m_turning = turning; }
-	
+
 	/** This is a force scrub for velocity when ai objects are colliding. */
 	void scrubVelocity2D( Real desiredVelocity );
 
@@ -195,7 +192,7 @@ class PhysicsBehavior : public UpdateModule,
 
 	void setBounceSound(const AudioEventRTS* bounceSound);
 	const AudioEventRTS* getBounceSound() { return m_bounceSound ? &m_bounceSound->m_event : TheAudio->getValidSilentAudioEvent(); }
-	
+
 	/**
 		Reset all values (vel, accel, etc) to starting values.
 		You should ALMOST NEVER use this; it's intended for cases where you need
@@ -209,12 +206,12 @@ class PhysicsBehavior : public UpdateModule,
 	void setIgnoreCollisionsWith(const Object* obj);
 	Bool isIgnoringCollisionsWith(ObjectID id) const;
 
-	inline Bool getAllowCollideForce() const { return getFlag(ALLOW_COLLIDE_FORCE); }
+	Bool getAllowCollideForce() const { return getFlag(ALLOW_COLLIDE_FORCE); }
 
 protected:
 
 	/*
-		Physics runs in its own phase, after AI, but before all others. 
+		Physics runs in its own phase, after AI, but before all others.
 		It's actually quite important that AI (the thing that drives Locomotors) and Physics
 		run in the same order, relative to each other, for a given object; otherwise,
 		interesting oscillations can occur in some situations, with friction being applied
@@ -243,7 +240,7 @@ class PhysicsBehavior : public UpdateModule,
 
 	enum PhysicsFlagsType
 	{
-		// Note - written out in save/load xfer; don't change these numbers.  
+		// Note - written out in save/load xfer; don't change these numbers.
 		STICK_TO_GROUND									= 0x0001,
 		ALLOW_BOUNCE										= 0x0002,
 		APPLY_FRICTION2D_WHEN_AIRBORNE	= 0x0004,
@@ -259,9 +256,9 @@ class PhysicsBehavior : public UpdateModule,
 	};
 
 	/*
-		Note: these are private because you should never manipulate these directly, 
+		Note: these are private because you should never manipulate these directly,
 		even if you are a subclass... if you want to change the acceleration, you
-		MUST call applyForce(). 
+		MUST call applyForce().
 	*/
 	Real												m_yawRate;								///< rate of rotation around up vector
 	Real												m_rollRate;								///< rate of rotation around forward vector
@@ -285,8 +282,8 @@ class PhysicsBehavior : public UpdateModule,
 
 	Bool												m_originalAllowBounce;		///< orignal state of allow bounce
 
-	inline void setFlag(PhysicsFlagsType f, Bool set) { if (set) m_flags |= f; else m_flags &= ~f; }
-	inline Bool getFlag(PhysicsFlagsType f) const { return (m_flags & f) != 0; }
+	void setFlag(PhysicsFlagsType f, Bool set) { if (set) m_flags |= f; else m_flags &= ~f; }
+	Bool getFlag(PhysicsFlagsType f) const { return (m_flags & f) != 0; }
 
 
 };
@@ -307,6 +304,3 @@ inline ObjectID PhysicsBehavior::getLastCollidee() const
 {
 	return m_lastCollidee;
 }
-
-#endif // _PHYSICSUPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h
index ddd8dca6975..78c39e8c2df 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PILOT_FIND_VEHICLE_UPDATE_H_
-#define __PILOT_FIND_VEHICLE_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -53,7 +50,7 @@ class PilotFindVehicleUpdateModuleData : public ModuleData
 	PilotFindVehicleUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -79,7 +76,3 @@ class PilotFindVehicleUpdate : public UpdateModule
 protected:
 	Bool		m_didMoveToBase;
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h
index 64d28e1cbcf..e66818f66f0 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __POINT_DEFENSE_LASER_UPDATE_H_
-#define __POINT_DEFENSE_LASER_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -56,7 +53,7 @@ class PointDefenseLaserUpdateModuleData : public ModuleData
 	PointDefenseLaserUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -87,7 +84,3 @@ class PointDefenseLaserUpdate : public UpdateModule
 	Int m_nextScanFrames;
 	Int m_nextShotAvailableInFrames;
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h
index d3185240e6e..11537deedc3 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __Poisoned_Behavior_H_
-#define __Poisoned_Behavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DamageModule.h"
@@ -55,7 +52,7 @@ class PoisonedBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class PoisonedBehavior : public UpdateModule, 
+class PoisonedBehavior : public UpdateModule,
 												 public DamageModuleInterface
 {
 
@@ -92,9 +89,7 @@ class PoisonedBehavior : public UpdateModule,
 	UnsignedInt		m_poisonDamageFrame;
 	UnsignedInt		m_poisonOverallStopFrame;
 	Real					m_poisonDamageAmount;
+	ObjectID			m_poisonSource;
 	DeathType			m_deathType;
 
 };
-
-#endif // __Poisoned_Behavior_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h
index d6fcb730ba9..97c21634e53 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __POWERPLANTUPDATE_H_
-#define __POWERPLANTUPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -44,11 +41,11 @@ class PowerPlantUpdateModuleData : public UpdateModuleData
 
 	PowerPlantUpdateModuleData( void );
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse( p );
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 
 			{ "RodsExtendTime", INI::parseDurationUnsignedInt, NULL, offsetof( PowerPlantUpdateModuleData, m_rodsExtendTime ) },
@@ -99,5 +96,3 @@ class PowerPlantUpdate : public UpdateModule,
 	Bool m_extended;										 ///< TRUE when extend is all done
 
 };
-
-#endif  // end __POWERPLANTUPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h
index ea1c4eaed59..c3b601bdd14 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __POWERPLANTUPGRADE_H_
-#define __POWERPLANTUPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -62,6 +59,3 @@ class PowerPlantUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-#endif // __POWERPLANTUPGRADE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h
index bfccea0f4f4..dad86a0cbd9 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _PREORDER_CREATE_H_
-#define _PREORDER_CREATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CreateModule.h"
 
@@ -58,5 +55,3 @@ class PreorderCreate : public CreateModule
 protected:
 
 };
-
-#endif // _PREORDER_CREATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h
index bbc0536c291..600af3bbb25 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h
@@ -27,8 +27,7 @@
 // Desc:   Prison Behaviors
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifndef __PRISON_BEHAVIOR_H_
-#define __PRISON_BEHAVIOR_H_
+#pragma once
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
@@ -81,9 +80,7 @@ class PrisonBehavior : public OpenContain
 	void removeVisual( Object *obj );						///< remove prisoner visual
 
 	PrisonVisual *m_visualList;									///< list of visual representation data (if needed)
-			
+
 };
 
 #endif
-
-#endif  // end __PRISON_BEHAVIOR_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h
index 83f4423ef54..2baf25279c4 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PRISON_DOCK_UPDATE_H_
-#define __PRISON_DOCK_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
 #include "GameLogic/Module/DockUpdate.h"
@@ -55,9 +52,7 @@ class PrisonDockUpdate : public DockUpdate
 	virtual Bool action( Object *docker, Object *drone = NULL );	///< for me this means do some Prison
 
 protected:
-	
+
 };
 
 #endif
-
-#endif  // end __PRISON_DOCK_UPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h
index 8c90ae3ffc0..5c6cc19fe4b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PRODUCTIONUPDATE_H_
-#define __PRODUCTIONUPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/ModelState.h"
 #include "GameLogic/Module/DieModule.h"
@@ -56,7 +53,7 @@ enum ProductionType CPP_11(: Int)
 };
 
 //-------------------------------------------------------------------------------------------------
-/** A ProductionEntry is a single entry representing something that we are supposed to 
+/** A ProductionEntry is a single entry representing something that we are supposed to
 	* produce */
 //-------------------------------------------------------------------------------------------------
 class ProductionEntry : public MemoryPoolObject
@@ -95,7 +92,7 @@ friend class ProductionUpdate;
 	void setExitDoor(ExitDoorType exitDoor) { m_exitDoor = exitDoor; }
 
 protected:
-	
+
 	ProductionType m_type;														///< production type
 	union
 	{
@@ -207,7 +204,7 @@ class ProductionUpdate : public UpdateModule, public ProductionUpdateInterface,
 	virtual CanMakeType canQueueUpgrade( const UpgradeTemplate *upgrade ) const;
 
 	/** this method is used to request a unique ID to assign to the production of a single
-	unit.  It is unique to all units that can be created from this source object, but is 
+	unit.  It is unique to all units that can be created from this source object, but is
 	not unique amoung multiple source objects */
 	virtual ProductionID requestUniqueUnitID( void ) { ProductionID tmp = m_uniqueID; m_uniqueID = (ProductionID)(m_uniqueID+1); return tmp; }
 
@@ -218,7 +215,7 @@ class ProductionUpdate : public UpdateModule, public ProductionUpdateInterface,
 
 	virtual Bool queueCreateUnit( const ThingTemplate *unitType, ProductionID productionID );					///< queue unit to be produced
 	virtual void cancelUnitCreate( ProductionID productionID );		      ///< cancel construction of unit with matching production ID
-	virtual void cancelAllUnitsOfType( const ThingTemplate *unitType);	///< cancel all production of type unitType 
+	virtual void cancelAllUnitsOfType( const ThingTemplate *unitType);	///< cancel all production of type unitType
 
 	virtual void cancelAndRefundAllProduction( void );									///< cancel and refund anything in the production queue
 
@@ -268,5 +265,3 @@ class ProductionUpdate : public UpdateModule, public ProductionUpdateInterface,
 	Bool								m_flagsDirty;										///< clearFlags/setFlags needs to be set into the model
 
 };
-
-#endif  // end __PRODUCTIONUPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h
index 599541298de..3f79ac99c5a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PROJECTILE_STREAM_UPDATE_H_
-#define __PROJECTILE_STREAM_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
@@ -73,11 +70,7 @@ class ProjectileStreamUpdate : public UpdateModule
 	Int m_nextFreeIndex;
 	Int m_firstValidIndex;
 	ObjectID m_owningObject;
-	
+
 	ObjectID m_targetObject;///< Need to insert a hole if target changes, so track target ID and target position
 	Coord3D m_targetPosition;
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h
index d28de3034c6..2aa74479938 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PRONE_UPDATE_H_
-#define __PRONE_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -49,7 +46,7 @@ class ProneUpdateModuleData : public ModuleData
 	ProneUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -78,7 +75,3 @@ class ProneUpdate : public UpdateModule
 
 	Int m_proneFrames;
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h
index 68c63f614aa..abcfd6f6f56 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h
@@ -27,8 +27,7 @@
 // Desc:   Propaganda Center Behavior
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifndef __PROPAGANDA_CENTER_BEHAVIOR_H_
-#define __PROPAGANDA_CENTER_BEHAVIOR_H_
+#pragma once
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/PrisonBehavior.h"
@@ -80,9 +79,7 @@ class PropagandaCenterBehavior : public PrisonBehavior
 	ObjectID m_brainwashingSubjectID;								///< who we're currently brainwashing
 	UnsignedInt m_brainwashingSubjectStartFrame;		///< frame we started brainwashing
 	BrainwashedIDList m_brainwashedList;						///< list of objects we've brainwashed
-		
+
 };
 
 #endif
-
-#endif  // end __PROPAGANDA_CENTER_BEHAVIOR_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h
index 4c78c05564f..da388a53f07 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __PROPAGANDA_TOWER_BEHAVIOR_H_
-#define __PROPAGANDA_TOWER_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/PropagandaTowerBehavior.h"
@@ -96,14 +93,14 @@ class PropagandaTowerBehavior : public UpdateModule,
 	// of our effect on people.  We don't say "Be affected for n frames", we toggle people.  We need to process
 	// so we can toggle everyone off.
 	virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; }
-	
+
 	// our own public module methods
 
 protected:
 
 	virtual void removeAllInfluence( void );			///< remove any influence we had on all objects we've affected
 	virtual void doScan( void );									///< do a scan
-	virtual void effectLogic( Object *obj, Bool giving, 
+	virtual void effectLogic( Object *obj, Bool giving,
 														const PropagandaTowerBehaviorModuleData *modData);///< give/remove effect on object
 
 	UnsignedInt m_lastScanFrame;									///< last frame we did a scan on
@@ -112,6 +109,3 @@ class PropagandaTowerBehavior : public UpdateModule,
 	const UpgradeTemplate *m_upgradeRequired;			///< Upgrade required to use the upgraded pulse FX
 
 };
-
-#endif  // end __PROPAGANDA_TOWER_BEHAVIOR_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h
index 9a3025e434a..d6eb4714fd1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _QUEUE_PRODUCTION_EXIT_UPDATE_H
-#define _QUEUE_PRODUCTION_EXIT_UPDATE_H
-
 #include "GameLogic/Module/UpdateModule.h"
 #include "Common/INI.h"
 #include "Lib/BaseType.h"
@@ -47,7 +44,7 @@ class QueueProductionExitUpdateModuleData : public UpdateModuleData
 	Coord3D m_naturalRallyPoint;
 	UnsignedInt m_exitDelayData;
 	Bool m_allowAirborneCreationData;
-	UnsignedInt m_initialBurst; 
+	UnsignedInt m_initialBurst;
 
 	QueueProductionExitUpdateModuleData()
 	{
@@ -58,10 +55,10 @@ class QueueProductionExitUpdateModuleData : public UpdateModuleData
 		m_initialBurst = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UnitCreatePoint",				INI::parseCoord3D,							NULL, offsetof( QueueProductionExitUpdateModuleData, m_unitCreatePoint ) },
 			{ "NaturalRallyPoint",			INI::parseCoord3D,							NULL, offsetof( QueueProductionExitUpdateModuleData, m_naturalRallyPoint ) },
@@ -81,7 +78,7 @@ class QueueProductionExitUpdate : public UpdateModule, public ExitInterface
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( QueueProductionExitUpdate, "QueueProductionExitUpdate" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( QueueProductionExitUpdate, QueueProductionExitUpdateModuleData )
 
-public: 
+public:
 
 	virtual ExitInterface* getUpdateExitInterface() { return this; }
 
@@ -110,7 +107,7 @@ class QueueProductionExitUpdate : public UpdateModule, public ExitInterface
 	Real				m_creationClearDistance;		///< I can think of myself as ready when the previous guy is this far away.
 	UnsignedInt m_currentBurstCount;				///< how many times must I still override the delay timer
 
-	Bool isFreeToExit() const; 
+	Bool isFreeToExit() const;
 };
 
 inline void QueueProductionExitUpdate::setRallyPoint( const Coord3D *pos )
@@ -126,5 +123,3 @@ inline const Coord3D *QueueProductionExitUpdate::getRallyPoint( void )  const
 
 	return NULL;
 }
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h
index 1b8b7f92c56..c36d57bf363 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RADARUPDATE_H_
-#define __RADARUPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -44,11 +41,11 @@ class RadarUpdateModuleData : public UpdateModuleData
 
 	RadarUpdateModuleData( void );
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse( p );
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 
 			{ "RadarExtendTime", INI::parseDurationReal, NULL, offsetof( RadarUpdateModuleData, m_radarExtendTime ) },
@@ -88,5 +85,3 @@ class RadarUpdate : public UpdateModule
 	Bool m_radarActive;												 ///< TRUE when radar is actually online and generating radar information.
 
 };
-
-#endif  // end __RADARUPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h
index 2610df236ff..eb5b0c89682 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RADARUPGRADE_H_
-#define __RADARUPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -78,6 +75,3 @@ class RadarUpgrade : public UpgradeModule
 
 
 };
-
-#endif // __RADARUPGRADE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h
index 70deec20106..3d58a6ae6f4 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef __RadiusDecalUpdate_H_
-#define __RadiusDecalUpdate_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameClient/RadiusDecal.h"
@@ -46,10 +43,10 @@ class RadiusDecalUpdateModuleData : public UpdateModuleData
 		//m_deliveryDecalRadius = 0.0f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			//{ "DeliveryDecal",						RadiusDecalTemplate::parseRadiusDecalTemplate,	NULL, offsetof( RadiusDecalUpdateModuleData, m_deliveryDecalTemplate ) },
 			//{ "DeliveryDecalRadius",			INI::parseReal,									NULL,	offsetof( RadiusDecalUpdateModuleData, m_deliveryDecalRadius ) },
@@ -75,7 +72,7 @@ class RadiusDecalUpdate : public UpdateModule
 	//void createRadiusDecal( const Coord3D& pos );
 	void createRadiusDecal( const RadiusDecalTemplate& tmpl, Real radius, const Coord3D& pos );
 	void killWhenNoLongerAttacking(Bool v) { m_killWhenNoLongerAttacking = v; }
-	void killRadiusDecal(); 
+	void killRadiusDecal();
 
 	virtual UpdateSleepTime update( void );
 
@@ -84,6 +81,3 @@ class RadiusDecalUpdate : public UpdateModule
 	RadiusDecal m_deliveryDecal;
 	Bool m_killWhenNoLongerAttacking;
 };
-
-#endif // __RadiusDecalUpdate_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h
index 1db4067a5c1..3f29b21677f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RAILED_TRANSPORT_AI_UPDATE_H_
-#define __RAILED_TRANSPORT_AI_UPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -96,7 +93,3 @@ class RailedTransportAIUpdate : public AIUpdateInterface
 	Bool m_waypointDataLoaded;		///< TRUE once we've searched the map to load m_path
 
 };
-
-
-#endif  // end __RAILED_TRANSPORT_AI_UPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h
index 186b76de6db..4b5357b27f3 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RAILED_TRANSPORT_CONTAIN_H_
-#define __RAILED_TRANSPORT_CONTAIN_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/TransportContain.h"
 
@@ -57,5 +54,3 @@ class RailedTransportContain : public TransportContain
 	virtual Bool isSpecificRiderFreeToExit( Object *obj );
 
 };
-
-#endif  // end __RAILED_TRANSPORT_CONTAIN_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h
index 9d75eb66124..537d0293ba4 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h
@@ -27,8 +27,7 @@
 // Desc:   Railed transport dock update
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifndef __RAILED_TRANSPORT_DOCK_UPDATE_H_
-#define __RAILED_TRANSPORT_DOCK_UPDATE_H_
+#pragma once
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DockUpdate.h"
@@ -44,7 +43,7 @@ class RailedTransportDockUpdateModuleData : public DockUpdateModuleData
 
 	static void buildFieldParse( MultiIniFieldParse &p );
 
-	UnsignedInt m_pullInsideDurationInFrames;		/**< how long it takes to pull object inside 
+	UnsignedInt m_pullInsideDurationInFrames;		/**< how long it takes to pull object inside
 																									 once they're at the dock action point */
 	UnsignedInt m_pushOutsideDurationInFrames;	/**< how long it takes to push object outside
 																									 when we're unloading */
@@ -110,5 +109,3 @@ class RailedTransportDockUpdate : public DockUpdate,
 	Int m_unloadCount;												///< count used to govern unloading 1 or all objects
 
 };
-
-#endif  // end __RAILED_TRANSPORT_DOCK_UPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h
index db14fbfe11d..994a7e67de9 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RAILROADGUIDE_AI_UPDATE_H_
-#define __RAILROADGUIDE_AI_UPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/Module/PhysicsUpdate.h"
@@ -53,7 +50,7 @@ class RailroadBehaviorModuleData : public PhysicsBehaviorModuleData
 	{
 		PhysicsBehaviorModuleData::buildFieldParse( p );
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "PathPrefixName",		INI::parseAsciiString, NULL,	offsetof( RailroadBehaviorModuleData, m_pathPrefixName ) },
 			{ "CrashFXTemplateName",		INI::parseAsciiString, NULL,	offsetof( RailroadBehaviorModuleData, m_CrashFXTemplateName ) },
@@ -77,7 +74,7 @@ class RailroadBehaviorModuleData : public PhysicsBehaviorModuleData
 
 		p.add( dataFieldParse );
 
-	}  // end buildFieldParse
+	}
 
 	TemplateNameList m_carriageTemplateNameData;
 	AsciiString m_pathPrefixName;		///< prefix to use for waypont start and end points we'll look for
@@ -93,13 +90,13 @@ class RailroadBehaviorModuleData : public PhysicsBehaviorModuleData
 	UnsignedInt m_waitAtStationTime;
 	AudioEventRTS			m_runningSound;
 	AudioEventRTS			m_clicketyClackSound;
-	AudioEventRTS				m_bigMetalImpactDefaultSound;		
-	AudioEventRTS				m_smallMetalImpactDefaultSound;	
-	AudioEventRTS				m_meatyImpactDefaultSound;			
-	AudioEventRTS				m_whistleSound;						
+	AudioEventRTS				m_bigMetalImpactDefaultSound;
+	AudioEventRTS				m_smallMetalImpactDefaultSound;
+	AudioEventRTS				m_meatyImpactDefaultSound;
+	AudioEventRTS				m_whistleSound;
 };
 //-------------------------------------------------------------------------------------------------
- 
+
 //-------------------------------------------------------------------------------------------------
 
 
@@ -158,9 +155,9 @@ struct TrainTrack
 	};
 
 
-	void clear( void ) 
-	{ 
-		m_pointList.clear(); 
+	void clear( void )
+	{
+		m_pointList.clear();
 		m_isLooping = FALSE;
 		m_isValid = FALSE;
 		m_refCount = 0;
@@ -171,10 +168,10 @@ struct TrainTrack
 	Bool m_isValid;
 	Real m_length;
 
-	void incReference(); 
-	Bool releaseReference(); 
+	void incReference();
+	Bool releaseReference();
 
-	// To protect the track form ever going out of sync between cars on the same train... 
+	// To protect the track form ever going out of sync between cars on the same train...
 	// I restrict write access to the first referencer, before a second one is added (the locomotive)
 	TrackPointList* getWritablePointList( void ) { return m_refCount == 1 ? &m_pointList : NULL; };
 	const TrackPointList* getPointList( void ) { return &m_pointList; };
@@ -214,8 +211,8 @@ class RailroadBehavior	: public PhysicsBehavior
 	};
 
 	typedef std::vector<AsciiString> TemplateNameVector;
-	typedef TemplateNameVector::const_iterator TemplateNameIterator;;
-	
+	typedef TemplateNameVector::const_iterator TemplateNameIterator;
+
 
 
 	//UpdateModule methods
@@ -226,7 +223,7 @@ class RailroadBehavior	: public PhysicsBehavior
 	virtual Bool isRailroad() const ;
 	virtual UpdateSleepTime update( void );
 
-  
+
 	// TRAINY METHODS
 	void getPulled( PullInfo *info );
 	void destroyTheWholeTrainNow( void );
@@ -274,10 +271,10 @@ class RailroadBehavior	: public PhysicsBehavior
 	AudioEventRTS			m_clicketyClackSound;
 	AudioEventRTS			m_runningSound;
 	AudioHandle				m_runningSoundHandle;
-	
+
 	TrainTrack *m_track;
 
-	Int m_currentPointHandle; 
+	Int m_currentPointHandle;
 	Int m_waitAtStationTimer;
 
 	//Flags
@@ -286,12 +283,12 @@ class RailroadBehavior	: public PhysicsBehavior
 	Bool m_trackDataLoaded; ///< have I TRIED to load track data, yet? I only try once!
 	Bool m_waitingInWings; /// I have not entered the real track yet, so leave me alone
 	Bool m_endOfLine;				/// I have reached the end of a non looping track
-	Bool m_isLocomotive; ///< Am I a locomotive, 
-	Bool m_isLeadCarraige; ///< Am the carraige in front,  
-	Int m_wantsToBeLeadCarraige; ///< Am the carraige in front,  
+	Bool m_isLocomotive; ///< Am I a locomotive,
+	Bool m_isLeadCarraige; ///< Am the carraige in front,
+	Int m_wantsToBeLeadCarraige; ///< Am the carraige in front,
 	Bool m_disembark; ///< If I wait at a station, I should also evacuate everybody when I get theres
-	Bool m_inTunnel; ///< Am I in a tunnel, so I wil not snap to ground height, until the next waypoint, 
-												//  i.e. do I provide the movement and scheduling AI for m_trailerID 
+	Bool m_inTunnel; ///< Am I in a tunnel, so I wil not snap to ground height, until the next waypoint,
+												//  i.e. do I provide the movement and scheduling AI for m_trailerID
 												//  And therefore for his and his and his..........
 
   Bool m_held;   ///< This will prevent a loco from departing a station
@@ -302,7 +299,3 @@ class RailroadBehavior	: public PhysicsBehavior
 
 
 };
-
-
-#endif  // end __RAILROAD_GUIDE_AI_UPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h
index 2e255c083b4..8a37bc1e417 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __REBUILD_HOLE_BEHAVIOR_H_
-#define __REBUILD_HOLE_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -49,7 +46,7 @@ class RebuildHoleBehaviorModuleData : public UpdateModuleData
 	static void buildFieldParse( MultiIniFieldParse &p );
 
 	Real m_workerRespawnDelay;							///< delay in frames from death of object till respawn of worker
-	Real m_holeHealthRegenPercentPerSecond; ///< the hole recovers this % of the max hit points per second 
+	Real m_holeHealthRegenPercentPerSecond; ///< the hole recovers this % of the max hit points per second
 	AsciiString m_workerTemplateName;				///< name of worker object
 
 private:
@@ -67,12 +64,12 @@ class RebuildHoleBehaviorInterface
 	virtual ObjectID getSpawnerID( void ) = 0;
 	virtual ObjectID getReconstructedBuildingID( void ) = 0;
 	virtual const ThingTemplate* getRebuildTemplate() const = 0;
-	
+
 };
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class RebuildHoleBehavior : public UpdateModule, 
+class RebuildHoleBehavior : public UpdateModule,
 														public DieModuleInterface,
 														public RebuildHoleBehaviorInterface
 {
@@ -120,5 +117,3 @@ class RebuildHoleBehavior : public UpdateModule,
 	const ThingTemplate *m_rebuildTemplate;	///< what we are rebuilding
 
 };
-
-#endif  // end __REBUILD_HOLE_BEHAVIOR_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h
index fe5d927add1..eaf5fff785e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __REBUILD_HOLE_EXPOSE_DIE_H_
-#define __REBUILD_HOLE_EXPOSE_DIE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "GameLogic/Module/DieModule.h"
@@ -69,9 +66,6 @@ class RebuildHoleExposeDie : public DieModule
 	RebuildHoleExposeDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-
-#endif  // end __REBUILD_HOLE_EXPOSE_DIE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h
index d1080599ce6..ff8c94e972a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __REPAIRDOCKUPDATE_H_
-#define __REPAIRDOCKUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
 #include "GameLogic/Module/SupplyCenterDockUpdate.h"
@@ -74,7 +71,5 @@ class RepairDockUpdate : public DockUpdate
 
   ObjectID m_lastRepair;			///< object we were repairing last
 	Real m_healthToAddPerFrame;	///< health to add per frame to current docked object
-	
-};
 
-#endif
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h
index 15a001976fe..0cdcb5234f1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _REPLACE_OBJECT_UPGRADE_H
-#define _REPLACE_OBJECT_UPGRADE_H
-
 #include "GameLogic/Module/UpgradeModule.h"
 
 //-----------------------------------------------------------------------------
@@ -64,6 +61,3 @@ class ReplaceObjectUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-#endif // _COMMAND_SET_UPGRADE_H
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h
index 1337a5ea308..7de01424392 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RIDER_CHANGE_CONTAIN_H
-#define __RIDER_CHANGE_CONTAIN_H
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/TransportContain.h"
 
@@ -45,7 +42,7 @@ struct RiderInfo
 {
 	AsciiString m_templateName;
 	WeaponSetType m_weaponSetFlag;
-	ModelConditionFlagType m_modelConditionFlagType; 
+	ModelConditionFlagType m_modelConditionFlagType;
 	ObjectStatusType m_objectStatusType;
 	AsciiString m_commandSet;
 	LocomotorSetType m_locomotorSetType;
@@ -55,7 +52,7 @@ struct RiderInfo
 class RiderChangeContainModuleData : public TransportContainModuleData
 {
 public:
-	
+
 	RiderInfo m_riders[ MAX_RIDERS ];
 	UnsignedInt m_scuttleFrames;
 	ModelConditionFlagType m_scuttleState;
@@ -87,7 +84,7 @@ class RiderChangeContain : public TransportContain
 	virtual UpdateSleepTime update();							///< called once per frame
 
 	virtual Bool isRiderChangeContain() const { return TRUE; }
-	virtual const Object *friend_getRider() const; 
+	virtual const Object *friend_getRider() const;
 
 	virtual Int getContainMax( void ) const;
 
@@ -106,7 +103,7 @@ class RiderChangeContain : public TransportContain
 	virtual void killRidersWhoAreNotFreeToExit();
 	virtual Bool isSpecificRiderFreeToExit(Object* obj);
 	virtual void createPayload();
-	
+
 private:
 
 	Int m_extraSlotsInUse;
@@ -116,6 +113,3 @@ class RiderChangeContain : public TransportContain
 	Bool m_containing; //doesn't require xfer.
 
 };
-
-#endif // __RIDER_CHANGE_CONTAIN_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h
index c08bdaaa251..ee0bd55023d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h
@@ -23,18 +23,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageCommandCenterCrateCollide.h 
+//
+// FILE: SabotageCommandCenterCrateCollide.h
 // Author: Kris Morness, June 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that resets ALL command center general powers
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef SABOTAGE_COMMAND_CENTER_CRATE_COLLIDE_H_
-#define SABOTAGE_COMMAND_CENTER_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -51,11 +48,11 @@ class SabotageCommandCenterCrateCollideModuleData : public CrateCollideModuleDat
 	{
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ 0, 0, 0, 0 }
 		};
@@ -87,5 +84,3 @@ class SabotageCommandCenterCrateCollide : public CrateCollide
 	virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; }
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h
index 9d9d6dccee9..7788a47ccdb 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h
@@ -23,18 +23,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageFakeBuildingCrateCollide.h 
+//
+// FILE: SabotageFakeBuildingCrateCollide.h
 // Author: Kris Morness, July 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that destroys a fake building.
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef SABOTAGE_FAKE_BUILDING_CRATE_COLLIDE_H_
-#define SABOTAGE_FAKE_BUILDING_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -51,11 +48,11 @@ class SabotageFakeBuildingCrateCollideModuleData : public CrateCollideModuleData
 	{
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ 0, 0, 0, 0 }
 		};
@@ -87,5 +84,3 @@ class SabotageFakeBuildingCrateCollide : public CrateCollide
 	virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; }
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h
index 7799ca99b8c..319dc68a3fc 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h
@@ -23,18 +23,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageInternetCenterCrateCollide.h 
+//
+// FILE: SabotageInternetCenterCrateCollide.h
 // Author: Kris Morness, July 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that temporarily disables an internet center
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef SABOTAGE_INTERNET_CENTER_CRATE_COLLIDE_H_
-#define SABOTAGE_INTERNET_CENTER_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -53,11 +50,11 @@ class SabotageInternetCenterCrateCollideModuleData : public CrateCollideModuleDa
 		m_sabotageFrames = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "SabotageDuration", INI::parseDurationUnsignedInt, NULL, offsetof( SabotageInternetCenterCrateCollideModuleData, m_sabotageFrames ) },
 			{ 0, 0, 0, 0 }
@@ -90,5 +87,3 @@ class SabotageInternetCenterCrateCollide : public CrateCollide
 	virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; }
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h
index 3ee28df7f6d..543e001657d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h
@@ -23,18 +23,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageMilitaryFactoryCrateCollide.h 
+//
+// FILE: SabotageMilitaryFactoryCrateCollide.h
 // Author: Kris Morness, June 2003
-// Desc:   A crate (actually a saboteur - mobile crate) that temporarily disables the target factory 
-//	
+// Desc:   A crate (actually a saboteur - mobile crate) that temporarily disables the target factory
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef SABOTAGE_MILITARY_FACTORY_CRATE_COLLIDE_H_
-#define SABOTAGE_MILITARY_FACTORY_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -53,11 +50,11 @@ class SabotageMilitaryFactoryCrateCollideModuleData : public CrateCollideModuleD
 		m_sabotageFrames = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "SabotageDuration", INI::parseDurationUnsignedInt, NULL, offsetof( SabotageMilitaryFactoryCrateCollideModuleData, m_sabotageFrames ) },
 			{ 0, 0, 0, 0 }
@@ -90,5 +87,3 @@ class SabotageMilitaryFactoryCrateCollide : public CrateCollide
 	virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; }
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h
index 114887cac7a..daff6951800 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h
@@ -23,18 +23,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotagePowerPlantCrateCollide.h 
+//
+// FILE: SabotagePowerPlantCrateCollide.h
 // Author: Kris Morness, June 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that makes the target powerplant lose power
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef SABOTAGE_POWER_PLANT_CRATE_COLLIDE_H_
-#define SABOTAGE_POWER_PLANT_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -53,11 +50,11 @@ class SabotagePowerPlantCrateCollideModuleData : public CrateCollideModuleData
 		m_powerSabotageFrames = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "SabotagePowerDuration", INI::parseDurationUnsignedInt, NULL, offsetof( SabotagePowerPlantCrateCollideModuleData, m_powerSabotageFrames ) },
 			{ 0, 0, 0, 0 }
@@ -90,5 +87,3 @@ class SabotagePowerPlantCrateCollide : public CrateCollide
 	virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; }
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h
index 8bc08cacc61..ed26201b133 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h
@@ -23,18 +23,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageSuperweaponCrateCollide.h 
+//
+// FILE: SabotageSuperweaponCrateCollide.h
 // Author: Kris Morness, June 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that resets a target superweapon.
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef SABOTAGE_SUPERWEAPON_CRATE_COLLIDE_H_
-#define SABOTAGE_SUPERWEAPON_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -51,11 +48,11 @@ class SabotageSuperweaponCrateCollideModuleData : public CrateCollideModuleData
 	{
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ 0, 0, 0, 0 }
 		};
@@ -87,5 +84,3 @@ class SabotageSuperweaponCrateCollide : public CrateCollide
 	virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; }
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h
index 61b0bafd746..c3f75fc1e9f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h
@@ -23,18 +23,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageSupplyCenterCrateCollide.h 
+//
+// FILE: SabotageSupplyCenterCrateCollide.h
 // Author: Kris Morness, June 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that makes the target powerplant lose power
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef SABOTAGE_SUPPLY_CENTER_CRATE_COLLIDE_H_
-#define SABOTAGE_SUPPLY_CENTER_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -53,11 +50,11 @@ class SabotageSupplyCenterCrateCollideModuleData : public CrateCollideModuleData
 		m_stealCashAmount = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "StealCashAmount",	INI::parseUnsignedInt, NULL, offsetof( SabotageSupplyCenterCrateCollideModuleData, m_stealCashAmount ) },
 			{ 0, 0, 0, 0 }
@@ -90,5 +87,3 @@ class SabotageSupplyCenterCrateCollide : public CrateCollide
 	virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; }
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h
index 90ee6ddc8da..0bf5d1c2d77 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h
@@ -23,18 +23,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageSupplyDropzoneCrateCollide.h 
+//
+// FILE: SabotageSupplyDropzoneCrateCollide.h
 // Author: Kris Morness, June 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that makes the target powerplant lose power
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef SABOTAGE_SUPPLY_DROPZONE_CRATE_COLLIDE_H_
-#define SABOTAGE_SUPPLY_DROPZONE_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -53,11 +50,11 @@ class SabotageSupplyDropzoneCrateCollideModuleData : public CrateCollideModuleDa
 		m_stealCashAmount = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "StealCashAmount",	INI::parseUnsignedInt, NULL, offsetof( SabotageSupplyDropzoneCrateCollideModuleData, m_stealCashAmount ) },
 			{ 0, 0, 0, 0 }
@@ -90,5 +87,3 @@ class SabotageSupplyDropzoneCrateCollide : public CrateCollide
 	virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; }
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h
index ebb32edb623..5540c678b5c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef SALVAGE_CRATE_COLLIDE_H_
-#define SALVAGE_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "Common/STLTypedefs.h"
@@ -60,11 +57,11 @@ class SalvageCrateCollideModuleData : public CrateCollideModuleData
 		m_maximumMoney = 75;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "WeaponChance",	INI::parsePercentToReal,	NULL, offsetof( SalvageCrateCollideModuleData, m_weaponChance ) },
 			{ "LevelChance",	INI::parsePercentToReal,	NULL, offsetof( SalvageCrateCollideModuleData, m_levelChance ) },
@@ -113,5 +110,3 @@ class SalvageCrateCollide : public CrateCollide
 	void doMoney( Object *other );
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h
index 0aff385d1de..f77074e4066 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef SHROUD_CRATE_COLLIDE_H_
-#define SHROUD_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -56,5 +53,3 @@ class ShroudCrateCollide : public CrateCollide
 	/// This is the game logic execution function that all real CrateCollides will implement
 	virtual Bool executeCrateBehavior( Object *other );
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h
index 054fe41e7ba..2a77c29aeb8 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h
@@ -29,10 +29,8 @@
 //        soldiers that are close to a stinger site. It's important to note that any slaved units
 //				can use any or all features, some of which are specialized.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#pragma once
 
-#ifndef _SLAVED_UPDATE_H_
-#define _SLAVED_UPDATE_H_
+#pragma once
 
 const Int SLAVED_UPDATE_RATE = LOGICFRAMES_PER_SECOND/4; ///< This is a low priority module that only needs to be called every this many frames
 
@@ -56,7 +54,7 @@ class SlavedUpdateModuleData : public UpdateModuleData
 	Int m_scoutRange;				//If master is moving somewhere, I'll scout ahead -- how far am I allowed to go?
 	Int m_scoutWanderRange;	//If I'm at the scout point, how far can I wander from it.
 	Int m_distToTargetToGrantRangeBonus;	//How close I have to be to the master's target in order to grant master a range bonus.
-	
+
 	//Example: Below are used by battle drones
 	Int m_repairRange;
 	Real m_repairMinAltitude;
@@ -67,7 +65,7 @@ class SlavedUpdateModuleData : public UpdateModuleData
 	Int m_minReadyFrames;
 	Int m_maxReadyFrames;
 	Int m_minWeldFrames;
-	Int m_maxWeldFrames; 
+	Int m_maxWeldFrames;
 	AsciiString m_weldingSysName;
 	AsciiString m_weldingFXBone;
 
@@ -93,10 +91,10 @@ class SlavedUpdateModuleData : public UpdateModuleData
 		m_stayOnSameLayerAsMaster = false;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "GuardMaxRange",			INI::parseInt,	NULL, offsetof( SlavedUpdateModuleData, m_guardMaxRange ) },
 			{ "GuardWanderRange",		INI::parseInt,	NULL, offsetof( SlavedUpdateModuleData, m_guardWanderRange ) },
@@ -177,5 +175,3 @@ class SlavedUpdate : public UpdateModule, public SlavedUpdateInterface
 	RepairStates m_repairState;
 	Bool m_repairing;
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
index 8a6ab500a4a..db778297fdc 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SlowDeathBehavior_H_
-#define __SlowDeathBehavior_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -54,11 +51,11 @@ enum SlowDeathPhaseType CPP_11(: Int)
 	SDPHASE_MIDPOINT,
 	SDPHASE_FINAL,
 
-	SD_PHASE_COUNT	// keep last
+	SD_PHASE_COUNT
 };
 
 #ifdef DEFINE_SLOWDEATHPHASE_NAMES
-static const char *TheSlowDeathPhaseNames[] = 
+static const char *const TheSlowDeathPhaseNames[] =
 {
 	"INITIAL",
 	"MIDPOINT",
@@ -66,6 +63,7 @@ static const char *TheSlowDeathPhaseNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheSlowDeathPhaseNames) == SD_PHASE_COUNT + 1, "Incorrect array size");
 #endif
 
 
@@ -90,7 +88,7 @@ class SlowDeathBehaviorModuleData : public UpdateModuleData
 	Real							m_flingPitch;
 	Real							m_flingPitchVariance;
 
-	enum 
+	enum
 	{
 		//flags used by m_maskOfLoadedEffects
 		HAS_FX							= 1,
@@ -102,7 +100,7 @@ class SlowDeathBehaviorModuleData : public UpdateModuleData
 
 	SlowDeathBehaviorModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
-	inline Bool hasNonLodEffects() const
+	Bool hasNonLodEffects() const
 	{
 		return (m_maskOfLoadedEffects & SlowDeathBehaviorModuleData::HAS_NON_LOD_EFFECTS) != 0;
 	}
@@ -123,7 +121,7 @@ class SlowDeathBehaviorInterface
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class SlowDeathBehavior : public UpdateModule, 
+class SlowDeathBehavior : public UpdateModule,
 													public DieModuleInterface,
 													public SlowDeathBehaviorInterface
 {
@@ -142,7 +140,7 @@ class SlowDeathBehavior : public UpdateModule,
 	virtual DieModuleInterface* getDie() { return this; }
 
 	// UpdateModuleInterface
-	virtual UpdateSleepTime update();	
+	virtual UpdateSleepTime update();
 	virtual SlowDeathBehaviorInterface* getSlowDeathBehaviorInterface() { return this; }
 	// Disabled conditions to process -- all
 	virtual DisabledMaskType getDisabledTypesToProcess() const { return DISABLEDMASK_ALL; }
@@ -158,11 +156,11 @@ class SlowDeathBehavior : public UpdateModule,
 protected:
 
 	void doPhaseStuff(SlowDeathPhaseType sdphase);
-	inline Bool isSlowDeathActivated() const { return (m_flags & (1<<SLOW_DEATH_ACTIVATED)) != 0; }
-	inline UnsignedInt getDestructionFrame() const { return m_destructionFrame; }
+	Bool isSlowDeathActivated() const { return (m_flags & (1<<SLOW_DEATH_ACTIVATED)) != 0; }
+	UnsignedInt getDestructionFrame() const { return m_destructionFrame; }
 
 private:
-	
+
 	enum
 	{
 		SLOW_DEATH_ACTIVATED,
@@ -173,10 +171,7 @@ class SlowDeathBehavior : public UpdateModule,
 
 	UnsignedInt m_sinkFrame;							///< Frame to be sunken into the ground on
 	UnsignedInt m_midpointFrame;					///< The midpoint is between .25 through life and .75 through life (eg)
-	UnsignedInt m_destructionFrame;	
+	UnsignedInt m_destructionFrame;
 	Real				m_acceleratedTimeScale;		///<used to speedup deaths when needed to improve game performance.
 	UnsignedInt	m_flags;
 };
-
-#endif // __SlowDeathBehavior_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SmartBombTargetHomingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SmartBombTargetHomingUpdate.h
index 6cbdebe9794..4f27ad1a9ab 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SmartBombTargetHomingUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SmartBombTargetHomingUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SMARTBOMB_UPDATE_H_
-#define __SMARTBOMB_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -46,10 +43,10 @@ class SmartBombTargetHomingUpdateModuleData : public UpdateModuleData
 		m_courseCorrectionScalar = 0.99f;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "CourseCorrectionScalar",	INI::parseReal,		NULL, offsetof( SmartBombTargetHomingUpdateModuleData, m_courseCorrectionScalar ) },
 			{ 0, 0, 0, 0 }
@@ -83,6 +80,3 @@ class SmartBombTargetHomingUpdate : public UpdateModule
 
 
 };
-
-#endif // __SMARTBOMB_UPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
index 835107b6c75..748355ff15e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _SPAWN_BEHAVIOR_H_
-#define _SPAWN_BEHAVIOR_H_
-
 const Int SPAWN_UPDATE_RATE = LOGICFRAMES_PER_SECOND/2; ///< This is a low priority module that only needs to be called every this many frames
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
@@ -63,43 +60,40 @@ class SpawnBehaviorModuleData : public BehaviorModuleData
 	DamageTypeFlags m_damageTypesToPropagateToSlaves;
 	std::vector<AsciiString> m_spawnTemplateNameData;
 	DieMuxData m_dieMuxData;
-	
+
 	SpawnBehaviorModuleData()
 	{
 		m_spawnNumberData = 0;
 		m_spawnReplaceDelayData = 0;
-		//Added By Sadullah Nader
-		//Initialization(s) inserted
 		m_spawnStartNumberData = 0;
-		//
 		m_initialBurst = 0;
 		m_isOneShotData = FALSE;
 		m_canReclaimOrphans = FALSE;
-		m_aggregateHealth = FALSE;	
+		m_aggregateHealth = FALSE;
 		m_exitByBudding = FALSE;
 		m_spawnTemplateNameData.clear();
 		m_spawnedRequireSpawner = FALSE;
 		m_slavesHaveFreeWill = FALSE;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     BehaviorModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "SpawnNumber",							INI::parseInt,										NULL, offsetof( SpawnBehaviorModuleData, m_spawnNumberData ) },
 			{ "SpawnReplaceDelay",				INI::parseDurationUnsignedInt,		NULL, offsetof( SpawnBehaviorModuleData, m_spawnReplaceDelayData ) },
 			{ "OneShot",									INI::parseBool,										NULL, offsetof( SpawnBehaviorModuleData, m_isOneShotData ) },
 			{ "CanReclaimOrphans",				INI::parseBool,										NULL,	offsetof( SpawnBehaviorModuleData, m_canReclaimOrphans ) },
-			{ "AggregateHealth",  				INI::parseBool,										NULL, offsetof( SpawnBehaviorModuleData, m_aggregateHealth ) },		
-			{ "ExitByBudding",    				INI::parseBool,										NULL, offsetof( SpawnBehaviorModuleData, m_exitByBudding ) },		
+			{ "AggregateHealth",  				INI::parseBool,										NULL, offsetof( SpawnBehaviorModuleData, m_aggregateHealth ) },
+			{ "ExitByBudding",    				INI::parseBool,										NULL, offsetof( SpawnBehaviorModuleData, m_exitByBudding ) },
 			{ "SpawnTemplateName",				INI::parseAsciiStringVectorAppend,NULL, offsetof( SpawnBehaviorModuleData, m_spawnTemplateNameData ) },
 			{ "SpawnedRequireSpawner",		INI::parseBool,										NULL,	offsetof( SpawnBehaviorModuleData, m_spawnedRequireSpawner ) },
 			{ "PropagateDamageTypesToSlavesWhenExisting",   INI::parseDamageTypeFlags, NULL, offsetof( SpawnBehaviorModuleData, m_damageTypesToPropagateToSlaves ) },
-			{ "InitialBurst",				      INI::parseInt,						        NULL, offsetof( SpawnBehaviorModuleData, m_initialBurst ) },			
+			{ "InitialBurst",				      INI::parseInt,						        NULL, offsetof( SpawnBehaviorModuleData, m_initialBurst ) },
 			{ "SlavesHaveFreeWill",				INI::parseBool,										NULL, offsetof( SpawnBehaviorModuleData, m_slavesHaveFreeWill ) },
 			{ 0, 0, 0, 0 }
-			
+
 		};
     p.add(dataFieldParse);
 		p.add(DieMuxData::getFieldParse(), offsetof( SpawnBehaviorModuleData, m_dieMuxData ));
@@ -163,8 +157,8 @@ class SpawnBehavior : public UpdateModule,
 	// damage methods
 	virtual void onDamage( DamageInfo *damageInfo );
 	virtual void onHealing( DamageInfo *damageInfo ) { }
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState) { }
 
 	// SpawnBehaviorInterface methods
@@ -213,7 +207,7 @@ class SpawnBehavior : public UpdateModule,
 	intList m_replacementTimes;			///< A list of frame times that I need to create new spawns
 	objectIDList m_spawnIDs;				///< My darling little spawns.  I need to keep track of them explicitly for the Slave type stuff
 	Bool m_active;									///< Am I currently turned on
-	
+
 
 	Object *reclaimOrphanSpawn( void );		///< find existing orphaned spawn object if present
 
@@ -227,5 +221,3 @@ class SpawnBehavior : public UpdateModule,
 	std::vector<AsciiString>::const_iterator m_templateNameIterator;
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h
index f7a1d6d70d1..8622540f497 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _SPAWN_POINT_PRODUCTION_EXIT_UPDATE_H
-#define _SPAWN_POINT_PRODUCTION_EXIT_UPDATE_H
-
 #include "GameLogic/Module/UpdateModule.h"
 #include "Common/INI.h"
 #include "Lib/BaseType.h"
@@ -50,10 +47,10 @@ class SpawnPointProductionExitUpdateModuleData : public UpdateModuleData
 public:
 	AsciiString m_spawnPointBoneNameData;
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "SpawnPointBoneName",		INI::parseAsciiString,		NULL, offsetof( SpawnPointProductionExitUpdateModuleData, m_spawnPointBoneNameData ) },
 			{ 0, 0, 0, 0 }
@@ -100,5 +97,3 @@ class SpawnPointProductionExitUpdate : public UpdateModule, public ExitInterface
 	void initializeBonePositions();	///< Look up the bone positions and store them in world space coords
 	void revalidateOccupiers();			///< Do a lookup on all our ID's and clear the dead ones.
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h
index 17a73f37f16..cd5abc5cd88 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h
@@ -24,15 +24,12 @@
 
 // FILE: Special Ability.h ///////////////////////////////////////////////////////////////
 // Author: Kris Morness, July 2002
-// Desc:   This is the class that handles processing of any special attack from a unit. There are 
+// Desc:   This is the class that handles processing of any special attack from a unit. There are
 //         many different styles and rules for various attacks.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __SPECIAL_ABILITY_H_
-#define __SPECIAL_ABILITY_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/SpecialPowerModule.h"
 
@@ -65,5 +62,3 @@ class SpecialAbility : public SpecialPowerModule
 protected:
 
 };
-
-#endif  // end __SPECIAL_ABILITY_H_
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h
index 2ef252b7279..bee145e9aa6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h
@@ -29,14 +29,11 @@
 
 #pragma once
 
-#ifndef __SPECIAL_ABILITY_UPDATE_H
-#define __SPECIAL_ABILITY_UPDATE_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/INI.h"
 #include "GameLogic/Module/SpecialPowerUpdateModule.h"
-#include "GameClient/ParticleSys.h"	
+#include "GameClient/ParticleSys.h"
 
 class DamageInfo;
 class SpecialPowerTemplate;
@@ -118,11 +115,11 @@ class SpecialAbilityUpdateModuleData : public UpdateModuleData
     m_persistenceRequiresRecharge = FALSE;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			//Primary data values
 			{ "SpecialPowerTemplate",				INI::parseSpecialPowerTemplate,		NULL, offsetof( SpecialAbilityUpdateModuleData, m_specialPowerTemplate ) },
@@ -135,7 +132,7 @@ class SpecialAbilityUpdateModuleData : public UpdateModuleData
 			{ "PreTriggerUnstealthTime",	  INI::parseDurationUnsignedInt,		NULL, offsetof( SpecialAbilityUpdateModuleData, m_preTriggerUnstealthFrames ) },
 			{ "SkipPackingWithNoTarget",		INI::parseBool,										NULL, offsetof( SpecialAbilityUpdateModuleData, m_skipPackingWithNoTarget ) },
 			{ "PackUnpackVariationFactor",	INI::parseReal,										NULL, offsetof( SpecialAbilityUpdateModuleData, m_packUnpackVariationFactor ) },
- 
+
 			//Secondary data values
 			{ "SpecialObject",							INI::parseAsciiString,						NULL, offsetof( SpecialAbilityUpdateModuleData, m_specialObjectName ) },
 			{ "SpecialObjectAttachToBone",	INI::parseAsciiString,						NULL, offsetof( SpecialAbilityUpdateModuleData, m_specialObjectAttachToBoneName ) },
@@ -195,7 +192,7 @@ class SpecialAbilityUpdate : public SpecialPowerUpdateModule
 	// UpdateModule
 	virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; }
 	virtual CommandOption getCommandOption() const { return (CommandOption)0; }
-	virtual UpdateSleepTime update();	
+	virtual UpdateSleepTime update();
 
 	// ??? ugh, public stuff that shouldn't be -- hell yeah!
 	UnsignedInt getSpecialObjectCount() const;
@@ -261,13 +258,13 @@ class SpecialAbilityUpdate : public SpecialPowerUpdateModule
 
 	enum PackingState
 	{
-		STATE_NONE, 
-		STATE_PACKING, 
+		STATE_NONE,
+		STATE_PACKING,
 		STATE_UNPACKING,
-		STATE_PACKED,		
-		STATE_UNPACKED,	
+		STATE_PACKED,
+		STATE_UNPACKED,
 	};
-	
+
 	AudioEventRTS									m_prepSoundLoop;
 	UnsignedInt										m_prepFrames;
 	UnsignedInt										m_animFrames;	//Used for packing/unpacking unit before or after using ability.
@@ -285,5 +282,3 @@ class SpecialAbilityUpdate : public SpecialPowerUpdateModule
 	Bool													m_withinStartAbilityRange;
 	Bool													m_doDisableFXParticles;      // smaller targets cause this flag to toggle, making the particle effect more sparse
 };
-
-#endif // _SPECIAL_POWER_UPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h
index f2c2b70aba0..fef438647a4 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SPECIAL_POWER_COMPLETION_DIE_H_
-#define _SPECIAL_POWER_COMPLETION_DIE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "GameLogic/Module/DieModule.h"
@@ -49,11 +46,11 @@ class SpecialPowerCompletionDieModuleData : public DieModuleData
 		m_specialPowerTemplate = NULL;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     DieModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "SpecialPowerTemplate", INI::parseSpecialPowerTemplate,	NULL, offsetof( SpecialPowerCompletionDieModuleData, m_specialPowerTemplate ) },
 			{ 0, 0, 0, 0 }
@@ -80,7 +77,7 @@ class SpecialPowerCompletionDie : public DieModule
 	void setCreator( ObjectID creatorID );
 	void notifyScriptEngine( void );
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 protected:
 
@@ -89,6 +86,4 @@ class SpecialPowerCompletionDie : public DieModule
 
 };
 
-#endif // _SPECIAL_POWER_COMPLETION_DIE_H_
-
-// Creator is stored as ID, so a failed lookup just means that he died first and noone cares that we are going.
\ No newline at end of file
+// Creator is stored as ID, so a failed lookup just means that he died first and noone cares that we are going.
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h
index 90c0a213925..c8d13c20e25 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SPECIAL_POWER_CREATE_H_
-#define _SPECIAL_POWER_CREATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CreateModule.h"
 
@@ -57,5 +54,3 @@ class SpecialPowerCreate : public CreateModule
 protected:
 
 };
-
-#endif // _SPECIAL_POWER_CREATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h
index 6e930681a9b..8669842463a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SPECIALPOWERMODULE_H_
-#define __SPECIALPOWERMODULE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/Module.h"
@@ -67,7 +64,7 @@ class SpecialPowerModuleInterface
 	virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ) = 0;
 	virtual void doSpecialPowerUsingWaypoints( const Waypoint *way, UnsignedInt commandOptions ) = 0;
 	virtual void markSpecialPowerTriggered( const Coord3D *location ) = 0;
-	virtual void startPowerRecharge() = 0;	
+	virtual void startPowerRecharge() = 0;
 	virtual const AudioEventRTS& getInitiateSound() const = 0;
 	virtual Bool isScriptOnly() const = 0;
 
@@ -94,7 +91,7 @@ class SpecialPowerModuleData : public BehaviorModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class SpecialPowerModule : public BehaviorModule, 
+class SpecialPowerModule : public BehaviorModule,
 													 public SpecialPowerModuleInterface
 {
 
@@ -113,7 +110,7 @@ class SpecialPowerModule : public BehaviorModule,
 	Bool isModuleForPower( const SpecialPowerTemplate *specialPowerTemplate ) const;	///< is this module for the specified special power
 	Bool isReady( void ) const; 						///< is this special power available now
 //  This is the althernate way to one-at-a-time BlackLotus' specials; we'll keep it commented her until Dustin decides, or until 12/10/02
-//	Bool isBusy( void ) const { return FALSE; } 
+//	Bool isBusy( void ) const { return FALSE; }
 
 	Real getPercentReady( void ) const;		///< get the percent ready (1.0 = ready now, 0.5 = half charged up etc.)
 
@@ -144,13 +141,13 @@ class SpecialPowerModule : public BehaviorModule,
 
 	/**
 	 Now, there are special powers that require some preliminary processing before the actual
-	 special power triggers. When the ini setting "UpdateModuleStartsAttack" is true, then 
-	 the update module will call the doSpecialPower a second time. This function then resets 
+	 special power triggers. When the ini setting "UpdateModuleStartsAttack" is true, then
+	 the update module will call the doSpecialPower a second time. This function then resets
 	 the power recharge, and tells the scriptengine that the attack has started.
-	 
-	 A good example of something that uses this is the Black Lotus - capture building hack attack. 
-	 When the user initiates the attack, the doSpecialPower is called, which triggers the update 
-	 module. The update module then orders the unit to move within range, and it isn't until the 
+
+	 A good example of something that uses this is the Black Lotus - capture building hack attack.
+	 When the user initiates the attack, the doSpecialPower is called, which triggers the update
+	 module. The update module then orders the unit to move within range, and it isn't until the
 	 hacker start the physical attack, that the timer is reset and the attack technically begins.
 	*/
 	virtual void markSpecialPowerTriggered( const Coord3D *location );
@@ -179,6 +176,3 @@ class SpecialPowerModule : public BehaviorModule,
 	Real m_pausedPercent;
 
 };
-
-#endif  // end __SPECIALPOWERMODULE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h
index f129933cd74..01d4aed5643 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SPECIAL_POWER_UPDATE_MODULE_H
-#define __SPECIAL_POWER_UPDATE_MODULE_H
-
 #include "Common/Module.h"
 #include "Common/GameType.h"
 
@@ -81,5 +78,3 @@ class SpecialPowerUpdateModule : public UpdateModule, public SpecialPowerUpdateI
 	virtual Bool isPowerCurrentlyInUse( const CommandButton *command = NULL ) const = 0;
 
 };
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h
index 93bd0375d71..ee44fd479d9 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SPECTRE_GUNSHIP_DEPLOYMENT_UPDATE_H_
-#define __SPECTRE_GUNSHIP_DEPLOYMENT_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/SpecialPowerUpdateModule.h"
@@ -55,6 +52,8 @@ enum GunshipCreateLocType CPP_11(: Int)
   CREATE_GUNSHIP_AT_EDGE_FARTHEST_FROM_SOURCE,
 	CREATE_GUNSHIP_AT_EDGE_NEAR_TARGET,
 	CREATE_GUNSHIP_AT_EDGE_FARTHEST_FROM_TARGET,
+
+	GUNSHIP_CREATE_LOC_COUNT
 };
 
 
@@ -84,7 +83,7 @@ class SpectreGunshipDeploymentUpdateModuleData : public ModuleData
 	SpectreGunshipDeploymentUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -145,7 +144,3 @@ class SpectreGunshipDeploymentUpdate : public SpecialPowerUpdateModule
 
 
 };
-
-
-#endif // __SPECTRE_GUNSHIP_DEPLOYMENT_UPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h
index 18ece532046..c494e4b1a58 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SPECTRE_GUNSHIP_UPDATE_H_
-#define __SPECTRE_GUNSHIP_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
 #include "GameLogic/Module/SpecialPowerUpdateModule.h"
@@ -44,7 +41,7 @@ class AudioEventRTS;
 enum ParticleSystemID CPP_11(: Int);
 
 //#define MAX_OUTER_NODES 16
-//#define TRACKERS 
+//#define TRACKERS
 
 //#define PUCK
 
@@ -75,7 +72,7 @@ class SpectreGunshipUpdateModuleData : public ModuleData
 	SpectreGunshipUpdateModuleData();
 	static void buildFieldParse(MultiIniFieldParse& p);
 
-private: 
+private:
 
 };
 
@@ -136,7 +133,7 @@ class SpectreGunshipUpdate : public SpecialPowerUpdateModule
 
   void friend_enableAfterburners(Bool v);
 
-  
+
 
 
   Coord3D				m_initialTargetPosition;
@@ -166,11 +163,7 @@ class SpectreGunshipUpdate : public SpecialPowerUpdateModule
   RadiusDecal			m_howitzerTrackerDecal;
 #endif
 
-  AudioEventRTS m_afterburnerSound; 
+  AudioEventRTS m_afterburnerSound;
   AudioEventRTS m_howitzerFireSound;
 
 };
-
-
-#endif // __SPECTRE_GUNSHIP_UPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h
index 242e4277252..0238e90e531 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SPY_VISION_SPECIAL_POWER_H_
-#define __SPY_VISION_SPECIAL_POWER_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/SpecialPowerModule.h"
 
@@ -73,5 +70,3 @@ class SpyVisionSpecialPower : public SpecialPowerModule
 protected:
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h
index badec77a263..6410014f217 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h
@@ -24,16 +24,13 @@
 
 // FILE: SpyVisionUpdate.h /////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, September 2002
-// Desc:   Special Power will spy on the vision of all enemy players.  
+// Desc:   Special Power will spy on the vision of all enemy players.
 //				Putting a SpecialPower in a behavior takes a big huge amount of code duplication and
 //				has no precedent.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef _SPY_VISION_UPDATE_H
-#define _SPY_VISION_UPDATE_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameLogic/Module/UpgradeModule.h"
@@ -62,9 +59,9 @@ class SpyVisionUpdateModuleData : public UpdateModuleData
 		m_spyOnKindof.flip();
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "NeedsUpgrade",					INI::parseBool,									NULL, offsetof( SpyVisionUpdateModuleData, m_needsUpgrade ) },
 			{ "SelfPowered",					INI::parseBool,									NULL, offsetof( SpyVisionUpdateModuleData, m_selfPowered ) },
@@ -134,7 +131,7 @@ class SpyVisionUpdate : public UpdateModule, public UpgradeMux
 	{
 		return getSpyVisionUpdateModuleData()->m_upgradeMuxData.m_requiresAllTriggers;
 	}
-	inline Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
+	Bool isUpgradeActive() const { return isAlreadyUpgraded(); }
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 private:
@@ -146,6 +143,3 @@ class SpyVisionUpdate : public UpdateModule, public UpgradeMux
 	Bool m_currentlyActive;
 	Bool m_resetTimersNextUpdate;
 };
-
-#endif 
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h
index 93ff0a989a3..598bd98db1b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SquishCollide_H_
-#define __SquishCollide_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CollideModule.h"
 
@@ -58,6 +55,3 @@ class SquishCollide : public CollideModule
 protected:
 
 };
-
-#endif // __SquishCollide_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h
index 79e5fca530c..c195a74f2e1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h
@@ -24,12 +24,12 @@
 
 // FILE: StatusBitsUpgrade.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	May 2002
@@ -37,17 +37,14 @@
 //	Filename: 	StatusBitsUpgrade.h
 //
 //	author:		Steven Johnson
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __StatusBitsUpgrade_H_
-#define __StatusBitsUpgrade_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -106,7 +103,3 @@ class StatusBitsUpgrade : public UpgradeModule
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __StatusBitsUpgrade_H_
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h
index cbe05fa0e63..c5add818822 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __StatusDamageHelper_H_
-#define __StatusDamageHelper_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ObjectHelper.h"
 
@@ -48,7 +45,7 @@ class StatusDamageHelper : public ObjectHelper
 {
 
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( StatusDamageHelper, StatusDamageHelperModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(StatusDamageHelper, "StatusDamageHelper" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(StatusDamageHelper, "StatusDamageHelper" )
 
 public:
 
@@ -65,6 +62,3 @@ class StatusDamageHelper : public ObjectHelper
 	UnsignedInt m_frameToHeal;
 	void clearStatusCondition();
 };
-
-
-#endif  // end __StatusDamageHelper_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h
index cb63b758847..6eab70e630a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __STEALTHDETECTOR_UPDATE_H_
-#define __STEALTHDETECTOR_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -97,7 +94,3 @@ class StealthDetectorUpdate : public UpdateModule
 	Bool m_enabled;
 
 };
-
-
-#endif	// __STEALTHDETECTOR_UPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
index 351e2b01413..11b44712951 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __STEALTH_UPDATE_H_
-#define __STEALTH_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -51,12 +48,13 @@ enum
 	STEALTH_NOT_WHILE_FIRING_TERTIARY		= 0x00000020,
 	STEALTH_ONLY_WITH_BLACK_MARKET			= 0x00000040,
 	STEALTH_NOT_WHILE_TAKING_DAMAGE			= 0x00000080,
-	STEALTH_NOT_WHILE_FIRING_WEAPON			= (STEALTH_NOT_WHILE_FIRING_PRIMARY | STEALTH_NOT_WHILE_FIRING_SECONDARY | STEALTH_NOT_WHILE_FIRING_TERTIARY),
   STEALTH_NOT_WHILE_RIDERS_ATTACKING  = 0x00000100,
+
+	STEALTH_NOT_WHILE_FIRING_WEAPON			= (STEALTH_NOT_WHILE_FIRING_PRIMARY | STEALTH_NOT_WHILE_FIRING_SECONDARY | STEALTH_NOT_WHILE_FIRING_TERTIARY),
 };
 
 #ifdef DEFINE_STEALTHLEVEL_NAMES
-static const char *TheStealthLevelNames[] = 
+static const char *const TheStealthLevelNames[] =
 {
 	"ATTACKING",
 	"MOVING",
@@ -144,7 +142,7 @@ class StealthUpdate : public UpdateModule
 
   Bool isGrantedBySpecialPower( void ) { return getStealthUpdateModuleData()->m_grantedBySpecialPower; }
 	Bool isTemporaryGrant() { return m_framesGranted > 0; }
-  
+
 protected:
 
 	StealthLookType calcStealthedStatusForPlayer(const Object* obj, const Player* player);
@@ -161,7 +159,7 @@ class StealthUpdate : public UpdateModule
 	UnsignedInt						m_detectionExpiresFrame;
 	mutable UnsignedInt		m_nextBlackMarketCheckFrame;
 	Bool									m_enabled;
-	
+
 	Real                  m_pulsePhaseRate;
 	Real                  m_pulsePhase;
 
@@ -179,7 +177,3 @@ class StealthUpdate : public UpdateModule
 	WeaponSetType					m_requiresWeaponSetType;
 
 };
-
-
-#endif 
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h
index 9142c9b2e1c..511dfb38a95 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __STEALTH_UPGRADE_H_
-#define __STEALTH_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -57,7 +54,3 @@ class StealthUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h
index e9bfa21941c..5d1c16d07f6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __STICK_BOMB_UPDATE_H
-#define __STICK_BOMB_UPDATE_H
-
 #include "GameLogic/Module/UpdateModule.h"
 
 class WeaponTemplate;
@@ -54,10 +51,10 @@ class StickyBombUpdateModuleData : public UpdateModuleData
 		m_geometryBasedDamageFX = NULL;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "AttachToTargetBone",				INI::parseAsciiString,		NULL, offsetof( StickyBombUpdateModuleData, m_attachToBone ) },
 			{ "OffsetZ",									INI::parseReal,						NULL, offsetof( StickyBombUpdateModuleData, m_offsetZ ) },
@@ -98,6 +95,3 @@ class StickyBombUpdate : public UpdateModule
 	UnsignedInt		m_dieFrame;
 	UnsignedInt   m_nextPingFrame;
 };
-
-#endif // __STICK_BOMB_UPDATE_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h
index 28c772f09c4..ebe9235daa3 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __STRUCTUREBODY_H_
-#define __STRUCTUREBODY_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ActiveBody.h"
 
@@ -40,16 +37,16 @@
 class Object;
 
 //-------------------------------------------------------------------------------------------------
-class StructureBodyModuleData : public ActiveBodyModuleData 
+class StructureBodyModuleData : public ActiveBodyModuleData
 {
 public:
 
-	StructureBodyModuleData(){}	
+	StructureBodyModuleData(){}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     ActiveBodyModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ 0, 0, 0, 0 }
 		};
@@ -79,6 +76,3 @@ class StructureBody : public ActiveBody
 	ObjectID m_constructorObjectID;					///< object that built this structure
 
 };
-
-#endif // __STRUCTUREBODY_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h
index 03b456501bf..aecbb73b414 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __StructureCollapseUpdate_H_
-#define __StructureCollapseUpdate_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DieModule.h"
@@ -53,7 +50,7 @@ enum StructureCollapsePhaseType CPP_11(: Int)
 	SCPHASE_BURST,
 	SCPHASE_FINAL,
 
-	SC_PHASE_COUNT	// keep last
+	SC_PHASE_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -78,9 +75,6 @@ class StructureCollapseUpdateModuleData : public UpdateModuleData
 		m_minCollapseDelay = 0;
 		m_maxCollapseDelay = 0;
 		m_minBurstDelay = 9999;
-		//Removed by Sadullah Nader
-		//Redundancy from above
-		//m_minBurstDelay = 9999;
 		m_maxShudder = 0;
 		m_collapseDamping = 0.0;
 		m_bigBurstFrequency = 0;
@@ -134,14 +128,14 @@ class StructureCollapseUpdate : public UpdateModule,
 
 	void doPhaseStuff(StructureCollapsePhaseType scphase, const Coord3D *target);
 
-	enum StructureCollapseStateType 
+	enum StructureCollapseStateType
 	{
 		COLLAPSESTATE_STANDING,
 		COLLAPSESTATE_WAITINGFORCOLLAPSESTART,
 		COLLAPSESTATE_COLLAPSING,
 		COLLAPSESTATE_DONE
 	};
-	
+
 	UnsignedInt									m_collapseFrame;
 	UnsignedInt									m_burstFrame;
 	StructureCollapseStateType	m_collapseState;
@@ -149,6 +143,3 @@ class StructureCollapseUpdate : public UpdateModule,
 	Real												m_currentHeight;
 
 };
-
-#endif // __StructureCollapseUpdate_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
index 2b32ceed6da..9e8931794df 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __StructureToppleUpdate_H_
-#define __StructureToppleUpdate_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -46,7 +43,7 @@ class ObjectCreationList;
 typedef std::vector<const ObjectCreationList*> OCLVec;
 
 //-------------------------------------------------------------------------------------------------
-struct FXBoneInfo 
+struct FXBoneInfo
 {
 	AsciiString boneName;
 	const ParticleSystemTemplate* particleSystemTemplate;
@@ -70,10 +67,10 @@ enum StructureTopplePhaseType CPP_11(: Int)
 	STPHASE_DELAY,
 	STPHASE_FINAL,
 
-	ST_PHASE_COUNT	// keep last
+	ST_PHASE_COUNT
 };
 
-static const char *TheStructureTopplePhaseNames[] = 
+static const char *const TheStructureTopplePhaseNames[] =
 {
 	"INITIAL",
 	"DELAY",
@@ -81,6 +78,7 @@ static const char *TheStructureTopplePhaseNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheStructureTopplePhaseNames) == ST_PHASE_COUNT + 1, "Incorrect array size");
 
 //-------------------------------------------------------------------------------------------------
 class StructureToppleUpdateModuleData : public UpdateModuleData
@@ -121,7 +119,6 @@ class StructureToppleUpdateModuleData : public UpdateModuleData
 		m_toppleDoneFXList = NULL;
 		m_toppleFXList = NULL;
 		m_crushingFXList = NULL;
-		m_crushingWeaponName.set("");
 
 		for (int i = 0; i < ST_PHASE_COUNT; ++i)
 		{
@@ -183,7 +180,7 @@ class StructureToppleUpdate : public UpdateModule,
 		TOPPLESTATE_WAITINGFORDONE,
 		TOPPLESTATE_DONE
 	};
-	
+
 	UnsignedInt m_toppleFrame;
 	Coord2D m_toppleDirection;
 	StructureToppleStateType m_toppleState;
@@ -196,6 +193,3 @@ class StructureToppleUpdate : public UpdateModule,
 	Real m_buildingHeight;
 
 };
-
-#endif // __StructureToppleUpdate_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h
index 0b78ee53aa9..db1460646a2 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h
@@ -24,12 +24,12 @@
 
 // FILE: SubObjectsUpgrade.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	September 2002
@@ -37,7 +37,7 @@
 //	Filename: SubObjectsUpgrade.cpp
 //
 //	Author:		Kris Morness
-//	
+//
 //	Purpose:	Shows or hides a list of subobjects based on upgrade statii. It
 //            will override any animation subobjects states.
 //
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __SUB_OBJECTS_UPGRADE_H
-#define __SUB_OBJECTS_UPGRADE_H
-
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -88,7 +85,3 @@ class SubObjectsUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return true; }
 
 };
-
-#endif
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h
index 826b077c4b7..46e45c24999 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SubdualDamageHelper_H_
-#define __SubdualDamageHelper_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ObjectHelper.h"
 
@@ -48,7 +45,7 @@ class SubdualDamageHelper : public ObjectHelper
 {
 
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( SubdualDamageHelper, SubdualDamageHelperModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SubdualDamageHelper, "SubdualDamageHelper" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SubdualDamageHelper, "SubdualDamageHelper" )
 
 public:
 
@@ -63,6 +60,3 @@ class SubdualDamageHelper : public ObjectHelper
 protected:
 	UnsignedInt m_healingStepCountdown;
 };
-
-
-#endif  // end __SubdualDamageHelper_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h
index c04601b2d87..e4c739bce4c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_CENTER_CREATE_H_
-#define _SUPPLY_CENTER_CREATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CreateModule.h"
 
@@ -57,5 +54,3 @@ class SupplyCenterCreate : public CreateModule
 protected:
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h
index 4f39179b138..e6d0d2d2825 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_CENTER_DOCK_UPDATE_H_
-#define _SUPPLY_CENTER_DOCK_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "Common/GameMemory.h"
@@ -69,5 +66,3 @@ class SupplyCenterDockUpdate : public DockUpdate
 
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h
index 7c9e6bc4d85..f528eca261f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_CENTER_PRODUCTION_EXIT_UPDATE_H
-#define _SUPPLY_CENTER_PRODUCTION_EXIT_UPDATE_H
-
 #include "GameLogic/Module/UpdateModule.h"
 
 class Object;
@@ -51,10 +48,10 @@ class SupplyCenterProductionExitUpdateModuleData : public UpdateModuleData
 		m_naturalRallyPoint.zero();
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     UpdateModuleData::buildFieldParse(p);
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UnitCreatePoint",		INI::parseCoord3D,		NULL, offsetof( SupplyCenterProductionExitUpdateModuleData, m_unitCreatePoint ) },
 			{ "NaturalRallyPoint",  INI::parseCoord3D,		NULL, offsetof( SupplyCenterProductionExitUpdateModuleData, m_naturalRallyPoint ) },
@@ -114,6 +111,3 @@ inline const Coord3D *SupplyCenterProductionExitUpdate::getRallyPoint( void ) co
 
 	return NULL;
 }
-
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h
index 7e088a049f9..bc1af1eefcc 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_TRUCK_AI_UPDATE_H_
-#define _SUPPLY_TRUCK_AI_UPDATE_H_
-
 #include "Common/StateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
 
@@ -61,7 +58,7 @@ class SupplyTruckStateMachine : public StateMachine
 //-------------------------------------------------------------------------------------------------
 class SupplyTruckWantsToPickUpOrDeliverBoxesState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckWantsToPickUpOrDeliverBoxesState, "SupplyTruckWantsToPickUpOrDeliverBoxesState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckWantsToPickUpOrDeliverBoxesState, "SupplyTruckWantsToPickUpOrDeliverBoxesState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -79,7 +76,7 @@ EMPTY_DTOR(SupplyTruckWantsToPickUpOrDeliverBoxesState)
 //-------------------------------------------------------------------------------------------------
 class RegroupingState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RegroupingState, "RegroupingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RegroupingState, "RegroupingState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -96,7 +93,7 @@ EMPTY_DTOR(RegroupingState)
 //-------------------------------------------------------------------------------------------------
 class DockingState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DockingState, "DockingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DockingState, "DockingState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -138,11 +135,11 @@ class SupplyTruckAIUpdateModuleData : public AIUpdateModuleData
 		m_warehouseScanDistance = 100;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     AIUpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MaxBoxes",					INI::parseInt,		NULL, offsetof( SupplyTruckAIUpdateModuleData, m_maxBoxesData ) },
 			{ "SupplyCenterActionDelay", INI::parseDurationUnsignedInt, NULL, offsetof( SupplyTruckAIUpdateModuleData, m_centerDelay ) },
@@ -212,31 +209,29 @@ class SupplyTruckAIUpdate : public AIUpdateInterface, public SupplyTruckAIInterf
 	virtual void setForceWantingState(Bool v) { m_forcePending = v; } // When a Supply Center creates us (or maybe other sources later), we need to hop into autopilot mode.
 	virtual Bool isForcedIntoWantingState() const { return m_forcePending; }
 
-	virtual void setForceBusyState(Bool v) { m_forcedBusyPending = v; } 
+	virtual void setForceBusyState(Bool v) { m_forcedBusyPending = v; }
 	virtual Bool isForcedIntoBusyState() const { return m_forcedBusyPending; }
 
 	virtual ObjectID getPreferredDockID() const { return m_preferredDock; }
 	virtual UnsignedInt getActionDelayForDock( Object *dock );
 	virtual Int getUpgradedSupplyBoost() const { return 0; }
-	
+
 	virtual UpdateSleepTime update();
 
 protected:
 
 	virtual AIStateMachine* makeStateMachine();
 	virtual void privateDock( Object *obj, CommandSourceType cmdSource );
-	virtual void privateIdle(CommandSourceType cmdSource);						///< Enter idle state.	
+	virtual void privateIdle(CommandSourceType cmdSource);						///< Enter idle state.
 
 private:
 	SupplyTruckStateMachine*	m_supplyTruckStateMachine;
 	ObjectID									m_preferredDock;			///< Instead of searching, try this one first
 	Int												m_numberBoxes;
-	Bool											m_forcePending;				// To prevent a function from doing a setState, 
+	Bool											m_forcePending;				// To prevent a function from doing a setState,
 																									// forceWanting will latch into here until serviced.
 	Bool											m_forcedBusyPending;	// A supply truck can't tell the difference between Idle since
 																									// I'm between docking states, or a Stop command without help.
  	AudioEventRTS m_suppliesDepletedVoice;						///< Sound played when I take the last box.
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h
index b2af2b047ca..eda60fef623 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_WAREHOUSE_CREATE_H_
-#define _SUPPLY_WAREHOUSE_CREATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/CreateModule.h"
 
@@ -56,6 +53,3 @@ class SupplyWarehouseCreate : public CreateModule
 protected:
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h
index 12950db43b6..8a5c9bfefce 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_WAREHOUSE_CRIPPLING_BEHAVIOR_H
-#define _SUPPLY_WAREHOUSE_CRIPPLING_BEHAVIOR_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/DamageModule.h"
@@ -56,7 +53,7 @@ class SupplyWarehouseCripplingBehaviorModuleData : public UpdateModuleData
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-class SupplyWarehouseCripplingBehavior : public UpdateModule, 
+class SupplyWarehouseCripplingBehavior : public UpdateModule,
 																				 public DamageModuleInterface
 {
 
@@ -90,6 +87,3 @@ class SupplyWarehouseCripplingBehavior : public UpdateModule,
 	UnsignedInt		m_healingSupressedUntilFrame;
 	UnsignedInt		m_nextHealingFrame;
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h
index ad8143aa79f..b9b81d91cd6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _SUPPLY_WAREHOUSE_DOCK_UPDATE_H_
-#define _SUPPLY_WAREHOUSE_DOCK_UPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "Common/GameMemory.h"
@@ -44,7 +41,7 @@ class SupplyWarehouseDockUpdateModuleData : public DockUpdateModuleData
 public:
 
   SupplyWarehouseDockUpdateModuleData( void );
-	
+
 	static void buildFieldParse(MultiIniFieldParse& p);
 
 	Int m_startingBoxesData;
@@ -78,5 +75,3 @@ class SupplyWarehouseDockUpdate : public DockUpdate
 	Int m_boxesStored;
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h
index 54ad97d13c5..19218186c9c 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __TECH_BUILDING_BEHAVIOR_H_
-#define __TECH_BUILDING_BEHAVIOR_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/DieModule.h"
 #include "GameLogic/Module/UpdateModule.h"
@@ -80,5 +77,3 @@ class TechBuildingBehavior : public UpdateModule,
 protected:
 
 };
-
-#endif  // end __TECH_BUILDING_BEHAVIOR_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h
index a9c62421df6..ca711ff8d58 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __TempWeaponBonusHelper_H_
-#define __TempWeaponBonusHelper_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ObjectHelper.h"
 
@@ -50,7 +47,7 @@ class TempWeaponBonusHelper : public ObjectHelper
 {
 
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( TempWeaponBonusHelper, TempWeaponBonusHelperModuleData )
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TempWeaponBonusHelper, "TempWeaponBonusHelper" )	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TempWeaponBonusHelper, "TempWeaponBonusHelper" )
 
 public:
 
@@ -67,6 +64,3 @@ class TempWeaponBonusHelper : public ObjectHelper
 	UnsignedInt m_frameToRemove;
 	void clearTempWeaponBonus();
 };
-
-
-#endif  // end __TempWeaponBonusHelper_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h
index 2251b02ca19..f67c53565a5 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __TENSILEFORMATIONUPDATE_H_
-#define __TENSILEFORMATIONUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -49,7 +46,7 @@ class TensileFormationUpdateModuleData: public UpdateModuleData
 	static void buildFieldParse(MultiIniFieldParse& p);
 
 	Bool m_enabled;							///< enabled
-	AudioEventRTS				m_crackSound;						
+	AudioEventRTS				m_crackSound;
 
 };
 
@@ -83,12 +80,10 @@ class TensileFormationUpdate : public UpdateModule
 	Coord3D m_inertia;
 	Bool m_enabled;			///< enabled
 	Bool m_linksInited;
-	UnsignedInt m_motionlessCounter; 
+	UnsignedInt m_motionlessCounter;
 	UnsignedInt m_life;
 	Real m_lowestSlideElevation;
 
-	AudioEventRTS				m_crackSound;						
+	AudioEventRTS				m_crackSound;
 
 };
-
-#endif  // end __TENSILEFORMATIONUPDATE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h
index 4ffa92248ef..5064096e48e 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: ToppleUpdate.h /////////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:   
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __TOPPLEUPDATE_H_
-#define __TOPPLEUPDATE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/BehaviorModule.h"
 #include "GameLogic/Module/CollideModule.h"
@@ -95,8 +92,8 @@ class ToppleUpdate : public UpdateModule,
 	Bool isAbleToBeToppled() const;
 
 	// UpdateModuleInterface
-	virtual UpdateSleepTime update();	
-	
+	virtual UpdateSleepTime update();
+
 	// CollideModuleInterface
 	virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal );
 	/// this is used for things like pilots, to determine if they can "enter" something
@@ -128,6 +125,3 @@ class ToppleUpdate : public UpdateModule,
 	ObjectID			m_stumpID;								///< stump generated, if any
 
 };
-
-#endif // end __TOPPLEUPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h
index 8364d5fca06..b50f352b0c8 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h
@@ -29,12 +29,9 @@
 
 #pragma once
 
-#ifndef __TRANSITIONDAMAGEFX_H_
-#define __TRANSITIONDAMAGEFX_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameClient/ParticleSys.h"
-#include "GameLogic/Module/DamageModule.h" 
+#include "GameLogic/Module/DamageModule.h"
 #include "GameLogic/Module/BodyModule.h"
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
@@ -49,7 +46,7 @@ class ParticleSystemTemplate;
 enum { DAMAGE_MODULE_MAX_FX = 12 };
 
 typedef Char FXDamageLocType;
-enum 
+enum
 {
 	FX_DAMAGE_LOC_TYPE_BONE  = 0,
 	FX_DAMAGE_LOC_TYPE_COORD = 1
@@ -98,11 +95,11 @@ class TransitionDamageFXModuleData : public DamageModuleData
 
 	TransitionDamageFXModuleData( void );
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     DamageModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 
 			{ "DamageFXTypes",				INI::parseDamageTypeFlags, NULL, offsetof( TransitionDamageFXModuleData, m_damageFXTypes ) },
@@ -253,8 +250,8 @@ class TransitionDamageFX : public DamageModule
 
 	virtual void onDamage( DamageInfo *damageInfo ) { }
 	virtual void onHealing( DamageInfo *damageInfo ) { }
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState );
 
 protected:
@@ -263,5 +260,3 @@ class TransitionDamageFX : public DamageModule
 	ParticleSystemID m_particleSystemID[ BODYDAMAGETYPE_COUNT ][ DAMAGE_MODULE_MAX_FX ];
 
 };
-
-#endif  // end __TRANSITIONDAMAGEFX
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h
index 385c0e05bb4..6b555e17008 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h
@@ -23,18 +23,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // TransportAIUpdate.cpp //////////
-// Needs to check legality of evacuate, and may move to a place that is better to evacuate at 
+// Needs to check legality of evacuate, and may move to a place that is better to evacuate at
 // Author: Graham Smallwood, July 2002
- 
-#pragma once
 
-#ifndef _TRANSPORT_AI_UPDATE_H_
-#define _TRANSPORT_AI_UPDATE_H_
+#pragma once
 
 #include "GameLogic/Module/AIUpdate.h"
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Soldier behavior implementation.
  * Override or extend AIUpdate methods to customize the Soldier's behavior.
  */
@@ -65,6 +62,3 @@ class TransportAIUpdate : public AIUpdateInterface
 	virtual void privateAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource );///< Extension.  Also tell occupants to attackPosition
 	virtual void privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource );///< Extension.  Also tell occupants to forceAttackObject
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h
index 0c6f045188c..24ca96adaf8 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __TransportContain_H_
-#define __TransportContain_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 
@@ -88,7 +85,7 @@ class TransportContain : public OpenContain
 
 	virtual Bool isRiderChangeContain() const { return FALSE; }
   virtual Bool isSpecialOverlordStyleContainer() const {return FALSE;}
-	
+
 	virtual Int getContainMax( void ) const;
 
 	virtual Int getExtraSlotsInUse( void ) { return m_extraSlotsInUse; }///< Transports have the ability to carry guys how take up more than spot.
@@ -108,7 +105,7 @@ class TransportContain : public OpenContain
 	virtual void createPayload();
 	void letRidersUpgradeWeaponSet( void );
 
-	Bool m_payloadCreated;	
+	Bool m_payloadCreated;
 
 private:
 
@@ -116,6 +113,3 @@ class TransportContain : public OpenContain
 	UnsignedInt m_frameExitNotBusy;
 
 };
-
-#endif // __TransportContain_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h
index cdb15252b1f..f19373a9abc 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __TUNNEL_CONTAIN_H_
-#define __TUNNEL_CONTAIN_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/OpenContain.h"
 #include "GameLogic/Module/HealContain.h"
@@ -62,11 +59,11 @@ class TunnelContainModuleData : public OpenContainModuleData
 
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     OpenContainModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "TimeForFullHeal", INI::parseDurationReal, NULL, offsetof( TunnelContainModuleData, m_framesForFullHeal ) },
 			{ 0, 0, 0, 0 }
@@ -80,7 +77,7 @@ class TunnelContain : public OpenContain, public CreateModuleInterface
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TunnelContain, "TunnelContain" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( TunnelContain, TunnelContainModuleData )
-	
+
 public:
 
 	TunnelContain( Thing *thing, const ModuleData* moduleData );
@@ -102,6 +99,9 @@ class TunnelContain : public OpenContain, public CreateModuleInterface
 	virtual void onSelling();///< Container is being sold.  Tunnel responds by kicking people out if this is the last tunnel.
 	virtual void onCapture( Player *oldOwner, Player *newOwner ); // Need to change who we are registered with.
 
+	virtual void orderAllPassengersToExit( CommandSourceType commandSource, Bool instantly ); ///< All of the smarts of exiting are in the passenger's AIExit. removeAllFrommContain is a last ditch system call, this is the game Evacuate
+	virtual void orderAllPassengersToIdle( CommandSourceType commandSource ); ///< Just like it sounds
+
 	virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const;
 	virtual void addToContainList( Object *obj );		///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved)
 	virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE );	///< remove 'obj' from contain list
@@ -113,7 +113,8 @@ class TunnelContain : public OpenContain, public CreateModuleInterface
 	virtual void iterateContained( ContainIterateFunc func, void *userData, Bool reverse );
 	virtual UnsignedInt getContainCount() const;
 	virtual Int getContainMax( void ) const;
-	virtual const ContainedItemsList* getContainedItemsList() const;	
+	virtual const ContainedItemsList* getContainedItemsList() const;
+	virtual UnsignedInt getFullTimeForHeal(void) const; ///< Returns the time in frames until a contained object becomes fully healed
 	virtual Bool isDisplayedOnControlBar() const { return TRUE; } ///< Does this container display its contents on the ControlBar?
 	virtual Bool isKickOutOnCapture(){ return FALSE; }///< Caves and Tunnels don't kick out on capture.
 
@@ -126,15 +127,13 @@ class TunnelContain : public OpenContain, public CreateModuleInterface
 	virtual void onBuildComplete();
 	virtual Bool shouldDoOnBuildComplete() const { return m_needToRunOnBuildComplete; }
 
-	// so that the ppl within the tunnel network can get healed	
+	// so that the ppl within the tunnel network can get healed
 	virtual UpdateSleepTime update();												///< called once per frame
 
 protected:
 
 	void scatterToNearbyPosition(Object* obj);
-	Bool m_needToRunOnBuildComplete; 
+	Bool m_needToRunOnBuildComplete;
 	Bool m_isCurrentlyRegistered; ///< Keeps track if this is registered with the player, so we don't double remove and mess up
 
 };
-
-#endif  // end __TUNNEL_CONTAIN_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h
index f37daca44d2..ebdd27facd4 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __UNDEAD_BODY_H
-#define __UNDEAD_BODY_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/ActiveBody.h"
 
@@ -39,7 +36,7 @@
 class Object;
 
 //-------------------------------------------------------------------------------------------------
-class UndeadBodyModuleData : public ActiveBodyModuleData 
+class UndeadBodyModuleData : public ActiveBodyModuleData
 {
 public:
 	Real m_secondLifeMaxHealth;
@@ -66,12 +63,9 @@ class UndeadBody : public ActiveBody
 
 protected:
 
-	Bool m_isSecondLife;	/** This is false until I detect death the first time, then I 
+	Bool m_isSecondLife;	/** This is false until I detect death the first time, then I
 														change my Max, Initial, and Current health and stop intercepting anything.
 												*/
 	void startSecondLife(DamageInfo *damageInfo);
 
 };
-
-#endif 
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h
index 440941ee4b1..d0f90a70514 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef UNIT_CRATE_COLLIDE_H_
-#define UNIT_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -49,14 +46,13 @@ class UnitCrateCollideModuleData : public CrateCollideModuleData
 	UnitCrateCollideModuleData()
 	{
 		m_unitCount = 0;
-		m_unitType = "";
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UnitCount",	INI::parseUnsignedInt,	NULL, offsetof( UnitCrateCollideModuleData, m_unitCount ) },
 			{ "UnitName",		INI::parseAsciiString,	NULL, offsetof( UnitCrateCollideModuleData, m_unitType ) },
@@ -84,5 +80,3 @@ class UnitCrateCollide : public CrateCollide
 protected:
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h
index 241977cbb69..5c6b610ee00 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h
@@ -24,16 +24,13 @@
 
 // FILE: UnpauseSpecialPowerUpgrade.h ///////////////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, August 2002
-// Desc:	 An upgrade that starts the timer on a Special Power module, so you can have them 
+// Desc:	 An upgrade that starts the timer on a Special Power module, so you can have them
 // dependent on upgrades on the logic side, like NEED_UPGRADE does on the client side by disabling
 // the button.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __UNPAUSE_SPECIAL_POWER_UPGRADE_H_
-#define __UNPAUSE_SPECIAL_POWER_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -75,6 +72,3 @@ class UnpauseSpecialPowerUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-#endif 
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
index 47d05a00ba8..00254e12476 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
@@ -24,14 +24,11 @@
 
 // FILE: UpdateModule.h /////////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2001
-// Desc:	 
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __UpdateModule_H_
-#define __UpdateModule_H_
-
 #include "Common/Module.h"
 #include "Common/GameType.h"
 #include "Common/DisabledTypes.h"
@@ -65,8 +62,8 @@ class Waypoint;
 enum CommandOption CPP_11(: Int);
 
 //-------------------------------------------------------------------------------------------------
-enum UpdateSleepTime CPP_11(: Int) 
-{ 
+enum UpdateSleepTime CPP_11(: Int)
+{
 	UPDATE_SLEEP_INVALID	= 0,
 	UPDATE_SLEEP_NONE			= 1,
 	// (we use 0x3fffffff so that we can add offsets and not overflow...
@@ -91,7 +88,7 @@ enum SleepyUpdatePhase CPP_11(: Int)
 	PHASE_NORMAL				= 2,
 	PHASE_FINAL					= 3
 };
-	
+
 //-------------------------------------------------------------------------------------------------
 class UpdateModuleInterface
 {
@@ -102,8 +99,8 @@ class UpdateModuleInterface
 	virtual DisabledMaskType getDisabledTypesToProcess() const = 0;
 
 #ifdef DIRECT_UPDATEMODULE_ACCESS
-	// these aren't in the interface; they are in the implementation, 
-	// because making them virtual is simply too much overhead. 
+	// these aren't in the interface; they are in the implementation,
+	// because making them virtual is simply too much overhead.
 	// no, really; I have the profiling data to prove it. (srj)
 #else
 	// these are for use ONLY by GameLogic scheduler. do not call otherwise,
@@ -123,7 +120,7 @@ class UpdateModuleData : public BehaviorModuleData
 {
 public:
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
 		BehaviorModuleData::buildFieldParse(p);
 	}
@@ -141,7 +138,7 @@ class UpdateModule : public BehaviorModule, public UpdateModuleInterface
 
 	// this is an absolute frame, not a frame count.
 	// actually, it's not a real frame at all, it has phase info in the lower bits...
-	UnsignedInt m_nextCallFrameAndPhase;	
+	UnsignedInt m_nextCallFrameAndPhase;
 	Int m_indexInLogic;
 
 protected:
@@ -175,67 +172,67 @@ class UpdateModule : public BehaviorModule, public UpdateModuleInterface
 	// UpdateModuleInterface
 	virtual UpdateSleepTime update() = 0;
 
-	DisabledMaskType getDisabledTypesToProcess() const 
-	{ 
-		return DISABLEDMASK_NONE; 
+	DisabledMaskType getDisabledTypesToProcess() const
+	{
+		return DISABLEDMASK_NONE;
 	}
 
 #ifdef DIRECT_UPDATEMODULE_ACCESS
 	#define UPDATEMODULE_FRIEND_DECLARATOR __forceinline
 #else
-	#define UPDATEMODULE_FRIEND_DECLARATOR virtual 
+	#define UPDATEMODULE_FRIEND_DECLARATOR virtual
 #endif
 
 	// for use ONLY by GameLogic scheduler. do not call otherwise.
-	UPDATEMODULE_FRIEND_DECLARATOR UnsignedInt friend_getPriority() const 
-	{ 
-		return m_nextCallFrameAndPhase; 
+	UPDATEMODULE_FRIEND_DECLARATOR UnsignedInt friend_getPriority() const
+	{
+		return m_nextCallFrameAndPhase;
 	}
 
-	UPDATEMODULE_FRIEND_DECLARATOR UnsignedInt friend_getNextCallFrame() const 
-	{ 
-		return m_nextCallFrameAndPhase >> 2; 
+	UPDATEMODULE_FRIEND_DECLARATOR UnsignedInt friend_getNextCallFrame() const
+	{
+		return m_nextCallFrameAndPhase >> 2;
 	}
 
-	UPDATEMODULE_FRIEND_DECLARATOR SleepyUpdatePhase friend_getNextCallPhase() const 
-	{ 
-		return (SleepyUpdatePhase)(m_nextCallFrameAndPhase & 3); 
+	UPDATEMODULE_FRIEND_DECLARATOR SleepyUpdatePhase friend_getNextCallPhase() const
+	{
+		return (SleepyUpdatePhase)(m_nextCallFrameAndPhase & 3);
 	}
 
-	UPDATEMODULE_FRIEND_DECLARATOR void friend_setNextCallFrame(UnsignedInt frame) 
-	{ 
+	UPDATEMODULE_FRIEND_DECLARATOR void friend_setNextCallFrame(UnsignedInt frame)
+	{
 		// anything greater than "forever" is still "forever"
 		// (this makes setWakeFrame() comparisons simpler and more efficient)
 		if (frame > UPDATE_SLEEP_FOREVER)
 			frame = UPDATE_SLEEP_FOREVER;
-		m_nextCallFrameAndPhase = (frame << 2) | getUpdatePhase(); 
+		m_nextCallFrameAndPhase = (frame << 2) | getUpdatePhase();
 	}
 
-	UPDATEMODULE_FRIEND_DECLARATOR Int friend_getIndexInLogic() const 
-	{ 
-		return m_indexInLogic; 
+	UPDATEMODULE_FRIEND_DECLARATOR Int friend_getIndexInLogic() const
+	{
+		return m_indexInLogic;
 	}
 
 	UPDATEMODULE_FRIEND_DECLARATOR void friend_setIndexInLogic(Int i)
-	{ 
-		m_indexInLogic = i; 
+	{
+		m_indexInLogic = i;
 	}
 
-	UPDATEMODULE_FRIEND_DECLARATOR const Object* friend_getObject() const 
-	{ 
-		return getObject(); 
+	UPDATEMODULE_FRIEND_DECLARATOR const Object* friend_getObject() const
+	{
+		return getObject();
 	}
 
 };
-inline UpdateModule::UpdateModule( Thing *thing, const ModuleData* moduleData ) : 
+inline UpdateModule::UpdateModule( Thing *thing, const ModuleData* moduleData ) :
 	BehaviorModule( thing, moduleData ),
 	m_indexInLogic(-1),
-	m_nextCallFrameAndPhase(0) 
-{ 
+	m_nextCallFrameAndPhase(0)
+{
 	// nothing
 }
-inline UpdateModule::~UpdateModule() 
-{ 
+inline UpdateModule::~UpdateModule()
+{
 	DEBUG_ASSERTCRASH(m_indexInLogic == -1, ("destroying an updatemodule still in the logic list"));
 }
 
@@ -289,8 +286,8 @@ class DockUpdateInterface
 	*/
 	virtual Bool advanceApproachPosition( Object* docker, Coord3D *position, Int *index ) = 0;
 
-	/** Return true when it is OK for docker to begin entering the dock 
-			The Dock will lift the restriction on one particular docker on its own, 
+	/** Return true when it is OK for docker to begin entering the dock
+			The Dock will lift the restriction on one particular docker on its own,
 			so you must continually ask.
 	*/
 	virtual Bool isClearToEnter( Object const* docker ) const = 0;
@@ -302,19 +299,19 @@ class DockUpdateInterface
 
 	/** Give me the point that is the start of your docking path
 			Returning NULL means there is none free
-			All functions take docker as arg so we could have multiple docks on a building.  
+			All functions take docker as arg so we could have multiple docks on a building.
 			Docker is not assumed, it is recorded and checked.
 	*/
-	virtual void getEnterPosition( Object* docker, Coord3D *position ) = 0;			
+	virtual void getEnterPosition( Object* docker, Coord3D *position ) = 0;
 
-	/** Give me the middle point of the dock process where the action() happens */	
-	virtual void getDockPosition( Object* docker, Coord3D *position ) = 0;					
+	/** Give me the middle point of the dock process where the action() happens */
+	virtual void getDockPosition( Object* docker, Coord3D *position ) = 0;
 
 	/** Give me the point to drive to when I am done */
-	virtual void getExitPosition( Object* docker, Coord3D *position ) = 0;					
+	virtual void getExitPosition( Object* docker, Coord3D *position ) = 0;
 
-	virtual void onApproachReached( Object* docker ) = 0;		///< I have reached the Enter Point.  
-	virtual void onEnterReached( Object* docker ) = 0;			///< I have reached the Enter Point.  
+	virtual void onApproachReached( Object* docker ) = 0;		///< I have reached the Enter Point.
+	virtual void onEnterReached( Object* docker ) = 0;			///< I have reached the Enter Point.
 	virtual void onDockReached( Object* docker ) = 0;				///< I have reached the Dock point
 	virtual void onExitReached( Object* docker ) = 0;				///< I have reached the exit.  You are no longer busy
 
@@ -324,11 +321,11 @@ class DockUpdateInterface
 
 	virtual Bool isDockOpen( void ) = 0;						///< Is the dock open to accepting dockers
 	virtual void setDockOpen( Bool open ) = 0;			///< Open/Close the dock
-	
+
 	virtual void setDockCrippled( Bool setting ) = 0; ///< Game Logic can set me as inoperative.  I get to decide what that means.
 
 	virtual Bool isAllowPassthroughType() = 0;	///< Not all docks allow you to path through them in your AIDock machine
-	
+
 	virtual Bool isRallyPointAfterDockType() = 0; ///< A minority of docks want to give you a final command to their rally point
 };
 
@@ -349,14 +346,14 @@ enum ExitDoorType CPP_11(: Int)
 //-------------------------------------------------------------------------------------------------
 ///< Different types of modules have an interest in exiting units out of themselves for whatever reason.
 class ExitInterface
-{ 
+{
 public:
 	virtual Bool isExitBusy() const = 0;	///< Contain style exiters are getting the ability to space out exits, so ask this before reserveDoor as a kind of no-commitment check.
 	virtual ExitDoorType reserveDoorForExit( const ThingTemplate* objType, Object *specificObject ) = 0;		///< All types can answer if they are free to exit or not, and you can ask about a specific guy or just exit anything in general
 	virtual void exitObjectViaDoor( Object *newObj, ExitDoorType exitDoor ) = 0;							///< Here is the object for you to exit to the world in your own special way
 	virtual void exitObjectByBudding( Object *newObj, Object *budHost ) = 0;	///< puts new spawn on top of an existing one
 	virtual void unreserveDoorForExit( ExitDoorType exitDoor ) = 0;	///< if you get permission to exit, but then don't/can't call exitObjectViaDoor, you should call this to "give up" your permission
-	
+
 	virtual void exitObjectInAHurry( Object *newObj) {}; ///< Special call for objects exiting a tunnel network, does NOT change the ai state. jba.
 
 	virtual void setRallyPoint( const Coord3D *pos ) = 0;				///< define a "rally point" for units to move towards
@@ -365,5 +362,3 @@ class ExitInterface
 	virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const {rallyPoint.x=rallyPoint.y=rallyPoint.z=0; return false;}	///< get the natural "rally point" for units to move towards
 	virtual Bool getExitPosition( Coord3D& exitPosition ) const {exitPosition.x=exitPosition.y=exitPosition.z=0; return false;};					///< access to the "Door" position of the production object
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h
index 261e836a7f3..01b9f8fb7cd 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __UPGRADEDIE_H
-#define __UPGRADEDIE_H
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/INI.h"
 #include "GameLogic/Module/DieModule.h"
@@ -48,12 +45,12 @@ class UpgradeDieModuleData : public DieModuleData
 
 	UpgradeDieModuleData(){}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
-    
+
 		DieModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "UpgradeToRemove",					INI::parseAsciiString,		NULL, offsetof( UpgradeDieModuleData, m_upgradeName ) },
 			{ 0, 0, 0, 0 }
@@ -75,9 +72,6 @@ class UpgradeDie : public DieModule
 	UpgradeDie( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
-	virtual void onDie( const DamageInfo *damageInfo ); 
+	virtual void onDie( const DamageInfo *damageInfo );
 
 };
-
-#endif // __UPGRADEDIE_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h
index ff93e4be730..2be91e217e3 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __UPGRADE_MODULE_H_
-#define __UPGRADE_MODULE_H_
-
 #include "Common/Module.h"
 #include "Common/STLTypedefs.h"
 #include "Common/Upgrade.h"
@@ -71,7 +68,7 @@ class UpgradeMuxData	// does NOT inherit from ModuleData.
 	mutable std::vector<AsciiString>	m_activationUpgradeNames;
 	mutable std::vector<AsciiString>	m_conflictingUpgradeNames;
 	mutable std::vector<AsciiString>	m_removalUpgradeNames;
-	
+
 	mutable const FXList*							m_fxListUpgrade;
 	mutable UpgradeMaskType						m_activationMask;				///< Activation only supports a single name currently
 	mutable UpgradeMaskType						m_conflictingMask;			///< Conflicts support multiple listings, and they are an OR
@@ -90,9 +87,9 @@ class UpgradeMuxData	// does NOT inherit from ModuleData.
 		m_requiresAllTriggers = false;
 	}
 
-	static const FieldParse* getFieldParse() 
+	static const FieldParse* getFieldParse()
 	{
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "TriggeredBy",		INI::parseAsciiStringVector, NULL, offsetof( UpgradeMuxData, m_activationUpgradeNames ) },
 			{ "ConflictsWith",	INI::parseAsciiStringVector, NULL, offsetof( UpgradeMuxData, m_conflictingUpgradeNames ) },
@@ -136,7 +133,7 @@ class UpgradeMux : public UpgradeModuleInterface
 	virtual Bool requiresAllActivationUpgrades() const = 0;
 	virtual Bool isSubObjectsUpgrade() = 0;
 	virtual void processUpgradeRemoval() = 0;
-	
+
 	void giveSelfUpgrade();
 
 	//
@@ -159,7 +156,7 @@ struct UpgradeModuleData : public BehaviorModuleData
 public:
 	UpgradeMuxData				m_upgradeMuxData;
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     ModuleData::buildFieldParse(p);
 		p.add(UpgradeMuxData::getFieldParse(), offsetof( UpgradeModuleData, m_upgradeMuxData ));
@@ -213,6 +210,3 @@ class UpgradeModule : public BehaviorModule, public UpgradeMux
 };
 inline UpgradeModule::UpgradeModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { }
 inline UpgradeModule::~UpgradeModule() { }
-
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h
index 0b1424fd79c..a1cc5bdeece 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef VETERANCY_CRATE_COLLIDE_H_
-#define VETERANCY_CRATE_COLLIDE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Module.h"
 #include "GameLogic/Module/CrateCollide.h"
@@ -54,11 +51,11 @@ class VeterancyCrateCollideModuleData : public CrateCollideModuleData
 		m_isPilot = false;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     CrateCollideModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "EffectRange",	INI::parseUnsignedInt,	NULL, offsetof( VeterancyCrateCollideModuleData, m_rangeOfEffect ) },
 			{ "AddsOwnerVeterancy",	INI::parseBool,	NULL, offsetof( VeterancyCrateCollideModuleData, m_addsOwnerVeterancy ) },
@@ -93,5 +90,3 @@ class VeterancyCrateCollide : public CrateCollide
 	Int getLevelsToGain() const;
 
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h
index 170600bfbeb..4ab22c5926a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __VETERANCY_GAIN_CREATE_H_
-#define __VETERANCY_GAIN_CREATE_H_
-
 #define DEFINE_VETERANCY_NAMES
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameCommon.h"
@@ -70,6 +67,3 @@ class VeterancyGainCreate : public CreateModule
 protected:
 
 };
-
-#endif 
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h
index 91a86f14fb5..dbfa033d1e8 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h
@@ -25,16 +25,13 @@
 // WanderAIUpdate.h //////////
 // Will give self random move commands
 // Author: Graham Smallwood, April 2002
- 
-#pragma once
 
-#ifndef _WANDER_AI_UPDATE_H_
-#define _WANDER_AI_UPDATE_H_
+#pragma once
 
 #include "GameLogic/Module/AIUpdate.h"
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Soldier behavior implementation.
  * Override or extend AIUpdate methods to customize the Soldier's behavior.
  */
@@ -63,6 +60,3 @@ class WanderAIUpdate : public AIUpdateInterface
 	virtual AIStateMachine* makeStateMachine();
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h
index 514e9132a01..ca6c583bc02 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __WATERWAVE_H_
-#define __WATERWAVE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpdateModule.h"
 
@@ -97,7 +94,7 @@ class WaveGuideUpdate : public UpdateModule
 	void doDamage( void );								///< do damage to things that have crossed our path
 
 	UnsignedInt m_activeFrame;						///< frame we became active on
-	Bool m_needDisable;									
+	Bool m_needDisable;
 	Bool m_initialized;										///< set to TRUE after we're enabled and in motion
 
 	enum { MAX_WAVEGUIDE_SHAPE_POINTS = 64 };
@@ -111,5 +108,3 @@ class WaveGuideUpdate : public UpdateModule
 	Coord3D m_finalDestination;						///< the final destination of the waveguide path
 
 };
-
-#endif  // end __WATERWAVE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h
index bb535c97fb2..fc25099d383 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h
@@ -24,12 +24,12 @@
 
 // FILE: WeaponBonusUpdate.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002-2003 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002-2003 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	July 2003
@@ -37,8 +37,8 @@
 //	Filename: 	WeaponBonusUpdate.cpp
 //
 //	author:		Graham Smallwood
-//	
-//	purpose:	Like healing in that it can affect just me or people around, 
+//
+//	purpose:	Like healing in that it can affect just me or people around,
 //						except this gives a Weapon Bonus instead of health
 //
 //-----------------------------------------------------------------------------
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __WEAPON_BONUS_UPDATE_H_
-#define __WEAPON_BONUS_UPDATE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -108,5 +105,3 @@ class WeaponBonusUpdate : public UpdateModule
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h
index 21547657907..c8bc99561ea 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h
@@ -24,12 +24,12 @@
 
 // FILE: WeaponBonusUpgrade.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	May 2002
@@ -37,17 +37,14 @@
 //	Filename: 	WeaponBonusUpgrade.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __WEAPON_BONUS_UPGRADE_H_
-#define __WEAPON_BONUS_UPGRADE_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -90,7 +87,3 @@ class WeaponBonusUpgrade : public UpgradeModule
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __WEAPON_BONUS_UPGRADE_H_
-
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h
index d73612c996e..3604ce239b1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __WEAPON_SET_UPGRADE_H_
-#define __WEAPON_SET_UPGRADE_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "GameLogic/Module/UpgradeModule.h"
 
@@ -57,7 +54,3 @@ class WeaponSetUpgrade : public UpgradeModule
 	virtual Bool isSubObjectsUpgrade() { return false; }
 
 };
-
-
-#endif // __DEFAULTDIE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h
index cd316da3771..afc308ccf68 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __WORKER_AI_UPDATE_H_
-#define __WORKER_AI_UPDATE_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/StateMachine.h"
 #include "GameLogic/Module/AIUpdate.h"
@@ -91,11 +88,11 @@ class WorkerAIUpdateModuleData : public AIUpdateModuleData
 		m_upgradedSupplyBoost = 0;
 	}
 
-	static void buildFieldParse(MultiIniFieldParse& p) 
+	static void buildFieldParse(MultiIniFieldParse& p)
 	{
     AIUpdateModuleData::buildFieldParse(p);
 
-		static const FieldParse dataFieldParse[] = 
+		static const FieldParse dataFieldParse[] =
 		{
 			{ "MaxBoxes",					INI::parseInt,		NULL, offsetof( WorkerAIUpdateModuleData, m_maxBoxesData ) },
 			{ "RepairHealthPercentPerSecond",	INI::parsePercentToReal,	NULL, offsetof( WorkerAIUpdateModuleData, m_repairHealthPercentPerSecond ) },
@@ -143,8 +140,8 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public
 	virtual Real getBoredTime( void ) const;							///< how long till we're bored
 	virtual Real getBoredRange( void ) const;							///< when we're bored, we look this far away to do things
 
-	virtual Object *construct( const ThingTemplate *what, 
-														 const Coord3D *pos, Real angle, 
+	virtual Object *construct( const ThingTemplate *what,
+														 const Coord3D *pos, Real angle,
 														 Player *owningPlayer,
 														 Bool isRebuild );			///< construct a building
 
@@ -188,7 +185,7 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public
 	virtual Bool isCurrentlyFerryingSupplies() const;
 	virtual Real getWarehouseScanDistance() const; ///< How far can I look for a warehouse?
 
-	virtual void setForceBusyState(Bool v) { m_forcedBusyPending = v; } 
+	virtual void setForceBusyState(Bool v) { m_forcedBusyPending = v; }
 	virtual Bool isForcedIntoBusyState() const { return m_forcedBusyPending; }
 
 	virtual void setForceWantingState(Bool v){ m_forcePending = v; }
@@ -212,7 +209,7 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public
 
 	virtual void startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID );
 	virtual void finishBuildingSound();
-	
+
 	virtual Int getUpgradedSupplyBoost() const;
 
 protected:
@@ -221,7 +218,7 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public
 	struct DozerTaskInfo
 	{
 		ObjectID m_targetObjectID;				///< target object ID of task
-		UnsignedInt m_taskOrderFrame;			///< logic frame we decided we wanted to do this task	
+		UnsignedInt m_taskOrderFrame;			///< logic frame we decided we wanted to do this task
 	} m_task[ DOZER_NUM_TASKS ];				///< tasks we want to do indexed by DozerTask
 
 
@@ -260,7 +257,7 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public
 	virtual void privateRepair( Object *obj, CommandSourceType cmdSource );	///< repair the target
 	virtual void privateResumeConstruction( Object *obj, CommandSourceType cmdSource );  ///< resume construction on obj
 	virtual void privateDock( Object *obj, CommandSourceType cmdSource );
-	virtual void privateIdle(CommandSourceType cmdSource);						///< Enter idle state.	
+	virtual void privateIdle(CommandSourceType cmdSource);						///< Enter idle state.
 
 private:
 
@@ -268,7 +265,3 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public
  	AudioEventRTS m_suppliesDepletedVoice;						///< Sound played when I take the last box.
 
 };
-
-
-#endif // __WORKER_AI_UPDATE_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
index d4cc8e1c52d..9c601848f69 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
@@ -27,10 +27,9 @@
 // Author: Michael S. Booth, October 2000
 
 #pragma once
-#ifndef _OBJECT_H_
-#define _OBJECT_H_
 
 #include "Lib/BaseType.h"
+#include "ref_ptr.h"
 
 #include "Common/Geometry.h"
 #include "Common/Snapshot.h"
@@ -122,9 +121,6 @@ enum WeaponStatus CPP_11(: Int);
 enum RadarPriorityType CPP_11(: Int);
 enum CanAttackResult CPP_11(: Int);
 
-// For ObjectStatusTypes
-#include "Common/ObjectStatusTypes.h"
-
 // For ObjectScriptStatusBit
 #include "GameLogic/ObjectScriptStatusBits.h"
 
@@ -149,8 +145,8 @@ struct TTriggerInfo
 
 enum CrushSquishTestType CPP_11(: Int)
 {
-	TEST_CRUSH_ONLY, 
-	TEST_SQUISH_ONLY, 
+	TEST_CRUSH_ONLY,
+	TEST_SQUISH_ONLY,
 	TEST_CRUSH_OR_SQUISH
 };
 
@@ -163,7 +159,7 @@ enum CrushSquishTestType CPP_11(: Int)
 class Object : public Thing, public Snapshot
 {
 
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Object, "ObjectPool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Object, "ObjectPool" )
 
 public:
 
@@ -199,8 +195,8 @@ class Object : public Thing, public Snapshot
 	Bool isAbleToAttack() const;														///< returns true if object currently has some kind of attack capability
 
 	void maskObject( Bool mask );				///< mask/unmask object
-	
-	/** 
+
+	/**
 		Booby traps are set off by many random actions, so those actions are responsible for calling this.
 		Return value is if a booby trap was set off, so caller can react.
 		Those actions are: planting any type of bomb, entering, starting to capture, dying.
@@ -231,7 +227,7 @@ class Object : public Thing, public Snapshot
 	void doStatusDamage( ObjectStatusTypes status, Real duration );///< At this level, we just pass this on to our helper
 	void doTempWeaponBonus( WeaponBonusConditionType status, UnsignedInt duration );///< At this level, we just pass this on to our helper
 
-	void scoreTheKill( const Object *victim );						///< I just killed this object.  
+	void scoreTheKill( const Object *victim );						///< I just killed this object.
 	void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = TRUE );	///< I just achieved this level right this moment
 	ExperienceTracker* getExperienceTracker() {return m_experienceTracker;}
 	const ExperienceTracker* getExperienceTracker() const {return m_experienceTracker;}
@@ -257,9 +253,12 @@ class Object : public Thing, public Snapshot
 	void setCustomIndicatorColor(Color c);
 	void removeCustomIndicatorColor();
 
+	Bool isLogicallyVisible() const; ///< Returns whether the object is logically visible to the player, irrespective of shroud.
+
 	Bool isLocallyControlled() const;
+	Bool isLocallyViewed() const;
 	Bool isNeutralControlled() const;
-	
+
 	Bool getIsUndetectedDefector(void) const { return BitIsSet(m_privateStatus, UNDETECTED_DEFECTOR); }
 	void friend_setUndetectedDefector(Bool status);
 
@@ -273,11 +272,11 @@ class Object : public Thing, public Snapshot
 	void setGeometryInfoZ( Real newZ );
 
 	void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal );
-	
+
 	Real getCarrierDeckHeight() const;
 	// access to modules
 	//-----------------------------------------------------------------------------
-	
+
 	//This is a good creation inspector. There's been multitudes of issues with conflicts of
 	//Objects getting constructed causing crashes either because the modules aren't created
 	//yet, and there's stuff being done inside of setTeam() that cares.
@@ -314,7 +313,7 @@ class Object : public Thing, public Snapshot
 	//
 	ProductionUpdateInterface* getProductionUpdateInterface( void );
 
-	// 
+	//
 	// Find us our dock update interface if we have one.  Again, this method exists simple
 	// because we want to do this in a lot of places throughout the code
 	//
@@ -339,10 +338,10 @@ class Object : public Thing, public Snapshot
 	UpgradeMaskType getObjectCompletedUpgradeMask() const { return m_objectUpgradesCompleted; } ///< Upgrades I complete locally
 
 	//This function sucks.
-	//It was added for objects that can disguise as other objects and contain upgraded subobject overrides. 
+	//It was added for objects that can disguise as other objects and contain upgraded subobject overrides.
 	//A concrete example is the bomb truck. Different payloads are displayed based on which upgrades have been
 	//made. When the bomb truck disguises as something else, these subobjects are lost because the vector is
-	//stored in W3DDrawModule. When we revert back to the original bomb truck, we call this function to 
+	//stored in W3DDrawModule. When we revert back to the original bomb truck, we call this function to
 	//recalculate those upgraded subobjects.
 	void forceRefreshSubObjectUpgradeStatus();
 
@@ -352,12 +351,12 @@ class Object : public Thing, public Snapshot
 	inline void clearScriptStatus( ObjectScriptStatusBit bit ) { setScriptStatus(bit, false); }
 
 	// Selectable is individually controlled on an object by object basis for design now.
-	// It defaults to the thingTemplate->isKindof(KINDOF_SELECTABLE), however, it can be overridden on an 
-	// object by object basis.  Finally, it can be temporarily overriden by the OBJECT_STATUS_UNSELECTABLE. 
+	// It defaults to the thingTemplate->isKindof(KINDOF_SELECTABLE), however, it can be overridden on an
+	// object by object basis.  Finally, it can be temporarily overriden by the OBJECT_STATUS_UNSELECTABLE.
 	// jba.
 	void setSelectable(Bool selectable);
 	Bool isSelectable() const;
-	
+
 	Bool isMassSelectable() const;
 
 	// User specified formation.
@@ -365,7 +364,7 @@ class Object : public Thing, public Snapshot
 	enum FormationID getFormationID(void) const {return m_formationID;}
 	void setFormationOffset(const Coord2D& offset) {m_formationOffset = offset;}
 	void getFormationOffset(Coord2D* offset) const {*offset = m_formationOffset;}
-		
+
 
 //THIS FUNCTION BELONGS AT THE OBJECT LEVEL BECAUSE THERE IS AT LEAST ONE SPECIAL UNIT
 //(ANGRY MOB) WHICH NEEDS LOGIC-SIDE POSITION CALC'S...
@@ -379,8 +378,8 @@ class Object : public Thing, public Snapshot
 
 	void markSingleUseCommandUsed() { m_singleUseCommandUsed = true; }
 	Bool hasSingleUseCommandBeenUsed() const { return m_singleUseCommandUsed; }
-	
-	/// returns true iff the object can run over the other object. 
+
+	/// returns true iff the object can run over the other object.
 	Bool canCrushOrSquish(Object *otherObj, CrushSquishTestType testType = TEST_CRUSH_OR_SQUISH) const;
 	UnsignedByte getCrusherLevel() const;
 	UnsignedByte getCrushableLevel() const;
@@ -415,6 +414,7 @@ class Object : public Thing, public Snapshot
 	void friend_setPartitionData(PartitionData *pd) { m_partitionData = pd; }
 	PartitionData *friend_getPartitionData() const { return m_partitionData; }
 	const PartitionData *friend_getConstPartitionData() const { return m_partitionData; }
+	Bool hasGhostObject() const; ///< This object has a ghost object. This does not imply that a ghost snapshot is taken or active.
 
 	void onPartitionCellChange();///< We have moved a 'significant' amount, so do maintenence that can be considered 'cell-based'
 	void handlePartitionCellMaintenance();					///< Undo and redo all shroud actions.  Call when something has changed, like position or ownership or Death
@@ -445,6 +445,8 @@ class Object : public Thing, public Snapshot
 	void onRemovedFrom( Object *removedFrom );
 	Int getTransportSlotCount() const;
 	void friend_setContainedBy( Object *containedBy ) { m_containedBy = containedBy; }
+	const Object* getEnclosingContainedBy() const; ///< Find the first enclosing container in the containment chain.
+	const Object* getOuterObject() const; ///< Get the top-level object
 
 	// Special Powers -------------------------------------------------------------------------------
 	SpecialPowerModuleInterface *getSpecialPowerModule( const SpecialPowerTemplate *specialPowerTemplate ) const;
@@ -457,7 +459,7 @@ class Object : public Thing, public Snapshot
 	void doCommandButtonAtObject( const CommandButton *commandButton, Object *obj, CommandSourceType cmdSource );
 	void doCommandButtonAtPosition( const CommandButton *commandButton, const Coord3D *pos, CommandSourceType cmdSource );
 	void doCommandButtonUsingWaypoints( const CommandButton *commandButton, const Waypoint *way, CommandSourceType cmdSource );
-	
+
 	/**
 		 For Object specific dynamic command sets.  Different from the Science specific ones handled in ThingTemplate
 	*/
@@ -465,7 +467,7 @@ class Object : public Thing, public Snapshot
 	void setCommandSetStringOverride( AsciiString newCommandSetString ) { m_commandSetStringOverride = newCommandSetString; }
 
 	/// People are faking their commandsets, and, Surprise!, they are authoritative.  Challenge everything.
-	Bool canProduceUpgrade( const UpgradeTemplate *upgrade ); 
+	Bool canProduceUpgrade( const UpgradeTemplate *upgrade );
 
 
 	// Weapons & Damage -------------------------------------------------------------------------------------------------
@@ -486,7 +488,7 @@ class Object : public Thing, public Snapshot
 	Weapon* getCurrentWeapon(WeaponSlotType* wslot = NULL);
 	const Weapon* getCurrentWeapon(WeaponSlotType* wslot = NULL) const;
 	void setFiringConditionForCurrentWeapon() const;
-	void adjustModelConditionForWeaponStatus();	///< Check to see if I should change my model condition. 
+	void adjustModelConditionForWeaponStatus();	///< Check to see if I should change my model condition.
 	void fireCurrentWeapon(Object *target);
 	void fireCurrentWeapon(const Coord3D* pos);
 	void preFireCurrentWeapon( const Object *victim );
@@ -499,12 +501,12 @@ class Object : public Thing, public Snapshot
 
   /**
 		Determines if the unit has any weapon that could conceivably
-		harm the victim. this does not take range, ammo, etc. into 
+		harm the victim. this does not take range, ammo, etc. into
 		account, but immutable weapon properties, such as "can you
 		target airborne victims".
 	*/
 	/*
-		NOTE: getAbleToAttackSpecificObject NO LONGER internally calls isAbleToAttack(), 
+		NOTE: getAbleToAttackSpecificObject NO LONGER internally calls isAbleToAttack(),
 		since that isn't an incredibly fast call, and this is called repeatedly in some inner loops
 		where we already know that isAbleToAttack() == true. so you should always
 		call isAbleToAttack prior to calling this! (srj)
@@ -557,7 +559,7 @@ class Object : public Thing, public Snapshot
 
 	void setWeaponBonusCondition(WeaponBonusConditionType wst);
 	void clearWeaponBonusCondition(WeaponBonusConditionType wst);
-	
+
   // note, the !=0 at the end is important, to convert this into a boolean type! (srj)
 	Bool testWeaponBonusCondition(WeaponBonusConditionType wst) const { return (m_weaponBonusCondition & (1 << wst)) != 0; }
 	inline WeaponBonusConditionFlags getWeaponBonusCondition() const { return m_weaponBonusCondition; }
@@ -565,7 +567,7 @@ class Object : public Thing, public Snapshot
 	Bool getSingleLogicalBonePosition(const char* boneName, Coord3D* position, Matrix3D* transform) const;
 	Bool getSingleLogicalBonePositionOnTurret(WhichTurretType whichTurret, const char* boneName, Coord3D* position, Matrix3D* transform) const;
 	Int getMultiLogicalBonePosition(const char* boneNamePrefix, Int maxBones, Coord3D* positions, Matrix3D* transforms, Bool convertToWorld = TRUE ) const;
-	
+
 	// Entered & exited.
 	Bool didEnter(const PolygonTrigger *pTrigger) const;
 	Bool didExit(const PolygonTrigger *pTrigger) const;
@@ -587,29 +589,29 @@ class Object : public Thing, public Snapshot
 
 	UnsignedInt getDisabledUntil( DisabledType type = DISABLED_ANY ) const;
 
-	void pauseAllSpecialPowers( const Bool disabling ) const;	
-	
+	void pauseAllSpecialPowers( const Bool disabling ) const;
+
 	//Checks any timers and clears disabled statii that have expired.
 	void checkDisabledStatus();
-	
+
 	//When an AIAttackState is over, it needs to clean up any weapons that might be in leech range mode
 	//or else those weapons will have unlimited range!
 	void clearLeechRangeModeForAllWeapons();
-	
+
 	Int getNumConsecutiveShotsFiredAtTarget( const Object *victim) const;
 
 	void setHealthBoxOffset( const Coord3D& offset ) { m_healthBoxOffset = offset; } ///< for special amorphous like angry mob
 
 	void defect( Team *newTeam, UnsignedInt detectionTime );
 	void goInvulnerable( UnsignedInt time );
-	
+
 	// This is public, since there is no Thing level master setting of Turret stuff.  It is all done in a sleepy hamlet
 	// of a module called TurretAI.
 	virtual void reactToTurretChange( WhichTurretType turret, Real oldRotation, Real oldPitch );
 
 	// Convenience function for checking certain kindof bits
 	Bool isStructure(void) const;
-	
+
 	// Convenience function for checking certain kindof bits
 	Bool isFactionStructure(void) const;
 
@@ -622,7 +624,7 @@ class Object : public Thing, public Snapshot
 	void setReceivingDifficultyBonus(Bool receive);
 
 	inline UnsignedInt getSafeOcclusionFrame(void) { return m_safeOcclusionFrame; }	//< this is an object specific frame at which it's safe to enable building occlusion.
-	inline void	setSafeOcclusionFrame(UnsignedInt frame) { m_safeOcclusionFrame = frame;} 
+	inline void	setSafeOcclusionFrame(UnsignedInt frame) { m_safeOcclusionFrame = frame;}
 
 	// All of our cheating for radars and power go here.
 	// This is the function that we now call in becomingTeamMember to adjust our power.
@@ -662,7 +664,7 @@ class Object : public Thing, public Snapshot
 
 	void updateTriggerAreaFlags(void);
 	void setTriggerAreaFlagsForChangeInPosition(void);
-	
+
 	/// Look and unlook are protected.  They should be called from Object::reasonToLook.  Like Capture, or death.
 	void look();
 	void unlook();
@@ -702,7 +704,11 @@ class Object : public Thing, public Snapshot
 
 	GeometryInfo	m_geometryInfo;
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	AIGroup*			m_group;								///< if non-NULL, we are part of this group of agents
+#else
+	RefCountPtr<AIGroup> m_group; ///< if non-NULL, we are part of this group of agents
+#endif
 
 	// These will last for my lifetime.  I will reuse them and reset them.  The truly dynamic ones are in PartitionManager
 	SightingInfo		*m_partitionLastLook;								///< Where and for whom I last looked, so I can undo its effects when I stop
@@ -761,7 +767,7 @@ class Object : public Thing, public Snapshot
 	Color													m_indicatorColor;			///< if nonzero, use this instead of controlling player's color
 
 	Coord3D												m_healthBoxOffset; ///< generally zero, except for special amorphous ones like angry mob
-	
+
 	/// @todo srj -- convert to non-DLINK list, after it is once again possible to test the change
 	MAKE_DLINK(Object, TeamMemberList)			///< other Things that are members of the same team
 
@@ -783,7 +789,7 @@ class Object : public Thing, public Snapshot
 	TTriggerInfo									m_triggerInfo[MAX_TRIGGER_AREA_INFOS];
 	UnsignedInt										m_enteredOrExitedFrame;
 	ICoord3D											m_iPos;
-	
+
 	PathfindLayerEnum							m_layer;							// Layer object is pathing on.
 	PathfindLayerEnum							m_destinationLayer;		// Layer of current path goal.
 
@@ -792,13 +798,13 @@ class Object : public Thing, public Snapshot
 	Coord2D												m_formationOffset;
 
 	AsciiString										m_commandSetStringOverride;///< To allow specific object to switch command sets
-	
+
 	UnsignedInt										m_safeOcclusionFrame;	///<flag used by occlusion renderer so it knows when objects have exited their production building.
 
 	// --------- BYTE-SIZED THINGS GO HERE
 	Bool													m_isSelectable;
 	Bool													m_modulesReady;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	Bool													m_hasDiedAlready;
 #endif
 	UnsignedByte									m_scriptStatus;					///< status as set by scripting, corresponds to ORed ObjectScriptStatusBits
@@ -807,7 +813,7 @@ class Object : public Thing, public Snapshot
 	Bool													m_singleUseCommandUsed;
 	Bool													m_isReceivingDifficultyBonus;
 
-};  // end class Object
+};
 
 // deleteInstance is not meant to be used with Object in order to require the use of TheGameLogic->destroyObject()
 void deleteInstance(Object* object) CPP_11(= delete);
@@ -815,7 +821,7 @@ void deleteInstance(Object* object) CPP_11(= delete);
 // describe an object as an AsciiString: e.g. "Object 102 (KillerBuggy) [GLARocketBuggy, owned by player 2 (GLAIntroPlayer)]"
 AsciiString DebugDescribeObject(const Object *obj);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	#define DEBUG_OBJECT_ID_EXISTS
 #else
 	#undef DEBUG_OBJECT_ID_EXISTS
@@ -824,5 +830,3 @@ AsciiString DebugDescribeObject(const Object *obj);
 #ifdef DEBUG_OBJECT_ID_EXISTS
 extern ObjectID TheObjectIDToDebug;
 #endif
-
-#endif // _OBJECT_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h
index 627fcc0a69a..d39dd19c00b 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h
@@ -32,9 +32,6 @@
 
 #pragma once
 
-#ifndef _ObjectCreationList_H_
-#define _ObjectCreationList_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameMemory.h"
 
@@ -49,24 +46,24 @@ class Object;
 /**
 	An ObjectCreationNugget encapsulates the creation of an Object. ObjectCreationNuggets are virtually
 	never used on their own, but rather, as a component of an ObjectCreationList (see below).
-	
+
 	Important notes:
 
 	-- ObjectCreationNugget is an ABC; all the implementations are (currently) located in ObjectCreationList.cpp,
 	thought they will probably be spread out more as we add more implementations.
 
-	-- As part of an ObjectCreationList, an ObjectCreationNugget is shared between multiple units. The implication is that 
-	an ObjectCreationNugget should not require private data storage to do what it needs to do, aside from stuff 
-	initialized at ObjectCreationNugget instantiation time (eg, parameters from an INI file). To help 
+	-- As part of an ObjectCreationList, an ObjectCreationNugget is shared between multiple units. The implication is that
+	an ObjectCreationNugget should not require private data storage to do what it needs to do, aside from stuff
+	initialized at ObjectCreationNugget instantiation time (eg, parameters from an INI file). To help
 	enforce this, all it's methods are declared 'const'. If you can't implement what you
 	need within this framework, please *don't* simply de-const things, because it could lead to very
 	strange side-effects. Instead, the system will have to be enhanced to allow for multiple instances
 	of each ObjectCreationNugget.
 
-	-- an individual ObjectCreationNugget is generally not directly accessible to anyone outside of the	
+	-- an individual ObjectCreationNugget is generally not directly accessible to anyone outside of the
 	ObjectCreationList system; in fact, it could probably be a private class, but isn't, mainly for coding convenience.
 
-	-- Unlike most other game systems, ObjectCreationNuggets can't be overridden by subsequent INI file 
+	-- Unlike most other game systems, ObjectCreationNuggets can't be overridden by subsequent INI file
 	loads. This isn't really a problem, because all you really need to do to "override" one is to
 	specify a different one.
 */
@@ -97,29 +94,29 @@ class ObjectCreationNugget : public MemoryPoolObject
 		object, or using the existing one.
 	*/
 	virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D *secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 ) const;
-};  
+};
 EMPTY_DTOR(ObjectCreationNugget)
 
 //-------------------------------------------------------------------------------------------------
 /**
 	An ObjectCreationList is a way of creating a particular set of Objects.
-	
+
 	Important notes:
 
 	-- an ObjectCreationList is specified solely by name, and the only parameters it receives when performing
 	its AV effects are a primary (and optional secondary) object position.
-	
+
 	-- There is no inheritance or overriding of ObjectCreationLists; if you need an ObjectCreationList that is nearly-but-not-quite
 	identical to an existing one, you must simply make an entirely new ObjectCreationList. Realistically, this shouldn't
 	be a problem, since they are pretty simple to specify, and don't consume a lot of memory.
 
-	-- an ObjectCreationList is shared between multiple units. To help 
+	-- an ObjectCreationList is shared between multiple units. To help
 	enforce this, all it's methods are declared 'const'. If you can't implement the stuff you
 	need within this framework, please *don't* simply de-const things, because it could lead to very
 	strange side-effects. Instead, the system will have to be enhanced to allow for multiple instances
 	of each ObjectCreationNugget.
 
-	-- Unlike most other game systems, ObjectCreationList can't be overridden by subsequent INI file 
+	-- Unlike most other game systems, ObjectCreationList can't be overridden by subsequent INI file
 	loads. This isn't really a problem, because all you really need to do to "override" one is to
 	specify a different one.
 */
@@ -137,9 +134,9 @@ class ObjectCreationList
 
 	// Kris: August 23, 2003
 	// All OCLs return the first object that is created (or NULL if not applicable).
-	inline static Object* create( const ObjectCreationList* ocl, const Object* primaryObj, const Coord3D *primary, const Coord3D *secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 )
+	static Object* create( const ObjectCreationList* ocl, const Object* primaryObj, const Coord3D *primary, const Coord3D *secondary, Bool createOwner, UnsignedInt lifetimeFrames = 0 )
 	{
-		if( ocl ) 
+		if( ocl )
 			return ocl->createInternal( primaryObj, primary, secondary, createOwner, lifetimeFrames );
 		return NULL;
 	}
@@ -147,9 +144,9 @@ class ObjectCreationList
 	// Kris: August 23, 2003
 	// All OCLs return the first object that is created (or NULL if not applicable).
 	/// inline convenience method to avoid having to check for null.
-	inline static Object* create(const ObjectCreationList* ocl, const Object* primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 )
+	static Object* create(const ObjectCreationList* ocl, const Object* primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 )
 	{
-		if (ocl) 
+		if (ocl)
 			return ocl->createInternal( primaryObj, primary, secondary, angle, lifetimeFrames );
 		return NULL;
 	}
@@ -157,9 +154,9 @@ class ObjectCreationList
 	// Kris: August 23, 2003
 	// All OCLs return the first object that is created (or NULL if not applicable).
 	/// inline convenience method to avoid having to check for null.
-	inline static Object* create( const ObjectCreationList* ocl, const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 )
+	static Object* create( const ObjectCreationList* ocl, const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 )
 	{
-		if (ocl) 
+		if (ocl)
 			return ocl->createInternal( primary, secondary, lifetimeFrames );
 		return NULL;
 	}
@@ -178,11 +175,11 @@ class ObjectCreationList
 	typedef std::vector<ObjectCreationNugget*> ObjectCreationNuggetVector;
 	ObjectCreationNuggetVector m_nuggets;
 
-};  
+};
 
 //-------------------------------------------------------------------------------------------------
 /**
-	The "store" used to hold all the ObjectCreationLists in existence. 
+	The "store" used to hold all the ObjectCreationLists in existence.
 */
 class ObjectCreationListStore : public SubsystemInterface
 {
@@ -201,7 +198,7 @@ class ObjectCreationListStore : public SubsystemInterface
 		return NULL if no such ObjectCreationList exists.
 	*/
 	const ObjectCreationList *findObjectCreationList(const char* name) const;
-	
+
 	static void parseObjectCreationListDefinition(INI* ini);
 
 	void addObjectCreationNugget(ObjectCreationNugget* nugget);
@@ -219,6 +216,3 @@ class ObjectCreationListStore : public SubsystemInterface
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern ObjectCreationListStore *TheObjectCreationListStore;
-
-#endif // _ObjectCreationList_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h
index 7b3c75c3a7f..6ef3f32d588 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef _OBJECT_ITER_H_
-#define _OBJECT_ITER_H_
-
 #include "Common/GameType.h"
 #include "Common/GameMemory.h"
 
@@ -69,7 +66,7 @@ enum IterOrderType CPP_11(: Int)
 	}
 	deleteInstance(iter);								// you own it, so you must delete it
 
-	note that the iterator is required to deal intelligently with deleted objects; 
+	note that the iterator is required to deal intelligently with deleted objects;
 	in particular, next() will check if an obj has been killed and simply skip it.
 */
 class ObjectIterator : public MemoryPoolObject
@@ -90,12 +87,12 @@ inline ObjectIterator::~ObjectIterator() { }
 */
 class SimpleObjectIterator : public ObjectIterator
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SimpleObjectIterator, "SimpleObjectIteratorPool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SimpleObjectIterator, "SimpleObjectIteratorPool" )
 private:
 
 	class Clump : public MemoryPoolObject
 	{
-		MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Clump, "SimpleObjectIteratorClumpPool" )		
+		MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Clump, "SimpleObjectIteratorClumpPool" )
 	public:
 
 		Clump			*m_nextClump;
@@ -135,7 +132,7 @@ class SimpleObjectIterator : public ObjectIterator
 	/**
 		throw away all contents of the iterator.
 	*/
-	void makeEmpty();	
+	void makeEmpty();
 
 	/**
 		insert an object at the head of the iterator. the given numeric value
@@ -155,7 +152,3 @@ class SimpleObjectIterator : public ObjectIterator
 	*/
 	Int getCount() { return m_clumpCount; }
 };
-
-
-#endif // _OBJECT_ITER_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h
index a2c83d16704..975f48096fd 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h
@@ -27,8 +27,6 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __OBJECTSCRIPTSTATUSBITS_H__
-#define __OBJECTSCRIPTSTATUSBITS_H__
 
 //-------------------------------------------------------------------------------------------------
 /** Object status bits */
@@ -42,6 +40,3 @@ enum ObjectScriptStatusBit CPP_11(: Int)
 	OBJECT_STATUS_SCRIPT_TARGETABLE					= 0x10,  ///< This unit can be targeted by the player, but not autoacquired.
 	// NOTE: Object currently only uses a Byte for this, so if you add status bits, you may need to enlarge that field.
 };
-
-#endif /* __OBJECTSCRIPTSTATUSBITS_H__ */
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h
index eaa2bd5d95e..f6188526916 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h
@@ -25,13 +25,10 @@
 // ObjectTypes.h //////////////////////////////////////////////////////////////////////////////////
 // Author: John McDonald, Jr.
 // September 2002
-// DO NOT DISTRIBUTE 
+// DO NOT DISTRIBUTE
 
 #pragma once
 
-#ifndef __OBJECT_TYPES_H__
-#define __OBJECT_TYPES_H__
-
 #include "Common/AsciiString.h"
 #include "Common/Snapshot.h"
 
@@ -40,13 +37,13 @@ class Player;
 class ObjectTypes : public MemoryPoolObject,
 										public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectTypes, "ObjectTypes")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ObjectTypes, "ObjectTypes")
 private:
 	typedef std::vector<AsciiString> AsciiStringVec;
 	typedef AsciiStringVec::iterator AsciiStringVecIt;
 
 private:
-	// Note, there is no direct access to m_objectTypes. Please endeavor to keep it this way, and 
+	// Note, there is no direct access to m_objectTypes. Please endeavor to keep it this way, and
 	// add any functions you might need to this class.
 	AsciiString m_listName;
 	AsciiStringVec m_objectTypes;
@@ -65,7 +62,7 @@ class ObjectTypes : public MemoryPoolObject,
 	// Maintenance
 	void addObjectType(const AsciiString &objectType);
 	void removeObjectType(const AsciiString &objectType);
-	
+
 	// Which list is this again?
 	const AsciiString& getListName() const;
 	void setListName(const AsciiString& listName);
@@ -76,7 +73,7 @@ class ObjectTypes : public MemoryPoolObject,
 
 	// Is the set empty?
 	size_t getListSize(void) const { return m_objectTypes.size(); }
-	
+
 	// I'd like to loop through, please.
 	AsciiString getNthInList( size_t index ) const { return (index < getListSize()) ? m_objectTypes[index] : AsciiString::TheEmptyString; }
 
@@ -87,5 +84,3 @@ class ObjectTypes : public MemoryPoolObject,
 	Bool canBuildAny(Player *player);
 };
 EMPTY_DTOR(ObjectTypes)
-
-#endif /* __OBJECT_TYPES_H__ */
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h
index ab4f9b54e11..627f5494d51 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h
@@ -24,12 +24,12 @@
 
 // FILE: PartitionManager.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -39,18 +39,15 @@
 // Created:    Steven Johnson, September 2001
 //
 // Desc:       Partition management, this system will allow us to partition the
-//						 objects in space, iterate objects in specified volumes, 
+//						 objects in space, iterate objects in specified volumes,
 //						 regions, by types and other properties.
 //
 //-----------------------------------------------------------------------------
 
 #pragma once
 
-#ifndef __PARTITIONMANAGER_H_
-#define __PARTITIONMANAGER_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "Common/GameCommon.h"	// ensure we get DUMP_PERF_STATS, or not
 #include "GameLogic/ObjectIter.h"
@@ -61,7 +58,7 @@
 #include "GameClient/Display.h"	// for ShroudLevel
 
 //-----------------------------------------------------------------------------
-//           defines                                                      
+//           defines
 //-----------------------------------------------------------------------------
 
 /*
@@ -77,7 +74,7 @@
 const Real HUGE_DIST = 1000000.0f;
 
 //-----------------------------------------------------------------------------
-//           Type Definitions                                                      
+//           Type Definitions
 //-----------------------------------------------------------------------------
 
 struct Coord3D;
@@ -103,7 +100,6 @@ enum ValueOrThreat CPP_11(: Int)
 {
 	VOT_CashValue = 1,
 	VOT_ThreatValue,
-	VOT_NumItems
 };
 
 // ----------------------------------------------------------------------------------------------
@@ -169,7 +165,7 @@ struct CollideLocAndNormal
 };
 
 //=====================================
-/** 
+/**
 	PartitionContactList is a utility class used by the Partition Manager
 	to hold potential collisions as it updates objects in the partition.
 	It stores pairs of potentially-colliding objects (eliminating duplicates)
@@ -180,7 +176,7 @@ class PartitionContactList;
 
 
 //=====================================
-/** 
+/**
 	This class (often called COI for short) is the abstraction
 	of the intersection between an Object and a Partition Cell.
 	For every Cell that an Object's geometry touches, even partially,
@@ -208,7 +204,7 @@ class CellAndObjectIntersection	// not MPO: we allocate these in arrays
 		list of COIs.
 	*/
 	void addCoverage(PartitionCell *cell, PartitionData *module);
-	
+
 	/**
 		make 'this' refer to nothing at all. this involves resetting the member
 		variables to null, and removing 'this' from the Cell's list of COI's.
@@ -218,22 +214,22 @@ class CellAndObjectIntersection	// not MPO: we allocate these in arrays
 	/**
 		return the Cell for this COI (null if the COI is not in use)
 	*/
-	inline PartitionCell *getCell() { return m_cell; }
+	PartitionCell *getCell() { return m_cell; }
 
 	/**
 		return the Module for this COI (null if the COI is not in use)
 	*/
-	inline PartitionData *getModule() { return m_module; }
+	PartitionData *getModule() { return m_module; }
 
 	/**
 		return the previous COI in the Cell's list of COIs.
 	*/
-	inline CellAndObjectIntersection *getPrevCoi() { return m_prevCoi; }
+	CellAndObjectIntersection *getPrevCoi() { return m_prevCoi; }
 
 	/**
 		return the next COI in the Cell's list of COIs.
 	*/
-	inline CellAndObjectIntersection *getNextCoi() { return m_nextCoi; }
+	CellAndObjectIntersection *getNextCoi() { return m_nextCoi; }
 
 	// only for use by PartitionCell.
 	void friend_addToCellList(CellAndObjectIntersection **pListHead);
@@ -256,7 +252,7 @@ class SightingInfo : public MemoryPoolObject, public Snapshot
 	Coord3D					m_where;
 	Real						m_howFar;
 	PlayerMaskType	m_forWhom;	// ask not for whom the sighting is masked; it masks for thee
-	
+
 	UnsignedInt			m_data;			// Threat and value use as the value.  Sighting uses it for a Timestamp
 
 protected:
@@ -270,7 +266,7 @@ class SightingInfo : public MemoryPoolObject, public Snapshot
 
 //=====================================
 /**
-	We sometimes need to save whether or not an area was fogged or permanently revealed through a 
+	We sometimes need to save whether or not an area was fogged or permanently revealed through a
 	script. This helps us do so.
 */
 //=====================================
@@ -284,11 +280,11 @@ enum
 struct ShroudStatusStoreRestore
 {
 	std::vector<UnsignedByte> m_foggedOrRevealed[MAX_PLAYER_COUNT];
-	Int m_cellsWide;	// m_cellsHigh is computed by m_foggedOrRevealed[0].size() / m_cellsWide 
+	Int m_cellsWide;	// m_cellsHigh is computed by m_foggedOrRevealed[0].size() / m_cellsWide
 };
 
 //=====================================
-/** 
+/**
 	The world's terrain is partitioned into a large grid of Partition Cells.
 	The Cell is the fundamental unit of space in the Partition Manager.
 */
@@ -297,7 +293,7 @@ class PartitionCell : public Snapshot	// not MPO: allocated in an array
 {
 private:
 	CellAndObjectIntersection*		m_firstCoiInCell;	///< list of COIs in this cell (may be null).
-	ShroudLevel										m_shroudLevel[MAX_PLAYER_COUNT];	
+	ShroudLevel										m_shroudLevel[MAX_PLAYER_COUNT];
 #ifdef PM_CACHE_TERRAIN_HEIGHT
 	Real													m_loTerrainZ;			///< lowest terrain-pt in this cell
 	Real													m_hiTerrainZ;			///< highest terrain-pt in this cell
@@ -346,13 +342,13 @@ class PartitionCell : public Snapshot	// not MPO: allocated in an array
 	void invalidateShroudedStatusForAllCois(Int playerIndex);
 
 #ifdef PM_CACHE_TERRAIN_HEIGHT
-	inline Real getLoTerrain() const { return m_loTerrainZ; }
-	inline Real getHiTerrain() const { return m_hiTerrainZ; }
+	Real getLoTerrain() const { return m_loTerrainZ; }
+	Real getHiTerrain() const { return m_hiTerrainZ; }
 #endif
 
 	void getCellCenterPos(Real& x, Real& y);
 
-	inline CellAndObjectIntersection *getFirstCoiInCell() { return m_firstCoiInCell; }
+	CellAndObjectIntersection *getFirstCoiInCell() { return m_firstCoiInCell; }
 
 	#ifdef RTS_DEBUG
 	void validateCoiList();
@@ -366,14 +362,14 @@ class PartitionCell : public Snapshot	// not MPO: allocated in an array
 };
 
 //=====================================
-/** 
+/**
 	A PartitionData is the part of an Object that understands
 	how to maintain the Object in the space partitioning system.
 */
 //=====================================
 class PartitionData : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PartitionData, "PartitionDataPool" )		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PartitionData, "PartitionDataPool" )
 
 private:
 
@@ -393,14 +389,14 @@ class PartitionData : public MemoryPoolObject
 
 	Int													m_coiArrayCount;					///< number of COIs allocated (may be more than are in use)
 	Int													m_coiInUseCount;					///< number of COIs that are actually in use
-	CellAndObjectIntersection		*m_coiArray;							///< The array of COIs 
+	CellAndObjectIntersection		*m_coiArray;							///< The array of COIs
 	Int													m_doneFlag;
 	DirtyStatus									m_dirtyStatus;
-	ObjectShroudStatus					m_shroudedness[MAX_PLAYER_COUNT];						
-	ObjectShroudStatus					m_shroudednessPrevious[MAX_PLAYER_COUNT];	///<previous frames value of m_shroudedness						
+	ObjectShroudStatus					m_shroudedness[MAX_PLAYER_COUNT];
+	ObjectShroudStatus					m_shroudednessPrevious[MAX_PLAYER_COUNT];	///<previous frames value of m_shroudedness
 	Bool												m_everSeenByPlayer[MAX_PLAYER_COUNT];		///<whether this object has ever been seen by a given player.
 	const PartitionCell					*m_lastCell;							///< The last cell I thought my center was in.
-	
+
 	/**
 		Given a shape's geometry and size parameters, calculate the maximum number of COIs
 		that the object could possibly occupy.
@@ -419,7 +415,7 @@ class PartitionData : public MemoryPoolObject
 	*/
 	void allocCoiArray();
 
-	/** 
+	/**
 		free the array of COIs (m_coiArray) for this module (if any).
 	*/
 	void freeCoiArray();
@@ -427,7 +423,7 @@ class PartitionData : public MemoryPoolObject
 	/**
 			marks self as touching no cells. (and any previous cells as not touching self!)
 	*/
-	void removeAllTouchedCells();									
+	void removeAllTouchedCells();
 
 	/**
 		this discards all current 'touch' information (via removeAllTouchedCells) and recalculates
@@ -515,8 +511,8 @@ class PartitionData : public MemoryPoolObject
 
 	ObjectShroudStatus getShroudedStatus(Int playerIndex);
 
-	inline Int wasSeenByAnyPlayers() const	///<check if a player in the game has seen the object but is now looking at fogged version.
-	{	
+	Int wasSeenByAnyPlayers() const	///<check if a player in the game has seen the object but is now looking at fogged version.
+	{
 		Int i=0;
 		for (; i<MAX_PLAYER_COUNT; i++)
 			if (m_everSeenByPlayer[i] && m_shroudedness[i] == OBJECTSHROUD_FOGGED)
@@ -528,7 +524,7 @@ class PartitionData : public MemoryPoolObject
 	Int getControllingPlayerIndex() const;
 
 	/**
-		enumerate the objects that share space with 'this' 
+		enumerate the objects that share space with 'this'
 		(ie, the objects in the same Partition Cells) and
 		add 'em to the given contact list. also, if self
 		is intersecting the ground, add it to the list as a possible
@@ -543,7 +539,7 @@ class PartitionData : public MemoryPoolObject
 	void friend_setGhostObject(GhostObject *object) {m_ghostObject=object;}	///<used by ghost object manager to free link to partition data.
 	void friend_setShroudednessPrevious(Int playerIndex,ObjectShroudStatus status); ///<only used to restore state after map border resizing and/or xfer!
 	ObjectShroudStatus friend_getShroudednessPrevious(Int playerIndex) {return m_shroudednessPrevious[playerIndex];}
-	
+
 	void friend_removeAllTouchedCells() { removeAllTouchedCells(); }	///< this is only for use by PartitionManager
 	void friend_updateCellsTouched()	{ updateCellsTouched(); } ///< this is only for use by PartitionManager
 	Int friend_getCoiInUseCount() { return m_coiInUseCount; } ///< this is only for use by PartitionManager
@@ -554,13 +550,13 @@ class PartitionData : public MemoryPoolObject
 	Int friend_getDoneFlag() { return m_doneFlag; }
 	void friend_setDoneFlag(Int i) { m_doneFlag = i; }
 
-	inline Bool isInListDirtyModules(PartitionData* const* pListHead) const
+	Bool isInListDirtyModules(PartitionData* const* pListHead) const
 	{
 		Bool result = (*pListHead == this || m_prevDirty || m_nextDirty);
 		DEBUG_ASSERTCRASH(result == (m_dirtyStatus != NOT_DIRTY), ("dirty flag mismatch"));
 		return result;
 	}
-	inline void prependToDirtyModules(PartitionData** pListHead)
+	void prependToDirtyModules(PartitionData** pListHead)
 	{
 		DEBUG_ASSERTCRASH((m_dirtyStatus != NOT_DIRTY), ("dirty flag mismatch"));
 		m_nextDirty = *pListHead;
@@ -596,13 +592,13 @@ class PartitionFilter
 {
 public:
 	virtual Bool allow(Object *objOther) = 0;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() = 0;
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Reject any objects that aren't currently flying.
 */
 class PartitionFilterIsFlying : public PartitionFilter
@@ -610,7 +606,7 @@ class PartitionFilterIsFlying : public PartitionFilter
 public:
 	PartitionFilterIsFlying() { }
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterIsFlying"; }
 #endif
 };
@@ -626,13 +622,13 @@ class PartitionFilterWouldCollide : public PartitionFilter
 public:
 	PartitionFilterWouldCollide(const Coord3D& pos, const GeometryInfo& geom, Real angle, Bool desired);
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterWouldCollide"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Reject any objects that aren't controlled by the same player.
 */
 class PartitionFilterSamePlayer : public PartitionFilter
@@ -642,15 +638,15 @@ class PartitionFilterSamePlayer : public PartitionFilter
 public:
 	PartitionFilterSamePlayer(const Player *player) : m_player(player) { }
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterSamePlayer"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Reject any objects that don't match the alliance
-	affiliations compared with 'm_obj'. You 
+	affiliations compared with 'm_obj'. You
 	may reject objects that are allied, neutral,
 	or enemy with respect to it.
 */
@@ -663,19 +659,19 @@ class PartitionFilterRelationship : public PartitionFilter
 	enum RelationshipAllowTypes
 	{
 		ALLOW_ALLIES					= (1<<ALLIES),		///< allow objects that m_obj considers allies
-		ALLOW_ENEMIES					= (1<<ENEMIES),		///< allow objects that m_obj considers enemy 
+		ALLOW_ENEMIES					= (1<<ENEMIES),		///< allow objects that m_obj considers enemy
 		ALLOW_NEUTRAL					= (1<<NEUTRAL)		///< allow objects that m_obj considers neutral
 	};
 	PartitionFilterRelationship(const Object *obj, Int flags) : m_obj(obj), m_flags(flags) { }
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterRelationship"; }
 #endif
 };
 
 //=====================================
 /**
-	Reject any objects that aren't on the specific 
+	Reject any objects that aren't on the specific
 	team.
 */
 class PartitionFilterAcceptOnTeam : public PartitionFilter
@@ -685,14 +681,14 @@ class PartitionFilterAcceptOnTeam : public PartitionFilter
 public:
 	PartitionFilterAcceptOnTeam(const Team *team);
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterAcceptOnTeam"; }
 #endif
 };
 
 //=====================================
 /**
-	Reject any objects that aren't on the specific 
+	Reject any objects that aren't on the specific
 	squad.
 */
 class PartitionFilterAcceptOnSquad : public PartitionFilter
@@ -702,13 +698,13 @@ class PartitionFilterAcceptOnSquad : public PartitionFilter
 public:
 	PartitionFilterAcceptOnSquad(const Squad *squad);
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterAcceptOnSquad"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Reject any objects that are not within clear line-of-sight
 	of a given object. "Line of sight" takes into account
 	terrain (ie, no hills between 'em) but does not
@@ -725,7 +721,7 @@ class PartitionFilterLineOfSight : public PartitionFilter
 public:
 	PartitionFilterLineOfSight(const Object *obj);
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterLineOfSight"; }
 #endif
 };
@@ -743,7 +739,7 @@ class PartitionFilterPossibleToAttack : public PartitionFilter
 public:
 	PartitionFilterPossibleToAttack(AbleToAttackType t, const Object *obj, CommandSourceType commandSource);
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterPossibleToAttack"; }
 #endif
 };
@@ -761,7 +757,7 @@ class PartitionFilterPossibleToEnter : public PartitionFilter
 public:
 	PartitionFilterPossibleToEnter(const Object *obj, CommandSourceType commandSource);
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterPossibleToEnter"; }
 #endif
 };
@@ -779,7 +775,7 @@ class PartitionFilterPossibleToHijack : public PartitionFilter
 public:
 	PartitionFilterPossibleToHijack(const Object *obj, CommandSourceType commandSource);
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterPossibleToHijack"; }
 #endif
 };
@@ -795,13 +791,13 @@ class PartitionFilterLastAttackedBy : public PartitionFilter
 public:
 	PartitionFilterLastAttackedBy(Object *obj);
 	virtual Bool allow(Object *other);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterLastAttackedBy"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Only objects that match the given masks are accepted.
 */
 class PartitionFilterAcceptByObjectStatus : public PartitionFilter
@@ -811,13 +807,13 @@ class PartitionFilterAcceptByObjectStatus : public PartitionFilter
 public:
 	PartitionFilterAcceptByObjectStatus( ObjectStatusMaskType mustBeSet, ObjectStatusMaskType mustBeClear) : m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear) { }
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterAcceptByObjectStatus"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Just like PartitionFilterAcceptByObjectStatus, except that objects
 	that match the given masks are REJECTED.
 */
@@ -826,18 +822,18 @@ class PartitionFilterRejectByObjectStatus : public PartitionFilter
 private:
 	ObjectStatusMaskType m_mustBeSet, m_mustBeClear;
 public:
-	PartitionFilterRejectByObjectStatus( ObjectStatusMaskType mustBeSet, ObjectStatusMaskType mustBeClear ) 
-		: m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear) 
-	{ 
+	PartitionFilterRejectByObjectStatus( ObjectStatusMaskType mustBeSet, ObjectStatusMaskType mustBeClear )
+		: m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear)
+	{
 	}
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterRejectByObjectStatus"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Objects that are stealthed and not detected or disguised are accepted or rejected based on allow bool.
 */
 class PartitionFilterStealthedAndUndetected : public PartitionFilter
@@ -846,15 +842,15 @@ class PartitionFilterStealthedAndUndetected : public PartitionFilter
 	const Object *m_obj;
 	Bool m_allow;
 public:
-	PartitionFilterStealthedAndUndetected( const Object *obj, Bool allow ) { m_obj = obj; m_allow = allow; } 
+	PartitionFilterStealthedAndUndetected( const Object *obj, Bool allow ) { m_obj = obj; m_allow = allow; }
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterStealthedAndUndetected"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Only objects that match the given masks are accepted.
 */
 class PartitionFilterAcceptByKindOf : public PartitionFilter
@@ -864,13 +860,13 @@ class PartitionFilterAcceptByKindOf : public PartitionFilter
 public:
 	PartitionFilterAcceptByKindOf(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) : m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear) { }
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterAcceptByKindOf"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	Just like PartitionFilterAcceptByKindOf, except that objects
 	that match the given masks are REJECTED.
 */
@@ -879,18 +875,18 @@ class PartitionFilterRejectByKindOf : public PartitionFilter
 private:
 	KindOfMaskType m_mustBeSet, m_mustBeClear;
 public:
-	PartitionFilterRejectByKindOf(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) 
-		: m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear) 
-	{ 
+	PartitionFilterRejectByKindOf(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear)
+		: m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear)
+	{
 	}
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterRejectByKindOf"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
  * Reject any objects "behind" the given object.
  * This is a 3D check.
  */
@@ -901,7 +897,7 @@ class PartitionFilterRejectBehind: public PartitionFilter
 public:
 	PartitionFilterRejectBehind( Object *obj );
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterRejectBehind"; }
 #endif
 };
@@ -916,7 +912,7 @@ class PartitionFilterAlive : public PartitionFilter
 	PartitionFilterAlive(void) { }
 protected:
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterAlive"; }
 #endif
 };
@@ -934,7 +930,7 @@ class PartitionFilterSameMapStatus : public PartitionFilter
 	PartitionFilterSameMapStatus(const Object *obj) : m_obj(obj) { }
 protected:
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterSameMapStatus"; }
 #endif
 };
@@ -949,14 +945,14 @@ class PartitionFilterOnMap : public PartitionFilter
 	PartitionFilterOnMap() { }
 protected:
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterOnMap"; }
 #endif
 };
 
 //=====================================
 /**
- * Reject buildings, unless they can attack, or 
+ * Reject buildings, unless they can attack, or
  * we are the computer-controlled AI and the building
  * is owned by the enemy.
  */
@@ -969,7 +965,7 @@ class PartitionFilterRejectBuildings : public PartitionFilter
 	PartitionFilterRejectBuildings(const Object *o);
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterRejectBuildings"; }
 #endif
 };
@@ -977,7 +973,7 @@ class PartitionFilterRejectBuildings : public PartitionFilter
 //=====================================
 /**
  * Accept/Reject Insignificant buildings
- * Note: This will allow things that 
+ * Note: This will allow things that
  */
 class PartitionFilterInsignificantBuildings : public PartitionFilter
 {
@@ -985,11 +981,11 @@ class PartitionFilterInsignificantBuildings : public PartitionFilter
 	Bool m_allowNonBuildings;
 	Bool m_allowInsignificant;
 public:
-	PartitionFilterInsignificantBuildings(Bool allowNonBuildings, Bool allowInsignificant) : 
+	PartitionFilterInsignificantBuildings(Bool allowNonBuildings, Bool allowInsignificant) :
 			m_allowNonBuildings(allowNonBuildings), m_allowInsignificant(allowInsignificant) {}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterInsignificantBuildings"; }
 #endif
 };
@@ -1003,11 +999,11 @@ class PartitionFilterFreeOfFog : public PartitionFilter
 private:
 	Int m_comparisonIndex;
 public:
-	PartitionFilterFreeOfFog(Int toWhom) : 
+	PartitionFilterFreeOfFog(Int toWhom) :
 			m_comparisonIndex(toWhom){}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterFreeOfFog"; }
 #endif
 };
@@ -1024,7 +1020,7 @@ class PartitionFilterRepulsor : public PartitionFilter
 	PartitionFilterRepulsor(const Object *o) : m_self(o) { }
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterRepulsor"; }
 #endif
 };
@@ -1045,7 +1041,7 @@ class PartitionFilterIrregularArea : public PartitionFilter
 	PartitionFilterIrregularArea(Coord3D* area, Int numPointsInArea) : m_area(area), m_numPointsInArea(numPointsInArea) {}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterIrregularArea"; }
 #endif
 };
@@ -1065,7 +1061,7 @@ class PartitionFilterPolygonTrigger : public PartitionFilter
 	PartitionFilterPolygonTrigger(const PolygonTrigger *trigger) : m_trigger(trigger) {}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterPolygonTrigger"; }
 #endif
 };
@@ -1085,7 +1081,7 @@ class PartitionFilterPlayer : public PartitionFilter
 	PartitionFilterPlayer(const Player *player, Bool match) : m_player(player), m_match(match) {}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterPlayer"; }
 #endif
 };
@@ -1093,7 +1089,7 @@ class PartitionFilterPlayer : public PartitionFilter
 //=====================================
 /**
  * Allow or reject (based on match) all Objects whose affiliation matches one of those
- * specified by 
+ * specified by
  */
 class PartitionFilterPlayerAffiliation : public PartitionFilter
 {
@@ -1105,12 +1101,12 @@ class PartitionFilterPlayerAffiliation : public PartitionFilter
 public:
 	// whichAffiliation should use AllowPlayerRelationship flags specified in PlayerList.h
 	PartitionFilterPlayerAffiliation(const Player *player, UnsignedInt whichAffiliation, Bool match)
-		: m_player(player), m_affiliation(whichAffiliation), m_match(match) 
+		: m_player(player), m_affiliation(whichAffiliation), m_match(match)
 	{
 	}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterPlayerAffiliation"; }
 #endif
 };
@@ -1127,10 +1123,12 @@ class PartitionFilterThing : public PartitionFilter
 	Bool  m_match;
 
 public:
-	PartitionFilterThing(const ThingTemplate *thing, Bool match) : m_tThing(thing), m_match(match) {}
+	PartitionFilterThing(const ThingTemplate *thing, Bool match) : m_tThing(thing), m_match(match) {
+		DEBUG_ASSERTCRASH(m_tThing != NULL, ("ThingTemplate for PartitionFilterThing is NULL"));
+	}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterThing"; }
 #endif
 };
@@ -1146,16 +1144,13 @@ class PartitionFilterGarrisonable : public PartitionFilter
 	Bool  m_match;
 
 public:
-	PartitionFilterGarrisonable( Bool match ) : m_match(match) 
+	PartitionFilterGarrisonable( Bool match ) : m_match(match)
 	{
-		//Added By Sadullah Nader
-		//Initializations 
 		m_player = NULL;
-		//
 	}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterGarrisonable"; }
 #endif
 };
@@ -1173,19 +1168,19 @@ class PartitionFilterGarrisonableByPlayer : public PartitionFilter
 
 public:
 	PartitionFilterGarrisonableByPlayer( Player *player, Bool match, CommandSourceType commandSource ):
-			m_player(player), m_match(match), m_commandSource(commandSource) 
+			m_player(player), m_match(match), m_commandSource(commandSource)
 	{
 	}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterGarrisonableByPlayer"; }
 #endif
 };
 
 //=====================================
 /**
- * Accept all objects that are/n't unmanned. 
+ * Accept all objects that are/n't unmanned.
  */
 class PartitionFilterUnmannedObject : public PartitionFilter
 {
@@ -1196,7 +1191,7 @@ class PartitionFilterUnmannedObject : public PartitionFilter
 	PartitionFilterUnmannedObject( Bool match ) : m_match(match) {}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterUnmannedObject"; }
 #endif
 };
@@ -1214,17 +1209,17 @@ class PartitionFilterValidCommandButtonTarget : public PartitionFilter
 	CommandSourceType m_commandSource;
 
 public:
-	PartitionFilterValidCommandButtonTarget( Object *source, const CommandButton *commandButton, Bool match, CommandSourceType commandSource) : 
+	PartitionFilterValidCommandButtonTarget( Object *source, const CommandButton *commandButton, Bool match, CommandSourceType commandSource) :
 		m_source(source), m_commandButton(commandButton), m_match(match), m_commandSource(commandSource) {}
 protected:
 	virtual Bool allow( Object *other );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterValidCommandButtonTarget"; }
 #endif
 };
 
 //=====================================
-/** 
+/**
 	PartitionManager is the singleton class that manages the entire partition/collision
 	system. It maintains the set of PartitionCells that correspond to the world system,
 	and updates the PartitionDatas as needed during update phase.
@@ -1261,15 +1256,15 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 protected:
 
 	/**
-		This is an internal function that is used to implement the public 
-		getClosestObject and iterateObjects calls. 
+		This is an internal function that is used to implement the public
+		getClosestObject and iterateObjects calls.
 	*/
 	Object *getClosestObjects(
-		const Object *obj, 
-		const Coord3D *pos, 
-		Real maxDist, 
-		DistanceCalculationType dc, 
-		PartitionFilter **filters, 
+		const Object *obj,
+		const Coord3D *pos,
+		Real maxDist,
+		DistanceCalculationType dc,
+		PartitionFilter **filters,
 		SimpleObjectIterator *iter,	// if nonnull, append ALL satisfactory objects to the iterator (not just the single closest)
 		Real *closestDistArg,
 		Coord3D *closestVecArg
@@ -1284,7 +1279,7 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	typedef Int (*CellAlongLineProc)(PartitionCell* cell, void* userData);
 
 	Int iterateCellsAlongLine(const Coord3D& pos, const Coord3D& posOther, CellAlongLineProc proc, void* userData);
-	
+
 	// note iterateCellsBreadthFirst returns the cell index that made the CellBreadthFirstProc return
 	// non-Zero.
 	typedef Int (*CellBreadthFirstProc)(PartitionCell* cell, void* userData);
@@ -1295,7 +1290,7 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	void calcRadiusVec();
 #endif
 
-	// These are all friend functions now. They will continue to function as before, but can be passed into 
+	// These are all friend functions now. They will continue to function as before, but can be passed into
 	// the DiscreteCircle::drawCircle function.
 	friend void hLineAddLooker(Int x1, Int x2, Int y, void *playerIndex);
 	friend void hLineRemoveLooker(Int x1, Int x2, Int y, void *playerIndex);
@@ -1326,7 +1321,7 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	void xfer( Xfer *xfer );
 	void loadPostProcess( void );
 
-	inline Bool getUpdatedSinceLastReset( void ) const { return m_updatedSinceLastReset; }
+	Bool getUpdatedSinceLastReset( void ) const { return m_updatedSinceLastReset; }
 
 	void registerObject( Object *object );				///< add thing to system
 	void unRegisterObject( Object *object );			///< remove thing from system
@@ -1345,7 +1340,7 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	PartitionCell *getCellAt(Int x, Int y);
 	const PartitionCell *getCellAt(Int x, Int y) const;
 
-	/// A convenience funtion to reveal shroud at some location 
+	/// A convenience funtion to reveal shroud at some location
 	// Queueing does not give you control of the timestamp to enforce the queue.  I own the delay, you don't.
 	void doShroudReveal( Real centerX, Real centerY, Real radius, PlayerMaskType playerMask);
 	void undoShroudReveal( Real centerX, Real centerY, Real radius, PlayerMaskType playerMask);
@@ -1363,24 +1358,24 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	void getCellCenterPos(Int x, Int y, Real& xx, Real& yy);
 
 	// find the cell that covers the world coords (wx,wy) and return its coords.
-	void worldToCell(Real wx, Real wy, Int *cx, Int *cy);
+	void worldToCell(Real wx, Real wy, Int *cx, Int *cy) const;
 
 	// given a distance in world coords, return the number of cells needed to cover that distance (rounding up)
 	Int worldToCellDist(Real w);
 
 	Object *getClosestObject(
-		const Object *obj, 
-		Real maxDist, 
-		DistanceCalculationType dc, 
-		PartitionFilter **filters = NULL, 
+		const Object *obj,
+		Real maxDist,
+		DistanceCalculationType dc,
+		PartitionFilter **filters = NULL,
 		Real *closestDist = NULL,
 		Coord3D *closestDistVec = NULL
 	);
 	Object *getClosestObject(
-		const Coord3D *pos, 
-		Real maxDist, 
-		DistanceCalculationType dc, 
-		PartitionFilter **filters = NULL, 
+		const Coord3D *pos,
+		Real maxDist,
+		DistanceCalculationType dc,
+		PartitionFilter **filters = NULL,
 		Real *closestDist = NULL,
 		Coord3D *closestDistVec = NULL
 	);
@@ -1411,48 +1406,48 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 #endif
 
 	SimpleObjectIterator *iterateObjectsInRange(
-		const Object *obj, 
-		Real maxDist, 
-		DistanceCalculationType dc, 
-		PartitionFilter **filters = NULL, 
+		const Object *obj,
+		Real maxDist,
+		DistanceCalculationType dc,
+		PartitionFilter **filters = NULL,
 		IterOrderType order = ITER_FASTEST
 	);
 
 	SimpleObjectIterator *iterateObjectsInRange(
-		const Coord3D *pos, 
-		Real maxDist, 
-		DistanceCalculationType dc, 
-		PartitionFilter **filters = NULL, 
+		const Coord3D *pos,
+		Real maxDist,
+		DistanceCalculationType dc,
+		PartitionFilter **filters = NULL,
 		IterOrderType order = ITER_FASTEST
 	);
 
-	SimpleObjectIterator *iterateAllObjects(PartitionFilter **filters = NULL);		
+	SimpleObjectIterator *iterateAllObjects(PartitionFilter **filters = NULL);
 
 	/**
 		return the Objects that would (or would not) collide with the given
 		geometry.
 	*/
 	SimpleObjectIterator* iteratePotentialCollisions(
-		const Coord3D* pos, 
+		const Coord3D* pos,
 		const GeometryInfo& geom,
 		Real angle,
 		Bool use2D = false
 	);
-	
+
 	Bool isColliding( const Object *a, const Object *b ) const;
 
-	/// Checks a geometry against an arbitrary geometry. 
-	Bool geomCollidesWithGeom( const Coord3D* pos1, 
+	/// Checks a geometry against an arbitrary geometry.
+	Bool geomCollidesWithGeom( const Coord3D* pos1,
 							const GeometryInfo& geom1,
-							Real angle1, 
-							const Coord3D* pos2, 
+							Real angle1,
+							const Coord3D* pos2,
 							const GeometryInfo& geom2,
-							Real angle2 
+							Real angle2
   ) const;
 
 	/// finding legal positions in the world
 	Bool findPositionAround( const Coord3D *center,
-													 const FindPositionOptions *options, 
+													 const FindPositionOptions *options,
 													 Coord3D *result );
 
 	/// return the size of a PartitionCell, in world coords.
@@ -1461,26 +1456,26 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	/// return (1.0 / getCellSize); this is used frequently, so we cache it for efficiency
 	Real getCellSizeInv() { return m_cellSizeInv; }
 
-	/** 
+	/**
 		return true iff there is clear line-of-sight between the two positions.
-		this only takes terrain into account; it does not consider objects, units, 
-		trees, buildings, etc. 
+		this only takes terrain into account; it does not consider objects, units,
+		trees, buildings, etc.
 	*/
 	Bool isClearLineOfSightTerrain(const Object* obj, const Coord3D& objPos, const Object* other, const Coord3D& otherPos);
 
-	inline Bool isInListDirtyModules(PartitionData* o) const
+	Bool isInListDirtyModules(PartitionData* o) const
 	{
 		return o->isInListDirtyModules(&m_dirtyModules);
 	}
-	inline void prependToDirtyModules(PartitionData* o)
+	void prependToDirtyModules(PartitionData* o)
 	{
 		o->prependToDirtyModules(&m_dirtyModules);
 	}
-	inline void removeFromDirtyModules(PartitionData* o)
+	void removeFromDirtyModules(PartitionData* o)
 	{
 		o->removeFromDirtyModules(&m_dirtyModules);
 	}
-	inline void removeAllDirtyModules()
+	void removeAllDirtyModules()
 	{
 		while (m_dirtyModules)
 		{
@@ -1489,22 +1484,22 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 		}
 	}
 
-	/** 
+	/**
 		Reveals the map for the given player, but does not override Shroud generation.  (Script)
 		*/
 	void revealMapForPlayer( Int playerIndex );
 
-	/** 
+	/**
 		Reveals the map for the given player, AND permanently disables all Shroud generation (Observer Mode).
 		*/
 	void revealMapForPlayerPermanently( Int playerIndex );
 
-	/** 
+	/**
 		Adds a layer of permanent blindness.  Used solely to undo the permanent reveal for debugging
 		*/
 	void undoRevealMapForPlayerPermanently( Int playerIndex );
 
-	/** 
+	/**
 		Resets the shroud for the given player with passive shroud (can re-explore).
 		*/
 	void shroudMapForPlayer( Int playerIndex );
@@ -1521,7 +1516,7 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	CellShroudStatus getShroudStatusForPlayer( Int playerIndex, Int x, Int y ) const;
 	CellShroudStatus getShroudStatusForPlayer( Int playerIndex, const Coord3D *loc ) const;
 
-	ObjectShroudStatus getPropShroudStatusForPlayer(Int playerIndex, const Coord3D *loc ) const; 
+	ObjectShroudStatus getPropShroudStatusForPlayer(Int playerIndex, const Coord3D *loc ) const;
 
 	Real getGroundOrStructureHeight(Real posx, Real posy);
 
@@ -1529,14 +1524,14 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	void getNearestGroupWithValue( Int playerIndex, UnsignedInt whichPlayerTypes, ValueOrThreat valType, const Coord3D *sourceLocation,
 																 Int valueRequired, Bool greaterThan, Coord3D *outLocation );
 
-	// If saveToFog is true, then we are writing STORE_FOG. 
+	// If saveToFog is true, then we are writing STORE_FOG.
 	// If saveToFog is false, then we are writing STORE_PERMENANT_REVEAL
 	void storeFoggedCells(ShroudStatusStoreRestore &outPartitionStore, Bool storeToFog) const;
 	void restoreFoggedCells(const ShroudStatusStoreRestore &inPartitionStore, Bool restoreToFog);
-};  // end class PartitionManager
+};
 
 // -----------------------------------------------------------------------------
-inline void PartitionManager::worldToCell(Real wx, Real wy, Int *cx, Int *cy)
+inline void PartitionManager::worldToCell(Real wx, Real wy, Int *cx, Int *cy) const
 {
 	*cx = REAL_TO_INT_FLOOR((wx - m_worldExtents.lo.x) * m_cellSizeInv);
 	*cy = REAL_TO_INT_FLOOR((wy - m_worldExtents.lo.y) * m_cellSizeInv);
@@ -1553,7 +1548,7 @@ inline PartitionCell *PartitionManager::getCellAt(Int x, Int y)
 {
 	return (x < 0 || y < 0 || x >= m_cellCountX || y >= m_cellCountY) ? NULL : &m_cells[y * m_cellCountX + x];
 }
-	
+
 //-----------------------------------------------------------------------------
 inline const PartitionCell *PartitionManager::getCellAt(Int x, Int y) const
 {
@@ -1590,13 +1585,10 @@ class CellOutwardIterator
 #endif
 
 //-----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//           Externals                                                     
+//           Externals
 //-----------------------------------------------------------------------------
 extern PartitionManager *ThePartitionManager;  ///< object manager singleton
-
-#endif // __PARTITIONMANAGER_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h
index a7169362eff..39ef5273f28 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h
@@ -25,17 +25,14 @@
 
 // PolygonTrigger.h
 // Class to encapsulate polygon triggers for maps.
-// Note - Polygons are used for two reasons - one is area triggers for 
-// scripts, so units can be tested for entering or exiting areas, and 
+// Note - Polygons are used for two reasons - one is area triggers for
+// scripts, so units can be tested for entering or exiting areas, and
 // second to specify areas that are filled with water in the map.
 // See the m_isWaterArea to differentiate.
 // Author: John Ahlquist, November 2001
 
 #pragma once
 
-#ifndef PolygonTrigger_H
-#define PolygonTrigger_H
-
 #include "Common/GameMemory.h"
 #include "Common/Snapshot.h"
 #include "Common/STLTypedefs.h"
@@ -57,7 +54,7 @@ class WaterHandle
 
 	WaterHandle( void ) { m_polygon = NULL; }
 
-	///@todo we need to formalize the water systems 
+	///@todo we need to formalize the water systems
 	PolygonTrigger *m_polygon;	///< valid when water is a polygon area, NULL if water is a grid
 
 };
@@ -67,7 +64,7 @@ class WaterHandle
 class PolygonTrigger : public MemoryPoolObject,
 											 public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PolygonTrigger, "PolygonTrigger")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PolygonTrigger, "PolygonTrigger")
 
 protected:
 	PolygonTrigger*		m_nextPolygonTrigger;		///< linked list.
@@ -77,7 +74,7 @@ class PolygonTrigger : public MemoryPoolObject,
 	ICoord3D*					m_points;	///< Points that are the polygon.
 	Int								m_numPoints; ///< Num points in m_points.
 	Int								m_sizePoints; ///< Space allocated for m_points.
-	mutable IRegion2D	m_bounds;  ///< 2D bounding box for quick checks.	
+	mutable IRegion2D	m_bounds;  ///< 2D bounding box for quick checks.
 	mutable Real			m_radius;
 	Int								m_riverStart;	///< Identifies the start point of the river.
 	mutable Bool			m_boundsNeedsUpdate;
@@ -123,7 +120,7 @@ class PolygonTrigger : public MemoryPoolObject,
 	void setTriggerName(AsciiString name) {m_triggerName = name;};
 
 	void setLayerName(AsciiString name) {m_layerName = name;};
-	AsciiString getLayerName(void)  const {return m_layerName;} 
+	AsciiString getLayerName(void)  const {return m_layerName;}
 
 	void setShouldRender(Bool toggle) {m_shouldRender = toggle;}
 	Bool getShouldRender() {return m_shouldRender;}
@@ -142,16 +139,14 @@ class PolygonTrigger : public MemoryPoolObject,
 	const PolygonTrigger *getNext(void) const {return m_nextPolygonTrigger;}
 	AsciiString getTriggerName(void)  const {return m_triggerName;} ///< Gets the trigger name.
 	Bool pointInTrigger(ICoord3D &point) const;
-	Bool doExportWithScripts(void) const {return m_exportWithScripts;} 
-	void setDoExportWithScripts(Bool val) {m_exportWithScripts = val;} 
-	Bool isWaterArea(void) const {return m_isWaterArea;} 
-	void setWaterArea(Bool val) {m_isWaterArea = val;} 
-	Bool isRiver(void) const {return m_isRiver;} 
-	void setRiver(Bool val) {m_isRiver = val;} 
-	Int getRiverStart(void) const {return m_riverStart;} 
-	void setRiverStart(Int val) {m_riverStart = val;} 
+	Bool doExportWithScripts(void) const {return m_exportWithScripts;}
+	void setDoExportWithScripts(Bool val) {m_exportWithScripts = val;}
+	Bool isWaterArea(void) const {return m_isWaterArea;}
+	void setWaterArea(Bool val) {m_isWaterArea = val;}
+	Bool isRiver(void) const {return m_isRiver;}
+	void setRiver(Bool val) {m_isRiver = val;}
+	Int getRiverStart(void) const {return m_riverStart;}
+	void setRiverStart(Int val) {m_riverStart = val;}
 	const WaterHandle* getWaterHandle(void) const;
 	Bool isValid(void) const;
 };
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h
index edc3069c69b..54732967956 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __POWERS_H_
-#define __POWERS_H_
-
 //
 // skeleton definition of unit powers
 //
@@ -39,16 +36,16 @@
 // power bit flags, keep this in sync with PowerNames
 enum
 {
-	POWER_NONE = 0,				// 0x0000000000000000 
-	POWER_FASTER,					// 0x0000000000000001 
-	POWER_DOUBLE_SHOT,		// 0x0000000000000002 
-	POWER_SELF_HEALING,		// 0x0000000000000004 
+	POWER_NONE = 0,				// 0x0000000000000000
+	POWER_FASTER,					// 0x0000000000000001
+	POWER_DOUBLE_SHOT,		// 0x0000000000000002
+	POWER_SELF_HEALING,		// 0x0000000000000004
 
 	POWERS_NUM_POWERS
 };
 
 #ifdef DEFINE_POWER_NAMES
-static const char *PowerNames[] = 
+static const char *const PowerNames[] =
 {
 	"NONE",
 	"FASTER",
@@ -56,7 +53,5 @@ static const char *PowerNames[] =
 	"SELF_HEALING",
 	NULL
 };
+static_assert(ARRAY_SIZE(PowerNames) == POWERS_NUM_POWERS + 1, "Incorrect array size");
 #endif  // end DEFINE_POWER_NAMES
-
-#endif // __POWERS_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h
index 8bdd039b44d..3576c0c03e7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __RankInfo_H_
-#define __RankInfo_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/Science.h"
 #include "Common/UnicodeString.h"
@@ -76,7 +73,3 @@ class RankInfoStore : public SubsystemInterface
 };
 
 extern RankInfoStore* TheRankInfoStore;
-
-
-#endif // __RankInfo_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h
index d71c4df6102..c849fb5fa85 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SCRIPTACTIONS_H_
-#define __SCRIPTACTIONS_H_
-
 class ScriptAction;
 class GameWindow;
 class	Team;
@@ -60,7 +57,7 @@ class ScriptActionsInterface : public SubsystemInterface
 
 	// Called by the script engine in postProcessLoad()
 	virtual void doEnableOrDisableObjectDifficultyBonuses(Bool enableBonuses) = 0;
-};  // end class ScriptActionsInterface
+};
 extern ScriptActionsInterface *TheScriptActions;   ///< singleton definition
 
 
@@ -162,12 +159,12 @@ class ScriptActions : public ScriptActionsInterface
 	void doTeamHuntWithCommandButton(const AsciiString& teamName, const AsciiString& commandButton);
 	void doPlayerHunt(const AsciiString& playerName);
 	void doNamedDelete(const AsciiString& unitName);
-	
+
 	void doTeamGarrisonSpecificBuilding(const AsciiString& teamName, const AsciiString& buildingName);
 	void doTeamGarrisonNearestBuilding(const AsciiString& teamName);
 	void doTeamExitAllBuildings(const AsciiString& teamName);
 	void doExitSpecificBuilding(const AsciiString& buildingName);
-	
+
 	void doUnitGarrisonSpecificBuilding(const AsciiString& unitName, const AsciiString& buildingName);
 	void doUnitGarrisonNearestBuilding(const AsciiString& unitName);
 	void doUnitExitBuilding(const AsciiString& unitName);
@@ -178,10 +175,10 @@ class ScriptActions : public ScriptActionsInterface
 	void doBlackWhiteMode(Bool startBWMode, Int frames);	// if true, start it. If false, end it.
 	void doSkyBox(Bool showSkyBox);	// if true, start it. If false, end it.
 	void doWeather(Bool showWeather);	// if true, show weather effects defined in INI file.
-	
+
 	void doFreezeTime( void );
 	void doUnfreezeTime( void );
-	
+
 	void doMilitaryCaption(const AsciiString& briefing, Int duration);
 	void doCameraSetAudibleDistance(Real audibleDistance);
 
@@ -189,7 +186,7 @@ class ScriptActions : public ScriptActionsInterface
 
 	void doNamedSetStoppingDistance(const AsciiString& unit, Real stoppingDistance);
 	void doSetStoppingDistance(const AsciiString& team, Real stoppingDistance);
-	
+
 	void doDisableSpecialPowerDisplay( void );
 	void doEnableSpecialPowerDisplay( void );
 	void doNamedHideSpecialPowerDisplay( const AsciiString& unit );
@@ -219,9 +216,9 @@ class ScriptActions : public ScriptActionsInterface
 	void doHideCounter(const AsciiString& counterName);
 
 	void doAudioSetVolume(AudioAffect whichToAffect, Real newVolumeLevel);
-	
+
 	void doTransferTeamToPlayer(const AsciiString& teamName, const AsciiString& playerName);
-	
+
 	void doSetMoney(const AsciiString& playerName, Int money);		// Set a player's cash reserves to a specific value.
 	void doGiveMoney(const AsciiString& playerName, Int money);	// Add/subtract cash from a player's reserves.
 
@@ -376,8 +373,8 @@ class ScriptActions : public ScriptActionsInterface
 	void doGuardSupplyCenter(const AsciiString& teamName, Int supplies);
 	void doTeamGuardInTunnelNetwork(const AsciiString& teamName);
 	void doAffectPlayerSkillset(const AsciiString& playerName, Int skillset);
-	void doC3CameraShake( const AsciiString &waypointName, Real amplitude, Real duration_seconds, Real radius ); 
-	void doOverrideHulkLifetime( Real seconds );	
+	void doC3CameraShake( const AsciiString &waypointName, Real amplitude, Real duration_seconds, Real radius );
+	void doOverrideHulkLifetime( Real seconds );
 	void doNamedFaceNamed( const AsciiString &unitName, const AsciiString &faceUnitName );
 	void doNamedFaceWaypoint( const AsciiString &unitName, const AsciiString &faceWaypointName );
 	void doTeamFaceNamed( const AsciiString &teamName, const AsciiString &faceUnitName );
@@ -389,10 +386,5 @@ class ScriptActions : public ScriptActionsInterface
 	void deleteAllUnmanned();
 	void doNamedSetTrainHeld( const AsciiString &locoName, const Bool set );
   void doEnableObjectSound(const AsciiString& objectName, Bool enable);
-	
-};  // end class ScriptActions
-
-
-#endif  // end __SCRIPTACTIONS_H_
-
 
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h
index 073de455b0e..28d7e5bcf79 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SCRIPTCONDITIONS_H_
-#define __SCRIPTCONDITIONS_H_
-
 class Condition;
 class ObjectTypes;
 class Parameter;
@@ -57,7 +54,7 @@ class ScriptConditionsInterface : public SubsystemInterface
 	virtual Bool evaluateSkirmishCommandButtonIsReady( Parameter *pSkirmishPlayerParm, Parameter *pTeamParm, Parameter *pCommandButtonParm, Bool allReady ) = 0;
 	virtual Bool evaluateTeamIsContained(Parameter *pTeamParm, Bool allContained) = 0;
 
-};  // end class ScriptConditionsInterface
+};
 extern ScriptConditionsInterface *TheScriptConditions;   ///< singleton definition
 
 
@@ -95,7 +92,7 @@ class ScriptConditions : public ScriptConditionsInterface
 	Bool evaluateNamedUnitDying(Parameter *pUnitParm);
 	Bool evaluateNamedUnitTotallyDead(Parameter *pUnitParm);
 	Bool evaluateHasUnits(Parameter *pTeamParm);
-	
+
 	Bool evaluateTeamEnteredAreaEntirely(Parameter *pTeamParm, Parameter *pTriggerParm, Parameter *pTypeParm);
 	Bool evaluateTeamEnteredAreaPartially(Parameter *pTeamParm, Parameter *pTriggerParm, Parameter *pTypeParm);
 	Bool evaluateTeamExitedAreaEntirely(Parameter *pTeamParm, Parameter *pTriggerParm, Parameter *pTypeParm);
@@ -108,7 +105,7 @@ class ScriptConditions : public ScriptConditionsInterface
 	Bool evaluateNamedExitedArea(Parameter *pUnitParm, Parameter *pTriggerParm);
 	Bool evaluateNamedInsideArea(Parameter *pUnitParm, Parameter *pTriggerParm);
 	Bool evaluateNamedOutsideArea(Parameter *pUnitParm, Parameter *pTriggerParm);
-	
+
 	Bool evaluateTeamStateIs(Parameter *pTeamParm, Parameter *pStateParm);
 	Bool evaluateTeamStateIsNot(Parameter *pTeamParm, Parameter *pStateParm);
 	Bool evaluatePlayerHasCredits(Parameter *pCreditsParm, Parameter* pComparisonParm, Parameter *pPlayerParm);
@@ -161,7 +158,7 @@ class ScriptConditions : public ScriptConditionsInterface
 	Bool evaluateMusicHasCompleted(Parameter *pMusicParm, Parameter *pIntParm);
 	Bool evaluatePlayerLostObjectType(Parameter *pPlayerParm, Parameter *pTypeParm);
 
-	// Skirmish Scripts. Please note that ALL Skirmish conditions should first pass a pSkirmishPlayerParm to 
+	// Skirmish Scripts. Please note that ALL Skirmish conditions should first pass a pSkirmishPlayerParm to
 	// prevent the necessity of having to write additional scripts for other players / skirmish types later.
 	Bool evaluateSkirmishSpecialPowerIsReady(Parameter *pSkirmishPlayerParm, Parameter *pPower);
 	Bool evaluateSkirmishValueInArea(Condition *pCondition, Parameter *pSkirmishPlayerParm, Parameter *pComparisonParm, Parameter *pMoneyParm, Parameter *pTriggerParm);
@@ -182,12 +179,9 @@ class ScriptConditions : public ScriptConditionsInterface
 	Bool evaluateSkirmishSupplySourceAttacked(Parameter *pSkirmishPlayerParm );
 	Bool evaluateSkirmishStartPosition(Parameter *pSkirmishPlayerParm, Parameter *startNdx );
 
-	
+
 	// Stubs
 	Bool evaluateMissionAttempts(Parameter *pPlayerParm, Parameter *pComparisonParm, Parameter *pAttemptsParm);
 
 
-};  // end class ScriptConditions
-
-
-#endif  // end __SCRIPTCONDITIONS_H_
+};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h
index 38d3e897d6e..fe237cbceec 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __SCRIPTENGINE_H_
-#define __SCRIPTENGINE_H_
-
 #include "Common/GameType.h"
 #include "Common/GameMemory.h"
 #include "Common/STLTypedefs.h"
@@ -50,13 +47,13 @@ class Player;
 class PolygonTrigger;
 class ObjectTypes;
 
-#ifdef RTS_INTERNAL
+#ifdef RTS_PROFILE
 #define SPECIAL_SCRIPT_PROFILING
 #endif
 
 // Slightly odd place to put breeze info, but the breeze info is
 // set by script, so it's as good a place as any.  john a.
-struct BreezeInfo 
+struct BreezeInfo
 {
 	Real		m_direction;				///< Direction of the breeze in radians. 0 == +x direction.
 	Coord2D	m_directionVec;			///< sin/cos of direction, for efficiency.
@@ -73,7 +70,7 @@ struct NamedReveal
 	AsciiString m_revealName;
 	AsciiString m_waypointName;
 	Real				m_radiusToReveal;
-	AsciiString m_playerName; 
+	AsciiString m_playerName;
 };
 
 struct TScriptListReadInfo
@@ -122,7 +119,7 @@ typedef AllObjectTypes::iterator AllObjectTypesIt;
 typedef std::vector<NamedReveal> VecNamedReveal;
 typedef VecNamedReveal::iterator VecNamedRevealIt;
 
-// TheSuperHackers @compile xezon 17/03/2025 Fixes destructor visibility by removing MemoryPoolObject base class.
+// TheSuperHackers @build xezon 17/03/2025 Fixes destructor visibility by removing MemoryPoolObject base class.
 // MemoryPoolObject looks to be unnecessary because it is never dynamically allocated.
 class AttackPriorityInfo : public Snapshot
 {
@@ -160,7 +157,7 @@ class AttackPriorityInfo : public Snapshot
 
 class SequentialScript : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SequentialScript, "SequentialScript")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SequentialScript, "SequentialScript")
 
 public:
 
@@ -190,7 +187,7 @@ EMPTY_DTOR(SequentialScript)
 #ifdef NOT_IN_USE
 class SequentialScriptStatus : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SequentialScriptStatus, "SequentialScriptStatus")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SequentialScriptStatus, "SequentialScriptStatus")
 
 public:
 
@@ -234,7 +231,7 @@ class ScriptEngine : public SubsystemInterface,
 	UnsignedInt getFrameObjectCountChanged(void) {return m_frameObjectCountChanged;}
 	void setSequentialTimer(Object *obj, Int frameCount);
 	void setSequentialTimer(Team *team, Int frameCount);
-	
+
 	void removeAllSequentialScripts(Object *obj);
 	void removeAllSequentialScripts(Team *team);
 
@@ -263,7 +260,7 @@ class ScriptEngine : public SubsystemInterface,
 	Bool hasShownMPLocalDefeatWindow(void);
 	void markMPLocalDefeatWindowShown(void);
 
-	// NOTE NOTE NOTE: do not store of the return value of this call (getObjectTypeList) beyond the life of the 
+	// NOTE NOTE NOTE: do not store of the return value of this call (getObjectTypeList) beyond the life of the
 	// function it will be used in, as it can be deleted from under you if maintenance is performed on the object.
 	virtual ObjectTypes *getObjectTypes(const AsciiString& objectTypeList);
 	virtual void doObjectTypeListMaintenance(const AsciiString& objectTypeList, const AsciiString& objectType, Bool addObject);
@@ -274,7 +271,7 @@ class ScriptEngine : public SubsystemInterface,
 	// For other systems to evaluate Conditions, execute Actions, etc.
 
 	///< if pThisTeam is specified, then scripts in here can use <This Team> to mean the team this script is attached to.
-	virtual Bool evaluateConditions( Script *pScript, Team *pThisTeam = NULL, Player *pPlayer=NULL );	
+	virtual Bool evaluateConditions( Script *pScript, Team *pThisTeam = NULL, Player *pPlayer=NULL );
 	virtual void friend_executeAction( ScriptAction *pActionHead, Team *pThisTeam = NULL);	///< Use this at yer peril.
 
 	virtual Object *getUnitNamed(const AsciiString& unitName); ///< Gets the named unit. May be null.
@@ -289,7 +286,7 @@ class ScriptEngine : public SubsystemInterface,
 	virtual void notifyOfCompletedSpecialPower( Int playerIndex, const AsciiString& completedPower, ObjectID sourceObj );
 	virtual void notifyOfCompletedUpgrade			( Int playerIndex, const AsciiString& upgrade,				 ObjectID sourceObj );
 	virtual void notifyOfAcquiredScience				( Int playerIndex, ScienceType science );
-	
+
 	virtual void signalUIInteract(const AsciiString& hookName);	///< Notify that a UI button was pressed and some flag should go true, for one frame only.
 
 	virtual Bool isVideoComplete( const AsciiString& completedVideo, Bool removeFromList );	///< Determine whether a video has completed
@@ -305,10 +302,10 @@ class ScriptEngine : public SubsystemInterface,
 	virtual void adjustToppleDirection( Object *object, Coord2D *direction);
 	virtual void adjustToppleDirection( Object *object, Coord3D *direction);
 	virtual const Script *findScriptByName(const AsciiString& scriptName) {return findScript(scriptName);} ///<  Finds a script.
-		
+
 	const BreezeInfo& getBreezeInfo() const {return m_breezeInfo;}
 	void turnBreezeOff(void) {m_breezeInfo.m_intensity = 0.0f;}
-	
+
 	Bool isTimeFrozenScript( void );		///< Ask whether a script has frozen time or not
 	void doFreezeTime( void );
 	void doUnfreezeTime( void );
@@ -335,9 +332,9 @@ class ScriptEngine : public SubsystemInterface,
 	/// Attack priority stuff.
 	const AttackPriorityInfo *getDefaultAttackInfo(void);
 	const AttackPriorityInfo *getAttackInfo(const AsciiString& name);
-	
-	const TCounter *getCounter(const AsciiString& counterName);	
-	
+
+	const TCounter *getCounter(const AsciiString& counterName);
+
 	void createNamedMapReveal(const AsciiString& revealName, const AsciiString& waypointName, Real radiusToReveal, const AsciiString& playerName);
 	void doNamedMapReveal(const AsciiString& revealName);
 	void undoNamedMapReveal(const AsciiString& revealName);
@@ -353,7 +350,7 @@ class ScriptEngine : public SubsystemInterface,
 	void setEnableVTune(Bool value);
 	Bool getEnableVTune() const;
 	///End VTUNE
-//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+//#if defined(RTS_DEBUG)
 	void debugVictory( void );
 //#endif
 
@@ -415,13 +412,13 @@ class ScriptEngine : public SubsystemInterface,
 	typedef VecSequentialScriptPtr::iterator VecSequentialScriptPtrIt;
 
 	VecSequentialScriptPtr m_sequentialScripts;
-	
+
 	void evaluateAndProgressAllSequentialScripts( void );
 	VecSequentialScriptPtrIt cleanupSequentialScript(VecSequentialScriptPtrIt it, Bool cleanDanglers);
 
 	Bool hasUnitCompletedSequentialScript( Object *object, const AsciiString& sequentialScriptName );
 	Bool hasTeamCompletedSequentialScript( Team *team, const AsciiString& sequentialScriptName );
-	
+
 
 
 
@@ -441,7 +438,7 @@ class ScriptEngine : public SubsystemInterface,
 	Team							*m_conditionTeam;				///< Team that is being used to evaluate conditions, used for THIS_TEAM
 	Object						*m_conditionObject;				///< Unit that is being used to evaluate conditions, used for THIS_OBJECT
 	VecNamedRequests	m_namedObjects;
-	Bool							m_firstUpdate;			
+	Bool							m_firstUpdate;
 	Player						*m_currentPlayer;
 	Player						*m_skirmishHumanPlayer;
 	AsciiString				m_currentTrackName;
@@ -465,7 +462,7 @@ class ScriptEngine : public SubsystemInterface,
 	ListAsciiStringUINT		m_testingAudio;
 
 	ListAsciiString				m_uiInteractions;
-	
+
 	ListAsciiStringObjectID	m_triggeredSpecialPowers[MAX_PLAYER_COUNT];
 	ListAsciiStringObjectID	m_midwaySpecialPowers		[MAX_PLAYER_COUNT];
 	ListAsciiStringObjectID	m_finishedSpecialPowers	[MAX_PLAYER_COUNT];
@@ -483,7 +480,7 @@ class ScriptEngine : public SubsystemInterface,
 	AllObjectTypes		m_allObjectTypeLists;
 	Bool							m_objectsShouldReceiveDifficultyBonus;
 	Bool							m_ChooseVictimAlwaysUsesNormal;
-	
+
 	Bool							m_shownMPLocalDefeatWindow;
 
 #ifdef SPECIAL_SCRIPT_PROFILING
@@ -495,9 +492,6 @@ class ScriptEngine : public SubsystemInterface,
 #endif
 #endif
 
-};  // end class ScriptEngine
+};
 
 extern ScriptEngine *TheScriptEngine;   ///< singleton definition
-																				
-
-#endif  // end __SCRIPTENGINE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h
index 0142130f868..3b928470bd3 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef SCRIPTS_H
-#define SCRIPTS_H
-
 #include "Common/Snapshot.h"
 #include "GameNetwork/NetworkDefs.h"
 #include "Common/ObjectStatusTypes.h"
@@ -82,8 +79,8 @@ class DataChunkOutput;
 #define NO_MORE_COMPLEX_SKIRMISH_SCRIPTS
 #ifndef NO_MORE_COMPLEX_SKIRMISH_SCRIPTS
 // For now, we only actually allow the simple stuff to be chosen. However, as soon as I can get more
-// time on the schedule, we need to extend these scripts to be more useful. To that end, I've 
-// created the parameters and such necessary for more complex behavior, but for now only the 
+// time on the schedule, we need to extend these scripts to be more useful. To that end, I've
+// created the parameters and such necessary for more complex behavior, but for now only the
 // rudimentary support is enabled. jkmcd
 	#define MORE_COMPLEX_SKIRMISH_SCRIPTS
 #endif
@@ -103,15 +100,15 @@ extern const char *ShakeIntensities[];
 // ******************************** class ScriptGroup ***********************************************
 //-------------------------------------------------------------------------------------------------
 class ScriptGroup : public MemoryPoolObject, public Snapshot
-// This is a list of scripts that are grouped and named, with some 
+// This is a list of scripts that are grouped and named, with some
 // additional properties.
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ScriptGroup, "ScriptGroup")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ScriptGroup, "ScriptGroup")
 protected:
-	
+
 	// snapshot methods
 	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer ); 
+	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
 
 protected:
@@ -129,7 +126,7 @@ class ScriptGroup : public MemoryPoolObject, public Snapshot
 public:
 
 	ScriptGroup *duplicate(void) const;		// note, duplicates just this node, not the full list.
-	ScriptGroup *duplicateAndQualify(const AsciiString& qualifier, 
+	ScriptGroup *duplicateAndQualify(const AsciiString& qualifier,
 			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;		// note, duplicates just this node, not the full list.
 
 	void setName(AsciiString name) { m_groupName = name;}
@@ -158,18 +155,18 @@ class ScriptGroup : public MemoryPoolObject, public Snapshot
 /// This is a linked list of or clauses, each containing a list of and clauses.
 class OrCondition : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(OrCondition, "OrCondition")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(OrCondition, "OrCondition")
 protected:
 	OrCondition *m_nextOr;   // Next or clause.
 	Condition *m_firstAnd;	 // These are Anded.
-	
+
 public:
 	OrCondition():m_nextOr(NULL),m_firstAnd(NULL){};
 	//~OrCondition();
 	/// Duplicate creates a "deep" copy.  If it is head of a linked list, duplicates the entire list.
 	OrCondition *duplicate(void) const;
-	OrCondition *duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;		
+	OrCondition *duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;
 
 public:
 	void setNextOrCondition(OrCondition *pOr) {m_nextOr = pOr;}
@@ -182,7 +179,7 @@ class OrCondition : public MemoryPoolObject
 	void deleteCondition(Condition *pCond);
 	static void WriteOrConditionDataChunk(DataChunkOutput &chunkWriter, OrCondition *pCondition);
 	static Bool ParseOrConditionDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	
+
 	// Utility for moving scripts upwards
 	Condition *findPreviousCondition( Condition *curCond );
 };
@@ -190,17 +187,17 @@ class OrCondition : public MemoryPoolObject
 //-------------------------------------------------------------------------------------------------
 // ******************************** class ScriptAction ***********************************************
 //-------------------------------------------------------------------------------------------------
-/** This is an action that can be executed by a script.  The Action Types 
+/** This is an action that can be executed by a script.  The Action Types
 are defined by ActionTemplates created in the ScriptEngine::init method. */
 enum {MAX_PARMS=12};
 
 class ScriptAction : public MemoryPoolObject // This is the action class.
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ScriptAction, "ScriptAction")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ScriptAction, "ScriptAction")
 // friend bad for MPOs. (srj)
 //friend class EditAction;
 public:
-	enum ScriptActionType 
+	enum ScriptActionType
 	{
 		DEBUG_MESSAGE_BOX,							///< Show a message box.
 		SET_FLAG,													///< Set a flag true of false.
@@ -270,7 +267,7 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 		PLAYER_ENABLE_BASE_CONSTRUCTION,	///< Allow a player to build bases
 		PLAYER_ENABLE_FACTORIES,					///< Allow a player to build from his factories
 		PLAYER_ENABLE_UNIT_CONSTRUCTION,	///< Allow a player to build units
-		CAMERA_MOVE_HOME,									///< Impl JKMCD	
+		CAMERA_MOVE_HOME,									///< Impl JKMCD
 		BUILD_TEAM,												///< Build a team from a teamtemplate
 		NAMED_DAMAGE,											///< Damage a unit
 		NAMED_DELETE,											///< Delete a unit
@@ -428,7 +425,7 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 		INGAME_POPUP_MESSAGE,											///< Popup an ingame popup message box
 		SET_CAVE_INDEX,														///< Set the index of which set of caves a cave is connected to.
 		NAMED_SET_HELD,														///< Sets a named object to be "held" in place or not
-		NAMED_SET_TOPPLE_DIRECTION,								///< Set the topple direction of the specified direction 
+		NAMED_SET_TOPPLE_DIRECTION,								///< Set the topple direction of the specified direction
 		UNIT_MOVE_TOWARDS_NEAREST_OBJECT_TYPE,		///< Move a named unit towards the nearest object of type type
 		TEAM_MOVE_TOWARDS_NEAREST_OBJECT_TYPE,		///< For each member of the team, move towards the nearest object of type
 		MAP_REVEAL_ALL_PERM,
@@ -441,7 +438,7 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 		DISPLAY_COUNTER,													///< shows a counter
 		HIDE_COUNTER,															///< hides a counter
 		TEAM_USE_COMMANDBUTTON_ABILITY_ON_NAMED,	///< Make a team use an ability on another unit.
-		TEAM_USE_COMMANDBUTTON_ABILITY_AT_WAYPOINT,			///< Make a team use an ability on a waypoint.		
+		TEAM_USE_COMMANDBUTTON_ABILITY_AT_WAYPOINT,			///< Make a team use an ability on a waypoint.
 		NAMED_USE_COMMANDBUTTON_ABILITY,					///< Make a unit use an ability.
 		TEAM_USE_COMMANDBUTTON_ABILITY,						///< Make a team use an ability.
 		NAMED_FLASH_WHITE,												///< Flashes a specific unit
@@ -471,7 +468,7 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 		TEAM_ALL_USE_COMMANDBUTTON_ON_NEAREST_ENEMY_BUILDING,	///< Tell the team to use the commandbutton on the nearest enemy building
 		TEAM_ALL_USE_COMMANDBUTTON_ON_NEAREST_ENEMY_BUILDING_CLASS,	///< Tell the team to use the commandbutton on the nearest enemy building class
 		TEAM_ALL_USE_COMMANDBUTTON_ON_NEAREST_OBJECTTYPE,	///< Tell the team to use the commandbutton on the nearest enemy object of type
-		TEAM_PARTIAL_USE_COMMANDBUTTON,						///< Tell some percentage of the team to use the commandbutton on 
+		TEAM_PARTIAL_USE_COMMANDBUTTON,						///< Tell some percentage of the team to use the commandbutton on
 		TEAM_CAPTURE_NEAREST_UNOWNED_FACTION_UNIT,///< Tell the team to capture the nearest unowned faction unit (unit whose pilot has been killed by Jarmen Kell)
 		PLAYER_CREATE_TEAM_FROM_CAPTURED_UNITS,		///< Tell the player to create a new named team from all the units who have been captured.
 		PLAYER_ADD_SKILLPOINTS,										///< add/subtract skill points to the player.
@@ -538,23 +535,23 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 		SET_TRAIN_HELD,				                    ///< LORENZEN -- Forbids trains from departing stations while true
     NAMED_SET_EVAC_LEFT_OR_RIGHT,	            ///< LORENZEN -- Which side of the garrisoned unit (LIKELY A TRAIN) do you want units to evacuate from?
     ENABLE_OBJECT_SOUND,                      ///< Enables the ambient sound on an object or fire the one-shot "ambient" sound on an object
-    DISABLE_OBJECT_SOUND,                     ///< Disable the ambient sound on an object or kill the one-shot "ambient" sound on an object	
+    DISABLE_OBJECT_SOUND,                     ///< Disable the ambient sound on an object or kill the one-shot "ambient" sound on an object
 		NAMED_USE_COMMANDBUTTON_ABILITY_USING_WAYPOINT_PATH, ///< Added for particle cannon to have beam follow waypoint path.
 		NAMED_SET_UNMANNED_STATUS,								///< Make unit unmanned or manned.
 		TEAM_SET_UNMANNED_STATUS,									///< Make all units on team unmanned or manned.
 		NAMED_SET_BOOBYTRAPPED,										///< Add boobytrap to unit.
 		TEAM_SET_BOOBYTRAPPED,										///< Add boobytrap to all units on team.
-		SHOW_WEATHER,															///< show map defined weather.    
+		SHOW_WEATHER,															///< show map defined weather.
 		AI_PLAYER_BUILD_TYPE_NEAREST_TEAM,				///< Tell the ai player to build an object nearest team.
 		// add new items here, please
 		NUM_ITEMS
 	};
-	ScriptAction(ScriptActionType type); 
-	//~ScriptAction(); 
+	ScriptAction(ScriptActionType type);
+	//~ScriptAction();
 
 	ScriptAction *duplicate(void) const;
-	ScriptAction *duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;		
+	ScriptAction *duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;
 
 protected:
 		ScriptAction();  ///< Protected constructor for read.
@@ -574,11 +571,11 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 	void setWarnings(Bool warnings) { m_hasWarnings = warnings;}
 	ScriptActionType getActionType(void) {return m_actionType;}
 	ScriptAction * getNext(void) {return m_nextAction;}
-	AsciiString getUiText(void);				
-	Parameter *getParameter(Int ndx) 
+	AsciiString getUiText(void);
+	Parameter *getParameter(Int ndx)
 	{
-		if (ndx>=0 && ndx<m_numParms) 
-			return m_parms[ndx]; 
+		if (ndx>=0 && ndx<m_numParms)
+			return m_parms[ndx];
 
 		return NULL;
 	}
@@ -599,11 +596,11 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 //-------------------------------------------------------------------------------------------------
 // ******************************** class Script ***********************************************
 //-------------------------------------------------------------------------------------------------
-/** This is a script, in a linked list of scripts.  The m_condition list is evaluated, and if one of the 
+/** This is a script, in a linked list of scripts.  The m_condition list is evaluated, and if one of the
 or clauses is true, the m_action list is executed.  . */
 class Script : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Script, "Script")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Script, "Script")
 protected:	// Note - If you add any member vars, you must take them into account in duplicate() and updateFrom(), as well as file read/write.
 
 	// snapshot methods
@@ -640,8 +637,8 @@ class Script : public MemoryPoolObject, public Snapshot
 	Script();
 	//~Script();
 	Script *duplicate(void) const;	// note, duplicates just this node, not the full list.
-	Script *duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;		
+	Script *duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;
 
 public:
 	void setName(AsciiString name) { m_scriptName = name;}
@@ -701,7 +698,7 @@ class Script : public MemoryPoolObject, public Snapshot
 	// Support routines for moving conditions around
 	OrCondition *findPreviousOrCondition( OrCondition *curOr );
 
-	// Support routines for ScriptEngine - 
+	// Support routines for ScriptEngine -
 	AsciiString getConditionTeamName(void) {return m_conditionTeamName;}
 	void setConditionTeamName(AsciiString teamName) {m_conditionTeamName = teamName;}
 };
@@ -712,7 +709,7 @@ class Script : public MemoryPoolObject, public Snapshot
 /** This is a parameter, in either a condition or an action. */
 class Parameter : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Parameter, "Parameter")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Parameter, "Parameter")
 // friend bad for MPOs. (srj)
 //friend class EditParameter;
 //friend class EditCoordParameter;
@@ -722,7 +719,7 @@ class Parameter : public MemoryPoolObject
 
 public:
 
-	enum ParameterType 
+	enum ParameterType
 	{
 		INT=0,							// Int.
 		REAL,								// Real.
@@ -750,7 +747,7 @@ class Parameter : public MemoryPoolObject
 		MOVIE,							// String, specifies string usable with open(...) or load(...)
 		WAYPOINT_PATH,			// String, waypoint path label.
 		LOCALIZED_TEXT,			// String, must be looked up from the localized text file.
-		BRIDGE,							// String, Named bridge.			
+		BRIDGE,							// String, Named bridge.
 		KIND_OF_PARAM,			// Integer, KindOfType enum.
 		ATTACK_PRIORITY_SET,// String, name of an attack priority set.
 		RADAR_EVENT_TYPE,		// Int. Specifies the radar Event type
@@ -768,7 +765,7 @@ class Parameter : public MemoryPoolObject
 		COMMANDBUTTON_ALL_ABILITIES, // String, refers to all command buttons
 		SKIRMISH_WAYPOINT_PATH, // String, name of a predefined skirmish waypoint path.
 		COLOR,							// color (as int) in ARGB format.
-		EMOTICON,						// List of all possible emoticons. 
+		EMOTICON,						// List of all possible emoticons.
 		OBJECT_PANEL_FLAG,	// String, specifies a flag name available on the options panel.
 		FACTION_NAME,				// The name of the faction (GLA, America, Munkee, China, etc)
 		OBJECT_TYPE_LIST,		// String, Special case of Object Type.
@@ -776,7 +773,7 @@ class Parameter : public MemoryPoolObject
 		SCIENCE_AVAILABILITY, // String, the name of the different science availabilities.
     LEFT_OR_RIGHT,        // 1=left, 2=right, okay?
 		PERCENT,						// Real.  A percentage.
-		NUM_ITEMS	
+		NUM_ITEMS
 	};
 
 	enum { // Comparison types.  Stored in Int value.
@@ -794,7 +791,7 @@ class Parameter : public MemoryPoolObject
 		REL_FRIEND		= ALLIES
 	};
 
-	Parameter(ParameterType type, int val = 0) : 
+	Parameter(ParameterType type, int val = 0) :
 		m_initialized(false),
 		m_paramType(type),
 		m_int(val),
@@ -842,25 +839,25 @@ class Parameter : public MemoryPoolObject
 };
 EMPTY_DTOR(Parameter)
 
-extern const char* TheObjectFlagsNames[];
+extern const char* const TheObjectFlagsNames[];
 
 //-------------------------------------------------------------------------------------------------
 // ******************************** class Condition ***********************************************
 //-------------------------------------------------------------------------------------------------
-/** This is a condition.  The parameters for a ConditionType are set up in 
-ConditionTemplates created in ScriptEngine::init. 
+/** This is a condition.  The parameters for a ConditionType are set up in
+ConditionTemplates created in ScriptEngine::init.
 
-// SPECIAL NOTE ABOUT Skirmish Scripts: Please note that ALL Skirmish conditions should first pass a pSkirmishPlayerParm to 
+// SPECIAL NOTE ABOUT Skirmish Scripts: Please note that ALL Skirmish conditions should first pass a pSkirmishPlayerParm to
 // prevet the necessity of having to write additional scripts for other players / skirmish types later.
 */
 
 class Condition : public MemoryPoolObject  // This is the conditional class.
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Condition, "Condition")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Condition, "Condition")
 // friend bad for MPOs. (srj)
 //friend class EditCondition;
 public:
-	enum ConditionType 
+	enum ConditionType
 	{
 		CONDITION_FALSE,										// Always evaluates to false.
 		COUNTER,															// COUNTER, COMPARISON, INT
@@ -869,7 +866,7 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 		TIMER_EXPIRED,												// If a timer expired.
 		PLAYER_ALL_DESTROYED,									// If a side (player) is totally destroyed.
 		PLAYER_ALL_BUILDFACILITIES_DESTROYED, // If a side (player) has all build facilities destroyed.
-		TEAM_INSIDE_AREA_PARTIALLY,						// If a player has units from a team entering an area.		
+		TEAM_INSIDE_AREA_PARTIALLY,						// If a player has units from a team entering an area.
 		TEAM_DESTROYED,												// If a team has been destroyed.
 		CAMERA_MOVEMENT_FINISHED,							// If the camera has completed it's current movement.
 		TEAM_HAS_UNITS,												// If a team has units.
@@ -886,7 +883,7 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 		NAMED_ATTACKED_BY_PLAYER,							// If a unit has been attacked by a unit controlled by player
 		TEAM_ATTACKED_BY_PLAYER,							// If a team has been attacked by a unit controlled by player
 		BUILT_BY_PLAYER,											// If a unit of type objecttype has been built by player
-		NAMED_CREATED,												// If a unit is currently in existence 
+		NAMED_CREATED,												// If a unit is currently in existence
 		TEAM_CREATED,													// If a team is currently in existence
 		PLAYER_HAS_CREDITS,										// If X [Less Than | Equal | More than] Players credits
 		NAMED_DISCOVERED,											// If a named unit is currently "seen" by a player.
@@ -895,7 +892,7 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 		NAMED_OWNED_BY_PLAYER,								// If a unit is currently owned by a player
 		TEAM_OWNED_BY_PLAYER,									// If a team is currently owned by a player
 		PLAYER_HAS_N_OR_FEWER_BUILDINGS,			// If a player has count or fewer buildings
-		PLAYER_HAS_POWER,											// If a player currently has power to his facilities 
+		PLAYER_HAS_POWER,											// If a player currently has power to his facilities
 		NAMED_REACHED_WAYPOINTS_END,					// If a unit has reached the end of the path that contains Waypoint
 		TEAM_REACHED_WAYPOINTS_END,						// If a team has reached the end of the path that contains Waypoint
 		NAMED_SELECTED,												// If a unit is selected
@@ -956,7 +953,7 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 		SKIRMISH_UNOWNED_FACTION_UNIT_EXISTS,		// True if there are comparison to unowned faction unit on the map.
 		SKIRMISH_PLAYER_HAS_PREREQUISITE_TO_BUILD,	// True if we can build this thing (we have prerequisites)
 		SKIRMISH_PLAYER_HAS_COMPARISON_GARRISONED,	// True if there are comparison to garrisoned buildings (by player) on the map
-		SKIRMISH_PLAYER_HAS_COMPARISON_CAPTURED_UNITS,	// True if there are comparison to captured units 
+		SKIRMISH_PLAYER_HAS_COMPARISON_CAPTURED_UNITS,	// True if there are comparison to captured units
 		SKIRMISH_NAMED_AREA_EXIST,							// True if a named area exists
 		SKIRMISH_PLAYER_HAS_UNITS_IN_AREA,			// True if a player has units in an area
 		SKIRMISH_PLAYER_HAS_BEEN_ATTACKED_BY_PLAYER,	// True if the player has been attacked by a player
@@ -968,7 +965,7 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 		PLAYER_CAN_PURCHASE_SCIENCE,						// True is player can purchase the given science (has all prereqs & points needed)
 		MUSIC_TRACK_HAS_COMPLETED,							// True if the specified track has completed at least N times
 		PLAYER_LOST_OBJECT_TYPE,								// True if a player has lost a specific unit type
-		
+
 		SUPPLY_SOURCE_SAFE,											// True if the nearest available supply source is not under enemy influence.
 		SUPPLY_SOURCE_ATTACKED,									// True if our supply depot or dozer near depot was attacked.
 		START_POSITION_IS,											// True if our start position matches.
@@ -977,12 +974,12 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 		NUM_ITEMS		 // Always the last condition.
 	};
 
-	Condition(enum ConditionType type); 
-	//~Condition(); 
+	Condition(enum ConditionType type);
+	//~Condition();
 
 	Condition *duplicate(void) const;
-	Condition *duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;		
+	Condition *duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const;
 
 protected:
 	Condition();  ///< Protected constructor for read.
@@ -1005,11 +1002,11 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 	void setWarnings(Bool warnings) { m_hasWarnings = warnings;}
 	enum ConditionType getConditionType(void) {return m_conditionType;}
 	Condition * getNext(void) {return m_nextAndCondition;}
-	AsciiString getUiText(void);				
-	Parameter *getParameter(Int ndx) 
+	AsciiString getUiText(void);
+	Parameter *getParameter(Int ndx)
 	{
-		if (ndx>=0 && ndx<m_numParms) 
-			return m_parms[ndx]; 
+		if (ndx>=0 && ndx<m_numParms)
+			return m_parms[ndx];
 
 		return NULL;
 	}
@@ -1033,11 +1030,11 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 //-------------------------------------------------------------------------------------------------
 // ******************************** class Template ***********************************************
 //-------------------------------------------------------------------------------------------------
-/** The template defines the parameters and ui strings used to display a 
+/** The template defines the parameters and ui strings used to display a
 condition or action. */
-class Template : public MemoryPoolObject 
+class Template : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Template, "Template")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Template, "Template")
 // friend bad for MPOs. (srj)
 //friend class ScriptEngine;
 public:
@@ -1084,10 +1081,10 @@ class ActionTemplate : public Template{};
 //-------------------------------------------------------------------------------------------------
 /// List of scripts.  May have one level of hierarchy in the ScriptGroup list.
 class ScriptList : public MemoryPoolObject, public Snapshot
-// A script list belongs to a Player.  It contains the heads of the 
+// A script list belongs to a Player.  It contains the heads of the
 // the top level scripts, and the script groups.
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ScriptList, "ScriptList")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ScriptList, "ScriptList")
 protected:
 
 	// snapshot methods
@@ -1108,15 +1105,15 @@ class ScriptList : public MemoryPoolObject, public Snapshot
 
 public:
 	static void updateDefaults(void);
-	static void reset(void); 
+	static void reset(void);
 	static Int getNextID(void) {m_curId++; return m_curId;};
-	
+
 public:
 	ScriptGroup *getScriptGroup(void) {return m_firstGroup;};
 	Script *getScript(void) {return m_firstScript;};
 	void WriteScriptListDataChunk(DataChunkOutput &chunkWriter);
 	static Bool ParseScriptListDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	
+
 	void addGroup(ScriptGroup *pGrp, Int ndx);
 	void addScript(Script *pScr, Int ndx);
 	void deleteScript(Script *pScr);
@@ -1125,17 +1122,14 @@ class ScriptList : public MemoryPoolObject, public Snapshot
 	void discard(void);
 
 	ScriptList *duplicate(void) const;
-	ScriptList *duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName ) const;		
+	ScriptList *duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName ) const;
 	/// Reads a set of scripts into m_readScripts.  Use getReadScripts to access.
 	static Bool ParseScriptsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
 	/// Writes sides (including build list info.)
 	static void WriteScriptsDataChunk(DataChunkOutput &chunkWriter, ScriptList *scriptLists[], Int numLists);
 
-	/// Returns array of script list pointers.  This can only be called once after scripts 
+	/// Returns array of script list pointers.  This can only be called once after scripts
 	/// are read, and the caller is responsible for deleting the scripts.
 	static Int getReadScripts(ScriptList *scriptLists[MAX_PLAYER_COUNT]);
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h
index 94db2afd139..82ed837e4ac 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef SIDESLIST_H
-#define SIDESLIST_H
-
 #include "Common/Dict.h"
 #include "Common/Errors.h"
 #include "Common/GameType.h"
@@ -53,7 +50,7 @@ class Shadow;
 	Note that a side corresponds to a Player in the game.  The lightweight
 	Side is used to give the WB Editor somewhere to hang build lists.
 */
-class SidesInfo 
+class SidesInfo
 {
 protected:
 	BuildListInfo*	m_pBuildList;		///< linked list.
@@ -76,7 +73,7 @@ class SidesInfo
 	void setScriptList(ScriptList *pScriptList) {m_scripts = pScriptList;};
 
 	// ug, I hate having to overload stuff, but this makes it a lot easier to make copies safely
-	SidesInfo& operator=(const SidesInfo& that);	
+	SidesInfo& operator=(const SidesInfo& that);
 };
 
 // ----------------------------------------------------------------------------------------------
@@ -110,22 +107,22 @@ class TeamsInfoRec
 	void addTeam(const Dict* d);
 	void removeTeam(Int i);
 	Int getNumTeams() const { return m_numTeams; }
-	TeamsInfo * getTeamInfo(Int team) 
+	TeamsInfo * getTeamInfo(Int team)
 	{
-		if (team>=0&&team<m_numTeams) 
+		if (team>=0&&team<m_numTeams)
 		{
 			return(&m_teams[team]);
 		}
-		DEBUG_CRASH(("Out of range.")); 
+		DEBUG_CRASH(("Out of range."));
 		throw ERROR_BAD_ARG;
 		return NULL;
-	}	
+	}
 };
 
 // ----------------------------------------------------------------------------------------------
 /**
 	This is a singleton class that maintains the list of Sides.
-	In RTS it is associated with the Player singleton.  
+	In RTS it is associated with the Player singleton.
 	Note that a side corresponds to a Player in the game.  The lightweight
 	Side is used to give the WB Editor somewhere to hang build lists, as
 	it doesn't instantiate the Player subsystem
@@ -173,7 +170,7 @@ class SidesList : public SubsystemInterface,
  	void addSkirmishTeam(const Dict* d);
 
 	TeamsInfo *findTeamInfo(AsciiString name, Int* index = NULL);
-	
+
 	Bool isPlayerDefaultTeam(TeamsInfo *t);
 
 	void clear();
@@ -206,37 +203,37 @@ class SidesList : public SubsystemInterface,
 };
 
 
-inline TeamsInfo * SidesList::getTeamInfo(Int team) 
+inline TeamsInfo * SidesList::getTeamInfo(Int team)
 {
 	return m_teamrec.getTeamInfo(team);
-}	
+}
 
-inline TeamsInfo * SidesList::getSkirmishTeamInfo(Int team) 
+inline TeamsInfo * SidesList::getSkirmishTeamInfo(Int team)
 {
 	return m_skirmishTeamrec.getTeamInfo(team);
-}	
+}
 
-inline SidesInfo * SidesList::getSideInfo(Int side) 
+inline SidesInfo * SidesList::getSideInfo(Int side)
 {
-	if (side>=0&&side<m_numSides) 
+	if (side>=0&&side<m_numSides)
 	{
 		return(&m_sides[side]);
 	}
-	DEBUG_CRASH(("Out of range.")); 
+	DEBUG_CRASH(("Out of range."));
 	throw ERROR_BAD_ARG;
 	return NULL;
-}	
+}
 
-inline SidesInfo * SidesList::getSkirmishSideInfo(Int side) 
+inline SidesInfo * SidesList::getSkirmishSideInfo(Int side)
 {
-	if (side>=0&&side<m_numSkirmishSides) 
+	if (side>=0&&side<m_numSkirmishSides)
 	{
 		return(&m_skirmishSides[side]);
 	}
-	DEBUG_CRASH(("Out of range.")); 
+	DEBUG_CRASH(("Out of range."));
 	throw ERROR_BAD_ARG;
 	return NULL;
-}	
+}
 
 
 // ----------------------------------------------------------------------------------------------
@@ -249,7 +246,7 @@ extern SidesList *TheSidesList;	 ///< singleton instance of SidesList
 */
 class BuildListInfo : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(BuildListInfo, "BuildListInfo")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(BuildListInfo, "BuildListInfo")
 
 // friend doesn't play well with MPO... it reveals delete, which shouldn't be visible, even to friends (srj)
 //friend class SidesInfo;  // This is essentially a component of the SidesInfo data structure.
@@ -257,7 +254,7 @@ class BuildListInfo : public MemoryPoolObject, public Snapshot
 //friend class BuildList;  // This is the class in WB that edits build lists.
 //friend class BuildListTool; // Other class in wb that edits build lists.
 //friend class WBDocUndoable; // Other class in wb that edits build lists.
-//friend class Player; 
+//friend class Player;
 //friend class AISideBuildList;
 //friend class AISkirmishPlayer;
 
@@ -301,7 +298,7 @@ class BuildListInfo : public MemoryPoolObject, public Snapshot
 	ObjectID m_objectID;								///< the object on the map instantiated by this info
 	UnsignedInt m_objectTimestamp;			///< frame when object was built
 	Bool		 m_underConstruction;				///< True if being constructed by dozer.
-	ObjectID m_resourceGatherers[MAX_RESOURCE_GATHERERS];	///< gatherers for this supply center type building. 
+	ObjectID m_resourceGatherers[MAX_RESOURCE_GATHERERS];	///< gatherers for this supply center type building.
 	Bool		 m_isSupplyBuilding;				///< Uses gatherers to get supplies.
 	Int			 m_desiredGatherers;				///< Number of gatherers desired.
 	Int			 m_currentGatherers;				///< Number of gatherers available.
@@ -371,15 +368,15 @@ class BuildListInfo : public MemoryPoolObject, public Snapshot
 	BuildListInfo *duplicate(void);
 };
 
-inline void BuildListInfo::decrementNumRebuilds(void)  
+inline void BuildListInfo::decrementNumRebuilds(void)
 {
-	if (m_numRebuilds > 0 && m_numRebuilds != UNLIMITED_REBUILDS) 
+	if (m_numRebuilds > 0 && m_numRebuilds != UNLIMITED_REBUILDS)
 		m_numRebuilds--;
 }
 
-inline void BuildListInfo::incrementNumRebuilds(void)  
+inline void BuildListInfo::incrementNumRebuilds(void)
 {
-	if (m_numRebuilds != UNLIMITED_REBUILDS) 
+	if (m_numRebuilds != UNLIMITED_REBUILDS)
 		m_numRebuilds++;
 }
 
@@ -390,7 +387,3 @@ inline Bool BuildListInfo::isBuildable( void )
 
 	return false;
 }
-
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h
index 686c94a49da..586f695b2bd 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Sqaud.h 
+// FILE: Sqaud.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -38,8 +38,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_SQAUD_
-#define _H_SQAUD_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Common/Snapshot.h"
@@ -62,7 +60,7 @@ typedef VecObjectPtr::iterator VecObjectPtrIt;
 
 class Squad : public MemoryPoolObject, public Snapshot
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Squad, "Squad")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Squad, "Squad")
 
 protected:
 	// snapshot methods
@@ -96,5 +94,3 @@ class Squad : public MemoryPoolObject, public Snapshot
 	void aiGroupFromSquad(AIGroup* aiGroupToFill);
 };
 EMPTY_DTOR(Squad)
-
-#endif /* _H_SQAUD_ */
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h
index ea932f57718..f56c268ae65 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __TERRAINLOGIC_H_
-#define __TERRAINLOGIC_H_
-
 #include "Common/GameMemory.h"
 #include "Common/Snapshot.h"
 #include "Common/STLTypedefs.h"
@@ -63,12 +60,12 @@ enum WaypointID CPP_11(: Int)
 */
 class Waypoint : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Waypoint, "Waypoint")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Waypoint, "Waypoint")
 
 // friends do not play well with MPO (srj)
 //friend class TerrainLogic;
 public:
-	Waypoint(WaypointID id, AsciiString name, const Coord3D *pLoc, AsciiString label1, 
+	Waypoint(WaypointID id, AsciiString name, const Coord3D *pLoc, AsciiString label1,
 						AsciiString label2, AsciiString label3, Bool biDirectional);
 	//~Waypoint();
 	enum {MAX_LINKS=8};
@@ -88,13 +85,13 @@ class Waypoint : public MemoryPoolObject
 public:
 	// should be protected, but friendly access needed (srj)
 	void setNext(Waypoint *pNext) {m_pNext = pNext; }
-	//void setLink(Int ndx, Waypoint *pLink) 
+	//void setLink(Int ndx, Waypoint *pLink)
 	//{
-	//	if (ndx>=0 && ndx <=MAX_LINKS) m_links[ndx] = pLink; 
+	//	if (ndx>=0 && ndx <=MAX_LINKS) m_links[ndx] = pLink;
 	//}
-	void addLink(Waypoint* pLink) 
+	void addLink(Waypoint* pLink)
 	{
-		if (m_numLinks < MAX_LINKS) 
+		if (m_numLinks < MAX_LINKS)
 		{
 			m_links[m_numLinks] = pLink;
 			++m_numLinks;
@@ -130,7 +127,7 @@ class Waypoint : public MemoryPoolObject
 // Bridge
 /** Helper class for bridge info in terrain logic.
 */
-class BridgeInfo 
+class BridgeInfo
 {
 public:
 	BridgeInfo();
@@ -151,7 +148,7 @@ class BridgeInfo
 // Bridge
 /** Helper class for bridge info in terrain logic.
 */
-struct TBridgeAttackInfo 
+struct TBridgeAttackInfo
 {
 public:
 	Coord3D attackPoint1, attackPoint2; /// The points that can be attacked..
@@ -161,7 +158,7 @@ struct TBridgeAttackInfo
 //-------------------------------------------------------------------------------------------------
 class Bridge : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Bridge, "Bridge")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Bridge, "Bridge")
 // friends do not play well with MPO (srj)
 //friend class TerrainLogic;
 public:
@@ -181,9 +178,9 @@ class Bridge : public MemoryPoolObject
 public:
 	// should be protected, but friendly access needed (srj)
 	void setNext(Bridge *pNext) {m_next = pNext; }
-	Object *createTower( Coord3D *worldPos, BridgeTowerType towerPos, 
+	Object *createTower( Coord3D *worldPos, BridgeTowerType towerPos,
 											 const ThingTemplate *towerTemplate, Object *bridge );
-	
+
 public:
 	/// return the bridge template name
 	AsciiString getBridgeTemplateName( void ) { return m_templateName; }
@@ -197,16 +194,16 @@ class Bridge : public MemoryPoolObject
 	Bool isPointOnBridge(const Coord3D *pLoc);
 	Drawable *pickBridge(const Vector3 &from, const Vector3 &to, Vector3 *pos);
 	void updateDamageState(void); ///< Updates a bridge's damage info.
-	inline const BridgeInfo *peekBridgeInfo(void) const {return &m_bridgeInfo;}
-	inline PathfindLayerEnum getLayer(void) const {return m_layer;}
-	inline void setLayer(PathfindLayerEnum layer) {m_layer = layer;}
+	const BridgeInfo *peekBridgeInfo(void) const {return &m_bridgeInfo;}
+	PathfindLayerEnum getLayer(void) const {return m_layer;}
+	void setLayer(PathfindLayerEnum layer) {m_layer = layer;}
 	const Region2D *getBounds(void) const {return &m_bounds;}
 	Bool isCellOnEnd(const Region2D *cell);	 // Is pathfind cell on the sides of the bridge
 	Bool isCellOnSide(const Region2D *cell); // Is pathfind cell on the end of the bridge
 	Bool isCellEntryPoint(const Region2D *cell); // Is pathfind cell an entry point to the bridge
-	
-	inline void setBridgeObjectID( ObjectID id ) { m_bridgeInfo.bridgeObjectID = id; }
-	inline void setTowerObjectID( ObjectID id, BridgeTowerType which ) { m_bridgeInfo.towerObjectID[ which ] = id; }
+
+	void setBridgeObjectID( ObjectID id ) { m_bridgeInfo.bridgeObjectID = id; }
+	void setTowerObjectID( ObjectID id, BridgeTowerType which ) { m_bridgeInfo.towerObjectID[ which ] = id; }
 
 };
 
@@ -248,8 +245,8 @@ class TerrainLogic : public Snapshot,
 	virtual const WaterHandle* getWaterHandle( Real x, Real y );					///< get water handle at this location
 	virtual const WaterHandle* getWaterHandleByName( AsciiString name );	///< get water handle by name
 	virtual Real getWaterHeight( const WaterHandle *water );							///< get height of water table
-	virtual void setWaterHeight( const WaterHandle *water, 
-															 Real height, 
+	virtual void setWaterHeight( const WaterHandle *water,
+															 Real height,
 															 Real damageAmount,
 															 Bool forcePathfindUpdate );	///< set height of water table
 	virtual void changeWaterHeightOverTime( const WaterHandle *water,
@@ -373,11 +370,10 @@ class TerrainLogic : public Snapshot,
 	} m_waterToUpdate[ MAX_DYNAMIC_WATER ];  ///< water tables to dynamicall update
 	Int m_numWaterToUpdate;						///< how many valid entries are in m_waterToUpdate
 
-};  // end class TerrainLogic
+};
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern TerrainLogic *TheTerrainLogic;   ///< singleton definition
 
 extern void makeAlignToNormalMatrix( Real angle, const Coord3D& pos, const Coord3D& normal, Matrix3D& mtx);
 extern Bool LineInRegion( const Coord2D *p1, const Coord2D *p2, const Region2D *clipRegion );
-#endif  // end __TERRAINLOGIC_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h
index dc1e387907b..30aa1d34cf1 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h
@@ -28,16 +28,13 @@
 
 #pragma once
 
-#ifndef _TURRETAI_H_
-#define _TURRETAI_H_
-
 #include "Common/StateMachine.h"
 #include "Common/GameMemory.h"
 
 const Real DEFAULT_TURN_RATE = 0.01f;
 const Real DEFAULT_PITCH_RATE = 0.01f;
 
-/** 
+/**
  * The TurretAI state IDs.
  * Each of these constants will be associated with an instance of a State class
  * in a given StateMachine.
@@ -60,7 +57,7 @@ class TurretAI;
 
 //-----------------------------------------------------------------------------------------------------------
 /**
- * The AI state machine.  This is used by AIUpdate to implement all of the 
+ * The AI state machine.  This is used by AIUpdate to implement all of the
  * commands in the AICommandInterface.
  */
 class TurretStateMachine : public StateMachine
@@ -68,12 +65,12 @@ class TurretStateMachine : public StateMachine
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( TurretStateMachine, "TurretStateMachine" );
 
 public:
-	/** 
+	/**
 	 * The implementation of this constructor defines the states
 	 * used by this machine.
 	 */
 	TurretStateMachine( TurretAI* tai, Object* owner, AsciiString name );
-	
+
 	TurretAI* getTurretAI() const { return m_turretAI; }
 
 	virtual void clear();
@@ -93,7 +90,7 @@ class TurretStateMachine : public StateMachine
 //-----------------------------------------------------------------------------------------------------------
 class TurretState : public State
 {
-	MEMORY_POOL_GLUE_ABC(TurretState)		
+	MEMORY_POOL_GLUE_ABC(TurretState)
 protected:
 	TurretState( TurretStateMachine* machine, AsciiString name ) : State( machine, name) { }
 	TurretAI* getTurretAI() { return ((TurretStateMachine*)getMachine())->getTurretAI(); }
@@ -102,8 +99,8 @@ EMPTY_DTOR(TurretState)
 
 //-----------------------------------------------------------------------------------------------------------
 class TurretAIIdleState : public TurretState
-{	
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIIdleState, "TurretAIIdleState")		
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIIdleState, "TurretAIIdleState")
 public:
 	TurretAIIdleState( TurretStateMachine* machine ) : TurretState( machine, "TurretAIIdleState"), m_nextIdleScan(0) { }
 	virtual StateReturnType onEnter();
@@ -123,7 +120,7 @@ EMPTY_DTOR(TurretAIIdleState)
 //-----------------------------------------------------------------------------------------------------------
 class TurretAIIdleScanState : public TurretState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIIdleScanState, "TurretAIIdleScanState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIIdleScanState, "TurretAIIdleScanState")
 public:
 	TurretAIIdleScanState( TurretStateMachine* machine ) : TurretState( machine, "TurretAIIdleScanState"), m_desiredAngle(0) { }
 	virtual StateReturnType onEnter();
@@ -146,15 +143,15 @@ EMPTY_DTOR(TurretAIIdleScanState)
  */
 class TurretAIAimTurretState : public TurretState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIAimTurretState, "TurretAIAimTurretState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIAimTurretState, "TurretAIAimTurretState")
 private:
 #ifdef INTER_TURRET_DELAY
 	UnsignedInt m_extraDelay;
 #endif
 public:
 	TurretAIAimTurretState( TurretStateMachine* machine ) : TurretState( machine, "TurretAIAimTurretState" )
-	{ 
-	
+	{
+
 	}
 	virtual StateReturnType onEnter();
 	virtual void onExit( StateExitType status );
@@ -173,7 +170,7 @@ EMPTY_DTOR(TurretAIAimTurretState)
  */
 class TurretAIRecenterTurretState : public TurretState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIRecenterTurretState, "TurretAIRecenterTurretState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIRecenterTurretState, "TurretAIRecenterTurretState")
 public:
 	TurretAIRecenterTurretState( TurretStateMachine* machine ) : TurretState( machine, "TurretAIRecenterTurretState" ) { }
 	virtual StateReturnType onEnter();
@@ -193,11 +190,11 @@ EMPTY_DTOR(TurretAIRecenterTurretState)
  */
 class TurretAIHoldTurretState : public TurretState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIHoldTurretState, "TurretAIHoldTurretState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIHoldTurretState, "TurretAIHoldTurretState")
 private:
 	UnsignedInt m_timestamp;										///< frame this state was last entered
 public:
-	TurretAIHoldTurretState( TurretStateMachine* machine ) : TurretState( machine , "AIHoldTurretState") 
+	TurretAIHoldTurretState( TurretStateMachine* machine ) : TurretState( machine , "AIHoldTurretState")
 	{
 		m_timestamp = 0;
 	}
@@ -215,7 +212,7 @@ EMPTY_DTOR(TurretAIHoldTurretState)
 //-------------------------------------------------------------------------------------------------
 class TurretAIData : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIData, "TurretAIData")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TurretAIData, "TurretAIData")
 public:
 	Real						m_turnRate;
 	Real						m_pitchRate;
@@ -256,7 +253,7 @@ enum TurretTargetType CPP_11(: Int)
 };
 
 //-----------------------------------------------------------------------------------------------------
-/** 
+/**
  * Turret behavior implementation.
  */
 class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFiredInterface
@@ -289,7 +286,7 @@ class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFi
 
 	Bool isOwnersCurWeaponOnTurret() const;
 	Bool isWeaponSlotOnTurret(WeaponSlotType wslot) const;
-	Bool isAttackingObject() const { return m_target == TARGET_OBJECT; } 
+	Bool isAttackingObject() const { return m_target == TARGET_OBJECT; }
 	Bool isForceAttacking() const { return m_isForceAttacking; }
 
 	// this will cause the turret to continuously track the given victim.
@@ -373,6 +370,3 @@ class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFi
 	mutable Bool						m_targetWasSetByIdleMood : 1;
 
 };
-
-#endif // end _TURRETAI_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h
index 1babe438a2a..27e69fccefc 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __VICTORYCONDITIONS_H__
-#define __VICTORYCONDITIONS_H__
-
 #include "Common/SubsystemInterface.h"
 #include "Lib/BaseType.h"
 
@@ -53,13 +50,13 @@ class VictoryConditionsInterface : public SubsystemInterface
 {
 public:
 	VictoryConditionsInterface() { m_victoryConditions = 0; }
-	
+
 	virtual void init( void ) = 0;
 	virtual void reset( void ) = 0;
 	virtual void update( void ) = 0;
 
-	inline void setVictoryConditions( Int victoryConditions ) { m_victoryConditions = victoryConditions; }
-	inline Int getVictoryConditions( void ) { return m_victoryConditions; }
+	void setVictoryConditions( Int victoryConditions ) { m_victoryConditions = victoryConditions; }
+	Int getVictoryConditions( void ) { return m_victoryConditions; }
 
 	virtual Bool hasAchievedVictory(Player *player) = 0;					///< has a specific player and his allies won?
 	virtual Bool hasBeenDefeated(Player *player) = 0;							///< has a specific player and his allies lost?
@@ -79,5 +76,3 @@ class VictoryConditionsInterface : public SubsystemInterface
 VictoryConditionsInterface * createVictoryConditions( void );
 
 extern VictoryConditionsInterface *TheVictoryConditions;
-
-#endif // __VICTORYCONDITIONS_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h
index 92fbe8a8b81..3afebed868d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __WEAPON_H_
-#define __WEAPON_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
 #include "Common/GameCommon.h"
@@ -60,17 +57,20 @@ enum WeaponReloadType CPP_11(: Int)
 {
 	AUTO_RELOAD,
 	NO_RELOAD,
-	RETURN_TO_BASE_TO_RELOAD
+	RETURN_TO_BASE_TO_RELOAD,
+
+	WEAPON_RELOAD_COUNT
 };
 
 #ifdef DEFINE_WEAPONRELOAD_NAMES
-static const char *TheWeaponReloadNames[] = 
+static const char *const TheWeaponReloadNames[] =
 {
 	"YES",
 	"NO",
 	"RETURN_TO_BASE",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheWeaponReloadNames) == WEAPON_RELOAD_COUNT + 1, "Incorrect array size");
 #endif
 
 //-------------------------------------------------------------------------------------------------
@@ -84,13 +84,14 @@ enum WeaponPrefireType CPP_11(: Int)
 };
 
 #ifdef DEFINE_WEAPONPREFIRE_NAMES
-static const char *TheWeaponPrefireNames[] = 
+static const char *const TheWeaponPrefireNames[] =
 {
 	"PER_SHOT",
 	"PER_ATTACK",
 	"PER_CLIP",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheWeaponPrefireNames) == PREFIRE_COUNT + 1, "Incorrect array size");
 #endif
 
 //-------------------------------------------------------------------------------------------------
@@ -119,7 +120,7 @@ enum WeaponAffectsMaskType CPP_11(: Int)
 };
 
 //#ifdef DEFINE_WEAPONAFFECTSMASK_NAMES ; Removed protection so other clases can use these strings... not sure why this was protected in the 1st place
-static const char *TheWeaponAffectsMaskNames[] = 
+static const char *const TheWeaponAffectsMaskNames[] =
 {
 	"SELF",
 	"ALLIES",
@@ -137,19 +138,19 @@ enum WeaponCollideMaskType CPP_11(: Int)
 {
 	// all of these apply to *nontargeted* things that might just happen to get in the way...
 	// the target can always be collided with, regardless of flags
-	WEAPON_COLLIDE_ALLIES									= 0x0001,	
-	WEAPON_COLLIDE_ENEMIES								= 0x0002,	
+	WEAPON_COLLIDE_ALLIES									= 0x0001,
+	WEAPON_COLLIDE_ENEMIES								= 0x0002,
 	WEAPON_COLLIDE_STRUCTURES							= 0x0004,	// this is "all structures EXCEPT for structures belonging to the projectile's controller".
 	WEAPON_COLLIDE_SHRUBBERY							= 0x0008,
 	WEAPON_COLLIDE_PROJECTILE							= 0x0010,
 	WEAPON_COLLIDE_WALLS									= 0x0020,
-	WEAPON_COLLIDE_SMALL_MISSILES					= 0x0040, //All missiles are also projectiles! 
+	WEAPON_COLLIDE_SMALL_MISSILES					= 0x0040, //All missiles are also projectiles!
 	WEAPON_COLLIDE_BALLISTIC_MISSILES			= 0x0080, //All missiles are also projectiles!
 	WEAPON_COLLIDE_CONTROLLED_STRUCTURES	= 0x0100	//this is "ONLY structures belonging to the projectile's controller".
 };
 
 #ifdef DEFINE_WEAPONCOLLIDEMASK_NAMES
-static const char *TheWeaponCollideMaskNames[] = 
+static const char *const TheWeaponCollideMaskNames[] =
 {
 	"ALLIES",
 	"ENEMIES",
@@ -209,7 +210,7 @@ enum WeaponBonusConditionType CPP_11(: Int)
 	WEAPONBONUSCONDITION_COUNT
 };
 #ifdef DEFINE_WEAPONBONUSCONDITION_NAMES
-static const char *TheWeaponBonusNames[] = 
+static const char *const TheWeaponBonusNames[] =
 {
 	// This is a RHS enum (weapon.ini will have WeaponBonus = IT) so it is all caps
 	"GARRISONED",
@@ -246,6 +247,7 @@ static const char *TheWeaponBonusNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheWeaponBonusNames) == WEAPONBONUSCONDITION_COUNT + 1, "Incorrect array size");
 #endif
 
 // For WeaponBonusConditionFlags
@@ -266,7 +268,7 @@ class WeaponBonus
 		RATE_OF_FIRE,
 		PRE_ATTACK,
 
-		FIELD_COUNT	// keep last
+		FIELD_COUNT
 	};
 
 	WeaponBonus()
@@ -274,14 +276,14 @@ class WeaponBonus
 		clear();
 	}
 
-	inline void clear()
+	void clear()
 	{
 		for (int i = 0; i < FIELD_COUNT; ++i)
 			m_field[i] = 1.0f;
 	}
 
-	inline Real getField(Field f) const { return m_field[f]; }
-	inline void setField(Field f, Real v) { m_field[f] = v; }
+	Real getField(Field f) const { return m_field[f]; }
+	void setField(Field f, Real v) { m_field[f] = v; }
 
 	void appendBonuses(WeaponBonus& bonus) const;
 
@@ -291,7 +293,7 @@ class WeaponBonus
 };
 
 #ifdef DEFINE_WEAPONBONUSFIELD_NAMES
-static const char *TheWeaponBonusFieldNames[] = 
+static const char *const TheWeaponBonusFieldNames[] =
 {
 	"DAMAGE",
 	"RADIUS",
@@ -300,6 +302,7 @@ static const char *TheWeaponBonusFieldNames[] =
 	"PRE_ATTACK",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheWeaponBonusFieldNames) == WeaponBonus::FIELD_COUNT + 1, "Incorrect array size");
 #endif
 
 
@@ -325,9 +328,10 @@ struct HistoricWeaponDamageInfo
 	// The time and location this weapon was fired
 	UnsignedInt						frame;
 	Coord3D								location;
+	UnsignedInt						triggerId; ///< Unique Id assigned to any grouped damage instances
 
 	HistoricWeaponDamageInfo(UnsignedInt f, const Coord3D& l) :
-		frame(f), location(l)
+		frame(f), location(l), triggerId(0)
 	{
 	}
 };
@@ -353,11 +357,11 @@ class WeaponTemplate : public MemoryPoolObject
 	Bool isOverride( void ) { return m_nextTemplate != NULL; }
 
 	/// field table for loading the values from an INI
-	inline const FieldParse *getFieldParse() const { return TheWeaponTemplateFieldParseTable; }
+	const FieldParse *getFieldParse() const { return TheWeaponTemplateFieldParseTable; }
 
-	/** 
+	/**
 		fire the weapon. return the logic-frame in which the damage will be dealt.
-		
+
 		If the damage will be determined at an indeterminate later date (eg, via Projectile),
 		or will never be dealt (eg, target was out of range), return zero.
 
@@ -365,11 +369,11 @@ class WeaponTemplate : public MemoryPoolObject
 	*/
 	UnsignedInt fireWeaponTemplate
 	(
-		const Object *sourceObj, 
-		WeaponSlotType wslot, 
-		Int specificBarrelToUse, 
-		Object *victimObj, 
-		const Coord3D* victimPos, 
+		const Object *sourceObj,
+		WeaponSlotType wslot,
+		Int specificBarrelToUse,
+		Object *victimObj,
+		const Coord3D* victimPos,
 		const WeaponBonus& bonus,
 		Bool isProjectileDetonation,
 		Bool ignoreRanges,
@@ -385,9 +389,9 @@ class WeaponTemplate : public MemoryPoolObject
 		take weapon range into account -- it ASSUMES that the victim is within range!
 	*/
 	Real estimateWeaponTemplateDamage(
-		const Object *sourceObj, 
-		const Object *victimObj, 
-		const Coord3D* victimPos, 
+		const Object *sourceObj,
+		const Object *victimObj,
+		const Coord3D* victimPos,
 		const WeaponBonus& bonus
 	) const;
 
@@ -403,70 +407,70 @@ class WeaponTemplate : public MemoryPoolObject
 	Int getPreAttackDelay(const WeaponBonus& bonus) const;
 	Bool isContactWeapon() const;
 
-	inline Real getShockWaveAmount() const { return m_shockWaveAmount; }
-	inline Real getShockWaveRadius() const { return m_shockWaveRadius; }
-	inline Real getShockWaveTaperOff() const { return m_shockWaveTaperOff; }
-
-	inline Real getRequestAssistRange() const {return m_requestAssistRange;}
-	inline AsciiString getName() const { return m_name; }
-	inline AsciiString getProjectileStreamName() const { return m_projectileStreamName; }
-	inline AsciiString getLaserName() const { return m_laserName; }
-	inline const AsciiString& getLaserBoneName() const { return m_laserBoneName; }
-	inline NameKeyType getNameKey() const { return m_nameKey; }
-	inline Real getWeaponSpeed() const { return m_weaponSpeed; }
-	inline Real getMinWeaponSpeed() const { return m_minWeaponSpeed; }
-	inline Bool isScaleWeaponSpeed() const { return m_isScaleWeaponSpeed; }
-	inline Real getWeaponRecoilAmount() const { return m_weaponRecoil; }
-	inline Real getMinTargetPitch() const { return m_minTargetPitch; }
-	inline Real getMaxTargetPitch() const { return m_maxTargetPitch; }
-	inline Real getRadiusDamageAngle() const { return m_radiusDamageAngle; }
-	inline DamageType getDamageType() const { return m_damageType; }
-	inline ObjectStatusTypes getDamageStatusType() const { return m_damageStatusType; }
-	inline DeathType getDeathType() const { return m_deathType; }
-	inline Real getContinueAttackRange() const { return m_continueAttackRange; }
-	inline Real getInfantryInaccuracyDist() const { return m_infantryInaccuracyDist; }
-	inline Real getAimDelta() const { return m_aimDelta; }
-	inline Real getScatterRadius() const { return m_scatterRadius; }
-	inline Real getScatterTargetScalar() const { return m_scatterTargetScalar; }
-	inline const ThingTemplate* getProjectileTemplate() const { return m_projectileTmpl; }
-	inline Bool getDamageDealtAtSelfPosition() const { return m_damageDealtAtSelfPosition; }
-	inline Int getAffectsMask() const { return m_affectsMask; }
-	inline Int getProjectileCollideMask() const { return m_collideMask; }
-	inline WeaponReloadType getReloadType() const { return m_reloadType; }
-	inline WeaponPrefireType getPrefireType() const { return m_prefireType; }
-	inline Bool getAutoReloadsClip() const { return m_reloadType == AUTO_RELOAD; }
-	inline Int getClipSize() const { return m_clipSize; }
-	inline Int getContinuousFireOneShotsNeeded() const { return m_continuousFireOneShotsNeeded; }
-	inline Int getContinuousFireTwoShotsNeeded() const { return m_continuousFireTwoShotsNeeded; }
-	inline UnsignedInt getContinuousFireCoastFrames() const { return m_continuousFireCoastFrames; }
- 	inline UnsignedInt getAutoReloadWhenIdleFrames() const { return m_autoReloadWhenIdleFrames; }
-	inline UnsignedInt getSuspendFXDelay() const { return m_suspendFXDelay; }
-
-	inline const FXList* getFireFX(VeterancyLevel v) const { return m_fireFXs[v]; }
-	inline const FXList* getProjectileDetonateFX(VeterancyLevel v) const { return m_projectileDetonateFXs[v]; }
-	inline const ObjectCreationList* getFireOCL(VeterancyLevel v) const { return m_fireOCLs[v]; }
-	inline const ObjectCreationList* getProjectileDetonationOCL(VeterancyLevel v) const { return m_projectileDetonationOCLs[v]; }
-	inline const ParticleSystemTemplate* getProjectileExhaust(VeterancyLevel v) const { return m_projectileExhausts[v]; }
-
-	inline const AudioEventRTS& getFireSound() const { return m_fireSound; }
-	inline UnsignedInt getFireSoundLoopTime() const { return m_fireSoundLoopTime; }
-	inline const std::vector<Coord2D>& getScatterTargetsVector() const { return m_scatterTargets; }
-	inline const WeaponBonusSet* getExtraBonus() const { return m_extraBonus; }
-	inline Int getShotsPerBarrel() const { return m_shotsPerBarrel; }
-	inline Int getAntiMask() const { return m_antiMask; }
-	inline Bool isLeechRangeWeapon() const { return m_leechRangeWeapon; }
-	inline Bool isCapableOfFollowingWaypoint() const { return m_capableOfFollowingWaypoint; }
-	inline Bool isShowsAmmoPips() const { return m_isShowsAmmoPips; }
-	inline Bool isPlayFXWhenStealthed() const { return m_playFXWhenStealthed; }
-	inline Bool getDieOnDetonate() const { return m_dieOnDetonate; }
+	Real getShockWaveAmount() const { return m_shockWaveAmount; }
+	Real getShockWaveRadius() const { return m_shockWaveRadius; }
+	Real getShockWaveTaperOff() const { return m_shockWaveTaperOff; }
+
+	Real getRequestAssistRange() const {return m_requestAssistRange;}
+	AsciiString getName() const { return m_name; }
+	AsciiString getProjectileStreamName() const { return m_projectileStreamName; }
+	AsciiString getLaserName() const { return m_laserName; }
+	const AsciiString& getLaserBoneName() const { return m_laserBoneName; }
+	NameKeyType getNameKey() const { return m_nameKey; }
+	Real getWeaponSpeed() const { return m_weaponSpeed; }
+	Real getMinWeaponSpeed() const { return m_minWeaponSpeed; }
+	Bool isScaleWeaponSpeed() const { return m_isScaleWeaponSpeed; }
+	Real getWeaponRecoilAmount() const { return m_weaponRecoil; }
+	Real getMinTargetPitch() const { return m_minTargetPitch; }
+	Real getMaxTargetPitch() const { return m_maxTargetPitch; }
+	Real getRadiusDamageAngle() const { return m_radiusDamageAngle; }
+	DamageType getDamageType() const { return m_damageType; }
+	ObjectStatusTypes getDamageStatusType() const { return m_damageStatusType; }
+	DeathType getDeathType() const { return m_deathType; }
+	Real getContinueAttackRange() const { return m_continueAttackRange; }
+	Real getInfantryInaccuracyDist() const { return m_infantryInaccuracyDist; }
+	Real getAimDelta() const { return m_aimDelta; }
+	Real getScatterRadius() const { return m_scatterRadius; }
+	Real getScatterTargetScalar() const { return m_scatterTargetScalar; }
+	const ThingTemplate* getProjectileTemplate() const { return m_projectileTmpl; }
+	Bool getDamageDealtAtSelfPosition() const { return m_damageDealtAtSelfPosition; }
+	Int getAffectsMask() const { return m_affectsMask; }
+	Int getProjectileCollideMask() const { return m_collideMask; }
+	WeaponReloadType getReloadType() const { return m_reloadType; }
+	WeaponPrefireType getPrefireType() const { return m_prefireType; }
+	Bool getAutoReloadsClip() const { return m_reloadType == AUTO_RELOAD; }
+	Int getClipSize() const { return m_clipSize; }
+	Int getContinuousFireOneShotsNeeded() const { return m_continuousFireOneShotsNeeded; }
+	Int getContinuousFireTwoShotsNeeded() const { return m_continuousFireTwoShotsNeeded; }
+	UnsignedInt getContinuousFireCoastFrames() const { return m_continuousFireCoastFrames; }
+ 	UnsignedInt getAutoReloadWhenIdleFrames() const { return m_autoReloadWhenIdleFrames; }
+	UnsignedInt getSuspendFXDelay() const { return m_suspendFXDelay; }
+
+	const FXList* getFireFX(VeterancyLevel v) const { return m_fireFXs[v]; }
+	const FXList* getProjectileDetonateFX(VeterancyLevel v) const { return m_projectileDetonateFXs[v]; }
+	const ObjectCreationList* getFireOCL(VeterancyLevel v) const { return m_fireOCLs[v]; }
+	const ObjectCreationList* getProjectileDetonationOCL(VeterancyLevel v) const { return m_projectileDetonationOCLs[v]; }
+	const ParticleSystemTemplate* getProjectileExhaust(VeterancyLevel v) const { return m_projectileExhausts[v]; }
+
+	const AudioEventRTS& getFireSound() const { return m_fireSound; }
+	UnsignedInt getFireSoundLoopTime() const { return m_fireSoundLoopTime; }
+	const std::vector<Coord2D>& getScatterTargetsVector() const { return m_scatterTargets; }
+	const WeaponBonusSet* getExtraBonus() const { return m_extraBonus; }
+	Int getShotsPerBarrel() const { return m_shotsPerBarrel; }
+	Int getAntiMask() const { return m_antiMask; }
+	Bool isLeechRangeWeapon() const { return m_leechRangeWeapon; }
+	Bool isCapableOfFollowingWaypoint() const { return m_capableOfFollowingWaypoint; }
+	Bool isShowsAmmoPips() const { return m_isShowsAmmoPips; }
+	Bool isPlayFXWhenStealthed() const { return m_playFXWhenStealthed; }
+	Bool getDieOnDetonate() const { return m_dieOnDetonate; }
 
 	Bool shouldProjectileCollideWith(
-		const Object* projectileLauncher, 
-		const Object* projectile, 
+		const Object* projectileLauncher,
+		const Object* projectile,
 		const Object* thingWeCollidedWith,
 		ObjectID intendedVictimID	// could be INVALID_ID for a position-shot
 	) const;
-	
+
 	void postProcessLoad();
 
 protected:
@@ -474,9 +478,11 @@ class WeaponTemplate : public MemoryPoolObject
 	// actually deal out the damage.
 	void dealDamageInternal(ObjectID sourceID, ObjectID victimID, const Coord3D *pos, const WeaponBonus& bonus, Bool isProjectileDetonation) const;
 	void trimOldHistoricDamage() const;
+	void trimTriggeredHistoricDamage() const;
+	void processHistoricDamage(const Object* source, const Coord3D* pos) const;
 
 private:
-	
+
 	// NOTE: m_nextTemplate will be cleaned up if it is NON-NULL.
 	WeaponTemplate *m_nextTemplate;
 
@@ -494,8 +500,8 @@ class WeaponTemplate : public MemoryPoolObject
 	Real m_primaryDamage;										///< primary damage amount
 	Real m_primaryDamageRadius;							///< primary damage radius range
 	Real m_secondaryDamage;									///< secondary damage amount
-	Real m_secondaryDamageRadius;						///< secondary damage radius range	
-	Real m_shockWaveAmount;									///( How much shockwave generated 
+	Real m_secondaryDamageRadius;						///< secondary damage radius range
+	Real m_shockWaveAmount;									///( How much shockwave generated
 	Real m_shockWaveRadius;									///( How far shockwave effect affects objects
 	Real m_shockWaveTaperOff;								///( How much shockwave is left at the tip of the shockwave radius
 	Real m_attackRange;											///< max distance the weapon can deal damage
@@ -558,7 +564,8 @@ class WeaponTemplate : public MemoryPoolObject
 	Bool m_dieOnDetonate;
 
 	mutable HistoricWeaponDamageList m_historicDamage;
-};  
+	mutable UnsignedInt m_historicDamageTriggerId;
+};
 
 // ---------------------------------------------------------
 class Weapon : public MemoryPoolObject,
@@ -617,7 +624,7 @@ class Weapon : public MemoryPoolObject,
 	{
 		return estimateWeaponDamage(source, NULL, pos);
 	}
-	
+
 	void onWeaponBonusChange(const Object *source);///< Our Object's weapon bonus changed, so we need to update to reflect that instead of waiting
 
 	/** return true if the target is within attack range, false otherwise.
@@ -670,44 +677,44 @@ class Weapon : public MemoryPoolObject,
 
 	// we must pass the source object for these (and for ANY FUTURE ADDITIONS)
 	// so that we can take the source's weapon bonuses, if any, into account.
-	// Also note: you should RARELY need to call getAttackRange. If what you want is to 
+	// Also note: you should RARELY need to call getAttackRange. If what you want is to
 	// determine if you are within attack range, please call isWithinAttackRange instead.
 	Real getAttackRange(const Object *source) const;
 
 	// Returns the max distance between the centerpoints of source & victim	for victim to be in range.
 	Real getAttackDistance(const Object *source, const Object *victim, const Coord3D* victimPos) const;
 
-	void newProjectileFired( const Object *sourceObj, const Object *projectile, const Object *victimObj, const Coord3D *victimPos );///<I just made this projectile and may need to keep track of it 
-	
+	void newProjectileFired( const Object *sourceObj, const Object *projectile, const Object *victimObj, const Coord3D *victimPos );///<I just made this projectile and may need to keep track of it
+
 	Bool isLaser() const { return m_template->getLaserName().isNotEmpty(); }
 	void createLaser( const Object *sourceObj, const Object *victimObj, const Coord3D *victimPos );
 
-	inline const WeaponTemplate* getTemplate() const { return m_template; }
-	inline WeaponSlotType getWeaponSlot() const { return m_wslot; }
-	inline AsciiString getName() const { return m_template->getName(); }
-	inline UnsignedInt getLastShotFrame() const { return m_lastFireFrame; }						///< frame a shot was last fired on
+	const WeaponTemplate* getTemplate() const { return m_template; }
+	WeaponSlotType getWeaponSlot() const { return m_wslot; }
+	AsciiString getName() const { return m_template->getName(); }
+	UnsignedInt getLastShotFrame() const { return m_lastFireFrame; }						///< frame a shot was last fired on
 	// If we are "reloading", then m_ammoInClip is a lie.  It will say full.
-	inline UnsignedInt getRemainingAmmo() const { return (getStatus() == RELOADING_CLIP) ? 0 : m_ammoInClip; }
-	inline WeaponReloadType getReloadType() const { return m_template->getReloadType(); }
-	inline Bool getAutoReloadsClip() const { return m_template->getAutoReloadsClip(); }
-	inline Real getAimDelta() const { return m_template->getAimDelta(); }
-	inline Real getScatterRadius() const { return m_template->getScatterRadius(); }
-	inline Real getScatterTargetScalar() const { return m_template->getScatterTargetScalar(); }
-	inline Int getAntiMask() const { return m_template->getAntiMask(); }
-	inline Bool isCapableOfFollowingWaypoint() const { return m_template->isCapableOfFollowingWaypoint(); }
-	inline Int getContinuousFireOneShotsNeeded() const { return m_template->getContinuousFireOneShotsNeeded(); }
-	inline Int getContinuousFireTwoShotsNeeded() const { return m_template->getContinuousFireTwoShotsNeeded(); }
-	inline UnsignedInt getContinuousFireCoastFrames() const { return m_template->getContinuousFireCoastFrames(); }
- 	inline UnsignedInt getAutoReloadWhenIdleFrames() const { return m_template->getAutoReloadWhenIdleFrames(); }
-	inline const AudioEventRTS& getFireSound() const { return m_template->getFireSound(); }
-	inline UnsignedInt getFireSoundLoopTime() const { return m_template->getFireSoundLoopTime(); }
-	inline DamageType getDamageType() const { return m_template->getDamageType(); }
-	inline DeathType getDeathType() const { return m_template->getDeathType(); }
-	inline Real getContinueAttackRange() const { return m_template->getContinueAttackRange(); }
-	inline Bool isShowsAmmoPips() const { return m_template->isShowsAmmoPips(); }
-	inline Int getClipSize() const { return m_template->getClipSize(); }
+	UnsignedInt getRemainingAmmo() const { return (getStatus() == RELOADING_CLIP) ? 0 : m_ammoInClip; }
+	WeaponReloadType getReloadType() const { return m_template->getReloadType(); }
+	Bool getAutoReloadsClip() const { return m_template->getAutoReloadsClip(); }
+	Real getAimDelta() const { return m_template->getAimDelta(); }
+	Real getScatterRadius() const { return m_template->getScatterRadius(); }
+	Real getScatterTargetScalar() const { return m_template->getScatterTargetScalar(); }
+	Int getAntiMask() const { return m_template->getAntiMask(); }
+	Bool isCapableOfFollowingWaypoint() const { return m_template->isCapableOfFollowingWaypoint(); }
+	Int getContinuousFireOneShotsNeeded() const { return m_template->getContinuousFireOneShotsNeeded(); }
+	Int getContinuousFireTwoShotsNeeded() const { return m_template->getContinuousFireTwoShotsNeeded(); }
+	UnsignedInt getContinuousFireCoastFrames() const { return m_template->getContinuousFireCoastFrames(); }
+ 	UnsignedInt getAutoReloadWhenIdleFrames() const { return m_template->getAutoReloadWhenIdleFrames(); }
+	const AudioEventRTS& getFireSound() const { return m_template->getFireSound(); }
+	UnsignedInt getFireSoundLoopTime() const { return m_template->getFireSoundLoopTime(); }
+	DamageType getDamageType() const { return m_template->getDamageType(); }
+	DeathType getDeathType() const { return m_template->getDeathType(); }
+	Real getContinueAttackRange() const { return m_template->getContinueAttackRange(); }
+	Bool isShowsAmmoPips() const { return m_template->isShowsAmmoPips(); }
+	Int getClipSize() const { return m_template->getClipSize(); }
 	// Contact weapons (like car bombs) need to basically collide with their target.
-	inline Bool isContactWeapon() const { return m_template->isContactWeapon(); }
+	Bool isContactWeapon() const { return m_template->isContactWeapon(); }
 
 	Int getClipReloadTime(const Object *source) const;
 
@@ -720,7 +727,7 @@ class Weapon : public MemoryPoolObject,
 	Bool isPitchLimited() const { return m_pitchLimited; }
 	Bool isWithinTargetPitch(const Object *source, const Object *victim) const;
 
-	//Leech range functionality simply means this weapon has unlimited range temporarily. How it works is if the 
+	//Leech range functionality simply means this weapon has unlimited range temporarily. How it works is if the
 	//weapon template has the LeechRangeWeapon set, it means that once the unit has closed to standard weapon range
 	//it fires the weapon, and will be able to hit the target even if it moves out of range! The unit will simply
 	//stand there. This functionality is used by hack attacks.
@@ -737,17 +744,17 @@ class Weapon : public MemoryPoolObject,
 	Bool isClearGoalFiringLineOfSightTerrain(const Object* source, const Coord3D& goalPos, const Coord3D& victimPos) const;
 
 	static void calcProjectileLaunchPosition(
-		const Object* launcher, 
-		WeaponSlotType wslot, 
+		const Object* launcher,
+		WeaponSlotType wslot,
 		Int specificBarrelToUse,
 		Matrix3D& worldTransform,
 		Coord3D& worldPos
 	);
 
 	static void positionProjectileForLaunch(
-		Object* projectile, 
-		const Object *launcher, 
-		WeaponSlotType wslot, 
+		Object* projectile,
+		const Object *launcher,
+		WeaponSlotType wslot,
 		Int specificBarrelToUse
 	);
 
@@ -765,11 +772,11 @@ class Weapon : public MemoryPoolObject,
 
 	// return true if we auto-reloaded our clip after firing.
 	Bool privateFireWeapon(
-		const Object *sourceObj, 
-		Object *victimObj, 
-		const Coord3D* victimPos, 
-		Bool isProjectileDetonation, 
-		Bool ignoreRanges, 
+		const Object *sourceObj,
+		Object *victimObj,
+		const Coord3D* victimPos,
+		Bool isProjectileDetonation,
+		Bool ignoreRanges,
 		WeaponBonusConditionFlags extraBonusFlags,
 		ObjectID* projectileID,
 		Bool inflictDamage
@@ -789,7 +796,7 @@ class Weapon : public MemoryPoolObject,
 private:
 	const WeaponTemplate*			m_template;									///< the kind of weapon this is
 	WeaponSlotType						m_wslot;										///< are we primary, secondary, etc. weapon? (used for projectile placement on reload)
-	mutable WeaponStatus			m_status;										///< weapon status 
+	mutable WeaponStatus			m_status;										///< weapon status
 	UnsignedInt								m_ammoInClip;								///< how many shots left in current clip
 	UnsignedInt								m_whenWeCanFireAgain;				///< the first frame the weapon can fire again
 	UnsignedInt								m_whenPreAttackFinished;		///< the frame the pre attack will complete.
@@ -832,25 +839,26 @@ class WeaponStore : public SubsystemInterface
 	/**
 		Find the WeaponTemplate with the given name. If no such WeaponTemplate exists, return null.
 	*/
-	const WeaponTemplate *findWeaponTemplate(AsciiString name) const;
+	const WeaponTemplate *findWeaponTemplate(const AsciiString& name) const;
+	const WeaponTemplate *findWeaponTemplate(const char* name) const;
 	const WeaponTemplate *findWeaponTemplateByNameKey( NameKeyType key ) const { return findWeaponTemplatePrivate( key ); }
 
 	// this dynamically allocates a new Weapon, which is owned (and must be freed!) by the caller.
-	inline Weapon* allocateNewWeapon(const WeaponTemplate *tmpl, WeaponSlotType wslot) const
+	Weapon* allocateNewWeapon(const WeaponTemplate *tmpl, WeaponSlotType wslot) const
 	{
 		return newInstance(Weapon)(tmpl, wslot);	// my, that was easy
 	}
 
 	void createAndFireTempWeapon(const WeaponTemplate* w, const Object *source, const Coord3D* pos);
 	void createAndFireTempWeapon(const WeaponTemplate* w, const Object *source, Object *target);
-	
+
 	void handleProjectileDetonation( const WeaponTemplate* w, const Object *source, const Coord3D* pos, WeaponBonusConditionFlags extraBonusFlags, Bool inflictDamage = TRUE );
-	
+
 	static void parseWeaponTemplateDefinition(INI* ini);
 
 protected:
 
-	WeaponTemplate *findWeaponTemplatePrivate( NameKeyType key ) const;	
+	WeaponTemplate *findWeaponTemplatePrivate( NameKeyType key ) const;
 
 	WeaponTemplate *newWeaponTemplate( AsciiString name );
 	WeaponTemplate *newOverride( WeaponTemplate *weaponTemplate );
@@ -879,11 +887,13 @@ class WeaponStore : public SubsystemInterface
 	};
 
 	std::vector<WeaponTemplate*> m_weaponTemplateVector;
+
+	// TheSuperHackers @performance IamInnocent 01/01/2026 - Now additionally stores the same weapon templates in a hash map to optimize lookups by name key
+	typedef std::hash_map<NameKeyType, WeaponTemplate*, rts::hash<NameKeyType>, rts::equal_to<NameKeyType> > WeaponTemplateMap;
+	WeaponTemplateMap m_weaponTemplateHashMap;
+
 	std::list<WeaponDelayedDamageInfo> m_weaponDDI;
 };
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern WeaponStore *TheWeaponStore;
-
-#endif // __WEAPON_H_
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h
index b20cdbf9d47..39d26fb0d19 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h
@@ -27,9 +27,5 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __WEAPONBONUSCONDITIONFLAGS_H__
-#define __WEAPONBONUSCONDITIONFLAGS_H__
 
 typedef UnsignedInt WeaponBonusConditionFlags;
-
-#endif /* __WEAPONBONUSCONDITIONFLAGS_H__ */
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h
index d1313382ce9..707d5fffc10 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h
@@ -26,9 +26,6 @@
 
 #pragma once
 
-#ifndef _WeaponSet_H_
-#define _WeaponSet_H_
-
 #include "Lib/BaseType.h"
 #include "Common/GameType.h"
 #include "Common/KindOf.h"
@@ -54,7 +51,7 @@ enum DamageType CPP_11(: Int);
 #include "GameLogic/WeaponSetFlags.h"
 
 #ifdef DEFINE_WEAPONSLOTTYPE_NAMES
-static const char *TheWeaponSlotTypeNames[] = 
+static const char *const TheWeaponSlotTypeNames[] =
 {
 	"PRIMARY",
 	"SECONDARY",
@@ -62,31 +59,33 @@ static const char *TheWeaponSlotTypeNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheWeaponSlotTypeNames) == WEAPONSLOT_COUNT + 1, "Incorrect array size");
 
-static const LookupListRec TheWeaponSlotTypeNamesLookupList[] = 
+static const LookupListRec TheWeaponSlotTypeNamesLookupList[] =
 {
 	{ "PRIMARY",		PRIMARY_WEAPON },
 	{ "SECONDARY",	SECONDARY_WEAPON },
 	{ "TERTIARY",		TERTIARY_WEAPON },
-	
-	{ NULL, 0	}// keep this last!
+
+	{ NULL, 0	}
 };
+static_assert(ARRAY_SIZE(TheWeaponSlotTypeNamesLookupList) == WEAPONSLOT_COUNT + 1, "Incorrect array size");
 
-#endif  
+#endif
 
 //-------------------------------------------------------------------------------------------------
 #ifdef DEFINE_WEAPONCONDITIONMAP
 
 //Kris: I did not write this code, but I am adding comments to clarify it.
 //When I ran into this, I discovered that it was grossly out of date. It wasn't
-//clearly identified as a "lookup table", but hopefully now it makes sense. I've 
+//clearly identified as a "lookup table", but hopefully now it makes sense. I've
 //updated it as of May 2003 when I added RIDER1-8 conditions.
 
 //Purpose: Whenever you change a weaponset, the model condition state associated with it
 //will be properly set exclusively.
 static const ModelConditionFlagType TheWeaponSetTypeToModelConditionTypeMap[WEAPONSET_COUNT] =
 {
-	/*WEAPONSET_VETERAN*/								MODELCONDITION_WEAPONSET_VETERAN,		
+	/*WEAPONSET_VETERAN*/								MODELCONDITION_WEAPONSET_VETERAN,
 	/*WEAPONSET_ELITE*/									MODELCONDITION_WEAPONSET_ELITE,
 	/*WEAPONSET_HERO*/									MODELCONDITION_WEAPONSET_HERO,
 	/*WEAPONSET_PLAYER_UPGRADE*/				MODELCONDITION_WEAPONSET_PLAYER_UPGRADE,
@@ -152,23 +151,20 @@ class WeaponTemplateSet
 	Bool isWeaponLockSharedAcrossSets() const {return m_isWeaponLockSharedAcrossSets; }
 
 	Bool hasAnyWeapons() const;
-	inline const WeaponTemplate* getNth(WeaponSlotType n) const { return m_template[n]; } 
-	inline UnsignedInt getNthCommandSourceMask(WeaponSlotType n) const { return m_autoChooseMask[n]; } 
-	inline const KindOfMaskType& getNthPreferredAgainstMask(WeaponSlotType n) const { return m_preferredAgainst[n]; } 
+	inline const WeaponTemplate* getNth(WeaponSlotType n) const { return m_template[n]; }
+	inline UnsignedInt getNthCommandSourceMask(WeaponSlotType n) const { return m_autoChooseMask[n]; }
+	inline const KindOfMaskType& getNthPreferredAgainstMask(WeaponSlotType n) const { return m_preferredAgainst[n]; }
 
 	inline Int getConditionsYesCount() const { return 1; }
 	inline const WeaponSetFlags& getNthConditionsYes(Int i) const { return m_types; }
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	inline AsciiString getDescription() const { return AsciiString("ArmorTemplateSet"); }
+#if defined(RTS_DEBUG)
+	inline AsciiString getDescription() const { return "ArmorTemplateSet"; }
 #endif
 };
 
 //-------------------------------------------------------------------------------------------------
 typedef std::vector<WeaponTemplateSet> WeaponTemplateSetVector;
 
-//-------------------------------------------------------------------------------------------------
-typedef SparseMatchFinder<WeaponTemplateSet, WeaponSetFlags> WeaponTemplateSetFinder;
-
 //-------------------------------------------------------------------------------------------------
 enum WeaponChoiceCriteria CPP_11(: Int)
 {
@@ -236,7 +232,7 @@ class WeaponSet : public Snapshot
 	const Weapon* findAmmoPipShowingWeapon() const;
 	void weaponSetOnWeaponBonusChange(const Object *source);
 	UnsignedInt getMostPercentReadyToFireAnyWeapon() const;
-	inline UnsignedInt getNthCommandSourceMask( WeaponSlotType n ) const { return m_curWeaponTemplateSet ? m_curWeaponTemplateSet->getNthCommandSourceMask( n ) : NULL; } 
+	inline UnsignedInt getNthCommandSourceMask( WeaponSlotType n ) const { return m_curWeaponTemplateSet ? m_curWeaponTemplateSet->getNthCommandSourceMask( n ) : NULL; }
 
 	Bool setWeaponLock( WeaponSlotType weaponSlot, WeaponLockType lockType );
 	void releaseWeaponLock(WeaponLockType lockType);
@@ -248,7 +244,7 @@ class WeaponSet : public Snapshot
 
 	/**
 		Determines if the unit has any weapon that could conceivably
-		harm the victim. this does not take range, ammo, etc. into 
+		harm the victim. this does not take range, ammo, etc. into
 		account, but immutable weapon properties, such as "can you
 		target airborne victims".
 	*/
@@ -269,5 +265,3 @@ class WeaponSet : public Snapshot
 
 	static ModelConditionFlags getModelConditionForWeaponSlot(WeaponSlotType wslot, WeaponSetConditionType a);
 };
-
-#endif	// _WeaponSet_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h
index df1c3a75bf4..aede4770421 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h
@@ -27,11 +27,7 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __WEAPONSETFLAGS_H__
-#define __WEAPONSETFLAGS_H__
 
 #include "GameLogic/WeaponSetType.h"
 
 typedef BitFlags<WEAPONSET_COUNT> WeaponSetFlags;
-
-#endif /* __WEAPONSETFLAGS_H__ */
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h
index 91c60ed3a45..50b999c0b25 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h
@@ -27,15 +27,13 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __WEAPONSETTYPE_H__
-#define __WEAPONSETTYPE_H__
 
 //-------------------------------------------------------------------------------------------------
 // IMPORTANT NOTE: you should endeavor to set up states such that the most "normal"
 // state is defined by the bit being off. That is, the typical "normal" condition
 // has all condition flags set to zero.
 //
-// IMPORTANT NOTE #2: if you add or modify this list, be sure to update TheWeaponSetNames, 
+// IMPORTANT NOTE #2: if you add or modify this list, be sure to update TheWeaponSetNames,
 // *and* TheWeaponSetTypeToModelConditionTypeMap!
 //
 enum WeaponSetType CPP_11(: Int)
@@ -59,7 +57,5 @@ enum WeaponSetType CPP_11(: Int)
 	WEAPONSET_RIDER7,
 	WEAPONSET_RIDER8,
 
-	WEAPONSET_COUNT			///< keep last, please
+	WEAPONSET_COUNT
 };
-
-#endif /* __WEAPONSETTYPE_H__ */
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h
index 255dd29952b..be8e86c1864 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h
@@ -27,8 +27,6 @@
 // JKMCD Aug 2002
 
 #pragma once
-#ifndef __WEAPONSTATUS_H__
-#define __WEAPONSTATUS_H__
 
 enum WeaponStatus CPP_11(: Int)
 {
@@ -38,7 +36,5 @@ enum WeaponStatus CPP_11(: Int)
 	RELOADING_CLIP,
 	PRE_ATTACK,
 
-	WEAPON_STATUS_COUNT	// keep last
+	WEAPON_STATUS_COUNT
 };
-
-#endif /* __WEAPONSTATUS_H__ */
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h
deleted file mode 100644
index 4aa162d0386..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * The Connection class handles queues for individual players, one connection per player.
- * Connections are identified by their names (m_name).  This should accomodate changing IPs
- * in the face of modem disconnects, NAT irregularities, etc.
- * Messages can be guaranteed or non-guaranteed, sequenced or not.
- *
- *
- * So how this works is this:
- * The connection contains the incoming and outgoing commands to and from the player this
- * connection object represents.  The incoming packets are separated into the different frames
- * of execution.  This is done for efficiency reasons since we will be keeping track of commands
- * that are to be executed on many different frames, and they will need to be retrieved by the
- * connection manager on a per-frame basis.  We don't really care what frame the outgoing
- * commands are executed on as they all need to be sent out right away to ensure that the commands
- * get to their destination in time.
- */
-
-#pragma once
-
-#ifndef __CONNECTION_H
-#define __CONNECTION_H
-
-#include "GameNetwork/NetCommandList.h"
-#include "GameNetwork/User.h"
-#include "GameNetwork/Transport.h"
-#include "GameNetwork/NetPacket.h"
-
-#define CONNECTION_LATENCY_HISTORY_LENGTH 200
-
-class Connection : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Connection, "Connection")		
-public:
-	Connection();
-	//~Connection();
-
-	void update();
-	void init();
-	void reset();
-
-	UnsignedInt doSend();
-	void doRecv();
-
-	Bool allCommandsReady(UnsignedInt frame);
-	Bool isQueueEmpty();
-	void attachTransport(Transport *transport);
-	void setUser(User *user);
-	User *getUser();
-	void setFrameGrouping(time_t frameGrouping);
-
-	void sendNetCommandMsg(NetCommandMsg *msg, UnsignedByte relay);
-
-	// These two processAck calls do the same thing, just take different types of ACK commands.
-	NetCommandRef * processAck(NetAckBothCommandMsg *msg);
-	NetCommandRef * processAck(NetAckStage1CommandMsg *msg);
-	NetCommandRef * processAck(NetCommandMsg *msg);
-	NetCommandRef * processAck(UnsignedShort commandID, UnsignedByte originalPlayerID);
-
-	void clearCommandsExceptFrom( Int playerIndex );
-
-	void setQuitting( void );
-	Bool isQuitting( void ) { return m_isQuitting; }
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	void debugPrintCommands();
-#endif
-
-protected:
-	void doRetryMetrics();
-
-	Bool m_isQuitting;
-	UnsignedInt m_quitTime;
-
-	Transport *m_transport;
-	User *m_user;
-
-	NetCommandList *m_netCommandList;
-	time_t m_retryTime;						///< The time between sending retry packets for this connection.  Time is in milliseconds.
-	Real m_averageLatency;			///< The average time between sending a command and receiving an ACK.
-	Real m_latencies[CONNECTION_LATENCY_HISTORY_LENGTH];	///< List of the last 100 latencies.
-
-	time_t m_frameGrouping;				///< The minimum time between packet sends.
-	time_t m_lastTimeSent;				///< The time of the last packet send.
-	Int m_numRetries;							///< The number of retries for the last second.
-	time_t m_retryMetricsTime;		///< The start time of the current retry metrics thing.
-};
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h
deleted file mode 100644
index 5ab892aa12e..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * The connection manager maintains a collection of Connections to each player.  Messages are queued up
- * from here, as well as removed through here.
- */
-
-#pragma once
-
-#ifndef __CONNECTIONMANAGER_H
-#define __CONNECTIONMANAGER_H
-
-#include "GameNetwork/Connection.h"
-#include "GameNetwork/NetCommandList.h"
-#include "GameNetwork/Transport.h"
-#include "GameNetwork/FrameDataManager.h"
-#include "GameNetwork/FrameMetrics.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/DisconnectManager.h"
-
-class GameInfo;
-class NetCommandWrapperList;
-
-typedef std::map<UnsignedShort, AsciiString> FileCommandMap;
-typedef std::map<UnsignedShort, UnsignedByte> FileMaskMap;
-typedef std::map<UnsignedShort, Int> FileProgressMap;
-
-class ConnectionManager
-{
-public:
-	ConnectionManager();
-	~ConnectionManager();
-
-	virtual void init();				///< Initialize this instance.
-	virtual void reset();				///< Take this instance back to the initial state.
-	virtual void update(Bool isInGame);			///< Service the Connections being managed by this instance.
-
-	// End SubsystemInterface functions
-
-	void updateRunAhead(Int oldRunAhead, Int frameRate, Bool didSelfSlug, Int nextExecutionFrame);	///< Update the run ahead value.  If we are the current packet router, issue the command.
-
-	void attachTransport(Transport *transport);
-
-	void parseUserList(const GameInfo *game);
-	void sendChat(UnicodeString text, Int playerMask, UnsignedInt executionFrame);
-	void sendDisconnectChat(UnicodeString text);
-	void sendLocalCommand(NetCommandMsg *msg, UnsignedByte relay = 0xff);		///< Send command to the players specified in the relay, goes through packet router.
-	void sendLocalCommandDirect(NetCommandMsg *msg, UnsignedByte relay);		///< Send command directly to the players specified, doesn't go through packet router.
-	void sendLocalGameMessage(GameMessage *msg, UnsignedInt frame);
-	void sendCommand(NetCommandMsg *msg);
-	Bool allCommandsReady(UnsignedInt frame, Bool justTesting = FALSE);
-	void handleAllCommandsReady(void);
-	NetCommandList *getFrameCommandList(UnsignedInt frame);
-//	void AddConnection(User *user, UnsignedInt slot);
-	void determineRouterFallbackPlan();
-	void zeroFrames(UnsignedInt startingFrame, UnsignedInt numFrames);
-	void destroyGameMessages();
-//	void createConnections(UnsignedInt numberOfPlayers, UnsignedInt localSlot);
-	void setLocalAddress(UnsignedInt ip, UnsignedInt port);
-	void initTransport();
-	void processFrameTick(UnsignedInt frame);
-	void handleLocalPlayerLeaving(UnsignedInt frame);
-
-	void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID);
-	UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask);
-	Int getFileTransferProgress(Int playerID, AsciiString path);
-	Bool areAllQueuesEmpty(void);
-
-	UnsignedInt getLocalPlayerID();
-	UnicodeString getPlayerName(Int playerNum);
-	Int getNumPlayers();
-
-	UnsignedInt getPacketRouterFallbackSlot(Int packetRouterNumber);	///< Returns the slot of the given packet router number in the fallback plan.
-	UnsignedInt getPacketRouterSlot();																///< Returns the current packet router's slot.
-	PlayerLeaveCode disconnectPlayer(Int slot);												///< Disconnect this player immediately.  This should only be called by the disconnect manager.
-	void disconnectLocalPlayer();																			///< Does whatever is necessary to get TheNetwork to realize that it should be leaving the game now.
-	void quitGame();																									///< Disconnect from the game RIGHT NOW!!  Tell everyone else we are disconnecting.
-
-	void voteForPlayerDisconnect(Int slot);														///< Register a vote for a player to be disconnected.
-
-	void resendPendingCommands();																			///< Resend the pending commands to the packet router.
-
-	void setFrameGrouping(time_t frameGrouping);				///< Set the number of frames that are grouped together into packets.
-
-	PlayerLeaveCode processPlayerLeave(NetPlayerLeaveCommandMsg *msg);
-	Bool canILeave();																///< Returns true if the local player is allowed to leave.
-
-	// Bandwidth metrics
-	Real getIncomingBytesPerSecond( void );
-	Real getIncomingPacketsPerSecond( void );
-	Real getOutgoingBytesPerSecond( void );
-	Real getOutgoingPacketsPerSecond( void );
-	Real getUnknownBytesPerSecond( void );
-	Real getUnknownPacketsPerSecond( void );
-	UnsignedInt getPacketArrivalCushion( void );
-
-	UnsignedInt getMinimumCushion();
-
-	void flushConnections();
-
-	void processChat(NetChatCommandMsg *msg); // this actually needs to be public because it is frame-synchronized
-	
-	void updateLoadProgress( Int progress );
-	void loadProgressComplete( void );
-	void sendTimeOutGameStart( void );
-	
-	Bool isPacketRouter( void );
-
-	Bool isPlayerConnected( Int playerID );
-
-	void notifyOthersOfCurrentFrame(Int frame);
-	void sendFrameDataToPlayer(UnsignedInt playerID, UnsignedInt startingFrame);
-	void sendSingleFrameToPlayer(UnsignedInt playerID, UnsignedInt frame);
-	void notifyOthersOfNewFrame(UnsignedInt frame);
-
-	UnsignedInt getNextPacketRouterSlot(UnsignedInt playerID); ///< returns the packet router player that comes after the given player.
-	
-	Int getAverageFPS( void );
-	Int getSlotAverageFPS(Int slot);
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	void debugPrintConnectionCommands();
-#endif
-
-	// For disconnect blame assignment
-	UnsignedInt getPingFrame();
-	Int getPingsSent();
-	Int getPingsRecieved();
-
-private:
-	void doRelay();
-	void doKeepAlive();
-	void sendRemoteCommand(NetCommandRef *msg);
-	void ackCommand(NetCommandRef *ref, UnsignedInt localSlot);
-
-	Bool processNetCommand(NetCommandRef *ref);
-	void processAckStage1(NetCommandMsg *msg);
-	void processAckStage2(NetCommandMsg *msg);
-	void processAck(NetCommandMsg *msg);
-	void processFrameInfo(NetFrameCommandMsg *msg);
-	void processRunAheadMetrics(NetRunAheadMetricsCommandMsg *msg);
-	void processDisconnectChat(NetDisconnectChatCommandMsg *msg);
-	void processProgress( NetProgressCommandMsg *msg );
-	void processLoadComplete( NetCommandMsg *msg );
-	void processTimeOutGameStart( NetCommandMsg *msg );
-	void processWrapper(NetCommandRef *ref);
-	void processFrameResendRequest(NetFrameResendRequestCommandMsg *msg);
-
-	void processFile(NetFileCommandMsg *ref);
-	void processFileAnnounce(NetFileAnnounceCommandMsg *ref);
-	void processFileProgress(NetFileProgressCommandMsg *ref);
-
-	//	void doPerFrameMetrics(UnsignedInt frame);
-	void getMinimumFps(Int &minFps, Int &minFpsPlayer);			///< Returns the smallest FPS in the m_fpsAverages list.
-	Real getMaximumLatency(); ///< This actually sums the two biggest latencies in the m_latencyAverages list.
-
-	void requestFrameDataResend(Int playerID, UnsignedInt frame); ///< request of this player that he send the specified frame's data.
-
-	// The connections are set up like the slot list. The connection corresponding to the local
-	// player's position in the slot list will be NULL.  Connections corresponding to slots that
-	// do not have a player will also be NULL.
-	Connection *m_connections[MAX_SLOTS];
-
-	Transport *m_transport;
-	UnsignedInt m_localSlot;
-	UnsignedInt m_packetRouterSlot;
-	UnsignedInt m_packetRouterFallback[MAX_SLOTS];
-	UnsignedInt m_localAddr;
-	UnsignedInt m_localPort;
-	User* m_localUser;
-
-	DisconnectManager *m_disconnectManager;						///< Controls the disconnect dialog.
-
-	FrameDataManager *m_frameData[MAX_SLOTS];
-
-	NetCommandList *m_pendingCommands;
-	NetCommandList *m_relayedCommands;
-
-	FrameMetrics m_frameMetrics;
-
-	NetCommandWrapperList *m_netCommandWrapperList;
-
-	// These variables are used to keep track of the other players' average fps and latency.
-	// yup.
-	Real m_latencyAverages[MAX_SLOTS];
-	Int  m_fpsAverages[MAX_SLOTS];
-	Int  m_minFpsPlayer;
-	Int  m_minFps;
-	UnsignedInt m_smallestPacketArrivalCushion;
-	Bool m_didSelfSlug;
-
-	// -----------------------------------------------------------------------------
-	FileCommandMap s_fileCommandMap;
-	FileMaskMap s_fileRecipientMaskMap;
-	FileProgressMap s_fileProgressMap[MAX_SLOTS];
-	// -----------------------------------------------------------------------------
-};
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h
deleted file mode 100644
index ba71a0e1d11..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __DISCONNECTMANAGER_H
-#define __DISCONNECTMANAGER_H
-
-#include "GameNetwork/NetCommandRef.h"
-#include "Lib/BaseType.h"
-//#include "GameNetwork/ConnectionManager.h"
-
-enum DisconnectStateType CPP_11(: Int) {
-	DISCONNECTSTATETYPE_SCREENON,
-	DISCONNECTSTATETYPE_SCREENOFF
-//	DISCONNECTSTATETYPE_WAITINGFORPACKETROUTER
-};
-
-class ConnectionManager;
-
-struct DisconnectVoteStruct {
-	Bool vote;
-	UnsignedInt frame;
-};
-
-class DisconnectManager 
-{
-public:
-	DisconnectManager();
-	virtual ~DisconnectManager();
-
-	void init();
-	void update(ConnectionManager *conMgr);
-
-	void processDisconnectCommand(NetCommandRef *ref, ConnectionManager *conMgr);
-	void allCommandsReady(UnsignedInt frame, ConnectionManager *conMgr, Bool waitForPacketRouter = TRUE);
-	void nextFrame(UnsignedInt frame, ConnectionManager *conMgr);
-	Bool allowedToContinue();			///< Allow the next frame to go through?
-	void playerHasAdvancedAFrame(Int slot, UnsignedInt frame); ///< this player has advanced to that frame.
-
-	void voteForPlayerDisconnect(Int slot, ConnectionManager *conMgr);
-
-	// For disconnect blame assignment
-	UnsignedInt getPingFrame();
-	Int getPingsSent();
-	Int getPingsRecieved();
-
-protected:
-	void sendKeepAlive(ConnectionManager *conMgr);
-	void populateDisconnectScreen(ConnectionManager *conMgr);
-	Int translatedSlotPosition(Int slot, Int localSlot);
-	Int untranslatedSlotPosition(Int slot, Int localSlot);
-	void resetPlayerTimeouts(ConnectionManager *conMgr);
-	void resetPlayerTimeout(Int slot);
-	void resetPacketRouterTimeout();
-	void updateDisconnectStatus(ConnectionManager *conMgr);
-	void disconnectPlayer(Int slot, ConnectionManager *conMgr);
-	void sendDisconnectCommand(Int slot, ConnectionManager *conMgr);
-	void sendVoteCommand(Int slot, ConnectionManager *conMgr);
-	void updateWaitForPacketRouter(ConnectionManager *conMgr);
-	void recalculatePacketRouterIndex(ConnectionManager *conMgr);
-	Bool allOnSameFrame(ConnectionManager *conMgr); ///< returns true if all players are stuck on the same frame.
-	Bool isLocalPlayerNextPacketRouter(ConnectionManager *conMgr); ///< returns true if the local player is next in line to be the packet router with all the players that have timed out being taken out of the picture.
-	Bool hasPlayerTimedOut(Int slot); ///< returns true if this player has timed out.
-	void sendPlayerDestruct(Int slot, ConnectionManager *conMgr); ///< send a destruct player network message.
-	Bool isPlayerVotedOut(Int slot, ConnectionManager *conMgr);	///< returns true if this player has been voted out.
-	Bool isPlayerInGame(Int slot, ConnectionManager *conMgr); ///< returns true if the player has neither timed out or been voted out.
-	UnsignedInt getMaxDisconnectFrame();	///< returns the highest frame that people have got to.
-	Int countVotesForPlayer(Int slot); ///< return the number of disconnect votes a player has.
-	void resetPlayersVotes(Int playerID, UnsignedInt frame, ConnectionManager *conMgr); ///< reset the votes for this player.
-
-	void turnOnScreen(ConnectionManager *conMgr); ///< This gets called when the disconnect screen is first turned on.
-
-	void processDisconnectKeepAlive(NetCommandMsg *msg, ConnectionManager *conMgr);
-	void processDisconnectPlayer(NetCommandMsg *msg, ConnectionManager *conMgr);
-	void processPacketRouterQuery(NetCommandMsg *msg, ConnectionManager *conMgr);
-	void processPacketRouterAck(NetCommandMsg *msg, ConnectionManager *conMgr);
-	void processDisconnectVote(NetCommandMsg *msg, ConnectionManager *conMgr);
-	void processDisconnectFrame(NetCommandMsg *msg, ConnectionManager *conMgr);
-	void processDisconnectScreenOff(NetCommandMsg *msg, ConnectionManager *conMgr);
-
-	void applyDisconnectVote(Int slot, UnsignedInt frame, Int castingSlot, ConnectionManager *conMgr);
-
-	UnsignedInt m_lastFrame;
-	time_t m_lastFrameTime;
-	DisconnectStateType m_disconnectState;
-
-	UnsignedInt m_packetRouterFallback[MAX_SLOTS];
-	UnsignedInt m_currentPacketRouterIndex;
-
-	time_t m_lastKeepAliveSendTime;
-
-	time_t m_playerTimeouts[MAX_SLOTS - 1];
-	time_t m_packetRouterTimeout;
-
-	DisconnectVoteStruct m_playerVotes[MAX_SLOTS][MAX_SLOTS];
-//	Bool m_myVotes[MAX_SLOTS - 1];
-
-	UnsignedInt m_disconnectFrames[MAX_SLOTS];
-	Bool m_disconnectFramesReceived[MAX_SLOTS];
-	Bool m_haveNotifiedOtherPlayersOfCurrentFrame;
-
-	time_t m_timeOfDisconnectScreenOn;
-	Int m_pingsSent;
-	Int m_pingsRecieved;
-	UnsignedInt m_pingFrame;
-};
-
-
-#endif // #ifndef __DISCONNECTMANAGER_H
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h
deleted file mode 100644
index 134ce383e53..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: DownloadManager.h //////////////////////////////////////////////////////
-// Generals download class definitions
-// Author: Matthew D. Campbell, July 2002
-
-#pragma once
-
-#ifndef __DOWNLOADMANAGER_H__
-#define __DOWNLOADMANAGER_H__
-
-#include "WWDownload/downloaddefs.h"
-#include "WWDownload/Download.h"
-
-class CDownload;
-class QueuedDownload
-{
-public:
-	AsciiString server;
-	AsciiString userName;
-	AsciiString password;
-	AsciiString file;
-	AsciiString localFile;
-	AsciiString regKey;
-	Bool tryResume;
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// DownloadManager
-
-class DownloadManager : public IDownload
-{
-public:
-	DownloadManager();
-	virtual ~DownloadManager();
-	
-public:
-	void init( void );
-	HRESULT update( void );
-	void reset( void );
-
-	virtual HRESULT OnError( Int error );
-	virtual HRESULT OnEnd();
-	virtual HRESULT OnQueryResume();
-	virtual HRESULT OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft );
-	virtual HRESULT OnStatusUpdate( Int status );
-
-	virtual HRESULT downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume );
-	AsciiString getLastLocalFile( void );
-
-	Bool isDone( void ) { return m_sawEnd || m_wasError; }
-	Bool isOk( void ) { return m_sawEnd; }
-	Bool wasError( void ) { return m_wasError; }
-
-	UnicodeString getStatusString( void ) { return m_statusString; }
-	UnicodeString getErrorString( void ) { return m_errorString; }
-
-	void queueFileForDownload( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume );
-	Bool isFileQueuedForDownload( void ) { return !m_queuedDownloads.empty(); }
-	HRESULT downloadNextQueuedFile( void );
-
-private:
-	Bool m_winsockInit;
-	CDownload *m_download;
-	Bool m_wasError;
-	Bool m_sawEnd;
-	UnicodeString m_errorString;
-	UnicodeString m_statusString;
-
-protected:
-	std::list<QueuedDownload> m_queuedDownloads;
-};
-
-extern DownloadManager *TheDownloadManager;
-
-#endif // __DOWNLOADMANAGER_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h
deleted file mode 100644
index edca97bae45..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: FileTransfer.h
-// Author: Matthew D. Campbell, December 2002
-// Description: File Transfer wrapper using TheNetwork
-///////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-#ifndef __FILE_TRANSFER_H__
-#define __FILE_TRANSFER_H__
-
-class GameInfo;
-
-// Convenience functions
-AsciiString GetBasePathFromPath( AsciiString path );
-AsciiString GetFileFromPath( AsciiString path );
-AsciiString GetExtensionFromFile( AsciiString fname );
-AsciiString GetBaseFileFromFile( AsciiString fname );
-AsciiString GetPreviewFromMap( AsciiString path );
-AsciiString GetINIFromMap( AsciiString path );
-AsciiString GetStrFileFromMap( AsciiString path );
-AsciiString GetSoloINIFromMap( AsciiString path );
-AsciiString GetAssetUsageFromMap( AsciiString path );
-AsciiString GetReadmeFromMap( AsciiString path );
-
-// The meat of file (map) transfers
-Bool DoAnyMapTransfers(GameInfo *game);
-
-#endif // __FILE_TRANSFER_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h
deleted file mode 100644
index e36f478b150..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /RedAlert2/NAT.CPP                                          $*
- *                                                                                             *
- *                      $Author:: Steve_t                                                     $*
- *                                                                                             *
- *                     $Modtime:: 3/15/01 12:00PM                                             $*
- *                                                                                             *
- *                    $Revision:: 1                                                           $*
- *                                                                                             *
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- *                                                                                             *
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- *                                                                                             *
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#pragma once
-
-#ifndef __FIREWALLHELPER_H
-#define __FIREWALLHELPER_H
-
-class UDP;
-
-#define NUM_TEST_PORTS 4
-#define MAX_SPARE_SOCKETS 8
-
-/*
-**
-**   Class to help in dealing with firewalls.
-**
-**
-**
-*/
-
-struct SpareSocketStruct {
-	UDP *udp;
-	UnsignedShort port;
-};
-
-enum FirewallDetectionState CPP_11(: Int) {
-	DETECTIONSTATE_IDLE,
-	DETECTIONSTATE_BEGIN,
-	DETECTIONSTATE_TEST1,
-	DETECTIONSTATE_TEST2,
-	DETECTIONSTATE_TEST3,
-	DETECTIONSTATE_TEST3_WAITFORRESPONSES,
-	DETECTIONSTATE_TEST4_1,
-	DETECTIONSTATE_TEST4_2,
-	DETECTIONSTATE_TEST5,
-	DETECTIONSTATE_DONE
-};
-
-#pragma pack(push, 1)
-
-// size = 16 bytes
-struct ManglerData {
-		unsigned int		CRC;
-		unsigned short	magic;
-		unsigned short	PacketID;
-		unsigned short	MyMangledPortNumber;
-		unsigned short	OriginalPortNumber;
-		unsigned char		MyMangledAddress[4];
-		unsigned char		NetCommandType;
-		unsigned char		BlitzMe;
-		unsigned short	Padding;
-};
-
-// size = TransportMessageHeader + ManglerData + 10 bytes = 26 bytes
-struct ManglerMessage {
-        ManglerData							data;
-        int											length;
-        unsigned int						ip;
-        unsigned short					port;
-};
-
-#pragma pack(pop)
-
-static const Int MAX_NUM_MANGLERS = 4;
-static const UnsignedShort MANGLER_PORT = 4321;
-
-class FirewallHelperClass {
-
-	public:
-
-		/*
-		** Enumeration of firewall behaviors we can detect.
-		**
-		** It is assumed that all port mangling firewalls change the mangled source port in response to
-		** an application source port change.
-		*/
-		typedef enum tFirewallBehaviorType {
-
-			FIREWALL_MIN = 0,
-
-			/*
-			** Just used as an initialiser.
-			*/
-			FIREWALL_TYPE_UNKNOWN = 0,
-
-			/*
-			** This is a simple, non-port translating firewall, or there is no firewall at all.
-			*/
-			FIREWALL_TYPE_SIMPLE = 1,
-
-			/*
-			** This is a firewall/NAT with port mangling but it's pretty dumb - it uses the same mangled
-			** source port regardless of the destination address.
-			*/
-			FIREWALL_TYPE_DUMB_MANGLING = 2,
-
-			/*
-			** This is a smarter firewall/NAT with port mangling that uses different mangled source ports
-			** for different destination IPs.
-			*/
-			FIREWALL_TYPE_SMART_MANGLING = 4,
-
-			/*
-			** This is a firewall that exhibits the bug as seen in the Netgear firewalls. A previously good
-			** source port mapping will change in response to unsolicited traffic from a known IP.
-			*/
-			FIREWALL_TYPE_NETGEAR_BUG = 8,
-
-			/*
-			** This firewall has a simple absolute offset port allocation scheme.
-			*/
-			FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION = 16,
-
-			/*
-			** This firewall has a relative offset port allocation scheme. For these firewalls, we have to
-			** subtract the actual source port from the mangled source port to discover the allocation scheme.
-			** The mangled port number is based in part on the original source port number.
-			*/
-			FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION = 32,
-
-			/*
-			** This firewall mangles source ports differently depending on the destination port.
-			*/
-			FIREWALL_TYPE_DESTINATION_PORT_DELTA = 64,
-
-			FIREWALL_MAX = 128
-
-		} FirewallBehaviorType;
-
-
-
-		FirewallHelperClass(void);
-		virtual ~FirewallHelperClass(void);
-		Bool detectFirewall(void);
-		UnsignedShort getRawFirewallBehavior(void) {return((UnsignedShort)m_behavior);}
-		Short getSourcePortAllocationDelta(void);
-		Int getFirewallHardness(FirewallBehaviorType behavior);
-		Int getFirewallRetries(FirewallBehaviorType behavior);
-		void setSourcePortPoolStart(Int port) {m_sourcePortPool = port;};
-		Int getSourcePortPool(void) {return(m_sourcePortPool);};
-		void readFirewallBehavior(void);
-		void reset(void);
-		Bool behaviorDetectionUpdate(void);
-		
-		FirewallBehaviorType getFirewallBehavior(void);
-		void writeFirewallBehavior(void);
-
-		void flagNeedToRefresh(Bool flag);
-
-		static void getManglerName(Int manglerIndex, Char *nameBuf);
-		Bool sendToManglerFromPort(UnsignedInt address, UnsignedShort port, UnsignedShort packetID, Bool blitzme = FALSE);
-		UnsignedShort getManglerResponse(UnsignedShort packetID, Int time = 0);
-		Bool openSpareSocket(UnsignedShort port);
-		void closeSpareSocket(UnsignedShort port);
-		void closeAllSpareSockets();
-		UnsignedShort getNextTemporarySourcePort(Int skip);
-
-		Bool detectionBeginUpdate(void);
-		Bool detectionTest1Update(void);
-		Bool detectionTest2Update(void);
-		Bool detectionTest3Update(void);
-		Bool detectionTest3WaitForResponsesUpdate(void);
-		Bool detectionTest4Stage1Update(void);
-		Bool detectionTest4Stage2Update(void);
-		Bool detectionTest5Update(void);
-
-
-		/*
-		** Behavior query functions.
-		*/
-		inline Bool isNAT(void) {
-			if (m_behavior == FIREWALL_TYPE_UNKNOWN || (m_behavior & FIREWALL_TYPE_SIMPLE) != 0) {
-				return(FALSE);
-			}
-			return(TRUE);
-		};
-
-		inline Bool isNAT(FirewallBehaviorType behavior) {
-			if (behavior == FIREWALL_TYPE_UNKNOWN || (behavior & FIREWALL_TYPE_SIMPLE) != 0) {
-				return(FALSE);
-			}
-			return(TRUE);
-		};
-
-		inline Bool isNetgear(FirewallBehaviorType behavior) {
-			if ((behavior & FIREWALL_TYPE_NETGEAR_BUG) != 0) {
-				return(TRUE);
-			}
-			return(FALSE);
-		};
-
-		inline Bool isNetgear(void) {
-			if ((m_behavior & FIREWALL_TYPE_NETGEAR_BUG) != 0) {
-				return(TRUE);
-			}
-			return(FALSE);
-		};
-
-
-
-	private:
-
-		Int getNATPortAllocationScheme(Int numPorts, UnsignedShort *originalPorts, UnsignedShort *mangledPorts, Bool &relativeDelta, Bool &looksGood);
-		void detectFirewallBehavior(/*Bool &canRecord*/);
-		Bool getReferencePort(void);
-
-		SpareSocketStruct * findSpareSocketByPort(UnsignedShort port);
-		ManglerMessage * findEmptyMessage();
-
-		void byteAdjust(ManglerData *data);
-
-		/*
-		** How does our firewall behave?
-		*/
-		FirewallBehaviorType m_behavior;
-
-		/*
-		** How did the firewall behave the last time we ran the game.
-		*/
-		FirewallBehaviorType m_lastBehavior;
-
-		/*
-		** What is the delta in our firewalls NAT port allocation scheme.
-		*/
-		Int m_sourcePortAllocationDelta;
-
-		/*
-		** What was the delta the last time we ran?
-		*/
-		Int m_lastSourcePortAllocationDelta;
-
-		/*
-		** Source ports used only to discover port allocation patterns.
-		** Needs to be static so that previous communications with the manglers
-		** don't affect the current one.
-		*/
-		static Int m_sourcePortPool;
-
-		/*
-		** Spare sockets used for detecting mangling and such.
-		*/
-		SpareSocketStruct m_spareSockets[MAX_SPARE_SOCKETS];
-
-		UnsignedInt m_manglers[MAX_NUM_MANGLERS];
-		Int m_numManglers;
-
-		UnsignedShort m_sparePorts[MAX_SPARE_SOCKETS];
-		UnsignedShort m_mangledPorts[MAX_SPARE_SOCKETS];
-		UnsignedShort m_packetID;
-
-		ManglerMessage m_messages[MAX_SPARE_SOCKETS];
-
-		FirewallDetectionState m_currentState;
-		time_t m_timeoutStart;
-		time_t m_timeoutLength;
-
-		Int m_numResponses;
-		Int m_currentTry;
-};
-
-
-
-extern FirewallHelperClass *TheFirewallHelper;
-FirewallHelperClass * createFirewallHelper();
-
-
-#endif	// __FIREWALLHELPER_H
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h
deleted file mode 100644
index cfbb977659c..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __FRAMEDATA_H
-#define __FRAMEDATA_H
-
-#include "Lib/BaseType.h"
-#include "GameNetwork/NetCommandList.h"
-
-enum FrameDataReturnType CPP_11(: Int) {
-	FRAMEDATA_NOTREADY,
-	FRAMEDATA_RESEND,
-	FRAMEDATA_READY
-};
-
-class FrameData {
-public:
-	FrameData();
-	~FrameData();
-
-	void init();
-	void reset();
-	void update();
-
-	UnsignedInt getFrame();
-	void setFrame(UnsignedInt frame);
-	FrameDataReturnType allCommandsReady(Bool debugSpewage);
-	NetCommandList * getCommandList();
-	void setFrameCommandCount(UnsignedInt totalCommandCount);
-	UnsignedInt getFrameCommandCount();
-	void addCommand(NetCommandMsg *msg);
-	UnsignedInt getCommandCount();
-	void zeroFrame();
-	void destroyGameMessages();
-
-protected:
-	UnsignedInt m_frame;
-	UnsignedInt m_frameCommandCount;
-	UnsignedInt m_commandCount;
-	NetCommandList *m_commandList;
-	UnsignedInt m_lastFailedCC;
-	UnsignedInt m_lastFailedFrameCC;
-};
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h
deleted file mode 100644
index e300e144b72..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __FRAMEDATAMANAGER_H
-#define __FRAMEDATAMANAGER_H
-
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/FrameData.h"
-
-class FrameDataManager : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FrameDataManager, "FrameDataManager")		
-public:
-	FrameDataManager(Bool isLocal);
-	//virtual ~FrameDataManager();
-
-	void init();
-	void reset();
-	void update();
-
-	void addNetCommandMsg(NetCommandMsg *msg);
-	void setIsLocal(Bool isLocal);
-	FrameDataReturnType allCommandsReady(UnsignedInt frame, Bool debugSpewage);
-	NetCommandList * getFrameCommandList(UnsignedInt frame);
-	UnsignedInt getCommandCount(UnsignedInt frame);
-	void setFrameCommandCount(UnsignedInt frame, UnsignedInt commandCount);
-	UnsignedInt getFrameCommandCount(UnsignedInt frame);
-	void zeroFrames(UnsignedInt startingFrame, UnsignedInt numFrames);
-	void destroyGameMessages();
-	void resetFrame(UnsignedInt frame, Bool isAdvancing = TRUE);
-	void setQuitFrame(UnsignedInt frame);
-	UnsignedInt getQuitFrame();
-	Bool getIsQuitting();
-
-protected:
-	FrameData *m_frameData;
-	Bool m_isLocal;
-
-	Bool m_isQuitting;
-	UnsignedInt m_quitFrame;
-};
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h
deleted file mode 100644
index 265db1440e1..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/** FrameMetrics.h */
-
-#pragma once
-
-#ifndef __FRAMEMETRICS_H
-#define __FRAMEMETRICS_H
-
-#include "Lib/BaseType.h"
-#include "GameNetwork/NetworkDefs.h"
-
-class FrameMetrics {
-public:
-	FrameMetrics();
-	virtual ~FrameMetrics();
-
-	void init();
-	void reset();
-
-	void doPerFrameMetrics(UnsignedInt frame);
-	void processLatencyResponse(UnsignedInt frame);
-	void addCushion(Int cushion);
-
-	Real getAverageLatency();
-	Int getAverageFPS();
-	Int getMinimumCushion();
-
-protected:
-	// These are used for keeping track of parameters to the run ahead equation.
-	// frames per second history variables.
-	Real *m_fpsList;								///< A record of how many game logic frames per second there were for the last 60 seconds.
-	time_t m_lastFpsTimeThing;																///< The time when the last fps entry started being recorded.
-	Int m_fpsListIndex;																				///< Index into the array of the current fps list entry being measured.
-	Real m_averageFps;																				///< The current average logic fps, computed just like m_averageLatency below but with the fps numbers.
-
-	// round trip time to packet router variables.
-	// The lists are indexed off the frame number of the frame info packet they are associated with.
-	// The index used should be the frame number mod the array length.
-	Real *m_latencyList;				///< A record of the round trip latencies of the frame info packets to the packet router.  Values in seconds.
-	time_t *m_pendingLatencies;																///< The latencies of frame info packets that are "in the air."
-	Real m_averageLatency;																		///< The current average latency, this is used to save calculation time.
-																														///< When a new latency value is received, the old one is subtracted out and the new
-																														///< one is added in.
-
-	// packet arrival cushion variables.
-	// Keeps track of the cushion for the incoming commands.
-	UnsignedInt m_cushionIndex;															///< The next index to use for the cushion list.
-	Int m_minimumCushion;																			///< The average cushion for the history.
-};
-
-#endif // __FRAMEMETRICS_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h
index f0bf0b447c7..2d00645cb15 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef __GUIUTIL_H__
-#define __GUIUTIL_H__
-
 class GameWindow;
 class GameInfo;
 
@@ -46,12 +43,10 @@ Bool AreSlotListUpdatesEnabled( void );
 
 void UpdateSlotList( GameInfo *myGame, GameWindow *comboPlayer[],
 										GameWindow *comboColor[], GameWindow *comboPlayerTemplate[],
-										GameWindow *comboTeam[], GameWindow *buttonAccept[], 
+										GameWindow *comboTeam[], GameWindow *buttonAccept[],
 										GameWindow *buttonStart, GameWindow *buttonMapStartPosition[] );
 
 void EnableAcceptControls(Bool Enabled, GameInfo *myGame, GameWindow *comboPlayer[],
 										GameWindow *comboColor[], GameWindow *comboPlayerTemplate[],
 										GameWindow *comboTeam[], GameWindow *buttonAccept[], GameWindow *buttonStart,
 										GameWindow *buttonMapStartPosition[], Int slotNum = -1);
-
-#endif // __GUIUTIL_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h
deleted file mode 100644
index abb37a4da51..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GameInfo.h //////////////////////////////////////////////////////
-// Generals game setup information
-// Author: Matthew D. Campbell, December 2001
-
-#pragma once
-
-#ifndef __GAMEINFO_H__
-#define __GAMEINFO_H__
-
-#include "Common/Snapshot.h"
-#include "Common/Money.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/FirewallHelper.h"
-
-enum SlotState CPP_11(: Int)
-{
-	SLOT_OPEN,
-	SLOT_CLOSED,
-	SLOT_EASY_AI,
-	SLOT_MED_AI,
-	SLOT_BRUTAL_AI,
-	SLOT_PLAYER
-};
-
-enum
-{
-	PLAYERTEMPLATE_RANDOM = -1,
-	PLAYERTEMPLATE_OBSERVER = -2,
-	PLAYERTEMPLATE_MIN = PLAYERTEMPLATE_OBSERVER
-};
-
-/**
-  * GameSlot class - maintains information about the contents of a
-	* game slot.  This persists throughout the game.
-	*/
-class GameSlot
-{
-public:
-	GameSlot();
-	virtual void reset();
-
-	void setAccept( void ) { m_isAccepted = true; }		///< Accept the current options
-	void unAccept( void );														///< Unaccept (options changed, etc)
-	Bool isAccepted( void ) const { return m_isAccepted; }	///< Non-human slots are always accepted
-
-	void setMapAvailability( Bool hasMap );						///< Set whether the slot has the map
-	Bool hasMap( void ) const { return m_hasMap; }		///< Non-human slots always have the map
-
-	void setState( SlotState state,
-		UnicodeString name = UnicodeString::TheEmptyString,
-		UnsignedInt IP = 0);														///< Set the slot's state (human, AI, open, etc)
-	SlotState getState( void ) const { return m_state; }		///< Get the slot state
-
-	void setColor( Int color ) { m_color = color; }
-	Int getColor( void ) const { return m_color; }
-
-	void setStartPos( Int startPos ) { m_startPos = startPos; }
-	Int getStartPos( void ) const { return m_startPos; }
-
-	void setPlayerTemplate( Int playerTemplate ) 
-	{ m_playerTemplate = playerTemplate;
-		if (playerTemplate <= PLAYERTEMPLATE_MIN)
-			m_startPos = -1;
-	 }
-	Int getPlayerTemplate( void ) const { return m_playerTemplate; }
-
-	void setTeamNumber( Int teamNumber ) { m_teamNumber = teamNumber; }
-	Int getTeamNumber( void ) const { return m_teamNumber; }
-
-	inline void setName( UnicodeString name ) { m_name = name; }
-	inline UnicodeString getName( void ) const { return m_name; }
-
-	inline void setIP( UnsignedInt IP ) { m_IP = IP; }
-	inline UnsignedInt getIP( void ) const { return m_IP; }
-
-	inline void setPort( UnsignedShort port ) { m_port = port; }
-	inline UnsignedShort getPort( void ) const { return m_port; }
-
-	inline void setNATBehavior( FirewallHelperClass::FirewallBehaviorType NATBehavior) { m_NATBehavior = NATBehavior; }
-	inline FirewallHelperClass::FirewallBehaviorType getNATBehavior() const { return m_NATBehavior; }
-	
-	void saveOffOriginalInfo( void );
-	inline Int getOriginalPlayerTemplate( void ) const	{ return m_origPlayerTemplate; }
-	inline Int getOriginalColor( void ) const						{ return m_origColor; }
-	inline Int getOriginalStartPos( void ) const				{ return m_origStartPos; }
-	Int getApparentPlayerTemplate( void ) const;
-	Int getApparentColor( void ) const;
-	Int getApparentStartPos( void ) const;
-	UnicodeString getApparentPlayerTemplateDisplayName( void ) const;
-
-	// Various tests
-	Bool isHuman( void ) const;															///< Is this slot occupied by a human player?
-	Bool isOccupied( void ) const;													///< Is this slot occupied (by a human or an AI)?
-	Bool isAI( void ) const;																///< Is this slot occupied by an AI?
-	Bool isPlayer( AsciiString userName ) const;						///< Does this slot contain the given user?
-	Bool isPlayer( UnicodeString userName ) const;					///< Does this slot contain the given user?
-	Bool isPlayer( UnsignedInt ip ) const;									///< Is this slot at this IP?
-	Bool isOpen( void ) const;
-
-	void setLastFrameInGame( UnsignedInt frame ) { m_lastFrameInGame = frame; }
-	void markAsDisconnected( void ) { m_disconnected = TRUE; }
-	UnsignedInt lastFrameInGame( void ) const { return m_lastFrameInGame; }
-	Bool disconnected( void ) const { return isHuman() && m_disconnected; }
-
-	void mute( Bool isMuted ) { m_isMuted = isMuted; }
-	Bool isMuted( void ) const { return m_isMuted; }
-protected:
-	SlotState m_state;
-	Bool m_isAccepted;
-	Bool m_hasMap;
-	Bool m_isMuted;
-	Int m_color;																			///< color, or -1 for random
-	Int m_startPos;																		///< start position, or -1 for random
-	Int m_playerTemplate;															///< PlayerTemplate
-	Int m_teamNumber;																	///< alliance, -1 for none
-	Int m_origColor;																			///< color, or -1 for random
-	Int m_origStartPos;																		///< start position, or -1 for random
-	Int m_origPlayerTemplate;															///< PlayerTemplate
-	UnicodeString m_name;															///< Only valid for human players
-	UnsignedInt m_IP;																	///< Only valid for human players in LAN/WOL
-	UnsignedShort m_port;															///< Only valid for human players in LAN/WOL
-	FirewallHelperClass::FirewallBehaviorType m_NATBehavior;	///< The NAT behavior for this slot's player.
-	UnsignedInt m_lastFrameInGame;	// only valid for human players
-	Bool m_disconnected;						// only valid for human players
-};
-
-/**
-  * GameInfo class - maintains information about the game setup and
-	* the contents of its slot list hroughout the game.
-	*/
-class GameInfo
-{
-public:
-	GameInfo();
-	
-	void init( void );
-	virtual void reset( void );
-
-	void clearSlotList( void );
-
-	Int getNumPlayers( void ) const;									///< How many players (human and AI) are in the game?
-	Int getNumNonObserverPlayers( void ) const;				///< How many non-observer players (human and AI) are in the game?
-	Int getMaxPlayers( void ) const;									///< How many players (human and AI) can be in the game?
-
-	void enterGame( void );														///< Mark us as having entered the game
-	void leaveGame( void );														///< Mark us as having left the game
-	virtual void startGame( Int gameID );											///< Mark our game as started, and record the game ID
-	void endGame( void );															///< Mark us as out of game
-	inline Int getGameID( void ) const;								///< Get the game ID of the current game or the last one if we're not in game
-
-	inline void setInGame( void );										///< set the m_inGame flag
-	inline Bool isInGame( void ) const;											///< Are we (in game or in game setup)?  As opposed to chatting, matching, etc
-	inline Bool isGameInProgress( void ) const;							///< Is the game in progress?
-	inline void setGameInProgress( Bool inProgress ); ///< Set whether the game is in progress or not.
-	void setSlot( Int slotNum, GameSlot slotInfo );		///< Set the slot state (human, open, AI, etc)
-	GameSlot* getSlot( Int slotNum );									///< Get the slot
-	const GameSlot* getConstSlot( Int slotNum ) const;	///< Get the slot
-	virtual Bool amIHost( void ) const;															///< Convenience function - is the local player the game host?
-	virtual Int getLocalSlotNum( void ) const;				///< Get the local slot number, or -1 if we're not present
-	Int getSlotNum( AsciiString userName ) const;			///< Get the slot number corresponding to a specific user, or -1 if he's not present
-
-	// Game options
-	void setMap( AsciiString mapName );								///< Set the map to play on
-	void setMapCRC( UnsignedInt mapCRC );							///< Set the map CRC
-	void setMapSize( UnsignedInt mapSize );						///< Set the map size
-	void setMapContentsMask( Int mask );							///< Set the map contents mask (1=map,2=preview,4=map.ini)
-	inline AsciiString getMap( void ) const;								///< Get the game map
-	inline UnsignedInt getMapCRC( void ) const;							///< Get the map CRC
-	inline UnsignedInt getMapSize( void ) const;						///< Get the map size
-	inline Int getMapContentsMask( void ) const;						///< Get the map contents mask
-	void setSeed( Int seed );													///< Set the random seed for the game
-	inline Int getSeed( void ) const;												///< Get the game seed
-	inline Int getUseStats( void ) const;		///< Does this game count towards gamespy stats?
-	inline void setUseStats( Int useStats );
-
-  inline UnsignedShort getSuperweaponRestriction( void ) const; ///< Get any optional limits on superweapons
-  void setSuperweaponRestriction( UnsignedShort restriction ); ///< Set the optional limits on superweapons
-  inline const Money & getStartingCash(void) const; 
-  void setStartingCash( const Money & startingCash );
-
-	void setSlotPointer( Int index, GameSlot *slot );	///< Set the slot info pointer
-
-	void setLocalIP( UnsignedInt ip ) { m_localIP =ip; }	///< Set the local IP
-	UnsignedInt getLocalIP( void ) const { return m_localIP; }	///< Get the local IP
-
-	Bool isColorTaken(Int colorIdx, Int slotToIgnore = -1 ) const;
-	Bool isStartPositionTaken(Int positionIdx, Int slotToIgnore = -1 ) const;
-
-	virtual void resetAccepted(void);															///< Reset the accepted flag on all players
-	virtual void resetStartSpots(void);						///< reset the start spots for the new map.
-	virtual void adjustSlotsForMap(void);					///< adjusts the slots to open and closed depending on the players in the game and the number of players the map can hold.
-
-	virtual void closeOpenSlots(void);						///< close all slots that are currently unoccupied.
-
-	// CRC checking hack
-	void setCRCInterval( Int val ) { m_crcInterval = (val<100)?val:100; }
-	inline Int getCRCInterval( void ) const { return m_crcInterval; }
-	
-	Bool haveWeSurrendered(void) { return m_surrendered; }
-	void markAsSurrendered(void) { m_surrendered = TRUE; }
-
-	Bool isSkirmish(void); // TRUE if 1 human & 1+ AI are present && !isSandbox()
-	Bool isMultiPlayer(void); // TRUE if 2+ human are present
-	Bool isSandbox(void); // TRUE if everybody is on the same team
-	
-	Bool isPlayerPreorder(Int index);
-	void markPlayerAsPreorder(Int index);
-
-  inline Bool oldFactionsOnly(void) const;
-  inline void setOldFactionsOnly( Bool oldFactionsOnly );
-
-protected:
-	Int m_preorderMask;
-	Int m_crcInterval;
-	Bool m_inGame;
-	Bool m_inProgress;
-	Bool m_surrendered;
-	Int m_gameID;
-	GameSlot *m_slot[MAX_SLOTS];
-
-	UnsignedInt m_localIP;
-
-	// Game options
-	AsciiString m_mapName;
-	UnsignedInt m_mapCRC;
-	UnsignedInt m_mapSize;
-	Int m_mapMask;
-	Int m_seed;
-	Int m_useStats;
-  Money         m_startingCash;
-  UnsignedShort m_superweaponRestriction;
-  Bool m_oldFactionsOnly; // Only USA, China, GLA -- not USA Air Force General, GLA Toxic General, et al
-};
-
-extern GameInfo *TheGameInfo;
-
-// Inline functions
-Int					GameInfo::getGameID( void ) const								{ return m_gameID; }
-AsciiString	GameInfo::getMap( void ) const									{ return m_mapName; }
-UnsignedInt	GameInfo::getMapCRC( void ) const								{ return m_mapCRC; }
-UnsignedInt	GameInfo::getMapSize( void ) const							{ return m_mapSize; }
-Int					GameInfo::getMapContentsMask( void ) const			{ return m_mapMask; }
-Int					GameInfo::getSeed( void ) const									{ return m_seed; }
-Bool				GameInfo::isInGame( void ) const								{ return m_inGame; }
-void				GameInfo::setInGame( void )											{ m_inGame = true; }
-Bool				GameInfo::isGameInProgress( void ) const				{ return m_inProgress; }
-void				GameInfo::setGameInProgress( Bool inProgress )	{ m_inProgress = inProgress; }
-Int					GameInfo::getUseStats( void ) const             { return m_useStats; }
-void				GameInfo::setUseStats( Int useStats )           { m_useStats = useStats; }
-const Money&GameInfo::getStartingCash( void ) const         { return m_startingCash; }
-UnsignedShort GameInfo::getSuperweaponRestriction( void ) const { return m_superweaponRestriction; }
-Bool        GameInfo::oldFactionsOnly(void) const           { return m_oldFactionsOnly; }
-void        GameInfo::setOldFactionsOnly( Bool oldFactionsOnly ) { m_oldFactionsOnly = oldFactionsOnly; }
-
-AsciiString GameInfoToAsciiString( const GameInfo *game );
-Bool ParseAsciiStringToGameInfo( GameInfo *game, AsciiString options );
-
-
-/**
-  * The SkirmishGameInfo class holds information about the skirmish game and
-	* the contents of its slot list.
-	*/
-
-class SkirmishGameInfo : public GameInfo, public Snapshot
-{
-private:
-	GameSlot m_skirmishSlot[MAX_SLOTS];
-
-protected:
-	// snapshot methods
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-public:
-	SkirmishGameInfo()
-	{
-		for (Int i = 0; i< MAX_SLOTS; ++i)
-			setSlotPointer(i, &m_skirmishSlot[i]);
-	}
-};
-
-extern SkirmishGameInfo *TheSkirmishGameInfo;
-extern SkirmishGameInfo *TheChallengeGameInfo;
-
-#endif // __GAMEINFO_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameMessageParser.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameMessageParser.h
deleted file mode 100644
index 18db206ddc2..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameMessageParser.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#include "Common/MessageStream.h"
-#include "Common/GameMemory.h"
-
-//----------------------------------------------------------------------------
-class GameMessageParserArgumentType : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessageParserArgumentType, "GameMessageParserArgumentType")		
-public:
-	GameMessageParserArgumentType(GameMessageArgumentDataType type, Int argCount);
-	//virtual ~GameMessageParserArgumentType();
-
-	GameMessageParserArgumentType *getNext();
-	void setNext(GameMessageParserArgumentType *next);
-	Int getArgCount();
-	GameMessageArgumentDataType getType();
-
-protected:
-	GameMessageParserArgumentType*	m_next;
-	GameMessageArgumentDataType			m_type;
-	Int															m_argCount;
-};
-
-//----------------------------------------------------------------------------
-inline GameMessageParserArgumentType * GameMessageParserArgumentType::getNext() 
-{
-	return m_next;
-}
-
-//----------------------------------------------------------------------------
-inline void GameMessageParserArgumentType::setNext(GameMessageParserArgumentType *next) 
-{
-	m_next = next;
-}
-
-//----------------------------------------------------------------------------
-inline GameMessageArgumentDataType GameMessageParserArgumentType::getType() 
-{
-	return m_type;
-}
-
-//----------------------------------------------------------------------------
-inline Int GameMessageParserArgumentType::getArgCount() 
-{
-	return m_argCount;
-}
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-class GameMessageParser : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GameMessageParser, "GameMessageParser")		
-public:
-	GameMessageParser();
-	GameMessageParser(GameMessage *msg);
-	//virtual ~GameMessageParser();
-
-	GameMessageParserArgumentType *getFirstArgumentType();
-	void addArgType(GameMessageArgumentDataType type, Int argCount);
-	Int getNumTypes();
-
-protected:
-	GameMessageParserArgumentType *m_first, *m_last;
-	Int m_argTypeCount;
-};
-
-//----------------------------------------------------------------------------
-inline GameMessageParserArgumentType * GameMessageParser::getFirstArgumentType() 
-{
-	return m_first;
-}
-
-//----------------------------------------------------------------------------
-inline Int GameMessageParser::getNumTypes() 
-{
-	return m_argTypeCount;
-}
-
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h
deleted file mode 100644
index 2d032020f84..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: BuddyDefs.h //////////////////////////////////////////////////////
-// Generals GameSpy Buddy (GP) definitions
-// Author: Matthew D. Campbell, July 2002
-
-#pragma once
-
-#ifndef __BUDDYDEFS_H__
-#define __BUDDYDEFS_H__
-
-void HandleBuddyResponses(void);
-void PopulateOldBuddyMessages(void);
-
-#endif // __BUDDYDEFS_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h
deleted file mode 100644
index 8b94bd9bfe7..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: BuddyThread.h //////////////////////////////////////////////////////
-// Generals GameSpy BuddyList thread class interface
-// Author: Matthew D. Campbell, June 2002
-
-#pragma once
-
-#ifndef __BUDDYTHREAD_H__
-#define __BUDDYTHREAD_H__
-
-#include "gamespy/gp/gp.h"
-
-#define MAX_BUDDY_CHAT_LEN 128
-
-// this class encapsulates a request for the buddy thread
-class BuddyRequest
-{
-public:
-	enum
-	{
-		BUDDYREQUEST_LOGIN,				// attempt to login
-		BUDDYREQUEST_RELOGIN,			// log in after being disconnected
-		BUDDYREQUEST_LOGOUT,			// log out if connected
-		BUDDYREQUEST_MESSAGE,
-		BUDDYREQUEST_LOGINNEW,		// attempt to create a new nick and login
-		//BUDDYREQUEST_DELETELOGIN,
-		BUDDYREQUEST_ADDBUDDY,		// add someone to your buddy list
-		BUDDYREQUEST_DELBUDDY,		// delete someone from your buddy list
-		BUDDYREQUEST_OKADD,				// allow someone to add you to their buddy list
-		BUDDYREQUEST_DENYADD,			// don't allow someone to add you to their buddy list
-		BUDDYREQUEST_SETSTATUS,		// Set our status
-		BUDDYREQUEST_DELETEACCT,	// Delete our account
-		BUDDYREQUEST_MAX
-	} buddyRequestType;
-
-	union
-	{
-		struct
-		{
-			GPProfile recipient;
-			WideChar text[MAX_BUDDY_CHAT_LEN];
-		} message;
-
-		struct
-		{
-			char nick[GP_NICK_LEN];
-			char email[GP_EMAIL_LEN];
-			char password[GP_PASSWORD_LEN];
-			Bool hasFirewall;
-		} login;
-
-		struct
-		{
-			GPProfile id;
-			WideChar text[MAX_BUDDY_CHAT_LEN];
-		} addbuddy;
-
-		struct
-		{
-			GPProfile id;
-		} profile;
-
-		struct
-		{
-			GPEnum status;
-			char statusString[GP_STATUS_STRING_LEN];
-			char locationString[GP_LOCATION_STRING_LEN];
-		} status;
-
-	} arg;
-};
-
-//-------------------------------------------------------------------------
-
-// this class encapsulates an action the buddy thread wants from the UI
-class BuddyResponse
-{
-public:
-	enum
-	{
-		BUDDYRESPONSE_LOGIN,
-		BUDDYRESPONSE_DISCONNECT,
-		BUDDYRESPONSE_MESSAGE,
-		BUDDYRESPONSE_REQUEST,
-		BUDDYRESPONSE_STATUS,
-		BUDDYRESPONSE_MAX
-	} buddyResponseType;
-
-	GPProfile profile;
-	GPResult result;
-
-	union
-	{
-		struct
-		{
-			UnsignedInt date;
-			char nick[GP_NICK_LEN];
-			WideChar text[MAX_BUDDY_CHAT_LEN];
-		} message;
-
-		struct
-		{
-			char nick[GP_NICK_LEN];
-			char email[GP_EMAIL_LEN];
-			char countrycode[GP_COUNTRYCODE_LEN];
-			WideChar text[GP_REASON_LEN];
-		} request;
-
-		struct
-		{
-			//GPResult result;
-			GPErrorCode errorCode;
-			char errorString[MAX_BUDDY_CHAT_LEN];
-			GPEnum fatal;
-		} error;
-
-		struct
-		{
-			char nick[GP_NICK_LEN];
-			char email[GP_EMAIL_LEN];
-			char countrycode[GP_COUNTRYCODE_LEN];
-			char location[GP_LOCATION_STRING_LEN];
-			GPEnum status;
-			char statusString[GP_STATUS_STRING_LEN];
-		} status;
-	} arg;
-};
-
-//-------------------------------------------------------------------------
-
-// this is the actual message queue used to pass messages between threads
-class GameSpyBuddyMessageQueueInterface
-{
-public:
-	virtual ~GameSpyBuddyMessageQueueInterface() {}
-	virtual void startThread( void ) = 0;
-	virtual void endThread( void ) = 0;
-	virtual Bool isThreadRunning( void ) = 0;
-	virtual Bool isConnected( void ) = 0;
-	virtual Bool isConnecting( void ) = 0;
-
-	virtual void addRequest( const BuddyRequest& req ) = 0;
-	virtual Bool getRequest( BuddyRequest& req ) = 0;
-
-	virtual void addResponse( const BuddyResponse& resp ) = 0;
-	virtual Bool getResponse( BuddyResponse& resp ) = 0;
-
-	virtual GPProfile getLocalProfileID( void ) = 0;
-
-	static GameSpyBuddyMessageQueueInterface* createNewMessageQueue( void );
-};
-
-extern GameSpyBuddyMessageQueueInterface *TheGameSpyBuddyMessageQueue;
-
-
-#endif // __BUDDYTHREAD_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h
deleted file mode 100644
index fb03080e9e1..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GSConfig.h ///////////////////////////////////////////////////////////
-// Author: Matthew D. Campbell, Sept 2002
-// Description: GameSpy online config
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __GSCONFIG_H__
-#define __GSCONFIG_H__
-
-#include "Common/AsciiString.h"
-#include "Common/STLTypedefs.h"
-
-class GameSpyConfigInterface
-{
-public:
-	virtual ~GameSpyConfigInterface() {}
-
-	// Pings
-	virtual std::list<AsciiString> getPingServers(void) = 0;
-	virtual Int getNumPingRepetitions(void) = 0;
-	virtual Int getPingTimeoutInMs(void) = 0;
-	virtual Int getPingCutoffGood( void ) = 0;
-	virtual Int getPingCutoffBad( void ) = 0; //Bryan sez, Maybe
-
-	// QM
-	virtual std::list<AsciiString> getQMMaps(void) = 0;
-	virtual Int getQMBotID(void) = 0;
-	virtual Int getQMChannel(void) = 0;
-	virtual void setQMChannel(Int channel) = 0;
-
-	// Player Info
-	virtual Int getPointsForRank(Int rank) = 0;
-	virtual Bool isPlayerVIP(Int id) = 0;
-
-	// mangler Info
-	virtual Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port) = 0;
-
-	// Ladder / Any other external parsing
-	virtual AsciiString getLeftoverConfig(void) = 0;
-
-	// Custom match
-	virtual Bool restrictGamesToLobby() = 0;
-	static GameSpyConfigInterface* create(AsciiString config);
-};
-
-extern GameSpyConfigInterface *TheGameSpyConfig;
-
-#endif // __GSCONFIG_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h
deleted file mode 100644
index 76c91675855..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GameResultsThread.h //////////////////////////////////////////////////////
-// Generals game results thread class interface
-// Author: Matthew D. Campbell, August 2002
-
-#pragma once
-
-#ifndef __GAMERESULTSTHREAD_H__
-#define __GAMERESULTSTHREAD_H__
-
-#include "Common/SubsystemInterface.h"
-
-// this class encapsulates a request for the thread
-class GameResultsRequest
-{
-public:
-	std::string hostname;
-	UnsignedShort port;
-	std::string results;
-};
-
-//-------------------------------------------------------------------------
-
-// this class encapsulates a response from the thread
-class GameResultsResponse
-{
-public:
-	std::string hostname;
-	UnsignedShort port;
-	Bool sentOk;
-};
-
-//-------------------------------------------------------------------------
-
-// this is the actual message queue used to pass messages between threads
-class GameResultsInterface : public SubsystemInterface
-{
-public:
-	virtual ~GameResultsInterface() {}
-	virtual void startThreads( void ) = 0;
-	virtual void endThreads( void ) = 0;
-	virtual Bool areThreadsRunning( void ) = 0;
-
-	virtual void addRequest( const GameResultsRequest& req ) = 0;
-	virtual Bool getRequest( GameResultsRequest& resp ) = 0;
-
-	virtual void addResponse( const GameResultsResponse& resp ) = 0;
-	virtual Bool getResponse( GameResultsResponse& resp ) = 0;
-
-	static GameResultsInterface* createNewGameResultsInterface( void );
-
-	virtual Bool areGameResultsBeingSent( void ) = 0;
-};
-
-extern GameResultsInterface *TheGameResultsQueue;
-
-
-#endif // __GAMERESULTSTHREAD_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h
deleted file mode 100644
index 25d8098c2ed..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: LadderDefs.h //////////////////////////////////////////////////////
-// Generals ladder definitions
-// Author: Matthew D. Campbell, August 2002
-
-#pragma once
-
-#ifndef __LADDERDEFS_H__
-#define __LADDERDEFS_H__
-
-#include "Common/UnicodeString.h"
-#include "Common/AsciiString.h"
-#include "Common/STLTypedefs.h"
-
-class GameWindow;
-
-class LadderInfo
-{
-public:
-	LadderInfo();
-	UnicodeString name;
-	UnicodeString description;
-	UnicodeString location;
-	Int playersPerTeam;
-	Int minWins;
-	Int maxWins;
-	Bool randomMaps;
-	Bool randomFactions;
-	Bool validQM;
-	Bool validCustom;
-	std::list<AsciiString> validMaps;
-	std::list<AsciiString> validFactions;
-	AsciiString cryptedPassword;
-	AsciiString address;
-	UnsignedShort port;
-	AsciiString homepageURL;
-	Bool submitReplay; // with game results
-	Int index;
-};
-
-typedef std::list<LadderInfo *> LadderInfoList;
-
-class LadderList
-{
-public:
-	LadderList();
-	~LadderList();
-
-	const LadderInfo* findLadder( const AsciiString& addr, UnsignedShort port );
-	const LadderInfo* findLadderByIndex( Int index );	// doesn't look in local ladders
-	const LadderInfoList* getLocalLadders( void );
-	const LadderInfoList* getSpecialLadders( void );
-	const LadderInfoList* getStandardLadders( void );
-
-private:
-	void loadLocalLadders( void );
-	void checkLadder( AsciiString fname, Int index );
-	LadderInfoList m_localLadders;
-	LadderInfoList m_specialLadders;
-	LadderInfoList m_standardLadders;
-};
-
-extern LadderList *TheLadderList;
-
-#endif // __LADDERDEFS_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
deleted file mode 100644
index 678a15fe20f..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: LobbyUtils.h //////////////////////////////////////////////////////
-// Generals lobby utils
-// Author: Matthew D. Campbell, Sept 2002
-
-#pragma once
-
-#ifndef __LOBBYUTILS_H__
-#define __LOBBYUTILS_H__
-
-class GameWindow;
-
-GameWindow *GetGameListBox( void );
-GameWindow *GetGameInfoListBox( void );
-NameKeyType GetGameListBoxID( void );
-NameKeyType GetGameInfoListBoxID( void );
-void GrabWindowInfo( void );
-void ReleaseWindowInfo( void );
-void RefreshGameInfoListBox( GameWindow *mainWin, GameWindow *win );
-void RefreshGameListBoxes( void );
-void ToggleGameListType( void );
-
-void playerTemplateComboBoxTooltip(GameWindow *wndComboBox, WinInstanceData *instData, UnsignedInt mouse);
-void playerTemplateListBoxTooltip(GameWindow *wndListBox, WinInstanceData *instData, UnsignedInt mouse);
-
-enum GameSortType CPP_11(: Int)
-{
-	GAMESORT_ALPHA_ASCENDING = 0,
-	GAMESORT_ALPHA_DESCENDING,
-	GAMESORT_PING_ASCENDING,
-	GAMESORT_PING_DESCENDING,
-	GAMESORT_MAX,
-};
-
-Bool HandleSortButton( NameKeyType sortButton );
-void PopulateLobbyPlayerListbox(void);
-
-#endif // __LOBBYUTILS_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h
deleted file mode 100644
index a0a8aff3dab..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: MainMenuUtils.h //////////////////////////////////////////////////////
-// Author: Matthew D. Campbell, Sept 2002
-// Description: GameSpy version check, patch download, etc utils
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __MAINMENUUTILS_H__
-#define __MAINMENUUTILS_H__
-
-void HTTPThinkWrapper( void );
-void StopAsyncDNSCheck( void );
-void StartPatchCheck( void );
-void CancelPatchCheckCallback( void );
-void StartDownloadingPatches( void );
-void HandleCanceledDownload( Bool resetDropDown = TRUE );
-
-void CheckOverallStats( void );
-void HandleOverallStats( const char* szHTTPStats, unsigned len );
-
-void CheckNumPlayersOnline( void );
-void HandleNumPlayersOnline( Int numPlayersOnline );
-
-#endif // __MAINMENUUTILS_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
deleted file mode 100644
index ac27f1370e2..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PeerDefs.h //////////////////////////////////////////////////////
-// Generals GameSpy Peer (chat) definitions
-// Author: Matthew D. Campbell, June 2002
-
-#pragma once
-
-#ifndef __PEERDEFS_H__
-#define __PEERDEFS_H__
-
-#include "gamespy/peer/peer.h"
-#include "gamespy/gp/gp.h"
-
-#include "GameClient/Color.h"
-#include "Common/STLTypedefs.h"
-#include "GameNetwork/GameSpy/StagingRoomGameInfo.h"
-
-class GameWindow;
-class PSPlayerStats;
-
-typedef std::set<AsciiString> IgnoreList;
-typedef std::map<Int, AsciiString> SavedIgnoreMap;
-
-enum RCItemType CPP_11(: Int)
-{
-	ITEM_BUDDY,
-	ITEM_REQUEST,
-	ITEM_NONBUDDY,
-	ITEM_NONE,
-};
-
-class GameSpyRCMenuData
-{
-public:
-	AsciiString m_nick;
-	GPProfile m_id;
-	RCItemType m_itemType;
-};
-
-class BuddyInfo
-{
-public:
-	GPProfile m_id;
-	AsciiString m_name;
-	AsciiString m_email;
-	AsciiString m_countryCode;
-	GPEnum m_status;
-	UnicodeString m_statusString;
-	UnicodeString m_locationString;
-};
-typedef std::map<GPProfile, BuddyInfo> BuddyInfoMap;
-
-class BuddyMessage
-{
-public:
-	UnsignedInt m_timestamp;
-	GPProfile m_senderID;
-	AsciiString m_senderNick;
-	GPProfile m_recipientID;
-	AsciiString m_recipientNick;
-	UnicodeString m_message;
-};
-typedef std::list<BuddyMessage> BuddyMessageList;
-
-class GameSpyGroupRoom
-{
-public:
-	GameSpyGroupRoom() { m_name = AsciiString::TheEmptyString; m_translatedName = UnicodeString::TheEmptyString; m_groupID = m_numWaiting = m_maxWaiting = m_numGames = m_numPlaying = 0; }
-	AsciiString m_name;
-	UnicodeString m_translatedName;
-	Int m_groupID;
-	Int m_numWaiting;
-	Int m_maxWaiting;
-	Int m_numGames;
-	Int m_numPlaying;
-};
-typedef std::map<Int, GameSpyGroupRoom> GroupRoomMap;
-
-class Transport;
-class NAT;
-
-typedef std::map<Int, GameSpyStagingRoom *> StagingRoomMap;
-
-class PlayerInfo
-{
-public:
-	PlayerInfo() { m_name = m_locale = AsciiString::TheEmptyString; m_wins = m_losses = m_rankPoints = m_side = m_preorder = m_profileID = m_flags = 0; }
-	AsciiString m_name;
-	AsciiString m_locale;
-	Int m_wins;
-	Int m_losses;
-	Int m_profileID;
-	Int m_flags;
-	Int m_rankPoints;
-	Int m_side;
-	Int m_preorder;
-	Bool isIgnored( void );
-};
-struct AsciiComparator
-{
-	bool operator()(AsciiString s1, AsciiString s2) const;
-};
-
-
-typedef std::map<AsciiString, PlayerInfo, AsciiComparator> PlayerInfoMap;
-
-enum GameSpyColors CPP_11(: Int) {
-	GSCOLOR_DEFAULT = 0,
-	GSCOLOR_CURRENTROOM,
-	GSCOLOR_ROOM,
-	GSCOLOR_GAME,
-	GSCOLOR_GAME_FULL,
-	GSCOLOR_GAME_CRCMISMATCH,
-	GSCOLOR_PLAYER_NORMAL,
-	GSCOLOR_PLAYER_OWNER,
-	GSCOLOR_PLAYER_BUDDY,
-	GSCOLOR_PLAYER_SELF,
-	GSCOLOR_PLAYER_IGNORED,
-	GSCOLOR_CHAT_NORMAL,
-	GSCOLOR_CHAT_EMOTE,
-	GSCOLOR_CHAT_OWNER,
-	GSCOLOR_CHAT_OWNER_EMOTE,
-	GSCOLOR_CHAT_PRIVATE,
-	GSCOLOR_CHAT_PRIVATE_EMOTE,
-	GSCOLOR_CHAT_PRIVATE_OWNER,
-	GSCOLOR_CHAT_PRIVATE_OWNER_EMOTE,
-	GSCOLOR_CHAT_BUDDY,
-	GSCOLOR_CHAT_SELF,
-	GSCOLOR_ACCEPT_TRUE,
-	GSCOLOR_ACCEPT_FALSE,
-	GSCOLOR_MAP_SELECTED,
-	GSCOLOR_MAP_UNSELECTED,
-	GSCOLOR_MOTD,
-	GSCOLOR_MOTD_HEADING,
-	GSCOLOR_MAX
-};
-
-extern Color GameSpyColor[GSCOLOR_MAX];
-
-enum GameSpyBuddyStatus CPP_11(: Int) {
-	BUDDY_OFFLINE,
-	BUDDY_ONLINE,
-	BUDDY_LOBBY,
-	BUDDY_STAGING,
-	BUDDY_LOADING,
-	BUDDY_PLAYING,
-	BUDDY_MATCHING,
-	BUDDY_MAX
-};
-
-// ---------------------------------------------------
-// this class holds info used in the main thread
-class GameSpyInfoInterface
-{
-public:
-	virtual ~GameSpyInfoInterface() {};
-	virtual void reset( void ) {};
-	virtual void clearGroupRoomList( void ) = 0;
-	virtual GroupRoomMap* getGroupRoomList( void ) = 0;
-	virtual void addGroupRoom( GameSpyGroupRoom room ) = 0;
-	virtual Bool gotGroupRoomList( void ) = 0;
-	virtual void joinGroupRoom( Int groupID ) = 0;
-	virtual void leaveGroupRoom( void ) = 0;
-	virtual void joinBestGroupRoom( void ) = 0;
-	virtual void setCurrentGroupRoom( Int groupID ) = 0;
-	virtual Int  getCurrentGroupRoom( void ) = 0;
-	virtual void updatePlayerInfo( PlayerInfo pi, AsciiString oldNick = AsciiString::TheEmptyString ) = 0;
-	virtual void playerLeftGroupRoom( AsciiString nick ) = 0;
-	virtual PlayerInfoMap* getPlayerInfoMap( void ) = 0;
-
-	virtual BuddyInfoMap* getBuddyMap( void ) = 0;
-	virtual BuddyInfoMap* getBuddyRequestMap( void ) = 0;
-	virtual BuddyMessageList* getBuddyMessages( void ) = 0;
-	virtual Bool isBuddy( Int id ) = 0;
-
-	virtual void setLocalName( AsciiString name ) = 0;
-	virtual AsciiString getLocalName( void ) = 0;
-	virtual void setLocalProfileID( Int profileID ) = 0;
-	virtual Int getLocalProfileID( void ) = 0;
-	virtual AsciiString getLocalEmail( void ) = 0;
-	virtual void setLocalEmail( AsciiString email ) = 0;
-	virtual AsciiString getLocalPassword( void ) = 0;
-	virtual void setLocalPassword( AsciiString passwd ) = 0;
-	virtual void setLocalBaseName( AsciiString name ) = 0;
-	virtual AsciiString getLocalBaseName( void ) = 0;
-
-	virtual void setCachedLocalPlayerStats( PSPlayerStats stats ) = 0;
-	virtual PSPlayerStats getCachedLocalPlayerStats( void ) = 0;
-
-	virtual void clearStagingRoomList( void ) = 0;
-	virtual StagingRoomMap* getStagingRoomList( void ) = 0;
-	virtual GameSpyStagingRoom* findStagingRoomByID( Int id ) = 0;
-	virtual void addStagingRoom( GameSpyStagingRoom room ) = 0;
-	virtual void updateStagingRoom( GameSpyStagingRoom room ) = 0;
-	virtual void removeStagingRoom( GameSpyStagingRoom room ) = 0;
-	virtual Bool hasStagingRoomListChanged( void ) = 0;
-	virtual void leaveStagingRoom( void ) = 0;
-	virtual void markAsStagingRoomHost( void ) = 0;
-	virtual void markAsStagingRoomJoiner( Int game ) = 0;
-	virtual void sawFullGameList( void ) = 0;
-
-	virtual Bool amIHost( void ) = 0;
-	virtual GameSpyStagingRoom* getCurrentStagingRoom( void ) = 0;
-	virtual void setGameOptions( void ) = 0;
-	virtual Int getCurrentStagingRoomID( void ) = 0;
-
-	virtual void setDisallowAsianText( Bool val ) = 0;
-	virtual void setDisallowNonAsianText( Bool val ) = 0;
-	virtual Bool getDisallowAsianText( void ) = 0;
-	virtual Bool getDisallowNonAsianText(void ) = 0;
-
-	// chat
-	virtual void registerTextWindow( GameWindow *win ) = 0;
-	virtual void unregisterTextWindow( GameWindow *win ) = 0;
-	virtual Int addText( UnicodeString message, Color c, GameWindow *win ) = 0;
-	virtual void addChat( PlayerInfo p, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win ) = 0;
-	virtual void addChat( AsciiString nick, Int profileID, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win ) = 0;
-	virtual Bool sendChat( UnicodeString message, Bool isAction, GameWindow *playerListbox ) = 0;
-
-	virtual void setMOTD( const AsciiString& motd ) = 0;
-	virtual const AsciiString& getMOTD( void ) = 0;
-
-	virtual void setConfig( const AsciiString& config ) = 0;
-	virtual const AsciiString& getConfig( void ) = 0;
-
-	virtual void setPingString( const AsciiString& ping ) = 0;
-	virtual const AsciiString& getPingString( void ) = 0;
-	virtual Int getPingValue( const AsciiString& otherPing ) = 0;
-
-	static GameSpyInfoInterface* createNewGameSpyInfoInterface( void );
-	
-	virtual void addToSavedIgnoreList( Int profileID, AsciiString nick ) = 0;
-	virtual void removeFromSavedIgnoreList( Int profileID ) = 0;
-	virtual Bool isSavedIgnored( Int profileID ) = 0;		
-	virtual SavedIgnoreMap returnSavedIgnoreList( void ) = 0;
-	virtual void loadSavedIgnoreList( void ) = 0;
-	
-	virtual IgnoreList returnIgnoreList( void ) = 0;
-	virtual void addToIgnoreList( AsciiString nick ) = 0;
-	virtual void removeFromIgnoreList( AsciiString nick ) = 0;
-	virtual Bool isIgnored( AsciiString nick ) = 0;
-
-	virtual void setLocalIPs(UnsignedInt internalIP, UnsignedInt externalIP) = 0;
-	virtual UnsignedInt getInternalIP(void) = 0;
-	virtual UnsignedInt getExternalIP(void) = 0;
-
-	virtual Bool isDisconnectedAfterGameStart(Int *reason) const = 0;
-	virtual void markAsDisconnectedAfterGameStart(Int reason) = 0;
-
-	virtual Bool didPlayerPreorder( Int profileID ) const = 0;
-	virtual void markPlayerAsPreorder( Int profileID ) = 0;
-
-	virtual void setMaxMessagesPerUpdate( Int num ) = 0;
-	virtual Int getMaxMessagesPerUpdate( void ) = 0;
-
-	virtual Int getAdditionalDisconnects( void ) = 0;
-	virtual void clearAdditionalDisconnects( void ) = 0;
-	virtual void readAdditionalDisconnects( void ) = 0;
-	virtual void updateAdditionalGameSpyDisconnections(Int count) = 0;
-};
-
-extern GameSpyInfoInterface *TheGameSpyInfo;
-
-void WOLDisplayGameOptions( void );
-void WOLDisplaySlotList( void );
-Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverPort, UnsignedInt& localIP);
-void SetLobbyAttemptHostJoin(Bool start);
-void SendStatsToOtherPlayers(const GameInfo *game);
-
-class PSPlayerStats;
-void GetAdditionalDisconnectsFromUserFile(PSPlayerStats *stats);
-extern Int GetAdditionalDisconnectsFromUserFile(Int playerID);
-
-//-------------------------------------------------------------------------
-// These functions set up the globals and threads neccessary for our GameSpy impl.
-
-void SetUpGameSpy( const char *motdBuffer, const char *configBuffer );
-void TearDownGameSpy( void );
-
-#endif // __PEERDEFS_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h
deleted file mode 100644
index 30c7fcb3b06..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PeerDefsImplementation.h //////////////////////////////////////////////////////
-// Generals GameSpy Peer (chat) implementation definitions
-// Author: Matthew D. Campbell, Sept 2002
-
-#pragma once
-
-#ifndef __PEERDEFSIMPLEMENTATION_H__
-#define __PEERDEFSIMPLEMENTATION_H__
-
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-
-
-class GameSpyInfo : public GameSpyInfoInterface
-{
-public:
-	GameSpyInfo();
-	virtual ~GameSpyInfo();
-	virtual void reset( void );
-	virtual void clearGroupRoomList( void ) { m_groupRooms.clear(); m_gotGroupRoomList = false; }
-	virtual GroupRoomMap* getGroupRoomList( void ) { return &m_groupRooms; }
-	virtual void addGroupRoom( GameSpyGroupRoom room );
-	virtual Bool gotGroupRoomList( void ) { return m_gotGroupRoomList; }
-	virtual void joinGroupRoom( Int groupID );
-	virtual void leaveGroupRoom( void );
-	virtual void joinBestGroupRoom( void );
-	virtual void setCurrentGroupRoom( Int groupID ) { m_currentGroupRoomID = groupID; m_playerInfoMap.clear(); }
-	virtual Int  getCurrentGroupRoom( void ) { return m_currentGroupRoomID; }
-	virtual void updatePlayerInfo( PlayerInfo pi, AsciiString oldNick = AsciiString::TheEmptyString );
-	virtual void playerLeftGroupRoom( AsciiString nick );
-	virtual PlayerInfoMap* getPlayerInfoMap( void ) { return &m_playerInfoMap; }
-
-	virtual void setLocalName( AsciiString name ) { m_localName = name; }
-	virtual AsciiString getLocalName( void ) { return m_localName; }
-	virtual void setLocalProfileID( Int profileID ) { m_localProfileID = profileID; }
-	virtual Int getLocalProfileID( void ) { return m_localProfileID; }
-	virtual AsciiString getLocalEmail( void ) { return m_localEmail; }
-	virtual void setLocalEmail( AsciiString email ) { m_localEmail = email;	}
-	virtual AsciiString getLocalPassword( void ){ return m_localPasswd;	}
-	virtual void setLocalPassword( AsciiString passwd ) { m_localPasswd = passwd;	}
-	virtual void setLocalBaseName( AsciiString name ) { m_localBaseName = name; }
-	virtual AsciiString getLocalBaseName( void ){ return m_localBaseName; }
-	virtual void setCachedLocalPlayerStats( PSPlayerStats stats ) {m_cachedLocalPlayerStats = stats;	}
-	virtual PSPlayerStats getCachedLocalPlayerStats( void ){ return m_cachedLocalPlayerStats;	}
-
-	virtual BuddyInfoMap* getBuddyMap( void ) { return &m_buddyMap; }
-	virtual BuddyInfoMap* getBuddyRequestMap( void ) { return &m_buddyRequestMap; }
-	virtual BuddyMessageList* getBuddyMessages( void ) { return &m_buddyMessages; }
-	virtual Bool isBuddy( Int id );
-
-	virtual void clearStagingRoomList( void );
-	virtual StagingRoomMap* getStagingRoomList( void ) { return &m_stagingRooms; }
-	virtual GameSpyStagingRoom* findStagingRoomByID( Int id );
-	virtual void addStagingRoom( GameSpyStagingRoom room );
-	virtual void updateStagingRoom( GameSpyStagingRoom room );
-	virtual void removeStagingRoom( GameSpyStagingRoom room );
-	virtual Bool hasStagingRoomListChanged( void );
-	virtual void leaveStagingRoom( void );
-	virtual void markAsStagingRoomHost( void );
-	virtual void markAsStagingRoomJoiner( Int game );
-	virtual Int getCurrentStagingRoomID( void ) { return m_localStagingRoomID; }
-
-	virtual void sawFullGameList( void ) { m_sawFullGameList = TRUE; }
-
-	virtual void setDisallowAsianText( Bool val );
-	virtual void setDisallowNonAsianText( Bool val );
-	virtual Bool getDisallowAsianText( void );
-	virtual Bool getDisallowNonAsianText(void );
-	// chat
-	virtual void registerTextWindow( GameWindow *win );
-	virtual void unregisterTextWindow( GameWindow *win );
-	virtual Int addText( UnicodeString message, Color c, GameWindow *win );
-	virtual void addChat( PlayerInfo p, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win );
-	virtual void addChat( AsciiString nick, Int profileID, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win );
-	virtual Bool sendChat( UnicodeString message, Bool isAction, GameWindow *playerListbox );
-
-	virtual void setMOTD( const AsciiString& motd );
-	virtual const AsciiString& getMOTD( void );
-	virtual void setConfig( const AsciiString& config );
-	virtual const AsciiString& getConfig( void );
-
-	virtual void setPingString( const AsciiString& ping ) { m_pingString = ping; }
-	virtual const AsciiString& getPingString( void ) { return m_pingString; }
-	virtual Int getPingValue( const AsciiString& otherPing );
-
-	virtual Bool amIHost( void );
-	virtual GameSpyStagingRoom* getCurrentStagingRoom( void );
-	virtual void setGameOptions( void );
-
-	virtual void addToIgnoreList( AsciiString nick );
-	virtual void removeFromIgnoreList( AsciiString nick );
-	virtual Bool isIgnored( AsciiString nick );
-	virtual IgnoreList returnIgnoreList( void );
-
-	virtual void loadSavedIgnoreList( void );
-	virtual SavedIgnoreMap returnSavedIgnoreList( void );
-	virtual void addToSavedIgnoreList( Int profileID, AsciiString nick);
-	virtual void removeFromSavedIgnoreList( Int profileID );
-	virtual Bool isSavedIgnored( Int profileID );	
-	virtual void setLocalIPs(UnsignedInt internalIP, UnsignedInt externalIP);
-	virtual UnsignedInt getInternalIP(void) { return m_internalIP; }
-	virtual UnsignedInt getExternalIP(void) { return m_externalIP; }
-
-	virtual Bool isDisconnectedAfterGameStart(Int *reason) const { if (reason) *reason = m_disconReason; return m_isDisconAfterGameStart; }
-	virtual void markAsDisconnectedAfterGameStart(Int reason) { m_isDisconAfterGameStart = TRUE; m_disconReason = reason; }
-	
-	virtual Bool didPlayerPreorder( Int profileID ) const;
-	virtual void markPlayerAsPreorder( Int profileID );
-
-	virtual void setMaxMessagesPerUpdate( Int num );
-	virtual Int getMaxMessagesPerUpdate( void );
-
-	virtual Int getAdditionalDisconnects( void );
-	virtual void clearAdditionalDisconnects( void );
-	virtual void readAdditionalDisconnects( void );
-	virtual void updateAdditionalGameSpyDisconnections(Int count);
-private:
-	Bool m_sawFullGameList;
-	Bool m_isDisconAfterGameStart;
-	Int m_disconReason;
-	AsciiString m_rawMotd;
-	AsciiString m_rawConfig;
-	AsciiString m_pingString;
-	GroupRoomMap m_groupRooms;
-	StagingRoomMap m_stagingRooms;
-	Bool m_stagingRoomsDirty;
-	BuddyInfoMap m_buddyMap;
-	BuddyInfoMap m_buddyRequestMap;
-	PlayerInfoMap m_playerInfoMap;
-	BuddyMessageList m_buddyMessages;
-	Int m_currentGroupRoomID;
-	Bool m_gotGroupRoomList;
-	AsciiString m_localName;
-	Int m_localProfileID;
-	AsciiString m_localPasswd;
-	AsciiString m_localEmail;
-	AsciiString m_localBaseName;
-	PSPlayerStats m_cachedLocalPlayerStats;
-	Bool m_disallowAsainText;
-	Bool m_disallowNonAsianText;
-	UnsignedInt m_internalIP, m_externalIP;
-	Int m_maxMessagesPerUpdate;
-
-	Int m_joinedStagingRoom;								// if we join a staging room, this holds its ID (0 otherwise)
-	Bool m_isHosting;												// if we host, this is true, and
-	GameSpyStagingRoom m_localStagingRoom;	// this holds the GameInfo for it.
-	Int m_localStagingRoomID;
-
-	IgnoreList m_ignoreList;
-	SavedIgnoreMap m_savedIgnoreMap;
-
-	std::set<GameWindow *> m_textWindows;
-
-	std::set<Int> m_preorderPlayers;
-	Int m_additionalDisconnects;
-};
-
-#endif // __PEERDEFS_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
deleted file mode 100644
index 207d02e8d4a..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PeerThread.h //////////////////////////////////////////////////////
-// Generals GameSpy Peer-to-peer chat thread class interface
-// Author: Matthew D. Campbell, June 2002
-
-#pragma once
-
-#ifndef __PEERTHREAD_H__
-#define __PEERTHREAD_H__
-
-#include "gamespy/peer/peer.h"
-#include "GameNetwork/NetworkDefs.h"
-
-enum SerialAuthResult CPP_11(: Int)
-{
-	SERIAL_NONEXISTENT,
-	SERIAL_AUTHFAILED,
-	SERIAL_BANNED,
-	SERIAL_OK
-};
-
-// this class encapsulates a request for the peer thread
-class PeerRequest
-{
-public:
-	enum
-	{
-		PEERREQUEST_LOGIN,				// attempt to login
-		PEERREQUEST_LOGOUT,				// log out if connected
-		PEERREQUEST_MESSAGEPLAYER,
-		PEERREQUEST_MESSAGEROOM,
-		PEERREQUEST_JOINGROUPROOM,
-		PEERREQUEST_LEAVEGROUPROOM,
-		PEERREQUEST_STARTGAMELIST,
-		PEERREQUEST_STOPGAMELIST,
-		PEERREQUEST_CREATESTAGINGROOM,
-		PEERREQUEST_SETGAMEOPTIONS,
-		PEERREQUEST_JOINSTAGINGROOM,
-		PEERREQUEST_LEAVESTAGINGROOM,
-		PEERREQUEST_UTMPLAYER,
-		PEERREQUEST_UTMROOM,
-		PEERREQUEST_STARTGAME,
-		PEERREQUEST_STARTQUICKMATCH,
-		PEERREQUEST_WIDENQUICKMATCHSEARCH,
-		PEERREQUEST_STOPQUICKMATCH,
-		PEERREQUEST_PUSHSTATS,
-		PEERREQUEST_GETEXTENDEDSTAGINGROOMINFO,
-		PEERREQUEST_MAX
-	} peerRequestType;
-
-	std::string nick;	// only used by login, but must be outside the union b/c of copy constructor
-	std::wstring text;  // can't be in a union
-	std::string password;
-	std::string email;
-	std::string id;
-	
-	// gameopts
-	std::string options; // full string for UTMs
-	std::string ladderIP;
-	std::string hostPingStr;
-	std::string gameOptsMapName;
-	std::string gameOptsPlayerNames[MAX_SLOTS];
-
-	std::vector<bool> qmMaps;
-
-	union
-	{
-		struct
-		{
-			Int profileID;
-		} login;
-
-		struct
-		{
-			Int id;
-		} groupRoom;
-		
-		struct
-		{
-			Bool restrictGameList;
-		} gameList;
-
-		struct
-		{
-			Bool isAction;
-		} message;
-
-		struct
-		{
-			Int id;
-		} stagingRoom;
-
-		struct
-		{
-			UnsignedInt exeCRC;
-			UnsignedInt iniCRC;
-			UnsignedInt gameVersion;
-			Bool allowObservers;
-      Bool useStats;
-			UnsignedShort ladPort;
-			UnsignedInt ladPassCRC;
-			Bool restrictGameList;
-		} stagingRoomCreation;
-
-		struct
-		{
-			Int wins[MAX_SLOTS];
-			Int losses[MAX_SLOTS];
-			Int profileID[MAX_SLOTS];
-			Int faction[MAX_SLOTS];
-			Int color[MAX_SLOTS];
-			Int numPlayers;
-			Int maxPlayers;
-			Int numObservers;
-		} gameOptions;
-
-		struct
-		{
-			Bool isStagingRoom;
-		} UTM;
-
-		struct
-		{
-			Int minPointPercentage, maxPointPercentage, points;
-			Int widenTime;
-			Int ladderID;
-			UnsignedInt ladderPassCRC;
-			Int maxPing;
-			Int maxDiscons, discons;
-			char pings[17]; // 8 servers (0-ff), 1 NULL
-			Int numPlayers;
-			Int botID;
-			Int roomID;
-			Int side;
-			Int color;
-			Int NAT;
-			UnsignedInt exeCRC;
-			UnsignedInt iniCRC;
-		} QM;
-
-		struct
-		{
-			Int locale;
-			Int wins;
-			Int losses;
-			Int rankPoints;
-			Int side;
-			Bool preorder;
-		} statsToPush;
-
-	};
-};
-
-//-------------------------------------------------------------------------
-
-enum DisconnectReason CPP_11(: Int)
-{
-	DISCONNECT_NICKTAKEN = 1,
-	DISCONNECT_BADNICK,
-	DISCONNECT_LOSTCON,
-	DISCONNECT_COULDNOTCONNECT,
-	DISCONNECT_GP_LOGIN_TIMEOUT,
-	DISCONNECT_GP_LOGIN_BAD_NICK,
-	DISCONNECT_GP_LOGIN_BAD_EMAIL,
-	DISCONNECT_GP_LOGIN_BAD_PASSWORD,
-	DISCONNECT_GP_LOGIN_BAD_PROFILE,
-	DISCONNECT_GP_LOGIN_PROFILE_DELETED,
-	DISCONNECT_GP_LOGIN_CONNECTION_FAILED,
-	DISCONNECT_GP_LOGIN_SERVER_AUTH_FAILED,
-	DISCONNECT_SERIAL_INVALID,
-	DISCONNECT_SERIAL_NOT_PRESENT,
-	DISCONNECT_SERIAL_BANNED,
-	DISCONNECT_GP_NEWUSER_BAD_NICK,
-	DISCONNECT_GP_NEWUSER_BAD_PASSWORD,
-	DISCONNECT_GP_NEWPROFILE_BAD_NICK,
-	DISCONNECT_GP_NEWPROFILE_BAD_OLD_NICK,
-	DISCONNECT_MAX,
-};
-
-enum QMStatus CPP_11(: Int)
-{
-	QM_IDLE,
-	QM_JOININGQMCHANNEL,
-	QM_LOOKINGFORBOT,
-	QM_SENTINFO,
-	QM_WORKING,
-	QM_POOLSIZE,
-	QM_WIDENINGSEARCH,
-	QM_MATCHED,
-	QM_INCHANNEL,
-	QM_NEGOTIATINGFIREWALLS,
-	QM_STARTINGGAME,
-	QM_COULDNOTFINDBOT,
-	QM_COULDNOTFINDCHANNEL,
-	QM_COULDNOTNEGOTIATEFIREWALLS,
-	QM_STOPPED,
-};
-
-// this class encapsulates an action the peer thread wants from the UI
-class PeerResponse
-{
-public:
-	enum
-	{
-		PEERRESPONSE_LOGIN,
-		PEERRESPONSE_DISCONNECT,
-		PEERRESPONSE_MESSAGE,
-		PEERRESPONSE_GROUPROOM,
-		PEERRESPONSE_STAGINGROOM,
-		PEERRESPONSE_STAGINGROOMLISTCOMPLETE,
-		PEERRESPONSE_STAGINGROOMPLAYERINFO,
-		PEERRESPONSE_JOINGROUPROOM,
-		PEERRESPONSE_CREATESTAGINGROOM,
-		PEERRESPONSE_JOINSTAGINGROOM,
-		PEERRESPONSE_PLAYERJOIN,
-		PEERRESPONSE_PLAYERLEFT,
-		PEERRESPONSE_PLAYERCHANGEDNICK,
-		PEERRESPONSE_PLAYERINFO,
-		PEERRESPONSE_PLAYERCHANGEDFLAGS,
-		PEERRESPONSE_ROOMUTM,
-		PEERRESPONSE_PLAYERUTM,
-		PEERRESPONSE_QUICKMATCHSTATUS,
-		PEERRESPONSE_GAMESTART,
-		PEERRESPONSE_FAILEDTOHOST,
-		PEERRESPONSE_MAX
-	} peerResponseType;
-
-	std::string groupRoomName; // can't be in union
-
-	std::string nick;   // can't be in a union
-	std::string oldNick;   // can't be in a union
-	std::wstring text;  // can't be in a union
-	std::string locale; // can't be in a union
-
-	std::string stagingServerGameOptions; // full string from UTMs
-
-	// game opts sent with PEERRESPONSE_STAGINGROOM
-	std::wstring stagingServerName;
-	std::string stagingServerPingString;
-	std::string stagingServerLadderIP;
-	std::string stagingRoomMapName;
-
-	// game opts sent with PEERRESPONSE_STAGINGROOMPLAYERINFO
-	std::string stagingRoomPlayerNames[MAX_SLOTS];
-
-	std::string command;
-	std::string commandOptions;
-
-	union
-	{
-		struct
-		{
-			DisconnectReason reason;
-		} discon;
-
-		struct
-		{
-			Int id;
-			Int numWaiting;
-			Int maxWaiting;
-			Int numGames;
-			Int numPlaying;
-		} groupRoom;
-
-		struct
-		{
-			Int id;
-			Bool ok;
-		} joinGroupRoom;
-		
-		struct
-		{
-			Int result;
-		} createStagingRoom;
-		
-		struct
-		{
-			Int id;
-			Bool ok;
-			Bool isHostPresent;
-			Int result; // for failures
-		} joinStagingRoom;
-		
-		struct
-		{
-			Bool isPrivate;
-			Bool isAction;
-			Int profileID;
-		} message;
-
-		struct
-		{
-			Int profileID;
-			Int wins;
-			Int losses;
-			RoomType roomType;
-			Int flags;
-			UnsignedInt IP;
-			Int rankPoints;
-			Int side;
-			Int preorder;
-			UnsignedInt internalIP; // for us, on connection
-			UnsignedInt externalIP; // for us, on connection
-		} player;
-
-		struct
-		{
-			Int id;
-			Int action;
-			Bool isStaging;
-			Bool requiresPassword;
-			Bool allowObservers;
-      Bool useStats;
-			UnsignedInt version;
-			UnsignedInt exeCRC;
-			UnsignedInt iniCRC;
-			UnsignedShort ladderPort;
-			Int wins[MAX_SLOTS];
-			Int losses[MAX_SLOTS];
-			Int profileID[MAX_SLOTS];
-			Int faction[MAX_SLOTS];
-			Int color[MAX_SLOTS];
-			Int numPlayers;
-			Int numObservers;
-			Int maxPlayers;
-			Int percentComplete;
-		} stagingRoom;
-
-		struct
-		{
-			QMStatus status;
-			Int poolSize;
-			Int mapIdx; // when matched
-			Int seed; // when matched
-			UnsignedInt IP[MAX_SLOTS]; // when matched
-			Int side[MAX_SLOTS]; // when matched
-			Int color[MAX_SLOTS]; // when matched
-			Int nat[MAX_SLOTS];
-		} qmStatus;
-	};
-};
-
-//-------------------------------------------------------------------------
-
-// this is the actual message queue used to pass messages between threads
-class GameSpyPeerMessageQueueInterface
-{
-public:
-	virtual ~GameSpyPeerMessageQueueInterface() {}
-	virtual void startThread( void ) = 0;
-	virtual void endThread( void ) = 0;
-	virtual Bool isThreadRunning( void ) = 0;
-	virtual Bool isConnected( void ) = 0;
-	virtual Bool isConnecting( void ) = 0;
-
-	virtual void addRequest( const PeerRequest& req ) = 0;
-	virtual Bool getRequest( PeerRequest& req ) = 0;
-
-	virtual void addResponse( const PeerResponse& resp ) = 0;
-	virtual Bool getResponse( PeerResponse& resp ) = 0;
-
-	virtual SerialAuthResult getSerialAuthResult( void ) = 0;
-
-	static GameSpyPeerMessageQueueInterface* createNewMessageQueue( void );
-};
-
-extern GameSpyPeerMessageQueueInterface *TheGameSpyPeerMessageQueue;
-
-#endif // __PEERTHREAD_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h
deleted file mode 100644
index e63547b00b1..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PersistentStorageDefs.h //////////////////////////////////////////////////////
-// Generals GameSpy Persistent Storage definitions
-// Author: Matthew D. Campbell, July 2002
-
-#pragma once
-
-#ifndef __PERSISTENTSTORAGEDEFS_H__
-#define __PERSISTENTSTORAGEDEFS_H__
-
-enum LocaleType CPP_11(: Int)
-{
-    LOC_UNKNOWN = 0,
-    LOC_MIN = 1,
-    LOC_MAX = 37
-};
-
-void HandlePersistentStorageResponses(void);
-void UpdateLocalPlayerStats(void);
-
-void SetLookAtPlayer( Int id, AsciiString nick );
-void PopulatePlayerInfoWindows( AsciiString parentWindowName );
-
-#endif // __PERSISTENTSTORAGEDEFS_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h
deleted file mode 100644
index 56bbdfe4088..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PersistentStorageThread.h //////////////////////////////////////////////////////
-// Generals GameSpy Persistent Storage thread class interface
-// Author: Matthew D. Campbell, July 2002
-
-#pragma once
-
-#ifndef __PERSISTENTSTORAGETHREAD_H__
-#define __PERSISTENTSTORAGETHREAD_H__
-
-#include "gamespy/gstats/gpersist.h"
-
-#define MAX_BUDDY_CHAT_LEN 128
-
-typedef std::map<Int, UnsignedInt> PerGeneralMap;
-// this structure holds all info on a player that is stored online
-class PSPlayerStats
-{
-public:
-	PSPlayerStats( void );
-	PSPlayerStats( const PSPlayerStats& other );
-	void reset(void);
-
-	Int id;
-	PerGeneralMap wins;
-	PerGeneralMap losses;
-	PerGeneralMap games;              //first: playerTemplate #,  second: #games played (see also gamesAsRandom)
-	PerGeneralMap duration;
-	PerGeneralMap unitsKilled;
-	PerGeneralMap unitsLost;
-	PerGeneralMap unitsBuilt;
-	PerGeneralMap buildingsKilled;
-	PerGeneralMap buildingsLost;
-	PerGeneralMap buildingsBuilt;
-	PerGeneralMap earnings;
-	PerGeneralMap techCaptured;
-	PerGeneralMap discons;
-	PerGeneralMap desyncs;
-	PerGeneralMap surrenders;
-	PerGeneralMap gamesOf2p;
-	PerGeneralMap gamesOf3p;
-	PerGeneralMap gamesOf4p;
-	PerGeneralMap gamesOf5p;
-	PerGeneralMap gamesOf6p;
-	PerGeneralMap gamesOf7p;
-	PerGeneralMap gamesOf8p;
-	PerGeneralMap customGames;
-	PerGeneralMap QMGames;
-	Int locale;
-	Int gamesAsRandom;
-	std::string options;
-	std::string systemSpec;
-	Real lastFPS;
-	Int lastGeneral;
-	Int gamesInRowWithLastGeneral;
-	Int challengeMedals;
-	Int battleHonors;
-	Int QMwinsInARow;
-	Int maxQMwinsInARow;
-
-	Int winsInARow;
-	Int maxWinsInARow;
-	Int lossesInARow;
-	Int maxLossesInARow;
-	Int disconsInARow;
-	Int maxDisconsInARow;
-	Int desyncsInARow;
-	Int maxDesyncsInARow;
-
-	Int builtParticleCannon;
-	Int builtNuke;
-	Int builtSCUD;
-
-	Int lastLadderPort;
-	std::string lastLadderHost;
-
-	void incorporate( const PSPlayerStats& other );
-};
-
-// this class encapsulates a request for the thread
-class PSRequest
-{
-public:
-	PSRequest();
-	enum
-	{
-		PSREQUEST_READPLAYERSTATS,			// read stats for a player
-		PSREQUEST_UPDATEPLAYERSTATS,		// update stats on the server
-		PSREQUEST_UPDATEPLAYERLOCALE,		// update locale on the server
-		PSREQUEST_READCDKEYSTATS,				// read stats for a cdkey
-		PSREQUEST_SENDGAMERESTOGAMESPY,	// report game results to GameSpy
-		PSREQUEST_MAX
-	} requestType;
-
-	// player stats for the *PLAYERSTATS
-	PSPlayerStats player;
-
-	// cdkey for READCDKEYSTATS;
-	std::string cdkey;
-
-	// our info for UPDATEPLAYERSTATS
-	std::string nick;
-	std::string password;
-	std::string email;
-	Bool addDiscon;
-	Bool addDesync;
-	Int lastHouse;
-
-	// for GameRes
-	std::string results;
-};
-
-//-------------------------------------------------------------------------
-
-// this class encapsulates a response from the thread
-class PSResponse
-{
-public:
-	enum
-	{
-		PSRESPONSE_PLAYERSTATS,
-		PSRESPONSE_COULDNOTCONNECT,
-		PSRESPONSE_PREORDER,
-		PSRESPONSE_MAX
-	} responseType;
-
-	// player stats for the *PLAYERSTATS
-	PSPlayerStats player;
-
-	// preorder flag
-	Bool preorder;
-};
-
-//-------------------------------------------------------------------------
-
-// this is the actual message queue used to pass messages between threads
-class GameSpyPSMessageQueueInterface
-{
-public:
-	virtual ~GameSpyPSMessageQueueInterface() {}
-	virtual void startThread( void ) = 0;
-	virtual void endThread( void ) = 0;
-	virtual Bool isThreadRunning( void ) = 0;
-
-	virtual void addRequest( const PSRequest& req ) = 0;
-	virtual Bool getRequest( PSRequest& req ) = 0;
-
-	virtual void addResponse( const PSResponse& resp ) = 0;
-	virtual Bool getResponse( PSResponse& resp ) = 0;
-
-	// called from the main thread
-	virtual void trackPlayerStats( PSPlayerStats stats ) = 0;
-	virtual PSPlayerStats findPlayerStatsByID( Int id ) = 0;
-
-	static GameSpyPSMessageQueueInterface* createNewMessageQueue( void );
-
-	static std::string formatPlayerKVPairs( PSPlayerStats stats );
-	static PSPlayerStats parsePlayerKVPairs( std::string kvPairs );
-};
-
-extern GameSpyPSMessageQueueInterface *TheGameSpyPSMessageQueue;
-
-
-#endif // __PERSISTENTSTORAGETHREAD_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h
deleted file mode 100644
index 4661de891bb..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PingThread.h //////////////////////////////////////////////////////
-// Generals ping thread class interface
-// Author: Matthew D. Campbell, August 2002
-// Note: adapted from WOLAPI
-
-#pragma once
-
-#ifndef __PINGTHREAD_H__
-#define __PINGTHREAD_H__
-
-// this class encapsulates a request for the thread
-class PingRequest
-{
-public:
-	std::string hostname;
-	Int repetitions;
-	Int timeout;
-};
-
-//-------------------------------------------------------------------------
-
-// this class encapsulates a response from the thread
-class PingResponse
-{
-public:
-	std::string hostname;
-	Int avgPing;
-	Int repetitions;
-};
-
-//-------------------------------------------------------------------------
-
-// this is the actual message queue used to pass messages between threads
-class PingerInterface
-{
-public:
-	virtual ~PingerInterface() {}
-	virtual void startThreads( void ) = 0;
-	virtual void endThreads( void ) = 0;
-	virtual Bool areThreadsRunning( void ) = 0;
-
-	virtual void addRequest( const PingRequest& req ) = 0;
-	virtual Bool getRequest( PingRequest& resp ) = 0;
-
-	virtual void addResponse( const PingResponse& resp ) = 0;
-	virtual Bool getResponse( PingResponse& resp ) = 0;
-
-	static PingerInterface* createNewPingerInterface( void );
-
-	virtual Bool arePingsInProgress( void ) = 0;
-	virtual Int getPing( AsciiString hostname ) = 0;
-	virtual void clearPingMap( void ) = 0;
-	virtual AsciiString getPingString( Int timeout ) = 0;
-};
-
-extern PingerInterface *ThePinger;
-
-
-#endif // __PINGTHREAD_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
deleted file mode 100644
index e7cd2bd4e4b..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: StagingRoomGameInfo.h //////////////////////////////////////////////////////
-// Generals GameSpy GameInfo
-// Author: Matthew D. Campbell, Sept 2002
-
-#pragma once
-
-#ifndef __STAGINGROOMGAMEINFO_H__
-#define __STAGINGROOMGAMEINFO_H__
-
-#include "GameNetwork/GameInfo.h"
-#include "GameNetwork/Transport.h"
-
-class GameSpyGameSlot : public GameSlot
-{
-public:
-	GameSpyGameSlot();
-	Int getProfileID( void ) const { return m_profileID; }
-	void setProfileID( Int id ) { m_profileID = id; }
-	AsciiString getLoginName( void ) const { return m_gameSpyLogin; }
-	void setLoginName( AsciiString name ) { m_gameSpyLogin = name; }
-	AsciiString getLocale( void ) const { return m_gameSpyLocale; }
-	void setLocale( AsciiString name ) { m_gameSpyLocale = name; }
-	Int getWins( void ) const { return m_wins; }
-	Int getLosses( void ) const { return m_losses; }
-	void setWins( Int wins ) { m_wins = wins; }
-	void setLosses( Int losses ) { m_losses = losses; }
-
-	Int getSlotRankPoints( void ) const { return m_rankPoints; }
-	Int getFavoriteSide( void ) const { return m_favoriteSide; }
-	void setSlotRankPoints( Int val ) { m_rankPoints = val; }
-	void setFavoriteSide( Int val ) { m_favoriteSide = val; }
-
-	void setPingString( AsciiString pingStr );
-	inline AsciiString getPingString( void ) const { return m_pingStr; }
-	inline Int getPingAsInt( void ) const { return m_pingInt; }
-
-protected:
-	Int m_profileID;
-	AsciiString m_gameSpyLogin;
-	AsciiString m_gameSpyLocale;
-
-	AsciiString m_pingStr;
-	Int m_pingInt;
-	Int m_wins, m_losses;
-	Int m_rankPoints, m_favoriteSide;
-};
-
-/**
-  * GameSpyStagingRoom class - maintains information about the GameSpy game and
-	* the contents of its slot list throughout the game.
-	*/
-class GameSpyStagingRoom : public GameInfo
-{
-private:
-	GameSpyGameSlot m_GameSpySlot[MAX_SLOTS];											///< The GameSpy Games Slot List
-	UnicodeString m_gameName;
-	Int m_id;
-	Transport *m_transport;
-	AsciiString m_localName;
-	Bool m_requiresPassword;
-	Bool m_allowObservers;
-	UnsignedInt m_version;
-	UnsignedInt m_exeCRC;
-	UnsignedInt m_iniCRC;
-	Bool m_isQM;
-
-	AsciiString m_ladderIP;
-	AsciiString m_pingStr;
-	Int m_pingInt;
-	UnsignedShort m_ladderPort;
-
-	Int m_reportedNumPlayers;
-	Int m_reportedMaxPlayers;
-	Int m_reportedNumObservers;
-
-public:
-	GameSpyStagingRoom();
-	virtual void reset( void );
-
-	void cleanUpSlotPointers(void);
-	inline void setID(Int id) { m_id = id; }
-	inline Int getID( void ) const { return m_id; }
-
-	inline void setHasPassword(Bool val) { m_requiresPassword = val; }
-	inline Bool getHasPassword(void) const { return m_requiresPassword; }
-	inline void setAllowObservers(Bool val) { m_allowObservers = val; }
-	inline Bool getAllowObservers(void) const { return m_allowObservers; }
-
-	inline void setVersion(UnsignedInt val) { m_version = val; }
-	inline UnsignedInt getVersion(void) const { return m_version; }
-	inline void setExeCRC(UnsignedInt val) { m_exeCRC = val; }
-	inline UnsignedInt getExeCRC(void) const { return m_exeCRC; }
-	inline void setIniCRC(UnsignedInt val) { m_iniCRC = val; }
-	inline UnsignedInt getIniCRC(void) const { return m_iniCRC; }
-
-	inline void setReportedNumPlayers(Int val) { m_reportedNumPlayers = val; }
-	inline Int getReportedNumPlayers(void) const { return m_reportedNumPlayers; }
-
-	inline void setReportedMaxPlayers(Int val) { m_reportedMaxPlayers = val; }
-	inline Int getReportedMaxPlayers(void) const { return m_reportedMaxPlayers; }
-
-	inline void setReportedNumObservers(Int val) { m_reportedNumObservers = val; }
-	inline Int getReportedNumObservers(void) const { return m_reportedNumObservers; }
-
-	inline void setLadderIP( AsciiString ladderIP ) { m_ladderIP = ladderIP; }
-	inline AsciiString getLadderIP( void ) const { return m_ladderIP; }
-	inline void setLadderPort( UnsignedShort ladderPort ) { m_ladderPort = ladderPort; }
-	inline UnsignedShort getLadderPort( void ) const { return m_ladderPort; }
-	void setPingString( AsciiString pingStr );
-	inline AsciiString getPingString( void ) const { return m_pingStr; }
-	inline Int getPingAsInt( void ) const { return m_pingInt; }
-
-	virtual Bool amIHost( void ) const;															///< Convenience function - is the local player the game host?
-	
-	GameSpyGameSlot *getGameSpySlot( Int index );
-
-	AsciiString generateGameSpyGameResultsPacket( void );
-	AsciiString generateLadderGameResultsPacket( void );
-	void markGameAsQM( void ) { m_isQM = TRUE; }
-	Bool isQMGame( void ) { return m_isQM; }
-
-	virtual void init(void);
-	virtual void resetAccepted(void);															///< Reset the accepted flag on all players
-
-	virtual void startGame(Int gameID);														///< Mark our game as started and record the game ID.
-	void launchGame( void );																			///< NAT negotiation has finished - really start
-	virtual Int getLocalSlotNum( void ) const;										///< Get the local slot number, or -1 if we're not present
-
-	inline void setGameName( UnicodeString name ) { m_gameName = name; }
-	inline UnicodeString getGameName( void ) const { return m_gameName; }
-
-	inline void setLocalName( AsciiString name ) { m_localName = name; } 
-};
-
-extern GameSpyStagingRoom *TheGameSpyGame;
-
-#endif // __STAGINGROOMGAMEINFO_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h
deleted file mode 100644
index 7dd7c6fa3fc..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: ThreadUtils.h //////////////////////////////////////////////////////
-// Generals GameSpy thread utils
-// Author: Matthew D. Campbell, July 2002
-
-#pragma once
-
-#ifndef __GAMESPY_THREADUTILS_H__
-#define __GAMESPY_THREADUTILS_H__
-
-std::wstring MultiByteToWideCharSingleLine( const char *orig );
-std::string WideCharStringToMultiByte( const WideChar *orig );
-
-#endif // __GAMESPY_THREADUTILS_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h
index b2a6b408ef4..cf149df1740 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __GAMESPYCHAT_H__
-#define __GAMESPYCHAT_H__
-
 #include "gamespy/peer/peer.h"
 
 class GameWindow;
@@ -56,5 +53,3 @@ void RoomMessageCallback(PEER peer, RoomType roomType,
 void PlayerMessageCallback(PEER peer, const char * nick,
 													 const char * message, MessageType messageType,
 													 void * param);														///< Called when a private message is received from another player.
-
-#endif // __GAMESPYCHAT_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h
index d434220e49a..6ce6092a557 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef __GAMESPYGP_H__
-#define __GAMESPYGP_H__
-
 #include "gamespy/gp/gp.h"
 
 void GPRecvBuddyRequestCallback(GPConnection * connection, GPRecvBuddyRequestArg * arg, void * param);
@@ -43,5 +40,3 @@ void GameSpyUpdateBuddyOverlay(void);
 extern GPConnection *TheGPConnection;
 
 Bool IsGameSpyBuddy(GPProfile id);
-
-#endif // __GAMESPYGP_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h
index 0bd7f69d686..36dccb48e14 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h
@@ -29,10 +29,6 @@
 #pragma once
 
 #error this file is obsolete
-
-#ifndef __GAMESPYGAMEINFO_H__
-#define __GAMESPYGAMEINFO_H__
-
 #include "gamespy/peer/peer.h"
 
 #include "GameNetwork/GameInfo.h"
@@ -74,7 +70,7 @@ class GameSpyGameInfo : public GameInfo
 
 	inline void setServer(SBServer server) { m_server = server; }
 	inline SBServer getServer( void ) { return m_server; }
-	
+
 	AsciiString generateGameResultsPacket( void );
 
 	virtual void init(void);
@@ -94,5 +90,3 @@ void WOLDisplaySlotList( void );
 void GameSpyStartGame( void );
 void GameSpyLaunchGame( void );
 Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverPort, UnsignedInt& localIP);
-
-#endif // __LANGAMEINFO_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h
deleted file mode 100644
index 53526dbf731..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GamespyOverlay.h //////////////////////////////////////////////////////
-// Generals GameSpy overlay screens
-// Author: Matthew D. Campbell, March 2002
-
-#pragma once
-
-#ifndef __GAMESPYOVERLAY_H__
-#define __GAMESPYOVERLAY_H__
-
-#include "Common/NameKeyGenerator.h"
-#include "GameClient/WindowLayout.h"
-#include "GameClient/Gadget.h"
-#include "GameClient/Shell.h"
-#include "GameClient/KeyDefs.h"
-#include "GameClient/GameWindowManager.h"
-
-void ClearGSMessageBoxes( void );	///< Tear down any GS message boxes (e.g. in case we have a new one to put up)
-void GSMessageBoxOk(UnicodeString titleString,UnicodeString bodyString, GameWinMsgBoxFunc okFunc = NULL);	///< Display a Message box with Ok button and track it
-void GSMessageBoxOkCancel(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc okFunc, GameWinMsgBoxFunc cancelFunc);	///< Display a Message box with Ok/Cancel buttons and track it
-void GSMessageBoxYesNo(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc yesFunc, GameWinMsgBoxFunc noFunc);	///< Display a Message box with Yes/No buttons and track it
-void RaiseGSMessageBox( void );		///< Bring GS message box to the foreground (if we transition screens while a message box is up)
-
-enum GSOverlayType CPP_11(: Int)
-{
-	GSOVERLAY_PLAYERINFO,
-	GSOVERLAY_MAPSELECT,
-	GSOVERLAY_BUDDY,
-	GSOVERLAY_PAGE,
-	GSOVERLAY_GAMEOPTIONS,
-	GSOVERLAY_GAMEPASSWORD,
-	GSOVERLAY_LADDERSELECT,
-	GSOVERLAY_LOCALESELECT,
-	GSOVERLAY_OPTIONS,
-	GSOVERLAY_MAX
-};
-
-void GameSpyOpenOverlay( GSOverlayType );
-void GameSpyCloseOverlay( GSOverlayType );
-void GameSpyCloseAllOverlays( void );
-Bool GameSpyIsOverlayOpen( GSOverlayType );
-void GameSpyToggleOverlay( GSOverlayType );
-void GameSpyUpdateOverlays( void );
-void ReOpenPlayerInfo( void );
-void CheckReOpenPlayerInfo(void );
-#endif // __GAMESPYOVERLAY_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h
deleted file mode 100644
index 11e8040027c..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GameSpyThread.h //////////////////////////////////////////////////////
-// Generals GameSpy thread class
-// Author: Matthew D. Campbell, March 2002
-
-#pragma once
-
-#ifndef __GAMESPYTHREAD_H__
-#define __GAMESPYTHREAD_H__
-
-#include "mutex.h"
-#include "thread.h"
-
-class GameSpyThreadClass : public ThreadClass
-{
-
-public:
-	GameSpyThreadClass::GameSpyThreadClass() : ThreadClass() { m_doLogin = false; m_readStats = false; m_updateWins = false; m_updateLosses = false; m_updateLocale = false; m_showLocaleSelect = false; m_nextShellScreen.clear(); }
-	void queueLogin(AsciiString nick, AsciiString pass, AsciiString email) { m_nick = nick; m_pass = pass; m_email = email; m_doLogin = true; }
-	void queueReadPersistentStatsFromServer( void ) { m_readStats = true; }
-	void queueUpdateLocale( AsciiString locale ) { m_locale = locale; m_updateLocale = true; }
-	void queueUpdateWins  ( AsciiString wins   ) { m_wins   = wins;   m_updateWins   = true; }
-	void queueUpdateLosses( AsciiString losses ) { m_losses = losses; m_updateLosses = true; }
-
-	void Thread_Function();
-
-	AsciiString getNextShellScreen( void );
-	Bool showLocaleSelect( void );
-
-	void setNextShellScreen( AsciiString nextShellScreen );
-	void setShowLocaleSelect( Bool val );
-
-private:
-	AsciiString m_nick, m_pass, m_email;
-	Bool m_doLogin, m_readStats, m_updateWins, m_updateLosses, m_updateLocale;
-	AsciiString m_locale, m_wins, m_losses;
-	AsciiString m_nextShellScreen;
-	Bool m_showLocaleSelect;
-};
-
-extern GameSpyThreadClass *TheGameSpyThread;
-extern MutexClass TheGameSpyMutex;
-
-#endif // __GAMESPYTHREAD_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h
deleted file mode 100644
index af3d064c82f..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// IPEnumeration.h ///////////////////////////////////////////////////////////////
-// Class for enumerating IP addresses
-// Author: Matthew D. Campbell, October 2001
-
-#pragma once
-
-#ifndef _IPENUMERATION_H_
-#define _IPENUMERATION_H_
-
-#include "GameNetwork/Transport.h"
-
-/**
- * IP wrapper class.
- */
-class EnumeratedIP : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(EnumeratedIP, "EnumeratedIP")		
-public:
-	EnumeratedIP() { m_IPstring = ""; m_next = NULL; m_IP = 0; }
-
-	// Access functions
-	inline AsciiString getIPstring( void ) { return m_IPstring; }
-	inline void setIPstring( AsciiString name ) { m_IPstring = name; }
-	inline UnsignedInt getIP( void ) { return m_IP; }
-	inline void setIP( UnsignedInt IP ) { m_IP = IP; }
-	inline EnumeratedIP *getNext( void ) { return m_next; }
-	inline void setNext( EnumeratedIP *next ) { m_next = next; }
-
-protected:
-	AsciiString m_IPstring;
-	UnsignedInt m_IP;
-	EnumeratedIP *m_next;
-};
-EMPTY_DTOR(EnumeratedIP)
-
-
-/**
- * The IPEnumeration class is used to obtain a list of IP addresses on the
- * local machine.
- */
-class IPEnumeration
-{
-public:
-
-	IPEnumeration();
-	~IPEnumeration();
-
-	EnumeratedIP * getAddresses( void );		///< Return a linked list of local IP addresses
-	AsciiString getMachineName( void );			///< Return the Network Neighborhood machine name
-
-protected:
-	void addNewIP( UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedByte d );
-
-	EnumeratedIP *m_IPlist;
-	Bool m_isWinsockInitialized;
-};
-
-
-#endif // _IPENUMERATION_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h
deleted file mode 100644
index 784b27bb4e4..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// LANAPI.h ///////////////////////////////////////////////////////////////
-// LANAPI singleton class - defines interface to LAN broadcast communications
-// Author: Matthew D. Campbell, October 2001
-
-#pragma once
-
-#ifndef _LANAPI_H_
-#define _LANAPI_H_
-
-#include "GameNetwork/Transport.h"
-#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/LANPlayer.h"
-#include "GameNetwork/LANGameInfo.h"
-
-//static const Int g_lanPlayerNameLength = 20;
-static const Int g_lanPlayerNameLength = 12; // reduced length because of game option length
-//static const Int g_lanLoginNameLength = 16;
-//static const Int g_lanHostNameLength = 16;
-static const Int g_lanLoginNameLength = 1;
-static const Int g_lanHostNameLength = 1;
-//static const Int g_lanGameNameLength = 32;
-static const Int g_lanGameNameLength = 16; // reduced length because of game option length
-static const Int g_lanGameNameReservedLength = 16; // save N wchars for ID info
-static const Int g_lanMaxChatLength = 100;
-static const Int m_lanMaxOptionsLength = MAX_PACKET_SIZE - ( 8 + (g_lanGameNameLength+1)*2 + 4 + (g_lanPlayerNameLength+1)*2
-																														+ (g_lanLoginNameLength+1) + (g_lanHostNameLength+1) );
-static const Int g_maxSerialLength = 23; // including the trailing '\0'
-
-struct LANMessage;
-
-/**
- * The LANAPI class is used to instantiate a singleton which 
- * implements the interface to all LAN broadcast communications.
- */
-class LANAPIInterface : public SubsystemInterface
-{
-public:
-
-	virtual ~LANAPIInterface() { };
-
-	virtual void init( void ) = 0;															///< Initialize or re-initialize the instance
-	virtual void reset( void ) = 0;															///< reset the logic system
-	virtual void update( void ) = 0;														///< update the world
-
-	virtual void setIsActive(Bool isActive ) = 0;								///< Tell TheLAN whether or not the app is active.
-
-	// Possible types of chat messages
-	enum ChatType
-	{
-		LANCHAT_NORMAL = 0,
-		LANCHAT_EMOTE,
-		LANCHAT_SYSTEM,
-		LANCHAT_MAX
-	};
-
-	// Request functions generate network traffic
-	virtual void RequestLocations( void ) = 0;																				///< Request everybody to respond with where they are
-	virtual void RequestGameJoin( LANGameInfo *game, UnsignedInt ip = 0 ) = 0;				///< Request to join a game
-	virtual void RequestGameJoinDirectConnect( UnsignedInt ipaddress ) = 0;						///< Request to join a game at an IP address
-	virtual void RequestGameLeave( void ) = 0;																				///< Tell everyone we're leaving
-	virtual void RequestAccept( void ) = 0;																						///< Indicate we're OK with the game options
-	virtual void RequestHasMap( void ) = 0;																						///< Send our map status
-	virtual void RequestChat( UnicodeString message, ChatType format ) = 0;						///< Send a chat message
-	virtual void RequestGameStart( void ) = 0;																				///< Tell everyone the game is starting
-	virtual void RequestGameStartTimer( Int seconds ) = 0;
-	virtual void RequestGameOptions( AsciiString gameOptions, Bool isPublic, UnsignedInt ip = 0 ) = 0;		///< Change the game options
-	virtual void RequestGameCreate( UnicodeString gameName, Bool isDirectConnect ) = 0;	///< Try to host a game
-	virtual void RequestGameAnnounce( void ) = 0;																			///< Sound out current game info if host
-//	virtual void RequestSlotList( void ) = 0;																					///< Pump out the Slot info.
-	virtual void RequestSetName( UnicodeString newName ) = 0;													///< Pick a new name
-	virtual void RequestLobbyLeave( Bool forced ) = 0;																///< Announce that we're leaving the lobby
-	virtual void ResetGameStartTimer( void ) = 0;
-
-	// Possible result codes passed to On functions
-	enum ReturnType
-	{
-		RET_OK,							// Any function
-		RET_TIMEOUT,				// OnGameJoin/Leave/Start, etc
-		RET_GAME_FULL,			// OnGameJoin
-		RET_DUPLICATE_NAME,	// OnGameJoin
-		RET_CRC_MISMATCH,		// OnGameJoin
-		RET_SERIAL_DUPE,		// OnGameJoin
-		RET_GAME_STARTED,		// OnGameJoin
-		RET_GAME_EXISTS,		// OnGameCreate
-		RET_GAME_GONE,			// OnGameJoin
-		RET_BUSY,						// OnGameCreate/Join/etc if another action is in progress
-		RET_UNKNOWN,				// Default message for oddity
-		RET_MAX
-	};
-	UnicodeString getErrorStringFromReturnType( ReturnType ret );
-
-	// On functions are (generally) the result of network traffic
-	virtual void OnGameList( LANGameInfo *gameList ) = 0;																							///< List of games
-	virtual void OnPlayerList( LANPlayer *playerList ) = 0;																				///< List of players in the Lobby
-	virtual void OnGameJoin( ReturnType ret, LANGameInfo *theGame ) = 0;															///< Did we get in the game?
-	virtual void OnPlayerJoin( Int slot, UnicodeString playerName ) = 0;													///< Someone else joined our game (host only; joiners get a slotlist)
-	virtual void OnHostLeave( void ) = 0;																													///< Host left the game
-	virtual void OnPlayerLeave( UnicodeString player ) = 0;																				///< Someone left the game
-	virtual void OnAccept( UnsignedInt playerIP, Bool status ) = 0;																///< Someone's accept status changed
-	virtual void OnHasMap( UnsignedInt playerIP, Bool status ) = 0;																///< Someone's map status changed
-	virtual void OnChat( UnicodeString player, UnsignedInt ip,
-											 UnicodeString message, ChatType format ) = 0;														///< Chat message from someone
-	virtual void OnGameStart( void ) = 0;																													///< The game is starting
-	virtual void OnGameStartTimer( Int seconds ) = 0;
-	virtual void OnGameOptions( UnsignedInt playerIP, Int playerSlot, AsciiString options ) = 0;	///< Someone sent game options
-	virtual void OnGameCreate( ReturnType ret ) = 0;																							///< Your game is created
-//	virtual void OnSlotList( ReturnType ret, LANGameInfo *theGame ) = 0;															///< Slotlist for a game in setup
-	virtual void OnNameChange( UnsignedInt IP, UnicodeString newName ) = 0;												///< Someone has morphed
-
-	// Misc utility functions
-	virtual LANGameInfo * LookupGame( UnicodeString gameName ) = 0;														///< return a pointer to a game we know about
-	virtual LANGameInfo * LookupGameByListOffset( Int offset ) = 0;														///< return a pointer to a game we know about
-	virtual Bool SetLocalIP( UnsignedInt localIP ) = 0;																		///< For multiple NIC machines
-	virtual void SetLocalIP( AsciiString localIP ) = 0;																		///< For multiple NIC machines
-	virtual Bool AmIHost( void ) = 0;																											///< Am I hosting a game?
-	virtual inline UnicodeString GetMyName( void ) = 0;																		///< What's my name?
-	virtual inline LANGameInfo *GetMyGame( void ) = 0;															          ///< What's my Game?
-	virtual void fillInLANMessage( LANMessage *msg ) = 0;																	///< Fill in default params
-	virtual void checkMOTD( void ) = 0;
-};
-
-
-/**
- * The LANAPI class is used to instantiate a singleton which 
- * implements the interface to all LAN broadcast communications.
- */
-class LANAPI : public LANAPIInterface
-{
-public:
-
-	LANAPI();
-	virtual ~LANAPI();
-
-	virtual void init( void );															///< Initialize or re-initialize the instance
-	virtual void reset( void );															///< reset the logic system
-	virtual void update( void );														///< update the world
-
-	virtual void setIsActive(Bool isActive);								///< tell TheLAN whether or not
-
-	// Request functions generate network traffic
-	virtual void RequestLocations( void );																				///< Request everybody to respond with where they are
-	virtual void RequestGameJoin( LANGameInfo *game, UnsignedInt ip = 0 );				///< Request to join a game
-	virtual void RequestGameJoinDirectConnect( UnsignedInt ipaddress );						///< Request to join a game at an IP address
-	virtual void RequestGameLeave( void );																				///< Tell everyone we're leaving
-	virtual void RequestAccept( void );																						///< Indicate we're OK with the game options
-	virtual void RequestHasMap( void );																						///< Send our map status
-	virtual void RequestChat( UnicodeString message, ChatType format );						///< Send a chat message
-	virtual void RequestGameStart( void );																				///< Tell everyone the game is starting
-	virtual void RequestGameStartTimer( Int seconds );
-	virtual void RequestGameOptions( AsciiString gameOptions, Bool isPublic, UnsignedInt ip = 0 );		///< Change the game options
-	virtual void RequestGameCreate( UnicodeString gameName, Bool isDirectConnect );	///< Try to host a game
-	virtual void RequestGameAnnounce( void );																			///< Send out game info if host
-	virtual void RequestSetName( UnicodeString newName );													///< Pick a new name
-//	virtual void RequestSlotList( void );																					///< Pump out the Slot info.
-	virtual void RequestLobbyLeave( Bool forced );																///< Announce that we're leaving the lobby
-	virtual void ResetGameStartTimer( void );
-
-	// On functions are (generally) the result of network traffic
-	virtual void OnGameList( LANGameInfo *gameList );																							///< List of games
-	virtual void OnPlayerList( LANPlayer *playerList );																				///< List of players in the Lobby
-	virtual void OnGameJoin( ReturnType ret, LANGameInfo *theGame );															///< Did we get in the game?
-	virtual void OnPlayerJoin( Int slot, UnicodeString playerName );													///< Someone else joined our game (host only; joiners get a slotlist)
-	virtual void OnHostLeave( void );																													///< Host left the game
-	virtual void OnPlayerLeave( UnicodeString player );																				///< Someone left the game
-	virtual void OnAccept( UnsignedInt playerIP, Bool status );																///< Someone's accept status changed
-	virtual void OnHasMap( UnsignedInt playerIP, Bool status );																///< Someone's map status changed
-	virtual void OnChat( UnicodeString player, UnsignedInt ip,
-											 UnicodeString message, ChatType format );														///< Chat message from someone
-	virtual void OnGameStart( void );																													///< The game is starting
-	virtual void OnGameStartTimer( Int seconds );
-	virtual void OnGameOptions( UnsignedInt playerIP, Int playerSlot, AsciiString options );	///< Someone sent game options
-	virtual void OnGameCreate( ReturnType ret );																							///< Your game is created
-	//virtual void OnSlotList( ReturnType ret, LANGameInfo *theGame );															///< Slotlist for a game in setup
-	virtual void OnNameChange( UnsignedInt IP, UnicodeString newName );												///< Someone has morphed
-	virtual void OnInActive( UnsignedInt IP );																								///< Someone has alt-tabbed out.
-
-
-	// Misc utility functions
-	virtual LANGameInfo * LookupGame( UnicodeString gameName );														///< return a pointer to a game we know about
-	virtual LANGameInfo * LookupGameByListOffset( Int offset );														///< return a pointer to a game we know about
-	virtual LANPlayer * LookupPlayer( UnsignedInt playerIP );													///< return a pointer to a player we know about
-	virtual Bool SetLocalIP( UnsignedInt localIP );																		///< For multiple NIC machines
-	virtual void SetLocalIP( AsciiString localIP );																		///< For multiple NIC machines
-	virtual Bool AmIHost( void );																											///< Am I hosting a game?
-	virtual inline UnicodeString GetMyName( void ) { return m_name; }                 ///< What's my name?
-	virtual inline LANGameInfo* GetMyGame( void ) { return m_currentGame; }					      ///< What's my Game?
-	virtual inline UnsignedInt GetLocalIP( void ) { return m_localIP; }								///< What's my IP?
-	virtual void fillInLANMessage( LANMessage *msg );																	///< Fill in default params
-	virtual void checkMOTD( void );
-protected:
-
-	enum PendingActionType
-	{
-		ACT_NONE = 0,
-		ACT_JOIN,
-		ACT_JOINDIRECTCONNECT,
-		ACT_LEAVE,
-		ACT_MAX
-	};
-
-	static const UnsignedInt s_resendDelta; // in ms
-
-protected:
-	LANPlayer *					m_lobbyPlayers;			///< List of players in the lobby
-	LANGameInfo *				m_games;								///< List of games
-	UnicodeString				m_name;							///< Who do we think we are?
-	AsciiString					m_userName;						///< login name
-	AsciiString					m_hostName;						///< machine name
-	UnsignedInt					m_gameStartTime;
-	Int									m_gameStartSeconds;
-
-	PendingActionType		m_pendingAction;	///< What action are we performing?
-	UnsignedInt					m_expiration;						///< When should we give up on our action?
-	UnsignedInt					m_actionTimeout;
-	UnsignedInt					m_directConnectRemoteIP;///< The IP address of the game we are direct connecting to.
-
-	// Resend timer ---------------------------------------------------------------------------
-	UnsignedInt					m_lastResendTime; // in ms
-
-	Bool								m_isInLANMenu;		///< true while we are in a LAN menu (lobby, game options, direct connect)
-	Bool								m_inLobby;											///< Are we in the lobby (not in a game)?
-	LANGameInfo *				m_currentGame;							///< Pointer to game (setup screen) we are currently in (NULL for lobby)
-	//LANGameInfo *m_currentGameInfo;			///< Pointer to game setup info we are currently in.
-
-	UnsignedInt					m_localIP;
-	Transport*					m_transport;
-
-	UnsignedInt					m_broadcastAddr;
-
-	UnsignedInt					m_lastUpdate;
-	AsciiString					m_lastGameopt; /// @todo: hack for demo - remove this
-
-	Bool								m_isActive;			///< is the game currently active?
-
-protected:
-	void sendMessage(LANMessage *msg, UnsignedInt ip = 0); // Convenience function
-	void removePlayer(LANPlayer *player);
-	void removeGame(LANGameInfo *game);
-	void addPlayer(LANPlayer *player);
-	void addGame(LANGameInfo *game);
-	AsciiString createSlotString( void );
-
-	// Functions to handle incoming messages -----------------------------------
-	void handleRequestLocations( LANMessage *msg, UnsignedInt senderIP );
-	void handleGameAnnounce( LANMessage *msg, UnsignedInt senderIP );
-	void handleLobbyAnnounce( LANMessage *msg, UnsignedInt senderIP );
-	void handleRequestGameInfo( LANMessage *msg, UnsignedInt senderIP );
-	void handleRequestJoin( LANMessage *msg, UnsignedInt senderIP );
-	void handleJoinAccept( LANMessage *msg, UnsignedInt senderIP );
-	void handleJoinDeny( LANMessage *msg, UnsignedInt senderIP );
-	void handleRequestGameLeave( LANMessage *msg, UnsignedInt senderIP );
-	void handleRequestLobbyLeave( LANMessage *msg, UnsignedInt senderIP );
-	void handleSetAccept( LANMessage *msg, UnsignedInt senderIP );
-	void handleHasMap( LANMessage *msg, UnsignedInt senderIP );
-	void handleChat( LANMessage *msg, UnsignedInt senderIP );
-	void handleGameStart( LANMessage *msg, UnsignedInt senderIP );
-	void handleGameStartTimer( LANMessage *msg, UnsignedInt senderIP );
-	void handleGameOptions( LANMessage *msg, UnsignedInt senderIP );
-	void handleInActive( LANMessage *msg, UnsignedInt senderIP );
-
-};
-
-
-
-/**
- * LAN message class
- */
-#pragma pack(push, 1)
-struct LANMessage
-{
-	enum											///< What kind of message are we?
-	{
-		// Locating everybody
-		MSG_REQUEST_LOCATIONS,	///< Hey, where is everybody?
-		MSG_GAME_ANNOUNCE,			///< Here I am, and here's my game info!
-		MSG_LOBBY_ANNOUNCE,			///< Hey, I'm in the lobby!
-
-		// Joining games
-		MSG_REQUEST_JOIN,				///< Let me in!  Let me in!
-		MSG_JOIN_ACCEPT,				///< Okay, you can join.
-		MSG_JOIN_DENY,					///< Go away!  We don't want any!
-
-		// Leaving games
-		MSG_REQUEST_GAME_LEAVE,	///< I want to leave the game
-		MSG_REQUEST_LOBBY_LEAVE,///< I'm leaving the lobby
-
-		// Game options, chat, etc
-		MSG_SET_ACCEPT,					///< I'm cool with everything as is.
-		MSG_MAP_AVAILABILITY,		///< I do (not) have the map.
-		MSG_CHAT,								///< Just spouting my mouth off.
-		MSG_GAME_START,					///< Hold on; we're starting!
-		MSG_GAME_START_TIMER,		///< The game will start in N seconds
-		MSG_GAME_OPTIONS,				///< Here's some info about the game.
-		MSG_INACTIVE,						///< I've alt-tabbed out.  Unaccept me cause I'm a poo-flinging monkey.
-
-		MSG_REQUEST_GAME_INFO,	///< For direct connect, get the game info from a specific IP Address
-
-		MSG_MAX
-	} LANMessageType;
-
-	WideChar name[g_lanPlayerNameLength+1]; ///< My name, for convenience
-	char userName[g_lanLoginNameLength+1];	///< login name, for convenience
-	char hostName[g_lanHostNameLength+1];		///< machine name, for convenience
-
-	// No additional data is required for REQUEST_LOCATIONS, LOBBY_ANNOUNCE,
-	// REQUEST_LOBBY_LEAVE, GAME_START.
-	union
-	{
-		// StartTimer is sent with GAME_START_TIMER
-		struct
-		{
-			Int seconds;
-		} StartTimer;
-
-		// GameJoined is sent with REQUEST_GAME_LEAVE
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-		} GameToLeave;
-
-		// GameInfo if sent with GAME_ANNOUNCE
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-			Bool inProgress;
-			char options[m_lanMaxOptionsLength+1];
-			Bool isDirectConnect;
-		} GameInfo;
-
-		// PlayerInfo is sent with REQUEST_GAME_INFO for direct connect games.
-		struct
-		{
-			UnsignedInt ip;
-			WideChar playerName[g_lanPlayerNameLength+1];
-		} PlayerInfo;
-
-		// GameToJoin is sent with REQUEST_JOIN
-		struct
-		{
-			UnsignedInt gameIP;
-			UnsignedInt exeCRC;
-			UnsignedInt iniCRC;
-			char serial[g_maxSerialLength];
-		} GameToJoin;
-
-		// GameJoined is sent with JOIN_ACCEPT
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-			UnsignedInt gameIP;
-			UnsignedInt playerIP;
-			Int slotPosition;
-		} GameJoined;
-
-		// GameNotJoined is sent with JOIN_DENY
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-			UnsignedInt gameIP;
-			UnsignedInt playerIP;
-			LANAPIInterface::ReturnType reason;
-		} GameNotJoined;
-
-		// Accept is sent with SET_ACCEPT
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-			Bool isAccepted;
-		} Accept;
-
-		// Accept is sent with MAP_AVAILABILITY
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-			UnsignedInt mapCRC;	// to make sure we're talking about the same map
-			Bool hasMap;
-		} MapStatus;
-
-		// Chat is sent with CHAT
-		struct
-		{
-			WideChar gameName[g_lanGameNameLength+1];
-			LANAPIInterface::ChatType chatType;
-			WideChar message[g_lanMaxChatLength+1];
-		} Chat;
-
-		// GameOptions is sent with GAME_OPTIONS
-		struct
-		{
-			char options[m_lanMaxOptionsLength+1];
-		} GameOptions;
-
-	};
-};
-#pragma pack(pop)
-
-
-#endif // _LANAPI_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h
deleted file mode 100644
index 8f1c02648bc..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: LANAPICallbacks.h
-// Author: Chris Huybregts, October 2001
-// Description: LAN API Callbacks header
-///////////////////////////////////////////////////////////////////////////////////////
-#pragma once
-
-#ifndef _LANAPI_CALLBACKS_H_
-#define _LANAPI_CALLBACKS_H_
-
-#include "Common/NameKeyGenerator.h"
-#include "GameClient/Shell.h"
-#include "GameClient/GadgetListBox.h"
-#include "GameClient/GadgetTextEntry.h"
-#include "GameNetwork/LANAPI.h"
-
-
-// LAN API Singleton ----------------------------------------------------------------------
-extern LANAPI *TheLAN;
-
-//external declarations of the Gadgets the callbacks can use
-// LanLobby
-extern NameKeyType listboxChatWindowID;
-extern GameWindow *listboxChatWindow;
-extern GameWindow *listboxPlayers;
-extern NameKeyType listboxGamesID;
-extern GameWindow *listboxGames;
-//LanGame Options screen
-extern NameKeyType listboxChatWindowLanGameID;
-extern GameWindow *listboxChatWindowLanGame;
-extern WindowLayout *mapSelectLayout;
-// ScoreScreen
-extern NameKeyType listboxChatWindowScoreScreenID;
-extern GameWindow *listboxChatWindowScoreScreen;
-
-
-//Colors used for the chat dialogs
-extern const Color playerColor;
-extern const Color gameColor;
-extern const Color gameInProgressColor;
-extern const Color chatNormalColor;
-extern const Color chatActionColor;
-extern const Color chatLocalNormalColor;
-extern const Color chatLocalActionColor;
-extern const Color chatSystemColor;
-extern const Color chatSystemColor;
-extern const Color acceptTrueColor;
-extern const Color acceptFalseColor;
-
-
-void lanUpdateSlotList( void );
-void updateGameOptions( void );
-
-
-//Enum is used for the utility function so other windows do not need
-//to know about controls on LanGameOptions window.
-enum PostToLanGameType CPP_11(: Int){ SEND_GAME_OPTS = 0,
-												MAP_BACK,
-												POST_TO_LAN_GAME_TYPE_COUNT };
-//the utility function mentioned above
-void PostToLanGameOptions(PostToLanGameType post);
-
-												
-
-#endif //_LANAPI_CALLBACKS_H_
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h
deleted file mode 100644
index 9c8b88996e9..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: LANGameInfo.h //////////////////////////////////////////////////////
-// Generals LAN game setup information
-// Author: Matthew D. Campbell, December 2001
-
-#pragma once
-
-#ifndef __LANGAMEINFO_H__
-#define __LANGAMEINFO_H__
-
-#include "GameNetwork/GameInfo.h"
-#include "GameNetwork/LANPlayer.h"
-
-class GameWindow;
-
-/**
-  * LANGameSlot class - maintains information about the contents of a
-	* game slot.  This persists throughout the game.
-	*/
-class LANGameSlot : public GameSlot
-{
-public:
-	LANGameSlot();
-
-	LANPlayer *getUser( void );																	///< Get the User structure associated with the slot (NULL for non-humans)
-
-	// Various tests
-	Bool isUser( LANPlayer *user );															///< Does this slot contain the given user?  Based off user->name
-	Bool isUser( UnicodeString userName );									///< Does this slot contain the given user?
-	Bool isLocalPlayer( void ) const;															///< Is this slot me?
-	inline void setLogin( UnicodeString name ) { m_user.setLogin(name); }
-	inline void setLogin( AsciiString name ) { m_user.setLogin(name); }
-	inline void setHost( UnicodeString name ) { m_user.setHost(name); }
-	inline void setHost( AsciiString name ) { m_user.setHost(name); }
-	inline void setSerial( AsciiString serial ) { m_serial = serial; }
-	inline AsciiString getSerial( void ) { return m_serial; }
-
-	inline void setLastHeard( UnsignedInt t ) { m_lastHeard = t; }
-	inline UnsignedInt getLastHeard( void ) { return m_lastHeard; }
-
-	//LANGameSlot& operator=(const LANGameSlot& src);
-
-private:
-
-	LANPlayer m_user;	///< filled in for each getUser() call
-	AsciiString m_serial;
-
-	UnsignedInt m_lastHeard;
-};
-
-/**
-  * LANGameInfo class - maintains information about the LAN game and
-	* the contents of its slot list hroughout the game.
-	*/
-class LANGameInfo : public GameInfo
-{
-private:
-	LANGameSlot m_LANSlot[MAX_SLOTS];											///< The Lan Games Slot List
-
-public:
-	LANGameInfo();
-	void setSlot( Int slotNum, LANGameSlot slotInfo );	///< Set the slot state (human, open, AI, etc)
-	LANGameSlot* getLANSlot( Int slotNum );							///< Get the slot
-	const LANGameSlot* getConstLANSlot( Int slotNum ) const;							///< Get the slot
-	virtual Int getLocalSlotNum( void ) const;												///< Get the local slot number, or -1 if we're not present
-	Int getSlotNum( UnicodeString userName );						///< Get the slot number corresponding to a specific user, or -1 if he's not present
-	
-	inline UnsignedInt getLastHeard( void ) { return m_lastHeard; }
-	inline void setLastHeard( UnsignedInt lastHeard ) { m_lastHeard = lastHeard; }
-	inline LANGameInfo *getNext( void ) { return m_next; }
-	inline void setNext( LANGameInfo *next ) { m_next = next; }
-	
-	// Game options
-	void setMap( AsciiString mapName );									///< Set the map to play on
-	void setSeed( Int seed );														///< Set the random seed for the game
-	
-	inline void setName( UnicodeString name ) { m_gameName = name; }		///< Set the Name of the Game
-	inline UnicodeString getName( void ) { return m_gameName; }					///< Get the Name of the Game
-
-	// Convinience functions that interface with the LANPlayer held in the slot list	
-	virtual void resetAccepted(void);														///< Reset the accepted flag on all players
-	Bool amIHost( void );																///< Convenience function - is the local player the game host?
-
-	/// Get the IP of selected player or return 0
-	inline UnsignedInt getIP( int who ) 
-	{
-		return m_LANSlot[who].getIP();
-	}
-	
-	/// Set the IP of the Selected Player
-	inline void setIP( int who, UnsignedInt IP )
-	{
-		m_LANSlot[who].setIP(IP); 
-	}
-
-	/// set whether or not this is a direct connect game or not.
-	inline void setIsDirectConnect(Bool isDirectConnect)
-	{
-		m_isDirectConnect = isDirectConnect;
-	}
-
-	/// returns whether or not this is a direct connect game or not.
-	inline Bool getIsDirectConnect()
-	{
-		return m_isDirectConnect;
-	}
-	
-	/// Set the Player Name
-	inline void setPlayerName( int who, UnicodeString name )
-	{
-		m_LANSlot[who].setName(name); 
-	}
-
-	/// Return the Player name or TheEmptyString
-	inline UnicodeString getPlayerName(int who)
-	{
-		return m_LANSlot[who].getName(); 
-	} 
-	
-	/// Return the time the player was heard from last, or 0
-	inline UnsignedInt getPlayerLastHeard( int who )
-	{
-		if (m_LANSlot[who].isHuman())
-			return m_LANSlot[who].getLastHeard();
-		return 0;
-	}
-
-	/// Set the last time we heard from the player
-	inline void setPlayerLastHeard( int who, UnsignedInt lastHeard ) 	
-	{
-		DEBUG_LOG(("LANGameInfo::setPlayerLastHeard - changing player %d last heard from %d to %d\n", who, getPlayerLastHeard(who), lastHeard));
-		if (m_LANSlot[who].isHuman())
-			m_LANSlot[who].setLastHeard(lastHeard);
-	}
-
-	/// Return the hosts IP or 0
-	UnsignedInt getHostIP(void)
-	{ 
-		if (m_LANSlot[0].isHuman())
-			return m_LANSlot[0].getIP();
-		return 0;
-	}
-
-	
-private:
-	LANGameInfo *m_next;																///< Pointer for linked list
-	UnsignedInt m_lastHeard;														///< The last time we heard from this game (for timeout purposes)
-	UnicodeString m_gameName;														///< Game name.  @todo: are game names based off of host player names?
-	Bool m_isDirectConnect;															///< Is this game a direct connect game, or a LAN game?
-};
-
-void LANDisplayGameList( GameWindow *gameListbox, LANGameInfo *gameList );	///< Displays the list of games in a listbox, preserving selections
-void LANEnableStartButton(Bool enabled);
-
-void LANDisplaySlotList( void );		///< Displays the slot list according to TheLANGameInfo
-void LANDisplayGameOptions( void );	///< Displays the game options according to TheLANGameInfo
-
-AsciiString GenerateGameOptionsString( void );
-Bool ParseGameOptionsString(LANGameInfo *game, AsciiString options);
-
-
-#endif // __LANGAMEINFO_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANPlayer.h
deleted file mode 100644
index d87a49ecbba..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANPlayer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// LANPlayer.h ///////////////////////////////////////////////////////////////
-// LAN Player Class used for both the LANAPI and LANGameInfo
-// Author: Matthew D. Campbell, October 2001 (Pulled out of LANAPI.h by CLH on 12/21/01
-
-#pragma once
-
-#ifndef _LANPLAYER_H_
-#define _LANPLAYER_H_
-
-
-/**
- * LAN player class.  This is for players sitting in the lobby.  Players are
- * uniquely identified by their IP addresses.
- */
-class LANPlayer
-{
-public:
-	LANPlayer() { m_name = m_login = m_host = L""; m_lastHeard = 0; m_next = NULL; m_IP = 0; }
-
-	// Access functions
-	inline UnicodeString getName( void ) { return m_name; }
-	inline void setName( UnicodeString name ) { m_name = name; }
-	inline UnicodeString getLogin( void ) { return m_login; }
-	inline void setLogin( UnicodeString name ) { m_login = name; }
-	inline void setLogin( AsciiString name ) { m_login.translate(name); }
-	inline UnicodeString getHost( void ) { return m_host; }
-	inline void setHost( UnicodeString name ) { m_host = name; }
-	inline void setHost( AsciiString name ) { m_host.translate(name); }
-	inline UnsignedInt getLastHeard( void ) { return m_lastHeard; }
-	inline void setLastHeard( UnsignedInt lastHeard ) { m_lastHeard = lastHeard; }
-	inline LANPlayer *getNext( void ) { return m_next; }
-	inline void setNext( LANPlayer *next ) { m_next = next; }
-	inline UnsignedInt getIP( void ) { return m_IP; }
-	inline void setIP( UnsignedInt IP ) { m_IP = IP; }
-	
-protected:
-	UnicodeString m_name;			///< Player name
-	UnicodeString m_login;		///< login name
-	UnicodeString m_host;			///< machine name
-	UnsignedInt m_lastHeard;	///< The last time we heard from this player (for timeout purposes)
-	LANPlayer *m_next;				///< Linked list pointer
-	UnsignedInt m_IP;					///< Player's IP
-};
-
-#endif //_LANPLAYER_H_
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h
deleted file mode 100644
index 7039ace4a7a..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: NAT.h /////////////////////////////////////////////////////////////////////////////////
-// Author: Bryan Cleveland April 2002
-// Desc:   Resolves NAT'd IPs and port numbers for the other players in a game.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __NAT_H
-#define __NAT_H
-
-#include "Lib/BaseType.h"
-#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/FirewallHelper.h"
-
-class Transport;
-class GameSlot;
-
-enum NATStateType CPP_11(: Int) {
-	NATSTATE_IDLE,
-	NATSTATE_DOCONNECTIONPATHS,
-	NATSTATE_WAITFORSTATS,
-	NATSTATE_DONE,
-	NATSTATE_FAILED
-};
-
-enum NATConnectionState CPP_11(: Int) {
-	NATCONNECTIONSTATE_NOSTATE,
-	NATCONNECTIONSTATE_WAITINGTOBEGIN,
-//	NATCONNECTIONSTATE_NETGEARDELAY,
-	NATCONNECTIONSTATE_WAITINGFORMANGLERRESPONSE,
-	NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT,
-	NATCONNECTIONSTATE_WAITINGFORRESPONSE,
-	NATCONNECTIONSTATE_DONE,
-	NATCONNECTIONSTATE_FAILED
-};
-
-struct ConnectionNodeType {
-	FirewallHelperClass::tFirewallBehaviorType m_behavior;	///< the NAT/Firewall behavior of this node.
-	UnsignedInt m_slotIndex; ///< the player list index of this node.
-};
-
-class NAT {
-public:
-	NAT();
-	virtual ~NAT();
-
-	NATStateType update();
-
-	void attachSlotList(GameSlot **slotList, Int localSlot, UnsignedInt localIP);
-	void establishConnectionPaths();
-
-	Int getSlotPort(Int slot);
-	Transport * getTransport();	///< return the newly created Transport layer that has all the connections and whatnot.
-
-	// Notification messages from GameSpy
-	void processGlobalMessage(Int slotNum, const char *options);
-
-protected:
-	NATConnectionState connectionUpdate(); ///< the update function for the connections.
-	void sendMangledSourcePort(); ///< starts the process to get the next mangled source port.
-	void processManglerResponse(UnsignedShort mangledPort);
-
-	Bool allConnectionsDoneThisRound();
-	Bool allConnectionsDone();
-
-	void generatePortNumbers(GameSlot **slotList, Int localSlot); ///< generate all of the slots' port numbers to be used.
-
-	void doThisConnectionRound();	///< compute who will connect with who for this round.
-	void setConnectionState(Int nodeNumber, NATConnectionState state); ///< central point for changing a connection's state.
-	void sendAProbe(UnsignedInt ip, UnsignedShort port, Int fromNode);	///< send a "PROBE" packet to this IP and port.
-	void notifyTargetOfProbe(GameSlot *targetSlot);
-	void notifyUsersOfConnectionDone(Int nodeIndex);
-	void notifyUsersOfConnectionFailed(Int nodeIndex);
-	void sendMangledPortNumberToTarget(UnsignedShort mangledPort, GameSlot *targetSlot);
-
-	void probed(Int nodeNumber);
-	void gotMangledPort(Int nodeNumber, UnsignedShort mangledPort);
-	void gotInternalAddress(Int nodeNumber, UnsignedInt address);
-	void connectionComplete(Int slotIndex);
-	void connectionFailed(Int slotIndex);
-
-	Transport *m_transport;
-	GameSlot **m_slotList;
-	NATStateType m_NATState;
-	Int m_localNodeNumber;	///< The node number of the local player.
-	Int m_targetNodeNumber;	///< The node number of the player we are connecting to this round.
-	UnsignedInt m_localIP;	///< The IP of the local computer.
-	UnsignedInt m_numNodes;	///< The number of players we have to connect together.
-	UnsignedInt m_connectionRound; ///< The "round" of connections we are currently on.
-
-	Int m_numRetries;
-	Int m_maxNumRetriesAllowed;
-
-	UnsignedShort m_packetID;
-	UnsignedShort m_spareSocketPort;
-	time_t m_manglerRetryTime;
-	Int m_manglerRetries;
-	UnsignedShort m_previousSourcePort;
-
-	Bool m_beenProbed; ///< have I been notified that I've been probed this round?
-	
-	UnsignedInt m_manglerAddress;
-
-	time_t m_timeTillNextSend; ///< The number of milliseconds till we send to the other guy's port again.
-	NATConnectionState m_connectionStates[MAX_SLOTS]; ///< connection states for this round for all the nodes.
-
-	ConnectionNodeType m_connectionNodes[MAX_SLOTS]; ///< info regarding the nodes that are being connected.
-
-	UnsignedShort m_sourcePorts[MAX_SLOTS]; ///< the source ports that the other players communicate to us on.
-
-	Bool m_myConnections[MAX_SLOTS]; ///< keeps track of all the nodes I've connected to. For keepalive.
-	time_t m_nextKeepaliveTime; ///< the next time we will send out our keepalive packets.
-
-	static Int m_connectionPairs[MAX_SLOTS-1][MAX_SLOTS-1][MAX_SLOTS];
-	Int m_connectionPairIndex;
-
-	UnsignedShort m_startingPortNumber; ///< the starting port number for this game. The slots all get port numbers with their port numbers based on this number.
-																			///< this is done so that games that are played right after each other with the same players in the same
-																			///< slot order will not use the old source port allocation scheme in case their NAT
-																			///< hasn't timed out that connection.
-
-	time_t m_nextPortSendTime; ///< Last time we sent our mangled port number to our target this round.
-
-	time_t m_timeoutTime; ///< the time at which we will time out waiting for the other player's port number.
-	time_t m_roundTimeout;	///< the time at which we will time out this connection round.
-
- static Int m_timeBetweenRetries; // 1 second between retries sounds good to me.
- static time_t m_manglerRetryTimeInterval; // sounds good to me.
- static Int m_maxAllowedManglerRetries; // works for me.
- static time_t m_keepaliveInterval; // 15 seconds between keepalive packets seems good.
- static time_t m_timeToWaitForPort; // wait for ten seconds for the other player's port number.
- static time_t m_timeForRoundTimeout; // wait for at most ten seconds for each connection round to finish.
-
-};
-
-extern NAT *TheNAT;
-
-#endif // #ifndef __NAT_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h
deleted file mode 100644
index 641acdf7716..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __NETCOMMANDLIST_H
-#define __NETCOMMANDLIST_H
-
-#include "Common/GameMemory.h"
-#include "GameNetwork/NetCommandRef.h"
-
-/**
- * The NetCommandList is a ordered linked list of NetCommandRef objects.
- * The list is ordered based on the command id, player id, and command type.
- * It is ordered in this way to aid in constructing the packets efficiently.
- * The list keeps track of the last message inserted in order to accommodate
- * adding commands in order more efficiently since that is whats going to be
- * done most of the time.  If the new message doesn't go after the last message
- * inserted, then the list will be traversed linearly until the proper spot is
- * found.  We can get away with this inefficient method since these occurances
- * will be rare.  Also, the list is not expected to ever have more than 30 or so
- * commands on it at a time.  Five commands would probably be a normal amount.
- */
-
-class NetCommandList : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandList, "NetCommandList")		
-public:
-	NetCommandList();
-	//virtual ~NetCommandList();
-
-	void init();									///< Initialize the list
-	void reset();									///< Reset the list to the initial state.
-	NetCommandRef * addMessage(NetCommandMsg *cmdMsg);	///< Add message to the list in its properly ordered place.
-	Bool isEqualCommandMsg(NetCommandMsg *msg1, NetCommandMsg *msg2);
-	NetCommandRef * getFirstMessage();				///< Get the first message on the list.
-	NetCommandRef * findMessage(NetCommandMsg *msg);	///< Find and return a reference to the given message if one exists.
-	NetCommandRef * findMessage(UnsignedShort commandID, UnsignedByte playerID);	///< Find and return a reference to the
-																								///< message given the player id and the command id.
-																								///< This will only check against messages of types that require
-																								///< a command id.
-	void removeMessage(NetCommandRef *msg);			///< Remove the given message from the list.
-	void appendList(NetCommandList *list);			///< Append the given list to the end of this list.
-	Int length();									///< Returns the number of nodes in this list.  This is inefficient and is meant to be a debug tool.
-
-protected:
-	NetCommandRef *m_first;							///< Head of the list.
-	NetCommandRef *m_last;							///< Tail of the list.
-	NetCommandRef *m_lastMessageInserted;			///< The last message that was inserted to this list.
-};
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h
deleted file mode 100644
index 3d6b09e0832..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h
+++ /dev/null
@@ -1,526 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//------------------------------------------------------------------------------------
-// The CommandMsg class is a linked-list wrapper around GameMessage objects that
-// are queued up to execute at a later time
-
-#pragma once
-
-#ifndef __NETCOMMANDMSG_H
-#define __NETCOMMANDMSG_H
-
-#include "Lib/BaseType.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "Common/UnicodeString.h"
-
-//-----------------------------------------------------------------------------
-class NetCommandMsg : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandMsg, "NetCommandMsg")		
-public:
-	NetCommandMsg();
-	//virtual ~NetCommandMsg();
-	inline UnsignedInt GetTimestamp() { return m_timestamp; }
-	inline void SetTimestamp(UnsignedInt timestamp) { m_timestamp = timestamp; }
-	inline void setExecutionFrame(UnsignedInt frame) { m_executionFrame = frame; }
-	inline void setPlayerID(UnsignedInt playerID) { m_playerID = playerID; }
-	inline void setID(UnsignedShort id) { m_id = id; }
-	inline UnsignedInt getExecutionFrame() { return m_executionFrame; }
-	inline UnsignedInt getPlayerID() { return m_playerID; }
-	inline UnsignedShort getID() { return m_id; }
-	inline void setNetCommandType(NetCommandType type) { m_commandType = type; }
-	inline NetCommandType getNetCommandType() { return m_commandType; }
-	virtual Int getSortNumber();
-	void attach();
-	void detach();
-
-	// For debugging purposes
-	virtual AsciiString getContentsAsAsciiString(void) { return AsciiString::TheEmptyString; }
-
-protected:
-	UnsignedInt m_timestamp;
-	UnsignedInt m_executionFrame;
-	UnsignedInt m_playerID;
-	UnsignedShort m_id;
-
-	NetCommandType m_commandType;
-	Int m_referenceCount;
-};
-
-
-//-----------------------------------------------------------------------------
-/**
- * The NetGameCommandMsg is the NetCommandMsg representation of a GameMessage
- */
-class NetGameCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetGameCommandMsg, "NetGameCommandMsg")		
-public:
-	NetGameCommandMsg();
-	NetGameCommandMsg(GameMessage *msg);
-	//virtual ~NetGameCommandMsg();
-
-	GameMessage *constructGameMessage();
-	void addArgument(const GameMessageArgumentDataType type, GameMessageArgumentType arg);
-	void setGameMessageType(GameMessage::Type type);
-
-	// For debugging purposes
-	virtual AsciiString getContentsAsAsciiString(void);
-
-protected:
-	Int m_numArgs;
-	Int m_argSize;
-	GameMessage::Type m_type;
-	GameMessageArgument *m_argList, *m_argTail;
-};
-
-//-----------------------------------------------------------------------------
-/**
- * The NetAckBothCommandMsg is the NetCommandMsg representation of the combination of a
- * stage 1 ack and a stage 2 ack.
- */
-class NetAckBothCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetAckBothCommandMsg, "NetAckBothCommandMsg")		
-public:
-	NetAckBothCommandMsg(NetCommandMsg *msg);
-	NetAckBothCommandMsg();
-	//virtual ~NetAckBothCommandMsg();
-
-	UnsignedShort getCommandID();
-	void setCommandID(UnsignedShort commandID);
-	UnsignedByte getOriginalPlayerID();
-	void setOriginalPlayerID(UnsignedByte originalPlayerID);
-	virtual Int getSortNumber();
-
-protected:
-	UnsignedShort m_commandID;
-	UnsignedByte m_originalPlayerID;
-};
-
-//-----------------------------------------------------------------------------
-/**
- * The NetAckStage1CommandMsg is the NetCommandMsg representation of an ack message for the initial
- * recipient.
- */
-class NetAckStage1CommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetAckStage1CommandMsg, "NetAckStage1CommandMsg")		
-public:
-	NetAckStage1CommandMsg(NetCommandMsg *msg);
-	NetAckStage1CommandMsg();
-	//virtual ~NetAckStage1CommandMsg();
-
-	UnsignedShort getCommandID();
-	void setCommandID(UnsignedShort commandID);
-	UnsignedByte getOriginalPlayerID();
-	void setOriginalPlayerID(UnsignedByte originalPlayerID);
-	virtual Int getSortNumber();
-
-protected:
-	UnsignedShort m_commandID;
-	UnsignedByte m_originalPlayerID;
-};
-
-//-----------------------------------------------------------------------------
-/**
- * The NetAckStage2CommandMsg is the NetCommandMsg representation of an ack message for all eventual
- * recipients. (when this is returned, all the players in the relay mask have received the packet)
- */
-class NetAckStage2CommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetAckStage2CommandMsg, "NetAckStage2CommandMsg")		
-public:
-	NetAckStage2CommandMsg(NetCommandMsg *msg);
-	NetAckStage2CommandMsg();
-	//virtual ~NetAckStage2CommandMsg();
-
-	UnsignedShort getCommandID();
-	void setCommandID(UnsignedShort commandID);
-	UnsignedByte getOriginalPlayerID();
-	void setOriginalPlayerID(UnsignedByte originalPlayerID);
-	virtual Int getSortNumber();
-
-protected:
-	UnsignedShort m_commandID;
-	UnsignedByte m_originalPlayerID;
-};
-
-//-----------------------------------------------------------------------------
-class NetFrameCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFrameCommandMsg, "NetFrameCommandMsg")		
-public:
-	NetFrameCommandMsg();
-	//virtual ~NetFrameCommandMsg();
-
-	void setCommandCount(UnsignedShort commandCount);
-	UnsignedShort getCommandCount();
-
-protected:
-	UnsignedShort m_commandCount;
-};
-
-//-----------------------------------------------------------------------------
-class NetPlayerLeaveCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetPlayerLeaveCommandMsg, "NetPlayerLeaveCommandMsg")		
-public:
-	NetPlayerLeaveCommandMsg();
-	//virtual ~NetPlayerLeaveCommandMsg();
-
-	UnsignedByte getLeavingPlayerID();
-	void setLeavingPlayerID(UnsignedByte id);
-
-protected:
-	UnsignedByte m_leavingPlayerID;
-};
-
-//-----------------------------------------------------------------------------
-class NetRunAheadMetricsCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetRunAheadMetricsCommandMsg, "NetRunAheadMetricsCommandMsg")		
-public:
-	NetRunAheadMetricsCommandMsg();
-	//virtual ~NetRunAheadMetricsCommandMsg();
-
-	Real getAverageLatency();
-	void setAverageLatency(Real avgLat);
-	Int  getAverageFps();
-	void setAverageFps(Int fps);
-
-protected:
-	Real m_averageLatency;
-	Int  m_averageFps;
-};
-
-//-----------------------------------------------------------------------------
-class NetRunAheadCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetRunAheadCommandMsg, "NetRunAheadCommandMsg")		
-public:
-	NetRunAheadCommandMsg();
-	//virtual ~NetRunAheadCommandMsg();
-
-	UnsignedShort getRunAhead();
-	void setRunAhead(UnsignedShort runAhead);
-
-	UnsignedByte getFrameRate();
-	void setFrameRate(UnsignedByte frameRate);
-
-protected:
-	UnsignedShort m_runAhead;
-	UnsignedByte m_frameRate;
-};
-
-//-----------------------------------------------------------------------------
-class NetDestroyPlayerCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDestroyPlayerCommandMsg, "NetDestroyPlayerCommandMsg")		
-public:
-	NetDestroyPlayerCommandMsg();
-	//virtual ~NetDestroyPlayerCommandMsg();
-
-	UnsignedInt getPlayerIndex();
-	void setPlayerIndex(UnsignedInt playerIndex);
-
-protected:
-	UnsignedInt m_playerIndex;
-};
-
-//-----------------------------------------------------------------------------
-class NetKeepAliveCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetKeepAliveCommandMsg, "NetKeepAliveCommandMsg")		
-public:
-	NetKeepAliveCommandMsg();
-	//virtual ~NetKeepAliveCommandMsg();
-};
-
-//-----------------------------------------------------------------------------
-class NetDisconnectKeepAliveCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectKeepAliveCommandMsg, "NetDisconnectKeepAliveCommandMsg")		
-public:
-	NetDisconnectKeepAliveCommandMsg();
-	//virtual ~NetDisconnectKeepAliveCommandMsg();
-};
-
-//-----------------------------------------------------------------------------
-class NetDisconnectPlayerCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectPlayerCommandMsg, "NetDisconnectPlayerCommandMsg")		
-public:
-	NetDisconnectPlayerCommandMsg();
-	//virtual ~NetDisconnectPlayerCommandMsg();
-
-	UnsignedByte getDisconnectSlot();
-	void setDisconnectSlot(UnsignedByte slot);
-
-	UnsignedInt getDisconnectFrame();
-	void setDisconnectFrame(UnsignedInt frame);
-
-protected:
-	UnsignedByte m_disconnectSlot;
-	UnsignedInt m_disconnectFrame;
-};
-
-//-----------------------------------------------------------------------------
-class NetPacketRouterQueryCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetPacketRouterQueryCommandMsg, "NetPacketRouterQueryCommandMsg")		
-public:
-	NetPacketRouterQueryCommandMsg();
-	//virtual ~NetPacketRouterQueryCommandMsg();
-};
-
-//-----------------------------------------------------------------------------
-class NetPacketRouterAckCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetPacketRouterAckCommandMsg, "NetPacketRouterAckCommandMsg")		
-public:
-	NetPacketRouterAckCommandMsg();
-	//virtual ~NetPacketRouterAckCommandMsg();
-};
-
-//-----------------------------------------------------------------------------
-class NetDisconnectChatCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectChatCommandMsg, "NetDisconnectChatCommandMsg")		
-public:
-	NetDisconnectChatCommandMsg();
-	//virtual ~NetDisconnectChatCommandMsg();
-
-	UnicodeString getText();
-	void setText(UnicodeString text);
-
-protected:
-	UnicodeString m_text;
-};
-
-//-----------------------------------------------------------------------------
-class NetChatCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetChatCommandMsg, "NetChatCommandMsg")		
-public:
-	NetChatCommandMsg();
-	//virtual ~NetChatCommandMsg();
-
-	UnicodeString getText();
-	void setText(UnicodeString text);
-
-	Int getPlayerMask( void );
-	void setPlayerMask( Int playerMask );
-
-protected:
-	UnicodeString m_text;
-	Int m_playerMask;
-};
-
-//-----------------------------------------------------------------------------
-class NetDisconnectVoteCommandMsg : public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectVoteCommandMsg, "NetDisconnectVoteCommandMsg")		
-public:
-	NetDisconnectVoteCommandMsg();
-	//virtual ~NetDisconnectVoteCommandMsg();
-
-	UnsignedByte getSlot();
-	void setSlot(UnsignedByte slot);
-
-	UnsignedInt getVoteFrame();
-	void setVoteFrame(UnsignedInt voteFrame);
-
-protected:
-	UnsignedByte m_slot;
-	UnsignedInt m_voteFrame;
-};
-
-//-----------------------------------------------------------------------------
-class NetProgressCommandMsg: public NetCommandMsg 
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetProgressCommandMsg, "NetProgressCommandMsg")		
-public:
-	NetProgressCommandMsg( void );
-	//virtual ~NetProgressCommandMsg( void );
-		
-	UnsignedByte getPercentage();
-	void setPercentage( UnsignedByte percent );
-protected:
-	UnsignedByte m_percent;
-};
-
-//-----------------------------------------------------------------------------
-class NetWrapperCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetWrapperCommandMsg, "NetWrapperCommandMsg")		
-public:
-	NetWrapperCommandMsg( void );
-	//virtual ~NetWrapperCommandMsg();
-
-	UnsignedByte * getData();
-	void setData(UnsignedByte *data, UnsignedInt dataLength);
-	
-	UnsignedInt getChunkNumber();
-	void setChunkNumber(UnsignedInt chunkNumber);
-
-	UnsignedInt getNumChunks();
-	void setNumChunks(UnsignedInt numChunks);
-
-	UnsignedInt getDataLength();
-
-	UnsignedInt getTotalDataLength();
-	void setTotalDataLength(UnsignedInt totalDataLength);
-
-	UnsignedInt getDataOffset();
-	void setDataOffset(UnsignedInt offset);
-
-	UnsignedShort getWrappedCommandID();
-	void setWrappedCommandID(UnsignedShort wrappedCommandID);
-
-private:
-	UnsignedByte *m_data;
-	// using UnsignedInt's so we can send around files of effectively unlimited size easily
-	UnsignedInt m_dataLength;
-	UnsignedInt m_dataOffset;
-	UnsignedInt m_totalDataLength;
-	UnsignedInt m_chunkNumber;
-	UnsignedInt m_numChunks;
-	UnsignedShort m_wrappedCommandID;
-};
-
-//-----------------------------------------------------------------------------
-class NetFileCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFileCommandMsg, "NetFileCommandMsg")		
-public:
-	NetFileCommandMsg();
-	//virtual ~NetFileCommandMsg();
-
-	AsciiString getRealFilename();
-	void setRealFilename(AsciiString filename);
-
-	AsciiString getPortableFilename() { return m_portableFilename; }
-	void setPortableFilename(AsciiString filename) { m_portableFilename = filename; }
-
-	UnsignedInt getFileLength();
-
-	UnsignedByte * getFileData();
-	void setFileData(UnsignedByte *data, UnsignedInt dataLength);
-
-protected:
-	AsciiString m_portableFilename;
-
-	UnsignedByte *m_data;
-	UnsignedInt m_dataLength;
-};
-
-//-----------------------------------------------------------------------------
-class NetFileAnnounceCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFileAnnounceCommandMsg, "NetFileAnnounceCommandMsg")		
-public:
-	NetFileAnnounceCommandMsg();
-	//virtual ~NetFileAnnounceCommandMsg();
-
-	AsciiString getRealFilename();
-	void setRealFilename(AsciiString filename);
-
-	AsciiString getPortableFilename() { return m_portableFilename; }
-	void setPortableFilename(AsciiString filename) { m_portableFilename = filename; }
-
-	UnsignedShort getFileID();
-	void setFileID(UnsignedShort fileID);
-
-	UnsignedByte getPlayerMask(void);
-	void setPlayerMask(UnsignedByte playerMask);
-
-protected:
-	AsciiString m_portableFilename;
-	UnsignedShort m_fileID;
-	UnsignedByte m_playerMask;
-};
-
-//-----------------------------------------------------------------------------
-class NetFileProgressCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFileProgressCommandMsg, "NetFileProgressCommandMsg")		
-public:
-	NetFileProgressCommandMsg();
-	//virtual ~NetFileProgressCommandMsg();
-
-	UnsignedShort getFileID();
-	void setFileID(UnsignedShort val);
-
-	Int getProgress();
-	void setProgress(Int val);
-
-protected:
-	UnsignedShort m_fileID;
-	Int m_progress;
-};
-
-//-----------------------------------------------------------------------------
-class NetDisconnectFrameCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectFrameCommandMsg, "NetDisconnectFrameCommandMsg")
-public:
-	NetDisconnectFrameCommandMsg();
-
-	UnsignedInt getDisconnectFrame();
-	void setDisconnectFrame(UnsignedInt disconnectFrame);
-
-protected:
-	UnsignedInt m_disconnectFrame;
-};
-
-//-----------------------------------------------------------------------------
-class NetDisconnectScreenOffCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetDisconnectScreenOffCommandMsg, "NetDisconnectScreenOffCommandMsg")
-public:
-	NetDisconnectScreenOffCommandMsg();
-
-	UnsignedInt getNewFrame();
-	void setNewFrame(UnsignedInt newFrame);
-
-protected:
-	UnsignedInt m_newFrame;
-};
-
-//-----------------------------------------------------------------------------
-class NetFrameResendRequestCommandMsg : public NetCommandMsg
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetFrameResendRequestCommandMsg, "NetFrameResendRequestCommandMsg")
-public:
-	NetFrameResendRequestCommandMsg();
-	
-	UnsignedInt getFrameToResend();
-	void setFrameToResend(UnsignedInt frame);
-	
-protected:
-	UnsignedInt m_frameToResend;	
-};
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h
deleted file mode 100644
index e2ac808c52f..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __NETCOMMANDREF_H
-#define __NETCOMMANDREF_H
-
-#include "GameNetwork/NetCommandMsg.h"
-#include "Common/GameMemory.h"
-
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
-//	#define DEBUG_NETCOMMANDREF
-#endif
-
-#ifdef DEBUG_NETCOMMANDREF
-#define NEW_NETCOMMANDREF(msg) newInstance(NetCommandRef)(msg, __FILE__, __LINE__)
-#else
-#define NEW_NETCOMMANDREF(msg) newInstance(NetCommandRef)(msg)
-#endif
- 
-
-class NetCommandRef : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandRef, "NetCommandRef")		
-public:
-#ifdef DEBUG_NETCOMMANDREF
-	NetCommandRef(NetCommandMsg *msg, char *filename, int line);
-#else
-	NetCommandRef(NetCommandMsg *msg);
-#endif
-	//~NetCommandRef();
-
-	NetCommandMsg *getCommand();
-	NetCommandRef *getNext();
-	NetCommandRef *getPrev();
-	void setNext(NetCommandRef *next);
-	void setPrev(NetCommandRef *prev);
-
-	void setRelay(UnsignedByte relay);
-	UnsignedByte getRelay() const;
-
-	time_t getTimeLastSent() const;
-	void setTimeLastSent(time_t timeLastSent);
-
-protected:
-	NetCommandMsg *m_msg;
-	NetCommandRef *m_next;
-	NetCommandRef *m_prev;
-	UnsignedByte m_relay; ///< Need this in the command reference since the relay value will be different depending on where this particular reference is being sent.
-	time_t m_timeLastSent;
-
-#ifdef DEBUG_NETCOMMANDREF
-	UnsignedInt m_id;
-#endif
-};
-
-/**
- * Return the command message.
- */
-inline NetCommandMsg * NetCommandRef::getCommand() 
-{
-	return m_msg;
-}
-
-/**
- * Return the next command ref in the list.
- */
-inline NetCommandRef * NetCommandRef::getNext() 
-{
-	return m_next;
-}
-
-/**
- * Return the previous command ref in the list.
- */
-inline NetCommandRef * NetCommandRef::getPrev() 
-{
-	return m_prev;
-}
-
-/**
- * Set the next command ref in the list.
- */
-inline void NetCommandRef::setNext(NetCommandRef *next) 
-{
-	m_next = next;
-}
-
-/**
- * Set the previous command ref in the list.
- */
-inline void NetCommandRef::setPrev(NetCommandRef *prev) 
-{
-	m_prev = prev;
-}
-
-/**
- * Return the time for the last time this command was sent from this reference.
- */
-inline time_t NetCommandRef::getTimeLastSent() const
-{
-	return m_timeLastSent;
-}
-
-/**
- * Set the time for the last time this command was sent from this reference.
- */
-inline void NetCommandRef::setTimeLastSent(time_t timeLastSent) 
-{
-	m_timeLastSent = timeLastSent;
-}
-
-/**
- * Set the send relay for this reference of the command.
- */
-inline void NetCommandRef::setRelay(UnsignedByte relay) 
-{
-	m_relay = relay;
-}
-
-/**
- * Return the send relay for this refreence of the command.
- */
-inline UnsignedByte NetCommandRef::getRelay() const
-{
-	return m_relay;
-}
-
-#endif // #ifndef __NETCOMMANDREF_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h
deleted file mode 100644
index c650a3203b7..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-////// NetCommandWrapperList.h ////////////////////////////////
-// Bryan Cleveland
-
-#pragma once
-
-#ifndef __NETCOMMANDWRAPPERLIST_H
-#define __NETCOMMANDWRAPPERLIST_H
-
-#include "GameNetwork/NetCommandList.h"
-
-class NetCommandWrapperListNode : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandWrapperListNode, "NetCommandWrapperListNode")		
-public:
-	NetCommandWrapperListNode(NetWrapperCommandMsg *msg);
-	//virtual ~NetCommandWrapperListNode();
-
-	Bool isComplete();
-	UnsignedShort getCommandID();
-	UnsignedInt getRawDataLength();
-	void copyChunkData(NetWrapperCommandMsg *msg);
-	UnsignedByte * getRawData();
-
-	Int getPercentComplete(void);
-
-	NetCommandWrapperListNode *m_next;
-
-protected:
-	UnsignedShort m_commandID;
-	UnsignedByte *m_data;
-	UnsignedInt m_dataLength;
-	Bool *m_chunksPresent;
-	UnsignedInt m_numChunks;
-	UnsignedInt m_numChunksPresent;
-
-};
-
-class NetCommandWrapperList : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetCommandWrapperList, "NetCommandWrapperList")		
-public:
-	NetCommandWrapperList();
-	//virtual ~NetCommandWrapperList();
-
-	void init();
-	void reset();
-
-	void processWrapper(NetCommandRef *ref);
-	NetCommandList * getReadyCommands();
-
-	Int getPercentComplete(UnsignedShort wrappedCommandID);
-
-protected:
-	void removeFromList(NetCommandWrapperListNode *node);
-
-	NetCommandWrapperListNode *m_list;
-};
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h
deleted file mode 100644
index 3c3307279df..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/*
-Ok, how this should have been done is to make each of the command types
-have a bitmask telling which command message header information
-each command type required.  That would make finding out the size of
-a particular command easier to find, without so much repetitious code.
-We would still need to have a separate function for each command type
-for the data, but at least that wouldn't be repeating code, that would
-be specialized code.
-*/
-
-
-
-#pragma once
-
-#ifndef __NETPACKET_H
-#define __NETPACKET_H
-
-#include "NetworkDefs.h"
-#include "GameNetwork/NetCommandList.h"
-#include "Common/MessageStream.h"
-#include "Common/GameMemory.h"
-
-class NetPacket;
-
-typedef std::list<NetPacket *> NetPacketList;
-typedef std::list<NetPacket *>::iterator NetPacketListIter;
-
-class NetPacket : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(NetPacket, "NetPacket")		
-public:
-	NetPacket();
-	NetPacket(TransportMessage *msg);
-	//virtual ~NetPacket();
-
-	void init();
-	void reset();
-	void setAddress(Int addr, Int port);
-	Bool addCommand(NetCommandRef *msg);
-	Int getNumCommands();
-
-	NetCommandList *getCommandList();
-
-	static NetCommandRef * ConstructNetCommandMsgFromRawData(UnsignedByte *data, UnsignedShort dataLength);
-	static NetPacketList ConstructBigCommandPacketList(NetCommandRef *ref);
-
-	UnsignedByte *getData();
-	Int getLength();
-	UnsignedInt getAddr();
-	UnsignedShort getPort();
-
-protected:
-	static UnsignedInt GetBufferSizeNeededForCommand(NetCommandMsg *msg);
-	static void FillBufferWithCommand(UnsignedByte *buffer, NetCommandRef *msg);
-
-	// These functions return the size of the command without any compression, repetition, etc.
-	// i.e. All of the required fields are taken into account when returning the size.
-	static UnsignedInt GetGameCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetAckCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetFrameCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetPlayerLeaveCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetRunAheadMetricsCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetRunAheadCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDestroyPlayerCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetKeepAliveCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDisconnectKeepAliveCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDisconnectPlayerCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetPacketRouterQueryCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetPacketRouterAckCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDisconnectChatCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDisconnectVoteCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetChatCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetProgressMessageSize(NetCommandMsg *msg);
-	static UnsignedInt GetLoadCompleteMessageSize(NetCommandMsg *msg);
-	static UnsignedInt GetTimeOutGameStartMessageSize(NetCommandMsg *msg);
-	static UnsignedInt GetWrapperCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetFileCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetFileAnnounceCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetFileProgressCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDisconnectFrameCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetDisconnectScreenOffCommandSize(NetCommandMsg *msg);
-	static UnsignedInt GetFrameResendRequestCommandSize(NetCommandMsg *msg);
-
-	static void FillBufferWithGameCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithAckCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithKeepAliveCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDisconnectKeepAliveCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithPacketRouterQueryCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithPacketRouterAckCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithProgressMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithLoadCompleteMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithTimeOutGameStartMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithFileMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithFileProgressMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithFileAnnounceMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDisconnectFrameMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithDisconnectScreenOffMessage(UnsignedByte *buffer, NetCommandRef *msg);
-	static void FillBufferWithFrameResendRequestMessage(UnsignedByte *buffer, NetCommandRef *msg);
-
-	Bool addFrameCommand(NetCommandRef *msg);
-	Bool isRoomForFrameMessage(NetCommandRef *msg);
-	Bool addAckCommand(NetCommandRef *msg, UnsignedShort commandID, UnsignedByte originalPlayerID);
-	Bool addAckStage1Command(NetCommandRef *msg);
-	Bool addAckStage2Command(NetCommandRef *msg);
-	Bool addAckBothCommand(NetCommandRef *msg);
-	Bool isRoomForAckMessage(NetCommandRef *msg);
-	Bool addGameCommand(NetCommandRef *msg);
-	Bool isRoomForGameMessage(NetCommandRef *msg, GameMessage *gmsg);
-	Bool addPlayerLeaveCommand(NetCommandRef *msg);
-	Bool isRoomForPlayerLeaveMessage(NetCommandRef *msg);
-	Bool addRunAheadMetricsCommand(NetCommandRef *msg);
-	Bool isRoomForRunAheadMetricsMessage(NetCommandRef *msg);
-	Bool addRunAheadCommand(NetCommandRef *msg);
-	Bool isRoomForRunAheadMessage(NetCommandRef *msg);
-	Bool addDestroyPlayerCommand(NetCommandRef *msg);
-	Bool isRoomForDestroyPlayerMessage(NetCommandRef *msg);
-	Bool addKeepAliveCommand(NetCommandRef *msg);
-	Bool isRoomForKeepAliveMessage(NetCommandRef *msg);
-	Bool addDisconnectKeepAliveCommand(NetCommandRef *msg);
-	Bool isRoomForDisconnectKeepAliveMessage(NetCommandRef *msg);
-	Bool addDisconnectPlayerCommand(NetCommandRef *msg);
-	Bool isRoomForDisconnectPlayerMessage(NetCommandRef *msg);
-	Bool addPacketRouterQueryCommand(NetCommandRef *msg);
-	Bool isRoomForPacketRouterQueryMessage(NetCommandRef *msg);
-	Bool addPacketRouterAckCommand(NetCommandRef *msg);
-	Bool isRoomForPacketRouterAckMessage(NetCommandRef *msg);
-	Bool addDisconnectChatCommand(NetCommandRef *msg);
-	Bool isRoomForDisconnectChatMessage(NetCommandRef *msg);
-	Bool addChatCommand(NetCommandRef *msg);
-	Bool isRoomForChatMessage(NetCommandRef *msg);
-	Bool addDisconnectVoteCommand(NetCommandRef *msg);
-	Bool isRoomForDisconnectVoteMessage(NetCommandRef *msg);
-	Bool addProgressMessage( NetCommandRef *msg );
-	Bool isRoomForProgressMessage( NetCommandRef *msg );
-	Bool addLoadCompleteMessage( NetCommandRef *msg );
-	Bool isRoomForLoadCompleteMessage( NetCommandRef *msg );
-	Bool addTimeOutGameStartMessage( NetCommandRef *msg );
-	Bool isRoomForTimeOutGameStartMessage( NetCommandRef *msg );
-	Bool addWrapperCommand(NetCommandRef *msg);
-	Bool isRoomForWrapperMessage(NetCommandRef *msg);
-	Bool addFileCommand(NetCommandRef *msg);
-	Bool isRoomForFileMessage(NetCommandRef *msg);
-	Bool addFileAnnounceCommand(NetCommandRef *msg);
-	Bool isRoomForFileAnnounceMessage(NetCommandRef *msg);
-	Bool addFileProgressCommand(NetCommandRef *msg);
-	Bool isRoomForFileProgressMessage(NetCommandRef *msg);
-	Bool addDisconnectFrameCommand(NetCommandRef *msg);
-	Bool isRoomForDisconnectFrameMessage(NetCommandRef *msg);
-	Bool addDisconnectScreenOffCommand(NetCommandRef *msg);
-	Bool isRoomForDisconnectScreenOffMessage(NetCommandRef *msg);
-	Bool addFrameResendRequestCommand(NetCommandRef *msg);
-	Bool isRoomForFrameResendRequestMessage(NetCommandRef *msg);
-
-	Bool isAckRepeat(NetCommandRef *msg);
-	Bool isAckBothRepeat(NetCommandRef *msg);
-	Bool isAckStage1Repeat(NetCommandRef *msg);
-	Bool isAckStage2Repeat(NetCommandRef *msg);
-	Bool isFrameRepeat(NetCommandRef *msg);
-
-	static NetCommandMsg * readGameMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readAckBothMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readAckStage1Message(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readAckStage2Message(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readFrameMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readPlayerLeaveMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readRunAheadMetricsMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readRunAheadMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDestroyPlayerMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readKeepAliveMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDisconnectKeepAliveMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDisconnectPlayerMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readPacketRouterQueryMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readPacketRouterAckMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDisconnectChatMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDisconnectVoteMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readChatMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readProgressMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readLoadCompleteMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readTimeOutGameStartMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readWrapperMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readFileMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readFileAnnounceMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readFileProgressMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDisconnectFrameMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readDisconnectScreenOffMessage(UnsignedByte *data, Int &i);
-	static NetCommandMsg * readFrameResendRequestMessage(UnsignedByte *data, Int &i);
-
-	void writeGameMessageArgumentToPacket(GameMessageArgumentDataType type, GameMessageArgumentType arg);
-	static void readGameMessageArgumentFromPacket(GameMessageArgumentDataType type, NetGameCommandMsg *msg, UnsignedByte *data, Int &i);
-
-	void dumpPacketToLog();
-
-protected:
-	UnsignedByte		m_packet[MAX_PACKET_SIZE];
-	Int							m_packetLen;
-	UnsignedInt			m_addr;
-	Int							m_numCommands;
-	NetCommandRef*	m_lastCommand;
-	UnsignedInt			m_lastFrame;
-	UnsignedShort		m_port;
-	UnsignedShort		m_lastCommandID;
-	UnsignedByte		m_lastPlayerID;
-	UnsignedByte		m_lastCommandType;
-	UnsignedByte		m_lastRelay;
-};
-
-#endif // __NETPACKET_H
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
deleted file mode 100644
index 9bd5ccd14bc..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __NETWORKDEFS_H
-#define __NETWORKDEFS_H
-
-#include "Lib/BaseType.h"
-#include "Common/MessageStream.h"
-
-static const Int WOL_NAME_LEN = 64;
-
-/// Max number of commands per frame
-static const Int MAX_COMMANDS = 256;
-
-extern Int MAX_FRAMES_AHEAD;
-extern Int MIN_RUNAHEAD;
-
-// FRAME_DATA_LENGTH needs to be MAX_FRAMES_AHEAD+1 because a player on a different
-// computer can send commands for a frame that is one beyond twice the max runahead.
-extern Int FRAME_DATA_LENGTH;
-extern Int FRAMES_TO_KEEP;
-
-// This is the connection numbering: 1-8 are for players, 9 is a broadcast con.
-enum ConnectionNumbers CPP_11(: Int)
-{
-	MAX_PLAYER = 7,			// The index of the highest possible player number.  This is 0 based, so the most players allowed in a game is MAX_PLAYER+1.
-	NUM_CONNECTIONS
-};
-
-static const Int MAX_SLOTS = MAX_PLAYER+1;
-
-// UDP (8 bytes) + IP header (28 bytes) = 36 bytes total.  We want a total packet size of 512, so 512 - 36 = 476
-static const Int MAX_PACKET_SIZE = 476;
-
-/**
- * Command packet - contains frame #, total # of commands, and each command.  This is what gets sent
- * to each player every frame
- */
-#define MAX_MESSAGE_LEN 1024
-#define MAX_MESSAGES 128
-static const Int numCommandsPerCommandPacket = (MAX_MESSAGE_LEN - sizeof(UnsignedInt) - sizeof(UnsignedShort))/sizeof(GameMessage);
-#pragma pack(push, 1)
-struct CommandPacket
-{
-	UnsignedInt m_frame;
-	UnsignedShort m_numCommands;
-	unsigned char m_commands[numCommandsPerCommandPacket * sizeof(GameMessage)];
-};
-#pragma pack(pop)
-
-#define MAX_TRANSPORT_STATISTICS_SECONDS 30
-
-#pragma pack(push, 1)
-struct TransportMessageHeader
-{
-	UnsignedInt crc;											///< packet-level CRC (must be first in packet)
-	UnsignedShort magic;									///< Magic number identifying Generals packets
-//	Int id;
-//	NetMessageFlags flags;
-};
-#pragma pack(pop)
-
-/**
- * Transport message - encapsulating info kept by the transport layer about each
- * packet.  These structs make up the in/out buffers at the transport layer.
- */
-#pragma pack(push, 1)
-struct TransportMessage
-{
-	TransportMessageHeader header;
-	UnsignedByte data[MAX_MESSAGE_LEN];
-	Int length;
-	UnsignedInt addr;
-	UnsignedShort port;
-};
-#pragma pack(pop)
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-#pragma pack(push, 1)
-struct DelayedTransportMessage
-{
-	UnsignedInt deliveryTime;
-	TransportMessage message;
-};
-#pragma pack(pop)
-#endif
-
-/**
- * Message types
- */
-enum NetMessageFlag CPP_11(: Int) {
-	MSG_ACK = 1,
-	MSG_NEEDACK = 2,
-	MSG_SEQUENCED = 4,
-	MSG_SUPERCEDING = 8
-};
-typedef UnsignedByte NetMessageFlags;
-
-enum NetCommandType CPP_11(: Int) {
-	NETCOMMANDTYPE_UNKNOWN = -1,
-	NETCOMMANDTYPE_ACKBOTH = 0,
-	NETCOMMANDTYPE_ACKSTAGE1,
-	NETCOMMANDTYPE_ACKSTAGE2,
-	NETCOMMANDTYPE_FRAMEINFO,
-	NETCOMMANDTYPE_GAMECOMMAND,
-	NETCOMMANDTYPE_PLAYERLEAVE,
-	NETCOMMANDTYPE_RUNAHEADMETRICS,
-	NETCOMMANDTYPE_RUNAHEAD,
-	NETCOMMANDTYPE_DESTROYPLAYER,
-	NETCOMMANDTYPE_KEEPALIVE,
-	NETCOMMANDTYPE_DISCONNECTCHAT,
-	NETCOMMANDTYPE_CHAT,
-	NETCOMMANDTYPE_MANGLERQUERY,
-	NETCOMMANDTYPE_MANGLERRESPONSE,
-	NETCOMMANDTYPE_PROGRESS,
-	NETCOMMANDTYPE_LOADCOMPLETE,
-	NETCOMMANDTYPE_TIMEOUTSTART,
-	NETCOMMANDTYPE_WRAPPER,							// A wrapper command that holds a command thats too big to fit in a single packet.
-	NETCOMMANDTYPE_FILE,
-	NETCOMMANDTYPE_FILEANNOUNCE,
-	NETCOMMANDTYPE_FILEPROGRESS,
-	NETCOMMANDTYPE_FRAMERESENDREQUEST,
-
-	// Disconnect menu command section.
-	NETCOMMANDTYPE_DISCONNECTSTART,
-	NETCOMMANDTYPE_DISCONNECTKEEPALIVE,
-	NETCOMMANDTYPE_DISCONNECTPLAYER,
-	NETCOMMANDTYPE_PACKETROUTERQUERY,
-	NETCOMMANDTYPE_PACKETROUTERACK,
-	NETCOMMANDTYPE_DISCONNECTVOTE,
-	NETCOMMANDTYPE_DISCONNECTFRAME,
-	NETCOMMANDTYPE_DISCONNECTSCREENOFF,
-	NETCOMMANDTYPE_DISCONNECTEND,
-
-	NETCOMMANDTYPE_MAX
-};
-
-enum NetLocalStatus CPP_11(: Int) {
-	NETLOCALSTATUS_PREGAME = 0,
-	NETLOCALSTATUS_INGAME,
-	NETLOCALSTATUS_LEAVING,
-	NETLOCALSTATUS_LEFT,
-	NETLOCALSTATUS_POSTGAME
-};
-
-enum PlayerLeaveCode CPP_11(: Int) {
-	PLAYERLEAVECODE_CLIENT = 0,
-	PLAYERLEAVECODE_LOCAL,
-	PLAYERLEAVECODE_PACKETROUTER,
-	PLAYERLEAVECODE_UNKNOWN
-};
-
-// Magic number for identifying a Generals packet.
-static const UnsignedShort GENERALS_MAGIC_NUMBER = 0xF00D;
-
-// The number of fps history entries.
-//static const Int NETWORK_FPS_HISTORY_LENGTH = 30;
-
-// The number of ping history entries.
-//static const Int NETWORK_LATENCY_HISTORY_LENGTH = 200;
-
-// The number of miliseconds between run ahead metrics things
-//static const Int NETWORK_RUN_AHEAD_METRICS_TIME = 5000;
-
-// The number of cushion values to keep.
-//static const Int NETWORK_CUSHION_HISTORY_LENGTH = 10;
-
-// The amount of slack in the run ahead value.  This is the percentage of the calculated run ahead that is added.
-//static const Int NETWORK_RUN_AHEAD_SLACK = 20;
-
-// The number of seconds between when the connections to each player send a keep-alive packet.
-// This should be less than 30 just to keep firewall ports open.
-//static const Int NETWORK_KEEPALIVE_DELAY = 20;
-
-// The number of milliseconds between when the game gets stuck on a frame for a network stall and
-// and when the disconnect dialog comes up.
-//static const Int NETWORK_DISCONNECT_TIME = 5000;
-
-// The number of miliseconds between when a player's last disconnect keep alive command
-// was recieved and when they are considered disconnected from the game.
-//static const Int NETWORK_PLAYER_TIMEOUT_TIME = 60000;
-
-// The base port number used for the transport socket.  A players slot number is added to this
-// value to get their actual port number.
-static const Int NETWORK_BASE_PORT_NUMBER = 8088;
-
-// the singleton
-class NetworkInterface;
-extern NetworkInterface *TheNetwork;
-
-#define PRINTF_IP_AS_4_INTS(ip) ((ip) >> 24) & 0xff, ((ip) >> 16) & 0xff, ((ip) >> 8 ) & 0xff, (ip) & 0xff
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h
deleted file mode 100644
index 07983545cfb..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// NetworkInterface.h ///////////////////////////////////////////////////////////////
-// Network singleton class - defines interface to Network methods
-// Author: Matthew D. Campbell, July 2001
-
-#pragma once
-
-#ifndef _NETWORK_INTERFACE_H_
-#define _NETWORK_INTERFACE_H_
-
-#include "Common/MessageStream.h"
-#include "GameNetwork/ConnectionManager.h"
-#include "GameNetwork/User.h"
-#include "GameNetwork/NetworkDefs.h"
-
-// forward declarations
-
-struct CommandPacket;
-class GameMessage;
-class GameInfo;
-
-void ClearCommandPacket(UnsignedInt frame);										///< ClearCommandPacket clears the command packet at the start of the frame.
-CommandPacket *GetCommandPacket(void);											///< TheNetwork calls GetCommandPacket to get commands to send.
-
-
-
-/**
- * Interface definition for the Network.
- */
-class NetworkInterface : public SubsystemInterface
-{
-protected:
-
-public:
-	virtual ~NetworkInterface() { };
-
-	static NetworkInterface * createNetwork( void );
-
-	//---------------------------------------------------------------------------------------
-	// SubsystemInterface functions
-	virtual void init( void ) = 0;																		///< Initialize the network
-	virtual void reset( void ) = 0;																		///< Re-initialize the network
-	virtual void update( void ) = 0;																	///< Updates the network
-	virtual void liteupdate( void ) = 0;															///< does a lightweight update for passing messages around.
-
-	virtual void setLocalAddress(UnsignedInt ip, UnsignedInt port) = 0;	///< Tell the network what local ip and port to bind to.
-	virtual Bool isFrameDataReady( void ) = 0;												///< Are the commands for the next frame available?
-	virtual void parseUserList( const GameInfo *game ) = 0;						///< Parse a userlist, creating connections
-	virtual void startGame(void) = 0;																	///< Sets the network game frame counter to -1
-	virtual UnsignedInt getRunAhead(void) = 0;												///< Get the current RunAhead value
-	virtual UnsignedInt getFrameRate(void) = 0;												///< Get the current allowed frame rate.
-	virtual UnsignedInt getPacketArrivalCushion(void) = 0;						///< Get the smallest packet arrival cushion since this was last called.
-
-	// Chat functions
-	virtual void sendChat(UnicodeString text, Int playerMask) = 0;		///< Send a chat line using the normal system.
-	virtual void sendDisconnectChat(UnicodeString text) = 0;					///< Send a chat line using the disconnect manager.
-
-	virtual void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID) = 0;
-	virtual UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask) = 0;
-	virtual Int getFileTransferProgress(Int playerID, AsciiString path) = 0;
-	virtual Bool areAllQueuesEmpty(void) = 0;
-
-	virtual void quitGame() = 0;																			///< Quit the game right now.
-	
-	virtual void selfDestructPlayer(Int index) = 0;
-
-	virtual void voteForPlayerDisconnect(Int slot) = 0;								///< register a vote towards this player's disconnect.
-	virtual Bool isPacketRouter( void ) = 0;
-
-	// Bandwidth metrics
-	virtual Real getIncomingBytesPerSecond( void ) = 0;
-	virtual Real getIncomingPacketsPerSecond( void ) = 0;
-	virtual Real getOutgoingBytesPerSecond( void ) = 0;
-	virtual Real getOutgoingPacketsPerSecond( void ) = 0;
-	virtual Real getUnknownBytesPerSecond( void ) = 0;
-	virtual Real getUnknownPacketsPerSecond( void ) = 0;
-
-	virtual void updateLoadProgress( Int percent ) = 0;
-	virtual void loadProgressComplete( void ) = 0;
-	virtual void sendTimeOutGameStart( void ) = 0;
-	virtual UnsignedInt getLocalPlayerID()= 0;
-	virtual UnicodeString getPlayerName(Int playerNum)= 0;
-	virtual Int getNumPlayers() = 0;
-
-	virtual Int getAverageFPS() = 0;
-	virtual Int getSlotAverageFPS(Int slot) = 0;
-
-	virtual void attachTransport(Transport *transport) = 0;
-	virtual void initTransport() = 0;
-	virtual Bool sawCRCMismatch() = 0;
-	virtual void setSawCRCMismatch() = 0;
-
-	virtual Bool isPlayerConnected(Int playerID) = 0;
-
-	virtual void notifyOthersOfCurrentFrame() = 0;					///< Tells all the other players what frame we are on.
-	virtual void notifyOthersOfNewFrame(UnsignedInt frame) = 0;							///< Tells all the other players that we are on a new frame.
-
-	virtual Int  getExecutionFrame() = 0;																			///< Returns the next valid frame for simultaneous command execution.
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	virtual void toggleNetworkOn( void ) = 0;													///< toggle whether or not to send network traffic.
-#endif
-
-	// For disconnect blame assignment
-	virtual UnsignedInt getPingFrame() = 0;
-	virtual Int getPingsSent() = 0;
-	virtual Int getPingsRecieved() = 0;
-};
-
-
-/**
- * ResolveIP turns a string ("games2.westwood.com", or "192.168.0.1") into
- * a 32-bit unsigned integer.
- */
-UnsignedInt ResolveIP(AsciiString host);
-
-#endif // _NETWORK_INTERFACE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h
deleted file mode 100644
index d59ae6028e7..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: RankPointValue.h /////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-//	created:	Sep 2002
-//
-//	Filename: 	RankPointValue.h
-//
-//	author:		Chris Huybregts
-//	
-//	purpose:	
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __RANK_POINT_VALUE_H_
-#define __RANK_POINT_VALUE_H_
-
-//-----------------------------------------------------------------------------
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// USER INCLUDES //////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-class Image;
-class PSPlayerStats;
-//-----------------------------------------------------------------------------
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-enum
-{
-	RANK_PRIVATE = 0,
-	RANK_CORPORAL,
-	RANK_SERGEANT,
-	RANK_LIEUTENANT,
-	RANK_CAPTAIN,
-	RANK_MAJOR,
-	RANK_COLONEL,
-	RANK_BRIGADIER_GENERAL,
-	RANK_GENERAL,
-	RANK_COMMANDER_IN_CHIEF,
-
-	MAX_RANKS // keep last
-};
-
-struct RankPoints
-{
-RankPoints(void );
-	Int m_ranks[MAX_RANKS];
-	Real m_winMultiplier;
-	Real m_lostMultiplier;
-	Real m_hourSpentOnlineMultiplier;
-	Real m_completedSoloCampaigns;
-	Real m_disconnectMultiplier;
-};
-//-----------------------------------------------------------------------------
-// INLINING ///////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// EXTERNALS //////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-Int CalculateRank( const PSPlayerStats& stats );
-Int GetFavoriteSide( const PSPlayerStats& stats );
-const Image* LookupSmallRankImage(Int side, Int rankPoints);
-extern RankPoints *TheRankPointValues;
-
-#endif // __RANK_POINT_VALUE_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h
deleted file mode 100644
index 4a1eddb765f..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// Transport.h ///////////////////////////////////////////////////////////////
-// Transport layer - a thin layer around a UDP socket, with queues.
-// Author: Matthew D. Campbell, July 2001
-
-#pragma once
-
-#ifndef _TRANSPORT_H_
-#define _TRANSPORT_H_
-
-#include "GameNetwork/udp.h"
-#include "GameNetwork/NetworkDefs.h"
-
-/**
- * The transport layer handles the UDP socket for the game, and will packetize and
- * de-packetize multiple ACK/CommandPacket/etc packets into larger aggregates.
- */
-// we only ever allocate one of there, and it is quite large, so we really DON'T want
-// it to be a MemoryPoolObject (srj)
-class Transport //: public MemoryPoolObject
-{
-	//MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Transport, "Transport")		
-public:
-
-	Transport();
-	~Transport();
-
-	Bool init( AsciiString ip, UnsignedShort port );
-	Bool init( UnsignedInt ip, UnsignedShort port );
-	void reset( void );
-	Bool update( void );									///< Call this once a GameEngine tick, regardless of whether the frame advances.
-
-	Bool doRecv( void );		///< call this to service the receive packets
-	Bool doSend( void );		///< call this to service the send queue.
-
-	Bool queueSend(UnsignedInt addr, UnsignedShort port, const UnsignedByte *buf, Int len /*,
-		NetMessageFlags flags, Int id */);				///< Queue a packet for sending to the specified address and port.  This will be sent on the next update() call.
-
-	inline Bool allowBroadcasts(Bool val) { if (!m_udpsock) return false; return (m_udpsock->AllowBroadcasts(val))?true:false; }
-
-	// Latency insertion and packet loss
-	void setLatency( Bool val ) { m_useLatency = val; }
-	void setPacketLoss( Bool val ) { m_usePacketLoss = val; }
-
-	// Bandwidth metrics
-	Real getIncomingBytesPerSecond( void );
-	Real getIncomingPacketsPerSecond( void );
-	Real getOutgoingBytesPerSecond( void );
-	Real getOutgoingPacketsPerSecond( void );
-	Real getUnknownBytesPerSecond( void );
-	Real getUnknownPacketsPerSecond( void );
-
-	TransportMessage m_outBuffer[MAX_MESSAGES];
-	TransportMessage m_inBuffer[MAX_MESSAGES];
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	DelayedTransportMessage m_delayedInBuffer[MAX_MESSAGES];
-#endif
-
-	UnsignedShort m_port;
-private:
-	Bool m_winsockInit;
-	UDP *m_udpsock;
-
-	// Latency insertion and packet loss
-	Bool m_useLatency;
-	Bool m_usePacketLoss;
-
-	// Bandwidth metrics
-	UnsignedInt m_incomingBytes[MAX_TRANSPORT_STATISTICS_SECONDS];
-	UnsignedInt m_unknownBytes[MAX_TRANSPORT_STATISTICS_SECONDS];
-	UnsignedInt m_outgoingBytes[MAX_TRANSPORT_STATISTICS_SECONDS];
-	UnsignedInt m_incomingPackets[MAX_TRANSPORT_STATISTICS_SECONDS];
-	UnsignedInt m_unknownPackets[MAX_TRANSPORT_STATISTICS_SECONDS];
-	UnsignedInt m_outgoingPackets[MAX_TRANSPORT_STATISTICS_SECONDS];
-	Int m_statisticsSlot;
-	UnsignedInt m_lastSecond;
-
-	Bool isGeneralsPacket( TransportMessage *msg );
-};
-
-#endif // _TRANSPORT_H_
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h
deleted file mode 100644
index 2304b9cc000..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * User class used by the network.
- */
-
-#pragma once
-
-#ifndef __USER_H
-#define __USER_H
-
-#include "GameNetwork/NetworkDefs.h"
-#include "Common/UnicodeString.h"
-
-class User : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(User, "User")		
-public:
-	User() {}
-	User(UnicodeString name, UnsignedInt addr, UnsignedInt port);
-	User &operator= (const User *other);
-	Bool operator== (const User *other);
-	Bool operator!= (const User *other);
-
-	inline UnicodeString GetName() { return m_name; }
-	void setName(UnicodeString name);
-	inline UnsignedShort GetPort() { return m_port; }
-	inline UnsignedInt GetIPAddr() { return m_ipaddr; }
-	inline void SetPort(UnsignedShort port) { m_port = port; }
-	inline void SetIPAddr(UnsignedInt ipaddr) { m_ipaddr = ipaddr; }
-
-
-private:
-	UnicodeString m_name;
-	UnsignedShort m_port;
-	UnsignedInt m_ipaddr;
-};
-EMPTY_DTOR(User)
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h
deleted file mode 100644
index ac06d3ff5de..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//
-// FEBDispatch class is a template class which, when inherited from, can implement the
-// IDispatch for a COM object with a type library.
-//
-
-#ifndef _FEBDISPATCH_H__
-#define _FEBDISPATCH_H__
-
-#include <atlbase.h>
-extern CComModule _Module;
-#include <atlcom.h>
-#include <comutil.h>    // For _bstr_t.
-
-#include "oleauto.h"
-
-template <class T, class C, const IID *I>
-class FEBDispatch :
-public CComObjectRootEx<CComSingleThreadModel>,
-public CComCoClass<T>,
-public C
-{
-public:
-	
-	BEGIN_COM_MAP(T)
-		COM_INTERFACE_ENTRY(C)
-		COM_INTERFACE_ENTRY_AGGREGATE(IID_IDispatch, m_dispatch)
-	END_COM_MAP()
-		
-		FEBDispatch()
-	{
-		m_ptinfo = NULL;
-		m_dispatch = NULL;
-		
-		ITypeLib *ptlib;
-		HRESULT hr;
-		HRESULT TypeLibraryLoadResult;
-		char filename[256];
-
-		GetModuleFileName(NULL, filename, sizeof(filename));
-		_bstr_t bstr(filename);
-		
-		TypeLibraryLoadResult = LoadTypeLib(bstr, &ptlib);
-
-		DEBUG_ASSERTCRASH(TypeLibraryLoadResult == 0, ("Can't load type library for Embedded Browser"));
-		
-		if (TypeLibraryLoadResult == S_OK)
-		{
-			hr = ptlib->GetTypeInfoOfGuid(*I, &m_ptinfo);
-			ptlib->Release();
-			
-			if (hr == S_OK)
-			{
-				hr = CreateStdDispatch(static_cast<IUnknown*>(this), static_cast<C*>(this), m_ptinfo, &m_dispatch);
-				
-				m_dispatch->AddRef();
-				// Don't release the IUnknown from CreateStdDispatch without calling AddRef.
-				// It looks like CreateStdDispatch doesn't call AddRef on the IUnknown it returns.
-			}
-		}
-		
-		if ( m_dispatch == NULL )
-		{
-			DEBUG_LOG(("Error creating Dispatch for Web interface\n"));
-		}
-	}
-	
-	virtual ~FEBDispatch()
-	{
-		if (m_ptinfo)
-			m_ptinfo->Release();
-		
-		if (m_dispatch)
-			m_dispatch->Release();
-	}
-	
-	IUnknown *m_dispatch;
-
-private:
-	ITypeInfo *m_ptinfo;
-};
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
deleted file mode 100644
index 075df2e479b..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/******************************************************************************
-*
-* NAME
-*     $Archive:  $
-*
-* DESCRIPTION
-*     Web Browser
-*
-* PROGRAMMER
-*     Bryan Cleveland
-*     $Author:  $
-*
-* VERSION INFO
-*     $Revision:  $
-*     $Modtime:  $
-*
-******************************************************************************/
-
-#pragma once
-
-#ifndef __WEBBROWSER_H__
-#define __WEBBROWSER_H__
-
-#include "Common/SubsystemInterface.h"
-#include <atlbase.h>
-#include <windows.h>
-#include <Common/GameMemory.h>
-#include "EABrowserDispatch/BrowserDispatch.h"
-#include "FEBDispatch.h"
-#include <Lib/BaseType.h>
-
-class GameWindow;
-
-class WebBrowserURL : public MemoryPoolObject
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( WebBrowserURL, "WebBrowserURL" )
-
-public:
-
-	WebBrowserURL();
-	// virtual destructor prototype defined by memory pool object
-
-	const FieldParse *getFieldParse( void ) const { return m_URLFieldParseTable; }
-
-	AsciiString m_tag;
-	AsciiString m_url;
-
-	WebBrowserURL *m_next;
-
-	static const FieldParse m_URLFieldParseTable[];		///< the parse table for INI definition
-
-};
-
-
-
-class WebBrowser :
-		public FEBDispatch<WebBrowser, IBrowserDispatch, &IID_IBrowserDispatch>,
-		public SubsystemInterface
-	{
-	public:
-		void init( void );
-		void reset( void );
-		void update( void );
-
-		// Create an instance of the embedded browser for Dune Emperor.
-		virtual Bool createBrowserWindow(const char *tag, GameWindow *win) = 0;
-		virtual void closeBrowserWindow(GameWindow *win) = 0;
-
-		WebBrowserURL *makeNewURL(AsciiString tag);
-		WebBrowserURL *findURL(AsciiString tag);
-
-	protected:
-		// Protected to prevent direct construction via new, use CreateInstance() instead.
-		WebBrowser();
-		virtual ~WebBrowser();
-
-		// Protected to prevent copy and assignment
-		WebBrowser(const WebBrowser&);
-		const WebBrowser& operator=(const WebBrowser&);
-
-//		Bool RetrievePageURL(const char* page, char* url, int size);
-//		Bool RetrieveHTMLPath(char* path, int size);
-
-	protected:
-		ULONG mRefCount;
-		WebBrowserURL *m_urlList;
-
-	//---------------------------------------------------------------------------
-	// IUnknown methods
-	//---------------------------------------------------------------------------
-	protected:
-		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) IUNKNOWN_NOEXCEPT;
-		ULONG STDMETHODCALLTYPE AddRef(void) IUNKNOWN_NOEXCEPT;
-		ULONG STDMETHODCALLTYPE Release(void) IUNKNOWN_NOEXCEPT;
-
-	//---------------------------------------------------------------------------
-	// IBrowserDispatch methods
-	//---------------------------------------------------------------------------
-	public:
-		STDMETHOD(TestMethod)(Int num1);
-	};
-
-extern CComObject<WebBrowser> *TheWebBrowser;
-#endif // __WEBBROWSER_H__
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h
deleted file mode 100644
index a38b0c1c871..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-#ifndef __NETWORKUTIL_H
-#define __NETWORKUTIL_H
-
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/NetworkInterface.h"
-
-UnsignedInt AssembleIp(UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedByte d);
-UnsignedInt ResolveIP(AsciiString host);
-UnsignedShort GenerateNextCommandID();
-Bool DoesCommandRequireACommandID(NetCommandType type);
-Bool CommandRequiresAck(NetCommandMsg *msg);
-Bool CommandRequiresDirectSend(NetCommandMsg *msg);
-Bool IsCommandSynchronized(NetCommandType type);
-AsciiString GetAsciiNetCommandType(NetCommandType type);
-
-#ifdef DEBUG_LOGGING
-extern "C" {
-void dumpBufferToLog(const void *vBuf, Int len, const char *fname, Int line);
-};
-#define LOGBUFFER(buf, len) dumpBufferToLog(buf, len, __FILE__, __LINE__)
-#else
-#define LOGBUFFER(buf, len) {}
-#endif // DEBUG_LOGGING
-
-inline UnsignedInt AssembleIp(UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedByte d)
-{
-    return ((UnsignedInt)(a) << 24) |
-           ((UnsignedInt)(b) << 16) |
-           ((UnsignedInt)(c) << 8) |
-           ((UnsignedInt)(d));
-}
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h
deleted file mode 100644
index ae1628a0aee..00000000000
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef UDP_HEADER
-#define UDP_HEADER
-
-#ifdef _UNIX
-#include <errno.h>
-#endif
-
-#ifdef _WINDOWS
-#include <winsock.h>
-#include <io.h>
-//#define close _close
-//#define read  _read
-//#define write _write
-
-#else  //UNIX
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#include <limits.h>
-#endif
-
-#ifdef AIX
-#include <sys/select.h>
-#endif
-
-#include "Lib/BaseType.h"
-
-#define DEFAULT_PROTOCOL 0
-
-//#include "wlib/wstypes.h"
-//#include "wlib/wtime.h"
-
-class UDP
-{
- // DATA
- private:
-  Int       fd; 
-  UnsignedInt       myIP;
-  UnsignedShort       myPort;
-  struct       sockaddr_in  addr;
-  
- public:
-  // These defines specify a system independent way to
-  //   get error codes for socket services.
-  enum sockStat CPP_11(: Int)
-  {
-    OK           =  0,     // Everything's cool
-    UNKNOWN      = -1,     // There was an error of unknown type
-    ISCONN       = -2,     // The socket is already connected
-    INPROGRESS   = -3,     // The socket is non-blocking and the operation
-                           //   isn't done yet
-    ALREADY      = -4,     // The socket is already attempting a connection
-                           //   but isn't done yet
-    AGAIN        = -5,     // Try again.
-    ADDRINUSE    = -6,     // Address already in use
-    ADDRNOTAVAIL = -7,     // That address is not available on the remote host
-    BADF         = -8,     // Not a valid FD
-    CONNREFUSED  = -9,     // Connection was refused
-    INTR         =-10,     // Operation was interrupted
-    NOTSOCK      =-11,     // FD wasn't a socket
-    PIPE         =-12,     // That operation just made a SIGPIPE
-    WOULDBLOCK   =-13,     // That operation would block
-    INVAL        =-14,     // Invalid
-    TIMEDOUT     =-15      // Timeout
-  };
-
-// CODE
- private:
-  Int           SetBlocking(Int block);
-	
-	Int m_lastError;
-
- public:
-                   UDP();
-                  ~UDP();
-  Int           Bind(UnsignedInt IP,UnsignedShort port);
-  Int           Bind(const char *Host,UnsignedShort port);
-  Int           Write(const unsigned char *msg,UnsignedInt len,UnsignedInt IP,UnsignedShort port);
-  Int           Read(unsigned char *msg,UnsignedInt len,sockaddr_in *from);
-  sockStat         GetStatus(void);
-  void             ClearStatus(void);
-  //int              Wait(Int sec,Int usec,fd_set &returnSet);
-  //int              Wait(Int sec,Int usec,fd_set &givenSet,fd_set &returnSet);
-
-  Int             getLocalAddr(UnsignedInt &ip, UnsignedShort &port);
-  Int           getFD(void) { return(fd); }
- 
-  Int             SetInputBuffer(UnsignedInt bytes);
-  Int             SetOutputBuffer(UnsignedInt bytes);
-  int              GetInputBuffer(void);
-  int              GetOutputBuffer(void);
-	Int						AllowBroadcasts(Bool status);
-};
-
-#ifdef DEBUG_LOGGING
-AsciiString GetWSAErrorString( Int error );
-#endif
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h b/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h
index 1ecc85d85c4..f6af2534bae 100644
--- a/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h
+++ b/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h
@@ -23,11 +23,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // This file contains all the header files that shouldn't change frequently.
-// Be careful what you stick in here, because putting files that change often in here will 
+// Be careful what you stick in here, because putting files that change often in here will
 // tend to cheese people's goats.
 
-#ifndef __PRERTS_H__
-#define __PRERTS_H__
+#pragma once
 
 //-----------------------------------------------------------------------------
 // srj sez: this must come first, first, first.
@@ -36,10 +35,10 @@
 class STLSpecialAlloc;
 
 
-// We actually don't use Windows for much other than timeGetTime, but it was included in 40 
+// We actually don't use Windows for much other than timeGetTime, but it was included in 40
 // different .cpp files, so I bit the bullet and included it here.
 // PLEASE DO NOT ABUSE WINDOWS OR IT WILL BE REMOVED ENTIRELY. :-)
-//--------------------------------------------------------------------------------- System Includes 
+//--------------------------------------------------------------------------------- System Includes
 #define WIN32_LEAN_AND_MEAN
 #include <atlbase.h>
 #include <windows.h>
@@ -69,9 +68,7 @@ class STLSpecialAlloc;
 #include <snmp.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <Utility/stdio_adapter.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/timeb.h>
 #include <sys/types.h>
@@ -111,7 +108,6 @@ class STLSpecialAlloc;
 #include "Common/SubsystemInterface.h"
 
 #include "Common/GameCommon.h"
-#include "Common/GameDefines.h"
 #include "Common/GameMemory.h"
 #include "Common/GameType.h"
 #include "Common/GlobalData.h"
@@ -128,5 +124,3 @@ class STLSpecialAlloc;
 
 #include "Common/Thing.h"
 #include "Common/UnicodeString.h"
-
-#endif /* __PRERTS_H__ */
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp
deleted file mode 100644
index 3f9d2937bb7..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp
+++ /dev/null
@@ -1,851 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: AudioEventRTS.cpp 
-/*---------------------------------------------------------------------------*/
-/* EA Pacific                                                                */
-/* Confidential Information	                                                 */
-/* Copyright (C) 2001 - All Rights Reserved                                  */
-/* DO NOT DISTRIBUTE                                                         */
-/*---------------------------------------------------------------------------*/
-/* Project:    RTS3                                                          */
-/* File name:  AudioEventRTS.cpp                                             */
-/* Created:    John K. McDonald, Jr., 3/21/2002                              */
-/* Desc:       AudioEventRTS constructors and assignment operator, etc.      */
-/* Revision History:                                                         */
-/*		3/21/2002 : Initial creation                                           */
-/*---------------------------------------------------------------------------*/
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/AudioEventRTS.h"
-
-#include "Common/AudioEventInfo.h"
-#include "Common/AudioRandomValue.h"
-#include "Common/AudioSettings.h"
-#include "Common/file.h"
-#include "Common/FileSystem.h"
-#include "Common/GameSounds.h"
-#include "Common/GlobalData.h"
-#include "Common/Player.h"
-#include "Common/Registry.h"
-
-#include "GameLogic/GameLogic.h"	// For getObjectByID
-#include "GameLogic/LogicRandomValue.h"
-#include "GameLogic/Object.h"
-
-#include "GameClient/Drawable.h"	// For getPosition
-#include "GameClient/GameClient.h"	// For getDrawableByID
-
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::AudioEventRTS()
-									: m_eventName(AsciiString::TheEmptyString), 
-										m_priority(AP_NORMAL), 
-										m_volume(-1.0),
-										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
-										m_ownerType(OT_INVALID),
-										m_shouldFade(false),
-										m_isLogicalAudio(false),
-										m_filenameToLoad(AsciiString::TheEmptyString),
-										m_eventInfo(NULL),
-										m_playingHandle(0),
-										m_killThisHandle(0),
-										m_pitchShift(1.0),
-										m_volumeShift(0.0),
-										m_loopCount(1),
-										m_playingAudioIndex(-1),
-										m_allCount(0),
-										m_playerIndex(-1),
-										m_delay(0.0f),
-										m_uninterruptable(FALSE)
-{
-	m_attackName.clear();
-	m_decayName.clear();
-	m_positionOfAudio.zero();
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::AudioEventRTS( const AsciiString& eventName )
-									: m_eventName(eventName), 
-										m_priority(AP_NORMAL), 
-										m_volume(-1.0),
-										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
-										m_ownerType(OT_INVALID),
-										m_shouldFade(false),
-										m_isLogicalAudio(false),
-										m_filenameToLoad(AsciiString::TheEmptyString),
-										m_eventInfo(NULL),
-										m_playingHandle(0),
-										m_killThisHandle(0),
-										m_pitchShift(1.0),
-										m_volumeShift(0.0),
-										m_loopCount(1),
-										m_playingAudioIndex(-1),
-										m_allCount(0),
-										m_playerIndex(-1),
-										m_delay(0.0f),
-										m_uninterruptable(FALSE)
-{
-	m_attackName.clear();
-	m_decayName.clear();
-	m_positionOfAudio.zero();
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::AudioEventRTS( const AsciiString& eventName, ObjectID ownerID )
-									: m_eventName(eventName), 
-										m_priority(AP_NORMAL), 
-										m_volume(-1.0),
-										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
-										m_objectID(ownerID),
-										m_ownerType(OT_INVALID),
-										m_shouldFade(false),
-										m_isLogicalAudio(false),
-										m_filenameToLoad(AsciiString::TheEmptyString),
-										m_eventInfo(NULL),
-										m_playingHandle(0),
-										m_killThisHandle(0),
-										m_pitchShift(1.0),
-										m_volumeShift(0.0),
-										m_loopCount(1),
-										m_playingAudioIndex(-1),
-										m_allCount(0),
-										m_playerIndex(-1),
-										m_delay(0.0f),
-										m_uninterruptable(FALSE)
-{						
-	m_attackName.clear();
-	m_decayName.clear();
-
-	if(	m_objectID ) 
-	{
-		m_ownerType = OT_Object;
-	} 
-	else 
-	{
-		m_objectID = INVALID_ID;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::AudioEventRTS( const AsciiString& eventName, DrawableID drawableID )
-									: m_eventName(eventName), 
-										m_priority(AP_NORMAL), 
-										m_volume(-1.0),
-										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
-										m_drawableID(drawableID),
-										m_ownerType(OT_INVALID),
-										m_shouldFade(false),
-										m_isLogicalAudio(false),
-										m_filenameToLoad(AsciiString::TheEmptyString),
-										m_eventInfo(NULL),
-										m_playingHandle(0),
-										m_killThisHandle(0),
-										m_pitchShift(1.0),
-										m_volumeShift(0.0),
-										m_loopCount(1),
-										m_playingAudioIndex(-1),
-										m_allCount(0),
-										m_playerIndex(-1),
-										m_delay(0.0f),
-										m_uninterruptable(FALSE)
-{
-	m_attackName.clear();
-	m_decayName.clear();
-
-	if( m_drawableID )
-	{
-		m_ownerType = OT_Drawable;
-	} 
-	else 
-	{
-		m_drawableID = INVALID_DRAWABLE_ID;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::AudioEventRTS( const AsciiString& eventName, const Coord3D *positionOfAudio )
-									: m_eventName(eventName), 
-										m_priority(AP_NORMAL), 
-										m_volume(-1.0),
-										m_timeOfDay(TIME_OF_DAY_AFTERNOON),
-										m_ownerType(OT_Positional),
-										m_shouldFade(false),
-										m_isLogicalAudio(false),
-										m_filenameToLoad(AsciiString::TheEmptyString),
-										m_eventInfo(NULL),
-										m_playingHandle(0),
-										m_killThisHandle(0),
-										m_pitchShift(1.0),
-										m_volumeShift(0.0),
-										m_loopCount(1),
-										m_playingAudioIndex(-1),
-										m_allCount(0),
-										m_playerIndex(-1),
-										m_delay(0.0f),
-										m_uninterruptable(FALSE)
-{
-	m_positionOfAudio.set( positionOfAudio );
-	m_attackName.clear();
-	m_decayName.clear();
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::AudioEventRTS( const AudioEventRTS& right )
-{
-	m_filenameToLoad			= right.m_filenameToLoad;
-	m_eventInfo						= right.m_eventInfo;
-	m_playingHandle				= right.m_playingHandle;
-	m_killThisHandle			= right.m_killThisHandle;
-	m_eventName						= right.m_eventName;
-	m_priority						= right.m_priority;
-	m_volume							= right.m_volume;
-	m_timeOfDay						= right.m_timeOfDay;
-	m_ownerType						= right.m_ownerType;
-	m_shouldFade					= right.m_shouldFade;
-	m_isLogicalAudio			= right.m_isLogicalAudio;
-	m_pitchShift					= right.m_pitchShift;
-	m_volumeShift					= right.m_volumeShift;
-	m_loopCount						= right.m_loopCount;
-	m_playingAudioIndex		= right.m_playingAudioIndex;
-	m_allCount						= right.m_allCount;
-	m_playerIndex					= right.m_playerIndex;
-	m_delay								= right.m_delay;
-	m_attackName					= right.m_attackName;
-	m_decayName						= right.m_decayName;
-	m_portionToPlayNext		= right.m_portionToPlayNext;
-	m_uninterruptable			= right.m_uninterruptable;
-
-	if( m_ownerType == OT_Positional || m_ownerType == OT_Dead ) 
-	{
-		m_positionOfAudio.set( &right.m_positionOfAudio );
-	} 
-	else if( m_ownerType == OT_Drawable ) 
-	{
-		m_drawableID = right.m_drawableID;
-	} 
-	else if( m_ownerType == OT_Object ) 
-	{
-		m_objectID = right.m_objectID;
-	}
-
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS& AudioEventRTS::operator=( const AudioEventRTS& right )
-{
-	m_filenameToLoad			= right.m_filenameToLoad;
-	m_eventInfo						= right.m_eventInfo;
-	m_playingHandle				= right.m_playingHandle;
-	m_killThisHandle			= right.m_killThisHandle;
-	m_eventName						= right.m_eventName;
-	m_priority						= right.m_priority;
-	m_volume							= right.m_volume;
-	m_timeOfDay						= right.m_timeOfDay;
-	m_ownerType						= right.m_ownerType;
-	m_shouldFade					= right.m_shouldFade;
-	m_isLogicalAudio			= right.m_isLogicalAudio;
-	m_pitchShift					= right.m_pitchShift;
-	m_volumeShift					= right.m_volumeShift;
-	m_loopCount						= right.m_loopCount;
-	m_playingAudioIndex		= right.m_playingAudioIndex;
-	m_allCount						= right.m_allCount;
-	m_playerIndex					= right.m_playerIndex;
-	m_delay								= right.m_delay;
-	m_attackName					= right.m_attackName;
-	m_decayName						= right.m_decayName;
-	m_portionToPlayNext		= right.m_portionToPlayNext;
-	m_uninterruptable			= right.m_uninterruptable;
-
-	if( m_ownerType == OT_Positional || m_ownerType == OT_Dead ) 
-	{
-		m_positionOfAudio.set( &right.m_positionOfAudio );
-	} 
-	else if( m_ownerType == OT_Drawable ) 
-	{
-		m_drawableID = right.m_drawableID;
-	} 
-	else if( m_ownerType == OT_Object ) 
-	{
-		m_objectID = right.m_objectID;
-	} 
-	return *this;
-
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS::~AudioEventRTS()
-{
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setEventName( AsciiString name )
-{
-	if ((name != m_eventName) && m_eventInfo != NULL) {
-		// Clear out the audio event info, cause its not valid for the new event.
-		m_eventInfo = NULL;
-	}
-
-	m_eventName = name;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::generateFilename( void )
-{
-	// A Logic Random Value is used because we may ask "How long will it take to play this sound?"
-	// In that case, we need the same answer across all pcs.
-
-	if (!m_eventInfo) {
-		return;
-	}
-	
-	m_filenameToLoad = generateFilenamePrefix(m_eventInfo->m_soundType, false);
-	
-	Int which = 0;
-
-	if (m_eventInfo->m_soundType == AT_Music || m_eventInfo->m_soundType == AT_Streaming) {
-		m_filenameToLoad.concat(m_eventInfo->m_filename);
-		adjustForLocalization(m_filenameToLoad);
-		return;
-	} else {
-		if (m_eventInfo->m_sounds.size() == 0) {
-			m_filenameToLoad = AsciiString::TheEmptyString;
-			return;
-		}
-
-
-		
-		if (BitIsSet(m_eventInfo->m_control, AC_RANDOM)) 
-		{ 
-			if (m_isLogicalAudio) 
-			{
-				which = GameLogicRandomValue(0, m_eventInfo->m_sounds.size() - 1);
-			} 
-			else 
-			{
-				which = GameAudioRandomValue(0, m_eventInfo->m_sounds.size() - 1);
-			}
-
-			if (which == m_playingAudioIndex && m_eventInfo->m_sounds.size() > 2)
-				which = ( which + 1 ) % m_eventInfo->m_sounds.size();
-
-			m_playingAudioIndex = which;//caching random choice to compare next call
-
-		}
-		else
-			which = (++m_playingAudioIndex) % m_eventInfo->m_sounds.size();
- 
-
-	}
-	
-	m_filenameToLoad.concat(m_eventInfo->m_sounds[which]);
-	m_filenameToLoad.concat(generateFilenameExtension(m_eventInfo->m_soundType));
-	adjustForLocalization(m_filenameToLoad);
-
-	// Note: Also generate Delay when generating a filename, cause 
-	// we want delay to apply between every loop of a sound.
-	m_delay = GameAudioRandomValueReal(m_eventInfo->m_delayMin, m_eventInfo->m_delayMax);
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioEventRTS::getFilename( void )
-{
-	return m_filenameToLoad;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::generatePlayInfo( void )
-{
-	m_pitchShift = GameAudioRandomValueReal(m_eventInfo->m_pitchShiftMin, m_eventInfo->m_pitchShiftMax);
-	m_volumeShift = GameAudioRandomValueReal(1.0f + m_eventInfo->m_volumeShift, 1.0f);	// volume shifts are between 0 and 1
-	m_loopCount = m_eventInfo->m_loopCount;
-	
-	m_portionToPlayNext = PP_Attack;
-	Int attackSize = m_eventInfo->m_attackSounds.size();
-	if (attackSize > 0) {
-		m_attackName = generateFilenamePrefix(m_eventInfo->m_soundType, false);
-		// needs to be logic because it needs to be the same on all systems.
-		Int attackToPlay;
-		if (m_isLogicalAudio) {
-			attackToPlay = GameLogicRandomValue(0, attackSize - 1);
-		} else {
-			attackToPlay = GameAudioRandomValue(0, attackSize - 1);
-		}
-		
-		m_attackName.concat(m_eventInfo->m_attackSounds[attackToPlay]);
-		m_attackName.concat(generateFilenameExtension(m_eventInfo->m_soundType));
-		adjustForLocalization(m_attackName);
-	} else {
-		m_portionToPlayNext = PP_Sound;
-	}
-
-	Int decaySize = m_eventInfo->m_decaySounds.size();
-	if (decaySize > 0) {
-		m_decayName = generateFilenamePrefix(m_eventInfo->m_soundType, false);
-		// needs to be logic because it needs to be the same on all systems.
-		Int decayToPlay;
-		if (m_isLogicalAudio) {
-			decayToPlay = GameLogicRandomValue(0, decaySize - 1);
-		} else {
-			decayToPlay = GameAudioRandomValue(0, decaySize - 1);
-		}
-		
-		m_decayName.concat(m_eventInfo->m_decaySounds[decayToPlay]);
-		m_decayName.concat(generateFilenameExtension(m_eventInfo->m_soundType));
-		adjustForLocalization(m_decayName);
-	}
-
-	m_isLogicalAudio = FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-Real AudioEventRTS::getPitchShift( void ) const
-{
-	return m_pitchShift;
-}
-
-//-------------------------------------------------------------------------------------------------
-Real AudioEventRTS::getVolumeShift( void ) const
-{
-	return m_volumeShift;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioEventRTS::getAttackFilename( void ) const
-{
-	return m_attackName;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioEventRTS::getDecayFilename( void ) const
-{
-	return m_decayName;
-}
-
-//-------------------------------------------------------------------------------------------------
-Real AudioEventRTS::getDelay( void ) const
-{
-	return m_delay;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::decrementDelay( Real timeToDecrement )
-{
-	m_delay -= timeToDecrement;
-}
-
-//-------------------------------------------------------------------------------------------------
-PortionToPlay AudioEventRTS::getNextPlayPortion( void ) const
-{
-	return m_portionToPlayNext;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::advanceNextPlayPortion( void )
-{
-	switch (m_portionToPlayNext) 
-	{
-		case PP_Attack:
-			m_portionToPlayNext = PP_Sound;
-			break;
-		case PP_Sound:
-			if (m_eventInfo && BitIsSet(m_eventInfo->m_control, AC_ALL)) 
-			{
-				if (m_allCount == m_eventInfo->m_sounds.size()) {
-					m_portionToPlayNext = PP_Decay;
-				}
-
-				// Advance the all count so that we move to the next sound.
-				++m_allCount;
-			}
-			if (!m_decayName.isEmpty()) {
-				m_portionToPlayNext = PP_Decay;
-			} else {
-				m_portionToPlayNext = PP_Done;
-			}
-			break;
-		case PP_Decay:
-			m_portionToPlayNext = PP_Done;
-			break;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setNextPlayPortion( PortionToPlay ptp )
-{
-	m_portionToPlayNext = ptp;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::decreaseLoopCount( void )
-{
-	if (m_loopCount == 1) {
-		m_loopCount = -1;
-	} else if (m_loopCount > 1) {
-		--m_loopCount;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioEventRTS::hasMoreLoops( void ) const
-{
-	return (m_loopCount >= 0);
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setAudioEventInfo( const AudioEventInfo *eventInfo ) const
-{
-	m_eventInfo = eventInfo;
-}
-
-//-------------------------------------------------------------------------------------------------
-const AudioEventInfo *AudioEventRTS::getAudioEventInfo( void ) const
-{
-	if (m_eventInfo) {
-		if (m_eventInfo->m_audioName == m_eventName) {
-			return m_eventInfo;
-		} else {
-			m_eventInfo = NULL;
-		}
-	}
-
-	return m_eventInfo;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setPlayingHandle( AudioHandle handle )
-{
-	m_playingHandle = handle;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioHandle AudioEventRTS::getPlayingHandle( void )
-{
-	return m_playingHandle;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setPosition( const Coord3D *pos )
-{
-	if (!pos) {
-		return;
-	}
-
-	if (!(m_ownerType == OT_Positional || m_ownerType == OT_INVALID)) {
-		return;
-	}
-
-	m_positionOfAudio = *pos;
-	m_ownerType = OT_Positional;
-}
-
-//-------------------------------------------------------------------------------------------------
-const Coord3D* AudioEventRTS::getPosition( void )
-{
-	if( m_ownerType != OT_INVALID ) 
-	{
-		return &m_positionOfAudio;
-	}
-
-	return NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setObjectID( ObjectID objID )
-{
-	if (!(m_ownerType == OT_Object || m_ownerType == OT_INVALID)) {
-		return;
-	}
-
-	m_objectID = objID;
-	m_ownerType = OT_Object;
-}
-
-//-------------------------------------------------------------------------------------------------
-ObjectID AudioEventRTS::getObjectID( void )
-{
-	if (m_ownerType == OT_Object) {
-		return m_objectID;
-	}
-
-	return INVALID_ID;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setDrawableID( DrawableID drawID )
-{
-	if (!(m_ownerType == OT_Drawable || m_ownerType == OT_INVALID)) {
-		return;
-	}
-
-	m_drawableID = drawID;
-	m_ownerType = OT_Drawable;
-}
-
-//-------------------------------------------------------------------------------------------------
-DrawableID AudioEventRTS::getDrawableID( void )
-{
-	if (m_ownerType == OT_Drawable) {
-		return m_drawableID;
-	}
-
-	return INVALID_DRAWABLE_ID;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setTimeOfDay( TimeOfDay tod )
-{
-	m_timeOfDay = tod;
-}
-
-//-------------------------------------------------------------------------------------------------
-TimeOfDay AudioEventRTS::getTimeOfDay( void ) const
-{
-	return m_timeOfDay;
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setHandleToKill( AudioHandle handleToKill )
-{
-	m_killThisHandle = handleToKill;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioHandle AudioEventRTS::getHandleToKill( void ) const
-{
-	return m_killThisHandle;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setShouldFade( Bool shouldFade )
-{
-	m_shouldFade = shouldFade;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioEventRTS::getShouldFade( void ) const
-{
-	return m_shouldFade;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setIsLogicalAudio( Bool isLogicalAudio )
-{
-	m_isLogicalAudio = isLogicalAudio;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioEventRTS::getIsLogicalAudio( void ) const
-{
-	return m_isLogicalAudio;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioEventRTS::isPositionalAudio( void ) const
-{
-	if( m_eventInfo ) 
-	{
-		if( !BitIsSet( m_eventInfo->m_type, ST_WORLD ) ) 
-		{
-			return FALSE;
-		}
-	}
-	if( m_ownerType != OT_INVALID )
-	{
-		if( m_drawableID != INVALID_DRAWABLE_ID || m_objectID != INVALID_ID || m_ownerType == OT_Positional )
-		{
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioEventRTS::isCurrentlyPlaying( void ) const
-{
-	return TheAudio->isCurrentlyPlaying(m_playingHandle);
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioPriority AudioEventRTS::getAudioPriority( void ) const
-{
-	return m_priority;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setAudioPriority( AudioPriority newPriority )
-{
-	m_priority = newPriority;
-
-}
-
-
-//-------------------------------------------------------------------------------------------------
-Real AudioEventRTS::getVolume( void ) const
-{
-	if (m_volume == -1.0f) {
-		if (m_eventInfo) {
-			return m_eventInfo->m_volume;
-		}
-		return 0.5;
-	}
-	
-	return m_volume;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setVolume( Real vol )
-{
-	m_volume = vol;
-}
-
-//-------------------------------------------------------------------------------------------------
-const Coord3D *AudioEventRTS::getCurrentPosition( void )
-{
-	if (m_ownerType == OT_Positional) 
-	{
-		return &m_positionOfAudio;
-	} 
-	else if (m_ownerType == OT_Object) 
-	{
-		Object *obj = TheGameLogic->findObjectByID(m_objectID);
-		if (obj)
-		{
-			m_positionOfAudio.set( obj->getPosition() );
-		}
-		else
-		{
-			m_ownerType = OT_Dead;
-		}
-		return &m_positionOfAudio;
-	} 
-	else if (m_ownerType == OT_Drawable) 
-	{
-		Drawable *draw = TheGameClient->findDrawableByID(m_drawableID);
-		if( draw )
-		{
-			m_positionOfAudio.set( draw->getPosition() );
-		}
-		else
-		{
-			m_ownerType = OT_Dead;
-		}
-		return &m_positionOfAudio;
-	}
-	else if( m_ownerType == OT_Dead )
-	{
-		return &m_positionOfAudio;
-	}
-
-	return NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioEventRTS::generateFilenamePrefix( AudioType audioTypeToPlay, Bool localized )
-{
-	AsciiString retStr;
-	retStr = TheAudio->getAudioSettings()->m_audioRoot;
-	retStr.concat("\\");
-	if (audioTypeToPlay == AT_Music) {
-		retStr.concat(TheAudio->getAudioSettings()->m_musicFolder);
-	} else if (audioTypeToPlay == AT_Streaming) {
-		retStr.concat(TheAudio->getAudioSettings()->m_streamingFolder);
-	} else {
-		retStr.concat(TheAudio->getAudioSettings()->m_soundsFolder);
-	}
-	retStr.concat("\\");
-
-	if (localized) {
-		retStr.concat(GetRegistryLanguage());
-		retStr.concat("\\");
-	}
-
-	return retStr;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioEventRTS::generateFilenameExtension( AudioType audioTypeToPlay )
-{
-	AsciiString retStr = AsciiString::TheEmptyString;
-	if (audioTypeToPlay != AT_Music) {
-		retStr = ".";
-		retStr.concat(TheAudio->getAudioSettings()->m_soundsExtension);
-	}
-
-	return retStr;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::adjustForLocalization(AsciiString &strToAdjust)
-{
-	const char *str = strToAdjust.reverseFind('\\');
-	if (!str) {
-		return;
-	}
-
-	// try the localized version first so that we're guarenteed to get it
-	// even if the generic data directory holds a version of the file
-	AsciiString localizedFilePath = generateFilenamePrefix(m_eventInfo->m_soundType, TRUE);
-	AsciiString filename = str;
-	localizedFilePath.concat(filename);
-
-	if (TheFileSystem->doesFileExist(localizedFilePath.str())) {
-		strToAdjust = localizedFilePath;
-	}
-	// else there was no localized version, so leave the path we received unchanged
-
-	return;
-}
-
-//-------------------------------------------------------------------------------------------------
-Int AudioEventRTS::getPlayerIndex( void ) const
-{
-	if (m_ownerType == OT_Object) {
-		Object *obj = TheGameLogic->findObjectByID(m_objectID);
-		if (obj) {
-			return obj->getControllingPlayer()->getPlayerIndex();
-		}
-	} else if (m_ownerType == OT_Drawable) {
-		Drawable *draw = TheGameClient->findDrawableByID(m_drawableID);
-		if (draw) {
-			Object *obj = draw->getObject();
-			if (obj) {
-				return obj->getControllingPlayer()->getPlayerIndex();
-			}
-		}
-	}
-
-	return m_playerIndex;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioEventRTS::setPlayerIndex( Int playerNdx )
-{
-	m_playerIndex = playerNdx;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/AudioRequest.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/AudioRequest.cpp
deleted file mode 100644
index c4e178840d4..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/Audio/AudioRequest.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/AudioRequest.h"
-
-
-AudioRequest::~AudioRequest() 
-{
-	
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameAudio.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameAudio.cpp
deleted file mode 100644
index 77c09a7d5d8..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameAudio.cpp
+++ /dev/null
@@ -1,1170 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: GameAudio.cpp
-//
-// Created:   5/01/01
-//
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#include "Common/GameAudio.h"
-
-#include "Common/AudioAffect.h"
-#include "Common/AudioEventInfo.h"
-#include "Common/AudioEventRTS.h"
-#include "Common/AudioHandleSpecialValues.h"
-#include "Common/AudioRequest.h"
-#include "Common/AudioSettings.h"
-#include "Common/FileSystem.h"
-#include "Common/GameEngine.h"
-#include "Common/GameMusic.h"
-#include "Common/GameSounds.h"
-#include "Common/MiscAudio.h"
-#include "Common/OSDisplay.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "Common/UserPreferences.h"
-
-#include "GameClient/ControlBar.h"
-#include "GameClient/Drawable.h"
-#include "GameClient/View.h"
-
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/TerrainLogic.h"
-
-#include "WWMath/matrix3d.h"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-static const char* TheSpeakerTypes[] =
-{
-	"2 Speakers",
-	"Headphones",
-	"Surround Sound",
-	"4 Speaker",
-	"5.1 Surround",
-	"7.1 Surround",
-	NULL
-};
-
-static const Int TheSpeakerTypesCount = sizeof(TheSpeakerTypes) / sizeof(TheSpeakerTypes[0]);
-
-static void parseSpeakerType( INI *ini, void *instance, void *store, const void *userData );
-
-// Field Parse table for Audio Settings ///////////////////////////////////////////////////////////
-static const FieldParse audioSettingsFieldParseTable[] =
-{
-	{ "AudioRoot",						INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_audioRoot) },
-	{ "SoundsFolder",					INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_soundsFolder) },
-	{ "MusicFolder",					INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_musicFolder) },
-	{ "StreamingFolder",			INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_streamingFolder) },
-	{ "SoundsExtension",			INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_soundsExtension) },
-
-	{ "UseDigital",						INI::parseBool,											NULL,							offsetof( AudioSettings, m_useDigital) },
-	{ "UseMidi",							INI::parseBool,											NULL,							offsetof( AudioSettings, m_useMidi) },
-	{ "OutputRate",						INI::parseInt,											NULL,							offsetof( AudioSettings, m_outputRate) },
-	{ "OutputBits",						INI::parseInt,											NULL,							offsetof( AudioSettings, m_outputBits) },
-	{ "OutputChannels",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_outputChannels) },
-	{ "SampleCount2D",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_sampleCount2D) },
-	{ "SampleCount3D",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_sampleCount3D) },
-	{ "StreamCount",					INI::parseInt,											NULL,							offsetof( AudioSettings, m_streamCount) },
-
-	{ "Preferred3DHW1",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[0]) },
-	{ "Preferred3DHW2",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[1]) },
-	{ "Preferred3DHW3",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[2]) },
-	{ "Preferred3DHW4",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[3]) },
-
-	{ "Preferred3DSW",				INI::parseAsciiString,							NULL,							offsetof( AudioSettings, m_preferred3DProvider[4]) },
-
-	{ "Default2DSpeakerType",		 parseSpeakerType,							NULL,							offsetof( AudioSettings, m_defaultSpeakerType2D) },
-	{ "Default3DSpeakerType",		 parseSpeakerType,							NULL,							offsetof( AudioSettings, m_defaultSpeakerType3D) },
-
-	{ "MinSampleVolume",			INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_minVolume) },
-	{ "GlobalMinRange",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_globalMinRange) },
-	{ "GlobalMaxRange",				INI::parseInt,											NULL,							offsetof( AudioSettings, m_globalMaxRange) },
-	{ "TimeBetweenDrawableSounds", INI::parseDurationUnsignedInt, NULL,							offsetof( AudioSettings, m_drawableAmbientFrames) },
-	{ "TimeToFadeAudio",			INI::parseDurationUnsignedInt,			NULL,							offsetof( AudioSettings, m_fadeAudioFrames) },
-	{ "AudioFootprintInBytes",INI::parseUnsignedInt,							NULL,							offsetof( AudioSettings, m_maxCacheSize) },
-	{ "Relative2DVolume",			INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_relative2DVolume ) },
-	{ "DefaultSoundVolume",		INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_defaultSoundVolume) },
-	{ "Default3DSoundVolume",	INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_default3DSoundVolume) },
-	{ "DefaultSpeechVolume",	INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_defaultSpeechVolume) },
-	{ "DefaultMusicVolume",		INI::parsePercentToReal,						NULL,							offsetof( AudioSettings, m_defaultMusicVolume) },
-	{ "MicrophoneDesiredHeightAboveTerrain",	INI::parseReal,			NULL,							offsetof( AudioSettings, m_microphoneDesiredHeightAboveTerrain ) },
-	{ "MicrophoneMaxPercentageBetweenGroundAndCamera", INI::parsePercentToReal,	NULL,	offsetof( AudioSettings, m_microphoneMaxPercentageBetweenGroundAndCamera ) },
-  { "ZoomMinDistance",		INI::parseReal,									NULL,							offsetof( AudioSettings, m_zoomMinDistance ) },
-  { "ZoomMaxDistance",		INI::parseReal,									NULL,							offsetof( AudioSettings, m_zoomMaxDistance ) },
-  { "ZoomSoundVolumePercentageAmount",		INI::parsePercentToReal,	NULL,		offsetof( AudioSettings, m_zoomSoundVolumePercentageAmount ) },
-
-	{ NULL, NULL, NULL, NULL }
-};
-
-// Singleton TheAudio /////////////////////////////////////////////////////////////////////////////
-AudioManager *TheAudio = NULL;
-
-
-// AudioManager Device Independent functions //////////////////////////////////////////////////////
-AudioManager::AudioManager() : 
-	m_soundOn(TRUE), 
-	m_sound3DOn(TRUE), 
-	m_musicOn(TRUE), 
-	m_speechOn(TRUE), 
-	m_music(NULL), 
-	m_sound(NULL),
-	m_surroundSpeakers(FALSE),
-	m_hardwareAccel(FALSE),
-	m_musicPlayingFromCD(FALSE)
-{
-	// Added by Sadullah Nader
-	m_adjustedVolumes.clear();
-	m_audioRequests.clear();
-	m_listenerPosition.zero();
-	m_musicTracks.clear();
-	m_musicVolume = 0.0f;
-	m_sound3DVolume = 0.0f;	
-	m_soundVolume   = 0.0f;
-	m_speechVolume  = 0.0f;
-	m_systemMusicVolume   = 0.0f;
-	m_systemSound3DVolume = 0.0f;
-	m_systemSoundVolume   = 0.0f; 
-	m_systemSpeechVolume  = 0.0f;
-	m_volumeHasChanged			= FALSE;
-	//
-
-	m_listenerOrientation.set(0.0, 1.0, 0.0);
-	theAudioHandlePool = AHSV_FirstHandle;
-	m_audioSettings = NEW AudioSettings;
-	m_miscAudio = NEW MiscAudio;
-	m_silentAudioEvent = NEW AudioEventRTS;
-	m_savedValues = NULL;
-	m_disallowSpeech = FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioManager::~AudioManager()
-{
-	// cleanup all of the loaded AudioEventInfos
-	AudioEventInfoHashIt it;
-	for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) {
-		AudioEventInfo *eventInfo = (*it).second;
-		if (eventInfo) {
-			deleteInstance(eventInfo);
-			eventInfo = NULL;
-		}
-	}
-
-	delete m_silentAudioEvent;
-	m_silentAudioEvent = NULL;
-	
-	delete m_music;
-	m_music = NULL;
-	
-	delete m_sound;
-	m_sound = NULL;
-	
-	delete m_miscAudio;
-	m_miscAudio = NULL;
-
-	delete m_audioSettings;
-	m_audioSettings = NULL;
-
-	if (m_savedValues) 
-		delete [] m_savedValues;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::init()
-{
-	INI ini;
-	ini.load( AsciiString( "Data\\INI\\AudioSettings.ini" ), INI_LOAD_OVERWRITE, NULL);
-
-	ini.load( AsciiString( "Data\\INI\\Default\\Music.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\Music.ini" ), INI_LOAD_OVERWRITE, NULL );
-
-	ini.load( AsciiString( "Data\\INI\\Default\\SoundEffects.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\SoundEffects.ini" ), INI_LOAD_OVERWRITE, NULL );
-
-	ini.load( AsciiString( "Data\\INI\\Default\\Speech.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\Speech.ini" ), INI_LOAD_OVERWRITE, NULL );
-
-	ini.load( AsciiString( "Data\\INI\\Default\\Voice.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\Voice.ini" ), INI_LOAD_OVERWRITE, NULL );
-
-	// do the miscellaneous sound files last so that we find the audioeventrts associated with the events.
-	ini.load( AsciiString( "Data\\INI\\MiscAudio.ini" ), INI_LOAD_OVERWRITE, NULL);
-	
-	// determine if one of the music tracks exists. Since their now BIGd, one implies all.
-	// If they don't exist, then attempt to load them from the CD. 
-	if (!isMusicAlreadyLoaded()) 
-	{
-		m_musicPlayingFromCD = TRUE;
-		while (TRUE) 
-		{
-			// @todo Unload any files from CD first. - jkmcd
-
-			TheFileSystem->loadMusicFilesFromCD();
-			if (isMusicAlreadyLoaded()) 
-			{
-				break;
-			}
-			// We loop infinitely on the splash screen if we don't allow breaking out of this loop.
-//#if !defined( RTS_DEBUG ) && !defined( RTS_INTERNAL )
-			else
-			{
-				// Display the warning.
-				
-				if (OSDisplayWarningBox("GUI:InsertCDPrompt", "GUI:InsertCDMessage", OSDBT_OK | OSDBT_CANCEL, OSDOF_SYSTEMMODAL | OSDOF_EXCLAMATIONICON) == OSDBT_CANCEL) {
-					//TheGameEngine->setQuitting(TRUE);  // Can't do this to WorldBuilder
-					break;
-				}
-			}
-//#endif
-		}
-	}
-	
-	m_music = NEW MusicManager;
-	m_sound = NEW SoundManager;
-
-	// Set our system volumes from the user's preferred settings, not the defaults.
-	m_systemMusicVolume = getAudioSettings() ? getAudioSettings()->m_preferredMusicVolume : 0.55f;
-	m_systemSoundVolume = getAudioSettings() ? getAudioSettings()->m_preferredSoundVolume : 0.75f;
-	m_systemSound3DVolume = getAudioSettings() ? getAudioSettings()->m_preferred3DSoundVolume: 0.75f;
-	m_systemSpeechVolume = getAudioSettings() ? getAudioSettings()->m_preferredSpeechVolume : 0.55f;
-
-	m_scriptMusicVolume = 1.0f;
-	m_scriptSoundVolume = 1.0f;
-	m_scriptSound3DVolume = 1.0f;
-	m_scriptSpeechVolume = 1.0f;
-	
-	m_musicVolume = m_systemMusicVolume;
-	m_soundVolume = m_systemSoundVolume;
-	m_sound3DVolume = m_systemSound3DVolume;
-	m_speechVolume = m_systemSpeechVolume;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::postProcessLoad()
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::reset()
-{
-	// clear out any adjusted volumes we might have set.
-	m_adjustedVolumes.clear();
-
-	// adjust the scripted volumes, and reset the 
-	m_scriptMusicVolume = 1.0f;
-	m_scriptSoundVolume = 1.0f;
-	m_scriptSound3DVolume = 1.0f;
-	m_scriptSpeechVolume = 1.0f;
-
-	// restore the final values to the 
-	m_musicVolume = m_systemMusicVolume;
-	m_soundVolume = m_systemSoundVolume;
-	m_sound3DVolume = m_systemSound3DVolume;
-	m_speechVolume = m_systemSpeechVolume;
-
-	m_disallowSpeech = FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::update()
-{
-	Coord3D groundPos, microphonePos;
-	TheTacticalView->getPosition( &groundPos );
-	Real angle = TheTacticalView->getAngle();
-	Matrix3D rot = Matrix3D::Identity;
-	rot.Rotate_Z( angle );
-	Vector3 forward( 0, 1, 0 );
-	rot.mulVector3( forward );
-
-	Real desiredHeight = TheAudio->getAudioSettings()->m_microphoneDesiredHeightAboveTerrain;
-	Real maxPercentage = TheAudio->getAudioSettings()->m_microphoneMaxPercentageBetweenGroundAndCamera;
-
-	Coord3D lookTo;
-	lookTo.set(forward.X, forward.Y, forward.Z);
-
-	//Kris: At this point, the microphone is calculated to be at the ground position where the camera is looking at.
-	//Instead we want to move the microphone towards the camera. Hopefully, it'll be a desired altitude, but if it
-	//gets too close to the camera (or even past it), that would be undesirable. Therefore, we have a backup method
-	//of making sure we only go a certain percentage towards the camera or the desired height, whichever occurs first.
-	Coord3D cameraPos = TheTacticalView->get3DCameraPosition();
-	Coord3D groundToCameraVector;
-	groundToCameraVector.set( &cameraPos );
-	groundToCameraVector.sub( &groundPos );
-	Real bestScaleFactor;
-
-	if( cameraPos.z <= desiredHeight || groundToCameraVector.z <= 0.0f )
-	{
-		//Use the percentage calculation!
-		bestScaleFactor = maxPercentage;
-	}
-	else
-	{
-		//Calculate the stopping position of the groundToCameraVector when we force z to be m_microphoneDesiredHeightAboveTerrain
-		Real zScale = desiredHeight / groundToCameraVector.z;
-
-		//Use the smallest of the two scale calculations
-		bestScaleFactor = MIN( maxPercentage, zScale );
-	}
-
-	//Now apply the best scalar to the ground-to-camera vector.
-	groundToCameraVector.scale( bestScaleFactor );
-
-	//Set the microphone to be the ground position adjusted for terrain plus the vector we just calculated.
-	groundPos.z = TheTerrainLogic->getGroundHeight( groundPos.x, groundPos.y );
-	microphonePos.set( &groundPos );
-	microphonePos.add( &groundToCameraVector );
-
-	//Viola! A properly placed microphone.
-	setListenerPosition( &microphonePos, &lookTo );
-
-
-	//Now determine if we would like to boost the volume based on the camera being close to the microphone!
-	Real maxBoostScalar = TheAudio->getAudioSettings()->m_zoomSoundVolumePercentageAmount;
-	Real minDist = TheAudio->getAudioSettings()->m_zoomMinDistance;
-	Real maxDist = TheAudio->getAudioSettings()->m_zoomMaxDistance;
-
-	//We can't boost a sound above 100%, instead reduce the normal sound level.
-	m_zoomVolume = 1.0f - maxBoostScalar;
-
-	//Are we even using a boost?
-	if( maxBoostScalar > 0.0f )
-	{
-		//How far away is the camera from the microphone?
-		Coord3D vector = cameraPos;
-		vector.sub( &microphonePos );
-		Real dist = vector.length();
-
-		if( dist < minDist )
-		{
-			//Max volume!
-			m_zoomVolume = 1.0f;
-		}
-		else if( dist < maxDist )
-		{
-			//Determine what the boost amount will be. 
-			Real scalar = (dist - minDist) / (maxDist - minDist);
-			m_zoomVolume = 1.0f - scalar * maxBoostScalar;
-		}
-	}
-
-	set3DVolumeAdjustment( m_zoomVolume );
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::getInfoForAudioEvent( const AudioEventRTS *eventToFindAndFill ) const
-{
-	if (!eventToFindAndFill) {
-		return;
-	}
-
-	if (eventToFindAndFill->getAudioEventInfo()) {
-		// already done
-		return;
-	}
-
-	eventToFindAndFill->setAudioEventInfo(findAudioEventInfo(eventToFindAndFill->getEventName()));
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioHandle AudioManager::addAudioEvent(const AudioEventRTS *eventToAdd)
-{
-	if (eventToAdd->getEventName().isEmpty() || eventToAdd->getEventName() == AsciiString("NoSound")) {
-		return AHSV_NoSound;
-	}
-
-#ifdef INTENSIVE_AUDIO_DEBUG
-	DEBUG_LOG(("AUDIO (%d): Received addAudioEvent('%s')", TheGameLogic->getFrame(), eventToAdd->getEventName().str()));
-#endif
-	if (!eventToAdd->getAudioEventInfo()) {
-		getInfoForAudioEvent(eventToAdd);
-		if (!eventToAdd->getAudioEventInfo()) {
-			DEBUG_CRASH(("No info for requested audio event '%s'\n", eventToAdd->getEventName().str()));
-			return AHSV_Error;
-		}
-	}
-
-	switch (eventToAdd->getAudioEventInfo()->m_soundType)
-	{
-		case AT_Music:
-			if (!isOn(AudioAffect_Music)) 
-				return AHSV_NoSound;
-			break;
-		case AT_SoundEffect:
-			if (!isOn(AudioAffect_Sound) || !isOn(AudioAffect_Sound3D)) 
-				return AHSV_NoSound;
-			break;
-		case AT_Streaming:
-			if (!isOn(AudioAffect_Speech)) 
-				return AHSV_NoSound;
-			break;
-	}
-
-	// if we're currently playing uninterruptable speech, then disallow the addition of this sample
-	if (getDisallowSpeech() && eventToAdd->getAudioEventInfo()->m_soundType == AT_Streaming) {
-		return AHSV_NoSound;
-	}
-
-
-	AudioEventRTS *audioEvent = MSGNEW("AudioEventRTS") AudioEventRTS(*eventToAdd);		// poolify
-	audioEvent->setPlayingHandle( allocateNewHandle() );
-	audioEvent->generateFilename();	// which file are we actually going to play?
-	((AudioEventRTS*)eventToAdd)->setPlayingAudioIndex( audioEvent->getPlayingAudioIndex() );
-	audioEvent->generatePlayInfo();	// generate pitch shift and volume shift now as well
-
-	std::list<std::pair<AsciiString, Real> >::iterator it;
-	for (it = m_adjustedVolumes.begin(); it != m_adjustedVolumes.end(); ++it) {
-		if (it->first == audioEvent->getEventName()) {
-			audioEvent->setVolume(it->second);
-			break;
-		}
-	}
-	
-	if (!audioEvent->getUninterruptable()) {
-		if (!shouldPlayLocally(audioEvent)) {
-			releaseAudioEventRTS(audioEvent);
-			return AHSV_NotForLocal;
-		}
-	}
-
-	// cull muted audio
-	if (audioEvent->getVolume() < TheAudio->getAudioSettings()->m_minVolume) {
-#ifdef INTENSIVE_AUDIO_DEBUG
-		DEBUG_LOG((" - culled due to muting (%d).\n", audioEvent->getVolume()));
-#endif
-		releaseAudioEventRTS(audioEvent);
-		return AHSV_Muted;
-	}
-
-	AudioType type = eventToAdd->getAudioEventInfo()->m_soundType;
-	if (type == AT_Music) 
-	{
-		m_music->addAudioEvent(audioEvent);
-	} 
-	else 
-	{
-		//Possible to nuke audioEvent inside.
-		m_sound->addAudioEvent(audioEvent);
-	}
-
-	if( audioEvent )
-	{
-		return audioEvent->getPlayingHandle();
-	}
-	return AHSV_NoSound;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isValidAudioEvent(const AudioEventRTS *eventToCheck) const
-{
-	if (eventToCheck->getEventName().isEmpty()) {
-		return false;
-	}
-
-	getInfoForAudioEvent(eventToCheck);
-
-	return (eventToCheck->getAudioEventInfo() != NULL);
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isValidAudioEvent( AudioEventRTS *eventToCheck ) const
-{
-	if( eventToCheck->getEventName().isEmpty() ) 
-	{
-		return false;
-	}
-
-	getInfoForAudioEvent( eventToCheck );
-
-	return( eventToCheck->getAudioEventInfo() );
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::addTrackName( const AsciiString& trackName )
-{
-	m_musicTracks.push_back(trackName);
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioManager::nextTrackName(const AsciiString& currentTrack )
-{
-	std::vector<AsciiString>::iterator it;
-	for (it = m_musicTracks.begin(); it != m_musicTracks.end(); ++it) {
-		if (*it == currentTrack) {
-			break;
-		}
-	}
-
-	if (it != m_musicTracks.end()) {
-		++it;
-	}
-
-	if (it == m_musicTracks.end()) {
-		it = m_musicTracks.begin();
-		if (it == m_musicTracks.end()) {
-			return AsciiString::TheEmptyString;
-		}
-	}
-
-	return *it;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioManager::prevTrackName(const AsciiString& currentTrack )
-{
-	std::vector<AsciiString>::reverse_iterator rit;
-	for (rit = m_musicTracks.rbegin(); rit != m_musicTracks.rend(); ++rit) {
-		if (*rit == currentTrack) {
-			break;
-		}
-	}
-	
-	if (rit != m_musicTracks.rend()) {
-		++rit;
-	}
-
-	if (rit == m_musicTracks.rend()) {
-		rit = m_musicTracks.rbegin();
-		if (rit == m_musicTracks.rend()) {
-			return AsciiString::TheEmptyString;
-		}
-	}
-
-	return *rit;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::removeAudioEvent(AudioHandle audioEvent)
-{
-	if (audioEvent == AHSV_StopTheMusic || audioEvent == AHSV_StopTheMusicFade) {
-		m_music->removeAudioEvent(audioEvent);
-		return;
-	}
-
-	if (audioEvent < AHSV_FirstHandle) {
-		return;
-	}
-
-	AudioRequest *req = allocateAudioRequest( false );
-	req->m_handleToInteractOn = audioEvent;
-	req->m_request = AR_Stop;
-	appendAudioRequest( req );
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::setAudioEventEnabled( AsciiString eventToAffect, Bool enable )
-{
-	setAudioEventVolumeOverride(eventToAffect, (enable ? -1.0f : 0.0f) );
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::setAudioEventVolumeOverride( AsciiString eventToAffect, Real newVolume )
-{
-	if (eventToAffect == AsciiString::TheEmptyString) {
-		m_adjustedVolumes.clear();
-		return;
-	}
-
-	// Find any playing audio events and adjust their volume accordingly.
-	if (newVolume != -1.0f) {
-		adjustVolumeOfPlayingAudio(eventToAffect, newVolume);
-	}
-
-	std::list<std::pair<AsciiString, Real> >::iterator it;
-	for (it = m_adjustedVolumes.begin(); it != m_adjustedVolumes.end(); ++it) {
-		if (it->first == eventToAffect) {
-			if (newVolume == -1.0f) {
-				m_adjustedVolumes.erase(it);
-				return;
-			} else {
-				it->second = newVolume;
-				return;
-			}
-		}
-	}
-
-	if (newVolume != -1.0f) {
-		std::pair<AsciiString, Real> newPair;
-		newPair.first = eventToAffect;
-		newPair.second = newVolume;
-		m_adjustedVolumes.push_front(newPair);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::removeAudioEvent( AsciiString eventToRemove )
-{
-	removePlayingAudio( eventToRemove );
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::removeDisabledEvents()
-{
-	removeAllDisabledAudio();
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isCurrentlyPlaying( AudioHandle audioEvent )
-{
-	return true;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt AudioManager::translateSpeakerTypeToUnsignedInt( const AsciiString& speakerType )
-{
-	for (UnsignedInt i = 0; TheSpeakerTypes[i]; ++i) {
-		if (TheSpeakerTypes[i] == speakerType) {
-			return i;
-		}
-	}
-
-	return 0;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString AudioManager::translateUnsignedIntToSpeakerType( UnsignedInt speakerType )
-{
-	if (speakerType >= TheSpeakerTypesCount) {
-		return TheSpeakerTypes[0];
-	}
-	
-	return TheSpeakerTypes[speakerType];
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isOn( AudioAffect whichToGet ) const
-{
-	if (whichToGet & AudioAffect_Music) {
-		return m_musicOn;
-	} else if (whichToGet & AudioAffect_Sound) {
-		return m_soundOn;
-	} else if (whichToGet & AudioAffect_Sound3D) {
-		return m_sound3DOn;
-	}
-
-	// Speech
-	return m_speechOn;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::setOn( Bool turnOn, AudioAffect whichToAffect )
-{
-	if (whichToAffect & AudioAffect_Music) {
-		m_musicOn = turnOn;
-	}
-
-	if (whichToAffect & AudioAffect_Sound) {
-		m_soundOn = turnOn;
-	}
-
-	if (whichToAffect & AudioAffect_Sound3D) {
-		m_sound3DOn = turnOn;
-	}
-
-	if (whichToAffect & AudioAffect_Speech) {
-		m_speechOn = turnOn;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::setVolume( Real volume, AudioAffect whichToAffect )
-{
-	if (whichToAffect & AudioAffect_Music) {
-		if (whichToAffect & AudioAffect_SystemSetting) {
-			m_systemMusicVolume = volume;
-		} else {
-			m_scriptMusicVolume = volume;
-		}
-
-		m_musicVolume = m_scriptMusicVolume * m_systemMusicVolume;
-	}
-
-	if (whichToAffect & AudioAffect_Sound) {
-		if (whichToAffect & AudioAffect_SystemSetting) {
-			m_systemSoundVolume = volume;
-		} else {
-			m_scriptSoundVolume = volume;
-		}
-
-		m_soundVolume = m_scriptSoundVolume * m_systemSoundVolume;
-	}
-
-	if (whichToAffect & AudioAffect_Sound3D) {
-		if (whichToAffect & AudioAffect_SystemSetting) {
-			m_systemSound3DVolume = volume;
-		} else {
-			m_scriptSound3DVolume = volume;
-		}
-		m_sound3DVolume = m_scriptSound3DVolume * m_systemSound3DVolume;
-	}
-
-	if (whichToAffect & AudioAffect_Speech) {
-		if (whichToAffect & AudioAffect_SystemSetting) {
-			m_systemSpeechVolume = volume;
-		} else {
-			m_scriptSpeechVolume = volume;
-		}
-		m_speechVolume = m_scriptSpeechVolume * m_systemSpeechVolume;
-	}
-
-	m_volumeHasChanged = true;
-}
-
-//-------------------------------------------------------------------------------------------------
-Real AudioManager::getVolume( AudioAffect whichToGet )
-{
-	if (whichToGet & AudioAffect_Music) {
-		return m_musicVolume;
-	} else if (whichToGet & AudioAffect_Sound) {
-		return m_soundVolume;
-	} else if (whichToGet & AudioAffect_Sound3D) {
-		return m_sound3DVolume;
-	}
-
-	// Speech
-	return m_speechVolume;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::set3DVolumeAdjustment( Real volumeAdjustment )
-{
-	m_sound3DVolume = volumeAdjustment * m_scriptSound3DVolume * m_systemSound3DVolume;
-	
-	// clamp
-	if (m_sound3DVolume < 0.0f) 
-		m_sound3DVolume = 0.0f;
-
-	if (m_sound3DVolume > 1.0f) 
-		m_sound3DVolume = 1.0f;
-
-  if ( ! has3DSensitiveStreamsPlaying() )
-  	m_volumeHasChanged = TRUE;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::setListenerPosition( const Coord3D *newListenerPos, const Coord3D *newListenerOrientation )
-{
-	m_listenerPosition = *newListenerPos;
-	m_listenerOrientation = *newListenerOrientation;
-}
-
-//-------------------------------------------------------------------------------------------------
-const Coord3D *AudioManager::getListenerPosition( void ) const
-{
-	return &m_listenerPosition;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioRequest *AudioManager::allocateAudioRequest( Bool useAudioEvent )
-{
-	AudioRequest *audioReq = newInstance(AudioRequest);
-	audioReq->m_usePendingEvent = useAudioEvent;
-	audioReq->m_requiresCheckForSample = false;
-	return audioReq;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::releaseAudioRequest( AudioRequest *requestToRelease )
-{
-	if (requestToRelease) {
-		deleteInstance(requestToRelease);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::appendAudioRequest( AudioRequest *m_request )
-{
-	m_audioRequests.push_back(m_request);
-}
-
-//-------------------------------------------------------------------------------------------------
-// Remove all pending audio requests
-void AudioManager::removeAllAudioRequests( void )
-{
-  std::list<AudioRequest*>::iterator it;
-  for ( it = m_audioRequests.begin(); it != m_audioRequests.end(); it++ ) {
-    releaseAudioRequest( *it );
-  }
-
-  m_audioRequests.clear();
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::processRequestList( void )
-{
-	
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventInfo *AudioManager::newAudioEventInfo( AsciiString audioName )
-{
-	AudioEventInfo *eventInfo = findAudioEventInfo(audioName);
-	if (eventInfo) {
-		DEBUG_CRASH(("Requested add of '%s' multiple times. Is this intentional? - jkmcd\n", audioName.str()));
-		return eventInfo;
-	}
-
-	m_allAudioEventInfo[audioName] = newInstance(AudioEventInfo);
-	return m_allAudioEventInfo[audioName];
-}
-
-//-------------------------------------------------------------------------------------------------
-// Add an AudioEventInfo structure allocated elsewhere to the audio event list
-void AudioManager::addAudioEventInfo( AudioEventInfo * newEvent )
-{
-  // Warning: Don't try to copy the structure. It may be a derived class
-  AudioEventInfo *eventInfo = findAudioEventInfo( newEvent->m_audioName );
-  if (eventInfo) 
-  {
-    DEBUG_CRASH(("Requested add of '%s' multiple times. Is this intentional? - jkmcd\n", newEvent->m_audioName.str()));
-    *eventInfo = *newEvent;
-  }
-  else
-  {
-    m_allAudioEventInfo[newEvent->m_audioName] = newEvent;
-  }
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventInfo *AudioManager::findAudioEventInfo( AsciiString eventName ) const
-{
-	AudioEventInfoHash::const_iterator it;
-	it = m_allAudioEventInfo.find(eventName);
-	if (it == m_allAudioEventInfo.end()) {
-		return NULL;
-	}
-
-	return (*it).second;
-}
-
-//-------------------------------------------------------------------------------------------------
-// Remove all AudioEventInfo's with the m_isLevelSpecific flag
-void AudioManager::removeLevelSpecificAudioEventInfos(void)
-{
-  AudioEventInfoHash::iterator it = m_allAudioEventInfo.begin();
-
-  while ( it != m_allAudioEventInfo.end() )
-  {
-    AudioEventInfoHash::iterator next = it; // Make sure erase doesn't cause problems
-    next++;
-
-    if ( it->second->isLevelSpecific() )
-    {
-      deleteInstance(it->second);
-      m_allAudioEventInfo.erase( it );
-    }
-
-    it = next;
-  }
-
-}
-
-//-------------------------------------------------------------------------------------------------
-const AudioSettings *AudioManager::getAudioSettings( void ) const
-{
-	return m_audioSettings;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioSettings *AudioManager::friend_getAudioSettings( void )
-{
-	return m_audioSettings;
-}
-
-//-------------------------------------------------------------------------------------------------
-const MiscAudio *AudioManager::getMiscAudio( void ) const
-{
-	return m_miscAudio;
-}
-
-//-------------------------------------------------------------------------------------------------
-MiscAudio *AudioManager::friend_getMiscAudio( void )
-{
-	return m_miscAudio;
-}
-
-//-------------------------------------------------------------------------------------------------
-const FieldParse *AudioManager::getFieldParseTable( void ) const
-{
-	return audioSettingsFieldParseTable;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::refreshCachedVariables()
-{
-	m_hardwareAccel = isCurrentProviderHardwareAccelerated();
-	m_surroundSpeakers = isCurrentSpeakerTypeSurroundSound();
-}
-
-//-------------------------------------------------------------------------------------------------
-Real AudioManager::getAudioLengthMS( const AudioEventRTS *event )
-{
-	if (!event->getAudioEventInfo()) {
-		getInfoForAudioEvent(event);
-		if (!event->getAudioEventInfo()) {
-			return 0.0f;
-		}
-	}
-
-	AudioEventRTS tmpEvent = *event;
-
-	tmpEvent.generateFilename();
-	tmpEvent.generatePlayInfo();
-	return getFileLengthMS(tmpEvent.getAttackFilename()) + 
-				 getFileLengthMS(tmpEvent.getFilename()) + 
-				 getFileLengthMS(tmpEvent.getDecayFilename());
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isMusicAlreadyLoaded(void) const
-{
-	const AudioEventInfo *musicToLoad = NULL;
-	AudioEventInfoHash::const_iterator it;
-	for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) {
-		if (it->second) {
-			const AudioEventInfo *aet = it->second;
-			if (aet->m_soundType == AT_Music) {
-				musicToLoad = aet;
-			}
-		}
-	}
-
-	if (!musicToLoad) {
-		return FALSE;
-	}
-
-	AudioEventRTS aud;
-	aud.setAudioEventInfo(musicToLoad);
-	aud.generateFilename();
-
-	AsciiString astr = aud.getFilename();
-
-	return (TheFileSystem->doesFileExist(astr.str()));
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::findAllAudioEventsOfType( AudioType audioType, std::vector<AudioEventInfo*>& allEvents )
-{
-	AudioEventInfoHashIt it;
-	for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) {
-		AudioEventInfo *aud = (*it).second;
-		if (aud->m_soundType == audioType) {
-			allEvents.push_back(aud);
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isCurrentProviderHardwareAccelerated()
-{
-	for (Int i = 0; i < MAX_HW_PROVIDERS; ++i) {
-		if (getProviderName(getSelectedProvider()) == TheAudio->getAudioSettings()->m_preferred3DProvider[i]) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::isCurrentSpeakerTypeSurroundSound()
-{
-	return (getSpeakerType() == TheAudio->getAudioSettings()->m_defaultSpeakerType3D);
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioManager::shouldPlayLocally(const AudioEventRTS *audioEvent)
-{
-	Player *localPlayer = ThePlayerList->getLocalPlayer();
-	if( !localPlayer->isPlayerActive() ) 
-	{
-		//We are dead, thus are observing. Get the player we are observing. It's 
-		//possible that we're not looking at any player, therefore it can be NULL.
-		localPlayer = TheControlBar->getObserverLookAtPlayer();
-	}
-
-	const AudioEventInfo *ei = audioEvent->getAudioEventInfo();
-
-	// Music should always play locally.
-	if (ei->m_soundType == AT_Music) {
-		return TRUE;
-	}
-
-	if (!BitIsSet(ei->m_type, (ST_PLAYER | ST_ALLIES | ST_ENEMIES | ST_EVERYONE))) {
-		DEBUG_CRASH(("No player restrictions specified for '%s'. Using Everyone.\n", ei->m_audioName.str()));
-		return TRUE;
-	}
-
-	if (BitIsSet(ei->m_type, ST_EVERYONE)) {
-		return TRUE;
-	}
-
-	Player *owningPlayer = ThePlayerList->getNthPlayer(audioEvent->getPlayerIndex());
-
-	if (BitIsSet(ei->m_type, ST_PLAYER) && BitIsSet(ei->m_type, ST_UI) && owningPlayer == NULL) {
-		DEBUG_ASSERTCRASH(!TheGameLogic->isInGameLogicUpdate(), ("Playing %s sound -- player-based UI sound without specifying a player.\n"));
-		return TRUE;
-	}
-
-	if (owningPlayer == NULL) {
-		DEBUG_CRASH(("Sound '%s' expects an owning player, but the audio event that created it didn't specify one.\n", ei->m_audioName.str()));
-		return FALSE;
-	}
-
-	if( !localPlayer )
-	{
-		return FALSE;
-	}
-
-	const Team *localTeam = localPlayer->getDefaultTeam();
-	if (localTeam == NULL) { 
-		return FALSE;
-	}
-
-	if (BitIsSet(ei->m_type, ST_PLAYER))  {
-		return owningPlayer == localPlayer;
-	}
-
-	if (BitIsSet(ei->m_type, ST_ALLIES)) { 
-		// We have to also check that the owning player isn't the local player, because PLAYER 
-		// wasn't specified, or we wouldn't have gotten here.
-		return (owningPlayer != localPlayer) && owningPlayer->getRelationship(localTeam) == ALLIES;
-	}
-
-	if (BitIsSet(ei->m_type, ST_ENEMIES)) {
-		return owningPlayer->getRelationship(localTeam) == ENEMIES;
-	}
-	
-	return FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioHandle AudioManager::allocateNewHandle( void )
-{
-	// note, intenionally a post increment rather than a pre increment.
-	return theAudioHandlePool++;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::releaseAudioEventRTS( AudioEventRTS *&eventToRelease )
-{
-	if( eventToRelease )
-	{
-		delete eventToRelease;
-		eventToRelease = NULL;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::loseFocus( void )
-{
-	DEBUG_ASSERTLOG(m_savedValues == NULL, ("AudioManager::loseFocus() - leak - jkmcd\n"));
-	// In this case, make all the audio go silent.
-	m_savedValues = NEW Real[NUM_VOLUME_TYPES];
-	m_savedValues[0] = m_systemMusicVolume;
-	m_savedValues[1] = m_systemSoundVolume;
-	m_savedValues[2] = m_systemSound3DVolume;
-	m_savedValues[3] = m_systemSpeechVolume;
-
-	// Now, set them all to 0.
-	setVolume(0.0f, (AudioAffect) (AudioAffect_All | AudioAffect_SystemSetting));
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioManager::regainFocus( void )
-{
-	if (!m_savedValues) {
-		return;
-	}
-
-	// We got focus back. Restore the previous audio values.
-	setVolume(m_savedValues[0], (AudioAffect) (AudioAffect_Music | AudioAffect_SystemSetting));
-	setVolume(m_savedValues[1], (AudioAffect) (AudioAffect_Sound | AudioAffect_SystemSetting));
-	setVolume(m_savedValues[2], (AudioAffect) (AudioAffect_Sound3D | AudioAffect_SystemSetting));
-	setVolume(m_savedValues[3], (AudioAffect) (AudioAffect_Speech | AudioAffect_SystemSetting));
-
-	// Now, blow away the old volumes.
-	delete [] m_savedValues;
-	m_savedValues = NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void INI::parseAudioSettingsDefinition( INI *ini )
-{
-	ini->initFromINI(TheAudio->friend_getAudioSettings(), TheAudio->getFieldParseTable());
-
-	// time to override the volume settings, default 3-D provider, and speaker setup with the
-	// ones stored from the prefs
-	OptionPreferences prefs;
-
-	TheAudio->setPreferredProvider(prefs.getPreferred3DProvider());
-	TheAudio->setPreferredSpeaker(prefs.getSpeakerType());
-
-	Real relative2DVolume = TheAudio->getAudioSettings()->m_relative2DVolume;
-	relative2DVolume = MIN( 1.0f, MAX( -1.0f, relative2DVolume ) );
-
-	TheAudio->friend_getAudioSettings()->m_preferredSoundVolume		= prefs.getSoundVolume() / 100.0f;
-	TheAudio->friend_getAudioSettings()->m_preferred3DSoundVolume	= prefs.get3DSoundVolume() / 100.0f;
-	TheAudio->friend_getAudioSettings()->m_preferredSpeechVolume	= prefs.getSpeechVolume() / 100.0f;
-	TheAudio->friend_getAudioSettings()->m_preferredMusicVolume		= prefs.getMusicVolume() / 100.0f;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-
-//-------------------------------------------------------------------------------------------------
-void parseSpeakerType( INI *ini, void *instance, void *store, const void* userData )
-{
-	AsciiString str;
-	ini->parseAsciiString( ini, instance, &str, userData );
-
-	(*(UnsignedInt*)store) = TheAudio->translateSpeakerTypeToUnsignedInt(str);
-}
-
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameMusic.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameMusic.cpp
deleted file mode 100644
index 5eb664302c9..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameMusic.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: GameMusic.cpp
-//
-// Created:   5/01/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameMusic.h"
-
-#include "Common/AudioEventRTS.h"
-#include "Common/AudioRequest.h"
-#include "Common/GameAudio.h"
-#include "Common/INI.h"
-
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-#define MUSIC_PATH "Data\\Audio\\Tracks"  // directory path to the music files
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-//-------------------------------------------------------------------------------------------------
-/** The INI data fields for music tracks */
-//-------------------------------------------------------------------------------------------------
-const FieldParse MusicTrack::m_musicTrackFieldParseTable[] = 
-{
-
-	{ "Filename",								INI::parseAsciiString,							NULL, offsetof( MusicTrack, filename ) },
-	{ "Volume",									INI::parsePercentToReal,						NULL, offsetof( MusicTrack, volume ) },
-	{ "Ambient",								INI::parseBool,											NULL, offsetof( MusicTrack, ambient ) },
-	{ NULL,											NULL,																NULL, 0 },
-};
-
-
-//-------------------------------------------------------------------------------------------------
-MusicManager::MusicManager()
-{	
-
-}
-
-//-------------------------------------------------------------------------------------------------
-MusicManager::~MusicManager()
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void MusicManager::playTrack( AudioEventRTS *eventToUse )
-{
-	AudioRequest *audioRequest = TheAudio->allocateAudioRequest( true );
-	audioRequest->m_pendingEvent = eventToUse;
-	audioRequest->m_request = AR_Play;
-	TheAudio->appendAudioRequest( audioRequest );
-}
-
-//-------------------------------------------------------------------------------------------------
-void MusicManager::stopTrack( AudioHandle eventToRemove )
-{
-	AudioRequest *audioRequest = TheAudio->allocateAudioRequest( false );
-	audioRequest->m_handleToInteractOn = eventToRemove;
-	audioRequest->m_request = AR_Stop;
-	TheAudio->appendAudioRequest( audioRequest );
-}
-
-//-------------------------------------------------------------------------------------------------
-void MusicManager::addAudioEvent( AudioEventRTS *eventToAdd )
-{
-	playTrack( eventToAdd );
-}
-
-//-------------------------------------------------------------------------------------------------
-void MusicManager::removeAudioEvent( AudioHandle eventToRemove )
-{
-	stopTrack( eventToRemove );
-}
-
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameSounds.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameSounds.cpp
deleted file mode 100644
index 361a752e595..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/Audio/GameSounds.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: GameSounds.cpp
-//
-// Created:   5/02/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Lib/BaseType.h"
-#include "Common/GameSounds.h"
-
-#include "Common/AudioEventInfo.h"
-#include "Common/AudioEventRTS.h"
-#include "Common/AudioRequest.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-
-#include "GameLogic/PartitionManager.h"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-------------------------------------------------------------------------------------------------
-SoundManager::SoundManager()
-{
-	// nada to do
-}
-
-//-------------------------------------------------------------------------------------------------
-SoundManager::~SoundManager()
-{
-	// nada to do
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::init( void )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::postProcessLoad()
-{
-	// The AudioManager should actually be live now, so go ahead and get the info we need from it 
-	// here
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::update( void )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::reset( void )
-{
-	m_numPlaying2DSamples = 0;
-	m_numPlaying3DSamples = 0;
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::loseFocus( void )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::regainFocus( void )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::setListenerPosition( const Coord3D *position )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::setViewRadius( Real viewRadius )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::setCameraAudibleDistance( Real audibleDistance )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-Real SoundManager::getCameraAudibleDistance( void )
-{
-	return 1.0f;
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::addAudioEvent(AudioEventRTS *&eventToAdd)
-{
-	if (m_num2DSamples == 0 && m_num3DSamples == 0) {
-		m_num2DSamples = TheAudio->getNum2DSamples();
-		m_num3DSamples = TheAudio->getNum3DSamples();
-	}
-
-	if (canPlayNow(eventToAdd)) {
-#ifdef INTENSIVE_AUDIO_DEBUG
-		DEBUG_LOG((" - appended to request list with handle '%d'.\n", (UnsignedInt) eventToAdd->getPlayingHandle()));
-#endif
-		AudioRequest *audioRequest = TheAudio->allocateAudioRequest( true );
-		audioRequest->m_pendingEvent = eventToAdd;
-		audioRequest->m_request = AR_Play;
-		TheAudio->appendAudioRequest(audioRequest);
-	} else {
-		TheAudio->releaseAudioEventRTS(eventToAdd);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::notifyOf2DSampleStart( void )
-{
-	++m_numPlaying2DSamples;
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::notifyOf3DSampleStart( void )
-{
-	++m_numPlaying3DSamples;
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::notifyOf2DSampleCompletion( void )
-{
-	if (m_numPlaying2DSamples > 0) {
-		--m_numPlaying2DSamples;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void SoundManager::notifyOf3DSampleCompletion( void )
-{
-	if (m_numPlaying3DSamples > 0) {
-		--m_numPlaying3DSamples;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-Int SoundManager::getAvailableSamples( void )
-{
-	return (m_num2DSamples - m_numPlaying2DSamples);
-}
-
-//-------------------------------------------------------------------------------------------------
-Int SoundManager::getAvailable3DSamples( void )
-{
-	return (m_num3DSamples - m_numPlaying3DSamples);
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString SoundManager::getFilenameForPlayFromAudioEvent( const AudioEventRTS *eventToGetFrom )
-{
-	return AsciiString::TheEmptyString;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool SoundManager::canPlayNow( AudioEventRTS *event )
-{
-	Bool retVal = false;
-	// 1) Are we muted because we're beyond our maximum distance?
-	// 2) Are we shrouded and this is a shroud sound?
-	// 3) Are we violating our voice count or are we playing above the limit? (If so, stop now)
-	// 4) is there an avaiable channel open?
-	// 5) if not, then determine if there is anything of lower priority that we can kill
-	// 6) if not, are we an interrupt-sound type?
-	// if so, are there any sounds of our type playing right now that we can interrupt?
-	// potentially here: Are there any sounds that are playing that are now beyond their distance?
-	// if so, kill them and start our sound
-	// if not, we're done. Can't play dude.
-	
-	if( event->isPositionalAudio() && !BitIsSet( event->getAudioEventInfo()->m_type, ST_GLOBAL) && event->getAudioEventInfo()->m_priority != AP_CRITICAL ) 
-	{
-		Coord3D distance = *TheAudio->getListenerPosition();
-		const Coord3D *pos = event->getCurrentPosition();
-		if (pos) 
-		{
-			distance.sub(pos);
-			if (distance.length() >= event->getAudioEventInfo()->m_maxDistance) 
-			{
-#ifdef INTENSIVE_AUDIO_DEBUG
-				DEBUG_LOG(("- culled due to distance (%.2f).\n", distance.length()));
-#endif
-				return false;
-			}
-			
-			Int localPlayerNdx = ThePlayerList->getLocalPlayer()->getPlayerIndex();
-			if( (event->getAudioEventInfo()->m_type & ST_SHROUDED) && 
-					 ThePartitionManager->getShroudStatusForPlayer(localPlayerNdx, pos) != CELLSHROUD_CLEAR ) 
-			{
-#ifdef INTENSIVE_AUDIO_DEBUG
-				DEBUG_LOG(("- culled due to shroud.\n"));
-#endif
-				return false;
-			}
-		} 
-	}
-
-	if (violatesVoice(event)) 
-	{
-		retVal = isInterrupting(event);
-		if (retVal) 
-		{
-			return true;
-		} 
-		else 
-		{
-#ifdef INTENSIVE_AUDIO_DEBUG
-		DEBUG_LOG(("- culled due to voice.\n"));
-#endif
-			return false;
-		}
-	}
-	
-	if( TheAudio->doesViolateLimit( event ) )
-	{
-#ifdef INTENSIVE_AUDIO_DEBUG
-		DEBUG_LOG(("- culled due to limit.\n" ));
-#endif
-		return false;
-	}
-	else if( isInterrupting( event ) )
-	{
-		return true;
-	}
-
-	if (event->isPositionalAudio()) 
-	{
-		if (m_numPlaying3DSamples < m_num3DSamples) 
-		{
-			return true;
-		}
-#ifdef INTENSIVE_AUDIO_DEBUG
-		DEBUG_LOG(("- %d samples playing, %d samples available", m_numPlaying3DSamples, m_num3DSamples));
-#endif
-	} 
-	else 
-	{
-		// its a UI sound (and thus, 2-D)
-		if (m_numPlaying2DSamples < m_num2DSamples) 
-		{
-			return true;
-		}
-	}
-
-	if (TheAudio->isPlayingLowerPriority(event)) 
-	{
-		return true;
-	}
-
-	if (isInterrupting(event)) 
-	{
-		retVal = TheAudio->isPlayingAlready(event);
-		if (retVal) 
-		{
-			return true;
-		} 
-		else 
-		{
-#ifdef INTENSIVE_AUDIO_DEBUG
-			DEBUG_LOG(("- culled due to no channels available and non-interrupting.\n" ));
-#endif
-			return false;
-		}
-	}
-#ifdef INTENSIVE_AUDIO_DEBUG
-	DEBUG_LOG(("culled due to unavailable channels"));
-#endif
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool SoundManager::violatesVoice( AudioEventRTS *event )
-{
-	if (event->getAudioEventInfo()->m_type & ST_VOICE) {
-		return (event->getObjectID() && TheAudio->isObjectPlayingVoice(event->getObjectID()));
-	}
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool SoundManager::isInterrupting( AudioEventRTS *event )
-{
-	return event->getAudioEventInfo()->m_control & AC_INTERRUPT;
-}
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/simpleplayer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/simpleplayer.cpp
deleted file mode 100644
index 8d134cb56f8..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/Audio/simpleplayer.cpp
+++ /dev/null
@@ -1,708 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "Common/simpleplayer.h"
-#include "Common/urllaunch.h"
-
-
-///////////////////////////////////////////////////////////////////////////////
-CSimplePlayer::CSimplePlayer( HRESULT* phr )
-{
-    m_cRef = 1;
-    m_cBuffersOutstanding = 0;
-
-    m_pReader = NULL;
-
-    m_pHeader = NULL;
-    m_hwo = NULL;
-
-    m_fEof = FALSE;
-    m_pszUrl = NULL;
-
-	*phr = S_OK;
-
-    m_hOpenEvent = CreateEvent( NULL, FALSE, FALSE, SIMPLE_PLAYER_OPEN_EVENT );
-	if ( NULL == m_hOpenEvent )
-	{
-		*phr = E_OUTOFMEMORY;
-	}
-    m_hCloseEvent = CreateEvent( NULL, FALSE, FALSE, SIMPLE_PLAYER_CLOSE_EVENT );
-	if ( NULL == m_hCloseEvent )
-	{
-		*phr = E_OUTOFMEMORY;
-	}
-
-    m_hrOpen = S_OK;
-
-	m_hCompletionEvent = NULL;
-
-    InitializeCriticalSection( &m_CriSec );
-    m_whdrHead = NULL;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-CSimplePlayer::~CSimplePlayer()
-{
-    DEBUG_ASSERTCRASH( 0 == m_cBuffersOutstanding,("CSimplePlayer destructor m_cBuffersOutstanding != 0") );
-
-    Close();
-
-    //
-    // final remove of everything in the wave header list
-    //
-    RemoveWaveHeaders();
-    DeleteCriticalSection( &m_CriSec );
-
-    if( m_pHeader != NULL )
-    {
-        m_pHeader->Release();
-        m_pHeader = NULL;
-    }
-
-    if( m_pReader != NULL )
-    {
-        m_pReader->Release();
-        m_pReader = NULL;
-    }
-
-    if( m_hwo != NULL )
-    {
-        waveOutClose( m_hwo );
-    }
-
-    delete [] m_pszUrl;
-
-	if ( m_hOpenEvent )
-	{
-	    CloseHandle( m_hOpenEvent );
-	}
-	if ( m_hCloseEvent )
-	{
-        CloseHandle( m_hCloseEvent );
-	}
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT STDMETHODCALLTYPE CSimplePlayer::QueryInterface(
-    REFIID riid,
-    void **ppvObject )
-{
-    return( E_NOINTERFACE );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-ULONG STDMETHODCALLTYPE CSimplePlayer::AddRef()
-{
-    return( InterlockedIncrement( &m_cRef ) );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-ULONG STDMETHODCALLTYPE CSimplePlayer::Release()
-{
-    ULONG uRet = InterlockedDecrement( &m_cRef );
-
-    if( 0 == uRet )
-    {
-        delete this;
-    }
-
-    return( uRet );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT STDMETHODCALLTYPE CSimplePlayer::OnSample( 
-        /* [in] */ DWORD dwOutputNum,
-        /* [in] */ QWORD cnsSampleTime,
-        /* [in] */ QWORD cnsSampleDuration,
-        /* [in] */ DWORD dwFlags,
-        /* [in] */ INSSBuffer __RPC_FAR *pSample,
-        /* [in] */ VOID *pvContext )
-{
-    if( 0 != dwOutputNum )
-    {
-        return( S_OK );
-    }
-
-    HRESULT hr = S_OK;
-    BYTE *pData;
-    DWORD cbData;
-
-    //
-    // first UnprepareHeader and remove everthing in the ready list
-    //
-    RemoveWaveHeaders( );
-
-    hr = pSample->GetBufferAndLength( &pData, &cbData );
-    if ( FAILED( hr ) )
-    {
-        return( E_UNEXPECTED );
-    }
-
-    DEBUG_LOG(( " New Sample of length %d and PS time %d ms\n", 
-              cbData, ( DWORD ) ( cnsSampleTime / 10000 ) ));
-
-    LPWAVEHDR pwh = (LPWAVEHDR) new BYTE[ sizeof( WAVEHDR ) + cbData ];
-
-    if( NULL == pwh )
-    {
-        DEBUG_LOG(( "OnSample OUT OF MEMORY! \n"));
-
-        *m_phrCompletion = E_OUTOFMEMORY;
-        SetEvent( m_hCompletionEvent );
-        return( E_UNEXPECTED );
-    }
-
-    pwh->lpData = (LPSTR)&pwh[1];
-    pwh->dwBufferLength = cbData;
-    pwh->dwBytesRecorded = cbData;
-    pwh->dwUser = 0;
-    pwh->dwLoops = 0;
-    pwh->dwFlags = 0;
-
-    CopyMemory( pwh->lpData, pData, cbData );
-
-    MMRESULT mmr;
-
-    mmr = waveOutPrepareHeader( m_hwo, pwh, sizeof(WAVEHDR) );
-    mmr = MMSYSERR_NOERROR;
-
-    if( mmr != MMSYSERR_NOERROR )
-    {
-        DEBUG_LOG(( "failed to prepare wave buffer, error=%lu\n" , mmr ));
-        *m_phrCompletion = E_UNEXPECTED;
-        SetEvent( m_hCompletionEvent );
-        return( E_UNEXPECTED );
-    }
-
-    mmr = waveOutWrite( m_hwo, pwh, sizeof(WAVEHDR) );
-    mmr = MMSYSERR_NOERROR;
-
-    if( mmr != MMSYSERR_NOERROR )
-    {
-        delete pwh;
-
-        DEBUG_LOG(( "failed to write wave sample, error=%lu\n" , mmr ));
-        *m_phrCompletion = E_UNEXPECTED;
-        SetEvent( m_hCompletionEvent );
-        return( E_UNEXPECTED );
-    }
-
-    InterlockedIncrement( &m_cBuffersOutstanding );
-
-    return( S_OK );
-}
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT CSimplePlayer::Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hCompletionEvent, HRESULT *phrCompletion )
-{
-    HRESULT hr;
-
-    //
-    // If the URL is not a UNC path, a full path, or an Internet-style URL then assume it is
-    // a relative local file name that needs to be expanded to a full path.
-    //
-    WCHAR wszFullUrl[ MAX_PATH ];
-
-    if( ( 0 == wcsstr( pszUrl, L"\\\\" ) )
-        && ( 0 == wcsstr( pszUrl, L":\\" ) )
-        && ( 0 == wcsstr( pszUrl, L"://" ) ) )
-    {
-        //
-        // Expand to a full path name
-        //
-        LPWSTR pszCheck = _wfullpath( wszFullUrl, pszUrl, MAX_PATH );
-
-        if( NULL == pszCheck )
-        {
-           DEBUG_LOG(( "internal error %lu\n" , GetLastError() ));
-           return E_UNEXPECTED ;
-        }
-
-		pszUrl = wszFullUrl;
-    }
-
-    //
-    // Save a copy of the URL
-    //
-    delete[] m_pszUrl;
-
-    m_pszUrl = new WCHAR[ wcslen( pszUrl ) + 1 ];
-
-    if( NULL == m_pszUrl )
-    {
-        DEBUG_LOG(( "insufficient Memory\n"  )) ;
-        return( E_OUTOFMEMORY );
-    }
-
-    wcscpy( m_pszUrl, pszUrl );
-
-    //
-    // Attempt to open the URL
-    //
-    m_hCompletionEvent = hCompletionEvent;
-
-    m_phrCompletion = phrCompletion;
-
-#ifdef SUPPORT_DRM
-
-    hr = WMCreateReader( NULL, WMT_RIGHT_PLAYBACK, &m_pReader );
-
-#else
-
-    hr = WMCreateReader( NULL, 0, &m_pReader );
-
-#endif
-
-    if( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "failed to create audio reader (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    //
-    // Open the file
-    //
-    hr = m_pReader->Open( m_pszUrl, this, NULL );
-    if ( SUCCEEDED( hr ) )
-    {
-        WaitForSingleObject( m_hOpenEvent, INFINITE );
-        hr = m_hrOpen;
-    }
-    if ( NS_E_NO_STREAM == hr )
-    {
-        DEBUG_LOG(( "Waiting for transmission to begin...\n" ));
-        WaitForSingleObject( m_hOpenEvent, INFINITE );
-        hr = m_hrOpen;
-    }
-    if ( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "failed to open (hr=0x%08x)\n", hr ));
-        return( hr );
-    }
-         
-
-    //
-    // It worked!  Display various attributes
-    //
-    hr = m_pReader->QueryInterface( IID_IWMHeaderInfo, ( VOID ** )&m_pHeader );
-    if ( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "failed to qi for header interface (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    WORD i, wAttrCnt;
-
-    hr = m_pHeader->GetAttributeCount( 0, &wAttrCnt );
-    if ( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "GetAttributeCount Failed (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    WCHAR *pwszName = NULL;
-    BYTE *pValue = NULL;
-
-    for ( i = 0; i < wAttrCnt ; i++ )
-    {
-        WORD wStream = 0;
-        WORD cchNamelen = 0;
-        WMT_ATTR_DATATYPE type;
-        WORD cbLength = 0;
-
-        hr = m_pHeader->GetAttributeByIndex( i, &wStream, NULL, &cchNamelen, &type, NULL, &cbLength );
-        if ( FAILED( hr ) ) 
-        {
-            DEBUG_LOG(( "GetAttributeByIndex Failed (hr=0x%08x)\n" , hr ));
-            break;
-        }
-
-        pwszName = new WCHAR[ cchNamelen ];
-        pValue = new BYTE[ cbLength ];
-
-        if( NULL == pwszName || NULL == pValue )
-        {
-            hr = E_OUTOFMEMORY;
-            break;
-        }
-
-        hr = m_pHeader->GetAttributeByIndex( i, &wStream, pwszName, &cchNamelen, &type, pValue, &cbLength );
-        if ( FAILED( hr ) ) 
-        {
-            DEBUG_LOG(( "GetAttributeByIndex Failed (hr=0x%08x)\n" , hr ));
-            break;
-        }
-
-        switch ( type )
-        {
-        case WMT_TYPE_DWORD:
-            DEBUG_LOG(("%ws:  %u\n" , pwszName, *((DWORD *) pValue) ));
-            break;
-        case WMT_TYPE_STRING:
-            DEBUG_LOG(("%ws:   %ws\n" , pwszName, (WCHAR *) pValue ));
-            break;
-        case WMT_TYPE_BINARY:
-            DEBUG_LOG(("%ws:   Type = Binary of Length %u\n" , pwszName, cbLength ));
-            break;
-        case WMT_TYPE_BOOL:
-            DEBUG_LOG(("%ws:   %s\n" , pwszName, ( * ( ( BOOL * ) pValue) ? _T( "true" ) : _T( "false" ) ) ));
-            break;
-        case WMT_TYPE_WORD:
-            DEBUG_LOG(("%ws:  %hu\n" , pwszName, *((WORD *) pValue) ));
-            break;
-        case WMT_TYPE_QWORD:
-            DEBUG_LOG(("%ws:  %I64u\n" , pwszName, *((QWORD *) pValue) ));
-            break;
-        case WMT_TYPE_GUID:
-            DEBUG_LOG(("%ws:  %I64x%I64x\n" , pwszName, *((QWORD *) pValue), *((QWORD *) pValue + 1) ));
-            break;
-        default:
-            DEBUG_LOG(("%ws:   Type = %d, Length %u\n" , pwszName, type, cbLength ));
-            break;
-        }
-
-        delete pwszName;
-        pwszName = NULL;
-
-        delete pValue;
-        pValue = NULL;
-    }
-
-    delete pwszName;
-    pwszName = NULL;
-
-    delete pValue;
-    pValue = NULL;
-
-    if ( FAILED( hr ) )
-    {
-        return( hr );
-    }
-
-    //
-    // Make sure we're audio only
-    //
-    DWORD cOutputs;
-
-    hr = m_pReader->GetOutputCount( &cOutputs );
-    if ( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "failed GetOutputCount(), (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    if ( cOutputs != 1 )
-    {
-        DEBUG_LOG(( "Not audio only (cOutputs = %d).\n" , cOutputs ));
-        // return( E_UNEXPECTED );
-    }
-
-    IWMOutputMediaProps *pProps;
-    hr = m_pReader->GetOutputProps( 0, &pProps );
-    if ( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "failed GetOutputProps(), (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    DWORD cbBuffer = 0;
-
-    hr = pProps->GetMediaType( NULL, &cbBuffer );
-    if ( FAILED( hr ) )
-    {
-        pProps->Release( );
-        DEBUG_LOG(( "GetMediaType failed (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-    
-	WM_MEDIA_TYPE *pMediaType = ( WM_MEDIA_TYPE * ) new BYTE[cbBuffer] ;
-
-	hr = pProps->GetMediaType( pMediaType, &cbBuffer );
-    if ( FAILED( hr ) )
-    {
-        pProps->Release( );
-        DEBUG_LOG(( "GetMediaType failed (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    pProps->Release( );
-
-    if ( pMediaType->majortype != WMMEDIATYPE_Audio )
-    {
-		delete[] (BYTE *) pMediaType ;
-        DEBUG_LOG(( "Not audio only (major type mismatch).\n"  ));
-        return( E_UNEXPECTED );
-    }
-    
-    //
-    // Set up for audio playback
-    //
-    WAVEFORMATEX *pwfx = ( WAVEFORMATEX * )pMediaType->pbFormat;
-    memcpy( &m_wfx, pwfx, sizeof( WAVEFORMATEX ) + pwfx->cbSize );
-    
-    delete[] (BYTE *)pMediaType ;
-	pMediaType = NULL ;
-
-    MMRESULT mmr;
-
-    mmr = waveOutOpen( &m_hwo,
-                       WAVE_MAPPER, 
-                       &m_wfx, 
-                       (DWORD)WaveProc, 
-                       (DWORD)this, 
-                       CALLBACK_FUNCTION );
-    mmr = MMSYSERR_NOERROR;
-
-    if( mmr != MMSYSERR_NOERROR  )
-    {
-        
-        DEBUG_LOG(( "failed to open wav output device, error=%lu\n" , mmr ));
-        return( E_UNEXPECTED );
-    }
-
-    //
-    // Start reading the data (and rendering the audio)
-    //
-    QWORD cnsDuration = ( QWORD ) dwSecDuration * 10000000;
-    hr = m_pReader->Start( 0, cnsDuration, 1.0, NULL );
-
-    if( FAILED( hr ) )
-    {
-        DEBUG_LOG(( "failed Start(), (hr=0x%08x)\n" , hr ));
-        return( hr );
-    }
-
-    return( hr );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT STDMETHODCALLTYPE CSimplePlayer::OnStatus( 
-        /* [in] */ WMT_STATUS Status,
-        /* [in] */ HRESULT hr,
-        /* [in] */ WMT_ATTR_DATATYPE dwType,
-        /* [in] */ BYTE __RPC_FAR *pValue,
-        /* [in] */ void __RPC_FAR *pvContext)
-{
-    switch( Status )
-    {
-    case WMT_OPENED:
-        DEBUG_LOG(( "OnStatus( WMT_OPENED )\n"  ));
-        m_hrOpen = hr;
-        SetEvent( m_hOpenEvent );
-        break;
-
-    case WMT_SOURCE_SWITCH:
-        DEBUG_LOG(( "OnStatus( WMT_SOURCE_SWITCH )\n"  ));
-        m_hrOpen = hr;
-        SetEvent( m_hOpenEvent );
-        break;
-
-    case WMT_ERROR:
-        DEBUG_LOG(( "OnStatus( WMT_ERROR )\n"  ));
-        break;
-
-    case WMT_STARTED:
-        DEBUG_LOG(( "OnStatus( WMT_STARTED )\n"  ));
-        break;
-
-    case WMT_STOPPED:
-        DEBUG_LOG(( "OnStatus( WMT_STOPPED )\n"  ));
-        break;
-
-    case WMT_BUFFERING_START:
-        DEBUG_LOG(( "OnStatus( WMT_BUFFERING START)\n"  ));
-        break;
-
-    case WMT_BUFFERING_STOP:
-        DEBUG_LOG(( "OnStatus( WMT_BUFFERING STOP)\n"  ));
-        break;
-
-    case WMT_EOF:
-        DEBUG_LOG(( "OnStatus( WMT_EOF )\n"  ));
-
-        //
-        // cleanup and exit
-        //
-
-        m_fEof = TRUE;
-
-        if( 0 == m_cBuffersOutstanding )
-        {
-            SetEvent( m_hCompletionEvent );
-        }
-
-        break;
-
-    case WMT_END_OF_SEGMENT:
-        DEBUG_LOG(( "OnStatus( WMT_END_OF_SEGMENT )\n"  ));
-
-        //
-        // cleanup and exit
-        //
-
-        m_fEof = TRUE;
-
-        if( 0 == m_cBuffersOutstanding )
-        {
-            SetEvent( m_hCompletionEvent );
-        }
-
-        break;
-
-    case WMT_LOCATING:
-        DEBUG_LOG(( "OnStatus( WMT_LOCATING )\n"  ));
-        break;
-
-    case WMT_CONNECTING:
-        DEBUG_LOG(( "OnStatus( WMT_CONNECTING )\n"  ));
-        break;
-
-    case WMT_NO_RIGHTS:
-        {
-            LPWSTR pwszEscapedURL = NULL;
-
-            hr = MakeEscapedURL( m_pszUrl, &pwszEscapedURL );
-
-            if( SUCCEEDED( hr ) )
-            {
-                WCHAR wszURL[ 0x1000 ];
-
-                swprintf( wszURL, L"%s&filename=%s&embedded=false", pValue, pwszEscapedURL );
-
-                hr = LaunchURL( wszURL );
-
-                if( FAILED( hr ) )
-                {
-                    DEBUG_LOG(( "Unable to launch web browser to retrieve playback license (hr=0x%08x)\n" , hr ));
-                }
-
-                delete [] pwszEscapedURL;
-				pwszEscapedURL = NULL ;
-            }
-        }
-        break;
-
-    case WMT_MISSING_CODEC:
-		{
-			DEBUG_LOG(( "Missing codec: (hr=0x%08x)\n" , hr ));
-			break;
-		}
-
-    case WMT_CLOSED:
-        SetEvent( m_hCloseEvent );
-        break;
-    };
-
-    return( S_OK );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT CSimplePlayer::Close()
-{
-    HRESULT hr = S_OK;
-
-    if( NULL != m_pReader )
-    {
-        hr = m_pReader->Close();
-
-        if( SUCCEEDED( hr ) )
-        {
-            WaitForSingleObject( m_hCloseEvent, INFINITE );
-        }
-    }
-
-    return( hr );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-void CSimplePlayer::OnWaveOutMsg( UINT uMsg, DWORD dwParam1, DWORD dwParam2 )
-{
-    if( WOM_DONE == uMsg )
-    {
-        //
-        // add the wave header to ready-to-free list for the caller
-        // to pick up and free in the next OnSample call
-        //
-        AddWaveHeader( ( LPWAVEHDR )dwParam1 );
-
-        InterlockedDecrement( &m_cBuffersOutstanding );
-
-        if( m_fEof && ( 0 == m_cBuffersOutstanding ) )
-        {
-            SetEvent( m_hCompletionEvent );
-        }
-    }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-void CALLBACK CSimplePlayer::WaveProc( 
-                                HWAVEOUT hwo, 
-                                UINT uMsg, 
-                                DWORD dwInstance, 
-                                DWORD dwParam1, 
-                                DWORD dwParam2 )
-{
-    CSimplePlayer *pThis = (CSimplePlayer*)dwInstance;
-
-    pThis->OnWaveOutMsg( uMsg, dwParam1, dwParam2 );
-}
-
-//////////////////////////////////////////////////////////////////////////////
-HRESULT CSimplePlayer::AddWaveHeader( LPWAVEHDR pwh )
-{
-    WAVEHDR_LIST *tmp = new WAVEHDR_LIST;
-    if( NULL == tmp )
-    {
-        return( E_OUTOFMEMORY );
-    }
-    tmp->pwh = pwh;
-
-    EnterCriticalSection( &m_CriSec );
-    tmp->next = m_whdrHead;
-    m_whdrHead = tmp;
-    LeaveCriticalSection( &m_CriSec );
-    return( S_OK );
-}
-
-//////////////////////////////////////////////////////////////////////////////
-void CSimplePlayer::RemoveWaveHeaders( )
-{
-    WAVEHDR_LIST *tmp;
-
-    EnterCriticalSection( &m_CriSec );
-    while( NULL != m_whdrHead )
-    {
-        tmp = m_whdrHead->next;
-        DEBUG_ASSERTCRASH( m_whdrHead->pwh->dwFlags & WHDR_DONE, ("RemoveWaveHeaders!") );
-        waveOutUnprepareHeader( m_hwo, m_whdrHead->pwh, sizeof( WAVEHDR ) );
-        delete m_whdrHead->pwh;
-        delete m_whdrHead;
-        m_whdrHead = tmp;
-    }
-    LeaveCriticalSection( &m_CriSec );
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/urllaunch.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/urllaunch.cpp
deleted file mode 100644
index 2abe264ee44..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/Audio/urllaunch.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "Common/urllaunch.h"
-
-#define FILE_PREFIX     L"file://"
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL )
-{
-    if( ( NULL == pszInURL ) || ( NULL == ppszOutURL ) )
-    {
-        return( E_INVALIDARG );
-    }
-
-    //
-    // Do we need to pre-pend file://?
-    //
-    BOOL fNeedFilePrefix = ( 0 == wcsstr( pszInURL, L"://" ) );
-
-    //
-    // Count how many characters need to be escaped
-    //
-    LPWSTR pszTemp = pszInURL;
-    DWORD cEscapees = 0;
-
-    while( TRUE )
-    {
-        LPWSTR pchToEscape = wcspbrk( pszTemp, L" #$%&\\+,;=@[]^{}" );
-
-        if( NULL == pchToEscape )
-        {
-            break;
-        }
-
-        cEscapees++;
-
-        pszTemp = pchToEscape + 1;
-    }
-
-    //
-    // Allocate sufficient outgoing buffer space
-    //
-    int cchNeeded = wcslen( pszInURL ) + ( 2 * cEscapees ) + 1;
-
-    if( fNeedFilePrefix )
-    {
-        cchNeeded += wcslen( FILE_PREFIX );
-    }
-
-    *ppszOutURL = new WCHAR[ cchNeeded ];
-
-    if( NULL == *ppszOutURL )
-    {
-        return( E_OUTOFMEMORY );
-    }
-
-    //
-    // Fill in the outgoing escaped buffer
-    //
-    pszTemp = pszInURL;
-
-    LPWSTR pchNext = *ppszOutURL;
-
-    if( fNeedFilePrefix )
-    {
-        wcscpy( *ppszOutURL, FILE_PREFIX );
-        pchNext += wcslen( FILE_PREFIX );
-    }
-
-    while( TRUE )
-    {
-        LPWSTR pchToEscape = wcspbrk( pszTemp, L" #$%&\\+,;=@[]^{}" );
-
-        if( NULL == pchToEscape )
-        {
-            //
-            // Copy the rest of the input string and get out
-            //
-            wcscpy( pchNext, pszTemp );
-            break;
-        }
-
-        //
-        // Copy all characters since the previous escapee
-        //
-        int cchToCopy = pchToEscape - pszTemp;
-
-        if( cchToCopy > 0 )
-        {
-            wcsncpy( pchNext, pszTemp, cchToCopy );
-
-            pchNext += cchToCopy;
-        }
-
-        //
-        // Expand this character into an escape code and move on
-        //
-        pchNext += swprintf( pchNext, L"%%%02x", *pchToEscape );
-
-        pszTemp = pchToEscape + 1;
-    }
-
-    return( S_OK );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT GetShellOpenCommand( LPTSTR ptszShellOpenCommand, DWORD cbShellOpenCommand )
-{
-    LONG lResult;
-
-    HKEY hKey = NULL;
-    HKEY hFileKey = NULL;
-
-    BOOL fFoundExtensionCommand = FALSE;
-
-    do
-    {
-        //
-        // Look for the file type associated with .html files
-        //
-        TCHAR szFileType[ MAX_PATH ];
-
-        lResult = RegOpenKeyEx( HKEY_CLASSES_ROOT, _T( ".html" ), 0, KEY_READ, &hKey );
-
-        if( ERROR_SUCCESS != lResult )
-        {
-            break;
-        }
-
-        DWORD dwLength = sizeof( szFileType );
-
-        lResult = RegQueryValueEx( hKey, NULL, 0, NULL, (BYTE *)szFileType, &dwLength );
-
-        if( ERROR_SUCCESS != lResult )
-        {
-            break;
-        }
-
-        //
-        // Find the command for the shell's open verb associated with this file type
-        //
-        TCHAR szKeyName[ MAX_PATH + 20 ];
-
-        wsprintf( szKeyName, _T( "%s\\shell\\open\\command" ), szFileType );
-
-        lResult = RegOpenKeyEx( HKEY_CLASSES_ROOT, szKeyName, 0, KEY_READ, &hFileKey );
-
-        if( ERROR_SUCCESS != lResult )
-        {
-            break;
-        }
-
-        dwLength = cbShellOpenCommand;
-
-        lResult = RegQueryValueEx( hFileKey, NULL, 0, NULL, (BYTE *)ptszShellOpenCommand, &dwLength );
-
-        if( 0 == lResult )
-        {
-            fFoundExtensionCommand = TRUE;
-        }
-    }
-    while( FALSE );
-
-    //
-    // If there was no application associated with .html files by extension, look for
-    // an application associated with the http protocol
-    //
-    if( !fFoundExtensionCommand )
-    {
-        if( NULL != hKey )
-        {
-            RegCloseKey( hKey );
-        }
-
-        do
-        {
-            //
-            // Find the command for the shell's open verb associated with the http protocol
-            //
-            lResult = RegOpenKeyEx( HKEY_CLASSES_ROOT, _T( "http\\shell\\open\\command" ), 0, KEY_READ, &hKey );
-
-            if( ERROR_SUCCESS != lResult )
-            {
-                break;
-            }
-
-            DWORD dwLength = cbShellOpenCommand;
-
-            lResult = RegQueryValueEx( hKey, NULL, 0, NULL, (BYTE *)ptszShellOpenCommand, &dwLength );
-        }
-        while( FALSE );
-    }
-
-    if( NULL != hKey )
-    {
-        RegCloseKey( hKey );
-    }
-
-    if( NULL != hFileKey )
-    {
-        RegCloseKey( hFileKey );
-    }
-
-    return( HRESULT_FROM_WIN32( lResult ) );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-HRESULT LaunchURL( LPCWSTR pszURL )
-{
-    HRESULT hr;
-
-    //
-    // Find the appropriate command to launch URLs with
-    //
-    TCHAR szShellOpenCommand[ MAX_PATH * 2 ];
-
-    hr = GetShellOpenCommand( szShellOpenCommand, sizeof( szShellOpenCommand ) );
-
-    if( FAILED( hr ) )
-    {
-        return( hr );
-    }
-
-    //
-    // Build the appropriate command line, substituting our URL parameter
-    //
-    TCHAR szLaunchCommand[ 2000 ];
-
-    LPTSTR pszParam = _tcsstr( szShellOpenCommand, _T( "\"%1\"" ) );
-
-    if( NULL == pszParam )
-    {
-        pszParam = _tcsstr( szShellOpenCommand, _T( "\"%*\"" ) );
-    }
-
-    if( NULL != pszParam )
-    {
-        *pszParam = _T( '\0' ) ;
-
-        wsprintf( szLaunchCommand, _T( "%s%ws%s" ), szShellOpenCommand, pszURL, pszParam + 4 );
-    }
-    else
-    {
-        wsprintf( szLaunchCommand, _T( "%s %ws" ), szShellOpenCommand, pszURL );
-    }
-
-    //
-    // Find the application name, stripping quotes if necessary
-    //
-    TCHAR szExe[ MAX_PATH * 2 ];
-    LPTSTR pchFirst = szShellOpenCommand;
-    LPTSTR pchNext = NULL;
-
-    while( _T( ' ' ) == *pchFirst )
-    {
-        pchFirst++;
-    }
-
-    if( _T( '"' ) == *pchFirst )
-    {
-        pchFirst++;
-
-        pchNext = _tcschr( pchFirst, _T( '"' ) );
-    }
-    else
-    {
-        pchNext = _tcschr( pchFirst + 1, _T( ' ' ) );
-    }
-
-    if( NULL == pchNext )
-    {
-        pchNext = szShellOpenCommand + _tcslen( szShellOpenCommand );
-    }
-
-    _tcsncpy( szExe, pchFirst, pchNext - pchFirst );
-    szExe[ pchNext - pchFirst ] = _T( '\0' ) ;
-
-    //
-    // Because of the extremely long length of the URLs, neither
-    // WinExec, nor ShellExecute, were working correctly.  For this reason 
-    // we use CreateProcess.  The CreateProcess documentation in MSDN says
-    // that the most robust way to call CreateProcess is to pass the full
-    // command line, where the first element is the application name, in the
-    // lpCommandLine parameter.  In our case this is necesssary to get Netscape
-    // to function properly.
-    //
-    PROCESS_INFORMATION ProcInfo;
-    ZeroMemory( (LPVOID)&ProcInfo, sizeof( PROCESS_INFORMATION ) );
-
-    STARTUPINFO StartUp;
-    ZeroMemory( (LPVOID)&StartUp, sizeof( STARTUPINFO ) );
-
-    StartUp.cb = sizeof(STARTUPINFO); 
-
-    if( !CreateProcess( szExe, szLaunchCommand, NULL, NULL, 
-                        FALSE, 0, NULL, NULL, &StartUp, &ProcInfo) )
-    {
-        hr = HRESULT_FROM_WIN32( GetLastError() );
-    }
-    else
-    {
-        //
-        // CreateProcess succeeded and we do not need the handles to the thread 
-        // or the process, so close them now.
-        //
-        if( NULL != ProcInfo.hThread )
-        {
-            CloseHandle( ProcInfo.hThread );
-        }
-
-        if( NULL != ProcInfo.hProcess )
-        {
-            CloseHandle( ProcInfo.hProcess );
-        }
-    }
-
-    return( hr );
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp
index 35174925713..976b119fc7b 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezFwdIterator.cpp
@@ -27,24 +27,20 @@
 
 //-------------------------------------------------------------------------------------------------
 BezFwdIterator::BezFwdIterator(): mStep(0), mStepsDesired(0)
-{ 
-	// Added by Sadullah Nader
+{
 	mCurrPoint.zero();
 	mDDDq.zero();
 	mDDq.zero();
 	mDq.zero();
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 BezFwdIterator::BezFwdIterator(Int stepsDesired, const BezierSegment *bezSeg)
 {
-	// Added by Sadullah Nader
 	mCurrPoint.zero();
 	mDDDq.zero();
 	mDDq.zero();
 	mDq.zero();
-	//
-
 	mStepsDesired = stepsDesired;
 	mBezSeg = (*bezSeg);
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezierSegment.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezierSegment.cpp
index 2e43e178f9c..c491126a601 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezierSegment.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/Bezier/BezierSegment.cpp
@@ -31,15 +31,15 @@
 
 //-------------------------------------------------------------------------------------------------
 BezierSegment::BezierSegment()
-{ 
+{
 	for(int i=0; i < 4; i++)
 		m_controlPoints[i].zero();
 }
 
 //-------------------------------------------------------------------------------------------------
-BezierSegment::BezierSegment(Real x0, Real y0, Real z0, 
-														 Real x1, Real y1, Real z1, 
-														 Real x2, Real y2, Real z2, 
+BezierSegment::BezierSegment(Real x0, Real y0, Real z0,
+														 Real x1, Real y1, Real z1,
+														 Real x2, Real y2, Real z2,
 														 Real x3, Real y3, Real z3)
 {
 	m_controlPoints[0].x = x0;
@@ -110,7 +110,7 @@ void BezierSegment::evaluateBezSegmentAtT(Real tValue, Coord3D *outResult) const
 
 	D3DXVECTOR4 tResult;
 	D3DXVec4Transform(&tResult, &tVec, &BezierSegment::s_bezBasisMatrix);
-	
+
 	outResult->x = D3DXVec4Dot(&xCoords, &tResult);
 	outResult->y = D3DXVec4Dot(&yCoords, &tResult);
 	outResult->z = D3DXVec4Dot(&zCoords, &tResult);
@@ -122,7 +122,7 @@ void BezierSegment::getSegmentPoints(Int numSegments, VecCoord3D *outResult) con
 	if (!outResult) {
 		return;
 	}
-	
+
 	outResult->clear();
 	outResult->resize(numSegments);
 
@@ -137,24 +137,24 @@ void BezierSegment::getSegmentPoints(Int numSegments, VecCoord3D *outResult) con
 }
 
 //-------------------------------------------------------------------------------------------------
-// This function isn't terribly fast. There are alternatives, and if this is too slow, we can 
+// This function isn't terribly fast. There are alternatives, and if this is too slow, we can
 // take a look at the other approximations.
 // There is no known close-form solution to this problem.
 Real BezierSegment::getApproximateLength(Real withinTolerance) const
 {
 	/*
 		How this works:
-		We can determine the approximate length of a bezier segment by 
-		L0 = |(P0,P1)| + |(P1,P2)| + |(P2,P3)| 
+		We can determine the approximate length of a bezier segment by
+		L0 = |(P0,P1)| + |(P1,P2)| + |(P2,P3)|
 		L1 = |(P0,P3)|
-		
+
 		The length of the segment is approximately 1/2 L0 + 1/2 L1
 
 		P1__P2
 		/		 \
 	 P0----P3
 
-		The error in this is L1 - L0. If the error is too much, then we subdivide the curve and 
+		The error in this is L1 - L0. If the error is too much, then we subdivide the curve and
 		try again.
 	*/
 
@@ -211,12 +211,12 @@ void BezierSegment::splitSegmentAtT(Real tValue, BezierSegment &outSeg1, BezierS
 	p1p2.add(&m_controlPoints[1]);
 	p2p3.add(&m_controlPoints[2]);
 
-	Coord3D triLeft = { p1p2.x - p0p1.x, 
-											p1p2.y - p0p1.y, 
+	Coord3D triLeft = { p1p2.x - p0p1.x,
+											p1p2.y - p0p1.y,
 											p1p2.z - p0p1.z, };
 
-	Coord3D triRight = { p2p3.x - p1p2.x, 
-											 p2p3.y - p1p2.y, 
+	Coord3D triRight = { p2p3.x - p1p2.x,
+											 p2p3.y - p1p2.y,
 											 p2p3.z - p1p2.z, };
 
 	triLeft.scale(tValue);
@@ -233,7 +233,7 @@ void BezierSegment::splitSegmentAtT(Real tValue, BezierSegment &outSeg1, BezierS
 	outSeg2.m_controlPoints[0] = outSeg1.m_controlPoints[3];
 	outSeg2.m_controlPoints[1] = triRight;
 	outSeg2.m_controlPoints[2] = p2p3;
-	outSeg2.m_controlPoints[3] = m_controlPoints[3];	
+	outSeg2.m_controlPoints[3] = m_controlPoints[3];
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/BitFlags.cpp b/GeneralsMD/Code/GameEngine/Source/Common/BitFlags.cpp
index fad98759a85..8fb0da908e3 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/BitFlags.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/BitFlags.cpp
@@ -32,14 +32,15 @@
 
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
-#include "Common/BitFlags.h" 
+#include "Common/BitFlags.h"
 #include "Common/BitFlagsIO.h"
 #include "Common/ModelState.h"
 #include "GameLogic/ArmorSet.h"
 
-const char* ModelConditionFlags::s_bitNameList[] = 
-{	
-	"TOPPLED", 
+template<>
+const char* const ModelConditionFlags::s_bitNameList[] =
+{
+	"TOPPLED",
 	"FRONTCRUSHED",
 	"BACKCRUSHED",
 	"DAMAGED",
@@ -125,7 +126,7 @@ const char* ModelConditionFlags::s_bitNameList[] =
 	"RAPPELLING",
 	"ARMED",
 	"POWER_PLANT_UPGRADING",
-	
+
 	"SPECIAL_CHEERING",
 
 	"CONTINUOUS_FIRE_SLOW",
@@ -144,7 +145,7 @@ const char* ModelConditionFlags::s_bitNameList[] =
 	"USING_WEAPON_C",
 
 	"PREORDER",
-	
+
 	"CENTER_TO_LEFT",
 	"LEFT_TO_CENTER",
 	"CENTER_TO_RIGHT",
@@ -166,15 +167,17 @@ const char* ModelConditionFlags::s_bitNameList[] =
 	"ARMORSET_CRATEUPGRADE_ONE",
 	"ARMORSET_CRATEUPGRADE_TWO",
 
-	"USER_1",	
+	"USER_1",
 	"USER_2",
-	
+
 	"DISGUISED",
-	
+
 	NULL
 };
- 
-const char* ArmorSetFlags::s_bitNameList[] = 
+static_assert(ARRAY_SIZE(ModelConditionFlags::s_bitNameList) == ModelConditionFlags::NumBits + 1, "Incorrect array size");
+
+template<>
+const char* const ArmorSetFlags::s_bitNameList[] =
 {
 	"VETERAN",
 	"ELITE",
@@ -187,4 +190,4 @@ const char* ArmorSetFlags::s_bitNameList[] =
 
 	NULL
 };
-
+static_assert(ARRAY_SIZE(ArmorSetFlags::s_bitNameList) == ArmorSetFlags::NumBits + 1, "Incorrect array size");
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/CRCDebug.cpp b/GeneralsMD/Code/GameEngine/Source/Common/CRCDebug.cpp
deleted file mode 100644
index 6263d46eb46..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/CRCDebug.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/CRCDebug.h"
-#include "Common/Debug.h"
-#include "Common/PerfTimer.h"
-#include "Common/LocalFileSystem.h"
-#include "GameClient/InGameUI.h"
-#include "GameNetwork/IPEnumeration.h"
-#include <cstdarg>
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#ifdef DEBUG_CRC
-
-static const Int MaxStrings = 64000;
-static const Int MaxStringLen = 1024;
-
-static char DebugStrings[MaxStrings][MaxStringLen];
-static Int nextDebugString = 0;
-static Int numDebugStrings = 0;
-//static char DumpStrings[MaxStrings][MaxStringLen];
-//static Int nextDumpString = 0;
-//static Int numDumpStrings = 0;
-
-#define IS_FRAME_OK_TO_LOG TheGameLogic->isInGame() && !TheGameLogic->isInShellGame() && !TheDebugIgnoreSyncErrors && \
-	TheCRCFirstFrameToLog >= 0 && TheCRCFirstFrameToLog <= TheGameLogic->getFrame() \
-	&& TheGameLogic->getFrame() <= TheCRCLastFrameToLog
-
-CRCVerification::CRCVerification()
-{
-#ifdef DEBUG_LOGGING
-/**/
-	if (g_verifyClientCRC && (IS_FRAME_OK_TO_LOG))
-	{
-		m_startCRC = TheGameLogic->getCRC(CRC_RECALC, (g_clientDeepCRC)?"clientPre.crc":"");
-	}
-	else
-	{
-		m_startCRC = 0;
-	}
-/**/
-#endif
-}
-
-CRCVerification::~CRCVerification()
-{
-#ifdef DEBUG_LOGGING
-/**/
-	UnsignedInt endCRC = 0;
-	if (g_verifyClientCRC && (IS_FRAME_OK_TO_LOG))
-	{
-		endCRC = TheGameLogic->getCRC(CRC_RECALC, (g_clientDeepCRC)?"clientPost.crc":"");
-	}
-	DEBUG_ASSERTCRASH(!TheGameLogic->isInGame() || m_startCRC == endCRC, ("GameLogic changed outside of GameLogic::update() on frame %d!", TheGameLogic->getFrame()));
-	if (TheGameLogic->isInMultiplayerGame() && m_startCRC != endCRC)
-	{
-		if (TheInGameUI)
-		{
-			TheInGameUI->message(UnicodeString(L"GameLogic changed outside of GameLogic::update() - call Matt (x36804)!"));
-		}
-		CRCDEBUG_LOG(("GameLogic changed outside of GameLogic::update()!!!\n"));
-	}
-/**/
-#endif
-}
-
-void outputCRCDebugLines( void )
-{
-	IPEnumeration ips;
-	AsciiString fname;
-	fname.format("crcDebug%s.txt", ips.getMachineName().str());
-	FILE *fp = fopen(fname.str(), "wt");
-	int start = 0;
-	int end = nextDebugString;
-	if (numDebugStrings >= MaxStrings)
-		start = nextDebugString - MaxStrings;
-
-	for (Int i=start; i<end; ++i)
-	{
-		const char *line = DebugStrings[ (i + MaxStrings) % MaxStrings ];
-		DEBUG_LOG(("%s\n", line));
-		if (fp) fprintf(fp, "%s\n", line);
-	}
-
-	if (fp) fclose(fp);
-}
-
-Int lastCRCDebugFrame = 0;
-Int lastCRCDebugIndex = 0;
-extern Bool inCRCGen;
-
-void CRCDebugStartNewGame()
-{
-	if (TheGameLogic->isInShellGame())
-		return;
-	if (g_saveDebugCRCPerFrame)
-	{
-		// Create folder for frame data, if it doesn't exist yet.
-		CreateDirectory(g_saveDebugCRCPerFrameDir.str(), NULL);
-
-		// Delete existing files
-		FilenameList files;
-		AsciiString dir = g_saveDebugCRCPerFrameDir;
-		dir.concat("/");
-		TheLocalFileSystem->getFileListInDirectory(dir.str(), "", "DebugFrame_*.txt", files, FALSE);
-		FilenameList::iterator it;
-		for (it = files.begin(); it != files.end(); ++it)
-		{
-			DeleteFile(it->str());
-		}
-	}
-	nextDebugString = 0;
-	numDebugStrings = 0;
-	lastCRCDebugFrame = 0;
-	lastCRCDebugIndex = 0;
-}
-
-static void outputCRCDebugLinesPerFrame()
-{
-	if (!g_saveDebugCRCPerFrame || numDebugStrings == 0)
-		return;
-	AsciiString fname;
-	fname.format("%s/DebugFrame_%06d.txt", g_saveDebugCRCPerFrameDir.str(), lastCRCDebugFrame);
-	FILE *fp = fopen(fname.str(), "wt");
-	int start = 0;
-	int end = nextDebugString;
-	if (numDebugStrings >= MaxStrings)
-		start = nextDebugString - MaxStrings;
-	nextDebugString = 0;
-	numDebugStrings = 0;
-	if (!fp)
-		return;
-
-	for (Int i=start; i<end; ++i)
-	{
-		const char *line = DebugStrings[ (i + MaxStrings) % MaxStrings ];
-		//DEBUG_LOG(("%s\n", line));
-		fprintf(fp, "%s\n", line);
-	}
-
-	fclose(fp);
-}
-
-void outputCRCDumpLines( void )
-{
-	/*
-	int start = 0;
-	int end = nextDumpString;
-	if (numDumpStrings >= MaxStrings)
-		start = nextDumpString - MaxStrings;
-
-	for (Int i=start; i<end; ++i)
-	{
-		const char *line = DumpStrings[ (i + MaxStrings) % MaxStrings ];
-		DEBUG_LOG(("%s", line));
-	}
-	*/
-}
-
-static AsciiString getFname(AsciiString path)
-{
-	return path.reverseFind('\\') + 1;
-}
-
-static void addCRCDebugLineInternal(bool count, const char *fmt, va_list args)
-{
-	if (TheGameLogic == NULL || !(IS_FRAME_OK_TO_LOG))
-		return;
-
-	if (lastCRCDebugFrame != TheGameLogic->getFrame())
-	{
-		outputCRCDebugLinesPerFrame();
-		lastCRCDebugFrame = TheGameLogic->getFrame();
-		lastCRCDebugIndex = 0;
-	}
-
-	if (count)
-		sprintf(DebugStrings[nextDebugString], "%d:%05d ", TheGameLogic->getFrame(), lastCRCDebugIndex++);
-	else
-		DebugStrings[nextDebugString][0] = 0;
-	Int len = strlen(DebugStrings[nextDebugString]);
-
-	vsnprintf(DebugStrings[nextDebugString]+len, MaxStringLen-len, fmt, args);
-
-	char *tmp = DebugStrings[nextDebugString];
-	while (tmp && *tmp)
-	{
-		if (*tmp == '\r' || *tmp == '\n')
-		{
-			*tmp = ' ';
-		}
-		++tmp;
-	}
-
-	//DEBUG_LOG(("%s\n", DebugStrings[nextDebugString]));
-
-	++nextDebugString;
-	++numDebugStrings;
-	if (nextDebugString == MaxStrings)
-		nextDebugString = 0;
-}
-
-void addCRCDebugLine(const char *fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    addCRCDebugLineInternal(true, fmt, args);
-    va_end(args);
-}
-
-void addCRCDebugLineNoCounter(const char *fmt, ...)
-{
-	// TheSuperHackers @feature helmutbuhler 04/09/2025
-	// This version doesn't increase the lastCRCDebugIndex counter
-	// and can be used for logging lines that don't necessarily match up on all peers.
-	// (Otherwise the numbers would no longer match up and the diff would be very difficult to read)
-    va_list args;
-    va_start(args, fmt);
-    addCRCDebugLineInternal(false, fmt, args);
-    va_end(args);
-}
-
-void addCRCGenLine(const char *fmt, ...)
-{
-	if (!(IS_FRAME_OK_TO_LOG))
-		return;
-
-	static char buf[MaxStringLen];
-	va_list va;
-	va_start( va, fmt );
-	vsnprintf(buf, MaxStringLen, fmt, va );
-	va_end( va );
-	addCRCDebugLine("%s", buf);
-
-	//DEBUG_LOG(("%s", buf));
-}
-
-void addCRCDumpLine(const char *fmt, ...)
-{
-	/*
-	va_list va;
-	va_start( va, fmt );
-	vsnprintf(DumpStrings[nextDumpString], MaxStringLen, fmt, va );
-	va_end( va );
-
-	++nextDumpString;
-	++numDumpStrings;
-	if (nextDumpString == MaxStrings)
-		nextDumpString = 0;
-		*/
-}
-
-void dumpVector3(const Vector3 *v, AsciiString name, AsciiString fname, Int line)
-{
-	if (!(IS_FRAME_OK_TO_LOG)) return;
-	fname.toLower();
-	fname = getFname(fname);
-	addCRCDebugLine("dumpVector3() %s:%d %s %8.8X %8.8X %8.8X\n",
-		fname.str(), line, name.str(),
-		AS_INT(v->X), AS_INT(v->Y), AS_INT(v->Z));
-}
-
-void dumpCoord3D(const Coord3D *c, AsciiString name, AsciiString fname, Int line)
-{
-	if (!(IS_FRAME_OK_TO_LOG)) return;
-	fname.toLower();
-	fname = getFname(fname);
-	addCRCDebugLine("dumpCoord3D() %s:%d %s %8.8X %8.8X %8.8X\n",
-		fname.str(), line, name.str(),
-		AS_INT(c->x), AS_INT(c->y), AS_INT(c->z));
-}
-
-void dumpMatrix3D(const Matrix3D *m, AsciiString name, AsciiString fname, Int line)
-{
-	if (!(IS_FRAME_OK_TO_LOG)) return;
-	fname.toLower();
-	fname = getFname(fname);
-	const Real *matrix = (const Real *)m;
-	addCRCDebugLine("dumpMatrix3D() %s:%d %s\n",
-		fname.str(), line, name.str());
-	for (Int i=0; i<3; ++i)
-		addCRCDebugLine("      0x%08X 0x%08X 0x%08X 0x%08X\n",
-			AS_INT(matrix[(i<<2)+0]), AS_INT(matrix[(i<<2)+1]), AS_INT(matrix[(i<<2)+2]), AS_INT(matrix[(i<<2)+3]));
-}
-
-void dumpReal(Real r, AsciiString name, AsciiString fname, Int line)
-{
-	if (!(IS_FRAME_OK_TO_LOG)) return;
-	fname.toLower();
-	fname = getFname(fname);
-	addCRCDebugLine("dumpReal() %s:%d %s %8.8X (%f)\n",
-		fname.str(), line, name.str(), AS_INT(r), r);
-}
-
-#endif // DEBUG_CRC
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp
index f5899829fab..0ec260b3861 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp
@@ -29,16 +29,14 @@
 #include "Common/CommandLine.h"
 #include "Common/CRCDebug.h"
 #include "Common/LocalFileSystem.h"
+#include "Common/Recorder.h"
 #include "Common/version.h"
+#include "GameClient/ClientInstance.h"
 #include "GameClient/TerrainVisual.h" // for TERRAIN_LOD_MIN definition
 #include "GameClient/GameText.h"
 #include "GameNetwork/NetworkDefs.h"
+#include "trim.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
@@ -58,7 +56,7 @@ Bool g_clientDeepCRC = FALSE;
 Bool g_logObjectCRCs = FALSE;
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 extern Bool g_useStringFile;
 #endif
 
@@ -85,7 +83,7 @@ static void ConvertShortMapPathToLongMapPath(AsciiString &mapName)
 		return;
 	}
 	path.nextToken(&token, "\\/");
-	while (!token.endsWithNoCase(".map") && (token.getLength() > 0))
+	while (!token.endsWithNoCase(".map") && (!token.isEmpty()))
 	{
 		actualpath.concat(token);
 		actualpath.concat('\\');
@@ -97,10 +95,7 @@ static void ConvertShortMapPathToLongMapPath(AsciiString &mapName)
 		DEBUG_CRASH(("Invalid map name %s", mapName.str()));
 	}
 	// remove the .map from the end.
-	token.removeLastChar();
-	token.removeLastChar();
-	token.removeLastChar();
-	token.removeLastChar();
+	token.truncateBy(4);
 
 	actualpath.concat(token);
 	actualpath.concat('\\');
@@ -114,7 +109,7 @@ static void ConvertShortMapPathToLongMapPath(AsciiString &mapName)
 //=============================================================================
 Int parseNoLogOrCrash(char *args[], int)
 {
-	DEBUG_CRASH(("-NoLogOrCrash not supported in this build\n"));
+	DEBUG_CRASH(("-NoLogOrCrash not supported in this build"));
 	return 1;
 }
 
@@ -122,10 +117,8 @@ Int parseNoLogOrCrash(char *args[], int)
 //=============================================================================
 Int parseWin(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_windowed = true;
-	}
+	TheWritableGlobalData->m_windowed = true;
+
 	return 1;
 }
 
@@ -133,10 +126,8 @@ Int parseWin(char *args[], int)
 //=============================================================================
 Int parseNoMusic(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_musicOn = false;
-	}
+	TheWritableGlobalData->m_musicOn = false;
+
 	return 1;
 }
 
@@ -145,10 +136,8 @@ Int parseNoMusic(char *args[], int)
 //=============================================================================
 Int parseNoVideo(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_videoOn = false;
-	}
+	TheWritableGlobalData->m_videoOn = false;
+
 	return 1;
 }
 
@@ -167,14 +156,21 @@ Int parseFPUPreserve(char *args[], int argc)
 //=============================================================================
 Int parseUseWaveEditor(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_usingWaterTrackEditor = TRUE;
-	}
+	TheWritableGlobalData->m_usingWaterTrackEditor = TRUE;
+
 	return 1;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+//=============================================================================
+//=============================================================================
+Int parseFullViewport(char *args[], int num)
+{
+	TheWritableGlobalData->m_viewportHeightScale = 1.0f;
+
+	return 1;
+}
+
+#if defined(RTS_DEBUG)
 
 //=============================================================================
 //=============================================================================
@@ -188,10 +184,8 @@ Int parseUseCSF(char *args[], int)
 //=============================================================================
 Int parseNoInputDisable(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_disableScriptedInputDisabling = true;
-	}
+	TheWritableGlobalData->m_disableScriptedInputDisabling = true;
+
 	return 1;
 }
 
@@ -199,10 +193,8 @@ Int parseNoInputDisable(char *args[], int)
 //=============================================================================
 Int parseNoFade(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_disableCameraFade = true;
-	}
+	TheWritableGlobalData->m_disableCameraFade = true;
+
 	return 1;
 }
 
@@ -210,13 +202,11 @@ Int parseNoFade(char *args[], int)
 //=============================================================================
 Int parseNoMilCap(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_disableMilitaryCaption = true;
-	}
+	TheWritableGlobalData->m_disableMilitaryCaption = true;
+
 	return 1;
 }
-#endif // RTS_DEBUG || RTS_INTERNAL
+#endif // RTS_DEBUG
 
 //=============================================================================
 //=============================================================================
@@ -351,15 +341,12 @@ Int parseReplayCRCInterval(char *args[], int argc)
 Int parseNoDraw(char *args[], int argc)
 {
 #ifdef DEBUG_CRC
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_noDraw = TRUE;
-	}
+	TheWritableGlobalData->m_noDraw = TRUE;
 #endif
 	return 1;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 
 //=============================================================================
 //=============================================================================
@@ -371,19 +358,17 @@ Int parseLogToConsole(char *args[], int)
 	return 1;
 }
 
-#endif // RTS_DEBUG || RTS_INTERNAL
+#endif // RTS_DEBUG
 
 //=============================================================================
 //=============================================================================
 Int parseNoAudio(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_audioOn = false;
-		TheWritableGlobalData->m_speechOn = false;
-		TheWritableGlobalData->m_soundsOn = false;
-		TheWritableGlobalData->m_musicOn = false;
-	}
+	TheWritableGlobalData->m_audioOn = false;
+	TheWritableGlobalData->m_speechOn = false;
+	TheWritableGlobalData->m_soundsOn = false;
+	TheWritableGlobalData->m_musicOn = false;
+
 	return 1;
 }
 
@@ -391,10 +376,8 @@ Int parseNoAudio(char *args[], int)
 //=============================================================================
 Int parseNoWin(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_windowed = false;
-	}
+	TheWritableGlobalData->m_windowed = false;
+
 	return 1;
 }
 
@@ -409,17 +392,15 @@ Int parseFullVersion(char *args[], int num)
 
 Int parseNoShadows(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_useShadowVolumes = false;
-		TheWritableGlobalData->m_useShadowDecals = false;
-	}
+	TheWritableGlobalData->m_useShadowVolumes = false;
+	TheWritableGlobalData->m_useShadowDecals = false;
+
 	return 1;
 }
 
 Int parseMapName(char *args[], int num)
 {
-	if (TheWritableGlobalData && num == 2)
+	if (num == 2)
 	{
 		TheWritableGlobalData->m_mapName.set( args[ 1 ] );
 		ConvertShortMapPathToLongMapPath(TheWritableGlobalData->m_mapName);
@@ -427,9 +408,59 @@ Int parseMapName(char *args[], int num)
 	return 1;
 }
 
+Int parseHeadless(char *args[], int num)
+{
+	TheWritableGlobalData->m_headless = TRUE;
+	TheWritableGlobalData->m_playIntro = FALSE;
+	TheWritableGlobalData->m_afterIntro = TRUE;
+	TheWritableGlobalData->m_playSizzle = FALSE;
+	return 1;
+}
+
+Int parseReplay(char *args[], int num)
+{
+	if (num > 1)
+	{
+		AsciiString filename = args[1];
+		if (!filename.endsWithNoCase(RecorderClass::getReplayExtention()))
+		{
+			printf("Invalid replay name \"%s\"\n", filename.str());
+			exit(1);
+		}
+		TheWritableGlobalData->m_simulateReplays.push_back(filename);
+
+		TheWritableGlobalData->m_playIntro = FALSE;
+		TheWritableGlobalData->m_afterIntro = TRUE;
+		TheWritableGlobalData->m_playSizzle = FALSE;
+		TheWritableGlobalData->m_shellMapOn = FALSE;
+
+		// Make replay playback possible while other clients (possible retail) are running
+		rts::ClientInstance::setMultiInstance(TRUE);
+		rts::ClientInstance::skipPrimaryInstance();
+
+		return 2;
+	}
+	return 1;
+}
+
+Int parseJobs(char *args[], int num)
+{
+	if (num > 1)
+	{
+		TheWritableGlobalData->m_simulateReplayJobs = atoi(args[1]);
+		if (TheGlobalData->m_simulateReplayJobs < SIMULATE_REPLAYS_SEQUENTIAL || TheGlobalData->m_simulateReplayJobs == 0)
+		{
+			printf("Invalid number of jobs: %d\n", TheGlobalData->m_simulateReplayJobs);
+			exit(1);
+		}
+		return 2;
+	}
+	return 1;
+}
+
 Int parseXRes(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_xResolution = atoi(args[1]);
 		return 2;
@@ -439,7 +470,7 @@ Int parseXRes(char *args[], int num)
 
 Int parseYRes(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_yResolution = atoi(args[1]);
 		return 2;
@@ -447,12 +478,12 @@ Int parseYRes(char *args[], int num)
 	return 1;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 //=============================================================================
 //=============================================================================
 Int parseLatencyAverage(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_latencyAverage = atoi(args[1]);
 	}
@@ -463,7 +494,7 @@ Int parseLatencyAverage(char *args[], int num)
 //=============================================================================
 Int parseLatencyAmplitude(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_latencyAmplitude = atoi(args[1]);
 	}
@@ -474,7 +505,7 @@ Int parseLatencyAmplitude(char *args[], int num)
 //=============================================================================
 Int parseLatencyPeriod(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_latencyPeriod = atoi(args[1]);
 	}
@@ -485,7 +516,7 @@ Int parseLatencyPeriod(char *args[], int num)
 //=============================================================================
 Int parseLatencyNoise(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_latencyNoise = atoi(args[1]);
 	}
@@ -496,7 +527,7 @@ Int parseLatencyNoise(char *args[], int num)
 //=============================================================================
 Int parsePacketLoss(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_packetLoss = atoi(args[1]);
 	}
@@ -507,10 +538,8 @@ Int parsePacketLoss(char *args[], int num)
 //=============================================================================
 Int parseLowDetail(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_terrainLOD = TERRAIN_LOD_MIN;
-	}
+	TheWritableGlobalData->m_terrainLOD = TERRAIN_LOD_MIN;
+
 	return 1;
 }
 
@@ -518,10 +547,8 @@ Int parseLowDetail(char *args[], int num)
 //=============================================================================
 Int parseNoDynamicLOD(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_enableDynamicLOD = FALSE;
-	}
+	TheWritableGlobalData->m_enableDynamicLOD = FALSE;
+
 	return 1;
 }
 
@@ -529,10 +556,8 @@ Int parseNoDynamicLOD(char *args[], int num)
 //=============================================================================
 Int parseNoStaticLOD(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_enableStaticLOD = FALSE;
-	}
+	TheWritableGlobalData->m_enableStaticLOD = FALSE;
+
 	return 1;
 }
 
@@ -540,7 +565,7 @@ Int parseNoStaticLOD(char *args[], int num)
 //=============================================================================
 Int parseFPSLimit(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_framesPerSecondLimit = atoi(args[1]);
 	}
@@ -550,132 +575,108 @@ Int parseFPSLimit(char *args[], int num)
 //=============================================================================
 Int parseNoViewLimit(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_useCameraConstraints = FALSE;
-	}
+	TheWritableGlobalData->m_useCameraConstraints = FALSE;
+
 	return 1;
 }
 
 Int parseWireframe(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_wireframe = TRUE;
-	}
+	TheWritableGlobalData->m_wireframe = TRUE;
+
 	return 1;
 }
 
 Int parseShowCollision(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_showCollisionExtents = TRUE;
-	}
+	TheWritableGlobalData->m_showCollisionExtents = TRUE;
+
 	return 1;
 }
 
 Int parseNoShowClientPhysics(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_showClientPhysics = FALSE;
-	}
+	TheWritableGlobalData->m_showClientPhysics = FALSE;
+
 	return 1;
 }
 
 Int parseShowTerrainNormals(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_showTerrainNormals = TRUE;
-	}
+	TheWritableGlobalData->m_showTerrainNormals = TRUE;
+
 	return 1;
 }
 
 Int parseStateMachineDebug(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_stateMachineDebug = TRUE;
-	}
+	TheWritableGlobalData->m_stateMachineDebug = TRUE;
+
 	return 1;
 }
 
 Int parseJabber(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_jabberOn = TRUE;
-	}
+	TheWritableGlobalData->m_jabberOn = TRUE;
+
 	return 1;
 }
 
 Int parseMunkee(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_munkeeOn = TRUE;
-	}
+	TheWritableGlobalData->m_munkeeOn = TRUE;
+
 	return 1;
 }
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // defined(RTS_DEBUG)
 
 Int parseScriptDebug(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_scriptDebug = TRUE;
-		TheWritableGlobalData->m_winCursors = TRUE;
-	}
+	TheWritableGlobalData->m_scriptDebug = TRUE;
+	TheWritableGlobalData->m_winCursors = TRUE;
+
 	return 1;
 }
 
 Int parseParticleEdit(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_particleEdit = TRUE;
-		TheWritableGlobalData->m_winCursors = TRUE;
-		TheWritableGlobalData->m_windowed = TRUE;
-	}
+	TheWritableGlobalData->m_particleEdit = TRUE;
+	TheWritableGlobalData->m_winCursors = TRUE;
+	TheWritableGlobalData->m_windowed = TRUE;
+
 	return 1;
 }
 
 
 Int parseBuildMapCache(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_buildMapCache = true;
-	}
+	TheWritableGlobalData->m_buildMapCache = true;
+
 	return 1;
 }
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 Int parsePreload( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-		TheWritableGlobalData->m_preloadAssets = TRUE;
+	TheWritableGlobalData->m_preloadAssets = TRUE;
+
 	return 1;
 }
 #endif
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) 
+#if defined(RTS_DEBUG)
 Int parseDisplayDebug(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_displayDebug = TRUE;
-	}
+	TheWritableGlobalData->m_displayDebug = TRUE;
+
 	return 1;
 }
 
 Int parseFile(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_initialFile = args[1];
 		ConvertShortMapPathToLongMapPath(TheWritableGlobalData->m_initialFile);
@@ -686,144 +687,120 @@ Int parseFile(char *args[], int num)
 
 Int parsePreloadEverything( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-	{
-		TheWritableGlobalData->m_preloadAssets = TRUE;
-		TheWritableGlobalData->m_preloadEverything = TRUE;
-	}
+	TheWritableGlobalData->m_preloadAssets = TRUE;
+	TheWritableGlobalData->m_preloadEverything = TRUE;
+
 	return 1;
 }
 
 Int parseLogAssets( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-	{
-		FILE *logfile=fopen("PreloadedAssets.txt","w");
-		if (logfile)	//clear the file
-			fclose(logfile);
-		TheWritableGlobalData->m_preloadReport = TRUE;
-	}
+	FILE *logfile=fopen("PreloadedAssets.txt","w");
+	if (logfile)	//clear the file
+		fclose(logfile);
+	TheWritableGlobalData->m_preloadReport = TRUE;
+
 	return 1;
 }
 
 /// begin stuff for VTUNE
 Int parseVTune ( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-		TheWritableGlobalData->m_vTune = TRUE;
+	TheWritableGlobalData->m_vTune = TRUE;
+
 	return 1;
 }
 /// end stuff for VTUNE
 
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // defined(RTS_DEBUG)
 
 //=============================================================================
 //=============================================================================
 
 Int parseNoFX(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_useFX = FALSE;
-	}
+	TheWritableGlobalData->m_useFX = FALSE;
+
 	return 1;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG) && ENABLE_CONFIGURABLE_SHROUD
 Int parseNoShroud(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_shroudOn = FALSE;
-	}
+	TheWritableGlobalData->m_shroudOn = FALSE;
+
 	return 1;
 }
 #endif
 
 Int parseForceBenchmark(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_forceBenchmark = TRUE;
-	}
+	TheWritableGlobalData->m_forceBenchmark = TRUE;
+
 	return 1;
 }
 
 Int parseNoMoveCamera(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_disableCameraMovement = true;
-	}
+	TheWritableGlobalData->m_disableCameraMovement = true;
+
 	return 1;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseNoCinematic(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_disableCameraMovement = true;
-		TheWritableGlobalData->m_disableMilitaryCaption = true;
-		TheWritableGlobalData->m_disableCameraFade = true;
-		TheWritableGlobalData->m_disableScriptedInputDisabling = true;
-	}
+	TheWritableGlobalData->m_disableCameraMovement = true;
+	TheWritableGlobalData->m_disableMilitaryCaption = true;
+	TheWritableGlobalData->m_disableCameraFade = true;
+	TheWritableGlobalData->m_disableScriptedInputDisabling = true;
+
 	return 1;
 }
 #endif
 
 Int parseSync(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheDebugIgnoreSyncErrors = true;
-	}
+	TheDebugIgnoreSyncErrors = true;
+
 	return 1;
 }
 
 Int parseNoShellMap(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_shellMapOn = FALSE;
-	}
+	TheWritableGlobalData->m_shellMapOn = FALSE;
+
 	return 1;
 }
 
 Int parseNoShaders(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_chipSetType = 1;	//force to a voodoo card which uses least amount of features.
-	}
+	TheWritableGlobalData->m_chipSetType = 1;	//force to a voodoo card which uses least amount of features.
+
 	return 1;
 }
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+#if defined(RTS_DEBUG)
 Int parseNoLogo(char *args[], int)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_playIntro = FALSE;
-		TheWritableGlobalData->m_afterIntro = TRUE;
-		TheWritableGlobalData->m_playSizzle = FALSE;
-	}
+	TheWritableGlobalData->m_playIntro = FALSE;
+	TheWritableGlobalData->m_afterIntro = TRUE;
+	TheWritableGlobalData->m_playSizzle = FALSE;
+
 	return 1;
 }
 #endif
 
 Int parseNoSizzle( char *args[], int )
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_playSizzle = FALSE;
-	}
+	TheWritableGlobalData->m_playSizzle = FALSE;
+
 	return 1;
 }
 
 Int parseShellMap(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_shellMapName = args[1];
 	}
@@ -832,25 +809,21 @@ Int parseShellMap(char *args[], int num)
 
 Int parseNoWindowAnimation(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_animateWindows = FALSE;
-	}
+	TheWritableGlobalData->m_animateWindows = FALSE;
+
 	return 1;
 }
 
 Int parseWinCursors(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_winCursors = TRUE;
-	}
+	TheWritableGlobalData->m_winCursors = TRUE;
+
 	return 1;
 }
 
 Int parseQuickStart( char *args[], int num )
 {
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+#if defined(RTS_DEBUG)
   parseNoLogo( args, num );
 #else
 	//Kris: Patch 1.01 -- Allow release builds to skip the sizzle video, but still force the EA logo to show up.
@@ -862,31 +835,18 @@ Int parseQuickStart( char *args[], int num )
 	return 1;
 }
 
-Int parseHeadless( char *args[], int num )
-{
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_headless = TRUE;
-	}
-	return 1;
-}
-
 Int parseConstantDebug( char *args[], int num )
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_constantDebugUpdate = TRUE;
-	}
+	TheWritableGlobalData->m_constantDebugUpdate = TRUE;
+
 	return 1;
 }
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+#if defined(RTS_DEBUG)
 Int parseExtraLogging( char *args[], int num )
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_extraLogging = TRUE;
-	}
+	TheWritableGlobalData->m_extraLogging = TRUE;
+
 	return 1;
 }
 #endif
@@ -895,31 +855,25 @@ Int parseExtraLogging( char *args[], int num )
 /*
 Int parseAllAdvice( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-	{
-		TheWritableGlobalData->m_allAdvice = TRUE;
-	}
+	TheWritableGlobalData->m_allAdvice = TRUE;
+
 	return 1;
 }
 */
 
 Int parseShowTeamDot( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-	{
-		TheWritableGlobalData->m_showTeamDot = TRUE;
-	}
+	TheWritableGlobalData->m_showTeamDot = TRUE;
+
 	return 1;
 }
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseSelectAll( char *args[], int num )
 {
-	if( TheWritableGlobalData )
-	{
-		TheWritableGlobalData->m_allowUnselectableSelection = TRUE;
-	}
+	TheWritableGlobalData->m_allowUnselectableSelection = TRUE;
+
 	return 1;
 }
 
@@ -938,7 +892,7 @@ Int parseRunAhead( char *args[], Int num )
 
 Int parseSeed(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_fixedSeed = atoi(args[1]);
 	}
@@ -947,16 +901,14 @@ Int parseSeed(char *args[], int num)
 
 Int parseIncrAGPBuf(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_incrementalAGPBuf = TRUE;
-	}
+	TheWritableGlobalData->m_incrementalAGPBuf = TRUE;
+
 	return 1;
 }
 
 Int parseNetMinPlayers(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_netMinPlayers = atoi(args[1]);
 	}
@@ -965,7 +917,7 @@ Int parseNetMinPlayers(char *args[], int num)
 
 Int parsePlayStats(char *args[], int num)
 {
-	if (TheWritableGlobalData  && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_playStats  = atoi(args[1]);
 	}
@@ -974,17 +926,15 @@ Int parsePlayStats(char *args[], int num)
 
 Int parseDemoLoadScreen(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_loadScreenDemo = TRUE;
-	}
+	TheWritableGlobalData->m_loadScreenDemo = TRUE;
+
 	return 1;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseSaveStats(char *args[], int num)
 {
-	if (TheWritableGlobalData  && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_saveStats = TRUE;
 		TheWritableGlobalData->m_baseStatsDir = args[1];
@@ -993,10 +943,10 @@ Int parseSaveStats(char *args[], int num)
 }
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseSaveAllStats(char *args[], int num)
 {
-	if (TheWritableGlobalData  && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_saveStats = TRUE;
 		TheWritableGlobalData->m_baseStatsDir = args[1];
@@ -1006,10 +956,10 @@ Int parseSaveAllStats(char *args[], int num)
 }
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseLocalMOTD(char *args[], int num)
 {
-	if (TheWritableGlobalData  && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_useLocalMOTD = TRUE;
 		TheWritableGlobalData->m_MOTDPath = args[1];
@@ -1018,21 +968,19 @@ Int parseLocalMOTD(char *args[], int num)
 }
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseCameraDebug(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_debugCamera = TRUE;
-	}
+	TheWritableGlobalData->m_debugCamera = TRUE;
+
 	return 1;
 }
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Int parseBenchmark(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_benchmarkTimer = atoi(args[1]);
 		TheWritableGlobalData->m_playStats  = atoi(args[1]);
@@ -1041,11 +989,11 @@ Int parseBenchmark(char *args[], int num)
 }
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 #ifdef DUMP_PERF_STATS
 Int parseStats(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		TheWritableGlobalData->m_dumpStatsAtInterval = TRUE;
 		TheWritableGlobalData->m_statsInterval  = atoi(args[1]);
@@ -1058,7 +1006,7 @@ Int parseStats(char *args[], int num)
 #ifdef DEBUG_CRASHING
 Int parseIgnoreAsserts(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 0)
+	if (num > 0)
 	{
 		TheWritableGlobalData->m_debugIgnoreAsserts = true;
 	}
@@ -1069,7 +1017,7 @@ Int parseIgnoreAsserts(char *args[], int num)
 #ifdef DEBUG_STACKTRACE
 Int parseIgnoreStackTrace(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 0)
+	if (num > 0)
 	{
 		TheWritableGlobalData->m_debugIgnoreStackTrace = true;
 	}
@@ -1079,26 +1027,22 @@ Int parseIgnoreStackTrace(char *args[], int num)
 
 Int parseNoFPSLimit(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_useFpsLimit = false;
-		TheWritableGlobalData->m_framesPerSecondLimit = 30000;
-	}
+	TheWritableGlobalData->m_useFpsLimit = false;
+	TheWritableGlobalData->m_framesPerSecondLimit = 30000;
+
 	return 1;
 }
 
 Int parseDumpAssetUsage(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_dumpAssetUsage = true;
-	}
+	TheWritableGlobalData->m_dumpAssetUsage = true;
+
 	return 1;
 }
 
 Int parseJumpToFrame(char *args[], int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		parseNoFPSLimit(args, num);
 		TheWritableGlobalData->m_noDraw = atoi(args[1]);
@@ -1109,16 +1053,14 @@ Int parseJumpToFrame(char *args[], int num)
 
 Int parseUpdateImages(char *args[], int num)
 {
-	if (TheWritableGlobalData)
-	{
-		TheWritableGlobalData->m_shouldUpdateTGAToDDS = TRUE;
-	}
+	TheWritableGlobalData->m_shouldUpdateTGAToDDS = TRUE;
+
 	return 1;
 }
 
 Int parseMod(char *args[], Int num)
 {
-	if (TheWritableGlobalData && num > 1)
+	if (num > 1)
 	{
 		AsciiString modPath = args[1];
 		if (strchr(modPath.str(), ':') || modPath.startsWith("/") || modPath.startsWith("\\"))
@@ -1129,11 +1071,11 @@ Int parseMod(char *args[], Int num)
 		{
 			modPath.format("%s%s", TheGlobalData->getPath_UserData().str(), args[1]);
 		}
-		DEBUG_LOG(("Looking for mod '%s'\n", modPath.str()));
+		DEBUG_LOG(("Looking for mod '%s'", modPath.str()));
 
 		if (!TheLocalFileSystem->doesFileExist(modPath.str()))
 		{
-			DEBUG_LOG(("Mod does not exist.\n"));
+			DEBUG_LOG(("Mod does not exist."));
 			return 2; // no such file/dir.
 		}
 
@@ -1141,7 +1083,7 @@ Int parseMod(char *args[], Int num)
 		struct _stat statBuf;
 		if (_stat(modPath.str(), &statBuf) != 0)
 		{
-			DEBUG_LOG(("Could not _stat() mod.\n"));
+			DEBUG_LOG(("Could not _stat() mod."));
 			return 2; // could not stat the file/dir.
 		}
 
@@ -1149,12 +1091,12 @@ Int parseMod(char *args[], Int num)
 		{
 			if (!modPath.endsWith("\\") && !modPath.endsWith("/"))
 				modPath.concat('\\');
-			DEBUG_LOG(("Mod dir is '%s'.\n", modPath.str()));
+			DEBUG_LOG(("Mod dir is '%s'.", modPath.str()));
 			TheWritableGlobalData->m_modDir = modPath;
 		}
 		else
 		{
-			DEBUG_LOG(("Mod file is '%s'.\n", modPath.str()));
+			DEBUG_LOG(("Mod file is '%s'.", modPath.str()));
 			TheWritableGlobalData->m_modBIG = modPath;
 		}
 
@@ -1199,15 +1141,38 @@ Int parseClearDebugLevel(char *args[], int num)
 }
 #endif
 
-static CommandLineParam params[] =
+// Initial Params are parsed before Windows Creation.
+// Note that except for TheGlobalData, no other global objects exist yet when these are parsed.
+static CommandLineParam paramsForStartup[] =
 {
-	{ "-noshellmap", parseNoShellMap },
 	{ "-win", parseWin },
+	{ "-fullscreen", parseNoWin },
+
+	// TheSuperHackers @feature helmutbuhler 11/04/2025
+	// This runs the game without a window, graphics, input and audio. You can combine this with -replay
+	{ "-headless", parseHeadless },
+
+	// TheSuperHackers @feature helmutbuhler 13/04/2025
+	// Play back a replay. Pass the filename including .rep afterwards.
+	// You can pass this multiple times to play back multiple replays.
+	// You can also include wildcards. The file must be in the replay folder or in a subfolder.
+	{ "-replay", parseReplay },
+
+	// TheSuperHackers @feature helmutbuhler 23/05/2025
+	// Simulate each replay in a separate process and use 1..N processes at the same time.
+	// (If you have 4 cores, call it with -jobs 4)
+	// If you do not call this, all replays will be simulated in sequence in the same process.
+	{ "-jobs", parseJobs },
+};
+
+// These Params are parsed during Engine Init before INI data is loaded
+static CommandLineParam paramsForEngineInit[] =
+{
+	{ "-noshellmap", parseNoShellMap },
 	{ "-xres", parseXRes },
 	{ "-yres", parseYRes },
-	{ "-fullscreen", parseNoWin },
 	{ "-fullVersion", parseFullVersion },
-	{	"-particleEdit", parseParticleEdit },
+	{ "-particleEdit", parseParticleEdit },
 	{ "-scriptDebug", parseScriptDebug },
 	{ "-playStats", parsePlayStats },
 	{ "-mod", parseMod },
@@ -1215,11 +1180,10 @@ static CommandLineParam params[] =
 	{ "-quickstart", parseQuickStart },
 	{ "-useWaveEditor", parseUseWaveEditor },
 
-	// TheSuperHackers @feature helmutbuhler 11/04/2025
-	// This runs the game without a window, graphics, input and audio. Used for testing.
-	{ "-headless", parseHeadless },
+	// TheSuperHackers @feature xezon 03/08/2025 Force full viewport for 'Control Bar Pro' Addons like GenTool did it.
+	{ "-forcefullviewport", parseFullViewport },
 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+#if defined(RTS_DEBUG)
 	{ "-noaudio", parseNoAudio },
 	{ "-map", parseMapName },
 	{ "-nomusic", parseNoMusic },
@@ -1228,9 +1192,9 @@ static CommandLineParam params[] =
 	{ "-FPUPreserve", parseFPUPreserve },
 	{ "-benchmark", parseBenchmark },
 #ifdef DUMP_PERF_STATS
-	{ "-stats", parseStats }, 
+	{ "-stats", parseStats },
 #endif
-  { "-saveStats", parseSaveStats },
+	{ "-saveStats", parseSaveStats },
 	{ "-localMOTD", parseLocalMOTD },
 	{ "-UseCSF", parseUseCSF },
 	{ "-NoInputDisable", parseNoInputDisable },
@@ -1284,7 +1248,7 @@ static CommandLineParam params[] =
 	// Number of frames between each CRC that is written to replay files in singleplayer games.
 	{ "-ReplayCRCInterval", parseReplayCRCInterval },
 #endif
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+#if defined(RTS_DEBUG)
 	{ "-saveAllStats", parseSaveAllStats },
 	{ "-noDraw", parseNoDraw },
 	{ "-nomilcap", parseNoMilCap },
@@ -1310,10 +1274,10 @@ static CommandLineParam params[] =
 	{ "-munkee", parseMunkee },
 	{ "-displayDebug", parseDisplayDebug },
 	{ "-file", parseFile },
-  
+
 //	{ "-preload", parsePreload },
-	
-  { "-preloadEverything", parsePreloadEverything },
+
+	{ "-preloadEverything", parsePreloadEverything },
 	{ "-logAssets", parseLogAssets },
 	{ "-netMinPlayers", parseNetMinPlayers },
 	{ "-DemoLoadScreen", parseDemoLoadScreen },
@@ -1322,7 +1286,9 @@ static CommandLineParam params[] =
 	{ "-vTune", parseVTune },
 	{ "-selectTheUnselectable", parseSelectAll },
 	{ "-RunAhead", parseRunAhead },
+#if ENABLE_CONFIGURABLE_SHROUD
 	{ "-noshroud", parseNoShroud },
+#endif
 	{ "-forceBenchmark", parseForceBenchmark },
 	{ "-buildmapcache", parseBuildMapCache },
 	{ "-noshadowvolumes", parseNoShadows },
@@ -1360,25 +1326,80 @@ static CommandLineParam params[] =
 	//-allAdvice feature
 	//{ "-allAdvice", parseAllAdvice },
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
-  { "-preload", parsePreload },
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+	{ "-preload", parsePreload },
 #endif
 
 
 };
 
-// parseCommandLine ===========================================================
-/** Parse command-line parameters. */
-//=============================================================================
-void parseCommandLine(int argc, char *argv[])
+char *nextParam(char *newSource, const char *seps)
 {
-	// To parse command-line parameters, we loop through a table holding arguments
-	// and functions to handle them.  Comparisons can be case-(in)sensitive, and
-	// can check the entire string (for testing the presence of a flag) or check
-	// just the start (for a key=val argument).  The handling function can also
-	// look at the next argument(s), to accomodate multi-arg parameters, e.g. "-p 1234".
-	int arg=1, param;
-	Bool found;
+	static char *source = NULL;
+	if (newSource)
+	{
+		source = newSource;
+	}
+	if (!source)
+	{
+		return NULL;
+	}
+
+	// find first separator
+	char *first = source;//strpbrk(source, seps);
+	if (first)
+	{
+		// go past separator
+		char *firstSep = strpbrk(first, seps);
+		char firstChar[2] = {0,0};
+		if (firstSep == first)
+		{
+			firstChar[0] = *first;
+			while (*first == firstChar[0]) first++;
+		}
+
+		// find end
+		char *end;
+		if (firstChar[0])
+			end = strpbrk(first, firstChar);
+		else
+			end = strpbrk(first, seps);
+
+		// trim string & save next start pos
+		if (end)
+		{
+			source = end+1;
+			*end = 0;
+
+			if (!*source)
+				source = NULL;
+		}
+		else
+		{
+			source = NULL;
+		}
+
+		if (first && !*first)
+			first = NULL;
+	}
+
+	return first;
+}
+
+static void parseCommandLine(const CommandLineParam* params, int numParams)
+{
+	std::vector<char*> argv;
+
+	std::string cmdLine = GetCommandLineA();
+	char *token = nextParam(&cmdLine[0], "\" ");
+	while (token != NULL)
+	{
+		argv.push_back(strtrim(token));
+		token = nextParam(NULL, "\" ");
+	}
+	int argc = argv.size();
+
+	int arg = 1;
 
 #ifdef DEBUG_LOGGING
 	DEBUG_LOG(("Command-line args:"));
@@ -1388,34 +1409,68 @@ void parseCommandLine(int argc, char *argv[])
 	{
 		DEBUG_LOG((" %s", argv[arg]));
 	}
-	DEBUG_LOG(("\n"));
+	DEBUG_LOG_RAW(("\n"));
 	DebugSetFlags(debugFlags); // turn timestamps back on iff they were on before
 	arg = 1;
 #endif // DEBUG_LOGGING
 
+	// To parse command-line parameters, we loop through a table holding arguments
+	// and functions to handle them.  Comparisons can be case-(in)sensitive, and
+	// can check the entire string (for testing the presence of a flag) or check
+	// just the start (for a key=val argument).  The handling function can also
+	// look at the next argument(s), to accomodate multi-arg parameters, e.g. "-p 1234".
 	while (arg<argc)
 	{
 		// Look at arg #i
-		found = false;
-		for (param=0; !found && param<sizeof(params)/sizeof(params[0]); ++param)
+		Bool found = false;
+		for (int param=0; !found && param<numParams; ++param)
 		{
 			int len = strlen(params[param].name);
 			int len2 = strlen(argv[arg]);
 			if (len2 != len)
 				continue;
-			if (!strnicmp(argv[arg], params[param].name, len))
+			if (strnicmp(argv[arg], params[param].name, len) == 0)
 			{
-				arg += params[param].func(argv+arg, argc-arg);
+				arg += params[param].func(&argv[0]+arg, argc-arg);
 				found = true;
+				break;
 			}
-		}	// for
+		}
 		if (!found)
 		{
 			arg++;
 		}
 	}
+}
+
+void createGlobalData()
+{
+	if (TheGlobalData == NULL)
+		TheWritableGlobalData = NEW GlobalData;
+}
 
-	TheArchiveFileSystem->loadMods();
+void CommandLine::parseCommandLineForStartup()
+{
+	// We need the GlobalData initialized before parsing the command line.
+	// Note that this function is potentially called multiple times and only initializes the first time.
+	createGlobalData();
+
+	if (TheGlobalData->m_commandLineData.m_hasParsedCommandLineForStartup)
+		return;
+	TheWritableGlobalData->m_commandLineData.m_hasParsedCommandLineForStartup = true;
+
+	parseCommandLine(paramsForStartup, ARRAY_SIZE(paramsForStartup));
 }
 
+void CommandLine::parseCommandLineForEngineInit()
+{
+	createGlobalData();
+
+	DEBUG_ASSERTCRASH(TheGlobalData->m_commandLineData.m_hasParsedCommandLineForStartup,
+		("parseCommandLineForStartup is expected to be called before parseCommandLineForEngineInit\n"));
+	DEBUG_ASSERTCRASH(!TheGlobalData->m_commandLineData.m_hasParsedCommandLineForEngineInit,
+		("parseCommandLineForEngineInit is expected to be called once only\n"));
+	TheWritableGlobalData->m_commandLineData.m_hasParsedCommandLineForEngineInit = true;
 
+	parseCommandLine(paramsForEngineInit, ARRAY_SIZE(paramsForEngineInit));
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/DamageFX.cpp b/GeneralsMD/Code/GameEngine/Source/Common/DamageFX.cpp
index ec1bddb6340..8975fa7d606 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/DamageFX.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/DamageFX.cpp
@@ -82,14 +82,14 @@ void DamageFX::clear()
 }
 
 //-------------------------------------------------------------------------------------------------
-UnsignedInt DamageFX::getDamageFXThrottleTime(DamageType t, const Object* source) const 
-{ 
-	return m_dfx[t][source ? source->getVeterancyLevel() : LEVEL_REGULAR].m_damageFXThrottleTime; 
+UnsignedInt DamageFX::getDamageFXThrottleTime(DamageType t, const Object* source) const
+{
+	return m_dfx[t][source ? source->getVeterancyLevel() : LEVEL_REGULAR].m_damageFXThrottleTime;
 }
 
 //-------------------------------------------------------------------------------------------------
 void DamageFX::doDamageFX(DamageType t, Real damageAmount, const Object* source, const Object* victim) const
-{ 
+{
 	ConstFXListPtr fx = getDamageFXList(t, damageAmount, source);
 	// since the victim is receiving the damage, it's the "primary" object.
 	// the source is the "secondary" object -- unused by most fx, but could be
@@ -99,7 +99,7 @@ void DamageFX::doDamageFX(DamageType t, Real damageAmount, const Object* source,
 
 //-------------------------------------------------------------------------------------------------
 ConstFXListPtr DamageFX::getDamageFXList(DamageType t, Real damageAmount, const Object* source) const
-{ 
+{
 	/*
 		if damage is zero, never do damage fx. this is by design, since "zero" damage can happen
 		with some special weapons, like the battleship, which is a "faux" weapon that never does damage.
@@ -109,9 +109,9 @@ ConstFXListPtr DamageFX::getDamageFXList(DamageType t, Real damageAmount, const
 		return NULL;
 
 	const DFX& dfx = m_dfx[t][source ? source->getVeterancyLevel() : LEVEL_REGULAR];
-	ConstFXListPtr fx = 
-		damageAmount >= dfx.m_amountForMajorFX ? 
-		dfx.m_majorDamageFXList : 
+	ConstFXListPtr fx =
+		damageAmount >= dfx.m_amountForMajorFX ?
+		dfx.m_majorDamageFXList :
 		dfx.m_minorDamageFXList;
 
 	return fx;
@@ -120,7 +120,7 @@ ConstFXListPtr DamageFX::getDamageFXList(DamageType t, Real damageAmount, const
 //-------------------------------------------------------------------------------------------------
 const FieldParse* DamageFX::getFieldParse() const
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ "AmountForMajorFX",						parseAmount,			NULL, 0 },
 		{ "MajorFX",										parseMajorFXList,	NULL, 0 },
@@ -137,11 +137,11 @@ const FieldParse* DamageFX::getFieldParse() const
 
 //-------------------------------------------------------------------------------------------Static
 static void parseCommonStuff(
-	INI* ini, 
-	ConstCharPtrArray names, 
-	VeterancyLevel& vetFirst, 
-	VeterancyLevel& vetLast, 
-	DamageType& damageFirst, 
+	INI* ini,
+	ConstCharPtrArray names,
+	VeterancyLevel& vetFirst,
+	VeterancyLevel& vetLast,
+	DamageType& damageFirst,
 	DamageType& damageLast
 )
 {
@@ -272,11 +272,10 @@ DamageFXStore::~DamageFXStore()
 }
 
 //-------------------------------------------------------------------------------------------------
-const DamageFX *DamageFXStore::findDamageFX(AsciiString name) const
+const DamageFX *DamageFXStore::findDamageFX(NameKeyType namekey) const
 {
-	NameKeyType namekey = TheNameKeyGenerator->nameToKey(name);
-  DamageFXMap::const_iterator it = m_dfxmap.find(namekey);
-  if (it == m_dfxmap.end()) 
+	DamageFXMap::const_iterator it = m_dfxmap.find(namekey);
+	if (it == m_dfxmap.end())
 	{
 		return NULL;
 	}
@@ -286,6 +285,18 @@ const DamageFX *DamageFXStore::findDamageFX(AsciiString name) const
 	}
 }
 
+//-------------------------------------------------------------------------------------------------
+const DamageFX *DamageFXStore::findDamageFX(const AsciiString& name) const
+{
+	return findDamageFX(TheNameKeyGenerator->nameToKey(name));
+}
+
+//-------------------------------------------------------------------------------------------------
+const DamageFX *DamageFXStore::findDamageFX(const char* name) const
+{
+	return findDamageFX(TheNameKeyGenerator->nameToKey(name));
+}
+
 //-------------------------------------------------------------------------------------------------
 void DamageFXStore::init()
 {
@@ -294,7 +305,7 @@ void DamageFXStore::init()
 //-------------------------------------------------------------------------------------------------
 void DamageFXStore::reset()
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void DamageFXStore::update()
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Dict.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Dict.cpp
index 590e32fbb8a..0eba66efd03 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/Dict.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/Dict.cpp
@@ -22,14 +22,14 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Dict.cpp 
+// FILE: Dict.cpp
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -130,7 +130,7 @@ Dict::DictPair* Dict::findPairByKey(NameKeyType key) const
 	DictPair* base = m_data->peek();
 	Int minIdx = 0;
 	Int maxIdx = m_data->m_numPairsUsed;
-	while (minIdx < maxIdx) 
+	while (minIdx < maxIdx)
 	{
 		Int midIdx = (((minIdx + maxIdx) - 1) >> 1);
 		DictPair* mid = base + midIdx;
@@ -160,11 +160,12 @@ Dict::DictPair *Dict::ensureUnique(int numPairsNeeded, Bool preserveData, DictPa
 	Dict::DictPairData* newData = NULL;
 	if (numPairsNeeded > 0)
 	{
+		DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order."));
 		DEBUG_ASSERTCRASH(numPairsNeeded <= MAX_LEN, ("Dict::ensureUnique exceeds max pairs length %d with requested length %d", MAX_LEN, numPairsNeeded));
 		int minBytes = sizeof(Dict::DictPairData) + numPairsNeeded*sizeof(Dict::DictPair);
 		int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
 		// note: be certain to alloc with zero; we'll take advantage of the fact that all-zero
-		// is a bit-pattern that happens to init all our pairs to legal values: 
+		// is a bit-pattern that happens to init all our pairs to legal values:
 		// type BOOL, key INVALID, value FALSE.
 		newData = (Dict::DictPairData*)TheDynamicMemoryAllocator->allocateBytes(actualBytes, "Dict::ensureUnique");
 		newData->m_refCount = 1;
@@ -181,7 +182,7 @@ Dict::DictPair *Dict::ensureUnique(int numPairsNeeded, Bool preserveData, DictPa
 		}
 	}
 
-	Int delta;
+	Int delta = 0;
 	if (pairToTranslate && m_data)
 		delta = pairToTranslate - m_data->peek();
 
@@ -273,7 +274,7 @@ Bool Dict::getBool(NameKeyType key, Bool *exists/*=NULL*/) const
 		if (exists) *exists = true;
 		return *pair->asBool();
 	}
-	DEBUG_ASSERTCRASH(exists != NULL, ("dict key missing, or of wrong type\n"));	// only assert if they didn't check result
+	DEBUG_ASSERTCRASH(exists != NULL, ("dict key missing, or of wrong type"));	// only assert if they didn't check result
 	if (exists) *exists = false;
 	return false;
 }
@@ -288,7 +289,7 @@ Int Dict::getInt(NameKeyType key, Bool *exists/*=NULL*/) const
 		if (exists) *exists = true;
 		return *pair->asInt();
 	}
-	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type\n"));	// only assert if they didn't check result
+	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type"));	// only assert if they didn't check result
 	if (exists) *exists = false;
 	return 0;
 }
@@ -303,7 +304,7 @@ Real Dict::getReal(NameKeyType key, Bool *exists/*=NULL*/) const
 		if (exists) *exists = true;
 		return *pair->asReal();
 	}
-	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type\n"));	// only assert if they didn't check result
+	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type"));	// only assert if they didn't check result
 	if (exists) *exists = false;
 	return 0.0f;
 }
@@ -318,7 +319,7 @@ AsciiString Dict::getAsciiString(NameKeyType key, Bool *exists/*=NULL*/) const
 		if (exists) *exists = true;
 		return *pair->asAsciiString();
 	}
-	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type\n"));	// only assert if they didn't check result
+	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type"));	// only assert if they didn't check result
 	if (exists) *exists = false;
 	return AsciiString::TheEmptyString;
 }
@@ -333,7 +334,7 @@ UnicodeString Dict::getUnicodeString(NameKeyType key, Bool *exists/*=NULL*/) con
 		if (exists) *exists = true;
 		return *pair->asUnicodeString();
 	}
-	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type\n"));	// only assert if they didn't check result
+	DEBUG_ASSERTCRASH(exists != NULL,("dict key missing, or of wrong type"));	// only assert if they didn't check result
 	if (exists) *exists = false;
 	return UnicodeString::TheEmptyString;
 }
@@ -342,14 +343,14 @@ UnicodeString Dict::getUnicodeString(NameKeyType key, Bool *exists/*=NULL*/) con
 Bool Dict::getNthBool(Int n) const
 {
 	validate();
-	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range\n"));
+	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range"));
 	if (m_data)
 	{
 		DictPair* pair = &m_data->peek()[n];
 		if (pair && pair->getType() == DICT_BOOL)
 			return *pair->asBool();
 	}
-	DEBUG_CRASH(("dict key missing, or of wrong type\n"));
+	DEBUG_CRASH(("dict key missing, or of wrong type"));
 	return false;
 }
 
@@ -357,14 +358,14 @@ Bool Dict::getNthBool(Int n) const
 Int Dict::getNthInt(Int n) const
 {
 	validate();
-	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range\n"));
+	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range"));
 	if (m_data)
 	{
 		DictPair* pair = &m_data->peek()[n];
 		if (pair && pair->getType() == DICT_INT)
 			return *pair->asInt();
 	}
-	DEBUG_CRASH(("dict key missing, or of wrong type\n"));
+	DEBUG_CRASH(("dict key missing, or of wrong type"));
 	return 0;
 }
 
@@ -372,14 +373,14 @@ Int Dict::getNthInt(Int n) const
 Real Dict::getNthReal(Int n) const
 {
 	validate();
-	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range\n"));
+	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range"));
 	if (m_data)
 	{
 		DictPair* pair = &m_data->peek()[n];
 		if (pair && pair->getType() == DICT_REAL)
 			return *pair->asReal();
 	}
-	DEBUG_CRASH(("dict key missing, or of wrong type\n"));
+	DEBUG_CRASH(("dict key missing, or of wrong type"));
 	return 0.0f;
 }
 
@@ -387,14 +388,14 @@ Real Dict::getNthReal(Int n) const
 AsciiString Dict::getNthAsciiString(Int n) const
 {
 	validate();
-	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range\n"));
+	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range"));
 	if (m_data)
 	{
 		DictPair* pair = &m_data->peek()[n];
 		if (pair && pair->getType() == DICT_ASCIISTRING)
 			return *pair->asAsciiString();
 	}
-	DEBUG_CRASH(("dict key missing, or of wrong type\n"));
+	DEBUG_CRASH(("dict key missing, or of wrong type"));
 	return AsciiString::TheEmptyString;
 }
 
@@ -402,14 +403,14 @@ AsciiString Dict::getNthAsciiString(Int n) const
 UnicodeString Dict::getNthUnicodeString(Int n) const
 {
 	validate();
-	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range\n"));
+	DEBUG_ASSERTCRASH(n >= 0 && n < getPairCount(), ("n out of range"));
 	if (m_data)
 	{
 		DictPair* pair = &m_data->peek()[n];
 		if (pair && pair->getType() == DICT_UNICODESTRING)
 			return *pair->asUnicodeString();
 	}
-	DEBUG_CRASH(("dict key missing, or of wrong type\n"));
+	DEBUG_CRASH(("dict key missing, or of wrong type"));
 	return UnicodeString::TheEmptyString;
 }
 
@@ -420,7 +421,7 @@ Dict::DictPair *Dict::setPrep(NameKeyType key, Dict::DataType type)
 	Int pairsNeeded = getPairCount();
 	if (!pair)
 		++pairsNeeded;
-	pair = ensureUnique(pairsNeeded, true, pair);	
+	pair = ensureUnique(pairsNeeded, true, pair);
 	if (!pair)
 	{
 		pair = &m_data->peek()[m_data->m_numPairsUsed++];
@@ -437,21 +438,21 @@ void Dict::sortPairs()
 		return;
 
 	// yer basic shellsort.
-	for (Int gap = m_data->m_numPairsUsed >> 1; gap > 0; gap >>= 1) 
+	for (Int gap = m_data->m_numPairsUsed >> 1; gap > 0; gap >>= 1)
 	{
-		for (Int i = gap; i < m_data->m_numPairsUsed; i++) 
+		for (Int i = gap; i < m_data->m_numPairsUsed; i++)
 		{
-			for (Int j = i - gap; j >= 0; j -= gap) 
+			for (Int j = i - gap; j >= 0; j -= gap)
 			{
 				DictPair* a = m_data->peek() + j;
 				DictPair* b = m_data->peek() + j + gap;
-				if (a->getName() > b->getName()) 
+				if (a->getName() > b->getName())
 				{
 					DictPair tmp = *a;
 					*a = *b;
 					*b = tmp;
-				} 
-				else 
+				}
+				else
 				{
 					break;
 				}
@@ -517,14 +518,14 @@ Bool Dict::remove(NameKeyType key)
 	DictPair* pair = findPairByKey(key);
 	if (pair)
 	{
-		pair = ensureUnique(m_data->m_numPairsUsed, true, pair);	
+		pair = ensureUnique(m_data->m_numPairsUsed, true, pair);
 		pair->setNameAndType((NameKeyType)0x7fffffff, DICT_BOOL);
 		sortPairs();
 		--m_data->m_numPairsUsed;
 		validate();
 		return true;
 	}
-	DEBUG_CRASH(("dict key missing in remove\n"));
+	DEBUG_CRASH(("dict key missing in remove"));
 	return false;
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/DiscreteCircle.cpp b/GeneralsMD/Code/GameEngine/Source/Common/DiscreteCircle.cpp
index 17f0caf3528..1b29ee8490c 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/DiscreteCircle.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/DiscreteCircle.cpp
@@ -24,12 +24,12 @@
 
 // FILE: DiscreteCircle.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       EA Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       EA Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -81,11 +81,11 @@ void DiscreteCircle::generateEdgePairs(Int xCenter, Int yCenter, Int radius)
 		hl.xEnd		= xCenter + x;
 		hl.yPos		= yCenter + y;
 		m_edges.push_back(hl);
-		
+
 		if (d + y > 0) {
 			--y;
 			d -= ((y << 1) - 1);
-		} 
+		}
 
 		if (x > d) {
 			++x;
@@ -107,8 +107,8 @@ void DiscreteCircle::removeDuplicates()
 
 		if (it->yPos == nextIt->yPos) {
 			it = m_edges.erase(it);
-		} else { 
+		} else {
 			++it;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp
index a1c98ab94da..3c183794f8b 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp
@@ -32,6 +32,7 @@
 #include "Common/AudioAffect.h"
 #include "Common/BuildAssistant.h"
 #include "Common/CRCDebug.h"
+#include "Common/FramePacer.h"
 #include "Common/Radar.h"
 #include "Common/PlayerTemplate.h"
 #include "Common/Team.h"
@@ -85,7 +86,7 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/SidesList.h"
 
-#include "GameClient/Display.h"
+#include "GameClient/ClientInstance.h"
 #include "GameClient/FXList.h"
 #include "GameClient/GameClient.h"
 #include "GameClient/Keyboard.h"
@@ -108,11 +109,6 @@
 
 #include "Common/version.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 
@@ -141,7 +137,7 @@ void DeepCRCSanityCheck::reset(void)
 	fname.format("%sCRCAfter%dMaps.dat", TheGlobalData->getPath_UserData().str(), timesThrough);
 	UnsignedInt thisCRC = TheGameLogic->getCRC( CRC_RECALC, fname );
 
-	DEBUG_LOG(("DeepCRCSanityCheck: CRC is %X\n", thisCRC));
+	DEBUG_LOG(("DeepCRCSanityCheck: CRC is %X", thisCRC));
 	DEBUG_ASSERTCRASH(timesThrough == 0 || thisCRC == lastCRC,
 		("CRC after reset did not match beginning CRC!\nNetwork games won't work after this.\nOld: 0x%8.8X, New: 0x%8.8X",
 		lastCRC, thisCRC));
@@ -160,11 +156,16 @@ SubsystemInterfaceList* TheSubsystemList = NULL;
 
 //-------------------------------------------------------------------------------------------------
 template<class SUBSYSTEM>
-void initSubsystem(SUBSYSTEM*& sysref, AsciiString name, SUBSYSTEM* sys, Xfer *pXfer,  const char* path1 = NULL, 
-									 const char* path2 = NULL, const char* dirpath = NULL)
+void initSubsystem(
+	SUBSYSTEM*& sysref,
+	AsciiString name,
+	SUBSYSTEM* sys,
+	Xfer *pXfer,
+	const char* path1 = NULL,
+	const char* path2 = NULL)
 {
 	sysref = sys;
-	TheSubsystemList->initSubsystem(sys, path1, path2, dirpath, pXfer, name);
+	TheSubsystemList->initSubsystem(sys, path1, path2, pXfer, name);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -174,19 +175,80 @@ extern CComModule _Module;
 //-------------------------------------------------------------------------------------------------
 static void updateTGAtoDDS();
 
-Int GameEngine::getFramesPerSecondLimit( void )
+//-------------------------------------------------------------------------------------------------
+static void updateWindowTitle()
 {
-	return m_maxFPS;
+	// TheSuperHackers @tweak Now prints product and version information in the Window title.
+
+	DEBUG_ASSERTCRASH(TheVersion != NULL, ("TheVersion is NULL"));
+	DEBUG_ASSERTCRASH(TheGameText != NULL, ("TheGameText is NULL"));
+
+	UnicodeString title;
+
+	if (rts::ClientInstance::getInstanceId() > 1u)
+	{
+		UnicodeString str;
+		str.format(L"Instance:%.2u", rts::ClientInstance::getInstanceId());
+		title.concat(str);
+	}
+
+	UnicodeString productString = TheVersion->getUnicodeProductString();
+
+	if (!productString.isEmpty())
+	{
+		if (!title.isEmpty())
+			title.concat(L" ");
+		title.concat(productString);
+	}
+
+#if RTS_GENERALS
+	const WideChar* defaultGameTitle = L"Command and Conquer Generals";
+#elif RTS_ZEROHOUR
+	const WideChar* defaultGameTitle = L"Command and Conquer Generals Zero Hour";
+#endif
+	UnicodeString gameTitle = TheGameText->FETCH_OR_SUBSTITUTE("GUI:Command&ConquerGenerals", defaultGameTitle);
+
+	if (!gameTitle.isEmpty())
+	{
+		UnicodeString gameTitleFinal;
+		UnicodeString gameVersion = TheVersion->getUnicodeVersion();
+
+		if (productString.isEmpty())
+		{
+			gameTitleFinal = gameTitle;
+		}
+		else
+		{
+			UnicodeString gameTitleFormat = TheGameText->FETCH_OR_SUBSTITUTE("Version:GameTitle", L"for %ls");
+			gameTitleFinal.format(gameTitleFormat.str(), gameTitle.str());
+		}
+
+		if (!title.isEmpty())
+			title.concat(L" ");
+		title.concat(gameTitleFinal.str());
+		title.concat(L" ");
+		title.concat(gameVersion.str());
+	}
+
+	if (!title.isEmpty())
+	{
+		AsciiString titleA;
+		titleA.translate(title);	//get ASCII version for Win 9x
+
+		extern HWND ApplicationHWnd;  ///< our application window handle
+		if (ApplicationHWnd) {
+			//Set it twice because Win 9x does not support SetWindowTextW.
+			::SetWindowText(ApplicationHWnd, titleA.str());
+			::SetWindowTextW(ApplicationHWnd, title.str());
+		}
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
 GameEngine::GameEngine( void )
 {
-	// Set the time slice size to 1 ms.
-	timeBeginPeriod(1);
-
 	// initialize to non garbage values
-	m_maxFPS = 0;
+	m_logicTimeAccumulator = 0.0f;
 	m_quitting = FALSE;
 	m_isActive = FALSE;
 
@@ -207,6 +269,10 @@ GameEngine::~GameEngine()
 
 	TheGameResultsQueue->endThreads();
 
+	// TheSuperHackers @fix helmutbuhler 03/06/2025
+	// Reset all subsystems before deletion to prevent crashing due to cross dependencies.
+	reset();
+
 	TheSubsystemList->shutdownAll();
 	delete TheSubsystemList;
 	TheSubsystemList = NULL;
@@ -223,8 +289,8 @@ GameEngine::~GameEngine()
 	delete TheFileSystem;
 	TheFileSystem = NULL;
 
-	if (TheGameLODManager)
-		delete TheGameLODManager;
+	delete TheGameLODManager;
+	TheGameLODManager = NULL;
 
 	Drawable::killStaticImages();
 
@@ -233,22 +299,51 @@ GameEngine::~GameEngine()
 #ifdef PERF_TIMERS
 	PerfGather::termPerfDump();
 #endif
+}
+
+//-------------------------------------------------------------------------------------------------
+Bool GameEngine::isTimeFrozen()
+{
+	// TheSuperHackers @fix The time can no longer be frozen in Network games. It would disconnect the player.
+	if (TheNetwork != NULL)
+		return false;
+
+	if (TheTacticalView != NULL)
+	{
+		if (TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished())
+			return true;
+	}
 
-	// Restore the previous time slice for Windows.
-	timeEndPeriod(1);
+	if (TheScriptEngine != NULL)
+	{
+		if (TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript())
+			return true;
+	}
+
+	return false;
 }
 
-void GameEngine::setFramesPerSecondLimit( Int fps )
+//-------------------------------------------------------------------------------------------------
+Bool GameEngine::isGameHalted()
 {
-	DEBUG_LOG(("GameEngine::setFramesPerSecondLimit() - setting max fps to %d (TheGlobalData->m_useFpsLimit == %d)\n", fps, TheGlobalData->m_useFpsLimit));
-	m_maxFPS = fps;
+	if (TheNetwork != NULL)
+	{
+		if (TheNetwork->isStalling())
+			return true;
+	}
+	else
+	{
+		if (TheGameLogic != NULL && TheGameLogic->isGamePaused())
+			return true;
+	}
+
+	return false;
 }
 
 /** -----------------------------------------------------------------------------------------------
  * Initialize the game engine by initializing the GameLogic and GameClient.
  */
-void GameEngine::init( void ) {} /// @todo: I changed this to take argc & argv so we can parse those after the GDF is loaded.  We need to rethink this immediately as it is a nasty hack
-void GameEngine::init( int argc, char *argv[] )
+void GameEngine::init()
 {
 	try {
 		//create an INI object to use for loading stuff
@@ -257,24 +352,21 @@ void GameEngine::init( int argc, char *argv[] )
 #ifdef DEBUG_LOGGING
 		if (TheVersion)
 		{
-			DEBUG_LOG(("================================================================================\n"));
-	#if defined RTS_DEBUG
-			const char *buildType = "Debug";
-	#elif defined RTS_INTERNAL
-			const char *buildType = "Internal";
-	#else
-			const char *buildType = "Release";
-	#endif
-			DEBUG_LOG(("Generals version %s (%s)\n", TheVersion->getAsciiVersion().str(), buildType));
-			DEBUG_LOG(("Build date: %s\n", TheVersion->getAsciiBuildTime().str()));
-			DEBUG_LOG(("Build location: %s\n", TheVersion->getAsciiBuildLocation().str()));
-			DEBUG_LOG(("Built by: %s\n", TheVersion->getAsciiBuildUser().str()));
-			DEBUG_LOG(("================================================================================\n"));
+			DEBUG_LOG(("================================================================================"));
+			DEBUG_LOG(("Generals version %s", TheVersion->getAsciiVersion().str()));
+			DEBUG_LOG(("Build date: %s", TheVersion->getAsciiBuildTime().str()));
+			DEBUG_LOG(("Build location: %s", TheVersion->getAsciiBuildLocation().str()));
+			DEBUG_LOG(("Build user: %s", TheVersion->getAsciiBuildUser().str()));
+			DEBUG_LOG(("Build git revision: %s", TheVersion->getAsciiGitCommitCount().str()));
+			DEBUG_LOG(("Build git version: %s", TheVersion->getAsciiGitTagOrHash().str()));
+			DEBUG_LOG(("Build git commit time: %s", TheVersion->getAsciiGitCommitTime().str()));
+			DEBUG_LOG(("Build git commit author: %s", Version::getGitCommitAuthorName()));
+			DEBUG_LOG(("================================================================================"));
 		}
 #endif
 
 	#if defined(PERF_TIMERS) || defined(DUMP_PERF_STATS)
-		DEBUG_LOG(("Calculating CPU frequency for performance timers.\n"));
+		DEBUG_LOG(("Calculating CPU frequency for performance timers."));
 		InitPrecisionTimer();
 	#endif
 	#ifdef PERF_TIMERS
@@ -291,11 +383,10 @@ void GameEngine::init( int argc, char *argv[] )
 	GetPrecisionTimer(&startTime64);////////////////////////////////////////////////////
   char Buf[256];//////////////////////////////////////////////////////////////////////
 	#endif//////////////////////////////////////////////////////////////////////////////
-		
-		m_maxFPS = DEFAULT_MAX_FPS;
+
 
 		TheSubsystemList = MSGNEW("GameEngineSubsystem") SubsystemInterfaceList;
-		
+
 		TheSubsystemList->addSubsystem(this);
 
 		// initialize the random number system
@@ -304,12 +395,6 @@ void GameEngine::init( int argc, char *argv[] )
 		// Create the low-level file system interface
 		TheFileSystem = createFileSystem();
 
-		//Kris: Patch 1.01 - November 17, 2003
-		//I was unable to resolve the RTPatch method of deleting a shipped file. English, Chinese, and Korean
-		//SKU's shipped with two INIZH.big files. One properly in the Run directory and the other in Run\INI\Data.
-		//We need to toast the latter in order for the game to patch properly.
-		DeleteFile( "Data\\INI\\INIZH.big" );
-
 		// not part of the subsystem list, because it should normally never be reset!
 		TheNameKeyGenerator = MSGNEW("GameEngineSubsystem") NameKeyGenerator;
 		TheNameKeyGenerator->init();
@@ -317,7 +402,7 @@ void GameEngine::init( int argc, char *argv[] )
 
     	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheNameKeyGenerator  = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheNameKeyGenerator  = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
@@ -329,7 +414,7 @@ void GameEngine::init( int argc, char *argv[] )
 
     	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheCommandList  = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheCommandList  = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
@@ -344,7 +429,7 @@ void GameEngine::init( int argc, char *argv[] )
 
     	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheLocalFileSystem  = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheLocalFileSystem  = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
@@ -354,42 +439,40 @@ void GameEngine::init( int argc, char *argv[] )
 
     	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheArchiveFileSystem  = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheArchiveFileSystem  = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
 
 
-		initSubsystem(TheWritableGlobalData, "TheWritableGlobalData", MSGNEW("GameEngineSubsystem") GlobalData(), &xferCRC, "Data\\INI\\Default\\GameData.ini", "Data\\INI\\GameData.ini");
+		DEBUG_ASSERTCRASH(TheWritableGlobalData,("TheWritableGlobalData expected to be created"));
+		initSubsystem(TheWritableGlobalData, "TheWritableGlobalData", TheWritableGlobalData, &xferCRC, "Data\\INI\\Default\\GameData", "Data\\INI\\GameData");
+		TheWritableGlobalData->parseCustomDefinition();
 
 
 	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After  TheWritableGlobalData = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After  TheWritableGlobalData = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
 
 
-		// TheSuperHackers @bugfix helmutbuhler 14/04/2025
-		// Pump messages during startup to ensure that the application window is correctly
-		// positioned on slower computers and in debug builds by a later call to SetWindowPos.
-		// It is unclear what the issue with SetWindowPos is when it fails to reposition the window.
-		serviceWindowsOS();
-
 
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		// If we're in Debug or Internal, load the Debug info as well.
-		ini.load( AsciiString( "Data\\INI\\GameDataDebug.ini" ), INI_LOAD_OVERWRITE, NULL );
+	#if defined(RTS_DEBUG)
+		// If we're in Debug, load the Debug settings as well.
+		ini.loadFileDirectory( "Data\\INI\\GameDataDebug", INI_LOAD_OVERWRITE, NULL );
 	#endif
-		
+
 		// special-case: parse command-line parameters after loading global data
-		parseCommandLine(argc, argv);
+		CommandLine::parseCommandLineForEngineInit();
+
+		TheArchiveFileSystem->loadMods();
 
 		// doesn't require resets so just create a single instance here.
 		TheGameLODManager = MSGNEW("GameEngineSubsystem") GameLODManager;
 		TheGameLODManager->init();
-		
+
 		// after parsing the command line, we may want to perform dds stuff. Do that here.
 		if (TheGlobalData->m_shouldUpdateTGAToDDS) {
 			// update any out of date targas here.
@@ -397,43 +480,45 @@ void GameEngine::init( int argc, char *argv[] )
 		}
 
 		// read the water settings from INI (must do prior to initing GameClient, apparently)
-		ini.load( AsciiString( "Data\\INI\\Default\\Water.ini" ), INI_LOAD_OVERWRITE, &xferCRC );
-		ini.load( AsciiString( "Data\\INI\\Water.ini" ), INI_LOAD_OVERWRITE, &xferCRC );
-		ini.load( AsciiString( "Data\\INI\\Default\\Weather.ini" ), INI_LOAD_OVERWRITE, &xferCRC );
-		ini.load( AsciiString( "Data\\INI\\Weather.ini" ), INI_LOAD_OVERWRITE, &xferCRC );
+		ini.loadFileDirectory( "Data\\INI\\Default\\Water", INI_LOAD_OVERWRITE, &xferCRC );
+		ini.loadFileDirectory( "Data\\INI\\Water", INI_LOAD_OVERWRITE, &xferCRC );
+		ini.loadFileDirectory( "Data\\INI\\Default\\Weather", INI_LOAD_OVERWRITE, &xferCRC );
+		ini.loadFileDirectory( "Data\\INI\\Weather", INI_LOAD_OVERWRITE, &xferCRC );
 
 
 
 	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After water INI's = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After water INI's = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
 
 
 #ifdef DEBUG_CRC
-		initSubsystem(TheDeepCRCSanityCheck, "TheDeepCRCSanityCheck", MSGNEW("GameEngineSubystem") DeepCRCSanityCheck, NULL, NULL, NULL, NULL);
+		initSubsystem(TheDeepCRCSanityCheck, "TheDeepCRCSanityCheck", MSGNEW("GameEngineSubystem") DeepCRCSanityCheck, NULL);
 #endif // DEBUG_CRC
 		initSubsystem(TheGameText, "TheGameText", CreateGameTextInterface(), NULL);
+		updateWindowTitle();
 
 	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheGameText = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheGameText = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
 
 
-		initSubsystem(TheScienceStore,"TheScienceStore", MSGNEW("GameEngineSubsystem") ScienceStore(), &xferCRC, "Data\\INI\\Default\\Science.ini", "Data\\INI\\Science.ini");
-		initSubsystem(TheMultiplayerSettings,"TheMultiplayerSettings", MSGNEW("GameEngineSubsystem") MultiplayerSettings(), &xferCRC, "Data\\INI\\Default\\Multiplayer.ini", "Data\\INI\\Multiplayer.ini");
-		initSubsystem(TheTerrainTypes,"TheTerrainTypes", MSGNEW("GameEngineSubsystem") TerrainTypeCollection(), &xferCRC, "Data\\INI\\Default\\Terrain.ini", "Data\\INI\\Terrain.ini");
-		initSubsystem(TheTerrainRoads,"TheTerrainRoads", MSGNEW("GameEngineSubsystem") TerrainRoadCollection(), &xferCRC, "Data\\INI\\Default\\Roads.ini", "Data\\INI\\Roads.ini");
+		initSubsystem(TheScienceStore,"TheScienceStore", MSGNEW("GameEngineSubsystem") ScienceStore(), &xferCRC, "Data\\INI\\Default\\Science", "Data\\INI\\Science");
+		initSubsystem(TheMultiplayerSettings,"TheMultiplayerSettings", MSGNEW("GameEngineSubsystem") MultiplayerSettings(), &xferCRC, "Data\\INI\\Default\\Multiplayer", "Data\\INI\\Multiplayer");
+		initSubsystem(TheTerrainTypes,"TheTerrainTypes", MSGNEW("GameEngineSubsystem") TerrainTypeCollection(), &xferCRC, "Data\\INI\\Default\\Terrain", "Data\\INI\\Terrain");
+		initSubsystem(TheTerrainRoads,"TheTerrainRoads", MSGNEW("GameEngineSubsystem") TerrainRoadCollection(), &xferCRC, "Data\\INI\\Default\\Roads", "Data\\INI\\Roads");
 		initSubsystem(TheGlobalLanguageData,"TheGlobalLanguageData",MSGNEW("GameEngineSubsystem") GlobalLanguage, NULL); // must be before the game text
+		TheGlobalLanguageData->parseCustomDefinition();
 		initSubsystem(TheCDManager,"TheCDManager", CreateCDManager(), NULL);
 	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheCDManager = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheCDManager = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
@@ -443,7 +528,7 @@ void GameEngine::init( int argc, char *argv[] )
 
 	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheAudio = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheAudio = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
@@ -454,63 +539,63 @@ void GameEngine::init( int argc, char *argv[] )
 		initSubsystem(TheMessageStream,"TheMessageStream", createMessageStream(), NULL);
 		initSubsystem(TheSidesList,"TheSidesList", MSGNEW("GameEngineSubsystem") SidesList(), NULL);
 		initSubsystem(TheCaveSystem,"TheCaveSystem", MSGNEW("GameEngineSubsystem") CaveSystem(), NULL);
-		initSubsystem(TheRankInfoStore,"TheRankInfoStore", MSGNEW("GameEngineSubsystem") RankInfoStore(), &xferCRC, NULL, "Data\\INI\\Rank.ini");
-		initSubsystem(ThePlayerTemplateStore,"ThePlayerTemplateStore", MSGNEW("GameEngineSubsystem") PlayerTemplateStore(), &xferCRC, "Data\\INI\\Default\\PlayerTemplate.ini", "Data\\INI\\PlayerTemplate.ini");
+		initSubsystem(TheRankInfoStore,"TheRankInfoStore", MSGNEW("GameEngineSubsystem") RankInfoStore(), &xferCRC, NULL, "Data\\INI\\Rank");
+		initSubsystem(ThePlayerTemplateStore,"ThePlayerTemplateStore", MSGNEW("GameEngineSubsystem") PlayerTemplateStore(), &xferCRC, "Data\\INI\\Default\\PlayerTemplate", "Data\\INI\\PlayerTemplate");
 		initSubsystem(TheParticleSystemManager,"TheParticleSystemManager", createParticleSystemManager(), NULL);
 
 	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheParticleSystemManager = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheParticleSystemManager = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
-    
-    
-		initSubsystem(TheFXListStore,"TheFXListStore", MSGNEW("GameEngineSubsystem") FXListStore(), &xferCRC, "Data\\INI\\Default\\FXList.ini", "Data\\INI\\FXList.ini");
-		initSubsystem(TheWeaponStore,"TheWeaponStore", MSGNEW("GameEngineSubsystem") WeaponStore(), &xferCRC, NULL, "Data\\INI\\Weapon.ini");
-		initSubsystem(TheObjectCreationListStore,"TheObjectCreationListStore", MSGNEW("GameEngineSubsystem") ObjectCreationListStore(), &xferCRC, "Data\\INI\\Default\\ObjectCreationList.ini", "Data\\INI\\ObjectCreationList.ini");
-		initSubsystem(TheLocomotorStore,"TheLocomotorStore", MSGNEW("GameEngineSubsystem") LocomotorStore(), &xferCRC, NULL, "Data\\INI\\Locomotor.ini");
-		initSubsystem(TheSpecialPowerStore,"TheSpecialPowerStore", MSGNEW("GameEngineSubsystem") SpecialPowerStore(), &xferCRC, "Data\\INI\\Default\\SpecialPower.ini", "Data\\INI\\SpecialPower.ini");
-		initSubsystem(TheDamageFXStore,"TheDamageFXStore", MSGNEW("GameEngineSubsystem") DamageFXStore(), &xferCRC, NULL, "Data\\INI\\DamageFX.ini");
-		initSubsystem(TheArmorStore,"TheArmorStore", MSGNEW("GameEngineSubsystem") ArmorStore(), &xferCRC, NULL, "Data\\INI\\Armor.ini");
+
+
+		initSubsystem(TheFXListStore,"TheFXListStore", MSGNEW("GameEngineSubsystem") FXListStore(), &xferCRC, "Data\\INI\\Default\\FXList", "Data\\INI\\FXList");
+		initSubsystem(TheWeaponStore,"TheWeaponStore", MSGNEW("GameEngineSubsystem") WeaponStore(), &xferCRC, NULL, "Data\\INI\\Weapon");
+		initSubsystem(TheObjectCreationListStore,"TheObjectCreationListStore", MSGNEW("GameEngineSubsystem") ObjectCreationListStore(), &xferCRC, "Data\\INI\\Default\\ObjectCreationList", "Data\\INI\\ObjectCreationList");
+		initSubsystem(TheLocomotorStore,"TheLocomotorStore", MSGNEW("GameEngineSubsystem") LocomotorStore(), &xferCRC, NULL, "Data\\INI\\Locomotor");
+		initSubsystem(TheSpecialPowerStore,"TheSpecialPowerStore", MSGNEW("GameEngineSubsystem") SpecialPowerStore(), &xferCRC, "Data\\INI\\Default\\SpecialPower", "Data\\INI\\SpecialPower");
+		initSubsystem(TheDamageFXStore,"TheDamageFXStore", MSGNEW("GameEngineSubsystem") DamageFXStore(), &xferCRC, NULL, "Data\\INI\\DamageFX");
+		initSubsystem(TheArmorStore,"TheArmorStore", MSGNEW("GameEngineSubsystem") ArmorStore(), &xferCRC, NULL, "Data\\INI\\Armor");
 		initSubsystem(TheBuildAssistant,"TheBuildAssistant", MSGNEW("GameEngineSubsystem") BuildAssistant, NULL);
 
 
 	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheBuildAssistant = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheBuildAssistant = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
 
 
 
-		initSubsystem(TheThingFactory,"TheThingFactory", createThingFactory(), &xferCRC, "Data\\INI\\Default\\Object.ini", NULL, "Data\\INI\\Object");
+		initSubsystem(TheThingFactory,"TheThingFactory", createThingFactory(), &xferCRC, "Data\\INI\\Default\\Object", "Data\\INI\\Object");
 
 	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheThingFactory = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheThingFactory = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
-    
-    
-		initSubsystem(TheUpgradeCenter,"TheUpgradeCenter", MSGNEW("GameEngineSubsystem") UpgradeCenter, &xferCRC, "Data\\INI\\Default\\Upgrade.ini", "Data\\INI\\Upgrade.ini");
+
+
+		initSubsystem(TheUpgradeCenter,"TheUpgradeCenter", MSGNEW("GameEngineSubsystem") UpgradeCenter, &xferCRC, "Data\\INI\\Default\\Upgrade", "Data\\INI\\Upgrade");
 		initSubsystem(TheGameClient,"TheGameClient", createGameClient(), NULL);
 
 
 	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheGameClient = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheGameClient = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
 
-	
-		initSubsystem(TheAI,"TheAI", MSGNEW("GameEngineSubsystem") AI(), &xferCRC,  "Data\\INI\\Default\\AIData.ini", "Data\\INI\\AIData.ini");
+
+		initSubsystem(TheAI,"TheAI", MSGNEW("GameEngineSubsystem") AI(), &xferCRC,  "Data\\INI\\Default\\AIData", "Data\\INI\\AIData");
 		initSubsystem(TheGameLogic,"TheGameLogic", createGameLogic(), NULL);
 		initSubsystem(TheTeamFactory,"TheTeamFactory", MSGNEW("GameEngineSubsystem") TeamFactory(), NULL);
-		initSubsystem(TheCrateSystem,"TheCrateSystem", MSGNEW("GameEngineSubsystem") CrateSystem(), &xferCRC, "Data\\INI\\Default\\Crate.ini", "Data\\INI\\Crate.ini");
+		initSubsystem(TheCrateSystem,"TheCrateSystem", MSGNEW("GameEngineSubsystem") CrateSystem(), &xferCRC, "Data\\INI\\Default\\Crate", "Data\\INI\\Crate");
 		initSubsystem(ThePlayerList,"ThePlayerList", MSGNEW("GameEngineSubsystem") PlayerList(), NULL);
 		initSubsystem(TheRecorder,"TheRecorder", createRecorder(), NULL);
 		initSubsystem(TheRadar,"TheRadar", TheGlobalData->m_headless ? NEW RadarDummy : createRadar(), NULL);
@@ -520,39 +605,39 @@ void GameEngine::init( int argc, char *argv[] )
 
 	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheVictoryConditions = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheVictoryConditions = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
 
 
 		AsciiString fname;
-		fname.format("Data\\%s\\CommandMap.ini", GetRegistryLanguage().str());
-		initSubsystem(TheMetaMap,"TheMetaMap", MSGNEW("GameEngineSubsystem") MetaMap(), NULL, fname.str(), "Data\\INI\\CommandMap.ini");
+		fname.format("Data\\%s\\CommandMap", GetRegistryLanguage().str());
+		initSubsystem(TheMetaMap,"TheMetaMap", MSGNEW("GameEngineSubsystem") MetaMap(), NULL, fname.str(), "Data\\INI\\CommandMap");
 
 		TheMetaMap->generateMetaMap();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		ini.load("Data\\INI\\CommandMapDebug.ini", INI_LOAD_MULTIFILE, NULL);
+#if defined(RTS_DEBUG)
+		ini.loadFileDirectory("Data\\INI\\CommandMapDebug", INI_LOAD_MULTIFILE, NULL);
 #endif
 
 #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
-		ini.load("Data\\INI\\CommandMapDemo.ini", INI_LOAD_MULTIFILE, NULL);
+		ini.loadFileDirectory("Data\\INI\\CommandMapDemo", INI_LOAD_MULTIFILE, NULL);
 #endif
 
 
 		initSubsystem(TheActionManager,"TheActionManager", MSGNEW("GameEngineSubsystem") ActionManager(), NULL);
 		//initSubsystem((CComObject<WebBrowser> *)TheWebBrowser,"(CComObject<WebBrowser> *)TheWebBrowser", (CComObject<WebBrowser> *)createWebBrowser(), NULL);
-		initSubsystem(TheGameStateMap,"TheGameStateMap", MSGNEW("GameEngineSubsystem") GameStateMap, NULL, NULL, NULL );
-		initSubsystem(TheGameState,"TheGameState", MSGNEW("GameEngineSubsystem") GameState, NULL, NULL, NULL );
+		initSubsystem(TheGameStateMap,"TheGameStateMap", MSGNEW("GameEngineSubsystem") GameStateMap, NULL );
+		initSubsystem(TheGameState,"TheGameState", MSGNEW("GameEngineSubsystem") GameState, NULL );
 
 		// Create the interface for sending game results
-		initSubsystem(TheGameResultsQueue,"TheGameResultsQueue", GameResultsInterface::createNewGameResultsInterface(), NULL, NULL, NULL, NULL);
+		initSubsystem(TheGameResultsQueue,"TheGameResultsQueue", GameResultsInterface::createNewGameResultsInterface(), NULL);
 
 
 	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheGameResultsQueue = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheGameResultsQueue = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
@@ -560,17 +645,17 @@ void GameEngine::init( int argc, char *argv[] )
 
 		xferCRC.close();
 		TheWritableGlobalData->m_iniCRC = xferCRC.getCRC();
-		DEBUG_LOG(("INI CRC is 0x%8.8X\n", TheGlobalData->m_iniCRC));
+		DEBUG_LOG(("INI CRC is 0x%8.8X", TheGlobalData->m_iniCRC));
 
 		TheSubsystemList->postProcessLoadAll();
 
-		setFramesPerSecondLimit(TheGlobalData->m_framesPerSecondLimit);
+		TheFramePacer->setFramesPerSecondLimit(TheGlobalData->m_framesPerSecondLimit);
 
 		TheAudio->setOn(TheGlobalData->m_audioOn && TheGlobalData->m_musicOn, AudioAffect_Music);
 		TheAudio->setOn(TheGlobalData->m_audioOn && TheGlobalData->m_soundsOn, AudioAffect_Sound);
 		TheAudio->setOn(TheGlobalData->m_audioOn && TheGlobalData->m_sounds3DOn, AudioAffect_Sound3D);
 		TheAudio->setOn(TheGlobalData->m_audioOn && TheGlobalData->m_speechOn, AudioAffect_Speech);
-			
+
 		// We're not in a network game yet, so set the network singleton to NULL.
 		TheNetwork = NULL;
 
@@ -579,7 +664,7 @@ void GameEngine::init( int argc, char *argv[] )
 
 		// If we turn m_quitting to FALSE here, then we throw away any requests to quit that
 		// took place during loading. :-\ - jkmcd
-		// If this really needs to take place, please make sure that pressing cancel on the audio 
+		// If this really needs to take place, please make sure that pressing cancel on the audio
 		// load music dialog will still cause the game to quit.
 		// m_quitting = FALSE;
 
@@ -590,7 +675,7 @@ void GameEngine::init( int argc, char *argv[] )
 
 	#ifdef DUMP_PERF_STATS///////////////////////////////////////////////////////////////////////////
 	GetPrecisionTimer(&endTime64);//////////////////////////////////////////////////////////////////
-	sprintf(Buf,"----------------------------------------------------------------------------After TheMapCache->updateCache = %f seconds \n",((double)(endTime64-startTime64)/(double)(freq64)));
+	sprintf(Buf,"----------------------------------------------------------------------------After TheMapCache->updateCache = %f seconds",((double)(endTime64-startTime64)/(double)(freq64)));
   startTime64 = endTime64;//Reset the clock ////////////////////////////////////////////////////////
 	DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
 	#endif/////////////////////////////////////////////////////////////////////////////////////////////
@@ -602,11 +687,11 @@ void GameEngine::init( int argc, char *argv[] )
 			//populateMapListbox(NULL, true, true);
 			m_quitting = TRUE;
 		}
-		
+
 		// load the initial shell screen
-		//TheShell->push( AsciiString("Menus/MainMenu.wnd") );
-		
-		// This allows us to run a map/reply from the command line
+		//TheShell->push( "Menus/MainMenu.wnd" );
+
+		// This allows us to run a map from the command line
 		if (TheGlobalData->m_initialFile.isEmpty() == FALSE)
 		{
 			AsciiString fname = TheGlobalData->m_initialFile;
@@ -628,13 +713,9 @@ void GameEngine::init( int argc, char *argv[] )
 				msg->appendIntegerArgument(0);
 				InitRandom(0);
 			}
-			else if (fname.endsWithNoCase(".rep"))
-			{
-				TheRecorder->playbackFile(fname);
-			}
 		}
 
-		// 
+		//
 		if (TheMapCache && TheGlobalData->m_shellMapOn)
 		{
 			AsciiString lowerName = TheGlobalData->m_shellMapName;
@@ -651,7 +732,7 @@ void GameEngine::init( int argc, char *argv[] )
 			TheWritableGlobalData->m_afterIntro = TRUE;
 
 		//initDisabledMasks();
-		
+
 	}
 	catch (ErrorCode ec)
 	{
@@ -680,12 +761,13 @@ void GameEngine::init( int argc, char *argv[] )
 	initDisabledMasks();
 	initDamageTypeFlags();
 
-	TheSubsystemList->resetAll();
+	resetSubsystems();
+
 	HideControlBar();
-}  // end init
+}
 
 /** -----------------------------------------------------------------------------------------------
-	* Reset all necessary parts of the game engine to be ready to accept new game data 
+	* Reset all necessary parts of the game engine to be ready to accept new game data
 	*/
 void GameEngine::reset( void )
 {
@@ -699,13 +781,12 @@ void GameEngine::reset( void )
 	if (TheGameLogic->isInMultiplayerGame())
 		deleteNetwork = true;
 
-	TheSubsystemList->resetAll();
+	resetSubsystems();
 
 	if (deleteNetwork)
 	{
 		DEBUG_ASSERTCRASH(TheNetwork, ("Deleting NULL TheNetwork!"));
-		if (TheNetwork)
-			delete TheNetwork;
+		delete TheNetwork;
 		TheNetwork = NULL;
 	}
 	if(background)
@@ -716,28 +797,104 @@ void GameEngine::reset( void )
 	}
 }
 
+/// -----------------------------------------------------------------------------------------------
+void GameEngine::resetSubsystems( void )
+{
+	// TheSuperHackers @fix xezon 09/06/2025 Reset GameLogic first to purge all world objects early.
+	// This avoids potentially catastrophic issues when objects and subsystems have cross dependencies.
+	TheGameLogic->reset();
+
+	TheSubsystemList->resetAll();
+}
+
+/// -----------------------------------------------------------------------------------------------
+Bool GameEngine::canUpdateGameLogic()
+{
+	// Must be first.
+	TheGameLogic->preUpdate();
+
+	TheFramePacer->setTimeFrozen(isTimeFrozen());
+	TheFramePacer->setGameHalted(isGameHalted());
+
+	if (TheNetwork != NULL)
+	{
+		return canUpdateNetworkGameLogic();
+	}
+	else
+	{
+		return canUpdateRegularGameLogic();
+	}
+}
+
+/// -----------------------------------------------------------------------------------------------
+Bool GameEngine::canUpdateNetworkGameLogic()
+{
+	DEBUG_ASSERTCRASH(TheNetwork != NULL, ("TheNetwork is NULL"));
+
+	if (TheNetwork->isFrameDataReady())
+	{
+		// Important: The Network is definitely no longer stalling.
+		TheFramePacer->setGameHalted(false);
+
+		return true;
+	}
+
+	return false;
+}
+
+/// -----------------------------------------------------------------------------------------------
+Bool GameEngine::canUpdateRegularGameLogic()
+{
+	const Bool enabled = TheFramePacer->isLogicTimeScaleEnabled();
+	const Int logicTimeScaleFps = TheFramePacer->getLogicTimeScaleFps();
+	const Int maxRenderFps = TheFramePacer->getFramesPerSecondLimit();
+
+#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+	const Bool useFastMode = TheGlobalData->m_TiVOFastMode;
+#else	//always allow this cheat key if we're in a replay game.
+	const Bool useFastMode = TheGlobalData->m_TiVOFastMode && TheGameLogic->isInReplayGame();
+#endif
+
+	if (useFastMode || !enabled || logicTimeScaleFps >= maxRenderFps)
+	{
+		// Logic time scale is uncapped or larger equal Render FPS. Update straight away.
+		return true;
+	}
+	else
+	{
+		// TheSuperHackers @tweak xezon 06/08/2025
+		// The logic time step is now decoupled from the render update.
+		const Real targetFrameTime = 1.0f / logicTimeScaleFps;
+		m_logicTimeAccumulator += min(TheFramePacer->getUpdateTime(), targetFrameTime);
+
+		if (m_logicTimeAccumulator >= targetFrameTime)
+		{
+			m_logicTimeAccumulator -= targetFrameTime;
+			return true;
+		}
+	}
+
+	return false;
+}
+
 /// -----------------------------------------------------------------------------------------------
 DECLARE_PERF_TIMER(GameEngine_update)
 
 /** -----------------------------------------------------------------------------------------------
  * Update the game engine by updating the GameClient and GameLogic singletons.
- * @todo Allow the client to run as fast as possible, but limit the execution
- * of TheNetwork and TheGameLogic to a fixed framerate.
  */
 void GameEngine::update( void )
-{ 
+{
 	USE_PERF_TIMER(GameEngine_update)
 	{
-
 		{
-			
 			// VERIFY CRC needs to be in this code block.  Please to not pull TheGameLogic->update() inside this block.
 			VERIFY_CRC
 
 			TheRadar->UPDATE();
 
 			/// @todo Move audio init, update, etc, into GameClient update
-			
+
 			TheAudio->UPDATE();
 			TheGameClient->UPDATE();
 			TheMessageStream->propagateMessages();
@@ -746,19 +903,26 @@ void GameEngine::update( void )
 			{
 				TheNetwork->UPDATE();
 			}
-			 
+
 			TheCDManager->UPDATE();
 		}
 
-		TheGameLogic->preUpdate();
+		const Bool canUpdate = canUpdateGameLogic();
+		const Bool canUpdateLogic = canUpdate && !TheFramePacer->isGameHalted() && !TheFramePacer->isTimeFrozen();
+		const Bool canUpdateScript = canUpdate && !TheFramePacer->isGameHalted();
 
-		if ((TheNetwork == NULL && !TheGameLogic->isGamePaused()) || (TheNetwork && TheNetwork->isFrameDataReady()))
+		if (canUpdateLogic)
 		{
+			TheGameClient->step();
 			TheGameLogic->UPDATE();
 		}
-
-	}	// end perfGather
-
+		else if (canUpdateScript)
+		{
+			// TheSuperHackers @info Still update the Script Engine to allow
+			// for scripted camera movements while the time is frozen.
+			TheScriptEngine->UPDATE();
+		}
+	}
 }
 
 // Horrible reference, but we really, really need to know if we are windowed.
@@ -766,13 +930,11 @@ extern bool DX8Wrapper_IsWindowed;
 extern HWND ApplicationHWnd;
 
 /** -----------------------------------------------------------------------------------------------
- * The "main loop" of the game engine. It will not return until the game exits. 
+ * The "main loop" of the game engine. It will not return until the game exits.
  */
 void GameEngine::execute( void )
 {
-	
-	DWORD prevTime = timeGetTime();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	DWORD startTime = timeGetTime() / 1000;
 #endif
 
@@ -789,7 +951,7 @@ void GameEngine::execute( void )
 
 		{
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 			{
 				// enter only if in benchmark mode
 				if (TheGlobalData->m_benchmarkTimer > 0)
@@ -810,9 +972,9 @@ void GameEngine::execute( void )
 				}
 			}
 #endif
-			
+
 			{
-				try 
+				try
 				{
 					// compute a frame
 					update();
@@ -828,7 +990,7 @@ void GameEngine::execute( void )
 				catch (...)
 				{
 					// try to save info off
-					try 
+					try
 					{
 						if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_RECORD && TheRecorder->isMultiplayer())
 							TheRecorder->cleanUpReplayFile();
@@ -837,46 +999,11 @@ void GameEngine::execute( void )
 					{
 					}
 					RELEASE_CRASH(("Uncaught Exception in GameEngine::update"));
-				}	// catch
-			}	// perf
-
-			{
-
-				if (TheTacticalView->getTimeMultiplier()<=1 && !TheScriptEngine->isTimeFast()) 
-				{
-
-		// I'm disabling this in internal because many people need alt-tab capability.  If you happen to be
-		// doing performance tuning, please just change this on your local system. -MDC
-		#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-					::Sleep(1); // give everyone else a tiny time slice.
-		#endif
-
-
-		#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
-          if ( ! TheGlobalData->m_TiVOFastMode )
-		#else	//always allow this cheatkey if we're in a replaygame.
-		  if ( ! (TheGlobalData->m_TiVOFastMode && TheGameLogic->isInReplayGame()))
-		#endif
-          {
-            // limit the framerate
-					  DWORD now = timeGetTime();
-					  DWORD limit = (1000.0f/m_maxFPS)-1;
-					  while (TheGlobalData->m_useFpsLimit && (now - prevTime) < limit) 
-					  {
-						  ::Sleep(0);
-						  now = timeGetTime();
-					  }
-					  //Int slept = now - prevTime;
-					  //DEBUG_LOG(("delayed %d\n",slept));
-
-					  prevTime = now;
-
-          }        
-        
-        }
+				}
 			}
 
-		}	// perfgather for execute_loop
+			TheFramePacer->update();
+		}
 
 #ifdef PERF_TIMERS
 		if (!m_quitting && TheGameLogic->isInGame() && !TheGameLogic->isInShellGame() && !TheGameLogic->isGamePaused())
@@ -888,7 +1015,6 @@ void GameEngine::execute( void )
 #endif
 
 	}
-
 }
 
 /** -----------------------------------------------------------------------------------------------
@@ -921,9 +1047,9 @@ Bool GameEngine::isMultiplayerSession( void )
 void updateTGAtoDDS()
 {
 	// Here's the scoop. We're going to traverse through all of the files in the Art\Textures folder
-	// and determine if there are any .tga files that are newer than associated .dds files. If there 
+	// and determine if there are any .tga files that are newer than associated .dds files. If there
 	// are, then we will re-run the compression tool on them.
-	
+
 	File *fp = TheLocalFileSystem->openFile("buildDDS.txt", File::WRITE | File::CREATE | File::TRUNCATE | File::TEXT);
 	if (!fp) {
 		return;
@@ -951,17 +1077,15 @@ void updateTGAtoDDS()
 		}
 
 		// replace tga with dds
-		filenameDDS.removeLastChar();	// a
-		filenameDDS.removeLastChar();	// g
-		filenameDDS.removeLastChar();	// t
+		filenameDDS.truncateBy(3); // tga
 		filenameDDS.concat("dds");
 
 		Bool needsToBeUpdated = FALSE;
 		FileInfo infoDDS;
 		if (TheFileSystem->doesFileExist(filenameDDS.str())) {
 			TheFileSystem->getFileInfo(filenameDDS, &infoDDS);
-			if (infoTGA.timestampHigh > infoDDS.timestampHigh || 
-					(infoTGA.timestampHigh == infoDDS.timestampHigh && 
+			if (infoTGA.timestampHigh > infoDDS.timestampHigh ||
+					(infoTGA.timestampHigh == infoDDS.timestampHigh &&
 					 infoTGA.timestampLow > infoDDS.timestampLow)) {
 				needsToBeUpdated = TRUE;
 			}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp
index 725c75fc8ef..4594265789b 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp
@@ -41,20 +41,15 @@
 #define DEFINE_PARTICLE_SYSTEM_NAMES
 #include "GameClient/ParticleSys.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define PROFILE_ERROR_LIMIT	0.94f	//fraction of profiled result needed to get a match.  Allows some room for error/fluctuation.
 
 //Hack to get access to a static method on the W3DDevice side. -MW
-extern Bool testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, Int *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex);
+extern Bool testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, MemValueType *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex);
 
 GameLODManager *TheGameLODManager=NULL;
 
-static const FieldParse TheStaticGameLODFieldParseTable[] = 
+static const FieldParse TheStaticGameLODFieldParseTable[] =
 {
 	{ "MinimumFPS",						INI::parseInt,					NULL,	offsetof( StaticGameLODInfo, m_minFPS)},
 	{ "MinimumProcessorFps",			INI::parseInt,					NULL,	offsetof( StaticGameLODInfo, m_minProcessorFPS)},
@@ -77,13 +72,15 @@ static const FieldParse TheStaticGameLODFieldParseTable[] =
 	{ "TextureReductionFactor",		INI::parseInt,					NULL,	offsetof( StaticGameLODInfo, m_textureReduction ) },
 };
 
-static const char *StaticGameLODNames[]=
+static const char *const StaticGameLODNames[]=
 {
 	"Low",
 	"Medium",
 	"High",
+	"VeryHigh",
 	"Custom"
 };
+static_assert(ARRAY_SIZE(StaticGameLODNames) == STATIC_GAME_LOD_COUNT, "Incorrect array size");
 
 StaticGameLODInfo::StaticGameLODInfo(void)
 {
@@ -112,7 +109,7 @@ StaticGameLODInfo::StaticGameLODInfo(void)
 	m_useTrees = TRUE;
 }
 
-static const FieldParse TheDynamicGameLODFieldParseTable[] = 
+static const FieldParse TheDynamicGameLODFieldParseTable[] =
 {
 	{ "MinimumFPS",						INI::parseInt,					NULL,	offsetof( DynamicGameLODInfo, m_minFPS)},
 	{ "ParticleSkipMask",				INI::parseInt,					NULL,	offsetof( DynamicGameLODInfo, m_dynamicParticleSkipMask)},
@@ -122,13 +119,14 @@ static const FieldParse TheDynamicGameLODFieldParseTable[] =
 	{ "MinParticleSkipPriority",		INI::parseIndexList, ParticlePriorityNames,	offsetof( DynamicGameLODInfo, m_minDynamicParticleSkipPriority)},
 };
 
-static const char *DynamicGameLODNames[]=
+static const char *const DynamicGameLODNames[]=
 {
 	"Low",
 	"Medium",
 	"High",
 	"VeryHigh"
 };
+static_assert(ARRAY_SIZE(DynamicGameLODNames) == DYNAMIC_GAME_LOD_COUNT, "Incorrect array size");
 
 DynamicGameLODInfo::DynamicGameLODInfo(void)
 {
@@ -141,16 +139,18 @@ DynamicGameLODInfo::DynamicGameLODInfo(void)
 };
 
 //Keep this in sync with enum in GameLOD.h
-static const char *CPUNames[] = 
+static const char *const CPUNames[] =
 {
 	"XX","P3", "P4","K7", NULL
 };
+static_assert(ARRAY_SIZE(CPUNames) == CPU_MAX + 1, "Incorrect array size");
 
 //Keep this in sync with enum in GameLOD.h
-static const char *VideoNames[] = 
+static const char *const VideoNames[] =
 {
 	"XX","V2","V3","V4","V5","TNT","TNT2","GF2","R100","PS11","GF3","GF4","PS14","R200","PS20","R300", NULL
 };
+static_assert(ARRAY_SIZE(VideoNames) == DC_MAX + 1, "Incorrect array size");
 
 void parseReallyLowMHz(INI* ini)
 {
@@ -229,11 +229,12 @@ GameLODManager::GameLODManager(void)
 	m_memBenchIndex=0;
 	m_compositeBenchIndex=0;
 	m_numBenchProfiles=0;
-	m_currentTextureReduction=0;
 	m_reallyLowMHz = 400;
-	
+
 	for (Int i=0; i<STATIC_GAME_LOD_CUSTOM; i++)
 		m_numLevelPresets[i]=0;
+
+	initStaticLODLevels();
 };
 
 GameLODManager::~GameLODManager()
@@ -241,27 +242,60 @@ GameLODManager::~GameLODManager()
 
 }
 
+void GameLODManager::initStaticLODLevels()
+{
+	// TheSuperHackers @info Initialize new system specs in this function when we cannot rely on new edits to GameLOD.ini.
+
+	StaticGameLODInfo& veryhigh = m_staticGameLODInfo[STATIC_GAME_LOD_VERY_HIGH];
+	veryhigh.m_minFPS = 55;
+	veryhigh.m_minProcessorFPS = 59;
+	veryhigh.m_sampleCount2D = 6;
+	veryhigh.m_sampleCount3D = 24;
+	veryhigh.m_streamCount = 2;
+	veryhigh.m_maxParticleCount = 5000;
+	veryhigh.m_useShadowVolumes = TRUE;
+	veryhigh.m_useShadowDecals = TRUE;
+	veryhigh.m_useCloudMap = TRUE;
+	veryhigh.m_useLightMap = TRUE;
+	veryhigh.m_showSoftWaterEdge = TRUE;
+	veryhigh.m_maxTankTrackEdges = 100;
+	veryhigh.m_maxTankTrackOpaqueEdges = 25;
+	veryhigh.m_maxTankTrackFadeDelay = 60000;
+	veryhigh.m_useBuildupScaffolds = TRUE;
+	veryhigh.m_useTreeSway = TRUE;
+	veryhigh.m_useEmissiveNightMaterials = TRUE;
+	veryhigh.m_useHeatEffects = TRUE;
+	veryhigh.m_textureReduction = 0;
+	veryhigh.m_useFpsLimit = TRUE;
+	veryhigh.m_enableDynamicLOD = TRUE;
+	veryhigh.m_useTrees = TRUE;
+}
+
 BenchProfile *GameLODManager::newBenchProfile(void)
 {
 	if (m_numBenchProfiles < MAX_BENCH_PROFILES)
-	{	
+	{
 		m_numBenchProfiles++;
 		return &m_benchProfiles[m_numBenchProfiles-1];
 	}
 
-	DEBUG_CRASH(( "GameLODManager::newBenchProfile - Too many profiles defined\n"));
+	DEBUG_CRASH(( "GameLODManager::newBenchProfile - Too many profiles defined"));
 	return NULL;
 }
 
 LODPresetInfo *GameLODManager::newLODPreset(StaticGameLODLevel index)
 {
-	if (m_numLevelPresets[index] < MAX_LOD_PRESETS_PER_LEVEL)
-	{	
-		m_numLevelPresets[index]++;
-		return &m_lodPresets[index][m_numLevelPresets[index]-1];
+	if (index >= 0 && index < STATIC_GAME_LOD_COUNT)
+	{
+		if (m_numLevelPresets[index] < MAX_LOD_PRESETS_PER_LEVEL)
+		{
+			m_numLevelPresets[index]++;
+			return &m_lodPresets[index][m_numLevelPresets[index]-1];
+		}
+
+		DEBUG_CRASH(( "GameLODManager::newLODPreset - Too many presets defined for '%s'", TheGameLODManager->getStaticGameLODLevelName(index)));
 	}
 
-	DEBUG_CRASH(( "GameLODManager::newLODPreset - Too many presets defined for '%s'\n", TheGameLODManager->getStaticGameLODLevelName(index)));
 	return NULL;
 }
 
@@ -269,10 +303,10 @@ void GameLODManager::init(void)
 {
 	INI ini;
 	//Get Presets for each LOD level.
-	ini.load( AsciiString( "Data\\INI\\GameLOD.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\GameLOD", INI_LOAD_OVERWRITE, NULL );
 
 	//Get presets for each known hardware configuration
-	ini.load( AsciiString( "Data\\INI\\GameLODPresets.ini"), INI_LOAD_OVERWRITE, NULL);
+	ini.loadFileDirectory( "Data\\INI\\GameLODPresets", INI_LOAD_OVERWRITE, NULL);
 
 	//Get Presets for custom LOD level by pulling them out of initial globaldata (which should
 	//have all settings already applied).
@@ -297,7 +331,7 @@ void GameLODManager::init(void)
 		{
 			//need to run the benchmark
 			testMinimumRequirements(NULL,NULL,NULL,NULL,&m_intBenchIndex,&m_floatBenchIndex,&m_memBenchIndex);
-			
+
 			if (TheGlobalData->m_forceBenchmark)
 			{	//we want to see the numbers.  So dump them to a logfile.
 				FILE *fp=fopen("Benchmark.txt","w");
@@ -318,8 +352,8 @@ void GameLODManager::init(void)
 			{
 				//Check if we're within 5% of the performance of this cpu profile.
 				if (m_intBenchIndex/prof->m_intBenchIndex >= PROFILE_ERROR_LIMIT && m_floatBenchIndex/prof->m_floatBenchIndex >= PROFILE_ERROR_LIMIT && m_memBenchIndex/prof->m_memBenchIndex >= PROFILE_ERROR_LIMIT)
-				{	
-					for (Int i=STATIC_GAME_LOD_HIGH; i >= STATIC_GAME_LOD_LOW; i--)
+				{
+					for (Int i=STATIC_GAME_LOD_LAST; i >= STATIC_GAME_LOD_FIRST; i--)
 					{
 						LODPresetInfo *preset=&m_lodPresets[i][0];	//pointer to first preset at this LOD level.
 						for (Int j=0; j<m_numLevelPresets[i]; j++)
@@ -338,8 +372,8 @@ void GameLODManager::init(void)
 				}
 				prof++;
 			}
-		}	//finding equivalent CPU to unkown cpu.
-	}	//find data needed to determine m_idealDetailLevel
+		}
+	}
 
 	if (userSetDetail == STATIC_GAME_LOD_CUSTOM)
 	{
@@ -394,7 +428,7 @@ Int GameLODManager::getStaticGameLODIndex(AsciiString name)
 			return i;
 	}
 
-	DEBUG_CRASH(( "GameLODManager::getGameLODIndex - Invalid LOD name '%s'\n", name.str() ));
+	DEBUG_CRASH(( "GameLODManager::getGameLODIndex - Invalid LOD name '%s'", name.str() ));
 	return STATIC_GAME_LOD_UNKNOWN;
 }
 
@@ -406,7 +440,7 @@ void INI::parseStaticGameLODDefinition( INI* ini )
 
 	// read the name
 	c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	if( TheGameLODManager )
 	{
@@ -431,7 +465,7 @@ void INI::parseStaticGameLODLevel( INI* ini, void * , void *store, const void*)
 			return;
 		}
 
-	DEBUG_CRASH(("invalid GameLODLevel token %s -- expected LOW/MEDIUM/HIGH\n",tok));
+	DEBUG_CRASH(("invalid GameLODLevel token %s -- expected LOW/MEDIUM/HIGH",tok));
 	throw INI_INVALID_DATA;
 }
 
@@ -442,7 +476,7 @@ const char *GameLODManager::getStaticGameLODLevelName(StaticGameLODLevel level)
 
 /**Function which calculates the recommended LOD level for current hardware
 configuration.*/
-StaticGameLODLevel GameLODManager::findStaticLODLevel(void)
+StaticGameLODLevel GameLODManager::getRecommendedStaticLODLevel(void)
 {
 	//Check if we have never done the test on current system
 	if (m_idealDetailLevel == STATIC_GAME_LOD_UNKNOWN)
@@ -457,7 +491,7 @@ StaticGameLODLevel GameLODManager::findStaticLODLevel(void)
 
 		Int numMBRam=m_numRAM/(1024*1024);
 
-		for (Int i=STATIC_GAME_LOD_HIGH; i >= STATIC_GAME_LOD_LOW; i--)
+		for (Int i=STATIC_GAME_LOD_LAST; i >= STATIC_GAME_LOD_FIRST; i--)
 		{
 				LODPresetInfo *preset=&m_lodPresets[i][0];	//pointer to first preset at this LOD level.
 				for (Int j=0; j<m_numLevelPresets[i]; j++)
@@ -493,7 +527,7 @@ StaticGameLODLevel GameLODManager::findStaticLODLevel(void)
 Bool GameLODManager::setStaticLODLevel(StaticGameLODLevel level)
 {
 	if (!TheGlobalData->m_enableStaticLOD)
-	{	m_currentStaticLOD = STATIC_GAME_LOD_CUSTOM; 
+	{	m_currentStaticLOD = STATIC_GAME_LOD_CUSTOM;
 		return FALSE;
 	}
 
@@ -525,16 +559,23 @@ void GameLODManager::applyStaticLODLevel(StaticGameLODLevel level)
 	StaticGameLODInfo *lodInfo=&m_staticGameLODInfo[level];
 	StaticGameLODInfo *prevLodInfo=&prevLodBackup;
 
-	Int requestedTextureReduction = 0;
-	Bool requestedTrees = m_memPassed;	//only use trees if memory requirement passed.
+	Int requestedTextureReduction;
+	Bool requestedTrees;
 	if (level == STATIC_GAME_LOD_CUSTOM)
-	{	requestedTextureReduction = lodInfo->m_textureReduction;
+	{
+		requestedTextureReduction = lodInfo->m_textureReduction;
 		requestedTrees = lodInfo->m_useTrees;
 	}
 	else
-	if (level >= STATIC_GAME_LOD_LOW)
-	{	//normal non-custom level gets texture reduction based on recommendation
-		requestedTextureReduction = getRecommendedTextureReduction();
+	{
+		//normal non-custom level gets texture reduction based on recommendation
+		StaticGameLODLevel textureLevel = getRecommendedTextureLODLevel();
+		if (textureLevel == STATIC_GAME_LOD_UNKNOWN)
+			textureLevel = level;
+		requestedTextureReduction = getLevelTextureReduction(textureLevel);
+
+		//only use trees if memory requirement passed.
+		requestedTrees = m_memPassed;
 	}
 
 	if (TheGlobalData)
@@ -543,13 +584,7 @@ void GameLODManager::applyStaticLODLevel(StaticGameLODLevel level)
 		TheWritableGlobalData->m_useShadowVolumes=lodInfo->m_useShadowVolumes;
 		TheWritableGlobalData->m_useShadowDecals=lodInfo->m_useShadowDecals;
 
-		//Check if texture resolution changed.  No need to apply when current is unknown because display will do it
-		if (requestedTextureReduction != m_currentTextureReduction)
-		{
-				TheWritableGlobalData->m_textureReductionFactor = requestedTextureReduction;
-				if (TheGameClient)
-					TheGameClient->adjustLOD(0);	//apply the new setting stored in globaldata
-		}
+		TheWritableGlobalData->m_textureReductionFactor = requestedTextureReduction;
 
 		//Check if shadow state changed
 		if (m_currentStaticLOD == STATIC_GAME_LOD_UNKNOWN	||
@@ -582,13 +617,17 @@ void GameLODManager::applyStaticLODLevel(StaticGameLODLevel level)
 		TheWritableGlobalData->m_enableDynamicLOD = lodInfo->m_enableDynamicLOD;
 		TheWritableGlobalData->m_useFpsLimit = lodInfo->m_useFpsLimit;
 		TheWritableGlobalData->m_useTrees = requestedTrees;
+
+		if (!m_memPassed || isReallyLowMHz()) {
+			TheWritableGlobalData->m_shellMapOn = false;
+		}
 	}
-	if (!m_memPassed || isReallyLowMHz()) {
-		TheWritableGlobalData->m_shellMapOn = false;
-	}
+
 	if (TheTerrainVisual)
 		TheTerrainVisual->setTerrainTracksDetail();
 
+	if (TheGameClient)
+		TheGameClient->setTextureLOD(requestedTextureReduction);
 }
 
 /**Parse a description of all the LOD settings for a given detail level*/
@@ -599,7 +638,7 @@ void INI::parseDynamicGameLODDefinition( INI* ini )
 
 	// read the name
 	c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	if( TheGameLODManager )
 	{
@@ -624,7 +663,7 @@ void INI::parseDynamicGameLODLevel( INI* ini, void * , void *store, const void*)
 			return;
 		}
 
-	DEBUG_CRASH(("invalid GameLODLevel token %s -- expected LOW/MEDIUM/HIGH\n",tok));
+	DEBUG_CRASH(("invalid GameLODLevel token %s -- expected LOW/MEDIUM/HIGH",tok));
 	throw INI_INVALID_DATA;
 }
 
@@ -637,7 +676,7 @@ Int GameLODManager::getDynamicGameLODIndex(AsciiString name)
 			return i;
 	}
 
-	DEBUG_CRASH(( "GameLODManager::getGameLODIndex - Invalid LOD name '%s'\n", name.str() ));
+	DEBUG_CRASH(( "GameLODManager::getGameLODIndex - Invalid LOD name '%s'", name.str() ));
 	return STATIC_GAME_LOD_UNKNOWN;
 }
 
@@ -687,13 +726,36 @@ void GameLODManager::applyDynamicLODLevel(DynamicGameLODLevel level)
 
 Int GameLODManager::getRecommendedTextureReduction(void)
 {
-	if (m_idealDetailLevel == STATIC_GAME_LOD_UNKNOWN)
-		findStaticLODLevel();	//it was never tested, so test now.
+	StaticGameLODLevel level = getRecommendedTextureLODLevel();
 
-	if (!m_memPassed)	//if they have < 256 MB, force them to low res textures.
-		return m_staticGameLODInfo[STATIC_GAME_LOD_LOW].m_textureReduction;
+	if (level == STATIC_GAME_LOD_UNKNOWN)
+	{
+		level = getStaticLODLevel();
+	}
+	return getLevelTextureReduction(level);
+}
+
+StaticGameLODLevel GameLODManager::getRecommendedTextureLODLevel()
+{
+	// TheSuperHackers @bugfix xezon 24/09/2025 Disables the recommended static LOD level for texture reduction
+	// because the benchmark code always generates a low level for it. Can revisit if the benchmarking is changed.
+	constexpr const Bool UseRecommendedStaticLODLevel = FALSE;
 
-	return m_staticGameLODInfo[m_idealDetailLevel].m_textureReduction;
+	StaticGameLODLevel level = STATIC_GAME_LOD_LOW;
+
+	// Force low res textures if user has less than 256 MB.
+	if (m_memPassed)
+	{
+		if constexpr (UseRecommendedStaticLODLevel)
+		{
+			level = getRecommendedStaticLODLevel();
+		}
+		else
+		{
+			level = STATIC_GAME_LOD_UNKNOWN;
+		}
+	}
+	return level;
 }
 
 Int GameLODManager::getLevelTextureReduction(StaticGameLODLevel level)
@@ -702,6 +764,6 @@ Int GameLODManager::getLevelTextureReduction(StaticGameLODLevel level)
 }
 
 Bool GameLODManager::didMemPass( void )
-{ 
-	return m_memPassed;	
+{
+	return m_memPassed;
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameMain.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameMain.cpp
index aef3d163e30..7c72fc4e1e8 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/GameMain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/GameMain.cpp
@@ -28,24 +28,39 @@
 
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/FramePacer.h"
 #include "Common/GameEngine.h"
+#include "Common/ReplaySimulation.h"
 
 
 /**
  * This is the entry point for the game system.
  */
-void GameMain( int argc, char *argv[] )
+Int GameMain()
 {
+	int exitcode = 0;
 	// initialize the game engine using factory function
+	TheFramePacer = new FramePacer();
+	TheFramePacer->enableFramesPerSecondLimit(TRUE);
 	TheGameEngine = CreateGameEngine();
-	TheGameEngine->init(argc, argv);
+	TheGameEngine->init();
 
-	// run it
-	TheGameEngine->execute();
+	if (!TheGlobalData->m_simulateReplays.empty())
+	{
+		exitcode = ReplaySimulation::simulateReplays(TheGlobalData->m_simulateReplays, TheGlobalData->m_simulateReplayJobs);
+	}
+	else
+	{
+		// run it
+		TheGameEngine->execute();
+	}
 
 	// since execute() returned, we are exiting the game
+	delete TheFramePacer;
+	TheFramePacer = NULL;
 	delete TheGameEngine;
 	TheGameEngine = NULL;
 
+	return exitcode;
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
index 83e33c3b61a..32808fab439 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
@@ -32,12 +32,15 @@
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/GlobalData.h"
+
 #define DEFINE_TERRAIN_LOD_NAMES
 #define DEFINE_TIME_OF_DAY_NAMES
 #define DEFINE_WEATHER_NAMES
 #define DEFINE_BODYDAMAGETYPE_NAMES
 #define DEFINE_PANNING_NAMES
 
+#include "Common/AddonCompat.h"
 #include "Common/crc.h"
 #include "Common/file.h"
 #include "Common/FileSystem.h"
@@ -65,7 +68,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-/*static*/ const FieldParse GlobalData::s_GlobalDataFieldParseTable[] = 
+/*static*/ const FieldParse GlobalData::s_GlobalDataFieldParseTable[] =
 {
 	{ "Windowed",									INI::parseBool,				NULL,			offsetof( GlobalData, m_windowed ) },
 	{ "XResolution",							INI::parseInt,				NULL,			offsetof( GlobalData, m_xResolution ) },
@@ -87,8 +90,8 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "Use3WayTerrainBlends",			INI::parseInt,				NULL,			offsetof( GlobalData, m_use3WayTerrainBlends ) },
 	{ "StretchTerrain",						INI::parseBool,				NULL,			offsetof( GlobalData, m_stretchTerrain ) },
 	{ "UseHalfHeightMap",					INI::parseBool,				NULL,			offsetof( GlobalData, m_useHalfHeightMap ) },
-	
-	
+
+
 	{ "DrawEntireTerrain",					INI::parseBool,				NULL,			offsetof( GlobalData, m_drawEntireTerrain ) },
 	{ "TerrainLOD",									INI::parseIndexList,	TerrainLODNames,	offsetof( GlobalData, m_terrainLOD ) },
 	{ "TerrainLODTargetTimeMS",			INI::parseInt,				NULL,			offsetof( GlobalData, m_terrainLODTargetTimeMS ) },
@@ -176,6 +179,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "SkyBoxPositionZ",				INI::parseReal,				NULL,			offsetof( GlobalData, m_skyBoxPositionZ ) },
 	{ "SkyBoxScale",				INI::parseReal,				NULL,			offsetof( GlobalData, m_skyBoxScale ) },
 	{ "DrawSkyBox",				INI::parseBool,				NULL,			offsetof( GlobalData, m_drawSkyBox ) },
+	{ "ViewportHeightScale", INI::parseReal, NULL, offsetof( GlobalData, m_viewportHeightScale ) },
 	{ "CameraPitch",								INI::parseReal,				NULL,			offsetof( GlobalData, m_cameraPitch ) },
 	{ "CameraYaw",									INI::parseReal,				NULL,			offsetof( GlobalData, m_cameraYaw ) },
 	{ "CameraHeight",								INI::parseReal,				NULL,			offsetof( GlobalData, m_cameraHeight ) },
@@ -189,7 +193,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "Gravity",									INI::parseAccelerationReal,				NULL,				offsetof( GlobalData, m_gravity ) },
 	{ "StealthFriendlyOpacity",		INI::parsePercentToReal,				NULL,				offsetof( GlobalData, m_stealthFriendlyOpacity ) },
 	{ "DefaultOcclusionDelay",				INI::parseDurationUnsignedInt,				NULL,			offsetof( GlobalData, m_defaultOcclusionDelay ) },
-	
+
 	{ "PartitionCellSize",				INI::parseReal,				NULL,			offsetof( GlobalData, m_partitionCellSize ) },
 
 	{ "AmmoPipScaleFactor",				INI::parseReal,				NULL,			offsetof( GlobalData, m_ammoPipScaleFactor ) },
@@ -243,7 +247,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "TerrainObjectsLightingNightDiffuse",				INI::parseRGBColor,			NULL,			offsetof( GlobalData, m_terrainObjectsLighting[ TIME_OF_DAY_NIGHT ][0].diffuse ) },
 	{ "TerrainObjectsLightingNightLightPos",			INI::parseCoord3D,			NULL,			offsetof( GlobalData, m_terrainObjectsLighting[ TIME_OF_DAY_NIGHT ][0].lightPos ) },
 
-	//Secondary global light	
+	//Secondary global light
 	{ "TerrainLightingMorningAmbient2",			INI::parseRGBColor,			NULL,			offsetof( GlobalData, m_terrainLighting[ TIME_OF_DAY_MORNING ][1].ambient ) },
 	{ "TerrainLightingMorningDiffuse2",			INI::parseRGBColor,			NULL,			offsetof( GlobalData, m_terrainLighting[ TIME_OF_DAY_MORNING ][1].diffuse ) },
 	{ "TerrainLightingMorningLightPos2",		INI::parseCoord3D,			NULL,			offsetof( GlobalData, m_terrainLighting[ TIME_OF_DAY_MORNING ][1].lightPos ) },
@@ -297,7 +301,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "TerrainObjectsLightingNightDiffuse3",				INI::parseRGBColor,			NULL,			offsetof( GlobalData, m_terrainObjectsLighting[ TIME_OF_DAY_NIGHT ][2].diffuse ) },
 	{ "TerrainObjectsLightingNightLightPos3",			INI::parseCoord3D,			NULL,			offsetof( GlobalData, m_terrainObjectsLighting[ TIME_OF_DAY_NIGHT ][2].lightPos ) },
 
-	
+
 	{ "NumberGlobalLights",								INI::parseInt,				NULL,			offsetof( GlobalData, m_numGlobalLights)},
 	{ "InfantryLightMorningScale",				INI::parseReal,			NULL,			offsetof( GlobalData, m_infantryLightScale[TIME_OF_DAY_MORNING] ) },
 	{ "InfantryLightAfternoonScale",				INI::parseReal,			NULL,			offsetof( GlobalData, m_infantryLightScale[TIME_OF_DAY_AFTERNOON] ) },
@@ -307,7 +311,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "MaxTranslucentObjects",						INI::parseInt,				NULL,			offsetof( GlobalData, m_maxVisibleTranslucentObjects) },
 	{ "OccludedColorLuminanceScale",				INI::parseReal,				NULL,			offsetof( GlobalData, m_occludedLuminanceScale) },
 
-/* These are internal use only, they do not need file definitons 
+/* These are internal use only, they do not need file definitons
 	{ "TerrainAmbientRGB",				INI::parseRGBColor,		NULL,			offsetof( GlobalData, m_terrainAmbient ) },
 	{ "TerrainDiffuseRGB",				INI::parseRGBColor,		NULL,			offsetof( GlobalData, m_terrainDiffuse ) },
 	{ "TerrainLightPos",					INI::parseCoord3D,		NULL,			offsetof( GlobalData, m_terrainLightPos ) },
@@ -318,7 +322,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "MaxRoadTypes",								INI::parseInt,				NULL,			offsetof( GlobalData, m_maxRoadTypes ) },
 
 	{ "ValuePerSupplyBox",					INI::parseInt,				NULL,			offsetof( GlobalData, m_baseValuePerSupplyBox ) },
-	
+
 	{ "AudioOn",										INI::parseBool,				NULL,			offsetof( GlobalData, m_audioOn ) },
 	{ "MusicOn",										INI::parseBool,				NULL,			offsetof( GlobalData, m_musicOn ) },
 	{ "SoundsOn",										INI::parseBool,				NULL,			offsetof( GlobalData, m_soundsOn ) },
@@ -327,7 +331,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "VideoOn",										INI::parseBool,				NULL,			offsetof( GlobalData, m_videoOn ) },
 	{ "DisableCameraMovements",			INI::parseBool,				NULL,			offsetof( GlobalData, m_disableCameraMovement ) },
 
-/* These are internal use only, they do not need file definitons 		
+/* These are internal use only, they do not need file definitons
 	/// @todo remove this hack
 	{ "InGame",											INI::parseBool,				NULL,			offsetof( GlobalData, m_inGame ) },
 */
@@ -361,7 +365,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "AutoAflameParticleSystem",					INI::parseAsciiString,  NULL,  offsetof( GlobalData, m_autoAflameParticleSystem ) },
 	{ "AutoAflameParticleMax",						INI::parseInt,					NULL,	 offsetof( GlobalData, m_autoAflameParticleMax ) },
 
-/* These are internal use only, they do not need file definitons 	
+/* These are internal use only, they do not need file definitons
 	{ "LatencyAverage",							INI::parseInt,				NULL,			offsetof( GlobalData, m_latencyAverage ) },
 	{ "LatencyAmplitude",						INI::parseInt,				NULL,			offsetof( GlobalData, m_latencyAmplitude ) },
 	{ "LatencyPeriod",							INI::parseInt,				NULL,			offsetof( GlobalData, m_latencyPeriod ) },
@@ -397,6 +401,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "EnforceMaxCameraHeight",			INI::parseBool,				NULL,			offsetof( GlobalData, m_enforceMaxCameraHeight ) },
 	{ "KeyboardScrollSpeedFactor",	INI::parseReal,				NULL,			offsetof( GlobalData, m_keyboardScrollFactor ) },
 	{ "KeyboardDefaultScrollSpeedFactor",	INI::parseReal,				NULL,			offsetof( GlobalData, m_keyboardDefaultScrollFactor ) },
+	{ "KeyboardCameraRotateSpeed", INI::parseReal, NULL, offsetof( GlobalData, m_keyboardCameraRotateSpeed ) },
 	{ "MovementPenaltyDamageState",	INI::parseIndexList,	TheBodyDamageTypeNames,	 offsetof( GlobalData, m_movementPenaltyDamageState ) },
 
 // you cannot set this; it always has a value of 100%.
@@ -437,6 +442,11 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 
 	{	"CameraAudibleRadius",				INI::parseReal,				NULL,			offsetof( GlobalData, m_cameraAudibleRadius ) },
 	{ "GroupMoveClickToGatherAreaFactor", INI::parseReal,	NULL,			offsetof( GlobalData, m_groupMoveClickToGatherFactor ) },
+
+#if !PRESERVE_RETAIL_BEHAVIOR
+	{ "AllowMoneyPerMinuteForPlayer",	INI::parseBool,			NULL,			offsetof( GlobalData, m_allowMoneyPerMinuteForPlayer ) },
+#endif
+
 	{ "ShakeSubtleIntensity",				INI::parseReal,				NULL,			offsetof( GlobalData, m_shakeSubtleIntensity ) },
 	{ "ShakeNormalIntensity",				INI::parseReal,				NULL,			offsetof( GlobalData, m_shakeNormalIntensity ) },
 	{ "ShakeStrongIntensity",				INI::parseReal,				NULL,			offsetof( GlobalData, m_shakeStrongIntensity ) },
@@ -456,13 +466,18 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 
 	{ "SpecialPowerViewObject",			INI::parseAsciiString,	NULL,			offsetof( GlobalData, m_specialPowerViewObjectName ) },
 
+	// TheSuperHackers @feature Customize the opacity (0..1) and shadows of build preview objects. Shadows are enabled by default.
+	// Note that disabling shadows loses a fair bit of contrast visually and warrants raising the opacity.
+	{ "ObjectPlacementOpacity", INI::parseReal, NULL, offsetof( GlobalData, m_objectPlacementOpacity ) },
+	{ "ObjectPlacementShadows", INI::parseBool, NULL, offsetof( GlobalData, m_objectPlacementShadows ) },
+
 	{ "StandardPublicBone", INI::parseAsciiStringVectorAppend, NULL, offsetof(GlobalData, m_standardPublicBones) },
 	{ "ShowMetrics",								INI::parseBool,				   NULL,		offsetof( GlobalData, m_showMetrics ) },
   { "DefaultStartingCash",				Money::parseMoneyAmount, NULL,		offsetof( GlobalData, m_defaultStartingCash ) },
 
 // NOTE: m_doubleClickTimeMS is still in use, but we disallow setting it from the GameData.ini file. It is now set in the constructor according to the windows parameter.
 //	{ "DoubleClickTimeMS",									INI::parseUnsignedInt,			NULL, offsetof( GlobalData, m_doubleClickTimeMS ) },
-	
+
 	{ "ShroudColor",		INI::parseRGBColor,						NULL,	offsetof( GlobalData, m_shroudColor) },
 	{ "ClearAlpha",			INI::parseUnsignedByte,				NULL,	offsetof( GlobalData, m_clearAlpha) },
 	{ "FogAlpha",				INI::parseUnsignedByte,				NULL,	offsetof( GlobalData, m_fogAlpha) },
@@ -484,11 +499,10 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "NetworkDisconnectTime", INI::parseInt, NULL, offsetof(GlobalData, m_networkDisconnectTime) },
 	{ "NetworkPlayerTimeoutTime", INI::parseInt, NULL, offsetof(GlobalData, m_networkPlayerTimeoutTime) },
 	{ "NetworkDisconnectScreenNotifyTime", INI::parseInt, NULL, offsetof(GlobalData, m_networkDisconnectScreenNotifyTime) },
-	
-	{ "KeyboardCameraRotateSpeed", INI::parseReal, NULL, offsetof( GlobalData, m_keyboardCameraRotateSpeed ) },
+
 	{ "PlayStats",									INI::parseInt,				NULL,			offsetof( GlobalData, m_playStats ) },
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	{ "DisableCameraFade",			INI::parseBool,				NULL,			offsetof( GlobalData, m_disableCameraFade ) },
 	{ "DisableScriptedInputDisabling",			INI::parseBool,		NULL,			offsetof( GlobalData, m_disableScriptedInputDisabling ) },
 	{ "DisableMilitaryCaption",			INI::parseBool,				NULL,			offsetof( GlobalData, m_disableMilitaryCaption ) },
@@ -522,7 +536,7 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "ExtraLogging",								INI::parseBool,				NULL,			offsetof( GlobalData, m_extraLogging ) },
 #endif
 
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
+	{ NULL,					NULL,						NULL,						0 }
 
 };
 
@@ -535,7 +549,7 @@ GlobalData::GlobalData()
 
 	//
 	// we have now instanced a global data instance, if theOriginal is NULL, this is
-	// *the* very first instance and it shall be recorded.  This way, when we load 
+	// *the* very first instance and it shall be recorded.  This way, when we load
 	// overrides of the global data, we can revert to the common, original data
 	// in m_theOriginal
 	//
@@ -543,16 +557,19 @@ GlobalData::GlobalData()
 		m_theOriginal = this;
 	m_next = NULL;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	m_specialPowerUsesDelay = TRUE;
 #endif
   m_TiVOFastMode = FALSE;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG) || ENABLE_CONFIGURABLE_SHROUD
+	m_shroudOn = TRUE;
+#endif
+
+#if defined(RTS_DEBUG)
 	m_wireframe = 0;
 	m_stateMachineDebug = FALSE;
 	m_useCameraConstraints = TRUE;
-	m_shroudOn = TRUE;
 	m_fogOfWarOn = FALSE;
 	m_jabberOn = FALSE;
 	m_munkeeOn = FALSE;
@@ -564,17 +581,17 @@ GlobalData::GlobalData()
 	m_debugVisibilityTileDuration = LOGICFRAMES_PER_SECOND;
 	m_debugProjectilePath = FALSE;
 	m_debugProjectileTileWidth = 10;
-	m_debugProjectileTileDuration = LOGICFRAMES_PER_SECOND;  // Changed By Sadullah Nader
+	m_debugProjectileTileDuration = LOGICFRAMES_PER_SECOND;
 	m_debugThreatMap = FALSE;
 	m_maxDebugThreat = 5000;
-	m_debugThreatMapTileDuration = LOGICFRAMES_PER_SECOND;  // Changed By Sadullah Nader
+	m_debugThreatMapTileDuration = LOGICFRAMES_PER_SECOND;
 	m_debugCashValueMap = FALSE;
 	m_maxDebugValue = 10000;
-	m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND; // Changed By Sadullah Nader
+	m_debugCashValueMapTileDuration = LOGICFRAMES_PER_SECOND;
 	m_vTune = false;
 	m_checkForLeaks = TRUE;
 	m_benchmarkTimer = -1;
-  
+
 
 	m_allowUnselectableSelection = FALSE;
 	m_disableCameraFade = false;
@@ -615,8 +632,8 @@ GlobalData::GlobalData()
 	m_chipSetType = 0;
 	m_headless = FALSE;
 	m_windowed = 0;
-	m_xResolution = 800;
-	m_yResolution = 600;
+	m_xResolution = DEFAULT_DISPLAY_WIDTH;
+	m_yResolution = DEFAULT_DISPLAY_HEIGHT;
 	m_maxShellScreens = 0;
 	m_useCloudMap = FALSE;
 	m_use3WayTerrainBlends = 1;
@@ -652,7 +669,7 @@ GlobalData::GlobalData()
 	m_waterPositionX = 0.0f;
 	m_waterPositionY = 0.0f;
 	m_waterPositionZ = 0.0f;
-	m_waterExtentX = 0.0f;	
+	m_waterExtentX = 0.0f;
 	m_waterExtentY = 0.0f;
 	m_waterType = 0;
 	m_featherWater = FALSE;
@@ -678,10 +695,8 @@ GlobalData::GlobalData()
 		m_vertexWaterAttenuationB[ i ] = 0.0f;
 		m_vertexWaterAttenuationC[ i ] = 0.0f;
 		m_vertexWaterAttenuationRange[ i ] = 0.0f;
-		//Added By Sadullah Nader
-		//Initializations missing and needed
 		m_vertexWaterAvailableMaps[i].clear();
-	}  // end for i
+	}
 
 	m_skyBoxPositionZ = 0.0f;
 	m_drawSkyBox = FALSE;
@@ -752,7 +767,7 @@ GlobalData::GlobalData()
 
 	for (j=TIME_OF_DAY_FIRST; j<TIME_OF_DAY_COUNT; j++)
 		m_infantryLightScale[j] = 1.5f;
-	
+
 	m_scriptOverrideInfantryLightScale = -1.0f;
 
 	m_numGlobalLights = 3;
@@ -778,7 +793,7 @@ GlobalData::GlobalData()
 
 	m_useFX = TRUE;
 
-//	m_inGame = FALSE;	
+//	m_inGame = FALSE;
 
 	m_noDraw = 0;
 	m_particleScale = 1.0f;
@@ -790,9 +805,7 @@ GlobalData::GlobalData()
 	m_autoSmokeParticleMediumMax = 0;
 	m_autoSmokeParticleLargeMax = 0;
 	m_autoAflameParticleMax = 0;
-  
-	// Added By Sadullah Nader
-	// Initializations missing and needed
+
 	m_autoFireParticleSmallPrefix.clear();
 	m_autoFireParticleMediumPrefix.clear();
 	m_autoFireParticleLargePrefix.clear();
@@ -815,8 +828,6 @@ GlobalData::GlobalData()
 	m_drawEntireTerrain = FALSE;
 	m_maxParticleCount = 0;
 	m_maxFieldParticleCount = 30;
-	
-	// End Add
 
 	m_debugAI = AI_DEBUG_NONE;
 	m_debugSupplyCenterPlacement = FALSE;
@@ -827,6 +838,8 @@ GlobalData::GlobalData()
 
 	m_particleEdit = FALSE;
 
+	m_viewportHeightScale = 0.80f; // Default value for the original Control Bar.
+
 	m_cameraPitch = 0.0f;
 	m_cameraYaw = 0.0f;
 	m_cameraHeight = 0.0f;
@@ -867,7 +880,10 @@ GlobalData::GlobalData()
 
 	m_standardMinefieldDensity = 0.01f;
 	m_standardMinefieldDistance = 40.0f;
-	
+
+	m_objectPlacementOpacity = 0.45f;
+	m_objectPlacementShadows = TRUE;
+
 	m_groupSelectMinSelectSize = 5;
 	m_groupSelectVolumeBase = 0.5f;
 	m_groupSelectVolumeIncrement = 0.02f;
@@ -924,10 +940,18 @@ GlobalData::GlobalData()
 	m_firewallPortAllocationDelta = 0;
 	m_loadScreenDemo = FALSE;
 	m_disableRender = false;
-	
+
 	m_saveCameraInReplay = FALSE;
 	m_useCameraInReplay = FALSE;
+	m_enablePlayerObserver = FALSE;
+
+	m_networkLatencyFontSize = 8;
+	m_renderFpsFontSize = 8;
+	m_systemTimeFontSize = 8;
+	m_gameTimeFontSize = 8;
 
+	m_showMoneyPerMinute = FALSE;
+	m_allowMoneyPerMinuteForPlayer = FALSE;
 
 	m_debugShowGraphicalFramerate = FALSE;
 
@@ -957,6 +981,9 @@ GlobalData::GlobalData()
 	m_initialFile.clear();
 	m_pendingFile.clear();
 
+	m_simulateReplays.clear();
+	m_simulateReplayJobs = SIMULATE_REPLAYS_SEQUENTIAL;
+
 	for (i = LEVEL_FIRST; i <= LEVEL_LAST; ++i)
 		m_healthBonus[i] = 1.0f;
 
@@ -978,106 +1005,37 @@ GlobalData::GlobalData()
 	m_afterIntro = FALSE;
 	m_allowExitOutOfMovies = FALSE;
 	m_loadScreenRender = FALSE;
-  m_musicVolumeFactor = 0.5f;
- 	m_SFXVolumeFactor = 0.5f;
-  m_voiceVolumeFactor = 0.5f;
-  m_3DSoundPref = false;
 
 	m_keyboardDefaultScrollFactor = m_keyboardScrollFactor = 0.5f;
+	m_drawScrollAnchor = FALSE;
+	m_moveScrollAnchor = FALSE;
 	m_scrollAmountCutoff = 10.0f;
 	m_cameraAdjustSpeed = 0.1f;
 	m_enforceMaxCameraHeight = TRUE;
-	
+
 	m_animateWindows = TRUE;
-	
+
 	m_iniCRC = 0;
 	m_exeCRC = 0;
-	
-	// lets CRC the executable!  Whee!
-	const Int blockSize = 65536;
-	CRC exeCRC;
-	File *fp;
-	// TheSuperHackers @tweak SkyAero/xezon 27/05/2025
-	// Simulate the EXE's CRC value to force Network and Replay compatibility with another build.
-#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
-
-#define GENERALSMD_104_CD_EXE_CRC    0x4f6c5afe
-#define GENERALSMD_104_STEAM_EXE_CRC 0xcb430f5f
-#define GENERALSMD_104_EAAPP_EXE_CRC 0x488d90f9
 
-	exeCRC.set(GENERALSMD_104_CD_EXE_CRC);
-	DEBUG_LOG(("Fake EXE CRC is 0x%8.8X\n", exeCRC.get()));
-
-#else
-	{
-		Char buffer[ _MAX_PATH ];
-		GetModuleFileName( NULL, buffer, sizeof( buffer ) );
-		fp = TheFileSystem->openFile(buffer, File::READ | File::BINARY);
-		if (fp != NULL) {
-			unsigned char crcBlock[blockSize];
-			Int amtRead = 0;
-			while ( (amtRead=fp->read(crcBlock, blockSize)) > 0 )
-			{
-				exeCRC.computeCRC(crcBlock, amtRead);
-			}
-			DEBUG_LOG(("EXE CRC is 0x%8.8X\n", exeCRC.get()));
-			fp->close();
-			fp = NULL;
-		}
-	}
-#endif
-
-	UnsignedInt version = 0;
-	if (TheVersion)
-	{
-		version = TheVersion->getVersionNumber();
-		exeCRC.computeCRC( &version, sizeof(UnsignedInt) );
-	}
-	// Add in MP scripts to the EXE CRC, since the game will go out of sync if they change
-	fp = TheFileSystem->openFile("Data\\Scripts\\SkirmishScripts.scb", File::READ | File::BINARY);
-	if (fp != NULL) {
-		unsigned char crcBlock[blockSize];
-		Int amtRead = 0;
-		while ( (amtRead=fp->read(crcBlock, blockSize)) > 0 )
-		{
-			exeCRC.computeCRC(crcBlock, amtRead);
-		}
-		fp->close();
-		fp = NULL;
-	}
-	fp = TheFileSystem->openFile("Data\\Scripts\\MultiplayerScripts.scb", File::READ | File::BINARY);
-	if (fp != NULL) {
-		unsigned char crcBlock[blockSize];
-		Int amtRead = 0;
-		while ( (amtRead=fp->read(crcBlock, blockSize)) > 0 )
-		{
-			exeCRC.computeCRC(crcBlock, amtRead);
-		}
-		fp->close();
-		fp = NULL;
-	}
-
-	m_exeCRC = exeCRC.get();
-	DEBUG_LOG(("EXE+Version(%d.%d)+SCB CRC is 0x%8.8X\n", version >> 16, version & 0xffff, m_exeCRC));
-	
 	m_movementPenaltyDamageState = BODY_REALLYDAMAGED;
-	
+
 	m_shouldUpdateTGAToDDS = FALSE;
-	
+
 	// Default DoubleClickTime to System double click time.
 	m_doubleClickTimeMS = GetDoubleClickTime(); // Note: This is actual MS, not frames.
-	
+
 #ifdef DUMP_PERF_STATS
 	m_dumpPerformanceStatistics = FALSE;
   m_dumpStatsAtInterval = FALSE;
-  m_statsInterval = 30;      
+  m_statsInterval = 30;
 #endif
 
 	m_forceBenchmark = FALSE;	///<forces running of CPU detection benchmark, even on known cpu's.
 
 	m_keyboardCameraRotateSpeed = 0.1f;
 
-  // Set user data directory based on registry settings instead of INI parameters. This allows us to 
+  // Set user data directory based on registry settings instead of INI parameters. This allows us to
   // localize the leaf name.
   char temp[_MAX_PATH + 1];
   if (::SHGetSpecialFolderPath(NULL, temp, CSIDL_PERSONAL, true))
@@ -1088,7 +1046,7 @@ GlobalData::GlobalData()
       myDocumentsDirectory.concat( '\\' );
 
     AsciiString leafName;
-    
+
     if ( !GetStringFromRegistry( "", "UserDataLeafName", leafName ) )
     {
       // Use something, anything
@@ -1103,30 +1061,29 @@ GlobalData::GlobalData()
     CreateDirectory(myDocumentsDirectory.str(), NULL);
     m_userDataDir = myDocumentsDirectory;
   }
-	
+
 	//-allAdvice feature
 	//m_allAdvice = FALSE;
 
 	m_clientRetaliationModeEnabled = TRUE; //On by default.
 
-}  // end GlobalData
+}
 
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 GlobalData::~GlobalData( void )
 {
-	DEBUG_ASSERTCRASH( TheWritableGlobalData->m_next == NULL, ("~GlobalData: theOriginal is not original\n") );
+	DEBUG_ASSERTCRASH( TheWritableGlobalData->m_next == NULL, ("~GlobalData: theOriginal is not original") );
 
-	if (m_weaponBonusSet)
-		deleteInstance(m_weaponBonusSet);
+	deleteInstance(m_weaponBonusSet);
 
 	if( m_theOriginal == this )	{
 		m_theOriginal = NULL;
 		TheWritableGlobalData = NULL;
 	}
 
-}  // end ~GlobalData
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1159,7 +1116,7 @@ GlobalData *GlobalData::newOverride( void )
 	GlobalData *override = NEW GlobalData;
 
 	// copy the data from the latest override (TheWritableGlobalData) to the newly created instance
-	DEBUG_ASSERTCRASH( TheWritableGlobalData, ("GlobalData::newOverride() - no existing data\n") );
+	DEBUG_ASSERTCRASH( TheWritableGlobalData, ("GlobalData::newOverride() - no existing data") );
 	*override = *TheWritableGlobalData;
 
 	//
@@ -1174,12 +1131,12 @@ GlobalData *GlobalData::newOverride( void )
 
 	return override;
 
-}  // end newOveride
+}
 
 //-------------------------------------------------------------------------------------------------
 void GlobalData::init( void )
 {
-	// nothing
+	m_exeCRC = generateExeCRC();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1198,7 +1155,7 @@ void GlobalData::reset( void )
 	{
 
 		// get next instance
-		GlobalData* next = TheWritableGlobalData->m_next;
+		GlobalData* next = m_next;
 
 		// delete the head of the global data list (the latest override)
 		delete TheWritableGlobalData;
@@ -1206,16 +1163,16 @@ void GlobalData::reset( void )
 		// set next as top
 		TheWritableGlobalData = next;
 
-	}  // end while
+	}
 
 	//
 	// we now have the one single global data in TheWritableGlobalData singleton, lets sanity check
 	// some of all that
 	//
-	DEBUG_ASSERTCRASH( TheWritableGlobalData->m_next == NULL, ("ResetGlobalData: theOriginal is not original\n") );
-	DEBUG_ASSERTCRASH( TheWritableGlobalData == GlobalData::m_theOriginal, ("ResetGlobalData: oops\n") );
+	DEBUG_ASSERTCRASH( TheWritableGlobalData->m_next == NULL, ("ResetGlobalData: theOriginal is not original") );
+	DEBUG_ASSERTCRASH( TheWritableGlobalData == GlobalData::m_theOriginal, ("ResetGlobalData: oops") );
 
-}  // end ResetGlobalData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse GameData entry */
@@ -1225,21 +1182,21 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	if( TheWritableGlobalData && ini->getLoadType() != INI_LOAD_MULTIFILE)
 	{
 
-		// 
+		//
 		// if the type of loading we're doing creates override data, we need to
 		// be loading into a new override item
 		//
 		if( ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES )
 			TheWritableGlobalData->newOverride();
 
-	}  // end if
+	}
 	else if (!TheWritableGlobalData)
 	{
 
 		// we don't have any global data instance at all yet, create one
 		TheWritableGlobalData = NEW GlobalData;
 
-	}  // end else
+	}
 	// If we're multifile, then continue loading stuff into the Global Data as normal.
 
 	// parse the ini weapon definition
@@ -1252,15 +1209,24 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	TheWritableGlobalData->m_clientRetaliationModeEnabled = optionPref.getRetaliationModeEnabled();
 	TheWritableGlobalData->m_doubleClickAttackMove = optionPref.getDoubleClickAttackMoveEnabled();
 	TheWritableGlobalData->m_keyboardScrollFactor = optionPref.getScrollFactor();
+	TheWritableGlobalData->m_drawScrollAnchor = optionPref.getDrawScrollAnchor();
+	TheWritableGlobalData->m_moveScrollAnchor = optionPref.getMoveScrollAnchor();
 	TheWritableGlobalData->m_defaultIP = optionPref.getLANIPAddress();
 	TheWritableGlobalData->m_firewallSendDelay = optionPref.getSendDelay();
 	TheWritableGlobalData->m_firewallBehavior = optionPref.getFirewallBehavior();
 	TheWritableGlobalData->m_firewallPortAllocationDelta = optionPref.getFirewallPortAllocationDelta();
 	TheWritableGlobalData->m_firewallPortOverride = optionPref.getFirewallPortOverride();
-	
+
 	TheWritableGlobalData->m_saveCameraInReplay = optionPref.saveCameraInReplays();
 	TheWritableGlobalData->m_useCameraInReplay = optionPref.useCameraInReplays();
-	
+	TheWritableGlobalData->m_enablePlayerObserver = optionPref.getPlayerObserverEnabled();
+
+	TheWritableGlobalData->m_networkLatencyFontSize = optionPref.getNetworkLatencyFontSize();
+	TheWritableGlobalData->m_renderFpsFontSize = optionPref.getRenderFpsFontSize();
+	TheWritableGlobalData->m_systemTimeFontSize = optionPref.getSystemTimeFontSize();
+	TheWritableGlobalData->m_gameTimeFontSize = optionPref.getGameTimeFontSize();
+	TheWritableGlobalData->m_showMoneyPerMinute = optionPref.getShowMoneyPerMinute();
+
 	Int val=optionPref.getGammaValue();
 	//generate a value between 0.6 and 2.0.
 	if (val < 50)
@@ -1281,3 +1247,87 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	TheWritableGlobalData->m_yResolution = yres;
 }
 
+void GlobalData::parseCustomDefinition()
+{
+	if (addon::HasFullviewportDat())
+	{
+		// TheSuperHackers @tweak xezon 03/08/2025 Force full viewport for 'Control Bar Pro' Addons like GenTool did it.
+		m_viewportHeightScale = 1.0f;
+	}
+}
+
+UnsignedInt GlobalData::generateExeCRC()
+{
+	DEBUG_ASSERTCRASH(TheFileSystem != NULL, ("TheFileSystem is NULL"));
+
+	// lets CRC the executable!  Whee!
+	const Int blockSize = 65536;
+	CRC exeCRC;
+	File *fp;
+	// TheSuperHackers @tweak SkyAero/xezon 27/05/2025
+	// Simulate the EXE's CRC value to force Network and Replay compatibility with another build.
+#if (defined(_MSC_VER) && _MSC_VER < 1300) && RETAIL_COMPATIBLE_CRC
+
+#define GENERALSMD_104_CD_EXE_CRC    0x3b6fb2cfu
+#define GENERALSMD_104_STEAM_EXE_CRC 0xf6a4221bu
+#define GENERALSMD_104_EAAPP_EXE_CRC 0xc4181eb9u
+
+	exeCRC.set(GENERALSMD_104_CD_EXE_CRC);
+	DEBUG_LOG(("Fake EXE CRC is 0x%8.8X", exeCRC.get()));
+
+#else
+	{
+		Char buffer[ _MAX_PATH ];
+		GetModuleFileName( NULL, buffer, sizeof( buffer ) );
+		fp = TheFileSystem->openFile(buffer, File::READ | File::BINARY);
+		if (fp != NULL) {
+			unsigned char crcBlock[blockSize];
+			Int amtRead = 0;
+			while ( (amtRead=fp->read(crcBlock, blockSize)) > 0 )
+			{
+				exeCRC.computeCRC(crcBlock, amtRead);
+			}
+			DEBUG_LOG(("EXE CRC is 0x%8.8X", exeCRC.get()));
+			fp->close();
+			fp = NULL;
+		}
+		else {
+			DEBUG_CRASH(("Executable file has failed to open"));
+		}
+	}
+#endif
+
+	UnsignedInt version = 0;
+	if (TheVersion)
+	{
+		version = TheVersion->getVersionNumber();
+		exeCRC.computeCRC( &version, sizeof(UnsignedInt) );
+	}
+	// Add in MP scripts to the EXE CRC, since the game will go out of sync if they change
+	fp = TheFileSystem->openFile("Data\\Scripts\\SkirmishScripts.scb", File::READ | File::BINARY);
+	if (fp != NULL) {
+		unsigned char crcBlock[blockSize];
+		Int amtRead = 0;
+		while ( (amtRead=fp->read(crcBlock, blockSize)) > 0 )
+		{
+			exeCRC.computeCRC(crcBlock, amtRead);
+		}
+		fp->close();
+		fp = NULL;
+	}
+	fp = TheFileSystem->openFile("Data\\Scripts\\MultiplayerScripts.scb", File::READ | File::BINARY);
+	if (fp != NULL) {
+		unsigned char crcBlock[blockSize];
+		Int amtRead = 0;
+		while ( (amtRead=fp->read(crcBlock, blockSize)) > 0 )
+		{
+			exeCRC.computeCRC(crcBlock, amtRead);
+		}
+		fp->close();
+		fp = NULL;
+	}
+
+	DEBUG_LOG(("EXE+Version(%d.%d)+SCB CRC is 0x%8.8X", version >> 16, version & 0xffff, exeCRC.get()));
+
+	return exeCRC.get();
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp
index 1634d019aec..edda2599bfc 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_DEATH_NAMES
 
 #include "Common/INI.h"
@@ -59,11 +59,6 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -145,8 +140,8 @@ static const BlockParse theTypeTable[] =
 	{	"ReallyLowMHz",				parseReallyLowMHz },
 	{	"ScriptAction",				ScriptEngine::parseScriptAction },
 	{	"ScriptCondition",		ScriptEngine::parseScriptCondition },
-	
-	{ NULL,									NULL },		// keep this last!
+
+	{ NULL,									NULL },
 };
 
 
@@ -173,7 +168,7 @@ Bool INI::isValidINIFilename( const char *filename )
 
 	return TRUE;
 
-} 
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -200,22 +195,61 @@ INI::INI( void )
 	m_curBlockStart[0]	= 0;
 #endif
 
-}  // end INI
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 INI::~INI( void )
 {
 
-}  // end ~INI
+}
+
+//-------------------------------------------------------------------------------------------------
+UnsignedInt INI::loadFileDirectory( AsciiString fileDirName, INILoadType loadType, Xfer *pXfer, Bool subdirs )
+{
+	UnsignedInt filesRead = 0;
+
+	AsciiString iniDir = fileDirName;
+	AsciiString iniFile = fileDirName;
+
+	char ext[] = ".ini";
+
+	if (iniDir.endsWithNoCase(ext))
+	{
+		iniDir.truncateBy(ARRAY_SIZE(ext)-1);
+	}
+
+	if (!iniFile.endsWithNoCase(ext))
+	{
+		iniFile.concat(ext);
+	}
+
+	if (TheFileSystem->doesFileExist(iniFile.str()))
+	{
+		filesRead += load(iniFile, loadType, pXfer);
+	}
+
+	// Load any additional ini files from a "filename" directory and its subdirectories.
+	filesRead += loadDirectory(iniDir, loadType, pXfer, subdirs);
+
+	// Expect to open and load at least one file.
+	if (filesRead == 0)
+	{
+		throw INI_CANT_OPEN_FILE;
+	}
+
+	return filesRead;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Load all INI files in the specified directory (and subdirectories if indicated).
 	* If we are to load subdirectories, we will load them *after* we load all the
 	* files in the current directory */
 //-------------------------------------------------------------------------------------------------
-void INI::loadDirectory( AsciiString dirName, Bool subdirs, INILoadType loadType, Xfer *pXfer )
+UnsignedInt INI::loadDirectory( AsciiString dirName, INILoadType loadType, Xfer *pXfer, Bool subdirs )
 {
+	UnsignedInt filesRead = 0;
+
 	// sanity
 	if( dirName.isEmpty() )
 		throw INI_INVALID_DIRECTORY;
@@ -224,7 +258,7 @@ void INI::loadDirectory( AsciiString dirName, Bool subdirs, INILoadType loadType
 	{
 		FilenameList filenameList;
 		dirName.concat('\\');
-		TheFileSystem->getFileListInDirectory(dirName, "*.ini", filenameList, TRUE);
+		TheFileSystem->getFileListInDirectory(dirName, "*.ini", filenameList, subdirs);
 		// Load the INI files in the dir now, in a sorted order.  This keeps things the same between machines
 		// in a network game.
 		FilenameList::const_iterator it = filenameList.begin();
@@ -235,7 +269,7 @@ void INI::loadDirectory( AsciiString dirName, Bool subdirs, INILoadType loadType
 
 			if ((tempname.find('\\') == NULL) && (tempname.find('/') == NULL)) {
 				// this file doesn't reside in a subdirectory, load it first.
-				load( *it, loadType, pXfer );
+				filesRead += load( *it, loadType, pXfer );
 			}
 			++it;
 		}
@@ -247,18 +281,19 @@ void INI::loadDirectory( AsciiString dirName, Bool subdirs, INILoadType loadType
 			tempname = (*it).str() + dirName.getLength();
 
 			if ((tempname.find('\\') != NULL) || (tempname.find('/') != NULL)) {
-				load( *it, loadType, pXfer );
+				filesRead += load( *it, loadType, pXfer );
 			}
 			++it;
 		}
-	} 
-	catch (...) 
+	}
+	catch (...)
 	{
 		// propagate the exception
 		throw;
 	}
 
-}  // end loadDirectory
+	return filesRead;
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -268,27 +303,27 @@ void INI::prepFile( AsciiString filename, INILoadType loadType )
 	if( m_file != NULL )
 	{
 
-		DEBUG_CRASH(( "INI::load, cannot open file '%s', file already open\n", filename.str() ));
+		DEBUG_CRASH(( "INI::load, cannot open file '%s', file already open", filename.str() ));
 		throw INI_FILE_ALREADY_OPEN;
 
-	}  // end if
+	}
 
 	// open the file
 	m_file = TheFileSystem->openFile(filename.str(), File::READ);
 	if( m_file == NULL )
 	{
 
-		DEBUG_CRASH(( "INI::load, cannot open file '%s'\n", filename.str() ));
+		DEBUG_CRASH(( "INI::load, cannot open file '%s'", filename.str() ));
 		throw INI_CANT_OPEN_FILE;
 
-	}  // end if
+	}
 
 	m_file = m_file->convertToRAMFile();
 
 	// save our filename
 	m_filename = filename;
 
-	// save our load time
+	// save our load type
 	m_loadType = loadType;
 }
 
@@ -334,7 +369,7 @@ static INIFieldParseProc findFieldParse(const FieldParse* parseTable, const char
 		}
 	}
 
-	if (!parse->token && parse->parse) 
+	if (!parse->token && parse->parse)
 	{
 		offset = parse->offset;
 		userData = token;
@@ -349,7 +384,7 @@ static INIFieldParseProc findFieldParse(const FieldParse* parseTable, const char
 //-------------------------------------------------------------------------------------------------
 /** Load and parse an INI file */
 //-------------------------------------------------------------------------------------------------
-void INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
+UnsignedInt INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
 {
 	setFPMode(); // so we have consistent Real values for GameLogic -MDC
 
@@ -360,7 +395,7 @@ void INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
 	{
 
 		// read all lines in the file
-		DEBUG_ASSERTCRASH( m_endOfFile == FALSE, ("INI::load, EOF at the beginning!\n") );
+		DEBUG_ASSERTCRASH( m_endOfFile == FALSE, ("INI::load, EOF at the beginning!") );
 		while( m_endOfFile == FALSE )
 		{
 			// read this line
@@ -376,13 +411,14 @@ void INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
 				if (parse)
 				{
 					#ifdef DEBUG_CRASHING
+					static_assert(ARRAY_SIZE(m_curBlockStart) >= ARRAY_SIZE(m_buffer), "Incorrect array size");
 					strcpy(m_curBlockStart, m_buffer);
 					#endif
 					try {
 						(*parse)( this );
 
 					} catch (...) {
-						DEBUG_CRASH(("Error parsing block '%s' in INI file '%s'\n", token, m_filename.str()) );
+						DEBUG_CRASH(("Error parsing block '%s' in INI file '%s'", token, m_filename.str()) );
 						char buff[1024];
 						sprintf(buff, "Error parsing INI file '%s' (Line: '%s')\n", m_filename.str(), currentLine.str());
 
@@ -394,14 +430,14 @@ void INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
 				}
 				else
 				{
-					DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown block '%s'\n",
+					DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown block '%s'",
 														 getLineNum(), getFilename().str(), token ) );
 					throw INI_UNKNOWN_TOKEN;
 				}
-				
-			}  // end if 
-				
-		}  // end while
+
+			}
+
+		}
 	}
 	catch (...)
 	{
@@ -413,16 +449,17 @@ void INI::load( AsciiString filename, INILoadType loadType, Xfer *pXfer )
 
 	unPrepFile();
 
-}  // end load
+	return 1;
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Read a line from the already open file.  Any comments will be remved and
+/** Read a line from the already open file.  Any comments will be removed and
 	* therefore ignored from any given line */
 //-------------------------------------------------------------------------------------------------
 void INI::readLine( void )
 {
 	// sanity
-	DEBUG_ASSERTCRASH( m_file, ("readLine(), file pointer is NULL\n") );
+	DEBUG_ASSERTCRASH( m_file, ("readLine(), file pointer is NULL") );
 
   if (m_endOfFile)
     *m_buffer=0;
@@ -455,7 +492,7 @@ void INI::readLine( void )
         break;
       }
 
-      DEBUG_ASSERTCRASH(*p != '\t', ("tab characters are not allowed in INI files (%s). please check your editor settings. Line Number %d\n",m_filename.str(), getLineNum()));
+      DEBUG_ASSERTCRASH(*p != '\t', ("tab characters are not allowed in INI files (%s). please check your editor settings. Line Number %d",m_filename.str(), getLineNum()));
 
       // comment?
       if (*p==';')
@@ -474,16 +511,16 @@ void INI::readLine( void )
 		if ( p == m_buffer+INI_MAX_CHARS_PER_LINE )
 		{
 
-			DEBUG_ASSERTCRASH( 0, ("Buffer too small (%d) and was truncated, increase INI_MAX_CHARS_PER_LINE\n", 
+			DEBUG_ASSERTCRASH( 0, ("Buffer too small (%d) and was truncated, increase INI_MAX_CHARS_PER_LINE",
 														 INI_MAX_CHARS_PER_LINE) );
 
-		}  // end if
+		}
   }
 
 	if (s_xfer)
 	{
 		s_xfer->xferUser( m_buffer, sizeof( char ) * strlen( m_buffer ) );
-		//DEBUG_LOG(("Xfer val is now 0x%8.8X in %s, line %s\n", ((XferCRC *)s_xfer)->getCRC(),
+		//DEBUG_LOG(("Xfer val is now 0x%8.8X in %s, line %s", ((XferCRC *)s_xfer)->getCRC(),
 			//m_filename.str(), m_buffer));
 	}
 }
@@ -501,7 +538,7 @@ void INI::parseUnsignedByte( INI* ini, void * /*instance*/, void *store, const v
 		throw ERROR_BUG;
 	}
 	*(Byte *)store = (Byte)value;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse signed short from buffer and assign at location 'store' */
@@ -516,7 +553,7 @@ void INI::parseShort( INI* ini, void * /*instance*/, void *store, const void* /*
 		throw ERROR_BUG;
 	}
 	*(Short *)store = (Short)value;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse unsigned short from buffer and assign at location 'store' */
@@ -531,7 +568,7 @@ void INI::parseUnsignedShort( INI* ini, void * /*instance*/, void *store, const
 		throw ERROR_BUG;
 	}
 	*(UnsignedShort *)store = (UnsignedShort)value;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse integer from buffer and assign at location 'store' */
@@ -541,7 +578,7 @@ void INI::parseInt( INI* ini, void * /*instance*/, void *store, const void* /*us
 	const char *token = ini->getNextToken();
 	*(Int *)store = scanInt(token);
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse unsigned integer from buffer and assign at location 'store' */
@@ -561,7 +598,7 @@ void INI::parseReal( INI* ini, void * /*instance*/, void *store, const void* /*u
 	const char *token = ini->getNextToken();
 	*(Real *)store = scanReal(token);
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse real from buffer and assign at location 'store' */
@@ -572,7 +609,7 @@ void INI::parsePositiveNonZeroReal( INI* ini, void * /*instance*/, void *store,
 	*(Real *)store = scanReal(token);
 	if (*(Real *)store <= 0.0f)
 	{
-		DEBUG_CRASH(("invalid Real value %f -- expected > 0\n",*(Real*)store));
+		DEBUG_CRASH(("invalid Real value %f -- expected > 0",*(Real*)store));
 		throw INI_INVALID_DATA;
 	}
 
@@ -582,7 +619,7 @@ void INI::parsePositiveNonZeroReal( INI* ini, void * /*instance*/, void *store,
 /** Parse a degree value (0 to 360) and store the radian value of that degree
 	* in a Real */
 //-------------------------------------------------------------------------------------------------
-void INI::parseAngleReal( INI *ini, void * /*instance*/, 
+void INI::parseAngleReal( INI *ini, void * /*instance*/,
 																			void *store, const void *userData )
 {
 	const char *token = ini->getNextToken();
@@ -596,7 +633,7 @@ void INI::parseAngleReal( INI *ini, void * /*instance*/,
 /** Parse an angular velocity in degrees-per-sec and store the rads-per-frame value of that degree
 	* in a Real */
 //-------------------------------------------------------------------------------------------------
-void INI::parseAngularVelocityReal( INI *ini, void * /*instance*/, 
+void INI::parseAngularVelocityReal( INI *ini, void * /*instance*/,
 																			void *store, const void *userData )
 {
 	const char *token = ini->getNextToken();
@@ -641,7 +678,7 @@ void INI::parseBitInInt32( INI *ini, void *instance, void *store, const void* us
 		return FALSE;
 	else
 	{
-		DEBUG_CRASH(("invalid boolean token %s -- expected Yes or No\n",token));
+		DEBUG_CRASH(("invalid boolean token %s -- expected Yes or No",token));
 		throw INI_INVALID_DATA;
 		return false;	// keep compiler happy
 	}
@@ -717,12 +754,13 @@ AsciiString INI::getNextQuotedAsciiString()
 {
 	AsciiString result;
 	char buff[INI_MAX_CHARS_PER_LINE];
+	buff[0] = '\0';
 
 	const char *token = getNextTokenOrNull();	// if null, just leave an empty string
 	if (token != NULL)
 	{
-		if (token[0] != '\"') 
-		{	
+		if (token[0] != '\"')
+		{
 			// if token is simply "
 			result.set( token );	// Start following the "
 		}
@@ -731,7 +769,7 @@ AsciiString INI::getNextQuotedAsciiString()
 			Bool done=FALSE;
 			if ((strLen=strlen(token)) > 1)
 			{
-				strcpy(buff, &token[1]);	//skip the starting quote
+				strlcpy(buff, &token[1], ARRAY_SIZE(buff));	//skip the starting quote
 				//Check for end of quoted string.  Checking here fixes cases where quoted string on same line with other data.
 				if (buff[strLen-2]=='"')	//skip ending quote if present
 				{	buff[strLen-2]='\0';
@@ -742,11 +780,11 @@ AsciiString INI::getNextQuotedAsciiString()
 			if (!done)
 			{
 				token = getNextToken(getSepsQuote());
-				
+
 				if (strlen(token) > 1 && token[1] != '\t')
 				{
-					strcat(buff, " ");
-					strcat(buff, token);
+					strlcat(buff, " ", ARRAY_SIZE(buff));
+					strlcat(buff, token, ARRAY_SIZE(buff));
 				}
 				else
 				{	Int buflen=strlen(buff);
@@ -769,8 +807,8 @@ AsciiString INI::getNextAsciiString()
 	const char *token = getNextTokenOrNull();	// if null, just leave an empty string
 	if (token != NULL)
 	{
-		if (token[0] != '\"') 
-		{	
+		if (token[0] != '\"')
+		{
 			// if token is simply "
 			result.set( token );	// Start following the "
 		}
@@ -780,16 +818,16 @@ AsciiString INI::getNextAsciiString()
 			buff[0] = 0;
 			if (strlen(token) > 1)
 			{
-				strcpy(buff, &token[1]);
-			} 
+				strlcpy(buff, &token[1], ARRAY_SIZE(buff));
+			}
 
 			token = getNextTokenOrNull(getSepsQuote());
 			if (token) {
 				if (strlen(token) > 1 && token[1] != '\t')
 				{
-					strcat(buff, " ");
+					strlcat(buff, " ", ARRAY_SIZE(buff));
 				}
-				strcat(buff, token);
+				strlcat(buff, token, ARRAY_SIZE(buff));
 				result.set(buff);
 			} else {
 				Int len = strlen(buff);
@@ -820,7 +858,7 @@ void INI::parseAndTranslateLabel( INI* ini, void * /*instance*/, void *store, co
 	UnicodeString *theString = (UnicodeString *)store;
 	theString->set( translated.str() );
 
-}  // end parseAndTranslateLabel
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a string label assumed as an image as part of the image collection.  Translate
@@ -833,19 +871,19 @@ void INI::parseMappedImage( INI *ini, void * /*instance*/, void *store, const vo
 	if( TheMappedImageCollection )
 	{
 		typedef const Image* ConstImagePtr;
-		*(ConstImagePtr*)store = TheMappedImageCollection->findImageByName( AsciiString( token ) );
+		*(ConstImagePtr*)store = TheMappedImageCollection->findImageByName( token );
 	}
-	
+
 	//KM: If we are in the worldbuilder, we want to parse commandbuttons for informational purposes,
 	//but we don't care about the images -- because we never access them. In RTS/GUIEdit, they always
 	//exist -- and in those cases, it will never call this code anyways because it'll throw long before.
 	//else
 	//	throw INI_UNKNOWN_ERROR;
 
-}  // end parseMappedImage
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Parse a string label assumed as a Anim2D template name.  Translate that name to an 
+/** Parse a string label assumed as a Anim2D template name.  Translate that name to an
 	* actual template pointer for storage */
 // ------------------------------------------------------------------------------------------------
 /*static*/ void INI::parseAnim2DTemplate( INI *ini, void *instance, void *store, const void *userData )
@@ -856,16 +894,16 @@ void INI::parseMappedImage( INI *ini, void * /*instance*/, void *store, const vo
 	{
 		Anim2DTemplate **anim2DTemplate = (Anim2DTemplate **)store;
 		*anim2DTemplate = TheAnim2DCollection->findTemplate( AsciiString( token ) );
-	}  // end if
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "INI::parseAnim2DTemplate - TheAnim2DCollection is NULL\n" ));
+		DEBUG_CRASH(( "INI::parseAnim2DTemplate - TheAnim2DCollection is NULL" ));
 		throw INI_UNKNOWN_ERROR;
 
-	}  // end else
+	}
 
-}  // end parseAnim2DTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a percent in int or real form such as "23%" or "95.4%" and assign
@@ -877,7 +915,7 @@ void INI::parsePercentToReal( INI* ini, void * /*instance*/, void *store, const
 	Real *theReal = (Real *)store;
 	*theReal = scanPercentToReal(token);
 
-}  // end parsePercentToReal
+}
 
 //-------------------------------------------------------------------------------------------------
 /** 'store' points to an 32 bit unsigned integer.  We will zero that integer, parse each token
@@ -908,7 +946,7 @@ void INI::parseBitString32( INI* ini, void * /*instance*/, void *store, const vo
 
 	if( flagList == NULL || flagList[ 0 ] == NULL)
 	{
-		DEBUG_ASSERTCRASH( flagList, ("INTERNAL ERROR! parseBitString32: No flag list provided!\n") );
+		DEBUG_ASSERTCRASH( flagList, ("INTERNAL ERROR! parseBitString32: No flag list provided!") );
 		throw INI_INVALID_NAME_LIST;
 	}
 
@@ -1026,7 +1064,7 @@ void INI::parseRGBAColorInt( INI* ini, void * /*instance*/, void *store, const v
 			// if present, the token must match.
 			if (stricmp(token, names[i]) != 0)
 			{
-				throw INI_INVALID_DATA;				
+				throw INI_INVALID_DATA;
 			}
 			colors[i] = scanInt(ini->getNextToken(ini->getSepsColon()));
 		}
@@ -1046,7 +1084,7 @@ void INI::parseRGBAColorInt( INI* ini, void * /*instance*/, void *store, const v
 	theColor->blue	= colors[ 2 ];
 	theColor->alpha = colors[ 3 ];
 
-}  // end parseRGBAColorInt
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a color in the form of
@@ -1078,7 +1116,7 @@ void INI::parseColorInt( INI* ini, void * /*instance*/, void *store, const void*
 			// if present, the token must match.
 			if (stricmp(token, names[i]) != 0)
 			{
-				throw INI_INVALID_DATA;				
+				throw INI_INVALID_DATA;
 			}
 			colors[i] = scanInt(ini->getNextToken(ini->getSepsColon()));
 		}
@@ -1095,7 +1133,7 @@ void INI::parseColorInt( INI* ini, void * /*instance*/, void *store, const void*
 	Color *theColor = (Color *)store;
 	*theColor = GameMakeColor(colors[0], colors[1], colors[2], colors[3]);
 
-}  // end parseColorInt
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a 3D coordinate of reals in the form of:
@@ -1109,7 +1147,7 @@ void INI::parseCoord3D( INI* ini, void * /*instance*/, void *store, const void*
 	theCoord->y = scanReal(ini->getNextSubToken("Y"));
 	theCoord->z = scanReal(ini->getNextSubToken("Z"));
 
-}  // end parseCoord3D
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a 2D coordinate of reals in the form of:
@@ -1122,7 +1160,7 @@ void INI::parseCoord2D( INI* ini, void * /*instance*/, void *store, const void*
 	theCoord->x = scanReal(ini->getNextSubToken("X"));
 	theCoord->y = scanReal(ini->getNextSubToken("Y"));
 
-}  // end parseCoord2D
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a 2D coordinate of Ints in the form of:
@@ -1135,7 +1173,7 @@ void INI::parseICoord2D( INI* ini, void * /*instance*/, void *store, const void*
 	theCoord->x = scanInt(ini->getNextSubToken("X"));
 	theCoord->y = scanInt(ini->getNextSubToken("Y"));
 
-}  // end parseICoord2D
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an audio event and assign to the 'AudioEventRTS*' at store */
@@ -1144,15 +1182,12 @@ void INI::parseDynamicAudioEventRTS( INI *ini, void * /*instance*/, void *store,
 {
 	const char *token = ini->getNextToken();
 	DynamicAudioEventRTS** theSound = (DynamicAudioEventRTS**)store;
-	
+
 	// translate the string into a sound
-	if (stricmp(token, "NoSound") == 0) 
+	if (stricmp(token, "NoSound") == 0)
 	{
-		if (*theSound)
-		{
-			deleteInstance(*theSound);
-			*theSound = NULL;
-		}
+		deleteInstance(*theSound);
+		*theSound = NULL;
 	}
 	else
 	{
@@ -1160,7 +1195,7 @@ void INI::parseDynamicAudioEventRTS( INI *ini, void * /*instance*/, void *store,
 			*theSound = newInstance(DynamicAudioEventRTS);
 		(*theSound)->m_event.setEventName(AsciiString(token));
 	}
-	
+
 	if (*theSound)
 		TheAudio->getInfoForAudioEvent(&(*theSound)->m_event);
 }
@@ -1173,7 +1208,7 @@ void INI::parseAudioEventRTS( INI *ini, void * /*instance*/, void *store, const
 	const char *token = ini->getNextToken();
 
 	AudioEventRTS *theSound = (AudioEventRTS*)store;
-	
+
 	// translate the string into a sound
 	if (stricmp(token, "NoSound") != 0) {
 		theSound->setEventName(AsciiString(token));
@@ -1196,7 +1231,7 @@ void INI::parseThingTemplate( INI* ini, void * /*instance*/, void *store, const
 	}
 
 	typedef const ThingTemplate *ConstThingTemplatePtr;
-	ConstThingTemplatePtr* theThingTemplate = (ConstThingTemplatePtr*)store;		
+	ConstThingTemplatePtr* theThingTemplate = (ConstThingTemplatePtr*)store;
 
 	if (stricmp(token, "None") == 0)
 	{
@@ -1205,12 +1240,12 @@ void INI::parseThingTemplate( INI* ini, void * /*instance*/, void *store, const
 	else
 	{
 		const ThingTemplate *tt = TheThingFactory->findTemplate(token);	// could be null!
-		DEBUG_ASSERTCRASH(tt, ("ThingTemplate %s not found!\n",token));
+		DEBUG_ASSERTCRASH(tt, ("ThingTemplate %s not found!",token));
 		// assign it, even if null!
 		*theThingTemplate = tt;
 	}
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an ArmorTemplate and assign to the 'ArmorTemplate *' at store */
@@ -1220,7 +1255,7 @@ void INI::parseArmorTemplate( INI* ini, void * /*instance*/, void *store, const
 	const char *token = ini->getNextToken();
 
 	typedef const ArmorTemplate *ConstArmorTemplatePtr;
-	ConstArmorTemplatePtr* theArmorTemplate = (ConstArmorTemplatePtr*)store;		
+	ConstArmorTemplatePtr* theArmorTemplate = (ConstArmorTemplatePtr*)store;
 
 	if (stricmp(token, "None") == 0)
 	{
@@ -1229,12 +1264,12 @@ void INI::parseArmorTemplate( INI* ini, void * /*instance*/, void *store, const
 	else
 	{
 		const ArmorTemplate *tt = TheArmorStore->findArmorTemplate(token);	// could be null!
-		DEBUG_ASSERTCRASH(tt, ("ArmorTemplate %s not found!\n",token));
+		DEBUG_ASSERTCRASH(tt, ("ArmorTemplate %s not found!",token));
 		// assign it, even if null!
 		*theArmorTemplate = tt;
 	}
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an WeaponTemplate and assign to the 'WeaponTemplate *' at store */
@@ -1244,14 +1279,14 @@ void INI::parseWeaponTemplate( INI* ini, void * /*instance*/, void *store, const
 	const char *token = ini->getNextToken();
 
 	typedef const WeaponTemplate *ConstWeaponTemplatePtr;
-	ConstWeaponTemplatePtr* theWeaponTemplate = (ConstWeaponTemplatePtr*)store;		
+	ConstWeaponTemplatePtr* theWeaponTemplate = (ConstWeaponTemplatePtr*)store;
 
 	const WeaponTemplate *tt = TheWeaponStore->findWeaponTemplate(token);	// could be null!
-	DEBUG_ASSERTCRASH(tt || stricmp(token, "None") == 0, ("WeaponTemplate %s not found!\n",token));
+	DEBUG_ASSERTCRASH(tt || stricmp(token, "None") == 0, ("WeaponTemplate %s not found!",token));
 	// assign it, even if null!
 	*theWeaponTemplate = tt;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an FXList and assign to the 'FXList *' at store */
@@ -1261,14 +1296,14 @@ void INI::parseFXList( INI* ini, void * /*instance*/, void *store, const void* /
 	const char *token = ini->getNextToken();
 
 	typedef const FXList *ConstFXListPtr;
-	ConstFXListPtr* theFXList = (ConstFXListPtr*)store;		
+	ConstFXListPtr* theFXList = (ConstFXListPtr*)store;
 
 	const FXList *fxl = TheFXListStore->findFXList(token);	// could be null!
-	DEBUG_ASSERTCRASH(fxl != NULL || stricmp(token, "None") == 0, ("FXList %s not found!\n",token));
+	DEBUG_ASSERTCRASH(fxl != NULL || stricmp(token, "None") == 0, ("FXList %s not found!",token));
 	// assign it, even if null!
 	*theFXList = fxl;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a particle system and assign to 'ParticleSystemTemplate *' at store */
@@ -1278,14 +1313,14 @@ void INI::parseParticleSystemTemplate( INI *ini, void * /*instance*/, void *stor
 	const char *token = ini->getNextToken();
 
 	const ParticleSystemTemplate *pSystemT = TheParticleSystemManager->findTemplate( AsciiString( token ) );
-	DEBUG_ASSERTCRASH( pSystemT || stricmp( token, "None" ) == 0, ("ParticleSystem %s not found!\n",token) );
+	DEBUG_ASSERTCRASH( pSystemT || stricmp( token, "None" ) == 0, ("ParticleSystem %s not found!",token) );
 
 	typedef const ParticleSystemTemplate* ConstParticleSystemTemplatePtr;
-	ConstParticleSystemTemplatePtr* theParticleSystemTemplate = (ConstParticleSystemTemplatePtr*)store;		
+	ConstParticleSystemTemplatePtr* theParticleSystemTemplate = (ConstParticleSystemTemplatePtr*)store;
 
 	*theParticleSystemTemplate = pSystemT;
 
-}  // end parseParticleSystemTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an DamageFX and assign to the 'DamageFX *' at store */
@@ -1295,7 +1330,7 @@ void INI::parseDamageFX( INI* ini, void * /*instance*/, void *store, const void*
 	const char *token = ini->getNextToken();
 
 	typedef const DamageFX *ConstDamageFXPtr;
-	ConstDamageFXPtr* theDamageFX = (ConstDamageFXPtr*)store;		
+	ConstDamageFXPtr* theDamageFX = (ConstDamageFXPtr*)store;
 
 	if (stricmp(token, "None") == 0)
 	{
@@ -1304,12 +1339,12 @@ void INI::parseDamageFX( INI* ini, void * /*instance*/, void *store, const void*
 	else
 	{
 		const DamageFX *fxl = TheDamageFXStore->findDamageFX(token);	// could be null!
-		DEBUG_ASSERTCRASH(fxl, ("DamageFX %s not found!\n",token));
+		DEBUG_ASSERTCRASH(fxl, ("DamageFX %s not found!",token));
 		// assign it, even if null!
 		*theDamageFX = fxl;
 	}
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an ObjectCreationList and assign to the 'ObjectCreationList *' at store */
@@ -1319,14 +1354,14 @@ void INI::parseObjectCreationList( INI* ini, void * /*instance*/, void *store, c
 	const char *token = ini->getNextToken();
 
 	typedef const ObjectCreationList *ConstObjectCreationListPtr;
-	ConstObjectCreationListPtr* theObjectCreationList = (ConstObjectCreationListPtr*)store;		
+	ConstObjectCreationListPtr* theObjectCreationList = (ConstObjectCreationListPtr*)store;
 
 	const ObjectCreationList *ocl = TheObjectCreationListStore->findObjectCreationList(token);	// could be null!
-	DEBUG_ASSERTCRASH(ocl || stricmp(token, "None") == 0, ("ObjectCreationList %s not found!\n",token));
+	DEBUG_ASSERTCRASH(ocl || stricmp(token, "None") == 0, ("ObjectCreationList %s not found!",token));
 	// assign it, even if null!
 	*theObjectCreationList = ocl;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a upgrade template string and store as template pointer */
@@ -1341,13 +1376,13 @@ void INI::parseUpgradeTemplate( INI* ini, void * /*instance*/, void *store, cons
 		throw ERROR_BUG;
 	}
 
-	const UpgradeTemplate *uu = TheUpgradeCenter->findUpgrade( AsciiString( token ) );
-	DEBUG_ASSERTCRASH( uu || stricmp( token, "None" ) == 0, ("Upgrade %s not found!\n",token) );
+	const UpgradeTemplate *uu = TheUpgradeCenter->findUpgrade( token );
+	DEBUG_ASSERTCRASH( uu || stricmp( token, "None" ) == 0, ("Upgrade %s not found!",token) );
 
 	typedef const UpgradeTemplate* ConstUpgradeTemplatePtr;
-	ConstUpgradeTemplatePtr* theUpgradeTemplate = (ConstUpgradeTemplatePtr *)store;		
+	ConstUpgradeTemplatePtr* theUpgradeTemplate = (ConstUpgradeTemplatePtr *)store;
 	*theUpgradeTemplate = uu;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a special power template string and store as template pointer */
@@ -1365,13 +1400,13 @@ void INI::parseSpecialPowerTemplate( INI* ini, void * /*instance*/, void *store,
 	const SpecialPowerTemplate *sPowerT = TheSpecialPowerStore->findSpecialPowerTemplate( AsciiString( token ) );
 	if( !sPowerT && stricmp( token, "None" ) != 0 )
 	{
-		DEBUG_CRASH( ("[LINE: %d in '%s'] Specialpower %s not found!\n", ini->getLineNum(), ini->getFilename().str(), token) );
+		DEBUG_CRASH( ("[LINE: %d in '%s'] Specialpower %s not found!", ini->getLineNum(), ini->getFilename().str(), token) );
 	}
 
 	typedef const SpecialPowerTemplate* ConstSpecialPowerTemplatePtr;
-	ConstSpecialPowerTemplatePtr* theSpecialPowerTemplate = (ConstSpecialPowerTemplatePtr *)store;		
+	ConstSpecialPowerTemplatePtr* theSpecialPowerTemplate = (ConstSpecialPowerTemplatePtr *)store;
 	*theSpecialPowerTemplate = sPowerT;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a science string and store as science type */
@@ -1401,7 +1436,7 @@ void INI::parseIndexList( INI* ini, void * /*instance*/, void *store, const void
 {
 	ConstCharPtrArray nameList = (ConstCharPtrArray)userData;
 	*(Int *)store = scanIndexList(ini->getNextToken(), nameList);
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a single string token, check for that token in the index list
@@ -1420,7 +1455,7 @@ void INI::parseByteSizedIndexList( INI* ini, void * /*instance*/, void *store, c
 		throw ERROR_BUG;
 	}
 	*(Byte *)store = (Byte)value;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a single string token, check for that token in the index list
@@ -1439,7 +1474,7 @@ void INI::parseLookupList( INI* ini, void * /*instance*/, void *store, const voi
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-	
+
 //-------------------------------------------------------------------------------------------------
 void MultiIniFieldParse::add(const FieldParse* f, UnsignedInt e)
 {
@@ -1479,7 +1514,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 
 	if( what == NULL )
 	{
-		DEBUG_ASSERTCRASH( 0, ("INI::initFromINI - Invalid parameters supplied!\n") );
+		DEBUG_ASSERTCRASH( 0, ("INI::initFromINI - Invalid parameters supplied!") );
 		throw INI_INVALID_PARAMS;
 	}
 
@@ -1515,7 +1550,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 						(*parse)( this, what, (char *)what + offset + parseTableList.getNthExtraOffset(ptIdx), userData );
 
 						} catch (...) {
-							DEBUG_CRASH( ("[LINE: %d - FILE: '%s'] Error reading field '%s' of block '%s'\n",
+							DEBUG_CRASH( ("[LINE: %d - FILE: '%s'] Error reading field '%s' of block '%s'",
 																 INI::getLineNum(), INI::getFilename().str(), field, m_curBlockStart) );
 
 
@@ -1523,36 +1558,35 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 							sprintf(buff, "[LINE: %d - FILE: '%s'] Error reading field '%s'\n", INI::getLineNum(), INI::getFilename().str(), field);
 							throw INIException(buff);
 						}
-						
+
 						found = true;
 						break;
-						
+
 					}
 				}
 
 				if (!found)
 				{
-					DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown field '%s' in block '%s'\n",
+					DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown field '%s' in block '%s'",
 														 INI::getLineNum(), INI::getFilename().str(), field, m_curBlockStart) );
-					throw INI_UNKNOWN_TOKEN;
 				}
 
-			}  // end else
+			}
 
-		}  // end if
+		}
 
 		// sanity check for reaching end of file with no closing end token
 		if( done == FALSE && INI::isEOF() == TRUE )
 		{
 
 			done = TRUE;
-			DEBUG_ASSERTCRASH( 0, ("Error parsing block '%s', in INI file '%s'.  Missing '%s' token\n",
+			DEBUG_ASSERTCRASH( 0, ("Error parsing block '%s', in INI file '%s'.  Missing '%s' token",
 												 m_curBlockStart, getFilename().str(), m_blockEndToken) );
 			throw INI_MISSING_END_TOKEN;
 
-		}  // end if
+		}
 
-	}  // end while
+	}
 
 }
 
@@ -1561,7 +1595,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 {
 	if (!seps) seps = getSeps();
 	const char *token = ::strtok(NULL, seps);
-	if (!token) 
+	if (!token)
 		throw INI_INVALID_DATA;
 	return token;
 }
@@ -1622,7 +1656,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 	if( nameList == NULL || nameList[ 0 ] == NULL )
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("INTERNAL ERROR! scanIndexList, invalid name list\n") );
+		DEBUG_ASSERTCRASH( 0, ("INTERNAL ERROR! scanIndexList, invalid name list") );
 		throw INI_INVALID_NAME_LIST;
 
 	}
@@ -1637,7 +1671,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 		}
 	}
 
-	DEBUG_CRASH(("token %s is not a valid member of the index list\n",token));
+	DEBUG_CRASH(("token %s is not a valid member of the index list",token));
 	throw INI_INVALID_DATA;
 	return 0;	// never executed, but keeps compiler happy
 
@@ -1647,7 +1681,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 {
 	if( lookupList == NULL || lookupList[ 0 ].name == NULL )
 	{
-		DEBUG_ASSERTCRASH( 0, ("INTERNAL ERROR! scanLookupList, invalid name list\n") );
+		DEBUG_ASSERTCRASH( 0, ("INTERNAL ERROR! scanLookupList, invalid name list") );
 		throw INI_INVALID_NAME_LIST;
 	}
 
@@ -1663,7 +1697,7 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 		}
 	}
 
-	DEBUG_CRASH(("token %s is not a valid member of the lookup list\n",token));
+	DEBUG_CRASH(("token %s is not a valid member of the lookup list",token));
 	throw INI_INVALID_DATA;
 	return 0;	// never executed, but keeps compiler happy
 
@@ -1877,61 +1911,39 @@ void INI::parseDeathTypeFlags(INI* ini, void* /*instance*/, void* store, const v
 // both blockType and blockName are case insensitive
 Bool INI::isDeclarationOfType( AsciiString blockType, AsciiString blockName, char *bufferToCheck )
 {
-	Bool retVal = true;
-	if (!bufferToCheck || blockType.isEmpty() || blockName.isEmpty()) {
+	if (!bufferToCheck || blockType.isEmpty() || blockName.isEmpty())
 		return false;
-	}
-	// DO NOT RETURN EARLY FROM THIS FUNCTION. (beyond this point)
-	// we have to restore the bufferToCheck to its previous state before returning, so 
-	// it is important to get through all the checks.
-	
-	char restoreChar;
-	char *tempBuff = bufferToCheck;
-	int blockTypeLength = blockType.getLength();
-	int blockNameLength = blockName.getLength();
 
-	while (isspace(*tempBuff)) {
+	const char* tempBuff = bufferToCheck;
+
+	while (isspace(*tempBuff))
 		++tempBuff;
-	}
-	
-	if (strlen(tempBuff) > blockTypeLength) {
-		restoreChar = tempBuff[blockTypeLength];
-		tempBuff[blockTypeLength] = 0;
-		
-		if (stricmp(blockType.str(), tempBuff) != 0) {
-			retVal = false;
-		}
 
-		tempBuff[blockTypeLength] = restoreChar;
-		tempBuff = tempBuff + blockTypeLength;
-	} else {
-		retVal = false;
-	}
+	const int blockTypeLength = blockType.getLength();
+	if (strnicmp(tempBuff, blockType.str(), blockTypeLength) != 0)
+		return false;
 
-	while (isspace(*tempBuff)) {
+	tempBuff += blockTypeLength;
+
+	if (!isspace(*tempBuff++))
+		return false;
+
+	while (isspace(*tempBuff))
 		++tempBuff;
-	}
 
-	if (strlen(tempBuff) > blockNameLength) {
-		restoreChar = tempBuff[blockNameLength];
-		tempBuff[blockNameLength] = 0;
-		
-		if (stricmp(blockName.str(), tempBuff) != 0) {
-			retVal = false;
-		}
+	const int blockNameLength = blockName.getLength();
+	if (strnicmp(tempBuff, blockName.str(), blockNameLength) != 0)
+		return false;
 
-		tempBuff[blockNameLength] = restoreChar;
-		tempBuff = tempBuff + blockNameLength;
-	} else {
-		retVal = false;
-	}
+	tempBuff += blockNameLength;
 
-	while (strlen(tempBuff)) {
-		retVal = retVal && isspace(tempBuff[0]);
+	while (isspace(*tempBuff))
 		++tempBuff;
-	}
 
-	return retVal;
+	if (*tempBuff != '\0')
+		return false;
+
+	return true;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1945,23 +1957,23 @@ Bool INI::isEndOfBlock( char *bufferToCheck )
 	}
 
 	// DO NOT RETURN EARLY FROM THIS FUNCTION (beyond this point)
-	// we have to restore the bufferToCheck to its previous state before returning, so 
+	// we have to restore the bufferToCheck to its previous state before returning, so
 	// it is important to get through all the checks.
-	
+
 	static const char* endString = "End";
 	int endStringLength = strlen(endString);
 	char restoreChar;
 	char *tempBuff = bufferToCheck;
-	
+
 
 	while (isspace(*tempBuff)) {
 		++tempBuff;
 	}
-	
+
 	if (strlen(tempBuff) > endStringLength) {
 		restoreChar = tempBuff[endStringLength];
 		tempBuff[endStringLength] = 0;
-		
+
 		if (stricmp(endString, tempBuff) != 0) {
 			retVal = false;
 		}
@@ -1972,8 +1984,8 @@ Bool INI::isEndOfBlock( char *bufferToCheck )
 		retVal = false;
 	}
 
-	while (strlen(tempBuff)) {
-		retVal = retVal && isspace(tempBuff[0]);
+	while (*tempBuff && retVal) {
+		retVal = isspace(*tempBuff);
 		++tempBuff;
 	}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIAiData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIAiData.cpp
index 4fe2dc7557a..8ba44c1f547 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIAiData.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIAiData.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameLogic/AI.h"
@@ -47,6 +47,6 @@
 void INI::parseAIDataDefinition( INI* ini )
 {
 	AI::parseAiDataDefinition(ini);
-} 
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIAnimation.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIAnimation.cpp
index 45ee3d6cff5..7300b1ebc74 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIAnimation.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIAnimation.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/Anim2D.h"
@@ -43,7 +43,7 @@ void INI::parseAnim2DDefinition( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	//
 	// find existing item if present, note that we do not support overrides
@@ -56,7 +56,7 @@ void INI::parseAnim2DDefinition( INI* ini )
 		//We don't need it if we're in the builder... which doesn't have this.
 		return;
 
-	}  // end if
+	}
 
 	// find existing animation template if present
 	animTemplate = TheAnim2DCollection->findTemplate( name );
@@ -65,24 +65,24 @@ void INI::parseAnim2DDefinition( INI* ini )
 
 		// item not found, create a new one
 		animTemplate = TheAnim2DCollection->newTemplate( name );
-		DEBUG_ASSERTCRASH( animTemplate, ("INI""parseAnim2DDefinition -  unable to allocate animation template for '%s'\n",
+		DEBUG_ASSERTCRASH( animTemplate, ("INI::parseAnim2DDefinition -  unable to allocate animation template for '%s'",
 											 name.str()) );
 
-	}  // end if
+	}
 	else
 	{
 
 		// we're loading over an existing animation template ... something is probably wrong
-		DEBUG_CRASH(( "INI::parseAnim2DDefinition - Animation template '%s' already exists\n",
+		DEBUG_CRASH(( "INI::parseAnim2DDefinition - Animation template '%s' already exists",
 									animTemplate->getName().str() ));
 		return;
 
-	}  // end else
+	}
 
 	// parse the ini definition
 	ini->initFromINI( animTemplate, animTemplate->getFieldParse() );
 
-}  // end parseAnim2DDefinition
+}
 
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIAudioEventInfo.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIAudioEventInfo.cpp
deleted file mode 100644
index 0ea67eee6be..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIAudioEventInfo.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: INIAudioEventInfo.cpp ////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, July 2002
-// Desc:   Parsing AudioEvent, MusicTrack and DialogEvent INI entries
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/INI.h"
-#include "Common/GameAudio.h"
-#include "Common/AudioEventInfo.h"
-
-AudioEventInfo::~AudioEventInfo()
-{
-
-}
-// @todo: Get these functions unified.
-
-//-------------------------------------------------------------------------------------------------
-void INI::parseMusicTrackDefinition( INI* ini )
-{
-	AsciiString name;
-	AudioEventInfo *track;
-
-	// read the name
-	const char* c = ini->getNextToken();
-	name.set( c );	
-
-	track = TheAudio->newAudioEventInfo( name );
-	if (!track) {
-		return;
-	}
-
-	AudioEventInfo *defaultInfo = TheAudio->findAudioEventInfo("DefaultMusicTrack");
-	if (defaultInfo) {
-		(*track) = (*defaultInfo);
-		TheAudio->addTrackName( name );
-	}
-
-	track->m_audioName = name;
-	track->m_soundType = AT_Music;
-
-	// parse the ini definition
-	ini->initFromINI( track, track->getFieldParse() );
-}  // end parseMusicTrackDefinition
-
-//-------------------------------------------------------------------------------------------------
-void INI::parseAudioEventDefinition( INI* ini )
-{
-	AsciiString name;
-	AudioEventInfo *track;
-
-	// read the name
-	const char* c = ini->getNextToken();
-	name.set( c );	
-
-	track = TheAudio->newAudioEventInfo( name );
-	if (!track) {
-		return;
-	}
-
-	AudioEventInfo *defaultInfo = TheAudio->findAudioEventInfo("DefaultSoundEffect");
-	if (defaultInfo) {
-		(*track) = (*defaultInfo);
-	}
-
-	track->m_audioName = name;
-	track->m_soundType = AT_SoundEffect;
-
-	// parse the ini definition
-	ini->initFromINI( track, track->getFieldParse() );
-}  // end parseAudioEventDefinition
-
-//-------------------------------------------------------------------------------------------------
-void INI::parseDialogDefinition( INI* ini )
-{
-	AsciiString name;
-	AudioEventInfo *track;
-
-	// read the name
-	const char* c = ini->getNextToken();
-	name.set( c );	
-
-	track = TheAudio->newAudioEventInfo( name );
-	if (!track) {
-		return;
-	}
-
-	AudioEventInfo *defaultInfo = TheAudio->findAudioEventInfo("DefaultDialog");
-	if (defaultInfo) {
-		(*track) = (*defaultInfo);
-	}
-
-	track->m_audioName = name;
-	track->m_soundType = AT_Streaming;
-
-	// parse the ini definition
-	ini->initFromINI( track, track->getFieldParse() );
-}  // end parseAudioEventDefinition
-
-
-//-------------------------------------------------------------------------------------------------
-static void parseDelay( INI* ini, void *instance, void *store, const void* /*userData*/ );
-static void parsePitchShift( INI* ini, void *instance, void *store, const void* /*userData*/ );
-
-//-------------------------------------------------------------------------------------------------
-const FieldParse AudioEventInfo::m_audioEventInfo[] = 
-{
-	{ "Filename",							INI::parseAsciiString,		NULL,								offsetof( AudioEventInfo, m_filename) },
-	{ "Volume",								INI::parsePercentToReal,	NULL,								offsetof( AudioEventInfo, m_volume ) },
-	{ "VolumeShift",					INI::parsePercentToReal,	NULL,								offsetof( AudioEventInfo, m_volumeShift ) },
-	{ "MinVolume",						INI::parsePercentToReal,	NULL,								offsetof( AudioEventInfo, m_minVolume ) },
-	{ "PitchShift",						parsePitchShift,					NULL,								0 },
-	{ "Delay",								parseDelay,								NULL,								0 },
-	{ "Limit",								INI::parseInt,						NULL,								offsetof( AudioEventInfo, m_limit ) },
-	{ "LoopCount",						INI::parseInt,						NULL,								offsetof( AudioEventInfo, m_loopCount ) },
-	{ "Priority",							INI::parseIndexList,			theAudioPriorityNames,	offsetof( AudioEventInfo, m_priority ) },
-	{ "Type",									INI::parseBitString32,		theSoundTypeNames,			offsetof( AudioEventInfo, m_type ) },
-	{ "Control",							INI::parseBitString32,		theAudioControlNames,	offsetof( AudioEventInfo, m_control ) },
-	{ "Sounds",								INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_sounds ) },
-	{ "SoundsNight",					INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_soundsNight ) },
-	{ "SoundsEvening",				INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_soundsEvening ) },
-	{ "SoundsMorning",				INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_soundsMorning ) },
-	{ "Attack",								INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_attackSounds ) },
-	{ "Decay",								INI::parseSoundsList,			NULL,								offsetof( AudioEventInfo, m_decaySounds ) },
-	{ "MinRange",							INI::parseReal,						NULL,								offsetof( AudioEventInfo, m_minDistance) },
-	{ "MaxRange",							INI::parseReal,						NULL,								offsetof( AudioEventInfo, m_maxDistance) },
-	{ "LowPassCutoff",				INI::parsePercentToReal,	NULL,								offsetof( AudioEventInfo, m_lowPassFreq) },
-};
-
-//-------------------------------------------------------------------------------------------------
-static void parseDelay( INI* ini, void *instance, void *store, const void* /*userData*/ )
-{
-	AudioEventInfo *attribs = (AudioEventInfo*) store;
-
-	Int min = ini->scanInt(ini->getNextToken());
-	Int max = ini->scanInt(ini->getNextToken());
-
-	DEBUG_ASSERTCRASH( min >= 0 && max >= min, ("Bad delay values for audio event %s", attribs->m_audioName.str()));
-	attribs->m_delayMax = max;
-	attribs->m_delayMin = min;
-}
-
-//-------------------------------------------------------------------------------------------------
-static void parsePitchShift( INI* ini, void *instance, void *store, const void* /*userData*/ )
-{
-	AudioEventInfo *attribs = (AudioEventInfo*) store;
-
-	Real min = ini->scanReal(ini->getNextToken());
-	Real max = ini->scanReal(ini->getNextToken());
-
-	DEBUG_ASSERTCRASH( min > -100 && max >= min, ("Bad pitch shift values for audio event %s", attribs->m_audioName.str()));
-	attribs->m_pitchShiftMin = 1.0f + min/100;
-	attribs->m_pitchShiftMax = 1.0f + max/100;
-}
-
-// STATIC DEFINIITIONS ////////////////////////////////////////////////////////////////////////////
-
-const char *theAudioPriorityNames[] = 
-{
-	"LOWEST",
-	"LOW",
-	"NORMAL",
-	"HIGH",
-	"CRITICAL",
-	NULL
-};
-
-const char *theSoundTypeNames[] = 
-{ 
-	"UI",
-	"WORLD",
-	"SHROUDED",
-	"GLOBAL",
-	"VOICE",
-	"PLAYER",
-	"ALLIES",
-	"ENEMIES",
-	"EVERYONE",
-	NULL
-};
-
-const char *theAudioControlNames[] = 
-{
-	"LOOP",
-	"RANDOM",
-	"ALL",
-	"POSTDELAY",
-	"INTERRUPT",
-	NULL
-};
-
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INICommandButton.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INICommandButton.cpp
index 3035213cf0d..67b6216c7c8 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INICommandButton.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INICommandButton.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/SpecialPower.h"
@@ -57,11 +57,11 @@ void ControlBar::parseCommandButtonDefinition( INI *ini )
 	{
 		// allocate a new item
 		button = TheControlBar->newCommandButton( name );
-		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES) 
+		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES)
 		{
 			button->markAsOverride();
 		}
-	}  // end if
+	}
 	else if( ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES )
 	{
 		DEBUG_CRASH(( "[LINE: %d in '%s'] Duplicate commandbutton %s found!", ini->getLineNum(), ini->getFilename().str(), name.str() ));
@@ -73,7 +73,7 @@ void ControlBar::parseCommandButtonDefinition( INI *ini )
 
 	// parse the ini definition
 	ini->initFromINI( button, button->getFieldParse() );
-	
+
 
 	//Make sure buttons with special power templates also have the appropriate option set.
 	const SpecialPowerTemplate *spTemplate = button->getSpecialPowerTemplate();
@@ -89,6 +89,6 @@ void ControlBar::parseCommandButtonDefinition( INI *ini )
 			ini->getLineNum(), ini->getFilename().str(), name.str() ) );
 	}
 
-}  // end parseCommandButtonDefinition
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INICommandSet.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INICommandSet.cpp
index 9d8a3584dfc..1e699785a3c 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INICommandSet.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INICommandSet.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/ControlBar.h"
@@ -40,4 +40,4 @@
 void INI::parseCommandSetDefinition( INI *ini )
 {
 	ControlBar::parseCommandSetDefinition(ini);
-}  // end parseCommandSetDefinition
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIControlBarScheme.cpp
index c215e0f2d80..4e22f8e068e 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIControlBarScheme.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIControlBarScheme.cpp
@@ -24,12 +24,12 @@
 
 // FILE: INIControlBarScheme.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Apr 2002
@@ -37,7 +37,7 @@
 //	Filename: 	INIControlBarScheme.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Parse a control Bar Scheme
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/ControlBar.h"
@@ -78,24 +78,24 @@ void INI::parseControlBarSchemeDefinition( INI *ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
 	CBSchemeManager = TheControlBar->getControlBarSchemeManager();
-	DEBUG_ASSERTCRASH( CBSchemeManager, ("parseControlBarSchemeDefinition: Unable to Get CBSchemeManager\n") );
+	DEBUG_ASSERTCRASH( CBSchemeManager, ("parseControlBarSchemeDefinition: Unable to Get CBSchemeManager") );
 	if( !CBSchemeManager )
 		return;
 
 	// If we have a previously allocated control bar, this will return a cleared out pointer to it so we
-	// can overwrite it	
+	// can overwrite it
 	CBScheme = CBSchemeManager->newControlBarScheme( name );
 
 	// sanity
-	DEBUG_ASSERTCRASH( CBScheme, ("parseControlBarSchemeDefinition: Unable to allocate Scheme '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( CBScheme, ("parseControlBarSchemeDefinition: Unable to allocate Scheme '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( CBScheme, CBSchemeManager->getFieldParse() );
 
-}  // end parseCommandButtonDefinition
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INICrate.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INICrate.cpp
index 32964735d53..7dd840bbd2b 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INICrate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INICrate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameLogic/CrateSystem.h"
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIDamageFX.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIDamageFX.cpp
index dd52d884b35..5bfe018f4ad 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIDamageFX.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIDamageFX.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/DamageFX.h"
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIDrawGroupInfo.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIDrawGroupInfo.cpp
index d1549a446a8..a732029ae73 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIDrawGroupInfo.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIDrawGroupInfo.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/DrawGroupInfo.h"
@@ -39,7 +39,7 @@ void parseInt( INI* ini, void * /*instance*/, void *store, const void* userData
 	if (userData == 0) {
 		store = &dgi->m_pixelOffsetX;
 		dgi->m_usingPixelOffsetX = TRUE;
-	} else { 
+	} else {
 		store = &dgi->m_pixelOffsetY;
 		dgi->m_usingPixelOffsetY = TRUE;
 	}
@@ -53,7 +53,7 @@ void parsePercentToReal( INI* ini, void * /*instance*/, void *store, const void*
 	if (userData == 0) {
 		store = &dgi->m_pixelOffsetX;
 		dgi->m_usingPixelOffsetX = FALSE;
-	} else { 
+	} else {
 		store = &dgi->m_pixelOffsetY;
 		dgi->m_usingPixelOffsetY = FALSE;
 	}
@@ -61,12 +61,12 @@ void parsePercentToReal( INI* ini, void * /*instance*/, void *store, const void*
 	INI::parsePercentToReal(ini, NULL, store, NULL);
 }
 
-const FieldParse DrawGroupInfo::s_fieldParseTable[] = 
+const FieldParse DrawGroupInfo::s_fieldParseTable[] =
 {
 	{ "UsePlayerColor",												INI::parseBool,						NULL, offsetof( DrawGroupInfo, m_usePlayerColor) },
 	{ "ColorForText",													INI::parseColorInt,				NULL, offsetof( DrawGroupInfo, m_colorForText ) },
 	{ "ColorForTextDropShadow",								INI::parseColorInt,				NULL, offsetof( DrawGroupInfo, m_colorForTextDropShadow ) },
-	
+
 	{ "FontName",															INI::parseQuotedAsciiString,		NULL, offsetof( DrawGroupInfo, m_fontName ) },
 	{ "FontSize",															INI::parseInt,						NULL, offsetof( DrawGroupInfo, m_fontSize ) },
 	{ "FontIsBold",														INI::parseBool,						NULL, offsetof( DrawGroupInfo, m_fontIsBold ) },
@@ -76,7 +76,7 @@ const FieldParse DrawGroupInfo::s_fieldParseTable[] =
 	{ "DrawPositionXPercent",			  					parsePercentToReal,				(void*)0, 0 },
 	{ "DrawPositionYPixel",			  						parseInt,									(void*)1, 0 },
 	{ "DrawPositionYPercent",			  					parsePercentToReal,				(void*)1, 0 },
-	
+
 	{ 0, 0, 0, 0 }
 };
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIGameData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIGameData.cpp
index 7ee05f54cc0..be6b983dbf4 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIGameData.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIGameData.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/GlobalData.h"
@@ -47,6 +47,6 @@
 void INI::parseGameDataDefinition( INI* ini )
 {
 	GlobalData::parseGameDataDefinition(ini);
-} 
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapCache.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapCache.cpp
index 1cad0961cf2..00e6a6cabbf 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapCache.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapCache.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Lib/BaseType.h"
 #include "Common/INI.h"
@@ -39,11 +39,6 @@
 #include "Common/WellKnownKeys.h"
 #include "Common/QuotedPrintable.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 class MapMetaDataReader
 {
@@ -86,7 +81,7 @@ void parseTechPositionsCoord3D( INI* ini, void * instance, void * /*store*/, con
 
 }
 
-const FieldParse MapMetaDataReader::m_mapFieldParseTable[] = 
+const FieldParse MapMetaDataReader::m_mapFieldParseTable[] =
 {
 
 	{ "isOfficial",							INI::parseBool,			NULL,	offsetof( MapMetaDataReader, m_isOfficial ) },
@@ -115,7 +110,7 @@ const FieldParse MapMetaDataReader::m_mapFieldParseTable[] =
 
 	{ "InitialCameraPosition",	INI::parseCoord3D,	NULL,	offsetof( MapMetaDataReader, m_initialCameraPosition ) },
 
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
+	{ NULL,					NULL,						NULL,						0 }
 
 };
 
@@ -136,6 +131,7 @@ void INI::parseMapCacheDefinition( INI* ini )
 
 	md.m_extent = mdr.m_extent;
 	md.m_isOfficial = mdr.m_isOfficial != 0;
+	md.m_doesExist = TRUE;
 	md.m_isMultiplayer = mdr.m_isMultiplayer != 0;
 	md.m_numPlayers = mdr.m_numPlayers;
 	md.m_filesize = mdr.m_filesize;
@@ -144,8 +140,9 @@ void INI::parseMapCacheDefinition( INI* ini )
 
 	md.m_waypoints[TheNameKeyGenerator->keyToName(TheKey_InitialCameraPosition)] = mdr.m_initialCameraPosition;
 
-//	md.m_displayName = QuotedPrintableToUnicodeString(mdr.m_asciiDisplayName);
-// this string is never to be used, but we'll leave it in to allow people with an old mapcache.ini to parse it
+#if RTS_GENERALS
+	md.m_displayName = QuotedPrintableToUnicodeString(mdr.m_asciiDisplayName);
+#else
 	md.m_nameLookupTag = QuotedPrintableToAsciiString(mdr.m_asciiNameLookupTag);
 
 	if (md.m_nameLookupTag.isEmpty())
@@ -172,6 +169,7 @@ void INI::parseMapCacheDefinition( INI* ini )
 			md.m_displayName.concat(extension);
 		}
 	}
+#endif
 
 	AsciiString startingCamName;
 	for (Int i=0; i<md.m_numPlayers; ++i)
@@ -199,7 +197,7 @@ void INI::parseMapCacheDefinition( INI* ini )
 		AsciiString lowerName = name;
 		lowerName.toLower();
 		md.m_fileName = lowerName;
-//		DEBUG_LOG(("INI::parseMapCacheDefinition - adding %s to map cache\n", lowerName.str()));
+//		DEBUG_LOG(("INI::parseMapCacheDefinition - adding %s to map cache", lowerName.str()));
 		(*TheMapCache)[lowerName] = md;
 	}
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapData.cpp
index 51abd28b078..16632e27920 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapData.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapData.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 
@@ -45,6 +45,6 @@
 //-------------------------------------------------------------------------------------------------
 void INI::parseMapDataDefinition( INI* ini )
 {
-}  // end parseMapData
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMappedImage.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMappedImage.cpp
index 0510a1f208c..f7a4c801543 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMappedImage.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMappedImage.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/Image.h"
@@ -42,11 +42,8 @@
 //-------------------------------------------------------------------------------------------------
 void INI::parseMappedImageDefinition( INI* ini )
 {
-	AsciiString name;
-
 	// read the name
-	const char* c = ini->getNextToken();
-	name.set( c );	
+	const char* name = ini->getNextToken();
 
 	//
 	// find existing item if present, note that we do not support overrides
@@ -66,15 +63,14 @@ void INI::parseMappedImageDefinition( INI* ini )
 	{
 
 		// image not found, create a new one
-  	image = newInstance(Image);
+		image = newInstance(Image);
 		image->setName( name );
 		TheMappedImageCollection->addImage(image);
-		DEBUG_ASSERTCRASH( image, ("parseMappedImage: unable to allocate image for '%s'\n",
-															name.str()) );
+		DEBUG_ASSERTCRASH( image, ("parseMappedImage: unable to allocate image for '%s'", name) );
 
-	}  // end if
+	}
 
 	// parse the ini definition
 	ini->initFromINI( image, image->getFieldParse());
 
-}  // end parseMappedImage
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMiscAudio.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMiscAudio.cpp
deleted file mode 100644
index a5b2261de57..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMiscAudio.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/MiscAudio.h"
-#include "Common/INI.h"
-
-const FieldParse MiscAudio::m_fieldParseTable[] = 
-{ 
-	{ "RadarNotifyUnitUnderAttackSound",			INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarUnitUnderAttackSound ) },
-	{ "RadarNotifyHarvesterUnderAttackSound",	INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarHarvesterUnderAttackSound ) },
-	{ "RadarNotifyStructureUnderAttackSound", INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarStructureUnderAttackSound ) },
-	{ "RadarNotifyUnderAttackSound",					INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarUnderAttackSound ) },
-	{ "RadarNotifyInfiltrationSound",					INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarInfiltrationSound ) },
-	{ "RadarNotifyOnlineSound",								INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarOnlineSound ) },
-	{ "RadarNotifyOfflineSound",							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_radarOfflineSound ) },
-	{ "DefectorTimerTickSound",			  				INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_defectorTimerTickSound ) },
-	{ "DefectorTimerDingSound",			  				INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_defectorTimerDingSound ) },
-	{ "LockonTickSound",			  							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_lockonTickSound ) },
-	{ "AllCheerSound",												INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_allCheerSound )	},
-	{ "BattleCrySound",												INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_battleCrySound )	},
-	{ "GUIClickSound",												INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_guiClickSound )	},
-	{ "NoCanDoSound",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_noCanDoSound )	},
-	{ "StealthDiscoveredSound",								INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_stealthDiscoveredSound ) },
-	{ "StealthNeutralizedSound",							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_stealthNeutralizedSound ) },
-	{ "MoneyDepositSound",										INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_moneyDepositSound ) },
-	{ "MoneyWithdrawSound",										INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_moneyWithdrawSound ) },
-	{ "BuildingDisabled",											INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_buildingDisabled ) },
-	{ "BuildingReenabled",										INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_buildingReenabled ) },
-	{ "VehicleDisabled",											INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_vehicleDisabled ) },
-	{ "VehicleReenabled",											INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_vehicleReenabled ) },
-	{ "SplatterVehiclePilotsBrain",						INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_splatterVehiclePilotsBrain ) },
-	{ "TerroristInCarMoveVoice",							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_terroristInCarMoveVoice ) },
-	{ "TerroristInCarAttackVoice",						INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_terroristInCarAttackVoice ) },
-	{ "TerroristInCarSelectVoice",						INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_terroristInCarSelectVoice ) },
-	{ "CrateHeal",														INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateHeal ) },
-	{ "CrateShroud",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateShroud ) },
-	{ "CrateSalvage",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateSalvage ) },
-	{ "CrateFreeUnit",												INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateFreeUnit ) },
-	{ "CrateMoney",														INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateMoney ) },
-	{ "UnitPromoted",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_unitPromoted ) },
-	{ "RepairSparks",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_repairSparks ) },
-	{ "SabotageShutDownBuilding",							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_sabotageShutDownBuilding ) },
-	{ "SabotageResetTimeBuilding",						INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_sabotageResetTimerBuilding ) },
-  { "AircraftWheelScreech",									INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_aircraftWheelScreech ) },
-	
-	{ 0, 0, 0, 0 }
-};
-
-
-//-------------------------------------------------------------------------------------------------
-void INI::parseMiscAudio( INI *ini )
-{
-	ini->initFromINI(TheAudio->friend_getMiscAudio(), MiscAudio::m_fieldParseTable);
-}
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIModel.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIModel.cpp
index 243d8164fff..8c1c05aa542 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIModel.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIModel.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp
index 630523f4d19..380c5e2548f 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMultiplayer.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/MultiplayerSettings.h"
@@ -37,7 +37,7 @@ void INI::parseMultiplayerSettingsDefinition( INI* ini )
 {
 	if( TheMultiplayerSettings )
 	{
-		// 
+		//
 		// if the type of loading we're doing creates override data, we need to
 		// be loading into a new override item
 		//
@@ -45,12 +45,12 @@ void INI::parseMultiplayerSettingsDefinition( INI* ini )
 		{
 			DEBUG_ASSERTCRASH(false, ("Creating an override of MultiplayerSettings!"));
 		}
-	}  // end if
+	}
 	else
 	{
 		// we don't have any multiplayer settings instance at all yet, create one
 		TheMultiplayerSettings = NEW MultiplayerSettings;
-	}  // end else
+	}
 
 	// parse the ini definition
 	ini->initFromINI( TheMultiplayerSettings, TheMultiplayerSettings->getFieldParse() );
@@ -64,9 +64,9 @@ void INI::parseMultiplayerColorDefinition( INI* ini )
 
 	// read the name
 	c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
-	// find existing item if present, but this type does not allow overrides, 
+	// find existing item if present, but this type does not allow overrides,
 	//so if it exists just overwrite it.
 	multiplayerColorDefinition = TheMultiplayerSettings->findMultiplayerColorDefinitionByName( name );
 	if( multiplayerColorDefinition == NULL )
@@ -85,12 +85,12 @@ namespace
     Money money;
     Bool  isDefault;
   };
-  
-  const FieldParse startingMoneyFieldParseTable[] = 
+
+  const FieldParse startingMoneyFieldParseTable[] =
   {
     { "Value",			  Money::parseMoneyAmount,	NULL,	offsetof( MultiplayerStartingMoneySettings, money ) },
     { "Default",	   	INI::parseBool,         	NULL,	offsetof( MultiplayerStartingMoneySettings, isDefault ) },
-    { NULL,	NULL,	NULL,	0 }  // keep this last
+    { NULL,	NULL,	NULL,	0 }
   };
 }
 
@@ -98,12 +98,12 @@ namespace
 void INI::parseMultiplayerStartingMoneyChoiceDefinition( INI* ini )
 {
   DEBUG_ASSERTCRASH( ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES, ("Overrides not supported for MultiplayerStartingMoneyChoice") );
-  
+
   // Temporary data store
   MultiplayerStartingMoneySettings settings;
   settings.isDefault = false;
-  
+
   ini->initFromINI( &settings, startingMoneyFieldParseTable );
-  
+
   TheMultiplayerSettings->addStartingMoneyChoice( settings.money, settings.isDefault );
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIObject.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIObject.cpp
index d6d6f5c7952..ff4cb3141d2 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIObject.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIObject.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/ThingTemplate.h"
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIParticleSys.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIParticleSys.cpp
index 915f9949f2e..617f3963638 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIParticleSys.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIParticleSys.cpp
@@ -27,14 +27,14 @@
 // Desc:   Parsing Particle System INI entries
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/ParticleSys.h"
 
 
-/** 
- * Parse entry 
+/**
+ * Parse entry
  */
 void INI::parseParticleSystemDefinition( INI* ini )
 {
@@ -42,7 +42,7 @@ void INI::parseParticleSystemDefinition( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
 	ParticleSystemTemplate *sysTemplate = const_cast<ParticleSystemTemplate*>(TheParticleSystemManager->findTemplate( name ));
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INISpecialPower.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INISpecialPower.cpp
index 7c53af6c9f1..ea76fd7ef7f 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INISpecialPower.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INISpecialPower.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/SpecialPower.h"
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INITerrain.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INITerrain.cpp
index ba4fe206e5f..ae6e2c92815 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INITerrain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INITerrain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/TerrainTypes.h"
@@ -43,7 +43,7 @@ void INI::parseTerrainDefinition( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
 	terrainType = TheTerrainTypes->findTerrain( name );
@@ -51,12 +51,12 @@ void INI::parseTerrainDefinition( INI* ini )
 		terrainType = TheTerrainTypes->newTerrain( name );
 
 	// sanity
-	DEBUG_ASSERTCRASH( terrainType, ("Unable to allocate terrain type '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( terrainType, ("Unable to allocate terrain type '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( terrainType, terrainType->getFieldParse() );
 
-}  // end parseTerrain
+}
 
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INITerrainBridge.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INITerrainBridge.cpp
index 7d1f4542263..3ad8a5d3eed 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INITerrainBridge.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INITerrainBridge.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/TerrainRoads.h"
@@ -43,7 +43,7 @@ void INI::parseTerrainBridgeDefinition( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present or allocate new one
 	bridge = TheTerrainRoads->findBridge( name );
@@ -53,21 +53,21 @@ void INI::parseTerrainBridgeDefinition( INI* ini )
 	{
 
 		// sanity
-		DEBUG_ASSERTCRASH( bridge->isBridge(), ("Redefining road '%s' as a bridge!\n", 
+		DEBUG_ASSERTCRASH( bridge->isBridge(), ("Redefining road '%s' as a bridge!",
 											 bridge->getName().str()) );
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
-	if( bridge == NULL )	
+	if( bridge == NULL )
 		bridge = TheTerrainRoads->newBridge( name );
 
-	DEBUG_ASSERTCRASH( bridge, ("Unable to allcoate bridge '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( bridge, ("Unable to allcoate bridge '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( bridge, bridge->getBridgeFieldParse() );
 
-}  // end parseTerrainBridge
+}
 
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INITerrainRoad.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INITerrainRoad.cpp
index 16d579b0abd..99b5ec9ebf8 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INITerrainRoad.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INITerrainRoad.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/TerrainRoads.h"
@@ -43,7 +43,7 @@ void INI::parseTerrainRoadDefinition( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present or allocate new one
 	road = TheTerrainRoads->findRoad( name );
@@ -53,21 +53,21 @@ void INI::parseTerrainRoadDefinition( INI* ini )
 	{
 
 		// sanity
-		DEBUG_ASSERTCRASH( road->isBridge() == FALSE, ("Redefining bridge '%s' as a road!\n", 
+		DEBUG_ASSERTCRASH( road->isBridge() == FALSE, ("Redefining bridge '%s' as a road!",
 											 road->getName().str()) );
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
-	if( road == NULL )	
+	if( road == NULL )
 		road = TheTerrainRoads->newRoad( name );
 
-	DEBUG_ASSERTCRASH( road, ("Unable to allocate road '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( road, ("Unable to allocate road '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( road, road->getRoadFieldParse() );
 
-}  // end parseTerrainRoad
+}
 
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIUpgrade.cpp
index 387d4ae943c..2bbfee5dc20 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/Upgrade.h"
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIVideo.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIVideo.cpp
deleted file mode 100644
index b25e495b2db..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIVideo.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: INIVideo.cpp /////////////////////////////////////////////////////////////////////////////
-// Author: John McDonald, February 2002
-// Desc:   Parsing Video INI entries
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/INI.h"
-#include "GameClient/VideoPlayer.h"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-/** Parse Music entry */
-//-------------------------------------------------------------------------------------------------
-void INI::parseVideoDefinition( INI* ini )
-{
-	// read the name
-	const char* c = ini->getNextToken();
-
-	Video video;
-	video.m_internalName.set( c );
-
-	ini->initFromINI(&video, TheVideoPlayer->getFieldParse() );
-	TheVideoPlayer->addVideo(&video);
-
-
-}  // end parseVideoDefinition
-
-
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWater.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWater.cpp
index 766b3141275..d3894bf3eac 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWater.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWater.cpp
@@ -24,11 +24,11 @@
 
 // FILE: INIWater.cpp /////////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, December 2001
-// Desc:   Water settings 
+// Desc:   Water settings
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_TIME_OF_DAY_NAMES
 
@@ -57,7 +57,7 @@ void INI::parseWaterSettingDefinition( INI* ini )
 	name.set( token );
 
 	// get the water setting we want to load based on name
-	const char **timeOfDayName = TimeOfDayNames;
+	const char *const *timeOfDayName = TimeOfDayNames;
 	Int timeOfDayIndex = 0;  // TIME_OF_DAY_INVALID
 	while( timeOfDayName && *timeOfDayName )
 	{
@@ -68,13 +68,13 @@ void INI::parseWaterSettingDefinition( INI* ini )
 			waterSetting = &WaterSettings[ timeOfDayIndex ];
 			break;
 
-		}  // end if
+		}
 
 		// next name
 		timeOfDayName++;
 		timeOfDayIndex++;
 
-	}  // end while
+	}
 
 	// check for no time of day match
 	if( waterSetting == NULL )
@@ -83,7 +83,7 @@ void INI::parseWaterSettingDefinition( INI* ini )
 	// parse the data
 	ini->initFromINI( waterSetting, waterSetting->getFieldParse() );
 
-}  // end parseWaterSetting
+}
 
 //-------------------------------------------------------------------------------------------------
 void INI::parseWaterTransparencyDefinition( INI *ini )
@@ -107,7 +107,7 @@ void INI::parseWaterTransparencyDefinition( INI *ini )
 	waterTrans = (WaterTransparencySetting*) (waterTrans->friend_getFinalOverride());
 	// parse the data
 	ini->initFromINI( waterTrans, TheWaterTransparency->getFieldParse() );
-	
+
 	// If we overrode any skybox textures, then call the W3D Water stuff.
 	if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES) {
 		// Check to see if we overrode any skybox textures.
@@ -120,7 +120,7 @@ void INI::parseWaterTransparencyDefinition( INI *ini )
 		const WaterTransparencySetting* wtOriginal = TheWaterTransparency.getNonOverloadedPointer();
 		OVERRIDE<WaterTransparencySetting> wtOverride = TheWaterTransparency;
 
-		if (wtOriginal == wtOverride) 
+		if (wtOriginal == wtOverride)
 			return;
 
 		const AsciiString *oldTextures[5],*newTextures[5];
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWeapon.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWeapon.cpp
index b303b682269..bf439d7ec73 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWeapon.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWeapon.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameLogic/Weapon.h"
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp
index b529e9e8447..8efd3aef39f 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIWebpageURL.cpp
@@ -28,17 +28,12 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/Registry.h"
 #include "GameNetwork/WOLBrowser/WebBrowser.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -109,7 +104,7 @@ void INI::parseWebpageURLDefinition( INI* ini )
 
 //	}  // end if
 
-//	DEBUG_ASSERTCRASH( track, ("parseMusicTrackDefinition: Unable to allocate track '%s'\n",
+//	DEBUG_ASSERTCRASH( track, ("parseMusicTrackDefinition: Unable to allocate track '%s'",
 //										 name.str()) );
 
 	// parse the ini definition
@@ -121,8 +116,8 @@ void INI::parseWebpageURLDefinition( INI* ini )
 		getcwd(cwd, _MAX_PATH);
 
 		url->m_url.format("file://%s\\Data\\%s\\%s", encodeURL(cwd).str(), GetRegistryLanguage().str(), url->m_url.str()+7);
-		DEBUG_LOG(("INI::parseWebpageURLDefinition() - converted URL to [%s]\n", url->m_url.str()));
+		DEBUG_LOG(("INI::parseWebpageURLDefinition() - converted URL to [%s]", url->m_url.str()));
 	}
-}  // end parseMusicTrackDefinition
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Language.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Language.cpp
index 991cae98fa6..679d89d42f0 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/Language.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/Language.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Language.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -46,7 +46,7 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Language.h"
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp
index 702add5f2a1..1acee2d16fa 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp
@@ -26,7 +26,7 @@
 // Implementation of the message stream
 // Author: Michael S. Booth, February 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/MessageStream.h"
 #include "Common/Player.h"
@@ -42,11 +42,6 @@ CommandList *TheCommandList = NULL;
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
@@ -57,22 +52,22 @@ CommandList *TheCommandList = NULL;
 /**
  * Constructor
  */
-GameMessage::GameMessage( GameMessage::Type type ) 
-{ 
+GameMessage::GameMessage( GameMessage::Type type )
+{
 	m_playerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();
-	m_type = type; 
+	m_type = type;
 	m_argList = NULL;
 	m_argTail = NULL;
-	m_argCount = 0; 
-	m_list = 0; 
+	m_argCount = 0;
+	m_list = 0;
 }
 
 
 /**
  * Destructor
  */
-GameMessage::~GameMessage( ) 
-{ 
+GameMessage::~GameMessage( )
+{
 	// free all arguments
 	GameMessageArgument *arg, *nextArg;
 
@@ -126,10 +121,10 @@ GameMessageArgumentDataType GameMessage::getArgumentDataType( Int argIndex )
 /**
  * Allocate a new argument, add it to the argument list, and increment the total arg count
  */
-GameMessageArgument *GameMessage::allocArg( void ) 
-{ 
+GameMessageArgument *GameMessage::allocArg( void )
+{
 	// allocate a new argument
-	GameMessageArgument *arg = newInstance(GameMessageArgument); 
+	GameMessageArgument *arg = newInstance(GameMessageArgument);
 
 	// add to end of argument list
 	if (m_argTail)
@@ -228,461 +223,481 @@ void GameMessage::appendWideCharArgument( const WideChar& arg )
 	a->m_type = ARGUMENTDATATYPE_WIDECHAR;
 }
 
-AsciiString GameMessage::getCommandAsAsciiString( void )
+const char *GameMessage::getCommandAsString( void ) const
 {
-	return getCommandTypeAsAsciiString(m_type);
+	return getCommandTypeAsString(m_type);
 }
 
-AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t)
+const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 {
-#define CHECK_IF(x) if (t == x) { return #x; }
-	AsciiString commandName = "UnknownMessage";
-	if (t >= GameMessage::MSG_COUNT)
-	{
-		commandName = "Invalid command";
-	}
-	CHECK_IF(MSG_INVALID)
-	CHECK_IF(MSG_FRAME_TICK)
-	CHECK_IF(MSG_RAW_MOUSE_BEGIN)
-	CHECK_IF(MSG_RAW_MOUSE_POSITION)
-	CHECK_IF(MSG_RAW_MOUSE_LEFT_BUTTON_DOWN)
-	CHECK_IF(MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK)
-	CHECK_IF(MSG_RAW_MOUSE_LEFT_BUTTON_UP)
-	CHECK_IF(MSG_RAW_MOUSE_LEFT_CLICK)
-	CHECK_IF(MSG_RAW_MOUSE_LEFT_DRAG)
-	CHECK_IF(MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN)
-	CHECK_IF(MSG_RAW_MOUSE_MIDDLE_DOUBLE_CLICK)
-	CHECK_IF(MSG_RAW_MOUSE_MIDDLE_BUTTON_UP)
-	CHECK_IF(MSG_RAW_MOUSE_MIDDLE_DRAG)
-	CHECK_IF(MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN)
-	CHECK_IF(MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK)
-	CHECK_IF(MSG_RAW_MOUSE_RIGHT_BUTTON_UP)
-	CHECK_IF(MSG_RAW_MOUSE_RIGHT_DRAG)
-	CHECK_IF(MSG_RAW_MOUSE_WHEEL)
-	CHECK_IF(MSG_RAW_MOUSE_END)
-	CHECK_IF(MSG_RAW_KEY_DOWN)
-	CHECK_IF(MSG_RAW_KEY_UP)
-	CHECK_IF(MSG_MOUSE_LEFT_CLICK)
-	CHECK_IF(MSG_MOUSE_LEFT_DOUBLE_CLICK)
-	CHECK_IF(MSG_MOUSE_MIDDLE_CLICK)
-	CHECK_IF(MSG_MOUSE_MIDDLE_DOUBLE_CLICK)
-	CHECK_IF(MSG_MOUSE_RIGHT_CLICK)
-	CHECK_IF(MSG_MOUSE_RIGHT_DOUBLE_CLICK)
-	CHECK_IF(MSG_CLEAR_GAME_DATA)
-	CHECK_IF(MSG_NEW_GAME)
-	CHECK_IF(MSG_BEGIN_META_MESSAGES)
-	CHECK_IF(MSG_META_SAVE_VIEW1)
-	CHECK_IF(MSG_META_SAVE_VIEW2)
-	CHECK_IF(MSG_META_SAVE_VIEW3)
-	CHECK_IF(MSG_META_SAVE_VIEW4)
-	CHECK_IF(MSG_META_SAVE_VIEW5)
-	CHECK_IF(MSG_META_SAVE_VIEW6)
-	CHECK_IF(MSG_META_SAVE_VIEW7)
-	CHECK_IF(MSG_META_SAVE_VIEW8)
-	CHECK_IF(MSG_META_VIEW_VIEW1)
-	CHECK_IF(MSG_META_VIEW_VIEW2)
-	CHECK_IF(MSG_META_VIEW_VIEW3)
-	CHECK_IF(MSG_META_VIEW_VIEW4)
-	CHECK_IF(MSG_META_VIEW_VIEW5)
-	CHECK_IF(MSG_META_VIEW_VIEW6)
-	CHECK_IF(MSG_META_VIEW_VIEW7)
-	CHECK_IF(MSG_META_VIEW_VIEW8)
-	CHECK_IF(MSG_META_CREATE_TEAM0)
-	CHECK_IF(MSG_META_CREATE_TEAM1)
-	CHECK_IF(MSG_META_CREATE_TEAM2)
-	CHECK_IF(MSG_META_CREATE_TEAM3)
-	CHECK_IF(MSG_META_CREATE_TEAM4)
-	CHECK_IF(MSG_META_CREATE_TEAM5)
-	CHECK_IF(MSG_META_CREATE_TEAM6)
-	CHECK_IF(MSG_META_CREATE_TEAM7)
-	CHECK_IF(MSG_META_CREATE_TEAM8)
-	CHECK_IF(MSG_META_CREATE_TEAM9)
-	CHECK_IF(MSG_META_SELECT_TEAM0)
-	CHECK_IF(MSG_META_SELECT_TEAM1)
-	CHECK_IF(MSG_META_SELECT_TEAM2)
-	CHECK_IF(MSG_META_SELECT_TEAM3)
-	CHECK_IF(MSG_META_SELECT_TEAM4)
-	CHECK_IF(MSG_META_SELECT_TEAM5)
-	CHECK_IF(MSG_META_SELECT_TEAM6)
-	CHECK_IF(MSG_META_SELECT_TEAM7)
-	CHECK_IF(MSG_META_SELECT_TEAM8)
-	CHECK_IF(MSG_META_SELECT_TEAM9)
-	CHECK_IF(MSG_META_ADD_TEAM0)
-	CHECK_IF(MSG_META_ADD_TEAM1)
-	CHECK_IF(MSG_META_ADD_TEAM2)
-	CHECK_IF(MSG_META_ADD_TEAM3)
-	CHECK_IF(MSG_META_ADD_TEAM4)
-	CHECK_IF(MSG_META_ADD_TEAM5)
-	CHECK_IF(MSG_META_ADD_TEAM6)
-	CHECK_IF(MSG_META_ADD_TEAM7)
-	CHECK_IF(MSG_META_ADD_TEAM8)
-	CHECK_IF(MSG_META_ADD_TEAM9)
-	CHECK_IF(MSG_META_VIEW_TEAM0)
-	CHECK_IF(MSG_META_VIEW_TEAM1)
-	CHECK_IF(MSG_META_VIEW_TEAM2)
-	CHECK_IF(MSG_META_VIEW_TEAM3)
-	CHECK_IF(MSG_META_VIEW_TEAM4)
-	CHECK_IF(MSG_META_VIEW_TEAM5)
-	CHECK_IF(MSG_META_VIEW_TEAM6)
-	CHECK_IF(MSG_META_VIEW_TEAM7)
-	CHECK_IF(MSG_META_VIEW_TEAM8)
-	CHECK_IF(MSG_META_VIEW_TEAM9)
-	CHECK_IF(MSG_META_SELECT_MATCHING_UNITS)
-	CHECK_IF(MSG_META_SELECT_NEXT_UNIT)
-	CHECK_IF(MSG_META_SELECT_PREV_UNIT)
-	CHECK_IF(MSG_META_SELECT_NEXT_WORKER)
-	CHECK_IF(MSG_META_SELECT_PREV_WORKER)
-	CHECK_IF(MSG_META_VIEW_COMMAND_CENTER)
-	CHECK_IF(MSG_META_VIEW_LAST_RADAR_EVENT)
-	CHECK_IF(MSG_META_SELECT_HERO)
-	CHECK_IF(MSG_META_SELECT_ALL)
-	CHECK_IF(MSG_META_SELECT_ALL_AIRCRAFT)
-	CHECK_IF(MSG_META_SCATTER)
-	CHECK_IF(MSG_META_STOP)
-	CHECK_IF(MSG_META_DEPLOY)
-	CHECK_IF(MSG_META_CREATE_FORMATION)
-	CHECK_IF(MSG_META_FOLLOW)
-	CHECK_IF(MSG_META_CHAT_PLAYERS)
-	CHECK_IF(MSG_META_CHAT_ALLIES)
-	CHECK_IF(MSG_META_CHAT_EVERYONE)
-	CHECK_IF(MSG_META_DIPLOMACY)
-	CHECK_IF(MSG_META_OPTIONS)
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	CHECK_IF(MSG_META_HELP)
+#define CASE_LABEL(x) case x: return #x;
+
+	switch (t) {
+	default: return (t >= GameMessage::MSG_COUNT) ? "Invalid command" : "UnknownMessage";
+
+	CASE_LABEL(MSG_INVALID)
+	CASE_LABEL(MSG_FRAME_TICK)
+	CASE_LABEL(MSG_RAW_MOUSE_BEGIN)
+	CASE_LABEL(MSG_RAW_MOUSE_POSITION)
+	CASE_LABEL(MSG_RAW_MOUSE_LEFT_BUTTON_DOWN)
+	CASE_LABEL(MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK)
+	CASE_LABEL(MSG_RAW_MOUSE_LEFT_BUTTON_UP)
+	CASE_LABEL(MSG_RAW_MOUSE_LEFT_CLICK)
+	CASE_LABEL(MSG_RAW_MOUSE_LEFT_DRAG)
+	CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN)
+	CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_DOUBLE_CLICK)
+	CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_BUTTON_UP)
+	CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_DRAG)
+	CASE_LABEL(MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN)
+	CASE_LABEL(MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK)
+	CASE_LABEL(MSG_RAW_MOUSE_RIGHT_BUTTON_UP)
+	CASE_LABEL(MSG_RAW_MOUSE_RIGHT_DRAG)
+	CASE_LABEL(MSG_RAW_MOUSE_WHEEL)
+	CASE_LABEL(MSG_RAW_MOUSE_END)
+	CASE_LABEL(MSG_RAW_KEY_DOWN)
+	CASE_LABEL(MSG_RAW_KEY_UP)
+	CASE_LABEL(MSG_MOUSE_LEFT_CLICK)
+	CASE_LABEL(MSG_MOUSE_LEFT_DOUBLE_CLICK)
+	CASE_LABEL(MSG_MOUSE_MIDDLE_CLICK)
+	CASE_LABEL(MSG_MOUSE_MIDDLE_DOUBLE_CLICK)
+	CASE_LABEL(MSG_MOUSE_RIGHT_CLICK)
+	CASE_LABEL(MSG_MOUSE_RIGHT_DOUBLE_CLICK)
+	CASE_LABEL(MSG_CLEAR_GAME_DATA)
+	CASE_LABEL(MSG_NEW_GAME)
+	CASE_LABEL(MSG_BEGIN_META_MESSAGES)
+	CASE_LABEL(MSG_META_SAVE_VIEW1)
+	CASE_LABEL(MSG_META_SAVE_VIEW2)
+	CASE_LABEL(MSG_META_SAVE_VIEW3)
+	CASE_LABEL(MSG_META_SAVE_VIEW4)
+	CASE_LABEL(MSG_META_SAVE_VIEW5)
+	CASE_LABEL(MSG_META_SAVE_VIEW6)
+	CASE_LABEL(MSG_META_SAVE_VIEW7)
+	CASE_LABEL(MSG_META_SAVE_VIEW8)
+	CASE_LABEL(MSG_META_VIEW_VIEW1)
+	CASE_LABEL(MSG_META_VIEW_VIEW2)
+	CASE_LABEL(MSG_META_VIEW_VIEW3)
+	CASE_LABEL(MSG_META_VIEW_VIEW4)
+	CASE_LABEL(MSG_META_VIEW_VIEW5)
+	CASE_LABEL(MSG_META_VIEW_VIEW6)
+	CASE_LABEL(MSG_META_VIEW_VIEW7)
+	CASE_LABEL(MSG_META_VIEW_VIEW8)
+	CASE_LABEL(MSG_META_CREATE_TEAM0)
+	CASE_LABEL(MSG_META_CREATE_TEAM1)
+	CASE_LABEL(MSG_META_CREATE_TEAM2)
+	CASE_LABEL(MSG_META_CREATE_TEAM3)
+	CASE_LABEL(MSG_META_CREATE_TEAM4)
+	CASE_LABEL(MSG_META_CREATE_TEAM5)
+	CASE_LABEL(MSG_META_CREATE_TEAM6)
+	CASE_LABEL(MSG_META_CREATE_TEAM7)
+	CASE_LABEL(MSG_META_CREATE_TEAM8)
+	CASE_LABEL(MSG_META_CREATE_TEAM9)
+	CASE_LABEL(MSG_META_SELECT_TEAM0)
+	CASE_LABEL(MSG_META_SELECT_TEAM1)
+	CASE_LABEL(MSG_META_SELECT_TEAM2)
+	CASE_LABEL(MSG_META_SELECT_TEAM3)
+	CASE_LABEL(MSG_META_SELECT_TEAM4)
+	CASE_LABEL(MSG_META_SELECT_TEAM5)
+	CASE_LABEL(MSG_META_SELECT_TEAM6)
+	CASE_LABEL(MSG_META_SELECT_TEAM7)
+	CASE_LABEL(MSG_META_SELECT_TEAM8)
+	CASE_LABEL(MSG_META_SELECT_TEAM9)
+	CASE_LABEL(MSG_META_ADD_TEAM0)
+	CASE_LABEL(MSG_META_ADD_TEAM1)
+	CASE_LABEL(MSG_META_ADD_TEAM2)
+	CASE_LABEL(MSG_META_ADD_TEAM3)
+	CASE_LABEL(MSG_META_ADD_TEAM4)
+	CASE_LABEL(MSG_META_ADD_TEAM5)
+	CASE_LABEL(MSG_META_ADD_TEAM6)
+	CASE_LABEL(MSG_META_ADD_TEAM7)
+	CASE_LABEL(MSG_META_ADD_TEAM8)
+	CASE_LABEL(MSG_META_ADD_TEAM9)
+	CASE_LABEL(MSG_META_VIEW_TEAM0)
+	CASE_LABEL(MSG_META_VIEW_TEAM1)
+	CASE_LABEL(MSG_META_VIEW_TEAM2)
+	CASE_LABEL(MSG_META_VIEW_TEAM3)
+	CASE_LABEL(MSG_META_VIEW_TEAM4)
+	CASE_LABEL(MSG_META_VIEW_TEAM5)
+	CASE_LABEL(MSG_META_VIEW_TEAM6)
+	CASE_LABEL(MSG_META_VIEW_TEAM7)
+	CASE_LABEL(MSG_META_VIEW_TEAM8)
+	CASE_LABEL(MSG_META_VIEW_TEAM9)
+	CASE_LABEL(MSG_META_SELECT_MATCHING_UNITS)
+	CASE_LABEL(MSG_META_SELECT_NEXT_UNIT)
+	CASE_LABEL(MSG_META_SELECT_PREV_UNIT)
+	CASE_LABEL(MSG_META_SELECT_NEXT_WORKER)
+	CASE_LABEL(MSG_META_SELECT_PREV_WORKER)
+	CASE_LABEL(MSG_META_VIEW_COMMAND_CENTER)
+	CASE_LABEL(MSG_META_VIEW_LAST_RADAR_EVENT)
+	CASE_LABEL(MSG_META_SELECT_HERO)
+	CASE_LABEL(MSG_META_SELECT_ALL)
+	CASE_LABEL(MSG_META_SELECT_ALL_AIRCRAFT)
+	CASE_LABEL(MSG_META_SCATTER)
+	CASE_LABEL(MSG_META_STOP)
+	CASE_LABEL(MSG_META_DEPLOY)
+	CASE_LABEL(MSG_META_CREATE_FORMATION)
+	CASE_LABEL(MSG_META_FOLLOW)
+	CASE_LABEL(MSG_META_CHAT_PLAYERS)
+	CASE_LABEL(MSG_META_CHAT_ALLIES)
+	CASE_LABEL(MSG_META_CHAT_EVERYONE)
+	CASE_LABEL(MSG_META_DIPLOMACY)
+	CASE_LABEL(MSG_META_OPTIONS)
+
+#if defined(RTS_DEBUG)
+	CASE_LABEL(MSG_META_HELP)
 #endif
-	CHECK_IF(MSG_META_TOGGLE_LOWER_DETAILS)
-	CHECK_IF(MSG_META_TOGGLE_CONTROL_BAR)
-	CHECK_IF(MSG_META_BEGIN_PATH_BUILD)
-	CHECK_IF(MSG_META_END_PATH_BUILD)
-	CHECK_IF(MSG_META_BEGIN_FORCEATTACK)
-	CHECK_IF(MSG_META_END_FORCEATTACK)
-	CHECK_IF(MSG_META_BEGIN_FORCEMOVE)
-	CHECK_IF(MSG_META_END_FORCEMOVE)
-	CHECK_IF(MSG_META_BEGIN_WAYPOINTS)
-	CHECK_IF(MSG_META_END_WAYPOINTS)
-	CHECK_IF(MSG_META_BEGIN_PREFER_SELECTION)
-	CHECK_IF(MSG_META_END_PREFER_SELECTION)
-	CHECK_IF(MSG_META_TAKE_SCREENSHOT)
-	CHECK_IF(MSG_META_ALL_CHEER)
-	CHECK_IF(MSG_META_TOGGLE_ATTACKMOVE)
-	CHECK_IF(MSG_META_BEGIN_CAMERA_ROTATE_LEFT)
-	CHECK_IF(MSG_META_END_CAMERA_ROTATE_LEFT)
-	CHECK_IF(MSG_META_BEGIN_CAMERA_ROTATE_RIGHT)
-	CHECK_IF(MSG_META_END_CAMERA_ROTATE_RIGHT)
-	CHECK_IF(MSG_META_BEGIN_CAMERA_ZOOM_IN)
-	CHECK_IF(MSG_META_END_CAMERA_ZOOM_IN)
-	CHECK_IF(MSG_META_BEGIN_CAMERA_ZOOM_OUT)
-	CHECK_IF(MSG_META_END_CAMERA_ZOOM_OUT)
-	CHECK_IF(MSG_META_CAMERA_RESET)
-	CHECK_IF(MSG_META_TOGGLE_CAMERA_TRACKING_DRAWABLE)
-	CHECK_IF(MSG_META_DEMO_INSTANT_QUIT)
 
+	CASE_LABEL(MSG_META_INCREASE_MAX_RENDER_FPS)
+	CASE_LABEL(MSG_META_DECREASE_MAX_RENDER_FPS)
+	CASE_LABEL(MSG_META_INCREASE_LOGIC_TIME_SCALE)
+	CASE_LABEL(MSG_META_DECREASE_LOGIC_TIME_SCALE)
+	CASE_LABEL(MSG_META_TOGGLE_LOWER_DETAILS)
+	CASE_LABEL(MSG_META_TOGGLE_CONTROL_BAR)
+	CASE_LABEL(MSG_META_TOGGLE_PLAYER_OBSERVER)
+	CASE_LABEL(MSG_META_BEGIN_PATH_BUILD)
+	CASE_LABEL(MSG_META_END_PATH_BUILD)
+	CASE_LABEL(MSG_META_BEGIN_FORCEATTACK)
+	CASE_LABEL(MSG_META_END_FORCEATTACK)
+	CASE_LABEL(MSG_META_BEGIN_FORCEMOVE)
+	CASE_LABEL(MSG_META_END_FORCEMOVE)
+	CASE_LABEL(MSG_META_BEGIN_WAYPOINTS)
+	CASE_LABEL(MSG_META_END_WAYPOINTS)
+	CASE_LABEL(MSG_META_BEGIN_PREFER_SELECTION)
+	CASE_LABEL(MSG_META_END_PREFER_SELECTION)
+	CASE_LABEL(MSG_META_TAKE_SCREENSHOT)
+	CASE_LABEL(MSG_META_ALL_CHEER)
+	CASE_LABEL(MSG_META_TOGGLE_ATTACKMOVE)
+	CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_LEFT)
+	CASE_LABEL(MSG_META_END_CAMERA_ROTATE_LEFT)
+	CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_RIGHT)
+	CASE_LABEL(MSG_META_END_CAMERA_ROTATE_RIGHT)
+	CASE_LABEL(MSG_META_BEGIN_CAMERA_ZOOM_IN)
+	CASE_LABEL(MSG_META_END_CAMERA_ZOOM_IN)
+	CASE_LABEL(MSG_META_BEGIN_CAMERA_ZOOM_OUT)
+	CASE_LABEL(MSG_META_END_CAMERA_ZOOM_OUT)
+	CASE_LABEL(MSG_META_CAMERA_RESET)
+	CASE_LABEL(MSG_META_TOGGLE_CAMERA_TRACKING_DRAWABLE)
+	CASE_LABEL(MSG_META_DEMO_INSTANT_QUIT)
 
 #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h
-    CHECK_IF(MSG_CHEAT_RUNSCRIPT1)
-		CHECK_IF(MSG_CHEAT_RUNSCRIPT2)
-		CHECK_IF(MSG_CHEAT_RUNSCRIPT3)
-		CHECK_IF(MSG_CHEAT_RUNSCRIPT4)
-		CHECK_IF(MSG_CHEAT_RUNSCRIPT5)
-		CHECK_IF(MSG_CHEAT_RUNSCRIPT6)
-		CHECK_IF(MSG_CHEAT_RUNSCRIPT7)
-		CHECK_IF(MSG_CHEAT_RUNSCRIPT8)
-		CHECK_IF(MSG_CHEAT_RUNSCRIPT9)
-		CHECK_IF(MSG_CHEAT_TOGGLE_SPECIAL_POWER_DELAYS)
-		CHECK_IF(MSG_CHEAT_SWITCH_TEAMS)							
-		CHECK_IF(MSG_CHEAT_KILL_SELECTION)						
-		CHECK_IF(MSG_CHEAT_TOGGLE_HAND_OF_GOD_MODE)	
-		CHECK_IF(MSG_CHEAT_INSTANT_BUILD)						
-		CHECK_IF(MSG_CHEAT_DESHROUD)									
-		CHECK_IF(MSG_CHEAT_ADD_CASH)									
-		CHECK_IF(MSG_CHEAT_GIVE_ALL_SCIENCES)				
-		CHECK_IF(MSG_CHEAT_GIVE_SCIENCEPURCHASEPOINTS)
-    CHECK_IF(MSG_CHEAT_SHOW_HEALTH)
-    CHECK_IF(MSG_CHEAT_TOGGLE_MESSAGE_TEXT)
+	CASE_LABEL(MSG_CHEAT_RUNSCRIPT1)
+	CASE_LABEL(MSG_CHEAT_RUNSCRIPT2)
+	CASE_LABEL(MSG_CHEAT_RUNSCRIPT3)
+	CASE_LABEL(MSG_CHEAT_RUNSCRIPT4)
+	CASE_LABEL(MSG_CHEAT_RUNSCRIPT5)
+	CASE_LABEL(MSG_CHEAT_RUNSCRIPT6)
+	CASE_LABEL(MSG_CHEAT_RUNSCRIPT7)
+	CASE_LABEL(MSG_CHEAT_RUNSCRIPT8)
+	CASE_LABEL(MSG_CHEAT_RUNSCRIPT9)
+	CASE_LABEL(MSG_CHEAT_TOGGLE_SPECIAL_POWER_DELAYS)
+	CASE_LABEL(MSG_CHEAT_SWITCH_TEAMS)
+	CASE_LABEL(MSG_CHEAT_KILL_SELECTION)
+	CASE_LABEL(MSG_CHEAT_TOGGLE_HAND_OF_GOD_MODE)
+	CASE_LABEL(MSG_CHEAT_INSTANT_BUILD)
+	CASE_LABEL(MSG_CHEAT_DESHROUD)
+	CASE_LABEL(MSG_CHEAT_ADD_CASH)
+	CASE_LABEL(MSG_CHEAT_GIVE_ALL_SCIENCES)
+	CASE_LABEL(MSG_CHEAT_GIVE_SCIENCEPURCHASEPOINTS)
+	CASE_LABEL(MSG_CHEAT_SHOW_HEALTH)
+	CASE_LABEL(MSG_CHEAT_TOGGLE_MESSAGE_TEXT)
+#endif
 
+	CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY)
+	CASE_LABEL(MSG_META_TOGGLE_PAUSE)
+	CASE_LABEL(MSG_META_TOGGLE_PAUSE_ALT)
+	CASE_LABEL(MSG_META_STEP_FRAME)
+	CASE_LABEL(MSG_META_STEP_FRAME_ALT)
+
+#if defined(RTS_DEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_LETTERBOX)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_MESSAGE_TEXT)
+	CASE_LABEL(MSG_META_DEMO_LOD_DECREASE)
+	CASE_LABEL(MSG_META_DEMO_LOD_INCREASE)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_ZOOM_LOCK)
+	CASE_LABEL(MSG_META_DEMO_PLAY_CAMEO_MOVIE)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_SPECIAL_POWER_DELAYS)
+	CASE_LABEL(MSG_META_DEMO_BATTLE_CRY)
+	CASE_LABEL(MSG_META_DEMO_SWITCH_TEAMS)
+	CASE_LABEL(MSG_META_DEMO_SWITCH_TEAMS_BETWEEN_CHINA_USA)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_PARTICLEDEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_SHADOW_VOLUMES)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_FOGOFWAR)
+	CASE_LABEL(MSG_META_DEMO_KILL_ALL_ENEMIES)
+	CASE_LABEL(MSG_META_DEMO_KILL_SELECTION)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_HURT_ME_MODE)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_HAND_OF_GOD_MODE)
+	CASE_LABEL(MSG_META_DEMO_DEBUG_SELECTION)
+	CASE_LABEL(MSG_META_DEMO_LOCK_CAMERA_TO_SELECTION)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_SOUND)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_TRACKMARKS)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_WATERPLANE)
+	CASE_LABEL(MSG_META_DEMO_TIME_OF_DAY)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_MUSIC)
+	CASE_LABEL(MSG_META_DEMO_MUSIC_NEXT_TRACK)
+	CASE_LABEL(MSG_META_DEMO_MUSIC_PREV_TRACK)
+	CASE_LABEL(MSG_META_DEMO_NEXT_OBJECTIVE_MOVIE)
+	CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE1)
+	CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE2)
+	CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE3)
+	CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE4)
+	CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE5)
+	CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE6)
+	CASE_LABEL(MSG_META_DEMO_BEGIN_ADJUST_PITCH)
+	CASE_LABEL(MSG_META_DEMO_END_ADJUST_PITCH)
+	CASE_LABEL(MSG_META_DEMO_BEGIN_ADJUST_FOV)
+	CASE_LABEL(MSG_META_DEMO_END_ADJUST_FOV)
+	CASE_LABEL(MSG_META_DEMO_LOCK_CAMERA_TO_PLANES)
+	CASE_LABEL(MSG_META_DEMO_REMOVE_PREREQ)
+	CASE_LABEL(MSG_META_DEMO_INSTANT_BUILD)
+	CASE_LABEL(MSG_META_DEMO_FREE_BUILD)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT1)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT2)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT3)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT4)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT5)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT6)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT7)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT8)
+	CASE_LABEL(MSG_META_DEMO_RUNSCRIPT9)
+	CASE_LABEL(MSG_META_DEMO_ENSHROUD)
+	CASE_LABEL(MSG_META_DEMO_DESHROUD)
+	CASE_LABEL(MSG_META_DEBUG_SHOW_EXTENTS)
+	CASE_LABEL(MSG_META_DEBUG_SHOW_AUDIO_LOCATIONS)
+	CASE_LABEL(MSG_META_DEBUG_SHOW_HEALTH)
+	CASE_LABEL(MSG_META_DEBUG_GIVE_VETERANCY)
+	CASE_LABEL(MSG_META_DEBUG_TAKE_VETERANCY)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_AI_DEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_SUPPLY_CENTER_PLACEMENT)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_CAMERA_DEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_AVI)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_BW_VIEW)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_RED_VIEW)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_GREEN_VIEW)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_MOTION_BLUR_ZOOM)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_MILITARY_SUBTITLES)
+	CASE_LABEL(MSG_META_DEMO_ADD_CASH)
 
-#endif
-    CHECK_IF(MSG_META_TOGGLE_FAST_FORWARD_REPLAY)
-    CHECK_IF(MSG_META_TOGGLE_PAUSE)
-    CHECK_IF(MSG_META_STEP_FRAME)
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_LETTERBOX)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_MESSAGE_TEXT)
-	CHECK_IF(MSG_META_DEMO_LOD_DECREASE)
-	CHECK_IF(MSG_META_DEMO_LOD_INCREASE)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_ZOOM_LOCK)
-	CHECK_IF(MSG_META_DEMO_PLAY_CAMEO_MOVIE)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_SPECIAL_POWER_DELAYS)
-	CHECK_IF(MSG_META_DEMO_BATTLE_CRY)
-	CHECK_IF(MSG_META_DEMO_SWITCH_TEAMS)
-	CHECK_IF(MSG_META_DEMO_SWITCH_TEAMS_BETWEEN_CHINA_USA)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_PARTICLEDEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_SHADOW_VOLUMES)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_FOGOFWAR)
-	CHECK_IF(MSG_META_DEMO_KILL_ALL_ENEMIES)
-	CHECK_IF(MSG_META_DEMO_KILL_SELECTION)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_HURT_ME_MODE)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_HAND_OF_GOD_MODE)
-	CHECK_IF(MSG_META_DEMO_DEBUG_SELECTION)
-	CHECK_IF(MSG_META_DEMO_LOCK_CAMERA_TO_SELECTION)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_SOUND)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_TRACKMARKS)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_WATERPLANE)
-	CHECK_IF(MSG_META_DEMO_TIME_OF_DAY)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_MUSIC)
-	CHECK_IF(MSG_META_DEMO_MUSIC_NEXT_TRACK)
-	CHECK_IF(MSG_META_DEMO_MUSIC_PREV_TRACK)
-	CHECK_IF(MSG_META_DEMO_NEXT_OBJECTIVE_MOVIE)
-	CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE1)
-	CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE2)
-	CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE3)
-	CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE4)
-	CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE5)
-	CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE6)
-	CHECK_IF(MSG_META_DEMO_BEGIN_ADJUST_PITCH)
-	CHECK_IF(MSG_META_DEMO_END_ADJUST_PITCH)
-	CHECK_IF(MSG_META_DEMO_BEGIN_ADJUST_FOV)
-	CHECK_IF(MSG_META_DEMO_END_ADJUST_FOV)
-	CHECK_IF(MSG_META_DEMO_LOCK_CAMERA_TO_PLANES)
-	CHECK_IF(MSG_META_DEMO_REMOVE_PREREQ)
-	CHECK_IF(MSG_META_DEMO_INSTANT_BUILD)
-	CHECK_IF(MSG_META_DEMO_FREE_BUILD)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT1)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT2)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT3)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT4)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT5)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT6)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT7)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT8)
-	CHECK_IF(MSG_META_DEMO_RUNSCRIPT9)
-	CHECK_IF(MSG_META_DEMO_ENSHROUD)
-	CHECK_IF(MSG_META_DEMO_DESHROUD)
-	CHECK_IF(MSG_META_DEBUG_SHOW_EXTENTS)
-  CHECK_IF(MSG_META_DEBUG_SHOW_AUDIO_LOCATIONS)
-	CHECK_IF(MSG_META_DEBUG_SHOW_HEALTH)
-	CHECK_IF(MSG_META_DEBUG_GIVE_VETERANCY)
-	CHECK_IF(MSG_META_DEBUG_TAKE_VETERANCY)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_AI_DEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_SUPPLY_CENTER_PLACEMENT)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_CAMERA_DEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_AVI)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_BW_VIEW)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_RED_VIEW)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_GREEN_VIEW)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_MOTION_BLUR_ZOOM)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_MILITARY_SUBTITLES)
-	CHECK_IF(MSG_META_DEMO_ADD_CASH)
 #ifdef ALLOW_SURRENDER
-	CHECK_IF(MSG_META_DEMO_TEST_SURRENDER)
+	CASE_LABEL(MSG_META_DEMO_TEST_SURRENDER)
 #endif
-	CHECK_IF(MSG_META_DEMO_TOGGLE_RENDER)
-	CHECK_IF(MSG_META_DEMO_KILL_AREA_SELECTION)
-	CHECK_IF(MSG_META_DEMO_CYCLE_LOD_LEVEL)
-	CHECK_IF(MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED)
-	CHECK_IF(MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED)
-	CHECK_IF(MSG_META_DEBUG_CYCLE_EXTENT_TYPE)
-	CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR)
-	CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR_BIG)
-	CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR)
-	CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR_BIG)
-	CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MINOR)
-	CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MINOR_BIG)
-	CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MINOR)
-	CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MINOR_BIG)
-	CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT)
-	CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT_BIG)
-	CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT)
-	CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT_BIG)
-	CHECK_IF(MSG_META_DEBUG_VTUNE_ON)
-	CHECK_IF(MSG_META_DEBUG_VTUNE_OFF)
-	CHECK_IF(MSG_META_DEBUG_TOGGLE_FEATHER_WATER)
-	CHECK_IF(MSG_META_DEBUG_DUMP_ASSETS)
-	CHECK_IF(MSG_NO_DRAW)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_METRICS)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_PROJECTILEDEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_VISIONDEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_THREATDEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_CASHMAPDEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_GRAPHICALFRAMERATEBAR)
-	CHECK_IF(MSG_META_DEMO_GIVE_ALL_SCIENCES)
-	CHECK_IF(MSG_META_DEMO_GIVE_RANKLEVEL)
-	CHECK_IF(MSG_META_DEMO_TAKE_RANKLEVEL)
-	CHECK_IF(MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS)
-	CHECK_IF(MSG_META_DEBUG_TOGGLE_NETWORK)
-	CHECK_IF(MSG_META_DEBUG_DUMP_PLAYER_OBJECTS)
-	CHECK_IF(MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS)
-	CHECK_IF(MSG_META_DEBUG_OBJECT_ID_PERFORMANCE)
-	CHECK_IF(MSG_META_DEBUG_DRAWABLE_ID_PERFORMANCE)
-	CHECK_IF(MSG_META_DEBUG_SLEEPY_UPDATE_PERFORMANCE)
-	CHECK_IF(MSG_META_DEBUG_WIN)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_DEBUG_STATS)
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-
-
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
-	CHECK_IF(MSG_META_DEMO_TOGGLE_AUDIODEBUG)
-#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_RENDER)
+	CASE_LABEL(MSG_META_DEMO_KILL_AREA_SELECTION)
+	CASE_LABEL(MSG_META_DEMO_CYCLE_LOD_LEVEL)
+	CASE_LABEL(MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED)
+	CASE_LABEL(MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED)
+	CASE_LABEL(MSG_META_DEBUG_CYCLE_EXTENT_TYPE)
+	CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR)
+	CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR_BIG)
+	CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR)
+	CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR_BIG)
+	CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MINOR)
+	CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MINOR_BIG)
+	CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MINOR)
+	CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MINOR_BIG)
+	CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT)
+	CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT_BIG)
+	CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT)
+	CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT_BIG)
+	CASE_LABEL(MSG_META_DEBUG_VTUNE_ON)
+	CASE_LABEL(MSG_META_DEBUG_VTUNE_OFF)
+	CASE_LABEL(MSG_META_DEBUG_TOGGLE_FEATHER_WATER)
+	CASE_LABEL(MSG_META_DEBUG_DUMP_ASSETS)
+	CASE_LABEL(MSG_NO_DRAW)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_METRICS)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_PROJECTILEDEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_VISIONDEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_THREATDEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_CASHMAPDEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_GRAPHICALFRAMERATEBAR)
+	CASE_LABEL(MSG_META_DEMO_GIVE_ALL_SCIENCES)
+	CASE_LABEL(MSG_META_DEMO_GIVE_RANKLEVEL)
+	CASE_LABEL(MSG_META_DEMO_TAKE_RANKLEVEL)
+	CASE_LABEL(MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS)
+	CASE_LABEL(MSG_META_DEBUG_TOGGLE_NETWORK)
+	CASE_LABEL(MSG_META_DEBUG_DUMP_PLAYER_OBJECTS)
+	CASE_LABEL(MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS)
+	CASE_LABEL(MSG_META_DEBUG_OBJECT_ID_PERFORMANCE)
+	CASE_LABEL(MSG_META_DEBUG_DRAWABLE_ID_PERFORMANCE)
+	CASE_LABEL(MSG_META_DEBUG_SLEEPY_UPDATE_PERFORMANCE)
+	CASE_LABEL(MSG_META_DEBUG_WIN)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_DEBUG_STATS)
+#endif // defined(RTS_DEBUG)
+
+#if defined(RTS_DEBUG)
+	CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG)
+#endif//defined(RTS_DEBUG)
+
 #ifdef DUMP_PERF_STATS
-	CHECK_IF(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP)
+	CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP)
 #endif//DUMP_PERF_STATS
-	CHECK_IF(MSG_META_PLACE_BEACON)
-	CHECK_IF(MSG_META_REMOVE_BEACON)
-	CHECK_IF(MSG_END_META_MESSAGES)
-	CHECK_IF(MSG_MOUSEOVER_DRAWABLE_HINT)
-	CHECK_IF(MSG_MOUSEOVER_LOCATION_HINT)
-	CHECK_IF(MSG_VALID_GUICOMMAND_HINT)
-	CHECK_IF(MSG_INVALID_GUICOMMAND_HINT)
-	CHECK_IF(MSG_AREA_SELECTION_HINT)
-	CHECK_IF(MSG_DO_ATTACK_OBJECT_HINT)
-	CHECK_IF(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
-	CHECK_IF(MSG_DO_FORCE_ATTACK_OBJECT_HINT)
-	CHECK_IF(MSG_DO_FORCE_ATTACK_GROUND_HINT)
-	CHECK_IF(MSG_GET_REPAIRED_HINT)
-	CHECK_IF(MSG_GET_HEALED_HINT)
-	CHECK_IF(MSG_DO_REPAIR_HINT)
-	CHECK_IF(MSG_RESUME_CONSTRUCTION_HINT)
-	CHECK_IF(MSG_ENTER_HINT)
-	CHECK_IF(MSG_DOCK_HINT)
-	CHECK_IF(MSG_DO_MOVETO_HINT)
-	CHECK_IF(MSG_DO_ATTACKMOVETO_HINT)
-	CHECK_IF(MSG_ADD_WAYPOINT_HINT)
-	CHECK_IF(MSG_HIJACK_HINT)
-	CHECK_IF(MSG_SABOTAGE_HINT)
-	CHECK_IF(MSG_FIREBOMB_HINT)
-	CHECK_IF(MSG_CONVERT_TO_CARBOMB_HINT)
-	CHECK_IF(MSG_CAPTUREBUILDING_HINT)
-	CHECK_IF(MSG_HACK_HINT)
+
+	CASE_LABEL(MSG_META_PLACE_BEACON)
+	CASE_LABEL(MSG_META_REMOVE_BEACON)
+	CASE_LABEL(MSG_END_META_MESSAGES)
+	CASE_LABEL(MSG_MOUSEOVER_DRAWABLE_HINT)
+	CASE_LABEL(MSG_MOUSEOVER_LOCATION_HINT)
+	CASE_LABEL(MSG_VALID_GUICOMMAND_HINT)
+	CASE_LABEL(MSG_INVALID_GUICOMMAND_HINT)
+	CASE_LABEL(MSG_AREA_SELECTION_HINT)
+	CASE_LABEL(MSG_DO_ATTACK_OBJECT_HINT)
+	CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
+	CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT_HINT)
+	CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND_HINT)
+	CASE_LABEL(MSG_GET_REPAIRED_HINT)
+	CASE_LABEL(MSG_GET_HEALED_HINT)
+	CASE_LABEL(MSG_DO_REPAIR_HINT)
+	CASE_LABEL(MSG_RESUME_CONSTRUCTION_HINT)
+	CASE_LABEL(MSG_ENTER_HINT)
+	CASE_LABEL(MSG_DOCK_HINT)
+	CASE_LABEL(MSG_DO_MOVETO_HINT)
+	CASE_LABEL(MSG_DO_ATTACKMOVETO_HINT)
+	CASE_LABEL(MSG_ADD_WAYPOINT_HINT)
+	CASE_LABEL(MSG_HIJACK_HINT)
+	CASE_LABEL(MSG_SABOTAGE_HINT)
+	CASE_LABEL(MSG_FIREBOMB_HINT)
+	CASE_LABEL(MSG_CONVERT_TO_CARBOMB_HINT)
+	CASE_LABEL(MSG_CAPTUREBUILDING_HINT)
+	CASE_LABEL(MSG_HACK_HINT)
+
 #ifdef ALLOW_SURRENDER
-	CHECK_IF(MSG_PICK_UP_PRISONER_HINT)
+	CASE_LABEL(MSG_PICK_UP_PRISONER_HINT)
 #endif
-	CHECK_IF(MSG_SNIPE_VEHICLE_HINT)
-	CHECK_IF(MSG_DEFECTOR_HINT)
-	CHECK_IF(MSG_SET_RALLY_POINT_HINT)
-	CHECK_IF(MSG_DO_SALVAGE_HINT)
-	CHECK_IF(MSG_DO_INVALID_HINT)
-	CHECK_IF(MSG_BEGIN_NETWORK_MESSAGES)
-	CHECK_IF(MSG_CREATE_SELECTED_GROUP)
-	CHECK_IF(MSG_CREATE_SELECTED_GROUP_NO_SOUND)
-	CHECK_IF(MSG_DESTROY_SELECTED_GROUP)
-	CHECK_IF(MSG_REMOVE_FROM_SELECTED_GROUP)
-	CHECK_IF(MSG_SELECTED_GROUP_COMMAND)
-	CHECK_IF(MSG_CREATE_TEAM0)
-	CHECK_IF(MSG_CREATE_TEAM1)
-	CHECK_IF(MSG_CREATE_TEAM2)
-	CHECK_IF(MSG_CREATE_TEAM3)
-	CHECK_IF(MSG_CREATE_TEAM4)
-	CHECK_IF(MSG_CREATE_TEAM5)
-	CHECK_IF(MSG_CREATE_TEAM6)
-	CHECK_IF(MSG_CREATE_TEAM7)
-	CHECK_IF(MSG_CREATE_TEAM8)
-	CHECK_IF(MSG_CREATE_TEAM9)
-	CHECK_IF(MSG_SELECT_TEAM0)
-	CHECK_IF(MSG_SELECT_TEAM1)
-	CHECK_IF(MSG_SELECT_TEAM2)
-	CHECK_IF(MSG_SELECT_TEAM3)
-	CHECK_IF(MSG_SELECT_TEAM4)
-	CHECK_IF(MSG_SELECT_TEAM5)
-	CHECK_IF(MSG_SELECT_TEAM6)
-	CHECK_IF(MSG_SELECT_TEAM7)
-	CHECK_IF(MSG_SELECT_TEAM8)
-	CHECK_IF(MSG_SELECT_TEAM9)
-	CHECK_IF(MSG_ADD_TEAM0)
-	CHECK_IF(MSG_ADD_TEAM1)
-	CHECK_IF(MSG_ADD_TEAM2)
-	CHECK_IF(MSG_ADD_TEAM3)
-	CHECK_IF(MSG_ADD_TEAM4)
-	CHECK_IF(MSG_ADD_TEAM5)
-	CHECK_IF(MSG_ADD_TEAM6)
-	CHECK_IF(MSG_ADD_TEAM7)
-	CHECK_IF(MSG_ADD_TEAM8)
-	CHECK_IF(MSG_ADD_TEAM9)
-	CHECK_IF(MSG_DO_ATTACKSQUAD)
-	CHECK_IF(MSG_DO_WEAPON)
-	CHECK_IF(MSG_DO_WEAPON_AT_LOCATION)
-	CHECK_IF(MSG_DO_WEAPON_AT_OBJECT)
-	CHECK_IF(MSG_DO_SPECIAL_POWER)
-	CHECK_IF(MSG_DO_SPECIAL_POWER_AT_LOCATION)
-	CHECK_IF(MSG_DO_SPECIAL_POWER_AT_OBJECT)
-	CHECK_IF(MSG_SET_RALLY_POINT)
-	CHECK_IF(MSG_PURCHASE_SCIENCE)
-	CHECK_IF(MSG_QUEUE_UPGRADE)
-	CHECK_IF(MSG_CANCEL_UPGRADE)
-	CHECK_IF(MSG_QUEUE_UNIT_CREATE)
-	CHECK_IF(MSG_CANCEL_UNIT_CREATE)
-	CHECK_IF(MSG_DOZER_CONSTRUCT)
-	CHECK_IF(MSG_DOZER_CONSTRUCT_LINE)
-	CHECK_IF(MSG_DOZER_CANCEL_CONSTRUCT)
-	CHECK_IF(MSG_SELL)
-	CHECK_IF(MSG_EXIT)
-	CHECK_IF(MSG_EVACUATE)
-	CHECK_IF(MSG_EXECUTE_RAILED_TRANSPORT)
-	CHECK_IF(MSG_COMBATDROP_AT_LOCATION)
-	CHECK_IF(MSG_COMBATDROP_AT_OBJECT)
-	CHECK_IF(MSG_AREA_SELECTION)
-	CHECK_IF(MSG_DO_ATTACK_OBJECT)
-	CHECK_IF(MSG_DO_FORCE_ATTACK_OBJECT)
-	CHECK_IF(MSG_DO_FORCE_ATTACK_GROUND)
-	CHECK_IF(MSG_GET_REPAIRED)
-	CHECK_IF(MSG_GET_HEALED)
-	CHECK_IF(MSG_DO_REPAIR)
-	CHECK_IF(MSG_RESUME_CONSTRUCTION)
-	CHECK_IF(MSG_ENTER)
-	CHECK_IF(MSG_DOCK)
-	CHECK_IF(MSG_DO_MOVETO)
-	CHECK_IF(MSG_DO_ATTACKMOVETO)
-	CHECK_IF(MSG_DO_FORCEMOVETO)
-	CHECK_IF(MSG_ADD_WAYPOINT)
-	CHECK_IF(MSG_DO_GUARD_POSITION)
-	CHECK_IF(MSG_DO_GUARD_OBJECT)
-	CHECK_IF(MSG_DO_STOP)
-	CHECK_IF(MSG_DO_SCATTER)
-	CHECK_IF(MSG_INTERNET_HACK)
-	CHECK_IF(MSG_DO_CHEER)
+
+	CASE_LABEL(MSG_SNIPE_VEHICLE_HINT)
+	CASE_LABEL(MSG_DEFECTOR_HINT)
+	CASE_LABEL(MSG_SET_RALLY_POINT_HINT)
+	CASE_LABEL(MSG_DO_SALVAGE_HINT)
+	CASE_LABEL(MSG_DO_INVALID_HINT)
+	CASE_LABEL(MSG_BEGIN_NETWORK_MESSAGES)
+	CASE_LABEL(MSG_CREATE_SELECTED_GROUP)
+	CASE_LABEL(MSG_CREATE_SELECTED_GROUP_NO_SOUND)
+	CASE_LABEL(MSG_DESTROY_SELECTED_GROUP)
+	CASE_LABEL(MSG_REMOVE_FROM_SELECTED_GROUP)
+	CASE_LABEL(MSG_SELECTED_GROUP_COMMAND)
+	CASE_LABEL(MSG_CREATE_TEAM0)
+	CASE_LABEL(MSG_CREATE_TEAM1)
+	CASE_LABEL(MSG_CREATE_TEAM2)
+	CASE_LABEL(MSG_CREATE_TEAM3)
+	CASE_LABEL(MSG_CREATE_TEAM4)
+	CASE_LABEL(MSG_CREATE_TEAM5)
+	CASE_LABEL(MSG_CREATE_TEAM6)
+	CASE_LABEL(MSG_CREATE_TEAM7)
+	CASE_LABEL(MSG_CREATE_TEAM8)
+	CASE_LABEL(MSG_CREATE_TEAM9)
+	CASE_LABEL(MSG_SELECT_TEAM0)
+	CASE_LABEL(MSG_SELECT_TEAM1)
+	CASE_LABEL(MSG_SELECT_TEAM2)
+	CASE_LABEL(MSG_SELECT_TEAM3)
+	CASE_LABEL(MSG_SELECT_TEAM4)
+	CASE_LABEL(MSG_SELECT_TEAM5)
+	CASE_LABEL(MSG_SELECT_TEAM6)
+	CASE_LABEL(MSG_SELECT_TEAM7)
+	CASE_LABEL(MSG_SELECT_TEAM8)
+	CASE_LABEL(MSG_SELECT_TEAM9)
+	CASE_LABEL(MSG_ADD_TEAM0)
+	CASE_LABEL(MSG_ADD_TEAM1)
+	CASE_LABEL(MSG_ADD_TEAM2)
+	CASE_LABEL(MSG_ADD_TEAM3)
+	CASE_LABEL(MSG_ADD_TEAM4)
+	CASE_LABEL(MSG_ADD_TEAM5)
+	CASE_LABEL(MSG_ADD_TEAM6)
+	CASE_LABEL(MSG_ADD_TEAM7)
+	CASE_LABEL(MSG_ADD_TEAM8)
+	CASE_LABEL(MSG_ADD_TEAM9)
+	CASE_LABEL(MSG_DO_ATTACKSQUAD)
+	CASE_LABEL(MSG_DO_WEAPON)
+	CASE_LABEL(MSG_DO_WEAPON_AT_LOCATION)
+	CASE_LABEL(MSG_DO_WEAPON_AT_OBJECT)
+	CASE_LABEL(MSG_DO_SPECIAL_POWER)
+	CASE_LABEL(MSG_DO_SPECIAL_POWER_AT_LOCATION)
+	CASE_LABEL(MSG_DO_SPECIAL_POWER_AT_OBJECT)
+	CASE_LABEL(MSG_SET_RALLY_POINT)
+	CASE_LABEL(MSG_PURCHASE_SCIENCE)
+	CASE_LABEL(MSG_QUEUE_UPGRADE)
+	CASE_LABEL(MSG_CANCEL_UPGRADE)
+	CASE_LABEL(MSG_QUEUE_UNIT_CREATE)
+	CASE_LABEL(MSG_CANCEL_UNIT_CREATE)
+	CASE_LABEL(MSG_DOZER_CONSTRUCT)
+	CASE_LABEL(MSG_DOZER_CONSTRUCT_LINE)
+	CASE_LABEL(MSG_DOZER_CANCEL_CONSTRUCT)
+	CASE_LABEL(MSG_SELL)
+	CASE_LABEL(MSG_EXIT)
+	CASE_LABEL(MSG_EVACUATE)
+	CASE_LABEL(MSG_EXECUTE_RAILED_TRANSPORT)
+	CASE_LABEL(MSG_COMBATDROP_AT_LOCATION)
+	CASE_LABEL(MSG_COMBATDROP_AT_OBJECT)
+	CASE_LABEL(MSG_AREA_SELECTION)
+	CASE_LABEL(MSG_DO_ATTACK_OBJECT)
+	CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT)
+	CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND)
+	CASE_LABEL(MSG_GET_REPAIRED)
+	CASE_LABEL(MSG_GET_HEALED)
+	CASE_LABEL(MSG_DO_REPAIR)
+	CASE_LABEL(MSG_RESUME_CONSTRUCTION)
+	CASE_LABEL(MSG_ENTER)
+	CASE_LABEL(MSG_DOCK)
+	CASE_LABEL(MSG_DO_MOVETO)
+	CASE_LABEL(MSG_DO_ATTACKMOVETO)
+	CASE_LABEL(MSG_DO_FORCEMOVETO)
+	CASE_LABEL(MSG_ADD_WAYPOINT)
+	CASE_LABEL(MSG_DO_GUARD_POSITION)
+	CASE_LABEL(MSG_DO_GUARD_OBJECT)
+	CASE_LABEL(MSG_DO_STOP)
+	CASE_LABEL(MSG_DO_SCATTER)
+	CASE_LABEL(MSG_INTERNET_HACK)
+	CASE_LABEL(MSG_DO_CHEER)
+
 #ifdef ALLOW_SURRENDER
-	CHECK_IF(MSG_DO_SURRENDER)
+	CASE_LABEL(MSG_DO_SURRENDER)
 #endif
-	CHECK_IF(MSG_TOGGLE_OVERCHARGE)
+
+	CASE_LABEL(MSG_TOGGLE_OVERCHARGE)
+
 #ifdef ALLOW_SURRENDER
-	CHECK_IF(MSG_RETURN_TO_PRISON)
+	CASE_LABEL(MSG_RETURN_TO_PRISON)
 #endif
-	CHECK_IF(MSG_SWITCH_WEAPONS)
-	CHECK_IF(MSG_CONVERT_TO_CARBOMB)
-	CHECK_IF(MSG_CAPTUREBUILDING)
-	CHECK_IF(MSG_DISABLEVEHICLE_HACK)
-	CHECK_IF(MSG_STEALCASH_HACK)
-	CHECK_IF(MSG_DISABLEBUILDING_HACK)
-	CHECK_IF(MSG_SNIPE_VEHICLE)
+
+	CASE_LABEL(MSG_SWITCH_WEAPONS)
+	CASE_LABEL(MSG_CONVERT_TO_CARBOMB)
+	CASE_LABEL(MSG_CAPTUREBUILDING)
+	CASE_LABEL(MSG_DISABLEVEHICLE_HACK)
+	CASE_LABEL(MSG_STEALCASH_HACK)
+	CASE_LABEL(MSG_DISABLEBUILDING_HACK)
+	CASE_LABEL(MSG_SNIPE_VEHICLE)
+
 #ifdef ALLOW_SURRENDER
-	CHECK_IF(MSG_PICK_UP_PRISONER)
+	CASE_LABEL(MSG_PICK_UP_PRISONER)
 #endif
-	CHECK_IF(MSG_DO_SALVAGE)
-	CHECK_IF(MSG_CLEAR_INGAME_POPUP_MESSAGE)
-	CHECK_IF(MSG_PLACE_BEACON)
-	CHECK_IF(MSG_REMOVE_BEACON)
-	CHECK_IF(MSG_SET_BEACON_TEXT)
-	CHECK_IF(MSG_SET_REPLAY_CAMERA)
-	CHECK_IF(MSG_SELF_DESTRUCT)
-	CHECK_IF(MSG_CREATE_FORMATION)
-	CHECK_IF(MSG_LOGIC_CRC)
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)  
-	CHECK_IF(MSG_DEBUG_KILL_SELECTION)
-	CHECK_IF(MSG_DEBUG_HURT_OBJECT)
-	CHECK_IF(MSG_DEBUG_KILL_OBJECT)
+
+	CASE_LABEL(MSG_DO_SALVAGE)
+	CASE_LABEL(MSG_CLEAR_INGAME_POPUP_MESSAGE)
+	CASE_LABEL(MSG_PLACE_BEACON)
+	CASE_LABEL(MSG_REMOVE_BEACON)
+	CASE_LABEL(MSG_SET_BEACON_TEXT)
+	CASE_LABEL(MSG_SET_REPLAY_CAMERA)
+	CASE_LABEL(MSG_SELF_DESTRUCT)
+	CASE_LABEL(MSG_CREATE_FORMATION)
+	CASE_LABEL(MSG_LOGIC_CRC)
+
+#if defined(RTS_DEBUG)
+	CASE_LABEL(MSG_DEBUG_KILL_SELECTION)
+	CASE_LABEL(MSG_DEBUG_HURT_OBJECT)
+	CASE_LABEL(MSG_DEBUG_KILL_OBJECT)
 #endif
 
-	CHECK_IF(MSG_END_NETWORK_MESSAGES)
-	CHECK_IF(MSG_TIMESTAMP)
-	CHECK_IF(MSG_OBJECT_CREATED)
-	CHECK_IF(MSG_OBJECT_DESTROYED)
-	CHECK_IF(MSG_OBJECT_POSITION)
-	CHECK_IF(MSG_OBJECT_ORIENTATION)
-	CHECK_IF(MSG_OBJECT_JOINED_TEAM)
-	CHECK_IF(MSG_SET_MINE_CLEARING_DETAIL)
-	CHECK_IF(MSG_ENABLE_RETALIATION_MODE)
-	return commandName;
+	CASE_LABEL(MSG_END_NETWORK_MESSAGES)
+	CASE_LABEL(MSG_TIMESTAMP)
+	CASE_LABEL(MSG_OBJECT_CREATED)
+	CASE_LABEL(MSG_OBJECT_DESTROYED)
+	CASE_LABEL(MSG_OBJECT_POSITION)
+	CASE_LABEL(MSG_OBJECT_ORIENTATION)
+	CASE_LABEL(MSG_OBJECT_JOINED_TEAM)
+	CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL)
+	CASE_LABEL(MSG_ENABLE_RETALIATION_MODE)
+	}
+
+#undef CASE_LABEL
 }
 
 
@@ -748,10 +763,10 @@ void GameMessageList::insertMessage( GameMessage *msg, GameMessage *messageToIns
 {
 	// First, set msg's next to be messageToInsertAfter's next.
 	msg->friend_setNext(messageToInsertAfter->next());
-	
+
 	// Next, set msg's prev to be messageToInsertAfter
 	msg->friend_setPrev(messageToInsertAfter);
-	
+
 	// Now update the next message's prev to be msg
 	if (msg->next())
 		msg->next()->friend_setPrev(msg);
@@ -833,7 +848,7 @@ void MessageStream::init( void )
 {
 	// extend
 	GameMessageList::init();
-} 
+}
 
 /**
 	* Reset
@@ -893,7 +908,7 @@ GameMessage *MessageStream::insertMessage( GameMessage::Type type, GameMessage *
  * Translators share a priority, they are kept in the same order they
  * were attached.
  */
-TranslatorID MessageStream::attachTranslator( GameMessageTranslator *translator, 
+TranslatorID MessageStream::attachTranslator( GameMessageTranslator *translator,
 																							UnsignedInt priority)
 {
 	MessageStream::TranslatorData *newSS = NEW MessageStream::TranslatorData;
@@ -951,7 +966,7 @@ TranslatorID MessageStream::attachTranslator( GameMessageTranslator *translator,
 }
 
 /**
-	* Find a translator attached to this message stream given the ID 
+	* Find a translator attached to this message stream given the ID
 	*/
 GameMessageTranslator* MessageStream::findTranslator( TranslatorID id )
 {
@@ -1000,17 +1015,24 @@ void MessageStream::removeTranslator( TranslatorID id )
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 
 Bool isInvalidDebugCommand( GameMessage::Type t )
 {
 	// see if this is something that should be prevented in multiplayer games
 	// Don't reject this stuff in skirmish games.
-	if (TheGameLogic && !TheGameLogic->isInSkirmishGame() && 
+	if (TheGameLogic && !TheGameLogic->isInSkirmishGame() &&
 			(TheRecorder && TheRecorder->isMultiplayer() && TheRecorder->getMode() == RECORDERMODETYPE_RECORD))
 	{
 		switch (t)
 		{
+		case GameMessage::MSG_META_DEMO_REMOVE_PREREQ:
+		case GameMessage::MSG_META_DEMO_INSTANT_BUILD:
+		case GameMessage::MSG_META_DEMO_FREE_BUILD:
+		case GameMessage::MSG_META_DEMO_GIVE_ALL_SCIENCES:
+			// TheSuperHackers @tweak Debug cheats are now multiplayer compatible. Happy cheating Munkees :)
+			return false;
+
 		case GameMessage::MSG_META_DEMO_SWITCH_TEAMS:
 		case GameMessage::MSG_META_DEMO_SWITCH_TEAMS_BETWEEN_CHINA_USA:
 		case GameMessage::MSG_META_DEMO_KILL_ALL_ENEMIES:
@@ -1020,9 +1042,6 @@ Bool isInvalidDebugCommand( GameMessage::Type t )
 		case GameMessage::MSG_META_DEMO_TOGGLE_SPECIAL_POWER_DELAYS:
 		case GameMessage::MSG_META_DEMO_TIME_OF_DAY:
 		case GameMessage::MSG_META_DEMO_LOCK_CAMERA_TO_PLANES:
-		case GameMessage::MSG_META_DEMO_REMOVE_PREREQ:
-		case GameMessage::MSG_META_DEMO_INSTANT_BUILD:
-		case GameMessage::MSG_META_DEMO_FREE_BUILD:
 		case GameMessage::MSG_META_DEMO_RUNSCRIPT1:
 		case GameMessage::MSG_META_DEMO_RUNSCRIPT2:
 		case GameMessage::MSG_META_DEMO_RUNSCRIPT3:
@@ -1036,7 +1055,6 @@ Bool isInvalidDebugCommand( GameMessage::Type t )
 		case GameMessage::MSG_META_DEMO_DESHROUD:
 		case GameMessage::MSG_META_DEBUG_GIVE_VETERANCY:
 		case GameMessage::MSG_META_DEBUG_TAKE_VETERANCY:
-//#pragma MESSAGE ("WARNING - DEBUG key in multiplayer!")
 		case GameMessage::MSG_META_DEMO_ADD_CASH:
 		case GameMessage::MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED:
 		case GameMessage::MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED:
@@ -1059,7 +1077,6 @@ Bool isInvalidDebugCommand( GameMessage::Type t )
 		case GameMessage::MSG_DEBUG_HURT_OBJECT:
 		case GameMessage::MSG_DEBUG_KILL_OBJECT:
 		case GameMessage::MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS:
-		case GameMessage::MSG_META_DEMO_GIVE_ALL_SCIENCES:
 		case GameMessage::MSG_META_DEMO_GIVE_RANKLEVEL:
 		case GameMessage::MSG_META_DEMO_TAKE_RANKLEVEL:
 		case GameMessage::MSG_META_DEBUG_WIN:
@@ -1086,9 +1103,9 @@ void MessageStream::propagateMessages( void )
 	for( ss=m_firstTranslator; ss; ss=ss->m_next )
 	{
 		for( msg=m_firstMessage; msg; msg=next )
-		{			
-			if (ss->m_translator 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+		{
+			if (ss->m_translator
+#if defined(RTS_DEBUG)
 				&& !isInvalidDebugCommand(msg->getType())
 #endif
 				)
@@ -1099,8 +1116,8 @@ void MessageStream::propagateMessages( void )
 				{
 					deleteInstance(msg);
 				}
-			} 
-			else 
+			}
+			else
 			{
 				next = msg->next();
 			}
@@ -1146,7 +1163,7 @@ void CommandList::init( void )
 	// extend
 	GameMessageList::init();
 
-} 
+}
 
 /**
 	* Destroy all messages on the list, and reset list to empty
@@ -1186,20 +1203,20 @@ void CommandList::destroyAllMessages( void )
 		next = msg->next();
 		deleteInstance(msg);
 	}
-	
+
 	m_firstMessage = NULL;
 	m_lastMessage = NULL;
 
 }
 
-/** 
+/**
  * Adds messages to the end of TheCommandList.
- * Primarily used by TheMessageStream to put the final messages that reach the end of the 
- * stream on TheCommandList. Since TheGameClient will update faster than TheNetwork 
+ * Primarily used by TheMessageStream to put the final messages that reach the end of the
+ * stream on TheCommandList. Since TheGameClient will update faster than TheNetwork
  * and TheGameLogic, messages will accumulate on this list.
  */
-void CommandList::appendMessageList( GameMessage *list ) 
-{ 
+void CommandList::appendMessageList( GameMessage *list )
+{
 	GameMessage *msg, *next;
 
 	for( msg = list; msg; msg = next )
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MiniLog.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MiniLog.cpp
index 5b20fb361c4..7d3945c75ea 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/MiniLog.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/MiniLog.cpp
@@ -27,7 +27,7 @@
 // Author: Matthew D. Campbell, January 2003
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/MiniLog.h"
 
 #ifdef DEBUG_LOGGING
@@ -36,19 +36,13 @@ LogClass::LogClass(const char *fname)
 {
 	char buffer[ _MAX_PATH ];
 	GetModuleFileName( NULL, buffer, sizeof( buffer ) );
-	char *pEnd = buffer + strlen( buffer );
-	while( pEnd != buffer )
+	if (char *pEnd = strrchr(buffer, '\\'))
 	{
-		if( *pEnd == '\\' )
-		{
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+		*pEnd = 0;
 	}
-	AsciiString fullPath;
-	fullPath.format("%s\\%s", buffer, fname);
-	m_fp = fopen(fullPath.str(), "wt");
+	// TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.
+	const std::string fullPath = std::string(buffer) + "\\" + fname;
+	m_fp = fopen(fullPath.c_str(), "wt");
 }
 
 LogClass::~LogClass()
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MultiplayerSettings.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MultiplayerSettings.cpp
index 3d3c9ddd167..d23ec32b56c 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/MultiplayerSettings.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/MultiplayerSettings.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_TERRAIN_LOD_NAMES
 #define DEFINE_TIME_OF_DAY_NAMES
@@ -43,17 +43,17 @@ MultiplayerSettings *TheMultiplayerSettings = NULL;				///< The MultiplayerSetti
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-const FieldParse MultiplayerColorDefinition::m_colorFieldParseTable[] = 
+const FieldParse MultiplayerColorDefinition::m_colorFieldParseTable[] =
 {
 
 	{ "TooltipName",	INI::parseAsciiString,	NULL,	offsetof( MultiplayerColorDefinition, m_tooltipName ) },
 	{ "RGBColor",			INI::parseRGBColor,			NULL,	offsetof( MultiplayerColorDefinition, m_rgbValue ) },
 	{ "RGBNightColor",			INI::parseRGBColor,		NULL,	offsetof( MultiplayerColorDefinition, m_rgbValueNight ) },
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
+	{ NULL,					NULL,						NULL,						0 }
 
 };
 
-const FieldParse MultiplayerSettings::m_multiplayerSettingsFieldParseTable[] = 
+const FieldParse MultiplayerSettings::m_multiplayerSettingsFieldParseTable[] =
 {
 
 	{ "StartCountdownTimer",			INI::parseInt,	NULL,	offsetof( MultiplayerSettings, m_startCountdownTimerSeconds ) },
@@ -63,7 +63,7 @@ const FieldParse MultiplayerSettings::m_multiplayerSettingsFieldParseTable[] =
 	{ "ShowRandomStartPos",				INI::parseBool,	NULL,	offsetof( MultiplayerSettings, m_showRandomStartPos ) },
 	{ "ShowRandomColor",					INI::parseBool,	NULL,	offsetof( MultiplayerSettings, m_showRandomColor ) },
 
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
+	{ NULL,					NULL,						NULL,						0 }
 
 };
 
@@ -80,12 +80,11 @@ MultiplayerSettings::MultiplayerSettings()
 	m_showRandomPlayerTemplate = TRUE;
 	m_showRandomStartPos = TRUE;
 	m_showRandomColor = TRUE;
-	
 	m_observerColor;
 	m_randomColor;
 
   m_gotDefaultStartingMoney = false;
-}  // end MultiplayerSettings
+}
 
 MultiplayerColorDefinition::MultiplayerColorDefinition()
 {
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/NameKeyGenerator.cpp b/GeneralsMD/Code/GameEngine/Source/Common/NameKeyGenerator.cpp
index e5578488eef..44894061dab 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/NameKeyGenerator.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/NameKeyGenerator.cpp
@@ -28,12 +28,12 @@
 // Desc:      Name key system to translate between names and unique key ids
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // Public Data ////////////////////////////////////////////////////////////////////////////////////
 NameKeyGenerator *TheNameKeyGenerator = NULL;  ///< name key gen. singleton
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 NameKeyGenerator::NameKeyGenerator()
 {
 
@@ -42,18 +42,18 @@ NameKeyGenerator::NameKeyGenerator()
 	for (Int i = 0; i < SOCKET_COUNT; ++i)
 		m_sockets[i] = NULL;
 
-}  // end NameKeyGenerator
+}
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 NameKeyGenerator::~NameKeyGenerator()
 {
-	
+
 	// free all system data
 	freeSockets();
 
-}  // end ~NameKeyGenerator
+}
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 void NameKeyGenerator::init()
 {
 	DEBUG_ASSERTCRASH(m_nextID == (UnsignedInt)NAMEKEY_INVALID, ("NameKeyGen already inited"));
@@ -62,17 +62,17 @@ void NameKeyGenerator::init()
 	freeSockets();
 	m_nextID = 1;
 
-}  // end init
+}
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 void NameKeyGenerator::reset()
 {
 	freeSockets();
 	m_nextID = 1;
 
-}  // end reset
+}
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 void NameKeyGenerator::freeSockets()
 {
 	for (Int i = 0; i < SOCKET_COUNT; ++i)
@@ -86,29 +86,29 @@ void NameKeyGenerator::freeSockets()
 		m_sockets[i] = NULL;
 	}
 
-}  // end freeSockets
+}
 
-/* ------------------------------------------------------------------------ */
+//-------------------------------------------------------------------------------------------------
 inline UnsignedInt calcHashForString(const char* p)
 {
-	UnsignedInt result = 0; 
+	UnsignedInt result = 0;
 	Byte *pp = (Byte*)p;
-	while (*pp) 
-		result = (result << 5) + result + *pp++; 
+	while (*pp)
+		result = (result << 5) + result + *pp++;
 	return result;
 }
 
-/* ------------------------------------------------------------------------ */
+//-------------------------------------------------------------------------------------------------
 inline UnsignedInt calcHashForLowercaseString(const char* p)
 {
-	UnsignedInt result = 0; 
+	UnsignedInt result = 0;
 	Byte *pp = (Byte*)p;
-	while (*pp) 
-		result = (result << 5) + result + tolower(*pp++); 
+	while (*pp)
+		result = (result << 5) + result + tolower(*pp++);
 	return result;
 }
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 AsciiString NameKeyGenerator::keyToName(NameKeyType key)
 {
 	for (Int i = 0; i < SOCKET_COUNT; ++i)
@@ -122,78 +122,151 @@ AsciiString NameKeyGenerator::keyToName(NameKeyType key)
 	return AsciiString::TheEmptyString;
 }
 
-//------------------------------------------------------------------------------------------------- 
-NameKeyType NameKeyGenerator::nameToKey(const char* nameString)
+//-------------------------------------------------------------------------------------------------
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+// TheSuperHackers @info xezon 04/09/2025 This key reservation is required for CRC compatibility,
+// because the name keys are somehow CRC relevant. It was originally used by the file exist cache
+// of the file system in Zero Hour.
+Bool NameKeyGenerator::addReservedKey()
 {
-	Bucket *b;
+	switch (m_nextID)
+	{
+	case 97: nameToLowercaseKeyImpl("Data\\English\\Language9x.ini"); return true;
+	case 98: nameToLowercaseKeyImpl("Data\\Audio\\Tracks\\English\\GLA_02.mp3"); return true;
+	case 99: nameToLowercaseKeyImpl("Data\\Audio\\Tracks\\GLA_02.mp3"); return true;
+	}
+	return false;
+}
+#endif
 
-	UnsignedInt hash = calcHashForString(nameString) % SOCKET_COUNT;
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToKey(const AsciiString& name)
+{
+	const NameKeyType key = nameToKeyImpl(name);
+
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+	while (addReservedKey());
+#endif
+
+	return key;
+}
+
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToLowercaseKey(const AsciiString& name)
+{
+	const NameKeyType key = nameToLowercaseKeyImpl(name);
+
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+	while (addReservedKey());
+#endif
 
-	// hmm, do we have it already?
+	return key;
+}
+
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToKey(const char* name)
+{
+	const NameKeyType key = nameToKeyImpl(name);
+
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+	while (addReservedKey());
+#endif
+
+	return key;
+}
+
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToLowercaseKey(const char *name)
+{
+	const NameKeyType key = nameToLowercaseKeyImpl(name);
+
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+	while (addReservedKey());
+#endif
+
+	return key;
+}
+
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToKeyImpl(const AsciiString& name)
+{
+	const UnsignedInt hash = calcHashForString(name.str()) % SOCKET_COUNT;
+
+	// do we have it already?
+	const Bucket *b;
 	for (b = m_sockets[hash]; b; b = b->m_nextInSocket)
 	{
-		if (strcmp(nameString, b->m_nameString.str()) == 0)
-			return b->m_key; 
+		if (name.compare(b->m_nameString) == 0)
+			return b->m_key;
 	}
 
 	// nope, guess not. let's allocate it.
-	b = newInstance(Bucket);
-	b->m_key = (NameKeyType)m_nextID++;
-	b->m_nameString = nameString;
-	b->m_nextInSocket = m_sockets[hash];
-	m_sockets[hash] = b;
+	return createNameKey(hash, name);
+}
 
-	NameKeyType result = b->m_key;
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToLowercaseKeyImpl(const AsciiString& name)
+{
+	const UnsignedInt hash = calcHashForLowercaseString(name.str()) % SOCKET_COUNT;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	// reality-check to be sure our hasher isn't going bad.
-	const Int maxThresh = 3;
-	Int numOverThresh = 0;
-	for (Int i = 0; i < SOCKET_COUNT; ++i)
+	// do we have it already?
+	const Bucket *b;
+	for (b = m_sockets[hash]; b; b = b->m_nextInSocket)
 	{
-		Int numInThisSocket = 0;
-		for (b = m_sockets[i]; b; b = b->m_nextInSocket)
-			++numInThisSocket;
-
-		if (numInThisSocket > maxThresh)
-			++numOverThresh;
+		if (name.compareNoCase(b->m_nameString) == 0)
+			return b->m_key;
 	}
-	
-	// if more than a small percent of the sockets are getting deep, probably want to increase the socket count.
-	if (numOverThresh > SOCKET_COUNT/20)
+
+	// nope, guess not. let's allocate it.
+	return createNameKey(hash, name);
+}
+
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToKeyImpl(const char* name)
+{
+	const UnsignedInt hash = calcHashForString(name) % SOCKET_COUNT;
+
+	// do we have it already?
+	const Bucket *b;
+	for (b = m_sockets[hash]; b; b = b->m_nextInSocket)
 	{
-		DEBUG_CRASH(("hmm, might need to increase the number of bucket-sockets for NameKeyGenerator (numOverThresh %d = %f%%)\n",numOverThresh,(Real)numOverThresh/(Real)(SOCKET_COUNT/20)));
+		if (strcmp(name, b->m_nameString.str()) == 0)
+			return b->m_key;
 	}
-#endif
-
-	return result;
 
-}  // end nameToKey
+	// nope, guess not. let's allocate it.
+	return createNameKey(hash, name);
+}
 
-//------------------------------------------------------------------------------------------------- 
-NameKeyType NameKeyGenerator::nameToLowercaseKey(const char* nameString)
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::nameToLowercaseKeyImpl(const char* name)
 {
-	Bucket *b;
-
-	UnsignedInt hash = calcHashForLowercaseString(nameString) % SOCKET_COUNT;
+	const UnsignedInt hash = calcHashForLowercaseString(name) % SOCKET_COUNT;
 
-	// hmm, do we have it already?
+	// do we have it already?
+	const Bucket *b;
 	for (b = m_sockets[hash]; b; b = b->m_nextInSocket)
 	{
-		if (_stricmp(nameString, b->m_nameString.str()) == 0)
-			return b->m_key; 
+		if (_stricmp(name, b->m_nameString.str()) == 0)
+			return b->m_key;
 	}
 
 	// nope, guess not. let's allocate it.
-	b = newInstance(Bucket);
+	return createNameKey(hash, name);
+}
+
+//-------------------------------------------------------------------------------------------------
+NameKeyType NameKeyGenerator::createNameKey(UnsignedInt hash, const AsciiString& name)
+{
+	Bucket *b = newInstance(Bucket);
 	b->m_key = (NameKeyType)m_nextID++;
-	b->m_nameString = nameString;
+	b->m_nameString = name;
 	b->m_nextInSocket = m_sockets[hash];
 	m_sockets[hash] = b;
 
 	NameKeyType result = b->m_key;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	// reality-check to be sure our hasher isn't going bad.
 	const Int maxThresh = 3;
 	Int numOverThresh = 0;
@@ -206,28 +279,27 @@ NameKeyType NameKeyGenerator::nameToLowercaseKey(const char* nameString)
 		if (numInThisSocket > maxThresh)
 			++numOverThresh;
 	}
-	
+
 	// if more than a small percent of the sockets are getting deep, probably want to increase the socket count.
 	if (numOverThresh > SOCKET_COUNT/20)
 	{
-		DEBUG_CRASH(("hmm, might need to increase the number of bucket-sockets for NameKeyGenerator (numOverThresh %d = %f%%)\n",numOverThresh,(Real)numOverThresh/(Real)(SOCKET_COUNT/20)));
+		DEBUG_CRASH(("hmm, might need to increase the number of bucket-sockets for NameKeyGenerator (numOverThresh %d = %f%%)",numOverThresh,(Real)numOverThresh/(Real)(SOCKET_COUNT/20)));
 	}
 #endif
 
 	return result;
+}
 
-}  // end nameToLowercaseKey
-
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 // Get a string out of the INI. Store it into a NameKeyType
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 void NameKeyGenerator::parseStringAsNameKeyType( INI *ini, void *instance, void *store, const void* userData )
 {
   *(NameKeyType *)store = TheNameKeyGenerator->nameToKey( ini->getNextToken() );
 }
 
 
-//------------------------------------------------------------------------------------------------- 
+//-------------------------------------------------------------------------------------------------
 NameKeyType StaticNameKey::key() const
 {
 	if (m_key == NAMEKEY_INVALID)
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp
index b8fb00faf20..e51add0e212 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp
@@ -39,17 +39,17 @@
 /**************************************************************************************************
 Some info about partioning problems:
 
-	This problem is contained in a very interesting class of problems known as NP complete. The 
-	basic problem is that there is no way to tell whether you have an optimal solution or not. 
-	Worst case, you try out every possible solution and still don't find the optimal solution: 
+	This problem is contained in a very interesting class of problems known as NP complete. The
+	basic problem is that there is no way to tell whether you have an optimal solution or not.
+	Worst case, you try out every possible solution and still don't find the optimal solution:
 	this takes 2^n time to find, where N is the number of elements you are attempting to place.
 	For this reason, a value near PREFER_FAST_SOLUTION should almost always be chosen. We will use
-	a flat multiply to determine how many solutions to attempt before giving up and returning our 
+	a flat multiply to determine how many solutions to attempt before giving up and returning our
 	best attempt. If you want more info, this site contains info on the problem:
 	http://odysseus.nat.uni-magdeburg.de/~mertens/npp/index.shtml
 **************************************************************************************************/
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PartitionSolver.h"
 
@@ -63,10 +63,7 @@ PartitionSolver::PartitionSolver(const EntriesVec& elements, const SpacesVec& sp
 	m_data = elements;
 	m_spacesForData = spaces;
 	m_howToSolve = solveHow;
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_currentSolutionLeftovers = 0;
-	//
 }
 
 void PartitionSolver::solve(void)
@@ -74,7 +71,7 @@ void PartitionSolver::solve(void)
 	m_bestSolution.clear();
 	m_currentSolution.clear();
 	m_currentSolutionLeftovers = 0x7fffffff;
-	
+
 	Int minSizeForAllData = 0;
 	Int slotsAllotted = 0;
 	size_t i, j;
@@ -92,22 +89,22 @@ void PartitionSolver::solve(void)
 	// out whole classes of solutions
 
 	std::sort(m_data.begin(), m_data.end(), greater_than);
-	
+
 	// Also make the largest partition first.
 	std::sort(m_spacesForData.begin(), m_spacesForData.end(), greater_than);
 
 	// work in our temporary vector.
 	SpacesVec spacesStillAvailable = m_spacesForData;
-	
-	if (m_howToSolve == PREFER_FAST_SOLUTION) 
+
+	if (m_howToSolve == PREFER_FAST_SOLUTION)
 	{
 		// we prefer the fast, but not necessarily correct solution
 		// simply start placing the stuff. Skip things you can't place.
-		for (i = 0; i < m_data.size(); ++i) 
+		for (i = 0; i < m_data.size(); ++i)
 		{
-			for (j = 0; j < spacesStillAvailable.size(); ++j) 
+			for (j = 0; j < spacesStillAvailable.size(); ++j)
 			{
-				if (m_data[i].second <= spacesStillAvailable[j].second) 
+				if (m_data[i].second <= spacesStillAvailable[j].second)
 				{
 					spacesStillAvailable[j].second -= m_data[i].second;
 					m_bestSolution.push_back(std::make_pair(m_data[i].first, spacesStillAvailable[j].first));
@@ -123,4 +120,4 @@ void PartitionSolver::solve(void)
 const SolutionVec& PartitionSolver::getSolution( void ) const
 {
 	return m_bestSolution;
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp
index 28881709911..336cffbc838 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp
@@ -23,10 +23,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: PerfTimer.cpp ///////////////////////////////////////////////////////////////////////////
-// Author: 
+// Author:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 
@@ -40,11 +40,6 @@ __forceinline void ProfileGetTime(__int64 &t)
 	t = _rdtsc();
 }
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -79,7 +74,7 @@ void InitPrecisionTimer()
     // wait for end of current tick
     unsigned timeEnd = timeGetTime() + 2;
     while( timeGetTime() < timeEnd ); //do nothing
- 
+
     // get cycles
     _int64 start, startQPC, endQPC;
     QueryPerformanceCounter( (LARGE_INTEGER *)&startQPC );
@@ -88,7 +83,7 @@ void InitPrecisionTimer()
     while( timeGetTime() < timeEnd ); //do nothing
     ProfileGetTime( n[ k ] );
     n[ k ] -= start;
- 
+
     // convert to 1 second
     if( QueryPerformanceCounter( (LARGE_INTEGER*)&endQPC ) )
     {
@@ -100,7 +95,7 @@ void InitPrecisionTimer()
       n[ k ] = ( n[ k ] * 1000 ) / 20;
     }
   }
- 
+
   // find two closest values
   _int64 d01 = n[ 1 ] - n[ 0 ];
 	_int64 d02 = n[ 2 ] - n[ 0 ];
@@ -110,7 +105,7 @@ void InitPrecisionTimer()
 	{
 		d01 = -d01;
 	}
-  if( d02 < 0 ) 
+  if( d02 < 0 )
 	{
 		d02 = -d02;
 	}
@@ -134,7 +129,7 @@ void InitPrecisionTimer()
 	s_ticksPerSec = s_ticksPerMSec * 1000.0f;
 	s_ticksPerUSec = s_ticksPerSec / 1000000.0f;
 
-	
+
 #else
 
 	//Kris: With total disrespect, this code costs 5 real seconds of init time
@@ -147,8 +142,8 @@ void InitPrecisionTimer()
 		Int64 totalTime = 0;
 		Int64	TotalTicks = 0;
 		static int TESTS = 5;
-		
-		for (int i = 0; i < TESTS; ++i) 
+
+		for (int i = 0; i < TESTS; ++i)
 		{
 			int        TimeStart;
 			int        TimeStop;
@@ -193,9 +188,9 @@ void InitPrecisionTimer()
 			GetPrecisionTimer(&bogus[7]);
 		}
 		TheTicksToGetTicks = (bogus[7] - start) / (ITERS*8);
-		DEBUG_LOG(("TheTicksToGetTicks is %d (%f usec)\n",(int)TheTicksToGetTicks,TheTicksToGetTicks/s_ticksPerUSec));
+		DEBUG_LOG(("TheTicksToGetTicks is %d (%f usec)",(int)TheTicksToGetTicks,TheTicksToGetTicks/s_ticksPerUSec));
 	#endif
-		
+
 #endif
 
 }
@@ -229,9 +224,9 @@ class PerfMetricsOutput
 
 	AsciiString& getStatsString(const AsciiString& id)
 	{
-		for (int i = 0; i < m_outputStats.size(); ++i) 
+		for (int i = 0; i < m_outputStats.size(); ++i)
 		{
-			if (m_outputStats[i].first == id) 
+			if (m_outputStats[i].first == id)
 				return m_outputStats[i].second;
 		}
 		std::pair<AsciiString, AsciiString> newPair;
@@ -242,9 +237,9 @@ class PerfMetricsOutput
 
 	void clearStatsString(const AsciiString& id)
 	{
-		for (int i = 0; i < m_outputStats.size(); ++i) 
+		for (int i = 0; i < m_outputStats.size(); ++i)
 		{
-			if (m_outputStats[i].first == id) 
+			if (m_outputStats[i].first == id)
 			{
 				m_outputStats.erase(&m_outputStats[i]);
 				return;
@@ -308,19 +303,16 @@ void PerfGather::removeFromList()
 }
 
 //-------------------------------------------------------------------------------------------------
-PerfGather::PerfGather(const char *identifier) : 
-	m_identifier(identifier), 
-	m_startTime(0), 
-	m_runningTimeGross(0), 
-	m_runningTimeNet(0), 
+PerfGather::PerfGather(const char *identifier) :
+	m_identifier(identifier),
+	m_startTime(0),
+	m_runningTimeGross(0),
+	m_runningTimeNet(0),
 	m_callCount(0),
 	m_next(0),
 	m_prev(0)
 {
-	//Added By Sadullah Nader
-	//Initializations inserted 
 	m_ignore = FALSE;
-	//
 	DEBUG_ASSERTCRASH(strchr(m_identifier, ',') == NULL, ("PerfGather names must not contain commas"));
 	addToList();
 }
@@ -354,11 +346,12 @@ void PerfGather::reset()
 {
 	PerfGather::termPerfDump();
 
-	strcpy(s_buf, fname);
+	strlcpy(s_buf, fname, ARRAY_SIZE(s_buf);
 
 	char tmp[256];
+	static_assert(ARRAY_SIZE(tmp) >= ARRAY_SIZE(s_buf), "Incorrect array size");
 	strcpy(tmp, s_buf);
-	strcat(tmp, ".csv");
+	strlcat(tmp, ".csv", ARRAY_SIZE(tmp));
 
 	s_perfStatsFile = fopen(tmp, "w");
 	s_perfDumpOptions = options;
@@ -368,7 +361,7 @@ void PerfGather::reset()
 		DEBUG_CRASH(("could not open/create perf file %s -- is it open in another app?",s_buf));
 		return;
 	}
-	
+
 	if (s_stopStartOverhead == -1)
 	{
 		const Int ITERS = 100000;
@@ -388,7 +381,7 @@ void PerfGather::reset()
 		}
 		GetPrecisionTimer(&end);
 		s_stopStartOverhead = (end - start) / (ITERS*8);
-		DEBUG_LOG(("s_stopStartOverhead is %d (%f usec)\n",(int)s_stopStartOverhead,s_stopStartOverhead/s_ticksPerUSec));
+		DEBUG_LOG(("s_stopStartOverhead is %d (%f usec)",(int)s_stopStartOverhead,s_stopStartOverhead/s_ticksPerUSec));
 	}
 }
 
@@ -397,7 +390,7 @@ void PerfGather::reset()
 {
 	if (frame < s_lastDumpedFrame)
 	{
-		// must have reset or started a new game. 
+		// must have reset or started a new game.
 		termPerfDump();
 		initPerfDump(s_buf, s_perfDumpOptions);
 	}
@@ -440,7 +433,7 @@ void PerfGather::reset()
 			}
 			fprintf(s_perfStatsFile, "\n");
 		}
-		
+
 		// a strange value so we can find it in the dump, if necessary.
 		// there's nothing magic about this value, it's purely determined from sample dumps...
 //		const Real CLIP_BIG_SPIKES = 1e10f;
@@ -488,7 +481,7 @@ void PerfGather::reset()
 }
 
 //-------------------------------------------------------------------------------------------------
-// This function will queue up stuff to draw on the next frame. We also need to adjust the 
+// This function will queue up stuff to draw on the next frame. We also need to adjust the
 // perf timers to not include time spent paused by the script engine.
 /*static*/ void PerfGather::displayGraph(UnsignedInt frame)
 {
@@ -501,7 +494,7 @@ void PerfGather::reset()
 		// always skip the first second or so, since it loads everything and skews the results horribly
 	}
 	else
-	{	
+	{
 		const Real CLIP_BIG_SPIKES = 100000.0f;
 
 		if (s_perfDumpOptions & PERF_GROSSTIME)
@@ -524,7 +517,7 @@ void PerfGather::reset()
 				t /= s_ticksPerUSec;
 				if (t > CLIP_BIG_SPIKES)
 					t = CLIP_BIG_SPIKES;
-				
+
 				TheGraphDraw->addEntry(head->m_identifier, REAL_TO_INT(t));
 			}
 		}
@@ -534,7 +527,7 @@ void PerfGather::reset()
 			{
 				Real t = head->m_callCount;
 				TheGraphDraw->addEntry(head->m_identifier, REAL_TO_INT(t));
-				
+
 			}
 		}
 	}
@@ -558,15 +551,13 @@ void PerfGather::reset()
 
 //-------------------------------------------------------------------------------------------------
 PerfTimer::PerfTimer( const char *identifier, Bool crashWithInfo, Int startFrame, Int endFrame) :
-	m_identifier(identifier), 
-	m_crashWithInfo(crashWithInfo), 
-	m_startFrame(startFrame), 
+	m_identifier(identifier),
+	m_crashWithInfo(crashWithInfo),
+	m_startFrame(startFrame),
 	m_endFrame(endFrame),
 	m_callCount(0),
 	m_runningTime(0),
 	m_outputInfo(true),
-	//Added By Sadullah Nader
-	//Intializations inserted
 	m_lastFrame(-1)
 {
 }
@@ -597,7 +588,7 @@ void PerfTimer::outputInfo( void )
 		return;
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	double totalTimeInMS = 1000.0 * m_runningTime / s_ticksPerSec;
 	double avgTimePerFrame = totalTimeInMS / (m_lastFrame - m_startFrame + 1);
 	double avgTimePerCall = totalTimeInMS / m_callCount;
@@ -605,29 +596,29 @@ void PerfTimer::outputInfo( void )
 
 	if (m_crashWithInfo) {
 		DEBUG_CRASH(("%s\n"
-								 "Average Time (per call): %.4f ms\n" 
+								 "Average Time (per call): %.4f ms\n"
 								 "Average Time (per frame): %.4f ms\n"
 								 "Average calls per frame: %.2f\n"
 								 "Number of calls: %d\n"
-								 "Max possible FPS: %.4f\n",
-								 m_identifier, 
+								 "Max possible FPS: %.4f",
+								 m_identifier,
 								 avgTimePerCall,
 								 avgTimePerFrame,
 								 1.0f * m_callCount / (m_lastFrame - m_startFrame + 1),
-								 m_callCount,								 
+								 m_callCount,
 								 1000.0f / avgTimePerFrame));
 	} else {
 		DEBUG_LOG(("%s\n"
-								 "Average Time (per call): %.4f ms\n" 
+								 "Average Time (per call): %.4f ms\n"
 								 "Average Time (per frame): %.4f ms\n"
 								 "Average calls per frame: %.2f\n"
 								 "Number of calls: %d\n"
-								 "Max possible FPS: %.4f\n",
-								 m_identifier, 
+								 "Max possible FPS: %.4f",
+								 m_identifier,
 								 avgTimePerCall,
 								 avgTimePerFrame,
 								 1.0f * m_callCount / (m_lastFrame - m_startFrame + 1),
-								 m_callCount,								 
+								 m_callCount,
 								 1000.0f / avgTimePerFrame));
 	}
 }
@@ -635,7 +626,7 @@ void PerfTimer::outputInfo( void )
 //-------------------------------------------------------------------------------------------------
 void PerfTimer::showMetrics( void )
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	double totalTimeInMS = 1000.0 * m_runningTime / s_ticksPerSec;
 	double avgTimePerFrame = totalTimeInMS / (m_lastFrame - m_startFrame + 1);
 	double avgTimePerCall = totalTimeInMS / m_callCount;
@@ -644,9 +635,9 @@ void PerfTimer::showMetrics( void )
 	// we want to work on the thing in the array, so just store a reference.
 	AsciiString &outputStats = s_output.getStatsString(m_identifier);
 
-	outputStats.format("%s: %.2fms / call, %.2fms / frame \n", 
-											m_identifier, 
-											avgTimePerCall,											
+	outputStats.format("%s: %.2fms / call, %.2fms / frame \n",
+											m_identifier,
+											avgTimePerCall,
 											avgTimePerFrame);
 	m_callCount = 0;
 	m_runningTime = 0;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp
index d0495081611..9041f653bdb 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp
@@ -24,12 +24,12 @@
 
 // FILE: AcademyStats.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Los Angeles                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2003 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Los Angeles
+//
+//                       Confidential Information
+//                Copyright (C) 2003 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -38,12 +38,12 @@
 //
 // Created:    Kris Morness, July 2003
 //
-// Desc:			 Keeps track of various statistics in order to provide advice to 
+// Desc:			 Keeps track of various statistics in order to provide advice to
 //             the player about how to improve playing.
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AcademyStats.h"
 #include "Common/Energy.h"
@@ -62,19 +62,15 @@
 
 #include "GameLogic/Module/ContainModule.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
-const char *TheAcademyClassificationTypeNames[] = 
+const char *const TheAcademyClassificationTypeNames[] =
 {
 	"ACT_NONE",
 	"ACT_UPGRADE_RADAR",
 	"ACT_SUPERPOWER",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheAcademyClassificationTypeNames) == ACT_COUNT + 1, "Incorrect array size");
 
 #define FRAMES_BETWEEN_UPDATES 30
 
@@ -101,7 +97,7 @@ void findDozerCommandSet( Object *object, void *userData )
 //------------------------------------------------------------------------------------------------
 void AcademyStats::init( const Player *player )
 {
-	if( !TheGameLogic ) 
+	if( !TheGameLogic )
 	{
 		return; // GUIEdit crashes on this, so bail
 	}
@@ -115,9 +111,9 @@ void AcademyStats::init( const Player *player )
 	const PlayerTemplate *plyrTemplate = player->getPlayerTemplate();
 
 	if( !plyrTemplate ||
-			plyrTemplate->getBaseSide().compareNoCase( "USA" ) &&
+			( plyrTemplate->getBaseSide().compareNoCase( "USA" ) &&
 			plyrTemplate->getBaseSide().compareNoCase( "China" ) &&
-			plyrTemplate->getBaseSide().compareNoCase( "GLA" ) )
+			plyrTemplate->getBaseSide().compareNoCase( "GLA" ) ) )
 	{
 		//Admittedly, this is a massive violation of data driven design. Shame on me!
 		//Unknown side... don't provide ANY advice. Simplicity reasons.
@@ -235,10 +231,10 @@ void AcademyStats::init( const Player *player )
 
 	//20) Did the Player pick up salvage (as GLA)?
 	m_salvageCollected = 0;
-	
+
 	//21) Did the player ever use the "Guard" ability?
 	m_guardAbilityUsedCount = 0;
-		
+
 	//22) Did the player build more than one Supply Center (that is, did he expand out)?
 	//Uses m_supplyCentersBuilt!
 
@@ -249,7 +245,7 @@ void AcademyStats::init( const Player *player )
 	//25) Did the player use the new alternate interface in the options?
 	//Uses TheGlobalData->m_useAlternateMouse
 
-	//26) Player did not use the new "double click location attack move/guard" 
+	//26) Player did not use the new "double click location attack move/guard"
 	m_doubleClickAttackMoveOrdersGiven = 0;
 
   //27) Built barracks within 5 minutes?
@@ -308,7 +304,7 @@ void AcademyStats::update()
 	}
 
 	UnsignedInt now = TheGameLogic->getFrame();
-	
+
 	if( m_nextUpdateFrame >= now )
 	{
 		m_nextUpdateFrame = now + FRAMES_BETWEEN_UPDATES;
@@ -353,12 +349,12 @@ void AcademyStats::update()
 				m_hadPowerLastCheck = hasPower;
 			}
 		}
-	
+
 		if( isFirstUpdate() )
 		{
 			setFirstUpdate( FALSE );
 		}
-	
+
 	}
 }
 
@@ -457,7 +453,7 @@ void AcademyStats::recordProduction( const Object *obj, const Object *constructe
 	}
 
 	//33) Did the player ever build a "disguisable" unit and never used the disguise ability?
-	if( obj->isKindOf( KINDOF_DISGUISER ) ) 
+	if( obj->isKindOf( KINDOF_DISGUISER ) )
 	{
 		m_disguisableVehiclesBuilt++;
 	}
@@ -507,7 +503,7 @@ void AcademyStats::recordIncome()
 void AcademyStats::evaluateTier1Advice( AcademyAdviceInfo *info, Int numAvailableTips )
 {
 	UnsignedInt maxAdviceTips = MAX_ADVICE_TIPS;
-	
+
 	//-allAdvice feature
 	//if( !TheGlobalData->m_allAdvice )
 	//{
@@ -691,7 +687,7 @@ void AcademyStats::evaluateTier1Advice( AcademyAdviceInfo *info, Int numAvailabl
 		numAvailableTips--;
 	}
 
-	//13) Extra gatherers built? 
+	//13) Extra gatherers built?
 	if( !m_gatherersBuilt )
 	{
 		//Don't count free ones that come with supply centers!
@@ -732,7 +728,7 @@ void AcademyStats::evaluateTier1Advice( AcademyAdviceInfo *info, Int numAvailabl
 void AcademyStats::evaluateTier2Advice( AcademyAdviceInfo *info, Int numAvailableTips )
 {
 	UnsignedInt maxAdviceTips = MAX_ADVICE_TIPS;
-	
+
 	//-allAdvice feature
 	//if( !TheGlobalData->m_allAdvice )
 	//{
@@ -878,7 +874,7 @@ void AcademyStats::evaluateTier2Advice( AcademyAdviceInfo *info, Int numAvailabl
 void AcademyStats::evaluateTier3Advice( AcademyAdviceInfo *info, Int numAvailableTips )
 {
 	UnsignedInt maxAdviceTips = MAX_ADVICE_TIPS;
-	
+
 	//-allAdvice feature
 	//if( !TheGlobalData->m_allAdvice )
 	//{
@@ -886,14 +882,14 @@ void AcademyStats::evaluateTier3Advice( AcademyAdviceInfo *info, Int numAvailabl
 	//}
 
 	UnsignedInt now = TheGameLogic->getFrame();
-	
+
 	//numAvailableTips is used to determine if we are going to randomly choose a tip
 	//or determine if a tip is available (if -1)
 	Bool choosing = numAvailableTips != -1;
 	Int availableTips = 0;
 
 	//25) Did the player use the new alternate interface in the options?
-	if( !TheGlobalData->m_useAlternateMouse ) 
+	if( !TheGlobalData->m_useAlternateMouse )
 	{
 		availableTips++;
 		Int rand = GameClientRandomValue( 0, numAvailableTips - 1 );
@@ -906,8 +902,8 @@ void AcademyStats::evaluateTier3Advice( AcademyAdviceInfo *info, Int numAvailabl
 		numAvailableTips--;
 	}
 
-	//26) Player did not use the new "double click location attack move/guard" 
-	if( !m_doubleClickAttackMoveOrdersGiven ) 
+	//26) Player did not use the new "double click location attack move/guard"
+	if( !m_doubleClickAttackMoveOrdersGiven )
 	{
 		availableTips++;
 		Int rand = GameClientRandomValue( 0, numAvailableTips - 1 );
@@ -1013,7 +1009,7 @@ void AcademyStats::evaluateTier3Advice( AcademyAdviceInfo *info, Int numAvailabl
 	}
 
 	//33) Did the player ever build a "disguisable" unit and never used the disguise ability?
-	if( m_disguisableVehiclesBuilt ) 
+	if( m_disguisableVehiclesBuilt )
 	{
 		if( !m_vehiclesDisguised )
 		{
@@ -1058,7 +1054,7 @@ void AcademyStats::evaluateTier3Advice( AcademyAdviceInfo *info, Int numAvailabl
 Bool AcademyStats::calculateAcademyAdvice( AcademyAdviceInfo *info )
 {
 	UnsignedInt maxAdviceTips = MAX_ADVICE_TIPS;
-	
+
 	//-allAdvice feature
 	//if( !TheGlobalData->m_allAdvice )
 	//{
@@ -1083,7 +1079,7 @@ Bool AcademyStats::calculateAcademyAdvice( AcademyAdviceInfo *info )
 	//Build the header for each string.
 	for( UnsignedInt i = 0; i < maxAdviceTips; i++ )
 	{
-		info->advice[ i ].format( UnicodeString( L"\n\n" ) );
+		info->advice[ i ].format( L"\n\n" );
 	}
 
 	//First look at tier 1 basic advice and pick any advice we could benefit from.
@@ -1106,12 +1102,12 @@ Bool AcademyStats::calculateAcademyAdvice( AcademyAdviceInfo *info )
 }
 
 //------------------------------------------------------------------------------------------------
-// CRC 
+// CRC
 //------------------------------------------------------------------------------------------------
 void AcademyStats::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 //------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1224,7 +1220,7 @@ void AcademyStats::xfer( Xfer *xfer )
 	//25) Did the player use the new alternate interface in the options?
 	//Uses TheGlobalData->m_useAlternateMouse
 
-	//26) Player did not use the new "double click location attack move/guard" 
+	//26) Player did not use the new "double click location attack move/guard"
 	xfer->xferUnsignedInt( &m_doubleClickAttackMoveOrdersGiven );
 
   //27) Built barracks within 5 minutes?
@@ -1258,7 +1254,7 @@ void AcademyStats::xfer( Xfer *xfer )
 	//35) Did the player ever create a "Firestorm" with his MiGs or Inferno Cannons?
 	xfer->xferUnsignedInt( &m_firestormsCreated );
 
-}  // end xfer
+}
 
 //------------------------------------------------------------------------------------------------
 // Load post process
@@ -1266,4 +1262,4 @@ void AcademyStats::xfer( Xfer *xfer )
 void AcademyStats::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp
index c7f058919b4..ee93d3a076b 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp
@@ -24,16 +24,16 @@
 
 // FILE: ActionManager.cpp ////////////////////////////////////////////////////////////////////////
 // Author: Colin Day
-// Desc:   TheActionManager is a convenient place for us to wrap up all sorts of logical 
+// Desc:   TheActionManager is a convenient place for us to wrap up all sorts of logical
 //				 queries about what objects can do in the world and to other objects.  The purpose
 //				 of having a central place for this logic assists us in making these logical kind
 //				 of queries in the user interface and allows us to use the same code to validate
-//				 commands as they come in over the network interface in order to do the 
+//				 commands as they come in over the network interface in order to do the
 //				 real action.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/GlobalData.h"
@@ -64,11 +64,6 @@
 
 #include "GameLogic/ExperienceTracker.h"//LORENZEN
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // GLOBAL /////////////////////////////////////////////////////////////////////////////////////////
 ActionManager *TheActionManager = NULL;
@@ -106,14 +101,14 @@ static Bool isObjectShroudedForAction ( const Object *source, const Object *targ
 	// GS Keeping this comment to show we now have commandSource, so everything should be fine again.
 
 	// The target is only shrouded for action if...
-	
+
 	// the asking player is human
 	// the asking impetus is not from a script
 	// and the target object is Fogged or worse
 
-	if( source && target && source->getControllingPlayer() ) 
+	if( source && target && source->getControllingPlayer() )
 	{
-		if( source->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN 
+		if( source->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN
 			&& commandSource != CMD_FROM_SCRIPT
 			&& target->getShroudedStatus( source->getControllingPlayer()->getPlayerIndex() ) >= OBJECTSHROUD_FOGGED
 			)
@@ -132,18 +127,18 @@ static Bool isObjectShroudedForAction ( const Object *source, const Object *targ
 ActionManager::ActionManager( void )
 {
 
-}  // end ActionManager
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 ActionManager::~ActionManager( void )
 {
 
-}  // end ~ActionManager
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Bool ActionManager::canGetRepairedAt( const Object *obj, const Object *repairDest, CommandSourceType commandSource ) 
+Bool ActionManager::canGetRepairedAt( const Object *obj, const Object *repairDest, CommandSourceType commandSource )
 {
 
 	// sanity
@@ -159,7 +154,7 @@ Bool ActionManager::canGetRepairedAt( const Object *obj, const Object *repairDes
 	// dead objects cannot be repaired
 	if( obj->isEffectivelyDead() )
 		return FALSE;
-	
+
 	// If I can't move, I can't get repaired
 	if( !obj->isMobile() )
 		return FALSE;
@@ -172,7 +167,7 @@ Bool ActionManager::canGetRepairedAt( const Object *obj, const Object *repairDes
 	// Can't get repaired at something being sold
 	if( repairDest->testStatus(OBJECT_STATUS_SOLD) )
 		return FALSE;
-	
+
 	// only vehicles can go get repaired at something
 	if( obj->isKindOf( KINDOF_VEHICLE ) == FALSE )
 		return FALSE;
@@ -203,12 +198,12 @@ Bool ActionManager::canGetRepairedAt( const Object *obj, const Object *repairDes
 	// all is well, we can be repaired here
 	return TRUE;
 
-}  // end canGetRepairedAt
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 // note that "dest" is typically a building...
-Bool ActionManager::canTransferSuppliesAt( const Object *obj, const Object *transferDest ) 
+Bool ActionManager::canTransferSuppliesAt( const Object *obj, const Object *transferDest )
 {
 
 	// sanity
@@ -228,7 +223,7 @@ Bool ActionManager::canTransferSuppliesAt( const Object *obj, const Object *tran
 	// Can't transfer at something being sold
 	if( transferDest->testStatus(OBJECT_STATUS_SOLD) )
 		return FALSE;
-	
+
 	// I must be something with a Supply Transfering AI interface
 	const AIUpdateInterface *ai= obj->getAI();
 	if( ai == NULL )
@@ -266,13 +261,13 @@ Bool ActionManager::canTransferSuppliesAt( const Object *obj, const Object *tran
 	// if the target is in the shroud, we can't do anything
 //	if (isObjectShroudedForAction(obj, transferDest))
 //		return FALSE;
-	//Commented out to show it is an intentional difference to most commands.  
+	//Commented out to show it is an intentional difference to most commands.
 
 	// Fogged is okay for player, and anything is okay for AI.
 	Player *objPlayer = obj->getControllingPlayer();
 	if( objPlayer )
 	{
-		if( objPlayer->getPlayerType() == PLAYER_HUMAN && 
+		if( objPlayer->getPlayerType() == PLAYER_HUMAN &&
 			transferDest->getShroudedStatus( objPlayer->getPlayerIndex() ) == OBJECTSHROUD_SHROUDED )
 		{
 			return FALSE;
@@ -282,7 +277,7 @@ Bool ActionManager::canTransferSuppliesAt( const Object *obj, const Object *tran
 	// all is well, we can transfer here
 	return TRUE;
 
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Can object 'obj' dock with object 'dockDest' for any reason */
@@ -319,16 +314,16 @@ Bool ActionManager::canDockAt( const Object *obj, const Object *dockDest, Comman
 		if( obj->isKindOf( KINDOF_VEHICLE ) || obj->isKindOf( KINDOF_INFANTRY ) )
 			return TRUE;
 
-	}  // end if
+	}
 
 	// cannot dock
 	return FALSE;
 
-}  // end canDockAt
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Bool ActionManager::canGetHealedAt( const Object *obj, const Object *healDest, CommandSourceType commandSource ) 
+Bool ActionManager::canGetHealedAt( const Object *obj, const Object *healDest, CommandSourceType commandSource )
 {
 
 	// sanity
@@ -353,7 +348,7 @@ Bool ActionManager::canGetHealedAt( const Object *obj, const Object *healDest, C
 	// Can't get healed at something being sold
 	if( healDest->testStatus(OBJECT_STATUS_SOLD) )
 		return FALSE;
-	
+
 	// only infantry can go get "healed" somewhere (vehicles get "repaired")
 	if( obj->isKindOf( KINDOF_INFANTRY ) == FALSE )
 		return FALSE;
@@ -365,7 +360,7 @@ Bool ActionManager::canGetHealedAt( const Object *obj, const Object *healDest, C
 	// if the target is in the shroud, we can't do anything
 	if (isObjectShroudedForAction(obj, healDest, commandSource))
 		return FALSE;
-	
+
 	BodyModuleInterface *body = obj->getBodyModule();
 	if( body && body->getHealth() == body->getMaxHealth() )
 	{
@@ -376,11 +371,11 @@ Bool ActionManager::canGetHealedAt( const Object *obj, const Object *healDest, C
 	// all is well, we can be healed here
 	return TRUE;
 
-}  // end canGetHealedAt
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Bool ActionManager::canRepairObject( const Object *obj, const Object *objectToRepair, CommandSourceType commandSource ) 
+Bool ActionManager::canRepairObject( const Object *obj, const Object *objectToRepair, CommandSourceType commandSource )
 {
 
 	// sanity
@@ -440,18 +435,18 @@ Bool ActionManager::canRepairObject( const Object *obj, const Object *objectToRe
 	if( obj->getContainedBy() )
 	{
 		// We can't heal things while in a transport (especially our own transport, you cheater)
-		return FALSE; 
+		return FALSE;
 	}
 
 	return TRUE;
 
-}  // end canRepair
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Can 'obj' resume the construction of 'objectBeingConstructed' */
 // ------------------------------------------------------------------------------------------------
-Bool ActionManager::canResumeConstructionOf( const Object *obj, 
-																						 const Object *objectBeingConstructed, 
+Bool ActionManager::canResumeConstructionOf( const Object *obj,
+																						 const Object *objectBeingConstructed,
 																						 CommandSourceType commandSource )
 {
 
@@ -488,12 +483,12 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj,
 	if( builder )
 	{
 		AIUpdateInterface *ai = builder->getAI();
-		DEBUG_ASSERTCRASH( ai, ("Builder object does not have an AI interface!\n") );
+		DEBUG_ASSERTCRASH( ai, ("Builder object does not have an AI interface!") );
 
 		if( ai )
 		{
 			DozerAIInterface *dozerAI = ai->getDozerAIInterface();
-			DEBUG_ASSERTCRASH( dozerAI, ("Builder object doest not have a DozerAI interface!\n") );
+			DEBUG_ASSERTCRASH( dozerAI, ("Builder object doest not have a DozerAI interface!") );
 
 			if( dozerAI )
 			{
@@ -502,11 +497,11 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj,
 						dozerAI->getTaskTarget( DOZER_TASK_BUILD ) == objectBeingConstructed->getID() )
 					return FALSE;
 
-			}  // end if
+			}
 
-		}  // en dif
+		}
 
-	}  //end if
+	}
 
 	// if the target is in the shroud, we can't do anything
 	if (isObjectShroudedForAction(obj, objectBeingConstructed, commandSource))
@@ -519,7 +514,7 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj,
 
 	return TRUE;
 
-}  // end canResumeConstructionOf
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -529,7 +524,7 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 	// sanity
 	if( obj == NULL || objectToEnter == NULL )
 		return FALSE;
-	
+
 	if( obj == objectToEnter )
 	{
 		//You can't contain yourself (crash fix for pow truck reselection)
@@ -550,15 +545,15 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 	{
 		return FALSE;
 	}
-	
+
 	// Can't enter something being sold
 	if( objectToEnter->testStatus(OBJECT_STATUS_SOLD) )
 		return FALSE;
 	if ( obj->isKindOf( KINDOF_IGNORED_IN_GUI )  //As in, Angry Mob Members, Cargo Planes
-		|| obj->isKindOf( KINDOF_MOB_NEXUS )   
+		|| obj->isKindOf( KINDOF_MOB_NEXUS )
 		|| objectToEnter->isKindOf( KINDOF_IGNORED_IN_GUI ) )  // As in Cargo Planes
-	{																					
-																						
+	{
+
 		return FALSE;
 	}
 
@@ -593,7 +588,7 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 
 		if (!obj->isAboveTerrain())
 			return FALSE;
-		
+
 		if( obj->getControllingPlayer() == objectToEnter->getControllingPlayer() )
 		{
 			//Kris -- added code to prevent aircraft from landing in any airstrips other than their own!
@@ -607,7 +602,7 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 
 				if (pp->hasReservedSpace(obj->getID()))
 					return TRUE;
-						
+
 				if (pp->shouldReserveDoorWhenQueued(obj->getTemplate()) && pp->hasAvailableSpaceFor(obj->getTemplate()))
 					return TRUE;
 			}
@@ -628,12 +623,12 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 			//getting to any of the other checks. The key is that it usually doesn't return
 			//TRUE because most things aren't trying to collide with objects. This is different
 			//for terrorist converting carbombs, and pilots entering vehicles. In these cases,
-			//the vehicles don't have transport capacities, therefore returning true here 
+			//the vehicles don't have transport capacities, therefore returning true here
 			//foregoes that checking later on.
 			return TRUE;
 		}
 	}
-	
+
 #ifdef ALLOW_SURRENDER
 	if( objectToEnter->isKindOf( KINDOF_PRISON ) )
 	{
@@ -662,7 +657,7 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 		BodyModuleInterface *body = obj->getBodyModule();
 		if( body->getHealth() == body->getMaxHealth() )
 		{
-			//This container is only used for the purposes of healing and we cannot 
+			//This container is only used for the purposes of healing and we cannot
 			//enter it with full health. This is not a normal container.
 			return FALSE;
 		}
@@ -692,7 +687,7 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 			// faction structure... can't do it.
 			if (objectToEnter->isFactionStructure())
 				return FALSE;
-			
+
 			// it's stealth-garrisoned... ignore check-cap and fall thru to
 			// normal isValid test.
 			if (stealthContainCount > 0 && nonStealthContainCount == 0)
@@ -703,7 +698,7 @@ Bool ActionManager::canEnterObject( const Object *obj, const Object *objectToEnt
 		/// @todo srj -- seems like we should check always (not just for checkCap), but scared to change now -- check later
 		if( checkCapacity && obj->getTransportSlotCount() == 0 )
 		{
-			return FALSE;		
+			return FALSE;
 		}
 
 		// finally: make sure that objectToEnter is a valid container for obj
@@ -784,7 +779,7 @@ CanAttackResult ActionManager::getCanAttackObject( const Object *obj, const Obje
 		{
 			//We found the spawn interface, now get the closest slave to the target.
 			Object *slave = spawnInterface->getClosestSlave( objectToAttack->getPosition() );
-			
+
 			if( slave )
 			{
 				result = slave->getAbleToAttackSpecificObject( attackType, objectToAttack, commandSource );
@@ -815,7 +810,7 @@ CanAttackResult ActionManager::getCanAttackObject( const Object *obj, const Obje
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Bool ActionManager::canConvertObjectToCarBomb( const Object *obj, const Object *objectToConvert, CommandSourceType commandSource ) 
+Bool ActionManager::canConvertObjectToCarBomb( const Object *obj, const Object *objectToConvert, CommandSourceType commandSource )
 {
 
 	// sanity
@@ -895,7 +890,7 @@ Bool ActionManager::canHijackVehicle( const Object *obj, const Object *objectToH
 		return FALSE;
 	}
 
-	// last, see if we'd like to collide with 'objectToHijack' 
+	// last, see if we'd like to collide with 'objectToHijack'
 	for (BehaviorModule** m = obj->getBehaviorModules(); *m; ++m)
 	{
 		CollideModuleInterface* collide = (*m)->getCollide();
@@ -939,7 +934,7 @@ Bool ActionManager::canSabotageBuilding( const Object *obj, const Object *object
 		return FALSE;
 	}
 
-	// last, see if we'd like to collide with 'objectToSabotage' 
+	// last, see if we'd like to collide with 'objectToSabotage'
 	for (BehaviorModule** m = obj->getBehaviorModules(); *m; ++m)
 	{
 		CollideModuleInterface* collide = (*m)->getCollide();
@@ -1068,7 +1063,7 @@ Bool ActionManager::canCaptureBuilding( const Object *obj, const Object *objectT
 		return false;
 
 	//If the enemy unit is stealthed and not detected, then we can't capture it!
-	if( objectToCapture->testStatus( OBJECT_STATUS_STEALTHED ) && 
+	if( objectToCapture->testStatus( OBJECT_STATUS_STEALTHED ) &&
 			!objectToCapture->testStatus( OBJECT_STATUS_DETECTED ) &&
 			!objectToCapture->testStatus( OBJECT_STATUS_DISGUISED ) )
 	{
@@ -1120,7 +1115,7 @@ Bool ActionManager::canDisableVehicleViaHacking( const Object *obj, const Object
 //	if ( cashSPI && cashSPI->isBusy() )
 //		return FALSE;
 
-	
+
 	SpecialPowerModuleInterface *spInterface = obj->findSpecialPowerModuleInterface( SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK );
 	if (checkSourceRequirements)
 	{
@@ -1158,7 +1153,7 @@ Bool ActionManager::canDisableVehicleViaHacking( const Object *obj, const Object
 		}
 
 		//If the enemy unit is stealthed and not detected, then we can't attack it!
-	if( objectToHack->testStatus( OBJECT_STATUS_STEALTHED ) && 
+	if( objectToHack->testStatus( OBJECT_STATUS_STEALTHED ) &&
 			!objectToHack->testStatus( OBJECT_STATUS_DETECTED ) &&
 			!objectToHack->testStatus( OBJECT_STATUS_DISGUISED ) )
 		{
@@ -1216,7 +1211,7 @@ Bool ActionManager::canPickUpPrisoner( const Object *obj, const Object *prisoner
 
 	return TRUE;
 
-}  // end canPickUpPrisoner
+}
 #endif
 
 // ------------------------------------------------------------------------------------------------
@@ -1274,13 +1269,13 @@ Bool ActionManager::canStealCashViaHacking( const Object *obj, const Object *obj
 		{
 			return FALSE;
 		}
-		
+
 		//Make sure object isn't under construction!
 		if( objectToHack->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 		{
 			return FALSE;
 		}
-		
+
 		//Make sure the building is considered hackable (temp: using capturable)
 		if( !objectToHack->isKindOf( KINDOF_CAPTURABLE ) || objectToHack->isKindOf( KINDOF_REBUILD_HOLE ) )
 		{
@@ -1288,7 +1283,7 @@ Bool ActionManager::canStealCashViaHacking( const Object *obj, const Object *obj
 		}
 
 		//If the enemy unit is stealthed and not detected, then we can't attack it!
-	if( objectToHack->testStatus( OBJECT_STATUS_STEALTHED ) && 
+	if( objectToHack->testStatus( OBJECT_STATUS_STEALTHED ) &&
 			!objectToHack->testStatus( OBJECT_STATUS_DETECTED ) &&
 			!objectToHack->testStatus( OBJECT_STATUS_DISGUISED ) )
 		{
@@ -1318,7 +1313,7 @@ Bool ActionManager::canDisableBuildingViaHacking( const Object *obj, const Objec
 	{
 		return FALSE;
 	}
-	
+
 	SpecialPowerModuleInterface *spInterface = obj->findSpecialPowerModuleInterface( SPECIAL_HACKER_DISABLE_BUILDING );
 	if( !spInterface || spInterface->getPercentReady() < 1.0f )
 	{
@@ -1355,13 +1350,13 @@ Bool ActionManager::canDisableBuildingViaHacking( const Object *obj, const Objec
 		return FALSE;
 	}
 
-	
+
 	if ( objectToHack->isKindOf( KINDOF_REBUILD_HOLE ) || objectToHack->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ))
 		return FALSE;
 
 
 	//If the enemy unit is stealthed and not detected, then we can't attack it!
-	if( objectToHack->testStatus( OBJECT_STATUS_STEALTHED ) && 
+	if( objectToHack->testStatus( OBJECT_STATUS_STEALTHED ) &&
 			!objectToHack->testStatus( OBJECT_STATUS_DETECTED ) &&
 			!objectToHack->testStatus( OBJECT_STATUS_DISGUISED ) )
 	{
@@ -1417,7 +1412,7 @@ Bool ActionManager::canSnipeVehicle( const Object *obj, const Object *objectToSn
 		{
 			return FALSE;
 		}
-		
+
 		//Can't be a drone type.
 		if( objectToSnipe->isKindOf( KINDOF_DRONE ) )
 		{
@@ -1436,9 +1431,16 @@ Bool ActionManager::canSnipeVehicle( const Object *obj, const Object *objectToSn
 			return FALSE;
 		}
 
+		// TheSuperHackers @bugfix Caball009 04/09/2025 Disabled bikes may not have a rider to snipe.
+		ContainModuleInterface* contain = objectToSnipe->getContain();
+		if ( contain && contain->isRiderChangeContain() && contain->getContainedItemsList()->empty() )
+		{
+			return FALSE;
+		}
+
 		return TRUE;
 	}
-	
+
 	return FALSE;
 }
 
@@ -1446,7 +1448,7 @@ Bool ActionManager::canSnipeVehicle( const Object *obj, const Object *objectToSn
 
 
 //-------------------------------------------------------------------------------------------------
-inline Bool isPointOnMap( const Coord3D  *testPos ) 
+inline Bool isPointOnMap( const Coord3D  *testPos )
 {
 	Region3D mapRegion;
 	TheTerrainLogic->getExtent( &mapRegion );
@@ -1479,7 +1481,7 @@ Bool ActionManager::canDoSpecialPowerAtLocation( const Object *obj, const Coord3
 				return false;
 			}
 		}
-    
+
 		// First check terrain type, if it is cared about.  Don't return a true, since there are more checks.
 		switch( spTemplate->getSpecialPowerType() )
 		{
@@ -1530,7 +1532,7 @@ Bool ActionManager::canDoSpecialPowerAtLocation( const Object *obj, const Coord3
 			case AIRF_SPECIAL_SPECTRE_GUNSHIP:
 			case SPECIAL_REPAIR_VEHICLES:
 			case EARLY_SPECIAL_REPAIR_VEHICLES:
-      case SPECIAL_GPS_SCRAMBLER:  
+      case SPECIAL_GPS_SCRAMBLER:
 			case SLTH_SPECIAL_GPS_SCRAMBLER:
 			case SPECIAL_ARTILLERY_BARRAGE:
 			case SPECIAL_FRENZY:
@@ -1596,7 +1598,7 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 	}
 
 	Relationship r = obj->getRelationship(target);
-	
+
 	SpecialPowerModuleInterface *mod = obj->getSpecialPowerModule( spTemplate );
 	if( mod )
 	{
@@ -1651,7 +1653,7 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 				break;
 
 			case SPECIAL_HACKER_DISABLE_BUILDING:
-				//Can only disable buildings... 
+				//Can only disable buildings...
 				if( target->isKindOf( KINDOF_STRUCTURE ) && r == ENEMIES )
 				{
 					//Make sure the building is considered hackable (temp: using capturable)
@@ -1662,19 +1664,19 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 					return true;
 				}
 				break;
-			
+
 			case SPECIAL_INFANTRY_CAPTURE_BUILDING:
 			case SPECIAL_BLACKLOTUS_CAPTURE_BUILDING:
 				return canCaptureBuilding( obj, target, commandSource );
 
 			case SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK:
 				return canDisableVehicleViaHacking( obj, target, commandSource, false );
-				
+
 			case SPECIAL_BLACKLOTUS_STEAL_CASH_HACK:
 				return canStealCashViaHacking( obj, target, commandSource );
 
 			case SPECIAL_CASH_HACK:
-				//Can only disable enemy supply centers. 
+				//Can only disable enemy supply centers.
 				if( target->isKindOf( KINDOF_STRUCTURE ) && r == ENEMIES )
 				{
 					//Make sure the building is considered hackable (temp: using capturable)
@@ -1682,13 +1684,13 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 					{
 						return FALSE;
 					}
-					
+
 					//Can't cash hack a building that's under construction.
 					if( target->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 					{
 						return FALSE;
 					}
-					
+
 					if (target->isKindOf( KINDOF_CASH_GENERATOR ) )
 					{
 						return true;
@@ -1697,9 +1699,9 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 				break;
 
 			case SPECIAL_DISGUISE_AS_VEHICLE:
-				if( target->isKindOf( KINDOF_VEHICLE ) 
-						&& !target->isKindOf( KINDOF_AIRCRAFT ) 
-						&& !target->isKindOf( KINDOF_BOAT ) 
+				if( target->isKindOf( KINDOF_VEHICLE )
+						&& !target->isKindOf( KINDOF_AIRCRAFT )
+						&& !target->isKindOf( KINDOF_BOAT )
 						&& !target->isKindOf( KINDOF_CLIFF_JUMPER ) )
 				{
 					//Don't allow it to disguise as another bomb truck -- that's just plain dumb.
@@ -1727,7 +1729,7 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 // "attack" Mines to disarm them...
 //				if ( target->isKindOf( KINDOF_CAN_ATTACK ) )
 					{
-						//neutral or same-team units are worthless defectors 
+						//neutral or same-team units are worthless defectors
 						if( r == ENEMIES )
 						{
 							return canMakeObjectDefector( obj, target, commandSource );
@@ -1827,7 +1829,7 @@ Bool ActionManager::canDoSpecialPowerAtObject( const Object *obj, const Object *
 							{
 								return false;
 							}
-						
+
 							return true;
 						}
 					}
@@ -1855,7 +1857,7 @@ Bool ActionManager::canDoSpecialPower( const Object *obj, const SpecialPowerTemp
 	SpecialPowerModuleInterface *mod = obj->getSpecialPowerModule( spTemplate );
 	if( mod )
 	{
-		if (checkSourceRequirements) 
+		if (checkSourceRequirements)
 		{
 			if( mod->getPercentReady() < 1.0f )
 			{
@@ -1980,7 +1982,7 @@ Bool ActionManager::canFireWeaponAtObject( const Object *obj, const Object *targ
 		result = obj->getAbleToAttackSpecificObject( ATTACK_NEW_TARGET, target, commandSource, slot );
 	else
 		result = obj->getAbleToAttackSpecificObject( ATTACK_NEW_TARGET, target, commandSource );
-	
+
 	if( result == ATTACKRESULT_POSSIBLE || result == ATTACKRESULT_POSSIBLE_AFTER_MOVING )
 	{
 		return weapon->estimateWeaponDamage( obj, target ) != 0.0f;
@@ -2005,7 +2007,7 @@ Bool ActionManager::canFireWeapon( const Object *obj, const WeaponSlotType slot,
 	}
 
 	return true;
-	
+
 }
 
 //------------------------------------------------------------------------------------------------
@@ -2022,11 +2024,11 @@ Bool ActionManager::canGarrison( const Object *obj, const Object *target, Comman
 		return false;
 
 	ContainModuleInterface *objCMI = obj->getContain();
-	if (!objCMI) 
+	if (!objCMI)
 		return false;
 
 	ContainModuleInterface *cmi = target->getContain();
-	if (cmi == NULL) 
+	if (cmi == NULL)
 		return false;
 
 	if (cmi->isGarrisonable() == false)
@@ -2051,7 +2053,7 @@ Bool ActionManager::canPlayerGarrison( const Player *player, const Object *targe
 {
 	if (!(player && target))
 		return false;
-	
+
 	if (target->isEffectivelyDead()) {
 		return false;
 	}
@@ -2060,7 +2062,7 @@ Bool ActionManager::canPlayerGarrison( const Player *player, const Object *targe
 		return false;
 
 	ContainModuleInterface *cmi = target->getContain();
-	if (cmi == NULL) 
+	if (cmi == NULL)
 		return false;
 
 	if (cmi->isGarrisonable() == false)
@@ -2077,7 +2079,7 @@ Bool ActionManager::canPlayerGarrison( const Player *player, const Object *targe
 		return cmi->getContainCount() == 0;
 	}
 
-	return false;	
+	return false;
 }
 
 //------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Energy.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Energy.cpp
index 4b2eb27110d..a0928add8f7 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Energy.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Energy.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Energy.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,7 +42,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Energy.h"
 #include "Common/Player.h"
@@ -53,11 +53,6 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Object.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 Energy::Energy()
@@ -70,19 +65,19 @@ Energy::Energy()
 
 //-----------------------------------------------------------------------------
 Int Energy::getProduction() const
-{ 
+{
 	if( TheGameLogic->getFrame() < m_powerSabotagedTillFrame )
 	{
 		//Power sabotaged, therefore no power.
 		return 0;
 	}
-	return m_energyProduction; 
+	return m_energyProduction;
 }
 
 //-----------------------------------------------------------------------------
-Real Energy::getEnergySupplyRatio() const 
-{ 
-	DEBUG_ASSERTCRASH(m_energyProduction >= 0 && m_energyConsumption >= 0, ("neg Energy numbers\n"));
+Real Energy::getEnergySupplyRatio() const
+{
+	DEBUG_ASSERTCRASH(m_energyProduction >= 0 && m_energyConsumption >= 0, ("neg Energy numbers"));
 
 	if( TheGameLogic->getFrame() < m_powerSabotagedTillFrame )
 	{
@@ -115,7 +110,7 @@ void Energy::adjustPower(Int powerDelta, Bool adding)
 	}
 
 	if (powerDelta > 0) {
-		if (adding) { 
+		if (adding) {
 			addProduction(powerDelta);
 		} else {
 			addProduction(-powerDelta);
@@ -150,11 +145,11 @@ void Energy::objectEnteringInfluence( Object *obj )
 		addProduction( energy );
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0, 
+	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0,
 										 ("Energy - Negative Energy numbers, Produce=%d Consume=%d\n",
 										 m_energyProduction, m_energyConsumption) );
 
-}  // end objectEnteringInfluence
+}
 
 //-------------------------------------------------------------------------------------------------
 /** 'obj' will now no longer add/subtrack from this energy construct */
@@ -176,7 +171,7 @@ void Energy::objectLeavingInfluence( Object *obj )
 		addProduction( -energy );
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0, 
+	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0,
 										 ("Energy - Negative Energy numbers, Produce=%d Consume=%d\n",
 										 m_energyProduction, m_energyConsumption) );
 
@@ -196,7 +191,7 @@ void Energy::addPowerBonus( Object *obj )
 	addProduction(obj->getTemplate()->getEnergyBonus());
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0, 
+	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0,
 										 ("Energy - Negative Energy numbers, Produce=%d Consume=%d\n",
 										 m_energyProduction, m_energyConsumption) );
 
@@ -212,14 +207,20 @@ void Energy::removePowerBonus( Object *obj )
 	if( obj == NULL )
 		return;
 
+	// TheSuperHackers @bugfix Caball009 14/11/2025 Don't remove power bonus for disabled power plants.
+#if !RETAIL_COMPATIBLE_CRC
+	if ( obj->isDisabled() )
+		return;
+#endif
+
 	addProduction( -obj->getTemplate()->getEnergyBonus() );
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0, 
+	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0,
 										 ("Energy - Negative Energy numbers, Produce=%d Consume=%d\n",
 										 m_energyProduction, m_energyConsumption) );
 
-}  // end removePowerBonus
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -227,7 +228,7 @@ void Energy::removePowerBonus( Object *obj )
 // ------------------------------------------------------------------------------------------------
 void Energy::addProduction(Int amt)
 {
-	m_energyProduction += amt; 
+	m_energyProduction += amt;
 
 	if( m_owner == NULL )
 		return;
@@ -240,7 +241,7 @@ void Energy::addProduction(Int amt)
 // ------------------------------------------------------------------------------------------------
 void Energy::addConsumption(Int amt)
 {
-	m_energyConsumption += amt; 
+	m_energyConsumption += amt;
 
 	if( m_owner == NULL )
 		return;
@@ -254,7 +255,7 @@ void Energy::addConsumption(Int amt)
 void Energy::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -275,7 +276,7 @@ void Energy::xfer( Xfer *xfer )
 	// production
 	if( version < 2 )
 		xfer->xferInt( &m_energyProduction );
-	
+
 	// consumption
 	if( version < 2 )
 		xfer->xferInt( &m_energyConsumption );
@@ -293,7 +294,7 @@ void Energy::xfer( Xfer *xfer )
 		xfer->xferUnsignedInt( &m_powerSabotagedTillFrame );
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -301,4 +302,4 @@ void Energy::xfer( Xfer *xfer )
 void Energy::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Handicap.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Handicap.cpp
index da5091a8f41..4261129cf8a 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Handicap.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Handicap.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Handicap.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,7 +42,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Handicap.h"
 #include "Common/Player.h"
@@ -50,7 +50,7 @@
 #include "Common/ThingTemplate.h"
 
 //-----------------------------------------------------------------------------
-Handicap::Handicap() 
+Handicap::Handicap()
 {
 	init();
 }
@@ -66,10 +66,10 @@ void Handicap::init()
 //-----------------------------------------------------------------------------
 void Handicap::readFromDict(const Dict* d)
 {
-	// this isn't very efficient, but is only called at load times, 
+	// this isn't very efficient, but is only called at load times,
 	// so it probably doesn't really matter.
 
-	const char* htNames[HANDICAP_TYPE_COUNT] = 
+	const char* htNames[HANDICAP_TYPE_COUNT] =
 	{
 		"BUILDCOST",
 		"BUILDTIME",
@@ -80,7 +80,7 @@ void Handicap::readFromDict(const Dict* d)
 //		"INCOME"
 	};
 
-	const char* ttNames[THING_TYPE_COUNT] = 
+	const char* ttNames[THING_TYPE_COUNT] =
 	{
 		"GENERIC",
 		"BUILDINGS",
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/MissionStats.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/MissionStats.cpp
index 979a9863f13..74d839daa37 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/MissionStats.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/MissionStats.cpp
@@ -24,12 +24,12 @@
 
 // FILE: MissionStats.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,20 +42,20 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/MissionStats.h"
 #include "Common/Player.h"
 #include "Common/Xfer.h"
 
 //-----------------------------------------------------------------------------
-MissionStats::MissionStats() 
+MissionStats::MissionStats()
 {
 	init();
 }
 
 //-----------------------------------------------------------------------------
-void MissionStats::init() 
+void MissionStats::init()
 {
 	Int i;
 
@@ -75,7 +75,7 @@ void MissionStats::init()
 void MissionStats::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -102,7 +102,7 @@ void MissionStats::xfer( Xfer *xfer )
 	// buildings lost
 	xfer->xferInt( &m_buildingsLost );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -110,4 +110,4 @@ void MissionStats::xfer( Xfer *xfer )
 void MissionStats::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Money.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Money.cpp
index 9c3fabc5813..ed1a177ad38 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Money.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Money.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Money.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,31 +42,36 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Money.h"
 
+#include "Common/AudioSettings.h"
 #include "Common/GameAudio.h"
 #include "Common/MiscAudio.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Xfer.h"
+#include "GameLogic/GameLogic.h"
 
 // ------------------------------------------------------------------------------------------------
 UnsignedInt Money::withdraw(UnsignedInt amountToWithdraw, Bool playSound)
 {
+#if defined(RTS_DEBUG)
+	Player* player = ThePlayerList->getNthPlayer(m_playerIndex);
+	if (player != NULL && player->buildsForFree())
+		return 0;
+#endif
+
 	if (amountToWithdraw > m_money)
 		amountToWithdraw = m_money;
 
 	if (amountToWithdraw == 0)
 		return amountToWithdraw;
 
-	//@todo: Do we do this frequently enough that it is a performance hit?
-	AudioEventRTS event = TheAudio->getMiscAudio()->m_moneyWithdrawSound;
-	event.setPlayerIndex(m_playerIndex);
-
-	// Play a sound
 	if (playSound)
-		TheAudio->addAudioEvent(&event);
+	{
+		triggerAudioEvent(TheAudio->getMiscAudio()->m_moneyWithdrawSound);
+	}
 
 	m_money -= amountToWithdraw;
 
@@ -74,19 +79,22 @@ UnsignedInt Money::withdraw(UnsignedInt amountToWithdraw, Bool playSound)
 }
 
 // ------------------------------------------------------------------------------------------------
-void Money::deposit(UnsignedInt amountToDeposit, Bool playSound)
+void Money::deposit(UnsignedInt amountToDeposit, Bool playSound, Bool trackIncome)
 {
 	if (amountToDeposit == 0)
 		return;
 
-	//@todo: Do we do this frequently enough that it is a performance hit?
-	AudioEventRTS event = TheAudio->getMiscAudio()->m_moneyDepositSound;
-	event.setPlayerIndex(m_playerIndex);
-
-	// Play a sound
 	if (playSound)
-		TheAudio->addAudioEvent(&event);
-	
+	{
+		triggerAudioEvent(TheAudio->getMiscAudio()->m_moneyDepositSound);
+	}
+
+	if (trackIncome)
+	{
+		m_incomeBuckets[m_currentBucket] += amountToDeposit;
+		m_cashPerMinute += amountToDeposit;
+	}
+
 	m_money += amountToDeposit;
 
 	if( amountToDeposit > 0 )
@@ -99,31 +107,89 @@ void Money::deposit(UnsignedInt amountToDeposit, Bool playSound)
 	}
 }
 
+// ------------------------------------------------------------------------------------------------
+void Money::setStartingCash(UnsignedInt amount)
+{
+	m_money = amount;
+	std::fill(m_incomeBuckets, m_incomeBuckets + ARRAY_SIZE(m_incomeBuckets), 0u);
+	m_currentBucket = 0u;
+	m_cashPerMinute = 0u;
+}
+
+// ------------------------------------------------------------------------------------------------
+void Money::updateIncomeBucket()
+{
+	UnsignedInt frame = TheGameLogic->getFrame();
+	UnsignedInt nextBucket = (frame / LOGICFRAMES_PER_SECOND) % ARRAY_SIZE(m_incomeBuckets);
+	if (nextBucket != m_currentBucket)
+	{
+		m_cashPerMinute -= m_incomeBuckets[nextBucket];
+		m_currentBucket = nextBucket;
+		m_incomeBuckets[m_currentBucket] = 0u;
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+UnsignedInt Money::getCashPerMinute() const
+{
+	return m_cashPerMinute;
+}
+
+void Money::triggerAudioEvent(const AudioEventRTS& audioEvent)
+{
+	Real volume = TheAudio->getAudioSettings()->m_preferredMoneyTransactionVolume;
+	volume *= audioEvent.getVolume();
+	if (volume <= 0.0f)
+		return;
+
+	//@todo: Do we do this frequently enough that it is a performance hit?
+	AudioEventRTS event = audioEvent;
+	event.setPlayerIndex(m_playerIndex);
+	event.setVolume(volume);
+	TheAudio->addAudioEvent(&event);
+}
+
 // ------------------------------------------------------------------------------------------------
 /** CRC */
 // ------------------------------------------------------------------------------------------------
 void Money::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version */
+	* 1: Initial version
+	* 2: Add saveload support for the cash per minute income tracking */
 // ------------------------------------------------------------------------------------------------
 void Money::xfer( Xfer *xfer )
 {
 
 	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
 	XferVersion currentVersion = 1;
+#else
+	XferVersion currentVersion = 2;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
 	// money value
 	xfer->xferUnsignedInt( &m_money );
 
-}  // end xfer
+	if (version <= 1)
+	{
+		setStartingCash(m_money);
+	}
+	else
+	{
+		xfer->xferUser(m_incomeBuckets, sizeof(m_incomeBuckets));
+		xfer->xferUnsignedInt(&m_currentBucket);
+
+		m_cashPerMinute = std::accumulate(m_incomeBuckets, m_incomeBuckets + ARRAY_SIZE(m_incomeBuckets), 0u);
+	}
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -131,7 +197,7 @@ void Money::xfer( Xfer *xfer )
 void Money::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -141,5 +207,7 @@ void Money::parseMoneyAmount( INI *ini, void *instance, void *store, const void*
 {
   // Someday, maybe, have mulitple fields like Gold:10000 Wood:1000 Tiberian:10
   Money * money = (Money *)store;
-  INI::parseUnsignedInt( ini, instance, &money->m_money, userData );
+	UnsignedInt moneyAmount;
+	INI::parseUnsignedInt( ini, instance, &moneyAmount, userData );
+	money->setStartingCash(moneyAmount);
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
index d096a602fda..ec98aa370d6 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Player.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,7 +42,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_SCIENCE_AVAILABILITY_NAMES
 
@@ -101,13 +101,8 @@
 
 #include "GameNetwork/GameInfo.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
-//Grey for neutral.  
+//Grey for neutral.
 #define NEUTRAL_PLAYER_COLOR 0xffffffff
 
 // ------------------------------------------------------------------------------------------------
@@ -152,7 +147,7 @@ static void findClosestKindOf( Object *obj, void *userData )
 	{
 		closestData->m_closest = obj;
 		closestData->m_closestDistSq = distSq;
-	} 
+	}
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -165,7 +160,7 @@ static void findClosestKindOf( Object *obj, void *userData )
 AsciiString kindofMaskAsAsciiString(KindOfMaskType m)
 {
 	AsciiString s;
-	const char** kindofNames = KindOfMaskType::getBitNames();
+	const char* const* kindofNames = KindOfMaskType::getBitNames();
 	for (Int i=KINDOF_FIRST; i<KINDOF_COUNT; ++i)
 	{
 		if (m.test(i))
@@ -181,7 +176,7 @@ AsciiString kindofMaskAsAsciiString(KindOfMaskType m)
 }
 void dumpBattlePlanBonuses(const BattlePlanBonuses *b, AsciiString name, const Player *p, const Object *o, AsciiString fname, Int line, Bool doDebugLog)
 {
-	CRCDEBUG_LOG(("dumpBattlePlanBonuses() %s:%d %s\n  Player %d(%ls) object %d(%s) armor:%g/%8.8X bombardment:%d, holdTheLine:%d, searchAndDestroy:%d sight:%g/%8.8X, valid:%s invalid:%s\n",
+	CRCDEBUG_LOG(("dumpBattlePlanBonuses() %s:%d %s\n  Player %d(%ls) object %d(%s) armor:%g/%8.8X bombardment:%d, holdTheLine:%d, searchAndDestroy:%d sight:%g/%8.8X, valid:%s invalid:%s",
 		fname.str(), line, name.str(),
 		(p)?p->getPlayerIndex():-1, (p)?((Player *)p)->getPlayerDisplayName().str():L"<No Name>", (o)?o->getID():-1, (o)?o->getTemplate()->getName().str():"<No Name>",
 		b->m_armorScalar, AS_INT(b->m_armorScalar),
@@ -191,7 +186,7 @@ void dumpBattlePlanBonuses(const BattlePlanBonuses *b, AsciiString name, const P
 		kindofMaskAsAsciiString(b->m_invalidKindOf).str()));
 	if (!doDebugLog)
 		return;
-	DEBUG_LOG(("dumpBattlePlanBonuses() %s:%d %s\n  Player %d(%ls) object %d(%s) armor:%g/%8.8X bombardment:%d, holdTheLine:%d, searchAndDestroy:%d sight:%g/%8.8X, valid:%s invalid:%s\n",
+	DEBUG_LOG(("dumpBattlePlanBonuses() %s:%d %s\n  Player %d(%ls) object %d(%s) armor:%g/%8.8X bombardment:%d, holdTheLine:%d, searchAndDestroy:%d sight:%g/%8.8X, valid:%s invalid:%s",
 		fname.str(), line, name.str(),
 		(p)?p->getPlayerIndex():-1, (p)?((Player *)p)->getPlayerDisplayName().str():L"<No Name>", (o)?o->getID():-1, (o)?o->getTemplate()->getName().str():"<No Name>",
 		b->m_armorScalar, AS_INT(b->m_armorScalar),
@@ -210,7 +205,7 @@ void dumpBattlePlanBonuses(const BattlePlanBonuses *b, AsciiString name, const P
 PlayerRelationMap::PlayerRelationMap( void )
 {
 
-}  // end PlayerRelationMap
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -220,7 +215,7 @@ PlayerRelationMap::~PlayerRelationMap( void )
 	// make sure the data is cleared
 	m_map.clear();
 
-}  // end ~PlayerRelationmap
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -228,12 +223,12 @@ PlayerRelationMap::~PlayerRelationMap( void )
 void PlayerRelationMap::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	*/
 // ------------------------------------------------------------------------------------------------
 void PlayerRelationMap::xfer( Xfer *xfer )
@@ -258,7 +253,7 @@ void PlayerRelationMap::xfer( Xfer *xfer )
 		// go through all player relations
 		for( playerRelationIt = m_map.begin(); playerRelationIt != m_map.end(); ++playerRelationIt )
 		{
-		
+
 			// write player index
 			playerIndex = (*playerRelationIt).first;
 			xfer->xferInt( &playerIndex );
@@ -267,12 +262,12 @@ void PlayerRelationMap::xfer( Xfer *xfer )
 			r = (*playerRelationIt).second;
 			xfer->xferUser( &r, sizeof( Relationship ) );
 
-		}  // end for, playerRelationIt
-					
-	}  // end if, save
+		}
+
+	}
 	else
 	{
-			
+
 		for( UnsignedShort i = 0; i < playerRelationCount; ++i )
 		{
 
@@ -284,12 +279,12 @@ void PlayerRelationMap::xfer( Xfer *xfer )
 
 			// assign relationship
 			m_map[ playerIndex ] = r;
-				
-		}  // end for, i
 
-	}  // end else, load
+		}
 
-}  // end xfer
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -297,7 +292,7 @@ void PlayerRelationMap::xfer( Xfer *xfer )
 void PlayerRelationMap::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //=============================================================================
 Player::Player( Int playerIndex )
@@ -326,8 +321,6 @@ Player::Player( Int playerIndex )
 	m_playerTemplate = NULL;
 	m_battlePlanBonuses = NULL;
 	m_skillPointsModifier = 1.0f;
-	//Added By Sadullah 
-	//Initializations inserted
 	m_canBuildUnits = TRUE;
 	m_canBuildBase  = TRUE;
 	m_cashBountyPercent = 0.0f;
@@ -344,8 +337,7 @@ Player::Player( Int playerIndex )
 	{
 		m_squads[i] = NULL;
 	}
-	//
-	for (i = 0; i < MAX_PLAYER_COUNT; ++i) 
+	for (i = 0; i < MAX_PLAYER_COUNT; ++i)
 	{
 		m_attackedBy[i] = false;
 	}
@@ -360,7 +352,7 @@ Player::Player( Int playerIndex )
 void Player::init(const PlayerTemplate* pt)
 {
 
-	DEBUG_ASSERTCRASH(m_playerTeamPrototypes.size() == 0, ("Player::m_playerTeamPrototypes is not empty at game start!\n"));
+	DEBUG_ASSERTCRASH(m_playerTeamPrototypes.empty(), ("Player::m_playerTeamPrototypes is not empty at game start!"));
 	m_skillPointsModifier = 1.0f;
 	m_attackedFrame = 0;
 
@@ -374,55 +366,37 @@ void Player::init(const PlayerTemplate* pt)
 	m_bombardBattlePlans = 0;
 	m_holdTheLineBattlePlans = 0;
 	m_searchAndDestroyBattlePlans = 0;
-	if( m_battlePlanBonuses )
-	{
-		deleteInstance(m_battlePlanBonuses);
-		m_battlePlanBonuses = NULL;
-	}
+
+	deleteInstance(m_battlePlanBonuses);
+	m_battlePlanBonuses = NULL;
 
 	deleteUpgradeList();
 
 	m_energy.init(this);
 	m_stats.init();
-	if (m_pBuildList != NULL) 
-	{
-		deleteInstance(m_pBuildList);
-		m_pBuildList = NULL;
-	}
+
+	deleteInstance(m_pBuildList);
+	m_pBuildList = NULL;
+
 	m_defaultTeam = NULL;
 
-	if (m_ai)
-	{
-		deleteInstance(m_ai);
-	}
+	deleteInstance(m_ai);
 	m_ai = NULL;
 
-	if( m_resourceGatheringManager )
-	{
-		deleteInstance(m_resourceGatheringManager);
-		m_resourceGatheringManager = NULL;
-	}
+	deleteInstance(m_resourceGatheringManager);
+	m_resourceGatheringManager = NULL;
 
 	for (Int i = 0; i < NUM_HOTKEY_SQUADS; ++i) {
-		if (m_squads[i] != NULL) {
-			deleteInstance(m_squads[i]);
-			m_squads[i] = NULL;
-		}
-		m_squads[i] = newInstance(Squad);	
+		deleteInstance(m_squads[i]);
+		m_squads[i] = newInstance(Squad);
 	}
 
-	if (m_currentSelection != NULL) {
-		deleteInstance(m_currentSelection) ;
-		m_currentSelection = NULL;
-	}
+	deleteInstance(m_currentSelection);
 	m_currentSelection = newInstance(Squad);
-	
-	if( m_tunnelSystem )
-	{
-		deleteInstance(m_tunnelSystem);
-		m_tunnelSystem = NULL;
-	}
-	
+
+	deleteInstance(m_tunnelSystem);
+	m_tunnelSystem = NULL;
+
 	m_canBuildBase = true;
 	m_canBuildUnits = true;
 	m_observer = false;
@@ -431,12 +405,12 @@ void Player::init(const PlayerTemplate* pt)
 
 	m_unitsShouldHunt = FALSE;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	m_DEMO_ignorePrereqs = FALSE;
 	m_DEMO_freeBuild = FALSE;
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	m_DEMO_instantBuild = FALSE;
 #endif
 
@@ -457,14 +431,16 @@ void Player::init(const PlayerTemplate* pt)
 
 		if( m_money.countMoney() == 0 )
 		{
-      if ( TheGameInfo )
-      {
-        m_money = TheGameInfo->getStartingCash();
-      }
-      else
-      {
-  			m_money = TheGlobalData->m_defaultStartingCash;
-      }
+			// TheSuperHackers @bugfix Now correctly deposits the money and fixes its audio and academy issues.
+			// Note that copying the entire Money class instead would also copy the player index inside of it.
+			if ( TheGameInfo )
+			{
+				m_money.deposit( TheGameInfo->getStartingCash().countMoney(), FALSE, FALSE );
+			}
+			else
+			{
+				m_money.deposit( TheGlobalData->m_defaultStartingCash.countMoney(), FALSE, FALSE );
+			}
 		}
 
 		m_playerDisplayName.clear();
@@ -512,8 +488,7 @@ void Player::init(const PlayerTemplate* pt)
 	{
 		KindOfPercentProductionChange *tof = *it;
 		it = m_kindOfPercentProductionChangeList.erase( it );
-		if(tof)
-			deleteInstance(tof);
+		deleteInstance(tof);
 	}
 
 	getAcademyStats()->init( this );
@@ -529,7 +504,7 @@ Player::~Player()
 	m_defaultTeam = NULL;
 	m_playerTemplate = NULL;
 
-	for( PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for( PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
 	{
 		(*it)->friend_setOwningPlayer(NULL);
@@ -538,25 +513,21 @@ Player::~Player()
 
 	// delete the relation maps (the destructor clears the actual map if any data is present)
 	deleteInstance(m_teamRelations);
+	m_teamRelations = NULL;
+
 	deleteInstance(m_playerRelations);
+	m_playerRelations = NULL;
 
 	for (Int i = 0; i < NUM_HOTKEY_SQUADS; ++i) {
-		if (m_squads[i] != NULL) {
-			deleteInstance(m_squads[i]);
-			m_squads[i] = NULL;
-		}
+		deleteInstance(m_squads[i]);
+		m_squads[i] = NULL;
 	}
 
-	if (m_currentSelection != NULL) {
-		deleteInstance(m_currentSelection);
-		m_currentSelection = NULL;
-	}
+	deleteInstance(m_currentSelection);
+	m_currentSelection = NULL;
 
-	if( m_battlePlanBonuses )
-	{
-		deleteInstance(m_battlePlanBonuses);
-		m_battlePlanBonuses = NULL;
-	}
+	deleteInstance(m_battlePlanBonuses);
+	m_battlePlanBonuses = NULL;
 }
 
 //=============================================================================
@@ -569,13 +540,13 @@ Relationship Player::getRelationship(const Team *that) const
 		// do we have an override for that particular team? if so, return it.
 		if (!m_teamRelations->m_map.empty())
 		{
-			TeamRelationMapType::const_iterator it = m_teamRelations->m_map.find(that->getID());			
+			TeamRelationMapType::const_iterator it = m_teamRelations->m_map.find(that->getID());
 			if (it != m_teamRelations->m_map.end())
 			{
 				return (*it).second;
 			}
 		}
-		
+
 		// hummm... well, do we have something for that team's player?
 		if (!m_playerRelations->m_map.empty())
 		{
@@ -663,26 +634,23 @@ Bool Player::removeTeamRelationship(const Team *that)
 void Player::setBuildList(BuildListInfo *pBuildList)
 {
 
-	if (m_pBuildList != NULL) 
-	{
-		deleteInstance(m_pBuildList);
-	}
+	deleteInstance(m_pBuildList);
 	m_pBuildList = pBuildList;
 
-} 
+}
 
 //=============================================================================
 void Player::addToBuildList(Object *obj)
 {
 	BuildListInfo *newInfo = newInstance( BuildListInfo );
-	newInfo->setObjectID(obj->getID());	
+	newInfo->setObjectID(obj->getID());
 	newInfo->setTemplateName(obj->getTemplate()->getName());
 	newInfo->setLocation(*obj->getPosition());
 	newInfo->setAngle(obj->getOrientation());
-	newInfo->setNumRebuilds(0);	 // Can't rebuild. 
+	newInfo->setNumRebuilds(0);	 // Can't rebuild.
 	newInfo->setNextBuildList(m_pBuildList);
 	m_pBuildList = newInfo;
-} 
+}
 
 //=============================================================================
 void Player::addToPriorityBuildList(AsciiString templateName, Coord3D *pos, Real angle)
@@ -692,10 +660,10 @@ void Player::addToPriorityBuildList(AsciiString templateName, Coord3D *pos, Real
 	newInfo->setLocation(*pos);
 	newInfo->setAngle(angle);
 	newInfo->markPriorityBuild();
-	newInfo->setNumRebuilds(1);	 // Build once. 
+	newInfo->setNumRebuilds(1);	 // Build once.
 	newInfo->setNextBuildList(m_pBuildList);
 	m_pBuildList = newInfo;
-} 
+}
 
 //=============================================================================
 void Player::update()
@@ -704,12 +672,12 @@ void Player::update()
 		m_ai->update();
 
 	// Allow the teams this player owns to update themselves.
-	for( PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); it != m_playerTeamPrototypes.end(); ++it ) 
+	for( PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); it != m_playerTeamPrototypes.end(); ++it )
 	{
-		for( DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance() ) 
+		for( DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance() )
 		{
 			Team *team = iter.cur();
-			if( !team ) 
+			if( !team )
 			{
 				continue;
 			}
@@ -745,6 +713,16 @@ void Player::update()
 			}
 		}
 	}
+
+#if !PRESERVE_RETAIL_BEHAVIOR && !RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix Stubbjax 26/09/2025 The Tunnel System now heals
+	// all units once per frame instead of once per frame per Tunnel Network.
+	TunnelTracker* tunnelSystem = getTunnelSystem();
+	if (tunnelSystem)
+		tunnelSystem->healObjects();
+#endif
+
+	m_money.updateIncomeBucket();
 }
 
 //=============================================================================
@@ -759,10 +737,7 @@ void Player::setPlayerType(PlayerType t, Bool skirmish)
 {
 	m_playerType = t;
 
-	if (m_ai)
-	{
-		deleteInstance(m_ai);
-	}
+	deleteInstance(m_ai);
 	m_ai = NULL;
 
 	if (t == PLAYER_COMPUTER)
@@ -795,11 +770,8 @@ void Player::setDefaultTeam(void) {
 //=============================================================================
 void Player::deletePlayerAI()
 {
-	if (m_ai)
-	{
-		deleteInstance(m_ai);
-		m_ai = NULL;
-	}
+	deleteInstance(m_ai);
+	m_ai = NULL;
 }
 
 //=============================================================================
@@ -809,8 +781,8 @@ void Player::initFromDict(const Dict* d)
 {
 	AsciiString tmplname = d->getAsciiString(TheKey_playerFaction);
 	const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(tmplname));
-	DEBUG_ASSERTCRASH(pt != NULL, ("PlayerTemplate %s not found -- this is an obsolete map (please open and resave in WB)\n",tmplname.str()));
-	
+	DEBUG_ASSERTCRASH(pt != NULL, ("PlayerTemplate %s not found -- this is an obsolete map (please open and resave in WB)",tmplname.str()));
+
 	init(pt);
 
 	m_playerDisplayName = d->getUnicodeString(TheKey_playerDisplayName);
@@ -832,7 +804,7 @@ void Player::initFromDict(const Dict* d)
 		{
 			AsciiString spTemplateName = TheSidesList->getSkirmishSideInfo(spIdx)->getDict()->getAsciiString(TheKey_playerFaction);
 			const PlayerTemplate* spt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(spTemplateName));
-			if (spt && spt->getSide() == getSide()) 
+			if (spt && spt->getSide() == getSide())
 			{
 				skirmish = true;
 				break;
@@ -873,10 +845,10 @@ void Player::initFromDict(const Dict* d)
 
 				ScriptList *scripts = TheSidesList->getSkirmishSideInfo(i)->getScriptList()->duplicateAndQualify(
 							qualifier, qualTemplatePlayerName, pname);
-				if (TheSidesList->getSideInfo(getPlayerIndex())->getScriptList()) {
-					deleteInstance(TheSidesList->getSideInfo(getPlayerIndex())->getScriptList());
-				}
+
+				deleteInstance(TheSidesList->getSideInfo(getPlayerIndex())->getScriptList());
 				TheSidesList->getSideInfo(getPlayerIndex())->setScriptList(scripts);
+
 				deleteInstance(TheSidesList->getSkirmishSideInfo(i)->getScriptList());
 				TheSidesList->getSkirmishSideInfo(i)->setScriptList(NULL);
 			}
@@ -907,16 +879,16 @@ void Player::initFromDict(const Dict* d)
 		}
 		Int diffInt  = d->getInt(TheKey_skirmishDifficulty, &exists);
 		GameDifficulty difficulty = TheScriptEngine->getGlobalDifficulty();
-		if (exists) 
+		if (exists)
 		{
 			difficulty = (GameDifficulty) diffInt;
 		}
-		if (m_ai) 
+		if (m_ai)
 		{
 			m_ai->setAIDifficulty(difficulty);
 		}
 
-		if (!found) 
+		if (!found)
 		{
 			DEBUG_CRASH(("Could not find skirmish player for side %s", mySide.str()));
 		} else {
@@ -925,12 +897,10 @@ void Player::initFromDict(const Dict* d)
 			qualifier.format("%d", m_mpStartIndex);
 			ScriptList *scripts = TheSidesList->getSkirmishSideInfo(skirmishNdx)->getScriptList()->duplicateAndQualify(
 						qualifier, qualTemplatePlayerName, pname);
-			ScriptList* slist = TheSidesList->getSideInfo(getPlayerIndex())->getScriptList();
-			if (slist) 
-			{
-				deleteInstance(slist);
-			}
+
+			deleteInstance(TheSidesList->getSideInfo(getPlayerIndex())->getScriptList());
 			TheSidesList->getSideInfo(getPlayerIndex())->setScriptList(scripts);
+
 			for (i=0; i<TheSidesList->getNumTeams(); i++) {
 				if (TheSidesList->getTeamInfo(i)->getDict()->getAsciiString(TheKey_teamOwner) == pname)
 				{
@@ -946,7 +916,7 @@ void Player::initFromDict(const Dict* d)
 				if (TheSidesList->getSkirmishTeamInfo(i)->getDict()->getAsciiString(TheKey_teamOwner) == originalPlayerName)
 				{
 					Dict teamDict(*TheSidesList->getSkirmishTeamInfo(i)->getDict());
-					AsciiString teamName = teamDict.getAsciiString(TheKey_teamName); 
+					AsciiString teamName = teamDict.getAsciiString(TheKey_teamName);
 					AsciiString newName;
 					newName.format("%s%d", teamDict.getAsciiString(TheKey_teamName).str(), m_mpStartIndex);
 
@@ -955,7 +925,7 @@ void Player::initFromDict(const Dict* d)
 					teamDict.setAsciiString(TheKey_teamName, newName);
 					// qualify scripts.
 
-					NameKeyType nameKeys[] = 
+					NameKeyType nameKeys[] =
 					{
 						TheKey_teamOnCreateScript,
 						TheKey_teamOnIdleScript,
@@ -995,20 +965,13 @@ void Player::initFromDict(const Dict* d)
 					TheSidesList->addTeam(&teamDict);
 				}
 			}
-		}						 
-	}																																 
-	if( m_resourceGatheringManager )
-	{
-		deleteInstance(m_resourceGatheringManager);
-		m_resourceGatheringManager = NULL;
+		}
 	}
+
+	deleteInstance(m_resourceGatheringManager);
 	m_resourceGatheringManager = newInstance(ResourceGatheringManager);
 
-	if( m_tunnelSystem )
-	{
-		deleteInstance(m_tunnelSystem);
-		m_tunnelSystem = NULL;
-	}
+	deleteInstance(m_tunnelSystem);
 	m_tunnelSystem = newInstance(TunnelTracker);
 
 	m_handicap.readFromDict(d);
@@ -1016,10 +979,10 @@ void Player::initFromDict(const Dict* d)
 	/// @todo Ack!  the todo in PlayerList::reset() mentioning the need for a Player::reset() really needs to get done.
 	m_playerRelations->m_map.clear(); // For now, it has been decided to just fix this one.  Dear god me must reset.
 	m_teamRelations->m_map.clear(); // For now, it has been decided to just fix this one.  Dear god me must reset.
-	
+
 	Int i;
 	for ( i = 0; i < MAX_PLAYER_COUNT; ++i ) // For now, it has been decided to just fix this one.  Dear god me must reset.
-	{ 
+	{
 		m_attackedBy[i] = false;
 	}
 
@@ -1041,33 +1004,26 @@ void Player::initFromDict(const Dict* d)
 		m_money.deposit(m);
 
 	for ( i = 0; i < NUM_HOTKEY_SQUADS; ++i ) {
-		if (m_squads[i] != NULL)
-		{
-			deleteInstance(m_squads[i]);
-			m_squads[i] = NULL;
-		}
+		deleteInstance(m_squads[i]);
 		m_squads[i] = newInstance( Squad );
 	}
 
-	if (m_currentSelection != NULL) {
-		deleteInstance(m_currentSelection);
-		m_currentSelection = NULL;
-	}
+	deleteInstance(m_currentSelection);
 	m_currentSelection = newInstance( Squad );
 }
 
 //=============================================================================
-void Player::becomingTeamMember(Object *obj, Bool yes) 
-{ 
+void Player::becomingTeamMember(Object *obj, Bool yes)
+{
 	if (!obj)
-		return;	
+		return;
 
 	// energy production/consumption hooks, note we ignore things that are UNDER_CONSTRUCTION
 	if( !obj->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 	{
 		obj->friend_adjustPowerForPlayer(yes);
-	}  // end if
-		
+	}
+
 	// when we capture a building, we need to see if there's an AutoDepositUpdate hooked to it,
 	// if so, award the cash bonus
 	if(this != ThePlayerList->getNeutralPlayer() && yes)
@@ -1089,13 +1045,13 @@ void Player::becomingTeamMember(Object *obj, Bool yes)
 		else
 		{
 			//We are leaving a team with active battle plans so remove them now.
-			removeBattlePlanBonusesForObject( obj ); 
+			removeBattlePlanBonusesForObject( obj );
 		}
 	}
-	
 
-	if (obj->isKindOf(KINDOF_DOZER) 
-			&& obj->getAIUpdateInterface() 
+
+	if (obj->isKindOf(KINDOF_DOZER)
+			&& obj->getAIUpdateInterface()
 			&& obj->getAIUpdateInterface()->isIdle())
 	{
 		// Need to remove it from the pick a peasant button
@@ -1127,12 +1083,12 @@ void Player::becomingLocalPlayer(Bool yes)
 			{
 				// Added support for updating the perceptions of garrisoned buildings containing enemy stealth units.
 				// When changing teams, it is necessary to update this information.
+				Bool requireRadarRefresh = false;
 				ContainModuleInterface *contain = object->getContain();
 				if( contain )
 				{
 					contain->recalcApparentControllingPlayer();
-					TheRadar->removeObject( object );
-					TheRadar->addObject( object );
+					requireRadarRefresh = true;
 				}
 
 				if( object->isKindOf( KINDOF_DISGUISER ) )
@@ -1142,7 +1098,7 @@ void Player::becomingLocalPlayer(Bool yes)
 					Drawable *draw = object->getDrawable();
 					if( draw )
 					{
-            
+
             StealthUpdate *update = object->getStealth();
 
 						if( update && update->isDisguised() )
@@ -1164,11 +1120,16 @@ void Player::becomingLocalPlayer(Bool yes)
 								else
 									draw->setIndicatorColor( object->getIndicatorColor() );
 							}
-							TheRadar->removeObject( object );
-							TheRadar->addObject( object );
+							requireRadarRefresh = true;
 						}
 					}
 				}
+
+				if (requireRadarRefresh)
+				{
+					TheRadar->removeObject( object );
+					TheRadar->addObject( object );
+				}
 			}
 			deleteInstance(iter);
 		}
@@ -1187,7 +1148,7 @@ void Player::becomingLocalPlayer(Bool yes)
 //-------------------------------------------------------------------------------------------------
 Bool Player::isSkirmishAIPlayer( void )
 {
-	return m_ai ? m_ai->isSkirmishAI() : false; 
+	return m_ai ? m_ai->isSkirmishAI() : false;
 }
 
 
@@ -1209,7 +1170,7 @@ Bool Player::computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord3D
 //-------------------------------------------------------------------------------------------------
 Player  *Player::getCurrentEnemy( void )
 {
-	return m_ai?m_ai->getAiEnemy():NULL; 
+	return m_ai?m_ai->getAiEnemy():NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1217,8 +1178,8 @@ Player  *Player::getCurrentEnemy( void )
 // to find a player's command center, or a specific building capable of firing the specified
 // special power.
 //
-// if he has none, return null. 
-// if he has multiple, return one arbitrarily. 
+// if he has none, return null.
+// if he has multiple, return one arbitrarily.
 //-------------------------------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------------------------------
@@ -1246,7 +1207,7 @@ static void doFindCommandCenter(Object* obj, void* userData)
 
 	PlayerObjectFindInfo* info = (PlayerObjectFindInfo*)userData;
 
-	if (info->obj == NULL 
+	if (info->obj == NULL
 			&& obj->isKindOf(KINDOF_COMMANDCENTER)
 			&& obj->getTemplate()->getDefaultOwningSide() == info->player->getSide()
 			&& !obj->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION)
@@ -1269,7 +1230,7 @@ static void doFindSpecialPowerSourceObject( Object *obj, void *userData )
 		//We already found the best case scenario, so no need to iterate any more.
 		return;
 	}
-	if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) 
+	if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION )
 			&& !obj->testStatus( OBJECT_STATUS_SOLD )
 			&& !obj->isEffectivelyDead() )
 	{
@@ -1291,8 +1252,8 @@ static void doFindSpecialPowerSourceObject( Object *obj, void *userData )
 			if( spmInterface && !spmInterface->isScriptOnly() )
 			{
 				UnsignedInt readyFrame = spmInterface->getReadyFrame();
-				
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 				// Everything is ready if timers are debug off'd
 				if( ! TheGlobalData->m_specialPowerUsesDelay )
 					readyFrame = 0;
@@ -1331,8 +1292,8 @@ static void doCountSpecialPowersReady( Object *obj, void *userData )
 {
 	PlayerObjectFindInfo* info = (PlayerObjectFindInfo*)userData;
 
-	if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) 
-			&& !obj->testStatus( OBJECT_STATUS_SOLD ) 
+	if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION )
+			&& !obj->testStatus( OBJECT_STATUS_SOLD )
 			&& !obj->isEffectivelyDead() )
 	{
 		if( obj->hasSpecialPower( info->spType ) )
@@ -1346,10 +1307,10 @@ static void doCountSpecialPowersReady( Object *obj, void *userData )
 					//Shared powers don't stack after the first one is counted.
 					return;
 				}
-				
+
 				UnsignedInt readyFrame = spmInterface->getReadyFrame();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 				// Everything is ready if timers are debug off'd
 				if( ! TheGlobalData->m_specialPowerUsesDelay )
 					readyFrame = 0;
@@ -1381,11 +1342,11 @@ static void doFindMostReadyWeaponForThing( Object *obj, void *userData )
 		//We already found the best case scenario, so no need to iterate any more.
 		return;
 	}
-	
-	if( info->thing->isEquivalentTo( obj->getTemplate() ) )
+
+	if( info->thing && info->thing->isEquivalentTo( obj->getTemplate() ) )
 	{
-		if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) 
-				&& !obj->testStatus( OBJECT_STATUS_SOLD ) 
+		if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION )
+				&& !obj->testStatus( OBJECT_STATUS_SOLD )
 				&& !obj->isEffectivelyDead() )
 		{
 			if( obj->hasAnyWeapon() )
@@ -1413,11 +1374,11 @@ static void doFindMostReadySpecialPowerForThing( Object *obj, void *userData )
 		//We already found the best case scenario, so no need to iterate any more.
 		return;
 	}
-	
-	if( info->thing->isEquivalentTo( obj->getTemplate() ) )
+
+	if( info->thing && info->thing->isEquivalentTo( obj->getTemplate() ) )
 	{
-		if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) 
-				&& !obj->testStatus( OBJECT_STATUS_SOLD ) 
+		if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION )
+				&& !obj->testStatus( OBJECT_STATUS_SOLD )
 				&& !obj->isEffectivelyDead() )
 		{
 			// search the modules for the one with the matching template
@@ -1449,11 +1410,11 @@ static void doFindExistingObjectWithThingTemplate( Object *obj, void *userData )
 		//We already found a matching obj, so return
 		return;
 	}
-	
-	if( info->thing->isEquivalentTo( obj->getTemplate() ) )
+
+	if( info->thing && info->thing->isEquivalentTo( obj->getTemplate() ) )
 	{
-		if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) 
-				&& !obj->testStatus( OBJECT_STATUS_SOLD ) 
+		if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION )
+				&& !obj->testStatus( OBJECT_STATUS_SOLD )
 				&& !obj->isEffectivelyDead() )
 		{
 			//We found one.
@@ -1539,7 +1500,7 @@ Bool Player::hasAnyShortcutSpecialPower()
 Int Player::countReadyShortcutSpecialPowersOfType( SpecialPowerType spType )
 {
 	PlayerObjectFindInfo info;
-	info.spType = spType; 
+	info.spType = spType;
 	info.numReady = 0;
 	iterateObjects( doCountSpecialPowersReady, &info );
 	return info.numReady;
@@ -1550,7 +1511,7 @@ Int Player::countReadyShortcutSpecialPowersOfType( SpecialPowerType spType )
 //-------------------------------------------------------------------------------------------------
 GameDifficulty Player::getPlayerDifficulty(void) const
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		return m_ai->getAIDifficulty();
 	}
@@ -1562,7 +1523,7 @@ GameDifficulty Player::getPlayerDifficulty(void) const
 //-------------------------------------------------------------------------------------------------
 Bool Player::checkBridges(Object *unit, Waypoint *way)
 {
-	return m_ai?m_ai->checkBridges(unit, way):false; 
+	return m_ai?m_ai->checkBridges(unit, way):false;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1570,7 +1531,7 @@ Bool Player::checkBridges(Object *unit, Waypoint *way)
 //-------------------------------------------------------------------------------------------------
 Bool Player::getAiBaseCenter(Coord3D *pos)
 {
-	return m_ai?m_ai->getBaseCenter(pos):false; 
+	return m_ai?m_ai->getBaseCenter(pos):false;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1578,9 +1539,9 @@ Bool Player::getAiBaseCenter(Coord3D *pos)
 //-------------------------------------------------------------------------------------------------
 void Player::repairStructure(ObjectID structureID)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
-		m_ai->repairStructure(structureID); 
+		m_ai->repairStructure(structureID);
 	}
 }
 
@@ -1589,7 +1550,7 @@ void Player::repairStructure(ObjectID structureID)
 //-------------------------------------------------------------------------------------------------
 void Player::onUnitCreated( Object *factory, Object *unit )
 {
-	// When a a unit is completed, it becomes "real" as far as scripting is 
+	// When a a unit is completed, it becomes "real" as far as scripting is
 	// concerned. jba.
 	TheScriptEngine->notifyOfObjectCreationOrDestruction();
 
@@ -1599,7 +1560,7 @@ void Player::onUnitCreated( Object *factory, Object *unit )
 	// ai notification callback
 	if( m_ai )
 		m_ai->onUnitProduced( factory, unit );
-}  // end onUnitCreated
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -1611,7 +1572,7 @@ Bool Player::isSupplySourceSafe( Int minSupplies )
 	if( m_ai )
 		return m_ai->isSupplySourceSafe( minSupplies );
 	return true;
-}  // isSupplySourceSafe
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is a supply source attacked? */
@@ -1622,7 +1583,7 @@ Bool Player::isSupplySourceAttacked( void )
 	if( m_ai )
 		return m_ai->isSupplySourceAttacked( );
 	return false;
-}  // isSupplySourceSafe
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set delay between team production */
@@ -1632,7 +1593,7 @@ void Player::setTeamDelaySeconds(Int delay  )
 	// ai action
 	if( m_ai )
 		m_ai->setTeamDelaySeconds( delay );
-}  // guardSupplyCenter
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Guard supply center */
@@ -1642,7 +1603,7 @@ void Player::guardSupplyCenter( Team *team, Int minSupplies  )
 	// ai action
 	if( m_ai )
 		m_ai->guardSupplyCenter( team, minSupplies );
-}  // guardSupplyCenter
+}
 
 //-------------------------------------------------------------------------------------------------
 /** A team is about to be destroyed */
@@ -1656,7 +1617,7 @@ void Player::preTeamDestroy( const Team *team )
 	// TheSuperHackers @bugfix Mauller/Xezon 03/05/2025 Clear the default team to prevent dangling pointer usage
 	if( m_defaultTeam == team )
 		m_defaultTeam = NULL;
-}  // preTeamDestroy
+}
 
 //-------------------------------------------------------------------------------------------------
 /// a structuer was just created, but is under construction
@@ -1664,14 +1625,14 @@ void Player::preTeamDestroy( const Team *team )
 void Player::onStructureCreated( Object *builder, Object *structure )
 {
 
-}  // end onStructureCreated
+}
 
 //-------------------------------------------------------------------------------------------------
 /// a structure that was under construction has become completed
 //-------------------------------------------------------------------------------------------------
 void Player::onStructureConstructionComplete( Object *builder, Object *structure, Bool isRebuild )
 {
-	// When a a structure is completed, it becomes "real" as far as scripting is 
+	// When a a structure is completed, it becomes "real" as far as scripting is
 	// concerned. jba.
 	TheScriptEngine->notifyOfObjectCreationOrDestruction();
 
@@ -1695,11 +1656,11 @@ void Player::onStructureConstructionComplete( Object *builder, Object *structure
 	// the GUI needs to re-evaluate the information being displayed to the user now
 	if( TheControlBar )
 		TheControlBar->markUIDirty();
-	
+
 	// This object may require us to play some EVA sounds.
 	Player *localPlayer = ThePlayerList->getLocalPlayer();
 
-	if( structure->hasSpecialPower( SPECIAL_PARTICLE_UPLINK_CANNON ) || 
+	if( structure->hasSpecialPower( SPECIAL_PARTICLE_UPLINK_CANNON ) ||
 			structure->hasSpecialPower( SUPW_SPECIAL_PARTICLE_UPLINK_CANNON ) ||
 			structure->hasSpecialPower( LAZR_SPECIAL_PARTICLE_UPLINK_CANNON ) )
   {
@@ -1718,8 +1679,8 @@ void Player::onStructureConstructionComplete( Object *builder, Object *structure
     }
   }
 
-	if( structure->hasSpecialPower( SPECIAL_NEUTRON_MISSILE ) || 
-			structure->hasSpecialPower( NUKE_SPECIAL_NEUTRON_MISSILE ) || 
+	if( structure->hasSpecialPower( SPECIAL_NEUTRON_MISSILE ) ||
+			structure->hasSpecialPower( NUKE_SPECIAL_NEUTRON_MISSILE ) ||
 			structure->hasSpecialPower( SUPW_SPECIAL_NEUTRON_MISSILE ) )
   {
     if ( localPlayer == structure->getControllingPlayer() )
@@ -1736,7 +1697,7 @@ void Player::onStructureConstructionComplete( Object *builder, Object *structure
       TheEva->setShouldPlay(EVA_SuperweaponDetected_Enemy_Nuke);
     }
   }
-  
+
 	if (structure->hasSpecialPower(SPECIAL_SCUD_STORM))
   {
     if ( localPlayer == structure->getControllingPlayer() )
@@ -1753,18 +1714,18 @@ void Player::onStructureConstructionComplete( Object *builder, Object *structure
       TheEva->setShouldPlay(EVA_SuperweaponDetected_Enemy_ScudStorm);
     }
   }
-}  // end onStructureConstructionComplete
+}
 
 //=============================================================================
 void Player::onStructureUndone(Object *structure)
 {
 	m_scoreKeeper.removeObjectBuilt(structure);
-} // end onStructureUndone
+}
 
 //=============================================================================
 void Player::addTeamToList(TeamPrototype* team)
 {
-	for( PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for( PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it )
 	{
 		if (team == *it)
@@ -1777,7 +1738,7 @@ void Player::addTeamToList(TeamPrototype* team)
 //=============================================================================
 void Player::removeTeamFromList(TeamPrototype* team)
 {
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			it != m_playerTeamPrototypes.end(); ++it)
 	{
 		if (team == *it)
@@ -1791,9 +1752,9 @@ void Player::removeTeamFromList(TeamPrototype* team)
 //=============================================================================
 void Player::healAllObjects()
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		(*it)->healAllObjects();
 	}
 }
@@ -1801,9 +1762,9 @@ void Player::healAllObjects()
 //=============================================================================
 void Player::iterateObjects( ObjectIterateFunc func, void *userData ) const
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		(*it)->iterateObjects( func, userData );
 	}
 }
@@ -1816,10 +1777,10 @@ void Player::countObjectsByThingTemplate(Int numTmplates, const ThingTemplate* c
 	for (i = 0; i < numTmplates; ++i)
 		counts[i] = 0;
 
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
-			 it != m_playerTeamPrototypes.end(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
+			 it != m_playerTeamPrototypes.end();
 			 ++it)
-	{	
+	{
 		(*it)->countObjectsByThingTemplate(numTmplates, things, ignoreDead, counts, ignoreUnderConstruction);
 	}
 }
@@ -1829,9 +1790,9 @@ Int Player::countBuildings(void)
 {
 	int retVal = 0;
 
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		retVal += (*it)->countBuildings();
 	}
 	return retVal;
@@ -1842,9 +1803,9 @@ Int Player::countObjects(KindOfMaskType setMask, KindOfMaskType clearMask)
 {
 	int retVal = 0;
 
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		retVal += (*it)->countObjects(setMask, clearMask);
 	}
 	return retVal;
@@ -1854,7 +1815,7 @@ Int Player::countObjects(KindOfMaskType setMask, KindOfMaskType clearMask)
 Object *Player::findClosestByKindOf( Object *queryObject, KindOfMaskType setMask, KindOfMaskType clearMask )
 {
 	if( queryObject == NULL )
-		return NULL; 
+		return NULL;
 
 	ClosestKindOfData data;
 	data.m_setKindOf = setMask;
@@ -1870,9 +1831,9 @@ Object *Player::findClosestByKindOf( Object *queryObject, KindOfMaskType setMask
 //=============================================================================
 Bool Player::hasAnyBuildings(void) const
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		if ((*it)->hasAnyBuildings()) {
 			return true;
 		}
@@ -1883,9 +1844,9 @@ Bool Player::hasAnyBuildings(void) const
 //=============================================================================
 Bool Player::hasAnyBuildings(KindOfMaskType kindOf) const
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		if ((*it)->hasAnyBuildings(kindOf)) {
 			return true;
 		}
@@ -1896,9 +1857,9 @@ Bool Player::hasAnyBuildings(KindOfMaskType kindOf) const
 //=============================================================================
 Bool Player::hasAnyUnits(void) const
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		if ((*it)->hasAnyUnits()) {
 			return true;
 		}
@@ -1909,9 +1870,9 @@ Bool Player::hasAnyUnits(void) const
 //=============================================================================
 Bool Player::hasAnyObjects(void) const
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		if ((*it)->hasAnyObjects()) {
 			return true;
 		}
@@ -1922,9 +1883,9 @@ Bool Player::hasAnyObjects(void) const
 //=============================================================================
 Bool Player::hasAnyBuildFacility(void) const
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		if ((*it)->hasAnyBuildFacility())
 			return true;
 	}
@@ -1932,11 +1893,11 @@ Bool Player::hasAnyBuildFacility(void) const
 }
 
 //=============================================================================
-void Player::updateTeamStates(void) 
+void Player::updateTeamStates(void)
 {
-	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it)
-	{	
+	{
 		(*it)->updateState();
 	}
 }
@@ -1967,41 +1928,41 @@ UnsignedInt Player::getSupplyBoxValue()
 }
 
 //=============================================================================
-Real Player::getProductionCostChangePercent( AsciiString buildTemplateName ) const 
-{ 
+Real Player::getProductionCostChangePercent( AsciiString buildTemplateName ) const
+{
   ProductionChangeMap::const_iterator it = m_productionCostChanges.find(NAMEKEY(buildTemplateName));
-  if (it != m_productionCostChanges.end()) 
+  if (it != m_productionCostChanges.end())
 	{
 		return (*it).second;
 	}
-	
+
 	return 0.0f;
-}	
+}
 
 //=============================================================================
-Real Player::getProductionTimeChangePercent( AsciiString buildTemplateName ) const 
-{ 
+Real Player::getProductionTimeChangePercent( AsciiString buildTemplateName ) const
+{
   ProductionChangeMap::const_iterator it = m_productionTimeChanges.find(NAMEKEY(buildTemplateName));
-  if (it != m_productionTimeChanges.end()) 
+  if (it != m_productionTimeChanges.end())
 	{
 		return (*it).second;
 	}
-	
+
 	return 0.0f;
-}	
+}
 
 //=============================================================================
-VeterancyLevel Player::getProductionVeterancyLevel( AsciiString buildTemplateName ) const 
-{ 
+VeterancyLevel Player::getProductionVeterancyLevel( AsciiString buildTemplateName ) const
+{
 	NameKeyType templateNameKey = NAMEKEY(buildTemplateName);
   ProductionVeterancyMap::const_iterator it = m_productionVeterancyLevels.find(templateNameKey);
-  if (it != m_productionVeterancyLevels.end()) 
+  if (it != m_productionVeterancyLevels.end())
 	{
 		return (*it).second;
 	}
-	
+
 	return LEVEL_FIRST;
-}	
+}
 
 //=============================================================================
 void Player::friend_setSkillset(Int skillSet)
@@ -2018,14 +1979,14 @@ void Player::setUnitsShouldHunt(Bool unitsShouldHunt, CommandSourceType source)
 
 	Coord3D pos;
 	ThePartitionManager->getMostValuableLocation(getPlayerIndex(), ALLOW_ENEMIES, VOT_CashValue, &pos);
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it) {
 		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) {
 				Object *obj = iterObj.cur();
 				if (!obj) {
@@ -2044,7 +2005,7 @@ void Player::setUnitsShouldHunt(Bool unitsShouldHunt, CommandSourceType source)
 				obj->leaveGroup();
 				AIUpdateInterface *ai = obj->getAIUpdateInterface();
 				if (ai) {
-					if (unitsShouldHunt) {	
+					if (unitsShouldHunt) {
 						ai->aiHunt(source);
 					} else {
 						ai->aiIdle(source);
@@ -2089,7 +2050,29 @@ void Player::killPlayer(void)
 	}
 	if (isLocalPlayer() && !TheGameLogic->isInShellGame())
 	{
+		// TheSuperHackers @bugfix helmutbuhler 29/03/2025
+		// Avoid multiplayer mismatch on surrender in team games when owning a base structure that has
+		// been cleared of infantry before, by disabling this bugged logic.
+		//
+		// Note that becomingLocalPlayer calls recalcApparentControllingPlayer on all objects with a
+		// contain, which does two things:
+		//   1. Reset the teams of all objects with empty contains
+		//   2. Update m_hideGarrisonedStateFromNonallies
+		//
+		// Likely, the original intent was to reveal hidden garrisoned buildings for the new observer.
+		// But this does not appear to work anyway, so this call is useless.
+		//
+		// There is another bug: The Contain modules keep track of the object's team before any units
+		// got inside. And that team does not get updated when the player is killed and the units
+		// transfer to another team. That means resetting the team sets it to neutral, and when this
+		// is done only for the local player, then a mismatch occurs.
+		//
+		// When fixing disguises for observers or fixing the team bug in the Contain classes, then this
+		// code can be used again.
+#if 0
 		becomingLocalPlayer(TRUE); // recalc disguises, etc
+#endif
+
 		if (TheControlBar )
 		{
 			if (isPlayerActive())
@@ -2110,21 +2093,21 @@ void Player::killPlayer(void)
 //=============================================================================
 void Player::setObjectsEnabled(AsciiString templateTypeToAffect, Bool enable)
 {
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it) {
 		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) {
 				Object *obj = iterObj.cur();
 				if (!obj) {
 					continue;
 				}
 
-				if (obj->getTemplate()->getName().compare(templateTypeToAffect) == 0) 
+				if (obj->getTemplate()->getName().compare(templateTypeToAffect) == 0)
 				{
 					obj->setScriptStatus( OBJECT_STATUS_SCRIPT_DISABLED, !enable );
 				}
@@ -2147,18 +2130,18 @@ void Player::transferAssetsFromThat(Player *that)
 	const ThingTemplate *beaconTemplate = TheThingFactory->findTemplate( that->getPlayerTemplate()->getBeaconTemplate() );
 
 	// transfer all his units.
-	for (PlayerTeamList::iterator it = that->m_playerTeamPrototypes.begin(); 
-			 it != that->m_playerTeamPrototypes.end(); ++it) 
+	for (PlayerTeamList::iterator it = that->m_playerTeamPrototypes.begin();
+			 it != that->m_playerTeamPrototypes.end(); ++it)
 	{
-		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 		{
 			Team *team = iter.cur();
-			if (!team) 
+			if (!team)
 			{
 				continue;
 			}
-			
-			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) 
+
+			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance())
 			{
 				Object *obj = iterObj.cur();
 				if (!obj || obj->getTemplate()->isEquivalentTo(beaconTemplate))  // don't transfer NULL objs or beacons
@@ -2177,7 +2160,7 @@ void Player::transferAssetsFromThat(Player *that)
 	// transfer all his money
 	UnsignedInt allMoney = that->getMoney()->countMoney();
 	that->getMoney()->withdraw(allMoney);
-	getMoney()->deposit(allMoney);
+	getMoney()->deposit(allMoney, TRUE, FALSE);
 }
 
 //=============================================================================
@@ -2192,14 +2175,14 @@ void Player::garrisonAllUnits(CommandSourceType source)
 	ObjectIterator *iterBuilding = ThePartitionManager->iterateObjectsInRange(&pos, 1e9f, FROM_CENTER_3D, filters, ITER_SORTED_NEAR_TO_FAR);
 	MemoryPoolObjectHolder hold(iterBuilding);
 
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it) {
 		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) {
 				Object *obj = iterObj.cur();
 				if (!obj) {
@@ -2211,7 +2194,7 @@ void Player::garrisonAllUnits(CommandSourceType source)
 					continue;
 				}
 
-				for (Object *theBuilding = iterBuilding->first(); theBuilding; theBuilding = iterBuilding->next()) 
+				for (Object *theBuilding = iterBuilding->first(); theBuilding; theBuilding = iterBuilding->next())
 				{
 					ContainModuleInterface *contain = theBuilding->getContain();
 					if (contain)
@@ -2236,14 +2219,14 @@ void Player::garrisonAllUnits(CommandSourceType source)
 //=============================================================================
 void Player::ungarrisonAllUnits(CommandSourceType source)
 {
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
 			 it != m_playerTeamPrototypes.end(); ++it) {
 		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) {
 				Object *obj = iterObj.cur();
 				if (!obj) {
@@ -2270,16 +2253,16 @@ void Player::ungarrisonAllUnits(CommandSourceType source)
 //=============================================================================
 void Player::setUnitsShouldIdleOrResume(Bool idle)
 {
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
-			 it != m_playerTeamPrototypes.end(); ++it) 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
+			 it != m_playerTeamPrototypes.end(); ++it)
 	{
-		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 		{
 			Team *team = iter.cur();
 			if (!team)
 				continue;
-			
-			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) 
+
+			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance())
 			{
 				Object *obj = iterObj.cur();
 				if (!obj)
@@ -2343,9 +2326,9 @@ Bool Player::allowedToBuild(const ThingTemplate *tmplate) const
 }
 
 //=============================================================================
-void Player::buildSpecificTeam( TeamPrototype *teamProto) 
+void Player::buildSpecificTeam( TeamPrototype *teamProto)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		// Do a priority build.
 		m_ai->buildSpecificAITeam(teamProto, true);
@@ -2353,9 +2336,9 @@ void Player::buildSpecificTeam( TeamPrototype *teamProto)
 }
 
 //=============================================================================
-void Player::buildBaseDefense(Bool flank) 
+void Player::buildBaseDefense(Bool flank)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		// Do a priority build.
 		m_ai->buildAIBaseDefense(flank);
@@ -2363,9 +2346,9 @@ void Player::buildBaseDefense(Bool flank)
 }
 
 //=============================================================================
-void Player::buildBaseDefenseStructure(const AsciiString &thingName, Bool flank) 
+void Player::buildBaseDefenseStructure(const AsciiString &thingName, Bool flank)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		// Do a priority build.
 		m_ai->buildAIBaseDefenseStructure(thingName, flank);
@@ -2373,9 +2356,9 @@ void Player::buildBaseDefenseStructure(const AsciiString &thingName, Bool flank)
 }
 
 //=============================================================================
-void Player::buildSpecificBuilding(const AsciiString &thingName) 
+void Player::buildSpecificBuilding(const AsciiString &thingName)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		// Do a priority build.
 		m_ai->buildSpecificAIBuilding(thingName);
@@ -2383,9 +2366,9 @@ void Player::buildSpecificBuilding(const AsciiString &thingName)
 }
 
 //=============================================================================
-void Player::buildBySupplies(Int minimumCash, const AsciiString &thingName) 
+void Player::buildBySupplies(Int minimumCash, const AsciiString &thingName)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		m_ai->buildBySupplies(minimumCash, thingName);
 	}
@@ -2401,18 +2384,18 @@ void Player::buildSpecificBuildingNearestTeam( const AsciiString &thingName, con
 }
 
 //=============================================================================
-void Player::buildUpgrade( const AsciiString &upgrade) 
+void Player::buildUpgrade( const AsciiString &upgrade)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		m_ai->buildUpgrade(upgrade);
 	}
 }
 
 //=============================================================================
-void Player::recruitSpecificTeam( TeamPrototype *teamProto, Real recruitRadius) 
+void Player::recruitSpecificTeam( TeamPrototype *teamProto, Real recruitRadius)
 {
-	if (m_ai) 
+	if (m_ai)
 	{
 		// Do a priority build.
 		m_ai->recruitSpecificAITeam(teamProto, recruitRadius);
@@ -2445,7 +2428,7 @@ void Player::doBountyForKill(const Object* killer, const Object* victim)
 
 	Int costToBuild = victim->getTemplate()->calcCostToBuild(victim->getControllingPlayer());
 	Int bounty = REAL_TO_INT_CEIL(costToBuild * m_cashBountyPercent);
-	
+
 	if( bounty )
 	{
 
@@ -2504,10 +2487,10 @@ Bool Player::addSkillPointsForKill(const Object* killer, const Object* victim)
 	// srj sez: per dustin, no experience (et al) for killing things under construction.
 	if (victim->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
 		return false;
-	
+
 	Int victimLevel = victim->getVeterancyLevel();
 	Int skillValue = victim->getTemplate()->getSkillPointValue(victimLevel);
-	
+
 	return addSkillPoints(skillValue);
 }
 
@@ -2542,21 +2525,21 @@ Bool Player::addScience(ScienceType science)
 	if (hasScience(science))
 		return false;
 
-	//DEBUG_LOG(("Adding Science %s\n",TheScienceStore->getInternalNameForScience(science).str()));
+	//DEBUG_LOG(("Adding Science %s",TheScienceStore->getInternalNameForScience(science).str()));
 
 	m_sciences.push_back(science);
 
 	// 'wake up' any special powers controlled by, well, stuff
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
-			 it != m_playerTeamPrototypes.end(); ++it) 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
+			 it != m_playerTeamPrototypes.end(); ++it)
 	{
-		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 		{
 			Team *team = iter.cur();
 			if (!team)
 				continue;
-			
-			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) 
+
+			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance())
 			{
 				Object *obj = iterObj.cur();
 				if (!obj)
@@ -2584,14 +2567,14 @@ Bool Player::addScience(ScienceType science)
 
 	// notify the script engine
 	TheScriptEngine->notifyOfAcquiredScience(getPlayerIndex(), science);
-	
+
 	return true;
 }
 
 //=============================================================================
 void Player::addSciencePurchasePoints(Int delta)
 {
-	//DEBUG_LOG(("Adding SciencePurchasePoints %d -> %d\n",m_sciencePurchasePoints,m_sciencePurchasePoints+delta));
+	//DEBUG_LOG(("Adding SciencePurchasePoints %d -> %d",m_sciencePurchasePoints,m_sciencePurchasePoints+delta));
 	Int oldSPP = m_sciencePurchasePoints;
 	m_sciencePurchasePoints += delta;
 	if (m_sciencePurchasePoints < 0)
@@ -2607,7 +2590,7 @@ Bool Player::attemptToPurchaseScience(ScienceType science)
 {
 	if (!isCapableOfPurchasingScience(science))
 	{
-		DEBUG_CRASH(("isCapableOfPurchasingScience: need other prereqs/points to purchase, request is ignored!\n"));
+		DEBUG_CRASH(("isCapableOfPurchasingScience: need other prereqs/points to purchase, request is ignored!"));
 		return false;
 	}
 
@@ -2616,7 +2599,7 @@ Bool Player::attemptToPurchaseScience(ScienceType science)
 	addScience(science);
 
 	getAcademyStats()->recordGeneralsPointsSpent( cost );
-	
+
 	if( ThePlayerList->getLocalPlayer() == this )
 	{
 		TheControlBar->markUIDirty();
@@ -2630,7 +2613,7 @@ Bool Player::grantScience(ScienceType science)
 {
 	if (!TheScienceStore->isScienceGrantable(science))
 	{
-		DEBUG_CRASH(("Cannot grant science %s, since it is marked as nonGrantable.\n",TheScienceStore->getInternalNameForScience(science).str()));
+		DEBUG_CRASH(("Cannot grant science %s, since it is marked as nonGrantable.",TheScienceStore->getInternalNameForScience(science).str()));
 		return false;	// it's not grantable, so tough, can't have it, even via this method.
 	}
 
@@ -2690,7 +2673,7 @@ void Player::resetRank()
 /// returns TRUE if rank level really changed.
 Bool Player::setRankLevel(Int newLevel)
 {
-	if (newLevel < 1) 
+	if (newLevel < 1)
 		newLevel = 1;
 	else if (newLevel > TheRankInfoStore->getRankLevelCount())
 		newLevel = TheRankInfoStore->getRankLevelCount();
@@ -2701,7 +2684,7 @@ Bool Player::setRankLevel(Int newLevel)
 	if (newLevel == m_rankLevel)
 		return false;
 
-	//DEBUG_LOG(("Set Rank Level %d -> %d\n",m_rankLevel,newLevel));
+	//DEBUG_LOG(("Set Rank Level %d -> %d",m_rankLevel,newLevel));
 
 	Int oldSPP = m_sciencePurchasePoints;
 
@@ -2740,7 +2723,7 @@ Bool Player::setRankLevel(Int newLevel)
 	m_rankLevel = newLevel;
 
 	DEBUG_ASSERTCRASH(m_skillPoints >= m_levelDown && m_skillPoints < m_levelUp, ("hmm, wrong"));
-	//DEBUG_LOG(("Rank %d, Skill %d, down %d, up %d\n",m_rankLevel,m_skillPoints, m_levelDown, m_levelUp));
+	//DEBUG_LOG(("Rank %d, Skill %d, down %d, up %d",m_rankLevel,m_skillPoints, m_levelDown, m_levelUp));
 
 	if (TheControlBar != NULL)
 	{
@@ -2866,9 +2849,9 @@ static void countExisting( Object *obj, void *userData )
     return;
 
   TypeCountData *typeCountData = (TypeCountData *)userData;
-  
+
   // Compare templates
-  if ( typeCountData->type->isEquivalentTo( obj->getTemplate() ) ||
+  if ( ( typeCountData->type && typeCountData->type->isEquivalentTo( obj->getTemplate() ) ) ||
        ( typeCountData->linkKey != NAMEKEY_INVALID && obj->getTemplate() != NULL && typeCountData->linkKey == obj->getTemplate()->getMaxSimultaneousLinkKey() ) )
   {
     typeCountData->count++;
@@ -2879,12 +2862,12 @@ static void countExisting( Object *obj, void *userData )
   {
     ProductionUpdateInterface *pui = ProductionUpdate::getProductionUpdateInterfaceFromObject( obj );
     if( pui )
-    { 
+    {
       // add the count of this type that are in the queue
-      typeCountData->count += pui->countUnitTypeInQueue( typeCountData->type ); 
-    }  // end if
-  }  
-}  // end countInProduction
+      typeCountData->count += pui->countUnitTypeInQueue( typeCountData->type );
+    }
+  }
+}
 
 //=============================================================================
 // Make sure that building another of this unit/structure/object won't exceed MaxSimultaneousOfType()
@@ -2899,11 +2882,11 @@ Bool Player::canBuildMoreOfType( const ThingTemplate *whatToBuild ) const
     typeCountData.count = 0;
     typeCountData.type = whatToBuild;
     typeCountData.linkKey = whatToBuild->getMaxSimultaneousLinkKey();
-    // Assumption: Things with a KINDOF_STRUCTURE flag can never be built from 
+    // Assumption: Things with a KINDOF_STRUCTURE flag can never be built from
     // a factory (ProductionUpdateInterface), because the building can't move
     // out of the factory. When we do our Starcraft port and have flying Terran
     // buildings, we'll have to change this ;-)
-    // Remember: To ASSUME makes an ASS out of U and ME. 
+    // Remember: To ASSUME makes an ASS out of U and ME.
     typeCountData.checkProductionInterface = !whatToBuild->isKindOf( KINDOF_STRUCTURE );
 
     iterateObjects( countExisting, &typeCountData );
@@ -2927,10 +2910,10 @@ Bool Player::canBuild(const ThingTemplate *tmplate) const
 
 	if (tmplate->getBuildable() == BSTATUS_IGNORE_PREREQUISITES)
 		return true;
-	
+
 	if (tmplate->getBuildable() == BSTATUS_ONLY_BY_AI && getPlayerType() != PLAYER_COMPUTER)
 		return false;
-	
+
 	// else BSTATUS tmplate->getBuildable() == BSTATUS_YES
 	{
 
@@ -2943,7 +2926,7 @@ Bool Player::canBuild(const ThingTemplate *tmplate) const
 				prereqsOK = false;
 		}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		if (ignoresPrereqs())
 			prereqsOK = true;
 #endif
@@ -2955,7 +2938,7 @@ Bool Player::canBuild(const ThingTemplate *tmplate) const
 
   if ( !canBuildMoreOfType( tmplate ) )
     return false;
-  
+
 
 	return true;
 }
@@ -2985,13 +2968,13 @@ void Player::deleteUpgradeList( void )
 		deleteInstance(m_upgradeList);
 		m_upgradeList = next;
 
-	}  // end while
+	}
 
 	// This doesn't call removeUpgrade, so clear these ourselves.
 	m_upgradesInProgress.clear();
 	m_upgradesCompleted.clear();
 
-}  // end deleteUpgradeList
+}
 
 //=================================================================================================
 /** Find an upgrade in our list of upgrades with matching name key */
@@ -3005,24 +2988,24 @@ Upgrade *Player::findUpgrade( const UpgradeTemplate *upgradeTemplate )
 			return upgrade;
 
 	return NULL;
-	
-}  // end findUpgrade
+
+}
 
 //=================================================================================================
 /** Does the player have this completed upgrade */
 //=================================================================================================
-Bool Player::hasUpgradeComplete( const UpgradeTemplate *upgradeTemplate )
+Bool Player::hasUpgradeComplete( const UpgradeTemplate *upgradeTemplate ) const
 {
 	UpgradeMaskType testMask = upgradeTemplate->getUpgradeMask();
 	return hasUpgradeComplete( testMask );
-} 
+}
 
 //=================================================================================================
-/** 
+/**
 	Does the player have this completed upgrade.  This form is exposed so Objects can do quick lookups.
 */
 //=================================================================================================
-Bool Player::hasUpgradeComplete( UpgradeMaskType testMask )
+Bool Player::hasUpgradeComplete( UpgradeMaskType testMask ) const
 {
 	return m_upgradesCompleted.testForAll( testMask );
 }
@@ -3049,15 +3032,15 @@ Upgrade *Player::addUpgrade( const UpgradeTemplate *upgradeTemplate, UpgradeStat
 
 		// make new one
 		u = newInstance(Upgrade)( upgradeTemplate );
-	
-		// tie to list	
+
+		// tie to list
 		u->friend_setPrev( NULL );
 		u->friend_setNext( m_upgradeList );
 		if( m_upgradeList )
 			m_upgradeList->friend_setPrev( u );
 		m_upgradeList = u;
 
-	}  // end if
+	}
 
 	// set the new status for the upgrade
 	u->setStatus( status );
@@ -3074,7 +3057,7 @@ Upgrade *Player::addUpgrade( const UpgradeTemplate *upgradeTemplate, UpgradeStat
 		m_upgradesCompleted.set( newMask );
 		onUpgradeCompleted( upgradeTemplate );
 	}
-	
+
 	if( ThePlayerList->getLocalPlayer() == this )
 	{
 		TheControlBar->markUIDirty();
@@ -3082,28 +3065,28 @@ Upgrade *Player::addUpgrade( const UpgradeTemplate *upgradeTemplate, UpgradeStat
 
 	return u;
 
-}  // end addUpgrade
+}
 
 //=================================================================================================
-/** 
-	An upgrade just finished, do things like tell all objects to recheck UpgradeModules 
-*/  
+/**
+	An upgrade just finished, do things like tell all objects to recheck UpgradeModules
+*/
 void Player::onUpgradeCompleted( const UpgradeTemplate *upgradeTemplate )
 {
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); 
-			 it != m_playerTeamPrototypes.end(); ++it) 
+	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
+			 it != m_playerTeamPrototypes.end(); ++it)
 	{
-		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 		{
 			Team *team = iter.cur();
-			if( team == NULL ) 
+			if( team == NULL )
 			{
 				continue;
 			}
-			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance()) 
+			for (DLINK_ITERATOR<Object> iterObj = team->iterate_TeamMemberList(); !iterObj.done(); iterObj.advance())
 			{
 				Object *obj = iterObj.cur();
-				if( obj == NULL ) 
+				if( obj == NULL )
 				{
 					continue;
 				}
@@ -3123,7 +3106,7 @@ void Player::onUpgradeCompleted( const UpgradeTemplate *upgradeTemplate )
 void Player::removeUpgrade( const UpgradeTemplate *upgradeTemplate )
 {
 	Upgrade *upgrade = findUpgrade( upgradeTemplate );
-	
+
 	if( upgrade )
 	{
 		if( upgrade->friend_getNext() )
@@ -3146,19 +3129,19 @@ void Player::removeUpgrade( const UpgradeTemplate *upgradeTemplate )
 		TheControlBar->markUIDirty();
 	}
 
-	}  // end if
+	}
 
-}  // end removeUpgrade
+}
 
 
 //-------------------------------------------------------------------------------------------------
 Bool Player::okToPlayRadarEdgeSound( void )
 {
 	return (
-		! TheVictoryConditions->hasSinglePlayerBeenDefeated( this ) 
-		&& ! m_isPlayerDead 
+		! TheVictoryConditions->hasSinglePlayerBeenDefeated( this )
+		&& ! m_isPlayerDead
 		&& ! TheInGameUI->isClientQuiet()
-		&& TheGameLogic->isInGameLogicUpdate() 
+		&& TheGameLogic->isInGameLogicUpdate()
 		&& TheGameLogic->getFrame() > 0 );
 
 }
@@ -3183,7 +3166,7 @@ void Player::addRadar( Bool disableProof )
 		soundToPlay.setPlayerIndex(getPlayerIndex());
 		TheAudio->addAudioEvent(&soundToPlay);
 	}
-}  // end addRadar
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The parameter object has is taking its radar away from the player */
@@ -3193,20 +3176,20 @@ void Player::removeRadar( Bool disableProof )
 	Bool hadRadar = hasRadar();
 
 	// decrement count
-	DEBUG_ASSERTCRASH( m_radarCount > 0, ("removeRadar: An Object is taking its radar away, but the player radar count says they don't have radar!\n") );
+	DEBUG_ASSERTCRASH( m_radarCount > 0, ("removeRadar: An Object is taking its radar away, but the player radar count says they don't have radar!") );
 	--m_radarCount;
 
 	if( disableProof )
 		--m_disableProofRadarCount;// Disable proof is also in the normal refcount
 
-	if( hadRadar && !hasRadar()	&& okToPlayRadarEdgeSound() ) 
+	if( hadRadar && !hasRadar()	&& okToPlayRadarEdgeSound() )
 	{
 		// This player just lost radar, so play the "You lost Radar!" sound
 		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_radarOfflineSound;
 		soundToPlay.setPlayerIndex(getPlayerIndex());
 		TheAudio->addAudioEvent(&soundToPlay);
 	}
-}  // end removeRadar
+}
 
 //-------------------------------------------------------------------------------------------------
 void Player::disableRadar()
@@ -3214,8 +3197,8 @@ void Player::disableRadar()
 	Bool hadRadar = hasRadar();
 	m_radarDisabled = TRUE;
 
-	if( hadRadar  
-		&& !hasRadar() && okToPlayRadarEdgeSound() ) 
+	if( hadRadar
+		&& !hasRadar() && okToPlayRadarEdgeSound() )
 	{
 		// This player just lost radar, so play the "You lost Radar!" sound
 		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_radarOfflineSound;
@@ -3230,7 +3213,7 @@ void Player::enableRadar()
 	Bool hadRadar = hasRadar();
 	m_radarDisabled = FALSE;
 
-	if( !hadRadar && hasRadar() && okToPlayRadarEdgeSound() )  
+	if( !hadRadar && hasRadar() && okToPlayRadarEdgeSound() )
 	{
 		// This player just got radar, so play the "You have Radar!" sound
 		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_radarOnlineSound;
@@ -3282,7 +3265,7 @@ void Player::onPowerBrownOutChange( Bool brownOut )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-// SEVERAL OBJECTS (LIKE MULTIPLE COMMAND CENTERS) MAY HAVE MATCHING SETS OF SPECIAL POWERS 
+// SEVERAL OBJECTS (LIKE MULTIPLE COMMAND CENTERS) MAY HAVE MATCHING SETS OF SPECIAL POWERS
 // THIS KEEPS THEM IN SYNC SO IT LOOKS LIKE EACH SPECIAL POWER IS SHARED BETWEEN ALL
 
 void Player::addNewSharedSpecialPowerTimer( const SpecialPowerTemplate *temp, UnsignedInt frame )
@@ -3382,10 +3365,10 @@ void Player::friend_applyDifficultyBonusesForObject(Object* obj, Bool apply) con
 			BodyModuleInterface* body = obj->getBodyModule();
 			if (apply)
 				body->setMaxHealth(body->getMaxHealth() * healthFactor, PRESERVE_RATIO);
-			else 
+			else
 				body->setMaxHealth(body->getMaxHealth() / healthFactor, PRESERVE_RATIO);
 		}
-		static const WeaponBonusConditionType wbonus[PLAYERTYPE_COUNT][DIFFICULTY_COUNT] = 
+		static const WeaponBonusConditionType wbonus[PLAYERTYPE_COUNT][DIFFICULTY_COUNT] =
 		{
 			{
 				WEAPONBONUSCONDITION_SOLO_HUMAN_EASY,
@@ -3487,7 +3470,7 @@ void Player::changeBattlePlan( BattlePlanStatus plan, Int delta, BattlePlanBonus
 		}
 		if( bonus->m_holdTheLine > 0 )
 		{
-			bonus->m_holdTheLine			= -1;	
+			bonus->m_holdTheLine			= -1;
 		}
 		if( bonus->m_searchAndDestroy > 0 )
 		{
@@ -3526,7 +3509,7 @@ static void localApplyBattlePlanBonusesToObject( Object *obj, void *userData )
 	Object *objectToValidate = obj;
 	Object *objectToModify = obj;
 
-	DEBUG_LOG(("localApplyBattlePlanBonusesToObject() - looking at object %d (%s)\n",
+	DEBUG_LOG(("localApplyBattlePlanBonusesToObject() - looking at object %d (%s)",
 		(objectToValidate)?objectToValidate->getID():INVALID_ID,
 		(objectToValidate)?objectToValidate->getTemplate()->getName().str():"<No Object>"));
 
@@ -3536,30 +3519,30 @@ static void localApplyBattlePlanBonusesToObject( Object *obj, void *userData )
 	if( isProjectile )
 	{
 		objectToValidate = TheGameLogic->findObjectByID( obj->getProducerID() );
-		DEBUG_LOG(("Object is a projectile - looking at object %d (%s) instead\n",
+		DEBUG_LOG(("Object is a projectile - looking at object %d (%s) instead",
 			(objectToValidate)?objectToValidate->getID():INVALID_ID,
 			(objectToValidate)?objectToValidate->getTemplate()->getName().str():"<No Object>"));
 	}
 	if( objectToValidate && objectToValidate->isAnyKindOf( bonus->m_validKindOf ) )
 	{
-		DEBUG_LOG(("Is valid kindof\n"));
+		DEBUG_LOG(("Is valid kindof"));
 		if( !objectToValidate->isAnyKindOf( bonus->m_invalidKindOf ) )
 		{
-			DEBUG_LOG(("Is not invalid kindof\n"));
+			DEBUG_LOG(("Is not invalid kindof"));
 			//Quite the trek eh? Now we can apply the bonuses!
 			if( !isProjectile )
 			{
-				DEBUG_LOG(("Is not projectile.  Armor scalar is %g\n", bonus->m_armorScalar));
+				DEBUG_LOG(("Is not projectile.  Armor scalar is %g", bonus->m_armorScalar));
 				//Really important to not apply certain bonuses like health augmentation to projectiles!
 				if( bonus->m_armorScalar != 1.0f )
 				{
 					BodyModuleInterface *body = objectToModify->getBodyModule();
 					body->applyDamageScalar( bonus->m_armorScalar );
-					CRCDEBUG_LOG(("Applying armor scalar of %g (%8.8X) to object %d (%ls) owned by player %d\n",
+					CRCDEBUG_LOG(("Applying armor scalar of %g (%8.8X) to object %d (%ls) owned by player %d",
 						bonus->m_armorScalar, AS_INT(bonus->m_armorScalar), objectToModify->getID(),
 						objectToModify->getTemplate()->getDisplayName().str(),
 						objectToModify->getControllingPlayer()->getPlayerIndex()));
-					DEBUG_LOG(("After apply, armor scalar is %g\n", body->getDamageScalar()));
+					DEBUG_LOG(("After apply, armor scalar is %g", body->getDamageScalar()));
 				}
 				if( bonus->m_sightRangeScalar != 1.0f )
 				{
@@ -3634,13 +3617,13 @@ void Player::applyBattlePlanBonusesForPlayerObjects( const BattlePlanBonuses *bo
 	//Only allocate the battle plan bonuses if we actually use it!
 	if( !m_battlePlanBonuses )
 	{
-		DEBUG_LOG(("Allocating new m_battlePlanBonuses\n"));
-		m_battlePlanBonuses = newInstance( BattlePlanBonuses );	
+		DEBUG_LOG(("Allocating new m_battlePlanBonuses"));
+		m_battlePlanBonuses = newInstance( BattlePlanBonuses );
 		*m_battlePlanBonuses = *bonus;
 	}
 	else
 	{
-		DEBUG_LOG(("Adding bonus into existing m_battlePlanBonuses\n"));
+		DEBUG_LOG(("Adding bonus into existing m_battlePlanBonuses"));
 		DUMPBATTLEPLANBONUSES(m_battlePlanBonuses, this, NULL);
 		//Just apply the differences by multiplying the scalars together (kindofs won't change)
 		//These bonuses are used for new objects that are created or objects that are transferred
@@ -3663,7 +3646,7 @@ void Player::applyBattlePlanBonusesForPlayerObjects( const BattlePlanBonuses *bo
 //-------------------------------------------------------------------------------------------------
 /** Create a hotkey team based on this GameMessage */
 //-------------------------------------------------------------------------------------------------
-void Player::processCreateTeamGameMessage(Int hotkeyNum, GameMessage *msg) {
+void Player::processCreateTeamGameMessage(Int hotkeyNum, const GameMessage *msg) {
 	// GameMessage arguments are the object ID's of the objects that are to be in this team.
 
 	if ((hotkeyNum < 0) || (hotkeyNum >= NUM_HOTKEY_SQUADS)) {
@@ -3702,8 +3685,8 @@ void Player::processSelectTeamGameMessage(Int hotkeyNum, GameMessage *msg) {
 
 	VecObjectPtr objectList = m_squads[hotkeyNum]->getLiveObjects();
 	Int numObjs = objectList.size();
-	
-	for (Int i = 0; i < numObjs; ++i) 
+
+	for (Int i = 0; i < numObjs; ++i)
 	{
 		m_currentSelection->addObject(objectList[i]);
 	}
@@ -3767,7 +3750,7 @@ void Player::setCurrentlySelectedAIGroup(AIGroup *group) {
 //-------------------------------------------------------------------------------------------------
 /** Select a hotkey team based on this GameMessage */
 //-------------------------------------------------------------------------------------------------
-Squad *Player::getHotkeySquad(Int squadNumber) 
+Squad *Player::getHotkeySquad(Int squadNumber)
 {
 	if ((squadNumber >= 0) && (squadNumber < NUM_HOTKEY_SQUADS)) {
 		return m_squads[squadNumber];
@@ -3815,7 +3798,7 @@ void Player::addAIGroupToCurrentSelection(AIGroup *group) {
 	if (m_currentSelection == NULL) {
 		m_currentSelection = newInstance( Squad );
 	}
-	
+
 	VecObjectID objectIDVec = group->getAllIDs();
 	Int numObjs = objectIDVec.size();
 	for (Int i = 0; i < numObjs; ++i) {
@@ -3831,7 +3814,7 @@ void Player::addKindOfProductionCostChange(	KindOfMaskType kindOf, Real percent
 	KindOfPercentProductionChangeListIt it = m_kindOfPercentProductionChangeList.begin();
 	while(it != m_kindOfPercentProductionChangeList.end())
 	{
-		
+
 		KindOfPercentProductionChange *tof = *it;
 		if( tof->m_percent == percent && tof->m_kindOf == kindOf)
 		{
@@ -3839,7 +3822,7 @@ void Player::addKindOfProductionCostChange(	KindOfMaskType kindOf, Real percent
 			return;
 		}
 		++it;
-	}	
+	}
 
 	KindOfPercentProductionChange *newTof = newInstance( KindOfPercentProductionChange );
 	newTof->m_kindOf = kindOf;
@@ -3857,7 +3840,7 @@ void Player::removeKindOfProductionCostChange(	KindOfMaskType kindOf, Real perce
 	KindOfPercentProductionChangeListIt it = m_kindOfPercentProductionChangeList.begin();
 	while(it != m_kindOfPercentProductionChangeList.end())
 	{
-		
+
 		KindOfPercentProductionChange* tof = *it;
 		if( tof->m_percent == percent && tof->m_kindOf == kindOf)
 		{
@@ -3865,8 +3848,7 @@ void Player::removeKindOfProductionCostChange(	KindOfMaskType kindOf, Real perce
 			if(tof->m_ref == 0)
 			{
 				m_kindOfPercentProductionChangeList.erase( it );
-				if(tof)
-					deleteInstance(tof);
+				deleteInstance(tof);
 			}
 			return;
 		}
@@ -3884,7 +3866,7 @@ Real Player::getProductionCostChangeBasedOnKindOf( KindOfMaskType kindOf ) const
 	KindOfPercentProductionChangeListIt it = m_kindOfPercentProductionChangeList.begin();
 	while(it != m_kindOfPercentProductionChangeList.end())
 	{
-		
+
 		KindOfPercentProductionChange *tof = *it;
 		if(TEST_KINDOFMASK_MULTI(kindOf, tof->m_kindOf, KINDOFMASK_NONE))
 		{
@@ -3926,7 +3908,7 @@ struct VisionSpiedStruct
 static void iterator_setUnitsVisionSpied( Object *obj, void * voidData)
 {
 	VisionSpiedStruct *data = (VisionSpiedStruct *)voidData;
-	
+
 	// I feel I have to disapprove of the naming of this gathering of cell functions.  It is called by death,
 	// alliance change, containment, spy change, and dynamic view range as well as partition cell change.
 	if( obj && obj->isAnyKindOf(data->whichUnits) )
@@ -3967,8 +3949,8 @@ Bool Player::isPlayableSide( void ) const
 {
 
 	return m_playerTemplate ? m_playerTemplate->isPlayableSide() : FALSE;
-	
-}  // end isPlayableSide
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -3978,7 +3960,7 @@ void Player::crc( Xfer *xfer )
 	// Player battle plan bonuses
 	Bool battlePlanBonus = m_battlePlanBonuses != NULL;
 	xfer->xferBool( &battlePlanBonus );
-	CRCDEBUG_LOG(("Player %d[%ls] %s battle plans\n", m_playerIndex, m_playerDisplayName.str(), (battlePlanBonus)?"has":"doesn't have"));
+	CRCDEBUG_LOG(("Player %d[%ls] %s battle plans", m_playerIndex, m_playerDisplayName.str(), (battlePlanBonus)?"has":"doesn't have"));
 	if( m_battlePlanBonuses )
 	{
 		CRCDUMPBATTLEPLANBONUSES(m_battlePlanBonuses, this, NULL);
@@ -3990,11 +3972,11 @@ void Player::crc( Xfer *xfer )
 		m_battlePlanBonuses->m_validKindOf.xfer(xfer);
 		m_battlePlanBonuses->m_invalidKindOf.xfer(xfer);
 	}
-	
+
 	xfer->xferInt( &m_skillPoints );
 	xfer->xferInt( &m_sciencePurchasePoints );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -4054,9 +4036,9 @@ void Player::xfer( Xfer *xfer )
 			// xfer upgrade data
 			xfer->xferSnapshot( upgrade );
 
-		}  // end for, upgrade
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		const UpgradeTemplate *upgradeTemplate;
@@ -4069,25 +4051,25 @@ void Player::xfer( Xfer *xfer )
 
 			// find template for this upgrade
 			upgradeTemplate = TheUpgradeCenter->findUpgrade( upgradeName );
-			
+
 			// sanity
 			if( upgradeTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "Player::xfer - Unable to find upgrade '%s'\n", upgradeName.str() ));
+				DEBUG_CRASH(( "Player::xfer - Unable to find upgrade '%s'", upgradeName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// add upgrade to player, the status is invalid, but that's OK cause we're about to xfer it
 			upgrade = addUpgrade( upgradeTemplate, UPGRADE_STATUS_INVALID );
 
 			// xfer upgrade data
 			xfer->xferSnapshot( upgrade );
-						
-		}  // end for, i
 
-	}  // end else, load
+		}
+
+	}
 
 	// radar info
 	xfer->xferInt( &m_radarCount );
@@ -4123,9 +4105,9 @@ void Player::xfer( Xfer *xfer )
 			prototypeID = prototype->getID();
 			xfer->xferUser( &prototypeID, sizeof( TeamPrototypeID ) );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -4146,17 +4128,17 @@ void Player::xfer( Xfer *xfer )
 			if( prototype == NULL )
 			{
 
-				DEBUG_CRASH(( "Player::xfer - Unable to find team prototype by id\n" ));
+				DEBUG_CRASH(( "Player::xfer - Unable to find team prototype by id" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// put in list
 			m_playerTeamPrototypes.push_back( prototype );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// build list info
 	UnsignedShort buildListInfoCount = 0;
@@ -4171,7 +4153,7 @@ void Player::xfer( Xfer *xfer )
 		for( buildListInfo = m_pBuildList; buildListInfo; buildListInfo = buildListInfo->getNext() )
 			xfer->xferSnapshot( buildListInfo );
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -4179,8 +4161,7 @@ void Player::xfer( Xfer *xfer )
 		// destroy any build list that we got from loading the bare bones map, note that deleting
 		// the head of these structures automatically deletes any links attached
 		//
-		if( m_pBuildList)
-			deleteInstance(m_pBuildList);
+		deleteInstance(m_pBuildList);
 		m_pBuildList = NULL;
 
 		// read each build list info
@@ -4188,7 +4169,7 @@ void Player::xfer( Xfer *xfer )
 		{
 
 			// allocate new build list
-			buildListInfo = newInstance( BuildListInfo );	
+			buildListInfo = newInstance( BuildListInfo );
 			buildListInfo->setNextBuildList( NULL );
 
 			// attach to the *end* of the list in the player
@@ -4203,14 +4184,14 @@ void Player::xfer( Xfer *xfer )
 
 				last->setNextBuildList( buildListInfo );
 
-			}  // end else
+			}
 
 			// xfer data
 			xfer->xferSnapshot( buildListInfo );
 
-		}  // end for,i
+		}
 
-	}  // end else, load
+	}
 
 	// ai player data
 	Bool aiPlayerPresent = m_ai ? TRUE : FALSE;
@@ -4218,24 +4199,24 @@ void Player::xfer( Xfer *xfer )
 	if( (aiPlayerPresent == TRUE && m_ai == NULL) || (aiPlayerPresent == FALSE && m_ai != NULL) )
 	{
 
-		DEBUG_CRASH(( "Player::xfer - m_ai present/missing mismatch\n" ));
-		throw SC_INVALID_DATA;;
+		DEBUG_CRASH(( "Player::xfer - m_ai present/missing mismatch" ));
+		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	if( m_ai )
 		xfer->xferSnapshot( m_ai );
 
 	// resource gathering manager
 	Bool resourceGatheringManagerPresent = m_resourceGatheringManager ? TRUE : FALSE;
 	xfer->xferBool( &resourceGatheringManagerPresent );
-	if( (resourceGatheringManagerPresent == TRUE && m_resourceGatheringManager == NULL) ||	
+	if( (resourceGatheringManagerPresent == TRUE && m_resourceGatheringManager == NULL) ||
 			(resourceGatheringManagerPresent == FALSE && m_resourceGatheringManager != NULL ) )
 	{
 
-		DEBUG_CRASH(( "Player::xfer - m_resourceGatheringManager present/missing mismatch\n" ));
+		DEBUG_CRASH(( "Player::xfer - m_resourceGatheringManager present/missing mismatch" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	if( m_resourceGatheringManager )
 		xfer->xferSnapshot( m_resourceGatheringManager );
 
@@ -4246,10 +4227,10 @@ void Player::xfer( Xfer *xfer )
 			(tunnelTrackerPresent == FALSE && m_tunnelSystem != NULL) )
 	{
 
-		DEBUG_CRASH(( "Player::xfer - m_tunnelSystem present/missing mismatch\n" ));
+		DEBUG_CRASH(( "Player::xfer - m_tunnelSystem present/missing mismatch" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	if( m_tunnelSystem )
 		xfer->xferSnapshot( m_tunnelSystem );
 
@@ -4335,11 +4316,11 @@ void Player::xfer( Xfer *xfer )
 	// observer
 	xfer->xferBool( &m_observer );
 
-	if (version >= 2) 
+	if (version >= 2)
 	{
 		// current skill point modifier value
 		xfer->xferReal( &m_skillPointsModifier);
-	} 
+	}
 	else
 	{
 		m_skillPointsModifier = 1.0f;
@@ -4388,27 +4369,27 @@ void Player::xfer( Xfer *xfer )
 			// ref
 			xfer->xferUnsignedInt( &entry->m_ref );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
 		// sanity, list must be empty right now
-		if( m_kindOfPercentProductionChangeList.size() != 0 )
+		if( !m_kindOfPercentProductionChangeList.empty() )
 		{
 
-			DEBUG_CRASH(( "Player::xfer - m_kindOfPercentProductionChangeList should be empty but is not\n" ));
+			DEBUG_CRASH(( "Player::xfer - m_kindOfPercentProductionChangeList should be empty but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each entry
 		for( UnsignedInt i = 0; i < percentProductionChangeCount; ++i )
 		{
 
 			// allocate new entry
-			entry = newInstance( KindOfPercentProductionChange );	
+			entry = newInstance( KindOfPercentProductionChange );
 
 			// read data
 			entry->m_kindOf.xfer(xfer);
@@ -4418,9 +4399,9 @@ void Player::xfer( Xfer *xfer )
 			// put at end of list
 			m_kindOfPercentProductionChangeList.push_back( entry );
 
-		}  // end for i
+		}
 
-	}  // end else, load
+	}
 
 
 
@@ -4448,16 +4429,16 @@ void Player::xfer( Xfer *xfer )
 		}
 		else
 		{
-			if( m_specialPowerReadyTimerList.size() != 0 ) // sanity, list must be empty right now
+			if( !m_specialPowerReadyTimerList.empty() ) // sanity, list must be empty right now
 			{
-				DEBUG_CRASH(( "Player::xfer - m_specialPowerReadyTimerList should be empty but is not\n" ));
+				DEBUG_CRASH(( "Player::xfer - m_specialPowerReadyTimerList should be empty but is not" ));
 				throw SC_INVALID_DATA;
-			}  // end if
+			}
 
 			// read each entry
 			for( UnsignedInt i = 0; i < timerListSize; ++i )
 			{
-				SpecialPowerReadyTimerType timer;	
+				SpecialPowerReadyTimerType timer;
 
 				// read data
 				xfer->xferUnsignedInt( &timer.m_templateID );
@@ -4466,7 +4447,7 @@ void Player::xfer( Xfer *xfer )
 				// put at end of list
 				m_specialPowerReadyTimerList.push_back( timer );
 
-			}  // end for i
+			}
 		}
 	}
 	///////////////////////////////////////////////////////////////////////////
@@ -4480,24 +4461,24 @@ void Player::xfer( Xfer *xfer )
 	if( squadCount != NUM_HOTKEY_SQUADS )
 	{
 
-		DEBUG_CRASH(( "Player::xfer - size of m_squadCount array has changed\n" ));
+		DEBUG_CRASH(( "Player::xfer - size of m_squadCount array has changed" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( UnsignedShort i = 0; i < squadCount; ++i )
 	{
 
 		if( m_squads[ i ] == NULL )
 		{
 
-			DEBUG_CRASH(( "Player::xfer - NULL squad at index '%d'\n", i ));
+			DEBUG_CRASH(( "Player::xfer - NULL squad at index '%d'", i ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		xfer->xferSnapshot( m_squads[ i ] );
 
-	}  // end for, i
+	}
 
 	// current squad selection
 	Bool currentSelectionPresent = m_currentSelection ? TRUE : FALSE;
@@ -4512,21 +4493,19 @@ void Player::xfer( Xfer *xfer )
 		// xfer
 		xfer->xferSnapshot( m_currentSelection );
 
-	}  // end if
+	}
 
 	// Player battle plan bonuses
 	Bool battlePlanBonus = m_battlePlanBonuses != NULL;
 	xfer->xferBool( &battlePlanBonus ); //If we're loading, it just replaces the bool
 	if( xfer->getXferMode() == XFER_LOAD )
 	{
-		if (m_battlePlanBonuses)
-		{
-			deleteInstance(m_battlePlanBonuses);
-			m_battlePlanBonuses = NULL;
-		}
+		deleteInstance(m_battlePlanBonuses);
+		m_battlePlanBonuses = NULL;
+
 		if ( battlePlanBonus )
 		{
-			m_battlePlanBonuses = newInstance( BattlePlanBonuses );	
+			m_battlePlanBonuses = newInstance( BattlePlanBonuses );
 		}
 	}
 	if( m_battlePlanBonuses )
@@ -4550,7 +4529,7 @@ void Player::xfer( Xfer *xfer )
 	else
 		m_unitsShouldHunt = FALSE;
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4558,5 +4537,5 @@ void Player::xfer( Xfer *xfer )
 void Player::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerList.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerList.cpp
index 365d18d8626..7b33095bc6d 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerList.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerList.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PlayerList.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,7 +42,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Errors.h"
 #include "Common/DataChunk.h"
@@ -60,11 +60,6 @@
 #include "GameLogic/SidesList.h"
 #include "GameNetwork/NetworkDefs.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 /*extern*/ PlayerList *ThePlayerList = NULL;
@@ -81,28 +76,25 @@ PlayerList::PlayerList() :
 }
 
 //-----------------------------------------------------------------------------
-PlayerList::~PlayerList() 
+PlayerList::~PlayerList()
 {
-	try {
-		// the world is happier if we reinit things before destroying them,
-		// to avoid debug warnings
-		init();
-	} catch (...) {
-		// nothing
-	}
+	// the world is happier if we reinit things before destroying them,
+	// to avoid debug warnings
+	init();
+
 	for( Int i = 0; i < MAX_PLAYER_COUNT; ++i )
 		delete m_players[ i ];
 }
 
 //-----------------------------------------------------------------------------
-Player *PlayerList::getNthPlayer(Int i) 
-{ 
+Player *PlayerList::getNthPlayer(Int i)
+{
 	if( i < 0 || i >= MAX_PLAYER_COUNT )
 	{
-//		DEBUG_CRASH( ("Illegal player index\n") );
+//		DEBUG_CRASH( ("Illegal player index") );
 		return NULL;
 	}
-	return m_players[i]; 
+	return m_players[i];
 }
 
 //-----------------------------------------------------------------------------
@@ -155,7 +147,7 @@ void PlayerList::newGame()
 		Bool exists;	// throwaway, since we don't care if it exists
 		if (d->getBool(TheKey_multiplayerIsLocal, &exists))
 		{
-			DEBUG_LOG(("Player %s is multiplayer local\n", pname.str()));
+			DEBUG_LOG(("Player %s is multiplayer local", pname.str()));
 			setLocalPlayer(p);
 			setLocal = true;
 		}
@@ -174,7 +166,7 @@ void PlayerList::newGame()
 
 	if (!setLocal)
 	{
-		DEBUG_ASSERTCRASH(TheNetwork, ("*** Map has no human player... picking first nonneutral player for control\n"));
+		DEBUG_ASSERTCRASH(TheNetwork, ("*** Map has no human player... picking first nonneutral player for control"));
 		for( i = 0; i < TheSidesList->getNumSides(); i++)
 		{
 			Player* p = getNthPlayer(i);
@@ -208,7 +200,7 @@ void PlayerList::newGame()
 			}
 			else
 			{
-				DEBUG_LOG(("unknown enemy %s\n",tok.str()));
+				DEBUG_LOG(("unknown enemy %s",tok.str()));
 			}
 		}
 
@@ -222,7 +214,7 @@ void PlayerList::newGame()
 			}
 			else
 			{
-				DEBUG_LOG(("unknown ally %s\n",tok.str()));
+				DEBUG_LOG(("unknown ally %s",tok.str()));
 			}
 		}
 
@@ -257,7 +249,7 @@ void PlayerList::update()
 	for( Int i = 0; i < MAX_PLAYER_COUNT; i++ )
 	{
 		m_players[i]->update();
-	}  // end for i
+	}
 
 }
 
@@ -268,7 +260,7 @@ void PlayerList::newMap()
 	for( Int i = 0; i < MAX_PLAYER_COUNT; i++ )
 	{
 		m_players[i]->newMap();
-	}  // end for i
+	}
 
 }
 
@@ -282,13 +274,13 @@ void PlayerList::teamAboutToBeDeleted(Team* team)
 }
 
 //=============================================================================
-void PlayerList::updateTeamStates(void) 
+void PlayerList::updateTeamStates(void)
 {
 	// Clear team flags for all players.
 	for( Int i = 0; i < MAX_PLAYER_COUNT; i++ )
 	{
 		m_players[i]->updateTeamStates();
-	}  // end for i
+	}
 }
 
 //-----------------------------------------------------------------------------
@@ -298,11 +290,11 @@ Team *PlayerList::validateTeam( AsciiString owner )
 	Team *t = TheTeamFactory->findTeam(owner);
 	if (t)
 	{
-		//DEBUG_LOG(("assigned obj %08lx to team %s\n",obj,owner.str()));
-	}	
+		//DEBUG_LOG(("assigned obj %08lx to team %s",obj,owner.str()));
+	}
 	else
 	{
-		DEBUG_CRASH(("no team or player named %s could be found!\n", owner.str()));
+		DEBUG_CRASH(("no team or player named %s could be found!", owner.str()));
 		t = getNeutralPlayer()->getDefaultTeam();
 	}
 	return t;
@@ -330,22 +322,20 @@ void PlayerList::setLocalPlayer(Player *player)
 #ifdef INTENSE_DEBUG
 	if (player)
 	{
-		DEBUG_LOG(("\n----------\n"));
 		// did you know? you can use "%ls" to print a doublebyte string, even in a single-byte printf...
-		DEBUG_LOG(("Switching local players. The new player is named '%ls' (%s) and owns the following objects:\n",
+		DEBUG_LOG(("Switching local players. The new player is named '%ls' (%s) and owns the following objects:",
 			player->getPlayerDisplayName().str(),
 			TheNameKeyGenerator->keyToName(player->getPlayerNameKey()).str()
 		));
 		for (Object *obj = player->getFirstOwnedObject(); obj; obj = obj->getNextOwnedObject())
 		{
-			DEBUG_LOG(("Obj %08lx is of type %s",obj,obj->getTemplate()->getName().str()));
+			DEBUG_LOG_RAW(("Obj %08lx is of type %s",obj,obj->getTemplate()->getName().str()));
 			if (!player->canBuild(obj->getTemplate()))
 			{
-				DEBUG_LOG((" (NOT BUILDABLE)"));
+				DEBUG_LOG_RAW((" (NOT BUILDABLE)"));
 			}
-			DEBUG_LOG(("\n"));
+			DEBUG_LOG_RAW(("\n"));
 		}
-		DEBUG_LOG(("\n----------\n"));
 	}
 #endif
 
@@ -359,17 +349,17 @@ Player *PlayerList::getPlayerFromMask( PlayerMaskType mask )
 
 	for( i = 0; i < MAX_PLAYER_COUNT; i++ )
 	{
-		
+
 		player = getNthPlayer( i );
 		if( player && player->getPlayerMask() == mask )
 			return player;
 
-	}  // end for i
+	}
 
-	DEBUG_CRASH( ("Player does not exist for mask\n") );
+	DEBUG_CRASH( ("Player does not exist for mask") );
 	return NULL; // mask not found
 
-}  // end getPlayerFromMask
+}
 
 //-----------------------------------------------------------------------------
 Player *PlayerList::getEachPlayerFromMask( PlayerMaskType& maskToAdjust )
@@ -379,16 +369,16 @@ Player *PlayerList::getEachPlayerFromMask( PlayerMaskType& maskToAdjust )
 
 	for( i = 0; i < MAX_PLAYER_COUNT; i++ )
 	{
-		
+
 		player = getNthPlayer( i );
 		if ( player && BitIsSet(player->getPlayerMask(), maskToAdjust ))
 		{
 			maskToAdjust &= (~player->getPlayerMask());
 			return player;
 		}
-	}  // end for i
+	}
 
-	DEBUG_CRASH( ("No players found that contain any matching masks.\n") );
+	DEBUG_CRASH( ("No players found that contain any matching masks.") );
 	maskToAdjust = 0;
 	return NULL; // mask not found
 }
@@ -473,16 +463,16 @@ void PlayerList::xfer( Xfer *xfer )
 	if( playerCount != m_playerCount )
 	{
 
-		DEBUG_CRASH(( "Invalid player count '%d', should be '%d'\n", playerCount, m_playerCount ));
+		DEBUG_CRASH(( "Invalid player count '%d', should be '%d'", playerCount, m_playerCount ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// xfer each of the player data
 	for( Int i = 0; i < playerCount; ++i )
 		xfer->xferSnapshot( m_players[ i ] );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -490,5 +480,5 @@ void PlayerList::xfer( Xfer *xfer )
 void PlayerList::loadPostProcess( void )
 {
 
-}  // end postProcessLoad
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp
index 14f18ef9b79..ef8be636a69 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PlayerTemplate.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,7 +42,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_VETERANCY_NAMES				// for TheVeterancyNames[]
 
@@ -53,11 +53,6 @@
 #include "Common/Science.h"
 #include "GameClient/Image.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -70,7 +65,7 @@
 //-------------------------------------------------------------------------------------------------
 /*static*/ const FieldParse* PlayerTemplate::getFieldParse()
 {
-	static const FieldParse TheFieldParseTable[] = 
+	static const FieldParse TheFieldParseTable[] =
 	{
 		{ "Side",											INI::parseAsciiString,													NULL, offsetof( PlayerTemplate, m_side ) },
 		{ "BaseSide",								INI::parseAsciiString,													NULL, offsetof( PlayerTemplate, m_baseSide ) },
@@ -186,15 +181,15 @@ AsciiString PlayerTemplate::getStartingUnit( Int i ) const
 	// assign the money into the 'Money' (m_money) pointed to at 'store'
 	Money *theMoney = (Money *)store;
 	theMoney->init();
-	theMoney->deposit( money );
+	theMoney->setStartingCash(money);
 
-}  // end parseStartMoney
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-PlayerTemplate::PlayerTemplate() : 
+PlayerTemplate::PlayerTemplate() :
 	m_nameKey(NAMEKEY_INVALID),
 	m_observer(false),
 	m_playableSide(false),
@@ -261,13 +256,13 @@ const Image *PlayerTemplate::getEnabledImage( void ) const
 /*extern*/ PlayerTemplateStore *ThePlayerTemplateStore = NULL;
 
 //-----------------------------------------------------------------------------
-PlayerTemplateStore::PlayerTemplateStore() 
+PlayerTemplateStore::PlayerTemplateStore()
 {
 	// nothing
 }
 
 //-----------------------------------------------------------------------------
-PlayerTemplateStore::~PlayerTemplateStore() 
+PlayerTemplateStore::~PlayerTemplateStore()
 {
 	// nothing
 }
@@ -357,36 +352,36 @@ const PlayerTemplate* PlayerTemplateStore::getNthPlayerTemplate(Int i) const
 }
 
 //-------------------------------------------------------------------------------------------------
-// @todo: PERF_EVALUATE Get a perf timer on this. 
-// If this function is called frequently, there are some relatively trivial changes we could make to 
+// @todo: PERF_EVALUATE Get a perf timer on this.
+// If this function is called frequently, there are some relatively trivial changes we could make to
 // have it run a lot faster.
 void PlayerTemplateStore::getAllSideStrings(AsciiStringList *outStringList)
 {
-	if (!outStringList) 
+	if (!outStringList)
 		return;
 
 	// should outStringList be cleared first? If so, that would go here
 	AsciiStringList tmpList;
 
 	Int numTemplates = getPlayerTemplateCount();
-	for ( Int i = 0; i < numTemplates; ++i ) 
+	for ( Int i = 0; i < numTemplates; ++i )
 	{
 		const PlayerTemplate *pt = getNthPlayerTemplate(i);
 		// Sanity
-		if (!pt)			
-			continue; 
+		if (!pt)
+			continue;
 
 		if (std::find(tmpList.begin(), tmpList.end(), pt->getSide()) == tmpList.end())
 			tmpList.push_back(pt->getSide());
 	}
 	// tmpList is now filled with all unique sides found in the player templates.
 
-	// splice is a constant-time function which takes all elements from tmpList and 
+	// splice is a constant-time function which takes all elements from tmpList and
 	// inserts them before outStringList->end(), and also removes them from tmpList
 	outStringList->splice(outStringList->end(), tmpList);
-	
+
 	// all done
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ void PlayerTemplateStore::parsePlayerTemplateDefinition( INI* ini )
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp
index c8ee735ee64..0e5bc0904e3 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ProductionPrerequisite.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ProductionPrerequisite.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -42,7 +42,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ProductionPrerequisite.h"
 #include "Common/Player.h"
@@ -52,14 +52,9 @@
 #include "GameClient/Drawable.h"
 #include "GameClient/GameText.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
-ProductionPrerequisite::ProductionPrerequisite() 
+ProductionPrerequisite::ProductionPrerequisite()
 {
 	init();
 }
@@ -74,7 +69,7 @@ void ProductionPrerequisite::init()
 {
 	m_prereqUnits.clear();
 	m_prereqSciences.clear();
-	
+
 }
 
 //=============================================================================
@@ -95,7 +90,7 @@ void ProductionPrerequisite::resolveNames()
  			/** @todo for now removing this assert until we can completely remove
  			the GDF stuff, the problem is that some INI files refer to GDF names, and they
  			aren't yet loaded in the world builder but will all go away later anyway etc */
-			DEBUG_ASSERTCRASH(m_prereqUnits[i].unit,("could not find prereq %s\n",m_prereqUnits[i].name.str()));
+			DEBUG_ASSERTCRASH(m_prereqUnits[i].unit,("could not find prereq %s",m_prereqUnits[i].name.str()));
 
 			m_prereqUnits[i].name.clear(); // we're done with it
 		}
@@ -136,7 +131,7 @@ Int ProductionPrerequisite::getAllPossibleBuildFacilityTemplates(const ThingTemp
 const ThingTemplate *ProductionPrerequisite::getExistingBuildFacilityTemplate( const Player *player ) const
 {
 	DEBUG_ASSERTCRASH(player, ("player may not be null"));
-	if (m_prereqUnits.size())
+	if (!m_prereqUnits.empty())
 	{
 		Int ownCount[MAX_PREREQ];
 		Int cnt = calcNumPrereqUnitsOwned(player, ownCount);
@@ -146,7 +141,7 @@ const ThingTemplate *ProductionPrerequisite::getExistingBuildFacilityTemplate( c
 				break;
 			if (ownCount[i])
 				return m_prereqUnits[i].unit;
-		} 
+		}
 	}
 	return NULL;
 }
@@ -183,7 +178,7 @@ Bool ProductionPrerequisite::isSatisfied(const Player *player) const
 	for (i = 0; i < cnt; i++)
 	{
 		if (ownCount[i] == -1)	// the magic "ignore me" flag
-			continue;	
+			continue;
 		if (ownCount[i] == 0)		// everything not ignored, is required
 			return false;
 	}
@@ -194,7 +189,7 @@ Bool ProductionPrerequisite::isSatisfied(const Player *player) const
 //-------------------------------------------------------------------------------------------------
 /** Add a unit prerequisite, if 'orWithPrevious' is set then this unit is said
 	* to be an alternate prereq to the previously added unit, otherwise this becomes
-	* a new 'block' and is required in ADDDITION to other entries. 
+	* a new 'block' and is required in ADDDITION to other entries.
 	* Return FALSE if no space left to add unit */
 //-------------------------------------------------------------------------------------------------
 void ProductionPrerequisite::addUnitPrereq( AsciiString unit, Bool orUnitWithPrevious )
@@ -205,12 +200,12 @@ void ProductionPrerequisite::addUnitPrereq( AsciiString unit, Bool orUnitWithPre
 	info.unit = NULL;
 	m_prereqUnits.push_back(info);
 
-}  // end addUnitPrereq
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Add a unit prerequisite, if 'orWithPrevious' is set then this unit is said
 	* to be an alternate prereq to the previously added unit, otherwise this becomes
-	* a new 'block' and is required in ADDDITION to other entries. 
+	* a new 'block' and is required in ADDDITION to other entries.
 	* Return FALSE if no space left to add unit */
 //-------------------------------------------------------------------------------------------------
 void ProductionPrerequisite::addUnitPrereq( const std::vector<AsciiString>& units )
@@ -222,7 +217,7 @@ void ProductionPrerequisite::addUnitPrereq( const std::vector<AsciiString>& unit
 		orWithPrevious = true;
 	}
 
-}  // end addUnitPrereq
+}
 
 //-------------------------------------------------------------------------------------------------
 // returns an asciistring which is a list of all the prerequisites
@@ -235,21 +230,17 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons
 		return UnicodeString::TheEmptyString;
 
 	UnicodeString requiresList = UnicodeString::TheEmptyString;
-		
+
 	// check the prerequired units
 	Int ownCount[MAX_PREREQ];
 	Int cnt = calcNumPrereqUnitsOwned(player, ownCount);
 	Int i;
 
 	Bool orRequirements[MAX_PREREQ];
-	//Added for fix below in getRequiresList
-	//By Sadullah Nader
-	//Initializes the OR_WITH_PREV structures
 	for (i = 0; i < MAX_PREREQ; i++)
 	{
 		orRequirements[i] = FALSE;
 	}
-	//
 	// account for the "or" unit cases, start for loop at 1
 	for (i = 1; i < cnt; i++)
 	{
@@ -260,7 +251,7 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons
 			ownCount[i-1] = -1;						// flag for "ignore me"
 		}
 	}
-	
+
 	// check to see if anything is required
 	const ThingTemplate *unit;
 	UnicodeString unitName;
@@ -269,7 +260,7 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons
 	{
 		// we have an unfulfilled requirement
 		if (ownCount[i] == 0) {
-			
+
 			if(orRequirements[i])
 			{
 				unit = m_prereqUnits[i-1].unit;
@@ -319,4 +310,4 @@ UnicodeString ProductionPrerequisite::getRequiresList(const Player *player) cons
 
 	// return final list
 	return requiresList;
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp
index 4c65fc8cc57..8724a73f20a 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ResourceGatheringManager.cpp
@@ -27,7 +27,7 @@
 // gathering type decisions based on them.
 // Author: Graham Smallwood, January, 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ResourceGatheringManager.h"
 
@@ -108,14 +108,14 @@ void ResourceGatheringManager::removeSupplyWarehouse( Object *oldWarehouse )
 static Real computeRelativeCost( Object *queryObject, Object *destObject, Real *pureDistanceSquared )
 {
 	/** @todo This gets filled with Pathfinding computations, analysis of Boxes remaining,
-			Threat calculations, paths of other trucks, and other fancy stuff. 
+			Threat calculations, paths of other trucks, and other fancy stuff.
 	*/
 
 	//A good score is a very small number.
 
 	if( queryObject == NULL  ||  destObject == NULL )
 		return FLT_MAX;
-	
+
 	if( !TheActionManager->canTransferSuppliesAt(queryObject, destObject) )
 		return FLT_MAX;// Handles emptyness and alliances
 
@@ -129,7 +129,7 @@ static Real computeRelativeCost( Object *queryObject, Object *destObject, Real *
 
 	// I need the distance, but I don't want to count on the coincidence that
 	// the abstract 'cost' this function returns happens to be just the distance, since it could
-	// become more complicated	
+	// become more complicated
 	if( pureDistanceSquared )
 		*pureDistanceSquared = distSquared;
 
@@ -258,7 +258,7 @@ Object *ResourceGatheringManager::findBestSupplyCenter( Object *queryObject )
 void ResourceGatheringManager::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -279,7 +279,7 @@ void ResourceGatheringManager::xfer( Xfer *xfer )
 	// supply centers
 	xfer->xferSTLObjectIDList( &m_supplyCenters );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -287,5 +287,5 @@ void ResourceGatheringManager::xfer( Xfer *xfer )
 void ResourceGatheringManager::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Science.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Science.cpp
index 2653c80766b..c2f75e58c22 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Science.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Science.cpp
@@ -27,7 +27,7 @@
 // Desc:      @todo
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/Player.h"
@@ -35,11 +35,6 @@
 
 ScienceStore* TheScienceStore = NULL;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 void ScienceStore::init()
@@ -59,9 +54,7 @@ ScienceStore::~ScienceStore()
 	{
 		ScienceInfo* si = *it;
 		++it;
-		if (si) {
-			deleteInstance(si);
-		}
+		deleteInstance(si);
 	}
 }
 
@@ -168,7 +161,7 @@ const ScienceInfo* ScienceStore::findScienceInfo(ScienceType st) const
 	if (TheScienceStore)
 	{
 
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "PrerequisiteSciences", INI::parseScienceVector, NULL, offsetof( ScienceInfo, m_prereqSciences ) },
 			{ "SciencePurchasePointCost", INI::parseInt, NULL, offsetof( ScienceInfo, m_sciencePurchasePointCost ) },
@@ -191,10 +184,10 @@ const ScienceInfo* ScienceStore::findScienceInfo(ScienceType st) const
 			}
 		}
 
-		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES) 
+		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES)
 		{
 			ScienceInfo* newInfo = newInstance(ScienceInfo);
-			
+
 			if (info == NULL)
 			{
 				// only add if it's not overriding an existing one.
@@ -215,12 +208,12 @@ const ScienceInfo* ScienceStore::findScienceInfo(ScienceType st) const
 				info = newInfo;
 				//TheScienceStore->m_sciences.push_back(info);	// NO, BAD, WRONG -- don't add in this case.
 			}
-		} 
+		}
 		else
 		{
 			if (info != NULL)
 			{
-				DEBUG_CRASH(("duplicate science %s!\n",c));
+				DEBUG_CRASH(("duplicate science %s!",c));
 				throw INI_INVALID_DATA;
 			}
 			info = newInstance(ScienceInfo);
@@ -320,7 +313,7 @@ Bool ScienceStore::playerHasRootPrereqsForScience(const Player* player, ScienceT
 }
 
 //-----------------------------------------------------------------------------
-/** return a list of the sciences the given player can purchase now, and a list he might be able to purchase in the future, 
+/** return a list of the sciences the given player can purchase now, and a list he might be able to purchase in the future,
 	but currently lacks prereqs or points for. (either might be an empty list) */
 void ScienceStore::getPurchasableSciences(const Player* player, ScienceVec& purchasable, ScienceVec& potentiallyPurchasable) const
 {
@@ -329,7 +322,7 @@ void ScienceStore::getPurchasableSciences(const Player* player, ScienceVec& purc
 	for (ScienceInfoVec::const_iterator it = m_sciences.begin(); it != m_sciences.end(); ++it)
 	{
 		const ScienceInfo* si = (const ScienceInfo*)(*it)->getFinalOverride();
-		
+
 		if (si->m_sciencePurchasePointCost == 0)
 		{
 			// 0 means "cannot be purchased"
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp
index 7fcb1079f8b..41e6d5ceaaa 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ScoreKeeper.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ScoreKeeper.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jun 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ScoreKeeper.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Score Keeper class will be an object attached to each player
 //						that will maintain accurate counts for the various stats we
 //						want to show on the score screen.  The information in here
@@ -53,7 +53,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/KindOf.h"
@@ -102,10 +102,7 @@ void ScoreKeeper::reset( Int playerIdx )
 	m_totalMoneyEarned = m_totalMoneySpent = 0;
 	m_totalUnitsLost = m_totalUnitsBuilt = 0;
 	m_totalBuildingsLost = m_totalBuildingsBuilt = 0;
-	//Added By Sadullah Nader
-	//Initializtion(s) inserted
-	m_totalFactionBuildingsCaptured = m_totalTechBuildingsCaptured = 0;	
-	//
+	m_totalFactionBuildingsCaptured = m_totalTechBuildingsCaptured = 0;
 	m_currentScore = 0;
 	m_objectsBuilt.clear();
 	m_objectsCaptured.clear();
@@ -117,7 +114,7 @@ void ScoreKeeper::reset( Int playerIdx )
 	}
 	m_myPlayerIdx	= playerIdx;
 }
-	
+
 void ScoreKeeper::addObjectBuilt( const Object *o)
 {
 	Bool addToCount = FALSE;
@@ -144,7 +141,7 @@ void ScoreKeeper::addObjectBuilt( const Object *o)
 			addToCount = TRUE;
 		}
 	}
-	
+
 	if(addToCount)
 	{
 		Int existingCount = 0;
@@ -174,7 +171,7 @@ Int ScoreKeeper::getTotalObjectsBuilt( const ThingTemplate *pTemplate )
 	for (ObjectCountMapIt it = m_objectsBuilt.begin(); it != m_objectsBuilt.end(); ++it)
 	{
 		const ThingTemplate *theTemplate = it->first;
-		if (theTemplate->isEquivalentTo(pTemplate))
+		if (theTemplate && theTemplate->isEquivalentTo(pTemplate))
 			++count;
 	}
 	return count;
@@ -236,7 +233,7 @@ void ScoreKeeper::addObjectCaptured( const Object *o )
 		}
 		addToCount = TRUE;
 	}
-	
+
 	if(addToCount)
 	{
 		Int existingCount = 0;
@@ -283,7 +280,7 @@ void ScoreKeeper::addObjectDestroyed( const Object *o)
 			}
 		}
 	}
-	
+
 	if(addToCount)
 	{
 		Int existingCount = 0;
@@ -325,7 +322,7 @@ void ScoreKeeper::addObjectLost( const Object *o )
 			}
 		}
 	}
-	
+
 	if(addToCount)
 	{
 		Int existingCount = 0;
@@ -333,7 +330,7 @@ void ScoreKeeper::addObjectLost( const Object *o )
 		if (it != m_objectsLost.end())
 			existingCount = it->second;
 		m_objectsLost[o->getTemplate()] = existingCount + 1;
-	}	
+	}
 }
 
 Int ScoreKeeper::calculateScore( void )
@@ -368,12 +365,12 @@ Int ScoreKeeper::getTotalBuildingsDestroyed( void )
 //		if(i == m_myPlayerIdx)
 //			continue;
 		count += m_totalBuildingsDestroyed[i];
-		//for (ObjectCountMapIt it = m_objectsDestroyed[i].begin(); it != m_objectsDestroyed[i].end(); ++it) 
+		//for (ObjectCountMapIt it = m_objectsDestroyed[i].begin(); it != m_objectsDestroyed[i].end(); ++it)
 		//		{
-		//			
+		//
 		//			count += it->second;
 		//		}
-		
+
 	}
 	return count;
 }
@@ -386,7 +383,7 @@ Int ScoreKeeper::getTotalUnitsDestroyed( void )
 //		if(i == m_myPlayerIdx)
 //			continue;
 		count += m_totalUnitsDestroyed[i];
-//		for (ObjectCountMapIt it = m_objectsDestroyed[i].begin(); it != m_objectsDestroyed[i].end(); ++it) 
+//		for (ObjectCountMapIt it = m_objectsDestroyed[i].begin(); it != m_objectsDestroyed[i].end(); ++it)
 //		{
 //		}
 	}
@@ -399,7 +396,7 @@ Int ScoreKeeper::getTotalUnitsDestroyed( void )
 void ScoreKeeper::crc( Xfer *xfer )
 {
 
-}  // end ScoreKeeper
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer of an object count map
@@ -413,10 +410,10 @@ void ScoreKeeper::xferObjectCountMap( Xfer *xfer, ObjectCountMap *map )
 	if( map == NULL )
 	{
 
-		DEBUG_CRASH(( "xferObjectCountMap - Invalid map parameter\n" ));
+		DEBUG_CRASH(( "xferObjectCountMap - Invalid map parameter" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// version info
 	XferVersion currentVersion = 1;
@@ -434,7 +431,7 @@ void ScoreKeeper::xferObjectCountMap( Xfer *xfer, ObjectCountMap *map )
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
 		ObjectCountMapIt it;
-		
+
 		// save all entries
 		for( it = map->begin(); it != map->end(); ++it )
 		{
@@ -448,9 +445,9 @@ void ScoreKeeper::xferObjectCountMap( Xfer *xfer, ObjectCountMap *map )
 			count = it->second;
 			xfer->xferInt( &count );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -464,10 +461,10 @@ void ScoreKeeper::xferObjectCountMap( Xfer *xfer, ObjectCountMap *map )
 			if( thingTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "xferObjectCountMap - Unknown thing template '%s'\n", thingTemplateName.str() ));
+				DEBUG_CRASH(( "xferObjectCountMap - Unknown thing template '%s'", thingTemplateName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// read count
 			xfer->xferInt( &count );
@@ -475,11 +472,11 @@ void ScoreKeeper::xferObjectCountMap( Xfer *xfer, ObjectCountMap *map )
 			// add to map
 			(*map)[ thingTemplate ] = count;
 
-		}  // end for, i
+		}
 
-	}  // end else
+	}
 
-}  // end xferObjectCountMap
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -489,7 +486,7 @@ void ScoreKeeper::xferObjectCountMap( Xfer *xfer, ObjectCountMap *map )
 void ScoreKeeper::xfer( Xfer *xfer )
 {
 
-	// version 
+	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
@@ -539,17 +536,17 @@ void ScoreKeeper::xfer( Xfer *xfer )
 	if( destroyedArraySize != MAX_PLAYER_COUNT )
 	{
 
-		DEBUG_CRASH(( "ScoreKeeper::xfer - size of objects destroyed array has changed\n" ));
+		DEBUG_CRASH(( "ScoreKeeper::xfer - size of objects destroyed array has changed" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( UnsignedShort i = 0; i < destroyedArraySize; ++i )
 	{
 
 		// xfer map data
 		xferObjectCountMap( xfer, &m_objectsDestroyed[ i ] );
 
-	}  // end for i
+	}
 
 	// objects lost
 	xferObjectCountMap( xfer, &m_objectsLost );
@@ -557,7 +554,7 @@ void ScoreKeeper::xfer( Xfer *xfer )
 	// objects captured
 	xferObjectCountMap( xfer, &m_objectsCaptured );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -565,4 +562,4 @@ void ScoreKeeper::xfer( Xfer *xfer )
 void ScoreKeeper::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp
index 693291300ea..f059cfdef1d 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Science.h"
@@ -37,39 +37,35 @@
 #include "GameLogic/Object.h"
 #include "Common/BitFlagsIO.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // GLOBAL /////////////////////////////////////////////////////////////////////////////////////////
 SpecialPowerStore *TheSpecialPowerStore = NULL;
 
-#define DEFAULT_DEFECTION_DETECTION_PROTECTION_TIME_LIMIT (LOGICFRAMES_PER_SECOND * 10) 
+#define DEFAULT_DEFECTION_DETECTION_PROTECTION_TIME_LIMIT (LOGICFRAMES_PER_SECOND * 10)
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Externs ////////////////////////////////////////////////////////////////////////////////////////
-const char* SpecialPowerMaskType::s_bitNameList[] = 
+template<>
+const char* const SpecialPowerMaskType::s_bitNameList[] =
 {
 	"SPECIAL_INVALID",
 
 	//Superweapons
-	"SPECIAL_DAISY_CUTTER", 
-	"SPECIAL_PARADROP_AMERICA", 
-	"SPECIAL_CARPET_BOMB", 
-	"SPECIAL_CLUSTER_MINES", 
-	"SPECIAL_EMP_PULSE", 
-	"SPECIAL_NAPALM_STRIKE", 
-	"SPECIAL_CASH_HACK", 
-	"SPECIAL_NEUTRON_MISSILE", 
-	"SPECIAL_SPY_SATELLITE", 
+	"SPECIAL_DAISY_CUTTER",
+	"SPECIAL_PARADROP_AMERICA",
+	"SPECIAL_CARPET_BOMB",
+	"SPECIAL_CLUSTER_MINES",
+	"SPECIAL_EMP_PULSE",
+	"SPECIAL_NAPALM_STRIKE",
+	"SPECIAL_CASH_HACK",
+	"SPECIAL_NEUTRON_MISSILE",
+	"SPECIAL_SPY_SATELLITE",
 	"SPECIAL_DEFECTOR",
-	"SPECIAL_TERROR_CELL", 
-	"SPECIAL_AMBUSH", 
+	"SPECIAL_TERROR_CELL",
+	"SPECIAL_AMBUSH",
 	"SPECIAL_BLACK_MARKET_NUKE",
 	"SPECIAL_ANTHRAX_BOMB",
 	"SPECIAL_SCUD_STORM",
@@ -84,15 +80,15 @@ const char* SpecialPowerMaskType::s_bitNameList[] =
 	"SPECIAL_ARTILLERY_BARRAGE",
 
 	//Special abilities
-	"SPECIAL_MISSILE_DEFENDER_LASER_GUIDED_MISSILES", 
-	"SPECIAL_REMOTE_CHARGES", 
-	"SPECIAL_TIMED_CHARGES", 
-	"SPECIAL_HELIX_NAPALM_BOMB", 
-	"SPECIAL_HACKER_DISABLE_BUILDING", 
-	"SPECIAL_TANKHUNTER_TNT_ATTACK", 
+	"SPECIAL_MISSILE_DEFENDER_LASER_GUIDED_MISSILES",
+	"SPECIAL_REMOTE_CHARGES",
+	"SPECIAL_TIMED_CHARGES",
+	"SPECIAL_HELIX_NAPALM_BOMB",
+	"SPECIAL_HACKER_DISABLE_BUILDING",
+	"SPECIAL_TANKHUNTER_TNT_ATTACK",
 	"SPECIAL_BLACKLOTUS_CAPTURE_BUILDING",
-	"SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK", 
-	"SPECIAL_BLACKLOTUS_STEAL_CASH_HACK", 
+	"SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK",
+	"SPECIAL_BLACKLOTUS_STEAL_CASH_HACK",
 	"SPECIAL_INFANTRY_CAPTURE_BUILDING",
 	"SPECIAL_RADAR_VAN_SCAN",
 	"SPECIAL_SPY_DRONE",
@@ -130,18 +126,19 @@ const char* SpecialPowerMaskType::s_bitNameList[] =
 	"SUPR_SPECIAL_CRUISE_MISSILE",
 	"LAZR_SPECIAL_PARTICLE_UPLINK_CANNON",
 	"SUPW_SPECIAL_NEUTRON_MISSILE",
-	
+
 	"SPECIAL_BATTLESHIP_BOMBARDMENT",
 
 	NULL
 };
+static_assert(ARRAY_SIZE(SpecialPowerMaskType::s_bitNameList) == SpecialPowerMaskType::NumBits + 1, "Incorrect array size");
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void SpecialPowerStore::parseSpecialPowerDefinition( INI *ini )
 {
 	// read the name
-	AsciiString name = ini->getNextToken();	
+	AsciiString name = ini->getNextToken();
 
 	SpecialPowerTemplate* specialPower = TheSpecialPowerStore->findSpecialPowerTemplatePrivate( name );
 
@@ -191,9 +188,9 @@ void SpecialPowerStore::parseSpecialPowerDefinition( INI *ini )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-/* static */ const FieldParse SpecialPowerTemplate::m_specialPowerFieldParse[] = 
+/* static */ const FieldParse SpecialPowerTemplate::m_specialPowerFieldParse[] =
 {
-	
+
 	{ "ReloadTime",								INI::parseDurationUnsignedInt,		NULL,	offsetof( SpecialPowerTemplate, m_reloadTime ) },
 	{ "RequiredScience",					INI::parseScience,								NULL, offsetof( SpecialPowerTemplate, m_requiredScience ) },
 	{ "InitiateSound",						INI::parseAudioEventRTS,					NULL,	offsetof( SpecialPowerTemplate, m_initiateSound ) },
@@ -207,7 +204,7 @@ void SpecialPowerStore::parseSpecialPowerDefinition( INI *ini )
 	{ "RadiusCursorRadius",				INI::parseReal,										NULL,	offsetof( SpecialPowerTemplate, m_radiusCursorRadius ) },
 	{ "ShortcutPower",						INI::parseBool,										NULL, offsetof( SpecialPowerTemplate, m_shortcutPower ) },
 	{ "AcademyClassify",					INI::parseIndexList,			TheAcademyClassificationTypeNames, offsetof( SpecialPowerTemplate, m_academyClassificationType ) },
-	{ NULL,	NULL, NULL,	0 }  // keep this last
+	{ NULL,	NULL, NULL,	0 }
 
 };
 
@@ -227,14 +224,14 @@ SpecialPowerTemplate::SpecialPowerTemplate()
 	m_radiusCursorRadius = 0;
 	m_shortcutPower = FALSE;
 
-}  // end SpecialPowerTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SpecialPowerTemplate::~SpecialPowerTemplate()
 {
 
-}  // end ~SpecialPowerTemplate
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -247,7 +244,7 @@ SpecialPowerStore::SpecialPowerStore( void )
 
 	m_nextSpecialPowerID = 0;
 
-}  // end SpecialPowerStore
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -264,7 +261,7 @@ SpecialPowerStore::~SpecialPowerStore( void )
 	// set our count to zero
 	m_nextSpecialPowerID = 0;
 
-}  // end ~SpecialPowerStore
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -306,7 +303,7 @@ const SpecialPowerTemplate *SpecialPowerStore::getSpecialPowerTemplateByIndex( U
 
 	return NULL;  // not found
 
-}  // end getSpecialPowerTemplateByIndex
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return the size of the store (WB) */
@@ -316,7 +313,7 @@ Int SpecialPowerStore::getNumSpecialPowers( void )
 
 	return m_specialPowerTemplates.size();
 
-}  // end getNumSpecialPowers
+}
 
 //-------------------------------------------------------------------------------------------------
 /** does the object (and therefore the player) meet all the requirements to use this power */
@@ -334,12 +331,12 @@ Bool SpecialPowerStore::canUseSpecialPower( Object *obj, const SpecialPowerTempl
 
 	//
 	// in order to execute the special powers we have attached special power modules to the objects
-	// that can use them.  However, just because an object has a module that is capable of 
+	// that can use them.  However, just because an object has a module that is capable of
 	// doing the power, does not mean the object and the player can actually execute the
 	// power because some powers require a specialized science that the player must select and
 	// they cannot have all of them.
 	//
-	
+
 	// check for requried science
 	ScienceType requiredScience = specialPowerTemplate->getRequiredScience();
 	if( requiredScience != SCIENCE_INVALID )
@@ -349,16 +346,16 @@ Bool SpecialPowerStore::canUseSpecialPower( Object *obj, const SpecialPowerTempl
 		if( player->hasScience( requiredScience ) == FALSE )
 			return FALSE;
 
-	}  // end if
+	}
+
 
-	
 	// I THINK THIS IS WHERE WE BAIL OUT IF A DIFFERENT CONYARD IS ALREADY CHARGIN THIS SPECIAL RIGHT NOW //LORENZEN
 
 
 	// all is well
 	return TRUE;
 
-}  // end canUseSpecialPower
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -378,4 +375,4 @@ void SpecialPowerStore::reset( void )
 			++it;
 		}
 	}
-}  // end reset
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp
index 2b3185e6f93..701debf163d 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameState.h"
 #include "Common/Team.h"
 #include "Common/ThingFactory.h"
@@ -51,11 +51,6 @@
 #include "GameLogic/ScriptActions.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///@todo - do delayed script evaluations for team scripts. jba.
 
@@ -67,7 +62,7 @@ TeamFactory *TheTeamFactory = NULL;
 TeamRelationMap::TeamRelationMap( void )
 {
 
-}  // end TeamRelationMap
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -77,7 +72,7 @@ TeamRelationMap::~TeamRelationMap( void )
 	// maek sure the data is clear
 	m_map.clear();
 
-}  // end ~TeamRelationMap
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -85,10 +80,10 @@ TeamRelationMap::~TeamRelationMap( void )
 void TeamRelationMap::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Xfer method 
+/** Xfer method
 	* Version Info;
 	* 1: Initial version */
 // ------------------------------------------------------------------------------------------------
@@ -118,14 +113,14 @@ void TeamRelationMap::xfer( Xfer *xfer )
 			// write team ID
 			teamID = (*teamRelationIt).first;
 			xfer->xferUser( &teamID, sizeof( TeamID ) );
-			
+
 			// write relationship
 			r = (*teamRelationIt).second;
 			xfer->xferUser( &r, sizeof( Relationship ) );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -140,12 +135,12 @@ void TeamRelationMap::xfer( Xfer *xfer )
 
 			// assign relationship
 			m_map[teamID] = r;
-			
-		}  // end for, i
 
-	}  // end else load
+		}
+
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -153,7 +148,7 @@ void TeamRelationMap::xfer( Xfer *xfer )
 void TeamRelationMap::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -241,9 +236,9 @@ void TeamFactory::initTeam(const AsciiString& name, const AsciiString& owner, Bo
 {
 	DEBUG_ASSERTCRASH(findTeamPrototype(name)==NULL,("team already exists"));
 	Player *pOwner = ThePlayerList->findPlayerWithNameKey(NAMEKEY(owner));
-	DEBUG_ASSERTCRASH(pOwner, ("no owner found for team %s (%s)\n",name.str(),owner.str()));
+	DEBUG_ASSERTCRASH(pOwner, ("no owner found for team %s (%s)",name.str(),owner.str()));
 	if (!pOwner)
-		pOwner = ThePlayerList->getNeutralPlayer(); 
+		pOwner = ThePlayerList->getNeutralPlayer();
 	/*TeamPrototype *tp =*/ newInstance(TeamPrototype)(this, name, pOwner, isSingleton, d, ++m_uniqueTeamPrototypeID);
 	if (isSingleton) {
 		// Create the singleton team.
@@ -293,14 +288,14 @@ TeamPrototype *TeamFactory::findTeamPrototypeByID( TeamPrototypeID id )
 
 	for( it = m_prototypes.begin(); it != m_prototypes.end(); ++it )
 	{
-	
+
 		prototype = it->second;
 		if( prototype->getID() == id )
 			return prototype;
 
-	}  // end for
-	
-	// not found	
+	}
+
+	// not found
 	return NULL;
 
 }
@@ -335,9 +330,11 @@ Call team->setActive() when all members are added. */
 Team *TeamFactory::createInactiveTeam(const AsciiString& name)
 {
 	TeamPrototype *tp = findTeamPrototype(name);
-	if (!tp)
-		throw ERROR_BAD_ARG;
-	
+	if (!tp) {
+		DEBUG_CRASH(( "Team prototype '%s' does not exist", name.str() ));
+		return NULL;
+	}
+
 	Team *t = NULL;
 	if (tp->getIsSingleton())
 	{
@@ -360,16 +357,18 @@ Team *TeamFactory::createInactiveTeam(const AsciiString& name)
 			TheScriptEngine->friend_executeAction(script->getAction());
 		}
 	}
-	
+
 	return t;
 }
 
 // ------------------------------------------------------------------------
 Team *TeamFactory::createTeam(const AsciiString& name)
 {
-	Team *t = NULL;
-	t = createInactiveTeam(name);
-	t->setActive();
+	Team *t = createInactiveTeam(name);
+
+	if (t)
+		t->setActive();
+
 	return t;
 }
 
@@ -397,7 +396,7 @@ Team* TeamFactory::findTeam(const AsciiString& name)
 	if (tp)
 	{
 		Team *t = tp->getFirstItemIn_TeamInstanceList();
-		if (t == NULL && !tp->getIsSingleton()) 
+		if (t == NULL && !tp->getIsSingleton())
 		{
 			t = createInactiveTeam(name);
 		}
@@ -423,7 +422,7 @@ void TeamFactory::teamAboutToBeDeleted(Team* team)
 void TeamFactory::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------
 /** Xfer method
@@ -452,11 +451,11 @@ void TeamFactory::xfer( Xfer *xfer )
 	if( prototypeCount != m_prototypes.size() )
 	{
 
-		DEBUG_CRASH(( "TeamFactory::xfer - Prototype count mismatch '%d should be '%d'\n",
+		DEBUG_CRASH(( "TeamFactory::xfer - Prototype count mismatch '%d should be '%d'",
 									prototypeCount, m_prototypes.size() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// xfer each of the prototype information
 	TeamPrototypeMap::iterator it;
@@ -479,10 +478,10 @@ void TeamFactory::xfer( Xfer *xfer )
 
 			// xfer prototype data
 			xfer->xferSnapshot( teamPrototype );
-		
-		}  //end for, it
 
-	}  // end if, saving
+		}
+
+	}
 	else
 	{
 
@@ -500,20 +499,20 @@ void TeamFactory::xfer( Xfer *xfer )
 			if( teamPrototype == NULL )
 			{
 
-				DEBUG_CRASH(( "TeamFactory::xfer - Unable to find team prototype by id\n" ));
+				DEBUG_CRASH(( "TeamFactory::xfer - Unable to find team prototype by id" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// xfer prototype data
 			xfer->xferSnapshot( teamPrototype );
 
-		}  // end for, i
+		}
 
-	}  // end else, loading
+	}
 
 /*
-// SAVE_LOAD_DEBUG 
+// SAVE_LOAD_DEBUG
 if( xfer->getXferMode() == XFER_SAVE )
 {
 
@@ -529,7 +528,7 @@ for( prototypeIt = m_prototypes.begin(); prototypeIt != m_prototypes.end(); ++pr
 {
 	prototype = prototypeIt->second;
 fprintf( fp, "Prototype '%s' for player index '%d'\n", prototype->getName().str(), prototype->getControllingPlayer()->getPlayerIndex() );
-	for( DLINK_ITERATOR<Team> teamIt = prototype->iterate_TeamInstanceList(); !teamIt.done(); teamIt.advance() ) 
+	for( DLINK_ITERATOR<Team> teamIt = prototype->iterate_TeamInstanceList(); !teamIt.done(); teamIt.advance() )
 	{
 		team = teamIt.cur();
 fprintf( fp, "  Team Instance '%s', id is '%d'\n", team->getName().str(), team->getID() );
@@ -538,15 +537,15 @@ fprintf( fp, "  Team Instance '%s', id is '%d'\n", team->getName().str(), team->
 			obj = objIt.cur();
 fprintf( fp, "    Member '%s', id '%d'\n", obj->getTemplate()->getName().str(), obj->getID() );
 		}
-	}  // end for
+	}
 
-}  // end for
+}
 fclose( fp );
 
-}  // end if, save
+}
 */
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------
 /** Load post process */
@@ -571,16 +570,16 @@ void TeamFactory::loadPostProcess( void )
 			m_uniqueTeamPrototypeID = prototype->getID() + 1;
 
 		// iterate team instances on each prototype and do the team ID check
-		for( DLINK_ITERATOR<Team> iter = prototype->iterate_TeamInstanceList(); !iter.done(); iter.advance() ) 
+		for( DLINK_ITERATOR<Team> iter = prototype->iterate_TeamInstanceList(); !iter.done(); iter.advance() )
 		{
 
 			team = iter.cur();
 			if( team->getID() >= m_uniqueTeamID )
 				m_uniqueTeamID = team->getID() + 1;
 
-		}  // end for
+		}
 
-	}  // end for, it
+	}
 
 /*
 // SAVE_LOAD_DEBUG
@@ -593,7 +592,7 @@ for( prototypeIt = m_prototypes.begin(); prototypeIt != m_prototypes.end(); ++pr
 {
 	prototype = prototypeIt->second;
 fprintf( fp, "Prototype '%s' for player index '%d'\n", prototype->getName().str(), prototype->getControllingPlayer()->getPlayerIndex() );
-	for( DLINK_ITERATOR<Team> teamIt = prototype->iterate_TeamInstanceList(); !teamIt.done(); teamIt.advance() ) 
+	for( DLINK_ITERATOR<Team> teamIt = prototype->iterate_TeamInstanceList(); !teamIt.done(); teamIt.advance() )
 	{
 		team = teamIt.cur();
 fprintf( fp, "  Team Instance '%s', id is '%d'\n", team->getName().str(), team->getID() );
@@ -603,13 +602,13 @@ fprintf( fp, "  Team Instance '%s', id is '%d'\n", team->getName().str(), team->
 			obj = objIt.cur();
 fprintf( fp, "    Member '%s', id '%d'\n", obj->getTemplate()->getName().str(), obj->getID() );
 		}
-	}  // end for
+	}
 
-}  // end for
+}
 fclose( fp );
 */
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
@@ -741,11 +740,11 @@ TeamTemplateInfo::TeamTemplateInfo(Dict *d) :
 	m_productionCondition = d->getAsciiString(TheKey_teamProductionCondition, &exists);
 	m_executeActions = d->getBool(TheKey_teamExecutesActionsOnCreate, &exists);
 
-	
+
 	// Which scripts to attempt during run?
 	for (int i = 0; i < MAX_GENERIC_SCRIPTS; ++i) {
 		AsciiString keyName;
-		keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_teamGenericScriptHook).str(), i);			
+		keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_teamGenericScriptHook).str(), i);
 		m_teamGenericScripts[i] = d->getAsciiString(NAMEKEY(keyName), &exists);
 		if (!exists) {
 			m_teamGenericScripts[i].clear();
@@ -767,7 +766,7 @@ TeamTemplateInfo::TeamTemplateInfo(Dict *d) :
 void TeamTemplateInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------
 /** Xfer method
@@ -785,7 +784,7 @@ void TeamTemplateInfo::xfer( Xfer *xfer )
 	// xfer the production priority
 	xfer->xferInt( &m_productionPriority );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------
 /** Load post process */
@@ -793,7 +792,7 @@ void TeamTemplateInfo::xfer( Xfer *xfer )
 void TeamTemplateInfo::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
@@ -801,18 +800,18 @@ void TeamTemplateInfo::loadPostProcess( void )
 // ------------------------------------------------------------------------
 
 // ------------------------------------------------------------------------
-TeamPrototype::TeamPrototype( TeamFactory *tf, 
-															const AsciiString &name, 
-															Player *ownerPlayer, 
-															Bool isSingleton, 
-															Dict *d, 
-															TeamPrototypeID id ) : 
+TeamPrototype::TeamPrototype( TeamFactory *tf,
+															const AsciiString &name,
+															Player *ownerPlayer,
+															Bool isSingleton,
+															Dict *d,
+															TeamPrototypeID id ) :
 	m_id(id),
-	m_factory(tf), 
-	m_name(name), 
-	m_owningPlayer(ownerPlayer), 
+	m_factory(tf),
+	m_name(name),
+	m_owningPlayer(ownerPlayer),
 	m_flags(isSingleton ? TeamPrototype::TEAM_SINGLETON : 0),
-	m_teamTemplate(d), 
+	m_teamTemplate(d),
 	m_productionConditionAlwaysFalse(false),
 	m_productionConditionScript(NULL)
 {
@@ -822,7 +821,7 @@ TeamPrototype::TeamPrototype( TeamFactory *tf,
 
 	if (m_owningPlayer)
 		m_owningPlayer->addTeamToList(this);
-	
+
 	m_retrievedGenericScripts = false;
 	for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i) {
 		m_genericScriptsToRun[i] = NULL;
@@ -850,19 +849,13 @@ TeamPrototype::~TeamPrototype()
 	if (m_factory)
 		m_factory->removeTeamPrototypeFromList(this);
 
-	if (m_productionConditionScript) 
-	{
-		deleteInstance(m_productionConditionScript);
-	}
+	deleteInstance(m_productionConditionScript);
 	m_productionConditionScript = NULL;
 
-	for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i) 
+	for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i)
 	{
-		if (m_genericScriptsToRun[i]) 
-		{
-			deleteInstance(m_genericScriptsToRun[i]);
-			m_genericScriptsToRun[i] = NULL;
-		}
+		deleteInstance(m_genericScriptsToRun[i]);
+		m_genericScriptsToRun[i] = NULL;
 	}
 }
 
@@ -884,7 +877,7 @@ Team *TeamPrototype::findTeamByID( TeamID teamID )
 }
 
 // ------------------------------------------------------------------------
-void TeamPrototype::setControllingPlayer(Player *newController) 
+void TeamPrototype::setControllingPlayer(Player *newController)
 {
 	DEBUG_ASSERTCRASH(newController, ("Attempted to set NULL player as team-owner, illegal."));
 	if (!newController) {
@@ -982,7 +975,7 @@ Int TeamPrototype::countObjects(KindOfMaskType setMask, KindOfMaskType clearMask
 // ------------------------------------------------------------------------
 void TeamPrototype::healAllObjects(void)
 {
-	for (DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+	for (DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance())
 	{
 		iter.cur()->healAllObjects();
 	}
@@ -991,7 +984,7 @@ void TeamPrototype::healAllObjects(void)
 // ------------------------------------------------------------------------
 void TeamPrototype::iterateObjects( ObjectIterateFunc func, void *userData )
 {
-	for (DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+	for (DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance())
 	{
 		iter.cur()->iterateObjects( func, userData );
 	}
@@ -1052,7 +1045,7 @@ Bool TeamPrototype::hasAnyObjects() const
 }
 
 // ------------------------------------------------------------------------
-void TeamPrototype::updateState(void) 
+void TeamPrototype::updateState(void)
 {
 	for (DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance())
 	{
@@ -1063,16 +1056,16 @@ void TeamPrototype::updateState(void)
 	while (!done) {
 		done = true;
 		for (DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance())
-		{	
-			if (iter.cur()->getFirstItemIn_TeamMemberList() == NULL) 
-			{ 
+		{
+			if (iter.cur()->getFirstItemIn_TeamMemberList() == NULL)
+			{
 				// Team has no members.
-				if (this->getIsSingleton())	
+				if (this->getIsSingleton())
 				{
 					continue; // Don't delete singleton teams, even if they are empty.
 				}
 
-				if (iter.cur()->getControllingPlayer() && iter.cur()->getControllingPlayer()->getDefaultTeam() == iter.cur()) 
+				if (iter.cur()->getControllingPlayer() && iter.cur()->getControllingPlayer()->getDefaultTeam() == iter.cur())
 				{
 					// This is the player's default team, so don't remove it.
 					continue;
@@ -1153,7 +1146,7 @@ Bool TeamPrototype::evaluateProductionCondition(void)
 	if (pScript) {
 		// Check difficulty.
 		switch (getControllingPlayer()->getPlayerDifficulty() ) {
-			case DIFFICULTY_EASY: 
+			case DIFFICULTY_EASY:
 				if (!pScript->isEasy()) {
 					m_productionConditionAlwaysFalse = true;
 					return false;
@@ -1189,7 +1182,7 @@ Bool TeamPrototype::evaluateProductionCondition(void)
 void TeamPrototype::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------
 /** Xfer method
@@ -1223,7 +1216,7 @@ void TeamPrototype::xfer( Xfer *xfer )
 
 	// xfer team instance count
 	UnsignedShort teamInstanceCount = 0;
-	for( DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance() ) 
+	for( DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance() )
 		teamInstanceCount++;
 	xfer->xferUnsignedShort( &teamInstanceCount );
 
@@ -1234,7 +1227,7 @@ void TeamPrototype::xfer( Xfer *xfer )
 	{
 
 		// xfer each team instance
-		for( DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance() ) 
+		for( DLINK_ITERATOR<Team> iter = iterate_TeamInstanceList(); !iter.done(); iter.advance() )
 		{
 
 			// get the team
@@ -1247,9 +1240,9 @@ void TeamPrototype::xfer( Xfer *xfer )
 			// write team data
 			xfer->xferSnapshot( teamInstance );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -1281,16 +1274,16 @@ void TeamPrototype::xfer( Xfer *xfer )
 				// restore original ID we read from the file
 				teamInstance->setID( teamID );
 
-			}  // end if
+			}
 
 			// xfer team data
 			xfer->xferSnapshot( teamInstance );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
-	
-}  // end xfer
+	}
+
+}
 
 // ------------------------------------------------------------------------
 /** Load post process */
@@ -1298,7 +1291,7 @@ void TeamPrototype::xfer( Xfer *xfer )
 void TeamPrototype::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
@@ -1309,25 +1302,21 @@ void TeamPrototype::loadPostProcess( void )
 // ------------------------------------------------------------------------
 
 // ------------------------------------------------------------------------
-Team::Team(TeamPrototype *proto, TeamID id ) : 
+Team::Team(TeamPrototype *proto, TeamID id ) :
   m_id( id ),
-	m_proto(proto), 
-	m_enteredOrExited(false), 
-	m_active(false), 
-	m_seeEnemy(false), 
-	m_prevSeeEnemy(false), 
+	m_proto(proto),
+	m_enteredOrExited(false),
+	m_active(false),
+	m_seeEnemy(false),
+	m_prevSeeEnemy(false),
 	m_checkEnemySighted(false),
 	m_isRecruitablitySet(false),
 	m_isRecruitable(false),
-	m_destroyThreshold(0), 
-	m_curUnits(0), 
+	m_destroyThreshold(0),
+	m_curUnits(0),
 	m_wasIdle(false)
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_created = FALSE;
-	
-	//
 	m_commonAttackTarget = INVALID_ID;
 
 	// allocate new relation map pools
@@ -1342,18 +1331,18 @@ Team::Team(TeamPrototype *proto, TeamID id ) :
 		{
 			m_checkEnemySighted = true;	 // Only keep track of enemy sighted if there is a script that cares.
 		}
-		
+
 		AsciiString teamName = proto->getName();
 		teamName.concat(" - creating team instance.");
 		TheScriptEngine->AppendDebugMessage(teamName, false);
 	}
 
-	for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i) 
+	for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i)
 	{
 		m_shouldAttemptGenericScript[i] = true;
 	}
 
-	
+
 }
 
 // ------------------------------------------------------------------------
@@ -1406,19 +1395,19 @@ void Team::setControllingPlayer(Player *newController)
 	m_proto->setControllingPlayer(newController);
 
 	// This function is used by one script, and it is kind of odd.  The actual units
-	// are not getting captured, the team they are on is being reassigned to a new player.  
+	// are not getting captured, the team they are on is being reassigned to a new player.
 	// The Team doesn't change, it just starts to return a different answer when you ask for
 	// the controlling player.  I don't want to make the major change of onCapture on everyone,
 	// so I will do the minor fix for the specific bug, which is harmless even when misused.
 
 	// Tell all members to redo their looking status, as their Player has changed, but they don't know.
-	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		Object *obj = iter.cur();
-		if (!obj) 
+		if (!obj)
 			continue;
 
-		obj->handlePartitionCellMaintenance();		
+		obj->handlePartitionCellMaintenance();
 	}
 
 }
@@ -1436,7 +1425,7 @@ void Team::getTeamAsAIGroup(AIGroup *pAIGroup)
 		return;
 	}
 
-	// Should this clear out the pAIGroup that it receives? I don't think so, but that 
+	// Should this clear out the pAIGroup that it receives? I don't think so, but that
 	// would go here if so. jkmcd
 
 	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) {
@@ -1456,7 +1445,7 @@ Int Team::getTargetableCount() const
 		if (!obj) {
 			continue;
 		}
-		
+
 		if (obj->isEffectivelyDead() || (obj->getAIUpdateInterface() == NULL && !obj->isKindOf(KINDOF_STRUCTURE))) {
 			continue;
 		}
@@ -1519,11 +1508,11 @@ Object *Team::getTeamTargetObject(void)
 {
 	if (m_commonAttackTarget == INVALID_ID) {
 		return NULL;
-	}			 
+	}
 	Object *target = TheGameLogic->findObjectByID(m_commonAttackTarget);
 	if (target) {
 		//If the enemy unit is stealthed and not detected, then we can't attack it!
-	if( target->testStatus( OBJECT_STATUS_STEALTHED ) && 
+	if( target->testStatus( OBJECT_STATUS_STEALTHED ) &&
 			!target->testStatus( OBJECT_STATUS_DETECTED ) &&
 			!target->testStatus( OBJECT_STATUS_DISGUISED ) )
 		{
@@ -1537,7 +1526,7 @@ Object *Team::getTeamTargetObject(void)
 		target = NULL; // target entered a building or vehicle, so stop targeting.
 	}
 	if (target && target->isKindOf(KINDOF_AIRCRAFT)) {
-		// It is just generally bad to have an aircraft as the team target. 
+		// It is just generally bad to have an aircraft as the team target.
 		// Let team members acquire aircraft individually.  jba. [8/27/2003]
 		target = NULL;
 	}
@@ -1675,7 +1664,7 @@ Int Team::countObjects(KindOfMaskType setMask, KindOfMaskType clearMask)
 // ------------------------------------------------------------------------
 void Team::healAllObjects(void)
 {
-	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		iter.cur()->healCompletely();
 	}
@@ -1684,7 +1673,7 @@ void Team::healAllObjects(void)
 // ------------------------------------------------------------------------
 void Team::iterateObjects( ObjectIterateFunc func, void *userData )
 {
-	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		func( iter.cur(), userData );
 	}
@@ -1698,7 +1687,7 @@ Bool Team::hasAnyBuildings() const
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (iter.cur()->isDestroyed()) 
+		if (iter.cur()->isDestroyed())
 			continue;
 
 		if (iter.cur()->isKindOf(KINDOF_STRUCTURE))
@@ -1715,7 +1704,7 @@ Bool Team::hasAnyBuildings(KindOfMaskType kindOf) const
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (iter.cur()->isDestroyed()) 
+		if (iter.cur()->isDestroyed())
 			continue;
 
 		kindOf.set(KINDOF_STRUCTURE);
@@ -1733,7 +1722,7 @@ Bool Team::hasAnyUnits() const
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (iter.cur()->isDestroyed()) 
+		if (iter.cur()->isDestroyed())
 			continue;
 
 		// If it's a structure, it's not  a unit.
@@ -1762,7 +1751,7 @@ Bool Team::isIdle() const
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (!ai->isIdle()) 
+		if (!ai->isIdle())
 		{
 			idle = false;
 			break;
@@ -1779,7 +1768,7 @@ Bool Team::hasAnyObjects() const
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (iter.cur()->isDestroyed()) 
+		if (iter.cur()->isDestroyed())
 			continue;
 
 		if (iter.cur()->isKindOf(KINDOF_PROJECTILE)) {
@@ -1804,18 +1793,18 @@ Bool Team::hasAnyObjects() const
 
 // ------------------------------------------------------------------------
 /** Clears m_enteredExited, checks & clears m_created. */
-void Team::updateState(void) 
+void Team::updateState(void)
 {
 	m_enteredOrExited = false;
 	if (!m_active) {
-		return; 
+		return;
 	}
 	const TeamTemplateInfo *pInfo = m_proto->getTemplateInfo();
-	if (m_created) 
+	if (m_created)
 	{
 		m_created = false;
 		// Run the on create script, if any.
-		if (!pInfo->m_scriptOnCreate.isEmpty()) 
+		if (!pInfo->m_scriptOnCreate.isEmpty())
 		{
 			TheScriptEngine->runScript(pInfo->m_scriptOnCreate, this);
 		}
@@ -1853,7 +1842,7 @@ void Team::updateState(void)
 			PartitionFilter *filters[] = { &filterTeam, &filterAlive, &filterMapStatus, NULL };
 			Real visionRange = iter.cur()->getVisionRange();
 			anyAliveInTeam = true;
-			Object *pObj = ThePartitionManager->getClosestObject( iter.cur(), visionRange, 
+			Object *pObj = ThePartitionManager->getClosestObject( iter.cur(), visionRange,
 				FROM_CENTER_2D, filters );
 			if (pObj) {
 				m_seeEnemy = true;
@@ -1861,9 +1850,9 @@ void Team::updateState(void)
 			}
 		}
 		if (anyAliveInTeam) {
-			if (m_prevSeeEnemy != m_seeEnemy) 
+			if (m_prevSeeEnemy != m_seeEnemy)
 			{
-				if (m_seeEnemy) 
+				if (m_seeEnemy)
 				{
 					// fire onEnemySighted
 					TheScriptEngine->runScript(pInfo->m_scriptOnEnemySighted, this);
@@ -1876,7 +1865,7 @@ void Team::updateState(void)
 	}
 
 	// Do onDestroyed checks.
-	if (!pInfo->m_scriptOnDestroyed.isEmpty()) 
+	if (!pInfo->m_scriptOnDestroyed.isEmpty())
 	{
 		Int prevUnits = m_curUnits;
 		m_curUnits = 0;
@@ -1887,7 +1876,7 @@ void Team::updateState(void)
 
 			m_curUnits++;
 		}
-		if (m_curUnits != prevUnits && m_curUnits <= m_destroyThreshold) 
+		if (m_curUnits != prevUnits && m_curUnits <= m_destroyThreshold)
 		{
 			TheScriptEngine->runScript(pInfo->m_scriptOnDestroyed, this);
 			m_destroyThreshold = -1; // don't trigger again.
@@ -1895,7 +1884,7 @@ void Team::updateState(void)
 	}
 
 	// Do onIdle checks.
-	if (!pInfo->m_scriptOnIdle.isEmpty()) 
+	if (!pInfo->m_scriptOnIdle.isEmpty())
 	{
 		Bool isIdle = true;
 		Bool anyAliveInTeam = false; // If we're all dead, don't do all clear.
@@ -1911,7 +1900,7 @@ void Team::updateState(void)
 				isIdle = false;
 			}
 		}
-		if (anyAliveInTeam && isIdle && m_wasIdle) 
+		if (anyAliveInTeam && isIdle && m_wasIdle)
 		{
 			TheScriptEngine->runScript(pInfo->m_scriptOnIdle, this);
 		}
@@ -1962,7 +1951,7 @@ Bool Team::didAllEnter(PolygonTrigger *pTrigger, UnsignedInt whichToConsider) co
 
 		if (iter.cur()->isEffectivelyDead())
 			continue;
-		
+
 		if (iter.cur()->isKindOf(KINDOF_INERT))
 			continue;
 
@@ -2011,7 +2000,7 @@ Bool Team::didPartialEnter(PolygonTrigger *pTrigger, UnsignedInt whichToConsider
 
 		if (iter.cur()->didEnter(pTrigger)) {
 			return true;
-		} 
+		}
 	}
 	return false;
 }
@@ -2047,7 +2036,7 @@ Bool Team::didPartialExit(PolygonTrigger *pTrigger, UnsignedInt whichToConsider)
 
 		if (iter.cur()->didExit(pTrigger)) {
 			return true;
-		} 
+		}
 	}
 	return false;
 }
@@ -2056,7 +2045,7 @@ Bool Team::didPartialExit(PolygonTrigger *pTrigger, UnsignedInt whichToConsider)
 Bool Team::didAllExit(PolygonTrigger *pTrigger, UnsignedInt whichToConsider) const
 {
 	// If any units entered or exited, they set this flag.
-	if (!m_enteredOrExited) 
+	if (!m_enteredOrExited)
 		return false;
 
 	Bool anyConsidered = false;
@@ -2081,7 +2070,7 @@ Bool Team::didAllExit(PolygonTrigger *pTrigger, UnsignedInt whichToConsider) con
 
 		if (iter.cur()->isEffectivelyDead())
 			continue;
-		
+
 		if (iter.cur()->isKindOf(KINDOF_INERT))
 			continue;
 
@@ -2220,7 +2209,7 @@ Bool Team::someInsideSomeOutside(PolygonTrigger *pTrigger, UnsignedInt whichToCo
 			anyOutside = true;
 		}
 
-		// In this particular case, this is unnecessary. However, unless it is a performance hit, please 
+		// In this particular case, this is unnecessary. However, unless it is a performance hit, please
 		// leave it.
 		anyConsidered = true;
 	}
@@ -2259,10 +2248,10 @@ void Team::deleteTeam(Bool ignoreDead)
 	if( this == getControllingPlayer()->getDefaultTeam() )
 	{
 		std::list<Object *> guysToMakeEvacuate;
-		for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 		{
 			Object *obj = iter.cur();
-			if (!obj) 
+			if (!obj)
 				continue;
 
 			if( obj->getContain()  &&  (obj->getContain()->getContainCount() > 0) )
@@ -2285,7 +2274,7 @@ void Team::deleteTeam(Bool ignoreDead)
 
 	// this doesn't actually delete the team, it deletes the members of the team.
 	// the team itself will be deleted in updateState.
-	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		Object *obj = iter.cur();
 		if (!obj) {
@@ -2297,7 +2286,7 @@ void Team::deleteTeam(Bool ignoreDead)
 		// they use it on a team with things that can't die, then yeah, the Team will last forever.  But then it is
 		// user error.
 		if( ignoreDead && obj->isEffectivelyDead() )
-			continue; 
+			continue;
 
 		TheGameLogic->destroyObject(obj);
 	}
@@ -2310,10 +2299,10 @@ void Team::transferUnitsTo(Team *newTeam)
 	if (this == newTeam) return;
 	if (newTeam == NULL) return;
 	Object *obj;
-	while ((obj = getFirstItemIn_TeamMemberList()) != 0) 
+	while ((obj = getFirstItemIn_TeamMemberList()) != 0)
 	{
 		obj->setTeam(newTeam);
-	} 
+	}
 }
 
 // ------------------------------------------------------------------------
@@ -2341,13 +2330,13 @@ Object *Team::tryToRecruit(const ThingTemplate *tTemplate, const Coord3D *teamHo
 	Object *recruit = NULL;
 	for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() )
 	{
-		if (!obj->getTemplate()->isEquivalentTo(tTemplate)) 
+		if (!obj->getTemplate()->isEquivalentTo(tTemplate))
 		{
 			// it might be ok, if tTemplate is really just a "build-variations" template...
 			if (!isInBuildVariations(tTemplate, obj->getTemplate()))
 				continue;
 		}
-		if (obj->getControllingPlayer() != myPlayer) 
+		if (obj->getControllingPlayer() != myPlayer)
 			continue;
 		Team *team = obj->getTeam();
 		Bool isDefaultTeam = false;
@@ -2362,7 +2351,7 @@ Object *Team::tryToRecruit(const ThingTemplate *tTemplate, const Coord3D *teamHo
 		}
 		Bool teamIsRecruitable = isDefaultTeam;	 // Default team always recruitable.
 		if (team->getPrototype()->getTemplateInfo()->m_isAIRecruitable) {
-			teamIsRecruitable = true; 
+			teamIsRecruitable = true;
 		}
 		// Check & see if individual team has been marked for recruitability.
 		if (team->m_isRecruitablitySet) {
@@ -2374,7 +2363,7 @@ Object *Team::tryToRecruit(const ThingTemplate *tTemplate, const Coord3D *teamHo
 		if (obj->getAIUpdateInterface() && !obj->getAIUpdateInterface()->isRecruitable()) {
 			continue; // can't recruit this unit.
 		}
-		if( obj->isDisabledByType( DISABLED_HELD ) ) 
+		if( obj->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // Don't recruit held units.
 		}
@@ -2396,7 +2385,7 @@ Object *Team::tryToRecruit(const ThingTemplate *tTemplate, const Coord3D *teamHo
 	if (recruit!=NULL) {
 		return recruit;
 	}
- 	return NULL;	 
+ 	return NULL;
 }
 
 // ------------------------------------------------------------------------
@@ -2441,8 +2430,10 @@ void Team::killTeam(void)
 
 	evacuateTeam();
 
+	// TheSuperHackers @bugfix Mauller 20/07/2025 the neutral player has no player template so we need to check for a null template
+	const PlayerTemplate* playerTemplate = getControllingPlayer()->getPlayerTemplate();
 	// beacons are effectively dead, so we need to destroy via a non-kill() method
-	const ThingTemplate *beaconTemplate = TheThingFactory->findTemplate( getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );
+	const ThingTemplate* beaconTemplate = playerTemplate ? TheThingFactory->findTemplate( playerTemplate->getBeaconTemplate() ) : NULL;
 
 	// now find objects to kill
 	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance()) {
@@ -2472,14 +2463,14 @@ void Team::killTeam(void)
 }
 
 // ------------------------------------------------------------------------
-Bool Team::damageTeamMembers(Real amount) 
+Bool Team::damageTeamMembers(Real amount)
 {
 	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (iter.cur()->isDestroyed()) 
+		if (iter.cur()->isDestroyed())
 			continue;
 
 		// do max amount of damage to object
@@ -2494,21 +2485,21 @@ Bool Team::damageTeamMembers(Real amount)
 			damageInfo.in.m_amount = amount;
 			iter.cur()->attemptDamage( &damageInfo );
 		}
-		
+
 	}
 	return false;
 }
 
 // ------------------------------------------------------------------------
 /// @todo This should give a "team move" command, not individual move orders (MSB)
-void Team::moveTeamTo(Coord3D destination) 
+void Team::moveTeamTo(Coord3D destination)
 {
 	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		if (iter.cur()->isEffectivelyDead())
 			continue;
 
-		if (iter.cur()->isDestroyed()) 
+		if (iter.cur()->isDestroyed())
 			continue;
 	}
 }
@@ -2519,7 +2510,7 @@ Bool Team::hasAnyBuildFacility() const
 	for (DLINK_ITERATOR<Object> iter = iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		const ThingTemplate *objtmpl = iter.cur()->getTemplate();
-		if (objtmpl->isBuildFacility()) 
+		if (objtmpl->isBuildFacility())
 			return true;
 	}
 	return false;
@@ -2532,7 +2523,7 @@ void Team::updateGenericScripts(void)
 	//USE_PERF_TIMER(updateGenericScripts)
 	for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i) {
 		if (m_shouldAttemptGenericScript[i]) {
-			// Does the condition succeed? If so, run it. If it is a run once script, also mark that we 
+			// Does the condition succeed? If so, run it. If it is a run once script, also mark that we
 			// shouldn't run it again.
 			Script *script = m_proto->getGenericScript(i);
 			if (script) {
@@ -2548,7 +2539,7 @@ void Team::updateGenericScripts(void)
 					msg.concat(getName());
 					TheScriptEngine->AppendDebugMessage(msg, false);
 				}
-			} else { 
+			} else {
 				m_shouldAttemptGenericScript[i] = false;
 			}
 		}
@@ -2561,7 +2552,7 @@ void Team::updateGenericScripts(void)
 void Team::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -2582,27 +2573,27 @@ void Team::xfer( Xfer *xfer )
 	if( teamID != m_id )
 	{
 
-		DEBUG_CRASH(( "Team::xfer - TeamID mismatch.  Xfered '%d' but should be '%d'\n",
+		DEBUG_CRASH(( "Team::xfer - TeamID mismatch.  Xfered '%d' but should be '%d'",
 									teamID, m_id ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
-		
+	}
+
 	// member list count and data
 	ObjectID memberID;
 	UnsignedShort memberCount = 0;
-	for( DLINK_ITERATOR< Object > objIt = iterate_TeamMemberList(); 
-			 objIt.done() == FALSE; 
+	for( DLINK_ITERATOR< Object > objIt = iterate_TeamMemberList();
+			 objIt.done() == FALSE;
 			 objIt.advance() )
 		memberCount++;
 	xfer->xferUnsignedShort( &memberCount );
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
 		Object *obj;
-		
+
 		// save all member info
-		for( DLINK_ITERATOR< Object > objIt = iterate_TeamMemberList(); 
-				 objIt.done() == FALSE; 
+		for( DLINK_ITERATOR< Object > objIt = iterate_TeamMemberList();
+				 objIt.done() == FALSE;
 				 objIt.advance() )
 		{
 
@@ -2613,9 +2604,9 @@ void Team::xfer( Xfer *xfer )
 			memberID = obj->getID();
 			xfer->xferObjectID( &memberID );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -2629,9 +2620,9 @@ void Team::xfer( Xfer *xfer )
 			// put on pending list for later processing
 			m_xferMemberIDList.push_back( memberID );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// state
 	xfer->xferAsciiString( &m_state );
@@ -2682,7 +2673,7 @@ void Team::xfer( Xfer *xfer )
 
 	// recruitability set
 	xfer->xferBool( &m_isRecruitablitySet );
-	
+
 	// is recruitable
 	xfer->xferBool( &m_isRecruitable );
 
@@ -2694,8 +2685,8 @@ void Team::xfer( Xfer *xfer )
 
 	// player relations
 	xfer->xferSnapshot( m_playerRelations );
-			
-}  // ene xfer
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2717,10 +2708,10 @@ void Team::loadPostProcess( void )
 		if( obj == NULL )
 		{
 
-			DEBUG_CRASH(( "Team::loadPostProcess - Unable to post process object to member list, object ID = '%d'\n", *it ));
+			DEBUG_CRASH(( "Team::loadPostProcess - Unable to post process object to member list, object ID = '%d'", *it ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		//
 		// we are now disabling this code since the objects set their team during their
@@ -2731,13 +2722,13 @@ void Team::loadPostProcess( void )
 		if( isInList_TeamMemberList( obj ) == FALSE )
 		{
 
-			DEBUG_CRASH(( "Team::loadPostProcess - Object '%s'(%d) should be in team list but is not\n",
+			DEBUG_CRASH(( "Team::loadPostProcess - Object '%s'(%d) should be in team list but is not",
 										obj->getTemplate()->getName().str(), obj->getID() ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
 	// since we prepended the object member pointers, reverse that list so it's just like before
 //	reverse_TeamMemberList();
@@ -2745,7 +2736,7 @@ void Team::loadPostProcess( void )
 	// we're done with the xfer list now
 	m_xferMemberIDList.clear();
 
-}  // end loadPostProcess
+}
 
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp
index 1a4a2141574..72ea6a28222 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp
@@ -26,7 +26,7 @@
 // The part of a Player's brain that holds the communal Passenger list of all tunnels.
 // Author: Graham Smallwood, March, 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/GlobalData.h"
@@ -54,6 +54,8 @@ TunnelTracker::TunnelTracker()
 	m_containListSize = 0;
 	m_curNemesisID = INVALID_ID;
 	m_nemesisTimestamp = 0;
+	m_framesForFullHeal = 0;
+	m_needsFullHealTimeUpdate = false;
 }
 
 // ------------------------------------------------------------------------
@@ -73,11 +75,11 @@ void TunnelTracker::iterateContained( ContainIterateFunc func, void *userData, B
 		{
 			// save the obj...
 			Object* obj = *it;
-			
+
 			// incr the iterator BEFORE calling the func (if the func removes the obj,
 			// the iterator becomes invalid)
 			++it;
-			
+
 			// call it
 			(*func)( obj, userData );
 		}
@@ -90,11 +92,11 @@ void TunnelTracker::iterateContained( ContainIterateFunc func, void *userData, B
 		{
 			// save the obj...
 			Object* obj = *it;
-			
+
 			// incr the iterator BEFORE calling the func (if the func removes the obj,
 			// the iterator becomes invalid)
 			++it;
-			
+
 			// call it
 			(*func)( obj, userData );
 		}
@@ -107,6 +109,13 @@ Int TunnelTracker::getContainMax() const
 	return TheGlobalData->m_maxTunnelCapacity;
 }
 
+// ------------------------------------------------------------------------
+void TunnelTracker::swapContainedItemsList(ContainedItemsList& newList)
+{
+	m_containList.swap(newList);
+	m_containListSize = (Int)m_containList.size();
+}
+
 // ------------------------------------------------------------------------
 void TunnelTracker::updateNemesis(const Object *target)
 {
@@ -128,7 +137,7 @@ Object *TunnelTracker::getCurNemesis(void)
 {
 	if (m_curNemesisID == INVALID_ID) {
 		return NULL;
-	}		
+	}
 	if (m_nemesisTimestamp + 4*LOGICFRAMES_PER_SECOND < TheGameLogic->getFrame()) {
 		m_curNemesisID = INVALID_ID;
 		return NULL;
@@ -136,7 +145,7 @@ Object *TunnelTracker::getCurNemesis(void)
 	Object *target = TheGameLogic->findObjectByID(m_curNemesisID);
 	if (target) {
 		//If the enemy unit is stealthed and not detected, then we can't attack it!
-	if( target->testStatus( OBJECT_STATUS_STEALTHED ) && 
+	if( target->testStatus( OBJECT_STATUS_STEALTHED ) &&
 			!target->testStatus( OBJECT_STATUS_DETECTED ) &&
 			!target->testStatus( OBJECT_STATUS_DISGUISED ) )
 		{
@@ -156,7 +165,7 @@ Object *TunnelTracker::getCurNemesis(void)
 Bool TunnelTracker::isValidContainerFor(const Object* obj, Bool checkCapacity) const
 {
 	//October 11, 2002 -- Kris : Dustin wants ALL units to be able to use tunnels!
-	// srj sez: um, except aircraft. 
+	// srj sez: um, except aircraft.
 	if (obj && !obj->isKindOf(KINDOF_AIRCRAFT))
 	{
 		if (checkCapacity)
@@ -190,7 +199,7 @@ void TunnelTracker::removeFromContain( Object *obj, Bool exposeStealthUnits )
 		// note that this invalidates the iterator!
 		m_containList.erase(it);
 		--m_containListSize;
-	}	
+	}
 
 }
 
@@ -205,6 +214,7 @@ void TunnelTracker::onTunnelCreated( const Object *newTunnel )
 {
 	m_tunnelCount++;
 	m_tunnelIDs.push_back( newTunnel->getID() );
+	m_needsFullHealTimeUpdate = true;
 }
 
 // ------------------------------------------------------------------------
@@ -212,6 +222,7 @@ void TunnelTracker::onTunnelDestroyed( const Object *deadTunnel )
 {
 	m_tunnelCount--;
 	m_tunnelIDs.remove( deadTunnel->getID() );
+	m_needsFullHealTimeUpdate = true;
 
 	if( m_tunnelCount == 0 )
 	{
@@ -223,7 +234,7 @@ void TunnelTracker::onTunnelDestroyed( const Object *deadTunnel )
 	else
 	{
 		Object *validTunnel = TheGameLogic->findObjectByID( m_tunnelIDs.front() );
-		// Otherwise, make sure nobody inside remembers the dead tunnel as the one they entered 
+		// Otherwise, make sure nobody inside remembers the dead tunnel as the one they entered
 		// (scripts need to use so there must be something valid here)
 		for(ContainedItemsList::iterator it = m_containList.begin(); it != m_containList.end(); )
 		{
@@ -246,18 +257,35 @@ void TunnelTracker::destroyObject( Object *obj, void * )
 
 // ------------------------------------------------------------------------
 	// heal all the objects within the tunnel system using the iterateContained function
+#if PRESERVE_RETAIL_BEHAVIOR || RETAIL_COMPATIBLE_CRC
 void TunnelTracker::healObjects(Real frames)
 {
 	iterateContained(healObject, &frames, FALSE);
 }
+#else
+void TunnelTracker::healObjects()
+{
+	if (m_needsFullHealTimeUpdate)
+	{
+		updateFullHealTime();
+		m_needsFullHealTimeUpdate = false;
+	}
+
+	iterateContained(healObject, &m_framesForFullHeal, FALSE);
+}
+#endif
 
 // ------------------------------------------------------------------------
 	// heal one object within the tunnel network system
 void TunnelTracker::healObject( Object *obj, void *frames)
 {
-	
+
 	//get the number of frames to heal
+#if PRESERVE_RETAIL_BEHAVIOR || RETAIL_COMPATIBLE_CRC
 	Real *framesForFullHeal = (Real*)frames;
+#else
+	UnsignedInt* framesForFullHeal = (UnsignedInt*)frames;
+#endif
 
 	// setup the healing damageInfo structure with all but the amount
 	DamageInfo healInfo;
@@ -271,14 +299,14 @@ void TunnelTracker::healObject( Object *obj, void *frames)
 	// if we've been in here long enough ... set our health to max
 	if( TheGameLogic->getFrame() - obj->getContainedByFrame() >= *framesForFullHeal )
 	{
-	
+
 		// set the amount to max just to be sure we're at the top
 		healInfo.in.m_amount = body->getMaxHealth();
-		
+
 		// set max health
 		body->attemptHealing( &healInfo );
 
-	}  // end if
+	}
 	else
 	{
 		//
@@ -291,7 +319,32 @@ void TunnelTracker::healObject( Object *obj, void *frames)
 		// do the healing
 		body->attemptHealing( &healInfo );
 
-	}  // end else
+	}
+}
+
+void TunnelTracker::updateFullHealTime()
+{
+	UnsignedInt minFrames = ~0u;
+
+	for (std::list<ObjectID>::const_iterator it = m_tunnelIDs.begin(); it != m_tunnelIDs.end(); ++it)
+	{
+		const Object* tunnelObj = TheGameLogic->findObjectByID(*it);
+		if (!tunnelObj)
+			continue;
+
+		const ContainModuleInterface* contain = tunnelObj->getContain();
+		DEBUG_ASSERTCRASH(contain != NULL, ("Contain module is NULL"));
+
+		if (!contain->isTunnelContain())
+			continue;
+
+		const TunnelContain* tunnelContain = static_cast<const TunnelContain*>(contain);
+		const UnsignedInt framesForFullHeal = tunnelContain->getFullTimeForHeal();
+		if (framesForFullHeal < minFrames)
+			minFrames = framesForFullHeal;
+	}
+
+	m_framesForFullHeal = minFrames;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -300,7 +353,7 @@ void TunnelTracker::healObject( Object *obj, void *frames)
 void TunnelTracker::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -333,9 +386,9 @@ void TunnelTracker::xfer( Xfer *xfer )
 			objectID = (*it)->getID();
 			xfer->xferObjectID( &objectID );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -345,14 +398,15 @@ void TunnelTracker::xfer( Xfer *xfer )
 			xfer->xferObjectID( &objectID );
 			m_xferContainList.push_back( objectID );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+		m_needsFullHealTimeUpdate = true;
+	}
 
 	// tunnel count
 	xfer->xferUnsignedInt( &m_tunnelCount );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -361,13 +415,13 @@ void TunnelTracker::loadPostProcess( void )
 {
 
 	// sanity, the contain list should be empty until we post process the id list
-	if( m_containList.size() != 0 )
+	if( !m_containList.empty() )
 	{
 
-		DEBUG_CRASH(( "TunnelTracker::loadPostProcess - m_containList should be empty but is not\n" ));
+		DEBUG_CRASH(( "TunnelTracker::loadPostProcess - m_containList should be empty but is not" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// translate each object ids on the xferContainList into real object pointers in the contain list
 	Object *obj;
@@ -379,10 +433,10 @@ void TunnelTracker::loadPostProcess( void )
 		if( obj == NULL )
 		{
 
-			DEBUG_CRASH(( "TunnelTracker::loadPostProcess - Unable to find object ID '%d'\n", *it ));
+			DEBUG_CRASH(( "TunnelTracker::loadPostProcess - Unable to find object ID '%d'", *it ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// push on the back of the contain list
 		m_containList.push_back( obj );
@@ -391,22 +445,22 @@ void TunnelTracker::loadPostProcess( void )
 		{
 			// remove object from its group (if any)
 			obj->leaveGroup();
-			
+
 			// remove rider from partition manager
 			ThePartitionManager->unRegisterObject( obj );
-			
+
 			// hide the drawable associated with rider
 			if( obj->getDrawable() )
 				obj->getDrawable()->setDrawableHidden( true );
-			
+
 			// remove object from pathfind map
 			if( TheAI )
 				TheAI->pathfinder()->removeObjectFromPathfindMap( obj );
-			
+
 		}
-	}  // end for, it
+	}
 
 	// we're done with the xfer contain list now
 	m_xferContainList.clear();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RandomValue.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RandomValue.cpp
deleted file mode 100644
index 5fa23da03b4..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/RandomValue.cpp
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// RandomValue.cpp
-// Pseudo-random number generators 
-// Author: Michael S. Booth, January 1998
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-
-#include "Lib/BaseType.h"
-#include "Common/RandomValue.h"
-#include "Common/crc.h"
-#include "Common/Debug.h"
-#include "GameLogic/GameLogic.h"
-
-//#define DETERMINISTIC				// to allow repetition for debugging
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#undef DEBUG_RANDOM_CLIENT
-#undef DEBUG_RANDOM_LOGIC
-#undef DEBUG_RANDOM_AUDIO
-
-//#define DEBUG_RANDOM_CLIENT
-//#define DEBUG_RANDOM_LOGIC
-//#define DEBUG_RANDOM_AUDIO
-
-static const Real theMultFactor = 1.0f / (powf(2, 8 * sizeof(UnsignedInt)) - 1.0f);
-
-// Initial seed values.
-static UnsignedInt theGameClientSeed[6] =
-{
-    0xf22d0e56L, 0x883126e9L, 0xc624dd2fL, 0x702c49cL, 0x9e353f7dL, 0x6fdf3b64L
-};
-
-static UnsignedInt theGameAudioSeed[6] =
-{
-    0xf22d0e56L, 0x883126e9L, 0xc624dd2fL, 0x702c49cL, 0x9e353f7dL, 0x6fdf3b64L
-};
-
-static UnsignedInt theGameLogicBaseSeed = 0;
-static UnsignedInt theGameLogicSeed[6] =
-{
-    0xf22d0e56L, 0x883126e9L, 0xc624dd2fL, 0x702c49cL, 0x9e353f7dL, 0x6fdf3b64L
-};
-
-// Add with carry. SUM is replaced with A + B + C, C is replaced with 1  if there was a carry, 0 if there wasn't. A carry occurred if the sum is  less than one of the inputs. This is addition, so carry can never be  more than one.
-#define ADC(SUM, A, B, C)   SUM = (A) + (B) + (C); C = ((SUM < (A)) || (SUM < (B)))
-
-static UnsignedInt randomValue(UnsignedInt *seed)
-{
-	UnsignedInt ax;
-	UnsignedInt c = 0;
-	
-	
-	ADC(ax, seed[5], seed[4], c);   /*  mov     ax,seed+20  */
-	/*  add     ax,seed+16  */
-	seed[4] = ax;                   /*  mov     seed+8,ax   */
-	
-	ADC(ax, ax, seed[3], c);        /*  adc     ax,seed+12  */
-	seed[3] = ax;                   /*  mov     seed+12,ax  */
-	
-	ADC(ax, ax, seed[2], c);        /*  adc     ax,seed+8   */
-	seed[2] = ax;                   /*  mov     seed+8,ax   */
-	
-	ADC(ax, ax, seed[1], c);        /*  adc     ax,seed+4   */
-	seed[1] = ax;                   /*  mov     seed+4,ax   */
-	
-	ADC(ax, ax, seed[0], c);        /*  adc     ax,seed+0   */
-	seed[0] = ax;                   /*  mov     seed+0,ax   */
-	
-	/* Increment seed array, bubbling up the carries. */
-	if (!++seed[5])
-	{
-		if (!++seed[4])
-		{
-			if (!++seed[3])
-			{
-				if (!++seed[2])
-				{
-					if (!++seed[1])
-					{
-						++seed[0];
-						++ax;
-					}
-				}
-			}
-		}
-	}
-	return(ax);
-}
-
-static void seedRandom(UnsignedInt SEED, UnsignedInt *seed)
-{
-	UnsignedInt ax;
-
-	ax = SEED;                      /* mov     eax,SEED                     */
-	ax += 0xf22d0e56;               /* add     eax,0f22d0e56h               */
-	seed[0] = ax;                   /* mov     seed,eax                     */
-	ax += 0x883126e9 - 0xf22d0e56;  /* add     eax,0883126e9h-0f22d0e56h    */
-	seed[1] = ax;                   /* mov     seed+4,eax                   */
-	ax += 0xc624dd2f - 0x883126e9;  /* add     eax,0c624dd2fh-0883126e9h    */
-	seed[2] = ax;                   /* mov     seed+8,eax                   */
-	ax += 0x0702c49c - 0xc624dd2f;  /* add     eax,00702c49ch-0c624dd2fh    */
-	seed[3] = ax;                   /* mov     seed+12,eax                  */
-	ax += 0x9e353f7d - 0x0702c49c;  /* add     eax,09e353f7dh-00702c49ch    */
-	seed[4] = ax;                   /* mov     seed+16,eax                  */
-	ax += 0x6fdf3b64 - 0x9e353f7d;  /* add     eax,06fdf3b64h-09e353f7dh    */
-	seed[5] = ax;                   /* mov     seed+20,eax                  */
-}
-
-//
-// It is necessary to separate the GameClient and GameLogic usage of random
-// values to ensure that the GameLogic remains deterministic, regardless
-// of the effects displayed on the GameClient.
-//
-
-UnsignedInt GetGameLogicRandomSeed( void )
-{
-	return theGameLogicBaseSeed;
-}
-
-UnsignedInt GetGameLogicRandomSeedCRC( void )
-{
-	CRC c;
-	c.computeCRC(theGameLogicSeed, 6*sizeof(UnsignedInt));
-	return c.get();
-}
-
-void InitRandom( void )
-{
-#ifdef DETERMINISTIC
-	// needs to be the same every time
-	seedRandom(0, theGameClientSeed);
-	seedRandom(0, theGameAudioSeed);
-	seedRandom(0, theGameLogicSeed);
-	theGameLogicBaseSeed = 0;
-#else
-	time_t seconds = time( NULL );
-
-	seedRandom(seconds, theGameAudioSeed);
-	seedRandom(seconds, theGameClientSeed);
-	seedRandom(seconds, theGameLogicSeed);
-	theGameLogicBaseSeed = seconds;
-#endif
-}
-
-void InitRandom( UnsignedInt seed )
-{
-	seedRandom(seed, theGameAudioSeed);
-	seedRandom(seed, theGameClientSeed);
-	seedRandom(seed, theGameLogicSeed);
-	theGameLogicBaseSeed = seed;
-#ifdef DEBUG_RANDOM_LOGIC
-DEBUG_LOG(( "InitRandom %08lx\n",seed));
-#endif
-}
-
-void InitGameLogicRandom( UnsignedInt seed )
-{
-#ifdef DETERMINISTIC
-	// needs to be the same every time
-	seedRandom(0, theGameLogicSeed);
-	theGameLogicBaseSeed = 0;
-#else
-	seedRandom(seed, theGameLogicSeed);
-	theGameLogicBaseSeed = seed;
-#endif
-#ifdef DEBUG_RANDOM_LOGIC
-DEBUG_LOG(( "InitRandom Logic %08lx\n",seed));
-#endif
-}
-
-//
-// Integer random value
-//
-Int GetGameLogicRandomValue( int lo, int hi, const char *file, int line )
-{
-	//Int delta = hi - lo + 1;
-	//Int rval;
-
-	//if (delta == 0)
-		//return hi;
-
-	//rval = ((Int)(randomValue(theGameLogicSeed) % delta)) + lo;
-
-	UnsignedInt delta = hi - lo + 1;
-	//UnsignedInt temp;
-	Int rval;
-
-	if (delta == 0)
-		return hi;
-
-	rval = ((Int)(randomValue(theGameLogicSeed) % delta)) + lo;
-	//temp = randomValue(theGameLogicSeed);
-	//temp = temp % delta;
-
-	//rval = temp + lo;
-
-/**/
-#ifdef DEBUG_RANDOM_LOGIC
-DEBUG_LOG(( "%d: GetGameLogicRandomValue = %d (%d - %d), %s line %d\n",
-				 TheGameLogic->getFrame(), rval, lo, hi, file, line ));
-#endif
-/**/
-
-	return rval;
-}
-
-//
-// Integer random value
-//
-Int GetGameClientRandomValue( int lo, int hi, const char *file, int line )
-{
-	UnsignedInt delta = hi - lo + 1;
-	Int rval;
-
-	if (delta == 0)
-		return hi;
-
-	rval = ((Int)(randomValue(theGameClientSeed) % delta)) + lo;
-
-/**/
-#ifdef DEBUG_RANDOM_CLIENT
-DEBUG_LOG(( "%d: GetGameClientRandomValue = %d (%d - %d), %s line %d\n",
-				TheGameLogic ? TheGameLogic->getFrame() : -1, rval, lo, hi, file, line ));
-#endif
-/**/
-
-	return rval;
-}
-
-//
-// Integer random value
-//
-Int GetGameAudioRandomValue( int lo, int hi, const char *file, int line )
-{
-	UnsignedInt delta = hi - lo + 1;
-	Int rval;
-
-	if (delta == 0)
-		return hi;
-
-	rval = ((Int)(randomValue(theGameAudioSeed) % delta)) + lo;
-
-/**/
-#ifdef DEBUG_RANDOM_AUDIO
-DEBUG_LOG(( "%d: GetGameAudioRandomValue = %d (%d - %d), %s line %d\n",
-				TheGameLogic->getFrame(), rval, lo, hi, file, line ));
-#endif
-/**/
-
-	return rval;
-}
-
-//
-// Real valued random value
-//
-Real GetGameLogicRandomValueReal( Real lo, Real hi, const char *file, int line )
-{
-	Real delta = hi - lo;
-	Real rval;
-
-	if (delta <= 0.0f)
-		return hi;
-
-	rval = ((Real)(randomValue(theGameLogicSeed)) * theMultFactor ) * delta + lo;
-
-	DEBUG_ASSERTCRASH( rval >= lo && rval <= hi, ("Bad random val"));
-/**/
-#ifdef DEBUG_RANDOM_LOGIC
-DEBUG_LOG(( "%d: GetGameLogicRandomValueReal = %f, %s line %d\n",
-					TheGameLogic->getFrame(), rval, file, line ));
-#endif
-/**/
-
-	return rval;
-}
-
-//
-// Real valued random value
-//
-Real GetGameClientRandomValueReal( Real lo, Real hi, const char *file, int line )
-{
-	Real delta = hi - lo;
-	Real rval;
-
-	if (delta <= 0.0f)
-		return hi;
-
-	rval = ((Real)(randomValue(theGameClientSeed)) * theMultFactor ) * delta + lo;
-
-	DEBUG_ASSERTCRASH( rval >= lo && rval <= hi, ("Bad random val"));
-/**/
-#ifdef DEBUG_RANDOM_CLIENT
-DEBUG_LOG(( "%d: GetGameClientRandomValueReal = %f, %s line %d\n",
-					TheGameLogic->getFrame(), rval, file, line ));
-#endif
-/**/
-
-	return rval;
-}
-
-//
-// Real valued random value
-//
-Real GetGameAudioRandomValueReal( Real lo, Real hi, const char *file, int line )
-{
-	Real delta = hi - lo;
-	Real rval;
-
-	if (delta <= 0.0f)
-		return hi;
-
-	rval = ((Real)(randomValue(theGameAudioSeed)) * theMultFactor ) * delta + lo;
-
-	DEBUG_ASSERTCRASH( rval >= lo && rval <= hi, ("Bad random val"));
-/**/
-#ifdef DEBUG_RANDOM_AUDIO
-DEBUG_LOG(( "%d: GetGameAudioRandomValueReal = %f, %s line %d\n",
-					TheGameLogic->getFrame(), rval, file, line ));
-#endif
-/**/
-
-	return rval;
-}
-
-//--------------------------------------------------------------------------------------------------------------
-// GameClientRandomVariable
-//
-
-/*static*/ const char *GameClientRandomVariable::DistributionTypeNames[] = 
-{
-	"CONSTANT", "UNIFORM", "GAUSSIAN", "TRIANGULAR", "LOW_BIAS", "HIGH_BIAS"
-};
-
-/**
-	define the range of random values, and the distribution of values
-*/
-void GameClientRandomVariable::setRange( Real low, Real high, DistributionType type )
-{
-	DEBUG_ASSERTCRASH(!(m_type == CONSTANT && m_low != m_high), ("CONSTANT GameClientRandomVariables should have low == high"));
-	m_low = low;
-	m_high = high;
-	m_type = type;
-}
-
-/**
- * Return a value from the random distribution
- */
-Real GameClientRandomVariable::getValue( void ) const
-{
-	switch( m_type )
-	{
-		case CONSTANT:
-			DEBUG_ASSERTLOG(m_low == m_high, ("m_low != m_high for a CONSTANT GameClientRandomVariable\n"));
-			if (m_low == m_high) {
-				return m_low;
-			} // else return as though a UNIFORM.
-
-		case UNIFORM:
-			return GameClientRandomValueReal( m_low, m_high );
-
-		default:
-			/// @todo fill in support for nonuniform GameClientRandomVariables.
-			DEBUG_CRASH(("unsupported DistributionType in GameClientRandomVariable::getValue\n"));
-			return 0.0f;
-	}
-}
-
-
-//--------------------------------------------------------------------------------------------------------------
-// GameLogicRandomVariable
-//
-
-/*static*/ const char *GameLogicRandomVariable::DistributionTypeNames[] = 
-{
-	"CONSTANT", "UNIFORM", "GAUSSIAN", "TRIANGULAR", "LOW_BIAS", "HIGH_BIAS"
-};
-
-/**
-	define the range of random values, and the distribution of values
-*/
-void GameLogicRandomVariable::setRange( Real low, Real high, DistributionType type )
-{
-	DEBUG_ASSERTCRASH(!(m_type == CONSTANT && m_low != m_high), ("CONSTANT GameLogicRandomVariables should have low == high"));
-	m_low = low;
-	m_high = high;
-	m_type = type;
-}
-
-/**
- * Return a value from the random distribution
- */
-Real GameLogicRandomVariable::getValue( void ) const
-{
-	switch( m_type )
-	{
-		case CONSTANT:
-			DEBUG_ASSERTLOG(m_low == m_high, ("m_low != m_high for a CONSTANT GameLogicRandomVariable"));
-			if (m_low == m_high) {
-				return m_low;
-			} // else return as though a UNIFORM.
-
-		case UNIFORM:
-			return GameLogicRandomValueReal( m_low, m_high );
-
-		default:
-			/// @todo fill in support for nonuniform GameLogicRandomVariables.
-			DEBUG_CRASH(("unsupported DistributionType in GameLogicRandomVariable::getValue\n"));
-			return 0.0f;
-	}
-}
-
-
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp
index 5014fc8a121..e5bc9ebbfa7 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp
@@ -22,9 +22,10 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Recorder.h"
+#include "Common/file.h"
 #include "Common/FileSystem.h"
 #include "Common/PlayerList.h"
 #include "Common/Player.h"
@@ -44,13 +45,11 @@
 #include "GameLogic/GameLogic.h"
 #include "Common/RandomValue.h"
 #include "Common/CRCDebug.h"
+#include "Common/UserPreferences.h"
 #include "Common/version.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+constexpr const char s_genrep[] = "GENREP";
+constexpr const UnsignedInt replayBufferBytes = 8192;
 
 Int REPLAY_CRC_INTERVAL = 100;
 
@@ -67,8 +66,8 @@ typedef int32_t replay_time_t;
 static time_t startTime;
 static const UnsignedInt startTimeOffset = 6;
 static const UnsignedInt endTimeOffset = startTimeOffset + sizeof(replay_time_t);
-static const UnsignedInt framesOffset = endTimeOffset + sizeof(replay_time_t);
-static const UnsignedInt desyncOffset = framesOffset + sizeof(UnsignedInt);
+static const UnsignedInt frameCountOffset = endTimeOffset + sizeof(replay_time_t);
+static const UnsignedInt desyncOffset = frameCountOffset + sizeof(UnsignedInt);
 static const UnsignedInt quitEarlyOffset = desyncOffset + sizeof(Bool);
 static const UnsignedInt disconOffset = quitEarlyOffset + sizeof(Bool);
 
@@ -78,22 +77,22 @@ void RecorderClass::logGameStart(AsciiString options)
 		return;
 
 	time(&startTime);
-	UnsignedInt fileSize = ftell(m_file);
+	UnsignedInt fileSize = m_file->size();
 	// move to appropriate offset
-	if (!fseek(m_file, startTimeOffset, SEEK_SET))
+	if ( m_file->seek(startTimeOffset, File::seekMode::START) == startTimeOffset )
 	{
 		// save off start time
 		replay_time_t tmp = (replay_time_t)startTime;
-		fwrite(&tmp, sizeof(replay_time_t), 1, m_file);
+		m_file->write(&tmp, sizeof(tmp));
 	}
 	// move back to end of stream
 #ifdef DEBUG_CRASHING
 	Int res =
 #endif
-		fseek(m_file, fileSize, SEEK_SET);
-	DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!"));
+	m_file->seek(fileSize, File::seekMode::START);
+	DEBUG_ASSERTCRASH(res == fileSize, ("Could not seek to end of file!"));
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheNetwork && TheGlobalData->m_saveStats)
 	{
 		//if (TheLAN)
@@ -139,22 +138,23 @@ void RecorderClass::logPlayerDisconnect(UnicodeString player, Int slot)
 	{
 		return;
 	}
-	UnsignedInt fileSize = ftell(m_file);
+	UnsignedInt fileSize = m_file->size();
 	// move to appropriate offset
-	if (!fseek(m_file, disconOffset + slot*sizeof(Bool), SEEK_SET))
+	Int playerSlotDisconOffset = disconOffset + slot * sizeof(Bool);
+	if ( m_file->seek(playerSlotDisconOffset, File::seekMode::START) == playerSlotDisconOffset )
 	{
 		// save off discon status
-		Bool b = TRUE;
-		fwrite(&b, sizeof(Bool), 1, m_file);
+		Bool flag = TRUE;
+		m_file->write(&flag, sizeof(flag));
 	}
 	// move back to end of stream
 #ifdef DEBUG_CRASHING
 	Int res =
 #endif
-		fseek(m_file, fileSize, SEEK_SET);
-	DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!"));
+	m_file->seek(fileSize, File::seekMode::START);
+	DEBUG_ASSERTCRASH(res == fileSize, ("Could not seek to end of file!"));
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_saveStats)
 	{
 		unsigned long bufSize = MAX_COMPUTERNAME_LENGTH + 1;
@@ -184,22 +184,22 @@ void RecorderClass::logCRCMismatch( void )
 	if (!m_file)
 		return;
 
-	UnsignedInt fileSize = ftell(m_file);
+	UnsignedInt fileSize = m_file->size();
 	// move to appropriate offset
-	if (!fseek(m_file, desyncOffset, SEEK_SET))
+	if ( m_file->seek(desyncOffset, File::seekMode::START) == desyncOffset )
 	{
 		// save off desync status
-		Bool b = TRUE;
-		fwrite(&b, sizeof(Bool), 1, m_file);
+		Bool flag = TRUE;
+		m_file->write(&flag, sizeof(flag));
 	}
 	// move back to end of stream
 #ifdef DEBUG_CRASHING
 	Int res =
 #endif
-		fseek(m_file, fileSize, SEEK_SET);
-	DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!"));
+	m_file->seek(fileSize, File::seekMode::START);
+	DEBUG_ASSERTCRASH(res == fileSize, ("Could not seek to end of file!"));
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_saveStats)
 	{
 		m_wasDesync = TRUE;
@@ -232,29 +232,29 @@ void RecorderClass::logGameEnd( void )
 
 	time_t t;
 	time(&t);
-	UnsignedInt duration = TheGameLogic->getFrame();
-	UnsignedInt fileSize = ftell(m_file);
+	UnsignedInt frameCount = TheGameLogic->getFrame();
+	UnsignedInt fileSize = m_file->size();
 	// move to appropriate offset
-	if (!fseek(m_file, endTimeOffset, SEEK_SET))
+	if ( m_file->seek(endTimeOffset, File::seekMode::START) == endTimeOffset )
 	{
 		// save off end time
 		replay_time_t tmp = (replay_time_t)t;
-		fwrite(&tmp, sizeof(replay_time_t), 1, m_file);
+		m_file->write(&tmp, sizeof(tmp));
 	}
 	// move to appropriate offset
-	if (!fseek(m_file, framesOffset, SEEK_SET))
+	if ( m_file->seek(frameCountOffset, File::seekMode::START) == frameCountOffset )
 	{
-		// save off duration
-		fwrite(&duration, sizeof(UnsignedInt), 1, m_file);
+		// save off frameCount
+		m_file->write(&frameCount, sizeof(frameCount));
 	}
 	// move back to end of stream
 #ifdef DEBUG_CRASHING
 	Int res =
 #endif
-		fseek(m_file, fileSize, SEEK_SET);
-	DEBUG_ASSERTCRASH(res == 0, ("Could not seek to end of file!"));
+	m_file->seek(fileSize, File::seekMode::START);
+	DEBUG_ASSERTCRASH(res == fileSize, ("Could not seek to end of file!"));
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheNetwork && TheGlobalData->m_saveStats)
 	{
 		//if (TheLAN)
@@ -272,7 +272,7 @@ void RecorderClass::logGameEnd( void )
 			if (logFP)
 			{
 				struct tm *t2 = localtime(&t);
-				duration = t - startTime;
+				time_t duration = t - startTime;
 				Int minutes = duration/60;
 				Int seconds = duration%60;
 				fprintf(logFP, "Game end at   %s(%d:%2.2d elapsed time)\n", asctime(t2), minutes, seconds);
@@ -285,13 +285,13 @@ void RecorderClass::logGameEnd( void )
 
 void RecorderClass::cleanUpReplayFile( void )
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_saveStats)
 	{
 		char fname[_MAX_PATH+1];
-		strncpy(fname, TheGlobalData->m_baseStatsDir.str(), _MAX_PATH);
-		strncat(fname, m_fileName.str(), _MAX_PATH - strlen(fname));
-		DEBUG_LOG(("Saving replay to %s\n", fname));
+		strlcpy(fname, TheGlobalData->m_baseStatsDir.str(), ARRAY_SIZE(fname));
+		strlcat(fname, m_fileName.str(), ARRAY_SIZE(fname));
+		DEBUG_LOG(("Saving replay to %s", fname));
 		AsciiString oldFname;
 		oldFname.format("%s%s", getReplayDir().str(), m_fileName.str());
 		CopyFile(oldFname.str(), fname, TRUE);
@@ -302,9 +302,7 @@ void RecorderClass::cleanUpReplayFile( void )
 			return;
 
 		AsciiString debugFname = fname;
-		debugFname.removeLastChar();
-		debugFname.removeLastChar();
-		debugFname.removeLastChar();
+		debugFname.truncateBy(3);
 		debugFname.concat("txt");
 		UnsignedInt fileSize = 0;
 		FILE *fp = fopen(logFileName, "rb");
@@ -314,18 +312,18 @@ void RecorderClass::cleanUpReplayFile( void )
 			fileSize = ftell(fp);
 			fclose(fp);
 			fp = NULL;
-			DEBUG_LOG(("Log file size was %d\n", fileSize));
+			DEBUG_LOG(("Log file size was %d", fileSize));
 		}
 
 		const int MAX_DEBUG_SIZE = 65536;
 		if (fileSize <= MAX_DEBUG_SIZE || TheGlobalData->m_saveAllStats)
 		{
-			DEBUG_LOG(("Using CopyFile to copy %s\n", logFileName));
+			DEBUG_LOG(("Using CopyFile to copy %s", logFileName));
 			CopyFile(logFileName, debugFname.str(), TRUE);
 		}
 		else
 		{
-			DEBUG_LOG(("manual copy of %s\n", logFileName));
+			DEBUG_LOG(("manual copy of %s", logFileName));
 			FILE *ifp = fopen(logFileName, "rb");
 			FILE *ofp = fopen(debugFname.str(), "wb");
 			if (ifp && ofp)
@@ -363,20 +361,17 @@ RecorderClass *TheRecorder = NULL;
 /**
  * Constructor
  */
-RecorderClass::RecorderClass() 
+RecorderClass::RecorderClass()
 {
 	m_originalGameMode = GAME_NONE;
 	m_mode = RECORDERMODETYPE_RECORD;
 	m_file = NULL;
 	m_fileName.clear();
 	m_currentFilePosition = 0;
-	//Added By Sadullah Nader
-	//Initializtion(s) inserted
 	m_doingAnalysis = FALSE;
+	m_archiveReplays = FALSE;
 	m_nextFrame = 0;
 	m_wasDesync = FALSE;
-	//
-
 	init(); // just for the heck of it.
 }
 
@@ -408,6 +403,10 @@ void RecorderClass::init() {
 	m_gameInfo.setSeed(GetGameLogicRandomSeed());
 	m_wasDesync = FALSE;
 	m_doingAnalysis = FALSE;
+	m_playbackFrameCount = 0;
+
+	OptionPreferences optionPref;
+	m_archiveReplays = optionPref.getArchiveReplaysEnabled();
 }
 
 /**
@@ -415,7 +414,7 @@ void RecorderClass::init() {
  */
 void RecorderClass::reset() {
 	if (m_file != NULL) {
-		fclose(m_file);
+		m_file->close();
 		m_file = NULL;
 	}
 	m_fileName.clear();
@@ -430,7 +429,7 @@ void RecorderClass::reset() {
 void RecorderClass::update() {
 	if (m_mode == RECORDERMODETYPE_RECORD || m_mode == RECORDERMODETYPE_NONE) {
 		updateRecord();
-	} else if (m_mode == RECORDERMODETYPE_PLAYBACK) {
+	} else if (isPlaybackMode()) {
 		updatePlayback();
 	}
 }
@@ -472,34 +471,34 @@ void RecorderClass::updatePlayback() {
  */
 void RecorderClass::stopPlayback() {
 	if (m_file != NULL) {
-		fclose(m_file);
+		m_file->close();
 		m_file = NULL;
 	}
 	m_fileName.clear();
-	// Don't clear the game data if the replay is over - let things continue
-//#ifdef DEBUG_CRC
+
 	if (!m_doingAnalysis)
-		TheMessageStream->appendMessage(GameMessage::MSG_CLEAR_GAME_DATA);
-//#endif
+	{
+		TheGameLogic->exitGame();
+	}
 }
 
 /**
  * Update function for recording a game. Basically all the pertinant logic commands for this frame are written out
  * to a file.
  */
-void RecorderClass::updateRecord() 
+void RecorderClass::updateRecord()
 {
 	Bool needFlush = FALSE;
 	static Int lastFrame = -1;
 	GameMessage *msg = TheCommandList->getFirstMessage();
 	while (msg != NULL) {
 		if (msg->getType() == GameMessage::MSG_NEW_GAME &&
-			 msg->getArgument(0)->integer != GAME_SHELL && 
+			 msg->getArgument(0)->integer != GAME_SHELL &&
 			 msg->getArgument(0)->integer != GAME_SINGLE_PLAYER && // Due to the massive amount of scripts that use <local player> in GC and single player, replays have been cut for them.
-			 msg->getArgument(0)->integer != GAME_NONE) 
+			 msg->getArgument(0)->integer != GAME_NONE)
 		{
 			m_originalGameMode = msg->getArgument(0)->integer;
-			DEBUG_LOG(("RecorderClass::updateRecord() - original game is mode %d\n", m_originalGameMode));
+			DEBUG_LOG(("RecorderClass::updateRecord() - original game is mode %d", m_originalGameMode));
 			lastFrame = 0;
 			GameDifficulty diff = DIFFICULTY_NORMAL;
 			if (msg->getArgumentCount() >= 2)
@@ -517,6 +516,7 @@ void RecorderClass::updateRecord()
 				lastFrame = -1;
 				writeToFile(msg);
 				stopRecording();
+				needFlush = FALSE;
 			}
 			m_fileName.clear();
 		} else {
@@ -533,7 +533,8 @@ void RecorderClass::updateRecord()
 	}
 
 	if (needFlush) {
-		fflush(m_file);
+		DEBUG_ASSERTCRASH(m_file != NULL, ("RecorderClass::updateRecord() - unexpected call to fflush(m_file)"));
+		m_file->flush();
 	}
 }
 
@@ -550,61 +551,62 @@ void RecorderClass::startRecording(GameDifficulty diff, Int originalGameMode, In
 
 	AsciiString filepath = getReplayDir();
 
-	// We have to make sure the replay dir exists. 
+	// We have to make sure the replay dir exists.
 	TheFileSystem->createDirectory(filepath);
 
 	m_fileName = getLastReplayFileName();
 	m_fileName.concat(getReplayExtention());
 	filepath.concat(m_fileName);
-	m_file = fopen(filepath.str(), "wb");
+	m_file = TheFileSystem->openFile(filepath.str(), File::WRITE | File::BINARY);
 	if (m_file == NULL) {
 		DEBUG_ASSERTCRASH(m_file != NULL, ("Failed to create replay file"));
 		return;
 	}
-	fprintf(m_file, "GENREP");
+	// TheSuperHackers @info the null terminator needs to be ignored to maintain retail replay file layout
+	m_file->writeFormat("%s", s_genrep);
 
 	//
 	// save space for stats to be filled in.
 	//
 	// **** if this changes, change the LAN code above ****
 	//
-	replay_time_t t = 0;
-	fwrite(&t, sizeof(replay_time_t), 1, m_file);	// reserve space for start time
-	fwrite(&t, sizeof(replay_time_t), 1, m_file);	// reserve space for end time
+	replay_time_t time = 0;
+	m_file->write(&time, sizeof(time));	// reserve space for start time
+	m_file->write(&time, sizeof(time));	// reserve space for end time
 
 	UnsignedInt frames = 0;
-	fwrite(&frames, sizeof(UnsignedInt), 1, m_file);	// reserve space for duration in frames
+	m_file->write(&frames, sizeof(frames));	// reserve space for duration in frames
 
-	Bool b = FALSE;
-	fwrite(&b, sizeof(Bool), 1, m_file);	// reserve space for flag (true if we desync)
-	fwrite(&b, sizeof(Bool), 1, m_file);	// reserve space for flag (true if we quit early)
+	Bool flag = FALSE;
+	m_file->write(&flag, sizeof(flag));	// reserve space for flag (true if we desync)
+	m_file->write(&flag, sizeof(flag));	// reserve space for flag (true if we quit early)
 	for (Int i=0; i<MAX_SLOTS; ++i)
 	{
-		fwrite(&b, sizeof(Bool), 1, m_file);	// reserve space for flag (true if player i disconnects)
+		m_file->write(&flag, sizeof(flag));	// reserve space for flag (true if player i disconnects)
 	}
 
 	// Print out the name of the replay.
 	UnicodeString replayName;
 	replayName = TheGameText->fetch("GUI:LastReplay");
-	fwprintf(m_file, L"%ws", replayName.str());
-	fputwc(0, m_file);
+	m_file->writeFormat(L"%s", replayName.str());
+	m_file->writeChar(L"\0");
 
 	// Date and Time
 	SYSTEMTIME systemTime;
 	GetLocalTime( &systemTime );
-	fwrite(&systemTime, sizeof(SYSTEMTIME), 1, m_file);
+	m_file->write(&systemTime, sizeof(systemTime));
 
 	// write out version info
 	UnicodeString versionString = TheVersion->getUnicodeVersion();
 	UnicodeString versionTimeString = TheVersion->getUnicodeBuildTime();
 	UnsignedInt versionNumber = TheVersion->getVersionNumber();
-	fwprintf(m_file, L"%ws", versionString.str());
-	fputwc(0, m_file);
-	fwprintf(m_file, L"%ws", versionTimeString.str());
-	fputwc(0, m_file);
-	fwrite(&versionNumber, sizeof(UnsignedInt), 1, m_file);
-	fwrite(&(TheGlobalData->m_exeCRC), sizeof(UnsignedInt), 1, m_file);
-	fwrite(&(TheGlobalData->m_iniCRC), sizeof(UnsignedInt), 1, m_file);
+	m_file->writeFormat(L"%s", versionString.str());
+	m_file->writeChar(L"\0");
+	m_file->writeFormat(L"%s", versionTimeString.str());
+	m_file->writeChar(L"\0");
+	m_file->write(&versionNumber, sizeof(versionNumber));
+	m_file->write(&(TheGlobalData->m_exeCRC), sizeof(TheGlobalData->m_exeCRC));
+	m_file->write(&(TheGlobalData->m_iniCRC), sizeof(TheGlobalData->m_iniCRC));
 
 	// Number of players
 	/*
@@ -644,7 +646,7 @@ void RecorderClass::startRecording(GameDifficulty diff, Int originalGameMode, In
     {
 			TheSkirmishGameInfo->setCRCInterval(REPLAY_CRC_INTERVAL);
       theSlotList = GameInfoToAsciiString(TheSkirmishGameInfo);
-      DEBUG_LOG(("GameInfo String: %s\n",theSlotList.str()));
+      DEBUG_LOG(("GameInfo String: %s",theSlotList.str()));
 			localIndex = 0;
     }
     else
@@ -655,12 +657,14 @@ void RecorderClass::startRecording(GameDifficulty diff, Int originalGameMode, In
     }
 	}
 	logGameStart(theSlotList);
-	DEBUG_LOG(("RecorderClass::startRecording - theSlotList = %s\n", theSlotList.str()));
+	DEBUG_LOG(("RecorderClass::startRecording - theSlotList = %s", theSlotList.str()));
 
 	// write slot list (starting spots, color, alliances, etc
-	fwrite(theSlotList.str(), theSlotList.getLength() + 1, 1, m_file);
-	fprintf(m_file, "%d", localIndex);
-	fputc(0, m_file);
+	m_file->writeFormat("%s", theSlotList.str());
+	m_file->writeChar("\0");
+
+	m_file->writeFormat("%d", localIndex);
+	m_file->writeChar("\0");
 
 	/*
 	/// @todo fix this to use starting spots and player alliances when those are put in the game.
@@ -685,18 +689,18 @@ void RecorderClass::startRecording(GameDifficulty diff, Int originalGameMode, In
 	*/
 
 	// Write the game difficulty.
-	fwrite(&diff, sizeof(Int), 1, m_file);
+	m_file->write(&diff, sizeof(diff));
 
 	// Write original game mode
-	fwrite(&originalGameMode, sizeof(originalGameMode), 1, m_file);
+	m_file->write(&originalGameMode, sizeof(originalGameMode));
 
 	// Write rank points to add at game start
-	fwrite(&rankPoints, sizeof(rankPoints), 1, m_file);
+	m_file->write(&rankPoints, sizeof(rankPoints));
 
 	// Write maxFPS chosen
-	fwrite(&maxFPS, sizeof(maxFPS), 1, m_file);
+	m_file->write(&maxFPS, sizeof(maxFPS));
 
-	DEBUG_LOG(("RecorderClass::startRecording() - diff=%d, mode=%d, FPS=%d\n", diff, originalGameMode, maxFPS));
+	DEBUG_LOG(("RecorderClass::startRecording() - diff=%d, mode=%d, FPS=%d", diff, originalGameMode, maxFPS));
 
 	/*
 	// Write the map name.
@@ -723,30 +727,62 @@ void RecorderClass::stopRecording() {
 		}
 	}
 	if (m_file != NULL) {
-		fclose(m_file);
+		m_file->close();
 		m_file = NULL;
+
+		if (m_archiveReplays)
+			archiveReplay(m_fileName);
 	}
 	m_fileName.clear();
 }
 
+/**
+ * TheSuperHackers @feature Stubbjax 17/10/2025 Copy the replay file to the archive directory and rename it using the current timestamp.
+ */
+void RecorderClass::archiveReplay(AsciiString fileName)
+{
+	SYSTEMTIME st;
+	GetLocalTime(&st);
+
+	AsciiString archiveFileName;
+	// Use a standard YYYYMMDD_HHMMSS format for simplicity and to avoid conflicts.
+	archiveFileName.format("%04d%02d%02d_%02d%02d%02d", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond);
+
+	AsciiString extension = getReplayExtention();
+	AsciiString sourcePath = getReplayDir();
+	sourcePath.concat(fileName);
+
+	if (!sourcePath.endsWith(extension))
+		sourcePath.concat(extension);
+
+	AsciiString destPath = getReplayArchiveDir();
+	TheFileSystem->createDirectory(destPath.str());
+
+	destPath.concat(archiveFileName);
+	destPath.concat(extension);
+
+	if (!CopyFile(sourcePath.str(), destPath.str(), FALSE))
+		DEBUG_LOG(("RecorderClass::archiveReplay: Failed to copy %s to %s", sourcePath.str(), destPath.str()));
+}
+
 /**
  * Write this game message to the record file. This also writes the game message's execution frame.
  */
 void RecorderClass::writeToFile(GameMessage * msg) {
 	// Write the frame number for this command.
 	UnsignedInt frame = TheGameLogic->getFrame();
-	fwrite(&frame, sizeof(frame), 1, m_file);
+	m_file->write(&frame, sizeof(frame));
 
 	// Write the command type
 	GameMessage::Type type = msg->getType();
-	fwrite(&type, sizeof(type), 1, m_file);
+	m_file->write(&type, sizeof(type));
 
 	// Write the player index
 	Int playerIndex = msg->getPlayerIndex();
-	fwrite(&playerIndex, sizeof(playerIndex), 1, m_file);
+	m_file->write(&playerIndex, sizeof(playerIndex));
 
 #ifdef DEBUG_LOGGING
-	AsciiString commandName = msg->getCommandAsAsciiString();
+	AsciiString commandName = msg->getCommandAsString();
 	if (type < GameMessage::MSG_BEGIN_NETWORK_MESSAGES || type > GameMessage::MSG_END_NETWORK_MESSAGES)
 	{
 		commandName.concat(" (Non-Network message!)");
@@ -758,21 +794,21 @@ void RecorderClass::writeToFile(GameMessage * msg) {
 		commandName.concat(tmp);
 	}
 
-	//DEBUG_LOG(("RecorderClass::writeToFile - Adding %s command from player %d to TheCommandList on frame %d\n",
+	//DEBUG_LOG(("RecorderClass::writeToFile - Adding %s command from player %d to TheCommandList on frame %d",
 		//commandName.str(), msg->getPlayerIndex(), TheGameLogic->getFrame()));
 #endif // DEBUG_LOGGING
 
 	GameMessageParser *parser = newInstance(GameMessageParser)(msg);
 	UnsignedByte numTypes = parser->getNumTypes();
-	fwrite(&numTypes, sizeof(numTypes), 1, m_file);
+	m_file->write(&numTypes, sizeof(numTypes));
 
 	GameMessageParserArgumentType *argType = parser->getFirstArgumentType();
 	while (argType != NULL) {
 		UnsignedByte type = (UnsignedByte)(argType->getType());
-		fwrite(&type, sizeof(type), 1, m_file);
+		m_file->write(&type, sizeof(type));
 
 		UnsignedByte argTypeCount = (UnsignedByte)(argType->getArgCount());
-		fwrite(&argTypeCount, sizeof(argTypeCount), 1, m_file);
+		m_file->write(&argTypeCount, sizeof(argTypeCount));
 
 		argType = argType->getNext();
 	}
@@ -791,32 +827,48 @@ void RecorderClass::writeToFile(GameMessage * msg) {
 	deleteInstance(parser);
 	parser = NULL;
 
-	fflush(m_file); ///< @todo should this be in the final release?
 }
 
 void RecorderClass::writeArgument(GameMessageArgumentDataType type, const GameMessageArgumentType arg) {
-	if (type == ARGUMENTDATATYPE_INTEGER) {
-		fwrite(&(arg.integer), sizeof(arg.integer), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_REAL) {
-		fwrite(&(arg.real), sizeof(arg.real), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-		fwrite(&(arg.boolean), sizeof(arg.boolean), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-		fwrite(&(arg.objectID), sizeof(arg.objectID), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-		fwrite(&(arg.drawableID), sizeof(arg.drawableID), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_TEAMID) {
-		fwrite(&(arg.teamID), sizeof(arg.teamID), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_LOCATION) {
-		fwrite(&(arg.location), sizeof(arg.location), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_PIXEL) {
-		fwrite(&(arg.pixel), sizeof(arg.pixel), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-		fwrite(&(arg.pixelRegion), sizeof(arg.pixelRegion), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {
-		fwrite(&(arg.timestamp), sizeof(arg.timestamp), 1, m_file);
-	} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-		fwrite(&(arg.wChar), sizeof(arg.wChar), 1, m_file);
+
+	switch (type) {
+
+		case ARGUMENTDATATYPE_INTEGER:
+			m_file->write( &(arg.integer), sizeof(arg.integer) );
+			break;
+		case ARGUMENTDATATYPE_REAL:
+			m_file->write( &(arg.real), sizeof(arg.real) );
+			break;
+		case ARGUMENTDATATYPE_BOOLEAN:
+			m_file->write( &(arg.boolean), sizeof(arg.boolean) );
+			break;
+		case ARGUMENTDATATYPE_OBJECTID:
+			m_file->write( &(arg.objectID), sizeof(arg.objectID) );
+			break;
+		case ARGUMENTDATATYPE_DRAWABLEID:
+			m_file->write( &(arg.drawableID), sizeof(arg.drawableID) );
+			break;
+		case ARGUMENTDATATYPE_TEAMID:
+			m_file->write( &(arg.teamID), sizeof(arg.teamID) );
+			break;
+		case ARGUMENTDATATYPE_LOCATION:
+			m_file->write( &(arg.location), sizeof(arg.location) );
+			break;
+		case ARGUMENTDATATYPE_PIXEL:
+			m_file->write( &(arg.pixel), sizeof(arg.pixel) );
+			break;
+		case ARGUMENTDATATYPE_PIXELREGION:
+			m_file->write( &(arg.pixelRegion), sizeof(arg.pixelRegion) );
+			break;
+		case ARGUMENTDATATYPE_TIMESTAMP:
+			m_file->write( &(arg.timestamp), sizeof(arg.timestamp) );
+			break;
+		case ARGUMENTDATATYPE_WIDECHAR:
+			m_file->write( &(arg.wChar), sizeof(arg.wChar) );
+			break;
+		default:
+			DEBUG_LOG(("Unknown GameMessageArgumentDataType in RecorderClass::writeArgument"));
+			break;
 	}
 }
 
@@ -828,62 +880,65 @@ Bool RecorderClass::readReplayHeader(ReplayHeader& header)
 {
 	AsciiString filepath = getReplayDir();
 	filepath.concat(header.filename.str());
-	m_file = fopen(filepath.str(), "rb");
+
+	// TheSuperHackers @performance More buffered data reduces disk overhead and will improve fast forward playback
+	const UnsignedInt buffersize = header.forPlayback ? replayBufferBytes : File::BUFFERSIZE;
+	m_file = TheFileSystem->openFile(filepath.str(), File::READ | File::BINARY, buffersize);
+
 	if (m_file == NULL)
 	{
-		DEBUG_LOG(("Can't open %s (%s)\n", filepath.str(), header.filename.str()));
+		DEBUG_LOG(("Can't open %s (%s)", filepath.str(), header.filename.str()));
 		return FALSE;
 	}
 
 	// Read the GENREP header.
-	char genrep[7];
-	fread(&genrep, sizeof(char), 6, m_file);
-	genrep[6] = 0;
-	if (strncmp(genrep, "GENREP", 6)) {
-		DEBUG_LOG(("RecorderClass::readReplayHeader - replay file did not have GENREP at the start.\n"));
-		fclose(m_file);
+	char genrep[sizeof(s_genrep) - 1] = {0};
+	m_file->read( &genrep, sizeof(s_genrep) - 1 );
+	if ( strncmp(genrep, s_genrep, sizeof(s_genrep) - 1 ) != 0 ) {
+		DEBUG_LOG(("RecorderClass::readReplayHeader - replay file did not have GENREP at the start."));
+		m_file->close();
 		m_file = NULL;
 		return FALSE;
 	}
 
 	// read in some stats
 	replay_time_t tmp;
-	fread(&tmp, sizeof(replay_time_t), 1, m_file);
+	m_file->read(&tmp, sizeof(tmp));
 	header.startTime = tmp;
-	fread(&tmp, sizeof(replay_time_t), 1, m_file);
+	m_file->read(&tmp, sizeof(tmp));
 	header.endTime = tmp;
 
-	fread(&header.frameDuration, sizeof(UnsignedInt), 1, m_file);
+	m_file->read(&header.frameCount, sizeof(header.frameCount));
 
-	fread(&header.desyncGame, sizeof(Bool), 1, m_file);
-	fread(&header.quitEarly, sizeof(Bool), 1, m_file);
+	m_file->read(&header.desyncGame, sizeof(header.desyncGame));
+	m_file->read(&header.quitEarly, sizeof(header.quitEarly));
 	for (Int i=0; i<MAX_SLOTS; ++i)
 	{
-		fread(&(header.playerDiscons[i]), sizeof(Bool), 1, m_file);
+		m_file->read(&(header.playerDiscons[i]), sizeof(Bool));
 	}
 
 	// Read the Replay Name.  We don't actually do anything with it.  Oh well.
 	header.replayName = readUnicodeString();
 
 	// Read the date and time.  We don't really do anything with this either. Oh well.
-	fread(&header.timeVal, sizeof(SYSTEMTIME), 1, m_file);
+	m_file->read(&header.timeVal, sizeof(header.timeVal));
 
 	// Read in the Version info
 	header.versionString = readUnicodeString();
 	header.versionTimeString = readUnicodeString();
-	fread(&header.versionNumber, sizeof(UnsignedInt), 1, m_file);
-	fread(&header.exeCRC, sizeof(UnsignedInt), 1, m_file);
-	fread(&header.iniCRC, sizeof(UnsignedInt), 1, m_file);
+	m_file->read(&header.versionNumber, sizeof(header.versionNumber));
+	m_file->read(&header.exeCRC, sizeof(header.exeCRC));
+	m_file->read(&header.iniCRC, sizeof(header.iniCRC));
 
 	// Read in the GameInfo
 	header.gameOptions = readAsciiString();
 	m_gameInfo.reset();
 	m_gameInfo.enterGame();
-	DEBUG_LOG(("RecorderClass::readReplayHeader - GameInfo = %s\n", header.gameOptions.str()));
+	DEBUG_LOG(("RecorderClass::readReplayHeader - GameInfo = %s", header.gameOptions.str()));
 	if (!ParseAsciiStringToGameInfo(&m_gameInfo, header.gameOptions))
 	{
-		DEBUG_LOG(("RecorderClass::readReplayHeader - replay file did not have a valid GameInfo string.\n"));
-		fclose(m_file);
+		DEBUG_LOG(("RecorderClass::readReplayHeader - replay file did not have a valid GameInfo string."));
+		m_file->close();
 		m_file = NULL;
 		return FALSE;
 	}
@@ -893,10 +948,10 @@ Bool RecorderClass::readReplayHeader(ReplayHeader& header)
 	header.localPlayerIndex = atoi(playerIndex.str());
 	if (header.localPlayerIndex < -1 || header.localPlayerIndex >= MAX_SLOTS)
 	{
-		DEBUG_LOG(("RecorderClass::readReplayHeader - invalid local slot number.\n"));
+		DEBUG_LOG(("RecorderClass::readReplayHeader - invalid local slot number."));
 		m_gameInfo.endGame();
 		m_gameInfo.reset();
-		fclose(m_file);
+		m_file->close();
 		m_file = NULL;
 		return FALSE;
 	}
@@ -910,28 +965,40 @@ Bool RecorderClass::readReplayHeader(ReplayHeader& header)
 	{
 		m_gameInfo.endGame();
 		m_gameInfo.reset();
-		fclose(m_file);
+		m_file->close();
 		m_file = NULL;
 	}
+
 	return TRUE;
 }
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+Bool RecorderClass::simulateReplay(AsciiString filename)
+{
+	Bool success = playbackFile(filename);
+	if (success)
+		m_mode = RECORDERMODETYPE_SIMULATION_PLAYBACK;
+	return success;
+}
+
+#if defined(RTS_DEBUG)
 Bool RecorderClass::analyzeReplay( AsciiString filename )
 {
 	m_doingAnalysis = TRUE;
 	return playbackFile(filename);
 }
 
-Bool RecorderClass::isAnalysisInProgress( void )
+
+
+#endif
+
+Bool RecorderClass::isPlaybackInProgress( void ) const
 {
-	return m_mode == RECORDERMODETYPE_PLAYBACK && m_nextFrame != -1;
+	return isPlaybackMode() && m_nextFrame != -1;
 }
-#endif
 
 AsciiString RecorderClass::getCurrentReplayFilename( void )
 {
-	if (m_mode == RECORDERMODETYPE_PLAYBACK)
+	if (isPlaybackMode())
 	{
 		return m_currentReplayFilename;
 	}
@@ -965,7 +1032,7 @@ class CRCInfo
 	UnsignedInt getLocalPlayer(void) { return m_localPlayer; }
 
 	void setSawCRCMismatch(void) { m_sawCRCMismatch = TRUE; }
-	Bool sawCRCMismatch(void) { return m_sawCRCMismatch; }
+	Bool sawCRCMismatch(void) const { return m_sawCRCMismatch; }
 
 protected:
 
@@ -996,28 +1063,33 @@ void CRCInfo::addCRC(UnsignedInt val)
 	}
 
 	m_data.push_back(val);
-	//DEBUG_LOG(("CRCInfo::addCRC() - crc %8.8X pushes list to %d entries (full=%d)\n", val, m_data.size(), !m_data.empty()));
+	//DEBUG_LOG(("CRCInfo::addCRC() - crc %8.8X pushes list to %d entries (full=%d)", val, m_data.size(), !m_data.empty()));
 }
 
 UnsignedInt CRCInfo::readCRC(void)
 {
 	if (m_data.empty())
 	{
-		DEBUG_LOG(("CRCInfo::readCRC() - bailing, full=0, size=%d\n", m_data.size()));
+		DEBUG_LOG(("CRCInfo::readCRC() - bailing, full=0, size=%d", m_data.size()));
 		return 0;
 	}
 
 	UnsignedInt val = m_data.front();
 	m_data.pop_front();
-	//DEBUG_LOG(("CRCInfo::readCRC() - returning %8.8X, full=%d, size=%d\n", val, !m_data.empty(), m_data.size()));
+	//DEBUG_LOG(("CRCInfo::readCRC() - returning %8.8X, full=%d, size=%d", val, !m_data.empty(), m_data.size()));
 	return val;
 }
 
+Bool RecorderClass::sawCRCMismatch() const
+{
+	return m_crcInfo->sawCRCMismatch();
+}
+
 void RecorderClass::handleCRCMessage(UnsignedInt newCRC, Int playerIndex, Bool fromPlayback)
 {
 	if (fromPlayback)
 	{
-		//DEBUG_LOG(("RecorderClass::handleCRCMessage() - Adding CRC of %X from %d to m_crcInfo\n", newCRC, playerIndex));
+		//DEBUG_LOG(("RecorderClass::handleCRCMessage() - Adding CRC of %X from %d to m_crcInfo", newCRC, playerIndex));
 		m_crcInfo->addCRC(newCRC);
 		return;
 	}
@@ -1032,38 +1104,52 @@ void RecorderClass::handleCRCMessage(UnsignedInt newCRC, Int playerIndex, Bool f
 	if (samePlayer || (localPlayerIndex < 0))
 	{
 		UnsignedInt playbackCRC = m_crcInfo->readCRC();
-		//DEBUG_LOG(("RecorderClass::handleCRCMessage() - Comparing CRCs of InGame:%8.8X Replay:%8.8X Frame:%d from Player %d\n",
+		//DEBUG_LOG(("RecorderClass::handleCRCMessage() - Comparing CRCs of InGame:%8.8X Replay:%8.8X Frame:%d from Player %d",
 		//	playbackCRC, newCRC, TheGameLogic->getFrame()-m_crcInfo->GetQueueSize()-1, playerIndex));
 		if (TheGameLogic->getFrame() > 0 && newCRC != playbackCRC && !m_crcInfo->sawCRCMismatch())
 		{
-			m_crcInfo->setSawCRCMismatch();
-
 			//Kris: Patch 1.01 November 10, 2003 (integrated changes from Matt Campbell)
 			// Since we don't seem to have any *visible* desyncs when replaying games, but get this warning
 			// virtually every replay, the assumption is our CRC checking is faulty.  Since we're at the
 			// tail end of patch season, let's just disable the message, and hope the users believe the
 			// problem is fixed. -MDC 3/20/2003
-			// 
+			//
 			// TheSuperHackers @tweak helmutbuhler 03/04/2025
-			// More than 20 years later, but finally fixed and reenabled!
+			// More than 20 years later, but finally fixed and re-enabled!
 			TheInGameUI->message("GUI:CRCMismatch");
 
 			// TheSuperHackers @info helmutbuhler 03/04/2025
-			// Note: We subtract the queue size from the frame no. This way we calculate the correct frame
+			// Note: We subtract the queue size from the frame number. This way we calculate the correct frame
 			// the mismatch first happened in case the NetCRCInterval is set to 1 during the game.
-			DEBUG_CRASH(("Replay has gone out of sync!  All bets are off!\nInGame:%8.8X Replay:%8.8X\nFrame:%d",
-				playbackCRC, newCRC, TheGameLogic->getFrame()-m_crcInfo->GetQueueSize()-1));
+			const UnsignedInt mismatchFrame = TheGameLogic->getFrame() - m_crcInfo->GetQueueSize() - 1;
+
+			// Now also prints a UI message for it.
+			const UnicodeString mismatchDetailsStr = TheGameText->FETCH_OR_SUBSTITUTE("GUI:CRCMismatchDetails", L"InGame:%8.8X Replay:%8.8X Frame:%d");
+			TheInGameUI->message(mismatchDetailsStr, playbackCRC, newCRC, mismatchFrame);
+
+			DEBUG_LOG(("Replay has gone out of sync!\nInGame:%8.8X Replay:%8.8X\nFrame:%d",
+				playbackCRC, newCRC, mismatchFrame));
+
+			// Print Mismatch in case we are simulating replays from console.
+			printf("CRC Mismatch in Frame %d\n", mismatchFrame);
 
 			// TheSuperHackers @tweak Pause the game on mismatch.
-			Bool pause = TRUE;
-			Bool pauseMusic = FALSE;
-			Bool pauseInput = FALSE;
-			TheGameLogic->setGamePaused(pause, pauseMusic, pauseInput);
+			// But not when a window with focus is opened, because that can make resuming difficult.
+			if (TheWindowManager->winGetFocus() == NULL)
+			{
+				Bool pause = TRUE;
+				Bool pauseMusic = FALSE;
+				Bool pauseInput = FALSE;
+				TheGameLogic->setGamePaused(pause, pauseMusic, pauseInput);
+
+				// Mark this mismatch as seen when we had the chance to pause once.
+				m_crcInfo->setSawCRCMismatch();
+			}
 		}
 		return;
 	}
 
-	//DEBUG_LOG(("RecorderClass::handleCRCMessage() - Skipping CRC of %8.8X from %d (our index is %d)\n", newCRC, playerIndex, localPlayerIndex));
+	//DEBUG_LOG(("RecorderClass::handleCRCMessage() - Skipping CRC of %8.8X from %d (our index is %d)", newCRC, playerIndex, localPlayerIndex));
 }
 
 /**
@@ -1083,25 +1169,23 @@ Bool RecorderClass::replayMatchesGameVersion(AsciiString filename)
 
 Bool RecorderClass::replayMatchesGameVersion(const ReplayHeader& header)
 {
-	Bool versionStringDiff = header.versionString != TheVersion->getUnicodeVersion();
-	Bool versionTimeStringDiff = header.versionTimeString != TheVersion->getUnicodeBuildTime();
-	Bool versionNumberDiff = header.versionNumber != TheVersion->getVersionNumber();
-	Bool exeCRCDiff = header.exeCRC != TheGlobalData->m_exeCRC;
-	Bool exeDifferent = versionStringDiff || versionTimeStringDiff || versionNumberDiff || exeCRCDiff;
-	Bool iniDifferent = header.iniCRC != TheGlobalData->m_iniCRC;
-
-	if(exeDifferent || iniDifferent)
-	{
-		return FALSE;
-	}
-	return TRUE;
+	// TheSuperHackers @fix No longer checks the build time here to prevent incorrect Replay playback incompatibility messages when the Replay playback would actually be technically compatible.
+	if (header.versionString != TheVersion->getUnicodeVersion())
+		return false;
+	if (header.versionNumber != TheVersion->getVersionNumber())
+		return false;
+	if (header.exeCRC != TheGlobalData->m_exeCRC)
+		return false;
+	if (header.iniCRC != TheGlobalData->m_iniCRC)
+		return false;
+	return true;
 }
 
 /**
  * Start playback of the file. Return true or false depending on if the file is
  * a valid replay file or not.
  */
-Bool RecorderClass::playbackFile(AsciiString filename) 
+Bool RecorderClass::playbackFile(AsciiString filename)
 {
 	if (!m_doingAnalysis)
 	{
@@ -1175,7 +1259,7 @@ Bool RecorderClass::playbackFile(AsciiString filename)
 #ifdef DEBUG_LOGGING
 	if (header.localPlayerIndex >= 0)
 	{
-		DEBUG_LOG(("Local player is %ls (slot %d, IP %8.8X)\n",
+		DEBUG_LOG(("Local player is %ls (slot %d, IP %8.8X)",
 			m_gameInfo.getSlot(header.localPlayerIndex)->getName().str(), header.localPlayerIndex, m_gameInfo.getSlot(header.localPlayerIndex)->getIP()));
 	}
 #endif
@@ -1183,21 +1267,21 @@ Bool RecorderClass::playbackFile(AsciiString filename)
 	Bool isMultiplayer = m_gameInfo.getSlot(header.localPlayerIndex)->getIP() != 0;
 	m_crcInfo = NEW CRCInfo(header.localPlayerIndex, isMultiplayer);
 	REPLAY_CRC_INTERVAL = m_gameInfo.getCRCInterval();
-	DEBUG_LOG(("Player index is %d, replay CRC interval is %d\n", m_crcInfo->getLocalPlayer(), REPLAY_CRC_INTERVAL));
+	DEBUG_LOG(("Player index is %d, replay CRC interval is %d", m_crcInfo->getLocalPlayer(), REPLAY_CRC_INTERVAL));
 
 	Int difficulty = 0;
-	fread(&difficulty, sizeof(difficulty), 1, m_file);
+	m_file->read(&difficulty, sizeof(difficulty));
 
-	fread(&m_originalGameMode, sizeof(m_originalGameMode), 1, m_file);
+	m_file->read(&m_originalGameMode, sizeof(m_originalGameMode));
 
 	Int rankPoints = 0;
-	fread(&rankPoints, sizeof(rankPoints), 1, m_file);
-	
+	m_file->read(&rankPoints, sizeof(rankPoints));
+
 	Int maxFPS = 0;
-	fread(&maxFPS, sizeof(maxFPS), 1, m_file);
+	m_file->read(&maxFPS, sizeof(maxFPS));
+
+	DEBUG_LOG(("RecorderClass::playbackFile() - original game was mode %d", m_originalGameMode));
 
-	DEBUG_LOG(("RecorderClass::playbackFile() - original game was mode %d\n", m_originalGameMode));
-	
 	// TheSuperHackers @fix helmutbuhler 03/04/2025
 	// In case we restart a replay, we need to clear the command list.
 	// Otherwise a crc message remains and messes up the crc calculation on the restarted replay.
@@ -1208,17 +1292,23 @@ Bool RecorderClass::playbackFile(AsciiString filename)
 	// send a message to the logic for a new game
 	if (!m_doingAnalysis)
 	{
-		GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
+		// TheSuperHackers @info helmutbuhler 13/04/2025
+		// We send the New Game message here directly to the command list and bypass the TheMessageStream.
+		// That's ok because Multiplayer is disabled during replay playback and is actually required
+		// during replay simulation because we don't update TheMessageStream during simulation.
+		GameMessage *msg = newInstance(GameMessage)(GameMessage::MSG_NEW_GAME);
 		msg->appendIntegerArgument(GAME_REPLAY);
 		msg->appendIntegerArgument(difficulty);
 		msg->appendIntegerArgument(rankPoints);
 		if( maxFPS != 0 )
 			msg->appendIntegerArgument(maxFPS);
+		TheCommandList->appendMessage( msg );
 		//InitGameLogicRandom( m_gameInfo.getSeed());
 		InitRandom( m_gameInfo.getSeed() );
 	}
 
 	m_currentReplayFilename = filename;
+	m_playbackFrameCount = header.frameCount;
 	return TRUE;
 }
 
@@ -1229,7 +1319,7 @@ UnicodeString RecorderClass::readUnicodeString() {
 	WideChar str[1024] = L"";
 	Int index = 0;
 
-	Int c = fgetwc(m_file);
+	Int c = m_file->readWideChar();
 	if (c == EOF) {
 		str[index] = 0;
 	}
@@ -1237,7 +1327,7 @@ UnicodeString RecorderClass::readUnicodeString() {
 
 	while (index < 1024 && str[index] != 0) {
 		++index;
-		Int c = fgetwc(m_file);
+		Int c = m_file->readWideChar();
 		if (c == EOF) {
 			str[index] = 0;
 			break;
@@ -1257,7 +1347,7 @@ AsciiString RecorderClass::readAsciiString() {
 	char str[1024] = "";
 	Int index = 0;
 
-	Int c = fgetc(m_file);
+	Int c =	m_file->readChar();
 	if (c == EOF) {
 		str[index] = 0;
 	}
@@ -1265,7 +1355,7 @@ AsciiString RecorderClass::readAsciiString() {
 
 	while (index < 1024 && str[index] != 0) {
 		++index;
-		Int c = fgetc(m_file);
+		Int c = m_file->readChar();
 		if (c == EOF) {
 			str[index] = 0;
 			break;
@@ -1283,9 +1373,9 @@ AsciiString RecorderClass::readAsciiString() {
  * is stopped and the next frame is said to be -1.
  */
 void RecorderClass::readNextFrame() {
-	Int retcode = fread(&m_nextFrame, sizeof(m_nextFrame), 1, m_file);
-	if (retcode != 1) {
-		DEBUG_LOG(("RecorderClass::readNextFrame - fread failed on frame %d\n", TheGameLogic->getFrame()));
+	Int bytesRead = m_file->read(&m_nextFrame, sizeof(m_nextFrame));
+	if (bytesRead != sizeof(m_nextFrame)) {
+		DEBUG_LOG(("RecorderClass::readNextFrame - read failed on frame %d", TheGameLogic->getFrame()));
 		m_nextFrame = -1;
 		stopPlayback();
 	}
@@ -1296,26 +1386,16 @@ void RecorderClass::readNextFrame() {
  */
 void RecorderClass::appendNextCommand() {
 	GameMessage::Type type;
-	Int retcode = fread(&type, sizeof(type), 1, m_file);
-	if (retcode != 1) {
-		DEBUG_LOG(("RecorderClass::appendNextCommand - fread failed on frame %d\n", m_nextFrame/*TheGameLogic->getFrame()*/));
+	Int bytesRead = m_file->read(&type, sizeof(type));
+	if (bytesRead != sizeof(type)) {
+		DEBUG_LOG(("RecorderClass::appendNextCommand - read failed on frame %d", m_nextFrame/*TheGameLogic->getFrame()*/));
 		return;
 	}
 
 	GameMessage *msg = newInstance(GameMessage)(type);
-	if (type == GameMessage::MSG_BEGIN_NETWORK_MESSAGES || type == GameMessage::MSG_CLEAR_GAME_DATA)
-	{
-	}
-	else
-	{
-		if (!m_doingAnalysis)
-		{
-			TheCommandList->appendMessage(msg);
-		}
-	}
 
 #ifdef DEBUG_LOGGING
-	AsciiString commandName = msg->getCommandAsAsciiString();
+	AsciiString commandName = msg->getCommandAsString();
 	if (type < GameMessage::MSG_BEGIN_NETWORK_MESSAGES || type > GameMessage::MSG_END_NETWORK_MESSAGES)
 	{
 		commandName.concat(" (Non-Network message!)");
@@ -1327,7 +1407,7 @@ void RecorderClass::appendNextCommand() {
 #endif // DEBUG_LOGGING
 
 	Int playerIndex = -1;
-	fread(&playerIndex, sizeof(playerIndex), 1, m_file);
+	m_file->read(&playerIndex, sizeof(playerIndex));
 	msg->friend_setPlayerIndex(playerIndex);
 
 	// don't debug log this if we're debugging sync errors, as it will cause diff problems between a game and it's replay...
@@ -1339,21 +1419,21 @@ void RecorderClass::appendNextCommand() {
 #endif
 	if (logCommand)
 	{
-		DEBUG_LOG(("RecorderClass::appendNextCommand - Adding %s command from player %d to TheCommandList on frame %d\n",
+		DEBUG_LOG(("RecorderClass::appendNextCommand - Adding %s command from player %d to TheCommandList on frame %d",
 			commandName.str(), (type == GameMessage::MSG_BEGIN_NETWORK_MESSAGES)?0:msg->getPlayerIndex(), m_nextFrame/*TheGameLogic->getFrame()*/));
 	}
 #endif
 
 	UnsignedByte numTypes = 0;
 	Int totalArgs = 0;
-	fread(&numTypes, sizeof(numTypes), 1, m_file);
+	m_file->read(&numTypes, sizeof(numTypes));
 
 	GameMessageParser *parser = newInstance(GameMessageParser)();
 	for (UnsignedByte i = 0; i < numTypes; ++i) {
 		UnsignedByte type = (UnsignedByte)ARGUMENTDATATYPE_UNKNOWN;
-		fread(&type, sizeof(type), 1, m_file);
+		m_file->read(&type, sizeof(type));
 		UnsignedByte numArgs = 0;
-		fread(&numArgs, sizeof(numArgs), 1, m_file);
+		m_file->read(&numArgs, sizeof(numArgs));
 		parser->addArgType((GameMessageArgumentDataType)type, numArgs);
 		totalArgs += numArgs;
 	}
@@ -1384,13 +1464,11 @@ void RecorderClass::appendNextCommand() {
 		}
 	}
 
-	if (type == GameMessage::MSG_CLEAR_GAME_DATA || type == GameMessage::MSG_BEGIN_NETWORK_MESSAGES)
+	if (type != GameMessage::MSG_BEGIN_NETWORK_MESSAGES && type != GameMessage::MSG_CLEAR_GAME_DATA && !m_doingAnalysis)
 	{
-		deleteInstance(msg);
-		msg = NULL;
+		TheCommandList->appendMessage(msg);
 	}
-
-	if (m_doingAnalysis)
+	else
 	{
 		deleteInstance(msg);
 		msg = NULL;
@@ -1401,117 +1479,142 @@ void RecorderClass::appendNextCommand() {
 }
 
 void RecorderClass::readArgument(GameMessageArgumentDataType type, GameMessage *msg) {
-	if (type == ARGUMENTDATATYPE_INTEGER) {
-		Int theint;
-		fread(&theint, sizeof(theint), 1, m_file);
-		msg->appendIntegerArgument(theint);
+	switch (type) {
+		case ARGUMENTDATATYPE_INTEGER: {
+			Int theint;
+			m_file->read(&theint, sizeof(theint));
+			msg->appendIntegerArgument(theint);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Integer argument: %d (%8.8X)\n", theint, theint));
-		}
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Integer argument: %d (%8.8X)", theint, theint));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_REAL) {
-		Real thereal;
-		fread(&thereal, sizeof(thereal), 1, m_file);
-		msg->appendRealArgument(thereal);
-#ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Real argument: %g (%8.8X)\n", thereal, *(int *)&thereal));
+			break;
 		}
-#endif
-	} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-		Bool thebool;
-		fread(&thebool, sizeof(thebool), 1, m_file);
-		msg->appendBooleanArgument(thebool);
+		case ARGUMENTDATATYPE_REAL: {
+			Real thereal;
+			m_file->read(&thereal, sizeof(thereal));
+			msg->appendRealArgument(thereal);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Bool argument: %d\n", thebool));
-		}
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Real argument: %g (%8.8X)", thereal, *(int *)&thereal));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-		ObjectID theid;
-		fread(&theid, sizeof(theid), 1, m_file);
-		msg->appendObjectIDArgument(theid);
-#ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Object ID argument: %d\n", theid));
+			break;
 		}
-#endif
-	} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-		DrawableID theid;
-		fread(&theid, sizeof(theid), 1, m_file);
-		msg->appendDrawableIDArgument(theid);
+		case ARGUMENTDATATYPE_BOOLEAN: {
+			Bool thebool;
+			m_file->read(&thebool, sizeof(thebool));
+			msg->appendBooleanArgument(thebool);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Drawable ID argument: %d\n", theid));
-		}
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Bool argument: %d", thebool));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_TEAMID) {
-		UnsignedInt theid;
-		fread(&theid, sizeof(theid), 1, m_file);
-		msg->appendTeamIDArgument(theid);
-#ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Team ID argument: %d\n", theid));
+			break;
 		}
-#endif
-	} else if (type == ARGUMENTDATATYPE_LOCATION) {
-		Coord3D loc;
-		fread(&loc, sizeof(loc), 1, m_file);
-		msg->appendLocationArgument(loc);
+		case ARGUMENTDATATYPE_OBJECTID: {
+			ObjectID theid;
+			m_file->read(&theid, sizeof(theid));
+			msg->appendObjectIDArgument(theid);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Coord3D argument: %g %g %g (%8.8X %8.8X %8.8X)\n", loc.x, loc.y, loc.z,
-				*(int *)&loc.x, *(int *)&loc.y, *(int *)&loc.z));
-		}
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Object ID argument: %d", theid));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_PIXEL) {
-		ICoord2D pixel;
-		fread(&pixel, sizeof(pixel), 1, m_file);
-		msg->appendPixelArgument(pixel);
-#ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Pixel argument: %d,%d\n", pixel.x, pixel.y));
+			break;
 		}
+		case ARGUMENTDATATYPE_DRAWABLEID: {
+			DrawableID theid;
+			m_file->read(&theid, sizeof(theid));
+			msg->appendDrawableIDArgument(theid);
+#ifdef DEBUG_LOGGING
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Drawable ID argument: %d", theid));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-		IRegion2D reg;
-		fread(&reg, sizeof(reg), 1, m_file);
-		msg->appendPixelRegionArgument(reg);
+			break;
+		}
+		case ARGUMENTDATATYPE_TEAMID: {
+			UnsignedInt theid;
+			m_file->read(&theid, sizeof(theid));
+			msg->appendTeamIDArgument(theid);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Pixel Region argument: %d,%d -> %d,%d\n", reg.lo.x, reg.lo.y, reg.hi.x, reg.hi.y));
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Team ID argument: %d", theid));
+			}
+#endif
+			break;
 		}
+		case ARGUMENTDATATYPE_LOCATION: {
+			Coord3D loc;
+			m_file->read(&loc, sizeof(loc));
+			msg->appendLocationArgument(loc);
+#ifdef DEBUG_LOGGING
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Coord3D argument: %g %g %g (%8.8X %8.8X %8.8X)", loc.x, loc.y, loc.z,
+					*(int *)&loc.x, *(int *)&loc.y, *(int *)&loc.z));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {  // Not to be confused with Terrance Stamp... Kneel before Zod!!!
-		UnsignedInt stamp;
-		fread(&stamp, sizeof(stamp), 1, m_file);
-		msg->appendTimestampArgument(stamp);
+			break;
+		}
+		case ARGUMENTDATATYPE_PIXEL: {
+			ICoord2D pixel;
+			m_file->read(&pixel, sizeof(pixel));
+			msg->appendPixelArgument(pixel);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("Timestamp argument: %d\n", stamp));
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Pixel argument: %d,%d", pixel.x, pixel.y));
+			}
+#endif
+			break;
 		}
+		case ARGUMENTDATATYPE_PIXELREGION: {
+			IRegion2D reg;
+			m_file->read(&reg, sizeof(reg));
+			msg->appendPixelRegionArgument(reg);
+#ifdef DEBUG_LOGGING
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Pixel Region argument: %d,%d -> %d,%d", reg.lo.x, reg.lo.y, reg.hi.x, reg.hi.y));
+			}
 #endif
-	} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-		WideChar theid;
-		fread(&theid, sizeof(theid), 1, m_file);
-		msg->appendWideCharArgument(theid);
+			break;
+		}
+		case ARGUMENTDATATYPE_TIMESTAMP: {  // Not to be confused with Terrance Stamp... Kneel before Zod!!!
+			UnsignedInt stamp;
+			m_file->read(&stamp, sizeof(stamp));
+			msg->appendTimestampArgument(stamp);
 #ifdef DEBUG_LOGGING
-		if (m_doingAnalysis)
-		{
-			DEBUG_LOG(("WideChar argument: %d (%lc)\n", theid, theid));
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("Timestamp argument: %d", stamp));
+			}
+#endif
+			break;
 		}
+		case ARGUMENTDATATYPE_WIDECHAR: {
+			WideChar theid;
+			m_file->read(&theid, sizeof(theid));
+			msg->appendWideCharArgument(theid);
+#ifdef DEBUG_LOGGING
+			if (m_doingAnalysis)
+			{
+				DEBUG_LOG(("WideChar argument: %d (%lc)", theid, theid));
+			}
 #endif
+			break;
+		}
+		default:
+			break;
 	}
 }
 
@@ -1549,12 +1652,20 @@ RecorderClass::CullBadCommandsResult RecorderClass::cullBadCommands() {
 /**
  * returns the directory that holds the replay files.
  */
-AsciiString RecorderClass::getReplayDir() 
+AsciiString RecorderClass::getReplayDir()
 {
-	const char* replayDir = "Replays\\";
+	AsciiString tmp = TheGlobalData->getPath_UserData();
+	tmp.concat("Replays\\");
+	return tmp;
+}
 
+/**
+ * returns the directory that holds the archived replay files.
+ */
+AsciiString RecorderClass::getReplayArchiveDir()
+{
 	AsciiString tmp = TheGlobalData->getPath_UserData();
-	tmp.concat(replayDir);
+	tmp.concat("ArchivedReplays\\");
 	return tmp;
 }
 
@@ -1568,9 +1679,9 @@ AsciiString RecorderClass::getReplayExtention() {
 /**
  * returns the file name used for the replay file that is recorded to.
  */
-AsciiString RecorderClass::getLastReplayFileName() 
+AsciiString RecorderClass::getLastReplayFileName()
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheNetwork && TheGlobalData->m_saveStats)
 	{
 		GameInfo *game = NULL;
@@ -1654,7 +1765,7 @@ RecorderModeType RecorderClass::getMode() {
 ///< Show or Hide the Replay controls
 void RecorderClass::initControls()
 {
-	NameKeyType parentReplayControlID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayControl.wnd:ParentReplayControl") );
+	NameKeyType parentReplayControlID = TheNameKeyGenerator->nameToKey( "ReplayControl.wnd:ParentReplayControl" );
 	GameWindow *parentReplayControl = TheWindowManager->winGetWindowFromId( NULL, parentReplayControlID );
 
 	Bool show = (getMode() != RECORDERMODETYPE_PLAYBACK);
@@ -1668,7 +1779,7 @@ void RecorderClass::initControls()
 Bool RecorderClass::isMultiplayer( void )
 {
 
-	if (m_mode == RECORDERMODETYPE_PLAYBACK)
+	if (isPlaybackMode())
 	{
 		GameSlot *slot;
 		for (int i=0; i<MAX_SLOTS; ++i)
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/SkirmishBattleHonors.cpp b/GeneralsMD/Code/GameEngine/Source/Common/SkirmishBattleHonors.cpp
index a8072a4290b..eded81eb0d0 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/SkirmishBattleHonors.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/SkirmishBattleHonors.cpp
@@ -31,7 +31,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -75,7 +75,7 @@
 
 
 //-----------------------------------------------------------------------------
-// SkirmishBattleHonors base class 
+// SkirmishBattleHonors base class
 //-----------------------------------------------------------------------------
 
 SkirmishBattleHonors::SkirmishBattleHonors()
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp
index 3a453729888..be7de3cd04b 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp
@@ -26,7 +26,7 @@
 // Implementation of basic state machine
 // Author: Michael S. Booth, January 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Errors.h"
 #include "Common/StateMachine.h"
@@ -39,14 +39,8 @@
 
 #include "ref_ptr.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
 
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//------------------------------------------------------------------------------ Performance Timers 
+//------------------------------------------------------------------------------ Performance Timers
 //#include "Common/PerfMetrics.h"
 //#include "Common/PerfTimer.h"
 
@@ -56,7 +50,7 @@
 /**
  * Constructor
  */
-State::State( StateMachine *machine, AsciiString name )	
+State::State( StateMachine *machine, AsciiString name )
 #ifdef STATE_MACHINE_DEBUG
 : m_name(name)
 #endif
@@ -94,8 +88,8 @@ class StIncrementer
 };
 #ifdef STATE_MACHINE_DEBUG
 //-----------------------------------------------------------------------------
-std::vector<StateID> * State::getTransitions( void ) 
-{ 
+std::vector<StateID> * State::getTransitions( void )
+{
 	std::vector<StateID> *ids = new std::vector<StateID>;
 	ids->push_back(m_successStateID);
 	ids->push_back(m_failureStateID);
@@ -118,9 +112,9 @@ std::vector<StateID> * State::getTransitions( void )
 StateReturnType State::friend_checkForTransitions( StateReturnType status )
 {
 	static Int checkfortransitionsnum = 0;
-	
+
 	StIncrementer inc(checkfortransitionsnum);
-	if (checkfortransitionsnum >= 20) 
+	if (checkfortransitionsnum >= 20)
 	{
 		DEBUG_CRASH(("checkfortransitionsnum is > 20"));
 		return STATE_FAILURE;
@@ -175,9 +169,9 @@ StateReturnType State::friend_checkForTransitions( StateReturnType status )
 						// test returned true, change to associated state
 
 	#ifdef STATE_MACHINE_DEBUG
-						if (getMachine()->getWantsDebugOutput()) 
+						if (getMachine()->getWantsDebugOutput())
 						{
-							DEBUG_LOG(("%d '%s' -- '%s' condition '%s' returned true!\n", TheGameLogic->getFrame(), getMachineOwner()->getTemplate()->getName().str(),
+							DEBUG_LOG(("%d '%s' -- '%s' condition '%s' returned true!", TheGameLogic->getFrame(), getMachineOwner()->getTemplate()->getName().str(),
 											getMachine()->getName().str(), it->description ? it->description : "[no description]"));
 						}
 	#endif
@@ -211,9 +205,9 @@ StateReturnType State::friend_checkForTransitions( StateReturnType status )
 StateReturnType State::friend_checkForSleepTransitions( StateReturnType status )
 {
 	static Int checkfortransitionsnum = 0;
-	
+
 	StIncrementer inc(checkfortransitionsnum);
-	if (checkfortransitionsnum >= 20) 
+	if (checkfortransitionsnum >= 20)
 	{
 		DEBUG_CRASH(("checkforsleeptransitionsnum is > 20"));
 		return STATE_FAILURE;
@@ -233,9 +227,9 @@ StateReturnType State::friend_checkForSleepTransitions( StateReturnType status )
 		// test returned true, change to associated state
 
 #ifdef STATE_MACHINE_DEBUG
-		if (getMachine()->getWantsDebugOutput()) 
+		if (getMachine()->getWantsDebugOutput())
 		{
-			DEBUG_LOG(("%d '%s' -- '%s' condition '%s' returned true!\n", TheGameLogic->getFrame(), getMachineOwner()->getTemplate()->getName().str(),
+			DEBUG_LOG(("%d '%s' -- '%s' condition '%s' returned true!", TheGameLogic->getFrame(), getMachineOwner()->getTemplate()->getName().str(),
 							getMachine()->getName().str(), it->description ? it->description : "[no description]"));
 		}
 #endif
@@ -298,15 +292,14 @@ StateMachine::~StateMachine()
 	// delete all states in the mapping
 	for( i = m_stateMap.begin(); i != m_stateMap.end(); ++i )
 	{
-		if ((*i).second)
-			deleteInstance((*i).second);
+		deleteInstance((*i).second);
 	}
 }
 
 //-----------------------------------------------------------------------------
 #ifdef STATE_MACHINE_DEBUG
-Bool StateMachine::getWantsDebugOutput() const 
-{ 
+Bool StateMachine::getWantsDebugOutput() const
+{
 	if (m_debugOutput)
 	{
 		return true;
@@ -341,7 +334,7 @@ void StateMachine::internalClear()
 #ifdef STATE_MACHINE_DEBUG
 	if (getWantsDebugOutput())
 	{
-		DEBUG_LOG(("%d '%s'%x -- '%s' %x internalClear()\n", TheGameLogic->getFrame(), m_owner->getTemplate()->getName().str(), m_owner, m_name.str(), this));
+		DEBUG_LOG(("%d '%s'%x -- '%s' %x internalClear()", TheGameLogic->getFrame(), m_owner->getTemplate()->getName().str(), m_owner, m_name.str(), this));
 	}
 #endif
 }
@@ -356,8 +349,8 @@ void StateMachine::clear()
 	if (m_locked)
 	{
 #ifdef STATE_MACHINE_DEBUG
-		if (m_currentState) DEBUG_LOG((" cur state '%s'\n", m_currentState->getName().str()));
-		DEBUG_LOG(("machine is locked (by %s), cannot be cleared (Please don't ignore; this generally indicates a potential logic flaw)\n",m_lockedby));
+		if (m_currentState) DEBUG_LOG((" cur state '%s'", m_currentState->getName().str()));
+		DEBUG_LOG(("machine is locked (by %s), cannot be cleared (Please don't ignore; this generally indicates a potential logic flaw)",m_lockedby));
 #endif
 		return;
 	}
@@ -381,8 +374,8 @@ StateReturnType StateMachine::resetToDefaultState()
 	if (m_locked)
 	{
 #ifdef STATE_MACHINE_DEBUG
-		if (m_currentState) DEBUG_LOG((" cur state '%s'\n", m_currentState->getName().str()));
-		DEBUG_LOG(("machine is locked (by %s), cannot be cleared (Please don't ignore; this generally indicates a potential logic flaw)\n",m_lockedby));
+		if (m_currentState) DEBUG_LOG((" cur state '%s'", m_currentState->getName().str()));
+		DEBUG_LOG(("machine is locked (by %s), cannot be cleared (Please don't ignore; this generally indicates a potential logic flaw)",m_lockedby));
 #endif
 		return STATE_FAILURE;
 	}
@@ -439,7 +432,7 @@ StateReturnType StateMachine::updateStateMachine()
 		// Calling m_currentState->update() can release this state machine in certain circumstances,
 		// for example if something kills the entity of this state machine as a result of this state update.
 		// See https://github.com/TheSuperHackers/GeneralsGameCode/issues/212
-		RefCountPtr<StateMachine> refThis(this);
+		RefCountPtr<StateMachine> refThis = RefCountPtr<StateMachine>::Create_AddRef(this);
 
 		// update() can change m_currentState, so save it for a moment...
 		State* stateBeforeUpdate = m_currentState;
@@ -452,8 +445,8 @@ StateReturnType StateMachine::updateStateMachine()
 		{
 			return STATE_FAILURE;
 		}
-		
-		// here's the scenario: 
+
+		// here's the scenario:
 		// -- State A calls foo() and then says "sleep for 2000 frames".
 		// -- however, foo() called setState() to State B. thus our current state is not the same.
 		// -- thus, if the state changed, we must ignore any sleep result and pretend we got STATE_CONTINUE,
@@ -492,7 +485,7 @@ StateReturnType StateMachine::updateStateMachine()
 void StateMachine::defineState( StateID id, State *state, StateID successID, StateID failureID, const StateConditionInfo* conditions )
 {
 #ifdef STATE_MACHINE_DEBUG
-	DEBUG_ASSERTCRASH(m_stateMap.find( id ) == m_stateMap.end(), ("duplicate state ID in statemachine %s\n",m_name.str()));
+	DEBUG_ASSERTCRASH(m_stateMap.find( id ) == m_stateMap.end(), ("duplicate state ID in statemachine %s",m_name.str()));
 #endif
 
 	// map the ID to the state
@@ -503,7 +496,7 @@ void StateMachine::defineState( StateID id, State *state, StateID successID, Sta
 
 	state->friend_onSuccess(successID);
 	state->friend_onFailure(failureID);
-	
+
 	while (conditions && conditions->test != NULL)
 	{
 		state->friend_onCondition(conditions->test, conditions->toStateID, conditions->userData);
@@ -527,14 +520,14 @@ State *StateMachine::internalGetState( StateID id )
 	if (i == m_stateMap.end())
 	{
 		DEBUG_CRASH( ("StateMachine::internalGetState(): Invalid state for object %s using state %d", m_owner->getTemplate()->getName().str(), id) );
-		DEBUG_LOG(("Transisioning to state #d\n", (Int)id));
-		DEBUG_LOG(("Attempting to recover - locating default state...\n"));
+		DEBUG_LOG(("Transisioning to state #d", (Int)id));
+		DEBUG_LOG(("Attempting to recover - locating default state..."));
 		i = m_stateMap.find(m_defaultStateID);
 		if (i == m_stateMap.end()) {
-			DEBUG_LOG(("Failed to located default state.  Aborting...\n"));
+			DEBUG_LOG(("Failed to located default state.  Aborting..."));
 			throw ERROR_BAD_ARG;
 		} else {
-			DEBUG_LOG(("Located default state to recover.\n"));
+			DEBUG_LOG(("Located default state to recover."));
 		}
 	}
 
@@ -553,8 +546,8 @@ StateReturnType StateMachine::setState( StateID newStateID )
 	if (m_locked)
 	{
 #ifdef STATE_MACHINE_DEBUG
-		if (m_currentState) DEBUG_LOG((" cur state '%s'\n", m_currentState->getName().str()));
-		DEBUG_LOG(("machine is locked (by %s), cannot be cleared (Please don't ignore; this generally indicates a potential logic flaw)\n",m_lockedby));
+		if (m_currentState) DEBUG_LOG((" cur state '%s'", m_currentState->getName().str()));
+		DEBUG_LOG(("machine is locked (by %s), cannot be cleared (Please don't ignore; this generally indicates a potential logic flaw)",m_lockedby));
 #endif
 		return STATE_CONTINUE;
 	}
@@ -593,22 +586,22 @@ StateReturnType StateMachine::internalSetState( StateID newStateID )
 		// extract the state associated with the given ID
 		newState = internalGetState( newStateID );
 #ifdef STATE_MACHINE_DEBUG
-		if (getWantsDebugOutput()) 
+		if (getWantsDebugOutput())
 		{
 			StateID curState = INVALID_STATE_ID;
 			if (m_currentState) {
 				curState = m_currentState->getID();
 			}
-			DEBUG_LOG(("%d '%s'%x -- '%s' %x exit ", TheGameLogic->getFrame(), m_owner->getTemplate()->getName().str(), m_owner, m_name.str(), this));
+			DEBUG_LOG_RAW(("%d '%s'%x -- '%s' %x exit ", TheGameLogic->getFrame(), m_owner->getTemplate()->getName().str(), m_owner, m_name.str(), this));
 			if (m_currentState) {
-				DEBUG_LOG((" '%s' ", m_currentState->getName().str()));
+				DEBUG_LOG_RAW((" '%s' ", m_currentState->getName().str()));
 			} else {
-				DEBUG_LOG((" INVALID_STATE_ID "));
+				DEBUG_LOG_RAW((" INVALID_STATE_ID "));
 			}
 			if (newState) {
-				DEBUG_LOG(("enter '%s' \n", newState->getName().str()));
+				DEBUG_LOG(("enter '%s'", newState->getName().str()));
 			} else {
-				DEBUG_LOG(("to INVALID_STATE\n"));
+				DEBUG_LOG(("to INVALID_STATE"));
 			}
 		}
 #endif
@@ -636,7 +629,7 @@ StateReturnType StateMachine::internalSetState( StateID newStateID )
 			return STATE_FAILURE;
 		}
 
-		// here's the scenario: 
+		// here's the scenario:
 		// -- State A calls foo() and then says "sleep for 2000 frames".
 		// -- however, foo() called setState() to State B. thus our current state is not the same.
 		// -- thus, if the state changed, we must ignore any sleep result and pretend we got STATE_CONTINUE,
@@ -674,7 +667,7 @@ StateReturnType StateMachine::initDefaultState()
 {
 #ifdef DEBUG_LOGGING
 #ifdef STATE_MACHINE_DEBUG
-#define REALLY_VERBOSE_LOG(x) /* */
+#define REALLY_VERBOSE_LOG(x) /* DEBUG_LOG_RAW(x) */
 	// Run through all the transitions and make sure there aren't any transitions to undefined states. jba. [8/18/2003]
 	std::map<StateID, State *>::iterator i;
 	REALLY_VERBOSE_LOG(("SM_BEGIN\n"));
@@ -708,9 +701,8 @@ StateReturnType StateMachine::initDefaultState()
 				i = m_stateMap.find( curID );
 
 				if (i == m_stateMap.end()) {
-					DEBUG_LOG(("\nState %s(%d) : ", state->getName().str(), id));
-					DEBUG_LOG(("Transition %d not found\n", curID));
-					DEBUG_LOG(("This MUST BE FIXED!!!jba\n"));
+					DEBUG_LOG(("\nState %s(%d) : Transition %d not found", state->getName().str(), id, curID));
+					DEBUG_LOG(("This MUST BE FIXED!!!jba"));
 					DEBUG_CRASH(("Invalid transition."));
 				} else {
 					State *st = (*i).second;
@@ -725,7 +717,7 @@ StateReturnType StateMachine::initDefaultState()
 		ids = NULL;
 	}
 	REALLY_VERBOSE_LOG(("SM_END\n\n"));
-#endif	
+#endif
 #endif
 	DEBUG_ASSERTCRASH(!m_locked, ("Machine is locked here, but probably should not be"));
 	if (m_defaultStateInited)
@@ -741,8 +733,8 @@ StateReturnType StateMachine::initDefaultState()
 }
 
 //-----------------------------------------------------------------------------
-void StateMachine::setGoalObject( const Object *obj ) 
-{ 
+void StateMachine::setGoalObject( const Object *obj )
+{
 	if (m_locked)
 		return;
 
@@ -751,8 +743,8 @@ void StateMachine::setGoalObject( const Object *obj )
 
 //-----------------------------------------------------------------------------
 Bool StateMachine::isGoalObjectDestroyed() const
-{ 
-	if (m_goalObjectID == 0) 
+{
+	if (m_goalObjectID == 0)
 	{
 		return false; // never had a goal object
 	}
@@ -760,23 +752,23 @@ Bool StateMachine::isGoalObjectDestroyed() const
 }
 
 //-----------------------------------------------------------------------------
-void StateMachine::halt() 
-{ 
+void StateMachine::halt()
+{
 	m_locked = true;
 	m_currentState = NULL; // don't exit current state, just clear it.
 #ifdef STATE_MACHINE_DEBUG
 	if (getWantsDebugOutput())
 	{
-		DEBUG_LOG(("%d '%s' -- '%s' %x halt()\n", TheGameLogic->getFrame(), m_owner->getTemplate()->getName().str(), m_name.str(), this));
-	}	
+		DEBUG_LOG(("%d '%s' -- '%s' %x halt()", TheGameLogic->getFrame(), m_owner->getTemplate()->getName().str(), m_name.str(), this));
+	}
 #endif
 }
 
 //-----------------------------------------------------------------------------
-void StateMachine::internalSetGoalObject( const Object *obj ) 
-{ 
+void StateMachine::internalSetGoalObject( const Object *obj )
+{
 	if (obj) {
-		m_goalObjectID = obj->getID(); 
+		m_goalObjectID = obj->getID();
 		internalSetGoalPosition(obj->getPosition());
 	}
 	else {
@@ -785,20 +777,20 @@ void StateMachine::internalSetGoalObject( const Object *obj )
 }
 
 //-----------------------------------------------------------------------------
-Object *StateMachine::getGoalObject() 
-{ 
-	return TheGameLogic->findObjectByID( m_goalObjectID ); 
+Object *StateMachine::getGoalObject()
+{
+	return TheGameLogic->findObjectByID( m_goalObjectID );
 }
 
 //-----------------------------------------------------------------------------
 const Object *StateMachine::getGoalObject() const
-{ 
-	return TheGameLogic->findObjectByID( m_goalObjectID ); 
+{
+	return TheGameLogic->findObjectByID( m_goalObjectID );
 }
 
 //-----------------------------------------------------------------------------
-void StateMachine::setGoalPosition( const Coord3D *pos ) 
-{ 
+void StateMachine::setGoalPosition( const Coord3D *pos )
+{
 	if (m_locked)
 		return;
 
@@ -806,10 +798,10 @@ void StateMachine::setGoalPosition( const Coord3D *pos )
 }
 
 //-----------------------------------------------------------------------------
-void StateMachine::internalSetGoalPosition( const Coord3D *pos ) 
-{ 
+void StateMachine::internalSetGoalPosition( const Coord3D *pos )
+{
 	if (pos) {
-		m_goalPosition = *pos; 
+		m_goalPosition = *pos;
 		// Don't clear the goal object, or everything breaks.  Like construction of buildings.
 	}
 }
@@ -820,7 +812,7 @@ void StateMachine::internalSetGoalPosition( const Coord3D *pos )
 void StateMachine::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -841,7 +833,7 @@ void StateMachine::xfer( Xfer *xfer )
 	StateID curStateID = getCurrentStateID();
 	xfer->xferUnsignedInt(&curStateID);
 	if (xfer->getXferMode() == XFER_LOAD)	{
-		// We are going to jump into the current state.	We don't call onEnter or onExit, because the 
+		// We are going to jump into the current state.	We don't call onEnter or onExit, because the
 		// state was already active when we saved.
 		m_currentState = internalGetState( curStateID );
 	}
@@ -865,19 +857,24 @@ void StateMachine::xfer( Xfer *xfer )
 		}
 		for( i = m_stateMap.begin(); i != m_stateMap.end(); ++i ) {
 			State *state = (*i).second;
-			StateID id = state->getID();
-			xfer->xferUnsignedInt(&id);
-			if (id!=state->getID()) {
-				DEBUG_CRASH(("State ID mismatch - %d expected, %d read", state->getID(), id));
-				throw SC_INVALID_DATA;
+			if( state != NULL )
+			{
+				StateID id = state->getID();
+				xfer->xferUnsignedInt(&id);
+				if (id!=state->getID()) {
+					DEBUG_CRASH(("State ID mismatch - %d expected, %d read", state->getID(), id));
+					throw SC_INVALID_DATA;
+				}
 			}
-			
-			if( state == NULL )
+			else
 			{
-				DEBUG_ASSERTCRASH(state != NULL, ("state was NULL on xfer, trying to heal..."));
+				DEBUG_CRASH(("state was NULL on xfer, trying to heal..."));
 				// Hmm... too late to find out why we are getting NULL in our state, but if we let it go, we will Throw in xferSnapshot.
 				state = internalGetState(m_defaultStateID);
+				StateID id = state->getID();
+				xfer->xferUnsignedInt(&id);
 			}
+
 			xfer->xferSnapshot(state);
 		}
 
@@ -896,7 +893,7 @@ void StateMachine::xfer( Xfer *xfer )
 	xfer->xferCoord3D(&m_goalPosition);
 	xfer->xferBool(&m_locked);
 	xfer->xferBool(&m_defaultStateInited);
-}  // end xfer
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -905,5 +902,5 @@ void StateMachine::xfer( Xfer *xfer )
 void StateMachine::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp b/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp
index 646e5b30a15..4289f2b2013 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp
@@ -24,12 +24,12 @@
 
 // FILE: StatsCollector.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,7 +37,7 @@
 //	Filename: 	StatsCollector.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Convinience class to gather player stats
 //
 //-----------------------------------------------------------------------------
@@ -46,7 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -76,13 +76,9 @@ static char statsDir[255] = "Stats\\";
 //=============================================================================
 StatsCollector::StatsCollector( void )
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_isScrolling = FALSE;
 	m_scrollBeginTime = 0;
 	m_scrollTime = 0;
-
-	//
 	m_timeCount = 0;
 	m_buildCommands = 0;
 	m_moveCommands = 0;
@@ -90,16 +86,14 @@ StatsCollector::StatsCollector( void )
 	m_scrollMapCommands = 0;
 	m_AIUnits = 0;
 	m_playerUnits = 0;
-	
 	m_lastUpdate = 0;
 	m_startFrame = TheGameLogic->getFrame();
-
 }
 //Destructor
 //=============================================================================
 StatsCollector::~StatsCollector( void )
 {
-	
+
 }
 
 // Reset and create the file header
@@ -108,7 +102,7 @@ void StatsCollector::reset( void )
 {
 
 	// make sure we have a stats Dir.
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_saveStats)
 	{
 		AsciiString playtestDir = TheGlobalData->m_baseStatsDir;
@@ -125,12 +119,12 @@ void StatsCollector::reset( void )
 	TheFileSystem->createDirectory(AsciiString(statsDir));
 	createFileName();
 	writeInitialFileInfo();
-	
+
 	// zero out
 	zeroOutStats();
 
 	m_lastUpdate = TheGameLogic->getFrame(); // timeGetTime();
-}	
+}
 
 // Msgs pass through here so we can track whichever ones we want
 //=============================================================================
@@ -139,8 +133,8 @@ void StatsCollector::collectMsgStats( const GameMessage *msg )
 	// We only care about our own messages.
 	if(ThePlayerList->getLocalPlayer()->getPlayerIndex() != msg->getPlayerIndex())
 		return;
-	
-	switch (msg->getType()) 
+
+	switch (msg->getType())
 	{
 		case GameMessage::MSG_QUEUE_UNIT_CREATE:
 		case GameMessage::MSG_DOZER_CONSTRUCT:
@@ -157,18 +151,18 @@ void StatsCollector::collectMsgStats( const GameMessage *msg )
 //=============================================================================
 void StatsCollector::collectUnitCountStats( void )
 {
-	
+
 	for(Object *obj =	TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject())
 	{
-		
+
 		if((!(obj->isKindOf(KINDOF_INFANTRY) || obj->isKindOf(KINDOF_VEHICLE))) || ( obj->isNeutralControlled()) ||(obj->getControllingPlayer()->getSide().compare("Civilian") == 0))
 			continue;
-		
+
 		if(obj->getControllingPlayer()->isLocalPlayer())
 		{
 			++m_playerUnits;
 		}
-		else 
+		else
 		{
 			++m_AIUnits;
 		}
@@ -197,7 +191,7 @@ void StatsCollector::update( void )
 	zeroOutStats();
 
 	m_lastUpdate = TheGameLogic->getFrame(); //timeGetTime();
-	
+
 }
 
 void StatsCollector::incrementScrollMoveCount( void )
@@ -228,16 +222,16 @@ void StatsCollector::writeFileEnd( void )
 		DEBUG_ASSERTCRASH(f, ("Unable to open file %s to write", m_statsFileName.str()));
 		return;
 	}
-	
+
 	m_timeCount += (TheGameLogic->getFrame() - m_lastUpdate) / LOGICFRAMES_PER_SECOND;
 	writeStatInfo();
 	fprintf(f, "---------------------------------------------------\n");
-	
+
 		// Time
 	struct tm *newTime;
 	time_t aclock;
   time( &aclock );
-  newTime = localtime( &aclock ); 
+  newTime = localtime( &aclock );
 	fprintf(f, "End Time:\t%s\n",asctime(newTime) );
 
 	fprintf(f, "=KEY===============================================\n");
@@ -253,8 +247,8 @@ void StatsCollector::writeFileEnd( void )
 	fprintf(f, "#AIU = # of AI's Units\n");
 	fprintf(f, "===================================================\n");
 	fprintf(f, "* Times are in Game Seconds which are based off of frames. Current fps is set to %d\n", LOGICFRAMES_PER_SECOND);
-	
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_benchmarkTimer > 0)
 	{
 		fprintf(f, "\n*** BENCHMARK MODE STATS ***\n");
@@ -279,7 +273,7 @@ void StatsCollector::endScrollTime( void )
 {
 	if(!m_isScrolling)
 		return;
-	
+
 	m_isScrolling = FALSE;
 
 	m_scrollTime += TheGameLogic->getFrame() - m_scrollBeginTime;
@@ -312,22 +306,19 @@ void StatsCollector::createFileName( void )
 	time(&longTime);
 	curtime = localtime(&longTime);
 	strftime(datestr, 256, "_%b%d_%I%M%p", curtime);
-//	const MapMetaData *m =  TheMapCache->findMap(TheGlobalData->m_mapName); 
+//	const MapMetaData *m =  TheMapCache->findMap(TheGlobalData->m_mapName);
 	AsciiString name = TheGlobalData->m_mapName;
 	const char *fname = name.reverseFind('\\');
 	if (fname)
 		name = fname+1;
-	name.removeLastChar(); // p
-	name.removeLastChar(); // a
-	name.removeLastChar(); // m
-	name.removeLastChar(); // .
+	name.truncateBy(4); // ".map"
 	m_statsFileName.clear();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_saveStats)
 	{
 		m_statsFileName.set(TheGlobalData->m_baseStatsDir);
 		m_statsFileName.concat(statsDir);
-		
+
 		if (TheNetwork)
 		{
 			if (TheLAN)
@@ -381,7 +372,7 @@ void StatsCollector::writeInitialFileInfo()
 	struct tm *newTime;
 	time_t aclock;
   time( &aclock );
-  newTime = localtime( &aclock ); 
+  newTime = localtime( &aclock );
 	fprintf(f, "Date:\t%s",asctime(newTime) );
 
 	// Map
@@ -394,8 +385,8 @@ void StatsCollector::writeInitialFileInfo()
 	fprintf(f, "Time*\tBC\tMC\tAC\tSMC\tST*\tOC\t$$$\t#PU\t#AIU\n");
 	collectUnitCountStats();
 	Money *m = ThePlayerList->getLocalPlayer()->getMoney();
-	fprintf(f, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", 0, m_buildCommands, m_moveCommands, m_attackCommands, 
-					m_scrollMapCommands, 0 ,/*other commands*/0, m->countMoney(), 
+	fprintf(f, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", 0, m_buildCommands, m_moveCommands, m_attackCommands,
+					m_scrollMapCommands, 0 ,/*other commands*/0, m->countMoney(),
 					m_playerUnits, m_AIUnits );
 	// initial stats
 	// we don't want a file pointer open for seconds on end... we'll open it each time.
@@ -414,12 +405,12 @@ void StatsCollector::writeStatInfo()
 		return;
 	}
 	Money *m = ThePlayerList->getLocalPlayer()->getMoney();
-	
-	fprintf(f, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", m_timeCount, m_buildCommands, m_moveCommands, m_attackCommands, 
-					m_scrollMapCommands, m_scrollTime / LOGICFRAMES_PER_SECOND, /*other commands*/0,m->countMoney() , 
+
+	fprintf(f, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", m_timeCount, m_buildCommands, m_moveCommands, m_attackCommands,
+					m_scrollMapCommands, m_scrollTime / LOGICFRAMES_PER_SECOND, /*other commands*/0,m->countMoney() ,
 					m_playerUnits, m_AIUnits  );
 
 
 	fclose(f);
-	
+
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/ArchiveFile.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/ArchiveFile.cpp
deleted file mode 100644
index 5e273337b30..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/ArchiveFile.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/////////ArchiveFile.cpp ///////////////////////
-// Bryan Cleveland, August 2002
-////////////////////////////////////////////////
-
-#include "PreRTS.h"
-
-#include "Common/ArchiveFile.h"
-#include "Common/ArchiveFileSystem.h"
-#include "Common/file.h"
-#include "Common/PerfTimer.h"
-
-
-// checks to see if str matches searchString.  Search string is done in the
-// using * and ? as wildcards. * is used to denote any number of characters,
-// and ? is used to denote a single wildcard character.
-static Bool SearchStringMatches(AsciiString str, AsciiString searchString) 
-{
-	if (str.getLength() == 0) {
-		if (searchString.getLength() == 0) {
-			return TRUE;
-		}
-		return FALSE;
-	}
-	if (searchString.getLength() == 0) {
-		return FALSE;
-	}
-
-	const char *c1 = str.str();
-	const char *c2 = searchString.str();
-
-	while ((*c1 == *c2) || (*c2 == '?') || (*c2 == '*')) {
-		if ((*c1 == *c2) || (*c2 == '?')) {
-			++c1;
-			++c2;
-		} else if (*c2 == '*') {
-			++c2;
-			if (*c2 == 0) {
-				return TRUE;
-			}
-			while (*c1 != 0) {
-				if (SearchStringMatches(AsciiString(c1), AsciiString(c2))) {
-					return TRUE;
-				}
-				++c1;
-			}
-		}
-		if (*c1 == 0) {
-			if (*c2 == 0) {
-				return TRUE;
-			}
-			return FALSE;
-		}
-		if (*c2 == 0) {
-			return FALSE;
-		}
-	}
-	return FALSE;
-}
-
-ArchiveFile::~ArchiveFile() 
-{
-	if (m_file != NULL) {
-		m_file->close();
-		m_file = NULL;
-	}
-}
-
-ArchiveFile::ArchiveFile() 
-{
-	m_rootDirectory.clear();
-}
-
-void ArchiveFile::addFile(const AsciiString& path, const ArchivedFileInfo *fileInfo) 
-{
-	AsciiString temp;
-	temp = path;
-	temp.toLower();
-	AsciiString token;
-	AsciiString debugpath;
-
-	DetailedArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
-
-	temp.nextToken(&token, "\\/");
-
-	while (token.getLength() > 0) {
-		if (dirInfo->m_directories.find(token) == dirInfo->m_directories.end()) 
-		{
-			dirInfo->m_directories[token].clear();
-			dirInfo->m_directories[token].m_directoryName = token;
-		}
-
-		debugpath.concat(token);
-		debugpath.concat('\\');
-		dirInfo = &(dirInfo->m_directories[token]);
-		temp.nextToken(&token, "\\/");
-	}
-
-	dirInfo->m_files[fileInfo->m_filename] = *fileInfo;
-	//path.concat(fileInfo->m_filename);
-}
-
-void ArchiveFile::getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
-{
-
-	AsciiString searchDir;
-	const DetailedArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
-
-	searchDir = originalDirectory;
-	searchDir.toLower();
-	AsciiString token;
-	
-	searchDir.nextToken(&token, "\\/");
-
-	while (token.getLength() > 0) {
-
-		DetailedArchivedDirectoryInfoMap::const_iterator it = dirInfo->m_directories.find(token);
-		if (it != dirInfo->m_directories.end())
-		{
-			dirInfo = &it->second;
-		}
-		else
-		{
-			// if the directory doesn't exist, then there aren't any files to be had.
-			return;
-		}
-
-		searchDir.nextToken(&token, "\\/");
-	}
-
-	getFileListInDirectory(dirInfo, originalDirectory, searchName, filenameList, searchSubdirectories);
-}
-
-void ArchiveFile::getFileListInDirectory(const DetailedArchivedDirectoryInfo *dirInfo, const AsciiString& currentDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
-{
-	DetailedArchivedDirectoryInfoMap::const_iterator diriter = dirInfo->m_directories.begin();
-	while (diriter != dirInfo->m_directories.end()) {
-		const DetailedArchivedDirectoryInfo *tempDirInfo = &(diriter->second);
-		AsciiString tempdirname;
-		tempdirname = currentDirectory;
-		if ((tempdirname.getLength() > 0) && (!tempdirname.endsWith("\\"))) {
-			tempdirname.concat('\\');
-		}
-		tempdirname.concat(tempDirInfo->m_directoryName);
-		getFileListInDirectory(tempDirInfo, tempdirname, searchName, filenameList, searchSubdirectories);
-		diriter++;
-	}
-
-	ArchivedFileInfoMap::const_iterator fileiter = dirInfo->m_files.begin();
-	while (fileiter != dirInfo->m_files.end()) {
-		if (SearchStringMatches(fileiter->second.m_filename, searchName)) {
-			AsciiString tempfilename;
-			tempfilename = currentDirectory;
-			if ((tempfilename.getLength() > 0) && (!tempfilename.endsWith("\\"))) {
-				tempfilename.concat('\\');
-			}
-			tempfilename.concat(fileiter->second.m_filename);
-			if (filenameList.find(tempfilename) == filenameList.end()) {
-				// only insert into the list if its not already in there.
-				filenameList.insert(tempfilename);
-			}
-		}
-		fileiter++;
-	}
-}
-
-void ArchiveFile::attachFile(File *file) 
-{
-	if (m_file != NULL) {
-		m_file->close();
-		m_file = NULL;
-	}
-	m_file = file;
-}
-
-const ArchivedFileInfo * ArchiveFile::getArchivedFileInfo(const AsciiString& filename) const
-{
-	AsciiString path;
-	path = filename;
-	path.toLower();
-	AsciiString token;
-
-	const DetailedArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
-
-	path.nextToken(&token, "\\/");
-
-	while ((token.find('.') == NULL) || (path.find('.') != NULL)) {
-
-		DetailedArchivedDirectoryInfoMap::const_iterator it = dirInfo->m_directories.find(token);
-		if (it != dirInfo->m_directories.end())
-		{
-			dirInfo = &it->second; 
-		}
-		else
-		{
-			return NULL;
-		}
-
-		path.nextToken(&token, "\\/");
-	}
-
-	ArchivedFileInfoMap::const_iterator it = dirInfo->m_files.find(token);
-	if (it != dirInfo->m_files.end())
-	{
-		return &it->second;
-	}
-	else
-	{
-		return NULL;
-	}
-
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
deleted file mode 100644
index c0513d63708..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/ArchiveFileSystem.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    Game Engine Common
-//
-// File name: ArchiveFileSystem.cpp
-//
-// Created:   11/26/01 TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-#include "Common/ArchiveFile.h"
-#include "Common/ArchiveFileSystem.h"
-#include "Common/AsciiString.h"
-#include "Common/PerfTimer.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-ArchiveFileSystem *TheArchiveFileSystem = NULL;
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-//------------------------------------------------------
-// ArchivedFileInfo
-//------------------------------------------------------
-ArchiveFileSystem::ArchiveFileSystem() 
-{
-}
-
-ArchiveFileSystem::~ArchiveFileSystem() 
-{
-	ArchiveFileMap::iterator iter = m_archiveFileMap.begin();
-	while (iter != m_archiveFileMap.end()) {
-		ArchiveFile *file = iter->second;
-		if (file != NULL) {
-			delete file;
-			file = NULL;
-		}
-		iter++;
-	}
-}
-
-void ArchiveFileSystem::loadIntoDirectoryTree(const ArchiveFile *archiveFile, const AsciiString& archiveFilename, Bool overwrite)
-{
-
-	FilenameList filenameList;
-
-	archiveFile->getFileListInDirectory(AsciiString(""), AsciiString(""), AsciiString("*"), filenameList, TRUE);
-
-	FilenameListIter it = filenameList.begin();
-
-	while (it != filenameList.end()) {
-		// add this filename to the directory tree.
-		AsciiString path = *it;
-		path.toLower();
-		AsciiString token;
-		AsciiString debugpath;
-
-		ArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
-
-		Bool infoInPath;
-		infoInPath = path.nextToken(&token, "\\/");
-
-		while (infoInPath && (!token.find('.') || path.find('.'))) {
-			ArchivedDirectoryInfoMap::iterator tempiter = dirInfo->m_directories.find(token);
-			if (tempiter == dirInfo->m_directories.end()) 
-			{
-				dirInfo->m_directories[token].clear();
-				dirInfo->m_directories[token].m_directoryName = token;
-			}
-
-			dirInfo = &(dirInfo->m_directories[token]);
-			debugpath.concat(token);
-			debugpath.concat('\\');
-			infoInPath = path.nextToken(&token, "\\/");
-		}
-
-		// token is the filename, and dirInfo is the directory that this file is in.
-		if (dirInfo->m_files.find(token) == dirInfo->m_files.end() || overwrite) {
-			AsciiString path2;
-			path2 = debugpath;
-			path2.concat(token);
-//			DEBUG_LOG(("ArchiveFileSystem::loadIntoDirectoryTree - adding file %s, archived in %s\n", path2.str(), archiveFilename.str()));
-			dirInfo->m_files[token] = archiveFilename;
-		}
-
-		it++;
-	}
-}
-
-void ArchiveFileSystem::loadMods() {
-	if (TheGlobalData->m_modBIG.isNotEmpty())
-	{
-		ArchiveFile *archiveFile = openArchiveFile(TheGlobalData->m_modBIG.str());
-
-		if (archiveFile != NULL) {
-			DEBUG_LOG(("ArchiveFileSystem::loadMods - loading %s into the directory tree.\n", TheGlobalData->m_modBIG.str()));
-			loadIntoDirectoryTree(archiveFile, TheGlobalData->m_modBIG, TRUE);
-			m_archiveFileMap[TheGlobalData->m_modBIG] = archiveFile;
-			DEBUG_LOG(("ArchiveFileSystem::loadMods - %s inserted into the archive file map.\n", TheGlobalData->m_modBIG.str()));
-		}
-		else
-		{
-			DEBUG_LOG(("ArchiveFileSystem::loadMods - could not openArchiveFile(%s)\n", TheGlobalData->m_modBIG.str()));
-		}
-	}
-
-	if (TheGlobalData->m_modDir.isNotEmpty())
-	{
-#ifdef DEBUG_LOGGING
-		Bool ret =
-#endif
-		loadBigFilesFromDirectory(TheGlobalData->m_modDir, "*.big", TRUE);
-		DEBUG_ASSERTLOG(ret, ("loadBigFilesFromDirectory(%s) returned FALSE!\n", TheGlobalData->m_modDir.str()));
-	}
-}
-
-Bool ArchiveFileSystem::doesFileExist(const Char *filename) const
-{
-	AsciiString path = filename;
-	path.toLower();
-	AsciiString token;
-
-	const ArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
-
-	path.nextToken(&token, "\\/");
-
-	while (!token.find('.') || path.find('.')) 
-	{
-		ArchivedDirectoryInfoMap::const_iterator tempiter = dirInfo->m_directories.find(token);
-		if (tempiter != dirInfo->m_directories.end()) 
-		{
-			dirInfo = &tempiter->second;
-			path.nextToken(&token, "\\/");
-		}
-		else
-		{
-			// the directory doesn't exist, so return false
-			return FALSE;
-		}
-	}
-
-	// token is the filename, and dirInfo is the directory that this file is in.
-	if (dirInfo->m_files.find(token) == dirInfo->m_files.end()) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-File * ArchiveFileSystem::openFile(const Char *filename, Int access /* = 0 */) 
-{
-	AsciiString archiveFilename;
-	archiveFilename = getArchiveFilenameForFile(AsciiString(filename));
-
-	if (archiveFilename.getLength() == 0) {
-		return NULL;
-	}
-
-	return m_archiveFileMap[archiveFilename]->openFile(filename, access);
-}
-
-Bool ArchiveFileSystem::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
-{
-	if (fileInfo == NULL) {
-		return FALSE;
-	}
-
-	if (filename.getLength() <= 0) {
-		return FALSE;
-	}
-
-	AsciiString archiveFilename = getArchiveFilenameForFile(filename);
-	ArchiveFileMap::const_iterator it = m_archiveFileMap.find(archiveFilename);
-	if (it != m_archiveFileMap.end())
-	{
-		return it->second->getFileInfo(filename, fileInfo);
-	}
-	else
-	{
-		return FALSE;
-	}
-}
-
-AsciiString ArchiveFileSystem::getArchiveFilenameForFile(const AsciiString& filename) const
-{
-	AsciiString path;
-	path = filename;
-	path.toLower();
-	AsciiString token;
-	AsciiString debugpath;
-
-	const ArchivedDirectoryInfo *dirInfo = &m_rootDirectory;
-
-	path.nextToken(&token, "\\/");
-
-	while (!token.find('.') || path.find('.')) {
-
-		ArchivedDirectoryInfoMap::const_iterator it = dirInfo->m_directories.find(token);
-		if (it != dirInfo->m_directories.end())
-		{
-			dirInfo = &it->second;
-		}
-		else
-		{
-			// the directory doesn't exist, so return NULL
-
-			// dump the directories;
-			//DEBUG_LOG(("directory %s not found in %s in archive file system\n", token.str(), debugpath.str()));
-			//DEBUG_LOG(("directories in %s in archive file system are:\n", debugpath.str()));
-			//ArchivedDirectoryInfoMap::const_iterator it = dirInfo->m_directories.begin();
-			//while (it != dirInfo->m_directories.end()) {
-			//	DEBUG_LOG(("\t%s\n", it->second.m_directoryName.str()));
-			//	it++;
-			//}
-			//DEBUG_LOG(("end of directory list.\n"));
-			return AsciiString::TheEmptyString;
-		}
-
-		debugpath.concat(token);
-		debugpath.concat('\\');
-
-		path.nextToken(&token, "\\/");
-	}
-
-	ArchivedFileLocationMap::const_iterator it = dirInfo->m_files.find(token);
-	if (it != dirInfo->m_files.end())
-	{
-		return it->second;
-	}
-	else
-	{
-		return AsciiString::TheEmptyString;
-	}
-
-}
-
-void ArchiveFileSystem::getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
-{
-	ArchiveFileMap::const_iterator it = m_archiveFileMap.begin();
-	while (it != m_archiveFileMap.end()) {
-		it->second->getFileListInDirectory(currentDirectory, originalDirectory, searchName, filenameList, searchSubdirectories);
-		it++;
-	}
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/AsciiString.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/AsciiString.cpp
deleted file mode 100644
index a872591bb7c..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/AsciiString.cpp
+++ /dev/null
@@ -1,483 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: AsciiString.cpp 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  AsciiString.cpp
-//
-// Created:    Steven Johnson, October 2001
-//
-// Desc:       General-purpose string classes
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/CriticalSection.h"
-
-
-// -----------------------------------------------------
-
-/*static*/ AsciiString AsciiString::TheEmptyString;
-
-//-----------------------------------------------------------------------------
-inline char* skipSeps(char* p, const char* seps)
-{
-	while (*p && strchr(seps, *p) != NULL)
-		++p;
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-inline char* skipNonSeps(char* p, const char* seps)
-{
-	while (*p && strchr(seps, *p) == NULL)
-		++p;
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-inline char* skipWhitespace(char* p)
-{
-	while (*p && isspace(*p))
-		++p;
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-inline char* skipNonWhitespace(char* p)
-{
-	while (*p && !isspace(*p))
-		++p;
-	return p;
-}
-
-// -----------------------------------------------------
-AsciiString::AsciiString(const AsciiString& stringSrc) : m_data(stringSrc.m_data)
-{
-	ScopedCriticalSection scopedCriticalSection(TheAsciiStringCriticalSection);
-	if (m_data)
-		++m_data->m_refCount;
-	validate();
-}
-
-// -----------------------------------------------------
-#ifdef RTS_DEBUG
-void AsciiString::validate() const
-{
-	if (!m_data) return;
-	DEBUG_ASSERTCRASH(m_data->m_refCount > 0, ("m_refCount is zero"));
-	DEBUG_ASSERTCRASH(m_data->m_refCount < 32000, ("m_refCount is suspiciously large"));
-	DEBUG_ASSERTCRASH(m_data->m_numCharsAllocated > 0, ("m_numCharsAllocated is zero"));
-//	DEBUG_ASSERTCRASH(m_data->m_numCharsAllocated < 1024, ("m_numCharsAllocated suspiciously large"));
-	DEBUG_ASSERTCRASH(strlen(m_data->peek())+1 <= m_data->m_numCharsAllocated,("str is too long (%d) for storage",strlen(m_data->peek())+1));
-}
-#endif
-
-// -----------------------------------------------------
-void AsciiString::debugIgnoreLeaks()
-{
-#ifdef MEMORYPOOL_DEBUG
-	if (m_data)
-	{
-		TheDynamicMemoryAllocator->debugIgnoreLeaksForThisBlock(m_data);
-	}
-	else
-	{
-		DEBUG_LOG(("cannot ignore the leak (no data)\n"));
-	}
-#endif
-}
-
-// -----------------------------------------------------
-void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData, const char* strToCopy, const char* strToCat)
-{
-	validate();
-
-	if (m_data &&
-			m_data->m_refCount == 1 &&
-			m_data->m_numCharsAllocated >= numCharsNeeded)
-	{
-		// no buffer manhandling is needed (it's already large enough, and unique to us)
-		if (strToCopy)
-			// TheSuperHackers @fix Mauller 04/04/2025 Replace strcpy with safer memmove as memory regions can overlap when part of string is copied to itself
-			memmove(m_data->peek(), strToCopy, strlen(strToCopy) + 1);
-		if (strToCat)
-			strcat(m_data->peek(), strToCat);
-		return;
-	}
-
-	DEBUG_ASSERTCRASH(numCharsNeeded <= MAX_LEN, ("AsciiString::ensureUniqueBufferOfSize exceeds max string length %d with requested length %d", MAX_LEN, numCharsNeeded));
-	int minBytes = sizeof(AsciiStringData) + numCharsNeeded*sizeof(char);
-	int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
-	AsciiStringData* newData = (AsciiStringData*)TheDynamicMemoryAllocator->allocateBytesDoNotZero(actualBytes, "STR_AsciiString::ensureUniqueBufferOfSize");
-	newData->m_refCount = 1;
-	newData->m_numCharsAllocated = (actualBytes - sizeof(AsciiStringData))/sizeof(char);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	newData->m_debugptr = newData->peek();	// just makes it easier to read in the debugger
-#endif
-
-	if (m_data && preserveData)
-		strcpy(newData->peek(), m_data->peek());
-	else
-		newData->peek()[0] = 0;
-
-	// do these BEFORE releasing the old buffer, so that self-copies
-	// or self-cats will work correctly.
-	if (strToCopy)
-		strcpy(newData->peek(), strToCopy);
-	if (strToCat)
-		strcat(newData->peek(), strToCat);
-
-	releaseBuffer();
-	m_data = newData;
-
-	validate();
-}
-
-
-// -----------------------------------------------------
-void AsciiString::releaseBuffer()
-{
-	ScopedCriticalSection scopedCriticalSection(TheAsciiStringCriticalSection);
-
-	validate();
-	if (m_data)
-	{
-		if (--m_data->m_refCount == 0)
-		{
-			TheDynamicMemoryAllocator->freeBytes(m_data);
-		}
-		m_data = 0;
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-AsciiString::AsciiString(const char* s) : m_data(0)
-{
-	//DEBUG_ASSERTCRASH(isMemoryManagerOfficiallyInited(), ("Initializing AsciiStrings prior to main (ie, as static vars) can cause memory leak reporting problems. Are you sure you want to do this?\n"));
-	int len = (s)?strlen(s):0;
-	if (len)
-	{
-		ensureUniqueBufferOfSize(len + 1, false, s, NULL);
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::set(const AsciiString& stringSrc)
-{
-	ScopedCriticalSection scopedCriticalSection(TheAsciiStringCriticalSection);
-
-	validate();
-	if (&stringSrc != this)
-	{
-		releaseBuffer();
-		m_data = stringSrc.m_data;
-		if (m_data)
-			++m_data->m_refCount;
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::set(const char* s)
-{
-	validate();
-	if (!m_data || s != peek())
-	{
-		int len = s ? strlen(s) : 0;
-		if (len)
-		{
-			ensureUniqueBufferOfSize(len + 1, false, s, NULL);
-		}
-		else
-		{
-			releaseBuffer();
-		}
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-char*  AsciiString::getBufferForRead(Int len)
-{
-	validate();
-	DEBUG_ASSERTCRASH(len>0, ("No need to allocate 0 len strings."));
-	ensureUniqueBufferOfSize(len + 1, false, NULL, NULL);
-	validate();
-	return peek();
-}
-
-// -----------------------------------------------------
-void AsciiString::translate(const UnicodeString& stringSrc)
-{
-	validate();
-	/// @todo srj put in a real translation here; this will only work for 7-bit ascii
-	clear();
-	Int len = stringSrc.getLength();
-	for (Int i = 0; i < len; i++)
-		concat((char)stringSrc.getCharAt(i));
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::concat(const char* s)
-{
-	validate();
-	int addlen = strlen(s);
-	if (addlen == 0)
-		return;	// my, that was easy
-
-	if (m_data)
-	{
-		ensureUniqueBufferOfSize(getLength() + addlen + 1, true, NULL, s);
-	}
-	else
-	{
-		set(s);
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::trim()
-{
-	validate();
-
-	if (m_data)
-	{
-		char *c = peek();
-
-		//	Strip leading white space from the string.
-		c = skipWhitespace(c);
-		if (c != peek())
-		{
-			set(c);
-		}
-
-		if (m_data) // another check, because the previous set() could erase m_data
-		{
-			//	Clip trailing white space from the string.
-			int len = strlen(peek());
-			for (int index = len-1; index >= 0; index--)
-			{
-				if (isspace(getCharAt(index)))
-				{
-					removeLastChar();
-				}
-				else
-				{
-					break;
-				}
-			}
-		}
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::toLower()
-{
-	validate();
-	if (m_data)
-	{
-		char buf[MAX_FORMAT_BUF_LEN];
-		strcpy(buf, peek());
-
-		char *c = buf;
-		while (c && *c)
-		{
-			*c = tolower(*c);
-			c++;
-		}
-		set(buf);
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::removeLastChar()
-{
-	validate();
-	if (m_data)
-	{
-		int len = strlen(peek());
-		if (len > 0)
-		{
-			ensureUniqueBufferOfSize(len+1, true, NULL, NULL);
-			peek()[len - 1] = 0;
-		}
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::format(AsciiString format, ...)
-{
-	validate();
-	va_list args;
-  va_start(args, format);
-	format_va(format, args);
-  va_end(args);
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::format(const char* format, ...)
-{
-	validate();
-	va_list args;
-  va_start(args, format);
-	format_va(format, args);
-  va_end(args);
-	validate();
-}
-
-// -----------------------------------------------------
-void AsciiString::format_va(const AsciiString& format, va_list args)
-{
-	format_va(format.str(), args);
-}
-
-// -----------------------------------------------------
-void AsciiString::format_va(const char* format, va_list args)
-{
-	validate();
-	char buf[MAX_FORMAT_BUF_LEN];
-	const int result = vsnprintf(buf, sizeof(buf)/sizeof(char), format, args);
-	if (result >= 0)
-	{
-		set(buf);
-		validate();
-	}
-	else
-	{
-		DEBUG_CRASH(("AsciiString::format_va failed with code:%d format:\"%s\"", result, format));
-	}
-}
-
-// -----------------------------------------------------
-Bool AsciiString::startsWith(const char* p) const
-{
-	if (*p == 0)
-		return true;	// everything starts with the empty string
-
-	int lenThis = getLength();
-	int lenThat = strlen(p);
-	if (lenThis < lenThat)
-		return false;	// that must be smaller than this
-
-	return strncmp(peek(), p, lenThat) == 0;
-}
-
-// -----------------------------------------------------
-Bool AsciiString::startsWithNoCase(const char* p) const
-{
-	if (*p == 0)
-		return true;	// everything starts with the empty string
-
-	int lenThis = getLength();
-	int lenThat = strlen(p);
-	if (lenThis < lenThat)
-		return false;	// that must be smaller than this
-
-	return strnicmp(peek(), p, lenThat) == 0;
-}
-
-// -----------------------------------------------------
-Bool AsciiString::endsWith(const char* p) const
-{
-	if (*p == 0)
-		return true;	// everything ends with the empty string
-
-	int lenThis = getLength();
-	int lenThat = strlen(p);
-	if (lenThis < lenThat)
-		return false;	// that must be smaller than this
-
-	return strncmp(peek() + lenThis - lenThat, p, lenThat) == 0;
-}
-
-// -----------------------------------------------------
-Bool AsciiString::endsWithNoCase(const char* p) const
-{
-	if (*p == 0)
-		return true;	// everything ends with the empty string
-
-	int lenThis = getLength();
-	int lenThat = strlen(p);
-	if (lenThis < lenThat)
-		return false;	// that must be smaller than this
-
-	return strnicmp(peek() + lenThis - lenThat, p, lenThat) == 0;
-}
-
-//-----------------------------------------------------------------------------
-Bool AsciiString::isNone() const
-{
-	return m_data && stricmp(peek(), "None") == 0;
-}
-
-//-----------------------------------------------------------------------------
-Bool AsciiString::nextToken(AsciiString* tok, const char* seps)
-{
-	if (this->isEmpty() || tok == this)
-		return false;
-
-	if (seps == NULL)
-		seps = " \n\r\t";
-
-	char* start = skipSeps(peek(), seps);
-	char* end = skipNonSeps(start, seps);
-
-	if (end > start)
-	{
-		Int len = end - start;
-		char* tmp = tok->getBufferForRead(len + 1);
-		memcpy(tmp, start, len);
-		tmp[len] = 0;
-
-		this->set(end);
-
-		return true;
-	}
-	else
-	{
-		this->clear();
-		tok->clear();
-		return false;
-	}
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp
index 03a13937e27..b3e11d5f10e 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp
@@ -25,11 +25,11 @@
 // FILE: BuildAssistant.cpp ///////////////////////////////////////////////////////////////////////
 // Author: Colin Day, February 2002
 // Desc:   Singleton class to encapsulate some of the more common functions or rules
-//				 that apply to building structures and units 
+//				 that apply to building structures and units
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BuildAssistant.h"
 #include "Common/GlobalData.h"
@@ -53,17 +53,11 @@
 #include "GameLogic/Module/ContainModule.h"
 #include "GameLogic/Module/CreateModule.h"
 #include "GameLogic/Module/ProductionUpdate.h"
-#include "GameLogic/Module/ContainModule.h"
 #include "GameLogic/Module/ParkingPlaceBehavior.h"
 
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 BuildAssistant *TheBuildAssistant = NULL;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -74,17 +68,17 @@ BuildAssistant *TheBuildAssistant = NULL;
 ObjectSellInfo::ObjectSellInfo( void )
 {
 
-	m_id = INVALID_ID; 
+	m_id = INVALID_ID;
 	m_sellFrame = 0;
-	
-}  // end ObjectSellInfo
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 ObjectSellInfo::~ObjectSellInfo( void )
 {
 
-}  // end ~ObjectSellInfo
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -104,7 +98,7 @@ static Bool isDozer( Object *obj )
 
 	return FALSE;
 
-}  // end isDozer
+}
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 
@@ -116,24 +110,18 @@ BuildAssistant::BuildAssistant( void )
 	m_buildPositions = NULL;
 	m_buildPositionSize = 0;
 	m_sellList.clear();
-}  // end BuildAssistant
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 BuildAssistant::~BuildAssistant( void )
 {
 
-	// delete build position array if we used it
-	if( m_buildPositions )
-	{
-		
-		delete [] m_buildPositions;
-		m_buildPositions = NULL;
-		m_buildPositionSize = 0;
-
-	}  // end if
+	delete [] m_buildPositions;
+	m_buildPositions = NULL;
+	m_buildPositionSize = 0;
 
-}  // end ~BuildAssistant
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -147,7 +135,7 @@ void BuildAssistant::init( void )
 	m_buildPositionSize = TheGlobalData->m_maxLineBuildObjects;
 	m_buildPositions = NEW Coord3D[ m_buildPositionSize ];
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -166,12 +154,12 @@ void BuildAssistant::reset( void )
 		// delete our data and erase this entry from the list
 		deleteInstance(sellInfo);
 
-	}  // end for
+	}
 
 	// clear the sell list
 	m_sellList.clear();
 
-}  // end reset
+}
 
 static const Real FRAMES_TO_ALLOW_SCAFFOLD = LOGICFRAMES_PER_SECOND * 1.5f;
 static const Real TOTAL_FRAMES_TO_SELL_OBJECT = LOGICFRAMES_PER_SECOND * 3.0f;
@@ -205,11 +193,11 @@ void BuildAssistant::update( void )
 		if( obj == NULL )
 		{
 
-			deleteInstance(sellInfo);			
-			m_sellList.erase( thisIterator );		
+			deleteInstance(sellInfo);
+			m_sellList.erase( thisIterator );
 			continue;
 
-		}  // end if
+		}
 
 		// decrement the construction percent
 		if( TheGameLogic->getFrame() - sellInfo->m_sellFrame >= FRAMES_TO_ALLOW_SCAFFOLD )
@@ -226,7 +214,7 @@ void BuildAssistant::update( void )
 			if( previousConstructionPercent > 0.0f && obj->getConstructionPercent() <= 0.0f )
 			{
 
-				obj->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK2( MODELCONDITION_PARTIALLY_CONSTRUCTED, 
+				obj->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK2( MODELCONDITION_PARTIALLY_CONSTRUCTED,
 																																				MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED ),
 																						 MAKE_MODELCONDITION_MASK( MODELCONDITION_SOLD ) );
 
@@ -238,9 +226,9 @@ void BuildAssistant::update( void )
 				if( draw )
 					draw->setAnimationLoopDuration( TOTAL_FRAMES_TO_SELL_OBJECT / 2 );
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
 		//
 		// after we've reached zero ... the object has "sunk" back down into the ground ... but
@@ -258,14 +246,14 @@ void BuildAssistant::update( void )
 				if( obj->getTemplate()->getRefundValue() != 0 )
 					sellValue = obj->getTemplate()->getRefundValue();
 				else
-					sellValue = REAL_TO_UNSIGNEDINT( obj->getTemplate()->calcCostToBuild( player ) * 
+					sellValue = REAL_TO_UNSIGNEDINT( obj->getTemplate()->calcCostToBuild( player ) *
 																										 TheGlobalData->m_sellPercentage );
 
-				player->getMoney()->deposit( sellValue );
+				player->getMoney()->deposit( sellValue, TRUE, FALSE );
 				// this money shouldn't be scored since it wasn't really "earned."
 //				player->getScoreKeeper()->addMoneyEarned( sellValue );
 
-			}  // end if
+			}
 
 			// cancel any of the production items and refund to the controlling player
 			ProductionUpdateInterface *pui = obj->getProductionUpdateInterface();
@@ -284,11 +272,11 @@ void BuildAssistant::update( void )
 			deleteInstance(sellInfo);
 			m_sellList.erase( thisIterator );
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
-}  // end update
+}
 //-------------------------------------------------------------------------------------------------
 /** Xfer the sell list. */
 //-------------------------------------------------------------------------------------------------
@@ -325,12 +313,12 @@ void BuildAssistant::xferTheSellList( Xfer *xfer )
 		DEBUG_ASSERTCRASH(count==0, ("Inconsistent list size counts."));
 	}
 
-}  // end xferTheSellList
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Nice little method to wrap up creating an object from a build */
 //-------------------------------------------------------------------------------------------------
-Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTemplate *what, 
+Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTemplate *what,
 																			  const Coord3D *pos, Real angle, Player *owningPlayer )
 {
 
@@ -347,8 +335,8 @@ Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTe
 		DEBUG_ASSERTCRASH( constructorObject->getControllingPlayer() == owningPlayer,
 											 ("buildObjectNow: Constructor object player is not the same as the controlling player passed in\n") );
 
-	}  // end if
-	
+	}
+
 	// Need to validate that we can make this in case someone fakes their CommandSet
 	// A NULL constructor Object means a script built building so let it slide.
 	if( (constructorObject != NULL) && !isPossibleToMakeUnit(constructorObject, what) )
@@ -359,7 +347,7 @@ Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTe
 
 	if ( moveObjectsForConstruction( what, pos, angle, owningPlayer ) == FALSE )
 	{
-		// totally bogus. We tried to move our units out of the way, but they wouldn't. 
+		// totally bogus. We tried to move our units out of the way, but they wouldn't.
 		// Chode-boys.
 		if (owningPlayer->getPlayerType()==PLAYER_HUMAN) {
 			return NULL;	// ai gets to cheat.  jba.
@@ -378,7 +366,7 @@ Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTe
 		}
 		return NULL;
 
-	}  // end else if
+	}
 	else
 	{
 
@@ -414,7 +402,7 @@ Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTe
 			owningPlayer->onStructureCreated( constructorObject, obj );
 			owningPlayer->onStructureConstructionComplete( constructorObject, obj, FALSE );
 
-		}  // end if
+		}
 		else
 		{
 			owningPlayer->onUnitCreated( constructorObject, obj );
@@ -435,17 +423,17 @@ Object *BuildAssistant::buildObjectNow( Object *constructorObject, const ThingTe
 
 			create->onBuildComplete();
 		}
-		
+
 		// Creation is another valid and essential time to call this. This building now Looks.
 		obj->handlePartitionCellMaintenance();
 
 		return obj;
 
-	}  // end else
+	}
 
   return NULL;
 
-}  // end buildObjectNow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This method will create a line of objects end to end along the line defined in 3D
@@ -463,19 +451,19 @@ void BuildAssistant::buildObjectLineNow( Object *constructorObject, const ThingT
 
 	// how big are each of our objects
 	Real objectSize = what->getTemplateGeometryInfo().getMajorRadius() * 2.0f;
-	
+
 	// what is our max tiling length we can make
 	Int maxObjects = TheGlobalData->m_maxLineBuildObjects;
 
 	// build an array of locations that we want to build from start to end
-	tileBuildInfo = buildTiledLocations( what, angle, start, end, 
+	tileBuildInfo = buildTiledLocations( what, angle, start, end,
 																			 objectSize, maxObjects, constructorObject );
 
 	// create an object at each position
 	for( Int i = 0; i < tileBuildInfo->tilesUsed; i++ )
 		buildObjectNow( constructorObject, what, &tileBuildInfo->positions[ i ], angle, owningPlayer );
 
-}  // end buildObjectLineNow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This structure is passed along to the checkSampleBuildLocation while iterating the
@@ -507,11 +495,11 @@ static void checkSampleBuildLocation( const Coord3D *samplePoint, void *userData
 		if( terrain->getRestrictConstruction() )
 			sampleData->terrainRestricted = TRUE;
 
-	}  // end if
+	}
 
 	Int cellX = REAL_TO_INT_FLOOR( samplePoint->x / PATHFIND_CELL_SIZE );
 	Int cellY = REAL_TO_INT_FLOOR( samplePoint->y / PATHFIND_CELL_SIZE );
-	
+
 	PathfindCell* cell = TheAI->pathfinder()->getCell( LAYER_GROUND, cellX, cellY );
 	if (!cell) {
 		sampleData->terrainRestricted = TRUE;
@@ -544,7 +532,7 @@ static void checkSampleBuildLocation( const Coord3D *samplePoint, void *userData
 		}
 	}
 
-}  // end checkSampleBuildLocation
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This function will call the user callback at each "sample point" across the footprint
@@ -575,7 +563,7 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 	transform.Rotate_Z( buildOrientation );
 
 	// get the bounding footprint rectangle for the geometry we're looking at
-	Real halfFootprintHeight, 
+	Real halfFootprintHeight,
 			 halfFootprintWidth;
 	if( build->getTemplateGeometryInfo().getGeomType() == GEOMETRY_BOX )
 	{
@@ -583,7 +571,7 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 		halfFootprintHeight = build->getTemplateGeometryInfo().getMinorRadius();
 		halfFootprintWidth = build->getTemplateGeometryInfo().getMajorRadius();
 
-	}  // end if
+	}
 	else if( build->getTemplateGeometryInfo().getGeomType() == GEOMETRY_SPHERE ||
 					 build->getTemplateGeometryInfo().getGeomType() == GEOMETRY_CYLINDER )
 	{
@@ -591,15 +579,15 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 		halfFootprintHeight = build->getTemplateGeometryInfo().getBoundingCircleRadius();
 		halfFootprintWidth = build->getTemplateGeometryInfo().getBoundingCircleRadius();
 
-	}  // end else if
+	}
 	else
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("iterateFootprint: Undefined geometry '%d' for '%s'\n",
+		DEBUG_ASSERTCRASH( 0, ("iterateFootprint: Undefined geometry '%d' for '%s'",
 											     build->getTemplateGeometryInfo().getGeomType(), build->getName().str()) );
 		return;
 
-	}  // end else
+	}
 
 	//
 	// start at a corner of the extent ... box geometries have a major radius down
@@ -611,8 +599,8 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 	//
 	Real x, y;
 	Vector3 v;
-	for( y = -halfFootprintHeight; 
-			 y < halfFootprintHeight + sampleResolution; 
+	for( y = -halfFootprintHeight;
+			 y < halfFootprintHeight + sampleResolution;
 			 y += sampleResolution )
 	{
 
@@ -620,8 +608,8 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 		if( y > halfFootprintHeight )
 			y = halfFootprintHeight;
 
-		for( x = -halfFootprintWidth; 
-				 x < halfFootprintWidth + sampleResolution; 
+		for( x = -halfFootprintWidth;
+				 x < halfFootprintWidth + sampleResolution;
 				 x += sampleResolution )
 		{
 
@@ -634,7 +622,7 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 			transform.Transform_Vector( transform, v, &v );
 
 			// for circular geometries we must actually be within the circle
-			if( build->getTemplateGeometryInfo().getGeomType() == GEOMETRY_SPHERE || 
+			if( build->getTemplateGeometryInfo().getGeomType() == GEOMETRY_SPHERE ||
 					build->getTemplateGeometryInfo().getGeomType() == GEOMETRY_CYLINDER )
 			{
 				Coord2D vector;
@@ -644,8 +632,8 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 				if( vector.length() > halfFootprintWidth )  // could be height too, radius is all the same for circles
 					continue;  // ignore this point
 
-			}  // end if
-		
+			}
+
 			// call the user callback
 			Coord3D pos;
 			pos.x = v.X;
@@ -653,24 +641,26 @@ void BuildAssistant::iterateFootprint( const ThingTemplate *build,
 			pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y );
 			func( &pos, funcUserData );
 
-		}  // end for x
+		}
 
-	}  // end for y	
+	}
 
-}  // end iterateFootprint
+}
 
 
 //-------------------------------------------------------------------------------------------------
-/** Check for objects preventing building at this location.  */
+/** Check for objects preventing building at this location.
+  * TheSuperHackers @tweak Stubbjax 05/09/2025 Return LBC_SHROUD for shrouded objects near the
+	* edge of the shroud so that players cannot use this info to determine whether they exist. */
 //-------------------------------------------------------------------------------------------------
-LegalBuildCode BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos, 
+LegalBuildCode BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos,
 																											 const ThingTemplate *build,
 																											 Real angle,
 																											 Object *builderObject,
 																											 UnsignedInt options,
 																											 Player *thePlayer)
 {
-	ObjectIterator *iter = 
+	ObjectIterator *iter =
 			ThePartitionManager->iteratePotentialCollisions( worldPos,
 																											 build->getTemplateGeometryInfo(),
 																											 angle );
@@ -680,7 +670,6 @@ LegalBuildCode BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos
 	for( them = iter->first(); them; them = iter->next() )
 	{
 		Bool feedbackWithFailure = TRUE;
-
 		Relationship rel = builderObject ? builderObject->getRelationship( them ) : NEUTRAL;
 
 		//Kris: If the object is stealthed and we can't see it, pretend we can build there.
@@ -695,23 +684,13 @@ LegalBuildCode BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos
 						feedbackWithFailure = FALSE; //We want to fail now but without feedback
 					}
 					else
-					{	
+					{
 						continue;
 					}
 				}
 			}
 		}
 
-		//Kris: Patch 1.01 - November 5, 2003
-		//Prevent busy units (black lotus hacking from being moved by trying to place a building -- exploit).
-		if( rel == ALLIES )
-		{
-			if( them->testStatus( OBJECT_STATUS_IS_USING_ABILITY ) || them->getAI() && them->getAI()->isBusy() )
-			{
-				return LBC_OBJECTS_IN_THE_WAY;
-			}
-		}
-
 		// ignore any kind of class of objects that we will "remove" for building
 		if( isRemovableForConstruction( them ) == TRUE )
 			continue;
@@ -725,13 +704,28 @@ LegalBuildCode BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos
 		if (them->isKindOf(KINDOF_INERT))
 			continue;
 
-		// an immobile object may obstruct our building depending on flags.
-		if( them->isKindOf( KINDOF_IMMOBILE ) )	
+		if (them->isKindOf(KINDOF_IMMOBILE))
 		{
-			if (onlyCheckEnemies && builderObject && rel != ENEMIES )	
-			{
+			if (onlyCheckEnemies && builderObject && rel != ENEMIES)
 				continue;
+		}
+
+		if (builderObject && them->getShroudedStatus(builderObject->getControllingPlayer()->getPlayerIndex()) >= OBJECTSHROUD_FOGGED)
+			return LBC_SHROUD;
+
+		//Kris: Patch 1.01 - November 5, 2003
+		//Prevent busy units (black lotus hacking from being moved by trying to place a building -- exploit).
+		if (rel == ALLIES)
+		{
+			if (them->testStatus(OBJECT_STATUS_IS_USING_ABILITY) || them->getAI() && them->getAI()->isBusy())
+			{
+				return LBC_OBJECTS_IN_THE_WAY;
 			}
+		}
+
+		// an immobile object may obstruct our building depending on flags.
+		if( them->isKindOf( KINDOF_IMMOBILE ) )
+		{
 			if( feedbackWithFailure )
 			{
 				TheTerrainVisual->addFactionBib( them, TRUE );
@@ -755,7 +749,7 @@ LegalBuildCode BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos
 		// if this is an enemy object of the builder object (and therefore the thing
 		// that will be constructed) we can't build here
 		//
-		if( builderObject && rel == ENEMIES ) 
+		if( builderObject && rel == ENEMIES )
 		{
 			if( feedbackWithFailure )
 			{
@@ -765,9 +759,9 @@ LegalBuildCode BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos
 			return LBC_GENERIC_FAILURE;
 		}
 
-	}  // end for, them
+	}
 
-	if (onlyCheckEnemies) 
+	if (onlyCheckEnemies)
 	{
 		return LBC_OK;
 	}
@@ -864,56 +858,66 @@ LegalBuildCode BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos
 			hisExitPos.x += c*offset;
 			hisExitPos.y += s*offset;
 		}
-		if (ThePartitionManager->geomCollidesWithGeom(them->getPosition(), hisBounds, them->getOrientation(), 
+		if (ThePartitionManager->geomCollidesWithGeom(them->getPosition(), hisBounds, them->getOrientation(),
 			worldPos, myBounds, angle)) {
 			TheTerrainVisual->addFactionBib(them, true);
 			return LBC_OBJECTS_IN_THE_WAY;
 		}
-		if (!checkMyExit && !checkHisExit && !hisExtraWidth && !myExtraWidth) 
+		if (!checkMyExit && !checkHisExit && !hisExtraWidth && !myExtraWidth)
 		{
 			continue; // neither has extra exit space.
 		}
 
 		// an immobile object will obstruct our building no matter what team it's on
 		if ( them->isKindOf( KINDOF_IMMOBILE ) )	{
+			Bool shrouded = builderObject && them->getShroudedStatus(builderObject->getControllingPlayer()->getPlayerIndex()) >= OBJECTSHROUD_FOGGED;
 			/* Check for overlap of my exit rectangle to his geom info. */
-			if (checkMyExit && ThePartitionManager->geomCollidesWithGeom(them->getPosition(), hisBounds, them->getOrientation(), 
+			if (checkMyExit && ThePartitionManager->geomCollidesWithGeom(them->getPosition(), hisBounds, them->getOrientation(),
 				&myExitPos, myGeom, angle)) {
+				if (shrouded)
+					return LBC_SHROUD;
+				
 				TheTerrainVisual->addFactionBib(them, true);
 				return LBC_OBJECTS_IN_THE_WAY;
 			}
 			// Check for overlap of his exit rectangle with my geom info
-			if (checkHisExit && ThePartitionManager->geomCollidesWithGeom(&hisExitPos, hisGeom, them->getOrientation(), 
+			if (checkHisExit && ThePartitionManager->geomCollidesWithGeom(&hisExitPos, hisGeom, them->getOrientation(),
 					worldPos, myBounds, angle)) {
+				if (shrouded)
+					return LBC_SHROUD;
+				
 				TheTerrainVisual->addFactionBib(them, true);
 				return LBC_OBJECTS_IN_THE_WAY;
 			}
 			// Check both exit rectangles together.
-			if (checkMyExit&&checkHisExit&&ThePartitionManager->geomCollidesWithGeom(&hisExitPos, hisGeom, them->getOrientation(), 
+			if (checkMyExit&&checkHisExit&&ThePartitionManager->geomCollidesWithGeom(&hisExitPos, hisGeom, them->getOrientation(),
 					&myExitPos, myGeom, angle)) {
+				if (shrouded)
+					return LBC_SHROUD;
+				
 				TheTerrainVisual->addFactionBib(them, true);
 				return LBC_OBJECTS_IN_THE_WAY;
 			}
 		}
 
-	}  // end for, them
+	}
 	return LBC_OK;
 }
 
 //-------------------------------------------------------------------------------------------------
 /** Query if we can build at this location.  Note that 'build' may be null and is NOT required
-	* to be valid to know if a location is legal to build at.  'builderObject' is used 
+	* to be valid to know if a location is legal to build at.  'builderObject' is used
 	* for queries that require a pathfind check and should be NULL if not required */
 //-------------------------------------------------------------------------------------------------
-LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos, 
+LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 																											 const ThingTemplate *build,
-																											 Real angle, 
-																											 UnsignedInt options, 
+																											 Real angle,
+																											 UnsignedInt options,
 																											 Object *builderObject,
 																											 Player *player)
 {
 
-	/* You just can't never build off the map, regardless of options.  jba. */			
+	/* You just can't never build off the map, regardless of options.  jba. */
 	Region3D mapExtent;
 	TheTerrainLogic->getMaximumPathfindExtent(&mapExtent);
 	if (!mapExtent.isInRegionNoZ(worldPos)) {
@@ -940,7 +944,7 @@ LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 
 	//
 	// if NO_OBJECT_OVERLAP is set, we are not allowed to construct 'build' if it would overlap
-	// any immobile objects, or an enemy object.  Friendly objects should politely 
+	// any immobile objects, or an enemy object.  Friendly objects should politely
 	// "move out of the way" when you build something where they're standing
 	//
 	if( BitIsSet( options, NO_OBJECT_OVERLAP ) )
@@ -951,7 +955,7 @@ LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 			return code;
 		}
 
-	}  // end if
+	}
 	//
 	// if NO_ENEMY_OBJECT_OVERLAP is set, we are not allowed to construct 'build' if it would overlap
 	// any enemy objects.  Friendly objects are ignored.
@@ -963,14 +967,14 @@ LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 		{
 			return code;
 		}
-	}  // end if
+	}
 
 	if (build->isKindOf(KINDOF_CANNOT_BUILD_NEAR_SUPPLIES) && TheGlobalData->m_SupplyBuildBorder > 0)
 	{
-		// special case for supply centers: can't build too close to supply sources 
+		// special case for supply centers: can't build too close to supply sources
 		PartitionFilterAcceptByKindOf f1(MAKE_KINDOF_MASK(KINDOF_SUPPLY_SOURCE), KINDOFMASK_NONE);
 		PartitionFilter *filters[] = { &f1, NULL };
-		
+
 		// see if there are any reasonably close by
 		Real range = build->getTemplateGeometryInfo().getBoundingCircleRadius() + TheGlobalData->m_SupplyBuildBorder*2;
 		Object* tooClose = ThePartitionManager->getClosestObject(worldPos, range, FROM_BOUNDINGSPHERE_2D, filters);
@@ -1011,7 +1015,7 @@ LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 		if( ai->isQuickPathAvailable( worldPos ) == FALSE )
 				return LBC_NO_CLEAR_PATH;
 
-	}  // end if
+	}
 
 	// check basic terrain restrctions
 	if( BitIsSet( options, TERRAIN_RESTRICTIONS ) )
@@ -1043,7 +1047,7 @@ LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 		sampleData.loZ = terrainExtent.hi.z;  // note we set lo point to highest point
 
 		// quick check at triple res.
-		iterateFootprint( build, angle, worldPos, 3*sampleResolution, 
+		iterateFootprint( build, angle, worldPos, 3*sampleResolution,
 		                  checkSampleBuildLocation, &sampleData );
 		if( sampleData.terrainRestricted == TRUE )
 			return LBC_RESTRICTED_TERRAIN;
@@ -1052,7 +1056,7 @@ LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 			return LBC_NOT_FLAT_ENOUGH;
 
 		// careful check at full res.
-		iterateFootprint( build, angle, worldPos, sampleResolution, 
+		iterateFootprint( build, angle, worldPos, sampleResolution,
 		                  checkSampleBuildLocation, &sampleData );
 		if( sampleData.terrainRestricted == TRUE )
 			return LBC_RESTRICTED_TERRAIN;
@@ -1060,12 +1064,12 @@ LegalBuildCode BuildAssistant::isLocationLegalToBuild( const Coord3D *worldPos,
 		if( sampleData.hiZ - sampleData.loZ > TheGlobalData->m_allowedHeightVariationForBuilding )
 			return LBC_NOT_FLAT_ENOUGH;
 
-	}  // end if
+	}
 
 	// we passed all the checks
 	return LBC_OK;
 
-}  // end isLocationLegalToBuild
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Adds bibs to structures near to worldPos */
@@ -1094,7 +1098,7 @@ void BuildAssistant::addBibs(const Coord3D *worldPos,
 			TheTerrainVisual->addFactionBib(them, true);
 		}
 
-	}  // end for, them
+	}
 
 }
 
@@ -1108,14 +1112,14 @@ void BuildAssistant::addBibs(const Coord3D *worldPos,
 	* of positions in the tile build info.
 	*
 	* REQUIRES: Note that the array at 'postions' must be large enough to hold 'maxTiles'
-	* entries of positions 
+	* entries of positions
 	*/
 //-------------------------------------------------------------------------------------------------
 BuildAssistant::TileBuildInfo *BuildAssistant::buildTiledLocations( const ThingTemplate *thingBeingTiled,
 																																		Real angle,
-																																		const Coord3D *start, 
+																																		const Coord3D *start,
 																																		const Coord3D *end,
-																																		Real tilingSize, 
+																																		Real tilingSize,
 																																		Int maxTiles,
 																																		Object *builderObject )
 {
@@ -1144,7 +1148,7 @@ BuildAssistant::TileBuildInfo *BuildAssistant::buildTiledLocations( const ThingT
 		//
 		DEBUG_ASSERTCRASH( m_buildPositionSize < 200, ("Do you really need to tile this many objects!!!") );
 
-	}  // end if
+	}
 	Coord3D *positions = m_buildPositions;
 
 	// compute a vector from the start of the line in the world to the end
@@ -1164,7 +1168,7 @@ BuildAssistant::TileBuildInfo *BuildAssistant::buildTiledLocations( const ThingT
 	// line start to the placement line end, we are guaranteed to have one thing (+1)
 	//
 	Int tilesNeeded = REAL_TO_INT(placementLength / tilingSize) + 1;
-	
+
 	// we have a max that we are allowed to build to
 	if( tilesNeeded > maxTiles )
 		tilesNeeded = maxTiles;
@@ -1206,7 +1210,7 @@ BuildAssistant::TileBuildInfo *BuildAssistant::buildTiledLocations( const ThingT
 		// we have now actually used one more "tile"
 		tilesUsed++;
 
-	}  // end for i
+	}
 
 	// return a struct filled out with the actual tiles used and the array of locations
 	static TileBuildInfo tileInfo;
@@ -1214,10 +1218,10 @@ BuildAssistant::TileBuildInfo *BuildAssistant::buildTiledLocations( const ThingT
 	tileInfo.positions = positions;
 	return &tileInfo;
 
-}  // end buildTiledLocations
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Is the template passed in one of those wall type structures that we "build" in 
+/** Is the template passed in one of those wall type structures that we "build" in
 	* the world after drawing a line of where we want the object(s) placed.  The objects
 	* are placed "tiled" in a line */
 //-------------------------------------------------------------------------------------------------
@@ -1232,12 +1236,12 @@ Bool BuildAssistant::isLineBuildTemplate( const ThingTemplate *tTemplate )
 
 	return FALSE;  // not a line build object
 
-}  // end isLineBuildTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This method will check to make sure it is possible to build the requested unit.  The
 	* builder object MUST be present since all construction comes comes from either a Dozer or
-	* a production building.  The player must have satisfied the prereqs for 'whatToBuild' 
+	* a production building.  The player must have satisfied the prereqs for 'whatToBuild'
   * This does NOT check available money (see canMakeUnit) */
 //-------------------------------------------------------------------------------------------------
 Bool BuildAssistant::isPossibleToMakeUnit( Object *builder, const ThingTemplate *whatToBuild ) const
@@ -1249,18 +1253,18 @@ Bool BuildAssistant::isPossibleToMakeUnit( Object *builder, const ThingTemplate
 
 	// get the command set for the producer object
 	const CommandSet *commandSet = TheControlBar->findCommandSet( builder->getCommandSetString() );
-	
+
 	// if no command set we cannot build anything
 	if( commandSet == NULL )
 	{
 
-		DEBUG_ASSERTLOG( 0, ("Can't build a '%s' from the builder '%s' because '%s' doesn't have any command set defined\n",
+		DEBUG_ASSERTLOG( 0, ("Can't build a '%s' from the builder '%s' because '%s' doesn't have any command set defined",
 													whatToBuild->getName().str(),
 													builder->getTemplate()->getName().str(),
 													builder->getTemplate()->getName().str()) );
 		return FALSE;
 
-	}  // end if
+	}
 
 	//
 	// scan the command set, we must find whatToBuild as one of the "build" commands available
@@ -1272,16 +1276,15 @@ Bool BuildAssistant::isPossibleToMakeUnit( Object *builder, const ThingTemplate
 	Int i;
 	for( i = 0; i < MAX_COMMANDS_PER_SET; i++ )
 	{
-		
+
 		// get this button
 		commandButton = commandSet->getCommandButton(i);
 		if( commandButton &&
-				(commandButton->getCommandType() == GUI_COMMAND_UNIT_BUILD ||
-				 commandButton->getCommandType() == GUI_COMMAND_DOZER_CONSTRUCT) &&
-				commandButton->getThingTemplate()->isEquivalentTo(whatToBuild) )
+				(commandButton->getCommandType() == GUI_COMMAND_UNIT_BUILD || commandButton->getCommandType() == GUI_COMMAND_DOZER_CONSTRUCT) &&
+				commandButton->getThingTemplate() && commandButton->getThingTemplate()->isEquivalentTo(whatToBuild) )
 			foundCommand = commandButton;
 
-	}  // end for i
+	}
 	if( foundCommand == NULL )
 		return FALSE;
 
@@ -1306,7 +1309,7 @@ CanMakeType BuildAssistant::canMakeUnit( Object *builder, const ThingTemplate *w
 	// sanity
 	if( builder == NULL || whatToBuild == NULL )
 		return CANMAKE_NO_PREREQ;
-	
+
 	if (builder->testScriptStatusBit(OBJECT_STATUS_SCRIPT_DISABLED) || builder->testScriptStatusBit(OBJECT_STATUS_SCRIPT_UNPOWERED))
 		return CANMAKE_FACTORY_IS_DISABLED;
 
@@ -1327,8 +1330,8 @@ CanMakeType BuildAssistant::canMakeUnit( Object *builder, const ThingTemplate *w
   // canBuildMoreOfType(), so do this check first
   if ( player && !player->canBuildMoreOfType( whatToBuild ) )
     return CANMAKE_MAXED_OUT_FOR_PLAYER;
-  
-	if (!isPossibleToMakeUnit(builder, whatToBuild)) 
+
+	if (!isPossibleToMakeUnit(builder, whatToBuild))
 		return CANMAKE_NO_PREREQ;
 
 	if (pu != NULL)
@@ -1380,7 +1383,7 @@ Bool BuildAssistant::isRemovableForConstruction( Object *obj )
 	// not removable
 	return FALSE;
 
-}  // end isRemovableForConstruction
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given that we are about to build 'whatToBuild' remove all the objects that are in the
@@ -1390,7 +1393,7 @@ void BuildAssistant::clearRemovableForConstruction( const ThingTemplate *whatToB
 																										const Coord3D *pos,
 																										Real angle )
 {
-	ObjectIterator *iter = 
+	ObjectIterator *iter =
 			ThePartitionManager->iteratePotentialCollisions( pos,
 																											 whatToBuild->getTemplateGeometryInfo(),
 																											 angle );
@@ -1403,34 +1406,34 @@ void BuildAssistant::clearRemovableForConstruction( const ThingTemplate *whatToB
 		if( isRemovableForConstruction( them ) == TRUE && !them->isKindOf( KINDOF_ALWAYS_SELECTABLE ) )
 			TheGameLogic->destroyObject( them );
 
-	}  // end for, them
+	}
 	TheTerrainVisual->removeTreesAndPropsForConstruction(pos, whatToBuild->getTemplateGeometryInfo(), angle);
 
-}  // end clearRemovableForConstruction
+}
 
 // ------------------------------------------------------------------------------------------------
 /** clearRemovable is set up to delete objects that should cease to exist (for instance, trees).
-	* moveObjects will move objects that are owned by the player. It will also return false if 
+	* moveObjects will move objects that are owned by the player. It will also return false if
     the association with the object is enemy. (We can move neutral things) */
 // ------------------------------------------------------------------------------------------------
-Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuild, 
+Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuild,
 																								 const Coord3D *pos,
 																								 Real angle,
 																								 Player *playerToBuild )
-{	 
-	GeometryInfo gi (GEOMETRY_BOX, false, 10, whatToBuild->getTemplateGeometryInfo().getMajorRadius(), 
+{
+	GeometryInfo gi (GEOMETRY_BOX, false, 10, whatToBuild->getTemplateGeometryInfo().getMajorRadius(),
 		whatToBuild->getTemplateGeometryInfo().getMajorRadius());
 	if (whatToBuild->getTemplateGeometryInfo().getGeomType()==GEOMETRY_BOX) {
 		gi = whatToBuild->getTemplateGeometryInfo();
-	} 
-	ObjectIterator *iter = 
+	}
+	ObjectIterator *iter =
 			ThePartitionManager->iteratePotentialCollisions( pos,
 																											 gi,
 																											 angle );
 	Bool anyUnmovables = false;
 	MemoryPoolObjectHolder hold( iter );
 
-	Real radius = sqrt(pow(gi.getMajorRadius(), 2) + pow(gi.getMinorRadius(), 2)); 
+	Real radius = sqrt(pow(gi.getMajorRadius(), 2) + pow(gi.getMinorRadius(), 2));
 	radius *= 1.4f;	// Fudge the distance,
 
 	for( Object *them = iter->first(); them; them = iter->next() )
@@ -1444,7 +1447,7 @@ Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuil
 		if (them->isKindOf(KINDOF_INERT))
 			continue;
 
-		// Skip KINDOF_ALWAYS_SELECTABLE and isRemovableForConstruction, because if it is 
+		// Skip KINDOF_ALWAYS_SELECTABLE and isRemovableForConstruction, because if it is
 		// RemovableForConstruction, it just got destroyed, and won't actually be gone until
 		// the end of the frame.  jba.
 		if ( !them->isKindOf( KINDOF_ALWAYS_SELECTABLE ) && !isRemovableForConstruction(them) )
@@ -1457,13 +1460,13 @@ Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuil
 				// Pick an arbitrary direction and tell the unit to move there, at a distance greater
 				// than the object's radius.
 				AIUpdateInterface *ai = them->getAIUpdateInterface();
-				if (ai) 
+				if (ai)
 				{
-					// Vary the distance to move between one half the diameter of the building (roughly) 
+					// Vary the distance to move between one half the diameter of the building (roughly)
 					// and 1.5 times the diameter of the building
 					Real variedRadius = GameLogicRandomValueReal(0.5, 1.5) * radius;
 
-					Coord3D destPos;					
+					Coord3D destPos;
 					Real dir = GameLogicRandomValueReal(-PI, PI);
 					Vector3 vec(variedRadius, 0, 0);
 					vec.Rotate_Z(dir);
@@ -1471,7 +1474,7 @@ Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuil
 					destPos.x = pos->x + vec.X;
 					destPos.y = pos->y + vec.Y;
 					destPos.z = pos->z + vec.Z;
-					
+
 					// note that this is an extra-special case... even if the unit's mood is "sleep"
 					// it still needs to move here. (units with an ai mood of "sleep" won't respond to
 					// any AI commands. this is a special case that ignores the "sleep" ai mood.) (srj)
@@ -1482,8 +1485,8 @@ Bool BuildAssistant::moveObjectsForConstruction( const ThingTemplate *whatToBuil
 					anyUnmovables = true;
 				}
 
-			} 
-			else 
+			}
+			else
 			{
 				anyUnmovables = true;
 			}
@@ -1519,7 +1522,7 @@ void BuildAssistant::sellObject( Object *obj )
 		else
 			sellInfo = NULL;
 
-	}  // end for
+	}
 	if( sellInfo != NULL )
 		return;
 
@@ -1536,18 +1539,30 @@ void BuildAssistant::sellObject( Object *obj )
 	// set the model condition in the drawable for this object that will show the buildup
 	// scaffold and adjust the model height by construction percent
 	//
-	obj->setModelConditionFlags( MAKE_MODELCONDITION_MASK2( MODELCONDITION_PARTIALLY_CONSTRUCTED, 
-																													MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED) );
+	obj->setModelConditionFlags( MAKE_MODELCONDITION_MASK2( MODELCONDITION_PARTIALLY_CONSTRUCTED, MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED) );
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	//
-	// set this object as under de-construction (sold).  It is still a legal target, since you get the money at 
+	// set this object as under de-construction (sold).  It is still a legal target, since you get the money at
 	// the completion of sale.
 	//
 	obj->setStatus( MAKE_OBJECT_STATUS_MASK2( OBJECT_STATUS_SOLD, OBJECT_STATUS_UNSELECTABLE ) );
+#endif
+
+	// TheSuperHackers @bugfix Mauller 27/06/2025 we need to deselect the object before setting it as unselectable
+	// If the object is set unselectable too soon, it fails to be removed from the selection group
 
 	// for everybody, unselect them at this time.  You can't just deselect a drawable.  Selection is a logic property.
 	TheGameLogic->deselectObject(obj, PLAYERMASK_ALL, TRUE);
 
+#if !RETAIL_COMPATIBLE_AIGROUP
+	//
+	// set this object as under de-construction (sold).  It is still a legal target, since you get the money at
+	// the completion of sale.
+	//
+	obj->setStatus( MAKE_OBJECT_STATUS_MASK2( OBJECT_STATUS_SOLD, OBJECT_STATUS_UNSELECTABLE ) );
+#endif
+
 	//
 	// set the animation durations so that the regular build up loop animations can be
 	// done a bit faster for selling
@@ -1569,7 +1584,7 @@ void BuildAssistant::sellObject( Object *obj )
 	{
 		contain->onSelling();
 	}
-	
+
 	// Tell it to stop attacking or anything else it is doing
 	if( obj->getAI() )
 		obj->getAI()->aiIdle(CMD_FROM_AI);
@@ -1584,7 +1599,7 @@ void BuildAssistant::sellObject( Object *obj )
 			break;
 		}
 	}
-	
+
 	// destroy any mines that are owned by this structure, right now.
 	// unfortunately, structures don't keep list of mines they own, so we must do
 	// this the hard way :-( [fortunately, this doens't happen very often, so this
@@ -1600,5 +1615,5 @@ void BuildAssistant::sellObject( Object *obj )
 		}
 	}
 
-}  // end sellObject
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/CDManager.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/CDManager.cpp
index 43c363c89ab..5b7147d1e9a 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/CDManager.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/CDManager.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   Generals
@@ -42,57 +42,57 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/CDManager.h"
 #include "GameLogic/GameLogic.h"
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 CDManagerInterface* TheCDManager = NULL;
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 
@@ -105,7 +105,7 @@ CDDrive::CDDrive()
 {
 	m_diskName.clear();
 	m_drivePath.clear();
-	
+
 }
 
 //============================================================================
@@ -244,7 +244,7 @@ CDDriveInterface* CDManager::newDrive( const Char *path )
 	if ( drive )
 	{
 		drive->setPath( path );
-		
+
 		drive->m_node.setItem( drive );
 		m_drives.add( &drive->m_node );
 	}
@@ -284,10 +284,7 @@ void CDManager::destroyAllDrives( void )
 	{
 		node->remove();
 		CDDriveInterface *drive = (CDDriveInterface *) node->item();
-		if ( drive )
-		{
-			delete drive;
-		}
+		delete drive;
 	}
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/CriticalSection.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/CriticalSection.cpp
index a26b16ea507..6b30352242f 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/CriticalSection.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/CriticalSection.cpp
@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/CriticalSection.h"
 
 // Definitions.
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp
index 4b3ed4fca97..6f04f71e8d7 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp
@@ -26,10 +26,9 @@
 // Implementation of Data Chunk save/load system
 // Author: Michael S. Booth, October 2000
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "stdlib.h"
-#include "string.h"
 #include "Compression.h"
 #include "Common/DataChunk.h"
 #include "Common/file.h"
@@ -44,10 +43,8 @@ CachedFileInputStream::CachedFileInputStream(void):m_buffer(NULL),m_size(0)
 
 CachedFileInputStream::~CachedFileInputStream(void)
 {
-	if (m_buffer) {
-		delete[] m_buffer;
-		m_buffer=NULL;
-	}
+	delete[] m_buffer;
+	m_buffer=NULL;
 }
 
 Bool CachedFileInputStream::open(AsciiString path)
@@ -66,32 +63,32 @@ Bool CachedFileInputStream::open(AsciiString path)
 
 	if (CompressionManager::isDataCompressed(m_buffer, m_size) == 0)
 	{
-		//DEBUG_LOG(("CachedFileInputStream::open() - file %s is uncompressed at %d bytes!\n", path.str(), m_size));
+		//DEBUG_LOG(("CachedFileInputStream::open() - file %s is uncompressed at %d bytes!", path.str(), m_size));
 	}
 	else
 	{
 		Int uncompLen = CompressionManager::getUncompressedSize(m_buffer, m_size);
-		//DEBUG_LOG(("CachedFileInputStream::open() - file %s is compressed!  It should go from %d to %d\n", path.str(),
+		//DEBUG_LOG(("CachedFileInputStream::open() - file %s is compressed!  It should go from %d to %d", path.str(),
 		//	m_size, uncompLen));
 		char *uncompBuffer = NEW char[uncompLen];
 		Int actualLen = CompressionManager::decompressData(m_buffer, m_size, uncompBuffer, uncompLen);
 		if (actualLen == uncompLen)
 		{
-			//DEBUG_LOG(("Using uncompressed data\n"));
+			//DEBUG_LOG(("Using uncompressed data"));
 			delete[] m_buffer;
 			m_buffer = uncompBuffer;
 			m_size = uncompLen;
 		}
 		else
 		{
-			//DEBUG_LOG(("Decompression failed - using compressed data\n"));
+			//DEBUG_LOG(("Decompression failed - using compressed data"));
 			// decompression failed.  Maybe we invalidly thought it was compressed?
 			delete[] uncompBuffer;
 		}
 	}
 	//if (m_size >= 4)
 	//{
-	//	DEBUG_LOG(("File starts as '%c%c%c%c'\n", m_buffer[0], m_buffer[1],
+	//	DEBUG_LOG(("File starts as '%c%c%c%c'", m_buffer[0], m_buffer[1],
 	//		m_buffer[2], m_buffer[3]));
 	//}
 
@@ -104,10 +101,9 @@ Bool CachedFileInputStream::open(AsciiString path)
 
 void CachedFileInputStream::close(void)
 {
-	if (m_buffer) {
-		delete[] m_buffer;
-		m_buffer=NULL;
-	}
+	delete[] m_buffer;
+	m_buffer=NULL;
+
 	m_pos=0;
 	m_size=0;
 }
@@ -214,7 +210,7 @@ Bool FileInputStream::eof(void)
 {
 	if (m_file != NULL) {
 		return (m_file->size() == m_file->position());
-	}	 
+	}
 	return(true);
 }
 
@@ -235,17 +231,13 @@ void FileInputStream::rewind()
 
 #define TEMP_FILENAME		"_tmpChunk.dat"
 
-DataChunkOutput::DataChunkOutput( OutputStream *pOut ) :  
+DataChunkOutput::DataChunkOutput( OutputStream *pOut ) :
 m_pOut(pOut)
 {
 	AsciiString tmpFileName = TheGlobalData->getPath_UserData();
 	tmpFileName.concat(TEMP_FILENAME);
-	m_tmp_file = ::fopen( tmpFileName.str(), "wb" );	
-	// Added Sadullah Nader
-	// Initializations missing and needed
+	m_tmp_file = ::fopen( tmpFileName.str(), "wb" );
 	m_chunkStack = NULL;
-	
-	// End Add
 }
 
 DataChunkOutput::~DataChunkOutput()
@@ -259,7 +251,7 @@ DataChunkOutput::~DataChunkOutput()
 	AsciiString tmpFileName = TheGlobalData->getPath_UserData();
 	tmpFileName.concat(TEMP_FILENAME);
 
- 	m_tmp_file = ::fopen( tmpFileName.str(), "rb" );	
+ 	m_tmp_file = ::fopen( tmpFileName.str(), "rb" );
 	::fseek(m_tmp_file, 0, SEEK_SET);
 
 	// append the temp m_tmp_file m_contents
@@ -295,7 +287,7 @@ void DataChunkOutput::openDataChunk( const char *name, DataChunkVersionType ver
 	// remember this m_tmp_file position so we can write the real data size later
 	c->filepos = ::ftell(m_tmp_file);
 #ifdef VERBOSE
-	DEBUG_LOG(("Writing chunk %s at %d (%x)\n", name, ::ftell(m_tmp_file), ::ftell(m_tmp_file)));
+	DEBUG_LOG(("Writing chunk %s at %d (%x)", name, ::ftell(m_tmp_file), ::ftell(m_tmp_file)));
 #endif
 	// store a placeholder for the data size
 	Int dummy = 0xffff;
@@ -328,48 +320,48 @@ void DataChunkOutput::closeDataChunk( void )
 	// pop the chunk off the stack
 	OutputChunk *c = m_chunkStack;
 #ifdef VERBOSE
-	DEBUG_LOG(("Closing chunk %s at %d (%x)\n", m_contents.getName(c->id).str(), here, here));
+	DEBUG_LOG(("Closing chunk %s at %d (%x)", m_contents.getName(c->id).str(), here, here));
 #endif
 	m_chunkStack = m_chunkStack->next;
 	deleteInstance(c);
 }
 
-void DataChunkOutput::writeReal( Real r ) 
-{ 
-	::fwrite( (const char *)&r, sizeof(float) , 1, m_tmp_file  ); 
+void DataChunkOutput::writeReal( Real r )
+{
+	::fwrite( (const char *)&r, sizeof(float) , 1, m_tmp_file  );
 }
 
-void DataChunkOutput::writeInt( Int i ) 
-{ 
-	::fwrite( (const char *)&i, sizeof(Int) , 1, m_tmp_file ); 
+void DataChunkOutput::writeInt( Int i )
+{
+	::fwrite( (const char *)&i, sizeof(Int) , 1, m_tmp_file );
 }
 
-void DataChunkOutput::writeByte( Byte b ) 
-{ 
-	::fwrite( (const char *)&b, sizeof(Byte) , 1, m_tmp_file ); 
+void DataChunkOutput::writeByte( Byte b )
+{
+	::fwrite( (const char *)&b, sizeof(Byte) , 1, m_tmp_file );
 }
 
-void DataChunkOutput::writeArrayOfBytes(char *ptr, Int len) 
-{ 
-	::fwrite( (const char *)ptr, 1, len , m_tmp_file ); 
+void DataChunkOutput::writeArrayOfBytes(char *ptr, Int len)
+{
+	::fwrite( (const char *)ptr, 1, len , m_tmp_file );
 }
 
-void DataChunkOutput::writeAsciiString( const AsciiString& theString ) 
-{ 
+void DataChunkOutput::writeAsciiString( const AsciiString& theString )
+{
 	UnsignedShort len = theString.getLength();
 	::fwrite( (const char *)&len, sizeof(UnsignedShort) , 1, m_tmp_file );
-	::fwrite( theString.str(), len , 1, m_tmp_file ); 
+	::fwrite( theString.str(), len , 1, m_tmp_file );
 }
 
-void DataChunkOutput::writeUnicodeString( UnicodeString theString ) 
-{ 
+void DataChunkOutput::writeUnicodeString( UnicodeString theString )
+{
 	UnsignedShort len = theString.getLength();
 	::fwrite( (const char *)&len, sizeof(UnsignedShort) , 1, m_tmp_file );
-	::fwrite( theString.str(), len*sizeof(WideChar) , 1, m_tmp_file ); 
+	::fwrite( theString.str(), len*sizeof(WideChar) , 1, m_tmp_file );
 }
 
-void DataChunkOutput::writeNameKey( const NameKeyType key ) 
-{ 
+void DataChunkOutput::writeNameKey( const NameKeyType key )
+{
 		AsciiString kname = TheNameKeyGenerator->keyToName(key);
 		Int keyAndType = m_contents.allocateID(kname);
 		keyAndType <<= 8;
@@ -378,8 +370,8 @@ void DataChunkOutput::writeNameKey( const NameKeyType key )
 		writeInt(keyAndType);
 }
 
-void DataChunkOutput::writeDict( const Dict& d ) 
-{ 
+void DataChunkOutput::writeDict( const Dict& d )
+{
 	UnsignedShort len = d.getPairCount();
 	::fwrite( (const char *)&len, sizeof(UnsignedShort) , 1, m_tmp_file );
 	for (int i = 0; i < len; i++)
@@ -421,9 +413,9 @@ void DataChunkOutput::writeDict( const Dict& d )
 // DataChunkTableOfContents
 //----------------------------------------------------------------------
 
-DataChunkTableOfContents::DataChunkTableOfContents( void ) : 
-m_list(NULL), 
-m_nextID(1), 
+DataChunkTableOfContents::DataChunkTableOfContents( void ) :
+m_list(NULL),
+m_nextID(1),
 m_listLength(0),
 m_headerOpened(false)
 {
@@ -454,19 +446,19 @@ Mapping *DataChunkTableOfContents::findMapping( const AsciiString& name )
 }
 
 // convert name to integer identifier
-UnsignedInt DataChunkTableOfContents::getID( const AsciiString& name )		
+UnsignedInt DataChunkTableOfContents::getID( const AsciiString& name )
 {
 	Mapping *m = findMapping( name );
 
 	if (m)
 		return m->id;
 
-	DEBUG_CRASH(("name not found in DataChunkTableOfContents::getName for name %s\n",name.str()));
+	DEBUG_CRASH(("name not found in DataChunkTableOfContents::getName for name %s",name.str()));
 	return 0;
 }
 
 // convert integer identifier to name
-AsciiString DataChunkTableOfContents::getName( UnsignedInt id )	
+AsciiString DataChunkTableOfContents::getName( UnsignedInt id )
 {
 	Mapping *m;
 
@@ -474,7 +466,7 @@ AsciiString DataChunkTableOfContents::getName( UnsignedInt id )
 		if (m->id == id)
 			return m->name;
 
-	DEBUG_CRASH(("name not found in DataChunkTableOfContents::getName for id %d\n",id));
+	DEBUG_CRASH(("name not found in DataChunkTableOfContents::getName for id %d",id));
 	return AsciiString::TheEmptyString;
 }
 
@@ -581,8 +573,8 @@ void DataChunkTableOfContents::read( ChunkInputStream &s)
 //----------------------------------------------------------------------
 // DataChunkInput
 //----------------------------------------------------------------------
-DataChunkInput::DataChunkInput( ChunkInputStream *pStream ) : m_file( pStream ), 
-																										m_userData(NULL), 
+DataChunkInput::DataChunkInput( ChunkInputStream *pStream ) : m_file( pStream ),
+																										m_userData(NULL),
 																										m_currentObject(NULL),
 																										m_chunkStack(NULL),
 																										m_parserList(NULL)
@@ -607,7 +599,7 @@ DataChunkInput::~DataChunkInput()
 }
 
 // register a user parsing function for a given DataChunk label
-void DataChunkInput::registerParser( const AsciiString& label, const AsciiString& parentLabel, 
+void DataChunkInput::registerParser( const AsciiString& label, const AsciiString& parentLabel,
 																		 DataChunkParserPtr parser, void *userData )
 {
 	UserParser *p = newInstance(UserParser);
@@ -633,8 +625,8 @@ Bool DataChunkInput::parse( void *userData )
 	UserParser *parser;
 	Bool scopeOK;
 	DataChunkInfo info;
-	
-	// If the header wasn't a chunk table of contents, we can't parse. 
+
+	// If the header wasn't a chunk table of contents, we can't parse.
 	if (!m_contents.isOpenedForRead()) {
 		return false;
 	}
@@ -645,7 +637,7 @@ Bool DataChunkInput::parse( void *userData )
 
 	while( atEndOfFile() == false )
 	{
-		if (m_chunkStack) { // If we are parsing chunks in a chunk, check current length. 
+		if (m_chunkStack) { // If we are parsing chunks in a chunk, check current length.
 			if (m_chunkStack->dataLeft < CHUNK_HEADER_BYTES) {
 				DEBUG_ASSERTCRASH( m_chunkStack->dataLeft==0, ("Unexpected extra data in chunk."));
 				break;
@@ -666,7 +658,7 @@ Bool DataChunkInput::parse( void *userData )
 				// make sure parent name (scope) also matches
 				scopeOK = true;
 
-				if (parentLabel != parser->parentLabel) 
+				if (parentLabel != parser->parentLabel)
 					scopeOK = false;
 
 				if (scopeOK)
@@ -679,7 +671,7 @@ Bool DataChunkInput::parse( void *userData )
 
 					if (parser->parser( *this, &info, userData ) == false)
 						return false;
-					break; 
+					break;
 				}
 			}
 		}
@@ -725,7 +717,7 @@ AsciiString DataChunkInput::openDataChunk(DataChunkVersionType *ver )
 	c->id = 0;
 	c->version = 0;
 	c->dataSize = 0;
-	//DEBUG_LOG(("Opening data chunk at offset %d (%x)\n", m_file->tell(), m_file->tell()));
+	//DEBUG_LOG(("Opening data chunk at offset %d (%x)", m_file->tell(), m_file->tell()));
 	// read the chunk ID
 	m_file->read( (char *)&c->id, sizeof(UnsignedInt) );
 	decrementDataLeft( sizeof(UnsignedInt) );
@@ -747,14 +739,14 @@ AsciiString DataChunkInput::openDataChunk(DataChunkVersionType *ver )
 	c->next = m_chunkStack;
 	m_chunkStack = c;
 	if (this->atEndOfFile()) {
-		return (AsciiString(""));
+		return AsciiString::TheEmptyString;
 	}
 	return m_contents.getName( c->id );
 }
 
 // close chunk and move to start of next chunk
 void DataChunkInput::closeDataChunk( void )
-{										
+{
 	if (m_chunkStack == NULL)
 	{
 		// TODO: Throw exception
@@ -783,7 +775,7 @@ AsciiString DataChunkInput::getChunkLabel( void )
 	{
 		// TODO: Throw exception
 		DEBUG_CRASH(("Bad."));
-		return AsciiString("");
+		return AsciiString::TheEmptyString;
 	}
 
 	return m_contents.getName( m_chunkStack->id );
@@ -800,7 +792,7 @@ DataChunkVersionType DataChunkInput::getChunkVersion( void )
 	}
 
 	return m_chunkStack->version;
-}		
+}
 
 // return size of data stored in this chunk
 UnsignedInt DataChunkInput::getChunkDataSize( void )
@@ -838,7 +830,7 @@ Bool DataChunkInput::atEndOfChunk( void )
 		return false;
 	}
 
-	return true; 
+	return true;
 }
 
 // update data left in chunk(s)
@@ -856,37 +848,37 @@ void DataChunkInput::decrementDataLeft( Int size )
 	// The sizes of the parent chunks on the stack are adjusted in closeDataChunk.
 }
 
-Real DataChunkInput::readReal(void) 
-{ 
+Real DataChunkInput::readReal(void)
+{
 	Real r;
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=sizeof(Real), ("Read past end of chunk."));
-	m_file->read( (char *)&r, sizeof(Real) ); 
+	m_file->read( (char *)&r, sizeof(Real) );
 	decrementDataLeft( sizeof(Real) );
-	return r; 
+	return r;
 }
 
-Int DataChunkInput::readInt(void) 
-{ 
+Int DataChunkInput::readInt(void)
+{
 	Int i;
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=sizeof(Int), ("Read past end of chunk."));
-	m_file->read( (char *)&i, sizeof(Int) ); 
+	m_file->read( (char *)&i, sizeof(Int) );
 	decrementDataLeft( sizeof(Int) );
-	return i; 
+	return i;
 }
 
-Byte DataChunkInput::readByte(void) 
-{ 
+Byte DataChunkInput::readByte(void)
+{
 	Byte b;
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=sizeof(Byte), ("Read past end of chunk."));
-	m_file->read( (char *)&b, sizeof(Byte) ); 
+	m_file->read( (char *)&b, sizeof(Byte) );
 	decrementDataLeft( sizeof(Byte) );
-	return b; 
+	return b;
 }
 
-void DataChunkInput::readArrayOfBytes(char *ptr, Int len) 
-{ 
+void DataChunkInput::readArrayOfBytes(char *ptr, Int len)
+{
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=len, ("Read past end of chunk."));
-	m_file->read( ptr, len ); 
+	m_file->read( ptr, len );
 	decrementDataLeft( len );
 }
 
@@ -904,9 +896,9 @@ NameKeyType DataChunkInput::readNameKey(void)
 		return k;
 }
 
-Dict DataChunkInput::readDict() 
-{ 
-	UnsignedShort len;	
+Dict DataChunkInput::readDict()
+{
+	UnsignedShort len;
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=sizeof(UnsignedShort), ("Read past end of chunk."));
 	m_file->read( &len, sizeof(UnsignedShort) );
 	decrementDataLeft( sizeof(UnsignedShort) );
@@ -949,9 +941,9 @@ Dict DataChunkInput::readDict()
 	return d;
 }
 
-AsciiString DataChunkInput::readAsciiString(void) 
-{ 
-	UnsignedShort len;	
+AsciiString DataChunkInput::readAsciiString(void)
+{
+	UnsignedShort len;
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=sizeof(UnsignedShort), ("Read past end of chunk."));
 	m_file->read( &len, sizeof(UnsignedShort) );
 	decrementDataLeft( sizeof(UnsignedShort) );
@@ -965,12 +957,12 @@ AsciiString DataChunkInput::readAsciiString(void)
 		str[len] = '\000';
 	}
 
-	return theString; 
+	return theString;
 }
 
-UnicodeString DataChunkInput::readUnicodeString(void) 
-{ 
-	UnsignedShort len;	
+UnicodeString DataChunkInput::readUnicodeString(void)
+{
+	UnsignedShort len;
 	DEBUG_ASSERTCRASH(m_chunkStack->dataLeft>=sizeof(UnsignedShort), ("Read past end of chunk."));
 	m_file->read( &len, sizeof(UnsignedShort) );
 	decrementDataLeft( sizeof(UnsignedShort) );
@@ -984,5 +976,5 @@ UnicodeString DataChunkInput::readUnicodeString(void)
 		str[len] = '\000';
 	}
 
-	return theString; 
+	return theString;
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp
deleted file mode 100644
index f9090dfa94e..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp
+++ /dev/null
@@ -1,833 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Debug.cpp 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: Debug.cpp
-//
-// Created:   Steven Johnson, August 2001
-//
-// Desc:      Debug logging and other debug utilities
-//
-// ----------------------------------------------------------------------------
-
-// SYSTEM INCLUDES 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-
-// USER INCLUDES
-
-// TheSuperHackers @feature helmutbuhler 04/10/2025
-// Uncomment this to show normal logging stuff in the crc logging.
-// This can be helpful for context, but can also clutter diffs because normal logs aren't necessarily
-// deterministic or the same on all peers in multiplayer games.
-//#define INCLUDE_DEBUG_LOG_IN_CRC_LOG
-
-#define DEBUG_THREADSAFE
-#ifdef DEBUG_THREADSAFE
-#include "Common/CriticalSection.h"
-#endif
-#include "Common/Debug.h"
-#include "Common/CRCDebug.h"
-#include "Common/SystemInfo.h"
-#include "Common/UnicodeString.h"
-#include "GameClient/ClientInstance.h"
-#include "GameClient/GameText.h"
-#include "GameClient/Keyboard.h"
-#include "GameClient/Mouse.h"
-#if defined(DEBUG_STACKTRACE) || defined(IG_DEBUG_STACKTRACE)
-	#include "Common/StackDump.h"
-#endif
-
-// Horrible reference, but we really, really need to know if we are windowed.
-extern bool DX8Wrapper_IsWindowed;
-extern HWND ApplicationHWnd;
-
-extern const char *gAppPrefix; /// So WB can have a different log file name.
-
-#ifdef RTS_INTERNAL
-// this should ALWAYS be present
-#pragma optimize("", off)
-#endif
-
-// ----------------------------------------------------------------------------
-// DEFINES 
-// ----------------------------------------------------------------------------
-
-#ifdef DEBUG_LOGGING
-
-#if defined(RTS_INTERNAL)
-	#define DEBUG_FILE_NAME				"DebugLogFileI"
-	#define DEBUG_FILE_NAME_PREV	"DebugLogFilePrevI"
-#elif defined(RTS_DEBUG)
-	#define DEBUG_FILE_NAME				"DebugLogFileD"
-	#define DEBUG_FILE_NAME_PREV	"DebugLogFilePrevD"
-#else
-	#define DEBUG_FILE_NAME				"DebugLogFile"
-	#define DEBUG_FILE_NAME_PREV	"DebugLogFilePrev"
-#endif
-
-#endif
-
-// ----------------------------------------------------------------------------
-// PRIVATE TYPES 
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// PRIVATE DATA 
-// ----------------------------------------------------------------------------
-// TheSuperHackers @info Must not use static RAII types when set in DebugInit,
-// because DebugInit can be called during static module initialization before the main function is called.
-#ifdef DEBUG_LOGGING
-static FILE *theLogFile = NULL;
-static char theLogFileName[ _MAX_PATH ];
-static char theLogFileNamePrev[ _MAX_PATH ];
-#endif
-#define LARGE_BUFFER	8192
-static char theBuffer[ LARGE_BUFFER ];	// make it big to avoid weird overflow bugs in debug mode
-static int theDebugFlags = 0;
-static DWORD theMainThreadID = 0;
-// ----------------------------------------------------------------------------
-// PUBLIC DATA 
-// ----------------------------------------------------------------------------
-
-char* TheCurrentIgnoreCrashPtr = NULL;
-#ifdef DEBUG_LOGGING
-UnsignedInt DebugLevelMask = 0;
-const char *TheDebugLevels[DEBUG_LEVEL_MAX] = {
-	"NET"
-};
-#endif
-
-// ----------------------------------------------------------------------------
-// PRIVATE PROTOTYPES 
-// ----------------------------------------------------------------------------
-static const char *getCurrentTimeString(void);
-static const char *getCurrentTickString(void);
-static const char *prepBuffer(const char* format, char *buffer);
-#ifdef DEBUG_LOGGING
-static void doLogOutput(const char *buffer);
-#endif
-#ifdef DEBUG_CRASHING
-static int doCrashBox(const char *buffer, Bool logResult);
-#endif
-static void whackFunnyCharacters(char *buf);
-#ifdef DEBUG_STACKTRACE
-static void doStackDump();
-#endif
-
-// ----------------------------------------------------------------------------
-// PRIVATE FUNCTIONS 
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-inline Bool ignoringAsserts()
-{
-#ifdef DEBUG_CRASHING
-	return !DX8Wrapper_IsWindowed || (TheGlobalData&&TheGlobalData->m_debugIgnoreAsserts);
-#else
-	return !DX8Wrapper_IsWindowed;
-#endif
-}
-
-// ----------------------------------------------------------------------------
-inline HWND getThreadHWND()
-{
-	return (theMainThreadID == GetCurrentThreadId())?ApplicationHWnd:NULL;
-}
-
-// ----------------------------------------------------------------------------
-
-int MessageBoxWrapper( LPCSTR lpText, LPCSTR lpCaption, UINT uType )
-{
-	HWND threadHWND = getThreadHWND();
-	if (!threadHWND)
-		return (uType & MB_ABORTRETRYIGNORE)?IDIGNORE:IDYES;
-
-	return ::MessageBox(threadHWND, lpText, lpCaption, uType);
-}
-
-// ----------------------------------------------------------------------------
-// getCurrentTimeString 
-/** 
-	Return the current time in string form
-*/
-// ----------------------------------------------------------------------------
-static const char *getCurrentTimeString(void)
-{
-	time_t aclock;
-	time(&aclock);
-	struct tm *newtime = localtime(&aclock);
-	return asctime(newtime);
-}
-
-// ----------------------------------------------------------------------------
-// getCurrentTickString 
-/** 
-	Return the current TickCount in string form
-*/
-// ----------------------------------------------------------------------------
-static const char *getCurrentTickString(void)
-{
-	static char TheTickString[32];
-	sprintf(TheTickString, "(T=%08lx)",::GetTickCount());
-	return TheTickString;
-}
-
-// ----------------------------------------------------------------------------
-// prepBuffer
-// zap the buffer and optionally prepend the tick time.
-// ----------------------------------------------------------------------------
-/**
-	Empty the buffer passed in, then optionally prepend the current TickCount
-	value in string form, depending on the setting of theDebugFlags.
-*/
-static const char *prepBuffer(const char* format, char *buffer)
-{
-	buffer[0] = 0;
-#ifdef ALLOW_DEBUG_UTILS
-	if (theDebugFlags & DEBUG_FLAG_PREPEND_TIME)
-	{
-		strcpy(buffer, getCurrentTickString());
-		strcat(buffer, " ");
-	}
-#endif
-	return format;
-}
-
-// ----------------------------------------------------------------------------
-// doLogOutput
-/** 
-	send a string directly to the log file and/or console without further processing.
-*/
-// ----------------------------------------------------------------------------
-#ifdef DEBUG_LOGGING
-static void doLogOutput(const char *buffer)
-{
-	// log message to file
-	if (theDebugFlags & DEBUG_FLAG_LOG_TO_FILE)
-	{
-		if (theLogFile)
-		{
-			fprintf(theLogFile, "%s", buffer);	// note, no \n (should be there already)
-			fflush(theLogFile);
-		}
-	}
-
-	// log message to dev studio output window
-	if (theDebugFlags & DEBUG_FLAG_LOG_TO_CONSOLE)
-	{
-		::OutputDebugString(buffer);
-	}
-
-#ifdef INCLUDE_DEBUG_LOG_IN_CRC_LOG
-	addCRCDebugLineNoCounter("%s", buffer);
-#endif
-}
-#endif
-
-// ----------------------------------------------------------------------------
-// doCrashBox
-/*
-	present a messagebox with the given message. Depending on user selection,
-	we exit the app, break into debugger, or continue execution. 
-*/
-// ----------------------------------------------------------------------------
-#ifdef DEBUG_CRASHING
-static int doCrashBox(const char *buffer, Bool logResult)
-{
-	int result;
-
-	if (!ignoringAsserts()) {
-		result = MessageBoxWrapper(buffer, "Assertion Failure", MB_ABORTRETRYIGNORE|MB_TASKMODAL|MB_ICONWARNING|MB_DEFBUTTON3);
-		//result = MessageBoxWrapper(buffer, "Assertion Failure", MB_ABORTRETRYIGNORE|MB_TASKMODAL|MB_ICONWARNING);
-	}	else {
-		result = IDIGNORE;
-	}
-
-	switch(result)
-	{
-		case IDABORT:
-#ifdef DEBUG_LOGGING
-			if (logResult)
-				DebugLog("[Abort]\n");
-#endif
-			_exit(1);
-			break;
-		case IDRETRY:
-#ifdef DEBUG_LOGGING
-			if (logResult)
-				DebugLog("[Retry]\n");
-#endif
-			::DebugBreak();
-			break;
-		case IDIGNORE:
-#ifdef DEBUG_LOGGING
-			// do nothing, just keep going
-			if (logResult)
-				DebugLog("[Ignore]\n");
-#endif
-			break;
-	}
-	return result;
-}
-#endif
-
-#ifdef DEBUG_STACKTRACE
-// ----------------------------------------------------------------------------
-/**
-	Dumps a stack trace (from the current PC) to logfile and/or console.
-*/
-static void doStackDump()
-{
-	const int STACKTRACE_SIZE	= 24;
-	const int STACKTRACE_SKIP = 2;
-	void* stacktrace[STACKTRACE_SIZE];
-
-	doLogOutput("\nStack Dump:\n");
-	::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);
-	::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, doLogOutput);
-}
-#endif
-
-// ----------------------------------------------------------------------------
-// whackFunnyCharacters 
-/** 
-	Eliminates any undesirable nonprinting characters, aside from newline,
-	replacing them with spaces.
-*/
-// ----------------------------------------------------------------------------
-static void whackFunnyCharacters(char *buf)
-{
-	for (char *p = buf + strlen(buf) - 1; p >= buf; --p)
-	{
-		// ok, these are naughty magic numbers, but I'm guessing you know ASCII.... 
-		if (*p >= 0 && *p < 32 && *p != 10 && *p != 13)
-			*p = 32;
-	}
-}
-
-// ----------------------------------------------------------------------------
-// PUBLIC FUNCTIONS 
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// DebugInit 
-// ----------------------------------------------------------------------------
-#ifdef ALLOW_DEBUG_UTILS
-/**
-	Initialize the debug utilities. This should be called once, as near to the 
-	start of the app as possible, before anything else (since other code will
-	probably want to make use of it).
-*/
-void DebugInit(int flags)
-{
-//	if (theDebugFlags != 0)
-//		::MessageBox(NULL, "Debug already inited", "", MB_OK|MB_APPLMODAL);
-
-	// just quietly allow multiple calls to this, so that static ctors can call it.
-	if (theDebugFlags == 0) 
-	{
-		theDebugFlags = flags;
-
-		theMainThreadID = GetCurrentThreadId();
-
-	#ifdef DEBUG_LOGGING
-
-		// TheSuperHackers @info Debug initialization can happen very early.
-		// Therefore, initialize the client instance now.
-		if (!rts::ClientInstance::initialize())
-			return;
-
-		char dirbuf[ _MAX_PATH ];
-		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
-		char *pEnd = dirbuf + strlen( dirbuf );
-		while( pEnd != dirbuf ) 
-		{
-			if( *pEnd == '\\' ) 
-			{
-				*(pEnd + 1) = 0;
-				break;
-			}
-			pEnd--;
-		}
-
-		strcpy(theLogFileNamePrev, dirbuf);
-		strcat(theLogFileNamePrev, gAppPrefix);
-		strcat(theLogFileNamePrev, DEBUG_FILE_NAME_PREV);
-		if (rts::ClientInstance::getInstanceId() > 1u)
-			sprintf(theLogFileNamePrev + strlen(theLogFileNamePrev), "_Instance%.2u", rts::ClientInstance::getInstanceId());
-		strcat(theLogFileNamePrev, ".txt");
-
-		strcpy(theLogFileName, dirbuf);
-		strcat(theLogFileName, gAppPrefix);
-		strcat(theLogFileName, DEBUG_FILE_NAME);
-		if (rts::ClientInstance::getInstanceId() > 1u)
-			sprintf(theLogFileName + strlen(theLogFileName), "_Instance%.2u", rts::ClientInstance::getInstanceId());
-		strcat(theLogFileName, ".txt");
-
-		remove(theLogFileNamePrev);
-		rename(theLogFileName, theLogFileNamePrev);
-		theLogFile = fopen(theLogFileName, "w");
-		if (theLogFile != NULL)
-		{
-			DebugLog("Log %s opened: %s\n", theLogFileName, getCurrentTimeString());
-		} 
-	#endif
-	}
-
-}  
-#endif
-
-// ----------------------------------------------------------------------------
-// DebugLog 
-// ----------------------------------------------------------------------------
-#ifdef DEBUG_LOGGING
-/**
-	Print a character string to the logfile and/or console.
-*/
-void DebugLog(const char *format, ...)
-{
-#ifdef DEBUG_THREADSAFE
-	ScopedCriticalSection scopedCriticalSection(TheDebugLogCriticalSection);
-#endif
-
-	if (theDebugFlags == 0)
-		MessageBoxWrapper("DebugLog - Debug not inited properly", "", MB_OK|MB_TASKMODAL);
-
-	format = prepBuffer(format, theBuffer);
-
-	va_list arg;
-  va_start(arg, format);
-  vsprintf(theBuffer + strlen(theBuffer), format, arg);
-  va_end(arg);
-
-	if (strlen(theBuffer) >= sizeof(theBuffer))
-		MessageBoxWrapper("String too long for debug buffer", "", MB_OK|MB_TASKMODAL);
-
-	whackFunnyCharacters(theBuffer);
-	doLogOutput(theBuffer);
-} 
-
-const char* DebugGetLogFileName()
-{
-	return theLogFileName;
-}
-
-const char* DebugGetLogFileNamePrev()
-{
-	return theLogFileNamePrev;
-}
-
-#endif
-
-// ----------------------------------------------------------------------------
-// DebugCrash
-// ----------------------------------------------------------------------------
-#ifdef DEBUG_CRASHING
-/**
-	Print a character string to the logfile and/or console, then halt execution
-	while presenting the user with an exit/debug/ignore dialog containing the same
-	text message.
-*/
-void DebugCrash(const char *format, ...)
-{
-	// Note: You might want to make this thread safe, but we cannot. The reason is that 
-	// there is an implicit requirement on other threads that the message loop be running.
-
-	// make it not static so that it'll be thread-safe.
-	// make it big to avoid weird overflow bugs in debug mode
-	char theCrashBuffer[ LARGE_BUFFER ];	
-	if (theDebugFlags == 0)
-	{
-		if (!DX8Wrapper_IsWindowed) {
-			if (ApplicationHWnd) {
-				ShowWindow(ApplicationHWnd, SW_HIDE);
-			}
-		}
-		MessageBoxWrapper("DebugCrash - Debug not inited properly", "", MB_OK|MB_TASKMODAL);
-	}
-
-	format = prepBuffer(format, theCrashBuffer);
-	strcat(theCrashBuffer, "ASSERTION FAILURE: ");
-
-	va_list arg;
-  va_start(arg, format);
-  vsprintf(theCrashBuffer + strlen(theCrashBuffer), format, arg);
-  va_end(arg);
-
-	if (strlen(theCrashBuffer) >= sizeof(theCrashBuffer))
-	{
-		if (!DX8Wrapper_IsWindowed) {
-			if (ApplicationHWnd) {
-				ShowWindow(ApplicationHWnd, SW_HIDE);
-			}
-		}
-		MessageBoxWrapper("String too long for debug buffers", "", MB_OK|MB_TASKMODAL);
-	}
-
-#ifdef DEBUG_LOGGING
-	if (ignoringAsserts()) 
-	{
-		doLogOutput("**** CRASH IN FULL SCREEN - Auto-ignored, CHECK THIS LOG!\n");
-	}
-	whackFunnyCharacters(theCrashBuffer);
-	doLogOutput(theCrashBuffer);
-#endif
-#ifdef DEBUG_STACKTRACE
-	if (!(TheGlobalData && TheGlobalData->m_debugIgnoreStackTrace))
-	{
-		doStackDump();
-	}
-#endif
-
-	strcat(theCrashBuffer, "\n\nAbort->exception; Retry->debugger; Ignore->continue\n");
-
-	int result = doCrashBox(theCrashBuffer, true);
-
-	if (result == IDIGNORE && TheCurrentIgnoreCrashPtr != NULL) 
-	{
-		int yn;
-		if (!ignoringAsserts()) 
-		{
-			yn = MessageBoxWrapper("Ignore this crash from now on?", "", MB_YESNO|MB_TASKMODAL);
-		}	
-		else 
-		{
-			yn = IDYES;
-		}
-		if (yn == IDYES)
-			*TheCurrentIgnoreCrashPtr = 1;
-		if( TheKeyboard )
-			TheKeyboard->resetKeys();
-		if( TheMouse )
-			TheMouse->reset();
-	}
-
-}  
-#endif
-
-// ----------------------------------------------------------------------------
-// DebugShutdown 
-// ----------------------------------------------------------------------------
-#ifdef ALLOW_DEBUG_UTILS
-/**
-	Shut down the debug utilities. This should be called once, as near to the 
-	end of the app as possible, after everything else (since other code will
-	probably want to make use of it).
-*/
-void DebugShutdown()
-{
-#ifdef DEBUG_LOGGING
-	if (theLogFile)
-	{
-		DebugLog("Log closed: %s\n", getCurrentTimeString());
-		fclose(theLogFile);
-	}
-	theLogFile = NULL;
-#endif
-	theDebugFlags = 0;
-}  
-
-// ----------------------------------------------------------------------------
-// DebugGetFlags 
-// ----------------------------------------------------------------------------
-/**
-	Get the current values for the flags passed to DebugInit. Most code will never
-	need to use this; the most common usage would be to temporarily enable or disable
-	the DEBUG_FLAG_PREPEND_TIME bit for complex logfile messages.
-*/
-int DebugGetFlags()
-{
-	return theDebugFlags;
-}
-
-// ----------------------------------------------------------------------------
-// DebugSetFlags 
-// ----------------------------------------------------------------------------
-/**
-	Set the current values for the flags passed to DebugInit. Most code will never
-	need to use this; the most common usage would be to temporarily enable or disable
-	the DEBUG_FLAG_PREPEND_TIME bit for complex logfile messages.
-*/
-void DebugSetFlags(int flags)
-{
-	theDebugFlags = flags;
-}
-
-#endif	// ALLOW_DEBUG_UTILS
-
-#ifdef DEBUG_PROFILE
-// ----------------------------------------------------------------------------
-SimpleProfiler::SimpleProfiler()
-{
-	QueryPerformanceFrequency((LARGE_INTEGER*)&m_freq);
-	m_startThisSession = 0;
-	m_totalThisSession = 0;
-	m_totalAllSessions = 0;
-	m_numSessions = 0;
-}
-
-// ----------------------------------------------------------------------------
-void SimpleProfiler::start()
-{
-	DEBUG_ASSERTCRASH(m_startThisSession == 0, ("already started"));
-	QueryPerformanceCounter((LARGE_INTEGER*)&m_startThisSession);
-}
-
-// ----------------------------------------------------------------------------
-void SimpleProfiler::stop()
-{
-	if (m_startThisSession != 0) 
-	{
-		__int64 stop;
-		QueryPerformanceCounter((LARGE_INTEGER*)&stop);
-		m_totalThisSession = stop - m_startThisSession;
-		m_totalAllSessions += stop - m_startThisSession;
-		m_startThisSession = 0;
-		++m_numSessions;
-	}
-}
-
-// ----------------------------------------------------------------------------
-void SimpleProfiler::stopAndLog(const char *msg, int howOftenToLog, int howOftenToResetAvg)
-{
-	stop();
-	// howOftenToResetAvg==0 means "never reset"
-	if (howOftenToResetAvg > 0 && m_numSessions >= howOftenToResetAvg)
-	{
-		m_numSessions = 0;
-		m_totalAllSessions = 0;
-		DEBUG_LOG(("%s: reset averages\n",msg));
-	}
-	DEBUG_ASSERTLOG(m_numSessions % howOftenToLog != 0, ("%s: %f msec, total %f msec, avg %f msec\n",msg,getTime(),getTotalTime(),getAverageTime()));
-}
-
-// ----------------------------------------------------------------------------
-double SimpleProfiler::getTime()
-{
-	stop();
-	return (double)m_totalThisSession / (double)m_freq * 1000.0;
-}
-
-// ----------------------------------------------------------------------------
-int SimpleProfiler::getNumSessions()
-{
-	stop();
-	return m_numSessions;
-}
-
-// ----------------------------------------------------------------------------
-double SimpleProfiler::getTotalTime()
-{
-	stop();
-	if (!m_numSessions)
-		return 0.0;
-
-	return (double)m_totalAllSessions * 1000.0 / ((double)m_freq);
-}
-
-// ----------------------------------------------------------------------------
-double SimpleProfiler::getAverageTime()
-{
-	stop();
-	if (!m_numSessions)
-		return 0.0;
-
-	return (double)m_totalAllSessions * 1000.0 / ((double)m_freq * (double)m_numSessions);
-}
-
-#endif	// DEBUG_PROFILE
-
-// ----------------------------------------------------------------------------
-// ReleaseCrash
-// ----------------------------------------------------------------------------
-/**
-	Halt the application, EVEN IN FINAL RELEASE BUILDS. This should be called
-	only when a crash is guaranteed by continuing, and no meaningful continuation
-	of processing is possible, even by throwing an exception.
-*/
-
-	#define RELEASECRASH_FILE_NAME				"ReleaseCrashInfo.txt"
-	#define RELEASECRASH_FILE_NAME_PREV		"ReleaseCrashInfoPrev.txt"
-
-	static FILE *theReleaseCrashLogFile = NULL;
-
-	static void releaseCrashLogOutput(const char *buffer)
-	{
-		if (theReleaseCrashLogFile)
-		{
-			fprintf(theReleaseCrashLogFile, "%s", buffer);	// note, no \n (should be there already)
-			fflush(theReleaseCrashLogFile);
-		}
-	}
-
-void ReleaseCrash(const char *reason)
-{
-	/// do additional reporting on the crash, if possible
-
-	if (!DX8Wrapper_IsWindowed) {
-		if (ApplicationHWnd) {
-			ShowWindow(ApplicationHWnd, SW_HIDE);
-		}
-	}
-//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-//	/* static */ char buff[8192]; // not so static so we can be threadsafe
-//	snprintf(buff, 8192, "Sorry, a serious error occurred. (%s)", reason);/
-//	::MessageBox(NULL, buff, "Technical Difficulties...", MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
-//#else
-//	::MessageBox(NULL, "Sorry, a serious error occurred.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
-//#endif
-
-	char prevbuf[ _MAX_PATH ];
-	char curbuf[ _MAX_PATH ];
-
-	if (TheGlobalData==NULL) {
-		return; // We are shutting down, and TheGlobalData has been freed.  jba. [4/15/2003]
-	}
-
-	strcpy(prevbuf, TheGlobalData->getPath_UserData().str());
-	strcat(prevbuf, RELEASECRASH_FILE_NAME_PREV);
-	strcpy(curbuf, TheGlobalData->getPath_UserData().str());
-	strcat(curbuf, RELEASECRASH_FILE_NAME);
-
- 	remove(prevbuf);
-	rename(curbuf, prevbuf);
-
-	theReleaseCrashLogFile = fopen(curbuf, "w");
-	if (theReleaseCrashLogFile)
-	{
-		fprintf(theReleaseCrashLogFile, "Release Crash at %s; Reason %s\n", getCurrentTimeString(), reason);
-		fprintf(theReleaseCrashLogFile, "\nLast error:\n%s\n\nCurrent stack:\n", g_LastErrorDump.str());
-		const int STACKTRACE_SIZE	= 12;
-		const int STACKTRACE_SKIP = 6;
-		void* stacktrace[STACKTRACE_SIZE];
-		::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);
-		::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, releaseCrashLogOutput);
-
-		fflush(theReleaseCrashLogFile);
-		fclose(theReleaseCrashLogFile);
-		theReleaseCrashLogFile = NULL;
-	}
-
-	if (!DX8Wrapper_IsWindowed) {
-		if (ApplicationHWnd) {
-			ShowWindow(ApplicationHWnd, SW_HIDE);
-		}
-	}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	/* static */ char buff[8192]; // not so static so we can be threadsafe
-	snprintf(buff, 8192, "Sorry, a serious error occurred. (%s)", reason);
-	::MessageBox(NULL, buff, "Technical Difficulties...", MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
-#else
-// crash error messaged changed 3/6/03 BGC
-//	::MessageBox(NULL, "Sorry, a serious error occurred.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
-//	::MessageBox(NULL, "You have encountered a serious error.  Serious errors can be caused by many things including viruses, overheated hardware and hardware that does not meet the minimum specifications for the game. Please visit the forums at www.generals.ea.com for suggested courses of action or consult your manual for Technical Support contact information.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);
-
-// crash error message changed again 8/22/03 M Lorenzen... made this message box modal to the system so it will appear on top of any task-modal windows, splash-screen, etc.
-  ::MessageBox(NULL, "You have encountered a serious error.  Serious errors can be caused by many things including viruses, overheated hardware and hardware that does not meet the minimum specifications for the game. Please visit the forums at www.generals.ea.com for suggested courses of action or consult your manual for Technical Support contact information.", 
-   "Technical Difficulties...", 
-   MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
-
-
-#endif
-
-	_exit(1);
-}  
-
-void ReleaseCrashLocalized(const AsciiString& p, const AsciiString& m)
-{
-	if (!TheGameText) {
-		ReleaseCrash(m.str());
-		// This won't ever return
-		return;
-	}
-
-	UnicodeString prompt = TheGameText->fetch(p);
-	UnicodeString mesg = TheGameText->fetch(m);
-
-
-	/// do additional reporting on the crash, if possible
-
-	if (!DX8Wrapper_IsWindowed) {
-		if (ApplicationHWnd) {
-			ShowWindow(ApplicationHWnd, SW_HIDE);
-		}
-	}
-
-	if (TheSystemIsUnicode) 
-	{
-		::MessageBoxW(NULL, mesg.str(), prompt.str(), MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
-	} 
-	else 
-	{
-		// However, if we're using the default version of the message box, we need to 
-		// translate the string into an AsciiString
-		AsciiString promptA, mesgA;
-		promptA.translate(prompt);
-		mesgA.translate(mesg);
-		//Make sure main window is not TOP_MOST
-		::SetWindowPos(ApplicationHWnd, HWND_NOTOPMOST, 0, 0, 0, 0,SWP_NOSIZE |SWP_NOMOVE);
-		::MessageBoxA(NULL, mesgA.str(), promptA.str(), MB_OK|MB_TASKMODAL|MB_ICONERROR);
-	}
-
-	char prevbuf[ _MAX_PATH ];
-	char curbuf[ _MAX_PATH ];
-
-	strcpy(prevbuf, TheGlobalData->getPath_UserData().str());
-	strcat(prevbuf, RELEASECRASH_FILE_NAME_PREV);
-	strcpy(curbuf, TheGlobalData->getPath_UserData().str());
-	strcat(curbuf, RELEASECRASH_FILE_NAME);
-
- 	remove(prevbuf);
-	rename(curbuf, prevbuf);
-
-	theReleaseCrashLogFile = fopen(curbuf, "w");
-	if (theReleaseCrashLogFile)
-	{
-		fprintf(theReleaseCrashLogFile, "Release Crash at %s; Reason %ls\n", getCurrentTimeString(), mesg.str());
-
-		const int STACKTRACE_SIZE	= 12;
-		const int STACKTRACE_SKIP = 6;
-		void* stacktrace[STACKTRACE_SIZE];
-		::FillStackAddresses(stacktrace, STACKTRACE_SIZE, STACKTRACE_SKIP);
-		::StackDumpFromAddresses(stacktrace, STACKTRACE_SIZE, releaseCrashLogOutput);
-
-		fflush(theReleaseCrashLogFile);
-		fclose(theReleaseCrashLogFile);
-		theReleaseCrashLogFile = NULL;
-	}
-
-	_exit(1);
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Directory.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Directory.cpp
index 9b4754eefbd..c2d526c6491 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/Directory.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Directory.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #if (0)
 
 #include "Common/Directory.h"
@@ -53,7 +53,7 @@ void FileInfo::set( const WIN32_FIND_DATA& info )
 	modTime = FileTimeToTimet(info.ftLastWriteTime);
 	attributes = info.dwFileAttributes;
 	filesize = info.nFileSizeLow;
-	//DEBUG_LOG(("FileInfo::set(): fname=%s, size=%d\n", filename.str(), filesize));
+	//DEBUG_LOG(("FileInfo::set(): fname=%s, size=%d", filename.str(), filesize));
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -67,7 +67,7 @@ Directory::Directory( const AsciiString& dirPath ) : m_dirPath(dirPath)
 	// sanity
 	if( m_dirPath.isEmpty() )
 	{
-		DEBUG_LOG(( "Empty dirname\n"));
+		DEBUG_LOG(( "Empty dirname"));
 		return;
 	}
 
@@ -77,7 +77,7 @@ Directory::Directory( const AsciiString& dirPath ) : m_dirPath(dirPath)
 	// switch into the directory provided
 	if( SetCurrentDirectory( m_dirPath.str() ) == 0 )
 	{
-		DEBUG_LOG(( "Can't set directory '%s'\n", m_dirPath.str() ));
+		DEBUG_LOG(( "Can't set directory '%s'", m_dirPath.str() ));
 		return;
 	}
 
@@ -86,7 +86,7 @@ Directory::Directory( const AsciiString& dirPath ) : m_dirPath(dirPath)
 	hFile = FindFirstFile( "*", &item);
 	if( hFile == INVALID_HANDLE_VALUE )
 	{
-		DEBUG_LOG(( "Can't search directory '%s'\n", m_dirPath.str() ));
+		DEBUG_LOG(( "Can't search directory '%s'", m_dirPath.str() ));
 		done = true;
 	}
 
@@ -97,7 +97,7 @@ Directory::Directory( const AsciiString& dirPath ) : m_dirPath(dirPath)
 		// if this is a subdirectory keep the name around till the end
 		if( BitIsSet( item.dwFileAttributes, FILE_ATTRIBUTE_DIRECTORY ) )
 		{
-			if ( strcmp( item.cFileName, "." ) && strcmp( item.cFileName, ".." ) )
+			if ( strcmp( item.cFileName, "." ) != 0 && strcmp( item.cFileName, ".." ) != 0 )
 			{
 				info.set(item);
 				m_subdirs.insert( info );
@@ -132,4 +132,4 @@ FileInfoSet* Directory::getSubdirs( void )
 	return &m_subdirs;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/DisabledTypes.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/DisabledTypes.cpp
index 65797c548b5..643d3c06116 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/DisabledTypes.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/DisabledTypes.cpp
@@ -30,7 +30,8 @@
 #include "Common/DisabledTypes.h"
 #include "Common/BitFlagsIO.h"
 
-const char* DisabledMaskType::s_bitNameList[] = 
+template<>
+const char* const DisabledMaskType::s_bitNameList[] =
 {
 	"DEFAULT",
 	"DISABLED_HACKED",
@@ -40,7 +41,7 @@ const char* DisabledMaskType::s_bitNameList[] =
 	"DISABLED_UNMANNED",
 	"DISABLED_UNDERPOWERED",
 	"DISABLED_FREEFALL",
-	
+
   "DISABLED_AWESTRUCK",
   "DISABLED_BRAINWASHED",
 	"DISABLED_SUBDUED",
@@ -50,6 +51,7 @@ const char* DisabledMaskType::s_bitNameList[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(DisabledMaskType::s_bitNameList) == DisabledMaskType::NumBits + 1, "Incorrect array size");
 
 DisabledMaskType DISABLEDMASK_NONE;	// inits to all zeroes
 DisabledMaskType DISABLEDMASK_ALL;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/File.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/File.cpp
deleted file mode 100644
index 1dae03204ce..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/File.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   WSYS Library
-//
-// Module:    IO_
-//
-// File name: IO_File.cpp
-//
-// Created:   4/23/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-
-#include <assert.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-
-#include "Common/file.h"
-
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-//=================================================================
-// File::File
-//=================================================================
-
-File::File()
-:	m_open(FALSE),
-	m_deleteOnClose(FALSE),
-	m_access(NONE)
-{
-
-	setName("<no file>");
-
-}
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//=================================================================
-// File::~File	
-//=================================================================
-
-File::~File()
-{
-	close();
-}
-
-//=================================================================
-// File::open	
-//=================================================================
-/**
-  * Any derived open() members must first call File::open. If File::open
-	* succeeds but the derived class's open failes then make sure to call
-	* File::close() before returning.
-	*/
-//=================================================================
-
-Bool File::open( const Char *filename, Int access )
-{
-	if( m_open )
-	{
-		return FALSE;
-	}
-
-	setName( filename );
-
-	if( (access & ( STREAMING | WRITE )) == ( STREAMING | WRITE ))
-	{
-		// illegal access
-		return FALSE;
-	}
-
-	if( (access & ( TEXT | BINARY)) == ( TEXT | BINARY ))
-	{
-		// illegal access
-		return FALSE;
-	}
-
-	if ( (access & (READ|WRITE)) == 0 )
-	{
-		access |= READ;
-	}
-
-	if ( !(access & (READ|APPEND)) )
-	{
-		access |= TRUNCATE;
-	}
-
-	if ( (access & (TEXT|BINARY)) == 0 )
-	{
-		access |= BINARY;
-	}
-
-	m_access = access;
-	m_open = TRUE;
-	return TRUE;
-}
-
-//=================================================================
-// File::close 	
-//=================================================================
-/**
-  * Must call File::close() for each successful File::open() call.
-	*/
-//=================================================================
-
-void File::close( void )
-{
-	if( m_open )
-	{
-		setName( "<no file>" );
-		m_open = FALSE;
-		if ( m_deleteOnClose )
-		{
-			deleteInstance(this); // on special cases File object will delete itself when closing
-		}
-	}
-}
-
-//=================================================================
-// File::size 
-//=================================================================
-/**
-  * Default implementation of File::size. Derived classes can optimize
-	* this member function.
-	*/
-//=================================================================
-
-Int File::size( void )
-{
-	Int pos = seek( 0, CURRENT );
-	Int size = seek( 0, END );
-
-	seek( pos, START );
-
-	return size < 0 ? 0 : size;
-}
-
-//============================================================================
-// File::position
-//============================================================================
-
-Int File::position( void )
-{
-	return seek(0, CURRENT);
-}
-
-//============================================================================
-// File::print
-//============================================================================
-
-Bool	File::print ( const Char *format, ...)
-{
-	Char buffer[10*1024];
-	Int len;
-
-	if ( ! (m_access & TEXT ) )
-	{
-		return FALSE;
-	}
-
-	va_list args;
-	va_start( args, format );     /* Initialize variable arguments. */
-	len = vsprintf( buffer, format, args );
-	va_end( args );
-
-	if ( len >= sizeof(buffer) )
-	{
-		// Big Problem
-		assert( FALSE );
-		return FALSE;
-	}
-
-	return (write ( buffer, len ) == len);
-}
-
-Bool	File::eof() {
-	return (position() == size());
-}
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/FileSystem.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/FileSystem.cpp
deleted file mode 100644
index 02f4b95abfd..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/FileSystem.cpp
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   WSYS Library
-//
-// Module:    IO
-//
-// File name: IO_FileSystem.cpp
-//
-// Created:   4/23/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-#include "Common/file.h"
-#include "Common/FileSystem.h"
-
-#include "Common/ArchiveFileSystem.h"
-#include "Common/CDManager.h"
-#include "Common/GameAudio.h"
-#include "Common/LocalFileSystem.h"
-#include "Common/PerfTimer.h"
-
-
-DECLARE_PERF_TIMER(FileSystem)
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-//===============================
-// TheFileSystem 
-//===============================
-/**
-  *	This is the FileSystem's singleton class. All file access 
-	* should be through TheFileSystem, unless code needs to use an explicit
-	* File or FileSystem derivative.
-	*
-	* Using TheFileSystem->open and File exclusively for file access, particularly
-	* in library or modular code, allows applications to transparently implement 
-	* file access as they see fit. This is particularly important for code that
-	* needs to be shared between applications, such as games and tools.
-	*/
-//===============================
-
-FileSystem	*TheFileSystem = NULL;
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//============================================================================
-// FileSystem::FileSystem
-//============================================================================
-
-FileSystem::FileSystem()
-{
-
-}
-
-//============================================================================
-// FileSystem::~FileSystem
-//============================================================================
-
-FileSystem::~FileSystem()
-{
-
-}
-
-//============================================================================
-// FileSystem::init
-//============================================================================
-
-void		FileSystem::init( void )
-{
-	TheLocalFileSystem->init();
-	TheArchiveFileSystem->init();
-}
-
-//============================================================================
-// FileSystem::update
-//============================================================================
-
-void		FileSystem::update( void )
-{
-	USE_PERF_TIMER(FileSystem)
-	TheLocalFileSystem->update();
-	TheArchiveFileSystem->update();
-}
-
-//============================================================================
-// FileSystem::reset
-//============================================================================
-
-void		FileSystem::reset( void )
-{
-	USE_PERF_TIMER(FileSystem)
-	TheLocalFileSystem->reset();
-	TheArchiveFileSystem->reset();
-}
-
-//============================================================================
-// FileSystem::open
-//============================================================================
-
-File*		FileSystem::openFile( const Char *filename, Int access ) 
-{
-	USE_PERF_TIMER(FileSystem)
-	File *file = NULL;
-
-	if ( TheLocalFileSystem != NULL )
-	{
-		file = TheLocalFileSystem->openFile( filename, access );
-		if (file != NULL && (file->getAccess() & File::CREATE))
-		{
-			unsigned key = TheNameKeyGenerator->nameToLowercaseKey(filename);
-			m_fileExist[key] = true;
-		}
-	}
-
-	if ( (TheArchiveFileSystem != NULL) && (file == NULL) )
-	{
-		file = TheArchiveFileSystem->openFile( filename );
-	}
-
-	return file;
-}
-
-//============================================================================
-// FileSystem::doesFileExist
-//============================================================================
-
-Bool FileSystem::doesFileExist(const Char *filename) const
-{
-	USE_PERF_TIMER(FileSystem)
-
-  unsigned key=TheNameKeyGenerator->nameToLowercaseKey(filename);
-  std::map<unsigned,bool>::iterator i=m_fileExist.find(key);
-  if (i!=m_fileExist.end())
-    return i->second;
-
-	if (TheLocalFileSystem->doesFileExist(filename)) 
-  {
-    m_fileExist[key]=true;
-		return TRUE;
-	}
-	if (TheArchiveFileSystem->doesFileExist(filename)) 
-  {
-    m_fileExist[key]=true;
-		return TRUE;
-	}
-
-  m_fileExist[key]=false;
-	return FALSE;
-}
-
-//============================================================================
-// FileSystem::getFileListInDirectory
-//============================================================================
-void FileSystem::getFileListInDirectory(const AsciiString& directory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const
-{
-	USE_PERF_TIMER(FileSystem)
-	TheLocalFileSystem->getFileListInDirectory(AsciiString(""), directory, searchName, filenameList, searchSubdirectories);
-	TheArchiveFileSystem->getFileListInDirectory(AsciiString(""), directory, searchName, filenameList, searchSubdirectories);
-}
-
-//============================================================================
-// FileSystem::getFileInfo
-//============================================================================
-Bool FileSystem::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const
-{
-	USE_PERF_TIMER(FileSystem)
-	if (fileInfo == NULL) {
-		return FALSE;
-	}
-	memset(fileInfo, 0, sizeof(*fileInfo));
-	
-	if (TheLocalFileSystem->getFileInfo(filename, fileInfo)) {
-		return TRUE;
-	}
-
-	if (TheArchiveFileSystem->getFileInfo(filename, fileInfo)) {
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-//============================================================================
-// FileSystem::createDirectory
-//============================================================================
-Bool FileSystem::createDirectory(AsciiString directory) 
-{
-	USE_PERF_TIMER(FileSystem)
-	if (TheLocalFileSystem != NULL) {
-		return TheLocalFileSystem->createDirectory(directory);
-	}
-	return FALSE;
-}
-
-//============================================================================
-// FileSystem::areMusicFilesOnCD
-//============================================================================
-Bool FileSystem::areMusicFilesOnCD()
-{
-#if 1
-    return TRUE;
-#else
-	if (!TheCDManager) {
-		DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - No CD Manager; returning false\n"));
-		return FALSE;
-	}
-
-	AsciiString cdRoot;
-	Int dc = TheCDManager->driveCount();
-	for (Int i = 0; i < dc; ++i) {
-		DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - checking drive %d\n", i));
-		CDDriveInterface *cdi = TheCDManager->getDrive(i);
-		if (!cdi) {
-			continue;
-		}
-
-		cdRoot = cdi->getPath();
-		if (!cdRoot.endsWith("\\"))
-			cdRoot.concat("\\");
-		cdRoot.concat("genseczh.big");
-		DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - checking for %s\n", cdRoot.str()));
-		File *musicBig = TheLocalFileSystem->openFile(cdRoot.str());
-		if (musicBig)
-		{
-			DEBUG_LOG(("FileSystem::areMusicFilesOnCD() - found it!\n"));
-			musicBig->close();
-			return TRUE;
-		}
-	}
-	return FALSE;
-#endif
-}
-//============================================================================
-// FileSystem::loadMusicFilesFromCD
-//============================================================================
-void FileSystem::loadMusicFilesFromCD()
-{
-	if (!TheCDManager) {
-		return;
-	}
-
-	AsciiString cdRoot;
-	Int dc = TheCDManager->driveCount();
-	for (Int i = 0; i < dc; ++i) {
-		CDDriveInterface *cdi = TheCDManager->getDrive(i);
-		if (!cdi) {
-			continue;
-		}
-
-		cdRoot = cdi->getPath();
-		if (TheArchiveFileSystem->loadBigFilesFromDirectory(cdRoot, MUSIC_BIG)) {
-			break;
-		}
-	}
-}
-
-//============================================================================
-// FileSystem::unloadMusicFilesFromCD
-//============================================================================
-void FileSystem::unloadMusicFilesFromCD()
-{
-	if (!(TheAudio && TheAudio->isMusicPlayingFromCD())) {
-		return;
-	}
-
-	TheArchiveFileSystem->closeArchiveFile( MUSIC_BIG );
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/FunctionLexicon.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/FunctionLexicon.cpp
index 2f6a9569dc3..3eccb5ef087 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/FunctionLexicon.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/FunctionLexicon.cpp
@@ -28,7 +28,7 @@
 //						 and assign callbacks
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/FunctionLexicon.h"
 #include "GameClient/GameWindow.h"
@@ -61,7 +61,7 @@ extern WindowMsgHandledType PopupReplayInput( GameWindow *window, UnsignedInt ms
 extern WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 );
 
 // game window draw table -----------------------------------------------------------------------
-static FunctionLexicon::TableEntry gameWinDrawTable[] = 
+static FunctionLexicon::TableEntry gameWinDrawTable[] =
 {
 	{ NAMEKEY_INVALID, "IMECandidateMainDraw",						IMECandidateMainDraw },
 	{ NAMEKEY_INVALID, "IMECandidateTextAreaDraw",				IMECandidateTextAreaDraw },
@@ -69,7 +69,7 @@ static FunctionLexicon::TableEntry gameWinDrawTable[] =
 };
 
 // game window system table -----------------------------------------------------------------------
-static FunctionLexicon::TableEntry gameWinSystemTable[] = 
+static FunctionLexicon::TableEntry gameWinSystemTable[] =
 {
 
 
@@ -142,7 +142,7 @@ static FunctionLexicon::TableEntry gameWinSystemTable[] =
 	{ NAMEKEY_INVALID, "DiplomacySystem",								DiplomacySystem },
 	{ NAMEKEY_INVALID, "GeneralsExpPointsSystem",				GeneralsExpPointsSystem },
 	{ NAMEKEY_INVALID, "DifficultySelectSystem",				DifficultySelectSystem },
-	
+
 	{ NAMEKEY_INVALID, "IdleWorkerSystem",							IdleWorkerSystem },
 	{ NAMEKEY_INVALID, "EstablishConnectionsControlSystem", EstablishConnectionsControlSystem },
 	{ NAMEKEY_INVALID, "GameInfoWindowSystem",					GameInfoWindowSystem },
@@ -154,7 +154,7 @@ static FunctionLexicon::TableEntry gameWinSystemTable[] =
 };
 
 // game window input table ------------------------------------------------------------------------
-static FunctionLexicon::TableEntry gameWinInputTable[] = 
+static FunctionLexicon::TableEntry gameWinInputTable[] =
 {
 
 	{ NAMEKEY_INVALID, "GameWinDefaultInput",						GameWinDefaultInput },
@@ -226,7 +226,7 @@ static FunctionLexicon::TableEntry gameWinInputTable[] =
 };
 
 // game window tooltip table ----------------------------------------------------------------------
-static FunctionLexicon::TableEntry gameWinTooltipTable[] = 
+static FunctionLexicon::TableEntry gameWinTooltipTable[] =
 {
 
 
@@ -237,7 +237,7 @@ static FunctionLexicon::TableEntry gameWinTooltipTable[] =
 };
 
 // window layout init table -----------------------------------------------------------------------
-static FunctionLexicon::TableEntry winLayoutInitTable[] = 
+static FunctionLexicon::TableEntry winLayoutInitTable[] =
 {
 
 	{ NAMEKEY_INVALID, "MainMenuInit",									MainMenuInit },
@@ -284,12 +284,12 @@ static FunctionLexicon::TableEntry winLayoutInitTable[] =
 	{ NAMEKEY_INVALID, "DifficultySelectInit",          DifficultySelectInit },
 	{ NAMEKEY_INVALID, "PopupReplayInit",							  PopupReplayInit },
 
-	{ NAMEKEY_INVALID, NULL,														NULL }  // keep this last
+	{ NAMEKEY_INVALID, NULL,														NULL }
 
 };
 
 // window layout update table ---------------------------------------------------------------------
-static FunctionLexicon::TableEntry winLayoutUpdateTable[] = 
+static FunctionLexicon::TableEntry winLayoutUpdateTable[] =
 {
 
 	{ NAMEKEY_INVALID, "MainMenuUpdate",								MainMenuUpdate },
@@ -299,7 +299,7 @@ static FunctionLexicon::TableEntry winLayoutUpdateTable[] =
 	{ NAMEKEY_INVALID, "LanLobbyMenuUpdate",						LanLobbyMenuUpdate },
 	{ NAMEKEY_INVALID, "ReplayMenuUpdate",							ReplayMenuUpdate },
 	{ NAMEKEY_INVALID, "SaveLoadMenuUpdate",							SaveLoadMenuUpdate },
-	
+
 	{ NAMEKEY_INVALID, "CreditsMenuUpdate",							CreditsMenuUpdate },
 	{ NAMEKEY_INVALID, "LanGameOptionsMenuUpdate",			LanGameOptionsMenuUpdate },
 	{ NAMEKEY_INVALID, "LanMapSelectMenuUpdate",				LanMapSelectMenuUpdate },
@@ -325,18 +325,18 @@ static FunctionLexicon::TableEntry winLayoutUpdateTable[] =
 	{ NAMEKEY_INVALID, "ScoreScreenUpdate",							ScoreScreenUpdate },
 	{ NAMEKEY_INVALID, "DownloadMenuUpdate",						DownloadMenuUpdate },
 	{ NAMEKEY_INVALID, "PopupReplayUpdate",							PopupReplayUpdate },
-	{ NAMEKEY_INVALID, NULL,														NULL }  // keep this last
+	{ NAMEKEY_INVALID, NULL,														NULL }
 
 };
 
 // window layout shutdown table -------------------------------------------------------------------
-static FunctionLexicon::TableEntry winLayoutShutdownTable[] = 
+static FunctionLexicon::TableEntry winLayoutShutdownTable[] =
 {
 
 	{ NAMEKEY_INVALID, "MainMenuShutdown",							MainMenuShutdown },
 	{ NAMEKEY_INVALID, "OptionsMenuShutdown",						OptionsMenuShutdown },
 	{ NAMEKEY_INVALID, "SaveLoadMenuShutdown",          SaveLoadMenuShutdown },
-	{ NAMEKEY_INVALID, "PopupCommunicatorShutdown",     PopupCommunicatorShutdown },      
+	{ NAMEKEY_INVALID, "PopupCommunicatorShutdown",     PopupCommunicatorShutdown },
 	{ NAMEKEY_INVALID, "KeyboardOptionsMenuShutdown",   KeyboardOptionsMenuShutdown },
 	{ NAMEKEY_INVALID, "SinglePlayerMenuShutdown",			SinglePlayerMenuShutdown },
 	{ NAMEKEY_INVALID, "MapSelectMenuShutdown",					MapSelectMenuShutdown },
@@ -366,12 +366,12 @@ static FunctionLexicon::TableEntry winLayoutShutdownTable[] =
 	{ NAMEKEY_INVALID, "ScoreScreenShutdown",						ScoreScreenShutdown },
 	{ NAMEKEY_INVALID, "DownloadMenuShutdown",          DownloadMenuShutdown },
 	{ NAMEKEY_INVALID, "PopupReplayShutdown",	          PopupReplayShutdown },
-	{ NAMEKEY_INVALID, NULL,														NULL }  // keep this last
+	{ NAMEKEY_INVALID, NULL,														NULL }
 
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC DATA 
+// PUBLIC DATA
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 FunctionLexicon *TheFunctionLexicon = NULL;  ///< the function dictionary
 
@@ -381,7 +381,7 @@ FunctionLexicon *TheFunctionLexicon = NULL;  ///< the function dictionary
 	* components we might want to add to the table, such as generating
 	* a key based off the name supplied in the table for faster access */
 //-------------------------------------------------------------------------------------------------
-void FunctionLexicon::loadTable( TableEntry *table, 
+void FunctionLexicon::loadTable( TableEntry *table,
 																 TableIndex tableIndex )
 {
 
@@ -395,17 +395,17 @@ void FunctionLexicon::loadTable( TableEntry *table,
 	{
 
 		// assign key from name key based on name provided in table
-		entry->key = TheNameKeyGenerator->nameToKey( AsciiString(entry->name) );
+		entry->key = TheNameKeyGenerator->nameToKey( entry->name );
 
 		// next table entry please
 		entry++;
 
-	}  // end while
+	}
 
 	// assign table to the index specified
 	m_tables[ tableIndex ] = table;
 
-}  // end loadTable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Search the provided table for a function matching the key */
@@ -426,11 +426,11 @@ void *FunctionLexicon::keyToFunc( NameKeyType key, TableEntry *table )
 			return entry->func;
 		entry++;
 
-	}  // end if
+	}
 
 	return NULL;  // not found
 
-}  // end keyToFunc
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Search tables for the function given this key, if the index parameter
@@ -457,21 +457,21 @@ void *FunctionLexicon::findFunction( NameKeyType key, TableIndex index )
 			if( func )
 				break;  // exit for i
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 	else
 	{
 
 		// do NOT search all tables, just the one specified by the parameter
 		func = keyToFunc( key, m_tables[ index ] );
 
-	}  // end else
+	}
 
 	// return function, if found
 	return func;
 
-}  // end findFunction
+}
 
 #ifdef NOT_IN_USE
 //-------------------------------------------------------------------------------------------------
@@ -496,15 +496,15 @@ const char *FunctionLexicon::funcToName( void *func, TableEntry *table )
 		// not it, check next
 		entry++;
 
-	}  // end while
+	}
 
 	return NULL;  // not found
 
-}  // end funcToName
+}
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC FUNCTIONS 
+// PUBLIC FUNCTIONS
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
@@ -517,14 +517,14 @@ FunctionLexicon::FunctionLexicon( void )
 	for( i = 0; i < MAX_FUNCTION_TABLES; i++ )
 		m_tables[ i ] = NULL;
 
-}  // end FunctionLexicon
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 FunctionLexicon::~FunctionLexicon( void )
 {
 
-}  // end ~FunctionLexicon
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize our dictionary of funtion pointers and symbols */
@@ -546,7 +546,7 @@ void FunctionLexicon::init( void )
 
 	validate();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** reset */
@@ -562,15 +562,15 @@ void FunctionLexicon::reset( void )
 	// nothing dynamically loaded, just reinit the tables
 	init();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Update */ 
+/** Update */
 //-------------------------------------------------------------------------------------------------
 void FunctionLexicon::update( void )
 {
 
-}  // end update
+}
 
 /*
 // !NOTE! We can not have this function, see the header for
@@ -581,7 +581,7 @@ void FunctionLexicon::update( void )
 //-------------------------------------------------------------------------------------------------
 char *FunctionLexicon::functionToName( void *func )
 {
-	
+
 	// sanity
 	if( func == NULL )
 		return NULL;
@@ -596,11 +596,11 @@ char *FunctionLexicon::functionToName( void *func )
 		if( name )
 			return name;
 
-	}  // end for i
+	}
 
 	return NULL;  // not found
 
-}  // end functionToName
+}
 */
 
 //-------------------------------------------------------------------------------------------------
@@ -625,7 +625,7 @@ Bool FunctionLexicon::validate( void )
 		sourceEntry = m_tables[ i ];
 		while( sourceEntry && sourceEntry->key != NAMEKEY_INVALID )
 		{
-		
+
 			//
 			// scan all tables looking for the function in sourceEntry, do not bother
 			// of source entry is NULL (a valid entry in the table, but not a function)
@@ -649,53 +649,53 @@ Bool FunctionLexicon::validate( void )
 							if( sourceEntry->func == lookAtEntry->func )
 							{
 
-								DEBUG_LOG(( "WARNING! Function lexicon entries match same address! '%s' and '%s'\n", 
+								DEBUG_LOG(( "WARNING! Function lexicon entries match same address! '%s' and '%s'",
 														sourceEntry->name, lookAtEntry->name ));
 								valid = FALSE;
 
-							}  // end if
+							}
 
 						// next entry in this target table
 						lookAtEntry++;
 
-					}  // end while
+					}
 
-				}  // end for j
+				}
 
-			}  // end if
+			}
 
 			// next source entry
 			sourceEntry++;
 
-		}  // end while	
+		}
 
-	}  // end for i
+	}
 
 	// return the valid state of our tables
 	return valid;
 
-}  // end validate
+}
 
 //============================================================================
 // FunctionLexicon::gameWinDrawFunc
 //============================================================================
 
 GameWinDrawFunc FunctionLexicon::gameWinDrawFunc( NameKeyType key, TableIndex index )
-{ 
+{
 	if ( index == TABLE_ANY )
 	{
 		// first search the device depended table then the device independent table
 		GameWinDrawFunc func;
 
-		func = (GameWinDrawFunc)findFunction( key, TABLE_GAME_WIN_DEVICEDRAW ); 
+		func = (GameWinDrawFunc)findFunction( key, TABLE_GAME_WIN_DEVICEDRAW );
 		if ( func == NULL )
 		{
-			func = (GameWinDrawFunc)findFunction( key, TABLE_GAME_WIN_DRAW ); 
+			func = (GameWinDrawFunc)findFunction( key, TABLE_GAME_WIN_DRAW );
 		}
 		return func;
 	}
 	// search the specified table
-	return (GameWinDrawFunc)findFunction( key, index ); 
+	return (GameWinDrawFunc)findFunction( key, index );
 }
 
 WindowLayoutInitFunc FunctionLexicon::winLayoutInitFunc( NameKeyType key, TableIndex index )
@@ -705,10 +705,10 @@ WindowLayoutInitFunc FunctionLexicon::winLayoutInitFunc( NameKeyType key, TableI
 		// first search the device depended table then the device independent table
 		WindowLayoutInitFunc func;
 
-		func = (WindowLayoutInitFunc)findFunction( key, TABLE_WIN_LAYOUT_DEVICEINIT ); 
+		func = (WindowLayoutInitFunc)findFunction( key, TABLE_WIN_LAYOUT_DEVICEINIT );
 		if ( func == NULL )
 		{
-			func = (WindowLayoutInitFunc)findFunction( key, TABLE_WIN_LAYOUT_INIT ); 
+			func = (WindowLayoutInitFunc)findFunction( key, TABLE_WIN_LAYOUT_INIT );
 		}
 		return func;
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/GameCommon.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/GameCommon.cpp
index 1535089371a..69be9afe5b4 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/GameCommon.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/GameCommon.cpp
@@ -26,11 +26,11 @@
 // Part of header detangling
 // John McDonald, Aug 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameCommon.h"
 
-const char *TheVeterancyNames[] = 
+const char *const TheVeterancyNames[] =
 {
 	"REGULAR",
 	"VETERAN",
@@ -38,27 +38,30 @@ const char *TheVeterancyNames[] =
 	"HEROIC",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheVeterancyNames) == LEVEL_COUNT + 1, "Incorrect array size");
 
-const char *TheRelationshipNames[] =
+const char *const TheRelationshipNames[] =
 {
 	"ENEMIES",
 	"NEUTRAL",
 	"ALLIES",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheRelationshipNames) == RELATIONSHIP_COUNT + 1, "Incorrect array size");
 
 //-------------------------------------------------------------------------------------------------
+// TheSuperHackers @todo DO NOT USE THIS FUNCTION! Use WWMath::Normalize_Angle instead. Delete this.
 Real normalizeAngle(Real angle)
 {
-	DEBUG_ASSERTCRASH(!_isnan(angle), ("Angle is NAN in normalizeAngle!\n"));
+	DEBUG_ASSERTCRASH(!_isnan(angle), ("Angle is NAN in normalizeAngle!"));
 
 	if( _isnan(angle) )
 		return 0;// ARGH!!!! Don't assert and then not handle it!  Error bad!  Fix error!
 
-	while (angle > PI) 
+	while (angle > PI)
 		angle -= 2*PI;
 
-	while (angle <= -PI) 
+	while (angle <= -PI)
 		angle += 2*PI;
 
 	return angle;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp
deleted file mode 100644
index b2b65f15a79..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp
+++ /dev/null
@@ -1,3576 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Memory.cpp 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: Memory.cpp
-//
-// Created:   Steven Johnson, August 2001
-//
-// Desc:      Memory manager
-//
-// ----------------------------------------------------------------------------
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-// SYSTEM INCLUDES 
-
-// USER INCLUDES 
-#include "Common/GameMemory.h"
-#include "Common/CriticalSection.h"
-#include "Common/Errors.h"
-#include "Common/GlobalData.h"
-#include "Common/PerfTimer.h"
-#ifdef MEMORYPOOL_DEBUG
-#include "GameClient/ClientRandomValue.h"
-#endif
-#ifdef MEMORYPOOL_STACKTRACE
-	#include "Common/StackDump.h"
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-DECLARE_PERF_TIMER(MemoryPoolDebugging)
-DECLARE_PERF_TIMER(MemoryPoolInitFilling)
-#endif
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-
-// ----------------------------------------------------------------------------
-// DEFINES 
-// ----------------------------------------------------------------------------
-
-/** 
-	define MPSB_DLINK to add a backlink to MemoryPoolSingleBlock; this makes it 
-	faster to free raw DMA blocks. 
-	@todo verify this speedup is enough to be worth the extra space
-*/
-#ifndef DISABLE_MEMORYPOOL_MPSB_DLINK
-	#define MPSB_DLINK
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-
-	/**
-		if you define MEMORYPOOL_INTENSE_VERIFY, we do intensive verifications after
-		nearly every memory operation. this is OFF by default, since it slows down 
-		things a lot, but is worth turning on for really obscure memory corruption issues.
-	*/
-	#ifndef MEMORYPOOL_INTENSE_VERIFY
-		#define NO_MEMORYPOOL_INTENSE_VERIFY
-	#endif
-
-	/**
-		if you define MEMORYPOOL_CHECK_BLOCK_OWNERSHIP, we do lots of calls to verify
-		that a block actually belongs to the pool it is called with. this is great
-		for debugging, but can be realllly slow, so is off by default.
-	*/
-	#ifndef MEMORYPOOL_CHECK_BLOCK_OWNERSHIP
-		#define NO_MEMORYPOOL_CHECK_BLOCK_OWNERSHIP
-	#endif
-
-	static const char* FREE_SINGLEBLOCK_TAG_STRING			= "FREE_SINGLEBLOCK_TAG_STRING";
-	const Short SINGLEBLOCK_MAGIC_COOKIE								= 12345;
-	const Int GARBAGE_FILL_VALUE												= 0xdeadbeef;
-
-	// flags for m_debugFlags
-	enum
-	{
-		IGNORE_LEAKS		= 0x0001
-	};
-
-	// in debug mode (but not internal), save stacktraces too
-	#if !defined(MEMORYPOOL_CHECKPOINTING) && defined(MEMORYPOOL_STACKTRACE) && defined(RTS_DEBUG)
-		#define MEMORYPOOL_SINGLEBLOCK_GETS_STACKTRACE
-	#endif
-
-	#define USE_FILLER_VALUE
-
-	const Int MAX_INIT_FILLER_COUNT = 8;
-	#ifdef USE_FILLER_VALUE
-		static UnsignedInt s_initFillerValue = 0xf00dcafe; // will be replaced, should never be this value at runtime
-		static void calcFillerValue(Int index)
-		{
-			s_initFillerValue = (index & 3) << 1;
-			s_initFillerValue |= 0x01;
-			s_initFillerValue |= (~(s_initFillerValue << 4)) & 0xf0;
-			s_initFillerValue |= (s_initFillerValue << 8);
-			s_initFillerValue |= (s_initFillerValue << 16);
-			DEBUG_LOG(("Setting MemoryPool initFillerValue to %08x (index %d)\n",s_initFillerValue,index));
-		}
-	#endif
-
-#endif
-
-#ifdef MEMORYPOOL_BOUNDINGWALL
-
-	#define WALLCOUNT (2)	// default setting of 8 requires 4*4*2==32 extra bytes PER BLOCK
-	#define WALLSIZE	(WALLCOUNT * sizeof(Int))
-
-#endif
-
-#ifdef MEMORYPOOL_STACKTRACE
-
-	#define MEMORYPOOL_STACKTRACE_SIZE				(20)
-	#define MEMORYPOOL_STACKTRACE_SKIP_SIZE		(6)
-	#define MEMORYPOOL_STACKTRACE_SIZE_BYTES	(MEMORYPOOL_STACKTRACE_SIZE * sizeof(void*))
-
-#endif
-
-// ----------------------------------------------------------------------------
-// PRIVATE DATA 
-// ----------------------------------------------------------------------------
-
-#ifdef MEMORYPOOL_BOUNDINGWALL
-
-	static Int theBoundingWallPattern = 0xbabeface;
-
-#endif
-
-#ifdef MEMORYPOOL_STACKTRACE
-
-	/** the max number levels to dump in the stacktrace. a variable rather than
-		constant so that you can fiddle with it in the debugger if desired, to
-		get shorter or longer dumps. (you can't go longer than MEMORYPOOL_STACKTRACE_SIZE
-		in any event. */
-	static Int theStackTraceDepth = 16;
-
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-
-	static Int theTotalSystemAllocationInBytes = 0;
-	static Int thePeakSystemAllocationInBytes = 0;
-	static Int theTotalLargeBlocks = 0;
-	static Int thePeakLargeBlocks = 0;
-	Int theTotalDMA = 0;
-	Int thePeakDMA = 0;
-	Int theWastedDMA = 0;
-	Int thePeakWastedDMA = 0;
-
-#ifdef INTENSE_DMA_BOOKKEEPING
-	struct UsedNPeak
-	{
-		Int used, peak, waste, peakwaste;
-		UsedNPeak() : used(0), peak(0), waste(0), peakwaste(0) { }
-	};
-	typedef std::map< const char*, UsedNPeak, std::less<const char*> > UsedNPeakMap;
-	static UsedNPeakMap TheUsedNPeakMap;
-	static Int doingIntenseDMA = 0;
-#endif
-
-
-#endif
-
-static Bool thePreMainInitFlag = false;
-static Bool theMainInitFlag = false;
-
-// ----------------------------------------------------------------------------
-// PRIVATE PROTOTYPES 
-// ----------------------------------------------------------------------------
-
-/// @todo srj -- make this work for 8
-#define MEM_BOUND_ALIGNMENT 4
-
-static Int roundUpMemBound(Int i);
-static void *sysAllocateDoNotZero(Int numBytes);
-static void sysFree(void* p);
-static void memset32(void* ptr, Int value, Int bytesToFill);
-#ifdef MEMORYPOOL_STACKTRACE
-static void doStackDumpOutput(const char* m);
-static void doStackDump(void **stacktrace, int size);
-#endif
-static void preMainInitMemoryManager();
-
-// ----------------------------------------------------------------------------
-// PRIVATE FUNCTIONS 
-// ----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/** round up to the nearest multiple of MEM_BOUND_ALIGNMENT */
-static Int roundUpMemBound(Int i)
-{
-	return (i + (MEM_BOUND_ALIGNMENT-1)) & ~(MEM_BOUND_ALIGNMENT-1);
-}
-
-//-----------------------------------------------------------------------------
-/** 
-	this is the low-level allocator that we use to request memory from the OS.
-	all (repeat, all) memory allocations in this module should ultimately
-	go thru this routine (or sysAllocate).
-
-	note: throws ERROR_OUT_OF_MEMORY on failure; never returns null
-*/
-static void* sysAllocateDoNotZero(Int numBytes)
-{
-	void* p = ::GlobalAlloc(GMEM_FIXED, numBytes);
-	if (!p)
-		throw ERROR_OUT_OF_MEMORY;
-#ifdef MEMORYPOOL_DEBUG
-	{
-		USE_PERF_TIMER(MemoryPoolDebugging)
-		#ifdef USE_FILLER_VALUE
-		{
-			USE_PERF_TIMER(MemoryPoolInitFilling)
-			::memset32(p, s_initFillerValue, ::GlobalSize(p));
-		}
-		#endif
-		theTotalSystemAllocationInBytes += ::GlobalSize(p);
-		if (thePeakSystemAllocationInBytes < theTotalSystemAllocationInBytes)
-			thePeakSystemAllocationInBytes = theTotalSystemAllocationInBytes;
-	}
-#endif
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-/** 
-	the counterpart to sysAllocate / sysAllocateDoNotZero; used to free blocks
-	allocated by them. it is OK to pass null here (it will just be ignored).
-*/
-static void sysFree(void* p)
-{
-	if (p)
-	{
-#ifdef MEMORYPOOL_DEBUG
-		{
-			USE_PERF_TIMER(MemoryPoolDebugging)
-			::memset32(p, GARBAGE_FILL_VALUE, ::GlobalSize(p));
-			theTotalSystemAllocationInBytes -= ::GlobalSize(p);
-		}
-#endif
-		::GlobalFree(p);
-	}
-}
-
-// ----------------------------------------------------------------------------
-/** 
-	fills memory with a 32-bit value (note: assumes the ptr is 4-byte-aligned)
-*/
-static void memset32(void* ptr, Int value, Int bytesToFill)
-{
-	Int wordsToFill = bytesToFill>>2;
-	bytesToFill -= (wordsToFill<<2);
-
-	Int *p = (Int*)ptr;
-	for (++wordsToFill; --wordsToFill; )
-		*p++ = value;
-
-	Byte *b = (Byte *)p;
-	for (++bytesToFill; --bytesToFill; )
-		*b++ = (Byte)value;
-}
-
-#ifdef MEMORYPOOL_STACKTRACE
-// ----------------------------------------------------------------------------
-/**
-	This is just a convenience routine that dumps output from the StackDump module
-	to our normal debug log file, with a little massaging for formatting.
-*/
-static void doStackDumpOutput(const char* m)
-{
-	const char *PREPEND = "STACKTRACE";
-	if (*m == 0 || strcmp(m, "\n") == 0)
-	{
-		DEBUG_LOG((m));
-	}
-	else
-	{
-		// Note - I am moving the prepend to the end, as this allows double clicking in the 
-		// output window to open the file in VisualStudio.  jba.
-		DEBUG_LOG(("%s,    %s",m, PREPEND));
-	}
-}
-#endif
-
-#ifdef MEMORYPOOL_STACKTRACE
-// ----------------------------------------------------------------------------
-/**
-	dump the given stacktrace to the debug log.
-*/
-static void doStackDump(void **stacktrace, int size)
-{
-	::doStackDumpOutput("Allocation Stack Trace:");
-	::doStackDumpOutput("\n");
-	::StackDumpFromAddresses(stacktrace, size, ::doStackDumpOutput);
-}
-#endif
-
-// ----------------------------------------------------------------------------
-// PRIVATE TYPES 
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	This is a auxiliary record that we allocate in debug modes (actually, checkpoint modes)
-	to retain extra information about blocks; there is a one-to-one correspondence
-	between this record and a block allocation. The interesting bit about this record is that
-	we don't deallocate it when the corresponding block is freed; we retain it so we can
-	later provide information about what blocks were freed when, etc. Yes, this does chew
-	up a lot of memory! That's why it's debug-mode only; the presumption is that developers
-	machines have boatloads of RAM. (Note that we *do* free these when resetCheckpoints() is called.)
-	Note also that we directly allocate/free these with sysAllocate/sysFree, so ctors/dtors
-	are never executed, nor would virtual functions work -- I know, it's a little evil.
-*/
-class BlockCheckpointInfo
-{
-private:
-	BlockCheckpointInfo				*m_next;										///< next checkpoint in this pool/dma
-	const char								*m_debugLiteralTagString;		///< the tagstring for the block
-	Int												m_allocCheckpoint;					///< when it was allocated
-	Int												m_freeCheckpoint;						///< when it was freed (-1 if still in existence)
-	Int												m_blockSize;								///< logical size of the block
-#ifdef MEMORYPOOL_STACKTRACE
-	void*											m_stacktrace[MEMORYPOOL_STACKTRACE_SIZE];		///< stacktrace of when block was allocated
-#endif
-
-	~BlockCheckpointInfo() {};
-
-public:
-
-	BlockCheckpointInfo *getNext();	///< return next checkpointinfo for this pool/dma
-
-	void debugSetFreepoint(Int f);	///< set the checkpoint at which the block was freed.
-
-#ifdef MEMORYPOOL_STACKTRACE
-	void **getStacktraceInfo();			///< return a ptr to the allocation stacktrace info.
-#endif
-	
-	static BlockCheckpointInfo *addToList(
-		BlockCheckpointInfo **pHead,
-		const char *debugLiteralTagString,
-		Int allocCheckpoint,
-		Int blockSize
-	);
-	
-	static void freeList(BlockCheckpointInfo **pHead);
-
-	Bool shouldBeInReport(Int flags, Int startCheckpoint, Int endCheckpoint);
-
-	static void doBlockCheckpointReport( BlockCheckpointInfo *bi, const char *poolName, 
-									Int flags, Int startCheckpoint, Int endCheckpoint );
-};
-
-#endif
-
-// ----------------------------------------------------------------------------
-/**
-	This is the fundamental allocation unit; when you allocate via (say) MemoryPool::allocateBlock,
-	this is what is being allocated for you. (Of course, you don't see the private fields.)
-	For the most part, we allocate big chunks of these in a monolithic Blob and subdivide 
-	from there. (However, we occasionally allocate these individually, for large blocks.)
-
-	Note also that we directly allocate/free these with sysAllocate/sysFree, so ctors/dtors
-	are never executed, nor would virtual functions work -- I know, it's a little evil.
-*/
-class MemoryPoolSingleBlock 
-{
-private:
-
-	MemoryPoolBlob				*m_owningBlob;			///< will be NULL if the single block was allocated via sysAllocate()
-	MemoryPoolSingleBlock	*m_nextBlock;				///< if m_owningBlob is nonnull, this points to next free (unallocated) block in the blob; if m_owningBlob is null, this points to the next used (allocated) raw block in the pool.
-#ifdef MPSB_DLINK
-	MemoryPoolSingleBlock	*m_prevBlock;				///< if m_owningBlob is nonnull, this points to prev free (unallocated) block in the blob; if m_owningBlob is null, this points to the prev used (allocated) raw block in the pool.
-#endif
-#ifdef MEMORYPOOL_CHECKPOINTING
-	BlockCheckpointInfo		*m_checkpointInfo;	///< ptr to the checkpointinfo for this block
-#endif
-#ifdef MEMORYPOOL_BOUNDINGWALL
-	Int										m_wallPattern;			///< unique seed value for the bounding-walls for this block
-#endif
-#ifdef MEMORYPOOL_DEBUG
-	const char						*m_debugLiteralTagString;	///< ptr to the tagstring for this block.
-	Int										m_logicalSize;						///< logical size of block (not including overhead, walls, etc.)
-	Int										m_wastedSize;							///< if allocated via DMA, the "wasted" bytes
-	Short									m_magicCookie;						///< magic value used to verify that the block is one of ours (as opposed to random pointer)
-	Short									m_debugFlags;							///< misc flags
-	#ifdef MEMORYPOOL_SINGLEBLOCK_GETS_STACKTRACE
-	void*									m_stacktrace[MEMORYPOOL_STACKTRACE_SIZE];		///< stacktrace of when block was allocated (if not checkpointing)
-	#endif
-#endif
-
-private:
-
-	void* getUserDataNoDbg();	
-#ifdef MEMORYPOOL_BOUNDINGWALL
-	void debugFillInWalls();	
-#endif
-
-public:
-	
-	static Int calcRawBlockSize(Int logicalSize);
-	static MemoryPoolSingleBlock *rawAllocateSingleBlock(MemoryPoolSingleBlock **pRawListHead, Int logicalSize, MemoryPoolFactory *owningFactory DECLARE_LITERALSTRING_ARG2);
-	void removeBlockFromList(MemoryPoolSingleBlock **pHead);
-
-	void initBlock(Int logicalSize, MemoryPoolBlob *owningBlob, MemoryPoolFactory *owningFactory DECLARE_LITERALSTRING_ARG2);
-	void* getUserData();
-	static MemoryPoolSingleBlock *recoverBlockFromUserData(void* pUserData);
-	MemoryPoolBlob *getOwningBlob();
-
-	MemoryPoolSingleBlock *getNextFreeBlock();
-	void setNextFreeBlock(MemoryPoolSingleBlock *b);
-	MemoryPoolSingleBlock *getNextRawBlock();
-	void setNextRawBlock(MemoryPoolSingleBlock *b);
-
-#ifdef MEMORYPOOL_DEBUG
-	void debugIgnoreLeaksForThisBlock();
-	const char *debugGetLiteralTagString();
-	Int debugGetLogicalSize();
-	Int debugGetWastedSize();
-	void debugSetWastedSize(Int waste);
-	void debugVerifyBlock();
-	void debugMarkBlockAsFree();
-	Bool debugCheckUnderrun();
-	Bool debugCheckOverrun();
-	Int debugSingleBlockReportLeak(const char* owner);
-#endif	// MEMORYPOOL_DEBUG
-#ifdef MEMORYPOOL_CHECKPOINTING
-	BlockCheckpointInfo *debugGetCheckpointInfo();
-	void debugSetCheckpointInfo(BlockCheckpointInfo *bi);
-	void debugResetCheckpoint();
-#endif
-
-};
-// ----------------------------------------------------------------------------
-class MemoryPoolBlob 
-{
-private:
-	MemoryPool							*m_owningPool;				///< the pool that owns this blob
-	MemoryPoolBlob					*m_nextBlob;					///< next blob in this pool
-	MemoryPoolBlob					*m_prevBlob;					///< prev blob in this pool
-	MemoryPoolSingleBlock		*m_firstFreeBlock;		///< ptr to first available block in this blob
-	Int											m_usedBlocksInBlob;		///< total allocated blocks in this blob
-	Int											m_totalBlocksInBlob;	///< total blocks in this blob (allocated + available)
-	char										*m_blockData;					///< ptr to the blocks (really a MemoryPoolSingleBlock*)
-
-public:
-
-	MemoryPoolBlob();
-	~MemoryPoolBlob();
-
-	void initBlob(MemoryPool *owningPool, Int allocationCount);
-
-	void addBlobToList(MemoryPoolBlob **ppHead, MemoryPoolBlob **ppTail);
-	void removeBlobFromList(MemoryPoolBlob **ppHead, MemoryPoolBlob **ppTail);
-	MemoryPoolBlob *getNextInList();
-	Bool hasAnyFreeBlocks();
-
-	MemoryPoolSingleBlock *allocateSingleBlock(DECLARE_LITERALSTRING_ARG1);
-	void freeSingleBlock(MemoryPoolSingleBlock *block);
-
-	MemoryPool *getOwningPool();
-	Int getFreeBlockCount();
-	Int getUsedBlockCount();
-	Int getTotalBlockCount();
-
-#ifdef MEMORYPOOL_DEBUG
-	void debugMemoryVerifyBlob();
-	Int debugBlobReportLeaks(const char* owner);
-	Bool debugIsBlockInBlob(void *pBlock);
-#endif
-#ifdef MEMORYPOOL_CHECKPOINTING
-	void debugResetCheckpoints();
-#endif
-
-};
-
-// ----------------------------------------------------------------------------
-// PUBLIC DATA 
-// ----------------------------------------------------------------------------
-
-MemoryPoolFactory *TheMemoryPoolFactory = NULL;
-DynamicMemoryAllocator *TheDynamicMemoryAllocator = NULL;
-
-// ----------------------------------------------------------------------------
-// INLINES 
-// ----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-inline BlockCheckpointInfo *BlockCheckpointInfo::getNext() { return m_next; }
-inline void BlockCheckpointInfo::debugSetFreepoint(Int f) { DEBUG_ASSERTCRASH(m_freeCheckpoint == -1, ("already have a freepoint")); m_freeCheckpoint = f; }
-#ifdef MEMORYPOOL_STACKTRACE
-inline void **BlockCheckpointInfo::getStacktraceInfo() { return m_stacktrace; }
-#endif
-#endif
-
-// ----------------------------------------------------------------------------
-/**
-	return a ptr to the user-data area of the block (ie, the part the enduser can deal with).
-	this call does NO debug verification and is for internal use of class MemoryPoolSingleBlock only.
-*/
-inline void* MemoryPoolSingleBlock::getUserDataNoDbg()
-{
-	char* p = ((char*)this) + sizeof(MemoryPoolSingleBlock);
-	#ifdef MEMORYPOOL_BOUNDINGWALL
-	p += WALLSIZE;
-	#endif
-	return (void*)p;
-}
-
-/**
-	return a ptr to the user-data area of the block (ie, the part the enduser can deal with).
-	this call verifies that the block is valid in debug mode.
-*/
-inline void* MemoryPoolSingleBlock::getUserData()
-{
-	// yes, verify the block in this case for plain debug mode (not intense-verify mode)
-	#ifdef MEMORYPOOL_DEBUG
-	debugVerifyBlock();
-	#endif
-	return getUserDataNoDbg();
-}
-
-/**
-	given a desired logical block size, calculate the physical size needed for each
-	MemoryPoolSingleBlock (including overhead, etc.)
-*/
-inline /*static*/ Int MemoryPoolSingleBlock::calcRawBlockSize(Int logicalSize) 
-{ 
-	Int s = ::roundUpMemBound(logicalSize) + sizeof(MemoryPoolSingleBlock);
-	#ifdef MEMORYPOOL_BOUNDINGWALL
-	s += WALLSIZE*2;
-	#endif
-	return s;
-}
-
-/**
-	accessor
-*/
-inline MemoryPoolBlob *MemoryPoolSingleBlock::getOwningBlob() 
-{ 
-	return m_owningBlob; 
-}
-
-/**
-	return the next free block in this blob. this call assumes that the block
-	in question belongs to a blob, and will assert if not.
-*/
-inline MemoryPoolSingleBlock *MemoryPoolSingleBlock::getNextFreeBlock() 
-{ 
-	DEBUG_ASSERTCRASH(m_owningBlob != NULL, ("must be called on blob block")); 
-	return m_nextBlock; 
-}
-
-/**
-	set the next free block in this blob. this call assumes that both blocks
-	in question belongs to a blob, but will NOT assert if not, since it may be 
-	called when the blocks are in an inconsistent state.
-*/
-inline void MemoryPoolSingleBlock::setNextFreeBlock(MemoryPoolSingleBlock *b) 
-{ 
-	//DEBUG_ASSERTCRASH(m_owningBlob != NULL && b->m_owningBlob != NULL, ("must be called on blob block")); 
-	// don't check the 'b' block -- we need to call this before 'b' is fully initialized.
-	DEBUG_ASSERTCRASH(m_owningBlob != NULL, ("must be called on blob block")); 
-	this->m_nextBlock = b;
-#ifdef MPSB_DLINK
-	if (b) {
-		b->m_prevBlock = this;
-	}
-#endif
-}
-
-/**
-	return the next raw block in this dma. this call assumes that the block
-	in question does NOT belong to a blob, and will assert if not.
-*/
-inline MemoryPoolSingleBlock *MemoryPoolSingleBlock::getNextRawBlock()
-{ 
-	DEBUG_ASSERTCRASH(m_owningBlob == NULL, ("must be called on raw block")); 
-	return m_nextBlock; 
-}
-
-/**
-	set the next raw block in this dma. this call assumes that the blocks
-	in question do NOT belong to a blob, and will assert if not.
-*/
-inline void MemoryPoolSingleBlock::setNextRawBlock(MemoryPoolSingleBlock *b) 
-{ 
-	DEBUG_ASSERTCRASH(m_owningBlob == NULL && (!b || b->m_owningBlob == NULL), ("must be called on raw block")); 
-	m_nextBlock = b; 
-#ifdef MPSB_DLINK
-	if (b)
-		b->m_prevBlock = this;
-#endif
-}
-
-#ifdef MEMORYPOOL_DEBUG
-inline void MemoryPoolSingleBlock::debugIgnoreLeaksForThisBlock()
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
-	m_debugFlags |= IGNORE_LEAKS;
-}
-/**
-	accessor
-*/
-inline const char *MemoryPoolSingleBlock::debugGetLiteralTagString() 
-{ 
-	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
-	return m_debugLiteralTagString; 
-}
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-/**
-	accessor
-*/
-inline Int MemoryPoolSingleBlock::debugGetLogicalSize() 
-{ 
-	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
-	return m_logicalSize; 
-}
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-/**
-	accessor
-*/
-inline Int MemoryPoolSingleBlock::debugGetWastedSize() 
-{ 
-	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
-	return m_wastedSize; 
-}
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-inline void MemoryPoolSingleBlock::debugSetWastedSize(Int w) 
-{ 
-	//USE_PERF_TIMER(MemoryPoolDebugging) not worth it
-	m_wastedSize = w; 
-}
-#endif
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	accessor
-*/
-inline BlockCheckpointInfo *MemoryPoolSingleBlock::debugGetCheckpointInfo() 
-{ 
-	return m_checkpointInfo; 
-}
-#endif
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	set the checkpoint info for this block.
-*/
-inline void MemoryPoolSingleBlock::debugSetCheckpointInfo(BlockCheckpointInfo *bi) 
-{ 
-	DEBUG_ASSERTCRASH(m_checkpointInfo == NULL, ("should be null")); 
-	m_checkpointInfo = bi; 
-}
-#endif
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	sets the checkpointinfo to null, but does NOT free it... the checkpointinfo
-	is expected to be freed elsewhere.
-*/
-inline void MemoryPoolSingleBlock::debugResetCheckpoint() 
-{ 
-	m_checkpointInfo = NULL; 
-}
-#endif
-
-// ----------------------------------------------------------------------------
-/// accessor
-inline MemoryPoolBlob *MemoryPoolBlob::getNextInList() { return m_nextBlob; }
-/// accessor
-inline Bool MemoryPoolBlob::hasAnyFreeBlocks() { return m_firstFreeBlock != NULL; }
-/// accessor
-inline MemoryPool *MemoryPoolBlob::getOwningPool() { return m_owningPool; }
-/// accessor
-inline Int MemoryPoolBlob::getFreeBlockCount() { return getTotalBlockCount() - getUsedBlockCount(); }
-/// accessor
-inline Int MemoryPoolBlob::getUsedBlockCount() { return m_usedBlocksInBlob; }
-/// accessor
-inline Int MemoryPoolBlob::getTotalBlockCount() { return m_totalBlocksInBlob; }
-
-//-----------------------------------------------------------------------------
-// METHODS for BlockCheckpointInfo
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/// return true iff this checkpointinfo should be included in a checkpointreport with the given parameters.
-Bool BlockCheckpointInfo::shouldBeInReport(Int flags, Int startCheckpoint, Int endCheckpoint)
-{
-	Bool allocFlagsOK = false;
-	Bool freedFlagsOK = false;
-
-	if (m_allocCheckpoint < startCheckpoint && (flags & _REPORT_CP_ALLOCATED_BEFORE))
-		allocFlagsOK = true;
-	if (m_allocCheckpoint >= startCheckpoint && m_allocCheckpoint < endCheckpoint && (flags & _REPORT_CP_ALLOCATED_BETWEEN))
-		allocFlagsOK = true;
-
-	if (m_freeCheckpoint == -1)
-	{
-		// block still exists! process this only if we want 'em.
-		freedFlagsOK = (flags & _REPORT_CP_FREED_NEVER) ? true : false;
-	}
-	else
-	{
-		if (m_freeCheckpoint < startCheckpoint && (flags & _REPORT_CP_FREED_BEFORE))
-			freedFlagsOK = true;
-		if (m_freeCheckpoint >= startCheckpoint && m_freeCheckpoint < endCheckpoint && (flags & _REPORT_CP_FREED_BETWEEN))
-			freedFlagsOK = true;
-	}
-
-	// the block must match both the 'alloc' and 'free' criteria to get a report
-	return allocFlagsOK && freedFlagsOK;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/// print a checkpointreport for the given checkpointinfo. if checkpointinfo is null, print column headers.
-/*static*/ void BlockCheckpointInfo::doBlockCheckpointReport(BlockCheckpointInfo *bi, 
-			const char *poolName, Int flags, Int startCheckpoint, Int endCheckpoint )
-{
-	const char *PREPEND = "BLOCKINFO";	// allows grepping more easily
-
-	if (!bi)
-	{
-		DEBUG_LOG(("%s,%32s,%6s,%6s,%6s,%s\n",PREPEND,"POOLNAME","BLKSZ","ALLOC","FREED","BLOCKNAME"));
-	}
-	else
-	{
-		DEBUG_ASSERTCRASH(startCheckpoint >= 0 && startCheckpoint <= endCheckpoint, ("bad checkpoints"));
-		DEBUG_ASSERTCRASH((flags & _REPORT_CP_ALLOCATED_DONTCARE) != 0, ("bad flags: must set at least one alloc flag"));
-		DEBUG_ASSERTCRASH((flags & _REPORT_CP_FREED_DONTCARE) != 0, ("bad flags: must set at least one freed flag"));
-
-		if (bi->shouldBeInReport(flags, startCheckpoint, endCheckpoint))
-		{
-			DEBUG_LOG(("%s,%32s,%6d,%6d,%6d,%s\n",PREPEND,poolName,bi->m_blockSize,bi->m_allocCheckpoint,bi->m_freeCheckpoint,bi->m_debugLiteralTagString));
-	#ifdef MEMORYPOOL_STACKTRACE
-			if (flags & REPORT_CP_STACKTRACE)
-			{
-				::doStackDump(bi->m_stacktrace, min(MEMORYPOOL_STACKTRACE_SIZE, theStackTraceDepth ));
-			}
-	#endif
-		}
-	}
-}
-#endif
-
-// ----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/// free an entire list of checkpointinfos.
-/*static*/ void BlockCheckpointInfo::freeList(BlockCheckpointInfo **pHead)
-{
-	BlockCheckpointInfo *p = *pHead;
-	while (p)
-	{
-		BlockCheckpointInfo *n = p->m_next;
-		::sysFree((void *)p);
-		p = n;
-	}
-	*pHead = NULL;
-}
-#endif
-
-// ----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	allocate a new checkpointinfo with the given tag/checkpoint/size, add it to the
-	linked list, and return the checkpointinfo. (note that this will NOT throw an exception;
-	if there is not enough memory to allocate a new checkpointinfo, it will quietly return null.)
-*/
-/*static*/ BlockCheckpointInfo *BlockCheckpointInfo::addToList(
-	BlockCheckpointInfo **pHead,
-	const char *debugLiteralTagString,
-	Int allocCheckpoint,
-	Int blockSize
-)
-{
-	DEBUG_ASSERTCRASH(debugLiteralTagString != FREE_SINGLEBLOCK_TAG_STRING, ("bad tag string"));
-
-	BlockCheckpointInfo *freed = NULL;
-	try {
-		freed = (BlockCheckpointInfo *)::sysAllocateDoNotZero(sizeof(BlockCheckpointInfo));
-	} catch (...) {
-		freed = NULL;
-	}
-	if (freed) 
-	{
-		DEBUG_ASSERTCRASH(debugLiteralTagString != NULL, ("null tagstrings are not allowed"));
-		freed->m_debugLiteralTagString = debugLiteralTagString;
-		freed->m_allocCheckpoint = allocCheckpoint;
-		freed->m_freeCheckpoint = -1;
-		freed->m_blockSize = blockSize;
-		freed->m_next = *pHead;
-		*pHead = freed;
-	}
-	return freed;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// METHODS for MemoryPoolSingleBlock
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/**
-	fill in a block's fields. this is usually done only just after a block is allocated,
-	but might also be done at other points in debug mode.
-*/
-void MemoryPoolSingleBlock::initBlock(Int logicalSize, MemoryPoolBlob *owningBlob, 
-			MemoryPoolFactory *owningFactory DECLARE_LITERALSTRING_ARG2)
-{
-	// Note that while it is OK for owningBlob to be null, it is NEVER ok
-	// for owningFactory to be null.
-	DEBUG_ASSERTCRASH(owningFactory, ("null factory"));
-
-#ifdef MEMORYPOOL_DEBUG
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-	m_magicCookie = SINGLEBLOCK_MAGIC_COOKIE;
-	m_debugFlags = 0;
-	if (!theMainInitFlag)
-		debugIgnoreLeaksForThisBlock();
-	DEBUG_ASSERTCRASH(debugLiteralTagString != NULL, ("null tagstrings are not allowed"));
-	m_debugLiteralTagString = debugLiteralTagString;
-	m_logicalSize = logicalSize;
-	m_wastedSize = 0;
-
-#ifdef MEMORYPOOL_SINGLEBLOCK_GETS_STACKTRACE
-	if (theStackTraceDepth > 0 && (!TheGlobalData || TheGlobalData->m_checkForLeaks)) 
-	{
-		memset(m_stacktrace, 0, MEMORYPOOL_STACKTRACE_SIZE_BYTES);
-		::FillStackAddresses(m_stacktrace, min(MEMORYPOOL_STACKTRACE_SIZE, theStackTraceDepth), MEMORYPOOL_STACKTRACE_SKIP_SIZE);
-	}
-	else 
-	{
-		m_stacktrace[0] = NULL;
-	}
-#endif
-}
-#endif // MEMORYPOOL_DEBUG
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-	m_checkpointInfo = NULL;
-#endif
-
-#ifdef MEMORYPOOL_BOUNDINGWALL
-	m_wallPattern = theBoundingWallPattern++;
-	debugFillInWalls();
-#endif
-
-	m_nextBlock = NULL;
-#ifdef MPSB_DLINK
-	m_prevBlock = NULL;
-#endif
-	m_owningBlob = owningBlob;	// could be NULL
-}
-
-//-----------------------------------------------------------------------------
-/**
-	given a 'public' ptr to a block (ie, the ptr returned by the MemoryPool::allocateBlock),
-	recover the ptr to the MemoryPoolSingleBlock, so we can access the hidden fields.
-*/
-/* static */ MemoryPoolSingleBlock *MemoryPoolSingleBlock::recoverBlockFromUserData(void* pUserData)
-{
-	DEBUG_ASSERTCRASH(pUserData, ("null pUserData"));
-	if (!pUserData)
-		return NULL;
-	char* p = ((char*)pUserData) - sizeof(MemoryPoolSingleBlock);
-	#ifdef MEMORYPOOL_BOUNDINGWALL
-	p -= WALLSIZE;
-	#endif
-	MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)p;
-// yes, verify the block in this case for plain debug mode (not intense-verify mode)
-#ifdef MEMORYPOOL_DEBUG
-	block->debugVerifyBlock();
-#endif
-	return block;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	allocate and initialize a single block. this should only used by DynamicMemoryAllocator
-	when allocating an extraordinarily large block.
-*/
-/*static*/ MemoryPoolSingleBlock *MemoryPoolSingleBlock::rawAllocateSingleBlock(
-	MemoryPoolSingleBlock **pRawListHead, 
-	Int logicalSize, 
-	MemoryPoolFactory *owningFactory
-	DECLARE_LITERALSTRING_ARG2)
-{
-	MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)::sysAllocateDoNotZero(calcRawBlockSize(logicalSize));
-	block->initBlock(logicalSize, NULL, owningFactory PASS_LITERALSTRING_ARG2);
-	block->setNextRawBlock(*pRawListHead);
-	*pRawListHead = block;
-	return block;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	remove the block from the list, which is presumed to be a list of raw blocks.
-	generally, only the DynamicMemoryAllocator should call this.
-*/
-void MemoryPoolSingleBlock::removeBlockFromList(MemoryPoolSingleBlock **pHead)
-{
-	DEBUG_ASSERTCRASH(this->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
-#ifdef MPSB_DLINK
-	DEBUG_ASSERTCRASH(this->m_nextBlock == NULL || this->m_nextBlock->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
-	if (this->m_prevBlock)
-	{
-		DEBUG_ASSERTCRASH(this->m_prevBlock->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
-		DEBUG_ASSERTCRASH(*pHead != this, ("bad linkage"));
-		this->m_prevBlock->m_nextBlock = this->m_nextBlock;
-	}
-	else
-	{
-		DEBUG_ASSERTCRASH(*pHead == this, ("bad linkage"));
-		*pHead = this->m_nextBlock;
-	}
-
-	if (this->m_nextBlock)
-	{
-		DEBUG_ASSERTCRASH(this->m_nextBlock->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
-		this->m_nextBlock->m_prevBlock = this->m_prevBlock;
-	}
-#else
-	// this isn't very efficient, and may need upgrading... but to do so
-	// would require adding a back link, so I'd rather do some testing
-	// first to see if it's really a speed issue in practice. (the only place
-	// this is used is when freeing 'raw' blocks allocated via the DMA).
-	MemoryPoolSingleBlock *prev = NULL;
-	for (MemoryPoolSingleBlock *cur = *pHead; cur; cur = cur->m_nextBlock)
-	{
-		DEBUG_ASSERTCRASH(cur->m_owningBlob == NULL, ("this function should only be used on raw blocks"));
-		if (cur == this)
-		{
-			if (prev)
-			{
-				prev->m_nextBlock = this->m_nextBlock;
-			}
-			else
-			{
-				*pHead = this->m_nextBlock;
-			}
-			break;
-		}
-		prev = cur;
-	}
-#endif
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-Int MemoryPoolSingleBlock::debugSingleBlockReportLeak(const char* owner)
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	// if allocated before main... just ignore the leak.
-	if (m_debugFlags & IGNORE_LEAKS)
-		return 0;
-
-	// it's free, ergo, not leaked.
-	if (m_debugLiteralTagString == FREE_SINGLEBLOCK_TAG_STRING)
-		return 0;
-
-	if (strcmp(m_debugLiteralTagString, "STR_AsciiString::ensureUniqueBufferOfSize") == 0)
-	{
-		/** @todo srj -- we leak a bunch of these for some reason (probably due to leaking Win32LocalFile)
-			so just ignore 'em for now... figure out later. */
-	}
-	else if (strstr(m_debugLiteralTagString, "Win32LocalFileSystem.cpp") != NULL)
-	{
-		/** @todo srj -- we leak a bunch of these for some reason 
-			so just ignore 'em for now... figure out later. */
-	}
-	else
-	{
-		DEBUG_LOG(("Leaked a block of size %d, tagstring %s, from pool/dma %s\n",m_logicalSize,m_debugLiteralTagString,owner));
-	}
-
-	#ifdef MEMORYPOOL_SINGLEBLOCK_GETS_STACKTRACE
-	if (!TheGlobalData || TheGlobalData->m_checkForLeaks)
-		::doStackDump(m_stacktrace, min(MEMORYPOOL_STACKTRACE_SIZE, theStackTraceDepth));
-	#endif
-
-	return 1;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	Verify internal consistency of this block.
-*/
-void MemoryPoolSingleBlock::debugVerifyBlock()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	DEBUG_ASSERTCRASH(this, ("null this"));
-	DEBUG_ASSERTCRASH(m_magicCookie == SINGLEBLOCK_MAGIC_COOKIE, ("wrong cookie"));
-	DEBUG_ASSERTCRASH(m_debugLiteralTagString != NULL, ("bad tagstring"));
-	/// @todo Put this check back in after the AI memory usage is under control (MSB)
-	//DEBUG_ASSERTCRASH(m_logicalSize>0 && m_logicalSize < 0x00ffffff, ("unlikely value for m_logicalSize"));
-	DEBUG_ASSERTCRASH(!m_nextBlock || m_nextBlock->m_owningBlob == m_owningBlob, ("owning blob mismatch..."));
-#ifdef MPSB_DLINK
-	DEBUG_ASSERTCRASH(!m_prevBlock || m_prevBlock->m_owningBlob == m_owningBlob, ("owning blob mismatch..."));
-#endif
-	debugCheckUnderrun();
-	debugCheckOverrun();
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	Fill block with bogus values and mark other internal fields for debugging purposes.
-*/
-void MemoryPoolSingleBlock::debugMarkBlockAsFree()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	::memset32(getUserDataNoDbg(), GARBAGE_FILL_VALUE, m_logicalSize);
-	m_debugLiteralTagString = FREE_SINGLEBLOCK_TAG_STRING;
-	#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugVerifyBlock();
-	#endif
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	Returns true iff someone overwrote part of the first bounding wall
-	(ie, tromped on memory just before the block)
-*/
-Bool MemoryPoolSingleBlock::debugCheckUnderrun()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-#ifdef MEMORYPOOL_BOUNDINGWALL
-	Int *p = (Int*)(((char*)getUserDataNoDbg()) - WALLSIZE);
-	for (Int i = 0; i < WALLCOUNT; i++, p++)
-	{
-		if (*p != m_wallPattern+i)
-		{
-			DEBUG_CRASH(("memory underrun for block \"%s\" (expected %08x, got %08x)\n",m_debugLiteralTagString,m_wallPattern+i,*p));
-			return true;
-		}
-	}
-#endif
-	return false;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	Returns true iff someone overwrote part of the second bounding wall
-	(ie, tromped on memory just after the block)
-*/
-Bool MemoryPoolSingleBlock::debugCheckOverrun()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-#ifdef MEMORYPOOL_BOUNDINGWALL
-	Int *p = (Int*)(((char*)getUserDataNoDbg()) + m_logicalSize);
-	for (Int i = 0; i < WALLCOUNT; i++, p++)
-	{
-		if (*p != m_wallPattern-i)
-		{
-			DEBUG_CRASH(("memory overrun for block \"%s\" (expected %08x, got %08x)\n",m_debugLiteralTagString,m_wallPattern+i,*p));
-			return true;
-		}
-	}
-#endif
-	return false;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_BOUNDINGWALL
-/**
-	Fill in the proper values for this block's bounding walls.
-*/
-void MemoryPoolSingleBlock::debugFillInWalls()
-{
-	Int *p;
-	Int i;
-
-	p = (Int*)(((char*)getUserDataNoDbg()) - WALLSIZE);
-	for (i = 0; i < WALLCOUNT; i++)
-		*p++ = m_wallPattern+i;
-
-	p = (Int*)(((char*)getUserDataNoDbg()) + m_logicalSize);
-	for (i = 0; i < WALLCOUNT; i++)
-		*p++ = m_wallPattern-i;
-
-	#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugVerifyBlock();
-	#endif
-}
-#endif
-
-
-//-----------------------------------------------------------------------------
-// METHODS for MemoryPoolBlob
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/**
-	fill in safe default values.
-*/
-MemoryPoolBlob::MemoryPoolBlob() :
-	m_owningPool(NULL),
-	m_nextBlob(NULL),
-	m_prevBlob(NULL),
-	m_firstFreeBlock(NULL),
-	m_usedBlocksInBlob(0),
-	m_totalBlocksInBlob(0),
-	m_blockData(NULL)
-{
-}
-
-//-----------------------------------------------------------------------------
-/**
-	throw away the blob. free the block data, if any.
-*/
-MemoryPoolBlob::~MemoryPoolBlob()
-{
-	::sysFree((void *)m_blockData);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	initialize a Blob; this is called just after the blob is allocated.
-	allocate space for the blocks in this blob and initialize all those blocks.
-*/
-void MemoryPoolBlob::initBlob(MemoryPool *owningPool, Int allocationCount)
-{
-	DEBUG_ASSERTCRASH(m_blockData == NULL, ("unlikely init call"));
-
-	m_owningPool = owningPool;
-	m_totalBlocksInBlob = allocationCount;
-	m_usedBlocksInBlob = 0;
-
-	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
-	m_blockData = (char *)::sysAllocateDoNotZero(rawBlockSize * m_totalBlocksInBlob);	// throws on failure
-
-	// set up the list of free blocks in the blob (namely, all of 'em)
-	MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)m_blockData;
-	MemoryPoolSingleBlock *next;
-	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--)
-	{
-		next = (MemoryPoolSingleBlock *)(((char *)block) + rawBlockSize);
-#ifdef MEMORYPOOL_DEBUG
-		block->initBlock(m_owningPool->getAllocationSize(), this, owningPool->getOwningFactory(), FREE_SINGLEBLOCK_TAG_STRING);
-#else
-		block->initBlock(m_owningPool->getAllocationSize(), this, owningPool->getOwningFactory());
-#endif
-		block->setNextFreeBlock((i > 0) ? next : NULL);
-#ifdef MEMORYPOOL_DEBUG
-		block->debugMarkBlockAsFree();
-#endif
-		block = next;
-	}
-	m_firstFreeBlock = (MemoryPoolSingleBlock *)m_blockData;
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerifyBlob();
-#endif
-}
-
-//-----------------------------------------------------------------------------
-/**
-	add this blob to a given pool's list-of-blobs
-*/
-void MemoryPoolBlob::addBlobToList(MemoryPoolBlob **ppHead, MemoryPoolBlob **ppTail)
-{
-	m_prevBlob = *ppTail;
-	m_nextBlob =  NULL;
-
-	if (*ppTail != NULL)
-		(*ppTail)->m_nextBlob = this;
-
-	if (*ppHead == NULL)
-		*ppHead = this;
-
-	*ppTail = this;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	remove this blob from a given pool's list-of-blobs
-*/
-void MemoryPoolBlob::removeBlobFromList(MemoryPoolBlob **ppHead, MemoryPoolBlob **ppTail)
-{
-	if (*ppHead == this)
-		*ppHead = this->m_nextBlob;
-	else
-		this->m_prevBlob->m_nextBlob = this->m_nextBlob;
-		
-	if (*ppTail == this)
-		*ppTail = this->m_prevBlob;
-	else
-		this->m_nextBlob->m_prevBlob = this->m_prevBlob;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	grab a free block from this blob, mark it as taken, and return it.
-	this method assumes that there is at least one free block in the blob!
-*/
-MemoryPoolSingleBlock *MemoryPoolBlob::allocateSingleBlock(DECLARE_LITERALSTRING_ARG1)
-{
-	DEBUG_ASSERTCRASH(m_firstFreeBlock, ("no free blocks available in MemoryPoolBlob"));
-	
-	MemoryPoolSingleBlock *block = m_firstFreeBlock;
-	m_firstFreeBlock = block->getNextFreeBlock();
-	++m_usedBlocksInBlob;
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	block->debugVerifyBlock();
-#endif
-#ifdef MEMORYPOOL_DEBUG
-	// this is debug-only because it only serves to update the debugLiteralTagString.
-	block->initBlock(m_owningPool->getAllocationSize(), this, m_owningPool->getOwningFactory(), debugLiteralTagString);
-#endif
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerifyBlob();
-#endif
-
-//	don't need to zero this out... the caller will do that, if necessary
-//	memset(block->getUserData(), 0, m_owningPool->getAllocationSize());
-
-	return block;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	make this block available for future allocations. it is assumed that the block
-	belongs to this blob, and is not already free. 
-*/
-void MemoryPoolBlob::freeSingleBlock(MemoryPoolSingleBlock *block)
-{	
-	DEBUG_ASSERTCRASH(block->getOwningBlob() == this, ("block does not belong to this blob"));
-
-	block->setNextFreeBlock(m_firstFreeBlock);
-	m_firstFreeBlock = block;
-	--m_usedBlocksInBlob;
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	block->debugVerifyBlock();
-#endif
-#ifdef MEMORYPOOL_DEBUG
-	block->debugMarkBlockAsFree();
-#endif
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerifyBlob();
-#endif
-	
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	Perform internal consistency checking on this blob and all its blocks.
-*/
-void MemoryPoolBlob::debugMemoryVerifyBlob()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	DEBUG_ASSERTCRASH(m_owningPool != NULL, ("bad owner"));
-	DEBUG_ASSERTCRASH(m_usedBlocksInBlob >= 0 && m_usedBlocksInBlob <= m_totalBlocksInBlob, ("unlikely m_usedBlocksInBlob"));
-	DEBUG_ASSERTCRASH(m_totalBlocksInBlob > 0, ("unlikely m_totalBlocksInBlob"));
-
-	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
-	char *blockData = m_blockData;
-	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--, blockData += rawBlockSize)
-	{
-		MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)blockData;
-		block->debugVerifyBlock();
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-Int MemoryPoolBlob::debugBlobReportLeaks(const char* owner)
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	Int any = 0;
-	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
-	char *blockData = m_blockData;
-	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--, blockData += rawBlockSize)
-	{
-		MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)blockData;
-		any += block->debugSingleBlockReportLeak(owner);
-	}
-	return any;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return true iff this block belongs to this blob.
-*/
-Bool MemoryPoolBlob::debugIsBlockInBlob(void *pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
-	char *blockData = m_blockData;
-	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--)
-	{
-		if ((char *)block == blockData)
-			return true;
-		blockData += rawBlockSize;
-	}
-	return false;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	set all the checkpointinfos to null for all the blocks in this blob.
-	this does NOT free the checkpointinfos; that is presumed to happen elsewhere.
-*/
-void MemoryPoolBlob::debugResetCheckpoints()
-{
-	Int rawBlockSize = MemoryPoolSingleBlock::calcRawBlockSize(m_owningPool->getAllocationSize());
-	char *blockData = m_blockData;
-	for (Int i = m_totalBlocksInBlob-1; i >= 0; i--, blockData += rawBlockSize)
-	{
-		MemoryPoolSingleBlock *block = (MemoryPoolSingleBlock *)blockData;
-		block->debugResetCheckpoint();
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// METHODS for Checkpointable
-//-----------------------------------------------------------------------------
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-//-----------------------------------------------------------------------------
-/**
-	init fields of Checkpointable to safe values.
-*/
-Checkpointable::Checkpointable() : 
-	m_firstCheckpointInfo(NULL), 
-	m_cpiEverFailed(false)
-{
-}
-#endif
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-//-----------------------------------------------------------------------------
-/**
-	destroy the object. discard any remaining checkpointinfo.
-*/
-Checkpointable::~Checkpointable()
-{
-	BlockCheckpointInfo::freeList(&m_firstCheckpointInfo);
-	m_firstCheckpointInfo = NULL;
-	m_cpiEverFailed = false;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	create a new checkpointinfo and fill it in appropriately. this does NOT
-	throw an exception on failure; it quietly returns null if there is not
-	enough memory, and sets a flag to indicate our checkpointinfo is not complete.
-*/
-BlockCheckpointInfo *Checkpointable::debugAddCheckpointInfo(
-	const char *debugLiteralTagString,
-	Int allocCheckpoint,
-	Int blockSize
-)
-{
-
-	BlockCheckpointInfo *bi = BlockCheckpointInfo::addToList(&m_firstCheckpointInfo, debugLiteralTagString,
-				allocCheckpoint, blockSize);
-
-	if (bi)
-	{
-#ifdef MEMORYPOOL_STACKTRACE
-		void **stacktrace = bi->getStacktraceInfo();
-		if (theStackTraceDepth > 0 && !TheGlobalData || TheGlobalData->m_checkForLeaks) 
-		{
-			memset(stacktrace, 0, MEMORYPOOL_STACKTRACE_SIZE_BYTES);
-			::FillStackAddresses(stacktrace, min(MEMORYPOOL_STACKTRACE_SIZE, theStackTraceDepth), MEMORYPOOL_STACKTRACE_SKIP_SIZE);
-		}
-		else 
-		{
-			stacktrace[0] = NULL;
-		}
-#endif
-	}
-	else
-	{
-		m_cpiEverFailed = true;
-	}
-
-	return bi;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	print a report on the checkpointinfos belonging to this pool/dma.
-*/
-void Checkpointable::debugCheckpointReport( Int flags, Int startCheckpoint, Int endCheckpoint, const char *poolName )
-{
-	DEBUG_ASSERTCRASH(startCheckpoint >= 0 && startCheckpoint <= endCheckpoint, ("bad checkpoints"));
-	DEBUG_ASSERTCRASH((flags & _REPORT_CP_ALLOCATED_DONTCARE) != 0, ("bad flags: must set at least one alloc flag"));
-	DEBUG_ASSERTCRASH((flags & _REPORT_CP_FREED_DONTCARE) != 0, ("bad flags: must set at least one freed flag"));
-
-	if (m_cpiEverFailed)
-	{
-		DEBUG_LOG(("  *** WARNING *** info on freed blocks may be inaccurate or incomplete!\n"));
-	}
-
-	for (BlockCheckpointInfo *bi = m_firstCheckpointInfo; bi; bi = bi->getNext())
-	{
-		BlockCheckpointInfo::doBlockCheckpointReport( bi, poolName, flags, startCheckpoint, endCheckpoint );
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	throw away all the checkpointinfos. this frees the memory, but blocks might still
-	refer to the discarded infos; you must zero those elsewhere.
-*/
-void Checkpointable::debugResetCheckpoints()
-{
-	BlockCheckpointInfo::freeList(&m_firstCheckpointInfo);
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// METHODS for MemoryPool
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/**
-	init to safe values.
-*/
-MemoryPool::MemoryPool() :
-	m_factory(NULL),
-	m_nextPoolInFactory(NULL),
-	m_poolName(""),
-	m_allocationSize(0),
-	m_initialAllocationCount(0),
-	m_overflowAllocationCount(0),
-	m_usedBlocksInPool(0),
-	m_totalBlocksInPool(0),
-	m_peakUsedBlocksInPool(0),
-	m_firstBlob(NULL),
-	m_lastBlob(NULL),
-	m_firstBlobWithFreeBlocks(NULL)
-{
-}
-
-//-----------------------------------------------------------------------------
-/**
-	initialize the memory pool with the given parameters. allocate the initial
-	set of blocks.
-*/
-void MemoryPool::init(MemoryPoolFactory *factory, const char *poolName, Int allocationSize, Int initialAllocationCount, Int overflowAllocationCount)
-{
-	m_factory = factory;
-	m_poolName = poolName;
-	m_allocationSize = ::roundUpMemBound(allocationSize);	// round up to four-byte boundary
-	m_initialAllocationCount = initialAllocationCount;
-	m_overflowAllocationCount = overflowAllocationCount;
-	m_usedBlocksInPool = 0;
-	m_totalBlocksInPool = 0;
-	m_peakUsedBlocksInPool = 0;
-	m_firstBlob = NULL;
-	m_lastBlob = NULL;
-	m_firstBlobWithFreeBlocks = NULL;
-
-	// go ahead and init the initial block here (will throw on failure)
-	createBlob(m_initialAllocationCount);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	throw away the pool, and all blocks/blobs associated with it.
-*/
-MemoryPool::~MemoryPool()
-{   
-	// toss everything. we could do this slightly more efficiently,
-	// but not really worth the extra code to do so.
-	while (m_firstBlob) 
-	{
-		freeBlob(m_firstBlob);
-	}
-}
-
-//-----------------------------------------------------------------------------
-/**
-	create a new blob for this pool. if you set up good values for initialAllocationCount,
-	this should rarely (if ever) be called (though during development it will be called
-	frequently).
-*/
-MemoryPoolBlob* MemoryPool::createBlob(Int allocationCount)
-{
-	DEBUG_ASSERTCRASH(allocationCount > 0 && allocationCount%MEM_BOUND_ALIGNMENT==0, ("bad allocationCount (must be >0 and evenly divisible by %d)",MEM_BOUND_ALIGNMENT));
-
-	MemoryPoolBlob* blob = new (::sysAllocateDoNotZero(sizeof MemoryPoolBlob)) MemoryPoolBlob;	// will throw on failure
-
-	blob->initBlob(this, allocationCount);	// will throw on failure
-
-	blob->addBlobToList(&m_firstBlob, &m_lastBlob);
-
-	DEBUG_ASSERTCRASH(m_firstBlobWithFreeBlocks == NULL, ("DO NOT IGNORE. Please call John McD - x36872 (m_firstBlobWithFreeBlocks != NULL)"));
-	m_firstBlobWithFreeBlocks = blob;
-
-	// bookkeeping
-	m_totalBlocksInPool += allocationCount;
-
-#ifdef MEMORYPOOL_DEBUG
-	m_factory->adjustTotals("", 0, allocationCount*getAllocationSize());
-#endif
-
-	return blob;
-}
-	
-//-----------------------------------------------------------------------------
-/**
-	throw away a given blob, and all its blocks. it's assumed that the blob belongs
-	to this pool.
-*/
-Int MemoryPool::freeBlob(MemoryPoolBlob* blob)
-{
-	DEBUG_ASSERTCRASH(blob, ("null blob"));
-	DEBUG_ASSERTCRASH(blob->getOwningPool() == this, ("blob does not belong to this pool"));
-
-	// save these for later...
-	Int totalBlocksInBlob = blob->getTotalBlockCount();
-	Int usedBlocksInBlob = blob->getUsedBlockCount();
-	DEBUG_ASSERTCRASH(usedBlocksInBlob == 0, ("freeing a nonempty blob (%d)\n",usedBlocksInBlob));
-
-	// this is really just an estimate... will be too small in debug mode.
-	Int amtFreed = totalBlocksInBlob * getAllocationSize() + sizeof(MemoryPoolBlob);
-
-	// de-link it from our list
-	blob->removeBlobFromList(&m_firstBlob, &m_lastBlob);
-	
-	// ensure that the 'first free' blob is still a valid blob. 
-	// (doesn't need to actually have free blocks, just be a valid blob) 
-	if (m_firstBlobWithFreeBlocks == blob)
-		m_firstBlobWithFreeBlocks = m_firstBlob;
-
-	// this is evil... since there is no 'placement delete' we must do this the hard way
-	// and call the dtor directly. ordinarily this is heinous, but in this case we'll
-	// make an exception.
-	blob->~MemoryPoolBlob();
-	::sysFree((void *)blob);
-
-	// finally... bookkeeping
-	m_usedBlocksInPool -= usedBlocksInBlob;
-	m_totalBlocksInPool -= totalBlocksInBlob;
-
-#ifdef MEMORYPOOL_DEBUG
-	m_factory->adjustTotals("", -usedBlocksInBlob*getAllocationSize(), -totalBlocksInBlob*getAllocationSize());
-#endif
-
-	return amtFreed;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	allocate a block from this pool and return it, but don't bother zeroing
-	out the block. if unable to allocate, throw ERROR_OUT_OF_MEMORY. this
-	function will never return null.
-*/
-void* MemoryPool::allocateBlockDoNotZeroImplementation(DECLARE_LITERALSTRING_ARG1)
-{
-	ScopedCriticalSection scopedCriticalSection(TheMemoryPoolCriticalSection);
-
-	if (m_firstBlobWithFreeBlocks != NULL && !m_firstBlobWithFreeBlocks->hasAnyFreeBlocks()) 
-	{
-		// hmm... the current 'free' blob has nothing available. look and see if there
-		// are any other existing blobs with freespace.
-		MemoryPoolBlob *blob = m_firstBlob;
-		for (; blob != NULL; blob = blob->getNextInList()) 
-		{
-			if (blob->hasAnyFreeBlocks())
-			 	break;
-		}
-
-		// note that if we walk thru the list without finding anything, this will 
-		// reset m_firstBlobWithFreeBlocks to null and fall thru.
-	 	m_firstBlobWithFreeBlocks = blob;
-	}
-	
-	// OK, if we are here then we have no blobs with freespace... darn.
-	// allocate an overflow block.
-	if (m_firstBlobWithFreeBlocks == NULL) 
-	{
-		if (m_overflowAllocationCount == 0)
-		{
-			throw ERROR_OUT_OF_MEMORY;	// this pool is not allowed to grow
-		}
-		else 
-		{
-			createBlob(m_overflowAllocationCount); // throws on failure
-		}
-	}
-	
-	MemoryPoolBlob *blob = m_firstBlobWithFreeBlocks;
-
-	DEBUG_ASSERTCRASH(blob, ("no blob with free blocks available in MemoryPool::allocate"));
-		
-	MemoryPoolSingleBlock *block = blob->allocateSingleBlock(PASS_LITERALSTRING_ARG1);
-	DEBUG_ASSERTCRASH(block, ("should not fail here"));
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-	BlockCheckpointInfo *bi = debugAddCheckpointInfo(block->debugGetLiteralTagString(), m_factory->getCurCheckpoint(), getAllocationSize());
-	if (bi)
-		block->debugSetCheckpointInfo(bi);
-#endif
-
-	// bookkeeping
-	++m_usedBlocksInPool;
-	if (m_peakUsedBlocksInPool < m_usedBlocksInPool)
-		m_peakUsedBlocksInPool = m_usedBlocksInPool;
-
-#ifdef MEMORYPOOL_DEBUG
-	m_factory->adjustTotals(debugLiteralTagString, 1*getAllocationSize(), 0);
-	#ifdef USE_FILLER_VALUE
-	{
-		USE_PERF_TIMER(MemoryPoolInitFilling)
-		::memset32(block->getUserData(), s_initFillerValue, getAllocationSize());
-	}
-	#endif
-#endif
-
-	return block->getUserData();
-}
-
-//-----------------------------------------------------------------------------
-/**
-	allocate a block from this pool and return it, and zero out the contents
-	of the block. if unable to allocate, throw ERROR_OUT_OF_MEMORY. this
-	function will never return null.
-*/
-void* MemoryPool::allocateBlockImplementation(DECLARE_LITERALSTRING_ARG1)
-{
-	void* p = allocateBlockDoNotZeroImplementation(PASS_LITERALSTRING_ARG1);	// throws on failure
-	memset(p, 0, getAllocationSize());
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	free a block allocated by this pool. it's ok to pass null.
-*/
-void MemoryPool::freeBlock(void* pBlockPtr)
-{
-	if (!pBlockPtr)
-		return;	// my, that was easy
-
-	ScopedCriticalSection scopedCriticalSection(TheMemoryPoolCriticalSection);
-
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	MemoryPoolBlob *blob = block->getOwningBlob();
-#ifdef MEMORYPOOL_DEBUG
-	const char* tagString = block->debugGetLiteralTagString();
-#endif
-	
-	DEBUG_ASSERTCRASH(blob && blob->getOwningPool() == this, ("block does not belong to this pool"));
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-	BlockCheckpointInfo *bi = block->debugGetCheckpointInfo();
-	DEBUG_ASSERTCRASH(bi, ("hmm, no checkpoint info"));
-	if (bi)
-		bi->debugSetFreepoint(m_factory->getCurCheckpoint());
-#endif
-
-	blob->freeSingleBlock(block);
-	
-	// if we want to free the blobs as they become empty, do that here.
-	// normally we don't bother, but just in case this is ever desired, here's how you'd do it...
-	//
-	// if (blob->m_usedBlocksInBlob == 0) 
-	// {
-	//	freeBlob(blob);
-	//	return;
-	//} 
-	
-	if (!m_firstBlobWithFreeBlocks)
-		m_firstBlobWithFreeBlocks = blob;
-
-	// bookkeeping
-	--m_usedBlocksInPool;
-
-#ifdef MEMORYPOOL_DEBUG
-	m_factory->adjustTotals(tagString, -1*getAllocationSize(), 0);
-#endif
-}
-
-//-----------------------------------------------------------------------------
-Int MemoryPool::countBlobsInPool()
-{
-	Int blobs = 0;
-	for (MemoryPoolBlob* blob = m_firstBlob; blob;) 
-	{
-		++blobs;
-		blob = blob->getNextInList();
-	}
-	return blobs;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	if the pool has any blobs that are completely unused, they are released back to the
-	operating system. this will rarely, if ever, be called, but may be useful
-	in odd situations.
-*/
-Int MemoryPool::releaseEmpties()
-{
-	ScopedCriticalSection scopedCriticalSection(TheMemoryPoolCriticalSection);
-
-	Int released = 0;
-
-	for (MemoryPoolBlob* blob = m_firstBlob; blob;) 
-	{
-		MemoryPoolBlob* pNext = blob->getNextInList();
-		if (blob->getUsedBlockCount() == 0) 
-			released += freeBlob(blob);
-		blob = pNext;
-	}
-	return released;
-}
-
-
-//-----------------------------------------------------------------------------
-/**
-	throw away everything in the pool, but keep the pool itself valid.
-*/
-void MemoryPool::reset()
-{
-	ScopedCriticalSection scopedCriticalSection(TheMemoryPoolCriticalSection);
-
-	// toss everything. we could do this slightly more efficiently,
-	// but not really worth the extra code to do so.
-	while (m_firstBlob) 
-	{
-		freeBlob(m_firstBlob);
-	}
-	m_firstBlob = NULL;
-	m_lastBlob = NULL;
-	m_firstBlobWithFreeBlocks = NULL;
-
-	init(m_factory, m_poolName, m_allocationSize, m_initialAllocationCount, m_overflowAllocationCount);	// will throw on failure
-
-}
-
-//-----------------------------------------------------------------------------
-/**
-	add this pool to the factory's list-of-pools.
-*/
-void MemoryPool::addToList(MemoryPool **pHead)
-{
-	this->m_nextPoolInFactory = *pHead;
-	*pHead = this;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	remove this pool from the factory's list-of-pools.
-*/
-void MemoryPool::removeFromList(MemoryPool **pHead)
-{
-	// this isn't very efficient, but then, we rarely remove pools...
-	// usually only at shutdown. so don't bother optimizing.
-	MemoryPool *prev = NULL;
-	for (MemoryPool *cur = *pHead; cur; cur = cur->m_nextPoolInFactory)
-	{
-		if (cur == this)
-		{
-			if (prev)
-			{
-				prev->m_nextPoolInFactory = this->m_nextPoolInFactory;
-			}
-			else
-			{
-				*pHead = this->m_nextPoolInFactory;
-			}
-			break;
-		}
-		prev = cur;
-	}
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	print a report about per-pool allocation statistics to the debug log.
-	if the pool is null, print column headers.
-*/
-/*static*/ void MemoryPool::debugPoolInfoReport( MemoryPool *pool, FILE *fp )
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	const char *PREPEND = "POOLINFO";	// allows grepping more easily
-
-	if (!pool)
-	{
-		DEBUG_LOG(("%s,%32s,%6s,%6s,%6s,%6s,%6s,%6s\n",PREPEND,"POOLNAME","BLKSZ","INIT","OVRFL","USED","TOTAL","PEAK"));
-		if( fp )
-			fprintf( fp, "%s,%32s,%6s,%6s,%6s,%6s,%6s,%6s\n",PREPEND,"POOLNAME","BLKSZ","INIT","OVRFL","USED","TOTAL","PEAK" );
-	}
-	else
-	{
-		DEBUG_LOG(("%s,%32s,%6d,%6d,%6d,%6d,%6d,%6d\n",PREPEND,
-			pool->m_poolName,pool->m_allocationSize,pool->m_initialAllocationCount,pool->m_overflowAllocationCount,
-			pool->m_usedBlocksInPool,pool->m_totalBlocksInPool,pool->m_peakUsedBlocksInPool));
-		if( fp )
-		{
-			fprintf( fp, "%s,%32s,%6d,%6d,%6d,%6d,%6d,%6d\n",PREPEND,
-				pool->m_poolName,pool->m_allocationSize,pool->m_initialAllocationCount,pool->m_overflowAllocationCount,
-				pool->m_usedBlocksInPool,pool->m_totalBlocksInPool,pool->m_peakUsedBlocksInPool );
-		}
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-Int MemoryPool::debugPoolReportLeaks( const char* owner )
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	Int any = 0;
-	for (MemoryPoolBlob* blob = m_firstBlob; blob; blob = blob->getNextInList()) 
-	{
-		any += blob->debugBlobReportLeaks(owner);
-	}
-	return any;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	perform internal consistency checking on the memory pool.
-*/
-void MemoryPool::debugMemoryVerifyPool()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	Int used = 0;
-	Int total = 0;
-	for (MemoryPoolBlob* blob = m_firstBlob; blob; blob = blob->getNextInList()) 
-	{
-		blob->debugMemoryVerifyBlob();
-		used += blob->getUsedBlockCount();
-		total += blob->getTotalBlockCount();
-	}
-	DEBUG_ASSERTCRASH(m_usedBlocksInPool == used, ("used mismatch %d %d",m_usedBlocksInPool,used));
-	DEBUG_ASSERTCRASH(m_totalBlocksInPool == total, ("total mismatch %d %d",m_totalBlocksInPool,total));
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return true iff the block is a valid block in this pool.
-*/
-Bool MemoryPool::debugIsBlockInPool(void *pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pBlockPtr)
-		return false;
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerifyPool();
-#endif
-
-	Bool check1 = false, check2 = false;
-
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	MemoryPoolBlob *ownerBlob = block->getOwningBlob();
-	for (MemoryPoolBlob* blob = m_firstBlob; blob; blob = blob->getNextInList()) 
-	{
-		if (blob->debugIsBlockInBlob(pBlockPtr))
-			check1 = true;
-	
-		if (blob == ownerBlob)
-			check2 = true;
-	}
-
-	DEBUG_ASSERTCRASH(check1 == check2, ("mismatch checks in debugIsBlockInPool"));
-
-	return check1 && check2;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return the tagstring for the block. this will never return null; if
-	the block is null or invalid, "FREE_SINGLEBLOCK_TAG_STRING" will be returned.
-	it is assumed that the block was allocated by this pool.
-*/
-const char *MemoryPool::debugGetBlockTagString(void *pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pBlockPtr)
-		return FREE_SINGLEBLOCK_TAG_STRING;
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerifyPool();
-#endif
-	if (!debugIsBlockInPool(pBlockPtr)) 
-	{
-		DEBUG_CRASH(("block is not in this pool"));
-		return FREE_SINGLEBLOCK_TAG_STRING;
-	}
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	return block->debugGetLiteralTagString();
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	free all checkpointinfo for this pool, and reset all ptrs to checkpointinfo.
-*/
-void MemoryPool::debugResetCheckpoints()
-{
-	Checkpointable::debugResetCheckpoints();
-	for (MemoryPoolBlob* blob = m_firstBlob; blob; blob = blob->getNextInList()) 
-	{
-		blob->debugResetCheckpoints();
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// METHODS for DynamicMemoryAllocator
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/**
-	init the DMA to safe values.
-*/
-DynamicMemoryAllocator::DynamicMemoryAllocator() :
-	m_factory(NULL),
-	m_nextDmaInFactory(NULL),
-	m_numPools(0),
-	m_usedBlocksInDma(0),
-	m_rawBlocks(NULL)
-{
-	for (Int i = 0; i < MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS; i++)
-		m_pools[i] = 0;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	Initialize the dma and its subpools.
-*/
-void DynamicMemoryAllocator::init(MemoryPoolFactory *factory, Int numSubPools, const PoolInitRec pParms[])
-{
-	const PoolInitRec defaultDMA[7] = 
-	{
-		{ "dmaPool_16", 16, 64, 64 },
-		{ "dmaPool_32", 32, 64, 64 },
-		{ "dmaPool_64", 64, 64, 64 },
-		{ "dmaPool_128", 128, 64, 64 },
-		{ "dmaPool_256", 256, 64, 64 },
-		{ "dmaPool_512", 512, 64, 64 },
-		{ "dmaPool_1024", 1024, 64, 64 }
-	};
-
-	if (numSubPools == 0 || pParms == NULL) 
-	{
-		// use the defaults...
-		numSubPools = 7;
-		pParms = defaultDMA;
-	}
-
-
-	m_factory = factory;
-	m_numPools = numSubPools;
-	if (m_numPools > MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS)
-		m_numPools = MAX_DYNAMICMEMORYALLOCATOR_SUBPOOLS;
-	m_usedBlocksInDma = 0;
-	for (Int i = 0; i < m_numPools; i++)
-	{
-		DEBUG_ASSERTCRASH(i == 0 || pParms[i].allocationSize > pParms[i-1].allocationSize, ("alloc size must increase monotonically for DMA"));
-		m_pools[i] = m_factory->createMemoryPool(&pParms[i]);
-	}
-}
-
-//-----------------------------------------------------------------------------
-/**
-	destroy the dma and its subpools.
-*/
-DynamicMemoryAllocator::~DynamicMemoryAllocator()
-{
-	DEBUG_ASSERTCRASH(m_usedBlocksInDma == 0, ("destroying a nonempty dma"));
-
-	/// @todo this may cause double-destruction of the subpools -- test & fix
-	for (Int i = 0; i < m_numPools; i++) 
-	{
-		m_factory->destroyMemoryPool(m_pools[i]);
-		m_pools[i] = NULL;
-	}
-
-	while (m_rawBlocks)
-	{
-		freeBytes(m_rawBlocks->getUserData());
-	}
-}
-
-//-----------------------------------------------------------------------------
-/**
-	find the best-fitting subpool in this dma for a given allocation size.
-	if no subpool can satisfy the size, return null.
-*/
-MemoryPool *DynamicMemoryAllocator::findPoolForSize(Int allocSize)
-{
-	for (Int i = 0; i < m_numPools; i++)
-	{
-		DEBUG_ASSERTCRASH(m_pools[i], ("null pool"));
-		if (allocSize <= m_pools[i]->getAllocationSize())
-			return m_pools[i];
-	}
-	return NULL;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	add this DMA to the factory's list of dmas.
-*/
-void DynamicMemoryAllocator::addToList(DynamicMemoryAllocator **pHead)
-{
-	this->m_nextDmaInFactory = *pHead;
-	*pHead = this;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	remove this DMA from the factory's list of dmas.
-*/
-void DynamicMemoryAllocator::removeFromList(DynamicMemoryAllocator **pHead)
-{
-	// this isn't very efficient, but then, we rarely remove these...
-	// usually only at shutdown. so don't bother optimizing.
-	DynamicMemoryAllocator *prev = NULL;
-	for (DynamicMemoryAllocator *cur = *pHead; cur; cur = cur->m_nextDmaInFactory)
-	{
-		if (cur == this)
-		{
-			if (prev)
-			{
-				prev->m_nextDmaInFactory = this->m_nextDmaInFactory;
-			}
-			else
-			{
-				*pHead = this->m_nextDmaInFactory;
-			}
-			break;
-		}
-		prev = cur;
-	}
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-void DynamicMemoryAllocator::debugIgnoreLeaksForThisBlock(void* pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pBlockPtr)
-		return;
-
-#ifdef MEMORYPOOL_CHECK_BLOCK_OWNERSHIP
-	DEBUG_ASSERTCRASH(debugIsBlockInDma(pBlockPtr), ("block is not in this dma"));
-#endif
-
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	if (block->getOwningBlob()) 
-	{
-#ifdef MEMORYPOOL_DEBUG
-		DEBUG_ASSERTCRASH(findPoolForSize(block->debugGetLogicalSize()) == block->getOwningBlob()->getOwningPool(), ("pool mismatch"));
-#endif
-		block->debugIgnoreLeaksForThisBlock();
-	}
-	else
-	{
-		DEBUG_CRASH(("cannot currently ignore leaks for raw blocks (allocation too large)\n"));
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-/**
-	allocate a chunk-o-bytes from this DMA and return it, but don't bother zeroing
-	out the block. if unable to allocate, throw ERROR_OUT_OF_MEMORY. this
-	function will never return null.
-
-  added code to make sure we're on a DWord boundary, throw exception if not
-*/
-void *DynamicMemoryAllocator::allocateBytesDoNotZeroImplementation(Int numBytes DECLARE_LITERALSTRING_ARG2)
-{
-	ScopedCriticalSection scopedCriticalSection(TheDmaCriticalSection);
-
-	void *result = NULL;
-
-#ifdef MEMORYPOOL_DEBUG
-	DEBUG_ASSERTCRASH(debugLiteralTagString != NULL, ("bad tagstring"));
-	Int waste = 0;
-#endif
-
-	MemoryPool *pool = findPoolForSize(numBytes);
-	if (pool != NULL) 
-	{
-		result = pool->allocateBlockDoNotZeroImplementation(PASS_LITERALSTRING_ARG1);
-#ifdef MEMORYPOOL_DEBUG
-	{
-		USE_PERF_TIMER(MemoryPoolDebugging)
-		waste = pool->getAllocationSize() - numBytes;
-		MemoryPoolSingleBlock *wblock = MemoryPoolSingleBlock::recoverBlockFromUserData(result);
-		wblock->debugSetWastedSize(waste);
-#ifdef INTENSE_DMA_BOOKKEEPING
-		if (doingIntenseDMA == 0)
-#endif
-		{
-			theWastedDMA += (waste);
-			if (thePeakWastedDMA < theWastedDMA)
-				thePeakWastedDMA = theWastedDMA;
-		}
-	}
-#endif // MEMORYPOOL_DEBUG
-	}
-	else
-	{
-		// too big for our pools -- just go right to the metal.
-		MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::rawAllocateSingleBlock(&m_rawBlocks, numBytes, m_factory PASS_LITERALSTRING_ARG2);
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-		BlockCheckpointInfo *bi = debugAddCheckpointInfo(block->debugGetLiteralTagString(), m_factory->getCurCheckpoint(), numBytes);
-		if (bi)
-			block->debugSetCheckpointInfo(bi);
-#endif
-
-		result = block->getUserData();
-
-#ifdef MEMORYPOOL_DEBUG
-		m_factory->adjustTotals(debugLiteralTagString, numBytes, numBytes);
-		theTotalLargeBlocks += numBytes;
-		if (thePeakLargeBlocks < theTotalLargeBlocks)
-			thePeakLargeBlocks = theTotalLargeBlocks;
-#endif
-	}
-
-#ifdef MEMORYPOOL_DEBUG
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-	theTotalDMA += numBytes;
-	if (thePeakDMA < theTotalDMA)
-		thePeakDMA = theTotalDMA;
-#ifdef INTENSE_DMA_BOOKKEEPING
-	if (isMemoryManagerOfficiallyInited() && doingIntenseDMA == 0)
-	{
-		++doingIntenseDMA;
-		UsedNPeak& up = TheUsedNPeakMap[debugLiteralTagString];
-		up.used += numBytes;
-		if (up.peak < up.used)
-			up.peak = up.used;
-		up.waste += waste;
-		if (up.peakwaste < up.waste)
-			up.peakwaste = up.waste;
-		--doingIntenseDMA;
-	}
-#endif
-}
-#endif // MEMORYPOOL_DEBUG
-
-	++m_usedBlocksInDma;
-	DEBUG_ASSERTCRASH(m_usedBlocksInDma >= 0, ("negative count for m_usedBlocksInDma"));
-#ifdef MEMORYPOOL_DEBUG
-	#ifdef USE_FILLER_VALUE
-	{
-		USE_PERF_TIMER(MemoryPoolInitFilling)
-		::memset32(result, s_initFillerValue, numBytes);
-	}
-	#endif
-#endif
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-  // check alignment
-  if (unsigned(result)&3)
-    throw ERROR_OUT_OF_MEMORY;
-#endif
-
-	return result;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	allocate a chunk-o-bytes from this DMA and return it, and zero out the contents first.
-	if unable to allocate, throw ERROR_OUT_OF_MEMORY. 
-	this function will never return null.
-*/
-void *DynamicMemoryAllocator::allocateBytesImplementation(Int numBytes DECLARE_LITERALSTRING_ARG2)
-{
-	void* p = allocateBytesDoNotZeroImplementation(numBytes PASS_LITERALSTRING_ARG2);	// throws on failure
-	memset(p, 0, numBytes);
-	return p;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	free a chunk-o-bytes allocated by this dma. it's ok to pass null.
-*/
-void DynamicMemoryAllocator::freeBytes(void* pBlockPtr)
-{
-	if (!pBlockPtr)
-		return;
-
-	ScopedCriticalSection scopedCriticalSection(TheDmaCriticalSection);
-
-#ifdef MEMORYPOOL_CHECK_BLOCK_OWNERSHIP
-	DEBUG_ASSERTCRASH(debugIsBlockInDma(pBlockPtr), ("block is not in this dma"));
-#endif
-
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-#ifdef MEMORYPOOL_DEBUG
-	Int waste = 0, used = 0;
-#ifdef INTENSE_DMA_BOOKKEEPING
-	const char* tagString;
-#endif
-	{
-		USE_PERF_TIMER(MemoryPoolDebugging)
-		waste = 0;
-		used = block->debugGetLogicalSize();
-		theTotalDMA -= used;
-		if (thePeakDMA < theTotalDMA)
-			thePeakDMA = theTotalDMA;
-	#ifdef INTENSE_DMA_BOOKKEEPING
-		tagString = block->debugGetLiteralTagString();
-	#endif
-	}
-#endif // MEMORYPOOL_DEBUG
-
-	if (block->getOwningBlob()) 
-	{
-#ifdef MEMORYPOOL_DEBUG
-		{
-			USE_PERF_TIMER(MemoryPoolDebugging)
-			DEBUG_ASSERTCRASH(findPoolForSize(used) == block->getOwningBlob()->getOwningPool(), ("pool mismatch"));
-	#ifdef INTENSE_DMA_BOOKKEEPING
-			if (doingIntenseDMA == 0)
-	#endif
-			{
-				waste = block->debugGetWastedSize();
-				theWastedDMA -= waste;
-				if (thePeakWastedDMA < theWastedDMA)
-					thePeakWastedDMA = theWastedDMA;
-			}
-		}
-#endif // MEMORYPOOL_DEBUG
-		block->getOwningBlob()->getOwningPool()->freeBlock(pBlockPtr);
-	}
-	else
-	{
-		// was allocated via sysAllocate.
-#ifdef MEMORYPOOL_CHECKPOINTING
-		BlockCheckpointInfo *bi = block->debugGetCheckpointInfo();
-		DEBUG_ASSERTCRASH(bi, ("hmm, no checkpoint info"));
-		if (bi)
-			bi->debugSetFreepoint(m_factory->getCurCheckpoint());
-#endif
-
-#ifdef MEMORYPOOL_DEBUG
-		m_factory->adjustTotals(block->debugGetLiteralTagString(), -used, -used);
-		theTotalLargeBlocks -= used;
-		if (thePeakLargeBlocks < theTotalLargeBlocks)
-			thePeakLargeBlocks = theTotalLargeBlocks;
-		block->debugMarkBlockAsFree();
-#endif
-
-		block->removeBlockFromList(&m_rawBlocks);
-
-		::sysFree((void *)block);
-
-	}
-	--m_usedBlocksInDma;
-	DEBUG_ASSERTCRASH(m_usedBlocksInDma >= 0, ("negative count for m_usedBlocksInDma"));
-
-#ifdef INTENSE_DMA_BOOKKEEPING
-	if (isMemoryManagerOfficiallyInited() && doingIntenseDMA == 0)
-	{
-		++doingIntenseDMA;
-		UsedNPeak& up = TheUsedNPeakMap[tagString];
-		up.used -= used;
-		if (up.peak < up.used)
-			up.peak = up.used;
-		up.waste -= waste;
-		if (up.peakwaste < up.waste)
-			up.peakwaste = up.waste;
-		--doingIntenseDMA;
-	}
-#endif
-
-}
-
-//-----------------------------------------------------------------------------
-Int DynamicMemoryAllocator::getActualAllocationSize(Int numBytes)
-{
-	MemoryPool *pool = findPoolForSize(numBytes);
-	return pool ? pool->getAllocationSize() : numBytes;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	throw away everything in the DMA, but keep the DMA itself valid.
-*/
-void DynamicMemoryAllocator::reset()
-{
-	for (Int i = 0; i < m_numPools; i++)
-	{
-		if (m_pools[i])
-		{
-			m_pools[i]->reset();
-		}
-	}
-
-	while (m_rawBlocks)
-		freeBytes(m_rawBlocks->getUserData());
-
-	m_usedBlocksInDma = 0;
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return true iff the given pool is a subpool of this dma.
-*/
-Bool DynamicMemoryAllocator::debugIsPoolInDma(MemoryPool *pool)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pool)
-		return false;
-
-	for (Int i = 0; i < m_numPools; i++)
-	{
-		if (m_pools[i] == pool)
-			return true;
-	}
-
-	return false;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return true iff the block was allocated by this dma
-	(either from a subpool or as a raw block).
-*/
-Bool DynamicMemoryAllocator::debugIsBlockInDma(void *pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pBlockPtr)
-		return false;
-
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	if (block->getOwningBlob()) 
-	{
-		MemoryPool *pool = block->getOwningBlob()->getOwningPool();
-		return pool && pool->debugIsBlockInPool(pBlockPtr) && debugIsPoolInDma(pool);
-	}
-	else
-	{
-		for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
-		{
-			if (b == block)
-				return true;
-		}
-		return false;
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return the tagstring for the block. this will never return null; if
-	the block is null or invalid, "FREE_SINGLEBLOCK_TAG_STRING" will be returned.
-	it is assumed that the block was allocated by this dma.
-*/
-const char *DynamicMemoryAllocator::debugGetBlockTagString(void *pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pBlockPtr)
-		return FREE_SINGLEBLOCK_TAG_STRING;
-
-	if (!debugIsBlockInDma(pBlockPtr)) 
-	{
-		DEBUG_CRASH(("block is not in this dma"));
-		return FREE_SINGLEBLOCK_TAG_STRING;
-	}
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	return block->debugGetLiteralTagString();
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	perform internal consistency checking on this DMA.
-*/
-void DynamicMemoryAllocator::debugMemoryVerifyDma()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
-	{
-		b->debugVerifyBlock();
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	free all checkpointinfo for this dma, and reset all ptrs to checkpointinfo.
-*/
-void DynamicMemoryAllocator::debugResetCheckpoints()
-{
-	Checkpointable::debugResetCheckpoints();
-	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
-	{
-		b->debugResetCheckpoint();
-	}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	calculate the total number of raw blocks allocated by this dma,
-	and the total number of bytes (logical) used by those raw blocks.
-*/
-Int DynamicMemoryAllocator::debugCalcRawBlockBytes(Int *numBlocks)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (numBlocks)
-		*numBlocks = 0;
-	Int bytes = 0;
-	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
-	{
-		if (numBlocks)
-			*numBlocks += 1;
-		bytes += b->debugGetLogicalSize();
-	}
-	return bytes;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-Int DynamicMemoryAllocator::debugDmaReportLeaks()
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	Int any = false;
-	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
-	{
-		any += b->debugSingleBlockReportLeak("(DMA)");
-	}
-	return any;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	print a report about raw block allocations to the debug log.
-*/
-void DynamicMemoryAllocator::debugDmaInfoReport( FILE *fp )
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	const char *PREPEND = "POOLINFO";	// allows grepping more easily
-
-	Int numBlocks;
-	Int bytes = debugCalcRawBlockBytes(&numBlocks);
-	DEBUG_LOG(("%s,Total Raw Blocks = %d\n",PREPEND,numBlocks));
-	DEBUG_LOG(("%s,Total Raw Block Bytes = %d\n",PREPEND,bytes));
-	DEBUG_LOG(("%s,Average Raw Block Size = %d\n",PREPEND,numBlocks?bytes/numBlocks:0));
-	DEBUG_LOG(("%s,Raw Blocks:\n",PREPEND));
-	if( fp )
-	{
-		fprintf( fp, "%s,Total Raw Blocks = %d\n",PREPEND,numBlocks );
-		fprintf( fp, "%s,Total Raw Block Bytes = %d\n",PREPEND,bytes );
-		fprintf( fp, "%s,Average Raw Block Size = %d\n",PREPEND,numBlocks?bytes/numBlocks:0 );
-		fprintf( fp, "%s,Raw Blocks:\n",PREPEND );
-	}
-	for (MemoryPoolSingleBlock *b = m_rawBlocks; b; b = b->getNextRawBlock())
-	{
-		DEBUG_LOG(("%s,  Blocksize=%d\n",PREPEND,b->debugGetLogicalSize()));
-		//if( fp )
-		//{
-		//	fprintf( fp, "%s,  Blocksize=%d\n",PREPEND,b->debugGetLogicalSize() );
-		//}
-	}
-
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// METHODS for MemoryPoolFactory
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/**
-	init the factory to safe values.
-*/
-MemoryPoolFactory::MemoryPoolFactory() :
-	m_firstPoolInFactory(NULL),
-	m_firstDmaInFactory(NULL)
-#ifdef MEMORYPOOL_CHECKPOINTING
-	, m_curCheckpoint(0)
-#endif
-#ifdef MEMORYPOOL_DEBUG
-	, m_usedBytes(0)
-	, m_physBytes(0)
-	, m_peakUsedBytes(0)
-	, m_peakPhysBytes(0)
-#endif
-{
-#ifdef MEMORYPOOL_DEBUG
-	for (int i = 0; i < MAX_SPECIAL_USED; ++i)
-	{
-		m_usedBytesSpecial[i] = 0;
-		m_usedBytesSpecialPeak[i] = 0;
-		m_physBytesSpecial[i] = 0;
-		m_physBytesSpecialPeak[i] = 0;
-	}
-	#ifdef USE_FILLER_VALUE
-	calcFillerValue(GameClientRandomValue(0, MAX_INIT_FILLER_COUNT-1));
-	#endif
-#endif
-}
-//-----------------------------------------------------------------------------
-/**
-	initialize the factory.
-*/
-void MemoryPoolFactory::init()
-{
-	// my, that was easy
-}
-
-//-----------------------------------------------------------------------------
-/**
-	destroy the factory, and all its pools and dmas.
-*/
-MemoryPoolFactory::~MemoryPoolFactory()
-{
-	while (m_firstPoolInFactory)
-	{
-		destroyMemoryPool(m_firstPoolInFactory);
-	}
-
-	while (m_firstDmaInFactory)
-	{
-		destroyDynamicMemoryAllocator(m_firstDmaInFactory);
-	}
-}
-
-//-----------------------------------------------------------------------------
-/**
-	create a new memory pool.
-*/
-MemoryPool *MemoryPoolFactory::createMemoryPool(const PoolInitRec *parms)
-{
-	return createMemoryPool(parms->poolName, parms->allocationSize, parms->initialAllocationCount, parms->overflowAllocationCount);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	create a new memory pool. (alternate argument list)
-*/
-MemoryPool *MemoryPoolFactory::createMemoryPool(const char *poolName, Int allocationSize, Int initialAllocationCount, Int overflowAllocationCount)
-{
-	MemoryPool *pool = findMemoryPool(poolName);
-	if (pool) 
-	{
-		DEBUG_ASSERTCRASH(allocationSize == pool->getAllocationSize(), ("pool size mismatch"));
-		return pool;
-	}
-
-	userMemoryAdjustPoolSize(poolName, initialAllocationCount, overflowAllocationCount);
-
-	if (initialAllocationCount <= 0 || overflowAllocationCount < 0)
-	{
-		DEBUG_CRASH(("illegal pool size: %d %d\n",initialAllocationCount,overflowAllocationCount));
-		throw ERROR_OUT_OF_MEMORY;
-	}
-
-	pool = new (::sysAllocateDoNotZero(sizeof MemoryPool)) MemoryPool;	// will throw on failure
-	pool->init(this, poolName, allocationSize, initialAllocationCount, overflowAllocationCount);	// will throw on failure
-
-	pool->addToList(&m_firstPoolInFactory);
-
-	return pool;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	find a memory pool with the given name; return null if no such pool exists,
-	return null. note that this function isn't particularly fast (it just does
-	a linear search), so you should probably cache the result.
-*/
-MemoryPool *MemoryPoolFactory::findMemoryPool(const char *poolName)
-{
-	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-	{
-		if (!strcmp(poolName, pool->getPoolName())) 
-		{
-			DEBUG_ASSERTCRASH(poolName == pool->getPoolName(), ("hmm, ptrs should probably match here"));
-			return pool;
-		}
-	}
-	return NULL;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	destroy the given memory pool. you normally will never need to call this directly.
-*/
-void MemoryPoolFactory::destroyMemoryPool(MemoryPool *pMemoryPool)
-{
-	if (!pMemoryPool)
-		return;
-
-	DEBUG_ASSERTCRASH(pMemoryPool->getUsedBlockCount() == 0, ("destroying a nonempty pool"));
-
-	pMemoryPool->removeFromList(&m_firstPoolInFactory);
-
-	// this is evil... since there is no 'placement delete' we must do this the hard way
-	// and call the dtor directly. ordinarily this is heinous, but in this case we'll
-	// make an exception.
-	pMemoryPool->~MemoryPool();
-	::sysFree((void *)pMemoryPool);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	create a new dynamicMemoryAllocator. You normally will never need to call this directly.
-*/
-DynamicMemoryAllocator *MemoryPoolFactory::createDynamicMemoryAllocator(Int numSubPools, const PoolInitRec pParms[])
-{
-	DynamicMemoryAllocator *dma;
-
-	dma = new (::sysAllocateDoNotZero(sizeof DynamicMemoryAllocator)) DynamicMemoryAllocator;	// will throw on failure
-	dma->init(this, numSubPools, pParms);	// will throw on failure
-
-	dma->addToList(&m_firstDmaInFactory);
-
-	return dma;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	destroy the given dynamicMemoryAllocator. You normally will never need to call this directly.
-*/
-void MemoryPoolFactory::destroyDynamicMemoryAllocator(DynamicMemoryAllocator *dma)
-{
-	if (!dma)
-		return;
-
-	dma->removeFromList(&m_firstDmaInFactory);
-
-	// this is evil... since there is no 'placement delete' we must do this the hard way
-	// and call the dtor directly. ordinarily this is heinous, but in this case we'll
-	// make an exception.
-	dma->~DynamicMemoryAllocator();
-	::sysFree((void *)dma);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	throw away everything in all pools/dmas owned by this factory, but keep the factory
-	and pools/dmas themselves valid.
-*/
-void MemoryPoolFactory::reset()
-{
-#ifdef MEMORYPOOL_CHECKPOINTING
-	debugResetCheckpoints();
-#endif
-
-	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-	{
-		pool->reset();
-	}
-	for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-	{
-		dma->reset();
-	}
-
-#ifdef MEMORYPOOL_DEBUG
-	m_usedBytes = 0;
-	m_physBytes = 0;
-	m_peakUsedBytes = 0;
-	m_peakPhysBytes = 0;
-	for (int i = 0; i < MAX_SPECIAL_USED; ++i)
-	{
-		m_usedBytesSpecial[i] = 0;
-		m_usedBytesSpecialPeak[i] = 0;
-		m_physBytesSpecial[i] = 0;
-		m_physBytesSpecialPeak[i] = 0;
-	}
-	#ifdef USE_FILLER_VALUE
-	calcFillerValue(GameClientRandomValue(0, MAX_INIT_FILLER_COUNT-1));
-	#endif
-#endif
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-static const char* s_specialPrefixes[MAX_SPECIAL_USED] =
-{
-	"Misc",			// the catchall for stuff that doesn't match others
-	"W3D_",
-	"W3A_",
-	"STL_",
-	"STR_",
-	NULL
-};
-
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	perform bookkeeping on memory usage statistics.
-*/
-void MemoryPoolFactory::adjustTotals(const char* tagString, Int usedDelta, Int physDelta)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	m_usedBytes += usedDelta;
-	m_physBytes += physDelta;
-	if (m_peakUsedBytes < m_usedBytes)
-		m_peakUsedBytes = m_usedBytes;
-	if (m_peakPhysBytes < m_physBytes)
-		m_peakPhysBytes = m_physBytes;
-
-	int found = 0;	// if no matches found, goes into slot zero
-	for (int i = 1; i < MAX_SPECIAL_USED; ++i)	// start at 1, not zero
-	{
-		if (s_specialPrefixes[i] == NULL)
-			break;
-
-		if (strncmp(tagString, s_specialPrefixes[i], strlen(s_specialPrefixes[i])) == 0)
-		{
-			found = i;
-			break;
-		}
-	}
-	m_usedBytesSpecial[found] += usedDelta;
-	m_physBytesSpecial[found] += physDelta;
-	if (m_usedBytesSpecialPeak[found] < m_usedBytesSpecial[found])
-		m_usedBytesSpecialPeak[found] = m_usedBytesSpecial[found];
-	if (m_physBytesSpecialPeak[found] < m_physBytesSpecial[found])
-		m_physBytesSpecialPeak[found] = m_physBytesSpecial[found];
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-void MemoryPoolFactory::debugSetInitFillerIndex(Int index)
-{
-	#ifdef USE_FILLER_VALUE
-	if (index < 0 || index >= MAX_INIT_FILLER_COUNT)
-		index = GameClientRandomValue(0, MAX_INIT_FILLER_COUNT-1);
-	calcFillerValue(index);
-	#endif
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	perform internal consistency checking on the factory, and all of its
-	pools and dmas.
-*/
-void MemoryPoolFactory::debugMemoryVerify()
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	Int used = 0, phys = 0;
-
-	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-	{
-		pool->debugMemoryVerifyPool();
-		used += pool->getUsedBlockCount()*pool->getAllocationSize();
-		phys += pool->getTotalBlockCount()*pool->getAllocationSize();
-	}
-
-	for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-	{
-		dma->debugMemoryVerifyDma();
-		Int tmp = dma->debugCalcRawBlockBytes(NULL);
-		used += tmp;
-		phys += tmp;
-	}
-
-	DEBUG_ASSERTCRASH(used == m_usedBytes, ("used count mismatch"));
-	DEBUG_ASSERTCRASH(phys == m_physBytes, ("phys count mismatch"));
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return true iff the block was allocated by any of the pools/dmas owned
-	by this factory.
-*/
-Bool MemoryPoolFactory::debugIsBlockInAnyPool(void *pBlock)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerify();
-#endif
-	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-	{
-		if (pool->debugIsBlockInPool(pBlock))
-			return true;
-	}
-
-	for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-	{
-		if (dma->debugIsBlockInDma(pBlock))
-			return true;
-	}
-
-	return false;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	return the tagstring for this block. this will never return null; if
-	the block is null or invalid, "FREE_SINGLEBLOCK_TAG_STRING" will be returned.
-	it is assumed that the block was allocated by this factory.
-*/
-const char *MemoryPoolFactory::debugGetBlockTagString(void *pBlockPtr)
-{
-	USE_PERF_TIMER(MemoryPoolDebugging)
-
-	if (!pBlockPtr)
-		return FREE_SINGLEBLOCK_TAG_STRING;
-
-#ifdef MEMORYPOOL_INTENSE_VERIFY
-	debugMemoryVerify();
-#endif
-	if (!debugIsBlockInAnyPool(pBlockPtr)) 
-	{
-		DEBUG_CRASH(("block is not in this factory"));
-		return FREE_SINGLEBLOCK_TAG_STRING;
-	}
-	MemoryPoolSingleBlock *block = MemoryPoolSingleBlock::recoverBlockFromUserData(pBlockPtr);
-	return block->debugGetLiteralTagString();
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	set a new checkpoint for all future blocks allocated/freed by this factory's pools/dmas.
-*/
-Int MemoryPoolFactory::debugSetCheckpoint()
-{
-	return ++m_curCheckpoint;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_CHECKPOINTING
-/**
-	throw away all checkpoint info for all pools/dmas.
-*/
-void MemoryPoolFactory::debugResetCheckpoints()
-{
-	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-	{
-		pool->debugResetCheckpoints();
-	}
-	for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-	{
-		dma->debugResetCheckpoints();
-	}
-	m_curCheckpoint = 0;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-void MemoryPoolFactory::memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead )
-{
-#ifdef MEMORYPOOL_DEBUG
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-	FILE* perfStatsFile = NULL;
-	Int totalNamedPoolPeak = 0;
-
-	if( !appendToFileInstead )
-	{
-		char tmp[256];
-		strcpy(tmp,filename);
-		strcat(tmp,".csv");
-		perfStatsFile = fopen(tmp, "w");
-	}
-	else
-	{
-		perfStatsFile = appendToFileInstead;
-	}
-
-	if (perfStatsFile == NULL)
-	{
-		DEBUG_CRASH(("could not open/create perf file %s -- is it open in another app?",filename));
-		return;
-	}
-
-	Int lineIdx = 0;
-	MemoryPool *pool = m_firstPoolInFactory;
-#ifdef INTENSE_DMA_BOOKKEEPING
-	UsedNPeakMap::const_iterator it = TheUsedNPeakMap.begin();
-#endif
-	for (;;)
-	{
-		Bool keepGoing = false;
-		if (pool)
-		{
-			if (lineIdx == 0)
-			{
-				fprintf(perfStatsFile, "%s,%d","Unpooled Large Blocks (>1024 bytes)",thePeakLargeBlocks/1024);
-			}
-			else
-			{
-				Int sz = pool->getAllocationSize();
-				Int initial = pool->getInitialBlockCount()*sz;
-				Int peak = pool->getPeakBlockCount()*sz;
-				Int waste = initial - peak;
-				if (waste < 0) waste = 0;
-				fprintf(perfStatsFile, "%s,%d,%d",pool->getPoolName(),peak/1024,waste/1024);
-				totalNamedPoolPeak += peak;
-				pool = pool->getNextPoolInList();
-			}
-			keepGoing = true;
-		}
-		else
-		{
-			fprintf(perfStatsFile, ",,");
-		}
-
-#ifdef INTENSE_DMA_BOOKKEEPING
-		if (it != TheUsedNPeakMap.end())
-		{
-			Int wastepct = (it->second.peakwaste * 100) / (it->second.peak + it->second.peakwaste);
-			fprintf(perfStatsFile, ",,,,%s,%d,%d,%d",it->first,it->second.peak/1024,it->second.peakwaste/1024,wastepct);
-			++it;
-			keepGoing = true;
-		}
-		else
-		{
-			fprintf(perfStatsFile, ",,,,,,,");
-		}
-#endif
-		
-		if (lineIdx < MAX_SPECIAL_USED && s_specialPrefixes[lineIdx] != NULL)
-		{
-			fprintf(perfStatsFile, ",,,%s,%d",s_specialPrefixes[lineIdx],m_usedBytesSpecialPeak[lineIdx]/1024);
-			keepGoing = true;
-		}
-
-		fprintf(perfStatsFile, "\n");
-		++lineIdx;
-
-		if (!keepGoing)
-			break;
-	}
-
-	fflush(perfStatsFile);
-
-	if( !appendToFileInstead )
-	{
-		fclose(perfStatsFile);
-	}
-#endif
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_DEBUG
-/**
-	send a memory reports (based on the flags/checkpoints) to the debug log.
-*/
-void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp )
-{
-	//USE_PERF_TIMER(MemoryPoolDebugging) skip end-of-run reporting stuff
-
-#ifdef ALLOW_DEBUG_UTILS
-	Int oldFlags = DebugGetFlags();
-	DebugSetFlags(oldFlags & ~DEBUG_FLAG_PREPEND_TIME);
-#endif
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-	Bool doBlockReport = (flags & _REPORT_CP_ALLOCATED_DONTCARE) != 0 && (flags & _REPORT_CP_FREED_DONTCARE) != 0;
-	DEBUG_ASSERTCRASH(startCheckpoint >= 0 && startCheckpoint <= endCheckpoint && endCheckpoint <= m_curCheckpoint, ("bad checkpoints"));
-	DEBUG_ASSERTCRASH(((flags & _REPORT_CP_ALLOCATED_DONTCARE) != 0) == ((flags & _REPORT_CP_FREED_DONTCARE) != 0), ("bad flags: must set at both alloc and free flag"));
-#endif
-
-	debugMemoryVerify();
-
-	if (flags & REPORT_FACTORYINFO)
-	{
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Begin Factory Info Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Bytes in use (logical) = %d\n",m_usedBytes));
-		DEBUG_LOG(("Bytes in use (physical) = %d\n",m_physBytes));
-		DEBUG_LOG(("PEAK Bytes in use (logical) = %d\n",m_peakUsedBytes));
-		DEBUG_LOG(("PEAK Bytes in use (physical) = %d\n",m_peakPhysBytes));
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("End Factory Info Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		if( fp )
-		{
-			fprintf( fp, "------------------------------------------\n" );
-			fprintf( fp, "Begin Factory Info Report\n" );
-			fprintf( fp, "------------------------------------------\n" );
-			fprintf( fp, "Bytes in use (logical) = %d\n",m_usedBytes );
-			fprintf( fp, "Bytes in use (physical) = %d\n",m_physBytes );
-			fprintf( fp, "PEAK Bytes in use (logical) = %d\n",m_peakUsedBytes );
-			fprintf( fp, "PEAK Bytes in use (physical) = %d\n",m_peakPhysBytes );
-			fprintf( fp, "------------------------------------------\n" );
-			fprintf( fp, "End Factory Info Report\n" );
-			fprintf( fp, "------------------------------------------\n" );
-		}
-	}
-
-	if (flags & REPORT_POOLINFO)
-	{
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Begin Pool Info Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		if( fp )
-		{
-			fprintf( fp, "------------------------------------------\n" );
-			fprintf( fp, "Begin Pool Info Report\n" );
-			fprintf( fp, "------------------------------------------\n" );
-		}
-		MemoryPool::debugPoolInfoReport( NULL, fp );
-		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-		{
-			MemoryPool::debugPoolInfoReport( pool, fp );
-		}
-		for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-		{
-			dma->debugDmaInfoReport( fp );
-		}
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("End Pool Info Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		if( fp )
-		{
-			fprintf( fp, "------------------------------------------\n" );
-			fprintf( fp, "End Pool Info Report\n" );
-			fprintf( fp, "------------------------------------------\n" );
-		}
-	}
-
-	if (flags & REPORT_POOL_OVERFLOW)
-	{
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Begin Pool Overflow Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		MemoryPool *pool = m_firstPoolInFactory;
-		for (; pool; pool = pool->getNextPoolInList())
-		{
-			if (pool->getPeakBlockCount() > pool->getInitialBlockCount())
-			{
-				DEBUG_LOG(("*** Pool %s overflowed initial allocation of %d (peak allocation was %d)\n",pool->getPoolName(),pool->getInitialBlockCount(),pool->getPeakBlockCount()));
-			}
-		}
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("End Pool Overflow Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Begin Pool Underflow Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		for (pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-		{
-			Int peak = pool->getPeakBlockCount()*pool->getAllocationSize();
-			Int initial = pool->getInitialBlockCount()*pool->getAllocationSize();
-			if (peak < initial/2 && (initial - peak) > 4096)
-			{
-				DEBUG_LOG(("*** Pool %s used less than half its initial allocation of %d (peak allocation was %d, wasted %dk)\n",
-					pool->getPoolName(),pool->getInitialBlockCount(),pool->getPeakBlockCount(),(initial - peak)/1024));
-			}
-		}
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("End Pool Underflow Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-	}
-
-	if( flags & REPORT_SIMPLE_LEAKS )
-	{
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Begin Simple Leak Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		Int any = 0;
-		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-		{
-			any += pool->debugPoolReportLeaks( pool->getPoolName() );
-		}
-		for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-		{
-			any += dma->debugDmaReportLeaks();
-		}
-		DEBUG_ASSERTCRASH(!any, ("There were %d memory leaks. Please fix them.\n",any));
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("End Simple Leak Report\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-	}
-
-#ifdef MEMORYPOOL_CHECKPOINTING
-	if (doBlockReport)
-	{
-		const char* nm = (this == TheMemoryPoolFactory) ? "TheMemoryPoolFactory" : "*** UNKNOWN *** MemoryPoolFactory";
-
-		DEBUG_LOG(("\n"));
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("Begin Block Report for %s\n", nm));
-		DEBUG_LOG(("------------------------------------------\n"));
-		char buf[256] = "";
-		if (flags & _REPORT_CP_ALLOCATED_BEFORE) strcat(buf, "AllocBefore ");
-		if (flags & _REPORT_CP_ALLOCATED_BETWEEN) strcat(buf, "AllocBetween ");
-		if (flags & _REPORT_CP_FREED_BEFORE) strcat(buf, "FreedBefore ");
-		if (flags & _REPORT_CP_FREED_BETWEEN) strcat(buf, "FreedBetween ");
-		if (flags & _REPORT_CP_FREED_NEVER) strcat(buf, "StillExisting ");
-		DEBUG_LOG(("Options: Between checkpoints %d and %d, report on (%s)\n",startCheckpoint,endCheckpoint,buf));
-		DEBUG_LOG(("------------------------------------------\n"));
-
-		BlockCheckpointInfo::doBlockCheckpointReport( NULL, "", 0, 0, 0 );
-		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
-		{
-			pool->debugCheckpointReport(flags, startCheckpoint, endCheckpoint, pool->getPoolName());
-		}
-		for (DynamicMemoryAllocator *dma = m_firstDmaInFactory; dma; dma = dma->getNextDmaInList())
-		{
-			dma->debugCheckpointReport(flags, startCheckpoint, endCheckpoint, "(Oversized)");
-		}
-
-		DEBUG_LOG(("------------------------------------------\n"));
-		DEBUG_LOG(("End Block Report for %s\n", nm));
-		DEBUG_LOG(("------------------------------------------\n"));
-	}
-#endif
-
-#ifdef ALLOW_DEBUG_UTILS
-	DebugSetFlags(oldFlags);
-#endif
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// GLOBAL FUNCTIONS
-//-----------------------------------------------------------------------------
-
-static int theLinkTester = 0;
-
-//-----------------------------------------------------------------------------
-void* STLSpecialAlloc::allocate(size_t __n) 
-{  
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
-	return TheDynamicMemoryAllocator->allocateBytes(__n, "STL_"); 
-}
-
-//-----------------------------------------------------------------------------
-void STLSpecialAlloc::deallocate(void* __p, size_t) 
-{ 
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
-	TheDynamicMemoryAllocator->freeBytes(__p); 
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator new; send requests to TheDynamicMemoryAllocator.
-*/
-void *operator new(size_t size)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
-	return TheDynamicMemoryAllocator->allocateBytes(size, "global operator new");
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator new[]; send requests to TheDynamicMemoryAllocator.
-*/
-void *operator new[](size_t size)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
-	return TheDynamicMemoryAllocator->allocateBytes(size, "global operator new[]");
-}
- 
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator delete; send requests to TheDynamicMemoryAllocator.
-*/
-void operator delete(void *p)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator delete"));
-	TheDynamicMemoryAllocator->freeBytes(p);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator delete[]; send requests to TheDynamicMemoryAllocator.
-*/
-void operator delete[](void *p)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator delete"));
-	TheDynamicMemoryAllocator->freeBytes(p);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator new (MFC debug version); send requests to TheDynamicMemoryAllocator.
-*/
-void* operator new(size_t size, const char * fname, int)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
-#ifdef MEMORYPOOL_DEBUG
-	return TheDynamicMemoryAllocator->allocateBytesImplementation(size, fname);
-#else
-	return TheDynamicMemoryAllocator->allocateBytesImplementation(size);
-#endif
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator delete (MFC debug version); send requests to TheDynamicMemoryAllocator.
-*/
-void operator delete(void * p, const char *, int)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator delete"));
-	TheDynamicMemoryAllocator->freeBytes(p);
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator new (MFC debug version); send requests to TheDynamicMemoryAllocator.
-*/
-void* operator new[](size_t size, const char * fname, int)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator new"));
-#ifdef MEMORYPOOL_DEBUG
-	return TheDynamicMemoryAllocator->allocateBytesImplementation(size, fname);
-#else
-	return TheDynamicMemoryAllocator->allocateBytesImplementation(size);
-#endif
-}
-
-//-----------------------------------------------------------------------------
-/**
-	overload for global operator delete (MFC debug version); send requests to TheDynamicMemoryAllocator.
-*/
-void operator delete[](void * p, const char *, int)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager before calling global operator delete"));
-	TheDynamicMemoryAllocator->freeBytes(p);
-}
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-void *calloc(size_t a, size_t b)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager"));
-	return TheDynamicMemoryAllocator->allocateBytes(a * b, "calloc");
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-void  free(void * p)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager"));
-	TheDynamicMemoryAllocator->freeBytes(p);
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-void *malloc(size_t a)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("must init memory manager"));
-	return TheDynamicMemoryAllocator->allocateBytesDoNotZero(a, "malloc");
-}
-#endif
-
-//-----------------------------------------------------------------------------
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-void *realloc(void *p, size_t s)
-{
-	DEBUG_CRASH(("realloc is evil. do not call it."));
-	throw ERROR_OUT_OF_MEMORY;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-/**
-	Initialize the memory manager, and create TheMemoryPoolFactory and TheDynamicMemoryAllocator.
-*/
-void initMemoryManager()
-{
-	if (TheMemoryPoolFactory == NULL) 
-	{
-		Int numSubPools;
-		const PoolInitRec *pParms;
-		userMemoryManagerGetDmaParms(&numSubPools, &pParms);
-		TheMemoryPoolFactory = new (::sysAllocateDoNotZero(sizeof MemoryPoolFactory)) MemoryPoolFactory;	// will throw on failure
-		TheMemoryPoolFactory->init();	// will throw on failure
-		TheDynamicMemoryAllocator = TheMemoryPoolFactory->createDynamicMemoryAllocator(numSubPools, pParms);	// will throw on failure
-		userMemoryManagerInitPools();
-		thePreMainInitFlag = false;
-	}
-	else
-	{
-		if (thePreMainInitFlag)
-		{
-			// quietly ignore the call
-		}
-		else 
-		{
-			DEBUG_CRASH(("memory manager is already inited"));
-		}
-	}
-
-	char* linktest;
-	
-	theLinkTester = 0; 
-
-	linktest = new char;
-	delete linktest;
-
-	linktest = new char[8];
-	delete [] linktest;
-
-	linktest = new char('\0');
-	delete linktest;
-
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-	linktest = (char*)malloc(1);
-	free(linktest);
-
-	linktest = (char*)calloc(1,1);
-	free(linktest);
-#endif
-
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-	if (theLinkTester != 10)
-#else
-	if (theLinkTester != 6)
-#endif
-	{
-		DEBUG_CRASH(("Wrong operator new/delete linked in! Fix this...\n"));
-		exit(-1);
-	}
-
-	theMainInitFlag = true;
-
-}
-
-//-----------------------------------------------------------------------------
-Bool isMemoryManagerOfficiallyInited()
-{
-	return theMainInitFlag;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	Initialize the memory manager, and create TheMemoryPoolFactory and TheDynamicMemoryAllocator.
-	This is only called if memory is allocated prior to the normal call to initMemoryManager
-	(generally via a static C++ ctor).
-*/
-static void preMainInitMemoryManager()
-{
-	if (TheMemoryPoolFactory == NULL)
-	{
-		DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
-		DEBUG_LOG(("*** Initing Memory Manager prior to main!\n"));
-
-		Int numSubPools;
-		const PoolInitRec *pParms;
-		userMemoryManagerGetDmaParms(&numSubPools, &pParms);
-		TheMemoryPoolFactory = new (::sysAllocateDoNotZero(sizeof MemoryPoolFactory)) MemoryPoolFactory;	// will throw on failure
-		TheMemoryPoolFactory->init();	// will throw on failure
-
-		TheDynamicMemoryAllocator = TheMemoryPoolFactory->createDynamicMemoryAllocator(numSubPools, pParms);	// will throw on failure
-		userMemoryManagerInitPools();
-		thePreMainInitFlag = true;
-	}
-}
-
-//-----------------------------------------------------------------------------
-/**
-	shutdown the memory manager and discard all memory. Note: if preMainInitMemoryManager()
-	was called prior to initMemoryManager(), this call will do nothing.
-*/
-void shutdownMemoryManager()
-{
-	if (thePreMainInitFlag)
-	{
-	#ifdef MEMORYPOOL_DEBUG
-		DEBUG_LOG(("*** Memory Manager was inited prior to main -- skipping shutdown!\n"));
-	#endif
-	}
-	else
-	{
-		if (TheDynamicMemoryAllocator)
-		{
-			DEBUG_ASSERTCRASH(TheMemoryPoolFactory, ("hmm, no factory"));
-			if (TheMemoryPoolFactory) 
-				TheMemoryPoolFactory->destroyDynamicMemoryAllocator(TheDynamicMemoryAllocator);
-			TheDynamicMemoryAllocator = NULL;
-		}
-
-		if (TheMemoryPoolFactory) 
-		{
-			// this is evil... since there is no 'placement delete' we must do this the hard way
-			// and call the dtor directly. ordinarily this is heinous, but in this case we'll
-			// make an exception.
-			TheMemoryPoolFactory->~MemoryPoolFactory();
-			::sysFree((void *)TheMemoryPoolFactory);
-			TheMemoryPoolFactory = NULL;
-		}
-
-	#ifdef MEMORYPOOL_DEBUG
-		DEBUG_LOG(("Peak system allocation was %d bytes\n",thePeakSystemAllocationInBytes));
-		DEBUG_LOG(("Wasted DMA space (peak) was %d bytes\n",thePeakWastedDMA));
-		DEBUG_ASSERTCRASH(theTotalSystemAllocationInBytes == 0, ("Leaked a total of %d raw bytes\n", theTotalSystemAllocationInBytes));
-	#endif
-	}
-
-	theMainInitFlag = false;
-}
-
-//-----------------------------------------------------------------------------
-void* createW3DMemPool(const char *poolName, int allocationSize)
-{
-	++theLinkTester;
-	preMainInitMemoryManager();
-	MemoryPool* pool = TheMemoryPoolFactory->createMemoryPool(poolName, allocationSize, 0, 0);
-	DEBUG_ASSERTCRASH(pool && pool->getAllocationSize() == allocationSize, ("bad w3d pool"));
-	return pool;
-}
-
-//-----------------------------------------------------------------------------
-void* allocateFromW3DMemPool(void* pool, int allocationSize)
-{
-	DEBUG_ASSERTCRASH(pool, ("pool is null\n"));
-	DEBUG_ASSERTCRASH(pool && ((MemoryPool*)pool)->getAllocationSize() == allocationSize, ("bad w3d pool size %s",((MemoryPool*)pool)->getPoolName()));
-	return ((MemoryPool*)pool)->allocateBlock("allocateFromW3DMemPool");
-}
-
-//-----------------------------------------------------------------------------
-void* allocateFromW3DMemPool(void* pool, int allocationSize, const char* msg, int unused)
-{
-	DEBUG_ASSERTCRASH(pool, ("pool is null\n"));
-	DEBUG_ASSERTCRASH(pool && ((MemoryPool*)pool)->getAllocationSize() == allocationSize, ("bad w3d pool size %s",((MemoryPool*)pool)->getPoolName()));
-	return ((MemoryPool*)pool)->allocateBlock(msg);
-}
-
-//-----------------------------------------------------------------------------
-void freeFromW3DMemPool(void* pool, void* p)
-{
-	DEBUG_ASSERTCRASH(pool, ("pool is null\n"));
-	((MemoryPool*)pool)->freeBlock(p);
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemoryNull.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemoryNull.cpp
deleted file mode 100644
index cbf029dd5aa..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemoryNull.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 TheSuperHackers
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "PreRTS.h"
-
-#include <malloc.h>
-
-#include "Common/GameMemoryNull.h"
-
-static Bool theMainInitFlag = false;
-
-// ----------------------------------------------------------------------------
-// PUBLIC DATA 
-// ----------------------------------------------------------------------------
-
-MemoryPoolFactory *TheMemoryPoolFactory = NULL;
-DynamicMemoryAllocator *TheDynamicMemoryAllocator = NULL;
-
-//-----------------------------------------------------------------------------
-// METHODS for DynamicMemoryAllocator
-//-----------------------------------------------------------------------------
-
-/**
-	allocate a chunk-o-bytes from this DMA and return it, but don't bother zeroing
-	out the block. if unable to allocate, throw ERROR_OUT_OF_MEMORY. this
-	function will never return null.
-
-  added code to make sure we're on a DWord boundary, throw exception if not
-*/
-void *DynamicMemoryAllocator::allocateBytesDoNotZeroImplementation(Int numBytes)
-{
-	void *p = malloc(numBytes);
-	if (p == NULL)
-		throw ERROR_OUT_OF_MEMORY;
-	return p;
-}
-
-/**
-	allocate a chunk-o-bytes from this DMA and return it, and zero out the contents first.
-	if unable to allocate, throw ERROR_OUT_OF_MEMORY. 
-	this function will never return null.
-*/
-void *DynamicMemoryAllocator::allocateBytesImplementation(Int numBytes)
-{
-	void* p = allocateBytesDoNotZeroImplementation(numBytes);	// throws on failure
-	memset(p, 0, numBytes);
-	return p;
-}
-
-/**
-	free a chunk-o-bytes allocated by this dma. it's ok to pass null.
-*/
-void DynamicMemoryAllocator::freeBytes(void* pBlockPtr)
-{
-	free(pBlockPtr);
-}
-
-Int DynamicMemoryAllocator::getActualAllocationSize(Int numBytes)
-{
-	return numBytes;
-}
-
-#ifdef MEMORYPOOL_DEBUG
-void DynamicMemoryAllocator::debugIgnoreLeaksForThisBlock(void* pBlockPtr)
-{
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// METHODS for MemoryPoolFactory
-//-----------------------------------------------------------------------------
-
-void MemoryPoolFactory::memoryPoolUsageReport( const char* filename, FILE *appendToFileInstead )
-{
-}
-
-#ifdef MEMORYPOOL_DEBUG
-void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int endCheckpoint, FILE *fp )
-{
-}
-void MemoryPoolFactory::debugSetInitFillerIndex(Int index)
-{
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// GLOBAL FUNCTIONS
-//-----------------------------------------------------------------------------
-
-/**
-	Initialize the memory manager, and create TheMemoryPoolFactory and TheDynamicMemoryAllocator.
-*/
-void initMemoryManager()
-{
-	if (TheMemoryPoolFactory == NULL && TheDynamicMemoryAllocator == NULL)
-	{
-		TheMemoryPoolFactory = new (malloc(sizeof MemoryPoolFactory)) MemoryPoolFactory;
-		TheDynamicMemoryAllocator = new (malloc(sizeof DynamicMemoryAllocator)) DynamicMemoryAllocator;
-	}
-	else
-	{
-			DEBUG_CRASH(("memory manager is already inited"));
-	}
-
-	theMainInitFlag = true;
-}
-
-//-----------------------------------------------------------------------------
-Bool isMemoryManagerOfficiallyInited()
-{
-	return theMainInitFlag;
-}
-
-//-----------------------------------------------------------------------------
-/**
-	shutdown the memory manager and discard all memory. Note: if preMainInitMemoryManager()
-	was called prior to initMemoryManager(), this call will do nothing.
-*/
-void shutdownMemoryManager()
-{
-	if (TheDynamicMemoryAllocator != NULL)
-	{
-		TheDynamicMemoryAllocator->~DynamicMemoryAllocator();
-		free((void *)TheDynamicMemoryAllocator);
-		TheDynamicMemoryAllocator = NULL;
-	}
-
-	if (TheMemoryPoolFactory != NULL)
-	{
-		TheMemoryPoolFactory->~MemoryPoolFactory();
-		free((void *)TheMemoryPoolFactory);
-		TheMemoryPoolFactory = NULL;
-	}
-
-	theMainInitFlag = false;
-}
-
-
-#ifndef DISABLE_GAMEMEMORY_NEW_OPERATORS
-
-extern void * __cdecl operator new(size_t size)
-{
-	void *p = malloc(size);
-	if (p == NULL)
-		throw ERROR_OUT_OF_MEMORY;
-	memset(p, 0, size);
-	return p;
-}
-
-extern void __cdecl operator delete(void *p)
-{
-	free(p);
-}
-
-extern void * __cdecl operator new[](size_t size)
-{
-	void *p = malloc(size);
-	if (p == NULL)
-		throw ERROR_OUT_OF_MEMORY;
-	memset(p, 0, size);
-	return p;
-}
-
-extern void __cdecl operator delete[](void *p)
-{
-	free(p);
-}
-
-// additional overloads to account for VC/MFC funky versions
-extern void* __cdecl operator new(size_t size, const char *, int)
-{
-	void *p = malloc(size);
-	if (p == NULL)
-		throw ERROR_OUT_OF_MEMORY;
-	memset(p, 0, size);
-	return p;
-}
-
-extern void __cdecl operator delete(void *p, const char *, int)
-{
-	free(p);
-}
-
-extern void* __cdecl operator new[](size_t size, const char *, int)
-{
-	void *p = malloc(size);
-	if (p == NULL)
-		throw ERROR_OUT_OF_MEMORY;
-	memset(p, 0, size);
-	return p;
-}
-
-extern void __cdecl operator delete[](void *p, const char *, int)
-{
-	free(p);
-}
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/GameType.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/GameType.cpp
index c02b378593a..b4fbba3d5c3 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/GameType.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/GameType.cpp
@@ -24,9 +24,9 @@
 
 // GameType.cpp ///////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
-const char *TimeOfDayNames[] = 
+const char *const TimeOfDayNames[] =
 {
 	"NONE",
 	"MORNING",
@@ -36,11 +36,13 @@ const char *TimeOfDayNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TimeOfDayNames) == TIME_OF_DAY_COUNT + 1, "Incorrect array size");
 
-const char *WeatherNames[] = 
+const char *const WeatherNames[] =
 {
 	"NORMAL",
 	"SNOWY",
 
 	NULL
 };
+static_assert(ARRAY_SIZE(WeatherNames) == WEATHER_COUNT + 1, "Incorrect array size");
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Geometry.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Geometry.cpp
index 40e048563db..670772bf200 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/Geometry.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Geometry.cpp
@@ -24,9 +24,9 @@
 
 // FILE: Geometry.cpp /////////////////////////////////////////////////////////////////////////////
 // Author: Steven Johnson, Aug 2002
-// Desc:   
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_GEOMETRY_NAMES
 
@@ -36,11 +36,6 @@
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -151,7 +146,7 @@ static Real calcPointToLineDistSquared(const Coord3D& pt, const Coord3D& lineSta
 	}
 
   Real tmp = dot / lineLenSqr;
-	
+
 	closest.x = lineStart.x + tmp * line.x;
 	closest.y = lineStart.y + tmp * line.y;
 	closest.z = lineStart.z + tmp * line.z;
@@ -181,7 +176,7 @@ void GeometryInfo::calcPitches(const Coord3D& thisPos, const GeometryInfo& that,
 	Real dxy = sqrt(sqr(thatPos.x - thisCenter.x) + sqr(thatPos.y - thisCenter.y));
 
 	Real dz;
-	
+
 	/** @todo srj -- this could be better, by calcing it for all the corners, not just top-center
 		and bottom-center... oh well */
 	dz = (thatPos.z + that.getMaxHeightAbovePosition()) - thisCenter.z;
@@ -297,7 +292,7 @@ void GeometryInfo::get2DBounds(const Coord3D& geomCenter, Real angle, Region2D&
 			bounds.lo.y = y;
 			bounds.hi.x = x;
 			bounds.hi.y = y;
-			
+
 			x = geomCenter.x + exc - eys;
 			y = geomCenter.y + eyc + exs;
 			if (bounds.lo.x > x) bounds.lo.x = x;
@@ -518,7 +513,7 @@ void GeometryInfo::calcBoundingStuff()
 	};
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 //=============================================================================
 void GeometryInfo::tweakExtents(ExtentModType extentModType, Real extentModAmount)
 {
@@ -542,7 +537,7 @@ void GeometryInfo::tweakExtents(ExtentModType extentModType, Real extentModAmoun
 }
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 //=============================================================================
 AsciiString GeometryInfo::getDescriptiveString() const
 {
@@ -558,7 +553,7 @@ AsciiString GeometryInfo::getDescriptiveString() const
 void GeometryInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -594,7 +589,7 @@ void GeometryInfo::xfer( Xfer *xfer )
 	// bounding sphere radius
 	xfer->xferReal( &m_boundingSphereRadius );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -602,4 +597,4 @@ void GeometryInfo::xfer( Xfer *xfer )
 void GeometryInfo::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/KindOf.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/KindOf.cpp
index 47ef9795f91..7e703a508a3 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/KindOf.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/KindOf.cpp
@@ -31,7 +31,8 @@
 #include "Common/KindOf.h"
 #include "Common/BitFlagsIO.h"
 
-const char* KindOfMaskType::s_bitNameList[] = 
+template<>
+const char* const KindOfMaskType::s_bitNameList[] =
 {
 	"OBSTACLE",
 	"SELECTABLE",
@@ -160,6 +161,7 @@ const char* KindOfMaskType::s_bitNameList[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(KindOfMaskType::s_bitNameList) == KindOfMaskType::NumBits + 1, "Incorrect array size");
 
 KindOfMaskType KINDOFMASK_NONE;	// inits to all zeroes
 KindOfMaskType KINDOFMASK_FS;		// inits to all zeroes
@@ -167,12 +169,12 @@ KindOfMaskType KINDOFMASK_FS;		// inits to all zeroes
 void initKindOfMasks()
 {
 	KINDOFMASK_FS.set( KINDOF_FS_FACTORY );
-	KINDOFMASK_FS.set( KINDOF_FS_BASE_DEFENSE ); 
-	KINDOFMASK_FS.set( KINDOF_FS_TECHNOLOGY ); 
-	KINDOFMASK_FS.set( KINDOF_FS_SUPPLY_DROPZONE ); 
-	KINDOFMASK_FS.set( KINDOF_FS_SUPERWEAPON );		
-	KINDOFMASK_FS.set( KINDOF_FS_BLACK_MARKET ); 
-	KINDOFMASK_FS.set( KINDOF_FS_SUPPLY_CENTER ); 
+	KINDOFMASK_FS.set( KINDOF_FS_BASE_DEFENSE );
+	KINDOFMASK_FS.set( KINDOF_FS_TECHNOLOGY );
+	KINDOFMASK_FS.set( KINDOF_FS_SUPPLY_DROPZONE );
+	KINDOFMASK_FS.set( KINDOF_FS_SUPERWEAPON );
+	KINDOFMASK_FS.set( KINDOF_FS_BLACK_MARKET );
+	KINDOFMASK_FS.set( KINDOF_FS_SUPPLY_CENTER );
 	KINDOFMASK_FS.set( KINDOF_FS_STRATEGY_CENTER );
 	KINDOFMASK_FS.set( KINDOF_FS_FAKE );
 	KINDOFMASK_FS.set( KINDOF_FS_INTERNET_CENTER );
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/List.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/List.cpp
index cd0bacbc581..af7da9cc3f3 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/List.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/List.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   WSYS Library
@@ -42,7 +42,7 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include "PreRTS.h"
@@ -53,49 +53,49 @@
 #pragma warning(disable : 4706)
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 //============================================================================
@@ -104,7 +104,7 @@
 
 LList::LList( )
 : m_sortMode(DESCENDING)
-{ 
+{
 	m_head.setItem( &m_head.m_item);
 };
 
@@ -214,7 +214,7 @@ void LList::clear( void )
 }
 
 //=================================================================
-// LList::nodeCount 
+// LList::nodeCount
 //=================================================================
 
 Int LList::nodeCount( void )
@@ -234,7 +234,7 @@ Int LList::nodeCount( void )
 }
 
 //=================================================================
-// LList::getNode 
+// LList::getNode
 //=================================================================
 
 LListNode*	LList::getNode( Int index )
@@ -314,8 +314,8 @@ LListNode* LList::findItem( void *item )
 LListNode::LListNode()
 : m_pri(0),
 	m_item(NULL),
-	m_autoDelete(FALSE) 
-{ 
+	m_autoDelete(FALSE)
+{
 	m_next = m_prev = this;
 };
 
@@ -370,7 +370,7 @@ LListNode*		LListNode::next( void )
 }
 
 //=================================================================
-// LListNode::prev 
+// LListNode::prev
 //=================================================================
 
 LListNode*		LListNode::prev( void )
@@ -384,7 +384,7 @@ LListNode*		LListNode::prev( void )
 }
 
 //=================================================================
-// LListNode::loopNext 
+// LListNode::loopNext
 //=================================================================
 
 LListNode*		LListNode::loopNext( void )
@@ -407,7 +407,7 @@ LListNode*		LListNode::loopNext( void )
 }
 
 //=================================================================
-// LListNode::loopPrev 
+// LListNode::loopPrev
 //=================================================================
 
 LListNode*		LListNode::loopPrev( void )
@@ -448,4 +448,4 @@ void	LListNode::destroy( void )
 void	LList::addToEndOfGroup( Bool yes )
 {
 	m_addToEndOfGroup = yes;
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/LocalFile.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/LocalFile.cpp
deleted file mode 100644
index 9680a43fa39..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/LocalFile.cpp
+++ /dev/null
@@ -1,627 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   WSYS Library
-//
-// Module:    IO_
-//
-// File name: IO_LocalFile.cpp
-//
-// Created:   4/23/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <io.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "Common/LocalFile.h"
-#include "Common/RAMFile.h"
-#include "Lib/BaseType.h"
-#include "Common/PerfTimer.h"
-			
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-static Int s_totalOpen = 0;
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-//=================================================================
-// LocalFile::LocalFile
-//=================================================================
-
-LocalFile::LocalFile()
-#ifdef USE_BUFFERED_IO
-	: m_file(NULL)
-#else
-	: m_handle(-1)
-#endif
-{
-}
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//=================================================================
-// LocalFile::~LocalFile	
-//=================================================================
-
-LocalFile::~LocalFile()
-{
-#ifdef USE_BUFFERED_IO
-	if (m_file)
-	{
-		fclose(m_file);
-		m_file = NULL;
-		--s_totalOpen;
-	}
-#else
-	if( m_handle != -1 )
-	{
-		_close( m_handle );
-		m_handle = -1;
-		--s_totalOpen;
-	}
-#endif
-
-	File::close();
-
-}
-
-//=================================================================
-// LocalFile::open	
-//=================================================================
-/**
-  *	This function opens a file using the standard C open() call. Access flags
-	* are mapped to the appropriate open flags. Returns true if file was opened
-	* successfully.
-	*/
-//=================================================================
-
-//DECLARE_PERF_TIMER(LocalFile)
-Bool LocalFile::open( const Char *filename, Int access )
-{
-	//USE_PERF_TIMER(LocalFile)
-	if( !File::open( filename, access) )
-	{
-		return FALSE;
-	}
-
-	/* here we translate WSYS file access to the std C equivalent */
-#ifdef USE_BUFFERED_IO
-	char mode[32];
-	char* m = mode;
-
-	if (m_access & APPEND)
-	{
-		DEBUG_CRASH(("not yet supported by buffered mode"));
-	}
-
-	if (m_access & TRUNCATE)
-	{
-		DEBUG_CRASH(("not yet supported by buffered mode"));
-	}
-
-	if((m_access & READWRITE ) == READWRITE )
-	{
-		if (m_access & CREATE)
-		{
-			*m++ = 'w';
-			*m++ = '+';
-		}
-		else
-		{
-			*m++ = 'r';
-			*m++ = '+';
-		}
-	}
-	else if(m_access & WRITE)
-	{
-		*m++ = 'w';
-	}
-	else
-	{
-		*m++ = 'r';
-		DEBUG_ASSERTCRASH(!(m_access & TRUNCATE), ("cannot truncate with read-only"));
-	}
-
-	if (m_access & TEXT)
-	{
-		*m++ = 't';
-	}
-	if (m_access & BINARY)
-	{
-		*m++ = 'b';
-	}
-
-	*m++ = 0;
-
-	m_file = fopen(filename, mode);
-	if (m_file == NULL)
-	{
-		goto error;
-	}
-	
-	//setvbuf(m_file, m_vbuf, _IOFBF, sizeof(BUF_SIZE));
-
-#else
-
-	int flags = 0;
-
-	if (m_access & CREATE)
-	{
-		flags |= _O_CREAT;
-	}
-	if (m_access & TRUNCATE)
-	{
-		flags |= _O_TRUNC;
-	}
-	if (m_access & APPEND)
-	{
-		flags |= _O_APPEND;
-	}
-	if (m_access & TEXT)
-	{
-		flags |= _O_TEXT;
-	}
-	if (m_access & BINARY)
-	{
-		flags |= _O_BINARY;
-	}
-
-	if((m_access & READWRITE )== READWRITE )
-	{
-		flags |= _O_RDWR;
-	}
-	else if(m_access & WRITE)
-	{
-		flags |= _O_WRONLY;
-		flags |= _O_CREAT;
-	}
-	else
-	{
-		flags |= _O_RDONLY;
-	}
-
-	m_handle = _open( filename, flags , _S_IREAD | _S_IWRITE);
-
-	if( m_handle == -1 )
-	{
-		goto error;
-	}
-
-#endif
-
-	++s_totalOpen;
-///	DEBUG_LOG(("LocalFile::open %s (total %d)\n",filename,s_totalOpen));
-	if ( m_access & APPEND )
-	{
-		if ( seek ( 0, END ) < 0 )
-		{
-			goto error;
-		}
-	}
-
-	return TRUE;
-
-error:
-
-	close();
-
-	return FALSE;
-}
-
-//=================================================================
-// LocalFile::close 	
-//=================================================================
-/**
-	* Closes the current file if it is open.
-  * Must call LocalFile::close() for each successful LocalFile::open() call.
-	*/
-//=================================================================
-
-void LocalFile::close( void )
-{
-	File::close();
-}
-
-//=================================================================
-// LocalFile::read 
-//=================================================================
-
-Int LocalFile::read( void *buffer, Int bytes )
-{
-	//USE_PERF_TIMER(LocalFile)
-	if( !m_open )
-	{
-		return -1;
-	}
-
-	if (buffer == NULL) 
-	{
-#ifdef USE_BUFFERED_IO
-		fseek(m_file, bytes, SEEK_CUR);
-#else
-		_lseek(m_handle, bytes, SEEK_CUR);
-#endif
-		return bytes;
-	}
-
-#ifdef USE_BUFFERED_IO
-	Int ret = fread(buffer, 1, bytes, m_file);
-#else
-	Int ret = _read( m_handle, buffer, bytes );
-#endif
-
-	return ret;
-}
-
-//=================================================================
-// LocalFile::write 
-//=================================================================
-
-Int LocalFile::write( const void *buffer, Int bytes )
-{
-
-	if( !m_open || !buffer )
-	{
-		return -1;
-	}
-
-#ifdef USE_BUFFERED_IO
-	Int ret = fwrite(buffer, 1, bytes, m_file);
-#else
-	Int ret = _write( m_handle, buffer, bytes );
-#endif
-	return ret;
-}
-
-//=================================================================
-// LocalFile::seek 
-//=================================================================
-
-Int LocalFile::seek( Int pos, seekMode mode)
-{
-	int lmode;
-
-	switch( mode )
-	{
-		case START:
-			lmode = SEEK_SET;
-			break;
-		case CURRENT:
-			lmode = SEEK_CUR;
-			break;
-		case END:
-			DEBUG_ASSERTCRASH(pos <= 0, ("LocalFile::seek - pos should be <= 0 for a seek starting at the end of the file"));
-			lmode = SEEK_END;
-			break;
-		default:
-			// bad seek mode
-			return -1;
-	}
-
-#ifdef USE_BUFFERED_IO
-	Int ret = fseek(m_file, pos, lmode);
-	if (ret == 0)
-		return ftell(m_file);
-	else
-		return -1;
-#else
-	Int ret = _lseek( m_handle, pos, lmode );
-#endif
-	return ret;
-}
-
-//=================================================================
-// LocalFile::scanInt
-//=================================================================
-// skips preceding whitespace and stops at the first non-number
-// or at EOF
-Bool LocalFile::scanInt(Int &newInt)
-{
-	newInt = 0;
-	AsciiString tempstr;
-	Char c;
-	Int val;
-
-	// skip preceding non-numeric characters
-	do {
-#ifdef USE_BUFFERED_IO
-		val = fread(&c, 1, 1, m_file);
-#else
-		val = _read( m_handle, &c, 1);
-#endif
-	} while ((val != 0) && (((c < '0') || (c > '9')) && (c != '-')));
-
-	if (val == 0) {
-		return FALSE;
-	}
-
-	do {
-		tempstr.concat(c);
-#ifdef USE_BUFFERED_IO
-		val = fread(&c, 1, 1, m_file);
-#else
-		val = _read( m_handle, &c, 1);
-#endif
-	} while ((val != 0) && ((c >= '0') && (c <= '9')));
-
-	// put the last read char back, since we didn't use it.
-	if (val != 0) {
-#ifdef USE_BUFFERED_IO
-		fseek(m_file, -1, SEEK_CUR);
-#else
-		_lseek(m_handle, -1, SEEK_CUR);
-#endif
-	}
-
-	newInt = atoi(tempstr.str());
-	return TRUE;
-}
-
-//=================================================================
-// LocalFile::scanReal
-//=================================================================
-// skips preceding whitespace and stops at the first non-number
-// or at EOF
-Bool LocalFile::scanReal(Real &newReal) 
-{
-	newReal = 0.0;
-	AsciiString tempstr;
-	Char c;
-	Int val;
-	Bool sawDec = FALSE;
-
-	// skip the preceding white space
-	do {
-#ifdef USE_BUFFERED_IO
-		val = fread(&c, 1, 1, m_file);
-#else
-		val = _read( m_handle, &c, 1);
-#endif
-	} while ((val != 0) && (((c < '0') || (c > '9')) && (c != '-') && (c != '.')));
-
-	if (val == 0) {
-		return FALSE;
-	}
-
-	do {
-		tempstr.concat(c);
-		if (c == '.') {
-			sawDec = TRUE;
-		}
-#ifdef USE_BUFFERED_IO
-		val = fread(&c, 1, 1, m_file);
-#else
-		val = _read(m_handle, &c, 1);
-#endif
-	} while ((val != 0) && (((c >= '0') && (c <= '9')) || ((c == '.') && !sawDec)));
-
-	if (val != 0) {
-#ifdef USE_BUFFERED_IO
-		fseek(m_file, -1, SEEK_CUR);
-#else
-		_lseek(m_handle, -1, SEEK_CUR);
-#endif
-	}
-
-	newReal = atof(tempstr.str());
-	return TRUE;
-}
-
-//=================================================================
-// LocalFile::scanString
-//=================================================================
-// skips preceding whitespace and stops at the first whitespace
-// or at EOF
-Bool LocalFile::scanString(AsciiString &newString) 
-{
-	Char c;
-	Int val;
-
-	newString.clear();
-
-	// skip the preceding whitespace
-	do {
-#ifdef USE_BUFFERED_IO
-		val = fread(&c, 1, 1, m_file);
-#else
-		val = _read(m_handle, &c, 1);
-#endif
-	} while ((val != 0) && (isspace(c)));
-
-	if (val == 0) {
-		return FALSE;
-	}
-
-	do {
-		newString.concat(c);
-#ifdef USE_BUFFERED_IO
-		val = fread(&c, 1, 1, m_file);
-#else
-		val = _read(m_handle, &c, 1);
-#endif
-	} while ((val != 0) && (!isspace(c)));
-
-	if (val != 0) {
-#ifdef USE_BUFFERED_IO
-		fseek(m_file, -1, SEEK_CUR);
-#else
-		_lseek(m_handle, -1, SEEK_CUR);
-#endif
-	}
-
-	return TRUE;
-}
-
-//=================================================================
-// LocalFile::nextLine
-//=================================================================
-// scans to the first character after a new-line or at EOF
-void LocalFile::nextLine(Char *buf, Int bufSize) 
-{
-	Char c = 0;
-	Int val;
-	Int i = 0;
-
-	// seek to the next new-line.
-	do {
-		if ((buf == NULL) || (i >= (bufSize-1))) {
-#ifdef USE_BUFFERED_IO
-			val = fread(&c, 1, 1, m_file);
-#else
-			val = _read(m_handle, &c, 1);
-#endif
-		} else {
-#ifdef USE_BUFFERED_IO
-			val = fread(buf + i, 1, 1, m_file);
-#else
-			val = _read(m_handle, buf + i, 1);
-#endif
-			c = buf[i];
-		}
-		++i;
-	} while ((val != 0) && (c != '\n'));
-
-	if (buf != NULL) {
-		if (i < bufSize) {
-			buf[i] = 0;
-		} else {
-			buf[bufSize] = 0;
-		}
-	}
-}
-
-//=================================================================
-//=================================================================
-File* LocalFile::convertToRAMFile()
-{
-	RAMFile *ramFile = newInstance( RAMFile );
-	if (ramFile->open(this)) 
-	{
-		if (this->m_deleteOnClose)
-		{
-			ramFile->deleteOnClose();
-			this->close(); // is deleteonclose, so should delete.
-		}
-		else
-		{
-			this->close();
-			deleteInstance(this);
-		}
-		return ramFile;
-	}	
-	else 
-	{
-		ramFile->close();
-		deleteInstance(ramFile);
-		return this;
-	}
-}
-
-//=================================================================
-// LocalFile::readEntireAndClose
-//=================================================================
-/**
-	Allocate a buffer large enough to hold entire file, read 
-	the entire file into the buffer, then close the file.
-	the buffer is owned by the caller, who is responsible
-	for freeing is (via delete[]). This is a Good Thing to
-	use because it minimizes memory copies for BIG files.
-*/
-char* LocalFile::readEntireAndClose()
-{
-	UnsignedInt fileSize = size();
-	char* buffer = NEW char[fileSize];
-
-	read(buffer, fileSize);
-
-	close();
-
-	return buffer;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/LocalFileSystem.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/LocalFileSystem.cpp
deleted file mode 100644
index 52ca11a812b..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/LocalFileSystem.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Game Engine
-//
-// Module:    IO
-//
-// File name: LocalFileSystem.cpp
-//
-// Created:   4/23/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-#include "Common/LocalFileSystem.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-LocalFileSystem *TheLocalFileSystem = NULL;
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-void LocalFileSystem::init() {
-}
-
-void LocalFileSystem::reset() {
-}
-
-void LocalFileSystem::update() {
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/MemoryInit.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/MemoryInit.cpp
deleted file mode 100644
index 5c377d6ffe0..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/MemoryInit.cpp
+++ /dev/null
@@ -1,805 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: MemoryInit.cpp 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: MemoryInit.cpp
-//
-// Created:   Steven Johnson, August 2001
-//
-// Desc:      Memory manager
-//
-// ----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-// SYSTEM INCLUDES
-
-// USER INCLUDES 
-#include "Lib/BaseType.h"
-#include "Common/GameMemory.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-----------------------------------------------------------------------------
-void userMemoryManagerGetDmaParms(Int *numSubPools, const PoolInitRec **pParms)
-{
-	static const PoolInitRec defaultDMA[7] = 
-	{
-		// name, allocsize, initialcount, overflowcount
-		{ "dmaPool_16", 16,			130000,	10000 },
-		{ "dmaPool_32", 32,			250000,	10000 },
-		{ "dmaPool_64", 64,			100000,	10000 },
-		{ "dmaPool_128", 128,		80000,	10000 },
-		{ "dmaPool_256", 256,		20000,	5000 },
-		{ "dmaPool_512", 512,		16000,	5000 },
-		{ "dmaPool_1024", 1024, 6000,		1024}
-	};
-
-	*numSubPools = 7;
-	*pParms = defaultDMA;
-}
-
-//-----------------------------------------------------------------------------
-struct PoolSizeRec
-{
-	const char* name;
-	Int initial;
-	Int overflow;
-};
-
-//-----------------------------------------------------------------------------
-// And please be careful of duplicates.  They are not rejected.
-// not const -- we might override from INI
-static PoolSizeRec sizes[] = 
-{
-	{ "PartitionContactListNode", 2048, 512 },
-	{ "BattleshipUpdate", 32, 32 },
-	{ "FlyToDestAndDestroyUpdate", 32, 32 },
-	{ "MusicTrack", 32, 32 },
-	{ "PositionalSoundPool", 32, 32 },
-	{ "GameMessage", 2048, 32 },
-	{ "NameKeyBucketPool", 9000, 1024 },
-	{ "ObjectSellInfo", 16, 16 },
-	{ "ProductionPrerequisitePool", 1024, 32 },
-	{ "RadarObject", 512, 32 },
-	{ "ResourceGatheringManager", 16, 16 },
-	{ "SightingInfo", 8192, 2048 },// Looks big, but all 3000 objects used to have 4 just built in.
-	{ "SpecialPowerTemplate", 84, 32 },
-	{ "StateMachinePool", 32, 32 },
-	{ "TeamPool", 128, 32 },	// if you increase this, increase player/team relation map pools
-	{ "PlayerRelationMapPool", 128, 32 },
-	{ "TeamRelationMapPool", 128, 32 },
-	{ "TeamPrototypePool", 256, 32 },
-	{ "TerrainType", 256, 32 },
-	{ "ThingTemplatePool", 2120, 32 },
-	{ "TunnelTracker", 16, 16 },
-	{ "Upgrade", 16, 16 },
-	{ "UpgradeTemplate", 128, 16 },
-	{ "Anim2D", 32, 32 },
-	{ "CommandButton", 1024, 256 },
-	{ "CommandSet", 820, 16 },
-	{ "DisplayString", 32, 32 },
-	{ "WebBrowserURL", 16, 16 },
-	{ "Drawable", 4096, 32 },
-	{ "Image", 2048, 32 },
-	{ "ParticlePool", 1400, 1024 },  
-	{ "ParticleSystemTemplatePool", 1100, 32 },  
-	{ "ParticleSystemPool", 1024, 32 },  
-	{ "TerrainRoadType", 100, 32, },
-	{ "WindowLayoutPool", 32, 32 },
-	{ "AnimatedParticleSysBoneClientUpdate", 16, 16 },
-	{ "SwayClientUpdate", 32, 32 },
-	{ "BeaconClientUpdate", 64, 32 },
-	{ "AIGroupPool", 64, 32 },  
-	{ "AIDockMachinePool", 256, 32 },
-	{ "AIGuardMachinePool", 32, 32 },
-	{ "AIGuardRetaliateMachinePool", 32, 32 },
-	{ "AITNGuardMachinePool", 32, 32 },
-	{ "PathNodePool", 8192, 1024 },  
-	{ "PathPool", 256, 16 },       
-	{ "WorkOrder", 32, 32 },  
-	{ "TeamInQueue", 32, 32 },
-	{ "AIPlayer", 12, 4 },  
-	{ "AISkirmishPlayer", 8, 8 },  
-	{ "AIStateMachine",  600, 32 },
-	{ "JetAIStateMachine",  64, 32 },
-	{ "HeliAIStateMachine",  64, 32 },
-	{ "AIAttackMoveStateMachine", 2048, 32 },
-	{ "AIAttackThenIdleStateMachine", 512, 32 },
-	{ "AttackStateMachine",  512, 32 },
-	{ "CrateTemplate", 32, 32 },
-	{ "ExperienceTrackerPool", 2048, 512 }, 
-	{ "FiringTrackerPool", 4096, 256 }, 
-	{ "ObjectRepulsorHelper", 1024, 256 }, 
-	{ "ObjectSMCHelperPool", 2048, 256 }, 
-	{ "ObjectWeaponStatusHelperPool", 4096, 256 }, 
-	{ "ObjectDefectionHelperPool", 2048, 256 }, 
-	{ "StatusDamageHelper", 1500, 256 },
-	{ "SubdualDamageHelper", 1500, 256 }, 
-	{ "TempWeaponBonusHelper", 4096, 256 },
-	{ "Locomotor", 2048, 32 },
-	{ "LocomotorTemplate", 192, 32	},
-	{ "ObjectPool", 1500, 256 },
-	{ "SimpleObjectIteratorPool", 32, 32 },
-	{ "SimpleObjectIteratorClumpPool", 4096, 32 },
-	{ "PartitionDataPool", 2048, 512 },
-	{ "BuildEntry", 32, 32 },
-	{ "Weapon", 4096, 32 },
-	{ "WeaponTemplate", 360, 32 },
-	{ "AIUpdateInterface", 600, 32 },
-	{ "ActiveBody", 1024, 32 },
-	{ "ActiveShroudUpgrade", 32, 32 },
-	{ "AssistedTargetingUpdate", 32, 32 },
-	{ "AudioEventInfo", 4096, 64 },
-	{ "AudioRequest", 256, 8 },
-	{ "AutoHealBehavior", 1024, 256 },
-	{ "WeaponBonusUpdate", 16, 16 },
-	{ "GrantStealthBehavior", 4096, 32 },
-	{ "NeutronBlastBehavior", 4096, 32 },
-	{ "CountermeasuresBehavior", 256, 32 },
-	{ "BaseRegenerateUpdate", 128, 32 },
-	{ "BoneFXDamage", 64, 32 },
-	{ "BoneFXUpdate", 64, 32 },
-	{ "BridgeBehavior", 4, 4 },
-	{ "BridgeTowerBehavior", 32, 32 },
-	{ "BridgeScaffoldBehavior", 32, 32 },
-	{ "CaveContain", 16, 16 },
-	{ "HealContain", 32, 32 },
-	{ "CreateCrateDie", 256, 128 },
-	{ "CreateObjectDie", 1024, 32 },
-	{ "EjectPilotDie", 1024, 32 },
-	{ "CrushDie", 1024, 32 },
-	{ "DamDie", 8, 8 },
-	{ "DeliverPayloadStateMachine", 32, 32 },
-	{ "DeliverPayloadAIUpdate", 32, 32 },
-	{ "DeletionUpdate", 128, 32 },
-	{ "SmartBombTargetHomingUpdate", 8, 8 },
-  { "DynamicAudioEventInfo", 16, 256 }, // Note: some levels have none, some have lots. Since all are allocated at level load time, we can set this low for the levels with none.
-	{ "HackInternetStateMachine", 32, 32 },
-	{ "HackInternetAIUpdate", 32, 32 },
-	{ "MissileAIUpdate", 512, 32 },
-	{ "DumbProjectileBehavior", 64, 32 },
-	{ "DestroyDie", 1024, 32 },
-	{ "UpgradeDie", 128, 32 },
-	{ "KeepObjectDie", 128, 32 },
-	{ "DozerAIUpdate", 32, 32 },
-	{ "DynamicGeometryInfoUpdate", 16, 16 },
-	{ "DynamicShroudClearingRangeUpdate", 128, 16 },
-	{ "FXListDie", 1024, 32 },
-	{ "FireSpreadUpdate", 2048, 128 },
-	{ "FirestormDynamicGeometryInfoUpdate", 16, 16 },
-	{ "FireWeaponCollide", 2048, 32 },
-	{ "FireWeaponUpdate", 32, 32 },
-	{ "FlammableUpdate", 512, 256 },
-	{ "FloatUpdate", 512, 128 },
-	{ "TensileFormationUpdate", 256, 32 },
-	{ "GarrisonContain", 256, 32 },
-	{ "HealCrateCollide", 32, 32 },
-	{ "HeightDieUpdate", 32, 32 },
-	{ "FireWeaponWhenDamagedBehavior", 32, 32 },
-	{ "FireWeaponWhenDeadBehavior", 128, 64 },
-	{ "GenerateMinefieldBehavior", 32, 32 },
-	{ "HelicopterSlowDeathBehavior", 64, 32 },
-	{ "ParkingPlaceBehavior", 32, 32 },
-	{ "FlightDeckBehavior", 8, 8 },
-#ifdef ALLOW_SURRENDER
-	{ "POWTruckAIUpdate", 32, 32, },
-	{ "POWTruckBehavior", 32, 32, },
-	{ "PrisonBehavior", 32, 32 },
-	{ "PrisonVisual", 32, 32 },
-	{ "PropagandaCenterBehavior", 16, 16 },
-#endif 
-	{ "PropagandaTowerBehavior", 16, 16 },
-	{ "BunkerBusterBehavior", 16, 16 },
-	{ "ObjectTracker", 128, 32 },
-	{ "OCLUpdate", 16, 16 },
-	{ "BodyParticleSystem", 196, 64 },
-	{ "HighlanderBody", 2048, 128 },
-	{ "UndeadBody", 32, 32 },
-	{ "HordeUpdate", 128, 32 },
-	{ "ImmortalBody", 128, 256 },
-	{ "InactiveBody", 2048, 32 },
-	{ "InstantDeathBehavior", 512, 32 },
-	{ "LaserUpdate", 32, 32 },
-	{ "PointDefenseLaserUpdate", 32, 32 },
-	{ "CleanupHazardUpdate", 32, 32 },
-	{ "AutoFindHealingUpdate", 256, 32 },
-	{ "CommandButtonHuntUpdate", 512, 8 },
-	{ "PilotFindVehicleUpdate", 256, 32 },
-	{ "DemoTrapUpdate", 32, 32 },
-	{ "ParticleUplinkCannonUpdate", 16, 16 },
-	{ "SpectreGunshipUpdate", 8, 8 },
-	{ "SpectreGunshipDeploymentUpdate", 8, 8 },
-	{ "BaikonurLaunchPower", 4, 4 },
-	{ "RadiusDecalUpdate", 16, 16 },
-	{ "BattlePlanUpdate", 32, 32 },
-	{ "LifetimeUpdate", 32, 32 },
-	{ "LocomotorSetUpgrade", 512, 128 },
-	{ "LockWeaponCreate", 64, 128 },
-	{ "AutoDepositUpdate", 256, 32 },
-	{ "NeutronMissileUpdate", 512, 32 },
-	{ "MoneyCrateCollide", 48, 16 },
-	{ "NeutronMissileSlowDeathBehavior", 8, 8 },
-	{ "OpenContain", 128, 32 },
-	{ "OverchargeBehavior", 32, 32 },
-	{ "OverlordContain", 32, 32 },
-	{ "HelixContain", 32, 32 },
-	{ "ParachuteContain", 128, 32 },
-	{ "PhysicsBehavior", 600, 32 },
-	{ "PoisonedBehavior", 512, 64 },
-	{ "ProductionEntry", 32, 32 },
-	{ "ProductionUpdate", 256, 32 },
-	{ "ProjectileStreamUpdate", 32, 32 },
-	{ "ProneUpdate", 128, 32 },
-	{ "QueueProductionExitUpdate", 32, 32 },
-	{ "RadarUpdate", 16, 16 },
-	{ "RadarUpgrade", 16, 16 },
-	{ "AnimationSteeringUpdate", 1024, 32 },
-	{ "SupplyWarehouseCripplingBehavior", 16, 16 },
-	{ "CostModifierUpgrade", 32, 32 },
-	{ "CashBountyPower", 32, 32 },
-	{ "CleanupAreaPower", 32, 32 },
-	{ "ObjectCreationUpgrade", 196, 32 },
-	{ "MinefieldBehavior", 256, 32 },
-	{ "JetSlowDeathBehavior", 64, 32 },
-	{ "BattleBusSlowDeathBehavior", 64, 32 },
-	{ "RebuildHoleBehavior", 64, 32 },
-	{ "RebuildHoleExposeDie", 64, 32 },
-	{ "RepairDockUpdate", 32, 32 },
-#ifdef ALLOW_SURRENDER
-	{ "PrisonDockUpdate", 32, 32 },
-#endif
-	{ "RailedTransportDockUpdate", 16, 16 },
-	{ "RailedTransportAIUpdate", 16, 16 },
-	{ "RailedTransportContain", 16, 16 },
-	{ "RailroadBehavior", 16, 16 },
-	{ "SalvageCrateCollide", 32, 32 },
-	{ "ShroudCrateCollide", 32, 32 },
-	{ "SlavedUpdate", 64, 32 },
-	{ "SlowDeathBehavior", 1400, 256 },
-	{ "SpyVisionUpdate", 16, 16 },
-	{ "DefaultProductionExitUpdate", 32, 32 },
-	{ "SpawnPointProductionExitUpdate", 32, 32 },
-	{ "SpawnBehavior", 32, 32 },
-	{ "SpecialPowerCompletionDie", 32, 32 },
-	{ "SpecialPowerCreate", 32, 32 },
-	{ "PreorderCreate", 32, 32 },
-	{ "SpecialAbility", 512, 32 },
-	{ "SpecialAbilityUpdate", 512, 32 },
-	{ "MissileLauncherBuildingUpdate", 32, 32 },
-	{ "SquishCollide", 512, 32 },
-	{ "StructureBody", 512, 64 },
-	{ "HiveStructureBody", 64, 32 }, //Stinger sites
-	{ "StructureCollapseUpdate", 32, 32 },
-	{ "StructureToppleUpdate", 32, 32 },
-	{ "SupplyCenterCreate", 32, 32 },
-	{ "SupplyCenterDockUpdate", 32, 32 },
-	{ "SupplyCenterProductionExitUpdate", 32, 32 },
-	{ "SupplyTruckStateMachine", 256, 32 },
-	{ "SupplyTruckAIUpdate", 32, 32 },
-	{ "SupplyWarehouseCreate", 48, 16 },
-	{ "SupplyWarehouseDockUpdate", 48, 16 },
-	{ "EnemyNearUpdate", 1024, 32 },
-	{ "TechBuildingBehavior", 32, 32 },
-	{ "ToppleUpdate", 256, 128 },
-	{ "TransitionDamageFX", 384, 128 },
-	{ "TransportAIUpdate", 64, 32 },
-	{ "TransportContain", 128, 32 },
-	{ "RiderChangeContain", 128, 32 },
-	{ "InternetHackContain", 16, 16 },
-	{ "TunnelContain", 8, 8 },
-	{ "TunnelContainDie", 32, 32 },
-	{ "TunnelCreate", 32, 32 },
-	{ "TurretAI", 256, 32 },
-	{ "TurretStateMachine", 128, 32 },
-	{ "TurretSwapUpgrade", 512, 128 },
-	{ "UnitCrateCollide", 32, 32 },
-	{ "UnpauseSpecialPowerUpgrade", 32, 32 },
-	{ "VeterancyCrateCollide", 32, 32 },
-	{ "VeterancyGainCreate", 512, 128 },
-	{ "ConvertToCarBombCrateCollide", 256, 128 },
-	{ "ConvertToHijackedVehicleCrateCollide", 256, 128 },
-	{ "SabotageCommandCenterCrateCollide", 256, 128 },
-	{ "SabotageFakeBuildingCrateCollide", 256, 128 },
-	{ "SabotageInternetCenterCrateCollide", 256, 128 },
-	{ "SabotageMilitaryFactoryCrateCollide", 256, 128 },
-	{ "SabotagePowerPlantCrateCollide", 256, 128 },
-	{ "SabotageSuperweaponCrateCollide", 256, 128 },
-	{ "SabotageSupplyCenterCrateCollide", 256, 128 },
-	{ "SabotageSupplyDropzoneCrateCollide", 256, 128 },
-	{ "JetAIUpdate", 64, 32 },
-	{ "ChinookAIUpdate", 32, 32 },
-	{ "WanderAIUpdate", 32, 32 },
-	{ "WaveGuideUpdate", 16, 16 },
-	{ "WeaponBonusUpgrade", 512, 128 },
-	{ "WeaponSetUpgrade", 512, 128 },
-	{ "ArmorUpgrade", 512, 128 },
-	{ "WorkerAIUpdate", 128, 128 },
-	{ "WorkerStateMachine", 128, 128 },
-	{ "ChinookAIStateMachine", 32, 32 },
-	{ "DeployStyleAIUpdate", 32, 32 },
-	{ "AssaultTransportAIUpdate", 64, 32 },
-	{ "StreamingArchiveFile", 8, 8 },
-
-	{ "DozerActionStateMachine", 256, 32 },
-	{ "DozerPrimaryStateMachine", 256, 32 },
-	{ "W3DDisplayString", 1400, 128 },
-	{ "W3DDefaultDraw", 1024, 128 },
-	{ "W3DDebrisDraw", 128, 128 },
-	{ "W3DDependencyModelDraw", 64, 64 },
-	{ "W3DLaserDraw", 32, 32 },
-	{ "W3DModelDraw", 2048, 512 },
-	{ "W3DOverlordTankDraw", 64, 64 },
-	{ "W3DOverlordTruckDraw", 64, 64 },
-	{ "W3DOverlordAircraftDraw", 64, 64 },
-	{ "W3DPoliceCarDraw", 32, 32 },
-	{ "W3DProjectileStreamDraw", 32, 32 },
-	{ "W3DRopeDraw", 32, 32 },
-	{ "W3DScienceModelDraw", 32, 32 },
-	{ "W3DSupplyDraw", 40, 16 },
-	{ "W3DTankDraw", 256, 32 },
-	{ "W3DTreeDraw", 16, 16 },
-	{ "W3DPropDraw", 16, 16 },
-	{ "W3DTracerDraw", 64, 32 },
-	{ "W3DTruckDraw", 128, 32 },
-	{ "W3DTankTruckDraw", 32, 16 },
-	{ "W3DTreeTextureClass", 4, 4 },
-	{ "DefaultSpecialPower", 32, 32 },
-	{ "OCLSpecialPower", 96, 32 },
-	{ "FireWeaponPower", 32, 32 },
-#ifdef ALLOW_DEMORALIZE
-	{ "DemoralizeSpecialPower", 16, 16, },
-#endif
-	{ "CashHackSpecialPower", 32, 32 },
-	{ "CommandSetUpgrade", 32, 32 },
-	{ "PassengersFireUpgrade", 32, 32 },
-	{ "GrantUpgradeCreate", 256, 32 },
-	{ "GrantScienceUpgrade", 256, 32 },
-	{ "ReplaceObjectUpgrade", 32, 32 },
-	{ "ModelConditionUpgrade", 32, 32 },
-	{ "SpyVisionSpecialPower", 256, 32 },
-	{ "StealthDetectorUpdate", 256, 32 },
-	{ "StealthUpdate", 512, 128 },
-	{ "StealthUpgrade", 256, 32 },
-	{ "StatusBitsUpgrade", 128, 128 },
-	{ "SubObjectsUpgrade", 128, 128 },
-	{ "ExperienceScalarUpgrade", 256, 128 },
-	{ "MaxHealthUpgrade", 128, 128 },
-	{ "WeaponBonusUpgrade", 128, 64 },
-	{ "StickyBombUpdate", 64, 32 },
-	{ "FireOCLAfterWeaponCooldownUpdate", 64, 32 },
-	{ "HijackerUpdate", 64, 32 },
-	{ "ChinaMinesUpgrade", 64, 32 },
-	{ "PowerPlantUpdate", 48, 16 },
-	{ "PowerPlantUpgrade", 48, 16 },
-	{ "DefectorSpecialPower", 16, 16 },
-	{ "CheckpointUpdate", 16, 16 },
-	{ "MobNexusContain", 128, 32 },
-	{ "MobMemberSlavedUpdate", 64, 32 },
-	{ "EMPUpdate", 64, 32 },
-	{ "LeafletDropBehavior", 64, 32 },
-	{ "Overridable", 32, 32 },
-
-	{ "W3DGameWindow", 700, 256 },
-	{ "GameWindowDummy", 700, 256 },
-	{ "SuccessState", 32, 32 },
-	{ "FailureState", 32, 32 },
-	{ "ContinueState", 32, 32 },
-	{ "SleepState", 32, 32 },
-
-	{ "AIDockWaitForClearanceState", 256, 32 },
-	{ "AIDockProcessDockState", 256, 32 },
-	{ "AIGuardInnerState", 32, 32 },
-	{ "AIGuardIdleState", 32, 32 },
-	{ "AIGuardOuterState", 32, 32 },
-	{ "AIGuardReturnState", 32, 32 },
-	{ "AIGuardPickUpCrateState", 32, 32 },
-	{ "AIGuardAttackAggressorState", 32, 32 },
-	{ "AIGuardRetaliateInnerState", 32, 32 },
-	{ "AIGuardRetaliateIdleState", 32, 32 },
-	{ "AIGuardRetaliateOuterState", 32, 32 },
-	{ "AIGuardRetaliateReturnState", 32, 32 },
-	{ "AIGuardRetaliatePickUpCrateState", 32, 32 },
-	{ "AIGuardRetaliateAttackAggressorState", 32, 32 },
-	{ "AITNGuardInnerState", 32, 32 },
-	{ "AITNGuardIdleState", 32, 32 },
-	{ "AITNGuardOuterState", 32, 32 },
-	{ "AITNGuardReturnState", 32, 32 },
-	{ "AITNGuardPickUpCrateState", 32, 32 },
-	{ "AITNGuardAttackAggressorState", 32, 32 },
-	{ "AIIdleState", 2400, 32 },
-	{ "AIRappelState", 600, 32 },
-	{ "AIBusyState", 600, 32 },
-	{ "AIWaitState", 600, 32 },
-	{ "AIAttackState", 4096, 32 },
-	{ "AIAttackSquadState", 600, 32 },
-	{ "AIDeadState", 600, 32 },
-	{ "AIDockState", 600, 32 },
-	{ "AIExitState", 600, 32 },
-	{ "AIExitInstantlyState", 600, 32 },
-	{ "AIGuardState", 600, 32 },
-	{ "AIGuardRetaliateState", 600, 32 },
-	{ "AITunnelNetworkGuardState", 600, 32 },
-	{ "AIHuntState", 600, 32 },
-	{ "AIAttackAreaState", 600, 32 },
-	{ "AIFaceState", 1200, 32 },
-	{ "ApproachState", 600, 32 },
-	{ "DeliveringState", 600, 32 },
-	{ "ConsiderNewApproachState", 600, 32 },
-	{ "RecoverFromOffMapState", 600, 32 },
-	{ "HeadOffMapState", 600, 32 },
-	{ "CleanUpState", 600, 32 },
-	{ "HackInternetState", 600, 32 },
-	{ "PackingState", 600, 32 },
-	{ "UnpackingState", 600, 32 },
-	{ "SupplyTruckWantsToPickUpOrDeliverBoxesState", 600, 32 },
-	{ "RegroupingState", 600, 32 },
-	{ "DockingState", 600, 32 },
-	{ "ChinookEvacuateState", 32, 32 },
-	{ "ChinookHeadOffMapState", 32, 32 },
-	{ "ChinookTakeoffOrLandingState", 32, 32 },
-	{ "ChinookCombatDropState", 32, 32 },
-	{ "DozerActionPickActionPosState", 256, 32 },
-	{ "DozerActionMoveToActionPosState", 256, 32 },
-	{ "DozerActionDoActionState", 256, 32 },
-	{ "DozerPrimaryIdleState", 256, 32 },
-	{ "DozerActionState", 256, 32 },
-	{ "DozerPrimaryGoingHomeState", 256, 32 },
-	{ "JetAwaitingRunwayState", 64, 32 },
-	{ "JetOrHeliCirclingDeadAirfieldState", 64, 32 },
-	{ "HeliTakeoffOrLandingState", 64, 32 },
-	{ "JetOrHeliParkOrientState", 64, 32 },
-	{ "JetOrHeliReloadAmmoState", 64, 32 },
-	{ "SupplyTruckBusyState", 600, 32 },
-	{ "SupplyTruckIdleState", 600, 32 },
-	{ "ActAsDozerState", 600, 32 },
-	{ "ActAsSupplyTruckState", 600, 32 },
-	{ "AIDockApproachState", 256, 32 },
-	{ "AIDockAdvancePositionState", 256, 32 },
-	{ "AIDockMoveToEntryState", 256, 32 },
-	{ "AIDockMoveToDockState", 256, 32 },
-	{ "AIDockMoveToExitState", 256, 32 },
-	{ "AIDockMoveToRallyState", 256, 32 },
-	{ "AIMoveToState", 600, 32 },
-	{ "AIMoveOutOfTheWayState", 600, 32 },
-	{ "AIMoveAndTightenState", 600, 32 },
-	{ "AIMoveAwayFromRepulsorsState", 600, 32 },
-	{ "AIAttackApproachTargetState", 96, 32 },
-	{ "AIAttackPursueTargetState", 96, 32 },
-	{ "AIAttackAimAtTargetState", 96, 32 },
-	{ "AIAttackFireWeaponState", 256, 32 },
-	{ "AIPickUpCrateState", 4096, 32 },
-	{ "AIFollowWaypointPathState", 1200, 32 },
-	{ "AIFollowWaypointPathExactState", 1200, 32 },
-	{ "AIWanderInPlaceState", 600, 32 },
-	{ "AIFollowPathState", 1200, 32 },
-	{ "AIMoveAndEvacuateState", 1200, 32 },
-	{ "AIMoveAndDeleteState", 600, 32 },
-	{ "AIEnterState", 600, 32 },
-	{ "JetOrHeliReturningToDeadAirfieldState", 64, 32 },
-	{ "JetOrHeliReturnForLandingState", 64, 32 },
-	{ "TurretAIIdleState", 600, 32 },
-	{ "TurretAIIdleScanState", 600, 32 },
-	{ "TurretAIAimTurretState", 600, 32 },
-	{ "TurretAIRecenterTurretState", 600, 32 },
-	{ "TurretAIHoldTurretState", 600, 32 },
-	{ "JetOrHeliTaxiState", 64, 32 },
-	{ "JetTakeoffOrLandingState", 64, 32 },
-	{ "JetPauseBeforeTakeoffState", 64, 32 },
-	{ "AIAttackMoveToState", 600, 32 },
-	{ "AIAttackFollowWaypointPathState", 1200, 32 },
-	{ "AIWanderState", 600, 32 },
-	{ "AIPanicState", 600, 32 },
-	{ "ChinookMoveToBldgState", 32, 32 },
-	{ "ChinookRecordCreationState", 32, 32 },
-	{ "ScienceInfo", 96, 32 },
-	{ "RankInfo", 32, 32 },
-
-	{ "FireWeaponNugget", 32, 32 },
-	{ "AttackNugget", 32, 32 },
-	{ "DeliverPayloadNugget", 48, 32 },
-	{ "ApplyRandomForceNugget", 32, 32 },
-	{ "GenericObjectCreationNugget", 632, 32 },
-	{ "SoundFXNugget", 320, 32 },
-	{ "TracerFXNugget", 32, 32 },
-	{ "RayEffectFXNugget", 32, 32 },
-	{ "LightPulseFXNugget", 68, 32 },
-	{ "ViewShakeFXNugget", 140, 32 },
-	{ "TerrainScorchFXNugget", 48, 32 },
-	{ "ParticleSystemFXNugget", 832, 32 },
-	{ "FXListAtBonePosFXNugget", 32, 32 },
-	{ "Squad", 256, 32 },
-	{ "BuildListInfo", 400, 64 },
-
-	{ "ScriptGroup", 128, 32 },
-	{ "OrCondition", 1024, 256 },
-	{ "ScriptAction", 2600, 512 },
-	{ "Script", 1024, 256 },
-	{ "Parameter", 8192, 1024 },
-	{ "Condition", 2048, 256 },
-	{ "Template", 32, 32 },
-	{ "ScriptList", 32, 32 },
-	{ "AttackPriorityInfo", 32, 32 },
-	{ "SequentialScript", 32, 32 },
-	{ "Win32LocalFile", 1024, 256 },
-	{ "StdLocalFile", 1024, 256 },
-	{ "RAMFile", 32, 32 },
-	{ "BattlePlanBonuses", 32, 32 },
-	{ "KindOfPercentProductionChange", 32, 32 },
-	{ "UserParser", 4096, 256 },
-	{ "XferBlockData", 32, 32 },
-	{ "EvaCheckInfo", 52, 16 },
-	{ "SuperweaponInfo", 32, 32 },
-	{ "NamedTimerInfo", 32, 32 },
-	{ "PopupMessageData", 32, 32 },
-	{ "FloatingTextData", 32, 32 },
-	{ "MapObject", 5000, 1024 },
-	{ "Waypoint", 1024, 32 },
-	{ "PolygonTrigger", 64, 64 },
-	{ "Bridge", 32, 32 },
-	{ "Mapping", 384, 64 },
-	{ "OutputChunk", 32, 32 },
-	{ "InputChunk", 32, 32 },
-	{ "AnimateWindow", 32, 32 },
-	{ "GameFont", 32, 32 },
-	{ "NetCommandRef", 256, 32 },
-	{ "GameMessageArgument", 1024, 256 },
-	{ "GameMessageParserArgumentType", 32, 32 },
-	{ "GameMessageParser", 32, 32 },
-	{ "WeaponBonusSet", 96, 32 },
-	{ "Campaign", 32, 32 },
-	{ "Mission", 88, 32 },
-	{ "ModalWindow", 32, 32 },
-	{ "NetPacket", 32, 32 },
-	{ "AISideInfo", 32, 32 },
-	{ "AISideBuildList", 32, 32 },
-	{ "MetaMapRec", 256, 32 },
-	{ "TransportStatus", 32, 32 },
-	{ "Anim2DTemplate", 32, 32 },
-	{ "ObjectTypes", 32, 32 },
-	{ "NetCommandList", 512, 32 },
-	{ "TurretAIData", 256, 32 },
-	{ "NetCommandMsg", 32, 32 },
-	{ "NetGameCommandMsg", 64, 32 },
-	{ "NetAckBothCommandMsg", 32, 32 },
-	{ "NetAckStage1CommandMsg", 32, 32 },
-	{ "NetAckStage2CommandMsg", 32, 32 },
-	{ "NetFrameCommandMsg", 32, 32 },
-	{ "NetPlayerLeaveCommandMsg", 32, 32 },
-	{ "NetRunAheadMetricsCommandMsg", 32, 32 },
-	{ "NetRunAheadCommandMsg", 32, 32 },
-	{ "NetDestroyPlayerCommandMsg", 32, 32 },
-	{ "NetDisconnectFrameCommandMsg", 32, 32 },
-	{ "NetDisconnectScreenOffCommandMsg", 32, 32 },
-	{ "NetFrameResendRequestCommandMsg", 32, 32 },
-	{ "NetKeepAliveCommandMsg", 32, 32 },
-	{ "NetDisconnectKeepAliveCommandMsg", 32, 32 },
-	{ "NetDisconnectPlayerCommandMsg", 32, 32 },
-	{ "NetPacketRouterQueryCommandMsg", 32, 32 },
-	{ "NetPacketRouterAckCommandMsg", 32, 32 },
-	{ "NetDisconnectChatCommandMsg", 32, 32 },
-	{ "NetChatCommandMsg", 32, 32 },
-	{ "NetDisconnectVoteCommandMsg", 32, 32 },
-	{ "NetProgressCommandMsg", 32, 32 },
-	{ "NetWrapperCommandMsg", 32, 32 },
-	{ "NetFileCommandMsg", 32, 32 },
-	{ "NetFileAnnounceCommandMsg", 32, 32 },
-	{ "NetFileProgressCommandMsg", 32, 32 },
-	{ "NetCommandWrapperListNode", 32, 32 },
-	{ "NetCommandWrapperList", 32, 32 },
-	{ "Connection", 32, 32 },
-	{ "User", 32, 32 },
-	{ "FrameDataManager", 32, 32 },
-	{ "DrawableIconInfo", 32, 32 },
-	{ "TintEnvelope", 128, 32 },
-	{ "DynamicAudioEventRTS", 4000, 256 },
-	{ "DrawableLocoInfo", 128, 32 },
-	{ "W3DPrototypeClass", 512, 256 },
-	{ "EnumeratedIP", 32, 32 },
-	{ "WaterTransparencySetting", 4, 4 },
-	{ "WeatherSetting", 4, 4 },
-	
-	// W3D pools!
-	{ "BoxPrototypeClass", 128, 128 },
-	{ "SpherePrototypeClass", 32, 32 },
-	{ "SoundRenderObjPrototypeClass", 32, 32 },
-	{ "RingPrototypeClass", 32, 32 },
-	{ "PrimitivePrototypeClass", 8192, 32 },
-	{ "HModelPrototypeClass", 256, 32 },
-	{ "ParticleEmitterPrototypeClass", 32, 32 },
-	{ "NullPrototypeClass", 32, 32 },
-	{ "HLodPrototypeClass", 700, 128 },
-	{ "HLodDefClass", 700, 128 },
-	{ "DistLODPrototypeClass", 32, 32 },
-	{ "DazzlePrototypeClass", 32, 32 },
-	{ "CollectionPrototypeClass", 32, 32 },
-	{ "BoxPrototypeClass", 256, 32 },
-	{ "AggregatePrototypeClass", 32, 32 },
-	{ "OBBoxRenderObjClass", 512, 128 },
-	{ "AABoxRenderObjClass", 32, 32 },
-	{ "VertexMaterialClass", 6000, 2048 },
-	{ "TextureClass", 1200, 256 },
-	{ "CloudMapTerrainTextureClass", 4, 4 },
-	{ "ScorchTextureClass", 4, 4 },
-	{ "LightMapTerrainTextureClass", 4, 4 },
-	{ "AlphaEdgeTextureClass", 4, 4 },
-	{ "AlphaTerrainTextureClass", 4, 4 },
-	{ "TerrainTextureClass", 4, 4 },
-	{ "MeshClass", 14000, 2000 },
-	{ "HTreeClass", 2048, 512 },
-	{ "HLodClass", 2048, 512 },
-	{ "MeshModelClass", 8192, 32 },
-	{ "ShareBufferClass", 32768, 1024 }, 
-	{ "AABTreeClass", 300, 128 },
-	{ "MotionChannelClass", 16384, 32 },
-	{ "BitChannelClass", 84, 32 },
-	{ "TimeCodedMotionChannelClass", 116, 32 },
-	{ "AdaptiveDeltaMotionChannelClass", 32, 32 },
-	{ "TimeCodedBitChannelClass", 32, 32 },
-	{ "UVBufferClass", 8192, 32 },
-	{ "TexBufferClass", 384, 128 },
-	{ "MatBufferClass", 256, 128 },
-	{ "MatrixMapperClass", 32, 32 },
-	{ "ScaleTextureMapperClass", 32, 32 },
-	{ "LinearOffsetTextureMapperClass", 96, 32 },
-	{ "GridTextureMapperClass", 32, 32 },
-	{ "RotateTextureMapperClass", 32, 32 },
-	{ "SineLinearOffsetTextureMapperClass", 32, 32 },
-	{ "StepLinearOffsetTextureMapperClass", 32, 32 },
-	{ "ZigZagLinearOffsetTextureMapperClass", 32, 32 },
-	{ "ClassicEnvironmentMapperClass", 32, 32 },
-	{ "EnvironmentMapperClass", 256, 32 },
-	{ "EdgeMapperClass", 32, 32 },
-	{ "WSClassicEnvironmentMapperClass", 32, 32 },
-	{ "WSEnvironmentMapperClass", 32, 32 },
-	{ "GridClassicEnvironmentMapperClass", 32, 32 },
-	{ "GridEnvironmentMapperClass", 32, 32 },
-	{ "ScreenMapperClass", 32, 32 },
-	{ "RandomTextureMapperClass", 32, 32 },
-	{ "BumpEnvTextureMapperClass", 32, 32 },
-	{ "MeshLoadContextClass", 4, 4 },
-	{ "MaterialInfoClass", 8192, 32 },
-	{ "MeshMatDescClass", 8192, 32 },
-	{ "TextureLoadTaskClass", 256, 32 },
-	{ "SortingNodeStruct", 288, 32 },
-	{ "ProxyArrayClass", 32, 32 },
-	{ "Line3DClass", 8, 8 },
-	{ "Render2DClass", 64, 32 },
-	{ "SurfaceClass", 128, 32 },
-	{ "FontCharsClassCharDataStruct", 1024, 32 },
-	{ "FontCharsBuffer", 16, 4 },
-	{ "FVFInfoClass", 152, 64 },
-	{ "TerrainTracksRenderObjClass", 128, 32 },
-	{ "DynamicIBAccessClass", 32, 32 },
-	{ "DX8IndexBufferClass", 128, 32 },
-	{ "SortingIndexBufferClass", 32, 32 },
-	{ "DX8VertexBufferClass", 128, 32 },
-	{ "SortingVertexBufferClass", 32, 32 },
-	{ "DynD3DMATERIAL8", 8192, 32 }, 
-	{ "DynamicMatrix3D", 512, 32 },
-	{ "MeshGeometryClass", 32, 32 },
-	{ "DynamicMeshModel", 32, 32 },
-	{ "GapFillerClass", 32, 32 },
-	{ "FontCharsClass", 64, 32 },
-	{ "ThumbnailManagerClass", 32, 32},
-	{ "SmudgeSet", 32, 32},
-	{ "Smudge", 128, 32},
-	{ 0, 0, 0 }
-};
-
-//-----------------------------------------------------------------------------
-void userMemoryAdjustPoolSize(const char *poolName, Int& initialAllocationCount, Int& overflowAllocationCount)
-{
-	if (initialAllocationCount > 0)
-		return;
-
-	for (const PoolSizeRec* p = sizes; p->name != NULL; ++p)
-	{
-		if (strcmp(p->name, poolName) == 0)
-		{
-			initialAllocationCount = p->initial;
-			overflowAllocationCount = p->overflow;
-			return;
-		}
-	}
-
-	DEBUG_CRASH(("Initial size for pool %s not found -- you should add it to MemoryInit.cpp\n",poolName));
-}
-
-//-----------------------------------------------------------------------------
-static Int roundUpMemBound(Int i)
-{
-	const int MEM_BOUND_ALIGNMENT = 4;
-
-	if (i < MEM_BOUND_ALIGNMENT)
-		return MEM_BOUND_ALIGNMENT;
-	else
-		return (i + (MEM_BOUND_ALIGNMENT-1)) & ~(MEM_BOUND_ALIGNMENT-1);
-}
-
-//-----------------------------------------------------------------------------
-void userMemoryManagerInitPools()
-{
-	// note that we MUST use stdio stuff here, and not the normal game file system
-	// (with bigfile support, etc), because that relies on memory pools, which
-	// aren't yet initialized properly! so rely ONLY on straight stdio stuff here.
-	// (not even AsciiString. thanks.)
-	
-	// since we're called prior to main, the cur dir might not be what
-	// we expect. so do it the hard way.
-	char buf[_MAX_PATH];
-	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char* pEnd = buf + strlen(buf);
-	while (pEnd != buf) 
-	{
-		if (*pEnd == '\\') 
-		{
-			*pEnd = 0;
-			break;
-		}
-		--pEnd;
-	}
-	strcat(buf, "\\Data\\INI\\MemoryPools.ini");
-
-	FILE* fp = fopen(buf, "r");
-	if (fp)
-	{
-		char poolName[256];
-		int initial, overflow;
-		while (fgets(buf, _MAX_PATH, fp))
-		{
-			if (buf[0] == ';')
-				continue;
-			if (sscanf(buf, "%s %d %d", poolName, &initial, &overflow ) == 3)
-			{
-				for (PoolSizeRec* p = sizes; p->name != NULL; ++p)
-				{
-					if (stricmp(p->name, poolName) == 0)
-					{
-						// currently, these must be multiples of 4. so round up.
-						p->initial = roundUpMemBound(initial);
-						p->overflow = roundUpMemBound(overflow);
-						break;	// from for-p
-					}
-				}
-			}
-		}
-		fclose(fp);
-	}
-}
-
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/ObjectStatusTypes.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/ObjectStatusTypes.cpp
deleted file mode 100644
index 02a099b3fb6..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/ObjectStatusTypes.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: ObjectStatusTypes.cpp ////////////////////////////////////////////////////////////////////
-// Author: Kris, May 2003
-// Desc:   Object status types that are stackable using the BitSet system. Used to be ObjectStatusBits
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"
-
-#include "Common/ObjectStatusTypes.h"
-#include "Common/BitFlagsIO.h"
-
-const char* ObjectStatusMaskType::s_bitNameList[] = 
-{
-	"NONE",
-	"DESTROYED",
-	"CAN_ATTACK",					
-	"UNDER_CONSTRUCTION",	
-	"UNSELECTABLE",				
-	"NO_COLLISIONS",				
-	"NO_ATTACK",						
-	"AIRBORNE_TARGET",			
-	"PARACHUTING",	
-	"REPULSOR",
-	"HIJACKED",					
-	"AFLAME",							
-	"BURNED",							
-	"WET",
-	"IS_FIRING_WEAPON",
-	"IS_BRAKING",
-	"STEALTHED",
-	"DETECTED",
-	"CAN_STEALTH",
-	"SOLD",
-	"UNDERGOING_REPAIR",
-	"RECONSTRUCTING",
-	"MASKED",
-	"IS_ATTACKING",
-	"USING_ABILITY",
-	"IS_AIMING_WEAPON",
-	"NO_ATTACK_FROM_AI",
-	"IGNORING_STEALTH",
-	"IS_CARBOMB",
-	"DECK_HEIGHT_OFFSET",
-	"STATUS_RIDER1",
-	"STATUS_RIDER2",
-	"STATUS_RIDER3",
-	"STATUS_RIDER4",
-	"STATUS_RIDER5",
-	"STATUS_RIDER6",
-	"STATUS_RIDER7",
-	"STATUS_RIDER8",
-	"FAERIE_FIRE",
-  "KILLING_SELF",
-	"REASSIGN_PARKING",
-	"BOOBY_TRAPPED",
-	"IMMOBILE",
-	"DISGUISED",
-	"DEPLOYED",
-	NULL
-};
-
-ObjectStatusMaskType OBJECT_STATUS_MASK_NONE;	// inits to all zeroes
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp
index a4181645d6d..42a42148234 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp
@@ -26,7 +26,7 @@
 // Author: Matt Campbell, February 2002
 // Description: Quoted-printable encode/decode
 ////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/QuotedPrintable.h"
 
@@ -56,7 +56,7 @@ static int hexDigitToInt(char c)
 AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
 {
 	static char dest[1024];
-	const char *src = (const char *)original.str();
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 	int i=0;
 	while ( !(src[0]=='\0' && src[1]=='\0') && i<1021 )
 	{
@@ -65,7 +65,8 @@ AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
 			dest[i++] = MAGIC_CHAR;
 			dest[i++] = intToHexDigit((*src)>>4);
 			dest[i++] = intToHexDigit((*src)&0xf);
-		} else
+		}
+		else
 		{
 			dest[i++] = *src;
 		}
@@ -91,7 +92,7 @@ AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
 AsciiString AsciiStringToQuotedPrintable(AsciiString original)
 {
 	static char dest[1024];
-	const char *src = (const char *)original.str();
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 	int i=0;
 	while ( src[0]!='\0' && i<1021 )
 	{
@@ -100,7 +101,8 @@ AsciiString AsciiStringToQuotedPrintable(AsciiString original)
 			dest[i++] = MAGIC_CHAR;
 			dest[i++] = intToHexDigit((*src)>>4);
 			dest[i++] = intToHexDigit((*src)&0xf);
-		} else
+		}
+		else
 		{
 			dest[i++] = *src;
 		}
@@ -117,8 +119,8 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)
 	static WideChar dest[1024];
 	int i=0;
 
-	unsigned char *c = (unsigned char *)dest;
-	const unsigned char *src = (const unsigned char *)original.str();
+	unsigned char *c = reinterpret_cast<unsigned char *>(dest);
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 
 	while (*src && i<1023)
 	{
@@ -159,18 +161,17 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)
 
 	*c = 0;
 
-	UnicodeString out(dest);
-	return out;
+	return dest;
 }
 
 // Convert ascii quoted-printable strings into ascii strings
 AsciiString QuotedPrintableToAsciiString(AsciiString original)
 {
-	static unsigned char dest[1024];
+	static char dest[1024];
 	int i=0;
 
-	unsigned char *c = (unsigned char *)dest;
-	const unsigned char *src = (const unsigned char *)original.str();
+	unsigned char *c = reinterpret_cast<unsigned char *>(dest);
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 
 	while (*src && i<1023)
 	{
@@ -200,6 +201,6 @@ AsciiString QuotedPrintableToAsciiString(AsciiString original)
 
 	*c = 0;
 
-	return AsciiString((const char *)dest);
+	return dest;
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/RAMFile.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/RAMFile.cpp
deleted file mode 100644
index 0c44ce50c51..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/RAMFile.cpp
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   WSYS Library
-//
-// Module:    IO
-//
-// File name: WSYS_RAMFile.cpp
-//
-// Created:   11/08/01
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <io.h>
-#include <string.h>
-#include <sys/stat.h>
-
-#include "Common/AsciiString.h"
-#include "Common/FileSystem.h"
-#include "Common/RAMFile.h"
-#include "Common/PerfTimer.h"
-									
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-//=================================================================
-// RAMFile::RAMFile
-//=================================================================
-
-RAMFile::RAMFile()
-: m_size(0),
-	m_data(NULL),
-//Added By Sadullah Nader
-//Initializtion(s) inserted
-	m_pos(0)
-//
-{
-
-}
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//=================================================================
-// RAMFile::~RAMFile	
-//=================================================================
-
-RAMFile::~RAMFile()
-{
-	if (m_data != NULL) {
-		delete [] m_data;
-	}
-
-	File::close();
-
-}
-
-//=================================================================
-// RAMFile::open	
-//=================================================================
-/**
-  *	This function opens a file using the standard C open() call. Access flags
-	* are mapped to the appropriate open flags. Returns true if file was opened
-	* successfully.
-	*/
-//=================================================================
-
-//DECLARE_PERF_TIMER(RAMFile)
-Bool RAMFile::open( const Char *filename, Int access )
-{
-	//USE_PERF_TIMER(RAMFile)
-	File *file = TheFileSystem->openFile( filename, access );
-
-	if ( file == NULL )
-	{
-		return FALSE;
-	}	
-
-	Bool result = open( file );
-
-	file->close();
-
-	return result;
-}
-
-//============================================================================
-// RAMFile::open
-//============================================================================
-
-Bool RAMFile::open( File *file )
-{
-	//USE_PERF_TIMER(RAMFile)
-	if ( file == NULL )
-	{
-		return NULL;
-	}
-
-	Int access = file->getAccess();
-
-	if ( !File::open( file->getName(), access ))
-	{
-		return FALSE;
-	}
-
-	// read whole file in to memory
-	m_size = file->size();
-	m_data = MSGNEW("RAMFILE") char [ m_size ];	// pool[]ify
-
-	if ( m_data == NULL )
-	{
-		return FALSE;
-	}
-
-	m_size = file->read( m_data, m_size );
-
-	if ( m_size < 0 )
-	{
-		delete [] m_data;
-		m_data = NULL;
-		return FALSE;
-	}
-
-	m_pos = 0;
-
-	return TRUE;
-}
-
-//============================================================================
-// RAMFile::openFromArchive
-//============================================================================
-Bool RAMFile::openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size) 
-{
-	//USE_PERF_TIMER(RAMFile)
-	if (archiveFile == NULL) {
-		return FALSE;
-	}
-
-	if (File::open(filename.str(), File::READ | File::BINARY) == FALSE) {
-		return FALSE;
-	}
-
-	if (m_data != NULL) {
-		delete[] m_data;
-		m_data = NULL;
-	}
-	m_data = MSGNEW("RAMFILE") Char [size];	// pool[]ify
-	m_size = size;
-
-	if (archiveFile->seek(offset, File::START) != offset) {
-		return FALSE;
-	}
-	if (archiveFile->read(m_data, size) != size) {
-		return FALSE;
-	}
-	m_nameStr = filename;
-
-	return TRUE;
-}
-
-//=================================================================
-// RAMFile::close 	
-//=================================================================
-/**
-	* Closes the current file if it is open.
-  * Must call RAMFile::close() for each successful RAMFile::open() call.
-	*/
-//=================================================================
-
-void RAMFile::close( void )
-{
-	if ( m_data )
-	{
-		delete [] m_data;
-		m_data = NULL;
-	}
-
-	File::close();
-}
-
-//=================================================================
-// RAMFile::read 
-//=================================================================
-// if buffer is null, just advance the current position by 'bytes'
-Int RAMFile::read( void *buffer, Int bytes )
-{
-	if( m_data == NULL )
-	{
-		return -1;
-	}
-
-	Int bytesLeft = m_size - m_pos ;
-
-	if ( bytes > bytesLeft )
-	{
-		bytes = bytesLeft;
-	}
-
-	if (( bytes > 0 ) && ( buffer != NULL ))
-	{
-		memcpy ( buffer, &m_data[m_pos], bytes );
-	}
-
-	m_pos += bytes;
-
-	return bytes;
-}
-
-//=================================================================
-// RAMFile::write 
-//=================================================================
-
-Int RAMFile::write( const void *buffer, Int bytes )
-{
-	return -1;
-}
-
-//=================================================================
-// RAMFile::seek 
-//=================================================================
-
-Int RAMFile::seek( Int pos, seekMode mode)
-{
-	Int newPos;
-
-	switch( mode )
-	{
-		case START:
-			newPos = pos;
-			break;
-		case CURRENT:
-			newPos = m_pos + pos;
-			break;
-		case END:
-			DEBUG_ASSERTCRASH(pos <= 0, ("RAMFile::seek - position should be <= 0 for a seek starting from the end."));
-			newPos = m_size + pos;
-			break;
-		default:
-			// bad seek mode
-			return -1;
-	}
-
-	if ( newPos < 0 )
-	{
-		newPos = 0;
-	}
-	else if ( newPos > m_size )
-	{
-		newPos = m_size;
-	}
-
-	m_pos = newPos;
-
-	return m_pos;
-
-}
-
-//=================================================================
-// RAMFile::scanInt
-//=================================================================
-Bool RAMFile::scanInt(Int &newInt) 
-{
-	newInt = 0;
-	AsciiString tempstr;
-
-	while ((m_pos < m_size) && ((m_data[m_pos] < '0') || (m_data[m_pos] > '9')) && (m_data[m_pos] != '-')) {
-		++m_pos;
-	}
-
-	if (m_pos >= m_size) {
-		m_pos = m_size;
-		return FALSE;
-	}
-
-	do {
-		tempstr.concat(m_data[m_pos]);
-		++m_pos;
-	} while ((m_pos < m_size) && ((m_data[m_pos] >= '0') && (m_data[m_pos] <= '9')));
-
-//	if (m_pos < m_size) {
-//		--m_pos;
-//	}
-
-	newInt = atoi(tempstr.str());
-	return TRUE;
-}
-
-//=================================================================
-// RAMFile::scanInt
-//=================================================================
-Bool RAMFile::scanReal(Real &newReal) 
-{
-	newReal = 0.0;
-	AsciiString tempstr;
-	Bool sawDec = FALSE;
-
-	while ((m_pos < m_size) && ((m_data[m_pos] < '0') || (m_data[m_pos] > '9')) && (m_data[m_pos] != '-') && (m_data[m_pos] != '.')) {
-		++m_pos;
-	}
-
-	if (m_pos >= m_size) {
-		m_pos = m_size;
-		return FALSE;
-	}
-
-	do {
-		tempstr.concat(m_data[m_pos]);
-		if (m_data[m_pos] == '.') {
-			sawDec = TRUE;
-		}
-		++m_pos;
-	} while ((m_pos < m_size) && (((m_data[m_pos] >= '0') && (m_data[m_pos] <= '9')) || ((m_data[m_pos] == '.') && !sawDec)));
-
-//	if (m_pos < m_size) {
-//		--m_pos;
-//	}
-
-	newReal = atof(tempstr.str());
-	return TRUE;
-}
-
-//=================================================================
-// RAMFile::scanString
-//=================================================================
-Bool RAMFile::scanString(AsciiString &newString) 
-{
-	newString.clear();
-
-	while ((m_pos < m_size) && isspace(m_data[m_pos])) {
-		++m_pos;
-	}
-
-	if (m_pos >= m_size) {
-		m_pos = m_size;
-		return FALSE;
-	}
-
-	do {
-		newString.concat(m_data[m_pos]);
-		++m_pos;
-	} while ((m_pos < m_size) && (!isspace(m_data[m_pos])));
-
-	return TRUE;
-}
-
-//=================================================================
-// RAMFile::nextLine
-//=================================================================
-void RAMFile::nextLine(Char *buf, Int bufSize) 
-{
-	Int i = 0;
-	// seek to the next new-line character
-	while ((m_pos < m_size) && (m_data[m_pos] != '\n')) {
-		if ((buf != NULL) && (i < (bufSize-1))) {
-			buf[i] = m_data[m_pos];
-			++i;
-		}
-		++m_pos;
-	}
-
-	// we got to the new-line character, now go one past it.
-	if (m_pos < m_size) {
-		if ((buf != NULL) && (i < bufSize)) {
-			buf[i] = m_data[m_pos];
-			++i;
-		}
-		++m_pos;
-	}
-	if (buf != NULL) {
-		if (i < bufSize) {
-			buf[i] = 0;
-		} else {
-			buf[bufSize] = 0;
-		}
-	}
-	if (m_pos >= m_size) {
-		m_pos = m_size;
-	}
-}
-
-//=================================================================
-// RAMFile::nextLine
-//=================================================================
-Bool RAMFile::copyDataToFile(File *localFile) 
-{
-	if (localFile == NULL) {
-		return FALSE;
-	}
-
-	if (localFile->write(m_data, m_size) == m_size) {
-		return TRUE;
-	}
-
-
-	return FALSE;
-}
-
-//=================================================================
-//=================================================================
-File* RAMFile::convertToRAMFile()
-{
-	return this;
-}
-
-//=================================================================
-// RAMFile::readEntireAndClose
-//=================================================================
-/**
-	Allocate a buffer large enough to hold entire file, read 
-	the entire file into the buffer, then close the file.
-	the buffer is owned by the caller, who is responsible
-	for freeing is (via delete[]). This is a Good Thing to
-	use because it minimizes memory copies for BIG files.
-*/
-char* RAMFile::readEntireAndClose()
-{
-
-	if (m_data == NULL)
-	{
-		DEBUG_CRASH(("m_data is NULL in RAMFile::readEntireAndClose -- should not happen!\n"));
-		return NEW char[1];	// just to avoid crashing...
-	}
-
-	char* tmp = m_data;
-	m_data = NULL;	// will belong to our caller!
-
-	close();
-
-	return tmp;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Radar.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Radar.cpp
deleted file mode 100644
index d5ba7a0797b..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/Radar.cpp
+++ /dev/null
@@ -1,1569 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Radar.cpp ////////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, January 2002
-// Desc:   Radar logic implementation
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameAudio.h"
-#include "Common/GameState.h"
-#include "Common/MiscAudio.h"
-#include "Common/Radar.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "Common/ThingTemplate.h"
-#include "Common/GlobalData.h"
-#include "Common/Xfer.h"
-
-#include "GameClient/Drawable.h"
-#include "GameClient/Eva.h"
-#include "GameClient/GameWindowManager.h"
-#include "GameClient/InGameUI.h"
-#include "GameClient/ControlBar.h"
-
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/Object.h"
-#include "GameLogic/PartitionManager.h"
-#include "GameLogic/TerrainLogic.h"
-#include "GameLogic/Module/ContainModule.h"
-#include "GameLogic/Module/StealthUpdate.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
-Radar *TheRadar = NULL;  ///< the radar global singleton
-
-// PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
-#define RADAR_QUEUE_TERRAIN_REFRESH_DELAY (LOGICFRAMES_PER_SECOND * 3.0f)
-
-//-------------------------------------------------------------------------------------------------
-/** Delete list resources used by the radar and return them to the memory pools */
-//-------------------------------------------------------------------------------------------------
-void Radar::deleteListResources( void )
-{
-	RadarObject *nextObject;
-
-	// delete entries from the local object list
-	while( m_localObjectList )
-	{
-
-		// get next object
-		nextObject = m_localObjectList->friend_getNext();
-
-		// remove radar data from object
-		m_localObjectList->friend_getObject()->friend_setRadarData( NULL );
-
-		// delete the head of the list
-		deleteInstance(m_localObjectList);
-
-		// set head of the list to the next object
-		m_localObjectList = nextObject;
-
-	}  // end while
-
-	// delete entries from the regular object list
-	while( m_objectList )
-	{
-
-		// get next object
-		nextObject = m_objectList->friend_getNext();
-
-		// remove radar data from object
-		m_objectList->friend_getObject()->friend_setRadarData( NULL );
-
-		// delete the head of the list
-		deleteInstance(m_objectList);
-
-		// set head of the list to the next object
-		m_objectList = nextObject;
-
-	}  // end while
-
-	Object *obj;
-	for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() )
-	{
-
-		DEBUG_ASSERTCRASH( obj->friend_getRadarData() == NULL, ("oops") );
-
-	}
-
-}  // end deleteListResources
-
-// PUBLIC METHODS /////////////////////////////////////////////////////////////////////////////////
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-RadarObject::RadarObject( void )
-{
-
-	m_object = NULL;
-	m_next = NULL;
-	m_color = GameMakeColor( 255, 255, 255, 255 );
-
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-RadarObject::~RadarObject( void )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-Bool RadarObject::isTemporarilyHidden() const
-{
-	Drawable* draw = m_object->getDrawable();
-	if (draw->getStealthLook() == STEALTHLOOK_INVISIBLE || draw->isDrawableEffectivelyHidden())
-		return true;
-
-	return false;
-}
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void RadarObject::crc( Xfer *xfer )
-{
-
-}  // end crc
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer method
-	* Version Info:
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-void RadarObject::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// object id
-	ObjectID objectID = m_object ? m_object->getID() : INVALID_ID;
-	xfer->xferObjectID( &objectID );
-	if( xfer->getXferMode() == XFER_LOAD )
-	{
-
-		// find the object and save
-		m_object = TheGameLogic->findObjectByID( objectID );
-		if( m_object == NULL )
-		{
-
-			DEBUG_CRASH(( "RadarObject::xfer - Unable to find object for radar data\n" ));
-			throw SC_INVALID_DATA;
-
-		}  // end if
-
-		// tell the object we now have some radar data
-		m_object->friend_setRadarData( this );
-
-	}  // end if
-
-	// color
-	xfer->xferColor( &m_color );
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void RadarObject::loadPostProcess( void )
-{
-
-}  // end loadPostProcess
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-Radar::Radar( void )
-{
-
-	m_radarWindow = NULL;
-	m_objectList = NULL;
-	m_localObjectList = NULL;
-	m_radarHidden = false;
-	m_radarForceOn = false;
-	m_terrainAverageZ = 0.0f;
-	m_waterAverageZ = 0.0f;
-	m_xSample = 0.0f;
-	m_ySample = 0.0f;
-	m_mapExtent.lo.x = 0.0f;
-	m_mapExtent.lo.y = 0.0f;
-	m_mapExtent.lo.z = 0.0f;
-	m_mapExtent.hi.x = 0.0f;
-	m_mapExtent.hi.y = 0.0f;
-	m_mapExtent.hi.z = 0.0f;
-	m_queueTerrainRefreshFrame = 0;
-
-	// clear the radar events
-	clearAllEvents();
-
-}  // end Radar
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-Radar::~Radar( void )
-{
-
-	// delete list resources
-	deleteListResources();
-
-}  // end ~Radar
-
-//-------------------------------------------------------------------------------------------------
-/** Clear all radar events */
-//-------------------------------------------------------------------------------------------------
-void Radar::clearAllEvents( void )
-{
-
-	// set next free index to the first one
-	m_nextFreeRadarEvent = 0;
-	m_lastRadarEvent = -1;
-
-	// zero out all data
-	for( Int i = 0; i < MAX_RADAR_EVENTS; ++i )
-	{
-
-		m_event[ i ].type = RADAR_EVENT_INVALID;
-		m_event[ i ].active = FALSE;
-		m_event[ i ].createFrame = 0;
-		m_event[ i ].dieFrame = 0;
-		m_event[ i ].fadeFrame = 0;
-		m_event[ i ].color1.red = 0;
-		m_event[ i ].color1.green = 0;
-		m_event[ i ].color1.blue = 0;
-		m_event[ i ].color2.red = 0;
-		m_event[ i ].color2.green = 0;
-		m_event[ i ].color2.blue = 0;
-		m_event[ i ].worldLoc.x = 0.0f;
-		m_event[ i ].worldLoc.y = 0.0f;
-		m_event[ i ].worldLoc.z = 0.0f;
-		m_event[ i ].radarLoc.x = 0;
-		m_event[ i ].radarLoc.y = 0;
-		m_event[ i ].soundPlayed = FALSE;
-
-	}  // end for i
-
-}  // end clearAllEvents
-
-//-------------------------------------------------------------------------------------------------
-/** Reset radar data */
-//-------------------------------------------------------------------------------------------------
-void Radar::reset( void )
-{
-
-	// delete list resources
-	deleteListResources();
-
-	// clear all events
-	clearAllEvents();
-
-	// stop forcing the radar on
-	m_radarForceOn = false;
-
-}  // end reset
-
-//-------------------------------------------------------------------------------------------------
-/** Radar per frame update */
-//-------------------------------------------------------------------------------------------------
-void Radar::update( void )
-{
-	Int i;
-	UnsignedInt thisFrame = TheGameLogic->getFrame();
-
-	//
-	// traverse the radar event list, if an event has a creationFrame it means that it
-	// exists ... check to see if it's time for that event to die and if so, just clear
-	// out the active status
-	//
-	for( i = 0; i < MAX_RADAR_EVENTS; i++ )
-	{
-
-		if( m_event[ i ].active == TRUE && m_event[ i ].createFrame && 
-				thisFrame > m_event[ i ].dieFrame )
-			m_event[ i ].active = FALSE;
-				
-	}  // end for i
-
-	// see if we should refresh the terrain
-	if( m_queueTerrainRefreshFrame != 0 && 
-			TheGameLogic->getFrame() - m_queueTerrainRefreshFrame > RADAR_QUEUE_TERRAIN_REFRESH_DELAY )
-	{
-
-		// refresh the terrain
-		refreshTerrain( TheTerrainLogic );
-
-	}  // end if
-
-}  // end update
-
-//-------------------------------------------------------------------------------------------------
-/** Reset the radar for the new map data being given to it */
-//-------------------------------------------------------------------------------------------------
-void Radar::newMap( TerrainLogic *terrain )
-{
-
-	// keep a pointer for our radar window
-	Int id = NAMEKEY( "ControlBar.wnd:LeftHUD" );
-	m_radarWindow = TheWindowManager->winGetWindowFromId( NULL, id );
-	DEBUG_ASSERTCRASH( m_radarWindow, ("Radar::newMap - Unable to find radar game window\n") );
-
-	// reset all the data in the radar
-	reset();
-
-	// get the extents of the new map
-	terrain->getExtent( &m_mapExtent );
-
-	// we will sample at these intervals across the map
-	m_xSample = m_mapExtent.width() / RADAR_CELL_WIDTH;
-	m_ySample = m_mapExtent.height() / RADAR_CELL_HEIGHT;
-
-	// find the "middle" height for the terrain (most used value) and water table
-	Int x, y;
-	Int terrainSamples = 0, waterSamples = 0;
-
-	m_terrainAverageZ = 0.0f;
-	m_waterAverageZ = 0.0f;
-	Coord3D worldPoint;
-  
-  // since we're averaging let's skip every second sample...
-  worldPoint.y=0;
-	for( y = 0; y < RADAR_CELL_HEIGHT; y+=2, worldPoint.y+=2.0*m_ySample )
-  {
-    worldPoint.x=0;
-    for( x = 0; x < RADAR_CELL_WIDTH; x+=2, worldPoint.x+=2.0*m_xSample )
-		{
-			// don't use this, we don't really need the 
-      // Z position by this function... radarToWorld( &radarPoint, &worldPoint );
-			// and this is done by isUnderwater anyway: z = terrain->getGroundHeight( worldPoint.x, worldPoint.y );
-			Real z,waterZ;
-			if( terrain->isUnderwater( worldPoint.x, worldPoint.y, &waterZ, &z ) )
-			{
-				m_waterAverageZ += z;
-				waterSamples++;
-			}
-			else
-			{
-				m_terrainAverageZ += z;
-				terrainSamples++;
-			}
-
-		}  // end for x
-  }
-
-	// avoid divide by zeros
-	if( terrainSamples == 0 )
-		terrainSamples = 1;
-	if( waterSamples == 0 )
-		waterSamples = 1;
-
-	// compute averages
-	m_terrainAverageZ = m_terrainAverageZ / INT_TO_REAL( terrainSamples );
-	m_waterAverageZ = m_waterAverageZ / INT_TO_REAL( waterSamples );
-
-}  // end newMap
-
-//-------------------------------------------------------------------------------------------------
-/** Add an object to the radar list.  The object will be sorted in the list to be grouped
-	* using it's radar priority */
-//-------------------------------------------------------------------------------------------------
-void Radar::addObject( Object *obj )
-{
-
-	// get the radar priority for this object
-	RadarPriorityType newPriority = obj->getRadarPriority();
-	if( isPriorityVisible( newPriority ) == FALSE )
-		return;
-
-	// if this object is on the radar, remove it in favor of the new add
-	RadarObject **list;
-	RadarObject *newObj;
-
-	// sanity
-	DEBUG_ASSERTCRASH( obj->friend_getRadarData() == NULL,
-										 ("Radar: addObject - non NULL radar data for '%s'\n", 
-										 obj->getTemplate()->getName().str()) );
-
-	// allocate a new object
-	newObj = newInstance(RadarObject);
-
-	// set the object data
-	newObj->friend_setObject( obj );
-
-	// set color for this object on the radar
-	const Player *player = obj->getControllingPlayer();
-	Bool useIndicatorColor = true;
-
-	if( obj->isKindOf( KINDOF_DISGUISER ) )
-	{
-		//Because we have support for disguised units pretending to be units from another
-		//team, we need to intercept it here and make sure it's rendered appropriately
-		//based on which client is rendering it.
-    StealthUpdate *update = obj->getStealth();
-		if( update )
-		{
-			if( update->isDisguised() )
-			{
-				Player *clientPlayer = ThePlayerList->getLocalPlayer();
-				Player *disguisedPlayer = ThePlayerList->getNthPlayer( update->getDisguisedPlayerIndex() );
-				if( player->getRelationship( clientPlayer->getDefaultTeam() ) != ALLIES && clientPlayer->isPlayerActive() )
-				{
-					//Neutrals and enemies will see this disguised unit as the team it's disguised as.
-					player = disguisedPlayer;
-					if( player )
-						useIndicatorColor = false;
-				}
-				//Otherwise, the color will show up as the team it really belongs to (already set above).
-			}
-		}
-	}
-	
-	if( obj->getContain() )
-	{
-		// To handle Stealth garrison, ask containers what color they are drawing with to the local player.
-		// Local is okay because radar display is not synced.
-		player = obj->getContain()->getApparentControllingPlayer( ThePlayerList->getLocalPlayer() );
-		if( player )
-			useIndicatorColor = false;
-	}
-
-	if( useIndicatorColor || (player == NULL) )
-	{
-		newObj->setColor( obj->getIndicatorColor() );
-	}
-	else
-	{	
-		newObj->setColor( player->getPlayerColor() );
-	}
-
-	// set a chunk of radar data in the object
-	obj->friend_setRadarData( newObj );
-
-	//
-	// we will put this on either the local object list for objects that belong to the
-	// local player, or on the regular object list for all other objects
-	//
-	if( obj->isLocallyControlled() )
-		list = &m_localObjectList;
-	else
-		list = &m_objectList;
-
-	// link object to master list at the head of it's priority section
-	if( *list == NULL )
-		*list = newObj;  // trivial case, an empty list
-	else
-	{
-		RadarPriorityType prevPriority, currPriority;
-		RadarObject *currObject, *prevObject, *nextObject;
-
-		prevObject = NULL;
-		prevPriority = RADAR_PRIORITY_INVALID;
-		for( currObject = *list; currObject; currObject = nextObject )
-		{
-
-			// get the next object
-			nextObject = currObject->friend_getNext();
-
-			// get the priority of this entry in the list (currPriority)
-			currPriority = currObject->friend_getObject()->getRadarPriority();
-
-			//
-			// if there is no previous object, or the previous priority is less than the
-			// our new priority, and the current object in the list has a priority 
-			// higher than our equal to our own we need to be inserted here
-			//
-			if( (prevObject == NULL || prevPriority < newPriority ) &&
-					(currPriority >= newPriority) )
-			{
-
-				// insert into the list just ahead of currObject
-				if( prevObject )
-				{
-
-					// the new entry next points to what the previous one used to point to
-					newObj->friend_setNext( prevObject->friend_getNext() );
-
-					// the previous one next now points to the new entry
-					prevObject->friend_setNext( newObj );
-
-				}  // end if
-				else
-				{
-
-					// the new object next points to the current object
-					newObj->friend_setNext( currObject );
-
-					// new list head is now newObj
-					*list = newObj;
-
-				}  // end else
-
-				break;  // exit for, stop the insert
-
-			}  // end if
-			else if( nextObject == NULL )
-			{
-
-				// at the end of the list, put object here
-				currObject->friend_setNext( newObj );
-
-			}  // end else if
-
-			// our current object is now the previous object
-			prevObject = currObject;
-			prevPriority = currPriority;
-
-		}  // end if
-
-	}  // end else
-
-}  // end addObject
-
-//-------------------------------------------------------------------------------------------------
-/** Try to delete an object from a specific list */
-//-------------------------------------------------------------------------------------------------
-Bool Radar::deleteFromList( Object *obj, RadarObject **list )
-{
-	RadarObject *radarObject, *prevObject = NULL;
-					
-	// find the object in list
-	for( radarObject = *list; radarObject; radarObject = radarObject->friend_getNext() )
-	{
-		
-		if( radarObject->friend_getObject() == obj )
-		{
-
-			// unlink the object from list
-			if( prevObject == NULL )
-				*list = radarObject->friend_getNext();  // removing head of list
-			else
-				prevObject->friend_setNext( radarObject->friend_getNext() );
-
-			// set the object radar data to NULL
-			obj->friend_setRadarData( NULL );
-
-			// delete the object instance
-			deleteInstance(radarObject);
-
-			// all done, object found and deleted
-			return TRUE;
-
-		}  // end if
-
-		// save this object as previous one encountered in the list
-		prevObject = radarObject;
-
-	}  // end for, radarObject
-
-	// object was not found in this list
-	return FALSE;
-
-}  // end deleteFromList
-
-//-------------------------------------------------------------------------------------------------
-/** Remove an object from the radar, the object may reside in any list */
-//-------------------------------------------------------------------------------------------------
-void Radar::removeObject( Object *obj )
-{
-
-	// sanity
-	if( obj->friend_getRadarData() == NULL )
-		return;
-
-	if( deleteFromList( obj, &m_localObjectList ) == TRUE )
-		return;
-	else if( deleteFromList( obj, &m_objectList ) == TRUE )
-		return;
-	else
-	{
-
-		// sanity
-		DEBUG_ASSERTCRASH( 0, ("Radar: Tried to remove object '%s' which was not found\n",
-											 obj->getTemplate()->getName().str()) );
-
-	}  // end else
-
-}  // end removeObject
-
-//-------------------------------------------------------------------------------------------------
-/** Translate a 2D spot on the radar (from (0,0) to (RADAR_CELL_WIDTH,RADAR_CELL_HEIGHT)
-	* to a 3D spot in the world. Does not determine Z value!
-	* Return TRUE if the radar points translates to a valid world position
-	* Return FALSE if the radar point is not a valid world position */
-//-------------------------------------------------------------------------------------------------		
-Bool Radar::radarToWorld2D( const ICoord2D *radar, Coord3D *world )
-{
-	Int x, y;
-
-	// sanity
-	if( radar == NULL || world == NULL )
-		return FALSE;
-
-	// get the coords
-	x = radar->x;
-	y = radar->y;
-
-	// more sanity
-	if( x < 0 )
-		x = 0;
-	if( x >= RADAR_CELL_WIDTH )
-		x = RADAR_CELL_WIDTH - 1;
-	if( y < 0 )
-		y = 0;
-	if( y >= RADAR_CELL_HEIGHT )
-		y = RADAR_CELL_HEIGHT - 1;
-
-	// translate to world
-	world->x = x * m_xSample;
-	world->y = y * m_ySample;
-  return TRUE;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Translate a 2D spot on the radar (from (0,0) to (RADAR_CELL_WIDTH,RADAR_CELL_HEIGHT)
-	* to a 3D spot in the world on the terrain
-	* Return TRUE if the radar points translates to a valid world position
-	* Return FALSE if the radar point is not a valid world position */
-//-------------------------------------------------------------------------------------------------		
-Bool Radar::radarToWorld( const ICoord2D *radar, Coord3D *world )
-{
-  if (!radarToWorld2D(radar,world))
-    return FALSE;
-
-	// find the terrain height here
-	world->z = TheTerrainLogic->getGroundHeight( world->x, world->y );
-	
-	return TRUE;  // valid translation
-
-}  // end radarToWorld
-
-//-------------------------------------------------------------------------------------------------
-/** Translate a point in the world to the 2D radar (x,y)
-	* Return TRUE if the world point successfully translates to a radar point
-	* Return FALSE if world point is a bogus off the map position */
-//-------------------------------------------------------------------------------------------------
-Bool Radar::worldToRadar( const Coord3D *world, ICoord2D *radar )
-{
-
-	// sanity
-	if( world == NULL || radar == NULL )
-		return FALSE;
-
-	// sanity check the world position
-//	if( world->x < m_mapExtent.lo.x || world->x > m_mapExtent.hi.x ||
-//			world->y < m_mapExtent.lo.y || world->y > m_mapExtent.hi.y )
-//		return FALSE;
-	// This is actually an insanity check.  Nobody uses the return value, so this just leaves garbage in the 
-	// return pointer.  The reason the question gets asked is there are 60 partition cells to 128 radar cells
-	// (for example), and the radar wants to draw a horizontal line.  This line ends up three pixels long
-	// at the right side, so the radar gives up and doesn't draw the middle one.
-	// We bind to on radar anyway, and we only ask if we are on radar, so don't intentionally add edge weirdness.
-
-	// convert
-	radar->x = world->x / m_xSample;
-	radar->y = world->y / m_ySample;
-
-	// keep it in bounds
-	if( radar->x < 0 )
-		radar->x = 0;
-	if( radar->x >= RADAR_CELL_WIDTH )
-		radar->x = RADAR_CELL_WIDTH - 1;
-	if( radar->y < 0 )
-		radar->y = 0;
-	if( radar->y >= RADAR_CELL_HEIGHT )
-		radar->y = RADAR_CELL_HEIGHT - 1;
-
-	return TRUE;  // valid translation
-
-}  // end worldToRadar
-
-// ------------------------------------------------------------------------------------------------
-/** Translate an actual pixel location (relative pixel with (0,0) being the top left of
-	* the radar area) to the "logical" radar coords that would cover the entire area of display
-	* on the screen.  This is needed because some maps are "long" or "tall" and need a translation
-	* to any radar image that has been scaled to preserve the map aspect ratio */
-// ------------------------------------------------------------------------------------------------
-Bool Radar::localPixelToRadar( const ICoord2D *pixel, ICoord2D *radar )
-{
-
-	// sanity
-	if( pixel == NULL || radar == NULL )
-		return FALSE;
-
-	// get window size of the radar
-	ICoord2D size;
-	m_radarWindow->winGetSize( &size.x, &size.y );
-
-	//
-	// act like we're going to draw and find the aspect ratio adjusted points of the 
-	// terrain radar positions
-	//
-	ICoord2D start = { 0, 0 };
-	ICoord2D ul, lr;
-	findDrawPositions( start.x, start.y, size.x, size.y, &ul, &lr );
-
-	// get the scaled width and height
-	Int scaledWidth = lr.x - ul.x;
-	Int scaledHeight = lr.y - ul.y;
-
-	// if the pixel is outsize of the adjusted radar area there are no logical coords
-	if( pixel->x < ul.x || pixel->x > lr.x ||
-			pixel->y < ul.y || pixel->y > lr.y )
-		return FALSE;
-
-	if( scaledWidth >= scaledHeight )
-	{
-
-		// just normal conversion from full stretched to radar cells
-		radar->x = (pixel->x - ul.x)* RADAR_CELL_WIDTH / scaledWidth;
-
-		// conversion for scaled Y direction in map
-		radar->y = REAL_TO_INT( ((pixel->y - ul.y) / INT_TO_REAL( scaledHeight )) * size.y );
-		
-		//
-		// radar->y now refers to a point that was "as if" the map was square, translate to radar
-		// note that y is inverted to have the radar align with the world (+x = right, -y = down)
-		//
-		radar->y = (size.y - radar->y) * RADAR_CELL_HEIGHT / size.y;
-
-
-	}  // end if
-	else
-	{
-
-		// conversion for scaled Y direction in map
-		radar->x = REAL_TO_INT( ((pixel->x - ul.x) / INT_TO_REAL( scaledWidth )) * size.x );
-		
-		// radar->x now refers to a point that was "as if" the map was square, translate to radar
-		radar->x = radar->x * RADAR_CELL_WIDTH / size.x;
-
-		//
-		// just normal conversion from full stretched to radar cells, note that y is inverted
-		// to have the radar align with the world (+x = right, -y = down)
-		//
-		radar->y = (size.y - pixel->y) * RADAR_CELL_HEIGHT / size.y;
-
-	}  // end else
-
-	return TRUE;
-
-}  // end localPixelToRadar
-
-// ------------------------------------------------------------------------------------------------
-/** Translate a screen mouse position to world coords if the screen position is within
-	* the radar window and that spot in the radar corresponds to a point in the world */
-// ------------------------------------------------------------------------------------------------
-Bool Radar::screenPixelToWorld( const ICoord2D *pixel, Coord3D *world )
-{
-
-	// sanity
-	if( pixel == NULL || world == NULL )
-		return FALSE;
-
-	// if we have no radar window can't do the conversion
-	if( m_radarWindow == NULL )
-		return FALSE;
-
-	// translate pixel coords to local pixel coords relative to the radar window
-	ICoord2D localPixel;
-	ICoord2D screenPos;
-	m_radarWindow->winGetScreenPosition( &screenPos.x, &screenPos.y );
-	localPixel.x = pixel->x - screenPos.x;
-	localPixel.y = pixel->y - screenPos.y;
-
-	// translate local pixel to radar
-	ICoord2D radar;
-	if( localPixelToRadar( &localPixel, &radar ) == FALSE )
-		return FALSE;
-
-	// translate radar to world
-	return radarToWorld( &radar, world );
-
-}  // end screenPixelToWorld
-
-// ------------------------------------------------------------------------------------------------
-/** Given the pixel coordinates, see if there is an object that is exactly in this
-	* spot represented on the radar */
-// ------------------------------------------------------------------------------------------------
-Object *Radar::objectUnderRadarPixel( const ICoord2D *pixel )
-{
-
-	// sanity
-	if( pixel == NULL )
-		return NULL;
-
-	// convert pixel location to radar logical radar location
-	ICoord2D radar;
-	if( localPixelToRadar( pixel, &radar ) == FALSE )
-		return NULL;
-
-	// object we will return
-	Object *obj = NULL;
-
-	//
-	// scan the objects on the radar list and return any object that maps its world location
-	// to the radar location
-	//
-	
-	// search the local object list
-	obj = searchListForRadarLocationMatch( m_localObjectList, &radar );
-
-	// search all other objects if not found
-	if( obj == NULL )
-		obj = searchListForRadarLocationMatch( m_objectList, &radar );
-
-	// return the object found (if any)
-	return obj;
-
-}  // end objectUnderRadarPixel
-
-// ------------------------------------------------------------------------------------------------
-/** Search the object list for an object that maps to the given logical radar coords */
-// ------------------------------------------------------------------------------------------------
-Object *Radar::searchListForRadarLocationMatch( RadarObject *listHead, ICoord2D *radarMatch )
-{
-
-	// sanity
-	if( listHead == NULL || radarMatch == NULL )
-		return NULL;
-
-	// scan the list
-	RadarObject *radarObject;
-	ICoord2D radar;
-	for( radarObject = listHead; radarObject; radarObject = radarObject->friend_getNext() )
-	{
-
-		// get object
-		Object *obj = radarObject->friend_getObject();
-		
-		// sanity
-		if( obj == NULL )
-		{
-
-			DEBUG_CRASH(( "Radar::searchListForRadarLocationMatch - NULL object encountered in list\n" ));
-			continue;
-
-		}  // end if
-
-		// convert object position to logical radar
-		worldToRadar( obj->getPosition(), &radar );
-
-		// see if this matches our match radar location
-		if( radar.x >= radarMatch->x - 1 &&
-				radar.x <= radarMatch->x + 1 && 
-				radar.y >= radarMatch->y - 1 &&
-				radar.y <= radarMatch->y + 1 )
-			return obj;
-
-	}  // end for, radarObject
-
-	// no match found
-	return NULL;
-
-}  // end searchListForRadarLocationMatch
-
-// ------------------------------------------------------------------------------------------------
-/** Given the RELATIVE SCREEN start X and Y, the width and height of the area to draw the whole
-	* radar in, compute what the upper left (ul) and lower right (lr) local coordinates are
-	* that represent the actual terrain image part of the radar that will preserve the
-	* aspect ratio of the map */
-// ------------------------------------------------------------------------------------------------
-void Radar::findDrawPositions( Int startX, Int startY, Int width, Int height, 
-															 ICoord2D *ul, ICoord2D *lr )
-{
-
-	Real ratioWidth;
-	Real ratioHeight;
-	Coord2D radar;
-	ratioWidth = m_mapExtent.width()/(width * 1.0f);
-	ratioHeight = m_mapExtent.height()/(height* 1.0f);
-	
-	if( ratioWidth >= ratioHeight)
-	{
-		radar.x = m_mapExtent.width() / ratioWidth;
-		radar.y = m_mapExtent.height()/ ratioWidth;
-		ul->x = 0;
-		ul->y = (height - radar.y) / 2.0f;
-		lr->x = radar.x;
-		lr->y = height - ul->y;
-	}
-	else
-	{
-		radar.x = m_mapExtent.width() / ratioHeight;
-		radar.y = m_mapExtent.height()/ ratioHeight;
-		ul->x = (width - radar.x ) / 2.0f;
-		ul->y = 0;
-		lr->x = width - ul->x;
-		lr->y = radar.y;
-	}
-/*
-
-	if( m_mapExtent.width() > m_mapExtent.height() )
-	{
-
-		//
-		// +---------------+
-		// |               |
-		// |               |
-		// +---------------+
-		// |   map area    |
-		// +---------------+
-		// |               |
-		// |               |
-		// +---------------+
-		//
-		ul->x = 0;
-		ul->y = (height - (m_mapExtent.height() / m_mapExtent.width() * height)) / 2.0f;
-		lr->x = width;
-		lr->y = height - ul->y;
-
-	}  // end if
-	else if(  m_mapExtent.height() > m_mapExtent.width() )
-	{
-
-		// +-----+---+-----+
-		// |     | m |     |
-		// |     | a |     |
-		// |     | p |     |
-		// |     |   |     |
-		// |     | a |     |
-		// |     | r |     |
-		// |     | e |     |
-		// |     | a |     |
-		// +-----+---+-----+
-		//
-
-		ul->x = (width - (m_mapExtent.width() / m_mapExtent.height() * width)) / 2.0f;
-		ul->y = 0;
-		lr->x = width - ul->x;
-		lr->y = height;
-
-	}  // end else
-	else
-	{
-
-		ul->x = 0;
-		ul->y = 0;
-		lr->x = width;
-		lr->y = height;
-
-	}  // end else
-*/
-
-	// make them pixel positions
-	ul->x += startX;
-	ul->y += startY;
-	lr->x += startX;
-	lr->y += startY;
-
-}  // end findDrawPositions
-
-//-------------------------------------------------------------------------------------------------
-/** Radar color lookup table */
-//-------------------------------------------------------------------------------------------------
-struct RadarColorLookup
-{
-	RadarEventType event;
-	RGBAColorInt color1;
-	RGBAColorInt color2;
-};
-static RadarColorLookup radarColorLookupTable[] = 
-{
-	/*      Radar Event													Color 1									 Color 2       */
-	{ RADAR_EVENT_CONSTRUCTION,					{ 128, 128, 255, 255 },  {  128, 255, 255, 255 } },
-	{ RADAR_EVENT_UPGRADE,							{ 128,   0,  64, 255 },  {  255, 185, 220, 255 } },
-	{ RADAR_EVENT_UNDER_ATTACK,					{ 255,   0,   0, 255 },  {  255, 128, 128, 255 } },
-	{ RADAR_EVENT_INFORMATION,					{ 255, 255,   0, 255 },  {  255, 255, 128, 255 } },
-	{ RADAR_EVENT_BEACON_PULSE,					{ 255, 255,   0, 255 },  {  255, 255, 128, 255 } },
-	{ RADAR_EVENT_INFILTRATION,					{   0, 255, 255, 255 },  {  128, 255, 255, 255 } },
-	{ RADAR_EVENT_BATTLE_PLAN,					{ 255, 255, 255, 255 },	 {  255, 255, 255, 255 } },
-	{ RADAR_EVENT_STEALTH_DISCOVERED,		{   0, 255,   0, 255 },	 {    0, 128,   0, 255 } },
-	{ RADAR_EVENT_STEALTH_NEUTRALIZED,	{   0, 255,   0, 255 },	 {    0, 128,   0, 255 } },
-	{ RADAR_EVENT_FAKE,									{   0,	 0,   0,	 0 },	 {    0,	 0,   0,   0 } },
-	{ RADAR_EVENT_INVALID,							{   0,   0,   0,   0 },  {    0,   0,   0,   0 } }
-};
-
-//-------------------------------------------------------------------------------------------------
-/** Create a new radar event */
-//-------------------------------------------------------------------------------------------------
-void Radar::createEvent( const Coord3D *world, RadarEventType type, Real secondsToLive )
-{
-		
-	// sanity
-	if( world == NULL )
-		return;
-
-	// lookup the colors we are to used based on the event 
-	RGBAColorInt color[ 2 ];
-	Int i = 0;
-	for( ; radarColorLookupTable[ i ].event != RADAR_EVENT_INVALID; ++i )
-	{
-
-		if( radarColorLookupTable[ i ].event == type )
-		{
-
-			color[ 0 ] = radarColorLookupTable[ i ].color1;
-			color[ 1 ] = radarColorLookupTable[ i ].color2;
-			break;
-
-		}  // end if
-
-	}  // end while
-
-	// check for no match found in color table
-	if( radarColorLookupTable[ i ].event == RADAR_EVENT_INVALID )
-	{
-		static RGBAColorInt color1 = { 255, 255, 255, 255 };
-		static RGBAColorInt color2 = { 255, 255, 255, 255 };
-
-		DEBUG_CRASH(( "Radar::createEvent - Event not found in color table, using default colors\n" ));
-		color[ 0 ] = color1;
-		color[ 1 ] = color2;
-
-	}  // end if
-
-	// call the internal method to create the event with these colors
-	internalCreateEvent( world, type, secondsToLive, &color[ 0 ], &color[ 1 ] );
-
-}  // end createEvent
-
-// ------------------------------------------------------------------------------------------------
-/** Create radar event using a specific colors from the player */
-// ------------------------------------------------------------------------------------------------
-void Radar::createPlayerEvent( Player *player, const Coord3D *world, 
-															 RadarEventType type, Real secondsToLive )
-{
-
-	// sanity
-	if( player == NULL || world == NULL )
-		return;
-
-	// figure out the two colors we should use
-	Color c;
-	UnsignedByte r, g, b, a;
-	RGBAColorInt color[ 2 ];
-
-	// color 1
-	c = player->getPlayerColor();
-	GameGetColorComponents( c, &r, &g, &b, &a );
-	color[ 0 ].red = r;
-	color[ 0 ].green = g;
-	color[ 0 ].blue = b;
-	color[ 0 ].alpha = a;
-
-	// the second will be a darker color 1
-	Real darkScale = 0.75f;
-	color[ 1 ] = color[ 0 ];
-	color[ 1 ].red -= REAL_TO_INT( color[ 0 ].red * darkScale );
-	if( color[ 1 ].red < 0 )
-		color[ 1 ].red = 0;
-	color[ 1 ].green -= REAL_TO_INT( color[ 0 ].green * darkScale );
-	if( color[ 1 ].green < 0 )
-		color[ 1 ].green = 0;
-	color[ 1 ].blue -= REAL_TO_INT( color[ 0 ].blue * darkScale );
-	if( color[ 1 ].blue < 0 )
-		color[ 1 ].blue = 0;
-
-	// create the events using these colors
-	internalCreateEvent( world, type, secondsToLive, &color[ 0 ], &color[ 1 ] );
-
-}  // end createPlayerEvent
-
-//-------------------------------------------------------------------------------------------------
-/** Create a new radar event */
-//-------------------------------------------------------------------------------------------------
-void Radar::internalCreateEvent( const Coord3D *world, RadarEventType type, Real secondsToLive,
-																 const RGBAColorInt *color1, const RGBAColorInt *color2 )
-{
-	static Real secondsBeforeDieToFade = 0.5f;  ///< this many seconds before we hit the die frame we start to fade away
-		
-	// sanity
-	if( world == NULL || color1 == NULL || color2 == NULL )
-		return;
-
-	// translate the world coord to radar coords
-	ICoord2D radar;
-	worldToRadar( world, &radar );
-
-	// add to the list of radar events
-	m_event[ m_nextFreeRadarEvent ].type = type;
-	m_event[ m_nextFreeRadarEvent ].active = TRUE;
-	m_event[ m_nextFreeRadarEvent ].createFrame = TheGameLogic->getFrame();
-	m_event[ m_nextFreeRadarEvent ].dieFrame = TheGameLogic->getFrame() + LOGICFRAMES_PER_SECOND * secondsToLive;
-	m_event[ m_nextFreeRadarEvent ].fadeFrame = m_event[ m_nextFreeRadarEvent ].dieFrame - LOGICFRAMES_PER_SECOND * secondsBeforeDieToFade;
-	m_event[ m_nextFreeRadarEvent ].color1 = *color1;
-	m_event[ m_nextFreeRadarEvent ].color2 = *color2;
-	m_event[ m_nextFreeRadarEvent ].worldLoc = *world;
-	m_event[ m_nextFreeRadarEvent ].radarLoc = radar;
-	m_event[ m_nextFreeRadarEvent ].soundPlayed = FALSE;
-
-	// record the index of this, our "last" radar event.
-	if ( type != RADAR_EVENT_BEACON_PULSE )
-		m_lastRadarEvent = m_nextFreeRadarEvent;
-
-	//
-	// increment the next radar event index, wrapping to the beginning.  If we ever have so many
-	// events that they fill up the buffer the oldest ones will just drop off, eh ... should be fine.
-	//
-	m_nextFreeRadarEvent++;
-	if( m_nextFreeRadarEvent >= MAX_RADAR_EVENTS )
-		m_nextFreeRadarEvent = 0;
-
-}  // end createEvent
-
-//-------------------------------------------------------------------------------------------------
-/** Get the last event position, if any.
-	* Returns TRUE if event was found
-	* Returns FALSE if there is no "last event" */
-//-------------------------------------------------------------------------------------------------
-Bool Radar::getLastEventLoc( Coord3D *eventPos )
-{
-
-	// if we have an index for the last event, one was present
-	if( m_lastRadarEvent != -1 )
-	{
-
-		if( eventPos )
-			*eventPos = m_event[ m_lastRadarEvent ].worldLoc;
-		return TRUE;
-
-	}  // end if
-
-	return FALSE;  // no last event
-
-}  // end getLastEventLoc
-
-// ------------------------------------------------------------------------------------------------
-/** Try to create a radar event for "we're under attack".  This will be called every time
-	* actual damage is dealt to an object that the player owns that shows up on the radar.
-	* We don't want to create under attack events every time we are damaged and we also want
-	* to limit them based on time and local area of other recent attack events */
-// ------------------------------------------------------------------------------------------------
-void Radar::tryUnderAttackEvent( const Object *obj )
-{
-
-	// sanity
-	if( obj == NULL )
-		return;
-
-	// try to create the event
-	Bool eventCreated = tryEvent( RADAR_EVENT_UNDER_ATTACK, obj->getPosition() );
-
-	// if event created, do some more feedback
-	if( eventCreated )
-	{
-
-		TheControlBar->triggerRadarAttackGlow();
-		//
-		///@todo Should make an INI data driven table for radar event strings, and audio events
-		//
-		// UI feedback for being under attack (note that we display these messages and audio
-		// queues even if we don't have a radar)
-		//
-		Player *player = ThePlayerList->getLocalPlayer();
-
-		// create a message for the attack event
-		if( obj->isKindOf( KINDOF_INFANTRY ) || obj->isKindOf( KINDOF_VEHICLE ) )
-		{
-			AudioEventRTS unitAttackSound;
-			if( obj->isKindOf(KINDOF_HARVESTER) )
-			{
-				// display special message
-				TheInGameUI->message( "RADAR:HarvesterUnderAttack" );
-
-				// play special audio event
-				unitAttackSound = TheAudio->getMiscAudio()->m_radarHarvesterUnderAttackSound;
-			}
-			else
-			{
-				// display message
-				TheInGameUI->message( "RADAR:UnitUnderAttack" );
-				
-				// play audio event
-				unitAttackSound = TheAudio->getMiscAudio()->m_radarStructureUnderAttackSound;
-			}
-			unitAttackSound.setPlayerIndex(player->getPlayerIndex());
-			TheAudio->addAudioEvent( &unitAttackSound );
-
-		}  // end if
-		else if( obj->isKindOf( KINDOF_STRUCTURE ) && obj->isKindOf( KINDOF_MP_COUNT_FOR_VICTORY ) )
-		{
-			// play EVA. If its our object, play Base under attack.
-			if (obj->getControllingPlayer()->isLocalPlayer())
-				TheEva->setShouldPlay(EVA_BaseUnderAttack);
-			else if (ThePlayerList->getLocalPlayer()->getRelationship(obj->getTeam()) == ALLIES)
-				TheEva->setShouldPlay(EVA_AllyUnderAttack);
-
-			// display message
-			TheInGameUI->message( "RADAR:StructureUnderAttack" );
-
-			// play audio event
-			static AudioEventRTS structureAttackSound = TheAudio->getMiscAudio()->m_radarStructureUnderAttackSound;
-			structureAttackSound.setPlayerIndex(player->getPlayerIndex());
-			TheAudio->addAudioEvent( &structureAttackSound );
-
-		}  // end else if
-		else
-		{
-
-			// display message
-			TheInGameUI->message( "RADAR:UnderAttack" );
-
-			// play audio event
-			static AudioEventRTS underAttackSound = TheAudio->getMiscAudio()->m_radarStructureUnderAttackSound;
-			underAttackSound.setPlayerIndex(player->getPlayerIndex());
-			TheAudio->addAudioEvent( &underAttackSound );
-
-		}  // end else
-
-	}  // end if
-
-}  // end tryUnderAttackEvent
-
-// ------------------------------------------------------------------------------------------------
-/** Try to create a radar event for "infiltration".
-		This happens whenever a unit is hijacked, defected, converted to carbomb, hacked, or 
-		otherwise snuck into */ 
-// ------------------------------------------------------------------------------------------------
-void Radar::tryInfiltrationEvent( const Object *obj )
-{
-
-	//Sanity!
-	if( !obj )
-	{
-		return;
-	}
-
-	// We should only be warned against infiltrations that are taking place against us.
-	if( obj->getControllingPlayer() != ThePlayerList->getLocalPlayer() )
-		return;
-
-	// create the radar event
-	createEvent( obj->getPosition(), RADAR_EVENT_INFILTRATION );
-
-	//
-	///@todo Should make an INI data driven table for radar event strings, and audio events
-	//
-	// UI feedback for being under attack (note that we display these messages and audio
-	// queues even if we don't have a radar)
-	//
-	Player *player = ThePlayerList->getLocalPlayer();
-
-	// display message
-	TheInGameUI->message( "RADAR:Infiltration" );
-
-	// play audio event
-	static AudioEventRTS infiltrationWarningSound = TheAudio->getMiscAudio()->m_radarInfiltrationSound;
-	infiltrationWarningSound.setPlayerIndex(player->getPlayerIndex());
-	TheAudio->addAudioEvent( &infiltrationWarningSound );
-
-}  // end tryInfiltrationEvent
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-Bool Radar::tryEvent( RadarEventType event, const Coord3D *pos )
-{
-
-	// sanity
-	if( event <= RADAR_EVENT_INVALID || event >= RADAR_EVENT_NUM_EVENTS || pos == NULL )
-		return FALSE;
-
-	// see if there was an event of this type within the given range within the given time
-	UnsignedInt currentFrame = TheGameLogic->getFrame();
-	const Real closeEnoughDistanceSq = 250.0f * 250.0f;
-	const UnsignedInt framesBetweenEvents = LOGICFRAMES_PER_SECOND * 10;
-	//
-
-	// see if there was any matching radar event within range of this one
-	// that wasn't too long ago, if there was we won't create another and get outta here
-	//
-	for( Int i = 0; i < MAX_RADAR_EVENTS; ++i )
-	{
-	
-		// only pay attention to under attack events
-		if( m_event[ i ].type == event )
-		{
-
-			// get distance from our new event location to this event location in 2D
-			Real distSquared = m_event[ i ].worldLoc.x - pos->x * m_event[ i ].worldLoc.x - pos->x +
-												 m_event[ i ].worldLoc.y - pos->y * m_event[ i ].worldLoc.y - pos->y;
-
-			if( distSquared <= closeEnoughDistanceSq )
-			{
-
-				// finally only reject making a new event of this existing one is "recent enough"
-				if( currentFrame - m_event[ i ].createFrame < framesBetweenEvents )
-					return FALSE;  // reject it
-
-			}  // end if
-
-		}  // end if
-
-	}  // end for i
-
-	// if we got here then we want to create a new event
-	createEvent( pos, event );
-
-	// return TRUE for successfully created event
-	return TRUE;
-
-}  // end tryEvent
-
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void Radar::refreshTerrain( TerrainLogic *terrain )
-{
-
-	// no future queue is valid now
-	m_queueTerrainRefreshFrame = 0;
-
-}  // end refreshTerrain
-
-// ------------------------------------------------------------------------------------------------
-/** Queue a refresh of the radar terrain, we have this so that if there is code that
-	* rapidly needs to refresh the radar, it should use this so we aren't continually
-	* rebuilding the radar graphic because that process is slow.  If you need to update
-	* the terrain on the radar immediately use refreshTerrain() */
-// ------------------------------------------------------------------------------------------------
-void Radar::queueTerrainRefresh( void )
-{
-
-	//
-	// we just simply overwrite the frame we have recorded for a radar refresh.  If there was
-	// already one there, it's simply just forgotten and whatever changes we wanted to see
-	// with that refresh will have to wait until enough time has passed to show these
-	// changes as well.  why you ask ... well, because if we're calling this in close enough
-	// proximity for us to overwrite something, we're changing the terrain features 
-	// quite often and can't afford the expense of rebuilding the radar visual
-	//
-	m_queueTerrainRefreshFrame = TheGameLogic->getFrame();
-
-}  // end queueTerrainRefresh
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void Radar::crc( Xfer *xfer )
-{
-
-}  // end crc
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer a radar object list given the head pointer as a parameter
-	* Version Info;
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-static void xferRadarObjectList( Xfer *xfer, RadarObject **head )
-{
-	RadarObject *radarObject;
-
-	// sanity
-	DEBUG_ASSERTCRASH( head != NULL, ("xferRadarObjectList - Invalid parameters\n" ));
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// write could of objects in list
-	UnsignedShort count = 0;
-	for( radarObject = *head; radarObject; radarObject = radarObject->friend_getNext() )
-		count++;
-	xfer->xferUnsignedShort( &count );
-
-	// xfer the list data
-	if( xfer->getXferMode() == XFER_SAVE )
-	{
-
-		// save each object
-		for( radarObject = *head; radarObject; radarObject = radarObject->friend_getNext() )
-		{
-
-			// save this object
-			xfer->xferSnapshot( radarObject );
-
-		}  // end for, radarObject
-
-	}  // end if, save
-	else
-	{
-
-		// the list should be empty at this point as we are loading it as a whole
-		if( *head != NULL )
-		{
-#if 1
-			// srj sez: yeah, it SHOULD be, but a few rogue things come into existence (via their ctor) preloaded
-			// with stuff (eg, "CabooseFullOfTerrorists"). we immediately destroy 'em, but they don't go away just yet.
-			// so just ignore 'em if possible.
-			for( radarObject = *head; radarObject; radarObject = radarObject->friend_getNext() )
-			{
-				if (!radarObject->friend_getObject()->isDestroyed())
-				{
-					DEBUG_CRASH(( "xferRadarObjectList - List head should be NULL, or contain only destroyed objects\n" ));
-					throw SC_INVALID_DATA;
-				}
-			}
-#else
-			DEBUG_CRASH(( "xferRadarObjectList - List head should be NULL, but isn't\n" ));
-			throw SC_INVALID_DATA;
-#endif
-		}  // end if
-
-		// read each element
-		for( UnsignedShort i = 0; i < count; ++i )
-		{
-
-			// alloate a new radar object 
-			radarObject = newInstance(RadarObject);
-
-			// link to the end of the list
-			if( *head == NULL )
-				*head = radarObject;
-			else
-			{
-
-				RadarObject *other;
-				for( other = *head; other->friend_getNext() != NULL; other = other->friend_getNext() )
-				{
-				}  // end for, other
-
-				// set the end of the list to point to the new object
-				other->friend_setNext( radarObject );
-
-			}  // end else
-
-			// load the data
-			xfer->xferSnapshot( radarObject );
-						
-		}  // end for i
-
-	}  // end else, load
-
-}  // end xferRadarObjectList
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer Method
-	* Version Info:
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-void Radar::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// radar hidden
-	xfer->xferBool( &m_radarHidden );
-
-	// radar force on
-	xfer->xferBool( &m_radarForceOn );
-
-	// save our local object list
-	xferRadarObjectList( xfer, &m_localObjectList );
-
-	// save the regular object list
-	xferRadarObjectList( xfer, &m_objectList );
-
-	// save the radar event count and data
-	UnsignedShort eventCountVerify = MAX_RADAR_EVENTS;
-	UnsignedShort eventCount = eventCountVerify;
-	xfer->xferUnsignedShort( &eventCount );
-	if( eventCount != eventCountVerify )
-	{
-
-		DEBUG_CRASH(( "Radar::xfer - size of MAX_RADAR_EVENTS has changed, you must version this xfer method to accomodate the new array size.  Was '%d' and is now '%d'\n",
-									eventCount, eventCountVerify ));
-		throw SC_INVALID_DATA;
-
-	}  // end if
-	for( UnsignedShort i = 0; i < eventCount; ++i )
-	{
-
-		// xfer event data
-		xfer->xferUser( &m_event[ i ].type, sizeof( RadarEventType ) );
-		xfer->xferBool( &m_event[ i ].active );
-		xfer->xferUnsignedInt( &m_event[ i ].createFrame );
-		xfer->xferUnsignedInt( &m_event[ i ].dieFrame );
-		xfer->xferUnsignedInt( &m_event[ i ].fadeFrame );
-		xfer->xferRGBAColorInt( &m_event[ i ].color1 );
-		xfer->xferRGBAColorInt( &m_event[ i ].color2 );
-		xfer->xferCoord3D( &m_event[ i ].worldLoc );
-		xfer->xferICoord2D( &m_event[ i ].radarLoc );
-		xfer->xferBool( &m_event[ i ].soundPlayed );
-		
-	}  // end for i
-
-	// next event index
-	xfer->xferInt( &m_nextFreeRadarEvent );
-
-	// last event index
-	xfer->xferInt( &m_lastRadarEvent );
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void Radar::loadPostProcess( void )
-{
-
-	//
-	// refresh the radar texture now that all the objects (specifically bridges) have
-	// been loaded with their correct damage states from save game file
-	//
-	refreshTerrain( TheTerrainLogic );
-
-}  // end loadPostProcess
-
-// ------------------------------------------------------------------------------------------------
-/** Is the priority type passed in a "visible" one that can show up on the radar */
-// ------------------------------------------------------------------------------------------------
-Bool Radar::isPriorityVisible( RadarPriorityType priority ) const 
-{
-
-	switch( priority )
-	{
-
-		case RADAR_PRIORITY_INVALID:
-		case RADAR_PRIORITY_NOT_ON_RADAR:
-			return FALSE;
-
-		default:
-			return TRUE;
-
-	}  // end switch
-
-}  // end isPriorityVisible
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp
index fb288a2e3b5..87a5934f403 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp
@@ -59,11 +59,6 @@
 #include "GameLogic/SidesList.h"
 #include "GameLogic/TerrainLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 GameState *TheGameState = NULL;
@@ -94,14 +89,14 @@ SaveGameInfo::SaveGameInfo( void )
 	missionNumber			= 0;
 	saveFileType			= SAVE_FILE_TYPE_NORMAL;
 
-}  // end SaveGameInfo
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 SaveGameInfo::~SaveGameInfo( void )
 {
 
-}  // end ~SaveGameInfo
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Is this date newer than the other one passed in? */
@@ -124,7 +119,7 @@ Bool SaveDate::isNewerThan( SaveDate *other )
 			return FALSE;
 		else
 		{
-			
+
 			// day
 			if( day > other->day )
 				return TRUE;
@@ -163,19 +158,19 @@ Bool SaveDate::isNewerThan( SaveDate *other )
 							else
 								return FALSE;
 
-						}  // end else
+						}
 
-					}  // end else
+					}
 
-				}  // end else
+				}
 
-			}  // end else
+			}
 
-		}  // end else
+		}
 
-	}  // end else
+	}
 
-}  // end isNewerThan
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Find a snapshot block info that matches the token passed in */
@@ -200,17 +195,17 @@ GameState::SnapshotBlock *GameState::findBlockInfoByToken( AsciiString token, Sn
 		if( blockInfo->blockName == token )
 			return blockInfo;
 
-	}  // end for
+	}
 
 	// not found
 	return NULL;
 
-}  // end findLexiconEntryByToken
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal) 
+UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal)
 {
 	// setup date buffer for local region date format
 	#define DATE_BUFFER_SIZE 256
@@ -220,7 +215,7 @@ UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal)
 	if (GetVersionEx(&osvi))
 	{	//check if we're running Win9x variant since they may need different characters
 		if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
-		{		
+		{
 			char dateBuffer[ DATE_BUFFER_SIZE ];
 			GetDateFormat( LOCALE_SYSTEM_DEFAULT,
 										 DATE_SHORTDATE,
@@ -229,7 +224,7 @@ UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal)
 										 dateBuffer, sizeof(dateBuffer) );
 			displayDateBuffer.translate(dateBuffer);
 			return displayDateBuffer;
-		}	
+		}
 	}
 	wchar_t dateBuffer[ DATE_BUFFER_SIZE ];
 	GetDateFormatW( LOCALE_SYSTEM_DEFAULT,
@@ -240,9 +235,9 @@ UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal)
 	displayDateBuffer.set(dateBuffer);
 	return displayDateBuffer;
 	//displayDateBuffer.format( L"%ls", dateBuffer );
-}															
+}
 
-UnicodeString getUnicodeTimeBuffer(SYSTEMTIME timeVal) 
+UnicodeString getUnicodeTimeBuffer(SYSTEMTIME timeVal)
 {
 	// setup time buffer for local region time format
 	UnicodeString displayTimeBuffer;
@@ -251,7 +246,7 @@ UnicodeString getUnicodeTimeBuffer(SYSTEMTIME timeVal)
 	if (GetVersionEx(&osvi))
 	{	//check if we're running Win9x variant since they may need different characters
 		if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
-		{		
+		{
 			char timeBuffer[ DATE_BUFFER_SIZE ];
 			GetTimeFormat( LOCALE_SYSTEM_DEFAULT,
 										 TIME_NOSECONDS|TIME_FORCE24HOURFORMAT|TIME_NOTIMEMARKER,
@@ -284,7 +279,7 @@ GameState::GameState( void )
 	m_availableGames = NULL;
 	m_isInLoadGame = FALSE;
 
-}  // end GameState
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -298,10 +293,10 @@ GameState::~GameState( void )
 	// make certain that the post process list is clean
 	m_snapshotPostProcessList.clear();
 
-	// clear any available game 
+	// clear any available game
 	clearAvailableGames();
 
-}  // end ~GameState
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Init the game state subsystem */
@@ -338,7 +333,7 @@ void GameState::init( void )
 
 	m_isInLoadGame = FALSE;
 
-}  // end init
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Reset */
@@ -349,12 +344,12 @@ void GameState::reset( void )
 	// clear the post process snapshot list
 	m_snapshotPostProcessList.clear();
 
-	// clear any available game 
+	// clear any available game
 	clearAvailableGames();
 
 	m_isInLoadGame = FALSE;
 
-}  // end reset
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Clear any available games entries */
@@ -370,9 +365,9 @@ void GameState::clearAvailableGames( void )
 		delete m_availableGames;
 		m_availableGames = gameInfo;
 
-	}  // end while
+	}
 
-}  // end clearAvailableGames
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add a snapshot and block name pair to the systems used to load and save */
@@ -384,10 +379,10 @@ void GameState::addSnapshotBlock( AsciiString blockName, Snapshot *snapshot, Sna
 	if( blockName.isEmpty() || snapshot == NULL )
 	{
 
-		DEBUG_CRASH(( "addSnapshotBlock: Invalid parameters\n" ));
+		DEBUG_CRASH(( "addSnapshotBlock: Invalid parameters" ));
 		return;
 
-	}  // end if
+	}
 
 	// add to the list
 	SnapshotBlock blockInfo;
@@ -395,7 +390,7 @@ void GameState::addSnapshotBlock( AsciiString blockName, Snapshot *snapshot, Sna
 	blockInfo.blockName = blockName;
 	m_snapshotBlockList[which].push_back( blockInfo );
 
-}  // end addSnapshotBlock
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given the filename of a save file, find the highest filename number */
@@ -413,9 +408,8 @@ static void findHighFileNumber( AsciiString filename, void *userData )
 
 	// strip off the extension at the end of the filename
 	AsciiString nameOnly = filename;
-	for( size_t count = 0; count < strlen( SAVE_GAME_EXTENSION ); count++ )
-		nameOnly.removeLastChar();
-	
+	nameOnly.truncateBy( strlen( SAVE_GAME_EXTENSION ) );
+
 	// convert filename (which is only numbers) to a number
 	Int fileNumber = atoi( nameOnly.str() );
 
@@ -432,7 +426,7 @@ static void findHighFileNumber( AsciiString filename, void *userData )
 	if( fileNumber >= *highFileNumber )
 		*highFileNumber = fileNumber;
 
-}  // end findHighFileNumber
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given the save files on disk, find the "next" filename to use when saving a game */
@@ -468,8 +462,8 @@ AsciiString GameState::findNextSaveFilename( UnicodeString desc )
 	//
 	// This method has code to support two modes of finding the next filename, one of
 	// them starts with a filename of 00000000.sav and counts up the number looking for
-	// a file that doesn't exist and therefore a filename we can use (LOWEST_NUMBER).  
-	// The other method iterates all save files and returns a filename that is one larger 
+	// a file that doesn't exist and therefore a filename we can use (LOWEST_NUMBER).
+	// The other method iterates all save files and returns a filename that is one larger
 	// than the largest filename number encountered (HIGHEST_NUMBER)
 	//
 	enum FindNextFileType { LOWEST_NUMBER = 0, HIGHEST_NUMBER = 1 };
@@ -490,8 +484,8 @@ AsciiString GameState::findNextSaveFilename( UnicodeString desc )
 		AsciiString filename;
 		filename.format( "%08d%s", highFileNumber + 1, SAVE_GAME_EXTENSION );
 		return filename;
-				
-	}  // end if
+
+	}
 	else if( searchType == LOWEST_NUMBER )
 	{
 		AsciiString filename;
@@ -518,28 +512,28 @@ AsciiString GameState::findNextSaveFilename( UnicodeString desc )
 			if( i > MAX_SAVE_FILE_NUMBER )
 				return AsciiString::TheEmptyString;
 
-		}  // end while
+		}
 
-	}  // end else if
+	}
 	else
 	{
 
-		DEBUG_CRASH(( "GameState::findNextSaveFilename - Unknown file search type '%d'\n", searchType ));
+		DEBUG_CRASH(( "GameState::findNextSaveFilename - Unknown file search type '%d'", searchType ));
 		return AsciiString::TheEmptyString;
 
-	}  // end else
+	}
 #endif
 
 	// no appropriate filename could be found, return the empty string
 	return AsciiString::TheEmptyString;
 
-}  // end findNextSaveFilename
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Save the current state of the engine in a save file
 	* NOTE: filename is a *filename only* */
 // ------------------------------------------------------------------------------------------------
-SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc, 
+SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 															SaveFileType saveType, SnapshotType which )
 {
 
@@ -549,10 +543,10 @@ SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 	if( filename.isEmpty() )
 	{
 
-		DEBUG_CRASH(( "GameState::saveGame - Unable to find valid filename for save game\n" ));
+		DEBUG_CRASH(( "GameState::saveGame - Unable to find valid filename for save game" ));
 		return SC_NO_FILE_AVAILABLE;
 
-	}  // end if
+	}
 
 	// make absolutely sure the save directory exists
 	CreateDirectory( getSaveDirectory().str(), NULL );
@@ -570,7 +564,7 @@ SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 	} catch(...) {
 		// print error message to the user
 		TheInGameUI->message( "GUI:Error" );
-		DEBUG_LOG(( "Error opening file '%s'\n", filepath.str() ));
+		DEBUG_LOG(( "Error opening file '%s'", filepath.str() ));
 		return SC_ERROR;
 	}
 
@@ -595,7 +589,7 @@ SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 		// save file
 		xferSaveData( &xferSave, which );
 
-	}  // end try
+	}
 	catch( ... )
 	{
 
@@ -610,8 +604,8 @@ SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 		// close the file and get out of here
 		xferSave.close();
 		return SC_ERROR;
-		
-	}  // end catch
+
+	}
 
 	// close the file
 	xferSave.close();
@@ -622,7 +616,7 @@ SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 
 	return SC_OK;
 
-}  // end saveGame
+}
 
 // ------------------------------------------------------------------------------------------------
 /** A mission save */
@@ -642,9 +636,9 @@ SaveCode GameState::missionSave( void )
 	desc.format( format, TheGameText->fetch( campaign->m_campaignNameLabel ).str(), missionNumber );
 
 	// do an automatic mission save
-	return TheGameState->saveGame( AsciiString(""), desc, SAVE_FILE_TYPE_MISSION );
+	return saveGame( "", desc, SAVE_FILE_TYPE_MISSION );
 
-}  // end missionSave
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load the save game pointed to by filename */
@@ -663,7 +657,7 @@ SaveCode GameState::loadGame( AvailableGameInfo gameInfo )
 		if (TheGameLogic->isInGame())
 			TheGameLogic->clearGameData( FALSE );
 
-	}  // end if
+	}
 
 	//
 	// clear the save directory of any temporary "scratch pad" maps that were extracted
@@ -694,11 +688,11 @@ SaveCode GameState::loadGame( AvailableGameInfo gameInfo )
 		// load file
 		xferSaveData( &xferLoad, SNAPSHOT_SAVELOAD );
 
-	}  // end try
+	}
 	catch( ... )
 	{
 		error = TRUE;
-	}  // end catch
+	}
 
 	// close the file
 	xferLoad.close();
@@ -735,7 +729,7 @@ SaveCode GameState::loadGame( AvailableGameInfo gameInfo )
 
 		return SC_INVALID_DATA;	// you can't use a naked "throw" outside of a catch statement!
 
-	}  // end if
+	}
 
 	//
 	// when loading a mission save, we want to do as much normal loading stuff as we
@@ -758,11 +752,11 @@ SaveCode GameState::loadGame( AvailableGameInfo gameInfo )
 		gameInfo->saveFileType = SAVE_FILE_TYPE_NORMAL;
 		gameInfo->missionMapName.clear();
 
-	}  // end if
-		
+	}
+
 	return SC_OK;
 
-}  // end loadGame
+}
 
 //-------------------------------------------------------------------------------------------------
 AsciiString GameState::getSaveDirectory() const
@@ -783,7 +777,7 @@ AsciiString GameState::getFilePathInSaveDirectory(const AsciiString& leaf) const
 //-------------------------------------------------------------------------------------------------
 Bool GameState::isInSaveDirectory(const AsciiString& path) const
 {
-	return path.startsWithNoCase(getSaveDirectory());
+	return FileSystem::isPathInDirectory(path, getSaveDirectory());
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -799,7 +793,7 @@ AsciiString GameState::getMapLeafName(const AsciiString& in) const
 		// at the name only
 		//
 		++p;
-		DEBUG_ASSERTCRASH( p != NULL && *p != 0, ("GameState::xfer - Illegal map name encountered\n") );
+		DEBUG_ASSERTCRASH( p != NULL && *p != 0, ("GameState::xfer - Illegal map name encountered") );
 		return p;
 	}
 	else
@@ -853,14 +847,13 @@ static AsciiString getMapLeafAndDirName(const AsciiString& in)
 // ------------------------------------------------------------------------------------------------
 static AsciiString removeExtension(const AsciiString& in)
 {
-	char buf[1024];
-	strcpy(buf, in.str());
-	char* p = strrchr(buf, '.');
-	if (p)
+	if (const char* end = in.reverseFind('.'))
 	{
-		*p = 0;
+		const char* begin = in.str();
+		return AsciiString(begin, end - begin);
 	}
-	return AsciiString(buf);
+
+	return in;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -902,10 +895,13 @@ AsciiString GameState::realMapPathToPortableMapPath(const AsciiString& in) const
 AsciiString GameState::portableMapPathToRealMapPath(const AsciiString& in) const
 {
 	AsciiString prefix;
+	// The directory where the real map path should be contained in.
+	AsciiString containingBasePath;
 	if (in.startsWithNoCase(PORTABLE_SAVE))
 	{
 		// the save dir ends with "\\"
 		prefix = getSaveDirectory();
+		containingBasePath = prefix;
 		prefix.concat(getMapLeafName(in));
 	}
 	else if (in.startsWithNoCase(PORTABLE_MAPS))
@@ -913,6 +909,7 @@ AsciiString GameState::portableMapPathToRealMapPath(const AsciiString& in) const
 		// the map dir DOES NOT end with "\\", must add it
 		prefix = TheMapCache->getMapDir();
 		prefix.concat("\\");
+		containingBasePath = prefix;
 		prefix.concat(getMapLeafAndDirName(in));
 	}
 	else if (in.startsWithNoCase(PORTABLE_USER_MAPS))
@@ -920,15 +917,22 @@ AsciiString GameState::portableMapPathToRealMapPath(const AsciiString& in) const
 		// the map dir DOES NOT end with "\\", must add it
 		prefix = TheMapCache->getUserMapDir();
 		prefix.concat("\\");
+		containingBasePath = prefix;
 		prefix.concat(getMapLeafAndDirName(in));
 	}
 	else
 	{
 		DEBUG_CRASH(("Map file was not found in any of the expected directories; this is impossible"));
-		//throw INI_INVALID_DATA;
-		// uncaught exceptions crash us. better to just use a bad path.
-		prefix = in;
+		// Empty string represents a failure, either caused by an invalid prefix or a relative path leading outside the base path.
+		return AsciiString::TheEmptyString;
+	}
+
+	if (!FileSystem::isPathInDirectory(prefix, containingBasePath))
+	{
+		DEBUG_LOG(("Normalized file path for '%s' was outside the expected base path of '%s'.", prefix.str(), containingBasePath.str()));
+		return AsciiString::TheEmptyString;
 	}
+
 	prefix.toLower();
 	return prefix;
 }
@@ -936,7 +940,7 @@ AsciiString GameState::portableMapPathToRealMapPath(const AsciiString& in) const
 // ------------------------------------------------------------------------------------------------
 /** Does the save game file exist */
 // ------------------------------------------------------------------------------------------------
-Bool GameState::doesSaveGameExist( AsciiString filename ) 
+Bool GameState::doesSaveGameExist( AsciiString filename )
 {
 
 	// construct full path to file
@@ -950,21 +954,21 @@ Bool GameState::doesSaveGameExist( AsciiString filename )
 		// try to open it
 		xfer.open( filepath );
 
-	}  // end try
+	}
 	catch( ... )
 	{
 
 		// unable to open file, it must not be here
 		return FALSE;
 
-	}  // end catch
-	
+	}
+
 	// close the file, we don't want to to anything with it right now
 	xfer.close();
 
 	return TRUE;
 
-}  // doesSaveGameExist
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Get save game info from the filename specified */
@@ -980,10 +984,10 @@ void GameState::getSaveGameInfoFromFile( AsciiString filename, SaveGameInfo *sav
 	if( filename.isEmpty() == TRUE || saveGameInfo == NULL )
 	{
 
-		DEBUG_CRASH(( "GameState::getSaveGameInfoFromFile - Illegal parameters\n" ));
+		DEBUG_CRASH(( "GameState::getSaveGameInfoFromFile - Illegal parameters" ));
 		return;
 
-	}  // end if
+	}
 
 	// open file for partial loading
 	XferLoad xferLoad;
@@ -992,7 +996,7 @@ void GameState::getSaveGameInfoFromFile( AsciiString filename, SaveGameInfo *sav
 	//
 	// disable post processing cause we're not really doing a load of game data that
 	// needs post processing and we don't want to keep track of any snapshots we loaded
-	// 
+	//
 	xferLoad.setOptions( XO_NO_POST_PROCESSING );
 
 	// read all data blocks in the file
@@ -1007,10 +1011,10 @@ void GameState::getSaveGameInfoFromFile( AsciiString filename, SaveGameInfo *sav
 		{
 
 			// we should never get here, if we did, we didn't find block of data we needed
-			DEBUG_CRASH(( "GameState::getSaveGameInfoFromFile - Game info not found in file '%s'\n", filename.str() ));
+			DEBUG_CRASH(( "GameState::getSaveGameInfoFromFile - Game info not found in file '%s'", filename.str() ));
 			done = TRUE;
 
-		}  // end if
+		}
 		else
 		{
 
@@ -1034,23 +1038,23 @@ void GameState::getSaveGameInfoFromFile( AsciiString filename, SaveGameInfo *sav
 					// load data
 					xferLoad.xferSnapshot( &tempGameState );
 
-				}  // end try
+				}
 				catch( ... )
 				{
 
-					DEBUG_CRASH(( "GameState::getSaveGameInfoFromFile - Error loading block '%s' in file '%s'\n",
+					DEBUG_CRASH(( "GameState::getSaveGameInfoFromFile - Error loading block '%s' in file '%s'",
 												blockInfo->blockName.str(), filename.str() ));
 					throw;
 
-				}  // end catch
+				}
 
 				// data was found, copy game state info over
 				*saveGameInfo = *tempGameState.getSaveGameInfo();
-				
+
 				// we're all done with this file now
 				done = TRUE;
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1060,16 +1064,16 @@ void GameState::getSaveGameInfoFromFile( AsciiString filename, SaveGameInfo *sav
 				// end of block
 				xferLoad.endBlock();
 
-			}  // end else
+			}
 
-		}  // end else, valid data block token
+		}
 
-	}  // end while, not done
+	}
 
 	// close the file
 	xferLoad.close();
 
-}  // end getSaveGameInfoFromFile
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Create game info and add to available list */
@@ -1079,15 +1083,15 @@ static void addGameToAvailableList( AsciiString filename, void *userData )
 	AvailableGameInfo **listHead = (AvailableGameInfo **)userData;
 
 	// sanity
-	DEBUG_ASSERTCRASH( listHead != NULL, ("addGameToAvailableList - Illegal parameters\n") );
-	DEBUG_ASSERTCRASH( filename.isEmpty() == FALSE, ("addGameToAvailableList - Illegal filename\n") );
- 
+	DEBUG_ASSERTCRASH( listHead != NULL, ("addGameToAvailableList - Illegal parameters") );
+	DEBUG_ASSERTCRASH( filename.isEmpty() == FALSE, ("addGameToAvailableList - Illegal filename") );
+
 	try {
 	// get header info from this listbox
 	SaveGameInfo saveGameInfo;
 	TheGameState->getSaveGameInfoFromFile( filename, &saveGameInfo );
 
-	// allocate new info 
+	// allocate new info
 	AvailableGameInfo *newInfo = new AvailableGameInfo;
 
 	// assign data
@@ -1124,9 +1128,9 @@ static void addGameToAvailableList( AsciiString filename, void *userData )
 
 				break;
 
-			}  // end if
+			}
 
-		}  // end for
+		}
 
 		// if not inserted, put at end
 		if( curr == NULL )
@@ -1135,15 +1139,15 @@ static void addGameToAvailableList( AsciiString filename, void *userData )
 			prev->next = newInfo;
 			newInfo->prev = prev;
 
-		}  // end if
+		}
 
-	}  // end else
+	}
 	} catch(...) {
 		// Do nothing - just return.
 	}
 
 
-}  // end addGameToAvailableList
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Populate the listbox passed in with a list of the save games present on the hard drive */
@@ -1167,8 +1171,8 @@ void GameState::populateSaveGameListbox( GameWindow *listbox, SaveLoadLayoutType
 
 		index = GadgetListBoxAddEntryText( listbox, newGameText, newGameColor, -1 );
 		GadgetListBoxSetItemData( listbox, NULL, index );
-	
-	}  // end if
+
+	}
 
 	// clear the available games
 	clearAvailableGames();
@@ -1208,12 +1212,12 @@ void GameState::populateSaveGameListbox( GameWindow *listbox, SaveLoadLayoutType
 		if( displayLabel.isEmpty() == TRUE )
 		{
 			Bool exists = FALSE;
-			
+
 			displayLabel = TheGameText->fetch( saveGameInfo->mapLabel, &exists );
 			if( exists == FALSE )
 				displayLabel.format( L"%S", saveGameInfo->mapLabel.str() );
 
-		}  // end if
+		}
 
 		// pick color for text (we alternate it each game)
 		Color color;
@@ -1232,12 +1236,12 @@ void GameState::populateSaveGameListbox( GameWindow *listbox, SaveLoadLayoutType
 		// add this available game info in the user data pointer of that listbox item
 		GadgetListBoxSetItemData( listbox, info, index );
 
-	}  // end for, info
+	}
 
 	// select the top "new game" entry
 	GadgetListBoxSetSelected( listbox, 0 );
 
-}  // end pupulateSaveGameListbox
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE METHODS ////////////////////////////////////////////////////////////////////////////////
@@ -1280,7 +1284,7 @@ void GameState::iterateSaveFiles( IterateSaveFileCallback callback, void *userDa
 			// we are no longer on our first item
 			first = FALSE;
 
-		}  // end if, first
+		}
 
 		// see if this is a file, and therefore a possible save file
 		if( !(item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
@@ -1298,15 +1302,15 @@ void GameState::iterateSaveFiles( IterateSaveFileCallback callback, void *userDa
 				// call the callback
 				callback( filename, userData );
 
-			}  // end if, a save file
+			}
 
-		}  // end if
+		}
 
 		// on to the next file
 		if( FindNextFile( hFile, &item ) == 0 )
 			done = TRUE;
 
-	}  // end while
+	}
 
 	// close search resources
 	FindClose( hFile );
@@ -1314,14 +1318,14 @@ void GameState::iterateSaveFiles( IterateSaveFileCallback callback, void *userDa
 	// restore the current directory
 	SetCurrentDirectory( currentDirectory );
 
-}  // end iterateSaveFiles
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Save game to xfer or load game using xfer */
 // ------------------------------------------------------------------------------------------------
 void GameState::friend_xferSaveDataForCRC( Xfer *xfer, SnapshotType which )
 {
-	DEBUG_LOG(("GameState::friend_xferSaveDataForCRC() - SnapshotType %d\n", which));
+	DEBUG_LOG(("GameState::friend_xferSaveDataForCRC() - SnapshotType %d", which));
 	SaveGameInfo *gameInfo = getSaveGameInfo();
 	gameInfo->description.clear();
 	gameInfo->saveFileType = SAVE_FILE_TYPE_NORMAL;
@@ -1344,7 +1348,7 @@ void GameState::xferSaveData( Xfer *xfer, SnapshotType which )
 	// save or load all blocks
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
-		DEBUG_LOG(("GameState::xferSaveData() - XFER_SAVE\n"));
+		DEBUG_LOG(("GameState::xferSaveData() - XFER_SAVE"));
 
 		// save all blocks
 		AsciiString blockName;
@@ -1352,20 +1356,20 @@ void GameState::xferSaveData( Xfer *xfer, SnapshotType which )
 		SnapshotBlockListIterator it;
 		for( it = m_snapshotBlockList[which].begin(); it != m_snapshotBlockList[which].end(); ++it )
 		{
-		
+
 			// get list data
 			blockInfo = &(*it);
 
 			// get block name
 			blockName = blockInfo->blockName;
 
-			DEBUG_LOG(("Looking at block '%s'\n", blockName.str()));
+			DEBUG_LOG(("Looking at block '%s'", blockName.str()));
 
 			//
 			// for mission save files, we only save the game state block and campaign manager
 			// because anything else is not needed.
 			//
-			if( getSaveGameInfo()->saveFileType != SAVE_FILE_TYPE_MISSION || 
+			if( getSaveGameInfo()->saveFileType != SAVE_FILE_TYPE_MISSION ||
 					(blockName.compareNoCase( GAME_STATE_BLOCK_STRING ) == 0 ||
 					 blockName.compareNoCase( CAMPAIGN_BLOCK_STRING ) == 0) )
 			{
@@ -1386,28 +1390,28 @@ void GameState::xferSaveData( Xfer *xfer, SnapshotType which )
 					// end this block
 					xfer->endBlock();
 
-				}  // end try
+				}
 				catch( ... )
 				{
 
-					DEBUG_CRASH(( "Error saving block '%s' in file '%s'\n",
-												blockName.str(), xfer->getIdentifier() ));
+					DEBUG_CRASH(( "Error saving block '%s' in file '%s'",
+												blockName.str(), xfer->getIdentifier().str() ));
 					throw;
 
-				}  // end catch
+				}
 
-			}  // end if
+			}
 
-		}  // end for, all snapshots
+		}
 
 		// write an end of file token
 		AsciiString eofToken = SAVE_FILE_EOF;
 		xfer->xferAsciiString( &eofToken );
-				
-	}  // end if, save
+
+	}
 	else
 	{
-		DEBUG_LOG(("GameState::xferSaveData() - not XFER_SAVE\n"));
+		DEBUG_LOG(("GameState::xferSaveData() - not XFER_SAVE"));
 		AsciiString token;
 		Int blockSize;
 		Bool done = FALSE;
@@ -1427,7 +1431,7 @@ void GameState::xferSaveData( Xfer *xfer, SnapshotType which )
 				// all done
 				done = TRUE;
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1437,7 +1441,7 @@ void GameState::xferSaveData( Xfer *xfer, SnapshotType which )
 				{
 
 					// log the block not found
-					DEBUG_LOG(( "GameState::xferSaveData - Skipping unknown block '%s'\n", token ));
+					DEBUG_LOG(( "GameState::xferSaveData - Skipping unknown block '%s'", token.str() ));
 
 					//
 					// block was not found, this could have been a block from an older file
@@ -1449,37 +1453,37 @@ void GameState::xferSaveData( Xfer *xfer, SnapshotType which )
 					// continue with while loop reading block tokens
 					continue;
 
-				}  // end if
+				}
 
 				try
 				{
 
 					// read block start
 					blockSize = xfer->beginBlock();
-				
+
 					// parse this data
 					xfer->xferSnapshot( blockInfo->snapshot );
 
 					// read block end
 					xfer->endBlock();
 
-				}  // end try
+				}
 				catch( ... )
 				{
 
-					DEBUG_CRASH(( "Error loading block '%s' in file '%s'\n",
-												blockInfo->blockName.str(), xfer->getIdentifier() ));
+					DEBUG_CRASH(( "Error loading block '%s' in file '%s'",
+												blockInfo->blockName.str(), xfer->getIdentifier().str() ));
 					throw;
 
-				}  // end catch
+				}
 
-			}  // end else, valid data block token
+			}
 
-		}  // end while, not done
+		}
 
-	}  // end else, load
+	}
 
-}  // end xferSaveData
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add a snapshot to the post process list for later */
@@ -1491,10 +1495,10 @@ void GameState::addPostProcessSnapshot( Snapshot *snapshot )
 	if( snapshot == NULL )
 	{
 
-		DEBUG_CRASH(( "GameState::addPostProcessSnapshot - invalid parameters\n" ));
+		DEBUG_CRASH(( "GameState::addPostProcessSnapshot - invalid parameters" ));
 		return;
 
-	}  // end if
+	}
 
 /*
 	//
@@ -1510,18 +1514,18 @@ void GameState::addPostProcessSnapshot( Snapshot *snapshot )
 		if( (*it) == snapshot )
 		{
 
-			DEBUG_CRASH(( "GameState::addPostProcessSnapshot - snapshot is already in list!\n" ));
+			DEBUG_CRASH(( "GameState::addPostProcessSnapshot - snapshot is already in list!" ));
 			return;
 
-		}  // end if
+		}
 
-	}  // end for, it
+	}
 */
 
 	// add to the list
 	m_snapshotPostProcessList.push_back( snapshot );
 
-}  // end addPostProcessSnapshot
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Post process entry point after all game data has been xferd from disk */
@@ -1544,7 +1548,7 @@ void GameState::gameStatePostProcessLoad( void )
 		// do processing
 		snapshot->loadPostProcess();
 
-	}  // end for
+	}
 
 	// clear the snapshot post process list as we are now done with it
 	m_snapshotPostProcessList.clear();
@@ -1552,12 +1556,12 @@ void GameState::gameStatePostProcessLoad( void )
 	// evil... must ensure this is updated prior to the script engine running the first time.
 	ThePartitionManager->update();
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Xfer method for the game state itself 
+/** Xfer method for the game state itself
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Added save file type and mission map name (regular save vs automatic mission save) */
 // ------------------------------------------------------------------------------------------------
 void GameState::xfer( Xfer *xfer )
@@ -1581,7 +1585,7 @@ void GameState::xfer( Xfer *xfer )
 		// mission map name
 		xfer->xferAsciiString( &saveGameInfo->missionMapName );
 
-	}  // end if
+	}
 
 	// current system time
 	SYSTEMTIME systemTime;
@@ -1614,23 +1618,17 @@ void GameState::xfer( Xfer *xfer )
 		saveGameInfo->mapLabel = dict->getAsciiString( TheKey_mapName, &exists );
 
 	// if no label was found, we'll use the map name (just filename, no directory info)
-	if( exists == FALSE || saveGameInfo->mapLabel == AsciiString::TheEmptyString )
+	if (exists == FALSE || saveGameInfo->mapLabel == AsciiString::TheEmptyString)
 	{
-		char string[ _MAX_PATH ];
-
-		strcpy( string, TheGlobalData->m_mapName.str() );
-		char *p = strrchr( string, '\\' );
-		if( p == NULL )
+		const char* p = TheGlobalData->m_mapName.reverseFind('\\');
+		if (p == NULL)
 			saveGameInfo->mapLabel = TheGlobalData->m_mapName;
 		else
 		{
-
 			p++;  // skip the '\' we're on
-			saveGameInfo->mapLabel.set( p );
-
-		}  // end else
-
-	}  // end if
+			saveGameInfo->mapLabel.set(p);
+		}
+	}
 
 	// xfer map label
 	xfer->xferAsciiString( &saveGameInfo->mapLabel );
@@ -1648,8 +1646,8 @@ void GameState::xfer( Xfer *xfer )
 		saveGameInfo->missionNumber = TheCampaignManager->getCurrentMissionNumber();
 		xfer->xferInt( &saveGameInfo->missionNumber );
 
-		
-	}  // end if
+
+	}
 	else
 	{
 
@@ -1661,6 +1659,6 @@ void GameState::xfer( Xfer *xfer )
 		saveGameInfo->missionNumber = CampaignManager::INVALID_MISSION_NUMBER;
 		xfer->xferInt( &saveGameInfo->missionNumber );
 
-	}  // end else
+	}
 
-}  // end xfer
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp
index a5edd698a25..15782d54425 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp
@@ -45,11 +45,6 @@
 // GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
 GameStateMap *TheGameStateMap = NULL;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // METHODS ////////////////////////////////////////////////////////////////////////////////////////
 
@@ -58,7 +53,7 @@ GameStateMap *TheGameStateMap = NULL;
 GameStateMap::GameStateMap( void )
 {
 
-}  // end GameStateMap
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -71,27 +66,27 @@ GameStateMap::~GameStateMap( void )
 	//
 	clearScratchPadMaps();
 
-}  // end ~GameStateMap
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Embed the pristine map into the xfer stream */
 // ------------------------------------------------------------------------------------------------
 static void embedPristineMap( AsciiString map, Xfer *xfer )
 {
- 
+
 	// open the map file
 	File *file = TheFileSystem->openFile( map.str(), File::READ | File::BINARY );
 	if( file == NULL )
 	{
 
-		DEBUG_CRASH(( "embedPristineMap - Error opening source file '%s'\n", map.str() ));
+		DEBUG_CRASH(( "embedPristineMap - Error opening source file '%s'", map.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
- 
+	}
+
 	// how big is the map file
 	Int fileSize = file->seek( 0, File::END );
- 
+
 	// rewind to beginning of file
 	file->seek( 0, File::START );
 
@@ -100,33 +95,33 @@ static void embedPristineMap( AsciiString map, Xfer *xfer )
 	if( buffer == NULL )
 	{
 
-		DEBUG_CRASH(( "embedPristineMap - Unable to allocate buffer for file '%s'\n", map.str() ));
+		DEBUG_CRASH(( "embedPristineMap - Unable to allocate buffer for file '%s'", map.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
- 
+	}
+
 	// copy the file to the buffer
 	if( file->read( buffer, fileSize ) != fileSize )
 	{
 
-		DEBUG_CRASH(( "embeddPristineMap - Error reading from file '%s'\n", map.str() ));
+		DEBUG_CRASH(( "embeddPristineMap - Error reading from file '%s'", map.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
- 
+	}
+
 	// close the BIG file
 	file->close();
- 
+
 	// write the contents to the save file
-	DEBUG_ASSERTCRASH( xfer->getXferMode() == XFER_SAVE, ("embedPristineMap - Unsupposed xfer mode\n") );
+	DEBUG_ASSERTCRASH( xfer->getXferMode() == XFER_SAVE, ("embedPristineMap - Unsupposed xfer mode") );
 	xfer->beginBlock();
 	xfer->xferUser( buffer, fileSize );
 	xfer->endBlock();
 
 	// delete the buffer
 	delete [] buffer;
- 
-}  // end embedPristineMap
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Embed an "in use" map into the xfer stream.  An "in use" map is one that has already
@@ -140,10 +135,10 @@ static void embedInUseMap( AsciiString map, Xfer *xfer )
 	if( fp == NULL )
 	{
 
-		DEBUG_CRASH(( "embedInUseMap - Unable to open file '%s'\n", map.str() ));
+		DEBUG_CRASH(( "embedInUseMap - Unable to open file '%s'", map.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// how big is the file
 	fseek( fp, 0, SEEK_END );
@@ -157,19 +152,19 @@ static void embedInUseMap( AsciiString map, Xfer *xfer )
 	if( buffer == NULL )
 	{
 
-		DEBUG_CRASH(( "embedInUseMap - Unable to allocate buffer for file '%s'\n", map.str() ));
+		DEBUG_CRASH(( "embedInUseMap - Unable to allocate buffer for file '%s'", map.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// read the entire file
 	if( fread( buffer, 1, fileSize, fp ) != fileSize )
 	{
 
-		DEBUG_CRASH(( "embedInUseMap - Error reading from file '%s'\n", map.str() ));
+		DEBUG_CRASH(( "embedInUseMap - Error reading from file '%s'", map.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// embed file into xfer stream
 	xfer->beginBlock();
@@ -182,7 +177,7 @@ static void embedInUseMap( AsciiString map, Xfer *xfer )
 	// delete buffer
 	delete [] buffer;
 
-}  // embedInUseMap
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Extract the map from the xfer stream and save as a file with filename 'mapToSave' */
@@ -196,10 +191,10 @@ static void extractAndSaveMap( AsciiString mapToSave, Xfer *xfer )
 	if( fp == NULL )
 	{
 
-		DEBUG_CRASH(( "extractAndSaveMap - Unable to open file '%s'\n", mapToSave.str() ));
+		DEBUG_CRASH(( "extractAndSaveMap - Unable to open file '%s'", mapToSave.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // en
+	}
 
 	// read data size from file
 	dataSize = xfer->beginBlock();
@@ -209,10 +204,10 @@ static void extractAndSaveMap( AsciiString mapToSave, Xfer *xfer )
 	if( buffer == NULL )
 	{
 
-		DEBUG_CRASH(( "extractAndSaveMap - Unable to allocate buffer for file '%s'\n", mapToSave.str() ));
+		DEBUG_CRASH(( "extractAndSaveMap - Unable to allocate buffer for file '%s'", mapToSave.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// read map file
 	xfer->xferUser( buffer, dataSize );
@@ -221,10 +216,10 @@ static void extractAndSaveMap( AsciiString mapToSave, Xfer *xfer )
 	if( fwrite( buffer, 1, dataSize, fp ) != dataSize )
 	{
 
-		DEBUG_CRASH(( "extractAndSaveMap - Error writing to file '%s'\n", mapToSave.str() ));
+		DEBUG_CRASH(( "extractAndSaveMap - Error writing to file '%s'", mapToSave.str() ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// close the new file
 	fclose( fp );
@@ -235,7 +230,7 @@ static void extractAndSaveMap( AsciiString mapToSave, Xfer *xfer )
 	// delete the buffer
 	delete [] buffer;
 
-}  // end extractAndSaveMap
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -304,7 +299,7 @@ void GameStateMap::xfer( Xfer *xfer )
 			//
 			firstSave = TRUE;
 
-		}  // end if
+		}
 
 		// save the pristine name
 		// For cross-machine compatibility, we always write
@@ -314,14 +309,14 @@ void GameStateMap::xfer( Xfer *xfer )
 			xfer->xferAsciiString( &tmp );
 		}
 
-		if (currentVersion >= 2) 
+		if (currentVersion >= 2)
 		{
 			// save the game mode.
-			Int gameMode = TheGameLogic->getGameMode();
+			Int gameMode = (Int)TheGameLogic->getGameMode();
 			xfer->xferInt( &gameMode);
 		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -333,7 +328,7 @@ void GameStateMap::xfer( Xfer *xfer )
 
 		if (!TheGameState->isInSaveDirectory(saveGameInfo->saveGameMapName))
 		{
-			DEBUG_CRASH(("GameState::xfer - The map filename read from the file '%s' is not in the SAVE directory, but should be\n",
+			DEBUG_CRASH(("GameState::xfer - The map filename read from the file '%s' is not in the SAVE directory, but should be",
 												 saveGameInfo->saveGameMapName.str()) );
 			throw SC_INVALID_DATA;
 		}
@@ -345,15 +340,15 @@ void GameStateMap::xfer( Xfer *xfer )
 		xfer->xferAsciiString( &saveGameInfo->pristineMapName );
 		saveGameInfo->pristineMapName = TheGameState->portableMapPathToRealMapPath(saveGameInfo->pristineMapName);
 
-		if (currentVersion >= 2) 
+		if (currentVersion >= 2)
 		{
 			// get the game mode.
 			Int gameMode;
 			xfer->xferInt(&gameMode);
-			TheGameLogic->setGameMode(gameMode);
+			TheGameLogic->setGameMode((GameMode)gameMode);
 		}
 
-	}  // end else, load
+	}
 
 	// map data
 	if( xfer->getXferMode() == XFER_SAVE )
@@ -368,7 +363,7 @@ void GameStateMap::xfer( Xfer *xfer )
 
 			embedPristineMap( saveGameInfo->pristineMapName, xfer );
 
-		}  // end if, first save
+		}
 		else
 		{
 
@@ -379,9 +374,9 @@ void GameStateMap::xfer( Xfer *xfer )
 			//
 			embedInUseMap( saveGameInfo->saveGameMapName, xfer );
 
-		}  // end else
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -391,7 +386,7 @@ void GameStateMap::xfer( Xfer *xfer )
 		//
 		extractAndSaveMap( saveGameInfo->saveGameMapName, xfer );
 
-	}  // end else
+	}
 
 	//
 	// it's important that early in the load process, we xfer the object ID counter
@@ -418,24 +413,21 @@ void GameStateMap::xfer( Xfer *xfer )
 	TheGameClient->setDrawableIDCounter( highDrawableID );
 
 	// Save the Game Info so the game can be started with the correct players on load
-	if( TheGameLogic->getGameMode()==GAME_SKIRMISH ) 
+	if( TheGameLogic->getGameMode()==GAME_SKIRMISH )
 	{
-		if( TheSkirmishGameInfo==NULL ) 
+		if( TheSkirmishGameInfo==NULL )
 		{
 			TheSkirmishGameInfo = NEW SkirmishGameInfo;
-			TheSkirmishGameInfo->init();  
+			TheSkirmishGameInfo->init();
 			TheSkirmishGameInfo->clearSlotList();
 			TheSkirmishGameInfo->reset();
 		}
 		xfer->xferSnapshot(TheSkirmishGameInfo);
-	} 
-	else 
+	}
+	else
 	{
-		if( TheSkirmishGameInfo ) 
-		{
-			delete TheSkirmishGameInfo;
-			TheSkirmishGameInfo = NULL;
-		}
+		delete TheSkirmishGameInfo;
+		TheSkirmishGameInfo = NULL;
 	}
 
 	//
@@ -443,13 +435,13 @@ void GameStateMap::xfer( Xfer *xfer )
 	// things in the map file that don't don't change (terrain, triggers, teams, script
 	// definitions) etc
 	//
-	if( xfer->getXferMode() == XFER_LOAD ) 
+	if( xfer->getXferMode() == XFER_LOAD )
 	{
 		TheGameLogic->startNewGame( TRUE );
 		TheGameLogic->setLoadingSave( FALSE );
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Delete any scratch pad maps in the save directory.  Scratch pad maps are maps that
@@ -491,7 +483,7 @@ void GameStateMap::clearScratchPadMaps( void )
 			// we are no longer on our first item
 			first = FALSE;
 
-		}  // end if, first
+		}
 
 		// see if this is a file, and therefore a possible .map file
 		if( !(item.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
@@ -502,7 +494,7 @@ void GameStateMap::clearScratchPadMaps( void )
 			if( c && stricmp( c, ".map" ) == 0 )
 				fileToDelete.set( item.cFileName );  // we want to delete this one
 
-		}  // end if
+		}
 
 		//
 		// find the next file before we delete this one, this is probably not necessary
@@ -516,7 +508,7 @@ void GameStateMap::clearScratchPadMaps( void )
 		if( fileToDelete.isEmpty() == FALSE )
 			DeleteFile( fileToDelete.str() );
 
-	}  // end while
+	}
 
 	// close search resources
 	FindClose( hFile );
@@ -524,4 +516,4 @@ void GameStateMap::clearScratchPadMaps( void )
 	// restore our directory to the current directory
 	SetCurrentDirectory( currentDirectory );
 
-}  // end clearScratchPadMaps
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Snapshot.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Snapshot.cpp
index 30f9750b251..4fd346804e0 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/Snapshot.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Snapshot.cpp
@@ -28,7 +28,7 @@
 //				 be considered during game saves, loads, and CRC checks.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameState.h"
 #include "Common/Snapshot.h"
 
@@ -37,7 +37,7 @@
 Snapshot::Snapshot( void )
 {
 
-}  // end Snapshot
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -53,4 +53,4 @@ Snapshot::~Snapshot( void )
 	//
 //	TheGameState->notifySnapshotDeleted();
 
-}  // end ~Snapshot
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp
index a0ed36025fd..b6a48d47376 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp
@@ -22,21 +22,21 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(IG_DEBUG_STACKTRACE)
+#if defined(RTS_DEBUG) || defined(IG_DEBUG_STACKTRACE)
 
 #pragma pack(push, 8)
 
 #include "Common/StackDump.h"
 #include "Common/Debug.h"
 
+#include "DbgHelpLoader.h"
 
 //*****************************************************************************
 //	Prototypes
 //*****************************************************************************
 BOOL InitSymbolInfo(void);
-void UninitSymbolInfo(void);
 void MakeStackTrace(DWORD myeip,DWORD myesp,DWORD myebp, int skipFrames, void (*callback)(const char*));
 void GetFunctionDetails(void *pointer, char*name, char*filename, unsigned int* linenumber, unsigned int* address);
 void WriteStackLine(void*address, void (*callback)(const char*));
@@ -45,14 +45,6 @@ void WriteStackLine(void*address, void (*callback)(const char*));
 //	Mis-named globals :-)
 //*****************************************************************************
 static CONTEXT gsContext;
-static Bool gsInit=FALSE;
-
-BOOL (__stdcall *gsSymGetLineFromAddr)(
-		IN  HANDLE                  hProcess,
-		IN  DWORD                   dwAddr,
-		OUT PDWORD                  pdwDisplacement,
-		OUT PIMAGEHLP_LINE          Line
-			);
 
 
 //*****************************************************************************
@@ -67,12 +59,13 @@ void StackDumpDefaultHandler(const char*line)
 //*****************************************************************************
 void StackDump(void (*callback)(const char*))
 {
-	if (callback == NULL) 
+	if (callback == NULL)
 	{
 		callback = StackDumpDefaultHandler;
 	}
 
-	InitSymbolInfo();
+	if (!InitSymbolInfo())
+		return;
 
 	DWORD myeip,myesp,myebp;
 
@@ -96,12 +89,13 @@ _asm
 //*****************************************************************************
 void StackDumpFromContext(DWORD eip,DWORD esp,DWORD ebp, void (*callback)(const char*))
 {
-	if (callback == NULL) 
+	if (callback == NULL)
 	{
 		callback = StackDumpDefaultHandler;
 	}
 
-	InitSymbolInfo();
+	if (!InitSymbolInfo())
+		return;
 
 	MakeStackTrace(eip,esp,ebp, 0,  callback);
 }
@@ -111,27 +105,24 @@ void StackDumpFromContext(DWORD eip,DWORD esp,DWORD ebp, void (*callback)(const
 //*****************************************************************************
 BOOL InitSymbolInfo()
 {
-	if (gsInit == TRUE) 
+	if (DbgHelpLoader::isLoaded())
 		return TRUE;
 
-	gsInit = TRUE;
-
-	atexit(UninitSymbolInfo);
-
-	// See if we have the line from address function
-	// We use GetProcAddress to stop link failures at dll loadup
-	HINSTANCE hInstDebugHlp = GetModuleHandle("dbghelp.dll");
+	if (DbgHelpLoader::isFailed())
+		return FALSE;
 
-	gsSymGetLineFromAddr = (BOOL (__stdcall *)(	IN  HANDLE,IN  DWORD,OUT PDWORD,OUT PIMAGEHLP_LINE))
-							GetProcAddress(hInstDebugHlp , "SymGetLineFromAddr");
+	if (!DbgHelpLoader::load())
+	{
+		atexit(DbgHelpLoader::unload);
+		return FALSE;
+	}
 
 	char pathname[_MAX_PATH+1];
 	char drive[10];
 	char directory[_MAX_PATH+1];
 	HANDLE process;
 
-
-	::SymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_UNDNAME | SYMOPT_LOAD_LINES | SYMOPT_OMAP_FIND_NEAREST);
+	DbgHelpLoader::symSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_UNDNAME | SYMOPT_LOAD_LINES | SYMOPT_OMAP_FIND_NEAREST);
 
 	process = GetCurrentProcess();
 
@@ -145,38 +136,23 @@ BOOL InitSymbolInfo()
 	// append the current directory to build a search path for SymInit
 	::lstrcat(pathname, ";.;");
 
-	if(::SymInitialize(process, pathname, FALSE))
+	if(DbgHelpLoader::symInitialize(process, pathname, FALSE))
 	{
 		// regenerate the name of the app
 		::GetModuleFileName(NULL, pathname, _MAX_PATH);
-		if(::SymLoadModule(process, NULL, pathname, NULL, 0, 0))
+		if(DbgHelpLoader::symLoadModule(process, NULL, pathname, NULL, 0, 0))
 		{
 				//Load any other relevant modules (ie dlls) here
+				atexit(DbgHelpLoader::unload);
 				return TRUE;
 		}
-		::SymCleanup(process);
-	}
-
-	return(FALSE);
-}
-
-
-//*****************************************************************************
-//*****************************************************************************
-void UninitSymbolInfo(void)
-{
-	if (gsInit == FALSE)
-	{
-		return;
 	}
 
-	gsInit = FALSE;
-
-	::SymCleanup(GetCurrentProcess());
+	DbgHelpLoader::unload();
+	return FALSE;
 }
 
 
-
 //*****************************************************************************
 //*****************************************************************************
 void MakeStackTrace(DWORD myeip,DWORD myesp,DWORD myebp, int skipFrames, void (*callback)(const char*))
@@ -217,14 +193,14 @@ stack_frame.AddrFrame.Offset = myebp;
 			unsigned int skip = skipFrames;
 			while (b_ret&&skip)
 			{
-					b_ret = StackWalk(      IMAGE_FILE_MACHINE_I386,
+					b_ret = DbgHelpLoader::stackWalk(      IMAGE_FILE_MACHINE_I386,
 											process,
 											thread,
 											&stack_frame,
 											NULL, //&gsContext,
 											NULL,
-											SymFunctionTableAccess,
-											SymGetModuleBase,
+											DbgHelpLoader::symFunctionTableAccess,
+											DbgHelpLoader::symGetModuleBase,
 											NULL);
 					skip--;
 			}
@@ -233,18 +209,18 @@ stack_frame.AddrFrame.Offset = myebp;
 			while(b_ret&&skip)
 			{
 
-					b_ret = StackWalk(      IMAGE_FILE_MACHINE_I386,
+					b_ret = DbgHelpLoader::stackWalk(      IMAGE_FILE_MACHINE_I386,
 											process,
 											thread,
 											&stack_frame,
 											NULL, //&gsContext,
 											NULL,
-											SymFunctionTableAccess,
-											SymGetModuleBase,
+											DbgHelpLoader::symFunctionTableAccess,
+											DbgHelpLoader::symGetModuleBase,
 											NULL);
-					
 
-					
+
+
 					if (b_ret) WriteStackLine((void *) stack_frame.AddrPC.Offset, callback);
 					skip--;
 			}
@@ -256,7 +232,9 @@ stack_frame.AddrFrame.Offset = myebp;
 //*****************************************************************************
 void GetFunctionDetails(void *pointer, char*name, char*filename, unsigned int* linenumber, unsigned int* address)
 {
-	InitSymbolInfo();
+	if (!InitSymbolInfo())
+		return;
+
 	if (name)
 	{
 		strcpy(name, "<Unknown>");
@@ -285,8 +263,8 @@ void GetFunctionDetails(void *pointer, char*name, char*filename, unsigned int* l
     psymbol->SizeOfStruct = sizeof(symbol_buffer);
     psymbol->MaxNameLength = 512;
 
-    if (SymGetSymFromAddr(process, (DWORD) pointer, &displacement, psymbol))
-    {
+	if (DbgHelpLoader::symGetSymFromAddr(process, (DWORD) pointer, &displacement, psymbol))
+	{
 		if (name)
 		{
 			strcpy(name, psymbol->Name);
@@ -294,32 +272,27 @@ void GetFunctionDetails(void *pointer, char*name, char*filename, unsigned int* l
 		}
 
 		// Get line now
-		if (gsSymGetLineFromAddr)
-		{
-			// Unsupported for win95/98 at least with my current dbghelp.dll
 
-			IMAGEHLP_LINE line;
-			memset(&line,0,sizeof(line));
-			line.SizeOfStruct = sizeof(line);
+		IMAGEHLP_LINE line;
+		memset(&line,0,sizeof(line));
+		line.SizeOfStruct = sizeof(line);
 
-		
-			if (gsSymGetLineFromAddr(process, (DWORD) pointer, &displacement, &line))
+		if (DbgHelpLoader::symGetLineFromAddr(process, (DWORD) pointer, &displacement, &line))
+		{
+			if (filename)
+			{
+				strcpy(filename, line.FileName);
+			}
+			if (linenumber)
 			{
-				if (filename)
-				{
-					strcpy(filename, line.FileName);
-				}
-				if (linenumber)
-				{
-					*linenumber = (unsigned int)line.LineNumber;
-				}
-				if (address)
-				{
-					*address = (unsigned int)line.Address;
-				}
-			} 					
+				*linenumber = (unsigned int)line.LineNumber;
+			}
+			if (address)
+			{
+				*address = (unsigned int)line.Address;
+			}
 		}
-    }
+	}
 }
 
 
@@ -328,11 +301,12 @@ void GetFunctionDetails(void *pointer, char*name, char*filename, unsigned int* l
 //*****************************************************************************
 void FillStackAddresses(void**addresses, unsigned int count, unsigned int skip)
 {
-	InitSymbolInfo();
+	if (!InitSymbolInfo())
+		return;
 
 	STACKFRAME	stack_frame;
 
-	
+
 	HANDLE thread = GetCurrentThread();
 	HANDLE process = GetCurrentProcess();
 
@@ -378,32 +352,32 @@ stack_frame.AddrFrame.Offset = myebp;
 		// Skip some?
 		while (stillgoing&&skip)
 		{
-			stillgoing = StackWalk(IMAGE_FILE_MACHINE_I386,
+			stillgoing = DbgHelpLoader::stackWalk(IMAGE_FILE_MACHINE_I386,
 								process,
 								thread,
 								&stack_frame,
 								NULL,	//&gsContext,
 								NULL,
-								SymFunctionTableAccess,
-								SymGetModuleBase,
+								DbgHelpLoader::symFunctionTableAccess,
+								DbgHelpLoader::symGetModuleBase,
 								NULL) != 0;
 			skip--;
 		}
 
 		while(stillgoing&&count)
 		{
-			stillgoing = StackWalk(IMAGE_FILE_MACHINE_I386,
+			stillgoing = DbgHelpLoader::stackWalk(IMAGE_FILE_MACHINE_I386,
 								process,
 								thread,
 								&stack_frame,
 								NULL, //&gsContext,
 								NULL,
-								SymFunctionTableAccess,
-								SymGetModuleBase,
+								DbgHelpLoader::symFunctionTableAccess,
+								DbgHelpLoader::symGetModuleBase,
 								NULL) != 0;
 			if (stillgoing)
 			{
-				*addresses  = (void*)stack_frame.AddrPC.Offset;				
+				*addresses  = (void*)stack_frame.AddrPC.Offset;
 				addresses++;
 				count--;
 			}
@@ -423,7 +397,7 @@ stack_frame.AddrFrame.Offset = myebp;
 	{
 		memset(addresses,NULL,count*sizeof(void*));
 	}
-*/	
+*/
 }
 
 
@@ -433,18 +407,19 @@ stack_frame.AddrFrame.Offset = myebp;
 //*****************************************************************************
 void StackDumpFromAddresses(void**addresses, unsigned int count, void (*callback)(const char *))
 {
-	if (callback == NULL) 
+	if (callback == NULL)
 	{
 		callback = StackDumpDefaultHandler;
 	}
 
-	InitSymbolInfo();
+	if (!InitSymbolInfo())
+		return;
 
 	while ((count--) && (*addresses!=NULL))
 	{
-		WriteStackLine(*addresses,callback);	
+		WriteStackLine(*addresses,callback);
 		addresses++;
-	}	
+	}
 }
 
 
@@ -466,7 +441,6 @@ void WriteStackLine(void*address, void (*callback)(const char*))
 			g_LastErrorDump.concat("\n");
 		}
 	callback(line);
-	callback("\n");
 }
 
 
@@ -474,11 +448,12 @@ void WriteStackLine(void*address, void (*callback)(const char*))
 //*****************************************************************************
 void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info )
 {
-   DEBUG_LOG(( "\n********** EXCEPTION DUMP ****************\n" ));
+	DEBUG_LOG_RAW(("\n"));
+	DEBUG_LOG(( "********** EXCEPTION DUMP ****************" ));
 	/*
 	** List of possible exceptions
 	*/
-	 g_LastErrorDump.clear(); 
+	 g_LastErrorDump.clear();
 
 	static const unsigned int _codes[] = {
 		EXCEPTION_ACCESS_VIOLATION,
@@ -531,30 +506,30 @@ void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info )
 		"Error code: ?????\nDescription: Unknown exception."
 	};
 
-	DEBUG_LOG( ("Dump exception info\n") );
+	DEBUG_LOG( ("Dump exception info") );
 	CONTEXT *context = e_info->ContextRecord;
 	/*
 	** The following are set for access violation only
 	*/
 	int access_read_write=-1;
 	unsigned long access_address = 0;
-	AsciiString msg; 
+	AsciiString msg;
 
 // DOUBLE_DEBUG does a DEBUG_LOG, and concats to g_LastErrorDump.  jba.
 #define DOUBLE_DEBUG(x) { msg.format x; g_LastErrorDump.concat(msg); DEBUG_LOG( x ); }
 
 	if ( e_info->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION )
 	{
-		DOUBLE_DEBUG (("Exception is access violation\n"));
+		DOUBLE_DEBUG (("Exception is access violation"));
 		access_read_write = e_info->ExceptionRecord->ExceptionInformation[0];  // 0=read, 1=write
 		access_address = e_info->ExceptionRecord->ExceptionInformation[1];
 	}
 	else
 	{
-		DOUBLE_DEBUG (("Exception code is %x\n", e_info->ExceptionRecord->ExceptionCode));
+		DOUBLE_DEBUG (("Exception code is %x", e_info->ExceptionRecord->ExceptionCode));
 	}
 	Int *winMainAddr = (Int *)WinMain;
-	DOUBLE_DEBUG(("WinMain at %x\n", winMainAddr));
+	DOUBLE_DEBUG(("WinMain at %x", winMainAddr));
 	/*
 	** Match the exception type with the error string and print it out
 	*/
@@ -563,46 +538,46 @@ void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info )
 	{
 		if ( _codes[i] == e_info->ExceptionRecord->ExceptionCode )
 		{
-			DEBUG_LOG ( ("Found exception description\n") );
+			DEBUG_LOG ( ("Found exception description") );
 			break;
 		}
 	}
-	DOUBLE_DEBUG( ("%s\n", _code_txt[i]));
+	DOUBLE_DEBUG( ("%s", _code_txt[i]));
 	/** For access violations, print out the violation address and if it was read or write.
 	*/
 	if ( e_info->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION )
 	{
 		if ( access_read_write )
 		{
-			DOUBLE_DEBUG( ("Access address:%08X was written to.\n", access_address));
+			DOUBLE_DEBUG( ("Access address:%08X was written to.", access_address));
 		}
 		else
 		{
-			DOUBLE_DEBUG( ("Access address:%08X was read from.\n", access_address));
+			DOUBLE_DEBUG( ("Access address:%08X was read from.", access_address));
 		}
 	}
 
-	DOUBLE_DEBUG (("\nStack Dump:\n"));
+	DOUBLE_DEBUG (("\nStack Dump:"));
 	StackDumpFromContext(context->Eip, context->Esp, context->Ebp, NULL);
 
-	DOUBLE_DEBUG (("\nDetails:\n"));
+	DOUBLE_DEBUG (("\nDetails:"));
 
-	DOUBLE_DEBUG (("Register dump...\n"));
+	DOUBLE_DEBUG (("Register dump..."));
 
 	/*
 	** Dump the registers.
 	*/
-	DOUBLE_DEBUG ( ( "Eip:%08X\tEsp:%08X\tEbp:%08X\n", context->Eip, context->Esp, context->Ebp));
-	DOUBLE_DEBUG ( ( "Eax:%08X\tEbx:%08X\tEcx:%08X\n", context->Eax, context->Ebx, context->Ecx));
-	DOUBLE_DEBUG ( ( "Edx:%08X\tEsi:%08X\tEdi:%08X\n", context->Edx, context->Esi, context->Edi));
-	DOUBLE_DEBUG ( ( "EFlags:%08X \n", context->EFlags));
-	DOUBLE_DEBUG ( ( "CS:%04x  SS:%04x  DS:%04x  ES:%04x  FS:%04x  GS:%04x\n", context->SegCs, context->SegSs, context->SegDs, context->SegEs, context->SegFs, context->SegGs));
+	DOUBLE_DEBUG ( ( "Eip:%08X\tEsp:%08X\tEbp:%08X", context->Eip, context->Esp, context->Ebp));
+	DOUBLE_DEBUG ( ( "Eax:%08X\tEbx:%08X\tEcx:%08X", context->Eax, context->Ebx, context->Ecx));
+	DOUBLE_DEBUG ( ( "Edx:%08X\tEsi:%08X\tEdi:%08X", context->Edx, context->Esi, context->Edi));
+	DOUBLE_DEBUG ( ( "EFlags:%08X ", context->EFlags));
+	DOUBLE_DEBUG ( ( "CS:%04x  SS:%04x  DS:%04x  ES:%04x  FS:%04x  GS:%04x", context->SegCs, context->SegSs, context->SegDs, context->SegEs, context->SegFs, context->SegGs));
 
 	/*
 	** Dump the bytes at EIP. This will make it easier to match the crash address with later versions of the game.
 	*/
 	char scrap[512];
-	DOUBLE_DEBUG ( ("EIP bytes dump...\n"));
+	DOUBLE_DEBUG ( ("EIP bytes dump..."));
 	wsprintf (scrap, "\nBytes at CS:EIP (%08X)  : ", context->Eip);
 
 	unsigned char *eip_ptr = (unsigned char *) (context->Eip);
@@ -617,15 +592,15 @@ void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info )
 		else
 		{
 			sprintf (bytestr, "%02X ", *eip_ptr);
-			strcat (scrap, bytestr);
+			strlcat(scrap, bytestr, ARRAY_SIZE(scrap));
 		}
 		eip_ptr++;
 	}
 
-	strcat (scrap, "\n");
 	DOUBLE_DEBUG ( ( (scrap)));
-  DEBUG_LOG(( "********** END EXCEPTION DUMP ****************\n\n" ));
-}																									 
+	DEBUG_LOG(( "********** END EXCEPTION DUMP ****************" ));
+	DEBUG_LOG_RAW(("\n"));
+}
 
 
 #pragma pack(pop)
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/StreamingArchiveFile.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/StreamingArchiveFile.cpp
deleted file mode 100644
index 4a5c08e16c9..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/StreamingArchiveFile.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   RTS
-//
-// Module:    IO
-//
-// File name: StreamingArchiveFile.cpp
-//
-// Created:   12/06/02
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <io.h>
-#include <string.h>
-#include <sys/stat.h>
-
-#include "Common/AsciiString.h"
-#include "Common/FileSystem.h"
-#include "Common/StreamingArchiveFile.h"
-#include "Common/PerfTimer.h"
-									
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-//=================================================================
-// StreamingArchiveFile::StreamingArchiveFile
-//=================================================================
-
-StreamingArchiveFile::StreamingArchiveFile()
-: m_file(NULL), 
-	m_startingPos(0), 
-	m_size(0), 
-	m_curPos(0)
-{
-
-}
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//=================================================================
-// StreamingArchiveFile::~StreamingArchiveFile	
-//=================================================================
-
-StreamingArchiveFile::~StreamingArchiveFile()
-{
-	File::close();
-}
-
-//=================================================================
-// StreamingArchiveFile::open	
-//=================================================================
-/**
-  *	This function opens a file using the standard C open() call. Access flags
-	* are mapped to the appropriate open flags. Returns true if file was opened
-	* successfully.
-	*/
-//=================================================================
-
-//DECLARE_PERF_TIMER(StreamingArchiveFile)
-Bool StreamingArchiveFile::open( const Char *filename, Int access )
-{
-	//USE_PERF_TIMER(StreamingArchiveFile)
-	File *file = TheFileSystem->openFile( filename, access );
-
-	if ( file == NULL )
-	{
-		return FALSE;
-	}	
-
-	return (open( file ) != NULL);
-}
-
-//============================================================================
-// StreamingArchiveFile::open
-//============================================================================
-
-Bool StreamingArchiveFile::open( File *file )
-{
-	return TRUE;
-}
-
-//============================================================================
-// StreamingArchiveFile::openFromArchive
-//============================================================================
-Bool StreamingArchiveFile::openFromArchive(File *archiveFile, const AsciiString& filename, Int offset, Int size) 
-{
-	//USE_PERF_TIMER(StreamingArchiveFile)
-	if (archiveFile == NULL) {
-		return FALSE;
-	}
-
-	if (File::open(filename.str(), File::READ | File::BINARY | File::STREAMING) == FALSE) {
-		return FALSE;
-	}
-
-	m_file = archiveFile;
-	m_startingPos = offset;
-	m_size = size;
-	m_curPos = 0;
-
-	if (m_file->seek(offset, File::START) != offset) {
-		return FALSE;
-	}
-	
-	if (m_file->seek(size) != m_startingPos + size) {
-		return FALSE;
-	}
-
-	// We know this will succeed.
-	m_file->seek(offset, File::START);
-
-	m_nameStr = filename;
-
-	return TRUE;
-}
-
-//=================================================================
-// StreamingArchiveFile::close 	
-//=================================================================
-/**
-	* Closes the current file if it is open.
-  * Must call StreamingArchiveFile::close() for each successful StreamingArchiveFile::open() call.
-	*/
-//=================================================================
-
-void StreamingArchiveFile::close( void )
-{
-	File::close();
-}
-
-//=================================================================
-// StreamingArchiveFile::read 
-//=================================================================
-// if buffer is null, just advance the current position by 'bytes'
-Int StreamingArchiveFile::read( void *buffer, Int bytes )
-{
-	if (!m_file) {
-		return 0;
-	}
-
-	// There shouldn't be a way that this can fail, because we've already verified that the file 
-	// contains at least this many bits.
-	m_file->seek(m_startingPos + m_curPos, File::START);
-
-	if (bytes + m_curPos > m_size) 
-		bytes = m_size - m_curPos;
-
-	Int bytesRead = m_file->read(buffer, bytes);
-
-	m_curPos += bytesRead;
-
-	return bytesRead;
-}
-
-//=================================================================
-// StreamingArchiveFile::write 
-//=================================================================
-
-Int StreamingArchiveFile::write( const void *buffer, Int bytes )
-{
-	DEBUG_CRASH(("Cannot write to streaming files.\n"));
-	return -1;
-}
-
-//=================================================================
-// StreamingArchiveFile::seek 
-//=================================================================
-
-Int StreamingArchiveFile::seek( Int pos, seekMode mode)
-{
-	Int newPos;
-
-	switch( mode )
-	{
-		case START:
-			newPos = pos;
-			break;
-		case CURRENT:
-			newPos = m_curPos + pos;
-			break;
-		case END:
-			DEBUG_ASSERTCRASH(pos <= 0, ("StreamingArchiveFile::seek - position should be <= 0 for a seek starting from the end."));
-			newPos = m_size + pos;
-			break;
-		default:
-			// bad seek mode
-			return -1;
-	}
-
-	if ( newPos < 0 )
-	{
-		newPos = 0;
-	}
-	else if ( newPos > m_size )
-	{
-		newPos = m_size;
-	}
-
-	m_curPos = newPos;
-
-	return m_curPos;
-
-}
-
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp
index ad6b39ea2ef..b35a88420c6 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp
@@ -22,18 +22,13 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: SubsystemInterface.cpp 
+// FILE: SubsystemInterface.cpp
 // ----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/SubsystemInterface.h"
 #include "Common/Xfer.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #ifdef DUMP_PERF_STATS
 #include "GameLogic/GameLogic.h"
@@ -68,7 +63,7 @@ SubsystemInterface::~SubsystemInterface()
 
 #ifdef DUMP_PERF_STATS
 static const Real MIN_TIME_THRESHOLD = 0.0002f; // .2 msec. [8/13/2003]
-void SubsystemInterface::UPDATE(void) 
+void SubsystemInterface::UPDATE(void)
 {
 	__int64 startTime64;
 	__int64 endTime64,freq64;
@@ -84,7 +79,7 @@ void SubsystemInterface::UPDATE(void)
 		m_dumpUpdate = true;
 	}
 	if (m_curUpdateTime > MIN_TIME_THRESHOLD/10.0f) {
-		//DLOG(Debug::Format("Subsys %s total time %.2f, subTime %.2f, net time %.2f\n", 
+		//DLOG(Debug::Format("Subsys %s total time %.2f, subTime %.2f, net time %.2f\n",
 		//	m_name.str(), m_curUpdateTime*1000, subTime*1000, (m_curUpdateTime-subTime)*1000	));
 
 		m_curUpdateTime -= subTime;
@@ -93,8 +88,8 @@ void SubsystemInterface::UPDATE(void)
 		m_curUpdateTime = 0;
 	}
 
-}																
-void SubsystemInterface::DRAW(void) 
+}
+void SubsystemInterface::DRAW(void)
 {
 	__int64 startTime64;
 	__int64 endTime64,freq64;
@@ -110,7 +105,7 @@ void SubsystemInterface::DRAW(void)
 		m_dumpDraw = true;
 	}
 	if (m_curDrawTime > MIN_TIME_THRESHOLD/10.0f) {
-		//DLOG(Debug::Format("Subsys %s total time %.2f, subTime %.2f, net time %.2f\n", 
+		//DLOG(Debug::Format("Subsys %s total time %.2f, subTime %.2f, net time %.2f\n",
 		//	m_name.str(), m_curUpdateTime*1000, subTime*1000, (m_curUpdateTime-subTime)*1000	));
 
 		m_curDrawTime -= subTime;
@@ -147,7 +142,7 @@ void SubsystemInterfaceList::removeSubsystem(SubsystemInterface* sys)
 {
 #ifdef DUMP_PERF_STATS
 	for (SubsystemList::iterator it = m_allSubsystems.begin(); it != m_allSubsystems.end(); ++it)
-	{	 
+	{
 		if ( (*it) == sys) {
 			m_allSubsystems.erase(it);
 			break;
@@ -156,18 +151,16 @@ void SubsystemInterfaceList::removeSubsystem(SubsystemInterface* sys)
 #endif
 }
 //-----------------------------------------------------------------------------
-void SubsystemInterfaceList::initSubsystem(SubsystemInterface* sys, const char* path1, const char* path2, const char* dirpath, Xfer *pXfer, AsciiString name)
+void SubsystemInterfaceList::initSubsystem(SubsystemInterface* sys, const char* path1, const char* path2, Xfer *pXfer, AsciiString name)
 {
 	sys->setName(name);
 	sys->init();
 
 	INI ini;
 	if (path1)
-		ini.load(path1, INI_LOAD_OVERWRITE, pXfer );
+		ini.loadFileDirectory(path1, INI_LOAD_OVERWRITE, pXfer );
 	if (path2)
-		ini.load(path2, INI_LOAD_OVERWRITE, pXfer );
-	if (dirpath)
-		ini.loadDirectory(dirpath, TRUE, INI_LOAD_OVERWRITE, pXfer );
+		ini.loadFileDirectory(path2, INI_LOAD_OVERWRITE, pXfer );
 
 	m_subsystems.push_back(sys);
 }
@@ -210,7 +203,7 @@ AsciiString SubsystemInterfaceList::dumpTimesForAll()
 
 	AsciiString buffer;
 	buffer = "ALL SUBSYSTEMS:\n";
-	//buffer.format("\nSUBSYSTEMS: total time %.2f MS\n", 
+	//buffer.format("\nSUBSYSTEMS: total time %.2f MS\n",
 	//	SubsystemInterface::getTotalTime()*1000.0f);
 	Real misc = 0;
 	Real total = 0;
@@ -240,4 +233,4 @@ AsciiString SubsystemInterfaceList::dumpTimesForAll()
 	buffer.concat(tmp);
 	return buffer;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Trig.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Trig.cpp
index e0718c419b5..a742f4f7350 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/Trig.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Trig.cpp
@@ -72,7 +72,6 @@ Real ASin(Real x)
 }
 
 #ifdef REGENERATE_TRIG_TABLES
-#include <stdio.h>
 void initTrig( void )
 {
 	static Byte inited = FALSE;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp
deleted file mode 100644
index 61d624031f6..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: UnicodeString.cpp 
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  UnicodeString.cpp
-//
-// Created:    Steven Johnson, October 2001
-//
-// Desc:       General-purpose string classes
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/CriticalSection.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// -----------------------------------------------------
-
-/*static*/ UnicodeString UnicodeString::TheEmptyString;
-
-// -----------------------------------------------------
-#ifdef RTS_DEBUG
-void UnicodeString::validate() const
-{
-	if (!m_data) return;
-	DEBUG_ASSERTCRASH(m_data->m_refCount > 0, ("m_refCount is zero"));
-	DEBUG_ASSERTCRASH(m_data->m_numCharsAllocated > 0, ("m_numCharsAllocated is zero"));
-	DEBUG_ASSERTCRASH(wcslen(m_data->peek())+1 <= m_data->m_numCharsAllocated,("str is too long for storage"));
-}
-#endif
-
-// -----------------------------------------------------
-UnicodeString::UnicodeString(const UnicodeString& stringSrc) : m_data(stringSrc.m_data)
-{
-	ScopedCriticalSection scopedCriticalSection(TheUnicodeStringCriticalSection);
-	if (m_data)
-		++m_data->m_refCount;
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData, const WideChar* strToCopy, const WideChar* strToCat)
-{
-	validate();
-
-	if (m_data &&
-			m_data->m_refCount == 1 &&
-			m_data->m_numCharsAllocated >= numCharsNeeded)
-	{
-		// no buffer manhandling is needed (it's already large enough, and unique to us)
-		if (strToCopy)
-			// TheSuperHackers @fix Mauller 04/04/2025 Replace wcscpy with safer memmove as memory regions can overlap when part of string is copied to itself
-			memmove(m_data->peek(), strToCopy, (wcslen(strToCopy) + 1) * sizeof(WideChar));
-		if (strToCat)
-			wcscat(m_data->peek(), strToCat);
-		return;
-	}
-
-	DEBUG_ASSERTCRASH(numCharsNeeded <= MAX_LEN, ("UnicodeString::ensureUniqueBufferOfSize exceeds max string length %d with requested length %d", MAX_LEN, numCharsNeeded));
-	int minBytes = sizeof(UnicodeStringData) + numCharsNeeded*sizeof(WideChar);
-	int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
-	UnicodeStringData* newData = (UnicodeStringData*)TheDynamicMemoryAllocator->allocateBytesDoNotZero(actualBytes, "STR_UnicodeString::ensureUniqueBufferOfSize");
-	newData->m_refCount = 1;
-	newData->m_numCharsAllocated = (actualBytes - sizeof(UnicodeStringData))/sizeof(WideChar);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	newData->m_debugptr = newData->peek();	// just makes it easier to read in the debugger
-#endif
-
-	if (m_data && preserveData)
-		wcscpy(newData->peek(), m_data->peek());
-	else
-		newData->peek()[0] = 0;
-
-	// do these BEFORE releasing the old buffer, so that self-copies
-	// or self-cats will work correctly.
-	if (strToCopy)
-		wcscpy(newData->peek(), strToCopy);
-	if (strToCat)
-		wcscat(newData->peek(), strToCat);
-
-	releaseBuffer();
-	m_data = newData;
-
-	validate();
-}
-
-
-// -----------------------------------------------------
-void UnicodeString::releaseBuffer()
-{
-	ScopedCriticalSection scopedCriticalSection(TheUnicodeStringCriticalSection);
-
-	validate();
-	if (m_data)
-	{
-		if (--m_data->m_refCount == 0)
-		{
-			TheDynamicMemoryAllocator->freeBytes(m_data);
-		}
-		m_data = 0;
-	}
-}
-
-// -----------------------------------------------------
-UnicodeString::UnicodeString(const WideChar* s) : m_data(0)
-{
-	int len = wcslen(s);
-	if (len)
-	{
-		ensureUniqueBufferOfSize(len + 1, false, s, NULL);
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::set(const UnicodeString& stringSrc)
-{
-	ScopedCriticalSection scopedCriticalSection(TheUnicodeStringCriticalSection);
-
-	validate();
-	if (&stringSrc != this)
-	{
-		releaseBuffer();
-		m_data = stringSrc.m_data;
-		if (m_data)
-			++m_data->m_refCount;
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::set(const WideChar* s)
-{
-	validate();
-	if (!m_data || s != peek())
-	{
-		int len = s ? wcslen(s) : 0;
-		if (len)
-		{
-			ensureUniqueBufferOfSize(len + 1, false, s, NULL);
-		}
-		else
-		{
-			releaseBuffer();
-		}
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-WideChar* UnicodeString::getBufferForRead(Int len)
-{
-	validate();
-	DEBUG_ASSERTCRASH(len>0, ("No need to allocate 0 len strings."));
-	ensureUniqueBufferOfSize(len + 1, false, NULL, NULL);
-	validate();
-	return peek();
-}
-
-// -----------------------------------------------------
-void UnicodeString::translate(const AsciiString& stringSrc)
-{
-	validate();
-	/// @todo srj put in a real translation here; this will only work for 7-bit ascii
-	clear();
-	Int len = stringSrc.getLength();
-	for (Int i = 0; i < len; i++)
-		concat((WideChar)stringSrc.getCharAt(i));
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::concat(const WideChar* s)
-{
-	validate();
-	int addlen = wcslen(s);
-	if (addlen == 0)
-		return;	// my, that was easy
-
-	if (m_data)
-	{
-		ensureUniqueBufferOfSize(getLength() + addlen + 1, true, NULL, s);
-	}
-	else
-	{
-		set(s);
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::trim()
-{
-	validate();
-
-	if (m_data)
-	{
-		const WideChar *c = peek();
-
-		//	Strip leading white space from the string.
-		while (c && iswspace(*c))
-		{
-			c++;
-		}
-		if (c != peek())
-		{
-			set(c);
-		}
-
-		if (m_data) // another check, because the previous set() could erase m_data
-		{
-			//	Clip trailing white space from the string.
-			int len = wcslen(peek());
-			for (int index = len-1; index >= 0; index--)
-			{
-				if (iswspace(getCharAt(index)))
-				{
-					removeLastChar();
-				}
-				else
-				{
-					break;
-				}
-			}
-		}
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::removeLastChar()
-{
-	validate();
-	if (m_data)
-	{
-		int len = wcslen(peek());
-		if (len > 0)
-		{
-			ensureUniqueBufferOfSize(len+1, true, NULL, NULL);
-			peek()[len - 1] = 0;
-		}
-	}
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::format(UnicodeString format, ...)
-{
-	validate();
-	va_list args;
-  va_start(args, format);
-	format_va(format, args);
-  va_end(args);
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::format(const WideChar* format, ...)
-{
-	validate();
-	va_list args;
-  va_start(args, format);
-	format_va(format, args);
-  va_end(args);
-	validate();
-}
-
-// -----------------------------------------------------
-void UnicodeString::format_va(const UnicodeString& format, va_list args)
-{
-	format_va(format.str(), args);
-}
-
-// -----------------------------------------------------
-void UnicodeString::format_va(const WideChar* format, va_list args)
-{
-	validate();
-	WideChar buf[MAX_FORMAT_BUF_LEN];
-	const int result = vswprintf(buf, sizeof(buf)/sizeof(WideChar), format, args);
-	if (result >= 0)
-	{
-		set(buf);
-		validate();
-	}
-	else
-	{
-		DEBUG_CRASH(("UnicodeString::format_va failed with code:%d", result));
-	}
-}
-
-//-----------------------------------------------------------------------------
-Bool UnicodeString::nextToken(UnicodeString* tok, UnicodeString delimiters)
-{
-	if (this->isEmpty() || tok == this)
-		return false;
-
-	if (delimiters.isEmpty())
-		delimiters = UnicodeString(L" \t\n\r");
-
-	Int offset;
-
-	offset = wcsspn(peek(), delimiters.str());
-	WideChar* start = peek() + offset;
-
-	offset = wcscspn(start, delimiters.str());
-	WideChar* end = start + offset;
-
-	if (end > start)
-	{
-		Int len = end - start;
-		WideChar* tmp = tok->getBufferForRead(len + 1);
-		memcpy(tmp, start, len*2);
-		tmp[len] = 0;
-
-		this->set(end);
-
-		return true;
-	}
-	else
-	{
-		this->clear();
-		tok->clear();
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp
index b436ac54c2d..1047f7970a8 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_VETERANCY_NAMES
 #include "Common/Upgrade.h"
@@ -38,12 +38,13 @@
 #include "GameClient/Image.h"
 
 
-const char *TheUpgradeTypeNames[] = 
+const char *const TheUpgradeTypeNames[] =
 {
 	"PLAYER",
 	"OBJECT",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheUpgradeTypeNames) == NUM_UPGRADE_TYPES + 1, "Incorrect array size");
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 class UpgradeCenter *TheUpgradeCenter = NULL;
@@ -62,14 +63,14 @@ Upgrade::Upgrade( const UpgradeTemplate *upgradeTemplate )
 	m_next = NULL;
 	m_prev = NULL;
 
-}  // end Upgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Upgrade::~Upgrade( void )
 {
 
-}  // end ~Upgrade
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -77,7 +78,7 @@ Upgrade::~Upgrade( void )
 void Upgrade::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -95,7 +96,7 @@ void Upgrade::xfer( Xfer *xfer )
 	// status
 	xfer->xferUser( &m_status, sizeof( UpgradeStatusType ) );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -103,7 +104,7 @@ void Upgrade::xfer( Xfer *xfer )
 void Upgrade::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // UPGRADE TEMPLATE ///////////////////////////////////////////////////////////////////////////////
@@ -111,7 +112,7 @@ void Upgrade::loadPostProcess( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] = 
+const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] =
 {
 
 	{ "DisplayName",				INI::parseAsciiString,		NULL, offsetof( UpgradeTemplate, m_displayNameLabel ) },
@@ -119,10 +120,10 @@ const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] =
 	{ "BuildTime",					INI::parseReal,						NULL, offsetof( UpgradeTemplate, m_buildTime ) },
 	{ "BuildCost",					INI::parseInt,						NULL, offsetof( UpgradeTemplate, m_cost ) },
 	{ "ButtonImage",				INI::parseAsciiString,		NULL, offsetof( UpgradeTemplate, m_buttonImageName ) },
-	{ "ResearchSound",			INI::parseAudioEventRTS,	NULL, offsetof( UpgradeTemplate, m_researchSound ) }, 
-	{ "UnitSpecificSound",	INI::parseAudioEventRTS,	NULL, offsetof( UpgradeTemplate, m_unitSpecificSound ) }, 
+	{ "ResearchSound",			INI::parseAudioEventRTS,	NULL, offsetof( UpgradeTemplate, m_researchSound ) },
+	{ "UnitSpecificSound",	INI::parseAudioEventRTS,	NULL, offsetof( UpgradeTemplate, m_unitSpecificSound ) },
 	{ "AcademyClassify",		INI::parseIndexList,			TheAcademyClassificationTypeNames, offsetof( UpgradeTemplate, m_academyClassificationType ) },
-	{ NULL,						NULL,												 NULL, 0 }  // keep this last
+	{ NULL,						NULL,												 NULL, 0 }
 
 };
 
@@ -130,10 +131,7 @@ const FieldParse UpgradeTemplate::m_upgradeFieldParseTable[] =
 //-------------------------------------------------------------------------------------------------
 UpgradeTemplate::UpgradeTemplate( void )
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_cost = 0;
-	//
 	m_type = UPGRADE_TYPE_PLAYER;
 	m_nameKey = NAMEKEY_INVALID;
 	m_buildTime = 0.0f;
@@ -142,21 +140,21 @@ UpgradeTemplate::UpgradeTemplate( void )
 	m_buttonImage = NULL;
 	m_academyClassificationType = ACT_NONE;
 
-}  // end UpgradeTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 UpgradeTemplate::~UpgradeTemplate( void )
 {
 
-}  // end ~UpgradeTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Calculate the time it takes (in logic frames) for a player to build this UpgradeTemplate */
 //-------------------------------------------------------------------------------------------------
 Int UpgradeTemplate::calcTimeToBuild( Player *player ) const
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	if( player->buildsInstantly() )
 	{
 		return 1;
@@ -166,7 +164,7 @@ Int UpgradeTemplate::calcTimeToBuild( Player *player ) const
 	///@todo modify this by power state of player
 	return m_buildTime * LOGICFRAMES_PER_SECOND;
 
-}  // end calcTimeToBuild
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Calculate the cost takes this player to build this upgrade */
@@ -177,7 +175,7 @@ Int UpgradeTemplate::calcCostToBuild( Player *player ) const
 	///@todo modify this by any player handicaps
 	return m_cost;
 
-}  // end calcCostToBuild
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -229,13 +227,13 @@ UpgradeCenter::UpgradeCenter( void )
 	m_nextTemplateMaskBit = 0;
 	buttonImagesCached = FALSE;
 
-}  // end UpgradeCenter
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 UpgradeCenter::~UpgradeCenter( void )
 {
-	
+
 	// delete all the upgrades loaded from the INI database
 	UpgradeTemplate *next;
 	while( m_upgradeList )
@@ -250,9 +248,9 @@ UpgradeCenter::~UpgradeCenter( void )
 		// set head to next element
 		m_upgradeList = next;
 
-	}  // end while
+	}
 
-}  // end ~UpgradeCenter
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Upgrade center initialization */
@@ -260,7 +258,7 @@ UpgradeCenter::~UpgradeCenter( void )
 void UpgradeCenter::init( void )
 {
 	UpgradeTemplate* up;
-	
+
 	// name will be overridden by friend_makeVeterancyUpgrade
 
 // no, there ISN'T an upgrade for this one...
@@ -295,7 +293,7 @@ void UpgradeCenter::reset( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Find upgrade matching name key */
+/** Find upgrade by veterancy level */
 //-------------------------------------------------------------------------------------------------
 const UpgradeTemplate *UpgradeCenter::findVeterancyUpgrade( VeterancyLevel level ) const
 {
@@ -304,7 +302,7 @@ const UpgradeTemplate *UpgradeCenter::findVeterancyUpgrade( VeterancyLevel level
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Find upgrade matching name key */
+/** Find upgrade by name key */
 //-------------------------------------------------------------------------------------------------
 UpgradeTemplate *UpgradeCenter::findNonConstUpgradeByKey( NameKeyType key )
 {
@@ -325,13 +323,13 @@ UpgradeTemplate *UpgradeCenter::findNonConstUpgradeByKey( NameKeyType key )
 // ------------------------------------------------------------------------------------------------
 UpgradeTemplate *UpgradeCenter::firstUpgradeTemplate( void )
 {
-	
+
 	return m_upgradeList;
 
-}  // end firstUpgradeTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Find upgrade matching name key */
+/** Find upgrade by name key */
 //-------------------------------------------------------------------------------------------------
 const UpgradeTemplate *UpgradeCenter::findUpgradeByKey( NameKeyType key ) const
 {
@@ -347,14 +345,20 @@ const UpgradeTemplate *UpgradeCenter::findUpgradeByKey( NameKeyType key ) const
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Find upgrade matching name */
+/** Find upgrade by name */
 //-------------------------------------------------------------------------------------------------
 const UpgradeTemplate *UpgradeCenter::findUpgrade( const AsciiString& name ) const
 {
-
 	return findUpgradeByKey( TheNameKeyGenerator->nameToKey( name ) );
+}
 
-}  // end findUpgrade
+//-------------------------------------------------------------------------------------------------
+/** Find upgrade by name */
+//-------------------------------------------------------------------------------------------------
+const UpgradeTemplate *UpgradeCenter::findUpgrade( const char* name ) const
+{
+	return findUpgradeByKey( TheNameKeyGenerator->nameToKey( name ) );
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Allocate a new upgrade template */
@@ -387,7 +391,7 @@ UpgradeTemplate *UpgradeCenter::newUpgrade( const AsciiString& name )
 	// return new upgrade
 	return newUpgrade;
 
-}  // end newUnlinkedUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Link an upgrade to our list */
@@ -406,7 +410,7 @@ void UpgradeCenter::linkUpgrade( UpgradeTemplate *upgrade )
 		m_upgradeList->friend_setPrev( upgrade );
 	m_upgradeList = upgrade;
 
-}  // end linkUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Unlink an upgrade from our list */
@@ -425,14 +429,14 @@ void UpgradeCenter::unlinkUpgrade( UpgradeTemplate *upgrade )
 	else
 		m_upgradeList = upgrade->friend_getNext();
 
-}  // end unlinkUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** does this player have all the necessary things to make this upgrade */
 //-------------------------------------------------------------------------------------------------
 Bool UpgradeCenter::canAffordUpgrade( Player *player, const UpgradeTemplate *upgradeTemplate, Bool displayReason ) const
 {
- 
+
 	// sanity
 	if( player == NULL || upgradeTemplate == NULL )
 		return FALSE;
@@ -453,7 +457,7 @@ Bool UpgradeCenter::canAffordUpgrade( Player *player, const UpgradeTemplate *upg
 
 	return TRUE;  // all is well
 
-}  // end canAffordUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** generate a list of upgrade names for WorldBuilder */
@@ -467,7 +471,7 @@ std::vector<AsciiString> UpgradeCenter::getUpgradeNames( void ) const
 
 	return upgradeNames;
 
-}  // end getUpgradeNames
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse an upgrade definition */
@@ -475,8 +479,7 @@ std::vector<AsciiString> UpgradeCenter::getUpgradeNames( void ) const
 void UpgradeCenter::parseUpgradeDefinition( INI *ini )
 {
 	// read the name
-	const char* c = ini->getNextToken();
-	AsciiString name = c;	
+	const char* name = ini->getNextToken();
 
 	// find existing item if present
 	UpgradeTemplate* upgrade = TheUpgradeCenter->findNonConstUpgradeByKey( NAMEKEY(name) );
@@ -486,10 +489,10 @@ void UpgradeCenter::parseUpgradeDefinition( INI *ini )
 		// allocate a new item
 		upgrade = TheUpgradeCenter->newUpgrade( name );
 
-	}  // end if
+	}
 
 	// sanity
-	DEBUG_ASSERTCRASH( upgrade, ("parseUpgradeDefinition: Unable to allocate upgrade '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( upgrade, ("parseUpgradeDefinition: Unable to allocate upgrade '%s'", name) );
 
 	// parse the ini definition
 	ini->initFromINI( upgrade, upgrade->getFieldParse() );
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/encrypt.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/encrypt.cpp
index 148371612ce..8520c0a1197 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/encrypt.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/encrypt.cpp
@@ -26,10 +26,8 @@
 // Ancient Westwood Online password encryption (obfuscation?) code
 // Author: Anonymous
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
-#include <stdio.h>
-#include <string.h>
 #include "Common/encrypt.h"
 
 #define MAX_CHARS 65
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/registry.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/registry.cpp
index d82ce18e08a..339423da85b 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/System/registry.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/System/registry.cpp
@@ -26,15 +26,10 @@
 // Simple interface for storing/retreiving registry values
 // Author: Matthew D. Campbell, December 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Registry.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 Bool  getStringFromRegistry(HKEY root, AsciiString path, AsciiString key, AsciiString& val)
 {
@@ -125,7 +120,7 @@ Bool GetStringFromGeneralsRegistry(AsciiString path, AsciiString key, AsciiStrin
 	AsciiString fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Generals";
 
 	fullPath.concat(path);
-	DEBUG_LOG(("GetStringFromRegistry - looking in %s for key %s\n", fullPath.str(), key.str()));
+	DEBUG_LOG(("GetStringFromRegistry - looking in %s for key %s", fullPath.str(), key.str()));
 	if (getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val))
 	{
 		return TRUE;
@@ -139,7 +134,7 @@ Bool GetStringFromRegistry(AsciiString path, AsciiString key, AsciiString& val)
 	AsciiString fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour";
 
 	fullPath.concat(path);
-	DEBUG_LOG(("GetStringFromRegistry - looking in %s for key %s\n", fullPath.str(), key.str()));
+	DEBUG_LOG(("GetStringFromRegistry - looking in %s for key %s", fullPath.str(), key.str()));
 	if (getStringFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val))
 	{
 		return TRUE;
@@ -153,7 +148,7 @@ Bool GetUnsignedIntFromRegistry(AsciiString path, AsciiString key, UnsignedInt&
 	AsciiString fullPath = "SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour";
 
 	fullPath.concat(path);
-	DEBUG_LOG(("GetUnsignedIntFromRegistry - looking in %s for key %s\n", fullPath.str(), key.str()));
+	DEBUG_LOG(("GetUnsignedIntFromRegistry - looking in %s for key %s", fullPath.str(), key.str()));
 	if (getUnsignedIntFromRegistry(HKEY_LOCAL_MACHINE, fullPath.str(), key.str(), val))
 	{
 		return TRUE;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/TerrainTypes.cpp b/GeneralsMD/Code/GameEngine/Source/Common/TerrainTypes.cpp
index 61be060d512..43b5186f626 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/TerrainTypes.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/TerrainTypes.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_TERRAIN_TYPE_NAMES
 
@@ -39,7 +39,7 @@
 TerrainTypeCollection *TheTerrainTypes = NULL;
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-const FieldParse TerrainType::m_terrainTypeFieldParseTable[] = 
+const FieldParse TerrainType::m_terrainTypeFieldParseTable[] =
 {
 
 	{ "Texture",		INI::parseAsciiString,			NULL,		offsetof( TerrainType, m_texture ) },
@@ -63,14 +63,14 @@ TerrainType::TerrainType( void )
 	m_restrictConstruction = FALSE;
 	m_next = NULL;
 
-}  // end TerrainType
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 TerrainType::~TerrainType( void )
 {
 
-}  // end ~TerrainType
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -83,7 +83,7 @@ TerrainTypeCollection::TerrainTypeCollection( void )
 
 	m_terrainList = NULL;
 
-}  // end TerrainTypeCollection
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -104,9 +104,9 @@ TerrainTypeCollection::~TerrainTypeCollection( void )
 		// set the new head of the type list
 		m_terrainList = temp;
 
-	}  // end while
+	}
 
-}  // end ~TerrainTypeCollection
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Find a terrain type given the name */
@@ -121,12 +121,12 @@ TerrainType *TerrainTypeCollection::findTerrain( AsciiString name )
 		if( terrain->getName() == name )
 			return terrain;
 
-	}  // end for terrain
+	}
 
 	// not found
 	return NULL;
 
-}  // end findTerrain
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Allocate a new type, assign the name, and tie to type list */
@@ -139,7 +139,7 @@ TerrainType *TerrainTypeCollection::newTerrain( AsciiString name )
 	terrain = newInstance(TerrainType);
 
 	// copy default values from the default terrain entry
-	TerrainType *defaultTerrain = findTerrain( AsciiString( "DefaultTerrain" ) );
+	TerrainType *defaultTerrain = findTerrain( "DefaultTerrain" );
 	if( defaultTerrain )
 		*terrain = *defaultTerrain;
 /*
@@ -148,8 +148,8 @@ TerrainType *TerrainTypeCollection::newTerrain( AsciiString name )
 		terrain->friend_setTexture( defaultTerrain->getTexture() );
 		terrain->friend_setClass( defaultTerrain->getClass() );
 		terrain->friend_setBlendEdge( defaultTerrain->isBlendEdge() );
-			
-	}  // end if
+
+	}
 */
 
 	// assign a name
@@ -158,8 +158,8 @@ TerrainType *TerrainTypeCollection::newTerrain( AsciiString name )
 	// tie to list
 	terrain->friend_setNext( m_terrainList );
 	m_terrainList = terrain;
-			
+
 	// return the new terrain
 	return terrain;
 
-}  // end newTerrain
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/DrawModule.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/DrawModule.cpp
index 4f931969b4c..b875346fdcd 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/DrawModule.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/DrawModule.cpp
@@ -42,10 +42,10 @@ void DrawModule::crc( Xfer *xfer )
 	// extend base class
 	DrawableModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Xfer method	
+/** Xfer method
 	* Version Info;
 	* 1: Initial version */
 // ------------------------------------------------------------------------------------------------
@@ -60,7 +60,7 @@ void DrawModule::xfer( Xfer *xfer )
 	// extend base class
 	DrawableModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -71,5 +71,5 @@ void DrawModule::loadPostProcess( void )
 	// extend base class
 	DrawableModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/Module.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/Module.cpp
index 9932109bcbd..0607cddd1d4 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/Module.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/Module.cpp
@@ -47,11 +47,6 @@
 #include "GameLogic/Module/UpdateModule.h"
 #include "GameLogic/Module/UpgradeModule.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -61,8 +56,8 @@
 //-------------------------------------------------------------------------------------------------
 // this method should NEVER be overridden by user code, only via the MAKE_STANDARD_MODULE_xxx macros!
 // it should also NEVER be called directly; it's only for use by ModuleFactory!
-/*static*/ ModuleData* Module::friend_newModuleData(INI* ini) 
-{ 
+/*static*/ ModuleData* Module::friend_newModuleData(INI* ini)
+{
 	ModuleData* data = MSGNEW("Module::friend_newModuleData") ModuleData;	// no need to memorypool these since we never allocate more than one of each
 	if (ini)
 		ini->initFromINI(data, 0);	// this is just so that an "end" token is required
@@ -74,7 +69,7 @@
 Module::~Module()
 {
 
-}  // end ~Module
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -82,7 +77,7 @@ Module::~Module()
 void Module::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -97,7 +92,7 @@ void Module::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** load post process */
@@ -105,30 +100,30 @@ void Module::xfer( Xfer *xfer )
 void Module::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ObjectModule::ObjectModule( Thing *thing, const ModuleData* moduleData ) : Module(moduleData)
-{ 
+{
 	if (!moduleData)
 	{
-		DEBUG_CRASH(("module data may not be null\n"));
+		DEBUG_CRASH(("module data may not be null"));
 		throw INI_INVALID_DATA;
 	}
 
-	DEBUG_ASSERTCRASH( thing, ("Thing passed to ObjectModule is NULL!\n") );
+	DEBUG_ASSERTCRASH( thing, ("Thing passed to ObjectModule is NULL!") );
 	m_object = AsObject(thing);
-	DEBUG_ASSERTCRASH( m_object, ("Thing passed to ObjectModule is not an Object!\n") );
+	DEBUG_ASSERTCRASH( m_object, ("Thing passed to ObjectModule is not an Object!") );
 
-}  // end ObjectModule
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ObjectModule::~ObjectModule( void )
 {
 
-}  // end ~ObjectModule
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -139,7 +134,7 @@ void ObjectModule::crc( Xfer *xfer )
 	// extend base class
 	Module::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -157,7 +152,7 @@ void ObjectModule::xfer( Xfer *xfer )
 	// extend base class
 	Module::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** load post process */
@@ -168,30 +163,30 @@ void ObjectModule::loadPostProcess( void )
 	// extend base class
 	Module::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 DrawableModule::DrawableModule( Thing *thing, const ModuleData* moduleData ) : Module(moduleData)
-{ 
+{
 	if (!moduleData)
 	{
-		DEBUG_CRASH(("module data may not be null\n"));
+		DEBUG_CRASH(("module data may not be null"));
 		throw INI_INVALID_DATA;
 	}
 
-	DEBUG_ASSERTCRASH( thing, ("Thing passed to DrawableModule is NULL!\n") );
+	DEBUG_ASSERTCRASH( thing, ("Thing passed to DrawableModule is NULL!") );
 	m_drawable = AsDrawable(thing);
-	DEBUG_ASSERTCRASH( m_drawable, ("Thing passed to DrawableModule is not a Drawable!\n") );
+	DEBUG_ASSERTCRASH( m_drawable, ("Thing passed to DrawableModule is not a Drawable!") );
 
-}  // end ~DrawableModule
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 DrawableModule::~DrawableModule( void )
 {
 
-}  // end ~DrawableModule
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -202,7 +197,7 @@ void DrawableModule::crc( Xfer *xfer )
 	// extend base class
 	Module::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -220,7 +215,7 @@ void DrawableModule::xfer( Xfer *xfer )
 	// extend base class
 	Module::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** load post process */
@@ -231,7 +226,7 @@ void DrawableModule::loadPostProcess( void )
 	// extend base class
 	Module::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -257,9 +252,9 @@ void UpgradeMuxData::muxDataProcessUpgradeRemoval(Object* obj) const
 					it++)
 		{
 			const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );
-			if( !theTemplate && !it->isEmpty() && !it->isNone())
+			if( !theTemplate )
 			{
-				DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));
+				DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));
 				throw INI_INVALID_DATA;
 			}
 
@@ -292,16 +287,16 @@ void UpgradeMuxData::getUpgradeActivationMasks(UpgradeMaskType& activation, Upgr
 	{
 		m_activationMask.clear();
 		m_conflictingMask.clear();
-		
+
 		std::vector<AsciiString>::const_iterator it;
 		for( it = m_activationUpgradeNames.begin();
 					it != m_activationUpgradeNames.end();
 					it++)
 		{
 			const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );
-			if( !theTemplate && !it->isEmpty() && !it->isNone())
+			if( !theTemplate )
 			{
-				DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));
+				DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));
 				throw INI_INVALID_DATA;
 			}
 
@@ -313,11 +308,12 @@ void UpgradeMuxData::getUpgradeActivationMasks(UpgradeMaskType& activation, Upgr
 					it++)
 		{
 			const UpgradeTemplate* theTemplate = TheUpgradeCenter->findUpgrade( *it );
-			if( !theTemplate && !it->isEmpty() && !it->isNone())
+			if( !theTemplate )
 			{
-				DEBUG_CRASH(("An upgrade module references %s, which is not an Upgrade", it->str()));
+				DEBUG_CRASH(("An upgrade module references '%s', which is not an Upgrade", it->str()));
 				throw INI_INVALID_DATA;
 			}
+
 			m_conflictingMask.set( theTemplate->getUpgradeMask() );
 		}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp
index dc8a3d9eb7c..7d85052fd7c 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ModuleFactory.cpp
@@ -27,7 +27,7 @@
 // Desc:	 TheModuleFactory is where we actually instance modules for objects
 //				 and drawbles.  Those modules are things such as an UpdateModule
 //			   or DamageModule or DrawModule etc.
-//	
+//
 //				 TheModuleFactory will contain a list of ModuleTemplates, when we
 //				 request a new module, we will look for that template in our
 //				 list and create it
@@ -35,7 +35,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Module.h"
 #include "Common/ModuleFactory.h"
@@ -73,7 +73,7 @@
 #include "GameLogic/Module/POWTruckBehavior.h"
 #include "GameLogic/Module/PrisonBehavior.h"
 #include "GameLogic/Module/PropagandaCenterBehavior.h"
-#endif 
+#endif
 #include "GameLogic/Module/PropagandaTowerBehavior.h"
 #include "GameLogic/Module/BunkerBusterBehavior.h"
 #include "GameLogic/Module/FireWeaponWhenDamagedBehavior.h"
@@ -209,7 +209,6 @@
 #include "GameLogic/Module/UnpauseSpecialPowerUpgrade.h"
 #include "GameLogic/Module/WeaponBonusUpgrade.h"
 #include "GameLogic/Module/WeaponSetUpgrade.h"
-#include "GameLogic/Module/WeaponBonusUpgrade.h"
 #include "GameLogic/Module/CostModifierUpgrade.h"
 #include "GameLogic/Module/ExperienceScalarUpgrade.h"
 #include "GameLogic/Module/MaxHealthUpgrade.h"
@@ -286,11 +285,6 @@ ModuleFactory *TheModuleFactory = NULL;  ///< the module factory singleton
 
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -298,7 +292,7 @@ ModuleFactory::ModuleFactory( void )
 {
 	m_moduleTemplateMap.clear();
 	m_moduleDataList.clear();
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -564,7 +558,7 @@ void ModuleFactory::init( void )
 	addModule( SwayClientUpdate );
 	addModule( BeaconClientUpdate );
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 Int ModuleFactory::findModuleInterfaceMask(const AsciiString& name, ModuleType type)
@@ -617,9 +611,9 @@ const ModuleFactory::ModuleTemplate* ModuleFactory::findModuleTemplate(const Asc
 	NameKeyType namekey = makeDecoratedNameKey(name, type);
 
   ModuleTemplateMap::const_iterator it = m_moduleTemplateMap.find(namekey);
-  if (it == m_moduleTemplateMap.end()) 
+  if (it == m_moduleTemplateMap.end())
 	{
-		DEBUG_CRASH(( "Module name '%s' not found\n", name.str() ));
+		DEBUG_CRASH(( "Module name '%s' not found", name.str() ));
 		return NULL;
 	}
 	else
@@ -636,7 +630,7 @@ Module *ModuleFactory::newModule( Thing *thing, const AsciiString& name, const M
 	// sanity
 	if( name.isEmpty() )
 	{
-		DEBUG_CRASH(("attempting to create module with empty name\n"));
+		DEBUG_CRASH(("attempting to create module with empty name"));
 		return NULL;
 	}
 	const ModuleTemplate* mt = findModuleTemplate(name, type);
@@ -650,35 +644,35 @@ Module *ModuleFactory::newModule( Thing *thing, const AsciiString& name, const M
 			BehaviorModule* bm = (BehaviorModule*)mod;
 
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_BODY)) != 0) == (bm->getBody() != NULL), 
-				("getInterfaceMask bad for MODULE_BODY (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_BODY)) != 0) == (bm->getBody() != NULL),
+				("getInterfaceMask bad for MODULE_BODY (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_COLLIDE)) != 0) == (bm->getCollide() != NULL), 
-				("getInterfaceMask bad for MODULE_COLLIDE (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_COLLIDE)) != 0) == (bm->getCollide() != NULL),
+				("getInterfaceMask bad for MODULE_COLLIDE (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_CONTAIN)) != 0) == (bm->getContain() != NULL), 
-				("getInterfaceMask bad for MODULE_CONTAIN (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_CONTAIN)) != 0) == (bm->getContain() != NULL),
+				("getInterfaceMask bad for MODULE_CONTAIN (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_CREATE)) != 0) == (bm->getCreate() != NULL), 
-				("getInterfaceMask bad for MODULE_CREATE (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_CREATE)) != 0) == (bm->getCreate() != NULL),
+				("getInterfaceMask bad for MODULE_CREATE (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_DAMAGE)) != 0) == (bm->getDamage() != NULL), 
-				("getInterfaceMask bad for MODULE_DAMAGE (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_DAMAGE)) != 0) == (bm->getDamage() != NULL),
+				("getInterfaceMask bad for MODULE_DAMAGE (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_DESTROY)) != 0) == (bm->getDestroy() != NULL), 
-				("getInterfaceMask bad for MODULE_DESTROY (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_DESTROY)) != 0) == (bm->getDestroy() != NULL),
+				("getInterfaceMask bad for MODULE_DESTROY (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_DIE)) != 0) == (bm->getDie() != NULL), 
-				("getInterfaceMask bad for MODULE_DIE (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_DIE)) != 0) == (bm->getDie() != NULL),
+				("getInterfaceMask bad for MODULE_DIE (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_SPECIAL_POWER)) != 0) == (bm->getSpecialPower() != NULL), 
-				("getInterfaceMask bad for MODULE_SPECIAL_POWER (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_SPECIAL_POWER)) != 0) == (bm->getSpecialPower() != NULL),
+				("getInterfaceMask bad for MODULE_SPECIAL_POWER (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_UPDATE)) != 0) == (bm->getUpdate() != NULL), 
-				("getInterfaceMask bad for MODULE_UPDATE (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_UPDATE)) != 0) == (bm->getUpdate() != NULL),
+				("getInterfaceMask bad for MODULE_UPDATE (%s)",name.str()));
 			DEBUG_ASSERTCRASH(
-				((mt->m_whichInterfaces & (MODULEINTERFACE_UPGRADE)) != 0) == (bm->getUpgrade() != NULL), 
-				("getInterfaceMask bad for MODULE_UPGRADE (%s)\n",name.str()));
+				((mt->m_whichInterfaces & (MODULEINTERFACE_UPGRADE)) != 0) == (bm->getUpgrade() != NULL),
+				("getInterfaceMask bad for MODULE_UPGRADE (%s)",name.str()));
 		}
 #endif
 
@@ -687,7 +681,7 @@ Module *ModuleFactory::newModule( Thing *thing, const AsciiString& name, const M
 
 	return NULL;
 
-}  // end newModule
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Add a module template to our list of templates */
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp
index bc0f65c456a..6fc61f7be96 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp
@@ -32,7 +32,7 @@
 //						"Things"
 //
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 #include "Common/Thing.h"
@@ -46,33 +46,33 @@
 #include "Lib/trig.h"
 #include "GameLogic/TerrainLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+
+static constexpr const Real InitialThingPosX = 0.0f;
+static constexpr const Real InitialThingPosY = 0.0f;
 
 //=============================================================================
 /** Constructor */
 //=============================================================================
-Thing::Thing( const ThingTemplate *thingTemplate ) 
+Thing::Thing( const ThingTemplate *thingTemplate )
 {
 	// sanity
 	if( thingTemplate == NULL )
 	{
-	
+
 		// cannot create thing without template
 		DEBUG_CRASH(( "no template" ));
 		return;
 
-	}  // end if
-		
+	}
+
 	m_template = thingTemplate;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	m_templateName = thingTemplate->getName();
 #endif
 	m_transform.Make_Identity();
-	m_cachedPos.zero();
+	m_cachedPos.x = InitialThingPosX;
+	m_cachedPos.y = InitialThingPosY;
+	m_cachedPos.z = 0.0f;
 	m_cachedAngle = 0.0f;
 	m_cachedDirVector.zero();
 	m_cachedAltitudeAboveTerrain = 0;
@@ -96,6 +96,12 @@ const ThingTemplate *Thing::getTemplate() const
 	return m_template;
 }
 
+//=============================================================================
+Bool Thing::isPositioned() const
+{
+	return m_cachedPos.x != InitialThingPosX || m_cachedPos.y != InitialThingPosY;
+}
+
 //=============================================================================
 const Coord3D* Thing::getUnitDirectionVector2D() const
 {
@@ -156,13 +162,13 @@ void Thing::setPositionZ( Real z )
 	else
 	{
 		Matrix3D mtx;
-		const Bool stickToGround = true;	// yes, set the "z" pos		
+		const Bool stickToGround = true;	// yes, set the "z" pos
 		Coord3D pos = m_cachedPos;
 		pos.z = z;
 		TheTerrainLogic->alignOnTerrain(getOrientation(), pos, stickToGround, mtx );
 		setTransformMatrix(&mtx);
 	}
-	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'\n", m_template->getName().str() ));
+	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'", m_template->getName().str() ));
 }
 
 //=============================================================================
@@ -175,7 +181,7 @@ void Thing::setPosition( const Coord3D *pos )
 		Coord3D oldPos = m_cachedPos;
 		Matrix3D oldMtx = m_transform;
 
-		//DEBUG_ASSERTCRASH(!(_isnan(pos->x) || _isnan(pos->y) || _isnan(pos->z)), ("Drawable/Object position NAN! '%s'\n", m_template->getName().str() ));
+		//DEBUG_ASSERTCRASH(!(_isnan(pos->x) || _isnan(pos->y) || _isnan(pos->z)), ("Drawable/Object position NAN! '%s'", m_template->getName().str() ));
 		m_transform.Set_X_Translation( pos->x );
 		m_transform.Set_Y_Translation( pos->y );
 		m_transform.Set_Z_Translation( pos->z );
@@ -187,11 +193,11 @@ void Thing::setPosition( const Coord3D *pos )
 	else
 	{
 		Matrix3D mtx;
-		const Bool stickToGround = true;	// yes, set the "z" pos				
+		const Bool stickToGround = true;	// yes, set the "z" pos
 		TheTerrainLogic->alignOnTerrain(getOrientation(), *pos, stickToGround, mtx );
 		setTransformMatrix(&mtx);
 	}
-	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'\n", m_template->getName().str() ));
+	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'", m_template->getName().str() ));
 }
 
 //=============================================================================
@@ -214,7 +220,7 @@ void Thing::setOrientation( Real angle )
 	if( m_template->isKindOf( KINDOF_STICK_TO_TERRAIN_SLOPE) )
 	{
 		Matrix3D mtx;
-		const Bool stickToGround = true;	// yes, set the "z" pos				
+		const Bool stickToGround = true;	// yes, set the "z" pos
 		TheTerrainLogic->alignOnTerrain(angle, pos, stickToGround, m_transform );
 	}
 	else
@@ -235,13 +241,13 @@ void Thing::setOrientation( Real angle )
 											x.z, y.z, z.z, pos.z );
 	}
 
-	//DEBUG_ASSERTCRASH(-PI <= angle && angle <= PI, ("Please pass only normalized (-PI..PI) angles to setOrientation (%f).\n", angle));
+	//DEBUG_ASSERTCRASH(-PI <= angle && angle <= PI, ("Please pass only normalized (-PI..PI) angles to setOrientation (%f).", angle));
 	m_cachedAngle = normalizeAngle(angle);
 	m_cachedPos = pos;
 	m_cacheFlags &= ~VALID_DIRVECTOR;	// but don't clear the altitude flags.
 
 	reactToTransformChange(&oldMtx, &oldPos, oldAngle);
-	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'\n", m_template->getName().str() ));
+	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'", m_template->getName().str() ));
 }
 
 //=============================================================================
@@ -262,19 +268,19 @@ void Thing::setTransformMatrix( const Matrix3D *mx )
 	m_cacheFlags = 0;
 
 	reactToTransformChange(&oldMtx, &oldPos, oldAngle);
-	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'\n", m_template->getName().str() ));
+	DEBUG_ASSERTCRASH(!(_isnan(getPosition()->x) || _isnan(getPosition()->y) || _isnan(getPosition()->z)), ("Drawable/Object position NAN! '%s'", m_template->getName().str() ));
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool Thing::isKindOf(KindOfType t) const 
-{ 
-	return getTemplate()->isKindOf(t); 
+Bool Thing::isKindOf(KindOfType t) const
+{
+	return getTemplate()->isKindOf(t);
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool Thing::isKindOfMulti(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) const 
-{ 
-	return getTemplate()->isKindOfMulti(mustBeSet, mustBeClear); 
+Bool Thing::isKindOfMulti(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) const
+{
+	return getTemplate()->isKindOfMulti(mustBeSet, mustBeClear);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -284,7 +290,7 @@ Bool Thing::isAnyKindOf( const KindOfMaskType& anyKindOf ) const
 }
 
 // ------------------------------------------------------------------------------------------------
-Real Thing::calculateHeightAboveTerrain() const 
+Real Thing::calculateHeightAboveTerrain() const
 {
 	//USE_PERF_TIMER(ThingMatrixStuff)
 	const Coord3D* pos = getPosition();
@@ -312,10 +318,10 @@ Real Thing::getHeightAboveTerrainOrWater() const
 	{
 		const Coord3D* pos = getPosition();
 		Real waterZ;
-		if (TheTerrainLogic->isUnderwater(pos->x, pos->y, &waterZ)) 
+		if (TheTerrainLogic->isUnderwater(pos->x, pos->y, &waterZ))
 		{
 			m_cachedAltitudeAboveTerrainOrWater = pos->z - waterZ;
-		} 
+		}
 		else
 		{
 			m_cachedAltitudeAboveTerrainOrWater = getHeightAboveTerrain();
@@ -329,7 +335,7 @@ Real Thing::getHeightAboveTerrainOrWater() const
 /** If we treat this as airborne, then they slide down slopes.  This checks whether
 they are high enough that we should let them act like they're flying. jba. */
 //=============================================================================
-Bool Thing::isSignificantlyAboveTerrain() const 
+Bool Thing::isSignificantlyAboveTerrain() const
 {
 	// If it's high enough that it will take more than 3 frames to return to the ground,
 	// then it's significantly airborne.  jba
@@ -389,4 +395,4 @@ void Thing::transformPoint( const Coord3D *in, Coord3D *out )
 	out->y = vectorOut.Y;
 	out->z = vectorOut.Z;
 
-}  // end transformPoint
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp
index a92d80b5486..71a9e724fbf 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp
@@ -24,11 +24,11 @@
 
 // FILE: ThingFactory.cpp /////////////////////////////////////////////////////////////////////////
 // Created:   Colin Day, April 2001
-// Desc:		This is how we go and make our things, we make our things, we make our things!	
+// Desc:		This is how we go and make our things, we make our things, we make our things!
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingFactory.h"
 #include "Common/ThingTemplate.h"
@@ -48,11 +48,6 @@
 #include "GameClient/Drawable.h"
 #include "Common/INI.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 enum { TEMPLATE_HASH_SIZE = 12288 };
 
@@ -79,7 +74,7 @@ void ThingFactory::freeDatabase( void )
 
 	m_templateHashMap.clear();
 
-}  // end freeDatabase
+}
 
 //-------------------------------------------------------------------------------------------------
 /** add the thing template passed in, into the databse */
@@ -89,7 +84,7 @@ void ThingFactory::addTemplate( ThingTemplate *tmplate )
 	ThingTemplateHashMapIt tIt = m_templateHashMap.find(tmplate->getName());
 
 	if (tIt != m_templateHashMap.end()) {
-		DEBUG_CRASH(("Duplicate Thing Template name found: %s\n", tmplate->getName().str()));
+		DEBUG_CRASH(("Duplicate Thing Template name found: %s", tmplate->getName().str()));
 	}
 
 	// Link it to the list
@@ -98,7 +93,7 @@ void ThingFactory::addTemplate( ThingTemplate *tmplate )
 
 	// Add it to the hash table.
 	m_templateHashMap[tmplate->getName()] = tmplate;
-}  // end addTemplate
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS
@@ -116,7 +111,7 @@ ThingFactory::ThingFactory()
 #else
 	m_templateHashMap.reserve( TEMPLATE_HASH_SIZE );
 #endif
-}  // end ThingFactory
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -126,7 +121,7 @@ ThingFactory::~ThingFactory()
 	// free all the template data
 	freeDatabase();
 
-}  // end ~ThingFactory
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a new template with name 'name' and add to our template list */
@@ -139,7 +134,7 @@ ThingTemplate *ThingFactory::newTemplate( const AsciiString& name )
 	newTemplate = newInstance(ThingTemplate);
 
 	// if the default template is present, get it and copy over any data to the new template
-	const ThingTemplate *defaultT = findTemplate( AsciiString( "DefaultThingTemplate" ), FALSE );
+	const ThingTemplate *defaultT = findTemplate( "DefaultThingTemplate", FALSE );
 	if( defaultT )
 	{
 
@@ -147,7 +142,7 @@ ThingTemplate *ThingFactory::newTemplate( const AsciiString& name )
 		*newTemplate = *defaultT;
 		newTemplate->setCopiedFromDefault();
 
-	}  // end if
+	}
 
 	// give template a unique identifier
 	newTemplate->friend_setTemplateID( m_nextTemplateID++ );
@@ -174,11 +169,11 @@ ThingTemplate* ThingFactory::newOverride( ThingTemplate *thingTemplate )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( thingTemplate, ("newOverride(): NULL 'parent' thing template\n") );
+	DEBUG_ASSERTCRASH( thingTemplate, ("newOverride(): NULL 'parent' thing template") );
 
 	// sanity just for debuging, the weapon must be in the master list to do overrides
 	DEBUG_ASSERTCRASH( findTemplate( thingTemplate->getName() ) != NULL,
-										 ("newOverride(): Thing template '%s' not in master list\n", 
+										 ("newOverride(): Thing template '%s' not in master list",
 										 thingTemplate->getName().str()) );
 
 	// find final override of the 'parent' template
@@ -197,7 +192,7 @@ ThingTemplate* ThingFactory::newOverride( ThingTemplate *thingTemplate )
 	// return the newly created override for us to set values with etc
 	return newTemplate;
 
-}  // end newOverride
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Init */
@@ -205,7 +200,7 @@ ThingTemplate* ThingFactory::newOverride( ThingTemplate *thingTemplate )
 void ThingFactory::init( void )
 {
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -217,33 +212,39 @@ void ThingFactory::reset( void )
 	for( t = m_firstTemplate; t; /* empty */ )
 	{
 		Bool possibleAdjustment = FALSE;
-		// t itself can be deleted if it is something created for this map only. Therefore, 
+		// t itself can be deleted if it is something created for this map only. Therefore,
 		// we need to store what the next item is so that we don't orphan a bunch of templates.
 		ThingTemplate *nextT = t->friend_getNextTemplate();
 		if (t == m_firstTemplate) {
 			possibleAdjustment = TRUE;
 		}
 
-		// if stillValid is NULL after we delete the overrides, then this template was created for 
+		// if stillValid is NULL after we delete the overrides, then this template was created for
 		// this map only. If it also happens to be m_firstTemplate, then we need to update m_firstTemplate
-		// as well. Finally, if it was only created for this map, we need to remove the name from the 
+		// as well. Finally, if it was only created for this map, we need to remove the name from the
 		// hash map, to prevent any crashes.
 
 		AsciiString templateName = t->getName();
-		
+
 		Overridable *stillValid = t->deleteOverrides();
 		if (stillValid == NULL && possibleAdjustment) {
 			m_firstTemplate = nextT;
 		}
-		
+
 		if (stillValid == NULL) {
 			// Also needs to be removed from the Hash map.
 			m_templateHashMap.erase(templateName);
 		}
 
+		DEBUG_ASSERTCRASH(!nextT || t->getTemplateID() == nextT->getTemplateID() + 1, ("Next template ID is unexpected"));
+
 		t = nextT;
 	}
-}  // end reset
+
+	// TheSuperHackers @bugfix Caball009 25/12/2025 Avoid mismatches by making m_nextTemplateID unique for a single match instead of unique since game launch.
+	DEBUG_ASSERTCRASH(m_firstTemplate && m_firstTemplate->getTemplateID() == m_templateHashMap.size(), ("Template ID is unexpected after deleting overrides"));
+	m_nextTemplateID = static_cast<UnsignedShort>(m_firstTemplate->getTemplateID() + 1);
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -251,7 +252,7 @@ void ThingFactory::reset( void )
 void ThingFactory::update( void )
 {
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return the template with the matching database name */
@@ -263,7 +264,7 @@ const ThingTemplate *ThingFactory::findByTemplateID( UnsignedShort id )
 		if (tmpl->getTemplateID() == id)
 			return tmpl;
 	}
-	DEBUG_CRASH(("template %d not found\n",(Int)id));
+	DEBUG_CRASH(("template %d not found",(Int)id));
 	return NULL;
 }
 
@@ -279,9 +280,9 @@ ThingTemplate *ThingFactory::findTemplateInternal( const AsciiString& name, Bool
 	}
 
 #ifdef LOAD_TEST_ASSETS
-	if (!strncmp(name.str(), TEST_STRING, strlen(TEST_STRING))) 
+	if (!strncmp(name.str(), TEST_STRING, strlen(TEST_STRING)))
 	{
-		ThingTemplate *tmplate = newTemplate( AsciiString( "Un-namedTemplate" ) );
+		ThingTemplate *tmplate = newTemplate( "Un-namedTemplate" );
 
 		// load the values
 		tmplate->initForLTA( name );
@@ -294,16 +295,16 @@ ThingTemplate *ThingFactory::findTemplateInternal( const AsciiString& name, Bool
 		return findTemplateInternal( name );
 
 	}
-	
+
 #endif
-	
+
 	if( check && name.isNotEmpty() )
 	{
 		DEBUG_CRASH( ("Failed to find thing template %s (case sensitive) This issue has a chance of crashing after you ignore it!", name.str() ) );
 	}
 	return NULL;
 
-}  // end getTemplate
+}
 
 //=============================================================================
 Object *ThingFactory::newObject( const ThingTemplate *tmplate, Team *team, ObjectStatusMaskType statusBits )
@@ -320,7 +321,7 @@ Object *ThingFactory::newObject( const ThingTemplate *tmplate, Team *team, Objec
 			tmplate = tmp;
 	}
 
-	DEBUG_ASSERTCRASH(!tmplate->isKindOf(KINDOF_DRAWABLE_ONLY), ("You may not create Objects with the template %s, only Drawables\n",tmplate->getName().str()));
+	DEBUG_ASSERTCRASH(!tmplate->isKindOf(KINDOF_DRAWABLE_ONLY), ("You may not create Objects with the template %s, only Drawables",tmplate->getName().str()));
 
 	// have the game logic create an object of the correct type.
 	// (this will throw an exception on failure.)
@@ -334,12 +335,12 @@ Object *ThingFactory::newObject( const ThingTemplate *tmplate, Team *team, Objec
 		CreateModuleInterface* create = (*m)->getCreate();
 		if (!create)
 			continue;
-	
+
 		create->onCreate();
 	}
 
 	//
-	// all objects are part of the partition manager system, add it to that 
+	// all objects are part of the partition manager system, add it to that
 	// system now
 	//
 	ThePartitionManager->registerObject( obj );
@@ -348,10 +349,10 @@ Object *ThingFactory::newObject( const ThingTemplate *tmplate, Team *team, Objec
 
 	return obj;
 
-} 
+}
 
 //=============================================================================
-Drawable *ThingFactory::newDrawable(const ThingTemplate *tmplate, DrawableStatus statusBits)
+Drawable *ThingFactory::newDrawable(const ThingTemplate *tmplate, DrawableStatusBits statusBits)
 {
 	if (tmplate == NULL)
 		throw ERROR_BAD_ARG;
@@ -364,9 +365,9 @@ Drawable *ThingFactory::newDrawable(const ThingTemplate *tmplate, DrawableStatus
 
 	return draw;
 
-}  // end newDrawableByType
+}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 AsciiString TheThingTemplateBeingParsedName;
 #endif
 
@@ -375,7 +376,7 @@ AsciiString TheThingTemplateBeingParsedName;
 //-------------------------------------------------------------------------------------------------
 /*static*/ void ThingFactory::parseObjectDefinition( INI* ini, const AsciiString& name, const AsciiString& reskinFrom )
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 	TheThingTemplateBeingParsedName = name;
 #endif
 
@@ -395,9 +396,9 @@ AsciiString TheThingTemplateBeingParsedName;
 	else if( ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES )
 	{
 		//Holy crap, this sucks to debug!!!
-		//If you have two different objects, the previous code would simply 
-		//allow you to define multiple objects with the same name, and just 
-		//nuke the old one with the new one. So, I (KM) have added this 
+		//If you have two different objects, the previous code would simply
+		//allow you to define multiple objects with the same name, and just
+		//nuke the old one with the new one. So, I (KM) have added this
 		//assert to notify in case of two same-name objects.
 		DEBUG_CRASH(( "[LINE: %d in '%s'] Duplicate factionunit %s found!", ini->getLineNum(), ini->getFilename().str(), name.str() ));
 	}
@@ -418,7 +419,7 @@ AsciiString TheThingTemplateBeingParsedName;
 		}
 		else
 		{
-			DEBUG_CRASH(("ObjectReskin must come after the original Object (%s, %s).\n",reskinFrom.str(),name.str()));
+			DEBUG_CRASH(("ObjectReskin must come after the original Object (%s, %s).",reskinFrom.str(),name.str()));
 			throw INI_INVALID_DATA;
 		}
 	}
@@ -428,13 +429,13 @@ AsciiString TheThingTemplateBeingParsedName;
 	}
 
 	thingTemplate->validate();
-	
+
 	if( ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES )
 	{
 		thingTemplate->resolveNames();
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 	TheThingTemplateBeingParsedName.clear();
 #endif
 }
@@ -522,8 +523,8 @@ void ThingFactory::postProcessLoad()
 #endif
 
 	// go through all thing templates
-	for( ThingTemplate *thingTemplate = m_firstTemplate; 
-			 thingTemplate; 
+	for( ThingTemplate *thingTemplate = m_firstTemplate;
+			 thingTemplate;
 			 thingTemplate = thingTemplate->friend_getNextTemplate() )
 	{
 
@@ -545,10 +546,10 @@ void ThingFactory::postProcessLoad()
 		}
 #endif
 
-	}  // end for 
+	}
 
 #ifdef CHECK_THING_NAMES
 	dumpMissingStringNames();
 	exit(0);
 #endif
-}  // end postProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp
index 81105d61a02..70d8c1b2b9e 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_POWER_NAMES								// for PowerNames[]
 #define DEFINE_SHADOW_NAMES								// for TheShadowNames[]
@@ -70,13 +70,8 @@
 #include "GameLogic/Powers.h"
 #include "GameLogic/Weapon.h"
 
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.	
+#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -89,29 +84,29 @@ const Int USE_EXP_VALUE_FOR_SKILL_VALUE = -999;
 
 AudioEventRTS ThingTemplate::s_audioEventNoSound;
 
-/* 
+/*
 	NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem!
 
-	"s_objectReskinFieldParseTable" is intended to be used for parsing the "ObjectReskin" keyword, and 
-	should only allow you to specify things that affect the appearance of a template. 
-	
+	"s_objectReskinFieldParseTable" is intended to be used for parsing the "ObjectReskin" keyword, and
+	should only allow you to specify things that affect the appearance of a template.
+
 	The idea is that some units are functionally the same, but different visually; rather than replicate
 	all the settings, you can specify it as "this one is like that one, but looks different".
 
 	Thus, currently, the only things in the reskin table are:
-		
+
 		-- DrawModules
 		-- DrawModuleData
 		-- Geometry
-	
-	So: if you add/remove/modify any settings that deal with visual appearance, you *may* want to 
+
+	So: if you add/remove/modify any settings that deal with visual appearance, you *may* want to
 	add 'em to the reskin table... but do so VERY CAUTIOUSLY and with careful deliberation (and
 	after checking around for other opinions).
 
 */
 
 // NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem -- see comment above
-const FieldParse ThingTemplate::s_objectFieldParseTable[] = 
+const FieldParse ThingTemplate::s_objectFieldParseTable[] =
 {
 	{ "DisplayName",					INI::parseAndTranslateLabel,					NULL,								offsetof( ThingTemplate, m_displayName ) },
 	{ "RadarPriority",				INI::parseByteSizedIndexList,					RadarPriorityNames, offsetof( ThingTemplate, m_radarPriority ) },
@@ -129,7 +124,7 @@ const FieldParse ThingTemplate::s_objectFieldParseTable[] =
 
 	{ "FactoryExitWidth",			INI::parseReal,												NULL,		offsetof( ThingTemplate, m_factoryExitWidth ) },
 	{ "FactoryExtraBibWidth",	INI::parseReal,												NULL,		offsetof( ThingTemplate, m_factoryExtraBibWidth ) },
-																											
+
 	{ "SkillPointValue",			ThingTemplate::parseIntList,					(void*)LEVEL_COUNT,		offsetof( ThingTemplate, m_skillPointValues ) },
 	{ "ExperienceValue",			ThingTemplate::parseIntList,					(void*)LEVEL_COUNT,		offsetof( ThingTemplate, m_experienceValues ) },
 	{ "ExperienceRequired",		ThingTemplate::parseIntList,					(void*)LEVEL_COUNT,		offsetof( ThingTemplate, m_experienceRequired ) },
@@ -153,7 +148,7 @@ const FieldParse ThingTemplate::s_objectFieldParseTable[] =
 	{ "DisplayColor",					INI::parseColorInt,									NULL,		offsetof( ThingTemplate, m_displayColor ) },
 	{ "EditorSorting",				INI::parseByteSizedIndexList,				EditorSortingNames, offsetof( ThingTemplate, m_editorSorting ) },
 	{ "KindOf",								KindOfMaskType::parseFromINI,				NULL,		offsetof( ThingTemplate, m_kindof ) },
-	{ "CommandSet",						INI::parseAsciiString,							NULL,		offsetof( ThingTemplate, m_commandSetString ) },	
+	{ "CommandSet",						INI::parseAsciiString,							NULL,		offsetof( ThingTemplate, m_commandSetString ) },
 	{ "BuildVariations",			INI::parseAsciiStringVector,				NULL,		offsetof( ThingTemplate, m_buildVariations ) },
 
 // NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem -- see comment above
@@ -165,19 +160,19 @@ const FieldParse ThingTemplate::s_objectFieldParseTable[] =
 
 	{ "SelectPortrait",					INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_selectedPortraitImageName ) },
 	{ "ButtonImage",						INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_buttonImageName ) },
-	
+
 	//Code renderer handles these states now.
 	//{ "InventoryImageEnabled",	INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_inventoryImage[ INV_IMAGE_ENABLED ] ) },
 	//{ "InventoryImageDisabled",	INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_inventoryImage[ INV_IMAGE_DISABLED ] ) },
 	//{ "InventoryImageHilite",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_inventoryImage[ INV_IMAGE_HILITE ] ) },
 	//{ "InventoryImagePushed",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_inventoryImage[ INV_IMAGE_PUSHED ] ) },
-	
+
 	{ "UpgradeCameo1",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_upgradeCameoUpgradeNames[ 0 ] ) },
 	{ "UpgradeCameo2",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_upgradeCameoUpgradeNames[ 1 ] ) },
 	{ "UpgradeCameo3",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_upgradeCameoUpgradeNames[ 2 ] ) },
 	{ "UpgradeCameo4",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_upgradeCameoUpgradeNames[ 3 ] ) },
 	{ "UpgradeCameo5",		INI::parseAsciiString,	NULL,		offsetof( ThingTemplate, m_upgradeCameoUpgradeNames[ 4 ] ) },
-	
+
 // NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem -- see comment above
 
 	{ "VoiceSelect",					INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceSelect]) },
@@ -196,9 +191,9 @@ const FieldParse ThingTemplate::s_objectFieldParseTable[] =
 	{ "VoiceSurrender",				INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceSurrender]) },
 #endif
 	{ "VoiceDefect",					INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceDefect]) },
-	{ "VoiceAttackSpecial",		INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceAttackSpecial ]) },	
-	{ "VoiceAttackAir",				INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceAttackAir ]) },	
-	{ "VoiceGuard",						INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceGuard ]) },	
+	{ "VoiceAttackSpecial",		INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceAttackSpecial ]) },
+	{ "VoiceAttackAir",				INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceAttackAir ]) },
+	{ "VoiceGuard",						INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_voiceGuard ]) },
 	{ "SoundMoveStart",				INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_soundMoveStart]) },
 	{ "SoundMoveStartDamaged",INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_soundMoveStartDamaged]) },
 	{ "SoundMoveLoop",				INI::parseDynamicAudioEventRTS,	NULL,		offsetof( ThingTemplate, m_audioarray.m_audio[TTAUDIO_soundMoveLoop]) },
@@ -244,19 +239,19 @@ const FieldParse ThingTemplate::s_objectFieldParseTable[] =
 	{ "Locomotor",						AIUpdateModuleData::parseLocomotorSet, NULL, 0 },
 	{ "InstanceScaleFuzziness",	INI::parseReal,					NULL, offsetof(ThingTemplate, m_instanceScaleFuzziness ) },
 	{ "StructureRubbleHeight",	INI::parseUnsignedByte,					NULL, offsetof(ThingTemplate, m_structureRubbleHeight ) },
-	{ "ThreatValue",						INI::parseUnsignedShort,		NULL, offsetof(ThingTemplate, m_threatValue ) }, 
-  { "MaxSimultaneousOfType",	ThingTemplate::parseMaxSimultaneous,		NULL, offsetof(ThingTemplate, m_maxSimultaneousOfType ) }, 
-  { "MaxSimultaneousLinkKey",	NameKeyGenerator::parseStringAsNameKeyType,		NULL, offsetof(ThingTemplate, m_maxSimultaneousLinkKey ) }, 
+	{ "ThreatValue",						INI::parseUnsignedShort,		NULL, offsetof(ThingTemplate, m_threatValue ) },
+  { "MaxSimultaneousOfType",	ThingTemplate::parseMaxSimultaneous,		NULL, offsetof(ThingTemplate, m_maxSimultaneousOfType ) },
+  { "MaxSimultaneousLinkKey",	NameKeyGenerator::parseStringAsNameKeyType,		NULL, offsetof(ThingTemplate, m_maxSimultaneousLinkKey ) },
 	{ "CrusherLevel",					INI::parseUnsignedByte,			NULL, offsetof( ThingTemplate, m_crusherLevel ) },
 	{ "CrushableLevel",				INI::parseUnsignedByte,			NULL, offsetof( ThingTemplate, m_crushableLevel ) },
 
-	{ 0, 0, 0, 0 }  // keep this last
+	{ 0, 0, 0, 0 }
 
 };
 // NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem -- see comment above
 
 // NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem -- see comment above
-const FieldParse ThingTemplate::s_objectReskinFieldParseTable[] = 
+const FieldParse ThingTemplate::s_objectReskinFieldParseTable[] =
 {
 	{ "Draw",									ThingTemplate::parseModuleName,		(const void*)MODULETYPE_DRAW, offsetof(ThingTemplate, m_drawModuleInfo) },
 
@@ -269,10 +264,10 @@ const FieldParse ThingTemplate::s_objectReskinFieldParseTable[] =
 	{ "FenceXOffset",					INI::parseReal,													NULL,		offsetof( ThingTemplate, m_fenceXOffset ) },
 
   // Needed to avoid some cheats with the scud storm rebuild hole
-  { "MaxSimultaneousOfType",	ThingTemplate::parseMaxSimultaneous,		NULL, offsetof(ThingTemplate, m_maxSimultaneousOfType ) }, 
-  { "MaxSimultaneousLinkKey",	NameKeyGenerator::parseStringAsNameKeyType,		NULL, offsetof(ThingTemplate, m_maxSimultaneousLinkKey ) }, 
+  { "MaxSimultaneousOfType",	ThingTemplate::parseMaxSimultaneous,		NULL, offsetof(ThingTemplate, m_maxSimultaneousOfType ) },
+  { "MaxSimultaneousLinkKey",	NameKeyGenerator::parseStringAsNameKeyType,		NULL, offsetof(ThingTemplate, m_maxSimultaneousLinkKey ) },
 
-	{ 0, 0, 0, 0 }  // keep this last
+	{ 0, 0, 0, 0 }
 
 };
 // NOTE NOTE NOTE -- s_objectFieldParseTable and s_objectReskinFieldParseTable must be updated in tandem -- see comment above
@@ -291,16 +286,16 @@ const ModuleInfo::Nugget *ModuleInfo::getNuggetWithTag( const AsciiString& tag )
 	// no match
 	return NULL;
 
-}  // end isTagPresent
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add this module info to the thing template */
 // ------------------------------------------------------------------------------------------------
-void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate, 
-															 const AsciiString& name, 
-															 const AsciiString& moduleTag, 
-															 const ModuleData* data, 
-															 Int interfaceMask, 
+void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
+															 const AsciiString& name,
+															 const AsciiString& moduleTag,
+															 const ModuleData* data,
+															 Int interfaceMask,
 															 Bool inheritable,
                                Bool overrideableByLikeKind)
 {
@@ -309,17 +304,17 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 	// there must be a module tag present, and it must be unique across all module infos
 	// for this thing template
 	//
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	// get module info
 	const Nugget *nugget;
-	
+
 	nugget = thingTemplate->getBehaviorModuleInfo().getNuggetWithTag( moduleTag );
 	if( nugget != NULL )
 	{
 
 		// compare this nugget tag against the tag for the new data we're going to submit
 		DEBUG_ASSERTCRASH( nugget->m_moduleTag != moduleTag,
-											 ("addModuleInfo - ERROR defining module '%s' on thing template '%s'.  The module '%s' has the tag '%s' which must be unique among all modules for this object, but the tag '%s' is also already on module '%s' within this object.\n\nPlease make unique tag names within an object definition\n",
+											 ("addModuleInfo - ERROR defining module '%s' on thing template '%s'.  The module '%s' has the tag '%s' which must be unique among all modules for this object, but the tag '%s' is also already on module '%s' within this object.\n\nPlease make unique tag names within an object definition",
 												name.str(),
 												thingTemplate->getName().str(),
 												name.str(),
@@ -329,7 +324,7 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 
 		// srj sez: prevent people from ignoring this.
 		throw INI_INVALID_DATA;
-	}  // end if
+	}
 
 	nugget = thingTemplate->getDrawModuleInfo().getNuggetWithTag( moduleTag );
 	if( nugget != NULL )
@@ -337,7 +332,7 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 
 		// compare this nugget tag against the tag for the new data we're going to submit
 		DEBUG_ASSERTCRASH( nugget->m_moduleTag != moduleTag,
-											 ("addModuleInfo - ERROR defining module '%s' on thing template '%s'.  The module '%s' has the tag '%s' which must be unique among all modules for this object, but the tag '%s' is also already on module '%s' within this object.\n\nPlease make unique tag names within an object definition\n",
+											 ("addModuleInfo - ERROR defining module '%s' on thing template '%s'.  The module '%s' has the tag '%s' which must be unique among all modules for this object, but the tag '%s' is also already on module '%s' within this object.\n\nPlease make unique tag names within an object definition",
 												name.str(),
 												thingTemplate->getName().str(),
 												name.str(),
@@ -347,7 +342,7 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 
 		// srj sez: prevent people from ignoring this.
 		throw INI_INVALID_DATA;
-	}  // end if
+	}
 
 	nugget = thingTemplate->getClientUpdateModuleInfo().getNuggetWithTag( moduleTag );
 	if( nugget != NULL )
@@ -355,7 +350,7 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 
 		// compare this nugget tag against the tag for the new data we're going to submit
 		DEBUG_ASSERTCRASH( nugget->m_moduleTag != moduleTag,
-											 ("addModuleInfo - ERROR defining module '%s' on thing template '%s'.  The module '%s' has the tag '%s' which must be unique among all modules for this object, but the tag '%s' is also already on module '%s' within this object.\n\nPlease make unique tag names within an object definition\n",
+											 ("addModuleInfo - ERROR defining module '%s' on thing template '%s'.  The module '%s' has the tag '%s' which must be unique among all modules for this object, but the tag '%s' is also already on module '%s' within this object.\n\nPlease make unique tag names within an object definition",
 												name.str(),
 												thingTemplate->getName().str(),
 												name.str(),
@@ -364,7 +359,7 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 												nugget->first.str()) );
 		// srj sez: prevent people from ignoring this.
 		throw INI_INVALID_DATA;
-	}  // end if
+	}
 
 #endif
 
@@ -373,15 +368,15 @@ void ModuleInfo::addModuleInfo(ThingTemplate *thingTemplate,
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool ModuleInfo::clearModuleDataWithTag(const AsciiString& tagToClear, AsciiString& clearedModuleNameOut) 
-{ 
+Bool ModuleInfo::clearModuleDataWithTag(const AsciiString& tagToClear, AsciiString& clearedModuleNameOut)
+{
 	Bool cleared = false;
 
 	// do NOT clear... we only want to modify this if we return true.
 	// if we return false, we should leave this unmodified.
 	//clearedModuleNameOut.clear();
 
-	for (std::vector<Nugget>::iterator it = m_info.begin(); it != m_info.end(); /* empty */ ) 
+	for (std::vector<Nugget>::iterator it = m_info.begin(); it != m_info.end(); /* empty */ )
 	{
 		if (it->m_moduleTag == tagToClear)
 		{
@@ -403,8 +398,8 @@ Bool ModuleInfo::clearModuleDataWithTag(const AsciiString& tagToClear, AsciiStri
 
 
 //-------------------------------------------------------------------------------------------------
-Bool ModuleInfo::clearCopiedFromDefaultEntries(Int interfaceMask, const AsciiString &newName, const ThingTemplate *fullTemplate ) 
-{ 
+Bool ModuleInfo::clearCopiedFromDefaultEntries(Int interfaceMask, const AsciiString &newName, const ThingTemplate *fullTemplate )
+{
   static KindOfMaskType ImmuneToGPSScramblerMask;
   KindOfMaskType &m = ImmuneToGPSScramblerMask;
   m.set(KINDOF_AIRCRAFT);// NO PLANES or helicopters
@@ -454,7 +449,7 @@ Bool ModuleInfo::clearCopiedFromDefaultEntries(Int interfaceMask, const AsciiStr
 			}
       else if ( it->overrideableByLikeKind)
       {
-        
+
         AsciiString oldName = it->first;
         if ( oldName == newName  //we will dump this instance, since the INI author requested a specific one of the same class
              || disallowed  // or, we just do not Add these special overrideables to these kinds of templates, so just dump it
@@ -486,8 +481,8 @@ Bool ModuleInfo::clearCopiedFromDefaultEntries(Int interfaceMask, const AsciiStr
 
 
 //-------------------------------------------------------------------------------------------------
-Bool ModuleInfo::clearAiModuleInfo() 
-{ 
+Bool ModuleInfo::clearAiModuleInfo()
+{
 	Bool ret = false;
 
 	std::vector<Nugget>::iterator it = m_info.begin();
@@ -524,11 +519,11 @@ void ThingTemplate::parseModuleName(INI* ini, void *instance, void* store, const
 	catch( ... )
 	{
 
-		DEBUG_CRASH(( "[LINE: %d - FILE: '%s'] Module tag not found for module '%s' on thing template '%s'.  Module tags are required and must be unique for all modules within an object definition\n",
-									ini->getLineNum(), ini->getFilename().str(), 
+		DEBUG_CRASH(( "[LINE: %d - FILE: '%s'] Module tag not found for module '%s' on thing template '%s'.  Module tags are required and must be unique for all modules within an object definition",
+									ini->getLineNum(), ini->getFilename().str(),
 									tokenStr.str(), self->getName().str() ));
 		throw;
-				
+
 	}
 
 	Int interfaceMask;
@@ -554,17 +549,17 @@ void ThingTemplate::parseModuleName(INI* ini, void *instance, void* store, const
 			throw INI_INVALID_DATA;
 		}
 	}
-	
+
 	// if we're overriding, we can totally skip over this block
 	if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES)
-	{	
+	{
 		if (self->m_moduleParsingMode == MODULEPARSE_ADD_REMOVE_REPLACE)
 		{
 			// do nothing, just fall thru
 		}
 		else
 		{
-			DEBUG_CRASH(("[LINE: %d - FILE: '%s'] You must use AddModule to add modules in override INI files.\n",
+			DEBUG_CRASH(("[LINE: %d - FILE: '%s'] You must use AddModule to add modules in override INI files.",
 				ini->getLineNum(), ini->getFilename().str(), self->getName().str()));
 			throw INI_INVALID_DATA;
 		}
@@ -580,20 +575,20 @@ void ThingTemplate::parseModuleName(INI* ini, void *instance, void* store, const
 		self->m_clientUpdateModuleInfo.clearCopiedFromDefaultEntries(interfaceMask, tokenStr, self );
 	}
 
-	if (self->m_moduleParsingMode == MODULEPARSE_ADD_REMOVE_REPLACE 
+	if (self->m_moduleParsingMode == MODULEPARSE_ADD_REMOVE_REPLACE
 			&& self->m_moduleBeingReplacedName.isNotEmpty()
 			&& self->m_moduleBeingReplacedName != tokenStr)
 	{
-		DEBUG_CRASH(("[LINE: %d - FILE: '%s'] ReplaceModule must replace modules with another module of the same type, but you are attempting to replace a %s with a %s for Object %s.\n",
+		DEBUG_CRASH(("[LINE: %d - FILE: '%s'] ReplaceModule must replace modules with another module of the same type, but you are attempting to replace a %s with a %s for Object %s.",
 			ini->getLineNum(), ini->getFilename().str(), self->m_moduleBeingReplacedName.str(), tokenStr.str(), self->getName().str()));
 		throw INI_INVALID_DATA;
 	}
 
-	if (self->m_moduleParsingMode == MODULEPARSE_ADD_REMOVE_REPLACE 
+	if (self->m_moduleParsingMode == MODULEPARSE_ADD_REMOVE_REPLACE
 			&& self->m_moduleBeingReplacedTag.isNotEmpty()
 			&& self->m_moduleBeingReplacedTag == moduleTagStr)
 	{
-		DEBUG_CRASH(("[LINE: %d - FILE: '%s'] ReplaceModule must specify a new, unique tag for the replaced module, but you are not doing so for %s (%s) for Object %s.\n",
+		DEBUG_CRASH(("[LINE: %d - FILE: '%s'] ReplaceModule must specify a new, unique tag for the replaced module, but you are not doing so for %s (%s) for Object %s.",
 			ini->getLineNum(), ini->getFilename().str(), moduleTagStr.str(), self->m_moduleBeingReplacedName.str(), self->getName().str()));
 		throw INI_INVALID_DATA;
 	}
@@ -606,7 +601,7 @@ void ThingTemplate::parseModuleName(INI* ini, void *instance, void* store, const
 		if (replaced)
 		{
 			//Kris: Commented this out for SPAM reasons. Do we really need this?
-			//DEBUG_LOG(("replaced an AI for %s!\n",self->getName().str()));
+			//DEBUG_LOG(("replaced an AI for %s!",self->getName().str()));
 		}
 	}
 
@@ -660,7 +655,7 @@ void ThingTemplate::parsePrerequisites( INI* ini, void *instance, void *store, c
 {
 	ThingTemplate* self = (ThingTemplate*)instance;
 
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ "Object", parsePrerequisiteUnit, 0, 0 },
 		{ "Science", parsePrerequisiteScience,	0, 0 },
@@ -682,8 +677,8 @@ static void parseArbitraryFXIntoMap( INI* ini, void *instance, void* /* store */
 	const char* name = (const char*)userData;
 	const char* token = ini->getNextToken();
 	const FXList* fxl = TheFXListStore->findFXList(token);	// could be null!
-	DEBUG_ASSERTCRASH(fxl != NULL || stricmp(token, "None") == 0, ("FXList %s not found!\n",token));
-	mapFX->insert(std::make_pair(AsciiString(name), fxl));	
+	DEBUG_ASSERTCRASH(fxl != NULL || stricmp(token, "None") == 0, ("FXList %s not found!",token));
+	mapFX->insert(std::make_pair(AsciiString(name), fxl));
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -694,7 +689,7 @@ void ThingTemplate::parsePerUnitFX( INI* ini, void *instance, void *store, const
 
 	fxmap->clear();
 
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ 0, parseArbitraryFXIntoMap, NULL, 0 },
 		{ 0, 0, 0, 0 }
@@ -709,11 +704,11 @@ static void parseArbitrarySoundsIntoMap( INI* ini, void *instance, void* /* stor
 	PerUnitSoundMap *mapSounds = (PerUnitSoundMap*) instance;
 	const char* name = (const char*)userData;
 	const char* token = ini->getNextToken();
-	
+
 	AudioEventRTS a;
 	if (token)
 		a.setEventName(token);
-	mapSounds->insert(std::make_pair(AsciiString(name), a));	
+	mapSounds->insert(std::make_pair(AsciiString(name), a));
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -724,7 +719,7 @@ void ThingTemplate::parsePerUnitSounds( INI* ini, void *instance, void *store, c
 	PerUnitSoundMap *mapSounds = (PerUnitSoundMap*)store;
 	mapSounds->clear();
 
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ 0, parseArbitrarySoundsIntoMap, NULL, 0 },
 		{ 0, 0, 0, 0 }
@@ -739,7 +734,7 @@ void ThingTemplate::parsePerUnitSounds( INI* ini, void *instance, void *store, c
 void ThingTemplate::parseAddModule(INI *ini, void *instance, void *store, const void *userData)
 {
 	// don't care about the result.
-	ThingTemplate* self = (ThingTemplate*)instance;	
+	ThingTemplate* self = (ThingTemplate*)instance;
 
 	ModuleParseMode oldMode = (ModuleParseMode)self->m_moduleParsingMode;
 	if (oldMode != MODULEPARSE_NORMAL)
@@ -757,7 +752,7 @@ void ThingTemplate::parseAddModule(INI *ini, void *instance, void *store, const
 //-------------------------------------------------------------------------------------------------
 void ThingTemplate::parseRemoveModule(INI *ini, void *instance, void *store, const void *userData)
 {
-	ThingTemplate* self = (ThingTemplate*)instance;	
+	ThingTemplate* self = (ThingTemplate*)instance;
 
 	ModuleParseMode oldMode = (ModuleParseMode)self->m_moduleParsingMode;
 	if (oldMode != MODULEPARSE_NORMAL)
@@ -770,7 +765,7 @@ void ThingTemplate::parseRemoveModule(INI *ini, void *instance, void *store, con
 	Bool removed = self->removeModuleInfo(modToRemove, removedModuleName);
 	if (!removed)
 	{
-		DEBUG_ASSERTCRASH(removed, ("RemoveModule %s was not found for %s. The game will crash now!\n",modToRemove, self->getName().str()));
+		DEBUG_ASSERTCRASH(removed, ("RemoveModule %s was not found for %s. The game will crash now!",modToRemove, self->getName().str()));
 		throw INI_INVALID_DATA;
 	}
 
@@ -782,7 +777,7 @@ void ThingTemplate::parseRemoveModule(INI *ini, void *instance, void *store, con
 //-------------------------------------------------------------------------------------------------
 void ThingTemplate::parseReplaceModule(INI *ini, void *instance, void *store, const void *userData)
 {
-	ThingTemplate* self = (ThingTemplate*)instance;	
+	ThingTemplate* self = (ThingTemplate*)instance;
 
 	ModuleParseMode oldMode = (ModuleParseMode)self->m_moduleParsingMode;
 	if (oldMode != MODULEPARSE_NORMAL)
@@ -795,7 +790,7 @@ void ThingTemplate::parseReplaceModule(INI *ini, void *instance, void *store, co
 	Bool removed = self->removeModuleInfo(modToRemove, removedModuleName);
 	if (!removed)
 	{
-		DEBUG_CRASH(("[LINE: %d - FILE: '%s'] ReplaceModule %s was not found for %s; cannot continue.\n",
+		DEBUG_CRASH(("[LINE: %d - FILE: '%s'] ReplaceModule %s was not found for %s; cannot continue.",
 															ini->getLineNum(), ini->getFilename().str(), modToRemove, self->getName().str()));
 		throw INI_INVALID_DATA;
 	}
@@ -814,7 +809,7 @@ void ThingTemplate::parseReplaceModule(INI *ini, void *instance, void *store, co
 //-------------------------------------------------------------------------------------------------
 void ThingTemplate::parseInheritableModule(INI *ini, void *instance, void *store, const void *userData)
 {
-	ThingTemplate* self = (ThingTemplate*)instance;	
+	ThingTemplate* self = (ThingTemplate*)instance;
 
 	ModuleParseMode oldMode = (ModuleParseMode)self->m_moduleParsingMode;
 	if (oldMode != MODULEPARSE_NORMAL)
@@ -833,7 +828,7 @@ void ThingTemplate::parseInheritableModule(INI *ini, void *instance, void *store
 //-------------------------------------------------------------------------------------------------
 void ThingTemplate::OverrideableByLikeKind(INI *ini, void *instance, void *store, const void *userData)
 {
-	ThingTemplate* self = (ThingTemplate*)instance;	
+	ThingTemplate* self = (ThingTemplate*)instance;
 
 	ModuleParseMode oldMode = (ModuleParseMode)self->m_moduleParsingMode;
 	if (oldMode != MODULEPARSE_NORMAL)
@@ -885,7 +880,7 @@ Bool ThingTemplate::removeModuleInfo(const AsciiString& moduleToRemove, AsciiStr
 /// @todo srj -- move this to another file
 void ArmorTemplateSet::parseArmorTemplateSet( INI* ini )
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ "Conditions", ArmorSetFlags::parseFromINI, NULL, offsetof( ArmorTemplateSet, m_types ) },
 		{ "Armor", INI::parseArmorTemplate,	NULL, offsetof( ArmorTemplateSet, m_template ) },
@@ -908,14 +903,14 @@ void ThingTemplate::parseArmorTemplateSet( INI* ini, void *instance, void * /*st
 
 	ArmorTemplateSet ws;
 	ws.parseArmorTemplateSet(ini);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES)
 	{
 		for (ArmorTemplateSetVector::const_iterator it = self->m_armorTemplateSets.begin(); it != self->m_armorTemplateSets.end(); ++it)
 		{
 			if (it->getNthConditionsYes(0) == ws.getNthConditionsYes(0))
 			{
-				DEBUG_CRASH(("dup armorset condition in %s\n",self->getName().str()));
+				DEBUG_CRASH(("dup armorset condition in %s",self->getName().str()));
 			}
 		}
 	}
@@ -936,14 +931,14 @@ void ThingTemplate::parseWeaponTemplateSet( INI* ini, void *instance, void * /*s
 
 	WeaponTemplateSet ws;
 	ws.parseWeaponTemplateSet(ini, self);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES)
 	{
 		for (WeaponTemplateSetVector::const_iterator it = self->m_weaponTemplateSets.begin(); it != self->m_weaponTemplateSets.end(); ++it)
 		{
 			if (it->getNthConditionsYes(0) == ws.getNthConditionsYes(0))
 			{
-				DEBUG_CRASH(("dup weaponset condition in %s\n",self->getName().str()));
+				DEBUG_CRASH(("dup weaponset condition in %s",self->getName().str()));
 			}
 		}
 	}
@@ -1053,9 +1048,9 @@ ThingTemplate::ThingTemplate() :
 AIUpdateModuleData *ThingTemplate::friend_getAIModuleInfo(void)
 {
 	Int numModInfos = m_behaviorModuleInfo.getCount();
-	for (int j = 0; j < numModInfos; ++j) 
+	for (int j = 0; j < numModInfos; ++j)
 	{
-		if (m_behaviorModuleInfo.getNthData(j) && m_behaviorModuleInfo.getNthData(j)->isAiModuleData()) 
+		if (m_behaviorModuleInfo.getNthData(j) && m_behaviorModuleInfo.getNthData(j)->isAiModuleData())
 		{
 			return (AIUpdateModuleData *)m_behaviorModuleInfo.friend_getNthData(j);
 		}
@@ -1068,11 +1063,11 @@ AIUpdateModuleData *ThingTemplate::friend_getAIModuleInfo(void)
 //-------------------------------------------------------------------------------------------------
 void ThingTemplate::validateAudio()
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 
 	#define AUDIO_TEST(y) \
 		if (!get##y()->getEventName().isEmpty() && get##y()->getEventName().compareNoCase("NoSound") != 0) { \
-			DEBUG_ASSERTLOG(TheAudio->isValidAudioEvent(get##y()), ("Invalid Sound '%s' in Object '%s'. (%s?)\n", #y, getName().str(), get##y()->getEventName().str())); \
+			DEBUG_ASSERTLOG(TheAudio->isValidAudioEvent(get##y()), ("Invalid Sound '%s' in Object '%s'. (%s?)", #y, getName().str(), get##y()->getEventName().str())); \
 		}
 
 	AUDIO_TEST(VoiceSelect)
@@ -1115,24 +1110,24 @@ void ThingTemplate::validateAudio()
 	AUDIO_TEST(SoundPromotedVeteran)
 	AUDIO_TEST(SoundPromotedElite)
 	AUDIO_TEST(SoundPromotedHero)
-	
+
 	#undef AUDIO_TEST
 
 	const PerUnitSoundMap *perUnitSounds = getAllPerUnitSounds();
-	if (!perUnitSounds) 
+	if (!perUnitSounds)
 	{
 		return;
 	}
 
-	for (PerUnitSoundMap::const_iterator it = perUnitSounds->begin(); it != perUnitSounds->end(); ++it) 
+	for (PerUnitSoundMap::const_iterator it = perUnitSounds->begin(); it != perUnitSounds->end(); ++it)
 	{
-		if (!it->second.getEventName().isEmpty() && it->second.getEventName().compareNoCase("NoSound") != 0) 
+		if (!it->second.getEventName().isEmpty() && it->second.getEventName().compareNoCase("NoSound") != 0)
 		{
-			DEBUG_ASSERTCRASH(TheAudio->isValidAudioEvent(&it->second), 
-												("Invalid UnitSpecificSound '%s' in Object '%s'. (%s?)", 
-												it->first.str(), 
-												getName().str(), 
-												it->second.getEventName().str())); 
+			DEBUG_ASSERTCRASH(TheAudio->isValidAudioEvent(&it->second),
+												("Invalid UnitSpecificSound '%s' in Object '%s'. (%s?)",
+												it->first.str(),
+												getName().str(),
+												it->second.getEventName().str()));
 		}
 	}
 #endif
@@ -1142,7 +1137,7 @@ void ThingTemplate::validateAudio()
 void ThingTemplate::validate()
 {
 	if (m_shadowTextureName.isEmpty())
-	{	
+	{
 		// no texture given, pick a default
 		switch (getTemplateGeometryInfo().getGeomType())
 		{
@@ -1158,8 +1153,8 @@ void ThingTemplate::validate()
 
 	validateAudio();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	
+#if defined(RTS_DEBUG)
+
 	if (getName() == "DefaultThingTemplate")
 		return;
 
@@ -1180,7 +1175,7 @@ void ThingTemplate::validate()
 		return;
 
 	Bool isImmobile = isKindOf(KINDOF_IMMOBILE);
-	
+
 	if (isKindOf(KINDOF_SHRUBBERY) && !isImmobile)
 	{
 		DEBUG_CRASH(("SHRUBBERY %s must be marked IMMOBILE!",getName().str()));
@@ -1188,25 +1183,25 @@ void ThingTemplate::validate()
 
 	if (isKindOf(KINDOF_STRUCTURE) && !isImmobile)
 	{
-		DEBUG_CRASH(("Structure %s is not marked immobile, but probably should be -- please fix it. (If we ever add mobile structures, this debug sniffer will need to be revised.)\n",getName().str()));
+		DEBUG_CRASH(("Structure %s is not marked immobile, but probably should be -- please fix it. (If we ever add mobile structures, this debug sniffer will need to be revised.)",getName().str()));
 	}
 
 	if (isKindOf(KINDOF_STICK_TO_TERRAIN_SLOPE) && !isImmobile)
 	{
-		DEBUG_CRASH(("item %s is marked STICK_TO_TERRAIN_SLOPE but not IMMOBILE -- please fix it.\n",getName().str()));
+		DEBUG_CRASH(("item %s is marked STICK_TO_TERRAIN_SLOPE but not IMMOBILE -- please fix it.",getName().str()));
 	}
 
 	if (isKindOf(KINDOF_STRUCTURE))
 	{
 		if (m_armorTemplateSets.empty() || (m_armorTemplateSets.size() == 1 && m_armorTemplateSets[0].getArmorTemplate() == NULL))
 		{
-			DEBUG_CRASH(("Structure %s has no armor, but probably should (StructureArmor) -- please fix it.)\n",getName().str()));
+			DEBUG_CRASH(("Structure %s has no armor, but probably should (StructureArmor) -- please fix it.)",getName().str()));
 		}
 		for (ArmorTemplateSetVector::const_iterator it = m_armorTemplateSets.begin(); it != m_armorTemplateSets.end(); ++it)
 		{
 			if (it->getDamageFX() == NULL)
 			{
-				DEBUG_CRASH(("Structure %s has no ArmorDamageFX, and really should.\n",getName().str()));
+				DEBUG_CRASH(("Structure %s has no ArmorDamageFX, and really should.",getName().str()));
 			}
 		}
 	}
@@ -1248,13 +1243,13 @@ ThingTemplate::~ThingTemplate()
 	// note, we don't need to take any special action for Armor/WeaponSets...
 	// though it is just a list of 'raw' pointers, we don't have ownership of 'em,
 	// and so we MUST NOT delete them
-} 
+}
 
 //=============================================================================
 void ThingTemplate::resolveNames()
 {
 	Int i, j;
-	
+
 	//Kris: July 31, 2003
 	//NOTE: Make sure that all code in this function supports caching properly. For example,
 	//      templates can be partially overridden by map.ini files. When this happens, strings
@@ -1263,7 +1258,7 @@ void ThingTemplate::resolveNames()
 	//      so we will want to make sure we don't NULL out cached data if the string is empty. A
 	//      concrete example is overriding an object with prerequisites. We just override the portrait.
 	//      So the 1st time we call this function, we get the standard template data. During this first
-	//      call, the strings are looked up, cached, and cleared. Then we override the portrait in the 
+	//      call, the strings are looked up, cached, and cleared. Then we override the portrait in the
 	//      map.ini. The next time we call this function, we look up all the strings again. The prereq
 	//      names didn't used to check for empty strings so they would NULL out all the previous prereqs
 	//      the object had. So be sure to make sure all string lookups don't blindly lookup things -- check
@@ -1286,10 +1281,10 @@ void ThingTemplate::resolveNames()
 			// but ThingTemplate can muck with stuff with gleeful abandon. (srj)
 			if( tmpls[ j ] )
 				const_cast<ThingTemplate*>(tmpls[j])->m_isBuildFacility = true;
-			// DEBUG_LOG(("BF: %s is a buildfacility for %s\n",tmpls[j]->m_nameString.str(),this->m_nameString.str()));
+			// DEBUG_LOG(("BF: %s is a buildfacility for %s",tmpls[j]->m_nameString.str(),this->m_nameString.str()));
 		}
 	}
-	
+
 	if (isKindOf(KINDOF_COMMANDCENTER)) {
 		// Command centers are considered factories. jba.
 		m_isBuildFacility = true;
@@ -1321,7 +1316,7 @@ void ThingTemplate::initForLTA(const AsciiString& name)
 	m_nameString = name;
 
 	char buffer[1024];
-	strncpy(buffer, name.str(), sizeof(buffer));
+	strlcpy(buffer, name.str(), sizeof(buffer));
 	int i=0;
 	for (; buffer[i]; i++) {
 		if (buffer[i] == '/') {
@@ -1357,7 +1352,7 @@ void ThingTemplate::initForLTA(const AsciiString& name)
 	m_shadowType = SHADOW_VOLUME;
 
 	m_geometryInfo.set(GEOMETRY_SPHERE, false, 10.0, 10.0, 10.0);
-	
+
 }
 #endif
 
@@ -1379,7 +1374,7 @@ const WeaponTemplateSet* ThingTemplate::findWeaponTemplateSet(const WeaponSetFla
 // returns false if we have no weaponsets, or they are all empty.
 Bool ThingTemplate::canPossiblyHaveAnyWeapon() const
 {
-	for (WeaponTemplateSetVector::const_iterator it = m_weaponTemplateSets.begin(); 
+	for (WeaponTemplateSetVector::const_iterator it = m_weaponTemplateSets.begin();
 					it != m_weaponTemplateSets.end();
 					++it)
 	{
@@ -1390,13 +1385,13 @@ Bool ThingTemplate::canPossiblyHaveAnyWeapon() const
 }
 
 //-----------------------------------------------------------------------------
-Int ThingTemplate::getSkillPointValue(Int level) const 
-{ 
-	Int value = m_skillPointValues[level]; 
-	
+Int ThingTemplate::getSkillPointValue(Int level) const
+{
+	Int value = m_skillPointValues[level];
+
 	if (value == USE_EXP_VALUE_FOR_SKILL_VALUE)
 		value = getExperienceValue(level);
-	
+
 	return value;
 }
 
@@ -1414,27 +1409,27 @@ const ThingTemplate *ThingTemplate::getBuildFacilityTemplate( const Player *play
 }
 
 //-------------------------------------------------------------------------------------------------
-BuildableStatus ThingTemplate::getBuildable() const 
-{ 
+BuildableStatus ThingTemplate::getBuildable() const
+{
 	BuildableStatus bs;
 	if (TheGameLogic && TheGameLogic->findBuildableStatusOverride(this, bs))
 		return bs;
 
-	return (BuildableStatus)m_buildable; 
+	return (BuildableStatus)m_buildable;
 }
 
 //-------------------------------------------------------------------------------------------------
 const FXList *ThingTemplate::getPerUnitFX(const AsciiString& fxName) const
 {
-	if (fxName.isEmpty()) 
+	if (fxName.isEmpty())
 	{
 		return NULL;
 	}
-	
+
 	PerUnitFXMap::const_iterator it = m_perUnitFX.find(fxName);
-	if (it == m_perUnitFX.end()) 
+	if (it == m_perUnitFX.end())
 	{
-		DEBUG_CRASH(("Unknown FX name (%s) asked for in ThingTemplate (%s). ", fxName.str(), m_nameString.str()));
+		DEBUG_CRASH(("Unknown FX name (%s) asked for in ThingTemplate (%s)", fxName.str(), m_nameString.str()));
 		return NULL;
 	}
 
@@ -1444,16 +1439,16 @@ const FXList *ThingTemplate::getPerUnitFX(const AsciiString& fxName) const
 //-------------------------------------------------------------------------------------------------
 const AudioEventRTS *ThingTemplate::getPerUnitSound(const AsciiString& soundName) const
 {
-	if (soundName.isEmpty()) 
+	if (soundName.isEmpty())
 	{
 		return &s_audioEventNoSound;
 	}
-	
+
 	PerUnitSoundMap::const_iterator it = m_perUnitSounds.find(soundName);
-	if (it == m_perUnitSounds.end()) 
+	if (it == m_perUnitSounds.end())
 	{
 #ifndef DO_UNIT_TIMINGS
-    DEBUG_LOG(("Unknown Audio name (%s) asked for in ThingTemplate (%s).\n", soundName.str(), m_nameString.str()));
+    DEBUG_LOG(("Unknown Audio name (%s) asked for in ThingTemplate (%s).", soundName.str(), m_nameString.str()));
 #endif
     return &s_audioEventNoSound;
 	}
@@ -1479,14 +1474,14 @@ UnsignedInt ThingTemplate::getMaxSimultaneousOfType() const
 Bool ThingTemplate::isEquivalentTo(const ThingTemplate* tt) const
 {
 	// sanity
-	if (!(this && tt)) 
+	if (!tt)
 		return false;
 
 	// sanity
-	if (this == tt) 
+	if (this == tt)
 		return true;
-	
-	if (this->getFinalOverride() == tt->getFinalOverride()) 
+
+	if (this->getFinalOverride() == tt->getFinalOverride())
 		return true;
 
 	// This reskinned from that?
@@ -1506,10 +1501,10 @@ Bool ThingTemplate::isEquivalentTo(const ThingTemplate* tt) const
 	Int i;
 
 	Int numVariations = m_buildVariations.size();
-	for (i = 0; i < numVariations; ++i) 
+	for (i = 0; i < numVariations; ++i)
 		if (m_buildVariations[i].compareNoCase(tt->getName()) == 0)
 			return true;
-	
+
 	numVariations = tt->m_buildVariations.size();
 	for (i = 0; i < numVariations; ++i)
 		if (tt->m_buildVariations[i].compareNoCase(getName()) == 0)
@@ -1554,7 +1549,7 @@ Int ThingTemplate::calcTimeToBuild( const Player* player) const
 	Real factionModifier = 1 + player->getProductionTimeChangePercent( getName() );
 	buildTime *= factionModifier;
 
-#if defined (RTS_DEBUG) || defined (RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	if( player->buildsInstantly() )
 	{
 		buildTime = 1;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/UserPreferences.cpp b/GeneralsMD/Code/GameEngine/Source/Common/UserPreferences.cpp
index 1d488c1d38d..7fefc7d5d1f 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/UserPreferences.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/UserPreferences.cpp
@@ -31,7 +31,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -51,11 +51,6 @@
 #include "GameClient/ChallengeGenerals.h"
 #include "GameNetwork/GameSpy/PeerDefs.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -108,7 +103,7 @@ static AsciiString realAsStr(Real val)
 
 
 //-----------------------------------------------------------------------------
-// UserPreferences Class 
+// UserPreferences Class
 //-----------------------------------------------------------------------------
 
 UserPreferences::UserPreferences( void )
@@ -148,7 +143,7 @@ Bool UserPreferences::load(AsciiString fname)
 				continue;
 
 			(*this)[key] = val;
-		}  // end while
+		}
 		fclose(fp);
 		return true;
 	}
@@ -241,7 +236,7 @@ void UserPreferences::setAsciiString(AsciiString key, AsciiString val)
 }
 
 //-----------------------------------------------------------------------------
-// QuickMatchPreferences base class 
+// QuickMatchPreferences base class
 //-----------------------------------------------------------------------------
 
 QuickMatchPreferences::QuickMatchPreferences()
@@ -426,7 +421,7 @@ Int QuickMatchPreferences::getSide( void )
 }
 
 //-----------------------------------------------------------------------------
-// CustomMatchPreferences base class 
+// CustomMatchPreferences base class
 //-----------------------------------------------------------------------------
 
 CustomMatchPreferences::CustomMatchPreferences()
@@ -680,7 +675,7 @@ AsciiString CustomMatchPreferences::getPreferredMap(void)
 		ret = getDefaultOfficialMap();
 		return ret;
 	}
-	
+
 	//can only use official maps if recording stats
 	if( getUseStats() && !isOfficialMap(ret) )
 		ret = getDefaultOfficialMap();
@@ -702,7 +697,7 @@ Bool CustomMatchPreferences::getSuperweaponRestricted(void) const
   {
     return false;
   }
-  
+
   return ( it->second.compareNoCase( "yes" ) == 0 );
 }
 
@@ -719,19 +714,19 @@ Money CustomMatchPreferences::getStartingCash(void) const
   {
     return TheMultiplayerSettings->getDefaultStartingMoney();
   }
-  
+
   Money money;
-  money.deposit( strtoul( it->second.str(), NULL, 10 ), FALSE  );
-  
+  money.deposit( strtoul( it->second.str(), NULL, 10 ), FALSE, FALSE );
+
   return money;
 }
 
 void CustomMatchPreferences::setStartingCash( const Money & startingCash )
 {
   AsciiString option;
-  
+
   option.format( "%d", startingCash.countMoney() );
-  
+
   (*this)[startingCashKey] = option;
 }
 
@@ -746,7 +741,7 @@ Bool CustomMatchPreferences::getFactionsLimited(void) const
   {
     return false; // The default
   }
-  
+
   return ( it->second.compareNoCase( "yes" ) == 0 );
 }
 
@@ -765,7 +760,7 @@ Bool CustomMatchPreferences::getUseStats(void) const
   {
     return true; // The default
   }
-  
+
   return ( it->second.compareNoCase( "yes" ) == 0 );
 }
 
@@ -775,7 +770,7 @@ void CustomMatchPreferences::setUseStats( Bool useStats )
 }
 
 //-----------------------------------------------------------------------------
-// GameSpyMiscPreferences base class 
+// GameSpyMiscPreferences base class
 //-----------------------------------------------------------------------------
 
 GameSpyMiscPreferences::GameSpyMiscPreferences()
@@ -820,7 +815,7 @@ Int GameSpyMiscPreferences::getMaxMessagesPerUpdate( void )
 	return getInt("MaxMessagesPerUpdate", 100);
 }
 //-----------------------------------------------------------------------------
-// IgnorePreferences base class 
+// IgnorePreferences base class
 //-----------------------------------------------------------------------------
 
 IgnorePreferences::IgnorePreferences()
@@ -853,7 +848,7 @@ void IgnorePreferences::setIgnore(const AsciiString& userName, Int profileID, Bo
 IgnorePrefMap IgnorePreferences::getIgnores(void)
 {
 	IgnorePrefMap ignores;
-	
+
 	IgnorePreferences::iterator it;
 	for (it = begin(); it != end(); ++it)
 	{
@@ -868,7 +863,7 @@ IgnorePrefMap IgnorePreferences::getIgnores(void)
 }
 
 //-----------------------------------------------------------------------------
-// LadderPreferences base class 
+// LadderPreferences base class
 //-----------------------------------------------------------------------------
 
 LadderPreferences::LadderPreferences()
@@ -896,7 +891,7 @@ Bool LadderPreferences::loadProfile( Int profileID )
 		AsciiString ladName = it->first;
 		AsciiString ladData = it->second;
 
-		DEBUG_LOG(("Looking at [%s] = [%s]\n", ladName.str(), ladData.str()));
+		DEBUG_LOG(("Looking at [%s] = [%s]", ladName.str(), ladData.str()));
 
 		const char *ptr = ladName.reverseFind(':');
 		DEBUG_ASSERTCRASH(ptr, ("Did not find ':' in ladder name - skipping"));
@@ -904,11 +899,7 @@ Bool LadderPreferences::loadProfile( Int profileID )
 			continue;
 
 		p.port = atoi( ptr + 1 );
-		Int i=0;
-		for (; i<strlen(ptr); ++i)
-		{
-			ladName.removeLastChar();
-		}
+		ladName.truncateBy(strlen(ptr));
 		p.address = QuotedPrintableToAsciiString(ladName);
 
 		ptr = ladData.reverseFind(':');
@@ -917,10 +908,7 @@ Bool LadderPreferences::loadProfile( Int profileID )
 			continue;
 
 		p.lastPlayDate = atoi( ptr + 1 );
-		for (i=0; i<strlen(ptr); ++i)
-		{
-			ladData.removeLastChar();
-		}
+		ladData.truncateBy(strlen(ptr));
 		p.name = QuotedPrintableToUnicodeString(ladData);
 
 		m_ladders[p.lastPlayDate] = p;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/crc.cpp b/GeneralsMD/Code/GameEngine/Source/Common/crc.cpp
deleted file mode 100644
index ddf54fff939..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/Common/crc.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/crc.h"
-#include "Common/Debug.h"
-
-#ifdef RTS_DEBUG
-
-void CRC::addCRC( UnsignedByte val )
-{
-	int hibit;
-
-	//cout << "\t\t" << hex << val;
-//	val = htonl(val);
-	//cout << " / " << hex << val <<endl;
-
-
-	if (crc & 0x80000000) {
-		hibit = 1;
-	} else {
-		hibit = 0;
-	}
-
-	crc <<= 1;
-	crc += val;
-	crc += hibit;
-
-	//cout << hex << (*crc) <<endl;
-}
-
-
-void CRC::computeCRC( const void *buf, Int len )
-{
-	if (!buf || len < 1)
-	{
-		return;
-	}
-
-	//crc = 0;
-
-	UnsignedByte *uintPtr = (UnsignedByte *)buf;
-
-	for (int i=0 ; i<len ; i++) {
-		addCRC (*(uintPtr++));
-	}
-	//crc = htonl(crc);
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-UnsignedInt CRC::get( void )
-{
-
-	UnsignedInt tcrc = crc;
-	return tcrc;
-
-}  // end skip
-
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/version.cpp b/GeneralsMD/Code/GameEngine/Source/Common/version.cpp
index 923b7a204cd..39876290ccc 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/version.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/version.cpp
@@ -26,11 +26,13 @@
 // Generals version number class
 // Author: Matthew D. Campbell, November 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameText.h"
 #include "Common/version.h"
 
+#include "gitinfo.h"
+
 Version *TheVersion = NULL;	///< The Version singleton
 
 Version::Version()
@@ -39,9 +41,15 @@ Version::Version()
 	m_minor = 0;
 	m_buildNum = 0;
 	m_localBuildNum = 0;
-	m_buildUser = AsciiString("somebody");
-	m_buildLocation = AsciiString("somewhere");
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+	m_buildUser = AsciiString::TheEmptyString;
+	m_buildLocation = AsciiString::TheEmptyString;
+	m_asciiGitCommitCount = buildAsciiGitCommitCount();
+	m_asciiGitTagOrHash = buildAsciiGitTagOrHash();
+	m_asciiGitCommitTime = buildAsciiGitCommitTime();
+	m_unicodeGitCommitCount = buildUnicodeGitCommitCount();
+	m_unicodeGitTagOrHash = buildUnicodeGitTagOrHash();
+	m_unicodeGitCommitTime = buildUnicodeGitCommitTime();
+#if defined(RTS_DEBUG)
 	m_showFullVersion = TRUE;
 #else
 	m_showFullVersion = FALSE;
@@ -62,74 +70,78 @@ void Version::setVersion(Int major, Int minor, Int buildNum,
 	m_buildDate = buildDate;
 }
 
-UnsignedInt Version::getVersionNumber( void )
+UnsignedInt Version::getVersionNumber() const
 {
 	return m_major << 16 | m_minor;
 }
 
-AsciiString Version::getAsciiVersion( void )
+AsciiString Version::getAsciiVersion() const
 {
 	AsciiString version;
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	if (m_localBuildNum)
-		version.format("%d.%d.%d.%d%c%c", m_major, m_minor, m_buildNum, m_localBuildNum,
-			m_buildUser.getCharAt(0), m_buildUser.getCharAt(1));
-	else
-		version.format("%d.%d.%d", m_major, m_minor, m_buildNum);
-#else // defined RTS_DEBUG || defined RTS_INTERNAL
-	version.format("%d.%d", m_major, m_minor);
-#endif // defined RTS_DEBUG || defined RTS_INTERNAL
-
-	return version;
-}
-
-UnicodeString Version::getUnicodeVersion( void )
-{
-	UnicodeString version;
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	if (!m_localBuildNum)
-		version.format(TheGameText->fetch("Version:Format3").str(), m_major, m_minor, m_buildNum);
+	if (m_showFullVersion)
+	{
+		if (!m_localBuildNum)
+		{
+			version.format("%d.%d.%d", m_major, m_minor, m_buildNum);
+		}
+		else
+		{
+			AsciiString user = getAsciiBuildUserOrGitCommitAuthorName();
+			// User name requires at least 2 characters
+			if (user.getLength() < 2)
+				user.concat("xx");
+
+			version.format("%d.%d.%d.%d%c%c", m_major, m_minor, m_buildNum, m_localBuildNum,
+				user.getCharAt(0), user.getCharAt(1));
+		}
+	}
 	else
-		version.format(TheGameText->fetch("Version:Format4").str(), m_major, m_minor, m_buildNum, m_localBuildNum,
-			m_buildUser.getCharAt(0), m_buildUser.getCharAt(1));
-#else // defined RTS_DEBUG || defined RTS_INTERNAL
-	version.format(TheGameText->fetch("Version:Format2").str(), m_major, m_minor);
-#endif // defined RTS_DEBUG || defined RTS_INTERNAL
+	{
+		version.format("%d.%d", m_major, m_minor);
+	}
 
 #ifdef RTS_DEBUG
-	version.concat(UnicodeString(L" Debug"));
-#endif
-
-#ifdef RTS_INTERNAL
-	version.concat(UnicodeString(L" Internal"));
+	version.concat(" Debug");
 #endif
 
 	return version;
 }
 
-UnicodeString Version::getFullUnicodeVersion( void )
+UnicodeString Version::getUnicodeVersion() const
 {
 	UnicodeString version;
 
-	if (!m_localBuildNum)
-		version.format(TheGameText->fetch("Version:Format3").str(), m_major, m_minor, m_buildNum);
+	if (m_showFullVersion)
+	{
+		if (!m_localBuildNum)
+		{
+			version.format(TheGameText->fetch("Version:Format3").str(), m_major, m_minor, m_buildNum);
+		}
+		else
+		{
+			UnicodeString user = getUnicodeBuildUserOrGitCommitAuthorName();
+			// User name requires at least 2 characters
+			if (user.getLength() < 2)
+				user.concat(L"xx");
+
+			version.format(TheGameText->fetch("Version:Format4").str(), m_major, m_minor, m_buildNum, m_localBuildNum,
+				user.getCharAt(0), user.getCharAt(1));
+		}
+	}
 	else
-		version.format(TheGameText->fetch("Version:Format4").str(), m_major, m_minor, m_buildNum, m_localBuildNum,
-			m_buildUser.getCharAt(0), m_buildUser.getCharAt(1));
+	{
+		version.format(TheGameText->fetch("Version:Format2").str(), m_major, m_minor);
+	}
 
 #ifdef RTS_DEBUG
-	version.concat(UnicodeString(L" Debug"));
-#endif
-
-#ifdef RTS_INTERNAL
-	version.concat(UnicodeString(L" Internal"));
+	version.concat(L" Debug");
 #endif
 
 	return version;
 }
 
-AsciiString Version::getAsciiBuildTime( void )
+AsciiString Version::getAsciiBuildTime() const
 {
 	AsciiString timeStr;
 	timeStr.format("%s %s", m_buildDate.str(), m_buildTime.str());
@@ -137,7 +149,7 @@ AsciiString Version::getAsciiBuildTime( void )
 	return timeStr;
 }
 
-UnicodeString Version::getUnicodeBuildTime( void )
+UnicodeString Version::getUnicodeBuildTime() const
 {
 	UnicodeString build;
 	UnicodeString dateStr;
@@ -150,34 +162,264 @@ UnicodeString Version::getUnicodeBuildTime( void )
 	return build;
 }
 
-AsciiString Version::getAsciiBuildLocation( void )
+AsciiString Version::getAsciiBuildLocation() const
 {
-	return AsciiString(m_buildLocation);
+	return m_buildLocation;
 }
 
-UnicodeString Version::getUnicodeBuildLocation( void )
+UnicodeString Version::getUnicodeBuildLocation() const
 {
 	UnicodeString build;
-	UnicodeString machine;
 
-	machine.translate(AsciiString(m_buildLocation));
-	build.format(TheGameText->fetch("Version:BuildMachine").str(), machine.str());
+	if (!m_buildLocation.isEmpty())
+	{
+		UnicodeString machine;
+		machine.translate(m_buildLocation);
+		build.format(TheGameText->fetch("Version:BuildMachine").str(), machine.str());
+	}
 
 	return build;
 }
 
-AsciiString Version::getAsciiBuildUser( void )
+AsciiString Version::getAsciiBuildUser() const
 {
-	return AsciiString(m_buildUser);
+	return m_buildUser;
 }
 
-UnicodeString Version::getUnicodeBuildUser( void )
+UnicodeString Version::getUnicodeBuildUser() const
 {
 	UnicodeString build;
-	UnicodeString user;
 
-	user.translate(AsciiString(m_buildUser));
-	build.format(TheGameText->fetch("Version:BuildUser").str(), user.str());
+	if (!m_buildUser.isEmpty())
+	{
+		UnicodeString user;
+		user.translate(m_buildUser);
+		build.format(TheGameText->fetch("Version:BuildUser").str(), user.str());
+	}
 
 	return build;
 }
+
+Int Version::getGitCommitCount()
+{
+	return GitRevision;
+}
+
+time_t Version::getGitCommitTime()
+{
+	return GitCommitTimeStamp;
+}
+
+const char* Version::getGitCommitAuthorName()
+{
+	return GitCommitAuthorName;
+}
+
+AsciiString Version::getAsciiGitCommitCount() const
+{
+	return m_asciiGitCommitCount;
+}
+
+UnicodeString Version::getUnicodeGitCommitCount() const
+{
+	return m_unicodeGitCommitCount;
+}
+
+AsciiString Version::getAsciiGitTagOrHash() const
+{
+	return m_asciiGitTagOrHash;
+}
+
+UnicodeString Version::getUnicodeGitTagOrHash() const
+{
+	return m_unicodeGitTagOrHash;
+}
+
+AsciiString Version::getAsciiGitCommitTime() const
+{
+	return m_asciiGitCommitTime;
+}
+
+UnicodeString Version::getUnicodeGitCommitTime() const
+{
+	return m_unicodeGitCommitTime;
+}
+
+AsciiString Version::getAsciiGitVersion() const
+{
+	AsciiString str;
+	if (m_showFullVersion)
+	{
+		str.format("%s %s",
+			getAsciiGitCommitCount().str(),
+			getAsciiGitTagOrHash().str());
+	}
+	else
+	{
+		str.format("%s",
+			getAsciiGitCommitCount().str());
+	}
+	return str;
+}
+
+UnicodeString Version::getUnicodeGitVersion() const
+{
+	UnicodeString str;
+	if (m_showFullVersion)
+	{
+		str.format(L"%s %s",
+			getUnicodeGitCommitCount().str(),
+			getUnicodeGitTagOrHash().str());
+	}
+	else
+	{
+		str.format(L"%s",
+			getUnicodeGitCommitCount().str());
+	}
+	return str;
+}
+
+AsciiString Version::getAsciiBuildUserOrGitCommitAuthorName() const
+{
+	AsciiString asciiUser = getAsciiBuildUser();
+
+	if (asciiUser.isEmpty())
+	{
+		asciiUser = getGitCommitAuthorName();
+	}
+
+	return asciiUser;
+}
+
+UnicodeString Version::getUnicodeBuildUserOrGitCommitAuthorName() const
+{
+	UnicodeString str;
+	AsciiString asciiUser = getAsciiBuildUserOrGitCommitAuthorName();
+
+	if (!asciiUser.isEmpty())
+	{
+		UnicodeString unicodeUser;
+		unicodeUser.translate(asciiUser);
+		str.format(TheGameText->fetch("Version:BuildUser").str(), unicodeUser.str());
+	}
+
+	return str;
+}
+
+UnicodeString Version::getUnicodeProductTitle() const
+{
+	// @todo Make configurable
+	return L"Community Patch";
+}
+
+UnicodeString Version::getUnicodeProductVersion() const
+{
+	return getUnicodeGitVersion();
+}
+
+UnicodeString Version::getUnicodeProductAuthor() const
+{
+	return getUnicodeBuildUserOrGitCommitAuthorName();
+}
+
+UnicodeString Version::getUnicodeProductString() const
+{
+	UnicodeString str;
+	UnicodeString productTitle = TheGameText->FETCH_OR_SUBSTITUTE("Version:ProductTitle", getUnicodeProductTitle().str());
+
+	if (!productTitle.isEmpty())
+	{
+		UnicodeString productVersion = TheGameText->FETCH_OR_SUBSTITUTE("Version:ProductVersion", getUnicodeProductVersion().str());
+		UnicodeString productAuthor = TheGameText->FETCH_OR_SUBSTITUTE("Version:ProductAuthor", getUnicodeProductAuthor().str());
+
+		str.concat(productTitle);
+
+		if (!productVersion.isEmpty())
+		{
+			str.concat(L" ");
+			str.concat(productVersion);
+		}
+
+		if (!productAuthor.isEmpty())
+		{
+			str.concat(L" ");
+			str.concat(productAuthor);
+		}
+	}
+
+	return str;
+}
+
+UnicodeString Version::getUnicodeProductVersionHashString() const
+{
+	UnicodeString str;
+	UnicodeString productString = getUnicodeProductString();
+	UnicodeString gameVersion = getUnicodeVersion();
+	UnicodeString gameHash;
+	gameHash.format(L"exe:%08X ini:%08X", TheGlobalData->m_exeCRC, TheGlobalData->m_iniCRC);
+
+	if (!productString.isEmpty())
+	{
+		str.concat(productString);
+		str.concat(L" | ");
+	}
+	str.concat(gameHash);
+	str.concat(L" ");
+	str.concat(gameVersion);
+
+	return str;
+}
+
+AsciiString Version::buildAsciiGitCommitCount()
+{
+	AsciiString str;
+	str.format("%s%d",
+		GitUncommittedChanges ? "~" : "",
+		GitRevision);
+	return str;
+}
+
+UnicodeString Version::buildUnicodeGitCommitCount()
+{
+	UnicodeString str;
+	str.format(L"%s%d",
+		GitUncommittedChanges ? L"~" : L"",
+		GitRevision);
+	return str;
+}
+
+AsciiString Version::buildAsciiGitTagOrHash()
+{
+	AsciiString str;
+	str.format("%s%s",
+		GitUncommittedChanges ? "~" : "",
+		GitTag[0] ? GitTag : GitShortSHA1);
+	return str;
+}
+
+UnicodeString Version::buildUnicodeGitTagOrHash()
+{
+	UnicodeString str;
+	str.translate(buildAsciiGitTagOrHash());
+	return str;
+}
+
+AsciiString Version::buildAsciiGitCommitTime()
+{
+	const Int len = 19;
+	AsciiString str;
+	Char* buf = str.getBufferForRead(len);
+	tm* time = gmtime(&GitCommitTimeStamp);
+	strftime(buf, len+1, "%Y-%m-%d %H:%M:%S", time);
+	return str;
+}
+
+UnicodeString Version::buildUnicodeGitCommitTime()
+{
+	const Int len = 19;
+	UnicodeString str;
+	WideChar* buf = str.getBufferForRead(len);
+	tm* time = gmtime(&GitCommitTimeStamp);
+	wcsftime(buf, len+1, L"%Y-%m-%d %H:%M:%S", time);
+	return str;
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/ClientInstance.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/ClientInstance.cpp
index 2ac1ff33988..417bcbd323a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/ClientInstance.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/ClientInstance.cpp
@@ -25,6 +25,12 @@ namespace rts
 HANDLE ClientInstance::s_mutexHandle = NULL;
 UnsignedInt ClientInstance::s_instanceIndex = 0;
 
+#if defined(RTS_MULTI_INSTANCE)
+Bool ClientInstance::s_isMultiInstance = true;
+#else
+Bool ClientInstance::s_isMultiInstance = false;
+#endif
+
 bool ClientInstance::initialize()
 {
 	if (isInitialized())
@@ -36,39 +42,42 @@ bool ClientInstance::initialize()
 	// WARNING: DO NOT use this number for any other application except Generals.
 	while (true)
 	{
-#if defined(RTS_MULTI_INSTANCE)
-		std::string guidStr = getFirstInstanceName();
-		if (s_instanceIndex > 0u)
-		{
-			char idStr[33];
-			itoa(s_instanceIndex, idStr, 10);
-			guidStr.push_back('-');
-			guidStr.append(idStr);
-		}
-		s_mutexHandle = CreateMutex(NULL, FALSE, guidStr.c_str());
-		if (GetLastError() == ERROR_ALREADY_EXISTS)
+		if (isMultiInstance())
 		{
-			if (s_mutexHandle != NULL)
+			std::string guidStr = getFirstInstanceName();
+			if (s_instanceIndex > 0u)
 			{
-				CloseHandle(s_mutexHandle);
-				s_mutexHandle = NULL;
+				char idStr[33];
+				itoa(s_instanceIndex, idStr, 10);
+				guidStr.push_back('-');
+				guidStr.append(idStr);
+			}
+			s_mutexHandle = CreateMutex(NULL, FALSE, guidStr.c_str());
+			if (GetLastError() == ERROR_ALREADY_EXISTS)
+			{
+				if (s_mutexHandle != NULL)
+				{
+					CloseHandle(s_mutexHandle);
+					s_mutexHandle = NULL;
+				}
+				// Try again with a new instance.
+				++s_instanceIndex;
+				continue;
 			}
-			// Try again with a new instance.
-			++s_instanceIndex;
-			continue;
 		}
-#else
-		s_mutexHandle = CreateMutex(NULL, FALSE, getFirstInstanceName());
-		if (GetLastError() == ERROR_ALREADY_EXISTS)
+		else
 		{
-			if (s_mutexHandle != NULL)
+			s_mutexHandle = CreateMutex(NULL, FALSE, getFirstInstanceName());
+			if (GetLastError() == ERROR_ALREADY_EXISTS)
 			{
-				CloseHandle(s_mutexHandle);
-				s_mutexHandle = NULL;
+				if (s_mutexHandle != NULL)
+				{
+					CloseHandle(s_mutexHandle);
+					s_mutexHandle = NULL;
+				}
+				return false;
 			}
-			return false;
 		}
-#endif
 		break;
 	}
 
@@ -80,6 +89,31 @@ bool ClientInstance::isInitialized()
 	return s_mutexHandle != NULL;
 }
 
+bool ClientInstance::isMultiInstance()
+{
+	return s_isMultiInstance;
+}
+
+void ClientInstance::setMultiInstance(bool v)
+{
+	if (isInitialized())
+	{
+		DEBUG_CRASH(("ClientInstance::setMultiInstance(%d) - cannot set multi instance after initialization", (int)v));
+		return;
+	}
+	s_isMultiInstance = v;
+}
+
+void ClientInstance::skipPrimaryInstance()
+{
+	if (isInitialized())
+	{
+		DEBUG_CRASH(("ClientInstance::skipPrimaryInstance() - cannot skip primary instance after initialization"));
+		return;
+	}
+	s_instanceIndex = 1;
+}
+
 UnsignedInt ClientInstance::getInstanceIndex()
 {
 	DEBUG_ASSERTLOG(isInitialized(), ("ClientInstance::isInitialized() failed"));
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Color.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Color.cpp
index 70d20e99e54..e98a90923dc 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Color.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Color.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Color.cpp ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,7 +46,7 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/Color.h"
 
@@ -69,9 +69,9 @@
 // GameMakeColor ==============================================================
 /** Create a color representation given red, green, blue, and
 	* alpha components
-	* 
+	*
 	* NOTE: pure solid white (255, 255, 255, 255) will translate
-	* intoa -1 which is GAME_COLOR_UNDEFINED 
+	* intoa -1 which is GAME_COLOR_UNDEFINED
 	*/
 //=============================================================================
 
@@ -79,11 +79,6 @@
 /** Get the RGB color comonents of a color */
 //=============================================================================
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //Put on ice until later M Lorenzen
@@ -100,8 +95,8 @@ void GameGetColorComponents( Color color,
 	*red		= (color & 0x00FF0000) >> 16;
 	*green	= (color & 0x0000FF00) >> 8;
 	*blue		= (color & 0x000000FF);
-	
-}  // end GameGetColorComponents
+
+}
 
 //Put on ice until later M Lorenzen
 //void GameGetColorComponentsWithCheatSpy( Color color,
@@ -119,7 +114,7 @@ void GameGetColorComponents( Color color,
 //  s_cheaterHasBeenSpied |= *green & (1<<17);   // decoy
 //	*blue		|= (color & 0x000000FE) >> 0;        // decoy
 //  s_cheaterHasBeenSpied |= *blue  & (1<<25);   // decoy
-//	
+//
 //}  // end GameGetColorComponents
 
 void GameGetColorComponentsReal( Color color, Real *red, Real *green, Real *blue, Real *alpha )
@@ -129,7 +124,7 @@ void GameGetColorComponentsReal( Color color, Real *red, Real *green, Real *blue
 	*green	= ((color & 0x0000FF00) >> 8) / 255.0f;
 	*blue		= (color & 0x000000FF) / 255.0f;
 }
-															
+
 
 Color GameDarkenColor( Color color, Int percent )
 {
@@ -144,7 +139,7 @@ Color GameDarkenColor( Color color, Int percent )
 	b -= (b * percent / 100);
 
 // Put on ice until later M Lorenzen
-//  TheWritableGlobalData->m_cheaterHasBeenSpiedIfMyLowestBitIsTrue = (r<<24) | (g<<16) | (b<<8) | s_cheaterHasBeenSpied; 
+//  TheWritableGlobalData->m_cheaterHasBeenSpiedIfMyLowestBitIsTrue = (r<<24) | (g<<16) | (b<<8) | s_cheaterHasBeenSpied;
 //  DEBUG_ASSERTCRASH( TheWritableGlobalData->m_cheaterHasBeenSpiedIfMyLowestBitIsTrue == FALSE, ("DIRTY ROTTEN CHEATER"));
 //  //my, but this looks like we just stored an alpha value along with rgb into the global data
 
@@ -153,5 +148,5 @@ Color GameDarkenColor( Color color, Int percent )
 
 	return GameMakeColor(r,g,b,a);
 
-}// end GameDarkenColor
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp
index afe800967a6..14c845436ad 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Credits.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Dec 2002
@@ -37,7 +37,7 @@
 //	Filename: 	Credits.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	This is where all the credit texts is going to be held.
 //
 //-----------------------------------------------------------------------------
@@ -56,11 +56,6 @@
 #include "GameClient/Display.h"
 #include "GameClient/GameText.h"
 #include "GameClient/GlobalLanguage.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-----------------------------------------------------------------------------
@@ -68,7 +63,7 @@
 //-----------------------------------------------------------------------------
 CreditsManager *TheCredits = NULL;
 
-const FieldParse CreditsManager::m_creditsFieldParseTable[] = 
+const FieldParse CreditsManager::m_creditsFieldParseTable[] =
 {
 
 	{ "ScrollRate",					INI::parseInt,											NULL, offsetof( CreditsManager, m_scrollRate )	},
@@ -81,7 +76,7 @@ const FieldParse CreditsManager::m_creditsFieldParseTable[] =
 	{ "Blank",							CreditsManager::parseBlank,					NULL,	NULL  },
 	{ "Text",								CreditsManager::parseText,					NULL,	NULL  },
 
-	{ NULL,										NULL,													NULL, 0 }  // keep this last
+	{ NULL,										NULL,													NULL, 0 }
 
 };
 
@@ -92,14 +87,14 @@ const FieldParse CreditsManager::m_creditsFieldParseTable[] =
 void INI::parseCredits( INI *ini )
 {
 	// find existing item if present
-	DEBUG_ASSERTCRASH( TheCredits, ("parseCredits: TheCredits has not been ininialized yet.\n") );
+	DEBUG_ASSERTCRASH( TheCredits, ("parseCredits: TheCredits has not been ininialized yet.") );
 	if( !TheCredits )
 		return;
 
 	// parse the ini definition
 	ini->initFromINI( TheCredits, TheCredits->getFieldParse() );
 
-}  // end parseCommandButtonDefinition
+}
 
 
 CreditsLine::CreditsLine()
@@ -117,7 +112,7 @@ CreditsLine::~CreditsLine()
 		TheDisplayStringManager->freeDisplayString(m_displayString);
 	if(m_secondDisplayString)
 		TheDisplayStringManager->freeDisplayString(m_secondDisplayString);
-	
+
 	m_displayString = NULL;
 	m_secondDisplayString = NULL;
 }
@@ -130,7 +125,7 @@ CreditsManager::CreditsManager(void)
 	m_scrollDown = TRUE;	// if TRUE text will come from the top to the bottom if False, it will go from the bottom up
 	m_framesSinceStarted = 0;
 	m_titleColor = m_positionColor = m_normalColor = GameMakeColor(255,255,255,255);
-	
+
 	m_currentStyle = CREDIT_STYLE_NORMAL;
 	m_isFinished = FALSE;
 	m_normalFontHeight = 10;
@@ -160,18 +155,18 @@ void CreditsManager::load(void )
 {
 	INI ini;
 	// Read from INI all the ControlBarSchemes
-	ini.load( AsciiString( "Data\\INI\\Credits.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Credits", INI_LOAD_OVERWRITE, NULL );
 
 	if(m_scrollRatePerFrames <=0)
 		m_scrollRatePerFrames = 1;
 	if(m_scrollRate <=0)
 		m_scrollRate = 1;
-	
+
 	GameFont *font = TheFontLibrary->getFont(TheGlobalLanguageData->m_creditsNormalFont.name,
 														TheGlobalLanguageData->adjustFontSize(TheGlobalLanguageData->m_creditsNormalFont.size),
 														TheGlobalLanguageData->m_creditsNormalFont.bold);
 
-	m_normalFontHeight = font->height;
+	m_normalFontHeight = font ? font->height : 0;
 }
 
 void CreditsManager::reset( void )
@@ -188,10 +183,10 @@ void CreditsManager::update( void )
 	if(m_isFinished)
 		return;
 	m_framesSinceStarted++;
-	
+
 	if(m_framesSinceStarted%m_scrollRatePerFrames != 0)
 		return;
-	
+
 
 	Int y = 0;
 	Int yTest = 0;
@@ -219,27 +214,27 @@ void CreditsManager::update( void )
 		else
 			drawIt++;
 	}
-	
+
 	y= y + ((lastHeight + CREDIT_SPACE_OFFSET) * offsetStartMultiplyer);
-	
+
 	// is it time to add a new string?
 	if(!((m_scrollDown && (yTest >= start)) || (!m_scrollDown && (yTest  <= start))))
 		return;
-	
-	if(m_displayedCreditLineList.size() == 0 && m_creditLineListIt == m_creditLineList.end())
+
+	if(m_displayedCreditLineList.empty() && m_creditLineListIt == m_creditLineList.end())
 		m_isFinished = TRUE;
-	
+
 	if(m_creditLineListIt == m_creditLineList.end())
 		return;
 
 	CreditsLine *cLine = *m_creditLineListIt;
 	ICoord2D pos;
-	switch (cLine->m_style) 
+	switch (cLine->m_style)
 	{
 	case CREDIT_STYLE_TITLE:
 		{
 			cLine->m_color = m_titleColor;
-			
+
 			if(TheGlobalLanguageData&& !cLine->m_text.isEmpty())
 			{
 				DisplayString *ds = TheDisplayStringManager->newDisplayString();
@@ -260,7 +255,7 @@ void CreditsManager::update( void )
 	case CREDIT_STYLE_POSITION:
 		{
 			cLine->m_color = m_positionColor;
-			
+
 			if(TheGlobalLanguageData && !cLine->m_text.isEmpty())
 			{
 				DisplayString *ds = TheDisplayStringManager->newDisplayString();
@@ -281,7 +276,7 @@ void CreditsManager::update( void )
 	case CREDIT_STYLE_NORMAL:
 	 {
 			cLine->m_color = m_normalColor;
-			
+
 			if(TheGlobalLanguageData && !cLine->m_text.isEmpty())
 			{
 				DisplayString *ds = TheDisplayStringManager->newDisplayString();
@@ -302,7 +297,7 @@ void CreditsManager::update( void )
 	case CREDIT_STYLE_COLUMN:
 		{
 			cLine->m_color = m_normalColor;
-			
+
 			if(TheGlobalLanguageData && !cLine->m_text.isEmpty())
 			{
 				DisplayString *ds = TheDisplayStringManager->newDisplayString();
@@ -332,7 +327,7 @@ void CreditsManager::update( void )
 				cLine->m_pos.x = TheDisplay->getWidth()/2 - pos.x/2 ;
 				cLine->m_pos.y = start + (cLine->m_height * offsetStartMultiplyer);
 				cLine->m_secondDisplayString = ds;
-				
+
 			}
 		}
 		break;
@@ -348,7 +343,7 @@ void CreditsManager::update( void )
 
 	if(m_creditLineListIt != m_creditLineList.end())
 		m_creditLineListIt++;
-	
+
 }
 
 void CreditsManager::draw( void )
@@ -372,7 +367,7 @@ void CreditsManager::draw( void )
 		else
 			perc = 1.0f;
 		UnsignedByte r,g,b,a;
-		GameGetColorComponents(cLine->m_color, &r, &g, &b, &a);		
+		GameGetColorComponents(cLine->m_color, &r, &g, &b, &a);
 		Int color = GameMakeColor( r,g,b, a * perc);
 		Int bColor= GameMakeColor( 0,0,0, a * perc);
 
@@ -423,7 +418,7 @@ void CreditsManager::parseBlank( INI* ini, void *instance, void *store, const vo
 
 void CreditsManager::parseText( INI* ini, void *instance, void *store, const void *userData )
 {
-	
+
 	AsciiString asciiString = ini->getNextQuotedAsciiString();
 	CreditsManager *cManager = (CreditsManager *)instance;
 	cManager->addText(asciiString);
@@ -432,7 +427,7 @@ void CreditsManager::addText( AsciiString text )
 {
 	CreditsLine *cLine = new CreditsLine;
 
-	switch (m_currentStyle) 
+	switch (m_currentStyle)
 	{
 		case CREDIT_STYLE_TITLE:
 		case CREDIT_STYLE_POSITION:
@@ -447,7 +442,7 @@ void CreditsManager::addText( AsciiString text )
 			{
 				CreditsLineList::reverse_iterator rIt = m_creditLineList.rbegin();
 				CreditsLine *rcLine = *rIt;
-				if(rIt == m_creditLineList.rend() || rcLine->m_style != CREDIT_STYLE_COLUMN 
+				if(rIt == m_creditLineList.rend() || rcLine->m_style != CREDIT_STYLE_COLUMN
 				   || (rcLine->m_style == CREDIT_STYLE_COLUMN && rcLine->m_done == TRUE))
 				{
 					cLine->m_text = getUnicodeString(text);
@@ -465,7 +460,7 @@ void CreditsManager::addText( AsciiString text )
 			}
 			break;
 		default:
-			DEBUG_ASSERTCRASH( FALSE, ("CreditsManager::addText we tried to add a credit text with the wrong style before it.  Style is %d\n", m_currentStyle) );
+			DEBUG_ASSERTCRASH( FALSE, ("CreditsManager::addText we tried to add a credit text with the wrong style before it.  Style is %d", m_currentStyle) );
 			delete cLine;
 	}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp
index 7eeb18b5d23..1b75c624683 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp
@@ -26,7 +26,7 @@
 // The implementation of the Display class
 // Author: Michael S. Booth, March 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/Display.h"
 #include "GameClient/Mouse.h"
@@ -57,18 +57,15 @@ Display::Display()
 	m_letterBoxEnabled = FALSE;
 	m_cinematicText = AsciiString::TheEmptyString;
 	m_cinematicFont = NULL;
-	m_cinematicTextFrames = 0;  
+	m_cinematicTextFrames = 0;
 	m_movieHoldTime	= -1;
 	m_copyrightHoldTime = -1;
 	m_elapsedMovieTime = 0;
 	m_elapsedCopywriteTime = 0;
 	m_copyrightDisplayString = NULL;
 
-	// Added by Sadullah Nader
-	// Initializations missing and needed
 	m_currentlyPlayingMovie.clear();
 	m_letterBoxFadeStartTime = 0;
-	// End Add
 }
 
 /**
@@ -131,12 +128,20 @@ void Display::updateViews( void )
 
 }
 
+void Display::stepViews( void )
+{
+
+	for( View *v = m_viewList; v; v = v->getNextView() )
+		v->stepView();
+
+}
+
 /// Redraw the entire display
 void Display::draw( void )
 {
 	// redraw all views
 	drawViews();
-	
+
 	// redraw the in-game user interface
 	/// @todo Switch between in-game and shell interfaces
 
@@ -177,7 +182,7 @@ void Display::setWidth( UnsignedInt width )
 	if( TheMouse )
 		TheMouse->setMouseLimits();
 
-}  // end setWidth
+}
 
 // Display::setHeight =========================================================
 /** Set the height of the display */
@@ -192,7 +197,7 @@ void Display::setHeight( UnsignedInt height )
 	if( TheMouse )
 		TheMouse->setMouseLimits();
 
-}  // end setHeight
+}
 
 //============================================================================
 // Display::playLogoMovie
@@ -202,7 +207,7 @@ void Display::setHeight( UnsignedInt height )
 
 void Display::playLogoMovie( AsciiString movieName, Int minMovieLength, Int minCopyrightLength )
 {
-	
+
 	stopMovie();
 
 	m_videoStream = TheVideoPlayer->open( movieName );
@@ -211,22 +216,22 @@ void Display::playLogoMovie( AsciiString movieName, Int minMovieLength, Int minC
 	{
 		return;
 	}
-	
+
 	m_currentlyPlayingMovie = movieName;
 	m_movieHoldTime = minMovieLength;
 	m_copyrightHoldTime = minCopyrightLength;
 	m_elapsedMovieTime = timeGetTime();  // we're using time get time becuase legal want's actual "Seconds"
-	
+
 	m_videoBuffer = createVideoBuffer();
-	if (	m_videoBuffer == NULL || 
-				!m_videoBuffer->allocate(	m_videoStream->width(), 
+	if (	m_videoBuffer == NULL ||
+				!m_videoBuffer->allocate(	m_videoStream->width(),
 													m_videoStream->height())
 		)
 	{
 		stopMovie();
 		return;
 	}
-	
+
 }
 
 //============================================================================
@@ -235,7 +240,7 @@ void Display::playLogoMovie( AsciiString movieName, Int minMovieLength, Int minC
 
 void Display::playMovie( AsciiString movieName)
 {
-	
+
 	stopMovie();
 
 
@@ -246,19 +251,19 @@ void Display::playMovie( AsciiString movieName)
 	{
 		return;
 	}
-	
+
 	m_currentlyPlayingMovie = movieName;
 
 	m_videoBuffer = createVideoBuffer();
-	if (	m_videoBuffer == NULL || 
-				!m_videoBuffer->allocate(	m_videoStream->width(), 
+	if (	m_videoBuffer == NULL ||
+				!m_videoBuffer->allocate(	m_videoStream->width(),
 													m_videoStream->height())
 		)
 	{
 		stopMovie();
 		return;
 	}
-	
+
 }
 
 //============================================================================
@@ -307,23 +312,22 @@ void Display::update( void )
 			{
 				if( m_elapsedCopywriteTime == 0 && m_elapsedCopywriteTime >= 0)
 				{
-					//display the copyrighttext;		
-					if(m_copyrightDisplayString)
-						deleteInstance(m_copyrightDisplayString);
+					//display the copyrighttext;
+					deleteInstance(m_copyrightDisplayString);
 					m_copyrightDisplayString = TheDisplayStringManager->newDisplayString();
 					m_copyrightDisplayString->setText(TheGameText->fetch("GUI:EACopyright"));
 					if (TheGlobalLanguageData && TheGlobalLanguageData->m_copyrightFont.name.isNotEmpty())
 					{	FontDesc	*fontdesc=&TheGlobalLanguageData->m_copyrightFont;
 						m_copyrightDisplayString->setFont(TheFontLibrary->getFont(fontdesc->name,
 							TheGlobalLanguageData->adjustFontSize(fontdesc->size),
-							fontdesc->bold));	
+							fontdesc->bold));
 					}
 					else
-						m_copyrightDisplayString->setFont(TheFontLibrary->getFont("Courier", 
-						TheGlobalLanguageData->adjustFontSize(12), TRUE));	
+						m_copyrightDisplayString->setFont(TheFontLibrary->getFont("Courier",
+						TheGlobalLanguageData->adjustFontSize(12), TRUE));
 					m_elapsedCopywriteTime = timeGetTime();
 				}
-				if(m_movieHoldTime + m_elapsedMovieTime < timeGetTime() && 
+				if(m_movieHoldTime + m_elapsedMovieTime < timeGetTime() &&
 						m_copyrightHoldTime + m_elapsedCopywriteTime < timeGetTime())
 				{
 					m_movieHoldTime = -1;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/DisplayString.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/DisplayString.cpp
index e67b95af57a..8d61a053e45 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/DisplayString.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/DisplayString.cpp
@@ -24,12 +24,12 @@
 
 // FILE: DisplayString.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,7 +45,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
@@ -79,7 +79,7 @@ DisplayString::DisplayString( void )
 	m_next = NULL;
 	m_prev = NULL;
 
-}  // end DisplayString
+}
 
 // DisplayString::~DisplayString ==============================================
 /** */
@@ -90,14 +90,14 @@ DisplayString::~DisplayString( void )
 	// free any data
 	reset();
 
-}  // end ~DisplayString
+}
 
 // DisplayString::setText =====================================================
 /** Copy the text to this instance */
 //=============================================================================
 void DisplayString::setText( UnicodeString text )
 {
-	if (text == m_textString) 
+	if (text == m_textString)
 		return;
 
 	m_textString = text;
@@ -105,7 +105,7 @@ void DisplayString::setText( UnicodeString text )
 	// our text has now changed
 	notifyTextChanged();
 
-}  // end setText
+}
 
 // DisplayString::reset =======================================================
 /** Free and reset all the data for this string, effectively making this
@@ -119,7 +119,7 @@ void DisplayString::reset( void )
 	// no font
 	m_font = NULL;
 
-}  // end reset
+}
 
 // DisplayString::removeLastChar ==============================================
 /** Remove the last character from the string text */
@@ -131,7 +131,32 @@ void DisplayString::removeLastChar( void )
 	// our text has now changed
 	notifyTextChanged();
 
-}  // end removeLastChar
+}
+
+// DisplayString::truncateBy ==================================================
+/** Remove the last charCount characters from the string text */
+//=============================================================================
+void DisplayString::truncateBy( const Int charCount )
+{
+	m_textString.truncateBy(charCount);
+
+	// our text has now changed
+	notifyTextChanged();
+
+}
+
+// DisplayString::truncateTo ==================================================
+/** Remove the last characters from the string text so it's at the most
+	* maxLength characters long */
+//=============================================================================
+void DisplayString::truncateTo( const Int maxLength )
+{
+	m_textString.truncateTo(maxLength);
+
+	// our text has now changed
+	notifyTextChanged();
+
+}
 
 // DisplayString::appendChar ==================================================
 /** Append character to the end of the string */
@@ -143,5 +168,5 @@ void DisplayString::appendChar( WideChar c )
 	// text has now changed
 	notifyTextChanged();
 
-}  // end appendchar
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/DisplayStringManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/DisplayStringManager.cpp
index 11f5177dcfd..6d8adb6b174 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/DisplayStringManager.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/DisplayStringManager.cpp
@@ -27,7 +27,7 @@
 // Desc:       Access for creating game managed display strings
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/DisplayStringManager.h"
 
@@ -46,7 +46,7 @@ DisplayStringManager::DisplayStringManager( void )
 	m_stringList = NULL;
 	m_currentCheckpoint = NULL;
 
-}  // end DisplayStringManager
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -59,7 +59,7 @@ DisplayStringManager::~DisplayStringManager( void )
 	//
 	assert( m_stringList == NULL );
 
-}  // end ~DisplayStringManager
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Link a display string to the master list */
@@ -77,7 +77,7 @@ void DisplayStringManager::link( DisplayString *string )
 
 	m_stringList = string;
 
-}  // end link
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Unlink a display string from the master list */
@@ -98,6 +98,6 @@ void DisplayStringManager::unLink( DisplayString *string )
 		assert( string == m_stringList );
 		m_stringList = string->m_next;
 
-	}  // end else
+	}
 
-}  // end unLink
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/DrawGroupInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/DrawGroupInfo.cpp
index 532088a2a35..558cee48c1e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/DrawGroupInfo.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/DrawGroupInfo.cpp
@@ -25,8 +25,8 @@
 // DrawGroupInfo.cpp //////////////////////////////////////////////////////////////////////////////
 // Author: John McDonald, October 2002
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/DrawGroupInfo.h"
 
@@ -52,4 +52,4 @@ DrawGroupInfo::DrawGroupInfo()
 	m_usingPixelOffsetY = TRUE;
 }
 
-DrawGroupInfo *TheDrawGroupInfo = NULL;
\ No newline at end of file
+DrawGroupInfo *TheDrawGroupInfo = NULL;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp
index b5413b37b13..f5dd995db0f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp
@@ -26,8 +26,8 @@
 // "Drawables" - graphical GameClient entities bound to GameLogic objects
 // Author: Michael S. Booth, March 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-  
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioEventInfo.h"
 #include "Common/DynamicAudioEventInfo.h"
@@ -36,10 +36,11 @@
 #include "Common/BuildAssistant.h"
 #include "Common/ClientUpdateModule.h"
 #include "Common/DrawModule.h"
+#include "Common/FramePacer.h"
 #include "Common/GameAudio.h"
-#include "Common/GameEngine.h"
 #include "Common/GameLOD.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/ModuleFactory.h"
 #include "Common/PerfTimer.h"
@@ -64,6 +65,7 @@
 #include "GameLogic/Weapon.h"
 
 #include "GameClient/Anim2D.h"
+#include "GameClient/ControlBar.h"
 #include "GameClient/Display.h"
 #include "GameClient/DisplayStringManager.h"
 #include "GameClient/Drawable.h"
@@ -77,21 +79,18 @@
 #include "GameClient/Shadow.h"
 #include "GameClient/GameText.h"
 
-//#define KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING 
+#include "ww3d.h"
+
+//#define KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING
 #ifdef KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING
 	#include "GameLogic/Module/ParkingPlaceBehavior.h"
 #endif
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define VERY_TRANSPARENT_MATERIAL_PASS_OPACITY (0.001f)
 #define MATERIAL_PASS_OPACITY_FADE_SCALAR (0.8f)
 
-static const char *TheDrawableIconNames[] = 
+static const char *const TheDrawableIconNames[] =
 {
 	"DefaultHeal",
 	"StructureHeal",
@@ -113,19 +112,20 @@ static const char *TheDrawableIconNames[] =
 	"CarBomb",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheDrawableIconNames) == MAX_ICONS + 1, "Incorrect array size");
 
 
-/** 
+/**
  * Returns a special DynamicAudioEventInfo which can be used to mark a sound as "no sound".
  * E.g. if m_customSoundAmbientInfo equals the value returned from this function, we
- * know it really means don't allow an ambient sound to be attached. 
+ * know it really means don't allow an ambient sound to be attached.
  *
  * OK, so it's a bit of a hack, but it saves memory in every Drawable
  */
 static DynamicAudioEventInfo  * getNoSoundMarker()
 {
   static DynamicAudioEventInfo  * marker = NULL;
-   
+
   if ( marker == NULL )
   {
     // Initialize first time function is called
@@ -161,8 +161,7 @@ void DrawableIconInfo::clear()
 {
 	for (int i = 0; i < MAX_ICONS; ++i)
 	{
-		if (m_icon[i])
-			deleteInstance(m_icon[i]);
+		deleteInstance(m_icon[i]);
 		m_icon[i] = NULL;
 		m_keepTillFrame[i] = 0;
 	}
@@ -221,18 +220,18 @@ static const char *drawableIconIndexToName( DrawableIconType iconIndex )
 {
 
 	DEBUG_ASSERTCRASH( iconIndex >= ICON_FIRST && iconIndex < MAX_ICONS,
-										 ("drawableIconIndexToName - Illegal index '%d'\n", iconIndex) );
+										 ("drawableIconIndexToName - Illegal index '%d'", iconIndex) );
 
 	return TheDrawableIconNames[ iconIndex ];
 
-}  // end drawableIconIndexToName
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 static DrawableIconType drawableIconNameToIndex( const char *iconName )
 {
 
-	DEBUG_ASSERTCRASH( iconName != NULL, ("drawableIconNameToIndex - Illegal name\n") );
+	DEBUG_ASSERTCRASH( iconName != NULL, ("drawableIconNameToIndex - Illegal name") );
 
 	for( Int i = ICON_FIRST; i < MAX_ICONS; ++i )
 		if( stricmp( TheDrawableIconNames[ i ], iconName ) == 0 )
@@ -240,7 +239,7 @@ static DrawableIconType drawableIconNameToIndex( const char *iconName )
 
 	return ICON_INVALID;
 
-}  // end drawableIconNameToIndex
+}
 
 // ------------------------------------------------------------------------------------------------
 // constants
@@ -284,7 +283,7 @@ const Int MAX_ENABLED_MODULES								= 16;
 	s_emptyAmmo	= TheMappedImageCollection->findImageByName("SCPAmmoEmpty");
 	s_fullContainer	= TheMappedImageCollection->findImageByName("SCPPipFull");
 	s_emptyContainer	= TheMappedImageCollection->findImageByName("SCPPipEmpty");
-	
+
 	s_animationTemplates = NEW Anim2DTemplate* [ MAX_ICONS ];
 
 	s_animationTemplates[ICON_DEFAULT_HEAL]			= TheAnim2DCollection->findTemplate(TheDrawableIconNames[ICON_DEFAULT_HEAL]);
@@ -311,11 +310,8 @@ const Int MAX_ENABLED_MODULES								= 16;
 //-------------------------------------------------------------------------------------------------
 /*static*/ void Drawable::killStaticImages()
 {
-	if( s_animationTemplates )
-	{
-		delete[] s_animationTemplates;
-		s_animationTemplates = NULL;
-	}
+	delete[] s_animationTemplates;
+	s_animationTemplates = NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -346,18 +342,15 @@ void Drawable::saturateRGB(RGBColor& color, Real factor)
  * graphical side of a logical object, whereas GameLogic objects encapsulate
  * behaviors and physics.  */
 //-------------------------------------------------------------------------------------------------
-Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBits ) 
+Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statusBits )
 				: Thing( thingTemplate )
 {
 
 	// assign status bits before anything else can be done
 	m_status = statusBits;
-	
-	// Added By Sadullah Nader
-	// Initialization missing and needed
+
 	m_nextDrawable = NULL;
 	m_prevDrawable = NULL;
-	//
 
   m_customSoundAmbientInfo = NULL;
 
@@ -369,17 +362,12 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 
 	Int i;
 
-	// Added By Sadullah Nader
-	// Initialization missing and needed
 	m_flashColor = 0;
 	m_selected = '\0';
-	//
 
 	m_expirationDate = 0;  // 0 == never expires
 
 	m_lastConstructDisplayed = -1.0f;
-	
-	//Added By Sadullah Nader
 	//Fix for the building percent
 	m_constructDisplayString = TheDisplayStringManager->newDisplayString();
 	m_constructDisplayString->setFont(TheFontLibrary->getFont(TheInGameUI->getDrawableCaptionFontName(),
@@ -389,7 +377,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 	m_ambientSound = NULL;
   m_ambientSoundEnabled = true;
   m_ambientSoundEnabledFromScript = true;
- 
+
 	m_decalOpacityFadeTarget = 0;
 	m_decalOpacityFadeRate = 0;
 	m_decalOpacity = 0;
@@ -403,7 +391,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 	m_timeElapsedFade = 0;
 	m_timeToFade = 0;
 
-	m_shroudClearFrame = 0;
+	m_shroudClearFrame = InvalidShroudClearFrame;
 
 	for (i = 0; i < NUM_DRAWABLE_MODULE_TYPES; ++i)
 		m_modules[i] = NULL;
@@ -413,6 +401,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 	m_flashCount = 0;
 
 	m_locoInfo = NULL;
+	m_physicsXform = NULL;
 
 	// sanity
 	if( TheGameClient == NULL || thingTemplate == NULL )
@@ -421,7 +410,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	m_instance.Make_Identity();
 	m_instanceIsIdentity = true;
@@ -447,7 +436,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 	m_drawableFullyObscuredByShroud = false;
 
   m_receivesDynamicLights = TRUE; // a good default... overridden by one of my draw modules if at all
-	
+
 	// allocate any modules we need to, we should keep
 	// this at or near the end of the drawable construction so that we have
 	// all the valid data about the thing when we create the module
@@ -463,7 +452,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 	for (modIdx = 0; modIdx < drawMI.getCount(); ++modIdx)
 	{
 		const ModuleData* newModData = drawMI.getNthData(modIdx);
-		if (TheGlobalData->m_useDrawModuleLOD && 
+		if (TheGlobalData->m_useDrawModuleLOD &&
 				newModData->getMinimumRequiredGameLOD() > TheGameLODManager->getStaticLODLevel())
 			continue;
 		*m++ = TheModuleFactory->newModule(this, drawMI.getNthName(modIdx), newModData, MODULETYPE_DRAW);
@@ -481,7 +470,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 			const ModuleData* newModData = cuMI.getNthData(modIdx);
 
 	/// @todo srj -- this is evil, we shouldn't look at the module name directly!
-			if (thingTemplate->isKindOf(KINDOF_SHRUBBERY) && 
+			if (thingTemplate->isKindOf(KINDOF_SHRUBBERY) &&
 					!TheGlobalData->m_useTreeSway &&
 					cuMI.getNthName(modIdx).compareNoCase("SwayClientUpdate") == 0)
 				continue;
@@ -497,7 +486,15 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 		for (Module** m = m_modules[i]; m && *m; ++m)
 			(*m)->onObjectCreated();
 	}
-	
+
+	const Bool shadowsEnabled = getShadowsEnabled();
+
+	// TheSuperHackers @fix xezon 14/09/2025 Match the shadow states of all draw modules with this drawable.
+	for (DrawModule** dm = (DrawModule**)getModuleList(MODULETYPE_DRAW); *dm; ++dm)
+	{
+		(*dm)->setShadowsEnabled(shadowsEnabled);
+	}
+
 	m_groupNumber = NULL;
 	m_captionDisplayString = NULL;
 	m_drawableInfo.m_drawable = this;
@@ -507,18 +504,18 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
 	m_selectionFlashEnvelope = NULL;	// lazily allocate!
 	m_colorTintEnvelope = NULL;				// lazily allocate!
 
-	initStaticImages(); 
+	initStaticImages();
 
-  // If we are inside GameLogic::startNewGame(), then starting the ambient sound 
-  // will be taken care of by Drawable::onLevelStart(). It's important that we 
+  // If we are inside GameLogic::startNewGame(), then starting the ambient sound
+  // will be taken care of by Drawable::onLevelStart(). It's important that we
   // wait until Drawable::onLevelStart(), because we may have a customized ambient
   // sound which we'll only learn about after the constructor is finished. The
   // map maker may also have disabled the ambient sound; again, we only learn that
   // after the constructor is done.
-  // By the same token, when loading from save, we may learn that the ambient sound 
+  // By the same token, when loading from save, we may learn that the ambient sound
   // is enabled or disabled in xfer(), and we may learn we have a customized sound there,
-  // so don't start the ambient sound yet. 
-  // This is all really traceable to the fact that stopAmbientSound() won't stop a sound which 
+  // so don't start the ambient sound yet.
+  // This is all really traceable to the fact that stopAmbientSound() won't stop a sound which
   // is in the middle of playing; it will only stop it when the current wavefile is finished.
   // So we have to be very careful of called startAmbientSound() because we can't "take it back" later.
   if ( TheGameLogic != NULL && !TheGameLogic->isLoadingMap() && TheGameState != NULL && !TheGameState->isInLoadGame() )
@@ -526,7 +523,7 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatus statusBit
   	startAmbientSound();
   }
 
-}  // end Drawable
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -552,16 +549,14 @@ Drawable::~Drawable()
 			deleteInstance(*m);
 			*m = NULL;	// in case other modules call findModule from their dtor!
 		}
-		delete [] m_modules[i]; 
+		delete [] m_modules[i];
 		m_modules[i] = NULL;
 	}
 
 	stopAmbientSound();
-	if (m_ambientSound)
-	{
-		deleteInstance(m_ambientSound);
-		m_ambientSound = NULL;
-	}
+
+	deleteInstance(m_ambientSound);
+	m_ambientSound = NULL;
 
   clearCustomSoundAmbient( false );
 
@@ -573,20 +568,19 @@ Drawable::~Drawable()
 	m_object = NULL;
 
 	// delete any icons present
-	if (m_iconInfo)
-		deleteInstance(m_iconInfo);
+	deleteInstance(m_iconInfo);
+	m_iconInfo = NULL;
 
-	if (m_selectionFlashEnvelope)
-		deleteInstance(m_selectionFlashEnvelope);
+	deleteInstance(m_selectionFlashEnvelope);
+	m_selectionFlashEnvelope = NULL;
 
-	if (m_colorTintEnvelope)
-		deleteInstance(m_colorTintEnvelope);
+	deleteInstance(m_colorTintEnvelope);
+	m_colorTintEnvelope = NULL;
 
-	if (m_locoInfo)
-	{
-		deleteInstance(m_locoInfo);
-		m_locoInfo = NULL;
-	}
+	deleteInstance(m_locoInfo);
+	m_locoInfo = NULL;
+
+	delete m_physicsXform;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -605,9 +599,9 @@ void Drawable::onDestroy( void )
 		for( Module** m = m_modules[ i ]; m && *m; ++m )
 			(*m)->onDelete();
 
-	}  // end for i
+	}
 
-}  // end onDestroy
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool Drawable::isVisible()
@@ -634,19 +628,19 @@ Bool Drawable::getShouldAnimate( Bool considerPower ) const
 
 		if (obj->isDisabled())
 		{
-			if( 
-         ! obj->isKindOf( KINDOF_PRODUCED_AT_HELIPAD )  && 
+			if(
+         ! obj->isKindOf( KINDOF_PRODUCED_AT_HELIPAD )  &&
         // mal sez: helicopters just look goofy if they stop animating, so keep animating them, anyway
 
-        (  obj->isDisabledByType( DISABLED_HACKED ) 
-				|| obj->isDisabledByType( DISABLED_PARALYZED ) 
-				|| obj->isDisabledByType( DISABLED_EMP ) 
-				|| obj->isDisabledByType( DISABLED_SUBDUED ) 
+        (  obj->isDisabledByType( DISABLED_HACKED )
+				|| obj->isDisabledByType( DISABLED_PARALYZED )
+				|| obj->isDisabledByType( DISABLED_EMP )
+				|| obj->isDisabledByType( DISABLED_SUBDUED )
 				// srj sez: unmanned things also should not animate. (eg, gattling tanks,
 				// which have a slight barrel animation even when at rest). if this causes
 				// a problem, we will need to fix gattling tanks in another way.
 				|| obj->isDisabledByType( DISABLED_UNMANNED ) )
-        
+
 				)
 				return FALSE;
 
@@ -749,7 +743,7 @@ void Drawable::showSubObject( const AsciiString& name, Bool show )
 // srj sez: not sure if this is a good idea, for net sync reasons...
 //-------------------------------------------------------------------------------------------------
 /**
-	This call asks, "In the current animation (if any) how far along are you, from 0.0f to 1.0f". 
+	This call asks, "In the current animation (if any) how far along are you, from 0.0f to 1.0f".
 */
 Real Drawable::getAnimationScrubScalar( void ) const // lorenzen
 {
@@ -761,7 +755,7 @@ Real Drawable::getAnimationScrubScalar( void ) const // lorenzen
 			return di->getAnimationScrubScalar();
 		}
 	}
-	
+
 	return 0.0f;
 
 }
@@ -779,7 +773,7 @@ Int Drawable::getPristineBonePositions(const char* boneNamePrefix, Int startInde
 		const ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
 		if (di)
 		{
-			Int subcount = 
+			Int subcount =
 				di->getPristineBonePositionsForConditionState(m_conditionState, boneNamePrefix, startIndex, positions, transforms, maxBones);
 
 			if (subcount > 0)
@@ -808,7 +802,7 @@ Int Drawable::getCurrentClientBonePositions(const char* boneNamePrefix, Int star
 		const ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
 		if (di)
 		{
-			Int subcount = 
+			Int subcount =
 				di->getCurrentBonePositions(boneNamePrefix, startIndex, positions, transforms, maxBones);
 
 			if (subcount > 0)
@@ -929,23 +923,23 @@ void Drawable::setFullyObscuredByShroud(Bool fullyObscured)
 /** Set drawable's "selected" status, if not already set.  Also update running
  * total count of selected drawables. */
 //-------------------------------------------------------------------------------------------------
-void Drawable::friend_setSelected( void ) 
-{ 
+void Drawable::friend_setSelected( void )
+{
 	if(isSelected() == false)
 	{
 		m_selected = TRUE;
 		onSelected();
 	}
 
-}			
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Clear drawable's "selected" status, if not already clear.  Also update running
  * total count of selected drawables. */
 //-------------------------------------------------------------------------------------------------
-void Drawable::friend_clearSelected( void ) 
+void Drawable::friend_clearSelected( void )
 {
-	if(isSelected()) 
+	if(isSelected())
 	{
 		m_selected = FALSE;
 		onUnselected();
@@ -970,10 +964,7 @@ void Drawable::colorFlash( const RGBColor* color, UnsignedInt decayFrames, Unsig
 		white.setFromInt(0xffffffff);
 		m_colorTintEnvelope->play( &white );
 	}
-
-	// make sure the tint color is unlocked so we "fade back down" to normal
-	clearDrawableStatus( DRAWABLE_STATUS_TINT_COLOR_LOCKED );
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Tint a drawable a specified color */
@@ -983,11 +974,7 @@ void Drawable::colorTint( const RGBColor* color )
 	if( color )
 	{
 		// set the color via color flash
-		colorFlash( color, 0, 0, TRUE );
-
-		// lock the tint color so the flash never "fades back down"
-		setDrawableStatus( DRAWABLE_STATUS_TINT_COLOR_LOCKED );
-
+		colorFlash( color, 0, 0, ~0u );
 	}
 	else
 	{
@@ -996,10 +983,6 @@ void Drawable::colorTint( const RGBColor* color )
 
 		// remove the tint applied to the object
 		m_colorTintEnvelope->rest();
-
-		// set the tint as unlocked so we can flash and stuff again
-		clearDrawableStatus( DRAWABLE_STATUS_TINT_COLOR_LOCKED );
-
 	}
 
 }
@@ -1011,7 +994,7 @@ void Drawable::onSelected()
 {
 
 	flashAsSelected();//much simpler
-	
+
 	Object* obj = getObject();
 	if ( obj )
 	{
@@ -1022,7 +1005,7 @@ void Drawable::onSelected()
 		}
 	}
 
-}  // end onSelected
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Gathering point for all things besides actual selection that must happen on deselection */
@@ -1065,7 +1048,7 @@ const Vector3 * Drawable::getSelectionColor( void )	const
 
 }
 
-		
+
 //-------------------------------------------------------------------------------------------------
 /** fades the object out gradually...how gradually is determined by number of frames */
 //-------------------------------------------------------------------------------------------------
@@ -1091,16 +1074,16 @@ void Drawable::fadeIn( UnsignedInt frames )		///< decloak object
 
 //-------------------------------------------------------------------------------------------------
 Real Drawable::getScale (void) const
-{ 
-	return m_instanceScale; 
-//	return getTemplate()->getAssetScale(); 
+{
+	return m_instanceScale;
+//	return getTemplate()->getAssetScale();
 }
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void Drawable::reactToBodyDamageStateChange(BodyDamageType newState)
 {
-	static const ModelConditionFlagType TheDamageMap[BODYDAMAGETYPE_COUNT] = 
+	static const ModelConditionFlagType TheDamageMap[BODYDAMAGETYPE_COUNT] =
 	{
 		MODELCONDITION_INVALID,
 		MODELCONDITION_DAMAGED,
@@ -1113,7 +1096,7 @@ void Drawable::reactToBodyDamageStateChange(BodyDamageType newState)
 		newDamage.set(TheDamageMap[newState]);
 
 	clearAndSetModelConditionFlags(
-		MAKE_MODELCONDITION_MASK3(MODELCONDITION_DAMAGED, MODELCONDITION_REALLY_DAMAGED, MODELCONDITION_RUBBLE), 
+		MAKE_MODELCONDITION_MASK3(MODELCONDITION_DAMAGED, MODELCONDITION_REALLY_DAMAGED, MODELCONDITION_RUBBLE),
 		newDamage);
 
   // When loading map, ambient sound starting is handled by onLevelStart(), so that we can
@@ -1135,8 +1118,8 @@ void Drawable::setEffectiveOpacity( Real pulseFactor, Real explicitOpacity /* =
 	Real pulseMargin = (1.0f - m_stealthOpacity);
 	Real pulseAmount = pulseMargin * pf;
 
-	m_effectiveStealthOpacity = m_stealthOpacity + pulseAmount; 
-}		///< get alpha/opacity value used to override defaults when drawing.
+	m_effectiveStealthOpacity = m_stealthOpacity + pulseAmount;
+}
 
 
 
@@ -1188,7 +1171,7 @@ void Drawable::updateDrawable( void )
 
 			setDrawableOpacity(numer/(Real)m_timeToFade);
 			++m_timeElapsedFade;
-			
+
 			if (m_timeElapsedFade > m_timeToFade)
 				m_fadeMode = FADING_NONE;
 		}
@@ -1222,7 +1205,7 @@ void Drawable::updateDrawable( void )
 				(*dm)->setTerrainDecalOpacity(m_decalOpacity);
 			}
 
-		}//end if (*dm)
+		}
 	}
 	else
 		m_decalOpacity = 0;
@@ -1251,7 +1234,7 @@ void Drawable::updateDrawable( void )
 
 	//Lets figure out whether we should be changing colors right about now
 	// we'll use an ifelseif ladder since we are scanning bits
-	if( m_prevTintStatus != m_tintStatus )// edge test 
+	if( m_prevTintStatus != m_tintStatus )// edge test
 	{
 		if ( testTintStatus( TINT_STATUS_DISABLED ) )
 		{
@@ -1273,7 +1256,7 @@ void Drawable::updateDrawable( void )
 				m_colorTintEnvelope = newInstance(TintEnvelope);
 
       m_colorTintEnvelope->play( isKindOf( KINDOF_INFANTRY) ? &FRENZY_COLOR_INFANTRY:&FRENZY_COLOR, 30, 30, SUSTAIN_INDEFINITELY);
-		
+
     }
 //		else if ( testTintStatus( TINT_STATUS_POISONED) )
 //		{
@@ -1287,8 +1270,8 @@ void Drawable::updateDrawable( void )
 //				m_colorTintEnvelope = newInstance(TintEnvelope);
 //			m_colorTintEnvelope->play( &RED_IRRADIATED_COLOR, 30, 30, SUSTAIN_INDEFINITELY);
 //		}
-		else 
-		{ 
+		else
+		{
 			// NO TINTING SHOULD BE PRESENT
 			if (m_colorTintEnvelope == NULL)
 				m_colorTintEnvelope = newInstance(TintEnvelope);
@@ -1313,15 +1296,15 @@ void Drawable::updateDrawable( void )
 
 	//If we have an ambient sound, and we aren't currently playing it, attempt to play it now.
   // However, if the attached sound is a one-shot (non-looping) sound, don't restart it -- only
-  // start it ONCE. The problem is, looping sounds need to keep being restarted. Why? Because 
-  // MilesAudioManager will kill the sound (in MilesAudioManager::processPlayingList) if gets 
+  // start it ONCE. The problem is, looping sounds need to keep being restarted. Why? Because
+  // MilesAudioManager will kill the sound (in MilesAudioManager::processPlayingList) if gets
   // out of range. Looping ambient sounds need to restart if the user moves back into range.
-  // The MilesAudioManager doesn't handle this, so we need to keep checking looping sounds 
+  // The MilesAudioManager doesn't handle this, so we need to keep checking looping sounds
   // to see if they are in range. But this messes up non-looping sounds -- they keep looping!
   // End result: a hack of testing the looping bit and only restarting the sound if the looping
   // bit is on and the loop count is 0 (loop forever).
-  if( m_ambientSound && m_ambientSoundEnabled && m_ambientSoundEnabledFromScript && 
-      !m_ambientSound->m_event.getEventName().isEmpty() && !m_ambientSound->m_event.isCurrentlyPlaying() ) 
+  if( m_ambientSound && m_ambientSoundEnabled && m_ambientSoundEnabledFromScript &&
+      !m_ambientSound->m_event.getEventName().isEmpty() && !m_ambientSound->m_event.isCurrentlyPlaying() )
   {
     const AudioEventInfo * eventInfo = m_ambientSound->m_event.getAudioEventInfo();
 
@@ -1337,17 +1320,17 @@ void Drawable::updateDrawable( void )
   		startAmbientSound();
     }
  	}
-}	
- 
+}
+
 //-------------------------------------------------------------------------------------------------
 // Called just after the level loads. Only called for NEW games, not save games.
 void Drawable::onLevelStart()
 {
   // Make sure the current ambient sound is playing if it should be playing. Needed because
   // the call to startAmbientSound in the constructor is too early to
-  // actually start the sound if the constructor is called during level load. 
-  if( m_ambientSoundEnabled && m_ambientSoundEnabledFromScript && 
-      ( m_ambientSound == NULL || 
+  // actually start the sound if the constructor is called during level load.
+  if( m_ambientSoundEnabled && m_ambientSoundEnabledFromScript &&
+      ( m_ambientSound == NULL ||
         ( !m_ambientSound->m_event.getEventName().isEmpty() && !m_ambientSound->m_event.isCurrentlyPlaying() ) ) )
   {
     // Unlike the check in the update() function, we want to do this for looping & one-shot sounds equally
@@ -1370,7 +1353,7 @@ void Drawable::flashAsSelected( const RGBColor *color ) ///< drawable takes care
 		Object *obj = getObject();
 		if (obj)
 		{
-			RGBColor tempColor; 
+			RGBColor tempColor;
 			if (TheGlobalData->m_selectionFlashHouseColor)
 				tempColor.setFromInt(obj->getIndicatorColor());
 			else
@@ -1387,25 +1370,19 @@ void Drawable::flashAsSelected( const RGBColor *color ) ///< drawable takes care
 //-------------------------------------------------------------------------------------------------
 void Drawable::applyPhysicsXform(Matrix3D* mtx)
 {
-	const Object *obj = getObject();
-
-	if( !obj ||	obj->isDisabledByType( DISABLED_HELD ) || !TheGlobalData->m_showClientPhysics )
-	{
-		return;
-	}
-
- 	Bool frozen = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
- 	frozen = frozen || TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript();
-	if (frozen)
-		return;
-	PhysicsXformInfo info;
-	if (calcPhysicsXform(info))
+	if (m_physicsXform != NULL)
 	{
-		mtx->Translate(0.0f, 0.0f, info.m_totalZ);
-		mtx->Rotate_Y( info.m_totalPitch );
-		mtx->Rotate_X( -info.m_totalRoll );
-		mtx->Rotate_Z( info.m_totalYaw );
+		// TheSuperHackers @tweak Update the physics transform on every WW Sync only.
+		// All calculations are originally catered to a 30 fps logic step.
+		if (WW3D::Get_Sync_Frame_Time() != 0)
+		{
+			calcPhysicsXform(*m_physicsXform);
+		}
 
+		mtx->Translate(0.0f, 0.0f, m_physicsXform->m_totalZ);
+		mtx->Rotate_Y( m_physicsXform->m_totalPitch );
+		mtx->Rotate_X( -m_physicsXform->m_totalRoll );
+		mtx->Rotate_Z( m_physicsXform->m_totalYaw );
 	}
 }
 
@@ -1413,38 +1390,33 @@ void Drawable::applyPhysicsXform(Matrix3D* mtx)
 //-------------------------------------------------------------------------------------------------
 Bool Drawable::calcPhysicsXform(PhysicsXformInfo& info)
 {
-	const Object* obj = getObject();
-	const AIUpdateInterface *ai = obj ? obj->getAIUpdateInterface() : NULL;
 	Bool hasPhysicsXform = false;
-	if (ai) 
+
+	if (const Locomotor *locomotor = getLocomotor())
 	{
-		const Locomotor *locomotor = ai->getCurLocomotor(); 
-		if (locomotor) 
+		switch (locomotor->getAppearance())
 		{
-			switch (locomotor->getAppearance())
-			{
-				case LOCO_WHEELS_FOUR:
-					calcPhysicsXformWheels(locomotor, info);
-					hasPhysicsXform = true;
-					break;
-				case LOCO_MOTORCYCLE:
-					calcPhysicsXformMotorcycle( locomotor, info );
-					hasPhysicsXform = TRUE;
-					break;
-				case LOCO_TREADS:
-					calcPhysicsXformTreads(locomotor, info);
-					hasPhysicsXform = true;
-					break;
-				case LOCO_HOVER:
-				case LOCO_WINGS:
-					calcPhysicsXformHoverOrWings(locomotor, info);
-					hasPhysicsXform = true;
-					break;
-				case LOCO_THRUST:	
-					calcPhysicsXformThrust(locomotor, info);
-					hasPhysicsXform = true;
-					break;
-			}
+			case LOCO_WHEELS_FOUR:
+				calcPhysicsXformWheels(locomotor, info);
+				hasPhysicsXform = true;
+				break;
+			case LOCO_MOTORCYCLE:
+				calcPhysicsXformMotorcycle( locomotor, info );
+				hasPhysicsXform = true;
+				break;
+			case LOCO_TREADS:
+				calcPhysicsXformTreads(locomotor, info);
+				hasPhysicsXform = true;
+				break;
+			case LOCO_HOVER:
+			case LOCO_WINGS:
+				calcPhysicsXformHoverOrWings(locomotor, info);
+				hasPhysicsXform = true;
+				break;
+			case LOCO_THRUST:
+				calcPhysicsXformThrust(locomotor, info);
+				hasPhysicsXform = true;
+				break;
 		}
 	}
 
@@ -1494,19 +1466,19 @@ void Drawable::calcPhysicsXformThrust( const Locomotor *locomotor, PhysicsXformI
 				m_locoInfo->m_pitch += WOBBLE_RATE;
 				m_locoInfo->m_yaw += WOBBLE_RATE;
 
-			}  // end if
+			}
 			else
 			{
 
 				m_locoInfo->m_pitch += (WOBBLE_RATE / 2.0f);
 				m_locoInfo->m_yaw += (WOBBLE_RATE / 2.0f);
 
-			}  // end else
+			}
 
 			if( m_locoInfo->m_pitch >= MAX_WOBBLE )
 				m_locoInfo->m_wobble = -1.0f;
 
-		}  // end if
+		}
 		else
 		{
 
@@ -1516,23 +1488,23 @@ void Drawable::calcPhysicsXformThrust( const Locomotor *locomotor, PhysicsXformI
 				m_locoInfo->m_pitch -= WOBBLE_RATE;
 				m_locoInfo->m_yaw -= WOBBLE_RATE;
 
-			}  // end if
+			}
 			else
 			{
 
 				m_locoInfo->m_pitch -= (WOBBLE_RATE / 2.0f);
 				m_locoInfo->m_yaw -= (WOBBLE_RATE / 2.0f);
 
-			}  // end else
+			}
 			if( m_locoInfo->m_pitch <= MIN_WOBBLE )
 				m_locoInfo->m_wobble = 1.0f;
 
-		}  // end else
+		}
 
 		info.m_totalPitch = m_locoInfo->m_pitch;
 		info.m_totalYaw = m_locoInfo->m_yaw;
 
-	}  // end if, wobble exists
+	}
 
 	if( THRUST_ROLL )
 	{
@@ -1540,7 +1512,7 @@ void Drawable::calcPhysicsXformThrust( const Locomotor *locomotor, PhysicsXformI
 		m_locoInfo->m_roll += THRUST_ROLL;
 		info.m_totalRoll = m_locoInfo->m_roll;
 
-	}  // end if
+	}
 
 }
 
@@ -1557,12 +1529,12 @@ void Drawable::calcPhysicsXformHoverOrWings( const Locomotor *locomotor, Physics
 	const Real ROLL_STIFFNESS =  locomotor->getRollStiffness();
 	const Real PITCH_DAMPING = locomotor->getPitchDamping();
 	const Real ROLL_DAMPING = locomotor->getRollDamping();
-	const Real Z_VEL_PITCH_COEFF = locomotor->getPitchByZVelCoef();	
-	const Real FORWARD_VEL_COEFF = locomotor->getForwardVelCoef();	
-	const Real LATERAL_VEL_COEFF = locomotor->getLateralVelCoef();	
-	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();	
-	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();	
-	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();	
+	const Real Z_VEL_PITCH_COEFF = locomotor->getPitchByZVelCoef();
+	const Real FORWARD_VEL_COEFF = locomotor->getForwardVelCoef();
+	const Real LATERAL_VEL_COEFF = locomotor->getLateralVelCoef();
+	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();
+	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();
+	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();
 
 
 	// get object from logic
@@ -1603,7 +1575,7 @@ void Drawable::calcPhysicsXformHoverOrWings( const Locomotor *locomotor, Physics
 	info.m_totalPitch = m_locoInfo->m_pitch + m_locoInfo->m_accelerationPitch;
 	info.m_totalRoll = m_locoInfo->m_roll + m_locoInfo->m_accelerationRoll;
 
-	if (physics->isMotive()) 
+	if (physics->isMotive())
   {
 		if (Z_VEL_PITCH_COEFF != 0.0f)
 		{
@@ -1644,10 +1616,10 @@ void Drawable::calcPhysicsXformHoverOrWings( const Locomotor *locomotor, Physics
 
 
 
-	const Real RUDDER_CORRECTION_DEGREE   = locomotor->getRudderCorrectionDegree();	
-	const Real RUDDER_CORRECTION_RATE     = locomotor->getRudderCorrectionRate();	
-	const Real ELEVATOR_CORRECTION_DEGREE = locomotor->getElevatorCorrectionDegree();	
-	const Real ELEVATOR_CORRECTION_RATE   = locomotor->getElevatorCorrectionRate();	
+	const Real RUDDER_CORRECTION_DEGREE   = locomotor->getRudderCorrectionDegree();
+	const Real RUDDER_CORRECTION_RATE     = locomotor->getRudderCorrectionRate();
+	const Real ELEVATOR_CORRECTION_DEGREE = locomotor->getElevatorCorrectionDegree();
+	const Real ELEVATOR_CORRECTION_RATE   = locomotor->getElevatorCorrectionRate();
 
   info.m_totalYaw = RUDDER_CORRECTION_DEGREE * sin( m_locoInfo->m_yawModulator += RUDDER_CORRECTION_RATE );
   info.m_totalPitch += ELEVATOR_CORRECTION_DEGREE * cos( m_locoInfo->m_pitchModulator += ELEVATOR_CORRECTION_RATE );
@@ -1674,9 +1646,9 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
 	const Real ROLL_STIFFNESS =  locomotor->getRollStiffness();
 	const Real PITCH_DAMPING = locomotor->getPitchDamping();
 	const Real ROLL_DAMPING = locomotor->getRollDamping();
-	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();	
-	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();	
-	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();	
+	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();
+	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();
+	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();
 
 	// get object from logic
 	Object *obj = getObject();
@@ -1744,7 +1716,7 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
 			Real rough = (vel->x*vel->x + vel->y*vel->y) * OVERLAP_ROUGH_VIBRATION_FACTOR;
 			if (rough > MAX_ROUGH_VIBRATION)
 				rough = MAX_ROUGH_VIBRATION;
-			
+
 			Real height = overlapped->getGeometryInfo().getMaxHeightAbovePosition();
 
 			// do not "go up" flattened crushed things
@@ -1836,7 +1808,7 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
 	info.m_totalPitch = m_locoInfo->m_pitch + m_locoInfo->m_accelerationPitch;
 	info.m_totalRoll = m_locoInfo->m_roll + m_locoInfo->m_accelerationRoll;
 
-	if (physics->isMotive()) 
+	if (physics->isMotive())
 	{
 		// cause the chassis to pitch & roll in reaction to acceleration/deceleration
 		Real forwardAccel = dir->x * accel->x + dir->y * accel->y;
@@ -1866,7 +1838,7 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
 				Real lateral = perp.x * to.x + perp.y * to.y;
 
 				Real recoil = PI/16.0f * GameClientRandomValueReal( 0.5f, 1.0f );
-			
+
 				m_locoInfo->m_accelerationPitchRate -= recoil * forward;
 				m_locoInfo->m_accelerationRollRate -= recoil * lateral;
 			}
@@ -1896,7 +1868,7 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
 		// m_locoInfo->m_overlapZ += 0.4f;
 		m_locoInfo->m_overlapZVel = 0.0f;
 	}
-	
+
 	Real ztmp = m_locoInfo->m_overlapZ/2.0f;
 
 	// do fake Z physics
@@ -1909,7 +1881,7 @@ void Drawable::calcPhysicsXformTreads( const Locomotor *locomotor, PhysicsXformI
 	if (m_locoInfo->m_overlapZ <= 0.0f)
 	{
 		m_locoInfo->m_overlapZ = 0.0f;
-		m_locoInfo->m_overlapZVel = 0.0f; 
+		m_locoInfo->m_overlapZVel = 0.0f;
 	}
 	info.m_totalZ = ztmp;
 }
@@ -1928,9 +1900,9 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 	const Real ROLL_STIFFNESS =  locomotor->getRollStiffness();
 	const Real PITCH_DAMPING = locomotor->getPitchDamping();
 	const Real ROLL_DAMPING = locomotor->getRollDamping();
-	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();	
-	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();	
-	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();	
+	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();
+	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();
+	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();
 
 	const Real MAX_SUSPENSION_EXTENSION = locomotor->getMaxWheelExtension(); //-2.3f;
 //	const Real MAX_SUSPENSION_COMPRESSION = locomotor->getMaxWheelCompression(); //1.4f;
@@ -1975,19 +1947,19 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 
 	Bool airborne = obj->isSignificantlyAboveTerrain();
 
-	if (airborne) 
+	if (airborne)
 	{
-		if (DO_WHEELS) 
-		{	
+		if (DO_WHEELS)
+		{
 			// Wheels extend when airborne.
 			m_locoInfo->m_wheelInfo.m_framesAirborne = 0;
 			m_locoInfo->m_wheelInfo.m_framesAirborneCounter++;
-			if (pos->z - hheight > -MAX_SUSPENSION_EXTENSION) 
+			if (pos->z - hheight > -MAX_SUSPENSION_EXTENSION)
 			{
 				m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset += (MAX_SUSPENSION_EXTENSION - m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset)/2.0f;
 				m_locoInfo->m_wheelInfo.m_rearRightHeightOffset += (MAX_SUSPENSION_EXTENSION - m_locoInfo->m_wheelInfo.m_rearRightHeightOffset)/2.0f;
-			} 
-			else 
+			}
+			else
 			{
 				m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset += (0 - m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset)/2.0f;
 				m_locoInfo->m_wheelInfo.m_rearRightHeightOffset += (0 - m_locoInfo->m_wheelInfo.m_rearRightHeightOffset)/2.0f;
@@ -1996,7 +1968,7 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 		// Calculate suspension info.
 		Real length = obj->getGeometryInfo().getMajorRadius();
 		Real width = obj->getGeometryInfo().getMinorRadius();
-		Real pitchHeight = length*Sin(m_locoInfo->m_pitch + m_locoInfo->m_accelerationPitch - groundPitch);	
+		Real pitchHeight = length*Sin(m_locoInfo->m_pitch + m_locoInfo->m_accelerationPitch - groundPitch);
 		Real rollHeight = width*Sin(m_locoInfo->m_roll + m_locoInfo->m_accelerationRoll - groundRoll);
 		info.m_totalZ = fabs(pitchHeight)/4 + fabs(rollHeight)/4;
 		return; // maintain the same orientation while we fly through the air.
@@ -2004,15 +1976,15 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 
 	// Bouncy.
 	Real curSpeed = physics->getVelocityMagnitude();
-#if 1 
+#if 1
 	Real maxSpeed = ai->getCurLocomotorSpeed();
-	if (!airborne && curSpeed > maxSpeed/10) 
+	if (!airborne && curSpeed > maxSpeed/10)
 	{
 		Real factor = curSpeed/maxSpeed;
-		if (fabs(m_locoInfo->m_pitchRate)<factor*BOUNCE_ANGLE_KICK/4 && fabs(m_locoInfo->m_rollRate)<factor*BOUNCE_ANGLE_KICK/8) 
+		if (fabs(m_locoInfo->m_pitchRate)<factor*BOUNCE_ANGLE_KICK/4 && fabs(m_locoInfo->m_rollRate)<factor*BOUNCE_ANGLE_KICK/8)
 		{
-			// do the bouncy. 
-			switch (GameClientRandomValue(0,3)) 
+			// do the bouncy.
+			switch (GameClientRandomValue(0,3))
 			{
 			case 0:
 				m_locoInfo->m_pitchRate -= BOUNCE_ANGLE_KICK*factor;
@@ -2063,7 +2035,7 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 	info.m_totalPitch = m_locoInfo->m_pitch + m_locoInfo->m_accelerationPitch;
 	info.m_totalRoll = m_locoInfo->m_roll + m_locoInfo->m_accelerationRoll;
 
-	if (physics->isMotive()) 
+	if (physics->isMotive())
 	{
 		// cause the chassis to pitch & roll in reaction to acceleration/deceleration
 		Real forwardAccel = dir->x * accel->x + dir->y * accel->y;
@@ -2092,8 +2064,8 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 	Real width = obj->getGeometryInfo().getMinorRadius();
 	Real pitchHeight = length*Sin(info.m_totalPitch-groundPitch);
 	Real rollHeight = width*Sin(info.m_totalRoll-groundRoll);
-	if (DO_WHEELS) 
-	{	
+	if (DO_WHEELS)
+	{
 		// calculate each wheel position
 		m_locoInfo->m_wheelInfo.m_framesAirborne = m_locoInfo->m_wheelInfo.m_framesAirborneCounter;
 		m_locoInfo->m_wheelInfo.m_framesAirborneCounter = 0;
@@ -2113,11 +2085,11 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 
 		//
 		///@todo Steven/John ... please review this and make sure it makes sense (CBD)
-		// we're going to add the angle to the current wheel rotation ... but we're going to 
+		// we're going to add the angle to the current wheel rotation ... but we're going to
 		// divide that number to add small angles.  This allows for "smoother" wheel turning
 		// transitions ... and when the AI has things move in a straight line, since it's
 		// constantly telling the object to go left, go straight, go right, go straight,
-		// etc, this smaller angle we'll be adding covers the constant wheel shifting 
+		// etc, this smaller angle we'll be adding covers the constant wheel shifting
 		// left and right when moving in a relatively straight line
 		//
 		#define WHEEL_SMOOTHNESS 10.0f  // higher numbers add smaller angles, make it more "smooth"
@@ -2195,7 +2167,7 @@ void Drawable::calcPhysicsXformWheels( const Locomotor *locomotor, PhysicsXformI
 		}
 		if (m_locoInfo->m_wheelInfo.m_rearRightHeightOffset>MAX_SUSPENSION_COMPRESSION) {
 			m_locoInfo->m_wheelInfo.m_rearRightHeightOffset=MAX_SUSPENSION_COMPRESSION;
-		}	
+		}
 		*/
 	}
 	// If we are > 22 degrees, need to raise height;
@@ -2223,9 +2195,9 @@ void Drawable::calcPhysicsXformMotorcycle( const Locomotor *locomotor, PhysicsXf
 	const Real ROLL_STIFFNESS =  locomotor->getRollStiffness();
 	const Real PITCH_DAMPING = locomotor->getPitchDamping();
 	const Real ROLL_DAMPING = locomotor->getRollDamping();
-	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();	
-	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();	
-	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();	
+	const Real FORWARD_ACCEL_COEFF = locomotor->getForwardAccelCoef();
+	const Real LATERAL_ACCEL_COEFF = locomotor->getLateralAccelCoef();
+	const Real UNIFORM_AXIAL_DAMPING = locomotor->getUniformAxialDamping();
 
 	const Real MAX_SUSPENSION_EXTENSION = locomotor->getMaxWheelExtension(); //-2.3f;
 //	const Real MAX_SUSPENSION_COMPRESSION = locomotor->getMaxWheelCompression(); //1.4f;
@@ -2270,19 +2242,19 @@ void Drawable::calcPhysicsXformMotorcycle( const Locomotor *locomotor, PhysicsXf
 
 	Bool airborne = obj->isSignificantlyAboveTerrain();
 
-	if (airborne) 
+	if (airborne)
 	{
-		if (DO_WHEELS) 
-		{	
+		if (DO_WHEELS)
+		{
 			// Wheels extend when airborne.
 			m_locoInfo->m_wheelInfo.m_framesAirborne = 0;
 			m_locoInfo->m_wheelInfo.m_framesAirborneCounter++;
-			if (pos->z - hheight > -MAX_SUSPENSION_EXTENSION) 
+			if (pos->z - hheight > -MAX_SUSPENSION_EXTENSION)
 			{
 				m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset += (MAX_SUSPENSION_EXTENSION - m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset)/2.0f;
 				m_locoInfo->m_wheelInfo.m_rearRightHeightOffset = m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset;
-			} 
-			else 
+			}
+			else
 			{
 				m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset += (0 - m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset)/2.0f;
 				m_locoInfo->m_wheelInfo.m_rearRightHeightOffset = m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset;
@@ -2291,7 +2263,7 @@ void Drawable::calcPhysicsXformMotorcycle( const Locomotor *locomotor, PhysicsXf
 		// Calculate suspension info.
 		Real length = obj->getGeometryInfo().getMajorRadius();
 		//Real width = obj->getGeometryInfo().getMinorRadius();
-		Real pitchHeight = length*Sin(m_locoInfo->m_pitch + m_locoInfo->m_accelerationPitch - groundPitch);	
+		Real pitchHeight = length*Sin(m_locoInfo->m_pitch + m_locoInfo->m_accelerationPitch - groundPitch);
 		//Real rollHeight = width*Sin(m_locoInfo->m_roll + m_locoInfo->m_accelerationRoll - groundRoll);
 		info.m_totalZ = fabs(pitchHeight)/4;// + fabs(rollHeight)/4;
 		//return; // maintain the same orientation while we fly through the air.
@@ -2299,15 +2271,15 @@ void Drawable::calcPhysicsXformMotorcycle( const Locomotor *locomotor, PhysicsXf
 
 	// Bouncy.
 	Real curSpeed = physics->getVelocityMagnitude();
-#if 1 
+#if 1
 	Real maxSpeed = ai->getCurLocomotorSpeed();
-	if (!airborne && curSpeed > maxSpeed/10) 
+	if (!airborne && curSpeed > maxSpeed/10)
 	{
 		Real factor = curSpeed/maxSpeed;
-		if (fabs(m_locoInfo->m_pitchRate)<factor*BOUNCE_ANGLE_KICK/4 && fabs(m_locoInfo->m_rollRate)<factor*BOUNCE_ANGLE_KICK/8) 
+		if (fabs(m_locoInfo->m_pitchRate)<factor*BOUNCE_ANGLE_KICK/4 && fabs(m_locoInfo->m_rollRate)<factor*BOUNCE_ANGLE_KICK/8)
 		{
-			// do the bouncy. 
-			switch (GameClientRandomValue(0,3)) 
+			// do the bouncy.
+			switch (GameClientRandomValue(0,3))
 			{
 			case 0:
 				m_locoInfo->m_pitchRate -= BOUNCE_ANGLE_KICK*factor;
@@ -2370,7 +2342,7 @@ void Drawable::calcPhysicsXformMotorcycle( const Locomotor *locomotor, PhysicsXf
 	{
 	}
 
-	if (physics->isMotive()) 
+	if (physics->isMotive())
 	{
 		// cause the chassis to pitch & roll in reaction to acceleration/deceleration
 		Real forwardAccel = dir->x * accel->x + dir->y * accel->y;
@@ -2399,8 +2371,8 @@ void Drawable::calcPhysicsXformMotorcycle( const Locomotor *locomotor, PhysicsXf
 	Real width = obj->getGeometryInfo().getMinorRadius();
 	Real pitchHeight = length*Sin(info.m_totalPitch-groundPitch);
 	Real rollHeight = width*Sin(info.m_totalRoll-groundRoll);
-	if (DO_WHEELS) 
-	{	
+	if (DO_WHEELS)
+	{
 		// calculate each wheel position
 		m_locoInfo->m_wheelInfo.m_framesAirborne = m_locoInfo->m_wheelInfo.m_framesAirborneCounter;
 		m_locoInfo->m_wheelInfo.m_framesAirborneCounter = 0;
@@ -2420,27 +2392,27 @@ void Drawable::calcPhysicsXformMotorcycle( const Locomotor *locomotor, PhysicsXf
 
 		//
 		///@todo Steven/John ... please review this and make sure it makes sense (CBD)
-		// we're going to add the angle to the current wheel rotation ... but we're going to 
+		// we're going to add the angle to the current wheel rotation ... but we're going to
 		// divide that number to add small angles.  This allows for "smoother" wheel turning
 		// transitions ... and when the AI has things move in a straight line, since it's
 		// constantly telling the object to go left, go straight, go right, go straight,
-		// etc, this smaller angle we'll be adding covers the constant wheel shifting 
+		// etc, this smaller angle we'll be adding covers the constant wheel shifting
 		// left and right when moving in a relatively straight line
 		//
 		#define WHEEL_SMOOTHNESS 10.0f  // higher numbers add smaller angles, make it more "smooth"
 		m_locoInfo->m_wheelInfo.m_wheelAngle += (newInfo.m_wheelAngle - m_locoInfo->m_wheelInfo.m_wheelAngle)/WHEEL_SMOOTHNESS;
 
 		const Real SPRING_FACTOR = 0.9f;
-		if (pitchHeight<0) 
-		{	
+		if (pitchHeight<0)
+		{
 			// Front raising up
 			newInfo.m_frontLeftHeightOffset		= SPRING_FACTOR*(pitchHeight/3+pitchHeight/2);
 			newInfo.m_rearLeftHeightOffset		= -pitchHeight/2 + pitchHeight/4;
 			newInfo.m_frontRightHeightOffset	= newInfo.m_frontLeftHeightOffset;
 			newInfo.m_rearRightHeightOffset		= newInfo.m_rearLeftHeightOffset;
-		}	
-		else 
-		{	
+		}
+		else
+		{
 			// Back raising up.
 			newInfo.m_frontLeftHeightOffset		= (-pitchHeight/4+pitchHeight/2);
 			newInfo.m_rearLeftHeightOffset		= SPRING_FACTOR*(-pitchHeight/2 + -pitchHeight/3);
@@ -2456,35 +2428,35 @@ void Drawable::calcPhysicsXformMotorcycle( const Locomotor *locomotor, PhysicsXf
 			newInfo.m_rearLeftHeightOffset += SPRING_FACTOR*(rollHeight/3+rollHeight/2);
 		}
 		*/
-		if (newInfo.m_frontLeftHeightOffset < m_locoInfo->m_wheelInfo.m_frontLeftHeightOffset) 
+		if (newInfo.m_frontLeftHeightOffset < m_locoInfo->m_wheelInfo.m_frontLeftHeightOffset)
 		{
 			// If it's going down, dampen the movement a bit
 			m_locoInfo->m_wheelInfo.m_frontLeftHeightOffset += (newInfo.m_frontLeftHeightOffset - m_locoInfo->m_wheelInfo.m_frontLeftHeightOffset)/2.0f;
 			m_locoInfo->m_wheelInfo.m_frontRightHeightOffset = m_locoInfo->m_wheelInfo.m_frontLeftHeightOffset;
-		}	
-		else 
+		}
+		else
 		{
 			m_locoInfo->m_wheelInfo.m_frontLeftHeightOffset = newInfo.m_frontLeftHeightOffset;
 			m_locoInfo->m_wheelInfo.m_frontRightHeightOffset = newInfo.m_frontLeftHeightOffset;
 		}
-		if (newInfo.m_rearLeftHeightOffset < m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset) 
+		if (newInfo.m_rearLeftHeightOffset < m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset)
 		{
 			// If it's going down, dampen the movement a bit
 			m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset += (newInfo.m_rearLeftHeightOffset - m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset)/2.0f;
 			m_locoInfo->m_wheelInfo.m_rearRightHeightOffset = m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset;
-		}	
-		else 
+		}
+		else
 		{
 			m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset = newInfo.m_rearLeftHeightOffset;
 			m_locoInfo->m_wheelInfo.m_rearRightHeightOffset = newInfo.m_rearLeftHeightOffset;
 		}
 		//m_locoInfo->m_wheelInfo = newInfo;
-		if (m_locoInfo->m_wheelInfo.m_frontLeftHeightOffset<MAX_SUSPENSION_EXTENSION) 
+		if (m_locoInfo->m_wheelInfo.m_frontLeftHeightOffset<MAX_SUSPENSION_EXTENSION)
 		{
 			m_locoInfo->m_wheelInfo.m_frontLeftHeightOffset = MAX_SUSPENSION_EXTENSION;
 			m_locoInfo->m_wheelInfo.m_frontRightHeightOffset = MAX_SUSPENSION_EXTENSION;
 		}
-		if (m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset<MAX_SUSPENSION_EXTENSION) 
+		if (m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset<MAX_SUSPENSION_EXTENSION)
 		{
 			m_locoInfo->m_wheelInfo.m_rearLeftHeightOffset = MAX_SUSPENSION_EXTENSION;
 			m_locoInfo->m_wheelInfo.m_rearRightHeightOffset = MAX_SUSPENSION_EXTENSION;
@@ -2496,8 +2468,8 @@ void Drawable::calcPhysicsXformMotorcycle( const Locomotor *locomotor, PhysicsXf
 
 	if (pitch>PI/8) {
 		divisor = ((4*PI/8) + (1*(pitch-PI/8)))/pitch;
-	} 
-	
+	}
+
 	if( !airborne )
 	{
 		info.m_totalZ += fabs(pitchHeight)/divisor;
@@ -2533,14 +2505,14 @@ void Drawable::validatePos() const
 	const Coord3D* ourPos = getPosition();
 	if (_isnan(ourPos->x) || _isnan(ourPos->y) || _isnan(ourPos->z))
 	{
-		DEBUG_CRASH(("Drawable/Object position NAN! '%s'\n", getTemplate()->getName().str()));
+		DEBUG_CRASH(("Drawable/Object position NAN! '%s'", getTemplate()->getName().str()));
 	}
 	if (getObject())
 	{
 		const Coord3D* objPos = getObject()->getPosition();
 		if (ourPos->x != objPos->x || ourPos->y != objPos->y || ourPos->z != objPos->z)
 		{
-			DEBUG_CRASH(("Drawable/Object position mismatch! '%s'\n", getTemplate()->getName().str()));
+			DEBUG_CRASH(("Drawable/Object position mismatch! '%s'", getTemplate()->getName().str()));
 		}
 	}
 }
@@ -2602,7 +2574,7 @@ void Drawable::setStealthLook(StealthLookType look)
 
 				break;
 			}
-			
+
 			case STEALTHLOOK_DISGUISED_ENEMY:
 				m_hiddenByStealth = false;
 				m_secondMaterialPassOpacity = 0.0f;
@@ -2633,9 +2605,8 @@ void Drawable::setStealthLook(StealthLookType look)
 //-------------------------------------------------------------------------------------------------
 /** default draw is to just call the database defined draw */
 //-------------------------------------------------------------------------------------------------
-void Drawable::draw( View *view )
+void Drawable::draw()
 {
-
   if ( testTintStatus( TINT_STATUS_FRENZY ) == FALSE )
   {
     if ( getObject() && getObject()->isEffectivelyDead() )
@@ -2670,7 +2641,10 @@ void Drawable::draw( View *view )
 #endif
 	}
 
-	applyPhysicsXform(&transformMtx);
+	if (TheGlobalData->m_showClientPhysics && getObject() && !getObject()->isDisabledByType( DISABLED_HELD ))
+	{
+		applyPhysicsXform(&transformMtx);
+	}
 
 	for (DrawModule** dm = getDrawModules(); *dm; ++dm)
 	{
@@ -2707,8 +2681,8 @@ static Bool computeHealthRegion( const Drawable *draw, IRegion2D& region )
 	Real zoom = TheTacticalView->getZoom();
 	//Real widthScale = 1.3f / zoom;
 	Real widthScale = 1.0f / zoom;
-	//Real heightScale = 0.8f / zoom; 
-	Real heightScale = 1.0f; 
+	//Real heightScale = 0.8f / zoom;
+	Real heightScale = 1.0f;
 
 	healthBoxWidth *= widthScale;
 	healthBoxHeight *= heightScale;
@@ -2725,28 +2699,28 @@ static Bool computeHealthRegion( const Drawable *draw, IRegion2D& region )
 
 	return TRUE;
 
-}  // end computeHealthRegion
+}
 
 
 // ------------------------------------------------------------------------------------------------
 
 Bool Drawable::drawsAnyUIText( void )
 {
-	if (!isSelected()) 
+	if (!isSelected())
 		return FALSE;
 
 	const Object *obj = getObject();
-	if ( !obj || !obj->isLocallyControlled() )  
+	if ( !obj || obj->getControllingPlayer() != rts::getObservedOrLocalPlayer())
 		return FALSE;
 
 	Player *owner = obj->getControllingPlayer();
 	Int groupNum = owner->getSquadNumberForObject(obj);
 
-	if (groupNum > NO_HOTKEY_SQUAD && groupNum < NUM_HOTKEY_SQUADS ) 
+	if (groupNum > NO_HOTKEY_SQUAD && groupNum < NUM_HOTKEY_SQUADS )
 		return TRUE;
 	else
 		m_groupNumber = NULL;
-		
+
 	if ( obj->getFormationID() != NO_FORMATION_ID )
 		return TRUE;
 
@@ -2769,14 +2743,14 @@ void Drawable::drawIconUI( void )
 			healthBarRegion = &healthBarRegionStorage; //both data and a PointerAsFlag for logic in the methods below
 
 		Object *obj = getObject();
-		
+
 		// we only draw icons drawables with objects, so one bail here -------------------------
 		if ( ! obj )
 			return;
 
 		//Icons that can be drawn on dead things
-		drawHealthBar( healthBarRegion );                                        
-		drawEmoticon( healthBarRegion );                                         
+		drawHealthBar( healthBarRegion );
+		drawEmoticon( healthBarRegion );
 
 		drawCaption( healthBarRegion );
 		drawConstructPercent( healthBarRegion );
@@ -2786,25 +2760,25 @@ void Drawable::drawIconUI( void )
 			return;
 		drawHealing( healthBarRegion );//call so dead things can kill their healing icons
 		drawBombed( healthBarRegion );
-	
-	
+
+
 		//Disabled for multiplay!
 		//drawBattlePlans( healthBarRegion );
-	
+
 		if ( drawsAnyUIText() )
 			TheGameClient->addTextBearingDrawable( this );
 
-		drawEnthusiastic( healthBarRegion );                                       
+		drawEnthusiastic( healthBarRegion );
 #ifdef ALLOW_DEMORALIZE
 		drawDemoralized( healthBarRegion );
 #endif
 		drawDisabled( healthBarRegion );
 
-		drawAmmo( healthBarRegion );                
-		drawContained( healthBarRegion ); 
+		drawAmmo( healthBarRegion );
+		drawContained( healthBarRegion );
 
 		//Moved this to last so that it shows up over contained and ammo icons.
-		drawVeterancy( healthBarRegion ); 
+		drawVeterancy( healthBarRegion );
 
 #ifdef KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING
 		drawUIText();
@@ -2837,7 +2811,7 @@ void Drawable::setEmoticon( const AsciiString &name, Int duration )
 	Anim2DTemplate *animTemplate = TheAnim2DCollection->findTemplate( name );
 	if( animTemplate )
 	{
-		DEBUG_ASSERTCRASH( getIconInfo()->m_icon[ ICON_EMOTICON ] == NULL, ("Drawable::setEmoticon - Emoticon isn't empty, need to refuse to set or destroy the old one in favor of the new one\n") );
+		DEBUG_ASSERTCRASH( getIconInfo()->m_icon[ ICON_EMOTICON ] == NULL, ("Drawable::setEmoticon - Emoticon isn't empty, need to refuse to set or destroy the old one in favor of the new one") );
 		if( getIconInfo()->m_icon[ ICON_EMOTICON ] == NULL )
 		{
 			getIconInfo()->m_icon[ ICON_EMOTICON ] = newInstance(Anim2D)( animTemplate, TheAnim2DCollection );
@@ -2865,7 +2839,7 @@ void Drawable::drawEmoticon( const IRegion2D *healthBarRegion )
 			Int size = REAL_TO_INT( barWidth * 0.3f );
 			frameHeight = REAL_TO_INT((INT_TO_REAL(size) / INT_TO_REAL(frameWidth)) * frameHeight);
 			frameWidth = size;
-#endif			
+#endif
 			// given our scaled width and height we need to find the top left point to draw the image at
 			ICoord2D screen;
 			screen.x = (Int)(healthBarRegion->lo.x + (barWidth * 0.5f) - (frameWidth * 0.5f));
@@ -2884,12 +2858,12 @@ void Drawable::drawEmoticon( const IRegion2D *healthBarRegion )
 // ------------------------------------------------------------------------------------------------
 void Drawable::drawAmmo( const IRegion2D *healthBarRegion )
 {
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 
 	if (!(
-				TheGlobalData->m_showObjectHealth && 
+				TheGlobalData->m_showObjectHealth &&
 				(isSelected() || (TheInGameUI && (TheInGameUI->getMousedOverDrawableID() == getID()))) &&
-				obj->getControllingPlayer() == ThePlayerList->getLocalPlayer()
+				obj->getControllingPlayer() == rts::getObservedOrLocalPlayer()
 			))
 		return;
 
@@ -2902,7 +2876,7 @@ void Drawable::drawAmmo( const IRegion2D *healthBarRegion )
 		return;
 
 
-	
+
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 	Real scale = TheGlobalData->m_ammoPipScaleFactor / CLAMP_ICON_ZOOM_FACTOR( TheTacticalView->getZoom() );
 #else
@@ -2938,16 +2912,16 @@ void Drawable::drawAmmo( const IRegion2D *healthBarRegion )
 // ------------------------------------------------------------------------------------------------
 void Drawable::drawContained( const IRegion2D *healthBarRegion )
 {
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 
 	ContainModuleInterface* container = obj->getContain();
 	if (!container)
 		return;
 
 	if (!(
-				TheGlobalData->m_showObjectHealth && 
+				TheGlobalData->m_showObjectHealth &&
 				(isSelected() || (TheInGameUI && (TheInGameUI->getMousedOverDrawableID() == getID()))) &&
-				obj->getControllingPlayer() == ThePlayerList->getLocalPlayer()
+				obj->getControllingPlayer() == rts::getObservedOrLocalPlayer()
 			))
 		return;
 
@@ -2990,7 +2964,7 @@ void Drawable::drawContained( const IRegion2D *healthBarRegion )
 		return;
 
 	Real bounding = obj->getGeometryInfo().getBoundingSphereRadius() * scale;
-	
+
 	//Int posx = screenCenter.x + REAL_TO_INT(TheGlobalData->m_containerPipScreenOffset.x*bounding) - totalWidth;
 	//**CHANGING CODE: Left justify with health bar min
 	Int posx = healthBarRegion->lo.x;
@@ -3001,7 +2975,7 @@ void Drawable::drawContained( const IRegion2D *healthBarRegion )
 		const Color INFANTRY_COLOR = GameMakeColor(0, 255, 0, 255);
 		const Color NON_INFANTRY_COLOR = GameMakeColor(0, 0, 255, 255);
 		if (i < numFull)
-			TheDisplay->drawImage(s_fullContainer, posx, posy, posx + boxWidth, posy + boxHeight, 
+			TheDisplay->drawImage(s_fullContainer, posx, posy, posx + boxWidth, posy + boxHeight,
 				(i < numInfantry) ? INFANTRY_COLOR : NON_INFANTRY_COLOR);
 		else
 			TheDisplay->drawImage(s_emptyContainer, posx, posy + 1, posx + boxWidth, posy + 1 + boxHeight);
@@ -3031,14 +3005,14 @@ void Drawable::drawBattlePlans( const IRegion2D *healthBarRegion )
 			//Int barHeight = healthBarRegion.hi.y - healthBarRegion.lo.y;
 			Int frameWidth = getIconInfo()->m_icon[ ICON_BATTLEPLAN_BOMBARD ]->getCurrentFrameWidth();
 			Int frameHeight = getIconInfo()->m_icon[ ICON_BATTLEPLAN_BOMBARD ]->getCurrentFrameHeight();
-			
+
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 			// adjust the width to be a % of the health bar region size
 			Int barWidth = healthBarRegion->hi.x - healthBarRegion->lo.x;
 			Int size = REAL_TO_INT( barWidth * 0.3f );
 			frameHeight = REAL_TO_INT((INT_TO_REAL(size) / INT_TO_REAL(frameWidth)) * frameHeight);
 			frameWidth = size;
-#endif			
+#endif
 			// given our scaled width and height we need to find the top left point to draw the image at
 			ICoord2D screen;
 			screen.x = healthBarRegion->lo.x;
@@ -3059,21 +3033,21 @@ void Drawable::drawBattlePlans( const IRegion2D *healthBarRegion )
 			// draw the icon
 			Int frameWidth = getIconInfo()->m_icon[ ICON_BATTLEPLAN_HOLDTHELINE ]->getCurrentFrameWidth();
 			Int frameHeight = getIconInfo()->m_icon[ ICON_BATTLEPLAN_HOLDTHELINE ]->getCurrentFrameHeight();
-			
+
 #ifdef SCALE_ICONS_WITH_ZOOM_ML
 			// adjust the width to be a % of the health bar region size
 			Int barWidth = healthBarRegion->hi.x - healthBarRegion->lo.x;
 			Int size = REAL_TO_INT( barWidth * 0.3f );
 			frameHeight = REAL_TO_INT((INT_TO_REAL(size) / INT_TO_REAL(frameWidth)) * frameHeight);
 			frameWidth = size;
-#endif			
+#endif
 			// given our scaled width and height we need to find the top left point to draw the image at
 			ICoord2D screen;
 			screen.x = healthBarRegion->lo.x;
 			screen.y = healthBarRegion->lo.y + frameHeight;
 			getIconInfo()->m_icon[ ICON_BATTLEPLAN_HOLDTHELINE ]->draw( screen.x + frameWidth, screen.y, frameWidth, frameHeight );
 		}
-		else 
+		else
 		{
 			killIcon(ICON_BATTLEPLAN_HOLDTHELINE);
 		}
@@ -3102,11 +3076,11 @@ void Drawable::drawBattlePlans( const IRegion2D *healthBarRegion )
 			screen.y = healthBarRegion->lo.y + frameHeight;
 			getIconInfo()->m_icon[ ICON_BATTLEPLAN_SEARCHANDDESTROY ]->draw( screen.x + (frameWidth * 2), screen.y, frameWidth, frameHeight );
 		}
-		else 
+		else
 		{
 			killIcon(ICON_BATTLEPLAN_SEARCHANDDESTROY);
 		}
-		
+
 	}
 }
 
@@ -3118,7 +3092,7 @@ void Drawable::drawUIText()
 	// This gets called by GameClient now
 	// GameClient caches a list of us drawables during Drawablepostdraw()
 	// then our group numbers get spit out last, so they draw in front
-	
+
 	const IRegion2D* healthBarRegion = NULL;
 	IRegion2D healthBarRegionStorage;
 	if (computeHealthRegion(this, healthBarRegionStorage))
@@ -3134,7 +3108,7 @@ void Drawable::drawUIText()
 
 	Color color = TheDrawGroupInfo->m_usePlayerColor ? owner->getPlayerColor() : TheDrawGroupInfo->m_colorForText;
 
-	if (groupNum > NO_HOTKEY_SQUAD && groupNum < NUM_HOTKEY_SQUADS ) 
+	if (groupNum > NO_HOTKEY_SQUAD && groupNum < NUM_HOTKEY_SQUADS )
 	{
 		Int xPos = healthBarRegion->lo.x;
 		Int yPos = healthBarRegion->lo.y;
@@ -3153,10 +3127,10 @@ void Drawable::drawUIText()
 
 		m_groupNumber = TheDisplayStringManager->getGroupNumeralString(groupNum);
 
-		
-		m_groupNumber->draw(xPos, yPos, color, 
-												TheDrawGroupInfo->m_colorForTextDropShadow, 
-												TheDrawGroupInfo->m_dropShadowOffsetX, 
+
+		m_groupNumber->draw(xPos, yPos, color,
+												TheDrawGroupInfo->m_colorForTextDropShadow,
+												TheDrawGroupInfo->m_dropShadowOffsetX,
 												TheDrawGroupInfo->m_dropShadowOffsetY);
 	}
 
@@ -3175,19 +3149,19 @@ void Drawable::drawUIText()
 			return;
 
 		Real scale = 1.3f/CLAMP_ICON_ZOOM_FACTOR( TheTacticalView->getZoom() );
-		screenCenter.x += (healthBoxWidth * scale * 0.5f) + 10 ; 
+		screenCenter.x += (healthBoxWidth * scale * 0.5f) + 10 ;
 
 
 		DisplayString *formationMarker = TheDisplayStringManager->getFormationLetterString();
 		//static DisplayString *formationMarker = TheDisplayStringManager->getGroupNumeralString( 5 );
 		if ( formationMarker )
 			formationMarker->draw(screenCenter.x, screenCenter.y, color,
-													TheDrawGroupInfo->m_colorForTextDropShadow, 
-													TheDrawGroupInfo->m_dropShadowOffsetX, 
+													TheDrawGroupInfo->m_colorForTextDropShadow,
+													TheDrawGroupInfo->m_dropShadowOffsetX,
 													TheDrawGroupInfo->m_dropShadowOffsetY);
 
 	}
-	
+
 #ifdef KRIS_BRUTAL_HACK_FOR_AIRCRAFT_CARRIER_DEBUGGING
 	if( obj->testStatus( OBJECT_STATUS_DECK_HEIGHT_OFFSET ) )
 	{
@@ -3200,7 +3174,7 @@ void Drawable::drawUIText()
 				if( pp )
 				{
 					Int index = pp->getSpaceIndex( obj->getID() );
-					
+
 					Int xPos = healthBarRegion->lo.x;
 					Int yPos = healthBarRegion->lo.y;
 
@@ -3218,10 +3192,10 @@ void Drawable::drawUIText()
 
 					m_groupNumber = TheDisplayStringManager->getGroupNumeralString(index);
 
-					
-					m_groupNumber->draw(xPos, yPos, color, 
-															TheDrawGroupInfo->m_colorForTextDropShadow, 
-															TheDrawGroupInfo->m_dropShadowOffsetX, 
+
+					m_groupNumber->draw(xPos, yPos, color,
+															TheDrawGroupInfo->m_colorForTextDropShadow,
+															TheDrawGroupInfo->m_dropShadowOffsetX,
 															TheDrawGroupInfo->m_dropShadowOffsetY);
 					break;
 				}
@@ -3236,7 +3210,7 @@ void Drawable::drawUIText()
 void Drawable::drawHealing(const IRegion2D* healthBarRegion)
 {
 
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 
 	// we do show show icons for things that explicitly forbid it
 	if( obj->isKindOf( KINDOF_NO_HEAL_ICON ) || obj->getStatusBits().test( OBJECT_STATUS_SOLD ) )
@@ -3249,8 +3223,8 @@ void Drawable::drawHealing(const IRegion2D* healthBarRegion)
 	if( body->getHealth() != body->getMaxHealth() )
 	{
 //		const DamageInfo* lastDamage = body->getLastDamageInfo();
-//		if( lastDamage != NULL && lastDamage->in.m_damageType == DAMAGE_HEALING 
-//			&&(TheGameLogic->getFrame() - body->getLastHealingTimestamp()) <= HEALING_ICON_DISPLAY_TIME 
+//		if( lastDamage != NULL && lastDamage->in.m_damageType == DAMAGE_HEALING
+//			&&(TheGameLogic->getFrame() - body->getLastHealingTimestamp()) <= HEALING_ICON_DISPLAY_TIME
 //			)
 		if ( TheGameLogic->getFrame() > HEALING_ICON_DISPLAY_TIME && // because so many things init health early in game
 			(TheGameLogic->getFrame() - body->getLastHealingTimestamp() <= HEALING_ICON_DISPLAY_TIME) )
@@ -3292,7 +3266,7 @@ void Drawable::drawHealing(const IRegion2D* healthBarRegion)
 			// draw the animation if present
 			if( getIconInfo()->m_icon[ typeIndex ] != NULL)
 			{
-				
+
 				//
 				// we are going to draw the healing icon relative to the size of the health bar region
 				// since that region takes into account hit point size and zoom factor of the camera too
@@ -3313,8 +3287,8 @@ void Drawable::drawHealing(const IRegion2D* healthBarRegion)
 				screen.x = REAL_TO_INT( healthBarRegion->lo.x + (barWidth * 0.75f) - (frameWidth * 0.5f) );
 				screen.y = REAL_TO_INT( healthBarRegion->lo.y - frameHeight );
 				getIconInfo()->m_icon[ typeIndex ]->draw( screen.x, screen.y, frameWidth, frameHeight );
-								
-			}	
+
+			}
 		}
 	}
 	else
@@ -3330,13 +3304,13 @@ void Drawable::drawHealing(const IRegion2D* healthBarRegion)
 void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
 {
 
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 	//
 	// if we are to show effect make sure we have the animation for it allocated, otherwise
 	// free any animation we may have allocated back to the animation memory pool
 	//
 	// only display if have enthusiasm
-	
+
 	if( obj->testWeaponBonusCondition( WEAPONBONUSCONDITION_ENTHUSIASTIC ) == TRUE &&
 			healthBarRegion != NULL )
 	{
@@ -3355,7 +3329,7 @@ void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
 		// draw the animation if present
 		if( getIconInfo()->m_icon[ iconIndex ] != NULL)
 		{
-			
+
 			//
 			// we are going to draw the healing icon relative to the size of the health bar region
 			// since that region takes into account hit point size and zoom factor of the camera too
@@ -3370,7 +3344,7 @@ void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
 				scale = 0.75f;
 			else
 				scale = 0.5f;
- 
+
 			Int frameWidth = getIconInfo()->m_icon[ iconIndex ]->getCurrentFrameWidth() * scale;
 			Int frameHeight = getIconInfo()->m_icon[ iconIndex ]->getCurrentFrameHeight() * scale;
 
@@ -3385,8 +3359,8 @@ void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
 			screen.x = REAL_TO_INT( healthBarRegion->lo.x + (barWidth * 0.25f) - (frameWidth * 0.5f) );
 			screen.y = healthBarRegion->hi.y + (frameHeight * 0.25);
 			getIconInfo()->m_icon[ iconIndex ]->draw( screen.x, screen.y, frameWidth, frameHeight );
-							
-		}	
+
+		}
 	}
 	else
 	{
@@ -3402,7 +3376,7 @@ void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
 void Drawable::drawDemoralized(const IRegion2D* healthBarRegion)
 {
 
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 
 
 	//
@@ -3420,7 +3394,7 @@ void Drawable::drawDemoralized(const IRegion2D* healthBarRegion)
 			// create icon if necessary
 			if( getIconInfo()->m_icon[ ICON_DEMORALIZED ] == NULL )
 				getIconInfo()->m_icon[ ICON_DEMORALIZED ] = newInstance(Anim2D)( s_animationTemplates[ ICON_DEMORALIZED ], TheAnim2DCollection );
-			
+
 			if (getIconInfo()->m_icon[ ICON_DEMORALIZED ])
 			{
 
@@ -3459,13 +3433,13 @@ enum
 void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 {
 
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 
 
 	UnsignedInt now = TheGameLogic->getFrame();
 
 	if( obj->testWeaponSetFlag( WEAPONSET_CARBOMB ) &&
-				obj->getControllingPlayer() == ThePlayerList->getLocalPlayer())
+				obj->getControllingPlayer() == rts::getObservedOrLocalPlayer())
 	{
 		if( !getIconInfo()->m_icon[ ICON_CARBOMB ] )
 			getIconInfo()->m_icon[ ICON_CARBOMB ] = newInstance(Anim2D)( s_animationTemplates[ ICON_CARBOMB ], TheAnim2DCollection );
@@ -3494,7 +3468,7 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 				screen.x = REAL_TO_INT( healthBarRegion->lo.x + (barWidth * 0.5f) - (frameWidth * 0.5f) );
 				screen.y = REAL_TO_INT( healthBarRegion->lo.y + barHeight * 0.5f ) + BOMB_ICON_EXTRA_OFFSET;
 
-				getIconInfo()->m_icon[ ICON_CARBOMB ]->draw( screen.x, screen.y, frameWidth, frameHeight );	
+				getIconInfo()->m_icon[ ICON_CARBOMB ]->draw( screen.x, screen.y, frameWidth, frameHeight );
 				getIconInfo()->m_keepTillFrame[ ICON_CARBOMB ] = FOREVER;
 			}
 		}
@@ -3524,16 +3498,16 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 					getIconInfo()->m_icon[ ICON_BOMB_REMOTE ] = newInstance(Anim2D)( s_animationTemplates[ ICON_BOMB_REMOTE ], TheAnim2DCollection );
 					getIconInfo()->m_icon[ ICON_BOMB_TIMED ] = newInstance(Anim2D)( s_animationTemplates[ ICON_BOMB_TIMED ], TheAnim2DCollection );
 
-					//Because this is a counter icon that ranges from 0-60 seconds, we need to calculate which frame to 
+					//Because this is a counter icon that ranges from 0-60 seconds, we need to calculate which frame to
 					//start the animation from. Because timers are second based -- 1000 ms equal 1 frame. So we simply
 					//calculate the time via detonation frame.
 					//
 					// srj sez: this may sound familiar somehow, but let me reiterate, just in case you missed it:
 					//
-					// hardcoding is bad. 
+					// hardcoding is bad.
+					//
+					// the anim got changed and now is only 20 seconds max, so the previous code was wrong.
 					//
-					// the anim got changed and now is only 20 seconds max, so the previous code was wrong. 
-					// 
 					// hey, I've got an idea! why don't we ASK the anim how long it is?
 					//
 					UnsignedInt dieFrame = update->getDetonationFrame();
@@ -3543,7 +3517,7 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 					// this anim goes from "N" seconds down to zero, so the max seconds we can use is N-1.
 					if (seconds > numFrames - 1)
 						seconds = numFrames - 1;
-					
+
 					getIconInfo()->m_icon[ ICON_BOMB_TIMED ]->setMinFrame(numFrames - seconds - 1);
 					getIconInfo()->m_icon[ ICON_BOMB_TIMED ]->reset();
 				}
@@ -3565,15 +3539,15 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 						Int size = REAL_TO_INT( barWidth * 0.65f );
 						frameHeight = REAL_TO_INT((INT_TO_REAL(size) / INT_TO_REAL(frameWidth)) * frameHeight);
 						frameWidth = size;
-						
+
 						// given our scaled width and height we need to find the top left point to draw the image at
 						ICoord2D screen;
 						screen.x = REAL_TO_INT( healthBarRegion->lo.x + (barWidth * 0.5f) - (frameWidth * 0.5f) );
 						screen.y = REAL_TO_INT( healthBarRegion->lo.y + barHeight * 0.5f ) + BOMB_ICON_EXTRA_OFFSET;
 
-						getIconInfo()->m_icon[ ICON_BOMB_REMOTE ]->draw( screen.x, screen.y, frameWidth, frameHeight );	
+						getIconInfo()->m_icon[ ICON_BOMB_REMOTE ]->draw( screen.x, screen.y, frameWidth, frameHeight );
 						getIconInfo()->m_keepTillFrame[ ICON_BOMB_REMOTE ] = now + 1;
-						getIconInfo()->m_icon[ ICON_BOMB_TIMED ]->draw( screen.x, screen.y, frameWidth, frameHeight );	
+						getIconInfo()->m_icon[ ICON_BOMB_TIMED ]->draw( screen.x, screen.y, frameWidth, frameHeight );
 						getIconInfo()->m_keepTillFrame[ ICON_BOMB_TIMED ] = now + 1;
 					}
 				}
@@ -3611,7 +3585,7 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 						screen.x = REAL_TO_INT( healthBarRegion->lo.x + (barWidth * 0.5f) - (frameWidth * 0.5f) );
 						screen.y = REAL_TO_INT( healthBarRegion->lo.y + barHeight * 0.5f ) + BOMB_ICON_EXTRA_OFFSET;
 
-						getIconInfo()->m_icon[ ICON_BOMB_REMOTE ]->draw( screen.x, screen.y, frameWidth, frameHeight );	
+						getIconInfo()->m_icon[ ICON_BOMB_REMOTE ]->draw( screen.x, screen.y, frameWidth, frameHeight );
 						getIconInfo()->m_keepTillFrame[ ICON_BOMB_REMOTE ] = now + 1;
 					}
 				}
@@ -3638,17 +3612,17 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 void Drawable::drawDisabled(const IRegion2D* healthBarRegion)
 {
 
-	const Object *obj = getObject();			
+	const Object *obj = getObject();
 
 
 	//
 	// Disabled Emoticon /Lightning
 	//                   7/
-	if( obj->isDisabledByType( DISABLED_HACKED ) 
-		|| obj->isDisabledByType( DISABLED_PARALYZED ) 
-		|| obj->isDisabledByType( DISABLED_EMP ) 
-		|| obj->isDisabledByType( DISABLED_SUBDUED ) 
-		|| obj->isDisabledByType( DISABLED_UNDERPOWERED ) 
+	if( obj->isDisabledByType( DISABLED_HACKED )
+		|| obj->isDisabledByType( DISABLED_PARALYZED )
+		|| obj->isDisabledByType( DISABLED_EMP )
+		|| obj->isDisabledByType( DISABLED_SUBDUED )
+		|| obj->isDisabledByType( DISABLED_UNDERPOWERED )
 		)
 	{
 		// create icon if necessary
@@ -3679,14 +3653,14 @@ void Drawable::drawDisabled(const IRegion2D* healthBarRegion)
 			screen.y = healthBarRegion->hi.y - (frameHeight + barHeight);
 			getIconInfo()->m_icon[ ICON_DISABLED ]->draw( screen.x, screen.y, frameWidth, frameHeight );
 
-		}  // end if
-	}  // end if
+		}
+	}
 	else
 	{
 		// delete icon if necessary
 		killIcon(ICON_DISABLED);
 
-	}  // end if
+	}
 
 }
 
@@ -3705,7 +3679,7 @@ void Drawable::drawConstructPercent( const IRegion2D *healthBarRegion )
 		// no object, or we are now complete get rid of the string if we have one
 		if( m_constructDisplayString )
 		{
-		
+
 			TheDisplayStringManager->freeDisplayString( m_constructDisplayString );
 			m_constructDisplayString = NULL;
 		}
@@ -3727,14 +3701,14 @@ void Drawable::drawConstructPercent( const IRegion2D *healthBarRegion )
 	{
 		UnicodeString buffer;
 
-		
+
 		buffer.format( TheGameText->fetch("CONTROLBAR:UnderConstructionDesc"), obj->getConstructionPercent());
 		m_constructDisplayString->setText( buffer );
 
 		// record this percent as our last displayed so we don't un-necessarily rebuild the string
 		m_lastConstructDisplayed = obj->getConstructionPercent();
-				
-	}  // end if
+
+	}
 
 	// get center position in drawable
 	ICoord2D screen;
@@ -3753,7 +3727,7 @@ void Drawable::drawConstructPercent( const IRegion2D *healthBarRegion )
 	screen.x -= (m_constructDisplayString->getWidth() / 2);
 	m_constructDisplayString->draw( screen.x, screen.y, color, dropColor );
 
-}  // end drawConstructPercent
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw caption */
@@ -3789,7 +3763,7 @@ void Drawable::drawCaption( const IRegion2D *healthBarRegion )
 	Color dropColor = GameMakeColor( 0, 0, 0, 255 );
 	m_captionDisplayString->draw( screen.x, screen.y, color, dropColor );
 
-}  // end drawCaption
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Draw any veterency markers that should be displayed */
@@ -3841,7 +3815,7 @@ void Drawable::drawVeterancy( const IRegion2D *healthBarRegion )
 	// draw the image
 	TheDisplay->drawImage(image, screenCenter.x + 1, screenCenter.y + 1, screenCenter.x + 1 + vetBoxWidth, screenCenter.y + 1 + vetBoxHeight);
 
-}  // end drawVeterancy
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Draw health bar information for drawable */
@@ -3855,7 +3829,7 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 	// only draw health for selected drawbles and drawables that have been moused over
 	// by the cursor
 	//
-	if( TheGlobalData->m_showObjectHealth && 
+	if( TheGlobalData->m_showObjectHealth &&
 			(isSelected() || (TheInGameUI && (TheInGameUI->getMousedOverDrawableID() == getID()))) )
 	{
 		Object *obj = getObject();
@@ -3893,7 +3867,10 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 		//
 
 		Color color, outlineColor;
-		if( obj->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) || (obj->isDisabled() && !obj->isDisabledByType(DISABLED_HELD)) )
+		DisabledMaskType mask = obj->getDisabledFlags();
+		mask.clear(MAKE_DISABLED_MASK(DISABLED_HELD));
+
+		if (obj->getStatusBits().test(OBJECT_STATUS_UNDER_CONSTRUCTION) || DISABLEDMASK_ANY_SET(mask))
 		{
 			color = GameMakeColor( 0, healthRatio * 255.0f, 255, 255 );//blue to cyan
 			outlineColor = GameMakeColor( 0, healthRatio * 128.0f, 128, 255 );//dark blue to dark cyan
@@ -3937,8 +3914,8 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 
 			color =        GameMakeColor( 255.0 * inColor.red, 255.0 * inColor.green, 255.0 * inColor.blue, 255);
 			outlineColor = GameMakeColor( 255.0 * outColor.red, 255.0 * outColor.green, 255.0 * outColor.blue, 255);
-		
-		
+
+
 		}
 
 
@@ -3946,7 +3923,7 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 
 ///		Real scale = 1.3f / TheTacticalView->getZoom();
 		Real healthBoxWidth = healthBarRegion->hi.x - healthBarRegion->lo.x;
-			
+
 		Real healthBoxHeight = max(3, healthBarRegion->hi.y - healthBarRegion->lo.y);
 		Real healthBoxOutlineSize = 1.0f;
 
@@ -3958,9 +3935,9 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 		TheDisplay->drawFillRect( healthBarRegion->lo.x + 1, healthBarRegion->lo.y + 1,
 															(healthBoxWidth - 2) * healthRatio, healthBoxHeight - 2,
 															color );
-	}  // end if
+	}
 
-}  // end drawHealthBar
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -3975,16 +3952,18 @@ void Drawable::clearAndSetModelConditionState( ModelConditionFlagType clr, Model
 }
 
 //-------------------------------------------------------------------------------------------------
-DrawModule** Drawable::getDrawModulesNonDirty() 
-{ 
-	DrawModule** dm = (DrawModule**)getModuleList(MODULETYPE_DRAW); 
+DrawModule** Drawable::getDrawModulesNonDirty()
+{
+	DrawModule** dm = (DrawModule**)getModuleList(MODULETYPE_DRAW);
+	DEBUG_ASSERTCRASH(dm != NULL, ("Draw Module List is not expected NULL"));
 	return dm;
 }
 
 //-------------------------------------------------------------------------------------------------
-DrawModule** Drawable::getDrawModules() 
-{ 
-	DrawModule** dm = (DrawModule**)getModuleList(MODULETYPE_DRAW); 
+DrawModule** Drawable::getDrawModules()
+{
+	DrawModule** dm = (DrawModule**)getModuleList(MODULETYPE_DRAW);
+
 #ifdef DIRTY_CONDITION_FLAGS
 	if (m_isModelDirty)
 	{
@@ -3997,23 +3976,20 @@ DrawModule** Drawable::getDrawModules()
 		}
 		else
 		{
-			for (DrawModule** dm2 = dm; *dm2; ++dm2)
-			{
-				ObjectDrawInterface* di = (*dm2)->getObjectDrawInterface();
-				if (di)
-					di->replaceModelConditionState( m_conditionState );
-			}
-			m_isModelDirty = false;
+			replaceModelConditionStateInDrawable();
 		}
 	}
 #endif
+
+	DEBUG_ASSERTCRASH(dm != NULL, ("Draw Module List is not expected NULL"));
 	return dm;
 }
 
 //-------------------------------------------------------------------------------------------------
-DrawModule const** Drawable::getDrawModules() const 
-{ 
-	DrawModule const** dm = (DrawModule const**)getModuleList(MODULETYPE_DRAW); 
+DrawModule const** Drawable::getDrawModules() const
+{
+	DrawModule const** dm = (DrawModule const**)getModuleList(MODULETYPE_DRAW);
+
 #ifdef DIRTY_CONDITION_FLAGS
 	if (m_isModelDirty)
 	{
@@ -4026,17 +4002,12 @@ DrawModule const** Drawable::getDrawModules() const
 		}
 		else
 		{
-			// yeah, yeah, yeah... I know (srj)
-			for (DrawModule** dm2 = (DrawModule**)dm; *dm2; ++dm2)
-			{
-				ObjectDrawInterface* di = (*dm2)->getObjectDrawInterface();
-				if (di)
-					di->replaceModelConditionState( m_conditionState );
-			}
-			m_isModelDirty = false;
+			const_cast<Drawable*>(this)->replaceModelConditionStateInDrawable();
 		}
 	}
 #endif
+
+	DEBUG_ASSERTCRASH(dm != NULL, ("Draw Module List is not expected NULL"));
 	return dm;
 }
 
@@ -4047,19 +4018,14 @@ void Drawable::clearAndSetModelConditionFlags(const ModelConditionFlags& clr, co
 	ModelConditionFlags oldFlags = m_conditionState;
 
 	m_conditionState.clearAndSet(clr, setf);
-	
+
 	if (m_conditionState == oldFlags)
 		return;
 
 #ifdef DIRTY_CONDITION_FLAGS
 	m_isModelDirty = true;
 #else
-	for (DrawModule** dm = getDrawModules(); *dm; ++dm)
-	{
-		ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
-		if (di)
-			di->replaceModelConditionState( m_conditionState );
-	}
+	replaceModelConditionStateInDrawable();
 #endif
 }
 
@@ -4075,30 +4041,43 @@ void Drawable::replaceModelConditionFlags( const ModelConditionFlags &flags, Boo
 	//
 	if( forceReplace == FALSE && m_conditionState == flags )
 		return;
-		
+
 	m_conditionState = flags;
 #ifdef DIRTY_CONDITION_FLAGS
 	// when forcing a replace we won't use dirty flags, we will immediately do an update now
 	if( forceReplace == TRUE )
 	{
-		for (DrawModule** dm = getDrawModules(); *dm; ++dm)
-		{
-			ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
-			if (di)
-				di->replaceModelConditionState( m_conditionState );
-		}
-		m_isModelDirty = false;
+		replaceModelConditionStateInDrawable();
 	}
-	else 
+	else
+	{
 		m_isModelDirty = true;
+	}
 #else
+	replaceModelConditionStateInDrawable();
+#endif
+}
+
+//-------------------------------------------------------------------------------------------------
+void Drawable::replaceModelConditionStateInDrawable()
+{
+	// TheSuperHackers @info Set not dirty early to avoid recursive calls from within getDrawModules().
+	m_isModelDirty = false;
+
+	// TheSuperHackers @bugfix Remove and re-add the terrain decal before processing the individual draw
+	// modules, because the terrain decal is applied to the first draw module only, and the new first
+	// draw module may be different than before.
+	const TerrainDecalType terrainDecalType = getTerrainDecalType();
+	setTerrainDecal(TERRAIN_DECAL_NONE);
+
 	for (DrawModule** dm = getDrawModules(); *dm; ++dm)
 	{
 		ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
 		if (di)
 			di->replaceModelConditionState( m_conditionState );
 	}
-#endif
+
+	setTerrainDecal(terrainDecalType);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4113,9 +4092,9 @@ void Drawable::setIndicatorColor(Color color)
 }
 
 // ------------------------------------------------------------------------------------------------
-const GeometryInfo& Drawable::getDrawableGeometryInfo() const 
-{ 
-	return getObject() ? getObject()->getGeometryInfo() : getTemplate()->getTemplateGeometryInfo(); 
+const GeometryInfo& Drawable::getDrawableGeometryInfo() const
+{
+	return getObject() ? getObject()->getGeometryInfo() : getTemplate()->getTemplateGeometryInfo();
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -4143,7 +4122,7 @@ void Drawable::setID( DrawableID id )
 			m_ambientSound->m_event.setDrawableID(m_id);
 	}
 
-}  // end setID
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Return drawable ID, this ID is only good on the client */
@@ -4152,16 +4131,16 @@ DrawableID Drawable::getID( void ) const
 {
 
 	// we should never be getting the ID of a drawable who doesn't yet have and ID assigned to it
-	DEBUG_ASSERTCRASH( m_id != 0, ("Drawable::getID - Using ID before it was assigned!!!!\n") );
+	DEBUG_ASSERTCRASH( m_id != 0, ("Drawable::getID - Using ID before it was assigned!!!!") );
 
 	return m_id;
 
-}  // end get ID
+}
 
 //-------------------------------------------------------------------------------------------------
 void Drawable::friend_bindToObject( Object *obj ) ///< bind this drawable to an object ID
-{ 
-	m_object = obj; 
+{
+	m_object = obj;
 	if (getObject())
 	{
 		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
@@ -4171,7 +4150,7 @@ void Drawable::friend_bindToObject( Object *obj ) ///< bind this drawable to an
 
 		if (getObject()->isKindOf(KINDOF_FS_FAKE))
 		{
-			Relationship rel=ThePlayerList->getLocalPlayer()->getRelationship(getObject()->getTeam());
+			Relationship rel = rts::getObservedOrLocalPlayer()->getRelationship(getObject()->getTeam());
 			if (rel == ALLIES || rel == NEUTRAL)
 				setTerrainDecal(TERRAIN_DECAL_SHADOW_TEXTURE);
 			else
@@ -4183,7 +4162,15 @@ void Drawable::friend_bindToObject( Object *obj ) ///< bind this drawable to an
 	{
 		(*dm)->onDrawableBoundToObject();
 	}
-}					
+
+	PhysicsXformInfo physicsXform;
+	if (calcPhysicsXform(physicsXform))
+	{
+		DEBUG_ASSERTCRASH(m_physicsXform == NULL, ("m_physicsXform is not NULL"));
+		m_physicsXform = new PhysicsXformInfo;
+		*m_physicsXform = physicsXform;
+	}
+}
 //-------------------------------------------------------------------------------------------------
 	// when our Object changes teams, it calls us to let us know, so
 	// we can update our model, etc., if necessary. NOTE, we don't guarantee
@@ -4201,7 +4188,7 @@ void Drawable::changedTeam()
 
 		if (object->isKindOf(KINDOF_FS_FAKE))
 		{
-			Relationship rel=ThePlayerList->getLocalPlayer()->getRelationship(object->getTeam());
+			Relationship rel = rts::getObservedOrLocalPlayer()->getRelationship(object->getTeam());
 			if (rel == ALLIES || rel == NEUTRAL)
 				setTerrainDecal(TERRAIN_DECAL_SHADOW_TEXTURE);
 			else
@@ -4211,7 +4198,7 @@ void Drawable::changedTeam()
 }
 
 //-------------------------------------------------------------------------------------------------
-void Drawable::setPosition(const Coord3D *pos) 
+void Drawable::setPosition(const Coord3D *pos)
 {
 	// extend
 	Thing::setPosition(pos);
@@ -4225,7 +4212,7 @@ void Drawable::reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* old
 	{
 		(*dm)->reactToTransformChange(oldMtx, oldPos, oldAngle);
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void Drawable::reactToGeometryChange()
@@ -4234,11 +4221,11 @@ void Drawable::reactToGeometryChange()
 	{
 		(*dm)->reactToGeometryChange();
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool Drawable::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelToUse, const FXList* fxl, Real weaponSpeed, Real recoilAmount, Real recoilAngle, const Coord3D* victimPos, Real damageRadius)
-{	  
+{
 	if (recoilAmount != 0.0f)
 	{
 		// adjust recoil from absolute to relative.
@@ -4260,7 +4247,7 @@ Bool Drawable::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelToUse,
 			return true;
 	}
 	return false;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 Int Drawable::getBarrelCount(WeaponSlotType wslot) const
@@ -4273,16 +4260,16 @@ Int Drawable::getBarrelCount(WeaponSlotType wslot) const
 			return count;
 	}
 	return 0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the Drawable's instance transform */
 //-------------------------------------------------------------------------------------------------
-void Drawable::setInstanceMatrix( const Matrix3D *instance ) 
-{ 
+void Drawable::setInstanceMatrix( const Matrix3D *instance )
+{
 	if (instance)
 	{
-		m_instance = *instance; 
+		m_instance = *instance;
 		m_instanceIsIdentity = false;
 	}
 	else
@@ -4294,7 +4281,7 @@ void Drawable::setInstanceMatrix( const Matrix3D *instance )
 
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Return the Drawable's world transform.
  * If this Drawable is attached to an Object, return the Object's transform instead.
  */
@@ -4310,7 +4297,7 @@ const Matrix3D *Drawable::getTransformMatrix( void ) const
 }
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Set and clear the drawable's caption text
  */
 //-------------------------------------------------------------------------------------------------
@@ -4379,8 +4366,8 @@ void	Drawable::setTimeOfDay(TimeOfDay tod)
 }
 
 
-/** 
- * If you wish to change some parameters of the default ambient sound, but keep the rest, 
+/**
+ * If you wish to change some parameters of the default ambient sound, but keep the rest,
  * this function will give you the default ambient sound's info
  */
 const AudioEventInfo * Drawable::getBaseSoundAmbientInfo() const
@@ -4392,7 +4379,7 @@ const AudioEventInfo * Drawable::getBaseSoundAmbientInfo() const
   return NULL;
 }
 
-/** 
+/**
  * Produce a unique-across-entire-level name for this audio event
  */
 void Drawable::mangleCustomAudioName( DynamicAudioEventInfo * audioToMangle ) const
@@ -4403,17 +4390,17 @@ void Drawable::mangleCustomAudioName( DynamicAudioEventInfo * audioToMangle ) co
   audioToMangle->overrideAudioName( customizedName );
 }
 
-/** 
+/**
  * Force the Drawable to not ever get an ambient sound attached to it (except possibly for RUBBLE)
  */
 void Drawable::setCustomSoundAmbientOff()
 {
   clearCustomSoundAmbient( false );
-  
-  m_customSoundAmbientInfo = getNoSoundMarker();  
+
+  m_customSoundAmbientInfo = getNoSoundMarker();
 }
 
-/** 
+/**
  * Force the Drawable to use the sound described by customAmbientInfo as its ambient sound.
  * The Drawable expects TheAudio to own the actual info pointer
  */
@@ -4421,18 +4408,18 @@ void Drawable::setCustomSoundAmbientInfo( DynamicAudioEventInfo * customAmbientI
 {
   clearCustomSoundAmbient( false );
 
-  // This is mostly to make sure no one delete's the no sound marker, causing it to be 
+  // This is mostly to make sure no one delete's the no sound marker, causing it to be
   // recycled as a new no sound marker
   DEBUG_ASSERTCRASH( customAmbientInfo != getNoSoundMarker(), ("No sound marker passed as custom ambient") );
 
   // Set name to something different so we don't get confused
- 
+
   m_customSoundAmbientInfo = customAmbientInfo;
 
   startAmbientSound(); // Note: checks for enabled flag
 }
 
-/** 
+/**
  * Return to using default ambient sound
  */
 void Drawable::clearCustomSoundAmbient( bool restartSound )
@@ -4447,7 +4434,7 @@ void Drawable::clearCustomSoundAmbient( bool restartSound )
   stopAmbientSound();
 
   m_customSoundAmbientInfo = NULL;
-  
+
   if ( restartSound )
   {
     startAmbientSound(); // Note: checks for enabled flag
@@ -4476,7 +4463,7 @@ void Drawable::startAmbientSound(BodyDamageType dt, TimeOfDay tod, Bool onlyIfPe
       m_ambientSound->m_event.setEventName( m_customSoundAmbientInfo->m_audioName );
       m_ambientSound->m_event.setAudioEventInfo( m_customSoundAmbientInfo );
       trySound = TRUE;
-    }       
+    }
   }
   else
   {
@@ -4506,8 +4493,8 @@ void Drawable::startAmbientSound(BodyDamageType dt, TimeOfDay tod, Bool onlyIfPe
 		  }
 	  }
   }
-  
-	
+
+
 	if( trySound && m_ambientSound )
 	{
 		const AudioEventInfo *info = m_ambientSound->m_event.getAudioEventInfo();
@@ -4554,7 +4541,7 @@ void Drawable::startAmbientSound( Bool onlyIfPermanent )
   // Must go through enableAmbientSound() if sound is disabled
   if ( !m_ambientSoundEnabled || !m_ambientSoundEnabledFromScript )
     return;
-  
+
   stopAmbientSound();
 	BodyDamageType bodyCondition = BODY_PRISTINE;
 	Object *obj = getObject();
@@ -4662,7 +4649,7 @@ void Drawable::updateHiddenStatus()
 		if (di)
 			di->setHidden(hidden != 0);
 	}
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4754,7 +4741,7 @@ void Drawable::preloadAssets( TimeOfDay timeOfDay )
 		for( Module** m = m_modules[i]; m && *m; ++m )
 			(*m)->preloadAssets( timeOfDay );
 
-}  // end preloadAssets
+}
 
 //-------------------------------------------------------------------------------------------------
 // Simply searches for the first occurrence of a specified client update module.
@@ -4781,7 +4768,7 @@ ClientUpdateModule* Drawable::findClientUpdateModule( NameKeyType key )
 void Drawable::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer the drawable modules
@@ -4832,7 +4819,7 @@ void Drawable::xferDrawableModules( Xfer *xfer )
 				// write module identifier
 				moduleIdentifier = TheNameKeyGenerator->keyToName( (*m)->getModuleTagNameKey() );
 				DEBUG_ASSERTCRASH( moduleIdentifier != AsciiString::TheEmptyString,
-													 ("Drawable::xferDrawableModules - module name key does not translate to a string!\n") );
+													 ("Drawable::xferDrawableModules - module name key does not translate to a string!") );
 				xfer->xferAsciiString( &moduleIdentifier );
 
 				// begin data block
@@ -4844,9 +4831,9 @@ void Drawable::xferDrawableModules( Xfer *xfer )
 				// end data block
 				xfer->endBlock();
 
-			}  // end for, m
+			}
 
-		}  // end if, save
+		}
 		else
 		{
 			// read each module
@@ -4867,9 +4854,9 @@ void Drawable::xferDrawableModules( Xfer *xfer )
 						module = *m;
 						break;  // exit for m
 
-					}  // end if
+					}
 
-				}  // end for, m
+				}
 
 				// new block of data
 				Int dataSize = xfer->beginBlock();
@@ -4883,49 +4870,54 @@ void Drawable::xferDrawableModules( Xfer *xfer )
 				{
 
 					// for testing purposes, this module better be found
-					DEBUG_CRASH(( "Drawable::xferDrawableModules - Module '%s' was indicated in file, but not found on Drawable %s %d\n",
+					DEBUG_CRASH(( "Drawable::xferDrawableModules - Module '%s' was indicated in file, but not found on Drawable %s %d",
 												moduleIdentifier.str(), getTemplate()->getName().str(),getID() ));
 
 					// skip this data in the file
 					xfer->skip( dataSize );
 
-				}  // end if
+				}
 				else
 				{
 
 					// xfer the data into this module
 					xfer->xferSnapshot( module );
 
-				}  // end else
+				}
 
 				// end of data block
 				xfer->endBlock();
 
-			}  // end for j
+			}
 
-		}  // end else, load
+		}
 
-	}  // end for curModuleType
+	}
 
-}  // end xferDrawableModules
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info;
 	* 1: Initial version
-	* 2: Moved condition state xfer before module xfer so we can restore anim frame 
+	* 2: Moved condition state xfer before module xfer so we can restore anim frame
 	*    during the module xfer (CBD)
 	* 4: Added m_ambientSoundEnabled flag
 	* 5: save full mtx, not pos+orient.
-  * 6: Added m_ambientSoundEnabledFromScript flag
-  * 7: Save the customize ambient sound info
+	* 6: Added m_ambientSoundEnabledFromScript flag
+	* 7: Save the customize ambient sound info
+	* 8: TheSuperHackers @bugfix Removed m_prevTintStatus because loading its value is unnecessary and undesirable
 	*/
 // ------------------------------------------------------------------------------------------------
 void Drawable::xfer( Xfer *xfer )
 {
 
 	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
 	const XferVersion currentVersion = 7;
+#else
+	const XferVersion currentVersion = 8;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
@@ -4952,7 +4944,7 @@ void Drawable::xfer( Xfer *xfer )
 		if( xfer->getXferMode() == XFER_LOAD	)
 			replaceModelConditionFlags( m_conditionState, TRUE );
 
-	}  // end if
+	}
 
 	if( version >= 3 )
 	{
@@ -4989,7 +4981,7 @@ void Drawable::xfer( Xfer *xfer )
 		// xfer
 		xfer->xferSnapshot( m_selectionFlashEnvelope );
 
-	}  // end if
+	}
 
 	// color tint envelope
 	Bool colFlash = (m_colorTintEnvelope != NULL);
@@ -5004,7 +4996,7 @@ void Drawable::xfer( Xfer *xfer )
 		// xfer
 		xfer->xferSnapshot( m_colorTintEnvelope );
 
-	}  // end if
+	}
 
 	// terrain decal type
 	TerrainDecalType decal = getTerrainDecalType();
@@ -5042,15 +5034,15 @@ void Drawable::xfer( Xfer *xfer )
 
 			if( objectID != m_object->getID() )
 			{
-			
-				DEBUG_CRASH(( "Drawable::xfer - Drawable '%s' is attached to wrong object '%s'\n",
+
+				DEBUG_CRASH(( "Drawable::xfer - Drawable '%s' is attached to wrong object '%s'",
 											getTemplate()->getName().str(), m_object->getTemplate()->getName().str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 
-		}  // end if
+		}
 		else
 		{
 
@@ -5059,22 +5051,22 @@ void Drawable::xfer( Xfer *xfer )
 #ifdef DEBUG_CRASHING
 				Object *obj = TheGameLogic->findObjectByID( objectID );
 
-				DEBUG_CRASH(( "Drawable::xfer - Drawable '%s' is not attached to an object but should be attached to object '%s' with id '%d'\n",
+				DEBUG_CRASH(( "Drawable::xfer - Drawable '%s' is not attached to an object but should be attached to object '%s' with id '%d'",
 											getTemplate()->getName().str(),
 											obj ? obj->getTemplate()->getName().str() : "Unknown",
 											objectID ));
 #endif
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
 
 	// particle
-	// we don't need to worry about this, the particle itself will set it upon loading 
+	// we don't need to worry about this, the particle itself will set it upon loading
 
 	// selected
 	// we won't worry about selection, we'll let TheInGameUI take care of it all
@@ -5085,8 +5077,15 @@ void Drawable::xfer( Xfer *xfer )
 	// tint status
 	xfer->xferUnsignedInt( &m_tintStatus );
 
-	// prev tint status
-	xfer->xferUnsignedInt( &m_prevTintStatus );
+	if (version <= 7)
+	{
+		// prev tint status
+		xfer->xferUnsignedInt( &m_prevTintStatus );
+
+		// TheSuperHackers @bugfix Caball009 21/12/2025 Trigger tinting after loading a save game.
+		if (xfer->getXferMode() == XFER_LOAD)
+			m_prevTintStatus = 0;
+	}
 
 	// fading mode
 	xfer->xferUser( &m_fadeMode, sizeof( FadingMode ) );
@@ -5192,15 +5191,15 @@ void Drawable::xfer( Xfer *xfer )
 	{
 
 		// sanity, we don't write old versions we can only read them
-		DEBUG_ASSERTCRASH( xfer->getXferMode() == XFER_LOAD, 
-											 ("Drawable::xfer - Writing an old format!!!\n") );
+		DEBUG_ASSERTCRASH( xfer->getXferMode() == XFER_LOAD,
+											 ("Drawable::xfer - Writing an old format!!!") );
 
 		// condition state, note that when we're loading we need to force a replace of these flags
 		m_conditionState.xfer( xfer );
 		if( xfer->getXferMode() == XFER_LOAD	)
 			replaceModelConditionFlags( m_conditionState, TRUE );
 
-	}  // end if
+	}
 
 	// expiration date
 	xfer->xferUnsignedInt( &m_expirationDate );
@@ -5244,9 +5243,9 @@ void Drawable::xfer( Xfer *xfer )
 			// icon data
 			xfer->xferSnapshot( getIconInfo()->m_icon[ i ] );
 
-		}  // end for, i
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		Int i;
@@ -5275,10 +5274,10 @@ void Drawable::xfer( Xfer *xfer )
 			if( animTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "Drawable::xfer - Unknown icon template '%s'\n", iconTemplateName.str() ));
+				DEBUG_CRASH(( "Drawable::xfer - Unknown icon template '%s'", iconTemplateName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// create icon
 			getIconInfo()->m_icon[ iconIndex ] = newInstance(Anim2D)( animTemplate, TheAnim2DCollection );
@@ -5286,14 +5285,14 @@ void Drawable::xfer( Xfer *xfer )
 			// icon data
 			xfer->xferSnapshot( getIconInfo()->m_icon[ iconIndex ] );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	if( xfer->getXferMode() == XFER_LOAD )
 	{
 		// On load, we want to set it to none, because stealthlook updates
-		// when it changes.  So in the next stealth update, it will be set to 
+		// when it changes.  So in the next stealth update, it will be set to
 		// it's correct value, and the drawable updated (hide shadows and such).  jba.
 		m_stealthLook = STEALTHLOOK_NONE;
 		// Also, need to update the hidden status for all sub-modules.
@@ -5309,7 +5308,7 @@ void Drawable::xfer( Xfer *xfer )
 	//
 #ifdef DIRTY_CONDITION_FLAGS
 	if( xfer->getXferMode() == XFER_SAVE )
-		DEBUG_ASSERTCRASH( m_isModelDirty == FALSE, ("Drawble::xfer - m_isModelDirty is not FALSE!\n") );
+		DEBUG_ASSERTCRASH( m_isModelDirty == FALSE, ("Drawble::xfer - m_isModelDirty is not FALSE!") );
 	else
 		m_isModelDirty = TRUE;
 #endif
@@ -5358,7 +5357,7 @@ void Drawable::xfer( Xfer *xfer )
           if ( baseInfo == NULL )
           {
             DEBUG_CRASH( ( "Load failed to load customized ambient sound because sound '%s' no longer exists", baseInfoName.str() ) );
-            
+
             // Keep trying to load if we possibly can... Don't completely ruin save files just because an old sound
             // entry in the INI files was removed or renamed
             customizedInfo = newInstance( DynamicAudioEventInfo );
@@ -5373,7 +5372,7 @@ void Drawable::xfer( Xfer *xfer )
           {
             // Get custom name back
             mangleCustomAudioName( customizedInfo );
-        
+
             customizedInfo->xferNoName( xfer );
 
             if ( successfulLoad )
@@ -5382,7 +5381,7 @@ void Drawable::xfer( Xfer *xfer )
 
               clearCustomSoundAmbient( false );
               m_customSoundAmbientInfo = customizedInfo;
-              
+
               customizedInfo = NULL; // Belongs to TheAudio now
             }
             else
@@ -5394,8 +5393,7 @@ void Drawable::xfer( Xfer *xfer )
           catch( ... )
           {
             // since Xfer can throw exceptions -- don't leak memory!
-            if ( customizedInfo != NULL ) 
-              deleteInstance(customizedInfo);
+            deleteInstance(customizedInfo);
 
             throw; //rethrow
           }
@@ -5412,7 +5410,7 @@ void Drawable::xfer( Xfer *xfer )
       }
     }
   }
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -5425,16 +5423,16 @@ void Drawable::loadPostProcess( void )
 	{
 		setTransformMatrix(m_object->getTransformMatrix());
 	}
-	
+
 	if( m_ambientSoundEnabled && m_ambientSoundEnabledFromScript )
 	{
-    // Do we actually want to start the ambient sound up? 
+    // Do we actually want to start the ambient sound up?
     // If it is a permanent sound, then yes; but if it is
     // a one-shot sound, we don't want to start it even
     // if it's enabled (because the sound might have finished
     // playing long ago). This is what the "onlyIfPermanent"
     // parameter does -- almost like it was added just for
-    // this special case! 
+    // this special case!
     startAmbientSound( true );
 	}
 	else
@@ -5442,7 +5440,20 @@ void Drawable::loadPostProcess( void )
 		stopAmbientSound();
 	}
 
-}  // end loadPostProcess
+}
+
+//-------------------------------------------------------------------------------------------------
+const Locomotor* Drawable::getLocomotor() const
+{
+	if (const Object* obj = getObject())
+	{
+		if (const AIUpdateInterface *ai = obj->getAIUpdateInterface())
+		{
+			return ai->getCurLocomotor();
+		}
+	}
+	return NULL;
+}
 
 //=================================================================================================
 //=================================================================================================
@@ -5491,11 +5502,11 @@ TintEnvelope::TintEnvelope(void)
 const Real FADE_RATE_EPSILON = (0.001f);
 
 //-------------------------------------------------------------------------------------------------
-void TintEnvelope::play(const RGBColor *peak, UnsignedInt atackFrames, UnsignedInt decayFrames, UnsignedInt sustainAtPeak )    
+void TintEnvelope::play(const RGBColor *peak, UnsignedInt attackFrames, UnsignedInt decayFrames, UnsignedInt sustainAtPeak )
 {
 	setPeakColor( peak );
 
-	setAttackFrames( atackFrames );
+	setAttackFrames( attackFrames );
 	setDecayFrames( decayFrames );
 
 	m_envState = ENVELOPE_STATE_ATTACK;
@@ -5511,7 +5522,7 @@ void TintEnvelope::play(const RGBColor *peak, UnsignedInt atackFrames, UnsignedI
 }
 
 //-------------------------------------------------------------------------------------------------
-void TintEnvelope::setAttackFrames(UnsignedInt frames) 
+void TintEnvelope::setAttackFrames(UnsignedInt frames)
 {
 	Real recipFrames = 1.0f / (Real)MAX(1,frames);
 	m_attackRate.Set( m_currentColor );
@@ -5530,6 +5541,9 @@ void TintEnvelope::setDecayFrames( UnsignedInt frames )
 //-------------------------------------------------------------------------------------------------
 void TintEnvelope::update(void)
 {
+	// TheSuperHackers @tweak The tint time step is now decoupled from the render update.
+	const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
+
 	switch ( m_envState )
 	{
 		case ( ENVELOPE_STATE_REST ) : //most likely case
@@ -5540,25 +5554,31 @@ void TintEnvelope::update(void)
 		}
 		case ( ENVELOPE_STATE_DECAY ) : // much more likely than attack
 		{
-			if (m_decayRate.Length() > m_currentColor.Length() || m_currentColor.Length() <= FADE_RATE_EPSILON) //we are at rest
+			const Vector3 decayRate = m_decayRate * timeScale;
+
+			if (decayRate.Length() > m_currentColor.Length() || m_currentColor.Length() <= FADE_RATE_EPSILON) 
 			{
+				// We are at rest
 				m_envState = ENVELOPE_STATE_REST;
 				m_affect = FALSE;
 			}
 			else
 			{
-				Vector3::Add( m_decayRate, m_currentColor, &m_currentColor );//Add the decayRate to the current color;
+				// Add the decayRate to the current color
+				Vector3::Add( decayRate, m_currentColor, &m_currentColor );
 				m_affect = TRUE;
 			}
 			break;
 		}
-		case ( ENVELOPE_STATE_ATTACK ) : 
+		case ( ENVELOPE_STATE_ATTACK ) :
 		{
+			const Vector3 attackRate = m_attackRate * timeScale;
 			Vector3 delta;
 			Vector3::Subtract(m_currentColor, m_peakColor, &delta);
-			
-			if (m_attackRate.Length() > delta.Length() || delta.Length() <= FADE_RATE_EPSILON) //we are at the peak
+
+			if (attackRate.Length() > delta.Length() || delta.Length() <= FADE_RATE_EPSILON)
 			{
+				// We are at the peak
 				if ( m_sustainCounter )
 				{
 					m_envState = ENVELOPE_STATE_SUSTAIN;
@@ -5567,23 +5587,23 @@ void TintEnvelope::update(void)
 				{
 					m_envState = ENVELOPE_STATE_DECAY;
 				}
-
 			}
 			else
 			{
-				Vector3::Add( m_attackRate, m_currentColor, &m_currentColor );//Add the attackRate to the current color;
+				// Add the attackRate to the current color
+				Vector3::Add( attackRate, m_currentColor, &m_currentColor );
 				m_affect = TRUE;
 			}
-			
+
 			break;
 		}
 		case ( ENVELOPE_STATE_SUSTAIN ) :
 		{
-			if ( m_sustainCounter > 0 )
-				--m_sustainCounter;
+			if ( m_sustainCounter > 0.0f )
+				m_sustainCounter -= timeScale;
 			else
 				release();
-				
+
 			break;
 		}
 		default:
@@ -5592,7 +5612,7 @@ void TintEnvelope::update(void)
 			break;
 		}
 	}
-	// here we transition the color from current to peak to release, according to 
+	// here we transition the color from current to peak to release, according to
 
 }
 
@@ -5602,7 +5622,7 @@ void TintEnvelope::update(void)
 void TintEnvelope::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -5612,8 +5632,12 @@ void TintEnvelope::crc( Xfer *xfer )
 void TintEnvelope::xfer( Xfer *xfer )
 {
 
-	// version 
+	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
 	XferVersion currentVersion = 1;
+#else
+	XferVersion currentVersion = 2;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
@@ -5630,7 +5654,16 @@ void TintEnvelope::xfer( Xfer *xfer )
 	xfer->xferUser( &m_currentColor, sizeof( Vector3 ) );
 
 	// sustain counter
-	xfer->xferUnsignedInt( &m_sustainCounter );
+	if (version <= 1)
+	{
+		UnsignedInt sustainCounter = (UnsignedInt)m_sustainCounter;
+		xfer->xferUnsignedInt( &sustainCounter );
+		m_sustainCounter = (Real)sustainCounter;
+	}
+	else
+	{
+		xfer->xferReal( &m_sustainCounter );
+	}
 
 	// affect
 	xfer->xferBool( &m_affect );
@@ -5638,7 +5671,7 @@ void TintEnvelope::xfer( Xfer *xfer )
 	// state
 	xfer->xferByte( &m_envState );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load Post Process */
@@ -5646,5 +5679,5 @@ void TintEnvelope::xfer( Xfer *xfer )
 void TintEnvelope::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
index 3a8a429c8db..adb780c903c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/Drawable.h"
 #include "GameClient/Module/AnimatedParticleSysBoneClientUpdate.h"
@@ -100,7 +100,7 @@ void AnimatedParticleSysBoneClientUpdate::crc( Xfer *xfer )
 	// extend base class
 	ClientUpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -119,7 +119,7 @@ void AnimatedParticleSysBoneClientUpdate::xfer( Xfer *xfer )
 	ClientUpdateModule::xfer( xfer );
 
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -130,4 +130,4 @@ void AnimatedParticleSysBoneClientUpdate::loadPostProcess( void )
 	// extend base class
 	ClientUpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
index 4d90613ed9f..338b0cc82ec 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
@@ -52,11 +52,11 @@ BeaconClientUpdateModuleData::~BeaconClientUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void BeaconClientUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void BeaconClientUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ClientUpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "RadarPulseFrequency",	INI::parseDurationUnsignedInt, NULL, offsetof(BeaconClientUpdateModuleData, m_framesBetweenRadarPulses) },
 		{ "RadarPulseDuration",		INI::parseDurationUnsignedInt, NULL, offsetof(BeaconClientUpdateModuleData, m_radarPulseDuration) },
@@ -95,8 +95,8 @@ static ParticleSystem* createParticleSystem( Drawable *draw )
 			templateName.format("BeaconSmoke%6.6X", (0xffffff & obj->getIndicatorColor()));
 			const ParticleSystemTemplate *particleTemplate = TheParticleSystemManager->findTemplate( templateName );
 
-			DEBUG_ASSERTCRASH(particleTemplate, ("Could not find particle system %s\n", templateName.str()));
-			
+			DEBUG_ASSERTCRASH(particleTemplate, ("Could not find particle system %s", templateName.str()));
+
 			if (particleTemplate)
 			{
 				system = TheParticleSystemManager->createParticleSystem( particleTemplate );
@@ -150,9 +150,9 @@ void BeaconClientUpdate::hideBeacon( void )
 		if( system )
 			system->stop();
 
-	}  // end if
-	
-//	DEBUG_LOG(("in hideBeacon(): draw=%d, m_particleSystemID=%d\n", draw, m_particleSystemID));
+	}
+
+//	DEBUG_LOG(("in hideBeacon(): draw=%d, m_particleSystemID=%d", draw, m_particleSystemID));
 
 }
 
@@ -188,11 +188,11 @@ void BeaconClientUpdate::clientUpdate( void )
 // ------------------------------------------------------------------------------------------------
 void BeaconClientUpdate::crc( Xfer *xfer )
 {
-	
+
 	// extend base class
 	ClientUpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -216,7 +216,7 @@ void BeaconClientUpdate::xfer( Xfer *xfer )
 	// last radar pulse
 	xfer->xferUnsignedInt( &m_lastRadarPulse );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -227,4 +227,4 @@ void BeaconClientUpdate::loadPostProcess( void )
 	// extend base class
 	ClientUpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
index f3eadcbe851..3beb267e877 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
@@ -28,10 +28,11 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/Drawable.h"
 #include "GameClient/Module/SwayClientUpdate.h"
+#include "Common/FramePacer.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/ThingFactory.h"
@@ -43,11 +44,6 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/GameLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -81,10 +77,10 @@ SwayClientUpdate::~SwayClientUpdate( void )
 void SwayClientUpdate::updateSway()
 {
 	const BreezeInfo& info = TheScriptEngine->getBreezeInfo();
-	if (info.m_randomness == 0.0f) 
+	if (info.m_randomness == 0.0f)
 	{
 		m_curValue = 0;
-	} 
+	}
 	Real delta				= info.m_randomness * 0.5f;
 	m_curAngleLimit		= info.m_intensity * GameClientRandomValueReal(1.0f-delta, 1.0f+delta);
 	m_curDelta				= 2*PI/info.m_breezePeriod * GameClientRandomValueReal(1.0f-delta, 1.0f+delta);
@@ -105,10 +101,10 @@ void SwayClientUpdate::clientUpdate( void )
 
 	Drawable *draw = getDrawable();
 
-	// if breeze changes, always process the full update, even if not visible, 
+	// if breeze changes, always process the full update, even if not visible,
 	// so that things offscreen won't 'pop' when first viewed
 	const BreezeInfo& info = TheScriptEngine->getBreezeInfo();
-	if (info.m_breezeVersion != m_curVersion) 
+	if (info.m_breezeVersion != m_curVersion)
 	{
 		updateSway();
 	}
@@ -119,8 +115,11 @@ void SwayClientUpdate::clientUpdate( void )
 			return;
 	}
 
-	m_curValue += m_curDelta;
-	if (m_curValue > 2*PI) 
+	// TheSuperHackers @tweak The tree sway time step is now decoupled from the render update.
+	const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
+
+	m_curValue += m_curDelta * timeScale;
+	if (m_curValue > 2*PI)
 		m_curValue -= 2*PI;
 	Real cosine = Cos(m_curValue);
 
@@ -133,7 +132,7 @@ void SwayClientUpdate::clientUpdate( void )
 	draw->setInstanceMatrix(&xfrm);
 
 	m_curAngle = targetAngle;
-	
+
 	// burned things don't sway.
 	Object* obj = draw->getObject();
 	if( obj && obj->getStatusBits().test( OBJECT_STATUS_BURNED ) )
@@ -150,7 +149,7 @@ void SwayClientUpdate::crc( Xfer *xfer )
 	// extend base class
 	ClientUpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -189,7 +188,7 @@ void SwayClientUpdate::xfer( Xfer *xfer )
 	// swaying
 	xfer->xferBool( &m_swaying );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -202,4 +201,4 @@ void SwayClientUpdate::loadPostProcess( void )
 
 	updateSway();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp
index 89d88ccfc25..31db3b87618 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp
@@ -24,21 +24,18 @@
 
 // GameClient/Eva.cpp /////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+#include "GameClient/ControlBar.h"
 #include "GameClient/Eva.h"
 
+#include "Common/GameUtility.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "GameLogic/GameLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
-const char *TheEvaMessageNames[] = 
+static const char *const TheEvaMessageNames[] =
 {
 	"LOWPOWER",
 	"INSUFFICIENTFUNDS",
@@ -93,16 +90,15 @@ const char *TheEvaMessageNames[] =
   "SUPERWEAPONLAUNCHED_OWN_SNEAK_ATTACK",
   "SUPERWEAPONLAUNCHED_ALLY_SNEAK_ATTACK",
   "SUPERWEAPONLAUNCHED_ENEMY_SNEAK_ATTACK",
-	
+
 	//****************************************************************************
 	//Kris: Don't forget to add another handler below -- it's ghey-ly implemented.
 	//****************************************************************************
-
-	"EVA_INVALID",
 };
+static_assert(ARRAY_SIZE(TheEvaMessageNames) == EVA_COUNT, "Incorrect array size");
 
 //-------------------------------------------------------------------------------------------------
-const ShouldPlayFunc Eva::s_shouldPlayFuncs[] = 
+const ShouldPlayFunc Eva::s_shouldPlayFuncs[] =
 {
 	Eva::shouldPlayLowPower,
 	Eva::shouldPlayGenericHandler,
@@ -121,9 +117,9 @@ const ShouldPlayFunc Eva::s_shouldPlayFuncs[] =
 	Eva::shouldPlayGenericHandler,
 	Eva::shouldPlayGenericHandler,
 	Eva::shouldPlayGenericHandler,
-	Eva::shouldPlayGenericHandler,	
-	Eva::shouldPlayGenericHandler,	
-	Eva::shouldPlayGenericHandler,	
+	Eva::shouldPlayGenericHandler,
+	Eva::shouldPlayGenericHandler,
+	Eva::shouldPlayGenericHandler,
   Eva::shouldPlayGenericHandler,
   Eva::shouldPlayGenericHandler,
   Eva::shouldPlayGenericHandler,
@@ -157,7 +153,6 @@ const ShouldPlayFunc Eva::s_shouldPlayFuncs[] =
   Eva::shouldPlayGenericHandler,
   Eva::shouldPlayGenericHandler,
   Eva::shouldPlayGenericHandler,
-	NULL,
 };
 
 
@@ -168,8 +163,8 @@ void INI::parseEvaEvent( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
-	
+	name.set( c );
+
 	EvaCheckInfo *check = TheEva->newEvaCheckInfo( name );
 	if (!check) {
 		// could be null because it already exists.
@@ -208,11 +203,11 @@ EvaCheckInfo::EvaCheckInfo() :
 	m_framesToExpire(150) // 5 seconds at 30 fps
 {
 
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
-const FieldParse EvaCheckInfo::s_evaEventInfo[] = 
+const FieldParse EvaCheckInfo::s_evaEventInfo[] =
 {
 	{ "Priority",							INI::parseUnsignedInt,					NULL,			offsetof( EvaCheckInfo, m_priority ) },
 	{ "TimeBetweenChecksMS",	INI::parseDurationUnsignedInt,	NULL,			offsetof( EvaCheckInfo, m_framesBetweenChecks ) },
@@ -223,17 +218,17 @@ const FieldParse EvaCheckInfo::s_evaEventInfo[] =
 };
 
 //-------------------------------------------------------------------------------------------------
-EvaCheck::EvaCheck() : 
-	m_evaInfo(NULL), 
+EvaCheck::EvaCheck() :
+	m_evaInfo(NULL),
 	m_triggeredOnFrame(TRIGGEREDON_NOT),
-	m_timeForNextCheck(NEXT_CHECK_NOW), 
+	m_timeForNextCheck(NEXT_CHECK_NOW),
 	m_alreadyPlayed(FALSE)
 {
 
 }
 
 //-------------------------------------------------------------------------------------------------
-Eva::Eva() : 
+Eva::Eva() :
 	m_localPlayer(NULL),
 	m_previousBuildingCount(0),
 	m_previousUnitCount(0),
@@ -250,8 +245,7 @@ Eva::~Eva()
 {
 	EvaCheckInfoPtrVecIt it;
 	for (it = m_allCheckInfos.begin(); it != m_allCheckInfos.end(); ++it) {
-		if (*it)
-			deleteInstance(*it);
+		deleteInstance(*it);
 	}
 }
 
@@ -260,7 +254,7 @@ void Eva::init()
 {
 	// parse the INI here, etc.
 	INI ini;
-	ini.load( AsciiString( "Data\\INI\\Eva.ini" ), INI_LOAD_OVERWRITE, NULL);
+	ini.loadFileDirectory( "Data\\INI\\Eva", INI_LOAD_OVERWRITE, NULL);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -278,7 +272,7 @@ void Eva::reset()
 	// remove all things flagged as "need to play"
 	for (Int i = 0; i < EVA_COUNT; ++i) {
 		m_shouldPlay[i] = FALSE;
-	}	
+	}
 
 	// If we were previously disabled, re-enable ourselves.
 	m_enabled = TRUE;
@@ -291,7 +285,7 @@ void Eva::update()
 		return;
 	}
 
-	m_localPlayer = ThePlayerList->getLocalPlayer();
+	m_localPlayer = rts::getObservedOrLocalPlayer();
 	UnsignedInt frame = TheGameLogic->getFrame();
 
 	// Don't update for the first few frames. This way, we don't have to deal with our initial power
@@ -308,7 +302,7 @@ void Eva::update()
 		}
 	}
 
-	processPlayingMessages(frame);	
+	processPlayingMessages(frame);
 	m_localPlayer = NULL;
 
 	// Reset all of the flags that have been set to true that haven't actually been probed, because
@@ -321,10 +315,6 @@ void Eva::update()
 //-------------------------------------------------------------------------------------------------
 EvaMessage Eva::nameToMessage(const AsciiString& name)
 {
-  DEBUG_ASSERTCRASH( ELEMENTS_OF( TheEvaMessageNames ) == EVA_COUNT + 1, ("TheEvaMessageNames out of sync" ) );
-  DEBUG_ASSERTCRASH( stricmp( TheEvaMessageNames[ EVA_COUNT ], "EVA_INVALID" ) == 0, ("TheEvaMessageNames out of sync" ) );
-  DEBUG_ASSERTCRASH( stricmp( TheEvaMessageNames[ EVA_COUNT - 1], "EVA_INVALID" ) != 0, ("TheEvaMessageNames out of sync" ) );
-
 	for (Int i = EVA_FIRST; i < EVA_COUNT; ++i) {
 		if (name.compareNoCase(TheEvaMessageNames[i]) == 0) {
 			return (EvaMessage) i;
@@ -338,10 +328,6 @@ EvaMessage Eva::nameToMessage(const AsciiString& name)
 //-------------------------------------------------------------------------------------------------
 AsciiString Eva::messageToName(EvaMessage message)
 {
-  DEBUG_ASSERTCRASH( ELEMENTS_OF( TheEvaMessageNames ) == EVA_COUNT + 1, ("TheEvaMessageNames out of sync" ) );
-  DEBUG_ASSERTCRASH( stricmp( TheEvaMessageNames[ EVA_COUNT ], "EVA_INVALID" ) == 0, ("TheEvaMessageNames out of sync" ) );
-  DEBUG_ASSERTCRASH( stricmp( TheEvaMessageNames[ EVA_COUNT - 1], "EVA_INVALID" ) != 0, ("TheEvaMessageNames out of sync" ) );
-
   if (message >= EVA_FIRST && message < EVA_COUNT)
 		return TheEvaMessageNames[message];
 
@@ -386,8 +372,8 @@ const EvaCheckInfo *Eva::getEvaCheckInfo(AsciiString name)
 void Eva::setShouldPlay(EvaMessage messageToPlay)
 {
 	m_shouldPlay[messageToPlay] = TRUE;
-  
-  // DEBUG_LOG( ( "Eva message %s play requested\n", messageToName( messageToPlay).str() ) );
+
+  // DEBUG_LOG( ( "Eva message %s play requested", messageToName( messageToPlay).str() ) );
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -397,7 +383,7 @@ void Eva::setEvaEnabled(Bool enabled)
 	for (Int i = EVA_FIRST; i < EVA_COUNT; ++i) {
 		m_shouldPlay[i] = FALSE;
 	}
-	m_enabled = enabled; 
+	m_enabled = enabled;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -420,9 +406,7 @@ Bool Eva::messageShouldPlay(EvaMessage messageToTest, UnsignedInt currentFrame)
 		return FALSE;
 	}
 
-  DEBUG_ASSERTCRASH( ELEMENTS_OF( s_shouldPlayFuncs ) == EVA_COUNT + 1, ("Eva::s_shouldPlayFuncs out of sync" ) );
-  DEBUG_ASSERTCRASH( s_shouldPlayFuncs[ EVA_COUNT ] == NULL, ("Eva::s_shouldPlayFuncs out of sync" ) );
-  DEBUG_ASSERTCRASH( s_shouldPlayFuncs[ EVA_COUNT - 1] != NULL, ("Eva::s_shouldPlayFuncs out of sync" ) );
+	static_assert(ARRAY_SIZE(s_shouldPlayFuncs) == EVA_COUNT, "Incorrect array size");
 
 	m_messageBeingTested = messageToTest;
 	return s_shouldPlayFuncs[messageToTest](m_localPlayer);
@@ -520,7 +504,7 @@ void Eva::processPlayingMessages(UnsignedInt currentFrame)
 	}
 
 	// We've got a winner!
-	AsciiString side = ThePlayerList->getLocalPlayer()->getSide();
+	AsciiString side = rts::getObservedOrLocalPlayer()->getSide();
 	Int numSides = storedIt->m_evaInfo->m_evaSideSounds.size();
 
   // clear it. If we can't find the side we want, don't play anything
@@ -529,7 +513,7 @@ void Eva::processPlayingMessages(UnsignedInt currentFrame)
 	for (Int i = 0; i < numSides; ++i) {
 		if (side.compareNoCase(storedIt->m_evaInfo->m_evaSideSounds[i].m_side) == 0) {
 			// Its this one.
-			if (storedIt->m_evaInfo->m_evaSideSounds[i].m_soundNames.size() > 0) {
+			if (!storedIt->m_evaInfo->m_evaSideSounds[i].m_soundNames.empty()) {
 				Int soundToPlay = GameClientRandomValue(0, storedIt->m_evaInfo->m_evaSideSounds[i].m_soundNames.size() - 1);
 				m_evaSpeech.setEventName(storedIt->m_evaInfo->m_evaSideSounds[i].m_soundNames[soundToPlay]);
 			}
@@ -540,7 +524,7 @@ void Eva::processPlayingMessages(UnsignedInt currentFrame)
 	// Update the entry
 	storedIt->m_alreadyPlayed = true;
 	storedIt->m_timeForNextCheck = currentFrame + storedIt->m_evaInfo->m_framesBetweenChecks;
-	
+
 	// Now that we correctly filter messages, we need to set the player index for who should hear the
 	// sound to the local player.
 	m_evaSpeech.setPlayerIndex(m_localPlayer->getPlayerIndex());
@@ -554,7 +538,7 @@ void Eva::processPlayingMessages(UnsignedInt currentFrame)
 /*static*/void Eva::parseEvaMessageFromIni( INI * ini, void *instance, void *store, const void* userData )
 {
   const char *token = ini->getNextToken();
-   
+
   EvaMessage message = nameToMessage( token );
   if ( message == EVA_Invalid )
   {
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp
index 74ff421e69a..5549137d7ce 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp
@@ -28,12 +28,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/FXList.h"
 
 #include "Common/DrawModule.h"
 #include "Common/GameAudio.h"
+#include "Common/GameUtility.h"
 #include "Common/INI.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -54,11 +55,6 @@
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 FXListStore *TheFXListStore = NULL;					///< the FXList store definition
 
@@ -95,15 +91,15 @@ void FXNugget::doFXObj(const Object* primary, const Object* secondary) const
 //-------------------------------------------------------------------------------------------------
 class SoundFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SoundFXNugget, "SoundFXNugget")		
-	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SoundFXNugget, "SoundFXNugget")
+
 public:
 
 	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real /*overrideRadius*/ ) const
 	{
 		AudioEventRTS sound(m_soundName);
-		
-		if (primary) 
+
+		if (primary)
 		{
 			sound.setPosition(primary);
 		}
@@ -126,20 +122,20 @@ class SoundFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Name",									INI::parseAsciiString,	NULL, offsetof( SoundFXNugget, m_soundName ) },
 			{ 0, 0, 0, 0 }
 		};
 
-		SoundFXNugget* nugget = newInstance(SoundFXNugget);	
+		SoundFXNugget* nugget = newInstance(SoundFXNugget);
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
 
 private:
 	AsciiString		m_soundName;
-};  
+};
 EMPTY_DTOR(SoundFXNugget)
 
 //-------------------------------------------------------------------------------------------------
@@ -154,7 +150,7 @@ static Real calcDist(const Coord3D& src, const Coord3D& dst)
 //-------------------------------------------------------------------------------------------------
 class TracerFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TracerFXNugget, "TracerFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TracerFXNugget, "TracerFXNugget")
 public:
 
 	TracerFXNugget()
@@ -179,11 +175,11 @@ class TracerFXNugget : public FXNugget
 			Drawable *tracer = TheThingFactory->newDrawable(TheThingFactory->findTemplate(m_tracerName));
 			if(!tracer)
 				return;
-			
+
 			//Kris -- Redid this section Sept 18, 2002
 			//Calculate tracer orientations to face from primary to secondary position. This
 			//should be the direction that the projectile is being fired towards. It doesn't make
-			//sense that the old stuff made use of the muzzle fx bone orientation (because it's a 
+			//sense that the old stuff made use of the muzzle fx bone orientation (because it's a
 			//subobject). It had other problems because of elevation variations the tracers would
 			//stay on the ground.
 			//tracer->setTransformMatrix(primaryMtx);
@@ -224,7 +220,7 @@ class TracerFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "TracerName",			INI::parseAsciiString,			NULL, offsetof( TracerFXNugget, m_tracerName ) },
 			{ "BoneName",				INI::parseAsciiString,			NULL, offsetof( TracerFXNugget, m_boneName ) },
@@ -237,7 +233,7 @@ class TracerFXNugget : public FXNugget
 			{ 0, 0, 0, 0 }
 		};
 
-		TracerFXNugget* nugget = newInstance( TracerFXNugget );	
+		TracerFXNugget* nugget = newInstance( TracerFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -251,13 +247,13 @@ class TracerFXNugget : public FXNugget
 	Real						m_width;
 	RGBColor				m_color;
 	Real						m_probability;
-};  
+};
 EMPTY_DTOR(TracerFXNugget)
 
 //-------------------------------------------------------------------------------------------------
 class RayEffectFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RayEffectFXNugget, "RayEffectFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(RayEffectFXNugget, "RayEffectFXNugget")
 public:
 
 	RayEffectFXNugget()
@@ -270,7 +266,7 @@ class RayEffectFXNugget : public FXNugget
 	virtual void doFXPos(const Coord3D *primary, const Matrix3D* /*primaryMtx*/, const Real /*primarySpeed*/, const Coord3D * secondary, const Real /*overrideRadius*/ ) const
 	{
 		const ThingTemplate* tmpl = TheThingFactory->findTemplate(m_templateName);
-		DEBUG_ASSERTCRASH(tmpl, ("RayEffect %s not found\n",m_templateName.str()));
+		DEBUG_ASSERTCRASH(tmpl, ("RayEffect %s not found",m_templateName.str()));
 		if (primary && secondary && tmpl)
 		{
 			Coord3D sourcePos = *primary;
@@ -293,7 +289,7 @@ class RayEffectFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Name",									INI::parseAsciiString,			NULL, offsetof( RayEffectFXNugget, m_templateName ) },
 			{ "PrimaryOffset",				INI::parseCoord3D,					NULL, offsetof( RayEffectFXNugget, m_primaryOffset ) },
@@ -301,7 +297,7 @@ class RayEffectFXNugget : public FXNugget
 			{ 0, 0, 0, 0 }
 		};
 
-		RayEffectFXNugget* nugget = newInstance( RayEffectFXNugget ); 
+		RayEffectFXNugget* nugget = newInstance( RayEffectFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -310,13 +306,13 @@ class RayEffectFXNugget : public FXNugget
 	AsciiString			m_templateName;
 	Coord3D					m_primaryOffset;
 	Coord3D					m_secondaryOffset;
-};  
+};
 EMPTY_DTOR(RayEffectFXNugget)
 
 //-------------------------------------------------------------------------------------------------
 class LightPulseFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(LightPulseFXNugget, "LightPulseFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(LightPulseFXNugget, "LightPulseFXNugget")
 public:
 
 	LightPulseFXNugget() : m_radius(0), m_increaseFrames(0), m_decreaseFrames(0), m_boundingCirclePct(0)
@@ -355,7 +351,7 @@ class LightPulseFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Color",						INI::parseRGBColor,								NULL, offsetof( LightPulseFXNugget, m_color ) },
 			{ "Radius",						INI::parseReal,										NULL, offsetof( LightPulseFXNugget, m_radius ) },
@@ -365,7 +361,7 @@ class LightPulseFXNugget : public FXNugget
 			{ 0, 0, 0, 0 }
 		};
 
-		LightPulseFXNugget* nugget = newInstance( LightPulseFXNugget );	
+		LightPulseFXNugget* nugget = newInstance( LightPulseFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -376,13 +372,13 @@ class LightPulseFXNugget : public FXNugget
 	Real					m_boundingCirclePct;
 	UnsignedInt		m_increaseFrames;
 	UnsignedInt		m_decreaseFrames;
-};  
+};
 EMPTY_DTOR(LightPulseFXNugget)
 
 //-------------------------------------------------------------------------------------------------
 class ViewShakeFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ViewShakeFXNugget, "ViewShakeFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ViewShakeFXNugget, "ViewShakeFXNugget")
 public:
 
 	ViewShakeFXNugget() : m_shake(View::SHAKE_NORMAL)
@@ -404,13 +400,13 @@ class ViewShakeFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Type",				parseShakeType,								NULL, offsetof( ViewShakeFXNugget, m_shake ) },
 			{ 0, 0, 0, 0 }
 		};
 
-		ViewShakeFXNugget* nugget = newInstance( ViewShakeFXNugget );	
+		ViewShakeFXNugget* nugget = newInstance( ViewShakeFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -418,7 +414,7 @@ class ViewShakeFXNugget : public FXNugget
 protected:
 	static void parseShakeType( INI* ini, void *instance, void *store, const void* /*userData*/ )
 	{
-		static const LookupListRec shakeTypeNames[] = 
+		static const LookupListRec shakeTypeNames[] =
 		{
 			{ "SUBTLE", View::SHAKE_SUBTLE },
 			{ "NORMAL", View::SHAKE_NORMAL },
@@ -428,19 +424,21 @@ class ViewShakeFXNugget : public FXNugget
 			{ "CINE_INSANE",  View::SHAKE_CINE_INSANE },
 			{ 0, 0 }
 		};
+		static_assert(ARRAY_SIZE(shakeTypeNames) == View::SHAKE_COUNT + 1, "Incorrect array size");
+
 		*(Int *)store = INI::scanLookupList(ini->getNextToken(), shakeTypeNames);
 	}
 
 private:
 	View::CameraShakeType m_shake;
 
-};  
+};
 EMPTY_DTOR(ViewShakeFXNugget)
 
 //-------------------------------------------------------------------------------------------------
 class TerrainScorchFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TerrainScorchFXNugget, "TerrainScorchFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TerrainScorchFXNugget, "TerrainScorchFXNugget")
 public:
 
 	TerrainScorchFXNugget() : m_scorch(-1), m_radius(0)
@@ -466,14 +464,14 @@ class TerrainScorchFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Type",				parseScorchType,			NULL, offsetof( TerrainScorchFXNugget, m_scorch ) },
 			{ "Radius",			INI::parseReal,				NULL, offsetof( TerrainScorchFXNugget, m_radius ) },
 			{ 0, 0, 0, 0 }
 		};
 
-		TerrainScorchFXNugget* nugget = newInstance( TerrainScorchFXNugget );	
+		TerrainScorchFXNugget* nugget = newInstance( TerrainScorchFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -482,7 +480,7 @@ class TerrainScorchFXNugget : public FXNugget
 
 	static void parseScorchType( INI* ini, void *instance, void *store, const void* /*userData*/ )
 	{
-		static const LookupListRec scorchTypeNames[] = 
+		static const LookupListRec scorchTypeNames[] =
 		{
 			{ "SCORCH_1",				SCORCH_1 },
 			{ "SCORCH_2",				SCORCH_2 },
@@ -492,19 +490,21 @@ class TerrainScorchFXNugget : public FXNugget
 			{ "RANDOM",					-1 },
 			{ 0, 0 }
 		};
+		static_assert(ARRAY_SIZE(scorchTypeNames) == SCORCH_COUNT + 2, "Incorrect array size");
+
 		*(Int *)store = INI::scanLookupList(ini->getNextToken(), scorchTypeNames);
 	}
 
 private:
 	Int		m_scorch;
 	Real	m_radius;
-};  
+};
 EMPTY_DTOR(TerrainScorchFXNugget)
 
 //-------------------------------------------------------------------------------------------------
 class ParticleSystemFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ParticleSystemFXNugget, "ParticleSystemFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ParticleSystemFXNugget, "ParticleSystemFXNugget")
 public:
 
 	ParticleSystemFXNugget()
@@ -565,7 +565,7 @@ class ParticleSystemFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Name",									INI::parseAsciiString,			NULL, offsetof( ParticleSystemFXNugget, m_name ) },
 			{ "Count",								INI::parseInt,							NULL, offsetof( ParticleSystemFXNugget, m_count ) },
@@ -584,7 +584,7 @@ class ParticleSystemFXNugget : public FXNugget
 			{ 0, 0, 0, 0 }
 		};
 
-		ParticleSystemFXNugget* nugget = newInstance( ParticleSystemFXNugget );	
+		ParticleSystemFXNugget* nugget = newInstance( ParticleSystemFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -600,7 +600,7 @@ class ParticleSystemFXNugget : public FXNugget
 		}
 
 		const ParticleSystemTemplate *tmp = TheParticleSystemManager->findTemplate(m_name);
-		DEBUG_ASSERTCRASH(tmp, ("ParticleSystem %s not found\n",m_name.str()));
+		DEBUG_ASSERTCRASH(tmp, ("ParticleSystem %s not found",m_name.str()));
 		if (tmp)
 		{
 			for (Int i = 0; i < m_count; i++ )
@@ -618,7 +618,7 @@ class ParticleSystemFXNugget : public FXNugget
 					{
 						//old way:
 						//newPos.z = TheTerrainLogic->getGrsoundHeight( newPos.x, newPos.y ) + 1;// The plus one prevents scissoring with terrain
-						
+
 						//new way: now we allow bridges in the GroundHeight.
 						PathfindLayerEnum layer = TheTerrainLogic->getLayerForDestination(&newPos);
 						newPos.z = TheTerrainLogic->getLayerHeight( newPos.x, newPos.y, layer );
@@ -678,13 +678,13 @@ class ParticleSystemFXNugget : public FXNugget
 	Bool						m_createAtGroundHeight;
 	Bool						m_useCallersRadius;
 	Bool						m_ricochet;
-};  
+};
 EMPTY_DTOR(ParticleSystemFXNugget)
 
 //-------------------------------------------------------------------------------------------------
 class FXListAtBonePosFXNugget : public FXNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FXListAtBonePosFXNugget, "FXListAtBonePosFXNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FXListAtBonePosFXNugget, "FXListAtBonePosFXNugget")
 public:
 
 	FXListAtBonePosFXNugget()
@@ -717,7 +717,7 @@ class FXListAtBonePosFXNugget : public FXNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "FX",								  	INI::parseFXList,			    NULL, offsetof( FXListAtBonePosFXNugget, m_fx ) },
 			{ "BoneName",							INI::parseAsciiString,		NULL, offsetof( FXListAtBonePosFXNugget, m_boneName ) },
@@ -725,7 +725,7 @@ class FXListAtBonePosFXNugget : public FXNugget
 			{ 0, 0, 0, 0 }
 		};
 
-		FXListAtBonePosFXNugget* nugget = newInstance( FXListAtBonePosFXNugget );	
+		FXListAtBonePosFXNugget* nugget = newInstance( FXListAtBonePosFXNugget );
 		ini->initFromINI(nugget, myFieldParse);
 		((FXList*)instance)->addFXNugget(nugget);
 	}
@@ -759,7 +759,7 @@ class FXListAtBonePosFXNugget : public FXNugget
 	const FXList*		m_fx;
   AsciiString     m_boneName;
   Bool            m_orientToBone;
-};  
+};
 EMPTY_DTOR(FXListAtBonePosFXNugget)
 
 //-------------------------------------------------------------------------------------------------
@@ -769,15 +769,15 @@ EMPTY_DTOR(FXListAtBonePosFXNugget)
 
 static const FieldParse TheFXListFieldParse[] =
 {
-	{ "Sound",											SoundFXNugget::parse, 0, 0},		
-	{ "RayEffect",									RayEffectFXNugget::parse, 0, 0},		
-	{ "Tracer",											TracerFXNugget::parse, 0, 0},		
-	{ "LightPulse",									LightPulseFXNugget::parse, 0, 0},		
-	{ "ViewShake",									ViewShakeFXNugget::parse, 0, 0},		
-	{ "TerrainScorch",							TerrainScorchFXNugget::parse, 0, 0},		
-	{ "ParticleSystem",							ParticleSystemFXNugget::parse, 0, 0},		
-	{ "FXListAtBonePos",						FXListAtBonePosFXNugget::parse, 0, 0},		
-	{ NULL, NULL, 0, 0 }  // keep this last
+	{ "Sound",											SoundFXNugget::parse, 0, 0},
+	{ "RayEffect",									RayEffectFXNugget::parse, 0, 0},
+	{ "Tracer",											TracerFXNugget::parse, 0, 0},
+	{ "LightPulse",									LightPulseFXNugget::parse, 0, 0},
+	{ "ViewShake",									ViewShakeFXNugget::parse, 0, 0},
+	{ "TerrainScorch",							TerrainScorchFXNugget::parse, 0, 0},
+	{ "ParticleSystem",							ParticleSystemFXNugget::parse, 0, 0},
+	{ "FXListAtBonePos",						FXListAtBonePosFXNugget::parse, 0, 0},
+	{ NULL, NULL, 0, 0 }
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -796,8 +796,7 @@ void FXList::clear()
 {
 	for (FXNuggetList::iterator it = m_nuggets.begin(); it != m_nuggets.end(); ++it)
 	{
-		if (*it)
-			deleteInstance(*it);
+		deleteInstance(*it);
 	}
 	m_nuggets.clear();
 }
@@ -805,7 +804,9 @@ void FXList::clear()
 //-------------------------------------------------------------------------------------------------
 void FXList::doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real primarySpeed, const Coord3D *secondary, const Real overrideRadius ) const
 {
-	if (ThePartitionManager->getShroudStatusForPlayer(ThePlayerList->getLocalPlayer()->getPlayerIndex(), primary) != CELLSHROUD_CLEAR)
+	const Int playerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
+
+	if (ThePartitionManager->getShroudStatusForPlayer(playerIndex, primary) != CELLSHROUD_CLEAR)
 		return;
 
 	for (FXNuggetList::const_iterator it = m_nuggets.begin(); it != m_nuggets.end(); ++it)
@@ -817,7 +818,9 @@ void FXList::doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const R
 //-------------------------------------------------------------------------------------------------
 void FXList::doFXObj(const Object* primary, const Object* secondary) const
 {
-	if (primary && primary->getShroudedStatus(ThePlayerList->getLocalPlayer()->getPlayerIndex()) > OBJECTSHROUD_PARTIAL_CLEAR)
+	const Int playerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
+
+	if (primary && primary->getShroudedStatus(playerIndex) > OBJECTSHROUD_PARTIAL_CLEAR)
 		return;	//the primary object is fogged or shrouded so don't bother with the effect.
 
 	for (FXNuggetList::const_iterator it = m_nuggets.begin(); it != m_nuggets.end(); ++it)
@@ -852,7 +855,7 @@ const FXList *FXListStore::findFXList(const char* name) const
 		return NULL;
 
   FXListMap::const_iterator it = m_fxmap.find(NAMEKEY(name));
-  if (it != m_fxmap.end()) 
+  if (it != m_fxmap.end())
 	{
 		return &(*it).second;
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp
index bd654d4730f..167d48f52f5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp
@@ -24,12 +24,12 @@
 
 // FILE: AnimateWindowManager.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Mar 2002
@@ -37,8 +37,8 @@
 //	Filename: 	AnimateWindowManager.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	This will contain the logic behind the different animations that 
+//
+//	purpose:	This will contain the logic behind the different animations that
 //						can happen to a window.
 //
 //-----------------------------------------------------------------------------
@@ -51,7 +51,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/AnimateWindowManager.h"
 #include "GameClient/GameWindow.h"
@@ -87,7 +87,7 @@ AnimateWindow::~AnimateWindow( void )
 	m_win = NULL;
 }
 
-void AnimateWindow::setAnimData( 	ICoord2D startPos, ICoord2D endPos, 
+void AnimateWindow::setAnimData( 	ICoord2D startPos, ICoord2D endPos,
 																	ICoord2D curPos, ICoord2D restPos,
 																	Coord2D vel, UnsignedInt startTime,
 																	UnsignedInt endTime )
@@ -111,14 +111,11 @@ void AnimateWindow::setAnimData( 	ICoord2D startPos, ICoord2D endPos,
 
 static void clearWinList(AnimateWindowList &winList)
 {
-	wnd::AnimateWindow *win = NULL;
 	while (!winList.empty())
 	{
-		win = *(winList.begin());
+		wnd::AnimateWindow *win = *(winList.begin());
 		winList.pop_front();
-		if (win)
-			deleteInstance(win);
-		win = NULL;
+		deleteInstance(win);
 	}
 }
 
@@ -140,22 +137,14 @@ AnimateWindowManager::AnimateWindowManager( void )
 }
 AnimateWindowManager::~AnimateWindowManager( void )
 {
-	if(m_slideFromRight)
-		delete m_slideFromRight;
-	if(m_slideFromRightFast)
-		delete m_slideFromRightFast;
-	if(m_slideFromLeft)
-		delete m_slideFromLeft;
-	if(m_slideFromTop)
-		delete m_slideFromTop;
-	if(m_slideFromTopFast)
-		delete m_slideFromTopFast;
-	if(m_slideFromBottom)
-		delete m_slideFromBottom;
-	if(m_spiral)
-		delete m_spiral;
-	if (m_slideFromBottomTimed)
-		delete m_slideFromBottomTimed;
+	delete m_slideFromRight;
+	delete m_slideFromRightFast;
+	delete m_slideFromLeft;
+	delete m_slideFromTop;
+	delete m_slideFromTopFast;
+	delete m_slideFromBottom;
+	delete m_spiral;
+	delete m_slideFromBottomTimed;
 
 	m_slideFromRight = NULL;
 	resetToRestPosition( );
@@ -163,7 +152,7 @@ AnimateWindowManager::~AnimateWindowManager( void )
 	clearWinList(m_winMustFinishList);
 }
 
-	
+
 void AnimateWindowManager::init( void )
 {
 	clearWinList(m_winList);
@@ -183,7 +172,7 @@ void AnimateWindowManager::reset( void )
 
 void AnimateWindowManager::update( void )
 {
-	
+
 	ProcessAnimateWindow *processAnim = NULL;
 
 	// if we need to update the windows that need to finish, update that list
@@ -191,7 +180,7 @@ void AnimateWindowManager::update( void )
 	{
 		AnimateWindowList::iterator it = m_winMustFinishList.begin();
 		m_needsUpdate = FALSE;
-		
+
 		while (it != m_winMustFinishList.end())
 		{
 			wnd::AnimateWindow *animWin = *it;
@@ -214,13 +203,13 @@ void AnimateWindowManager::update( void )
 						m_needsUpdate = TRUE;
 				}
 			}
-			
+
 			it ++;
 		}
 	}
 
 	AnimateWindowList::iterator it = m_winList.begin();
-		
+
 	while (it != m_winList.end())
 	{
 		wnd::AnimateWindow *animWin = *it;
@@ -233,7 +222,7 @@ void AnimateWindowManager::update( void )
 		if(m_reverse)
 		{
 			if(processAnim)
-				processAnim->reverseAnimateWindow(animWin);			
+				processAnim->reverseAnimateWindow(animWin);
 		}
 		else
 		{
@@ -248,7 +237,7 @@ void AnimateWindowManager::update( void )
 void AnimateWindowManager::registerGameWindow(GameWindow *win, AnimTypes animType, Bool needsToFinish, UnsignedInt ms, UnsignedInt delayMs)
 {
 	if(!win)
-	{	
+	{
 		DEBUG_CRASH(("Win was NULL as it was passed into registerGameWindow... not good indeed"));
 		return;
 	}
@@ -272,7 +261,7 @@ void AnimateWindowManager::registerGameWindow(GameWindow *win, AnimTypes animTyp
 		processAnim->setMaxDuration(ms);
 		processAnim->initAnimateWindow( animWin );
 	}
-	
+
 	// Add the Window to the proper list
 	if(needsToFinish)
 	{
@@ -325,11 +314,11 @@ ProcessAnimateWindow *AnimateWindowManager::getProcessAnimate( AnimTypes animTyp
 
 void AnimateWindowManager::reverseAnimateWindow( void )
 {
-	
+
 	m_reverse = TRUE;
 	m_needsUpdate = TRUE;
 	ProcessAnimateWindow *processAnim = NULL;
-	
+
 	UnsignedInt maxDelay = 0;
 	AnimateWindowList::iterator it = m_winMustFinishList.begin();
 	while (it != m_winMustFinishList.end())
@@ -360,13 +349,13 @@ void AnimateWindowManager::reverseAnimateWindow( void )
 		{
 			processAnim->initReverseAnimateWindow( animWin, maxDelay );
 		}
-		
+
 		animWin->setFinished(FALSE);
 		it ++;
 	}
-	
+
 	it = m_winList.begin();
-		
+
 	while (it != m_winList.end())
 	{
 		wnd::AnimateWindow *animWin = *it;
@@ -376,7 +365,7 @@ void AnimateWindowManager::reverseAnimateWindow( void )
 			return;
 		}
 		processAnim = getProcessAnimate( animWin->getAnimType() );
-		
+
 		if(processAnim)
 			processAnim->initReverseAnimateWindow(animWin);
 		animWin->setFinished(FALSE);
@@ -387,10 +376,10 @@ void AnimateWindowManager::reverseAnimateWindow( void )
 
 void AnimateWindowManager::resetToRestPosition( void )
 {
-	
+
 	m_reverse = TRUE;
 	m_needsUpdate = TRUE;
-	
+
 	AnimateWindowList::iterator it = m_winMustFinishList.begin();
 	while (it != m_winMustFinishList.end())
 	{
@@ -422,7 +411,7 @@ void AnimateWindowManager::resetToRestPosition( void )
 		it ++;
 	}
 
-	
+
 }
 
 //-----------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ChallengeGenerals.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ChallengeGenerals.cpp
index b788f334929..d270e95daf2 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ChallengeGenerals.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ChallengeGenerals.cpp
@@ -27,15 +27,10 @@
 // Desc:   This is a manager for data pertaining to the Generals' Challenge personas and related GUI.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/ChallengeGenerals.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ChallengeGenerals *TheChallengeGenerals = NULL;
 
@@ -60,13 +55,13 @@ ChallengeGenerals::~ChallengeGenerals()
 void ChallengeGenerals::init( void )
 {
 	INI ini;
-	ini.load( AsciiString( "Data\\INI\\ChallengeMode.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\ChallengeMode", INI_LOAD_OVERWRITE, NULL );
 }
 
 
 void ChallengeGenerals::parseGeneralPersona(INI *ini, void *instance, void *store, const void *userData)
 {
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "StartsEnabled",			INI::parseBool, NULL, offsetof( GeneralPersona, m_bStartsEnabled ) },
 		{ "BioNameString",			INI::parseAsciiString, NULL, offsetof( GeneralPersona, m_strBioName ) },
@@ -94,14 +89,14 @@ void ChallengeGenerals::parseGeneralPersona(INI *ini, void *instance, void *stor
 		{ "LossSound",					INI::parseAsciiString, NULL, offsetof( GeneralPersona, m_strLossSound ) },
 		{ "PreviewSound",					INI::parseAsciiString, NULL, offsetof( GeneralPersona, m_strPreviewSound ) },
 		{ "NameSound",					INI::parseAsciiString, NULL, offsetof( GeneralPersona, m_strNameSound ) },
-		
+
 		{ 0, 0, 0, 0 }
 	};
 	ini->initFromINI(store, dataFieldParse);
 }
 
 
-const FieldParse ChallengeGenerals::s_fieldParseTable[] = 
+const FieldParse ChallengeGenerals::s_fieldParseTable[] =
 {
 	{ "GeneralPersona0", ChallengeGenerals::parseGeneralPersona, NULL, offsetof( ChallengeGenerals, m_position[0] ) },
 	{ "GeneralPersona1", ChallengeGenerals::parseGeneralPersona, NULL, offsetof( ChallengeGenerals, m_position[1] ) },
@@ -130,7 +125,7 @@ void INI::parseChallengeModeDefinition( INI* ini )
 	}
 }
 
-const GeneralPersona* ChallengeGenerals::getPlayerGeneralByCampaignName( AsciiString name ) const 
+const GeneralPersona* ChallengeGenerals::getPlayerGeneralByCampaignName( AsciiString name ) const
 {
 	for (Int i = 0; i < NUM_GENERALS; i++)
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
index a705f0dbeca..6eb90665160 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
@@ -29,7 +29,7 @@
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_GUI_COMMMAND_NAMES
 #define DEFINE_COMMAND_OPTION_NAMES
 #define DEFINE_WEAPONSLOTTYPE_NAMES
@@ -83,11 +83,6 @@
 
 #include "GameNetwork/GameInfo.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 ControlBar *TheControlBar = NULL;
@@ -102,7 +97,7 @@ const Image* ControlBar::m_rankHeroicIcon		= NULL;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-const FieldParse CommandButton::s_commandButtonFieldParseTable[] = 
+const FieldParse CommandButton::s_commandButtonFieldParseTable[] =
 {
 
 	{ "Command",							CommandButton::parseCommand, NULL, offsetof( CommandButton, m_command ) },
@@ -122,9 +117,9 @@ const FieldParse CommandButton::s_commandButtonFieldParseTable[] =
 	{ "InvalidCursorName",		INI::parseAsciiString,       NULL, offsetof( CommandButton, m_invalidCursorName ) },
 	{ "ButtonBorderType",			INI::parseLookupList,				 CommandButtonMappedBorderTypeNames, offsetof( CommandButton, m_commandButtonBorder ) },
 	{ "RadiusCursorType",			INI::parseIndexList,				 TheRadiusCursorNames, offsetof( CommandButton, m_radiusCursor ) },
-	{ "UnitSpecificSound",		INI::parseAudioEventRTS,		 NULL, offsetof( CommandButton, m_unitSpecificSound ) }, 
+	{ "UnitSpecificSound",		INI::parseAudioEventRTS,		 NULL, offsetof( CommandButton, m_unitSpecificSound ) },
 
-	{ NULL,						NULL,												 NULL, 0 }  // keep this last
+	{ NULL,						NULL,												 NULL, 0 }
 
 };
 static void commandButtonTooltip(GameWindow *window,
@@ -136,10 +131,10 @@ static void commandButtonTooltip(GameWindow *window,
 
 /// mark the UI as dirty so the context of everything is re-evaluated
 void ControlBar::markUIDirty( void )
-{ 
+{
   m_UIDirty = TRUE;
 
-#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG )
+#if defined(RTS_DEBUG)
 	UnsignedInt now = TheGameLogic->getFrame();
 	if( now == m_lastFrameMarkedDirty )
 	{
@@ -163,6 +158,21 @@ void ControlBar::markUIDirty( void )
 #endif
 }
 
+Player* ControlBar::getCurrentlyViewedPlayer()
+{
+	if (isObserverControlBarOn())
+		return getObserverLookAtPlayer();
+
+	return ThePlayerList->getLocalPlayer();
+}
+
+Relationship ControlBar::getCurrentlyViewedPlayerRelationship(const Team* team)
+{
+	if (Player* player = getCurrentlyViewedPlayer())
+		return player->getRelationship(team);
+
+	return NEUTRAL;
+}
 
 void ControlBar::populatePurchaseScience( Player* player )
 {
@@ -175,13 +185,13 @@ void ControlBar::populatePurchaseScience( Player* player )
 	if(TheScriptEngine->isGameEnding())
 		return;
 	// get command set
-	if(!player ||!player->getPlayerTemplate() || player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1().isEmpty() || 
+	if(!player ||!player->getPlayerTemplate() || player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1().isEmpty() ||
 			player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3().isEmpty() ||
 			player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8().isEmpty())
 		return;
-	commandSet1 = TheControlBar->findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
-	commandSet3 = TheControlBar->findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
-	commandSet8 = TheControlBar->findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
+	commandSet1 = findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
+	commandSet3 = findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
+	commandSet8 = findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
 
 	for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_1; i++ )
 		m_sciencePurchaseWindowsRank1[i]->winHide(TRUE);
@@ -210,7 +220,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 		{
 			// hide window on interface
 			m_sciencePurchaseWindowsRank1[ i ]->winHide( TRUE );
-		}  // end if
+		}
 		else
 		{
 			// make sure the window is not hidden
@@ -255,9 +265,9 @@ void ControlBar::populatePurchaseScience( Player* player )
 						m_sciencePurchaseWindowsRank1[ i ]->winHide(TRUE);
 				}
 			}
-		}  // end else
+		}
 
-	}  // end for
+	}
 
 	for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_3; i++ )
 	{
@@ -270,7 +280,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 		{
 			// hide window on interface
 			m_sciencePurchaseWindowsRank3[ i ]->winHide( TRUE );
-		}  // end if
+		}
 		else
 		{
 			// make sure the window is not hidden
@@ -282,7 +292,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 			// populate the visible button with data from the command button
 
 			setControlCommand( m_sciencePurchaseWindowsRank3[ i ], commandButton );
-			ScienceType	st = SCIENCE_INVALID; 
+			ScienceType	st = SCIENCE_INVALID;
 			ScienceVec sv = commandButton->getScienceVec();
 			if (! sv.empty())
 			{
@@ -318,9 +328,9 @@ void ControlBar::populatePurchaseScience( Player* player )
 					m_sciencePurchaseWindowsRank3[ i ]->winHide(TRUE);
 			}
 
-		}  // end else
+		}
 
-	}  // end for
+	}
 
 	for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_8; i++ )
 	{
@@ -333,7 +343,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 		{
 			// hide window on interface
 			m_sciencePurchaseWindowsRank8[ i ]->winHide( TRUE );
-		}  // end if
+		}
 		else
 		{
 			// make sure the window is not hidden
@@ -345,7 +355,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 			// populate the visible button with data from the command button
 
 			setControlCommand( m_sciencePurchaseWindowsRank8[ i ], commandButton );
-			ScienceType	st = SCIENCE_INVALID; 
+			ScienceType	st = SCIENCE_INVALID;
 			st = commandButton->getScienceVec()[ 0 ];
 			if( player->isScienceDisabled( st ) )
 			{
@@ -376,9 +386,9 @@ void ControlBar::populatePurchaseScience( Player* player )
 					m_sciencePurchaseWindowsRank8[ i ]->winHide(TRUE);
 			}
 
-		}  // end else
+		}
 
-	}  // end for
+	}
 
 
 	GameWindow *win = NULL;
@@ -389,7 +399,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 		tempUS.format(L"%d", player->getSciencePurchasePoints());
 		GadgetStaticTextSetText(win, tempUS);
 	}
-	
+
 // redundant to StaticTextTitle in the Zero Hour context
 /*
 	win = TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], TheNameKeyGenerator->nameToKey( "GeneralsExpPoints.wnd:StaticTextLevel" ) );
@@ -399,7 +409,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 		GadgetStaticTextSetText(win, tempUS);
 	}
 */
-	
+
 	win = TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], TheNameKeyGenerator->nameToKey( "GeneralsExpPoints.wnd:ProgressBarExperience" ) );
 	if(win)
 	{
@@ -416,8 +426,8 @@ void ControlBar::populatePurchaseScience( Player* player )
 		tempAs.format("SCIENCE:Rank%d", player->getRankLevel());
 		GadgetStaticTextSetText(win, TheGameText->fetch(tempAs));
 	}
-	
-	
+
+
 	//
 	// to avoid a one frame delay where windows may become enabled/disabled, run the update
 	// at once to get it all in the correct state immediately
@@ -449,7 +459,7 @@ void ControlBar::populatePurchaseScience( Player* player )
 		u.translate(foo);
 		GadgetListBoxAddEntryText(win, u, color, -1, -1);
 	}
-	GadgetListBoxAddEntryText(win, UnicodeString(L"Cancel"), color, -1, -1);*/
+	GadgetListBoxAddEntryText(win, L"Cancel", color, -1, -1);*/
 
 }
 
@@ -466,7 +476,7 @@ void ControlBar::updateContextPurchaseScience( void )
 		progress = ((player->getSkillPoints() - player->getSkillPointsLevelDown()) * 100) /(player->getSkillPointsLevelUp() - player->getSkillPointsLevelDown());
 		GadgetProgressBarSetProgress(win, progress);
 	}
-	
+
 //	win = TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], TheNameKeyGenerator->nameToKey( "ControlBar.wnd:TextEntryGeneralName" ) );
 //	if(win)
 //	{
@@ -484,7 +494,7 @@ void ControlBar::updateContextPurchaseScience( void )
 	// sanity
 	if( obj->isKindOf( KINDOF_COMMANDCENTER ) == FALSE )
 		switchToContext( CB_CONTEXT_NONE, NULL );
-	
+
 	GameWindow* win = m_contextParent[ CP_PURCHASE_SCIENCE ];
 
 	Int selected;
@@ -526,14 +536,14 @@ void CommandButton::parseCommand( INI* ini, void *instance, void *store, const v
 			*command = (GUICommandType)i;
 			return;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// if we're here the command was not found
 	throw INI_INVALID_DATA;
 
-}  // end parseCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -555,10 +565,6 @@ CommandButton::CommandButton( void )
 	//m_pushedImage = NULL;
 
 	m_flashCount = 0;
-
-	// Added by Sadullah Nader
-	// The purpose is to initialize these variable to values that are zero or empty
-
 	m_conflictingLabel.clear();
 	m_cursorName.clear();
 	m_descriptionLabel.clear();
@@ -567,22 +573,19 @@ CommandButton::CommandButton( void )
 	m_options = 0;
 	m_purchasedLabel.clear();
 	m_textLabel.clear();
-
-	// End Add
-	
 	m_window = NULL;
 	m_commandButtonBorder = COMMAND_BUTTON_BORDER_NONE;
 	//m_prev = NULL;
-	m_next = NULL;			
-	m_radiusCursor = RADIUSCURSOR_NONE;													
-	
+	m_next = NULL;
+	m_radiusCursor = RADIUSCURSOR_NONE;
+
 }
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 CommandButton::~CommandButton( void )
 {
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -628,7 +631,7 @@ Bool CommandButton::isValidToUseOn(const Object *sourceObj, const Object *target
 		if (pui) {
 			const ProductionEntry *pe = pui->firstProduction();
 			while (pe) {
-				if (pe->getProductionUpgrade() != NULL) 
+				if (pe->getProductionUpgrade() != NULL)
 					return false;
 				pe = pui->nextProduction(pe);
 			}
@@ -638,7 +641,7 @@ Bool CommandButton::isValidToUseOn(const Object *sourceObj, const Object *target
 		return false;
 	}
 
-	if( BitIsSet( m_options, COMMAND_OPTION_NEED_OBJECT_TARGET ) && !targetObj ) 
+	if( BitIsSet( m_options, COMMAND_OPTION_NEED_OBJECT_TARGET ) && !targetObj )
 	{
 		return false;
 	}
@@ -649,7 +652,7 @@ Bool CommandButton::isValidToUseOn(const Object *sourceObj, const Object *target
 		pos.set( targetLocation );
 	}
 
-	if( BitIsSet( m_options, NEED_TARGET_POS ) && !targetLocation ) 
+	if( BitIsSet( m_options, NEED_TARGET_POS ) && !targetLocation )
 	{
 		if( targetObj )
 		{
@@ -660,13 +663,13 @@ Bool CommandButton::isValidToUseOn(const Object *sourceObj, const Object *target
 			return false;
 		}
 	}
-	
-	if( BitIsSet( m_options, COMMAND_OPTION_NEED_OBJECT_TARGET ) ) 
+
+	if( BitIsSet( m_options, COMMAND_OPTION_NEED_OBJECT_TARGET ) )
 	{
 		return TheActionManager->canDoSpecialPowerAtObject( sourceObj, targetObj, commandSource, m_specialPower, m_options, false );
 	}
 
-	if( BitIsSet( m_options, NEED_TARGET_POS ) ) 
+	if( BitIsSet( m_options, NEED_TARGET_POS ) )
 	{
 		return TheActionManager->canDoSpecialPowerAtLocation( sourceObj, &pos, commandSource, m_specialPower, NULL, m_options, false );
 	}
@@ -678,9 +681,9 @@ Bool CommandButton::isValidToUseOn(const Object *sourceObj, const Object *target
 Bool CommandButton::isReady(const Object *sourceObj) const
 {
 	SpecialPowerModuleInterface *mod = sourceObj->getSpecialPowerModule( m_specialPower );
-	if( mod && mod->getPercentReady() == 1.0f ) 
+	if( mod && mod->getPercentReady() == 1.0f )
 		return true;
-	
+
 	if (m_upgradeTemplate && sourceObj->affectedByUpgrade(m_upgradeTemplate) && !sourceObj->hasUpgrade(m_upgradeTemplate))
 		return true;
 
@@ -701,9 +704,9 @@ Bool CommandButton::isValidObjectTarget(const Drawable* source, const Drawable*
 /** These are the fields you can define in a command set, they correspond to physical
 	* buttons in the GUI */
 //-------------------------------------------------------------------------------------------------
-const FieldParse CommandSet::m_commandSetFieldParseTable[] = 
+const FieldParse CommandSet::m_commandSetFieldParseTable[] =
 {
-	
+
 	{ "1",			CommandSet::parseCommandButton, (void *)0,		offsetof( CommandSet, m_command ) },
 	{ "2",			CommandSet::parseCommandButton, (void *)1,		offsetof( CommandSet, m_command ) },
 	{ "3",			CommandSet::parseCommandButton, (void *)2,		offsetof( CommandSet, m_command ) },
@@ -722,7 +725,7 @@ const FieldParse CommandSet::m_commandSetFieldParseTable[] =
 	{ "16",			CommandSet::parseCommandButton, (void *)15,		offsetof( CommandSet, m_command ) },
 	{ "17",			CommandSet::parseCommandButton, (void *)16,		offsetof( CommandSet, m_command ) },
 	{ "18",			CommandSet::parseCommandButton, (void *)17,		offsetof( CommandSet, m_command ) },
-	{ NULL,			NULL,														 NULL,				0	}  // keep this last
+	{ NULL,			NULL,														 NULL,				0	}
 
 };
 
@@ -769,7 +772,7 @@ void CommandButton::copyButtonTextFrom( const CommandButton *button, Bool shortc
 		}
 	}
 	else
-	{	
+	{
 		//Copy the text from the purchase science button if it exists (most won't).
 		if( button->getTextLabel().isNotEmpty() && m_textLabel.compare( button->getTextLabel() ) )
 		{
@@ -800,28 +803,28 @@ void CommandSet::parseCommandButton( INI* ini, void *instance, void *store, cons
 	if( commandButton == NULL )
 	{
 
-		DEBUG_CRASH(( "[LINE: %d - FILE: '%s'] Unknown command '%s' found in command set\n",
+		DEBUG_CRASH(( "[LINE: %d - FILE: '%s'] Unknown command '%s' found in command set",
 								  ini->getLineNum(), ini->getFilename().str(), token ));
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// get the index to store the command at, and the command array itself
 	const CommandButton **buttonArray = (const CommandButton **)store;
 	Int buttonIndex = (Int)userData;
 
 	// sanity
-	DEBUG_ASSERTCRASH( buttonIndex < MAX_COMMANDS_PER_SET, ("parseCommandButton: button index '%d' out of range\n", 
+	DEBUG_ASSERTCRASH( buttonIndex < MAX_COMMANDS_PER_SET, ("parseCommandButton: button index '%d' out of range",
 										 buttonIndex) );
 
 	// save it
 	buttonArray[ buttonIndex ] = commandButton;
 
-}  // end parseCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-CommandSet::CommandSet(const AsciiString& name) : 
+CommandSet::CommandSet(const AsciiString& name) :
 	m_name(name),
 	m_next(NULL)
 {
@@ -831,14 +834,14 @@ CommandSet::CommandSet(const AsciiString& name) :
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-const CommandButton* CommandSet::getCommandButton(Int i) const 
-{ 
+const CommandButton* CommandSet::getCommandButton(Int i) const
+{
 	const CommandButton* button;
   // Check for TheGameLogic == null, cause it is in Worldbuilder, and wb gets command bar info. jba.
 	if (TheGameLogic && TheGameLogic->findControlBarOverride(m_name, i, button))
 		return button;
 
-	return m_command[i]; 
+	return m_command[i];
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -854,7 +857,7 @@ void CommandSet::friend_addToList(CommandSet** listHead)
 CommandSet::~CommandSet( void )
 {
 
-}  // end ~CommandSet
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // ControlBar /////////////////////////////////////////////////////////////////////////////////////
@@ -870,11 +873,10 @@ ControlBar::ControlBar( void )
 	m_controlBarSchemeManager = NULL;
 	m_isObserverCommandBar = FALSE;
 	m_observerLookAtPlayer = NULL;
+	m_observedPlayer = NULL;
 	m_buildToolTipLayout = NULL;
 	m_showBuildToolTipLayout = FALSE;
 
-	// Added By Sadullah Nader
-	// initializing vars to zero
 	m_animateDownWin1Pos.x = m_animateDownWin1Pos.y = 0;
 	m_animateDownWin1Size.x = m_animateDownWin1Size.y = 0;
 	m_animateDownWin2Pos.x = m_animateDownWin2Pos.y = 0;
@@ -887,15 +889,14 @@ ControlBar::ControlBar( void )
 	{
 		m_commonCommands[i] = 0;
 	}
-	
+
 	m_currContext = CB_CONTEXT_NONE;
 	m_defaultControlBarPosition.x = m_defaultControlBarPosition.y = 0;
 	m_genStarFlash = FALSE;
-  m_genStarOff = NULL;
+	m_genStarOff = NULL;
 	m_genStarOn  = NULL;
 	m_UIDirty    = FALSE;
-	//
-//	m_controlBarResizer = NULL;
+	//	m_controlBarResizer = NULL;
 	m_buildUpClockColor = GameMakeColor(0,0,0,100);
 	m_commandBarBorderColor = GameMakeColor(0,0,0,100);
 	for( i = 0; i < NUM_CONTEXT_PARENTS; i++ )
@@ -938,7 +939,7 @@ ControlBar::ControlBar( void )
 	resetBuildQueueData();
 	resetContainData();
 	m_lastRecordedInventoryCount = 0;
-	
+
 	m_videoManager = NULL;
 	m_animateWindowManager = NULL;
 	m_generalsScreenAnimate = NULL;
@@ -950,7 +951,7 @@ ControlBar::ControlBar( void )
 	m_toggleButtonDownIn = NULL;
 	m_toggleButtonDownOn = NULL;
 	m_toggleButtonDownPushed = NULL;
-	
+
 	m_generalButtonEnable = NULL;
 	m_generalButtonHighlight = NULL;
 	m_genArrow = NULL;
@@ -961,12 +962,12 @@ ControlBar::ControlBar( void )
 	m_remainingRadarAttackGlowFrames = 0;
 	m_radarAttackGlowWindow = NULL;
 
-#if defined( RTS_INTERNAL ) || defined( RTS_DEBUG )
+#if defined(RTS_DEBUG)
 	m_lastFrameMarkedDirty = 0;
 	m_consecutiveDirtyFrames = 0;
 #endif
 
-}  // end ControlBar
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -980,29 +981,25 @@ ControlBar::~ControlBar( void )
 		m_scienceLayout = NULL;
 	}
 	m_genArrow = NULL;
-	if(m_videoManager)
-		delete m_videoManager;
-	m_videoManager = NULL;
 
+	delete m_videoManager;
+	m_videoManager = NULL;
 
-	if(m_animateWindowManagerForGenShortcuts)
-		delete m_animateWindowManagerForGenShortcuts;
+	delete m_animateWindowManagerForGenShortcuts;
 	m_animateWindowManagerForGenShortcuts = NULL;
-	if(m_animateWindowManager)
-		delete m_animateWindowManager;
+
+	delete m_animateWindowManager;
 	m_animateWindowManager = NULL;
-	
-	if(m_generalsScreenAnimate)
-		delete m_generalsScreenAnimate;
+
+	delete m_generalsScreenAnimate;
 	m_generalsScreenAnimate = NULL;
 
-	if( m_controlBarSchemeManager )
-		delete m_controlBarSchemeManager;
+	delete m_controlBarSchemeManager;
 	m_controlBarSchemeManager = NULL;
 
-//	if(m_controlBarResizer)
-//		delete m_controlBarResizer;
+//	delete m_controlBarResizer;
 //	m_controlBarResizer = NULL;
+
 	// destroy all the command set definitions
 	CommandSet *set;
 	while( m_commandSets )
@@ -1011,7 +1008,7 @@ ControlBar::~ControlBar( void )
 		deleteInstance(m_commandSets);
 		m_commandSets = set;
 
-	}  // end while
+	}
 
 	// destroy all our command button definitions
 	CommandButton *button;
@@ -1021,7 +1018,7 @@ ControlBar::~ControlBar( void )
 		deleteInstance(m_commandButtons);
 		m_commandButtons = button;
 
-	}  // end while
+	}
 	if(m_buildToolTipLayout)
 	{
 		m_buildToolTipLayout->destroyWindows();
@@ -1039,9 +1036,12 @@ ControlBar::~ControlBar( void )
 	m_radarAttackGlowWindow = NULL;
 
 	if (m_rightHUDCameoWindow && m_rightHUDCameoWindow->winGetUserData())
+	{
 		delete m_rightHUDCameoWindow->winGetUserData();
+		m_rightHUDCameoWindow->winSetUserData(NULL);
+	}
 
-}  // end ~ControlBar
+}
 void ControlBarPopupDescriptionUpdateFunc( WindowLayout *layout, void *param );
 
 //-------------------------------------------------------------------------------------------------
@@ -1052,11 +1052,11 @@ void ControlBar::init( void )
 	INI ini;
 	m_sideSelectAnimateDown = FALSE;
 	// load the command buttons
-	ini.load( AsciiString( "Data\\INI\\Default\\CommandButton.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\CommandButton.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\CommandButton", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\CommandButton", INI_LOAD_OVERWRITE, NULL );
 
 	// load the command sets
-	ini.load( AsciiString( "Data\\INI\\CommandSet.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\CommandSet", INI_LOAD_OVERWRITE, NULL );
 
 	// post process step after loading the command buttons and command sets
 	postProcessCommands();
@@ -1071,14 +1071,14 @@ void ControlBar::init( void )
 	{
 		//
 		// the control bar has several windows that make up our context sensitive interface, we
-		// want those parent windows so that we can easily hide and show them to make the 
+		// want those parent windows so that we can easily hide and show them to make the
 		// interface context sensitive
 		//
 		NameKeyType id;
 		id = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ControlBarParent" );
 		m_contextParent[ CP_MASTER ] = TheWindowManager->winGetWindowFromId( NULL, id );
 	m_contextParent[ CP_MASTER ]->winGetPosition(&m_defaultControlBarPosition.x, &m_defaultControlBarPosition.y);
-		
+
 		m_scienceLayout = TheWindowManager->winCreateLayout("GeneralsExpPoints.wnd");
 		m_scienceLayout->hide(TRUE);
 		id = TheNameKeyGenerator->nameToKey( "GeneralsExpPoints.wnd:GenExpParent" );
@@ -1113,10 +1113,10 @@ void ControlBar::init( void )
 		AsciiString windowName;
 		for( i = 0; i < MAX_COMMANDS_PER_SET; i++ )
 		{
-		
+
 			windowName.format( "ControlBar.wnd:ButtonCommand%02d", i + 1 );
 			id = TheNameKeyGenerator->nameToKey( windowName.str() );
-			m_commandWindows[ i ] = 
+			m_commandWindows[ i ] =
 				TheWindowManager->winGetWindowFromId( m_contextParent[ CP_COMMAND ], id );
 			if (m_commandWindows[ i ])
 			{
@@ -1128,57 +1128,57 @@ void ControlBar::init( void )
 	// removed from multiplayer branch
 //			windowName.format( "ControlBar.wnd:CommandMarker%02d", i + 1 );
 //			id = TheNameKeyGenerator->nameToKey( windowName.str() );
-//			m_commandMarkers[ i ] = 
+//			m_commandMarkers[ i ] =
 //				TheWindowManager->winGetWindowFromId( m_contextParent[ CP_COMMAND ], id );
 //			// set the size and position to make sure their in the same place as the buttons.
 //			m_commandMarkers[i]->winSetPosition(commandPos.x -2, commandPos.y - 2);
 //			m_commandMarkers[i]->winSetSize(commandSize.x + 2, commandSize.y + 2);
-			
 
 
-		}  // end for i
+
+		}
 
 
 		for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_1; i++ )
 		{
 			windowName.format( "GeneralsExpPoints.wnd:ButtonRank1Number%d", i );
 			id = TheNameKeyGenerator->nameToKey( windowName.str() );
-			m_sciencePurchaseWindowsRank1[ i ] = 
+			m_sciencePurchaseWindowsRank1[ i ] =
 				TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], id );
 			m_sciencePurchaseWindowsRank1[ i ]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
-		}  // end for i
+		}
 		for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_3; i++ )
 		{
 			windowName.format( "GeneralsExpPoints.wnd:ButtonRank3Number%d", i );
 			id = TheNameKeyGenerator->nameToKey( windowName.str() );
-			m_sciencePurchaseWindowsRank3[ i ] = 
+			m_sciencePurchaseWindowsRank3[ i ] =
 				TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], id );
 			m_sciencePurchaseWindowsRank3[ i ]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
-		}  // end for i
-		
-		for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_8; i++ ) 
+		}
+
+		for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_8; i++ )
 		{
 			windowName.format( "GeneralsExpPoints.wnd:ButtonRank8Number%d", i );
 			id = TheNameKeyGenerator->nameToKey( windowName.str() );
-			m_sciencePurchaseWindowsRank8[ i ] = 
+			m_sciencePurchaseWindowsRank8[ i ] =
 				TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], id );
 			m_sciencePurchaseWindowsRank8[ i ]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
-		}  // end for i
+		}
 
 		// keep a pointer to the window making up the right HUD display
 		id = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:RightHUD" );
 		m_rightHUDWindow = TheWindowManager->winGetWindowFromId( NULL, id );
-	
+
 		id = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:WinUnitSelected" );
 		m_rightHUDUnitSelectParent = TheWindowManager->winGetWindowFromId( NULL, id );
-		
+
 		id = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:CameoWindow" );
 		m_rightHUDCameoWindow = TheWindowManager->winGetWindowFromId( NULL, id );
 		for( i = 0; i < MAX_RIGHT_HUD_UPGRADE_CAMEOS; i++ )
 		{
 			windowName.format( "ControlBar.wnd:UnitUpgrade%d", i+1 );
 			id = TheNameKeyGenerator->nameToKey( windowName.str() );
-			m_rightHUDUpgradeCameos[ i ] = 
+			m_rightHUDUpgradeCameos[ i ] =
 				TheWindowManager->winGetWindowFromId( m_rightHUDWindow, id );
 			m_rightHUDUpgradeCameos[ i ]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
 		}
@@ -1223,7 +1223,7 @@ void ControlBar::init( void )
 			setControlCommand(win, findCommandButton("NonCommand_UpDown") );
 			win->winSetTooltipFunc(commandButtonTooltip);
 		}
-		
+
 		win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey("ControlBar.wnd:PowerWindow"));
 		if(win)
 		{
@@ -1243,9 +1243,9 @@ void ControlBar::init( void )
 		m_radarAttackGlowWindow = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:WinUAttack"));
 
 
-		win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ));
+		win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ));
 		win->winGetScreenPosition(&m_controlBarForegroundMarkerPos.x, &m_controlBarForegroundMarkerPos.y);
-		win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ));
+		win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ));
 		win->winGetScreenPosition(&m_controlBarBackgroundMarkerPos.x,&m_controlBarBackgroundMarkerPos.y);
 
 		if(!m_videoManager)
@@ -1262,7 +1262,7 @@ void ControlBar::init( void )
 			m_buildToolTipLayout->hide(TRUE);
 			m_buildToolTipLayout->setUpdate(ControlBarPopupDescriptionUpdateFunc);
 		}
-			
+
 		m_genStarOn = TheMappedImageCollection ? (Image *)TheMappedImageCollection->findImageByName("BarButtonGenStarON") : NULL;
 		m_genStarOff = TheMappedImageCollection ? (Image *)TheMappedImageCollection->findImageByName("BarButtonGenStarOFF") : NULL;
 		m_genStarFlash = TRUE;
@@ -1276,7 +1276,7 @@ void ControlBar::init( void )
 //		if(!m_controlBarResizer)
 //			m_controlBarResizer = NEW ControlBarResizer;
 //		m_controlBarResizer->init();
-		
+
 
 
 		// Initialize the Observer controls
@@ -1286,7 +1286,7 @@ void ControlBar::init( void )
 		switchToContext( CB_CONTEXT_NONE, NULL );
 	}
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the context sensitive control bar GUI */
@@ -1306,7 +1306,8 @@ void ControlBar::reset( void )
 
 	m_isObserverCommandBar = FALSE; // reset us to use a normal command bar
 	m_observerLookAtPlayer = NULL;
-	
+	m_observedPlayer = NULL;
+
 	if(m_buildToolTipLayout)
 		m_buildToolTipLayout->hide(TRUE);
 	m_showBuildToolTipLayout = FALSE;
@@ -1323,14 +1324,14 @@ void ControlBar::reset( void )
 
 	if(m_videoManager)
 		m_videoManager->reset();
-	
+
 	// go back to default context
 	switchToContext( CB_CONTEXT_NONE, NULL );
 	m_sideSelectAnimateDown = FALSE;
 	if(m_animateDownWindow)
 	{
 		TheWindowManager->winDestroy( m_animateDownWindow );
-		m_animateDownWindow = NULL;		
+		m_animateDownWindow = NULL;
 	}
 
 	// Remove any overridden sets.
@@ -1374,7 +1375,7 @@ void ControlBar::reset( void )
 
 	m_lastFlashedAtPointValue = -1;
 	m_genStarFlash = TRUE;
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update phase, we can track if our selected object is destroyed, update button
@@ -1400,7 +1401,7 @@ void ControlBar::update( void )
 		{
 			if (m_animateWindowManager->isFinished() && m_animateWindowManager->isReversed())
 			{
-				Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
+				Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent");
 				GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
 				if (window && !window->winIsHidden())
 					window->winHide(TRUE);
@@ -1439,29 +1440,32 @@ void ControlBar::update( void )
 			populateObserverInfoWindow();
 
 		Drawable *drawToEvaluateFor = NULL;
-		Bool multiSelect = FALSE;
 		if( TheInGameUI->getSelectCount() > 1 )
 		{
 			// Attempt to isolate a Drawable here to evaluate
 			// The need arises when selected is an AngryMob,
 			// whose selection actually consists of varied units
 			// but is represented in the UI as a single unit,
-			// so we must isolate and evaluate only the Nexus 
+			// so we must isolate and evaluate only the Nexus
 			drawToEvaluateFor = TheGameClient->findDrawableByID( TheInGameUI->getSoloNexusSelectedDrawableID() ) ;
-			multiSelect = ( drawToEvaluateFor == NULL );
-
-		}  
+		}
 		else // get the first and only drawble in the selection list
 			// TheSuperHackers @fix Mauller 07/04/2025 The first access to this can return an empty list
 			if (!TheInGameUI->getAllSelectedDrawables()->empty()) {
 				drawToEvaluateFor = TheInGameUI->getAllSelectedDrawables()->front();
-				Object *obj = drawToEvaluateFor ? drawToEvaluateFor->getObject() : NULL;
-				setPortraitByObject( obj );
 			}
-		
+
+		Object* obj = drawToEvaluateFor ? drawToEvaluateFor->getObject() : NULL;
+		setPortraitByObject(obj);
+
+		const Coord3D* exitPosition = NULL;
+		if (obj && obj->getControllingPlayer() == getCurrentlyViewedPlayer() && obj->getObjectExitInterface())
+			exitPosition = obj->getObjectExitInterface()->getRallyPoint();
+
+		showRallyPoint(exitPosition);
 		return;
 	}
-		
+
 
 	// check flashing
 	if( m_flash )
@@ -1496,7 +1500,7 @@ void ControlBar::update( void )
 			}
 		}
 	}
-	
+
 	if(!m_contextParent[ CP_PURCHASE_SCIENCE ]->winIsHidden())
 		updateContextPurchaseScience();
 
@@ -1509,7 +1513,7 @@ void ControlBar::update( void )
 		evaluateContextUI();
 		populateSpecialPowerShortcut(ThePlayerList->getLocalPlayer());
 		// if we have a build tooltip layout, update it with the new data.
-		repopulateBuildTooltipLayout(); 
+		repopulateBuildTooltipLayout();
 	}
 
 	// enable/disable the beacon button depending on if the max has been reached
@@ -1543,7 +1547,7 @@ void ControlBar::update( void )
 		updateContextMultiSelect();
 		return;
 
-	}  // end if
+	}
 
 	// if nothing is selected get out of here except if we're in the Purchase science context... that requires
 	// us to not have anything selected
@@ -1551,12 +1555,12 @@ void ControlBar::update( void )
 	{
 
 		// we better be in the default none context
-		DEBUG_ASSERTCRASH( m_currContext == CB_CONTEXT_NONE, ("ControlBar::update no selection, but not we're not showing the default NONE context\n") );
+		DEBUG_ASSERTCRASH( m_currContext == CB_CONTEXT_NONE, ("ControlBar::update no selection, but not we're not showing the default NONE context") );
 		return;
 
-	}  // end if
-	
-	
+	}
+
+
 
 	// if our selected drawable has no object get out of here
 	Object *obj = NULL;
@@ -1568,13 +1572,13 @@ void ControlBar::update( void )
 		switchToContext( CB_CONTEXT_NONE, NULL );
 		return;
 
-	}  // end if
+	}
 
 	switch( m_currContext )
 	{
 
 		//---------------------------------------------------------------------------------------------
-		case CB_CONTEXT_NONE:  
+		case CB_CONTEXT_NONE:
 			break;
 
 		//---------------------------------------------------------------------------------------------
@@ -1602,11 +1606,11 @@ void ControlBar::update( void )
 			updateContextOCLTimer();
 			break;
 
-	}  // end switch
+	}
 
 
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1620,7 +1624,7 @@ void ControlBar::onDrawableSelected( Drawable *draw )
 	TheInGameUI->setGUICommand( NULL );
 
 
-}  // end onDrawableSelected
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1643,7 +1647,7 @@ void ControlBar::onDrawableDeselected( Drawable *draw )
 	//
 	TheInGameUI->placeBuildAvailable( NULL, NULL );
 
-}  // end onDrawableDeselected
+}
 
 //-------------------------------------------------------------------------------------------------
 
@@ -1653,7 +1657,7 @@ const Image *ControlBar::getStarImage(void )
 		m_genStarFlash = FALSE;
 	else
 		m_lastFlashedAtPointValue = ThePlayerList->getLocalPlayer()->getSciencePurchasePoints();
-	
+
 	GameWindow *win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonGeneral" ) );
 	if(!win)
 		return NULL;
@@ -1711,7 +1715,7 @@ void ControlBar::onPlayerSciencePurchasePointsChanged(const Player *p)
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Given the drawables that we have selected into our context sensitive UI, evaluate 
+/** Given the drawables that we have selected into our context sensitive UI, evaluate
 	* and perform all UI manipulations to make the GUI show to the user what we want them
 	* to see */
 //-------------------------------------------------------------------------------------------------
@@ -1723,7 +1727,7 @@ void ControlBar::evaluateContextUI( void )
 	// information to the player
 	//
 	m_UIDirty = FALSE;
-	
+
 	// if our purchase science window is up, we will want to update it by repopulating it.
 	if(!m_contextParent[ CP_PURCHASE_SCIENCE ]->winIsHidden())
 		showPurchaseScience();
@@ -1751,7 +1755,7 @@ void ControlBar::evaluateContextUI( void )
 		//Also make sure the unit isn't a garrisonable neutral civ team building!
 		Drawable *draw = selectedDrawables->front();
 
-		//sanity 
+		//sanity
 		if( !draw )
 		{
 			return;
@@ -1761,7 +1765,7 @@ void ControlBar::evaluateContextUI( void )
 		{
 			return;
 		}
-		
+
 		if (obj->getControllingPlayer()
 			&& obj->getControllingPlayer()->getPlayerTemplate()
 			&& obj->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate().compare(obj->getTemplate()->getName()) == 0
@@ -1823,20 +1827,20 @@ void ControlBar::evaluateContextUI( void )
 		// The need arises when selected is an AngryMob,
 		// whose selection actually consists of varied units
 		// but is represented in the UI as a single unit,
-		// so we must isolate and evaluate only the Nexus 
+		// so we must isolate and evaluate only the Nexus
 		drawToEvaluateFor = TheGameClient->findDrawableByID( TheInGameUI->getSoloNexusSelectedDrawableID() ) ;
 		multiSelect = ( drawToEvaluateFor == NULL );
 
-	}  
+	}
 	else // get the first and only drawble in the selection list
 		drawToEvaluateFor = selectedDrawables->front();
-	
+
 
 
 	if( multiSelect )
 	{
 		switchToContext( CB_CONTEXT_MULTI_SELECT, NULL );
-	}  
+	}
 	else if ( drawToEvaluateFor )// either we have exactly one drawable, or we have isolated one to evaluate for...
 	{
 
@@ -1858,7 +1862,7 @@ void ControlBar::evaluateContextUI( void )
 
 		static const NameKeyType key_OCLUpdate = NAMEKEY( "OCLUpdate" );
 		OCLUpdate *update = (OCLUpdate*)obj->findUpdateModule( key_OCLUpdate );
-	
+
 		//
 		// a command center is context sensitive itself, if a side has *NOT* been chosen we display
 		// the side select interface for command centers only, but note how under construction is
@@ -1871,7 +1875,7 @@ void ControlBar::evaluateContextUI( void )
 			switchToContext( CB_CONTEXT_UNDER_CONSTRUCTION, drawToEvaluateFor );
 			contextSelected = TRUE;
 
-		}  // end else if
+		}
 
 		// check for a regular switch to the appropriate context
 		if( contextSelected == FALSE )
@@ -1893,7 +1897,7 @@ void ControlBar::evaluateContextUI( void )
 				if( obj->isLocallyControlled() == TRUE || relationship == NEUTRAL )
 					switchToContext( CB_CONTEXT_STRUCTURE_INVENTORY, drawToEvaluateFor );
 
-			}  // end else if
+			}
 			else if( update )
 			{
 				switchToContext( CB_CONTEXT_OCL_TIMER, drawToEvaluateFor );
@@ -1903,32 +1907,32 @@ void ControlBar::evaluateContextUI( void )
 
 				switchToContext( CB_CONTEXT_COMMAND, drawToEvaluateFor );
 
-			}  // end else if
+			}
 			else if (obj->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate().compare(obj->getTemplate()->getName()) == 0)
 			{
 				switchToContext( CB_CONTEXT_BEACON, drawToEvaluateFor );
 			}
-			else 
+			else
 				switchToContext( CB_CONTEXT_NONE, drawToEvaluateFor );
-		}  // end else
+		}
 
-	}  // end else	
+	}
 
-}  // end evaluateContextUI
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Find a command button of the given name if present */
 //-------------------------------------------------------------------------------------------------
 CommandButton *ControlBar::findNonConstCommandButton( const AsciiString& name )
 {
-	
+
 	for( const CommandButton *command = m_commandButtons; command; command = command->getNext() )
 		if( command->getName() == name )
 			return const_cast<CommandButton*>((const CommandButton*)command->getFinalOverride());
 
 	return NULL;  // not found
 
-}  // end findCommandButton
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Allocate a new command button, assign name, and tie to list */
@@ -1949,7 +1953,7 @@ CommandButton *ControlBar::newCommandButton( const AsciiString& name )
 	// return the new button
 	return newButton;
 
-}  // end newCommandButton
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1982,7 +1986,7 @@ CommandButton *ControlBar::newCommandButtonOverride( CommandButton *buttonToOver
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
 	commandSet = TheControlBar->findNonConstCommandSet( name );
@@ -1994,7 +1998,7 @@ CommandButton *ControlBar::newCommandButtonOverride( CommandButton *buttonToOver
 		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES) {
 			commandSet->markAsOverride();
 		}
-	}  // end if
+	}
 	else if( ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES )
 	{
 		//Holy crap, this sucks to debug!!!
@@ -2012,12 +2016,12 @@ CommandButton *ControlBar::newCommandButtonOverride( CommandButton *buttonToOver
 	}
 
 	// sanity
-	DEBUG_ASSERTCRASH( commandSet, ("parseCommandSetDefinition: Unable to allocate set '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( commandSet, ("parseCommandSetDefinition: Unable to allocate set '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( commandSet, commandSet->friend_getFieldParse() );
 
-}  // end parseCommandSetDefinition
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Find existing command set by name */
@@ -2036,25 +2040,25 @@ CommandSet* ControlBar::findNonConstCommandSet( const AsciiString& name )
 //-------------------------------------------------------------------------------------------------
 /** find existing command button if present	*/
 //-------------------------------------------------------------------------------------------------
-const CommandButton *ControlBar::findCommandButton( const AsciiString& name ) 
-{ 
-	CommandButton *btn =  findNonConstCommandButton(name); 
+const CommandButton *ControlBar::findCommandButton( const AsciiString& name )
+{
+	CommandButton *btn =  findNonConstCommandButton(name);
 	if( btn )
 	{
 		btn = (CommandButton *)btn->friend_getFinalOverride();
 	}
-	return btn; 
+	return btn;
 }
 
 //-------------------------------------------------------------------------------------------------
 /** Find existing command set by name */
 //-------------------------------------------------------------------------------------------------
-const CommandSet *ControlBar::findCommandSet( const AsciiString& name ) 
-{ 
-	CommandSet *set = findNonConstCommandSet(name); 
+const CommandSet *ControlBar::findCommandSet( const AsciiString& name )
+{
+	CommandSet *set = findNonConstCommandSet(name);
 	if (set)
 		set = (CommandSet*)set->friend_getFinalOverride();
-	return set; 
+	return set;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2069,7 +2073,7 @@ CommandSet *ControlBar::newCommandSet( const AsciiString& name )
 	// return the newly created set
 	return set;
 
-}  // end newCommandSet
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create an overridden command set. */
@@ -2097,26 +2101,26 @@ CommandSet *ControlBar::newCommandSetOverride( CommandSet *setToOverride )
 //-------------------------------------------------------------------------------------------------
 /** Process a button click for the context sensitive GUI */
 //-------------------------------------------------------------------------------------------------
-CBCommandStatus ControlBar::processContextSensitiveButtonClick( GameWindow *button, 
+CBCommandStatus ControlBar::processContextSensitiveButtonClick( GameWindow *button,
 																																GadgetGameMessage gadgetMessage )
 {
 
 	// call command processing method
 	return processCommandUI( button, gadgetMessage );
 
-}  // end processContextSensitiveButtonClick
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Process a button click for the context sensitive GUI */
 //-------------------------------------------------------------------------------------------------
-CBCommandStatus ControlBar::processContextSensitiveButtonTransition( GameWindow *button, 
+CBCommandStatus ControlBar::processContextSensitiveButtonTransition( GameWindow *button,
 																																GadgetGameMessage gadgetMessage )
 {
 
 	// call command processing method
 	return processCommandTransitionUI( button, gadgetMessage );
 
-}  // end processContextSensitiveButtonClick
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -2169,7 +2173,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 			for( int i = 0; i < MAX_COMMANDS_PER_SET; i++ )
 			{
 				// the implementation won't necessarily use the max number of windows possible
-				if (m_commandWindows[ i ]) 
+				if (m_commandWindows[ i ])
 				{
 					m_commandWindows[ i ]->winClearStatus( WIN_STATUS_FLASHING );
 				}
@@ -2197,10 +2201,10 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 
 			// do not show any rally point marker
 			showRallyPoint( NULL );
-			
+
 			break;
 
-		}  // end none
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case CB_CONTEXT_COMMAND:
@@ -2215,7 +2219,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 			m_contextParent[ CP_OCL_TIMER ]->winHide( TRUE );
 			m_contextParent[ CP_OBSERVER_INFO ]->winHide( TRUE );
 			m_contextParent[ CP_OBSERVER_LIST ]->winHide( TRUE );
-			
+
 			// fill the specific UI info
 			populateCommand( draw->getObject() );
 
@@ -2233,17 +2237,17 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 					m_contextParent[ CP_BUILD_QUEUE ]->winHide( FALSE );
 					populateBuildQueue( obj );
 					setPortraitByObject( NULL );
-				}  // end if
-				else 
+				}
+				else
 				{
 					setPortraitByObject( obj );
 				}
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end command
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case CB_CONTEXT_STRUCTURE_INVENTORY:
@@ -2264,7 +2268,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 
 			break;
 
-		}  // end inventory
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case CB_CONTEXT_BEACON:
@@ -2280,13 +2284,13 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 			m_contextParent[ CP_OBSERVER_INFO ]->winHide( TRUE );
 			m_contextParent[ CP_OBSERVER_LIST ]->winHide( TRUE );
 
-			
-			// fill the specific UI info			
+
+			// fill the specific UI info
 			populateBeacon( draw->getObject() );
 
 			break;
 
-		}  // end beacon
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case CB_CONTEXT_UNDER_CONSTRUCTION:
@@ -2307,7 +2311,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 
 			break;
 
-		}  // end under construction
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case CB_CONTEXT_OCL_TIMER:
@@ -2328,7 +2332,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 
 			break;
 
-		}  // end under construction
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case CB_CONTEXT_MULTI_SELECT:
@@ -2350,7 +2354,7 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 
 			break;
 
-		}  // end multi select
+		}
 		case CB_CONTEXT_OBSERVER_LIST:
 		{
 
@@ -2369,23 +2373,23 @@ void ControlBar::switchToContext( ControlBarContext context, Drawable *draw )
 			populateObserverList();
 			break;
 
-		}  // end multi select
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 		{
 
-			DEBUG_ASSERTCRASH( 0, ("ControlBar::switchToContext, unknown context '%d'\n", context) );
+			DEBUG_ASSERTCRASH( 0, ("ControlBar::switchToContext, unknown context '%d'", context) );
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch
+	}
 
 	// save our context
 	m_currContext = context;
 
-}  // end switchToContext
+}
 
 void ControlBar::setCommandBarBorder( GameWindow *button, CommandButtonMappedBorderType type)
 {
@@ -2436,19 +2440,19 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com
 	if( button->winGetInputFunc() != GadgetPushButtonInput )
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("setControlCommand: Window is not a button\n") );
+		DEBUG_ASSERTCRASH( 0, ("setControlCommand: Window is not a button") );
 		return;
 
-	}  // end if
+	}
 
 	// sanity
 	if( commandButton == NULL )
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("setControlCommand: NULL commandButton passed in\n") );
+		DEBUG_ASSERTCRASH( 0, ("setControlCommand: NULL commandButton passed in") );
 		return;
 
-	}  // end if
+	}
 
 	//
 	// set the button gadget control to be a normal button or a check like button if
@@ -2466,7 +2470,7 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com
 	// hilite pushed image to be the enabled pushed image ... and we will also replicate
 	// the disabled image to be the disabled pushed image.  For complete control over all
 	// the states of these buttons we would add additional lines to the INI for a command
-	// button and store those additional images in the command button 
+	// button and store those additional images in the command button
 	//
 	if( commandButton->getButtonImage() )
 		GadgetButtonSetEnabledImage( button, commandButton->getButtonImage() );
@@ -2485,19 +2489,19 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com
 	//}  // end if
 
 	// set the text
-	if( commandButton->getTextLabel().isEmpty() == FALSE || !commandButton->getScienceVec().empty()) 
+	if( commandButton->getTextLabel().isEmpty() == FALSE || !commandButton->getScienceVec().empty())
 	{
 		button->winSetTooltipFunc(commandButtonTooltip);
 	}
 	else
-		GadgetButtonSetText( button, UnicodeString( L"" ) );
+		GadgetButtonSetText( button, L"" );
 
 	// save the command in the user data of the window
 	GadgetButtonSetData(button, (void*)commandButton);
 	//button->winSetUserData( commandButton );
-	
+
 	setCommandBarBorder(button, commandButton->getCommandButtonMappedBorderType());
-	
+
 	if (TheHotKeyManager)
 	{
 		AsciiString hotKey =	TheHotKeyManager->searchHotKey(commandButton->getTextLabel());
@@ -2506,7 +2510,7 @@ void ControlBar::setControlCommand( GameWindow *button, const CommandButton *com
 	}
 	GadgetButtonSetAltSound(button, "GUICommandBarClick");
 
-}  // end setControlCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 void CommandButton::cacheButtonImage()
@@ -2527,7 +2531,7 @@ void CommandButton::cacheButtonImage()
 //-------------------------------------------------------------------------------------------------
 void ControlBar::postProcessCommands( void )
 {
-	for ( CommandButton *button = m_commandButtons; button; button = button->friend_getNext() ) 
+	for ( CommandButton *button = m_commandButtons; button; button = button->friend_getNext() )
 	{
 		button->cacheButtonImage();
 	}
@@ -2547,15 +2551,15 @@ void ControlBar::setControlCommand( const AsciiString& buttonWindowName, GameWin
 	if( win == NULL )
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("setControlCommand: Unable to find window '%s'\n", buttonWindowName.str()) );
+		DEBUG_ASSERTCRASH( 0, ("setControlCommand: Unable to find window '%s'", buttonWindowName.str()) );
 		return;
 
-	}  // end if
+	}
 
 	// call the workhorse
 	setControlCommand( win, commandButton );
 
-}  // end setControlCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 /** show/hide the portrait window image */
@@ -2573,7 +2577,7 @@ void ControlBar::setPortraitByImage( const Image *image )
 		for(Int i = 0; i < MAX_UPGRADE_CAMEO_UPGRADES; ++i)
 			m_rightHUDUpgradeCameos[i]->winHide(TRUE);
 
-	}  // end if
+	}
 	else
 	{
 		m_rightHUDWindow->winSetStatus( WIN_STATUS_IMAGE );
@@ -2586,7 +2590,7 @@ void ControlBar::setPortraitByImage( const Image *image )
 
 	}
 
-}  // end setPortraitByImage
+}
 
 //-------------------------------------------------------------------------------------------------
 /** show/hide the portrait image by object.  We like to use this method as opposed to the
@@ -2607,7 +2611,7 @@ void ControlBar::setPortraitByObject( Object *obj )
 
 		const ThingTemplate *thing = obj->getTemplate();
 		Player *player = obj->getControllingPlayer();
-		
+
 		//If we have an enemy stealth disguised unit, swap portraits!
 		Drawable *draw = obj->getDrawable();
 		if( draw && draw->getStealthLook() == STEALTHLOOK_DISGUISED_ENEMY )
@@ -2626,7 +2630,7 @@ void ControlBar::setPortraitByObject( Object *obj )
 				player = ThePlayerList->getNthPlayer( stealth->getDisguisedPlayerIndex() );
 			}
 		}
-		
+
 		const Image* portrait = thing->getSelectedPortraitImage();
 
 		m_rightHUDUnitSelectParent->winHide(FALSE);
@@ -2674,9 +2678,9 @@ void ControlBar::setPortraitByObject( Object *obj )
 				m_rightHUDUpgradeCameos[i]->winEnable( FALSE );
 			}
 		}
-	
 
-	}  // end if
+
+	}
 	else
 	{
 		m_rightHUDUnitSelectParent->winHide(TRUE);
@@ -2689,64 +2693,59 @@ void ControlBar::setPortraitByObject( Object *obj )
 		GadgetButtonDrawOverlayImage( m_rightHUDCameoWindow, NULL );
 	}
 
-}  // end setPortraitByObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Show a rally point marker at the world location specified.  If no location is specified
 	* any marker that we might have visible is hidden */
 // ------------------------------------------------------------------------------------------------
-void ControlBar::showRallyPoint( const Coord3D *loc )
+void ControlBar::showRallyPoint(const Coord3D* loc)
 {
-
 	// if loc is NULL, destroy any rally point drawble we have shown
-	if( loc == NULL )
+	if (loc == NULL)
 	{
-
 		// destroy rally point drawable if present
-		if( m_rallyPointDrawableID != INVALID_DRAWABLE_ID )
-			TheGameClient->destroyDrawable( TheGameClient->findDrawableByID( m_rallyPointDrawableID ) );
+		if (m_rallyPointDrawableID != INVALID_DRAWABLE_ID)
+			TheGameClient->destroyDrawable(TheGameClient->findDrawableByID(m_rallyPointDrawableID));
+
 		m_rallyPointDrawableID = INVALID_DRAWABLE_ID;
+		return;
+	}
 
-	}  // end if
-	else
-	{
-		Drawable *marker = NULL;
+	Drawable* marker = NULL;
 
-		// create a rally point drawble if necessary
-		if( m_rallyPointDrawableID == INVALID_DRAWABLE_ID )
+	// create a rally point drawble if necessary
+	if (m_rallyPointDrawableID == INVALID_DRAWABLE_ID)
+	{
+		const ThingTemplate* ttn = TheThingFactory->findTemplate("RallyPointMarker");
+		marker = TheThingFactory->newDrawable(ttn);
+		DEBUG_ASSERTCRASH(marker, ("showRallyPoint: Unable to create rally point drawable"));
+		if (marker)
 		{
+			marker->setDrawableStatus(DRAWABLE_STATUS_NO_SAVE);
+			m_rallyPointDrawableID = marker->getID();
+		}
+	}
+	else
+		marker = TheGameClient->findDrawableByID(m_rallyPointDrawableID);
 
-			const ThingTemplate* ttn = TheThingFactory->findTemplate("RallyPointMarker");
-			marker = TheThingFactory->newDrawable( ttn );
-			DEBUG_ASSERTCRASH( marker, ("showRallyPoint: Unable to create rally point drawable\n") );
-			if (marker)
-			{
-				marker->setDrawableStatus(DRAWABLE_STATUS_NO_SAVE);
-				m_rallyPointDrawableID = marker->getID();
-			}
-
-		}  // end if
-		else
-			marker = TheGameClient->findDrawableByID( m_rallyPointDrawableID );
-
-		// sanity
-		DEBUG_ASSERTCRASH( marker, ("showRallyPoint: No rally point marker found\n" ) );
-
-		// set the position of the rally point drawble to the position passed in
-		marker->setPosition( loc );
-		marker->setOrientation( TheGlobalData->m_downwindAngle );//To blow down wind -- ML
+	// sanity
+	DEBUG_ASSERTCRASH(marker, ("showRallyPoint: No rally point marker found"));
 
-		// set the marker colors to that of the local player
-		Player *player = ThePlayerList->getLocalPlayer();
+	// set the position of the rally point drawble to the position passed in
+	marker->setPosition(loc);
+	marker->setOrientation(TheGlobalData->m_downwindAngle); // To blow down wind -- ML
 
+	// set the marker colors to that of the local player
+	Player* player = getCurrentlyViewedPlayer();
+	if (player)
+	{
 		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
-			marker->setIndicatorColor( player->getPlayerNightColor() );
+			marker->setIndicatorColor(player->getPlayerNightColor());
 		else
-			marker->setIndicatorColor( player->getPlayerColor() );
-
-	}  // end else
-
-}  // end showRallyPoint
+			marker->setIndicatorColor(player->getPlayerColor());
+	}
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Show a rally point marker at the world location specified.  If no location is specified
@@ -2768,7 +2767,7 @@ void ControlBar::setControlBarSchemeByPlayer(Player *p)
 	{
 		m_isObserverCommandBar = TRUE;
 		switchToContext( CB_CONTEXT_OBSERVER_LIST, NULL );
-		DEBUG_LOG(("We're loading the Observer Command Bar\n"));
+		DEBUG_LOG(("We're loading the Observer Command Bar"));
 
 		if (buttonPlaceBeacon)
 			buttonPlaceBeacon->winHide(TRUE);
@@ -2813,7 +2812,7 @@ void ControlBar::setControlBarSchemeByPlayerTemplate( const PlayerTemplate *pt)
 	{
 		m_isObserverCommandBar = TRUE;
 		switchToContext( CB_CONTEXT_OBSERVER_LIST, NULL );
-		DEBUG_LOG(("We're loading the Observer Command Bar\n"));
+		DEBUG_LOG(("We're loading the Observer Command Bar"));
 
 		if (buttonPlaceBeacon)
 			buttonPlaceBeacon->winHide(TRUE);
@@ -2874,15 +2873,15 @@ void ControlBar::updateBuildQueueDisabledImages( const Image *image )
 
 		for( i = 0; i < MAX_BUILD_QUEUE_BUTTONS; i++ )
 		{
-			
+
 			buttonName.format( "ControlBar.wnd:ButtonQueue%02d", i + 1 );
 			buildQueueIDs[ i ] = TheNameKeyGenerator->nameToKey( buttonName );
 
-		}  // end for i
+		}
 
 		idsInitialized = TRUE;
 
-	}  // end if
+	}
 
 	// get window pointers to all the buttons for the build queue
 	for( i = 0; i < MAX_BUILD_QUEUE_BUTTONS; i++ )
@@ -2894,7 +2893,7 @@ void ControlBar::updateBuildQueueDisabledImages( const Image *image )
 
 		GadgetButtonSetDisabledImage( m_queueData[ i ].control, image );
 
-	}  // end for i
+	}
 
 }
 
@@ -2946,7 +2945,7 @@ void ControlBar::updatePurchaseScience( void )
 
 void ControlBar::showPurchaseScience( void )
 {
-	
+
 	if(TheScriptEngine->isGameEnding())
 		return;
 	populatePurchaseScience(ThePlayerList->getLocalPlayer());
@@ -3007,8 +3006,6 @@ void ControlBar::switchControlBarStage( ControlBarStages stage )
 {
 	if(stage < CONTROL_BAR_STAGE_DEFAULT || stage >= MAX_CONTROL_BAR_STAGES)
 		return;
-	if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK)
-		return;
 	switch (stage) {
 	case CONTROL_BAR_STAGE_DEFAULT:
 		setDefaultControlBarConfig();
@@ -3025,7 +3022,7 @@ void ControlBar::switchControlBarStage( ControlBarStages stage )
 	default:
 		DEBUG_ASSERTCRASH(FALSE,("ControlBar::switchControlBarStage we were passed in a stage that's not supported %d", stage));
 	}
-	
+
 }
 void ControlBar::setDefaultControlBarConfig( void )
 {
@@ -3035,7 +3032,7 @@ void ControlBar::setDefaultControlBarConfig( void )
 //		m_controlBarSchemeManager->setControlBarSchemeByPlayerTemplate(ThePlayerList->getLocalPlayer()->getPlayerTemplate(), FALSE);
 //	}
 	m_currentControlBarStage = CONTROL_BAR_STAGE_DEFAULT;
-	TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f)); 
+	setScaledViewportHeight();
 	m_contextParent[ CP_MASTER ]->winSetPosition(m_defaultControlBarPosition.x, m_defaultControlBarPosition.y);
 	m_contextParent[ CP_MASTER ]->winHide(FALSE);
 	repopulateBuildTooltipLayout();
@@ -3049,10 +3046,10 @@ void ControlBar::setSquishedControlBarConfig( void )
 		return;
 	m_currentControlBarStage = CONTROL_BAR_STAGE_SQUISHED;
 	m_contextParent[ CP_MASTER ]->winSetPosition(m_defaultControlBarPosition.x, m_defaultControlBarPosition.y);
-	
+
 //	m_controlBarResizer->sizeWindowsAlt();
-	repopulateBuildTooltipLayout();	
-	TheTacticalView->setHeight((Int)(TheDisplay->getHeight())); 
+	repopulateBuildTooltipLayout();
+	setFullViewportHeight();
 	m_controlBarSchemeManager->setControlBarSchemeByPlayerTemplate(ThePlayerList->getLocalPlayer()->getPlayerTemplate(), TRUE);
 }
 
@@ -3063,12 +3060,12 @@ void ControlBar::setLowControlBarConfig( void )
 //		m_controlBarResizer->sizeWindowsDefault();
 //		m_controlBarSchemeManager->setControlBarSchemeByPlayerTemplate(ThePlayerList->getLocalPlayer()->getPlayerTemplate(), FALSE);
 //	}
-	
+
 	m_currentControlBarStage = CONTROL_BAR_STAGE_LOW;
 	ICoord2D pos;
 	pos.x = m_defaultControlBarPosition.x;
 	pos.y = TheDisplay->getHeight() - .1 * TheDisplay->getHeight();
-	TheTacticalView->setHeight((Int)(TheDisplay->getHeight())); 
+	setFullViewportHeight();
 	m_contextParent[ CP_MASTER ]->winSetPosition(pos.x, pos.y);
 	m_contextParent[ CP_MASTER ]->winHide(FALSE);
 	setUpDownImages();
@@ -3101,7 +3098,7 @@ void ControlBar::updateCommandMarkerImage( const Image *image )
 	//	{
 	//		m_commandMarkers[i]->winSetEnabledImage(0, image);
 	//	}
-	
+
 }
 void ControlBar::updateSlotExitImage( const Image *image )
 {
@@ -3216,13 +3213,13 @@ void ControlBar::updateRadarAttackGlow ( void )
 		m_radarAttackGlowWindow->winEnable(TRUE);
 		return;
 	}
-	
+
 	if(m_remainingRadarAttackGlowFrames % RADAR_ATTACK_GLOW_NUM_TIMES == 0)
 	{
 		m_radarAttackGlowWindow->winEnable(!BitIsSet(m_radarAttackGlowWindow->winGetStatus(),WIN_STATUS_ENABLED));
 	}
 
-	
+
 }
 void ControlBar::initSpecialPowershortcutBar( Player *player)
 {
@@ -3244,7 +3241,7 @@ void ControlBar::initSpecialPowershortcutBar( Player *player)
 	const PlayerTemplate *pt = player->getPlayerTemplate();
 
 	if(!player || !pt|| !player->isLocalPlayer()
-			|| pt->getSpecialPowerShortcutButtonCount() == 0  
+			|| pt->getSpecialPowerShortcutButtonCount() == 0
 			|| pt->getSpecialPowerShortcutWinName().isEmpty()
 			|| !player->isPlayerActive())
 		return;
@@ -3268,7 +3265,7 @@ void ControlBar::initSpecialPowershortcutBar( Player *player)
 	{
 		windowName.format( tempName, i+1 );
 		id = TheNameKeyGenerator->nameToKey( windowName.str() );
-		m_specialPowerShortcutButtons[ i ] = 
+		m_specialPowerShortcutButtons[ i ] =
 			TheWindowManager->winGetWindowFromId( m_specialPowerShortcutParent, id );
 		m_specialPowerShortcutButtons[ i ]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
 		// Oh god... this is a total hack for shortcut buttons to handle rendering text top left corner...
@@ -3276,9 +3273,9 @@ void ControlBar::initSpecialPowershortcutBar( Player *player)
 
 		windowName.format( parentName, i+1 );
 		id = TheNameKeyGenerator->nameToKey( windowName.str() );
-		m_specialPowerShortcutButtonParents[ i ] = 
+		m_specialPowerShortcutButtonParents[ i ] =
 			TheWindowManager->winGetWindowFromId( m_specialPowerShortcutParent, id );
-	}  // end for i
+	}
 
 }
 
@@ -3286,7 +3283,7 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 {
 	const CommandSet *commandSet;
 	Int i;
-	if(!player || !player->getPlayerTemplate() 
+	if(!player || !player->getPlayerTemplate()
 			|| !player->isLocalPlayer() || m_currentlyUsedSpecialPowersButtons == 0
 			|| m_specialPowerShortcutButtons == NULL || m_specialPowerShortcutButtonParents == NULL)
 		return;
@@ -3296,13 +3293,13 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 			m_specialPowerShortcutButtons[i]->winHide(TRUE);
 		if (m_specialPowerShortcutButtonParents[i])
 			m_specialPowerShortcutButtonParents[i]->winHide(TRUE);
-		
+
 	}
-	
+
 	// get command set
 	if(player->getPlayerTemplate()->getSpecialPowerShortcutCommandSet().isEmpty() )
 		return;
-	commandSet = TheControlBar->findCommandSet(player->getPlayerTemplate()->getSpecialPowerShortcutCommandSet()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
+	commandSet = findCommandSet(player->getPlayerTemplate()->getSpecialPowerShortcutCommandSet()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
 	if(!commandSet)
 		return;
 	// populate the button with commands defined
@@ -3321,7 +3318,7 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 			// hide window on interface
 			//m_specialPowerShortcutButtons[ i ]->winHide( TRUE );
 
-		}  // end if
+		}
 		else
 		{
 
@@ -3330,7 +3327,7 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 				const UpgradeTemplate *upgrade = commandButton->getUpgradeTemplate();
 				if( upgrade && !ThePlayerList->getLocalPlayer()->hasUpgradeComplete( upgrade->getUpgradeMask() ) )
 				{
-					//Kris: 8/13/03 - Don't show shortcut buttons that require upgrades we don't have. As far as 
+					//Kris: 8/13/03 - Don't show shortcut buttons that require upgrades we don't have. As far as
 					//I know, only the radar van scan has this. The MOAB is handled differently (sciences).
 					continue;
 				}
@@ -3376,7 +3373,7 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 						for( size_t scienceIndex = 0; scienceIndex < commandButton->getScienceVec().size(); ++scienceIndex )
 						{
 							science = commandButton->getScienceVec()[ scienceIndex ];
-							
+
 							//Keep going until we reach the end or don't have the required science!
 							if( player->hasScience( science ) )
 							{
@@ -3399,16 +3396,16 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 							Int i;
 
 							// get command set
-							if( !player || !player->getPlayerTemplate() 
+							if( !player || !player->getPlayerTemplate()
 									|| player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1().isEmpty()
 									|| player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3().isEmpty()
 									|| player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8().isEmpty() )
 							{
 								continue;
 							}
-							commandSet1 = TheControlBar->findCommandSet( player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1() ); 
-							commandSet3 = TheControlBar->findCommandSet( player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3() ); 
-							commandSet8 = TheControlBar->findCommandSet( player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8() ); 
+							commandSet1 = findCommandSet( player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1() );
+							commandSet3 = findCommandSet( player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3() );
+							commandSet8 = findCommandSet( player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8() );
 
 							if( !commandSet1 || !commandSet3 || !commandSet8 )
 							{
@@ -3476,7 +3473,7 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 						}
 					}
 				}
-			}  // end if			
+			}
 			else if( commandButton->getCommandType() == GUI_COMMAND_SELECT_ALL_UNITS_OF_TYPE )
 			{
 				//Make sure we actually have an object of type that we want to be able to select.
@@ -3498,10 +3495,10 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 			setControlCommand( m_specialPowerShortcutButtons[ currentButton ], commandButton );
 			GadgetButtonSetAltSound(m_specialPowerShortcutButtons[ currentButton ], "GUIGenShortcutClick");
 			currentButton++;
-					
-		}  // end else
 
-	}  // end for i
+		}
+
+	}
 	if(m_contextParent[ CP_MASTER ] && !m_contextParent[ CP_MASTER ]->winIsHidden() && m_specialPowerShortcutParent->winIsHidden())
 	{
 		showSpecialPowerShortcut();
@@ -3539,7 +3536,7 @@ Bool ControlBar::hasAnyShortcutSelection() const
 //-------------------------------------------------------------------------------------------------
 void ControlBar::updateSpecialPowerShortcut( void )
 {
-	if(!m_specialPowerShortcutParent || !m_specialPowerShortcutButtons 
+	if(!m_specialPowerShortcutParent || !m_specialPowerShortcutButtons
 	   || !ThePlayerList || !ThePlayerList->getLocalPlayer())
 		return;
 
@@ -3549,18 +3546,18 @@ void ControlBar::updateSpecialPowerShortcut( void )
 	Bool hasValidShortcutButton = hasShortcutSelectionButtons || hasAnyShortcutSpecialPower;
 
 	if( hasValidShortcutButton
-		  && m_specialPowerShortcutParent->winIsHidden() 
-			&& m_contextParent[ CP_MASTER ] 
+		  && m_specialPowerShortcutParent->winIsHidden()
+			&& m_contextParent[ CP_MASTER ]
 			&& !m_contextParent[ CP_MASTER ]->winIsHidden() )
 	{
 		showSpecialPowerShortcut();
 		animateSpecialPowerShortcut(TRUE);
 	}
-	else if( !hasValidShortcutButton 
-					 && !m_specialPowerShortcutParent->winIsHidden() 
+	else if( !hasValidShortcutButton
+					 && !m_specialPowerShortcutParent->winIsHidden()
 					 && m_animateWindowManagerForGenShortcuts->isFinished() )
 	{
-		animateSpecialPowerShortcut(FALSE);		
+		animateSpecialPowerShortcut(FALSE);
 	}
 
 	if(m_specialPowerShortcutParent->winIsHidden())
@@ -3592,14 +3589,14 @@ void ControlBar::updateSpecialPowerShortcut( void )
 
 		win->winClearStatus( WIN_STATUS_NOT_READY );
 		win->winClearStatus( WIN_STATUS_ALWAYS_COLOR );
-		
+
 
 		// is the command available
 
 		CommandAvailability availability = COMMAND_RESTRICTED;
 
 		const SpecialPowerTemplate *spTemplate = command->getSpecialPowerTemplate();
-		Object *obj = NULL; 
+		Object *obj = NULL;
 		if( spTemplate )
 		{
 			obj = ThePlayerList->getLocalPlayer()->findMostReadyShortcutSpecialPowerOfType( command->getSpecialPowerTemplate()->getSpecialPowerType() );
@@ -3620,7 +3617,7 @@ void ControlBar::updateSpecialPowerShortcut( void )
 				{
 					//Ugh... hacky.
 					//Look for a command button for a special power and if so, then get the command availability for it.
-					const CommandSet *commandSet = TheControlBar->findCommandSet( obj->getCommandSetString() );
+					const CommandSet *commandSet = findCommandSet( obj->getCommandSetString() );
 					if( commandSet )
 					{
 						for( Int commandIndex = 0; commandIndex < MAX_COMMANDS_PER_SET; commandIndex++ )
@@ -3690,7 +3687,7 @@ void ControlBar::drawSpecialPowerShortcutMultiplierText()
 				//m_shortcutDisplayStrings[ i ] = TheDisplayStringManager->newDisplayString();
 				//m_shortcutDisplayStrings[ i ]->setFont( TheFontLibrary->getFont( "Arial", 16, false ) );
 			}
-			
+
 			const SpecialPowerTemplate *spTemplate = command->getSpecialPowerTemplate();
 			Int numReady = 0;
 			if( spTemplate )
@@ -3701,7 +3698,7 @@ void ControlBar::drawSpecialPowerShortcutMultiplierText()
 			{
 				UnicodeString unibuffer;
 				unibuffer.format( L"%d", numReady );
-				
+
 				GadgetButtonSetText( win, unibuffer );
 
 				//m_shortcutDisplayStrings[ i ]->setText( unibuffer );
@@ -3735,7 +3732,7 @@ void ControlBar::animateSpecialPowerShortcut( Bool isOn )
 		return;
 
 	if(isOn)
-	{	
+	{
 		m_animateWindowManagerForGenShortcuts->reset();
 		m_animateWindowManagerForGenShortcuts->registerGameWindow(m_specialPowerShortcutParent,WIN_ANIMATION_SLIDE_RIGHT,TRUE,500,0);
 	}
@@ -3747,7 +3744,7 @@ void ControlBar::animateSpecialPowerShortcut( Bool isOn )
 
 void ControlBar::showSpecialPowerShortcut( void )
 {
-	if(TheScriptEngine->isGameEnding() || !m_specialPowerShortcutParent 
+	if(TheScriptEngine->isGameEnding() || !m_specialPowerShortcutParent
 		||!m_specialPowerShortcutButtons || !ThePlayerList || !ThePlayerList->getLocalPlayer())
 		return;
 	Bool dontAnimate = TRUE;
@@ -3763,14 +3760,24 @@ void ControlBar::showSpecialPowerShortcut( void )
 		return;
 	m_specialPowerShortcutParent->winHide(FALSE);
 	populateSpecialPowerShortcut(ThePlayerList->getLocalPlayer());
-		
+
 }
 
 void ControlBar::hideSpecialPowerShortcut( void )
 {
 	if(!m_specialPowerShortcutParent)
 		return;
-	
+
 	m_specialPowerShortcutParent->winHide(TRUE);
-		
+
+}
+
+void ControlBar::setFullViewportHeight()
+{
+	TheTacticalView->setHeight(TheDisplay->getHeight());
+}
+
+void ControlBar::setScaledViewportHeight()
+{
+	TheTacticalView->setHeight(TheDisplay->getHeight() * TheGlobalData->m_viewportHeightScale);
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
index 6f62f956557..9851cc03ff7 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/NameKeyGenerator.h"
 #include "Common/ThingTemplate.h"
@@ -81,14 +81,14 @@ void ControlBar::populateBeacon( Object *beacon )
 		if (buttonWin)
 			buttonWin->winHide(TRUE);
 	}
-}  // end populateBeacon
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void ControlBar::updateContextBeacon( void )
 {
 
-}  // end updateContextBeacon
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -103,4 +103,4 @@ WindowMsgHandledType BeaconWindowInput( GameWindow *window, UnsignedInt msg,
 
 	return MSG_IGNORED;
 
-}  // end InGameChatInput
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
index a61b3971774..ca67c21b7e4 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/NameKeyGenerator.h"
 #include "Common/ThingTemplate.h"
@@ -48,7 +48,6 @@
 #include "GameLogic/Module/TransportContain.h"
 #include "GameLogic/Module/MobNexusContain.h"
 #include "GameLogic/Module/SpecialAbilityUpdate.h"
-#include "GameLogic/Module/BattlePlanUpdate.h"
 #include "GameLogic/Module/VeterancyGainCreate.h"
 #include "GameLogic/Module/HackInternetAIUpdate.h"
 #include "GameLogic/Weapon.h"
@@ -60,11 +59,6 @@
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/GadgetPushButton.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 static GameWindow *commandWindows[ MAX_COMMANDS_PER_SET ];
@@ -99,15 +93,15 @@ void ControlBar::populateInvDataCallback( Object *obj, void *userData )
 	if( data->currIndex > data->maxIndex )
 	{
 
-		DEBUG_ASSERTCRASH( 0, ("There is not enough GUI slots to hold the # of items inside a '%s'\n", 
+		DEBUG_ASSERTCRASH( 0, ("There is not enough GUI slots to hold the # of items inside a '%s'",
 													data->transport->getTemplate()->getName().str()) );
 		return;
 
-	}  // end if
+	}
 
 	// get the window control that we're going to put our smiling faces in
 	GameWindow *control = data->controls[ data->currIndex ];
-	DEBUG_ASSERTCRASH( control, ("populateInvDataCallback: Control not found\n") );
+	DEBUG_ASSERTCRASH( control, ("populateInvDataCallback: Control not found") );
 
 	// assign our control and object id to the transport data
 	m_containData[ data->currIndex ].control = control;
@@ -132,7 +126,7 @@ void ControlBar::populateInvDataCallback( Object *obj, void *userData )
 	// enable the control
 	control->winEnable( TRUE );
 
-}  // end populateInvDataCallback
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Transports have an extra special manipulation of the user interface.  They get to look
@@ -149,14 +143,14 @@ void ControlBar::doTransportInventoryUI( Object *transport, const CommandSet *co
 {
 /// @todo srj -- remove hard-coding here, please
 	//static const CommandButton *exitCommand = findCommandButton( "Command_TransportExit" );
-		
+
 	// sanity
 	if( transport == NULL || commandSet == NULL )
 		return;
 
 	// get the transport contain module
 	ContainModuleInterface *contain = transport->getContain();
-	
+
 	// sanity
 	if( contain == NULL )
 		return;
@@ -209,14 +203,14 @@ void ControlBar::doTransportInventoryUI( Object *transport, const CommandSet *co
 
 			//Clear any potential veterancy rank, or else we'll see it when it's empty!
 			GadgetButtonDrawOverlayImage( m_commandWindows[ i ], NULL );
-			
+
 			//Unmanned vehicles don't have any commands available -- in fact they are hidden!
  			if( transport->isDisabledByType( DISABLED_UNMANNED ) )
  			{
  				m_commandWindows[ i ]->winHide( TRUE );
  			}
 
-      
+
      //  is this where we set the cameos disabled when container is subdued?
 
 			// if we've counted more UI spots than the transport can hold, hide this command window
@@ -229,10 +223,10 @@ void ControlBar::doTransportInventoryUI( Object *transport, const CommandSet *co
 			//
 			setControlCommand( m_commandWindows[ i ], commandButton );
 
-		}  // end if
+		}
+
+	}
 
-	}  // end for i
-	
 	// After Every change to the m_commandWIndows, we need to show fill in the missing blanks with the images
 	// removed from multiplayer branch
 	//showCommandMarkers();
@@ -252,7 +246,7 @@ void ControlBar::doTransportInventoryUI( Object *transport, const CommandSet *co
 		data.transport = transport;
 		contain->iterateContained( populateInvDataCallback, &data, FALSE );
 
-	}  // end if
+	}
 
 	//
 	// save the last recorded inventory count so we know when we have to redo the gui when
@@ -260,7 +254,7 @@ void ControlBar::doTransportInventoryUI( Object *transport, const CommandSet *co
 	//
 	m_lastRecordedInventoryCount = contain->getContainCount();
 
-}  // end doTransportInventoryUI
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -277,7 +271,7 @@ void ControlBar::populateCommand( Object *obj )
 	resetBuildQueueData();
 
 	// get command set
-	commandSet = TheControlBar->findCommandSet( obj->getCommandSetString() );
+	commandSet = findCommandSet( obj->getCommandSetString() );
 
 	// if no command set match is found hide all the buttons
 	if( commandSet == NULL )
@@ -293,7 +287,7 @@ void ControlBar::populateCommand( Object *obj )
 		// nothing left to do
 		return;
 
-	}  // end if
+	}
 
 	// transports do extra special things with the user interface buttons
 	if( obj->getContain()  &&  obj->getContain()->isDisplayedOnControlBar() )
@@ -316,7 +310,7 @@ void ControlBar::populateCommand( Object *obj )
 			// hide window on interface
 			m_commandWindows[ i ]->winHide( TRUE );
 
-		}  // end if
+		}
 		else
 		{
 
@@ -353,7 +347,7 @@ void ControlBar::populateCommand( Object *obj )
 
 					if( power && power->getRequiredScience() != SCIENCE_INVALID )
 					{
-						if( commandButton->getCommandType() != GUI_COMMAND_PURCHASE_SCIENCE && 
+						if( commandButton->getCommandType() != GUI_COMMAND_PURCHASE_SCIENCE &&
 								commandButton->getCommandType() != GUI_COMMAND_PLAYER_UPGRADE &&
 								commandButton->getCommandType() != GUI_COMMAND_OBJECT_UPGRADE )
 						{
@@ -372,7 +366,7 @@ void ControlBar::populateCommand( Object *obj )
 								for( size_t scienceIndex = 0; scienceIndex < commandButton->getScienceVec().size(); ++scienceIndex )
 								{
 									science = commandButton->getScienceVec()[ scienceIndex ];
-									
+
 									//Keep going until we reach the end or don't have the required science!
 									if( player->hasScience( science ) )
 									{
@@ -395,16 +389,16 @@ void ControlBar::populateCommand( Object *obj )
 									Int i;
 
 									// get command set
-									if( !player || !player->getPlayerTemplate() 
+									if( !player || !player->getPlayerTemplate()
 											|| player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1().isEmpty()
 											|| player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3().isEmpty()
 											|| player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8().isEmpty() )
 									{
 										continue;
 									}
-									commandSet1 = TheControlBar->findCommandSet( player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1() ); 
-									commandSet3 = TheControlBar->findCommandSet( player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3() ); 
-									commandSet8 = TheControlBar->findCommandSet( player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8() ); 
+									commandSet1 = findCommandSet( player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1() );
+									commandSet3 = findCommandSet( player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3() );
+									commandSet8 = findCommandSet( player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8() );
 
 									if( !commandSet1 || !commandSet3 || !commandSet8 )
 									{
@@ -474,13 +468,13 @@ void ControlBar::populateCommand( Object *obj )
 						}
 					}
 
-				}  // end if			
-						
-			}  // end else
+				}
+
+			}
 
-		}  // end else
+		}
 
-	}  // end for i
+	}
 
 	// After Every change to the m_commandWIndows, we need to show fill in the missing blanks with the images
 	// removed from multiplayer branch
@@ -497,11 +491,11 @@ void ControlBar::populateCommand( Object *obj )
 
 		//
 		// if a rally point is set, show the rally point, if we don't have it set hide any rally
-		// point we might have visible 
+		// point we might have visible
 		//
 		showRallyPoint( exit->getRallyPoint() );
 
-	}  // end if
+	}
 
 	//
 	// to avoid a one frame delay where windows may become enabled/disabled, run the update
@@ -509,7 +503,7 @@ void ControlBar::populateCommand( Object *obj )
 	//
 	updateContextCommand();
 
-}  // end populateCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 /** reset transport data */
@@ -524,9 +518,9 @@ void ControlBar::resetContainData( void )
 		m_containData[ i ].control = NULL;
 		m_containData[ i ].objectID = INVALID_ID;
 
-	}  // end for i
+	}
 
-}  // end resetTransportData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** reset the build queue data we use to die queue entires to control */
@@ -543,9 +537,9 @@ void ControlBar::resetBuildQueueData( void )
 		m_queueData[ i ].productionID = PRODUCTIONID_INVALID;
 		m_queueData[ i ].upgradeToResearch = NULL;
 
-	}  // end for i
+	}
 
-}  // end resetBuildQueue
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -569,15 +563,15 @@ void ControlBar::populateBuildQueue( Object *producer )
 
 		for( i = 0; i < MAX_BUILD_QUEUE_BUTTONS; i++ )
 		{
-			
+
 			buttonName.format( "ControlBar.wnd:ButtonQueue%02d", i + 1 );
 			buildQueueIDs[ i ] = TheNameKeyGenerator->nameToKey( buttonName );
 
-		}  // end for i
+		}
 
 		idsInitialized = TRUE;
 
-	}  // end if
+	}
 
 	// get window pointers to all the buttons for the build queue
 	for( i = 0; i < MAX_BUILD_QUEUE_BUTTONS; i++ )
@@ -595,12 +589,12 @@ void ControlBar::populateBuildQueue( Object *producer )
 		m_queueData[ i ].control->winClearStatus( WIN_STATUS_USE_OVERLAY_STATES );
 
 		// set the text of the window to nothing by default
-		GadgetButtonSetText( m_queueData[ i ].control, UnicodeString( L"" ) );
+		GadgetButtonSetText( m_queueData[ i ].control, L"" );
 
 		//Clear any potential veterancy rank, or else we'll see it when it's empty!
 		GadgetButtonDrawOverlayImage( m_queueData[ i ].control, NULL );
 
-	}  // end for i
+	}
 
 	// step through each object being built and set the image data for the buttons
 	ProductionUpdateInterface *pu = producer->getProductionUpdateInterface();
@@ -609,7 +603,7 @@ void ControlBar::populateBuildQueue( Object *producer )
 	const ProductionEntry *production;
 	Int windowIndex = 0;
 	const Image *image;
-	for( production = pu->firstProduction();	
+	for( production = pu->firstProduction();
 			 production;
 			 production = pu->nextProduction( production ) )
 	{
@@ -632,7 +626,7 @@ void ControlBar::populateBuildQueue( Object *producer )
 			m_queueData[ windowIndex ].control->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
 			image = production->getProductionObject()->getButtonImage();
 			GadgetButtonSetEnabledImage( m_queueData[ windowIndex ].control, image );
-			
+
 			//No longer used.
 			//image = TheMappedImageCollection->findImageByName( production->getProductionObject()->getInventoryImageName( INV_IMAGE_HILITE ) );
 			//GadgetButtonSetHiliteSelectedImage( m_queueData[ windowIndex ].control, image );
@@ -650,7 +644,7 @@ void ControlBar::populateBuildQueue( Object *producer )
 	//		image = TheMappedImageCollection->findImageByName( production->getProductionObject()->getInventoryImageName( INV_IMAGE_DISABLED ) );
 	//		GadgetButtonSetDisabledImage( m_queueData[ windowIndex ].control, image );
 
-		}  // end if
+		}
 		else
 		{
 			const UpgradeTemplate *ut = production->getProductionUpgrade();
@@ -665,7 +659,7 @@ void ControlBar::populateBuildQueue( Object *producer )
 			m_queueData[ windowIndex ].control->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
 			image = ut->getButtonImage();
 			GadgetButtonSetEnabledImage( m_queueData[ windowIndex ].control, image );
-			
+
 			//No longer used
 			//image = TheMappedImageCollection->findImageByName( ut->getQueueImageName( UpgradeTemplate::UPGRADE_HILITE ) );
 			//GadgetButtonSetHiliteSelectedImage( m_queueData[ windowIndex ].control, image );
@@ -679,12 +673,12 @@ void ControlBar::populateBuildQueue( Object *producer )
 	//		image = TheMappedImageCollection->findImageByName( ut->getQueueImageName( UpgradeTemplate::UPGRADE_DISABLED ) );
 	//		GadgetButtonSetDisabledImage( m_queueData[ windowIndex ].control, image );
 
-		}  // end else
+		}
 
 		// we have filled up this window now
 		windowIndex++;
 
-	}  // end for
+	}
 
 	//
 	// save the count of things being produced in the build queue, when it changes we will
@@ -692,7 +686,7 @@ void ControlBar::populateBuildQueue( Object *producer )
 	//
 	m_displayedQueueCount = pu->getProductionCount();
 
-}  // end populateBuildQueue
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -710,7 +704,7 @@ void ControlBar::updateContextCommand( void )
 	// we always to update the UI
 	//
 	ContainModuleInterface *contain = obj ? obj->getContain() : NULL;
-	if( contain && contain->getContainMax() > 0 && 
+	if( contain && contain->getContainMax() > 0 &&
 			m_lastRecordedInventoryCount != contain->getContainCount() )
 	{
 
@@ -719,8 +713,8 @@ void ControlBar::updateContextCommand( void )
 
 		// re-evaluate the UI because something has changed
 		evaluateContextUI();
-					
-	}  // end if, transport
+
+	}
 
 	// get production update for those objects that have one
 	ProductionUpdateInterface *pu = obj ? obj->getProductionUpdateInterface() : NULL;
@@ -744,9 +738,9 @@ void ControlBar::updateContextCommand( void )
 			m_contextParent[ CP_BUILD_QUEUE ]->winHide( FALSE );
 			populateBuildQueue( obj );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 
@@ -759,9 +753,9 @@ void ControlBar::updateContextCommand( void )
 			// show the portrait image
 			setPortraitByObject( obj );
 
-		}  // end if
+		}
 
-	}  // end else
+	}
 
 	// update a visible production queue
 	if( m_contextParent[ CP_BUILD_QUEUE ]->winIsHidden() == FALSE )
@@ -777,7 +771,7 @@ void ControlBar::updateContextCommand( void )
 		//
 		if( pu )
 		{
-		
+
 			// update the whole queue as necessary
 			if( pu->getProductionCount() != m_displayedQueueCount )
 				populateBuildQueue( obj );
@@ -791,20 +785,20 @@ void ControlBar::updateContextCommand( void )
 			{
 				static NameKeyType winID = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonQueue01" );
 				GameWindow *win = TheWindowManager->winGetWindowFromId( m_contextParent[ CP_BUILD_QUEUE ], winID );
-				
-				DEBUG_ASSERTCRASH( win, ("updateContextCommand: Unable to find first build queue button\n") );
+
+				DEBUG_ASSERTCRASH( win, ("updateContextCommand: Unable to find first build queue button") );
 				//				UnicodeString text;
 				//
 				//				text.format( L"%.0f%%", produce->getPercentComplete() );
 				//				GadgetButtonSetText( win, text );
-				
+
 				GadgetButtonDrawInverseClock(win,produce->getPercentComplete(), m_buildUpClockColor);
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// evaluate each command on whether or not it should be enabled
 	for( i = 0; i < MAX_COMMANDS_PER_SET; i++ )
@@ -819,7 +813,7 @@ void ControlBar::updateContextCommand( void )
 		win = m_commandWindows[ i ];
 
 		// only consider commands for windows that are actually shown
-		//`tbd: fix the bug here, that is that if we don't change the unit, we won't attempt to show 
+		//`tbd: fix the bug here, that is that if we don't change the unit, we won't attempt to show
 		// these.
 		if( win->winIsHidden() == TRUE )
 			continue;
@@ -832,7 +826,7 @@ void ControlBar::updateContextCommand( void )
 
 
 // LORENZEN COMMENTED THIS OUT 8/11
-    // Reason: ExitCameos can be greyed out when the container object gets subdued 
+    // Reason: ExitCameos can be greyed out when the container object gets subdued
 
 //		// ignore transport/structure inventory commands, they are handled elsewhere
 //		if( command->getCommandType() == GUI_COMMAND_EXIT_CONTAINER )
@@ -870,7 +864,7 @@ void ControlBar::updateContextCommand( void )
 				win->winEnable( TRUE );
 				break;
 		}
-  
+
 		//Determine by the production type of this button, whether or not the created object
 		//will have a veterancy rank
 		if( command->getCommandType() != GUI_COMMAND_EXIT_CONTAINER )
@@ -879,7 +873,7 @@ void ControlBar::updateContextCommand( void )
 			const Image *image = calculateVeterancyOverlayForThing( command->getThingTemplate() );
 			GadgetButtonDrawOverlayImage( win, image );
 		}
-    
+
 		//
 		// for check-like commands we will keep the push button "pushed" or "unpushed" depending
 		// on the current running status of the command
@@ -888,8 +882,8 @@ void ControlBar::updateContextCommand( void )
 		{
 
 			// sanity, check like commands should have windows that are check like as well
-			DEBUG_ASSERTCRASH( BitIsSet( win->winGetStatus(), WIN_STATUS_CHECK_LIKE ),	
-												 ("updateContextCommand: Error, gadget window for command '%s' is not check-like!\n",
+			DEBUG_ASSERTCRASH( BitIsSet( win->winGetStatus(), WIN_STATUS_CHECK_LIKE ),
+												 ("updateContextCommand: Error, gadget window for command '%s' is not check-like!",
 												 command->getName().str()) );
 
 			if( availability == COMMAND_ACTIVE )
@@ -897,18 +891,18 @@ void ControlBar::updateContextCommand( void )
 			else
 				GadgetCheckLikeButtonSetVisualCheck( win, FALSE );
 
-		}  // end if
+		}
+
+	}
 
-	}  // end for i
-	
 	// After Every change to the m_commandWIndows, we need to show fill in the missing blanks with the images
 	// removed from multiplayer branch
 	//showCommandMarkers();
 
 //	// if we have a build tooltip layout, update it with the new data.
-//	repopulateBuildTooltipLayout(); 
+//	repopulateBuildTooltipLayout();
 
-}  // end updatecontextCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 const Image* ControlBar::calculateVeterancyOverlayForThing( const ThingTemplate *thingTemplate )
@@ -940,7 +934,7 @@ const Image* ControlBar::calculateVeterancyOverlayForThing( const ThingTemplate
 
 			//It does, so see if the player has that upgrade
 			if( data )
-			{ 
+			{
 				//If no science is specified, he gets it automatically (or check the science).
 				if( data->m_scienceRequired == SCIENCE_INVALID || player->hasScience( data->m_scienceRequired ) )
 				{
@@ -964,7 +958,7 @@ const Image* ControlBar::calculateVeterancyOverlayForThing( const ThingTemplate
 		case LEVEL_HEROIC:
 			return m_rankHeroicIcon;
 	}
-	return NULL;;
+	return NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -986,7 +980,7 @@ const Image* ControlBar::calculateVeterancyOverlayForObject( const Object *obj )
 		case LEVEL_HEROIC:
 			return m_rankHeroicIcon;
 	}
-	return NULL;;
+	return NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1011,13 +1005,13 @@ static Int getRappellerCount(Object* obj)
 /** What's the status between 'obj' and the 'command' at present.  Can we do it?  Are
 	* we already doing it?  Can ya dig it? */
 //-------------------------------------------------------------------------------------------------
-CommandAvailability ControlBar::getCommandAvailability( const CommandButton *command, 
-																												Object *obj, 
+CommandAvailability ControlBar::getCommandAvailability( const CommandButton *command,
+																												Object *obj,
 																												GameWindow *win,
 																												GameWindow *applyToWin,
 																												Bool forceDisabledEvaluation ) const
 {
-	if(	command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT 
+	if(	command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT
 			|| command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_CONSTRUCT_FROM_SHORTCUT )
 	{
 		if (ThePlayerList && ThePlayerList->getLocalPlayer())
@@ -1043,7 +1037,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 		// if the object status is disabled or unpowered, you cannot do anything to it.
 		return COMMAND_HIDDEN;
 	}
-	
+
 	//Unmanned vehicles don't have any commands available -- in fact they are hidden!
  	if( obj->isDisabledByType( DISABLED_UNMANNED ) )
  	{
@@ -1055,7 +1049,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 	{
 		return COMMAND_RESTRICTED;
 	}
-	
+
 	if( BitIsSet( command->getOptions(), MUST_BE_STOPPED ) )
 	{
 		//This button can only be activated when the unit isn't moving!
@@ -1065,13 +1059,13 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			return COMMAND_RESTRICTED;
 		}
 	}
- 
+
 	//Other disabled objects are unable to use buttons -- so gray them out.
 	Bool disabled = obj->isDisabled();
-	
+
 	// if we are only disabled by being underpowered, and this button doesn't care, well, fix it
 	if (disabled
-			&& BitIsSet(command->getOptions(), IGNORES_UNDERPOWERED) 
+			&& BitIsSet(command->getOptions(), IGNORES_UNDERPOWERED)
 			&& obj->getDisabledFlags().test(DISABLED_UNDERPOWERED)
 			&& obj->getDisabledFlags().count() == 1)
 	{
@@ -1082,12 +1076,12 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
  	{
 
 		GUICommandType commandType = command->getCommandType();
-		if( commandType != GUI_COMMAND_SELL && 
+		if( commandType != GUI_COMMAND_SELL &&
 				commandType != GUI_COMMAND_EVACUATE &&
-				commandType != GUI_COMMAND_EXIT_CONTAINER && 
-				commandType != GUI_COMMAND_BEACON_DELETE && 
-				commandType != GUI_COMMAND_SET_RALLY_POINT && 
-				commandType != GUI_COMMAND_STOP && 
+				commandType != GUI_COMMAND_EXIT_CONTAINER &&
+				commandType != GUI_COMMAND_BEACON_DELETE &&
+				commandType != GUI_COMMAND_SET_RALLY_POINT &&
+				commandType != GUI_COMMAND_STOP &&
 				commandType != GUI_COMMAND_SWITCH_WEAPON )
 		{
 			if( getCommandAvailability( command, obj, win, applyToWin, TRUE ) == COMMAND_HIDDEN )
@@ -1110,7 +1104,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 				if( player->hasUpgradeComplete( upgradeT ) == FALSE )
 					return COMMAND_RESTRICTED;
 			}
-			else if( upgradeT->getUpgradeType() == UPGRADE_TYPE_OBJECT && 
+			else if( upgradeT->getUpgradeType() == UPGRADE_TYPE_OBJECT &&
 							 obj->hasUpgrade( upgradeT ) == FALSE )
 			{
 				return COMMAND_RESTRICTED;
@@ -1160,7 +1154,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			// if building anything at all right now we can't build another
 			if( dozerAI->isTaskPending( DOZER_TASK_BUILD ) == TRUE )
 				return COMMAND_RESTRICTED;
-			
+
 			// return whether or not the player can build this thing
 			if( player->canBuild( whatToBuild ) == FALSE )
 				return COMMAND_RESTRICTED;
@@ -1169,10 +1163,10 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			{
 				return COMMAND_RESTRICTED;//COMMAND_CANT_AFFORD;
 			}
-      
+
 
 			break;
-		}  
+		}
 
 		case GUI_COMMAND_SELL:
 		{
@@ -1220,7 +1214,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			}
 
 			break;
-		}  
+		}
 
 		case GUI_COMMAND_PLAYER_UPGRADE:
 		{
@@ -1246,7 +1240,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 				}
 			}
 			break;
-		} 
+		}
 
 		case GUI_COMMAND_OBJECT_UPGRADE:
 		{
@@ -1282,7 +1276,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 				}
 			}
 			break;
-		} 
+		}
 
 		case GUI_COMMAND_FIRE_WEAPON:
 		{
@@ -1297,9 +1291,9 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 
 			// changed this to Log rather than Crash, because this can legitimately happen now for
 			// dozers and workers with mine-clearing stuff... (srj)
-			//DEBUG_ASSERTLOG( w, ("Unit %s's CommandButton %s is trying to access weaponslot %d, but doesn't have a weapon there in its FactionUnit ini entry.\n", 
+			//DEBUG_ASSERTLOG( w, ("Unit %s's CommandButton %s is trying to access weaponslot %d, but doesn't have a weapon there in its FactionUnit ini entry.",
 			//	obj->getTemplate()->getName().str(), command->getName().str(), (Int)command->getWeaponSlot() ) );
-			
+
 			UnsignedInt now = TheGameLogic->getFrame();
 
 			/// @Kris -- We need to show the button as always available for anything with a 0 clip reload time.
@@ -1314,9 +1308,9 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 /// @todo srj -- not sure why this next check is necessary, but the Comanche missile buttons will flicker without it. figure out someday.
 /// @todo ml  -- and note: that the "now-1" below causes zero-clip-reload weapons to never be ready, so I added this
 /// If you make changes to this code, make sure that the DragonTank's firewall weapon can be retargeted while active,
-/// that is, while the tank is squirting out flames all over the floor, you can click the firewall button (or "F"), 
-/// and re-target the firewall without having to stop or move in-betwen.. Thanks for reading 
-				|| (w->getPossibleNextShotFrame()==now-1) 	
+/// that is, while the tank is squirting out flames all over the floor, you can click the firewall button (or "F"),
+/// and re-target the firewall without having to stop or move in-betwen.. Thanks for reading
+				|| (w->getPossibleNextShotFrame()==now-1)
 				)
 			{
 				if ( w != NULL )
@@ -1344,7 +1338,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 					// no weapon in the slot means "gray me out"
 					return COMMAND_RESTRICTED;
 				}
-			} 
+			}
 
 			break;
 		}
@@ -1353,7 +1347,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 		case GUI_COMMAND_GUARD_WITHOUT_PURSUIT:
 		case GUI_COMMAND_GUARD_FLYING_UNITS_ONLY:
 			// always available
-			break;	
+			break;
 
 		case GUI_COMMAND_COMBATDROP:
 		{
@@ -1364,7 +1358,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 
 		case GUI_COMMAND_EXIT_CONTAINER:
 		{
-			
+
 			//
 			// this method is really used as a per frame update to see if we should enable
 			// disable a control ... inventory of objects shows as buttons have that enable
@@ -1377,7 +1371,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
         return COMMAND_RESTRICTED;
 
 			break;
-		} 
+		}
 
 		case GUI_COMMAND_EVACUATE:
 		{
@@ -1391,7 +1385,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 
 
 			break;
-		}  
+		}
 
 		case GUI_COMMAND_EXECUTE_RAILED_TRANSPORT:
 		{
@@ -1401,7 +1395,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			if( dui == NULL || dui->isDockOpen() == FALSE )
 				return COMMAND_RESTRICTED;
 			break;
-		}  
+		}
 
 		case GUI_COMMAND_SPECIAL_POWER:
 		case GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT:
@@ -1410,7 +1404,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 		{
 			// sanity
 			DEBUG_ASSERTCRASH( command->getSpecialPowerTemplate() != NULL,
-												 ("The special power in the command '%s' is NULL\n", command->getName().str()) );
+												 ("The special power in the command '%s' is NULL", command->getName().str()) );
 			// get special power module from the object to execute it
 			SpecialPowerModuleInterface *mod = obj->getSpecialPowerModule( command->getSpecialPowerTemplate() );
 
@@ -1418,9 +1412,9 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			{
 				// sanity ... we must have a module for the special power, if we don't somebody probably
 				// forgot to put it in the object
-				DEBUG_CRASH(( "Object %s does not contain special power module (%s) to execute.  Did you forget to add it to the object INI?\n",
+				DEBUG_CRASH(( "Object %s does not contain special power module (%s) to execute.  Did you forget to add it to the object INI?",
 											obj->getTemplate()->getName().str(), command->getSpecialPowerTemplate()->getName().str() ));
-			} 
+			}
 			else if( mod->isReady() == FALSE )
 			{
 				Int percent =  mod->getPercentReady() * 100;
@@ -1446,7 +1440,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			}
 
 			break;
-		}  
+		}
 
 		case GUI_COMMAND_TOGGLE_OVERCHARGE:
 		{
@@ -1460,10 +1454,10 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 				{
 					if( obi->isOverchargeActive() )
 						return COMMAND_ACTIVE;
-				} 
-			}  
+				}
+			}
 			break;
-		} 
+		}
 
 		// switch weapon command
 		case GUI_COMMAND_SWITCH_WEAPON:
@@ -1471,9 +1465,9 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			// ask the ai which weapon is in the current slot
 			const Weapon* w = obj->getWeaponInWeaponSlot( command->getWeaponSlot() );
 
-			DEBUG_ASSERTCRASH( w, ("Unit %s's CommandButton %s is trying to access weaponslot %d, but doesn't have a weapon there in its FactionUnit ini entry.", 
+			DEBUG_ASSERTCRASH( w, ("Unit %s's CommandButton %s is trying to access weaponslot %d, but doesn't have a weapon there in its FactionUnit ini entry.",
 				obj->getTemplate()->getName().str(), command->getName().str(), (Int)command->getWeaponSlot() ) );
-			
+
 			if( w == NULL)
 				return COMMAND_RESTRICTED;
 
@@ -1488,10 +1482,10 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 						return COMMAND_AVAILABLE;
 				}
 			}
-			
+
 			return COMMAND_ACTIVE;
 		}
-		
+
 		case GUI_COMMAND_HACK_INTERNET:
 		{
 			AIUpdateInterface *ai = obj->getAI();
@@ -1505,7 +1499,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			}
 			return COMMAND_AVAILABLE;
 		}
-		
+
 		case GUI_COMMAND_STOP:
 		{
 			if( !BitIsSet( command->getOptions(), OPTION_ONE ) )
@@ -1523,16 +1517,16 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			}
 			return COMMAND_AVAILABLE;
 		}
-		
+
 		case GUI_COMMAND_SELECT_ALL_UNITS_OF_TYPE:
 		{
 			//We can *always* select a unit :)
 			return COMMAND_AVAILABLE;
 		}
 	}
-	
+
 	// all is well with the command
 	return COMMAND_AVAILABLE;
 
-}  // end getCommandAvailability
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
index a5a3e5fedab..37261a151d3 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BuildAssistant.h"
 #include "Common/Money.h"
@@ -56,11 +56,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/ProductionUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
@@ -106,17 +101,17 @@ CBCommandStatus ControlBar::processCommandTransitionUI( GameWindow *control, Gad
 {
 	// sanity, we won't process messages if we have no source object
 	if( m_currContext != CB_CONTEXT_MULTI_SELECT &&
-			(m_currentSelectedDrawable == NULL || 
+			(m_currentSelectedDrawable == NULL ||
 			 m_currentSelectedDrawable->getObject() == NULL) )
 	{
 
-		if( m_currContext != CB_CONTEXT_NONE && 
-				m_currContext != CB_CONTEXT_OBSERVER_INFO && 
+		if( m_currContext != CB_CONTEXT_NONE &&
+				m_currContext != CB_CONTEXT_OBSERVER_INFO &&
 				m_currContext != CB_CONTEXT_OBSERVER_LIST)
 			switchToContext( CB_CONTEXT_NONE, NULL );
 		return CBC_COMMAND_NOT_USED;
 
-	}  // end if
+	}
 
 	return CBC_COMMAND_USED;
 
@@ -126,7 +121,7 @@ CBCommandStatus ControlBar::processCommandTransitionUI( GameWindow *control, Gad
 /** Process a button selected message from the window system that should be for one of
 	* our GUI commands */
 //-------------------------------------------------------------------------------------------------
-CBCommandStatus ControlBar::processCommandUI( GameWindow *control, 
+CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 																							GadgetGameMessage gadgetMessage )
 {
 	// get the command pointer from the control user data we put in the button
@@ -137,13 +132,13 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 		return CBC_COMMAND_NOT_USED;
 	}
 
-	// sanity, we won't process messages if we have no source object, 
+	// sanity, we won't process messages if we have no source object,
 	// unless we're CB_CONTEXT_PURCHASE_SCIENCE or GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT
 	if( m_currContext != CB_CONTEXT_MULTI_SELECT &&
 			commandButton->getCommandType() != GUI_COMMAND_PURCHASE_SCIENCE &&
 			commandButton->getCommandType() != GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT &&
 			commandButton->getCommandType() != GUI_COMMAND_SPECIAL_POWER_CONSTRUCT_FROM_SHORTCUT &&
-			commandButton->getCommandType() != GUI_COMMAND_SELECT_ALL_UNITS_OF_TYPE && 
+			commandButton->getCommandType() != GUI_COMMAND_SELECT_ALL_UNITS_OF_TYPE &&
 			(m_currentSelectedDrawable == NULL || m_currentSelectedDrawable->getObject() == NULL) )
 	{
 
@@ -151,7 +146,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			switchToContext( CB_CONTEXT_NONE, NULL );
 		return CBC_COMMAND_NOT_USED;
 
-	}  // end if
+	}
 
 	// sanity
 	if( control == NULL )
@@ -161,27 +156,27 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 	if( control->winGetInputFunc() != GadgetPushButtonInput )
 		return CBC_COMMAND_NOT_USED;
 
-	
+
 	if( commandButton == NULL )
 		return CBC_COMMAND_NOT_USED;
 
 	// if the button is flashing, tell it to stop flashing
 	commandButton->setFlashCount(0);
-	TheControlBar->setFlash( FALSE );
+	setFlash( FALSE );
 
 	if( commandButton->getCommandType() != GUI_COMMAND_EXIT_CONTAINER )
 	{
 		GadgetButtonSetEnabledImage( control, commandButton->getButtonImage() );
 	}
-	
+
 	//
 	// get the object that is driving the context sensitive UI if we're not in a multi
 	// select context
 	//
 	Object *obj = NULL;
-	if( m_currContext != CB_CONTEXT_MULTI_SELECT && 
+	if( m_currContext != CB_CONTEXT_MULTI_SELECT &&
 			commandButton->getCommandType() != GUI_COMMAND_PURCHASE_SCIENCE &&
-			commandButton->getCommandType() != GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT && 
+			commandButton->getCommandType() != GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT &&
 			commandButton->getCommandType() != GUI_COMMAND_SPECIAL_POWER_CONSTRUCT_FROM_SHORTCUT &&
 			commandButton->getCommandType() != GUI_COMMAND_SELECT_ALL_UNITS_OF_TYPE )
 		obj = m_currentSelectedDrawable->getObject();
@@ -224,11 +219,11 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 		//I've added support for specific context sensitive commands which need targets just like
 		//other options may need. When we need a target, the user must move the cursor to a position
 		//where he wants the GUI command to take place. Older commands such as napalm strikes or daisy
-		//cutter drops simply needed the user to click anywhere he desired. 
+		//cutter drops simply needed the user to click anywhere he desired.
 		//
-		//Now, we have new commands that will only work when the user clicks on valid targets to interact 
-		//with. For example, the terrorist can jack a car and convert it into a carbomb, but he has to 
-		//click on a valid car. In this case the doCommandOrHint code will determine if the mode is valid 
+		//Now, we have new commands that will only work when the user clicks on valid targets to interact
+		//with. For example, the terrorist can jack a car and convert it into a carbomb, but he has to
+		//click on a valid car. In this case the doCommandOrHint code will determine if the mode is valid
 		//or not and the cursor modes will be set appropriately.
 		TheInGameUI->setGUICommand( commandButton );
 	}
@@ -253,7 +248,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				TheEva->setShouldPlay(EVA_InsufficientFunds);
 				TheInGameUI->message( "GUI:NotEnoughMoneyToBuild" );
 				break;
-			} 
+			}
 			else if (cmt == CANMAKE_QUEUE_FULL)
 			{
 				TheInGameUI->message( "GUI:ProductionQueueFull" );
@@ -268,14 +263,14 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			{
 				TheInGameUI->message( "GUI:UnitMaxedOut" );
 				break;
-			} 
+			}
 
 			// tell the UI that we want to build something so we get a building at the cursor
 			TheInGameUI->placeBuildAvailable( commandButton->getThingTemplate(), m_currentSelectedDrawable );
 
 			break;
 
-		}  // end dozer construct
+		}
 
 
 		case GUI_COMMAND_SPECIAL_POWER_CONSTRUCT_FROM_SHORTCUT:
@@ -296,7 +291,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				TheEva->setShouldPlay(EVA_InsufficientFunds);
 				TheInGameUI->message( "GUI:NotEnoughMoneyToBuild" );
 				break;
-			} 
+			}
 			else if (cmt == CANMAKE_QUEUE_FULL)
 			{
 				TheInGameUI->message( "GUI:ProductionQueueFull" );
@@ -311,11 +306,11 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			{
 				TheInGameUI->message( "GUI:UnitMaxedOut" );
 				break;
-			} 
+			}
 
 			// tell the UI that we want to build something so we get a building at the cursor
 			TheInGameUI->placeBuildAvailable( commandButton->getThingTemplate(), draw );
-		
+
 			ProductionUpdateInterface* pu = obj->getProductionUpdateInterface();
 			if( pu )
 			{
@@ -338,7 +333,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				TheEva->setShouldPlay(EVA_InsufficientFunds);
 				TheInGameUI->message( "GUI:NotEnoughMoneyToBuild" );
 				break;
-			} 
+			}
 			else if (cmt == CANMAKE_QUEUE_FULL)
 			{
 				TheInGameUI->message( "GUI:ProductionQueueFull" );
@@ -353,7 +348,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			{
 				TheInGameUI->message( "GUI:UnitMaxedOut" );
 				break;
-			} 
+			}
 
 			// tell the UI that we want to build something so we get a building at the cursor
 			TheInGameUI->placeBuildAvailable( commandButton->getThingTemplate(), m_currentSelectedDrawable );
@@ -366,7 +361,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end dozer construct
+		}
 
 
 
@@ -388,7 +383,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end cancel dozer construction
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_UNIT_BUILD:
@@ -402,9 +397,9 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				break;
 
 			// sanity, we must have something to build
-			DEBUG_ASSERTCRASH( whatToBuild, ("Undefined BUILD command for object '%s'\n", 
+			DEBUG_ASSERTCRASH( whatToBuild, ("Undefined BUILD command for object '%s'",
 												 commandButton->getThingTemplate()->getName().str()) );
-			
+
 			CanMakeType cmt = TheBuildAssistant->canMakeUnit(factory, whatToBuild);
 
 			if (cmt == CANMAKE_NO_MONEY)
@@ -412,7 +407,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				TheEva->setShouldPlay(EVA_InsufficientFunds);
 				TheInGameUI->message( "GUI:NotEnoughMoneyToBuild" );
 				break;
-			} 
+			}
 			else if (cmt == CANMAKE_QUEUE_FULL)
 			{
 				TheInGameUI->message( "GUI:ProductionQueueFull" );
@@ -427,11 +422,11 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			{
 				TheInGameUI->message( "GUI:UnitMaxedOut" );
 				break;
-			} 
+			}
 			else if (cmt != CANMAKE_OK)
 			{
-				DEBUG_ASSERTCRASH( 0, ("Cannot create '%s' because the factory object '%s' returns false for canMakeUnit\n", 
-																whatToBuild->getName().str(), 
+				DEBUG_ASSERTCRASH( 0, ("Cannot create '%s' because the factory object '%s' returns false for canMakeUnit",
+																whatToBuild->getName().str(),
 																factory->getTemplate()->getName().str()) );
 				break;
 			}
@@ -443,13 +438,13 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			if( pu == NULL )
 			{
 
-				DEBUG_ASSERTCRASH( 0, ("Cannot create '%s' because the factory object '%s' is not capable of producting units\n", 
-																whatToBuild->getName().str(), 
+				DEBUG_ASSERTCRASH( 0, ("Cannot create '%s' because the factory object '%s' is not capable of producting units",
+																whatToBuild->getName().str(),
 																factory->getTemplate()->getName().str()) );
 				break;
 
-			}  // end if
-			
+			}
+
 			// get a new production id to assign to this
 			ProductionID productionID = pu->requestUniqueUnitID();
 
@@ -461,8 +456,8 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end build unit
-		
+		}
+
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_CANCEL_UNIT_BUILD:
 		{
@@ -477,10 +472,10 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			if( i == MAX_BUILD_QUEUE_BUTTONS )
 			{
 
-				DEBUG_ASSERTCRASH( 0, ("Control not found in build queue data\n") );
+				DEBUG_ASSERTCRASH( 0, ("Control not found in build queue data") );
 				break;
 
-			}  // end if
+			}
 
 			// sanity
 			if( m_queueData[ i ].type != PRODUCTION_UNIT )
@@ -504,13 +499,13 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end cancel unit build
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_PLAYER_UPGRADE:
 		{
 			const UpgradeTemplate *upgradeT = commandButton->getUpgradeTemplate();
-			DEBUG_ASSERTCRASH( upgradeT, ("Undefined upgrade '%s' in player upgrade command\n", "UNKNOWN") );
+			DEBUG_ASSERTCRASH( upgradeT, ("Undefined upgrade '%s' in player upgrade command", "UNKNOWN") );
 
 			// sanity
 			if( obj == NULL || upgradeT == NULL )
@@ -540,13 +535,13 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // command player upgrade
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_OBJECT_UPGRADE:
 		{
 			const UpgradeTemplate *upgradeT = commandButton->getUpgradeTemplate();
-			DEBUG_ASSERTCRASH( upgradeT, ("Undefined upgrade '%s' in object upgrade command\n", "UNKNOWN") );
+			DEBUG_ASSERTCRASH( upgradeT, ("Undefined upgrade '%s' in object upgrade command", "UNKNOWN") );
 			// sanity
 			if( upgradeT == NULL )
 				break;
@@ -585,7 +580,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end object upgrade
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_CANCEL_UPGRADE:
@@ -601,10 +596,10 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			if( i == MAX_BUILD_QUEUE_BUTTONS )
 			{
 
-				DEBUG_ASSERTCRASH( 0, ("Control not found in build queue data\n") );
+				DEBUG_ASSERTCRASH( 0, ("Control not found in build queue data") );
 				break;
 
-			}  // end if
+			}
 
 			// sanity
 			if( m_queueData[ i ].type != PRODUCTION_UPGRADE )
@@ -626,7 +621,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end cancel upgrade
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_ATTACK_MOVE:
@@ -672,7 +667,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_WAYPOINTS:
 			break;
@@ -702,7 +697,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			// get the actual object
 			Object *objWantingExit = TheGameLogic->findObjectByID( objID );
-			
+
 			// if the control container returns an object ID but the object is not found, remove the control entry and exit
 			if( objWantingExit == NULL )
 			{
@@ -716,7 +711,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				m_containData[ i ].objectID = INVALID_ID;
 				break;  // exit case
 
-			}  // end if
+			}
 
       //what if container is subdued... assert a logic failure, perhaps?
 
@@ -726,7 +721,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end transport exit
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_EVACUATE:
@@ -738,16 +733,16 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_EVACUATE );
 				TheMessageStream->appendMessage( GameMessage::MSG_EVACUATE );
 			}
-			
+
 			break;
-		}  // end evacuate
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GUI_COMMAND_EXECUTE_RAILED_TRANSPORT:
 		{
 			TheMessageStream->appendMessage( GameMessage::MSG_EXECUTE_RAILED_TRANSPORT );
 			break;
-		}  // end execute railed transport
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GUI_COMMAND_HACK_INTERNET:
@@ -762,7 +757,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 		{
 			break;
 
-		}  // end set rally point
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_SELL:
@@ -772,7 +767,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			TheMessageStream->appendMessage( GameMessage::MSG_SELL );
 			break;
 
-		}  // end sell
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GUI_COMMAND_TOGGLE_OVERCHARGE:
@@ -781,7 +776,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			TheMessageStream->appendMessage( GameMessage::MSG_TOGGLE_OVERCHARGE );
 			break;
 
-		}  // end overcharge
+		}
 
 #ifdef ALLOW_SURRENDER
 		// ------------------------------------------------------------------------------------------------
@@ -791,7 +786,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			TheMessageStream->appendMessage( GameMessage::MSG_RETURN_TO_PRISON );
 			break;
 
-		}  // end return to prison
+		}
 #endif
 
 		//---------------------------------------------------------------------------------------------
@@ -800,7 +795,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end delete beacon
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_GUARD:
@@ -838,7 +833,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			break;
 
-		}  // end fire weapon
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT:
@@ -857,7 +852,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			msg->appendObjectIDArgument( obj->getID() );
 			break;
 
-		}  // end special weapon
+		}
 
 		case GUI_COMMAND_SPECIAL_POWER:
 		{
@@ -868,7 +863,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 			msg->appendObjectIDArgument( INVALID_ID );	// no specific source
 			break;
 
-		}  // end special weapon
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GUI_COMMAND_PURCHASE_SCIENCE:
@@ -876,7 +871,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 
 			// loop through all the sciences on the button and select the one we don't have
 
-			ScienceType	st = SCIENCE_INVALID; 
+			ScienceType	st = SCIENCE_INVALID;
 			Player *player = ThePlayerList->getLocalPlayer();
 			for(size_t i = 0; i < commandButton->getScienceVec().size(); ++i)
 			{
@@ -886,32 +881,32 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 					break;
 				}
 			}
-			
+
 			if( st == SCIENCE_INVALID)
 			{
 				switchToContext( CB_CONTEXT_NONE, NULL );
 				break;
 			}
-			
-		
+
+
 			GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_PURCHASE_SCIENCE );
 			msg->appendIntegerArgument( st );
-			
+
 			markUIDirty();
 
 			break;
 
-		}  // end pick specialized science
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 
-			DEBUG_ASSERTCRASH( 0, ("Unknown command '%d'\n", commandButton->getCommandType()) );
+			DEBUG_ASSERTCRASH( 0, ("Unknown command '%d'", commandButton->getCommandType()) );
 			return CBC_COMMAND_NOT_USED;
 
-	}  // end switch
+	}
 
 	return CBC_COMMAND_USED;
 
-}  // end processCommandUI
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
index daa7176c157..4ba7345e650 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "GameClient/ControlBar.h"
@@ -40,11 +40,6 @@
 #include "GameClient/InGameUI.h"
 #include "GameLogic/Object.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
@@ -62,7 +57,7 @@ void ControlBar::resetCommonCommandData( void )
 		GadgetButtonDrawOverlayImage( m_commandWindows[ i ], NULL );
 	}
 
-}  // end resetCommonCommandData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** add the common commands of this drawable to the common command set */
@@ -104,11 +99,11 @@ void ControlBar::addCommonCommands( Drawable *draw, Bool firstDrawable )
 	// removed from multiplayer branch
 			//showCommandMarkers();
 
-		}  // end for i
+		}
 
 		return;
 
-	}  // end if
+	}
 
 
 	//
@@ -141,25 +136,25 @@ void ControlBar::addCommonCommands( Drawable *draw, Bool firstDrawable )
 				// set the command into the control
 				setControlCommand( m_commandWindows[ i ], command );
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 	else
 	{
 
 		// go through each command one by one
 		for( i = 0; i < MAX_COMMANDS_PER_SET; i++ )
 		{
-		
+
 			// our implementation doesn't necessarily make use of the max possible command buttons
 			if (! m_commandWindows[ i ]) continue;
 
 			// get the command
 			command = commandSet->getCommandButton(i);
-					
-			Bool attackMove = (command && command->getCommandType() == GUI_COMMAND_ATTACK_MOVE) || 
+
+			Bool attackMove = (command && command->getCommandType() == GUI_COMMAND_ATTACK_MOVE) ||
 												(m_commonCommands[ i ] && m_commonCommands[ i ]->getCommandType() == GUI_COMMAND_ATTACK_MOVE);
 
 			// Kris: When any units have attack move, they all get it. This is to allow
@@ -194,15 +189,15 @@ void ControlBar::addCommonCommands( Drawable *draw, Bool firstDrawable )
 				m_commandWindows[ i ]->winHide( TRUE );
 			}
 
-		}  // end if
+		}
 
-	}  // end else
+	}
 
 	// After Every change to the m_commandWIndows, we need to show fill in the missing blanks with the images
 	// removed from multiplayer branch
 	//showCommandMarkers();
 
-}  // end addCommonCommands
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Populate the visible command bar with commands that are common to all the objects
@@ -230,24 +225,24 @@ void ControlBar::populateMultiSelect( void )
 
 	// sanity
 	DEBUG_ASSERTCRASH( TheInGameUI->getSelectCount() > 1,
-										 ("populateMultiSelect: Can't populate multiselect context cause there are only '%d' things selected\n",
+										 ("populateMultiSelect: Can't populate multiselect context cause there are only '%d' things selected",
 										  TheInGameUI->getSelectCount()) );
 
 	// get the list of drawable IDs from the in game UI
 	const DrawableList *selectedDrawables = TheInGameUI->getAllSelectedDrawables();
 
 	// sanity
-	DEBUG_ASSERTCRASH( selectedDrawables->empty() == FALSE, ("populateMultiSelect: Drawable list is empty\n") );
+	DEBUG_ASSERTCRASH( selectedDrawables->empty() == FALSE, ("populateMultiSelect: Drawable list is empty") );
 
 	// loop through all the selected drawables
 	for( DrawableListCIt it = selectedDrawables->begin();
 			 it != selectedDrawables->end(); ++it )
 	{
-	
+
 		// get the drawable
 		draw = *it;
 
-		
+
 		if (draw->getObject()->isKindOf(KINDOF_IGNORED_IN_GUI)) // ignore these guys
 			continue;
 
@@ -260,7 +255,7 @@ void ControlBar::populateMultiSelect( void )
 		// NOTE that we're not considering objects that are currently in the process of
 		// being sold as those objects can't be issued anymore commands
 		//
-		if( draw && draw->getObject() && 
+		if( draw && draw->getObject() &&
 				!draw->getObject()->getStatusBits().test( OBJECT_STATUS_SOLD ) )
 		{
 
@@ -276,23 +271,23 @@ void ControlBar::populateMultiSelect( void )
 			//
 			if( portraitSet == FALSE )
 			{
-			
+
 				portrait = draw->getTemplate()->getSelectedPortraitImage();
 				portraitObj = draw->getObject();
 				portraitSet = TRUE;
 
-			}  // end if
+			}
 			else if( draw->getTemplate()->getSelectedPortraitImage() != portrait )
 				portrait = NULL;
 
-		}  // end if
+		}
 
-	}  // end for, drawble id iterator
+	}
 
 	// set the portrait image
 	setPortraitByObject( portraitObj );
 
-}  // end populateMultiSelect
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update logic for the multi select context sensitive GUI */
@@ -311,20 +306,20 @@ void ControlBar::updateContextMultiSelect( void )
 
 	// santiy
 	DEBUG_ASSERTCRASH( TheInGameUI->getSelectCount() > 1,
-										 ("updateContextMultiSelect: TheInGameUI only has '%d' things selected\n",
+										 ("updateContextMultiSelect: TheInGameUI only has '%d' things selected",
 										  TheInGameUI->getSelectCount()) );
 
 	// get the list of drawable IDs from the in game UI
 	const DrawableList *selectedDrawables = TheInGameUI->getAllSelectedDrawables();
 
 	// sanity
-	DEBUG_ASSERTCRASH( selectedDrawables->empty() == FALSE, ("populateMultiSelect: Drawable list is empty\n") );
+	DEBUG_ASSERTCRASH( selectedDrawables->empty() == FALSE, ("populateMultiSelect: Drawable list is empty") );
 
 	// loop through all the selected drawable IDs
 	for( DrawableListCIt it = selectedDrawables->begin();
 			 it != selectedDrawables->end(); ++it )
 	{
-	
+
 		// get the drawable from the ID
 		draw = *it;
 
@@ -395,9 +390,9 @@ void ControlBar::updateContextMultiSelect( void )
 			if( availability == COMMAND_AVAILABLE || availability == COMMAND_ACTIVE )
 					objectsThatCanDoCommand[ i ]++;
 
-		}  // end for i
+		}
 
-	}  // end for, selected drawables
+	}
 
 	//
 	// for each command, if any objects can do the command we enable the window, otherwise
@@ -415,18 +410,18 @@ void ControlBar::updateContextMultiSelect( void )
 		// don't consider slots that don't have commands
 		if( m_commonCommands[ i ] == NULL )
 			continue;
-		
+
 		// check the count of objects that can do the command and enable/disable the control,
 		if( objectsThatCanDoCommand[ i ] > 0 )
 			m_commandWindows[ i ]->winEnable( TRUE );
 		else
 			m_commandWindows[ i ]->winEnable( FALSE );
 
-	}  // end for i
+	}
 
 	// After Every change to the m_commandWIndows, we need to show fill in the missing blanks with the images
 	// removed from multiplayer branch
 	//showCommandMarkers();
 
 
-}  // end updateContextMultiSelect
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
index f947ea45601..ea1211b34a1 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/NameKeyGenerator.h"
 #include "Common/ThingTemplate.h"
@@ -54,7 +54,7 @@ void ControlBar::updateOCLTimerTextDisplay( UnsignedInt totalSeconds, Real perce
 	GameWindow *barWindow = TheWindowManager->winGetWindowFromId( NULL, barID );
 
 	// santiy
-	DEBUG_ASSERTCRASH( descWindow, ("Under construction window not found\n") );
+	DEBUG_ASSERTCRASH( descWindow, ("Under construction window not found") );
 
 	Int minutes = totalSeconds / 60;
 	Int seconds = totalSeconds - (minutes * 60);
@@ -66,12 +66,12 @@ void ControlBar::updateOCLTimerTextDisplay( UnsignedInt totalSeconds, Real perce
 		text.format( TheGameText->fetch( "CONTROLBAR:OCLTimerDesc" ), minutes, seconds );
 
 	GadgetStaticTextSetText( descWindow, text );
-	GadgetProgressBarSetProgress(barWindow, (percent * 100));  
+	GadgetProgressBarSetProgress(barWindow, (percent * 100));
 
 	// record this as the last time displayed
 	m_displayedOCLTimerSeconds = totalSeconds;
 
-}  // end updateOCLTimerTextDisplay
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Populate the interface for an OCL Timer context. */
@@ -91,7 +91,7 @@ void ControlBar::populateOCLTimer( Object *creatorObject )
 	NameKeyType id;
 	id = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:OCLTimerSellButton" );
 	GameWindow *win = TheWindowManager->winGetWindowFromId( parent, id );
-	
+
 	if( !creatorObject->isKindOf(KINDOF_TECH_BUILDING) )
 	{
 		// Surgical bug fix.  srj is right, this is stupid.
@@ -116,24 +116,24 @@ void ControlBar::populateOCLTimer( Object *creatorObject )
 		{
 			//
 			// if a rally point is set, show the rally point, if we don't have it set hide any rally
-			// point we might have visible 
+			// point we might have visible
 			//
 			showRallyPoint( exit->getRallyPoint() );
 
-		}  // end if
+		}
 	}
 	else
 	{
 		win->winHide(TRUE);
 	}
-	
+
 	// set the text percent and bar of our timer we are displaying
 	updateContextOCLTimer( );
 
 	// set the portrait for the thing being constructed
 	setPortraitByObject( creatorObject );
 
-}  // end populateUnderConstruction
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -148,9 +148,9 @@ void ControlBar::updateContextOCLTimer( void )
 	UnsignedInt seconds = frames / LOGICFRAMES_PER_SECOND;
 
 	Real percent = update->getCountdownPercent();
-	
+
 	// if the time has changed since what was last shown to the user update the text
 	if( m_displayedOCLTimerSeconds != seconds )
 		updateOCLTimerTextDisplay( seconds, percent );
 
-}  // end updatecontextUnderConstruction
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
index 327de89716a..bd7a154d681 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarObserver.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ControlBarObserver.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	All things related to the Observer Control bar, are in here.
 //
 //-----------------------------------------------------------------------------
@@ -50,8 +50,9 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/GameUtility.h"
 #include "Common/NameKeyGenerator.h"
 #include "Common/PlayerList.h"
 #include "Common/Player.h"
@@ -89,12 +90,16 @@ static NameKeyType buttonCancelID = NAMEKEY_INVALID;
 
 static GameWindow *winFlag = NULL;
 static GameWindow *winGeneralPortrait = NULL;
+// TheSuperHackers @tweak Allow idle worker selection for observers.
+static GameWindow *buttonIdleWorker = NULL;
 static GameWindow *staticTextNumberOfUnits = NULL;
 static GameWindow *staticTextNumberOfBuildings = NULL;
 static GameWindow *staticTextNumberOfUnitsKilled = NULL;
 static GameWindow *staticTextNumberOfUnitsLost = NULL;
 static GameWindow *staticTextPlayerName = NULL;
 
+static NameKeyType s_replayObserverNameKey = NAMEKEY_INVALID;
+
 //-----------------------------------------------------------------------------
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -115,7 +120,7 @@ void ControlBar::initObserverControls( void )
 		staticTextPlayerID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		staticTextPlayer[i] = TheWindowManager->winGetWindowFromId( ObserverPlayerListWindow, staticTextPlayerID[i] );
 	}
-	
+
 	staticTextNumberOfUnits = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:StaticTextNumberOfUnits"));
 	staticTextNumberOfBuildings = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:StaticTextNumberOfBuildings"));
 	staticTextNumberOfUnitsKilled = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:StaticTextNumberOfUnitsKilled"));
@@ -123,26 +128,57 @@ void ControlBar::initObserverControls( void )
 	staticTextPlayerName = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:StaticTextPlayerName"));
 	winFlag = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:WinFlag"));
 	winGeneralPortrait = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:WinGeneralPortrait"));
-	
+	buttonIdleWorker = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonIdleWorker"));
+
 	buttonCancelID = TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonCancel");
+
+	s_replayObserverNameKey = TheNameKeyGenerator->nameToKey("ReplayObserver");
+}
+
+//-------------------------------------------------------------------------------------------------
+void ControlBar::setObserverLookAtPlayer(Player *player)
+{
+	if (player != NULL && player == ThePlayerList->findPlayerWithNameKey(s_replayObserverNameKey))
+	{
+		// Looking at the observer. Treat as not looking at player.
+		m_observerLookAtPlayer = NULL;
+	}
+	else
+	{
+		m_observerLookAtPlayer = player;
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void ControlBar::setObservedPlayer(Player *player)
+{
+	if (player != NULL && player == ThePlayerList->findPlayerWithNameKey(s_replayObserverNameKey))
+	{
+		// Looking at the observer. Treat as not observing player.
+		m_observedPlayer = NULL;
+	}
+	else
+	{
+		m_observedPlayer = player;
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
 /** System callback for the ControlBarObserverSystem */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType ControlBarObserverSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ControlBarObserverSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	static NameKeyType buttonCommunicator = NAMEKEY_INVALID;
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
 				break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_MOUSE_ENTERING:
@@ -160,29 +196,35 @@ WindowMsgHandledType ControlBarObserverSystem( GameWindow *window, UnsignedInt m
 			Int controlID = control->winGetWindowId();
 			if( controlID == buttonCancelID)
 			{
-				TheControlBar->setObserverLookAtPlayer(NULL);
+				rts::changeObservedPlayer(NULL);
+
 				ObserverPlayerInfoWindow->winHide(TRUE);
 				ObserverPlayerListWindow->winHide(FALSE);
+				buttonIdleWorker->winHide(TRUE);
 				TheControlBar->populateObserverList();
-
 			}
+
 			for(Int i = 0; i <MAX_BUTTONS; ++i)
 			{
 				if( controlID == buttonPlayerID[i])
 				{
+					Player* player = static_cast<Player*>(GadgetButtonGetData(buttonPlayer[i]));
+					rts::changeObservedPlayer(player);
+
 					ObserverPlayerInfoWindow->winHide(FALSE);
 					ObserverPlayerListWindow->winHide(TRUE);
-					TheControlBar->setObserverLookAtPlayer((Player *) GadgetButtonGetData( buttonPlayer[i]));
+
 					if(TheControlBar->getObserverLookAtPlayer())
 						TheControlBar->populateObserverInfoWindow();
+
 					return MSG_HANDLED;
 				}
 			}
-			
+
 		//	if( controlID == buttonCommunicator && TheGameLogic->getGameMode() == GAME_INTERNET )
 	/*
 		{
-				popupCommunicatorLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupCommunicator.wnd" ) );
+				popupCommunicatorLayout = TheWindowManager->winCreateLayout( "Menus/PopupCommunicator.wnd" );
 				popupCommunicatorLayout->runInit();
 				popupCommunicatorLayout->hide( FALSE );
 				popupCommunicatorLayout->bringForward();
@@ -191,17 +233,17 @@ WindowMsgHandledType ControlBarObserverSystem( GameWindow *window, UnsignedInt m
 
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end ControlBarSystem
+}
 
 //-----------------------------------------------------------------------------
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
@@ -212,7 +254,7 @@ void ControlBar::populateObserverList( void )
 	Int currentButton = 0, i;
 	if(TheRecorder->isMultiplayer())
 	{
-	
+
 		for (i = 0; i < MAX_SLOTS; ++i)
 		{
 			AsciiString name;
@@ -232,7 +274,7 @@ void ControlBar::populateObserverList( void )
 				buttonPlayer[currentButton]->winHide(FALSE);
 				buttonPlayer[currentButton]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
 
-				const GameSlot *slot = TheGameInfo->getConstSlot(currentButton);
+				const GameSlot *slot = TheGameInfo->getConstSlot(i);
 				Color playerColor = p->getPlayerColor();
 				Color backColor = GameMakeColor(0, 0, 0, 255);
 				staticTextPlayer[currentButton]->winSetEnabledTextColors( playerColor, backColor );
@@ -301,15 +343,16 @@ void ControlBar::populateObserverInfoWindow ( void )
 	{
 		ObserverPlayerInfoWindow->winHide(TRUE);
 		ObserverPlayerListWindow->winHide(FALSE);
+		buttonIdleWorker->winHide(TRUE);
 		populateObserverList();
 		return;
 	}
-							
+
 	UnicodeString uString;
 	KindOfMaskType mask,clearmask;
 	mask.set(KINDOF_SCORE);
 	clearmask.set(KINDOF_STRUCTURE);
-	
+
 	uString.format(L"%d",m_observerLookAtPlayer->countObjects(mask,clearmask));
 	GadgetStaticTextSetText(staticTextNumberOfUnits, uString);
 
@@ -338,4 +381,5 @@ void ControlBar::populateObserverInfoWindow ( void )
 	staticTextPlayerName->winSetEnabledTextColors(color, GameMakeColor(0,0,0,255));
 	winFlag->winSetEnabledImage(0, m_observerLookAtPlayer->getPlayerTemplate()->getFlagWaterMarkImage());
 	winGeneralPortrait->winHide(FALSE);
+	buttonIdleWorker->winHide(FALSE);
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
index 91cb5294952..7fe4f4e843a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarPrintPositions.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ControlBarPrintPositions.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Convience function for degayifying the whole squished control bar
 //						process
 //
@@ -47,8 +47,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#include <stdio.h>
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
index 31a721ada0a..2eee2dd5312 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarResizer.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ControlBarResizer.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	We want a "squished" control bar, this is the methods that will do it
 //
 //-----------------------------------------------------------------------------
@@ -46,7 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -59,11 +59,11 @@
 // DEFINES ////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 
-const FieldParse ControlBarResizer::m_controlBarResizerParseTable[] = 
+const FieldParse ControlBarResizer::m_controlBarResizerParseTable[] =
 {
 	{ "AltPosition",		INI::parseICoord2D,						NULL, offsetof( ResizerWindow, m_altPos ) },
 	{ "AltSize",				INI::parseICoord2D,						NULL, offsetof( ResizerWindow, m_altSize ) },
-	{ NULL,										NULL,													NULL, 0 }  // keep this last
+	{ NULL,										NULL,													NULL, 0 }
 
 };
 //-----------------------------------------------------------------------------
@@ -98,16 +98,16 @@ ControlBarResizer::~ControlBarResizer( void )
 	}
 	m_resizerWindowsList.clear();
 }
-	
+
 void ControlBarResizer::init( void )
 {
 	INI ini;
 	// Read from INI all the ControlBarSchemes
-	ini.load( AsciiString( "Data\\INI\\ControlBarResizer.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\ControlBarResizer", INI_LOAD_OVERWRITE, NULL );
 
 }
 
-	
+
 ResizerWindow *ControlBarResizer::findResizerWindow( AsciiString name )
 {
 	ResizerWindowList::iterator it = m_resizerWindowsList.begin();
@@ -126,7 +126,7 @@ ResizerWindow *ControlBarResizer::findResizerWindow( AsciiString name )
 		{
 			return rWin;
 		}
-		it ++;	
+		it ++;
 	}
 	return NULL;
 }
@@ -150,7 +150,7 @@ ResizerWindow *ControlBarResizer::newResizerWindow( AsciiString name )
 	win->winGetSize(&newRwin->m_defaultSize.x,&newRwin->m_defaultSize.y);
 	m_resizerWindowsList.push_back(newRwin);
 	return newRwin;
-}	
+}
 void ControlBarResizer::sizeWindowsDefault( void )
 {
 	ResizerWindowList::iterator it = m_resizerWindowsList.begin();
@@ -173,15 +173,15 @@ void ControlBarResizer::sizeWindowsDefault( void )
 		win->winSetPosition(rWin->m_defaultPos.x, rWin->m_defaultPos.y);
 		win->winSetSize(rWin->m_defaultSize.x, rWin->m_defaultSize.y);
 		DEBUG_LOG(("sizeWindowsDefault:%s pos X:%d pos Y: %d size X:%d sizeY: %d",rWin->m_name.str(),rWin->m_defaultPos.x, rWin->m_defaultPos.y,rWin->m_defaultSize.x, rWin->m_defaultSize.y ));
-		it ++;	
+		it ++;
 	}
 }
 void ControlBarResizer::sizeWindowsAlt( void )
 {
 	ResizerWindowList::iterator it = m_resizerWindowsList.begin();
 	GameWindow *win = NULL;
-	Real x = (Real)TheDisplay->getWidth() / 800;
-	Real y = (Real)TheDisplay->getHeight() / 600;
+	Real x = (Real)TheDisplay->getWidth() / DEFAULT_DISPLAY_WIDTH;
+	Real y = (Real)TheDisplay->getHeight() / DEFAULT_DISPLAY_HEIGHT;
 	while (it != m_resizerWindowsList.end())
 	{
 		ResizerWindow *rWin = *it;
@@ -197,12 +197,12 @@ void ControlBarResizer::sizeWindowsAlt( void )
 			it++;
 			continue;
 		}
-		
+
 		win->winSetPosition(rWin->m_altPos.x * x, rWin->m_altPos.y * y);
 		if(rWin->m_altSize.x >0 || rWin->m_altSize.y > 0)
 			win->winSetSize(rWin->m_altSize.x *x, rWin->m_altSize.y *y);
 		DEBUG_LOG(("sizeWindowsAlt:%s pos X:%d pos Y: %d size X:%d sizeY: %d",rWin->m_name.str(), rWin->m_altPos.x*x, rWin->m_altPos.y*y,rWin->m_altSize.x*x, rWin->m_altSize.y *y));
-		it ++;	
+		it ++;
 	}
 }
 
@@ -214,7 +214,7 @@ void INI::parseControlBarResizerDefinition( INI* ini )
 //
 //	// read the name
 //	const char* c = ini->getNextToken();
-//	name.set( c );	
+//	name.set( c );
 //
 ////	ControlBarResizer *resizer = TheControlBar->getControlBarResizer();
 //	if( !resizer )
@@ -228,7 +228,7 @@ void INI::parseControlBarResizerDefinition( INI* ini )
 //
 //		// image not found, create a new one
 //		rWin = resizer->newResizerWindow(name);
-//		DEBUG_ASSERTCRASH( rWin, ("parseControlBarResizerDefinition: unable to allocate ResizerWindow for '%s'\n",
+//		DEBUG_ASSERTCRASH( rWin, ("parseControlBarResizerDefinition: unable to allocate ResizerWindow for '%s'",
 //															name.str()) );
 //
 //	}  // end if
@@ -236,7 +236,7 @@ void INI::parseControlBarResizerDefinition( INI* ini )
 //	// parse the ini definition
 //	ini->initFromINI( rWin, resizer->getFieldParse());
 //
-}  // end parseMappedImage
+}
 
 
 //-----------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
index 22e49b08fe4..32b27527194 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarScheme.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Apr 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ControlBarScheme.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Contains all the Command bar goodness in terms of how it looks
 //						For instrucitons on how to use, please see it's .h file
 //
@@ -51,7 +51,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerTemplate.h"
@@ -62,11 +62,6 @@
 #include "GameClient/Image.h"
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/GadgetPushButton.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -75,7 +70,7 @@ enum{
 	COMMAND_BAR_SIZE_OFFSET = 0
 };
 
-const FieldParse ControlBarSchemeManager::m_controlBarSchemeFieldParseTable[] = 
+const FieldParse ControlBarSchemeManager::m_controlBarSchemeFieldParseTable[] =
 {
 
 	{ "ImagePart",						ControlBarSchemeManager::parseImagePart,			NULL, NULL },
@@ -161,16 +156,17 @@ const FieldParse ControlBarSchemeManager::m_controlBarSchemeFieldParseTable[] =
 	{ "ExpBarForegroundImage",		INI::parseMappedImage,				NULL, offsetof( ControlBarScheme, m_expBarForeground) },
 	{ "PowerPurchaseImage",			INI::parseMappedImage,				NULL, offsetof( ControlBarScheme, m_powerPurchaseImage) },
 
-	{ NULL,										NULL,													NULL, 0 }  // keep this last
+	{ NULL,										NULL,													NULL, 0 }
 
 };
 
 // used to parse the anim types that each animation part of a scheme can have
-static const LookupListRec AnimTypeNames[] = 
+static const LookupListRec AnimTypeNames[] =
 {
 	{ "SLIDE_RIGHT", ControlBarSchemeAnimation::CB_ANIM_SLIDE_RIGHT },
 	{ NULL, 0	}
 };
+static_assert(ARRAY_SIZE(AnimTypeNames) == ControlBarSchemeAnimation::CB_ANIM_MAX + 1, "Incorrect array size");
 
 static void animSlideRight( ControlBarSchemeAnimation *anim );
 
@@ -193,13 +189,8 @@ ControlBarSchemeImage::~ControlBarSchemeImage( void )
 
 ControlBarSchemeAnimation::ControlBarSchemeAnimation( void )
 {
-	// Added by Sadullah Nader
-	// Initializations missing and needed
-	
 	m_animDuration = 0;
 	m_finalPos.x = m_finalPos.y = 0;
-
-	// End Add
 	m_name.clear();
 	m_animType = 0;
 	m_animImage = NULL;
@@ -222,13 +213,11 @@ void ControlBarScheme::reset(void)
 		while (it != m_layer[i].end())
 		{
 			ControlBarSchemeImage *im = *it;
-			if( im )
-				delete im;
-			im = NULL;
-			it ++;	
+			delete im;
+			it ++;
 		}
 		m_layer[i].clear();
-	
+
 	}
 
 
@@ -237,13 +226,8 @@ void ControlBarScheme::reset(void)
 	while (it != m_animations.end())
 	{
 		ControlBarSchemeAnimation *anim = *it;
-		if( anim )
-		{
-			anim->m_animImage = NULL;
-			delete(anim);
-		}
-		anim = NULL;
-		it ++;	
+		delete anim;
+		it ++;
 	}
 	m_animations.clear();
 
@@ -285,7 +269,7 @@ void ControlBarScheme::reset(void)
 	m_commandMarkerImage = NULL;
 	m_expBarForeground = NULL;
 	m_powerPurchaseImage = NULL;
-		
+
 }
 
 ControlBarScheme::~ControlBarScheme(void)
@@ -314,13 +298,9 @@ ControlBarScheme::ControlBarScheme(void)
 	m_optionsButtonHightlited = NULL;
 	m_optionsButtonPushed = NULL;
 	m_optionsButtonDisabled = NULL;
-	
-	// Added By Sadullah Nader
-	// Initializations needed 
-	
+
 	m_commandBarBorderColor = 0;
-	
-	//
+
 	m_idleWorkerButtonEnable = NULL;
 	m_idleWorkerButtonHightlited = NULL;
 	m_idleWorkerButtonPushed = NULL;
@@ -359,13 +339,12 @@ ControlBarScheme::ControlBarScheme(void)
 	m_uAttackButtonEnable = NULL;
 	m_uAttackButtonHightlited = NULL;
 	m_uAttackButtonPushed = NULL;
-	
+
 	m_genArrow = NULL;
 
 	m_minMaxButtonEnable = NULL;
 	m_minMaxButtonHightlited = NULL;
 	m_minMaxButtonPushed = NULL;
-	
 	m_minMaxUL.x = 0;
 	m_minMaxLR.x = 0;
 
@@ -413,10 +392,10 @@ ControlBarScheme::ControlBarScheme(void)
 
 	m_powerBarUL.y = 0;
 	m_powerBarLR.y = 0;
-	
+
 	m_moneyUL.x = 0;
 	m_moneyUL.y = 0;
-	
+
 	m_moneyLR.x = 0;
 	m_moneyLR.y = 0;
 }
@@ -443,16 +422,16 @@ void ControlBarScheme::init(void)
 	resMultiplier.y = TheDisplay->getHeight()/INT_TO_REAL(m_ScreenCreationRes.y);
 
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PopupCommunicator" ) );
-	if(win)	
+	if(win)
 	{
-//		DEBUG_ASSERTCRASH(m_buddyButtonEnable,     ("No enable button image for communicator in scheme %s!\n", m_name.str()));
-//		DEBUG_ASSERTCRASH(m_buddyButtonHightlited, ("No hilite button image for communicator in scheme %s!\n", m_name.str()));
-//		DEBUG_ASSERTCRASH(m_buddyButtonPushed,     ("No pushed button image for communicator in scheme %s!\n", m_name.str()));
+//		DEBUG_ASSERTCRASH(m_buddyButtonEnable,     ("No enable button image for communicator in scheme %s!", m_name.str()));
+//		DEBUG_ASSERTCRASH(m_buddyButtonHightlited, ("No hilite button image for communicator in scheme %s!", m_name.str()));
+//		DEBUG_ASSERTCRASH(m_buddyButtonPushed,     ("No pushed button image for communicator in scheme %s!", m_name.str()));
 		GadgetButtonSetEnabledImage(win, m_buddyButtonEnable);
 		GadgetButtonSetHiliteImage(win, m_buddyButtonHightlited);
 		GadgetButtonSetHiliteSelectedImage(win, m_buddyButtonPushed);
 		GadgetButtonSetDisabledImage(win, m_buddyButtonDisabled);
-		
+
 		Int x, y;
 		GameWindow* parent =win->winGetParent();
 		if(parent)
@@ -471,13 +450,13 @@ void ControlBarScheme::init(void)
 		win->winSetSize((m_chatLR.x - m_chatUL.x)*resMultiplier.x + COMMAND_BAR_SIZE_OFFSET,(m_chatLR.y - m_chatUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET);
 	}
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonIdleWorker" ) );
-	if(win)	
+	if(win)
 	{
 		GadgetButtonSetEnabledImage(win, m_idleWorkerButtonEnable);
 		GadgetButtonSetHiliteImage(win, m_idleWorkerButtonHightlited);
 		GadgetButtonSetHiliteSelectedImage(win, m_idleWorkerButtonPushed);
 		GadgetButtonSetDisabledImage(win, m_idleWorkerButtonDisabled);
-		
+
 		Int x, y;
 		GameWindow* parent =win->winGetParent();
 		if(parent)
@@ -493,17 +472,17 @@ void ControlBarScheme::init(void)
 			y = m_workerUL.y * resMultiplier.y;
 		}
 		win->winSetPosition(x,y );
-		
+
 		win->winSetSize((m_workerLR.x - m_workerUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_workerLR.y - m_workerUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET);
 
 	}
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ExpBarForeground" ) );
-	if(win)	
+	if(win)
 	{
 		win->winSetEnabledImage(0, m_expBarForeground);
 	}
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonOptions" ) );
-	if(win)	
+	if(win)
 	{
 		GadgetButtonSetEnabledImage(win, m_optionsButtonEnable);
 		GadgetButtonSetHiliteImage(win, m_optionsButtonHightlited);
@@ -527,7 +506,7 @@ void ControlBarScheme::init(void)
 		win->winSetSize((m_optionsLR.x - m_optionsUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_optionsLR.y - m_optionsUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET);
 	}
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonPlaceBeacon" ) );
-	if(win)	
+	if(win)
 	{
 		GadgetButtonSetEnabledImage(win, m_beaconButtonEnable);
 		GadgetButtonSetHiliteImage(win, m_beaconButtonHightlited);
@@ -551,9 +530,9 @@ void ControlBarScheme::init(void)
 		win->winSetPosition(x,y );
 		win->winSetSize((m_beaconLR.x - m_beaconUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_beaconLR.y - m_beaconUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET);
 	}
-	
+
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:MoneyDisplay" ) );
-	if(win)	
+	if(win)
 	{
 
 		Int x, y;
@@ -575,7 +554,7 @@ void ControlBarScheme::init(void)
 	}
 
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PowerWindow" ) );
-	if(win)	
+	if(win)
 	{
 
 		Int x, y;
@@ -594,11 +573,11 @@ void ControlBarScheme::init(void)
 		}
 		win->winSetPosition(x,y );
 		win->winSetSize((m_powerBarLR.x - m_powerBarUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_powerBarLR.y - m_powerBarUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET);
-		DEBUG_LOG(("Power Bar UL X:%d Y:%d LR X:%d Y:%d size X:%d Y:%d\n",m_powerBarUL.x, m_powerBarUL.y,m_powerBarLR.x, m_powerBarLR.y, (m_powerBarLR.x - m_powerBarUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_powerBarLR.y - m_powerBarUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET  ));
-	}	
+		DEBUG_LOG(("Power Bar UL X:%d Y:%d LR X:%d Y:%d size X:%d Y:%d",m_powerBarUL.x, m_powerBarUL.y,m_powerBarLR.x, m_powerBarLR.y, (m_powerBarLR.x - m_powerBarUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_powerBarLR.y - m_powerBarUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET  ));
+	}
 
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonGeneral" ) );
-	if(win)	
+	if(win)
 	{
 
 		GadgetButtonSetEnabledImage(win, m_generalButtonEnable);
@@ -623,15 +602,15 @@ void ControlBarScheme::init(void)
 		win->winSetPosition(x,y );
 		win->winSetSize((m_generalLR.x - m_generalUL.x)*resMultiplier.x+ COMMAND_BAR_SIZE_OFFSET,(m_generalLR.y - m_generalUL.y)*resMultiplier.y+ COMMAND_BAR_SIZE_OFFSET);
 	}
-	
+
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:ButtonLarge" ) );
-	if(win)	
+	if(win)
 	{
 		// The images are set above
 //		GadgetButtonSetEnabledImage(win, m_minMaxButtonEnable);
 //		GadgetButtonSetHiliteImage(win, m_minMaxButtonHightlited);
 //		GadgetButtonSetHiliteSelectedImage(win, m_minMaxButtonPushed);
-	
+
 				Int x, y;
 		GameWindow* parent =win->winGetParent();
 		if(parent)
@@ -649,13 +628,13 @@ void ControlBarScheme::init(void)
 		win->winSetPosition(x,y );
 		win->winSetSize((m_minMaxLR.x - m_minMaxUL.x)*resMultiplier.x + COMMAND_BAR_SIZE_OFFSET,(m_minMaxLR.y - m_minMaxUL.y)*resMultiplier.y + COMMAND_BAR_SIZE_OFFSET);
 	}
-	
+
 	win= TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey( "ControlBar.wnd:WinUAttack" ) );
-	if(win)	
+	if(win)
 	{
 		win->winSetEnabledImage(0,m_uAttackButtonEnable);
 		win->winSetDisabledImage(0,m_uAttackButtonHightlited);
-		
+
 		Int x, y;
 		GameWindow* parent =win->winGetParent();
 		if(parent)
@@ -692,11 +671,11 @@ void ControlBarScheme::addAnimation( ControlBarSchemeAnimation *schemeAnim )
 {
 	if( !schemeAnim )
 	{
-		DEBUG_ASSERTCRASH(FALSE,("Trying to add a null animation to the controlbarscheme\n"));
+		DEBUG_ASSERTCRASH(FALSE,("Trying to add a null animation to the controlbarscheme"));
 		return;
 	}
 	m_animations.push_back( schemeAnim );
-}// addAnimation
+}
 
 //
 // Add an image to the proper layer list
@@ -705,20 +684,20 @@ void ControlBarScheme::addImage( ControlBarSchemeImage *schemeImage )
 {
 	if( !schemeImage )
 	{
-		DEBUG_ASSERTCRASH(FALSE,("Trying to add a null image to the controlbarscheme\n"));
+		DEBUG_ASSERTCRASH(FALSE,("Trying to add a null image to the controlbarscheme"));
 		return;
 	}
 
 	if(schemeImage->m_layer < 0 || schemeImage->m_layer >= MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS)
 	{
-		DEBUG_ASSERTCRASH(FALSE,("SchemeImage %s attempted to be added to layer %d which is not Between to %d, %d\n",
+		DEBUG_ASSERTCRASH(FALSE,("SchemeImage %s attempted to be added to layer %d which is not Between to %d, %d",
 								 schemeImage->m_name.str(), schemeImage->m_layer, 0, MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS));
 		// bring the foobar to the front so we make it obvious that something's wrong
 		schemeImage->m_layer = 0;
 	}
 
 	m_layer[schemeImage->m_layer].push_back(schemeImage);
-}// addImage
+}
 
 //
 // Update the position of the image that's animating
@@ -745,7 +724,7 @@ void ControlBarScheme::updateAnim (ControlBarSchemeAnimation * anim)
 void ControlBarScheme::update( void )
 {
 	ControlBarSchemeAnimationList::iterator it = m_animations.begin();
-	
+
 	while (it != m_animations.end())
 	{
 		ControlBarSchemeAnimation *anim = *it;
@@ -755,9 +734,9 @@ void ControlBarScheme::update( void )
 			return;
 		}
 		updateAnim( anim );
-		it ++;	
+		it ++;
 	}
-	
+
 }
 
 //
@@ -769,7 +748,7 @@ void ControlBarScheme::drawForeground( Coord2D multi, ICoord2D offset )
 	{
 		ControlBarSchemeImageList::iterator it = m_layer[i].begin();
 		while (it != m_layer[i].end())
-		{	
+		{
 			ControlBarSchemeImage *schemeImage = *it;
 			if( !schemeImage )
 			{
@@ -777,21 +756,21 @@ void ControlBarScheme::drawForeground( Coord2D multi, ICoord2D offset )
 				it++;
 				continue;
 			}
-			
+
 			// if we dont' have an image, don't try to draw it
 			if(!schemeImage->m_image)
 			{
 				it++;
 				continue;
 			}
-			
+
 			// draw the image
 			TheDisplay->drawImage(schemeImage->m_image, schemeImage->m_position.x * multi.x + offset.x,
-														schemeImage->m_position.y * multi.y + offset.y, 
+														schemeImage->m_position.y * multi.y + offset.y,
 														(schemeImage->m_position.x + schemeImage->m_size.x) * multi.x + offset.x,
 														(schemeImage->m_position.y + schemeImage->m_size.y) * multi.y + offset.y);
-			
-			it ++;	
+
+			it ++;
 		}
 	}
 }
@@ -801,12 +780,12 @@ void ControlBarScheme::drawForeground( Coord2D multi, ICoord2D offset )
 //-----------------------------------------------------------------------------
 void ControlBarScheme::drawBackground( Coord2D multi, ICoord2D offset )
 {
-	
+
 	for(Int i = MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS - 1; i >= CONTROL_BAR_SCHEME_FOREGROUND_IMAGE_LAYERS; i--)
 	{
 		ControlBarSchemeImageList::iterator it = m_layer[i].begin();
 		while (it != m_layer[i].end())
-		{	
+		{
 			ControlBarSchemeImage *schemeImage = *it;
 			if( !schemeImage )
 			{
@@ -814,21 +793,21 @@ void ControlBarScheme::drawBackground( Coord2D multi, ICoord2D offset )
 				it++;
 				continue;
 			}
-			
+
 			// if we don't have an image, don't try to draw it
 			if(!schemeImage->m_image)
 			{
 				it++;
 				continue;
 			}
-			
+
 			// draw it
 			TheDisplay->drawImage(schemeImage->m_image, schemeImage->m_position.x * multi.x + offset.x,
-														schemeImage->m_position.y * multi.y + offset.y, 
+														schemeImage->m_position.y * multi.y + offset.y,
 														(schemeImage->m_position.x + schemeImage->m_size.x) * multi.x + offset.x,
 														(schemeImage->m_position.y + schemeImage->m_size.y) * multi.y + offset.y);
-			
-			it ++;	
+
+			it ++;
 		}
 	}
 }
@@ -855,10 +834,8 @@ ControlBarSchemeManager::~ControlBarSchemeManager( void )
 	while (it != m_schemeList.end())
 	{
 		ControlBarScheme *CBScheme = *it;
-		if( CBScheme )
-			delete CBScheme;
-		CBScheme = NULL;
-		it ++;	
+		delete CBScheme;
+		it ++;
 	}
 	m_schemeList.clear();
 	m_currentScheme = NULL;
@@ -870,13 +847,13 @@ ControlBarSchemeManager::~ControlBarSchemeManager( void )
 //-----------------------------------------------------------------------------
 void ControlBarSchemeManager::parseImagePart(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Position",				INI::parseICoord2D,				NULL, offsetof( ControlBarSchemeImage, m_position ) },
 			{ "Size",						INI::parseICoord2D,				NULL, offsetof( ControlBarSchemeImage, m_size ) },
       { "ImageName",			INI::parseMappedImage,		NULL, offsetof( ControlBarSchemeImage, m_image ) },
 			{ "Layer",					INI::parseInt,						NULL, offsetof( ControlBarSchemeImage, m_layer ) },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
 	ControlBarSchemeImage *schemeImage = NEW ControlBarSchemeImage;
@@ -890,13 +867,13 @@ void ControlBarSchemeManager::parseImagePart(INI *ini, void *instance, void* /*s
 //-----------------------------------------------------------------------------
 void ControlBarSchemeManager::parseAnimatingPartImage(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Position",				INI::parseICoord2D,				NULL, offsetof( ControlBarSchemeImage, m_position ) },
 			{ "Size",						INI::parseICoord2D,				NULL, offsetof( ControlBarSchemeImage, m_size ) },
       { "ImageName",			INI::parseMappedImage,		NULL, offsetof( ControlBarSchemeImage, m_image ) },
 			{ "Layer",					INI::parseInt,						NULL, offsetof( ControlBarSchemeImage, m_layer ) },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
 	ControlBarSchemeImage *schemeImage = NEW ControlBarSchemeImage;
@@ -910,16 +887,16 @@ void ControlBarSchemeManager::parseAnimatingPartImage(INI *ini, void *instance,
 //-----------------------------------------------------------------------------
 void ControlBarSchemeManager::parseAnimatingPart(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Name",						INI::parseAsciiString,		NULL, offsetof( ControlBarSchemeAnimation, m_name ) },
       { "Animation",			INI::parseLookupList,			AnimTypeNames, offsetof( ControlBarSchemeAnimation, m_animType ) },
 			{ "Duration",				INI::parseDurationUnsignedInt,			NULL, offsetof( ControlBarSchemeAnimation, m_animDuration ) },
 			{ "FinalPos",				INI::parseICoord2D,			NULL, offsetof( ControlBarSchemeAnimation, m_finalPos ) },
 			{ "ImagePart",			ControlBarSchemeManager::parseAnimatingPartImage,	NULL, NULL },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
-	
+
 	ControlBarSchemeAnimation *schemeAnim = NEW ControlBarSchemeAnimation;
 	ini->initFromINI(schemeAnim, myFieldParse);
 	((ControlBarScheme*)instance)->addAnimation(schemeAnim);
@@ -939,7 +916,7 @@ ControlBarScheme *ControlBarSchemeManager::newControlBarScheme( AsciiString name
 		cbScheme->reset();
 		cbScheme->m_name.set( name );
 		cbScheme->m_name.toLower();
-		return cbScheme;		
+		return cbScheme;
 	}
 
 	cbScheme = NEW ControlBarScheme;
@@ -954,7 +931,7 @@ ControlBarScheme *ControlBarSchemeManager::newControlBarScheme( AsciiString name
 	cbScheme->m_name.toLower();
 
 	m_schemeList.push_back(cbScheme);
-		
+
 	return cbScheme;
 }
 
@@ -964,7 +941,7 @@ ControlBarScheme *ControlBarSchemeManager::newControlBarScheme( AsciiString name
 ControlBarScheme *ControlBarSchemeManager::findControlBarScheme( AsciiString name )
 {
 	name.toLower();
-	
+
 	ControlBarSchemeList::iterator it = m_schemeList.begin();
 
 	// iterate through the list and return the scheme that we're looking for
@@ -978,7 +955,7 @@ ControlBarScheme *ControlBarSchemeManager::findControlBarScheme( AsciiString nam
 		}
 		if(CBScheme->m_name.compareNoCase( name ) == 0)
 			return CBScheme;
-		it ++;	
+		it ++;
 	}
 	return NULL;
 }
@@ -1004,7 +981,7 @@ void ControlBarSchemeManager::preloadAssets( TimeOfDay timeOfDay )
 
 		if (CBScheme->m_rightHUDImage)
 		{
-			TheDisplay->preloadTextureAssets(CBScheme->m_buttonQueueImage->getFilename());
+			TheDisplay->preloadTextureAssets(CBScheme->m_rightHUDImage->getFilename());
 		}
 
 		for (Int layer = 0; layer < MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS; ++layer)
@@ -1033,19 +1010,19 @@ void ControlBarSchemeManager::init( void )
 
 	INI ini;
 	// Read from INI all the ControlBarSchemes
-	ini.load( AsciiString( "Data\\INI\\Default\\ControlBarScheme.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\ControlBarScheme.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\ControlBarScheme", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\ControlBarScheme", INI_LOAD_OVERWRITE, NULL );
 
 //	//Load the user modified control bar schemes
 //	WIN32_FIND_DATA findData;
 //	AsciiString userDataPath;
 //	if(TheGlobalData)
 //	{
-//		userDataPath.format("%sINI\\ControlBarScheme.ini",TheGlobalData->getPath_UserData().str());
+//		userDataPath.format("%sINI\\ControlBarScheme",TheGlobalData->getPath_UserData().str());
 //		if	(FindFirstFile(userDataPath.str(), &findData) !=INVALID_HANDLE_VALUE)
-//			ini.load(userDataPath,  INI_LOAD_OVERWRITE, NULL );
+//			ini.loadFileDirectory(userDataPath,  INI_LOAD_OVERWRITE, NULL );
 //	}
-	if( m_schemeList.size() <= 0 )
+	if( m_schemeList.empty() )
 	{
 		DEBUG_ASSERTCRASH(FALSE,("There's no ControlBarScheme in the ControlBarSchemeList:m_schemeList that was just read from the INI file"));
 		return;
@@ -1081,20 +1058,20 @@ void ControlBarSchemeManager::setControlBarScheme(AsciiString schemeName)
 //-----------------------------------------------------------------------------
 void ControlBarSchemeManager::update( void )
 {
-	if(m_currentScheme)	
+	if(m_currentScheme)
 		m_currentScheme->update();
 }
 
 //-----------------------------------------------------------------------------
 void ControlBarSchemeManager::drawForeground( ICoord2D offset )
 {
-	if(m_currentScheme)	
+	if(m_currentScheme)
 		m_currentScheme->drawForeground( m_multiplyer, offset);
 }
 //-----------------------------------------------------------------------------
 void ControlBarSchemeManager::drawBackground( ICoord2D offset )
 {
-	if(m_currentScheme)	
+	if(m_currentScheme)
 		m_currentScheme->drawBackground( m_multiplyer, offset );
 }
 
@@ -1110,18 +1087,18 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayerTemplate( const PlayerT
 	{
 		m_currentScheme->init();
 
-		DEBUG_LOG(("setControlBarSchemeByPlayer already is using %s as its side\n", side.str()));
+		DEBUG_LOG(("setControlBarSchemeByPlayer already is using %s as its side", side.str()));
 		return;
 	}
 
 	// if we don't have a side, set it to Observer shell
 	if(side.isEmpty())
 		side.set("Observer");
-	DEBUG_LOG(("setControlBarSchemeByPlayer used %s as its side\n", side.str()));
+	DEBUG_LOG(("setControlBarSchemeByPlayer used %s as its side", side.str()));
 	ControlBarScheme *tempScheme = NULL;
 
 	ControlBarSchemeList::iterator it = m_schemeList.begin();
-	
+
 	// iterate through the list and return the scheme that we're looking for
 	while (it != m_schemeList.end())
 	{
@@ -1135,13 +1112,13 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayerTemplate( const PlayerT
 		// find the scheme that best matches our resolution
 		if(CBScheme->m_side.compareNoCase( side ) == 0)
 		{
-		
+
 			if((!tempScheme || tempScheme->m_ScreenCreationRes.x < CBScheme->m_ScreenCreationRes.x) )//&& TheDisplay->getWidth() >= CBScheme->m_ScreenCreationRes.x )
 				tempScheme = CBScheme;
 		}
-		it ++;	
+		it ++;
 	}
-	
+
 	if(tempScheme)
 	{
 		// setup the multiplyer value
@@ -1178,18 +1155,18 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayer(Player *p)
 	{
 		m_currentScheme->init();
 
-		DEBUG_LOG(("setControlBarSchemeByPlayer already is using %s as its side\n", side.str()));
+		DEBUG_LOG(("setControlBarSchemeByPlayer already is using %s as its side", side.str()));
 		return;
 	}
 
 	// if we don't have a side, set it to Observer shell
 	if(side.isEmpty())
 		side.set("Observer");
-	DEBUG_LOG(("setControlBarSchemeByPlayer used %s as its side\n", side.str()));
+	DEBUG_LOG(("setControlBarSchemeByPlayer used %s as its side", side.str()));
 	ControlBarScheme *tempScheme = NULL;
 
 	ControlBarSchemeList::iterator it = m_schemeList.begin();
-	
+
 	// iterate through the list and return the scheme that we're looking for
 	while (it != m_schemeList.end())
 	{
@@ -1203,13 +1180,13 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayer(Player *p)
 		// find the scheme that best matches our resolution
 		if(CBScheme->m_side.compareNoCase( side ) == 0)
 		{
-		
+
 			if((!tempScheme || tempScheme->m_ScreenCreationRes.x < CBScheme->m_ScreenCreationRes.x) )//&& TheDisplay->getWidth() >= CBScheme->m_ScreenCreationRes.x )
 				tempScheme = CBScheme;
 		}
-		it ++;	
+		it ++;
 	}
-	
+
 	if(tempScheme)
 	{
 		// setup the multiplyer value
@@ -1226,7 +1203,7 @@ void ControlBarSchemeManager::setControlBarSchemeByPlayer(Player *p)
 	}
 	if(m_currentScheme)
 		m_currentScheme->init();
-}	
+}
 
 
 //-----------------------------------------------------------------------------
@@ -1254,9 +1231,9 @@ static void animSlideRight( ControlBarSchemeAnimation *anim )
 		startPos.y = anim->m_animImage->m_position.y;
 		anim->setStartPos(startPos);
 	}
-	
+
 	// now lets animate this bad boy!
-	
+
 	// now increment the frame
 	currentFrame++;
 	anim->setCurrentFrame(currentFrame);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
index 0afb55edf60..d41a25c3d58 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/NameKeyGenerator.h"
 #include "Common/ThingTemplate.h"
@@ -44,11 +44,6 @@
 #include "GameClient/GadgetPushButton.h"
 #include "GameClient/HotKey.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define STOP_ID			10
 #define EVACUATE_ID	11
@@ -66,27 +61,27 @@ struct PopulateButtonInfo
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void ControlBar::populateButtonProc( Object *obj, void *userData )
-{	
+{
 	PopulateButtonInfo* info = (PopulateButtonInfo*)userData;
 
 	// sanity
-	DEBUG_ASSERTCRASH( info->buttonIndex < MAX_STRUCTURE_INVENTORY_BUTTONS, 
+	DEBUG_ASSERTCRASH( info->buttonIndex < MAX_STRUCTURE_INVENTORY_BUTTONS,
 										 ("Too many objects inside '%s' for the inventory buttons to hold",
 											info->source->getTemplate()->getName().str()) );
 
 	// put object in inventory data
 	info->self->m_containData[ info->buttonIndex ].control = info->inventoryButtons[ info->buttonIndex ];
 	info->self->m_containData[ info->buttonIndex ].objectID = obj->getID();
-	
+
 	// set the UI button that will allow us to press it and cause the object to exit the container
 	const Image *image;
 	image = obj->getTemplate()->getButtonImage();
 	GadgetButtonSetEnabledImage( info->inventoryButtons[ info->buttonIndex ], image );
-	
+
 	//Show the auto-contained object's veterancy symbol!
 	image = calculateVeterancyOverlayForObject( obj );
 	GadgetButtonDrawOverlayImage( info->inventoryButtons[ info->buttonIndex ], image );
-	
+
 	// Enable the button
 	info->inventoryButtons[ info->buttonIndex ]->winEnable( TRUE );
 
@@ -119,10 +114,10 @@ void ControlBar::populateStructureInventory( Object *building )
 			m_commandWindows[commandIndex]->winHide(TRUE);
 		}
 	}
-	
+
 	// get the contain module of the object
 	ContainModuleInterface *contain = building->getContain();
-	DEBUG_ASSERTCRASH( contain, ("Object in structure inventory does not contain a Contain Module\n") );
+	DEBUG_ASSERTCRASH( contain, ("Object in structure inventory does not contain a Contain Module") );
 	if (!contain)
 		return;
 
@@ -168,7 +163,7 @@ void ControlBar::populateStructureInventory( Object *building )
 			m_commandWindows[ i ]->winHide( TRUE );
 
 
-	}  // end for i
+	}
 
 	// show the window
 	m_commandWindows[ EVACUATE_ID ]->winHide( FALSE );
@@ -180,7 +175,7 @@ void ControlBar::populateStructureInventory( Object *building )
 		m_commandWindows[ EVACUATE_ID ]->winEnable( TRUE );
 		m_commandWindows[ STOP_ID ]->winEnable( TRUE );
 	}
-	
+
 	//
 	// iterate each of the objects inside the container and put them in a button, note
 	// we're iterating in reverse order here
@@ -198,7 +193,7 @@ void ControlBar::populateStructureInventory( Object *building )
 	//
 	m_lastRecordedInventoryCount = contain->getContainCount();
 
-}  // end populateStructureInventory
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -212,7 +207,7 @@ void ControlBar::updateContextStructureInventory( void )
 	// in that case we want to unselect the building so that we can't see the contents
 	//
 	Player *localPlayer = ThePlayerList->getLocalPlayer();
-	if( source->isLocallyControlled() == FALSE && 
+	if( source->isLocallyControlled() == FALSE &&
 			localPlayer->getRelationship( source->getTeam() ) != NEUTRAL )
 	{
 		Drawable *draw = source->getDrawable();
@@ -221,19 +216,19 @@ void ControlBar::updateContextStructureInventory( void )
 			TheInGameUI->deselectDrawable( draw );
 		return;
 
-	}  // end if
+	}
 
 	//
 	// if the object being displayed in the interface has a different count than we last knew
 	// about we need to repopulate the buttons of the interface
 	//
 	ContainModuleInterface *contain = source->getContain();
-	DEBUG_ASSERTCRASH( contain, ("No contain module defined for object in the iventory bar\n") );
+	DEBUG_ASSERTCRASH( contain, ("No contain module defined for object in the iventory bar") );
 	if (!contain)
 		return;
 
 	if( m_lastRecordedInventoryCount != contain->getContainCount() )
 		populateStructureInventory( source );
 
-}  // end updateContextStructureInventory
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
index fab6b00b4c8..b85445884db 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/NameKeyGenerator.h"
 #include "Common/ThingTemplate.h"
@@ -52,17 +52,17 @@ void ControlBar::updateConstructionTextDisplay( Object *obj )
 	GameWindow *descWindow = TheWindowManager->winGetWindowFromId( NULL, descID );
 
 	// santiy
-	DEBUG_ASSERTCRASH( descWindow, ("Under construction window not found\n") );
+	DEBUG_ASSERTCRASH( descWindow, ("Under construction window not found") );
 
 	// format the message
-	text.format( TheGameText->fetch( "CONTROLBAR:UnderConstructionDesc" ), 
+	text.format( TheGameText->fetch( "CONTROLBAR:UnderConstructionDesc" ),
 							 obj->getConstructionPercent() );
 	GadgetStaticTextSetText( descWindow, text );
 
 	// record this as the last percentage displayed
 	m_displayedConstructPercent = obj->getConstructionPercent();
 
-}  // end updateConstructionTextDisplay
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Populate the interface for an under construction context. */
@@ -86,7 +86,7 @@ void ControlBar::populateUnderConstruction( Object *objectUnderConstruction )
 
 	setControlCommand( win, commandButton );
 	win->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
-	
+
 	// set the text description of what is building
 	updateConstructionTextDisplay( objectUnderConstruction );
 
@@ -99,7 +99,7 @@ void ControlBar::populateUnderConstruction( Object *objectUnderConstruction )
 		showRallyPoint( exit->getRallyPoint() );
 
 
-}  // end populateUnderConstruction
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -114,10 +114,10 @@ void ControlBar::updateContextUnderConstruction( void )
 		evaluateContextUI();
 		return;
 
-	}  // end if
+	}
 
 	// if the construction percent has changed since what was last shown to the user update the text
 	if( m_displayedConstructPercent != obj->getConstructionPercent() )
 		updateConstructionTextDisplay( obj );
 
-}  // end updatecontextUnderConstruction
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp
index 2b1f9bd70c0..6c2ffe60e4a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/DisconnectMenu.h"
 #include "GameClient/GUICallbacks.h"
@@ -34,7 +34,7 @@
 #include "GameClient/GameText.h"
 #include "GameNetwork/NetworkInterface.h"
 
-const char *DisconnectMenu::m_playerNameTextControlNames[] = {
+const char *const DisconnectMenu::m_playerNameTextControlNames[] = {
 	"DisconnectScreen.wnd:StaticPlayer1Name",
 	"DisconnectScreen.wnd:StaticPlayer2Name",
 	"DisconnectScreen.wnd:StaticPlayer3Name",
@@ -45,7 +45,7 @@ const char *DisconnectMenu::m_playerNameTextControlNames[] = {
 	NULL
 };
 
-const char *DisconnectMenu::m_playerTimeoutTextControlNames[] = {
+const char *const DisconnectMenu::m_playerTimeoutTextControlNames[] = {
 	"DisconnectScreen.wnd:StaticPlayer1Timeout",
 	"DisconnectScreen.wnd:StaticPlayer2Timeout",
 	"DisconnectScreen.wnd:StaticPlayer3Timeout",
@@ -56,7 +56,7 @@ const char *DisconnectMenu::m_playerTimeoutTextControlNames[] = {
 	NULL
 };
 
-const char *DisconnectMenu::m_playerVoteButtonControlNames[] = {
+const char *const DisconnectMenu::m_playerVoteButtonControlNames[] = {
 	"DisconnectScreen.wnd:ButtonKickPlayer1",
 	"DisconnectScreen.wnd:ButtonKickPlayer2",
 	"DisconnectScreen.wnd:ButtonKickPlayer3",
@@ -67,7 +67,7 @@ const char *DisconnectMenu::m_playerVoteButtonControlNames[] = {
 	NULL
 };
 
-const char *DisconnectMenu::m_playerVoteCountControlNames[] = {
+const char *const DisconnectMenu::m_playerVoteCountControlNames[] = {
 	"DisconnectScreen.wnd:StaticPlayer1Votes",
 	"DisconnectScreen.wnd:StaticPlayer2Votes",
 	"DisconnectScreen.wnd:StaticPlayer3Votes",
@@ -78,9 +78,9 @@ const char *DisconnectMenu::m_playerVoteCountControlNames[] = {
 	NULL
 };
 
-const char *DisconnectMenu::m_packetRouterTimeoutControlName = "DisconnectScreen.wnd:StaticPacketRouterTimeout";
-const char *DisconnectMenu::m_packetRouterTimeoutLabelControlName = "DisconnectScreen.wnd:StaticPacketRouterTimeoutLabel";
-const char *DisconnectMenu::m_textDisplayControlName = "DisconnectScreen.wnd:ListboxTextDisplay";
+const char *const DisconnectMenu::m_packetRouterTimeoutControlName = "DisconnectScreen.wnd:StaticPacketRouterTimeout";
+const char *const DisconnectMenu::m_packetRouterTimeoutLabelControlName = "DisconnectScreen.wnd:StaticPacketRouterTimeoutLabel";
+const char *const DisconnectMenu::m_textDisplayControlName = "DisconnectScreen.wnd:ListboxTextDisplay";
 
 static const Color chatNormalColor =  GameMakeColor(255,0,0,255);
 
@@ -121,7 +121,7 @@ void DisconnectMenu::setPlayerName(Int playerNum, UnicodeString name) {
 	GameWindow *control = TheWindowManager->winGetWindowFromId(NULL, id);
 
 	if (control != NULL) {
-		if (name.getLength() > 0) {
+		if (!name.isEmpty()) {
 			GadgetStaticTextSetText(control, name);
 //			showPlayerControls(playerNum);
 		}
@@ -131,12 +131,12 @@ void DisconnectMenu::setPlayerName(Int playerNum, UnicodeString name) {
 	control = TheWindowManager->winGetWindowFromId(NULL, id);
 
 	if (control != NULL) {
-		if (name.getLength() > 0) {
-			GadgetStaticTextSetText(control, UnicodeString(L""));
+		if (!name.isEmpty()) {
+			GadgetStaticTextSetText(control, L"");
 		}
 	}
 
-	if (name.getLength() > 0) {
+	if (!name.isEmpty()) {
 		showPlayerControls(playerNum);
 	} else {
 		hidePlayerControls(playerNum);
@@ -224,7 +224,7 @@ void DisconnectMenu::showPacketRouterTimeout() {
 	control = TheWindowManager->winGetWindowFromId(NULL, id);
 
 	if (control != NULL) {
-		GadgetStaticTextSetText(control, UnicodeString(L"")); // start it off with a blank string.
+		GadgetStaticTextSetText(control, L""); // start it off with a blank string.
 		control->winHide(FALSE);
 	}
 }
@@ -294,7 +294,7 @@ void DisconnectMenu::removePlayer(Int slot, UnicodeString playerName) {
 }
 
 void DisconnectMenu::voteForPlayer(Int slot) {
-	DEBUG_LOG(("Casting vote for disconnect slot %d\n", slot));
+	DEBUG_LOG(("Casting vote for disconnect slot %d", slot));
 	TheNetwork->voteForPlayerDisconnect(slot); // Do this next.
 }
 
@@ -312,4 +312,4 @@ void DisconnectMenu::updateVotes(Int slot, Int votes) {
 
 		GadgetStaticTextSetText(control, unistr);
 	}
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
index cd22e2b5562..223e4afae78 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
@@ -24,7 +24,7 @@
 
 //// EstablishConnectionsMenu.cpp /////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GUICallbacks.h"
 #include "GameClient/EstablishConnectionsMenu.h"
@@ -36,7 +36,7 @@
 
 EstablishConnectionsMenu *TheEstablishConnectionsMenu = NULL;
 
-const char *EstablishConnectionsMenu::m_playerReadyControlNames[] = {
+const char *const EstablishConnectionsMenu::m_playerReadyControlNames[] = {
 	"EstablishConnectionsScreen.wnd:ButtonAccept1",
 	"EstablishConnectionsScreen.wnd:ButtonAccept2",
 	"EstablishConnectionsScreen.wnd:ButtonAccept3",
@@ -46,7 +46,7 @@ const char *EstablishConnectionsMenu::m_playerReadyControlNames[] = {
 	"EstablishConnectionsScreen.wnd:ButtonAccept7",
 	NULL};
 
-const char *EstablishConnectionsMenu::m_playerNameControlNames[] = {
+const char *const EstablishConnectionsMenu::m_playerNameControlNames[] = {
 	"EstablishConnectionsScreen.wnd:StaticPlayer1Name",
 	"EstablishConnectionsScreen.wnd:StaticPlayer2Name",
 	"EstablishConnectionsScreen.wnd:StaticPlayer3Name",
@@ -57,7 +57,7 @@ const char *EstablishConnectionsMenu::m_playerNameControlNames[] = {
 	NULL
 };
 
-const char *EstablishConnectionsMenu::m_playerStatusControlNames[] = {
+const char *const EstablishConnectionsMenu::m_playerStatusControlNames[] = {
 	"EstablishConnectionsScreen.wnd:StaticPlayer1Status",
 	"EstablishConnectionsScreen.wnd:StaticPlayer2Status",
 	"EstablishConnectionsScreen.wnd:StaticPlayer3Status",
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
index b15e2a1656f..fef643087a1 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
@@ -29,8 +29,9 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/GameUtility.h"
 #include "Common/NameKeyGenerator.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -64,30 +65,26 @@ WindowLayout *popupCommunicatorLayout = NULL;
 WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 																	 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	// get player
-	Player *player = ThePlayerList->getLocalPlayer();
-
 	//
 	// if the player doesn't have a radar, or the radar is hidden, and the radar is not being
 	// forced to on, we just eat input over the radar window
 	//
-	if( !TheRadar->isRadarForced() && (TheRadar->isRadarHidden() || !player->hasRadar()) )
+	if( !rts::localPlayerHasRadar() )
 		return MSG_HANDLED;
-	
-	// If the middle mouse button is depressed, then just let the message fall all the 
+
+	// If the middle mouse button is depressed, then just let the message fall all the
 	// way back to the usual middle mouse button processing.
 	// jkmcd
 	if( TheMouse->getMouseStatus()->middleState == MBS_Down )
 		return MSG_IGNORED;
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		/** @todo
 			This is wrong.  The radar should be in the message stream, and eat all messages and propagate them
-			as a new message with the coords converted to world coords and the message flagged as being from 
-			the radar.  This would let all of the normal processing occur, and allow individual commands to easily 
+			as a new message with the coords converted to world coords and the message flagged as being from
+			the radar.  This would let all of the normal processing occur, and allow individual commands to easily
 			reject being used on the radar.
 		*/
 
@@ -103,7 +100,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 			//
 			Bool targeting = FALSE;
 			const CommandButton *command = TheInGameUI->getGUICommand();
-			if( command 
+			if( command
 					&& (command->getCommandType() == GUI_COMMAND_SPECIAL_POWER || command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT)
 					&& BitIsSet( command->getOptions(), NEED_TARGET_POS ) )
 				targeting = TRUE;
@@ -113,7 +110,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 				const DrawableList *drawableList = TheInGameUI->getAllSelectedLocalDrawables();
 				Mouse::MouseCursor cur = Mouse::ARROW;
 
-				if (!(drawableList->empty() || msg == GWM_MOUSE_LEAVING)) 
+				if (!(drawableList->empty() || msg == GWM_MOUSE_LEAVING))
 				{
 					if (command && command->getCommandType() == GUI_COMMAND_ATTACK_MOVE)
 					{
@@ -128,7 +125,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 				// Groovy
 				TheMouse->setCursor(cur);
 
-			}  // end if
+			}
 
 			return MSG_HANDLED;
 		}
@@ -152,22 +149,21 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 
 			// is the mouse in the radar window
 			ICoord2D radar;
-			if( (TheRadar->isRadarHidden() == FALSE || TheRadar->isRadarForced()) &&
-					TheRadar->localPixelToRadar( &mouse, &radar ) )
+			if( TheRadar->localPixelToRadar( &mouse, &radar ) )
 			{
 
 /*
 //
-// this is an example piece of code to find the object under the pixel position 
+// this is an example piece of code to find the object under the pixel position
 // of the radar ... should we in the future wish to allow commands to be executed
-// on objects throught he radar.  note tho that this is extremely hard to do because
+// on objects through the radar.  note tho that this is extremely hard to do because
 // the pixels on the radar are very small and it's hard to do accurate targeting
 //
 
 				Object *obj = TheRadar->objectUnderRadarPixel( &mouse );
 				UnicodeString msg;
 				if( obj )
-					msg.format( L"Object under mouse on radar '%S'(%d)", 
+					msg.format( L"Object under mouse on radar '%S'(%d)",
 											obj->getTemplate()->getName().str(), obj->getID() );
 				else
 					msg.format( L"Mouse (%d,%d) in Radar window L(%d,%d)", mouse.x, mouse.y, radar.x, radar.y );
@@ -176,7 +172,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 
 				// keep the cursor for any context commands
 				const CommandButton *command = TheInGameUI->getGUICommand();
-				if( command 
+				if( command
 						&& (command->getCommandType() == GUI_COMMAND_SPECIAL_POWER || command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT)
 						&& BitIsSet( command->getOptions(), NEED_TARGET_POS ) )
 				{
@@ -187,7 +183,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 					else
 						TheMouse->setCursor( Mouse::CROSS );
 
-				}  // end if
+				}
 				else
 				{
 					// Else we are not super targeting, so we have to try to refresh the move cursor.
@@ -196,7 +192,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 					const DrawableList *drawableList = TheInGameUI->getAllSelectedLocalDrawables();
 					Mouse::MouseCursor cur = Mouse::ARROW;
 
-					if (!(drawableList->empty() || msg == GWM_MOUSE_LEAVING)) 
+					if (!(drawableList->empty() || msg == GWM_MOUSE_LEAVING))
 					{
 						if (command && command->getCommandType() == GUI_COMMAND_ATTACK_MOVE)
 						{
@@ -212,11 +208,11 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 					TheMouse->setCursor(cur);
 				}
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end case mouse position
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_RIGHT_UP:// Here to eat
@@ -238,7 +234,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 			// get mouse position
 			mouse.x = mData1 & 0xFFFF;
 			mouse.y = mData1 >> 16;
-			
+
 			// get window screen position
 			window->winGetScreenPosition( &screenPos.x, &screenPos.y );
 
@@ -252,9 +248,8 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 			// completely drawn with the radar ... so it's just a translation from
 			// our window size we're drawing into to the radar cell size
 			//
-			if( (TheRadar->isRadarHidden() == FALSE || TheRadar->isRadarForced()) &&
-					TheRadar->localPixelToRadar( &mouse, &radar ) &&
-					TheRadar->radarToWorld( &radar, &world ) )
+			if( TheRadar->localPixelToRadar( &mouse, &radar ) &&
+			    TheRadar->radarToWorld( &radar, &world ) )
 			{
 
 				// No drawables, or a right click automatically means its a look at.
@@ -262,9 +257,9 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 				// Having drawables and not being in attack move mode means that we should move.
 
 				const DrawableList *drawableList = TheInGameUI->getAllSelectedLocalDrawables(); // locally-owned only
-				
+
 				// see if the user wants to move the tactical view
-				if (	drawableList->empty() 
+				if (	drawableList->empty()
 					||	(! TheGlobalData->m_useAlternateMouse && msg == GWM_RIGHT_DOWN)
 					||	(TheGlobalData->m_useAlternateMouse && msg == GWM_LEFT_DOWN)	)
 				{
@@ -274,16 +269,16 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 
 				// evaluate any special powers that can be executed from the radar
 				const CommandButton *command = TheInGameUI->getGUICommand();
-				if( command 
+				if( command
 					&& (command->getCommandType() == GUI_COMMAND_SPECIAL_POWER || command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT)
-					&& BitIsSet( command->getOptions(), NEED_TARGET_POS ) 
+					&& BitIsSet( command->getOptions(), NEED_TARGET_POS )
 					)
 				{
 
 					// do the command
 					TheGameClient->evaluateContextCommand( NULL, &world, CommandTranslator::DO_COMMAND );
 
-				}  // end if
+				}
 				else if( command && command->getCommandType() == GUI_COMMAND_ATTACK_MOVE)
 				{
 					// Attack move has changed from a modifier to a command, so it moves up here.
@@ -301,7 +296,7 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 					// Do the superweapon stuff here, before issuing these other messages
 
 					// GS Leaving commented out to show that isInAttackMoveToMode is NEVER SET.  It's a command now, not a modifier.
-//					if (TheInGameUI->isInAttackMoveToMode()) 
+//					if (TheInGameUI->isInAttackMoveToMode())
 //					{
 //						newMsg = TheMessageStream->appendMessage(GameMessage::MSG_DO_ATTACKMOVETO);
 //						newMsg->appendLocationArgument(world);
@@ -314,26 +309,26 @@ WindowMsgHandledType LeftHUDInput( GameWindow *window, UnsignedInt msg,
 					newMsg->appendLocationArgument(world);
 					// Play the unit voice response
 					pickAndPlayUnitVoiceResponse(drawableList, GameMessage::MSG_DO_MOVETO);
-				
-				}  // end else
+
+				}
 
 			}
-			
+
 
 	break;
 
-		}  // end left down
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	TheInGameUI->clearAttackMoveToMode();
 	return MSG_HANDLED;
 
-}  // end LeftHUDInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Input procedure for the control bar */
@@ -344,29 +339,29 @@ WindowMsgHandledType ControlBarInput( GameWindow *window, UnsignedInt msg,
 
 	return MSG_IGNORED;
 
-}  // end ControlBarInput
+}
 void ToggleQuitMenu(void);
 //-------------------------------------------------------------------------------------------------
 /** System callback for the control bar parent */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType ControlBarSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ControlBarSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	static NameKeyType buttonCommunicator = NAMEKEY_INVALID;
 	if(TheScriptEngine && TheScriptEngine->isGameEnding())
 		return MSG_IGNORED;
-	switch( msg ) 
+	switch( msg )
 	{
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
 
 			// get ids for our children controls
-			buttonCommunicator = TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:PopupCommunicator") );
+			buttonCommunicator = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PopupCommunicator" );
 
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_MOUSE_ENTERING:
@@ -430,7 +425,7 @@ WindowMsgHandledType ControlBarSystem( GameWindow *window, UnsignedInt msg,
 			//			{
 			//				TheControlBar->switchControlBarStage( CONTROL_BAR_STAGE_SQUISHED	);
 			//			}
-			
+
 			else if( controlID == buttonLargeID)
 			{
 				TheControlBar->toggleControlBarStage();
@@ -454,7 +449,7 @@ WindowMsgHandledType ControlBarSystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GEM_EDIT_DONE:
@@ -479,17 +474,17 @@ WindowMsgHandledType ControlBarSystem( GameWindow *window, UnsignedInt msg,
 				}
 			}
 			break;
-		} // end edit done
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end ControlBarSystem
+}
 
 extern void showReplayControls( void );
 extern void hideReplayControls( void );
@@ -500,121 +495,114 @@ extern void toggleReplayControls( void );
 //-------------------------------------------------------------------------------------------------
 void ShowControlBar( Bool immediate )
 {
+	if (!TheWindowManager || !TheControlBar)
+		return;
+
 	showReplayControls();
-	if(TheControlBar)
-		TheControlBar->showSpecialPowerShortcut();
-	if (TheWindowManager)
+
+	TheControlBar->showSpecialPowerShortcut();
+
+	Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent");
+	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
+
+	if (window)
 	{
-		Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
-		GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
+		TheControlBar->switchControlBarStage(CONTROL_BAR_STAGE_DEFAULT);
+		TheControlBar->setScaledViewportHeight();
 
-		if (window)
-		{	
-			TheControlBar->switchControlBarStage(CONTROL_BAR_STAGE_DEFAULT);
-			TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f));
-			if (TheControlBar->m_animateWindowManager && !immediate)
-			{
-				TheControlBar->m_animateWindowManager->reset();
-				//TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM_TIMED, TRUE, 1000, 0);
-				TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM, TRUE, 500, 0);
-				TheControlBar->animateSpecialPowerShortcut(TRUE);
-			}
-			window->winHide(FALSE);
+		if (TheControlBar->m_animateWindowManager && !immediate)
+		{
+			TheControlBar->m_animateWindowManager->reset();
+			//TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM_TIMED, TRUE, 1000, 0);
+			TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM, TRUE, 500, 0);
+			TheControlBar->animateSpecialPowerShortcut(TRUE);
 		}
 
-	}  
+		window->winHide(FALSE);
+	}
 
 	// We want to get everything recalced since this is a major state change.
-	if(TheControlBar)
-		TheControlBar->markUIDirty();
-
-}// void ShowControlBar(void)
+	TheControlBar->markUIDirty();
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Force the control bar to be hidden */
 //-------------------------------------------------------------------------------------------------
 void HideControlBar( Bool immediate )
 {
+	if (!TheWindowManager || !TheControlBar)
+		return;
+
 	hideReplayControls();
-	if(TheControlBar)
-		TheControlBar->hideSpecialPowerShortcut();
-	if (TheWindowManager)
-	{
-		Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
-		GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
 
-		if (window)
-		{
+	TheControlBar->hideSpecialPowerShortcut();
+
+	Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent");
+	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
+
+	if (window)
+	{
 #ifdef SLIDE_LETTERBOX
-				TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f)); 
+		TheControlBar->setScaledViewportHeight();
 #else
-				TheTacticalView->setHeight(TheDisplay->getHeight());
+		TheControlBar->setFullViewportHeight();
 #endif
-		}
 		if (immediate)
 		{
 			window->winHide(TRUE);
-			if(TheControlBar)
-				TheControlBar->hideSpecialPowerShortcut();
-	
-		}
-		else
-		{
-			TheControlBar->m_animateWindowManager->reverseAnimateWindow();
-			TheControlBar->animateSpecialPowerShortcut(FALSE);
 		}
+	}
 
-		//Always get rid of the purchase science screen!
-		if( TheControlBar )
-		{
-			TheControlBar->hidePurchaseScience();
-		}
-	}  
-}//void HideControlBar( void )
+	if (TheControlBar->m_animateWindowManager && !immediate)
+	{
+		TheControlBar->m_animateWindowManager->reverseAnimateWindow();
+		TheControlBar->animateSpecialPowerShortcut(FALSE);
+	}
+
+	//Always get rid of the purchase science screen!
+	TheControlBar->hidePurchaseScience();
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Toggle the control bar on or off */
 //-------------------------------------------------------------------------------------------------
 void ToggleControlBar( Bool immediate )
 {
+	if (!TheWindowManager || !TheControlBar)
+		return;
+
 	toggleReplayControls();
 
-	if (TheWindowManager)
-	{
-		Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
-		GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
+	Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent");
+	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
 
-		if (window)
+	if (window)
+	{
+		if (window->winIsHidden())
 		{
-			if (window->winIsHidden())
-			{
-				if(TheControlBar)	
-					TheControlBar->showSpecialPowerShortcut();
-
-				//now hidden, we're making it visible again so shrink viewport under the window
-				TheTacticalView->setHeight((Int)(TheDisplay->getHeight() * 0.80f)); 
-				window->winHide(!window->winIsHidden());
-				TheControlBar->switchControlBarStage(CONTROL_BAR_STAGE_DEFAULT);
-				if (TheControlBar->m_animateWindowManager && !immediate)
-				{
-					TheControlBar->m_animateWindowManager->reset();
-					//TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM_TIMED, FALSE, 500, 0);
-					TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM, TRUE, 500, 0);
-					TheControlBar->animateSpecialPowerShortcut(TRUE);
-				}
-			}
-			else
+			TheControlBar->showSpecialPowerShortcut();
+
+			//now hidden, we're making it visible again so shrink viewport under the window
+			TheControlBar->setScaledViewportHeight();
+			window->winHide(FALSE);
+			TheControlBar->switchControlBarStage(CONTROL_BAR_STAGE_DEFAULT);
+
+			if (TheControlBar->m_animateWindowManager && !immediate)
 			{
-				if(TheControlBar)
-					TheControlBar->hideSpecialPowerShortcut();
-				TheTacticalView->setHeight(TheDisplay->getHeight());
-				window->winHide(!window->winIsHidden());
+				TheControlBar->m_animateWindowManager->reset();
+				//TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM_TIMED, FALSE, 500, 0);
+				TheControlBar->m_animateWindowManager->registerGameWindow(window, WIN_ANIMATION_SLIDE_BOTTOM, TRUE, 500, 0);
+				TheControlBar->animateSpecialPowerShortcut(TRUE);
 			}
-			
 		}
-
+		else
+		{
+			TheControlBar->hideSpecialPowerShortcut();
+			TheControlBar->setFullViewportHeight();
+			window->winHide(TRUE);
+		}
 	}
-}// end void ToggleControlBar( void )
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Resize the control bar */
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
index 3546d55f6a3..3619dd01bbb 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ControlBarPopupDescription.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,8 +37,8 @@
 //	Filename: 	ControlBarPopupDescription.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -65,7 +65,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/BuildAssistant.h"
@@ -93,11 +93,6 @@
 #include "GameLogic/ScriptEngine.h"
 
 #include "GameNetwork/NetworkInterface.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static WindowLayout *theLayout = NULL;
 static GameWindow *theWindow = NULL;
@@ -108,25 +103,25 @@ void ControlBarPopupDescriptionUpdateFunc( WindowLayout *layout, void *param )
 {
 	if(TheScriptEngine->isGameEnding())
 		TheControlBar->hideBuildTooltipLayout();
-	
+
 	if(theAnimateWindowManager && !TheControlBar->getShowBuildTooltipLayout() && !theAnimateWindowManager->isReversed())
 		theAnimateWindowManager->reverseAnimateWindow();
 	else if(!TheControlBar->getShowBuildTooltipLayout() && (!TheGlobalData->m_animateWindows || !useAnimation))
 		TheControlBar->deleteBuildTooltipLayout();
-		
+
 
 	if ( useAnimation && theAnimateWindowManager && TheGlobalData->m_animateWindows)
 	{
 		Bool wasFinished = theAnimateWindowManager->isFinished();
 		theAnimateWindowManager->update();
-		if (theAnimateWindowManager && theAnimateWindowManager->isFinished() && !wasFinished && theAnimateWindowManager->isReversed())
+		if (theAnimateWindowManager->isFinished() && !wasFinished && theAnimateWindowManager->isReversed())
 		{
 			delete theAnimateWindowManager;
 			theAnimateWindowManager = NULL;
 			TheControlBar->deleteBuildTooltipLayout();
 		}
 	}
-	
+
 }
 
 // ---------------------------------------------------------------------------------------
@@ -140,15 +135,15 @@ void ControlBar::showBuildTooltipLayout( GameWindow *cmdButton )
 	Bool passedWaitTime = FALSE;
 	static Bool isInitialized = FALSE;
 	static UnsignedInt beginWaitTime;
-	if(prevWindow == cmdButton)	
+	if(prevWindow == cmdButton)
 	{
 		m_showBuildToolTipLayout = TRUE;
 		if(!isInitialized &&  beginWaitTime + cmdButton->getTooltipDelay() < timeGetTime())
 		{
-			//DEBUG_LOG(("%d beginwaittime, %d tooltipdelay, %dtimegettime\n", beginWaitTime, cmdButton->getTooltipDelay(), timeGetTime()));
+			//DEBUG_LOG(("%d beginwaittime, %d tooltipdelay, %dtimegettime", beginWaitTime, cmdButton->getTooltipDelay(), timeGetTime()));
 			passedWaitTime = TRUE;
 		}
-		
+
 		if(!passedWaitTime)
 			return;
 	}
@@ -167,11 +162,11 @@ void ControlBar::showBuildTooltipLayout( GameWindow *cmdButton )
 //			m_buildToolTipLayout = NULL;
 			m_buildToolTipLayout->hide(TRUE);
 			prevWindow = NULL;
-		}	
+		}
 		return;
 	}
-	
-	
+
+
 	// will only get here the firsttime through the function through this window
 	if(!passedWaitTime)
 	{
@@ -187,7 +182,7 @@ void ControlBar::showBuildTooltipLayout( GameWindow *cmdButton )
 	if(BitIsSet(cmdButton->winGetStyle(), GWS_PUSH_BUTTON))
 	{
 		const CommandButton *commandButton = (const CommandButton *)GadgetButtonGetData(cmdButton);
-		
+
 		if(!commandButton)
 			return;
 
@@ -213,7 +208,7 @@ void ControlBar::showBuildTooltipLayout( GameWindow *cmdButton )
 		m_showBuildToolTipLayout = TRUE;
 		//	m_buildToolTipLayout = TheWindowManager->winCreateLayout( "ControlBarPopupDescription.wnd" );
 		//	m_buildToolTipLayout->setUpdate(ControlBarPopupDescriptionUpdateFunc);
-		
+
 		populateBuildTooltipLayout(commandButton);
 	}
 	else
@@ -227,12 +222,12 @@ void ControlBar::showBuildTooltipLayout( GameWindow *cmdButton )
 
 	if (useAnimation && TheGlobalData->m_animateWindows)
 	{
-		theAnimateWindowManager = NEW AnimateWindowManager;	
+		theAnimateWindowManager = NEW AnimateWindowManager;
 		theAnimateWindowManager->reset();
 		theAnimateWindowManager->registerGameWindow( m_buildToolTipLayout->getFirstWindow(), WIN_ANIMATION_SLIDE_RIGHT_FAST, TRUE, 200 );
 	}
-	
-	
+
+
 }
 
 
@@ -264,16 +259,16 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 		const ThingTemplate *thingTemplate = commandButton->getThingTemplate();
 		const UpgradeTemplate *upgradeTemplate = commandButton->getUpgradeTemplate();
 
-		ScienceType	st = SCIENCE_INVALID; 
+		ScienceType	st = SCIENCE_INVALID;
 		if( commandButton->getCommandType() != GUI_COMMAND_PLAYER_UPGRADE &&
-				commandButton->getCommandType() != GUI_COMMAND_OBJECT_UPGRADE ) 
+				commandButton->getCommandType() != GUI_COMMAND_OBJECT_UPGRADE )
 		{
-			if( commandButton->getScienceVec().size() > 1 ) 						
+			if( commandButton->getScienceVec().size() > 1 )
 			{
 				for(size_t j = 0; j < commandButton->getScienceVec().size(); ++j)
 				{
 					st = commandButton->getScienceVec()[ j ];
-					
+
 					if( commandButton->getCommandType() != GUI_COMMAND_PURCHASE_SCIENCE )
 					{
 						if( !player->hasScience( st ) && j > 0 )
@@ -335,10 +330,10 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 								else
 									descrip.concat( TheGameText->fetch( "TOOLTIP:TooltipNukeReactorOverChargeIsOff" ) );
 							}
-						}  
+						}
 					}
-				} //End overcharge special case
-				
+				}
+
 				//Special case: When building units & buildings, the CanMakeType determines reasons for not being able to buy stuff.
 				else if( thingTemplate )
 				{
@@ -394,7 +389,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 						}
 					}
 				}
-				
+
 			}
 
 		}
@@ -403,7 +398,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 
 		if( thingTemplate && commandButton->getCommandType() != GUI_COMMAND_PURCHASE_SCIENCE )
 		{
-			//We are either looking at building a unit or a structure that may or may not have any 
+			//We are either looking at building a unit or a structure that may or may not have any
 			//prerequisites.
 
 			//Format the cost only when we have to pay for it.
@@ -414,12 +409,12 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 			}
 
 			// ask each prerequisite to give us a list of the non satisfied prerequisites
-			for( Int i=0; i<thingTemplate->getPrereqCount(); i++ ) 
+			for( Int i=0; i<thingTemplate->getPrereqCount(); i++ )
 			{
 				prereq = thingTemplate->getNthPrereq(i);
 				requiresList = prereq->getRequiresList(player);
 
-				if( requiresList != UnicodeString::TheEmptyString ) 
+				if( requiresList != UnicodeString::TheEmptyString )
 				{
 					// make sure to put in 'returns' to space things correctly
 					if (firstRequirement)
@@ -451,7 +446,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 
 			if( !hasUpgradeAlready )
 			{
-				//Check if the first selected object has the specified upgrade. 
+				//Check if the first selected object has the specified upgrade.
 				Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
 				if( draw )
 				{
@@ -518,11 +513,11 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 					descrip.concat( requiresFormat );
 				}
 			}
-		}	
+		}
 		else if( st != SCIENCE_INVALID && !fireScienceButton )
 		{
 			TheScienceStore->getNameAndDescription(st, name, descrip);
-			
+
 			costToBuild = TheScienceStore->getSciencePurchaseCost( st );
 			if( costToBuild > 0 )
 			{
@@ -532,12 +527,12 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 			// ask each prerequisite to give us a list of the non satisfied prerequisites
 			if( thingTemplate )
 			{
-				for( Int i=0; i<thingTemplate->getPrereqCount(); i++ ) 
+				for( Int i=0; i<thingTemplate->getPrereqCount(); i++ )
 				{
 					prereq = thingTemplate->getNthPrereq(i);
 					requiresList = prereq->getRequiresList(player);
 
-					if( requiresList != UnicodeString::TheEmptyString ) 
+					if( requiresList != UnicodeString::TheEmptyString )
 					{
 						// make sure to put in 'returns' to space things correctly
 						if (firstRequirement)
@@ -561,7 +556,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 	}
 	else if(tooltipWin)
 	{
-		
+
 		if( tooltipWin == TheWindowManager->winGetWindowFromId(m_buildToolTipLayout->getFirstWindow(), TheNameKeyGenerator->nameToKey("ControlBar.wnd:MoneyDisplay")))
 		{
 			name = TheGameText->fetch("CONTROLBAR:Money");
@@ -572,11 +567,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 			name = TheGameText->fetch("CONTROLBAR:Power");
 			descrip = TheGameText->fetch("CONTROLBAR:PowerDescription");
 
-			Player *playerToDisplay = NULL;
-			if(TheControlBar->isObserverControlBarOn())
-				playerToDisplay = TheControlBar->getObserverLookAtPlayer();
-			else
-				playerToDisplay = ThePlayerList->getLocalPlayer();
+			Player* playerToDisplay = getCurrentlyViewedPlayer();
 
 			if( playerToDisplay && playerToDisplay->getEnergy() )
 			{
@@ -598,7 +589,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 			DEBUG_ASSERTCRASH(FALSE, ("ControlBar::populateBuildTooltipLayout We attempted to call the popup tooltip on a game window that has yet to be hand coded in as this fuction was/is designed for only buttons but has been hacked to work with GameWindows."));
 			return;
 		}
-		
+
 	}
 	GameWindow *win = TheWindowManager->winGetWindowFromId(m_buildToolTipLayout->getFirstWindow(), TheNameKeyGenerator->nameToKey("ControlBarPopupDescription.wnd:StaticTextName"));
 	if(win)
@@ -624,12 +615,12 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 	if(win)
 	{
 
-		static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) );
+		static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" );
 		static ICoord2D lastOffset = { 0, 0 };
 
 		ICoord2D size, newSize, pos;
 		Int diffSize;
-		
+
 		DisplayString *tempDString = TheDisplayStringManager->newDisplayString();
 		win->winGetSize(&size.x, &size.y);
 		tempDString->setFont(win->winGetFont());
@@ -642,7 +633,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
  		GameWindow *parent = m_buildToolTipLayout->getFirstWindow();
  		if(!parent)
  			return;
-		
+
  		parent->winGetSize(&size.x, &size.y);
  		if(size.y + diffSize < 102) {
 			diffSize = 102 - size.y;
@@ -652,7 +643,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
  		parent->winGetPosition(&pos.x, &pos.y);
 //		if(size.y + diffSize < 102)
 //		{
-//			
+//
 //			parent->winSetPosition(pos.x, pos.y -  (102 - (newSize.y + size.y + diffSize) ));
 //		}
 //		else
@@ -665,7 +656,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 		{
 			return;
 		}
-		TheControlBar->getBackgroundMarkerPos(&basePos.x, &basePos.y);
+		getBackgroundMarkerPos(&basePos.x, &basePos.y);
 		ICoord2D curPos, offset;
 		marker->winGetScreenPosition(&curPos.x,&curPos.y);
 
@@ -680,7 +671,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 		win->winGetSize(&size.x, &size.y);
  		win->winSetSize(size.x, size.y + diffSize);
 
-		GadgetStaticTextSetText(win, descrip);		
+		GadgetStaticTextSetText(win, descrip);
 	}
 	m_buildToolTipLayout->hide(FALSE);
 }
@@ -705,12 +696,12 @@ void ControlBar::deleteBuildTooltipLayout( void )
 	m_buildToolTipLayout->hide(TRUE);
 //	if(!m_buildToolTipLayout)
 //		return;
-//	
+//
 //	m_buildToolTipLayout->destroyWindows();
 //	deleteInstance(m_buildToolTipLayout);
 //	m_buildToolTipLayout = NULL;
-	if(theAnimateWindowManager)
-		delete theAnimateWindowManager;
+
+	delete theAnimateWindowManager;
 	theAnimateWindowManager = NULL;
 
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
index 5f8db643746..da73cce360b 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/MultiplayerSettings.h"
@@ -57,11 +57,6 @@
 #include "GameNetwork/GameSpy/BuddyDefs.h"
 #include "GameNetwork/GameSpy/PeerDefs.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 
@@ -94,7 +89,7 @@ static Int slotNumInRow[MAX_SLOTS];
 static WindowLayout *theLayout = NULL;
 static GameWindow *theWindow = NULL;
 static AnimateWindowManager *theAnimateWindowManager = NULL;
-WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2);
 void InitBuddyControls(Int type);
 void updateBuddyInfo( void );
@@ -198,10 +193,10 @@ void UpdateDiplomacyBriefingText(AsciiString newText, Bool clear)
 // ------------------------------------------------------------------------------------------------
 void ShowDiplomacy( Bool immediate )
 {
-	if (!TheInGameUI->getInputEnabled() || TheGameLogic->isIntroMoviePlaying() || 
+	if (!TheInGameUI->getInputEnabled() || TheGameLogic->isIntroMoviePlaying() ||
 			TheGameLogic->isLoadingMap())
 		return;
-	
+
 
 	if (TheInGameUI->isQuitMenuVisible())
 		return;
@@ -279,7 +274,7 @@ void ShowDiplomacy( Bool immediate )
 		PopulateOldBuddyMessages();
 		updateBuddyInfo();
 	}
-	
+
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -295,8 +290,8 @@ void ResetDiplomacy( void )
 		theLayout = NULL;
 	}
 	theWindow = NULL;
-	if (theAnimateWindowManager)
-		delete theAnimateWindowManager;
+
+	delete theAnimateWindowManager;
 	theAnimateWindowManager = NULL;
 }
 
@@ -348,7 +343,7 @@ WindowMsgHandledType DiplomacyInput( GameWindow *window, UnsignedInt msg,
 																			WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -366,29 +361,29 @@ WindowMsgHandledType DiplomacyInput( GameWindow *window, UnsignedInt msg,
 					HideDiplomacy();
 					return MSG_HANDLED;
 					//return MSG_IGNORED;
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
 			return MSG_HANDLED;
 
-		}  // end char
+		}
 
 	}
 
 	return MSG_IGNORED;
 
-}  // end DiplomacyInput
+}
 
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType DiplomacySystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType DiplomacySystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	if(BuddyControlSystem(window, msg, mData1, mData2) == MSG_HANDLED)
 	{
 		return MSG_HANDLED;
 	}
-	switch( msg ) 
+	switch( msg )
 	{
 		//---------------------------------------------------------------------------------------------
 		case GGM_FOCUS_CHANGE:
@@ -397,17 +392,17 @@ WindowMsgHandledType DiplomacySystem( GameWindow *window, UnsignedInt msg,
 			//if (focus)
 				//TheWindowManager->winSetGrabWindow( chatTextEntry );
 			break;
-		} // end focus change
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-		{	
+		{
 			// if we're given the opportunity to take the keyboard focus we must say we don't want it
 			if( mData1 == TRUE )
 				*(Bool *)mData2 = FALSE;
 
 			return MSG_HANDLED;
-		}//case GWM_INPUT_FOCUS:
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -447,17 +442,17 @@ WindowMsgHandledType DiplomacySystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end DiplomacySystem
+}
 
 void PopulateInGameDiplomacyPopup( void )
 {
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
index 0f55c12c9ae..ec5c383e37e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
@@ -31,7 +31,7 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/NameKeyGenerator.h"
@@ -43,7 +43,7 @@
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/ExtendedMessageBox.h"
 
-WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt msg,
 										 WindowMsgData mData1, WindowMsgData mData2 );
 
 //-------------------------------------------------------------------------------------------------
@@ -62,8 +62,8 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne
 		return NULL;
 	}
 
-	GameWindow *parent = TheWindowManager->winCreateFromScript( AsciiString("Menus/MessageBox.wnd") ); 
-	TheWindowManager->winSetModal( parent ); 
+	GameWindow *parent = TheWindowManager->winCreateFromScript( "Menus/MessageBox.wnd" );
+	TheWindowManager->winSetModal( parent );
 	TheWindowManager->winSetFocus( NULL ); // make sure we lose focus from other windows even if we refuse focus ourselves
 	TheWindowManager->winSetFocus( parent	 );
 
@@ -78,8 +78,8 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne
 		ratioX = (float)width / (float)temp.x;
 		ratioY = (float)height / (float)temp.y;
 		//Set the window's new size
-		parent->winSetSize( width, height);	
-	
+		parent->winSetSize( width, height);
+
 		//Resize/reposition all the children windows based off the ratio
 		GameWindow *child;
 		for( child = parent->winGetChild(); child; child = child->winGetNext() )
@@ -95,37 +95,37 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne
 			child->winSetPosition(temp.x, temp.y);
 		}
 	}
-	
+
 	// If the user wants to position the message box somewhere other then default
 	if( x >= 0 && y >= 0)
-		parent->winSetPosition(x, y);	
-	
-	// Reposition the buttons 
+		parent->winSetPosition(x, y);
+
+	// Reposition the buttons
 	Int buttonX[3], buttonY[3];
-		 	
+
 	//In the layout, buttonOk will be in the first button position
-	NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonOk" ) );
+	NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonOk" );
 	GameWindow *buttonOk = TheWindowManager->winGetWindowFromId(parent, buttonOkID);
 	buttonOk->winGetPosition(&buttonX[0], &buttonY[0]);
 
-	NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonYes" ) );
+	NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonYes" );
 	GameWindow *buttonYes = TheWindowManager->winGetWindowFromId(parent, buttonYesID);
 	//buttonNo in the second position
-	NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonNo" ) );
+	NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonNo" );
 	GameWindow *buttonNo = TheWindowManager->winGetWindowFromId(parent, buttonNoID);
 	buttonNo->winGetPosition(&buttonX[1], &buttonY[1]);
-	
+
 	//and buttonCancel in the third
-	NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonCancel" ) );
+	NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonCancel" );
 	GameWindow *buttonCancel = TheWindowManager->winGetWindowFromId(parent, buttonCancelID);
 	buttonCancel->winGetPosition(&buttonX[2], &buttonY[2]);
-	
+
 	//we shouldn't have button OK and Yes on the same dialog
 	if((buttonFlags & (MSG_BOX_OK | MSG_BOX_YES)) == (MSG_BOX_OK | MSG_BOX_YES) )
 	{
 		DEBUG_ASSERTCRASH(false, ("Passed in MSG_BOX_OK and MSG_BOX_YES.  Big No No."));
 	}
-	
+
 	//Position the OK button if we have one
 	if( (buttonFlags & MSG_BOX_OK) == MSG_BOX_OK)
 	{
@@ -138,7 +138,7 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne
 		buttonYes->winSetPosition(buttonX[0], buttonY[0]);
 		buttonYes->winHide(FALSE);
 	}
-	
+
 	if((buttonFlags & (MSG_BOX_NO | MSG_BOX_CANCEL)) == (MSG_BOX_NO | MSG_BOX_CANCEL) )
 	{
 		//If we have both the No and Cancel button, then the no should go in the middle position
@@ -159,17 +159,17 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne
 		buttonCancel->winSetPosition(buttonX[2], buttonY[2]);
 		buttonCancel->winHide(FALSE);
 	}
-		
+
 	// Fill the text into the text boxes
-	NameKeyType staticTextTitleID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:StaticTextTitle" ) );
+	NameKeyType staticTextTitleID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:StaticTextTitle" );
 	GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId(parent, staticTextTitleID);
 	GadgetStaticTextSetText(staticTextTitle,titleString);
-	
-	NameKeyType staticTextMessageID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:StaticTextMessage" ) );
+
+	NameKeyType staticTextMessageID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:StaticTextMessage" );
 	GameWindow *staticTextMessage = TheWindowManager->winGetWindowFromId(parent, staticTextMessageID);
 	GadgetStaticTextSetText(staticTextMessage,bodyString);
 
-	// create a structure that will pass the functions to 
+	// create a structure that will pass the functions to
 	WindowExMessageBoxData *MsgBoxCallbacks = NEW WindowExMessageBoxData;
 	MsgBoxCallbacks->cancelCallback = cancelCallback;
 	MsgBoxCallbacks->noCallback = noCallback;
@@ -180,13 +180,13 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne
 	parent->winSetUserData( MsgBoxCallbacks );
 
 	parent->winSetSystemFunc(ExtendedMessageBoxSystem);
-	
+
 	//make sure the dialog is showing and bring it to the top
 	parent->winHide(FALSE);
 	parent->winBringToTop();
-	
+
 	return parent;
-}// gogoExMessageBox
+}
 
 GameWindow *ExMessageBoxYesNo				(UnicodeString titleString,UnicodeString bodyString, void *userData,
 																		 MessageBoxFunc yesCallback, MessageBoxFunc noCallback)
@@ -227,12 +227,12 @@ GameWindow *ExMessageBoxCancel			(UnicodeString titleString,UnicodeString bodySt
 //-------------------------------------------------------------------------------------------------
 /** Message Box window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt msg,
 										 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	
-	switch( msg ) 
+
+
+	switch( msg )
 	{
 
 		//---------------------------------------------------------------------------------------------
@@ -242,7 +242,7 @@ WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt m
 			window->winSetUserData( NULL );
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -254,17 +254,17 @@ WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt m
 
 			break;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-			static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonOk" ) );
-			static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonYes" ) );
-			static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonNo" ) );
-			static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonCancel" ) );
+			static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonOk" );
+			static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonYes" );
+			static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonNo" );
+			static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonCancel" );
 			WindowExMessageBoxData *MsgBoxCallbacks = (WindowExMessageBoxData *)window->winGetUserData();
 
 			MessageBoxReturnType ret = MB_RETURN_CLOSE;
@@ -273,36 +273,36 @@ WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt m
 			{
 				if (MsgBoxCallbacks->okCallback)
 					ret = MsgBoxCallbacks->okCallback(MsgBoxCallbacks->userData);
-			}  // end if
+			}
 			else if( controlID == buttonYesID )
 			{
 				if (MsgBoxCallbacks->yesCallback)
 					ret = MsgBoxCallbacks->yesCallback(MsgBoxCallbacks->userData);
-			}  // end else if
+			}
 			else if( controlID == buttonNoID )
 			{
 				if (MsgBoxCallbacks->noCallback)
 					ret = MsgBoxCallbacks->noCallback(MsgBoxCallbacks->userData);
-			}  // end else if
+			}
 			else if( controlID == buttonCancelID )
 			{
 				if (MsgBoxCallbacks->cancelCallback)
 					ret = MsgBoxCallbacks->cancelCallback(MsgBoxCallbacks->userData);
-			}  // end else if
+			}
 
 			if (ret == MB_RETURN_CLOSE)
 				TheWindowManager->winDestroy(window);
-			
+
 			break;
 
-		}  // end selected
-		
+		}
+
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end ExtendedMessageBoxSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
index e23577cf622..feb813c857e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GeneralsExpPoints.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Oct 2002
@@ -37,7 +37,7 @@
 //	Filename: 	GeneralsExpPoints.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	File used to populate/update/show/hide the generals exp screen
 //
 //-----------------------------------------------------------------------------
@@ -46,7 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -56,7 +56,6 @@
 #include "GameClient/GameWindow.h"
 #include "GameClient/Gadget.h"
 #include "GameClient/KeyDefs.h"
-#include "GameClient/ControlBar.h"
 #include "GameClient/InGameUI.h"
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -67,7 +66,7 @@ WindowMsgHandledType GeneralsExpPointsInput( GameWindow *window, UnsignedInt msg
 																			WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -78,7 +77,7 @@ WindowMsgHandledType GeneralsExpPointsInput( GameWindow *window, UnsignedInt msg
 				TheInGameUI->placeBuildAvailable( NULL, NULL );
 			}
 			break;
-	
+
 		case GWM_CHAR:
 		{
 			UnsignedByte key = mData1;
@@ -93,30 +92,30 @@ WindowMsgHandledType GeneralsExpPointsInput( GameWindow *window, UnsignedInt msg
 					TheControlBar->hidePurchaseScience();
 					return MSG_HANDLED;
 					//return MSG_IGNORED;
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
 			return MSG_HANDLED;
 
-		}  // end char
+		}
 
 	}
 
 	return MSG_HANDLED;
 
-}  // end DiplomacyInput
+}
 
 
 
 //-----------------------------------------------------------------------------
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-WindowMsgHandledType GeneralsExpPointsSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType GeneralsExpPointsSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 		//---------------------------------------------------------------------------------------------
 		case GGM_FOCUS_CHANGE:
@@ -125,17 +124,17 @@ WindowMsgHandledType GeneralsExpPointsSystem( GameWindow *window, UnsignedInt ms
 			//if (focus)
 				//TheWindowManager->winSetGrabWindow( chatTextEntry );
 			break;
-		} // end focus change
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-		{	
+		{
 			// if we're given the opportunity to take the keyboard focus we must say we don't want it
 			if( mData1 == TRUE )
 				*(Bool *)mData2 = FALSE;
 
 			return MSG_HANDLED;
-		}//case GWM_INPUT_FOCUS:
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -151,17 +150,17 @@ WindowMsgHandledType GeneralsExpPointsSystem( GameWindow *window, UnsignedInt ms
 				TheControlBar->processContextSensitiveButtonClick( control, (GadgetGameMessage)msg );
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GeneralsExpPointsSystem
+}
 
 //-----------------------------------------------------------------------------
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
index 2d7f099f0a6..fee4cf69aeb 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameWindow.h"
 #include "GameClient/Gadget.h"
@@ -51,15 +51,15 @@ WindowMsgHandledType IMECandidateWindowInput( GameWindow *window, UnsignedInt ms
 
 	return MSG_HANDLED;
 
-}  // end IMECandidateInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** System callback for the IME Candidate widnow */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType IMECandidateWindowSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType IMECandidateWindowSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 		case GWM_CREATE:
 			if ( Dstring == NULL )
@@ -81,11 +81,11 @@ WindowMsgHandledType IMECandidateWindowSystem( GameWindow *window, UnsignedInt m
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end IMECandidateWidnowSystem
+}
 
 // IMECandidateDraw ================================================================
 /** Draw function for the IME candidate window */
@@ -94,9 +94,9 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 {
 	// set up for rendering
 	ICoord2D origin, size, start, end;
-	Color		textColor, 
-					textBorder, 
-					textSelectColor, 
+	Color		textColor,
+					textBorder,
+					textSelectColor,
 					textSelectBorder;
 	IRegion2D textRegion;
 	Color black = GameMakeColor( 0, 0, 0, 255);
@@ -120,7 +120,7 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 		textColor		= window->winGetDisabledTextColor();
 		textBorder	= window->winGetDisabledTextBorderColor();
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -129,7 +129,7 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 		textSelectColor		= window->winGetHiliteTextColor();
 		textSelectBorder	= window->winGetHiliteTextBorderColor();
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
@@ -138,12 +138,12 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 		textColor		= window->winGetEnabledTextColor();
 		textBorder	= window->winGetEnabledTextBorderColor();
 
-	}  // end else, just enabled
+	}
 
 
 	{
 		Real borderWidth = 1.0f;
-	
+
 		start.x = origin.x;
 		start.y = origin.y;
 		end.x = start.x + size.x;
@@ -164,14 +164,14 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 		return;
 	}
 
-	GameFont *font = window->winGetFont() ;
-	Int height;
+	GameFont *font = window->winGetFont();
 
 	// set the font
 	Dstring->setFont( font );
 
-	// cacl line height
-	height = font->height + IMECandidateWindowLineSpacing;
+	// calculate line height
+	Int fontHeight = font ? font->height : 0;
+	Int height = fontHeight + IMECandidateWindowLineSpacing;
 
 	// set the clip region
 	Dstring->setClipRegion( &textRegion );
@@ -193,7 +193,7 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 
 	// calulate the widest number text
 	Int width;
-	Dstring->setText(UnicodeString(L"00:"));
+	Dstring->setText(L"00:");
 	width = Dstring->getWidth();
 
 	// calc y start pos
@@ -202,9 +202,9 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 
 	for ( Int i = 0; i < count; i++, y+= height )
 	{
-		UnicodeString *candidate = ime->getCandidate( first + i );
+		const UnicodeString *candidate = ime->getCandidate( first + i );
 		Int tcolor, bcolor;
-		
+
 		if ( i == selected )
 		{
 			tcolor = textSelectColor;
@@ -215,8 +215,8 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 			tcolor = textColor;
 			bcolor = textBorder;
 		}
-		
-		// draw number tab first	
+
+		// draw number tab first
 		number.format( L"%d:", i + ime->getIndexBase());
 		Dstring->setText( number );
 		width = Dstring->getWidth();
@@ -225,7 +225,7 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
 		// draw candidate
 		Dstring->setText( *candidate );
 		Dstring->draw( leftEdge, y, tcolor, black );
-	}	
+	}
 }
 
 // IMECandidateDraw ================================================================
@@ -235,7 +235,7 @@ void IMECandidateMainDraw( GameWindow *window, WinInstanceData *instData )
 {
 	// set up for rendering
 	ICoord2D origin, size, start, end;
-	Color		backColor, 
+	Color		backColor,
 					backBorder;
 	Real borderWidth = 1.0f;
 
@@ -250,33 +250,33 @@ void IMECandidateMainDraw( GameWindow *window, WinInstanceData *instData )
 		backColor		= window->winGetDisabledColor( 0 );
 		backBorder	= window->winGetDisabledBorderColor( 0 );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
 		backColor		= window->winGetHiliteColor( 0 );
 		backBorder	= window->winGetHiliteBorderColor( 0 );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
 		backColor		= window->winGetEnabledColor( 0 );
 		backBorder	= window->winGetEnabledBorderColor( 0 );
 
-	}  // end else, just enabled
+	}
 
 	// draw the back border
 	if( backBorder != WIN_COLOR_UNDEFINED )
 	{
-	
+
 		start.x = origin.x;
 		start.y = origin.y;
 		end.x = start.x + size.x;
 		end.y = start.y + size.y;
 		TheWindowManager->winOpenRect( backBorder, borderWidth,
 																	 start.x, start.y, end.x, end.y );
-	}  // end if
+	}
 
 	// draw the filled back
 	if( backColor != WIN_COLOR_UNDEFINED )
@@ -288,6 +288,6 @@ void IMECandidateMainDraw( GameWindow *window, WinInstanceData *instData )
 		end.y = start.y + size.y - 2;
 		TheWindowManager->winFillRect( backColor, 0, start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
index c71f8c0f935..09336b14179 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -76,7 +76,7 @@ void ShowInGameChat( Bool immediate )
 	}
 	else
 	{
-		chatWindow = TheWindowManager->winCreateFromScript( AsciiString("InGameChat.wnd") );
+		chatWindow = TheWindowManager->winCreateFromScript( "InGameChat.wnd" );
 
 		static NameKeyType textEntryChatID = TheNameKeyGenerator->nameToKey( "InGameChat.wnd:TextEntryChat" );
 		chatTextEntry = TheWindowManager->winGetWindowFromId( NULL, textEntryChatID );
@@ -266,7 +266,7 @@ WindowMsgHandledType InGameChatInput( GameWindow *window, UnsignedInt msg,
 																			WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -284,26 +284,26 @@ WindowMsgHandledType InGameChatInput( GameWindow *window, UnsignedInt msg,
 					HideInGameChat();
 					return MSG_HANDLED;
 					//return MSG_IGNORED;
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
 			return MSG_HANDLED;
 
-		}  // end char
+		}
 
 	}
 
 	return MSG_IGNORED;
 
-}  // end InGameChatInput
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 		//---------------------------------------------------------------------------------------------
 		case GGM_FOCUS_CHANGE:
@@ -312,17 +312,17 @@ WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg,
 			//if (focus)
 				//TheWindowManager->winSetGrabWindow( chatTextEntry );
 			break;
-		} // end focus change
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-		{	
+		{
 			// if we're givin the opportunity to take the keyboard focus we must say we want it
 			if( mData1 == TRUE )
 				*(Bool *)mData2 = TRUE;
 
 			return MSG_HANDLED;
-		}//case GWM_INPUT_FOCUS:
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GEM_EDIT_DONE:
@@ -332,13 +332,13 @@ WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
-			static NameKeyType buttonClearID = TheNameKeyGenerator->nameToKey( AsciiString( "InGameChat.wnd:ButtonClear" ) );
+			static NameKeyType buttonClearID = TheNameKeyGenerator->nameToKey( "InGameChat.wnd:ButtonClear" );
 			if (control && control->winGetWindowId() == buttonClearID)
 			{
 				if (chatTextEntry)
@@ -347,15 +347,15 @@ WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end InGameChatSystem
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
index ba3d317fcf5..25726ad39cb 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
@@ -24,12 +24,12 @@
 
 // FILE: InGamePopupMessage.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,7 +37,7 @@
 //	Filename: 	InGamePopupMessage.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Init, input, and system for the in game message popup
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/NameKeyGenerator.h"
@@ -89,23 +89,23 @@ static Bool pause = FALSE;
 void InGamePopupMessageInit( WindowLayout *layout, void *userData )
 {
 
-	parentID = TheNameKeyGenerator->nameToKey(AsciiString("InGamePopupMessage.wnd:InGamePopupMessageParent"));
+	parentID = TheNameKeyGenerator->nameToKey("InGamePopupMessage.wnd:InGamePopupMessageParent");
 	parent = TheWindowManager->winGetWindowFromId(NULL, parentID);
 
-	staticTextMessageID = TheNameKeyGenerator->nameToKey(AsciiString("InGamePopupMessage.wnd:StaticTextMessage"));
+	staticTextMessageID = TheNameKeyGenerator->nameToKey("InGamePopupMessage.wnd:StaticTextMessage");
 	staticTextMessage = TheWindowManager->winGetWindowFromId(parent, staticTextMessageID);
-	buttonOkID = TheNameKeyGenerator->nameToKey(AsciiString("InGamePopupMessage.wnd:ButtonOk"));
+	buttonOkID = TheNameKeyGenerator->nameToKey("InGamePopupMessage.wnd:ButtonOk");
 	buttonOk = TheWindowManager->winGetWindowFromId(parent, buttonOkID);
-	
+
 	PopupMessageData *pMData = TheInGameUI->getPopupMessageData();
-	
+
 	if(!pMData)
 	{
-		DEBUG_ASSERTCRASH(pMData, ("We're in InGamePopupMessage without a pointer to pMData\n") );
+		DEBUG_ASSERTCRASH(pMData, ("We're in InGamePopupMessage without a pointer to pMData") );
 		///< @todo: add a call to the close this bitch method when I implement it CLH
 		return;
 	}
-	
+
 	DisplayString *tempString = TheDisplayStringManager->newDisplayString();
 	tempString->setText(pMData->message);
 	tempString->setFont(staticTextMessage->winGetFont());
@@ -113,7 +113,7 @@ void InGamePopupMessageInit( WindowLayout *layout, void *userData )
 	Int width, height;
 	tempString->getSize(&width, &height);
 	TheDisplayStringManager->freeDisplayString(tempString);
-	
+
 	GadgetStaticTextSetText(staticTextMessage, pMData->message);
 	// set the positions/sizes
 	Int widthOk, heightOk;
@@ -127,7 +127,7 @@ void InGamePopupMessageInit( WindowLayout *layout, void *userData )
 	pause = pMData->pause;
 	if(pMData->pause)
 		TheWindowManager->winSetModal( parent );
-	
+
 	TheWindowManager->winSetFocus( parent );
 
 	parent->winHide(FALSE);
@@ -140,9 +140,9 @@ void InGamePopupMessageInit( WindowLayout *layout, void *userData )
 WindowMsgHandledType InGamePopupMessageInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-		switch( msg ) 
+		switch( msg )
 		{
-	
+
 			// --------------------------------------------------------------------------------------------
 			case GWM_CHAR:
 			{
@@ -150,38 +150,38 @@ WindowMsgHandledType InGamePopupMessageInput( GameWindow *window, UnsignedInt ms
 				UnsignedByte state = mData2;
 	//			if (buttonPushed)
 	//				break;
-	
+
 				switch( key )
 				{
-	
+
 					// ----------------------------------------------------------------------------------------
 					case KEY_ENTER:
 					case KEY_ESC:
 					{
-						
+
 						//
 						// send a simulated selected event to the parent window of the
 						// back/exit button
 						//
 						if( BitIsSet( state, KEY_STATE_UP ) )
 						{
-							TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+							TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)buttonOk, buttonOkID );
-	
-						}  // end if
-	
+
+						}
+
 						// don't let key fall through anywhere else
 						return MSG_HANDLED;
-	
-					}  // end escape
-	
-				}  // end switch( key )
-	
-			}  // end char
-	
-		}  // end switch( msg )
+
+					}
+
+				}
+
+			}
+
+		}
 		return MSG_IGNORED;
-	
+
 
 }
 
@@ -191,7 +191,7 @@ WindowMsgHandledType InGamePopupMessageInput( GameWindow *window, UnsignedInt ms
 WindowMsgHandledType InGamePopupMessageSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -200,14 +200,14 @@ WindowMsgHandledType InGamePopupMessageSystem( GameWindow *window, UnsignedInt m
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 
 			break;
 
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -219,13 +219,13 @@ WindowMsgHandledType InGamePopupMessageSystem( GameWindow *window, UnsignedInt m
 
 			break;
 
-		}  // end input
+		}
     //---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-     
+
       if( controlID == buttonOkID )
 			{
 				if(!pause)
@@ -238,7 +238,7 @@ WindowMsgHandledType InGamePopupMessageSystem( GameWindow *window, UnsignedInt m
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 
 	return MSG_HANDLED;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp
index 7d3c2d6898b..8a7ca7b216d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp
@@ -28,7 +28,7 @@
 // Description: General's Challenge Mode Menu
 ///////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/FileSystem.h"
 #include "Common/GameEngine.h"
@@ -55,11 +55,6 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 SkirmishGameInfo *TheChallengeGameInfo = NULL;
 
@@ -135,7 +130,7 @@ Int findPositionButton( Int controlID )
 {
 	for (Int i = 0; i < NUM_GENERALS; i++)
 	{
-		if (controlID == buttonGeneralPositionID[i]) 
+		if (controlID == buttonGeneralPositionID[i])
 			return i;
 	}
 	return -1;
@@ -259,7 +254,7 @@ void updateButtonSequence(Int stepsPerUpdate)
 			if (playerTemplate)
 				GadgetCheckBoxSetEnabledImage( buttonGeneralPosition[pos], TheMappedImageCollection->findImageByName( playerTemplate->getMedallionHilite() ) );
 		}
-		
+
 		// regular look
 		if (--pos > 0 && pos < NUM_GENERALS && !buttonGeneralPosition[pos]->winIsHidden())
 		{
@@ -334,7 +329,7 @@ void ChallengeMenuInit( WindowLayout *layout, void *userData )
 	if( !TheChallengeGameInfo )
 		TheChallengeGameInfo = NEW SkirmishGameInfo;
 
-	TheChallengeGameInfo->init();  
+	TheChallengeGameInfo->init();
 	TheChallengeGameInfo->clearSlotList();
 	TheChallengeGameInfo->reset();
 	TheChallengeGameInfo->enterGame();
@@ -343,25 +338,25 @@ void ChallengeMenuInit( WindowLayout *layout, void *userData )
 	TheShell->showShellMap(TRUE);
 
 	// init window ids and pointers
-	parentID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:ParentChallengeMenu") );
+	parentID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:ParentChallengeMenu" );
 	parentMenu = TheWindowManager->winGetWindowFromId( NULL, parentID );
-	buttonPlayID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:ButtonPlay") );
+	buttonPlayID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:ButtonPlay" );
 	buttonPlay = TheWindowManager->winGetWindowFromId( parentMenu, buttonPlayID );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:ButtonBack") );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:ButtonBack" );
 	buttonBack = TheWindowManager->winGetWindowFromId( parentMenu, buttonBackID );
-	bioPortraitID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:BioPortrait") );
+	bioPortraitID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:BioPortrait" );
 	bioPortrait = TheWindowManager->winGetWindowFromId( parentMenu, bioPortraitID );
-	bioNameEntryID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:BioNameEntry") );
+	bioNameEntryID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:BioNameEntry" );
 	bioLine1Entry = TheWindowManager->winGetWindowFromId( parentMenu, bioNameEntryID ); // this window has been repurposed
-	bioDOBEntryID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:BioDOBEntry") );
+	bioDOBEntryID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:BioDOBEntry" );
 	bioLine2Entry = TheWindowManager->winGetWindowFromId( parentMenu, bioDOBEntryID ); // this window has been repurposed
-	bioBirthplaceEntryID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:BioBirthplaceEntry") );
+	bioBirthplaceEntryID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:BioBirthplaceEntry" );
 	bioLine3Entry = TheWindowManager->winGetWindowFromId( parentMenu, bioBirthplaceEntryID ); // this window has been repurposed
-	bioStrategyEntryID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:BioStrategyEntry") );
+	bioStrategyEntryID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:BioStrategyEntry" );
 	bioLine4Entry = TheWindowManager->winGetWindowFromId( parentMenu, bioStrategyEntryID ); // this window has been repurposed
-	backdropID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:MainBackdrop") );
+	backdropID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:MainBackdrop" );
 	backdrop = TheWindowManager->winGetWindowFromId( parentMenu, backdropID);
-	bioParentID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:GeneralsBioParent") );
+	bioParentID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:GeneralsBioParent" );
 	bioParent = TheWindowManager->winGetWindowFromId( parentMenu, bioParentID);
 
 	AsciiString strButtonName;
@@ -459,14 +454,13 @@ void ChallengeMenuUpdate( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 void ChallengeMenuShutdown( WindowLayout *layout, void *userData )
 {
-	if(wndVideoManager)
-		delete wndVideoManager;
+	delete wndVideoManager;
 	wndVideoManager = NULL;
 
 	lastButtonIndex = -1;
 
 	buttonSequenceStep = 0;
-	
+
 	Bool popImmediate = *(Bool *)userData;
 	if( popImmediate )
 	{
@@ -478,8 +472,7 @@ void ChallengeMenuShutdown( WindowLayout *layout, void *userData )
 	TheTransitionHandler->reverse("ChallengeMenuFade");
 	isShuttingDown = TRUE;
 
-	if(TheChallengeGameInfo)
-		delete TheChallengeGameInfo;
+	delete TheChallengeGameInfo;
 	TheChallengeGameInfo = NULL;
 
 	TheAudio->removeAudioEvent( lastSelectionSound );
@@ -495,7 +488,7 @@ void ChallengeMenuShutdown( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType ChallengeMenuInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -510,7 +503,7 @@ WindowMsgHandledType ChallengeMenuInput( GameWindow *window, UnsignedInt msg, Wi
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -520,18 +513,18 @@ WindowMsgHandledType ChallengeMenuInput( GameWindow *window, UnsignedInt msg, Wi
 
 						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, (WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
@@ -543,7 +536,7 @@ WindowMsgHandledType ChallengeMenuInput( GameWindow *window, UnsignedInt msg, Wi
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType ChallengeMenuSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 		case GWM_CREATE: break;
 
@@ -653,7 +646,7 @@ WindowMsgHandledType ChallengeMenuSystem( GameWindow *window, UnsignedInt msg, W
  			{
 				if( TheChallengeGameInfo == NULL )
 				{
-					// If this is NULL, then we must be on the way back out of this menu.  
+					// If this is NULL, then we must be on the way back out of this menu.
 					// Don't crash, just eat the button click message.
 					return MSG_HANDLED;
 				}
@@ -676,7 +669,7 @@ WindowMsgHandledType ChallengeMenuSystem( GameWindow *window, UnsignedInt msg, W
 
 				// If the campaign has been reset, so has the campaign difficulty.  Restore it, just in case.
 				DEBUG_ASSERTCRASH(TheChallengeGenerals, ("TheChallengeGenerals are not initialized."));
-				if (TheChallengeGenerals) 
+				if (TheChallengeGenerals)
 				{
 	        TheCampaignManager->setGameDifficulty(TheChallengeGenerals->getCurrentDifficulty());
 					TheScriptEngine->setGlobalDifficulty(TheChallengeGenerals->getCurrentDifficulty());
@@ -687,12 +680,12 @@ WindowMsgHandledType ChallengeMenuSystem( GameWindow *window, UnsignedInt msg, W
 				msg->appendIntegerArgument(GAME_SINGLE_PLAYER);
 				msg->appendIntegerArgument(TheCampaignManager->getGameDifficulty());
 				msg->appendIntegerArgument(TheCampaignManager->getRankPoints());
-	
-        
+
+
         // Added so that, even though a ChallengeGame is really a SkirmishGame in SinglePlayerGame's clothing,
         // GameEngine will still apply the default "FRAME CAP" as it does during "Solo Missions."
         msg->appendIntegerArgument(LOGICFRAMES_PER_SECOND);	// FPS limit
-				
+
 				InitRandom(0);
 			}
 			else if( controlID == buttonBackID )
@@ -706,4 +699,4 @@ WindowMsgHandledType ChallengeMenuSystem( GameWindow *window, UnsignedInt msg, W
 	}
 
 	return MSG_HANDLED;
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
index afb9fb5eb34..3a0087ded97 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
@@ -24,12 +24,12 @@
 
 // FILE: CreditsMenu.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Dec 2002
@@ -37,7 +37,7 @@
 //	Filename: 	CreditsMenu.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The credits screen...yay
 //
 //-----------------------------------------------------------------------------
@@ -46,12 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 //-----------------------------------------------------------------------------
@@ -85,13 +80,13 @@ static GameWindow *parentMainMenu = NULL;
 void CreditsMenuInit( WindowLayout *layout, void *userData )
 {
 	TheShell->showShellMap(FALSE);
-	if(TheCredits)
-		delete TheCredits;
+
+	delete TheCredits;
 	TheCredits = new CreditsManager;
 	TheCredits->load();
 	TheCredits->init();
-	
-	parentMainMenuID = TheNameKeyGenerator->nameToKey( AsciiString("CreditsMenu.wnd:ParentCreditsWindow") );
+
+	parentMainMenuID = TheNameKeyGenerator->nameToKey( "CreditsMenu.wnd:ParentCreditsWindow" );
 	parentMainMenu = TheWindowManager->winGetWindowFromId( NULL, parentMainMenuID );
 
 
@@ -104,12 +99,12 @@ void CreditsMenuInit( WindowLayout *layout, void *userData )
 
 
 	TheAudio->removeAudioEvent( AHSV_StopTheMusicFade );
-	AudioEventRTS event( AsciiString( "Credits" ) );
+	AudioEventRTS event( "Credits" );
 	event.setShouldFade( TRUE );
 	TheAudio->addAudioEvent( &event );
 
 
-}  // end CreditsMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu shutdown method */
@@ -129,7 +124,7 @@ void CreditsMenuShutdown( WindowLayout *layout, void *userData )
 
 	TheAudio->removeAudioEvent( AHSV_StopTheMusicFade );
 
-}  // end CreditsMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu update method */
@@ -147,7 +142,7 @@ void CreditsMenuUpdate( WindowLayout *layout, void *userData )
 	else
 		TheShell->pop();
 
-}  // end CreditsMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Replay menu input callback */
@@ -156,7 +151,7 @@ WindowMsgHandledType CreditsMenuInput( GameWindow *window, UnsignedInt msg,
 																						WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -171,7 +166,7 @@ WindowMsgHandledType CreditsMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -181,41 +176,41 @@ WindowMsgHandledType CreditsMenuInput( GameWindow *window, UnsignedInt msg,
 
 						TheShell->pop();
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end CreditsMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType CreditsMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType CreditsMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
 
-			
+
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -223,7 +218,7 @@ WindowMsgHandledType CreditsMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -235,20 +230,20 @@ WindowMsgHandledType CreditsMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
-			
+
 			break;
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
-}  // end CreditsMenuSystem
+}
 
 //-----------------------------------------------------------------------------
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
index 5fe47ec7211..4e8d80624a0 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
@@ -24,12 +24,12 @@
 
 // FILE: DifficultySelect.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Nov 2002
@@ -37,7 +37,7 @@
 //	Filename: 	DifficultySelect.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The popup campaign difficulty select
 //
 //-----------------------------------------------------------------------------
@@ -46,7 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -68,15 +68,15 @@
 //-----------------------------------------------------------------------------
 static GameDifficulty s_AIDiff = DIFFICULTY_NORMAL;
 static NameKeyType    buttonOkID      = NAMEKEY_INVALID;
-static GameWindow *   buttonOk       = NULL; 
+static GameWindow *   buttonOk       = NULL;
 static NameKeyType    buttonCancelID      = NAMEKEY_INVALID;
-static GameWindow *   buttonCancel       = NULL; 
+static GameWindow *   buttonCancel       = NULL;
 static NameKeyType    radioButtonEasyAIID      = NAMEKEY_INVALID;
 static NameKeyType    radioButtonMediumAIID      = NAMEKEY_INVALID;
 static NameKeyType    radioButtonHardAIID      = NAMEKEY_INVALID;
-static GameWindow *   radioButtonEasyAI       = NULL; 
-static GameWindow *   radioButtonMediumAI       = NULL; 
-static GameWindow *   radioButtonHardAI       = NULL; 
+static GameWindow *   radioButtonEasyAI       = NULL;
+static GameWindow *   radioButtonMediumAI       = NULL;
+static GameWindow *   radioButtonHardAI       = NULL;
 
 void setupGameStart(AsciiString mapName, GameDifficulty diff);
 //-----------------------------------------------------------------------------
@@ -116,29 +116,28 @@ static void SetDifficultyRadioButton( void )
 			{
 				DEBUG_CRASH(("unrecognized difficulty level in the script engine"));
 			}
-			
+
 		}
-	} // if (TheScriptEngine)
-	
+	}
+
 }
 
 
 void DifficultySelectInit( WindowLayout *layout, void *userData )
-{ 
-	AsciiString parentName( "DifficultySelect.wnd:DifficultySelectParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+{
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:DifficultySelectParent" );
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
-   
+
 	buttonOkID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:ButtonOk" );
 	buttonOk = TheWindowManager->winGetWindowFromId( parent, buttonOkID );
 	buttonCancelID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:ButtonCancel" );
 	buttonCancel = TheWindowManager->winGetWindowFromId( parent, buttonCancelID );
-	radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( AsciiString("DifficultySelect.wnd:RadioButtonEasy") );
-	radioButtonEasyAI = TheWindowManager->winGetWindowFromId( parent, radioButtonEasyAIID );			
-	radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( AsciiString("DifficultySelect.wnd:RadioButtonMedium") );
+	radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:RadioButtonEasy" );
+	radioButtonEasyAI = TheWindowManager->winGetWindowFromId( parent, radioButtonEasyAIID );
+	radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:RadioButtonMedium" );
 	radioButtonMediumAI = TheWindowManager->winGetWindowFromId( parent, radioButtonMediumAIID );
-	radioButtonHardAIID = TheNameKeyGenerator->nameToKey( AsciiString("DifficultySelect.wnd:RadioButtonHard") );
-	radioButtonHardAI = TheWindowManager->winGetWindowFromId( parent, radioButtonHardAIID );			
+	radioButtonHardAIID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:RadioButtonHard" );
+	radioButtonHardAI = TheWindowManager->winGetWindowFromId( parent, radioButtonHardAIID );
 
 	s_AIDiff = DIFFICULTY_NORMAL;
 	SetDifficultyRadioButton();
@@ -151,8 +150,8 @@ void DifficultySelectInit( WindowLayout *layout, void *userData )
 //
 	parent->winBringToTop();
 	TheWindowManager->winSetModal(parent);
-	
-}  // end SkirmishMapSelectMenuInit
+
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -162,7 +161,7 @@ WindowMsgHandledType DifficultySelectInput( GameWindow *window, UnsignedInt msg,
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-//	switch( msg ) 
+//	switch( msg )
 //	{
 //
 //		// --------------------------------------------------------------------------------------------
@@ -177,7 +176,7 @@ WindowMsgHandledType DifficultySelectInput( GameWindow *window, UnsignedInt msg,
 //				// ----------------------------------------------------------------------------------------
 //				case KEY_ESC:
 //				{
-//					
+//
 //					//
 //					// send a simulated selected event to the parent window of the
 //					// back/exit button
@@ -188,7 +187,7 @@ WindowMsgHandledType DifficultySelectInput( GameWindow *window, UnsignedInt msg,
 //						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
 //						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 //
-//						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+//						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 //																								(WindowMsgData)button, buttonID );
 //
 //					}  // end if
@@ -206,16 +205,16 @@ WindowMsgHandledType DifficultySelectInput( GameWindow *window, UnsignedInt msg,
 
 	return MSG_IGNORED;
 
-}  // end SkirmishMapSelectMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType DifficultySelectSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType DifficultySelectSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -223,14 +222,14 @@ WindowMsgHandledType DifficultySelectSystem( GameWindow *window, UnsignedInt msg
 		{
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -242,7 +241,7 @@ WindowMsgHandledType DifficultySelectSystem( GameWindow *window, UnsignedInt msg
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -277,7 +276,7 @@ WindowMsgHandledType DifficultySelectSystem( GameWindow *window, UnsignedInt msg
 					layout->destroyWindows();
 					deleteInstance(layout);
 				}
-				
+
 			}
 			else if ( controlID == radioButtonEasyAIID )
 			{
@@ -294,16 +293,16 @@ WindowMsgHandledType DifficultySelectSystem( GameWindow *window, UnsignedInt msg
 
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  
+}
 //-----------------------------------------------------------------------------
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp
index 32ec15c6dc4..c0b7f7097cb 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameWindow.h"
 #include "GameClient/GameText.h"
@@ -69,8 +69,8 @@ static GameWindow *buttonVotePlayer6Window = NULL;
 static GameWindow *buttonVotePlayer7Window = NULL;
 
 static void InitDisconnectWindow( void ) {
-	textEntryID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:TextEntry"));
-	textDisplayID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ListboxTextDisplay"));
+	textEntryID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:TextEntry");
+	textDisplayID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ListboxTextDisplay");
 
 	textEntryWindow = TheWindowManager->winGetWindowFromId(NULL, textEntryID);
 	textDisplayWindow = TheWindowManager->winGetWindowFromId(NULL, textDisplayID);
@@ -80,16 +80,16 @@ static void InitDisconnectWindow( void ) {
 		TheWindowManager->winSetFocus(textEntryWindow);
 	}
 
-	buttonQuitID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonQuitGame"));
+	buttonQuitID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonQuitGame");
 	buttonQuitWindow = TheWindowManager->winGetWindowFromId(NULL, buttonQuitID);
 
-	buttonVotePlayer1ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer1"));
-	buttonVotePlayer2ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer2"));
-	buttonVotePlayer3ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer3"));
-	buttonVotePlayer4ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer4"));
-	buttonVotePlayer5ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer5"));
-	buttonVotePlayer6ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer6"));
-	buttonVotePlayer7ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer7"));
+	buttonVotePlayer1ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer1");
+	buttonVotePlayer2ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer2");
+	buttonVotePlayer3ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer3");
+	buttonVotePlayer4ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer4");
+	buttonVotePlayer5ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer5");
+	buttonVotePlayer6ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer6");
+	buttonVotePlayer7ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer7");
 
 	buttonVotePlayer1Window = TheWindowManager->winGetWindowFromId(NULL, buttonVotePlayer1ID);
 	buttonVotePlayer2Window = TheWindowManager->winGetWindowFromId(NULL, buttonVotePlayer2ID);
@@ -115,17 +115,17 @@ void ShowDisconnectWindow( void )
 
 		// init it
 		InitDisconnectWindow();
-	
+
 		// show it
 		disconnectMenuLayout->hide( FALSE );
 
-	}  // end if
+	}
 	else
 	{
 
 		disconnectMenuLayout->hide( FALSE );
 
-	}  // end else
+	}
 
 	buttonVotePlayer1Window->winEnable(TRUE);
 	buttonVotePlayer2Window->winEnable(TRUE);
@@ -141,7 +141,7 @@ void ShowDisconnectWindow( void )
 	GadgetListBoxAddEntryText(textDisplayWindow, TheGameText->fetch("GUI:InternetDisconnectionMenuBody1"),
 		GameMakeColor(255,255,255,255), -1);
 
-}  // end ToggleQuitMenu
+}
 
 //------------------------------------------------------
 /** Hide the Disconnect Screen */
@@ -158,19 +158,19 @@ void HideDisconnectWindow( void )
 
 		// init it
 		InitDisconnectWindow();
-	
+
 		// show it
 		disconnectMenuLayout->hide( TRUE );
 
-	}  // end if
+	}
 	else
 	{
 
 		disconnectMenuLayout->hide( TRUE );
 
-	}  // end else
+	}
 
-}  // end ToggleQuitMenu
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Input callback for the control bar parent */
@@ -181,15 +181,15 @@ WindowMsgHandledType DisconnectControlInput( GameWindow *window, UnsignedInt msg
 
 	return MSG_IGNORED;
 
-} // end DisconnectControlInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** System callback for the control bar parent */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType DisconnectControlSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType DisconnectControlSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		//---------------------------------------------------------------------------------------------
@@ -227,11 +227,11 @@ WindowMsgHandledType DisconnectControlSystem( GameWindow *window, UnsignedInt ms
 
 			break;
 
-		}  // end button selected
+		}
 
 		case GEM_EDIT_DONE:
 		{
-//			DEBUG_LOG(("DisconnectControlSystem - got GEM_EDIT_DONE.\n"));
+//			DEBUG_LOG(("DisconnectControlSystem - got GEM_EDIT_DONE."));
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
 
@@ -241,7 +241,7 @@ WindowMsgHandledType DisconnectControlSystem( GameWindow *window, UnsignedInt ms
 			{
 				UnicodeString txtInput;
 
-//				DEBUG_LOG(("DisconnectControlSystem - GEM_EDIT_DONE was from the text entry control.\n"));
+//				DEBUG_LOG(("DisconnectControlSystem - GEM_EDIT_DONE was from the text entry control."));
 
 				// read the user's input
 				txtInput.set(GadgetTextEntryGetText( textEntryWindow ));
@@ -251,11 +251,11 @@ WindowMsgHandledType DisconnectControlSystem( GameWindow *window, UnsignedInt ms
 				txtInput.trim();
 				// Echo the user's input to the chat window
 				if (!txtInput.isEmpty()) {
-//					DEBUG_LOG(("DisconnectControlSystem - sending string %ls\n", txtInput.str()));
+//					DEBUG_LOG(("DisconnectControlSystem - sending string %ls", txtInput.str()));
 					TheDisconnectMenu->sendChat(txtInput);
 				}
 
-			}// if ( controlID == textEntryChatID )
+			}
 			break;
 		}
 
@@ -263,9 +263,9 @@ WindowMsgHandledType DisconnectControlSystem( GameWindow *window, UnsignedInt ms
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end ControlBarSystem
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
index 7c0d8df6f67..61a4e89ee71 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
@@ -24,12 +24,12 @@
 
 // FILE: DownloadMenu.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/NameKeyGenerator.h"
@@ -109,7 +109,7 @@ static void successQuitCallback( void )
 
 	// Clean up game data.  No crashy-crash for you!
 	if (TheGameLogic->isInGame())
-		TheMessageStream->appendMessage( GameMessage::MSG_CLEAR_GAME_DATA );
+		TheGameLogic->exitGame();
 }
 
 static void successNoQuitCallback( void )
@@ -262,13 +262,11 @@ void DownloadMenuInit( WindowLayout *layout, void *userData )
 	progressBarMunkee = TheWindowManager->winGetWindowFromId( parent, progressBarMunkeeID );
 
 	DEBUG_ASSERTCRASH(!TheDownloadManager, ("Download manager already exists"));
-	if (TheDownloadManager)
-	{
-		delete TheDownloadManager;
-	}
+
+	delete TheDownloadManager;
 	TheDownloadManager = NEW DownloadManagerMunkee;
 
-}  // end DownloadMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** menu shutdown method */
@@ -276,11 +274,9 @@ void DownloadMenuInit( WindowLayout *layout, void *userData )
 void DownloadMenuShutdown( WindowLayout *layout, void *userData )
 {
 	DEBUG_ASSERTCRASH(TheDownloadManager, ("No download manager"));
-	if (TheDownloadManager)
-	{
-		delete TheDownloadManager;
-		TheDownloadManager = NULL;
-	}
+
+	delete TheDownloadManager;
+	TheDownloadManager = NULL;
 
 	staticTextSize = NULL;
 	staticTextTime = NULL;
@@ -289,7 +285,7 @@ void DownloadMenuShutdown( WindowLayout *layout, void *userData )
 	progressBarMunkee = NULL;
 	parent = NULL;
 
-}  // end DownloadMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** menu update method */
@@ -322,7 +318,7 @@ void DownloadMenuUpdate( WindowLayout *layout, void *userData )
 		GadgetStaticTextSetText(staticTextTime, timeString);
 	}
 
-}  // end DownloadMenuUpdate 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** menu input callback */
@@ -331,7 +327,7 @@ WindowMsgHandledType DownloadMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -346,45 +342,44 @@ WindowMsgHandledType DownloadMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "DownloadMenu.wnd:ButtonCancel" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "DownloadMenu.wnd:ButtonCancel" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end DownloadMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType DownloadMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType DownloadMenuSystem( GameWindow *window, UnsignedInt msg,
 																		 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -393,14 +388,14 @@ WindowMsgHandledType DownloadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 
 			break;
 
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -412,28 +407,28 @@ WindowMsgHandledType DownloadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end input
+		}
     //---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-      
+
 			if( controlID == buttonCancelID )
 			{
 				HandleCanceledDownload();
 				closeDownloadWindow();
-			}  // end if
-	
+			}
+
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-} // end DownloadMenuSystem
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
index 8b2f45df345..c3c10fa3f65 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///// EstablishConnectionsWindow.cpp /////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "GameClient/GameWindowManager.h"
@@ -82,7 +82,7 @@ static const char *gadgetsToHide[] =
 	"ButtonSelectMap",
 	"ButtonStart",
 	"StaticTextMapPreview",
-	NULL // keep this last
+	NULL
 };
 static const char *perPlayerGadgetsToHide[] =
 {
@@ -93,7 +93,7 @@ static const char *perPlayerGadgetsToHide[] =
 	"ButtonAccept",
 	"GenericPing",
 	//"ButtonStartPosition",
-	NULL // keep this last
+	NULL
 };
 
 static const char *qmlayoutFilename = "WOLQuickMatchMenu.wnd";
@@ -107,18 +107,18 @@ static const char *qmgadgetsToHide[] =
 	"ButtonWiden",
 	"ButtonStop",
 	"ButtonStart",
-	NULL // keep this last
+	NULL
 };
 static const char *qmperPlayerGadgetsToHide[] =
 {
 	//"ButtonStartPosition",
-	NULL // keep this last
+	NULL
 };
 
 static void showGameSpyGameOptionsUnderlyingGUIElements( Bool show )
 {
 	ShowUnderlyingGUIElements( show, layoutFilename, parentName, gadgetsToHide, perPlayerGadgetsToHide );
-	
+
 }
 static void showGameSpyQMUnderlyingGUIElements( Bool show )
 {
@@ -126,7 +126,7 @@ static void showGameSpyQMUnderlyingGUIElements( Bool show )
 }
 
 static void InitEstablishConnectionsDialog( void ) {
-	buttonQuitID = TheNameKeyGenerator->nameToKey( AsciiString("EstablishConnectionsScreen.wnd:ButtonQuit") );
+	buttonQuitID = TheNameKeyGenerator->nameToKey( "EstablishConnectionsScreen.wnd:ButtonQuit" );
 	buttonQuitWindow = TheWindowManager->winGetWindowFromId(NULL, buttonQuitID);
 }
 
@@ -189,6 +189,6 @@ WindowMsgHandledType EstablishConnectionsControlSystem(GameWindow *window, Unsig
 				}
 				break;
 			}
-	} // end switch
+	}
 	return MSG_HANDLED;
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
index 11784eda810..3286091c8e8 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/WindowLayout.h"
 #include "GameClient/MapUtil.h"
@@ -44,11 +44,6 @@
 #include "GameNetwork/GameInfo.h"
 #include "GameNetwork/LANAPI.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static GameWindow *parent = NULL;
 static GameWindow *staticTextGameName = NULL;
@@ -72,8 +67,8 @@ static WindowLayout *gameInfoWindowLayout = NULL;
 void CreateLANGameInfoWindow( GameWindow *sizeAndPosWin )
 {
 	if( !gameInfoWindowLayout )
-		gameInfoWindowLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/GameInfoWindow.wnd" ) );
-	
+		gameInfoWindowLayout = TheWindowManager->winCreateLayout( "Menus/GameInfoWindow.wnd" );
+
 	gameInfoWindowLayout->runInit();
 	gameInfoWindowLayout->bringForward();
 	gameInfoWindowLayout->hide( TRUE );
@@ -95,7 +90,7 @@ void DestroyGameInfoWindow(void)
 	{
 		gameInfoWindowLayout->destroyWindows();
 		deleteInstance(gameInfoWindowLayout);
-		gameInfoWindowLayout = NULL;		
+		gameInfoWindowLayout = NULL;
 	}
 }
 
@@ -124,7 +119,7 @@ void RefreshGameInfoWindow(GameInfo *gameInfo, UnicodeString gameName)
 	{
 		// can happen if the map will have to be transferred... so use the leaf name (srj)
 		const char *noPath = gameInfo->getMap().reverseFind('\\');
-		if (noPath) 
+		if (noPath)
 		{
 			++noPath;
 		}
@@ -201,7 +196,7 @@ void RefreshGameInfoWindow(GameInfo *gameInfo, UnicodeString gameName)
 			GadgetListBoxAddEntryImage(listBoxPlayers, fact->getSideIconImage(),addedRow, 0, 22,25);
 			//GadgetListBoxAddEntryText(listBoxPlayers,fact->getDisplayName(),playerColor,addedRow, 0);
 		}
-	
+
 	}
 }
 
@@ -226,7 +221,7 @@ void GameInfoWindowInit( WindowLayout *layout, void *userData )
 	winCratesID = TheNameKeyGenerator->nameToKey( "GameInfoWindow.wnd:WinCrates" );
 	winSuperWeaponsID = TheNameKeyGenerator->nameToKey( "GameInfoWindow.wnd:WinSuperWeapons" );
 	winFreeForAllID = TheNameKeyGenerator->nameToKey( "GameInfoWindow.wnd:WinFreeForAll" );
-	
+
 	parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	staticTextGameName = TheWindowManager->winGetWindowFromId( parent, staticTextGameNameID );
 	staticTextMapName = TheWindowManager->winGetWindowFromId( parent, staticTextMapNameID );
@@ -238,17 +233,17 @@ void GameInfoWindowInit( WindowLayout *layout, void *userData )
 	GadgetStaticTextSetText(staticTextGameName,UnicodeString::TheEmptyString);
 	GadgetStaticTextSetText(staticTextMapName,UnicodeString::TheEmptyString);
 	GadgetListBoxReset(listBoxPlayers);
-	
-}  // end MapSelectMenuInit
+
+}
 
 
 //-------------------------------------------------------------------------------------------------
 /** GameInfo window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType GameInfoWindowSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType GameInfoWindowSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 // might use these later
 //			GameWindow *control = (GameWindow *)mData1;
@@ -261,7 +256,7 @@ WindowMsgHandledType GameInfoWindowSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -269,7 +264,7 @@ WindowMsgHandledType GameInfoWindowSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -281,15 +276,15 @@ WindowMsgHandledType GameInfoWindowSystem( GameWindow *window, UnsignedInt msg,
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end MapSelectMenuSystem
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
index c4ba02ca9c8..0c466741cc5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
@@ -24,12 +24,12 @@
 
 // FILE: KeyboardOptionsMenu.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   Command & Conquer: Generals
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/GameEngine.h"
@@ -126,7 +126,7 @@ void populateCategoryBox()
 	for ( i = 0; i < CATEGORY_NUM_CATEGORIES; ++i)
 	{
 		temp.format("GUI:%s", CategoryListName[i]);
-		str = TheGameText->fetch( temp ); 
+		str = TheGameText->fetch( temp );
 		index = GadgetComboBoxAddEntry(comboBoxCategoryList, str, color);
 	}
 
@@ -378,7 +378,7 @@ void doKeyDown(EntryData *e, UnicodeString mod )
 				}
 
 			}
-					
+
 		}
 	}
 }
@@ -395,7 +395,7 @@ void KeyboardOptionsMenuInit( WindowLayout *layout, void *userData )
 	parentKeyboardOptionsMenu = TheWindowManager->winGetWindowFromId( NULL, parentKeyboardOptionsMenuID );
 
 	// get ids for our children controls
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("KeyboardOptionsMenu.wnd:ButtonBack") );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "KeyboardOptionsMenu.wnd:ButtonBack" );
 	buttonBack = TheWindowManager->winGetWindowFromId( parentKeyboardOptionsMenu, buttonBackID );
 
 	comboBoxCategoryListID = TheNameKeyGenerator->nameToKey( "KeyboardOptionsMenu.wnd:ComboBoxCategoryList" );
@@ -468,7 +468,7 @@ void KeyboardOptionsMenuShutdown( WindowLayout *layout, void *userData )
 void KeyboardOptionsMenuUpdate( WindowLayout *layout, void *userData )
 {
 
-}  // end OptionsMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Options menu input callback */
@@ -477,7 +477,7 @@ WindowMsgHandledType KeyboardOptionsMenuInput( GameWindow *window, UnsignedInt m
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -492,53 +492,52 @@ WindowMsgHandledType KeyboardOptionsMenuInput( GameWindow *window, UnsignedInt m
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "KeyboardOptionsMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "KeyboardOptionsMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end KeyboardOptionsMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** options menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 																				WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
-			
+
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -546,7 +545,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -558,7 +557,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
@@ -572,10 +571,10 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
         GadgetComboBoxGetSelectedPos(comboBoxCategoryList, &selected);
 
 				LookupListRec rec;
-				rec = CategoryListName[selected]; 
+				rec = CategoryListName[selected];
 				MappableKeyCategories cat = (MappableKeyCategories)(rec.value);
 				fillCommandListBox( cat );
-				
+
 				//reset current hotkey description
 				GadgetStaticTextSetText( staticTextDescription, TheGameText->fetch( "GUI:NULL" ) );
 
@@ -593,7 +592,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
       }
 			break;
 
-		}  // end selected
+		}
 
 		// ---------------------------------------------------------------------------------------------
 		case GLM_SELECTED:
@@ -617,7 +616,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 						MappableKeyType type = rec->m_key;
 						//enable text entry for assigning different hotkey
 						textEntryAssignHotkey->winEnable( true );
-						
+
 						for (const LookupListRec* keyName = KeyNames; keyName->name; keyName++)
 						{
 							if( keyName->value == type )
@@ -627,7 +626,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 								aStr.format( cptr );
 								UnicodeString uStr;
 								uStr.translate( aStr );
-								
+
 								GadgetStaticTextSetText( staticTextCurrentHotkey, uStr );
 								break;
 							}
@@ -635,13 +634,13 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 
 						break;
 					}
-				} // end if
+				}
 
-			} // end selected
+			}
 
 			break;
 
-		} // end case
+		}
 
 		// ---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -655,7 +654,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 				// go back one screen
 				TheShell->pop();
 
-			}  // end if
+			}
 			else if( controlID == buttonAssignID )
 			{
 				// check grammar in text field
@@ -680,7 +679,7 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 				setKeyDown(alt, false );
 				setKeyDown(ctrl, false );
 				setKeyDown(shift, false );
-				
+
 				//disable text entry
 				textEntryAssignHotkey->winEnable( false );
 
@@ -688,16 +687,16 @@ WindowMsgHandledType KeyboardOptionsMenuSystem( GameWindow *window, UnsignedInt
 
 			break;
 
-		}	// end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}	// end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end KeyboardOptionsMenuSystem
+}
 
 // KeyboardTextEntryInput =======================================================
 /** Handle input for text entry field */
@@ -715,7 +714,7 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 		return MSG_HANDLED;
 	}
 
-	switch( msg ) 
+	switch( msg )
 	{
 		// ------------------------------------------------------------------------
 		case GWM_IME_CHAR:
@@ -726,9 +725,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 			if ( ch == VK_RETURN )
 			{
 				// Done with this edit
-			 		TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			 		TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 			 																				GEM_EDIT_DONE,
-			 																				(WindowMsgData)window, 
+			 																				(WindowMsgData)window,
 			 																				0 );
 				return MSG_HANDLED;
 			};
@@ -759,9 +758,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					e->text->setText( UnicodeString::TheEmptyString );
 					e->text->appendChar( ch );
 					e->charPos = e->text->getTextLength();
-					TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+					TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GEM_UPDATE_TEXT,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					0 );
 					return MSG_HANDLED;
 				}
@@ -773,9 +772,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					{
 						e->text->appendChar( ch );
 						e->charPos++;
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GEM_UPDATE_TEXT,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 						return MSG_HANDLED;
 					}
@@ -791,9 +790,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 							{
 								e->text->removeLastChar();
 								e->text->appendChar( ch );
-								TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+								TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GEM_UPDATE_TEXT,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								0 );
 							}
 						}
@@ -803,15 +802,15 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 							e->text->setText( UnicodeString::TheEmptyString );
 							e->text->appendChar( ch );
 							e->charPos = 1;
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																							GEM_UPDATE_TEXT,
-																							(WindowMsgData)window, 
+																							(WindowMsgData)window,
 																							0 );
 						}
 						return MSG_HANDLED;
 					}
 				}
-				
+
 
 			}
 			break;
@@ -830,9 +829,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					{
 						if( e->receivedUnichar == FALSE )
 						{
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GEM_EDIT_DONE,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									0 );
 						}
 					}
@@ -849,9 +848,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					{
 						UnicodeString mod = ctrl;
 						doKeyDown( e, mod );
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																GEM_UPDATE_TEXT,
-																(WindowMsgData)window, 
+																(WindowMsgData)window,
 																0 );
 
 						return MSG_HANDLED;
@@ -860,9 +859,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					{
 							UnicodeString mod = ctrl;
 							doKeyUp( e, mod );
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GEM_UPDATE_TEXT,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 
 							return MSG_HANDLED;
@@ -877,9 +876,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					{
 						UnicodeString mod = shift;
 						doKeyDown( e, mod );
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																GEM_UPDATE_TEXT,
-																(WindowMsgData)window, 
+																(WindowMsgData)window,
 																0 );
 
 						return MSG_HANDLED;
@@ -890,9 +889,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 						UnicodeString mod = shift;
 						doKeyUp(e, mod );
 
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GEM_UPDATE_TEXT,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 
 
@@ -908,9 +907,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 						UnicodeString mod = alt;
 						doKeyDown( e, mod );
 
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																GEM_UPDATE_TEXT,
-																(WindowMsgData)window, 
+																(WindowMsgData)window,
 																0 );
 
 						return MSG_HANDLED;
@@ -920,9 +919,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 					{
 						UnicodeString mod = alt;
 						doKeyUp( e, mod );
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																GEM_UPDATE_TEXT,
-																(WindowMsgData)window, 
+																(WindowMsgData)window,
 																0 );
 
 						return MSG_HANDLED;
@@ -977,15 +976,15 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 				{
 					e->text->setText( UnicodeString::TheEmptyString );
 					e->charPos = e->text->getTextLength();
-					TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+					TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GEM_UPDATE_TEXT,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					0 );
 					setKeyDown(shift, false );
 					setKeyDown(ctrl, false );
 					setKeyDown(alt, false );
 					return MSG_HANDLED;
-					
+
 					break;
 				}
 				case KEY_DEL:
@@ -1003,11 +1002,11 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 								e->text->removeLastChar();
 								e->sText->removeLastChar();
 								e->charPos--;
-								TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+								TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GEM_UPDATE_TEXT,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								0 );
-							}  // end if
+							}
 						}
 					}
 					break;
@@ -1044,9 +1043,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 							e->text->setText( UnicodeString::TheEmptyString );
 							e->text->appendChar( ch );
 							e->charPos = e->text->getTextLength();
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																							GEM_UPDATE_TEXT,
-																							(WindowMsgData)window, 
+																							(WindowMsgData)window,
 																							0 );
 							return MSG_HANDLED;
 						}
@@ -1058,9 +1057,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 							{
 								e->text->appendChar( ch );
 								e->charPos++;
-								TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+								TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GEM_UPDATE_TEXT,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								0 );
 								return MSG_HANDLED;
 							}
@@ -1076,9 +1075,9 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 									{
 										e->text->removeLastChar();
 										e->text->appendChar( ch );
-										TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+										TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																										GEM_UPDATE_TEXT,
-																										(WindowMsgData)window, 
+																										(WindowMsgData)window,
 																										0 );
 									}
 								}
@@ -1088,21 +1087,21 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 									e->text->setText( UnicodeString::TheEmptyString );
 									e->text->appendChar( ch );
 									e->charPos = 1;
-									TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+									TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GEM_UPDATE_TEXT,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									0 );
 								}
 								return MSG_HANDLED;
 							}
 						}
-						
+
 
 					}
 				}*/
 
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
@@ -1119,7 +1118,7 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
 																						(WindowMsgData)window, 0 );
 				TheWindowManager->winSetFocus( window );
@@ -1134,7 +1133,7 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
 																						(WindowMsgData)window, 0 );
 			}
@@ -1144,7 +1143,7 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 		case GWM_LEFT_DRAG:
 
 			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
 																						(WindowMsgData)window, 0 );
 			break;
@@ -1153,10 +1152,10 @@ WindowMsgHandledType KeyboardTextEntryInput( GameWindow *window, UnsignedInt msg
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetTextEntryInput
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
index d8893c12d23..2541ecafb9e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
@@ -27,7 +27,7 @@
 // Author: Chris Huybregts, October 2001
 // Description: Lan Game Options Menu
 ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/PlayerTemplate.h"
@@ -60,11 +60,6 @@
 #include "GameClient/GameText.h"
 #include "GameNetwork/GUIUtil.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 extern char *LANnextScreen;
 extern Bool LANisShuttingDown;
@@ -195,7 +190,7 @@ void updateMapStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[
 void positionStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[], GameWindow *mapWindow);
 void LanPositionStartSpots( void )
 {
-	
+
 	positionStartSpots( TheLAN->GetMyGame(), buttonMapStartPosition, windowMap);
 }
 static void playerTooltip(GameWindow *window,
@@ -226,15 +221,8 @@ static void playerTooltip(GameWindow *window,
 		TheMouse->setCursorTooltip( UnicodeString::TheEmptyString );
 		return;
 	}
-	UnicodeString tooltip;
-	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());
-#if defined(_DEBUG) || defined(_INTERNAL)
-	UnicodeString ip;
-	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
-	tooltip.concat(ip);
-#endif
 
-	TheMouse->setCursorTooltip( tooltip );
+	setLANPlayerTooltip(player);
 }
 
 void StartPressed(void)
@@ -273,7 +261,7 @@ void StartPressed(void)
 		{
 			UnicodeString text;
 			text.format(TheGameText->fetch("LAN:TooManyPlayers"), (md)?md->m_numPlayers:0);
-			TheLAN->OnChat(UnicodeString(L"SYSTEM"), TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
+			TheLAN->OnChat(L"SYSTEM", TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
 		}
 		return;
 	}
@@ -284,7 +272,7 @@ void StartPressed(void)
 		if (TheLAN->AmIHost())
 		{
 			UnicodeString text = TheGameText->fetch("GUI:NeedHumanPlayers");
-			TheLAN->OnChat(UnicodeString(L"SYSTEM"), TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
+			TheLAN->OnChat(L"SYSTEM", TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
 		}
 		return;
 	}
@@ -296,14 +284,14 @@ void StartPressed(void)
 		{
 			UnicodeString text;
 			text.format(TheGameText->fetch("LAN:NeedMorePlayers"),numUsers);
-			TheLAN->OnChat(UnicodeString(L"SYSTEM"), TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
+			TheLAN->OnChat(L"SYSTEM", TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
 		}
 		return;
 	}
 
 	// Check for too few teams
 	int numRandom = 0;
-	std::set<Int> teams; 
+	std::set<Int> teams;
 	for (i=0; i<MAX_SLOTS; ++i)
 	{
 		GameSlot *slot = myGame->getSlot(i);
@@ -325,7 +313,7 @@ void StartPressed(void)
 		{
 			UnicodeString text;
 			text.format(TheGameText->fetch("LAN:NeedMoreTeams"));
-			TheLAN->OnChat(UnicodeString(L"SYSTEM"), TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
+			TheLAN->OnChat(L"SYSTEM", TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
 		}
 		return;
 	}
@@ -334,7 +322,7 @@ void StartPressed(void)
 	{
 		UnicodeString text;
 		text.format(TheGameText->fetch("GUI:SandboxMode"));
-			TheLAN->OnChat(UnicodeString(L"SYSTEM"), TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
+			TheLAN->OnChat(L"SYSTEM", TheLAN->GetLocalIP(), text, LANAPI::LANCHAT_SYSTEM);
 	}
 
 	// see if everyone's accepted and count the number of players in the game
@@ -400,7 +388,7 @@ void StartPressed(void)
 		}
 	}
 
-}//void StartPressed(void)
+}
 
 void LANEnableStartButton(Bool enabled)
 {
@@ -525,7 +513,7 @@ static void handlePlayerTemplateSelection(int index)
 static void handleStartPositionSelection(Int player, int startPos)
 {
 	LANGameInfo *myGame = TheLAN->GetMyGame();
-	
+
 	if (myGame)
 	{
 		LANGameSlot * slot = myGame->getLANSlot(player);
@@ -538,7 +526,7 @@ static void handleStartPositionSelection(Int player, int startPos)
 		}
 
 		if(!skip)
-		{	
+		{
 			Bool isAvailable = TRUE;
 			for(Int i = 0; i < MAX_SLOTS; ++i)
 			{
@@ -621,14 +609,14 @@ static void handleTeamSelection(int index)
 static void handleStartingCashSelection()
 {
   LANGameInfo *myGame = TheLAN->GetMyGame();
-  
+
   if (myGame)
   {
     Int selIndex;
     GadgetComboBoxGetSelectedPos(comboBoxStartingCash, &selIndex);
 
     Money startingCash;
-    startingCash.deposit( (UnsignedInt)GadgetComboBoxGetItemData( comboBoxStartingCash, selIndex ), FALSE );
+    startingCash.deposit( (UnsignedInt)GadgetComboBoxGetItemData( comboBoxStartingCash, selIndex ), FALSE, FALSE );
     myGame->setStartingCash( startingCash );
     myGame->resetAccepted();
 
@@ -647,7 +635,7 @@ static void handleStartingCashSelection()
 static void handleLimitSuperweaponsClick()
 {
   LANGameInfo *myGame = TheLAN->GetMyGame();
-  
+
   if (myGame)
   {
     // At the moment, 1 and 0 are the only choices supported in the GUI, though the system could
@@ -661,7 +649,7 @@ static void handleLimitSuperweaponsClick()
       myGame->setSuperweaponRestriction( 0 );
     }
     myGame->resetAccepted();
-    
+
     if (myGame->amIHost())
     {
       if (!s_isIniting)
@@ -680,7 +668,7 @@ void lanUpdateSlotList( void )
 		return;
 	UpdateSlotList( TheLAN->GetMyGame(), comboBoxPlayer, comboBoxColor,
 		comboBoxPlayerTemplate, comboBoxTeam, buttonAccept, buttonStart, buttonMapStartPosition);
-	
+
 	updateMapStartSpots(TheLAN->GetMyGame(), buttonMapStartPosition);
 }
 
@@ -690,17 +678,17 @@ void lanUpdateSlotList( void )
 void InitLanGameGadgets( void )
 {
 	//Initialize the gadget IDs
-	parentLanGameOptionsID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:LanGameOptionsMenuParent" ) );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonBack" ) );
-	buttonStartID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonStart" ) );
-	textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:TextEntryChat" ) );
-	textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:TextEntryMapDisplay" ) );
-	listboxChatWindowLanGameID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ListboxChatWindowLanGame" ) );
-	buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonEmote" ) );
-	buttonSelectMapID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonSelectMap" ) );
-  checkboxLimitSuperweaponsID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:CheckboxLimitSuperweapons" ) );
-  comboBoxStartingCashID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ComboBoxStartingCash" ) );
-	windowMapID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:MapWindow" ) );
+	parentLanGameOptionsID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:LanGameOptionsMenuParent" );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonBack" );
+	buttonStartID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonStart" );
+	textEntryChatID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:TextEntryChat" );
+	textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:TextEntryMapDisplay" );
+	listboxChatWindowLanGameID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ListboxChatWindowLanGame" );
+	buttonEmoteID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonEmote" );
+	buttonSelectMapID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonSelectMap" );
+  checkboxLimitSuperweaponsID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:CheckboxLimitSuperweapons" );
+  comboBoxStartingCashID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ComboBoxStartingCash" );
+	windowMapID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:MapWindow" );
 
 	// Initialize the pointers to our gadgets
 	parentLanGameOptions = TheWindowManager->winGetWindowFromId( NULL, parentLanGameOptionsID );
@@ -731,11 +719,8 @@ void InitLanGameGadgets( void )
 	Int localSlotNum = TheLAN->GetMyGame()->getLocalSlotNum();
 	DEBUG_ASSERTCRASH(localSlotNum >= 0, ("Bad slot number!"));
 
-	//Added By Sadullah Nader
 	//Tooltip function is being set for techBuildings, and supplyDocks
-
 	windowMap->winSetTooltipFunc(MapSelectorTooltip);
-	//End Add
 
 	for (Int i = 0; i < MAX_SLOTS; i++)
 	{
@@ -746,11 +731,7 @@ void InitLanGameGadgets( void )
 		GadgetComboBoxReset(comboBoxPlayer[i]);
 		GadgetComboBoxGetEditBox(comboBoxPlayer[i])->winSetTooltipFunc(playerTooltip);
 
-		if(localSlotNum == i)
-		{
-			GadgetComboBoxAddEntry(comboBoxPlayer[i],TheLAN->GetMyName(),white);
-		}
-		else
+		if(localSlotNum != i)
 		{
 			GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Open"),white);
 			GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Closed"),white);
@@ -772,7 +753,7 @@ void InitLanGameGadgets( void )
 		DEBUG_ASSERTCRASH(comboBoxColor[i], ("Could not find the comboBoxColor[%d]",i ));
 		PopulateColorComboBox(i, comboBoxColor, TheLAN->GetMyGame());
 		GadgetComboBoxSetSelectedPos(comboBoxColor[i], 0);
-		
+
 		tmpString.format("LanGameOptionsMenu.wnd:ComboBoxPlayerTemplate%d", i);
 		comboBoxPlayerTemplateID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		comboBoxPlayerTemplate[i] = TheWindowManager->winGetWindowFromId( parentLanGameOptions, comboBoxPlayerTemplateID[i] );
@@ -790,13 +771,12 @@ void InitLanGameGadgets( void )
 		PopulateTeamComboBox(i, comboBoxTeam, TheLAN->GetMyGame());
 
 		tmpString.clear();
-		tmpString.format("LanGameOptionsMenu.wnd:ButtonAccept%d", i); 
+		tmpString.format("LanGameOptionsMenu.wnd:ButtonAccept%d", i);
 		buttonAcceptID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		buttonAccept[i] = TheWindowManager->winGetWindowFromId( parentLanGameOptions, buttonAcceptID[i] );
 		DEBUG_ASSERTCRASH(buttonAccept[i], ("Could not find the buttonAccept[%d]",i ));
-		//Added by Saad for the tooltips on the MultiPlayer icons
 		buttonAccept[i]->winSetTooltipFunc(gameAcceptTooltip);
-//		
+//
 //		tmpString.format("LanGameOptionsMenu.wnd:ButtonStartPosition%d", i);
 //		buttonStartPositionID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 //		buttonStartPosition[i] = TheWindowManager->winGetWindowFromId( parentLanGameOptions, buttonStartPositionID[i] );
@@ -812,7 +792,7 @@ void InitLanGameGadgets( void )
 	}
 	if( buttonAccept[0] )
 		GadgetButtonSetEnabledColor(buttonAccept[0], acceptTrueColor );
-	
+
 }
 
 void DeinitLanGameGadgets( void )
@@ -827,7 +807,11 @@ void DeinitLanGameGadgets( void )
 	textEntryMapDisplay = NULL;
   checkboxLimitSuperweapons = NULL;
   comboBoxStartingCash = NULL;
-	windowMap = NULL;
+	if (windowMap)
+	{
+		windowMap->winSetUserData(NULL);
+		windowMap = NULL;
+	}
 	for (Int i = 0; i < MAX_SLOTS; i++)
 	{
 		comboBoxPlayer[i] = NULL;
@@ -849,7 +833,7 @@ void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
 	{
 		// If we init while the game is in progress, we are really returning to the menu
 		// after the game.  So, we pop the menu and go back to the lobby.  Whee!
-		DEBUG_LOG(("Popping to lobby after a game!\n"));
+		DEBUG_LOG(("Popping to lobby after a game!"));
 		TheShell->popImmediate();
 		return;
 	}
@@ -866,7 +850,7 @@ void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
 
 	// Make sure the text fields are clear
 	GadgetListBoxReset( listboxChatWindowLanGame );
-	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);	
+	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);
 
 	//The dialog needs to react differently depending on whether it's the host or not.
 	TheMapCache->updateCache();
@@ -898,11 +882,14 @@ void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
 		lanUpdateSlotList();
 		updateGameOptions();
 		start = 1; // leave my combo boxes usable
+
+		// TheSuperHackers @tweak disable the combo box for the host's player name
+		comboBoxPlayer[0]->winEnable(FALSE);
 	}
 	else
 	{
 
-		//DEBUG_LOG(("LanGameOptionsMenuInit(): map is %s\n", TheLAN->GetMyGame()->getMap().str()));
+		//DEBUG_LOG(("LanGameOptionsMenuInit(): map is %s", TheLAN->GetMyGame()->getMap().str()));
 		buttonStart->winSetText(TheGameText->fetch("GUI:Accept"));
 		buttonSelectMap->winEnable( FALSE );
     checkboxLimitSuperweapons->winEnable( FALSE ); // Can look but only host can touch
@@ -933,7 +920,7 @@ void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
 //
 	// Show the Menu
 	layout->hide( FALSE );
-	
+
 	// Set Keyboard to Main Parent
 	TheWindowManager->winSetFocus( parentLanGameOptions );
 
@@ -950,8 +937,8 @@ void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
 
 	// animate controls
 	//TheShell->registerWithAnimateManager(buttonBack, WIN_ANIMATION_SLIDE_RIGHT, TRUE, 1);
-	
-}// void LanGameOptionsMenuInit( WindowLayout *layout, void *userData )
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update options on screen */
@@ -1000,6 +987,29 @@ void updateGameOptions( void )
 }
 
 
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void setLANPlayerTooltip(LANPlayer* player)
+{
+	UnicodeString tooltip;
+
+	if (!player->getLogin().isEmpty() || !player->getHost().isEmpty())
+	{
+		tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());
+	}
+
+#if defined(RTS_DEBUG)
+	UnicodeString ip;
+	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
+	tooltip.concat(ip);
+#endif
+
+	if (!tooltip.isEmpty())
+	{
+		TheMouse->setCursorTooltip( tooltip );
+	}
+}
+
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -1023,7 +1033,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	LANnextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Game Options menu shutdown method */
@@ -1043,7 +1053,7 @@ void LanGameOptionsMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 	TheTransitionHandler->reverse("LanGameOptionsFade");
@@ -1060,7 +1070,7 @@ void LanGameOptionsMenuShutdown( WindowLayout *layout, void *userData )
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 	*/
-}  // void LanGameOptionsMenuShutdown( WindowLayout *layout, void *userData )
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Game Options menu update method */
@@ -1070,7 +1080,7 @@ void LanGameOptionsMenuUpdate( WindowLayout * layout, void *userData)
 	if(LANisShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 		shutdownComplete(layout);
 	//TheLAN->update(); // this is handled in the lobby
-}// void LanGameOptionsMenuUpdate( WindowLayout * layout, void *userData)
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Game Options menu input callback */
@@ -1078,7 +1088,7 @@ void LanGameOptionsMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType LanGameOptionsMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1100,47 +1110,50 @@ WindowMsgHandledType LanGameOptionsMenuInput( GameWindow *window, UnsignedInt ms
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
-					}  // end if
+					}
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
-				}  // end escape
-			}  // end switch( key )
-		}  // end char
-	}  // end switch( msg )
+				}
+			}
+		}
+	}
 	return MSG_IGNORED;
-}//WindowMsgHandledType LanGameOptionsMenuInput( GameWindow *window, UnsignedInt msg,
+}
 
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Game Options menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 	switch( msg )
 	{
-		//-------------------------------------------------------------------------------------------------	
+		//-------------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 			{
+				if (windowMap)
+					windowMap->winSetUserData(NULL);
+
 				break;
-			} // case GWM_DESTROY:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
 			{
@@ -1208,7 +1221,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
           }
 				}
         break;
-			}// case GCM_SELECTED:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 			{
@@ -1228,7 +1241,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 					TheLAN->RequestGameLeave();
 					//TheShell->pop();
 
-				} //if ( controlID == buttonBack )				
+				}
 				else if ( controlID == buttonEmoteID )
 				{
 					// read the user's input
@@ -1240,12 +1253,12 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 					// Echo the user's input to the chat window
 					if (!txtInput.isEmpty())
 						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_EMOTE);
-				} //if ( controlID == buttonEmote )
+				}
 				else if ( controlID == buttonSelectMapID )
 				{
 					//buttonBack->winEnable( false );
-				
-					mapSelectLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/LanMapSelectMenu.wnd" ) );
+
+					mapSelectLayout = TheWindowManager->winCreateLayout( "Menus/LanMapSelectMenu.wnd" );
 					mapSelectLayout->runInit();
 					mapSelectLayout->hide( FALSE );
 					mapSelectLayout->bringForward();
@@ -1266,7 +1279,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 						// Disable the accept button
 						EnableAcceptControls(TRUE, TheLAN->GetMyGame(), comboBoxPlayer, comboBoxColor, comboBoxPlayerTemplate,
 							comboBoxTeam, buttonAccept, buttonStart, buttonMapStartPosition);
-						
+
 					}
 				}
         else if ( controlID == checkboxLimitSuperweaponsID )
@@ -1317,7 +1330,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 				}
 
 				break;
-			}// case GBM_SELECTED:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GBM_SELECTED_RIGHT:
 		{
@@ -1351,7 +1364,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 						}
 					}
 				}
-			}					
+			}
 			break;
 		}
 		//-------------------------------------------------------------------------------------------------
@@ -1366,7 +1379,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 				// send it to the other clients on the lan
 				if ( controlID == textEntryChatID )
 				{
-					
+
 					// read the user's input
 					txtInput.set(GadgetTextEntryGetText( textEntryChat ));
 					// Clear the text entry line
@@ -1377,15 +1390,15 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
 					if (!txtInput.isEmpty())
 						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_NORMAL);
 
-				}// if ( controlID == textEntryChatID )
+				}
 				break;
 			}
 		//-------------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
-	}//Switch
+	}
 	return MSG_HANDLED;
-}//WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt msg, 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Utility FUnction used as a bridge from other windows to this one */
@@ -1401,12 +1414,12 @@ void PostToLanGameOptions( PostToLanGameType post )
 		case SEND_GAME_OPTS:
 		{
 			LANGameInfo *game = TheLAN->GetMyGame();
-			game->resetAccepted();			
-			updateGameOptions();		
+			game->resetAccepted();
+			updateGameOptions();
 			lanUpdateSlotList();
-			
+
 			//buttonBack->winEnable( true );
-			
+
 			for(Int i = 0; i < MAX_SLOTS; ++i)
 			{
 				game->getSlot(i)->setStartPos(-1);
@@ -1414,7 +1427,7 @@ void PostToLanGameOptions( PostToLanGameType post )
 
 			TheLAN->RequestGameOptions(GenerateGameOptionsString(), true);
 			break;
-		}		//-------------------------------------------------------------------------------------------------
+		}
 		case MAP_BACK:
 		{
 				//buttonBack->winEnable( true );
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
index ce762645156..58418c946df 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Lib/BaseType.h"
 #include "Common/crc.h"
@@ -193,7 +193,7 @@ AsciiString LANPreferences::getPreferredMap(void)
 		ret = getDefaultMap(TRUE);
 		return ret;
 	}
-	
+
 	return ret;
 }
 
@@ -233,7 +233,7 @@ UnicodeString LANPreferences::getRemoteIPEntry(Int i)
 	asciientry.set(asciientry.str() + 1); // skip the ':'
 
 	ret.translate(ipstr);
-	if (asciientry.getLength() > 0)
+	if (!asciientry.isEmpty())
 	{
 		ret.concat(L"(");
 		ret.concat(QuotedPrintableToUnicodeString(asciientry));
@@ -252,7 +252,7 @@ Bool LANPreferences::getSuperweaponRestricted(void) const
   {
     return false;
   }
-  
+
   return ( it->second.compareNoCase( "yes" ) == 0 );
 }
 
@@ -271,7 +271,7 @@ Money LANPreferences::getStartingCash(void) const
   }
 
   Money money;
-  money.deposit( strtoul( it->second.str(), NULL, 10 ), FALSE  );
+  money.deposit( strtoul( it->second.str(), NULL, 10 ), FALSE, FALSE );
 
   return money;
 }
@@ -352,14 +352,8 @@ static void playerTooltip(GameWindow *window,
 		//TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:LobbyPlayers") );
 		return;
 	}
-	UnicodeString tooltip;
-	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());
-#if defined(_DEBUG) || defined(_INTERNAL)
-	UnicodeString ip;
-	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
-	tooltip.concat(ip);
-#endif
-	TheMouse->setCursorTooltip( tooltip );
+
+	setLANPlayerTooltip(player);
 }
 
 
@@ -373,20 +367,20 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	LANisShuttingDown = false;
 
 	// get the ids for our controls
-	parentLanLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:LanLobbyMenuParent" ) );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonBack" ) );
-	buttonClearID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonClear" ) );
-	buttonHostID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonHost" ) );
-	buttonJoinID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonJoin" ) );
-	buttonDirectConnectID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonDirectConnect" ) );
-	buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonEmote" ) );
-	staticToolTipID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:StaticToolTip" ) );
-	textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:TextEntryPlayerName" ) );
-	textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:TextEntryChat" ) );
-	listboxPlayersID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ListboxPlayers" ) );
-	listboxChatWindowID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ListboxChatWindowLanLobby" ) );
-	listboxGamesID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ListboxGames" ) );
-	staticTextGameInfoID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:StaticTextGameInfo" ) );
+	parentLanLobbyID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:LanLobbyMenuParent" );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonBack" );
+	buttonClearID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonClear" );
+	buttonHostID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonHost" );
+	buttonJoinID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonJoin" );
+	buttonDirectConnectID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonDirectConnect" );
+	buttonEmoteID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonEmote" );
+	staticToolTipID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:StaticToolTip" );
+	textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:TextEntryPlayerName" );
+	textEntryChatID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:TextEntryChat" );
+	listboxPlayersID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ListboxPlayers" );
+	listboxChatWindowID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ListboxChatWindowLanLobby" );
+	listboxGamesID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ListboxGames" );
+	staticTextGameInfoID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:StaticTextGameInfo" );
 
 
 	// Get pointers to the window buttons
@@ -412,7 +406,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	// Init LAN API Singleton
 	if (!TheLAN)
 	{
-		TheLAN = NEW LANAPI();	/// @todo clh delete TheLAN and 
+		TheLAN = NEW LANAPI();	/// @todo clh delete TheLAN and
 		useFpsLimit = TheGlobalData->m_useFpsLimit;
 	}
 	else
@@ -447,7 +441,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	{
 		IPSource = L"Default local IP";
 	}
-#if defined(_DEBUG) || defined(_INTERNAL)
+#if defined(RTS_DEBUG)
 	UnicodeString str;
 	str.format(L"%s: %d.%d.%d.%d", IPSource, PRINTF_IP_AS_4_INTS(IP));
 	GadgetListBoxAddEntryText(listboxChatWindow, str, chatSystemColor, -1, 0);
@@ -464,8 +458,8 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	//txtInput.translate(IPs.getMachineName());
 	LANPreferences prefs;
 	defaultName = prefs.getUserName();
-	while (defaultName.getLength() > g_lanPlayerNameLength)
-		defaultName.removeLastChar();
+	defaultName.truncateTo(g_lanPlayerNameLength);
+
 	GadgetTextEntrySetText( textEntryPlayerName, defaultName);
 	// Clear the text entry line
 	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);
@@ -473,8 +467,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	GadgetListBoxReset(listboxPlayers);
 	GadgetListBoxReset(listboxGames);
 
-	while (defaultName.getLength() > g_lanPlayerNameLength)
-		defaultName.removeLastChar();
+	defaultName.truncateTo(g_lanPlayerNameLength);
 	TheLAN->RequestSetName(defaultName);
 	TheLAN->RequestLocations();
 
@@ -502,7 +495,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	//shellmapOn = FALSE;
 	// coming out of a game, re-load the shell map
 	TheShell->showShellMap(TRUE);
-		
+
 	// check for MOTD
 	TheLAN->checkMOTD();
 	layout->hide(FALSE);
@@ -514,7 +507,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 	if(win)
 		win->winHide(TRUE);
 
-	
+
 	// animate controls
 	//TheShell->registerWithAnimateManager(parentLanLobby, WIN_ANIMATION_SLIDE_TOP, TRUE);
 //	TheShell->registerWithAnimateManager(buttonHost, WIN_ANIMATION_SLIDE_LEFT, TRUE, 600);
@@ -523,7 +516,7 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData )
 //	//TheShell->registerWithAnimateManager(buttonOptions, WIN_ANIMATION_SLIDE_LEFT, TRUE, 1);
 //	TheShell->registerWithAnimateManager(buttonBack, WIN_ANIMATION_SLIDE_RIGHT, TRUE, 1);
 
-} // GameLobbyMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -546,7 +539,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	LANnextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Lobby menu shutdown method */
@@ -583,13 +576,13 @@ void LanLobbyMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 	TheTransitionHandler->reverse("LanLobbyFade");
 	//if(	shellmapOn)
 //		TheShell->showShellMap(TRUE);
-}  // LanLobbyMenuShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -622,7 +615,7 @@ void LanLobbyMenuUpdate( WindowLayout * layout, void *userData)
 
 	if (LANSocketErrorDetected == TRUE) {
 		LANSocketErrorDetected = FALSE;
-		DEBUG_LOG(("SOCKET ERROR!  BAILING!\n"));
+		DEBUG_LOG(("SOCKET ERROR!  BAILING!"));
 		MessageBoxOk(TheGameText->fetch("GUI:NetworkError"), TheGameText->fetch("GUI:SocketError"), NULL);
 
 		// we have a socket problem, back out to the main menu.
@@ -630,8 +623,8 @@ void LanLobbyMenuUpdate( WindowLayout * layout, void *userData)
 																			 (WindowMsgData)buttonBack, buttonBackID);
 	}
 
-	
-}// LanLobbyMenuUpdate
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Lobby menu input callback */
@@ -639,7 +632,7 @@ void LanLobbyMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType LanLobbyMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -656,74 +649,74 @@ WindowMsgHandledType LanLobbyMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// LanLobbyMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Lobby menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
 				SignalUIInteraction(SHELL_SCRIPT_HOOK_LAN_OPENED);
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				SignalUIInteraction(SHELL_SCRIPT_HOOK_LAN_CLOSED);
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 		case GLM_DOUBLE_CLICKED:
 			{
 				if (LANbuttonPushed)
 					break;
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxGamesID ) 
+				if( controlID == listboxGamesID )
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						LANGameInfo * theGame = TheLAN->LookupGameByListOffset(rowSelected);
@@ -741,7 +734,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					break;
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxGamesID ) 
+				if( controlID == listboxGamesID )
 				{
 					int rowSelected = mData2;
 					if( rowSelected < 0 )
@@ -769,31 +762,31 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 				{
 					//shellmapOn = TRUE;
 					LANbuttonPushed = true;
-					DEBUG_LOG(("Back was hit - popping to main menu\n"));
+					DEBUG_LOG(("Back was hit - popping to main menu"));
 					TheShell->pop();
 					delete TheLAN;
 					TheLAN = NULL;
 					//TheTransitionHandler->reverse("LanLobbyFade");
 
-				} //if ( controlID == buttonBack )
+				}
 				else if ( controlID == buttonHostID )
 				{
-					TheLAN->RequestGameCreate( UnicodeString(L""), FALSE);
-					
-				}//else if ( controlID == buttonHostID )
+					TheLAN->RequestGameCreate( L"", FALSE);
+
+				}
 				else if ( controlID == buttonClearID )
 				{
 					GadgetTextEntrySetText(textEntryPlayerName, UnicodeString::TheEmptyString);
-					TheWindowManager->winSendSystemMsg( window, 
+					TheWindowManager->winSendSystemMsg( window,
 																						GEM_UPDATE_TEXT,
-																						(WindowMsgData)textEntryPlayerName, 
+																						(WindowMsgData)textEntryPlayerName,
 																						0 );
 
 				}
 				else if ( controlID == buttonJoinID )
 				{
 
-					//TheShell->push( AsciiString("Menus/LanGameOptionsMenu.wnd") );
+					//TheShell->push( "Menus/LanGameOptionsMenu.wnd" );
 
 					int rowSelected = -1;
 					GadgetListBoxGetSelected( listboxGames, &rowSelected );
@@ -811,7 +804,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 						GadgetListBoxAddEntryText(listboxChatWindow, TheGameText->fetch("LAN:ErrorNoGameSelected") , chatSystemColor, -1, 0);
 					}
 
-				} //else if ( controlID == buttonJoinID )
+				}
 				else if ( controlID == buttonEmoteID )
 				{
 					// read the user's input
@@ -825,16 +818,16 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 //						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_EMOTE);
 						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_NORMAL);
 					}
-				} //if ( controlID == buttonEmote )
+				}
 				else if (controlID == buttonDirectConnectID)
 				{
 					TheLAN->RequestLobbyLeave( false );
-					TheShell->push(AsciiString("Menus/NetworkDirectConnect.wnd"));
+					TheShell->push("Menus/NetworkDirectConnect.wnd");
 				}
-				
+
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_UPDATE_TEXT:
 			{
 				if (LANbuttonPushed)
@@ -857,9 +850,8 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					else
 						txtInput = UnicodeString::TheEmptyString;
 
-					while (txtInput.getLength() > g_lanPlayerNameLength)
-						txtInput.removeLastChar();
-					
+					txtInput.truncateTo(g_lanPlayerNameLength);
+
 					if (!txtInput.isEmpty() && txtInput.getCharAt(txtInput.getLength()-1) == L',')
 						txtInput.removeLastChar(); // we use , for strtok's so we can't allow them in names.  :(
 
@@ -880,9 +872,9 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					// Put the whitespace-free version in the box
 					GadgetTextEntrySetText( textEntryPlayerName, txtInput );
 
-				}// if ( controlID == textEntryPlayerNameID )
+				}
 				break;
-			}//case GEM_UPDATE_TEXT:
+			}
 		case GEM_EDIT_DONE:
 			{
 				if (LANbuttonPushed)
@@ -894,7 +886,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 				// send it to the other clients on the lan
 				if ( controlID == textEntryChatID )
 				{
-					
+
 					// read the user's input
 					txtInput.set(GadgetTextEntryGetText( textEntryChat ));
 					// Clear the text entry line
@@ -907,7 +899,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					if (!txtInput.isEmpty())
 						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_NORMAL);
 
-				}// if ( controlID == textEntryChatID )
+				}
 				/*
 				else if ( controlID == textEntryPlayerNameID )
 				{
@@ -924,14 +916,14 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					// Put the whitespace-free version in the box
 					GadgetTextEntrySetText( textEntryPlayerName, txtInput );
 
-				}// if ( controlID == textEntryPlayerNameID )
+				}
 				*/
 				break;
 			}
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// LanLobbyMenuSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
index 343da538036..5ff05f9ff1b 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/NameKeyGenerator.h"
@@ -44,11 +44,6 @@
 #include "GameClient/MapUtil.h"
 #include "GameNetwork/GUIUtil.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 static NameKeyType buttonBack = NAMEKEY_INVALID;
@@ -85,14 +80,14 @@ static const char *gadgetsToHide[] =
 	"ButtonStart",
 	"StaticTextMapPreview",
 
-	NULL // keep this last
+	NULL
 };
 static const char *perPlayerGadgetsToHide[] =
 {
 	"ComboBoxTeam",
 	"ComboBoxColor",
 	"ComboBoxPlayerTemplate",
-	NULL // keep this last
+	NULL
 };
 
 static void showLANGameOptionsUnderlyingGUIElements( Bool show )
@@ -106,9 +101,13 @@ static void showLANGameOptionsUnderlyingGUIElements( Bool show )
 
 static void NullifyControls()
 {
-	mapList = NULL;
-	winMapPreview = NULL;
 	parent = NULL;
+	mapList = NULL;
+	if (winMapPreview)
+	{
+		winMapPreview->winSetUserData(NULL);
+		winMapPreview = NULL;
+	}
 	for (Int i=0; i<MAX_SLOTS; ++i)
 	{
 		buttonMapStartPosition[i] = NULL;
@@ -123,8 +122,7 @@ void LanMapSelectMenuInit( WindowLayout *layout, void *userData )
 	showLANGameOptionsUnderlyingGUIElements(FALSE);
 
 	// set keyboard focus to main parent
-	AsciiString parentName( "LanMapSelectMenu.wnd:LanMapSelectMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:LanMapSelectMenuParent" );
 	parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 
 	TheWindowManager->winSetFocus( parent );
@@ -139,10 +137,10 @@ void LanMapSelectMenuInit( WindowLayout *layout, void *userData )
 	}
 
 
-	buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:ButtonBack") );
-	buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:ButtonOK") );
-	listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:ListboxMap") );
-	winMapPreviewID = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:WinMapPreview") );
+	buttonBack = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ButtonBack" );
+	buttonOK = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ButtonOK" );
+	listboxMap = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ListboxMap" );
+	winMapPreviewID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:WinMapPreview" );
 
 	radioButtonSystemMapsID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:RadioButtonSystemMaps" );
 	radioButtonUserMapsID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:RadioButtonUserMaps" );
@@ -166,8 +164,7 @@ void LanMapSelectMenuInit( WindowLayout *layout, void *userData )
 	}
 
 	// get the listbox window
-	AsciiString listString( "LanMapSelectMenu.wnd:ListboxMap" );
-	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( listString );
+	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ListboxMap" );
 	mapList = TheWindowManager->winGetWindowFromId( parent, mapListID );
 	if( mapList )
 	{
@@ -175,7 +172,7 @@ void LanMapSelectMenuInit( WindowLayout *layout, void *userData )
 			TheMapCache->updateCache();
 		populateMapListbox( mapList, usesSystemMapDir, TRUE, TheLAN->GetMyGame()->getMap() );
 	}
-}  // end LanMapSelectMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu shutdown method */
@@ -187,10 +184,10 @@ void LanMapSelectMenuShutdown( WindowLayout *layout, void *userData )
 	layout->hide( TRUE );
 
 	NullifyControls();
-	
+
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
-}  // end LanMapSelectMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu update method */
@@ -198,7 +195,7 @@ void LanMapSelectMenuShutdown( WindowLayout *layout, void *userData )
 void LanMapSelectMenuUpdate( WindowLayout *layout, void *userData )
 {
 
-}  // end LanMapSelectMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Map select menu input callback */
@@ -207,7 +204,7 @@ WindowMsgHandledType LanMapSelectMenuInput( GameWindow *window, UnsignedInt msg,
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -222,41 +219,40 @@ WindowMsgHandledType LanMapSelectMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "LanMapSelectMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end LanMapSelectMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
 	GameWindow *mapWindow = NULL;
@@ -265,16 +261,16 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 		mapWindow = TheWindowManager->winGetWindowFromId( parent, listboxMap );
 	}
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
-			
+
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -283,7 +279,7 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -295,23 +291,23 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GLM_DOUBLE_CLICKED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						GadgetListBoxSetSelected( control, rowSelected );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonOK );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonOK );
 					}
 				}
@@ -343,7 +339,7 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 			}
 			else if ( controlID == buttonBack )
 			{
-				
+
 				if (mapSelectLayout)
 				{
 					mapSelectLayout->destroyWindows();
@@ -355,7 +351,7 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 				NullifyControls();
 				showLANGameOptionsUnderlyingGUIElements(TRUE);
 				PostToLanGameOptions( MAP_BACK );
-			}  // end if
+			}
 			else if ( controlID == buttonOK )
 			{
 				Int selected = -1;
@@ -393,7 +389,7 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 						TheLAN->GetMyGame()->adjustSlotsForMap(); // BGC- adjust the slots for the new map.
 					}
 
-					
+
 					if (mapSelectLayout)
 					{
 						mapSelectLayout->destroyWindows();
@@ -407,19 +403,19 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 					showLANGameOptionsUnderlyingGUIElements(TRUE);
 					PostToLanGameOptions(SEND_GAME_OPTS);
 
-				}  // end if
-			}  // end else if
+				}
+			}
 
 			break;
 
-		}  // end selected
+		}
 
 		case GLM_SELECTED:
 			{
-				
+
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
 					if( rowSelected < 0 )
@@ -460,8 +456,8 @@ WindowMsgHandledType LanMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end LanMapSelectMenuSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
index f507410f4d8..23b5e9ea142 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "gamespy/ghttp/ghttp.h"
 
@@ -74,16 +74,8 @@
 #include "GameNetwork/GameSpy/MainMenuUtils.h"
 
 #include "GameClient/CDCheck.h"
-//Added By Saad
-//for accessing the InGameUI
 #include "GameClient/InGameUI.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 
@@ -95,13 +87,13 @@ enum
 	DROPDOWN_MAIN,
 	DROPDOWN_LOADREPLAY,
 	DROPDOWN_DIFFICULTY,
-	
-	DROPDOWN_COUNT // keep last
+
+	DROPDOWN_COUNT
 };
 
 static Bool raiseMessageBoxes = TRUE;
 static Bool campaignSelected = FALSE;
-#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE
+#if defined(RTS_DEBUG) || defined RTS_PROFILE
 static NameKeyType campaignID = NAMEKEY_INVALID;
 static GameWindow *buttonCampaign = NULL;
 #ifdef TEST_COMPRESSION
@@ -213,7 +205,6 @@ static Bool launchChallengeMenu = FALSE;
 
 static Bool dontAllowTransitions = FALSE;
 
-//Added by Saad
 const Int /*TIME_OUT = 15,*/ CORNER = 10;
 void AcceptResolution();
 void DeclineResolution();
@@ -221,7 +212,6 @@ GameWindow *resAcceptMenu = NULL;
 extern DisplaySettings oldDispSettings, newDispSettings;
 extern Bool dispChanged;
 //static time_t timeStarted = 0, currentTime = 0;
-//
 
 void diffReverseSide( void );
 void HandleCanceledDownload( Bool resetDropDown )
@@ -247,7 +237,7 @@ static void showSelectiveButtons( Int show )
 	buttonChinaRecentSave->winHide(!(show == SHOW_CHINA ));
 	buttonChinaLoadGame->winHide(!(show == SHOW_CHINA ));
 }
- 
+
 static void quitCallback( void )
 {
 	buttonPushed = TRUE;
@@ -255,7 +245,7 @@ static void quitCallback( void )
 	TheShell->pop();
 	TheGameEngine->setQuitting( TRUE );
 
-  
+
 
 	//if (!TheGameLODManager->didMemPass())
 	{	//GIANT CRAPTACULAR HACK ALERT!!!!  On sytems with little memory, we skip all normal exit code
@@ -270,7 +260,7 @@ static void quitCallback( void )
 
 	}
 	if (TheGameLogic->isInGame())
-		TheMessageStream->appendMessage( GameMessage::MSG_CLEAR_GAME_DATA );
+		TheGameLogic->exitGame();
 }
 
 
@@ -282,9 +272,9 @@ void setupGameStart(AsciiString mapName, GameDifficulty diff)
 	{
 		if (TheChallengeGenerals)
 			TheChallengeGenerals->setCurrentDifficulty(diff);
-		
+
 		campaignSelected = TRUE;
-		TheShell->push( AsciiString("Menus/ChallengeMenu.wnd") );
+		TheShell->push( "Menus/ChallengeMenu.wnd" );
 		TheTransitionHandler->reverse("MainMenuDifficultyMenuTraining");
 	}
 	else
@@ -361,14 +351,14 @@ static void checkCDBeforeCampaign(GameDifficulty diff)
 static void shutdownComplete( WindowLayout *layout )
 {
 	isShuttingDown = FALSE;
-	
+
 	// hide the layout
 	layout->hide( TRUE );
 
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end if
+}
 
 
 
@@ -447,6 +437,28 @@ GameWindow *win = NULL;
 		win->winHide(TRUE);
 
 }
+
+// TheSuperHackers @tweak Now prints version information in an optional version label.
+// Originally this label does not exist in the Main Menu. It can be copied from the Options Menu.
+static void initLabelVersion()
+{
+	NameKeyType versionID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:LabelVersion" );
+	GameWindow *labelVersion = TheWindowManager->winGetWindowFromId( NULL, versionID );
+
+	if (labelVersion)
+	{
+		if (TheVersion && TheGlobalData)
+		{
+			UnicodeString text = TheVersion->getUnicodeProductVersionHashString();
+			GadgetStaticTextSetText( labelVersion, text );
+		}
+		else
+		{
+			labelVersion->winHide( TRUE );
+		}
+	}
+}
+
 //-------------------------------------------------------------------------------------------------
 /** Initialize the main menu */
 //-------------------------------------------------------------------------------------------------
@@ -467,42 +479,41 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 		dropDownWindows[i] = NULL;
 
 	// get ids for our windows
-	mainMenuID = TheNameKeyGenerator->nameToKey( AsciiString( "MainMenu.wnd:MainMenuParent" ) );
-//	campaignID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonCampaign") );
-	skirmishID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSkirmish") );
-	onlineID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonOnline") );
-	networkID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonNetwork") );
-	optionsID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonOptions") );
-	exitID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonExit") );
-	motdID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMOTD") );
-	worldBuilderID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonWorldBuilder") );
-//	NameKeyType versionID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:LabelVersion") );
-	getUpdateID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGetUpdate") );
-//	buttonTRAININGID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonTRAINING") );
-	buttonChallengeID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChallenge") );
-	buttonUSAID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonUSA") );
-	buttonGLAID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGLA") );
-	buttonChinaID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChina") );
-	buttonUSARecentSaveID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonUSARecentSave") );
-	buttonUSALoadGameID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonUSALoadGame") );
-	buttonGLARecentSaveID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGLARecentSave") );
-	buttonGLALoadGameID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGLALoadGame") );
-	buttonChinaRecentSaveID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChinaRecentSave") );
-	buttonChinaLoadGameID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChinaLoadGame") );
-	buttonSinglePlayerID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSinglePlayer") );
-	buttonMultiPlayerID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMultiplayer") );
-	buttonMultiBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMultiBack") );
-	buttonSingleBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSingleBack") );
-	buttonLoadReplayBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonLoadReplayBack") );
-	buttonReplayID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonReplay") );
-	buttonLoadReplayID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonLoadReplay") );
-	buttonLoadID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonLoadGame") );
-	buttonCreditsID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonCredits") );
-
-	buttonEasyID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonEasy") );
-	buttonMediumID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMedium") );
-	buttonHardID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonHard") );
-	buttonDiffBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonDiffBack") );
+	mainMenuID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MainMenuParent" );
+//	campaignID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonCampaign" );
+	skirmishID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSkirmish" );
+	onlineID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonOnline" );
+	networkID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonNetwork" );
+	optionsID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonOptions" );
+	exitID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonExit" );
+	motdID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMOTD" );
+	worldBuilderID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonWorldBuilder" );
+	getUpdateID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGetUpdate" );
+//	buttonTRAININGID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonTRAINING" );
+	buttonChallengeID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChallenge" );
+	buttonUSAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSA" );
+	buttonGLAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLA" );
+	buttonChinaID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChina" );
+	buttonUSARecentSaveID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSARecentSave" );
+	buttonUSALoadGameID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSALoadGame" );
+	buttonGLARecentSaveID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLARecentSave" );
+	buttonGLALoadGameID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLALoadGame" );
+	buttonChinaRecentSaveID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChinaRecentSave" );
+	buttonChinaLoadGameID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChinaLoadGame" );
+	buttonSinglePlayerID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSinglePlayer" );
+	buttonMultiPlayerID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMultiplayer" );
+	buttonMultiBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMultiBack" );
+	buttonSingleBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSingleBack" );
+	buttonLoadReplayBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonLoadReplayBack" );
+	buttonReplayID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonReplay" );
+	buttonLoadReplayID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonLoadReplay" );
+	buttonLoadID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonLoadGame" );
+	buttonCreditsID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonCredits" );
+
+	buttonEasyID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonEasy" );
+	buttonMediumID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMedium" );
+	buttonHardID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonHard" );
+	buttonDiffBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonDiffBack" );
 
 	// get pointers to the window buttons
 	parentMainMenu = TheWindowManager->winGetWindowFromId( NULL, mainMenuID );
@@ -526,9 +537,6 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 	buttonHard = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonHardID );
 	buttonDiffBack = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonDiffBackID );
 
-
-//	GameWindow *labelVersion = TheWindowManager->winGetWindowFromId( parentMainMenu, versionID );
-	
 	getUpdate = TheWindowManager->winGetWindowFromId( parentMainMenu, getUpdateID );
 //	buttonTRAINING = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonTRAININGID );
 	buttonChallenge = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonChallengeID );
@@ -542,65 +550,53 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 	buttonChinaRecentSave = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonChinaRecentSaveID );
 	buttonChinaLoadGame = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonChinaLoadGameID );
 
-	dropDownWindows[DROPDOWN_SINGLE] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder") ));
-	dropDownWindows[DROPDOWN_MULTIPLAYER] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder1") ) );
-	dropDownWindows[DROPDOWN_MAIN] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder2") ) );
-	dropDownWindows[DROPDOWN_LOADREPLAY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder3") ) );
-	dropDownWindows[DROPDOWN_DIFFICULTY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder4") ) );
+	dropDownWindows[DROPDOWN_SINGLE] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder" ));
+	dropDownWindows[DROPDOWN_MULTIPLAYER] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder1" ) );
+	dropDownWindows[DROPDOWN_MAIN] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder2" ) );
+	dropDownWindows[DROPDOWN_LOADREPLAY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder3" ) );
+	dropDownWindows[DROPDOWN_DIFFICULTY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder4" ) );
 	for(i = 1; i < DROPDOWN_COUNT; ++i)
 		dropDownWindows[i]->winHide(TRUE);
 
 	initialHide();
-	
+
 	showSelectiveButtons(SHOW_NONE);
 	// Set up the version number
-#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE
+#if defined(RTS_DEBUG) || defined RTS_PROFILE
 	WinInstanceData instData;
 #ifdef TEST_COMPRESSION
 	instData.init();
 	BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK );
 	instData.m_textLabelString = "Debug: Compress/Decompress Maps";
-	instData.setTooltipText(UnicodeString(L"Only Used in Debug and Internal!"));
-	buttonCompressTest = TheWindowManager->gogoGadgetPushButton( parentMainMenu, 
-																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE, 
-																									 25, 175, 
-																									 400, 400, 
+	instData.setTooltipText(L"Only Used in Debug and Internal!");
+	buttonCompressTest = TheWindowManager->gogoGadgetPushButton( parentMainMenu,
+																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
+																									 25, 175,
+																									 400, 400,
 																									 &instData, NULL, TRUE );
 #endif // TEST_COMPRESSION
 
 	instData.init();
 	BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK );
 	instData.m_textLabelString = "Debug: Load Map";
-	
-	instData.setTooltipText(UnicodeString(L"Only Used in Debug and Internal!"));
-	buttonCampaign = TheWindowManager->gogoGadgetPushButton( parentMainMenu, 
-																									 WIN_STATUS_ENABLED, 
-																									 25, 54, 
-																									 180, 26, 
+
+	instData.setTooltipText(L"Only Used in Debug and Internal!");
+	buttonCampaign = TheWindowManager->gogoGadgetPushButton( parentMainMenu,
+																									 WIN_STATUS_ENABLED,
+																									 25, 54,
+																									 180, 26,
 																									 &instData, NULL, TRUE );
-	
-//	if (TheVersion)
-//	{
-//		UnicodeString version;
-//		version.format(L"%s\n%s", TheVersion->getUnicodeVersion().str(), TheVersion->getUnicodeBuildTime().str());
-//		GadgetStaticTextSetText( labelVersion, version );
-//	}
-//	else
-//	{
-//		labelVersion->winHide( TRUE );
-//	}
-//#else
-	
-//	GadgetStaticTextSetText( labelVersion, TheVersion->getUnicodeVersion() );
 #endif
 
+	initLabelVersion();
+
 	//TheShell->registerWithAnimateManager(buttonCampaign, WIN_ANIMATION_SLIDE_LEFT, TRUE, 800);
 	//TheShell->registerWithAnimateManager(buttonSkirmish, WIN_ANIMATION_SLIDE_LEFT, TRUE, 600);
 //	TheShell->registerWithAnimateManager(buttonSinglePlayer, WIN_ANIMATION_SLIDE_LEFT, TRUE, 400);
 //	TheShell->registerWithAnimateManager(buttonMultiPlayer, WIN_ANIMATION_SLIDE_LEFT, TRUE, 200);
 //	TheShell->registerWithAnimateManager(buttonOptions, WIN_ANIMATION_SLIDE_LEFT, TRUE, 1);
 //	TheShell->registerWithAnimateManager(buttonExit, WIN_ANIMATION_SLIDE_RIGHT, TRUE, 1);
-//	
+//
 	layout->hide( FALSE );
 
 	/*
@@ -612,7 +608,7 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 		{
 			// wohoo - we're connected!  fire off a check for updates
 			checkedForUpdate = TRUE;
-			DEBUG_LOG(("Looking for a patch for productID=%d, versionStr=%s, distribution=%d\n",
+			DEBUG_LOG(("Looking for a patch for productID=%d, versionStr=%s, distribution=%d",
 				gameProductID, gameVersionUniqueIDStr, gameDistributionID));
 			ptCheckForPatch( gameProductID, gameVersionUniqueIDStr, gameDistributionID, patchAvailableCallback, PTFalse, NULL );
 			//ptCheckForPatch( productID, versionUniqueIDStr, distributionID, mapPackAvailableCallback, PTFalse, NULL );
@@ -627,7 +623,7 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 
 	if (TheGameSpyPeerMessageQueue && !TheGameSpyPeerMessageQueue->isConnected())
 	{
-		DEBUG_LOG(("Tearing down GameSpy from MainMenuInit()\n"));
+		DEBUG_LOG(("Tearing down GameSpy from MainMenuInit()"));
 		TearDownGameSpy();
 	}
 	if (TheMapCache)
@@ -639,7 +635,7 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 		buttonMOTD->winHide(FALSE);
 	}
 	*/
-	
+
 	TheShell->loadScheme("MainMenu");
 	raiseMessageBoxes = TRUE;
 
@@ -647,9 +643,9 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 //		localAnimateWindowManager = NEW AnimateWindowManager;
 
 	//pendingDropDown =DROPDOWN_MAIN;
-	
 
-	GameWindow *rule = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MainMenuRuler") ) );
+
+	GameWindow *rule = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MainMenuRuler" ) );
 	if(rule)
 		rule->winHide(TRUE);
 	campaignSelected = FALSE;
@@ -670,12 +666,12 @@ void MainMenuInit( WindowLayout *layout, void *userData )
 		rule->winHide(FALSE);
 	}
 
-	layout->bringForward();	
+	layout->bringForward();
 	// set keyboard focus to main parent
 	TheWindowManager->winSetFocus( parentMainMenu );
-	
-	
-}  // end MainMenuInit
+
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Main menu shutdown method */
@@ -689,11 +685,11 @@ void MainMenuShutdown( WindowLayout *layout, void *userData )
 
 	// if we are shutting down for an immediate pop, skip the animations
 	Bool popImmediate = *(Bool *)userData;
-	
+
 //	if(winVidManager)
 	//		delete winVidManager;
 	//	winVidManager = NULL;
-	
+
 
 	if( popImmediate )
 	{
@@ -705,21 +701,19 @@ void MainMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	if (!startGame)
 		TheShell->reverseAnimatewindow();
 	//TheShell->reverseAnimatewindow();
 //	if(localAnimateWindowManager && dropDown != DROPDOWN_NONE)
 //		localAnimateWindowManager->reverseAnimateWindow();
-}  // end MainMenuShutdown
+}
 
 extern Bool DontShowMainMenu;
 
 ////////////////////////////////////////////////////////////////////////////
-//Added By Sadullah Nader
-//Added as a fix to the resolution change
-//Allows the user to confirm the change, goes back to the previous mode 
+//Allows the user to confirm the change, goes back to the previous mode
 //if the time to change expires.
 ////////////////////////////////////////////////////////////////////////////
 
@@ -739,10 +733,10 @@ void AcceptResolution()
 //-------------------------------------------------------------------------------------------------
 void DeclineResolution()
 {
-	//Revert back to old resolution and reset all necessary 
+	//Revert back to old resolution and reset all necessary
 	//parts of the shell
 
-	if (TheDisplay->setDisplayMode(oldDispSettings.xRes, oldDispSettings.yRes, 
+	if (TheDisplay->setDisplayMode(oldDispSettings.xRes, oldDispSettings.yRes,
 										oldDispSettings.bitDepth, oldDispSettings.windowed))
 	{
 		dispChanged = FALSE;
@@ -750,29 +744,20 @@ void DeclineResolution()
 
 		TheWritableGlobalData->m_xResolution = newDispSettings.xRes;
 		TheWritableGlobalData->m_yResolution = newDispSettings.yRes;
-		
-		TheHeaderTemplateManager->headerNotifyResolutionChange();
-		TheMouse->mouseNotifyResolutionChange();
-				
+
+		TheHeaderTemplateManager->onResolutionChanged();
+		TheMouse->onResolutionChanged();
+
 		AsciiString prefString;
 		prefString.format("%d %d", newDispSettings.xRes, newDispSettings.yRes);
-		
+
 		OptionPreferences optionPref;
 		optionPref["Resolution"] = prefString;
 		optionPref.write();
 
-		// delete the shell
-		delete TheShell;
-		TheShell = NULL;
+		TheShell->recreateWindowLayouts();
 
-		// create the shell
-		TheShell = MSGNEW("GameClientSubsystem") Shell;
-		if( TheShell )
-			TheShell->init();
-		
 		TheInGameUI->recreateControlBar();
-
-		TheShell->push( AsciiString("Menus/MainMenu.wnd") );
 	}
 }
 
@@ -783,25 +768,25 @@ void DoResolutionDialog()
 {
 	//Bring up a dialog to accept the resolution chosen in the options menu
 	UnicodeString resolutionNew;
-	
+
 	UnicodeString resTimerString = TheGameText->fetch("GUI:Resolution");
-	
+
 	resolutionNew.format(L": %dx%d\n", newDispSettings.xRes , newDispSettings.yRes);
-	
+
 	resTimerString.concat(resolutionNew);
-		
-	
-	resAcceptMenu = TheWindowManager->gogoMessageBox( CORNER, CORNER, -1, -1,MSG_BOX_OK | MSG_BOX_CANCEL , 
-																									 TheGameText->fetch("GUI:Resolution"), 
-																									 resTimerString, NULL, NULL, AcceptResolution, 
+
+
+	resAcceptMenu = TheWindowManager->gogoMessageBox( CORNER, CORNER, -1, -1,MSG_BOX_OK | MSG_BOX_CANCEL ,
+																									 TheGameText->fetch("GUI:Resolution"),
+																									 resTimerString, NULL, NULL, AcceptResolution,
 																									 DeclineResolution);
 }
 
-/* This function is not being currently used because we do not need a timer on the 
+/* This function is not being currently used because we do not need a timer on the
 // dialog box.
 //-------------------------------------------------------------------------------------------------
-//ResolutionDialogUpdate() - if resolution dialog box is shown, this must count 10 seconds for 
-//	accepting resolution changes otherwise we go back to previous display settings 
+//ResolutionDialogUpdate() - if resolution dialog box is shown, this must count 10 seconds for
+//	accepting resolution changes otherwise we go back to previous display settings
 //-------------------------------------------------------------------------------------------------
 void ResolutionDialogUpdate()
 {
@@ -809,11 +794,11 @@ void ResolutionDialogUpdate()
 	{
 		timeStarted = currentTime = time(NULL);
 	}
-	else 
+	else
 	{
 		currentTime = time(NULL);
 	}
-	
+
 	if ( ( currentTime - timeStarted ) >= TIME_OUT)
 	{
 		currentTime = timeStarted = 0;
@@ -822,7 +807,7 @@ void ResolutionDialogUpdate()
 	//------------------------------------------------------------------------------------------------------
 	// Used for debugging purposes
 	//------------------------------------------------------------------------------------------------------
-	DEBUG_LOG(("Resolution Timer :  started at %d,  current time at %d, frameTicker is %d\n", timeStarted, 
+	DEBUG_LOG(("Resolution Timer :  started at %d,  current time at %d, frameTicker is %d", timeStarted,
 							time(NULL) , currentTime));
 }
 */
@@ -839,15 +824,13 @@ void MainMenuUpdate( WindowLayout *layout, void *userData )
 	}
 	if(DontShowMainMenu && justEntered)
 		justEntered = FALSE;
-	
+
 	if (TheDownloadManager && !TheDownloadManager->isDone())
 	{
 		TheDownloadManager->update();
 		DownloadMenuUpdate(layout, userData);
 	}
 
-	// Added by Saad to the confirmation or decline of the resoluotion change
-	// dialog box.
 	/* This is also commented for the same reason as the top
 	if (dispChanged)
 	{
@@ -868,7 +851,7 @@ void MainMenuUpdate( WindowLayout *layout, void *userData )
 		else
 			initialGadgetDelay--;
 	}
-	
+
 	if(dontAllowTransitions && TheTransitionHandler->isFinished())
 		dontAllowTransitions = FALSE;
 
@@ -895,7 +878,7 @@ void MainMenuUpdate( WindowLayout *layout, void *userData )
 				break;
 			}
 			showLogo = FALSE;
-//			showFrames = 0;	
+//			showFrames = 0;
 //			logoIsShown = TRUE;
 //		}
 //		else
@@ -940,7 +923,7 @@ void MainMenuUpdate( WindowLayout *layout, void *userData )
 //			dropDownWindows[dropDown]->winHide(TRUE);
 //		dropDown = pendingDropDown;
 //		dropDownWindows[dropDown]->winHide(FALSE);
-//		localAnimateWindowManager->registerGameWindow(dropDownWindows[dropDown],WIN_ANIMATION_SLIDE_TOP_FAST,TRUE,1,1);						
+//		localAnimateWindowManager->registerGameWindow(dropDownWindows[dropDown],WIN_ANIMATION_SLIDE_TOP_FAST,TRUE,1,1);
 //		//buttonPushed = FALSE;
 //		pendingDropDown = DROPDOWN_NONE;
 //	}
@@ -950,31 +933,31 @@ void MainMenuUpdate( WindowLayout *layout, void *userData )
 //		for(Int i = 1; i < DROPDOWN_COUNT; ++i)
 //			dropDownWindows[i]->winHide(TRUE);
 //	}
-	
-	
-	
-	
+
+
+
+
 
 	if (startGame && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 	{
 		doGameStart();
 	}
 
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 	{
 		shutdownComplete(layout);
 	}
-	
 
-	// We'll only be successful if we've requested to 
+
+	// We'll only be successful if we've requested to
 //	if(TheShell->isAnimReversed() && TheShell->isAnimFinished())
 //		shutdownComplete( layout );
 
 //	if(winVidManager)
 //		winVidManager->update();
 
-}  // end MainMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Main menu input callback */
@@ -985,8 +968,8 @@ WindowMsgHandledType MainMenuInput( GameWindow *window, UnsignedInt msg,
 
 	if(!notShown)
 		return MSG_IGNORED;
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -995,15 +978,17 @@ WindowMsgHandledType MainMenuInput( GameWindow *window, UnsignedInt msg,
 			ICoord2D mouse;
 			mouse.x = mData1 & 0xFFFF;
 			mouse.y = mData1 >> 16;
-			if( mouse.x == 0 && mouse.y == 0)
+
+			// TheSuperHackers @tweak 20/08/2025 Show mouse and menu immediately when shellmap is disabled.
+			if (TheGlobalData->m_shellMapOn && mouse.x == 0 && mouse.y == 0)
 				break;
 
 			static Int mousePosX = mouse.x;
 			static Int mousePosY = mouse.y;
 			if(abs(mouse.x - mousePosX) > 20 || abs(mouse.y - mousePosY) > 20)
 			{
-			
-				DEBUG_LOG(("Mouse X:%d, Y:%d\n", mouse.x, mouse.y));
+
+				DEBUG_LOG(("Mouse X:%d, Y:%d", mouse.x, mouse.y));
 				if(notShown)
 				{
 					initialGadgetDelay = 1;
@@ -1015,8 +1000,8 @@ WindowMsgHandledType MainMenuInput( GameWindow *window, UnsignedInt msg,
 					return MSG_HANDLED;
 				}
 			}
-			
-		}  // end char
+
+		}
 		break;
 		case GWM_CHAR:
 		{
@@ -1030,26 +1015,26 @@ WindowMsgHandledType MainMenuInput( GameWindow *window, UnsignedInt msg,
 				notShown = FALSE;
 				return MSG_HANDLED;
 			}
-			
-		}  // end char
 
-	}  // end switch( msg )
-	
+		}
+
+	}
+
 
 	return MSG_IGNORED;
 
-}  // end MainMenuInput
+}
 void PrintOffsetsFromControlBarParent( void );
 //-------------------------------------------------------------------------------------------------
 /** Main menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 										 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	static Bool triedToInitWOLAPI = FALSE;
 	static Bool canInitWOLAPI = FALSE;
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		//---------------------------------------------------------------------------------------------
@@ -1057,18 +1042,18 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 		{
 			ghttpStartup();
 			break;
-		}  // end case
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 			ghttpCleanup();
-			DEBUG_LOG(("Tearing down GameSpy from MainMenuSystem(GWM_DESTROY)\n"));
+			DEBUG_LOG(("Tearing down GameSpy from MainMenuSystem(GWM_DESTROY)"));
 			TearDownGameSpy();
 			StopAsyncDNSCheck(); // kill off the async DNS check thread in case it is still running
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -1080,7 +1065,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end input
+		}
 		//---------------------------------------------------------------------------------------------
 		case GBM_MOUSE_ENTERING:
 		{
@@ -1146,7 +1131,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->setGroup("MainMenuFactionSkirmish");
 				//showSelectiveButtons(SHOW_NONE);
 			}
-			
+
 			else if(controlID == buttonUSAID)
 			{
 				if(dontAllowTransitions && !campaignSelected)
@@ -1196,7 +1181,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 //				showFrames = 0;
 //				showSide = SHOW_CHINA;
 			}
-			
+
 		break;
 		}
 		//---------------------------------------------------------------------------------------------
@@ -1246,7 +1231,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				if(campaignSelected || dontAllowTransitions)
 					break;
 				TheTransitionHandler->reverse("MainMenuFactionTraining");
-				
+
 				//showSelectiveButtons(SHOW_NONE);
 			}
 */			else if(controlID == skirmishID)
@@ -1271,7 +1256,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				if(campaignSelected || dontAllowTransitions)
 					break;
 				TheTransitionHandler->reverse("MainMenuFactionUS");
-				
+
 				//showSelectiveButtons(SHOW_NONE);
 			}
 			else if(controlID == buttonGLAID)
@@ -1297,23 +1282,23 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 					break;
 				TheTransitionHandler->reverse("MainMenuFactionChina");
 				//showSelectiveButtons(SHOW_NONE);
-			}	
+			}
 		break;
 		}
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
-			
+
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-			
+
 			if(buttonPushed)
 				break;
-#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE
+#if defined(RTS_DEBUG) || defined RTS_PROFILE
 			if( control == buttonCampaign )
 			{
 				buttonPushed = TRUE;
-				TheShell->push(AsciiString( "Menus/MapSelectMenu.wnd" ));
+				TheShell->push("Menus/MapSelectMenu.wnd");
 				// As soon as we have a campaign, add it in here!;
 			}
 #ifdef TEST_COMPRESSION
@@ -1322,7 +1307,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				DoCompressTest();
 			}
 #endif // TEST_COMPRESSION
-			else 
+			else
 #endif
 
 			// don't allow mouse click slop that occurs during transitions to unset this flag
@@ -1346,7 +1331,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->remove("MainMenuDefaultMenu");
 				TheTransitionHandler->reverse("MainMenuDefaultMenuBack");
 				TheTransitionHandler->setGroup("MainMenuSinglePlayerMenu");
-			}  // end if
+			}
 			else if( controlID == buttonSingleBackID )
 			{
 				if(campaignSelected || dontAllowTransitions)
@@ -1357,7 +1342,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->reverse("MainMenuSinglePlayerMenuBack");
 				TheTransitionHandler->setGroup("MainMenuDefaultMenu");
 				dontAllowTransitions = TRUE;
-			}  // end if
+			}
 			else if( controlID == buttonMultiBackID )
 			{
 				if(dontAllowTransitions)
@@ -1368,7 +1353,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->remove("MainMenuMultiPlayerMenu");
 				TheTransitionHandler->reverse("MainMenuMultiPlayerMenuReverse");
 				TheTransitionHandler->setGroup("MainMenuDefaultMenu");
-			}  // end if
+			}
 			else if( controlID == buttonLoadReplayBackID )
 			{
 				if(dontAllowTransitions)
@@ -1379,8 +1364,8 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->remove("MainMenuLoadReplayMenu");
 				TheTransitionHandler->reverse("MainMenuLoadReplayMenuBack");
 				TheTransitionHandler->setGroup("MainMenuDefaultMenu");
-			}  // end if
-			
+			}
+
 			else if( control == buttonCredits )
 			{
 				if(dontAllowTransitions)
@@ -1401,7 +1386,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				dropDownWindows[DROPDOWN_MULTIPLAYER]->winHide(FALSE);
 				TheTransitionHandler->remove("MainMenuDefaultMenu");
 				TheTransitionHandler->reverse("MainMenuDefaultMenuBack");
-				TheTransitionHandler->setGroup("MainMenuMultiPlayerMenu");		
+				TheTransitionHandler->setGroup("MainMenuMultiPlayerMenu");
 			}
 			else if( controlID == buttonLoadReplayID)
 			{
@@ -1422,14 +1407,14 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				dontAllowTransitions = TRUE;
 //				SaveLoadLayoutType layoutType = SLLT_LOAD_ONLY;
 //        WindowLayout *saveLoadMenuLayout = TheShell->getSaveLoadMenuLayout();
-//				DEBUG_ASSERTCRASH( saveLoadMenuLayout, ("Unable to get save load menu layout.\n") );
+//				DEBUG_ASSERTCRASH( saveLoadMenuLayout, ("Unable to get save load menu layout.") );
 //				saveLoadMenuLayout->runInit( &layoutType );
 //				saveLoadMenuLayout->hide( FALSE );
 //				saveLoadMenuLayout->bringForward();
 				buttonPushed = TRUE;
 				dropDownWindows[DROPDOWN_LOADREPLAY]->winHide(FALSE);
 				TheTransitionHandler->reverse("MainMenuLoadReplayMenuBackTransition");
-				TheShell->push(AsciiString("Menus/SaveLoad.wnd"));
+				TheShell->push("Menus/SaveLoad.wnd");
 
 			}
 			else if( controlID == buttonReplayID )
@@ -1440,7 +1425,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				buttonPushed = TRUE;
 				dropDownWindows[DROPDOWN_LOADREPLAY]->winHide(FALSE);
 				TheTransitionHandler->reverse("MainMenuLoadReplayMenuBackTransition");
-				TheShell->push(AsciiString("Menus/ReplayMenu.wnd"));
+				TheShell->push("Menus/ReplayMenu.wnd");
 			}
 			else if( controlID == skirmishID )
 			{
@@ -1463,7 +1448,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				checkCDBeforeCampaign(DIFFICULTY_NORMAL);
 				break;
 #endif
-				TheShell->push( AsciiString("Menus/SkirmishGameOptionsMenu.wnd") );
+				TheShell->push( "Menus/SkirmishGameOptionsMenu.wnd" );
 				TheScriptEngine->signalUIInteract(TheShellHookNames[SHELL_SCRIPT_HOOK_MAIN_MENU_SKIRMISH_SELECTED]);
 			}
 			else if( controlID == onlineID )
@@ -1479,7 +1464,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 //				localAnimateWindowManager->reverseAnimateWindow();
 				dropDown = DROPDOWN_NONE;
 
-			}  // end else if
+			}
 			else if( controlID == networkID )
 			{
 				if(dontAllowTransitions)
@@ -1488,10 +1473,10 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				buttonPushed = TRUE;
 				dropDownWindows[DROPDOWN_MULTIPLAYER]->winHide(FALSE);
 				TheTransitionHandler->reverse("MainMenuMultiPlayerMenuTransitionToNext");
-				TheShell->push( AsciiString("Menus/LanLobbyMenu.wnd") );
+				TheShell->push( "Menus/LanLobbyMenu.wnd" );
 
 				TheScriptEngine->signalUIInteract(TheShellHookNames[SHELL_SCRIPT_HOOK_MAIN_MENU_NETWORK_SELECTED]);
-			}  // end else if
+			}
 			else if( controlID == optionsID )
 			{
 				if(dontAllowTransitions)
@@ -1506,15 +1491,12 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				optLayout->runInit();
 				optLayout->hide(FALSE);
 				optLayout->bringForward();
-			}  // end else if
+			}
 			else if( controlID == worldBuilderID )
 			{
 #if defined RTS_DEBUG
 				if(_spawnl(_P_NOWAIT,"WorldBuilderD.exe","WorldBuilderD.exe", NULL) < 0)
 					MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL);
-#elif defined  RTS_INTERNAL
-				if(_spawnl(_P_NOWAIT,"WorldBuilderI.exe","WorldBuilderI.exe", NULL) < 0)
-					MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL);
 #else
 				if(_spawnl(_P_NOWAIT,"WorldBuilder.exe","WorldBuilder.exe", NULL) < 0)
 					MessageBoxOk(TheGameText->fetch("GUI:WorldBuilder"), TheGameText->fetch("GUI:WorldBuilderLoadFailed"),NULL);
@@ -1527,23 +1509,19 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 			else if( controlID == exitID )
 			{
 				// If we ever want to add a dialog before we exit out of the game, uncomment this line and kill the quitCallback() line below.
-//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-				
-				//Added By Sadullah Nader
-				//Changed the preprocessing code to normal code
+//#if defined(RTS_DEBUG)
 				if (TheGlobalData->m_windowed)
 				{
 					quitCallback();
-//#else	
+//#else
 				}
 				else
 				{
 					QuitMessageBoxYesNo(TheGameText->fetch("GUI:QuitPopupTitle"), TheGameText->fetch("GUI:QuitPopupMessage"),quitCallback,NULL);
 				}
-				//
 //#endif
-				
-			}  // end else if
+
+			}
 			else if(controlID == buttonChallengeID)
 			{
 				if(campaignSelected || dontAllowTransitions)
@@ -1561,7 +1539,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				showSide = SHOW_TRAINING;
 				launchChallengeMenu = TRUE;
 			}
-			
+
 
 // This button has been removed for the mission disk -June 2003
 /*			else if(controlID == buttonTRAININGID)
@@ -1603,7 +1581,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				showSide = SHOW_USA;
 //				launchChallengeMenu = FALSE;
 //				WindowLayout *layout = NULL;
-//				layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DifficultySelect.wnd" ) );
+//				layout = TheWindowManager->winCreateLayout( "Menus/DifficultySelect.wnd" );
 //				layout->runInit();
 //				layout->hide( FALSE );
 //				layout->bringForward();
@@ -1622,7 +1600,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->remove("MainMenuFactionGLA", TRUE);
 				GameWindow *win = TheWindowManager->winGetWindowFromId(parentMainMenu, TheNameKeyGenerator->nameToKey("MainMenu.wnd:WinFactionGLA"));
 				if(win)
-					win->winHide(TRUE);				
+					win->winHide(TRUE);
 				TheTransitionHandler->reverse("MainMenuSinglePlayerMenuBackGLA");
 				TheTransitionHandler->setGroup("MainMenuDifficultyMenuGLA");
 				campaignSelected = TRUE;
@@ -1631,7 +1609,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				showSide = SHOW_GLA;
 //				launchChallengeMenu = FALSE;
 //				WindowLayout *layout = NULL;
-//				layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DifficultySelect.wnd" ) );
+//				layout = TheWindowManager->winCreateLayout( "Menus/DifficultySelect.wnd" );
 //				layout->runInit();
 //				layout->hide( FALSE );
 //				layout->bringForward();
@@ -1650,7 +1628,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheTransitionHandler->remove("MainMenuFactionChina", TRUE);
 				GameWindow *win = TheWindowManager->winGetWindowFromId(parentMainMenu, TheNameKeyGenerator->nameToKey("MainMenu.wnd:WinFactionChina"));
 				if(win)
-					win->winHide(TRUE);				
+					win->winHide(TRUE);
 				TheTransitionHandler->reverse("MainMenuSinglePlayerMenuBackChina");
 				TheTransitionHandler->setGroup("MainMenuDifficultyMenuChina");
 				campaignSelected = TRUE;
@@ -1659,13 +1637,13 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 				showSide = SHOW_CHINA;
 //				launchChallengeMenu = FALSE;
 //				WindowLayout *layout = NULL;
-//				layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DifficultySelect.wnd" ) );
+//				layout = TheWindowManager->winCreateLayout( "Menus/DifficultySelect.wnd" );
 //				layout->runInit();
 //				layout->hide( FALSE );
 //				layout->bringForward();
 
 //				setupGameStart(TheCampaignManager->getCurrentMap());
-			}// end else if
+			}
 			else if(controlID == buttonEasyID)
 			{
 				if(dontAllowTransitions)
@@ -1700,17 +1678,17 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end selected
-		
+		}
+
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end MainMenuSystem
+}
 
 void diffReverseSide( void )
 {
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
index 91caaecfded..429d921a4fd 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/MessageStream.h"
@@ -104,12 +104,11 @@ static void shutdownComplete( WindowLayout *layout )
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end if
+}
 
 void SetDifficultyRadioButton( void )
 {
-	AsciiString parentName( "MapSelectMenu.wnd:MapSelectMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:MapSelectMenuParent" );
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 
 	if (!TheScriptEngine)
@@ -122,15 +121,15 @@ void SetDifficultyRadioButton( void )
 		{
 			case DIFFICULTY_EASY:
 			{
-				NameKeyType radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonEasyAI") );
-				GameWindow *radioButtonEasyAI = TheWindowManager->winGetWindowFromId( parent, radioButtonEasyAIID );			
+				NameKeyType radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonEasyAI" );
+				GameWindow *radioButtonEasyAI = TheWindowManager->winGetWindowFromId( parent, radioButtonEasyAIID );
 				GadgetRadioSetSelection(radioButtonEasyAI, FALSE);
 				s_AIDiff = DIFFICULTY_EASY;
 				break;
 			}
 			case DIFFICULTY_NORMAL:
 			{
-				NameKeyType radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonMediumAI") );
+				NameKeyType radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonMediumAI" );
 				GameWindow *radioButtonMediumAI = TheWindowManager->winGetWindowFromId( parent, radioButtonMediumAIID );
 				GadgetRadioSetSelection(radioButtonMediumAI, FALSE);
 				s_AIDiff = DIFFICULTY_NORMAL;
@@ -138,8 +137,8 @@ void SetDifficultyRadioButton( void )
 			}
 			case DIFFICULTY_HARD:
 			{
-				NameKeyType radioButtonHardAIID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonHardAI") );
-				GameWindow *radioButtonHardAI = TheWindowManager->winGetWindowFromId( parent, radioButtonHardAIID );			
+				NameKeyType radioButtonHardAIID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonHardAI" );
+				GameWindow *radioButtonHardAI = TheWindowManager->winGetWindowFromId( parent, radioButtonHardAIID );
 				GadgetRadioSetSelection(radioButtonHardAI, FALSE);
 				s_AIDiff = DIFFICULTY_HARD;
 				break;
@@ -149,9 +148,9 @@ void SetDifficultyRadioButton( void )
 			{
 				DEBUG_CRASH(("unrecognized difficulty level in the script engine"));
 			}
-			
+
 		}
-	} // if (TheScriptEngine)
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -171,8 +170,7 @@ void MapSelectMenuInit( WindowLayout *layout, void *userData )
 	Bool usesSystemMapDir = pref.usesSystemMapDir();
 
 	// get the listbox window
-	AsciiString listString( "MapSelectMenu.wnd:ListboxMap" );
-	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( listString );
+	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ListboxMap" );
 	mapList = TheWindowManager->winGetWindowFromId( NULL, mapListID );
 	if( mapList )
 	{
@@ -181,17 +179,16 @@ void MapSelectMenuInit( WindowLayout *layout, void *userData )
 		populateMapListbox( mapList, usesSystemMapDir, !showSoloMaps );
 	}
 
-	
+
 	// set keyboard focus to main parent
-	AsciiString parentName( "MapSelectMenu.wnd:MapSelectMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:MapSelectMenuParent" );
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	TheWindowManager->winSetFocus( parent );
 
-	NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonBack") );
+	NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonBack" );
 	GameWindow *buttonBack = TheWindowManager->winGetWindowFromId( NULL, buttonBackID );
-	
-	NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonOK") );
+
+	NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonOK" );
 	GameWindow *buttonOK = TheWindowManager->winGetWindowFromId( NULL, buttonOKID );
 
 
@@ -208,7 +205,7 @@ void MapSelectMenuInit( WindowLayout *layout, void *userData )
 		GadgetRadioSetSelection( radioButtonSystemMaps, FALSE );
 	else
 		GadgetRadioSetSelection( radioButtonUserMaps, FALSE );
-}  // end MapSelectMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu shutdown method */
@@ -226,12 +223,12 @@ void MapSelectMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	if (!startGame)
 		TheShell->reverseAnimatewindow();
 
-}  // end MapSelectMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu update method */
@@ -242,12 +239,12 @@ void MapSelectMenuUpdate( WindowLayout *layout, void *userData )
 	if (startGame && TheShell->isAnimFinished())
 		doGameStart();
 
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished())
 		shutdownComplete(layout);
 
 
-}  // end MapSelectMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Map select menu input callback */
@@ -256,7 +253,7 @@ WindowMsgHandledType MapSelectMenuInput( GameWindow *window, UnsignedInt msg,
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -273,41 +270,40 @@ WindowMsgHandledType MapSelectMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "MapSelectMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end MapSelectMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
 	static NameKeyType buttonBack = NAMEKEY_INVALID;
@@ -316,7 +312,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 	static NameKeyType radioButtonEasyAI = NAMEKEY_INVALID;
 	static NameKeyType radioButtonMediumAI = NAMEKEY_INVALID;
 	static NameKeyType radioButtonHardAI = NAMEKEY_INVALID;
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -324,15 +320,15 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 		{
 
 			// get ids for our children controls
-			buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonBack") );
-			buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonOK") );
-			listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ListboxMap") );
-			radioButtonEasyAI = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonEasyAI") );
-			radioButtonMediumAI = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonMediumAI") );
-			radioButtonHardAI = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonHardAI") );
+			buttonBack = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonBack" );
+			buttonOK = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonOK" );
+			listboxMap = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ListboxMap" );
+			radioButtonEasyAI = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonEasyAI" );
+			radioButtonMediumAI = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonMediumAI" );
+			radioButtonHardAI = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonHardAI" );
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -340,7 +336,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -352,7 +348,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -402,7 +398,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 				TheShell->pop();
 				buttonPushed = true;
 
-			}  // end if
+			}
 			else if( controlID == buttonOK )
 			{
 
@@ -418,15 +414,15 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 					buttonPushed = true;
 					// reset the campaign manager to empty
 					if( TheCampaignManager )
-					  TheCampaignManager->setCampaign( AsciiString( "" ) );
+					  TheCampaignManager->setCampaign( "" );
 					// get text of the map to load
 					const char *mapFname = (const char *)GadgetListBoxGetItemData( mapWindow, selected );
 					DEBUG_ASSERTCRASH(mapFname, ("No map item data"));
 					if (mapFname)
 						setupGameStart(mapFname);
-				}  // end if
+				}
 
-			}  // end else if
+			}
 			else if( controlID == radioButtonEasyAI)
 			{
 				s_AIDiff = DIFFICULTY_EASY;
@@ -441,7 +437,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end selected
+		}
 		case GLM_DOUBLE_CLICKED:
 			{
 				if (buttonPushed)
@@ -449,18 +445,18 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						//buttonPushed = true;
 						GadgetListBoxSetSelected( control, rowSelected );
-						NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonOK") );
+						NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonOK" );
 						GameWindow *buttonOK = TheWindowManager->winGetWindowFromId( NULL, buttonOKID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)buttonOK, buttonOKID );
 					}
 				}
@@ -469,8 +465,8 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end MapSelectMenuSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
index 7de2fa6f000..c6132c56e49 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "gamespy/peer/peer.h"
 
@@ -50,11 +50,6 @@
 #include "GameNetwork/LANAPI.h"
 #include "GameNetwork/LANAPICallbacks.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // window ids ------------------------------------------------------------------------------
 
@@ -118,7 +113,7 @@ void UpdateRemoteIPList()
 //	UnicodeString newEntry = prefs.getRemoteIPEntry(0);
 	UnicodeString newEntry = unisel;
 	UnicodeString newIP;
-	newEntry.nextToken(&newIP, UnicodeString(L":"));
+	newEntry.nextToken(&newIP, L":");
 	Int numFields = swscanf(newIP.str(), L"%d.%d.%d.%d", &(n1[0]), &(n1[1]), &(n1[2]), &(n1[3]));
 
 	if (numFields != 4) {
@@ -145,7 +140,7 @@ void UpdateRemoteIPList()
 			{
 				UnicodeString oldEntry = uni;
 				UnicodeString oldIP;
-				oldEntry.nextToken(&oldIP, UnicodeString(L":"));
+				oldEntry.nextToken(&oldIP, L":");
 
 				swscanf(oldIP.str(), L"%d.%d.%d.%d", &(n2[0]), &(n2[1]), &(n2[2]), &(n2[3]));
 
@@ -202,8 +197,7 @@ void HostDirectConnectGame()
 	prefs["UserName"] = UnicodeStringToQuotedPrintable(name);
 	prefs.write();
 
-	while (name.getLength() > g_lanPlayerNameLength)
-		name.removeLastChar();
+	name.truncateTo(g_lanPlayerNameLength);
 	TheLAN->RequestSetName(name);
 	TheLAN->RequestGameCreate(localIPString, TRUE);
 }
@@ -225,13 +219,11 @@ void JoinDirectConnectGame()
 	AsciiString ipstring;
 	asciientry.nextToken(&ipstring, "(");
 
-	char ipstr[16];
-	strcpy(ipstr, ipstring.str());
-
 	Int ip1, ip2, ip3, ip4;
-	sscanf(ipstr, "%d.%d.%d.%d", &ip1, &ip2, &ip3, &ip4);
+	Int numFields = sscanf(ipstring.str(), "%d.%d.%d.%d", &ip1, &ip2, &ip3, &ip4);
+	(void)numFields; DEBUG_ASSERTCRASH(numFields == 4, ("JoinDirectConnectGame - invalid IP address format: %s", ipstring.str()));
 
-	DEBUG_LOG(("JoinDirectConnectGame - joining at %d.%d.%d.%d\n", ip1, ip2, ip3, ip4));
+	DEBUG_LOG(("JoinDirectConnectGame - joining at %d.%d.%d.%d", ip1, ip2, ip3, ip4));
 
 	ipaddress = (ip1 << 24) + (ip2 << 16) + (ip3 << 8) + ip4;
 //	ipaddress = htonl(ipaddress);
@@ -246,8 +238,7 @@ void JoinDirectConnectGame()
 	UpdateRemoteIPList();
 	PopulateRemoteIPComboBox();
 
-	while (name.getLength() > g_lanPlayerNameLength)
-		name.removeLastChar();
+	name.truncateTo(g_lanPlayerNameLength);
 	TheLAN->RequestSetName(name);
 
 	TheLAN->RequestGameJoinDirectConnect(ipaddress);
@@ -271,12 +262,12 @@ void NetworkDirectConnectInit( WindowLayout *layout, void *userData )
 	buttonPushed = false;
 	isShuttingDown = false;
 	TheShell->showShellMap(TRUE);
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ButtonBack" ) );
-	buttonHostID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ButtonHost" ) );
-	buttonJoinID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ButtonJoin" ) );
-	editPlayerNameID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:EditPlayerName" ) );
-	comboboxRemoteIPID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ComboboxRemoteIP" ) );
-	staticLocalIPID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:StaticLocalIP" ) );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ButtonBack" );
+	buttonHostID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ButtonHost" );
+	buttonJoinID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ButtonJoin" );
+	editPlayerNameID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:EditPlayerName" );
+	comboboxRemoteIPID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ComboboxRemoteIP" );
+	staticLocalIPID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:StaticLocalIP" );
 
 	buttonBack = TheWindowManager->winGetWindowFromId( NULL,  buttonBackID);
 	buttonHost = TheWindowManager->winGetWindowFromId( NULL,	buttonHostID);
@@ -294,7 +285,7 @@ void NetworkDirectConnectInit( WindowLayout *layout, void *userData )
 	UnicodeString name;
 	name = userprefs.getUserName();
 
-	if (name.getLength() == 0)
+	if (name.isEmpty())
 	{
 		name = TheGameText->fetch("GUI:Player");
 	}
@@ -314,7 +305,7 @@ void NetworkDirectConnectInit( WindowLayout *layout, void *userData )
 
 		OptionPreferences prefs;
 		UnsignedInt IP = prefs.getOnlineIPAddress();
-		
+
 		IPEnumeration IPs;
 
 //		if (!IP)
@@ -356,7 +347,7 @@ void NetworkDirectConnectInit( WindowLayout *layout, void *userData )
 	TheTransitionHandler->setGroup("NetworkDirectConnectFade");
 
 
-} // NetworkDirectConnectInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -372,7 +363,7 @@ static void shutdownComplete( WindowLayout *layout )
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Welcome Menu shutdown method */
@@ -389,12 +380,12 @@ void NetworkDirectConnectShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 
 	TheTransitionHandler->reverse("NetworkDirectConnectFade");
-}  // NetworkDirectConnectShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -402,10 +393,10 @@ void NetworkDirectConnectShutdown( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 void NetworkDirectConnectUpdate( WindowLayout * layout, void *userData)
 {
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 		shutdownComplete(layout);
-}// NetworkDirectConnectUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Welcome Menu input callback */
@@ -413,7 +404,7 @@ void NetworkDirectConnectUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType NetworkDirectConnectInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -430,63 +421,63 @@ WindowMsgHandledType NetworkDirectConnectInput( GameWindow *window, UnsignedInt
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// NetworkDirectConnectInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Welcome Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType NetworkDirectConnectSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType NetworkDirectConnectSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -505,14 +496,13 @@ WindowMsgHandledType NetworkDirectConnectSystem( GameWindow *window, UnsignedInt
 					prefs["UserName"] = UnicodeStringToQuotedPrintable(name);
 					prefs.write();
 
-					while (name.getLength() > g_lanPlayerNameLength)
-						name.removeLastChar();
+					name.truncateTo(g_lanPlayerNameLength);
 					TheLAN->RequestSetName(name);
 
 					buttonPushed = true;
 					LANbuttonPushed = true;
 					TheShell->pop();
-				} //if ( controlID == buttonBack )
+				}
 				else if (controlID == buttonHostID)
 				{
 					HostDirectConnectGame();
@@ -522,8 +512,8 @@ WindowMsgHandledType NetworkDirectConnectSystem( GameWindow *window, UnsignedInt
 					JoinDirectConnectGame();
 				}
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -531,7 +521,7 @@ WindowMsgHandledType NetworkDirectConnectSystem( GameWindow *window, UnsignedInt
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// NetworkDirectConnectSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
index 1984623f6b1..16e2cc03111 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "gamespy/ghttp/ghttp.h"
 
@@ -38,12 +38,14 @@
 #include "Common/GameEngine.h"
 #include "Common/UserPreferences.h"
 #include "Common/GameLOD.h"
+#include "Common/Recorder.h"
 #include "Common/Registry.h"
 #include "Common/version.h"
 
 #include "GameClient/ClientInstance.h"
 #include "GameClient/GameClient.h"
 #include "GameClient/InGameUI.h"
+#include "GameClient/LookAtXlat.h"
 #include "GameClient/WindowLayout.h"
 #include "GameClient/Gadget.h"
 #include "GameClient/GadgetCheckBox.h"
@@ -62,6 +64,7 @@
 #include "GameClient/IMEManager.h"
 #include "GameClient/ShellHooks.h"
 #include "GameClient/GUICallbacks.h"
+#include "GameClient/GlobalLanguage.h"
 #include "GameNetwork/FirewallHelper.h"
 #include "GameNetwork/IPEnumeration.h"
 #include "GameNetwork/GameSpyOverlay.h"
@@ -69,18 +72,13 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/ScriptEngine.h"
 #include "WWDownload/Registry.h"
-//added by saad
-//used to access a messagebox that does "ok" and "cancel"
 #include "GameClient/MessageBox.h"
 
+#include "ww3d.h"
+
 // This is for non-RC builds only!!!
 #define VERBOSE_VERSION L"Release"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 static NameKeyType		comboBoxOnlineIPID	= NAMEKEY_INVALID;
@@ -93,10 +91,10 @@ static NameKeyType    comboBoxAntiAliasingID   = NAMEKEY_INVALID;
 static GameWindow *   comboBoxAntiAliasing     = NULL;
 
 static NameKeyType    comboBoxResolutionID      = NAMEKEY_INVALID;
-static GameWindow *   comboBoxResolution       = NULL; 
+static GameWindow *   comboBoxResolution       = NULL;
 
 static NameKeyType    comboBoxDetailID      = NAMEKEY_INVALID;
-static GameWindow *   comboBoxDetail        = NULL; 
+static GameWindow *   comboBoxDetail        = NULL;
 
 static NameKeyType		checkAlternateMouseID	= NAMEKEY_INVALID;
 static GameWindow *		checkAlternateMouse		= NULL;
@@ -152,13 +150,13 @@ static GameWindow *   sliderGamma = NULL;
 
 //Advanced Options Screen
 static NameKeyType    WinAdvancedDisplayID      = NAMEKEY_INVALID;
-static GameWindow *   WinAdvancedDisplay				= NULL; 
+static GameWindow *   WinAdvancedDisplay				= NULL;
 
 static NameKeyType    ButtonAdvancedAcceptID      = NAMEKEY_INVALID;
-static GameWindow *   ButtonAdvancedAccept				= NULL; 
+static GameWindow *   ButtonAdvancedAccept				= NULL;
 
 static NameKeyType    ButtonAdvancedCancelID      = NAMEKEY_INVALID;
-static GameWindow *   ButtonAdvancedCancel				= NULL; 
+static GameWindow *   ButtonAdvancedCancel				= NULL;
 
 static NameKeyType    sliderTextureResolutionID = NAMEKEY_INVALID;
 static GameWindow *   sliderTextureResolution = NULL;
@@ -210,26 +208,13 @@ static GameWindow *   radioLow   = NULL;
 
 */
 
-//Added By Saad for the resolution confirmation dialog box
 DisplaySettings oldDispSettings, newDispSettings;
 Bool dispChanged = FALSE;
 extern Int timer;
 extern void DoResolutionDialog();
-//
-
 static Bool ignoreSelected = FALSE;
 WindowLayout *OptionsLayout = NULL;
 
-enum Detail CPP_11(: Int)
-{
-	HIGHDETAIL = 0,
-	MEDIUMDETAIL,
-	LOWDETAIL,
-	CUSTOMDETAIL,
-
-	DETAIL,
-};
-
 
 OptionPreferences::OptionPreferences( void )
 {
@@ -263,7 +248,7 @@ Int OptionPreferences::getCampaignDifficulty(void)
 		factor = DIFFICULTY_EASY;
 	if (factor > DIFFICULTY_HARD)
 		factor = DIFFICULTY_HARD;
-	
+
 	return factor;
 }
 
@@ -330,6 +315,18 @@ void OptionPreferences::setOnlineIPAddress( UnsignedInt IP )
 	(*this)["GameSpyIPAddress"] = tmp;
 }
 
+Bool OptionPreferences::getArchiveReplaysEnabled() const
+{
+	OptionPreferences::const_iterator it = find("ArchiveReplays");
+	if (it == end())
+		return FALSE;
+
+	if (stricmp(it->second.str(), "yes") == 0) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
 Bool OptionPreferences::getAlternateMouseModeEnabled(void)
 {
 	OptionPreferences::const_iterator it = find("UseAlternateMouse");
@@ -373,14 +370,132 @@ Real OptionPreferences::getScrollFactor(void)
 		return TheGlobalData->m_keyboardDefaultScrollFactor;
 
 	Int factor = atoi(it->second.str());
-	if (factor < 0)
-		factor = 0;
-	if (factor > 100)
-		factor = 100;
-	
+
+	// TheSuperHackers @tweak xezon 11/07/2025
+	// No longer caps the upper limit to 100, because the options setting can go beyond that.
+	// No longer caps the lower limit to 0, because that would mean standstill.
+	if (factor < 1)
+		factor = 1;
+
 	return factor/100.0f;
 }
 
+Bool OptionPreferences::getDrawScrollAnchor(void)
+{
+	OptionPreferences::const_iterator it = find("DrawScrollAnchor");
+	// TheSuperHackers @info this default is based on the same variable within InGameUi.ini
+	if (it == end())
+		return FALSE;
+
+	if (stricmp(it->second.str(), "yes") == 0) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool OptionPreferences::getMoveScrollAnchor(void)
+{
+	OptionPreferences::const_iterator it = find("MoveScrollAnchor");
+	// TheSuperHackers @info this default is based on the same variable within InGameUi.ini
+	if (it == end())
+		return TRUE;
+
+	if (stricmp(it->second.str(), "yes") == 0) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+Bool OptionPreferences::getCursorCaptureEnabledInWindowedGame() const
+{
+	OptionPreferences::const_iterator it = find("CursorCaptureEnabledInWindowedGame");
+	if (it == end())
+		return (CursorCaptureMode_Default & CursorCaptureMode_EnabledInWindowedGame) != 0;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+Bool OptionPreferences::getCursorCaptureEnabledInWindowedMenu() const
+{
+	OptionPreferences::const_iterator it = find("CursorCaptureEnabledInWindowedMenu");
+	if (it == end())
+		return (CursorCaptureMode_Default & CursorCaptureMode_EnabledInWindowedMenu) != 0;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+Bool OptionPreferences::getCursorCaptureEnabledInFullscreenGame() const
+{
+	OptionPreferences::const_iterator it = find("CursorCaptureEnabledInFullscreenGame");
+	if (it == end())
+		return (CursorCaptureMode_Default & CursorCaptureMode_EnabledInFullscreenGame) != 0;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+Bool OptionPreferences::getCursorCaptureEnabledInFullscreenMenu() const
+{
+	OptionPreferences::const_iterator it = find("CursorCaptureEnabledInFullscreenMenu");
+	if (it == end())
+		return (CursorCaptureMode_Default & CursorCaptureMode_EnabledInFullscreenMenu) != 0;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+CursorCaptureMode OptionPreferences::getCursorCaptureMode() const
+{
+	CursorCaptureMode mode = 0;
+	mode |= getCursorCaptureEnabledInWindowedGame() ? CursorCaptureMode_EnabledInWindowedGame : 0;
+	mode |= getCursorCaptureEnabledInWindowedMenu() ? CursorCaptureMode_EnabledInWindowedMenu : 0;
+	mode |= getCursorCaptureEnabledInFullscreenGame() ? CursorCaptureMode_EnabledInFullscreenGame : 0;
+	mode |= getCursorCaptureEnabledInFullscreenMenu() ? CursorCaptureMode_EnabledInFullscreenMenu : 0;
+	return mode;
+}
+
+Bool OptionPreferences::getScreenEdgeScrollEnabledInWindowedApp() const
+{
+	OptionPreferences::const_iterator it = find("ScreenEdgeScrollEnabledInWindowedApp");
+	if (it == end())
+		return (ScreenEdgeScrollMode_Default & ScreenEdgeScrollMode_EnabledInWindowedApp) != 0;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+Bool OptionPreferences::getScreenEdgeScrollEnabledInFullscreenApp() const
+{
+	OptionPreferences::const_iterator it = find("ScreenEdgeScrollEnabledInFullscreenApp");
+	if (it == end())
+		return (ScreenEdgeScrollMode_Default & ScreenEdgeScrollMode_EnabledInFullscreenApp) != 0;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+ScreenEdgeScrollMode OptionPreferences::getScreenEdgeScrollMode() const
+{
+	ScreenEdgeScrollMode mode = 0;
+	mode |= getScreenEdgeScrollEnabledInWindowedApp() ? ScreenEdgeScrollMode_EnabledInWindowedApp : 0;
+	mode |= getScreenEdgeScrollEnabledInFullscreenApp() ? ScreenEdgeScrollMode_EnabledInFullscreenApp : 0;
+	return mode;
+}
+
 Bool OptionPreferences::usesSystemMapDir(void)
 {
 	OptionPreferences::const_iterator it = find("UseSystemMapDir");
@@ -417,6 +532,18 @@ Bool OptionPreferences::useCameraInReplays(void)
 	return FALSE;
 }
 
+Bool OptionPreferences::getPlayerObserverEnabled() const
+{
+	OptionPreferences::const_iterator it = find("PlayerObserverEnabled");
+	if (it == end())
+		return TRUE;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
 Int OptionPreferences::getIdealStaticGameDetail(void)
 {
 	OptionPreferences::const_iterator it = find("IdealStaticGameLOD");
@@ -736,7 +863,7 @@ Real OptionPreferences::getGammaValue(void)
 	OptionPreferences::const_iterator it = find("Gamma");
  	if (it == end())
  		return 50.0f;
- 
+
  	Real gamma = (Real) atoi(it->second.str());
  	return gamma;
 }
@@ -772,10 +899,108 @@ Real OptionPreferences::getMusicVolume(void)
 	return volume;
 }
 
+Real OptionPreferences::getMoneyTransactionVolume(void) const
+{
+	OptionPreferences::const_iterator it = find("MoneyTransactionVolume");
+	if (it == end())
+		return TheAudio->getAudioSettings()->m_defaultMoneyTransactionVolume * 100.0f;
+
+	Real volume = (Real) atof(it->second.str());
+	if (volume < 0.0f)
+		volume = 0.0f;
+
+	return volume;
+}
+
+Int OptionPreferences::getNetworkLatencyFontSize(void)
+{
+	OptionPreferences::const_iterator it = find("NetworkLatencyFontSize");
+	if (it == end())
+		return 8;
+
+	Int fontSize = atoi(it->second.str());
+	if (fontSize < 0)
+	{
+		fontSize = 0;
+	}
+	return fontSize;
+}
+
+Int OptionPreferences::getRenderFpsFontSize(void)
+{
+	OptionPreferences::const_iterator it = find("RenderFpsFontSize");
+	if (it == end())
+		return 8;
+
+	Int fontSize = atoi(it->second.str());
+	if (fontSize < 0)
+	{
+		fontSize = 0;
+	}
+	return fontSize;
+}
+
+Int OptionPreferences::getSystemTimeFontSize(void)
+{
+	OptionPreferences::const_iterator it = find("SystemTimeFontSize");
+	if (it == end())
+		return 8;
+
+	Int fontSize = atoi(it->second.str());
+	if (fontSize < 0)
+	{
+		fontSize = 0;
+	}
+	return fontSize;
+}
+
+Int OptionPreferences::getGameTimeFontSize(void)
+{
+	OptionPreferences::const_iterator it = find("GameTimeFontSize");
+	if (it == end())
+		return 8;
+
+	Int fontSize = atoi(it->second.str());
+	if (fontSize < 0)
+	{
+		fontSize = 0;
+	}
+	return fontSize;
+}
+
+Real OptionPreferences::getResolutionFontAdjustment(void)
+{
+	OptionPreferences::const_iterator it = find("ResolutionFontAdjustment");
+	if (it == end())
+		return -1.0f;
+
+	Real fontScale = (Real)atof(it->second.str()) / 100.0f;
+	if (fontScale < 0.0f)
+	{
+		fontScale = -1.0f;
+	}
+	return fontScale;
+}
+
+Bool OptionPreferences::getShowMoneyPerMinute(void) const
+{
+	OptionPreferences::const_iterator it = find("ShowMoneyPerMinute");
+	if (it == end())
+		return TheGlobalData->m_showMoneyPerMinute;
+
+	if (stricmp(it->second.str(), "yes") == 0)
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
 static OptionPreferences *pref = NULL;
 
 static void setDefaults( void )
 {
+	constexpr const Bool ModifyDisplaySettings = FALSE;
+
 	//-------------------------------------------------------------------------------------------------
 	// provider type
 //	GadgetCheckBoxSetChecked(checkAudioHardware, FALSE);
@@ -791,30 +1016,16 @@ static void setDefaults( void )
 	//-------------------------------------------------------------------------------------------------
 	// send Delay
 	GadgetCheckBoxSetChecked(checkSendDelay, FALSE);
-	
+
+	if constexpr (ModifyDisplaySettings)
+	{
 	//-------------------------------------------------------------------------------------------------
 	// LOD
-	if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE)) {
-		StaticGameLODLevel level=TheGameLODManager->findStaticLODLevel();
-		switch (level)
-		{
-		case STATIC_GAME_LOD_LOW:
-			GadgetComboBoxSetSelectedPos(comboBoxDetail, LOWDETAIL);
-			break;
-		case STATIC_GAME_LOD_MEDIUM:
-			GadgetComboBoxSetSelectedPos(comboBoxDetail, MEDIUMDETAIL);
-			break;
-		case STATIC_GAME_LOD_HIGH:
-			GadgetComboBoxSetSelectedPos(comboBoxDetail, HIGHDETAIL);
-			break;
-		case STATIC_GAME_LOD_CUSTOM:
-			GadgetComboBoxSetSelectedPos(comboBoxDetail, CUSTOMDETAIL);
-			break;
-		default:
-			DEBUG_ASSERTCRASH(FALSE,("Tried to set comboBoxDetail to a value of %d ", TheGameLODManager->getStaticLODLevel()) );
-		};
+	if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE))
+	{
+		GadgetComboBoxSetSelectedPos(comboBoxDetail, (Int)TheGameLODManager->getRecommendedStaticLODLevel());
 	}
-	
+
 	//-------------------------------------------------------------------------------------------------
 	// Resolution
 	//Find index of 800x600 mode.
@@ -824,14 +1035,14 @@ static void setDefaults( void )
 		for( Int i = 0; i < numResolutions; ++i )
 		{	Int xres,yres,bitDepth;
 			TheDisplay->getDisplayModeDescription(i,&xres,&yres,&bitDepth);
-			if (xres == 800 && yres == 600)	//keep track of default mode in case we need it.
+			if (xres == DEFAULT_DISPLAY_WIDTH && yres == DEFAULT_DISPLAY_HEIGHT)	//keep track of default mode in case we need it.
 			{	defaultResIndex=i;
 				break;
 			}
 		}
 		GadgetComboBoxSetSelectedPos( comboBoxResolution, defaultResIndex );	//should be 800x600 (our lowest supported mode)
 	}
-
+	}
 
 	//-------------------------------------------------------------------------------------------------
 	// Mouse Mode
@@ -841,13 +1052,12 @@ static void setDefaults( void )
 
 	//-------------------------------------------------------------------------------------------------
 //	// scroll speed val
-	Int valMin, valMax;
-//	GadgetSliderGetMinMax(sliderScrollSpeed,&valMin, &valMax);
-//	GadgetSliderSetPosition(sliderScrollSpeed, ((valMax - valMin) / 2 + valMin));
 	Int scrollPos = (Int)(TheGlobalData->m_keyboardDefaultScrollFactor*100.0f);
 	GadgetSliderSetPosition( sliderScrollSpeed, scrollPos );
 
 
+	Int valMin, valMax;
+
 	//-------------------------------------------------------------------------------------------------
 	// slider music volume
 	GadgetSliderGetMinMax(sliderMusicVolume,&valMin, &valMax);
@@ -869,12 +1079,13 @@ static void setDefaults( void )
  	GadgetSliderGetMinMax(sliderGamma,&valMin, &valMax);
  	GadgetSliderSetPosition(sliderGamma, ((valMax - valMin) / 2 + valMin));
 
-	//-------------------------------------------------------------------------------------------------
- 	// Texture resolution slider
-	//
-
+	if constexpr (ModifyDisplaySettings)
+	{
 	if ((TheGameLogic->isInGame() == FALSE) || (TheGameLogic->isInShellGame() == TRUE))
-	{	
+	{
+		//-------------------------------------------------------------------------------------------------
+		// Texture resolution slider
+		//
 		Int	txtFact=TheGameLODManager->getRecommendedTextureReduction();
 
 		GadgetSliderSetPosition( sliderTextureResolution, 2-txtFact);
@@ -939,6 +1150,7 @@ static void setDefaults( void )
 		//
 		GadgetCheckBoxSetChecked( checkProps, TheGlobalData->m_useTrees);
 	}
+	}
 }
 
 static void saveOptions( void )
@@ -971,72 +1183,71 @@ static void saveOptions( void )
 			TheWritableGlobalData->m_languageFilterPref = false;
 			(*pref)["LanguageFilter"] = "false";
 	}
-	
+
 	//-------------------------------------------------------------------------------------------------
 	// send Delay
-	TheWritableGlobalData->m_firewallSendDelay = GadgetCheckBoxIsChecked(checkSendDelay);
-	if (TheGlobalData->m_firewallSendDelay) {
-		(*pref)["SendDelay"] = AsciiString("yes");
-	} else {
-		(*pref)["SendDelay"] = AsciiString("no");
+	if (checkSendDelay && checkSendDelay->winGetEnabled())
+	{
+		TheWritableGlobalData->m_firewallSendDelay = GadgetCheckBoxIsChecked(checkSendDelay);
+		if (TheGlobalData->m_firewallSendDelay) {
+			(*pref)["SendDelay"] = "yes";
+		} else {
+			(*pref)["SendDelay"] = "no";
+		}
 	}
 
 	//-------------------------------------------------------------------------------------------------
 	// Custom game detail settings.
 	GadgetComboBoxGetSelectedPos( comboBoxDetail, &index );
-	if (index == CUSTOMDETAIL)
+	if (index == STATIC_GAME_LOD_CUSTOM)
 	{
  		//-------------------------------------------------------------------------------------------------
  		// Texture resolution slider
 		{
-				AsciiString prefString;
-
-		 		val = GadgetSliderGetPosition(sliderTextureResolution);
-				val = 2-val;
+		 		val = 2 - GadgetSliderGetPosition(sliderTextureResolution);
 
+				AsciiString prefString;
 				prefString.format("%d",val);
 				(*pref)["TextureReduction"] = prefString;
 
-				if (TheGlobalData->m_textureReductionFactor != val)
-				{
-					TheGameClient->adjustLOD(val-TheGlobalData->m_textureReductionFactor);	//apply the new setting
-				}
+				TheWritableGlobalData->m_textureReductionFactor = val;
+				TheGameClient->setTextureLOD(val);
 		}
 
 		TheWritableGlobalData->m_useShadowVolumes = GadgetCheckBoxIsChecked( check3DShadows );
-		(*pref)["UseShadowVolumes"] = TheWritableGlobalData->m_useShadowVolumes ? AsciiString("yes") : AsciiString("no");
+		(*pref)["UseShadowVolumes"] = TheWritableGlobalData->m_useShadowVolumes ? "yes" : "no";
 
 		TheWritableGlobalData->m_useShadowDecals = GadgetCheckBoxIsChecked( check2DShadows );
-		(*pref)["UseShadowDecals"] = TheWritableGlobalData->m_useShadowDecals ? AsciiString("yes") : AsciiString("no");
+		(*pref)["UseShadowDecals"] = TheWritableGlobalData->m_useShadowDecals ? "yes" : "no";
 
 		TheWritableGlobalData->m_useCloudMap = GadgetCheckBoxIsChecked( checkCloudShadows );
-		(*pref)["UseCloudMap"] = TheGlobalData->m_useCloudMap ? AsciiString("yes") : AsciiString("no");
+		(*pref)["UseCloudMap"] = TheGlobalData->m_useCloudMap ? "yes" : "no";
 
 		TheWritableGlobalData->m_useLightMap = GadgetCheckBoxIsChecked( checkGroundLighting );
-		(*pref)["UseLightMap"] = TheGlobalData->m_useLightMap ? AsciiString("yes") : AsciiString("no");
+		(*pref)["UseLightMap"] = TheGlobalData->m_useLightMap ? "yes" : "no";
 
 		TheWritableGlobalData->m_showSoftWaterEdge = GadgetCheckBoxIsChecked( checkSmoothWater );
-		(*pref)["ShowSoftWaterEdge"] = TheGlobalData->m_showSoftWaterEdge ? AsciiString("yes") : AsciiString("no");
+		(*pref)["ShowSoftWaterEdge"] = TheGlobalData->m_showSoftWaterEdge ? "yes" : "no";
 
 		TheWritableGlobalData->m_useDrawModuleLOD = !GadgetCheckBoxIsChecked( checkExtraAnimations );
 		TheWritableGlobalData->m_useTreeSway = !TheWritableGlobalData->m_useDrawModuleLOD;	//borrow same setting.
-		(*pref)["ExtraAnimations"] = TheGlobalData->m_useDrawModuleLOD ? AsciiString("no") : AsciiString("yes");
+		(*pref)["ExtraAnimations"] = TheGlobalData->m_useDrawModuleLOD ? "no" : "yes";
 
 		TheWritableGlobalData->m_enableDynamicLOD = !GadgetCheckBoxIsChecked( checkNoDynamicLod );
-		(*pref)["DynamicLOD"] = TheGlobalData->m_enableDynamicLOD ? AsciiString("yes") : AsciiString("no");
+		(*pref)["DynamicLOD"] = TheGlobalData->m_enableDynamicLOD ? "yes" : "no";
 
 		TheWritableGlobalData->m_useHeatEffects = GadgetCheckBoxIsChecked( checkHeatEffects );
-		(*pref)["HeatEffects"] = TheGlobalData->m_useHeatEffects ? AsciiString("yes") : AsciiString("no");
+		(*pref)["HeatEffects"] = TheGlobalData->m_useHeatEffects ? "yes" : "no";
 
 		// Never write this out
 		//TheWritableGlobalData->m_useFpsLimit = !GadgetCheckBoxIsChecked( checkUnlockFps );
-		//(*pref)["FPSLimit"] = TheGlobalData->m_useFpsLimit ? AsciiString("yes") : AsciiString("no");
+		//(*pref)["FPSLimit"] = TheGlobalData->m_useFpsLimit ? "yes" : "no";
 
 		TheWritableGlobalData->m_enableBehindBuildingMarkers = GadgetCheckBoxIsChecked( checkBuildingOcclusion );
-		(*pref)["BuildingOcclusion"] = TheWritableGlobalData->m_enableBehindBuildingMarkers ? AsciiString("yes") : AsciiString("no");
+		(*pref)["BuildingOcclusion"] = TheWritableGlobalData->m_enableBehindBuildingMarkers ? "yes" : "no";
 
 		TheWritableGlobalData->m_useTrees = GadgetCheckBoxIsChecked( checkProps);
-		(*pref)["ShowTrees"] = TheWritableGlobalData->m_useTrees ? AsciiString("yes") : AsciiString("no");
+		(*pref)["ShowTrees"] = TheWritableGlobalData->m_useTrees ? "yes" : "no";
 
  		//-------------------------------------------------------------------------------------------------
 		// Particle Cap slider
@@ -1054,102 +1265,44 @@ static void saveOptions( void )
 
 	//-------------------------------------------------------------------------------------------------
 	// LOD
-	Bool levelChanged=FALSE;
-	GadgetComboBoxGetSelectedPos( comboBoxDetail, &index );
-	//The levels stored by the LOD Manager are inverted compared to GUI so find correct one:
-	switch (index) {
-	case HIGHDETAIL:
-		levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_HIGH);
-		break;
-	case MEDIUMDETAIL:
-		levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_MEDIUM);
-		break;
-	case LOWDETAIL:
-		levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_LOW);
-		break;
-	case CUSTOMDETAIL:
-		levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_CUSTOM);
-		break;
-	default:
-		DEBUG_ASSERTCRASH(FALSE,("LOD passed in was %d, %d is not a supported LOD",index,index));
-		break;
-	}
-
-	if (levelChanged)
-	        (*pref)["StaticGameLOD"] = TheGameLODManager->getStaticGameLODLevelName(TheGameLODManager->getStaticLODLevel());
-
-	//-------------------------------------------------------------------------------------------------
-	// Resolution
-	GadgetComboBoxGetSelectedPos( comboBoxResolution, &index );
-	Int xres, yres, bitDepth;
-	
-	oldDispSettings.xRes = TheDisplay->getWidth();
-	oldDispSettings.yRes = TheDisplay->getHeight();
-	oldDispSettings.bitDepth = TheDisplay->getBitDepth();
-	oldDispSettings.windowed = TheDisplay->getWindowed();
-	
-	if (index < TheDisplay->getDisplayModeCount() && index >= 0)
+	if (comboBoxDetail && comboBoxDetail->winGetEnabled())
 	{
-		TheDisplay->getDisplayModeDescription(index,&xres,&yres,&bitDepth);
-		if (TheGlobalData->m_xResolution != xres || TheGlobalData->m_yResolution != yres)
-		{
-			
-			if (TheDisplay->setDisplayMode(xres,yres,bitDepth,TheDisplay->getWindowed()))
-			{
-				dispChanged = TRUE;
-				TheWritableGlobalData->m_xResolution = xres;
-				TheWritableGlobalData->m_yResolution = yres;
-
-				TheHeaderTemplateManager->headerNotifyResolutionChange();
-				TheMouse->mouseNotifyResolutionChange();
-				
-				//Save new settings for a dialog box confirmation after options are accepted
-				newDispSettings.xRes = xres;
-				newDispSettings.yRes = yres;
-				newDispSettings.bitDepth = bitDepth;
-				newDispSettings.windowed = TheDisplay->getWindowed();
-
-				AsciiString prefString;
-				prefString.format("%d %d", xres, yres );
-				(*pref)["Resolution"] = prefString;
-
-				// delete the shell
-				delete TheShell;
-				TheShell = NULL;
-
-				// create the shell
-				TheShell = MSGNEW("GameClientSubsystem") Shell;
-				if( TheShell )
-					TheShell->init();
-				
-				TheInGameUI->recreateControlBar();
+		GadgetComboBoxGetSelectedPos( comboBoxDetail, &index );
+		const Bool levelChanged = TheGameLODManager->setStaticLODLevel((StaticGameLODLevel)index);
 
-				TheShell->push( AsciiString("Menus/MainMenu.wnd") );
-			}
-		}
+		if (levelChanged)
+			(*pref)["StaticGameLOD"] = TheGameLODManager->getStaticGameLODLevelName(TheGameLODManager->getStaticLODLevel());
 	}
 
 	//-------------------------------------------------------------------------------------------------
 	// IP address
-	UnsignedInt ip;
-	GadgetComboBoxGetSelectedPos(comboBoxLANIP, &index);
-	if (index>=0 && TheGlobalData)
+	if (comboBoxLANIP && comboBoxLANIP->winGetEnabled())
 	{
-		ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxLANIP, index);
-		TheWritableGlobalData->m_defaultIP = ip;
-		pref->setLANIPAddress(ip);
+		UnsignedInt ip;
+		GadgetComboBoxGetSelectedPos(comboBoxLANIP, &index);
+		if (index>=0 && TheGlobalData)
+		{
+			ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxLANIP, index);
+			TheWritableGlobalData->m_defaultIP = ip;
+			pref->setLANIPAddress(ip);
+		}
 	}
-	GadgetComboBoxGetSelectedPos(comboBoxOnlineIP, &index);
-	if (index>=0)
+
+	if (comboBoxOnlineIP && comboBoxOnlineIP->winGetEnabled())
 	{
-		ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxOnlineIP, index);
-		pref->setOnlineIPAddress(ip);
+		UnsignedInt ip;
+		GadgetComboBoxGetSelectedPos(comboBoxOnlineIP, &index);
+		if (index>=0)
+		{
+			ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxOnlineIP, index);
+			pref->setOnlineIPAddress(ip);
+		}
 	}
 
 	//-------------------------------------------------------------------------------------------------
 	// HTTP Proxy
 	GameWindow *textEntryHTTPProxy = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("OptionsMenu.wnd:TextEntryHTTPProxy"));
-	if (textEntryHTTPProxy)
+	if (textEntryHTTPProxy && textEntryHTTPProxy->winGetEnabled())
 	{
 		UnicodeString uStr = GadgetTextEntryGetText(textEntryHTTPProxy);
 		AsciiString aStr;
@@ -1161,7 +1314,7 @@ static void saveOptions( void )
 	//-------------------------------------------------------------------------------------------------
 	// Firewall Port Override
 	GameWindow *textEntryFirewallPortOverride = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("OptionsMenu.wnd:TextEntryFirewallPortOverride"));
-	if (textEntryFirewallPortOverride)
+	if (textEntryFirewallPortOverride && textEntryFirewallPortOverride->winGetEnabled())
 	{
 		UnicodeString uStr = GadgetTextEntryGetText(textEntryFirewallPortOverride);
 		AsciiString aStr;
@@ -1191,44 +1344,93 @@ static void saveOptions( void )
 	//-------------------------------------------------------------------------------------------------
 	// mouse mode
 	TheWritableGlobalData->m_useAlternateMouse = GadgetCheckBoxIsChecked(checkAlternateMouse);
-	(*pref)["UseAlternateMouse"] = TheWritableGlobalData->m_useAlternateMouse ? AsciiString("yes") : AsciiString("no");
+	(*pref)["UseAlternateMouse"] = TheWritableGlobalData->m_useAlternateMouse ? "yes" : "no";
 
 	TheWritableGlobalData->m_clientRetaliationModeEnabled = GadgetCheckBoxIsChecked(checkRetaliation);
-	(*pref)["Retaliation"] = TheWritableGlobalData->m_clientRetaliationModeEnabled? AsciiString("yes") : AsciiString("no");
+	(*pref)["Retaliation"] = TheWritableGlobalData->m_clientRetaliationModeEnabled? "yes" : "no";
 
 	TheWritableGlobalData->m_doubleClickAttackMove = GadgetCheckBoxIsChecked( checkDoubleClickAttackMove );
-	(*pref)["UseDoubleClickAttackMove"] = TheWritableGlobalData->m_doubleClickAttackMove ? AsciiString("yes") : AsciiString("no");
+	(*pref)["UseDoubleClickAttackMove"] = TheWritableGlobalData->m_doubleClickAttackMove ? "yes" : "no";
+
+	// TheSuperHackers @todo Add combo box ?
+	{
+		CursorCaptureMode mode = pref->getCursorCaptureMode();
+		(*pref)["CursorCaptureEnabledInWindowedGame"] = (mode & CursorCaptureMode_EnabledInWindowedGame) ? "yes" : "no";
+		(*pref)["CursorCaptureEnabledInWindowedMenu"] = (mode & CursorCaptureMode_EnabledInWindowedMenu) ? "yes" : "no";
+		(*pref)["CursorCaptureEnabledInFullscreenGame"] = (mode & CursorCaptureMode_EnabledInFullscreenGame) ? "yes" : "no";
+		(*pref)["CursorCaptureEnabledInFullscreenMenu"] = (mode & CursorCaptureMode_EnabledInFullscreenMenu) ? "yes" : "no";
+		TheMouse->setCursorCaptureMode(mode);
+	}
+
+	// TheSuperHackers @todo Add combo box ?
+	{
+		ScreenEdgeScrollMode mode = pref->getScreenEdgeScrollMode();
+		(*pref)["ScreenEdgeScrollEnabledInWindowedApp"] = (mode & ScreenEdgeScrollMode_EnabledInWindowedApp) ? "yes" : "no";
+		(*pref)["ScreenEdgeScrollEnabledInFullscreenApp"] = (mode & ScreenEdgeScrollMode_EnabledInFullscreenApp) ? "yes" : "no";
+		TheLookAtTranslator->setScreenEdgeScrollMode(mode);
+	}
+
+	// TheSuperHackers @todo Add checkbox ?
+	{
+		Bool enabled = pref->getPlayerObserverEnabled();
+		(*pref)["PlayerObserverEnabled"] = enabled ? "yes" : "no";
+		TheWritableGlobalData->m_enablePlayerObserver = enabled;
+	}
+
+	// TheSuperHackers @todo Add checkbox ?
+	{
+		Bool enabled = pref->getArchiveReplaysEnabled();
+		(*pref)["ArchiveReplays"] = enabled ? "yes" : "no";
+		TheRecorder->setArchiveEnabled(enabled);
+	}
 
 	//-------------------------------------------------------------------------------------------------
 	// scroll speed val
 	val = GadgetSliderGetPosition(sliderScrollSpeed);
-	if(val != -1)
+	if(val > 0)
 	{
 		TheWritableGlobalData->m_keyboardScrollFactor = val/100.0f;
-		DEBUG_LOG(("Scroll Spped val %d, keyboard scroll factor %f\n", val, TheGlobalData->m_keyboardScrollFactor));
+		DEBUG_LOG(("Scroll Spped val %d, keyboard scroll factor %f", val, TheGlobalData->m_keyboardScrollFactor));
 		AsciiString prefString;
 		prefString.format("%d", val);
 		(*pref)["ScrollFactor"] = prefString;
 	}
-	
+
+	//-------------------------------------------------------------------------------------------------
+	// draw scroll anchor
+	{
+		if( TheInGameUI->getDrawRMBScrollAnchor() )
+				(*pref)["DrawScrollAnchor"] = "yes";
+		else
+				(*pref)["DrawScrollAnchor"] = "no";
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// move scroll anchor
+	{
+		if( TheInGameUI->getMoveRMBScrollAnchor() )
+				(*pref)["MoveScrollAnchor"] = "yes";
+		else
+				(*pref)["MoveScrollAnchor"] = "no";
+	}
+
 	//-------------------------------------------------------------------------------------------------
 	// slider music volume
 	val = GadgetSliderGetPosition(sliderMusicVolume);
 	if(val != -1)
 	{
-	  TheWritableGlobalData->m_musicVolumeFactor = val;
     AsciiString prefString;
     prefString.format("%d", val);
     (*pref)["MusicVolume"] = prefString;
     TheAudio->setVolume(val / 100.0f, (AudioAffect) (AudioAffect_Music | AudioAffect_SystemSetting));
 	}
-	
+
 	//-------------------------------------------------------------------------------------------------
 	// slider SFX volume
 	val = GadgetSliderGetPosition(sliderSFXVolume);
 	if(val != -1)
 	{
-		//Both 2D and 3D sound effects are sharing the same slider. However, there is a 
+		//Both 2D and 3D sound effects are sharing the same slider. However, there is a
 		//relative slider that gets applied to one of these values to lower that sound volume.
 		Real sound2DVolume = val / 100.0f;
 		Real sound3DVolume = val / 100.0f;
@@ -1250,7 +1452,6 @@ static void saveOptions( void )
 		TheAudio->setVolume( sound3DVolume, (AudioAffect) (AudioAffect_Sound3D | AudioAffect_SystemSetting) );
 
 		//Save the settings in the options.ini.
-    TheWritableGlobalData->m_SFXVolumeFactor = val;
     AsciiString prefString;
     prefString.format("%d", REAL_TO_INT( sound2DVolume * 100.0f ) );
     (*pref)["SFXVolume"] = prefString;
@@ -1263,13 +1464,23 @@ static void saveOptions( void )
 	val = GadgetSliderGetPosition(sliderVoiceVolume);
 	if(val != -1)
 	{
-    TheWritableGlobalData->m_voiceVolumeFactor = val;
     AsciiString prefString;
     prefString.format("%d", val);
     (*pref)["VoiceVolume"] = prefString;
     TheAudio->setVolume(val / 100.0f, (AudioAffect) (AudioAffect_Speech | AudioAffect_SystemSetting));
 	}
 
+	//-------------------------------------------------------------------------------------------------
+	// Money tick volume
+	// TheSuperHackers @todo Add options slider ?
+	{
+		val = pref->getMoneyTransactionVolume();
+		AsciiString prefString;
+		prefString.format("%d", val);
+		(*pref)["MoneyTransactionVolume"] = prefString;
+		TheAudio->friend_getAudioSettings()->m_preferredMoneyTransactionVolume = val / 100.0f;
+	}
+
  	//-------------------------------------------------------------------------------------------------
  	// slider Gamma
  	val = GadgetSliderGetPosition(sliderGamma);
@@ -1298,6 +1509,119 @@ static void saveOptions( void )
 		}
  	}
 
+	//-------------------------------------------------------------------------------------------------
+	// Set Network Latency Font Size
+	val = pref->getNetworkLatencyFontSize();
+	if (val >= 0)
+	{
+		AsciiString prefString;
+		prefString.format("%d", val);
+		(*pref)["NetworkLatencyFontSize"] = prefString;
+		TheInGameUI->refreshNetworkLatencyResources();
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// Set Render FPS Font Size
+	val = pref->getRenderFpsFontSize();
+	if (val >= 0)
+	{
+		AsciiString prefString;
+		prefString.format("%d", val);
+		(*pref)["RenderFpsFontSize"] = prefString;
+		TheInGameUI->refreshRenderFpsResources();
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// Set System Time Font Size
+	val = pref->getSystemTimeFontSize(); // TheSuperHackers @todo replace with options input when applicable
+	if (val >= 0)
+	{
+		AsciiString prefString;
+		prefString.format("%d", val);
+		(*pref)["SystemTimeFontSize"] = prefString;
+		TheInGameUI->refreshSystemTimeResources();
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// Set Game Time Font Size
+	val = pref->getGameTimeFontSize(); // TheSuperHackers @todo replace with options input when applicable
+	if (val >= 0)
+	{
+		AsciiString prefString;
+		prefString.format("%d", val);
+		(*pref)["GameTimeFontSize"] = prefString;
+		TheInGameUI->refreshGameTimeResources();
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// Set User Font Scaling Percentage
+	val = pref->getResolutionFontAdjustment() * 100.0f; // TheSuperHackers @todo replace with options input when applicable
+	if (val >= 0 || val == -100)
+	{
+		AsciiString prefString;
+		prefString.format("%d", REAL_TO_INT( val ) );
+		(*pref)["ResolutionFontAdjustment"] = prefString;
+		TheGlobalLanguageData->m_userResolutionFontSizeAdjustment = (Real)val / 100.0f;
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// Set Money Per Minute
+	{
+		Bool show = pref->getShowMoneyPerMinute();
+		AsciiString prefString;
+		prefString = show ? "yes" : "no";
+		(*pref)["ShowMoneyPerMinute"] = prefString;
+		TheWritableGlobalData->m_showMoneyPerMinute = show;
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// Resolution
+	//
+	// TheSuperHackers @bugfix xezon 12/06/2025 Now performs the resolution change at the very end of
+	// processing all the options. This is necessary, because recreating the Shell will destroy the
+	// Options Menu and therefore prevent any further ui gadget interactions afterwards.
+
+	GadgetComboBoxGetSelectedPos( comboBoxResolution, &index );
+	Int xres, yres, bitDepth;
+
+	oldDispSettings.xRes = TheDisplay->getWidth();
+	oldDispSettings.yRes = TheDisplay->getHeight();
+	oldDispSettings.bitDepth = TheDisplay->getBitDepth();
+	oldDispSettings.windowed = TheDisplay->getWindowed();
+
+	if (comboBoxResolution && comboBoxResolution->winGetEnabled() && index < TheDisplay->getDisplayModeCount() && index >= 0)
+	{
+		TheDisplay->getDisplayModeDescription(index,&xres,&yres,&bitDepth);
+		if (TheGlobalData->m_xResolution != xres || TheGlobalData->m_yResolution != yres)
+		{
+			if (TheDisplay->setDisplayMode(xres,yres,bitDepth,TheDisplay->getWindowed()))
+			{
+				dispChanged = TRUE;
+				TheWritableGlobalData->m_xResolution = xres;
+				TheWritableGlobalData->m_yResolution = yres;
+
+				TheHeaderTemplateManager->onResolutionChanged();
+				TheMouse->onResolutionChanged();
+
+				//Save new settings for a dialog box confirmation after options are accepted
+				newDispSettings.xRes = xres;
+				newDispSettings.yRes = yres;
+				newDispSettings.bitDepth = bitDepth;
+				newDispSettings.windowed = TheDisplay->getWindowed();
+
+				AsciiString prefString;
+				prefString.format("%d %d", xres, yres );
+				(*pref)["Resolution"] = prefString;
+
+				TheShell->recreateWindowLayouts();
+
+				TheInGameUI->recreateControlBar();
+				TheInGameUI->refreshCustomUiResources();
+			}
+		}
+	}
+
+	// MUST NEVER ADD ANOTHER OPTION HERE AT THE END !
 }
 
 static void DestroyOptionsLayout() {
@@ -1321,26 +1645,31 @@ static void acceptAdvancedOptions()
 static void cancelAdvancedOptions()
 {
 	//restore the detail selection back to initial state
-	switch (TheGameLODManager->getStaticLODLevel())
-	{
-	case STATIC_GAME_LOD_LOW:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, LOWDETAIL);
-		break;
-	case STATIC_GAME_LOD_MEDIUM:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, MEDIUMDETAIL);
-		break;
-	case STATIC_GAME_LOD_HIGH:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, HIGHDETAIL);
-		break;
-	case STATIC_GAME_LOD_CUSTOM:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, CUSTOMDETAIL);
-		break;
-	default:
-		DEBUG_ASSERTCRASH(FALSE,("Tried to set comboBoxDetail to a value of %d ", TheGameLODManager->getStaticLODLevel()) );
-	};
+	GadgetComboBoxSetSelectedPos(comboBoxDetail, (Int)TheGameLODManager->getStaticLODLevel());
 
 	WinAdvancedDisplay->winHide(TRUE);
 }
+
+// TheSuperHackers @tweak Now prints additional version information in the version label.
+static void initLabelVersion()
+{
+	NameKeyType versionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:LabelVersion" );
+	GameWindow *labelVersion = TheWindowManager->winGetWindowFromId( NULL, versionID );
+
+	if (labelVersion)
+	{
+		if (TheVersion && TheGlobalData)
+		{
+			UnicodeString text = TheVersion->getUnicodeProductVersionHashString();
+			GadgetStaticTextSetText( labelVersion, text );
+		}
+		else
+		{
+			labelVersion->winHide( TRUE );
+		}
+	}
+}
+
 //-------------------------------------------------------------------------------------------------
 /** Initialize the options menu */
 //-------------------------------------------------------------------------------------------------
@@ -1357,107 +1686,107 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 
 	SignalUIInteraction(SHELL_SCRIPT_HOOK_OPTIONS_OPENED);
 
-	comboBoxLANIPID				 = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxIP" ) );
+	comboBoxLANIPID				 = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxIP" );
 	comboBoxLANIP					 = TheWindowManager->winGetWindowFromId( NULL,  comboBoxLANIPID);
-	comboBoxOnlineIPID		 = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxOnlineIP" ) );
+	comboBoxOnlineIPID		 = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxOnlineIP" );
 	comboBoxOnlineIP			 = TheWindowManager->winGetWindowFromId( NULL,  comboBoxOnlineIPID);
-	checkAlternateMouseID  = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckAlternateMouse" ) );
+	checkAlternateMouseID  = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckAlternateMouse" );
 	checkAlternateMouse	   = TheWindowManager->winGetWindowFromId( NULL, checkAlternateMouseID);
-	checkRetaliationID		 = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:Retaliation" ) );
+	checkRetaliationID		 = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:Retaliation" );
 	checkRetaliation	     = TheWindowManager->winGetWindowFromId( NULL, checkRetaliationID);
-	checkDoubleClickAttackMoveID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckDoubleClickAttackMove" ) );
+	checkDoubleClickAttackMoveID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckDoubleClickAttackMove" );
 	checkDoubleClickAttackMove   = TheWindowManager->winGetWindowFromId( NULL, checkDoubleClickAttackMoveID );
-	sliderScrollSpeedID	   = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderScrollSpeed" ) );
+	sliderScrollSpeedID	   = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderScrollSpeed" );
 	sliderScrollSpeed		   = TheWindowManager->winGetWindowFromId( NULL,  sliderScrollSpeedID);
-	comboBoxAntiAliasingID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxAntiAliasing" ) );
+	comboBoxAntiAliasingID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxAntiAliasing" );
 	comboBoxAntiAliasing   = TheWindowManager->winGetWindowFromId( NULL, comboBoxAntiAliasingID );
-	comboBoxResolutionID   = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxResolution" ) );
+	comboBoxResolutionID   = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxResolution" );
 	comboBoxResolution     = TheWindowManager->winGetWindowFromId( NULL, comboBoxResolutionID );
-	comboBoxDetailID			 = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxDetail" ) );
+	comboBoxDetailID			 = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxDetail" );
 	comboBoxDetail		   = TheWindowManager->winGetWindowFromId( NULL, comboBoxDetailID );
 
-	checkLanguageFilterID  = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckLanguageFilter" ) );
+	checkLanguageFilterID  = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckLanguageFilter" );
 	checkLanguageFilter    = TheWindowManager->winGetWindowFromId( NULL, checkLanguageFilterID );
-	checkSendDelayID       = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckSendDelay" ) );
+	checkSendDelayID       = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckSendDelay" );
 	checkSendDelay				 = TheWindowManager->winGetWindowFromId( NULL, checkSendDelayID);
-	buttonFirewallRefreshID	= TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonFirewallRefresh" ) );
+	buttonFirewallRefreshID	= TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonFirewallRefresh" );
 	buttonFirewallRefresh		= TheWindowManager->winGetWindowFromId( NULL, buttonFirewallRefreshID);
-	checkDrawAnchorID       = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxDrawAnchor" ) );
+	checkDrawAnchorID       = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxDrawAnchor" );
 	checkDrawAnchor				 = TheWindowManager->winGetWindowFromId( NULL, checkDrawAnchorID);
-	checkMoveAnchorID       = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxMoveAnchor" ) );
+	checkMoveAnchorID       = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxMoveAnchor" );
 	checkMoveAnchor				 = TheWindowManager->winGetWindowFromId( NULL, checkMoveAnchorID);
 
 	// Replay camera
-	checkSaveCameraID      = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxSaveCamera" ) );
+	checkSaveCameraID      = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxSaveCamera" );
 	checkSaveCamera        = TheWindowManager->winGetWindowFromId( NULL, checkSaveCameraID );
-	checkUseCameraID       = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxUseCamera" ) );
+	checkUseCameraID       = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxUseCamera" );
 	checkUseCamera         = TheWindowManager->winGetWindowFromId( NULL, checkUseCameraID );
 
 //	// Speakers and 3-D Audio
-//	checkAudioSurroundID   = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckAudioSurround" ) );
+//	checkAudioSurroundID   = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckAudioSurround" );
 //	checkAudioSurround     = TheWindowManager->winGetWindowFromId( NULL, checkAudioSurroundID );
-//	checkAudioHardwareID   = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckAudioHardware" ) );
+//	checkAudioHardwareID   = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckAudioHardware" );
 //	checkAudioHardware     = TheWindowManager->winGetWindowFromId( NULL, checkAudioHardwareID );
 //
 	// Volume Controls
-	sliderMusicVolumeID    = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderMusicVolume" ) );
+	sliderMusicVolumeID    = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderMusicVolume" );
 	sliderMusicVolume      = TheWindowManager->winGetWindowFromId( NULL, sliderMusicVolumeID );
-	sliderSFXVolumeID      = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderSFXVolume" ) );
+	sliderSFXVolumeID      = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderSFXVolume" );
 	sliderSFXVolume        = TheWindowManager->winGetWindowFromId( NULL, sliderSFXVolumeID );
-	sliderVoiceVolumeID    = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderVoiceVolume" ) );
+	sliderVoiceVolumeID    = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderVoiceVolume" );
 	sliderVoiceVolume      = TheWindowManager->winGetWindowFromId( NULL, sliderVoiceVolumeID );
- 	sliderGammaID    = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderGamma" ) );
+ 	sliderGammaID    = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderGamma" );
  	sliderGamma      = TheWindowManager->winGetWindowFromId( NULL, sliderGammaID );
 
-//	checkBoxLowTextureDetailID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckLowTextureDetail" ) );
+//	checkBoxLowTextureDetailID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckLowTextureDetail" );
 //	checkBoxLowTextureDetail      = TheWindowManager->winGetWindowFromId( NULL, checkBoxLowTextureDetailID );
-	
-	WinAdvancedDisplayID		= TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:WinAdvancedDisplayOptions" ) );
+
+	WinAdvancedDisplayID		= TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:WinAdvancedDisplayOptions" );
 	WinAdvancedDisplay      = TheWindowManager->winGetWindowFromId( NULL, WinAdvancedDisplayID );
 
-	ButtonAdvancedAcceptID		= TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonAdvanceAccept" ) );
+	ButtonAdvancedAcceptID		= TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonAdvanceAccept" );
 	ButtonAdvancedAccept      = TheWindowManager->winGetWindowFromId( NULL, ButtonAdvancedAcceptID );
 
-	ButtonAdvancedCancelID		= TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonAdvanceBack" ) );
+	ButtonAdvancedCancelID		= TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonAdvanceBack" );
 	ButtonAdvancedCancel      = TheWindowManager->winGetWindowFromId( NULL, ButtonAdvancedCancelID );
 
-	sliderTextureResolutionID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:LowResSlider" ) );
+	sliderTextureResolutionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:LowResSlider" );
 	sliderTextureResolution = TheWindowManager->winGetWindowFromId( NULL, sliderTextureResolutionID );
 
-	check3DShadowsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:Check3DShadows" ) );
+	check3DShadowsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:Check3DShadows" );
 	check3DShadows   = TheWindowManager->winGetWindowFromId( NULL, check3DShadowsID);
 
-	check2DShadowsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:Check2DShadows" ) );
+	check2DShadowsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:Check2DShadows" );
 	check2DShadows   = TheWindowManager->winGetWindowFromId( NULL, check2DShadowsID);
 
-	checkCloudShadowsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckCloudShadows" ) );
+	checkCloudShadowsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckCloudShadows" );
 	checkCloudShadows   = TheWindowManager->winGetWindowFromId( NULL, checkCloudShadowsID);
 
-	checkGroundLightingID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckGroundLighting" ) );
+	checkGroundLightingID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckGroundLighting" );
 	checkGroundLighting   = TheWindowManager->winGetWindowFromId( NULL, checkGroundLightingID);
 
-	checkSmoothWaterID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckSmoothWater" ) );
+	checkSmoothWaterID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckSmoothWater" );
 	checkSmoothWater   = TheWindowManager->winGetWindowFromId( NULL, checkSmoothWaterID);
 
-	checkExtraAnimationsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckExtraAnimations" ) );
+	checkExtraAnimationsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckExtraAnimations" );
 	checkExtraAnimations   = TheWindowManager->winGetWindowFromId( NULL, checkExtraAnimationsID);
 
-	checkNoDynamicLodID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckNoDynamicLOD" ) );
+	checkNoDynamicLodID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckNoDynamicLOD" );
 	checkNoDynamicLod   = TheWindowManager->winGetWindowFromId( NULL, checkNoDynamicLodID);
 
-	checkHeatEffectsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckHeatEffects" ) );
+	checkHeatEffectsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckHeatEffects" );
 	checkHeatEffects   = TheWindowManager->winGetWindowFromId( NULL, checkHeatEffectsID);
 
-	checkUnlockFpsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckUnlockFPS" ) );
+	checkUnlockFpsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckUnlockFPS" );
 	checkUnlockFps   = TheWindowManager->winGetWindowFromId( NULL, checkUnlockFpsID);
 
-	checkBuildingOcclusionID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBehindBuilding" ) );
+	checkBuildingOcclusionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBehindBuilding" );
 	checkBuildingOcclusion   = TheWindowManager->winGetWindowFromId( NULL, checkBuildingOcclusionID);
 
-	checkPropsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckShowProps" ) );
+	checkPropsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckShowProps" );
 	checkProps   = TheWindowManager->winGetWindowFromId( NULL, checkPropsID);
 
-	sliderParticleCapID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ParticleCapSlider" ) );
+	sliderParticleCapID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ParticleCapSlider" );
   sliderParticleCap = TheWindowManager->winGetWindowFromId( NULL, sliderParticleCapID );
 
 	WinAdvancedDisplay->winHide(TRUE);
@@ -1472,29 +1801,7 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
     NUM_ALIASING_MODES
   };
 
-	NameKeyType versionID = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:LabelVersion") );
-	GameWindow *labelVersion = TheWindowManager->winGetWindowFromId( NULL, versionID );
-	UnicodeString versionString;
-	versionString.format(TheGameText->fetch("Version:Format2").str(), (GetRegistryVersion() >> 16), (GetRegistryVersion() & 0xffff));
-	
-	if (TheVersion->showFullVersion())
-	{
-		if (TheVersion)
-		{
-			UnicodeString version;
-			version.format(L"(%s) %s -- %s", versionString.str(), TheVersion->getFullUnicodeVersion().str(), TheVersion->getUnicodeBuildTime().str());
-			GadgetStaticTextSetText( labelVersion, version );
-		}
-		else
-		{
-			labelVersion->winHide( TRUE );
-		}
-	}
-	else
-	{
-		GadgetStaticTextSetText( labelVersion, versionString );
-	}
-
+	initLabelVersion();
 
 	// Choose an IP address, then initialize the IP combo box
 	UnsignedInt selectedIP = pref->getLANIPAddress();
@@ -1612,74 +1919,73 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 
 	// get resolution from saved preferences file
 	AsciiString selectedResolution = (*pref) ["Resolution"];
-	Int selectedXRes=800,selectedYRes=600;
+	Int selectedXRes=DEFAULT_DISPLAY_WIDTH;
+	Int selectedYRes=DEFAULT_DISPLAY_HEIGHT;
 	Int selectedResIndex=-1;
-	Int defaultResIndex=0;	//index of default video mode that should always exist
 	if (!selectedResolution.isEmpty())
 	{	//try to parse 2 integers out of string
 		if (sscanf(selectedResolution.str(),"%d%d", &selectedXRes, &selectedYRes) != 2)
-		{	selectedXRes=800; selectedYRes=600;
+		{
+			selectedXRes=DEFAULT_DISPLAY_WIDTH;
+			selectedYRes=DEFAULT_DISPLAY_HEIGHT;
 		}
 	}
 
 	// populate resolution modes
 	GadgetComboBoxReset(comboBoxResolution);
 	Int numResolutions = TheDisplay->getDisplayModeCount();
+	UnsignedInt displayWidth = TheDisplay->getWidth();
+	UnsignedInt displayHeight = TheDisplay->getHeight();
+
 	for( i = 0; i < numResolutions; ++i )
 	{	Int xres,yres,bitDepth;
 		TheDisplay->getDisplayModeDescription(i,&xres,&yres,&bitDepth);
 		str.format(L"%d x %d",xres,yres);
 		GadgetComboBoxAddEntry( comboBoxResolution, str, color);
-		if (xres == 800 && yres == 600)	//keep track of default mode in case we need it.
-			defaultResIndex=i;
-		if (xres == selectedXRes && yres == selectedYRes)
+		// TheSuperHackers @bugfix xezon 12/06/2025 Now makes a selection with the active display resolution
+		// instead of the resolution read from the Option Preferences, because the active display resolution
+		// is the most relevant to make a selection with and the Option Preferences could be wrong.
+		if ( xres == displayWidth && yres == displayHeight )
 			selectedResIndex=i;
 	}
 
-	if (selectedResIndex == -1)	//check if saved mode no longer available
-	{	//pick default resolution
-		selectedXRes = 800;
-		selectedXRes = 600;
-		selectedResIndex = defaultResIndex;
+	if (selectedResIndex == -1)
+	{
+		// TheSuperHackers @bugfix xezon 08/06/2025 Now adds the current resolution instead of defaulting to 800 x 600.
+		// This avoids force changing the resolution when the user has set a custom resolution in the Option Preferences.
+		Int xres = displayWidth;
+		Int yres = displayHeight;
+		str.format(L"%d x %d",xres,yres);
+		GadgetComboBoxAddEntry( comboBoxResolution, str, color );
+		selectedResIndex = GadgetComboBoxGetLength( comboBoxResolution ) - 1;
 	}
 
-	TheWritableGlobalData->m_xResolution = selectedXRes;
-	TheWritableGlobalData->m_yResolution = selectedYRes;
-
 	GadgetComboBoxSetSelectedPos( comboBoxResolution, selectedResIndex );
 
 	// set the display detail
+	// TheSuperHackers @tweak xezon 24/09/2025 The Detail Combo Box now has the same value order as StaticGameLODLevel for simplicity.
+	// TheSuperHackers @feature xezon 24/09/2025 The Detail Combo Box now has a new options for "Very High".
 	GadgetComboBoxReset(comboBoxDetail);
-	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->fetch("GUI:High"), color);
-	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->fetch("GUI:Medium"), color);
+#if ENABLE_GUI_HACKS
+	// TheSuperHackers @tweak xezon 24/09/2025 Show max 4 rows because with the original layout it cannot possibly show 5.
+	GadgetComboBoxSetMaxDisplay(comboBoxDetail, 4);
+#endif
 	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->fetch("GUI:Low"), color);
+	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->fetch("GUI:Medium"), color);
+	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->fetch("GUI:High"), color);
+	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->FETCH_OR_SUBSTITUTE("GUI:VeryHigh", L"Very High"), color);
 	GadgetComboBoxAddEntry(comboBoxDetail, TheGameText->fetch("GUI:Custom"), color);
+	static_assert(STATIC_GAME_LOD_COUNT == 5, "Wrong combo box count");
 
 	//Check if level was never set and default to setting most suitable for system.
 	if (TheGameLODManager->getStaticLODLevel() == STATIC_GAME_LOD_UNKNOWN)
-		TheGameLODManager->setStaticLODLevel(TheGameLODManager->findStaticLODLevel());
-
-	switch (TheGameLODManager->getStaticLODLevel())
-	{
-	case STATIC_GAME_LOD_LOW:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, LOWDETAIL);
-		break;
-	case STATIC_GAME_LOD_MEDIUM:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, MEDIUMDETAIL);
-		break;
-	case STATIC_GAME_LOD_HIGH:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, HIGHDETAIL);
-		break;
-	case STATIC_GAME_LOD_CUSTOM:
-		GadgetComboBoxSetSelectedPos(comboBoxDetail, CUSTOMDETAIL);
-		break;
-	default:
-		DEBUG_ASSERTCRASH(FALSE,("Tried to set comboBoxDetail to a value of %d ", TheGameLODManager->getStaticLODLevel()) );
-	};
-
-	Int txtFact=TheGameLODManager->getCurrentTextureReduction();
-
-	GadgetSliderSetPosition( sliderTextureResolution, 2-txtFact);
+	{
+		TheGameLODManager->setStaticLODLevel(TheGameLODManager->getRecommendedStaticLODLevel());
+	}
+
+	GadgetComboBoxSetSelectedPos(comboBoxDetail, (Int)TheGameLODManager->getStaticLODLevel());
+
+	GadgetSliderSetPosition( sliderTextureResolution, 2-WW3D::Get_Texture_Reduction());
 
 	GadgetCheckBoxSetChecked( check3DShadows, TheGlobalData->m_useShadowVolumes);
 
@@ -1718,7 +2024,7 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 		GadgetCheckBoxSetChecked( checkLanguageFilter, false);
 		TheWritableGlobalData->m_languageFilterPref = false;
 	}
-	
+
 	//set replay camera
 	if (pref->saveCameraInReplays())
 	{
@@ -1743,8 +2049,8 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 
 	//set scroll options
 	AsciiString test = (*pref)["DrawScrollAnchor"];
-	DEBUG_LOG(("DrawScrollAnchor == [%s]\n", test.str()));
-	if (test == "Yes" || (test.isEmpty() && TheInGameUI->getDrawRMBScrollAnchor()))
+	DEBUG_LOG(("DrawScrollAnchor == [%s]", test.str()));
+	if (test == "yes" || (test.isEmpty() && TheInGameUI->getDrawRMBScrollAnchor()))
 	{
 		GadgetCheckBoxSetChecked( checkDrawAnchor, true);
 		TheInGameUI->setDrawRMBScrollAnchor(true);
@@ -1755,8 +2061,8 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 		TheInGameUI->setDrawRMBScrollAnchor(false);
 	}
 	test = (*pref)["MoveScrollAnchor"];
-	DEBUG_LOG(("MoveScrollAnchor == [%s]\n", test.str()));
-	if (test == "Yes" || (test.isEmpty() && TheInGameUI->getMoveRMBScrollAnchor()))
+	DEBUG_LOG(("MoveScrollAnchor == [%s]", test.str()));
+	if (test == "yes" || (test.isEmpty() && TheInGameUI->getMoveRMBScrollAnchor()))
 	{
 		GadgetCheckBoxSetChecked( checkMoveAnchor, true);
 		TheInGameUI->setMoveRMBScrollAnchor(true);
@@ -1777,9 +2083,17 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 	GadgetCheckBoxSetChecked( checkDoubleClickAttackMove, TheGlobalData->m_doubleClickAttackMove );
 
 	// set scroll speed slider
+	// TheSuperHackers @tweak xezon 11/07/2025 No longer sets the slider position if the user setting
+	// is set beyond the slider limits. This gives the user more freedom to customize the scroll
+	// speed. The slider value remains 0.
 	Int scrollPos = (Int)(TheGlobalData->m_keyboardScrollFactor*100.0f);
-	GadgetSliderSetPosition( sliderScrollSpeed, scrollPos );
-	DEBUG_LOG(("Scroll SPeed %d\n", scrollPos));
+	Int scrollMin, scrollMax;
+	GadgetSliderGetMinMax( sliderScrollSpeed, &scrollMin, &scrollMax );
+	if (scrollPos >= scrollMin && scrollPos <= scrollMax)
+	{
+		GadgetSliderSetPosition( sliderScrollSpeed, scrollPos );
+	}
+	DEBUG_LOG(("Scroll Speed %d", scrollPos));
 
 	// set the send delay check box
 	GadgetCheckBoxSetChecked(checkSendDelay, TheGlobalData->m_firewallSendDelay);
@@ -1795,7 +2109,7 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 
 	//set voice volume slider
 	GadgetSliderSetPosition( sliderVoiceVolume, REAL_TO_INT(pref->getSpeechVolume()) );
-	
+
 	// set the gamma slider
  	GadgetSliderSetPosition( sliderGamma, REAL_TO_INT(pref->getGammaValue()) );
 
@@ -1803,27 +2117,34 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 	layout->hide( FALSE );
 
 	// set keyboard focus to main parent
-	AsciiString parentName( "OptionsMenu.wnd:OptionsMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:OptionsMenuParent" );
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	TheWindowManager->winSetFocus( parent );
-	
+
 	if( (TheGameLogic->isInGame() && TheGameLogic->getGameMode() != GAME_SHELL) || TheGameSpyInfo )
 	{
 		// disable controls that you can't change the options for in game
 		comboBoxLANIP->winEnable(FALSE);
+
 		if (comboBoxOnlineIP)
 			comboBoxOnlineIP->winEnable(FALSE);
+
 		checkSendDelay->winEnable(FALSE);
+
 		buttonFirewallRefresh->winEnable(FALSE);
 
 		if (comboBoxDetail)
 			comboBoxDetail->winEnable(FALSE);
 
-
 		if (comboBoxResolution)
 			comboBoxResolution->winEnable(FALSE);
 
+		if (textEntryFirewallPortOverride)
+			textEntryFirewallPortOverride->winEnable(FALSE);
+
+		if (textEntryHTTPProxy)
+			textEntryHTTPProxy->winEnable(FALSE);
+
 //		if (checkAudioSurround)
 //			checkAudioSurround->winEnable(FALSE);
 //
@@ -1834,7 +2155,7 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 
 	TheWindowManager->winSetModal(parent);
 	ignoreSelected = FALSE;
-}  // end OptionsMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** options menu shutdown method */
@@ -1858,7 +2179,7 @@ void OptionsMenuShutdown( WindowLayout *layout, void *userData )
 	TheShell->shutdownComplete( layout );
 */
 
-}  // end OptionsMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** options menu update method */
@@ -1866,7 +2187,7 @@ void OptionsMenuShutdown( WindowLayout *layout, void *userData )
 void OptionsMenuUpdate( WindowLayout *layout, void *userData )
 {
 
-}  // end OptionsMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Options menu input callback */
@@ -1875,7 +2196,7 @@ WindowMsgHandledType OptionsMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1890,41 +2211,40 @@ WindowMsgHandledType OptionsMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "OptionsMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end OptionsMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** options menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 																				WindowMsgData mData1, WindowMsgData mData2 )
 {
 	static NameKeyType buttonBack = NAMEKEY_INVALID;
@@ -1933,7 +2253,7 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 	static NameKeyType buttonReplayMenu = NAMEKEY_INVALID;
 	static NameKeyType buttonKeyboardOptionsMenu = NAMEKEY_INVALID;
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1941,14 +2261,14 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 		{
 
 			// get ids for our children controls
-			buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:ButtonBack") );
-			buttonDefaults = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:ButtonDefaults") );
-			buttonAccept = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:ButtonAccept") );
-			buttonKeyboardOptionsMenu = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonKeyboardOptions" ) );
+			buttonBack = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonBack" );
+			buttonDefaults = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonDefaults" );
+			buttonAccept = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonAccept" );
+			buttonKeyboardOptionsMenu = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonKeyboardOptions" );
 
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -1956,7 +2276,7 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -1968,7 +2288,7 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
@@ -1977,12 +2297,12 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 					break;
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-		
+
 				if (controlID == comboBoxDetailID)
 				{
 					Int index;
 					GadgetComboBoxGetSelectedPos( comboBoxDetail, &index );
-					if(index != CUSTOMDETAIL)
+					if(index != STATIC_GAME_LOD_CUSTOM)
 						break;
 
 					showAdvancedOptions();
@@ -2002,11 +2322,9 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 			{
 				// go back one screen
 				//TheShell->pop();
-				if (pref)
-				{
-					delete pref;
-					pref = NULL;
-				}
+
+				delete pref;
+				pref = NULL;
 
 				comboBoxLANIP = NULL;
 				comboBoxOnlineIP = NULL;
@@ -2018,7 +2336,7 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 					DestroyOptionsLayout();
 				}
 
-			}  // end if
+			}
 			else if (controlID == buttonAccept )
 			{
 				saveOptions();
@@ -2032,7 +2350,7 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 
 				comboBoxLANIP = NULL;
 				comboBoxOnlineIP = NULL;
-				
+
 				if(!TheGameLogic->isInGame() || TheGameLogic->isInShellGame())
 					destroyQuitMenu(); // if we're in a game, the change res then enter the same kind of game, we nee the quit menu to be gone.
 
@@ -2056,27 +2374,27 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 			else if (controlID == ButtonAdvancedAcceptID )
 			{
 				acceptAdvancedOptions();
-				
+
 			}
 			else if (controlID == ButtonAdvancedCancelID )
-			{	
+			{
 				cancelAdvancedOptions();
 			}
 			else if ( controlID == buttonKeyboardOptionsMenu )
 			{
-				TheShell->push( AsciiString( "Menus/KeyboardOptionsMenu.wnd" ) );
+				TheShell->push( "Menus/KeyboardOptionsMenu.wnd" );
 			}
 			else if(controlID == checkDrawAnchorID )
       {
         if( GadgetCheckBoxIsChecked( control ) )
         {
           	TheInGameUI->setDrawRMBScrollAnchor(true);
-          	(*pref)["DrawScrollAnchor"] = "Yes";
+          	(*pref)["DrawScrollAnchor"] = "yes";
         }
 				else
         {
           	TheInGameUI->setDrawRMBScrollAnchor(false);
-          	(*pref)["DrawScrollAnchor"] = "No";
+          	(*pref)["DrawScrollAnchor"] = "no";
         }
       }
 			else if(controlID == checkMoveAnchorID )
@@ -2084,12 +2402,12 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
         if( GadgetCheckBoxIsChecked( control ) )
         {
           	TheInGameUI->setMoveRMBScrollAnchor(true);
-          	(*pref)["MoveScrollAnchor"] = "Yes";
+          	(*pref)["MoveScrollAnchor"] = "yes";
         }
 				else
         {
           	TheInGameUI->setMoveRMBScrollAnchor(false);
-          	(*pref)["MoveScrollAnchor"] = "No";
+          	(*pref)["MoveScrollAnchor"] = "no";
         }
       }
 			else if(controlID == checkSaveCameraID )
@@ -2132,13 +2450,13 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end OptionsMenuSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
index bd47f599d23..d3b9be11bc0 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PopupCommunicator.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GUICallbacks.h"
 #include "GameClient/GameWindowManager.h"
@@ -69,10 +69,10 @@ void PopupCommunicatorInit( WindowLayout *layout, void *userData )
 	TheWindowManager->winSetModal( parent );
 
 	// get ids for our children controls
-	buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString("PopupCommunicator.wnd:ButtonOk") );
+	buttonOkID = TheNameKeyGenerator->nameToKey( "PopupCommunicator.wnd:ButtonOk" );
 	buttonOk = TheWindowManager->winGetWindowFromId( parent, buttonOkID );
 
-}  // end PopupCommunicatorInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Popup Communicator shutdown method */
@@ -80,7 +80,7 @@ void PopupCommunicatorInit( WindowLayout *layout, void *userData )
 void PopupCommunicatorShutdown( WindowLayout *layout, void *userData )
 {
 
-}  // end PopupCommunicatorShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Popup Communicator update method */
@@ -88,7 +88,7 @@ void PopupCommunicatorShutdown( WindowLayout *layout, void *userData )
 void PopupcommunicatorUpdate( WindowLayout *layout, void *userData )
 {
 
-}  // end PopupCommunicatorUpdate 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Popup Communicator input callback */
@@ -97,7 +97,7 @@ WindowMsgHandledType PopupCommunicatorInput( GameWindow *window, UnsignedInt msg
 																						WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -112,7 +112,7 @@ WindowMsgHandledType PopupCommunicatorInput( GameWindow *window, UnsignedInt msg
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -120,34 +120,34 @@ WindowMsgHandledType PopupCommunicatorInput( GameWindow *window, UnsignedInt msg
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)buttonOk, buttonOkID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end PopupCommunicatorInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Popup Communicator window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType PopupCommunicatorSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType PopupCommunicatorSystem( GameWindow *window, UnsignedInt msg,
 																		 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -156,14 +156,14 @@ WindowMsgHandledType PopupCommunicatorSystem( GameWindow *window, UnsignedInt ms
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 
 			break;
 
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -175,13 +175,13 @@ WindowMsgHandledType PopupCommunicatorSystem( GameWindow *window, UnsignedInt ms
 
 			break;
 
-		}  // end input
+		}
     //---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-      
+
 			if( controlID == buttonOkID )
 			{
 				WindowLayout *popupCommunicatorLayout = window->winGetLayout();
@@ -191,17 +191,17 @@ WindowMsgHandledType PopupCommunicatorSystem( GameWindow *window, UnsignedInt ms
 					deleteInstance(popupCommunicatorLayout);
 					popupCommunicatorLayout = NULL;
 				}
-			}  // end if
-	
+			}
+
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
index efd7235e580..9d55935b356 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PopupHostGame.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,7 +37,7 @@
 //	Filename: 	PopupHostGame.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Contains the Callbacks for the Host Game Popus
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/NameKeyGenerator.h"
@@ -100,11 +100,6 @@ static GameWindow *textEntryGamePassword = NULL;
 static GameWindow *checkBoxLimitArmies = NULL;
 static GameWindow *checkBoxUseStats = NULL;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 void createGame( void );
 
@@ -315,51 +310,51 @@ void PopulateCustomLadderComboBox( void )
 //-------------------------------------------------------------------------------------------------
 void PopupHostGameInit( WindowLayout *layout, void *userData )
 {
-	parentPopupID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ParentHostPopUp"));
+	parentPopupID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ParentHostPopUp");
 	parentPopup = TheWindowManager->winGetWindowFromId(NULL, parentPopupID);
 
-	textEntryGameNameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryGameName"));
+	textEntryGameNameID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryGameName");
 	textEntryGameName = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGameNameID);
 	UnicodeString name;
 	name.translate(TheGameSpyInfo->getLocalName());
 	GadgetTextEntrySetText(textEntryGameName, name);
 
-	textEntryGameDescriptionID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryGameDescription"));
+	textEntryGameDescriptionID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryGameDescription");
 	textEntryGameDescription = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGameDescriptionID);
 	GadgetTextEntrySetText(textEntryGameDescription, UnicodeString::TheEmptyString);
 
-	textEntryLadderPasswordID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryLadderPassword"));
+	textEntryLadderPasswordID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryLadderPassword");
 	textEntryLadderPassword = TheWindowManager->winGetWindowFromId(parentPopup, textEntryLadderPasswordID);
 	GadgetTextEntrySetText(textEntryLadderPassword, UnicodeString::TheEmptyString);
 
-	textEntryGamePasswordID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryGamePassword"));
+	textEntryGamePasswordID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryGamePassword");
 	textEntryGamePassword = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGamePasswordID);
 	GadgetTextEntrySetText(textEntryGamePassword, UnicodeString::TheEmptyString);
 
-	buttonCreateGameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ButtonCreateGame"));
+	buttonCreateGameID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ButtonCreateGame");
 	buttonCreateGame = TheWindowManager->winGetWindowFromId(parentPopup, buttonCreateGameID);
 
-	buttonCancelID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ButtonCancel"));
+	buttonCancelID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ButtonCancel");
 	buttonCancel = TheWindowManager->winGetWindowFromId(parentPopup, buttonCancelID);
 
-	checkBoxAllowObserversID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:CheckBoxAllowObservers"));
+	checkBoxAllowObserversID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:CheckBoxAllowObservers");
 	checkBoxAllowObservers = TheWindowManager->winGetWindowFromId(parentPopup, checkBoxAllowObserversID);
 	CustomMatchPreferences customPref;
 	GadgetCheckBoxSetChecked(checkBoxAllowObservers, customPref.allowsObservers());
 
-	comboBoxLadderNameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ComboBoxLadderName"));
+	comboBoxLadderNameID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ComboBoxLadderName");
 	comboBoxLadderName = TheWindowManager->winGetWindowFromId(parentPopup, comboBoxLadderNameID);
 	if (comboBoxLadderName)
 		GadgetComboBoxReset(comboBoxLadderName);
 	PopulateCustomLadderComboBox();
 
-  checkBoxUseStatsID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:CheckBoxUseStats"));
+  checkBoxUseStatsID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:CheckBoxUseStats");
   checkBoxUseStats = TheWindowManager->winGetWindowFromId(parentPopup, checkBoxUseStatsID);
 	Bool usingStats = customPref.getUseStats();
   GadgetCheckBoxSetChecked( checkBoxUseStats, usingStats );
 
 	// limit armies is disallowed in "use stats" games
-  checkBoxLimitArmiesID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:CheckBoxLimitArmies"));
+  checkBoxLimitArmiesID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:CheckBoxLimitArmies");
   checkBoxLimitArmies = TheWindowManager->winGetWindowFromId(parentPopup, checkBoxLimitArmiesID);
 	checkBoxLimitArmies->winEnable(! usingStats );
   GadgetCheckBoxSetChecked( checkBoxLimitArmies, usingStats? FALSE : customPref.getFactionsLimited() );
@@ -392,7 +387,7 @@ void PopupHostGameUpdate( WindowLayout * layout, void *userData)
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupHostGameInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -409,28 +404,28 @@ WindowMsgHandledType PopupHostGameInput( GameWindow *window, UnsignedInt msg, Wi
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonCancel, buttonCancelID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
@@ -441,7 +436,7 @@ WindowMsgHandledType PopupHostGameInput( GameWindow *window, UnsignedInt msg, Wi
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -450,7 +445,7 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
@@ -458,7 +453,7 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 
 			break;
 
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -470,7 +465,7 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 
 			break;
 
-		}  // end input
+		}
 
     //----------------------------------------------------------------------------------------------
 		case GEM_UPDATE_TEXT:
@@ -498,9 +493,9 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 					// Put the whitespace-free version in the box
 					GadgetTextEntrySetText( textEntryGameName, txtInput );
 
-				}// if ( controlID == textEntryPlayerNameID )
+				}
 				break;
-			}//case GEM_UPDATE_TEXT:
+			}
     //---------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
 			{
@@ -523,14 +518,14 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 					}
 				}
 				break;
-			} // case GCM_SELECTED
+			}
 
     //---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-     
+
       if( controlID == buttonCancelID )
 			{
 				parentPopup = NULL;
@@ -542,7 +537,7 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 				UnicodeString name;
 				name = GadgetTextEntryGetText(textEntryGameName);
 				name.trim();
-				if(name.getLength() <= 0)
+				if(name.isEmpty())
 				{
 					name.translate(TheGameSpyInfo->getLocalName());
 					GadgetTextEntrySetText(textEntryGameName, name);
@@ -556,7 +551,7 @@ WindowMsgHandledType PopupHostGameSystem( GameWindow *window, UnsignedInt msg, W
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
index 6c284cf06a7..efbba30770c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PopupJoinGame.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,7 +37,7 @@
 //	Filename: 	PopupJoinGame.cpp
 //
 //	author:		Matthew D. Campbell
-//	
+//
 //	purpose:	Contains the Callbacks for the Join Game Popup
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/NameKeyGenerator.h"
@@ -86,14 +86,14 @@ static void joinGame( AsciiString password );
 //-------------------------------------------------------------------------------------------------
 void PopupJoinGameInit( WindowLayout *layout, void *userData )
 {
-	parentPopupID = TheNameKeyGenerator->nameToKey(AsciiString("PopupJoinGame.wnd:ParentJoinPopUp"));
+	parentPopupID = TheNameKeyGenerator->nameToKey("PopupJoinGame.wnd:ParentJoinPopUp");
 	parentPopup = TheWindowManager->winGetWindowFromId(NULL, parentPopupID);
 
-	textEntryGamePasswordID = TheNameKeyGenerator->nameToKey(AsciiString("PopupJoinGame.wnd:TextEntryGamePassword"));
+	textEntryGamePasswordID = TheNameKeyGenerator->nameToKey("PopupJoinGame.wnd:TextEntryGamePassword");
 	textEntryGamePassword = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGamePasswordID);
 	GadgetTextEntrySetText(textEntryGamePassword, UnicodeString::TheEmptyString);
 
-	NameKeyType staticTextGameNameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupJoinGame.wnd:StaticTextGameName"));
+	NameKeyType staticTextGameNameID = TheNameKeyGenerator->nameToKey("PopupJoinGame.wnd:StaticTextGameName");
 	GameWindow *staticTextGameName = TheWindowManager->winGetWindowFromId(parentPopup, staticTextGameNameID);
 	GadgetStaticTextSetText(staticTextGameName, UnicodeString::TheEmptyString);
 
@@ -113,7 +113,7 @@ void PopupJoinGameInit( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupJoinGameInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -130,7 +130,7 @@ WindowMsgHandledType PopupJoinGameInput( GameWindow *window, UnsignedInt msg, Wi
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -140,18 +140,18 @@ WindowMsgHandledType PopupJoinGameInput( GameWindow *window, UnsignedInt msg, Wi
 						GameSpyCloseOverlay(GSOVERLAY_GAMEPASSWORD);
 						SetLobbyAttemptHostJoin( FALSE );
 						parentPopup = NULL;
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
@@ -162,7 +162,7 @@ WindowMsgHandledType PopupJoinGameInput( GameWindow *window, UnsignedInt msg, Wi
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupJoinGameSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -171,14 +171,14 @@ WindowMsgHandledType PopupJoinGameSystem( GameWindow *window, UnsignedInt msg, W
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 
 			break;
 
-		}  // end case
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -204,13 +204,13 @@ WindowMsgHandledType PopupJoinGameSystem( GameWindow *window, UnsignedInt msg, W
 
 			break;
 
-		}  // end input
+		}
     //---------------------------------------------------------------------------------------------
 		case GEM_EDIT_DONE:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-     
+
       if( controlID == textEntryGamePasswordID )
 			{
 				// read the user's input and clear the entry box
@@ -230,7 +230,7 @@ WindowMsgHandledType PopupJoinGameSystem( GameWindow *window, UnsignedInt msg, W
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
@@ -257,7 +257,7 @@ static void joinGame( AsciiString password )
 	req.stagingRoom.id = ourRoom->getID();
 	req.password = password.str();
 	TheGameSpyPeerMessageQueue->addRequest(req);
-	DEBUG_LOG(("Attempting to join game %d(%ls) with password [%s]\n", ourRoom->getID(), ourRoom->getGameName().str(), password.str()));
+	DEBUG_LOG(("Attempting to join game %d(%ls) with password [%s]", ourRoom->getID(), ourRoom->getGameName().str(), password.str()));
 	GameSpyCloseOverlay(GSOVERLAY_GAMEPASSWORD);
 	parentPopup = NULL;
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
index 3a184f884f6..72389c9f9f4 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PopupLadderSelect.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	August 2002
@@ -37,7 +37,7 @@
 //	Filename: 	PopupLadderSelect.cpp
 //
 //	author:		Matthew D. Campbell
-//	
+//
 //	purpose:	Contains the Callbacks for the Ladder Select Popup
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/encrypt.h"
@@ -68,11 +68,6 @@
 //#include "GameNetwork/GameSpy/PeerThread.h"
 #include "GameNetwork/GameSpyOverlay.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -269,7 +264,7 @@ void PopupLadderSelectInit( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupLadderSelectInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -286,7 +281,7 @@ WindowMsgHandledType PopupLadderSelectInput( GameWindow *window, UnsignedInt msg
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -306,18 +301,18 @@ WindowMsgHandledType PopupLadderSelectInput( GameWindow *window, UnsignedInt msg
 							break;
 						}
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
@@ -340,13 +335,13 @@ void ladderSelectedCallback(void)
 //-------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-  switch( msg ) 
+  switch( msg )
 	{
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
 			break;
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
@@ -355,7 +350,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 			listboxLadderDetails = NULL;
 			CustomMatchHideHostPopup(FALSE);
 			break;
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -364,7 +359,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 			if( mData1 == TRUE )
 				*(Bool *)mData2 = TRUE;
 			break;
-		}  // end input
+		}
     //----------------------------------------------------------------------------------------------
     case GBM_SELECTED:
 		{
@@ -413,7 +408,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 				if ( pass.isNotEmpty() ) // password ok
 				{
 					AsciiString cryptPass = EncryptString(pass.str());
-					DEBUG_LOG(("pass is %s, crypted pass is %s, comparing to %s\n",
+					DEBUG_LOG(("pass is %s, crypted pass is %s, comparing to %s",
 						pass.str(), cryptPass.str(), li->cryptedPassword.str()));
 					if (cryptPass == li->cryptedPassword)
 						ladderSelectedCallback();
@@ -434,7 +429,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 				setPasswordMode(PASS_NONE);
 			}
 			break;
-		}  // end input
+		}
 
     //---------------------------------------------------------------------------------------------
 		case GLM_SELECTED:
@@ -450,7 +445,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 
 			updateLadderDetails(selID, staticTextLadderName, listboxLadderDetails);
 			break;
-		}  // end GLM_DOUBLE_CLICKED
+		}
 
     //---------------------------------------------------------------------------------------------
 		case GLM_DOUBLE_CLICKED:
@@ -462,7 +457,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 
       if( controlID == listboxLadderSelectID )
 			{
-				TheWindowManager->winSendSystemMsg( parent, GBM_SELECTED, 
+				TheWindowManager->winSendSystemMsg( parent, GBM_SELECTED,
 																					(WindowMsgData)buttonOk, buttonOk->winGetWindowId() );
 			}
 			break;
@@ -475,7 +470,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 			Int controlID = control->winGetWindowId();
 			if (controlID == textEntryPasswordID)
 			{
-				TheWindowManager->winSendSystemMsg( parent, GBM_SELECTED, 
+				TheWindowManager->winSendSystemMsg( parent, GBM_SELECTED,
 																					(WindowMsgData)(TheWindowManager->winGetWindowFromId(passwordParent, buttonPasswordOkID)), buttonPasswordOkID );
 			}
 			break;
@@ -484,7 +479,7 @@ WindowMsgHandledType PopupLadderSelectSystem( GameWindow *window, UnsignedInt ms
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
@@ -595,7 +590,7 @@ static void closeRightClickMenu(GameWindow *win)
 		WindowLayout *winLay = win->winGetLayout();
 		if(!winLay)
 			return;
-		winLay->destroyWindows();					
+		winLay->destroyWindows();
 		deleteInstance(winLay);
 		winLay = NULL;
 
@@ -612,13 +607,13 @@ WindowMsgHandledType RCGameDetailsMenuSystem( GameWindow *window, UnsignedInt ms
 	static NameKeyType buttonOkID = NAMEKEY_INVALID;
 	switch( msg )
 	{
-		
+
 		case GWM_CREATE:
 			{
 				ladderInfoID = NAMEKEY("RCGameDetailsMenu.wnd:ButtonLadderDetails");
 				buttonOkID = NAMEKEY("PopupLadderDetails.wnd:ButtonOk");
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GGM_CLOSE:
 			{
@@ -630,7 +625,7 @@ WindowMsgHandledType RCGameDetailsMenuSystem( GameWindow *window, UnsignedInt ms
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -653,7 +648,7 @@ WindowMsgHandledType RCGameDetailsMenuSystem( GameWindow *window, UnsignedInt ms
 						const LadderInfo *linfo = TheLadderList->findLadder(theRoom->getLadderIP(), theRoom->getLadderPort());
 						if (linfo)
 						{
-							WindowLayout *rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/PopupLadderDetails.wnd"));	
+							WindowLayout *rcLayout = TheWindowManager->winCreateLayout("Menus/PopupLadderDetails.wnd");
 							if (!rcLayout)
 								break;
 
@@ -661,7 +656,7 @@ WindowMsgHandledType RCGameDetailsMenuSystem( GameWindow *window, UnsignedInt ms
 							rcMenu->winGetLayout()->runInit();
 							rcMenu->winBringToTop();
 							rcMenu->winHide(FALSE);
-							
+
 							rcMenu->winSetUserData((void *)selectedID);
 							TheWindowManager->winSetLoneWindow(rcMenu);
 
@@ -677,7 +672,7 @@ WindowMsgHandledType RCGameDetailsMenuSystem( GameWindow *window, UnsignedInt ms
 			}
 		default:
 			return MSG_IGNORED;
-	
-	}//Switch		
+
+	}
 	return MSG_HANDLED;
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp
index 60fdf4da2fd..3dd610bcfdc 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PlayerTemplate.h"
 #include "Common/BattleHonors.h"
@@ -60,11 +60,6 @@
 
 #include "WWDownload/Registry.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 // window ids ------------------------------------------------------------------------------
@@ -95,7 +90,7 @@ static Int lookAtPlayerID = 0;
 static std::string lookAtPlayerName;
 
 
-static const char *rankNames[] = {
+static const char *const rankNames[] = {
 	"Private",
 	"Corporal",
 	"Sergeant",
@@ -107,6 +102,7 @@ static const char *rankNames[] = {
 	"Brigadier",
 	"Commander",
 };
+static_assert(ARRAY_SIZE(rankNames) == MAX_RANKS, "Incorrect array size");
 
 
 static const Image* lookupRankImage(AsciiString side, Int rank)
@@ -148,7 +144,7 @@ static Int getTotalDisconnectsFromFile(Int playerID)
 	UserPreferences pref;
 	AsciiString userPrefFilename;
 	userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", playerID);
-	DEBUG_LOG(("getTotalDisconnectsFromFile - reading stats from file %s\n", userPrefFilename.str()));
+	DEBUG_LOG(("getTotalDisconnectsFromFile - reading stats from file %s", userPrefFilename.str()));
 	pref.load(userPrefFilename);
 
 	// if there is a file override, use that data instead.
@@ -171,7 +167,7 @@ static Int getTotalDisconnectsFromFile(Int playerID)
 		retval += atoi(pref.find("5")->second.str());
 	}
 
-	return retval;	
+	return retval;
 }
 
 Int GetAdditionalDisconnectsFromUserFile(Int playerID)
@@ -184,7 +180,7 @@ Int GetAdditionalDisconnectsFromUserFile(Int playerID)
 
 	if (TheGameSpyInfo->getAdditionalDisconnects() > 0 && !retval)
 	{
-		DEBUG_LOG(("Clearing additional disconnects\n"));
+		DEBUG_LOG(("Clearing additional disconnects"));
 		TheGameSpyInfo->clearAdditionalDisconnects();
 	}
 
@@ -204,7 +200,7 @@ void GetAdditionalDisconnectsFromUserFile(PSPlayerStats *stats)
 
 	if (TheGameSpyInfo->getAdditionalDisconnects() > 0 && !getTotalDisconnectsFromFile(stats->id))
 	{
-		DEBUG_LOG(("Clearing additional disconnects\n"));
+		DEBUG_LOG(("Clearing additional disconnects"));
 		TheGameSpyInfo->clearAdditionalDisconnects();
 	}
 
@@ -216,7 +212,7 @@ void GetAdditionalDisconnectsFromUserFile(PSPlayerStats *stats)
 	UserPreferences pref;
 	AsciiString userPrefFilename;
 	userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", stats->id);
-	DEBUG_LOG(("GetAdditionalDisconnectsFromUserFile - reading stats from file %s\n", userPrefFilename.str()));
+	DEBUG_LOG(("GetAdditionalDisconnectsFromUserFile - reading stats from file %s", userPrefFilename.str()));
 	pref.load(userPrefFilename);
 
 	// if there is a file override, use that data instead.
@@ -463,7 +459,7 @@ void BattleHonorTooltip(GameWindow *window,
 				TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:BattleHonorDominationOnlineDisabled"), -1, NULL, tooltipWidth );
 		}
 	}
-	
+
 }
 
 static Int rowsToSkip = 0;
@@ -473,8 +469,8 @@ void ResetBattleHonorInsertion(void)
 }
 void InsertBattleHonor(GameWindow *list, const Image *image, Bool enabled, Int itemData, Int& row, Int& column, UnicodeString text = UnicodeString::TheEmptyString, Int extra = 0)
 {
-	Int width = MAX_BATTLE_HONOR_IMAGE_WIDTH * (TheDisplay->getWidth() / 800.0f);
-	Int height = MAX_BATTLE_HONOR_IMAGE_HEIGHT * (TheDisplay->getHeight() / 600.0f);
+	Int width = MAX_BATTLE_HONOR_IMAGE_WIDTH * (TheDisplay->getWidth() / (Real)DEFAULT_DISPLAY_WIDTH);
+	Int height = MAX_BATTLE_HONOR_IMAGE_HEIGHT * (TheDisplay->getHeight() / (Real)DEFAULT_DISPLAY_HEIGHT);
 
 	static Int enabledColor = 0xFFFFFFFF;
 	static Int disabledColor = GameMakeColor(80, 80, 80, 255);
@@ -483,7 +479,7 @@ void InsertBattleHonor(GameWindow *list, const Image *image, Bool enabled, Int i
 		color = enabledColor;
 	else
 		color = disabledColor;
-	
+
 	if (!enabled)
 		itemData |= BATTLE_HONOR_NOT_GAINED;
 
@@ -751,7 +747,7 @@ Int GetFavoriteSide( const PSPlayerStats& stats )
 
 Int CalculateRank( const PSPlayerStats& stats )
 {
-	if(stats.id == 0 || !TheRankPointValues)	
+	if(stats.id == 0 || !TheRankPointValues)
 		return 0;
 	PerGeneralMap::const_iterator it;
 	Int rankPoints = 0;
@@ -762,7 +758,7 @@ Int CalculateRank( const PSPlayerStats& stats )
 		numGames += it->second;
 	}
 	rankPoints += (numGames * TheRankPointValues->m_winMultiplier);
-	
+
 	numGames = 0;
 	for(it =stats.losses.begin(); it != stats.losses.end(); ++it)
 	{
@@ -805,7 +801,7 @@ static GameWindow* findWindow(GameWindow *parent, AsciiString baseWindow, AsciiS
 	AsciiString fullPath;
 	fullPath.format("%s:%s", baseWindow.str(), gadgetName.str());
 	GameWindow *res = TheWindowManager->winGetWindowFromId(parent, NAMEKEY(fullPath));
-	DEBUG_ASSERTLOG(res, ("Cannot find window %s\n", fullPath.str()));
+	DEBUG_ASSERTLOG(res, ("Cannot find window %s", fullPath.str()));
 	return res;
 }
 
@@ -830,7 +826,7 @@ void PopulatePlayerInfoWindows( AsciiString parentWindowName )
 
 		weHaveStats = TRUE;
 	}
-	
+
 	Int currentRank = 0;
 	Int rankPoints = CalculateRank(stats);
 	Int i = 0;
@@ -863,7 +859,7 @@ void PopulatePlayerInfoWindows( AsciiString parentWindowName )
 	numDiscons += GetAdditionalDisconnectsFromUserFile(lookupID);
 
 	numGames = numWins + numLosses + numDiscons;
-	
+
 	GameWindow *win = NULL;
 	UnicodeString uStr;
 	win = findWindow(NULL, parentWindowName, "StaticTextPlayerStatisticsLabel");
@@ -1096,7 +1092,7 @@ void PopulatePlayerInfoWindows( AsciiString parentWindowName )
 			GadgetStaticTextSetText(win, TheGameText->fetch("GUI:FetchingPlayerInfo"));
 		}
 	}
-	
+
 	win = findWindow(NULL, parentWindowName, "ListboxInfo");
 	if(win)
 	{
@@ -1139,7 +1135,7 @@ void HandlePersistentStorageResponses( void )
 				break;
 			case PSResponse::PSRESPONSE_PLAYERSTATS:
 				{
-					DEBUG_LOG(("LocalProfileID %d, resp.player.id %d, resp.player.locale %d\n", TheGameSpyInfo->getLocalProfileID(), resp.player.id, resp.player.locale));
+					DEBUG_LOG(("LocalProfileID %d, resp.player.id %d, resp.player.locale %d", TheGameSpyInfo->getLocalProfileID(), resp.player.id, resp.player.locale));
 					/*
 					if(resp.player.id == TheGameSpyInfo->getLocalProfileID() && resp.player.locale < LOC_MIN)
 					{
@@ -1188,7 +1184,7 @@ void HandlePersistentStorageResponses( void )
 						Bool isPreorder = TheGameSpyInfo->didPlayerPreorder( TheGameSpyInfo->getLocalProfileID() );
 						req.statsToPush.preorder = isPreorder;
 
-						DEBUG_LOG(("PEERREQUEST_PUSHSTATS: stats will be %d,%d,%d,%d,%d,%d\n",
+						DEBUG_LOG(("PEERREQUEST_PUSHSTATS: stats will be %d,%d,%d,%d,%d,%d",
 							req.statsToPush.locale, req.statsToPush.wins, req.statsToPush.losses, req.statsToPush.rankPoints, req.statsToPush.side, req.statsToPush.preorder));
 						TheGameSpyPeerMessageQueue->addRequest(req);
 					}
@@ -1197,10 +1193,10 @@ void HandlePersistentStorageResponses( void )
 					{
 						UpdateLocalPlayerStats();
 					}
-					DEBUG_LOG(("PopulatePlayerInfoWindows() - lookAtPlayerID is %d, got %d\n", lookAtPlayerID, resp.player.id));
+					DEBUG_LOG(("PopulatePlayerInfoWindows() - lookAtPlayerID is %d, got %d", lookAtPlayerID, resp.player.id));
 					PopulatePlayerInfoWindows("PopupPlayerInfo.wnd");
-					//GadgetListBoxAddEntryText(listboxInfo, UnicodeString(L"Got info!"), GameSpyColor[GSCOLOR_DEFAULT], -1);
-					
+					//GadgetListBoxAddEntryText(listboxInfo, L"Got info!", GameSpyColor[GSCOLOR_DEFAULT], -1);
+
 					// also update info for player list in lobby
 					PlayerInfoMap::iterator it = TheGameSpyInfo->getPlayerInfoMap()->begin();
 					while (it != TheGameSpyInfo->getPlayerInfoMap()->end())
@@ -1296,7 +1292,7 @@ void GameSpyPlayerInfoOverlayInit( WindowLayout *layout, void *userData )
 
 	isOverlayActive = true;
 
-	//GadgetListBoxAddEntryText(listboxInfo, UnicodeString(L"Working"), GameSpyColor[GSCOLOR_DEFAULT], -1);
+	//GadgetListBoxAddEntryText(listboxInfo, L"Working", GameSpyColor[GSCOLOR_DEFAULT], -1);
 
 	GameSpyCloseOverlay(GSOVERLAY_BUDDY);
 	raiseMessageBox = true;
@@ -1339,7 +1335,7 @@ void GameSpyPlayerInfoOverlayInit( WindowLayout *layout, void *userData )
 	}
 
 	//TheWindowManager->winSetModal(parent);
-} // GameSpyPlayerInfoOverlayInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Overlay shutdown method */
@@ -1353,7 +1349,7 @@ void GameSpyPlayerInfoOverlayShutdown( WindowLayout *layout, void *userData )
 
 	// our shutdown is complete
 	isOverlayActive = false;
-}  // GameSpyPlayerInfoOverlayShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -1364,7 +1360,7 @@ void GameSpyPlayerInfoOverlayUpdate( WindowLayout * layout, void *userData)
 	if (raiseMessageBox)
 		RaiseGSMessageBox();
 	raiseMessageBox = false;
-}// GameSpyPlayerInfoOverlayUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Overlay input callback */
@@ -1372,7 +1368,7 @@ void GameSpyPlayerInfoOverlayUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType GameSpyPlayerInfoOverlayInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1387,63 +1383,63 @@ WindowMsgHandledType GameSpyPlayerInfoOverlayInput( GameWindow *window, Unsigned
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonClose, buttonCloseID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// GameSpyPlayerInfoOverlayInput
+}
 void messageBoxYes( void );
 //-------------------------------------------------------------------------------------------------
 /** Overlay window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType GameSpyPlayerInfoOverlaySystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType GameSpyPlayerInfoOverlaySystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 		case GBM_SELECTED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
@@ -1504,7 +1500,7 @@ WindowMsgHandledType GameSpyPlayerInfoOverlaySystem( GameWindow *window, Unsigne
 					Bool isChecked = !GadgetCheckBoxIsChecked(control);
 					CustomMatchPreferences pref;
 					pref.setDisallowNonAsianText(isChecked);
-					pref.write();				
+					pref.write();
 					if(TheGameSpyInfo)
 						TheGameSpyInfo->setDisallowNonAsianText(isChecked);
 					if(isChecked && !GadgetCheckBoxIsChecked(checkBoxAsianFont))
@@ -1519,15 +1515,15 @@ WindowMsgHandledType GameSpyPlayerInfoOverlaySystem( GameWindow *window, Unsigne
 				}
 
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// GameSpyPlayerInfoOverlaySystem
+}
 
 static void messageBoxYes( void )
 {
@@ -1535,5 +1531,5 @@ static void messageBoxYes( void )
 	breq.buddyRequestType = BuddyRequest::BUDDYREQUEST_DELETEACCT;
 	TheGameSpyBuddyMessageQueue->addRequest( breq );
 	TheGameSpyInfo->setLocalProfileID(0);
-	
+
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
index e5bbf658924..b4a6e905e1e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PopupReplay.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   Generals
@@ -45,7 +45,7 @@
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/LocalFileSystem.h"
 #include "Common/MessageStream.h"
@@ -59,11 +59,6 @@
 #include "GameClient/Shell.h"
 #include "GameLogic/GameLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 static NameKeyType buttonBackKey					= NAMEKEY_INVALID;
@@ -107,7 +102,7 @@ static void closeSaveMenu( GameWindow *window )
 	if( layout )
 		layout->hide( TRUE );
 
-}  // end closeSaveMenu
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the SaveLoad menu */
@@ -140,7 +135,7 @@ void PopupReplayInit( WindowLayout *layout, void *userData )
 
 	// get the listbox that will have the save games in it
 	GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( NULL, listboxGamesKey );
-	DEBUG_ASSERTCRASH( listboxGames != NULL, ("PopupReplayInit - Unable to find games listbox\n") );
+	DEBUG_ASSERTCRASH( listboxGames != NULL, ("PopupReplayInit - Unable to find games listbox") );
 
 	// populate the listbox with the save games on disk
 	PopulateReplayFileListbox(listboxGames);
@@ -156,7 +151,7 @@ void PopupReplayInit( WindowLayout *layout, void *userData )
 		control->winEnable( FALSE );
 	}
 
-}  // end SaveLoadMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** SaveLoad menu shutdown method */
@@ -165,7 +160,7 @@ void PopupReplayShutdown( WindowLayout *layout, void *userData )
 {
 	parent = NULL;
 
-}  // end SaveLoadMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** SaveLoad menu update method */
@@ -173,11 +168,11 @@ void PopupReplayShutdown( WindowLayout *layout, void *userData )
 void PopupReplayUpdate( WindowLayout *layout, void *userData )
 {
 
-	if (s_fileSavePopupStartTime != 0) 
+	if (s_fileSavePopupStartTime != 0)
 	{
 		// the replay save confirmation popup is up
 		// check to see if its time to take it down.
-		if ((timeGetTime() - s_fileSavePopupStartTime) >= s_fileSavePopupDuration) 
+		if ((timeGetTime() - s_fileSavePopupStartTime) >= s_fileSavePopupDuration)
 		{
 			ShowReplaySavedPopup(FALSE);
 
@@ -189,13 +184,13 @@ void PopupReplayUpdate( WindowLayout *layout, void *userData )
 			s_fileSavePopupStartTime = 0;
 		}
 	}
-}  // end SaveLoadMenuUpdate 
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 WindowMsgHandledType PopupReplayInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -210,7 +205,7 @@ WindowMsgHandledType PopupReplayInput( GameWindow *window, UnsignedInt msg, Wind
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -218,21 +213,21 @@ WindowMsgHandledType PopupReplayInput( GameWindow *window, UnsignedInt msg, Wind
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 						GameWindow *button = TheWindowManager->winGetWindowFromId( parent, buttonBackKey );
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonBackKey );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 }
@@ -264,7 +259,7 @@ static void saveReplay( UnicodeString filename )
 	messageBoxWin = NULL;
 	if (TheLocalFileSystem->doesFileExist(fullPath.str()))
 	{
-		messageBoxWin = MessageBoxOkCancel(TheGameText->fetch("GUI:OverwriteReplayTitle"), TheGameText->fetch("GUI:OverwriteReplay"), reallySaveReplay, NULL);		
+		messageBoxWin = MessageBoxOkCancel(TheGameText->fetch("GUI:OverwriteReplayTitle"), TheGameText->fetch("GUI:OverwriteReplay"), reallySaveReplay, NULL);
 	}
 	else
 	{
@@ -301,7 +296,7 @@ void reallySaveReplay(void)
 
 			// get the listbox that will have the save games in it
 			GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( parent, listboxGamesKey );
-			DEBUG_ASSERTCRASH( listboxGames != NULL, ("reallySaveReplay - Unable to find games listbox\n") );
+			DEBUG_ASSERTCRASH( listboxGames != NULL, ("reallySaveReplay - Unable to find games listbox") );
 
 			// populate the listbox with the save games on disk
 			PopulateReplayFileListbox(listboxGames);
@@ -328,7 +323,7 @@ void reallySaveReplay(void)
 
 	// get the listbox that will have the save games in it
 	GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( parent, listboxGamesKey );
-	DEBUG_ASSERTCRASH( listboxGames != NULL, ("reallySaveReplay - Unable to find games listbox\n") );
+	DEBUG_ASSERTCRASH( listboxGames != NULL, ("reallySaveReplay - Unable to find games listbox") );
 
 	// populate the listbox with the save games on disk
 	PopulateReplayFileListbox(listboxGames);
@@ -340,11 +335,11 @@ void reallySaveReplay(void)
 //-------------------------------------------------------------------------------------------------
 /** SaveLoad menu system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -353,14 +348,14 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 
 			break;
 
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -372,7 +367,7 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end input
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GLM_SELECTED:
@@ -380,7 +375,7 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 			GameWindow *control = (GameWindow *)mData1;
 
 			GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( window, listboxGamesKey );
-			DEBUG_ASSERTCRASH( listboxGames != NULL, ("PopupReplaySystem - Unable to find games listbox\n") );
+			DEBUG_ASSERTCRASH( listboxGames != NULL, ("PopupReplaySystem - Unable to find games listbox") );
 
 			//
 			// handle games listbox, when certain items are selected in the listbox only some
@@ -394,14 +389,14 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 					UnicodeString filename;
 					filename = GadgetListBoxGetText(listboxGames, rowSelected);
 					GameWindow *textEntryReplayName = TheWindowManager->winGetWindowFromId( window, textEntryReplayNameKey );
-					DEBUG_ASSERTCRASH( textEntryReplayName != NULL, ("PopupReplaySystem - Unable to find text entry\n") );
+					DEBUG_ASSERTCRASH( textEntryReplayName != NULL, ("PopupReplaySystem - Unable to find text entry") );
 					GadgetTextEntrySetText(textEntryReplayName, filename);
 				}
 			}
 
 			break;
 
-		}  // end selected
+		}
 
     //---------------------------------------------------------------------------------------------
 		case GEM_EDIT_DONE:
@@ -418,10 +413,10 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 				saveReplay(filename);
 
       }
-	
+
 			break;
 
-		}  // end selected
+		}
     //---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
@@ -432,7 +427,7 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
       {
 				// get the filename, and see if we are overwriting
 				GameWindow *textEntryReplayName = TheWindowManager->winGetWindowFromId( window, textEntryReplayNameKey );
-				DEBUG_ASSERTCRASH( textEntryReplayName != NULL, ("PopupReplaySystem - Unable to find text entry\n") );
+				DEBUG_ASSERTCRASH( textEntryReplayName != NULL, ("PopupReplaySystem - Unable to find text entry") );
 
 				UnicodeString filename = GadgetTextEntryGetText( textEntryReplayName );
 				if (filename.isEmpty())
@@ -448,11 +443,11 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 				closeSaveMenu( window );
 				ScoreScreenEnableControls(TRUE);
 
-			}  // end if
-	
+			}
+
 			break;
 
-		}  // end selected
+		}
 
 		case GEM_UPDATE_TEXT:
 		{
@@ -476,12 +471,14 @@ WindowMsgHandledType PopupReplaySystem( GameWindow *window, UnsignedInt msg,
 					}
 				}
 			}
+
+			break;
 		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp
index 437bc9cdcb7..7f4d4b990a5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PopupSaveLoad.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -45,7 +45,7 @@
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
@@ -102,7 +102,7 @@ static void updateMenuActions( void )
 
 	// for loading only, disable the save button, otherwise enable it
 	GameWindow *saveButton = TheWindowManager->winGetWindowFromId( NULL, buttonSaveKey );
-	DEBUG_ASSERTCRASH( saveButton, ("SaveLoadMenuInit: Unable to find save button\n") );
+	DEBUG_ASSERTCRASH( saveButton, ("SaveLoadMenuInit: Unable to find save button") );
 	if( currentLayoutType == SLLT_LOAD_ONLY )
 		saveButton->winEnable( FALSE );
 	else
@@ -120,8 +120,8 @@ static void updateMenuActions( void )
 	buttonLoad->winEnable( selectedGameInfo != NULL );
 	GameWindow *buttonDelete = TheWindowManager->winGetWindowFromId( NULL, buttonDeleteKey );
 	buttonDelete->winEnable( selectedGameInfo != NULL );
-	
-}  // end updateMenuActions
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the SaveLoad menu */
@@ -172,7 +172,7 @@ void SaveLoadMenuInit( WindowLayout *layout, void *userData )
 	editDesc = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:EntryDesc" ) );
 	// get the listbox that will have the save games in it
 	listboxGames = TheWindowManager->winGetWindowFromId( NULL, listboxGamesKey );
-	DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox\n") );
+	DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox") );
 
 	// populate the listbox with the save games on disk
 	TheGameState->populateSaveGameListbox( listboxGames, currentLayoutType );
@@ -180,7 +180,7 @@ void SaveLoadMenuInit( WindowLayout *layout, void *userData )
 	// update the availability of the menu buttons
 	updateMenuActions();
 
-}  // end SaveLoadMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the SaveLoad menu */
@@ -193,7 +193,7 @@ void SaveLoadMenuFullScreenInit( WindowLayout *layout, void *userData )
 	isPopup = FALSE;
 	// set default behavior for this menu
 	currentLayoutType = SLLT_LOAD_ONLY;
-	
+
 	// get layout type if present
 	if( userData )
 		currentLayoutType = *((SaveLoadLayoutType *)userData);
@@ -235,7 +235,7 @@ void SaveLoadMenuFullScreenInit( WindowLayout *layout, void *userData )
 	deleteConfirm = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "SaveLoad.wnd:DeleteConfirmParent" ) );
 	// get the listbox that will have the save games in it
 	listboxGames = TheWindowManager->winGetWindowFromId( NULL, listboxGamesKey );
-	DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox\n") );
+	DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox") );
 
 	// populate the listbox with the save games on disk
 	TheGameState->populateSaveGameListbox( listboxGames, currentLayoutType );
@@ -249,14 +249,14 @@ void SaveLoadMenuFullScreenInit( WindowLayout *layout, void *userData )
 	if(parent)
 		parent->winHide(TRUE);
 	isShuttingDown = false;
-}  // end SaveLoadMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** SaveLoad menu shutdown method */
 //-------------------------------------------------------------------------------------------------
 void SaveLoadMenuShutdown( WindowLayout *layout, void *userData )
 {
-	
+
 	Bool popImmediate = *(Bool *)userData;
 	if( popImmediate )
 	{
@@ -265,12 +265,12 @@ void SaveLoadMenuShutdown( WindowLayout *layout, void *userData )
 		TheShell->shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	// our shutdown is complete
 	TheTransitionHandler->reverse("SaveLoadMenuFade");
 	isShuttingDown = TRUE;
-}  // end SaveLoadMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** SaveLoad menu update method */
@@ -301,13 +301,13 @@ void SaveLoadMenuUpdate( WindowLayout *layout, void *userData )
 	if(isShuttingDown && TheShell->isAnimFinished()&& TheTransitionHandler->isFinished())
 		TheShell->shutdownComplete( layout );
 
-}  // end SaveLoadMenuUpdate 
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 WindowMsgHandledType SaveLoadMenuInput( GameWindow *window, UnsignedInt msg, WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -322,7 +322,7 @@ WindowMsgHandledType SaveLoadMenuInput( GameWindow *window, UnsignedInt msg, Win
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -330,7 +330,7 @@ WindowMsgHandledType SaveLoadMenuInput( GameWindow *window, UnsignedInt msg, Win
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 						GameWindow *button = TheWindowManager->winGetWindowFromId( parent, buttonBackKey );
-						
+
 						//Kris: Patch 1.01 - November 12, 2003
 						//If you are in the game, then bring up the popup save menu, select a save game, click delete,
 						//hit ESC (brings you back to menu), then hit save/load again, the delete confirmation is still up
@@ -340,21 +340,21 @@ WindowMsgHandledType SaveLoadMenuInput( GameWindow *window, UnsignedInt msg, Win
 						listboxGames->winEnable( TRUE );
 						buttonFrame->winEnable( TRUE );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonBackKey );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 }
@@ -367,7 +367,7 @@ static AvailableGameInfo *getSelectedSaveFileInfo( GameWindow *window )
 
 	// get the listbox
 	//GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( window, listboxGamesKey );
-	DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox\n") );
+	DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox") );
 
 	// which item is selected
 	Int selected;
@@ -379,7 +379,7 @@ static AvailableGameInfo *getSelectedSaveFileInfo( GameWindow *window )
 
 	return selectedGameInfo;
 
-}  // end getSelectedSaveFileInfo
+}
 
 // ---------------------------------------------------con------------------------------------------
 // ------------------------------------------------------------------------------------------------				// close the save/load menu
@@ -388,16 +388,16 @@ static void doLoadGame( void )
 
 	// get listbox of games
 	//GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:ListboxGames" ) );
-	DEBUG_ASSERTCRASH( listboxGames, ("doLoadGame: Unable to find game listbox\n") );
+	DEBUG_ASSERTCRASH( listboxGames, ("doLoadGame: Unable to find game listbox") );
 
 	// get selected game info
 	AvailableGameInfo *selectedGameInfo = getSelectedSaveFileInfo( listboxGames );
-	DEBUG_ASSERTCRASH( selectedGameInfo, ("doLoadGame: No selected game info found\n") );
+	DEBUG_ASSERTCRASH( selectedGameInfo, ("doLoadGame: No selected game info found") );
 
 	// when loading a game we also close the quit/esc menu for the user when in-game
 	if( TheShell->isShellActive() == FALSE )
 	{
-		destroyQuitMenu();		
+		destroyQuitMenu();
 //		ToggleQuitMenu();
 //		TheTransitionHandler->remove("QuitNoSave");
 //		TheTransitionHandler->remove("QuitFull");
@@ -422,24 +422,24 @@ static void doLoadGame( void )
 		TheShell->showShell(TRUE);
 	}
 
-}  // end doLoadGame
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Close the save/load menu */
 // ------------------------------------------------------------------------------------------------
 static void closeSaveMenu( GameWindow *window )
 {
-	
+
 	if(isPopup)
 	{
 		WindowLayout *saveLoadMenuLayout = window->winGetLayout();
 		if( saveLoadMenuLayout )
-			saveLoadMenuLayout->hide( TRUE );	
+			saveLoadMenuLayout->hide( TRUE );
 	}
 	else
 		TheShell->hideShell();
 
-}  // end closeSaveMenu
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -449,12 +449,12 @@ static void setEditDescription( GameWindow *editControl )
 	Campaign *campaign = TheCampaignManager->getCurrentCampaign();
 
 	//
-	// if we have a campaign we will use a default description that describes the 
+	// if we have a campaign we will use a default description that describes the
 	// location and map in the campaign nicely, otherwise we will default to just
 	// the map name (which is really only used in debug)
 	//
 	if( campaign )
-		defaultDesc.format( L"%s %d", 
+		defaultDesc.format( L"%s %d",
 												TheGameText->fetch( campaign->m_campaignNameLabel ).str(),
 												TheCampaignManager->getCurrentMissionNumber() + 1 );
 	else
@@ -465,25 +465,22 @@ static void setEditDescription( GameWindow *editControl )
 			defaultDesc.format( L"%S", mapName + 1 );
 		else
 			defaultDesc.format( L"%S", TheGlobalData->m_mapName.str() );
-		
+
 		//Keep the extension out of the descriptive name.
 		if( (defaultDesc.getLength() >= 4)  &&  (defaultDesc.getCharAt(defaultDesc.getLength()-4) == '.') )
 		{
-			for( Int stripIndex = 0; stripIndex < 4; stripIndex++ )
-			{
-				defaultDesc.removeLastChar();
-			}
+			defaultDesc.truncateBy(4);
 		}
 
-	}  // end else
+	}
 
 	// set into edit control
 	GadgetTextEntrySetText( editControl, defaultDesc );
 
-}  // end setEditDescription
+}
 
 //----------------------------------------------------------------------------------------------
-static void processLoadButtonPress(GameWindow *window) 
+static void processLoadButtonPress(GameWindow *window)
 {
 	// get the filename of the selected savegame in the listbox
 	AvailableGameInfo *selectedGameInfo = getSelectedSaveFileInfo( window );
@@ -501,7 +498,7 @@ static void processLoadButtonPress(GameWindow *window)
 			closeSaveMenu( window );
 			doLoadGame();
 
-		}  // end if
+		}
 		else
 		{
 
@@ -516,19 +513,19 @@ static void processLoadButtonPress(GameWindow *window)
 			// show the load confirm dialog
 			loadConfirm->winHide( FALSE );
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
 /** SaveLoad menu system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-  switch( msg ) 
+  switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -537,14 +534,14 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end create
+		}
     //---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 
 			break;
 
-		}  // end case
+		}
 
     //----------------------------------------------------------------------------------------------
     case GWM_INPUT_FOCUS:
@@ -556,14 +553,14 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end input
+		}
 
     //----------------------------------------------------------------------------------------------
 		case GLM_DOUBLE_CLICKED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
 				GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( window, listboxGamesKey );
-				DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox\n") );
+				DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox") );
 
 				if (listboxGames != NULL) {
 					int rowSelected = mData2;
@@ -583,7 +580,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 			GameWindow *control = (GameWindow *)mData1;
 
 			GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( window, listboxGamesKey );
-			DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox\n") );
+			DEBUG_ASSERTCRASH( listboxGames != NULL, ("SaveLoadMenuInit - Unable to find games listbox") );
 
 			//
 			// handle games listbox, when certain items are selected in the listbox only some
@@ -594,27 +591,27 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end selected
+		}
 
     //---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-      
+
       if( controlID == buttonLoadKey )
       {
 				processLoadButtonPress(window);
-      }  // end if
+      }
       else if( controlID == buttonSaveKey )
       {
 
 				// sanity
 				DEBUG_ASSERTCRASH( currentLayoutType == SLLT_SAVE_AND_LOAD ||
 													 currentLayoutType == SLLT_SAVE_ONLY,
-													 ("SaveLoadMenuSystem - layout type '%d' does not allow saving\n",
+													 ("SaveLoadMenuSystem - layout type '%d' does not allow saving",
 													 currentLayoutType) );
-													 	
+
 				// get save file info
 				AvailableGameInfo *selectedGameInfo = getSelectedSaveFileInfo( window );
 
@@ -640,7 +637,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 					TheWindowManager->winSetFocus(editDesc);
 
-				}  // end if
+				}
 				else
 				{
 
@@ -656,7 +653,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					//GameWindow *overwriteConfirm  = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:OverwriteConfirmParent" ) );
 					overwriteConfirm->winHide( FALSE );
 
-				}  // end else
+				}
 
       }
 			else if( controlID == buttonDeleteKey )
@@ -684,13 +681,13 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					//GameWindow *deleteConfirm = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:DeleteConfirmParent" ) );
 					deleteConfirm->winHide( FALSE );
 
-				}  // end if
-								
-			}  // end else if
+				}
+
+			}
 			else if( controlID == buttonBackKey )
 			{
 				if(isPopup)
-				{				
+				{
 					// close the save/load menu
 					closeSaveMenu( window );
 				}
@@ -699,7 +696,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					TheShell->pop();
 				}
 
-			}  // end if
+			}
 			else if( controlID == buttonDeleteConfirm || controlID == buttonDeleteCancel )
 			{
 				//GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:ListboxGames" ) );
@@ -719,11 +716,11 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 					// delete the file
 					DeleteFile( filepath.str() );
-					
+
 					// repopulate the listbox
 					TheGameState->populateSaveGameListbox( listboxGames, currentLayoutType );
 
-				}  // end if
+				}
 
 				// hide the confirm dialog
 				//GameWindow *deleteConfirm = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:DeleteConfirmParent" ) );
@@ -737,7 +734,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 				buttonFrame->winEnable( TRUE );
 				updateMenuActions();
 
-			}  // end if
+			}
 			else if( controlID == buttonOverwriteCancel || controlID == buttonOverwriteConfirm )
 			{
 				//GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:ListboxGames" ) );
@@ -761,7 +758,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					// get the item data of the selection
 					AvailableGameInfo *selectedGameInfo;
 					selectedGameInfo = (AvailableGameInfo *)GadgetListBoxGetItemData( listboxGames, selected );
-					DEBUG_ASSERTCRASH( selectedGameInfo, ("SaveLoadMenuSystem: Internal error, listbox entry to overwrite game has no item data set into listbox element\n") );
+					DEBUG_ASSERTCRASH( selectedGameInfo, ("SaveLoadMenuSystem: Internal error, listbox entry to overwrite game has no item data set into listbox element") );
 
 					// enable the listbox of games
 					//GameWindow *listboxGames = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:ListboxGames" ) );
@@ -771,12 +768,10 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					//GameWindow *buttonFrame  = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:MenuButtonFrame" ) );
 					buttonFrame->winEnable( TRUE );
 					updateMenuActions();
-					
-					//Added By Sadullah Nader
-					//Fix for bug
-					// close save menuu
+
+					// close save menu
 					closeSaveMenu( window );
-					
+
 					//
 					// given the context of this menu figure out which type of save game we're acutally
 					// saving right now.  As it turns out, when this menu is used in the save only
@@ -791,8 +786,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 
 					// save the game
 					AsciiString filename;
-					if( selectedGameInfo )
-						filename = selectedGameInfo->filename;
+					filename = selectedGameInfo->filename;
 					TheGameState->saveGame( filename, selectedGameInfo->saveGameInfo.description, fileType );
 
 /*
@@ -800,7 +794,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					GameWindow *editDesc = TheWindowManager->winGetWindowFromId( saveDesc, NAMEKEY( "PopupSaveLoad.wnd:EntryDesc" ) );
 					setEditDescription( editDesc );
 */
-				}  // end if
+				}
 				else if( controlID == buttonOverwriteCancel )
 				{
 					//GameWindow *buttonFrame  = TheWindowManager->winGetWindowFromId( parent, NAMEKEY( "PopupSaveLoad.wnd:MenuButtonFrame" ) );
@@ -810,9 +804,9 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					updateMenuActions();
 					listboxGames->winEnable( TRUE );
 
-				}  // end else if
+				}
 
-			}  // end else if
+			}
 			else if( controlID == buttonSaveDescConfirm )
 			{
 
@@ -835,7 +829,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 				buttonFrame->winEnable( TRUE );
 				updateMenuActions();
 
-				// close save menuu
+				// close save menu
 				closeSaveMenu( window );
 
 				// get save filename
@@ -859,7 +853,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					filename = selectedGameInfo->filename;
 				TheGameState->saveGame( filename, desc, fileType );
 
-			}  // end else if
+			}
 			else if( controlID == buttonSaveDescCancel )
 			{
 
@@ -876,7 +870,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 				buttonFrame->winEnable( TRUE );
 				updateMenuActions();
 
-			}  // end else if
+			}
 			else if( controlID == buttonLoadConfirm || controlID == buttonLoadCancel )
 			{
 
@@ -893,29 +887,23 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 				buttonFrame->winEnable( TRUE );
 				updateMenuActions();
 
-				
-				
-
 				// do the load game
 				if( controlID == buttonLoadConfirm )
 				{
-					//Moved by Sadullah Nader
-					//moved to fix the 
-					// close save/load layout menu
 					closeSaveMenu( window );
 					doLoadGame();
 				}
 
-			}  // end else if
-	
+			}
+
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
index 87403c40e63..0d387b201c1 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
@@ -28,8 +28,9 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/FramePacer.h"
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
 #include "Common/MessageStream.h"
@@ -53,11 +54,6 @@
 #include "GameClient/DisconnectMenu.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -85,12 +81,12 @@ static NameKeyType buttonSaveLoad = NAMEKEY_INVALID;
 
 static void initGadgetsFullQuit( void )
 {
-	buttonExit = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonExit" ) );
-	buttonRestart = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonRestart" ) );
-	buttonReturn = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonReturn" ) );
-	buttonOptions = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonOptions" ) );
-	buttonSaveLoad = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonSaveLoad" ) );
-	
+	buttonExit = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonExit" );
+	buttonRestart = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonRestart" );
+	buttonReturn = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonReturn" );
+	buttonOptions = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonOptions" );
+	buttonSaveLoad = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonSaveLoad" );
+
 	buttonRestartWin	= TheWindowManager->winGetWindowFromId( NULL, buttonRestart );
 	buttonSaveLoadWin = TheWindowManager->winGetWindowFromId( NULL, buttonSaveLoad );
 	buttonOptionsWin = TheWindowManager->winGetWindowFromId( NULL, buttonOptions );
@@ -99,12 +95,12 @@ static void initGadgetsFullQuit( void )
 
 static void initGadgetsNoSaveQuit( void )
 {
-	buttonExit = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonExit" ) );
-	buttonRestart = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonRestart" ) );
-	buttonReturn = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonReturn" ) );
-	buttonOptions = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonOptions" ) );
+	buttonExit = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonExit" );
+	buttonRestart = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonRestart" );
+	buttonReturn = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonReturn" );
+	buttonOptions = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonOptions" );
 	buttonSaveLoad = NAMEKEY_INVALID;
-	
+
 	buttonRestartWin	= TheWindowManager->winGetWindowFromId( NULL, buttonRestart );
 	buttonOptionsWin = TheWindowManager->winGetWindowFromId( NULL, buttonOptions );
 	buttonSaveLoadWin = NULL;
@@ -132,6 +128,8 @@ void destroyQuitMenu()
 	}
 	quitMenuLayout = NULL;
 	isVisible = FALSE;
+
+	TheInGameUI->setQuitMenuVisible(FALSE);
 }
 
 /**
@@ -141,16 +139,14 @@ static void exitQuitMenu()
 {
   // destroy the quit menu
 	destroyQuitMenu();
-	
+
 	// clear out all the game data
 	if ( TheGameLogic->isInMultiplayerGame() && !TheGameLogic->isInSkirmishGame() && !TheGameInfo->isSandbox() )
 	{
 		GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);
 		msg->appendBooleanArgument(TRUE);
 	}
-	/*GameMessage *msg =*/ TheMessageStream->appendMessage( GameMessage::MSG_CLEAR_GAME_DATA );
-	if ( !TheGameLogic->isInMultiplayerGame() )
-		TheGameLogic->setGamePaused(FALSE);
+	TheGameLogic->exitGame();
 	// TheGameLogic->clearGameData();
 	// display the menu on top of the shell stack
   // TheShell->showShell();
@@ -217,10 +213,10 @@ static void restartMissionMenu()
 	{
 		TheRecorder->stopRecording();
 	}
-	
+
 	Int rankPointsStartedWith = TheGameLogic->getRankPointsToAddAtGameStart();// must write down before reset
 	GameDifficulty diff = TheScriptEngine->getGlobalDifficulty();
-	Int fps = TheGameEngine->getFramesPerSecondLimit();
+	Int fps = TheFramePacer->getFramesPerSecondLimit();
 
 	TheGameLogic->clearGameData(FALSE);
 	TheGameEngine->setQuitting(FALSE);
@@ -238,8 +234,8 @@ static void restartMissionMenu()
 		msg->appendIntegerArgument(diff);
 		msg->appendIntegerArgument(rankPointsStartedWith);
 		msg->appendIntegerArgument(fps);
-		DEBUG_LOG(("Restarting game mode %d, Diff=%d, RankPoints=%d\n", gameMode, 
-																																		TheScriptEngine->getGlobalDifficulty(), 
+		DEBUG_LOG(("Restarting game mode %d, Diff=%d, RankPoints=%d", gameMode,
+																																		TheScriptEngine->getGlobalDifficulty(),
 																																		rankPointsStartedWith)
 							);
 		//if (TheGlobalData->m_fixedSeed >= 0)
@@ -283,14 +279,9 @@ void HideQuitMenu( void )
 //-------------------------------------------------------------------------------------------------
 void ToggleQuitMenu()
 {
-	
-	//Added By Sadullah Nader
-	//Added a check to see if we're not in game yet
 	if (TheGameLogic->isIntroMoviePlaying() || TheGameLogic->isLoadingMap() ||TheScriptEngine->isGameEnding())
 		return;
 
-	//End Add
-
 	// BGC- If we are currently in the disconnect screen, don't let the quit menu come up.
 	if (TheDisconnectMenu != NULL) {
 		if (TheDisconnectMenu->isScreenVisible() == TRUE) {
@@ -305,35 +296,32 @@ void ToggleQuitMenu()
 		WindowLayout *optLayout = TheShell->getOptionsLayout(FALSE);
 		GameWindow *optionsParent = optLayout->getFirstWindow();
 		DEBUG_ASSERTCRASH(optionsParent != NULL, ("Not able to get the options layout parent window"));
-		GameWindow *optionsBack = TheWindowManager->winGetWindowFromId(optionsParent, TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonBack" ) ));
+		GameWindow *optionsBack = TheWindowManager->winGetWindowFromId(optionsParent, TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonBack" ));
 		DEBUG_ASSERTCRASH(optionsBack != NULL, ("Not able to get the back button window from the options menu"));
 		TheWindowManager->winSendSystemMsg(optLayout->getFirstWindow(), GBM_SELECTED, (WindowMsgData)optionsBack, NULL);
 		return;
 	}
-	if ((saveLoadMenuLayout != NULL) && (saveLoadMenuLayout->isHidden() == FALSE)) 
+	if ((saveLoadMenuLayout != NULL) && (saveLoadMenuLayout->isHidden() == FALSE))
 	{
 		GameWindow *saveLoadParent = saveLoadMenuLayout->getFirstWindow();
 		DEBUG_ASSERTCRASH(saveLoadParent != NULL, ("Not able to get the save/load layout parent window"));
-		GameWindow *saveLoadBack = TheWindowManager->winGetWindowFromId(saveLoadParent, TheNameKeyGenerator->nameToKey( AsciiString( "PopupSaveLoad.wnd:ButtonBack" ) ));
+		GameWindow *saveLoadBack = TheWindowManager->winGetWindowFromId(saveLoadParent, TheNameKeyGenerator->nameToKey( "PopupSaveLoad.wnd:ButtonBack" ));
 		DEBUG_ASSERTCRASH(saveLoadBack != NULL, ("Not able to get the back button window from the save/load menu"));
 		TheWindowManager->winSendSystemMsg(saveLoadMenuLayout->getFirstWindow(), GBM_SELECTED, (WindowMsgData)saveLoadBack, NULL);
 		saveLoadMenuLayout = NULL;
 		return;
 	}
-	
+
 	// if we're visable hide our quit menu
 	if(isVisible && quitMenuLayout)
 	{
-		
+
 		isVisible = FALSE;
-		
-		//Added By Sadullah Nader
-		//Bug: When Toggling the quit menu off, the quit confirmation should also go away
+
 		if (quitConfirmationWindow)
 			TheWindowManager->winDestroy(quitConfirmationWindow);
 		quitConfirmationWindow = NULL;
-		//
-		
+
 		if ( !TheGameLogic->isInMultiplayerGame() )
 			TheGameLogic->setGamePaused(FALSE);
 		if(quitMenuLayout && quitMenuLayout == noSaveLoadQuitMenuLayout)
@@ -356,9 +344,7 @@ void ToggleQuitMenu()
 	}
 	else
 	{
-		//Added By Sadullah Nader
-		//Added to compensate for the quit confirmation window pop-up
-		
+
 		TheMouse->setCursor( Mouse::ARROW );
 
 		TheControlBar->hidePurchaseScience();
@@ -366,7 +352,7 @@ void ToggleQuitMenu()
 		{
 			// we don't want to show the save load button.
 			if(!noSaveLoadQuitMenuLayout)
-				noSaveLoadQuitMenuLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/QuitNoSave.wnd" ) );
+				noSaveLoadQuitMenuLayout = TheWindowManager->winCreateLayout( "Menus/QuitNoSave.wnd" );
 			quitMenuLayout = noSaveLoadQuitMenuLayout;
 			initGadgetsNoSaveQuit();
 			TheTransitionHandler->remove("QuitNoSave");
@@ -375,7 +361,7 @@ void ToggleQuitMenu()
 		else
 		{
 			if(!fullQuitMenuLayout)
-				fullQuitMenuLayout= TheWindowManager->winCreateLayout( AsciiString( "Menus/QuitMenu.wnd" ) );
+				fullQuitMenuLayout= TheWindowManager->winCreateLayout( "Menus/QuitMenu.wnd" );
 			quitMenuLayout = fullQuitMenuLayout;
 			initGadgetsFullQuit();
 			TheTransitionHandler->remove("QuitFull");
@@ -390,7 +376,7 @@ void ToggleQuitMenu()
 			TheInGameUI->setQuitMenuVisible(FALSE);
 			return;
 		}
-		
+
 		//quitMenuLayout->hide(FALSE);
 
 		// if we are watching a cinematic, we need to disable the save/load button
@@ -412,9 +398,9 @@ void ToggleQuitMenu()
 			buttonRestartWin->winEnable(TRUE);
 			if (TheGameLogic->isInSkirmishGame() == FALSE) {
 				GadgetButtonSetText(buttonRestartWin, TheGameText->fetch("GUI:Surrender"));
-				
+
 			}
-	
+
 			if (TheGameLogic->isInSkirmishGame() == TRUE) {
 				TheGameLogic->setGamePaused(TRUE);
 			}
@@ -432,7 +418,7 @@ void ToggleQuitMenu()
 			{
 				GadgetButtonSetText(buttonRestartWin, TheGameText->fetch("GUI:RestartMission"));
 				GadgetButtonSetText(buttonExitWin, TheGameText->fetch("GUI:ExitMission"));
-				
+
 			}
 			//if we're not in a multiplayer game, pause the game
 			TheGameLogic->setGamePaused(TRUE);
@@ -447,18 +433,18 @@ void ToggleQuitMenu()
 		TheControlBar->hidePurchaseScience();
 		isVisible = TRUE;
 	}
-		
+
 	TheInGameUI->setQuitMenuVisible(isVisible);
-	
-}  // end ToggleQuitMenu
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Quit menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg,
 																		 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -467,7 +453,7 @@ WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -475,7 +461,7 @@ WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -492,7 +478,7 @@ WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg,
         // now and just using the grey button for the whole save/load button for now
         // during a cinema
         //
-              	
+
 //				SaveLoadLayoutType layoutType = SLLT_SAVE_AND_LOAD;
 
 				//
@@ -507,21 +493,21 @@ WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg,
 
         saveLoadMenuLayout = TheShell->getSaveLoadMenuLayout();
 //				saveLoadMenuLayout->runInit( &layoutType );
-				saveLoadMenuLayout->runInit();				
+				saveLoadMenuLayout->runInit();
 				saveLoadMenuLayout->hide( FALSE );
 				saveLoadMenuLayout->bringForward();
       }
 			else if( controlID == buttonExit )
 			{
         quitConfirmationWindow = QuitMessageBoxYesNo(TheGameText->fetch("GUI:QuitPopupTitle"), TheGameText->fetch("GUI:QuitPopupMessage"),/*quitCallback*/exitQuitMenu,noExitQuitMenu);
-			}  // end if
+			}
 			else if( controlID == buttonReturn )
 			{
-			
+
 				// hide this menu
 				ToggleQuitMenu();
 
-			}  // end else if
+			}
 			else if( buttonOptions == controlID )
 			{
 				WindowLayout *optLayout = TheShell->getOptionsLayout(TRUE);
@@ -540,28 +526,28 @@ WindowMsgHandledType QuitMenuSystem( GameWindow *window, UnsignedInt msg,
 				if ( TheGameLogic->isInMultiplayerGame() )
 				{
 					// we really want to surrender
-					quitConfirmationWindow = MessageBoxYesNo(TheGameText->fetch("GUI:SurrenderConfirmationTitle"), 
+					quitConfirmationWindow = MessageBoxYesNo(TheGameText->fetch("GUI:SurrenderConfirmationTitle"),
 																			TheGameText->fetch("GUI:SurrenderConfirmation"),
 																			/*quitCallback*/surrenderQuitMenu,noExitQuitMenu);
 				}
 				else
 				{
 					//we really want to restart
-					quitConfirmationWindow = MessageBoxYesNo(TheGameText->fetch("GUI:RestartConfirmationTitle"), 
+					quitConfirmationWindow = MessageBoxYesNo(TheGameText->fetch("GUI:RestartConfirmationTitle"),
 																			TheGameText->fetch("GUI:RestartConfirmation"),
 																			/*quitCallback*/restartMissionMenu,noExitQuitMenu);
 				}
-			}  // end else if
+			}
 
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end QuitMenuSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
index 43e2f3793c4..058841715ca 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Lib/BaseType.h"
@@ -45,14 +45,15 @@
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/MessageBox.h"
 #include "GameClient/MapUtil.h"
+#include "GameClient/Mouse.h"
 #include "GameClient/GameText.h"
 #include "GameClient/GameWindowTransitions.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+typedef UnicodeString ReplayName;
+typedef UnicodeString TooltipString;
+typedef std::map<ReplayName, TooltipString> ReplayTooltipMap;
+
+static ReplayTooltipMap replayTooltipCache;
 
 // window ids -------------------------------------------------------------------------------------
 static NameKeyType parentReplayMenuID = NAMEKEY_INVALID;
@@ -75,7 +76,7 @@ static Int	initialGadgetDelay = 2;
 static Bool justEntered = FALSE;
 
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 static GameWindow *buttonAnalyzeReplay = NULL;
 #endif
 
@@ -102,30 +103,164 @@ UnicodeString GetReplayFilenameFromListbox(GameWindow *listbox, Int index)
 	return fname;
 }
 
+//-------------------------------------------------------------------------------------------------
+
+static Bool readReplayMapInfo(const AsciiString& filename, RecorderClass::ReplayHeader &header, ReplayGameInfo &info, const MapMetaData *&mapData)
+{
+	header.forPlayback = FALSE;
+	header.filename = filename;
+
+	if (TheRecorder != NULL && TheRecorder->readReplayHeader(header))
+	{
+		if (ParseAsciiStringToGameInfo(&info, header.gameOptions))
+		{
+			if (TheMapCache != NULL)
+				mapData = TheMapCache->findMap(info.getMap());
+			else
+				mapData = NULL;
+
+			return true;
+		}
+	}
+	return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+static void removeReplayExtension(UnicodeString& replayName)
+{
+	const Int extensionLength = TheRecorder->getReplayExtention().getLength();
+	replayName.truncateBy(extensionLength);
+}
+
+//-------------------------------------------------------------------------------------------------
+
+static UnicodeString createReplayName(const AsciiString& filename)
+{
+	AsciiString lastReplayFName = TheRecorder->getLastReplayFileName();
+	lastReplayFName.concat(TheRecorder->getReplayExtention());
+	UnicodeString replayName;
+
+	if (lastReplayFName.compareNoCase(filename) == 0)
+	{
+		replayName = TheGameText->fetch("GUI:LastReplay");
+	}
+	else
+	{
+		replayName.translate(filename);
+		removeReplayExtension(replayName);
+	}
+	return replayName;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+static UnicodeString createMapName(const AsciiString& filename, const ReplayGameInfo& info, const MapMetaData *mapData)
+{
+	UnicodeString mapName;
+	if (!mapData)
+	{
+		// TheSuperHackers @bugfix helmutbuhler 08/03/2025 Just use the filename.
+		// Displaying a long map path string would break the map list gui.
+		const char* filename = info.getMap().reverseFind('\\');
+		mapName.translate(filename ? filename + 1 : info.getMap());
+	}
+	else
+	{
+		mapName = mapData->m_displayName;
+	}
+	return mapName;
+}
+
+//-------------------------------------------------------------------------------------------------
+// TheSuperHackers @feature Stubbjax 21/10/2025 Show extra info tooltip when hovering over a replay.
+
+static void showReplayTooltip(GameWindow* window, WinInstanceData* instData, UnsignedInt mouse)
+{
+	Int x, y, row, col;
+	x = LOLONGTOSHORT(mouse);
+	y = HILONGTOSHORT(mouse);
+
+	GadgetListBoxGetEntryBasedOnXY(window, x, y, row, col);
+
+	if (row == -1 || col == -1)
+	{
+		TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
+		return;
+	}
+
+	UnicodeString replayFileName = GetReplayFilenameFromListbox(window, row);
+
+	ReplayTooltipMap::const_iterator it = replayTooltipCache.find(replayFileName);
+	if (it != replayTooltipCache.end())
+		TheMouse->setCursorTooltip(it->second, -1, NULL, 1.5f);
+	else
+		TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
+}
+
+static UnicodeString buildReplayTooltip(RecorderClass::ReplayHeader header, ReplayGameInfo info)
+{
+	UnicodeString tooltipStr;
+
+	if (header.endTime < header.startTime)
+		header.startTime = header.endTime;
+
+	time_t totalSeconds = header.endTime - header.startTime;
+	UnsignedInt hours = totalSeconds / 3600;
+	UnsignedInt mins = (totalSeconds % 3600) / 60;
+	UnsignedInt secs = totalSeconds % 60;
+	Real fps = totalSeconds > 0 ? header.frameCount / totalSeconds : 0;
+	tooltipStr.format(L"%02u:%02u:%02u (%g fps)", hours, mins, secs, fps);
+
+	if (header.localPlayerIndex >= 0)
+	{
+		// MP game
+		for (Int i = 0; i < MAX_SLOTS; ++i)
+		{
+			const GameSlot* slot = info.getConstSlot(i);
+			if (slot && slot->isHuman())
+			{
+				tooltipStr.concat(L"\n");
+				tooltipStr.concat(info.getConstSlot(i)->getName());
+			}
+		}
+	}
+
+	return tooltipStr;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Populate the listbox with the names of the available replay files */
 //-------------------------------------------------------------------------------------------------
 void PopulateReplayFileListbox(GameWindow *listbox)
 {
+	replayTooltipCache.clear();
+
 	if (!TheMapCache)
 		return;
-	
+
 	GadgetListBoxReset(listbox);
+	const Int listboxLength = GadgetListBoxGetListLength(listbox);
 
+	// TheSuperHackers @tweak xezon 08/06/2025 Now shows missing maps in red color.
 	enum {
 		COLOR_SP = 0,
 		COLOR_SP_CRC_MISMATCH,
 		COLOR_MP,
 		COLOR_MP_CRC_MISMATCH,
+		COLOR_MISSING_MAP,
+		COLOR_MISSING_MAP_CRC_MISMATCH,
 		COLOR_MAX
 	};
-	Color colors[COLOR_MAX] = {
+	Color colors[] = {
 		GameMakeColor( 255, 255, 255, 255 ),
 		GameMakeColor( 128, 128, 128, 255 ),
 		GameMakeColor( 255, 255, 255, 255 ),
-		GameMakeColor( 128, 128, 128, 255 )
+		GameMakeColor( 128, 128, 128, 255 ),
+		GameMakeColor( 243,  24,  24, 255 ),
+		GameMakeColor( 128,  32,  32, 255 )
 	};
+	static_assert(ARRAY_SIZE(colors) == COLOR_MAX, "Mismatch between colors array size and COLOR_MAX");
 
 	AsciiString asciistr;
 	AsciiString asciisearch;
@@ -135,134 +270,96 @@ void PopulateReplayFileListbox(GameWindow *listbox)
 	FilenameList replayFilenames;
 	FilenameListIter it;
 
-	TheFileSystem->getFileListInDirectory(TheRecorder->getReplayDir(), asciisearch, replayFilenames, TRUE);
+	TheFileSystem->getFileListInDirectory(TheRecorder->getReplayDir(), asciisearch, replayFilenames, FALSE);
 
 	TheMapCache->updateCache();
 
-
 	for (it = replayFilenames.begin(); it != replayFilenames.end(); ++it)
 	{
 		// just want the filename
 		asciistr.set((*it).reverseFind('\\') + 1);
 
-		// lets get some info about the replay
 		RecorderClass::ReplayHeader header;
-		header.forPlayback = FALSE;
-		header.filename = asciistr;
-		Bool success = TheRecorder && TheMapCache && TheRecorder->readReplayHeader( header );
-		if (success)
+		ReplayGameInfo info;
+		const MapMetaData *mapData;
+
+		if (readReplayMapInfo(asciistr, header, info, mapData))
 		{
-			ReplayGameInfo info;
-			if (ParseAsciiStringToGameInfo( &info, header.gameOptions ))
-			{
+			// columns are: name, date, version, map, extra
 
-				// columns are: name, date, version, map, extra
+			// name
+			UnicodeString replayNameToShow = createReplayName(asciistr);
 
-				// name
-				header.replayName.translate(asciistr);
-				for (Int tmp=0; tmp < TheRecorder->getReplayExtention().getLength(); ++tmp)
-					header.replayName.removeLastChar();
+			UnicodeString displayTimeBuffer = getUnicodeTimeBuffer(header.timeVal);
 
-				UnicodeString replayNameToShow = header.replayName;
+			//displayTimeBuffer.format( L"%ls", timeBuffer);
 
-				AsciiString lastReplayFName = TheRecorder->getLastReplayFileName();
-				lastReplayFName.concat(TheRecorder->getReplayExtention());
-				if (lastReplayFName.compareNoCase(asciistr) == 0)
-					replayNameToShow = TheGameText->fetch("GUI:LastReplay");
+			// version (no-op)
 
-				UnicodeString displayTimeBuffer = getUnicodeTimeBuffer(header.timeVal);
+			// map
+			UnicodeString mapStr = createMapName(asciistr, info, mapData);
 
-				//displayTimeBuffer.format( L"%ls", timeBuffer);
+			// tooltip
+			UnicodeString tooltipStr = buildReplayTooltip(header, info);
 
-				// version (no-op)
+			UnicodeString key;
+			key.translate(asciistr);
+			replayTooltipCache[key] = tooltipStr;
 
-				// map
-				UnicodeString mapStr;
-				const MapMetaData *md = TheMapCache->findMap(info.getMap());
-				if (!md)
+			// pick a color
+			Color color;
+			Color mapColor;
+
+			const Bool hasMap = mapData != NULL;
+
+			const Bool isCrcCompatible = RecorderClass::replayMatchesGameVersion(header);
+
+			if (isCrcCompatible)
+			{
+				if (header.localPlayerIndex >= 0)
 				{
-					// TheSuperHackers @bugfix helmutbuhler 08/03/2025 Just use the filename.
-					// Displaying a long map path string would break the map list gui.
-					const char* filename = info.getMap().reverseFind('\\');
-					mapStr.translate(filename ? filename + 1 : info.getMap());
+					// MP
+					color = colors[COLOR_MP];
 				}
 				else
 				{
-					mapStr = md->m_displayName;
+					// SP
+					color = colors[COLOR_SP];
 				}
 
-//				// extra
-//				UnicodeString extraStr;
-//				if (header.localPlayerIndex >= 0)
-//				{
-//					// MP game
-//					time_t totalSeconds = header.endTime - header.startTime;
-//					Int mins = totalSeconds/60;
-//					Int secs = totalSeconds%60;
-//					Real fps = header.frameDuration/totalSeconds;
-//					extraStr.format(L"%d:%d (%g fps) %hs", mins, secs, fps, header.desyncGame?"OOS ":"");
-//
-//					for (Int i=0; i<MAX_SLOTS; ++i)
-//					{
-//						const GameSlot *slot = info.getConstSlot(i);
-//						if (slot && slot->isHuman())
-//						{
-//							if (i)
-//								extraStr.concat(L", ");
-//							if (header.playerDiscons[i])
-//								extraStr.concat(L'*');
-//							extraStr.concat(info.getConstSlot(i)->getName());
-//						}
-//					}
-//				}
-//				else
-//				{
-//					// solo game
-//					time_t totalSeconds = header.endTime - header.startTime;
-//					Int mins = totalSeconds/60;
-//					Int secs = totalSeconds%60;
-//					Real fps = header.frameDuration/totalSeconds;
-//					extraStr.format(L"%d:%d (%g fps)", mins, secs, fps);
-//				}
-
-				// pick a color
-				Color color;
-				if (header.versionString == TheVersion->getUnicodeVersion() && header.versionNumber == TheVersion->getVersionNumber() &&
-					header.exeCRC == TheGlobalData->m_exeCRC && header.iniCRC == TheGlobalData->m_iniCRC)
+				if (hasMap)
+					mapColor = color;
+				else
+					mapColor = colors[COLOR_MISSING_MAP];
+			}
+			else
+			{
+				if (header.localPlayerIndex >= 0)
 				{
-					// good version
-					if (header.localPlayerIndex >= 0)
-					{
-						// MP
-						color = colors[COLOR_MP];
-					}
-					else
-					{
-						// SP
-						color = colors[COLOR_SP];
-					}
+					// MP
+					color = colors[COLOR_MP_CRC_MISMATCH];
 				}
 				else
 				{
-					// bad version
-					if (header.localPlayerIndex >= 0)
-					{
-						// MP
-						color = colors[COLOR_MP_CRC_MISMATCH];
-					}
-					else
-					{
-						// SP
-						color = colors[COLOR_SP_CRC_MISMATCH];
-					}
+					// SP
+					color = colors[COLOR_SP_CRC_MISMATCH];
 				}
-				
-				Int insertionIndex = GadgetListBoxAddEntryText(listbox, replayNameToShow, color, -1, 0);
-				GadgetListBoxAddEntryText(listbox, displayTimeBuffer, color, insertionIndex, 1);
-				GadgetListBoxAddEntryText(listbox, header.versionString, color, insertionIndex, 2);
-				GadgetListBoxAddEntryText(listbox, mapStr, color, insertionIndex, 3);
-				//GadgetListBoxAddEntryText(listbox, extraStr, color, insertionIndex, 4);
+
+				if (hasMap)
+					mapColor = color;
+				else
+					mapColor = colors[COLOR_MISSING_MAP_CRC_MISMATCH];
 			}
+
+			const Int insertionIndex = GadgetListBoxAddEntryText(listbox, replayNameToShow, color, -1, 0);
+			DEBUG_ASSERTCRASH(insertionIndex >= 0, ("Expects valid index"));
+			GadgetListBoxAddEntryText(listbox, displayTimeBuffer, color, insertionIndex, 1);
+			GadgetListBoxAddEntryText(listbox, header.versionString, color, insertionIndex, 2);
+			GadgetListBoxAddEntryText(listbox, mapStr, mapColor, insertionIndex, 3);
+
+			// TheSuperHackers @performance Now stops processing when the list is full.
+			if (insertionIndex == listboxLength - 1)
+				break;
 		}
 	}
 	GadgetListBoxSetSelected(listbox, 0);
@@ -276,17 +373,18 @@ void ReplayMenuInit( WindowLayout *layout, void *userData )
 	TheShell->showShellMap(TRUE);
 
 	// get ids for our children controls
-	parentReplayMenuID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ParentReplayMenu") );
-	buttonLoadID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonLoadReplay") );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonBack") );
-	listboxReplayFilesID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ListboxReplayFiles") );
-	buttonDeleteID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonDeleteReplay") );
-	buttonCopyID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonCopyReplay") );
+	parentReplayMenuID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ParentReplayMenu" );
+	buttonLoadID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonLoadReplay" );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonBack" );
+	listboxReplayFilesID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ListboxReplayFiles" );
+	buttonDeleteID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonDeleteReplay" );
+	buttonCopyID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonCopyReplay" );
 
 	parentReplayMenu = TheWindowManager->winGetWindowFromId( NULL, parentReplayMenuID );
 	buttonLoad = TheWindowManager->winGetWindowFromId( parentReplayMenu, buttonLoadID );
 	buttonBack = TheWindowManager->winGetWindowFromId( parentReplayMenu, buttonBackID );
 	listboxReplayFiles = TheWindowManager->winGetWindowFromId( parentReplayMenu, listboxReplayFilesID );
+	listboxReplayFiles->winSetTooltipFunc(showReplayTooltip);
 	buttonDelete = TheWindowManager->winGetWindowFromId( parentReplayMenu, buttonDeleteID );
 	buttonCopy = TheWindowManager->winGetWindowFromId( parentReplayMenu, buttonCopyID );
 
@@ -294,16 +392,16 @@ void ReplayMenuInit( WindowLayout *layout, void *userData )
 	GadgetListBoxReset(listboxReplayFiles);
 	PopulateReplayFileListbox(listboxReplayFiles);
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	WinInstanceData instData;
 	instData.init();
 	BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK );
 	instData.m_textLabelString = "Debug: Analyze Replay";
-	instData.setTooltipText(UnicodeString(L"Only Used in Debug and Internal!"));
-	buttonAnalyzeReplay = TheWindowManager->gogoGadgetPushButton( parentReplayMenu, 
-																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE, 
-																									 4, 4, 
-																									 180, 26, 
+	instData.setTooltipText(L"Only Used in Debug and Internal!");
+	buttonAnalyzeReplay = TheWindowManager->gogoGadgetPushButton( parentReplayMenu,
+																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
+																									 4, 4,
+																									 180, 26,
 																									 &instData, NULL, TRUE );
 #endif
 
@@ -319,7 +417,7 @@ void ReplayMenuInit( WindowLayout *layout, void *userData )
 		win->winHide(TRUE);
 	isShuttingDown = FALSE;
 
-}  // end ReplayMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu shutdown method */
@@ -335,12 +433,12 @@ void ReplayMenuShutdown( WindowLayout *layout, void *userData )
 		TheShell->shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	// our shutdown is complete
 	TheTransitionHandler->reverse("ReplayMenuFade");
 	isShuttingDown = TRUE;
-}  // end ReplayMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu update method */
@@ -364,11 +462,11 @@ void ReplayMenuUpdate( WindowLayout *layout, void *userData )
 		copyReplay();
 	if(callDelete)
 		deleteReplay();
-		// We'll only be successful if we've requested to 
+		// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished()&& TheTransitionHandler->isFinished())
 		TheShell->shutdownComplete( layout );
 
-}  // end ReplayMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Replay menu input callback */
@@ -377,7 +475,7 @@ WindowMsgHandledType ReplayMenuInput( GameWindow *window, UnsignedInt msg,
 																						WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -392,7 +490,7 @@ WindowMsgHandledType ReplayMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -400,25 +498,25 @@ WindowMsgHandledType ReplayMenuInput( GameWindow *window, UnsignedInt msg,
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end ReplayMenuInput
+}
 
 void reallyLoadReplay(void)
 {
@@ -441,7 +539,7 @@ void reallyLoadReplay(void)
 	if(parentReplayMenu != NULL)
 	{
 		parentReplayMenu->winHide(TRUE);
-	}	
+	}
 }
 
 static void loadReplay(UnicodeString filename)
@@ -449,8 +547,32 @@ static void loadReplay(UnicodeString filename)
 	AsciiString asciiFilename;
 	asciiFilename.translate(filename);
 
-	if(!TheRecorder->replayMatchesGameVersion(asciiFilename))
+	RecorderClass::ReplayHeader header;
+	ReplayGameInfo info;
+	const MapMetaData *mapData;
+
+	if(!readReplayMapInfo(asciiFilename, header, info, mapData))
+	{
+		// TheSuperHackers @bugfix Prompts a message box when the replay was deleted by the user while the Replay Menu was opened.
+
+		UnicodeString title = TheGameText->FETCH_OR_SUBSTITUTE("GUI:ReplayFileNotFoundTitle", L"REPLAY NOT FOUND");
+		UnicodeString body = TheGameText->FETCH_OR_SUBSTITUTE("GUI:ReplayFileNotFound", L"This replay cannot be loaded because the file no longer exists on this device.");
+
+		MessageBoxOk(title, body, NULL);
+	}
+	else if(mapData == NULL)
+	{
+		// TheSuperHackers @bugfix Prompts a message box when the map used by the replay was not found.
+
+		UnicodeString title = TheGameText->FETCH_OR_SUBSTITUTE("GUI:ReplayMapNotFoundTitle", L"MAP NOT FOUND");
+		UnicodeString body = TheGameText->FETCH_OR_SUBSTITUTE("GUI:ReplayMapNotFound", L"This replay cannot be loaded because the map was not found on this device.");
+
+		MessageBoxOk(title, body, NULL);
+	}
+	else if(!TheRecorder->replayMatchesGameVersion(header))
 	{
+		// Pressing OK loads the replay.
+
 		MessageBoxOkCancel(TheGameText->fetch("GUI:OlderReplayVersionTitle"), TheGameText->fetch("GUI:OlderReplayVersion"), reallyLoadReplay, NULL);
 	}
 	else
@@ -467,21 +589,21 @@ static void loadReplay(UnicodeString filename)
 //-------------------------------------------------------------------------------------------------
 /** single player menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
 
-			
+
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -489,7 +611,7 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -501,13 +623,13 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 		//---------------------------------------------------------------------------------------------
 		case GLM_DOUBLE_CLICKED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxReplayFilesID ) 
+				if( controlID == listboxReplayFilesID )
 				{
 					int rowSelected = mData2;
 
@@ -526,7 +648,7 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 			if( controlID == buttonAnalyzeReplay->winGetWindowId() )
 			{
 				if(listboxReplayFiles)
@@ -535,7 +657,7 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 					GadgetListBoxGetSelected( listboxReplayFiles,  &selected );
 					if(selected < 0)
 					{
-						MessageBoxOk(UnicodeString(L"Blah Blah"),UnicodeString(L"Please select something munkee boy"), NULL);
+						MessageBoxOk(L"Blah Blah",L"Please select something munkee boy", NULL);
 						break;
 					}
 
@@ -548,11 +670,11 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 						do
 						{
 							TheRecorder->update();
-						} while (TheRecorder->isAnalysisInProgress());
+						} while (TheRecorder->isPlaybackInProgress());
 					}
 				}
 			}
-			else 
+			else
 #endif
 			if( controlID == buttonLoadID )
 			{
@@ -569,14 +691,14 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 					filename = GetReplayFilenameFromListbox(listboxReplayFiles, selected);
 					loadReplay(filename);
 				}
-			}  // end else if
+			}
 			else if( controlID == buttonBackID )
 			{
 
 				// thou art directed to return to thy known solar system immediately!
 				TheShell->pop();
 
-			}  // end else if
+			}
 			else if( controlID == buttonDeleteID )
 			{
 				Int selected;
@@ -602,14 +724,14 @@ WindowMsgHandledType ReplayMenuSystem( GameWindow *window, UnsignedInt msg,
 				MessageBoxYesNo(TheGameText->fetch("GUI:CopyReplay"), TheGameText->fetch("GUI:AreYouSureCopy"), copyReplayFlag, NULL);
 			}
 			break;
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
-}  // end ReplayMenuSystem
+}
 
 void deleteReplay( void )
 {
@@ -654,7 +776,7 @@ void copyReplay( void )
 	filename = TheRecorder->getReplayDir();
 	translate.translate(GetReplayFilenameFromListbox(listboxReplayFiles, selected));
 	filename.concat(translate);
-	
+
 	char path[1024];
 	LPITEMIDLIST pidl;
 	SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOPDIRECTORY, &pidl);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
index 786ba75d532..d1edfbd099f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ScoreScreen.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jun 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ScoreScreen.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Gui callbacks for the Score Screen
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioAffect.h"
 #include "Common/AudioEventRTS.h"
@@ -67,6 +67,7 @@
 #include "Common/PlayerTemplate.h"
 #include "Common/RandomValue.h"
 #include "Common/Recorder.h"
+#include "Common/ReplaySimulation.h"
 #include "Common/ScoreKeeper.h"
 #include "Common/SkirmishBattleHonors.h"
 #include "Common/ThingFactory.h"
@@ -81,6 +82,7 @@
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/Gadget.h"
 #include "GameClient/GameText.h"
+#include "GameClient/Keyboard.h"
 #include "GameClient/MapUtil.h"
 #include "GameClient/Shell.h"
 #include "GameClient/KeyDefs.h"
@@ -100,11 +102,6 @@
 #include "GameClient/InGameUI.h"
 #include "GameClient/ChallengeGenerals.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -201,8 +198,8 @@ void startNextCampaignGame(void)
 	TheWritableGlobalData->m_pendingFile = TheCampaignManager->getCurrentMap();
 	if (TheCampaignManager->getCurrentCampaign() && TheCampaignManager->getCurrentCampaign()->isChallengeCampaign())
 	{
-		DEBUG_ASSERTCRASH( TheChallengeGameInfo, ("TheChallengeGameInfo doesn't exist.\n") );
-		TheChallengeGameInfo->init();  
+		DEBUG_ASSERTCRASH( TheChallengeGameInfo, ("TheChallengeGameInfo doesn't exist.") );
+		TheChallengeGameInfo->init();
 		TheChallengeGameInfo->clearSlotList();
 		TheChallengeGameInfo->reset();
 		TheChallengeGameInfo->enterGame();
@@ -214,7 +211,7 @@ void startNextCampaignGame(void)
 		slot.setState(SLOT_PLAYER, playerTemplate->getDisplayName());
 		slot.setPlayerTemplate(templateNum);
 		TheChallengeGameInfo->setSlot(0, slot);
-		
+
 		if (TheGameLogic->isInGame())
 			TheGameLogic->clearGameData();
 	}
@@ -224,7 +221,7 @@ void startNextCampaignGame(void)
 	msg->appendIntegerArgument(GAME_SINGLE_PLAYER);
 	msg->appendIntegerArgument(TheCampaignManager->getGameDifficulty());
 	msg->appendIntegerArgument(TheCampaignManager->getRankPoints());
-	
+
 	InitRandom(0);
 }
 
@@ -261,29 +258,29 @@ void ScoreScreenInit( WindowLayout *layout, void *userData )
 {
 	//Play music after subsystems get reset including the audio...
 	g_playMusic = TRUE;
-	
+
 	if (TheGameSpyInfo)
 	{
-		DEBUG_LOG(("ScoreScreenInit(): TheGameSpyInfo->stuff(%s/%s/%s)\n", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
+		DEBUG_LOG(("ScoreScreenInit(): TheGameSpyInfo->stuff(%s/%s/%s)", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
 	}
 
 	DontShowMainMenu = TRUE; //KRIS
 	buttonIsFinishCampaign = FALSE;
 
 	//Store the keys so we have them later
-	parentID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ParentScoreScreen" ) );
-	buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonOk" ) );
-	textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:TextEntryChat" ) );
-	buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonEmote" ) );
-	listboxChatWindowScoreScreenID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ListboxChatWindowScoreScreen" ) );
-	listboxAcademyWindowScoreScreenID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ListboxWarschoolAdvice" ) );
-	staticTextAcademyTitleID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:StaticTextWarSchool" ) );
-//	buttonRehostID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonRehost" ) );
-	chatBoxBorderID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ChatBoxBorder" ) );
-	buttonBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonBuddy" ) );
-	buttonContinueID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonContinue" ) );
-	buttonSaveReplayID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonSaveReplay" ) );
-	backdropID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:MainBackdrop" ) );
+	parentID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ParentScoreScreen" );
+	buttonOkID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonOk" );
+	textEntryChatID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:TextEntryChat" );
+	buttonEmoteID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonEmote" );
+	listboxChatWindowScoreScreenID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ListboxChatWindowScoreScreen" );
+	listboxAcademyWindowScoreScreenID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ListboxWarschoolAdvice" );
+	staticTextAcademyTitleID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:StaticTextWarSchool" );
+//	buttonRehostID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonRehost" );
+	chatBoxBorderID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ChatBoxBorder" );
+	buttonBuddiesID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonBuddy" );
+	buttonContinueID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonContinue" );
+	buttonSaveReplayID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonSaveReplay" );
+	backdropID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:MainBackdrop" );
 
 	parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	buttonOk = TheWindowManager->winGetWindowFromId( parent, buttonOkID );
@@ -381,7 +378,7 @@ void ScoreScreenInit( WindowLayout *layout, void *userData )
 		s_blankLayout->hide(FALSE);
 		s_blankLayout->bringForward();
 	}
-	
+
 }
 
 void FixupScoreScreenMovieWindow( void )
@@ -425,14 +422,14 @@ void ScoreScreenUpdate( WindowLayout * layout, void *userData)
 		finishSinglePlayerInit();
 		s_needToFinishSinglePlayerInit = FALSE;
 	}
-	
+
 	//TheGameLogic->clearGameData() gets called after ScoreScreenInit and before the
 	//first ScoreScreenUpdate(), so it was creatively moved here so we can actually
 	//hear the music play.
 	if( TheGameInfo && g_playMusic )
 	{
 		g_playMusic = FALSE;
-		
+
 		GameSlot *lSlot = TheGameInfo->getSlot(TheGameInfo->getLocalSlotNum());
 		const PlayerTemplate* pt;
 
@@ -447,7 +444,7 @@ void ScoreScreenUpdate( WindowLayout * layout, void *userData)
 			AudioEventRTS event( musicName );
 			event.setShouldFade( TRUE );
 			TheAudio->addAudioEvent( &event );
-			TheAudio->update();//Since GameEngine::update() is suspended until after I am gone... 
+			TheAudio->update();//Since GameEngine::update() is suspended until after I am gone...
 		}
 
 
@@ -460,7 +457,7 @@ WindowMsgHandledType ScoreScreenInput( GameWindow *window, UnsignedInt msg,
 																		WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -475,7 +472,7 @@ WindowMsgHandledType ScoreScreenInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -483,34 +480,42 @@ WindowMsgHandledType ScoreScreenInput( GameWindow *window, UnsignedInt msg,
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)buttonOk, buttonOkID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end MainMenuInput
+}
+
+static Bool showReplayButtonContinue()
+{
+	bool hasSimulationReplay = ReplaySimulation::getReplayCount() > 0;
+	bool isLastSimulationReplay = ReplaySimulation::getCurrentReplayIndex() == ReplaySimulation::getReplayCount()-1;
+
+	return hasSimulationReplay && !isLastSimulationReplay;
+}
 
 /** System Function for the ScoreScreen */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
-	switch( msg ) 
+	switch( msg )
 	{
 		// --------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -527,7 +532,7 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 				*(Bool *)mData2 = TRUE;
 
 			break;
-		}  // end input
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -541,27 +546,40 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 			{
 				TheShell->pop();
 				TheCampaignManager->setCampaign(AsciiString::TheEmptyString);
+
+				if ( ReplaySimulation::getReplayCount() > 0 )
+				{
+					ReplaySimulation::stop();
+					TheGameEngine->setQuitting(TRUE);
+				}
 			}
-			else if ( controlID == buttonContinueID )	
+			else if ( controlID == buttonContinueID )
 			{
-				if(!buttonIsFinishCampaign)
-					ReplayWasPressed = TRUE;
-				if( screenType == SCORESCREEN_SINGLEPLAYER)	
+				if( ReplaySimulation::getReplayCount() > 0 )
 				{
-					AsciiString mapName = TheCampaignManager->getCurrentMap();
-
-					if( mapName.isEmpty() )
-					{
-						ReplayWasPressed = FALSE;
-						TheShell->pop();
-					}
-					else
+					TheGameEngine->setQuitting(TRUE);
+				}
+				else
+				{
+					if(!buttonIsFinishCampaign)
+						ReplayWasPressed = TRUE;
+					if( screenType == SCORESCREEN_SINGLEPLAYER)
 					{
-						CheckForCDAtGameStart( startNextCampaignGame );
+						AsciiString mapName = TheCampaignManager->getCurrentMap();
+
+						if( mapName.isEmpty() )
+						{
+							ReplayWasPressed = FALSE;
+							TheShell->pop();
+						}
+						else
+						{
+							CheckForCDAtGameStart( startNextCampaignGame );
+						}
 					}
 				}
 			}
-			else if ( controlID == buttonBuddiesID )	
+			else if ( controlID == buttonBuddiesID )
 			{
 				GameSpyToggleOverlay( GSOVERLAY_BUDDY );
 			}
@@ -569,7 +587,7 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 			{
 				ScoreScreenEnableControls(FALSE);
         WindowLayout *saveReplayLayout = TheShell->getPopupReplayLayout();
-				DEBUG_ASSERTCRASH( saveReplayLayout, ("Unable to get save replay menu layout.\n") );
+				DEBUG_ASSERTCRASH( saveReplayLayout, ("Unable to get save replay menu layout.") );
 				saveReplayLayout->runInit();
 				saveReplayLayout->hide( FALSE );
 				saveReplayLayout->bringForward();
@@ -588,7 +606,7 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 					if(TheLAN)
 						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_EMOTE);
 					//add the gamespy chat request here
-			} //if ( controlID == buttonEmote )
+			}
 			for(Int i = 0; i < MAX_SLOTS; ++i)
 			{
 				AsciiString name;
@@ -615,13 +633,13 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 						req.arg.addbuddy.id = playerID;
 						UnicodeString buddyAddstr;
 						buddyAddstr = TheGameText->fetch("GUI:BuddyAddReq");
-						wcsncpy(req.arg.addbuddy.text, buddyAddstr.str(), MAX_BUDDY_CHAT_LEN);
-						req.arg.addbuddy.text[MAX_BUDDY_CHAT_LEN-1] = 0;
+						wcslcpy(req.arg.addbuddy.text, buddyAddstr.str(), MAX_BUDDY_CHAT_LEN);
 						TheGameSpyBuddyMessageQueue->addRequest(req);
 					}
-					break;
 				}
 			}
+
+			break;
 		}
 
 		case GEM_EDIT_DONE:
@@ -633,7 +651,7 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 			// send it to the other clients on the lan
 			if ( controlID == textEntryChatID )
 			{
-				
+
 				// read the user's input
 				txtInput.set(GadgetTextEntryGetText( textEntryChat ));
 				// Clear the text entry line
@@ -646,9 +664,11 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 						TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_NORMAL);
 					//add the gamespy chat request here
 
-			}// if ( controlID == textEntryChatID )
+			}
+
+			break;
 		}
-	}		
+	}
 	return MSG_HANDLED;
 }
 
@@ -691,8 +711,8 @@ void PlayMovieAndBlock(AsciiString movieTitle)
 
 	// Create the new buffer
 	VideoBuffer *videoBuffer = TheDisplay->createVideoBuffer();
-	if (	videoBuffer == NULL || 
-				!videoBuffer->allocate(	videoStream->width(), 
+	if (	videoBuffer == NULL ||
+				!videoBuffer->allocate(	videoStream->width(),
 													videoStream->height())
 		)
 	{
@@ -700,16 +720,33 @@ void PlayMovieAndBlock(AsciiString movieTitle)
 		videoBuffer = NULL;
 
 		if ( videoStream )
+		{
 			videoStream->close();
-		videoStream = NULL;
+			videoStream = NULL;
+		}
 
 		return;
 	}
 
+	// TheSuperHackers @bugfix Originally this movie render loop stopped rendering when the game window was inactive.
+	// This either skipped the movie or caused decompression artifacts. Now the video just keeps playing until it done.
+
 	GameWindow *movieWindow = s_blankLayout->getFirstWindow();
 	TheWritableGlobalData->m_loadScreenRender = TRUE;
 	while (videoStream->frameIndex() < videoStream->frameCount() - 1)
 	{
+		// TheSuperHackers @feature User can now skip video by pressing ESC
+		if (TheKeyboard)
+		{
+			TheKeyboard->UPDATE();
+			KeyboardIO *io = TheKeyboard->findKey(KEY_ESC, KeyboardIO::STATUS_UNUSED);
+			if (io && BitIsSet(io->state, KEY_STATE_DOWN))
+			{
+				io->setUsed();
+				break;
+			}
+		}
+
 		TheGameEngine->serviceWindowsOS();
 
 		if(!videoStream->isFrameReady())
@@ -718,13 +755,6 @@ void PlayMovieAndBlock(AsciiString movieTitle)
 			continue;
 		}
 
-		if (!TheGameEngine->isActive())
-		{	//we are alt-tabbed out, so just increment the frame
-			videoStream->frameNext();
-			videoStream->frameDecompress();
-			continue;
-		}
-		
 		videoStream->frameDecompress();
 		videoStream->frameRender(videoBuffer);
 		videoStream->frameNext();
@@ -738,11 +768,10 @@ void PlayMovieAndBlock(AsciiString movieTitle)
 	}
 	TheWritableGlobalData->m_loadScreenRender = FALSE;
 	movieWindow->winGetInstanceData()->setVideoBuffer(NULL);
-	if (videoBuffer)
-	{
-		delete videoBuffer;
-		videoBuffer = NULL;
-	}
+
+	delete videoBuffer;
+	videoBuffer = NULL;
+
 	if (videoStream)
 	{
 		videoStream->close();
@@ -770,7 +799,7 @@ void displayChallengeWinLoss( const Image *imageGeneral, const UnicodeString str
 {
 	// format the display for challenge mode win/loss
 	backdrop->winHide(TRUE);
-	gadgetParent->winHide(TRUE);	
+	gadgetParent->winHide(TRUE);
 	challengeWinLossText->winHide(FALSE);
 	challengeRemarks->winHide(FALSE);
 	challengePortrait->winHide(FALSE);
@@ -879,7 +908,7 @@ void finishSinglePlayerInit( void )
 						if (!TheGameLODManager->didMemPass()) {
 							useLowRes = TRUE;
 						}
-						if (TheGameLODManager->findStaticLODLevel()==STATIC_GAME_LOD_LOW) {
+						if (TheGameLODManager->getRecommendedStaticLODLevel()==STATIC_GAME_LOD_LOW) {
 							useLowRes = TRUE;
 						}
 						if (TheGameLODManager->getStaticLODLevel()==STATIC_GAME_LOD_LOW) {
@@ -891,10 +920,10 @@ void finishSinglePlayerInit( void )
 				}
 			}
 		}
-		else 
+		else
 		{
 			GadgetButtonSetText(buttonContinue, TheGameText->fetch("GUI:SaveAndContinue"));
-			
+
 			// auto save game
 			TheGameState->missionSave();
 			if(staticTextGameSaved)
@@ -924,12 +953,8 @@ void finishSinglePlayerInit( void )
 
 	}
 
-	//Added By Sadullah Nader
-	//Fix for the black screen text that appears after loading sequence
-
 	TheInGameUI->freeMessageResources();
 
-	//
 	if (s_blankLayout)
 	{
 		s_blankLayout->destroyWindows();
@@ -984,7 +1009,7 @@ void initReplaySinglePlayer( void )
 	if (chatBoxBorder)
 		chatBoxBorder->winHide(TRUE);
 	if (buttonContinue)
-		buttonContinue->winHide(TRUE);
+		buttonContinue->winHide(!showReplayButtonContinue());
 	if (buttonBuddies)
 		buttonBuddies->winHide(TRUE);
 	if (listboxChatWindowScoreScreen)
@@ -1045,7 +1070,7 @@ void initInternetMultiPlayer(void)
 		buttonEmote->winHide(TRUE);
 	if (listboxChatWindowScoreScreen)
 		listboxChatWindowScoreScreen->winHide(FALSE);
-	
+
 	//Provide academy advice in internet games.
 	if( listboxAcademyWindowScoreScreen )
 		listboxAcademyWindowScoreScreen->winHide( FALSE );
@@ -1091,7 +1116,7 @@ void initReplayMultiPlayer(void)
 	if (chatBoxBorder)
 		chatBoxBorder->winHide(TRUE);
 	if (buttonContinue)
-		buttonContinue->winHide(TRUE);
+		buttonContinue->winHide(!showReplayButtonContinue());
 	if (buttonBuddies)
 		buttonBuddies->winHide(TRUE);
 //	if (buttonRehost)
@@ -1116,7 +1141,7 @@ static Bool isSlotLocalAlly(GameInfo *game, const GameSlot *slot)
 
 static void updateSkirmishBattleHonors(SkirmishBattleHonors& stats)
 {
-	DEBUG_LOG(("Updating Skirmish battle honors\n"));
+	DEBUG_LOG(("Updating Skirmish battle honors"));
 	Player *localPlayer = ThePlayerList->getLocalPlayer();
 	ScoreKeeper *s = localPlayer->getScoreKeeper();
 
@@ -1250,7 +1275,7 @@ static void updateSkirmishBattleHonors(SkirmishBattleHonors& stats)
 
 static void updateMPBattleHonors(Int& honors, PSPlayerStats& stats)
 {
-	DEBUG_LOG(("Updating MP battle honors\n"));
+	DEBUG_LOG(("Updating MP battle honors"));
 	Player *localPlayer = ThePlayerList->getLocalPlayer();
 	ScoreKeeper *s = localPlayer->getScoreKeeper();
 
@@ -1393,7 +1418,7 @@ static inline int CheckForApocalypse( ScoreKeeper *s, const char* szWeapon )
 //-------------------------------------------------------------------------------------------------
 void populatePlayerInfo( Player *player, Int pos)
 {
-	if(!player || pos > MAX_SLOTS)
+	if(!player || pos < 0 || pos >= MAX_SLOTS)
 		return;
 	Color color = player->getPlayerColor();
 	ScoreKeeper *scoreKpr = player->getScoreKeeper();
@@ -1478,15 +1503,6 @@ void populatePlayerInfo( Player *player, Int pos)
 	win->winSetEnabledTextColors(color, win->winGetEnabledTextBorderColor());
 	win->winHide(FALSE);
 
-	// set the total BuildingsDestroyed
-	winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", pos);
-	win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
-	DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
-	winValue.format(L"%d", scoreKpr->getTotalBuildingsDestroyed());
-	GadgetStaticTextSetText(win, winValue);
-	win->winSetEnabledTextColors(color, win->winGetEnabledTextBorderColor());
-	win->winHide(FALSE);
-
 	// set the total Resources
 	winName.format("ScoreScreen.wnd:StaticTextResources%d", pos);
 	win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
@@ -1535,14 +1551,14 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 	//	if(screenType ==	SCORESCREEN_INTERNET && TheGameSpyInfo && TheGameSpyInfo->getLocalProfileID() != 0)
 	//	{
 	//		// Get the stats for the player
-	//		
+	//
 	//		AsciiString aName;
 	//		aName.translate(player->getPlayerDisplayName());
 	//
 	//		PlayerInfoMap::iterator blah = TheGameSpyInfo->getPlayerInfoMap()->find(aName);
 	//		if(blah->second.m_profileID != 0)
 	//		{
-	//			
+	//
 	//			BuddyInfoMap::iterator bIt = TheGameSpyInfo->getBuddyMap()->find(blah->second.m_profileID);
 	//			if(bIt !=  TheGameSpyInfo->getBuddyMap()->end()  || (TheGameSpyInfo->getLocalProfileID() == blah->second.m_profileID))
 	//			{
@@ -1551,7 +1567,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 	//			}
 	//			else
 	//			{
-	//		
+	//
 	//				GadgetButtonSetData(win, (void *) blah->second.m_profileID);
 	//				win->winEnable(TRUE);
 	//				win->winHide(FALSE);
@@ -1564,7 +1580,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 	//	{
 	//		win->winHide(TRUE);
 	//	}
-	
+
 
 	// set a marker for who won and lost
 	winName.format("ScoreScreen.wnd:GameWindowWinner%d", pos);
@@ -1583,7 +1599,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 	{
 		win->winSetEnabledImage(0, fact->getSideIconImage());
 	}
-	
+
 
 	if ( screenType == SCORESCREEN_SKIRMISH && player->isLocalPlayer() )
 	{
@@ -1592,7 +1608,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 			// If we died, and are watching sparring AIs, we still get the loss.
 			if (player->isPlayerActive())
 			{
-				DEBUG_LOG(("Skipping skirmish stats update: sandbox:%d defeat:%d victory:%d\n",
+				DEBUG_LOG(("Skipping skirmish stats update: sandbox:%d defeat:%d victory:%d",
 					TheGameInfo->isSandbox(), TheVictoryConditions->isLocalAlliedDefeat(), TheVictoryConditions->isLocalAlliedVictory()));
 				return;
 			}
@@ -1632,7 +1648,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 
 	if ( screenType == SCORESCREEN_INTERNET )
 	{
-		DEBUG_LOG(("populatePlayerInfo() - SCORESCREEN_INTERNET\n"));
+		DEBUG_LOG(("populatePlayerInfo() - SCORESCREEN_INTERNET"));
 		if (TheGameSpyGame && !TheGameSpyGame->getUseStats()
 		 && !TheGameSpyGame->isQMGame() )  //QuickMatch games always record stats
 			return;	//the host has requested not to record stats for this game.
@@ -1649,7 +1665,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					if (TheVictoryConditions->amIObserver())
 					{
 						// nothing to track
-						DEBUG_LOG(("populatePlayerInfo() - not tracking stats for observer\n"));
+						DEBUG_LOG(("populatePlayerInfo() - not tracking stats for observer"));
 						return;
 					}
 
@@ -1684,28 +1700,28 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 							}
 						}
 					}
-					DEBUG_LOG(("Game ended on frame %d - TheGameLogic->getFrame()=%d\n", lastFrameOfGame-1, TheGameLogic->getFrame()-1));
+					DEBUG_LOG(("Game ended on frame %d - TheGameLogic->getFrame()=%d", lastFrameOfGame-1, TheGameLogic->getFrame()-1));
 					for (i=0; i<MAX_SLOTS; ++i)
 					{
 						const GameSlot *slot = TheGameInfo->getConstSlot(i);
-						DEBUG_LOG(("latestHumanInGame=%d, slot->isOccupied()=%d, slot->disconnected()=%d, slot->isAI()=%d, slot->lastFrameInGame()=%d\n",
+						DEBUG_LOG(("latestHumanInGame=%d, slot->isOccupied()=%d, slot->disconnected()=%d, slot->isAI()=%d, slot->lastFrameInGame()=%d",
 							latestHumanInGame, slot->isOccupied(), slot->disconnected(), slot->isAI(), slot->lastFrameInGame()));
 						if (slot->isOccupied() && slot->disconnected())
 						{
-							DEBUG_LOG(("Marking game as a possible disconnect game\n"));
+							DEBUG_LOG(("Marking game as a possible disconnect game"));
 							sawAnyDisconnects = TRUE;
 						}
 						if (slot->isOccupied() && !slot->disconnected() && i != localSlotNum &&
 							(slot->isAI() || (slot->lastFrameInGame() >= lastFrameOfGame/*TheGameLogic->getFrame()*/-1)))
 						{
-							DEBUG_LOG(("Marking game as not ending in disconnect\n"));
+							DEBUG_LOG(("Marking game as not ending in disconnect"));
 							gameEndedInDisconnect = FALSE;
 						}
 					}
 
 					if (!sawAnyDisconnects)
 					{
-						DEBUG_LOG(("Didn't see any disconnects - making gameEndedInDisconnect == FALSE\n"));
+						DEBUG_LOG(("Didn't see any disconnects - making gameEndedInDisconnect == FALSE"));
 						gameEndedInDisconnect = FALSE;
 					}
 
@@ -1717,20 +1733,20 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 							// check if we were to blame.
 							if (TheNetwork->getPingsRecieved() < max(1, TheNetwork->getPingsSent()/2)) /// @todo: what's a good percent of pings to have gotten?
 							{
-								DEBUG_LOG(("We were to blame.  Leaving gameEndedInDisconnect = true\n"));
+								DEBUG_LOG(("We were to blame.  Leaving gameEndedInDisconnect = true"));
 							}
 							else
 							{
-								DEBUG_LOG(("We were not to blame.  Changing gameEndedInDisconnect = false\n"));
+								DEBUG_LOG(("We were not to blame.  Changing gameEndedInDisconnect = false"));
 								gameEndedInDisconnect = FALSE;
 							}
 						}
 						else
 						{
-							DEBUG_LOG(("gameEndedInDisconnect, and we didn't ping on last frame.  What's up with that?\n"));
+							DEBUG_LOG(("gameEndedInDisconnect, and we didn't ping on last frame.  What's up with that?"));
 						}
 					}
-					
+
 					if (!anyNonAI)
 					{
 						// play against all ai players -- no stats to gather.
@@ -1739,13 +1755,13 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 
 					if( anyAI )
 					{
-						// Holy mis-implemented, Batman, You get no stats for _any_ AI, not _all_ AI.  
+						// Holy mis-implemented, Batman, You get no stats for _any_ AI, not _all_ AI.
 						// No wonder we fired the whole department.
 						return;
 					}
 
  					//Remove the extra disconnection we add to all games when they start.
-					DEBUG_LOG(("populatePlayerInfo() - removing extra disconnect\n"));
+					DEBUG_LOG(("populatePlayerInfo() - removing extra disconnect"));
  					if (TheGameSpyInfo)
 						TheGameSpyInfo->updateAdditionalGameSpyDisconnections(-1);
 
@@ -1764,7 +1780,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					}
 					if (!sawEndOfGame)
 					{
-						DEBUG_LOG(("Not sending results - we didn't finish a game. %d\n", TheVictoryConditions->getEndFrame() ));
+						DEBUG_LOG(("Not sending results - we didn't finish a game. %d", TheVictoryConditions->getEndFrame() ));
 						return;
 					}
 
@@ -1775,7 +1791,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 						gameResReq.hostname = TheGameSpyGame->getLadderIP().str();
 						gameResReq.port = TheGameSpyGame->getLadderPort();
 						gameResReq.results = TheGameSpyGame->generateLadderGameResultsPacket().str();
-						DEBUG_ASSERTCRASH(TheGameResultsQueue, ("No Game Results queue!\n"));
+						DEBUG_ASSERTCRASH(TheGameResultsQueue, ("No Game Results queue!"));
 						if (TheGameResultsQueue)
 						{
 							TheGameResultsQueue->addRequest(gameResReq);
@@ -1787,7 +1803,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					}
 					// generate and send a gameres packet
 					AsciiString resultsPacket = TheGameSpyGame->generateGameSpyGameResultsPacket();
-					DEBUG_LOG(("About to send results packet: %s\n", resultsPacket.str()));
+					DEBUG_LOG(("About to send results packet: %s", resultsPacket.str()));
 					PSRequest grReq;
 					grReq.requestType = PSRequest::PSREQUEST_SENDGAMERESTOGAMESPY;
 					grReq.results = resultsPacket.str();
@@ -1795,11 +1811,11 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 
 					Int ptIdx;
 					const PlayerTemplate *myTemplate = player->getPlayerTemplate();
-					DEBUG_LOG(("myTemplate = %X(%s)\n", myTemplate, myTemplate->getName().str()));
+					DEBUG_LOG(("myTemplate = %X(%s)", myTemplate, myTemplate->getName().str()));
 					for (ptIdx = 0; ptIdx < ThePlayerTemplateStore->getPlayerTemplateCount(); ++ptIdx)
 					{
 						const PlayerTemplate *nthTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(ptIdx);
-						DEBUG_LOG(("nthTemplate = %X(%s)\n", nthTemplate, nthTemplate->getName().str()));
+						DEBUG_LOG(("nthTemplate = %X(%s)", nthTemplate, nthTemplate->getName().str()));
 						if (nthTemplate == myTemplate)
 						{
 							break;
@@ -1823,7 +1839,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 							SetUnsignedIntInRegistry("", "dc", discons);
 							SetUnsignedIntInRegistry("", "se", syncs);
 							*/
-							DEBUG_LOG(("populatePlayerInfo() - need to save off info for disconnect games!\n"));
+							DEBUG_LOG(("populatePlayerInfo() - need to save off info for disconnect games!"));
 
 							PSRequest req;
 							req.requestType = PSRequest::PSREQUEST_UPDATEPLAYERSTATS;
@@ -1836,7 +1852,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 							req.lastHouse = ptIdx;
 							TheGameSpyPSMessageQueue->addRequest(req);
 						}
-						DEBUG_CRASH(("populatePlayerInfo() - not tracking stats - we haven't gotten the original stuff yet\n"));
+						DEBUG_CRASH(("populatePlayerInfo() - not tracking stats - we haven't gotten the original stuff yet"));
 						return;
 					}
 
@@ -1959,7 +1975,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					stats.surrenders[ptIdx] += TheGameInfo->haveWeSurrendered()  || !TheVictoryConditions->getEndFrame();
 
 					AsciiString systemSpec;
-					systemSpec.format("LOD%d", TheGameLODManager->findStaticLODLevel());
+					systemSpec.format("LOD%d", TheGameLODManager->getRecommendedStaticLODLevel());
 					stats.systemSpec = systemSpec.str();
 
 					stats.techCaptured[ptIdx] += s->getTotalTechBuildingsCaptured();
@@ -1968,7 +1984,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					stats.unitsKilled[ptIdx] += s->getTotalUnitsDestroyed();
 					stats.unitsLost[ptIdx] += s->getTotalUnitsLost();
 
-					DEBUG_LOG(("Before game built scud:%d, cannon:%d, nuke:%d\n", stats.builtSCUD, stats.builtParticleCannon, stats.builtNuke ));
+					DEBUG_LOG(("Before game built scud:%d, cannon:%d, nuke:%d", stats.builtSCUD, stats.builtParticleCannon, stats.builtNuke ));
 					stats.builtSCUD += CheckForApocalypse( s, "GLAScudStorm" );
 					stats.builtSCUD += CheckForApocalypse( s, "Chem_GLAScudStorm" );
 					stats.builtSCUD += CheckForApocalypse( s, "Demo_GLAScudStorm" );
@@ -1981,7 +1997,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					stats.builtNuke += CheckForApocalypse( s, "Nuke_ChinaNuclearMissileLauncher" );
 					stats.builtNuke += CheckForApocalypse( s, "Infa_ChinaNuclearMissileLauncher" );
 					stats.builtNuke += CheckForApocalypse( s, "Tank_ChinaNuclearMissileLauncher" );
-					DEBUG_LOG(("After game built scud:%d, cannon:%d, nuke:%d\n", stats.builtSCUD, stats.builtParticleCannon, stats.builtNuke ));
+					DEBUG_LOG(("After game built scud:%d, cannon:%d, nuke:%d", stats.builtSCUD, stats.builtParticleCannon, stats.builtNuke ));
 
 					if (TheGameSpyGame->getLadderPort() && TheGameSpyGame->getLadderIP().isNotEmpty())
 					{
@@ -1995,7 +2011,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 						updateChallengeMedals(stats.challengeMedals);
 					}
 
-					DEBUG_LOG(("populatePlayerInfo() - tracking stats for %s/%s/%s\n", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
+					DEBUG_LOG(("populatePlayerInfo() - tracking stats for %s/%s/%s", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
 
 					PSRequest req;
 					req.requestType = PSRequest::PSREQUEST_UPDATEPLAYERSTATS;
@@ -2008,7 +2024,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 					req.lastHouse = ptIdx;
 					TheGameSpyPSMessageQueue->addRequest(req);
 					TheGameSpyPSMessageQueue->trackPlayerStats(stats);
-					
+
 					// force an update of our shtuff
 					PSResponse newResp;
 					newResp.responseType = PSResponse::PSRESPONSE_PLAYERSTATS;
@@ -2063,7 +2079,7 @@ void grabMultiPlayerInfo( void )
 			Int score = player->getScoreKeeper()->calculateScore();
 			it = scores.find( score );
 			if (it != scores.end())
-			score += adder++;			
+			score += adder++;
 			scores[score] = player;
 			++playerCount;
 		}
@@ -2072,18 +2088,18 @@ void grabMultiPlayerInfo( void )
 	Int count =0;
 	RevScoreMapIt revIt;
 	// display the players based on Score
-	for ( revIt = scores.rbegin(); revIt != scores.rend(); ++revIt) 
+	for ( revIt = scores.rbegin(); revIt != scores.rend(); ++revIt)
 	{
 		Player *p = revIt->second;
 		if(p->isPlayerObserver())
 			setObserverWindows( p, count );
 		else
-			populatePlayerInfo( p, count);	
+			populatePlayerInfo( p, count);
 		count ++;
 	}
-	
+
 	DEBUG_ASSERTCRASH(count == playerCount, ("For some reason we added %d players to the scores map, but only read %d", playerCount, count));
-	
+
 }
 
 enum
@@ -2094,7 +2110,8 @@ enum
 	USA_ENEMY,		// Keep friends with friends, enemys with enemys
 	CHINA_ENEMY,
 	GLA_ENEMY,
-	MAX_RELATIONS // keep me last
+
+	MAX_RELATIONS
 };
 /**	Grab the single player info */
 //-------------------------------------------------------------------------------------------------
@@ -2103,7 +2120,7 @@ void grabSinglePlayerInfo( void )
 	Int playerCount = 0;
 	Player *player, *localPlayer;
 	localPlayer = ThePlayerList->getLocalPlayer();
-	
+
 	if(localPlayer)
 	{
 		if(!localPlayer->isPlayerObserver())
@@ -2144,21 +2161,24 @@ void grabSinglePlayerInfo( void )
 	for(Int j = 0; j < MAX_RELATIONS; ++j )
 	{
 		Bool isFriend = TRUE;
-		
-		// set the string we'll be compairing to
+
+		// set the string we'll be comparing to
 		switch (j) {
 		case USA_ENEMY:
 			isFriend = FALSE;
+			FALLTHROUGH;
 		case USA_FRIEND:
 			side.set("USA");
 			break;
 		case CHINA_ENEMY:
 			isFriend = FALSE;
+			FALLTHROUGH;
 		case CHINA_FRIEND:
 			side.set("China");
 			break;
 		case GLA_ENEMY:
-			isFriend = FALSE;	
+			isFriend = FALSE;
+			FALLTHROUGH;
 		case GLA_FRIEND:
 			side.set("GLA");
 			break;
@@ -2178,7 +2198,7 @@ void grabSinglePlayerInfo( void )
 		for(Int i = 0; i < MAX_PLAYER_COUNT; ++i)
 		{
 			player = ThePlayerList->getNthPlayer(i);
-			if(player && player != localPlayer &&	
+			if(player && player != localPlayer &&
 				 side.compare(player->getBaseSide()) == 0)
 			{
 				if ((TheGameLogic->isInSinglePlayerGame() == FALSE) || (player->getListInScoreScreen() == TRUE))
@@ -2197,7 +2217,7 @@ void grabSinglePlayerInfo( void )
 						sg.m_totalUnitsLost += sk->getTotalUnitsLost();
 						sg.m_sideImage = player->getPlayerTemplate()->getSideIconImage();
 						color = player->getPlayerColor();
-						populate = TRUE;	
+						populate = TRUE;
 					}
 				}
 			}
@@ -2216,7 +2236,7 @@ void grabSinglePlayerInfo( void )
 		}
 	}
 	hideWindows(playerCount);
-	
+
 }
 
 /** Hide the windows we're not using */
@@ -2278,18 +2298,12 @@ void hideWindows( Int pos )
 		DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
 		win->winHide(TRUE);
 
-		// set the total BuildingsDestroyed
-		winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", i);
-		win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
-		DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
-		win->winHide(TRUE);
-
 		// set the total Resources
 		winName.format("ScoreScreen.wnd:StaticTextResources%d", i);
 		win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
 		DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
 		win->winHide(TRUE);
-		
+
 		// set the total score
 		/*
 winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
@@ -2303,7 +2317,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
 		win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
 		DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
 		win->winHide(TRUE);
-		
+
 
 //		// Set the Game Add Buttons
 //		winName.format("ScoreScreen.wnd:ButtonAdd%d", i);
@@ -2317,27 +2331,21 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
 //-------------------------------------------------------------------------------------------------
 void setObserverWindows( Player *player, Int i )
 {
-	if(i < 0 || i >= MAX_SLOTS)
+	if(!player || i < 0 || i >= MAX_SLOTS)
 		return;
 	AsciiString winName;
 	GameWindow *win;
-	
+
 	Color color = 0xffffffff;
-	
+
 	// set the player name
 	winName.format("ScoreScreen.wnd:StaticTextPlayer%d", i);
 	win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
 	DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
-	if (player)
-	{
-		GadgetStaticTextSetText(win, player->getPlayerDisplayName());
-		win->winHide(FALSE);
-		win->winSetEnabledTextColors(color, win->winGetEnabledTextBorderColor());
-	}
-	else
-	{
-		win->winHide(TRUE);
-	}
+
+	GadgetStaticTextSetText(win, player->getPlayerDisplayName());
+	win->winHide(FALSE);
+	win->winSetEnabledTextColors(color, win->winGetEnabledTextBorderColor());
 
 	// set the player name
 	winName.format("ScoreScreen.wnd:StaticTextObserver%d", i);
@@ -2382,18 +2390,12 @@ void setObserverWindows( Player *player, Int i )
 	DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
 	win->winHide(TRUE);
 
-	// set the total BuildingsDestroyed
-	winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", i);
-	win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
-	DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
-	win->winHide(TRUE);
-
 	// set the total Resources
 	winName.format("ScoreScreen.wnd:StaticTextResources%d", i);
 	win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
 	DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
 	win->winHide(TRUE);
-	
+
 	// set the total score
 	/*
 winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
@@ -2412,7 +2414,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
 	{
 		win->winSetEnabledImage(0, fact->getSideIconImage());
 	}
-	
+
 //	// set the Buttons
 //	winName.format("ScoreScreen.wnd:ButtonAdd%d", i);
 //	win =  TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
@@ -2424,14 +2426,14 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
 //	if(screenType ==	SCORESCREEN_INTERNET && TheGameSpyInfo && TheGameSpyInfo->getLocalProfileID() != 0)
 //	{
 //		// Get the stats for the player
-//		
+//
 //		AsciiString aName;
 //		aName.translate(player->getPlayerDisplayName());
 //
 //		PlayerInfoMap::iterator blah = TheGameSpyInfo->getPlayerInfoMap()->find(aName);
 //		if(blah->second.m_profileID != 0)
 //		{
-//			
+//
 //			BuddyInfoMap::iterator bIt = TheGameSpyInfo->getBuddyMap()->find(blah->second.m_profileID);
 //			if(bIt !=  TheGameSpyInfo->getBuddyMap()->end()  || (TheGameSpyInfo->getLocalProfileID() == blah->second.m_profileID))
 //			{
@@ -2440,7 +2442,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", i);
 //			}
 //			else
 //			{
-//		
+//
 //				GadgetButtonSetData(win, (void *) blah->second.m_profileID);
 //				win->winEnable(TRUE);
 //				win->winHide(FALSE);
@@ -2464,7 +2466,7 @@ void populateSideInfo( UnicodeString side,ScoreGather *sg, Int pos, Color color)
 {
 	if(pos < 0 || pos > MAX_SLOTS)
 		return;
-	
+
 	AsciiString winName;
 	UnicodeString winValue;
 	GameWindow *win;
@@ -2562,7 +2564,7 @@ winName.format("ScoreScreen.wnd:StaticTextScore%d", pos);
 	DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
 	if(sg->m_sideImage)
 	{
-		win->winHide(FALSE);	
+		win->winHide(FALSE);
 		win->winSetEnabledImage(0, sg->m_sideImage);
 	}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
index d8a6e2aaf03..5f72983f75d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "GameClient/AnimateWindowManager.h"
@@ -54,7 +54,7 @@ static void shutdownComplete( WindowLayout *layout )
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the single player menu */
@@ -69,27 +69,26 @@ void SinglePlayerMenuInit( WindowLayout *layout, void *userData )
 	layout->hide( FALSE );
 
 	// set keyboard focus to main parent
-	AsciiString parentName( "SinglePlayerMenu.wnd:SinglePlayerMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:SinglePlayerMenuParent" );
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	TheWindowManager->winSetFocus( parent );
 
-	NameKeyType buttonNewID = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonNew") );
+	NameKeyType buttonNewID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonNew" );
 	GameWindow *buttonNew = TheWindowManager->winGetWindowFromId( NULL, buttonNewID );
 	TheShell->registerWithAnimateManager(buttonNew, WIN_ANIMATION_SLIDE_LEFT, TRUE,1);
 
-	NameKeyType buttonLoadID = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonLoad") );
+	NameKeyType buttonLoadID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonLoad" );
 	GameWindow *buttonLoad = TheWindowManager->winGetWindowFromId( NULL, buttonLoadID );
 	TheShell->registerWithAnimateManager(buttonLoad, WIN_ANIMATION_SLIDE_LEFT, TRUE,200);
 
-	NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonBack") );
+	NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonBack" );
 	GameWindow *buttonBack = TheWindowManager->winGetWindowFromId( NULL, buttonBackID );
 	TheShell->registerWithAnimateManager(buttonBack, WIN_ANIMATION_SLIDE_RIGHT, TRUE,1);
 
 
 	//TheShell->registerWithAnimateManager(parent, WIN_ANIMATION_SLIDE_TOP, TRUE);
 
-}  // end SinglePlayerMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu shutdown method */
@@ -106,11 +105,11 @@ void SinglePlayerMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 
-}  // end SinglePlayerMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu update method */
@@ -118,11 +117,11 @@ void SinglePlayerMenuShutdown( WindowLayout *layout, void *userData )
 void SinglePlayerMenuUpdate( WindowLayout *layout, void *userData )
 {
 
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished())
 		shutdownComplete(layout);
 
-}  // end SinglePlayerMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** SinglePlayer menu input callback */
@@ -131,7 +130,7 @@ WindowMsgHandledType SinglePlayerMenuInput( GameWindow *window, UnsignedInt msg,
 																						WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -148,48 +147,47 @@ WindowMsgHandledType SinglePlayerMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "SinglePlayerMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end SinglePlayerMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	static NameKeyType buttonNew = NAMEKEY_INVALID;
 	static NameKeyType buttonLoad = NAMEKEY_INVALID;
 	static NameKeyType buttonBack = NAMEKEY_INVALID;
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -197,13 +195,13 @@ WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg
 		{
 
 			// get ids for our children controls
-			buttonNew = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonNew") );
-			buttonLoad = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonLoad") );
-			buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonBack") );
+			buttonNew = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonNew" );
+			buttonLoad = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonLoad" );
+			buttonBack = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonBack" );
 
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -211,7 +209,7 @@ WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -223,7 +221,7 @@ WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -237,31 +235,31 @@ WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg
 			{
 
 				// open up the map select menu
-				TheShell->push( AsciiString( "Menus/MapSelectMenu.wnd" ) );
+				TheShell->push( "Menus/MapSelectMenu.wnd" );
 				buttonPushed = true;
 
-			}  // end if
+			}
 			else if( controlID == buttonLoad )
 			{
 
-			}  // end else if
+			}
 			else if( controlID == buttonBack )
 			{
 
 				// thou art directed to return to thy known solar system immediately!
 				TheShell->pop();
 				buttonPushed = true;
-				
-			}  // end else if
+
+			}
 
 			break;
 
-		}  // end selected
-		
+		}
+
 		default:
 			return MSG_IGNORED;
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
-}  // end SinglePlayerMenuSystem
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
index 0d39484b54e..d99f370cc3a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
@@ -28,7 +28,7 @@
 // Description: Lan Game Options Menu
 ///////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/BattleHonors.h"
@@ -70,11 +70,6 @@
 #include "GameNetwork/IPEnumeration.h"
 #include "WWDownload/Registry.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 SkirmishGameInfo *TheSkirmishGameInfo = NULL;
 
@@ -117,7 +112,7 @@ static NameKeyType buttonStartID = NAMEKEY_INVALID;
 static NameKeyType buttonSelectMapID = NAMEKEY_INVALID;
 static NameKeyType buttonResetID = NAMEKEY_INVALID;
 static NameKeyType windowMapID = NAMEKEY_INVALID;
-static NameKeyType sliderGameSpeedID = NAMEKEY_INVALID; 
+static NameKeyType sliderGameSpeedID = NAMEKEY_INVALID;
 static NameKeyType staticTextGameSpeedID = NAMEKEY_INVALID;
 static NameKeyType checkBoxLimitSuperweaponsID = NAMEKEY_INVALID;
 static NameKeyType comboBoxStartingCashID = NAMEKEY_INVALID;
@@ -229,7 +224,7 @@ UnicodeString SkirmishPreferences::getUserName(void)
 		ret.translate(IPs.getMachineName());
 		return ret;
 	}
-	
+
 	return ret;
 }
 
@@ -303,7 +298,7 @@ AsciiString SkirmishPreferences::getPreferredMap(void)
 		ret = getDefaultMap(TRUE);
 		return ret;
 	}
-	
+
 	return ret;
 }
 
@@ -316,7 +311,7 @@ Bool SkirmishPreferences::getSuperweaponRestricted(void) const
   {
     return false;
   }
-  
+
   return ( it->second.compareNoCase( "yes" ) == 0 );
 }
 
@@ -333,19 +328,19 @@ Money SkirmishPreferences::getStartingCash(void) const
   {
     return TheMultiplayerSettings->getDefaultStartingMoney();
   }
-  
+
   Money money;
-  money.deposit( strtoul( it->second.str(), NULL, 10 ), FALSE  );
-  
+  money.deposit( strtoul( it->second.str(), NULL, 10 ), FALSE, FALSE );
+
   return money;
 }
 
 void SkirmishPreferences::setStartingCash( const Money & startingCash )
 {
   AsciiString option;
-  
+
   option.format( "%d", startingCash.countMoney() );
-  
+
   (*this)[startingCashKey] = option;
 }
 
@@ -373,7 +368,7 @@ Bool SkirmishPreferences::write(void)
 
 	setSlotList();
 
-//	NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) );
+//	NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" );
 	GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID );
 	Int maxFPS = GadgetSliderGetPosition( sliderGameSpeed );
 	setInt("FPS", maxFPS);
@@ -431,11 +426,11 @@ void reallyDoStart( void )
 {
 	if (TheGameLogic->isInGame())
 		TheGameLogic->clearGameData(FALSE);
-	
-	//NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) );
+
+	//NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" );
 	GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID );
 	Int maxFPS = GadgetSliderGetPosition( sliderGameSpeed );
-	DEBUG_LOG(("GameSpeedSlider was at %d\n", maxFPS));
+	DEBUG_LOG(("GameSpeedSlider was at %d", maxFPS));
 	if (maxFPS > GREATER_NO_FPS_LIMIT)
 		maxFPS = 1000;
 	if (maxFPS < 15)
@@ -478,7 +473,7 @@ static MessageBoxReturnType cancelStartBecauseOfNoCD( void *userData )
 
 Bool IsFirstCDPresent(void)
 {
-#if !defined(RTS_INTERNAL) && !defined(RTS_DEBUG)
+#if !defined(RTS_DEBUG)
 	return TheFileSystem->areMusicFilesOnCD();
 #else
 	return TRUE;
@@ -547,19 +542,17 @@ static void startPressed(void)
 	{
 		isReady = TRUE;
 	}
-	
+
 	if(isReady)
 	{
 		CheckForCDAtGameStart( reallyDoStart );
 	}
 
-}//void startPressed(void)
+}
 
 /////////////////////////////////////////////////////
-// MapSelectorTooltip - shows tooltips for the tech buildings 
+// MapSelectorTooltip - shows tooltips for the tech buildings
 //											and supply depots
-// Added By : Sadullah Nader
-/////////////////////////////////////////////////////
 void MapSelectorTooltip(GameWindow *window,
 												WinInstanceData *instData,
 												UnsignedInt mouse)
@@ -577,13 +570,13 @@ void MapSelectorTooltip(GameWindow *window,
 
 	ICoord2DList::iterator it = TheSupplyAndTechImageLocations.m_techPosList.begin();
 	ICoord2DList::iterator it2 = TheSupplyAndTechImageLocations.m_supplyPosList.begin();
-	
+
 	if( image )
 	{
-		// Check to see if we mouse over a tech building 
+		// Check to see if we mouse over a tech building
 		while(it != TheSupplyAndTechImageLocations.m_techPosList.end())
 		{
-			if ((x > (pixelX + it->x) && x < (pixelX + it->x + SUPPLY_TECH_SIZE)) 
+			if ((x > (pixelX + it->x) && x < (pixelX + it->x + SUPPLY_TECH_SIZE))
 				  && ( y > (pixelY + it->y) && y < (pixelY + it->y + SUPPLY_TECH_SIZE)))
 			{
 				TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:TechBuilding"), -1, NULL); //, 1.5f
@@ -607,7 +600,7 @@ void MapSelectorTooltip(GameWindow *window,
 			it2++;
 		}
 	}
-	
+
 }
 
 
@@ -624,7 +617,7 @@ void positionStartSpotControls( GameWindow *win, GameWindow *mapWindow, Coord3D
 	findDrawPositions(0,0, winMapSize.x, winMapSize.y,mmd->m_extent, &ul, &lr);
 	Int smallWidth = lr.x - ul.x;
 	Int smallHeight= lr.y - ul.y;
-	
+
 	// When we actually draw the map, save off it's screen position and use that instead of the map window's position/size
 	Real position;
 	position = (pos->x - mmd->m_extent.lo.x) / (mmd->m_extent.hi.x - mmd->m_extent.lo.x);
@@ -632,8 +625,8 @@ void positionStartSpotControls( GameWindow *win, GameWindow *mapWindow, Coord3D
 
 	position = (pos->y - mmd->m_extent.lo.y) / (mmd->m_extent.hi.y - mmd->m_extent.lo.y);
 	gadgetPos.y = ((1- position) * smallHeight) - gadgetSize.y /2 + ul.y;// + winMapPos.y;
-	
-	
+
+
 
 	// loop through and make sure we're not on top of anyone else
 	for(Int i = 0; i < MAX_SLOTS; ++i)
@@ -686,12 +679,12 @@ void positionAdditionalImages( MapMetaData *mmd, GameWindow *mapWindow, Bool for
 	findDrawPositions(0,0, winMapSize.x, winMapSize.y,mmd->m_extent, &ul, &lr);
 	Int smallWidth = lr.x - ul.x;
 	Int smallHeight= lr.y - ul.y;
-	
+
 	Coord3DList::iterator it = mmd->m_supplyPositions.begin();
 		// loop through and make sure we're not on top of anyone else
 	while( it != mmd->m_supplyPositions.end())
 	{
-		
+
 		ICoord2D markerPos;
 
 		// When we actually draw the map, save off it's screen position and use that instead of the map window's position/size
@@ -760,7 +753,7 @@ void positionStartSpots( AsciiString mapName, GameWindow *buttonMapStartPosition
 	else
 	{
 		MapMetaData mmd = it->second;
-		
+
 		Image *image = getMapPreviewImage(mapName);
 		if (mapWindow != NULL) {
 			mapWindow->winSetUserData((void *)TheMapCache->findMap(mapName));
@@ -788,7 +781,7 @@ void positionStartSpots( AsciiString mapName, GameWindow *buttonMapStartPosition
 
 		positionAdditionalImages(&mmd, mapWindow, TRUE);
 
-		AsciiString waypointName;				
+		AsciiString waypointName;
 		Int i = 0;
 		for(; i < mmd.m_numPlayers && mmd.m_isMultiplayer; ++i )
 		{
@@ -807,7 +800,7 @@ void positionStartSpots( AsciiString mapName, GameWindow *buttonMapStartPosition
 			{
 				DEBUG_ASSERTCRASH(FALSE,("positionStartSpots:: someone messed with the map cash.  We couldn't find waypoint <%s> in map <%s>", waypointName.str(),lowerMap.str()));
 			}
-		}	
+		}
 		// hide the rest
 		for (; i < MAX_SLOTS; ++i)
 		{
@@ -835,7 +828,7 @@ void positionStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[]
 			}
 		}
 	}
-	positionStartSpots(localMapFname, buttonMapStartPositions, mapWindow);	
+	positionStartSpots(localMapFname, buttonMapStartPositions, mapWindow);
 }
 
 void updateMapStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[], Bool onLoadScreen )
@@ -890,8 +883,6 @@ void updateMapStartSpots( GameInfo *myGame, GameWindow *buttonMapStartPositions[
 				AsciiString displayNumber;
 				displayNumber.format("NUMBER:%d",i + 1);
 				GadgetButtonSetText(buttonMapStartPositions[gs->getStartPos()], TheGameText->fetch(displayNumber));
-				//Added By Sadullah Nader
-				//Fix for no tooltips at start positions
 				//added start position tooltip
 				//Fixed again to show the right number , ie "i + 1"
 				UnicodeString temp;
@@ -920,7 +911,7 @@ static void handlePlayerSelection(int index)
     if(!slot)
       return;
     slot->setState(SlotState(playerType), title);
-    
+
 	}
   //skirmishUpdateSlotList();
 }
@@ -1042,14 +1033,14 @@ static void handleTeamSelection(int index)
 static void handleStartingCashSelection()
 {
   GameInfo *myGame = TheSkirmishGameInfo;
-  
+
   if (myGame)
   {
     Int selIndex;
     GadgetComboBoxGetSelectedPos(comboBoxStartingCash, &selIndex);
 
     Money startingCash;
-    startingCash.deposit( (UnsignedInt)GadgetComboBoxGetItemData( comboBoxStartingCash, selIndex ), FALSE );
+    startingCash.deposit( (UnsignedInt)GadgetComboBoxGetItemData( comboBoxStartingCash, selIndex ), FALSE, FALSE );
     myGame->setStartingCash( startingCash );
   }
 }
@@ -1057,7 +1048,7 @@ static void handleStartingCashSelection()
 static void handleLimitSuperweaponsClick()
 {
   GameInfo *myGame = TheSkirmishGameInfo;
-  
+
   if (myGame)
   {
     // At the moment, 1 and 0 are the only choices supported in the GUI, though the system could
@@ -1080,16 +1071,16 @@ static void handleLimitSuperweaponsClick()
 void InitSkirmishGameGadgets( void )
 {
 	//Initialize the gadget IDs
-	parentSkirmishGameOptionsID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SkirmishGameOptionsMenuParent" ) );
-	buttonExitID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonBack" ) );
-	buttonStartID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonStart" ) );
-	textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:TextEntryMapDisplay" ) );
-	buttonSelectMapID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonSelectMap" ) );
-	buttonResetID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonReset" ) );
-	windowMapID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:MapWindow" ) );
-	staticTextGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:StaticTextGameSpeed" ) );
-  checkBoxLimitSuperweaponsID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:CheckboxLimitSuperweapons" ) );
-  comboBoxStartingCashID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ComboBoxStartingCash" ) );
+	parentSkirmishGameOptionsID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SkirmishGameOptionsMenuParent" );
+	buttonExitID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonBack" );
+	buttonStartID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonStart" );
+	textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:TextEntryMapDisplay" );
+	buttonSelectMapID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonSelectMap" );
+	buttonResetID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonReset" );
+	windowMapID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:MapWindow" );
+	staticTextGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:StaticTextGameSpeed" );
+  checkBoxLimitSuperweaponsID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:CheckboxLimitSuperweapons" );
+  comboBoxStartingCashID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ComboBoxStartingCash" );
 
 	// Initialize the pointers to our gadgets
 	parentSkirmishGameOptions = TheWindowManager->winGetWindowFromId( NULL, parentSkirmishGameOptionsID );
@@ -1112,10 +1103,10 @@ void InitSkirmishGameGadgets( void )
   DEBUG_ASSERTCRASH(comboBoxStartingCash, ("Could not find the comboBoxStartingCash"));
   PopulateStartingCashComboBox(comboBoxStartingCash, TheSkirmishGameInfo );
 
-	textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:TextEntryPlayerName" ) );
+	textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:TextEntryPlayerName" );
   textEntryPlayerName = TheWindowManager->winGetWindowFromId( NULL, textEntryPlayerNameID );
 	DEBUG_ASSERTCRASH(textEntryPlayerName, ("Could not find the textEntryPlayerName" ));
-	
+
 	windowMap = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions,windowMapID  );
 	DEBUG_ASSERTCRASH(windowMap, ("Could not find the SkirmishGameOptionsMenu.wnd:MapWindow" ));
 
@@ -1132,7 +1123,7 @@ void InitSkirmishGameGadgets( void )
 		  comboBoxPlayer[i] = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, comboBoxPlayerID[i] );
 		  GadgetComboBoxReset(comboBoxPlayer[i]);
 		  //GadgetComboBoxGetEditBox(comboBoxPlayer[i])->winSetTooltipFunc(playerTooltip);
-    }    
+    }
 		Color white = GameMakeColor( 255, 255, 255, 255 );
 
 		if( i == 0 )
@@ -1161,7 +1152,7 @@ void InitSkirmishGameGadgets( void )
 		comboBoxColorID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		comboBoxColor[i] = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, comboBoxColorID[i] );
 		DEBUG_ASSERTCRASH(comboBoxColor[i], ("Could not find the comboBoxColor[%d]",i ));
-		
+
 		tmpString.format("SkirmishGameOptionsMenu.wnd:ComboBoxPlayerTemplate%d", i);
 		comboBoxPlayerTemplateID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		comboBoxPlayerTemplate[i] = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, comboBoxPlayerTemplateID[i] );
@@ -1175,7 +1166,7 @@ void InitSkirmishGameGadgets( void )
 		comboBoxTeamID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		comboBoxTeam[i] = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, comboBoxTeamID[i] );
 		DEBUG_ASSERTCRASH(comboBoxTeam[i], ("Could not find the comboBoxTeam[%d]",i ));
-		
+
 
 //		tmpString.format("SkirmishGameOptionsMenu.wnd:ButtonStartPosition%d", i);
 //		buttonStartPositionID[i] = TheNameKeyGenerator->nameToKey( tmpString );
@@ -1187,7 +1178,7 @@ void InitSkirmishGameGadgets( void )
 		buttonMapStartPosition[i] = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, buttonMapStartPositionID[i] );
 		DEBUG_ASSERTCRASH(buttonMapStartPosition[i], ("Could not find the ButtonMapStartPosition[%d]",i ));
 	}
-   
+
 	for (i = 0; i < MAX_SLOTS; ++i)
 	{
 		PopulateColorComboBox(i, comboBoxColor, TheSkirmishGameInfo );
@@ -1198,7 +1189,7 @@ void InitSkirmishGameGadgets( void )
 //		if (buttonStartPosition[i])
 //			buttonStartPosition[i]->winHide(TRUE); // not using these right now
 	}
-	
+
 	populateSkirmishBattleHonors();
 }
 
@@ -1247,7 +1238,7 @@ static const char *gadgetsToHide[] =
 	"StaticTextColor",
 	"StaticTextTeam",
 	"StaticTextFaction",
-	NULL // keep this last
+	NULL
 };
 static const char *perPlayerGadgetsToHide[] =
 {
@@ -1255,7 +1246,7 @@ static const char *perPlayerGadgetsToHide[] =
 	"ComboBoxTeam",
 	"ComboBoxColor",
 	"ComboBoxPlayerTemplate",
-	NULL // keep this last
+	NULL
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -1302,7 +1293,7 @@ void updateSkirmishGameOptions( void )
       break;
     }
   }
-  
+
   DEBUG_ASSERTCRASH( index < itemCount, ("Could not find new starting cash amount %d in list", TheSkirmishGameInfo->getStartingCash().countMoney() ) );
 }
 
@@ -1316,8 +1307,8 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
 
 	stillNeedsToSetOptions = FALSE;
 
-	sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) );
-	
+	sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" );
+
 	sandboxOk = FALSE;
   doUpdateSlotList = FALSE;
   if( !TheSkirmishGameInfo )
@@ -1333,7 +1324,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
 	{
 		SignalUIInteraction(SHELL_SCRIPT_HOOK_SKIRMISH_OPENED);
 	}
-  TheSkirmishGameInfo->init();  
+  TheSkirmishGameInfo->init();
   TheSkirmishGameInfo->clearSlotList();
 	TheSkirmishGameInfo->reset();
   Int localIP = TheSkirmishGameInfo->getSlot(0)->getIP();
@@ -1375,7 +1366,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
 
   TheSkirmishGameInfo->setStartingCash( prefs.getStartingCash() );
   TheSkirmishGameInfo->setSuperweaponRestriction( prefs.getSuperweaponRestricted() ? 1 : 0 );
- 
+
   TheSkirmishGameInfo->setMap(prefs.getPreferredMap());
 	const MapMetaData *md = TheMapCache->findMap(TheSkirmishGameInfo->getMap());
 	if (!md)
@@ -1402,7 +1393,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
 	//initSkirmishGameOptions();
 
 	// set up the game speed slider
-//	NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) );
+//	NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" );
 	GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID );
 	Int sliderPos = max(15,min(61,prefs.getInt("FPS", TheGlobalData->m_framesPerSecondLimit)));
 	GadgetSliderSetPosition( sliderGameSpeed, sliderPos );
@@ -1422,7 +1413,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
 
 	// Show the Menu
 	layout->hide( FALSE );
-	
+
 	// Set Keyboard to Main Parent
 	TheWindowManager->winSetFocus( parentSkirmishGameOptions );
 
@@ -1437,7 +1428,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
 	if(win)
 		win->winHide(TRUE);
 	buttonPushed = FALSE;
-}// void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData )
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -1461,7 +1452,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	//LANnextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Skirmish Game Options menu shutdown method */
@@ -1480,18 +1471,18 @@ void SkirmishGameOptionsMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 
-	
+
 	// hide menu
 //	layout->hide( TRUE );
 
 	// our shutdown is complete
 	TheTransitionHandler->reverse("SkirmishGameOptionsMenuFade");
-	
-}  // void SkirmishGameOptionsMenuShutdown( WindowLayout *layout, void *userData )
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Skirmish Game Options menu update method */
@@ -1526,7 +1517,7 @@ void SkirmishGameOptionsMenuUpdate( WindowLayout * layout, void *userData)
 
 	if(TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 			TheShell->shutdownComplete( layout );
-}// void SkirmishGameOptionsMenuUpdate( WindowLayout * layout, void *userData)
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Skirmish Game Options menu input callback */
@@ -1534,7 +1525,7 @@ void SkirmishGameOptionsMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType SkirmishGameOptionsMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1554,48 +1545,51 @@ WindowMsgHandledType SkirmishGameOptionsMenuInput( GameWindow *window, UnsignedI
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonExit, buttonExitID );
-					}  // end if
+					}
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
-				}  // end escape
-			}  // end switch( key )
-		}  // end char
+				}
+			}
+		}
 		break;
-	}  // end switch( msg )
+	}
 	return MSG_IGNORED;
-}//WindowMsgHandledType SkirmishGameOptionsMenuInput( GameWindow *window, UnsignedInt msg,
+}
 
 
 //-------------------------------------------------------------------------------------------------
 /** Skirmish Game Options menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 	switch( msg )
 	{
-		//-------------------------------------------------------------------------------------------------	
+		//-------------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 			{
+				if (windowMap)
+					windowMap->winSetUserData(NULL);
+
 				break;
-			} // case GWM_DESTROY:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
 			{
@@ -1630,7 +1624,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
 				sandboxOk = FALSE;
         skirmishUpdateSlotList();
         break;
-			}// case GCM_SELECTED:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GSM_SLIDER_TRACK:
 		{
@@ -1641,14 +1635,15 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
 			{
 				setFPSTextBox(sliderPos);
 			}
+			break;
 		}
 		//-------------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 			{
-				
+
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-///				static NameKeyType buttonResetFPSID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonResetFPS" ) );
+///				static NameKeyType buttonResetFPSID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonResetFPS" );
 				if(buttonPushed)
 					break;
 				if ( controlID == buttonExitID )
@@ -1666,10 +1661,10 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
           delete TheSkirmishGameInfo;
           TheSkirmishGameInfo = NULL;
 
-				} //if ( controlID == buttonBack )
+				}
 //				else if ( controlID == buttonResetFPSID )
 //				{
-//					static NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) );
+//					static NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" );
 //					GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID );
 //					GadgetSliderSetPosition( sliderGameSpeed, TheGlobalData->m_framesPerSecondLimit );
 //				}
@@ -1677,7 +1672,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
 				{
 					sandboxOk = FALSE;
 					//buttonBack->winEnable( false );
-					skirmishMapSelectLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/SkirmishMapSelectMenu.wnd" ) );
+					skirmishMapSelectLayout = TheWindowManager->winCreateLayout( "Menus/SkirmishMapSelectMenu.wnd" );
 					skirmishMapSelectLayout->runInit();
 					skirmishMapSelectLayout->hide( FALSE );
 					skirmishMapSelectLayout->bringForward();
@@ -1745,7 +1740,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
 					}
 				}
 				break;
-			}// case GBM_SELECTED:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GBM_SELECTED_RIGHT:
 		{
@@ -1777,7 +1772,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
 						sandboxOk = FALSE;
 					}
 				}
-			}					
+			}
 			break;
 		}
 		//-------------------------------------------------------------------------------------------------
@@ -1797,7 +1792,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned
 		//-------------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
-	}//Switch
+	}
 	return MSG_HANDLED;
 }
 
@@ -1843,7 +1838,7 @@ void populateSkirmishBattleHonors(void)
 
 	ResetBattleHonorInsertion();
 	GadgetListBoxAddEntryImage(list, NULL, 0, 0, 10, 10, TRUE, GameMakeColor(255,255,255,255));
-	
+
 	// FIRST ROW OF HONORS
 	row = 1; column = 0;
 
@@ -1852,7 +1847,7 @@ void populateSkirmishBattleHonors(void)
 	{
 		InsertBattleHonor(list, TheMappedImageCollection->findImageByName("ChinaCampaign_G"), TRUE,
 			BATTLE_HONOR_CAMPAIGN_CHINA, row, column);
-	} 
+	}
 	else if (stats.getCHINACampaignComplete(DIFFICULTY_NORMAL))
 	{
 		InsertBattleHonor(list, TheMappedImageCollection->findImageByName("ChinaCampaign_S"), TRUE,
@@ -1874,7 +1869,7 @@ void populateSkirmishBattleHonors(void)
 	{
 		InsertBattleHonor(list, TheMappedImageCollection->findImageByName("GLACampaign_G"), TRUE,
 			BATTLE_HONOR_CAMPAIGN_GLA, row, column);
-	} 
+	}
 	else if (stats.getGLACampaignComplete(DIFFICULTY_NORMAL))
 	{
 		InsertBattleHonor(list, TheMappedImageCollection->findImageByName("GLACampaign_S"), TRUE,
@@ -1896,7 +1891,7 @@ void populateSkirmishBattleHonors(void)
 	{
 		InsertBattleHonor(list, TheMappedImageCollection->findImageByName("USACampaign_G"), TRUE,
 			BATTLE_HONOR_CAMPAIGN_USA, row, column);
-	} 
+	}
 	else if (stats.getUSACampaignComplete(DIFFICULTY_NORMAL))
 	{
 		InsertBattleHonor(list, TheMappedImageCollection->findImageByName("USACampaign_S"), TRUE,
@@ -1933,7 +1928,7 @@ void populateSkirmishBattleHonors(void)
 	{
 		InsertBattleHonor(list, TheMappedImageCollection->findImageByName("Challenge_Gold"), TRUE,
 			BATTLE_HONOR_CHALLENGE_MODE, row, column);
-	} 
+	}
 	else if (completedOnNormal)
 	{
 		InsertBattleHonor(list, TheMappedImageCollection->findImageByName("Challenge_Silver"), TRUE,
@@ -2107,7 +2102,7 @@ void populateSkirmishBattleHonors(void)
 	{
 		if (!it->second.m_isOfficial || !it->second.m_isMultiplayer)
 			continue;
-	
+
 		Int totalOpponentSlots = it->second.m_numPlayers - 1;
 		Int numBrutalOpponentsBeaten = stats.getEnduranceMedal(it->first, SLOT_BRUTAL_AI);
 		if (numBrutalOpponentsBeaten < totalOpponentSlots)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp
index c4d72a12de2..42ad7642cb6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/MessageStream.h"
@@ -67,9 +67,13 @@ static NameKeyType winMapPreviewID = NAMEKEY_INVALID;
 
 static void NullifyControls()
 {
-	mapList = NULL;
-	winMapPreview = NULL;
 	parent = NULL;
+	mapList = NULL;
+	if (winMapPreview)
+	{
+		winMapPreview->winSetUserData(NULL);
+		winMapPreview = NULL;
+	}
 	for (Int i=0; i<MAX_SLOTS; ++i)
 	{
 		buttonMapStartPosition[i] = NULL;
@@ -125,9 +129,8 @@ void positionStartSpots( AsciiString mapName, GameWindow *buttonMapStartPosition
 void skirmishPositionStartSpots( void );
 void skirmishUpdateSlotList( void );
 void showSkirmishGameOptionsUnderlyingGUIElements( Bool show )
-{                          
-	AsciiString parentName( "SkirmishGameOptionsMenu.wnd:SkirmishGameOptionsMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+{
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SkirmishGameOptionsMenuParent" );
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	if (!parent)
 		return;
@@ -248,8 +251,7 @@ void SkirmishMapSelectMenuInit( WindowLayout *layout, void *userData )
 {
 
 	// set keyboard focus to main parent
-	AsciiString parentName( "SkirmishMapSelectMenu.wnd:SkrimishMapSelectMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:SkrimishMapSelectMenuParent" );
 	parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 
 	TheWindowManager->winSetFocus( parent );
@@ -263,13 +265,13 @@ void SkirmishMapSelectMenuInit( WindowLayout *layout, void *userData )
 		usesSystemMapDir = mmd->m_isOfficial;
 	}
 
-	winMapPreviewID = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:WinMapPreview") );
+	winMapPreviewID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:WinMapPreview" );
 	winMapPreview = TheWindowManager->winGetWindowFromId(parent, winMapPreviewID);
 
 
-	buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:ButtonBack") );
-	buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:ButtonOK") );
-	listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:ListboxMap") );
+	buttonBack = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ButtonBack" );
+	buttonOK = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ButtonOK" );
+	listboxMap = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ListboxMap" );
 
 	radioButtonSystemMapsID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:RadioButtonSystemMaps" );
 	radioButtonUserMapsID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:RadioButtonUserMaps" );
@@ -294,8 +296,7 @@ void SkirmishMapSelectMenuInit( WindowLayout *layout, void *userData )
 	showSkirmishGameOptionsUnderlyingGUIElements(FALSE);
 
 	// get the listbox window
-	AsciiString listString( "SkirmishMapSelectMenu.wnd:ListboxMap" );
-	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( listString );
+	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ListboxMap" );
 	mapList = TheWindowManager->winGetWindowFromId( parent, mapListID );
 	if( mapList )
 	{
@@ -313,7 +314,7 @@ void SkirmishMapSelectMenuInit( WindowLayout *layout, void *userData )
 		mapList->winSetTooltipFunc(mapListTooltipFunc);
 	}
 
-}  // end SkirmishMapSelectMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu shutdown method */
@@ -323,13 +324,13 @@ void SkirmishMapSelectMenuShutdown( WindowLayout *layout, void *userData )
 
 	// hide menu
 	layout->hide( TRUE );
-	
+
 	NullifyControls();
-	
+
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end LanMapSelectMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu update method */
@@ -337,7 +338,7 @@ void SkirmishMapSelectMenuShutdown( WindowLayout *layout, void *userData )
 void SkirmishMapSelectMenuUpdate( WindowLayout *layout, void *userData )
 {
 
-}  // end SkirmishMapSelectMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Map select menu input callback */
@@ -346,7 +347,7 @@ WindowMsgHandledType SkirmishMapSelectMenuInput( GameWindow *window, UnsignedInt
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -361,45 +362,44 @@ WindowMsgHandledType SkirmishMapSelectMenuInput( GameWindow *window, UnsignedInt
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "SkirmishMapSelectMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end SkirmishMapSelectMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -407,7 +407,7 @@ WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedIn
 		{
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -415,7 +415,7 @@ WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedIn
 			NullifyControls();
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -427,23 +427,23 @@ WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedIn
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GLM_DOUBLE_CLICKED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						GadgetListBoxSetSelected( control, rowSelected );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonOK );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonOK );
 					}
 				}
@@ -456,7 +456,7 @@ WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedIn
 
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
 					if( rowSelected < 0 )
@@ -535,7 +535,7 @@ WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedIn
 				//TheShell->pop();
 				//do you need this ??
 				//PostToLanGameOptions( MAP_BACK );
-			}  // end if
+			}
 			else if ( controlID == buttonOK )
 			{
 
@@ -598,18 +598,18 @@ WindowMsgHandledType SkirmishMapSelectMenuSystem( GameWindow *window, UnsignedIn
 				}
 					//TheShell->pop();
 
-				}  // end if
-			}  // end else if
+				}
+			}
 
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end SkirmishMapSelectMenuSystem*/
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
index c153ef6787e..e109cfb88e0 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioEventRTS.h"
 #include "Common/PlayerList.h"
@@ -57,11 +57,6 @@
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // window ids ------------------------------------------------------------------------------
 static NameKeyType parentID = NAMEKEY_INVALID;
@@ -171,20 +166,20 @@ void InitBuddyControls(Int type)
 		buddyControls.isInit = FALSE;
 	break;
 	case BUDDY_WINDOW_BUDDIES:
-		buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:TextEntryChat" ) );
+		buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:TextEntryChat" );
 		buddyControls.textEntryEdit = TheWindowManager->winGetWindowFromId(NULL,  buddyControls.textEntryEditID);
-		buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddies" ) );
-		buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddyChat" ) );
+		buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddies" );
+		buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddyChat" );
 		buddyControls.listboxBuddies = TheWindowManager->winGetWindowFromId( NULL,  buddyControls.listboxBuddiesID );
 		buddyControls.listboxChat = TheWindowManager->winGetWindowFromId( NULL,  buddyControls.listboxChatID);
 		GadgetTextEntrySetText(buddyControls.textEntryEdit, UnicodeString::TheEmptyString);
 		buddyControls.isInit = TRUE;
 		break;
 	case BUDDY_WINDOW_DIPLOMACY:
-		buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( AsciiString( "Diplomacy.wnd:TextEntryChat" ) );
+		buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( "Diplomacy.wnd:TextEntryChat" );
 		buddyControls.textEntryEdit = TheWindowManager->winGetWindowFromId(NULL,  buddyControls.textEntryEditID);
-		buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "Diplomacy.wnd:ListboxBuddies" ) );
-		buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( AsciiString( "Diplomacy.wnd:ListboxBuddyChat" ) );
+		buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( "Diplomacy.wnd:ListboxBuddies" );
+		buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( "Diplomacy.wnd:ListboxBuddyChat" );
 		buddyControls.listboxBuddies = TheWindowManager->winGetWindowFromId( NULL,  buddyControls.listboxBuddiesID );
 		buddyControls.listboxChat = TheWindowManager->winGetWindowFromId( NULL,  buddyControls.listboxChatID);
 		GadgetTextEntrySetText(buddyControls.textEntryEdit, UnicodeString::TheEmptyString);
@@ -195,10 +190,10 @@ void InitBuddyControls(Int type)
 	default:
 		DEBUG_ASSERTCRASH(FALSE, ("Well, you really shouldn't have gotten here, if you really care about GUI Bugs, search for this string, you you don't care, call chris (who probably doesn't care either"));
 	}
-	
+
 }
 
-WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2)
 {
 	if(!TheGameSpyInfo || TheGameSpyInfo->getLocalProfileID() == 0 || !buddyControls.isInit)
@@ -213,7 +208,7 @@ WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
 
-				if( controlID == buddyControls.listboxBuddiesID ) 
+				if( controlID == buddyControls.listboxBuddiesID )
 				{
 					RightClickStruct *rc = (RightClickStruct *)mData2;
 					WindowLayout *rcLayout;
@@ -226,17 +221,17 @@ WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 
 					GadgetListBoxSetSelected(control, rc->pos);
 					if (itemType == ITEM_BUDDY)
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddiesMenu.wnd"));
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddiesMenu.wnd");
 					else if (itemType == ITEM_REQUEST)
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddyRequestMenu.wnd"));
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddyRequestMenu.wnd");
 					else
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNonBuddiesMenu.wnd"));
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCNonBuddiesMenu.wnd");
 					rcMenu = rcLayout->getFirstWindow();
 					rcMenu->winGetLayout()->runInit();
 					rcMenu->winBringToTop();
 					rcMenu->winHide(FALSE);
-					
-					
+
+
 					ICoord2D rcSize, rcPos;
 					rcMenu->winGetSize(&rcSize.x, &rcSize.y);
 					rcPos.x = rc->mouseX;
@@ -247,7 +242,7 @@ WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 						rcPos.y = TheDisplay->getHeight() - rcSize.y;
 					rcMenu->winSetPosition(rcPos.x, rcPos.y);
 
-					
+
 					GameSpyRCMenuData *rcData = NEW GameSpyRCMenuData;
 					rcData->m_id = profileID;
 					rcData->m_nick.translate(nick);
@@ -278,14 +273,14 @@ WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 					if (recipIt == m->end())
 						break;
 
-					DEBUG_LOG(("Trying to send a buddy message to %d.\n", selectedProfile));
+					DEBUG_LOG(("Trying to send a buddy message to %d.", selectedProfile));
 					if (TheGameSpyGame && TheGameSpyGame->isInGame() && TheGameSpyGame->isGameInProgress() &&
 						!ThePlayerList->getLocalPlayer()->isPlayerActive())
 					{
-						DEBUG_LOG(("I'm dead - gotta look for cheats.\n"));
+						DEBUG_LOG(("I'm dead - gotta look for cheats."));
 						for (Int i=0; i<MAX_SLOTS; ++i)
 						{
-							DEBUG_LOG(("Slot[%d] profile is %d\n", i, TheGameSpyGame->getGameSpySlot(i)->getProfileID()));
+							DEBUG_LOG(("Slot[%d] profile is %d", i, TheGameSpyGame->getGameSpySlot(i)->getProfileID()));
 							if (TheGameSpyGame->getGameSpySlot(i)->getProfileID() == selectedProfile)
 							{
 								// can't send to someone in our game if we're dead/observing.  security breach and all that.  no seances for you.
@@ -309,8 +304,7 @@ WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg,
 						// Send the message
 						BuddyRequest req;
 						req.buddyRequestType = BuddyRequest::BUDDYREQUEST_MESSAGE;
-						wcsncpy(req.arg.message.text, txtInput.str(), MAX_BUDDY_CHAT_LEN);
-						req.arg.message.text[MAX_BUDDY_CHAT_LEN-1] = 0;
+						wcslcpy(req.arg.message.text, txtInput.str(), MAX_BUDDY_CHAT_LEN);
 						req.arg.message.recipient = selectedProfile;
 						TheGameSpyBuddyMessageQueue->addRequest(req);
 
@@ -514,12 +508,12 @@ void HandleBuddyResponses( void )
 				break;
 			case BuddyResponse::BUDDYRESPONSE_MESSAGE:
 				{
-					if ( !wcscmp(resp.arg.message.text, L"I have authorized your request to add me to your list") )
+					if ( wcscmp(resp.arg.message.text, L"I have authorized your request to add me to your list") == 0 )
 						break;
 
 					if (TheGameSpyInfo->isSavedIgnored(resp.profile))
 					{
-						//DEBUG_CRASH(("Player is ignored!\n"));
+						//DEBUG_CRASH(("Player is ignored!"));
 						break; // no buddy messages from ignored people
 					}
 
@@ -542,23 +536,21 @@ void HandleBuddyResponses( void )
 					message.m_senderNick = nick;
 					messages->push_back(message);
 
-					DEBUG_LOG(("Inserting buddy chat from '%s'/'%s'\n", nick.str(), resp.arg.message.nick));
+					DEBUG_LOG(("Inserting buddy chat from '%s'/'%s'", nick.str(), resp.arg.message.nick));
 
 					// put message on screen
 					insertChat(message);
-					
+
 					// play audio notification
 					AudioEventRTS buddyMsgAudio("GUIMessageReceived");
 					if( TheAudio )
 					{
 						TheAudio->addAudioEvent( &buddyMsgAudio );
-					}  // end if
+					}
 
 					UnicodeString snippet = message.m_message;
-					while (snippet.getLength() > 11)
-					{
-						snippet.removeLastChar();
-					}
+					snippet.truncateTo(11);
+
 					UnicodeString s;
 					s.format(TheGameText->fetch("Buddy:MessageNotification"), nick.str(), snippet.str());
 					lastNotificationWasStatus = FALSE;
@@ -642,7 +634,7 @@ void HandleBuddyResponses( void )
 	}
 	else
 	{
-		DEBUG_CRASH(("No buddy message queue!\n"));
+		DEBUG_CRASH(("No buddy message queue!"));
 	}
 	if(noticeLayout && timeGetTime() > noticeExpires)
 	{
@@ -685,7 +677,7 @@ void showNotificationBox( AsciiString nick, UnicodeString message)
 	if( TheAudio )
 	{
 		TheAudio->addAudioEvent( &buttonClick );
-	}  // end if
+	}
 
 }
 
@@ -717,20 +709,20 @@ void PopulateOldBuddyMessages(void)
 //-------------------------------------------------------------------------------------------------
 void WOLBuddyOverlayInit( WindowLayout *layout, void *userData )
 {
-	parentID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:BuddyMenuParent" ) );
-	buttonHideID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonHide" ) );
-	buttonAddBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonAdd" ) );
-	buttonDeleteBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonDelete" ) );
-	//textEntryID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:TextEntryChat" ) );
-	//listboxBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddies" ) );
-	//listboxChatID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddyChat" ) );
-	buttonAcceptBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonYes" ) );
-	buttonDenyBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonNo" ) );
-	radioButtonBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:RadioButtonBuddies" ) );
-	radioButtonIgnoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:RadioButtonIgnore" ) );
-	parentBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:BuddiesParent" ) );
-	parentIgnoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:IgnoreParent" ) );
-	listboxIgnoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxIgnore" ) );
+	parentID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:BuddyMenuParent" );
+	buttonHideID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonHide" );
+	buttonAddBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonAdd" );
+	buttonDeleteBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonDelete" );
+	//textEntryID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:TextEntryChat" );
+	//listboxBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddies" );
+	//listboxChatID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddyChat" );
+	buttonAcceptBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonYes" );
+	buttonDenyBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonNo" );
+	radioButtonBuddiesID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:RadioButtonBuddies" );
+	radioButtonIgnoreID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:RadioButtonIgnore" );
+	parentBuddiesID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:BuddiesParent" );
+	parentIgnoreID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:IgnoreParent" );
+	listboxIgnoreID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxIgnore" );
 
 
 	parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
@@ -766,8 +758,8 @@ void WOLBuddyOverlayInit( WindowLayout *layout, void *userData )
 
 	isOverlayActive = true;
 	updateBuddyInfo();
-	
-} // WOLBuddyOverlayInit
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Buddy Overlay shutdown method */
@@ -786,7 +778,7 @@ void WOLBuddyOverlayShutdown( WindowLayout *layout, void *userData )
 
 	InitBuddyControls(BUDDY_RESETALL_CRAP);
 
-}  // WOLBuddyOverlayShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -796,7 +788,7 @@ void WOLBuddyOverlayUpdate( WindowLayout * layout, void *userData)
 {
 	if (!TheGameSpyBuddyMessageQueue || !TheGameSpyBuddyMessageQueue->isConnected())
 		GameSpyCloseOverlay(GSOVERLAY_BUDDY);
-}// WOLBuddyOverlayUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Buddy Overlay input callback */
@@ -804,7 +796,7 @@ void WOLBuddyOverlayUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLBuddyOverlayInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -819,36 +811,36 @@ WindowMsgHandledType WOLBuddyOverlayInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonHide, buttonHideID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLBuddyOverlayInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Buddy Overlay window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
@@ -858,33 +850,33 @@ WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg,
 	}
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 		case GLM_RIGHT_CLICKED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
 
-				if( controlID == listboxIgnoreID ) 
+				if( controlID == listboxIgnoreID )
 				{
 					RightClickStruct *rc = (RightClickStruct *)mData2;
 					WindowLayout *rcLayout;
@@ -918,17 +910,17 @@ WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg,
 
 					GadgetListBoxSetSelected(control, rc->pos);
 					if (isBuddy)
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddiesMenu.wnd"));
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddiesMenu.wnd");
 					else if (isRequest)
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddyRequestMenu.wnd"));
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddyRequestMenu.wnd");
 					else
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNonBuddiesMenu.wnd"));
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCNonBuddiesMenu.wnd");
 					rcMenu = rcLayout->getFirstWindow();
 					rcMenu->winGetLayout()->runInit();
 					rcMenu->winBringToTop();
 					rcMenu->winHide(FALSE);
-					
-					
+
+
 
 					rcMenu->winSetPosition(rc->mouseX, rc->mouseY);
 					GameSpyRCMenuData *rcData = NEW GameSpyRCMenuData;
@@ -991,16 +983,16 @@ WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg,
 					*/
 				}
 				break;
-			}// case GBM_SELECTED:
+			}
 		case GLM_DOUBLE_CLICKED:
 			{
 				/*
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxBuddyID ) 
+				if( controlID == listboxBuddyID )
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						UnicodeString buddyName;
@@ -1095,16 +1087,16 @@ WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg,
 				*/
 				break;
 			}
-		
+
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLBuddyOverlaySystem
+}
 
-WindowMsgHandledType PopupBuddyNotificationSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType PopupBuddyNotificationSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	switch( msg )
@@ -1112,12 +1104,12 @@ WindowMsgHandledType PopupBuddyNotificationSystem( GameWindow *window, UnsignedI
 		case GWM_CREATE:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -1134,10 +1126,10 @@ WindowMsgHandledType PopupBuddyNotificationSystem( GameWindow *window, UnsignedI
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// PopupBuddyNotificationSystem
+}
 
 /*
 static NameKeyType buttonAcceptBuddyID = NAMEKEY_INVALID;
@@ -1177,7 +1169,7 @@ static void closeRightClickMenu(GameWindow *win)
 		WindowLayout *winLay = win->winGetLayout();
 		if(!winLay)
 			return;
-		winLay->destroyWindows();					
+		winLay->destroyWindows();
 		deleteInstance(winLay);
 		winLay = NULL;
 
@@ -1192,8 +1184,7 @@ void RequestBuddyAdd(Int profileID, AsciiString nick)
 	req.arg.addbuddy.id = profileID;
 	UnicodeString buddyAddstr;
 	buddyAddstr = TheGameText->fetch("GUI:BuddyAddReq");
-	wcsncpy(req.arg.addbuddy.text, buddyAddstr.str(), MAX_BUDDY_CHAT_LEN);
-	req.arg.addbuddy.text[MAX_BUDDY_CHAT_LEN-1] = 0;
+	wcslcpy(req.arg.addbuddy.text, buddyAddstr.str(), MAX_BUDDY_CHAT_LEN);
 	TheGameSpyBuddyMessageQueue->addRequest(req);
 
 	UnicodeString s;
@@ -1218,17 +1209,17 @@ void RequestBuddyAdd(Int profileID, AsciiString nick)
 	// insert status into box
 	messages->push_back(message);
 
-	DEBUG_LOG(("Inserting buddy add request\n"));
+	DEBUG_LOG(("Inserting buddy add request"));
 
 	// put message on screen
 	insertChat(message);
-	
+
 	// play audio notification
 	AudioEventRTS buddyMsgAudio("GUIMessageReceived");
 	if( TheAudio )
 	{
 		TheAudio->addAudioEvent( &buddyMsgAudio );
-	}  // end if
+	}
 
 	lastNotificationWasStatus = FALSE;
 	numOnlineInNotification = 0;
@@ -1240,18 +1231,18 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 
 	switch( msg )
 	{
-		
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				rcMenu = NULL;
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GGM_CLOSE:
 			{
@@ -1259,7 +1250,7 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 				//rcMenu = NULL;
 				break;
 			}
-		
+
 
 		case GBM_SELECTED:
 			{
@@ -1279,11 +1270,9 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 				else if (rcData->m_itemType == ITEM_REQUEST)
 					isRequest = TRUE;
 
-				if(rcData)
-				{
-					delete rcData;
-					rcData = NULL;
-				}
+				delete rcData;
+				rcData = NULL;
+
 				window->winSetUserData(NULL);
 				//DEBUG_ASSERTCRASH(profileID > 0, ("Bad profile ID in user data!"));
 
@@ -1291,7 +1280,7 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 				{
 					if(!isGameSpyUser)
 						break;
-					DEBUG_LOG(("ButtonAdd was pushed\n"));
+					DEBUG_LOG(("ButtonAdd was pushed"));
 					if (isRequest)
 					{
 						// ok the request
@@ -1306,7 +1295,7 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 						// request to add him to our list automatically CLH 2-18-03
 						if(!TheGameSpyInfo->isBuddy(profileID))
 						{
-							RequestBuddyAdd(profileID, nick);		
+							RequestBuddyAdd(profileID, nick);
 						}
 						updateBuddyInfo();
 					}
@@ -1327,7 +1316,7 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 						req.arg.profile.id = profileID;
 						TheGameSpyBuddyMessageQueue->addRequest(req);
 					}
-					else 
+					else
 					{
 						// delete the request
 						BuddyRequest req;
@@ -1340,12 +1329,12 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 					BuddyInfoMap *buddies = (isBuddy)?TheGameSpyInfo->getBuddyMap():TheGameSpyInfo->getBuddyRequestMap();
 					buddies->erase(profileID);
 					updateBuddyInfo();
-					DEBUG_LOG(("ButtonDelete was pushed\n"));
+					DEBUG_LOG(("ButtonDelete was pushed"));
 					PopulateLobbyPlayerListbox();
 				}
 				else if( controlID == buttonPlayID )
 				{
-					DEBUG_LOG(("buttonPlayID was pushed\n"));
+					DEBUG_LOG(("buttonPlayID was pushed"));
 				}
 				else if( controlID == buttonIgnoreID )
 				{
@@ -1362,7 +1351,7 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 						}
 					}
 					else
-					{	
+					{
 						if(TheGameSpyInfo->isIgnored(nick))
 						{
 							TheGameSpyInfo->removeFromIgnoreList(nick);
@@ -1379,7 +1368,7 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 				}
 				else if( controlID == buttonStatsID )
 				{
-					DEBUG_LOG(("buttonStatsID was pushed\n"));
+					DEBUG_LOG(("buttonStatsID was pushed"));
 					GameSpyCloseOverlay(GSOVERLAY_PLAYERINFO);
 					SetLookAtPlayer(profileID,nick );
 					GameSpyOpenOverlay(GSOVERLAY_PLAYERINFO);
@@ -1393,8 +1382,8 @@ WindowMsgHandledType WOLBuddyOverlayRCMenuSystem( GameWindow *window, UnsignedIn
 			}
 		default:
 			return MSG_IGNORED;
-	
-	}//Switch		
+
+	}
 	return MSG_HANDLED;
 }
 
@@ -1415,7 +1404,7 @@ void setUnignoreText( WindowLayout *layout, AsciiString nick, GPProfile id)
 void refreshIgnoreList( void )
 {
 
-	
+
 	SavedIgnoreMap tempMap;
 	tempMap = TheGameSpyInfo->returnSavedIgnoreList();
 	SavedIgnoreMap::iterator it = tempMap.begin();
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
index c4fe4c54e36..359cac5d116 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Lib/BaseType.h"
 #include "Common/GameEngine.h"
@@ -63,9 +63,9 @@ static GameWindow *buttonLobby = NULL;
 //-------------------------------------------------------------------------------------------------
 void WOLCustomScoreScreenInit( WindowLayout *layout, void *userData )
 {
-	parentWOLCustomScoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomScoreScreen.wnd:WOLCustomScoreScreenParent" ) );
-	buttonDisconnectID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomScoreScreen.wnd:ButtonDisconnect" ) );
-	buttonLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomScoreScreen.wnd:ButtonLobby" ) );
+	parentWOLCustomScoreID = TheNameKeyGenerator->nameToKey( "WOLCustomScoreScreen.wnd:WOLCustomScoreScreenParent" );
+	buttonDisconnectID = TheNameKeyGenerator->nameToKey( "WOLCustomScoreScreen.wnd:ButtonDisconnect" );
+	buttonLobbyID = TheNameKeyGenerator->nameToKey( "WOLCustomScoreScreen.wnd:ButtonLobby" );
 	parentWOLCustomScore = TheWindowManager->winGetWindowFromId( NULL, parentWOLCustomScoreID );
 	buttonDisconnect = TheWindowManager->winGetWindowFromId( NULL,  buttonDisconnectID);
 	buttonLobby = TheWindowManager->winGetWindowFromId( NULL,  buttonLobbyID);
@@ -84,7 +84,7 @@ void WOLCustomScoreScreenInit( WindowLayout *layout, void *userData )
 
 	// Set Keyboard to Main Parent
 	TheWindowManager->winSetFocus( parentWOLCustomScore );
-} // WOLCustomScoreScreenInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu shutdown method */
@@ -96,7 +96,7 @@ void WOLCustomScoreScreenShutdown( WindowLayout *layout, void *userData )
 
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
-}  // WOLCustomScoreScreenShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -108,7 +108,7 @@ void WOLCustomScoreScreenUpdate( WindowLayout * layout, void *userData)
 	if (WOL::TheWOL)
 		WOL::TheWOL->update();
 	*/
-}// WOLCustomScoreScreenUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu input callback */
@@ -116,7 +116,7 @@ void WOLCustomScoreScreenUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLCustomScoreScreenInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -131,36 +131,36 @@ WindowMsgHandledType WOLCustomScoreScreenInput( GameWindow *window, UnsignedInt
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonDisconnect, buttonDisconnectID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLCustomScoreScreenInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLCustomScoreScreenSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLCustomScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
@@ -170,23 +170,23 @@ WindowMsgHandledType WOLCustomScoreScreenSystem( GameWindow *window, UnsignedInt
 
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're given the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -201,7 +201,7 @@ WindowMsgHandledType WOLCustomScoreScreenSystem( GameWindow *window, UnsignedInt
 						WOL::TheWOL->addCommand( WOL::WOLCOMMAND_RESET );  // don't display an error, log out, or anything
 					}
 
-				} //if ( controlID == buttonDisconnect )
+				}
 				else if ( controlID == buttonLobbyID )
 				{
 					if (WOL::TheWOL->getState() != WOL::WOLAPI_FATAL_ERROR)
@@ -214,11 +214,11 @@ WindowMsgHandledType WOLCustomScoreScreenSystem( GameWindow *window, UnsignedInt
 					else
 					{
 					}
-				} //if ( controlID == buttonDisconnect )
+				}
 				*/
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -226,7 +226,7 @@ WindowMsgHandledType WOLCustomScoreScreenSystem( GameWindow *window, UnsignedInt
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLCustomScoreScreenSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
index 97910d58897..c5a6755723a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
@@ -28,7 +28,7 @@
 // Description: WOL Game Options Menu
 ///////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
@@ -67,17 +67,12 @@
 
 void WOLDisplaySlotList( void );
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 extern std::list<PeerResponse> TheLobbyQueuedUTMs;
 extern void MapSelectorTooltip(GameWindow *window, WinInstanceData *instData,	UnsignedInt mouse);
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 extern Bool g_debugSlots;
 void slotListDebugLog(const char *fmt, ...)
 {
@@ -118,7 +113,7 @@ void SendStatsToOtherPlayers(const GameInfo *game)
 	subStats.locale = fullStats.locale;
 	subStats.gamesAsRandom = fullStats.gamesAsRandom;
 	GetAdditionalDisconnectsFromUserFile(&subStats);
-	fullStr.format("%d %s", TheGameSpyInfo->getLocalProfileID(), TheGameSpyPSMessageQueue->formatPlayerKVPairs( subStats ));
+	fullStr.format("%d %s", TheGameSpyInfo->getLocalProfileID(), TheGameSpyPSMessageQueue->formatPlayerKVPairs( subStats ).c_str());
 	req.options = fullStr.str();
 
 	Int localIndex = game->getLocalSlotNum();
@@ -130,7 +125,7 @@ void SendStatsToOtherPlayers(const GameInfo *game)
 			AsciiString hostName;
 			hostName.translate(slot->getName());
 			req.nick = hostName.str();
-			DEBUG_LOG(("SendStatsToOtherPlayers() - sending to '%s', data of\n\t'%s'\n", hostName.str(), req.options.c_str()));
+			DEBUG_LOG(("SendStatsToOtherPlayers() - sending to '%s', data of\n\t'%s'", hostName.str(), req.options.c_str()));
 			TheGameSpyPeerMessageQueue->addRequest(req);
 		}
 	}
@@ -259,7 +254,7 @@ void PopBackToLobby( void )
 		//TheGameSpyInfo->joinBestGroupRoom();
 	}
 
-	DEBUG_LOG(("PopBackToLobby() - parentWOLGameSetup is %X\n", parentWOLGameSetup));
+	DEBUG_LOG(("PopBackToLobby() - parentWOLGameSetup is %X", parentWOLGameSetup));
 	if (parentWOLGameSetup)
 	{
 		nextScreen = "Menus/WOLCustomLobby.wnd";
@@ -277,13 +272,13 @@ void WOLPositionStartSpots( void )
 		win = TheWindowManager->winGetWindowFromId(NULL, windowMapSelectMapID);
 
 		// get the controls.
-		NameKeyType listboxMapID = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ListboxMap") );
+		NameKeyType listboxMapID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ListboxMap" );
 		GameWindow *listboxMap = TheWindowManager->winGetWindowFromId( NULL, listboxMapID );
 
 		if (listboxMap != NULL) {
 			Int selected;
 			UnicodeString map;
-			
+
 			// get the selected index
 			GadgetListBoxGetSelected( listboxMap, &selected );
 
@@ -292,8 +287,8 @@ void WOLPositionStartSpots( void )
 
 				// get text of the map to load
 				map = GadgetListBoxGetText( listboxMap, selected, 0 );
-				
-				
+
+
 				// set the map name in the global data map name
 				AsciiString asciiMap;
 				const char *mapFname = (const char *)GadgetListBoxGetItemData( listboxMap, selected );
@@ -305,7 +300,7 @@ void WOLPositionStartSpots( void )
 				}
 
 				positionStartSpots(asciiMap, buttonMapStartPosition, win);
-			}			
+			}
 		}
 
 	} else {
@@ -442,7 +437,7 @@ static void playerTooltip(GameWindow *window,
 	else if( stats.gamesAsRandom >= numGames )
 		favoriteSide = TheGameText->fetch("GUI:Random");
 	else
-	{		
+	{
 		const PlayerTemplate *fac = ThePlayerTemplateStore->getNthPlayerTemplate(favorite);
 		if (fac)
 		{
@@ -516,7 +511,7 @@ void pingTooltip(GameWindow *window, WinInstanceData *instData, UnsignedInt mous
 	x = LOLONGTOSHORT(mouse);
 	y = HILONGTOSHORT(mouse);
 
-	
+
 	Int winPosX, winPosY, winWidth, winHeight;
 
 	window->winGetScreenPosition(&winPosX, &winPosY);
@@ -658,7 +653,7 @@ static void handlePlayerTemplateSelection(int index)
 static void handleStartPositionSelection(Int player, int startPos)
 {
 	GameSpyStagingRoom *myGame = TheGameSpyInfo->getCurrentStagingRoom();
-	
+
 	if (myGame)
 	{
 		GameSpyGameSlot * slot = myGame->getGameSpySlot(player);
@@ -674,7 +669,7 @@ static void handleStartPositionSelection(Int player, int startPos)
 		}
 
 		if(!skip)
-		{	
+		{
 			Bool isAvailable = TRUE;
 			for(Int i = 0; i < MAX_SLOTS; ++i)
 			{
@@ -765,17 +760,17 @@ static void handleTeamSelection(int index)
 static void handleStartingCashSelection()
 {
   GameInfo *myGame = TheGameSpyInfo->getCurrentStagingRoom();
-  
+
   if (myGame)
   {
     Int selIndex;
     GadgetComboBoxGetSelectedPos(comboBoxStartingCash, &selIndex);
-    
+
     Money startingCash;
-    startingCash.deposit( (UnsignedInt)GadgetComboBoxGetItemData( comboBoxStartingCash, selIndex ), FALSE );
+    startingCash.deposit( (UnsignedInt)GadgetComboBoxGetItemData( comboBoxStartingCash, selIndex ), FALSE, FALSE );
     myGame->setStartingCash( startingCash );
     myGame->resetAccepted();
-    
+
     if (myGame->amIHost())
     {
       // send around the new data
@@ -788,7 +783,7 @@ static void handleStartingCashSelection()
 static void handleLimitSuperweaponsClick()
 {
   GameInfo *myGame = TheGameSpyInfo->getCurrentStagingRoom();
-  
+
   if (myGame)
   {
     // At the moment, 1 and 0 are the only choices supported in the GUI, though the system could
@@ -802,7 +797,7 @@ static void handleLimitSuperweaponsClick()
       myGame->setSuperweaponRestriction( 0 );
     }
     myGame->resetAccepted();
-    
+
     if (myGame->amIHost())
     {
       // send around a new slotlist
@@ -897,7 +892,7 @@ static void StartPressed(void)
 
 	// Check for too few teams
 	int numRandom = 0;
-	std::set<Int> teams; 
+	std::set<Int> teams;
 	for (i=0; i<MAX_SLOTS; ++i)
 	{
 		GameSlot *slot = myGame->getSlot(i);
@@ -961,7 +956,7 @@ static void StartPressed(void)
 		TheGameSpyPeerMessageQueue->addRequest(req);
 	}
 
-}//void StartPressed(void)
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update options on screen */
@@ -1010,7 +1005,7 @@ void WOLDisplayGameOptions( void )
     // Repopulate the lists of available armies, since the old list is now wrong
     for (Int i = 0; i < MAX_SLOTS; i++)
     {
-      PopulatePlayerTemplateComboBox(i, comboBoxPlayerTemplate, theGame, theGame->getAllowObservers() );      
+      PopulatePlayerTemplateComboBox(i, comboBoxPlayerTemplate, theGame, theGame->getAllowObservers() );
 
       // Make sure selections are up to date on all machines
       handlePlayerTemplateSelection(i) ;
@@ -1021,7 +1016,7 @@ void WOLDisplayGameOptions( void )
   Bool limitSuperweapons = (theGame->getSuperweaponRestriction() != 0);
   if ( limitSuperweapons != GadgetCheckBoxIsChecked(checkBoxLimitSuperweapons))
     GadgetCheckBoxSetChecked( checkBoxLimitSuperweapons, limitSuperweapons );
-  
+
   Int itemCount = GadgetComboBoxGetLength(comboBoxStartingCash);
   Int index = 0;
   for ( ; index < itemCount; index++ )
@@ -1038,7 +1033,7 @@ void WOLDisplayGameOptions( void )
       break;
     }
   }
-  
+
   DEBUG_ASSERTCRASH( index < itemCount, ("Could not find new starting cash amount %d in list", theGame->getStartingCash().countMoney() ) );
 }
 
@@ -1113,20 +1108,20 @@ void InitWOLGameGadgets( void )
 	DEBUG_ASSERTCRASH(pingImages[2], ("Can't find ping image!"));
 
 	//Initialize the gadget IDs
-	parentWOLGameSetupID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:GameSpyGameOptionsMenuParent" ) );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonBack" ) );
-	buttonStartID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonStart" ) );
-	textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:TextEntryChat" ) );
-	textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:TextEntryMapDisplay" ) );
-	listboxGameSetupChatID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ListboxChatWindowGameSpyGameSetup" ) );
-	buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonEmote" ) );
-	buttonSelectMapID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonSelectMap" ) );
-	checkBoxUseStatsID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:CheckBoxUseStats" ) );
-	windowMapID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:MapWindow" ) );
-  checkBoxLimitSuperweaponsID = TheNameKeyGenerator->nameToKey(AsciiString("GameSpyGameOptionsMenu.wnd:CheckboxLimitSuperweapons"));
-  comboBoxStartingCashID = TheNameKeyGenerator->nameToKey(AsciiString("GameSpyGameOptionsMenu.wnd:ComboBoxStartingCash"));
-  checkBoxLimitArmiesID = TheNameKeyGenerator->nameToKey(AsciiString("GameSpyGameOptionsMenu.wnd:CheckBoxLimitArmies"));
-	windowMapSelectMapID = TheNameKeyGenerator->nameToKey(AsciiString("WOLMapSelectMenu.wnd:WinMapPreview"));
+	parentWOLGameSetupID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:GameSpyGameOptionsMenuParent" );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonBack" );
+	buttonStartID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonStart" );
+	textEntryChatID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:TextEntryChat" );
+	textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:TextEntryMapDisplay" );
+	listboxGameSetupChatID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ListboxChatWindowGameSpyGameSetup" );
+	buttonEmoteID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonEmote" );
+	buttonSelectMapID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonSelectMap" );
+	checkBoxUseStatsID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:CheckBoxUseStats" );
+	windowMapID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:MapWindow" );
+  checkBoxLimitSuperweaponsID = TheNameKeyGenerator->nameToKey("GameSpyGameOptionsMenu.wnd:CheckboxLimitSuperweapons");
+  comboBoxStartingCashID = TheNameKeyGenerator->nameToKey("GameSpyGameOptionsMenu.wnd:ComboBoxStartingCash");
+  checkBoxLimitArmiesID = TheNameKeyGenerator->nameToKey("GameSpyGameOptionsMenu.wnd:CheckBoxLimitArmies");
+	windowMapSelectMapID = TheNameKeyGenerator->nameToKey("WOLMapSelectMenu.wnd:WinMapPreview");
 
 	NameKeyType staticTextTitleID = NAMEKEY("GameSpyGameOptionsMenu.wnd:StaticTextGameName");
 
@@ -1163,7 +1158,7 @@ void InitWOLGameGadgets( void )
   {
     checkBoxLimitSuperweapons->winEnable( false );
     comboBoxStartingCash->winEnable( false );
-		NameKeyType labelID = TheNameKeyGenerator->nameToKey(AsciiString("GameSpyGameOptionsMenu.wnd:StartingCashLabel"));
+		NameKeyType labelID = TheNameKeyGenerator->nameToKey("GameSpyGameOptionsMenu.wnd:StartingCashLabel");
 		TheWindowManager->winGetWindowFromId(parentWOLGameSetup, labelID)->winEnable( FALSE );
   }
 
@@ -1174,15 +1169,12 @@ void InitWOLGameGadgets( void )
 		checkBoxLimitSuperweapons->winEnable( FALSE );
 		comboBoxStartingCash->winEnable( FALSE );
 		checkBoxLimitArmies->winEnable( FALSE );
-		NameKeyType labelID = TheNameKeyGenerator->nameToKey(AsciiString("GameSpyGameOptionsMenu.wnd:StartingCashLabel"));
+		NameKeyType labelID = TheNameKeyGenerator->nameToKey("GameSpyGameOptionsMenu.wnd:StartingCashLabel");
 		TheWindowManager->winGetWindowFromId(parentWOLGameSetup, labelID)->winEnable( FALSE );
 	}
 
-	//Added By Sadullah Nader
-	//Tooltip Function set 
 	windowMap->winSetTooltipFunc(MapSelectorTooltip);
-	//
-	
+
 	GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, staticTextTitleID );
 	if (staticTextTitle)
 	{
@@ -1211,14 +1203,7 @@ void InitWOLGameGadgets( void )
 		if (TheGameSpyInfo->amIHost())
 			staticTextPlayer[i]->winHide(TRUE);
 
-		if(i==0 && TheGameSpyInfo->amIHost())
-		{
-			UnicodeString uName;
-			uName.translate(TheGameSpyInfo->getLocalName());
-			GadgetComboBoxAddEntry(comboBoxPlayer[i],uName,GameSpyColor[GSCOLOR_PLAYER_OWNER]);
-			GadgetComboBoxSetSelectedPos(comboBoxPlayer[0],0);
-		}
-		else
+		if(theGameInfo->getLocalSlotNum() != i)
 		{
 			GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Open"),GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
 			GadgetComboBoxAddEntry(comboBoxPlayer[i],TheGameText->fetch("GUI:Closed"),GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
@@ -1234,7 +1219,7 @@ void InitWOLGameGadgets( void )
 		DEBUG_ASSERTCRASH(comboBoxColor[i], ("Could not find the comboBoxColor[%d]",i ));
 		PopulateColorComboBox(i, comboBoxColor, theGameInfo);
 		GadgetComboBoxSetSelectedPos(comboBoxColor[i], 0);
-		
+
 		tmpString.format("GameSpyGameOptionsMenu.wnd:ComboBoxPlayerTemplate%d", i);
 		comboBoxPlayerTemplateID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		comboBoxPlayerTemplate[i] = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, comboBoxPlayerTemplateID[i] );
@@ -1251,13 +1236,13 @@ void InitWOLGameGadgets( void )
 		DEBUG_ASSERTCRASH(comboBoxTeam[i], ("Could not find the comboBoxTeam[%d]",i ));
 		PopulateTeamComboBox(i, comboBoxTeam, theGameInfo);
 
-		tmpString.format("GameSpyGameOptionsMenu.wnd:ButtonAccept%d", i); 
+		tmpString.format("GameSpyGameOptionsMenu.wnd:ButtonAccept%d", i);
 		buttonAcceptID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		buttonAccept[i] = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, buttonAcceptID[i] );
 		DEBUG_ASSERTCRASH(buttonAccept[i], ("Could not find the buttonAccept[%d]",i ));
 		buttonAccept[i]->winSetTooltipFunc(gameAcceptTooltip);
 
-		tmpString.format("GameSpyGameOptionsMenu.wnd:GenericPing%d", i); 
+		tmpString.format("GameSpyGameOptionsMenu.wnd:GenericPing%d", i);
 		genericPingWindowID[i] = TheNameKeyGenerator->nameToKey( tmpString );
 		genericPingWindow[i] = TheWindowManager->winGetWindowFromId( parentWOLGameSetup, genericPingWindowID[i] );
 		DEBUG_ASSERTCRASH(genericPingWindow[i], ("Could not find the genericPingWindow[%d]",i ));
@@ -1300,11 +1285,15 @@ void DeinitWOLGameGadgets( void )
 	listboxGameSetupChat = NULL;
 	textEntryChat = NULL;
 	textEntryMapDisplay = NULL;
-	windowMap = NULL;
+	if (windowMap)
+	{
+		windowMap->winSetUserData(NULL);
+		windowMap = NULL;
+	}
 	checkBoxUseStats = NULL;
   checkBoxLimitSuperweapons = NULL;
   comboBoxStartingCash = NULL;
-  
+
 //	GameWindow *staticTextTitle = NULL;
 	for (Int i = 0; i < MAX_SLOTS; i++)
 	{
@@ -1345,28 +1334,26 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 			GameSpyCloseAllOverlays();
 			GSMessageBoxOk( title, body );
 			TheGameSpyInfo->reset();
-			DEBUG_LOG(("WOLGameSetupMenuInit() - game was in progress, and we were disconnected, so pop immediate back to main menu\n"));
+			DEBUG_LOG(("WOLGameSetupMenuInit() - game was in progress, and we were disconnected, so pop immediate back to main menu"));
 			TheShell->popImmediate();
 			return;
 		}
 
 		// If we init while the game is in progress, we are really returning to the menu
 		// after the game.  So, we pop the menu and go back to the lobby.  Whee!
-		DEBUG_LOG(("WOLGameSetupMenuInit() - game was in progress, so pop immediate back to lobby\n"));
+		DEBUG_LOG(("WOLGameSetupMenuInit() - game was in progress, so pop immediate back to lobby"));
 		TheShell->popImmediate();
 		if (TheGameSpyPeerMessageQueue && TheGameSpyPeerMessageQueue->isConnected())
 		{
-			DEBUG_LOG(("We're still connected, so pushing back on the lobby\n"));
+			DEBUG_LOG(("We're still connected, so pushing back on the lobby"));
 			TheShell->push("Menus/WOLCustomLobby.wnd", TRUE);
 		}
 		return;
 	}
 	TheGameSpyInfo->setCurrentGroupRoom(0);
 
-	if (TheNAT != NULL) {
-		delete TheNAT;
-		TheNAT = NULL;
-	}
+	delete TheNAT;
+	TheNAT = NULL;
 
 	nextScreen = NULL;
 	buttonPushed = false;
@@ -1435,6 +1422,9 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 
 		WOLDisplaySlotList();
 		WOLDisplayGameOptions();
+
+		// TheSuperHackers @tweak disable the combo box for the host's player name
+		comboBoxPlayer[0]->winEnable(FALSE);
 	}
 	else
 	{
@@ -1461,7 +1451,7 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 		options.format("Ping=%s", TheGameSpyInfo->getPingString().str());
 		req.options = options.str();
 		TheGameSpyPeerMessageQueue->addRequest(req);
-   
+
 		game->setMapCRC( game->getMapCRC() );		// force a recheck
 		game->setMapSize( game->getMapSize() ); // of if we have the map
 
@@ -1487,10 +1477,10 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 
 	// Show the Menu
 	layout->hide( FALSE );
-	
+
 	// Make sure the text fields are clear
 	GadgetListBoxReset( listboxGameSetupChat );
-	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);	
+	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);
 
 	initDone = true;
 	TheGameSpyInfo->setGameOptions();
@@ -1504,7 +1494,7 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 	TheWindowManager->winSetFocus( textEntryChat );
 	raiseMessageBoxes = true;
 	TheTransitionHandler->setGroup("GameSpyGameOptionsMenuFade");
-}// void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -1524,7 +1514,7 @@ static void shutdownComplete( WindowLayout *layout )
 	{
 		if (!TheGameSpyPeerMessageQueue || !TheGameSpyPeerMessageQueue->isConnected())
 		{
-			DEBUG_LOG(("GameSetup shutdownComplete() - skipping push because we're disconnected\n"));
+			DEBUG_LOG(("GameSetup shutdownComplete() - skipping push because we're disconnected"));
 		}
 		else
 		{
@@ -1542,7 +1532,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	nextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** GameSpy Game Options menu shutdown method */
@@ -1576,13 +1566,13 @@ void WOLGameSetupMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 
 	RaiseGSMessageBox();
 	TheTransitionHandler->reverse("GameSpyGameOptionsMenuFade");
-}  // void WOLGameSetupMenuShutdown( WindowLayout *layout, void *userData )
+}
 
 static void fillPlayerInfo(const PeerResponse *resp, PlayerInfo *info)
 {
@@ -1602,7 +1592,7 @@ static void fillPlayerInfo(const PeerResponse *resp, PlayerInfo *info)
 //-------------------------------------------------------------------------------------------------
 void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 {
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 	{
 		shutdownComplete(layout);
@@ -1670,7 +1660,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 			{
 				// haven't seen ourselves
 				buttonPushed = true;
-				DEBUG_LOG(("Haven't seen ourselves in slotlist\n"));
+				DEBUG_LOG(("Haven't seen ourselves in slotlist"));
 				if (TheGameSpyGame)
 					TheGameSpyGame->reset();
 				TheGameSpyInfo->leaveStagingRoom();
@@ -1721,13 +1711,13 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 
 		if (!TheLobbyQueuedUTMs.empty())
 		{
-			DEBUG_LOG(("Got response from queued lobby UTM list\n"));
+			DEBUG_LOG(("Got response from queued lobby UTM list"));
 			resp = TheLobbyQueuedUTMs.front();
 			TheLobbyQueuedUTMs.pop_front();
 		}
 		else if (TheGameSpyPeerMessageQueue->getResponse( resp ))
 		{
-			DEBUG_LOG(("Got response from message queue\n"));
+			DEBUG_LOG(("Got response from message queue"));
 		}
 			else
 		{
@@ -1914,7 +1904,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 						// send out new slotlist if I'm host
 						TheGameSpyInfo->setGameOptions();
 						WOLDisplaySlotList();
-						
+
 						if (game && !TheGameSpyInfo->amIHost())
 						{
 							Int idx = game->getSlotNum(resp.nick.c_str());
@@ -1955,44 +1945,45 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 					TheGameSpyInfo->reset();
 					TheShell->pop();
 				}
+				break;
 
 			case PeerResponse::PEERRESPONSE_ROOMUTM:
 				{
 					sawImportantMessage = TRUE;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 					if (g_debugSlots)
 					{
-						DEBUG_LOG(("About to process a room UTM.  Command is '%s', command options is '%s'\n",
+						DEBUG_LOG(("About to process a room UTM.  Command is '%s', command options is '%s'",
 							resp.command.c_str(), resp.commandOptions.c_str()));
 					}
 #endif
-					if (!strcmp(resp.command.c_str(), "SL"))
+					if (strcmp(resp.command.c_str(), "SL") == 0)
 					{
 						// slotlist
 						GameSpyStagingRoom *game = TheGameSpyInfo->getCurrentStagingRoom();
 						Bool isValidSlotList = game && game->getSlot(0) && game->getSlot(0)->isPlayer( resp.nick.c_str() ) && !TheGameSpyInfo->amIHost();
 						if (!isValidSlotList)
 						{
-							SLOTLIST_DEBUG_LOG(("Not a valid slotlist\n"));
+							SLOTLIST_DEBUG_LOG(("Not a valid slotlist"));
 							if (!game)
 							{
-								SLOTLIST_DEBUG_LOG(("No game!\n"));
+								SLOTLIST_DEBUG_LOG(("No game!"));
 							}
 							else
 							{
 								if (!game->getSlot(0))
 								{
-									SLOTLIST_DEBUG_LOG(("No slot 0!\n"));
+									SLOTLIST_DEBUG_LOG(("No slot 0!"));
 								}
 								else
 								{
 									if (TheGameSpyInfo->amIHost())
 									{
-										SLOTLIST_DEBUG_LOG(("I'm the host!\n"));
+										SLOTLIST_DEBUG_LOG(("I'm the host!"));
 									}
 									else
 									{
-										SLOTLIST_DEBUG_LOG(("Not from the host!  isHuman:%d, name:'%ls', sender:'%s'\n",
+										SLOTLIST_DEBUG_LOG(("Not from the host!  isHuman:%d, name:'%ls', sender:'%s'",
 											game->getSlot(0)->isHuman(), game->getSlot(0)->getName().str(),
 											resp.nick.c_str()));
 									}
@@ -2035,9 +2026,9 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 #ifdef DEBUG_LOGGING
 										UnsignedShort newPort = game->getConstSlot(i)->getPort();
 										UnsignedInt newIP = game->getConstSlot(i)->getIP();
-										DEBUG_ASSERTLOG(newIP == ips[i], ("IP was different for player %d (%X --> %X)\n",
+										DEBUG_ASSERTLOG(newIP == ips[i], ("IP was different for player %d (%X --> %X)",
 											i, ips[i], newIP));
-										DEBUG_ASSERTLOG(newPort == ports[i], ("Port was different for player %d (%d --> %d)\n",
+										DEBUG_ASSERTLOG(newPort == ports[i], ("Port was different for player %d (%d --> %d)",
 											i, ports[i], newPort));
 #endif
 										game->getSlot(i)->setPort(ports[i]);
@@ -2049,15 +2040,15 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 							Bool isInGame = newLocalSlotNum >= 0;
 							if (!optionsOK)
 							{
-								SLOTLIST_DEBUG_LOG(("Options are bad!  bailing!\n"));
+								SLOTLIST_DEBUG_LOG(("Options are bad!  bailing!"));
 								break;
 							}
 							else
 							{
-								SLOTLIST_DEBUG_LOG(("Options are good, local slot is %d\n", newLocalSlotNum));
+								SLOTLIST_DEBUG_LOG(("Options are good, local slot is %d", newLocalSlotNum));
 								if (!isInGame)
 								{
-									SLOTLIST_DEBUG_LOG(("Not in game; players are:\n"));
+									SLOTLIST_DEBUG_LOG(("Not in game; players are:"));
 									for (Int i=0; i<MAX_SLOTS; ++i)
 									{
 										const GameSpyGameSlot *slot = game->getGameSpySlot(i);
@@ -2065,7 +2056,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 										{
 											UnicodeString munkee;
 											munkee.format(L"\t%d: %ls", i, slot->getName().str());
-											SLOTLIST_DEBUG_LOG(("%ls\n", munkee.str()));
+											SLOTLIST_DEBUG_LOG(("%ls", munkee.str()));
 										}
 									}
 								}
@@ -2125,7 +2116,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 								{
 									// can't see ourselves
 									buttonPushed = true;
-									DEBUG_LOG(("Can't see ourselves in slotlist %s\n", options.str()));
+									DEBUG_LOG(("Can't see ourselves in slotlist %s", options.str()));
 									TheGameSpyInfo->getCurrentStagingRoom()->reset();
 									TheGameSpyInfo->leaveStagingRoom();
 									//TheGameSpyInfo->joinBestGroupRoom();
@@ -2136,7 +2127,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 							}
 						}
 					}
-					else if (!strcmp(resp.command.c_str(), "HWS"))
+					else if (strcmp(resp.command.c_str(), "HWS") == 0)
 					{
 						// host wants to start
 						GameInfo *game = TheGameSpyInfo->getCurrentStagingRoom();
@@ -2150,13 +2141,13 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 							}
 						}
 					}
-					else if (!stricmp(resp.command.c_str(), "NAT"))
+					else if (stricmp(resp.command.c_str(), "NAT") == 0)
 					{
 						if (TheNAT != NULL) {
 							TheNAT->processGlobalMessage(-1, resp.commandOptions.c_str());
 						}
 					}
-					else if (!stricmp(resp.command.c_str(), "Pings"))
+					else if (stricmp(resp.command.c_str(), "Pings") == 0)
 					{
 						if (!TheGameSpyInfo->amIHost())
 						{
@@ -2183,7 +2174,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 			case PeerResponse::PEERRESPONSE_PLAYERUTM:
 				{
 					sawImportantMessage = TRUE;
-					if (!strcmp(resp.command.c_str(), "STATS"))
+					if (strcmp(resp.command.c_str(), "STATS") == 0)
 					{
 						PSPlayerStats stats = TheGameSpyPSMessageQueue->parsePlayerKVPairs(resp.commandOptions.c_str());
 						if (stats.id && (TheGameSpyPSMessageQueue->findPlayerStatsByID(stats.id).id == 0))
@@ -2194,7 +2185,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 					if (game)
 					{
 						Int slotNum = game->getSlotNum(resp.nick.c_str());
-						if ((slotNum >= 0) && (slotNum < MAX_SLOTS) && (!stricmp(resp.command.c_str(), "NAT"))) {
+						if ((slotNum >= 0) && (slotNum < MAX_SLOTS) && (stricmp(resp.command.c_str(), "NAT") == 0)) {
 							// this is a command for NAT negotiations, pass if off to TheNAT
 							if (TheNAT != NULL) {
 								TheNAT->processGlobalMessage(slotNum, resp.commandOptions.c_str());
@@ -2202,7 +2193,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 						}
 						if (slotNum == 0 && !TheGameSpyInfo->amIHost())
 						{
-							if (!strcmp(resp.command.c_str(), "KICK"))
+							if (strcmp(resp.command.c_str(), "KICK") == 0)
 							{
 								// oops - we've been kicked.  bail.
 								buttonPushed = true;
@@ -2212,7 +2203,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 								UnicodeString message = TheGameText->fetch("GUI:GSKicked");
 								AsciiString commandMessage = resp.commandOptions.c_str();
 								commandMessage.trim();
-								DEBUG_LOG(("We were kicked: reason was '%s'\n", resp.commandOptions.c_str()));
+								DEBUG_LOG(("We were kicked: reason was '%s'", resp.commandOptions.c_str()));
 								if (commandMessage == "GameStarted")
 								{
 									message = TheGameText->fetch("GUI:GSKickedGameStarted");
@@ -2228,13 +2219,13 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 						}
 						else if (slotNum > 0 && TheGameSpyInfo->amIHost())
 						{
-							if (!strcmp(resp.command.c_str(), "accept"))
+							if (strcmp(resp.command.c_str(), "accept") == 0)
 							{
 								game->getSlot(slotNum)->setAccept();
 								TheGameSpyInfo->setGameOptions();
 								WOLDisplaySlotList();
 							}
-							else if (!strcmp(resp.command.c_str(), "MAP"))
+							else if (strcmp(resp.command.c_str(), "MAP") == 0)
 							{
 								Bool hasMap = atoi(resp.commandOptions.c_str());
 								game->getSlot(slotNum)->setMapAvailability(hasMap);
@@ -2263,7 +2254,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 								}
 								WOLDisplaySlotList();
 							}
-							else if (!strcmp(resp.command.c_str(), "REQ"))
+							else if (strcmp(resp.command.c_str(), "REQ") == 0)
 							{
 								AsciiString options = resp.commandOptions.c_str();
 								options.trim();
@@ -2274,7 +2265,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 								options.nextToken(&key, "=");
 								Int val = atoi(options.str()+1);
 								UnsignedInt uVal = atoi(options.str()+1);
-								DEBUG_LOG(("GameOpt request: key=%s, val=%s from player %d\n", key.str(), options.str()+1, slotNum));
+								DEBUG_LOG(("GameOpt request: key=%s, val=%s from player %d", key.str(), options.str()+1, slotNum));
 
 								GameSpyGameSlot *slot = game->getGameSpySlot(slotNum);
 								if (!slot)
@@ -2303,7 +2294,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 									}
 									else
 									{
-										DEBUG_LOG(("Rejecting invalid color %d\n", val));
+										DEBUG_LOG(("Rejecting invalid color %d", val));
 									}
 								}
 								else if (key == "PlayerTemplate")
@@ -2332,7 +2323,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 									}
 									else
 									{
-										DEBUG_LOG(("Rejecting invalid PlayerTemplate %d\n", val));
+										DEBUG_LOG(("Rejecting invalid PlayerTemplate %d", val));
 									}
 								}
 								else if (key == "StartPos")
@@ -2359,7 +2350,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 									}
 									else
 									{
-										DEBUG_LOG(("Rejecting invalid startPos %d\n", val));
+										DEBUG_LOG(("Rejecting invalid startPos %d", val));
 									}
 								}
 								else if (key == "Team")
@@ -2372,7 +2363,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 									}
 									else
 									{
-										DEBUG_LOG(("Rejecting invalid team %d\n", val));
+										DEBUG_LOG(("Rejecting invalid team %d", val));
 									}
 								}
 								else if (key == "IP")
@@ -2386,7 +2377,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 									}
 									else
 									{
-										DEBUG_LOG(("Rejecting invalid IP %d\n", uVal));
+										DEBUG_LOG(("Rejecting invalid IP %d", uVal));
 									}
 								}
 								else if (key == "NAT")
@@ -2395,19 +2386,19 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 											(val <= FirewallHelperClass::FIREWALL_MAX))
 									{
 										slot->setNATBehavior((FirewallHelperClass::FirewallBehaviorType)val);
-										DEBUG_LOG(("Setting NAT behavior to %d for player %d\n", val, slotNum));
+										DEBUG_LOG(("Setting NAT behavior to %d for player %d", val, slotNum));
 										change = true;
 									}
 									else
 									{
-										DEBUG_LOG(("Rejecting invalid NAT behavior %d from player %d\n", val, slotNum));
+										DEBUG_LOG(("Rejecting invalid NAT behavior %d from player %d", val, slotNum));
 									}
 								}
 								else if (key == "Ping")
 								{
 									slot->setPingString(options.str()+1);
 									TheGameSpyInfo->setGameOptions();
-									DEBUG_LOG(("Setting ping string to %s for player %d\n", options.str()+1, slotNum));
+									DEBUG_LOG(("Setting ping string to %s for player %d", options.str()+1, slotNum));
 								}
 
 								if (change)
@@ -2418,9 +2409,9 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 									TheGameSpyInfo->setGameOptions();
 
 									WOLDisplaySlotList();
-									DEBUG_LOG(("Slot value is color=%d, PlayerTemplate=%d, startPos=%d, team=%d, IP=0x%8.8X\n",
+									DEBUG_LOG(("Slot value is color=%d, PlayerTemplate=%d, startPos=%d, team=%d, IP=0x%8.8X",
 										slot->getColor(), slot->getPlayerTemplate(), slot->getStartPos(), slot->getTeamNumber(), slot->getIP()));
-									DEBUG_LOG(("Slot list updated to %s\n", GameInfoToAsciiString(game).str()));
+									DEBUG_LOG(("Slot list updated to %s", GameInfoToAsciiString(game).str()));
 								}
 							}
 						}
@@ -2433,7 +2424,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 
 
 	}
-}// void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Lan Game Options menu input callback */
@@ -2442,7 +2433,7 @@ WindowMsgHandledType WOLGameSetupMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	/*
-	switch( msg ) 
+	switch( msg )
 	{
 
 		//-------------------------------------------------------------------------------------------------
@@ -2453,7 +2444,7 @@ WindowMsgHandledType WOLGameSetupMenuInput( GameWindow *window, UnsignedInt msg,
 
 			GameWindow *control = (GameWindow *)mData1;
 			NameKeyType controlID = (NameKeyType)control->winGetWindowId();
-			DEBUG_LOG(("GWM_RIGHT_UP for control %d(%s)\n", controlID, TheNameKeyGenerator->keyToName(controlID).str()));
+			DEBUG_LOG(("GWM_RIGHT_UP for control %d(%s)", controlID, TheNameKeyGenerator->keyToName(controlID).str()));
 			break;
 		}
 
@@ -2476,18 +2467,18 @@ WindowMsgHandledType WOLGameSetupMenuInput( GameWindow *window, UnsignedInt msg,
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
-					}  // end if
+					}
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
-				}  // end escape
-			}  // end switch( key )
-		}  // end char
-	}  // end switch( msg )
+				}
+			}
+		}
+	}
 	*/
 	return MSG_IGNORED;
-}//WindowMsgHandledType WOLGameSetupMenuInput( GameWindow *window, UnsignedInt msg,
+}
 
 
 // Slash commands -------------------------------------------------------------------------
@@ -2523,11 +2514,11 @@ Bool handleGameSetupSlashCommands(UnicodeString uText)
 		TheGameSpyInfo->sendChat(UnicodeString(uText.str()+4), TRUE, NULL);
 		return TRUE; // was a slash command
 	}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	else if (token == "slots")
 	{
 		g_debugSlots = !g_debugSlots;
-		TheGameSpyInfo->addText(UnicodeString(L"Toggled SlotList debug"), GameSpyColor[GSCOLOR_DEFAULT], NULL);
+		TheGameSpyInfo->addText(L"Toggled SlotList debug", GameSpyColor[GSCOLOR_DEFAULT], NULL);
 		return TRUE; // was a slash command
 	}
 	else if (token == "discon")
@@ -2537,7 +2528,7 @@ Bool handleGameSetupSlashCommands(UnicodeString uText)
 		TheGameSpyPeerMessageQueue->addRequest( req );
 		return TRUE;
 	}
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // defined(RTS_DEBUG)
 
 	return FALSE; // not a slash command
 }
@@ -2579,33 +2570,36 @@ static Int getFirstSelectablePlayer(const GameInfo *game)
 //-------------------------------------------------------------------------------------------------
 /** WOL Game Options menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 	static Int buttonCommunicatorID = NAMEKEY_INVALID;
 	switch( msg )
 	{
-		//-------------------------------------------------------------------------------------------------	
+		//-------------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 			{
 				buttonCommunicatorID = NAMEKEY("GameSpyGameOptionsMenu.wnd:ButtonCommunicator");
 				break;
-			} // case GWM_DESTROY:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 			{
+				if (windowMap)
+					windowMap->winSetUserData(NULL);
+
 				break;
-			} // case GWM_DESTROY:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
 			{
@@ -2682,7 +2676,7 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 				  }
         }
         break;
-			}// case GCM_SELECTED:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 			{
@@ -2709,7 +2703,7 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 					nextScreen = "Menus/WOLCustomLobby.wnd";
 					TheShell->pop();
 
-				} //if ( controlID == buttonBack )
+				}
 				else if ( controlID == buttonCommunicatorID )
 				{
 					GameSpyToggleOverlay( GSOVERLAY_BUDDY );
@@ -2726,7 +2720,7 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 					// Echo the user's input to the chat window
 					if (!txtInput.isEmpty())
 						TheGameSpyInfo->sendChat(txtInput, FALSE, NULL); // 'emote' button is now carriage-return
-				} //if ( controlID == buttonEmote )
+				}
 				else if ( controlID == buttonSelectMapID )
 				{
 					WOLMapSelectLayout = TheWindowManager->winCreateLayout( "Menus/WOLMapSelectMenu.wnd" );
@@ -2812,13 +2806,13 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 
 
 				break;
-			}// case GBM_SELECTED:
+			}
 		//-------------------------------------------------------------------------------------------------
 		case GBM_SELECTED_RIGHT:
    		{
    			if (buttonPushed)
    				break;
-   
+
    			GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
 				for (Int i = 0; i < MAX_SLOTS; i++)
@@ -2859,7 +2853,7 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 				// send it to the other clients on the lan
 				if ( controlID == textEntryChatID )
 				{
-					
+
 					// read the user's input
 					txtInput.set(GadgetTextEntryGetText( textEntryChat ));
 					// Clear the text entry line
@@ -2875,14 +2869,14 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 						}
 					}
 
-				}// if ( controlID == textEntryChatID )
+				}
 				break;
 			}
 		//-------------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
-	}//Switch
+	}
 	return MSG_HANDLED;
-}//WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg, 
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
index 7ac57179ed3..2e02bd29604 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "GameClient/WindowLayout.h"
@@ -58,9 +58,9 @@ void WOLLadderScreenInit( WindowLayout *layout, void *userData )
 	TheShell->showShellMap(TRUE);
 
 	// get ids for our children controls
-	parentWindowID = TheNameKeyGenerator->nameToKey( AsciiString("WOLLadderScreen.wnd:LadderParent") );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("WOLLadderScreen.wnd:ButtonBack") );
-	windowLadderID = TheNameKeyGenerator->nameToKey( AsciiString("WOLLadderScreen.wnd:WindowLadder") );
+	parentWindowID = TheNameKeyGenerator->nameToKey( "WOLLadderScreen.wnd:LadderParent" );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "WOLLadderScreen.wnd:ButtonBack" );
+	windowLadderID = TheNameKeyGenerator->nameToKey( "WOLLadderScreen.wnd:WindowLadder" );
 
 	parentWindow = TheWindowManager->winGetWindowFromId( NULL, parentWindowID );
 	buttonBack = TheWindowManager->winGetWindowFromId( parentWindow, buttonBackID );
@@ -81,7 +81,7 @@ void WOLLadderScreenInit( WindowLayout *layout, void *userData )
 	// set keyboard focus to main parent
 	TheWindowManager->winSetFocus( parentWindow );
 
-}  // end ReplayMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu shutdown method */
@@ -100,7 +100,7 @@ void WOLLadderScreenShutdown( WindowLayout *layout, void *userData )
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end ReplayMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu update method */
@@ -108,7 +108,7 @@ void WOLLadderScreenShutdown( WindowLayout *layout, void *userData )
 void WOLLadderScreenUpdate( WindowLayout *layout, void *userData )
 {
 
-}  // end ReplayMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Replay menu input callback */
@@ -117,7 +117,7 @@ WindowMsgHandledType WOLLadderScreenInput( GameWindow *window, UnsignedInt msg,
 																						WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -132,7 +132,7 @@ WindowMsgHandledType WOLLadderScreenInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -140,44 +140,44 @@ WindowMsgHandledType WOLLadderScreenInput( GameWindow *window, UnsignedInt msg,
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end ReplayMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** single player menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLLadderScreenSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLLadderScreenSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	switch( msg ) 
+
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
 
-			
+
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -185,7 +185,7 @@ WindowMsgHandledType WOLLadderScreenSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -197,7 +197,7 @@ WindowMsgHandledType WOLLadderScreenSystem( GameWindow *window, UnsignedInt msg,
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
@@ -210,16 +210,16 @@ WindowMsgHandledType WOLLadderScreenSystem( GameWindow *window, UnsignedInt msg,
 				// thou art directed to return to thy known solar system immediately!
 				TheShell->pop();
 
-			}  // end else if
+			}
 
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
-}  // end ReplayMenuSystem
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
index 760fbb362cf..9f98a002a8c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
@@ -70,11 +70,6 @@
 #include "GameNetwork/GameSpy/LobbyUtils.h"
 #include "GameNetwork/RankPointValue.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 void refreshGameList( Bool forceRefresh = FALSE );
 void refreshPlayerList( Bool forceRefresh = FALSE );
 
@@ -133,7 +128,7 @@ static Int groupRoomToJoin = 0;
 static Int	initialGadgetDelay = 2;
 static Bool justEntered = FALSE;
 
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 Bool g_fakeCRC = FALSE;
 Bool g_debugSlots = FALSE;
 #endif
@@ -176,7 +171,7 @@ Bool handleLobbySlashCommands(UnicodeString uText)
 	else if (token == "refresh")
 	{
 		// Added 2/19/03 added the game refresh
-		refreshGameList(TRUE);	
+		refreshGameList(TRUE);
 		refreshPlayerList(TRUE);
 		return TRUE; // was a slash command
 	}
@@ -202,17 +197,17 @@ Bool handleLobbySlashCommands(UnicodeString uText)
 		return TRUE; // was a slash command
 	}
 	*/
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 	else if (token == "fakecrc")
 	{
 		g_fakeCRC = !g_fakeCRC;
-		TheGameSpyInfo->addText(UnicodeString(L"Toggled CRC fakery"), GameSpyColor[GSCOLOR_DEFAULT], NULL);
+		TheGameSpyInfo->addText(L"Toggled CRC fakery", GameSpyColor[GSCOLOR_DEFAULT], NULL);
 		return TRUE; // was a slash command
 	}
 	else if (token == "slots")
 	{
 		g_debugSlots = !g_debugSlots;
-		TheGameSpyInfo->addText(UnicodeString(L"Toggled SlotList debug"), GameSpyColor[GSCOLOR_DEFAULT], NULL);
+		TheGameSpyInfo->addText(L"Toggled SlotList debug", GameSpyColor[GSCOLOR_DEFAULT], NULL);
 		return TRUE; // was a slash command
 	}
 #endif
@@ -318,7 +313,7 @@ static void playerTooltip(GameWindow *window,
 	rank = i;
 	AsciiString sideName = "GUI:RandomSide";
 	if (info->m_side > 0)
-	{		
+	{
 		const PlayerTemplate *fac = ThePlayerTemplateStore->getNthPlayerTemplate(info->m_side);
 		if (fac)
 		{
@@ -349,7 +344,7 @@ static void populateGroupRoomListbox(GameWindow *lb)
 		GameSpyGroupRoom room = iter->second;
 		if (room.m_groupID != TheGameSpyConfig->getQMChannel())
 		{
-			DEBUG_LOG(("populateGroupRoomListbox(): groupID %d\n", room.m_groupID));
+			DEBUG_LOG(("populateGroupRoomListbox(): groupID %d", room.m_groupID));
 			if (room.m_groupID == TheGameSpyInfo->getCurrentGroupRoom())
 			{
 				Int selected = GadgetComboBoxAddEntry(lb, room.m_translatedName, GameSpyColor[GSCOLOR_CURRENTROOM]);
@@ -364,14 +359,14 @@ static void populateGroupRoomListbox(GameWindow *lb)
 		}
 		else
 		{
-			DEBUG_LOG(("populateGroupRoomListbox(): skipping QM groupID %d\n", room.m_groupID));
+			DEBUG_LOG(("populateGroupRoomListbox(): skipping QM groupID %d", room.m_groupID));
 		}
 	}
 
 	GadgetComboBoxSetSelectedPos(lb, indexToSelect);
 }
 
-static const char *rankNames[] = {
+static const char *const rankNames[] = {
 	"Private",
 	"Corporal",
 	"Sergeant",
@@ -383,6 +378,8 @@ static const char *rankNames[] = {
 	"Brigadier",
 	"Commander",
 };
+static_assert(ARRAY_SIZE(rankNames) == MAX_RANKS, "Incorrect array size");
+
 
 const Image* LookupSmallRankImage(Int side, Int rankPoints)
 {
@@ -426,7 +423,7 @@ const Image* LookupSmallRankImage(Int side, Int rankPoints)
 	AsciiString fullImageName;
 	fullImageName.format("%s-%s", rankNames[rank], sideStr.str());
 	const Image *img = TheMappedImageCollection->findImageByName(fullImageName);
-	DEBUG_ASSERTLOG(img, ("*** Could not load small rank image '%s' from TheMappedImageCollection!\n", fullImageName.str()));
+	DEBUG_ASSERTLOG(img, ("*** Could not load small rank image '%s' from TheMappedImageCollection!", fullImageName.str()));
 	return img;
 }
 
@@ -521,7 +518,7 @@ void PopulateLobbyPlayerListbox(void)
 			uStr = GadgetListBoxGetText(listboxLobbyPlayers, selectedIndices[i], COLUMN_PLAYERNAME);
 			selectedName.translate(uStr);
 			selectedNames.insert(selectedName);
-			DEBUG_LOG(("Saving off old selection %d (%s)\n", selectedIndices[i], selectedName.str()));
+			DEBUG_LOG(("Saving off old selection %d (%s)", selectedIndices[i], selectedName.str()));
 		}
 
 		// save off old top entry
@@ -540,7 +537,7 @@ void PopulateLobbyPlayerListbox(void)
 				selIt = selectedNames.find(info.m_name);
 				if (selIt != selectedNames.end())
 				{
-					DEBUG_LOG(("Marking index %d (%s) to re-select\n", index, info.m_name.str()));
+					DEBUG_LOG(("Marking index %d (%s) to re-select", index, info.m_name.str()));
 					indicesToSelect.insert(index);
 				}
 			}
@@ -558,7 +555,7 @@ void PopulateLobbyPlayerListbox(void)
 				selIt = selectedNames.find(info.m_name);
 				if (selIt != selectedNames.end())
 				{
-					DEBUG_LOG(("Marking index %d (%s) to re-select\n", index, info.m_name.str()));
+					DEBUG_LOG(("Marking index %d (%s) to re-select", index, info.m_name.str()));
 					indicesToSelect.insert(index);
 				}
 			}
@@ -576,23 +573,27 @@ void PopulateLobbyPlayerListbox(void)
 				selIt = selectedNames.find(info.m_name);
 				if (selIt != selectedNames.end())
 				{
-					DEBUG_LOG(("Marking index %d (%s) to re-select\n", index, info.m_name.str()));
+					DEBUG_LOG(("Marking index %d (%s) to re-select", index, info.m_name.str()));
 					indicesToSelect.insert(index);
 				}
 			}
 		}
 
 		// restore selection
-		if (indicesToSelect.size())
+		if (!indicesToSelect.empty())
 		{
-			std::set<Int>::const_iterator indexIt;
-			Int *newIndices = NEW Int[indicesToSelect.size()];
-			for (i=0, indexIt = indicesToSelect.begin(); indexIt != indicesToSelect.end(); ++i, ++indexIt)
+			std::set<Int>::const_iterator indexIt = indicesToSelect.begin();
+			const size_t count = indicesToSelect.size();
+			size_t index = 0;
+			Int *newIndices = NEW Int[count];
+			while (index < count)
 			{
-				newIndices[i] = *indexIt;
-				DEBUG_LOG(("Queueing up index %d to re-select\n", *indexIt));
+				newIndices[index] = *indexIt;
+				DEBUG_LOG(("Queueing up index %d to re-select", *indexIt));
+				++index;
+				++indexIt;
 			}
-			GadgetListBoxSetSelected(listboxLobbyPlayers, newIndices, indicesToSelect.size());
+			GadgetListBoxSetSelected(listboxLobbyPlayers, newIndices, count);
 			delete[] newIndices;
 		}
 
@@ -621,40 +622,40 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
 	gameListRefreshTime = 0;
 	playerListRefreshTime = 0;
 
-	parentWOLLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomLobby.wnd:WOLLobbyMenuParent" ) );
+	parentWOLLobbyID = TheNameKeyGenerator->nameToKey( "WOLCustomLobby.wnd:WOLLobbyMenuParent" );
 	parent = TheWindowManager->winGetWindowFromId(NULL, parentWOLLobbyID);
 
-	buttonBackID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonBack"));
+	buttonBackID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonBack");
 	buttonBack = TheWindowManager->winGetWindowFromId(parent, buttonBackID);
 
-	buttonHostID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonHost"));
+	buttonHostID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonHost");
 	buttonHost = TheWindowManager->winGetWindowFromId(parent, buttonHostID);
 
-	buttonRefreshID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonRefresh"));
+	buttonRefreshID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonRefresh");
 	buttonRefresh = TheWindowManager->winGetWindowFromId(parent, buttonRefreshID);
 
-	buttonJoinID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonJoin"));
+	buttonJoinID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonJoin");
 	buttonJoin = TheWindowManager->winGetWindowFromId(parent, buttonJoinID);
 	buttonJoin->winEnable(FALSE);
 
-	buttonBuddyID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonBuddy"));
+	buttonBuddyID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonBuddy");
 	buttonBuddy = TheWindowManager->winGetWindowFromId(parent, buttonBuddyID);
 
-	buttonEmoteID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonEmote"));
+	buttonEmoteID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonEmote");
 	buttonEmote = TheWindowManager->winGetWindowFromId(parent, buttonEmoteID);
 
-	textEntryChatID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:TextEntryChat"));
+	textEntryChatID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:TextEntryChat");
 	textEntryChat = TheWindowManager->winGetWindowFromId(parent, textEntryChatID);
 
-	listboxLobbyPlayersID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ListboxPlayers"));
+	listboxLobbyPlayersID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ListboxPlayers");
 	listboxLobbyPlayers = TheWindowManager->winGetWindowFromId(parent, listboxLobbyPlayersID);
 	listboxLobbyPlayers->winSetTooltipFunc(playerTooltip);
 
-	listboxLobbyChatID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ListboxChat"));
+	listboxLobbyChatID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ListboxChat");
 	listboxLobbyChat = TheWindowManager->winGetWindowFromId(parent, listboxLobbyChatID);
 	TheGameSpyInfo->registerTextWindow(listboxLobbyChat);
 
-	comboLobbyGroupRoomsID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ComboBoxGroupRooms"));
+	comboLobbyGroupRoomsID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ComboBoxGroupRooms");
 	comboLobbyGroupRooms = TheWindowManager->winGetWindowFromId(parent, comboLobbyGroupRoomsID);
 
 	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);
@@ -669,19 +670,19 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
 	{
 		if (groupRoomToJoin)
 		{
-			DEBUG_LOG(("WOLLobbyMenuInit() - rejoining group room %d\n", groupRoomToJoin));
+			DEBUG_LOG(("WOLLobbyMenuInit() - rejoining group room %d", groupRoomToJoin));
 			TheGameSpyInfo->joinGroupRoom(groupRoomToJoin);
 			groupRoomToJoin = 0;
 		}
 		else
 		{
-			DEBUG_LOG(("WOLLobbyMenuInit() - joining best group room\n"));
+			DEBUG_LOG(("WOLLobbyMenuInit() - joining best group room"));
 			TheGameSpyInfo->joinBestGroupRoom();
 		}
 	}
 	else
 	{
-		DEBUG_LOG(("WOLLobbyMenuInit() - not joining group room because we're already in one\n"));
+		DEBUG_LOG(("WOLLobbyMenuInit() - not joining group room because we're already in one"));
 	}
 
 	GrabWindowInfo();
@@ -696,7 +697,7 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
 //	TheShell->registerWithAnimateManager(parent, WIN_ANIMATION_SLIDE_TOP, TRUE);
 	TheShell->showShellMap(TRUE);
 	TheGameSpyGame->reset();
-	
+
 	CustomMatchPreferences pref;
 //	GameWindow *slider = TheWindowManager->winGetWindowFromId(parent, sliderChatAdjustID);
 //	if (slider)
@@ -722,7 +723,7 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
 		win->winHide(TRUE);
 	DontShowMainMenu = TRUE;
 
-} // WOLLobbyMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -745,7 +746,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	nextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Lobby Menu shutdown method */
@@ -790,7 +791,7 @@ void WOLLobbyMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 	DontShowMainMenu = FALSE;
@@ -798,7 +799,7 @@ void WOLLobbyMenuShutdown( WindowLayout *layout, void *userData )
 	RaiseGSMessageBox();
 	TheTransitionHandler->reverse("WOLCustomLobbyFade");
 
-}  // WOLLobbyMenuShutdown
+}
 
 static void fillPlayerInfo(const PeerResponse *resp, PlayerInfo *info)
 {
@@ -862,7 +863,7 @@ static const char* getMessageString(Int t)
 #endif // PERF_TEST
 
 //-------------------------------------------------------------------------------------------------
-/** refreshGameList 
+/** refreshGameList
 		The Bool is used to force refresh if the refresh button was hit.*/
 //-------------------------------------------------------------------------------------------------
 static void refreshGameList( Bool forceRefresh )
@@ -873,19 +874,19 @@ static void refreshGameList( Bool forceRefresh )
 	{
 		if (TheGameSpyInfo->hasStagingRoomListChanged())
 		{
-			//DEBUG_LOG(("################### refreshing game list\n"));
-			//DEBUG_LOG(("gameRefreshTime=%d, refreshInterval=%d, now=%d\n", gameListRefreshTime, refreshInterval, timeGetTime()));
+			//DEBUG_LOG(("################### refreshing game list"));
+			//DEBUG_LOG(("gameRefreshTime=%d, refreshInterval=%d, now=%d", gameListRefreshTime, refreshInterval, timeGetTime()));
 			RefreshGameListBoxes();
 			gameListRefreshTime = timeGetTime();
 		} else {
 			//DEBUG_LOG(("-"));
 		}
 	} else {
-		//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d\n"));
+		//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d", gameListRefreshTime, refreshInterval));
 	}
 }
 //-------------------------------------------------------------------------------------------------
-/** refreshPlayerList 
+/** refreshPlayerList
 		The Bool is used to force refresh if the refresh button was hit.*/
 //-------------------------------------------------------------------------------------------------
 static void refreshPlayerList( Bool forceRefresh )
@@ -919,9 +920,9 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 	{
 		SignalUIInteraction(SHELL_SCRIPT_HOOK_GENERALS_ONLINE_ENTERED_FROM_GAME);
 	}
-	
 
-	// We'll only be successful if we've requested to 
+
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 		shutdownComplete(layout);
 
@@ -973,7 +974,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 				}
 				else
 				{
-					DEBUG_LOG(("WOLLobbyMenuUpdate() - joining best group room\n"));
+					DEBUG_LOG(("WOLLobbyMenuUpdate() - joining best group room"));
 					TheGameSpyInfo->joinBestGroupRoom();
 				}
 				populateGroupRoomListbox(comboLobbyGroupRooms);
@@ -1017,7 +1018,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 			case PeerResponse::PEERRESPONSE_PLAYERUTM:
 			case PeerResponse::PEERRESPONSE_ROOMUTM:
 				{
-					DEBUG_LOG(("Putting off a UTM in the lobby\n"));
+					DEBUG_LOG(("Putting off a UTM in the lobby"));
 					TheLobbyQueuedUTMs.push_back(resp);
 				}
 				break;
@@ -1048,6 +1049,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 					TheGameSpyInfo->reset();
 					TheShell->pop();
 				}
+				break;
 			case PeerResponse::PEERRESPONSE_CREATESTAGINGROOM:
 				{
 					sawImportantMessage = TRUE;
@@ -1083,9 +1085,9 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 								AsciiString hostName;
 								hostName.translate(room->getConstSlot(0)->getName());
 								const char *firstPlayer = resp.stagingRoomPlayerNames[i].c_str();
-								if (!strcmp(hostName.str(), firstPlayer))
+								if (strcmp(hostName.str(), firstPlayer) == 0)
 								{
-									DEBUG_LOG(("Saw host %s == %s in slot %d\n", hostName.str(), firstPlayer, i));
+									DEBUG_LOG(("Saw host %s == %s in slot %d", hostName.str(), firstPlayer, i));
 									isHostPresent = TRUE;
 								}
 							}
@@ -1129,13 +1131,13 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 						GSMessageBoxOk(TheGameText->fetch("GUI:JoinFailedDefault"), s);
 						if (groupRoomToJoin)
 						{
-							DEBUG_LOG(("WOLLobbyMenuUpdate() - rejoining group room %d\n", groupRoomToJoin));
+							DEBUG_LOG(("WOLLobbyMenuUpdate() - rejoining group room %d", groupRoomToJoin));
 							TheGameSpyInfo->joinGroupRoom(groupRoomToJoin);
 							groupRoomToJoin = 0;
 						}
 						else
 						{
-							DEBUG_LOG(("WOLLobbyMenuUpdate() - joining best group room\n"));
+							DEBUG_LOG(("WOLLobbyMenuUpdate() - joining best group room"));
 							TheGameSpyInfo->joinBestGroupRoom();
 						}
 					}
@@ -1151,7 +1153,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 					{
 					case PEER_CLEAR:
 						TheGameSpyInfo->clearStagingRoomList();
-						//TheGameSpyInfo->addText( UnicodeString(L"gameList: PEER_CLEAR"), GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
+						//TheGameSpyInfo->addText( L"gameList: PEER_CLEAR", GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
 						break;
 					case PEER_ADD:
 					case PEER_UPDATE:
@@ -1164,7 +1166,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 						//if (ParseAsciiStringToGameInfo(&room, resp.stagingRoomMapName.c_str()))
 						//if (ParseAsciiStringToGameInfo(&room, resp.stagingServerGameOptions.c_str()))
 						Bool serverOk = TRUE;
-						if (!resp.stagingRoomMapName.length())
+						if (resp.stagingRoomMapName.empty())
 						{
 							serverOk = FALSE;
 						}
@@ -1236,7 +1238,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 										slot->setState(SLOT_BRUTAL_AI);
 										++numPlayers;
 									}
-									else if (resp.stagingRoomPlayerNames[i].length())
+									else if (!resp.stagingRoomPlayerNames[i].empty())
 									{
 										UnicodeString nameUStr;
 										nameUStr.translate(resp.stagingRoomPlayerNames[i].c_str());
@@ -1249,34 +1251,34 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 									}
 								}
 							}
-							DEBUG_ASSERTCRASH(numPlayers, ("Game had no players!\n"));
-							//DEBUG_LOG(("Saw room: hasPass=%d, allowsObservers=%d\n", room.getHasPassword(), room.getAllowObservers()));
+							DEBUG_ASSERTCRASH(numPlayers, ("Game had no players!"));
+							//DEBUG_LOG(("Saw room: hasPass=%d, allowsObservers=%d", room.getHasPassword(), room.getAllowObservers()));
 							if (resp.stagingRoom.action == PEER_ADD)
 							{
 								TheGameSpyInfo->addStagingRoom(room);
-								//TheGameSpyInfo->addText( UnicodeString(L"gameList: PEER_ADD"), GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
+								//TheGameSpyInfo->addText( L"gameList: PEER_ADD", GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
 							}
 							else
 							{
 								TheGameSpyInfo->updateStagingRoom(room);
-								//TheGameSpyInfo->addText( UnicodeString(L"gameList: PEER_UPDATE"), GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
+								//TheGameSpyInfo->addText( L"gameList: PEER_UPDATE", GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
 							}
 						}
 						else
 						{
 							room.setID(resp.stagingRoom.id);
 							TheGameSpyInfo->removeStagingRoom(room);
-							//TheGameSpyInfo->addText( UnicodeString(L"gameList: PEER_UPDATE FAILED"), GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
+							//TheGameSpyInfo->addText( L"gameList: PEER_UPDATE FAILED", GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
 						}
 						break;
 					}
 					case PEER_REMOVE:
 						room.setID(resp.stagingRoom.id);
 						TheGameSpyInfo->removeStagingRoom(room);
-						//TheGameSpyInfo->addText( UnicodeString(L"gameList: PEER_REMOVE"), GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
+						//TheGameSpyInfo->addText( L"gameList: PEER_REMOVE", GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
 						break;
 					default:
-						//TheGameSpyInfo->addText( UnicodeString(L"gameList: Unknown"), GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
+						//TheGameSpyInfo->addText( L"gameList: Unknown", GameSpyColor[GSCOLOR_DEFAULT], listboxLobbyChat );
 						break;
 					}
 				}
@@ -1295,38 +1297,38 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 #ifdef PERF_TEST
 		// check performance
 		end = timeGetTime();
-		PERF_LOG(("Frame time was %d ms\n", end-start));
+		PERF_LOG(("Frame time was %d ms", end-start));
 		std::list<Int>::const_iterator it;
 		for (it = responses.begin(); it != responses.end(); ++it)
 		{
-			PERF_LOG(("  %s\n", getMessageString(*it)));
+			PERF_LOG(("  %s", getMessageString(*it)));
 		}
-		PERF_LOG(("\n"));
+		PERF_LOG((""));
 #endif // PERF_TEST
 
 #if 0
-// Removed 2-17-03 to pull out into a function so we can do the same checks 
+// Removed 2-17-03 to pull out into a function so we can do the same checks
 		Int refreshInterval = gameListRefreshInterval;
 
 		if ((gameListRefreshTime == 0) || ((gameListRefreshTime + refreshInterval) <= timeGetTime()))
 		{
 			if (TheGameSpyInfo->hasStagingRoomListChanged())
 			{
-				//DEBUG_LOG(("################### refreshing game list\n"));
-				//DEBUG_LOG(("gameRefreshTime=%d, refreshInterval=%d, now=%d\n", gameListRefreshTime, refreshInterval, timeGetTime()));
+				//DEBUG_LOG(("################### refreshing game list"));
+				//DEBUG_LOG(("gameRefreshTime=%d, refreshInterval=%d, now=%d", gameListRefreshTime, refreshInterval, timeGetTime()));
 				RefreshGameListBoxes();
 				gameListRefreshTime = timeGetTime();
 			} else {
 				//DEBUG_LOG(("-"));
 			}
 		} else {
-			//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d\n"));
+			//DEBUG_LOG(("gameListRefreshTime: %d refreshInterval: %d", gameListRefreshTime, refreshInterval));
 		}
 #else
 	refreshGameList();
 #endif
 	}
-}// WOLLobbyMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Lobby Menu input callback */
@@ -1334,7 +1336,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLLobbyMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1351,31 +1353,31 @@ WindowMsgHandledType WOLLobbyMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLLobbyMenuInput
+}
 
 //static void doSliderTrack(GameWindow *control, Int val)
 //{
@@ -1429,7 +1431,7 @@ WindowMsgHandledType WOLLobbyMenuInput( GameWindow *window, UnsignedInt msg,
 //-------------------------------------------------------------------------------------------------
 /** WOL Lobby Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
@@ -1437,32 +1439,32 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 
 	switch( msg )
 	{
-		
-		
+
+
 		//---------------------------------------------------------------------------------------------
 		case GWM_CREATE:
 			{
 				buttonGameListTypeToggleID = NAMEKEY("WOLCustomLobby.wnd:ButtonGameListToggle");
 //				sliderChatAdjustID = NAMEKEY("WOLCustomLobby.wnd:SliderChatAdjust");
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		//---------------------------------------------------------------------------------------------
 		case GLM_SELECTED:
@@ -1499,7 +1501,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					{
 						RefreshGameInfoListBox(GetGameListBox(), GetGameInfoListBox());
 					}
-				} //if ( controlID == GetGameListBoxID() )
+				}
 
 				break;
 			}
@@ -1530,11 +1532,11 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					nextScreen = "Menus/WOLWelcomeMenu.wnd";
 					TheShell->pop();
 
-				} //if ( controlID == buttonBack )
+				}
 				else if ( controlID == buttonRefreshID )
 				{
 					// Added 2/17/03 added the game refresh button
-					refreshGameList(TRUE);	
+					refreshGameList(TRUE);
 					refreshPlayerList(TRUE);
 				}
 				else if ( controlID == buttonHostID )
@@ -1570,8 +1572,8 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 								if (!roomToJoin || roomToJoin->getExeCRC() != TheGlobalData->m_exeCRC || roomToJoin->getIniCRC() != TheGlobalData->m_iniCRC)
 								{
 									// bad crc.  don't go.
-									DEBUG_LOG(("WOLLobbyMenuSystem - CRC mismatch with the game I'm trying to join. My CRC's - EXE:0x%08X INI:0x%08X  Their CRC's - EXE:0x%08x INI:0x%08x\n", TheGlobalData->m_exeCRC, TheGlobalData->m_iniCRC, roomToJoin->getExeCRC(), roomToJoin->getIniCRC()));
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+									DEBUG_LOG(("WOLLobbyMenuSystem - CRC mismatch with the game I'm trying to join. My CRC's - EXE:0x%08X INI:0x%08X  Their CRC's - EXE:0x%08x INI:0x%08x", TheGlobalData->m_exeCRC, TheGlobalData->m_iniCRC, roomToJoin->getExeCRC(), roomToJoin->getIniCRC()));
+#if defined(RTS_DEBUG)
 									if (TheGlobalData->m_netMinPlayers)
 									{
 										GSMessageBoxOk(TheGameText->fetch("GUI:JoinFailedDefault"), TheGameText->fetch("GUI:JoinFailedCRCMismatch"));
@@ -1650,9 +1652,9 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 						TheGameSpyInfo->sendChat( txtInput, FALSE, listboxLobbyPlayers ); // 'emote' button now just sends text
 					}
 				}
-				
+
 				break;
-			}// case GBM_SELECTED:
+			}
 
 		//---------------------------------------------------------------------------------------------
 		case GCM_SELECTED:
@@ -1661,17 +1663,17 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					break;
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == comboLobbyGroupRoomsID ) 
+				if( controlID == comboLobbyGroupRoomsID )
 				{
 					int rowSelected = -1;
 					GadgetComboBoxGetSelectedPos(control, &rowSelected);
-				
-					DEBUG_LOG(("Row selected = %d\n", rowSelected));
+
+					DEBUG_LOG(("Row selected = %d", rowSelected));
 					if (rowSelected >= 0)
 					{
 						Int groupID;
 						groupID = (Int)GadgetComboBoxGetItemData(comboLobbyGroupRooms, rowSelected);
-						DEBUG_LOG(("ItemData was %d, current Group Room is %d\n", groupID, TheGameSpyInfo->getCurrentGroupRoom()));
+						DEBUG_LOG(("ItemData was %d, current Group Room is %d", groupID, TheGameSpyInfo->getCurrentGroupRoom()));
 						if (groupID && groupID != TheGameSpyInfo->getCurrentGroupRoom())
 						{
 							TheGameSpyInfo->leaveGroupRoom();
@@ -1689,7 +1691,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 						}
 					}
 				}
-			} // case GCM_SELECTED
+			}
 			break;
 
 		//---------------------------------------------------------------------------------------------
@@ -1703,18 +1705,18 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 				if (controlID == GetGameListBoxID())
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						GadgetListBoxSetSelected( control, rowSelected );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonJoinID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonJoinID );
 					}
 				}
 				break;
-			}// case GLM_DOUBLE_CLICKED:
+			}
 
 		//---------------------------------------------------------------------------------------------
 		case GLM_RIGHT_CLICKED:
@@ -1722,7 +1724,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
 
-				if( controlID == listboxLobbyPlayersID ) 
+				if( controlID == listboxLobbyPlayersID )
 				{
 					RightClickStruct *rc = (RightClickStruct *)mData2;
 					WindowLayout *rcLayout = NULL;
@@ -1742,26 +1744,26 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 
 					Bool isBuddy = FALSE;
 					if (profileID <= 0)
-						rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNoProfileMenu.wnd"));	
+						rcLayout = TheWindowManager->winCreateLayout("Menus/RCNoProfileMenu.wnd");
 					else
 					{
 						if (profileID == TheGameSpyInfo->getLocalProfileID())
 						{
-							rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCLocalPlayerMenu.wnd"));
+							rcLayout = TheWindowManager->winCreateLayout("Menus/RCLocalPlayerMenu.wnd");
 						}
 						else if(TheGameSpyInfo->isBuddy(profileID))
 						{
-							rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddiesMenu.wnd"));
+							rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddiesMenu.wnd");
 							isBuddy = TRUE;
 						}
 						else
-							rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNonBuddiesMenu.wnd"));
+							rcLayout = TheWindowManager->winCreateLayout("Menus/RCNonBuddiesMenu.wnd");
 					}
 					if(!rcLayout)
 						break;
-					
+
 					GadgetListBoxSetSelected(control, rc->pos);
-					
+
 					rcMenu = rcLayout->getFirstWindow();
 					rcMenu->winGetLayout()->runInit();
 					rcMenu->winBringToTop();
@@ -1776,7 +1778,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					if(rc->mouseY + rcSize.y > TheDisplay->getHeight())
 						rcPos.y = TheDisplay->getHeight() - rcSize.y;
 					rcMenu->winSetPosition(rcPos.x, rcPos.y);
-					
+
 					GameSpyRCMenuData *rcData = NEW GameSpyRCMenuData;
 					rcData->m_id = profileID;
 					rcData->m_nick = aName;
@@ -1784,7 +1786,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 					rcMenu->winSetUserData((void *)rcData);
 					TheWindowManager->winSetLoneWindow(rcMenu);
 				}
-				else if( controlID == GetGameListBoxID() ) 
+				else if( controlID == GetGameListBoxID() )
 				{
 					RightClickStruct *rc = (RightClickStruct *)mData2;
 					WindowLayout *rcLayout = NULL;
@@ -1808,7 +1810,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 							const LadderInfo *linfo = TheLadderList->findLadder(theRoom->getLadderIP(), theRoom->getLadderPort());
 							if (linfo)
 							{
-								rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCGameDetailsMenu.wnd"));	
+								rcLayout = TheWindowManager->winCreateLayout("Menus/RCGameDetailsMenu.wnd");
 								if (!rcLayout)
 									break;
 
@@ -1819,7 +1821,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 								rcMenu->winBringToTop();
 								rcMenu->winHide(FALSE);
 								rcMenu->winSetPosition(rc->mouseX, rc->mouseY);
-								
+
 								rcMenu->winSetUserData((void *)selectedID);
 								TheWindowManager->winSetLoneWindow(rcMenu);
 							}
@@ -1871,7 +1873,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLLobbyMenuSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
index 522a354c936..9c8aa8db08f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameText.h"
 #include "Common/CustomMatchPreferences.h"
@@ -48,11 +48,6 @@
 #include "GameNetwork/GameSpy/PersistentStorageDefs.h"
 #include "GameNetwork/GameSpy/PersistentStorageThread.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 // window ids ------------------------------------------------------------------------------
@@ -70,9 +65,9 @@ static GameWindow *listboxLocale = NULL;
 //-------------------------------------------------------------------------------------------------
 void WOLLocaleSelectInit( WindowLayout *layout, void *userData )
 {
-	parentLocaleSelectID = TheNameKeyGenerator->nameToKey( AsciiString( "PopupLocaleSelect.wnd:ParentLocaleSelect" ) );
-	buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "PopupLocaleSelect.wnd:ButtonOk" ) );
-	listboxLocaleID = TheNameKeyGenerator->nameToKey( AsciiString( "PopupLocaleSelect.wnd:ListBoxLocaleSelect" ) );
+	parentLocaleSelectID = TheNameKeyGenerator->nameToKey( "PopupLocaleSelect.wnd:ParentLocaleSelect" );
+	buttonOkID = TheNameKeyGenerator->nameToKey( "PopupLocaleSelect.wnd:ButtonOk" );
+	listboxLocaleID = TheNameKeyGenerator->nameToKey( "PopupLocaleSelect.wnd:ListBoxLocaleSelect" );
 	parentLocaleSelect = TheWindowManager->winGetWindowFromId( NULL, parentLocaleSelectID );
 	buttonOk = TheWindowManager->winGetWindowFromId( NULL,  buttonOkID);
 	listboxLocale = TheWindowManager->winGetWindowFromId( NULL,  listboxLocaleID);
@@ -91,7 +86,7 @@ void WOLLocaleSelectInit( WindowLayout *layout, void *userData )
 	// Set Keyboard to Main Parent
 	TheWindowManager->winSetFocus( parentLocaleSelect );
 	TheWindowManager->winSetModal( parentLocaleSelect );
-} // WOLLocaleSelectInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu shutdown method */
@@ -105,7 +100,7 @@ void WOLLocaleSelectShutdown( WindowLayout *layout, void *userData )
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // WOLLocaleSelectShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -113,8 +108,8 @@ void WOLLocaleSelectShutdown( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 void WOLLocaleSelectUpdate( WindowLayout * layout, void *userData)
 {
-	
-}// WOLLocaleSelectUpdate
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu input callback */
@@ -122,7 +117,7 @@ void WOLLocaleSelectUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLLocaleSelectInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -134,43 +129,43 @@ WindowMsgHandledType WOLLocaleSelectInput( GameWindow *window, UnsignedInt msg,
 			// ----------------------------------------------------------------------------------------
 			// don't let key fall through anywhere else
 			return MSG_HANDLED;
-		}  // end char
-	}  // end switch( msg )
+		}
+	}
 	return MSG_IGNORED;
-}// WOLLocaleSelectInput
+}
 
 //Int getRegistryNicknameOffset(AsciiString nick); /// @todo: mdc remove this once we can save ini pref files
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLLocaleSelectSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLLocaleSelectSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -210,7 +205,7 @@ WindowMsgHandledType WOLLocaleSelectSystem( GameWindow *window, UnsignedInt msg,
 						TheGameSpyInfo->setCachedLocalPlayerStats(stats);
 					}
 					else
-					{						
+					{
 						// force an update of our shtuff
 						PSResponse newResp;
 						newResp.responseType = PSResponse::PSRESPONSE_PLAYERSTATS;
@@ -218,10 +213,10 @@ WindowMsgHandledType WOLLocaleSelectSystem( GameWindow *window, UnsignedInt msg,
 						TheGameSpyPSMessageQueue->addResponse(newResp);
 					}
 					CheckReOpenPlayerInfo();
-				} //if ( controlID == buttonDisconnect )
+				}
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -229,7 +224,7 @@ WindowMsgHandledType WOLLocaleSelectSystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLLocaleSelectSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
index 104e40c35d4..52955e817d2 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/STLTypedefs.h"
 
@@ -69,11 +69,6 @@
 
 #include "GameNetwork/WOLBrowser/WebBrowser.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #ifdef ALLOW_NON_PROFILED_LOGIN
 Bool GameSpyUseProfiles = false;
@@ -225,7 +220,7 @@ Bool GameSpyLoginPreferences::write( void )
 			fprintf(fp, "pass_%s = %s\n", passIt->first.str(), quoPass.str());
 			++passIt;
 		}
-		
+
 		PassMap::iterator dateIt = m_emailDateMap.begin();
 		while (dateIt != m_emailDateMap.end())
 		{
@@ -369,7 +364,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	nextScreen = NULL;
 
-}  // end if
+}
 
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -458,7 +453,7 @@ void WOLLoginMenuInit( WindowLayout *layout, void *userData )
 	{
 		loginPref = NEW GameSpyLoginPreferences;
 	}
-	
+
 	// if the ESRB warning is blank (other country) hide the box
 	GameWindow *esrbTitle = TheWindowManager->winGetWindowFromId( NULL, NAMEKEY("GameSpyLoginProfile.wnd:StaticTextESRBTop") );
 	GameWindow *esrbParent = TheWindowManager->winGetWindowFromId( NULL, NAMEKEY("GameSpyLoginProfile.wnd:ParentESRB") );
@@ -509,9 +504,9 @@ void WOLLoginMenuInit( WindowLayout *layout, void *userData )
 	textEntryYear =					TheWindowManager->winGetWindowFromId( NULL,  textEntryYearID);
 
 	GadgetTextEntrySetText(textEntryMonth, UnicodeString::TheEmptyString);
-	
+
 	GadgetTextEntrySetText(textEntryDay, UnicodeString::TheEmptyString);
-	
+
 	GadgetTextEntrySetText(textEntryYear, UnicodeString::TheEmptyString);
 
 
@@ -596,12 +591,12 @@ void WOLLoginMenuInit( WindowLayout *layout, void *userData )
 		DEBUG_ASSERTCRASH(textEntryLoginName,		("textEntryLoginName missing!"));
 		TheWindowManager->winSetFocus( textEntryLoginName );
 		//TheShell->registerWithAnimateManager(parentWOLLogin, WIN_ANIMATION_SLIDE_TOP, TRUE);
-		
+
 //		TheShell->registerWithAnimateManager(buttonTOS, WIN_ANIMATION_SLIDE_LEFT, TRUE);
 //		TheShell->registerWithAnimateManager(buttonCreateAccount, WIN_ANIMATION_SLIDE_LEFT, TRUE);
 //		TheShell->registerWithAnimateManager(buttonUseAccount, WIN_ANIMATION_SLIDE_LEFT, TRUE);
 //		TheShell->registerWithAnimateManager(buttonBack, WIN_ANIMATION_SLIDE_RIGHT, TRUE);
-		
+
 	}
 #endif // ALLOW_NON_PROFILED_LOGIN
 
@@ -651,7 +646,7 @@ void WOLLoginMenuInit( WindowLayout *layout, void *userData )
 			UnicodeString pass;
 			pass.translate(loginPref->getPasswordForEmail(lastEmail));
 			GadgetTextEntrySetText(textEntryPassword, pass);
-			
+
 			AsciiString month,day,year;
 			loginPref->getDateForEmail(lastEmail, month, day, year);
 			pass.translate(month);
@@ -720,18 +715,18 @@ void WOLLoginMenuInit( WindowLayout *layout, void *userData )
 	layout->hide( FALSE );
 
 	// Set Keyboard to Main Parent
-	
+
 	RaiseGSMessageBox();
 
 	OptionPreferences optionPref;
 	if (!optionPref.getBool("SawTOS", TRUE))
 	{
-		TheWindowManager->winSendSystemMsg( parentWOLLogin, GBM_SELECTED, 
+		TheWindowManager->winSendSystemMsg( parentWOLLogin, GBM_SELECTED,
 																			(WindowMsgData)buttonTOS, buttonTOSID );
 	}
 	TheTransitionHandler->setGroup("GameSpyLoginProfileFade");
 
-} // WOLLoginMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Login Menu shutdown method */
@@ -759,12 +754,12 @@ void WOLLoginMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 	TheTransitionHandler->reverse("GameSpyLoginProfileFade");
 
-}  // WOLLoginMenuShutdown
+}
 
 
 // this is used to check if we've got all the pings
@@ -774,7 +769,7 @@ static void checkLogin( void )
 	{
 		// save off our ping string, and end those threads
 		AsciiString pingStr = ThePinger->getPingString( 1000 );
-		DEBUG_LOG(("Ping string is %s\n", pingStr.str()));
+		DEBUG_LOG(("Ping string is %s", pingStr.str()));
 		TheGameSpyInfo->setPingString(pingStr);
 		//delete ThePinger;
 		//ThePinger = NULL;
@@ -790,7 +785,7 @@ static void checkLogin( void )
 		SignalUIInteraction(SHELL_SCRIPT_HOOK_GENERALS_ONLINE_LOGIN);
 		nextScreen = "Menus/WOLWelcomeMenu.wnd";
 		TheShell->pop();
-		
+
 		// read in some cached data
 		GameSpyMiscPreferences mPref;
 		PSPlayerStats localPSStats = GameSpyPSMessageQueueInterface::parsePlayerKVPairs(mPref.getCachedStats().str());
@@ -812,7 +807,7 @@ static void checkLogin( void )
 void WOLLoginMenuUpdate( WindowLayout * layout, void *userData)
 {
 
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 		shutdownComplete(layout);
 
@@ -835,7 +830,7 @@ void WOLLoginMenuUpdate( WindowLayout * layout, void *userData)
 					room.m_groupID = resp.groupRoom.id;
 					room.m_maxWaiting = resp.groupRoom.maxWaiting;
 					room.m_name = resp.groupRoomName.c_str();
-					room.m_translatedName = UnicodeString(L"TEST");
+					room.m_translatedName = L"TEST";
 					room.m_numGames = resp.groupRoom.numGames;
 					room.m_numPlaying = resp.groupRoom.numPlaying;
 					room.m_numWaiting = resp.groupRoom.numWaiting;
@@ -873,7 +868,7 @@ void WOLLoginMenuUpdate( WindowLayout * layout, void *userData)
 					// kill & restart the threads
 					AsciiString motd = TheGameSpyInfo->getMOTD();
 					AsciiString config = TheGameSpyInfo->getConfig();
-					DEBUG_LOG(("Tearing down GameSpy from WOLLoginMenuUpdate(PEERRESPONSE_DISCONNECT)\n"));
+					DEBUG_LOG(("Tearing down GameSpy from WOLLoginMenuUpdate(PEERRESPONSE_DISCONNECT)"));
 					TearDownGameSpy();
 					SetUpGameSpy( motd.str(), config.str() );
 				}
@@ -899,12 +894,12 @@ void WOLLoginMenuUpdate( WindowLayout * layout, void *userData)
 		// kill & restart the threads
 		AsciiString motd = TheGameSpyInfo->getMOTD();
 		AsciiString config = TheGameSpyInfo->getConfig();
-		DEBUG_LOG(("Tearing down GameSpy from WOLLoginMenuUpdate(login timeout)\n"));
+		DEBUG_LOG(("Tearing down GameSpy from WOLLoginMenuUpdate(login timeout)"));
 		TearDownGameSpy();
 		SetUpGameSpy( motd.str(), config.str() );
 	}
 
-}// WOLLoginMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Login Menu input callback */
@@ -912,7 +907,7 @@ void WOLLoginMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLLoginMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -929,31 +924,31 @@ WindowMsgHandledType WOLLoginMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLLoginMenuInput
+}
 
 static Bool isNickOkay(UnicodeString nick)
 {
@@ -1027,33 +1022,33 @@ static Bool isAgeOkay(AsciiString &month, AsciiString &day, AsciiString year)
 //-------------------------------------------------------------------------------------------------
 /** WOL Login Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		// someone typed in a combo box.  Clear password (or fill it in if the typed name matches a known login name)
 		case GCM_UPDATE_TEXT:
@@ -1071,17 +1066,13 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 				trimmedEmail.trim();
 				if (!trimmedNick.isEmpty())
 				{
-					if (trimmedNick.getCharAt(trimmedNick.getLength()-1) == L'\\')
-						trimmedNick.removeLastChar();
-					if (trimmedNick.getCharAt(trimmedNick.getLength()-1) == L'/')
-						trimmedNick.removeLastChar();
+					trimmedNick.trimEnd(L'\\');
+					trimmedNick.trimEnd(L'/');
 				}
 				if (!trimmedEmail.isEmpty())
 				{
-					if (trimmedEmail.getCharAt(trimmedEmail.getLength()-1) == L'\\')
-						trimmedEmail.removeLastChar();
-					if (trimmedEmail.getCharAt(trimmedEmail.getLength()-1) == L'/')
-						trimmedEmail.removeLastChar();
+					trimmedEmail.trimEnd(L'\\');
+					trimmedEmail.trimEnd(L'/');
 				}
 				if (trimmedEmail.getLength() != uEmail.getLength())
 				{
@@ -1134,7 +1125,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					}
 					else
 					{
-						GadgetCheckBoxSetChecked(checkBoxRememberPassword, false);						
+						GadgetCheckBoxSetChecked(checkBoxRememberPassword, false);
 						GadgetTextEntrySetText(textEntryMonth, UnicodeString::TheEmptyString);
 						GadgetTextEntrySetText(textEntryDay, UnicodeString::TheEmptyString);
 						GadgetTextEntrySetText(textEntryYear, UnicodeString::TheEmptyString);
@@ -1197,7 +1188,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					}
 					else
 					{
-						GadgetCheckBoxSetChecked(checkBoxRememberPassword, false);						
+						GadgetCheckBoxSetChecked(checkBoxRememberPassword, false);
 						GadgetTextEntrySetText(textEntryMonth, UnicodeString::TheEmptyString);
 						GadgetTextEntrySetText(textEntryDay, UnicodeString::TheEmptyString);
 						GadgetTextEntrySetText(textEntryYear, UnicodeString::TheEmptyString);
@@ -1224,7 +1215,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					buttonPushed = true;
 					TearDownGameSpy();
 					TheShell->pop();
-				} //if ( controlID == buttonBack )
+				}
 #ifdef ALLOW_NON_PROFILED_LOGIN
 				else if ( controlID == buttonUseAccountID )
 				{
@@ -1232,14 +1223,14 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					nextScreen = "Menus/GameSpyLoginProfile.wnd";
 					TheShell->pop();
 					//TheShell->push( "Menus/GameSpyLoginProfile.wnd" );
-				} //if ( controlID == buttonUseAccount )
+				}
 				else if ( controlID == buttonDontUseAccountID )
 				{
 					buttonPushed = true;
 					nextScreen = "Menus/GameSpyLoginQuick.wnd";
 					TheShell->pop();
 					//TheShell->push( "Menus/GameSpyLoginQuick.wnd" );
-				} //if ( controlID == buttonDontUseAccount )
+				}
 #endif // ALLOW_NON_PROFILED_LOGIN
 				else if ( controlID == buttonCreateAccountID )
 				{
@@ -1252,13 +1243,13 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 						month.translate( GadgetTextEntryGetText(textEntryMonth) );
 						day.translate( GadgetTextEntryGetText(textEntryDay) );
 						year.translate( GadgetTextEntryGetText(textEntryYear) );
-						
+
 						if(!isAgeOkay(month, day, year))
 						{
 							GSMessageBoxOk(TheGameText->fetch("GUI:AgeFailedTitle"), TheGameText->fetch("GUI:AgeFailed"));
 							break;
 						}
-						
+
 						AsciiString login, password, email;
 						email.translate( GadgetComboBoxGetText(comboBoxEmail) );
 						login.translate( GadgetComboBoxGetText(comboBoxLoginName) );
@@ -1269,20 +1260,20 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 							loginAttemptTime = timeGetTime();
 							BuddyRequest req;
 							req.buddyRequestType = BuddyRequest::BUDDYREQUEST_LOGINNEW;
-							strcpy(req.arg.login.nick, login.str());
-							strcpy(req.arg.login.email, email.str());
-							strcpy(req.arg.login.password, password.str());
+							strlcpy(req.arg.login.nick, login.str(), ARRAY_SIZE(req.arg.login.nick));
+							strlcpy(req.arg.login.email, email.str(), ARRAY_SIZE(req.arg.login.email));
+							strlcpy(req.arg.login.password, password.str(), ARRAY_SIZE(req.arg.login.password));
 							req.arg.login.hasFirewall = TRUE;
-							
+
 							TheGameSpyInfo->setLocalBaseName( login );
 							//TheGameSpyInfo->setLocalProfileID( resp.player.profileID );
 							TheGameSpyInfo->setLocalEmail( email );
 							TheGameSpyInfo->setLocalPassword( password );
-							DEBUG_LOG(("before create: TheGameSpyInfo->stuff(%s/%s/%s)\n", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
+							DEBUG_LOG(("before create: TheGameSpyInfo->stuff(%s/%s/%s)", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
 
 							TheGameSpyBuddyMessageQueue->addRequest( req );
 							if(checkBoxRememberPassword && GadgetCheckBoxIsChecked(checkBoxRememberPassword))
-							{	
+							{
 								(*loginPref)["lastName"] = login;
 								(*loginPref)["lastEmail"] = email;
 								(*loginPref)["useProfiles"] = "yes";
@@ -1329,7 +1320,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 						TheShell->pop();
 					}
 #endif // ALLOW_NON_PROFILED_LOGIN
-				} //if ( controlID == buttonCreateAccount )
+				}
 				else if ( controlID == buttonLoginID )
 				{
 					AsciiString login, password, email;
@@ -1342,7 +1333,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 						month.translate( GadgetTextEntryGetText(textEntryMonth) );
 						day.translate( GadgetTextEntryGetText(textEntryDay) );
 						year.translate( GadgetTextEntryGetText(textEntryYear) );
-						
+
 						if(!isAgeOkay(month, day, year))
 						{
 							GSMessageBoxOk(TheGameText->fetch("GUI:AgeFailedTitle"), TheGameText->fetch("GUI:AgeFailed"));
@@ -1358,20 +1349,20 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 							loginAttemptTime = timeGetTime();
 							BuddyRequest req;
 							req.buddyRequestType = BuddyRequest::BUDDYREQUEST_LOGIN;
-							strcpy(req.arg.login.nick, login.str());
-							strcpy(req.arg.login.email, email.str());
-							strcpy(req.arg.login.password, password.str());
+							strlcpy(req.arg.login.nick, login.str(), ARRAY_SIZE(req.arg.login.nick));
+							strlcpy(req.arg.login.email, email.str(), ARRAY_SIZE(req.arg.login.email));
+							strlcpy(req.arg.login.password, password.str(), ARRAY_SIZE(req.arg.login.password));
 							req.arg.login.hasFirewall = true;
-							
+
 							TheGameSpyInfo->setLocalBaseName( login );
 							//TheGameSpyInfo->setLocalProfileID( resp.player.profileID );
 							TheGameSpyInfo->setLocalEmail( email );
 							TheGameSpyInfo->setLocalPassword( password );
-							DEBUG_LOG(("before login: TheGameSpyInfo->stuff(%s/%s/%s)\n", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
+							DEBUG_LOG(("before login: TheGameSpyInfo->stuff(%s/%s/%s)", TheGameSpyInfo->getLocalBaseName().str(), TheGameSpyInfo->getLocalEmail().str(), TheGameSpyInfo->getLocalPassword().str()));
 
 							TheGameSpyBuddyMessageQueue->addRequest( req );
 							if(checkBoxRememberPassword && GadgetCheckBoxIsChecked(checkBoxRememberPassword))
-							{	
+							{
 								(*loginPref)["lastName"] = login;
 								(*loginPref)["lastEmail"] = email;
 								(*loginPref)["useProfiles"] = "yes";
@@ -1437,7 +1428,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					}
 #endif // ALLOW_NON_PROFILED_LOGIN
 
-				} //if ( controlID == buttonLogin )
+				}
 				else if ( controlID == buttonTOSID )
 				{
 					parentTOS->winHide(FALSE);
@@ -1471,20 +1462,8 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 								{
 									UnicodeString uniLine;
 									uniLine = UnicodeString(MultiByteToWideCharSingleLine(asciiLine.str()).c_str());
-									int len = uniLine.getLength();
-									for (int index = len-1; index >= 0; index--)
-									{
-										if (iswspace(uniLine.getCharAt(index)))
-										{
-											uniLine.removeLastChar();
-										}
-										else
-										{
-											break;
-										}
-									}
-									//uniLine.trim();
-									DEBUG_LOG(("adding TOS line: [%ls]\n", uniLine.str()));
+									uniLine.trimEnd();
+									DEBUG_LOG(("adding TOS line: [%ls]", uniLine.str()));
 									GadgetListBoxAddEntryText(listboxTOS, uniLine, tosColor, -1);
 								}
 
@@ -1499,7 +1478,7 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					}
 					EnableLoginControls( FALSE );
 					buttonBack->winEnable(FALSE);
-					
+
 				}
 				else if ( controlID == buttonTOSOKID )
 				{
@@ -1521,8 +1500,8 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 					buttonBack->winEnable(TRUE);
 				}
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -1543,16 +1522,16 @@ WindowMsgHandledType WOLLoginMenuSystem( GameWindow *window, UnsignedInt msg,
 						munkee.removeLastChar();
 						GadgetTextEntrySetText( textEntryLoginName, munkee );
 					}
-				}// if ( controlID == textEntryLoginNameID )
+				}
 				break;
-			}//case GEM_UPDATE_TEXT:
+			}
 			*/
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLLoginMenuSystem
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp
index 101659ca2c5..ea60f558561 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/CustomMatchPreferences.h"
 #include "Common/GameEngine.h"
@@ -44,11 +44,6 @@
 #include "GameClient/MapUtil.h"
 #include "GameNetwork/GUIUtil.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 static NameKeyType buttonBack = NAMEKEY_INVALID;
@@ -77,8 +72,12 @@ static GameWindow *winMapWindow = NULL;
 static void NullifyControls(void)
 {
 	parent = NULL;
-	winMapPreview = NULL;
 	mapList = NULL;
+	if (winMapPreview)
+	{
+		winMapPreview->winSetUserData(NULL);
+		winMapPreview = NULL;
+	}
 	for (Int i=0; i<MAX_SLOTS; ++i)
 	{
 		buttonMapStartPosition[i] = NULL;
@@ -98,8 +97,8 @@ static const char *gadgetsToHide[] =
 	"ButtonSelectMap",
 	"ButtonStart",
 	"StaticTextMapPreview",
-	
-	NULL // keep this last
+
+	NULL
 };
 static const char *perPlayerGadgetsToHide[] =
 {
@@ -107,7 +106,7 @@ static const char *perPlayerGadgetsToHide[] =
 	"ComboBoxColor",
 	"ComboBoxPlayerTemplate",
 	//"ButtonStartPosition",
-	NULL // keep this last
+	NULL
 };
 void positionStartSpots( AsciiString mapName, GameWindow *buttonMapStartPositions[], GameWindow *mapWindow);
 
@@ -128,15 +127,14 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData )
 {
 
 	// set keyboard focus to main parent
-	AsciiString parentName( "WOLMapSelectMenu.wnd:WOLMapSelectMenuParent" );
-	NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
+	NameKeyType parentID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:WOLMapSelectMenuParent" );
 	parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 
 	TheWindowManager->winSetFocus( parent );
 
 	CustomMatchPreferences pref;
 	Bool usesSystemMapDir = pref.usesSystemMapDir();
-	winMapPreviewID = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:WinMapPreview") );
+	winMapPreviewID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:WinMapPreview" );
 	winMapPreview = TheWindowManager->winGetWindowFromId(parent, winMapPreviewID);
 
 	const MapMetaData *mmd = TheMapCache->findMap(TheGameSpyGame->getMap());
@@ -149,9 +147,9 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData )
 	if( TheGameSpyInfo->getCurrentStagingRoom()->getUseStats() )
 		usesSystemMapDir = true;
 
-	buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ButtonBack") );
-	buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ButtonOK") );
-	listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ListboxMap") );
+	buttonBack = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ButtonBack" );
+	buttonOK = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ButtonOK" );
+	listboxMap = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ListboxMap" );
 	radioButtonSystemMapsID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:RadioButtonSystemMaps" );
 	radioButtonUserMapsID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:RadioButtonUserMaps" );
 	winMapWindow = TheWindowManager->winGetWindowFromId( parent, listboxMap );
@@ -167,7 +165,7 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData )
 		GadgetRadioSetSelection( radioButtonSystemMaps, FALSE );
 	else
 		GadgetRadioSetSelection( radioButtonUserMaps, FALSE );
-	
+
 	AsciiString tmpString;
 	for (Int i = 0; i < MAX_SLOTS; i++)
 	{
@@ -183,8 +181,7 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData )
 	showGameSpyGameOptionsUnderlyingGUIElements( FALSE );
 
 	// get the listbox window
-	AsciiString listString( "WOLMapSelectMenu.wnd:ListboxMap" );
-	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( listString );
+	NameKeyType mapListID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ListboxMap" );
 	mapList = TheWindowManager->winGetWindowFromId( parent, mapListID );
 	if( mapList )
 	{
@@ -193,7 +190,7 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData )
 		populateMapListbox( mapList, usesSystemMapDir, TRUE, TheGameSpyGame->getMap() );
 	}
 
-}  // end WOLMapSelectMenuInit  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu shutdown method */
@@ -204,11 +201,11 @@ void WOLMapSelectMenuShutdown( WindowLayout *layout, void *userData )
 
 	// hide menu
 	layout->hide( TRUE );
-	
+
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
 
-}  // end WOLMapSelectMenuShutdown
+}
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu update method */
@@ -224,7 +221,7 @@ void WOLMapSelectMenuUpdate( WindowLayout *layout, void *userData )
 
 	// No update because the game setup screen is up at the same
 	// time and it does the update for us...
-}  // end WOLMapSelectMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Map select menu input callback */
@@ -233,7 +230,7 @@ WindowMsgHandledType WOLMapSelectMenuInput( GameWindow *window, UnsignedInt msg,
 																				 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -248,46 +245,45 @@ WindowMsgHandledType WOLMapSelectMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						AsciiString buttonName( "WOLMapSelectMenu.wnd:ButtonBack" );
-						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( buttonName );
+						NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ButtonBack" );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonID );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
 
-}  // end WOLMapSelectMenuInput
+}
 void WOLPositionStartSpots( void );
 
 //-------------------------------------------------------------------------------------------------
 /** MapSelect menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg,
 																				  WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -295,7 +291,7 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 		{
 			break;
 
-		}  // end create
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -303,7 +299,7 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 			NullifyControls();
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -315,23 +311,23 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 			return MSG_HANDLED;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GLM_DOUBLE_CLICKED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
-				
+
 					if (rowSelected >= 0)
 					{
 						GadgetListBoxSetSelected( control, rowSelected );
 						GameWindow *button = TheWindowManager->winGetWindowFromId( window, buttonOK );
 
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																								(WindowMsgData)button, buttonOK );
 					}
 				}
@@ -343,10 +339,10 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 			case GLM_SELECTED:
 			{
-				
+
 				GameWindow *control = (GameWindow *)mData1;
 				Int controlID = control->winGetWindowId();
-				if( controlID == listboxMap ) 
+				if( controlID == listboxMap )
 				{
 					int rowSelected = mData2;
 					if( rowSelected < 0 )
@@ -401,7 +397,7 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 				}
 
 				WOLPositionStartSpots();
-			}  // end if
+			}
 			else if ( controlID == radioButtonSystemMapsID )
 			{
 				if (TheMapCache)
@@ -424,7 +420,7 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 			{
 				Int selected;
 				UnicodeString map;
-				
+
 				// get the selected index
 				GadgetListBoxGetSelected( winMapWindow, &selected );
 
@@ -433,8 +429,8 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 					// get text of the map to load
 					map = GadgetListBoxGetText( winMapWindow, selected, 0 );
-					
-					
+
+
 					// set the map name in the global data map name
 					AsciiString asciiMap;
 					const char *mapFname = (const char *)GadgetListBoxGetItemData( winMapWindow, selected );
@@ -472,19 +468,19 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 					WOLPositionStartSpots();
 
-				}  // end if
+				}
 
-			}  // end else if
+			}
 
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end WOLMapSelectMenuSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
index d2a4def76a6..7eb372eb8c0 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "GameClient/WindowLayout.h"
@@ -59,11 +59,11 @@ static GameWindow *buttonCancel = NULL;
 //-------------------------------------------------------------------------------------------------
 void WOLMessageWindowInit( WindowLayout *layout, void *userData )
 {
-	parentWOLMessageWindowID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLMessageWindow.wnd:WOLMessageWindowParent" ) );
-	buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLMessageWindow.wnd:ButtonCancel" ) );
+	parentWOLMessageWindowID = TheNameKeyGenerator->nameToKey( "WOLMessageWindow.wnd:WOLMessageWindowParent" );
+	buttonCancelID = TheNameKeyGenerator->nameToKey( "WOLMessageWindow.wnd:ButtonCancel" );
 	parentWOLMessageWindow = TheWindowManager->winGetWindowFromId( NULL, parentWOLMessageWindowID );
 	buttonCancel = TheWindowManager->winGetWindowFromId( NULL,  buttonCancelID);
-	
+
 
 	// Show Menu
 	layout->hide( FALSE );
@@ -71,7 +71,7 @@ void WOLMessageWindowInit( WindowLayout *layout, void *userData )
 	// Set Keyboard to Main Parent
 	TheWindowManager->winSetFocus( parentWOLMessageWindow );
 
-} // WOLMessageWindowInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOLMessage Window shutdown method */
@@ -84,7 +84,7 @@ void WOLMessageWindowShutdown( WindowLayout *layout, void *userData )
 
 	// our shutdown is complete
 	TheShell->shutdownComplete( layout );
-}  // WOLMessageWindowShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void WOLMessageWindowUpdate( WindowLayout * layout, void *userData)
 		WOL::TheWOL->update();
 	*/
 
-}// WOLMessageWindowUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOLMessage Window input callback */
@@ -105,7 +105,7 @@ void WOLMessageWindowUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLMessageWindowInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -120,69 +120,69 @@ WindowMsgHandledType WOLMessageWindowInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonCancel, buttonCancelID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLMessageWindowInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOLMessage Window window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLMessageWindowSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLMessageWindowSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -190,7 +190,7 @@ WindowMsgHandledType WOLMessageWindowSystem( GameWindow *window, UnsignedInt msg
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLMessageWindowSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
index 574785c2ba3..94b1113afa1 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "GameClient/WindowLayout.h"
@@ -60,9 +60,9 @@ static GameWindow *buttonQuickmatch = NULL;
 //-------------------------------------------------------------------------------------------------
 void WOLQMScoreScreenInit( WindowLayout *layout, void *userData )
 {
-	parentWOLQMScoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLQMScoreScreen.wnd:WOLQMScoreScreenParent" ) );
-	buttonDisconnectID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLQMScoreScreen.wnd:ButtonDisconnect" ) );
-	buttonQuickmatchID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLQMScoreScreen.wnd:ButtonQuickMatch" ) );
+	parentWOLQMScoreID = TheNameKeyGenerator->nameToKey( "WOLQMScoreScreen.wnd:WOLQMScoreScreenParent" );
+	buttonDisconnectID = TheNameKeyGenerator->nameToKey( "WOLQMScoreScreen.wnd:ButtonDisconnect" );
+	buttonQuickmatchID = TheNameKeyGenerator->nameToKey( "WOLQMScoreScreen.wnd:ButtonQuickMatch" );
 	parentWOLQMScore = TheWindowManager->winGetWindowFromId( NULL, parentWOLQMScoreID );
 	buttonDisconnect = TheWindowManager->winGetWindowFromId( NULL,  buttonDisconnectID);
 	buttonQuickmatch = TheWindowManager->winGetWindowFromId( NULL,  buttonQuickmatchID);
@@ -85,7 +85,7 @@ void WOLQMScoreScreenInit( WindowLayout *layout, void *userData )
 
 	//progressLayout = TheShell->top();
 
-} // WOLQMScoreScreenInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu shutdown method */
@@ -101,7 +101,7 @@ void WOLQMScoreScreenShutdown( WindowLayout *layout, void *userData )
 
 	//progressLayout = NULL;
 
-}  // WOLQMScoreScreenShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -113,7 +113,7 @@ void WOLQMScoreScreenUpdate( WindowLayout * layout, void *userData)
 	if (WOL::TheWOL)
 		WOL::TheWOL->update();
 	*/
-}// WOLQMScoreScreenUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu input callback */
@@ -121,7 +121,7 @@ void WOLQMScoreScreenUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLQMScoreScreenInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -136,63 +136,63 @@ WindowMsgHandledType WOLQMScoreScreenInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonDisconnect, buttonDisconnectID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLQMScoreScreenInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLQMScoreScreenSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLQMScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're given the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -208,7 +208,7 @@ WindowMsgHandledType WOLQMScoreScreenSystem( GameWindow *window, UnsignedInt msg
 						WOL::TheWOL->addCommand( WOL::WOLCOMMAND_RESET );  // don't display an error, log out, or anything
 					}
 
-				} //if ( controlID == buttonDisconnect )
+				}
 				else if ( controlID == buttonQuickmatchID )
 				{
 					//TheShell->pop();
@@ -221,11 +221,11 @@ WindowMsgHandledType WOLQMScoreScreenSystem( GameWindow *window, UnsignedInt msg
 						}
 					}
 
-				} //if ( controlID == buttonDisconnect )
+				}
 				*/
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -233,7 +233,7 @@ WindowMsgHandledType WOLQMScoreScreenSystem( GameWindow *window, UnsignedInt msg
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLQMScoreScreenSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
index e281adc3842..6ebb5c6804a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/QuickmatchPreferences.h"
@@ -66,11 +66,6 @@
 #include "GameNetwork/GameSpy/PersistentStorageThread.h"
 #include "GameNetwork/RankPointValue.h"
 #include "GameNetwork/GameSpy/LadderDefs.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #ifdef DEBUG_LOGGING
 #include "Common/MiniLog.h"
@@ -214,7 +209,7 @@ static void enableOptionsGadgets(Bool doIt)
 	}
 }
 
-enum 
+enum
 {
 	MAX_DISCONNECTS_ANY = 0,
 	MAX_DISCONNECTS_5 = 5,
@@ -224,10 +219,10 @@ enum
 };
 enum{ MAX_DISCONNECTS_COUNT = 5 };
 
-static Int MAX_DISCONNECTS[MAX_DISCONNECTS_COUNT] = {MAX_DISCONNECTS_ANY, MAX_DISCONNECTS_5, 
+static Int MAX_DISCONNECTS[MAX_DISCONNECTS_COUNT] = {MAX_DISCONNECTS_ANY, MAX_DISCONNECTS_5,
 																											MAX_DISCONNECTS_10, MAX_DISCONNECTS_25,
 																											MAX_DISCONNECTS_50};
-																										
+
 
 void UpdateStartButton(void)
 {
@@ -297,7 +292,7 @@ static void populateQMSideComboBox(Int favSide, const LadderInfo *li = NULL)
 	GadgetComboBoxSetItemData(comboBoxSide, newIndex, (void *)PLAYERTEMPLATE_RANDOM);
 
 	std::set<AsciiString> seenSides;
-	
+
 	Int entryToSelect = 0; // select Random by default
 
 	for (Int c=0; c<numPlayerTemplates; ++c)
@@ -714,7 +709,7 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
 			GameSpyCloseAllOverlays();
 			GSMessageBoxOk( title, body );
 			TheGameSpyInfo->reset();
-			DEBUG_LOG(("WOLQuickMatchMenuInit() - game was in progress, and we were disconnected, so pop immediate back to main menu\n"));
+			DEBUG_LOG(("WOLQuickMatchMenuInit() - game was in progress, and we were disconnected, so pop immediate back to main menu"));
 			TheShell->popImmediate();
 			return;
 		}
@@ -725,10 +720,8 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
 	isShuttingDown = false;
 	raiseMessageBoxes = true;
 
-	if (TheNAT != NULL) {
-		delete TheNAT;
-		TheNAT = NULL;
-	}
+	delete TheNAT;
+	TheNAT = NULL;
 
 	parentWOLQuickMatchID = NAMEKEY( "WOLQuickMatchMenu.wnd:WOLQuickMatchMenuParent" );
 	buttonBackID = NAMEKEY( "WOLQuickMatchMenu.wnd:ButtonBack" );
@@ -772,9 +765,9 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
 	comboBoxSide = TheWindowManager->winGetWindowFromId( parentWOLQuickMatch, comboBoxSideID );
 	comboBoxColor = TheWindowManager->winGetWindowFromId( parentWOLQuickMatch, comboBoxColorID );
 
-	if (TheLadderList->getStandardLadders()->size() == 0
-		&& TheLadderList->getSpecialLadders()->size() == 0
-		&& TheLadderList->getLocalLadders()->size() == 0)
+	if (TheLadderList->getStandardLadders()->empty()
+		&& TheLadderList->getSpecialLadders()->empty()
+		&& TheLadderList->getLocalLadders()->empty())
 	{
 		// no ladders, so just disable them
 		comboBoxDisabledLadder = comboBoxLadder;
@@ -900,7 +893,7 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
 	UpdateStartButton();
 	TheTransitionHandler->setGroup("WOLQuickMatchMenuFade");
 	isInInit= FALSE;
-} // WOLQuickMatchMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a shutdown is complete for this menu */
@@ -923,7 +916,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	nextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Quick Match Menu shutdown method */
@@ -950,13 +943,13 @@ void WOLQuickMatchMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 	TheTransitionHandler->reverse("WOLQuickMatchMenuFade");
 
 	RaiseGSMessageBox();
-}  // WOLQuickMatchMenuShutdown
+}
 
 
 #ifdef PERF_TEST
@@ -1017,7 +1010,7 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 		SignalUIInteraction(SHELL_SCRIPT_HOOK_GENERALS_ONLINE_ENTERED_FROM_GAME);
 	}
 
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished()&& TheTransitionHandler->isFinished())
 		shutdownComplete(layout);
 
@@ -1026,7 +1019,7 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 		RaiseGSMessageBox();
 		raiseMessageBoxes = false;
 	}
-	
+
 	/// @todo: MDC handle disconnects in-game the same way as Custom Match!
 
 	if (TheShell->isAnimFinished() && !buttonPushed && TheGameSpyPeerMessageQueue)
@@ -1119,19 +1112,19 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 			{
 			case PeerResponse::PEERRESPONSE_PLAYERUTM:
 				{
-					if (!stricmp(resp.command.c_str(), "STATS"))
+					if (stricmp(resp.command.c_str(), "STATS") == 0)
 					{
-						DEBUG_LOG(("Saw STATS from %s, data was '%s'\n", resp.nick.c_str(), resp.commandOptions.c_str()));
+						DEBUG_LOG(("Saw STATS from %s, data was '%s'", resp.nick.c_str(), resp.commandOptions.c_str()));
 						AsciiString data = resp.commandOptions.c_str();
 						AsciiString idStr;
 						data.nextToken(&idStr, " ");
 						Int id = atoi(idStr.str());
-						DEBUG_LOG(("data: %d(%s) - '%s'\n", id, idStr.str(), data.str()));
+						DEBUG_LOG(("data: %d(%s) - '%s'", id, idStr.str(), data.str()));
 
 						PSPlayerStats stats = TheGameSpyPSMessageQueue->parsePlayerKVPairs(data.str());
 						PSPlayerStats oldStats = TheGameSpyPSMessageQueue->findPlayerStatsByID(id);
 						stats.id = id;
-						DEBUG_LOG(("Parsed ID is %d, old ID is %d\n", stats.id, oldStats.id));
+						DEBUG_LOG(("Parsed ID is %d, old ID is %d", stats.id, oldStats.id));
 						if (stats.id && (oldStats.id == 0))
 							TheGameSpyPSMessageQueue->trackPlayerStats(stats);
 
@@ -1148,7 +1141,7 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 						}
 					}
 					Int slotNum = TheGameSpyGame->getSlotNum(resp.nick.c_str());
-					if ((slotNum >= 0) && (slotNum < MAX_SLOTS) && (!stricmp(resp.command.c_str(), "NAT"))) {
+					if ((slotNum >= 0) && (slotNum < MAX_SLOTS) && (stricmp(resp.command.c_str(), "NAT") == 0)) {
 						// this is a command for NAT negotiations, pass if off to TheNAT
 						sawImportantMessage = TRUE;
 						if (TheNAT != NULL) {
@@ -1162,12 +1155,12 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 								(val <= FirewallHelperClass::FIREWALL_TYPE_DESTINATION_PORT_DELTA))
 						{
 							slot->setNATBehavior((FirewallHelperClass::FirewallBehaviorType)val);
-							DEBUG_LOG(("Setting NAT behavior to %d for player %d\n", val, slotNum));
+							DEBUG_LOG(("Setting NAT behavior to %d for player %d", val, slotNum));
 							change = true;
 						}
 						else
 						{
-							DEBUG_LOG(("Rejecting invalid NAT behavior %d from player %d\n", val, slotNum));
+							DEBUG_LOG(("Rejecting invalid NAT behavior %d from player %d", val, slotNum));
 						}
 					}
 					*/
@@ -1194,11 +1187,11 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 				/*
 				if (resp.joinGroupRoom.ok)
 				{
-					TheGameSpyInfo->addText(UnicodeString(L"Joined group room"), GameSpyColor[GSCOLOR_DEFAULT], quickmatchTextWindow);
+					TheGameSpyInfo->addText(L"Joined group room", GameSpyColor[GSCOLOR_DEFAULT], quickmatchTextWindow);
 				}
 				else
 				{
-					TheGameSpyInfo->addText(UnicodeString(L"Didn't join group room"), GameSpyColor[GSCOLOR_DEFAULT], quickmatchTextWindow);
+					TheGameSpyInfo->addText(L"Didn't join group room", GameSpyColor[GSCOLOR_DEFAULT], quickmatchTextWindow);
 				}
 				*/
 				break;
@@ -1291,7 +1284,7 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 					switch( resp.qmStatus.status )
 					{
 					case QM_IDLE:
-						//TheGameSpyInfo->addText(UnicodeString(L"Status: QM_IDLE"), GameSpyColor[GSCOLOR_DEFAULT], quickmatchTextWindow);
+						//TheGameSpyInfo->addText(L"Status: QM_IDLE", GameSpyColor[GSCOLOR_DEFAULT], quickmatchTextWindow);
 						break;
 					case QM_JOININGQMCHANNEL:
 						TheGameSpyInfo->addText(TheGameText->fetch("QM:JOININGQMCHANNEL"), GameSpyColor[GSCOLOR_DEFAULT], quickmatchTextWindow);
@@ -1394,7 +1387,7 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 								}
 							}
 
-							DEBUG_LOG(("Starting a QM game: options=[%s]\n", GameInfoToAsciiString(TheGameSpyGame).str()));
+							DEBUG_LOG(("Starting a QM game: options=[%s]", GameInfoToAsciiString(TheGameSpyGame).str()));
 							SendStatsToOtherPlayers(TheGameSpyGame);
 							TheGameSpyGame->startGame(0);
 							GameWindow *buttonBuddies = TheWindowManager->winGetWindowFromId(NULL, buttonBuddiesID);
@@ -1454,17 +1447,17 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 			UnicodeString munkee;
 			munkee.format(L"inQM:%d %d ms, %d messages", s_inQM, frameTime, responses.size());
 			TheGameSpyInfo->addText(munkee, GameSpyColor[GSCOLOR_DEFAULT], quickmatchTextWindow);
-			PERF_LOG(("%ls\n", munkee.str()));
+			PERF_LOG(("%ls", munkee.str()));
 
 			std::list<Int>::const_iterator it;
 			for (it = responses.begin(); it != responses.end(); ++it)
 			{
-				PERF_LOG(("  %s\n", getMessageString(*it)));
+				PERF_LOG(("  %s", getMessageString(*it)));
 			}
 		}
 #endif // PERF_TEST
 	}
-}// WOLQuickMatchMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Quick Match Menu input callback */
@@ -1472,7 +1465,7 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLQuickMatchMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -1489,7 +1482,7 @@ WindowMsgHandledType WOLQuickMatchMenuInput( GameWindow *window, UnsignedInt msg
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
@@ -1497,56 +1490,56 @@ WindowMsgHandledType WOLQuickMatchMenuInput( GameWindow *window, UnsignedInt msg
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
 						if(!buttonBack->winIsHidden())
-							TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+							TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLQuickMatchMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Quick Match Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GCM_SELECTED:
 			{
@@ -1598,7 +1591,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 					UpdateStartButton();
 				}
 				break;
-			} // case GCM_SELECTED
+			}
 
 		case GBM_SELECTED:
 			{
@@ -1679,7 +1672,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 						val = 0;
 					if( val >= maxPingEntries - 1)
 					{
-						req.QM.maxPing = TheGameSpyConfig->getPingTimeoutInMs();	
+						req.QM.maxPing = TheGameSpyConfig->getPingTimeoutInMs();
 					}
 					else
 						req.QM.maxPing = (val+1)*100;
@@ -1715,7 +1708,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 					if (ladderInfo && ladderInfo->randomFactions)
 					{
 						Int sideNum = GameClientRandomValue(0, ladderInfo->validFactions.size()-1);
-						DEBUG_LOG(("Looking for %d out of %d random sides\n", sideNum, ladderInfo->validFactions.size()));
+						DEBUG_LOG(("Looking for %d out of %d random sides", sideNum, ladderInfo->validFactions.size()));
 						AsciiStringListConstIterator cit = ladderInfo->validFactions.begin();
 						while (sideNum)
 						{
@@ -1726,13 +1719,13 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 						{
 							Int numPlayerTemplates = ThePlayerTemplateStore->getPlayerTemplateCount();
 							AsciiString sideStr = *cit;
-							DEBUG_LOG(("Chose %s as our side... finding\n", sideStr.str()));
+							DEBUG_LOG(("Chose %s as our side... finding", sideStr.str()));
 							for (Int c=0; c<numPlayerTemplates; ++c)
 							{
 								const PlayerTemplate *fac = ThePlayerTemplateStore->getNthPlayerTemplate(c);
 								if (fac && fac->getSide() == sideStr)
 								{
-									DEBUG_LOG(("Found %s in index %d\n", sideStr.str(), c));
+									DEBUG_LOG(("Found %s in index %d", sideStr.str(), c));
 									req.QM.side = c;
 									break;
 								}
@@ -1790,9 +1783,8 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 					req.QM.discons = numDiscons;
 
 
-					strncpy(req.QM.pings, TheGameSpyInfo->getPingString().str(), 17);
-					req.QM.pings[16] = 0;
-					
+					strlcpy(req.QM.pings, TheGameSpyInfo->getPingString().str(), sizeof(req.QM.pings));
+
 					req.QM.botID = TheGameSpyConfig->getQMBotID();
 					req.QM.roomID = TheGameSpyConfig->getQMChannel();
 
@@ -1829,7 +1821,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 					TheGameSpyInfo->leaveGroupRoom();
 					nextScreen = "Menus/WOLWelcomeMenu.wnd";
 					TheShell->pop();
-				} //if ( controlID == buttonBack )
+				}
 				else if ( controlID == buttonSelectAllMapsID )
 				{
 					Int numMaps = GadgetListBoxGetNumEntries(listboxMapSelect);
@@ -1839,7 +1831,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 						GadgetListBoxSetItemData(listboxMapSelect, (void *)1, i);
 						GadgetListBoxAddEntryText(listboxMapSelect, GadgetListBoxGetText(listboxMapSelect, i, 1), GameSpyColor[GSCOLOR_MAP_SELECTED], i, 1);
 					}
-				} //if ( controlID == buttonSelectAllMapsID )
+				}
 				else if ( controlID == buttonSelectNoMapsID )
 				{
 					Int numMaps = GadgetListBoxGetNumEntries(listboxMapSelect);
@@ -1849,10 +1841,10 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 						GadgetListBoxSetItemData(listboxMapSelect, (void *)0, i);
 						GadgetListBoxAddEntryText(listboxMapSelect, GadgetListBoxGetText(listboxMapSelect, i, 1), GameSpyColor[GSCOLOR_MAP_UNSELECTED], i, 1);
 					}
-				} //if ( controlID == buttonSelectNoMapsID )
+				}
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GLM_SELECTED:
 			{
 				GameWindow *control = (GameWindow *)mData1;
@@ -1882,7 +1874,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 				}
 				UpdateStartButton();
 				break;
-			}// case GLM_SELECTED
+			}
 
 		case GEM_EDIT_DONE:
 			{
@@ -1891,7 +1883,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLQuickMatchMenuSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
index 693a8905de7..e186969e79a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "GameClient/WindowLayout.h"
@@ -59,14 +59,14 @@ GameWindow *progressTextWindow = NULL;
 //-------------------------------------------------------------------------------------------------
 void WOLStatusMenuInit( WindowLayout *layout, void *userData )
 {
-	parentWOLStatusID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLStatusMenu.wnd:WOLStatusMenuParent" ) );
-	buttonDisconnectID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLStatusMenu.wnd:ButtonDisconnect" ) );
+	parentWOLStatusID = TheNameKeyGenerator->nameToKey( "WOLStatusMenu.wnd:WOLStatusMenuParent" );
+	buttonDisconnectID = TheNameKeyGenerator->nameToKey( "WOLStatusMenu.wnd:ButtonDisconnect" );
 	parentWOLStatus = TheWindowManager->winGetWindowFromId( NULL, parentWOLStatusID );
 	buttonDisconnect = TheWindowManager->winGetWindowFromId( NULL,  buttonDisconnectID);
 
 	progressTextWindow = TheWindowManager->winGetWindowFromId( NULL,
-		TheNameKeyGenerator->nameToKey( AsciiString( "WOLStatusMenu.wnd:ListboxStatus" ) ) );
-	
+		TheNameKeyGenerator->nameToKey( "WOLStatusMenu.wnd:ListboxStatus" ) );
+
 	// Show Menu
 	layout->hide( FALSE );
 
@@ -76,7 +76,7 @@ void WOLStatusMenuInit( WindowLayout *layout, void *userData )
 	//progressLayout = TheShell->top();
 
 	//WOL::raiseWOLMessageBox();
-} // WOLStatusMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu shutdown method */
@@ -93,7 +93,7 @@ void WOLStatusMenuShutdown( WindowLayout *layout, void *userData )
 	//progressLayout = NULL;
 
 	//WOL::raiseWOLMessageBox();
-}  // WOLStatusMenuShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -103,7 +103,7 @@ void WOLStatusMenuUpdate( WindowLayout * layout, void *userData)
 {
 	//if (WOL::TheWOL)
 		//WOL::TheWOL->update();
-}// WOLStatusMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu input callback */
@@ -111,7 +111,7 @@ void WOLStatusMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLStatusMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -126,63 +126,63 @@ WindowMsgHandledType WOLStatusMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonDisconnect, buttonDisconnectID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLStatusMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Status Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLStatusMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLStatusMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -198,11 +198,11 @@ WindowMsgHandledType WOLStatusMenuSystem( GameWindow *window, UnsignedInt msg,
 						WOL::TheWOL->addCommand( WOL::WOLCOMMAND_RESET );  // don't display an error, log out, or anything
 					}
 
-				} //if ( controlID == buttonDisconnect )
+				}
 				*/
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -210,7 +210,7 @@ WindowMsgHandledType WOLStatusMenuSystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLStatusMenuSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
index 5fb0378e3a1..f098089806f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "gamespy/peer/peer.h"
 
@@ -64,16 +64,10 @@
 #include "GameNetwork/GameSpy/PeerThread.h"
 #include "GameNetwork/GameSpy/PersistentStorageDefs.h"
 #include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/BuddyThread.h"
 #include "GameNetwork/GameSpy/ThreadUtils.h"
 #include "GameNetwork/GameSpy/MainMenuUtils.h"
 #include "GameNetwork/WOLBrowser/WebBrowser.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 static Bool isShuttingDown = FALSE;
 static Bool buttonPushed = FALSE;
@@ -208,7 +202,7 @@ static void shutdownComplete( WindowLayout *layout )
 
 	nextScreen = NULL;
 
-}  // end if
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Handle Num Players Online data */
@@ -249,7 +243,7 @@ static void updateNumPlayersOnline(void)
 		//This was a Harvard initiated fix.
 		headingStr.format(TheGameText->fetch("MOTD:NumPlayersHeading"));
 
-		while (headingStr.nextToken(&line, UnicodeString(L"\n")))
+		while (headingStr.nextToken(&line, L"\n"))
 		{
 			if (line.getCharAt(line.getLength()-1) == '\r')
 				line.removeLastChar();	// there is a trailing '\r'
@@ -258,12 +252,12 @@ static void updateNumPlayersOnline(void)
 
 			if (line.isEmpty())
 			{
-				line = UnicodeString(L" ");
+				line = L" ";
 			}
 
 			GadgetListBoxAddEntryText(listboxInfo, line, GameSpyColor[GSCOLOR_MOTD_HEADING], -1, -1);
 		}
-		GadgetListBoxAddEntryText(listboxInfo, UnicodeString(L" "), GameSpyColor[GSCOLOR_MOTD_HEADING], -1, -1);
+		GadgetListBoxAddEntryText(listboxInfo, L" ", GameSpyColor[GSCOLOR_MOTD_HEADING], -1, -1);
 
 		while (aMotd.nextToken(&aLine, "\n"))
 		{
@@ -291,7 +285,7 @@ static void updateNumPlayersOnline(void)
 				g = grabUByte(aLine.str()+5);
 				b = grabUByte(aLine.str()+7);
 				c = GameMakeColor(r, g, b, a);
-				DEBUG_LOG(("MOTD line '%s' has color %X\n", aLine.str(), c));
+				DEBUG_LOG(("MOTD line '%s' has color %X", aLine.str(), c));
 				aLine = aLine.str() + 9;
 			}
 			line = UnicodeString(MultiByteToWideCharSingleLine(aLine.str()).c_str());
@@ -330,12 +324,12 @@ static const char* FindNextNumber( const char* pStart )
 //parse win/loss stats received from GameSpy
 void HandleOverallStats( const char* szHTTPStats, unsigned len )
 {
-//x	DEBUG_LOG(("Parsing win percent stats:\n%s\n", szHTTPStats));
+//x	DEBUG_LOG(("Parsing win percent stats:\n%s", szHTTPStats));
 	//find today's stats
 	const char* pToday = strstr( szHTTPStats, "Today" );
 	if( !pToday )
 	{	//error
-		DEBUG_LOG(( "Unable to parse win/loss stats.  Could not find 'Today' in:\n%s\n", szHTTPStats ));
+		DEBUG_LOG(( "Unable to parse win/loss stats.  Could not find 'Today' in:\n%s", szHTTPStats ));
 		return;
 	}
 	s_winStats.clear();
@@ -356,7 +350,7 @@ void HandleOverallStats( const char* szHTTPStats, unsigned len )
 		const char* pSide = strstr( pToday, side.str() );
 		if( pSide == NULL )
 		{	//error, skip this side
-			DEBUG_LOG(( "Unable to parse win/loss stats for %s in:\n%s\n", side.str(), szHTTPStats ));
+			DEBUG_LOG(( "Unable to parse win/loss stats for %s in:\n%s", side.str(), szHTTPStats ));
 			continue;
 		}
 
@@ -368,9 +362,9 @@ void HandleOverallStats( const char* szHTTPStats, unsigned len )
 		s_totalWinPercent += percent;
 
 		s_winStats.insert(std::make_pair( side, percent ));
-//x		DEBUG_LOG(("Added win percent: %s, %d\n", side.str(), percent));
-	} //for i
-} //HandleOverallStats
+//x		DEBUG_LOG(("Added win percent: %s, %d", side.str(), percent));
+	}
+}
 
 
 //called only from WOLWelcomeMenuInit to set %win stats
@@ -391,9 +385,9 @@ static void updateOverallStats(void)
 		wndName.format( "WOLWelcomeMenu.wnd:Percent%s", it->first.str() );
 		pWin = TheWindowManager->winGetWindowFromId( NULL, NAMEKEY(wndName) );
 		GadgetCheckBoxSetText( pWin, percStr );
-//x		DEBUG_LOG(("Initialized win percent: %s -> %s %f=%s\n", wndName.str(), it->first.str(), it->second, percStr.str() ));
-	} //for
-} //updateOverallStats
+//x		DEBUG_LOG(("Initialized win percent: %s -> %s %f=%s", wndName.str(), it->first.str(), it->second, percStr.str() ));
+	}
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -413,7 +407,7 @@ void UpdateLocalPlayerStats(void)
 	{
 		PopulatePlayerInfoWindows( "WOLQuickMatchMenu.wnd" );
 	}
-	
+
 	return;
 }
 
@@ -431,13 +425,13 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData )
 
 	//TheWOL->reset();
 
-	parentWOLWelcomeID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:WOLWelcomeMenuParent" ) );
-	buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonBack" ) );
+	parentWOLWelcomeID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:WOLWelcomeMenuParent" );
+	buttonBackID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonBack" );
 	parentWOLWelcome = TheWindowManager->winGetWindowFromId( NULL, parentWOLWelcomeID );
 	buttonBack = TheWindowManager->winGetWindowFromId( NULL,  buttonBackID);
 	buttonOptionsID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonOptions" );
 	buttonbuttonOptions = TheWindowManager->winGetWindowFromId( NULL,  buttonOptionsID);
-	listboxInfoID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:InfoListbox" ) );
+	listboxInfoID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:InfoListbox" );
 
 	listboxInfo = TheWindowManager->winGetWindowFromId( NULL,  listboxInfoID);
 
@@ -481,7 +475,7 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData )
 
 	// Clear some defaults
 	/*
-	UnicodeString questionMark = UnicodeString(L"?");
+	UnicodeString questionMark = L"?";
 	GadgetStaticTextSetText(staticTextLastUpdated, questionMark);
 	GadgetStaticTextSetText(staticTextLadderWins, questionMark);
 	GadgetStaticTextSetText(staticTextLadderLosses, questionMark);
@@ -496,19 +490,19 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData )
 
 	//DEBUG_ASSERTCRASH(listboxInfo, ("No control found!"));
 
-	buttonQuickMatchID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonQuickMatch" ) );
+	buttonQuickMatchID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonQuickMatch" );
 	buttonQuickMatch = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonQuickMatchID );
 
-	buttonLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonCustomMatch" ) );
+	buttonLobbyID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonCustomMatch" );
 	buttonLobby = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonLobbyID );
 
-	buttonBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonBuddies" ) );
+	buttonBuddiesID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonBuddies" );
 	buttonBuddies = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonBuddiesID );
 
-	buttonMyInfoID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonMyInfo" ) );
+	buttonMyInfoID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonMyInfo" );
 	buttonMyInfo = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonMyInfoID );
 
-	buttonLadderID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonLadder" ) );
+	buttonLadderID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonLadder" );
 	buttonLadder = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonLadderID );
 
 	if (TheFirewallHelper == NULL) {
@@ -566,7 +560,7 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData )
 	raiseMessageBoxes = TRUE;
 	TheTransitionHandler->setGroup("WOLWelcomeMenuFade");
 
-} // WOLWelcomeMenuInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Welcome Menu shutdown method */
@@ -575,10 +569,8 @@ void WOLWelcomeMenuShutdown( WindowLayout *layout, void *userData )
 {
 	listboxInfo = NULL;
 
-	if (TheFirewallHelper != NULL) {
-		delete TheFirewallHelper;
-		TheFirewallHelper = NULL;
-	}
+	delete TheFirewallHelper;
+	TheFirewallHelper = NULL;
 
 	isShuttingDown = TRUE;
 
@@ -590,14 +582,14 @@ void WOLWelcomeMenuShutdown( WindowLayout *layout, void *userData )
 		shutdownComplete( layout );
 		return;
 
-	}  //end if
+	}
 
 	TheShell->reverseAnimatewindow();
 	TheTransitionHandler->reverse("WOLWelcomeMenuFade");
 
 
 	RaiseGSMessageBox();
-}  // WOLWelcomeMenuShutdown
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -605,7 +597,7 @@ void WOLWelcomeMenuShutdown( WindowLayout *layout, void *userData )
 //-------------------------------------------------------------------------------------------------
 void WOLWelcomeMenuUpdate( WindowLayout * layout, void *userData)
 {
-	// We'll only be successful if we've requested to 
+	// We'll only be successful if we've requested to
 	if(isShuttingDown && TheShell->isAnimFinished() && TheTransitionHandler->isFinished())
 		shutdownComplete(layout);
 
@@ -624,7 +616,7 @@ void WOLWelcomeMenuUpdate( WindowLayout * layout, void *userData)
 			TheFirewallHelper->writeFirewallBehavior();
 
 			TheFirewallHelper->flagNeedToRefresh(FALSE); // 2/19/03 BGC, we're done, so we don't need to refresh the NAT anymore.
-			
+
 			// we are now done with the firewall helper
 			delete TheFirewallHelper;
 			TheFirewallHelper = NULL;
@@ -649,7 +641,7 @@ void WOLWelcomeMenuUpdate( WindowLayout * layout, void *userData)
 					room.m_groupID = resp.groupRoom.id;
 					room.m_maxWaiting = resp.groupRoom.maxWaiting;
 					room.m_name = resp.groupRoomName.c_str();
-					room.m_translatedName = UnicodeString(L"TEST");
+					room.m_translatedName = L"TEST";
 					room.m_numGames = resp.groupRoom.numGames;
 					room.m_numPlaying = resp.groupRoom.numPlaying;
 					room.m_numWaiting = resp.groupRoom.numWaiting;
@@ -698,7 +690,7 @@ void WOLWelcomeMenuUpdate( WindowLayout * layout, void *userData)
 		}
 	}
 
-}// WOLWelcomeMenuUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Welcome Menu input callback */
@@ -706,7 +698,7 @@ void WOLWelcomeMenuUpdate( WindowLayout * layout, void *userData)
 WindowMsgHandledType WOLWelcomeMenuInput( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// --------------------------------------------------------------------------------------------
@@ -723,63 +715,63 @@ WindowMsgHandledType WOLWelcomeMenuInput( GameWindow *window, UnsignedInt msg,
 				// ----------------------------------------------------------------------------------------
 				case KEY_ESC:
 				{
-					
+
 					//
 					// send a simulated selected event to the parent window of the
 					// back/exit button
 					//
 					if( BitIsSet( state, KEY_STATE_UP ) )
 					{
-						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+						TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																							(WindowMsgData)buttonBack, buttonBackID );
 
-					}  // end if
+					}
 
 					// don't let key fall through anywhere else
 					return MSG_HANDLED;
 
-				}  // end escape
+				}
 
-			}  // end switch( key )
+			}
 
-		}  // end char
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_IGNORED;
-}// WOLWelcomeMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** WOL Welcome Menu window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 														 WindowMsgData mData1, WindowMsgData mData2 )
 {
 	UnicodeString txtInput;
 
 	switch( msg )
 	{
-		
-		
+
+
 		case GWM_CREATE:
 			{
-				
+
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_DESTROY:
 			{
 				break;
-			} // case GWM_DESTROY:
+			}
 
 		case GWM_INPUT_FOCUS:
-			{	
+			{
 				// if we're givin the opportunity to take the keyboard focus we must say we want it
 				if( mData1 == TRUE )
 					*(Bool *)mData2 = TRUE;
 
 				return MSG_HANDLED;
-			}//case GWM_INPUT_FOCUS:
+			}
 
 		case GBM_SELECTED:
 			{
@@ -793,7 +785,7 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 				{
 					//DEBUG_ASSERTCRASH(TheGameSpyChat->getPeer(), ("No GameSpy Peer object!"));
 					//TheGameSpyChat->disconnectFromChat();
-					
+
 					PeerRequest req;
 					req.peerRequestType = PeerRequest::PEERREQUEST_LOGOUT;
 					TheGameSpyPeerMessageQueue->addRequest( req );
@@ -801,7 +793,7 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 					breq.buddyRequestType = BuddyRequest::BUDDYREQUEST_LOGOUT;
 					TheGameSpyBuddyMessageQueue->addRequest( breq );
 
-					DEBUG_LOG(("Tearing down GameSpy from WOLWelcomeMenuSystem(GBM_SELECTED)\n"));
+					DEBUG_LOG(("Tearing down GameSpy from WOLWelcomeMenuSystem(GBM_SELECTED)"));
 					TearDownGameSpy();
 
 					/*
@@ -826,15 +818,15 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 					TheWOLGame = NULL;
 					**/
 
-				} //if ( controlID == buttonBack )
+				}
 				else if (controlID == buttonOptionsID)
-				{					
+				{
 					GameSpyOpenOverlay( GSOVERLAY_OPTIONS );
 				}
 				else if (controlID == buttonQuickMatchID)
 				{
 					GameSpyMiscPreferences mPref;
-					if ((TheDisplay->getWidth() != 800 || TheDisplay->getHeight() != 600) && mPref.getQuickMatchResLocked())
+					if ((TheDisplay->getWidth() != DEFAULT_DISPLAY_WIDTH || TheDisplay->getHeight() != DEFAULT_DISPLAY_HEIGHT) && mPref.getQuickMatchResLocked())
 					{
 						GSMessageBoxOk(TheGameText->fetch("GUI:GSErrorTitle"), TheGameText->fetch("GUI:QuickMatch800x600"));
 					}
@@ -844,7 +836,7 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 						nextScreen = "Menus/WOLQuickMatchMenu.wnd";
 						TheShell->pop();
 					}
-				}// else if
+				}
 				else if (controlID == buttonMyInfoID )
 				{
 					SetLookAtPlayer(TheGameSpyInfo->getLocalProfileID(), TheGameSpyInfo->getLocalName());
@@ -864,7 +856,7 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 					TheWOL->setState( WOL::WOLAPI_LOBBY );
 					TheWOL->addCommand( WOL::WOLCOMMAND_REFRESH_CHANNELS );
 					*/
-				}// else if
+				}
 				else if (controlID == buttonBuddiesID)
 				{
 					GameSpyToggleOverlay( GSOVERLAY_BUDDY );
@@ -882,17 +874,17 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 					else
 					{
 						GameSpyCurrentGroupRoomID = 0;
-						GSMessageBoxOk(UnicodeString(L"Oops"), UnicodeString(L"Unable to join title room"), NULL);
+						GSMessageBoxOk(L"Oops", L"Unable to join title room", NULL);
 					}
 					*/
 				}
 				else if (controlID == buttonLadderID)
 				{
-					TheShell->push(AsciiString("Menus/WOLLadderScreen.wnd"));
+					TheShell->push("Menus/WOLLadderScreen.wnd");
 				}
 				break;
-			}// case GBM_SELECTED:
-	
+			}
+
 		case GEM_EDIT_DONE:
 			{
 				break;
@@ -900,7 +892,7 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}//Switch
+	}
 
 	return MSG_HANDLED;
-}// WOLWelcomeMenuSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
index 58a1843fe0c..998f9daee59 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
@@ -24,12 +24,12 @@
 
 // FILE: MessageBox.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -46,7 +46,7 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/NameKeyGenerator.h"
@@ -98,12 +98,12 @@ GameWindow *MessageBoxCancel(UnicodeString titleString,UnicodeString bodyString,
 //-------------------------------------------------------------------------------------------------
 /** Message Box window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType MessageBoxSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType MessageBoxSystem( GameWindow *window, UnsignedInt msg,
 										 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	
-	switch( msg ) 
+
+
+	switch( msg )
 	{
 
 		//---------------------------------------------------------------------------------------------
@@ -113,7 +113,7 @@ WindowMsgHandledType MessageBoxSystem( GameWindow *window, UnsignedInt msg,
 			window->winSetUserData( NULL );
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -125,69 +125,69 @@ WindowMsgHandledType MessageBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-			static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonOk" ) );
-			static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonYes" ) );
-			static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonNo" ) );
-			static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonCancel" ) );
+			static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonOk" );
+			static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonYes" );
+			static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonNo" );
+			static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonCancel" );
 			WindowMessageBoxData *MsgBoxCallbacks = (WindowMessageBoxData *)window->winGetUserData();
-			
+
 			if( controlID == buttonOkID )
 			{
 				//simple enough,if we have a callback, call it, if not, then just destroy the window
 				if (MsgBoxCallbacks->okCallback)
 					MsgBoxCallbacks->okCallback();
-				
+
 				TheWindowManager->winDestroy(window);
 
-			}  // end if
+			}
 			else if( controlID == buttonYesID )
 			{
 				if (MsgBoxCallbacks->yesCallback)
 					MsgBoxCallbacks->yesCallback();
 				TheWindowManager->winDestroy(window);
-			}  // end else if
+			}
 			else if( controlID == buttonNoID )
 			{
 				if (MsgBoxCallbacks->noCallback)
 					MsgBoxCallbacks->noCallback();
 				TheWindowManager->winDestroy(window);
-			}  // end else if
+			}
 			else if( controlID == buttonCancelID )
 			{
 				if (MsgBoxCallbacks->cancelCallback)
 					MsgBoxCallbacks->cancelCallback();
 				TheWindowManager->winDestroy(window);
-			}  // end else if
-			
+			}
+
 			break;
 
-		}  // end selected
-		
+		}
+
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end MessageBoxSystem
+}
 //-------------------------------------------------------------------------------------------------
 /** Message Box window system callback */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType QuitMessageBoxSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType QuitMessageBoxSystem( GameWindow *window, UnsignedInt msg,
 										 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	
-	
-	switch( msg ) 
+
+
+	switch( msg )
 	{
 
 		//---------------------------------------------------------------------------------------------
@@ -197,7 +197,7 @@ WindowMsgHandledType QuitMessageBoxSystem( GameWindow *window, UnsignedInt msg,
 			window->winSetUserData( NULL );
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -209,57 +209,57 @@ WindowMsgHandledType QuitMessageBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end input
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
-			static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonOk" ) );
-			static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonYes" ) );
-			static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonNo" ) );
-			static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonCancel" ) );
+			static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonOk" );
+			static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonYes" );
+			static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonNo" );
+			static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonCancel" );
 			WindowMessageBoxData *MsgBoxCallbacks = (WindowMessageBoxData *)window->winGetUserData();
-			
+
 			if( controlID == buttonOkID )
 			{
 				//simple enough,if we have a callback, call it, if not, then just destroy the window
 				if (MsgBoxCallbacks->okCallback)
 					MsgBoxCallbacks->okCallback();
-				
+
 				TheWindowManager->winDestroy(window);
 
-			}  // end if
+			}
 			else if( controlID == buttonYesID )
 			{
 				if (MsgBoxCallbacks->yesCallback)
 					MsgBoxCallbacks->yesCallback();
 				TheWindowManager->winDestroy(window);
-			}  // end else if
+			}
 			else if( controlID == buttonNoID )
 			{
 				if (MsgBoxCallbacks->noCallback)
 					MsgBoxCallbacks->noCallback();
 				TheWindowManager->winDestroy(window);
-			}  // end else if
+			}
 			else if( controlID == buttonCancelID )
 			{
 				if (MsgBoxCallbacks->cancelCallback)
 					MsgBoxCallbacks->cancelCallback();
 				TheWindowManager->winDestroy(window);
-			}  // end else if
-			
+			}
+
 			break;
 
-		}  // end selected
-		
+		}
+
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end MessageBoxSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp
index 924649b7d57..43e1a55f2e3 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameWindow.h"
 #include "GameClient/Gadget.h"
@@ -43,15 +43,15 @@ WindowMsgHandledType ReplayControlInput( GameWindow *window, UnsignedInt msg,
 
 	return MSG_IGNORED;
 
-}  // end MapSelectMenuInput
+}
 
 //-------------------------------------------------------------------------------------------------
 /** System callback for the control bar parent */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType ReplayControlSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType ReplayControlSystem( GameWindow *window, UnsignedInt msg,
 																			 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		//---------------------------------------------------------------------------------------------
@@ -60,15 +60,15 @@ WindowMsgHandledType ReplayControlSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end ControlBarSystem
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
index 207f7f75339..2adcad2546e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
@@ -24,12 +24,12 @@
 
 // FILE: CheckBox.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -76,44 +76,44 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 				//TheWindowManager->winSetFocus( window );
 
-			}  // end if
+			}
 			break;
 
-		}  // end mouse entering
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
-			}  // end if
+			}
 			break;
 
-		}  // end mouse leaving
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
@@ -123,7 +123,7 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 																					(WindowMsgData)window, mData1 );
 			break;
 
-		}  // end left drag
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DOWN:
@@ -131,7 +131,7 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end left down
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_UP:
@@ -152,14 +152,14 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end left up and left click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_RIGHT_DOWN:
 		{
 
 			break;
-		}  // end right down
+		}
 
 		//-------------------------------------------------------------------------
 		case GWM_RIGHT_UP:
@@ -178,13 +178,13 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 				return MSG_IGNORED;
 			}
 			break;
-		}  // end right up or right click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CHAR:
 		{
 
-			switch( mData1 ) 
+			switch( mData1 )
 			{
 
 				// --------------------------------------------------------------------
@@ -197,14 +197,14 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 						// Toggle the check state
 						instData->m_state ^= WIN_STATE_SELECTED;
 
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GBM_SELECTED,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								0 );
-					}  //end if
+					}
 					break;
 
-				}  // end enter/space
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_DOWN:
@@ -216,7 +216,7 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 						TheWindowManager->winNextTab(window);
 					break;
 
-				}  // end down, right, tab
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_UP:
@@ -227,7 +227,7 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 						TheWindowManager->winPrevTab(window);
 					break;
 
-				}  // end up, left
+				}
 
 				// --------------------------------------------------------------------
 				default:
@@ -235,13 +235,13 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 
 					return MSG_IGNORED;
 
-				}  // end default
+				}
 
-			}  // end switch
+			}
 
 			break;
 
-		}  // end char msg
+		}
 
 		// ------------------------------------------------------------------------
 		default:
@@ -249,13 +249,13 @@ WindowMsgHandledType GadgetCheckBoxInput( GameWindow *window, UnsignedInt msg,
 
 			return MSG_IGNORED;
 
-		}  // end default
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetCheckBoxInput
+}
 
 // GadgetCheckBoxSystem =======================================================
 /** Handle system messages for check box */
@@ -265,9 +265,9 @@ WindowMsgHandledType GadgetCheckBoxSystem( GameWindow *window, UnsignedInt msg,
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
-		// ------------------------------------------------------------------------	
+		// ------------------------------------------------------------------------
 		case GGM_SET_LABEL:
 		{
 			window->winSetText( *(UnicodeString*)mData1 );
@@ -289,25 +289,25 @@ WindowMsgHandledType GadgetCheckBoxSystem( GameWindow *window, UnsignedInt msg,
 				BitClear( instData->m_state, WIN_STATE_HILITED );
 			else
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 			if( mData1 == FALSE )
 				*(Bool*)mData2 = FALSE;
 			else
 				*(Bool*)mData2 = TRUE;
-			
+
 			break;
 
-		default: 
+		default:
 			return MSG_IGNORED;
 
-	}  // end switch msg
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetCheckBoxSystem
+}
 
 // GadgetCheckBoxSetText ======================================================
 /** Set the text for the control */
@@ -321,7 +321,7 @@ void GadgetCheckBoxSetText( GameWindow *g, UnicodeString text )
 
 	TheWindowManager->winSendSystemMsg( g, GGM_SET_LABEL, (WindowMsgData)&text, 0 );
 
-}  // end GadgetCheckBoxSetText
+}
 
 // GadgetCheckBoxSetChecked ============================================
 //=============================================================================
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
index 1926b736331..e4c715ab385 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GadgetComboBox.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -45,7 +45,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -100,7 +100,7 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 
 			switch (mData1)
 			{
-				
+
 				// --------------------------------------------------------------------
 				case KEY_DOWN:
 				case KEY_RIGHT:
@@ -122,11 +122,11 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 				default:
 					return TheWindowManager->winSendInputMsg( editBox, GWM_CHAR, mData1, mData2 );
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
-		}  // end case char
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_WHEEL_DOWN:
@@ -134,14 +134,14 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end wheel down
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_WHEEL_UP:
 		{
 			break;
 
-		}  // end wheel up
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_UP:
@@ -158,7 +158,7 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 				if( TheAudio )
 				{
 					TheAudio->addAudioEvent( &buttonClick );
-				}  // end if
+				}
 
 				GameWindow *listBox = GadgetComboBoxGetListBox(window);
 				if (listBox)
@@ -178,7 +178,7 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 						{
 							multiplier = comboData->entryCount;
 							listX = winSize.x;// + 16;
-							
+
 							if(listData->upButton)
 								listData->upButton->winHide(TRUE);
 							if(listData->downButton)
@@ -196,9 +196,9 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 								listData->downButton->winHide(FALSE);
 							if(listData->slider)
 								listData->slider->winHide(FALSE);
-							
+
 						}
-						
+
 						newSize.y = ((TheWindowManager->winFontHeight( listInstData->getFont() ) ) * multiplier) + multiplier * 2 + 4;
 						window->winSetSize(winSize.x , winSize.y + newSize.y );
 						listBox->winSetPosition(0, winSize.y);
@@ -212,62 +212,62 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 					}
 				}			break;
 
-		}  // end left click, left up
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_RIGHT_UP:
 		{
 			break;
 
-		}  // end right up, right click
+		}
 
 /*
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 				TheWindowManager->winSetFocus( window );
 
-			}  // end if
+			}
 
 			break;
 
-		}  //  end mouse entering
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK )) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ))
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
-			}  // end if
+			}
 
 			break;
 
-		}  // end mouse leaving
+		}
 */
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
 
 			if (BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 			break;
 
@@ -281,11 +281,11 @@ WindowMsgHandledType GadgetComboBoxInput( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch msg
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetComboBoxInput
+}
 
 // HideListBox ================================================================
 /** Called to close the listbox if it is opened */
@@ -325,7 +325,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			instData->setText(*(UnicodeString*)mData1);
 			break;
 
-		}  // end set lavel
+		}
 
 		// ------------------------------------------------------------------------
 		case GCM_GET_TEXT:
@@ -333,7 +333,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			if(comboData->editBox)
 				*(UnicodeString*)mData2 = GadgetTextEntryGetText(comboData->editBox);
 			break;
-		} // end Get text
+		}
 
 		// ------------------------------------------------------------------------
 		case GCM_SET_TEXT:
@@ -342,13 +342,13 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 				GadgetTextEntrySetText(comboData->editBox,*(const UnicodeString*)mData1);
 			break;
 
-		}  // end set text
+		}
 
 		case GEM_UPDATE_TEXT:
 		{
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																	GCM_UPDATE_TEXT,
-																	(WindowMsgData)window, 
+																	(WindowMsgData)window,
 																	0 );
 			if (comboData->listBox)
 			{
@@ -365,19 +365,19 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			if ((GameWindow *)mData1 == comboData->editBox)
 			{
 				HideListBox(window);
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																		GCM_SELECTED,
-																		(WindowMsgData)window, 
+																		(WindowMsgData)window,
 																		0 );
 			}
 			break;
 		}
 		// ------------------------------------------------------------------------
-		// Set the selection in the listbox, this will trigger the listbox selected message 
+		// Set the selection in the listbox, this will trigger the listbox selected message
 		// which will set the edit box.
 		case GCM_SET_SELECTION:
-		{		
-			GameWindow *listBox = GadgetComboBoxGetListBox(window);					
+		{
+			GameWindow *listBox = GadgetComboBoxGetListBox(window);
 			if(listBox)
 			{
 				if( !listBox->winIsHidden() && mData2 == TRUE )
@@ -399,7 +399,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 				*(Int *)mData2 = -1;
 			}
 			break;
-		} //case GCM_GET_SELECTION:
+		}
 		// ------------------------------------------------------------------------
 		// Set the User Data for the specified listbox element
 		case GCM_SET_ITEM_DATA:
@@ -433,8 +433,8 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 					}
 					else
 						HideListBox(window);
-					
-					// Nothing was actually selected, so we just want to 
+
+					// Nothing was actually selected, so we just want to
 					if( mData2 == -1)
 					{
 						break;
@@ -444,26 +444,26 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 					UnicodeString tempUString;
 					Color color;
 					tempUString = GadgetListBoxGetTextAndColor( comboData->listBox, &color, mData2, 0 );
-									
+
 					GadgetTextEntrySetTextColor(comboData->editBox, color);
-					
+
 					GadgetTextEntrySetText(comboData->editBox, tempUString);
-					
-					TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+
+					TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																		GCM_SELECTED,
-																		(WindowMsgData)window, 
+																		(WindowMsgData)window,
 																		0 );
 				}
 			break;
 		}
-		
+
 		// ------------------------------------------------------------------------
 		case GGM_LEFT_DRAG:
 		{
 
 			break;
 
-		}  // end left drag
+		}
 
 		// ------------------------------------------------------------------------
 		case GCM_DEL_ALL:
@@ -473,32 +473,32 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			if ( comboData->editBox )
 				GadgetTextEntrySetText(comboData->editBox, UnicodeString::TheEmptyString );
 			comboData->entryCount = 0;
-			//HideListBox(window);	
+			//HideListBox(window);
 			break;
 
-		}  // end delete all
+		}
 
 		// ------------------------------------------------------------------------
 		case GCM_DEL_ENTRY:
 		{
-			
+
 			break;
 
-		}  // end delete entry
+		}
 		// ------------------------------------------------------------------------
 		case GGM_CLOSE:
 		{
 			HideListBox(window);
 			break;
 
-		}  // end delete entry
+		}
 
 		// ------------------------------------------------------------------------
 		case GCM_ADD_ENTRY:
 		{
 			GameWindow *listBox = GadgetComboBoxGetListBox(window);
 			ListboxData *listData = (ListboxData *)listBox->winGetUserData();
-			
+
 			Int addedIndex = -1;
 			if( listBox )
 			{
@@ -522,7 +522,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 				editBox->winGetSize(&editBoxSize.x, &editBoxSize.y);
 				// If the listbox has less entries then the MaxDisplay, size it smaller
 				if(comboData->entryCount <= comboData->maxDisplay)
-				{							
+				{
 					multiplier = comboData->entryCount;
 					listX = winSize.x + 16;
 					if(listData->upButton)
@@ -550,9 +550,9 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			}
 
 			return( (WindowMsgHandledType) addedIndex );
-		}  // end add entry
-	
-		
+		}
+
+
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
 			break;
@@ -565,15 +565,15 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			ICoord2D dropDownSize;
 
 			// get needed window sizes
-			
+
 			comboData->dropDownButton->winGetSize( &dropDownSize.x, &dropDownSize.y );
-		
+
 			GameWindow *listBox = GadgetComboBoxGetListBox(window);
 			if (listBox->winIsHidden())
 			{
 				if (listBox)
 					listBox->winSetSize(width,height);
-					
+
 				if( comboData->dropDownButton )
 				{
 					comboData->dropDownButton->winSetPosition( width - dropDownSize.x, 0 );
@@ -587,7 +587,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end resized
+		}
 
 		// ------------------------------------------------------------------------
 
@@ -595,13 +595,11 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 		case GWM_DESTROY:
 		{
 			TheWindowManager->winSetLoneWindow(NULL); // if we are transitioning screens, close all combo boxes
-			if (comboData)
-			{
-				delete(comboData);
-				comboData = NULL;
-			}
+			delete (ComboBoxData *)window->winGetUserData();
+			window->winSetUserData(NULL);
+			comboData = NULL;
 			break;
-		}  // end destroy
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -617,20 +615,20 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 			}
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 
 			Bool wantsFocus = FALSE;
 			GameWindow *editBox = GadgetComboBoxGetEditBox(window);
 			// we need to tell the text entry box to take the focus.
 			TheWindowManager->winSendSystemMsg( editBox, GWM_INPUT_FOCUS, mData1, (WindowMsgData)&wantsFocus );
-			
+
 			*(Bool*)mData2 = TRUE;
 			break;
 
-		}  // end input focus
+		}
 
 
 		case GBM_SELECTED:
@@ -662,7 +660,7 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 						{
 							multiplier = comboData->entryCount;
 							listX = winSize.x;// + 16;
-							
+
 							if(listData->upButton)
 								listData->upButton->winHide(TRUE);
 							if(listData->downButton)
@@ -680,9 +678,9 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 								listData->downButton->winHide(FALSE);
 							if(listData->slider)
 								listData->slider->winHide(FALSE);
-							
+
 						}
-						
+
 						newSize.y = ((TheWindowManager->winFontHeight( listInstData->getFont() ) ) * multiplier) + multiplier * 2 + 4;
 						window->winSetSize(winSize.x , winSize.y + newSize.y );
 						listBox->winSetPosition(0, winSize.y);
@@ -701,29 +699,29 @@ WindowMsgHandledType GadgetComboBoxSystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetListBoxSystem
+}
 
 // GadgetComboBoxSetColors ====================================================
 /** Set the colors for a Combo box, note that this will also automatically
-	* change the colors of any attached slider, slider thumb, and slider 
+	* change the colors of any attached slider, slider thumb, and slider
 	* buttons */
 //=============================================================================
 void GadgetComboBoxSetColors( GameWindow *comboBox,
-														 Color enabledColor, 
+														 Color enabledColor,
 														 Color enabledBorderColor,
-														 Color enabledSelectedItemColor, 
+														 Color enabledSelectedItemColor,
 														 Color enabledSelectedItemBorderColor,
-														 Color disabledColor, 
+														 Color disabledColor,
 														 Color disabledBorderColor,
-														 Color disabledSelectedItemColor, 
+														 Color disabledSelectedItemColor,
 														 Color disabledSelectedItemBorderColor,
-														 Color hiliteColor, 
+														 Color hiliteColor,
 														 Color hiliteBorderColor,
-														 Color hiliteSelectedItemColor, 
+														 Color hiliteSelectedItemColor,
 														 Color hiliteSelectedItemBorderColor )
 {
 //	ComboBoxData *comboBoxData = (ComboBoxData *)comboBox->winGetUserData();
@@ -744,7 +742,7 @@ void GadgetComboBoxSetColors( GameWindow *comboBox,
 		GadgetComboBoxSetHiliteBorderColor( comboBox,hiliteBorderColor );
 		GadgetComboBoxSetHiliteSelectedItemColor( comboBox, hiliteSelectedItemColor );
 		GadgetComboBoxSetHiliteSelectedItemBorderColor( comboBox, hiliteSelectedItemBorderColor );
-	
+
 	GameWindow *editBox = GadgetComboBoxGetEditBox(comboBox);
 	if (editBox)
 	{
@@ -763,7 +761,7 @@ void GadgetComboBoxSetColors( GameWindow *comboBox,
 		GadgetButtonSetHiliteBorderColor( editBox, hiliteBorderColor );
 		GadgetButtonSetHiliteSelectedColor( editBox, hiliteSelectedItemColor );
 		GadgetButtonSetHiliteSelectedBorderColor( editBox, hiliteSelectedItemBorderColor );
-	}	
+	}
 
 	GameWindow *dropDownButton = GadgetComboBoxGetDropDownButton(comboBox);
 	if (dropDownButton)
@@ -783,33 +781,33 @@ void GadgetComboBoxSetColors( GameWindow *comboBox,
 		GadgetButtonSetHiliteBorderColor( dropDownButton, hiliteBorderColor );
 		GadgetButtonSetHiliteSelectedColor( dropDownButton, hiliteSelectedItemColor );
 		GadgetButtonSetHiliteSelectedBorderColor( dropDownButton, hiliteSelectedItemBorderColor );
-	}	
+	}
 
 	GameWindow * listBox = GadgetComboBoxGetListBox( comboBox );
 	if ( listBox )
 	{
 		GadgetListBoxSetColors(listBox,
-													enabledColor, 
+													enabledColor,
 													enabledBorderColor,
-													enabledSelectedItemColor, 
+													enabledSelectedItemColor,
 													enabledSelectedItemBorderColor,
-													disabledColor, 
+													disabledColor,
 													disabledBorderColor,
-													disabledSelectedItemColor, 
+													disabledSelectedItemColor,
 													disabledSelectedItemBorderColor,
-													hiliteColor, 
+													hiliteColor,
 													hiliteBorderColor,
-													hiliteSelectedItemColor, 
+													hiliteSelectedItemColor,
 													hiliteSelectedItemBorderColor );
 	}
-}  // end GadgetComboBoxSetColors
+}
 
 // GadgetComboBoxSetIsEditable ================================================
 /** Sets up the Text Entry gadget as editable or not */
 //=============================================================================
 void GadgetComboBoxSetIsEditable(GameWindow *comboBox, Bool isEditable  )
 {
-	ComboBoxData *comboData = (ComboBoxData *)comboBox->winGetUserData();	
+	ComboBoxData *comboData = (ComboBoxData *)comboBox->winGetUserData();
 	GameWindow *editBox = GadgetComboBoxGetEditBox(comboBox);
 	UnsignedInt status ;
 	if(!editBox)
@@ -819,7 +817,7 @@ void GadgetComboBoxSetIsEditable(GameWindow *comboBox, Bool isEditable  )
 	if (isEditable)
 	{
 		status = editBox->winGetStatus();
-		
+
 		BitClear(status, WIN_STATUS_NO_INPUT);
 //		BitClear(status, WIN_STATUS_NO_FOCUS);
 		editBox->winSetStatus(status);
@@ -827,18 +825,18 @@ void GadgetComboBoxSetIsEditable(GameWindow *comboBox, Bool isEditable  )
 	else
 	{
 		status = editBox->winGetStatus();
-		
+
 		BitSet(status, WIN_STATUS_NO_INPUT);
 //		BitSet(status, WIN_STATUS_NO_FOCUS);
 		editBox->winSetStatus(status);
 	}
-}//void GadgetComboBoxSetIsEditable(GameWindow *comboBox, Int maxChars )
+}
 
 // GadgetComboBoxSetIsAsciiOnly ==================================================
 /** Get the text the Combo Box */
 //=============================================================================
 void GadgetComboBoxSetLettersAndNumbersOnly(GameWindow *comboBox, Bool isLettersAndNumbersOnly)
-{	
+{
 	//sanity
 	if(comboBox == NULL)
 		return;
@@ -879,7 +877,7 @@ void GadgetComboBoxSetMaxChars( GameWindow *comboBox, Int maxChars )
 	comboData->maxChars = maxChars;
 	comboData->entryData->maxTextLen = maxChars;
 
-}//void GadgetComboBoxSetMaxChars( GameWindow *comboBox, Int maxChars )
+}
 
 // GadgetComboBoxSetMaxDisplay ================================================
 /** Sets the MaxDisplay variable to the new Max Display */
@@ -889,7 +887,7 @@ void GadgetComboBoxSetMaxDisplay( GameWindow *comboBox, Int maxDisplay )
 	ComboBoxData *comboData = (ComboBoxData *)comboBox->winGetUserData();
 	comboData->maxDisplay = maxDisplay;
 
-}//void GadgetComboBoxSetMaxDisplay( GameWindow *comboBox, Int maxDisplay );
+}
 
 // GadgetComboBoxGetText =======================================================
 /** Get the text the Combo Box */
@@ -904,7 +902,7 @@ UnicodeString GadgetComboBoxGetText( GameWindow *comboBox )
 	// verify that this is a combo box
 	if( BitIsSet( comboBox->winGetStyle(), GWS_COMBO_BOX ) == FALSE )
 		return UnicodeString::TheEmptyString;
-	
+
 	return GadgetTextEntryGetText( GadgetComboBoxGetEditBox(comboBox) );
 }
 
@@ -990,7 +988,7 @@ void GadgetComboBoxSetEnabledTextColors(GameWindow *comboBox, Color color, Color
 	// sanity
 	if( comboBox == NULL )
 		return;
-	
+
 	ComboBoxData *comboBoxData = (ComboBoxData *)comboBox->winGetUserData();
 	if(comboBoxData->listBox)
 		comboBoxData->listBox->winSetEnabledTextColors( color,borderColor);
@@ -1020,9 +1018,9 @@ void GadgetComboBoxSetHiliteTextColors( GameWindow *comboBox,Color color, Color
 	// sanity
 	if( comboBox == NULL )
 		return;
-	
+
 	ComboBoxData *comboBoxData = (ComboBoxData *)comboBox->winGetUserData();
-	
+
 	if(comboBoxData->listBox)
 		comboBoxData->listBox->winSetHiliteTextColors( color,borderColor);
 	if(comboBoxData->editBox)
@@ -1036,7 +1034,7 @@ void GadgetComboBoxSetIMECompositeTextColors(GameWindow *comboBox, Color color,
 	// sanity
 	if( comboBox == NULL )
 		return;
-	
+
 	ComboBoxData *comboBoxData = (ComboBoxData *)comboBox->winGetUserData();
 
 	if(comboBoxData->listBox)
@@ -1086,7 +1084,7 @@ void GadgetComboBoxSetItemData( GameWindow *comboBox, Int index, void *data )
 void *GadgetComboBoxGetItemData( GameWindow *comboBox, Int index )
 {
 	void *data = NULL;
-	
+
 	if (comboBox)
 	{
 		TheWindowManager->winSendSystemMsg( comboBox, GCM_GET_ITEM_DATA, index, (WindowMsgData)&data);
@@ -1105,5 +1103,5 @@ Int GadgetComboBoxGetLength( GameWindow *combobox )
 		return comboboxData->entryCount;
 
 	return 0;
-}  // end GadgetListBoxGetListLength
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
index 665fa2ca81b..94e9f3e5339 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
@@ -24,12 +24,12 @@
 
 // FILE: HorizontalSlider.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -67,11 +67,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // GadgetHorizontalSliderInput ================================================
 /** Handle input for horizontal slider */
@@ -83,24 +78,24 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 	WinInstanceData *instData = window->winGetInstanceData();
 	ICoord2D size, childSize, childCenter;
 	window->winGetSize( &size.x, &size.y );
-	switch( msg ) 
+	switch( msg )
 	{
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 				//TheWindowManager->winSetFocus( window );
 
-			}  // end if
-			
+			}
+
 			if(window->winGetChild() && BitIsSet(window->winGetChild()->winGetStyle(),GWS_PUSH_BUTTON) )
 			{
 				WinInstanceData *instDataChild = window->winGetChild()->winGetInstanceData();
@@ -109,21 +104,21 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 
 			break;
 
-		}  //  end mouse entering
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK )) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ))
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
-			}  // end if
+			}
 			if(window->winGetChild() && BitIsSet(window->winGetChild()->winGetStyle(),GWS_PUSH_BUTTON) )
 			{
 				WinInstanceData *instDataChild = window->winGetChild()->winGetInstanceData();
@@ -132,15 +127,15 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 
 			break;
 
-		}  // end mouse leaving
+		}
 
-		// ------------------------------------------------------------------------	
+		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
 
 			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 			break;
 
@@ -154,12 +149,12 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 			Int x, y;
 			Int mousex = mData1 & 0xFFFF;
 //			Int mousey = mData1 >> 16;
-			
+
 			GameWindow *child = window->winGetChild();
 			Int pageClickSize, clickPos;
 
 			window->winGetScreenPosition( &x, &y );
-	
+
 			child->winGetSize( &childSize.x, &childSize.y );
 			child->winGetPosition( &childCenter.x, &childCenter.y );
 			childCenter.x += childSize.x / 2;
@@ -179,7 +174,7 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 				if( clickPos > mousex - x )
 					clickPos = mousex - x;
 
-			}  // end if
+			}
 			else
 			{
 
@@ -187,7 +182,7 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 				if( clickPos < mousex - x )
 					clickPos = mousex - x;
 
-			}  // end else
+			}
 
 			// keep it all valid to the window
 			if( clickPos > x + size.x - childSize.x / 2 )
@@ -199,7 +194,7 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 			TheWindowManager->winSendSystemMsg( window, GGM_LEFT_DRAG, 0, mData1 );
 			break;
 
-		}  // end left up, left click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CHAR:
@@ -213,22 +208,22 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 					if( BitIsSet( mData2, KEY_STATE_DOWN ) )
 					{
 
-						if( s->position > s->minVal + 1 ) 
+						if( s->position > s->minVal + 1 )
 						{
 							GameWindow *child = window->winGetChild();
 
 							s->position -= 2;
 							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GSM_SLIDER_TRACK,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									s->position );
 
 							// Translate to window coords
 							child->winSetPosition( (Int)((s->position - s->minVal) * s->numTicks), HORIZONTAL_SLIDER_THUMB_POSITION );
 
-						}  // end if
+						}
 
-					}  // if key down
+					}
 
 					break;
 
@@ -238,14 +233,14 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 					if( BitIsSet( mData2, KEY_STATE_DOWN ) )
 					{
 
-						if( s->position < s->maxVal - 1 ) 
+						if( s->position < s->maxVal - 1 )
 						{
 							GameWindow *child = window->winGetChild();
 
 							s->position += 2;
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GSM_SLIDER_TRACK,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									s->position );
 
 							// Translate to window coords
@@ -253,7 +248,7 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 
 						}
 
-					}  // end if key down
+					}
 
 					break;
 
@@ -276,11 +271,11 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 				default:
 					return MSG_IGNORED;
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
-		}  // end char
+		}
 
 		// ------------------------------------------------------------------------
 		default:
@@ -290,7 +285,7 @@ WindowMsgHandledType GadgetHorizontalSliderInput( GameWindow *window, UnsignedIn
 
 	return MSG_HANDLED;
 
-}  // end GadgetHorizontalSliderInput
+}
 
 // GadgetHorizontalSliderSystem ===============================================
 /** Handle system messages for horizontal slider */
@@ -302,7 +297,7 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 	WinInstanceData *instData = window->winGetInstanceData();
 	ICoord2D size, childSize, childCenter,childRelativePos;
 	window->winGetSize( &size.x, &size.y );
-	switch( msg ) 
+	switch( msg )
 	{
 		// ------------------------------------------------------------------------
 		case GGM_LEFT_DRAG:
@@ -311,10 +306,10 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 //			Int mousey = mData2 >> 16;
 			Int x, y, delta;
 			GameWindow *child = window->winGetChild();
-			
+
 
 			window->winGetScreenPosition( &x, &y );
-			
+
 			child->winGetSize( &childSize.x, &childSize.y );
 			child->winGetScreenPosition( &childCenter.x, &childCenter.y );
 			child->winGetPosition(&childRelativePos.x, &childRelativePos.y);
@@ -328,41 +323,41 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 			if( mousex > x + size.x -HORIZONTAL_SLIDER_THUMB_WIDTH/2 )
 			{
 
-				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER, 
+				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER,
 																						s->maxVal, 0 );
 				// tell owner i moved
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GSM_SLIDER_TRACK,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						s->position );
 				break;
-			
-			}  // end if
+
+			}
 			else if( mousex < x + HORIZONTAL_SLIDER_THUMB_WIDTH/2)
 			{
 
-				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER, 
+				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER,
 																						s->minVal, 0 );
 				// tell owner i moved
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GSM_SLIDER_TRACK,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						s->position );
 				break;
 
-			}  // end else if
+			}
 
 			if( childCenter.x < x + childSize.x / 2 )
 			{
 				child->winSetPosition( 0,HORIZONTAL_SLIDER_THUMB_POSITION );
 				s->position = s->minVal;
-				
+
 			}
 			else if( childCenter.x >= x + size.x - childSize.x / 2 )
 			{
 				child->winSetPosition( (Int)((s->maxVal - s->minVal) * s->numTicks) -HORIZONTAL_SLIDER_THUMB_WIDTH/2 , HORIZONTAL_SLIDER_THUMB_POSITION );
 				s->position = s->maxVal;
-				
+
 			}
 			else
 			{
@@ -379,24 +374,24 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 					s->position = s->maxVal;
 				if( s->position < s->minVal)
 					s->position = s->minVal;
-				
+
 				child->winSetPosition( childRelativePos.x, HORIZONTAL_SLIDER_THUMB_POSITION );
 			}
-			
+
 			// tell owner i moved
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GSM_SLIDER_TRACK,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					s->position );
 
 			break;
 
-		}  // end left drag
+		}
 
 		// ------------------------------------------------------------------------
 		case GSM_SET_SLIDER:
 		{
-			Int newPos = (Int)mData1; 
+			Int newPos = (Int)mData1;
 			GameWindow *child = window->winGetChild();
 
 			if( newPos < s->minVal || newPos > s->maxVal )
@@ -410,7 +405,7 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 			child->winSetPosition( newPos , HORIZONTAL_SLIDER_THUMB_POSITION );
 			break;
 
-		}  // end set slider
+		}
 
 		// ------------------------------------------------------------------------
 		case GSM_SET_MIN_MAX:
@@ -428,7 +423,7 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 			child->winSetPosition( 0, HORIZONTAL_SLIDER_THUMB_POSITION );
 			break;
 
-		}  // end set min max
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
@@ -437,6 +432,8 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
 			delete ( (SliderData *)window->winGetUserData() );
+			window->winSetUserData(NULL);
+			s = NULL;
 			break;
 
 		// ------------------------------------------------------------------------
@@ -449,15 +446,15 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 			else
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 
 			*(Bool*)mData2 = TRUE;
 			break;
 
-		}  // end focus msg
+		}
 
 		// ------------------------------------------------------------------------
 		case GGM_RESIZED:
@@ -471,13 +468,13 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 
 			break;
 
-		}  // end resized
-		
+		}
+
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetHorizontalSliderSystem
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
index a1aeefb4d7f..783f3607233 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GadgetListBox.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -47,7 +47,7 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioEventRTS.h"
 #include "Common/Language.h"
@@ -63,11 +63,6 @@
 #include "GameClient/GameWindowGlobal.h"
 #include "GameClient/Keyboard.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // DEFINES ////////////////////////////////////////////////////////////////////
 // Sets up the user's OS set doubleclick time so if they don't like it... they can
@@ -113,7 +108,7 @@ static void doAudioFeedback(GameWindow *window)
 		if( TheAudio )
 		{
 			TheAudio->addAudioEvent( &buttonClick );
-		}  // end if
+		}
 	}
 }
 
@@ -135,14 +130,14 @@ static Int getListboxEntryBasedOnCoord(GameWindow *window, Int x, Int y, Int &ro
 	for( i=0; ; i++ )
 	{
 		if( i > 0 )
-			if( list->listData[ i - 1 ].listHeight > 
+			if( list->listData[ i - 1 ].listHeight >
 					(list->displayPos + list->displayHeight ) )
 			{
 				pos = -1;
 				break;
 			}
 
-		if( i == list->endPos )						
+		if( i == list->endPos )
 		{
 			pos = -1;
 			break;
@@ -154,7 +149,7 @@ static Int getListboxEntryBasedOnCoord(GameWindow *window, Int x, Int y, Int &ro
 
 	column = -1;
 	if( pos == -2 )
-	{ 
+	{
 		pos = i;
 		Int total = 0;
 		for( i = 0; i < list->columns ;i++)
@@ -234,7 +229,7 @@ static void removeSelection( ListboxData *list, Int i )
 // adjustDisplay ==============================================================
 /** Update Display List information inlcuding scrollbar */
 //=============================================================================
-static void adjustDisplay( GameWindow *window, Int adjustment, 
+static void adjustDisplay( GameWindow *window, Int adjustment,
 													 Bool updateSlider )
 {
 	Int entry;
@@ -266,24 +261,24 @@ static void adjustDisplay( GameWindow *window, Int adjustment,
 		list->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 		// Take into account that there is a line-drawn outline surrounding listbox
 		sData->maxVal = list->totalHeight - ( list->displayHeight - TOTAL_OUTLINE_HEIGHT ) + 1;
-		
+
 		if( sData->maxVal < 0 )
 		{
 			sData->maxVal = 0;
 		}
-		
+
 		child = list->slider->winGetChild();
 		child->winGetSize( &sliderChildSize.x, &sliderChildSize.y );
 		sData->numTicks = (float)((sliderSize.y - sliderChildSize.y) / (float)sData->maxVal);
 
 		if( updateSlider )
-			TheWindowManager->winSendSystemMsg( list->slider, 
-																					GSM_SET_SLIDER, 
-																					(sData->maxVal - list->displayPos), 
+			TheWindowManager->winSendSystemMsg( list->slider,
+																					GSM_SET_SLIDER,
+																					(sData->maxVal - list->displayPos),
 																					0 );
 	}
 
-}  // end adjustDisplay
+}
 
 // computeTotalHeight =========================================================
 /** Compute Total Height and fill in listHeight values */
@@ -297,11 +292,11 @@ static void computeTotalHeight( GameWindow *window )
 
 	for( i=0; i<list->endPos; i++ )
 	{
-		
+
 		if(!list->listData[i].cell)
 			continue;
 		tempHeight = 0;
-		
+
 		for (Int j = 0; j < list->columns; j++)
 		{
 			Int cellHeight = 0;
@@ -315,9 +310,9 @@ static void computeTotalHeight( GameWindow *window )
 				{
 					DisplayString *displayString = (DisplayString *)list->listData[i].cell[j].data;
 					if(displayString)
-						displayString->getSize( NULL, &cellHeight );		
-				}//else
-			}//if
+						displayString->getSize( NULL, &cellHeight );
+				}
+			}
 			else if(list->listData[i].cell[j].cellType == LISTBOX_IMAGE)
 			{
 				if(list->listData[i].cell[j].height > 0)
@@ -327,7 +322,7 @@ static void computeTotalHeight( GameWindow *window )
 			}
 			if(cellHeight > tempHeight)
 				tempHeight = cellHeight;
-		}//for
+		}
 		list->listData[i].height = tempHeight;
 		height += (list->listData[i].height + 1);
 		list->listData[i].listHeight = height;
@@ -352,7 +347,7 @@ static Int addImageEntry( const Image *image, Color color, Int row, Int column,
 		DEBUG_ASSERTCRASH(false, ("Tried to add Image to Listbox at invalid position"));
 		return -1;
 	}
-	
+
 	// If we want to just add an entry to the bottom, set the defaults
 	if (row == -1)
 	{
@@ -383,12 +378,12 @@ static Int addImageEntry( const Image *image, Color color, Int row, Int column,
 	listRow->cell[column].color = color;
 	listRow->cell[column].height = height;
 	listRow->cell[column].width = width;
-	
+
 	computeTotalHeight( window );
 
-	return (row);	
+	return (row);
 
-}// static Int addImageEntry( Image image, Int column, GameWindow *window)
+}
 
 // startingRow will get moved to startingRow+1, etc.  This assumes there is space!!!!!
 static Int moveRowsDown(ListboxData *list, Int startingRow)
@@ -448,14 +443,14 @@ static Int addEntry( UnicodeString *string, Int color, Int row, Int column, Game
 	ListboxData *list = (ListboxData *)window->winGetUserData();
 	Int width;
 	DisplayString *displayString;
-	
+
 	// make sure our params are good
 	if( column >= list->columns  || row >= list->listLength )
 	{
 		DEBUG_ASSERTCRASH(false, ("Tried to add text to Listbox at invalid position"));
 		return -1;
 	}
-	
+
 	// If we want to just add an entry to the bottom, set the defaults
 	if (row == -1)
 	{
@@ -487,7 +482,7 @@ static Int addEntry( UnicodeString *string, Int color, Int row, Int column, Game
 		memset(listRow->cell,0,list->columns * sizeof(ListEntryCell));
 		rowsAdded = 1;
 	}
-	
+
 	//add Image to selected row/cell
 	listRow->cell[column].cellType = LISTBOX_TEXT;
 
@@ -534,7 +529,7 @@ static Int addEntry( UnicodeString *string, Int color, Int row, Int column, Game
 	}
 
 	return (row);
-}  // end addEntry
+}
 
 // PUBLIC DATA ////////////////////////////////////////////////////////////////
 
@@ -564,7 +559,7 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 
 			switch (mData1)
 			{
-				
+
 				// --------------------------------------------------------------------
 				case KEY_ENTER:
 				case KEY_SPACE:
@@ -574,15 +569,15 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 					{
 						doAudioFeedback(window);
 
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GLM_DOUBLE_CLICKED,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								list->selectPos );
-					}  // end if
+					}
 
 					break;
 
-				}  // end enter or space
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_DOWN:
@@ -625,15 +620,15 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 
 						}
 
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GLM_SELECTED,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								list->selectPos );
-					}  // end if
+					}
 
 					break;
 
-				}  // end key down
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_UP:
@@ -641,7 +636,7 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 
 					if( BitIsSet( mData2, KEY_STATE_DOWN ) )
 					{
-	
+
 						if( list->selectPos == -1 )
 						{
 							list->selectPos = 0;
@@ -672,15 +667,15 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 							}
 						}
 
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GLM_SELECTED,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								list->selectPos );
 					}
 
 					break;
 
-				}  // end key up
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_RIGHT:
@@ -713,7 +708,7 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 								// if we've reached the end of the list, start at the beginning
 								if( position >= list->endPos)
 									position = 0;
-								
+
 								ListEntryCell *cell = NULL;
 								// go through the columns until we find a column with text
 								Int j = 0;
@@ -731,8 +726,8 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 								if(!dString)
 									continue;
 								for(j = 0; j < TheKeyboard->MAX_KEY_STATES; ++j)
-								{								
-									if(dString->getText().getCharAt(0) == TheKeyboard->getPrintableKey(mData1, j))
+								{
+									if(dString->getText().getCharAt(0) == TheKeyboard->getPrintableKey((KeyDefType)mData1, j))
 									{
 										list->selectPos = position;
 										Int prevPos = getListboxTopEntry(list);
@@ -749,19 +744,19 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 								}
 
 							}
-							
-							
+
+
 						}
 
 						if (!foundIt)
 							return MSG_IGNORED;
 					}
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
-		}  // end case char
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_WHEEL_DOWN:
@@ -774,7 +769,7 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end wheel down
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_WHEEL_UP:
@@ -785,7 +780,7 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 			adjustDisplay( window, -1, TRUE );
 			break;
 
-		}  // end wheel up
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_UP:
@@ -808,14 +803,14 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 			{
 
 				if( i > 0 )
-					if( list->listData[ i - 1 ].listHeight > 
+					if( list->listData[ i - 1 ].listHeight >
 							(list->displayPos + list->displayHeight) )
 					{
 						list->selectPos = -1;
 						break;
 					}
 
-				if( i == list->endPos )						
+				if( i == list->endPos )
 				{
 					list->selectPos = -1;
 					break;
@@ -824,9 +819,9 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 				if( list->listData[i].listHeight > (mousey - y + list->displayPos) )
 					break;
 			}
-			
+
 			//Bool dblClicked = FALSE;
-			if( list->doubleClickTime + doubleClickTime > timeGetTime() && 
+			if( list->doubleClickTime + doubleClickTime > timeGetTime() &&
 					(i == oldPos || (oldPos == -1 && ( i>=0 && i<list->endPos ) )) )
 			{
 				int temp;
@@ -835,9 +830,9 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 					temp = i;
 				else
 					temp = oldPos;
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_DOUBLE_CLICKED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					temp );
 				//break;
 			}
@@ -856,14 +851,14 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 				list->selectPos = oldPos;
 			}
 			list->doubleClickTime = timeGetTime();
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_SELECTED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					list->selectPos );
-			
+
 			break;
 
-		}  // end left click, left up
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_RIGHT_DOWN:
@@ -889,14 +884,14 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 			for( i=0; ; i++ )
 			{
 				if( i > 0 )
-					if( list->listData[ i - 1 ].listHeight > 
+					if( list->listData[ i - 1 ].listHeight >
 							(list->displayPos + list->displayHeight ) )
 					{
 						pos = -1;
 						break;
 					}
 
-				if( i == list->endPos )						
+				if( i == list->endPos )
 				{
 					pos = -1;
 					break;
@@ -908,63 +903,63 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 
 			if( pos == -2 )
 				pos = i;
-					
+
 			rc.pos = pos;
 			rc.mouseX = mousex;
 			rc.mouseY = mousey;
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_RIGHT_CLICKED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					(WindowMsgData)&rc );
 			break;
 
-		}  // end right up, right click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 				//TheWindowManager->winSetFocus( window );
 
-			}  // end if
+			}
 
 			break;
 
-		}  //  end mouse entering
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK )) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ))
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
-			}  // end if
+			}
 
 			break;
 
-		}  // end mouse leaving
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
 
 			if (BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 			break;
 
@@ -978,11 +973,11 @@ WindowMsgHandledType GadgetListBoxInput( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch msg
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetListBoxInput
+}
 
 // GadgetListBoxMultiInput ====================================================
 /** Handle input for multiple selection list box */
@@ -993,7 +988,7 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 	ListboxData *list = (ListboxData *)window->winGetUserData();
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 		// ------------------------------------------------------------------------
 		case GWM_CHAR:
@@ -1014,7 +1009,7 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 			}
 			break;
 
-		}  // end char
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_UP:
@@ -1038,14 +1033,14 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 			{
 
 				if( i > 0 )
-					if( list->listData[ i - 1 ].listHeight > 
+					if( list->listData[ i - 1 ].listHeight >
 							(list->displayPos + list->displayHeight ) )
 					{
 						selectPos = -1;
 						break;
 					}
 
-				if( i == list->endPos )						
+				if( i == list->endPos )
 				{
 					selectPos = -1;
 					break;
@@ -1067,7 +1062,7 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 					removed = TRUE;
 					break;
 				}
-				
+
 				i++;
 			}
 
@@ -1076,14 +1071,14 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 				list->selections[ i] = selectPos;
 				list->selections[ i + 1 ] = -1;
 			}
-		
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_SELECTED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					selectPos );
 			break;
 
-		}  // end left up, left click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_RIGHT_UP:
@@ -1103,14 +1098,14 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 			for( i = 0; ; i++ )
 			{
 				if( i > 0 )
-					if( list->listData[ i - 1 ].listHeight > 
+					if( list->listData[ i - 1 ].listHeight >
 							(list->displayPos + list->displayHeight ) )
 					{
 						selectPos = -1;
 						break;
 					}
 
-				if( i == list->endPos )						
+				if( i == list->endPos )
 				{
 					selectPos = -1;
 					break;
@@ -1123,9 +1118,9 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 			if( selectPos == -2 )
 				selectPos = i;
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_RIGHT_CLICKED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					selectPos );*/
 			TheWindowManager->winSetFocus( window );
 			Int pos;
@@ -1145,14 +1140,14 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 			for( i=0; ; i++ )
 			{
 				if( i > 0 )
-					if( list->listData[ i - 1 ].listHeight > 
+					if( list->listData[ i - 1 ].listHeight >
 							(list->displayPos + list->displayHeight ) )
 					{
 						pos = -1;
 						break;
 					}
 
-				if( i == list->endPos )						
+				if( i == list->endPos )
 				{
 					pos = -1;
 					break;
@@ -1164,17 +1159,17 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 
 			if( pos == -2 )
 				pos = i;
-					
+
 			rc.pos = pos;
 			rc.mouseX = mousex;
 			rc.mouseY = mousey;
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_RIGHT_CLICKED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					(WindowMsgData)&rc );
 			break;
 
-		}  // end right up, right click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_WHEEL_DOWN:
@@ -1202,47 +1197,47 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 				//TheWindowManager->winSetFocus( window );
 
-			}  // end if
+			}
 
 			break;
 
-		}  //  end mouse entering
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK )) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ))
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
-			}  // end if
+			}
 
 			break;
 
-		}  // end mouse leaving
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
 
 			if (BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 			break;
 
@@ -1256,11 +1251,11 @@ WindowMsgHandledType GadgetListBoxMultiInput( GameWindow *window, UnsignedInt ms
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetListBoxMultiInput
+}
 
 // GadgetListBoxSystem ========================================================
 /** Handle system messages for list box */
@@ -1271,7 +1266,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 	ListboxData *list = (ListboxData *)window->winGetUserData();
 	WinInstanceData *instData = window->winGetInstanceData();
 	ICoord2D *pos;
-		
+
 	switch( msg )
 	{
 		// ------------------------------------------------------------------------
@@ -1280,7 +1275,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			instData->setText(*(UnicodeString*)mData1);
 			break;
 
-		}  // end set lavel
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_GET_TEXT:
@@ -1288,20 +1283,20 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			pos = (ICoord2D *)mData1;
 			TextAndColor *tAndC = (TextAndColor *)mData2;
 
-			if(pos->x >= list->columns || pos->y >= list->listLength || 
+			if(pos->x >= list->columns || pos->y >= list->listLength ||
 					list->listData[pos->y].cell[pos->x].cellType != LISTBOX_TEXT)
 			{
 				tAndC->string = UnicodeString::TheEmptyString;
-				tAndC->color = 0;				
+				tAndC->color = 0;
 			}
 			else
 			{
 				tAndC->string = ((DisplayString *)list->listData[ pos->y ].cell[pos->x].data)->getText();
-				tAndC->color = list->listData[ pos->y ].cell[pos->x].color;				
+				tAndC->color = list->listData[ pos->y ].cell[pos->x].color;
 			}
 		break;
 		}
-		
+
 		// ------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
@@ -1320,7 +1315,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end selected
+		}
 
 		// ------------------------------------------------------------------------
 		case GGM_LEFT_DRAG:
@@ -1339,7 +1334,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end left drag
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_DEL_ALL:
@@ -1352,20 +1347,20 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			// Loop through and destroy any display strings we've allocated that aren't used
 			for( Int i = 0; i < list->listLength; i++ )
 			{
-				// Loop though 
+				// Loop though
 				ListEntryCell *cells = list->listData[i].cell;
 				for (int j = list->columns - 1; j >=0; j-- )
-				{			
+				{
 					if(!cells)
 						break;
 					if( cells[j].cellType == LISTBOX_TEXT )
 					{
 						if ( cells[j].data )
 						{
-							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );	
+							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
 						}
 					}
-					
+
 					cells[j].userData = NULL;
 					cells[j].data = NULL;
 				}
@@ -1379,7 +1374,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			{
 				list->displayPos = 0;
 			}
-			
+
 			if( list->multiSelect )
 				memset( list->selections, -1, list->listLength * sizeof( Int ) );
 			else
@@ -1393,7 +1388,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			adjustDisplay( window, 0, TRUE );
 			break;
 
-		}  // end delete all
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_DEL_ENTRY:
@@ -1408,11 +1403,11 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 				for( i = 0; i <= list->columns; i ++ )
 				{
 					if( cells[i].cellType == LISTBOX_TEXT && cells[i].data )
-						TheDisplayStringManager->freeDisplayString((DisplayString *) cells[i].data );	
-					cells[i].data = NULL;		
+						TheDisplayStringManager->freeDisplayString((DisplayString *) cells[i].data );
+					cells[i].data = NULL;
 					cells[i].userData = NULL;
 				}
-			
+
 			delete[](list->listData[mData1].cell);
 			list->listData[mData1].cell = NULL;
 
@@ -1450,20 +1445,20 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			computeTotalHeight( window );
 			break;
 
-		}  // end delete entry
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_ADD_ENTRY:
 		{
 			Bool success = TRUE;
-			Int addedIndex = -1;			
+			Int addedIndex = -1;
 			AddMessageStruct *addInfo = (AddMessageStruct*)mData1;
 			if (addInfo->row >= list->insertPos)
 				addInfo->row = -1;
 
 			Int row = addInfo->row;
-			// Special case, we're just appending and we've reached the end. 
-			if( addInfo->row == -1 && list->insertPos == list->listLength ) 
+			// Special case, we're just appending and we've reached the end.
+			if( addInfo->row == -1 && list->insertPos == list->listLength )
 			{
 				row = list->insertPos;
 				// Check to see if we've filled our buffer and need to scroll the window
@@ -1498,7 +1493,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 					success = FALSE;
 			}
 
-			if( success ) 
+			if( success )
 			{
 
 				if( list->autoScroll )
@@ -1510,15 +1505,15 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 						// we use -1 because insertPos was increased in addEntry
 						if( row == -1 )
 						{
-							if( list->listData[(list->insertPos - 1)].listHeight >= 
+							if( list->listData[(list->insertPos - 1)].listHeight >=
 									(list->displayPos + list->displayHeight) )
 								adjustDisplay( window, 1, TRUE );
 							else
 								break;
 						}
-						else 
+						else
 						{
-							if( list->listData[( row )].listHeight >= 
+							if( list->listData[( row )].listHeight >=
 									(list->displayPos + list->displayHeight) )
 								adjustDisplay( window, 1, TRUE );
 							else
@@ -1540,20 +1535,20 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 						i++;
 
-					}  // end while
+					}
 
-				}  // end if
+				}
 				else
 				{
 					if( row == list->selectPos )
 						list->selectPos = -1;
 				}
 
-			}  // end success
+			}
 
 			return((WindowMsgHandledType) addedIndex );
-			
-		}  // end add entry
+
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_TOGGLE_MULTI_SELECTION:
@@ -1589,7 +1584,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 						removed = TRUE;
 						break;
 					}
-					
+
 					i++;
 				}
 
@@ -1603,10 +1598,10 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			{
 				// this message has no effect in a non-multi listbox
 			}
-			
+
 			break;
 
-		}  // end toggle multi-select
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_SET_SELECTION:
@@ -1623,9 +1618,9 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 				else
 					list->selectPos = -1;
 
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GLM_SELECTED,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						list->selectPos );
 
 				break;
@@ -1666,41 +1661,41 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 				GameWindow *parent = window->winGetParent();
 				if( parent && BitIsSet( parent->winGetStyle(), GWS_COMBO_BOX ) )
 				{
-					TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+					TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GLM_SELECTED,
-																						(WindowMsgData)window, 
-																						list->selectPos );				
+																						(WindowMsgData)window,
+																						list->selectPos );
 					break;
 				}
 				if( list->listData[list->selectPos].listHeight < list->displayPos )
 				{
-				
-					TheWindowManager->winSendSystemMsg( window, GLM_UPDATE_DISPLAY, 
+
+					TheWindowManager->winSendSystemMsg( window, GLM_UPDATE_DISPLAY,
 																							list->selectPos, 0 );
 				}
-				else if( list->listData[list->selectPos].listHeight > 
+				else if( list->listData[list->selectPos].listHeight >
 								 (list->displayPos + list->displayHeight) )
 				{
 
 					if( list->selectPos > 0 )
-						list->displayPos = 
+						list->displayPos =
 							list->listData[list->selectPos].listHeight - list->displayHeight;
 					else
 						list->displayPos = 0;
 
 					adjustDisplay( window, 0, TRUE );
 
-				}  // end else if
+				}
 
-			}  // end else
+			}
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GLM_SELECTED,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					list->selectPos );
 			break;
 
-		}  // end set selection
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_SCROLL_BUFFER:
@@ -1711,9 +1706,9 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			//
 			// scroll buffer literally scrolls the entire list data buffer
-			// up one entry, effectively removing the top entry.  
+			// up one entry, effectively removing the top entry.
 			//
-			
+
 			//
 			// Loop through and remove all the entries from the top up until we reach
 			// the position mData1 contains
@@ -1723,27 +1718,27 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			for (; i < (Int)mData1; i++)
 			{
 				cells = list->listData[i].cell;
-				
+
 				if(cells)
 					for( Int j = 0; j < list->columns; j++ )
 					{
 						if( cells[j].cellType == LISTBOX_TEXT && cells[j].data )
-							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );	
-//						if (cells[i].userData)
-//							free(cells[i].userData);
-						cells[j].data = NULL;		
+							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
+
+//						free(cells[i].userData);
+						cells[j].data = NULL;
 						cells[j].userData = NULL;
 						cells[j].color = 0;
 						cells[j].cellType = 0;
 					}
-				
+
 				delete[](list->listData[i].cell);
 				list->listData[i].cell = NULL;
 			}
 
-			
+
 			//
-			// copy the cells up 
+			// copy the cells up
 			//
 			memcpy(list->listData, &list->listData[mData1],
 						(list->endPos - mData1) * sizeof(ListEntryRow) );
@@ -1790,12 +1785,12 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end scroll buffer
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_GET_SELECTION:
 		{
-			
+
 			if( list->multiSelect )
 				*(Int*)mData2 = (Int)list->selections;
 			else
@@ -1803,7 +1798,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end get selection
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_SET_UP_BUTTON:
@@ -1857,7 +1852,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			if( list->downButton )
 			{
-	
+
 				list->downButton->winSetPosition( width - downSize.x - 2,
 																					height - downSize.y - 2 );
 
@@ -1865,10 +1860,10 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 
 			if( list->slider )
 			{
-				list->slider->winSetSize( sliderSize.x, 
+				list->slider->winSetSize( sliderSize.x,
 																	height - (2 * upSize.y) -6 );
 				list->slider->winSetPosition( width - sliderSize.x -2, upSize.y + 3 );
-				
+
 			}
 
 			list->displayHeight = height;
@@ -1891,8 +1886,8 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 					list->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 					list->columnWidth[0] -= sliderSize.x;
 
-				}  // end if
-			}// if
+				}
+			}
 			else
 			{
 				if( !list->columnWidthPercentage )
@@ -1908,17 +1903,17 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 					list->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 					totalWidth -= sliderSize.x;
 
-				}  // end if
+				}
 				for(Int i = 0; i < list->columns; i++ )
 				{
 					list->columnWidth[i] = list->columnWidthPercentage[i] * totalWidth / 100;
-				}// for
-			}// else
+				}
+			}
 				//reset the total height
 				computeTotalHeight(window);
 			break;
 
-		}  // end resized
+		}
 
 		// ------------------------------------------------------------------------
 		case GLM_UPDATE_DISPLAY:
@@ -1938,20 +1933,20 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 			adjustDisplay( window, 0, TRUE );
 			break;
 
-		}  // end update display
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
 			Int i;
 
-			// Loop through and destroy any display strings we've allocated 
+			// Loop through and destroy any display strings we've allocated
 			for( i = 0; i < list->listLength; i++ )
 			{
 				//We're now onto a row of cells we are not using anymore Pull off the cells and loop through them
 				ListEntryCell *cells = list->listData[i].cell;
 				for (int j = list->columns - 1; j >=0; j-- )
-				{			
+				{
 					if(!cells)
 						break;
 					if( cells[j].cellType == LISTBOX_TEXT )
@@ -1959,12 +1954,11 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 						// If we can delete the stuff that won't be showing up in the new listData struture
 						if ( cells[j].data )
 						{
-							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );	
+							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
 						}
 					}
-//					if ( cells[j].userData ) 
-//						free(cells[j].userData);
-					
+//					free(cells[j].userData);
+
 					// Null out the data pointers so they're not destroyed when we free up this listdata
 					cells[j].userData = NULL;
 					cells[j].data = NULL;
@@ -1972,18 +1966,20 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 				delete[](list->listData[i].cell);
 				list->listData[i].cell = NULL;
 			}
-	
+
 			delete[]( list->listData );
-			if( list->columnWidth	)
-				delete[]( list->columnWidth );
-			if( list->columnWidthPercentage	)
-				delete[]( list->columnWidthPercentage );
+			delete[]( list->columnWidth );
+			delete[]( list->columnWidthPercentage );
 			if( list->multiSelect )
 				delete[]( list->selections );
-			delete( list );
+
+			delete (ListboxData *)window->winGetUserData();
+			window->winSetUserData( NULL );
+			list = NULL;
+
 			break;
 
-		}  // end destroy
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -1999,82 +1995,82 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 			}
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 
 			*(Bool*)mData2 = TRUE;
 			break;
 
-		}  // end input focus
+		}
 		// ------------------------------------------------------------------------
 		case GSM_SLIDER_TRACK:
 		{
 			SliderData *sData = (SliderData *)list->slider->winGetUserData();
-			list->displayPos = sData->maxVal - mData2; 
+			list->displayPos = sData->maxVal - mData2;
 
 			if( list->displayPos > (list->totalHeight - list->displayHeight + 1) )
 				list->displayPos = (list->totalHeight - list->displayHeight + 1);
-			
+
 			if( list->displayPos < 0)
 				list->displayPos = 0;
 
 			adjustDisplay( window, 0, FALSE );
 			break;
 
-		}  // end slider track
+		}
 		// ------------------------------------------------------------------------
 		case GLM_SET_ITEM_DATA:
 		{
 			void *data = (void *)mData2;
 			pos = (ICoord2D *)mData1;
-			
+
 			if (pos->y >= 0 && pos->y < list->endPos && list->listData[pos->y].cell)
 				list->listData[pos->y].cell[pos->x].userData = data;
 
 			break;
-		}//case GLM_SET_ITEM_DATA:
+		}
 		// ------------------------------------------------------------------------
 		case GLM_GET_ITEM_DATA:
 		{
 			pos = (ICoord2D *)mData1;
 			void **data = (void **)mData2;
 
-			*data = NULL;  // initialize to NULL			
+			*data = NULL;  // initialize to NULL
 			if (pos->y >= 0 && pos->y < list->endPos && list->listData[pos->y].cell)
 				*data = list->listData[pos->y].cell[pos->x].userData;
 
 			break;
-		}//case GLM_GET_ITEM_DATA:
+		}
 
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetListBoxSystem
+}
 
 // GadgetListBoxSetColors =====================================================
 /** Set the colors for a list box, note that this will also automatically
-	* change the colors of any attached slider, slider thumb, and slider 
+	* change the colors of any attached slider, slider thumb, and slider
 	* buttons */
 //=============================================================================
 void GadgetListBoxSetColors( GameWindow *listbox,
-														 Color enabledColor, 
+														 Color enabledColor,
 														 Color enabledBorderColor,
-														 Color enabledSelectedItemColor, 
+														 Color enabledSelectedItemColor,
 														 Color enabledSelectedItemBorderColor,
-														 Color disabledColor, 
+														 Color disabledColor,
 														 Color disabledBorderColor,
-														 Color disabledSelectedItemColor, 
+														 Color disabledSelectedItemColor,
 														 Color disabledSelectedItemBorderColor,
-														 Color hiliteColor, 
+														 Color hiliteColor,
 														 Color hiliteBorderColor,
-														 Color hiliteSelectedItemColor, 
+														 Color hiliteSelectedItemColor,
 														 Color hiliteSelectedItemBorderColor )
 {
 	ListboxData *listboxData = (ListboxData *)listbox->winGetUserData();
@@ -2117,7 +2113,7 @@ void GadgetListBoxSetColors( GameWindow *listbox,
 		// Hilite
 		GadgetSliderSetHiliteColor( slider, GadgetListBoxGetHiliteColor( listbox ) );
 		GadgetSliderSetHiliteBorderColor( slider, GadgetListBoxGetHiliteBorderColor( listbox ) );
-	
+
 		// up button ------------------------------------------------------------
 
 		// enabled
@@ -2158,9 +2154,9 @@ void GadgetListBoxSetColors( GameWindow *listbox,
 		GadgetButtonSetHiliteSelectedColor( downButton, GadgetSliderGetHiliteSelectedThumbColor( slider ) );
 		GadgetButtonSetHiliteSelectedBorderColor( downButton, GadgetSliderGetHiliteSelectedThumbBorderColor( slider ) );
 
-	}  // end if
+	}
 
-}  // end GadgetListBoxSetColors
+}
 
 // GadgetListBoxGetText =======================================================
 /** Get the text for a list box entry */
@@ -2169,7 +2165,7 @@ UnicodeString GadgetListBoxGetText( GameWindow *listbox, Int row, Int column)
 {
 	Color color;
 	return GadgetListBoxGetTextAndColor( listbox,&color,row,column );
-}  // end GadgetListBoxGetText
+}
 
 // GadgetListBoxGetText =======================================================
 /** Get the text for a list box entry */
@@ -2190,14 +2186,14 @@ UnicodeString GadgetListBoxGetTextAndColor( GameWindow *listbox, Color *color, I
 	pos.x = column;
 	pos.y = row;
 	TheWindowManager->winSendSystemMsg( listbox, GLM_GET_TEXT, (WindowMsgData)&pos, (WindowMsgData)&tAndC );
-	
+
 
 		*color = tAndC.color;
 		return tAndC.string;
-	
+
 	//return UnicodeString::TheEmptyString;
 
-}  // end GadgetListBoxGetText
+}
 
 // GadgetListBoxAddEntryText ==================================================
 /** Add a new string entry into the listbox at the insert position */
@@ -2209,7 +2205,7 @@ Int GadgetListBoxAddEntryText( GameWindow *listbox,
 	if (!listbox)
 		return -1;
 	if (text.isEmpty())
-		text = UnicodeString(L" ");
+		text = L" ";
 	Int index;
 	AddMessageStruct addInfo;
 	addInfo.row = row;
@@ -2230,7 +2226,7 @@ Int GadgetListBoxAddEntryText( GameWindow *listbox,
 	/// @TODO: Don't do this type cast!
 	index = (Int) TheWindowManager->winSendSystemMsg( listbox, GLM_ADD_ENTRY, (WindowMsgData)&addInfo, color );
 
-	//DEBUG_ASSERTLOG(!listData->scrollIfAtEnd, ("Adding line %d (orig end was %d, newEntryOffset is %d, (%d-%d)?=%d, isFull=%d/%d ll=%d, end=%d\n",
+	//DEBUG_ASSERTLOG(!listData->scrollIfAtEnd, ("Adding line %d (orig end was %d, newEntryOffset is %d, (%d-%d)?=%d, isFull=%d/%d ll=%d, end=%d",
 		//index, oldBottomIndex, newEntryOffset, index, oldBottomIndex, newEntryOffset, wasFull, GadgetListBoxIsFull(listbox), listData->listLength, listData->endPos));
 	if(listData->scrollIfAtEnd && index - oldBottomIndex == newEntryOffset && GadgetListBoxIsFull(listbox))
 	{
@@ -2238,7 +2234,7 @@ Int GadgetListBoxAddEntryText( GameWindow *listbox,
 	}
 
 	return (index);
-}  // end GadgetListBoxAddEntry
+}
 
 // GadgetListBoxAddEntryImage =================================================
 /** Add a new string entry into the listbox at the insert position */
@@ -2260,7 +2256,7 @@ Int GadgetListBoxAddEntryImage( GameWindow *listbox, const Image *image,
 	/// @TODO: Don't do this type cast!
 	index = (Int) TheWindowManager->winSendSystemMsg( listbox, GLM_ADD_ENTRY, (WindowMsgData)&addInfo, color );
 	return (index);
-}  // end GadgetListBoxAddEntryImage
+}
 
 Int GadgetListBoxAddEntryImage( GameWindow *listbox, const Image *image,
 															 Int row, Int column,
@@ -2287,7 +2283,7 @@ void GadgetListBoxSetFont( GameWindow *g, GameFont *font )
 	if( dString )
 		dString->setFont( font );
 
-	// listbox specific	
+	// listbox specific
 	if( listData )
 		for( Int i = 0; i < listData->listLength; i++ )
 		{
@@ -2300,9 +2296,9 @@ void GadgetListBoxSetFont( GameWindow *g, GameFont *font )
 						dString->setFont( font );
 					}
 				}
-		}  // end for i
+		}
 
-}  // end GadgetListBoxSetFont
+}
 
 // GadgetListboxCreateScrollbar ===============================================
 /** Create the scroll bar using a slider and two buttons for a listbox */
@@ -2354,7 +2350,7 @@ void GadgetListboxCreateScrollbar( GameWindow *listbox )
 	if( BitIsSet( listbox->winGetStyle(), GWS_MOUSE_TRACK ) )
 		BitSet( winInstData.m_style, GWS_MOUSE_TRACK );
 
-	listData->upButton = 
+	listData->upButton =
 		 TheWindowManager->gogoGadgetPushButton( listbox,
 																						 status | WIN_STATUS_ACTIVE | WIN_STATUS_ENABLED,
 																						 width - buttonWidth -2, top+2,
@@ -2373,7 +2369,7 @@ void GadgetListboxCreateScrollbar( GameWindow *listbox )
 	if( BitIsSet( listbox->winGetStyle(), GWS_MOUSE_TRACK ) )
 		BitSet( winInstData.m_style, GWS_MOUSE_TRACK );
 
-	listData->downButton = 
+	listData->downButton =
 			 TheWindowManager->gogoGadgetPushButton( listbox,
 																							 status | WIN_STATUS_ACTIVE | WIN_STATUS_ENABLED,
 																							 width - buttonWidth -2,
@@ -2402,7 +2398,7 @@ void GadgetListboxCreateScrollbar( GameWindow *listbox )
 	memset( &sData, 0, sizeof(SliderData) );
 
 	// Create Slider
-	listData->slider = 
+	listData->slider =
 			TheWindowManager->gogoGadgetSlider( listbox,
 																					status | WIN_STATUS_ACTIVE | WIN_STATUS_ENABLED,
 																					width - sliderButtonWidth - 2,
@@ -2413,7 +2409,7 @@ void GadgetListboxCreateScrollbar( GameWindow *listbox )
 	// we now have all the scrollbar parts, this better be set :)
 	listData->scrollBar = TRUE;
 
-}  // end GadgetListBoxCreateScrollbar
+}
 
 // GadgetListBoxAddMultiSelect ================================================
 /** Enable multi selections for a listbox
@@ -2421,7 +2417,7 @@ void GadgetListboxCreateScrollbar( GameWindow *listbox )
 	* ASSUMPTION: The listLength must already be set at this time so
 	* that we can make enough space to hold all the selection data, if you
 	* change the list length you must also change the selection array
-	* for multi select listboxes 
+	* for multi select listboxes
 	*/
 //=============================================================================
 void GadgetListBoxAddMultiSelect( GameWindow *listbox )
@@ -2430,8 +2426,8 @@ void GadgetListBoxAddMultiSelect( GameWindow *listbox )
 
 	DEBUG_ASSERTCRASH(listboxData && listboxData->selections == NULL, ("selections is not NULL"));
 	listboxData->selections = NEW Int [listboxData->listLength];
-	DEBUG_LOG(( "Enable list box multi select: listLength (select) = %d * %d = %d bytes;\n",
-					 listboxData->listLength, sizeof(Int), 
+	DEBUG_LOG(( "Enable list box multi select: listLength (select) = %d * %d = %d bytes;",
+					 listboxData->listLength, sizeof(Int),
 					 listboxData->listLength *sizeof(Int) ));
 
 	if( listboxData->selections == NULL )
@@ -2441,7 +2437,7 @@ void GadgetListBoxAddMultiSelect( GameWindow *listbox )
 		listboxData->listData = NULL;
 		return;
 
-	}  // end if
+	}
 
 	memset( listboxData->selections, -1,
 		      listboxData->listLength * sizeof(Int) );
@@ -2452,7 +2448,7 @@ void GadgetListBoxAddMultiSelect( GameWindow *listbox )
 	// adjust the input procedure for the listbox
 	listbox->winSetInputFunc( GadgetListBoxMultiInput );
 
-}  // end GadgetListBoxEnableMultiSelect
+}
 
 // GadgetListBoxRemoveMultiSelect =============================================
 /** Remove multi select capability from a listbox */
@@ -2461,25 +2457,20 @@ void GadgetListBoxRemoveMultiSelect( GameWindow *listbox )
 {
 	ListboxData *listData = (ListboxData *)listbox->winGetUserData();
 
-	if( listData->selections )
-	{
-
-		delete[]( listData->selections );
-		listData->selections = NULL;
-
-	}  // end if
+	delete[]( listData->selections );
+	listData->selections = NULL;
 
 	listData->multiSelect = FALSE;
 
 	// adjust the input procedure for the listbox
 	listbox->winSetInputFunc( GadgetListBoxInput );
 
-}  // end GadgetListBoxRemoveMultiSelect
+}
 
 // GadgetListBoxSetListLength =================================================
 /** Set OR reset the list length data contained in the listboxData
 	* parameter.  When adjusting the size of lists we also have to
-	* adjust multiselection lists if present and any display 
+	* adjust multiselection lists if present and any display
 	* strings present */
 //=============================================================================
 void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
@@ -2495,16 +2486,16 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 	DEBUG_ASSERTCRASH(listboxData->columns > 0,("We need at least one Column in the listbox"));
 	if( listboxData->columns < 1 )
 		return;
-	
+
   Int columns = listboxData->columns;
-	ListEntryRow *newData = NEW ListEntryRow[ newLength ];	
+	ListEntryRow *newData = NEW ListEntryRow[ newLength ];
 	DEBUG_ASSERTCRASH(newData, ("Unable to allocate new data structures for the Listbox"));
 	if( !newData )
 		return;
 	Int i;
   // zero out the new Data structure
 	memset( newData, 0, newLength  * sizeof( ListEntryRow ) );
-	 
+
 	// we want to copy over different amounts of data depending on if we're adding
 	// to the list box or removing from the listbox
 	if(newLength >= listboxData->listLength)
@@ -2513,18 +2504,18 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 	}
 	else
 	{
-		// If we're removing entries from the listbox, we need to reset the length, 
+		// If we're removing entries from the listbox, we need to reset the length,
 		// position, and selection to their new places
 		if( listboxData->displayPos >newLength)
 			listboxData->displayPos = newLength;
 		//if we're multiselect, just select no position
-		if(listboxData->selectPos > newLength || listboxData->multiSelect) 
+		if(listboxData->selectPos > newLength || listboxData->multiSelect)
 			listboxData->selectPos = -1;
     if(listboxData->insertPos > newLength)
 			listboxData->insertPos = newLength;
 
     listboxData->endPos = newLength;
-		//copy only the data that we'll be needing.		
+		//copy only the data that we'll be needing.
 		memcpy(newData,listboxData->listData,newLength * sizeof( ListEntryRow ) );
 	}
 
@@ -2534,7 +2525,7 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 		//We're now onto a row of cells we are not using anymore Pull off the cells and loop through them
 		ListEntryCell *cells = listboxData->listData[i].cell;
 		for (int j = columns - 1; j >=0; j-- )
-		{			
+		{
 			if(!cells)
 				break;
 			if ( i >= newLength )
@@ -2544,11 +2535,10 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 					// If we can delete the stuff that won't be showing up in the new listData struture
 					if ( cells[j].data )
 					{
-						TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );	
+						TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
 					}
 				}
-//			if ( cells[j].userData ) 
-//					free(cells[j].userData);
+//				free(cells[j].userData);
 			}
 		}
 		if (i >= newLength) {
@@ -2559,10 +2549,9 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 
 	listboxData->listLength = newLength;
 
-	if( listboxData->listData )
-		delete[]( listboxData->listData );
+	delete[]( listboxData->listData );
 	listboxData->listData = newData;
-	
+
 	//reset the total height
 	computeTotalHeight(listbox);
 
@@ -2570,39 +2559,42 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 	if( listboxData->listData == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to allocate listbox data pointer\n" ));
+		DEBUG_LOG(( "Unable to allocate listbox data pointer" ));
 		assert( 0 );
 		return;
 
-	}  // end if
-	
+	}
+
 	// adjust the selection array for multi select listboxes
 	if( listboxData->multiSelect )
 	{
-		
+
 		GadgetListBoxRemoveMultiSelect( listbox );
 		GadgetListBoxAddMultiSelect( listbox );
 
-	}  // end if
+	}
 
-}  // end GadgetListBoxSetListLength
+}
 
-// GadgetListBoxGetListLength =================================================
-/** Get the list length data contained in the listboxData
-	* parameter. */
 //=============================================================================
 Int GadgetListBoxGetListLength( GameWindow *listbox )
 {
 	ListboxData *listboxData = (ListboxData *)listbox->winGetUserData();
-	if (listboxData->multiSelect)
-	{
+	if (listboxData)
 		return listboxData->listLength;
-	}
-	else
-	{
-		return 1;
-	}
-}  // end GadgetListBoxGetListLength
+
+	return 0;
+}
+
+//=============================================================================
+Int GadgetListBoxGetMaxSelectedLength( GameWindow *listbox )
+{
+	ListboxData *listboxData = (ListboxData *)listbox->winGetUserData();
+	if (listboxData)
+		return listboxData->multiSelect ? listboxData->listLength : 1;
+
+	return 0;
+}
 
 // GadgetListBoxGetNumEntries =================================================
 /** Get the list length data contained in the listboxData
@@ -2618,7 +2610,7 @@ Int GadgetListBoxGetNumEntries( GameWindow *listbox )
 		return listboxData->endPos;
 
 	return 0;
-}  // end GadgetListBoxGetNumEntries
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the selected item(s) of a listbox.  For a single select listbox the parameter
@@ -2637,7 +2629,7 @@ void GadgetListBoxGetSelected( GameWindow *listbox, Int *selectList )
 	// get selected indeces via system message
 	TheWindowManager->winSendSystemMsg( listbox, GLM_GET_SELECTION, 0, (WindowMsgData)selectList );
 
-}  // end GadgetListBoxGetSelected
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the selected item of a listbox.  The parameter is a single integer.  If
@@ -2653,7 +2645,7 @@ void GadgetListBoxSetSelected( GameWindow *listbox, Int selectIndex )
 	// set selected index via system message
 	TheWindowManager->winSendSystemMsg( listbox, GLM_SET_SELECTION, (WindowMsgData)(&selectIndex), 1 );
 
-}  // end GadgetListBoxSetSelected
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the selected item of a listbox. */
@@ -2680,7 +2672,7 @@ void GadgetListBoxReset( GameWindow *listbox )
 	// reset via system message
 	TheWindowManager->winSendSystemMsg( listbox, GLM_DEL_ALL, 0, 0 );
 
-}  // end GadgetListBoxReset
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2692,8 +2684,8 @@ void GadgetListBoxSetItemData( GameWindow *listbox, void *data, Int row, Int col
 
 	if (listbox)
 		TheWindowManager->winSendSystemMsg( listbox, GLM_SET_ITEM_DATA, (WindowMsgData)&pos, (WindowMsgData)data);
-		
-}// void GadgetListBoxSetItemData( Int index, void *data )
+
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2709,7 +2701,7 @@ void *GadgetListBoxGetItemData( GameWindow *listbox, Int row, Int column)
 		TheWindowManager->winSendSystemMsg( listbox, GLM_GET_ITEM_DATA, (WindowMsgData)&pos, (WindowMsgData)&data);
 	}
 	return (data);
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2758,7 +2750,7 @@ void GadgetListBoxSetBottomVisibleEntry( GameWindow *window, Int newPos )
 	int prevPos = GadgetListBoxGetBottomVisibleEntry( window );
 
 	adjustDisplay(window, newPos - prevPos + 1, true);
-} // void GadgetListBoxSetTopVisibleEntry( GameWindow *window, Int newPos )
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2772,7 +2764,7 @@ Int GadgetListBoxGetTopVisibleEntry( GameWindow *window )
 		return 0;
 
 	return getListboxTopEntry(listData);
-} // Int GadgetListBoxGetTopVisibleEntry( GameWindow *window )
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2788,7 +2780,7 @@ void GadgetListBoxSetTopVisibleEntry( GameWindow *window, Int newPos )
 	int prevPos = GadgetListBoxGetTopVisibleEntry( window );
 
 	adjustDisplay(window, newPos - prevPos, true);
-} // void GadgetListBoxSetTopVisibleEntry( GameWindow *window, Int newPos )
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2801,7 +2793,7 @@ void GadgetListBoxSetAudioFeedback( GameWindow *listbox, Bool enable )
 		return;
 
 	listboxData->audioFeedback = enable;
-}  // end GadgetListBoxSetAudioFeedback
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2814,7 +2806,7 @@ Int GadgetListBoxGetNumColumns( GameWindow *listbox )
 		return 0;
 
 	return listboxData->columns;
-}  // end GadgetListBoxGetNumColumns
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2829,5 +2821,5 @@ Int GadgetListBoxGetColumnWidth( GameWindow *listbox, Int column )
 		return 0;
 
 	return listboxData->columnWidth[column];
-}  // end GadgetListBoxGetNumColumns
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
index cdd838014b9..48e53b57271 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ProgressBar.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -75,11 +75,17 @@ WindowMsgHandledType GadgetProgressBarSystem( GameWindow *window, UnsignedInt ms
 
   switch( msg )
 	{
+		// ------------------------------------------------------------------------
+		case GWM_DESTROY:
+		{
+			window->winSetUserData( NULL );
+			break;
+		}
 
 		// ------------------------------------------------------------------------
     case GPM_SET_PROGRESS:
     {
-      Int newPos = (Int)mData1; 
+      Int newPos = (Int)mData1;
 
       if (newPos < 0 || newPos > 100)
         break;
@@ -88,17 +94,17 @@ WindowMsgHandledType GadgetProgressBarSystem( GameWindow *window, UnsignedInt ms
 
 			break;
 
-    }  // end set progress
-		
+    }
+
 		// ------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetProgressBarSystem
+}
 
 // GadgetProgressBarSetProgress ===============================================
 /** send progress system message to Progress Bar */
@@ -109,4 +115,4 @@ void GadgetProgressBarSetProgress( GameWindow *g, Int progress )
 		return;
 
 	TheWindowManager->winSendSystemMsg( g, GPM_SET_PROGRESS, progress, 0);
-} // end GadgetProgressBarSetProgress
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
index 2e39eb0d3a1..02eb8a7e385 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GadgetPushButton.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
@@ -54,11 +54,6 @@
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/InGameUI.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 // DEFINES ////////////////////////////////////////////////////////////////////
 
 // PRIVATE TYPES //////////////////////////////////////////////////////////////
@@ -86,27 +81,27 @@ static Bool buttonTriggersOnMouseDown(GameWindow *window)
 // GadgetPushButtonInput ======================================================
 /** Handle input for push button */
 //=============================================================================
-WindowMsgHandledType GadgetPushButtonInput( GameWindow *window, 
+WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 																						UnsignedInt msg,
-																						WindowMsgData mData1, 
+																						WindowMsgData mData1,
 																						WindowMsgData mData2 )
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 
-				TheWindowManager->winSendSystemMsg( instData->getOwner(), 
+				TheWindowManager->winSendSystemMsg( instData->getOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 
 				//TheWindowManager->winSetFocus( window );
@@ -118,21 +113,21 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 			}
 			break;
 
-		}  // end mouse entering
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if(BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if(BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( instData->getOwner(), 
+				TheWindowManager->winSendSystemMsg( instData->getOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 			}
-		
+
 			//
 			// if this is not a check-like button, clear any selected state when the
 			// move leaves the window area
@@ -148,7 +143,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 			}
 			break;
 
-		}  // end mouse leaving
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
@@ -158,7 +153,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 																					(WindowMsgData)window, mData1 );
 			break;
 
-		}  // end left drag
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DOWN:
@@ -173,7 +168,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 			if( TheAudio )
 			{
 				TheAudio->addAudioEvent( &buttonClick );
-			}  // end if
+			}
 
 			//
 			// for 'check-like' buttons we have "dual state", we flip the selected status
@@ -182,21 +177,21 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 			//
 			if( BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) )
 			{
-				
+
 				if( BitIsSet( instData->m_state, WIN_STATE_SELECTED ) )
 					BitClear( instData->m_state, WIN_STATE_SELECTED );
 				else
 					BitSet( instData->m_state, WIN_STATE_SELECTED );
 
 
-			}  // end if
+			}
 			else
 			{
-				
+
 				// just select as normal
 				BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-			}  // end else
+			}
 
 			if (buttonTriggersOnMouseDown(window)) {
 				TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
@@ -204,7 +199,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 			}
 
 			break;
-		}  // end left down
+		}
 
 		//-------------------------------------------------------------------------
 		case GWM_LEFT_UP:
@@ -237,7 +232,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 
 			break;
 
-		}  // end left up or left click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_RIGHT_DOWN:
@@ -248,7 +243,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 				buttonClick.setEventName(pData->altSound);
 			else
 				buttonClick.setEventName("GUIClick");
-				
+
 
 			if( BitIsSet( instData->getStatus(), WIN_STATUS_RIGHT_CLICK ) )
 			{
@@ -256,7 +251,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 				if( TheAudio )
 				{
 					TheAudio->addAudioEvent( &buttonClick );
-				}  // end if
+				}
 
 				//
 				// for 'check-like' buttons we have "dual state", we flip the selected status
@@ -265,7 +260,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 				//
 				if( BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) )
 				{
-					
+
 					if( BitIsSet( instData->m_state, WIN_STATE_SELECTED ) )
 						BitClear( instData->m_state, WIN_STATE_SELECTED );
 					else
@@ -274,14 +269,14 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 					TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED_RIGHT,
 																							(WindowMsgData)window, mData1 );
 
-				}  // end if
+				}
 				else
 				{
-					
+
 					// just select as normal
 					BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-				}  // end else
+				}
 
 			}
 			else
@@ -290,12 +285,12 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 				return MSG_IGNORED;
 			}
 			break;
-		}  // end right down
+		}
 
 		//-------------------------------------------------------------------------
 		case GWM_RIGHT_UP:
 		{
-			
+
 			if( BitIsSet( instData->getStatus(), WIN_STATUS_RIGHT_CLICK ) )
 			{
 
@@ -330,7 +325,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 
 			break;
 
-		}  // end right up or right click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CHAR:
@@ -360,7 +355,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 
 						}
 
-					} 
+					}
 					else
 					{
 
@@ -371,7 +366,7 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 						//
 						if( BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) )
 						{
-							
+
 							if( BitIsSet( instData->m_state, WIN_STATE_SELECTED ) )
 								BitClear( instData->m_state, WIN_STATE_SELECTED );
 							else
@@ -380,21 +375,21 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 							TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
 																									(WindowMsgData)window, mData1 );
 
-						}  // end if
+						}
 						else
 						{
-							
+
 							// just select as normal
 							BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-						}  // end else
+						}
 
 
-					}  // end else
+					}
 
 					break;
 
-				}  // end handle enter and space button
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_DOWN:
@@ -405,8 +400,8 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 					if( BitIsSet( mData2, KEY_STATE_DOWN ) )
 						TheWindowManager->winNextTab(window);
 					break;
-				
-				}  // end key down, right or tab
+
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_UP:
@@ -417,27 +412,27 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 						TheWindowManager->winPrevTab(window);
 					break;
 
-				}  // end key up or left
+				}
 
 				// --------------------------------------------------------------------
 				default:
 					return MSG_IGNORED;
 
-			}  // end switch on char
+			}
 
 			break;
 
-		}  // end character message
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetPushButtonInput
+}
 
 // GadgetPushButtonSystem =====================================================
 /** Handle system messages for push button */
@@ -447,9 +442,9 @@ WindowMsgHandledType GadgetPushButtonSystem( GameWindow *window, UnsignedInt msg
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
-		
+
 		// ------------------------------------------------------------------------
 		case GGM_SET_LABEL:
 		{
@@ -465,12 +460,10 @@ WindowMsgHandledType GadgetPushButtonSystem( GameWindow *window, UnsignedInt msg
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
-			PushButtonData *pData = (PushButtonData *)window->winGetUserData();
-			if(pData)
-				delete pData;
+			delete (PushButtonData *)window->winGetUserData();
 			window->winSetUserData(NULL);
-		}
 			break;
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -480,9 +473,9 @@ WindowMsgHandledType GadgetPushButtonSystem( GameWindow *window, UnsignedInt msg
 			else
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 
-			TheWindowManager->winSendSystemMsg( instData->getOwner(), 
+			TheWindowManager->winSendSystemMsg( instData->getOwner(),
 																					GGM_FOCUS_CHANGE,
-																					(WindowMsgData)mData1, 
+																					(WindowMsgData)mData1,
 																					window->winGetWindowId() );
 			if( mData1 == FALSE )
 				*(Bool*)mData2 = FALSE;
@@ -493,11 +486,11 @@ WindowMsgHandledType GadgetPushButtonSystem( GameWindow *window, UnsignedInt msg
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetPushButtonSystem
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set the visual status of a button to make it looked checked/unchecked ... DO NOT send
@@ -511,7 +504,7 @@ void GadgetCheckLikeButtonSetVisualCheck( GameWindow *g, Bool checked )
 		return;
 
 	// get instance data
-	WinInstanceData *instData = g->winGetInstanceData();	
+	WinInstanceData *instData = g->winGetInstanceData();
 	if( instData == NULL )
 		return;
 
@@ -519,10 +512,10 @@ void GadgetCheckLikeButtonSetVisualCheck( GameWindow *g, Bool checked )
 	if( BitIsSet( g->winGetStatus(), WIN_STATUS_CHECK_LIKE ) == FALSE )
 	{
 
-		DEBUG_CRASH(( "GadgetCheckLikeButtonSetVisualCheck: Window is not 'CHECK-LIKE'\n" ));
+		DEBUG_CRASH(( "GadgetCheckLikeButtonSetVisualCheck: Window is not 'CHECK-LIKE'" ));
 		return;
 
-	}  // end if
+	}
 
 	// set or clear the 'pushed' state
 	if( instData )
@@ -533,9 +526,9 @@ void GadgetCheckLikeButtonSetVisualCheck( GameWindow *g, Bool checked )
 		else
 			BitClear( instData->m_state, WIN_STATE_SELECTED );
 
-	}  // end if
+	}
 
-}  // end GadgetCheckLikeButtonSetVisualCheck
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -554,7 +547,7 @@ Bool GadgetCheckLikeButtonIsChecked( GameWindow *g )
 	// we just hold this "check like dual state thingie" using the selected state
 	return BitIsSet( instData->m_state, WIN_STATE_SELECTED );
 
-}  // end GadgetCheckLikeButtonIsChecked
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -582,7 +575,7 @@ void GadgetButtonEnableCheckLike( GameWindow *g, Bool makeCheckLike, Bool initia
 	else
 		BitClear( instData->m_state, WIN_STATE_SELECTED );
 
-}  // end GadgetButtonEnableCheckLike
+}
 
 // GadgetButtonSetText ========================================================
 /** Set the text for a push button */
@@ -596,14 +589,14 @@ void GadgetButtonSetText( GameWindow *g, UnicodeString text )
 
 	TheWindowManager->winSendSystemMsg( g, GGM_SET_LABEL, (WindowMsgData)&text, 0 );
 
-}  // end GadgetButtonSetText
+}
 
 PushButtonData * getNewPushButtonData( void )
 {
 	PushButtonData *p = NEW PushButtonData;
 	if(!p)
 		return NULL;
-	
+
 	p->userData = NULL;
 	p->drawBorder = FALSE;
 	p->drawClock = NO_CLOCK;
@@ -697,7 +690,7 @@ void GadgetButtonSetData(GameWindow *g, void *data)
 	PushButtonData *pData = (PushButtonData *)g->winGetUserData();
 	if(!pData)
 	{
-		pData = getNewPushButtonData();	
+		pData = getNewPushButtonData();
 	}
 	pData->userData = data;
 	g->winSetUserData(pData);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
index ba2da3f01f4..3843009576e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
@@ -24,12 +24,12 @@
 
 // FILE: RadioButton.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -71,7 +71,7 @@
 static void doRadioUnselect( GameWindow *window, Int group, Int screen,
 												GameWindow *except )
 {
-	
+
 	//
 	// if this is a radio button we have something to consider, but we
 	// will ignore the except window
@@ -86,9 +86,9 @@ static void doRadioUnselect( GameWindow *window, Int group, Int screen,
 
 			BitClear( instData->m_state, WIN_STATE_SELECTED );
 
-		}  // end if
-					
-	}  // end if
+		}
+
+	}
 
 	// recursively call on all my children
 	GameWindow *child;
@@ -96,14 +96,14 @@ static void doRadioUnselect( GameWindow *window, Int group, Int screen,
 	for( child = window->winGetChild(); child; child = child->winGetNext() )
 		doRadioUnselect( child, group, screen, except );
 
-}  // end doRadioUnselect
+}
 
 // unselectOtherRadioOfGroup ==================================================
 /** Go through the entire window system, including child windows and
 	* unselect any radio buttons of the specified group, but not the
 	* window specified */
 //=============================================================================
-static void unselectOtherRadioOfGroup( Int group, Int screen, 
+static void unselectOtherRadioOfGroup( Int group, Int screen,
 																			 GameWindow *except )
 {
 	GameWindow *window = TheWindowManager->winGetWindowList();
@@ -113,7 +113,7 @@ static void unselectOtherRadioOfGroup( Int group, Int screen,
 			 window = window->winGetNext() )
 		doRadioUnselect( window, group, screen, except );
 
-}  // end unselectOtherRadioOfGroup
+}
 
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 
@@ -125,46 +125,46 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( instData->getOwner(), 
+				TheWindowManager->winSendSystemMsg( instData->getOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 				//TheWindowManager->winSetFocus( window );
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end mouse enter
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 		{
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( instData->getOwner(), 
+				TheWindowManager->winSendSystemMsg( instData->getOwner(),
 																						GBM_MOUSE_LEAVING,
-																					  (WindowMsgData)window, 
+																					  (WindowMsgData)window,
 																						mData1 );
-			}  // end if
+			}
 
 			break;
 
-		}  // end mouse leaving
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DRAG:
@@ -174,7 +174,7 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 																					(WindowMsgData)window, mData1 );
 			break;
 
-		}  // end left drag
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_DOWN:
@@ -182,7 +182,7 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 
 			break;
 
-		}  // end down
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_LEFT_UP:
@@ -192,9 +192,9 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 			{
 				RadioButtonData *radioData = (RadioButtonData *)window->winGetUserData();
 
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_SELECTED,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 
 				//
@@ -207,24 +207,24 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 				// this button is now selected
 				BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-			}  // end if, not selected
+			}
 			else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) == FALSE )
 			{
 
 				// this up click was not meant for this button
 				return MSG_IGNORED;
 
-			}  // end else if
+			}
 
 			break;
 
-		}  // end left up or click
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CHAR:
 		{
 
-			switch( mData1 ) 
+			switch( mData1 )
 			{
 
 				// --------------------------------------------------------------------
@@ -237,9 +237,9 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 						{
 							RadioButtonData *radioData = (RadioButtonData *)window->winGetUserData();
 
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GBM_SELECTED,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									mData1 );
 
 							//
@@ -252,9 +252,9 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 							// this button is now selected
 							BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-						}  // end if, not selected
+						}
 
-					}  // end key down
+					}
 
 					break;
 
@@ -268,7 +268,7 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 						window->winNextTab();
 					break;
 
-				}  // end down, right, or tab
+				}
 
 				// --------------------------------------------------------------------
 				case KEY_UP:
@@ -279,7 +279,7 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 						window->winPrevTab();
 					break;
 
-				}  // end up, left
+				}
 
 				// --------------------------------------------------------------------
 				default:
@@ -287,13 +287,13 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 
 					return MSG_IGNORED;
 
-				}  // end default
+				}
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
-		}  // end char messsage
+		}
 
 		// ------------------------------------------------------------------------
 		default:
@@ -301,13 +301,13 @@ WindowMsgHandledType GadgetRadioButtonInput( GameWindow *window, UnsignedInt msg
 
 			return MSG_IGNORED;
 
-		}  // end default
+		}
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetRadioButtonInput
+}
 
 // GadgetRadioButtonSystem ====================================================
 /** Handle system messages for radio button */
@@ -317,7 +317,7 @@ WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt ms
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
@@ -331,11 +331,11 @@ WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt ms
 				if( (Bool)mData1 == TRUE )
 				{
 
-					TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+					TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																							GBM_SELECTED,
-																							(WindowMsgData)window, 
+																							(WindowMsgData)window,
 																							0 );
-				}  // end if
+				}
 
 				//
 				// unselect any windows in the system (including children) that
@@ -348,11 +348,11 @@ WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt ms
 				// this button is now selected
 				BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end set selection
+		}
 
 		// ------------------------------------------------------------------------
 		case GGM_SET_LABEL:
@@ -361,7 +361,7 @@ WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt ms
 			window->winSetText( *(UnicodeString*)mData1 );
 			break;
 
-		}  // end set label
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
@@ -370,14 +370,13 @@ WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt ms
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
-			RadioButtonData *radioData = (RadioButtonData *)window->winGetUserData();
-
 			// free radio button user data
-			delete radioData;
+			delete (RadioButtonData *)window->winGetUserData();
+			window->winSetUserData( NULL );
 
 			break;
-		
-		}  // end destroy
+
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
@@ -388,22 +387,22 @@ WindowMsgHandledType GadgetRadioButtonSystem( GameWindow *window, UnsignedInt ms
 
 			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 
 			*(Bool*)mData2 = TRUE;
 			break;
 
-		}  // end focus
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetRadioButtonSystem
+}
 
 // GadgetRadioSetText =========================================================
 /** Set the text for the control */
@@ -417,7 +416,7 @@ void GadgetRadioSetText( GameWindow *g, UnicodeString text )
 
 	TheWindowManager->winSendSystemMsg( g, GGM_SET_LABEL, (WindowMsgData)&text, 0 );
 
-}  // end GadgetRadioSetText
+}
 
 // GadgetRadioSetGroup ========================================================
 /** Set the group number for a radio button, only one radio button of
@@ -430,7 +429,7 @@ void GadgetRadioSetGroup( GameWindow *g, Int group, Int screen )
 	radioData->group = group;
 	radioData->screen = screen;
 
-}  // end GadgetRadioSetGroup
+}
 
 
 // GadgetRadioSetText =========================================================
@@ -445,5 +444,5 @@ void GadgetRadioSetSelection( GameWindow *g, Bool sendMsg )
 
 	TheWindowManager->winSendSystemMsg( g, GBM_SET_SELECTION, (WindowMsgData)&sendMsg, 0 );
 
-}  // end GadgetRadioSetText
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetStaticText.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
index 262681a9af7..9913fa9633b 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
@@ -24,12 +24,12 @@
 
 // FILE: StaticText.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -76,13 +76,13 @@ WindowMsgHandledType GadgetStaticTextInput( GameWindow *window, UnsignedInt msg,
 											      WindowMsgData mData1, WindowMsgData mData2 )
 {
 
-  switch( msg ) 
+  switch( msg )
 	{
 		// ------------------------------------------------------------------------
     case GWM_CHAR:
       switch (mData1)
 			{
-					
+
         case KEY_DOWN:
         case KEY_RIGHT:
         case KEY_TAB:
@@ -108,9 +108,9 @@ WindowMsgHandledType GadgetStaticTextInput( GameWindow *window, UnsignedInt msg,
 
   }
 	return MSG_HANDLED;
- 
 
-}  // end GadgetStaticTextInput
+
+}
 
 // GadgetStaticTextSystem =====================================================
 /** Handle system messages for text field */
@@ -129,8 +129,8 @@ WindowMsgHandledType GadgetStaticTextSystem( GameWindow *window, UnsignedInt msg
 			if (tData && tData->text)
 				*(UnicodeString*)mData2 = tData->text->getText();
 			break;
-		
-		}  // end get label
+
+		}
 
 		// ------------------------------------------------------------------------
 		case GGM_SET_LABEL:
@@ -144,7 +144,7 @@ WindowMsgHandledType GadgetStaticTextSystem( GameWindow *window, UnsignedInt msg
 
       break;
 
-		}  // end set label
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
@@ -159,19 +159,20 @@ WindowMsgHandledType GadgetStaticTextSystem( GameWindow *window, UnsignedInt msg
 			TheDisplayStringManager->freeDisplayString( data->text );
 
 			// free text data
-			delete( data );
+			delete (TextData *)window->winGetUserData();
+			window->winSetUserData( NULL );
 
       break;
 
-		}  // end destroy
+		}
 
 		default:
 			return MSG_IGNORED;
 
-  }  // end switch( msg )
+  }
 
 	return MSG_HANDLED;
-}  // end GadgetStaticTextSystem
+}
 
 // GadgetStaticTextSetText ====================================================
 /** Set the text for a static text control */
@@ -182,7 +183,7 @@ void GadgetStaticTextSetText( GameWindow *window, UnicodeString text )
 		return;
 	TheWindowManager->winSendSystemMsg( window, GGM_SET_LABEL, (WindowMsgData)&text, 0 );
 
-}  // end GadgetStaticTextSetText
+}
 
 UnicodeString GadgetStaticTextGetText( GameWindow *window )
 {
@@ -220,6 +221,6 @@ void GadgetStaticTextSetFont( GameWindow *g, GameFont *font )
 		if( dString )
 			dString->setFont( font );
 
-	}  // end if
+	}
 
-}  // end GadgetStaticTextSetFont
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTabControl.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
index 18a7755fc03..1a1d2e2b0ce 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
@@ -24,12 +24,12 @@
 
 // FILE: RadioButton.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -86,7 +86,7 @@ WindowMsgHandledType GadgetTabControlInput( GameWindow *tabControl, UnsignedInt
 	Int tabsBottom = tabData->tabsBottomLimit;
 	Int tabsTop = tabData->tabsTopLimit;
 
-	switch( msg ) 
+	switch( msg )
 	{
 		case GWM_LEFT_DOWN:
 		{
@@ -124,7 +124,7 @@ WindowMsgHandledType GadgetTabControlInput( GameWindow *tabControl, UnsignedInt
 
 	return MSG_HANDLED;
 
-}  // end GadgetTabControlInput
+}
 
 // GadgetTabControlSystem ====================================================
 /** Handle system messages for TabControl */
@@ -132,7 +132,7 @@ WindowMsgHandledType GadgetTabControlInput( GameWindow *tabControl, UnsignedInt
 WindowMsgHandledType GadgetTabControlSystem( GameWindow *tabControl, UnsignedInt msg,
 															WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
@@ -141,14 +141,13 @@ WindowMsgHandledType GadgetTabControlSystem( GameWindow *tabControl, UnsignedInt
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
 		{
-			TabControlData *tabData = (TabControlData *)tabControl->winGetUserData();
-
 			// free tab control user data
-			delete tabData;
+			delete (TabControlData *)tabControl->winGetUserData();
+			tabControl->winSetUserData( NULL );
 
 			break;
-		
-		}  // end destroy
+
+		}
 
 		case GGM_RESIZED:
 		{//On resize, we need to upkeep the pane sizes and tabs since they are bound to us
@@ -164,16 +163,18 @@ WindowMsgHandledType GadgetTabControlSystem( GameWindow *tabControl, UnsignedInt
 
 			if( parent )
 				return TheWindowManager->winSendSystemMsg( parent, msg, mData1, mData2 );
+
+			break;
 		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetTabControlSystem
+}
 
 void GadgetTabControlComputeTabRegion( GameWindow *tabControl )///< Recalc the tab positions based on userData
 {
@@ -362,4 +363,4 @@ void GadgetTabControlFixupSubPaneList( GameWindow *tabControl )
 			child = child->winGetPrev();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
index 4e7c3c12a65..0319ca68282 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
@@ -24,12 +24,12 @@
 
 // FILE: TextEntry.cpp ////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -57,11 +57,6 @@
 // DEFINES ////////////////////////////////////////////////////////////////////
 
 // PRIVATE TYPES //////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 ///////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -95,7 +90,7 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 		return MSG_HANDLED;
 	}
 
-	switch( msg ) 
+	switch( msg )
 	{
 		// ------------------------------------------------------------------------
 		case GWM_IME_CHAR:
@@ -106,9 +101,9 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 			if ( ch == VK_RETURN )
 			{
 				// Done with this edit
-			 		TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			 		TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 			 																				GEM_EDIT_DONE,
-			 																				(WindowMsgData)window, 
+			 																				(WindowMsgData)window,
 			 																				0 );
 				return MSG_HANDLED;
 			};
@@ -139,9 +134,9 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 						e->text->appendChar( ch );
 						e->sText->appendChar( L'*' );
 						e->charPos++;
-						TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+						TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GEM_UPDATE_TEXT,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 				}
 			}
@@ -165,9 +160,9 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 					{
 						if( e->receivedUnichar == FALSE )
 						{
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GEM_EDIT_DONE,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									0 );
 						}
 					}
@@ -213,7 +208,7 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 						else
 							TheWindowManager->winNextTab(window);
 					}
-					
+
 					break;
 
 				// --------------------------------------------------------------------
@@ -248,16 +243,16 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 								e->text->removeLastChar();
 								e->sText->removeLastChar();
 								e->charPos--;
-								TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+								TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																								GEM_UPDATE_TEXT,
-																								(WindowMsgData)window, 
+																								(WindowMsgData)window,
 																								0 );
-							}  // end if
+							}
 						}
 					}
 					break;
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
@@ -274,7 +269,7 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
 																						(WindowMsgData)window, 0 );
 				//TheWindowManager->winSetFocus( window );
@@ -289,7 +284,7 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
 																						(WindowMsgData)window, 0 );
 			}
@@ -299,7 +294,7 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 		case GWM_LEFT_DRAG:
 
 			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
 																						(WindowMsgData)window, 0 );
 			break;
@@ -308,11 +303,11 @@ WindowMsgHandledType GadgetTextEntryInput( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetTextEntryInput
+}
 
 // GadgetTextEntrySystem ======================================================
 /** Handle system messages for entry field */
@@ -349,7 +344,7 @@ WindowMsgHandledType GadgetTextEntrySystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end set text
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
@@ -370,6 +365,8 @@ WindowMsgHandledType GadgetTextEntrySystem( GameWindow *window, UnsignedInt msg,
 
 			// free all edit data
 			delete( (EntryData *)window->winGetUserData() );
+			window->winSetUserData(NULL);
+			e = NULL;
 			break;
 
 		// ------------------------------------------------------------------------
@@ -402,9 +399,9 @@ WindowMsgHandledType GadgetTextEntrySystem( GameWindow *window, UnsignedInt msg,
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 			}
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 
 			*(Bool*)mData2 = TRUE;
@@ -413,11 +410,11 @@ WindowMsgHandledType GadgetTextEntrySystem( GameWindow *window, UnsignedInt msg,
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetTextEntrySystem
+}
 
 /** @todo we might want to do something like this if we use IME for language
 	* support in this product */
@@ -562,9 +559,9 @@ void GadgetTextEntrySetFont( GameWindow *g, GameFont *font )
 		if( dString )
 			dString->setFont( font );
 
-	}  // end if
+	}
 
-}  // end GadgetTextEntrySetFont
+}
 
 // GadgetTextEntryGetText =======================================================
 /** Get the text for a Text entry */
@@ -584,4 +581,4 @@ UnicodeString GadgetTextEntryGetText( GameWindow *textentry )
 	TheWindowManager->winSendSystemMsg( textentry, GEM_GET_TEXT, 0, (WindowMsgData)&result );
 	return result;
 
-}  // end GadgetListBoxGetText
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
index 71168137cf6..a5bf79259b7 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
@@ -24,12 +24,12 @@
 
 // FILE: VerticalSlider.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Language.h"
@@ -66,11 +66,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // GadgetVerticlaSliderInput ==================================================
 /** Handle input for vertical slider */
@@ -81,19 +76,19 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 	SliderData *s = (SliderData *)window->winGetUserData();
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_ENTERING:
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitSet( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_ENTERING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 				//TheWindowManager->winSetFocus( window );
 
@@ -103,13 +98,13 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 		// ------------------------------------------------------------------------
 		case GWM_MOUSE_LEAVING:
 
-			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) ) 
+			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
 			{
 
 				BitClear( instData->m_state, WIN_STATE_HILITED );
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GBM_MOUSE_LEAVING,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						0 );
 			}
 			break;
@@ -118,9 +113,9 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 		case GWM_LEFT_DRAG:
 
 			if( BitIsSet( instData->getStyle(), GWS_MOUSE_TRACK ) )
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GGM_LEFT_DRAG,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						mData1 );
 			break;
 
@@ -159,7 +154,7 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 				if( clickPos > mousey - y )
 					clickPos = mousey - y;
 
-			}  // end if
+			}
 			else
 			{
 
@@ -167,7 +162,7 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 				if( clickPos < mousey - y )
 					clickPos = mousey - y;
 
-			}  // end else
+			}
 
 			// keep pos valid on window
 			if( clickPos > y + size.y - childSize.y / 2 )
@@ -199,9 +194,9 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 							GameWindow *child = window->winGetChild();
 
 							s->position += 2;
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GSM_SLIDER_TRACK,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									s->position );
 							// Translate to window coords
 							child->winSetPosition( 0, (Int)((s->maxVal - s->position) * s->numTicks) );
@@ -218,14 +213,14 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 					if( BitIsSet( mData2, KEY_STATE_DOWN ) )
 					{
 
-						if( s->position > s->minVal + 1 ) 
+						if( s->position > s->minVal + 1 )
 						{
 							GameWindow *child = window->winGetChild();
 
 							s->position -= 2;
-							TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+							TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																									GSM_SLIDER_TRACK,
-																									(WindowMsgData)window, 
+																									(WindowMsgData)window,
 																									s->position );
 							// Translate to window coords
 							child->winSetPosition( 0, (Int)((s->maxVal - s->position) * s->numTicks) );
@@ -251,20 +246,20 @@ WindowMsgHandledType GadgetVerticalSliderInput( GameWindow *window, UnsignedInt
 				default:
 					return MSG_IGNORED;
 
-			}  // end switch( mData1 )
+			}
 
 			break;
 
-		}  // end char
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetVerticalSliderInput
+}
 
 // GadgetVerticalSliderSystem =================================================
 /** Handle system messages for vertical slider */
@@ -275,16 +270,16 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
 	SliderData *s = (SliderData *)window->winGetUserData();
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case GBM_SELECTED:
 		{
 			// tell owner I've finished moving
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GSM_SLIDER_DONE,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					s->position );
 			break;
 
@@ -314,30 +309,30 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
 			{
 
 				//s->position = s->minVal;
-				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER, 
+				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER,
 																						s->minVal, 0 );
 				// tell owner i moved
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GSM_SLIDER_TRACK,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						s->position );
 				break;
-			
-			}  // end if
+
+			}
 			else if( mousey < y )
 			{
 
 				//s->position = s->maxVal;
-				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER, 
+				TheWindowManager->winSendSystemMsg( window, GSM_SET_SLIDER,
 																						s->maxVal, 0 );
 				// tell owner i moved
-				TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+				TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																						GSM_SLIDER_TRACK,
-																						(WindowMsgData)window, 
+																						(WindowMsgData)window,
 																						s->position );
 				break;
 
-			}  // end else if
+			}
 
 			if( childCenter.y <= y + childSize.y / 2 )
 			{
@@ -365,13 +360,13 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
 
 				// Invert slider position so that maxval is at the top
 				s->position = s->maxVal - s->position;
-				
+
 			}
 
 			// tell owner i moved
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GSM_SLIDER_TRACK,
-																					(WindowMsgData)window, 
+																					(WindowMsgData)window,
 																					s->position );
 			break;
 
@@ -426,22 +421,24 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
 			delete( (SliderData *)window->winGetUserData() );
+			window->winSetUserData(NULL);
+			s = NULL;
 			break;
 
 		// ------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
 
 			// If we're losing focus
-			if( mData1 == FALSE ) 
+			if( mData1 == FALSE )
 			{
 				BitClear( instData->m_state, WIN_STATE_HILITED );
 			} else {
 				BitSet( instData->m_state, WIN_STATE_HILITED );
 			}
 
-			TheWindowManager->winSendSystemMsg( window->winGetOwner(), 
+			TheWindowManager->winSendSystemMsg( window->winGetOwner(),
 																					GGM_FOCUS_CHANGE,
-																					mData1, 
+																					mData1,
 																					window->winGetWindowId() );
 
 			*(Bool*)mData2 = TRUE;
@@ -459,14 +456,14 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
 
 			break;
 
-		}  // end resized
+		}
 
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
-}  // end GadgetVerticalSliderSystem
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameFont.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameFont.cpp
index bc1b6c7c094..799f7d2776c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameFont.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameFont.cpp
@@ -27,7 +27,7 @@
 // Desc:       Access to our representation for fonts
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameFont.h"
 
@@ -55,7 +55,7 @@ void FontLibrary::linkFont( GameFont *font )
 	// increment linked count
 	m_count++;
 
-}  // end linkFont
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Unlink a font from the font list */
@@ -75,10 +75,10 @@ void FontLibrary::unlinkFont( GameFont *font )
 	if( other == NULL )
 	{
 
-		DEBUG_CRASH(( "Font '%s' not found in library\n", font->nameString.str() ));
+		DEBUG_CRASH(( "Font '%s' not found in library", font->nameString.str() ));
 		return;
 
-	}  // end if
+	}
 
 	// scan for the font pointing to the one we're going to unlink
 	for( other = m_fontList; other; other = other->next )
@@ -100,7 +100,7 @@ void FontLibrary::unlinkFont( GameFont *font )
 	// we now have one less font on the list
 	m_count--;
 
-}  // end unlinkFont
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Delete all font data, DO NOT throw an exception ... the destructor uses this */
@@ -125,9 +125,9 @@ void FontLibrary::deleteAllFonts( void )
 		// delete the font list element
 		deleteInstance(font);
 
-	}  // end while
+	}
 
-}  // deleteAllFonts
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -141,7 +141,7 @@ FontLibrary::FontLibrary( void )
 	m_fontList = NULL;
 	m_count = 0;
 
-}  // end FontLibrary
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -151,7 +151,7 @@ FontLibrary::~FontLibrary( void )
 	// delete all font data
 	deleteAllFonts();
 
-}  // end ~FontLibrary
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize what we need to in the font library */
@@ -159,7 +159,7 @@ FontLibrary::~FontLibrary( void )
 void FontLibrary::init( void )
 {
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the fonts for this font library */
@@ -167,10 +167,10 @@ void FontLibrary::init( void )
 void FontLibrary::reset( void )
 {
 
-	// delete all font data 
+	// delete all font data
 	deleteAllFonts();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get a font from our list, if we don't have that font loaded we will
@@ -178,6 +178,13 @@ void FontLibrary::reset( void )
 //-------------------------------------------------------------------------------------------------
 GameFont *FontLibrary::getFont( AsciiString name, Int pointSize, Bool bold )
 {
+	// sanity check the size - anything over 100 is probably wrong. -MW
+	// TheSuperHackers @fix Now also no longer creates fonts with zero size.
+	if (pointSize < 1 || pointSize > 100)
+	{
+		return NULL;
+	}
+
 	GameFont *font;
 
 	// search for font in list
@@ -186,21 +193,21 @@ GameFont *FontLibrary::getFont( AsciiString name, Int pointSize, Bool bold )
 
 		if( font->pointSize == pointSize &&
 				font->bold == bold &&
-				font->nameString == name 
+				font->nameString == name
 			)
 			return font;  // found
 
-	}  // end for font
+	}
 
 	// font not found, allocate a new font element
 	font = newInstance(GameFont);
 	if( font == NULL )
 	{
 
-		DEBUG_CRASH(( "getFont: Unable to allocate new font list element\n" ));
+		DEBUG_CRASH(( "getFont: Unable to allocate new font list element" ));
 		return NULL;
 
-	}  // end if
+	}
 
 	// copy font data over to new element
 	font->nameString = name;
@@ -208,16 +215,16 @@ GameFont *FontLibrary::getFont( AsciiString name, Int pointSize, Bool bold )
 	font->bold = bold;
 	font->fontData = NULL;
 
-	//DEBUG_LOG(("Font: Loading font '%s' %d point\n", font->nameString.str(), font->pointSize));
+	//DEBUG_LOG(("Font: Loading font '%s' %d point", font->nameString.str(), font->pointSize));
 	// load the device specific data pointer
 	if( loadFontData( font ) == FALSE )
 	{
 
-		DEBUG_CRASH(( "getFont: Unable to load font data pointer '%s'\n", name ));
+		DEBUG_CRASH(( "getFont: Unable to load font data pointer '%s'", name.str() ));
 		deleteInstance(font);
 		return NULL;
 
-	}  // end if
+	}
 
 	// tie font into list
 	linkFont( font );
@@ -225,4 +232,4 @@ GameFont *FontLibrary::getFont( AsciiString name, Int pointSize, Bool bold )
 	// all is done and loaded
 	return font;
 
-}  // end getFont
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp
index 4ab5a741114..49d7e6ee54c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindow.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GameWindow.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -45,7 +45,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/AudioEventRTS.h"
@@ -62,11 +62,6 @@
 #include "GameClient/Mouse.h"
 #include "GameClient/SelectionXlat.h"
 #include "GameClient/GameWindowTransitions.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // DEFINES ////////////////////////////////////////////////////////////////////
 
@@ -99,7 +94,7 @@ GameWindow::GameWindow( void )
 	m_cursorX = 0;
 	m_cursorY = 0;
 
-	m_userData = 0;
+	m_userData = NULL;
 
 	m_inputData = NULL;
 
@@ -122,24 +117,22 @@ GameWindow::GameWindow( void )
 
 	m_editData = NULL;
 
-}  // end GameWindow
+}
 
 // GameWindow::~GameWindow ====================================================
 //=============================================================================
 GameWindow::~GameWindow( void )
 {
 
-	if(	m_inputData )
-		delete m_inputData;
+	delete m_inputData;
 	m_inputData = NULL;
-	
-	if( m_editData )
-		delete m_editData;
+
+	delete m_editData;
 	m_editData = NULL;
 
 	unlinkFromTransitionWindows();
 
-}  // end ~GameWindow
+}
 
 // GameWindow::linkTransitionWindow ============================================
 //=============================================================================
@@ -148,7 +141,7 @@ void GameWindow::linkTransitionWindow( TransitionWindow* transitionWindow )
 
 	m_transitionWindows.push_back(transitionWindow);
 
-}  // end linkTransitionWindow
+}
 
 // GameWindow::unlinkTransitionWindow =========================================
 //=============================================================================
@@ -167,7 +160,7 @@ void GameWindow::unlinkTransitionWindow( TransitionWindow* transitionWindow )
 		++it;
 	}
 
-}  // end unlinkTransitionWindow
+}
 
 // GameWindow::unlinkFromTransitionWindows =========================================
 //=============================================================================
@@ -180,7 +173,7 @@ void GameWindow::unlinkFromTransitionWindows( void )
 		m_transitionWindows.pop_back();
 	}
 
-}  // end unlinkFromTransitionWindows
+}
 
 // GameWindow::normalizeWindowRegion ==========================================
 /** Puts the upper left corner in the window's region.lo field */
@@ -189,25 +182,25 @@ void GameWindow::normalizeWindowRegion( void )
 {
 	Int temp;
 
-	if( m_region.lo.x > m_region.hi.x) 
+	if( m_region.lo.x > m_region.hi.x)
 	{
 
 		temp = m_region.lo.x;
 		m_region.lo.x = m_region.hi.x;
 		m_region.hi.x = temp;
 
-	}  // end if
+	}
 
-	if( m_region.lo.y > m_region.hi.y ) 
+	if( m_region.lo.y > m_region.hi.y )
 	{
 
 		temp = m_region.lo.y;
 		m_region.lo.y = m_region.hi.y;
 		m_region.hi.y = temp;
 
-	}  // end if
+	}
 
-}  // end normalizeWindowRegion
+}
 
 // GameWindow::findFirstLeaf ==================================================
 /** Returns the first leaf of the branch */
@@ -226,7 +219,7 @@ GameWindow *GameWindow::findFirstLeaf( void )
 
 	return leaf;
 
-}  // end findFirstLeaf
+}
 
 // GameWindow::findLastLeaf ===================================================
 /** Returns the last leaf of the branch */
@@ -240,7 +233,7 @@ GameWindow *GameWindow::findLastLeaf( void )
 		leaf = leaf->m_parent;
 
 	// Find the last leaf
-	while( leaf->m_child ) 
+	while( leaf->m_child )
 	{
 
 		leaf = leaf->m_child;
@@ -248,11 +241,11 @@ GameWindow *GameWindow::findLastLeaf( void )
 		while( leaf->m_next )
 			leaf = leaf->m_next;
 
-	}  // end while
+	}
 
 	return leaf;
 
-}  // end findLastLeaf
+}
 
 // GameWindow::findPrevLeaf ===================================================
 /** Returns the prev leaf of the tree */
@@ -261,13 +254,13 @@ GameWindow *GameWindow::findPrevLeaf( void )
 {
 	GameWindow *leaf = this;
 
-	if( leaf->m_prev ) 
+	if( leaf->m_prev )
 	{
 
 		leaf = leaf->m_prev;
 
-		while( leaf->m_child && 
-					 BitIsSet( leaf->m_status, WIN_STATUS_TAB_STOP ) == FALSE ) 
+		while( leaf->m_child &&
+					 BitIsSet( leaf->m_status, WIN_STATUS_TAB_STOP ) == FALSE )
 		{
 
 			leaf = leaf->m_child;
@@ -275,26 +268,26 @@ GameWindow *GameWindow::findPrevLeaf( void )
 			while( leaf->m_next )
 				leaf = leaf->m_next;
 
-		}  // end while
+		}
 
 		return leaf;
 
-	}   // end if
-	else 
+	}
+	else
 	{
 
-		while( leaf->m_parent ) 
+		while( leaf->m_parent )
 		{
 
 			leaf = leaf->m_parent;
 
-			if( leaf->m_parent && leaf->m_prev ) 
+			if( leaf->m_parent && leaf->m_prev )
 			{
 
 				leaf = leaf->m_prev;
 
-				while( leaf->m_child && 
-							 BitIsSet( leaf->m_status, WIN_STATUS_TAB_STOP ) == FALSE ) 
+				while( leaf->m_child &&
+							 BitIsSet( leaf->m_status, WIN_STATUS_TAB_STOP ) == FALSE )
 				{
 
 					leaf = leaf->m_child;
@@ -302,24 +295,24 @@ GameWindow *GameWindow::findPrevLeaf( void )
 					while( leaf->m_next )
 						leaf = leaf->m_next;
 
-				}  // end while
+				}
 
 				return leaf;
 
-			}  // end if
+			}
 
-		}  // end while
+		}
 
 		if( leaf )
 			return leaf->findLastLeaf();
 		else
 			return NULL;
 
-	}  // end else
+	}
 
 	return NULL;
 
-}  // end findPrevLeaf
+}
 
 // GameWindow::findNextLeaf ===================================================
 /** Returns the next leaf of the tree */
@@ -328,48 +321,48 @@ GameWindow *GameWindow::findNextLeaf( void )
 {
 	GameWindow *leaf = this;
 
-	if( leaf->m_next ) 
+	if( leaf->m_next )
 	{
 
 		if( leaf->m_next->m_status & WIN_STATUS_TAB_STOP )
 			return leaf->m_next;
 
 		for( leaf = leaf->m_next; leaf; leaf = leaf->m_child )
-			if( leaf->m_child == NULL || BitIsSet( leaf->m_status, 
+			if( leaf->m_child == NULL || BitIsSet( leaf->m_status,
 																						WIN_STATUS_TAB_STOP ) )
 				return leaf;
 
-	}  // end if
-	else 
+	}
+	else
 	{
 
-		while( leaf->m_parent ) 
+		while( leaf->m_parent )
 		{
 
 			leaf = leaf->m_parent;
 
-			if( leaf->m_parent && leaf->m_next ) 
+			if( leaf->m_parent && leaf->m_next )
 			{
 
 				for( leaf = leaf->m_next; leaf; leaf = leaf->m_child )
-					if( leaf->m_child == NULL || 
+					if( leaf->m_child == NULL ||
 							BitIsSet( leaf->m_status, WIN_STATUS_TAB_STOP ) )
 						return leaf;
 
-			}  // end if
+			}
 
-		}  // end while
+		}
 
 		if( leaf )
 			return leaf->findFirstLeaf();
 		else
 			return NULL;
 
-	}  // end else
+	}
 
 	return NULL;
 
-}  // end findNextLeav
+}
 
 // GameWindow::winNextTab =====================================================
 /** Go to next window in tab chain */
@@ -383,16 +376,16 @@ Int GameWindow::winNextTab( void )
 	// Un-hilite the current window
 	m_instData.m_state &= ~WIN_STATE_HILITED;
 
-	do 
+	do
 	{
 
-		if( m_parent == NULL && firstTry ) 
+		if( m_parent == NULL && firstTry )
 		{
 
 			newTab = findLastLeaf( newTab );
 			firstTry = FALSE;
 
-		} 
+		}
 		else
 			newTab = findPrevLeaf( newTab );
 	} while( ( isEnabled( newTab ) == FALSE ) ||
@@ -404,7 +397,7 @@ Int GameWindow::winNextTab( void )
 */
 	return WIN_ERR_OK;
 
-}  // end WinNextTab
+}
 
 // GameWindow::winPrevTab =====================================================
 /** Go to previous window in tab chain */
@@ -418,16 +411,16 @@ Int GameWindow::winPrevTab( void )
 	// Un-hilite the current window
 	m_instData.m_state &= ~WIN_STATE_HILITED;
 
-	do 
+	do
 	{
 
-		if( m_parent == NULL && firstTry ) 
+		if( m_parent == NULL && firstTry )
 		{
 
 			newTab = findFirstLeaf( newTab );
 			firstTry = FALSE;
 
-		}  // end if
+		}
 		else
 			newTab = findNextLeaf( newTab );
 
@@ -441,7 +434,7 @@ Int GameWindow::winPrevTab( void )
 
 	return WIN_ERR_OK;
 
-}  // end WinPrevTab
+}
 
 // GameWindow::winBringToTop ==================================================
 /** Bring this window to the top of the window list, if we have a parent
@@ -459,13 +452,13 @@ Int GameWindow::winBringToTop( void )
 		TheWindowManager->addWindowToParent( this, parent );
 //		TheWindowManager->addWindowToParentAtEnd( this, parent );
 
-	}  // end if
+	}
 	else
 	{
 
 		// sanity, make sure this window is in the window list
-		for( current = TheWindowManager->winGetWindowList(); 
-				 current != this; 
+		for( current = TheWindowManager->winGetWindowList();
+				 current != this;
 				 current = current->m_next)
 			if (current == NULL)
 				return WIN_ERR_INVALID_PARAMETER;
@@ -474,7 +467,7 @@ Int GameWindow::winBringToTop( void )
 		TheWindowManager->unlinkWindow( this );
 		TheWindowManager->linkWindow( this );
 
-	}  // end else
+	}
 
 	//
 	// if the window is part of a screen layout, move it to the top
@@ -493,11 +486,11 @@ Int GameWindow::winBringToTop( void )
 		saveLayout->removeWindow( this );
 		saveLayout->addWindow( this );
 
-	}  // end if
+	}
 
 	return WIN_ERR_OK;
 
-}  // end winBringToTop
+}
 
 // GameWindow::winActivate ====================================================
 /** Pop window to top of window list AND activate it */
@@ -517,7 +510,7 @@ Int GameWindow::winActivate( void )
 
 	return WIN_ERR_OK;
 
-}  // end WinActivate
+}
 
 // GameWindow::winSetPosition =================================================
 /** Set the window's position */
@@ -535,14 +528,14 @@ Int GameWindow::winSetPosition( Int x, Int y )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetPosition
+}
 
 // WinGetPosition =============================================================
 /** Get the window's postion */
 //=============================================================================
 Int GameWindow::winGetPosition( Int *x, Int *y )
 {
-	
+
 	// sanity
 	if( x == NULL || y == NULL )
 		return WIN_ERR_INVALID_PARAMETER;
@@ -552,7 +545,7 @@ Int GameWindow::winGetPosition( Int *x, Int *y )
 
 	return WIN_ERR_OK;
 
-}  // end WinGetPosition
+}
 
 // WinSetCursorPosition =============================================================
 /** Set the window's cursor postion */
@@ -564,7 +557,7 @@ Int GameWindow::winSetCursorPosition( Int x, Int y )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetCursorPosition
+}
 
 // WinGetCursorPosition =============================================================
 /** Get the window's cursor postion */
@@ -575,15 +568,15 @@ Int GameWindow::winGetCursorPosition( Int *x, Int *y )
 	{
 		*x = m_cursorX;
 	}
-	
+
 	if ( y )
 	{
 		*y = m_cursorY;
 	}
-	
+
 	return WIN_ERR_OK;
 
-}  // end WinGetPosition
+}
 
 // GameWindow::winGetScreenPosition ===========================================
 /** Get the window's postion in screen coordinates */
@@ -595,18 +588,18 @@ Int GameWindow::winGetScreenPosition( Int *x, Int *y )
 	*x = m_region.lo.x;
 	*y = m_region.lo.y;
 
-	while( parent ) 
+	while( parent )
 	{
 
 		*x += parent->m_region.lo.x;
 		*y += parent->m_region.lo.y;
 		parent = parent->m_parent;
 
-	}  // end while
+	}
 
 	return WIN_ERR_OK;
 
-}  // end WinGetScreenPosition
+}
 
 // GameWindow::winGetRegion ===================================================
 /** Get the window region */
@@ -619,7 +612,7 @@ Int GameWindow::winGetRegion( IRegion2D *region )
 
 	return WIN_ERR_OK;
 
-}  // end winGetRegion
+}
 
 // GameWindow::winPointInWindow ===============================================
 /** Check to see if the given point is inside the window.  Will
@@ -638,7 +631,7 @@ Bool GameWindow::winPointInWindow( Int x, Int y )
 
 	return FALSE;
 
-}  // end WinPointInWindow
+}
 
 // GameWindow::winSetSize =====================================================
 /** Set the window's size */
@@ -651,14 +644,14 @@ Int GameWindow::winSetSize( Int width, Int height )
 	m_region.hi.x = m_region.lo.x + width;
 	m_region.hi.y = m_region.lo.y + height;
 
-	TheWindowManager->winSendSystemMsg( this, 
+	TheWindowManager->winSendSystemMsg( this,
 																			GGM_RESIZED,
-																			(WindowMsgData)width, 
+																			(WindowMsgData)width,
 																			(WindowMsgData)height );
 
 	return WIN_ERR_OK;
 
-}  // end WinSetSize
+}
 
 // GameWindow::winGetSize =====================================================
 /** Get the window's size */
@@ -675,7 +668,7 @@ Int GameWindow::winGetSize( Int *width, Int *height )
 
 	return WIN_ERR_OK;
 
-}  // end WinGetSize
+}
 
 // GameWindow::winEnable ======================================================
 /** Enable or disable a window based on the enable parameter.
@@ -690,17 +683,17 @@ Int GameWindow::winEnable( Bool enable )
 	else
 		BitClear( m_status, WIN_STATUS_ENABLED );
 
-	if( m_child ) 
+	if( m_child )
 	{
 
 		for( child = m_child; child; child = child->m_next)
 			child->winEnable( enable );
 
-	}  // end if
+	}
 
 	return WIN_ERR_OK;
 
-}  // end WinEnable
+}
 
 // GameWindow::winGetEnabled ======================================================
 /** Enable or disable a window based on the enable parameter.
@@ -710,7 +703,7 @@ Bool GameWindow::winGetEnabled( void )
 {
   return BitIsSet( m_status, WIN_STATUS_ENABLED );
 
-}  // end winGetEnabled
+}
 
 // GameWindow::winHide ========================================================
 /** Hide or show a window based on the hide parameter.
@@ -735,17 +728,17 @@ Int GameWindow::winHide( Bool hide )
 		// notify the window manger we are hiding
 		TheWindowManager->windowHiding( this );
 
-	}  // end if
+	}
 	else
 	{
 
 		BitClear( m_status, WIN_STATUS_HIDDEN );
 
-	}  // end else
+	}
 
 	return WIN_ERR_OK;
 
-}  // end WinHide
+}
 
 // GameWindow::winIsHidden ====================================================
 /** Am I hidden? */
@@ -755,7 +748,7 @@ Bool GameWindow::winIsHidden( void )
 
 	return BitIsSet( m_status, WIN_STATUS_HIDDEN );
 
-}  // end WinIsHidden
+}
 
 // GameWindow::winSetStatus ===================================================
 /** Allows the user to directly set a window's status flags. */
@@ -770,7 +763,7 @@ UnsignedInt GameWindow::winSetStatus( UnsignedInt status )
 
 	return oldStatus;
 
-}  // end WinSetStatus
+}
 
 // GameWindow::winClearStatus =================================================
 /** Allows the user to directly clear a window's status flags. */
@@ -784,7 +777,7 @@ UnsignedInt GameWindow::winClearStatus( UnsignedInt status )
 
 	return oldStatus;
 
-}  // end WinClearStatus
+}
 
 // GameWindow::winGetStatus ===================================================
 /** Returns a window's status flags. */
@@ -794,7 +787,7 @@ UnsignedInt GameWindow::winGetStatus( void )
 
 	return m_status;
 
-}  // end WinGetStatus
+}
 
 // GameWindow::winGetStyle ====================================================
 /** Returns a window's style flags. */
@@ -804,7 +797,7 @@ UnsignedInt GameWindow::winGetStyle( void )
 
 	return m_instData.m_style;
 
-}  // end WinGetStyle
+}
 
 // GameWindow::winSetHiliteState ==============================================
 /** Set whether window is highlighted or not */
@@ -817,7 +810,7 @@ void GameWindow::winSetHiliteState( Bool state )
 	else
 		BitClear( m_instData.m_state, WIN_STATE_HILITED );
 
-}  // end WinSetHiliteState
+}
 
 // GameWindow::winSetDrawOffset ===============================================
 /** Set offset for drawing images */
@@ -828,7 +821,7 @@ void GameWindow::winSetDrawOffset( Int x, Int y )
 	m_instData.m_imageOffset.x = x;
 	m_instData.m_imageOffset.y = y;
 
-}  // end WinSetDrawOffset
+}
 
 // GameWindow::winGetDrawOffset ===============================================
 /** Get offset for drawing images */
@@ -843,7 +836,7 @@ void GameWindow::winGetDrawOffset( Int *x, Int *y )
 	*x = m_instData.m_imageOffset.x;
 	*y = m_instData.m_imageOffset.y;
 
-}  // end WinGetDrawOffset
+}
 
 // GameWindow::winSetText =====================================================
 /** Sets the text in a window */
@@ -855,10 +848,10 @@ Int GameWindow::winSetText( UnicodeString newText )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetText
+}
 
 // GameWindow::winGetText =====================================================
-/** Get text from a window ... this works for static text windows and 
+/** Get text from a window ... this works for static text windows and
 	* edit boxes */
 //=============================================================================
 UnicodeString GameWindow::winGetText( void )
@@ -866,7 +859,7 @@ UnicodeString GameWindow::winGetText( void )
 	// return the contents of our text field
 	return m_instData.getText();
 
-}  // end WinGetText
+}
 
 // GameWindow::winGetTextLength =====================================================
 //=============================================================================
@@ -875,7 +868,7 @@ Int GameWindow::winGetTextLength()
 	// return the contents of our text field
 	return m_instData.getTextLength();
 
-}  // end WinGetText
+}
 
 // GameWindow::winGetFont =====================================================
 /** Get the font being used by this window */
@@ -885,7 +878,7 @@ GameFont *GameWindow::winGetFont( void )
 
 	return m_instData.getFont();
 
-}  // end WinGetFont
+}
 
 // GameWindow::winSetFont =====================================================
 /** Set font for text in this window */
@@ -917,9 +910,9 @@ void GameWindow::winSetFont( GameFont *font )
 		if( dString )
 			dString->setFont( font );
 
-	}  // end else
+	}
 
-}  // end WinSetFont
+}
 
 // GameWindow::winSetEnabledTextColors ========================================
 /** Set the text colors for the enabled state */
@@ -928,12 +921,12 @@ void GameWindow::winSetEnabledTextColors( Color color, Color borderColor )
 {
 	m_instData.m_enabledText.color = color;
 	m_instData.m_enabledText.borderColor = borderColor;
-	
+
 	if( BitIsSet( m_instData.getStyle(), GWS_COMBO_BOX ) )
 		GadgetComboBoxSetEnabledTextColors(this,  color, borderColor );
-	
 
-}  // end winSetEnabledTextColors
+
+}
 
 // GameWindow::winSetDisabledTextColors =======================================
 /** Set the text colors for the disabled state */
@@ -947,7 +940,7 @@ void GameWindow::winSetDisabledTextColors( Color color, Color borderColor )
 	if( BitIsSet( m_instData.getStyle(), GWS_COMBO_BOX ) )
 		GadgetComboBoxSetDisabledTextColors( this, color, borderColor );
 
-}  // end winSetDisabledTextColors
+}
 
 // GameWindow::winSetHiliteTextColors =========================================
 /** Set the text colors for the Hilite state */
@@ -961,7 +954,7 @@ void GameWindow::winSetHiliteTextColors( Color color, Color borderColor )
 	if( BitIsSet( m_instData.getStyle(), GWS_COMBO_BOX ) )
 		GadgetComboBoxSetHiliteTextColors( this, color, borderColor );
 
-}  // end winSetHiliteTextColors
+}
 
 // GameWindow::winSetIMECompositeTextColors =========================================
 /** Set the text colors for the IME Composite state */
@@ -974,7 +967,7 @@ void GameWindow::winSetIMECompositeTextColors( Color color, Color borderColor )
 
 	if( BitIsSet( m_instData.getStyle(), GWS_COMBO_BOX ) )
 		GadgetComboBoxSetIMECompositeTextColors( this, color, borderColor );
-}  // end winSetIMECompositeTextColors
+}
 
 // GameWindow::winGetEnabledTextColor =========================================
 /** Get the enabled text color */
@@ -984,7 +977,7 @@ Color GameWindow::winGetEnabledTextColor( void )
 
 	return m_instData.m_enabledText.color;
 
-}  // end winGetEnabledTextColor
+}
 
 // GameWindow::winGetEnabledTextBorderColor ===================================
 /** Get the enabled text color */
@@ -994,7 +987,7 @@ Color GameWindow::winGetEnabledTextBorderColor( void )
 
 	return m_instData.m_enabledText.borderColor;
 
-}  // end winGetEnabledTextBorderColor
+}
 
 // GameWindow::winGetDisabledTextColor ========================================
 /** Get the disabled text color */
@@ -1004,7 +997,7 @@ Color GameWindow::winGetDisabledTextColor( void )
 
 	return m_instData.m_disabledText.color;
 
-}  // end winGetDisabledTextColor
+}
 
 // GameWindow::winGetDisabledTextBorderColor ==================================
 /** Get the disabled text color */
@@ -1014,7 +1007,7 @@ Color GameWindow::winGetDisabledTextBorderColor( void )
 
 	return m_instData.m_disabledText.borderColor;
 
-}  // end winGetEnabledTextBorderColor
+}
 
 // GameWindow::winGetIMECompositeTextColor ==========================================
 /** Get the IME composite text color */
@@ -1024,7 +1017,7 @@ Color GameWindow::winGetIMECompositeTextColor( void )
 
 	return m_instData.m_imeCompositeText.color;
 
-}  // end winGetIMECompositeTextColor
+}
 
 // GameWindow::winGetIMECompositeBorderColor ==========================================
 /** Get the IME composite border color */
@@ -1034,7 +1027,7 @@ Color GameWindow::winGetIMECompositeBorderColor( void )
 
 	return m_instData.m_imeCompositeText.borderColor;
 
-}  // end winGetIMECompositeBorderColor
+}
 
 // GameWindow::winGetHiliteTextColor ==========================================
 /** Get the hilite text color */
@@ -1044,7 +1037,7 @@ Color GameWindow::winGetHiliteTextColor( void )
 
 	return m_instData.m_hiliteText.color;
 
-}  // end winGetHiliteTextColor
+}
 
 // GameWindow::winGetHiliteTextBorderColor ====================================
 /** Get the hilite text color */
@@ -1054,7 +1047,7 @@ Color GameWindow::winGetHiliteTextBorderColor( void )
 
 	return m_instData.m_hiliteText.borderColor;
 
-}  // end winGetHiliteTextBorderColor
+}
 
 // GameWindow::winSetInstanceData =============================================
 /** Sets the window's instance data which includes parameters
@@ -1088,7 +1081,7 @@ Int GameWindow::winSetInstanceData( WinInstanceData *data )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetInstanceData
+}
 
 // GameWindow::winGetInstanceData =============================================
 /** Return pointer to the instance data for this window */
@@ -1098,7 +1091,7 @@ WinInstanceData *GameWindow::winGetInstanceData( void )
 
 	return &m_instData;
 
-}  // end WinGetInstanceData
+}
 
 // GameWindow::winGetUserData =================================================
 /** Return the user data stored */
@@ -1108,7 +1101,7 @@ void *GameWindow::winGetUserData( void )
 
 	return m_userData;
 
-}  // end WinGetUserData
+}
 
 // GameWindow::winSetUserData =================================================
 /** Set the user data stored */
@@ -1118,7 +1111,7 @@ void GameWindow::winSetUserData( void *data )
 
 	m_userData = data;
 
-}  // end WinSetUserData
+}
 
 // GameWindow::winSetTooltip ==================================================
 /** Sets the window's tooltip text */
@@ -1128,7 +1121,7 @@ void GameWindow::winSetTooltip( UnicodeString tip )
 
 	m_instData.setTooltipText( tip );
 
-}  // end WinSetTooltip
+}
 
 // GameWindow::winSetWindowId =================================================
 /** Sets the window's id */
@@ -1140,7 +1133,7 @@ Int GameWindow::winSetWindowId( Int id )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetWindowId
+}
 
 // GameWindow::winGetWindowId =================================================
 /** Gets the window's id */
@@ -1150,7 +1143,7 @@ Int GameWindow::winGetWindowId( void )
 
 	return m_instData.m_id;
 
-}  // end WinGetWindowId
+}
 
 // GameWindow::winSetParent ===================================================
 /** Sets this window's parent */
@@ -1187,7 +1180,7 @@ Int GameWindow::winSetParent( GameWindow *parent )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetParent
+}
 
 // GameWindow::winGetParent ===================================================
 /** Gets the window's parent */
@@ -1197,7 +1190,7 @@ GameWindow *GameWindow::winGetParent( void )
 
 	return m_parent;
 
-}  // end WinGetParent
+}
 
 // GameWindow::winIsChild =====================================================
 /** Determins if a window is a child/grand-child of a parent */
@@ -1214,11 +1207,11 @@ Bool GameWindow::winIsChild( GameWindow *child )
 		// set up tree
 		child = child->m_parent;
 
-	}  // end while
+	}
 
 	return FALSE;
 
-}  // end WinIsChild
+}
 
 // GameWindow::winGetChild ====================================================
 /** Get the child window of this window */
@@ -1228,7 +1221,7 @@ GameWindow *GameWindow::winGetChild( void )
 
 	return m_child;
 
-}  // end WinGetChild
+}
 
 // GameWindow::winSetOwner ====================================================
 /** Sets the window's owner */
@@ -1243,7 +1236,7 @@ Int GameWindow::winSetOwner( GameWindow *owner )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetOwner
+}
 
 // GameWindow::winGetOwner ====================================================
 /** Gets the window's owner */
@@ -1253,7 +1246,7 @@ GameWindow *GameWindow::winGetOwner( void )
 
 	return m_instData.getOwner();
 
-}  // end winGetOwner
+}
 
 // GameWindow::winSetNext =====================================================
 /** Set next pointer */
@@ -1263,7 +1256,7 @@ void GameWindow::winSetNext( GameWindow *next )
 
 	m_next = next;
 
-}  // end winSetNext
+}
 
 // GameWindow::winGetNext =====================================================
 /** Gets the next window */
@@ -1273,7 +1266,7 @@ GameWindow *GameWindow::winGetNext( void )
 
 	return m_next;
 
-}  // end winGetNext
+}
 
 // GameWindow::winSetPrev =====================================================
 /** Set prev pointer */
@@ -1283,7 +1276,7 @@ void GameWindow::winSetPrev( GameWindow *prev )
 
 	m_prev = prev;
 
-}  // end winSetPrev
+}
 
 // GameWindow::winGetPrev =====================================================
 /** Get the previous window */
@@ -1293,7 +1286,7 @@ GameWindow *GameWindow::winGetPrev( void )
 
 	return m_prev;
 
-}  // end winGetPrev
+}
 
 // GameWindow::winSetNextInLayout =============================================
 /** Set next window in layout */
@@ -1355,7 +1348,7 @@ Int GameWindow::winSetSystemFunc( GameWinSystemFunc system )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetSystemFunc
+}
 
 // GameWindow::winSetInputFunc ================================================
 /** Sets the window's input callback functions. */
@@ -1370,7 +1363,7 @@ Int GameWindow::winSetInputFunc( GameWinInputFunc input )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetInputFunc
+}
 
 // GameWindow::winSetDrawFunc =================================================
 /** Sets the window's redraw callback functions. */
@@ -1385,7 +1378,7 @@ Int GameWindow::winSetDrawFunc( GameWinDrawFunc draw )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetDrawFunc
+}
 
 // GameWindow::winSetTooltipFunc ==============================================
 /** Sets a window's tooltip callback */
@@ -1394,10 +1387,10 @@ Int GameWindow::winSetTooltipFunc( GameWinTooltipFunc tooltip )
 {
 
 	m_tooltip = tooltip;
-	
+
 	return WIN_ERR_OK;
 
-}  // end WinSetTooltipFunc
+}
 
 // GameWindow::winSetCallbacks ================================================
 /** Sets the window's input, tooltip, and redraw callback functions. */
@@ -1413,7 +1406,7 @@ Int GameWindow::winSetCallbacks( GameWinInputFunc input,
 
 	return WIN_ERR_OK;
 
-}  // end WinSetCallbacks
+}
 
 // GameWindow::winDrawWindow ==================================================
 /** Draws the default background for the specified window. */
@@ -1426,7 +1419,7 @@ Int GameWindow::winDrawWindow( void )
 
 	return WIN_ERR_OK;
 
-}  // end WinDrawWindow
+}
 
 // GameWindow::winPointInChild ================================================
 /** Given a window and the mouse coordinates, return the child
@@ -1439,20 +1432,20 @@ GameWindow *GameWindow::winPointInChild( Int x, Int y, Bool ignoreEnableCheck, B
 	GameWindow *child;
 	ICoord2D origin;
 
-	for( child = m_child; child; child = child->m_next ) 
+	for( child = m_child; child; child = child->m_next )
 	{
 
 		origin = child->m_region.lo;
 		parent = child->winGetParent();
 
-		while( parent ) 
+		while( parent )
 		{
 
 			origin.x += parent->m_region.lo.x;
 			origin.y += parent->m_region.lo.y;
 			parent = parent->m_parent;
 
-		}  // end while
+		}
 
 		if( x >= origin.x && x <= origin.x + child->m_size.x &&
 				y >= origin.y && y <= origin.y + child->m_size.y )
@@ -1476,12 +1469,12 @@ GameWindow *GameWindow::winPointInChild( Int x, Int y, Bool ignoreEnableCheck, B
 			}
 		}
 
-	}  // end for child
+	}
 
 	// not in any children, must be in parent
 	return this;
 
-}  // end WinPointInChild
+}
 
 // GameWindow::winPointInAnyChild =============================================
 /** Find the child in which the cursor resides; regardless of
@@ -1493,20 +1486,20 @@ GameWindow *GameWindow::winPointInAnyChild( Int x, Int y, Bool ignoreHidden, Boo
 	GameWindow *child;
 	ICoord2D origin;
 
-	for( child = m_child; child; child = child->m_next ) 
+	for( child = m_child; child; child = child->m_next )
 	{
 
 		origin = child->m_region.lo;
 		parent = child->m_parent;
 
-		while( parent ) 
+		while( parent )
 		{
 
 			origin.x += parent->m_region.lo.x;
 			origin.y += parent->m_region.lo.y;
 			parent = parent->m_parent;
 
-		}  // end while
+		}
 
 		if( x >= origin.x && x <= origin.x + child->m_size.x &&
 				y >= origin.y && y <= origin.y + child->m_size.y )
@@ -1515,14 +1508,14 @@ GameWindow *GameWindow::winPointInAnyChild( Int x, Int y, Bool ignoreHidden, Boo
 			if( !(ignoreHidden == TRUE &&	BitIsSet( child->m_status, WIN_STATUS_HIDDEN )) )
 				return child->winPointInChild( x, y, ignoreEnableCheck );
 
-		}  // end if
+		}
 
-	}  // end for child
+	}
 
 	// not in any children, must be in parent
 	return this;
 
-}  // end WinPointInAnyChild
+}
 
 //
 // In release builds the default input and system functions are optimized
@@ -1542,7 +1535,7 @@ WindowMsgHandledType GameWinDefaultInput( GameWindow *window, UnsignedInt msg,
 
 	return MSG_IGNORED;
 
-}  // end GameWinDefaultInput
+}
 
 ///< Input that blocks all (mouse) input like a wall, instead of passing like it wasn't there
 WindowMsgHandledType GameWinBlockInput( GameWindow *window, UnsignedInt msg,
@@ -1550,47 +1543,45 @@ WindowMsgHandledType GameWinBlockInput( GameWindow *window, UnsignedInt msg,
 {
 	if (msg == GWM_CHAR || msg == GWM_MOUSE_POS)
 		return MSG_IGNORED;
-	
-	//Added By Sadullah Nader
-	//Fix for drag selecting in the control bar
+
 	if (msg == GWM_LEFT_UP )//|| msg == GWM_LEFT_DRAG)
 	{
-		//stop drag selecting 
-		
+		//stop drag selecting
+
 		TheSelectionTranslator->setLeftMouseButton(FALSE);
 		TheSelectionTranslator->setDragSelecting(FALSE);
-		
+
 		TheTacticalView->setMouseLock( FALSE );
 		TheInGameUI->setSelecting( FALSE );
 		TheInGameUI->endAreaSelectHint(NULL);
-		
+
 	}
 
 	return MSG_HANDLED;
 
-}  // end GameWinBlockInput
+}
 
 // GameWinDefaultSystem =======================================================
 /** The default system callback.  Currently does nothing. */
 //=============================================================================
-WindowMsgHandledType GameWinDefaultSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType GameWinDefaultSystem( GameWindow *window, UnsignedInt msg,
 													 WindowMsgData mData1, WindowMsgData mData2 )
 {
 
 	return MSG_IGNORED;
 
-}  // end GameWinDefaultSystem
+}
 
 // GameWinDefaultTooltip ======================================================
 /** Default tooltip callback */
 //=============================================================================
-void GameWinDefaultTooltip( GameWindow *window, 
+void GameWinDefaultTooltip( GameWindow *window,
 														WinInstanceData *instData,
 														UnsignedInt mouse )
 {
 	return;
 
-}  // end GameWinDefaultTooltip
+}
 
 // GameWinDefaultDraw =========================================================
 /** Default draw, does nothing */
@@ -1600,7 +1591,7 @@ void GameWinDefaultDraw( GameWindow *window, WinInstanceData *instData )
 
 	return;
 
-}  // end GameWinDefaultDraw
+}
 
 // GameWindow::winSetEnabledImage =============================================
 /** Set an enabled image into the draw data for the enabled state */
@@ -1612,16 +1603,16 @@ Int GameWindow::winSetEnabledImage( Int index, const Image *image )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set enabled image, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set enabled image, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_enabledDrawData[ index ].image = image;
 	return WIN_ERR_OK;
 
-}  // end winSetEnabledImage
+}
 
 // GameWindow::winSetEnabledColor =============================================
 /** set color for enabled state at index */
@@ -1633,16 +1624,16 @@ Int GameWindow::winSetEnabledColor( Int index, Color color )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set enabled color, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set enabled color, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_enabledDrawData[ index ].color = color;
 	return WIN_ERR_OK;
 
-}  // end winSetEnabledColor
+}
 
 // GameWindow::winSetEnabledBorderColor =======================================
 /** set border color for state at this index */
@@ -1654,16 +1645,16 @@ Int GameWindow::winSetEnabledBorderColor( Int index, Color color )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set enabled border color, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set enabled border color, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_enabledDrawData[ index ].borderColor = color;
 	return WIN_ERR_OK;
 
-}  // end winSetEnabledBorderColor
+}
 
 // GameWindow::winSetDisabledImage ============================================
 /** Set an disabled image into the draw data for the disabled state */
@@ -1675,16 +1666,16 @@ Int GameWindow::winSetDisabledImage( Int index, const Image *image )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set disabled image, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set disabled image, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_disabledDrawData[ index ].image = image;
 	return WIN_ERR_OK;
 
-}  // end winSetDisabledImage
+}
 
 // GameWindow::winSetDisabledColor ============================================
 /** set color for disabled state at index */
@@ -1696,16 +1687,16 @@ Int GameWindow::winSetDisabledColor( Int index, Color color )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set disabled color, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set disabled color, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_disabledDrawData[ index ].color = color;
 	return WIN_ERR_OK;
 
-}  // end winSetDisabledColor
+}
 
 // GameWindow::winSetDisabledBorderColor ======================================
 /** set border color for state at this index */
@@ -1717,16 +1708,16 @@ Int GameWindow::winSetDisabledBorderColor( Int index, Color color )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set disabled border color, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set disabled border color, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_disabledDrawData[ index ].borderColor = color;
 	return WIN_ERR_OK;
 
-}  // end winSetDisabledBorderColor
+}
 
 // GameWindow::winSetHiliteImage ==============================================
 /** Set an hilite image into the draw data for the hilite state */
@@ -1738,16 +1729,16 @@ Int GameWindow::winSetHiliteImage( Int index, const Image *image )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set hilite image, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set hilite image, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_hiliteDrawData[ index ].image = image;
 	return WIN_ERR_OK;
 
-}  // end winSetHiliteImage
+}
 
 // GameWindow::winSetHiliteColor ==============================================
 /** set color for hilite state at index */
@@ -1759,16 +1750,16 @@ Int GameWindow::winSetHiliteColor( Int index, Color color )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set hilite color, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set hilite color, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_hiliteDrawData[ index ].color = color;
 	return WIN_ERR_OK;
 
-}  // end winSetHiliteColor
+}
 
 // GameWindow::winSetHiliteBorderColor ========================================
 /** set border color for state at this index */
@@ -1780,16 +1771,16 @@ Int GameWindow::winSetHiliteBorderColor( Int index, Color color )
 	if( index < 0 || index >= MAX_DRAW_DATA )
 	{
 
-		DEBUG_LOG(( "set hilite border color, index out of range '%d'\n", index ));
+		DEBUG_LOG(( "set hilite border color, index out of range '%d'", index ));
 		assert( 0 );
 		return WIN_ERR_INVALID_PARAMETER;
 
-	}  // end if
+	}
 
 	m_instData.m_hiliteDrawData[ index ].borderColor = color;
 	return WIN_ERR_OK;
 
-}  // end winSetHiliteBorderColor
+}
 
 // GameWindow::winGetInputFunc ================================================
 //=============================================================================
@@ -1798,7 +1789,7 @@ GameWinInputFunc GameWindow::winGetInputFunc( void )
 
 	return m_input;
 
-}  // end winGetInputFunc
+}
 
 // GameWindow::winGetSystemFunc ===============================================
 //=============================================================================
@@ -1807,7 +1798,7 @@ GameWinSystemFunc GameWindow::winGetSystemFunc( void )
 
 	return m_system;
 
-}  // end winGetSystemFunc
+}
 
 // GameWindow::winGetTooltipFunc ==============================================
 //=============================================================================
@@ -1816,7 +1807,7 @@ GameWinTooltipFunc GameWindow::winGetTooltipFunc( void )
 
 	return m_tooltip;
 
-}  // end winGetTooltipFunc
+}
 
 // GameWindow::winGetDrawFunc =================================================
 //=============================================================================
@@ -1825,7 +1816,7 @@ GameWinDrawFunc GameWindow::winGetDrawFunc( void )
 
 	return m_draw;
 
-}  // end winGetDrawFunc
+}
 
 // GameWindow::winSetEditData =================================================
 //=============================================================================
@@ -1834,7 +1825,7 @@ void GameWindow::winSetEditData( GameWindowEditData *editData )
 
 	m_editData = editData;
 
-}  // end winSetEditData
+}
 
 // GameWindow::winGetEditData =================================================
 //=============================================================================
@@ -1843,4 +1834,4 @@ GameWindowEditData *GameWindow::winGetEditData( void )
 
 	return m_editData;
 
-}  // end winGetEditData
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp
index 90e4bff134e..d0fb42146af 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowGlobal.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -45,10 +45,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
-#include "Common/Language.h"
 #include "GameClient/Image.h"
 #include "GameClient/Display.h"
 #include "GameClient/GameWindowManager.h"
@@ -71,36 +70,36 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // GameWindowManager::winDrawImage ============================================
-/** draw image, coord are in screen and should be kepth within 
+/** draw image, coord are in screen and should be kepth within
 	* that box specified */
 //=============================================================================
-void GameWindowManager::winDrawImage( const Image *image, Int startX, Int startY, 
+void GameWindowManager::winDrawImage( const Image *image, Int startX, Int startY,
 																			Int endX, Int endY, Color color )
 {
 
 	TheDisplay->drawImage( image, startX, startY, endX, endY, color );
 
-}  // end WinDrawImage
+}
 
 // GameWindowManager::winFillRect =============================================
 /** draw filled rect, coords are absolute screen coords */
 //=============================================================================
-void GameWindowManager::winFillRect( Color color, Real width, 
-																		 Int startX, Int startY, 
+void GameWindowManager::winFillRect( Color color, Real width,
+																		 Int startX, Int startY,
 																		 Int endX, Int endY )
 {
 
-	TheDisplay->drawFillRect( startX, startY, 
-														endX - startX, endY - startY, 
+	TheDisplay->drawFillRect( startX, startY,
+														endX - startX, endY - startY,
 														color );
 
-}  // end WinFillRect
+}
 
 // GameWindowManager::winOpenRect =============================================
 /** draw rect outline, coords are absolute screen coords */
 //=============================================================================
-void GameWindowManager::winOpenRect( Color color, Real width, 
-																		 Int startX, Int startY, 
+void GameWindowManager::winOpenRect( Color color, Real width,
+																		 Int startX, Int startY,
 																		 Int endX, Int endY )
 {
 
@@ -108,49 +107,49 @@ void GameWindowManager::winOpenRect( Color color, Real width,
 														endX - startX, endY - startY,
 														width, color );
 
-}  // end WinOpenRect
+}
 
 // GameWindowManager::winDrawLine =============================================
 /** draw line, coords are absolute screen coords */
 //=============================================================================
-void GameWindowManager::winDrawLine( Color color, Real width, 
-																		 Int startX, Int startY, 
+void GameWindowManager::winDrawLine( Color color, Real width,
+																		 Int startX, Int startY,
 																		 Int endX, Int endY )
 {
 
 	TheDisplay->drawLine( startX, startY, endX, endY, width, color );
 
-}  // end WinDrawLine
+}
 
 // GameWindowManager::winFindImage ============================================
 /** Given an image name, return an image loc to that image information.
-	* You may reorganize the image loc structure however you like to suit 
+	* You may reorganize the image loc structure however you like to suit
 	* your individual project */
 //=============================================================================
-const Image *GameWindowManager::winFindImage( const char *name ) 
-{ 
+const Image *GameWindowManager::winFindImage( const char *name )
+{
 
 	assert( TheMappedImageCollection );
 	if( TheMappedImageCollection )
-		return TheMappedImageCollection->findImageByName( AsciiString( name ) );
+		return TheMappedImageCollection->findImageByName( name );
 
 	return NULL;
 
-}  // end WinFindImage
+}
 
 // GameWindowManager::winMakeColor ============================================
 /** Given RGBA, make a color, you can change color representation for your
 	* individual project needs */
 //=============================================================================
-Color GameWindowManager::winMakeColor( UnsignedByte red, 
-																			 UnsignedByte green, 
-																			 UnsignedByte blue, 
-																			 UnsignedByte alpha ) 
-{ 
+Color GameWindowManager::winMakeColor( UnsignedByte red,
+																			 UnsignedByte green,
+																			 UnsignedByte blue,
+																			 UnsignedByte alpha )
+{
 
 	return GameMakeColor( red, green, blue, alpha );
 
-}  // end WinMakeColor
+}
 
 // GameWindowManager::winFormatText ===========================================
 /** draw text to the screen */
@@ -161,12 +160,12 @@ void GameWindowManager::winFormatText( GameFont *font, UnicodeString text, Color
 
 	/// @todo make all display string rendering go through here!
 
-}  // end WinFormatText
+}
 
 // GameWindowManager::winGetTextSize ==========================================
 /** get the extent size of text */
 //=============================================================================
-void GameWindowManager::winGetTextSize( GameFont *font, UnicodeString text, 
+void GameWindowManager::winGetTextSize( GameFont *font, UnicodeString text,
 																				Int *width, Int *height, Int maxWidth )
 {
 
@@ -178,17 +177,20 @@ void GameWindowManager::winGetTextSize( GameFont *font, UnicodeString text,
 	if( height )
 		*height = 0;
 
-}  // end WinGetTextSize
+}
 
 // GameWindowManager::winFontHeight ===========================================
 /** Return the font height in pixels */
 //=============================================================================
 Int GameWindowManager::winFontHeight( GameFont *font )
 {
-	
+
+	if (font == NULL)
+		return 0;
+
 	return font->height;
 
-}  // end WinFontHeight
+}
 
 // GameWindowManager::winIsDigit ==============================================
 /** You implementation of whether or not character is a digit */
@@ -196,9 +198,9 @@ Int GameWindowManager::winFontHeight( GameFont *font )
 Int GameWindowManager::winIsDigit( Int c )
 {
 
-	return GameIsDigit( c );
+	return iswdigit( c );
 
-}  // end WinIsDigit
+}
 
 // GameWindowManager::winIsAscii ==============================================
 /** You implementation of whether or not character is ascii */
@@ -206,9 +208,9 @@ Int GameWindowManager::winIsDigit( Int c )
 Int GameWindowManager::winIsAscii( Int c )
 {
 
-	return GameIsAscii( c );
+	return iswascii( c );
 
-}  // end WinIsDigit
+}
 
 // GameWindowManager::winIsAlNum ==============================================
 /** Your implementation of whether or not character is alpha numeric */
@@ -216,15 +218,15 @@ Int GameWindowManager::winIsAscii( Int c )
 Int GameWindowManager::winIsAlNum( Int c )
 {
 
-	return GameIsAlNum( c );
+	return iswalnum( c );
 
-}  // end WinIsAlNum
+}
 
 // GameWindowManager::winFindFont =============================================
 /** Get a font */
 //=============================================================================
-GameFont *GameWindowManager::winFindFont( AsciiString fontName, 
-																					Int pointSize, 
+GameFont *GameWindowManager::winFindFont( AsciiString fontName,
+																					Int pointSize,
 																					Bool bold )
 {
 
@@ -234,5 +236,5 @@ GameFont *GameWindowManager::winFindFont( AsciiString fontName,
 
 	return NULL;
 
-}  // end WinFindFont
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
index 2f77bb0e46a..bbe4bb38b91 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
@@ -29,7 +29,7 @@
 //						with to interact with the game windowing system.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Debug.h"
 #include "Common/Language.h"
@@ -61,11 +61,6 @@ UnsignedInt WindowLayoutCurrentVersion = 2;
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //
 // with this statis set to true, the window system will propogate mouse position
@@ -120,13 +115,14 @@ void GameWindowManager::processDestroyList( void )
 		// send the destroy message to the window we're about to kill
 		winSendSystemMsg( doDestroy, GWM_DESTROY, 0, 0 );
 
+		DEBUG_ASSERTCRASH(doDestroy->winGetUserData() == NULL, ("Win user data is expected to be deleted now"));
+
 		// free the memory
-		if (doDestroy)
-			deleteInstance(doDestroy);
+		deleteInstance(doDestroy);
 
-	}  // end for
+	}
 
-}  // end processDestroyList
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -150,11 +146,11 @@ WindowMsgHandledType PassSelectedButtonsToParentSystem( GameWindow *window, Unsi
 		if( parent )
 			return TheWindowManager->winSendSystemMsg( parent, msg, mData1, mData2 );
 
-	}  // end if
-	
+	}
+
 	return MSG_IGNORED;
 
-}  // end PassSelectedButtonsToParentSystem
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Generic function to simply propagate only button press messages to parent and let it deal with it */
@@ -172,10 +168,10 @@ WindowMsgHandledType PassMessagesToParentSystem( GameWindow *window, UnsignedInt
 
 	if( parent )
 		return TheWindowManager->winSendSystemMsg( parent, msg, mData1, mData2 );
-	
+
 	return MSG_IGNORED;
 
-}  // end PassSelectedButtonsToParentSystem
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -198,7 +194,7 @@ GameWindowManager::GameWindowManager( void )
 	m_cursorBitmap = NULL;
 	m_captureFlags = 0;
 
-}  // end GameWindowManger
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -208,10 +204,10 @@ GameWindowManager::~GameWindowManager( void )
 	// destroy all windows
 	winDestroyAll();
 	freeStaticStrings();
-	if(TheTransitionHandler)
-		delete TheTransitionHandler;
+
+	delete TheTransitionHandler;
 	TheTransitionHandler = NULL;
-}  // end ~GameWindowManager
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the game window manager system */
@@ -222,7 +218,7 @@ void GameWindowManager::init( void )
 		TheTransitionHandler = NEW GameWindowTransitionsHandler;
 	TheTransitionHandler->load();
 	TheTransitionHandler->init();
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset window system */
@@ -235,7 +231,7 @@ void GameWindowManager::reset( void )
 	if(TheTransitionHandler)
 		TheTransitionHandler->reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update cycle for game widnow manager */
@@ -247,7 +243,7 @@ void GameWindowManager::update( void )
 	processDestroyList();
 	if(TheTransitionHandler)
 		TheTransitionHandler->update();
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Puts a window at the head of the window list */
@@ -279,7 +275,7 @@ void GameWindowManager::linkWindow( GameWindow *window )
 
 		if( m_windowList )
 			m_windowList->m_prev = window;
-		else 
+		else
 		{
 			// first on list is also the tail
 			m_windowTail = window;
@@ -299,29 +295,29 @@ void GameWindowManager::linkWindow( GameWindow *window )
 		}
 	}
 
-}  // end linkWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Insert the window ahead of the the 'aheadOf' window.  'aheadOf' can
 	* be a window in the master list or a child of any window in that master
 	* list */
 //-------------------------------------------------------------------------------------------------
-void GameWindowManager::insertWindowAheadOf( GameWindow *window, 
+void GameWindowManager::insertWindowAheadOf( GameWindow *window,
 																						 GameWindow *aheadOf )
 {
-	
+
 	// sanity
 	if( window == NULL )
 		return;
 
 	// we'll say that an aheadOf window means at the head of the list
-	if( aheadOf == NULL )	
+	if( aheadOf == NULL )
 	{
 
 		linkWindow( window );
 		return;
 
-	}  // end if
+	}
 
 	// get parent of aheadOf
 	GameWindow *aheadOfParent = aheadOf->winGetParent();
@@ -343,7 +339,7 @@ void GameWindowManager::insertWindowAheadOf( GameWindow *window,
 		aheadOf->m_prev = window;
 		window->m_next = aheadOf;
 
-	}  // end if
+	}
 	else
 	{
 
@@ -359,9 +355,9 @@ void GameWindowManager::insertWindowAheadOf( GameWindow *window,
 
 		window->m_parent = aheadOfParent;
 
-	}  // end else
+	}
 
-}  // end insertWindowAheadOf
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Takes a window off the window list */
@@ -371,7 +367,7 @@ void GameWindowManager::unlinkWindow( GameWindow *window )
 
 	if( window->m_next )
 		window->m_next->m_prev = window->m_prev;
-	else 
+	else
 	{
 		// no next means this is the tail
 		m_windowTail = window->m_prev;
@@ -382,7 +378,7 @@ void GameWindowManager::unlinkWindow( GameWindow *window )
 	else
 		m_windowList = window->m_next;
 
-}  // end unlinkWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Takes a child window off its parent's window list */
@@ -390,7 +386,7 @@ void GameWindowManager::unlinkWindow( GameWindow *window )
 void GameWindowManager::unlinkChildWindow( GameWindow *window )
 {
 
-	if( window->m_prev ) 
+	if( window->m_prev )
 	{
 
 		window->m_prev->m_next = window->m_next;
@@ -398,11 +394,11 @@ void GameWindowManager::unlinkChildWindow( GameWindow *window )
 		if( window->m_next )
 			window->m_next->m_prev = window->m_prev;
 
-	} 
-	else 
+	}
+	else
 	{
 
-		if( window->m_next ) 
+		if( window->m_next )
 		{
 
 			window->m_parent->m_child = window->m_next;
@@ -411,20 +407,20 @@ void GameWindowManager::unlinkChildWindow( GameWindow *window )
 
 			window->m_next = NULL;
 
-		} 
-		else 
+		}
+		else
 		{
 
 			window->m_parent->m_child = NULL;
 
 		}
 
-	}  // end else
+	}
 
 	// remove the parent reference from this window
 	window->m_parent = NULL;
 
-}  // end unlinkChildWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Check window and parents to see if this window is enabled */
@@ -435,7 +431,7 @@ Bool GameWindowManager::isEnabled( GameWindow *win )
 	// sanity
 	if( win == NULL )
 		return FALSE;
-	
+
 	if( BitIsSet( win->m_status, WIN_STATUS_ENABLED ) == FALSE )
 	{
 		return FALSE;
@@ -452,7 +448,7 @@ Bool GameWindowManager::isEnabled( GameWindow *win )
 
 	return TRUE;
 
-}  // end isEnabled
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Check window and parents to see if this window is hidden */
@@ -463,7 +459,7 @@ Bool GameWindowManager::isHidden( GameWindow *win )
 	// we'll allow for the idea that if a window doesn't exist it is hidden
 	if( win == NULL )
 		return TRUE;
-	
+
 	if( BitIsSet( win->m_status, WIN_STATUS_HIDDEN ))
 	{
 		return TRUE;
@@ -480,15 +476,15 @@ Bool GameWindowManager::isHidden( GameWindow *win )
 
 	return FALSE;
 
-}  // end isHidden
+}
 
 //-------------------------------------------------------------------------------------------------
 // Adds a child window to its parent.
 //-------------------------------------------------------------------------------------------------
-void GameWindowManager::addWindowToParent( GameWindow *window, 
+void GameWindowManager::addWindowToParent( GameWindow *window,
 																					 GameWindow *parent )
 {
-	if( parent ) 
+	if( parent )
 	{
 
 		// add to parent's list of children
@@ -504,13 +500,13 @@ void GameWindowManager::addWindowToParent( GameWindow *window,
 
 	}
 
-}  // end addWindowToParent
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Add a child window to the parent, put place it at the end of the 
+/** Add a child window to the parent, put place it at the end of the
 	* parent window child list */
 //-------------------------------------------------------------------------------------------------
-void GameWindowManager::addWindowToParentAtEnd( GameWindow *window,	
+void GameWindowManager::addWindowToParentAtEnd( GameWindow *window,
 																								GameWindow *parent )
 {
 
@@ -532,16 +528,16 @@ void GameWindowManager::addWindowToParentAtEnd( GameWindow *window,
 			last->m_next = window;
 			window->m_prev = last;
 
-		}  // end if
+		}
 		else
 			parent->m_child = window;
 
 		// assign the parent to the window
 		window->m_parent = parent;
 
-	}  // end if
+	}
 
-}  // end addWindowToParentAtEnd
+}
 
 //-------------------------------------------------------------------------------------------------
 /** this gets called from winHide() when a window hides itself */
@@ -570,49 +566,49 @@ void GameWindowManager::windowHiding( GameWindow *window )
 	for( child = window->winGetChild(); child; child = child->winGetNext() )
 		windowHiding( child );
 
-}  // end windowHiding
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Hide all windows in a certain range of id's (inclusive) */
 //-------------------------------------------------------------------------------------------------
-void GameWindowManager::hideWindowsInRange( GameWindow *baseWindow, 
-																						Int first, Int last, 
+void GameWindowManager::hideWindowsInRange( GameWindow *baseWindow,
+																						Int first, Int last,
 																						Bool hideFlag )
 {
 	Int i;
 	GameWindow *window;
 
-	for( i = first; i <= last; i++ ) 
+	for( i = first; i <= last; i++ )
 	{
 
 		window = winGetWindowFromId( baseWindow, i );
 		if( window )
 			window->winHide( hideFlag );
 
-	}  // end for i
+	}
 
-}  // end hideWindowsInRange
+}
 
 //-------------------------------------------------------------------------------------------------
 // Enable all windows in a certain range of id's (inclusive)
 //-------------------------------------------------------------------------------------------------
-void GameWindowManager::enableWindowsInRange( GameWindow *baseWindow, 
-																							Int first, Int last, 
+void GameWindowManager::enableWindowsInRange( GameWindow *baseWindow,
+																							Int first, Int last,
 																							Bool enableFlag )
 {
 	Int i;
 	GameWindow *window;
 
-	for( i =first; i <= last; i++ ) 
+	for( i =first; i <= last; i++ )
 	{
 
 		window = winGetWindowFromId( baseWindow, i );
 		if( window )
 			window->winEnable( enableFlag );
 
-	}  // end for i
+	}
 
-}  // end enableWindowsInRange
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Captures the mouse capture. */
@@ -627,7 +623,7 @@ Int GameWindowManager::winCapture( GameWindow *window )
 
 	return WIN_ERR_OK;
 
-}  // end WinCapture
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Releases the mouse capture. */
@@ -640,7 +636,7 @@ Int GameWindowManager::winRelease( GameWindow *window )
 
 	return WIN_ERR_OK;
 
-}  // end WinRelease
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Returns the current mouse captor. */
@@ -650,7 +646,7 @@ GameWindow *GameWindowManager::winGetCapture( void )
 
 	return m_mouseCaptor;
 
-}  // end WinGetCapture
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Gets the window pointer from its id */
@@ -661,25 +657,25 @@ GameWindow *GameWindowManager::winGetWindowFromId( GameWindow *window, Int id )
 	if( window == NULL )
 		window = m_windowList;
 
-	for( ; window; window = window->m_next ) 
+	for( ; window; window = window->m_next )
 	{
 
 		if( window->winGetWindowId() == id)
 			return window;
-		else if( window->m_child ) 
+		else if( window->m_child )
 		{
 			GameWindow *child = winGetWindowFromId( window->m_child, id );
 
 			if( child )
 				return child;
 
-		}  // end else if
+		}
 
-	}  // end for
+	}
 
 	return NULL;
 
-}  // end WinGetWindowFromId
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Gets the Window List Pointer */
@@ -689,14 +685,14 @@ GameWindow *GameWindowManager::winGetWindowList( void )
 
 	return m_windowList;
 
-}  // end winGetWindowList
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Send a system message to the specified window */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType GameWindowManager::winSendSystemMsg( GameWindow *window, 
+WindowMsgHandledType GameWindowManager::winSendSystemMsg( GameWindow *window,
 																					UnsignedInt msg,
-																					WindowMsgData mData1, 
+																					WindowMsgData mData1,
 																					WindowMsgData mData2 )
 {
 
@@ -708,14 +704,14 @@ WindowMsgHandledType GameWindowManager::winSendSystemMsg( GameWindow *window,
 
 	return window->m_system( window, msg, mData1, mData2 );
 
-}  // end winSendSystemMsg
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Send a system message to the specified window */
 //-------------------------------------------------------------------------------------------------
-WindowMsgHandledType GameWindowManager::winSendInputMsg( GameWindow *window, 
+WindowMsgHandledType GameWindowManager::winSendInputMsg( GameWindow *window,
 																				 UnsignedInt msg,
-																				 WindowMsgData mData1, 
+																				 WindowMsgData mData1,
 																				 WindowMsgData mData2 )
 {
 
@@ -727,7 +723,7 @@ WindowMsgHandledType GameWindowManager::winSendInputMsg( GameWindow *window,
 
 	return window->m_input( window, msg, mData1, mData2 );
 
-}  // end winSendInputMsg
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the current input focus */
@@ -737,7 +733,7 @@ GameWindow *GameWindowManager::winGetFocus( void )
 
 	return m_keyboardFocus;
 
-}  // end WinGetFocus
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the current input focus */
@@ -765,7 +761,7 @@ Int GameWindowManager::winSetFocus( GameWindow *window )
 	m_keyboardFocus = window;
 
 	// Tell new focus window that it has focus
-	if( m_keyboardFocus ) 
+	if( m_keyboardFocus )
 	{
 
 		for (;;)
@@ -779,7 +775,7 @@ Int GameWindowManager::winSetFocus( GameWindow *window )
 				break;
 		}
 
-	}  // end if
+	}
 
 	// If new window doesn't want focus, set focus to NULL
 	if( wantsFocus == FALSE )
@@ -787,12 +783,12 @@ Int GameWindowManager::winSetFocus( GameWindow *window )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetFocus
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Process key press through the GUI. */
 //-------------------------------------------------------------------------------------------------
-WinInputReturnCode GameWindowManager::winProcessKey( UnsignedByte key, 
+WinInputReturnCode GameWindowManager::winProcessKey( UnsignedByte key,
 																										 UnsignedByte state )
 {
 	WinInputReturnCode returnCode = WIN_INPUT_NOT_USED;
@@ -801,7 +797,7 @@ WinInputReturnCode GameWindowManager::winProcessKey( UnsignedByte key,
 	if( m_keyboardFocus && (key != KEY_NONE) )
 	{
 		GameWindow *win = m_keyboardFocus;
-			
+
 		returnCode = WIN_INPUT_USED;  // assume input will be used
 
 		//
@@ -818,15 +814,15 @@ WinInputReturnCode GameWindowManager::winProcessKey( UnsignedByte key,
 				returnCode = WIN_INPUT_NOT_USED;  // oops, it wasn't used after all
 				break;
 
-			}  // end if
+			}
 
-		}  // end while
+		}
 
-	}  // end if
+	}
 
 	return returnCode;
 
-}  // end winProcessKey
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Process a single mouse event through the window system */
@@ -840,7 +836,6 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 	UnsignedInt packedMouseCoords;
 	GameWindow *window = NULL;
 	GameWindow *toolTipWindow = NULL;
-	GameWindow *childWindow;
 	Int dx, dy;
 	Bool clearGrabWindow = FALSE;
 
@@ -888,9 +883,9 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 
 					win = win->winGetParent();
 
-				}  // end while
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -898,11 +893,11 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 				if(	winSendInputMsg( m_mouseCaptor, msg, packedMouseCoords, 0 ) == MSG_HANDLED )
 					returnCode = WIN_INPUT_USED;
 
-			}  // end else
+			}
 
-		}  // end if
+		}
 
-	}  // end if, mouse captor window present
+	}
 	else
 	{
 
@@ -930,7 +925,7 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 					clearGrabWindow = TRUE;
 					break;
 
-				}  // end left up
+				}
 
 				// --------------------------------------------------------------------
 				case MOUSE_EVENT_NONE:
@@ -973,33 +968,33 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 							newRegion.lo.x = 0;
 						if( newRegion.lo.y < 0 )
 							newRegion.lo.y = 0;
-						
+
 						newRegion.hi.x = newRegion.lo.x + grabSize.x;
 						newRegion.hi.y = newRegion.lo.y + grabSize.y;
 						if( newRegion.hi.x > (Int)TheDisplay->getWidth() )
 							newRegion.hi.x = (Int)TheDisplay->getWidth();
 						if( newRegion.hi.y > (Int)TheDisplay->getHeight() )
 							newRegion.hi.y = (Int)TheDisplay->getHeight();
-						
+
 						newRegion.lo.x = newRegion.hi.x - grabSize.x;
 						newRegion.lo.y = newRegion.hi.y - grabSize.y;
 
 						m_grabWindow->winSetPosition( newRegion.lo.x, newRegion.lo.y );
 
-					}  // end if, draggable window
+					}
 
 					// Send mouse drag message
 					winSendInputMsg( m_grabWindow, msg, packedMouseCoords, 0 );
 					break;
 
-				}  // end mouse event none or left drag
+				}
 
-			}  // end switch
+			}
 
 			// mark event handled
 			returnCode = WIN_INPUT_USED;
 
-		}  // end if, m_grabWindow
+		}
 		else
 		{
 
@@ -1009,112 +1004,17 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 			}
 			else
 			{
-			
-				/**@todo Colin, there are 3 cases here that are nearly identical code,
-				break them up into functions with parameters */
-
 				// search for top-level window which contains pointer
-				for( window = m_windowList; window; window = window->m_next )
-				{
-
-					if( BitIsSet( window->m_status, WIN_STATUS_ABOVE ) &&
-							!BitIsSet( window->m_status, WIN_STATUS_HIDDEN ) &&
-							mousePos->x >= window->m_region.lo.x &&
-							mousePos->x <= window->m_region.hi.x &&
-							mousePos->y >= window->m_region.lo.y &&
-							mousePos->y <= window->m_region.hi.y)
-					{
-
-						childWindow = window->winPointInAnyChild( mousePos->x, mousePos->y, TRUE, TRUE );
-						if( toolTipWindow == NULL )
-						{
-							if( childWindow->m_tooltip || 
-									childWindow->m_instData.getTooltipTextLength() )
-							{
-								toolTipWindow = childWindow;
-							}
-						}
-						if( BitIsSet( window->m_status, WIN_STATUS_ENABLED ) )
-						{
-							// determine which child window the mouse is in
-							window = window->winPointInChild( mousePos->x, mousePos->y );
-							break;  // exit for
-						}
-						
-					}  // end if
-
-				}  // end for window
+				window = findWindowUnderMouse(toolTipWindow, mousePos, WIN_STATUS_ABOVE, WIN_STATUS_HIDDEN);
 
 				// check !above, below and hidden
 				if( window == NULL )
-				{
-
-					for( window = m_windowList; window; window = window->m_next )
-					{
-
-						if( !BitIsSet( window->m_status, WIN_STATUS_ABOVE | 
-																						WIN_STATUS_BELOW | 
-																						WIN_STATUS_HIDDEN ) &&
-								mousePos->x >= window->m_region.lo.x &&
-								mousePos->x <= window->m_region.hi.x &&
-								mousePos->y >= window->m_region.lo.y &&
-								mousePos->y <= window->m_region.hi.y)
-						{
-
-							childWindow = window->winPointInAnyChild( mousePos->x, mousePos->y, TRUE, TRUE );
-							if( toolTipWindow == NULL )
-							{
-								if( childWindow->m_tooltip || 
-										childWindow->m_instData.getTooltipTextLength() )
-								{
-									toolTipWindow = childWindow;
-								}
-							}
-							if( BitIsSet( window->m_status, WIN_STATUS_ENABLED ))
-							{								
-								// determine which child window the mouse is in
-								window = window->winPointInChild( mousePos->x, mousePos->y );
-								break;  // exit for
-							}
-						}
-					}
-				}  // end if, window == NULL
+					window = findWindowUnderMouse(toolTipWindow, mousePos, WIN_STATUS_NONE, WIN_STATUS_ABOVE | WIN_STATUS_BELOW | WIN_STATUS_HIDDEN);
 
 				// check below and !hidden
 				if( window == NULL )
-				{
-
-					for( window = m_windowList; window; window = window->m_next )
-					{
-
-						if( BitIsSet( window->m_status, WIN_STATUS_BELOW ) &&
-								!BitIsSet( window->m_status, WIN_STATUS_HIDDEN ) &&
-								mousePos->x >= window->m_region.lo.x &&
-								mousePos->x <= window->m_region.hi.x &&
-								mousePos->y >= window->m_region.lo.y &&
-								mousePos->y <= window->m_region.hi.y)
-						{
-
-							childWindow = window->winPointInAnyChild( mousePos->x, mousePos->y, TRUE, TRUE );
-							if( toolTipWindow == NULL )
-							{
-								if( childWindow->m_tooltip || 
-										childWindow->m_instData.getTooltipTextLength() )
-								{
-									toolTipWindow = childWindow;
-								}
-							}
-							if( BitIsSet( window->m_status, WIN_STATUS_ENABLED ))
-							{
-								// determine which child window the mouse is in
-								window = window->winPointInChild( mousePos->x, mousePos->y );
-								break;  // exit for
-							}
-						}
-					}
-				}  // end if
-
-			}  // end else, no modal head
+					window = findWindowUnderMouse(toolTipWindow, mousePos, WIN_STATUS_BELOW, WIN_STATUS_HIDDEN);
+			}
 
 			if( window )
 				if( BitIsSet( window->m_status, WIN_STATUS_NO_INPUT ) )
@@ -1137,7 +1037,7 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 				{
 
 					tempWin = window;
-	
+
 					// Give everyone a chance to do something with the clicks
 					GameWindow *oldLoneWindow = m_loneWindow;
 					while( winSendInputMsg( tempWin, msg, packedMouseCoords, 0 ) == MSG_IGNORED )
@@ -1147,11 +1047,11 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 						if( tempWin == NULL )
 							break;
 
-					}  // end while
+					}
+
 
-						
 					// First check to see if m_loneWindow is set if so, close the window
-					if( m_loneWindow && m_loneWindow == oldLoneWindow 
+					if( m_loneWindow && m_loneWindow == oldLoneWindow
 					&&( msg == GWM_LEFT_UP || msg == GWM_MIDDLE_UP || msg == GWM_RIGHT_UP || tempWin))
 					{
 						if(!m_loneWindow->winIsChild(tempWin))
@@ -1167,11 +1067,11 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 																cData->listboxData->slider != tempWin &&
 																cData->listboxData->slider != tempWin->winGetParent())
 																	winSetOpenComboBoxWindow( NULL );*/
-								
+
 					}
 					if( tempWin )
 					{
-					
+
 						//
 						// Someone cares, if this is a left button down event
 						// it should get "grabbed"
@@ -1180,20 +1080,20 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 						if( msg == GWM_LEFT_DOWN )
 						{
 
-//						if( tempWin != windowList ) 
+//						if( tempWin != windowList )
 //							WinActivate( tempWin );
 							m_grabWindow = tempWin;
 
-						}  // end if
+						}
 
 						// event is used
 						returnCode = WIN_INPUT_USED;
 
-					}  // end if, tempWin
+					}
 
-				}  // end if
+				}
 
-			}  // end if( window ) 
+			}
 
 			if( toolTipWindow == NULL )
 			{
@@ -1201,7 +1101,7 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 				if( isHidden( window ) == FALSE )
 					toolTipWindow = window;
 
-			}  // end if
+			}
 
 			// if tooltips are on set them into the window
 			Bool tooltipsOn = TRUE;
@@ -1213,34 +1113,34 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 				{
 					// do we have a callback to call for the tooltip
 					if( toolTipWindow->m_tooltip )
-						toolTipWindow->m_tooltip( toolTipWindow, 
-																			&toolTipWindow->m_instData, 
+						toolTipWindow->m_tooltip( toolTipWindow,
+																			&toolTipWindow->m_instData,
 																			packedMouseCoords );
 
 					// else, do we have a normal tooltip to set
 					else if( toolTipWindow->m_instData.getTooltipTextLength() )
 						TheMouse->setCursorTooltip( toolTipWindow->m_instData.getTooltipText(), toolTipWindow->m_instData.m_tooltipDelay );
 
-				}  // end if
+				}
 				else
 				{
 
 					//
 					// not pointing at a window... perhaps we are pointing at a valid
-					// tooltip-able object in the game world ... let's set a flag so 
+					// tooltip-able object in the game world ... let's set a flag so
 					// during the object testing we can set the tooltip, we can do
 					// whatever we like now that we know no other tooltip was set from
 					// a window
 					//
 					objectTooltip = TRUE;
 
-				}  // end else
+				}
 
-			}  // end if
+			}
 
-		}  // end if grabWindow not present
+		}
 
-	}  // end else (mouseCaptor) 
+	}
 
 	//
 	// check if new current window is different from the last
@@ -1261,7 +1161,7 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 
 		m_currMouseRgn = window;
 
-	}  // end if
+	}
 
 	// clear grabWindow if necessary
 	if( clearGrabWindow == TRUE )
@@ -1270,17 +1170,52 @@ WinInputReturnCode GameWindowManager::winProcessMouseEvent( GameWindowMessage ms
 		m_grabWindow = NULL;
 		clearGrabWindow = FALSE;
 
-	}  // end if
+	}
 
 	return returnCode;
 
-}  // end winProcessMouseEvent
+}
+
+bool GameWindowManager::isMouseWithinWindow(GameWindow* window, const ICoord2D* mousePos, unsigned int requiredStatusMask, unsigned int forbiddenStatusMask)
+{
+	return ((BitIsSet(window->m_status, requiredStatusMask) || requiredStatusMask == 0) &&
+		!BitIsSet(window->m_status, forbiddenStatusMask) &&
+		mousePos->x >= window->m_region.lo.x &&
+		mousePos->x <= window->m_region.hi.x &&
+		mousePos->y >= window->m_region.lo.y &&
+		mousePos->y <= window->m_region.hi.y);
+}
+
+GameWindow* GameWindowManager::findWindowUnderMouse(GameWindow*& toolTipWindow, const ICoord2D* mousePos, unsigned int requiredStatusMask, unsigned int forbiddenStatusMask)
+{
+	for (GameWindow* window = m_windowList; window; window = window->m_next)
+	{
+		if (!isMouseWithinWindow(window, mousePos, requiredStatusMask, forbiddenStatusMask))
+			continue;
+
+		if (toolTipWindow == NULL)
+		{
+			GameWindow* childWindow = window->winPointInAnyChild(mousePos->x, mousePos->y, TRUE, TRUE);
+
+			if (childWindow->m_tooltip || childWindow->m_instData.getTooltipTextLength())
+				toolTipWindow = childWindow;
+		}
+
+		if (BitIsSet(window->m_status, WIN_STATUS_ENABLED))
+		{
+			// determine which child window the mouse is in
+			return window->winPointInChild(mousePos->x, mousePos->y);
+		}
+	}
+
+	return NULL;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw a window and its children, in parent-first order.
 	* Children's coordinates are relative to their parents.
 	* Note that hidden windows automatically will not draw any
-	* of their children ... but see-thru windows only will not 
+	* of their children ... but see-thru windows only will not
 	* draw themselves, but will give their children an
 	* opportunity to draw */
 //-------------------------------------------------------------------------------------------------
@@ -1321,11 +1256,11 @@ Int GameWindowManager::drawWindow( GameWindow *window )
 					!BitIsSet( window->m_status, WIN_STATUS_SEE_THRU ) )
 				window->winDrawBorder();
 
-	}  // end if
+	}
 
 	return WIN_ERR_OK;
 
-}  // end drawWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw the GUI in reverse order to correlate with clicking priority */
@@ -1348,7 +1283,7 @@ void GameWindowManager::winRepaint( void )
 	{
 		next = window->m_prev;
 
-		if (BitIsSet( window->m_status, WIN_STATUS_ABOVE | 
+		if (BitIsSet( window->m_status, WIN_STATUS_ABOVE |
 																	 WIN_STATUS_BELOW ) == FALSE)
 			drawWindow( window );
 	}
@@ -1364,7 +1299,7 @@ void GameWindowManager::winRepaint( void )
 
 	if(TheTransitionHandler)
 		TheTransitionHandler->draw();
-}  // end WinRepaint
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Dump information about all the windows for resource problems */
@@ -1377,21 +1312,21 @@ void GameWindowManager::dumpWindow( GameWindow *window )
 	if( window == NULL )
 		return;
 
-	DEBUG_LOG(( "ID: %d\tRedraw: 0x%08X\tUser Data: %d\n",
+	DEBUG_LOG(( "ID: %d\tRedraw: 0x%08X\tUser Data: %d",
 				 	 window->winGetWindowId(), window->m_draw, window->m_userData ));
-	
+
 	for( child = window->m_child; child; child = child->m_next )
 		dumpWindow( child );
 
 	return;
 #endif
-}  // end dumpWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a new window by setting up its parameters and callbacks. */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::winCreate( GameWindow *parent, 
-																				  UnsignedInt status, 
+GameWindow *GameWindowManager::winCreate( GameWindow *parent,
+																				  UnsignedInt status,
 																				  Int x, Int y,
 																				  Int width, Int height,
 																					GameWinSystemFunc system,
@@ -1404,7 +1339,7 @@ GameWindow *GameWindowManager::winCreate( GameWindow *parent,
 	if( window == NULL )
 	{
 
-		DEBUG_LOG(( "WinCreate error: Could not allocate new window\n" ));
+		DEBUG_LOG(( "WinCreate error: Could not allocate new window" ));
 #ifndef FINAL
 		{
 			GameWindow *win;
@@ -1416,7 +1351,7 @@ GameWindow *GameWindowManager::winCreate( GameWindow *parent,
 
 		return NULL;
 
-	}  // endif
+	}
 
 	// If this is a child window add it to the parent's window list
 	if( parent )
@@ -1451,11 +1386,11 @@ GameWindow *GameWindowManager::winCreate( GameWindow *parent,
 			TheGlobalLanguageData->m_defaultWindowFont.bold) );
 	}
 	else
-		window->winSetFont( winFindFont( AsciiString("Times New Roman"), 14, FALSE ) );
+		window->winSetFont( winFindFont( "Times New Roman", 14, FALSE ) );
 
 	return window;
 
-}  // end WinCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Take a window and its children off the top level list and free
@@ -1464,7 +1399,7 @@ GameWindow *GameWindowManager::winCreate( GameWindow *parent,
 Int GameWindowManager::winDestroy( GameWindow *window )
 {
 	GameWindow *child, *next;
-	
+
 	if( window == NULL )
 		return WIN_ERR_INVALID_WINDOW;
 
@@ -1473,7 +1408,7 @@ Int GameWindowManager::winDestroy( GameWindow *window )
 	// completely handled by the editor ONLY
 	//
 	DEBUG_ASSERTCRASH( window->winGetEditData() == NULL,
-										 ("winDestroy(): edit data should NOT be present!\n") );
+										 ("winDestroy(): edit data should NOT be present!") );
 
 	if( BitIsSet( window->m_status, WIN_STATUS_DESTROYED ) )
 		return WIN_ERR_OK;
@@ -1523,7 +1458,7 @@ Int GameWindowManager::winDestroy( GameWindow *window )
 
 	return WIN_ERR_OK;
 
-}  // winDestroy
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Destroy all windows on the window list IMMEDIATELY */
@@ -1536,7 +1471,7 @@ Int GameWindowManager::winDestroyAll( void )
 	// NOTE that it is CRITICAL that the windows be destroyed this way,
 	// the editor has windows that are not on this main list that must
 	// exist throughout a reset of the system (copy/paste for instance)
-	// so DO NOT ever change this to a clever pool of memory for the 
+	// so DO NOT ever change this to a clever pool of memory for the
 	// windows and reset the _pool_ ... I will have to kill you!  CBD
 	//
 
@@ -1546,14 +1481,14 @@ Int GameWindowManager::winDestroyAll( void )
 
 		winDestroy( win );
 
-	}  // end for
+	}
 
 	// Destroy All Windows just added to destroy list
 	processDestroyList();
 
 	return WIN_ERR_OK;
 
-}  // end WinDestroyAll
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Sets selected window into a modal state.  This window will get
@@ -1587,7 +1522,7 @@ Int GameWindowManager::winSetModal( GameWindow *window )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetModal
+}
 
 //-------------------------------------------------------------------------------------------------
 /** pops window off of the modal stack.  If this window is not the top
@@ -1605,11 +1540,11 @@ Int GameWindowManager::winUnsetModal( GameWindow *window )
 	{
 
 		// return error if not
-		DEBUG_LOG(( "WinUnsetModal: Invalid window attempting to unset modal (%d)\n", 
+		DEBUG_LOG(( "WinUnsetModal: Invalid window attempting to unset modal (%d)",
 								window->winGetWindowId() ));
 		return WIN_ERR_GENERAL_FAILURE;
 
-	}  // end if
+	}
 
 	// remove from top of list
 	next = m_modalHead->next;
@@ -1618,7 +1553,7 @@ Int GameWindowManager::winUnsetModal( GameWindow *window )
 
 	return WIN_ERR_OK;
 
-}  // end WinUnsetModal
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the grabbed window */
@@ -1628,7 +1563,7 @@ GameWindow *GameWindowManager::winGetGrabWindow( void )
 
 	return m_grabWindow;
 
-}  // end WinGetGrabWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Explicitly set the grab window */
@@ -1638,7 +1573,7 @@ void GameWindowManager::winSetGrabWindow( GameWindow *window )
 
 	m_grabWindow = window;
 
-}  // end winSetGrabWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Explicitly set the grab window */
@@ -1649,10 +1584,10 @@ void GameWindowManager::winSetLoneWindow( GameWindow *window )
 	if( m_loneWindow == window )
 		return;
 	if( m_loneWindow )
-		TheWindowManager->winSendSystemMsg( m_loneWindow, GGM_CLOSE, 0, 0 );
+		winSendSystemMsg( m_loneWindow, GGM_CLOSE, 0, 0 );
 	m_loneWindow = window;
 
-}  // end winSetGrabWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a Modal Message Box */
@@ -1683,9 +1618,9 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 	GameWindow *trueParent = NULL;
 	//Changed by Chris
 	if(useLogo)
-		trueParent = winCreateFromScript( AsciiString("Menus/QuitMessageBox.wnd") ); 
+		trueParent = winCreateFromScript( "Menus/QuitMessageBox.wnd" );
 	else
-		trueParent = winCreateFromScript( AsciiString("Menus/MessageBox.wnd") ); 
+		trueParent = winCreateFromScript( "Menus/MessageBox.wnd" );
 	//Added By Chris
 	AsciiString menuName;
 	if(useLogo)
@@ -1695,13 +1630,13 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 
 	AsciiString tempName;
 	GameWindow *parent = NULL;
-	
+
 	tempName = menuName;
 	tempName.concat("MessageBoxParent");
-	parent = TheWindowManager->winGetWindowFromId(trueParent, TheNameKeyGenerator->nameToKey( tempName ));
-	TheWindowManager->winSetModal( trueParent ); 
-	TheWindowManager->winSetFocus( NULL ); // make sure we lose focus from other windows even if we refuse focus ourselves
-	TheWindowManager->winSetFocus( parent	 );
+	parent = winGetWindowFromId(trueParent, TheNameKeyGenerator->nameToKey( tempName ));
+	winSetModal( trueParent );
+	winSetFocus( NULL ); // make sure we lose focus from other windows even if we refuse focus ourselves
+	winSetFocus( parent	 );
 
 	// If the user wants the size to be different then the default
 	float ratioX, ratioY = 1;
@@ -1714,8 +1649,8 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 		ratioX = (float)width / (float)temp.x;
 		ratioY = (float)height / (float)temp.y;
 		//Set the window's new size
-		parent->winSetSize( width, height);	
-	
+		parent->winSetSize( width, height);
+
 		//Resize/reposition all the children windows based off the ratio
 		GameWindow *child;
 		for( child = parent->winGetChild(); child; child = child->winGetNext() )
@@ -1731,47 +1666,47 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 			child->winSetPosition(temp.x, temp.y);
 		}
 	}
-	
+
 	// If the user wants to position the message box somewhere other then default
 	if( x >= 0 && y >= 0)
-		parent->winSetPosition(x, y);	
-	
-	// Reposition the buttons 
+		parent->winSetPosition(x, y);
+
+	// Reposition the buttons
 	Int buttonX[3], buttonY[3];
-		 	
+
 	//In the layout, buttonOk will be in the first button position
 	NameKeyType buttonOkID = NAMEKEY_INVALID;
-	
+
 	tempName = menuName;
 	tempName.concat("ButtonOk");
 	buttonOkID = TheNameKeyGenerator->nameToKey( tempName );
-	GameWindow *buttonOk = TheWindowManager->winGetWindowFromId(parent, buttonOkID);
+	GameWindow *buttonOk = winGetWindowFromId(parent, buttonOkID);
 	buttonOk->winGetPosition(&buttonX[0], &buttonY[0]);
 
 	tempName = menuName;
 	tempName.concat("ButtonYes");
 	NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( tempName );
-	GameWindow *buttonYes = TheWindowManager->winGetWindowFromId(parent, buttonYesID);
+	GameWindow *buttonYes = winGetWindowFromId(parent, buttonYesID);
 	//buttonNo in the second position
 	tempName = menuName;
 	tempName.concat("ButtonNo");
 	NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey(tempName);
-	GameWindow *buttonNo = TheWindowManager->winGetWindowFromId(parent, buttonNoID);
+	GameWindow *buttonNo = winGetWindowFromId(parent, buttonNoID);
 	buttonNo->winGetPosition(&buttonX[1], &buttonY[1]);
-	
+
 	//and buttonCancel in the third
 	tempName = menuName;
 	tempName.concat("ButtonCancel");
 	NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( tempName );
-	GameWindow *buttonCancel = TheWindowManager->winGetWindowFromId(parent, buttonCancelID);
+	GameWindow *buttonCancel = winGetWindowFromId(parent, buttonCancelID);
 	buttonCancel->winGetPosition(&buttonX[2], &buttonY[2]);
-	
+
 	//we shouldn't have button OK and Yes on the same dialog
 	if((buttonFlags & (MSG_BOX_OK | MSG_BOX_YES)) == (MSG_BOX_OK | MSG_BOX_YES) )
 	{
 		DEBUG_ASSERTCRASH(false, ("Passed in MSG_BOX_OK and MSG_BOX_YES.  Big No No."));
 	}
-	
+
 	//Position the OK button if we have one
 	if( (buttonFlags & MSG_BOX_OK) == MSG_BOX_OK)
 	{
@@ -1784,7 +1719,7 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 		buttonYes->winSetPosition(buttonX[0], buttonY[0]);
 		buttonYes->winHide(FALSE);
 	}
-	
+
 	if((buttonFlags & (MSG_BOX_NO | MSG_BOX_CANCEL)) == (MSG_BOX_NO | MSG_BOX_CANCEL) )
 	{
 		//If we have both the No and Cancel button, then the no should go in the middle position
@@ -1805,20 +1740,20 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 		buttonCancel->winSetPosition(buttonX[2], buttonY[2]);
 		buttonCancel->winHide(FALSE);
 	}
-		
+
 	// Fill the text into the text boxes
 	tempName = menuName;
 	tempName.concat("StaticTextTitle");
 	NameKeyType staticTextTitleID = TheNameKeyGenerator->nameToKey( tempName );
-	GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId(parent, staticTextTitleID);
+	GameWindow *staticTextTitle = winGetWindowFromId(parent, staticTextTitleID);
 	GadgetStaticTextSetText(staticTextTitle,titleString);
 	tempName = menuName;
 	tempName.concat("StaticTextMessage");
 	NameKeyType staticTextMessageID = TheNameKeyGenerator->nameToKey( tempName );
-	GameWindow *staticTextMessage = TheWindowManager->winGetWindowFromId(parent, staticTextMessageID);
+	GameWindow *staticTextMessage = winGetWindowFromId(parent, staticTextMessageID);
 	GadgetStaticTextSetText(staticTextMessage,bodyString);
 
-	// create a structure that will pass the functions to 
+	// create a structure that will pass the functions to
 	WindowMessageBoxData *MsgBoxCallbacks = NEW WindowMessageBoxData;
 	MsgBoxCallbacks->cancelCallback = cancelCallback;
 	MsgBoxCallbacks->noCallback = noCallback;
@@ -1826,14 +1761,14 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh
 	MsgBoxCallbacks->yesCallback = yesCallback;
 	//pass the structure to the dialog
 	trueParent->winSetUserData( MsgBoxCallbacks );
-	
+
 	//make sure the dialog is showing and bring it to the top
 	parent->winHide(FALSE);
 	parent->winBringToTop();
-	
+
 	//Changed By Chris
 	return trueParent;
-}// gogoMessageBox
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a button GUI control */
@@ -1852,25 +1787,25 @@ GameWindow *GameWindowManager::gogoGadgetPushButton( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_PUSH_BUTTON ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create button gadget, instance data not button type\n" ));
+		DEBUG_LOG(( "Cann't create button gadget, instance data not button type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the button window
-	button = TheWindowManager->winCreate( parent, status, 
-																				x, y, width, height, 
+	button = winCreate( parent, status,
+																				x, y, width, height,
 																				GadgetPushButtonSystem,
 																				instData );
 	if( button == NULL )
 	{
-	
-		DEBUG_LOG(( "Unable to create button for push button gadget\n" ));
+
+		DEBUG_LOG(( "Unable to create button for push button gadget" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// assign input function
 	button->winSetInputFunc( GadgetPushButtonInput );
@@ -1886,7 +1821,7 @@ GameWindow *GameWindowManager::gogoGadgetPushButton( GameWindow *parent,
 
 	// set the owner to the parent, or if no parent it will be itself
 	button->winSetOwner( parent );
-	
+
 	// Init the userdata to NULL
 	button->winSetUserData(NULL);
 
@@ -1897,18 +1832,18 @@ GameWindow *GameWindowManager::gogoGadgetPushButton( GameWindow *parent,
 	UnicodeString text = winTextLabelToText( instData->m_textLabelString );
 	if( text.getLength() )
 		GadgetButtonSetText( button, text );
-	
+
 	return button;
 
-}  // end gogoGadgetPushButton
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a checkbox UI element */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetCheckbox( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetCheckbox( GameWindow *parent,
 																									 UnsignedInt status,
-																									 Int x, Int y, 
-																									 Int width, Int height, 
+																									 Int x, Int y,
+																									 Int width, Int height,
 																									 WinInstanceData *instData,
 																									 GameFont *defaultFont,
 																									 Bool defaultVisual )
@@ -1920,25 +1855,25 @@ GameWindow *GameWindowManager::gogoGadgetCheckbox( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_CHECK_BOX ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create checkbox gadget, instance data not checkbox type\n" ));
+		DEBUG_LOG(( "Cann't create checkbox gadget, instance data not checkbox type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the button window
-	checkbox = TheWindowManager->winCreate( parent, status, 
-																					x, y, width, height, 
+	checkbox = winCreate( parent, status,
+																					x, y, width, height,
 																					GadgetCheckBoxSystem,
 																					instData );
 	if( checkbox == NULL )
 	{
-	
-		DEBUG_LOG(( "Unable to create checkbox window\n" ));
+
+		DEBUG_LOG(( "Unable to create checkbox window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// assign input function
 	checkbox->winSetInputFunc( GadgetCheckBoxInput );
@@ -1965,15 +1900,15 @@ GameWindow *GameWindowManager::gogoGadgetCheckbox( GameWindow *parent,
 
 	return checkbox;
 
-}  // end gogoGadgetCheckbox
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a radio button GUI element */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetRadioButton( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetRadioButton( GameWindow *parent,
 																										  UnsignedInt status,
-																										  Int x, Int y, 
-																										  Int width, Int height, 
+																										  Int x, Int y,
+																										  Int width, Int height,
 																										  WinInstanceData *instData,
 																											RadioButtonData *rData,
 																										  GameFont *defaultFont,
@@ -1987,25 +1922,25 @@ GameWindow *GameWindowManager::gogoGadgetRadioButton( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_RADIO_BUTTON ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create radioButton gadget, instance data not radioButton type\n" ));
+		DEBUG_LOG(( "Cann't create radioButton gadget, instance data not radioButton type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the button window
-	radioButton = TheWindowManager->winCreate( parent, status, 
-																					   x, y, width, height, 
+	radioButton = winCreate( parent, status,
+																					   x, y, width, height,
 																						 GadgetRadioButtonSystem,
 																						 instData );
 	if( radioButton == NULL )
 	{
-	
-		DEBUG_LOG(( "Unable to create radio button window\n" ));
+
+		DEBUG_LOG(( "Unable to create radio button window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// allocate and store the radio button user data
 	radioData = NEW RadioButtonData;
@@ -2037,15 +1972,15 @@ GameWindow *GameWindowManager::gogoGadgetRadioButton( GameWindow *parent,
 
 	return radioButton;
 
-}  // end gogoGadgetRadioButton
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a tab control GUI element */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetTabControl( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetTabControl( GameWindow *parent,
 																										  UnsignedInt status,
-																										  Int x, Int y, 
-																										  Int width, Int height, 
+																										  Int x, Int y,
+																										  Int width, Int height,
 																										  WinInstanceData *instData,
 																											TabControlData *tData,
 																										  GameFont *defaultFont,
@@ -2059,25 +1994,25 @@ GameWindow *GameWindowManager::gogoGadgetTabControl( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_TAB_CONTROL ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create tabControl gadget, instance data not tabControl type\n" ));
+		DEBUG_LOG(( "Cann't create tabControl gadget, instance data not tabControl type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the tab control window
-	tabControl = TheWindowManager->winCreate( parent, status, 
-																					   x, y, width, height, 
+	tabControl = winCreate( parent, status,
+																					   x, y, width, height,
 																						 GadgetTabControlSystem,
 																						 instData );
 	if( tabControl == NULL )
 	{
-	
-		DEBUG_LOG(( "Unable to create tab control window\n" ));
+
+		DEBUG_LOG(( "Unable to create tab control window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// allocate and store the tab control user data
 	tabData = NEW TabControlData;
@@ -2108,16 +2043,16 @@ GameWindow *GameWindowManager::gogoGadgetTabControl( GameWindow *parent,
 
 	return tabControl;
 
-}  // end gogoGadgetTabControl
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a list box GUI control */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetListBox( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetListBox( GameWindow *parent,
 																									UnsignedInt status,
-										                              Int x, Int y, 
+										                              Int x, Int y,
 																									Int width, Int height,
-																									WinInstanceData *instData, 
+																									WinInstanceData *instData,
 																									ListboxData *listboxDataTemplate,
 																								  GameFont *defaultFont,
 																								  Bool defaultVisual )
@@ -2131,24 +2066,24 @@ GameWindow *GameWindowManager::gogoGadgetListBox( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_SCROLL_LISTBOX ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create listbox gadget, instance data not listbox type\n" ));
+		DEBUG_LOG(( "Cann't create listbox gadget, instance data not listbox type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the listbox
-  listbox = winCreate( parent, status, x, y, width, height, 
+  listbox = winCreate( parent, status, x, y, width, height,
 											 GadgetListBoxSystem, instData );
-	
+
 	if( listbox == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to create listbox window\n" ));
+		DEBUG_LOG(( "Unable to create listbox window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// allocate the listbox data, copy template data over and set it into box
 	listboxData = NEW ListboxData;
@@ -2178,7 +2113,7 @@ GameWindow *GameWindowManager::gogoGadgetListBox( GameWindow *parent,
 		listbox->winSetInputFunc( GadgetListBoxInput );
 
 
-	
+
 	//
 	// allocate and set the list length, note that setting the list length will
 	// automatically allocate the selection entries that are needed for multi
@@ -2223,8 +2158,8 @@ GameWindow *GameWindowManager::gogoGadgetListBox( GameWindow *parent,
 			listboxData->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 			listboxData->columnWidth[0] -= (sliderSize.x + 2);
 
-		}  // end if
-	}// if
+		}
+	}
 	else
 	{
 		if( !listboxData->columnWidthPercentage )
@@ -2241,28 +2176,28 @@ GameWindow *GameWindowManager::gogoGadgetListBox( GameWindow *parent,
 			listboxData->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 			totalWidth -= (sliderSize.x + 2);
 
-		}  // end if
+		}
 		for(Int i = 0; i < listboxData->columns; i++ )
 		{
 			listboxData->columnWidth[i] = listboxData->columnWidthPercentage[i] * totalWidth / 100;
-		}// for
-	}// else
+		}
+	}
 	// assign the default images/colors
 	assignDefaultGadgetLook( listbox, defaultFont, defaultVisual );
 
   return listbox;
 
-}  // end gogoGadgetListBox
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Does all generic window creation, calls appropriate slider create
 	* function to set up slider-specific data */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent,
 																								 UnsignedInt status,
-																								 Int x, Int y, 
+																								 Int x, Int y,
 																								 Int width, Int height,
-																								 WinInstanceData *instData, 
+																								 WinInstanceData *instData,
 																								 SliderData *sliderData,
 																								 GameFont *defaultFont,
 																								 Bool defaultVisual )
@@ -2278,10 +2213,10 @@ GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent,
 	//
 	BitSet( status, WIN_STATUS_TAB_STOP );
 
-	if( BitIsSet( instData->getStyle(), GWS_HORZ_SLIDER ) ) 
+	if( BitIsSet( instData->getStyle(), GWS_HORZ_SLIDER ) )
 	{
 
-		slider = winCreate( parent, status, x, y, width, height, 
+		slider = winCreate( parent, status, x, y, width, height,
 												GadgetHorizontalSliderSystem, instData );
 
 		// Set up horizontal slider callbacks
@@ -2291,40 +2226,40 @@ GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent,
 		else
 			slider->winSetDrawFunc( getHorizontalSliderDrawFunc() );
 
-	}  // end if
-	else if ( BitIsSet( instData->getStyle(), GWS_VERT_SLIDER ) ) 
+	}
+	else if ( BitIsSet( instData->getStyle(), GWS_VERT_SLIDER ) )
 	{
 
-		slider = winCreate( parent, status, x, y, width, height, 
+		slider = winCreate( parent, status, x, y, width, height,
 												GadgetVerticalSliderSystem, instData );
 
 		// Set up vertical slider callbacks
 		slider->winSetInputFunc( GadgetVerticalSliderInput );
-		
+
 		if( BitIsSet( slider->winGetStatus(), WIN_STATUS_IMAGE ) && !(parent && BitIsSet(parent->winGetStyle(), GWS_SCROLL_LISTBOX)))
 			slider->winSetDrawFunc( getVerticalSliderImageDrawFunc() );
 		else
 			slider->winSetDrawFunc( getVerticalSliderDrawFunc() );
 
-	}  // end else if
-	else 
+	}
+	else
 	{
 
-		DEBUG_LOG(( "gogoGadgetSlider warning: unrecognized slider style.\n" ));
+		DEBUG_LOG(( "gogoGadgetSlider warning: unrecognized slider style." ));
 		assert( 0 );
 		return NULL;
-		
-	}  // end else
+
+	}
 
 	// sanity
 	if( slider == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to create slider control window\n" ));
+		DEBUG_LOG(( "Unable to create slider control window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// set the owner to the parent, or if no parent it will be itself
 	slider->winSetOwner( parent );
@@ -2356,11 +2291,11 @@ GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent,
 	if( sliderData->maxVal == sliderData->minVal )
 		sliderData->maxVal = sliderData->minVal + 1;
 
-	if( BitIsSet( instData->getStyle(), GWS_HORZ_SLIDER ) ) 
+	if( BitIsSet( instData->getStyle(), GWS_HORZ_SLIDER ) )
 	{
 		sliderData->numTicks = (float)(width - HORIZONTAL_SLIDER_THUMB_WIDTH) /
 													 (float)(sliderData->maxVal - sliderData->minVal);
-	} else 
+	} else
 	{
 		sliderData->numTicks = (float)(height - GADGET_SIZE) /
 													 (float)(sliderData->maxVal - sliderData->minVal);
@@ -2377,16 +2312,16 @@ GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent,
 
 	return slider;
 
-}  // end gogoGadgetSlider
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a Combo Box GUI element */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 																									UnsignedInt status,
-										                              Int x, Int y, 
+										                              Int x, Int y,
 																									Int width, Int height,
-																									WinInstanceData *instData, 
+																									WinInstanceData *instData,
 																									ComboBoxData *comboBoxDataTemplate,
 																								  GameFont *defaultFont,
 																								  Bool defaultVisual )
@@ -2399,24 +2334,24 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_COMBO_BOX) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create ComboBox gadget, instance data not ComboBox type\n" ));
+		DEBUG_LOG(( "Cann't create ComboBox gadget, instance data not ComboBox type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the listbox
-  comboBox = winCreate( parent, status, x, y, width, height, 
+  comboBox = winCreate( parent, status, x, y, width, height,
 											 GadgetComboBoxSystem, instData );
-	
+
 	if( comboBox == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to create ComboBox window\n" ));
+		DEBUG_LOG(( "Unable to create ComboBox window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 
 // begin here
@@ -2443,7 +2378,7 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 	// Set up list box input callbacks
 	comboBox->winSetInputFunc( GadgetComboBoxInput );
 
-	//Create the windows that make up 
+	//Create the windows that make up
 
 
 	WinInstanceData winInstData;
@@ -2460,7 +2395,7 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 	// remove unwanted status bits.
 	status &= ~(WIN_STATUS_BORDER | WIN_STATUS_HIDDEN);
 
-	fontHeight = TheWindowManager->winFontHeight( comboBox->winGetFont() );
+	fontHeight = winFontHeight( comboBox->winGetFont() );
 	top = title ? (fontHeight + 1):0;
 	bottom = title ? (height - (fontHeight + 1)):height;
 
@@ -2481,9 +2416,9 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 	// if listbox tracks, so will this sub control
 	if( BitIsSet( comboBox->winGetStyle(), GWS_MOUSE_TRACK ) )
 		BitSet( winInstData.m_style, GWS_MOUSE_TRACK );
-	
+
 	comboBoxData->dropDownButton =
-		 TheWindowManager->gogoGadgetPushButton( comboBox,
+		 gogoGadgetPushButton( comboBox,
 																						 status | WIN_STATUS_ACTIVE | WIN_STATUS_ENABLED,
 																						 width - buttonWidth, 0,
 																						 buttonWidth, height,
@@ -2496,7 +2431,7 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 	// ----------------------------------------------------------------------
 	UnsignedInt statusTextEntry;
 	winInstData.init();
-	
+
 	winInstData.m_owner = comboBox;
   winInstData.m_style |= GWS_ENTRY_FIELD;
 	winInstData.m_textLabelString = "Entry";
@@ -2511,10 +2446,10 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 		statusTextEntry = status | WIN_STATUS_NO_INPUT ;//| WIN_STATUS_NO_FOCUS;
 		comboBoxData->entryData->drawTextFromStart = TRUE;
 	}
-  comboBoxData->editBox = TheWindowManager->gogoGadgetTextEntry( comboBox, statusTextEntry ,
-																										 0,0 , 
+  comboBoxData->editBox = gogoGadgetTextEntry( comboBox, statusTextEntry ,
+																										 0,0 ,
 																										width - buttonWidth , height ,
-																										&winInstData, comboBoxData->entryData, 
+																										&winInstData, comboBoxData->entryData,
 																										winInstData.m_font, FALSE );
 	comboBoxData->editBox->winSetTooltipFunc(comboBox->winGetTooltipFunc());
 	comboBoxData->editBox->winSetTooltip(instData->getTooltipText());
@@ -2526,16 +2461,16 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 	// Create list box
 	// ----------------------------------------------------------------------
 	winInstData.init();
-	
+
 	winInstData.m_owner = comboBox;
   if( BitIsSet( comboBox->winGetStyle(), GWS_MOUSE_TRACK ) )
 		BitSet( winInstData.m_style, GWS_MOUSE_TRACK );
 	BitSet( winInstData.m_style, WIN_STATUS_HIDDEN );
-  winInstData.m_style |= GWS_SCROLL_LISTBOX; 
+  winInstData.m_style |= GWS_SCROLL_LISTBOX;
 	status &= ~(WIN_STATUS_IMAGE);
-  comboBoxData->listBox = TheWindowManager->gogoGadgetListBox( comboBox, status | WIN_STATUS_ABOVE | WIN_STATUS_ONE_LINE, 0, height, 
+  comboBoxData->listBox = gogoGadgetListBox( comboBox, status | WIN_STATUS_ABOVE | WIN_STATUS_ONE_LINE, 0, height,
 																								width, height,
-																								&winInstData, comboBoxData->listboxData, 
+																								&winInstData, comboBoxData->listboxData,
 																								winInstData.m_font, FALSE );
 	comboBoxData->listBox->winHide(TRUE);
 	delete(comboBoxData->listboxData);
@@ -2588,10 +2523,10 @@ GameWindow *GameWindowManager::gogoGadgetComboBox( GameWindow *parent,
 //-------------------------------------------------------------------------------------------------
 /** Create a progress bar GUI element */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetProgressBar( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetProgressBar( GameWindow *parent,
 																										  UnsignedInt status,
-																										  Int x, Int y, 
-																										  Int width, Int height, 
+																										  Int x, Int y,
+																										  Int width, Int height,
 																										  WinInstanceData *instData,
 																										  GameFont *defaultFont,
 																										  Bool defaultVisual )
@@ -2603,25 +2538,25 @@ GameWindow *GameWindowManager::gogoGadgetProgressBar( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_PROGRESS_BAR ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Cann't create progressBar gadget, instance data not progressBar type\n" ));
+		DEBUG_LOG(( "Cann't create progressBar gadget, instance data not progressBar type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the button window
-	progressBar = TheWindowManager->winCreate( parent, status, 
-																					   x, y, width, height, 
+	progressBar = winCreate( parent, status,
+																					   x, y, width, height,
 																						 GadgetProgressBarSystem,
 																						 instData );
 	if( progressBar == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to create progress bar control\n" ));
+		DEBUG_LOG(( "Unable to create progress bar control" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	//
 	// assign draw function, the draw functions must actually be implemented
@@ -2640,17 +2575,17 @@ GameWindow *GameWindowManager::gogoGadgetProgressBar( GameWindow *parent,
 
 	return progressBar;
 
-}  // end gogoGadgetProgressBar
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Does all generic window creation, calls appropriate text field create
 	* function to set up specific data */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetStaticText( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetStaticText( GameWindow *parent,
 																										 UnsignedInt status,
-																										 Int x, Int y, 
+																										 Int x, Int y,
 																										 Int width, Int height,
-																										 WinInstanceData *instData, 
+																										 WinInstanceData *instData,
 																										 TextData *textData,
 																										 GameFont *defaultFont,
 																										 Bool defaultVisual )
@@ -2662,17 +2597,17 @@ GameWindow *GameWindowManager::gogoGadgetStaticText( GameWindow *parent,
 	// Static Text can not be a Tab Stop
 	BitClear( instData->m_style, GWS_TAB_STOP );
 
-  if( BitIsSet( instData->getStyle(), GWS_STATIC_TEXT ) ) 
+  if( BitIsSet( instData->getStyle(), GWS_STATIC_TEXT ) )
 	{
-    textWin = winCreate( parent, status, x, y, width, height, 
+    textWin = winCreate( parent, status, x, y, width, height,
 												 GadgetStaticTextSystem, instData );
-  } 
-	else 
+  }
+	else
 	{
-    DEBUG_LOG(( "gogoGadgetText warning: unrecognized text style.\n" ));
+    DEBUG_LOG(( "gogoGadgetText warning: unrecognized text style." ));
     return NULL;
   }
-  
+
   if( textWin != NULL )
 	{
 
@@ -2705,21 +2640,21 @@ GameWindow *GameWindowManager::gogoGadgetStaticText( GameWindow *parent,
 		if( text.getLength() )
 			GadgetStaticTextSetText( textWin, text );
 
-  }  // end if
+  }
 
   return textWin;
 
-}  // end gogoGadetStaticText
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Does all generic window creation, calls appropriate entry field create
 	* function to set up specific data */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GameWindowManager::gogoGadgetTextEntry( GameWindow *parent, 
+GameWindow *GameWindowManager::gogoGadgetTextEntry( GameWindow *parent,
 																										UnsignedInt status,
-																										Int x, Int y, 
+																										Int x, Int y,
 																										Int width, Int height,
-																										WinInstanceData *instData, 
+																										WinInstanceData *instData,
 																										EntryData *entryData,
 																										GameFont *defaultFont,
 																										Bool defaultVisual )
@@ -2731,23 +2666,23 @@ GameWindow *GameWindowManager::gogoGadgetTextEntry( GameWindow *parent,
 	if( BitIsSet( instData->getStyle(), GWS_ENTRY_FIELD ) == FALSE )
 	{
 
-		DEBUG_LOG(( "Unable to create text entry, style not entry type\n" ));
+		DEBUG_LOG(( "Unable to create text entry, style not entry type" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the window
-	entry = winCreate( parent, status, x, y, width, height, 
+	entry = winCreate( parent, status, x, y, width, height,
 										 GadgetTextEntrySystem, instData );
 	if( entry == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to create text entry window\n" ));
+		DEBUG_LOG(( "Unable to create text entry window" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// set owner of this control
 	entry->winSetOwner( parent );
@@ -2799,7 +2734,7 @@ GameWindow *GameWindowManager::gogoGadgetTextEntry( GameWindow *parent,
 
 	// asian languages get to have list box kanji character completion
 	data->constructList = NULL;
-	if( OurLanguage == LANGUAGE_ID_KOREAN || 
+	if( OurLanguage == LANGUAGE_ID_KOREAN ||
 			OurLanguage == LANGUAGE_ID_JAPANESE )
 	{
 		// we need to create the construct listbox
@@ -2822,29 +2757,29 @@ GameWindow *GameWindowManager::gogoGadgetTextEntry( GameWindow *parent,
 
 		boxInstData.m_style = GWS_SCROLL_LISTBOX | GWS_MOUSE_TRACK;
 
-		data->constructList = gogoGadgetListBox( NULL, 
-																						 WIN_STATUS_ABOVE | 
+		data->constructList = gogoGadgetListBox( NULL,
+																						 WIN_STATUS_ABOVE |
 																						 WIN_STATUS_HIDDEN |
-																						 WIN_STATUS_NO_FOCUS | 
+																						 WIN_STATUS_NO_FOCUS |
 																						 WIN_STATUS_ONE_LINE,
-																						 0, height, 
-																						 110, 119, 
-																						 &boxInstData, 
-																						 &lData, 
-																						 NULL, 
+																						 0, height,
+																						 110, 119,
+																						 &boxInstData,
+																						 &lData,
+																						 NULL,
 																						 TRUE );
 
 		if( data->constructList == NULL )
 		{
 
-			DEBUG_LOG(( "gogoGadgetEntry warning: Failed to create listbox.\n" ));
+			DEBUG_LOG(( "gogoGadgetEntry warning: Failed to create listbox." ));
 			assert( 0 );
 			winDestroy( entry );
 			return NULL;
 
-		}  // end if
+		}
 
-	}  // end, korean or japanese
+	}
 
 	// assign the default images/colors
 	assignDefaultGadgetLook( entry, defaultFont, defaultVisual );
@@ -2856,10 +2791,10 @@ GameWindow *GameWindowManager::gogoGadgetTextEntry( GameWindow *parent,
 
 	return entry;
 
-}  // end gogoGadgetTextEntry
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Use this method to assign the default images/colors to gadgets as 
+/** Use this method to assign the default images/colors to gadgets as
 	* they area created */
 //-------------------------------------------------------------------------------------------------
 void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
@@ -2867,29 +2802,29 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 																								 Bool assignVisual )
 {
 	UnsignedByte alpha = 255;
-	static Color red				= TheWindowManager->winMakeColor( 255,   0,   0, alpha );
-	static Color darkRed		= TheWindowManager->winMakeColor( 128,   0,   0, alpha );
-	static Color lightRed		= TheWindowManager->winMakeColor( 255, 128, 128, alpha );
-	static Color green			= TheWindowManager->winMakeColor(   0, 255,   0, alpha );
-	static Color darkGreen	= TheWindowManager->winMakeColor(   0, 128,   0, alpha );
-	static Color lightGreen	= TheWindowManager->winMakeColor( 128, 255, 128, alpha );
-	static Color blue				= TheWindowManager->winMakeColor(   0,   0, 255, alpha );
-	static Color darkBlue		= TheWindowManager->winMakeColor(   0,   0, 128, alpha );
-	static Color lightBlue	= TheWindowManager->winMakeColor( 128, 128, 255, alpha );
-	static Color purple			= TheWindowManager->winMakeColor( 255,   0, 255, alpha );
-	static Color darkPurple	= TheWindowManager->winMakeColor( 128,   0, 128, alpha );
-	static Color lightPurple= TheWindowManager->winMakeColor( 255, 128, 255, alpha );
-	static Color yellow			= TheWindowManager->winMakeColor( 255, 255,   0, alpha );
-	static Color darkYellow	= TheWindowManager->winMakeColor( 128, 128,   0, alpha );
-	static Color lightYellow= TheWindowManager->winMakeColor( 255, 255, 128, alpha );
-	static Color cyan				= TheWindowManager->winMakeColor(   0, 255, 255, alpha );
-	static Color darkCyan		= TheWindowManager->winMakeColor(  64, 128, 128, alpha );
-	static Color lightCyan	= TheWindowManager->winMakeColor( 128, 255, 255, alpha );
-	static Color gray				= TheWindowManager->winMakeColor( 128, 128, 128, alpha );
-	static Color darkGray		= TheWindowManager->winMakeColor(  64,  64,  64, alpha );
-	static Color lightGray	= TheWindowManager->winMakeColor( 192, 192, 192, alpha );
-	static Color black			= TheWindowManager->winMakeColor(   0,   0,   0, alpha );
-	static Color white			= TheWindowManager->winMakeColor( 254, 254, 254, alpha );
+	static Color red				= winMakeColor( 255,   0,   0, alpha );
+	static Color darkRed		= winMakeColor( 128,   0,   0, alpha );
+	static Color lightRed		= winMakeColor( 255, 128, 128, alpha );
+	static Color green			= winMakeColor(   0, 255,   0, alpha );
+	static Color darkGreen	= winMakeColor(   0, 128,   0, alpha );
+	static Color lightGreen	= winMakeColor( 128, 255, 128, alpha );
+	static Color blue				= winMakeColor(   0,   0, 255, alpha );
+	static Color darkBlue		= winMakeColor(   0,   0, 128, alpha );
+	static Color lightBlue	= winMakeColor( 128, 128, 255, alpha );
+	static Color purple			= winMakeColor( 255,   0, 255, alpha );
+	static Color darkPurple	= winMakeColor( 128,   0, 128, alpha );
+	static Color lightPurple= winMakeColor( 255, 128, 255, alpha );
+	static Color yellow			= winMakeColor( 255, 255,   0, alpha );
+	static Color darkYellow	= winMakeColor( 128, 128,   0, alpha );
+	static Color lightYellow= winMakeColor( 255, 255, 128, alpha );
+	static Color cyan				= winMakeColor(   0, 255, 255, alpha );
+	static Color darkCyan		= winMakeColor(  64, 128, 128, alpha );
+	static Color lightCyan	= winMakeColor( 128, 255, 255, alpha );
+	static Color gray				= winMakeColor( 128, 128, 128, alpha );
+	static Color darkGray		= winMakeColor(  64,  64,  64, alpha );
+	static Color lightGray	= winMakeColor( 192, 192, 192, alpha );
+	static Color black			= winMakeColor(   0,   0,   0, alpha );
+	static Color white			= winMakeColor( 254, 254, 254, alpha );
 	static Color enabledText					= white;
 	static Color enabledTextBorder		= darkGray;
 	static Color disabledText					= darkGray;
@@ -2899,7 +2834,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 	static Color imeCompositeText				= green;
 	static Color imeCompositeTextBorder	= blue;
 	WinInstanceData *instData;
-	
+
 	// sanity
 	if( gadget == NULL )
 		return;
@@ -2913,15 +2848,15 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 	else
 	{
 		if (TheGlobalLanguageData && TheGlobalLanguageData->m_defaultWindowFont.name.isNotEmpty())
-		{		gadget->winSetFont( TheWindowManager->winFindFont(
+		{		gadget->winSetFont( winFindFont(
 				TheGlobalLanguageData->m_defaultWindowFont.name,
 				TheGlobalLanguageData->m_defaultWindowFont.size,
 				TheGlobalLanguageData->m_defaultWindowFont.bold) );
 		}
 		else
-			gadget->winSetFont( TheWindowManager->winFindFont( AsciiString("Times New Roman"), 14, FALSE ) );
+			gadget->winSetFont( winFindFont( "Times New Roman", 14, FALSE ) );
 	}
-	
+
 	// if we don't want to assign default colors/images get out of here
 	if( assignVisual == FALSE )
 		return;
@@ -2963,7 +2898,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		gadget->winSetHiliteTextColors( hiliteText, hiliteTextBorder );
 		gadget->winSetIMECompositeTextColors( imeCompositeText, imeCompositeTextBorder );
 
-	}  // end if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_CHECK_BOX ) )
 	{
 
@@ -3012,7 +2947,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		gadget->winSetHiliteTextColors( hiliteText, hiliteTextBorder );
 		gadget->winSetIMECompositeTextColors( imeCompositeText, imeCompositeTextBorder );
 
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_RADIO_BUTTON ) )
 	{
 
@@ -3061,7 +2996,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		gadget->winSetHiliteTextColors( hiliteText, hiliteTextBorder );
 		gadget->winSetIMECompositeTextColors( imeCompositeText, imeCompositeTextBorder );
 
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_HORZ_SLIDER ) )
 	{
 
@@ -3087,7 +3022,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		GadgetSliderSetHiliteImageCenter( gadget, winFindImage( "HSliderHiliteRepeatingCenter" ) );
 		GadgetSliderSetHiliteImageSmallCenter( gadget, winFindImage( "HSliderHiliteSmallRepeatingCenter" ) );
 		GadgetSliderSetHiliteColor( gadget, red );
-		GadgetSliderSetHiliteBorderColor( gadget, lightRed );	
+		GadgetSliderSetHiliteBorderColor( gadget, lightRed );
 
 		// set default text colors for the gadget
 		gadget->winSetEnabledTextColors( enabledText, enabledTextBorder );
@@ -3123,7 +3058,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		GadgetSliderSetHiliteSelectedThumbBorderColor( gadget, GadgetSliderGetHiliteColor( gadget ) );
 
 
-	}  // end if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_VERT_SLIDER ) )
 	{
 		// enabled
@@ -3148,7 +3083,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		GadgetSliderSetHiliteImageCenter( gadget, winFindImage( "VSliderHiliteRepeatingCenter" ) );
 		GadgetSliderSetHiliteImageSmallCenter( gadget, winFindImage( "VSliderHiliteSmallRepeatingCenter" ) );
 		GadgetSliderSetHiliteColor( gadget, red );
-		GadgetSliderSetHiliteBorderColor( gadget, lightRed );	
+		GadgetSliderSetHiliteBorderColor( gadget, lightRed );
 
 		// set default text colors for the gadget
 		gadget->winSetEnabledTextColors( enabledText, enabledTextBorder );
@@ -3183,7 +3118,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		GadgetSliderSetHiliteSelectedThumbColor( gadget, GadgetSliderGetHiliteBorderColor( gadget ) );
 		GadgetSliderSetHiliteSelectedThumbBorderColor( gadget, GadgetSliderGetHiliteColor( gadget ) );
 
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_SCROLL_LISTBOX ) )
 	{
 		ListboxData *listboxData = (ListboxData *)gadget->winGetUserData();
@@ -3202,7 +3137,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 														darkGreen,				// hilite border
 														white,						// hilite selected item
 														darkGreen );			// hilite selected item border
-											
+
 		// now set the images
 
 		// enabled
@@ -3259,7 +3194,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 			GadgetSliderSetHiliteImageSmallCenter( slider, winFindImage( "VSliderLargeHiliteSmallRepeatingCenter" ) );
 			GadgetSliderSetHiliteThumbImage( slider, winFindImage( "VSliderLargeThumbHilite" ) );
 			GadgetSliderSetHiliteSelectedThumbImage( slider, winFindImage( "VSliderLargeThumbHilite" ) );
-	
+
 			// up button ------------------------------------------------------------
 
 			// enabled
@@ -3288,9 +3223,9 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 			GadgetButtonSetHiliteImage( downButton, winFindImage( "VSliderLargeDownButtonHilite" ) );
 			GadgetButtonSetHiliteSelectedImage( downButton, winFindImage( "VSliderLargeDownButtonHiliteSelected" ) );
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_COMBO_BOX ) )
 	{
 //		ComboBoxData *comboBoxData = (ComboBoxData *)gadget->winGetUserData();
@@ -3308,7 +3243,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 														darkGreen,				// hilite border
 														white,						// hilite selected item
 														darkGreen );			// hilite selected item border
-		
+
 		// enabled
 		GadgetComboBoxSetEnabledImage( gadget, winFindImage( "ListBoxEnabled" ) );
 		GadgetComboBoxSetEnabledSelectedItemImageLeft( gadget, winFindImage( "ListBoxEnabledSelectedItemLeftEnd" ) );
@@ -3343,17 +3278,17 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 			GadgetButtonSetEnabledImage( dropDownButton, winFindImage( "PushButtonEnabled" ) );
 			// enabled selected button
 			GadgetButtonSetEnabledSelectedImage( dropDownButton, winFindImage( "PushButtonEnabledSelected" ) );
-			
+
 			// Disabled background
 			GadgetButtonSetDisabledImage( dropDownButton, winFindImage( "PushButtonDisabled" ) );
 			// Disabled selected button
 			GadgetButtonSetDisabledSelectedImage( dropDownButton, winFindImage( "PushButtonDisabledSelected" ) );
-			
+
 			// Hilite background
 			GadgetButtonSetHiliteImage( dropDownButton, winFindImage( "PushButtonHilite" ) );
 			// Hilite selected button
 			GadgetButtonSetHiliteSelectedImage( dropDownButton, winFindImage( "PushButtonHiliteSelected" ) );
-			
+
 		}
 
 		GameWindow *editBox = GadgetComboBoxGetEditBox( gadget );
@@ -3364,25 +3299,25 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 			GadgetTextEntrySetEnabledImageRight( editBox, winFindImage( "TextEntryEnabledRightEnd" ) );
 			GadgetTextEntrySetEnabledImageCenter( editBox, winFindImage( "TextEntryEnabledRepeatingCenter" ) );
 			GadgetTextEntrySetEnabledImageSmallCenter( editBox, winFindImage( "TextEntryEnabledSmallRepeatingCenter" ) );
-			
+
 			// disabled
 			GadgetTextEntrySetDisabledImageLeft( editBox, winFindImage( "TextEntryDisabledLeftEnd" ) );
 			GadgetTextEntrySetDisabledImageRight( editBox, winFindImage( "TextEntryDisabledRightEnd" ) );
 			GadgetTextEntrySetDisabledImageCenter( editBox, winFindImage( "TextEntryDisabledRepeatingCenter" ) );
 			GadgetTextEntrySetDisabledImageSmallCenter( editBox, winFindImage( "TextEntryDisabledSmallRepeatingCenter" ) );
-			
+
 			// hilited
 			GadgetTextEntrySetHiliteImageLeft( editBox, winFindImage( "TextEntryHiliteLeftEnd" ) );
 			GadgetTextEntrySetHiliteImageRight( editBox, winFindImage( "TextEntryHiliteRightEnd" ) );
 			GadgetTextEntrySetHiliteImageCenter( editBox, winFindImage( "TextEntryHiliteRepeatingCenter" ) );
 			GadgetTextEntrySetHiliteImageSmallCenter( editBox, winFindImage( "TextEntryHiliteSmallRepeatingCenter" ) );
-			
+
 		}
 
 		GameWindow * listBox = GadgetComboBoxGetListBox( gadget );
 		if ( listBox )
 		{
-														
+
 			// now set the images
 
 			// enabled
@@ -3439,7 +3374,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 				GadgetSliderSetHiliteImageSmallCenter( slider, winFindImage( "VSliderLargeHiliteSmallRepeatingCenter" ) );
 				GadgetSliderSetHiliteThumbImage( slider, winFindImage( "VSliderLargeThumbHilite" ) );
 				GadgetSliderSetHiliteSelectedThumbImage( slider, winFindImage( "VSliderLargeThumbHilite" ) );
-		
+
 				// up button ------------------------------------------------------------
 
 				// enabled
@@ -3468,9 +3403,9 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 				GadgetButtonSetHiliteImage( downButton, winFindImage( "VSliderLargeDownButtonHilite" ) );
 				GadgetButtonSetHiliteSelectedImage( downButton, winFindImage( "VSliderLargeDownButtonHiliteSelected" ) );
 
-			}  // end if
+			}
 		}
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_PROGRESS_BAR ) )
 	{
 
@@ -3516,7 +3451,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		GadgetProgressBarSetHiliteBarImageCenter( gadget, winFindImage( "ProgressBarHiliteBarRepeatingCenter" ) );
 		GadgetProgressBarSetHiliteBarImageSmallCenter( gadget, winFindImage( "ProgressBarHiliteBarSmallRepeatingCenter" ) );
 
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_STATIC_TEXT ) )
 	{
 
@@ -3541,7 +3476,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		gadget->winSetHiliteTextColors( hiliteText, hiliteTextBorder );
 		gadget->winSetIMECompositeTextColors( imeCompositeText, imeCompositeTextBorder );
 
-	}  // end else if
+	}
 	else if( BitIsSet( instData->getStyle(), GWS_ENTRY_FIELD ) )
 	{
 
@@ -3575,9 +3510,9 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 		gadget->winSetHiliteTextColors( hiliteText, hiliteTextBorder );
 		gadget->winSetIMECompositeTextColors( imeCompositeText, imeCompositeTextBorder );
 
-	}  // end else if
+	}
 
-}  // end assignDefaultGadgetLook
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Given a text label, retreive the real localized text associated
@@ -3585,7 +3520,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget,
 //-------------------------------------------------------------------------------------------------
 UnicodeString GameWindowManager::winTextLabelToText( AsciiString label )
 {
-	
+
 	// sanity
 	if( label.isEmpty() )
 		return UnicodeString::TheEmptyString;
@@ -3595,7 +3530,7 @@ UnicodeString GameWindowManager::winTextLabelToText( AsciiString label )
 	tmp.translate(label);
 	return tmp;
 
-}  // end winTextLabelToText
+}
 
 //-------------------------------------------------------------------------------------------------
 /** find the top window at the given coordinates */
@@ -3638,16 +3573,16 @@ GameWindow *GameWindowManager::getWindowUnderCursor( Int x, Int y, Bool ignoreEn
 					window = window->winPointInChild( x, y, ignoreEnabled );
 					break;  // exit for
 				}
-			}  // end if
-		}  // end for window
+			}
+		}
 
 		// check !above, below and hidden
 		if( window == NULL )
 		{
 			for( window = m_windowList; window; window = window->m_next )
 			{
-				if( !BitIsSet( window->m_status, WIN_STATUS_ABOVE | 
-																				WIN_STATUS_BELOW | 
+				if( !BitIsSet( window->m_status, WIN_STATUS_ABOVE |
+																				WIN_STATUS_BELOW |
 																				WIN_STATUS_HIDDEN ) &&
 						x >= window->m_region.lo.x &&
 						x <= window->m_region.hi.x &&
@@ -3655,14 +3590,14 @@ GameWindow *GameWindowManager::getWindowUnderCursor( Int x, Int y, Bool ignoreEn
 						y <= window->m_region.hi.y)
 				{
 					if( BitIsSet( window->m_status, WIN_STATUS_ENABLED )|| ignoreEnabled)
-					{								
+					{
 						// determine which child window the mouse is in
 						window = window->winPointInChild( x, y, ignoreEnabled );
 						break;  // exit for
 					}
 				}
 			}
-		}  // end if, window == NULL
+		}
 
 		// check below and !hidden
 		if( window == NULL )
@@ -3684,8 +3619,8 @@ GameWindow *GameWindowManager::getWindowUnderCursor( Int x, Int y, Bool ignoreEn
 					}
 				}
 			}
-		}  // end if
-	}  // end else, no modal head
+		}
+	}
 
 	if( window )
 	{
@@ -3741,51 +3676,51 @@ Bool GameWindowManager::initTestGUI( void )
 	WinInstanceData instData;
 
 	// make some windows inside each other in the upper left
-	window = TheWindowManager->winCreate( NULL, statusFlags, 0, 0, 100, 100, NULL, NULL );
+	window = winCreate( NULL, statusFlags, 0, 0, 100, 100, NULL, NULL );
 	window->winSetInputFunc( testGrab );
-	window->winSetEnabledColor( 0, TheWindowManager->winMakeColor( 255, 254, 255, 255 ) );
-	window->winSetEnabledBorderColor( 0 , TheWindowManager->winMakeColor( 0, 0, 0, 255 ) );
-	window = TheWindowManager->winCreate( window, statusFlags, 10, 10, 50, 50, NULL, NULL );
+	window->winSetEnabledColor( 0, winMakeColor( 255, 254, 255, 255 ) );
+	window->winSetEnabledBorderColor( 0 , winMakeColor( 0, 0, 0, 255 ) );
+	window = winCreate( window, statusFlags, 10, 10, 50, 50, NULL, NULL );
 	window->winSetInputFunc( testGrab );
-	window->winSetEnabledColor( 0, TheWindowManager->winMakeColor( 128, 128, 128, 255 ) );
-	window->winSetEnabledBorderColor( 0 , TheWindowManager->winMakeColor( 0, 0, 0, 255 ) );
+	window->winSetEnabledColor( 0, winMakeColor( 128, 128, 128, 255 ) );
+	window->winSetEnabledBorderColor( 0 , winMakeColor( 0, 0, 0, 255 ) );
 
 	// make a push button
 	instData.init();
 	BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK );
 	instData.m_textLabelString = "What Up?";
-	window = TheWindowManager->gogoGadgetPushButton( NULL, 
-																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE, 
-																									 200, 100, 
-																									 100, 30, 
+	window = gogoGadgetPushButton( NULL,
+																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
+																									 200, 100,
+																									 100, 30,
 																									 &instData, NULL, TRUE );
 
 	// make a push button
 	instData.init();
 	BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK );
 	instData.m_textLabelString = "Enabled";
-	window = TheWindowManager->gogoGadgetPushButton( NULL, 
-																									 WIN_STATUS_ENABLED, 
-																									 330, 100, 
-																									 100, 30, 
+	window = gogoGadgetPushButton( NULL,
+																									 WIN_STATUS_ENABLED,
+																									 330, 100,
+																									 100, 30,
 																									 &instData, NULL, TRUE );
 
 	// make a push button
 	instData.init();
 	BitSet( instData.m_style, GWS_PUSH_BUTTON | GWS_MOUSE_TRACK );
 	instData.m_textLabelString = "Disabled";
-	window = TheWindowManager->gogoGadgetPushButton( NULL, 
-																									 0, 
-																									 450, 100, 
-																									 100, 30, 
+	window = gogoGadgetPushButton( NULL,
+																									 0,
+																									 450, 100,
+																									 100, 30,
 																									 &instData, NULL, TRUE );
 
 	// make a check box
 	instData.init();
 	instData.m_style = GWS_CHECK_BOX | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Check";
-	window = TheWindowManager->gogoGadgetCheckbox( NULL,
-																								 WIN_STATUS_ENABLED | 
+	window = gogoGadgetCheckbox( NULL,
+																								 WIN_STATUS_ENABLED |
 																								 WIN_STATUS_IMAGE,
 																								 200, 150,
 																								 100, 30,
@@ -3795,18 +3730,18 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.init();
 	instData.m_style = GWS_CHECK_BOX | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Check";
-	window = TheWindowManager->gogoGadgetCheckbox( NULL,
+	window = gogoGadgetCheckbox( NULL,
 																								 WIN_STATUS_ENABLED,
 																								 330, 150,
 																								 100, 30,
 																								 &instData, NULL, TRUE );
 
 	// make window to hold radio buttons
-	window = TheWindowManager->winCreate( NULL, WIN_STATUS_ENABLED | WIN_STATUS_DRAGABLE,
+	window = winCreate( NULL, WIN_STATUS_ENABLED | WIN_STATUS_DRAGABLE,
 																				200, 200, 250, 45, NULL );
 	window->winSetInputFunc( testGrab );
-	window->winSetEnabledColor( 0, TheWindowManager->winMakeColor( 50, 50, 50, 200 ) );
-	window->winSetEnabledBorderColor( 0, TheWindowManager->winMakeColor( 254, 254, 254, 255 ) );
+	window->winSetEnabledColor( 0, winMakeColor( 50, 50, 50, 200 ) );
+	window->winSetEnabledBorderColor( 0, winMakeColor( 254, 254, 254, 255 ) );
 
 	// make a radio button
 	GameWindow *radio;
@@ -3815,7 +3750,7 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.m_style = GWS_RADIO_BUTTON | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Mama Said!";
 	rData.group = 1;
-	radio = TheWindowManager->gogoGadgetRadioButton( window,
+	radio = gogoGadgetRadioButton( window,
 																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																									 10, 10,
 																									 100, 30,
@@ -3826,7 +3761,7 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.init();
 	instData.m_style = GWS_RADIO_BUTTON | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "On the Run";
-	radio = TheWindowManager->gogoGadgetRadioButton( window,
+	radio = gogoGadgetRadioButton( window,
 																									 WIN_STATUS_ENABLED,
 																									 130, 10,
 																									 100, 30,
@@ -3849,25 +3784,25 @@ Bool GameWindowManager::initTestGUI( void )
 	listData.columnWidth = NULL;
 	instData.init();
 	instData.m_style = GWS_SCROLL_LISTBOX | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetListBox( NULL,
+	window = gogoGadgetListBox( NULL,
 																								WIN_STATUS_ENABLED,
 																								200, 250,
 																								100, 100,
 																								&instData,
 																								&listData, NULL, TRUE );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Listbox text"), 
-												 TheWindowManager->winMakeColor( 255, 255, 255, 255 ), -1, 0 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"More text"), 
-												 TheWindowManager->winMakeColor( 105, 105, 255, 255 ), -1, 0 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Nothing"), 
-												 TheWindowManager->winMakeColor( 105, 105, 255, 255 ), -1, 0 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Seasons"), 
-												 TheWindowManager->winMakeColor( 105, 205, 255, 255 ), -1, 0 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Misery"), 
-												 TheWindowManager->winMakeColor( 235, 105, 255, 255 ), -1, 0 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Natural"), 
-												 TheWindowManager->winMakeColor( 105, 205, 45, 255 ), -1, 0 );
-	window->winSetFont( TheFontLibrary->getFont( AsciiString("Times New Roman"), 12, FALSE ) );
+	GadgetListBoxAddEntryText( window, L"Listbox text",
+												 winMakeColor( 255, 255, 255, 255 ), -1, 0 );
+	GadgetListBoxAddEntryText( window, L"More text",
+												 winMakeColor( 105, 105, 255, 255 ), -1, 0 );
+	GadgetListBoxAddEntryText( window, L"Nothing",
+												 winMakeColor( 105, 105, 255, 255 ), -1, 0 );
+	GadgetListBoxAddEntryText( window, L"Seasons",
+												 winMakeColor( 105, 205, 255, 255 ), -1, 0 );
+	GadgetListBoxAddEntryText( window, L"Misery",
+												 winMakeColor( 235, 105, 255, 255 ), -1, 0 );
+	GadgetListBoxAddEntryText( window, L"Natural",
+												 winMakeColor( 105, 205, 45, 255 ), -1, 0 );
+	window->winSetFont( TheFontLibrary->getFont( "Times New Roman", 12, FALSE ) );
 
 	// make a listbox
 	memset( &listData, 0, sizeof( ListboxData ) );
@@ -3882,24 +3817,24 @@ Bool GameWindowManager::initTestGUI( void )
 	listData.columnWidth = NULL;
 	instData.init();
 	instData.m_style = GWS_SCROLL_LISTBOX | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetListBox( NULL,
+	window = gogoGadgetListBox( NULL,
 																								WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																								75, 250,
 																								100, 100,
 																								&instData,
 																								&listData, NULL, TRUE );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Listbox text"), 
-												 TheWindowManager->winMakeColor( 255, 255, 255, 255 ), -1, -1 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"More text"), 
-												 TheWindowManager->winMakeColor( 105, 105, 255, 255 ), -1, -1 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Nothing"), 
-												 TheWindowManager->winMakeColor( 105, 105, 255, 255 ), -1, -1 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Seasons"), 
-												 TheWindowManager->winMakeColor( 105, 205, 255, 255 ), -1, -1 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Misery"), 
-												 TheWindowManager->winMakeColor( 235, 105, 255, 255 ), -1, -1 );
-	GadgetListBoxAddEntryText( window, UnicodeString(L"Natural"), 
-												 TheWindowManager->winMakeColor( 105, 205, 45, 255 ), -1, -1 );
+	GadgetListBoxAddEntryText( window, L"Listbox text",
+												 winMakeColor( 255, 255, 255, 255 ), -1, -1 );
+	GadgetListBoxAddEntryText( window, L"More text",
+												 winMakeColor( 105, 105, 255, 255 ), -1, -1 );
+	GadgetListBoxAddEntryText( window, L"Nothing",
+												 winMakeColor( 105, 105, 255, 255 ), -1, -1 );
+	GadgetListBoxAddEntryText( window, L"Seasons",
+												 winMakeColor( 105, 205, 255, 255 ), -1, -1 );
+	GadgetListBoxAddEntryText( window, L"Misery",
+												 winMakeColor( 235, 105, 255, 255 ), -1, -1 );
+	GadgetListBoxAddEntryText( window, L"Natural",
+												 winMakeColor( 105, 205, 45, 255 ), -1, -1 );
 
 	// make a vert slider
 	SliderData sliderData;
@@ -3910,7 +3845,7 @@ Bool GameWindowManager::initTestGUI( void )
 	sliderData.position = 0;
 	instData.init();
 	instData.m_style = GWS_VERT_SLIDER | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetSlider( NULL,
+	window = gogoGadgetSlider( NULL,
 																							 WIN_STATUS_ENABLED,
 																							 360, 250,
 																							 11, 100,
@@ -3925,7 +3860,7 @@ Bool GameWindowManager::initTestGUI( void )
 	sliderData.position = 0;
 	instData.init();
 	instData.m_style = GWS_VERT_SLIDER | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetSlider( NULL,
+	window = gogoGadgetSlider( NULL,
 																							 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																							 400, 250,
 																							 11, 100,
@@ -3940,7 +3875,7 @@ Bool GameWindowManager::initTestGUI( void )
 	sliderData.position = 0;
 	instData.init();
 	instData.m_style = GWS_HORZ_SLIDER | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetSlider( NULL,
+	window = gogoGadgetSlider( NULL,
 																							 WIN_STATUS_ENABLED,
 																							 200, 400,
 																							 200, 11,
@@ -3955,7 +3890,7 @@ Bool GameWindowManager::initTestGUI( void )
 	sliderData.position = 0;
 	instData.init();
 	instData.m_style = GWS_HORZ_SLIDER | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetSlider( NULL,
+	window = gogoGadgetSlider( NULL,
 																							 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																							 200, 420,
 																							 200, 11,
@@ -3965,7 +3900,7 @@ Bool GameWindowManager::initTestGUI( void )
 	// make a progress bar
 	instData.init();
 	instData.m_style = GWS_PROGRESS_BAR | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetProgressBar( NULL,
+	window = gogoGadgetProgressBar( NULL,
 																									 WIN_STATUS_ENABLED,
 																									 200, 450,
 																									 250, 15,
@@ -3974,7 +3909,7 @@ Bool GameWindowManager::initTestGUI( void )
 	// make a progress bar
 	instData.init();
 	instData.m_style = GWS_PROGRESS_BAR | GWS_MOUSE_TRACK;
-	window = TheWindowManager->gogoGadgetProgressBar( NULL,
+	window = gogoGadgetProgressBar( NULL,
 																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																									 200, 470,
 																									 250, 15,
@@ -3986,7 +3921,7 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.init();
 	instData.m_style = GWS_STATIC_TEXT | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Centered Static Text";
-	window = TheWindowManager->gogoGadgetStaticText( NULL,
+	window = gogoGadgetStaticText( NULL,
 																									 WIN_STATUS_ENABLED,
 																									 200, 490,
 																									 300, 25,
@@ -3998,14 +3933,14 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.init();
 	instData.m_style = GWS_STATIC_TEXT | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Not Centered Static Text";
-	window = TheWindowManager->gogoGadgetStaticText( NULL,
+	window = gogoGadgetStaticText( NULL,
 																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																									 200, 520,
 																									 300, 25,
 																									 &instData,
 																									 &textData, NULL, TRUE );
-	window->winSetEnabledTextColors( TheWindowManager->winMakeColor( 128, 128, 255, 255 ),
-																	 TheWindowManager->winMakeColor( 255, 255, 255, 255 ) );
+	window->winSetEnabledTextColors( winMakeColor( 128, 128, 255, 255 ),
+																	 winMakeColor( 255, 255, 255, 255 ) );
 
 	// make some entry text
 	EntryData entryData;
@@ -4014,7 +3949,7 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.init();
 	instData.m_style = GWS_ENTRY_FIELD | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Entry";
-	window = TheWindowManager->gogoGadgetTextEntry( NULL,
+	window = gogoGadgetTextEntry( NULL,
 																									 WIN_STATUS_ENABLED,
 																									 450, 270,
 																									 400, 30,
@@ -4027,7 +3962,7 @@ Bool GameWindowManager::initTestGUI( void )
 	instData.init();
 	instData.m_style = GWS_ENTRY_FIELD | GWS_MOUSE_TRACK;
 	instData.m_textLabelString = "Entry";
-	window = TheWindowManager->gogoGadgetTextEntry( NULL,
+	window = gogoGadgetTextEntry( NULL,
 																									 WIN_STATUS_ENABLED | WIN_STATUS_IMAGE,
 																									 450, 310,
 																									 400, 30,
@@ -4036,12 +3971,12 @@ Bool GameWindowManager::initTestGUI( void )
 
 	return TRUE;
 
-}  // end initTestGUI
+}
 
 
 void GameWindowManager::winNextTab( GameWindow *window )
 {
-	if(m_tabList.size() == 0|| m_modalHead)
+	if(m_tabList.empty()|| m_modalHead)
 		return;
 
 	GameWindowList::iterator it = m_tabList.begin();
@@ -4065,7 +4000,7 @@ void GameWindowManager::winNextTab( GameWindow *window )
 
 void GameWindowManager::winPrevTab( GameWindow *window )
 {
-	if(m_tabList.size() == 0 || m_modalHead)
+	if(m_tabList.empty() || m_modalHead)
 		return;
 
 	GameWindowList::reverse_iterator it = m_tabList.rbegin();
@@ -4083,7 +4018,7 @@ void GameWindowManager::winPrevTab( GameWindow *window )
 	else
 	{
 		winSetFocus(*m_tabList.rbegin());
-	}	
+	}
 	winSetLoneWindow(NULL);
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp
index 9a2176e1ece..b416fd0f5b1 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowManagerScript.cpp //////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -45,7 +45,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
@@ -72,11 +72,6 @@
 #include "GameClient/GameText.h"
 #include "GameClient/HeaderTemplate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -139,19 +134,19 @@ static Color defTextColor				= 0;
 static GameFont  *defFont				= NULL;
 
 //
-// These strings must be in the same order as they are in their definitions 
+// These strings must be in the same order as they are in their definitions
 // (see WIN_STATUS_* enums and GWS_* enums).
 //
-const char *WindowStatusNames[] = { "ACTIVE", "TOGGLE", "DRAGABLE", "ENABLED", "HIDDEN", 
+const char *const WindowStatusNames[] = { "ACTIVE", "TOGGLE", "DRAGABLE", "ENABLED", "HIDDEN",
 														  "ABOVE", "BELOW", "IMAGE", "TABSTOP", "NOINPUT",
 														  "NOFOCUS", "DESTROYED", "BORDER",
-														  "SMOOTH_TEXT", "ONE_LINE", "NO_FLUSH", "SEE_THRU", 
+														  "SMOOTH_TEXT", "ONE_LINE", "NO_FLUSH", "SEE_THRU",
 															"RIGHT_CLICK", "WRAP_CENTERED", "CHECK_LIKE","HOTKEY_TEXT",
 															"USE_OVERLAY_STATES", "NOT_READY", "FLASHING", "ALWAYS_COLOR",
-															"ON_MOUSE_DOWN",
+															"ON_MOUSE_DOWN", /*"SHORTCUT_BUTTON",*/
 															NULL };
 
-const char *WindowStyleNames[] = { "PUSHBUTTON",	"RADIOBUTTON",	"CHECKBOX",
+const char *const WindowStyleNames[] = { "PUSHBUTTON",	"RADIOBUTTON",	"CHECKBOX",
 														 "VERTSLIDER",	"HORZSLIDER",		"SCROLLLISTBOX",
 														 "ENTRYFIELD",	"STATICTEXT",		"PROGRESSBAR",
 														 "USER",				"MOUSETRACK",		"ANIMATED",
@@ -204,16 +199,16 @@ static GameWindow *parseWindow( File *inFile, char *buffer );
 	* for ParseBitString().  Sets the appropriate bit in the 'bits' arg,
 	* if successful.  Returns TRUE on success, else FALSE. */
 //=============================================================================
-static Bool parseBitFlag( const char *flagString, UnsignedInt *bits, 
-													const char **flagList )
+static Bool parseBitFlag( const char *flagString, UnsignedInt *bits,
+													ConstCharPtrArray flagList )
 {
-	const char **c;
+	ConstCharPtrArray c;
 	int i;
 
 	for( i = 0, c = flagList; *c; i++, c++ )
 	{
 
-		if( !stricmp( *c, flagString ) )
+		if( stricmp( *c, flagString ) == 0 )
 		{
 			*bits |= (1 << i);
 			return TRUE;
@@ -223,7 +218,7 @@ static Bool parseBitFlag( const char *flagString, UnsignedInt *bits,
 
 	return FALSE;
 
-}  // end parseBitFlag
+}
 
 // parseBitString =============================================================
 /** Given a character string of the form 'A+B+C+D', parse the
@@ -231,26 +226,26 @@ static Bool parseBitFlag( const char *flagString, UnsignedInt *bits,
 	* argument.
 	* Note that this routine does not clear any bits, only sets them. */
 //=============================================================================
-static void parseBitString( const char *inBuffer, UnsignedInt *bits, const char **flagList )
+static void parseBitString( const char *inBuffer, UnsignedInt *bits, ConstCharPtrArray flagList )
 {
 	char buffer[256];
 	char *tok;
 
 	// do not modify the inBuffer argument
-	strcpy( buffer, inBuffer );
+	strlcpy(buffer, inBuffer, ARRAY_SIZE(buffer));
 
-	if( strncmp( buffer, "NULL", 4 ) )
+	if( strncmp( buffer, "NULL", 4 ) != 0 )
 	{
 		for( tok = strtok( buffer, "+" ); tok; tok = strtok( NULL, "+" ) )
 		{
 			if ( !parseBitFlag( tok, bits, flagList ) )
 			{
-				DEBUG_LOG(( "ParseBitString: Invalid flag '%s'.\n", tok ));
+				DEBUG_LOG(( "ParseBitString: Invalid flag '%s'.", tok ));
 			}
 		}
 	}
 
-}  // end parseBitString
+}
 
 // readUntilSemicolon =========================================================
 //=============================================================================
@@ -259,26 +254,26 @@ static void readUntilSemicolon( File *fp, char *buffer, int maxBufLen )
 	int i = 0;
 	Bool start = TRUE;
 
-	while( i < maxBufLen ) 
+	while( i < maxBufLen )
 	{
 
 		// get next character
 		fp->read(buffer + i, 1);
 
 		// make all whitespace characters spaces
-		if( isspace( buffer[ i ] ) ) 
+		if( isspace( buffer[ i ] ) )
 		{
 
 			if( start == FALSE )
 				buffer[ i++ ] = ' ';
 
-		} 
-		else 
+		}
+		else
 		{
 
 			start = FALSE;
 
-			if( buffer[ i ] == ';' ) 
+			if( buffer[ i ] == ';' )
 			{
 
 				// found end of data chunk
@@ -292,11 +287,11 @@ static void readUntilSemicolon( File *fp, char *buffer, int maxBufLen )
 
 	}
 
-	DEBUG_LOG(( "ReadUntilSemicolon: ERROR - Read buffer overflow - input truncated.\n" ));
+	DEBUG_LOG(( "ReadUntilSemicolon: ERROR - Read buffer overflow - input truncated." ));
 
 	buffer[ maxBufLen - 1 ] = '\000';
 
-}  // end readUntilSemicolon
+}
 
 // scanBool ===================================================================
 //=============================================================================
@@ -307,7 +302,7 @@ static Int scanBool( const char *source, Bool& val )
 	val = (Bool)temp;
 
 	return ret;
-}  // end scanBool
+}
 
 // scanShort ==================================================================
 //=============================================================================
@@ -318,7 +313,7 @@ static Int scanShort( const char *source, Short& val )
 	val = (Short)temp;
 
 	return ret;
-}  // end scanShort
+}
 
 // scanInt ====================================================================
 //=============================================================================
@@ -327,7 +322,7 @@ static Int scanInt( const char *source, Int& val )
 	Int ret = sscanf( source, "%d", &val ); // not strictly necessary to wrap this, but it's more consistent
 
 	return ret;
-}  // end scanInt
+}
 
 // scanUnsignedInt ============================================================
 //=============================================================================
@@ -336,7 +331,7 @@ static Int scanUnsignedInt( const char *source, UnsignedInt& val )
 	Int ret = sscanf( source, "%d", &val ); // not strictly necessary to wrap this, but it's more consistent
 
 	return ret;
-}  // end scanUnsignedInt
+}
 
 // resetWindowStack ===========================================================
 //=============================================================================
@@ -346,7 +341,7 @@ static void resetWindowStack( void )
   memset( windowStack, 0, sizeof( windowStack ) );
   stackPtr = windowStack;
 
-}  // end resetWindowStack
+}
 
 // resetWindowDefaults ========================================================
 //=============================================================================
@@ -361,7 +356,7 @@ static void resetWindowDefaults( void )
 	defTextColor = 0;
 	defFont = 0;
 
-}  // end resetWindowDefaults
+}
 
 // peekWindow =================================================================
 //=============================================================================
@@ -369,10 +364,10 @@ static GameWindow *peekWindow( void )
 {
   if (stackPtr == windowStack)
     return NULL;
-  
+
   return *(stackPtr - 1);
 
-}  // end peekWindow
+}
 
 // popWindow ==================================================================
 //=============================================================================
@@ -385,27 +380,27 @@ static GameWindow *popWindow( void )
 
   return *stackPtr;
 
-}  // end popWindow
+}
 
 // pushWindow =================================================================
 //=============================================================================
 static void pushWindow( GameWindow *window )
 {
 
-  if( stackPtr == &windowStack[ WIN_STACK_DEPTH - 1 ] ) 
+  if( stackPtr == &windowStack[ WIN_STACK_DEPTH - 1 ] )
 	{
 
-    DEBUG_LOG(( "pushWindow: Warning, stack overflow\n" ));
+    DEBUG_LOG(( "pushWindow: Warning, stack overflow" ));
     return;
 
-  }  // end if
+  }
 
   *stackPtr++ = window;
 
-}  // end pushWindow
+}
 
 // parseColor =================================================================
-/** Parse a color entry and store it in the value pointed to by the 
+/** Parse a color entry and store it in the value pointed to by the
 	* 'color' parm. */
 //=============================================================================
 static Bool parseColor( Color *color, char *buffer )
@@ -426,15 +421,15 @@ static Bool parseColor( Color *color, char *buffer )
 
   return TRUE;
 
-}  // end parseColor
+}
 
 // parseDefaultColor ==========================================================
-/** Parse a default color entry and store it in the value pointed to by 
+/** Parse a default color entry and store it in the value pointed to by
 	* the 'color' parm. */
 //=============================================================================
 static Bool parseDefaultColor( Color *color, File *inFile, char *buffer )
 {
-	// eat '=' 
+	// eat '='
 //	fscanf( inFile, "%*s" );
 	AsciiString str;
 	inFile->scanString(str);
@@ -442,18 +437,18 @@ static Bool parseDefaultColor( Color *color, File *inFile, char *buffer )
   // Read the rest of the color definition
 	readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );
 
-  if (!strcmp( buffer, "TRANSPARENT" ))
+  if (strcmp( buffer, "TRANSPARENT" ) == 0)
 	{
-		
+
 		*color = WIN_COLOR_UNDEFINED;
 
-	}  // end if
+	}
   else
     parseColor( color, buffer );
 
   return TRUE;
 
-}  // end parseDefaultColor
+}
 
 // parseDefaultFont ===========================================================
 /** Parse the default font */
@@ -461,7 +456,7 @@ static Bool parseDefaultColor( Color *color, File *inFile, char *buffer )
 static Bool parseDefaultFont( GameFont *font, File *inFile, char *buffer )
 {
 
-	// eat '=' 
+	// eat '='
 //	fscanf( inFile, "%*s" );
 	AsciiString str;
 	inFile->scanString(str);
@@ -476,12 +471,12 @@ static Bool parseDefaultFont( GameFont *font, File *inFile, char *buffer )
 
 	return TRUE;
 
-}  // end parseDefaultFont
+}
 
 // parseTooltip ===============================================================
 /** Parse the tooltip field */
 //=============================================================================
-static Bool parseTooltip( const char *token, WinInstanceData *instData, 
+static Bool parseTooltip( const char *token, WinInstanceData *instData,
 													char *buffer, void *data )
 {
 	UnicodeString tooltip;
@@ -491,7 +486,7 @@ static Bool parseTooltip( const char *token, WinInstanceData *instData,
 	instData->setTooltipText( tooltip );
 	return TRUE;
 
-}  // end parseTooltip
+}
 
 // parseScreenRect ============================================================
 /** Parse the screen rect entry which tells us the position and size
@@ -554,14 +549,14 @@ static Bool parseScreenRect( const char *token, char *buffer,
 		*x = screenRegion.lo.x - parentScreenPos.x;
 		*y = screenRegion.lo.y - parentScreenPos.y;
 
-	}  // end if
+	}
 	else
 	{
 
 		*x = screenRegion.lo.x;
 		*y = screenRegion.lo.y;
 
-	}  // end else
+	}
 
 	// save our width and height from the adjusted screen region locations
 	*width = screenRegion.hi.x - screenRegion.lo.x;
@@ -569,12 +564,12 @@ static Bool parseScreenRect( const char *token, char *buffer,
 
 	return TRUE;
 
-}  // end parseScreenRect
+}
 
 // parseImageOffset ===========================================================
 /** Parse the image draw offset */
 //=============================================================================
-static Bool parseImageOffset( const char *token, WinInstanceData *instData, 
+static Bool parseImageOffset( const char *token, WinInstanceData *instData,
 															char *buffer, void *data )
 {
   char *c;
@@ -584,15 +579,15 @@ static Bool parseImageOffset( const char *token, WinInstanceData *instData,
 
 	c = strtok( NULL, " \t\n\r" );
 	instData->m_imageOffset.y = atoi( c );
-  
+
   return TRUE;
 
-}  // end parseImageOffset
+}
 
 // parseFont ==================================================================
 /** Parse the font field */
 //=============================================================================
-static Bool parseFont( const char *token, WinInstanceData *instData, 
+static Bool parseFont( const char *token, WinInstanceData *instData,
 											 char *buffer, void *data )
 {
 	char *c, *ptr;
@@ -610,7 +605,7 @@ static Bool parseFont( const char *token, WinInstanceData *instData,
 		ptr++;
 	ptr++;  // skip the "
 	c = strtok( ptr, stringSeps );  // value
-	strcpy( fontName, c );
+	strlcpy(fontName, c, ARRAY_SIZE(fontName));
 
 	// "SIZE"
 	c = strtok( NULL, seps );  // label
@@ -624,17 +619,14 @@ static Bool parseFont( const char *token, WinInstanceData *instData,
 
 	if( TheFontLibrary )
 	{
-		GameFont *font;
-
-		font = TheFontLibrary->getFont( AsciiString(fontName), fontSize, fontBold );
+		GameFont *font = TheFontLibrary->getFont( AsciiString(fontName), fontSize, fontBold );
 		if( font )
 			instData->m_font = font;
-
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end parseFont
+}
 
 // parseName =================================================================
 /** Parse the NAME field */
@@ -658,15 +650,15 @@ static Bool parseName( const char *token, WinInstanceData *instData,
 	assert( TheNameKeyGenerator );
 	if( TheNameKeyGenerator )
 		instData->m_id = (Int)TheNameKeyGenerator->nameToKey( instData->m_decoratedNameString );
-	
+
 	return TRUE;
 
-}  // end parseName
+}
 
 // parseStatus ================================================================
 /** Parse the STATUS field */
 //=============================================================================
-static Bool parseStatus( const char *token, WinInstanceData *instData, 
+static Bool parseStatus( const char *token, WinInstanceData *instData,
 												 char *buffer, void *data )
 {
 
@@ -675,12 +667,12 @@ static Bool parseStatus( const char *token, WinInstanceData *instData,
 
   return TRUE;
 
-}  // end parseStatus
+}
 
 // parseStyle =================================================================
 /** Parse the STYLE field */
 //=============================================================================
-static Bool parseStyle( const char *token, WinInstanceData *instData, 
+static Bool parseStyle( const char *token, WinInstanceData *instData,
 												char *buffer, void *data )
 {
 
@@ -689,7 +681,7 @@ static Bool parseStyle( const char *token, WinInstanceData *instData,
 
   return TRUE;
 
-}  // end parseStyle
+}
 
 // parseSystemCallback ========================================================
 /** Parse the system method callback for a window */
@@ -716,7 +708,7 @@ static Bool parseSystemCallback( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseSystemCallback
+}
 
 // parseInputCallback =========================================================
 /** Parse the Input method callback for a window */
@@ -743,7 +735,7 @@ static Bool parseInputCallback( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseInputCallback
+}
 
 // parseTooltipCallback =======================================================
 /** Parse the Tooltip method callback for a window */
@@ -770,7 +762,7 @@ static Bool parseTooltipCallback( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseTooltipCallback
+}
 
 // parseDrawCallback ==========================================================
 /** Parse the Draw method callback for a window */
@@ -797,7 +789,7 @@ static Bool parseDrawCallback( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseDrawCallback
+}
 
 // parseHeaderTemplate ==========================================================
 /** Parse the Draw method callback for a window */
@@ -818,12 +810,12 @@ static Bool parseHeaderTemplate( const char *token, WinInstanceData *instData,
 
 	// save a pointer of the function address
 	DEBUG_ASSERTCRASH( TheNameKeyGenerator && TheFunctionLexicon, ("Invalid singletons") );
-	
+
 	instData->m_headerTemplateName = c;
-	
+
 	return TRUE;
 
-}  // end parseDrawCallback
+}
 
 // parseListboxData ===========================================================
 /** Parse listbox data entry */
@@ -847,7 +839,7 @@ static Bool parseListboxData( const char *token, WinInstanceData *instData,
 
 	// "SCROLLIFATEND" (optional)
 	c = strtok( NULL, seps );  // label
-	if ( !stricmp(c, "ScrollIfAtEnd") )
+	if ( stricmp(c, "ScrollIfAtEnd") == 0 )
 	{
 		c = strtok( NULL, seps );  // value
 		scanBool( c, listData->scrollIfAtEnd );
@@ -878,7 +870,7 @@ static Bool parseListboxData( const char *token, WinInstanceData *instData,
 	scanShort( c, listData->columns );
 	if(listData->columns > 1)
 	{
-		listData->columnWidthPercentage = NEW Int[listData->columns];	
+		listData->columnWidthPercentage = NEW Int[listData->columns];
 		for(Int i = 0; i < listData->columns; i++ )
 		{
 			// "COLUMNS"
@@ -895,11 +887,11 @@ static Bool parseListboxData( const char *token, WinInstanceData *instData,
 	c = strtok( NULL, seps );  // value
 	scanBool( c, listData->forceSelect );
 
-	
-	// "	
+
+	// "
 	return TRUE;
 
-}  // end parseListboxData
+}
 
 // parseComboBoxData ===========================================================
 /** Parse Combo Box data entry */
@@ -918,22 +910,22 @@ static Bool parseComboBoxData( const char *token, WinInstanceData *instData,
 	c = strtok( NULL, seps );  // label
 	c = strtok( NULL, seps );	// value
   scanInt( c, comboData->maxChars );
-	
+
 	c = strtok( NULL, seps );  // label
 	c = strtok( NULL, seps );	// value
   scanInt( c, comboData->maxDisplay );
-	
+
 	c = strtok( NULL, seps );  // label
 	c = strtok( NULL, seps );	// value
   scanBool( c, comboData->asciiOnly );
-	
+
 	c = strtok( NULL, seps );  // label
 	c = strtok( NULL, seps );	// value
   scanBool( c, comboData->lettersAndNumbersOnly );
-	
+
 
   return TRUE;
-}//parseComboBoxData
+}
 
 // parseSliderData ============================================================
 /** Parse slider data entry */
@@ -957,7 +949,7 @@ static Bool parseSliderData( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseSliderData
+}
 
 // parseRadioButtonData =======================================================
 /** Parse radio button data entry */
@@ -976,18 +968,18 @@ static Bool parseRadioButtonData( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseRadioButtonData
+}
 
 
 // parseTooltipText ===========================================================
 /** Parse the TOOLTIPTEXT field */
 //=============================================================================
-static Bool parseTooltipText( const char *token, WinInstanceData *instData, 
+static Bool parseTooltipText( const char *token, WinInstanceData *instData,
 											 char *buffer, void *data )
 {
 	char *ptr = buffer;
 	char *c;
-	const char *stringSeps = "\n\r\t\""; 
+	const char *stringSeps = "\n\r\t\"";
 
 	// scan to the first " mark
 	while( *ptr != '"' )
@@ -998,19 +990,19 @@ static Bool parseTooltipText( const char *token, WinInstanceData *instData,
 	c = strtok( ptr, stringSeps );  // value
 	if( strlen( c ) >= MAX_TEXT_LABEL )
 	{
-		
-		DEBUG_LOG(( "TextTooltip label '%s' is too long, max is '%d'\n", c, MAX_TEXT_LABEL ));
+
+		DEBUG_LOG(( "TextTooltip label '%s' is too long, max is '%d'", c, MAX_TEXT_LABEL ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 	instData->m_tooltipString.set(c);
 	instData->setTooltipText(TheGameText->fetch(c));
-	
+
 
   return TRUE;
 
-}  // end parseTooltipText
+}
 
 // parseTooltipDelay =======================================================
 /** Parse the tooltip delay */
@@ -1028,18 +1020,18 @@ static Bool parseTooltipDelay( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseTooltipDelay
+}
 
 
 // parseText ==================================================================
 /** Parse the TEXT field */
 //=============================================================================
-static Bool parseText( const char *token, WinInstanceData *instData, 
+static Bool parseText( const char *token, WinInstanceData *instData,
 											 char *buffer, void *data )
 {
 	char *ptr = buffer;
 	char *c;
-	const char *stringSeps = "\n\r\t\""; 
+	const char *stringSeps = "\n\r\t\"";
 
 	// scan to the first " mark
 	while( *ptr != '"' )
@@ -1048,18 +1040,18 @@ static Bool parseText( const char *token, WinInstanceData *instData,
 	c = strtok( ptr, stringSeps );  // value
 	if( strlen( c ) >= MAX_TEXT_LABEL )
 	{
-		
-		DEBUG_LOG(( "Text label '%s' is too long, max is '%d'\n", c, MAX_TEXT_LABEL ));
+
+		DEBUG_LOG(( "Text label '%s' is too long, max is '%d'", c, MAX_TEXT_LABEL ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 	instData->m_textLabelString = c;
-	
+
 
   return TRUE;
 
-}  // end parseText
+}
 
 // parseTextColor =============================================================
 /** Parse text color entries for enabled, disabled, and hilite with
@@ -1088,11 +1080,11 @@ static Bool parseTextColor( const char *token, WinInstanceData *instData,
 		else
 		{
 
-			DEBUG_LOG(( "Undefined state for text color\n" ));
+			DEBUG_LOG(( "Undefined state for text color" ));
 			assert( 0 );
 			return FALSE;
 
-		}  // end else
+		}
 
 		// color
 		if( first == TRUE )
@@ -1122,11 +1114,11 @@ static Bool parseTextColor( const char *token, WinInstanceData *instData,
 		scanUnsignedInt( c, a );
 		textData->borderColor = GameMakeColor( r, g, b, a );
 
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end parseTextColor
+}
 
 // parseStaticTextData ========================================================
 /** Parse static text data entry */
@@ -1152,7 +1144,7 @@ static Bool parseStaticTextData( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseStaticTextDAta
+}
 
 // parseTextEntryData =========================================================
 /** Parse text entry data entry */
@@ -1191,7 +1183,7 @@ static Bool parseTextEntryData( const char *token, WinInstanceData *instData,
 
 	return TRUE;
 
-}  // end parseStaticTextDAta
+}
 
 // parseTabControlData =========================================================
 /** Parse tab control data entry */
@@ -1265,11 +1257,11 @@ static Bool parseDrawData( const char *token, WinInstanceData *instData,
 	{
 
 		// get the right draw data
-		if( strcmp( token, "ENABLEDDRAWDATA" ) == 0 )	
+		if( strcmp( token, "ENABLEDDRAWDATA" ) == 0 )
 			drawData = &instData->m_enabledDrawData[ i ];
-		else if( strcmp( token, "DISABLEDDRAWDATA" ) == 0 )	
+		else if( strcmp( token, "DISABLEDDRAWDATA" ) == 0 )
 			drawData = &instData->m_disabledDrawData[ i ];
-		else if( strcmp( token, "HILITEDRAWDATA" ) == 0 )	
+		else if( strcmp( token, "HILITEDRAWDATA" ) == 0 )
 			drawData = &instData->m_hiliteDrawData[ i ];
 		else if( strcmp( token, "LISTBOXENABLEDUPBUTTONDRAWDATA" ) == 0 )
 			drawData = &enabledUpButtonDrawData[ i ];
@@ -1316,11 +1308,11 @@ static Bool parseDrawData( const char *token, WinInstanceData *instData,
 		else
 		{
 
-			DEBUG_LOG(( "ParseDrawData, undefined token '%s'\n", token ));
+			DEBUG_LOG(( "ParseDrawData, undefined token '%s'", token ));
 			assert( 0 );
 			return FALSE;
 
-		}  // end else
+		}
 
 		// IMAGE: X
 		if( first == TRUE )
@@ -1328,9 +1320,9 @@ static Bool parseDrawData( const char *token, WinInstanceData *instData,
 		else
 			c = strtok( NULL, seps );  // label
 		first = FALSE;
-	
+
 		c = strtok( NULL, seps );  // value
-		if( strcmp( c, "NoImage" ) )
+		if( strcmp( c, "NoImage" ) != 0 )
 			drawData->image = TheMappedImageCollection->findImageByName( AsciiString( c ) );
 		else
 			drawData->image = NULL;
@@ -1358,11 +1350,11 @@ static Bool parseDrawData( const char *token, WinInstanceData *instData,
 		scanUnsignedInt( c, a );
 		drawData->borderColor = GameMakeColor( r, g, b, a );
 
-	}  // end for i
+	}
 
 	return TRUE;
 
-}  // end parseDrawData
+}
 
 // getDataTemplate ============================================================
 /** Given a window type style string return the address of a static
@@ -1380,57 +1372,57 @@ void *getDataTemplate( char *type )
 	static ComboBoxData	cData;
 	void *data;
 
-  if( !strcmp( type, "VERTSLIDER" ) || !strcmp( type, "HORZSLIDER" ) ) 
+  if( strcmp( type, "VERTSLIDER" ) == 0 || strcmp( type, "HORZSLIDER" ) == 0 )
 	{
 
     memset( &sData, 0, sizeof( SliderData ) );
     data = &sData;
 
-  } 
-	else if( !strcmp( type, "SCROLLLISTBOX" ) ) 
+  }
+	else if( strcmp( type, "SCROLLLISTBOX" ) == 0 )
 	{
 
     memset( &lData, 0, sizeof( ListboxData ) );
     data = &lData;
 
-  } 
-	else if( !strcmp( type, "TABCONTROL" ) ) 
+  }
+	else if( strcmp( type, "TABCONTROL" ) == 0 )
 	{
     memset( &tcData, 0, sizeof( TabControlData ) );
     data = &tcData;
-  } 
-	else if( !strcmp( type, "ENTRYFIELD" ) ) 
+  }
+	else if( strcmp( type, "ENTRYFIELD" ) == 0 )
 	{
 
     memset( &eData, 0, sizeof( EntryData ) );
     data = &eData;
 
-  } 
-	else if( !strcmp( type, "STATICTEXT" ) ) 
+  }
+	else if( strcmp( type, "STATICTEXT" ) == 0 )
 	{
 
 		memset( &tData, 0, sizeof( TextData ) );
 		data = &tData;
 
   }
-	else if( !strcmp( type, "RADIOBUTTON" ) ) 
-	{ 
+	else if( strcmp( type, "RADIOBUTTON" ) == 0 )
+	{
 
 		memset( &rData, 0, sizeof( RadioButtonData ) );
 		data = &rData;
-	}	
-	else if( !strcmp( type, "COMBOBOX" ) ) 
-	{ 
+	}
+	else if( strcmp( type, "COMBOBOX" ) == 0 )
+	{
 
 		memset( &cData, 0, sizeof( ComboBoxData ) );
 		data = &cData;
-	}	
+	}
 	else
     data = NULL;
 
   return data;
 
-}  // end getDataTemplate
+}
 
 // parseData ==================================================================
 //
@@ -1462,7 +1454,7 @@ static Bool parseData( void **data, char *type, char *buffer )
 	static RadioButtonData rData;
 	static ComboBoxData cData;
 
-  if( !strcmp( type, "VERTSLIDER" ) || !strcmp( type, "HORZSLIDER" ) ) 
+  if( strcmp( type, "VERTSLIDER" ) == 0 || strcmp( type, "HORZSLIDER" ) == 0 )
 	{
 
     memset( &sData, 0, sizeof( SliderData ) );
@@ -1475,8 +1467,8 @@ static Bool parseData( void **data, char *type, char *buffer )
 
     *data = &sData;
 
-  } 
-	else if( !strcmp( type, "SCROLLLISTBOX" ) ) 
+  }
+	else if( strcmp( type, "SCROLLLISTBOX" ) == 0 )
 	{
 
     memset( &lData, 0, sizeof( ListboxData ) );
@@ -1501,11 +1493,11 @@ static Bool parseData( void **data, char *type, char *buffer )
 
 		c = strtok( NULL, " \t\n\r" );
 		lData.forceSelect = atoi(c);
-		
+
     *data = &lData;
 
-  } 
-	else if( !strcmp( type, "ENTRYFIELD" ) ) 
+  }
+	else if( strcmp( type, "ENTRYFIELD" ) == 0 )
 	{
 
     memset( &eData, 0, sizeof( EntryData ) );
@@ -1545,13 +1537,13 @@ static Bool parseData( void **data, char *type, char *buffer )
 		}
     *data = &eData;
 
-  } 
-	else if( !strcmp( type, "STATICTEXT" ) ) 
+  }
+	else if( strcmp( type, "STATICTEXT" ) == 0 )
 	{
 
 	  c = strtok( buffer, " \t\n\r" );
     tData.centered = atoi(c);
-		
+
 		if( tData.centered != FALSE )
 			tData.centered = TRUE;
 
@@ -1567,8 +1559,8 @@ static Bool parseData( void **data, char *type, char *buffer )
 		*data = &tData;
 
   }
-	else if( !strcmp( type, "RADIOBUTTON" ) ) 
-	{ 
+	else if( strcmp( type, "RADIOBUTTON" ) == 0 )
+	{
 
 		c = strtok( buffer, " \t\n\r" );
 		rData.group = atoi(c);
@@ -1578,13 +1570,13 @@ static Bool parseData( void **data, char *type, char *buffer )
 //			tData.centered = TRUE;
 //		}
 		*data = &rData;
-	}	
+	}
 	else
     *data = NULL;
 
   return TRUE;
 
-}  // end parseData
+}
 
 // setWindowText ==============================================================
 /** Set the default text for a window or gadget control */
@@ -1616,34 +1608,34 @@ static void setWindowText( GameWindow *window, AsciiString textLabel )
 	else
 		window->winSetText( theText );
 
-}  // end setWindowText
+}
 
 // createGadget ===============================================================
 /** Create a gadget based on the 'type' parm */
 //=============================================================================
-static GameWindow *createGadget( char *type, 
-																 GameWindow *parent, 
+static GameWindow *createGadget( char *type,
+																 GameWindow *parent,
 																 Int status,
-																 Int x, Int y, 
-																 Int width, Int height, 
-																 WinInstanceData *instData, 
+																 Int x, Int y,
+																 Int width, Int height,
+																 WinInstanceData *instData,
 																 void *data )
 {
-  GameWindow *window;
+  GameWindow *window = NULL;
 
   instData->m_owner = parent;
 
-  if( !strcmp( type, "PUSHBUTTON" ) ) 
+  if( strcmp( type, "PUSHBUTTON" ) == 0 )
 	{
 
     instData->m_style |= GWS_PUSH_BUTTON;
-    window = TheWindowManager->gogoGadgetPushButton( parent, status, x, y, 
-																										 width, height, 
-																										 instData, 
+    window = TheWindowManager->gogoGadgetPushButton( parent, status, x, y,
+																										 width, height,
+																										 instData,
 																										 instData->m_font, FALSE );
 
-  } 
-	else if( !strcmp( type, "RADIOBUTTON" ) ) 
+  }
+	else if( strcmp( type, "RADIOBUTTON" ) == 0 )
 	{
 		RadioButtonData *rData = (RadioButtonData *)data;
 		char filename[ MAX_WINDOW_NAME_LEN ];
@@ -1653,49 +1645,49 @@ static GameWindow *createGadget( char *type,
 		// assign a screen identifier to the radio button based on the
 		// filename the radio button was saved in
 		//
-		
-		strcpy( filename, instData->m_decoratedNameString.str() );
+
+		strlcpy(filename, instData->m_decoratedNameString.str(), ARRAY_SIZE(filename));
 		c = strchr( filename, ':' );
 		if( c )
 			*c = 0;  // terminate after filename (format is filename:gadgetname)
 		assert( TheNameKeyGenerator );
 		if( TheNameKeyGenerator )
-			rData->screen = (Int)(TheNameKeyGenerator->nameToKey( AsciiString(filename) ));
+			rData->screen = (Int)(TheNameKeyGenerator->nameToKey( filename ));
 
     instData->m_style |= GWS_RADIO_BUTTON;
-    window = TheWindowManager->gogoGadgetRadioButton( parent, status, x, y, 
-																											width, height, 
-																											instData, rData, 
+    window = TheWindowManager->gogoGadgetRadioButton( parent, status, x, y,
+																											width, height,
+																											instData, rData,
 																											instData->m_font, FALSE );
 
-  } 
-	else if( !strcmp( type, "CHECKBOX" ) ) 
+  }
+	else if( strcmp( type, "CHECKBOX" ) == 0 )
 	{
 
     instData->m_style |= GWS_CHECK_BOX;
-    window = TheWindowManager->gogoGadgetCheckbox( parent, status, x, y, 
-																									 width, height, 
-																									 instData, 
+    window = TheWindowManager->gogoGadgetCheckbox( parent, status, x, y,
+																									 width, height,
+																									 instData,
 																									 instData->m_font, FALSE );
 
   }
-	else if( !strcmp( type, "TABCONTROL" ) ) 
+	else if( strcmp( type, "TABCONTROL" ) == 0 )
 	{
 		TabControlData *tcData = (TabControlData *)data;
     instData->m_style |= GWS_TAB_CONTROL;
-    window = TheWindowManager->gogoGadgetTabControl( parent, status, x, y, 
-																										width, height, 
+    window = TheWindowManager->gogoGadgetTabControl( parent, status, x, y,
+																										width, height,
 																										instData, tcData,
 																										instData->m_font, FALSE );
 	}
-	else if( !strcmp( type, "VERTSLIDER" ) ) 
+	else if( strcmp( type, "VERTSLIDER" ) == 0 )
 	{
     SliderData *sData = (SliderData *)data;
 
     instData->m_style |= GWS_VERT_SLIDER;
-    window = TheWindowManager->gogoGadgetSlider( parent, status, x, y, 
+    window = TheWindowManager->gogoGadgetSlider( parent, status, x, y,
 																								 width, height,
-																								 instData, sData, 
+																								 instData, sData,
 																								 instData->m_font, FALSE );
 
 		//
@@ -1715,19 +1707,19 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledSliderThumbDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteSliderThumbDrawData[ i ];
 
-			}  // end for i
+			}
 
-		}  //end if
+		}
 
   }
-	else if( !strcmp( type, "HORZSLIDER" ) ) 
+	else if( strcmp( type, "HORZSLIDER" ) == 0 )
 	{
     SliderData *sData = (SliderData *)data;
 
     instData->m_style |= GWS_HORZ_SLIDER;
-    window = TheWindowManager->gogoGadgetSlider( parent, status, x, y, 
+    window = TheWindowManager->gogoGadgetSlider( parent, status, x, y,
 																								 width, height,
-																								 instData, sData, 
+																								 instData, sData,
 																								 instData->m_font, FALSE );
 
 		//
@@ -1747,20 +1739,20 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledSliderThumbDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteSliderThumbDrawData[ i ];
 
-			}  // end for i
+			}
 
-		}  //end if
+		}
 
   }
-	else if( !strcmp( type, "SCROLLLISTBOX" ) ) 
+	else if( strcmp( type, "SCROLLLISTBOX" ) == 0 )
 	{
 
     ListboxData *lData = (ListboxData *)data;
 
     instData->m_style |= GWS_SCROLL_LISTBOX;
-    window = TheWindowManager->gogoGadgetListBox( parent, status, x, y, 
+    window = TheWindowManager->gogoGadgetListBox( parent, status, x, y,
 																									width, height,
-																									instData, lData, 
+																									instData, lData,
 																									instData->m_font, FALSE );
 
 		//
@@ -1780,9 +1772,9 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledUpButtonDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteUpButtonDrawData[ i ];
 
-			}  // end for i
+			}
 
-		}  // end if
+		}
 
 		GameWindow *downButton = GadgetListBoxGetDownButton( window );
 		if( downButton )
@@ -1796,9 +1788,9 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledDownButtonDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteDownButtonDrawData[ i ];
 
-			}  // end for i
+			}
 
-		}  // end if
+		}
 
 		GameWindow *slider = GadgetListBoxGetSlider( window );
 		if( slider )
@@ -1812,7 +1804,7 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledSliderDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteSliderDrawData[ i ];
 
-			}  // end for i
+			}
 
 			// do the slider thumb
 			GameWindow *thumb = slider->winGetChild();
@@ -1827,21 +1819,21 @@ static GameWindow *createGadget( char *type,
 					instData->m_disabledDrawData[ i ] = disabledSliderThumbDrawData[ i ];
 					instData->m_hiliteDrawData[ i ] = hiliteSliderThumbDrawData[ i ];
 
-				}  // end for i
+				}
 
-			}  //end if
+			}
 
-		}  // end if
+		}
 
   }
-	else if( !strcmp( type, "COMBOBOX" ) ) 
+	else if( strcmp( type, "COMBOBOX" ) == 0 )
 	{
 		ComboBoxData *cData = (ComboBoxData *)data;
 		cData->entryData = NEW EntryData;
 		memset ( cData->entryData, 0, sizeof(EntryData));
 		cData->listboxData = NEW ListboxData;
 		memset ( cData->listboxData, 0, sizeof(ListboxData));
-		
+
 		//initialize combo box data
 		//cData->isEditable = TRUE;
 		//cData->maxChars = 16;
@@ -1851,7 +1843,7 @@ static GameWindow *createGadget( char *type,
 		cData->entryData->aSCIIOnly = cData->asciiOnly;
 		cData->entryData->alphaNumericalOnly = cData->lettersAndNumbersOnly;
 		cData->entryData->maxTextLen = cData->maxChars;
-	
+
 		//initialize listbox data
 		cData->listboxData->listLength = 10;
 		cData->listboxData->autoScroll = 0;
@@ -1865,11 +1857,11 @@ static GameWindow *createGadget( char *type,
 		cData->listboxData->columnWidthPercentage = NULL;
 
     instData->m_style |= GWS_COMBO_BOX;
-    window = TheWindowManager->gogoGadgetComboBox( parent, status, x, y, 
+    window = TheWindowManager->gogoGadgetComboBox( parent, status, x, y,
 																									width, height,
-																									instData, cData, 
+																									instData, cData,
 																									instData->m_font, FALSE );
-		
+
 		GameWindow *dropDownButton = GadgetComboBoxGetDropDownButton( window );
 		if( dropDownButton )
 		{
@@ -1882,8 +1874,8 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledDropDownButtonDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteDropDownButtonDrawData[ i ];
 
-			}  // end for i
-		} // end if
+			}
+		}
 
 		GameWindow *editBox = GadgetComboBoxGetEditBox( window );
 		if( editBox )
@@ -1897,8 +1889,8 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledEditBoxDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteEditBoxDrawData[ i ];
 
-			}  // end for i
-		} // end if
+			}
+		}
 
 
 		GameWindow *listBox = GadgetComboBoxGetListBox( window );
@@ -1913,8 +1905,8 @@ static GameWindow *createGadget( char *type,
 				instData->m_disabledDrawData[ i ] = disabledListBoxDrawData[ i ];
 				instData->m_hiliteDrawData[ i ] = hiliteListBoxDrawData[ i ];
 
-			}  // end for i
-			
+			}
+
 
 			GameWindow *upButton = GadgetListBoxGetUpButton( listBox );
 			if( upButton )
@@ -1928,9 +1920,9 @@ static GameWindow *createGadget( char *type,
 					instData->m_disabledDrawData[ i ] = disabledUpButtonDrawData[ i ];
 					instData->m_hiliteDrawData[ i ] = hiliteUpButtonDrawData[ i ];
 
-				}  // end for i
+				}
 
-			}  // end if
+			}
 
 			GameWindow *downButton = GadgetListBoxGetDownButton( listBox );
 			if( downButton )
@@ -1944,9 +1936,9 @@ static GameWindow *createGadget( char *type,
 					instData->m_disabledDrawData[ i ] = disabledDownButtonDrawData[ i ];
 					instData->m_hiliteDrawData[ i ] = hiliteDownButtonDrawData[ i ];
 
-				}  // end for i
+				}
 
-			}  // end if
+			}
 
 			GameWindow *slider = GadgetListBoxGetSlider( listBox );
 			if( slider )
@@ -1960,7 +1952,7 @@ static GameWindow *createGadget( char *type,
 					instData->m_disabledDrawData[ i ] = disabledSliderDrawData[ i ];
 					instData->m_hiliteDrawData[ i ] = hiliteSliderDrawData[ i ];
 
-				}  // end for i
+				}
 
 				// do the slider thumb
 				GameWindow *thumb = slider->winGetChild();
@@ -1975,60 +1967,60 @@ static GameWindow *createGadget( char *type,
 						instData->m_disabledDrawData[ i ] = disabledSliderThumbDrawData[ i ];
 						instData->m_hiliteDrawData[ i ] = hiliteSliderThumbDrawData[ i ];
 
-					}  // end for i
+					}
 
-				}  //end if
+				}
 
-			}  // end if
+			}
 		}
   }
-	else if( !strcmp( type, "ENTRYFIELD" ) ) 
+	else if( strcmp( type, "ENTRYFIELD" ) == 0 )
 	{
     EntryData *eData = (EntryData *)data;
 
     instData->m_style |= GWS_ENTRY_FIELD;
-    window = TheWindowManager->gogoGadgetTextEntry( parent, status, x, y, 
+    window = TheWindowManager->gogoGadgetTextEntry( parent, status, x, y,
 																										width, height,
-																										instData, eData, 
+																										instData, eData,
 																										instData->m_font, FALSE );
 
   }
-	else if( !strcmp( type, "STATICTEXT" ) ) 
+	else if( strcmp( type, "STATICTEXT" ) == 0 )
 	{
     TextData *tData = (TextData *)data;
 
     instData->m_style |= GWS_STATIC_TEXT;
-    window = TheWindowManager->gogoGadgetStaticText( parent, status, x, y, 
+    window = TheWindowManager->gogoGadgetStaticText( parent, status, x, y,
 																										 width, height,
-																										 instData, tData, 
+																										 instData, tData,
 																										 instData->m_font, FALSE );
 
 
   }
-	else if( !strcmp( type, "PROGRESSBAR" ) ) 
+	else if( strcmp( type, "PROGRESSBAR" ) == 0 )
 	{
 
     instData->m_style |= GWS_PROGRESS_BAR;
-    window = TheWindowManager->gogoGadgetProgressBar( parent, status, x, y, 
-																											width, height, 
-																											instData, 
+    window = TheWindowManager->gogoGadgetProgressBar( parent, status, x, y,
+																											width, height,
+																											instData,
 																											instData->m_font, FALSE );
 
   }
 
   return window;
 
-}  // end createGadget
+}
 
 // createWindow ===============================================================
 // Create a user window or a gadget depending on the 'type' parm
 //=============================================================================
-static GameWindow *createWindow( char *type, 
-																 Int id, 
-																 Int status, 
+static GameWindow *createWindow( char *type,
+																 Int id,
+																 Int status,
 																 Int x, Int y,
-																 Int width, Int height, 
-																 WinInstanceData *instData, 
+																 Int width, Int height,
+																 WinInstanceData *instData,
 																 void *data,
 																 GameWinSystemFunc system,
 																 GameWinInputFunc input,
@@ -2041,12 +2033,12 @@ static GameWindow *createWindow( char *type,
   parent = peekWindow();
 
   // If this is a regular window just create it
-  if( !strcmp( type, "USER" ) ) 
+  if( strcmp( type, "USER" ) == 0 )
 	{
 
-    window = TheWindowManager->winCreate( parent, 
-																					status, x, y, 
-																					width, height, 
+    window = TheWindowManager->winCreate( parent,
+																					status, x, y,
+																					width, height,
 																					system );
 		if( window )
 		{
@@ -2055,15 +2047,15 @@ static GameWindow *createWindow( char *type,
 			window->winSetInstanceData( instData );
 			window->winSetWindowId( id );
 
-		}  // end if
+		}
 
-  } 
-	else if( !strcmp( type, "TABPANE" ) ) 
+  }
+	else if( strcmp( type, "TABPANE" ) == 0 )
 	{
 
-    window = TheWindowManager->winCreate( parent, 
-																					status, x, y, 
-																					width, height, 
+    window = TheWindowManager->winCreate( parent,
+																					status, x, y,
+																					width, height,
 																					system );
 		if( window )
 		{
@@ -2072,28 +2064,28 @@ static GameWindow *createWindow( char *type,
 			window->winSetInstanceData( instData );
 			window->winSetWindowId( id );
 
-		}  // end if
+		}
 
-  } 
+  }
 
-	else 
+	else
 	{
 
     // Else parse the type and create the gadget
-    window = createGadget( type, 
-													 parent, 
-													 status, 
-													 x, y, 
+    window = createGadget( type,
+													 parent,
+													 status,
+													 x, y,
 													 width, height,
-                           instData, 
+                           instData,
 													 data );
 		if( window )
 		{
 
 			// set id
 			window->winSetWindowId( id );
-			
-		}  // end if
+
+		}
 
   }
 
@@ -2110,7 +2102,7 @@ static GameWindow *createWindow( char *type,
 			window->winSetTooltipFunc( tooltip );
 		if( draw )
 			window->winSetDrawFunc( draw );
-		
+
 		// save strings for edit data if present
 		GameWindowEditData *editData = window->winGetEditData();
 		if( editData )
@@ -2121,9 +2113,9 @@ static GameWindow *createWindow( char *type,
 			editData->tooltipCallbackString = theTooltipString;
 			editData->drawCallbackString = theDrawString;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	if( window )
 	{
@@ -2131,7 +2123,7 @@ static GameWindow *createWindow( char *type,
 		// set any text read from the textLabel
 		setWindowText( window, instData->m_textLabelString );
 
-	}  // end if
+	}
 
   // If there is a parent window, send it the SCRIPT_CREATE message
   if( window && parent )
@@ -2139,14 +2131,14 @@ static GameWindow *createWindow( char *type,
 
   return window;
 
-}  // end createWindow
+}
 
 // parseChildWindows ==========================================================
 /** Parse window descriptions until an extra end is encountered indicating
 	* the end of this block of child window descriptions. */
 //=============================================================================
-static Bool parseChildWindows( GameWindow *window, 
-															 File *inFile, 
+static Bool parseChildWindows( GameWindow *window,
+															 File *inFile,
 															 char *buffer )
 {
   GameWindow *lastWindow;
@@ -2163,11 +2155,11 @@ static Bool parseChildWindows( GameWindow *window,
 			TheWindowManager->winDestroy( myChild );
 		}
 	}
-		
+
 		// Push the current window onto the stack so we know it's the parent
   pushWindow( window );
 
-	while( TRUE ) 
+	while( TRUE )
 	{
 
 		if (inFile->scanString(asciibuf) == FALSE) {
@@ -2185,34 +2177,34 @@ static Bool parseChildWindows( GameWindow *window,
 		if (asciibuf.compare("ENABLEDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defEnabledColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defEnabledColor, inFile, buffer ) == FALSE )
 			{
 				return FALSE;
 			}
 
-		} 
+		}
 		else if (asciibuf.compare("DISABLEDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defDisabledColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defDisabledColor, inFile, buffer ) == FALSE )
 			{
 				return FALSE;
 			}
 
-		} 
+		}
 		else if (asciibuf.compare("HILITECOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defHiliteColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defHiliteColor, inFile, buffer ) == FALSE )
 			{
 				return FALSE;
 			}
 
-		} 
+		}
 		else if (asciibuf.compare("SELECTEDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defSelectedColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defSelectedColor, inFile, buffer ) == FALSE )
 			{
 				return FALSE;
 			}
@@ -2221,7 +2213,7 @@ static Bool parseChildWindows( GameWindow *window,
 		else if (asciibuf.compare("TEXTCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defTextColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defTextColor, inFile, buffer ) == FALSE )
 			{
 				return FALSE;
 			}
@@ -2231,22 +2223,22 @@ static Bool parseChildWindows( GameWindow *window,
 		{
 
       // Parse window descriptions until the last END is read
-			if( parseWindow( inFile, buffer ) == NULL ) 
+			if( parseWindow( inFile, buffer ) == NULL )
 			{
 				return FALSE;
 			}
 
 		}
 
-	}  // end while( TRUE )
+	}
 
   // Pop the current window off the stack
   lastWindow = popWindow();
 
-  if( lastWindow != window ) 
+  if( lastWindow != window )
 	{
 
-    DEBUG_LOG(( "parseChildWindows: unmatched window on stack.  Corrupt stack or bad source\n" ));
+    DEBUG_LOG(( "parseChildWindows: unmatched window on stack.  Corrupt stack or bad source" ));
     return FALSE;
 
   }
@@ -2256,10 +2248,10 @@ static Bool parseChildWindows( GameWindow *window,
 
   return TRUE;
 
-}  // end parseChildWindows
+}
 
 // lookup table for parsing functions
-static GameWindowParse gameWindowFieldList[] = 
+static GameWindowParse gameWindowFieldList[] =
 {
 	{ "NAME", parseName },
 	{ "STATUS", parseStatus },
@@ -2348,12 +2340,12 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 	if( parent )
 	{
 		parent->winGetSize( &parentSize.x, &parentSize.y );
-	}  // end if
+	}
 	else
 	{
 		parentSize.x = TheDisplay->getWidth();
 		parentSize.y = TheDisplay->getHeight();
-	}  // end else
+	}
 
 	// Initialize the instance data to the defaults
 	/// @todo need to support enabled/disabled/hilite text colors here
@@ -2369,63 +2361,63 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 	instData.m_font = defFont;
 
 	//
-	// read the first few lines that are required to be first in a 
+	// read the first few lines that are required to be first in a
 	// window definition file including position, size, type, and id
 	//
 
 	// window type
-	readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );	
+	readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );
 	c = strtok( buffer, seps );
 	assert( strcmp( c, "WINDOWTYPE" ) == 0 );
 	c = strtok( NULL, seps );  // get data to right of = sign
-	strcpy( type, c );
+	strlcpy(type, c, ARRAY_SIZE(type));
 
 	//
 	// based on the window type get a pointer for any specific data
 	// for the gadget controls needed
 	//
 	data = getDataTemplate( type );
-	
+
 	// position
-	readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );	
+	readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );
 	c = strtok( buffer, seps );
 	assert( strcmp( c, "SCREENRECT" ) == 0 );
 	if( parseScreenRect( c, buffer, &x, &y, &width, &height ) == FALSE )
 		goto cleanupAndExit;
 
 	// parse all the field definitions
-	while( TRUE ) 
+	while( TRUE )
 	{
 
 		// get token
 		inFile->scanString(asciibuf);
 
 		// parse field
-		for( parse = gameWindowFieldList; parse->parse; parse++ ) 
+		for( parse = gameWindowFieldList; parse->parse; parse++ )
 		{
 
 			if (asciibuf.compare(parse->name) == 0)
 			{
-				
-				strcpy( token, asciibuf.str() );
+
+				strlcpy(token, asciibuf.str(), ARRAY_SIZE(token));
 
 				// eat '='
 				inFile->scanString(asciibuf);
 
 				readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );
 
-				if (parse->parse( token, &instData, buffer, data ) == FALSE ) 
+				if (parse->parse( token, &instData, buffer, data ) == FALSE )
 				{
-					DEBUG_LOG(( "parseGameObject: Error parsing %s\n", parse->name ));
+					DEBUG_LOG(( "parseGameObject: Error parsing %s", parse->name ));
 					goto cleanupAndExit;
 				}
 
 				break;
 			}
 
-		}  // end for
+		}
 
-		if( parse->parse == NULL ) 
+		if( parse->parse == NULL )
 		{
 
 			// If it's the END keyword
@@ -2437,13 +2429,13 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 
 				readUntilSemicolon( inFile, buffer, WIN_BUFFER_LENGTH );
 
-				if( parseData( &data, type, buffer ) == FALSE ) 
+				if( parseData( &data, type, buffer ) == FALSE )
 				{
-					DEBUG_LOG(( "parseGameWindow: Error parsing %s\n", parse->name ));
+					DEBUG_LOG(( "parseGameWindow: Error parsing %s", parse->name ));
 					goto cleanupAndExit;
 				}
 
-			} 
+			}
 			else if (asciibuf.compare("END") == 0)
 			{
 				// Check to see if we have a header template, if so, set the font equal to that.
@@ -2453,13 +2445,13 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 				// Create a window using the current description
 				if( window == NULL )
 					window = createWindow( type, instData.m_id, instData.getStatus(), x, y,
-																 width, height, &instData, data, 
+																 width, height, &instData, data,
 																 systemFunc, inputFunc, tooltipFunc, drawFunc );
 
-				
+
 				goto cleanupAndExit;
 
-			} 
+			}
 			else if (asciibuf.compare("CHILD") == 0)
 			{
 
@@ -2479,10 +2471,10 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 					window = NULL;
 					goto cleanupAndExit;
 
-				}  // end if
+				}
 
-			} 
-			else 
+			}
+			else
 			{
 
 				// Else it is unrecognized so eat associated data
@@ -2490,9 +2482,9 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 
 			}
 
-		}  // end if
+		}
 
-	}  // end while( TRUE )
+	}
 
 cleanupAndExit:
 
@@ -2507,7 +2499,7 @@ static GameWindow *parseWindow( File *inFile, char *buffer )
 
 	return window;
 
-}  // end parseWindow
+}
 
 //=================================================================================================
 //=================================================================================================
@@ -2530,7 +2522,7 @@ Bool parseInit( const char *token, char *buffer, UnsignedInt version, WindowLayo
 
 	return TRUE;  // success
 
-}  // end parseInit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse update for layout file */
@@ -2549,7 +2541,7 @@ Bool parseUpdate( const char *token, char *buffer, UnsignedInt version, WindowLa
 
 	return TRUE;  // success
 
-}  // end parseUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse shutdown for layout file */
@@ -2568,7 +2560,7 @@ Bool parseShutdown( const char *token, char *buffer, UnsignedInt version, Window
 
 	return TRUE;  // success
 
-}  // end parseShutdown
+}
 
 static LayoutScriptParse layoutScriptTable[] =
 {
@@ -2623,23 +2615,23 @@ Bool parseLayoutBlock( File *inFile, char *buffer, UnsignedInt version, WindowLa
 				// eat equals separator " = "
 				c = strtok( buffer, " =" );
 
-				strcpy(token, asciitoken.str());
-				
+				strlcpy(token, asciitoken.str(), ARRAY_SIZE(token));
+
 				// parse it
-				if( parse->parse( token, c, version, info ) == FALSE )	
+				if( parse->parse( token, c, version, info ) == FALSE )
 					return FALSE;
 
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for parse
+		}
 
-	}  // end while
+	}
 
 	return TRUE;
 
-}  // end parseLayoutBlock
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -2663,12 +2655,12 @@ WindowLayout *GameWindowManager::winCreateLayout( AsciiString filename )
 		deleteInstance(layout);
 		return NULL;
 
-	}  // end if
-	
+	}
+
 	// return loaded layout
 	return layout;
 
-}  // end winCreateLayout
+}
 
 /** Free up the memory used by static strings.  Normally this memory
 is freed by the string destructor but we do it here to make the
@@ -2698,7 +2690,7 @@ WindowLayoutInfo::WindowLayoutInfo() :
 	* within it.
 	*
 	* NOTE: The FIRST window created from the script is returned, this
-	* way if you want to know ALL of the windows created from this 
+	* way if you want to know ALL of the windows created from this
 	* layout file you must iterate over info->windows, since the windows will
 	* not be at the head of the window list if there is a modal window active.
 	*/
@@ -2732,19 +2724,19 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 	if( strchr( filename, '\\' ) == NULL )
 		sprintf( filepath, "Window\\%s", filename );
 	else
-		strcpy( filepath, filename );
+		strlcpy(filepath, filename, ARRAY_SIZE(filepath));
 
   // Open the input file
 	inFile = TheFileSystem->openFile(filepath, File::READ);
 	if (inFile == NULL)
 	{
-		DEBUG_LOG(( "WinCreateFromScript: Cannot access file '%s'.\n", filename ));
+		DEBUG_LOG(( "WinCreateFromScript: Cannot access file '%s'.", filename ));
 		return NULL;
 	}
 
   // read into memory
   inFile=inFile->convertToRAMFile();
-  
+
 	// read the file version
 	Int version;
 	inFile->read(NULL, strlen("FILE_VERSION = "));
@@ -2758,12 +2750,12 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		if( parseLayoutBlock( inFile, buffer, version, &scriptInfo ) == FALSE )
 		{
 
-			DEBUG_LOG(( "WinCreateFromScript: Error parsing layout block\n" ));
+			DEBUG_LOG(( "WinCreateFromScript: Error parsing layout block" ));
 			return FALSE;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 
@@ -2772,9 +2764,9 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		scriptInfo.updateNameString = "[None]";
 		scriptInfo.shutdownNameString = "[None]";
 
-	}  // end else
+	}
 
-	while( TRUE ) 
+	while( TRUE )
 	{
 
 		if (inFile->scanString(asciibuf) == FALSE) {
@@ -2788,7 +2780,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		if (asciibuf.compare("ENABLEDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defEnabledColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defEnabledColor, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2799,7 +2791,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		else if (asciibuf.compare("DISABLEDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defDisabledColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defDisabledColor, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2810,7 +2802,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		else if (asciibuf.compare("HILITECOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defHiliteColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defHiliteColor, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2821,7 +2813,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		else if (asciibuf.compare("SELECTEDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defSelectedColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defSelectedColor, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2832,7 +2824,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		else if (asciibuf.compare("TEXTCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defTextColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defTextColor, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2843,7 +2835,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		else if (asciibuf.compare("BACKGROUNDCOLOR") == 0)
 		{
 
-			if( parseDefaultColor( &defBackgroundColor, inFile, buffer ) == FALSE ) 
+			if( parseDefaultColor( &defBackgroundColor, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2854,7 +2846,7 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 		else if (asciibuf.compare("FONT") == 0)
 		{
 
-			if( parseDefaultFont( defFont, inFile, buffer ) == FALSE ) 
+			if( parseDefaultFont( defFont, inFile, buffer ) == FALSE )
 			{
 				inFile->close();
 				inFile = NULL;
@@ -2874,9 +2866,9 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 
 			scriptInfo.windows.push_back(window);
 
-    }  // end else if
+    }
 
-	}  // end while( TRUE )
+	}
 
 	// close the file
 	inFile->close();
@@ -2889,5 +2881,5 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
 	// return the first window created
 	return firstWindow;
 
-}  // end WinCreateFromScript
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp
index 6bdb319c9c3..38ee36d9553 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowTransitions.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Dec 2002
@@ -37,8 +37,8 @@
 //	Filename: 	GameWindowTransitions.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,12 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -60,17 +55,18 @@
 #include "GameClient/GameWindowTransitions.h"
 #include "GameClient/GameWindow.h"
 #include "GameClient/GameWindowManager.h"
+#include "Common/FramePacer.h"
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 GameWindowTransitionsHandler *TheTransitionHandler = NULL;
-const FieldParse GameWindowTransitionsHandler::m_gameWindowTransitionsFieldParseTable[] = 
+const FieldParse GameWindowTransitionsHandler::m_gameWindowTransitionsFieldParseTable[] =
 {
 
 	{ "Window",		GameWindowTransitionsHandler::parseWindow,	NULL, NULL	},
 	{ "FireOnce",	INI::parseBool,															NULL, offsetof( TransitionGroup, m_fireOnce) 	},
-	
-	{ NULL,										NULL,													NULL, 0 }  // keep this last
+
+	{ NULL,										NULL,													NULL, 0 }
 
 };
 
@@ -81,20 +77,20 @@ void INI::parseWindowTransitions( INI* ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
-	
-	DEBUG_ASSERTCRASH( TheTransitionHandler, ("parseWindowTransitions: TheTransitionHandler doesn't exist yet\n") );
+
+	DEBUG_ASSERTCRASH( TheTransitionHandler, ("parseWindowTransitions: TheTransitionHandler doesn't exist yet") );
 	if( !TheTransitionHandler )
 		return;
 
 	// If we have a previously allocated control bar, this will return a cleared out pointer to it so we
-	// can overwrite it	
+	// can overwrite it
 	g = TheTransitionHandler->getNewGroup( name );
 
 	// sanity
-	DEBUG_ASSERTCRASH( g, ("parseWindowTransitions: Unable to allocate group '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( g, ("parseWindowTransitions: Unable to allocate group '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( g, TheTransitionHandler->getFieldParse() );
@@ -162,9 +158,8 @@ TransitionWindow::~TransitionWindow( void )
 		m_win->unlinkTransitionWindow(this);
 
 	m_win = NULL;
-	if(m_transition)
-		delete m_transition;
 
+	delete m_transition;
 	m_transition = NULL;
 }
 
@@ -176,10 +171,8 @@ Bool TransitionWindow::init( void )
 //	DEBUG_ASSERTCRASH( m_win, ("TransitionWindow::init Failed to find window %s", m_winName.str()));
 //	if( !m_win )
 //		return FALSE;
-	
-	if(m_transition)
-		delete m_transition;
 
+	delete m_transition;
 	m_transition = getTransitionForStyle( m_style );
 	m_transition->init(m_win);
 
@@ -194,7 +187,7 @@ void TransitionWindow::update( Int frame )
 {
 	if(frame < m_currentFrameDelay || frame > (m_currentFrameDelay + m_transition->getFrameLength()))
 		return;
-	
+
 	if(m_transition)
 		m_transition->update( frame - m_currentFrameDelay);
 }
@@ -258,7 +251,6 @@ TransitionGroup::~TransitionGroup( void )
 	{
 		TransitionWindow *tWin = *it;
 		delete tWin;
-		tWin = NULL;
 		it = m_transitionWindowList.erase(it);
 	}
 }
@@ -279,14 +271,16 @@ void TransitionGroup::init( void )
 
 void TransitionGroup::update( void )
 {
-	m_currentFrame += m_directionMultiplier; // we go forward or backwards depending.
+	// TheSuperHackers @tweak GUI transition timing is now decoupled from the render update.
+	const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
+	m_currentFrame += m_directionMultiplier * timeScale; // we go forward or backwards depending.
 	TransitionWindowList::iterator it = m_transitionWindowList.begin();
 	while (it != m_transitionWindowList.end())
 	{
 		TransitionWindow *tWin = *it;
 		tWin->update(m_currentFrame);
 		it++;
-	}	
+	}
 }
 
 Bool TransitionGroup::isFinished( void )
@@ -307,7 +301,7 @@ void TransitionGroup::reverse( void )
 {
 	Int totalFrames =0;
 	m_directionMultiplier = -1;
-	
+
 	TransitionWindowList::iterator it = m_transitionWindowList.begin();
 	while (it != m_transitionWindowList.end())
 	{
@@ -403,7 +397,7 @@ void GameWindowTransitionsHandler::load(void )
 {
 	INI ini;
 	// Read from INI all the ControlBarSchemes
-	ini.load( AsciiString( "Data\\INI\\WindowTransitions.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\WindowTransitions", INI_LOAD_OVERWRITE, NULL );
 
 }
 
@@ -470,7 +464,7 @@ void GameWindowTransitionsHandler::setGroup(AsciiString groupName, Bool immidiat
 			m_currentGroup->init();
 		return;
 	}
-	
+
 	if(m_currentGroup)
 	{
 		if(!m_currentGroup->isFireOnce() && !m_currentGroup->isReversed())
@@ -485,8 +479,8 @@ void GameWindowTransitionsHandler::setGroup(AsciiString groupName, Bool immidiat
 	if(m_currentGroup)
 		m_currentGroup->init();
 
-	
-	
+
+
 }
 
 void GameWindowTransitionsHandler::reverse( AsciiString groupName )
@@ -578,12 +572,12 @@ TransitionGroup *GameWindowTransitionsHandler::findGroup( AsciiString groupName
 
 void GameWindowTransitionsHandler::parseWindow( INI* ini, void *instance, void *store, const void *userData )
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "WinName",				INI::parseAsciiString,		NULL,									offsetof( TransitionWindow, m_winName ) },
       { "Style",					INI::parseLookupList,			TransitionStyleNames,	offsetof( TransitionWindow, m_style ) },
 			{ "FrameDelay",			INI::parseInt,						NULL,									offsetof( TransitionWindow, m_frameDelay ) },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 	TransitionWindow *transWin = NEW TransitionWindow;
 	ini->initFromINI(transWin, myFieldParse);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
index f9795b2e5e0..dfedf3d0954 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GameWindowTransitionsStyles.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Dec 2002
@@ -37,7 +37,7 @@
 //	Filename: 	GameWindowTransitionsStyles.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The Actual Styles that can fire off.
 //
 //-----------------------------------------------------------------------------
@@ -46,12 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -76,7 +71,7 @@ void drawTypeText( GameWindow *window, DisplayString *str);
 //-----------------------------------------------------------------------------
 Transition::Transition ( void )
 {
-	
+
 }
 
 Transition::~Transition( void )
@@ -124,7 +119,7 @@ void FlashTransition::update( Int frame )
 	switch (frame) {
 	case FLASHTRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win)
 				break;
 			m_win->winHide(TRUE);
@@ -139,9 +134,11 @@ void FlashTransition::update( Int frame )
 			if( TheAudio )
 			{
 				TheAudio->addAudioEvent( &buttonClick );
-			}  // end if
-		
+			}
+
 		}
+		FALLTHROUGH;
+
 	case FLASHTRANSITION_FADE_IN_2:
 	case FLASHTRANSITION_FADE_IN_3:
 		{
@@ -171,8 +168,8 @@ void FlashTransition::update( Int frame )
 		}
 		break;
 	}
-	
-	
+
+
 }
 
 void FlashTransition::reverse( void )
@@ -184,7 +181,7 @@ void FlashTransition::reverse( void )
 
 void FlashTransition::draw( void )
 {
-	switch (m_drawState) 
+	switch (m_drawState)
 	{
 		case FLASHTRANSITION_FADE_IN_1:
 		{
@@ -230,12 +227,12 @@ void FlashTransition::draw( void )
 		break;
 	}
 }
-	
+
 void FlashTransition::skip( void )
 {
 	update(FLASHTRANSITION_END);
 }
-	
+
 //-----------------------------------------------------------------------------
 
 
@@ -278,7 +275,7 @@ void ButtonFlashTransition::update( Int frame )
 	switch (frame) {
 	case BUTTONFLASHTRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win)
 				break;
 			m_win->winHide(TRUE);
@@ -293,11 +290,11 @@ void ButtonFlashTransition::update( Int frame )
 				if(m_isForward)
 				{
 					AudioEventRTS buttonClick("GUIButtonsFadeIn");
-	
+
 					if( TheAudio )
 					{
 						TheAudio->addAudioEvent( &buttonClick );
-					}  // end if
+					}
 
 					m_drawState = frame;
 				}
@@ -324,7 +321,7 @@ void ButtonFlashTransition::update( Int frame )
 				if(m_isForward)
 					m_drawState = frame;
 				else
-					m_drawState = BUTTONFLASHTRANSITION_FADE_TO_BACKGROUND_2;		
+					m_drawState = BUTTONFLASHTRANSITION_FADE_TO_BACKGROUND_2;
 		}
 		break;
 	case BUTTONFLASHTRANSITION_FADE_TO_BACKGROUND_1:
@@ -378,19 +375,19 @@ void ButtonFlashTransition::update( Int frame )
 			if(m_isForward)
 			{
 //				AudioEventRTS buttonClick("GUIBlip");
-//	
+//
 //				if( TheAudio )
 //				{
 //					TheAudio->addAudioEvent( &buttonClick );
 //				}  // end if
 
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = frame;
 			}
 			else
 			{
-				
-				m_win->winHide(TRUE);	
+
+				m_win->winHide(TRUE);
 				m_drawState = BUTTONFLASHTRANSITION_FADE_TO_GRADE_OUT_4;
 			}
 
@@ -402,12 +399,12 @@ void ButtonFlashTransition::update( Int frame )
 				break;
 			if(m_isForward)
 			{
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = frame;
 			}
 			else
 			{
-				m_win->winHide(TRUE);	
+				m_win->winHide(TRUE);
 				m_drawState = BUTTONFLASHTRANSITION_FADE_TO_GRADE_OUT_3;
 			}
 		}
@@ -418,12 +415,12 @@ void ButtonFlashTransition::update( Int frame )
 				break;
 			if(m_isForward)
 			{
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = frame;
 			}
 			else
 			{
-				m_win->winHide(TRUE);	
+				m_win->winHide(TRUE);
 				m_drawState = BUTTONFLASHTRANSITION_FADE_TO_GRADE_OUT_2;
 			}
 		}
@@ -434,12 +431,12 @@ void ButtonFlashTransition::update( Int frame )
 				break;
 			if(m_isForward)
 			{
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = frame;
 			}
 			else
 			{
-				m_win->winHide(TRUE);	
+				m_win->winHide(TRUE);
 				m_drawState = BUTTONFLASHTRANSITION_FADE_TO_GRADE_OUT_1;
 			}
 		}
@@ -450,12 +447,12 @@ void ButtonFlashTransition::update( Int frame )
 				break;
 			if(m_isForward)
 			{
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = frame;
 			}
 			else
 			{
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = BUTTONFLASHTRANSITION_FADE_TO_GRADE_IN_2;
 			}
 		}
@@ -467,15 +464,15 @@ void ButtonFlashTransition::update( Int frame )
 				break;
 			if(m_isForward)
 			{
-				m_win->winHide(FALSE);			
+				m_win->winHide(FALSE);
 				m_drawState = frame;
 			}
 			else
 			{
-				m_win->winHide(FALSE);	
+				m_win->winHide(FALSE);
 				m_drawState = BUTTONFLASHTRANSITION_FADE_TO_GRADE_IN_1;
 			}
-			
+
 		}
 		break;
 	case BUTTONFLASHTRANSITION_END:
@@ -489,7 +486,7 @@ void ButtonFlashTransition::update( Int frame )
 	}
 	if(frame > BUTTONFLASHTRANSITION_FADE_TO_BACKGROUND_4 && frame < BUTTONFLASHTRANSITION_FADE_TO_GRADE_IN_1)
 		m_drawState = BUTTONFLASHTRANSITION_SHOW_BACKGROUND;
-	
+
 }
 
 void ButtonFlashTransition::reverse( void )
@@ -501,7 +498,7 @@ void ButtonFlashTransition::reverse( void )
 
 void ButtonFlashTransition::draw( void )
 {
-	switch (m_drawState) 
+	switch (m_drawState)
 	{
 		case BUTTONFLASHTRANSITION_FADE_IN_1:
 		{
@@ -604,7 +601,7 @@ void ButtonFlashTransition::draw( void )
 
 	}
 }
-	
+
 void ButtonFlashTransition::skip( void )
 {
 	update(BUTTONFLASHTRANSITION_END);
@@ -651,7 +648,7 @@ void FadeTransition::update( Int frame )
 	switch (frame) {
 	case FADETRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win)
 				break;
 			m_win->winHide(TRUE);
@@ -678,7 +675,7 @@ void FadeTransition::update( Int frame )
 			m_win->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 }
 
 void FadeTransition::reverse( void )
@@ -695,7 +692,7 @@ void FadeTransition::draw( void )
 	if(m_drawState <= FADETRANSITION_START || m_drawState >= FADETRANSITION_END)
 		return;
 	const Image *image = m_win->winGetEnabledImage(0);
-	switch (m_drawState) 
+	switch (m_drawState)
 	{
 		case FADETRANSITION_FADE_IN_1:
 		{
@@ -743,7 +740,7 @@ void FadeTransition::draw( void )
 		}
 	}
 }
-	
+
 void FadeTransition::skip( void )
 {
 	update(FADETRANSITION_END);
@@ -775,7 +772,7 @@ void ScaleUpTransition::init( GameWindow *win )
 	update(SCALEUPTRANSITION_START);
 	m_isFinished = FALSE;
 	m_isForward = TRUE;
-	
+
 	m_centerPos.x = m_pos.x + m_size.x / 2;
 	m_centerPos.y = m_pos.y + m_size.y / 2;
 	m_incrementSize.x = m_size.x / SCALEUPTRANSITION_END;
@@ -808,10 +805,10 @@ void ScaleUpTransition::update( Int frame )
 			if( TheAudio )
 			{
 				TheAudio->addAudioEvent( &buttonClick );
-			}  // end if
+			}
 
-			
 		}
+		FALLTHROUGH;
 
 	case SCALEUPTRANSITION_2:
 	case SCALEUPTRANSITION_3:
@@ -842,7 +839,7 @@ void ScaleUpTransition::update( Int frame )
 			m_win->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 }
 
 void ScaleUpTransition::reverse( void )
@@ -865,7 +862,7 @@ void ScaleUpTransition::draw( void )
 	Int y1 = y + m_incrementSize.y * m_drawState;
 	TheDisplay->drawImage(image, x,y, x1, y1);
 }
-	
+
 void ScaleUpTransition::skip( void )
 {
 	update(SCALEUPTRANSITION_END);
@@ -898,7 +895,7 @@ void ScoreScaleUpTransition::init( GameWindow *win )
 	update(SCORESCALEUPTRANSITION_START);
 	m_isFinished = FALSE;
 	m_isForward = TRUE;
-	
+
 	m_centerPos.x = m_pos.x + m_size.x / 2;
 	m_centerPos.y = m_pos.y + m_size.y / 2;
 	m_incrementSize.x = m_size.x / SCORESCALEUPTRANSITION_END;
@@ -931,10 +928,10 @@ void ScoreScaleUpTransition::update( Int frame )
 			if( TheAudio )
 			{
 				TheAudio->addAudioEvent( &buttonClick );
-			}  // end if
+			}
 
-			
 		}
+		FALLTHROUGH;
 
 	case SCORESCALEUPTRANSITION_2:
 	case SCORESCALEUPTRANSITION_3:
@@ -965,7 +962,7 @@ void ScoreScaleUpTransition::update( Int frame )
 			m_win->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 }
 
 void ScoreScaleUpTransition::reverse( void )
@@ -988,7 +985,7 @@ void ScoreScaleUpTransition::draw( void )
 	Int y1 = y + m_incrementSize.y * m_drawState;
 	TheDisplay->drawImage(image, x,y, x1, y1);
 }
-	
+
 void ScoreScaleUpTransition::skip( void )
 {
 	update(SCORESCALEUPTRANSITION_END);
@@ -1034,7 +1031,7 @@ void MainMenuScaleUpTransition::init( GameWindow *win )
 	m_incrementSize.y = (m_growSize.y - m_size.y) / MAINMENUSCALEUPTRANSITION_END;
 	const Image *image = m_win->winGetDisabledImage(0);
 	m_growWin->winSetEnabledImage(0, image);
-	
+
 }
 
 void MainMenuScaleUpTransition::update( Int frame )
@@ -1048,7 +1045,7 @@ void MainMenuScaleUpTransition::update( Int frame )
 	switch (frame) {
 	case MAINMENUSCALEUPTRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win || !m_growWin)
 				break;
 //			m_win->winHide(TRUE);
@@ -1064,7 +1061,7 @@ void MainMenuScaleUpTransition::update( Int frame )
 			m_growWin->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 	if(frame == 1)
 	{
 		AudioEventRTS buttonClick("GUILogoSelect");
@@ -1072,7 +1069,7 @@ void MainMenuScaleUpTransition::update( Int frame )
 		if( TheAudio )
 		{
 			TheAudio->addAudioEvent( &buttonClick );
-		}  // end if			
+		}
 	}
 	if(frame > MAINMENUSCALEUPTRANSITION_START && frame < MAINMENUSCALEUPTRANSITION_END)
 	{
@@ -1105,7 +1102,7 @@ void MainMenuScaleUpTransition::draw( void )
 	Int y1 = y + m_size.y + ((m_incrementSize.y * m_drawState));
 	TheDisplay->drawImage(image, x,y, x1, y1);
 }
-	
+
 void MainMenuScaleUpTransition::skip( void )
 {
 	update(MAINMENUSCALEUPTRANSITION_END);
@@ -1148,12 +1145,12 @@ void MainMenuMediumScaleUpTransition::init( GameWindow *win )
 	update(MAINMENUMEDIUMSCALEUPTRANSITION_START);
 	m_isFinished = FALSE;
 	m_isForward = TRUE;
-	
+
 	m_incrementSize.x = (m_growSize.x - m_size.x) / MAINMENUMEDIUMSCALEUPTRANSITION_END;
 	m_incrementSize.y = (m_growSize.y - m_size.y) / MAINMENUMEDIUMSCALEUPTRANSITION_END;
 //	const Image *image = m_win->winGetEnabledImage(0);
 	//m_growWin->winSetEnabledImage(0, image);
-	
+
 }
 
 void MainMenuMediumScaleUpTransition::update( Int frame )
@@ -1167,7 +1164,7 @@ void MainMenuMediumScaleUpTransition::update( Int frame )
 	switch (frame) {
 	case MAINMENUMEDIUMSCALEUPTRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win || !m_growWin)
 				break;
 			m_win->winHide(FALSE);
@@ -1183,7 +1180,7 @@ void MainMenuMediumScaleUpTransition::update( Int frame )
 			m_growWin->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 	if(frame > MAINMENUMEDIUMSCALEUPTRANSITION_START && frame < MAINMENUMEDIUMSCALEUPTRANSITION_END)
 	{
 		if(frame == 1 && m_isForward)
@@ -1193,7 +1190,7 @@ void MainMenuMediumScaleUpTransition::update( Int frame )
 			if( TheAudio )
 			{
 				TheAudio->addAudioEvent( &buttonClick );
-			}  // end if			
+			}
 		}
 		if(m_win)
 			m_win->winHide(TRUE);
@@ -1225,7 +1222,7 @@ void MainMenuMediumScaleUpTransition::draw( void )
 	Int y1 = m_pos.y + m_size.y + ((m_incrementSize.y * m_drawState) / 2);
 	TheDisplay->drawImage(image, x,y, x1, y1);
 }
-	
+
 void MainMenuMediumScaleUpTransition::skip( void )
 {
 	update(MAINMENUMEDIUMSCALEUPTRANSITION_END);
@@ -1267,12 +1264,12 @@ void MainMenuSmallScaleDownTransition::init( GameWindow *win )
 	update(MAINMENUSMALLSCALEDOWNTRANSITION_START);
 	m_isFinished = FALSE;
 	m_isForward = TRUE;
-	
+
 	m_incrementSize.x = (m_growSize.x - m_size.x) / MAINMENUSMALLSCALEDOWNTRANSITION_END;
 	m_incrementSize.y = (m_growSize.y - m_size.y) / MAINMENUSMALLSCALEDOWNTRANSITION_END;
 	const Image *image = m_win->winGetEnabledImage(0);
 	m_growWin->winSetEnabledImage(0, image);
-	
+
 }
 
 void MainMenuSmallScaleDownTransition::update( Int frame )
@@ -1286,7 +1283,7 @@ void MainMenuSmallScaleDownTransition::update( Int frame )
 	switch (frame) {
 	case MAINMENUSMALLSCALEDOWNTRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win || !m_growWin)
 				break;
 			m_win->winHide(FALSE);
@@ -1313,7 +1310,7 @@ void MainMenuSmallScaleDownTransition::update( Int frame )
 			m_growWin->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 }
 
 void MainMenuSmallScaleDownTransition::reverse( void )
@@ -1336,7 +1333,7 @@ void MainMenuSmallScaleDownTransition::draw( void )
 	Int y1 = m_pos.y + m_size.y + ((m_incrementSize.y * m_drawState) / 2);
 	TheDisplay->drawImage(image, x,y, x1, y1);
 }
-	
+
 void MainMenuSmallScaleDownTransition::skip( void )
 {
 	update(MAINMENUSMALLSCALEDOWNTRANSITION_END);
@@ -1375,7 +1372,7 @@ void TextTypeTransition::init( GameWindow *win )
 	m_isFinished = FALSE;
 	m_isForward = TRUE;
 	m_dStr = TheDisplayStringManager->newDisplayString();
-	m_fullText = GadgetStaticTextGetText(m_win);		
+	m_fullText = GadgetStaticTextGetText(m_win);
 	Int length = m_fullText.getLength();
 	m_frameLength = MIN(length, TEXTTYPETRANSITION_END);
 }
@@ -1391,7 +1388,7 @@ void TextTypeTransition::update( Int frame )
 	switch (frame) {
 	case TEXTTYPETRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win )
 				break;
 			m_win->winHide(TRUE);
@@ -1405,7 +1402,7 @@ void TextTypeTransition::update( Int frame )
 			m_win->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 	if(frame >= m_frameLength)
 	{
 		m_win->winHide(FALSE);
@@ -1420,7 +1417,7 @@ void TextTypeTransition::update( Int frame )
 		if( TheAudio )
 		{
 			TheAudio->addAudioEvent( &buttonClick );
-		}  // end if
+		}
 		if(m_isForward)
 		{
 			m_partialText.concat(m_fullText.getCharAt(frame - 1));
@@ -1448,7 +1445,7 @@ void TextTypeTransition::draw( void )
 		drawTypeText(m_win, m_dStr);
 	}
 }
-	
+
 void TextTypeTransition::skip( void )
 {
 	update(TEXTTYPETRANSITION_END);
@@ -1487,16 +1484,16 @@ void CountUpTransition::init( GameWindow *win )
 			return;
 		}
 	}
-	m_fullText = GadgetStaticTextGetText(m_win);		
+	m_fullText = GadgetStaticTextGetText(m_win);
 	m_isForward = FALSE;
 	update(COUNTUPTRANSITION_START);
 	m_isFinished = FALSE;
 	m_isForward = TRUE;
-	
+
 	AsciiString tempStr;
 	tempStr.translate(m_fullText);
 	m_intValue = atoi(tempStr.str());
-	DEBUG_LOG(("CountUpTransition::init %hs %s %d\n", m_fullText.str(), tempStr.str(), m_intValue));
+	DEBUG_LOG(("CountUpTransition::init %hs %s %d", m_fullText.str(), tempStr.str(), m_intValue));
 	if(m_intValue < COUNTUPTRANSITION_END)
 	{
 		m_countState = COUNT_ONES;
@@ -1512,7 +1509,7 @@ void CountUpTransition::init( GameWindow *win )
 		m_countState = COUNT_1000S;
 		m_frameLength = MIN(m_intValue/1000, COUNTUPTRANSITION_END);
 	}
-	
+
 	m_currentValue = 0;
 	UnicodeString currVal;
 	currVal.format(L"%d",m_currentValue);
@@ -1530,7 +1527,7 @@ void CountUpTransition::update( Int frame )
 	switch (frame) {
 	case COUNTUPTRANSITION_START:
 		{
-			
+
 			if(m_isForward || !m_win )
 				break;
 			m_currentValue = 0;
@@ -1549,7 +1546,7 @@ void CountUpTransition::update( Int frame )
 			m_win->winHide(FALSE);
 			m_isFinished = TRUE;
 		}
-	}	
+	}
 	if(frame >= m_frameLength)
 	{
 		m_win->winHide(FALSE);
@@ -1564,7 +1561,7 @@ void CountUpTransition::update( Int frame )
 		if( TheAudio )
 		{
 			TheAudio->addAudioEvent( &buttonClick );
-		}  // end if
+		}
 		m_currentValue +=m_countState;
 		if(m_currentValue > m_intValue)
 			m_currentValue = m_intValue;
@@ -1597,7 +1594,7 @@ void CountUpTransition::reverse( void )
 void CountUpTransition::draw( void )
 {
 }
-	
+
 void CountUpTransition::skip( void )
 {
 	if (!m_isFinished)
@@ -1612,13 +1609,13 @@ ScreenFadeTransition::ScreenFadeTransition ( void )
 	m_win = NULL;
 	m_drawState = -1;
 	m_isForward = TRUE;
-	
+
 }
 
 ScreenFadeTransition::~ScreenFadeTransition( void )
 {
 	m_win = NULL;
-	
+
 }
 
 void ScreenFadeTransition::init( GameWindow *win )
@@ -1654,8 +1651,8 @@ void ScreenFadeTransition::update( Int frame )
 		{
 			m_isFinished = TRUE;
 		}
-	}	
-	m_drawState = frame;	
+	}
+	m_drawState = frame;
 }
 
 void ScreenFadeTransition::reverse( void )
@@ -1672,7 +1669,7 @@ void ScreenFadeTransition::draw( void )
 	TheDisplay->drawFillRect(m_pos.x, m_pos.y, m_size.x, m_size.y , GameMakeColor(0,0,0,alpha));
 
 }
-	
+
 void ScreenFadeTransition::skip( void )
 {
 	update(SCREENFADETRANSITION_END);
@@ -1688,7 +1685,7 @@ ControlBarArrowTransition::ControlBarArrowTransition ( void )
 	m_drawState = -1;
 	m_isForward = TRUE;
 	m_arrowImage = NULL;
-	
+
 }
 
 ControlBarArrowTransition::~ControlBarArrowTransition( void )
@@ -1706,7 +1703,7 @@ void ControlBarArrowTransition::init( GameWindow *win )
 
 	m_percent = 1.0f / CONTROLBARARROWTRANSITION_BEGIN_FADE;
 	m_fadePercent = 1.0f/ (CONTROLBARARROWTRANSITION_END - CONTROLBARARROWTRANSITION_BEGIN_FADE);
-	
+
 	m_arrowImage = TheControlBar->getArrowImage();
 	GameWindow *twin = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonGeneral"));
 	if(!twin || !m_arrowImage)
@@ -1717,7 +1714,7 @@ void ControlBarArrowTransition::init( GameWindow *win )
 	ICoord2D screenPos, screenSize;
 	twin->winGetScreenPosition(&screenPos.x, &screenPos.y);
 	twin->winGetSize(&screenSize.x, &screenSize.y);
-	
+
 	m_incrementPos.x = 0;
 	m_incrementPos.y = screenPos.y * m_percent;
 
@@ -1747,8 +1744,8 @@ void ControlBarArrowTransition::update( Int frame )
 		{
 			m_isFinished = TRUE;
 		}
-	}	
-	m_drawState = frame;	
+	}
+	m_drawState = frame;
 }
 
 void ControlBarArrowTransition::reverse( void )
@@ -1776,9 +1773,9 @@ void ControlBarArrowTransition::draw( void )
 
 		TheDisplay->drawImage(m_arrowImage, m_pos.x, yPos, m_pos.x + m_size.x, yPos + m_size.y , GameMakeColor(255,255,255,alpha));
 	}
-	
+
 }
-	
+
 void ControlBarArrowTransition::skip( void )
 {
 	update(CONTROLBARARROWTRANSITION_END);
@@ -1796,13 +1793,13 @@ FullFadeTransition::FullFadeTransition ( void )
 	m_win = NULL;
 	m_drawState = -1;
 	m_isForward = TRUE;
-	
+
 }
 
 FullFadeTransition::~FullFadeTransition( void )
 {
 	m_win = NULL;
-	
+
 }
 
 void FullFadeTransition::init( GameWindow *win )
@@ -1835,7 +1832,7 @@ void FullFadeTransition::update( Int frame )
 	switch (frame) {
 	case FULLFADETRANSITION_START:
 		{
-						
+
 			if(m_isForward || !m_win )
 				break;
 
@@ -1852,15 +1849,15 @@ void FullFadeTransition::update( Int frame )
 			m_isFinished = TRUE;
 
 		}
-	}	
+	}
 	if(frame == FULLFADETRANSITION_END/2)
 	{
 		if(m_isForward)
-			m_win->winHide(FALSE);	
+			m_win->winHide(FALSE);
 		else
-			m_win->winHide(TRUE);	
+			m_win->winHide(TRUE);
 	}
-	m_drawState = frame;	
+	m_drawState = frame;
 }
 
 void FullFadeTransition::reverse( void )
@@ -1881,7 +1878,7 @@ void FullFadeTransition::draw( void )
 	TheDisplay->drawFillRect(m_pos.x, m_pos.y, m_size.x, m_size.y , GameMakeColor(0,0,0,alpha));
 	TheDisplay->drawOpenRect(m_pos.x, m_pos.y, m_size.x, m_size.y , 1.0f, GameMakeColor(60,60,180,alpha));
 }
-	
+
 void FullFadeTransition::skip( void )
 {
 	update(FULLFADETRANSITION_END);
@@ -1895,13 +1892,13 @@ TextOnFrameTransition::TextOnFrameTransition ( void )
 	m_frameLength = TEXTONFRAMETRANSITION_END;
 	m_win = NULL;
 	m_isForward = TRUE;
-	
+
 }
 
 TextOnFrameTransition::~TextOnFrameTransition( void )
 {
 	m_win = NULL;
-	
+
 }
 
 void TextOnFrameTransition::init( GameWindow *win )
@@ -1936,7 +1933,7 @@ void TextOnFrameTransition::update( Int frame )
 	switch (frame) {
 	case TEXTONFRAMETRANSITION_START:
 		{
-						
+
 			if(m_isForward || !m_win )
 				break;
 
@@ -1953,7 +1950,7 @@ void TextOnFrameTransition::update( Int frame )
 			m_isFinished = TRUE;
 
 		}
-	}	
+	}
 }
 
 void TextOnFrameTransition::reverse( void )
@@ -1970,7 +1967,7 @@ void TextOnFrameTransition::reverse( void )
 void TextOnFrameTransition::draw( void )
 {
 }
-	
+
 void TextOnFrameTransition::skip( void )
 {
 	if (!m_isFinished)
@@ -1985,13 +1982,13 @@ ReverseSoundTransition::ReverseSoundTransition ( void )
 	m_frameLength = REVERSESOUNDTRANSITION_END;
 	m_win = NULL;
 	m_isForward = TRUE;
-	
+
 }
 
 ReverseSoundTransition::~ReverseSoundTransition( void )
 {
 	m_win = NULL;
-	
+
 }
 
 void ReverseSoundTransition::init( GameWindow *win )
@@ -2010,7 +2007,7 @@ void ReverseSoundTransition::update( Int frame )
 	switch (frame) {
 	case REVERSESOUNDTRANSITION_START:
 		{
-						
+
 			if(m_isForward  )
 				break;
 
@@ -2018,7 +2015,7 @@ void ReverseSoundTransition::update( Int frame )
 
 		}
 		break;
-		
+
 	case REVERSESOUNDTRANSITION_FIRESOUND:
 		{
 			AudioEventRTS buttonClick("GUITransitionFade");
@@ -2026,9 +2023,10 @@ void ReverseSoundTransition::update( Int frame )
 			if( TheAudio )
 			{
 				TheAudio->addAudioEvent( &buttonClick );
-			}  // end if		
-
+			}
 		}
+		break;
+
 	case REVERSESOUNDTRANSITION_END:
 		{
 			if(!m_isForward  )
@@ -2036,7 +2034,7 @@ void ReverseSoundTransition::update( Int frame )
 			m_isFinished = TRUE;
 
 		}
-	}	
+	}
 }
 
 void ReverseSoundTransition::reverse( void )
@@ -2048,7 +2046,7 @@ void ReverseSoundTransition::reverse( void )
 void ReverseSoundTransition::draw( void )
 {
 }
-	
+
 void ReverseSoundTransition::skip( void )
 {
 	if (!m_isFinished)
@@ -2082,7 +2080,7 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha )
 	centerImage				= GadgetButtonGetMiddleEnabledImage( window );
 
 	// sanity, we need to have these images to make it look right
-	if( leftImage == NULL || rightImage == NULL || 
+	if( leftImage == NULL || rightImage == NULL ||
 			centerImage == NULL )
 		return;
 
@@ -2105,7 +2103,7 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha )
 
 	// get width we have to draw our repeating center in
 	centerWidth = rightStart.x - leftEnd.x;
-	
+
 	if( centerWidth <= 0)
 	{
 		// draw left end
@@ -2124,7 +2122,7 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha )
 	}
 	else
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerImage->getImageWidth();
 
@@ -2136,13 +2134,13 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha )
 		{
 
 			end.x = start.x + centerImage->getImageWidth();
-			
-			TheDisplay->drawImage( centerImage, 
+
+			TheDisplay->drawImage( centerImage,
 																			start.x, start.y,
 																			end.x, end.y,color );
 			start.x += centerImage->getImageWidth();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -2173,7 +2171,7 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha )
 		end.y = start.y + size.y;
 		TheDisplay->drawImage(rightImage, start.x, start.y, end.x, end.y,color);
 	}
-	
+
 }
 
 static void drawTypeText( GameWindow *window, DisplayString *str)
@@ -2189,16 +2187,16 @@ static void drawTypeText( GameWindow *window, DisplayString *str)
 	if( text == NULL || text->getTextLength() == 0 )
 		return;
 	GameFont *font = text->getFont();
-	
+
 	str->setFont(font);
 
 	// get window position and size
 	window->winGetScreenPosition( &origin.x, &origin.y );
 	window->winGetSize( &size.x, &size.y );
-	
+
 	// Set the text Wrap width
 	wordWrap = size.x - 10;
-	text->setWordWrap(wordWrap);	
+	text->setWordWrap(wordWrap);
 	str->setWordWrap(wordWrap);
 	if( BitIsSet(window->winGetStatus(), WIN_STATUS_WRAP_CENTERED)		)
 	{
@@ -2215,13 +2213,13 @@ static void drawTypeText( GameWindow *window, DisplayString *str)
 
 	// how much space will this text take up
 	text->getSize( &textWidth, &textHeight );
-		
+
 	//Init the clip region
 	clipRegion.lo.x = origin.x ;
 	clipRegion.lo.y = origin.y ;
 	clipRegion.hi.x = origin.x + size.x ;
 	clipRegion.hi.y = origin.y + size.y;
-	
+
 	if( tData->centered )
 	{
 
@@ -2229,7 +2227,7 @@ static void drawTypeText( GameWindow *window, DisplayString *str)
 		textPos.y = origin.y + (size.y / 2) - (textHeight / 2);
 		str->setClipRegion(&clipRegion);
 		str->draw( textPos.x, textPos.y, textColor, textDropColor );
-	}  // end if
+	}
 	else
 	{
 
@@ -2239,7 +2237,7 @@ static void drawTypeText( GameWindow *window, DisplayString *str)
 		str->setClipRegion(&clipRegion);
 		str->draw( textPos.x, textPos.y, textColor, textDropColor );
 
-	}  // end else
+	}
 
 
-}  // end drawStaticTextText
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp
index bfde39d203f..4b873a3a771 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/HeaderTemplate.cpp
@@ -24,12 +24,12 @@
 
 // FILE: HeaderTemplate.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	HeaderTemplate.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The header template system is used to maintain a unified look across
 //						windows.  It also allows Localization to customize the looks based
 //						on language fonts.
@@ -60,11 +60,6 @@
 #include "GameClient/HeaderTemplate.h"
 #include "GameClient/GameFont.h"
 #include "GameClient/GlobalLanguage.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -87,7 +82,7 @@ void INI::parseHeaderTemplateDefinition( INI *ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
 	hTemplate = TheHeaderTemplateManager->findHeaderTemplate( name );
@@ -97,7 +92,7 @@ void INI::parseHeaderTemplateDefinition( INI *ini )
 		// allocate a new item
 		hTemplate = TheHeaderTemplateManager->newHeaderTemplate( name );
 
-	}  // end if
+	}
 	else
 	{
 		DEBUG_CRASH(( "[LINE: %d in '%s'] Duplicate header Template %s found!", ini->getLineNum(), ini->getFilename().str(), name.str() ));
@@ -105,15 +100,13 @@ void INI::parseHeaderTemplateDefinition( INI *ini )
 	// parse the ini definition
 	ini->initFromINI( hTemplate, TheHeaderTemplateManager->getFieldParse() );
 
-}  // end parseCommandButtonDefinition
+}
 
 HeaderTemplate::HeaderTemplate( void ) :
 m_font(NULL),
 m_point(0),
 m_bold(FALSE)
 {
-	//Added By Sadullah Nader
-	//Initializations missing and needed 
 	m_fontName.clear();
 	m_name.clear();
 }
@@ -129,11 +122,7 @@ HeaderTemplateManager::~HeaderTemplateManager( void )
 	while(it != m_headerTemplateList.end())
 	{
 		HeaderTemplate *hTemplate = *it;
-		if(hTemplate)
-		{
-			hTemplate->m_font = NULL;
-			delete hTemplate;
-		}
+		delete hTemplate;
 		it = m_headerTemplateList.erase(it);
 
 	}
@@ -141,22 +130,14 @@ HeaderTemplateManager::~HeaderTemplateManager( void )
 
 void HeaderTemplateManager::init( void )
 {
-	INI ini;
-	AsciiString fname;
-	fname.format("Data\\%s\\HeaderTemplate.ini", GetRegistryLanguage().str());
-	OSVERSIONINFO	osvi;
-	osvi.dwOSVersionInfoSize=sizeof(OSVERSIONINFO);
-	if (GetVersionEx(&osvi))
-	{	//check if we're running Win9x variant since they may need different fonts
-		if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
-		{	AsciiString tempName;
-
-			tempName.format("Data\\%s\\HeaderTemplate9x.ini", GetRegistryLanguage().str());
-			if (TheFileSystem->doesFileExist(tempName.str()))
-				fname = tempName;
-		}
+	{
+		AsciiString fname;
+		fname.format("Data\\%s\\HeaderTemplate", GetRegistryLanguage().str());
+
+		INI ini;
+		ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, NULL );
 	}
-	ini.load( fname, INI_LOAD_OVERWRITE, NULL );
+
 	populateGameFonts();
 }
 
@@ -179,7 +160,7 @@ HeaderTemplate *HeaderTemplateManager::newHeaderTemplate( AsciiString name )
 	DEBUG_ASSERTCRASH(newHTemplate, ("Unable to create a new Header Template in HeaderTemplateManager::newHeaderTemplate"));
 	if(!newHTemplate)
 		return NULL;
-	
+
 	newHTemplate->m_name = name;
 	m_headerTemplateList.push_front(newHTemplate);
 	return newHTemplate;
@@ -191,10 +172,10 @@ GameFont *HeaderTemplateManager::getFontFromTemplate( AsciiString name )
 	HeaderTemplate *ht = findHeaderTemplate( name );
 	if(!ht)
 	{
-		//DEBUG_LOG(("HeaderTemplateManager::getFontFromTemplate - Could not find header %s\n", name.str()));
+		//DEBUG_LOG(("HeaderTemplateManager::getFontFromTemplate - Could not find header %s", name.str()));
 		return NULL;
 	}
-	
+
 	return ht->m_font;
 }
 
@@ -225,7 +206,7 @@ HeaderTemplate *HeaderTemplateManager::getNextHeader( HeaderTemplate *ht )
 
 }
 
-void HeaderTemplateManager::headerNotifyResolutionChange( void )
+void HeaderTemplateManager::onResolutionChanged( void )
 {
 	populateGameFonts();
 }
@@ -241,10 +222,10 @@ void HeaderTemplateManager::populateGameFonts( void )
 		HeaderTemplate *hTemplate = *it;
 		Real pointSize = TheGlobalLanguageData->adjustFontSize(hTemplate->m_point);
 		GameFont *font = TheFontLibrary->getFont(hTemplate->m_fontName, pointSize,hTemplate->m_bold);
-		DEBUG_ASSERTCRASH(font,("HeaderTemplateManager::populateGameFonts - Could not find font %s %d",hTemplate->m_fontName, hTemplate->m_point));
+		DEBUG_ASSERTCRASH(font,("HeaderTemplateManager::populateGameFonts - Could not find font %s %d",hTemplate->m_fontName.str(), hTemplate->m_point));
 
 		hTemplate->m_font = font;
-		
+
 		++it;
 	}
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp
index 08ab7b231a6..ccc22ea9f7d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   Ganerals
@@ -42,10 +42,10 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "mbstring.h"
 
@@ -61,32 +61,27 @@
 #include "GameClient/Color.h"
 #include "Common/NameKeyGenerator.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 extern HWND ApplicationHWnd;  ///< our application window handle
 extern Int	IMECandidateWindowLineSpacing;
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 //#define DEBUG_IME
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 //===============================
-// IMEManager 
+// IMEManager
 //===============================
 
 class IMEManager : public IMEManagerInterface
@@ -96,11 +91,11 @@ class IMEManager : public IMEManagerInterface
 
 		IMEManager();
 		~IMEManager();
-		
+
 		virtual void					init( void );
 		virtual void					reset( void );
 		virtual void					update( void );
-													
+
 		virtual void					attach( GameWindow *window );		///< attach IME to specified window
 		virtual void					detatch( void );								///< detatch IME from current window
 		virtual void					enable( void );									///< Enable IME
@@ -110,11 +105,11 @@ class IMEManager : public IMEManagerInterface
 		virtual GameWindow*		getWindow( void );							///< Returns the window we are currently attached to
 		virtual Bool					isComposing( void );						///< Manager is currently composing new input string
 		virtual void					getCompositionString( UnicodeString &string ); ///< Return the current composition string
-		virtual Int						getCompositionCursorPosition( void );			///< Returns the composition cursor position 
+		virtual Int						getCompositionCursorPosition( void );			///< Returns the composition cursor position
 		virtual Int						getIndexBase( void );						///< Get index base for candidate list
 
 		virtual Int						getCandidateCount();						///< Returns the total number of candidates
-		virtual UnicodeString*getCandidate( Int index );			///< Returns the candidate string 
+		virtual const UnicodeString* getCandidate( Int index );	///< Returns the candidate string
 		virtual Int						getSelectedCandidateIndex();		///< Returns the indexed of the currently selected candidate
 		virtual Int						getCandidatePageSize();					///< Returns the page size for the candidates list
 		virtual Int						getCandidatePageStart();				///< Returns the index of the first visibel candidate
@@ -122,7 +117,7 @@ class IMEManager : public IMEManagerInterface
 
 
 		/// Checks for and services IME messages. Returns TRUE if message serviced
-		virtual Bool serviceIMEMessage(	void *windowsHandle, 
+		virtual Bool serviceIMEMessage(	void *windowsHandle,
 												UnsignedInt message,
 												Int wParam,
 												Int lParam );
@@ -184,7 +179,7 @@ class IMEManager : public IMEManagerInterface
 
 
 
-	#ifdef DEBUG_IME													
+	#ifdef DEBUG_IME
 		static MessageInfo		m_mainMessageInfo[];
 		static MessageInfo		m_notifyInfo[];
 		static MessageInfo		m_requestInfo[];
@@ -204,7 +199,7 @@ class IMEManager : public IMEManagerInterface
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 #ifdef DEBUG_IME
 
@@ -318,20 +313,20 @@ IMEManager::MessageInfo IMEManager::m_setSmodeInfo[] =
 #endif
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 IMEManagerInterface *TheIMEManager = NULL;
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 #ifdef DEBUG_IME
@@ -401,7 +396,7 @@ void		IMEManager::printMessageInfo( Int message, Int wParam, Int lParam )
 		{
 			Char *notifyName = getMessageName( m_notifyInfo, wParam );
 			if ( notifyName == NULL ) notifyName = "unknown";
-			DEBUG_LOG(( "IMM: %s(0x%04x) - %s(0x%04x) - 0x%08x\n",  messageText, message, notifyName, wParam, lParam )); 
+			DEBUG_LOG(( "IMM: %s(0x%04x) - %s(0x%04x) - 0x%08x",  messageText, message, notifyName, wParam, lParam ));
 			break;
 		}
 		case WM_IME_CONTROL:
@@ -409,7 +404,7 @@ void		IMEManager::printMessageInfo( Int message, Int wParam, Int lParam )
 			Char *controlName = getMessageName( m_controlInfo, wParam );
 			if ( controlName == NULL ) controlName = "unknown";
 
-			DEBUG_LOG(( "IMM: %s(0x%04x) - %s(0x%04x) - 0x%08x\n",  messageText, message, controlName, wParam, lParam )); 
+			DEBUG_LOG(( "IMM: %s(0x%04x) - %s(0x%04x) - 0x%08x",  messageText, message, controlName, wParam, lParam ));
 			break;
 		}
 		#ifdef WM_IME_REQUEST
@@ -418,7 +413,7 @@ void		IMEManager::printMessageInfo( Int message, Int wParam, Int lParam )
 			Char *requestName = getMessageName( m_requestInfo, wParam );
 			if ( requestName == NULL ) requestName = "unknown";
 
-			DEBUG_LOG(( "IMM: %s(0x%04x) - %s(0x%04x) - 0x%08x\n",  messageText, message, requestName, wParam, lParam )); 
+			DEBUG_LOG(( "IMM: %s(0x%04x) - %s(0x%04x) - 0x%08x",  messageText, message, requestName, wParam, lParam ));
 			break;
 		}
 		#endif
@@ -428,13 +423,13 @@ void		IMEManager::printMessageInfo( Int message, Int wParam, Int lParam )
 
 			buildFlagsString( m_setContextInfo, lParam, flags );
 
-			DEBUG_LOG(( "IMM: %s(0x%04x) - 0x%08x - %s(0x%04x)\n",  messageText, message, wParam, flags.str(), lParam )); 
+			DEBUG_LOG(( "IMM: %s(0x%04x) - 0x%08x - %s(0x%04x)",  messageText, message, wParam, flags.str(), lParam ));
 			break;
 		}
 		default:
 			if ( messageText )
 			{
-				DEBUG_LOG(( "IMM: %s(0x%04x) - 0x%08x - 0x%08x\n",  messageText, message, wParam, lParam )); 
+				DEBUG_LOG(( "IMM: %s(0x%04x) - 0x%08x - 0x%08x",  messageText, message, wParam, lParam ));
 			}
 			break;
 	}
@@ -455,7 +450,7 @@ void IMEManager::printConversionStatus( void )
 
 		buildFlagsString( m_setCmodeInfo, mode, flags );
 
-		DEBUG_LOG(( "IMM: Conversion mode = (%s)\n", flags.str()));
+		DEBUG_LOG(( "IMM: Conversion mode = (%s)", flags.str()));
 	}
 }
 
@@ -474,14 +469,14 @@ void IMEManager::printSentenceStatus( void )
 
 		buildFlagsString( m_setSmodeInfo, mode, flags );
 
-		DEBUG_LOG(( "IMM: Sentence mode = (%s)\n", flags.str()));
+		DEBUG_LOG(( "IMM: Sentence mode = (%s)", flags.str()));
 	}
 }
 #endif // DEBUG_IME
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 //============================================================================
@@ -511,8 +506,6 @@ IMEManager::IMEManager()
 	m_result(0),
 	m_indexBase(1),
 
-	//Added By Sadullah Nader
-	//Initializations missing and needed
 	m_compositionCharsDisplayed(0),
 	m_candidateDownArrow(NULL),
 	m_candidateTextArea(NULL),
@@ -522,7 +515,6 @@ IMEManager::IMEManager()
 	m_pageStart(0),
 	m_selectedIndex(0),
 	m_unicodeIME(FALSE)
-	//
 {
 }
 
@@ -534,6 +526,9 @@ IMEManager::~IMEManager()
 {
 	if ( m_candidateWindow )
 	{
+		m_candidateWindow->winSetUserData( NULL );
+		m_candidateTextArea->winSetUserData( NULL );
+
 		TheWindowManager->winDestroy( m_candidateWindow );
 	}
 
@@ -542,10 +537,7 @@ IMEManager::~IMEManager()
 		TheWindowManager->winDestroy( m_statusWindow );
 	}
 
-	if ( m_candidateString )
-	{
-		delete [] m_candidateString;
-	}
+	delete [] m_candidateString;
 
 	detatch();
 	ImmAssociateContext( ApplicationHWnd, m_oldContext );
@@ -563,7 +555,7 @@ IMEManager::~IMEManager()
 void IMEManager::init( void )
 {
 	//HWND ImeWindow = ImmGetDefaultIMEWnd(ApplicationHWnd);
-  // if(ImeWindow) 
+  // if(ImeWindow)
 	// {
   //    DestroyWindow(ImeWindow);
 	//	}
@@ -571,22 +563,22 @@ void IMEManager::init( void )
 	m_context = ImmCreateContext();
 	m_oldContext = ImmGetContext( ApplicationHWnd );
 	m_disabled = 0;
-	m_candidateWindow = TheWindowManager->winCreateFromScript( AsciiString("IMECandidateWindow.wnd"));
+	m_candidateWindow = TheWindowManager->winCreateFromScript( "IMECandidateWindow.wnd");
 	m_candidateWindow->winSetStatus(WIN_STATUS_ABOVE);
-	
+
 	if ( m_candidateWindow )
 	{
 		m_candidateWindow->winHide( TRUE );
 
 		// find text area window
-		NameKeyType id = TheNameKeyGenerator->nameToKey( AsciiString( "IMECandidateWindow.wnd:TextArea" ) );
+		NameKeyType id = TheNameKeyGenerator->nameToKey( "IMECandidateWindow.wnd:TextArea" );
 		m_candidateTextArea = TheWindowManager->winGetWindowFromId(m_candidateWindow, id);
 
 		// find arrows
-		id = TheNameKeyGenerator->nameToKey( AsciiString( "IMECandidateWindow.wnd:UpArrow" ) );
+		id = TheNameKeyGenerator->nameToKey( "IMECandidateWindow.wnd:UpArrow" );
 		m_candidateUpArrow = TheWindowManager->winGetWindowFromId(m_candidateWindow, id);
 
-		id = TheNameKeyGenerator->nameToKey( AsciiString( "IMECandidateWindow.wnd:DownArrow" ) );
+		id = TheNameKeyGenerator->nameToKey( "IMECandidateWindow.wnd:DownArrow" );
 		m_candidateDownArrow = TheWindowManager->winGetWindowFromId(m_candidateWindow, id);
 
 
@@ -598,7 +590,7 @@ void IMEManager::init( void )
 		}
 	}
 
-	m_statusWindow = TheWindowManager->winCreateFromScript( AsciiString("IMEStatusWindow.wnd"));
+	m_statusWindow = TheWindowManager->winCreateFromScript( "IMEStatusWindow.wnd");
 
 	if ( m_statusWindow )
 	{
@@ -633,7 +625,7 @@ void IMEManager::update( void )
 {
 
 }
-		
+
 //============================================================================
 // IMEManager::attach
 //============================================================================
@@ -683,9 +675,9 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 			{
 				WideChar wchar = convertCharToWide(wParam);
 				#ifdef DEBUG_IME
-				DEBUG_LOG(("IMM: WM_IME_CHAR - '%hc'0x%04x\n", wchar, wchar ));
+				DEBUG_LOG(("IMM: WM_IME_CHAR - '%hc'0x%04x", wchar, wchar ));
 				#endif
-																	 
+
 				if ( m_window && (wchar > 32 || wchar == VK_RETURN ))
 				{
 					TheWindowManager->winSendInputMsg( m_window, GWM_IME_CHAR, (wParam & 0xffff), lParam );
@@ -701,7 +693,7 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 					WideChar wchar = (WideChar) (wParam & 0xffff);
 
 				#ifdef DEBUG_IME
-				DEBUG_LOG(("IMM: WM_CHAR - '%hc'0x%04x\n", wchar, wchar ));
+				DEBUG_LOG(("IMM: WM_CHAR - '%hc'0x%04x", wchar, wchar ));
 				#endif
 
 				if ( m_window && (wchar >= 32 || wchar == VK_RETURN) )
@@ -715,10 +707,10 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 
 			// --------------------------------------------------------------------
       case WM_IME_SELECT:
-					DEBUG_LOG(("IMM: WM_IME_SELECT\n"));
+					DEBUG_LOG(("IMM: WM_IME_SELECT"));
 				return FALSE;
       case WM_IME_STARTCOMPOSITION:
-        //The WM_IME_STARTCOMPOSITION message is sent immediately before an 
+        //The WM_IME_STARTCOMPOSITION message is sent immediately before an
         //IME generates a composition string as a result of a user's keystroke.
         //
 				m_composing = TRUE;
@@ -742,10 +734,10 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 				// the strings real time inside WM_IME_COMPOSITION
 				// instead of waiting for user to enter separator. -MW
 
-        //IMEs send this message to the application when the IMEs' composition 
-        //windows have closed. Applications that display their own composition 
-        //characters should process this message. Other applications should 
-        //send the message to the application IME window or to DefWindowProc, 
+        //IMEs send this message to the application when the IMEs' composition
+        //windows have closed. Applications that display their own composition
+        //characters should process this message. Other applications should
+        //send the message to the application IME window or to DefWindowProc,
         //which will pass the message to  the default IME window.
         //
 
@@ -767,17 +759,17 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 			// --------------------------------------------------------------------
 			case WM_IME_COMPOSITION:
 			{
-				//IMEs send this message to the application when they change composition 
-				//status in response to a keystroke. Applications that display their own 
-				//composition characters should process this message by calling 
-				//ImmGetCompositionString. Other applications should send the message to 
-				//the application IME window or to DefWindowProc, which will pass the 
+				//IMEs send this message to the application when they change composition
+				//status in response to a keystroke. Applications that display their own
+				//composition characters should process this message by calling
+				//ImmGetCompositionString. Other applications should send the message to
+				//the application IME window or to DefWindowProc, which will pass the
 				//message to the default IME window.
 				//
-				//The WM_IME_COMPOSITION message is sent to an application when the IME 
-				//changes composition status as a result of a keystroke. An application 
-				//should process this message if it displays composition characters itself. 
-				//Otherwise, it should send the message to the IME window. This message 
+				//The WM_IME_COMPOSITION message is sent to an application when the IME
+				//changes composition status as a result of a keystroke. An application
+				//should process this message if it displays composition characters itself.
+				//Otherwise, it should send the message to the IME window. This message
 				//has no return value. wParam = DBCS character. lParam = change indicator.
 				//
 
@@ -858,8 +850,8 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 			// --------------------------------------------------------------------
 			case WM_IME_SETCONTEXT:
 			{
-				//The system sends this message to an application when one of the 
-				//application's windows is activated. Applications should respond by 
+				//The system sends this message to an application when one of the
+				//application's windows is activated. Applications should respond by
 				//calling ImmGetContext.
 				//
 				updateProperties();
@@ -872,19 +864,19 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 			// --------------------------------------------------------------------
 			case WM_IME_NOTIFY:
 			{
-				//IMEs generate this message to notify the application or the IME window 
-				//that the IME status has changed. The wParam value is a submessage that 
-				//specifies the nature of the change. 
+				//IMEs generate this message to notify the application or the IME window
+				//that the IME status has changed. The wParam value is a submessage that
+				//specifies the nature of the change.
 				//
 				switch(wParam)
 				{
 					case IMN_OPENCANDIDATE:
 					{
-						//This message is sent to the application when an IME is about to 
-						//open the candidate window. An application should process this 
-						//message if it displays candidates. The application can retrieve 
-						//a list of candidates to display by using theImmGetCandidateList 
-						//function. The application receives this notification message through 
+						//This message is sent to the application when an IME is about to
+						//open the candidate window. An application should process this
+						//message if it displays candidates. The application can retrieve
+						//a list of candidates to display by using theImmGetCandidateList
+						//function. The application receives this notification message through
 						//the WM_IME_NOTIFY message.
 						//
 
@@ -895,9 +887,9 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 					}
 					case IMN_CLOSECANDIDATE:
 					{
-						//This message is sent to the application when an IME is about to 
-						//close the candidate window. An application should process this 
-						//message if it displays candidates. The application receives this 
+						//This message is sent to the application when an IME is about to
+						//close the candidate window. An application should process this
+						//message if it displays candidates. The application receives this
 						//notification message through the WM_IME_NOTIFY message.
 						//
 						closeCandidateList( lParam );
@@ -907,17 +899,17 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 
 					case IMN_CHANGECANDIDATE:
 					{
-						//This message is sent to the application when an IME is about to 
-						//change the content of the candidate window. An application should 
-						//process this notification message if it displays candidates itself. 
-						//The application receives this notification message through the 
+						//This message is sent to the application when an IME is about to
+						//change the content of the candidate window. An application should
+						//process this notification message if it displays candidates itself.
+						//The application receives this notification message through the
 						//WM_IME_NOTIFY message.
 						//
 						updateCandidateList( lParam );
 						m_result =  1;
 				 	  return TRUE;
 					}
-					case IMN_GUIDELINE:              //This message is sent when an IME is about to show an error message or other data. 
+					case IMN_GUIDELINE:              //This message is sent when an IME is about to show an error message or other data.
 					{
 						// display error message
 						m_result = 1;
@@ -951,7 +943,7 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 						DEBUG_LOG(("Close Status Window"));
 						return FALSE;
 					case IMN_SETOPENSTATUS:          //This message is sent when the open status of the input context is updated.
-					case IMN_SETCOMPOSITIONFONT:     //This message is sent when the font of the input context is updated. 
+					case IMN_SETCOMPOSITIONFONT:     //This message is sent when the font of the input context is updated.
 					case IMN_SETCOMPOSITIONWINDOW:   //This message is sent when the style or position of the composition window is updated.
 					case IMN_PRIVATE:                //This message is for your own use, it seems.
 */				default:
@@ -964,9 +956,9 @@ Bool IMEManager::serviceIMEMessage(	void *windowsHandle, UnsignedInt message,	In
 			// --------------------------------------------------------------------
       case WM_IME_COMPOSITIONFULL:
 			{
-				//IMEs send this message to the application when they are unable to 
-        //extend the composition window to accommodate any more characters. 
-        //Applications should tell IMEs how to display the composition window 
+				//IMEs send this message to the application when they are unable to
+        //extend the composition window to accommodate any more characters.
+        //Applications should tell IMEs how to display the composition window
         //using the IMC_SETCOMPOSITIONWINDOW message.
         //
         //I'm not sure what to do here.
@@ -1117,17 +1109,17 @@ void IMEManager::updateCompositionString( void )
 		}
 		else
 		{
-			
+
 			// read MBCS instead
 			result = ImmGetCompositionStringA( m_context, GCS_COMPSTR, tempBuf, MAX_COMPSTRINGLEN*2);
-			
+
 			if ( result > 0 )
 			{
 				tempBuf[ result ] = '\0';
-			
+
 				int convRes = MultiByteToWideChar( CP_ACP, 0, tempBuf, -1, m_compositionString, MAX_COMPSTRINGLEN );
 				GameArrayEnd(m_compositionString);
-			
+
 				if ( convRes < 0)
 				{
 					convRes = 0;
@@ -1135,14 +1127,14 @@ void IMEManager::updateCompositionString( void )
 				else
 				{
 					m_compositionCursorPos = (ImmGetCompositionString( m_context, GCS_CURSORPOS, NULL, 0) & 0xffff );
-					convRes = GameStrlen ( m_compositionString );
+					convRes = wcslen( m_compositionString );
 				}
-			
+
 				// m_compositionCursorPos is in DBCS characters, need to convert it to Wide characters
-			
+
 				//msg_assert ( (int)strlen(tempBuf) >= convRes ,("bad DBCS string: DBCS = %d chars, Wide = %d chars", strlen(tempBuf), convRes));
 				m_compositionCursorPos = _mbsnccnt ( (unsigned char *) tempBuf, m_compositionCursorPos );
-			
+
 				m_compositionString[convRes] = 0;
 				m_compositionStringLength = convRes;
 				if ( m_compositionCursorPos > convRes )
@@ -1163,7 +1155,7 @@ void IMEManager::updateCompositionString( void )
 }
 
 //============================================================================
-// IMEManager::getResultsString 
+// IMEManager::getResultsString
 //============================================================================
 
 void IMEManager::getResultsString ( void )
@@ -1183,16 +1175,16 @@ void IMEManager::getResultsString ( void )
 		else
 		{
 			char tempBuf[ (MAX_COMPSTRINGLEN+1)*2];
-			
+
 			// read MBCS instead
 			result = ImmGetCompositionStringA( m_context, GCS_RESULTSTR, tempBuf, MAX_COMPSTRINGLEN*2);
-			
+
 			if ( result > 0 )
 			{
 				tempBuf[ result ] = '\0';
-			
+
 				int convRes = MultiByteToWideChar( CP_ACP, 0, tempBuf, strlen(tempBuf), m_resultsString, MAX_COMPSTRINGLEN );
-			
+
 				if ( convRes < 0)
 				{
 					convRes = 0;
@@ -1208,7 +1200,7 @@ void IMEManager::getResultsString ( void )
 }
 
 //============================================================================
-// IMEManager::convertToUnicode 
+// IMEManager::convertToUnicode
 //============================================================================
 
 void IMEManager::convertToUnicode ( Char *mbcs, UnicodeString &unicode )
@@ -1227,7 +1219,7 @@ void IMEManager::convertToUnicode ( Char *mbcs, UnicodeString &unicode )
 	if ( buffer )
 	{
 		size = MultiByteToWideChar( CP_ACP, 0, mbcs, strlen(mbcs), buffer, size );
-		
+
 		if ( size <= 0 )
 		{
 			unicode.clear();
@@ -1258,7 +1250,7 @@ void IMEManager::openCandidateList( Int candidateFlags )
 
 	m_candidateWindow->winHide( FALSE );
 	m_candidateWindow->winBringToTop();
-	TheWindowManager->winSetModal( m_candidateWindow ); 
+	TheWindowManager->winSetModal( m_candidateWindow );
 
 	Int wx, wy, wwidth, wheight, wcursorx, wcursory;
 	Int cx, cy, cwidth, cheight;
@@ -1320,14 +1312,11 @@ void IMEManager::closeCandidateList( Int candidateFlags  )
 	if ( m_candidateWindow != NULL )
 	{
 		m_candidateWindow->winHide( TRUE );
-		TheWindowManager->winUnsetModal( m_candidateWindow ); 
+		TheWindowManager->winUnsetModal( m_candidateWindow );
 	}
 
-	if ( m_candidateString )
-	{
-		delete [] m_candidateString;
-		m_candidateString = NULL;
-	}
+	delete [] m_candidateString;
+	m_candidateString = NULL;
 
 	m_candidateCount = 0;
 
@@ -1340,19 +1329,16 @@ void IMEManager::closeCandidateList( Int candidateFlags  )
 void IMEManager::updateCandidateList( Int candidateFlags  )
 {
 
-	if ( m_candidateString )
-	{
-		delete [] m_candidateString;
-		m_candidateString = NULL;
-	}
+	delete [] m_candidateString;
+	m_candidateString = NULL;
 
 	m_pageSize = 10;
 	m_candidateCount = 0;
 	m_pageStart = 0;
 	m_selectedIndex = 0;
 
-	if (	m_candidateWindow == NULL || 
-				m_context == NULL || 
+	if (	m_candidateWindow == NULL ||
+				m_context == NULL ||
 				candidateFlags == 0)
 	{
 		return;
@@ -1376,17 +1362,17 @@ void IMEManager::updateCandidateList( Int candidateFlags  )
 					return;
 				}
 			}
-			
+
 			// create a temporary buffer for reading the candidate list
 			Char *buffer = NEW Char[size];
-			
+
 			if ( buffer == NULL )
 			{
 				return;
 			}
-			
+
 			memset( buffer, 0, size );
-			
+
 			CANDIDATELIST *clist = (CANDIDATELIST*) buffer;
 
 			Bool ok = TRUE ;
@@ -1409,9 +1395,9 @@ void IMEManager::updateCandidateList( Int candidateFlags  )
 
 			if ( ok && clist->dwStyle != IME_CAND_UNKNOWN && clist->dwStyle != IME_CAND_CODE  )
 			{
-		    //Apparently there is an "IME98 bug" (IME bug under Windows 98?) that 
-		    //causes you to have to execute the following code. 
-		    if(( clist->dwPageStart >  clist->dwSelection) || 
+		    //Apparently there is an "IME98 bug" (IME bug under Windows 98?) that
+		    //causes you to have to execute the following code.
+		    if(( clist->dwPageStart >  clist->dwSelection) ||
 		       (clist->dwSelection >= clist->dwPageStart + clist->dwPageSize))
 		    {
 		       clist->dwPageStart = (clist->dwSelection / clist->dwPageSize) * clist->dwPageSize;
@@ -1423,7 +1409,7 @@ void IMEManager::updateCandidateList( Int candidateFlags  )
 				m_selectedIndex = clist->dwSelection;
 
 				#ifdef DEBUG_IME
-				DEBUG_LOG(("IME: Candidate Update: Candidates = %d, pageSize = %d pageStart = %d, selected = %d\n", m_candidateCount, m_pageStart, m_pageSize, m_selectedIndex ));
+				DEBUG_LOG(("IME: Candidate Update: Candidates = %d, pageSize = %d pageStart = %d, selected = %d", m_candidateCount, m_pageStart, m_pageSize, m_selectedIndex ));
 				#endif
 
 				if ( m_candidateUpArrow )
@@ -1505,7 +1491,7 @@ void IMEManager::resizeCandidateWindow( Int pageSize )
 	}
 
 	Int newh = pageSize * (font->height + IMECandidateWindowLineSpacing);
-	Int w, h; 
+	Int w, h;
 	m_candidateTextArea->winGetSize( &w, &h );
 
 	Int dif = newh - h;
@@ -1524,7 +1510,7 @@ void IMEManager::resizeCandidateWindow( Int pageSize )
 		m_candidateDownArrow->winSetPosition( x, y );
 	}
 
-}	
+}
 
 //============================================================================
 // IMEManager::getCandidateCount
@@ -1539,7 +1525,7 @@ Int	IMEManager::getCandidateCount()
 // IMEManager::getCandidate
 //============================================================================
 
-UnicodeString* IMEManager::getCandidate( Int index )
+const UnicodeString* IMEManager::getCandidate( Int index )
 {
 	if ( m_candidateString != NULL && index >=0 && index < m_candidateCount )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
index 21d3c892aff..ef054982dec 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
@@ -24,12 +24,12 @@
 
 // FILE: LoadScreen.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Mar 2002
@@ -37,7 +37,7 @@
 //	Filename: 	LoadScreen.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Contains each of the different derived LoadClasses for each of the
 //						Different kind of games we can have.
 //
@@ -47,7 +47,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -71,6 +71,7 @@
 #include "GameClient/GameText.h"
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/GameWindowTransitions.h"
+#include "GameClient/Keyboard.h"
 #include "GameClient/LoadScreen.h"
 #include "GameClient/MapUtil.h"
 #include "GameClient/Mouse.h"
@@ -90,11 +91,6 @@
 // DEFINES ////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 // PRIVATE TYPES //////////////////////////////////////////////////////////////
@@ -144,12 +140,12 @@ static const Int TELETYPE_UPDATE_FREQ = 2; // how many frames between teletype u
 
 
 //-----------------------------------------------------------------------------
-// LoadScreen Class 
+// LoadScreen Class
 //-----------------------------------------------------------------------------
 
 LoadScreen::LoadScreen( void )
 {
-	m_loadScreen = NULL;		
+	m_loadScreen = NULL;
 }
 
 LoadScreen::~LoadScreen( void )
@@ -180,13 +176,10 @@ void LoadScreen::update( Int percent )
 //-----------------------------------------------------------------------------
 SinglePlayerLoadScreen::SinglePlayerLoadScreen( void )
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_currentObjectiveLine = 0;
 	m_currentObjectiveLineCharacter = 0;
 	m_finishedObjectiveText = NULL;
 	m_currentObjectiveWidthOffset = 0;
-	//
 	m_progressBar = NULL;
 	m_percent = NULL;
 	m_videoStream = NULL;
@@ -196,7 +189,7 @@ SinglePlayerLoadScreen::SinglePlayerLoadScreen( void )
 		m_objectiveLines[i] = NULL;
 
 }
-	
+
 SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )
 {
 	m_progressBar = NULL;
@@ -204,17 +197,19 @@ SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )
 	m_objectiveWin = NULL;
 	for(Int i = 0; i < MAX_OBJECTIVE_LINES; ++i)
 		m_objectiveLines[i] = NULL;
-	if(m_videoBuffer)
-		delete m_videoBuffer;
+
+	delete m_videoBuffer;
 	m_videoBuffer = NULL;
 
 	if ( m_videoStream )
+	{
 		m_videoStream->close();
-	m_videoStream = NULL;
-	
+		m_videoStream = NULL;
+	}
+
 	TheAudio->removeAudioEvent( m_ambientLoopHandle );
 	m_ambientLoopHandle = NULL;
-	
+
 }
 
 void SinglePlayerLoadScreen::moveWindows( Int frame )
@@ -237,7 +232,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame )
 	};
 	if(frame < STATE_BEGIN || frame > STATE_END)
 		return;
-	
+
 	if( frame == STATE_BEGIN_BREIFING)
 	{
 		// add sound support here
@@ -249,7 +244,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame )
 		m_objectiveWin->winHide(FALSE);
 		// animate the text and stuff
 	}
-	
+
 	if( frame > STATE_BEGIN_ANIMATING_TEXT && frame <= STATE_END_ANIMATING_TEXT && !m_finishedObjectiveText)
 	{
 		if(m_currentObjectiveLineCharacter >= m_unicodeObjectiveLines[m_currentObjectiveLine].getLength() )
@@ -272,7 +267,7 @@ void SinglePlayerLoadScreen::moveWindows( Int frame )
 		m_currentObjectiveLineCharacter++;
 	}
 	switch (frame) {
-	
+
 	case STATE_SHOW_LOCATION:
 		m_location->winHide(FALSE);
 		break;
@@ -338,11 +333,11 @@ void SinglePlayerLoadScreen::moveWindows( Int frame )
 		m_cameoWindow2->winGetPosition(&endPos.x, &endPos.y);
 		endPos.x = endPos.x - xOffset;
 		endPos.y = startPos.y;
-	
+
 	}
 	else if( frame > STATE_ANIM_CAMEO1_TRASITION_CAMEO2 && frame < STATE_ANIM_CAMEO2)
 	{
-		
+
 		//extrapolate between start and end pos
 		Real percent = INT_TO_REAL((frame - STATE_ANIM_CAMEO1_TRASITION_CAMEO2)) / (STATE_ANIM_CAMEO2 - STATE_ANIM_CAMEO1_TRASITION_CAMEO2);
 		m_cameoFrame->winSetPosition(startPos.x + (endPos.x - startPos.x) * percent, endPos.y);
@@ -365,11 +360,11 @@ void SinglePlayerLoadScreen::moveWindows( Int frame )
 		m_cameoWindow3->winGetPosition(&endPos.x, &endPos.y);
 		endPos.x = endPos.x - xOffset;
 		endPos.y = startPos.y;
-	
+
 	}
 	else if( frame > STATE_ANIM_CAMEO2_TRASITION_CAMEO3 && frame < STATE_ANIM_CAMEO3)
 	{
-		
+
 		//extrapolate between start and end pos
 		Real percent = INT_TO_REAL((frame - STATE_ANIM_CAMEO2_TRASITION_CAMEO3)) / (STATE_ANIM_CAMEO3 - STATE_ANIM_CAMEO2_TRASITION_CAMEO3);
 		m_cameoFrame->winSetPosition(startPos.x + (endPos.x - startPos.x) * percent, endPos.y);
@@ -385,35 +380,35 @@ void SinglePlayerLoadScreen::moveWindows( Int frame )
 		m_cameoWindow3->winEnable(FALSE);
 		GadgetStaticTextSetText(m_cameoText, UnicodeString::TheEmptyString);
 		m_cameoFrame->winHide(TRUE);
-		
+
 	}
 }*/
- 
+
 void SinglePlayerLoadScreen::init( GameInfo *game )
 {
 	//No music in SinglePlayerLoadScreen
 
 	// create the layout of the load screen
-	m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/SinglePlayerLoadScreen.wnd" ) );
+	m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/SinglePlayerLoadScreen.wnd" );
 	DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the single player loadscreen"));
 	m_loadScreen->winHide(FALSE);
 	m_loadScreen->winBringToTop();
 //	Mission *mission = TheCampaignManager->getCurrentMission();
 	// Store the pointer to the progress bar on the loadscreen
-	m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:ProgressLoad" ) ));
+	m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:ProgressLoad" ));
 	DEBUG_ASSERTCRASH(m_progressBar, ("Can't initialize the progressbar for the single player loadscreen"));
-	GadgetProgressBarSetProgress(m_progressBar, 0 );	
+	GadgetProgressBarSetProgress(m_progressBar, 0 );
 
-	m_percent = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:Percent" ) ));
+	m_percent = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:Percent" ));
 	DEBUG_ASSERTCRASH(m_percent, ("Can't initialize the m_percent for the single player loadscreen"));
-	GadgetStaticTextSetText(m_percent,UnicodeString(L"0%"));
+	GadgetStaticTextSetText(m_percent,L"0%");
 	m_percent->winHide(TRUE);
 
-	m_objectiveWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:ObjectivesWin" ) ));
+	m_objectiveWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:ObjectivesWin" ));
 	DEBUG_ASSERTCRASH(m_objectiveWin, ("Can't initialize the m_objectiveWin for the single player loadscreen"));
 	m_objectiveWin->winHide(TRUE);
 
-	
+
 	Mission *mission = TheCampaignManager->getCurrentMission();
 	AsciiString lineName;
 	Int i = 0;
@@ -437,46 +432,46 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 		GadgetStaticTextSetText(m_unitDesc[i],TheGameText->fetch(mission->m_unitNames[i]));
 		m_unitDesc[i]->winHide(TRUE);
 	}
-	m_location = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:StaticTextCameoText3" ) ));
+	m_location = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:StaticTextCameoText3" ));
 	DEBUG_ASSERTCRASH(m_location, ("Can't initialize the m_objectiveWin for the single player loadscreen"));
 	m_location->winHide(TRUE);
 	GadgetStaticTextSetText(m_location, TheGameText->fetch(mission->m_locationNameLabel));
-	
 
-	
+
+
 	m_currentObjectiveLine = 0;
 	m_currentObjectiveWidthOffset = 0;
 	m_currentObjectiveLineCharacter = 0;
 	m_finishedObjectiveText = FALSE;
 /*
-	m_cameoWindow1 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowCameo1" ) ));
+	m_cameoWindow1 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowCameo1" ));
 	DEBUG_ASSERTCRASH(m_cameoWindow1, ("Can't initialize the m_cameoWindow1 for the single player loadscreen"));
 	m_cameoWindow1->winHide(TRUE);
 	m_cameoWindow1->winEnable(FALSE);
 	m_cameoWindow1->winSetEnabledImage(0, mission->m_cameoImage[0]);
 	m_cameoWindow1->winSetDisabledImage(0, mission->m_cameoDisabledImage[0]);
 
-	m_cameoWindow2 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowCameo2" ) ));
+	m_cameoWindow2 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowCameo2" ));
 	DEBUG_ASSERTCRASH(m_cameoWindow2, ("Can't initialize the m_cameoWindow2 for the single player loadscreen"));
 	m_cameoWindow2->winHide(TRUE);
 	m_cameoWindow2->winEnable(FALSE);
 	m_cameoWindow2->winSetEnabledImage(0, mission->m_cameoImage[1]);
 	m_cameoWindow2->winSetDisabledImage(0, mission->m_cameoDisabledImage[1]);
 
-	m_cameoWindow3 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowCameo3" ) ));
+	m_cameoWindow3 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowCameo3" ));
 	DEBUG_ASSERTCRASH(m_cameoWindow3, ("Can't initialize the m_cameoWindow3 for the single player loadscreen"));
 	m_cameoWindow3->winHide(TRUE);
 	m_cameoWindow3->winEnable(FALSE);
 	m_cameoWindow3->winSetEnabledImage(0, mission->m_cameoImage[2]);
 	m_cameoWindow3->winSetDisabledImage(0, mission->m_cameoDisabledImage[2]);
 
-	m_headMovie = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowHead" ) ));
+	m_headMovie = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowHead" ));
 	DEBUG_ASSERTCRASH(m_headMovie, ("Can't initialize the m_headMovie for the single player loadscreen"));
 	m_headMovie->winHide(TRUE);
-	m_cameoFrame = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowHiliteCameo" ) ));
+	m_cameoFrame = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowHiliteCameo" ));
 	DEBUG_ASSERTCRASH(m_cameoFrame, ("Can't initialize the m_cameoFrame for the single player loadscreen"));
 	m_cameoFrame->winHide(TRUE);
-	m_cameoText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:StaticTextCameoText" ) ));
+	m_cameoText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:StaticTextCameoText" ));
 	DEBUG_ASSERTCRASH(m_cameoText, ("Can't initialize the m_cameoText for the single player loadscreen"));
 
 */
@@ -491,8 +486,8 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 
 	// Create the new buffer
 	m_videoBuffer = TheDisplay->createVideoBuffer();
-	if (	m_videoBuffer == NULL || 
-				!m_videoBuffer->allocate(	m_videoStream->width(), 
+	if (	m_videoBuffer == NULL ||
+				!m_videoBuffer->allocate(	m_videoStream->width(),
 													m_videoStream->height())
 		)
 	{
@@ -500,8 +495,10 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 		m_videoBuffer = NULL;
 
 		if ( m_videoStream )
+		{
 			m_videoStream->close();
-		m_videoStream = NULL;
+			m_videoStream = NULL;
+		}
 
 		return;
 	}
@@ -509,7 +506,7 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 	// format the progress bar: USA to blue, GLA to green, China to red
 	// and set the background image
 	AsciiString campaignName = TheCampaignManager->getCurrentCampaign()->m_name;
-	GameWindow *backgroundWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:ParentSinglePlayerLoadScreen" ) ));
+	GameWindow *backgroundWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:ParentSinglePlayerLoadScreen" ));
 	if (campaignName.compareNoCase("USA") == 0)
 	{
 		backgroundWin->winSetEnabledImage( 0, TheMappedImageCollection->findImageByName("MissionLoad_USA") );
@@ -524,33 +521,39 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 	{
 		backgroundWin->winSetEnabledImage( 0, TheMappedImageCollection->findImageByName("MissionLoad_China") );
 		m_progressBar->winSetEnabledImage( 6, TheMappedImageCollection->findImageByName("LoadingBar_ProgressCenter1") );
-	} 
+	}
 	// else leave the default background screen
 
 
 	if(TheGameLODManager && TheGameLODManager->didMemPass())
 	{
+		// TheSuperHackers @bugfix Originally this movie render loop stopped rendering when the game window was inactive.
+		// This either skipped the movie or caused decompression artifacts. Now the video just keeps playing until it done.
+
 		Int progressUpdateCount = m_videoStream->frameCount() / FRAME_FUDGE_ADD;
 		Int shiftedPercent = -FRAME_FUDGE_ADD + 1;
 		while (m_videoStream->frameIndex() < m_videoStream->frameCount() - 1 )
 		{
+			// TheSuperHackers @feature User can now skip video by pressing ESC
+			if (TheKeyboard)
+			{
+				TheKeyboard->UPDATE();
+				KeyboardIO *io = TheKeyboard->findKey(KEY_ESC, KeyboardIO::STATUS_UNUSED);
+				if (io && BitIsSet(io->state, KEY_STATE_DOWN))
+				{
+					io->setUsed();
+					break;
+				}
+			}
+
 			TheGameEngine->serviceWindowsOS();
 
 			if(!m_videoStream->isFrameReady())
 			{
-				Sleep(1);	
+				Sleep(1);
 				continue;
 			}
 
-			if (!TheGameEngine->isActive())
-			{/*	//we are alt-tabbed out, so just increment the frame
-				m_videoStream->frameNext();
-				m_videoStream->frameDecompress();*/
-
-				//Changing for MissionDisk, just skip to end.
-				break;
-			}
-			
 			m_videoStream->frameDecompress();
 			m_videoStream->frameRender(m_videoBuffer);
 
@@ -572,7 +575,7 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 				TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
 				GadgetProgressBarSetProgress(m_progressBar, percent);
 				GadgetStaticTextSetText(m_percent, per);
-			
+
 			}
 			TheWindowManager->update();
 
@@ -589,13 +592,13 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 	else
 	{
 		// if we're min spec'ed don't play a movie
-		
+
 		Int delay = mission->m_voiceLength * 1000;
 		Int begin = timeGetTime();
 		Int currTime = begin;
 		Int fudgeFactor = 0;
 		while(begin + delay > currTime )
-		{		
+		{
 			fudgeFactor = 30 * ((currTime - begin)/ INT_TO_REAL(delay ));
 			GadgetProgressBarSetProgress(m_progressBar, fudgeFactor);
 
@@ -604,7 +607,7 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 			Sleep(100);
 			currTime = timeGetTime();
 		}
-		
+
 
 		TheWindowManager->update();
 		TheDisplay->draw();
@@ -613,7 +616,7 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 	setFPMode();
 	m_percent->winHide(TRUE);
 	m_ambientLoopHandle = TheAudio->addAudioEvent(&m_ambientLoop);
-	
+
 }
 
 void SinglePlayerLoadScreen::reset( void )
@@ -630,7 +633,7 @@ void SinglePlayerLoadScreen::update( Int percent )
 	TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
 	GadgetProgressBarSetProgress(m_progressBar, percent);
 	GadgetStaticTextSetText(m_percent, per);
-	
+
 	// Do this last!
 	LoadScreen::update( percent );
 }
@@ -681,17 +684,20 @@ ChallengeLoadScreen::ChallengeLoadScreen( void )
 	m_overlayVs = NULL;
 	m_wndVideoManager = NULL;
 }
-	
+
 ChallengeLoadScreen::~ChallengeLoadScreen( void )
 {
 	m_progressBar = NULL;
-	if(m_videoBuffer)
-		delete m_videoBuffer;
+
+	delete m_videoBuffer;
 	m_videoBuffer = NULL;
+
 	if ( m_videoStream )
+	{
 		m_videoStream->close();
-	m_videoStream = NULL;
-	
+		m_videoStream = NULL;
+	}
+
 	m_bioNameLeft = NULL;
 	m_bioAgeLeft = NULL;
 	m_bioBirthplaceLeft = NULL;
@@ -724,8 +730,7 @@ ChallengeLoadScreen::~ChallengeLoadScreen( void )
 	m_overlayVsBackdrop = NULL;
 	m_overlayVs = NULL;
 
-	if(m_wndVideoManager)
-		delete m_wndVideoManager;
+	delete m_wndVideoManager;
 	m_wndVideoManager = NULL;
 
 	TheAudio->removeAudioEvent( m_ambientLoopHandle );
@@ -747,7 +752,7 @@ Int updateTeletypeText( Int num_chars, GameWindow* window, UnicodeString full_te
 			currentText.concat(wChar);
 			current_text_pos++;
 		}
-	}	
+	}
 	GadgetStaticTextSetText(window, currentText);
 	return current_text_pos;
 }
@@ -818,14 +823,14 @@ void ChallengeLoadScreen::activatePieces( Int frame, const GeneralPersona *gener
 			GadgetStaticTextSetText( m_bioStrategyEntryRight, UnicodeString::TheEmptyString );
 			break;
 		case FRAME_PORTRAITS_START:
-			
+
 			m_wndVideoManager->playMovie( m_portraitMovieLeft, generalPlayer->getPortraitMovieLeftName(), WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME);
 			m_wndVideoManager->playMovie( m_portraitMovieRight, generalOpponent->getPortraitMovieRightName(), WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME);
 			m_portraitMovieLeft->winHide(FALSE);
 			m_portraitMovieRight->winHide(FALSE);
 
 			TheAudio->addAudioEvent( &eventLeftGeneral );
-			
+
 			break;
 		case FRAME_OUTER_CIRCLE_LINE_SHOW:
 //			m_overlayReticleCircleLineOuter->winHide(FALSE);
@@ -853,7 +858,7 @@ void ChallengeLoadScreen::activatePieces( Int frame, const GeneralPersona *gener
 //					m_overlayVsBackdrop->winSetEnabledImage( 0, TheMappedImageCollection->findImageByFilename("))
 			m_overlayVsBackdrop->winHide(FALSE);
 			m_overlayVs->winHide(FALSE);
-			m_wndVideoManager->playMovie( m_overlayVs, AsciiString("VSSmall"), WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME);
+			m_wndVideoManager->playMovie( m_overlayVs, "VSSmall", WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME);
 
 			// "Verses"
 			TheAudio->addAudioEvent( &eventVS );
@@ -873,7 +878,7 @@ void ChallengeLoadScreen::activatePieces( Int frame, const GeneralPersona *gener
 //		textPosAgeLeft = updateTeletypeText( 1, m_bioAgeEntryLeft, TheGameText->fetch(generalPlayer->getBioDOB()), textPosAgeLeft);
 		textPosBirthplaceLeft = updateTeletypeText( 1, m_bioBirthplaceEntryLeft, TheGameText->fetch(generalPlayer->getBioRank()), textPosBirthplaceLeft);
 		textPosStrategyLeft = updateTeletypeText( 1, m_bioStrategyEntryLeft, TheGameText->fetch(generalPlayer->getBioStrategy()), textPosStrategyLeft);
-		
+
 		textPosNameRight = updateTeletypeText( 1, m_bioNameEntryRight, TheGameText->fetch(generalOpponent->getBioName()), textPosNameRight);
 		textPosBigNameRight = updateTeletypeText( 1, m_bioBigNameEntryRight, TheGameText->fetch(generalOpponent->getBioName()), textPosBigNameRight);
 //		textPosAgeRight = updateTeletypeText( 1, m_bioAgeEntryRight, TheGameText->fetch(generalOpponent->getBioDOB()), textPosAgeRight);
@@ -881,7 +886,7 @@ void ChallengeLoadScreen::activatePieces( Int frame, const GeneralPersona *gener
 		textPosStrategyRight = updateTeletypeText( 1, m_bioStrategyEntryRight, TheGameText->fetch(generalOpponent->getBioStrategy()), textPosStrategyRight);
 	}
 }
- 
+
 void ChallengeLoadScreen::activatePiecesMinSpec(const GeneralPersona *generalPlayer, const GeneralPersona *generalOpponent)
 {
 	m_bioNameLeft->winHide(FALSE);
@@ -921,7 +926,7 @@ void ChallengeLoadScreen::activatePiecesMinSpec(const GeneralPersona *generalPla
 	m_overlayVsBackdrop->winHide(FALSE);
 	m_overlayVsBackdrop->winHide(FALSE);
 	m_overlayVs->winHide(FALSE);
-	m_wndVideoManager->playMovie( m_overlayVs, AsciiString("VSSmall"), WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME);
+	m_wndVideoManager->playMovie( m_overlayVs, "VSSmall", WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME);
 }
 
 
@@ -938,15 +943,15 @@ void ChallengeLoadScreen::init( GameInfo *game )
 	const GeneralPersona* generalOpponent = TheChallengeGenerals->getGeneralByGeneralName( mission->m_generalName );
 
 	// create the layout of the load screen
-	m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/ChallengeLoadScreen.wnd" ) );
+	m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/ChallengeLoadScreen.wnd" );
 	DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the single player loadscreen"));
 	m_loadScreen->winHide(FALSE);
 	m_loadScreen->winBringToTop();
 
 	// Store the pointer to the progress bar on the loadscreen
-	m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ChallengeLoadScreen.wnd:ProgressLoad" ) ));
+	m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:ProgressLoad" ));
 	DEBUG_ASSERTCRASH(m_progressBar, ("Can't initialize the progressbar for the single player loadscreen"));
-	GadgetProgressBarSetProgress(m_progressBar, 0 );	
+	GadgetProgressBarSetProgress(m_progressBar, 0 );
 
 	m_ambientLoop.setEventName("LoadScreenAmbient");
 
@@ -961,75 +966,77 @@ void ChallengeLoadScreen::init( GameInfo *game )
 		m_videoBuffer = NULL;
 
 		if ( m_videoStream )
+		{
 			m_videoStream->close();
-		m_videoStream = NULL;
+			m_videoStream = NULL;
+		}
 
 		return;
 	}
 
 	// init overlays
-	NameKeyType namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:PortraitLeft"));
+	NameKeyType namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:PortraitLeft");
 	m_portraitLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:PortraitRight"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:PortraitRight");
 	m_portraitRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
 
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:PortraitMovieLeft"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:PortraitMovieLeft");
 	m_portraitMovieLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:PortraitMovieRight"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:PortraitMovieRight");
 	m_portraitMovieRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
 
-//	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:ReticleCrosshairs"));
+//	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:ReticleCrosshairs");
 //	m_overlayReticleCrosshairs = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
 /*
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:OuterCircleLine"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:OuterCircleLine");
 	m_overlayReticleCircleLineOuter = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:InnerCircleLine"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:InnerCircleLine");
 	m_overlayReticleCircleLineInner = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
 */
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:CircleAlphaOuter"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:CircleAlphaOuter");
 	m_overlayReticleCircleAlphaOuter = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:CircleAlphaInner"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:CircleAlphaInner");
 	m_overlayReticleCircleAlphaInner = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:VersusBackdrop"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:VersusBackdrop");
 	m_overlayVsBackdrop = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:OverlayVs"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:OverlayVs");
 	m_overlayVs = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
 
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioNameLeft"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioNameLeft");
 	m_bioNameLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-//	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioDOBLeft"));
+//	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioDOBLeft");
 //	m_bioAgeLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioBirthplaceLeft"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioBirthplaceLeft");
 	m_bioBirthplaceLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioStrategyLeft"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioStrategyLeft");
 	m_bioStrategyLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BigNameEntryLeft"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BigNameEntryLeft");
 	m_bioBigNameEntryLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioNameEntryLeft"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioNameEntryLeft");
 	m_bioNameEntryLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-//	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioDOBEntryLeft"));
+//	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioDOBEntryLeft");
 //	m_bioAgeEntryLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioBirthplaceEntryLeft"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioBirthplaceEntryLeft");
 	m_bioBirthplaceEntryLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioStrategyEntryLeft"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioStrategyEntryLeft");
 	m_bioStrategyEntryLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioNameRight"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioNameRight");
 	m_bioNameRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-//	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioDOBRight"));
+//	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioDOBRight");
 //	m_bioAgeRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioBirthplaceRight"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioBirthplaceRight");
 	m_bioBirthplaceRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioStrategyRight"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioStrategyRight");
 	m_bioStrategyRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BigNameEntryRight"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BigNameEntryRight");
 	m_bioBigNameEntryRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioNameEntryRight"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioNameEntryRight");
 	m_bioNameEntryRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-//	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioDOBEntryRight"));
+//	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioDOBEntryRight");
 //	m_bioAgeEntryRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioBirthplaceEntryRight"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioBirthplaceEntryRight");
 	m_bioBirthplaceEntryRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
-	namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioStrategyEntryRight"));
+	namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioStrategyEntryRight");
 	m_bioStrategyEntryRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey );
 
 
@@ -1046,25 +1053,33 @@ void ChallengeLoadScreen::init( GameInfo *game )
 
 	if(TheGameLODManager && TheGameLODManager->didMemPass())
 	{
+		// TheSuperHackers @bugfix Originally this movie render loop stopped rendering when the game window was inactive.
+		// This either skipped the movie or caused decompression artifacts. Now the video just keeps playing until it done.
+
 		Int progressUpdateCount = m_videoStream->frameCount() / FRAME_FUDGE_ADD;
 		Int shiftedPercent = -FRAME_FUDGE_ADD + 1;
 		while (m_videoStream->frameIndex() < m_videoStream->frameCount() - 1 )
 		{
+			// TheSuperHackers @feature User can now skip video by pressing ESC
+			if (TheKeyboard)
+			{
+				TheKeyboard->UPDATE();
+				KeyboardIO *io = TheKeyboard->findKey(KEY_ESC, KeyboardIO::STATUS_UNUSED);
+				if (io && BitIsSet(io->state, KEY_STATE_DOWN))
+				{
+					io->setUsed();
+					break;
+				}
+			}
+
 			TheGameEngine->serviceWindowsOS();
 
 			if(!m_videoStream->isFrameReady())
 			{
-				Sleep(1);	
+				Sleep(1);
 				continue;
 			}
 
-			if (!TheGameEngine->isActive())
-			{	//we are alt-tabbed out, so just increment the frame
-				m_videoStream->frameNext();
-				m_videoStream->frameDecompress();
-				continue;
-			}
-			
 			m_videoStream->frameDecompress();
 			m_videoStream->frameRender(m_videoBuffer);
 			m_videoStream->frameNext();
@@ -1113,7 +1128,7 @@ void ChallengeLoadScreen::init( GameInfo *game )
 		Int currTime = begin;
 		Int fudgeFactor = 0;
 		while(begin + delay > currTime )
-		{		
+		{
 			fudgeFactor = 30 * ((currTime - begin)/ INT_TO_REAL(delay ));
 			GadgetProgressBarSetProgress(m_progressBar, fudgeFactor);
 
@@ -1122,14 +1137,14 @@ void ChallengeLoadScreen::init( GameInfo *game )
 			Sleep(100);
 			currTime = timeGetTime();
 		}
-		
+
 		m_wndVideoManager->update();
 		TheWindowManager->update();
 		TheDisplay->draw();
 	}
 	setFPMode();
 
-	
+
 	AudioEventRTS event( generalOpponent->getRandomTauntSound() );
 	TheAudio->addAudioEvent( &event );
 
@@ -1166,10 +1181,10 @@ ShellGameLoadScreen::ShellGameLoadScreen( void )
 {
 	m_progressBar = NULL;
 }
-	
+
 ShellGameLoadScreen::~ShellGameLoadScreen( void )
 {
-	
+
 	m_progressBar = NULL;
 }
 
@@ -1177,94 +1192,30 @@ void ShellGameLoadScreen::init( GameInfo *game )
 {
 	static BOOL firstLoad = TRUE;
 
-	
+
 	// create the layout of the load screen
-	m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/ShellGameLoadScreen.wnd" ) );
+	m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/ShellGameLoadScreen.wnd" );
 	DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the ShellGame loadscreen"));
 	m_loadScreen->winHide(FALSE);
 	m_loadScreen->winBringToTop();
 
 	// Store the pointer to the progress bar on the loadscreen
-	m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ShellGameLoadScreen.wnd:ProgressLoad" ) ));
+	m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "ShellGameLoadScreen.wnd:ProgressLoad" ));
 	DEBUG_ASSERTCRASH(m_progressBar, ("Can't initialize the progressbar for the single player loadscreen"));
-	GadgetProgressBarSetProgress(m_progressBar, 0 );	
+	GadgetProgressBarSetProgress(m_progressBar, 0 );
 	m_progressBar->winHide(TRUE);
-	
+
 	if(m_loadScreen && firstLoad && TheGameLODManager && TheGameLODManager->didMemPass())
 	{
 		m_loadScreen->winSetEnabledImage(0, TheMappedImageCollection->findImageByName("TitleScreen"));
 		TheWritableGlobalData->m_breakTheMovie = FALSE;
 
-//		m_videoStream = TheVideoPlayer->open( "Sizzle" );
-//		if ( m_videoStream == NULL )
-//		{
-//			m_progressBar->winHide(FALSE);
-//			return;
-//		}
-//
-//		// Create the new buffer
-//		m_videoBuffer = TheDisplay->createVideoBuffer();
-//		if (	m_videoBuffer == NULL || 
-//					!m_videoBuffer->allocate(	m_videoStream->width(), 
-//														m_videoStream->height())
-//			)
-//		{
-//			delete m_videoBuffer;
-//			m_videoBuffer = NULL;
-//
-//			if ( m_videoStream )
-//				m_videoStream->close();
-//			m_videoStream = NULL;
-//
-//			return;
-//		}
-//		TheGlobalData->m_isBreakableMovie = TRUE;
-//		TheGlobalData->m_breakTheMovie = FALSE;
-//		while (m_videoStream->frameIndex() < m_videoStream->frameCount() - 1 )
-//		{
-//			if(TheGlobalData->m_breakTheMovie)
-//			{
-//				TheGlobalData->m_breakTheMovie = FALSE;
-//				m_videoStream->frameGoto(m_videoStream->frameCount() - 1);
-//			}
-//			if(m_videoStream->frameIndex() < m_videoStream->frameCount() - 1)
-//			{
-//				if(!m_videoStream->isFrameReady())
-//					continue;
-//
-//				m_videoStream->frameDecompress();
-//				m_videoStream->frameRender(m_videoBuffer);
-//				m_videoStream->frameNext();
-//				if(m_videoBuffer)
-//					m_loadScreen->winGetInstanceData()->setVideoBuffer(m_videoBuffer);
-//			}
-//
-//			TheWindowManager->update();
-//		//	TheShell->update();
-//			//TheDisplay->update();
-//			// redraw all views, update the GUI
-//			TheDisplay->draw();
-//		}
-//		TheGlobalData->m_isBreakableMovie = FALSE;
-//		TheGlobalData->m_breakTheMovie = FALSE;
-//		GameWindow *win = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ShellGameLoadScreen.wnd:EAGamesLogo" ) ));
-//		if(win)
-//			win->winHide(FALSE);
-
-		GameWindow *win = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ShellGameLoadScreen.wnd:StaticTextLegal" ) ));
+		GameWindow *win = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "ShellGameLoadScreen.wnd:StaticTextLegal" ));
 		if(win)
 			win->winHide(FALSE);
 		firstLoad = FALSE;
-
-		UnsignedInt showTime = timeGetTime();
-		while(showTime + 3000 > timeGetTime())
-		{	
-			LoadScreen::update(0);
-			Sleep(100);
-		}
-
 	}
-	m_progressBar->winHide(FALSE);	
+	m_progressBar->winHide(FALSE);
 }
 
 void ShellGameLoadScreen::reset( void )
@@ -1286,26 +1237,25 @@ void ShellGameLoadScreen::update( Int percent )
 //-----------------------------------------------------------------------------
 MultiPlayerLoadScreen::MultiPlayerLoadScreen( void )
 {
-	//Added By Sadullah Nader
-	//Initializations missing and needed
 	m_mapPreview = NULL;
 
-	//
 	for(Int i = 0; i < MAX_SLOTS; ++i)
 	{
-		//Added By Sadullah Nader
-		//Initializations missing and needed
 		m_buttonMapStartPosition[i] = NULL;
-		//
 		m_progressBars[i] = NULL;
 		m_playerNames[i] = NULL;
 		m_playerSide[i]= NULL;
 		m_playerLookup[i] = -1;
 	}
 }
-	
+
 MultiPlayerLoadScreen::~MultiPlayerLoadScreen( void )
 {
+	if(m_mapPreview)
+	{
+		m_mapPreview->winSetUserData(NULL);
+	}
+
 	for(Int i = 0; i < MAX_SLOTS; ++i)
 	{
 		m_progressBars[i] = NULL;
@@ -1325,7 +1275,7 @@ MultiPlayerLoadScreen::~MultiPlayerLoadScreen( void )
 void MultiPlayerLoadScreen::init( GameInfo *game )
 {
 	// create the layout of the load screen
-	m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/MultiplayerLoadScreen.wnd" ) );
+	m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/MultiplayerLoadScreen.wnd" );
 	DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the Multiplayer loadscreen"));
 	m_loadScreen->winHide(FALSE);
 	m_loadScreen->winBringToTop();
@@ -1347,7 +1297,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 		portrait = localGeneral->getBioPortraitLarge();
 		localName = TheGameText->fetch( localGeneral->getBioName() );
 	}
-	else 
+	else
 	{
 		// the main original factions don't have associated generals
 		AsciiString imageName;
@@ -1366,7 +1316,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 	m_portraitLocalGeneral->winSetEnabledImage( 0, portrait);
 	m_featuresLocalGeneral = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "MultiplayerLoadScreen.wnd:LocalGeneralFeatures"));
 	AsciiString features = pt->getGeneralFeatures();
-	GadgetStaticTextSetText( m_featuresLocalGeneral, TheGameText->fetch( features.isEmpty() ? AsciiString( "GUI:PlayerObserver" ) : pt->getGeneralFeatures() ) );
+	GadgetStaticTextSetText( m_featuresLocalGeneral, TheGameText->fetch( features.isEmpty() ? "GUI:PlayerObserver" : pt->getGeneralFeatures() ) );
 	m_nameLocalGeneral = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "MultiplayerLoadScreen.wnd:LocalGeneralName"));
 	GadgetStaticTextSetText( m_nameLocalGeneral, localName );
 
@@ -1378,7 +1328,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 		event.setShouldFade( TRUE );
 
 		TheAudio->addAudioEvent( &event );
-		TheAudio->update();//Since GameEngine::update() is suspended until after I am gone... 
+		TheAudio->update();//Since GameEngine::update() is suspended until after I am gone...
 
 	}
 
@@ -1386,7 +1336,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 //	if(loadScreenImage)
 //		m_loadScreen->winSetEnabledImage(0, loadScreenImage);
 	//DEBUG_ASSERTCRASH(TheNetwork, ("Where the Heck is the Network!!!!"));
-	//DEBUG_LOG(("NumPlayers %d\n", TheNetwork->getNumPlayers()));
+	//DEBUG_LOG(("NumPlayers %d", TheNetwork->getNumPlayers()));
 
 	GameWindow *teamWin[MAX_SLOTS];
 	Int i = 0;
@@ -1417,19 +1367,19 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 		winName.format( "MultiplayerLoadScreen.wnd:StaticTextPlayer%d",i);
 		m_playerNames[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 		DEBUG_ASSERTCRASH(m_playerNames[i], ("Can't initialize the Names for the Multiplayer loadscreen"));
-		
+
 		// Load the Player's Side
 		winName.format( "MultiplayerLoadScreen.wnd:StaticTextSide%d",i);
 		m_playerSide[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 		DEBUG_ASSERTCRASH(m_playerSide[i], ("Can't initialize the Sides for the Multiplayer loadscreen"));
-		
+
 		winName.format( "MultiplayerLoadScreen.wnd:StaticTextTeam%d",i);
 		teamWin[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 
 		// get the slot man!
 		GameSlot *slot = game->getSlot(i);
 		if (!slot || !slot->isOccupied())
-			continue;		
+			continue;
 
 		Color houseColor = TheMultiplayerSettings->getColor(slot->getApparentColor())->getColor();
 
@@ -1463,7 +1413,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 
 		netSlot++;
 	}
-	
+
 	for(i = netSlot; i < MAX_SLOTS; ++i)
 	{
 		m_progressBars[i]->winHide(TRUE);
@@ -1477,7 +1427,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 		const MapMetaData *mmd = TheMapCache->findMap(game->getMap());
 		Image *image = getMapPreviewImage(game->getMap());
 		m_mapPreview->winSetUserData((void *)mmd);
-		
+
 		positionStartSpots( game, m_buttonMapStartPosition, m_mapPreview);
 		updateMapStartSpots( game, m_buttonMapStartPosition, TRUE );
 		//positionAdditionalImages((MapMetaData *)mmd, m_mapPreview, TRUE);
@@ -1492,7 +1442,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
 		}
 	}
 
-	
+
 	TheGameLogic->initTimeOutValues();
 }
 
@@ -1521,7 +1471,7 @@ void MultiPlayerLoadScreen::update( Int percent )
 			TheGameLogic->processProgress( TheGameInfo->getLocalSlotNum(), percent );
 	}
 
-	//GadgetProgressBarSetProgress(m_progressBars[TheNetwork->getLocalPlayerID()], percent );	
+	//GadgetProgressBarSetProgress(m_progressBars[TheNetwork->getLocalPlayerID()], percent );
 
 	TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
 
@@ -1531,14 +1481,15 @@ void MultiPlayerLoadScreen::update( Int percent )
 
 void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage)
 {
-	
+
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
-		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));
+		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d", percentage, playerId));
+		return;
 	}
-	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)\n", percentage, playerId, m_playerLookup[playerId]));
+	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)", percentage, playerId, m_playerLookup[playerId]));
 	if(m_progressBars[m_playerLookup[playerId]])
-		GadgetProgressBarSetProgress(m_progressBars[m_playerLookup[playerId]], percentage );	
+		GadgetProgressBarSetProgress(m_progressBars[m_playerLookup[playerId]], percentage );
 }
 
 // GameSpyLoadScreen Class //////////////////////////////////////////////////
@@ -1546,19 +1497,13 @@ void MultiPlayerLoadScreen::processProgress(Int playerId, Int percentage)
 GameSpyLoadScreen::GameSpyLoadScreen( void )
 {
 
-	// Added By Sadullah Nader
-	// Initializations missing and needed
 	m_mapPreview = NULL;
-	//
 
 	for(Int i = 0; i < MAX_SLOTS; ++i)
 	{
-		
-		// Added By Sadullah Nader
-		// Initializations missing and needed
+
 		m_buttonMapStartPosition[i] = NULL;
 		m_playerRank[i] = NULL;
-		//
 
 		m_playerOfficerMedal[i] = NULL;
 		m_progressBars[i] = NULL;
@@ -1568,12 +1513,17 @@ GameSpyLoadScreen::GameSpyLoadScreen( void )
 		m_playerFavoriteFactions[i]= NULL;
 		m_playerTotalDisconnects[i]= NULL;
 		m_playerWin[i]= NULL;
-		m_playerWinLosses[i]= NULL;		
+		m_playerWinLosses[i]= NULL;
 	}
 }
-	
+
 GameSpyLoadScreen::~GameSpyLoadScreen( void )
 {
+	if(m_mapPreview)
+	{
+		m_mapPreview->winSetUserData(NULL);
+	}
+
 	for(Int i = 0; i < MAX_SLOTS; ++i)
 	{
 		m_progressBars[i] = NULL;
@@ -1583,7 +1533,7 @@ GameSpyLoadScreen::~GameSpyLoadScreen( void )
 		m_playerFavoriteFactions[i]= NULL;
 		m_playerTotalDisconnects[i]= NULL;
 		m_playerWin[i]= NULL;
-		m_playerWinLosses[i]= NULL;		
+		m_playerWinLosses[i]= NULL;
 	}
 }
 
@@ -1592,13 +1542,13 @@ extern Int GetAdditionalDisconnectsFromUserFile(Int playerID);
 void GameSpyLoadScreen::init( GameInfo *game )
 {
 	// create the layout of the load screen
-	m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/GameSpyLoadScreen.wnd" ) );
+	m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/GameSpyLoadScreen.wnd" );
 	DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the Multiplayer loadscreen"));
 	m_loadScreen->winHide(FALSE);
 	m_loadScreen->winBringToTop();
 	m_mapPreview = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "GameSpyLoadScreen.wnd:WinMapPreview"));
 	DEBUG_ASSERTCRASH(TheNetwork, ("Where the Heck is the Network!!!!"));
-	DEBUG_LOG(("NumPlayers %d\n", TheNetwork->getNumPlayers()));
+	DEBUG_LOG(("NumPlayers %d", TheNetwork->getNumPlayers()));
 GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 	const PlayerTemplate* pt;
 	if (lSlot->getPlayerTemplate() >= 0)
@@ -1618,7 +1568,7 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 		portrait = localGeneral->getBioPortraitLarge();
 		localName = TheGameText->fetch( localGeneral->getBioName() );
 	}
-	else 
+	else
 	{
 		// the main original factions don't have associated generals
 		AsciiString imageName;
@@ -1637,7 +1587,7 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 	m_portraitLocalGeneral->winSetEnabledImage( 0, portrait);
 	m_featuresLocalGeneral = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "GameSpyLoadScreen.wnd:LocalGeneralFeatures"));
 	AsciiString features = pt->getGeneralFeatures();
-	GadgetStaticTextSetText( m_featuresLocalGeneral, TheGameText->fetch( features.isEmpty() ? AsciiString( "GUI:PlayerObserver" ) : pt->getGeneralFeatures() ) );
+	GadgetStaticTextSetText( m_featuresLocalGeneral, TheGameText->fetch( features.isEmpty() ? "GUI:PlayerObserver" : pt->getGeneralFeatures() ) );
 	m_nameLocalGeneral = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "GameSpyLoadScreen.wnd:LocalGeneralName"));
 	GadgetStaticTextSetText( m_nameLocalGeneral, localName );
 
@@ -1658,13 +1608,13 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 		m_progressBars[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 		DEBUG_ASSERTCRASH(m_progressBars[i], ("Can't initialize the progressbars for the GameSpyLoadScreen loadscreen"));
 		// set the progressbar to zero
-		GadgetProgressBarSetProgress(m_progressBars[i], 0 );	
+		GadgetProgressBarSetProgress(m_progressBars[i], 0 );
 
 		// Load the Player's name
 		winName.format( "GameSpyLoadScreen.wnd:StaticTextPlayer%d",i);
 		m_playerNames[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 		DEBUG_ASSERTCRASH(m_playerNames[i], ("Can't initialize the Names for the GameSpyLoadScreen loadscreen"));
-		
+
 		// Load MapStart Positions
 		winName.format( "GameSpyLoadScreen.wnd:ButtonMapStartPosition%d",i);
 		m_buttonMapStartPosition[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
@@ -1675,12 +1625,12 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 		winName.format( "GameSpyLoadScreen.wnd:StaticTextSide%d",i);
 		m_playerSide[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 		DEBUG_ASSERTCRASH(m_playerSide[i], ("Can't initialize the Sides for the GameSpyLoadScreen loadscreen"));
-		
+
 		// Load the Player's window
 		winName.format( "GameSpyLoadScreen.wnd:WinPlayer%d",i);
 		m_playerWin[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
 		DEBUG_ASSERTCRASH(m_playerWin[i], ("Can't initialize the WinPlayer for the GameSpyLoadScreen loadscreen"));
-		
+
 		// Load the Player's m_playerTotalDisconnects
 		winName.format( "GameSpyLoadScreen.wnd:StaticTextTotalDisconnects%d",i);
 		m_playerTotalDisconnects[i] = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
@@ -1730,7 +1680,7 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 
 		// Get the stats for the player
 		PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(slot->getProfileID());
-		DEBUG_LOG(("LoadScreen - populating info for %ls(%d) - stats returned id %d\n",
+		DEBUG_LOG(("LoadScreen - populating info for %ls(%d) - stats returned id %d",
 			slot->getName().str(), slot->getProfileID(), stats.id));
 
 		Bool isPreorder = TheGameSpyInfo->didPlayerPreorder(stats.id);
@@ -1744,7 +1694,7 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 		m_playerRank[i]->winSetEnabledImage(0, rankImg);
 
 		UnicodeString formatString;
-	
+
 		// pop wins and losses
 		Int numLosses = 0;
 		PerGeneralMap::iterator it;
@@ -1772,17 +1722,17 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 			}
 		}
 //		if(numGames == 0)
-//			GadgetStaticTextSetText(m_playerFavoriteFactions[netSlot], TheGameText->fetch("GUI:None"));	
+//			GadgetStaticTextSetText(m_playerFavoriteFactions[netSlot], TheGameText->fetch("GUI:None"));
 //		else if( stats.gamesAsRandom > numGames )
-//			GadgetStaticTextSetText(m_playerFavoriteFactions[netSlot], TheGameText->fetch("GUI:Random"));	
+//			GadgetStaticTextSetText(m_playerFavoriteFactions[netSlot], TheGameText->fetch("GUI:Random"));
 //		else
-//		{		
+//		{
 //			const PlayerTemplate *fac = ThePlayerTemplateStore->getNthPlayerTemplate(favorite);
 //			if (fac)
 //			{
 //				AsciiString side;
 //				side.format("SIDE:%s", fac->getSide().str());
-//				
+//
 //				GadgetStaticTextSetText(m_playerFavoriteFactions[netSlot], TheGameText->fetch(side));
 //			}
 //		}
@@ -1835,7 +1785,7 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 
 		netSlot++;
 	}
-	
+
 	for(i = netSlot; i < MAX_SLOTS; ++i)
 	{
 		m_playerWin[i]->winHide(TRUE);
@@ -1848,7 +1798,7 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
 		const MapMetaData *mmd = TheMapCache->findMap(game->getMap());
 		Image *image = getMapPreviewImage(game->getMap());
 		m_mapPreview->winSetUserData((void *)mmd);
-		
+
 		positionStartSpots( game, m_buttonMapStartPosition, m_mapPreview);
 		updateMapStartSpots( game, m_buttonMapStartPosition, TRUE );
 		//positionAdditionalImages((MapMetaData *)mmd, m_mapPreview, TRUE);
@@ -1883,7 +1833,7 @@ void GameSpyLoadScreen::update( Int percent )
 		TheNetwork->updateLoadProgress( percent );
 	TheNetwork->liteupdate();
 
-	//GadgetProgressBarSetProgress(m_progressBars[TheNetwork->getLocalPlayerID()], percent );	
+	//GadgetProgressBarSetProgress(m_progressBars[TheNetwork->getLocalPlayerID()], percent );
 
 	TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
 
@@ -1893,24 +1843,22 @@ void GameSpyLoadScreen::update( Int percent )
 
 void GameSpyLoadScreen::processProgress(Int playerId, Int percentage)
 {
-	
+
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
-		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));
+		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d", percentage, playerId));
+		return;
 	}
-	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)\n", percentage, playerId, m_playerLookup[playerId]));
+	//DEBUG_LOG(("Percentage %d was passed in for Player %d (in loadscreen position %d)", percentage, playerId, m_playerLookup[playerId]));
 	if(m_progressBars[m_playerLookup[playerId]])
-		GadgetProgressBarSetProgress(m_progressBars[m_playerLookup[playerId]], percentage );	
+		GadgetProgressBarSetProgress(m_progressBars[m_playerLookup[playerId]], percentage );
 }
 
 // MapTransferLoadScreen Class //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 MapTransferLoadScreen::MapTransferLoadScreen( void )
 {
-	//Added By Sadullah Nader
-	//Initializations missing and needed
 	m_oldTimeout = 0;
-	//
 	for(Int i = 0; i < MAX_SLOTS; ++i)
 	{
 		m_progressBars[i] = NULL;
@@ -1922,7 +1870,7 @@ MapTransferLoadScreen::MapTransferLoadScreen( void )
 	m_fileNameText = NULL;
 	m_timeoutText = NULL;
 }
-	
+
 MapTransferLoadScreen::~MapTransferLoadScreen( void )
 {
 	for(Int i = 0; i < MAX_SLOTS; ++i)
@@ -1940,7 +1888,7 @@ MapTransferLoadScreen::~MapTransferLoadScreen( void )
 void MapTransferLoadScreen::init( GameInfo *game )
 {
 	// create the layout of the load screen
-	m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/MapTransferScreen.wnd" ) );
+	m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/MapTransferScreen.wnd" );
 	DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the map transfer loadscreen"));
 	if (!m_loadScreen)
 		return;
@@ -1949,19 +1897,17 @@ void MapTransferLoadScreen::init( GameInfo *game )
 	m_loadScreen->winBringToTop();
 
 	DEBUG_ASSERTCRASH(TheNetwork, ("Where the Heck is the Network?!!!!"));
-	DEBUG_LOG(("NumPlayers %d\n", TheNetwork->getNumPlayers()));
+	DEBUG_LOG(("NumPlayers %d", TheNetwork->getNumPlayers()));
 
 	AsciiString winName;
 	Int i;
 
 	// Load the Filename Text
-	winName.format( "MapTransferScreen.wnd:StaticTextCurrentFile");
-	m_fileNameText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
+	m_fileNameText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "MapTransferScreen.wnd:StaticTextCurrentFile" ));
 	DEBUG_ASSERTCRASH(m_fileNameText, ("Can't initialize the filename for the map transfer loadscreen"));
 
 	// Load the Timeout Text
-	winName.format( "MapTransferScreen.wnd:StaticTextTimeout");
-	m_timeoutText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( winName ));
+	m_timeoutText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "MapTransferScreen.wnd:StaticTextTimeout" ));
 	DEBUG_ASSERTCRASH(m_timeoutText, ("Can't initialize the timeout for the map transfer loadscreen"));
 
 	Int netSlot = 0;
@@ -2006,7 +1952,7 @@ void MapTransferLoadScreen::init( GameInfo *game )
 
 		netSlot++;
 	}
-	
+
 	for(i = netSlot; i < MAX_SLOTS; ++i)
 	{
 		m_progressBars[i]->winHide(TRUE);
@@ -2045,10 +1991,11 @@ void MapTransferLoadScreen::update( Int percent )
 
 void MapTransferLoadScreen::processProgress(Int playerId, Int percentage, AsciiString stateStr)
 {
-	
+
 	if( percentage < 0 || percentage > 100 || playerId >= MAX_SLOTS || playerId < 0 || m_playerLookup[playerId] == -1)
 	{
-		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d\n", percentage, playerId));
+		DEBUG_ASSERTCRASH(FALSE, ("Percentage %d was passed in for Player %d", percentage, playerId));
+		return;
 	}
 
 	if (m_oldProgress[playerId] == percentage)
@@ -2057,7 +2004,7 @@ void MapTransferLoadScreen::processProgress(Int playerId, Int percentage, AsciiS
 
 	Int translatedSlot = m_playerLookup[playerId];
 	if(m_progressBars[translatedSlot])
-		GadgetProgressBarSetProgress(m_progressBars[translatedSlot], percentage );	
+		GadgetProgressBarSetProgress(m_progressBars[translatedSlot], percentage );
 	if (m_progressText[translatedSlot])
 		GadgetStaticTextSetText(m_progressText[translatedSlot], TheGameText->fetch(stateStr));
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ProcessAnimateWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ProcessAnimateWindow.cpp
index fd79473f45e..7cc73e923f8 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ProcessAnimateWindow.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ProcessAnimateWindow.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ProcessAnimateWindow.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Mar 2002
@@ -37,7 +37,7 @@
 //	Filename: 	ProcessAnimateWindow.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Holds all the process modules for the Animate Window Class
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/ProcessAnimateWindow.h"
 #include "GameClient/AnimateWindowManager.h"
@@ -81,7 +81,7 @@ ProcessAnimateWindowSlideFromRight::ProcessAnimateWindowSlideFromRight( void )
 																			// positions they start to slow down
 	m_slowDownRatio = 0.67f;  // how fast the windows slow down (smaller slows quicker)
 	m_speedUpRatio = 2.0f - m_slowDownRatio;  // how fast the windows speed up
-	
+
 }
 
 //-----------------------------------------------------------------------------
@@ -100,7 +100,7 @@ void ProcessAnimateWindowSlideFromRight::initReverseAnimateWindow( wnd::AnimateW
 	Coord2D vel = animWin->getVel();
 	vel.x *= -1;
 	vel.y *= -1;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 	animWin->setFinished( FALSE );
 
 }
@@ -113,7 +113,7 @@ void ProcessAnimateWindowSlideFromRight::initAnimateWindow( wnd::AnimateWindow *
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -153,7 +153,7 @@ void ProcessAnimateWindowSlideFromRight::initAnimateWindow( wnd::AnimateWindow *
 //-----------------------------------------------------------------------------
 Bool ProcessAnimateWindowSlideFromRight::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -201,7 +201,7 @@ Bool ProcessAnimateWindowSlideFromRight::updateAnimateWindow( wnd::AnimateWindow
 
 Bool ProcessAnimateWindowSlideFromRight::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -267,7 +267,7 @@ ProcessAnimateWindowSlideFromLeft::ProcessAnimateWindowSlideFromLeft( void )
 																			// positions they start to slow down
 	m_slowDownRatio = 0.67f;  // how fast the windows slow down (smaller slows quicker)
 	m_speedUpRatio = 2.0f - m_slowDownRatio;  // how fast the windows speed up
-	
+
 }
 
 ProcessAnimateWindowSlideFromLeft::~ProcessAnimateWindowSlideFromLeft( void ) { }
@@ -284,7 +284,7 @@ void ProcessAnimateWindowSlideFromLeft::initReverseAnimateWindow( wnd::AnimateWi
 	Coord2D vel = animWin->getVel();
 	vel.x *= -1;
 	vel.y *= -1;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 
 }
 
@@ -295,13 +295,13 @@ void ProcessAnimateWindowSlideFromLeft::initAnimateWindow( wnd::AnimateWindow *a
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -330,7 +330,7 @@ void ProcessAnimateWindowSlideFromLeft::initAnimateWindow( wnd::AnimateWindow *a
 
 Bool ProcessAnimateWindowSlideFromLeft::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -340,7 +340,7 @@ Bool ProcessAnimateWindowSlideFromLeft::updateAnimateWindow( wnd::AnimateWindow
 	// if the window has finished animating into position, return
 	if(animWin->isFinished())
 		return TRUE;
-	
+
 	// if the window hasn't started animating...return that we're not finished
 	if(timeGetTime() < animWin->getStartTime())
 		return FALSE;
@@ -379,7 +379,7 @@ Bool ProcessAnimateWindowSlideFromLeft::updateAnimateWindow( wnd::AnimateWindow
 
 Bool ProcessAnimateWindowSlideFromLeft::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -445,7 +445,7 @@ ProcessAnimateWindowSlideFromTop::ProcessAnimateWindowSlideFromTop( void )
 																			// positions they start to slow down
 	m_slowDownRatio = 0.67f;  // how fast the windows slow down (smaller slows quicker)
 	m_speedUpRatio = 2.0f - m_slowDownRatio;  // how fast the windows speed up
-	
+
 }
 
 ProcessAnimateWindowSlideFromTop::~ProcessAnimateWindowSlideFromTop( void ) { }
@@ -462,7 +462,7 @@ void ProcessAnimateWindowSlideFromTop::initReverseAnimateWindow( wnd::AnimateWin
 	Coord2D vel = animWin->getVel();
 	vel.x *= -1;
 	vel.y *= -1;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 
 }
 
@@ -473,13 +473,13 @@ void ProcessAnimateWindowSlideFromTop::initAnimateWindow( wnd::AnimateWindow *an
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -508,7 +508,7 @@ void ProcessAnimateWindowSlideFromTop::initAnimateWindow( wnd::AnimateWindow *an
 
 Bool ProcessAnimateWindowSlideFromTop::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -518,7 +518,7 @@ Bool ProcessAnimateWindowSlideFromTop::updateAnimateWindow( wnd::AnimateWindow *
 	// if the window has finished animating into position, return
 	if(animWin->isFinished())
 		return TRUE;
-	
+
 	// if the window hasn't started animating...return that we're not finished
 	if(timeGetTime() < animWin->getStartTime())
 		return FALSE;
@@ -558,7 +558,7 @@ Bool ProcessAnimateWindowSlideFromTop::updateAnimateWindow( wnd::AnimateWindow *
 
 Bool ProcessAnimateWindowSlideFromTop::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -624,7 +624,7 @@ ProcessAnimateWindowSlideFromBottom::ProcessAnimateWindowSlideFromBottom( void )
 																			// positions they start to slow down
 	m_slowDownRatio = 0.67f;  // how fast the windows slow down (smaller slows quicker)
 	m_speedUpRatio = 2.0f - m_slowDownRatio;  // how fast the windows speed up
-	
+
 }
 
 ProcessAnimateWindowSlideFromBottom::~ProcessAnimateWindowSlideFromBottom( void ) { }
@@ -641,7 +641,7 @@ void ProcessAnimateWindowSlideFromBottom::initReverseAnimateWindow( wnd::Animate
 	Coord2D vel = animWin->getVel();
 	vel.x *= -1;
 	vel.y *= -1;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 
 }
 
@@ -653,13 +653,13 @@ void ProcessAnimateWindowSlideFromBottom::initAnimateWindow( wnd::AnimateWindow
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -688,7 +688,7 @@ void ProcessAnimateWindowSlideFromBottom::initAnimateWindow( wnd::AnimateWindow
 
 Bool ProcessAnimateWindowSlideFromBottom::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -738,7 +738,7 @@ Bool ProcessAnimateWindowSlideFromBottom::updateAnimateWindow( wnd::AnimateWindo
 
 Bool ProcessAnimateWindowSlideFromBottom::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -811,13 +811,13 @@ void ProcessAnimateWindowSlideFromBottomTimed::initReverseAnimateWindow( wnd::An
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -840,7 +840,7 @@ void ProcessAnimateWindowSlideFromBottomTimed::initReverseAnimateWindow( wnd::An
 
 	UnsignedInt now = timeGetTime();
 
-	DEBUG_LOG(("initReverseAnimateWindow at %d (%d->%d)\n", now, now, now + m_maxDuration));
+	DEBUG_LOG(("initReverseAnimateWindow at %d (%d->%d)", now, now, now + m_maxDuration));
 	animWin->setAnimData(startPos, endPos, curPos, restPos, vel, now, now + m_maxDuration);
 }
 
@@ -852,13 +852,13 @@ void ProcessAnimateWindowSlideFromBottomTimed::initAnimateWindow( wnd::AnimateWi
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -882,13 +882,13 @@ void ProcessAnimateWindowSlideFromBottomTimed::initAnimateWindow( wnd::AnimateWi
 	UnsignedInt now = timeGetTime();
 	UnsignedInt delay = animWin->getDelay();
 
-	DEBUG_LOG(("initAnimateWindow at %d (%d->%d)\n", now, now + delay, now + m_maxDuration + delay));
+	DEBUG_LOG(("initAnimateWindow at %d (%d->%d)", now, now + delay, now + m_maxDuration + delay));
 	animWin->setAnimData(startPos, endPos, curPos, restPos, vel, now + delay, now + m_maxDuration + delay);
 }
 
 Bool ProcessAnimateWindowSlideFromBottomTimed::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -929,12 +929,12 @@ Bool ProcessAnimateWindowSlideFromBottomTimed::updateAnimateWindow( wnd::Animate
 		curPos.y = endPos.y;
 		animWin->setFinished( TRUE );
 		win->winSetPosition(curPos.x, curPos.y);
-		DEBUG_LOG(("window finished animating at %d (%d->%d)\n", now, startTime, endTime));
+		DEBUG_LOG(("window finished animating at %d (%d->%d)", now, startTime, endTime));
 		return TRUE;
 	}
 
 	curPos.y = startPos.y + percentDone*(endPos.y - startPos.y);
-	DEBUG_LOG(("(%d,%d) -> (%d,%d) -> (%d,%d) at %g\n",
+	DEBUG_LOG(("(%d,%d) -> (%d,%d) -> (%d,%d) at %g",
 		startPos.x, startPos.y, curPos.x, curPos.y, endPos.x, endPos.y, percentDone));
 
 	win->winSetPosition(curPos.x, curPos.y);
@@ -955,7 +955,7 @@ Bool ProcessAnimateWindowSlideFromBottomTimed::reverseAnimateWindow( wnd::Animat
 ProcessAnimateWindowSpiral::ProcessAnimateWindowSpiral( void )
 {
 	m_maxR = TheDisplay->getWidth() / 2;
-	m_deltaTheta = .33f;	
+	m_deltaTheta = .33f;
 }
 
 //-----------------------------------------------------------------------------
@@ -974,7 +974,7 @@ void ProcessAnimateWindowSpiral::initReverseAnimateWindow( wnd::AnimateWindow *a
 	Coord2D vel = animWin->getVel();
 	vel.x = 0;
 	vel.y = 0;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 
 }
 
@@ -987,13 +987,13 @@ void ProcessAnimateWindowSpiral::initAnimateWindow( wnd::AnimateWindow *animWin
 	ICoord2D endPos = {0,0};
 	ICoord2D size = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -1022,7 +1022,7 @@ void ProcessAnimateWindowSpiral::initAnimateWindow( wnd::AnimateWindow *animWin
 //-----------------------------------------------------------------------------
 Bool ProcessAnimateWindowSpiral::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -1049,13 +1049,13 @@ Bool ProcessAnimateWindowSpiral::updateAnimateWindow( wnd::AnimateWindow *animWi
 	ICoord2D curPos = animWin->getCurPos();
 	ICoord2D endPos = animWin->getEndPos();
 	Coord2D vel = animWin->getVel();
-	
-	curPos.x = (vel.y * cos(vel.x)) + endPos.x; 
+
+	curPos.x = (vel.y * cos(vel.x)) + endPos.x;
 	curPos.y = (vel.y * sin(vel.x)) + endPos.y;
 
 	vel.x = vel.x + m_deltaTheta;
 	vel.y -=5;
-	
+
 	ICoord2D size;
 	win->winGetSize(&size.x, &size.y);
 	Int m_max = min(size.x/2, size.y/2);
@@ -1076,7 +1076,7 @@ Bool ProcessAnimateWindowSpiral::updateAnimateWindow( wnd::AnimateWindow *animWi
 //-----------------------------------------------------------------------------
 Bool ProcessAnimateWindowSpiral::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -1101,13 +1101,13 @@ Bool ProcessAnimateWindowSpiral::reverseAnimateWindow( wnd::AnimateWindow *animW
 	ICoord2D curPos = animWin->getCurPos();
 	ICoord2D endPos = animWin->getEndPos();
 	Coord2D vel = animWin->getVel();
-	
-	curPos.x = (vel.y * cos(vel.x)) + endPos.x; 
+
+	curPos.x = (vel.y * cos(vel.x)) + endPos.x;
 	curPos.y = (vel.y * sin(vel.x)) + endPos.y;
 
 	vel.x = vel.x - m_deltaTheta;
 	vel.y +=5;
-	
+
 	ICoord2D size;
 	win->winGetSize(&size.x, &size.y);
 //	Int m_max = min(size.x/2, size.y/2);
@@ -1138,7 +1138,7 @@ ProcessAnimateWindowSlideFromTopFast::ProcessAnimateWindowSlideFromTopFast( void
 																			// positions they start to slow down
 	m_slowDownRatio = 0.67f;  // how fast the windows slow down (smaller slows quicker)
 	m_speedUpRatio = 4.0f - m_slowDownRatio;  // how fast the windows speed up
-	
+
 }
 
 ProcessAnimateWindowSlideFromTopFast::~ProcessAnimateWindowSlideFromTopFast( void ) { }
@@ -1155,7 +1155,7 @@ void ProcessAnimateWindowSlideFromTopFast::initReverseAnimateWindow( wnd::Animat
 	Coord2D vel = animWin->getVel();
 	vel.x *= -1;
 	vel.y *= -1;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 
 }
 
@@ -1167,13 +1167,13 @@ void ProcessAnimateWindowSlideFromTopFast::initAnimateWindow( wnd::AnimateWindow
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
 	ICoord2D size = {0,0};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
 		return;
 	}
-	
+
 	// it's set that the window is passed in as it's current position being it's rest position
 	// so save off the rest position
 	GameWindow *win = animWin->getGameWindow();
@@ -1185,7 +1185,7 @@ void ProcessAnimateWindowSlideFromTopFast::initAnimateWindow( wnd::AnimateWindow
 	win->winGetPosition(&restPos.x, &restPos.y);
 	endPos.x = restPos.x;
 	endPos.y = restPos.y;
-	
+
 	win->winGetSize(&size.x, &size.y);
 
 	//set the initial positions for the window. In this case, off the Top of the screen
@@ -1204,7 +1204,7 @@ void ProcessAnimateWindowSlideFromTopFast::initAnimateWindow( wnd::AnimateWindow
 
 Bool ProcessAnimateWindowSlideFromTopFast::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -1214,7 +1214,7 @@ Bool ProcessAnimateWindowSlideFromTopFast::updateAnimateWindow( wnd::AnimateWind
 	// if the window has finished animating into position, return
 	if(animWin->isFinished())
 		return TRUE;
-	
+
 	// if the window hasn't started animating...return that we're not finished
 	if(timeGetTime() < animWin->getStartTime())
 		return FALSE;
@@ -1254,7 +1254,7 @@ Bool ProcessAnimateWindowSlideFromTopFast::updateAnimateWindow( wnd::AnimateWind
 
 Bool ProcessAnimateWindowSlideFromTopFast::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -1321,7 +1321,7 @@ ProcessAnimateWindowSlideFromRightFast::ProcessAnimateWindowSlideFromRightFast(
 																			// positions they start to slow down
 	m_slowDownRatio = 0.77f;  // how fast the windows slow down (smaller slows quicker)
 	m_speedUpRatio = 3.0f - m_slowDownRatio;  // how fast the windows speed up
-	
+
 }
 
 //-----------------------------------------------------------------------------
@@ -1340,7 +1340,7 @@ void ProcessAnimateWindowSlideFromRightFast::initReverseAnimateWindow( wnd::Anim
 	Coord2D vel = animWin->getVel();
 	vel.x *= -1;
 	vel.y *= -1;
-	animWin->setVel( vel );	
+	animWin->setVel( vel );
 	animWin->setFinished( FALSE );
 	GameWindow * win = animWin->getGameWindow();
 	ICoord2D pos, tempPos;
@@ -1371,7 +1371,7 @@ void ProcessAnimateWindowSlideFromRightFast::initAnimateWindow( wnd::AnimateWind
 	ICoord2D curPos = {0,0};
 	ICoord2D endPos = {0,0};
 	Coord2D	vel = {0.0f,0.0f};
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into initAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -1412,7 +1412,7 @@ void ProcessAnimateWindowSlideFromRightFast::initAnimateWindow( wnd::AnimateWind
 //-----------------------------------------------------------------------------
 Bool ProcessAnimateWindowSlideFromRightFast::updateAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
@@ -1460,7 +1460,7 @@ Bool ProcessAnimateWindowSlideFromRightFast::updateAnimateWindow( wnd::AnimateWi
 
 Bool ProcessAnimateWindowSlideFromRightFast::reverseAnimateWindow( wnd::AnimateWindow *animWin )
 {
-	
+
 	if(!animWin)
 	{
 		DEBUG_ASSERTCRASH( animWin, ("animWin was passed into updateAnimateWindow as a NULL Pointer... bad bad bad!"));
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
index ad8954ae150..319c5cc475b 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "GameClient/Shell.h"
@@ -47,16 +47,26 @@
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 Shell *TheShell = NULL;  ///< the shell singleton definition
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Shell::Shell( void )
+{
+	construct();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+Shell::~Shell( void )
+{
+	deconstruct();
+
+}
+
+//-------------------------------------------------------------------------------------------------
+void Shell::construct( void )
 {
 	Int i;
 
@@ -75,17 +85,12 @@ Shell::Shell( void )
 	m_schemeManager = NEW ShellMenuSchemeManager;
 	m_saveLoadMenuLayout = NULL;
 	m_popupReplayLayout = NULL;
-	//Added By Sadullah Nader
-	//Initializations
 	m_optionsLayout = NULL;
 	m_screenCount = 0;
-	//
-
-}  // end Shell
+}
 
 //-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-Shell::~Shell( void )
+void Shell::deconstruct( void )
 {
 	WindowLayout *newTop = top();
 	while(newTop)
@@ -101,12 +106,10 @@ Shell::~Shell( void )
 		m_background = NULL;
 	}
 
-	if(m_animateWindowManager)
-		delete m_animateWindowManager;
+	delete m_animateWindowManager;
 	m_animateWindowManager = NULL;
 
-	if(m_schemeManager)
-		delete m_schemeManager;
+	delete m_schemeManager;
 	m_schemeManager = NULL;
 
 	// delete the save/load menu if present
@@ -117,7 +120,7 @@ Shell::~Shell( void )
 		deleteInstance(m_saveLoadMenuLayout);
 		m_saveLoadMenuLayout = NULL;
 
-	}  //end if
+	}
 
 	// delete the replay save menu if present
 	if( m_popupReplayLayout )
@@ -127,7 +130,7 @@ Shell::~Shell( void )
 		deleteInstance(m_popupReplayLayout);
 		m_popupReplayLayout = NULL;
 
-	}  //end if
+	}
 
 	// delete the options menu if present.
 	if (m_optionsLayout != NULL) {
@@ -135,8 +138,7 @@ Shell::~Shell( void )
 		deleteInstance(m_optionsLayout);
 		m_optionsLayout = NULL;
 	}
-
-}  // end ~Shell
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the shell system */
@@ -145,13 +147,13 @@ void Shell::init( void )
 {
 	INI ini;
 	// Read from INI all the ShellMenuScheme
-	ini.load( AsciiString( "Data\\INI\\Default\\ShellMenuScheme.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\ShellMenuScheme.ini" ), INI_LOAD_OVERWRITE, NULL );
-	
+	ini.loadFileDirectory( "Data\\INI\\Default\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL );
+
 	if( m_schemeManager )
 		m_schemeManager->init();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the shell system to a clean state just as though init had
@@ -159,17 +161,17 @@ void Shell::init( void )
 //-------------------------------------------------------------------------------------------------
 void Shell::reset( void )
 {
-	
+
 	if (TheIMEManager)
 		TheIMEManager->detatch();
 
 	// pop all screens
 	while( m_screenCount )
-		pop();
+		popImmediate();
 
 	m_animateWindowManager->reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update shell system cycle.  All windows are updated that are on the stack, starting
@@ -180,7 +182,7 @@ void Shell::update( void )
 	static Int lastUpdate = timeGetTime();
 	static const Int shellUpdateDelay = 30;  // try to update 30 frames a second
 	Int now = timeGetTime();
-	
+
 	//
 	// we keep the shell updates fixed in time so that we can write consitent animation
 	// speeds during the screen update functions
@@ -192,19 +194,19 @@ void Shell::update( void )
 		for( Int i = m_screenCount - 1; i >= 0; i-- )
 		{
 
-			DEBUG_ASSERTCRASH( m_screenStack[ i ], ("Top of shell stack is NULL!\n") );
+			DEBUG_ASSERTCRASH( m_screenStack[ i ], ("Top of shell stack is NULL!") );
 			m_screenStack[ i ]->runUpdate( NULL );
 
-		}  // end for i
+		}
 		if(TheGlobalData->m_shellMapOn && m_shellMapOn &&m_background)
 		{
-			
+
 			m_background->destroyWindows();
 			deleteInstance(m_background);
 			m_background = NULL;
-			
+
 		}
-		
+
 		// Update the animate window manager
 		m_animateWindowManager->update();
 
@@ -213,9 +215,56 @@ void Shell::update( void )
 		// mark last time we ran the updates
 		lastUpdate = now;
 
-	}  // end if
+	}
+
+}
 
-}  // end update
+//-------------------------------------------------------------------------------------------------
+namespace
+{
+	struct ScreenInfo
+	{
+		ScreenInfo() : isHidden(false) {}
+		AsciiString filename;
+		bool isHidden;
+	};
+}
+
+//-------------------------------------------------------------------------------------------------
+void Shell::recreateWindowLayouts( void )
+{
+		// collect state of the current shell
+	const Int screenCount = getScreenCount();
+	std::vector<ScreenInfo> screenStackInfos;
+
+	{
+		screenStackInfos.resize(screenCount);
+		Int screenIndex = 0;
+		for (; screenIndex < screenCount; ++screenIndex)
+		{
+			const WindowLayout* layout = getScreenLayout(screenIndex);
+			ScreenInfo& screenInfo = screenStackInfos[screenIndex];
+			screenInfo.filename = layout->getFilename();
+			screenInfo.isHidden = layout->isHidden();
+		}
+	}
+
+	// reconstruct the shell now
+	deconstruct();
+	construct();
+	init();
+
+	// restore the screen stack
+	Int screenIndex = 0;
+	for (; screenIndex < screenCount; ++screenIndex)
+	{
+		const ScreenInfo& screenInfo = screenStackInfos[screenIndex];
+		push(screenInfo.filename);
+
+		WindowLayout* layout = getScreenLayout(screenIndex);
+		layout->hide(screenInfo.isHidden);
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Find a screen via the .wnd script filename loaded */
@@ -236,11 +285,20 @@ WindowLayout *Shell::findScreenByFilename( AsciiString filename )
 		if( screen && filename.compareNoCase(screen->getFilename()) == 0 )
 			return screen;
 
-	}  // end for i
+	}
 
 	return NULL;
 
-}  // end findScreenByFilename
+}
+
+//-------------------------------------------------------------------------------------------------
+WindowLayout *Shell::getScreenLayout( Int index ) const
+{
+	if (index >= 0 && index < m_screenCount)
+		return m_screenStack[index];
+
+	return NULL;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Hide or unhide all window layouts loaded */
@@ -256,7 +314,7 @@ void Shell::hide( Bool hide )
 	if (TheIMEManager)
 		TheIMEManager->detatch();
 
-}  // end hide
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Push layout onto shell */
@@ -272,22 +330,22 @@ void Shell::push( AsciiString filename, Bool shutdownImmediate )
 
 
 #ifdef DEBUG_LOGGING
-	DEBUG_LOG(("Shell:push(%s) - stack was\n", filename.str()));
+	DEBUG_LOG(("Shell:push(%s) - stack was", filename.str()));
 	for (Int i=0; i<m_screenCount; ++i)
 	{
-		DEBUG_LOG(("\t\t%s\n", m_screenStack[i]->getFilename().str()));
+		DEBUG_LOG(("\t\t%s", m_screenStack[i]->getFilename().str()));
 	}
 #endif
 
 	// make sure we have an available spot for another screen
 	if( m_screenCount >= MAX_SHELL_STACK )
 	{
-	
-		DEBUG_LOG(( "Unable to load screen '%s', max '%d' reached\n",
-								filename, MAX_SHELL_STACK ));
+
+		DEBUG_LOG(( "Unable to load screen '%s', max '%d' reached",
+								filename.str(), MAX_SHELL_STACK ));
 		return;
 
-	}  // end if
+	}
 
 	// set a push as pending with the layout name passed in
 	m_pendingPush = TRUE;
@@ -308,19 +366,19 @@ void Shell::push( AsciiString filename, Bool shutdownImmediate )
 		// run the shutdown
 		currentTop->runShutdown( &shutdownImmediate );
 
-	}  // end if
+	}
 	else
 	{
 
 		// just call shutdownComplete() which will immediately cause the push to happen
 		shutdownComplete( NULL );
 
-	}  // end else
+	}
 
 //	if (TheIMEManager)
 //		TheIMEManager->detatch();
 
-}  // end push
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Pop top layout of the stack.  Note that we don't actually do the pop right here,
@@ -339,10 +397,10 @@ void Shell::pop( void )
 		return;
 
 #ifdef DEBUG_LOGGING
-	DEBUG_LOG(("Shell:pop() - stack was\n"));
+	DEBUG_LOG(("Shell:pop() - stack was"));
 	for (Int i=0; i<m_screenCount; ++i)
 	{
-		DEBUG_LOG(("\t\t%s\n", m_screenStack[i]->getFilename().str()));
+		DEBUG_LOG(("\t\t%s", m_screenStack[i]->getFilename().str()));
 	}
 #endif
 
@@ -360,7 +418,7 @@ void Shell::pop( void )
 	if (TheIMEManager)
 		TheIMEManager->detatch();
 
-}  // end pop
+}
 
 //-------------------------------------------------------------------------------------------------
 /** When you need to immediately pop a screen off the stack use this method.  It
@@ -378,10 +436,10 @@ void Shell::popImmediate( void )
 		return;
 
 #ifdef DEBUG_LOGGING
-	DEBUG_LOG(("Shell:popImmediate() - stack was\n"));
+	DEBUG_LOG(("Shell:popImmediate() - stack was"));
 	for (Int i=0; i<m_screenCount; ++i)
 	{
-		DEBUG_LOG(("\t\t%s\n", m_screenStack[i]->getFilename().str()));
+		DEBUG_LOG(("\t\t%s", m_screenStack[i]->getFilename().str()));
 	}
 #endif
 
@@ -398,7 +456,7 @@ void Shell::popImmediate( void )
 	if (TheIMEManager)
 		TheIMEManager->detatch();
 
-}  // end popImmediate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Run the initialize function for the top of the stack just as though it was pushed
@@ -408,14 +466,14 @@ void Shell::popImmediate( void )
 //-------------------------------------------------------------------------------------------------
 void Shell::showShell( Bool runInit )
 {
-	DEBUG_LOG(("Shell:showShell() - %s (%s)\n", TheGlobalData->m_initialFile.str(), (top())?top()->getFilename().str():"no top screen"));
+	DEBUG_LOG(("Shell:showShell() - %s (%s)", TheGlobalData->m_initialFile.str(), (top())?top()->getFilename().str():"no top screen"));
 
-	if(!TheGlobalData->m_initialFile.isEmpty())
+	if(!TheGlobalData->m_initialFile.isEmpty() || !TheGlobalData->m_simulateReplays.empty())
 	{
 		return;
 	}
-	
-	// runInit is used if we want show shell to run 
+
+	// runInit is used if we want show shell to run
 	if(runInit)
 	{
 		WindowLayout *layout = top();
@@ -447,16 +505,16 @@ void Shell::showShell( Bool runInit )
 	//	}
 	//	else
 	//	{
-	//		
+	//
 	//		m_background = TheWindowManager->winCreateLayout("Menus/BlankWindow.wnd");
-	//		
+	//
 	//		DEBUG_ASSERTCRASH(m_background,("We Couldn't Load Menus/BlankWindow.wnd"));
 	//		m_background->hide(FALSE);
 	//		if (top())
 	//			top()->bringForward();
-	//		
+	//
 	//	}
-	
+
 
 	if (!TheGlobalData->m_shellMapOn && m_screenCount == 0)
   {
@@ -464,15 +522,15 @@ void Shell::showShell( Bool runInit )
     Profile::StopRange("init");
 #endif
 	//else
-		TheShell->push( AsciiString("Menus/MainMenu.wnd") );
+		push( "Menus/MainMenu.wnd" );
   }
 	m_isShellActive = TRUE;
-}  // end showShell
+}
 
 void Shell::showShellMap(Bool useShellMap )
 {
 	// we don't want any of this to show if we're loading straight into a file
-	if(TheGlobalData->m_initialFile.isNotEmpty() || !TheGameLogic )
+	if (TheGlobalData->m_initialFile.isNotEmpty() || !TheGameLogic || !TheGlobalData->m_simulateReplays.empty())
 		return;
 	if(useShellMap && TheGlobalData->m_shellMapOn)
 	{
@@ -481,7 +539,7 @@ void Shell::showShellMap(Bool useShellMap )
 			return;
 		// we're in some other kind of game, clear it out foo!
 		if(TheGameLogic->isInGame())
-			TheMessageStream->appendMessage( GameMessage::MSG_CLEAR_GAME_DATA );
+			TheGameLogic->exitGame();
 
 		TheWritableGlobalData->m_pendingFile = TheGlobalData->m_shellMapName;
 		InitGameLogicRandom(0);
@@ -493,14 +551,14 @@ void Shell::showShellMap(Bool useShellMap )
 	{
 		// we're in a shell game, stop it!
 		if(TheGameLogic->isInGame() && TheGameLogic->getGameMode() == GAME_SHELL)
-			TheMessageStream->appendMessage( GameMessage::MSG_CLEAR_GAME_DATA );
+			TheGameLogic->exitGame();
 
 		// if the shell is active,we need a background
 		if(!m_isShellActive)
 			return;
 		if(!m_background)
 			m_background = TheWindowManager->winCreateLayout("Menus/BlankWindow.wnd");
-		
+
 		DEBUG_ASSERTCRASH(m_background,("We Couldn't Load Menus/BlankWindow.wnd"));
 		m_background->getFirstWindow()->winSetStatus(WIN_STATUS_IMAGE);
 		m_background->hide(FALSE);
@@ -522,7 +580,7 @@ void Shell::hideShell( void )
 	// If we have the 3d background running, mark it to close
 	m_clearBackground = TRUE;
 
-	DEBUG_LOG(("Shell:hideShell() - %s\n", (top())?top()->getFilename().str():"no top screen"));
+	DEBUG_LOG(("Shell:hideShell() - %s", (top())?top()->getFilename().str():"no top screen"));
 
 	WindowLayout *layout = top();
 
@@ -532,7 +590,7 @@ void Shell::hideShell( void )
 
 		layout->runShutdown( &immediatePop );
 
-	}  // end if
+	}
 
 	if (TheIMEManager)
 		TheIMEManager->detatch();
@@ -540,7 +598,7 @@ void Shell::hideShell( void )
 	// Mark that the shell is no longer up.
 	m_isShellActive = FALSE;
 
-}  // end hideShell
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return the top layout on the stack */
@@ -555,7 +613,7 @@ WindowLayout *Shell::top( void )
 	// top layout is at count index
 	return m_screenStack[ m_screenCount - 1 ];
 
-}  // end top
+}
 
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
@@ -572,34 +630,34 @@ void Shell::linkScreen( WindowLayout *screen )
 	if( m_screenCount == MAX_SHELL_STACK )
 	{
 
-		DEBUG_CRASH(( "No room in shell stack for screen\n" ));
+		DEBUG_CRASH(( "No room in shell stack for screen" ));
 		return;
 
-	}  // end if
+	}
 
 	// add to array at top index
 	m_screenStack[ m_screenCount++ ] = screen;
 
-}  // end linkScreen
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove screen from our list */
 //-------------------------------------------------------------------------------------------------
 void Shell::unlinkScreen( WindowLayout *screen )
 {
-	
+
 	// sanity
 	if( screen == NULL )
 		return;
 
-	DEBUG_ASSERTCRASH( m_screenStack[ m_screenCount - 1 ] == screen, 
-										 ("Screen not on top of stack\n") );
+	DEBUG_ASSERTCRASH( m_screenStack[ m_screenCount - 1 ] == screen,
+										 ("Screen not on top of stack") );
 
 	// remove reference to screen and decrease count
 	if( m_screenStack[ m_screenCount - 1 ] == screen )
 		m_screenStack[ --m_screenCount ] = NULL;
 
-}  // end unlinkScreen
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Actually do the work for a push */
@@ -609,10 +667,10 @@ void Shell::doPush( AsciiString layoutFile )
 	if(TheGameSpyInfo)
 			GameSpyCloseAllOverlays();
 	WindowLayout *newScreen;
-	
+
 	// create new layout and load from window manager
 	newScreen = TheWindowManager->winCreateLayout( layoutFile );
-	DEBUG_ASSERTCRASH( newScreen != NULL, ("Shell unable to load pending push layout\n") );
+	DEBUG_ASSERTCRASH( newScreen != NULL, ("Shell unable to load pending push layout") );
 
 	// link screen to the top
 	linkScreen( newScreen );
@@ -625,7 +683,7 @@ void Shell::doPush( AsciiString layoutFile )
 	newScreen->bringForward();
 
 
-}  // end doPush
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Actually do the work for a pop */
@@ -635,7 +693,7 @@ void Shell::doPop( Bool impendingPush )
 	WindowLayout *currentTop = top();
 
 	// there better be a top of the stack since we're popping
-	DEBUG_ASSERTCRASH( currentTop, ("Shell: No top of stack and we want to pop!\n") );
+	DEBUG_ASSERTCRASH( currentTop, ("Shell: No top of stack and we want to pop!") );
 
 	if (currentTop)
 	{
@@ -660,7 +718,7 @@ void Shell::doPop( Bool impendingPush )
 	if (TheIMEManager)
 		TheIMEManager->detatch();
 
-}  // end doPop
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This is called when a layout has finished its shutdown process.  Layouts are
@@ -677,7 +735,7 @@ void Shell::shutdownComplete( WindowLayout *screen, Bool impendingPush )
 
 	// there should never be a pending push AND pop operation
 	DEBUG_ASSERTCRASH( m_pendingPush == FALSE || m_pendingPop == FALSE,
-										 ("There is a pending push AND pop in the shell.  Not allowed!\n") );	
+										 ("There is a pending push AND pop in the shell.  Not allowed!") );
 
 	// Reset the AnimateWindowManager
 	m_animateWindowManager->reset();
@@ -693,18 +751,18 @@ void Shell::shutdownComplete( WindowLayout *screen, Bool impendingPush )
 		m_pendingPush = FALSE;
 		m_pendingPushName.set( "" );
 
-	}  // end if
+	}
 	else if( m_pendingPop )
 	{
 
 		// do the pop
 		doPop( impendingPush );
-				
+
 		// no more pending pop for you!
 		m_pendingPop = FALSE;
 
-	}  // end else if
-	
+	}
+
 	if(m_clearBackground)
 	{
 		if(m_background)
@@ -714,10 +772,10 @@ void Shell::shutdownComplete( WindowLayout *screen, Bool impendingPush )
 			m_background = NULL;
 			m_clearBackground = FALSE;
 		}
-			
+
 	}
 
-}  // end shutdownComplete
+}
 
 
 void Shell::registerWithAnimateManager( GameWindow *win, AnimTypes animType, Bool needsToFinish, UnsignedInt delayMS)
@@ -785,35 +843,35 @@ void Shell::loadScheme( AsciiString name )
 // ------------------------------------------------------------------------------------------------
 WindowLayout *Shell::getSaveLoadMenuLayout( void )
 {
-	
+
 	// if layout has not been created, create it now
 	if( m_saveLoadMenuLayout == NULL )
-   m_saveLoadMenuLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupSaveLoad.wnd" ) );
+   m_saveLoadMenuLayout = TheWindowManager->winCreateLayout( "Menus/PopupSaveLoad.wnd" );
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_saveLoadMenuLayout, ("Unable to create save/load menu layout\n") );
+	DEBUG_ASSERTCRASH( m_saveLoadMenuLayout, ("Unable to create save/load menu layout") );
 
 	// return the layout
 	return m_saveLoadMenuLayout;
 
-}  // end getSaveLoadMenuLayout
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 WindowLayout *Shell::getPopupReplayLayout( void )
 {
-	
+
 	// if layout has not been created, create it now
 	if( m_popupReplayLayout == NULL )
-   m_popupReplayLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupReplay.wnd" ) );
+   m_popupReplayLayout = TheWindowManager->winCreateLayout( "Menus/PopupReplay.wnd" );
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_popupReplayLayout, ("Unable to create replay save menu layout\n") );
+	DEBUG_ASSERTCRASH( m_popupReplayLayout, ("Unable to create replay save menu layout") );
 
 	// return the layout
 	return m_popupReplayLayout;
 
-}  // end getSaveLoadMenuLayout
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -822,15 +880,15 @@ WindowLayout *Shell::getOptionsLayout( Bool create )
 	// if layout has not been created, create it now
 	if ((m_optionsLayout == NULL) && (create == TRUE))
 	{
-		m_optionsLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/OptionsMenu.wnd" ) );
+		m_optionsLayout = TheWindowManager->winCreateLayout( "Menus/OptionsMenu.wnd" );
 
 		// sanity
-		DEBUG_ASSERTCRASH( m_optionsLayout, ("Unable to create options menu layout\n") );
+		DEBUG_ASSERTCRASH( m_optionsLayout, ("Unable to create options menu layout") );
 	}
 
 	// return the layout
 	return m_optionsLayout;
-} // end getOptionsLayout
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
index b56f66f0c5a..276f0f5e0da 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ShellMenuScheme.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,8 +37,8 @@
 //	Filename: 	ShellMenuScheme.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "GameClient/ShellMenuScheme.h"
@@ -60,12 +60,12 @@
 // DEFINES ////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 
-const FieldParse ShellMenuSchemeManager::m_shellMenuSchemeFieldParseTable[] = 
+const FieldParse ShellMenuSchemeManager::m_shellMenuSchemeFieldParseTable[] =
 {
 
 	{ "ImagePart",						ShellMenuSchemeManager::parseImagePart,			NULL, NULL },
 	{ "LinePart",							ShellMenuSchemeManager::parseLinePart,	NULL, NULL },
-	{ NULL,										NULL,													NULL, 0 }  // keep this last
+	{ NULL,										NULL,													NULL, 0 }
 
 };
 
@@ -80,25 +80,25 @@ void INI::parseShellMenuSchemeDefinition( INI *ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
 	SMSchemeManager = TheShell->getShellMenuSchemeManager();
-	DEBUG_ASSERTCRASH( SMSchemeManager, ("parseShellMenuSchemeDefinition: Unable to Get SMSchemeManager\n") );
+	DEBUG_ASSERTCRASH( SMSchemeManager, ("parseShellMenuSchemeDefinition: Unable to Get SMSchemeManager") );
 	if( !SMSchemeManager )
 		return;
 
 	// If we have a previously allocated control bar, this will return a cleared out pointer to it so we
-	// can overwrite it	
+	// can overwrite it
 	SMScheme = SMSchemeManager->newShellMenuScheme( name );
 
 	// sanity
-	DEBUG_ASSERTCRASH( SMScheme, ("parseControlBarSchemeDefinition: Unable to allocate Scheme '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( SMScheme, ("parseControlBarSchemeDefinition: Unable to allocate Scheme '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( SMScheme, SMSchemeManager->getFieldParse() );
 
-}  // end parseCommandButtonDefinition
+}
 
 ShellMenuSchemeLine::ShellMenuSchemeLine( void )
 {
@@ -126,7 +126,7 @@ ShellMenuSchemeImage::~ShellMenuSchemeImage( void )
 
 ShellMenuScheme::ShellMenuScheme( void )
 {
-	
+
 }
 
 ShellMenuScheme::~ShellMenuScheme( void )
@@ -136,8 +136,7 @@ ShellMenuScheme::~ShellMenuScheme( void )
 	{
 		ShellMenuSchemeImage *image = *it;
 		it = m_imageList.erase( it );
-		if(image)
-			delete image;
+		delete image;
 	}
 
 	ShellMenuSchemeLineListIt lineIt = m_lineList.begin();
@@ -145,11 +144,10 @@ ShellMenuScheme::~ShellMenuScheme( void )
 	{
 		ShellMenuSchemeLine *line = *lineIt;
 		lineIt = m_lineList.erase( lineIt );
-		if(line)
-			delete line;
+		delete line;
 	}
 
-	
+
 }
 
 void ShellMenuScheme::addLine( ShellMenuSchemeLine* schemeLine )
@@ -188,7 +186,7 @@ void ShellMenuScheme::draw( void )
 	while(it != m_lineList.end())
 	{
 		ShellMenuSchemeLine *line = *it;
-		
+
 		if(line)
 		{
 			TheDisplay->drawLine(line->m_startPos.x, line->m_startPos.y, line->m_endPos.x,
@@ -215,20 +213,19 @@ ShellMenuSchemeManager::~ShellMenuSchemeManager( void )
 	{
 		ShellMenuScheme *scheme = *it;
 		it = m_schemeList.erase( it );
-		if(scheme)
-			delete scheme;
+		delete scheme;
 	}
-	
+
 }
 
 void ShellMenuSchemeManager::parseImagePart(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Position",				INI::parseICoord2D,				NULL, offsetof( ShellMenuSchemeImage, m_position ) },
 			{ "Size",						INI::parseICoord2D,				NULL, offsetof( ShellMenuSchemeImage, m_size ) },
       { "ImageName",			INI::parseMappedImage,		NULL, offsetof( ShellMenuSchemeImage, m_image ) },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
 	ShellMenuSchemeImage *schemeImage = NEW ShellMenuSchemeImage;
@@ -239,14 +236,14 @@ void ShellMenuSchemeManager::parseImagePart(INI *ini, void *instance, void* /*st
 
 void ShellMenuSchemeManager::parseLinePart(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "StartPosition",		INI::parseICoord2D,				NULL, offsetof( ShellMenuSchemeLine, m_startPos ) },
 			{ "EndPosition",			INI::parseICoord2D,				NULL, offsetof( ShellMenuSchemeLine, m_endPos ) },
       { "Color",						INI::parseColorInt,				NULL, offsetof( ShellMenuSchemeLine, m_color ) },
 			{ "Width",						INI::parseInt,						NULL, offsetof( ShellMenuSchemeLine, m_width ) },
-			
-			{ NULL,								NULL,											NULL, 0 }  // keep this last
+
+			{ NULL,								NULL,											NULL, 0 }
 		};
 
 	ShellMenuSchemeLine *schemeLine = NEW ShellMenuSchemeLine;
@@ -282,8 +279,8 @@ void ShellMenuSchemeManager::init( void )
 {
 	INI ini;
 	// Read from INI all the ControlBarSchemes
-	ini.load( AsciiString( "Data\\INI\\Default\\ShellMenuScheme.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\ShellMenuScheme.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL );
 
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WinInstanceData.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WinInstanceData.cpp
index 190fc81a1eb..393296d7ba8 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WinInstanceData.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WinInstanceData.cpp
@@ -24,12 +24,12 @@
 
 // FILE: WinInstanceData.cpp //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,7 +44,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "GameClient/WinInstanceData.h"
@@ -79,7 +79,7 @@ WinInstanceData::WinInstanceData( void )
 	m_videoBuffer = NULL;
 	init();
 
-}  // end WinInstanceData
+}
 
 // WinInstanceData::~WinInstanceData ==========================================
 //=============================================================================
@@ -94,7 +94,7 @@ WinInstanceData::~WinInstanceData( void )
 
 	m_videoBuffer = NULL; //Video Buffer needs to be clean up by the control that is in charge of the video.
 
-}  // end ~WinInstanceData
+}
 
 // WinInstanceData::init ======================================================
 /** Set initial values for instance data if desired */
@@ -119,7 +119,7 @@ void WinInstanceData::init( void )
 		m_hiliteDrawData[ i ].color = WIN_COLOR_UNDEFINED;
 		m_hiliteDrawData[ i ].borderColor = WIN_COLOR_UNDEFINED;
 
-	}  // end for i
+	}
 
 	// initialize text colors
 	m_enabledText.color					= WIN_COLOR_UNDEFINED;
@@ -150,19 +150,19 @@ void WinInstanceData::init( void )
 		TheDisplayStringManager->freeDisplayString( m_text );
 		m_text = NULL;
 
-	}  // end if
+	}
 	if( m_tooltip )
 	{
 
 		TheDisplayStringManager->freeDisplayString( m_tooltip );
 		m_tooltip = NULL;
 
-	}  // end if
+	}
 
 	m_videoBuffer = NULL;
 
 
-}  // end init
+}
 
 // WinInstanceData::setTooltipText ============================================
 //=============================================================================
@@ -177,7 +177,7 @@ void WinInstanceData::setTooltipText( UnicodeString tip )
 	// set text
 	m_tooltip->setText( tip );
 
-}  // end setTooltipText
+}
 
 // WinInstanceData:setText ====================================================
 /** Set the text for this window instance data */
@@ -193,7 +193,7 @@ void WinInstanceData::setText( UnicodeString text )
 	// set the text
 	m_text->setText( text );
 
-}  // end set text
+}
 
 // WinInstanceData:setText ====================================================
 /** Set the text for this window instance data */
@@ -201,4 +201,4 @@ void WinInstanceData::setText( UnicodeString text )
 void WinInstanceData::setVideoBuffer( VideoBuffer * videoBuffer )
 {
 	m_videoBuffer = videoBuffer;
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp
index 746f595b2ee..e0b08d321f1 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowLayout.cpp
@@ -28,17 +28,11 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/WindowLayout.h"
 #include "GameClient/Shell.h"
 #include "GameClient/GameWindowManager.h"
-#ifdef RTS_INTERNAL
-
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
@@ -57,7 +51,7 @@ WindowLayout::WindowLayout( void )
 	m_update = NULL;
 	m_shutdown = NULL;
 
-}  // end WindowLayout
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -70,9 +64,9 @@ WindowLayout::~WindowLayout( void )
 	// use them in any you see fit, as long as they are clean when they go away
 	//
 	DEBUG_ASSERTCRASH( m_windowList == NULL, ("Window layout being destroyed still has window references") );
-	DEBUG_ASSERTCRASH( m_windowTail == NULL, ("Window layout being destroyed still has window references") );	
+	DEBUG_ASSERTCRASH( m_windowTail == NULL, ("Window layout being destroyed still has window references") );
 
-}  // end ~WindowLayout
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the hidden/visible status of all the windows in this layout */
@@ -87,12 +81,12 @@ void WindowLayout::hide( Bool hide )
 
 		window->winHide( hide );
 
-	}  // end for window
+	}
 
 	// save the new visible state of the system
 	m_hidden = hide;
 
-}  // end hide
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Add window to this layout */
@@ -101,7 +95,7 @@ void WindowLayout::addWindow( GameWindow *window )
 {
 	GameWindow *win = findWindow( window );
 
-	// only add window if window is not in this layout already	
+	// only add window if window is not in this layout already
 	if( win == NULL )
 	{
 
@@ -126,9 +120,9 @@ void WindowLayout::addWindow( GameWindow *window )
 		// we gots another window now
 		m_windowCount++;
 
-	}  // end if
+	}
 
-}  // end addWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove window from this layout */
@@ -164,9 +158,9 @@ void WindowLayout::removeWindow( GameWindow *window )
 		// we lost one sir!
 		m_windowCount--;
 
-	}  // end if
+	}
 
-}  // end removeWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Destroy all the windows in a layout */
@@ -184,9 +178,9 @@ void WindowLayout::destroyWindows( void )
 		// destroy window in window system
 		TheWindowManager->winDestroy( window );
 
-	}  // end while
+	}
 
-}  // end destroyWindows
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create the windows using the .wnd file script and load all windows into
@@ -214,10 +208,10 @@ Bool WindowLayout::load( AsciiString filename )
 	{
 
 		DEBUG_ASSERTCRASH( target, ("WindowLayout::load - Failed to load layout") );
-		DEBUG_LOG(( "WindowLayout::load - Unable to load layout file '%s'\n", filename.str() ));
+		DEBUG_LOG(( "WindowLayout::load - Unable to load layout file '%s'", filename.str() ));
 		return FALSE;
 
-	}  // end if
+	}
 
 	//
 	// add windows loaded from .wnd file to the layout, via info.windows.
@@ -242,7 +236,7 @@ Bool WindowLayout::load( AsciiString filename )
 		// add window to this layout
 		addWindow( window );
 
-	}  // end for window
+	}
 	*/
 
 	// copy filename
@@ -255,7 +249,7 @@ Bool WindowLayout::load( AsciiString filename )
 
 	return TRUE;  // success
 
-}  // end load
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Bring all windows in this layout forward */
@@ -282,9 +276,9 @@ void WindowLayout::bringForward( void )
 		window->winBringToTop();
 		countLeft--;
 
-	}  // end for window
+	}
 
-}  // end bringForward
+}
 
 
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////////////////////////
@@ -301,4 +295,4 @@ GameWindow *WindowLayout::findWindow( GameWindow *window )
 
 	return NULL;  // window not found
 
-}  // end findWindow
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp
deleted file mode 100644
index 0d1ebb02dd8..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: WindowVideoManager.cpp /////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-//	created:	Apr 2002
-//
-//	Filename: 	WindowVideoManager.cpp
-//
-//	author:		Chris Huybregts
-//	
-//	purpose:	Every window is setup to be able to draw a movie.  The 
-//						WindowVideoManager will take care of setting up the window,
-//						creating/destroying the buffers, and the ability to pause/stop
-//						movies.
-//
-//	To Use:		Create a manager and initialize it. Make sure the manager's Update
-//						is called every frame or how ever often it needs to be updated.
-//						Call reset if the manager needs to be cleared.
-//						Play a movie in a window by passing a window pointer, a movie name,
-//						and the playtype.
-//						If a user trys to play a two different movies on the same window,
-//						only the last one added will play.
-//						It's important when destroying a window, that window is removed
-//						from the manager (Or call Reset if you know no other windows are
-//						playing a movie).
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-//-----------------------------------------------------------------------------
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// USER INCLUDES //////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/WindowVideoManager.h"
-#include "GameClient/GameWindow.h"
-#include "GameClient/VideoPlayer.h"
-#include "GameClient/Display.h"
-
-//-----------------------------------------------------------------------------
-// DEFINES ////////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// WindowVideo PUBLIC FUNCTIONS ///////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-WindowVideo::WindowVideo( void )
-{
-	
-	m_playType = WINDOW_PLAY_MOVIE_ONCE;
-	m_win = NULL;
-	m_videoBuffer = NULL;
-	m_videoStream = NULL;
-	m_movieName.clear();
-	m_state = WINDOW_VIDEO_STATE_STOP;
-
-}
-
-WindowVideo::~WindowVideo( void )
-{
-	// Don't Delete the window, only set it's video buffer to NULL
-	if(m_win)
-		m_win->winGetInstanceData()->setVideoBuffer( NULL );
-	m_win = NULL;
-	
-	delete m_videoBuffer;
-	m_videoBuffer = NULL;
-
-	if ( m_videoStream )
-		m_videoStream->close();
-	m_videoStream = NULL;
-
-}
-	
-void WindowVideo::init( GameWindow *win, AsciiString movieName, 
-												WindowVideoPlayType playType,
-												VideoBuffer *videoBuffer, VideoStreamInterface *videoStream)
-{
-	m_win = win;
-	m_movieName = movieName;
-	m_playType = playType;
-	m_videoBuffer = videoBuffer;
-	m_videoStream = videoStream;
-	m_state = WINDOW_VIDEO_STATE_PLAY;
-	if(m_win)
-		m_win->winGetInstanceData()->setVideoBuffer( m_videoBuffer );
-}
-	
-void WindowVideo::setWindowState( WindowVideoStates state )
-{ 
-	m_state = state; 
-
-	if(m_state == WINDOW_VIDEO_STATE_STOP && m_win)
-		m_win->winGetInstanceData()->setVideoBuffer( NULL );
-
-	if((m_state == WINDOW_VIDEO_STATE_PLAY || m_state == WINDOW_VIDEO_STATE_PAUSE )&& m_win)
-		m_win->winGetInstanceData()->setVideoBuffer( m_videoBuffer );
-}	
-
-//-----------------------------------------------------------------------------
-// WindowVideoManager PUBLIC FUNCTIONS ////////////////////////////////////////
-//-----------------------------------------------------------------------------
-WindowVideoManager::WindowVideoManager( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			delete winVid;
-		it++;
-	}
-	m_playingVideos.clear();
-	
-	m_stopAllMovies = FALSE;
-	m_pauseAllMovies = FALSE;
-
-}
-
-WindowVideoManager::~WindowVideoManager( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			delete winVid;
-		it++;
-	}
-	m_playingVideos.clear();
-	
-}
-
-	
-void WindowVideoManager::init( void )
-{
-	m_playingVideos.clear();
-	
-	m_stopAllMovies = FALSE;
-	m_pauseAllMovies = FALSE;
-}
-
-void WindowVideoManager::reset( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			delete winVid;
-		it++;
-	}
-	m_playingVideos.clear();
-	
-	m_stopAllMovies = FALSE;
-	m_pauseAllMovies = FALSE;
-}
-
-void WindowVideoManager::update( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-
-	if(m_pauseAllMovies || m_stopAllMovies)
-		return;
-
-	//Iterate through the maps
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		
-		if(!winVid)
-		{
-			DEBUG_CRASH(("There's No WindowVideo in the m_playignVideos list"));
-			return;
-		}
-		GameWindow *win = winVid->getWin();
-
-		if(winVid->getState() == WINDOW_VIDEO_STATE_HIDDEN && (win->winIsHidden() == FALSE))
-		{
-			resumeMovie(win);
-		}
-
-		if(winVid->getState() == WINDOW_VIDEO_STATE_PLAY && win->winIsHidden())
-		{
-			hideMovie(win);
-		}
-
-		// Only advance the frame if we're playing
-		if(winVid->getState() != WINDOW_VIDEO_STATE_PLAY)
-		{
-			it++;
-			continue;
-		}
-
-		// Get the Stream and the buffer to update for each animation
-		VideoStreamInterface *videoStream = winVid->getVideoStream();
-		VideoBuffer *videoBuffer = winVid->getVideoBuffer();
-		
-		if ( videoStream && videoBuffer )
-		{
-			if ( videoStream->isFrameReady())
-			{
-				videoStream->frameDecompress();
-				videoStream->frameRender( videoBuffer );
-				videoStream->frameNext();
-				
-				// If we reach frame Index of 0, we might have to pause, or loop.
-				if ( videoStream->frameIndex() == 0 )
-				{
-					if(winVid->getPlayType() == WINDOW_PLAY_MOVIE_ONCE)
-						stopMovie(win);
-					else if (winVid->getPlayType() == WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME)
-						pauseMovie(win);
-				}
-			}
-		}
-		
-		it++;
-	}
-}
-
-void WindowVideoManager::playMovie( GameWindow *win, AsciiString movieName, WindowVideoPlayType playType )
-{
-	// if we already have a movie playing for that window, kill it.
-	stopAndRemoveMovie( win );
-	
-	// create the new stream
-	VideoStreamInterface *videoStream = TheVideoPlayer->open( movieName );
-	if ( videoStream == NULL )
-	{
-		return;
-	}
-
-	// Create the new buffer
-	VideoBuffer *videoBuffer = TheDisplay->createVideoBuffer();
-	if (	videoBuffer == NULL || 
-				!videoBuffer->allocate(	videoStream->width(), 
-													videoStream->height())
-		)
-	{
-		// If we failed to create the buffer...
-		delete videoBuffer;
-		videoBuffer = NULL;
-
-		if ( videoStream )
-			videoStream->close();
-		videoStream = NULL;
-
-		return;
-	}
-
-	// now that we have everything, create the new WindowVideo Structure
-	WindowVideo *winVid = NEW WindowVideo;
-	
-	// init it.
-	winVid->init( win, movieName,playType,videoBuffer,videoStream);
-
-	// add it to our map.
-	m_playingVideos[win] = winVid;
-
-	m_pauseAllMovies = FALSE;
-	m_stopAllMovies = FALSE;
-}
-
-
-void WindowVideoManager::pauseMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-		winVid->setWindowState(WINDOW_VIDEO_STATE_PAUSE);
-	}
-	
-}
-void WindowVideoManager::hideMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-		winVid->setWindowState(WINDOW_VIDEO_STATE_HIDDEN);
-	}
-}
-
-void WindowVideoManager::resumeMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_PLAY);
-	}
-	m_pauseAllMovies = FALSE;
-	m_stopAllMovies = FALSE;
-}
-
-void WindowVideoManager::stopMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_STOP);
-	}
-}
-
-void WindowVideoManager::stopAndRemoveMovie( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			delete winVid;
-		winVid = NULL;
-		m_playingVideos.erase(it);
-	}
-}
-
-void WindowVideoManager::stopAllMovies( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	//Iterate through the maps
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_STOP);
-		it++;
-	}
-	
-	m_stopAllMovies = TRUE;
-	m_pauseAllMovies = FALSE;
-}
-
-void WindowVideoManager::pauseAllMovies( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	//Iterate through the maps
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_PAUSE);
-		it++;
-	}
-	
-	m_pauseAllMovies = TRUE;
-	m_stopAllMovies = FALSE;
-}
-
-void WindowVideoManager::resumeAllMovies( void )
-{
-	WindowVideoMap::iterator it = m_playingVideos.begin();
-	//Iterate through the maps
-	while(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			winVid->setWindowState(WINDOW_VIDEO_STATE_PLAY);
-		it++;
-	}
-	m_stopAllMovies = FALSE;
-	m_pauseAllMovies = FALSE;
-}
-
-Int WindowVideoManager::getWinState( GameWindow *win )
-{
-	WindowVideoMap::iterator it = m_playingVideos.find(win);
-	if(it != m_playingVideos.end())
-	{
-		WindowVideo *winVid = it->second;
-		if(winVid)
-			return winVid->getState();
-	}
-	return WINDOW_VIDEO_STATE_STOP;
-}
-
-//-----------------------------------------------------------------------------
-// PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp
index 8c6e4076c87..4b8c9f00e9b 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp
@@ -28,13 +28,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "GameClient/GameClient.h"
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/ActionManager.h"
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/PerfTimer.h"
 #include "Common/Player.h"
@@ -83,11 +84,6 @@
 #include "GameLogic/GhostObject.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/ScriptEngine.h"		// For TheScriptEngine - jkmcd
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define DRAWABLE_HASH_SIZE	8192
 
@@ -103,17 +99,14 @@ GameClient::GameClient()
 		m_translators[ i ] = TRANSLATOR_ID_INVALID;
 	m_numTranslators = 0;
 	m_commandTranslator = NULL;
-	
-	// Added By Sadullah Nader
-	// Initializations missing and needed
+
 	m_drawableTOC.clear();
-	//
 	m_textBearingDrawableList.clear();
 
 	m_frame = 0;
 
 	m_drawableList = NULL;
-	
+
 	m_nextDrawableID = (DrawableID)1;
 	TheDrawGroupInfo = new DrawGroupInfo;
 }
@@ -129,28 +122,25 @@ GameClient::~GameClient()
 	TheGraphDraw = NULL;
 #endif
 
-	if (TheDrawGroupInfo) 
-	{
-		delete TheDrawGroupInfo;
-		TheDrawGroupInfo = NULL;
-	}
+	delete TheDrawGroupInfo;
+	TheDrawGroupInfo = NULL;
 
 	// clear any drawable TOC we might have
 	m_drawableTOC.clear();
 
-	//DEBUG_LOG(("Preloaded texture files ------------------------------------------\n"));
+	//DEBUG_LOG(("Preloaded texture files ------------------------------------------"));
 	//for (Int oog=0; oog<preloadTextureNamesGlobalHack2.size(); ++oog)
 	//{
-	//	DEBUG_LOG(("%s\n", preloadTextureNamesGlobalHack2[oog]));
+	//	DEBUG_LOG(("%s", preloadTextureNamesGlobalHack2[oog]));
 	//}
-	//DEBUG_LOG(("------------------------------------------------------------------\n"));
+	//DEBUG_LOG(("------------------------------------------------------------------"));
 	//for (oog=0; oog<preloadTextureNamesGlobalHack.size(); ++oog)
 	//{
-	//	DEBUG_LOG(("%s\n", preloadTextureNamesGlobalHack[oog]));
+	//	DEBUG_LOG(("%s", preloadTextureNamesGlobalHack[oog]));
 	//}
-	//DEBUG_LOG(("End Texture files ------------------------------------------------\n"));
-	if(TheCampaignManager)
-		delete TheCampaignManager;
+	//DEBUG_LOG(("End Texture files ------------------------------------------------"));
+
+	delete TheCampaignManager;
 	TheCampaignManager = NULL;
 
 	// destroy all Drawables
@@ -193,6 +183,7 @@ GameClient::~GameClient()
 	delete TheFontLibrary;
 	TheFontLibrary = NULL;
 
+	TheMouse->reset();
 	delete TheMouse;
 	TheMouse = NULL;
 
@@ -210,7 +201,7 @@ GameClient::~GameClient()
 
 	delete TheHeaderTemplateManager;
 	TheHeaderTemplateManager = NULL;
-	
+
 	delete TheLanguageFilter;
 	TheLanguageFilter = NULL;
 
@@ -219,16 +210,16 @@ GameClient::~GameClient()
 
 	// destroy all translators
 	for( UnsignedInt i = 0; i < m_numTranslators; i++ )
-		TheMessageStream->removeTranslator( m_translators[ i ] );	
+		TheMessageStream->removeTranslator( m_translators[ i ] );
 	m_numTranslators = 0;
 	m_commandTranslator = NULL;
 
 	delete TheAnim2DCollection;
-	TheAnim2DCollection = NULL;	
+	TheAnim2DCollection = NULL;
 
 	delete TheMappedImageCollection;
-	TheMappedImageCollection = NULL;	
-	
+	TheMappedImageCollection = NULL;
+
 	delete TheKeyboard;
 	TheKeyboard = NULL;
 
@@ -241,7 +232,7 @@ GameClient::~GameClient()
 	delete TheSnowManager;
 	TheSnowManager = NULL;
 
-}  // end ~GameClient
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize resources for the game client */
@@ -253,8 +244,8 @@ void GameClient::init( void )
 
 	INI ini;
 	// Load the DrawGroupInfo here, before the Display Manager is loaded.
-	ini.load("Data\\INI\\DrawGroupInfo.ini", INI_LOAD_OVERWRITE, NULL);
-	
+	ini.loadFileDirectory("Data\\INI\\DrawGroupInfo", INI_LOAD_OVERWRITE, NULL);
+
 	// Override the ini values with localized versions:
 	if (TheGlobalLanguageData && TheGlobalLanguageData->m_drawGroupInfoFont.name.isNotEmpty())
 	{
@@ -269,7 +260,7 @@ void GameClient::init( void )
 		TheDisplayStringManager->init();
 		TheDisplayStringManager->setName("TheDisplayStringManager");
 	}
-	
+
 	if (!TheGlobalData->m_headless)
 	{
 		// create the keyboard
@@ -317,7 +308,7 @@ void GameClient::init( void )
 		//
 		m_translators[ m_numTranslators++ ] =	TheMessageStream->attachTranslator( MSGNEW("GameClientSubsystem") GameClientMessageDispatcher, 999999999 );
 
-	}  
+	}
 
 	// create the font library
 	TheFontLibrary = createFontLibrary();
@@ -336,7 +327,7 @@ void GameClient::init( void )
 		TheDisplay->init();
  		TheDisplay->setName("TheDisplay");
 	}
-	
+
 	TheHeaderTemplateManager = MSGNEW("GameClientSubsystem") HeaderTemplateManager;
 	if(TheHeaderTemplateManager){
 		TheHeaderTemplateManager->init();
@@ -351,7 +342,7 @@ void GameClient::init( void )
  		TheWindowManager->setName("TheWindowManager");
 //		TheWindowManager->initTestGUI();
 
-	}  // end if
+	}
 
 	// create the IME manager
 	TheIMEManager = CreateIMEManagerInterface();
@@ -408,7 +399,7 @@ void GameClient::init( void )
 		TheMouse->setPosition( 0, 0 );
 		TheMouse->setMouseLimits();
  		TheMouse->setName("TheMouse");
-	}  // end if
+	}
 
 	// create the video player
 	TheVideoPlayer = createVideoPlayer();
@@ -446,7 +437,7 @@ void GameClient::init( void )
 	TheGraphDraw = new GraphDraw;
 #endif
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the game client for a new game */
@@ -484,7 +475,7 @@ void GameClient::reset( void )
 	// TheSuperHackers @fix Mauller 13/04/2025 Reset the drawable id so it does not keep growing over the lifetime of the game.
 	m_nextDrawableID = (DrawableID)1;
 
-}  // end reset
+}
 
 /** -----------------------------------------------------------------------------------------------
  * Return a new unique object id.
@@ -500,7 +491,7 @@ DrawableID GameClient::allocDrawableID( void )
 /** -----------------------------------------------------------------------------------------------
  * Given a drawable, register it with the GameClient and give it a unique ID.
  */
-void GameClient::registerDrawable( Drawable *draw ) 
+void GameClient::registerDrawable( Drawable *draw )
 {
 
 	// assign this drawable a unique ID, this will add it to the fast lookup table too
@@ -509,7 +500,7 @@ void GameClient::registerDrawable( Drawable *draw )
 	// add the drawable to the master list
 	draw->prependToList( &m_drawableList );
 
-}  // end registerDrawable
+}
 
 /** -----------------------------------------------------------------------------------------------
  * Redraw all views, update the GUI, play sound effects, etc.
@@ -535,10 +526,10 @@ void GameClient::update( void )
 		playSizzle = TRUE;
 	}
 
-	//Initial Game Codition.  We must show the movie first and then we can display the shell	
+	//Initial Game Codition.  We must show the movie first and then we can display the shell
 	if(TheGlobalData->m_afterIntro && !TheDisplay->isMoviePlaying())
 	{
-		if( playSizzle && TheGlobalData->m_playSizzle && !TheGlobalData->m_headless )// Remove headless-check with Replay Simulation PR
+		if( playSizzle && TheGlobalData->m_playSizzle )
 		{
 			TheWritableGlobalData->m_allowExitOutOfMovies = TRUE;
 			if(TheGameLODManager && TheGameLODManager->didMemPass())
@@ -558,7 +549,7 @@ void GameClient::update( void )
 
 				WindowLayout *legal = TheWindowManager->winCreateLayout("Menus/LegalPage.wnd");
 				if(legal)
-				{				
+				{
 					legal->hide(FALSE);
 					legal->bringForward();
 					Int beginTime = timeGetTime();
@@ -578,7 +569,7 @@ void GameClient::update( void )
 				}
 				TheWritableGlobalData->m_breakTheMovie = TRUE;
 
-				
+
 			}
 
 			TheShell->showShellMap(TRUE);
@@ -600,7 +591,7 @@ void GameClient::update( void )
 		TheKeyboard->UPDATE();
 		TheKeyboard->createStreamMessages();
 
-	}  // end if
+	}
 
 	// Update the Eva stuff
 	TheEva->UPDATE();
@@ -611,8 +602,8 @@ void GameClient::update( void )
 		TheMouse->UPDATE();
 		TheMouse->createStreamMessages();
 
-	}  // end if
-	
+	}
+
 
   if (TheInGameUI->isCameraTrackingDrawable())
   {
@@ -629,11 +620,8 @@ void GameClient::update( void )
 	if(TheGlobalData->m_playIntro || TheGlobalData->m_afterIntro)
 	{
 		// redraw all views, update the GUI
-		if (!TheGlobalData->m_headless)// Remove headless-check with Replay Simulation PR
-		{
-			TheDisplay->DRAW();
-			TheDisplay->UPDATE();
-		}
+		TheDisplay->DRAW();
+		TheDisplay->UPDATE();
 		return;
 	}
 
@@ -647,42 +635,38 @@ void GameClient::update( void )
 		TheVideoPlayer->UPDATE();
 	}
 
-	Bool freezeTime = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
-	freezeTime = freezeTime || TheScriptEngine->isTimeFrozenDebug();
-	freezeTime = freezeTime || TheScriptEngine->isTimeFrozenScript();
-	freezeTime = freezeTime || TheGameLogic->isGamePaused();
-	Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+	const Bool freezeTime = TheGameEngine->isTimeFrozen() || TheGameEngine->isGameHalted();
 
-	// hack to let client spin fast in network games but still do effects at the same pace. -MDC
-	static UnsignedInt lastFrame = ~0;
-	freezeTime = freezeTime || (lastFrame == m_frame);
-	lastFrame = m_frame;
+	const Int localPlayerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
 
 	if (!freezeTime)
 	{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+		Int numPlayers = ThePlayerList->getPlayerCount();
+		Int numNonLocalPlayers = 0;
+		Int nonLocalPlayerIndices[MAX_PLAYER_COUNT];
+
+#if ENABLE_CONFIGURABLE_SHROUD
 		if (TheGlobalData->m_shroudOn)
 #else
 		if (true)
 #endif
-		{	
-			//localPlayerIndex=TheGhostObjectManager->getLocalPlayerIndex();	//always use the first local player set since normally can't change.  Doesn't work with debug "CTRL_SHIFT_SPACE"
-#ifdef DEBUG_FOG_MEMORY
-			//Find indices of all active players
-			Int numPlayers=ThePlayerList->getPlayerCount();
-			Int numNonLocalPlayers=0;
-			Int nonLocalPlayerIndices[MAX_PLAYER_COUNT];
-			for (Int i=0; i<numPlayers; i++)
-			{	Player *player=ThePlayerList->getNthPlayer(i);
-				//if (player->getPlayerType == PLAYER_HUMAN)
-				if (player->getPlayerIndex() != localPlayerIndex)
-					nonLocalPlayerIndices[numNonLocalPlayers++]=player->getPlayerIndex();
+		{
+			if (TheGhostObjectManager->trackAllPlayers())
+			{
+				//Find indices of all active players
+				for (Int i=0; i < numPlayers; i++)
+				{
+					Player *player = ThePlayerList->getNthPlayer(i);
+					if (player->getPlayerTemplate() != NULL && player->getPlayerIndex() != localPlayerIndex)
+						nonLocalPlayerIndices[numNonLocalPlayers++] = player->getPlayerIndex();
+				}
+				//update ghost objects which don't have drawables or objects.
+				TheGhostObjectManager->updateOrphanedObjects(nonLocalPlayerIndices, numNonLocalPlayers);
+			}
+			else
+			{
+				TheGhostObjectManager->updateOrphanedObjects(NULL, 0);
 			}
-			//update ghostObjects which don't have drawables or objects.
-			TheGhostObjectManager->updateOrphanedObjects(nonLocalPlayerIndices,numNonLocalPlayers);
-#else
-			TheGhostObjectManager->updateOrphanedObjects(NULL,0);
-#endif
 		}
 
 
@@ -691,25 +675,36 @@ void GameClient::update( void )
 		while (draw)
 		{	// update() could free the Drawable, so go ahead and grab 'next'
 			Drawable* next = draw->getNextDrawable();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if ENABLE_CONFIGURABLE_SHROUD
 			if (TheGlobalData->m_shroudOn)
 #else
 			if (true)
 #endif
-			{	//immobile objects need to take snapshots whenever they become fogged
+			{
+				//immobile objects need to take snapshots whenever they become fogged
 				//so need to refresh their status.  We can't rely on external calls
 				//to getShroudStatus() because they are only made for visible on-screen
 				//objects.
 				Object *object=draw->getObject();
 				if (object)
 				{
-	#ifdef DEBUG_FOG_MEMORY
-					Int *playerIndex=nonLocalPlayerIndices;
-					for (i=0; i<numNonLocalPlayers; i++, playerIndex++)
-						object->getShroudedStatus(*playerIndex);
-	#endif
+					if (TheGhostObjectManager->trackAllPlayers())
+					{
+						// TheSuperHackers @info Update the shrouded status for all objects
+						// that own a ghost object for all non local players. This is costly.
+						if (object->hasGhostObject())
+						{
+							Int *playerIndex = nonLocalPlayerIndices;
+							Int *const playerIndexEnd = nonLocalPlayerIndices + numNonLocalPlayers;
+							for (; playerIndex < playerIndexEnd; ++playerIndex)
+							{
+								object->getShroudedStatus(*playerIndex);
+							}
+						}
+					}
+
 					ObjectShroudStatus ss=object->getShroudedStatus(localPlayerIndex);
-					if (ss >= OBJECTSHROUD_FOGGED && draw->getShroudClearFrame()!=0) {
+					if (ss >= OBJECTSHROUD_FOGGED && draw->getShroudClearFrame() != InvalidShroudClearFrame) {
 						UnsignedInt limit = 2*LOGICFRAMES_PER_SECOND;
 						if (object->isEffectivelyDead()) {
 							// extend the time, so we can see the dead plane blow up & crash.
@@ -728,9 +723,9 @@ void GameClient::update( void )
 		}
 	}
 
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#if defined(RTS_DEBUG)
 	// need to draw the first frame, then don't draw again until TheGlobalData->m_noDraw
-	if (TheGlobalData->m_noDraw > TheGameLogic->getFrame() && TheGameLogic->getFrame() > 0) 
+	if (TheGlobalData->m_noDraw > TheGameLogic->getFrame() && TheGameLogic->getFrame() > 0)
 	{
 		return;
 	}
@@ -743,7 +738,7 @@ void GameClient::update( void )
 		TheParticleSystemManager->setLocalPlayerIndex(localPlayerIndex);
 //		TheParticleSystemManager->update();
 
-	}  // end if
+	}
 
 	// update the terrain visuals
 	{
@@ -751,18 +746,16 @@ void GameClient::update( void )
 	}
 
 	// update display
-	if (!TheGlobalData->m_headless)// Remove headless-check with Replay Simulation PR
 	{
 		TheDisplay->UPDATE();
 	}
 
-	if (!TheGlobalData->m_headless)// Remove headless-check with Replay Simulation PR
 	{
 		USE_PERF_TIMER(GameClient_draw)
-			
+
 	// redraw all views, update the GUI
 	//if(TheGameLogic->getFrame() >= 2)
-		
+
 		TheDisplay->DRAW();
 	}
 
@@ -777,10 +770,27 @@ void GameClient::update( void )
 	}
 
 	{
-		// update the in game UI 
+		// update the in game UI
 		TheInGameUI->UPDATE();
 	}
-}  // end update
+}
+
+void GameClient::step()
+{
+	TheDisplay->step();
+}
+
+void GameClient::updateHeadless()
+{
+	// TheSuperHackers @info helmutbuhler 03/05/2025
+	// When we play a replay back in headless mode, we want to skip the update of GameClient
+	// because it's not necessary for CRC checking.
+	// But we do reset the particles. The problem is that particles can be generated during
+	// GameLogic and are only cleaned up during rendering. If we don't clean this up here,
+	// the particles accumulate and slow things down a lot and can even cause a crash on
+	// longer replays.
+	TheParticleSystemManager->reset();
+}
 
 /** -----------------------------------------------------------------------------------------------
  * Call the given callback function for each object contained within the given region.
@@ -814,8 +824,8 @@ void GameClient::updateFakeDrawables(void)
 		const Object *object=draw->getObject();
 
 		if( object && object->isKindOf( KINDOF_FS_FAKE ) )
-		{	
-			Relationship rel=ThePlayerList->getLocalPlayer()->getRelationship(object->getTeam());
+		{
+			Relationship rel = rts::getObservedOrLocalPlayer()->getRelationship(object->getTeam());
 			if (rel == ALLIES || rel == NEUTRAL)
 				draw->setTerrainDecal(TERRAIN_DECAL_SHADOW_TEXTURE);
 			else
@@ -845,10 +855,10 @@ void GameClient::destroyDrawable( Drawable *draw )
 	if( obj )
 	{
 
-		DEBUG_ASSERTCRASH( obj->getDrawable() == draw, ("Object/Drawable pointer mismatch!\n") );
+		DEBUG_ASSERTCRASH( obj->getDrawable() == draw, ("Object/Drawable pointer mismatch!") );
 		obj->friend_bindToDrawable( NULL );
 
-	}  // end if
+	}
 
 	// remove the drawable from our hash of drawables
 	removeDrawableFromLookupTable( draw );
@@ -876,7 +886,7 @@ void GameClient::addDrawableToLookupTable(Drawable *draw )
 
 	m_drawableVector[ newID ] = draw;
 
-}  // end addDrawableToLookupTable
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove drawable from lookup table of fast id searching */
@@ -893,7 +903,7 @@ void GameClient::removeDrawableFromLookupTable( Drawable *draw )
 //	m_drawableHash.erase( draw->getID() );
 	m_drawableVector[ draw->getID() ] = NULL;
 
-}  // end removeDrawableFromLookupTable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Load a map into the game interface */
@@ -908,7 +918,7 @@ Bool GameClient::loadMap( AsciiString mapName )
 
 	return TRUE;
 
-}  // end loadMap
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Unload a map from the game interface */
@@ -917,7 +927,7 @@ void GameClient::unloadMap( AsciiString mapName )
 
 	assert( 0 );  // who calls this?
 
-}  // end unloadMap
+}
 
 //-------------------------------------------------------------------------------------------------
 void GameClient::setTimeOfDay( TimeOfDay tod )
@@ -939,7 +949,7 @@ void GameClient::assignSelectedDrawablesToGroup( Int group )
 	Drawable *draw = firstDrawable();
 	while( draw )
 	{
-	
+
 		if( draw->isSelected() && draw->getObject()->isLocallyControlled())
 		{
 			draw->setDrawableGroup( group );
@@ -972,7 +982,7 @@ void GameClient::selectDrawablesInGroup( Int group )
 	while( draw )
 	{
 		int counter = 0;
-	
+
 		const Object *object = draw->getObject();
 
 		if( object && draw->getDrawableGroup() == group && object->isLocallyControlled() && !object->isContained() )
@@ -1024,7 +1034,7 @@ GameMessage::Type GameClient::evaluateContextCommand( Drawable *draw,
 	else
 		return GameMessage::MSG_INVALID;
 
-}  // end evaluateContextCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the ray effect data for a drawable */
@@ -1033,7 +1043,7 @@ void GameClient::getRayEffectData( Drawable *draw, RayEffectData *effectData )
 
 	TheRayEffects->getRayEffectData( draw, effectData );
 
-}  // end getRayEffectData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** remove the drawble from the ray effects sytem if present */
@@ -1042,7 +1052,7 @@ void GameClient::removeFromRayEffects( Drawable *draw )
 
 	TheRayEffects->deleteRayEffect( draw );
 
-}  // end removeFromRayEffects
+}
 
 /** frees all shadow resources used by this module - used by Options screen.*/
 void GameClient::releaseShadows(void)
@@ -1086,7 +1096,7 @@ void GameClient::preloadAssets( TimeOfDay timeOfDay )
 			 tTemplate;
 			 tTemplate = tTemplate->friend_getNextTemplate() )
 	{
-			
+
 		// if this isn't one of the objects that can be preloaded ignore it
 		if( tTemplate->isKindOf( KINDOF_PRELOAD ) == FALSE && !TheGlobalData->m_preloadEverything )
 			continue;
@@ -1100,29 +1110,29 @@ void GameClient::preloadAssets( TimeOfDay timeOfDay )
 			draw->preloadAssets( timeOfDay );
 
 			// destroy the drawable
-			TheGameClient->destroyDrawable( draw );
+			destroyDrawable( draw );
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 	GlobalMemoryStatus(&after);
 
-	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d",
 		before.dwAvailPageFile, after.dwAvailPageFile, before.dwAvailPageFile - after.dwAvailPageFile));
-	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d",
 		before.dwAvailPhys, after.dwAvailPhys, before.dwAvailPhys - after.dwAvailPhys));
-	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d",
 		before.dwAvailVirtual, after.dwAvailVirtual, before.dwAvailVirtual - after.dwAvailVirtual));
 	/*
-	DEBUG_LOG(("Preloading memory dwLength        %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwLength        %d --> %d : %d",
 		before.dwLength, after.dwLength, before.dwLength - after.dwLength));
-	DEBUG_LOG(("Preloading memory dwMemoryLoad    %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwMemoryLoad    %d --> %d : %d",
 		before.dwMemoryLoad, after.dwMemoryLoad, before.dwMemoryLoad - after.dwMemoryLoad));
-	DEBUG_LOG(("Preloading memory dwTotalPageFile %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwTotalPageFile %d --> %d : %d",
 		before.dwTotalPageFile, after.dwTotalPageFile, before.dwTotalPageFile - after.dwTotalPageFile));
-	DEBUG_LOG(("Preloading memory dwTotalPhys     %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwTotalPhys     %d --> %d : %d",
 		before.dwTotalPhys , after.dwTotalPhys, before.dwTotalPhys - after.dwTotalPhys));
-	DEBUG_LOG(("Preloading memory dwTotalVirtual  %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwTotalVirtual  %d --> %d : %d",
 		before.dwTotalVirtual , after.dwTotalVirtual, before.dwTotalVirtual - after.dwTotalVirtual));
 	*/
 
@@ -1136,11 +1146,11 @@ void GameClient::preloadAssets( TimeOfDay timeOfDay )
 	GlobalMemoryStatus(&after);
 	debrisModelNamesGlobalHack.clear();
 
-	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d",
 		before.dwAvailPageFile, after.dwAvailPageFile, before.dwAvailPageFile - after.dwAvailPageFile));
-	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d",
 		before.dwAvailPhys, after.dwAvailPhys, before.dwAvailPhys - after.dwAvailPhys));
-	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d",
 		before.dwAvailVirtual, after.dwAvailVirtual, before.dwAvailVirtual - after.dwAvailVirtual));
 
 	TheControlBar->preloadAssets( timeOfDay );
@@ -1149,14 +1159,14 @@ void GameClient::preloadAssets( TimeOfDay timeOfDay )
 	TheParticleSystemManager->preloadAssets( timeOfDay );
 	GlobalMemoryStatus(&after);
 
-	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d",
 		before.dwAvailPageFile, after.dwAvailPageFile, before.dwAvailPageFile - after.dwAvailPageFile));
-	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d",
 		before.dwAvailPhys, after.dwAvailPhys, before.dwAvailPhys - after.dwAvailPhys));
-	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d",
 		before.dwAvailVirtual, after.dwAvailVirtual, before.dwAvailVirtual - after.dwAvailVirtual));
 
-	const char *textureNames[] = {
+	const char *const textureNames[] = {
 		"ptspruce01.tga",
 		"exrktflame.tga",
 		"cvlimo3_d2.tga",
@@ -1203,17 +1213,17 @@ void GameClient::preloadAssets( TimeOfDay timeOfDay )
 		TheDisplay->preloadTextureAssets(textureNames[i]);
 	GlobalMemoryStatus(&after);
 
-	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPageFile %d --> %d : %d",
 		before.dwAvailPageFile, after.dwAvailPageFile, before.dwAvailPageFile - after.dwAvailPageFile));
-	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailPhys     %d --> %d : %d",
 		before.dwAvailPhys, after.dwAvailPhys, before.dwAvailPhys - after.dwAvailPhys));
-	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d\n",
+	DEBUG_LOG(("Preloading memory dwAvailVirtual  %d --> %d : %d",
 		before.dwAvailVirtual, after.dwAvailVirtual, before.dwAvailVirtual - after.dwAvailVirtual));
 
 //	preloadTextureNamesGlobalHack2 = preloadTextureNamesGlobalHack;
 //	preloadTextureNamesGlobalHack.clear();
 
-}  // end preloadAssets
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given a string name, find the drawable TOC entry (if any) associated with it */
@@ -1227,7 +1237,7 @@ GameClient::DrawableTOCEntry *GameClient::findTOCEntryByName( AsciiString name )
 
 	return NULL;
 
-}  // end findTOCEntryByname
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given a drawable TOC identifier, find the drawable TOC if any */
@@ -1241,7 +1251,7 @@ GameClient::DrawableTOCEntry *GameClient::findTOCEntryById( UnsignedShort id )
 
 	return NULL;
 
-}  // end findTOCEntryById
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add an drawable TOC entry */
@@ -1254,7 +1264,7 @@ void GameClient::addTOCEntry( AsciiString name, UnsignedShort id )
 	tocEntry.id = id;
 	m_drawableTOC.push_back( tocEntry );
 
-}  // end addTOCEntry
+}
 
 // ------------------------------------------------------------------------------------------------
 static Bool shouldSaveDrawable(const Drawable* draw)
@@ -1267,7 +1277,7 @@ static Bool shouldSaveDrawable(const Drawable* draw)
 		}
 		else
 		{
-			DEBUG_CRASH(("You should not ever set DRAWABLE_STATUS_NO_SAVE for a Drawable with an object. (%s)\n",draw->getTemplate()->getName().str()));
+			DEBUG_CRASH(("You should not ever set DRAWABLE_STATUS_NO_SAVE for a Drawable with an object. (%s)",draw->getTemplate()->getName().str()));
 		}
 	}
 	return true;
@@ -1305,11 +1315,11 @@ void GameClient::xferDrawableTOC( Xfer *xfer )
 			// if is this drawable name already in the TOC, skip it
 			if( findTOCEntryByName( templateName ) != NULL )
 				continue;
-			
+
 			// add this entry to the TOC
 			addTOCEntry( draw->getTemplate()->getName(), ++tocCount );
 
-		}  // end for obj
+		}
 
 		// xfer entries in the TOC
 		xfer->xferUnsignedInt( &tocCount );
@@ -1329,9 +1339,9 @@ void GameClient::xferDrawableTOC( Xfer *xfer )
 			// xfer the paired id
 			xfer->xferUnsignedShort( &tocEntry->id );
 
-		}  // end for
+		}
 
-	}  // end if
+	}
 	else
 	{
 		AsciiString templateName;
@@ -1349,15 +1359,15 @@ void GameClient::xferDrawableTOC( Xfer *xfer )
 
 			// read the id
 			xfer->xferUnsignedShort( &id );
-			
+
 			// add this to the TOC
 			addTOCEntry( templateName, id );
-					
-		}  // end for i
 
-	}  // end else
+		}
+
+	}
 
-}  // end xferDrawableTOC
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method for Game Client
@@ -1383,7 +1393,7 @@ void GameClient::xfer( Xfer *xfer )
 	// note that we do not do the id counter here, we did it in the game state block because
 	// it's important to do that part very early in the load process
 	//
-	// !!!DON'T DO THIS!!! ----> xfer->xferDrawableID( &m_nextDrawableID ); <---- !!!DON'T DO THIS!!! 
+	// !!!DON'T DO THIS!!! ----> xfer->xferDrawableID( &m_nextDrawableID ); <---- !!!DON'T DO THIS!!!
 
 	//
 	// xfer a table of contents that contain thing template and indentifier pairs.  this
@@ -1408,7 +1418,7 @@ void GameClient::xfer( Xfer *xfer )
 	ObjectID objectID;
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
-	
+
 		// iterate all drawables
 		for( draw = getDrawableList(); draw; draw = draw->getNextDrawable() )
 		{
@@ -1420,10 +1430,10 @@ void GameClient::xfer( Xfer *xfer )
 			if( tocEntry == NULL )
 			{
 
-				DEBUG_CRASH(( "GameClient::xfer - Drawable TOC entry not found for '%s'\n", draw->getTemplate()->getName().str() ));
+				DEBUG_CRASH(( "GameClient::xfer - Drawable TOC entry not found for '%s'", draw->getTemplate()->getName().str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// xfer toc id entry
 			xfer->xferUnsignedShort( &tocEntry->id );
@@ -1441,9 +1451,9 @@ void GameClient::xfer( Xfer *xfer )
 			// end data block
 			xfer->endBlock();
 
-		}  // end for, draw
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		UnsignedShort tocID;
@@ -1462,10 +1472,10 @@ void GameClient::xfer( Xfer *xfer )
 			if( tocEntry == NULL )
 			{
 
-				DEBUG_CRASH(( "GameClient::xfer - No TOC entry match for id '%d'\n", tocID ));
+				DEBUG_CRASH(( "GameClient::xfer - No TOC entry match for id '%d'", tocID ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// read data block size
 			dataSize = xfer->beginBlock();
@@ -1475,12 +1485,12 @@ void GameClient::xfer( Xfer *xfer )
 			if( thingTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "GameClient::xfer - Unrecognized thing template '%s', skipping.  ENGINEERS - Are you *sure* it's OK to be ignoring this object from the save file???  Think hard about it!\n",
+				DEBUG_CRASH(( "GameClient::xfer - Unrecognized thing template '%s', skipping.  ENGINEERS - Are you *sure* it's OK to be ignoring this object from the save file???  Think hard about it!",
 											tocEntry->name.str() ));
 				xfer->skip( dataSize );
 				continue;
 
-			}  // end if
+			}
 
 			// read the object ID this drawable is attached to (if any)
 			xfer->xferObjectID( &objectID );
@@ -1497,22 +1507,22 @@ void GameClient::xfer( Xfer *xfer )
 				if( object == NULL )
 				{
 
-					DEBUG_CRASH(( "GameClient::xfer - Cannot find object '%d' that is supposed to be attached to this drawable '%s'\n",
+					DEBUG_CRASH(( "GameClient::xfer - Cannot find object '%d' that is supposed to be attached to this drawable '%s'",
 												objectID, thingTemplate->getName().str() ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
 				// get the drawable from the object
 				draw = object->getDrawable();
 				if( draw == NULL )
 				{
 
-					DEBUG_CRASH(( "GameClient::xfer - There is no drawable attached to the object '%s' (%d) and there should be\n",
+					DEBUG_CRASH(( "GameClient::xfer - There is no drawable attached to the object '%s' (%d) and there should be",
 												object->getTemplate()->getName().str(), object->getID() ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
 				// srj sez: some objects (eg, diguised bombtrucks) may have an "abnormal" drawable. so check.
 				//
@@ -1524,12 +1534,12 @@ void GameClient::xfer( Xfer *xfer )
 				const ThingTemplate* drawTemplate = draw->getTemplate();
 				if (drawTemplate->getFinalOverride() != thingTemplate->getFinalOverride())
 				{
-					TheGameClient->destroyDrawable( draw );
+					destroyDrawable( draw );
 					draw = TheThingFactory->newDrawable( thingTemplate );
 					TheGameLogic->bindObjectAndDrawable(object, draw);
 				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1538,18 +1548,18 @@ void GameClient::xfer( Xfer *xfer )
 				// whole brand new drawable now
 				//
 				draw = TheThingFactory->newDrawable( thingTemplate );
-				
+
 				// sanity
 				if( draw == NULL )
 				{
 
-					DEBUG_CRASH(( "GameClient::xfer - Unable to create drawable for '%s'\n",
+					DEBUG_CRASH(( "GameClient::xfer - Unable to create drawable for '%s'",
 												thingTemplate->getName().str() ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
-			}  // end else
+			}
 
 			// xfer the drawable data
 			xfer->xferSnapshot( draw );
@@ -1557,10 +1567,10 @@ void GameClient::xfer( Xfer *xfer )
 			// end block (not necessary since this is a no-op but symettrically nice)
 			xfer->endBlock();
 
-		}  // end for, i
+		}
+
+	}
 
-	}  // end else, load
-	
 	// xfer the in-game mission briefing history list
 	if (version >= 2)
 	{
@@ -1569,11 +1579,11 @@ void GameClient::xfer( Xfer *xfer )
 			BriefingList *bList = GetBriefingTextList();
 			Int numEntries = bList->size();
 			xfer->xferInt(&numEntries);
-			DEBUG_LOG(("Saving %d briefing lines\n", numEntries));
+			DEBUG_LOG(("Saving %d briefing lines", numEntries));
 			for (BriefingList::const_iterator bIt = bList->begin(); bIt != bList->end(); ++bIt)
 			{
 				AsciiString tempStr = *bIt;
-				DEBUG_LOG(("'%s'\n", tempStr.str()));
+				DEBUG_LOG(("'%s'", tempStr.str()));
 				xfer->xferAsciiString(&tempStr);
 			}
 		}
@@ -1581,19 +1591,19 @@ void GameClient::xfer( Xfer *xfer )
 		{
 			Int numEntries = 0;
 			xfer->xferInt(&numEntries);
-			DEBUG_LOG(("Loading %d briefing lines\n", numEntries));
+			DEBUG_LOG(("Loading %d briefing lines", numEntries));
 			UpdateDiplomacyBriefingText(AsciiString::TheEmptyString, TRUE); // clear out briefing list first
 			while (numEntries-- > 0)
 			{
 				AsciiString tempStr;
 				xfer->xferAsciiString(&tempStr);
-				DEBUG_LOG(("'%s'\n", tempStr.str()));
+				DEBUG_LOG(("'%s'", tempStr.str()));
 				UpdateDiplomacyBriefingText(tempStr, FALSE);
 			}
 		}
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1611,7 +1621,7 @@ void GameClient::loadPostProcess( void )
 		if( draw->getID() >= m_nextDrawableID )
 			m_nextDrawableID = (DrawableID)((UnsignedInt)draw->getID() + 1);
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -1619,4 +1629,4 @@ void GameClient::loadPostProcess( void )
 void GameClient::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp
index e2e1c782443..cde639ccc56 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/MessageStream.h"
 #include "GameClient/GameClient.h"
@@ -49,8 +49,8 @@ GameMessageDisposition GameClientMessageDispatcher::translateGameMessage(const G
 	if (msg->getType() == GameMessage::MSG_FRAME_TICK)
 		return KEEP_MESSAGE;
 
-	//DEBUG_LOG(("GameClientMessageDispatcher::translateGameMessage() - eating a %s on frame %d\n",
-		//((GameMessage *)msg)->getCommandAsAsciiString().str(), TheGameClient->getFrame()));
+	//DEBUG_LOG(("GameClientMessageDispatcher::translateGameMessage() - eating a %s on frame %d",
+		//((GameMessage *)msg)->getCommandAsString(), TheGameClient->getFrame()));
 
 	return DESTROY_MESSAGE;
-}  // end clientMessageDispatcher
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp
index 9bf84dfb152..8f0a037f538 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright(C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright(C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -40,15 +40,14 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameText.h"
 #include "Common/Language.h"
 #include "Common/Registry.h"
-#include "GameClient/ClientInstance.h"
 #include "GameClient/LanguageFilter.h"
 #include "Common/Debug.h"
 #include "Common/UnicodeString.h"
@@ -56,26 +55,22 @@
 #include "Common/GlobalData.h"
 #include "Common/file.h"
 #include "Common/FileSystem.h"
+#include "Common/version.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 Bool g_useStringFile = TRUE;
 #endif
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 #define CSF_ID ( ('C'<<24) | ('S'<<16) | ('F'<<8) | (' ') )
@@ -88,11 +83,11 @@ Bool g_useStringFile = TRUE;
 #define CSF_FILE 1
 #define MAX_UITEXT_LENGTH (10*1024)
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 //===============================
-// StringInfo 
+// StringInfo
 //===============================
 
 struct StringInfo
@@ -109,7 +104,7 @@ struct StringLookUp
 };
 
 //===============================
-// CSFHeader 
+// CSFHeader
 //===============================
 
 struct CSFHeader
@@ -124,7 +119,7 @@ struct CSFHeader
 };
 
 //===============================
-// struct NoString 
+// struct NoString
 //===============================
 
 struct NoString
@@ -135,7 +130,7 @@ struct NoString
 
 
 //===============================
-// GameTextManager 
+// GameTextManager
 //===============================
 
 class GameTextManager : public GameTextInterface
@@ -145,13 +140,18 @@ class GameTextManager : public GameTextInterface
 		GameTextManager();
 		virtual ~GameTextManager();
 
-		virtual void					init( void );						///< Initlaizes the text system
-		virtual void					deinit( void );					///< De-initlaizes the text system
+		virtual void					init( void );						///< Initializes the text system
+		virtual void					deinit( void );					///< Shuts down the text system
 		virtual void					update( void ) {};			///< update text manager
 		virtual void					reset( void );					///< Resets the text system
 
 		virtual UnicodeString fetch( const Char *label, Bool *exists = NULL );		///< Returns the associated labeled unicode text
 		virtual UnicodeString fetch( AsciiString label, Bool *exists = NULL );		///< Returns the associated labeled unicode text
+		virtual UnicodeString fetchFormat( const Char *label, ... );
+		virtual UnicodeString fetchOrSubstitute( const Char *label, const WideChar *substituteText );
+		virtual UnicodeString fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... );
+		virtual UnicodeString fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args );
+
 		virtual AsciiStringVec& getStringsWithLabelPrefix(AsciiString label);
 
 		virtual void					initMapStringFile( const AsciiString& filename );
@@ -164,11 +164,11 @@ class GameTextManager : public GameTextInterface
 		Char						m_buffer2[MAX_UITEXT_LENGTH];
 		Char						m_buffer3[MAX_UITEXT_LENGTH];
 		WideChar				m_tbuffer[MAX_UITEXT_LENGTH*2];
-		
+
 		StringInfo			*m_stringInfo;
 		StringLookUp		*m_stringLUT;
 		Bool						m_initialized;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		Bool						m_jabberWockie;
 		Bool						m_munkee;
 #endif
@@ -201,31 +201,31 @@ class GameTextManager : public GameTextInterface
 
 static int _cdecl			compareLUT ( const void *,  const void*);
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 GameTextInterface *TheGameText = NULL;
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 //============================================================================
@@ -249,7 +249,7 @@ GameTextManager::GameTextManager()
 	m_stringLUT(NULL),
 	m_initialized(FALSE),
 	m_noStringList(NULL),
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	m_jabberWockie(FALSE),
 	m_munkee(FALSE),
 	m_useStringFile(g_useStringFile),
@@ -258,16 +258,13 @@ GameTextManager::GameTextManager()
 #endif
 	m_mapStringInfo(NULL),
 	m_mapStringLUT(NULL),
-	m_failed(L"***FATAL*** String Manager failed to initilaize properly")
+	m_failed(L"***FATAL*** String Manager failed to initialize properly")
 {
-	// Added By Sadullah Nader
-	// Initializations missing and needed
-
 	for(Int i=0; i < MAX_UITEXT_LENGTH; i++)
 	{
-		m_buffer[i] = 0; 
-		m_buffer2[i] = 0; 
-		m_buffer3[i] = 0; 
+		m_buffer[i] = 0;
+		m_buffer2[i] = 0;
+		m_buffer3[i] = 0;
 	}
 	//
 }
@@ -279,7 +276,7 @@ GameTextManager::GameTextManager()
 GameTextManager::~GameTextManager()
 {
 	deinit();
-}							
+}
 
 //============================================================================
 // GameTextManager::init
@@ -302,7 +299,7 @@ void GameTextManager::init( void )
 	m_initialized = TRUE;
 
 	m_maxLabelLen = 0;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if(TheGlobalData)
 	{
 		m_jabberWockie = TheGlobalData->m_jabberOn;
@@ -370,25 +367,6 @@ void GameTextManager::init( void )
 
 	qsort( m_stringLUT, m_textCount, sizeof(StringLookUp), compareLUT  );
 
-	UnicodeString ourName = fetch("GUI:Command&ConquerGenerals");
-
-	if (rts::ClientInstance::getInstanceId() > 1u)
-	{
-		UnicodeString s;
-		s.format(L"Instance:%.2u - %s", rts::ClientInstance::getInstanceId(), ourName.str());
-		ourName = s;
-	}
-
-	AsciiString ourNameA;
-	ourNameA.translate(ourName);	//get ASCII version for Win 9x
-
-	extern HWND ApplicationHWnd;  ///< our application window handle
-	if (ApplicationHWnd) {
-		//Set it twice because Win 9x does not support SetWindowTextW.
-		::SetWindowText(ApplicationHWnd, ourNameA.str());
-		::SetWindowTextW(ApplicationHWnd, ourName.str());
-	}
-
 }
 
 //============================================================================
@@ -398,31 +376,27 @@ void GameTextManager::init( void )
 void GameTextManager::deinit( void )
 {
 
-	if( m_stringInfo != NULL )
-	{
-		delete [] m_stringInfo;
-		m_stringInfo = NULL;
-	}
+	delete [] m_stringInfo;
+	m_stringInfo = NULL;
 
-	if( m_stringLUT != NULL )
-	{
-		delete [] m_stringLUT;
-		m_stringLUT = NULL;
-	}
+	delete [] m_stringLUT;
+	m_stringLUT = NULL;
 
 	m_textCount = 0;
 
 	NoString *noString = m_noStringList;
 
-	DEBUG_LOG(("\n*** Missing strings ***\n"));
+	DEBUG_LOG_RAW(("\n"));
+	DEBUG_LOG(("*** Missing strings ***"));
 	while ( noString )
 	{
-		DEBUG_LOG(("*** %ls ***\n", noString->text.str()));
+		DEBUG_LOG(("*** %ls ***", noString->text.str()));
 		NoString *next = noString->next;
 		delete noString;
 		noString = next;
 	}
-	DEBUG_LOG(("*** End missing strings ***\n\n"));
+	DEBUG_LOG(("*** End missing strings ***"));
+	DEBUG_LOG_RAW(("\n"));
 
 	m_noStringList = NULL;
 
@@ -435,22 +409,16 @@ void GameTextManager::deinit( void )
 
 void GameTextManager::reset( void )
 {
-	if( m_mapStringInfo != NULL )
-	{
-		delete [] m_mapStringInfo;
-		m_mapStringInfo = NULL;
-	}
+	delete [] m_mapStringInfo;
+	m_mapStringInfo = NULL;
 
-	if( m_mapStringLUT != NULL )
-	{
-		delete [] m_mapStringLUT;
-		m_mapStringLUT = NULL;
-	}
+	delete [] m_mapStringLUT;
+	m_mapStringLUT = NULL;
 }
 
 
 //============================================================================
-// GameTextManager::stripSpaces 
+// GameTextManager::stripSpaces
 //============================================================================
 
 void GameTextManager::stripSpaces ( WideChar *string )
@@ -497,7 +465,7 @@ void GameTextManager::stripSpaces ( WideChar *string )
 }
 
 //============================================================================
-// GameTextManager::removeLeadingAndTrailing 
+// GameTextManager::removeLeadingAndTrailing
 //============================================================================
 
 void GameTextManager::removeLeadingAndTrailing ( Char *buffer )
@@ -514,7 +482,7 @@ void GameTextManager::removeLeadingAndTrailing ( Char *buffer )
 
 	while ( (*ptr++ = *first++) != 0 );
 
-	ptr -= 2;;
+	ptr -= 2;
 
 	while ( (ptr > buffer) && (ch = *ptr) != 0 && iswspace ( ch ) )
 	{
@@ -628,6 +596,7 @@ void GameTextManager::readToEndOfQuote( File *file, Char *in, Char *out, Char *w
 				}
 
 				state = 1;
+				FALLTHROUGH;
 			case 1:
 				if ( ( ch >= 'a' && ch <= 'z') || ( ch >= 'A' && ch <='Z') || (ch >= '0' && ch <= '9') || ch == '_' )
 				{
@@ -636,6 +605,7 @@ void GameTextManager::readToEndOfQuote( File *file, Char *in, Char *out, Char *w
 					break;
 				}
 				state = 2;
+				FALLTHROUGH;
 			case 2:
 				break;
 		}
@@ -656,7 +626,7 @@ void GameTextManager::readToEndOfQuote( File *file, Char *in, Char *out, Char *w
 
 
 //============================================================================
-// GameTextManager::reverseWord 
+// GameTextManager::reverseWord
 //============================================================================
 
 void GameTextManager::reverseWord ( Char *file, Char *lp )
@@ -704,7 +674,7 @@ void GameTextManager::translateCopy( WideChar *outbuf, Char *inbuf )
 {
 	Int slash = FALSE;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if ( m_jabberWockie )
 	{
 		static Char buffer[MAX_UITEXT_LENGTH*2];
@@ -835,8 +805,8 @@ Bool GameTextManager::getStringCount( const char *filename, Int& textCount )
 
 	File *file;
 	file = TheFileSystem->openFile(filename, File::READ | File::TEXT);
-	DEBUG_LOG(("Looking in %s for string file\n", filename));
-	
+	DEBUG_LOG(("Looking in %s for string file", filename));
+
 	if ( file == NULL )
 	{
 		return FALSE;
@@ -855,7 +825,7 @@ Bool GameTextManager::getStringCount( const char *filename, Int& textCount )
 				m_buffer[ len+1] = 0;
 			readToEndOfQuote( file, &m_buffer[1], m_buffer2, m_buffer3, MAX_UITEXT_LENGTH );
 		}
-		else if( !stricmp( m_buffer, "END") )
+		else if( stricmp( m_buffer, "END") == 0 )
 		{
 			textCount++;
 		}
@@ -868,7 +838,7 @@ Bool GameTextManager::getStringCount( const char *filename, Int& textCount )
 }
 
 //============================================================================
-// GameTextManager::getCSFInfo 
+// GameTextManager::getCSFInfo
 //============================================================================
 
 Bool GameTextManager::getCSFInfo ( const Char *filename )
@@ -876,7 +846,7 @@ Bool GameTextManager::getCSFInfo ( const Char *filename )
 	CSFHeader header;
 	Int ok = FALSE;
 	File *file = TheFileSystem->openFile(filename, File::READ | File::BINARY);
-	DEBUG_LOG(("Looking in %s for compiled string file\n", filename));
+	DEBUG_LOG(("Looking in %s for compiled string file", filename));
 
 	if ( file != NULL )
 	{
@@ -982,19 +952,19 @@ Bool GameTextManager::parseCSF( const Char *filename )
 			{
 				// only use the first string found
 				m_tbuffer[len] = 0;
-				
+
 				{
 					WideChar *ptr;
-				
+
 					ptr = m_tbuffer;
-				
+
 					while ( *ptr )
 					{
 						*ptr = ~*ptr;
 						ptr++;
 					}
 				}
-				
+
 				stripSpaces ( m_tbuffer );
 				m_stringInfo[listCount].text = m_tbuffer;
 			}
@@ -1043,7 +1013,7 @@ Bool GameTextManager::parseStringFile( const char *filename )
 	Int ok = TRUE;
 
 	File *file = TheFileSystem->openFile(filename, File::READ | File::TEXT);
-	
+
 	if ( file == NULL )
 	{
 		return FALSE;
@@ -1066,7 +1036,7 @@ Bool GameTextManager::parseStringFile( const char *filename )
 
 		for ( Int i = 0; i < listCount; i++ )
 		{
-			if ( !stricmp ( m_stringInfo[i].label.str(), m_buffer ))
+			if ( stricmp ( m_stringInfo[i].label.str(), m_buffer ) == 0)
 			{
 				DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' multiply defined!", m_buffer ));
 			}
@@ -1111,13 +1081,13 @@ Bool GameTextManager::parseStringFile( const char *filename )
 					// Copy string into new home
 					translateCopy( m_tbuffer, m_buffer2 );
 					stripSpaces ( m_tbuffer );
-					
+
 					m_stringInfo[listCount].text = m_tbuffer ;
 					m_stringInfo[listCount].speech = m_buffer3;
 					readString = TRUE;
 				}
 			}
-			else if ( !stricmp ( m_buffer, "END" ))
+			else if ( stricmp ( m_buffer, "END" ) == 0)
 			{
 				break;
 			}
@@ -1174,7 +1144,7 @@ Bool GameTextManager::parseMapStringFile( const char *filename )
 
 	File *file;
 
-	file = TheFileSystem->openFile(filename, File::READ | File::TEXT);	
+	file = TheFileSystem->openFile(filename, File::READ | File::TEXT);
 	if ( file == NULL )
 	{
 		return FALSE;
@@ -1197,7 +1167,7 @@ Bool GameTextManager::parseMapStringFile( const char *filename )
 
 		for ( Int i = 0; i < listCount; i++ )
 		{
-			if ( !stricmp ( m_mapStringInfo[i].label.str(), m_buffer ))
+			if ( stricmp ( m_mapStringInfo[i].label.str(), m_buffer ) == 0)
 			{
 				DEBUG_ASSERTCRASH ( FALSE, ("String label '%s' multiply defined!", m_buffer ));
 			}
@@ -1246,13 +1216,13 @@ Bool GameTextManager::parseMapStringFile( const char *filename )
 					UnicodeString text = UnicodeString(m_tbuffer);
 					if (TheLanguageFilter)
 						TheLanguageFilter->filterLine(text);
-					
+
 					m_mapStringInfo[listCount].text = text;
 					m_mapStringInfo[listCount].speech = m_buffer3;
 					readString = TRUE;
 				}
 			}
-			else if ( !stricmp ( m_buffer, "END" ))
+			else if ( stricmp ( m_buffer, "END" ) == 0)
 			{
 				break;
 			}
@@ -1319,7 +1289,7 @@ UnicodeString GameTextManager::fetch( const Char *label, Bool *exists )
 			noString = noString->next;
 		}
 
-		//DEBUG_LOG(("*** MISSING:'%s' ***\n", label));
+		//DEBUG_LOG(("*** MISSING:'%s' ***", label));
 		// Remember file could have been altered at this point.
 		noString = NEW NoString;
 		noString->text = missingString;
@@ -1327,7 +1297,7 @@ UnicodeString GameTextManager::fetch( const Char *label, Bool *exists )
 		m_noStringList = noString;
 		return noString->text;
 	}
-	if( exists )	
+	if( exists )
 		*exists = TRUE;
 	return lookUp->info->text;
 }
@@ -1341,6 +1311,77 @@ UnicodeString GameTextManager::fetch( AsciiString label, Bool *exists )
 	return fetch(label.str(), exists);
 }
 
+//============================================================================
+// *GameTextManager::fetchFormat
+//============================================================================
+
+UnicodeString GameTextManager::fetchFormat( const Char *label, ... )
+{
+	Bool exists;
+	UnicodeString str = fetch(label, &exists);
+	if (exists)
+	{
+		UnicodeString strFormat;
+
+		va_list args;
+		va_start(args, label);
+		strFormat.format_va(str.str(), args);
+		va_end(args);
+
+		str = strFormat;
+	}
+	return str;
+}
+
+//============================================================================
+// GameTextManager::fetchOrSubstitute
+//============================================================================
+
+UnicodeString GameTextManager::fetchOrSubstitute( const Char *label, const WideChar *substituteText )
+{
+	Bool exists;
+	UnicodeString str = fetch(label, &exists);
+	if (!exists)
+		str = substituteText;
+	return str;
+}
+
+//============================================================================
+// GameTextManager::fetchOrSubstituteFormat
+//============================================================================
+
+UnicodeString GameTextManager::fetchOrSubstituteFormat( const Char *label, const WideChar *substituteFormat, ... )
+{
+	va_list args;
+	va_start(args, substituteFormat);
+	UnicodeString str = fetchOrSubstituteFormatVA(label, substituteFormat, args);
+	va_end(args);
+
+	return str;
+}
+
+//============================================================================
+// GameTextManager::fetchOrSubstituteFormatVA
+//============================================================================
+
+UnicodeString GameTextManager::fetchOrSubstituteFormatVA( const Char *label, const WideChar *substituteFormat, va_list args )
+{
+	Bool exists;
+	UnicodeString str = fetch(label, &exists);
+	if (exists)
+	{
+		UnicodeString strFormat;
+		strFormat.format_va(strFormat.str(), args);
+		str = strFormat;
+	}
+	else
+	{
+		str.format_va(substituteFormat, args);
+	}
+
+	return str;
+}
+
 //============================================================================
 // GameTextManager::getStringsWithLabelPrefix
 //============================================================================
@@ -1349,14 +1390,14 @@ AsciiStringVec& GameTextManager::getStringsWithLabelPrefix(AsciiString label)
 {
 	m_asciiStringVec.clear();
 	if (m_stringLUT) {
-		for (int i = 0; i < m_textCount; ++i) {		
+		for (int i = 0; i < m_textCount; ++i) {
 			if (strstr(m_stringLUT[i].label->str(), label.str()) == m_stringLUT[i].label->str()) {
 				m_asciiStringVec.push_back(*m_stringLUT[i].label);
 			}
 		}
 	}
 	if (m_mapStringLUT) {
-		for (int i = 0; i < m_mapTextCount; ++i) {		
+		for (int i = 0; i < m_mapTextCount; ++i) {
 			if (strstr(m_mapStringLUT[i].label->str(), label.str()) == m_mapStringLUT[i].label->str()) {
 				m_asciiStringVec.push_back(*m_mapStringLUT[i].label);
 			}
@@ -1408,7 +1449,7 @@ Char	GameTextManager::readChar( File *file )
 }
 
 //============================================================================
-// GameTextManager::compareLUT 
+// compareLUT
 //============================================================================
 
 static int __cdecl compareLUT ( const void *i1,  const void*i2)
@@ -1418,3 +1459,4 @@ static int __cdecl compareLUT ( const void *i1,  const void*i2)
 
 	return stricmp( lut1->label->str(), lut2->label->str());
 }
+
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp
index cd8357d7b8b..17c88e9480c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GlobalLanguage.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GlobalLanguage.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	GlobalLanguage.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Contains the member functions for the language munkee
 //
 //-----------------------------------------------------------------------------
@@ -52,17 +52,30 @@
 //-----------------------------------------------------------------------------
 #include "PreRTS.h"
 
+#include "Common/AddonCompat.h"
 #include "Common/INI.h"
 #include "Common/Registry.h"
-#include "GameClient/GlobalLanguage.h"
 #include "Common/FileSystem.h"
+#include "Common/UserPreferences.h"
+
+#include "GameClient/Display.h"
+#include "GameClient/GlobalLanguage.h"
 
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-GlobalLanguage *TheGlobalLanguageData = NULL;				///< The global language singalton
+GlobalLanguage *TheGlobalLanguageData = NULL;				///< The global language singleton
 
-static const FieldParse TheGlobalLanguageDataFieldParseTable[] = 
+static const LookupListRec ResolutionFontSizeMethodNames[] =
+{
+	{ "CLASSIC", GlobalLanguage::ResolutionFontSizeMethod_Classic },
+	{ "CLASSIC_NO_CEILING", GlobalLanguage::ResolutionFontSizeMethod_ClassicNoCeiling },
+	{ "STRICT", GlobalLanguage::ResolutionFontSizeMethod_Strict },
+	{ "BALANCED", GlobalLanguage::ResolutionFontSizeMethod_Balanced },
+	{ NULL, 0 }
+};
+
+static const FieldParse TheGlobalLanguageDataFieldParseTable[] =
 {
 	{ "UnicodeFontName",									INI::parseAsciiString,NULL,									offsetof( GlobalLanguage, m_unicodeFontName ) },
 	//{	"UnicodeFontFileName",							INI::parseAsciiString,NULL,									offsetof( GlobalLanguage, m_unicodeFontFileName ) },
@@ -70,9 +83,9 @@ static const FieldParse TheGlobalLanguageDataFieldParseTable[] =
 	{ "MilitaryCaptionSpeed",						INI::parseInt,					NULL,		offsetof( GlobalLanguage, m_militaryCaptionSpeed ) },
 	{ "UseHardWordWrap",						INI::parseBool,					NULL,		offsetof( GlobalLanguage, m_useHardWrap) },
 	{ "ResolutionFontAdjustment",						INI::parseReal,					NULL,		offsetof( GlobalLanguage, m_resolutionFontSizeAdjustment) },
-	
+	{ "ResolutionFontSizeMethod", INI::parseLookupList, ResolutionFontSizeMethodNames, offsetof( GlobalLanguage, m_resolutionFontSizeMethod) },
 	{ "CopyrightFont",					GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_copyrightFont ) },
-	{ "MessageFont",					GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_messageFont) },					
+	{ "MessageFont",					GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_messageFont) },
 	{ "MilitaryCaptionTitleFont",		GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_militaryCaptionTitleFont) },
 	{ "MilitaryCaptionDelayMS",					INI::parseInt,					NULL,		offsetof( GlobalLanguage, m_militaryCaptionDelayMS ) },
 	{ "MilitaryCaptionFont",			GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_militaryCaptionFont) },
@@ -90,7 +103,7 @@ static const FieldParse TheGlobalLanguageDataFieldParseTable[] =
 	{ "CreditsMinorTitleFont",				GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_creditsPositionFont) },
 	{ "CreditsNormalFont",				GlobalLanguage::parseFontDesc,	NULL,	offsetof( GlobalLanguage, m_creditsNormalFont) },
 
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
+	{ NULL,					NULL,						NULL,						0 }
 };
 
 //-----------------------------------------------------------------------------
@@ -102,7 +115,7 @@ void INI::parseLanguageDefinition( INI *ini )
 	{
 		DEBUG_ASSERTCRASH(TheGlobalLanguageData, ("INI::parseLanguageDefinition - TheGlobalLanguage Data is not around, please create it before trying to parse the ini file."));
 		return;
-	}  // end if
+	}
 	// parse the ini weapon definition
 	ini->initFromINI( TheGlobalLanguageData, TheGlobalLanguageDataFieldParseTable );
 }
@@ -110,15 +123,15 @@ void INI::parseLanguageDefinition( INI *ini )
 GlobalLanguage::GlobalLanguage()
 {
 	m_unicodeFontName.clear();
-	//Added By Sadullah Nader
-	//Initializations missing and needed
 	m_unicodeFontFileName.clear();
 	m_unicodeFontName.clear();
 	m_militaryCaptionSpeed = 0;
 	m_useHardWrap = FALSE;
 	m_resolutionFontSizeAdjustment = 0.7f;
+	m_resolutionFontSizeMethod = ResolutionFontSizeMethod_Default;
 	m_militaryCaptionDelayMS = 750;
-	//End Add
+
+	m_userResolutionFontSizeAdjustment = -1.0f;
 }
 
 GlobalLanguage::~GlobalLanguage()
@@ -133,27 +146,16 @@ GlobalLanguage::~GlobalLanguage()
 	}
 }
 
-void GlobalLanguage::init( void ) 
+void GlobalLanguage::init( void )
 {
+	{
+		AsciiString fname;
+		fname.format("Data\\%s\\Language", GetRegistryLanguage().str());
 
-	INI ini;
-	AsciiString fname;
-	fname.format("Data\\%s\\Language.ini", GetRegistryLanguage().str());
-
-	OSVERSIONINFO	osvi;
-	osvi.dwOSVersionInfoSize=sizeof(OSVERSIONINFO);
-
-	//GS NOTE: Must call doesFileExist in either case so that NameKeyGenerator will stay in sync
-	AsciiString tempName;
-	tempName.format("Data\\%s\\Language9x.ini", GetRegistryLanguage().str());
-	bool isExist = TheFileSystem->doesFileExist(tempName.str());
-	if (GetVersionEx(&osvi)  &&  osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS  && isExist)
-	{	//check if we're running Win9x variant since they may need different fonts
-		fname = tempName;
+		INI ini;
+		ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, NULL );
 	}
 
-
-	ini.load( fname, INI_LOAD_OVERWRITE, NULL );
 	StringListIt it = m_localFonts.begin();
 	while( it != m_localFonts.end())
 	{
@@ -169,7 +171,10 @@ void GlobalLanguage::init( void )
 		++it;
 	}
 
-	
+	// override values with user preferences
+	OptionPreferences optionPref;
+	m_userResolutionFontSizeAdjustment = optionPref.getResolutionFontAdjustment();
+
 }
 void GlobalLanguage::reset( void ) {}
 
@@ -187,18 +192,100 @@ void GlobalLanguage::parseFontFileName( INI *ini, void * instance, void *store,
 	GlobalLanguage *monkey = (GlobalLanguage *)instance;
 	AsciiString asciiString = ini->getNextAsciiString();
 	monkey->m_localFonts.push_front(asciiString);
-}	 
+}
 
-Int GlobalLanguage::adjustFontSize(Int theFontSize) 
+float GlobalLanguage::getResolutionFontSizeAdjustment( void ) const
 {
-	Real adjustFactor = TheGlobalData->m_xResolution/800.0f;
-	adjustFactor = 1.0f + (adjustFactor-1.0f) * m_resolutionFontSizeAdjustment;
-	if (adjustFactor<1.0f) adjustFactor = 1.0f;
-	if (adjustFactor>2.0f) adjustFactor = 2.0f;
+	if (m_userResolutionFontSizeAdjustment >= 0.0f)
+		return m_userResolutionFontSizeAdjustment;
+	else
+		return m_resolutionFontSizeAdjustment;
+}
+
+Int GlobalLanguage::adjustFontSize(Int theFontSize)
+{
+	// TheSuperHackers @todo This function is called very often.
+	// Therefore cache the adjustFactor on resolution change to not recompute it on every call.
+	Real adjustFactor;
+
+	switch (m_resolutionFontSizeMethod)
+	{
+	default:
+	case ResolutionFontSizeMethod_Classic:
+	{
+		// TheSuperHackers @info The original font scaling for this game.
+		// Useful for not breaking legacy Addons and Mods. Scales poorly with large resolutions.
+		adjustFactor = TheDisplay->getWidth() / (Real)DEFAULT_DISPLAY_WIDTH;
+		adjustFactor = 1.0f + (adjustFactor - 1.0f) * getResolutionFontSizeAdjustment();
+		if (adjustFactor > 2.0f)
+			adjustFactor = 2.0f;
+		break;
+	}
+	case ResolutionFontSizeMethod_ClassicNoCeiling:
+	{
+		// TheSuperHackers @feature The original font scaling, but without ceiling.
+		// Useful for not changing the original look of the game. Scales alright with large resolutions.
+		adjustFactor = TheDisplay->getWidth() / (Real)DEFAULT_DISPLAY_WIDTH;
+		adjustFactor = 1.0f + (adjustFactor - 1.0f) * getResolutionFontSizeAdjustment();
+		break;
+	}
+	case ResolutionFontSizeMethod_Strict:
+	{
+		// TheSuperHackers @feature The strict method scales fonts based on the smallest screen
+		// dimension so they scale independent of aspect ratio.
+		const Real wScale = TheDisplay->getWidth() / (Real)DEFAULT_DISPLAY_WIDTH;
+		const Real hScale = TheDisplay->getHeight() / (Real)DEFAULT_DISPLAY_HEIGHT;
+		adjustFactor = min(wScale, hScale);
+		adjustFactor = 1.0f + (adjustFactor - 1.0f) * getResolutionFontSizeAdjustment();
+		break;
+	}
+	case ResolutionFontSizeMethod_Balanced:
+	{
+		// TheSuperHackers @feature The balanced method evenly weighs the display width and height
+		// for a balanced rescale on non 4:3 resolutions. The aspect ratio scaling is clamped to
+		// prevent oversizing.
+		constexpr const Real maxAspect = 1.8f;
+		constexpr const Real minAspect = 1.0f;
+		Real w = TheDisplay->getWidth();
+		Real h = TheDisplay->getHeight();
+		const Real aspect = w / h;
+		Real wScale = w / (Real)DEFAULT_DISPLAY_WIDTH;
+		Real hScale = h / (Real)DEFAULT_DISPLAY_HEIGHT;
+
+		if (aspect > maxAspect)
+		{
+			// Recompute width at max aspect
+			w = maxAspect * h;
+			wScale = w / (Real)DEFAULT_DISPLAY_WIDTH;
+		}
+		else if (aspect < minAspect)
+		{
+			// Recompute height at min aspect
+			h = minAspect * w;
+			hScale = h / (Real)DEFAULT_DISPLAY_HEIGHT;
+		}
+		adjustFactor = (wScale + hScale) * 0.5f;
+		adjustFactor = 1.0f + (adjustFactor - 1.0f) * getResolutionFontSizeAdjustment();
+		break;
+	}
+	}
+
+	if (adjustFactor < 1.0f)
+		adjustFactor = 1.0f;
 	Int pointSize = REAL_TO_INT_FLOOR(theFontSize*adjustFactor);
 	return pointSize;
 }
 
+void GlobalLanguage::parseCustomDefinition()
+{
+	if (addon::HasFullviewportDat())
+	{
+		// TheSuperHackers @tweak xezon 19/08/2025 Force the classic font size adjustment for the old
+		// 'Control Bar Pro' Addons because they use manual font upscaling in higher resolution packages.
+		m_resolutionFontSizeMethod = ResolutionFontSizeMethod_Classic;
+	}
+}
+
 FontDesc::FontDesc(void)
 {
 	name = "Arial Unicode MS";	///<name of font
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GraphDraw.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GraphDraw.cpp
index 3db0c78a279..76aff3d7c53 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GraphDraw.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GraphDraw.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GraphDraw.cpp ////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,8 +37,8 @@
 //	Filename: 	GraphDraw.cpp
 //
 //	author:		John McDonald
-//	
-//	purpose:	Contains the functions to queue up and display a single graph for 
+//
+//	purpose:	Contains the functions to queue up and display a single graph for
 //						each frame
 //
 //-----------------------------------------------------------------------------
@@ -91,18 +91,18 @@ void GraphDraw::render()
 	Int height = TheDisplay->getHeight();
 
 	Int totalCount = m_graphEntries.size();
-	DEBUG_ASSERTCRASH(totalCount < MAX_GRAPH_VALUES, ("MAX_GRAPH_VALUES must be increased, not all labels will appear (max %d, cur %d).\n",MAX_GRAPH_VALUES,totalCount));
-	DEBUG_ASSERTCRASH(BAR_HEIGHT * totalCount < height, ("BAR_HEIGHT must be reduced, as bars are being drawn off-screen.\n"));
+	DEBUG_ASSERTCRASH(totalCount < MAX_GRAPH_VALUES, ("MAX_GRAPH_VALUES must be increased, not all labels will appear (max %d, cur %d).",MAX_GRAPH_VALUES,totalCount));
+	DEBUG_ASSERTCRASH(BAR_HEIGHT * totalCount < height, ("BAR_HEIGHT must be reduced, as bars are being drawn off-screen."));
 	VecGraphEntriesIt it;
 
 	Int count = 0;
 	for (it = m_graphEntries.begin(); it != m_graphEntries.end(); ++it) {
-		
+
 		if (count < MAX_GRAPH_VALUES) {
 			// draw the label.
 			UnicodeString uniStr;
 			uniStr.translate(it->first);
-		
+
 			m_displayStrings[count]->setText(uniStr);
 			m_displayStrings[count]->draw(5, count * BAR_HEIGHT, 0xFFFFFFFF, 0x00000000, 1, 1);
 		}
@@ -121,4 +121,4 @@ void GraphDraw::clear()
 
 GraphDraw *TheGraphDraw = NULL;
 
-#endif /* PERF_TIMERS */
\ No newline at end of file
+#endif /* PERF_TIMERS */
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
index f969e598375..278f66ec7dd 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -23,18 +23,19 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // InGameUI.cpp ///////////////////////////////////////////////////////////////////////////////////
-// Implementation of in-game user interface singleton inteface
+// Implementation of in-game user interface singleton
 // Author: Michael S. Booth, March 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_SHADOW_NAMES
 
 #include "Common/ActionManager.h"
+#include "Common/FramePacer.h"
 #include "Common/GameAudio.h"
-#include "Common/GameEngine.h"
 #include "Common/GameType.h"
+#include "Common/GameUtility.h"
 #include "Common/MessageStream.h"
 #include "Common/PerfTimer.h"
 #include "Common/Player.h"
@@ -45,7 +46,6 @@
 #include "Common/ThingTemplate.h"
 #include "Common/BuildAssistant.h"
 #include "Common/Recorder.h"
-#include "Common/BuildAssistant.h"
 #include "Common/SpecialPower.h"
 
 #include "GameClient/Anim2D.h"
@@ -66,8 +66,7 @@
 #include "GameClient/Mouse.h"
 #include "GameClient/GadgetStaticText.h"
 #include "GameClient/View.h"
-#include "GameClient/TerrainVisual.h"	
-#include "GameClient/ControlBar.h"
+#include "GameClient/TerrainVisual.h"
 #include "GameClient/Display.h"
 #include "GameClient/WindowLayout.h"
 #include "GameClient/LookAtXlat.h"
@@ -88,18 +87,47 @@
 #include "GameLogic/Module/SupplyWarehouseDockUpdate.h"
 #include "GameLogic/Module/MobMemberSlavedUpdate.h"//ML
 
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.		 
+#include "GameNetwork/NetworkInterface.h"
+
+#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // ------------------------------------------------------------------------------------------------
-static const Real placementOpacity = 0.45f;
-static const RGBColor illegalBuildColor = { 1.0, 0.0, 0.0 };
+static const RGBColor IllegalBuildColor = { 1.0, 0.0, 0.0 };
+
+// ------------------------------------------------------------------------------------------------
+static UnicodeString formatMoneyValue(UnsignedInt amount)
+{
+	UnicodeString result;
+	if (amount >= 100000)
+	{
+		result.format(L"%uk", amount / 1000);
+	}
+	else
+	{
+		result.format(L"%u", amount);
+	}
+	return result;
+}
+
+static UnicodeString formatIncomeValue(UnsignedInt cashPerMin)
+{
+	UnicodeString result;
+	if (cashPerMin >= 10000)
+	{
+		result.format(L"%uk", cashPerMin / 1000);
+	}
+	else if (cashPerMin >= 1000)
+	{
+		result.format(L"%u", (cashPerMin / 100) * 100);
+	}
+	else
+	{
+		result.format(L"%u", (cashPerMin / 10) * 10);
+	}
+	return result;
+}
 
 //-------------------------------------------------------------------------------------------------
 /// The InGameUI singleton instance.
@@ -123,7 +151,7 @@ static Bool kindOfUnitSelection( Drawable *test, void *userData )
 	if( test )
 	{
 		const Object *object = test->getObject();
-		// Only things with objects can be selected, and the code below isn't 
+		// Only things with objects can be selected, and the code below isn't
 		// safe unless you've verified that there is a valid object.
 		if (!object)
 			return FALSE;
@@ -131,10 +159,10 @@ static Bool kindOfUnitSelection( Drawable *test, void *userData )
 		Bool isKindOfMatch = object->isKindOfMulti(data->m_mustbeSet, data->m_mustbeClear);
 
 		// only select objects if not already selected
-		if( object && isKindOfMatch 
-					&& object->isLocallyControlled() 
-					&& !object->isContained() 
-					&& !object->getDrawable()->isSelected() 
+		if( object && isKindOfMatch
+					&& object->isLocallyControlled()
+					&& !object->isContained()
+					&& !object->getDrawable()->isSelected()
 					&& !object->isEffectivelyDead()
 					&& object->isMassSelectable()
 					&& !object->isOffMap()
@@ -157,7 +185,7 @@ static Bool kindOfUnitSelection( Drawable *test, void *userData )
 				TheInGameUI->setDisplayedMaxWarning( FALSE );
 				data->newlySelectedDrawables.push_back(test);
 				return TRUE;
-			}	
+			}
 		}
 	}
 	return FALSE;
@@ -179,7 +207,7 @@ static Bool similarUnitSelection( Drawable *test, void *userData )
 	if( test )
 	{
 		const Object *object = test->getObject();
-		// Only things with objects can be selected, and the code below isn't 
+		// Only things with objects can be selected, and the code below isn't
 		// safe unless you've verified that there is a valid object.
 		if (!object)
 			return FALSE;
@@ -191,10 +219,10 @@ static Bool similarUnitSelection( Drawable *test, void *userData )
 		}
 
 		// only select objects if not already selected
-		if( object && isEquivalent 
-			  && object->isLocallyControlled() 
+		if( object && isEquivalent
+			  && object->isLocallyControlled()
 				&& !object->isContained()
-				&& !( object->getDrawable()->isSelected() ) 
+				&& !( object->getDrawable()->isSelected() )
 				&& object->isMassSelectable() // And only if they can be multiply selected. (otherwise the drawable will be, but the object will not be)
 				&& !object->isOffMap()
 				)
@@ -216,7 +244,7 @@ static Bool similarUnitSelection( Drawable *test, void *userData )
 				TheInGameUI->setDisplayedMaxWarning( FALSE );
 				data->newlySelectedDrawables.push_back(test);
 				return TRUE;
-			}	
+			}
 		}
 	}
 	return FALSE;
@@ -263,10 +291,10 @@ SuperweaponInfo::SuperweaponInfo(
 	Bool hiddenByScience,
 	Bool ready,
   Bool evaReadyPlayed,
-	const AsciiString& superweaponNormalFont, 
-	Int superweaponNormalPointSize, 
+	const AsciiString& superweaponNormalFont,
+	Int superweaponNormalPointSize,
 	Bool superweaponNormalBold,
-	Color c, 
+	Color c,
 	const SpecialPowerTemplate* spt
 ) :
 	m_id(id),
@@ -309,9 +337,9 @@ SuperweaponInfo::~SuperweaponInfo()
 // ------------------------------------------------------------------------------------------------
 void SuperweaponInfo::setFont(const AsciiString& superweaponNormalFont, Int superweaponNormalPointSize, Bool superweaponNormalBold)
 {
-	m_nameDisplayString->setFont( TheFontLibrary->getFont( superweaponNormalFont, 
+	m_nameDisplayString->setFont( TheFontLibrary->getFont( superweaponNormalFont,
 		TheGlobalLanguageData->adjustFontSize(superweaponNormalPointSize), superweaponNormalBold ) );
-	m_timeDisplayString->setFont( TheFontLibrary->getFont( superweaponNormalFont, 
+	m_timeDisplayString->setFont( TheFontLibrary->getFont( superweaponNormalFont,
 		TheGlobalLanguageData->adjustFontSize(superweaponNormalPointSize), superweaponNormalBold ) );
 }
 
@@ -351,12 +379,12 @@ Real SuperweaponInfo::getHeight() const
 void InGameUI::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Save NamedTimers, but not specifically their Info structs.  We'll recreate them.
   * 3: Added m_evaReadyPlayed boolean to transfer
 */
@@ -425,7 +453,7 @@ void InGameUI::xfer( Xfer *xfer )
 
 					// since this list tends to be somewhat sparse, we write stuff out pretty explicitly.
 					xfer->xferInt(&playerIndex);
-					
+
 					AsciiString templateName = swInfo->getSpecialPowerTemplate()->getName();
 
 					xfer->xferAsciiString(&templateName);
@@ -458,7 +486,7 @@ void InGameUI::xfer( Xfer *xfer )
 			}
 			else if (playerIndex < 0 || playerIndex >= MAX_PLAYER_COUNT)
 			{
-				DEBUG_CRASH(("SWInfo bad plyrindex\n"));
+				DEBUG_CRASH(("SWInfo bad plyrindex"));
 				throw INI_INVALID_DATA;
 			}
 
@@ -467,7 +495,7 @@ void InGameUI::xfer( Xfer *xfer )
 			const SpecialPowerTemplate* powerTemplate = TheSpecialPowerStore->findSpecialPowerTemplate(templateName);
 			if (powerTemplate == NULL)
 			{
-				DEBUG_CRASH(("power %s not found\n",templateName.str()));
+				DEBUG_CRASH(("power %s not found",templateName.str()));
 				throw INI_INVALID_DATA;
 			}
 
@@ -492,7 +520,7 @@ void InGameUI::xfer( Xfer *xfer )
       }
 
 			// srj sez: due to order-of-operation stuff, sometimes these will already exist,
-			// sometimes not. not sure why. so handle both cases. 
+			// sometimes not. not sure why. so handle both cases.
 			SuperweaponInfo* swInfo = findSWInfo(playerIndex, powerName, id, powerTemplate);
 			if (swInfo == NULL)
 			{
@@ -504,10 +532,10 @@ void InGameUI::xfer( Xfer *xfer )
 					hiddenByScience,
 					ready,
           evaReadyPlayed,
-					m_superweaponNormalFont, 
-					m_superweaponNormalPointSize, 
-					m_superweaponNormalBold, 
-					player->getPlayerColor(), 
+					m_superweaponNormalFont,
+					m_superweaponNormalPointSize,
+					m_superweaponNormalBold,
+					player->getPlayerColor(),
 					powerTemplate);
 				m_superweapons[playerIndex][powerName].push_back(swInfo);
 			}
@@ -521,7 +549,7 @@ void InGameUI::xfer( Xfer *xfer )
         swInfo->m_evaReadyPlayed = evaReadyPlayed;
 			}
 			swInfo->m_forceUpdateText = true;
-		
+
 		}
 	}
 
@@ -533,7 +561,7 @@ void InGameUI::xfer( Xfer *xfer )
 void InGameUI::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -583,7 +611,7 @@ void InGameUI::addSuperweapon(Int playerIndex, const AsciiString& powerName, Obj
 	Bool hiddenByScience = (powerTemplate->getRequiredScience() != SCIENCE_INVALID) && (player->hasScience(powerTemplate->getRequiredScience()) == false);
 
 #ifndef DO_UNIT_TIMINGS
-  DEBUG_LOG(("Adding superweapon UI timer\n"));
+  DEBUG_LOG(("Adding superweapon UI timer"));
 #endif
 	SuperweaponInfo *info = newInstance(SuperweaponInfo)(
 					id,
@@ -594,10 +622,10 @@ void InGameUI::addSuperweapon(Int playerIndex, const AsciiString& powerName, Obj
 													// the timer never, ever, ever get drawn.... unless the owning object is post-science constructed.
 					FALSE,	// ready
           FALSE,  // evaReadyPlayed
-					m_superweaponNormalFont, 
-					m_superweaponNormalPointSize, 
-					m_superweaponNormalBold, 
-					player->getPlayerColor(), 
+					m_superweaponNormalFont,
+					m_superweaponNormalPointSize,
+					m_superweaponNormalBold,
+					player->getPlayerColor(),
 					powerTemplate);
 
 	m_superweapons[playerIndex][powerName].push_back(info);
@@ -607,7 +635,7 @@ void InGameUI::addSuperweapon(Int playerIndex, const AsciiString& powerName, Obj
 // ------------------------------------------------------------------------------------------------
 Bool InGameUI::removeSuperweapon(Int playerIndex, const AsciiString& powerName, ObjectID id, const SpecialPowerTemplate *powerTemplate)
 {
-	DEBUG_LOG(("Removing superweapon UI timer\n"));
+	DEBUG_LOG(("Removing superweapon UI timer"));
 	SuperweaponMap::iterator mapIt = m_superweapons[playerIndex].find(powerName);
 	if (mapIt != m_superweapons[playerIndex].end())
 	{
@@ -619,7 +647,7 @@ Bool InGameUI::removeSuperweapon(Int playerIndex, const AsciiString& powerName,
 				SuperweaponInfo *info = *listIt;
 				swList.erase(listIt);
 				deleteInstance(info);
-				if (swList.size() == 0)
+				if (swList.empty())
 				{
 					m_superweapons[playerIndex].erase(mapIt);
 				}
@@ -725,20 +753,20 @@ void InGameUI::setSuperweaponDisplayEnabledByScript(Bool enable)
 // ------------------------------------------------------------------------------------------------
 Bool InGameUI::getSuperweaponDisplayEnabledByScript(void) const
 {
-	return m_superweaponHiddenByScript;
+	return !m_superweaponHiddenByScript;
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void InGameUI::addNamedTimer( const AsciiString& timerName, const UnicodeString& text, Bool isCountdown )
 {
-	NamedTimerInfo *info = newInstance( NamedTimerInfo );	
+	NamedTimerInfo *info = newInstance( NamedTimerInfo );
 	info->m_timerName = timerName;
 	info->color = m_namedTimerNormalColor;
 	info->timerText = text;
 	info->displayString = TheDisplayStringManager->newDisplayString();
 	info->displayString->reset();
-	info->displayString->setFont( TheFontLibrary->getFont( m_namedTimerNormalFont, 
+	info->displayString->setFont( TheFontLibrary->getFont( m_namedTimerNormalFont,
 		TheGlobalLanguageData->adjustFontSize(m_namedTimerNormalPointSize), m_namedTimerNormalBold ) );
 	info->displayString->setText( UnicodeString::TheEmptyString );
 	info->timestamp = -1;
@@ -773,7 +801,7 @@ void InGameUI::showNamedTimerDisplay( Bool show )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-const FieldParse InGameUI::s_fieldParseTable[] = 
+const FieldParse InGameUI::s_fieldParseTable[] =
 {
 	{ "MaxSelectionSize",								INI::parseInt,					NULL,		offsetof( InGameUI, m_maxSelectCount ) },
 
@@ -832,7 +860,7 @@ const FieldParse InGameUI::s_fieldParseTable[] =
 	{ "FloatingTextVanishRate",								INI::parseVelocityReal,	NULL,		offsetof( InGameUI, m_floatingTextMoveVanishRate ) },
 
 	{ "PopupMessageColor",								INI::parseColorInt,					NULL,		offsetof( InGameUI, m_popupMessageColor ) },
-	
+
 	{ "DrawableCaptionFont",									INI::parseAsciiString,	NULL,		offsetof( InGameUI, m_drawableCaptionFont ) },
 	{ "DrawableCaptionPointSize",							INI::parseInt,					NULL,		offsetof( InGameUI, m_drawableCaptionPointSize ) },
 	{ "DrawableCaptionBold",									INI::parseBool,					NULL,		offsetof( InGameUI, m_drawableCaptionBold ) },
@@ -859,24 +887,51 @@ const FieldParse InGameUI::s_fieldParseTable[] =
 	{ "SpySatelliteRadiusCursor",		RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_SPYSATELLITE] ) },
 	{ "SpectreGunshipRadiusCursor",	RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_SPECTREGUNSHIP] ) },
 	{ "HelixNapalmBombRadiusCursor",RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_HELIX_NAPALM_BOMB] ) },
-	
-	{ "NuclearMissileRadiusCursor", RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_NUCLEARMISSILE] ) }, 
+
+	{ "NuclearMissileRadiusCursor", RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_NUCLEARMISSILE] ) },
 	{ "EMPPulseRadiusCursor",		  	RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_EMPPULSE] ) },
 	{ "ArtilleryRadiusCursor",		  RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_ARTILLERYBARRAGE] ) },
 	{ "FrenzyRadiusCursor",				  RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_FRENZY] ) },
 	{ "NapalmStrikeRadiusCursor",		RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_NAPALMSTRIKE] ) },
 	{ "ClusterMinesRadiusCursor",		RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_CLUSTERMINES] ) },
-	
-	{ "ScudStormRadiusCursor",			RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_SCUDSTORM] ) }, 
+
+	{ "ScudStormRadiusCursor",			RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_SCUDSTORM] ) },
 	{ "AnthraxBombRadiusCursor",		RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_ANTHRAXBOMB] ) },
-	{ "AmbushRadiusCursor",					RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_AMBUSH] ) }, 
+	{ "AmbushRadiusCursor",					RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_AMBUSH] ) },
 	{ "RadarRadiusCursor",					RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[	RADIUSCURSOR_RADAR] ) },
 	{ "SpyDroneRadiusCursor",				RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[ RADIUSCURSOR_SPYDRONE] ) },
 
 	{ "ClearMinesRadiusCursor",			RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[ RADIUSCURSOR_CLEARMINES] ) },
 	{ "AmbulanceRadiusCursor",			RadiusDecalTemplate::parseRadiusDecalTemplate, NULL, offsetof( InGameUI, m_radiusCursors[ RADIUSCURSOR_AMBULANCE] ) },
 
-	{ NULL,													NULL,										NULL,		0 }  // keep this last
+	// TheSuperHackers @info ui enhancement configuration
+	{ "NetworkLatencyFont",      INI::parseAsciiString,  NULL, offsetof( InGameUI, m_networkLatencyFont ) },
+	{ "NetworkLatencyBold",      INI::parseBool,         NULL, offsetof( InGameUI, m_networkLatencyBold ) },
+	{ "NetworkLatencyPosition",  INI::parseCoord2D,      NULL, offsetof( InGameUI, m_networkLatencyPosition ) },
+	{ "NetworkLatencyColor",     INI::parseColorInt,     NULL, offsetof( InGameUI, m_networkLatencyColor ) },
+	{ "NetworkLatencyDropColor", INI::parseColorInt,     NULL, offsetof( InGameUI, m_networkLatencyDropColor ) },
+
+	{ "RenderFpsFont",          INI::parseAsciiString,  NULL, offsetof( InGameUI, m_renderFpsFont ) },
+	{ "RenderFpsBold",          INI::parseBool,         NULL, offsetof( InGameUI, m_renderFpsBold ) },
+	{ "RenderFpsPosition",      INI::parseCoord2D,      NULL, offsetof( InGameUI, m_renderFpsPosition ) },
+	{ "RenderFpsColor",         INI::parseColorInt,     NULL, offsetof( InGameUI, m_renderFpsColor ) },
+	{ "RenderFpsLimitColor",    INI::parseColorInt,     NULL, offsetof( InGameUI, m_renderFpsLimitColor ) },
+	{ "RenderFpsDropColor",     INI::parseColorInt,     NULL, offsetof( InGameUI, m_renderFpsDropColor ) },
+	{ "RenderFpsRefreshMs",     INI::parseUnsignedInt,  NULL, offsetof( InGameUI, m_renderFpsRefreshMs ) },
+
+	{ "SystemTimeFont",         INI::parseAsciiString,  NULL, offsetof( InGameUI, m_systemTimeFont ) },
+	{ "SystemTimeBold",         INI::parseBool,         NULL, offsetof( InGameUI, m_systemTimeBold ) },
+	{ "SystemTimePosition",     INI::parseCoord2D,      NULL, offsetof( InGameUI, m_systemTimePosition ) },
+	{ "SystemTimeColor",        INI::parseColorInt,     NULL, offsetof( InGameUI, m_systemTimeColor ) },
+	{ "SystemTimeDropColor",    INI::parseColorInt,     NULL, offsetof( InGameUI, m_systemTimeDropColor ) },
+
+	{ "GameTimeFont",           INI::parseAsciiString,  NULL, offsetof( InGameUI, m_gameTimeFont ) },
+	{ "GameTimeBold",           INI::parseBool,         NULL, offsetof( InGameUI, m_gameTimeBold ) },
+	{ "GameTimePosition",       INI::parseCoord2D,      NULL, offsetof( InGameUI, m_gameTimePosition ) },
+	{ "GameTimeColor",          INI::parseColorInt,     NULL, offsetof( InGameUI, m_gameTimeColor ) },
+	{ "GameTimeDropColor",      INI::parseColorInt,     NULL, offsetof( InGameUI, m_gameTimeDropColor ) },
+
+	{ NULL,													NULL,										NULL,		0 }
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -891,13 +946,23 @@ void INI::parseInGameUIDefinition( INI* ini )
 	}
 }
 
+//-------------------------------------------------------------------------------------------------
+namespace
+{
+	// helpers for inline counters
+	constexpr const Int kHudAnchorX = 3;
+	constexpr const Int kHudAnchorY = -1;
+	constexpr const Int kHudGapPx = 6;
+	inline Bool isAtHudAnchorPos(const Coord2D &p) { return p.x == kHudAnchorX && p.y == kHudAnchorY; }
+}
+
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 InGameUI::InGameUI()
 {
 	Int i;
 
-	
+
   m_inputEnabled = true;
 	m_isDragSelecting = false;
 	m_nextMoveHint = 0;
@@ -911,15 +976,13 @@ InGameUI::InGameUI()
 	m_mouseMode = MOUSEMODE_DEFAULT;
 	m_mouseModeCursor = Mouse::ARROW;
 	m_mousedOverDrawableID = INVALID_DRAWABLE_ID;
-	
-	//Added By Sadullah Nader
-	//Initializations missing and needed
+
 	m_currentlyPlayingMovie.clear();
 	m_militarySubtitle = NULL;
 	m_popupMessageData = NULL;
 	m_waypointMode = FALSE;
 	m_clientQuiet = FALSE;
-	
+
 	m_messageColor1 = GameMakeColor( 255, 255, 255, 255 );
 	m_messageColor2 = GameMakeColor( 180, 180, 180, 255 );
 	m_messagePosition.x = 10;
@@ -958,7 +1021,7 @@ InGameUI::InGameUI()
 		m_moveHint[ i ].sourceID = 0;
 		m_moveHint[ i ].frame = 0;
 
-	}  //  end for i
+	}
 
 	for( i = 0; i < MAX_BUILD_PROGRESS; i++ )
 	{
@@ -967,7 +1030,7 @@ InGameUI::InGameUI()
 		m_buildProgress[ i ].m_percentComplete = 0.0f;
 		m_buildProgress[ i ].m_control = NULL;
 
-	}  // end for i
+	}
 
 	m_pendingGUICommand = NULL;
 
@@ -996,11 +1059,56 @@ InGameUI::InGameUI()
 		m_uiMessages[ i ].timestamp = 0;
 		m_uiMessages[ i ].color = 0;
 
-	}  // end for i
+	}
 
 	m_replayWindow = NULL;
 	m_messagesOn = TRUE;
 
+	// TheSuperHackers @info the default font, size and positions of the various counters were chosen based on GenTools implementation
+	m_networkLatencyString = NULL;
+	m_networkLatencyFont = "Tahoma";
+	m_networkLatencyPointSize = TheGlobalData->m_networkLatencyFontSize;
+	m_networkLatencyBold = TRUE;
+	m_networkLatencyPosition.x = kHudAnchorX;
+	m_networkLatencyPosition.y = kHudAnchorY;
+	m_networkLatencyColor = GameMakeColor( 173, 216, 255, 255 );
+	m_networkLatencyDropColor = GameMakeColor( 0, 0, 0, 255 );
+	m_lastNetworkLatencyFrames = ~0u;
+
+	m_renderFpsString = NULL;
+	m_renderFpsLimitString = NULL;
+	m_renderFpsFont = "Tahoma";
+	m_renderFpsPointSize = TheGlobalData->m_renderFpsFontSize;
+	m_renderFpsBold = TRUE;
+	m_renderFpsPosition.x = kHudAnchorX;
+	m_renderFpsPosition.y = kHudAnchorY;
+	m_renderFpsColor = GameMakeColor( 255, 255, 0, 255 );
+	m_renderFpsLimitColor = GameMakeColor(119, 119, 119, 255);
+	m_renderFpsDropColor = GameMakeColor( 0, 0, 0, 255 );
+	m_renderFpsRefreshMs = 1000;
+	m_lastRenderFps = ~0u;
+	m_lastRenderFpsLimit = ~0u;
+	m_lastRenderFpsUpdateMs = 0u;
+
+	m_systemTimeString = NULL;
+	m_systemTimeFont = "Tahoma";
+	m_systemTimePointSize = TheGlobalData->m_systemTimeFontSize;
+	m_systemTimeBold = TRUE;
+	m_systemTimePosition.x = kHudAnchorX; // TheSuperHackers @info relative to the left of the screen
+	m_systemTimePosition.y = kHudAnchorY;
+	m_systemTimeColor = GameMakeColor( 255, 255, 255, 255 );
+	m_systemTimeDropColor = GameMakeColor( 0, 0, 0, 255 );
+
+	m_gameTimeString = NULL;
+	m_gameTimeFrameString = NULL;
+	m_gameTimeFont = "Tahoma";
+	m_gameTimePointSize = TheGlobalData->m_gameTimeFontSize;
+	m_gameTimeBold = TRUE;
+	m_gameTimePosition.x = kHudAnchorX; // TheSuperHackers @info relative to the right of the screen
+	m_gameTimePosition.y = kHudAnchorY;
+	m_gameTimeColor = GameMakeColor( 255, 255, 255, 255 );
+	m_gameTimeDropColor = GameMakeColor( 0, 0, 0, 255 );
+
 	m_superweaponPosition.x = 0.7f;
 	m_superweaponPosition.y = 0.7f;
 	m_superweaponFlashDuration = 1.0f;
@@ -1045,7 +1153,7 @@ InGameUI::InGameUI()
 
 	m_drawRMBScrollAnchor = FALSE;
 	m_moveRMBScrollAnchor = FALSE;
-	m_displayedMaxWarning = FALSE; 
+	m_displayedMaxWarning = FALSE;
 
 	m_idleWorkerWin = NULL;
 	m_currentIdleWorkerDisplay = -1;
@@ -1057,10 +1165,10 @@ InGameUI::InGameUI()
 	m_preferSelection		= false;
 
 	m_curRcType = RADIUSCURSOR_NONE;
-	
+
 	m_soloNexusSelectedDrawableID = INVALID_DRAWABLE_ID;
 
-}  // end InGameUI
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1082,6 +1190,9 @@ InGameUI::~InGameUI()
 	// delete the message resources
 	freeMessageResources();
 
+	// free custom ui strings
+	freeCustomUiResources();
+
 	// delete the array for the drawbles
 	delete [] m_placeIcon;
 	m_placeIcon = NULL;
@@ -1100,7 +1211,7 @@ InGameUI::~InGameUI()
 void InGameUI::init( void )
 {
 	INI ini;
-	ini.load( AsciiString( "Data\\INI\\InGameUI.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\InGameUI", INI_LOAD_OVERWRITE, NULL );
 
 	//override INI values with language localized values:
 	if (TheGlobalLanguageData)
@@ -1165,10 +1276,9 @@ void InGameUI::init( void )
 		TheTacticalView->init();
 		TheDisplay->attachView( TheTacticalView );
 
-		// make the tactical display the full screen width for now
-		TheTacticalView->setWidth( TheDisplay->getWidth());
-		// make the tactical display 0.76 of full screen so no drawing under GUI.
-		TheTacticalView->setHeight( TheDisplay->getHeight() * 0.77f);
+		// make the tactical display the full screen width and height
+		TheTacticalView->setWidth( TheDisplay->getWidth() );
+		TheTacticalView->setHeight( TheDisplay->getHeight() );
 	}
 	TheTacticalView->setDefaultView(0.0f, 0.0f, 1.0f);
 
@@ -1188,8 +1298,10 @@ void InGameUI::init( void )
 
 	m_soloNexusSelectedDrawableID = INVALID_DRAWABLE_ID;
 
+	setDrawRMBScrollAnchor(TheGlobalData->m_drawScrollAnchor);
+	setMoveRMBScrollAnchor(TheGlobalData->m_moveScrollAnchor);
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1226,7 +1338,7 @@ void InGameUI::setRadiusCursor(RadiusCursorType cursorType, const SpecialPowerTe
 
 	if (obj == NULL)
 		return;
-	
+
 	Player* controller = obj->getControllingPlayer();
 	if (controller == NULL)
 		return;
@@ -1258,23 +1370,23 @@ void InGameUI::setRadiusCursor(RadiusCursorType cursorType, const SpecialPowerTe
 		case RADIUSCURSOR_OFFENSIVE_SPECIALPOWER:
 		case RADIUSCURSOR_SUPERWEAPON_SCATTER_AREA:
 		case RADIUSCURSOR_EMERGENCY_REPAIR:
-		case RADIUSCURSOR_PARTICLECANNON: 
+		case RADIUSCURSOR_PARTICLECANNON:
 		case RADIUSCURSOR_A10STRIKE:
 		case RADIUSCURSOR_SPECTREGUNSHIP:
     case RADIUSCURSOR_HELIX_NAPALM_BOMB:
 		case RADIUSCURSOR_DAISYCUTTER:
 		case RADIUSCURSOR_CARPETBOMB:
 		case RADIUSCURSOR_PARADROP:
-		case RADIUSCURSOR_SPYSATELLITE: 
-		case RADIUSCURSOR_NUCLEARMISSILE: 
+		case RADIUSCURSOR_SPYSATELLITE:
+		case RADIUSCURSOR_NUCLEARMISSILE:
 		case RADIUSCURSOR_EMPPULSE:
 		case RADIUSCURSOR_ARTILLERYBARRAGE:
 		case RADIUSCURSOR_FRENZY:
 		case RADIUSCURSOR_NAPALMSTRIKE:
 		case RADIUSCURSOR_CLUSTERMINES:
-		case RADIUSCURSOR_SCUDSTORM: 
+		case RADIUSCURSOR_SCUDSTORM:
 		case RADIUSCURSOR_ANTHRAXBOMB:
-		case RADIUSCURSOR_AMBUSH: 
+		case RADIUSCURSOR_AMBUSH:
 		case RADIUSCURSOR_RADAR:
 		case RADIUSCURSOR_SPYDRONE:
 		case RADIUSCURSOR_AMBULANCE:
@@ -1309,13 +1421,7 @@ void InGameUI::handleRadiusCursor()
 		// from screen to world
 		// But only if the radar is on.
 		//
-		Bool radarOn = TheRadar->isRadarForced() 
-									|| ( !TheRadar->isRadarHidden() 
-												&& ThePlayerList->getLocalPlayer() 
-												&& ThePlayerList->getLocalPlayer()->hasRadar()
-											);
-
-		if( !radarOn  ||  (TheRadar->screenPixelToWorld( &mouseIO->pos, &pos ) == FALSE) )// if radar off, or point not on radar
+		if( !rts::localPlayerHasRadar()  ||  (TheRadar->screenPixelToWorld( &mouseIO->pos, &pos ) == FALSE) )// if radar off, or point not on radar
 			TheTacticalView->screenToTerrain( &mouseIO->pos, &pos );
 
 
@@ -1335,16 +1441,16 @@ void InGameUI::handleRadiusCursor()
 }
 
 
-void InGameUI::triggerDoubleClickAttackMoveGuardHint( void ) 
+void InGameUI::triggerDoubleClickAttackMoveGuardHint( void )
 {
-  m_duringDoubleClickAttackMoveGuardHintTimer = 11; 
+  m_duringDoubleClickAttackMoveGuardHintTimer = 11;
 	const MouseIO* mouseIO = TheMouse->getMouseStatus();
 	TheTacticalView->screenToTerrain( &mouseIO->pos, &m_duringDoubleClickAttackMoveGuardHintStashedPosition );
 }
 
 
 //-------------------------------------------------------------------------------------------------
-/** Handle the placement "icons" that appear at the cursor when we're putting down a 
+/** Handle the placement "icons" that appear at the cursor when we're putting down a
 	* structure to build.  Note that this has additional logic to also show a line
 	* of objects because when we build "walls" we want to draw a line of repeating
 	* wall pieces on the map where we want to put all of them */
@@ -1366,7 +1472,7 @@ void InGameUI::evaluateSoloNexus( Drawable *newlyAddedDrawable )
 
 	//LoopAllSelectedDrawables
 	UnsignedShort nexaeFound = 0;
-	for( DrawableListCIt it = m_selectedDrawables.begin(); it != m_selectedDrawables.end(); ++it ) 
+	for( DrawableListCIt it = m_selectedDrawables.begin(); it != m_selectedDrawables.end(); ++it )
 	{
 
 		Drawable *draw = (*it);
@@ -1375,7 +1481,7 @@ void InGameUI::evaluateSoloNexus( Drawable *newlyAddedDrawable )
 
 		if ( ! obj )
 			continue;
-			
+
 		if ( obj->isKindOf( KINDOF_MOB_NEXUS ) )
 		{
 			++nexaeFound;
@@ -1395,7 +1501,7 @@ void InGameUI::evaluateSoloNexus( Drawable *newlyAddedDrawable )
 			return;
 		}
 
-	}  // end for
+	}
 
 
 }
@@ -1419,8 +1525,8 @@ void InGameUI::handleBuildPlacements( void )
 		if( isPlacementAnchored() )
 		{
 			ICoord2D start, end;
-								
-			// get the placement arrow points	
+
+			// get the placement arrow points
 			getPlacementPoints( &start, &end );
 
 			// set icon to anchor point
@@ -1434,15 +1540,22 @@ void InGameUI::handleBuildPlacements( void )
 				// project the start and the end points of the line anchor into the 3D world
 				TheTacticalView->screenToTerrain( &start, &worldStart );
 				TheTacticalView->screenToTerrain( &end, &worldEnd );
-				
+
 				Coord2D v;
 				v.x = worldEnd.x - worldStart.x;
 				v.y = worldEnd.y - worldStart.y;
 				angle = v.toAngle();
 
-			}  // end if
+				// TheSuperHackers @tweak Stubbjax 04/08/2025 Snap angle to nearest 45 degrees
+				// while using force attack mode for convenience.
+				if (isInForceAttackMode())
+				{
+					const Real snapRadians = DEG_TO_RADF(45);
+					angle = WWMath::Round(angle / snapRadians) * snapRadians;
+				}
+			}
 
-		}  // end if
+		}
 		else
 		{
 			const MouseIO *mouseIO = TheMouse->getMouseStatus();
@@ -1450,7 +1563,7 @@ void InGameUI::handleBuildPlacements( void )
 			// location is the mouse position
 			loc = mouseIO->pos;
 
-		}  // end else
+		}
 
 		// set the location and angle of the place icon
 		/**@todo this whole orientation vector thing is LAME! Must replace, all I want to
@@ -1479,29 +1592,30 @@ void InGameUI::handleBuildPlacements( void )
 																											 m_pendingPlaceType,
 																											 angle,
 																											 BuildAssistant::USE_QUICK_PATHFIND |
-																											 BuildAssistant::TERRAIN_RESTRICTIONS | 
+																											 BuildAssistant::TERRAIN_RESTRICTIONS |
 																											 BuildAssistant::CLEAR_PATH |
 																											 BuildAssistant::NO_OBJECT_OVERLAP |
 																											 BuildAssistant::SHROUD_REVEALED |
 																											 BuildAssistant::IGNORE_STEALTHED,
 																											 builderObject,
 																											 NULL );
+
 			if( lbc != LBC_OK )
-				m_placeIcon[ 0 ]->colorTint( &illegalBuildColor );
+				m_placeIcon[ 0 ]->colorTint( &IllegalBuildColor );
 			else
 				m_placeIcon[ 0 ]->colorTint( NULL );
 
-			
+
 
 
 			// Add the bibs around the structure.
-			if (lbc != LBC_OK) 
+			if (lbc != LBC_OK)
 			{
 				TheTerrainVisual->addFactionBibDrawable(m_placeIcon[0], lbc != LBC_OK);
 			} else {
 				TheTerrainVisual->removeFactionBibDrawable(m_placeIcon[0]);
 			}
-		}  // end if
+		}
 
 
 
@@ -1525,12 +1639,12 @@ void InGameUI::handleBuildPlacements( void )
 
 			// how big are each of our objects
 			Real objectSize = m_pendingPlaceType->getTemplateGeometryInfo().getMajorRadius() * 2.0f;
-			
+
 			// what is our max tiling length we can make
 			Int maxObjects = TheGlobalData->m_maxLineBuildObjects;
 
 			// get the builder object that will be constructing things
-			Object *builderObject = TheGameLogic->findObjectByID( TheInGameUI->getPendingPlaceSourceObjectID() );
+			Object *builderObject = TheGameLogic->findObjectByID( getPendingPlaceSourceObjectID() );
 
 			//
 			// given the start/end points in the world and the the angle of the wall, fill
@@ -1540,17 +1654,20 @@ void InGameUI::handleBuildPlacements( void )
 			tileBuildInfo = TheBuildAssistant->buildTiledLocations( m_pendingPlaceType, angle,
 																															&worldStart, &worldEnd,
 																															objectSize, maxObjects,
-																															builderObject );	
+																															builderObject );
 
 			// create any necessary drawables we need to "fill out" the line
 			for( i = 0; i < tileBuildInfo->tilesUsed; i++ )
 			{
-			
+
 				if( m_placeIcon[ i ] == NULL )
-					m_placeIcon[ i ] = TheThingFactory->newDrawable( m_pendingPlaceType,
-																													 DRAWABLE_STATUS_NO_STATE_PARTICLES );
+				{
+					UnsignedInt drawableStatus = DRAWABLE_STATUS_NO_STATE_PARTICLES;
+					drawableStatus |= TheGlobalData->m_objectPlacementShadows ? DRAWABLE_STATUS_SHADOWS : 0;
+					m_placeIcon[ i ] = TheThingFactory->newDrawable( m_pendingPlaceType, drawableStatus );
+				}
 
-			}  // end for i
+			}
 
 			//
 			// destroy any drawables that we're not using anymore because a previous
@@ -1563,7 +1680,7 @@ void InGameUI::handleBuildPlacements( void )
 					TheGameClient->destroyDrawable( m_placeIcon[ i ] );
 				m_placeIcon[ i ] = NULL;
 
-			}  // end for i
+			}
 
 			//
 			// march down each drawable and set the position based on its position in the
@@ -1572,22 +1689,22 @@ void InGameUI::handleBuildPlacements( void )
 			for( i = 0; i < tileBuildInfo->tilesUsed; i++ )
 			{
 
-				// set the drawble position
+				// set the drawable position
 				m_placeIcon[ i ]->setPosition( &tileBuildInfo->positions[ i ] );
 
-				// set opacity for the drawble
-				m_placeIcon[ i ]->setDrawableOpacity( placementOpacity );
+				// set opacity for the drawable
+				m_placeIcon[ i ]->setDrawableOpacity( TheGlobalData->m_objectPlacementOpacity );
 
 				// set the drawable angle
 				m_placeIcon[ i ]->setOrientation( angle );
 
-			}  // end for i
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end handleBuildPlacements
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Pre-draw phase of the in game ui */
@@ -1607,14 +1724,14 @@ void InGameUI::preDraw( void )
 	// draw world animations
 	updateAndDrawWorldAnimations();
 
-}  // end preDraw
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update the in game user interface */
 //-------------------------------------------------------------------------------------------------
 //DECLARE_PERF_TIMER(InGameUI_update)
 void InGameUI::update( void )
-{ 
+{
 	//USE_PERF_TIMER(InGameUI_update)
 	Int i;
 
@@ -1672,7 +1789,7 @@ void InGameUI::update( void )
 				a = 0;
 			else
 				a -= amount;
-			
+
 			// set the new color
 			m_uiMessages[ i ].color = GameMakeColor( r, g, b, a );
 
@@ -1680,9 +1797,9 @@ void InGameUI::update( void )
 			if( a == 0 )
 				removeMessageAtIndex( i );
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	//
 	// Update the Military Subtitle display
@@ -1715,7 +1832,7 @@ void InGameUI::update( void )
 		}
 		else
 		{
-			// trigger whether or not we should draw the block	
+			// trigger whether or not we should draw the block
 			if( m_militarySubtitle->blockBeginFrame + 9 < currLogicFrame )
 			{
 				m_militarySubtitle->blockBeginFrame = currLogicFrame;
@@ -1738,7 +1855,7 @@ void InGameUI::update( void )
 					// Now add a new display string
 					m_militarySubtitle->currentDisplayString++;
 					if(!(m_militarySubtitle->currentDisplayString >= MAX_SUBTITLE_LINES) )
-					{	
+					{
 						m_militarySubtitle->blockPos.x = m_militarySubtitle->position.x;
 						m_militarySubtitle->displayStrings[m_militarySubtitle->currentDisplayString] = TheDisplayStringManager->newDisplayString();
 						m_militarySubtitle->displayStrings[m_militarySubtitle->currentDisplayString]->reset();
@@ -1751,7 +1868,7 @@ void InGameUI::update( void )
 					{
 						// if we've exceeded the allocated number of display strings, this will force us to essentially truncate the remaining text
 						m_militarySubtitle->index = m_militarySubtitle->subtitle.getLength();
-						DEBUG_CRASH(("You're Only Allowed to use %d lines of subtitle text\n",MAX_SUBTITLE_LINES));
+						DEBUG_CRASH(("You're Only Allowed to use %d lines of subtitle text",MAX_SUBTITLE_LINES));
 					}
 				}
 				else
@@ -1772,7 +1889,7 @@ void InGameUI::update( void )
 						m_militarySubtitle->incrementOnFrame = currLogicFrame + m_militaryCaptionSpeed;
 
 				}
-				// increment the index			
+				// increment the index
 				m_militarySubtitle->index++;
 				if(m_militarySubtitle->index >= m_militarySubtitle->subtitle.getLength())
 				{
@@ -1792,43 +1909,64 @@ void InGameUI::update( void )
 										m_militarySubtitle->incrementOnFrame = GameClientRandomValue(10, 13) + currLogicFrame;
 									}
 								}*/
-				
+
 			}
 		}
 	}
 
 	// update the player money window if the money amount has changed
 	// this seems like as good a place as any to do the power hide/show
-	static Int lastMoney = -1;
-	static NameKeyType moneyWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:MoneyDisplay" );	
-	static NameKeyType powerWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PowerWindow" );	
+	static UnsignedInt lastMoney = ~0u;
+	static UnsignedInt lastIncome = ~0u;
+	static NameKeyType moneyWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:MoneyDisplay" );
+	static NameKeyType powerWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PowerWindow" );
 
 	GameWindow *moneyWin = TheWindowManager->winGetWindowFromId( NULL, moneyWindowKey );
 	GameWindow *powerWin = TheWindowManager->winGetWindowFromId( NULL, powerWindowKey );
 //	if( moneyWin == NULL )
 //	{
-//		NameKeyType moneyWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:MoneyDisplay" );	
+//		NameKeyType moneyWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:MoneyDisplay" );
 //
 //		moneyWin = TheWindowManager->winGetWindowFromId( NULL, moneyWindowKey );
 //
 //	}  // end if
-	Player *moneyPlayer = NULL;
-	if( TheControlBar->isObserverControlBarOn())
-		moneyPlayer = TheControlBar->getObserverLookAtPlayer();
-	else
-		moneyPlayer = ThePlayerList->getLocalPlayer();
+	Player* moneyPlayer = TheControlBar->getCurrentlyViewedPlayer();
 	if( moneyPlayer)
 	{
-		Int currentMoney = moneyPlayer->getMoney()->countMoney();
-		if( lastMoney != currentMoney )
+		Money *money = moneyPlayer->getMoney();
+		Bool wantShowIncome = TheGlobalData->m_showMoneyPerMinute;
+		Bool canShowIncome = TheGlobalData->m_allowMoneyPerMinuteForPlayer || TheControlBar->isObserverControlBarOn();
+		Bool doShowIncome = wantShowIncome && canShowIncome;
+		if (!doShowIncome)
 		{
-			UnicodeString buffer;
+			UnsignedInt currentMoney = money->countMoney();
+			if( lastMoney != currentMoney )
+			{
+				UnicodeString buffer;
 
-			buffer.format( TheGameText->fetch( "GUI:ControlBarMoneyDisplay" ), currentMoney );
-			GadgetStaticTextSetText( moneyWin, buffer );
-			lastMoney = currentMoney;
-			
-		}  // end if
+				buffer.format(TheGameText->fetch( "GUI:ControlBarMoneyDisplay" ), currentMoney );
+				GadgetStaticTextSetText( moneyWin, buffer );
+				lastMoney = currentMoney;
+
+			}
+		}
+		else
+		{
+			// TheSuperHackers @feature L3-M 21/08/2025 player money per minute
+			UnsignedInt currentMoney = money->countMoney();
+			UnsignedInt cashPerMin = money->getCashPerMinute();
+			if ( lastMoney != currentMoney || lastIncome != cashPerMin )
+			{
+				UnicodeString buffer;
+				UnicodeString moneyStr = formatMoneyValue(currentMoney);
+				UnicodeString incomeStr = formatIncomeValue(cashPerMin);
+
+				buffer.format(TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:ControlBarMoneyDisplayIncome", L"$ %ls +%ls/min", moneyStr.str(), incomeStr.str()));
+				GadgetStaticTextSetText(moneyWin, buffer);
+				lastMoney = currentMoney;
+				lastIncome = cashPerMin;
+			}
+		}
 		moneyWin->winHide(FALSE);
 		powerWin->winHide(FALSE);
 	}
@@ -1837,7 +1975,7 @@ void InGameUI::update( void )
 		moneyWin->winHide(TRUE);
 		powerWin->winHide(TRUE);
 	}
-	
+
 	// Update the floating Text;
 	updateFloatingText();
 
@@ -1853,30 +1991,34 @@ void InGameUI::update( void )
 		layout->runUpdate();
 	}
 
-	//Handle keyboard camera rotations
-	if( m_cameraRotatingLeft && !m_cameraRotatingRight )
-	{
-		//Keyboard rotate left
-		TheTacticalView->setAngle( TheTacticalView->getAngle() - TheGlobalData->m_keyboardCameraRotateSpeed );
-	}
-	if( m_cameraRotatingRight && !m_cameraRotatingLeft )
+	if (m_cameraRotatingLeft || m_cameraRotatingRight || m_cameraZoomingIn || m_cameraZoomingOut)
 	{
-		//Keyboard rotate right
-		TheTacticalView->setAngle( TheTacticalView->getAngle() + TheGlobalData->m_keyboardCameraRotateSpeed );
-	}
-	if( m_cameraZoomingIn && !m_cameraZoomingOut )
-	{
-		//Keyboard zoom in
-		TheTacticalView->zoomIn();
-	}
-	if( m_cameraZoomingOut && !m_cameraZoomingIn )
-	{
-		//Keyboard zoom out
-		TheTacticalView->zoomOut();
+		// TheSuperHackers @tweak The camera rotation and zoom are now decoupled from the render update.
+		const Real fpsRatio = TheFramePacer->getBaseOverUpdateFpsRatio();
+		const Real rotateAngle = TheGlobalData->m_keyboardCameraRotateSpeed * fpsRatio;
+		const Real zoomHeight = (Real)View::ZoomHeightPerSecond * fpsRatio;
+
+		if( m_cameraRotatingLeft && !m_cameraRotatingRight )
+		{
+			TheTacticalView->setAngle( TheTacticalView->getAngle() - rotateAngle );
+		}
+		else if( m_cameraRotatingRight && !m_cameraRotatingLeft )
+		{
+			TheTacticalView->setAngle( TheTacticalView->getAngle() + rotateAngle );
+		}
+
+		if( m_cameraZoomingIn && !m_cameraZoomingOut )
+		{
+			TheTacticalView->zoom( -zoomHeight );
+		}
+		else if( m_cameraZoomingOut && !m_cameraZoomingIn )
+		{
+			TheTacticalView->zoom( +zoomHeight );
+		}
 	}
 
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 void InGameUI::registerWindowLayout( WindowLayout *layout )
@@ -1924,6 +2066,9 @@ void InGameUI::reset( void )
 	// free any message resources allocated
 	freeMessageResources();
 
+	// refresh custom ui strings - this will create the strings if required and update the fonts
+	refreshCustomUiResources();
+
 	Int i;
 	for (i=0; i<MAX_PLAYER_COUNT; ++i)
 	{
@@ -1948,13 +2093,13 @@ void InGameUI::reset( void )
 	m_namedTimers.clear();
 	m_namedTimerLastFlashFrame = 0;
 	m_namedTimerUsedFlashColor = TRUE; // so next one is false
-	m_showNamedTimers = TRUE;
+	showNamedTimerDisplay(true);
 
 	removeMilitarySubtitle();
 	clearPopupMessageData();
 	m_superweaponLastFlashFrame = 0;
 	m_superweaponUsedFlashColor = TRUE; // so next one is false
-	m_superweaponHiddenByScript = FALSE;
+	setSuperweaponDisplayEnabledByScript(true);
 
 	clearFloatingText();
 	clearWorldAnimations();
@@ -1967,21 +2112,30 @@ void InGameUI::reset( void )
 		m_moveHint[ i ].sourceID = 0;
 		m_moveHint[ i ].frame = 0;
 
-	}  //  end for i
+	}
+
+	setClientQuiet(false);
+	setWaypointMode(false);
+	setForceMoveMode(false);
+	setForceAttackMode(false);
+	setPreferSelectionMode(false);
+	clearAttackMoveToMode();
+
+	// TheSuperHackers @bugfix Disable all camera interactions to prevent them getting stuck after game end.
+	setScrolling(false);
+	setSelecting(false);
+	setCameraRotateLeft(false);
+	setCameraRotateRight(false);
+	setCameraZoomIn(false);
+	setCameraZoomOut(false);
+	setCameraTrackingDrawable(false);
 
-	m_waypointMode			= false;
-	m_forceAttackMode		= false;
-	m_forceMoveToMode		= false;
-	m_attackMoveToMode	= false;
-	m_preferSelection		= false;
-	m_clientQuiet    = false;
-	
 	m_windowLayouts.clear();
 
 	m_tooltipsDisabledUntil = 0;
 
 	UpdateDiplomacyBriefingText(AsciiString::TheEmptyString, TRUE);
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Free any resources we used for our messages */
@@ -2005,9 +2159,25 @@ void InGameUI::freeMessageResources( void )
 		// set timestamp to zero
 		m_uiMessages[ i ].timestamp = 0;
 
-	}  // end for i
+	}
 
-}  // end freeMessageResources
+}
+
+void InGameUI::freeCustomUiResources( void )
+{
+	TheDisplayStringManager->freeDisplayString(m_networkLatencyString);
+	m_networkLatencyString = NULL;
+	TheDisplayStringManager->freeDisplayString(m_renderFpsString);
+	m_renderFpsString = NULL;
+	TheDisplayStringManager->freeDisplayString(m_renderFpsLimitString);
+	m_renderFpsLimitString = NULL;
+	TheDisplayStringManager->freeDisplayString(m_systemTimeString);
+	m_systemTimeString = NULL;
+	TheDisplayStringManager->freeDisplayString(m_gameTimeString);
+	m_gameTimeString = NULL;
+	TheDisplayStringManager->freeDisplayString(m_gameTimeFrameString);
+	m_gameTimeFrameString = NULL;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Same as the unicode message method, but this takes an ascii string which is assumed
@@ -2039,7 +2209,21 @@ void InGameUI::message( AsciiString stringManagerLabel, ... )
 	{
 		DEBUG_CRASH(("InGameUI::message failed with code:%d", result));
 	}
-}  // end 
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void InGameUI::messageNoFormat( const UnicodeString& message )
+{
+	addMessageText( message, NULL );
+}
+
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void InGameUI::messageNoFormat( const RGBColor *rgbColor, const UnicodeString& message )
+{
+	addMessageText( message, rgbColor );
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Interface for display text messages to the user */
@@ -2066,7 +2250,7 @@ void InGameUI::message( UnicodeString format, ... )
 	{
 		DEBUG_CRASH(("InGameUI::message failed with code:%d", result));
 	}
-}  // end message
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Interface for display text messages to the user */
@@ -2093,7 +2277,7 @@ void InGameUI::messageColor( const RGBColor *rgbColor, UnicodeString format, ...
 	{
 		DEBUG_CRASH(("InGameUI::messageColor failed with code:%d", result));
 	}
-}  // end message
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -2128,10 +2312,10 @@ void InGameUI::addMessageText( const UnicodeString& formattedMessage, const RGBC
 	m_uiMessages[ 0 ].fullText = formattedMessage;
 	m_uiMessages[ 0 ].timestamp = TheGameLogic->getFrame();
 	m_uiMessages[ 0 ].displayString = TheDisplayStringManager->newDisplayString();
-	m_uiMessages[ 0 ].displayString->setFont( TheFontLibrary->getFont( m_messageFont, 
+	m_uiMessages[ 0 ].displayString->setFont( TheFontLibrary->getFont( m_messageFont,
 																						TheGlobalLanguageData->adjustFontSize(m_messagePointSize), m_messageBold ) );
 	m_uiMessages[ 0 ].displayString->setText( m_uiMessages[ 0 ].fullText );
-	
+
 	//
 	// assign a color for this string instance that will stay with it no matter what
 	// line it is rendered on
@@ -2141,7 +2325,7 @@ void InGameUI::addMessageText( const UnicodeString& formattedMessage, const RGBC
 	else
 		m_uiMessages[ 0 ].color = color2;
 
-}  // end addFormattedMessage
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove the message on screen at index i */
@@ -2155,7 +2339,7 @@ void InGameUI::removeMessageAtIndex( Int i )
 	m_uiMessages[ i ].displayString = NULL;
 	m_uiMessages[ i ].timestamp = 0;
 
-}  // end removeMessageAtIndex
+}
 
 //-------------------------------------------------------------------------------------------------
 /** An area selection is occurring, start graphical "hint". */
@@ -2187,7 +2371,7 @@ void InGameUI::createMoveHint( const GameMessage *msg )
 				m_moveHint[ i ].frame != 0 )
 			expireHint( MOVE_HINT, i );
 
-		
+
 	if( getSelectCount() == 1 )
 	{
 		Drawable *draw = getFirstSelectedDrawable();
@@ -2201,7 +2385,7 @@ void InGameUI::createMoveHint( const GameMessage *msg )
 
 	m_moveHint[ m_nextMoveHint ].frame = TheGameClient->getFrame();
 	m_moveHint[ m_nextMoveHint ].pos = msg->getArgument( 0 )->location;
-		
+
 	m_nextMoveHint++;
 
 	// wrap around
@@ -2237,7 +2421,7 @@ void InGameUI::createGarrisonHint( const GameMessage *msg )
 	}
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 #define AI_DEBUG_TOOLTIPS		1
 
 #ifdef AI_DEBUG_TOOLTIPS
@@ -2246,7 +2430,7 @@ void InGameUI::createGarrisonHint( const GameMessage *msg )
 #include "GameLogic/AIPathfind.h"
 #endif // AI_DEBUG_TOOLTIPS
 
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // defined(RTS_DEBUG)
 
 //-------------------------------------------------------------------------------------------------
 /** Details of what is mouse hovered over right now are in this message.  Terrain might result
@@ -2270,7 +2454,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 			underWindow = false;
 			break;
 		}
-		
+
 		// check to see if it or any of its parents are opaque.  If so, we can't select anything.
 		if (!BitIsSet( window->winGetStatus(), WIN_STATUS_SEE_THRU ))
 		{
@@ -2286,7 +2470,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 		return;
 	}
 
-  
+
 
 
 
@@ -2300,7 +2484,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 		const Object *obj = draw ? draw->getObject() : NULL;
 		if( obj )
 		{
-			
+
  			//Ahh, here is a wierd exception: if the moused-over drawable is a mob-member
 			//(e.g. AngryMob), Lets fool the UI into creating the hint for the NEXUS instead...
  			if (obj->isKindOf( KINDOF_IGNORED_IN_GUI ))
@@ -2322,7 +2506,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
  			else
  				m_mousedOverDrawableID = draw->getID();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) //Extra hacky, sorry, but I need to use this in constantdebug report
+#if defined(RTS_DEBUG) //Extra hacky, sorry, but I need to use this in constantdebug report
 			if ( TheGlobalData->m_constantDebugUpdate == TRUE )
 				m_mousedOverDrawableID = draw->getID();
 #endif
@@ -2384,13 +2568,13 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 				AsciiString objName = obj->getName();
 				AsciiString teamName;
 				AsciiString stateName;
-				
+
 				AIUpdateInterface *ai = (AIUpdateInterface*)obj->getAI();
 				if (ai) {
 					if (ai->getPath()) {
 						TheAI->pathfinder()->setDebugPath(ai->getPath());
 					}
-#ifdef STATE_MACHINE_DEBUG	
+#ifdef STATE_MACHINE_DEBUG
 					stateName = ai->getCurrentStateName();
 					if (ai->getAttackInfo()) {
 						stateName.concat(" AttackPriority=");
@@ -2445,7 +2629,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 				else
 					tooltip = str;
 
-				Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+				const Int localPlayerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
 
 				Int x, y;
 				ThePartitionManager->worldToCell(obj->getPosition()->x, obj->getPosition()->y, &x, &y);
@@ -2460,7 +2644,7 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 					{
 						rgb.setFromInt(draw->getObject()->getIndicatorColor());
 
-						// Unless this is a stealth garrisoned building, 
+						// Unless this is a stealth garrisoned building,
 						// Let's not use the contained's housecolor
 						const Object *obj = draw->getObject();
 						if ( obj )
@@ -2494,16 +2678,16 @@ void InGameUI::createMouseoverHint( const GameMessage *msg )
 
 	if (oldID != m_mousedOverDrawableID)
 	{
-		//DEBUG_LOG(("Resetting tooltip delay\n"));
+		//DEBUG_LOG(("Resetting tooltip delay"));
 		TheMouse->resetTooltipDelay();
 	}
 
-	if (m_mouseMode == MOUSEMODE_DEFAULT && !m_isScrolling && !m_isSelecting && !TheInGameUI->getSelectCount() && (TheRecorder->getMode() != RECORDERMODETYPE_PLAYBACK || TheLookAtTranslator->hasMouseMovedRecently()))
+	if (m_mouseMode == MOUSEMODE_DEFAULT && !m_isScrolling && !m_isSelecting && !getSelectCount() && (TheRecorder->getMode() != RECORDERMODETYPE_PLAYBACK || TheLookAtTranslator->hasMouseMovedRecently()))
 	{
 		if( m_mousedOverDrawableID != INVALID_DRAWABLE_ID )
 		{
 			Drawable *draw = TheGameClient->findDrawableByID(m_mousedOverDrawableID);
-			
+
 			//Add basic logic to determine if we can select a unit (or hint)
 			const Object *obj = draw ? draw->getObject() : NULL;
 			Bool drawSelectable = CanSelectDrawable(draw, FALSE);
@@ -2547,8 +2731,8 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 	if( draw && (t == GameMessage::MSG_DO_ATTACK_OBJECT_HINT || t == GameMessage::MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT) )
 	{
 		const Object* obj = draw->getObject();
-		Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+		const Int localPlayerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
+#if ENABLE_CONFIGURABLE_SHROUD
 		ObjectShroudStatus ss = (!obj || !TheGlobalData->m_shroudOn) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex);
 #else
 		ObjectShroudStatus ss = (!obj) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex);
@@ -2567,7 +2751,7 @@ void InGameUI::createCommandHint( const GameMessage *msg )
     if ( --m_duringDoubleClickAttackMoveGuardHintTimer > 0 )
     {
       setMouseCursor(Mouse::FORCE_ATTACK_GROUND);
-		  setRadiusCursor(RADIUSCURSOR_GUARD_AREA, 
+		  setRadiusCursor(RADIUSCURSOR_GUARD_AREA,
 										  NULL,
 										  PRIMARY_WEAPON);
       return;
@@ -2592,7 +2776,7 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 			underWindow = false;
 			break;
 		}
-		
+
 		// check to see if it or any of its parents are opaque.  If so, we can't select anything.
 		if (!BitIsSet( window->winGetStatus(), WIN_STATUS_SEE_THRU ))
 		{
@@ -2622,7 +2806,7 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 	switch (m_mouseMode)
 	{
 		case MOUSEMODE_DEFAULT:
-			{ 
+			{
 				// This section of code only gets called when there is no specific cursor mode happening.
 				if (underWindow || (srcObj && !srcObj->isLocallyControlled()))
 				{
@@ -2637,12 +2821,9 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 							setMouseCursor( Mouse::GENERIC_INVALID );
 						else if( drawSelectable && obj->isLocallyControlled() && !obj->isKindOf(KINDOF_MINE))
 							setMouseCursor( Mouse::SELECTING );
-						else if( TheRadar->isRadarWindow( window ) &&
-										 TheRadar->isRadarForced() == FALSE &&
-										 (TheRadar->isRadarHidden() || 
-										 ThePlayerList->getLocalPlayer()->hasRadar() == FALSE) )
+						else if( TheRadar->isRadarWindow( window ) && !rts::localPlayerHasRadar() )
 							setMouseCursor( Mouse::ARROW );
-						else 
+						else
 							setMouseCursor( Mouse::MOVETO );
 						break;
 					}
@@ -2681,7 +2862,7 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 						break;
 					case GameMessage::MSG_RESUME_CONSTRUCTION_HINT:
 						setMouseCursor( Mouse::RESUME_CONSTRUCTION );
-						break;				
+						break;
 					case GameMessage::MSG_ENTER_HINT:
 						setMouseCursor( Mouse::ENTER_FRIENDLY );
 						break;
@@ -2756,12 +2937,12 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 				// set the mouse cursor for commands that need a targeting or to normal with no command
 				if( m_pendingGUICommand )
 				{
-					if( m_pendingGUICommand->isContextCommand() || 
+					if( m_pendingGUICommand->isContextCommand() ||
 							m_pendingGUICommand->getCommandType() == GUI_COMMAND_SPECIAL_POWER ||
 							m_pendingGUICommand->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT )
 					{
 						//Here is the hook for when we are in a context sensitive command mode. We can
-						//either do the specified command mode command or nothing! Whether or not the 
+						//either do the specified command mode command or nothing! Whether or not the
 						//command is valid or not was determined in evaluateContextCommand which is
 						//called first, and posts the appropriate message.
 						AsciiString cursorName;	// empty by default
@@ -2832,7 +3013,6 @@ void InGameUI::setScrolling( Bool isScrolling )
 
 	if (isScrolling)
 	{
-		TheMouse->capture();
 		setMouseCursor( Mouse::SCROLL );
 
 		// break any camera locks
@@ -2842,7 +3022,6 @@ void InGameUI::setScrolling( Bool isScrolling )
 	else
 	{
 		setMouseCursor( Mouse::ARROW );
-		TheMouse->releaseCapture();
 	}
 
 	m_isScrolling = isScrolling;
@@ -2913,17 +3092,17 @@ void InGameUI::setGUICommand( const CommandButton *command )
 		if( BitIsSet( command->getOptions(), COMMAND_OPTION_NEED_TARGET ) == FALSE )
 		{
 
-			DEBUG_ASSERTCRASH( 0, ("setGUICommand: Command '%s' does not need additional user interaction\n",	
+			DEBUG_ASSERTCRASH( 0, ("setGUICommand: Command '%s' does not need additional user interaction",
 														command->getName().str()) );
 			m_pendingGUICommand = NULL;
 			m_mouseMode = MOUSEMODE_DEFAULT;
 			return;
 
-		}  // end if
+		}
 
 		m_mouseMode = MOUSEMODE_GUI_COMMAND;
 
-	}  // end if
+	}
 	else
 	{
 		m_mouseMode = MOUSEMODE_DEFAULT;
@@ -2954,7 +3133,7 @@ void InGameUI::setGUICommand( const CommandButton *command )
 
 	m_mouseModeCursor = TheMouse->getMouseCursor();
 
-}  // end setGUICommand
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the pending gui command */
@@ -2964,7 +3143,7 @@ const CommandButton *InGameUI::getGUICommand( void ) const
 
 	return m_pendingGUICommand;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Destroy any drawables we have in our placement icon array and set to NULL */
@@ -2976,20 +3155,20 @@ void InGameUI::destroyPlacementIcons( void )
 	for( i = 0; i < TheGlobalData->m_maxLineBuildObjects; ++i )
 	{
 
-		if( m_placeIcon[ i ] ) 
+		if( m_placeIcon[ i ] )
 		{
 			TheTerrainVisual->removeFactionBibDrawable(m_placeIcon[ i ]);
 			TheGameClient->destroyDrawable( m_placeIcon[ i ] );
 		}
 		m_placeIcon[ i ] = NULL;
 
-	}  // end for i
+	}
 	TheTerrainVisual->removeAllBibs();
 
-}  // end destroyPlacementIcons
+}
 
 //-------------------------------------------------------------------------------------------------
-/** User has clicked on a built item that requires placement in the world.  We will 
+/** User has clicked on a built item that requires placement in the world.  We will
 	* record what that thing is so that the we can catch the next click in the world
 	* and try to place the object there */
 //-------------------------------------------------------------------------------------------------
@@ -3041,9 +3220,6 @@ void InGameUI::placeBuildAvailable( const ThingTemplate *build, Drawable *buildD
 
 			Drawable *draw;
 
-			// capture the mouse for our window, windows is lame and changes it if we don't
-			TheMouse->capture();
-
 			// hack for changing cursor
 			setMouseCursor( Mouse::CROSS );
 
@@ -3051,8 +3227,12 @@ void InGameUI::placeBuildAvailable( const ThingTemplate *build, Drawable *buildD
 			///@ todo when message stream order more formalized eliminate this
 //			TheInGameUI->deselectAllDrawables();
 
-			// create a drawble of what we are building to be "attached" at the cursor
-			draw = TheThingFactory->newDrawable( build, DRAWABLE_STATUS_NO_STATE_PARTICLES );
+			{
+				// create a drawable of what we are building to be "attached" at the cursor
+				UnsignedInt drawableStatus = DRAWABLE_STATUS_NO_STATE_PARTICLES;
+				drawableStatus |= TheGlobalData->m_objectPlacementShadows ? DRAWABLE_STATUS_SHADOWS : 0;
+				draw = TheThingFactory->newDrawable( build, drawableStatus );
+			}
 			if (sourceObject)
 			{
 				if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
@@ -3060,7 +3240,7 @@ void InGameUI::placeBuildAvailable( const ThingTemplate *build, Drawable *buildD
 				else
 					draw->setIndicatorColor(sourceObject->getControllingPlayer()->getPlayerColor());
 			}
-			DEBUG_ASSERTCRASH( draw, ("Unable to create icon at cursor for placement '%s'\n",
+			DEBUG_ASSERTCRASH( draw, ("Unable to create icon at cursor for placement '%s'",
 												 build->getName().str()) );
 
 			//
@@ -3070,20 +3250,17 @@ void InGameUI::placeBuildAvailable( const ThingTemplate *build, Drawable *buildD
 			//
 			Real angle = build->getPlacementViewAngle();
 
-			// don't forget to take into account the current view angle
-			// angle += TheTacticalView->getAngle();	Don't do this - makes odd angled building placements.  jba.
-
 			// set the angle in the icon we just created
 			draw->setOrientation( angle );
 
 			// set the build icon attached to the cursor to be "see-thru"
-			draw->setDrawableOpacity( placementOpacity );
+			draw->setDrawableOpacity( TheGlobalData->m_objectPlacementOpacity );
 
 			// set the "icon" in the icon array at the first index
 			DEBUG_ASSERTCRASH( m_placeIcon[ 0 ] == NULL, ("placeBuildAvailable, build icon array is not empty!") );
-			m_placeIcon[ 0 ] = draw;	
+			m_placeIcon[ 0 ] = draw;
 
-		}  // end if
+		}
 		else
 		{
 			if (m_mouseMode == MOUSEMODE_BUILD_PLACE)
@@ -3092,7 +3269,6 @@ void InGameUI::placeBuildAvailable( const ThingTemplate *build, Drawable *buildD
 				m_mouseModeCursor = Mouse::ARROW;
 			}
 
-			TheMouse->releaseCapture();
 			setMouseCursor( Mouse::ARROW );
 			setPlacementStart( NULL );
 
@@ -3110,11 +3286,11 @@ void InGameUI::placeBuildAvailable( const ThingTemplate *build, Drawable *buildD
 				}
 			}
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
-}  // end placeBuildAvailable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return the thing we're attempting to place */
@@ -3131,7 +3307,7 @@ ObjectID InGameUI::getPendingPlaceSourceObjectID( void )
 
 	return m_pendingPlaceSourceObjectID;
 
-}  // end getPendingPlaceSourceObjectID
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Start the angle selection interface for selecting building angles when placing them */
@@ -3147,11 +3323,11 @@ void InGameUI::setPlacementStart( const ICoord2D *start )
 		m_placeAnchorEnd = *start;
 		m_placeAnchorInProgress = TRUE;
 
-	}  // end if
+	}
 	else
 		m_placeAnchorInProgress = FALSE;
 
-}  // end setPlacementStart
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the end anchor for the angle build interface */
@@ -3162,7 +3338,7 @@ void InGameUI::setPlacementEnd( const ICoord2D *end )
 	if( end )
 		m_placeAnchorEnd = *end;
 
-}  // end setPlacementEnd
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is the angle selection interface for placing building at angles up? */
@@ -3172,7 +3348,7 @@ Bool InGameUI::isPlacementAnchored( void )
 
 	return m_placeAnchorInProgress;
 
-}  // end isPlacementAnchored
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the start and end anchor points for the building angle selection interface */
@@ -3185,7 +3361,7 @@ void InGameUI::getPlacementPoints( ICoord2D *start, ICoord2D *end )
 	if( end )
 		*end = m_placeAnchorEnd;
 
-}  // end getPlacementPoints
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return the angle of the drawable at the cursor if any */
@@ -3198,7 +3374,7 @@ Real InGameUI::getPlacementAngle( void )
 
 	return 0.0f;
 
-}  // end getPlacementAngle
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Mark given Drawable as "selected". */
@@ -3217,7 +3393,7 @@ void InGameUI::selectDrawable( Drawable *draw )
 		m_selectedDrawables.push_front( draw );
 
 		// we now have one more selected drawable
-		incrementSelectCount(); 
+		incrementSelectCount();
 
 
 		// evaluate whether our selection consists of exactly one angry mob
@@ -3226,9 +3402,9 @@ void InGameUI::selectDrawable( Drawable *draw )
 		// the control needs to update its context sensitive display now
 		TheControlBar->onDrawableSelected( draw );
 
-	}  // end if
+	}
 
-}  // end selectDrawable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Clear "selected" status of Drawable. */
@@ -3244,20 +3420,20 @@ void InGameUI::deselectDrawable( Drawable *draw )
 		draw->friend_clearSelected();
 
 		// find the drawable entry in our list
-		DrawableListIt findIt = std::find( m_selectedDrawables.begin(), 
-																			 m_selectedDrawables.end(), 
+		DrawableListIt findIt = std::find( m_selectedDrawables.begin(),
+																			 m_selectedDrawables.end(),
 																			 draw );
 
 		// sanity
 		DEBUG_ASSERTCRASH( findIt != m_selectedDrawables.end(),
-											 ("deselectDrawable: Drawable not found in the selected drawable list '%s'\n",
+											 ("deselectDrawable: Drawable not found in the selected drawable list '%s'",
 											 draw->getTemplate()->getName().str()) );
 
-		// remove it from the selected drawable list		
+		// remove it from the selected drawable list
 		m_selectedDrawables.erase( findIt );
 
 		// keep out own internal count happy
-		decrementSelectCount(); 
+		decrementSelectCount();
 
 		// evaluate whether our selection consists of exactly one angry mob
 		evaluateSoloNexus();
@@ -3265,16 +3441,16 @@ void InGameUI::deselectDrawable( Drawable *draw )
 		// the control needs to update its context sensitive display now
 		TheControlBar->onDrawableDeselected( draw );
 
-	}  // end if
+	}
 
-}  // end deselectDrawable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Clear all drawables' "select" status */
 //-------------------------------------------------------------------------------------------------
 void InGameUI::deselectAllDrawables( Bool postMsg )
 {
-	const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
+	const DrawableList *selected = getAllSelectedDrawables();
 
 	// loop through all the selected drawables
 	for ( DrawableListCIt it = selected->begin(); it != selected->end(); )
@@ -3284,9 +3460,9 @@ void InGameUI::deselectAllDrawables( Bool postMsg )
 		Drawable* draw = *it++;
 
 		// do the deselection
-		TheInGameUI->deselectDrawable( draw );
+		deselectDrawable( draw );
 
-	}  // end while
+	}
 
 	// keep our list all tidy
 	m_selectedDrawables.clear();
@@ -3347,7 +3523,7 @@ Drawable *InGameUI::getFirstSelectedDrawable( void )
 
 	return m_selectedDrawables.front();
 
-}  // end getFirstSelectedDrawable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return true if the selected ID is in the drawable list */
@@ -3355,17 +3531,32 @@ Drawable *InGameUI::getFirstSelectedDrawable( void )
 Bool InGameUI::isDrawableSelected( DrawableID idToCheck ) const
 {
 
-	for( DrawableListCIt it = m_selectedDrawables.begin(); it != m_selectedDrawables.end(); ++it ) 
+	for( DrawableListCIt it = m_selectedDrawables.begin(); it != m_selectedDrawables.end(); ++it )
 	{
 
 		if( (*it)->getID() == idToCheck )
 			return TRUE;
 
-	}  // end for
+	}
 
 	return FALSE;
 
-}  // end isDrawableSelected
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Return true if all of the given objects are selected */
+//-------------------------------------------------------------------------------------------------
+Bool InGameUI::areAllObjectsSelected(const std::vector<Object*>& objectsToCheck) const
+{
+	for (std::vector<Object*>::const_iterator it = objectsToCheck.begin(); it != objectsToCheck.end(); ++it)
+	{
+		if (!(*it)->getDrawable()->isSelected())
+			return FALSE;
+	}
+
+	return TRUE;
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -3385,11 +3576,11 @@ Bool InGameUI::isAnySelectedKindOf( KindOfType kindOf ) const
 		if( draw && draw->isKindOf( kindOf ) )
 			return TRUE;
 
-	}  // end for, it
+	}
 
 	return FALSE;  // no selected objects are of the kind of type
 
-}  // end isAnySelectedKindOf
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -3409,11 +3600,11 @@ Bool InGameUI::isAllSelectedKindOf( KindOfType kindOf ) const
 		if( draw && draw->isKindOf( kindOf ) == FALSE )
 			return FALSE;  // not all objects are of the kind of type
 
-	}  // end for, it
+	}
 
 	return TRUE;  // all objects have this kindof bit set in them
 
-}  // end isAllSelectedKindOf
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the input enabled/disabled */
@@ -3422,11 +3613,11 @@ void InGameUI::setInputEnabled( Bool enable )
 {
 	if(!enable)
 		setSelecting( FALSE );
-	
+
 	Bool wasEnabled = m_inputEnabled;
 
 	m_inputEnabled = enable;
-	
+
 	if (wasEnabled && !enable)
 	{
 		/*
@@ -3455,8 +3646,37 @@ void InGameUI::disregardDrawable( Drawable *draw )
 {
 
 	// make sure drawable is no longer selected
-	deselectDrawable( draw );		
+	deselectDrawable( draw );
+
+}
+
+//-------------------------------------------------------------------------------------------------
+/** This is called after the WindowManager has drawn the menus. */
+//-------------------------------------------------------------------------------------------------
+void InGameUI::postWindowDraw( void )
+{
+	Int hudOffsetX = 0;
+	Int hudOffsetY = 0;
 
+	if (m_networkLatencyPointSize > 0 && TheGameLogic->isInMultiplayerGame())
+	{
+		drawNetworkLatency(hudOffsetX, hudOffsetY);
+	}
+
+	if (m_renderFpsPointSize > 0)
+	{
+		drawRenderFps(hudOffsetX, hudOffsetY);
+	}
+
+	if (m_systemTimePointSize > 0)
+	{
+		drawSystemTime(hudOffsetX, hudOffsetY);
+	}
+
+	if ( (m_gameTimePointSize > 0) && !TheGameLogic->isInShellGame() && TheGameLogic->isInGame() )
+	{
+		drawGameTime();
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -3488,14 +3708,16 @@ void InGameUI::postDraw( void )
 				m_uiMessages[ i ].displayString->draw( x, y, m_uiMessages[ i ].color, dropColor );
 
 				// increment text spot to next location
-				GameFont *font = m_uiMessages[ i ].displayString->getFont();
-				y += font->height;
+				if (GameFont *font = m_uiMessages[ i ].displayString->getFont())
+				{
+					y += font->height;
+				}
 
-			}  //end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 
 	if( m_militarySubtitle )
 	{
@@ -3525,16 +3747,16 @@ void InGameUI::postDraw( void )
 
 	// draw superweapon timers
   // Also responsible for Eva saying "Superweapon is ready for launch"
-  //  IMPORTANT: Don't bail out of this block early just because you don't 
+  //  IMPORTANT: Don't bail out of this block early just because you don't
   //  want to display the timers -- Eva still needs to be checked
 	if (TheGameLogic->getFrame() > 0 )
 	{
 //	Int superweaponCount = 0;
 		Int startX = (Int)(m_superweaponPosition.x * TheDisplay->getWidth());
 		Int startY = (Int)(m_superweaponPosition.y * TheDisplay->getHeight());
-		
-		Int bottomMargin = (Int)( (Real)TheTacticalView->getHeight() * 0.82f ); 
-			
+
+		Int bottomMargin = (Int)( (Real)TheTacticalView->getHeight() * 0.82f );
+
 
 
 		Bool marginExceeded = FALSE;
@@ -3559,14 +3781,14 @@ void InGameUI::postDraw( void )
 							info->setText( ellipsis, ellipsis );
 							info->setFont( m_superweaponReadyFont, m_superweaponNormalPointSize, m_superweaponNormalBold );
 							info->drawTime( startX,	startY, m_superweaponFlashColor, bgColor );
-							
+
 							marginExceeded = TRUE;
 						}
 
 						Object * owningObject = TheGameLogic->findObjectByID(info->m_id);
 						if (owningObject)
 						{
-							
+
 							// We don't draw our timers until we are finished with construction.
 							// It is important that let the SpecialPowerUpdate is add its timer in its contructor,,
 							// since the science for it could be added before construction is finished,
@@ -3580,24 +3802,24 @@ void InGameUI::postDraw( void )
 								// found one - draw it
  								Bool isReady = module->isReady();
  								Int readySecs;
- 
-								// IsReady includes disabledness, so if you have a 0 timer disabled super, you don't want 
+
+								// IsReady includes disabledness, so if you have a 0 timer disabled super, you don't want
  								// the UnsignedInt to wrap around to hundreds of millions of seconds.
  								if( module->getReadyFrame() < TheGameLogic->getFrame() )
 									readySecs = 0;
- 								else 
+ 								else
  									readySecs = (module->getReadyFrame() - TheGameLogic->getFrame()) / LOGICFRAMES_PER_SECOND;
 								// Yes, integer math.  We can't have float imprecision display 4:01 on a disabled superweapon.
- 
+
                 // Only if we actually changed the ready status do we want to play an Eva event.
                 if ( isReady && !info->m_evaReadyPlayed )
                 {
                   if ( TheGameLogic->getFrame() > 0 )
                   {
                     SpecialPowerType type = module->getSpecialPowerTemplate()->getSpecialPowerType();
-                  
+
                     Player *localPlayer = ThePlayerList->getLocalPlayer();
-                  
+
                     if( type == SPECIAL_PARTICLE_UPLINK_CANNON || type == SUPW_SPECIAL_PARTICLE_UPLINK_CANNON || type == LAZR_SPECIAL_PARTICLE_UPLINK_CANNON )
                     {
                       if ( localPlayer == owningObject->getControllingPlayer() )
@@ -3654,7 +3876,7 @@ void InGameUI::postDraw( void )
                   if ( !isReady )
                     info->m_evaReadyPlayed = false; // Reset Eva for next time
                 }
-              
+
                 // draw the text
                 if ( !m_superweaponHiddenByScript && !marginExceeded )
                 {
@@ -3675,8 +3897,8 @@ void InGameUI::postDraw( void )
 											  info->setFont( m_superweaponNormalFont, m_superweaponNormalPointSize, m_superweaponNormalBold );
 										  }
 									  }
-                  
-									  
+
+
 									  info->m_forceUpdateText = false;
  									  info->m_ready = isReady;
 									  info->m_timestamp = readySecs;
@@ -3762,7 +3984,7 @@ void InGameUI::postDraw( void )
 					if (!readySecs && info->isCountdown)
 					{
 						// go bold - we're good to go
-						info->displayString->setFont( TheFontLibrary->getFont( m_namedTimerReadyFont, 
+						info->displayString->setFont( TheFontLibrary->getFont( m_namedTimerReadyFont,
 							TheGlobalLanguageData->adjustFontSize(m_namedTimerReadyPointSize), m_namedTimerReadyBold ) );
 					}
 					else
@@ -3770,7 +3992,7 @@ void InGameUI::postDraw( void )
 						// if we were at 0, we've just fired - kill the bold
 						if (info->timestamp == 0 || info->isCountdown)
 						{
-							info->displayString->setFont( TheFontLibrary->getFont( m_namedTimerNormalFont, 
+							info->displayString->setFont( TheFontLibrary->getFont( m_namedTimerNormalFont,
 								TheGlobalLanguageData->adjustFontSize(m_namedTimerNormalPointSize), m_namedTimerNormalBold ) );
 						}
 					}
@@ -3778,7 +4000,7 @@ void InGameUI::postDraw( void )
 					info->timestamp = readySecs;
 					Int min = readySecs/60;
 					Int sec = readySecs - min*60;
-					
+
 					if (!info->isCountdown)
 						line.format(L"%s %d", info->timerText.str(), framesLeft);
 					else
@@ -3821,7 +4043,7 @@ void InGameUI::postDraw( void )
 			}
 		}
 	}
-	
+
 	// draw RMB scroll anchor
 	if (TheLookAtTranslator && m_drawRMBScrollAnchor)
 	{
@@ -3843,7 +4065,7 @@ void InGameUI::postDraw( void )
 	//draw superweapon ready multipliers
 	TheControlBar->drawSpecialPowerShortcutMultiplierText();
 
-}  // end postDraw
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Expire a hint of the specified type with the corresponding hint index */
@@ -3861,7 +4083,7 @@ void InGameUI::expireHint( HintType type, UnsignedInt hintIndex )
 		m_moveHint[ hintIndex ].sourceID = 0;
 		m_moveHint[ hintIndex ].frame = 0;
 
-	}  // end if
+	}
 	else
 	{
 
@@ -3869,9 +4091,9 @@ void InGameUI::expireHint( HintType type, UnsignedInt hintIndex )
 		DEBUG_CRASH(("undefined hint type"));
 		return;
 
-	}  // end else
+	}
 
-}  // end expireHint
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create the control user interface GUI */
@@ -3879,16 +4101,16 @@ void InGameUI::expireHint( HintType type, UnsignedInt hintIndex )
 void InGameUI::createControlBar( void )
 {
 
-	TheWindowManager->winCreateFromScript( AsciiString("ControlBar.wnd") );
+	TheWindowManager->winCreateFromScript( "ControlBar.wnd" );
 	HideControlBar();
-/*	
+/*
 	// hide all windows created from this layout
 	GameWindow *window = TheWindowManager->winGetWindowList();
 	for( ; window; window = window->winGetPrev() )
 		window->winHide( TRUE );
 */
 
-}  // end createControlBar
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create the replay control GUI */
@@ -3896,16 +4118,16 @@ void InGameUI::createControlBar( void )
 void InGameUI::createReplayControl( void )
 {
 
-	m_replayWindow = TheWindowManager->winCreateFromScript( AsciiString("ReplayControl.wnd") );
+	m_replayWindow = TheWindowManager->winCreateFromScript( "ReplayControl.wnd" );
 
-/*	
+/*
 	// hide all windows created from this layout
 	GameWindow *window = TheWindowManager->winGetWindowList();
 	for( ; window; window = window->winGetPrev() )
 		window->winHide( TRUE );
 */
 
-}  // end createReplayControl
+}
 
 // ------------------------------------------------------------------------------------------------
 // InGameUI::playMovie
@@ -3925,8 +4147,8 @@ void InGameUI::playMovie( const AsciiString& movieName )
 	m_currentlyPlayingMovie = movieName;
 	m_videoBuffer = TheDisplay->createVideoBuffer();
 
-	if (	m_videoBuffer == NULL || 
-				!m_videoBuffer->allocate(	m_videoStream->width(), 
+	if (	m_videoBuffer == NULL ||
+				!m_videoBuffer->allocate(	m_videoStream->width(),
 													m_videoStream->height())
 		)
 	{
@@ -3979,15 +4201,15 @@ void InGameUI::playCameoMovie( const AsciiString& movieName )
 
 	m_cameoVideoBuffer = TheDisplay->createVideoBuffer();
 
-	if (	m_cameoVideoBuffer == NULL || 
-				!m_cameoVideoBuffer->allocate(	m_cameoVideoStream->width(), 
+	if (	m_cameoVideoBuffer == NULL ||
+				!m_cameoVideoBuffer->allocate(	m_cameoVideoStream->width(),
 													m_cameoVideoStream->height())
 		)
 	{
 		stopCameoMovie();
 		return;
 	}
-	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:RightHUD") ));
+	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:RightHUD" ));
 	WinInstanceData *winData = window->winGetInstanceData();
 	winData->setVideoBuffer(m_cameoVideoBuffer);
 //	window->winHide(FALSE);
@@ -3998,12 +4220,12 @@ void InGameUI::playCameoMovie( const AsciiString& movieName )
 void InGameUI::stopCameoMovie( void )
 {
 //RightHUD
-	//GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:CameoMovieWindow") ));
-	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:RightHUD") ));
+	//GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:CameoMovieWindow" ));
+	GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:RightHUD" ));
 //	window->winHide(FALSE);
 	WinInstanceData *winData = window->winGetInstanceData();
 	winData->setVideoBuffer(NULL);
-	
+
 	delete m_cameoVideoBuffer;
 	m_cameoVideoBuffer = NULL;
 
@@ -4012,7 +4234,7 @@ void InGameUI::stopCameoMovie( void )
 		m_cameoVideoStream->close();
 		m_cameoVideoStream = NULL;
 	}
-	
+
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -4033,44 +4255,44 @@ void InGameUI::displayCantBuildMessage( LegalBuildCode lbc )
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_RESTRICTED_TERRAIN:
-			TheInGameUI->message( "GUI:CantBuildRestrictedTerrain" );
+			message( "GUI:CantBuildRestrictedTerrain" );
 			break;
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_NOT_FLAT_ENOUGH:
-			TheInGameUI->message( "GUI:CantBuildNotFlatEnough" );
+			message( "GUI:CantBuildNotFlatEnough" );
 			break;
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_OBJECTS_IN_THE_WAY:
-			TheInGameUI->message( "GUI:CantBuildObjectsInTheWay" );
+			message( "GUI:CantBuildObjectsInTheWay" );
 			break;
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_TOO_CLOSE_TO_SUPPLIES:
-			TheInGameUI->message( "GUI:CantBuildTooCloseToSupplies" );
+			message( "GUI:CantBuildTooCloseToSupplies" );
 			break;
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_NO_CLEAR_PATH:
-		  TheInGameUI->message( "GUI:CantBuildNoClearPath" );
+		  message( "GUI:CantBuildNoClearPath" );
 			break;
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_SHROUD:
-			TheInGameUI->message( "GUI:CantBuildShroud" );
+			message( "GUI:CantBuildShroud" );
 			break;
 
 		//---------------------------------------------------------------------------------------------
 		case LBC_GENERIC_FAILURE:
 		default:
 
-			TheInGameUI->message( "GUI:CantBuildThere" );
+			message( "GUI:CantBuildThere" );
 			break;
 
-	}  // end switch
+	}
 
-}  // end displayCantBuildMessage
+}
 
 // ------------------------------------------------------------------------------------------------
 // InGameUI::militarySubtitle
@@ -4097,13 +4319,13 @@ void InGameUI::militarySubtitle( const AsciiString& label, Int duration )
 	const int messageTimeout = currLogicFrame + (Int)(((Real)LOGICFRAMES_PER_SECOND * duration)/1000.0f);
 
 	// disable tooltips until this frame, cause we don't want to collide with the military subtitles.
-	TheInGameUI->disableTooltipsUntil(messageTimeout);
-	
+	disableTooltipsUntil(messageTimeout);
+
 	// calculate where this screen position should be since the position being passed in is based off 8x6
 	Coord2D multiplier;
-	multiplier.x = (float)TheDisplay->getWidth() / 800.0f;
-	multiplier.y = (float)TheDisplay->getHeight() / 600.0f;
-	
+	multiplier.x = (Real)TheDisplay->getWidth() / (Real)DEFAULT_DISPLAY_WIDTH;
+	multiplier.y = (Real)TheDisplay->getHeight() / (Real)DEFAULT_DISPLAY_HEIGHT;
+
 	// lets bring out the data structure!
 	m_militarySubtitle = NEW MilitarySubtitleData;
 
@@ -4121,7 +4343,7 @@ void InGameUI::militarySubtitle( const AsciiString& label, Int duration )
 	m_militarySubtitle->currentDisplayString = 0;
 	m_militarySubtitle->displayStrings[0] = TheDisplayStringManager->newDisplayString();
 	m_militarySubtitle->displayStrings[0]->reset();
-	m_militarySubtitle->displayStrings[0]->setFont(	TheFontLibrary->getFont( m_militaryCaptionTitleFont, 
+	m_militarySubtitle->displayStrings[0]->setFont(	TheFontLibrary->getFont( m_militaryCaptionTitleFont,
 		TheGlobalLanguageData->adjustFontSize(m_militaryCaptionTitlePointSize), m_militaryCaptionTitleBold ) );
 	m_militarySubtitle->color = GameMakeColor(m_militaryCaptionColor.red, m_militaryCaptionColor.green, m_militaryCaptionColor.blue, m_militaryCaptionColor.alpha);
 }
@@ -4135,7 +4357,7 @@ void InGameUI::removeMilitarySubtitle( void )
 	if(!m_militarySubtitle)
 		return;
 
-	TheInGameUI->clearTooltipsDisabled();
+	clearTooltipsDisabled();
 
 	// loop through and free up the display strings
 	for(UnsignedInt i = 0; i <= m_militarySubtitle->currentDisplayString; i ++)
@@ -4154,7 +4376,7 @@ void InGameUI::removeMilitarySubtitle( void )
 // ------------------------------------------------------------------------------------------------
 Bool InGameUI::areSelectedObjectsControllable() const
 {
-	const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
+	const DrawableList *selected = getAllSelectedDrawables();
 
 	// loop through all the selected drawables
 	const Drawable *draw;
@@ -4163,7 +4385,7 @@ Bool InGameUI::areSelectedObjectsControllable() const
 		// get this drawable
 		draw = *it;
 
-		// All selected objects will have the same local controller, so 
+		// All selected objects will have the same local controller, so
 		// simply return the first one.
 		return draw->getObject()->isLocallyControlled();
 	}
@@ -4178,12 +4400,12 @@ Bool InGameUI::areSelectedObjectsControllable() const
 void InGameUI::resetCamera()
 {
 	ViewLocation currentView;
-	TheTacticalView->getLocation( &currentView ); 
+	TheTacticalView->getLocation( &currentView );
 	TheTacticalView->resetCamera( &currentView.getPosition(), 1, 0.0f, 0.0f );
 }
 
 //------------------------------------------------------------------------------
-//Checks to see if an object can interact with an object in a non-hostile manner. This is currently used by the selection 
+//Checks to see if an object can interact with an object in a non-hostile manner. This is currently used by the selection
 //translator to determine whether to do something to an object or select it instead based on the context of what is currently
 //selected.
 //------------------------------------------------------------------------------
@@ -4205,7 +4427,7 @@ Bool InGameUI::canSelectedObjectsNonAttackInteractWithObject( const Object *obje
 CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const Object *objectToInteractWith, SelectionRules rule, Bool additionalChecking ) const
 {
 	//Kris: Aug 16, 2003
-	//John McDonald added this code back in Oct 09, 2002. 
+	//John McDonald added this code back in Oct 09, 2002.
 	//Replaced it with palatable code.
 	//if( (objectToInteractWith == NULL) != (action == ACTIONTYPE_SET_RALLY_POINT)) <---BAD CODE
 	if( !objectToInteractWith && action != ACTIONTYPE_SET_RALLY_POINT || //No object to interact with (and not rally point mode)
@@ -4216,7 +4438,7 @@ CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const
 	}
 
 	// get selected list of drawables
-	const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
+	const DrawableList *selected = getAllSelectedDrawables();
 
 	// set up counters for rule checking
 	Int count = 0;
@@ -4227,7 +4449,7 @@ CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const
 	Drawable *other;
 	for( DrawableListCIt it = selected->begin(); it != selected->end(); ++it )
 	{
-	
+
 		// get this drawable
 		other = *it;
 		count++;
@@ -4237,7 +4459,7 @@ CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const
 			case ACTIONTYPE_ATTACK_OBJECT:
 			{
 				//additionalChecking is TRUE only if force attack mode is on.
-				CanAttackResult result = 	TheActionManager->getCanAttackObject( other->getObject(), objectToInteractWith, CMD_FROM_PLAYER, 
+				CanAttackResult result = 	TheActionManager->getCanAttackObject( other->getObject(), objectToInteractWith, CMD_FROM_PLAYER,
 									additionalChecking ? ATTACK_NEW_TARGET_FORCED : ATTACK_NEW_TARGET );
 
 				if( result > bestResult )
@@ -4274,12 +4496,12 @@ CanAttackResult InGameUI::getCanSelectedObjectsAttack( ActionType action, const
 			case ACTIONTYPE_MAKE_DEFECTOR:
 			case ACTIONTYPE_SET_RALLY_POINT:
 			default:
-				DEBUG_CRASH( ("Called InGameUI::getCanSelectedObjectsAttack() with actiontype %d. Only accepts attack types! Should you be calling InGameUI::canSelectedObjectsDoAction() instead?") );
+				DEBUG_CRASH( ("Called InGameUI::getCanSelectedObjectsAttack() with actiontype %d. Only accepts attack types! Should you be calling InGameUI::canSelectedObjectsDoAction() instead?", action) );
 				return ATTACKRESULT_INVALID_SHOT;
 
 		}
 
-	}  // end for
+	}
 
 	if( count > 0 )
 	{
@@ -4304,7 +4526,7 @@ Bool InGameUI::canSelectedObjectsDoAction( ActionType action, const Object *obje
 	//John McDonald added this code back in Oct 09, 2002. This code is SO wrong that it should
 	//be a firing offense. Strangely enough, this code has gone unnoticed for nearly a year
 	//and nearly two projects. I'm fixing this now by moving it to the rally point code...
-	//because it would be nice if a saboteur could actually sabotage a building via a 
+	//because it would be nice if a saboteur could actually sabotage a building via a
 	//commandbutton.
 	//if( (objectToInteractWith == NULL) != (action == ACTIONTYPE_SET_RALLY_POINT))
 	if( !objectToInteractWith && action != ACTIONTYPE_SET_RALLY_POINT || //No object to interact with (and not rally point mode)
@@ -4315,7 +4537,7 @@ Bool InGameUI::canSelectedObjectsDoAction( ActionType action, const Object *obje
 	}
 
 	// get selected list of drawables
-	const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
+	const DrawableList *selected = getAllSelectedDrawables();
 
 	// set up counters for rule checking
 	Int count = 0;
@@ -4325,7 +4547,7 @@ Bool InGameUI::canSelectedObjectsDoAction( ActionType action, const Object *obje
 	Drawable *other;
 	for( DrawableListCIt it = selected->begin(); it != selected->end(); ++it )
 	{
-	
+
 		// get this drawable
 		other = *it;
 		count++;
@@ -4350,7 +4572,7 @@ Bool InGameUI::canSelectedObjectsDoAction( ActionType action, const Object *obje
 					ContainModuleInterface *contain = objectToInteractWith->getContain();
 					if( contain && contain->isHealContain() )
 					{
-						//This container is only used for the purposes of healing and we cannot 
+						//This container is only used for the purposes of healing and we cannot
 						//enter it normally -- this is NOT a transport!
 						success = false;
 					}
@@ -4358,11 +4580,11 @@ Bool InGameUI::canSelectedObjectsDoAction( ActionType action, const Object *obje
 				break;
 			case ACTIONTYPE_REPAIR_OBJECT:
 			{
-				ObjectID currentRepairer = objectToInteractWith->getSoleHealingBenefactor(); 
-				success = ( TheActionManager->canRepairObject( other->getObject(), objectToInteractWith, CMD_FROM_PLAYER ) 
+				ObjectID currentRepairer = objectToInteractWith->getSoleHealingBenefactor();
+				success = ( TheActionManager->canRepairObject( other->getObject(), objectToInteractWith, CMD_FROM_PLAYER )
 										&& ( currentRepairer == INVALID_ID || currentRepairer == other->getObject()->getID() ) );
 											// unless someone else is already healing it...
-											// please note that this add'l test is left out of canRepairObject() since canRepairObject 
+											// please note that this add'l test is left out of canRepairObject() since canRepairObject
 											// gets called from within the Dozer/WorkerAIUpdates' stateMachines as they continue the repair process.
 											// This remains true.
 				break;
@@ -4430,7 +4652,7 @@ Bool InGameUI::canSelectedObjectsDoAction( ActionType action, const Object *obje
 
 			++qualify;
 		}
-	}  // end for
+	}
 
 	//If the rule is all must qualify, do the check now and return success
 	//only if all the selected units qualified.
@@ -4463,7 +4685,7 @@ Bool InGameUI::canSelectedObjectsDoSpecialPower( const CommandButton *command, c
 	}
 	if( doAtPosition && !position )
 	{
-		return false;		
+		return false;
 	}
 
 	// get selected list of drawables
@@ -4473,7 +4695,7 @@ Bool InGameUI::canSelectedObjectsDoSpecialPower( const CommandButton *command, c
 	if (ignoreSelDraw)
 		tmpList.push_back(ignoreSelDraw);
 
-	const DrawableList* selected = (tmpList.size() > 0) ? &tmpList : TheInGameUI->getAllSelectedDrawables();
+	const DrawableList* selected = (!tmpList.empty()) ? &tmpList : getAllSelectedDrawables();
 
 	// set up counters for rule checking
 	Int count = 0;
@@ -4482,7 +4704,7 @@ Bool InGameUI::canSelectedObjectsDoSpecialPower( const CommandButton *command, c
 	// loop through all the selected drawables
 	for( DrawableListCIt it = selected->begin(); it != selected->end(); ++it )
 	{
-	
+
 		// get this drawable
 		Drawable* other = *it;
 		count++;
@@ -4539,13 +4761,13 @@ Bool InGameUI::canSelectedObjectsOverrideSpecialPowerDestination( const Coord3D
 	Int qualify = 0;
 
 	// get selected list of drawables
-	const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
+	const DrawableList *selected = getAllSelectedDrawables();
 
 	// loop through all the selected drawables
 	Drawable *other;
 	for( DrawableListCIt it = selected->begin(); it != selected->end(); ++it )
 	{
-	
+
 		// get this drawable
 		other = *it;
 		count++;
@@ -4587,11 +4809,11 @@ Bool InGameUI::canSelectedObjectsEffectivelyUseWeapon( const CommandButton *comm
 	}
 	if( doAtPosition && !position )
 	{
-		return false;		
+		return false;
 	}
 
 	// get selected list of drawables
-	const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
+	const DrawableList *selected = getAllSelectedDrawables();
 
 	// set up counters for rule checking
 	Int count = 0;
@@ -4601,7 +4823,7 @@ Bool InGameUI::canSelectedObjectsEffectivelyUseWeapon( const CommandButton *comm
 	Drawable *other;
 	for( DrawableListCIt it = selected->begin(); it != selected->end(); ++it )
 	{
-	
+
 		// get this drawable
 		other = *it;
 		count++;
@@ -4720,7 +4942,7 @@ Int InGameUI::selectMatchingAcrossRegion( IRegion2D *region )
 	//std::set<AsciiString> drawableList;
 	std::set<const ThingTemplate*> drawableList;
 	Bool carBomb = FALSE;
-	
+
 	for( DrawableListCIt it = selected->begin(); it != selected->end(); ++it )
 	{
 		// get this drawable
@@ -4736,7 +4958,7 @@ Int InGameUI::selectMatchingAcrossRegion( IRegion2D *region )
 		}
 	}
 
-	if (drawableList.size() == 0)
+	if (drawableList.empty())
 		return -1; // nothing useful selected to begin with - don't bother iterating
 
 	std::set<const ThingTemplate*>::iterator iter;
@@ -4794,30 +5016,30 @@ Int InGameUI::selectMatchingAcrossRegion( IRegion2D *region )
 Int InGameUI::selectAllUnitsByTypeAcrossScreen(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear)
 {
 	/// When implementing this, obey TheInGameUI->getMaxSelectCount() if it is > 0
-			
+
 	IRegion2D region;
 	ICoord2D origin;
 	ICoord2D size;
- 
+
 	TheTacticalView->getOrigin( &origin.x, &origin.y );
 	size.x = TheTacticalView->getWidth();
 	size.y = TheTacticalView->getHeight();
- 
+
 	buildRegion( &origin, &size, &region );
 
 	Int numSelected = selectAllUnitsByTypeAcrossRegion(&region, mustBeSet, mustBeClear);
 	if (numSelected == -1)
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:NothingSelected" );
+		message( msgStr );
 	}
 	else if (numSelected == 0)
 	{
 	}
 	else
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossScreen" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:SelectedAcrossScreen" );
+		message( msgStr );
 	}
 	return numSelected;
 }
@@ -4828,30 +5050,30 @@ Int InGameUI::selectAllUnitsByTypeAcrossScreen(KindOfMaskType mustBeSet, KindOfM
 Int InGameUI::selectMatchingAcrossScreen( void )
 {
 	/// When implementing this, obey TheInGameUI->getMaxSelectCount() if it is > 0
-			
+
 	IRegion2D region;
 	ICoord2D origin;
 	ICoord2D size;
- 
+
 	TheTacticalView->getOrigin( &origin.x, &origin.y );
 	size.x = TheTacticalView->getWidth();
 	size.y = TheTacticalView->getHeight();
- 
+
 	buildRegion( &origin, &size, &region );
 
 	Int numSelected = selectMatchingAcrossRegion(&region);
 	if (numSelected == -1)
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:NothingSelected" );
+		message( msgStr );
 	}
 	else if (numSelected == 0)
 	{
 	}
 	else
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossScreen" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:SelectedAcrossScreen" );
+		message( msgStr );
 	}
 	return numSelected;
 }
@@ -4863,22 +5085,22 @@ Int InGameUI::selectAllUnitsByTypeAcrossMap(KindOfMaskType mustBeSet, KindOfMask
 	Int numSelected = selectAllUnitsByTypeAcrossRegion(NULL, mustBeSet, mustBeClear);
 	if (numSelected == -1)
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:NothingSelected" );
+		message( msgStr );
 	}
 	else if (numSelected == 0)
 	{
-		Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
+		Drawable *draw = getFirstSelectedDrawable();
 		if( !draw || !draw->getObject() || !draw->getObject()->isKindOf( KINDOF_STRUCTURE ) )
 		{
-			UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-			TheInGameUI->message( message );
+			UnicodeString msgStr = TheGameText->fetch( "GUI:SelectedAcrossMap" );
+			message( msgStr );
 		}
 	}
 	else
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:SelectedAcrossMap" );
+		message( msgStr );
 	}
 	return numSelected;
 }
@@ -4892,22 +5114,22 @@ Int InGameUI::selectMatchingAcrossMap()
 	Int numSelected = selectMatchingAcrossRegion(NULL);
 	if (numSelected == -1)
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:NothingSelected" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:NothingSelected" );
+		message( msgStr );
 	}
 	else if (numSelected == 0)
 	{
-		Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
+		Drawable *draw = getFirstSelectedDrawable();
 		if( !draw || !draw->getObject() || !draw->getObject()->isKindOf( KINDOF_STRUCTURE ) )
 		{
-			UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-			TheInGameUI->message( message );
+			UnicodeString msgStr = TheGameText->fetch( "GUI:SelectedAcrossMap" );
+			message( msgStr );
 		}
 	}
 	else
 	{
-		UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-		TheInGameUI->message( message );
+		UnicodeString msgStr = TheGameText->fetch( "GUI:SelectedAcrossMap" );
+		message( msgStr );
 	}
 	return numSelected;
 }
@@ -5003,25 +5225,25 @@ void InGameUI::addFloatingText(const UnicodeString& text,const Coord3D *pos, Col
 		newFTD->m_pos3D.y = pos->y;
 		newFTD->m_text = text;
 		newFTD->m_dString->setText(text);
-		
-			
+
+
 		if(m_floatingTextTimeOut <= 0)
 			newFTD->m_frameTimeOut = TheGameLogic->getFrame() +  DEFAULT_FLOATING_TEXT_TIMEOUT;
 		else
-			newFTD->m_frameTimeOut = TheGameLogic->getFrame() +  m_floatingTextTimeOut; 
-		
+			newFTD->m_frameTimeOut = TheGameLogic->getFrame() +  m_floatingTextTimeOut;
+
 		m_floatingTextList.push_front( newFTD ); // add to the list
 	}
 }
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 inline Bool isClose(Real a, Real b) { return fabs(a-b) <= 1.0f; }
-inline Bool isClose(const Coord3D& a, const Coord3D& b) 
+inline Bool isClose(const Coord3D& a, const Coord3D& b)
 {
-		return	isClose(a.x, b.x) && 
-			isClose(a.y, b.y) && 
+		return	isClose(a.x, b.x) &&
+			isClose(a.y, b.y) &&
 			isClose(a.z, b.z);
 }
 void InGameUI::DEBUG_addFloatingText(const AsciiString& text, const Coord3D * pos, Color color)
@@ -5050,16 +5272,16 @@ void InGameUI::DEBUG_addFloatingText(const AsciiString& text, const Coord3D * po
 	translate.translate(text);
 	newFTD->m_text = translate;
 	newFTD->m_dString->setText(translate);
-	newFTD->m_dString->setFont(TheWindowManager->winFindFont( AsciiString("Arial"), POINTSIZE, FALSE ));
-				
+	newFTD->m_dString->setFont(TheWindowManager->winFindFont( "Arial", POINTSIZE, FALSE ));
+
 	if(m_floatingTextTimeOut <= 0)
 		newFTD->m_frameTimeOut = TheGameLogic->getFrame() +  DEFAULT_FLOATING_TEXT_TIMEOUT;
 	else
-		newFTD->m_frameTimeOut = TheGameLogic->getFrame() +  m_floatingTextTimeOut; 
-	
+		newFTD->m_frameTimeOut = TheGameLogic->getFrame() +  m_floatingTextTimeOut;
+
 	m_floatingTextList.push_front( newFTD ); // add to the list
 
-	//DEBUG_LOG(("%s\n",text.str()));
+	//DEBUG_LOG(("%s",text.str()));
 }
 #endif
 
@@ -5077,22 +5299,22 @@ void InGameUI::updateFloatingText( void )
 	// only update the position if we're incrementing frames
 	if(lastLogicFrameUpdate == currLogicFrame)
 		return;
-	
+
 	lastLogicFrameUpdate = currLogicFrame;
 
 	// Loop through our floating text list
 	for(FloatingTextListIt it = m_floatingTextList.begin(); it != m_floatingTextList.end();)
 	{
 		ftd = *it;
-		
+
 		// move it up
 		++ftd->m_frameCount;
-		
+
 		// fade the text
 		if( currLogicFrame > ftd->m_frameTimeOut)
 		{
 			// modify the color
-			GameGetColorComponents(ftd->m_color, &r, &g, &b, &a);		
+			GameGetColorComponents(ftd->m_color, &r, &g, &b, &a);
 			amount = REAL_TO_INT( (currLogicFrame - ftd->m_frameTimeOut) * m_floatingTextMoveVanishRate);
 			if(a - amount < 0)
 				a = 0;
@@ -5110,13 +5332,13 @@ void InGameUI::updateFloatingText( void )
 		}
 		// increase our itterator
 		++it;
-	
+
 	}
 
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Itterates through and draws each floating text */
+/** Iterates through and draws each floating text */
 //-------------------------------------------------------------------------------------------------
 void InGameUI::drawFloatingText( void )
 {
@@ -5126,17 +5348,16 @@ void InGameUI::drawFloatingText( void )
 	{
 		ftd = *it;
 		ICoord2D pos;
-		// get the local player's index
-		Int playerNdx = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+		const Int playerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
 
 		// which PartitionManager cells are we looking at?
 		Int pCX, pCY;
 		ThePartitionManager->worldToCell(ftd->m_pos3D.x, ftd->m_pos3D.y, &pCX, &pCY);
 
 		// translate it's 3d pos into a 2d screen pos
-		if( TheTacticalView->worldToScreen(&ftd->m_pos3D, &pos) 
-			&& ftd->m_dString 
-			&& ThePartitionManager->getShroudStatusForPlayer(playerNdx, pCX, pCY) == CELLSHROUD_CLEAR )
+		if( TheTacticalView->worldToScreen(&ftd->m_pos3D, &pos)
+			&& ftd->m_dString
+			&& ThePartitionManager->getShroudStatusForPlayer(playerIndex, pCX, pCY) == CELLSHROUD_CLEAR )
 		{
 			pos.y -= ftd->m_frameCount * m_floatingTextMoveUpSpeed;
 			Color dropColor;
@@ -5167,7 +5388,7 @@ void InGameUI::clearFloatingText( void )
 		it = m_floatingTextList.erase(it);
 		deleteInstance(ftd);
 	}
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -5190,14 +5411,14 @@ void InGameUI::popupMessage( const AsciiString& identifier, Int x, Int y, Int wi
 
 	UnicodeString message = TheGameText->fetch(identifier);
 
-	m_popupMessageData = newInstance( PopupMessageData );	
+	m_popupMessageData = newInstance( PopupMessageData );
 	m_popupMessageData->message = message;
 	// x and why are passed in as a percentage of the screen, convert to screen coords
 	if( x > 100 )
 		x = 100;
 	if( x < 0 )
 		x = 0;
-	
+
 	if( y > 100 )
 		y = 100;
 	if( y < 0 )
@@ -5216,7 +5437,7 @@ void InGameUI::popupMessage( const AsciiString& identifier, Int x, Int y, Int wi
 	if( pause )
 		TheGameLogic->setGamePaused(TRUE, pauseMusic);
 
-	m_popupMessageData->layout = TheWindowManager->winCreateLayout(AsciiString("InGamePopupMessage.wnd"));
+	m_popupMessageData->layout = TheWindowManager->winCreateLayout("InGamePopupMessage.wnd");
 	m_popupMessageData->layout->runInit();
 }
 
@@ -5237,7 +5458,7 @@ void InGameUI::clearPopupMessageData( void )
 		TheGameLogic->setGamePaused(FALSE, m_popupMessageData->pauseMusic);
 	deleteInstance(m_popupMessageData);
 	m_popupMessageData = NULL;
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -5250,14 +5471,11 @@ void InGameUI::clearPopupMessageData( void )
 //-------------------------------------------------------------------------------------------------
 FloatingTextData::FloatingTextData(void)
 {
-	// Added By Sadullah Nader
-	// Initializations missing and needed
 	m_color = 0;
 	m_frameCount = 0;
 	m_frameTimeOut = 0;
 	m_pos3D.zero();
 	m_text.clear();
-	//
 	m_dString = TheDisplayStringManager->newDisplayString();
 }
 
@@ -5288,7 +5506,7 @@ WorldAnimationData::WorldAnimationData( void )
 	m_options = WORLD_ANIM_NO_OPTIONS;
 	m_zRisePerSecond = 0.0f;
 
-}  // end WorldAnimationData
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add a 2D animation at a spot in the world */
@@ -5308,7 +5526,7 @@ void InGameUI::addWorldAnimation( Anim2DTemplate *animTemplate,
 	// (huh huh, he said "wad")
 	WorldAnimationData *wad = NEW WorldAnimationData;
 	if( wad == NULL )
-		return;		
+		return;
 
 	// allocate a new animation instance
 	Anim2D *anim = newInstance(Anim2D)( animTemplate, TheAnim2DCollection );
@@ -5323,37 +5541,31 @@ void InGameUI::addWorldAnimation( Anim2DTemplate *animTemplate,
 	// add to list
 	m_worldAnimationList.push_front( wad );
 
-}  // end addWorldAnimation
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Delete all world animations */
 // ------------------------------------------------------------------------------------------------
 void InGameUI::clearWorldAnimations( void )
 {
-	WorldAnimationData *wad;
-
 	// iterate through all entries and delete the animation data
-	for( WorldAnimationListIterator it = m_worldAnimationList.begin();	
+	for( WorldAnimationListIterator it = m_worldAnimationList.begin();
 			 it != m_worldAnimationList.end(); /*empty*/ )
 	{
 
-		wad = *it;
-		if( wad )
-		{
+		WorldAnimationData *wad = *it;
 
-			// delete the animation instance
-			deleteInstance(wad->m_anim);
+		// delete the animation instance
+		deleteInstance(wad->m_anim);
 
-			// delete the world animation data
-			delete wad;
-
-		}  // end if
+		// delete the world animation data
+		delete wad;
 
 		it = m_worldAnimationList.erase( it );
 
-	}  // end for
-	
-}  // end clearWorldAnimations
+	}
+
+}
 
 static const UnsignedInt FRAMES_BEFORE_EXPIRE_TO_FADE = LOGICFRAMES_PER_SECOND * 1;
 // ------------------------------------------------------------------------------------------------
@@ -5361,18 +5573,16 @@ static const UnsignedInt FRAMES_BEFORE_EXPIRE_TO_FADE = LOGICFRAMES_PER_SECOND *
 // ------------------------------------------------------------------------------------------------
 void InGameUI::updateAndDrawWorldAnimations( void )
 {
-	WorldAnimationData *wad;
-
 	// go through all animations
 	for( WorldAnimationListIterator it = m_worldAnimationList.begin();
 			 it != m_worldAnimationList.end(); /*empty*/ )
 	{
 
 		// get data
-		wad = *it;
+		WorldAnimationData *wad = *it;
 
 		// update portion ... only when the game is in motion
-		if( wad && TheGameLogic->isGamePaused() == FALSE )
+		if( TheGameLogic->isGamePaused() == FALSE )
 		{
 
 			//
@@ -5390,26 +5600,31 @@ void InGameUI::updateAndDrawWorldAnimations( void )
 				it = m_worldAnimationList.erase( it );
 				continue;
 
-			}  // end if
+			}
 
 			// update the Z value
+			// TheSuperHackers @tweak World animation Z-rise is now decoupled from the render update.
 			if( wad->m_zRisePerSecond )
-				wad->m_worldPos.z += wad->m_zRisePerSecond / LOGICFRAMES_PER_SECOND;
+			{
+				const Real timeScale = TheFramePacer->getActualLogicTimeScaleOverFpsRatio();
+				wad->m_worldPos.z += wad->m_zRisePerSecond / LOGICFRAMES_PER_SECOND * timeScale;
+			}
 
-		}  // end if
+		}
 
 		//
 		// don't bother going forward with the draw process if this location is shrouded for
 		// the local player
 		//
-		Int playerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+		const Int playerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
+
 		if( ThePartitionManager->getShroudStatusForPlayer( playerIndex, &wad->m_worldPos ) != CELLSHROUD_CLEAR )
 		{
 
 			++it;
 			continue;
 
-		}  // end if
+		}
 
 		// update translucency value
 		if( BitIsSet( wad->m_options, WORLD_ANIM_FADE_ON_EXPIRE ) )
@@ -5419,14 +5634,14 @@ void InGameUI::updateAndDrawWorldAnimations( void )
 			UnsignedInt framesTillExpire = wad->m_expireFrame - TheGameLogic->getFrame();
 			if( framesTillExpire < FRAMES_BEFORE_EXPIRE_TO_FADE )
 			{
-				
+
 				// compute alpha level so that we're totally gone by the expire frame
 				Real alpha = INT_TO_REAL( framesTillExpire ) / INT_TO_REAL( FRAMES_BEFORE_EXPIRE_TO_FADE );
 				wad->m_anim->setAlpha( alpha );
-				
-			}  // end if
 
-		}  // end if
+			}
+
+		}
 
 		// project the point to screen space
 		ICoord2D screen;
@@ -5436,7 +5651,9 @@ void InGameUI::updateAndDrawWorldAnimations( void )
 			UnsignedInt height = wad->m_anim->getCurrentFrameHeight();
 
 			// scale the width and height given the camera zoom level
-			Real zoomScale = TheTacticalView->getMaxZoom() / TheTacticalView->getZoom();
+			// TheSuperHackers @todo Rework this with sane values. scaler=1.3 originally came from TheTacticalView::getMaxZoom()
+			constexpr Real scaler = 1.3f;
+			Real zoomScale = scaler / TheTacticalView->getZoom();
 			width *= zoomScale;
 			height *= zoomScale;
 
@@ -5447,22 +5664,22 @@ void InGameUI::updateAndDrawWorldAnimations( void )
 			// draw the animation
 			wad->m_anim->draw( screen.x, screen.y, width, height );
 
-		}  // end if
+		}
 
 		// go to the next element in the list
 		++it;
 
-	}  // end for
+	}
 
-}  // end updateAndDrawWorldAnimations
+}
 
 
 Object *InGameUI::findIdleWorker( Object *obj)
 {
 	if(!obj)
 		return NULL;
-	
-	Int index = obj->getControllingPlayer()->getPlayerIndex();	
+
+	Int index = obj->getControllingPlayer()->getPlayerIndex();
 	if(m_idleWorkers[index].empty())
 		return NULL;
 
@@ -5498,11 +5715,11 @@ void InGameUI::removeIdleWorker( Object *obj, Int playerNumber )
 		return;
 	if(playerNumber < 0 || playerNumber >= MAX_PLAYER_COUNT)  // we're leaving the game, so this is all screwed
 		return;
-	
+
 	if(m_idleWorkers[playerNumber].empty())
 		return;
 
-	
+
 	ObjectListIt it = m_idleWorkers[playerNumber].begin();
 	while(it != m_idleWorkers[playerNumber].end())
 	{
@@ -5519,53 +5736,54 @@ void InGameUI::removeIdleWorker( Object *obj, Int playerNumber )
 
 void InGameUI::selectNextIdleWorker( void )
 {
-	Int index = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+	Player* player = rts::getObservedOrLocalPlayer();
+	Int index = player->getPlayerIndex();
+
 	if(m_idleWorkers[index].empty())
 	{
-		DEBUG_ASSERTCRASH(FALSE, ("InGameUI::selectNextIdleWorker We're trying to select a worker when our list is empty for player %ls", ThePlayerList->getLocalPlayer()->getPlayerDisplayName().str()));
+		DEBUG_ASSERTCRASH(FALSE, ("InGameUI::selectNextIdleWorker We're trying to select a worker when our list is empty for player %ls", player->getPlayerDisplayName().str()));
 		return;
 	}
 	Object *selectThisObject = NULL;
-	
+
 	if(getSelectCount() == 0 || getSelectCount() > 1)
 	{
 		selectThisObject = *m_idleWorkers[index].begin();
+		// If our idle worker is contained by anything, we need to select the container instead.
+		while (selectThisObject->getContainedBy())
+			selectThisObject = selectThisObject->getContainedBy();
 	}
 	else
 	{
-		Drawable *selectedDrawable = TheInGameUI->getFirstSelectedDrawable();	
-		
-		ObjectListIt it = m_idleWorkers[index].begin();
-		while(it != m_idleWorkers[index].end())
+		Drawable *selectedDrawable = getFirstSelectedDrawable();
+		// TheSuperHackers @tweak Stubbjax 22/07/2025 Idle worker iteration now correctly identifies and
+		// iterates contained idle workers. Previous iteration logic would not go past contained workers,
+		// and was not guaranteed to select top-level containers.
+		ObjectPtrVector uniqueIdleWorkers = getUniqueIdleWorkers(m_idleWorkers[index]);
+
+		ObjectPtrVector::iterator it = uniqueIdleWorkers.begin();
+		while(it != uniqueIdleWorkers.end())
 		{
 			Object *itObj = *it;
 			if(itObj == selectedDrawable->getObject())
 			{
 				++it;
-				if(it != m_idleWorkers[index].end())
+				if(it != uniqueIdleWorkers.end())
 					selectThisObject = *it;
 				else
-					selectThisObject = *m_idleWorkers[index].begin();
+					selectThisObject = *uniqueIdleWorkers.begin();
 				break;
 			}
 			++it;
 		}
 		// if we had something selected that wasn't a worker, we'll get here
-		if(!selectThisObject)
-			selectThisObject = *m_idleWorkers[index].begin();
-
+		if (!selectThisObject)
+			selectThisObject = uniqueIdleWorkers.front();
 	}
 	DEBUG_ASSERTCRASH(selectThisObject, ("InGameUI::selectNextIdleWorker Could not select the next IDLE worker"));
 	if(selectThisObject)
-	{	
-		
-		//If our idle worker is contained by anything, we need to select the container instead.
-		Object *containedBy = selectThisObject->getContainedBy();
-		if( containedBy )
-		{
-			selectThisObject = containedBy;
-		}
-
+	{
+		DEBUG_ASSERTCRASH(selectThisObject->getContainedBy() == NULL, ("InGameUI::selectNextIdleWorker Selected idle object should not be contained"));
 		deselectAllDrawables();
 		GameMessage *teamMsg = TheMessageStream->appendMessage( GameMessage::MSG_CREATE_SELECTED_GROUP );
 
@@ -5574,7 +5792,7 @@ void InGameUI::selectNextIdleWorker( void )
 		teamMsg->appendBooleanArgument( TRUE );
 
 		teamMsg->appendObjectIDArgument( selectThisObject->getID() );
-		
+
 		selectDrawable( selectThisObject->getDrawable() );
 
 		/*// removed becuase we're already playing a select sound... left in, just in case i"m wrong.
@@ -5584,15 +5802,34 @@ void InGameUI::selectNextIdleWorker( void )
 				{
 					TheAudio->addAudioEvent( soundEvent );
 				}*/
-		
+
 		// center on the unit
 		TheTacticalView->lookAt(selectThisObject->getPosition());
 	}
 }
 
+// Finds unique selectables to avoid selecting the same or a previous container if multiple idle workers are contained.
+ObjectPtrVector InGameUI::getUniqueIdleWorkers(const ObjectList& idleWorkers)
+{
+	ObjectPtrVector uniqueIdleWorkers;
+	uniqueIdleWorkers.reserve(idleWorkers.size());
+
+	for (ObjectList::const_iterator it = idleWorkers.begin(); it != idleWorkers.end(); ++it)
+	{
+		Object* itObj = *it;
+		while (itObj->getContainedBy())
+			itObj = itObj->getContainedBy();
+
+		stl::push_back_unique(uniqueIdleWorkers, itObj);
+	}
+
+	return uniqueIdleWorkers;
+}
+
 Int InGameUI::getIdleWorkerCount( void )
 {
-	Int index = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+	Player* player = rts::getObservedOrLocalPlayer();
+	Int index = player->getPlayerIndex();
 	return m_idleWorkers[index].size();
 }
 
@@ -5601,14 +5838,14 @@ void InGameUI::showIdleWorkerLayout( void )
 	if (!m_idleWorkerWin)
 	{
 		m_idleWorkerWin = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonIdleWorker"));
-		DEBUG_ASSERTCRASH(m_idleWorkerWin, ("InGameUI::showIdleWorkerLayout could not find IdleWorker.wnd to load "));
+		DEBUG_ASSERTCRASH(m_idleWorkerWin, ("InGameUI::showIdleWorkerLayout could not find IdleWorker.wnd to load"));
 		return;
 	}
 
 	m_idleWorkerWin->winEnable(TRUE);
 
 	m_currentIdleWorkerDisplay = getIdleWorkerCount();
-	
+
 //	if(m_currentIdleWorkerDisplay < 1)
 //		GadgetButtonSetText(m_idleWorkerWin, UnicodeString::TheEmptyString);
 //	else
@@ -5631,10 +5868,10 @@ void InGameUI::updateIdleWorker( void )
 {
 	Int idleCount = getIdleWorkerCount();
 
-	if(idleCount > 0 && m_currentIdleWorkerDisplay != idleCount && getInputEnabled())
+	if(idleCount > 0 && m_currentIdleWorkerDisplay != idleCount)
 		showIdleWorkerLayout();
 
-	if((idleCount <= 0 && m_idleWorkerWin) || !getInputEnabled())
+	if(idleCount <= 0 && m_idleWorkerWin)
 		hideIdleWorkerLayout();
 }
 
@@ -5654,27 +5891,102 @@ void InGameUI::resetIdleWorker( void )
 
 void InGameUI::recreateControlBar( void )
 {
-	GameWindow *win = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd")));
-	if(win)
-		deleteInstance(win);
-	
-	m_idleWorkerWin = NULL;	
-	
+	GameWindow *win = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd"));
+	deleteInstance(win);
+
+	m_idleWorkerWin = NULL;
+
 	createControlBar();
-		
-	if(TheControlBar)
+
+	delete TheControlBar;
+	TheControlBar = NEW ControlBar;
+	TheControlBar->init();
+}
+
+void InGameUI::refreshCustomUiResources(void)
+{
+	refreshNetworkLatencyResources();
+	refreshRenderFpsResources();
+	refreshSystemTimeResources();
+	refreshGameTimeResources();
+}
+
+void InGameUI::refreshNetworkLatencyResources(void)
+{
+	if (!m_networkLatencyString)
+	{
+		m_networkLatencyString = TheDisplayStringManager->newDisplayString();
+		m_lastNetworkLatencyFrames = ~0u;
+	}
+
+	m_networkLatencyPointSize = TheGlobalData->m_networkLatencyFontSize;
+	Int adjustedNetworkLatencyFontSize = TheGlobalLanguageData->adjustFontSize(m_networkLatencyPointSize);
+	GameFont* latencyFont = TheWindowManager->winFindFont(m_networkLatencyFont, adjustedNetworkLatencyFontSize, m_networkLatencyBold);
+	m_networkLatencyString->setFont(latencyFont);
+}
+
+void InGameUI::refreshRenderFpsResources(void)
+{
+	if (!m_renderFpsString)
+	{
+		m_renderFpsString = TheDisplayStringManager->newDisplayString();
+		m_lastRenderFps = ~0u;
+		m_lastRenderFpsUpdateMs = 0u;
+	}
+
+	if (!m_renderFpsLimitString)
 	{
-		delete TheControlBar;
-		TheControlBar = NEW ControlBar;
-		TheControlBar->init();
+		m_renderFpsLimitString = TheDisplayStringManager->newDisplayString();
+		m_lastRenderFpsLimit = ~0u;
 	}
 
+	m_renderFpsPointSize = TheGlobalData->m_renderFpsFontSize;
+	Int adjustedRenderFpsFontSize = TheGlobalLanguageData->adjustFontSize(m_renderFpsPointSize);
+	GameFont *fpsFont = TheWindowManager->winFindFont(m_renderFpsFont, adjustedRenderFpsFontSize, m_renderFpsBold);
+	m_renderFpsString->setFont(fpsFont);
+	m_renderFpsLimitString->setFont(fpsFont);
+
+	if (m_renderFpsPointSize > 0)
+	{
+		updateRenderFpsString();
+	}
+}
+
+void InGameUI::refreshSystemTimeResources(void)
+{
+	if (!m_systemTimeString)
+	{
+		m_systemTimeString = TheDisplayStringManager->newDisplayString();
+	}
 
+	m_systemTimePointSize = TheGlobalData->m_systemTimeFontSize;
+	Int adjustedSystemTimeFontSize = TheGlobalLanguageData->adjustFontSize(m_systemTimePointSize);
+	GameFont* systemTimeFont = TheWindowManager->winFindFont(m_systemTimeFont, adjustedSystemTimeFontSize, m_systemTimeBold);
+	m_systemTimeString->setFont(systemTimeFont);
+}
+
+void InGameUI::refreshGameTimeResources(void)
+{
+	if (!m_gameTimeString)
+	{
+		m_gameTimeString = TheDisplayStringManager->newDisplayString();
+	}
+
+	if (!m_gameTimeFrameString)
+	{
+		m_gameTimeFrameString = TheDisplayStringManager->newDisplayString();
+	}
+
+	m_gameTimePointSize = TheGlobalData->m_gameTimeFontSize;
+	Int adjustedGameTimeFontSize = TheGlobalLanguageData->adjustFontSize(m_gameTimePointSize);
+	GameFont* gameTimeFont = TheWindowManager->winFindFont(m_gameTimeFont, adjustedGameTimeFontSize, m_gameTimeBold);
+	m_gameTimeString->setFont(gameTimeFont);
+	m_gameTimeFrameString->setFont(gameTimeFont);
 }
 
 void InGameUI::disableTooltipsUntil(UnsignedInt frameNum)
 {
-	if (frameNum > m_tooltipsDisabledUntil) 
+	if (frameNum > m_tooltipsDisabledUntil)
 		m_tooltipsDisabledUntil = frameNum;
 }
 
@@ -5689,17 +6001,19 @@ Bool InGameUI::areTooltipsDisabled() const
 }
 
 
-WindowMsgHandledType IdleWorkerSystem( GameWindow *window, UnsignedInt msg, 
+WindowMsgHandledType IdleWorkerSystem( GameWindow *window, UnsignedInt msg,
 																				WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 		//---------------------------------------------------------------------------------------------
 		case GWM_INPUT_FOCUS:
-		{	
+		{
 			// if we're givin the opportunity to take the keyboard focus we must say we don't want it
 			if( mData1 == TRUE )
 				*(Bool *)mData2 = FALSE;
+			break;
+
 		}
 		//---------------------------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -5712,16 +6026,149 @@ WindowMsgHandledType IdleWorkerSystem( GameWindow *window, UnsignedInt msg,
 			}
 			break;
 
-		}  // end button selected
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 			return MSG_IGNORED;
 
-	}  // end switch( msg )
+	}
 
 	return MSG_HANDLED;
 
 }
 
 
+void InGameUI::updateRenderFpsString()
+{
+	const UnsignedInt renderFps = (UnsignedInt)(TheDisplay->getAverageFPS() + 0.5f);
+	if (renderFps != m_lastRenderFps)
+	{
+		UnicodeString fpsStr;
+		fpsStr.format(L"%u", renderFps);
+		m_renderFpsString->setText(fpsStr);
+		m_lastRenderFps = renderFps;
+	}
+}
+
+void InGameUI::drawNetworkLatency(Int &x, Int &y)
+{
+	const UnsignedInt networkLatencyFrames = TheNetwork->getRunAhead();
+
+	if (networkLatencyFrames != m_lastNetworkLatencyFrames)
+	{
+		UnicodeString latencyStr;
+		latencyStr.format(L"%u", networkLatencyFrames);
+		m_networkLatencyString->setText(latencyStr);
+		m_lastNetworkLatencyFrames = networkLatencyFrames;
+	}
+
+	// TheSuperHackers @info at the HUD anchor this draws inline and advances x otherwise uses configured position
+	if (isAtHudAnchorPos(m_networkLatencyPosition))
+	{
+		m_networkLatencyString->draw(kHudAnchorX + x, kHudAnchorY + y, m_networkLatencyColor, m_networkLatencyDropColor);
+		x += m_networkLatencyString->getWidth() + kHudGapPx;
+	}
+	else
+	{
+		m_networkLatencyString->draw(m_networkLatencyPosition.x, m_networkLatencyPosition.y, m_networkLatencyColor, m_networkLatencyDropColor);
+	}
+}
+
+void InGameUI::drawRenderFps(Int &x, Int &y)
+{
+	if (m_renderFpsRefreshMs > 0u)
+	{
+		const UnsignedInt nowMs = timeGetTime();
+		const UnsignedInt deltaMs = nowMs - m_lastRenderFpsUpdateMs;
+		if (deltaMs >= m_renderFpsRefreshMs)
+		{
+			m_lastRenderFpsUpdateMs = nowMs;
+			updateRenderFpsString();
+		}
+	}
+	else
+	{
+		updateRenderFpsString();
+	}
+
+	UnsignedInt renderFpsLimit = 0u;
+	if (TheGlobalData->m_useFpsLimit)
+	{
+		renderFpsLimit = (UnsignedInt)TheFramePacer->getFramesPerSecondLimit();
+		if (renderFpsLimit == RenderFpsPreset::UncappedFpsValue)
+		{
+			renderFpsLimit = 0u;
+		}
+	}
+	if (renderFpsLimit != m_lastRenderFpsLimit)
+	{
+		UnicodeString fpsLimitStr;
+		fpsLimitStr.format(L"[%u]", renderFpsLimit);
+		m_renderFpsLimitString->setText(fpsLimitStr);
+		m_lastRenderFpsLimit = renderFpsLimit;
+	}
+
+	// TheSuperHackers @info at the HUD anchor this draws inline and advances x otherwise uses configured position
+	if (isAtHudAnchorPos(m_renderFpsPosition))
+	{
+		const Int drawY = kHudAnchorY + y;
+
+		m_renderFpsString->draw(kHudAnchorX + x, drawY, m_renderFpsColor, m_renderFpsDropColor);
+		x += m_renderFpsString->getWidth();
+		m_renderFpsLimitString->draw(kHudAnchorX + x, drawY, m_renderFpsLimitColor, m_renderFpsDropColor);
+		x += m_renderFpsLimitString->getWidth() + kHudGapPx;
+	}
+	else
+	{
+		m_renderFpsString->draw(m_renderFpsPosition.x, m_renderFpsPosition.y, m_renderFpsColor, m_renderFpsDropColor);
+		m_renderFpsLimitString->draw(m_renderFpsPosition.x + m_renderFpsString->getWidth(), m_renderFpsPosition.y, m_renderFpsLimitColor, m_renderFpsDropColor);
+	}
+}
+
+void InGameUI::drawSystemTime(Int &x, Int &y)
+{
+	// current system time
+	SYSTEMTIME systemTime;
+	GetLocalTime( &systemTime );
+
+	UnicodeString TimeString;
+	TimeString.format(L"%2.2d:%2.2d:%2.2d", systemTime.wHour, systemTime.wMinute, systemTime.wSecond);
+	m_systemTimeString->setText(TimeString);
+
+	// TheSuperHackers @info at the HUD anchor this draws inline and advances x otherwise uses configured position
+	if (isAtHudAnchorPos(m_systemTimePosition))
+	{
+		m_systemTimeString->draw(kHudAnchorX + x, kHudAnchorY + y, m_systemTimeColor, m_systemTimeDropColor);
+		x += m_systemTimeString->getWidth() + kHudGapPx;
+	}
+	else
+	{
+		m_systemTimeString->draw(m_systemTimePosition.x, m_systemTimePosition.y, m_systemTimeColor, m_systemTimeDropColor);
+	}
+}
+
+void InGameUI::drawGameTime()
+{
+	Int currentFrame = TheGameLogic->getFrame();
+	Int gameSeconds = (Int) (SECONDS_PER_LOGICFRAME_REAL * currentFrame );
+	Int hours = gameSeconds / 60 / 60;
+	Int minutes = (gameSeconds / 60) % 60;
+	Int seconds = gameSeconds % 60;
+	Int frame = currentFrame % 30;
+
+    UnicodeString gameTimeString;
+    gameTimeString.format(L"%2.2d:%2.2d:%2.2d", hours, minutes, seconds);
+    m_gameTimeString->setText(gameTimeString);
+
+	UnicodeString gameTimeFrameString;
+    gameTimeFrameString.format(L".%2.2d", frame);
+    m_gameTimeFrameString->setText(gameTimeFrameString);
+
+	// TheSuperHackers @info this implicitly offsets the game timer from the right instead of left of the screen
+	int horizontalTimerOffset = TheDisplay->getWidth() - (Int)m_gameTimePosition.x - m_gameTimeString->getWidth() - m_gameTimeFrameString->getWidth();
+	int horizontalFrameOffset = TheDisplay->getWidth() - (Int)m_gameTimePosition.x - m_gameTimeFrameString->getWidth();
+
+	m_gameTimeString->draw(horizontalTimerOffset, m_gameTimePosition.y, m_gameTimeColor, m_gameTimeDropColor);
+	m_gameTimeFrameString->draw(horizontalFrameOffset, m_gameTimePosition.y, GameMakeColor(180,180,180,255), m_gameTimeDropColor);
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp
index d569e9f45bb..9ef9c3b1423 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp
@@ -27,7 +27,7 @@
 // Desc:       Basic keyboard
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Language.h"
 #include "Common/GameEngine.h"
@@ -49,8 +49,8 @@ Keyboard *TheKeyboard = NULL;
 //-------------------------------------------------------------------------------------------------
 void Keyboard::createStreamMessages( void )
 {
-	
-	// santiy
+
+	// sanity
 	if( TheMessageStream == NULL )
 		return;
 
@@ -64,22 +64,22 @@ void Keyboard::createStreamMessages( void )
 		{
 
 			msg = TheMessageStream->appendMessage( GameMessage::MSG_RAW_KEY_DOWN );
-			DEBUG_ASSERTCRASH( msg, ("Unable to append key down message to stream\n") );
+			DEBUG_ASSERTCRASH( msg, ("Unable to append key down message to stream") );
 
-		}  // end if
+		}
 		else if( BitIsSet( key->state, KEY_STATE_UP ) )
 		{
 
 			msg = TheMessageStream->appendMessage( GameMessage::MSG_RAW_KEY_UP );
-			DEBUG_ASSERTCRASH( msg, ("Unable to append key up message to stream\n") );
+			DEBUG_ASSERTCRASH( msg, ("Unable to append key up message to stream") );
 
-		}  // end else if
+		}
 		else
 		{
 
-			DEBUG_CRASH(( "Unknown key state when creating msg stream\n" ));
-			
-		}  // end else
+			DEBUG_CRASH(( "Unknown key state when creating msg stream" ));
+
+		}
 
 		// fill out message arguments
 		if( msg )
@@ -89,11 +89,12 @@ void Keyboard::createStreamMessages( void )
 		}
 
 		// next key please
+		key->setUsed();
 		key++;
 
-	}  // end while
+	}
 
-}  // end createStreamMessages
+}
 
 //-------------------------------------------------------------------------------------------------
 /** update all our key state data */
@@ -122,11 +123,11 @@ void Keyboard::updateKeys( void )
 				resetKeys();
 				index = 0;
 
-			}  // end if
+			}
 
 		}
 		while( m_keys[ index ].key == KEY_LOST );
-	} 
+	}
 	while( m_keys[ index++ ].key != KEY_NONE );
 
 	// update keyboard status array
@@ -139,7 +140,12 @@ void Keyboard::updateKeys( void )
 
 		m_keyStatus[ m_keys[ index ].key ].state = m_keys[ index ].state;
 		m_keyStatus[ m_keys[ index ].key ].status = m_keys[ index ].status;
-		m_keyStatus[ m_keys[ index ].key ].sequence = m_inputFrame;
+
+		// Update key down time for new key presses
+		if( BitIsSet( m_keys[ index ].state, KEY_STATE_DOWN ) )
+		{
+			m_keyStatus[ m_keys[ index ].key ].keyDownTimeMsec = m_keys[ index ].keyDownTimeMsec;
+		}
 
 		// prevent ALT-TAB from causing a TAB event
 		if( m_keys[ index ].key == KEY_TAB )
@@ -166,11 +172,11 @@ void Keyboard::updateKeys( void )
 			//
 			translateKey( m_keys[ index ].key );
 
-		}  // end else if
+		}
 
 		index++;
 
-	}  // end while
+	}
 
 	// check for key repeats
 	checkKeyRepeat();
@@ -187,14 +193,14 @@ void Keyboard::updateKeys( void )
 			// next key
 			index++;
 
-		}  // end while
+		}
 
-	}  // end if
+	}
 
-}  // end updateKeys
+}
 
 //-------------------------------------------------------------------------------------------------
-/** check key repeat sequences, TRUE is returned if repeat is occurring */
+/** check key repeat timing, TRUE is returned if repeat is occurring */
 //-------------------------------------------------------------------------------------------------
 Bool Keyboard::checkKeyRepeat( void )
 {
@@ -202,7 +208,7 @@ Bool Keyboard::checkKeyRepeat( void )
 	Int index = 0;
 	Int key;
 
-	/** @todo we shouldn't think about repeating any keys while we 
+	/** @todo we shouldn't think about repeating any keys while we
 	don't have the focus */
 //	if( currentFocus == FOCUS_OUT )
 //		return FALSE;
@@ -213,13 +219,17 @@ Bool Keyboard::checkKeyRepeat( void )
 
 	// Scan Keyboard status array for first key down
 	// long enough to repeat
-	for( key = 0; key < 256; key++ )
+	for( key = 0; key < ARRAY_SIZE(m_keyStatus); key++ )
 	{
 
 		if( BitIsSet( m_keyStatus[ key ].state, KEY_STATE_DOWN ) )
 		{
 
-			if( (m_inputFrame - m_keyStatus[ key ].sequence) > Keyboard::KEY_REPEAT_DELAY )
+			const UnsignedInt now = timeGetTime();
+			const UnsignedInt keyDownTime = m_keyStatus[ key ].keyDownTimeMsec;
+			const UnsignedInt elapsedMsec = now - keyDownTime;
+
+			if( elapsedMsec > Keyboard::KEY_REPEAT_DELAY_MSEC )
 			{
 				// Add key to this frame
 				m_keys[ index ].key = (UnsignedByte)key;
@@ -228,26 +238,26 @@ Bool Keyboard::checkKeyRepeat( void )
 
 				// Set End Flag
 				m_keys[ ++index ].key = KEY_NONE;
-			
+
 				// Set all keys as new to prevent multiple keys repeating
 				for( index = 0; index< NUM_KEYS; index++ )
-					m_keyStatus[ index ].sequence = m_inputFrame;
+					m_keyStatus[ index ].keyDownTimeMsec = now;
 
-				// Set repeated key so it will repeat again in two frames
-				m_keyStatus[ key ].sequence = m_inputFrame - (Keyboard::KEY_REPEAT_DELAY + 2);
+				// Set repeated key so it will repeat again after the interval
+				m_keyStatus[ key ].keyDownTimeMsec = now - (Keyboard::KEY_REPEAT_DELAY_MSEC + Keyboard::KEY_REPEAT_INTERVAL_MSEC);
 
 				retVal = TRUE;
 				break;  // exit for key
 
-			}  // end if
+			}
 
-		}  // end if, key down
+		}
 
-	}  // end for key
+	}
 
 	return retVal;
 
-}  // end checkKeyRepeat
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the keyboard key-names array */
@@ -261,14 +271,14 @@ void Keyboard::initKeyNames( void )
 	/*
 	 * Initialize the keyboard key-names array.
 	 */
-	for( i = 0; i < KEY_NAMES_COUNT; i++ )
+	for( i = 0; i < ARRAY_SIZE(m_keyNames); i++ )
 	{
 
 		m_keyNames[ i ].stdKey =		L'\0';
 		m_keyNames[ i ].shifted =		L'\0';
 		m_keyNames[ i ].shifted2 =	L'\0';
 
-	}  // end for i
+	}
 
 	m_shift2Key = KEY_NONE;
 
@@ -674,9 +684,9 @@ void Keyboard::initKeyNames( void )
 			m_shift2Key = KEY_RALT;
 			break;
 
-	}  // end switch( Language )
+	}
 
-}  // end initKeyNames
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC PROTOTYPES //////////////////////////////////////////////////////////////////////////////
@@ -693,16 +703,15 @@ Keyboard::Keyboard( void )
 	m_shift2Key = KEY_NONE;
 
 	memset( m_keyNames, 0, sizeof( m_keyNames ) );
-	m_inputFrame = 0;
 
-}  // end Keyboard
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Keyboard::~Keyboard( void )
 {
 
-}  // end ~Keyboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialzie the keyboard */
@@ -713,10 +722,7 @@ void Keyboard::init( void )
 	// initialize the key names
 	initKeyNames();
 
-	// first input frame
-	m_inputFrame = 0;
-
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset keyboard system */
@@ -724,7 +730,7 @@ void Keyboard::init( void )
 void Keyboard::reset( void )
 {
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Called once per frame to gather key data input */
@@ -732,13 +738,10 @@ void Keyboard::reset( void )
 void Keyboard::update( void )
 {
 
-	// increment input frame
-	m_inputFrame++;
-
 	// update the key data
 	updateKeys();
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the state data for the keys, we likely want to do this when
@@ -747,63 +750,92 @@ void Keyboard::update( void )
 void Keyboard::resetKeys( void )
 {
 
+	// TheSuperHackers @fix Caball009 13/12/2025 Fix bug where game remains in waypoint mode
+	// because the key up state for the alt key is not detected after alt tab.
+	refreshAltKeys();
+
 	memset( m_keys, 0, sizeof( m_keys ) );
 	memset( m_keyStatus, 0, sizeof( m_keyStatus ) );
-	m_modifiers = KEY_STATE_NONE; 
+	m_modifiers = KEY_STATE_NONE;
 	if( getCapsState() )
 	{
 		m_modifiers |= KEY_STATE_CAPSLOCK;
 	}
 
-}  // end resetKeys
+}
+
+//-------------------------------------------------------------------------------------------------
+// Refresh the state of the alt keys, necessary after alt tab
+//-------------------------------------------------------------------------------------------------
+void Keyboard::refreshAltKeys() const
+{
+	if (BitIsSet(m_keyStatus[KEY_LALT].state, KEY_STATE_DOWN))
+	{
+		GameMessage* msg = TheMessageStream->appendMessage(GameMessage::MSG_RAW_KEY_UP);
+		msg->appendIntegerArgument(KEY_LALT);
+		msg->appendIntegerArgument(KEY_STATE_UP);
+	}
+	if (BitIsSet(m_keyStatus[KEY_RALT].state, KEY_STATE_DOWN))
+	{
+		GameMessage* msg = TheMessageStream->appendMessage(GameMessage::MSG_RAW_KEY_UP);
+		msg->appendIntegerArgument(KEY_RALT);
+		msg->appendIntegerArgument(KEY_STATE_UP);
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 /** get the first key in our current state of the keyboard */
 //-------------------------------------------------------------------------------------------------
 KeyboardIO *Keyboard::getFirstKey( void )
 {
-	return &m_keys[ 0 ];	
-}  // end getFirstKey
+	return &m_keys[ 0 ];
+}
 
 //-------------------------------------------------------------------------------------------------
-/** return the key status for the specified key */
 //-------------------------------------------------------------------------------------------------
-UnsignedByte Keyboard::getKeyStatusData( UnsignedByte key )
+KeyboardIO *Keyboard::findKey( KeyDefType key, KeyboardIO::StatusType status )
 {
-	return m_keyStatus[ key ].status;
-}  // end getKeyStatusData
+	for (KeyboardIO *io = getFirstKey(); io->key != KEY_NONE; ++io)
+	{
+		if (io->key == key && io->status == status)
+		{
+			return io;
+		}
+	}
+	return NULL;
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Get the key state data as a Bool for the specified key */
+/** return the key status for the specified key */
 //-------------------------------------------------------------------------------------------------
-Bool Keyboard::getKeyStateBit( UnsignedByte key, Int bit )
+UnsignedByte Keyboard::getKeyStatusData( KeyDefType key )
 {
-	return (m_keyStatus[ key ].state & bit) ? 1 : 0;
-}  // end getKeyStateBit
+	return m_keyStatus[ key ].status;
+}
 
 //-------------------------------------------------------------------------------------------------
-/** return the sequence data for the given key */
+/** Get the key state data as a Bool for the specified key */
 //-------------------------------------------------------------------------------------------------
-UnsignedInt Keyboard::getKeySequenceData( UnsignedByte key )
+Bool Keyboard::getKeyStateBit( KeyDefType key, Int bit )
 {
-	return m_keyStatus[ key ].sequence;
-}  // end getKeySequenceData
+	return (m_keyStatus[ key ].state & bit) ? 1 : 0;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** set the key status data */
 //-------------------------------------------------------------------------------------------------
-void Keyboard::setKeyStatusData( UnsignedByte key, KeyboardIO::StatusType data )
+void Keyboard::setKeyStatusData( KeyDefType key, KeyboardIO::StatusType data )
 {
 	m_keyStatus[ key ].status = data;
-}  // end setKeyStatusData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** set the key state data */
 //-------------------------------------------------------------------------------------------------
-void Keyboard::setKeyStateData( UnsignedByte key, UnsignedByte data )
+void Keyboard::setKeyStateData( KeyDefType key, UnsignedByte data )
 {
 	m_keyStatus[ key ].state = data;
-}  // end setKeyStateData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This routine must be called with every character to
@@ -926,15 +958,15 @@ WideChar Keyboard::translateKey( WideChar keyCode )
 			{
 				return( m_keyNames[ ubKeyCode ].shifted2 );
 			}
-			
-			if( isShift() || getCapsState() && GameIsAlpha( m_keyNames[ ubKeyCode ].stdKey ) )
+
+			if( isShift() || getCapsState() && iswalpha( m_keyNames[ ubKeyCode ].stdKey ) )
 			{
 				return( m_keyNames[ ubKeyCode ].shifted );
 			}
-			
+
 			return( m_keyNames[ubKeyCode ].stdKey );
-	}  // end switch( ubKeyCode )
-}  // end translateKey
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 /** returns true if any shift state is pressed */
@@ -946,7 +978,7 @@ Bool Keyboard::isShift()
 			return TRUE;
 		}
 		return FALSE;
-}  // end isShift()
+}
 
 //-------------------------------------------------------------------------------------------------
 /** returns true if any control state is pressed */
@@ -958,7 +990,7 @@ Bool Keyboard::isCtrl()
 			return TRUE;
 		}
 		return FALSE;
-}  // end isCtrl()
+}
 
 //-------------------------------------------------------------------------------------------------
 /** returns true if any shift state is pressed */
@@ -970,19 +1002,17 @@ Bool Keyboard::isAlt()
 		return TRUE;
 	}
 	return FALSE;
-}  // end isAlt()
+}
 
 
-WideChar Keyboard::getPrintableKey( UnsignedByte key,  Int state )
+WideChar Keyboard::getPrintableKey( KeyDefType key, Int state )
 {
-	if((key < 0 || key >=KEY_NAMES_COUNT) || ( state < 0 || state >= MAX_KEY_STATES))
+	if((key < 0 || key >= ARRAY_SIZE(m_keyNames)) || ( state < 0 || state >= MAX_KEY_STATES))
 		return L'\0';
 	if(state == 0)
 		return m_keyNames[key].stdKey;
 	else if(state == 1)
 		return m_keyNames[key].shifted;
-	else 
+	else
 		return m_keyNames[key].shifted2;
-
-
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp
index 22abf438fcc..2310d9ccc6c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp
@@ -27,13 +27,14 @@
 // Desc:      Basic mouse interactions
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Debug.h"
 #include "Common/MessageStream.h"
 #include "Common/GameEngine.h"
 #include "Common/GlobalData.h"
 #include "Common/INI.h"
+#include "Common/UserPreferences.h"
 
 #include "GameClient/Display.h"
 #include "GameClient/DisplayStringManager.h"
@@ -45,29 +46,31 @@
 #include "GameClient/Mouse.h"
 #include "GameClient/GlobalLanguage.h"
 
+#include "GameLogic/GameLogic.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 Mouse *TheMouse = NULL;
 
-const char *Mouse::RedrawModeName[RM_MAX] = {
+const char *const Mouse::RedrawModeName[] = {
 	"Mouse:Windows",
 	"Mouse:W3D",
 	"Mouse:Poly",
 	"Mouse:DX8",
 };
 
+const char *const Mouse::CursorCaptureBlockReasonNames[] = {
+	"CursorCaptureBlockReason_NoInit",
+	"CursorCaptureBlockReason_Paused",
+	"CursorCaptureBlockReason_Unfocused",
+	"CursorCaptureBlockReason_CursorIsOutside",
+};
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-static const FieldParse TheMouseCursorFieldParseTable[] = 
+static const FieldParse TheMouseCursorFieldParseTable[] =
 {
 	{ "CursorText",						INI::parseAsciiString,	NULL, offsetof( CursorInfo, cursorText ) },
 	{ "CursorTextColor",			INI::parseRGBAColorInt,	NULL, offsetof( CursorInfo, cursorTextColor ) },
@@ -84,7 +87,7 @@ static const FieldParse TheMouseCursorFieldParseTable[] =
 	{ "Directions",							INI::parseInt,	NULL,	offsetof( CursorInfo, numDirections ) },
 };
 
-static const FieldParse TheMouseFieldParseTable[] = 
+static const FieldParse TheMouseFieldParseTable[] =
 {
 	{ "TooltipFontName",						INI::parseAsciiString,NULL,			offsetof( Mouse, m_tooltipFontName ) },
 	{ "TooltipFontSize",						INI::parseInt,				NULL,			offsetof( Mouse, m_tooltipFontSize ) },
@@ -141,7 +144,7 @@ void Mouse::moveMouse( Int x, Int y, Int relOrAbs )
 	else if( m_currMouse.pos.y < m_minY )
 		m_currMouse.pos.y = m_minY;
 
-}  // end moveMouse
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the current information for the mouse from the device */
@@ -173,17 +176,14 @@ void Mouse::updateMouseData( )
 
 		busy = FALSE;
 
-	}  // end if
+	}
 
 	if( index > 0 )
 		m_eventsThisFrame = index - 1;
 	else
 		m_eventsThisFrame = 0;
 
-	if( index != 0 )
-		m_deadInputFrame = m_inputFrame;
-
-}  // end updateMouseData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Combine mouse events into the main mouse variables */
@@ -210,15 +210,15 @@ void Mouse::processMouseEvent( Int index )
 		checkForDrag();
 
 	// add Mouse Position Changes to Master Position
-	moveMouse( m_mouseEvents[ index ].pos.x, 
-						 m_mouseEvents[ index ].pos.y, 
+	moveMouse( m_mouseEvents[ index ].pos.x,
+						 m_mouseEvents[ index ].pos.y,
 						 movementType );
 
 	// Cumulate Wheel Adjustments
 	m_currMouse.wheelPos += m_mouseEvents[ index ].wheelPos;
 
 	// Check Left Mouse State
-	if( m_mouseEvents[ index ].leftFrame )
+	if( m_mouseEvents[ index ].leftState != MBS_None )
 	{
 		if( m_currMouse.leftState != m_mouseEvents[ index ].leftState )
 		{
@@ -228,25 +228,22 @@ void Mouse::processMouseEvent( Int index )
 				// Mouse Down
 				m_currMouse.leftEvent = GWM_LEFT_DOWN;
 				m_currMouse.leftState = MBS_Down;
-				m_currMouse.leftFrame = m_inputFrame;
 			}
 			else if ( m_mouseEvents[ index ].leftState == MBS_DoubleClick )
 			{
 				// Mouse Double Click
 				m_currMouse.leftEvent = GWM_LEFT_DOUBLE_CLICK;
 				m_currMouse.leftState = MBS_DoubleClick;
-				m_currMouse.leftFrame = m_inputFrame;
 			}
 			else
 			{
 				// Mouse Up
 				m_currMouse.leftEvent = GWM_LEFT_UP;
 				m_currMouse.leftState = MBS_Up;
-				m_currMouse.leftFrame = m_inputFrame;
 			}
 		}
 	}
-	else if( m_currMouse.leftState != MBS_Up && 
+	else if( m_currMouse.leftState != MBS_Up &&
 					(	(m_prevMouse.leftEvent == GWM_LEFT_DOWN) ||
 						(m_prevMouse.leftEvent == GWM_LEFT_DRAG) ) )
 	{
@@ -254,7 +251,7 @@ void Mouse::processMouseEvent( Int index )
 	}
 
 	// Check Right Mouse State
-	if( m_mouseEvents[ index ].rightFrame )
+	if( m_mouseEvents[ index ].rightState != MBS_None )
 	{
 		if( m_currMouse.rightState != m_mouseEvents[ index ].rightState )
 		{
@@ -264,25 +261,22 @@ void Mouse::processMouseEvent( Int index )
 				// Mouse Down
 				m_currMouse.rightEvent = GWM_RIGHT_DOWN;
 				m_currMouse.rightState = MBS_Down;
-				m_currMouse.rightFrame = m_inputFrame;
 			}
 			else if( m_mouseEvents[ index ].rightState == MBS_DoubleClick )
 			{
 				// Mouse Double Click
 				m_currMouse.rightEvent = GWM_RIGHT_DOUBLE_CLICK;
 				m_currMouse.rightState = MBS_DoubleClick;
-				m_currMouse.rightFrame = m_inputFrame;
 			}
 			else
 			{
 				// Mouse Up
 				m_currMouse.rightEvent = GWM_RIGHT_UP;
 				m_currMouse.rightState = MBS_Up;
-				m_currMouse.rightFrame = m_inputFrame;
 			}
 		}
 	}
-	else if( m_currMouse.rightState != MBS_Up && 
+	else if( m_currMouse.rightState != MBS_Up &&
 					(	(m_prevMouse.rightEvent == GWM_RIGHT_DOWN) ||
 						(m_prevMouse.rightEvent == GWM_RIGHT_DRAG) ) )
 	{
@@ -290,7 +284,7 @@ void Mouse::processMouseEvent( Int index )
 	}
 
 	// Check Middle Mouse State
-	if( m_mouseEvents[ index ].middleFrame )
+	if( m_mouseEvents[ index ].middleState != MBS_None )
 	{
 		if( m_currMouse.middleState != m_mouseEvents[index].middleState )
 		{
@@ -299,24 +293,21 @@ void Mouse::processMouseEvent( Int index )
 			{
 				m_currMouse.middleEvent = GWM_MIDDLE_DOWN;
 				m_currMouse.middleState = MBS_Down;
-				m_currMouse.middleFrame = m_inputFrame;
 			}
 			else if( m_mouseEvents[index].middleState == MBS_DoubleClick )
 			{
 				m_currMouse.middleEvent = GWM_MIDDLE_DOUBLE_CLICK;
 				m_currMouse.middleState = MBS_DoubleClick;
-				m_currMouse.middleFrame = m_inputFrame;
 			}
 			else
 			{
 				// Mouse Up
 				m_currMouse.middleEvent = GWM_MIDDLE_UP;
 				m_currMouse.middleState = MBS_Up;
-				m_currMouse.middleFrame = m_inputFrame;
 			}
 		}
 	}
-	else if( m_currMouse.middleState != MBS_Up && 
+	else if( m_currMouse.middleState != MBS_Up &&
 					(	(m_prevMouse.middleEvent == GWM_MIDDLE_DOWN) ||
 						(m_prevMouse.middleEvent == GWM_MIDDLE_DRAG) ) )
 	{
@@ -325,7 +316,7 @@ void Mouse::processMouseEvent( Int index )
 
 	m_currMouse.deltaPos.x = m_currMouse.pos.x - m_prevMouse.pos.x;
 	m_currMouse.deltaPos.y = m_currMouse.pos.y - m_prevMouse.pos.y;
-//	DEBUG_LOG(("Mouse dx %d, dy %d, index %d, frame %d\n", m_currMouse.deltaPos.x, m_currMouse.deltaPos.y, index, m_inputFrame));
+//	DEBUG_LOG(("Mouse dx %d, dy %d, index %d", m_currMouse.deltaPos.x, m_currMouse.deltaPos.y, index));
 //	// check if mouse is still and flag tooltip
 //	if( ((dx*dx) + (dy*dy)) < CURSOR_MOVE_TOL_SQ )
 //	{
@@ -334,7 +325,7 @@ void Mouse::processMouseEvent( Int index )
 //    Int delay = m_tooltipDelayTime;
 //    if(m_tooltipDelay >= 0 )
 //       delay = m_tooltipDelay;
-//    
+//
 //		if( now - m_stillTime >= delay )
 //		{
 //			if (!m_displayTooltip)
@@ -358,7 +349,7 @@ void Mouse::processMouseEvent( Int index )
 
 	m_prevMouse = m_currMouse;
 
-}  // end processMouseEvent
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Check for mouse drag */
@@ -366,28 +357,28 @@ void Mouse::processMouseEvent( Int index )
 void Mouse::checkForDrag( void )
 {
 
-	if( m_currMouse.leftState && 
+	if( m_currMouse.leftState &&
 			(	(m_prevMouse.leftEvent == GWM_LEFT_DOWN) ||
 				(m_prevMouse.leftEvent == GWM_LEFT_DRAG) ) )
 	{
 		m_currMouse.leftEvent = GWM_LEFT_DRAG;
 	}
 
-	if( m_currMouse.rightState && 
+	if( m_currMouse.rightState &&
 			(	(m_prevMouse.rightEvent == GWM_RIGHT_DOWN) ||
 				(m_prevMouse.rightEvent == GWM_RIGHT_DRAG) ) )
 	{
 		m_currMouse.rightEvent = GWM_RIGHT_DRAG;
 	}
 
-	if( m_currMouse.middleState && 
+	if( m_currMouse.middleState &&
 			(	(m_prevMouse.middleEvent == GWM_MIDDLE_DOWN) ||
 				(m_prevMouse.middleEvent == GWM_MIDDLE_DRAG) ) )
 	{
 		m_currMouse.middleEvent = GWM_MIDDLE_DRAG;
 	}
 
-}  // end checkForDrag
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -421,15 +412,12 @@ Bool Mouse::isClick(const ICoord2D *anchor, const ICoord2D *dest, UnsignedInt pr
 //-------------------------------------------------------------------------------------------------
 CursorInfo::CursorInfo( void )
 {
-	// Added Sadullah Nader
-	// Initializations missing and needed
-	
+
 	cursorName.clear();
 	cursorText.clear();
 	cursorTextColor.red = cursorTextColor.green = cursorTextColor.blue = 0;
 	cursorTextDropColor.red = cursorTextDropColor.blue = cursorTextDropColor.green = 0;
-	 
-	//
+
 	textureName.clear();
 	imageName.clear();
 	W3DModelName.clear();
@@ -448,18 +436,17 @@ CursorInfo::CursorInfo( void )
 //-------------------------------------------------------------------------------------------------
 Mouse::Mouse( void )
 {
+	static_assert(ARRAY_SIZE(CursorCaptureBlockReasonNames) == CursorCaptureBlockReason_Count, "Incorrect array size");
+	static_assert(ARRAY_SIZE(RedrawModeName) == RM_MAX, "Incorrect array size");
+
 	// device info
 	m_numButtons = 0;
 	m_numAxes = 0;
 	m_forceFeedback = FALSE;
-	
-	//Added By Sadullah Nader
-	//Initializations missing and needed
+
 	m_dragTolerance = 0;
 	m_dragTolerance3D = 0;
 	m_dragToleranceMS = 0;
-	//
-	
 	//m_tooltipString.clear();	// redundant
 	m_displayTooltip = FALSE;
 	m_tooltipDisplayString = NULL;
@@ -475,9 +462,6 @@ Mouse::Mouse( void )
 	m_maxY = 0;
 	m_eventsThisFrame = 0;
 
-	m_inputFrame = 0;
-	m_deadInputFrame =0;
-
 	m_inputMovesAbsolute = FALSE;
 
 	m_currentCursor = ARROW;
@@ -486,6 +470,7 @@ Mouse::Mouse( void )
 	else
 		m_currentRedrawMode = RM_W3D;//RM_WINDOWS;
 	m_visible = FALSE;
+	m_isCursorCaptured = FALSE;
 	m_tooltipFontName = "Times New Roman";
 	m_tooltipFontSize = 12;
 	m_tooltipFontIsBold = FALSE;
@@ -522,7 +507,7 @@ Mouse::Mouse( void )
 	m_cursorTextDropColor.green = 255;
 	m_cursorTextDropColor.blue  = 255;
 	m_cursorTextDropColor.alpha = 255;
-	
+
 	m_highlightPos = 0;
 	m_highlightUpdateStart = 0;
 	m_stillTime = 0;
@@ -535,7 +520,12 @@ Mouse::Mouse( void )
 	m_tooltipBackColor.blue = 0;
 	m_tooltipBackColor.alpha = 255;
 
-}  // end Mouse
+	m_cursorCaptureMode = CursorCaptureMode_Default;
+
+	m_captureBlockReasonBits = (1 << CursorCaptureBlockReason_NoInit);
+	DEBUG_LOG(("Mouse::Mouse: m_blockCaptureReason=CursorCaptureBlockReason_NoInit"));
+
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -549,14 +539,14 @@ Mouse::~Mouse( void )
 		TheDisplayStringManager->freeDisplayString( m_cursorTextDisplayString );
 	m_cursorTextDisplayString = NULL;
 
-}  // end ~Mouse
+}
 
 /**Had to move this out of main init() because I need this data to properly initialize
 the Win32 version of the mouse (by preloading resources before D3D device is created).*/
 void Mouse::parseIni(void)
 {
 	INI ini;
-	ini.load( AsciiString( "Data\\INI\\Mouse.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Mouse", INI_LOAD_OVERWRITE, NULL );
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -571,7 +561,7 @@ void Mouse::init( void )
 	m_numButtons = 2;  // by default just have 2 buttons
 	m_numAxes = 2;  // by default a normal mouse moves in a 2d plane
 	m_forceFeedback = FALSE;
-	mouseNotifyResolutionChange();
+	onResolutionChanged();
 	m_tooltipString.clear();	// redundant
 	m_displayTooltip = FALSE;
 
@@ -585,9 +575,6 @@ void Mouse::init( void )
 	m_minY = 0;
 	m_maxY = 599;
 
-	m_inputFrame = 0;
-	m_deadInputFrame =0;
-
 	m_inputMovesAbsolute = FALSE;
 	m_eventsThisFrame = 0;
 
@@ -596,12 +583,14 @@ void Mouse::init( void )
  	// allocate a new display string
 	m_cursorTextDisplayString = TheDisplayStringManager->newDisplayString();
 
-}  // end init
+	initCapture();
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Tell mouse system display resolution changed. */
 //-------------------------------------------------------------------------------------------------
-void Mouse::mouseNotifyResolutionChange( void )
+void Mouse::onResolutionChanged( void )
 {
 	if(m_tooltipDisplayString)
 		TheDisplayStringManager->freeDisplayString(m_tooltipDisplayString);
@@ -626,8 +615,26 @@ void Mouse::mouseNotifyResolutionChange( void )
 
 	m_tooltipDisplayString->setWordWrap(120);
 
-}  // end reset
+}
 
+//-------------------------------------------------------------------------------------------------
+void Mouse::onGameModeChanged(GameMode prev, GameMode next)
+{
+	refreshCursorCapture();
+}
+
+//-------------------------------------------------------------------------------------------------
+void Mouse::onGamePaused(Bool paused)
+{
+	if (paused)
+	{
+		blockCapture(CursorCaptureBlockReason_Paused);
+	}
+	else
+	{
+		unblockCapture(CursorCaptureBlockReason_Paused);
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset mouse system */
@@ -641,7 +648,9 @@ void Mouse::reset( void )
   if ( m_cursorTextDisplayString )
   	m_cursorTextDisplayString->reset();
 
-}  // end reset
+	blockCapture(CursorCaptureBlockReason_NoInit);
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update the states of the mouse position and buttons */
@@ -649,13 +658,10 @@ void Mouse::reset( void )
 void Mouse::update( void )
 {
 
-	// increment input frame
-	m_inputFrame++;
-
 	// update the mouse data
 	updateMouseData( );
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Given the current state of this input device, turn the raw input
@@ -686,7 +692,7 @@ void Mouse::createStreamMessages( void )
 		//No delay while scriptdebugging!
 		delay = 0;
 	}
-  
+
 	if( now - m_stillTime >= delay )
 	{
 		if (!m_displayTooltip)
@@ -700,10 +706,10 @@ void Mouse::createStreamMessages( void )
 	}
 	else
 	{
-		//DEBUG_LOG(("%d %d %d %d\n", TheGameClient->getFrame(), delay, now, m_stillTime));
+		//DEBUG_LOG(("%d %d %d %d", TheGameClient->getFrame(), delay, now, m_stillTime));
 		m_displayTooltip = FALSE;
 	}
-	
+
 	for (Int i = 0; i < m_eventsThisFrame; ++i)
 	{
 		processMouseEvent(i);
@@ -743,7 +749,7 @@ void Mouse::createStreamMessages( void )
 				msg->appendIntegerArgument( TheKeyboard->getModifierFlags() );
 				break;
 
-		}  // end switch
+		}
 
 		msg = NULL;
 		switch( m_currMouse.middleEvent )
@@ -778,7 +784,7 @@ void Mouse::createStreamMessages( void )
 				msg->appendIntegerArgument( TheKeyboard->getModifierFlags() );
 				break;
 
-		}  // end switch
+		}
 
 		msg = NULL;
 		switch( m_currMouse.rightEvent )
@@ -813,7 +819,7 @@ void Mouse::createStreamMessages( void )
 				msg->appendIntegerArgument( TheKeyboard->getModifierFlags() );
 				break;
 
-		}  // end switch
+		}
 
 		// wheel pos
 		msg = NULL;
@@ -823,10 +829,10 @@ void Mouse::createStreamMessages( void )
 			msg->appendPixelArgument( m_currMouse.pos );
 			msg->appendIntegerArgument( m_currMouse.wheelPos / 120 );  // wheel delta
 			msg->appendIntegerArgument( TheKeyboard->getModifierFlags() );
-		}  // end if
-	
-	}	// end for
-}  // end createStreamMessages
+		}
+
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the string to display at the cursor for the tooltip */
@@ -834,7 +840,7 @@ void Mouse::createStreamMessages( void )
 void Mouse::setCursorTooltip( UnicodeString tooltip, Int delay, const RGBColor *color, Real width )
 {
 
-	//DEBUG_LOG(("%d Tooltip: %ls\n", TheGameClient->getFrame(), tooltip.str()));
+	//DEBUG_LOG(("%d Tooltip: %ls", TheGameClient->getFrame(), tooltip.str()));
 
 	m_isTooltipEmpty = tooltip.isEmpty();
   m_tooltipDelay = delay;
@@ -852,7 +858,7 @@ void Mouse::setCursorTooltip( UnicodeString tooltip, Int delay, const RGBColor *
 		{
 			widthInPixels = TheDisplay->getWidth();
 		}
-		//DEBUG_LOG(("Setting tooltip width to %d pixels (%g%% of the normal tooltip width)\n", widthInPixels, width*100));
+		//DEBUG_LOG(("Setting tooltip width to %d pixels (%g%% of the normal tooltip width)", widthInPixels, width*100));
 		m_tooltipDisplayString->setWordWrap( widthInPixels );
 		m_lastTooltipWidth = width;
 	}
@@ -860,7 +866,7 @@ void Mouse::setCursorTooltip( UnicodeString tooltip, Int delay, const RGBColor *
 	if (forceRecalc || !m_isTooltipEmpty && tooltip.compare(m_tooltipDisplayString->getText()))
 	{
 		m_tooltipDisplayString->setText(tooltip);
-		//DEBUG_LOG(("Tooltip: %ls\n", tooltip.str()));
+		//DEBUG_LOG(("Tooltip: %ls", tooltip.str()));
 	}
 	if (color)
 	{
@@ -903,14 +909,14 @@ void Mouse::setCursorTooltip( UnicodeString tooltip, Int delay, const RGBColor *
 		m_tooltipBackColor = m_tooltipColorBackground;
 	}
 
-}  // end setCursorTooltip
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set the text for the mouse cursor ... note that this is *NOT* the tooltip text we
 	* can set to be at the mouse position */
 // ------------------------------------------------------------------------------------------------
-void Mouse::setMouseText( UnicodeString text, 
-													const RGBAColorInt *color, 
+void Mouse::setMouseText( UnicodeString text,
+													const RGBAColorInt *color,
 													const RGBAColorInt *dropColor )
 {
 
@@ -927,7 +933,7 @@ void Mouse::setMouseText( UnicodeString text,
 	if( dropColor )
 		m_cursorTextDropColor = *dropColor;
 
-}  // end setMouseText
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Move the mouse to the position */
@@ -938,14 +944,14 @@ void Mouse::setPosition( Int x, Int y )
 	m_currMouse.pos.x = x;
 	m_currMouse.pos.y = y;
 
-}  // end setPosition
+}
 
 //-------------------------------------------------------------------------------------------------
-/** This default implemtation of SetMouseLimits will just set the limiting	
+/** This default implementation of SetMouseLimits will just set the limiting
 	* rectangle to be the width and height of the game display with the
 	* origin in the upper left at (0,0).  However, if the game is running
 	* in a windowed mode then these limits should reflect the SCREEN
-	* coords that the mouse is allowed to move in.  Also, if the game is in
+	* coordinates that the mouse is allowed to move in.  Also, if the game is in
 	* a window you may want to adjust for any title bar available in
 	* the operating system.  For system specific limits and windows etc,
 	* just override this function in the device implementation of the mouse */
@@ -960,10 +966,159 @@ void Mouse::setMouseLimits( void )
 
 		m_maxX = TheDisplay->getWidth();
 		m_maxY = TheDisplay->getHeight();
-	
-	}  // end if
 
-}  // end setMouseLimits
+	}
+
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::setCursorCaptureMode(CursorCaptureMode mode)
+{
+	if (m_cursorCaptureMode != mode)
+	{
+		m_cursorCaptureMode = mode;
+		refreshCursorCapture();
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::refreshCursorCapture()
+{
+	if (canCapture())
+	{
+		capture();
+	}
+	else
+	{
+		releaseCapture();
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+Bool Mouse::isCursorCaptured()
+{
+	return m_isCursorCaptured;
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::loseFocus()
+{
+	// Free the cursor when losing window focus.
+	blockCapture(CursorCaptureBlockReason_Unfocused);
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::regainFocus()
+{
+	// Recapture the cursor when returning from desktop.
+	unblockCapture(CursorCaptureBlockReason_Unfocused);
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::onCursorMovedOutside()
+{
+	blockCapture(CursorCaptureBlockReadon_CursorIsOutside);
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::onCursorMovedInside()
+{
+	unblockCapture(CursorCaptureBlockReadon_CursorIsOutside);
+}
+
+// ------------------------------------------------------------------------------------------------
+Bool Mouse::isCursorInside() const
+{
+	return (m_captureBlockReasonBits & (1 << CursorCaptureBlockReadon_CursorIsOutside)) == 0;
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::initCapture()
+{
+	OptionPreferences prefs;
+	m_cursorCaptureMode = prefs.getCursorCaptureMode();
+
+	unblockCapture(CursorCaptureBlockReason_NoInit);
+}
+
+// ------------------------------------------------------------------------------------------------
+Bool Mouse::canCapture() const
+{
+	if (m_captureBlockReasonBits != 0)
+		return false;
+
+	DEBUG_ASSERTCRASH(TheDisplay != NULL, ("The Display is NULL"));
+	const Bool inInteractiveGame = TheGameLogic && TheGameLogic->isInInteractiveGame();
+
+	if (TheDisplay->getWindowed())
+	{
+		if (inInteractiveGame)
+		{
+			if ((m_cursorCaptureMode & CursorCaptureMode_EnabledInWindowedGame) == 0)
+				return false;
+		}
+		else
+		{
+			if ((m_cursorCaptureMode & CursorCaptureMode_EnabledInWindowedMenu) == 0)
+				return false;
+		}
+	}
+	else
+	{
+		if (inInteractiveGame)
+		{
+			if ((m_cursorCaptureMode & CursorCaptureMode_EnabledInFullscreenGame) == 0)
+				return false;
+		}
+		else
+		{
+			if ((m_cursorCaptureMode & CursorCaptureMode_EnabledInFullscreenMenu) == 0)
+				return false;
+		}
+	}
+
+	return true;
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::unblockCapture(CursorCaptureBlockReason reason)
+{
+	Bool canCaptureBefore = canCapture();
+	m_captureBlockReasonBits &= ~(1 << reason);
+	Bool canCaptureNow = canCapture();
+
+	if (canCaptureNow != canCaptureBefore)
+	{
+		DEBUG_ASSERTCRASH(canCaptureNow, ("Mouse::unblockCapture(%s): Unexpected logic", CursorCaptureBlockReasonNames[reason]));
+		capture();
+	}
+
+	DEBUG_LOG(("Mouse::unblockCapture(%s): m_captureBlockReason=%u canCapture=%d",
+		CursorCaptureBlockReasonNames[reason], m_captureBlockReasonBits, (Int)canCapture()));
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::blockCapture(CursorCaptureBlockReason reason)
+{
+	Bool canCaptureBefore = canCapture();
+	m_captureBlockReasonBits |= (1 << reason);
+	Bool canCaptureNow = canCapture();
+
+	if (canCaptureNow != canCaptureBefore)
+	{
+		DEBUG_ASSERTCRASH(!canCaptureNow, ("Mouse::blockCapture(%s): Unexpected logic", CursorCaptureBlockReasonNames[reason]));
+		releaseCapture();
+	}
+
+	DEBUG_LOG(("Mouse::blockCapture(%s): m_captureBlockReason=%u canCapture=%d",
+		CursorCaptureBlockReasonNames[reason], m_captureBlockReasonBits, (Int)canCapture()));
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::onCursorCaptured( Bool captured )
+{
+	m_isCursorCaptured = captured;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw the mouse */
@@ -1041,10 +1196,10 @@ void Mouse::drawTooltip( void )
 			UnsignedInt now = timeGetTime();
 			m_highlightPos = (width*(now-m_highlightUpdateStart))/m_tooltipFillTime;
 		}
-	}  // end if
+	}
 
 
-}  // end drawTooltip
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Draw the cursor text at the mouse position.  Note that this is *NOT* the tooltip text */
@@ -1058,13 +1213,13 @@ void Mouse::drawCursorText( void )
 
 	// get the colors to draw the text in an acceptable format
 	Color color, dropColor;
-	color = GameMakeColor( m_cursorTextColor.red, 
-												 m_cursorTextColor.green, 
-												 m_cursorTextColor.blue, 
+	color = GameMakeColor( m_cursorTextColor.red,
+												 m_cursorTextColor.green,
+												 m_cursorTextColor.blue,
 												 m_cursorTextColor.alpha );
-	dropColor = GameMakeColor( m_cursorTextDropColor.red, 
-														 m_cursorTextDropColor.green, 
-														 m_cursorTextDropColor.blue, 
+	dropColor = GameMakeColor( m_cursorTextDropColor.red,
+														 m_cursorTextDropColor.green,
+														 m_cursorTextDropColor.blue,
 														 m_cursorTextDropColor.alpha );
 
 	// get the size of the text to draw
@@ -1077,7 +1232,7 @@ void Mouse::drawCursorText( void )
 	y = m_currMouse.pos.y - height / 2;
 	m_cursorTextDisplayString->draw( x, y, color, dropColor );
 
-}  // end drawCursorText
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1086,7 +1241,7 @@ Int Mouse::getCursorIndex(const AsciiString& name)
 	if (name.isEmpty())
 		return INVALID_MOUSE_CURSOR;
 
-	/** @todo This is silly to have to define these names from INI in the code ... 
+	/** @todo This is silly to have to define these names from INI in the code ...
 		* that should be changed (CBD) */
 	static const char *CursorININames[NUM_MOUSE_CURSORS] =
 	{
@@ -1152,7 +1307,7 @@ Int Mouse::getCursorIndex(const AsciiString& name)
 			return i;
 	}
 
-	DEBUG_CRASH(( "Mouse::getCursorIndex - Invalid cursor name '%s'\n", name.str() ));
+	DEBUG_CRASH(( "Mouse::getCursorIndex - Invalid cursor name '%s'", name.str() ));
 	return INVALID_MOUSE_CURSOR;
 
 }
@@ -1161,7 +1316,7 @@ Int Mouse::getCursorIndex(const AsciiString& name)
 // ------------------------------------------------------------------------------------------------
 void Mouse::setCursor( MouseCursor cursor )
 {
-	
+
 	// if cursor has not changed do nothing
 	if( m_currentCursor == cursor )
 		return;
@@ -1180,11 +1335,11 @@ void Mouse::setCursor( MouseCursor cursor )
 										 &(cursorInfo->cursorTextColor),
 										 &(cursorInfo->cursorTextDropColor) );
 		else
-			setMouseText( UnicodeString( L"" ), NULL, NULL );
+			setMouseText( L"", NULL, NULL );
 
-	}  // end if
+	}
 
-}  // end setCursor
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse MouseCursor entry */
@@ -1196,7 +1351,7 @@ void INI::parseMouseCursorDefinition( INI* ini )
 
 	// read the name
 	c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	if( TheMouse )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp
index b7fabb01f39..6185748421c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/LanguageFilter.cpp
@@ -23,26 +23,18 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/LanguageFilter.h"
 #include "Common/FileSystem.h"
 #include "Common/file.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 LanguageFilter *TheLanguageFilter = NULL;
 
-LanguageFilter::LanguageFilter() 
+LanguageFilter::LanguageFilter()
 {
-	//Modified by Saad
-	//Unnecessary
-	//m_wordList.clear();
 }
 
 LanguageFilter::~LanguageFilter() {
@@ -69,7 +61,7 @@ void LanguageFilter::init() {
 		}
 		UnicodeString uniword(word);
 		unHaxor(uniword);
-		//DEBUG_LOG(("Just read %ls from the bad word file.  Entered as %ls\n", word, uniword.str()));
+		//DEBUG_LOG(("Just read %ls from the bad word file.  Entered as %ls", word, uniword.str()));
 		m_wordList[uniword] = true;
 	}
 
@@ -86,15 +78,15 @@ void LanguageFilter::update() {
 
 wchar_t ignoredChars[] = L"-_*'\"";
 
-void LanguageFilter::filterLine(UnicodeString &line) 
+void LanguageFilter::filterLine(UnicodeString &line)
 {
 	WideChar *buf = NEW WideChar[line.getLength()+1];
 	wcscpy(buf, line.str());
 
 	UnicodeString newLine(line);
-	UnicodeString token(L"");
+	UnicodeString token;
 
-	while (newLine.nextToken(&token, UnicodeString(L" ;,.!?:=\\/><`~()&^%#\n\t"))) {
+	while (newLine.nextToken(&token, L" ;,.!?:=\\/><`~()&^%#\n\t")) {
 		wchar_t *pos = wcsstr(buf, token.str());
 		if (pos == NULL) {
 			DEBUG_CRASH(("Couldn't find the token in its own string."));
@@ -106,7 +98,7 @@ void LanguageFilter::filterLine(UnicodeString &line)
 		unHaxor(token);
 		LangMapIter iter = m_wordList.find(token);
 		if (iter != m_wordList.end()) {
-			DEBUG_LOG(("Found word %ls in bad word list. Token was %ls\n", (*iter).first.str(), token.str()));
+			DEBUG_LOG(("Found word %ls in bad word list. Token was %ls", (*iter).first.str(), token.str()));
 			for (Int i = 0; i < len; ++i) {
 				*pos = L'*';
 				++pos;
@@ -120,7 +112,7 @@ void LanguageFilter::filterLine(UnicodeString &line)
 
 void LanguageFilter::unHaxor(UnicodeString &word) {
 	Int len = word.getLength();
-	UnicodeString newWord(L"");
+	UnicodeString newWord;
 	for (Int i = 0; i < len; ++i) {
 		wchar_t c = word.getCharAt(i);
 		if ((c == L'p') || (c == L'P')) {
@@ -192,7 +184,7 @@ Bool LanguageFilter::readWord(File *file1, WideChar *buf) {
 	return retval;
 }
 
-LanguageFilter * createLanguageFilter() 
+LanguageFilter * createLanguageFilter()
 {
 	return NEW LanguageFilter;
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Line2D.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Line2D.cpp
index 90811bbfe74..610ef69963f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Line2D.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Line2D.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Lib/BaseType.h"
 #include "GameClient/Line2D.h"
@@ -49,7 +49,7 @@ const static Coord2D reallyFarPoint = { 1000000.0, 1000000.0 };
 /** Clip a line to the region provided.  The source line runs from p1 to p2, and is clipped
 	* using the clipRegion.  The resulting line goes from c1 to c2
 	*
-	* Return values: 
+	* Return values:
 	*				TRUE  - Line is visible
 	*				FALSE - Line is not visible
 	*/
@@ -87,7 +87,7 @@ Bool ClipLine2D( ICoord2D *p1, ICoord2D *p2, ICoord2D *c1, ICoord2D *c2,
 	y1 = p1->y;
 	x2 = p2->x;
 	y2 = p2->y;
-		
+
 	// Test first point
 	clipCode1 = 0;
 
@@ -128,7 +128,7 @@ Bool ClipLine2D( ICoord2D *p1, ICoord2D *p2, ICoord2D *c1, ICoord2D *c2,
 		*c2 = *p2;
 		return TRUE;
 
-	}  // end if
+	}
 
 	// Both points outside window?
 	if (clipCode1 & clipCode2)
@@ -224,14 +224,14 @@ Bool ClipLine2D( ICoord2D *p1, ICoord2D *p2, ICoord2D *c1, ICoord2D *c2,
 			x2 >= clipLeft && x2 <= clipRight &&
 			y2 >= clipTop && y2 <= clipBottom);
 
-}  // end ClipLine2D
+}
 
 
-// This solution uses the 
-// http://www.faqs.org/faqs/graphics/algorithms-faq/ 
+// This solution uses the
+// http://www.faqs.org/faqs/graphics/algorithms-faq/
 // Subject 1.03
-Bool IntersectLine2D( const Coord2D *a, const Coord2D *b, 
-										   const Coord2D *c, const Coord2D *d, 
+Bool IntersectLine2D( const Coord2D *a, const Coord2D *b,
+										   const Coord2D *c, const Coord2D *d,
 											 Coord2D *intersection)
 {
 	if (!a || !b || !c || !d) {
@@ -265,7 +265,7 @@ Bool IntersectLine2D( const Coord2D *a, const Coord2D *b,
 
 // determines whether a point lies within a rectangle. Doesnt' determine whether the shape is
 // actually a rectangle or not.
-Bool PointInsideRect2D(const Coord2D *bl, const Coord2D *tl, const Coord2D *br, const Coord2D *tr, 
+Bool PointInsideRect2D(const Coord2D *bl, const Coord2D *tl, const Coord2D *br, const Coord2D *tr,
 											 const Coord2D *inputPoint)
 {
 	if (!(bl && br && tl && tr && inputPoint)) {
@@ -379,7 +379,7 @@ void ShortestDistancePointToSegment2D( const Coord2D *a, const Coord2D *b, const
 		Coord2D segment;
 		segment.x = pt->x - a->x;
 		segment.y = pt->y - a->y;
-		if (outDistance) {		
+		if (outDistance) {
 			(*outDistance) = segment.length();
 		}
 
@@ -415,7 +415,7 @@ void ShortestDistancePointToSegment2D( const Coord2D *a, const Coord2D *b, const
 	if (outDistance) {
 		(*outDistance) = intersectSegment.length();
 	}
-	
+
 	if (outU) {
 		(*outU) = u;
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp
deleted file mode 100644
index 0e3f0ad5f57..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp
+++ /dev/null
@@ -1,1358 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: MapUtil.cpp //////////////////////////////////////////////////////////////////////////////
-// Author: Matt Campbell, December 2001
-// Description: Map utility/convenience routines
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/crc.h"
-#include "Common/FileSystem.h"
-#include "Common/LocalFileSystem.h"
-#include "Common/file.h"
-#include "Common/GlobalData.h"
-#include "Common/GameState.h"
-#include "Common/GameEngine.h"
-#include "Common/NameKeyGenerator.h"
-#include "Common/DataChunk.h"
-#include "Common/MapReaderWriterInfo.h"
-#include "Common/MessageStream.h"
-#include "Common/WellKnownKeys.h"
-#include "Common/INI.h"
-#include "Common/QuotedPrintable.h"
-#include "Common/SkirmishBattleHonors.h"
-#include "Common/ThingFactory.h"
-#include "Common/ThingTemplate.h"
-#include "Common/MapObject.h"
-#include "GameClient/GameText.h" 
-#include "GameClient/WindowLayout.h"
-#include "GameClient/Gadget.h"
-#include "GameClient/Image.h"
-#include "GameClient/Shell.h"
-#include "GameClient/GameWindowManager.h"
-#include "GameClient/GadgetListBox.h"
-#include "GameClient/MapUtil.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/FPUControl.h"
-#include "GameNetwork/GameInfo.h"
-#include "GameNetwork/NetworkDefs.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-------------------------------------------------------------------------------
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-static const char *mapExtension = ".map";
-
-static Int m_width = 0;						///< Height map width.
-static Int m_height = 0;					///< Height map height (y size of array).
-static Int m_borderSize = 0;			///< Non-playable border area.
-static std::vector<ICoord2D> m_boundaries;	///< All the boundaries we use for the map
-static Int m_dataSize = 0;				///< size of m_data.
-static UnsignedByte *m_data = 0;	///< array of z(height) values in the height map.
-static Dict worldDict = 0;
-
-static WaypointMap *m_waypoints = 0;
-static Coord3DList	m_supplyPositions;
-static Coord3DList	m_techPositions;
-
-static Int m_mapDX = 0;
-static Int m_mapDY = 0;
-
-static UnsignedInt calcCRC( AsciiString dirName, AsciiString fname )
-{
-	CRC theCRC;
-	theCRC.clear();
-
-	// Try the official map dir
-	AsciiString asciiFile;
-	char	tempBuf[_MAX_PATH];
-	char	filenameBuf[_MAX_PATH];
-	int length = 0;
-	strcpy(tempBuf, fname.str());
-	length = strlen( tempBuf );
-	if( length >= 4 )
-	{
-		memset( filenameBuf, '\0', _MAX_PATH);
-		strncpy( filenameBuf, tempBuf, length - 4);
-	}
-
-	File *fp;
-	asciiFile = fname;
-	fp = TheFileSystem->openFile(asciiFile.str(), File::READ);
-	if( !fp )
-	{
-		DEBUG_CRASH(("Couldn't open '%s'\n", fname.str()));
-		return 0;
-	}
-
-	UnsignedByte buf[4096];
-	Int num;
-	while ( (num=fp->read(buf, 4096)) > 0 )
-	{
-		theCRC.computeCRC(buf, num);
-	}
-
-	fp->close();
-	fp = NULL;
-
-	return theCRC.get();
-}
-
-static Bool ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	Bool readDict = info->version >= K_OBJECTS_VERSION_2;
-
-	Coord3D loc;
-	loc.x = file.readReal();
-	loc.y = file.readReal();
-	loc.z = file.readReal();
-	if (info->version <= K_OBJECTS_VERSION_2) 
-	{
-		loc.z = 0;
-	}
-
-	Real angle = file.readReal();
-	Int flags = file.readInt(); 
-	AsciiString name = file.readAsciiString();
-	Dict d;
-	if (readDict)
-	{
-		d = file.readDict();
-	}
-	MapObject *pThisOne;
-	
-	// create the map object
-	pThisOne = newInstance( MapObject )( loc, name, angle, flags, &d, 
-														TheThingFactory->findTemplate( name, FALSE ) );
-
-//DEBUG_LOG(("obj %s owner %s\n",name.str(),d.getAsciiString(TheKey_originalOwner).str()));
-
-	if (pThisOne->getProperties()->getType(TheKey_waypointID) == Dict::DICT_INT)
-	{
-		pThisOne->setIsWaypoint();
-
-		// grab useful info
-		(*m_waypoints)[pThisOne->getWaypointName()] = loc;
-	}
-	else if (pThisOne->getThingTemplate() && pThisOne->getThingTemplate()->isKindOf(KINDOF_TECH_BUILDING))
-	{
-		m_techPositions.push_back(loc);
-	}
-	else if (pThisOne->getThingTemplate() && pThisOne->getThingTemplate()->isKindOf(KINDOF_SUPPLY_SOURCE_ON_PREVIEW))
-	{
-		m_supplyPositions.push_back(loc);
-	}
-
-	deleteInstance(pThisOne);
-	return TRUE;
-}
-
-static Bool ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	file.m_currentObject = NULL;
-	file.registerParser( AsciiString("Object"), info->label, ParseObjectDataChunk );
-	return (file.parse(userData));
-}
-
-static Bool ParseWorldDictDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	worldDict = file.readDict();
-	return true;
-}
-
-static Bool ParseSizeOnly(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	m_width = file.readInt();
-	m_height = file.readInt();
-	if (info->version >= K_HEIGHT_MAP_VERSION_3) {
-		m_borderSize = file.readInt();
-	} else {
-		m_borderSize = 0;
-	}
-
-	if (info->version >= K_HEIGHT_MAP_VERSION_4) {
-		Int numBorders = file.readInt();
-		m_boundaries.resize(numBorders);
-		for (int i = 0; i < numBorders; ++i) {
-			m_boundaries[i].x = file.readInt();
-			m_boundaries[i].y = file.readInt();
-		}
-	}
-	return true;
-
-	m_dataSize = file.readInt();
-	m_data = NEW UnsignedByte[m_dataSize];	// pool[]ify
-	if (m_dataSize <= 0 || (m_dataSize != (m_width*m_height))) {
-		throw ERROR_CORRUPT_FILE_FORMAT	;
-	}
-	file.readArrayOfBytes((char *)m_data, m_dataSize);
-	// Resize me. 
-	if (info->version == K_HEIGHT_MAP_VERSION_1) {
-		Int newWidth = (m_width+1)/2;
-		Int newHeight = (m_height+1)/2;
-		Int i, j;
-		for (i=0; i<newHeight; i++) {
-			for (j=0; j<newWidth; j++) {
-				m_data[i*newWidth+j] = m_data[2*i*m_width+2*j];
-			}
-		}
-		m_width = newWidth;
-		m_height = newHeight;
-	}
-	return true;
-}
-
-static Bool ParseSizeOnlyInChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	return ParseSizeOnly(file, info, userData);
-}
-
-static Bool loadMap( AsciiString filename )
-{
-	char	tempBuf[_MAX_PATH];
-	char	filenameBuf[_MAX_PATH];
-	AsciiString asciiFile;
-	int length = 0;
-
-	strcpy(tempBuf, filename.str());
-
-	length = strlen( tempBuf );
-	if( length >= 4 )
-	{
-		memset( filenameBuf, '\0', _MAX_PATH);
-		strncpy( filenameBuf, tempBuf, length - 4);
-	}
-
-	CachedFileInputStream fileStrm;
-
-	asciiFile = filename;
-	if( !fileStrm.open(asciiFile) )
-	{
-		return FALSE;
-	}
-
-	ChunkInputStream *pStrm = &fileStrm;
-
-	DataChunkInput file( pStrm );
-
-	m_waypoints = NEW WaypointMap;
-
-	file.registerParser( AsciiString("HeightMapData"), AsciiString::TheEmptyString, ParseSizeOnlyInChunk );
-	file.registerParser( AsciiString("WorldInfo"), AsciiString::TheEmptyString, ParseWorldDictDataChunk );
-	file.registerParser( AsciiString("ObjectsList"), AsciiString::TheEmptyString, ParseObjectsDataChunk );
-	if (!file.parse(NULL)) {
-		throw(ERROR_CORRUPT_FILE_FORMAT);
-	}
-
-	m_mapDX = m_width  - 2*m_borderSize;
-	m_mapDY = m_height - 2*m_borderSize;
-
-	return TRUE;
-}
-
-static void resetMap( void )
-{
-	if (m_data)
-	{
-		delete[] m_data;
-		m_data = 0;
-	}
-
-	if (m_waypoints)
-	{
-		delete m_waypoints;
-		m_waypoints = 0;
-	}
-	m_techPositions.clear();
-	m_supplyPositions.clear();
-}
-
-static void getExtent( Region3D *extent )
-{
-	extent->lo.x = 0.0f;
-
-	extent->lo.y = 0.0f;
-
-	// Note - m_mapDX & Y are the number of height map grids wide, so we have to
-	// multiply by the grid width.
-	extent->hi.x = m_mapDX*MAP_XY_FACTOR;
-	extent->hi.y = m_mapDY*MAP_XY_FACTOR;
-
-	extent->lo.z = 0;
-	extent->hi.z = 0;
-}
-
-//-------------------------------------------------------------------------------
-
-void WaypointMap::update( void )
-{
-	if (!m_waypoints)
-	{
-		m_numStartSpots = 1;
-		return;
-	}
-
-	this->clear();
-
-	AsciiString startingCamName = TheNameKeyGenerator->keyToName(TheKey_InitialCameraPosition);
-	WaypointMap::const_iterator it;
-
-	it = m_waypoints->find(startingCamName);
-	if (it != m_waypoints->end())
-	{
-		(*this)[startingCamName] = it->second;
-	}
-
-	m_numStartSpots = 0;
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		startingCamName.format("Player_%d_Start", i+1); // start pos waypoints are 1-based
-		it = m_waypoints->find(startingCamName);
-		if (it != m_waypoints->end())
-		{
-			(*this)[startingCamName] = it->second;
-			++m_numStartSpots;
-		}
-		else
-		{
-			break;
-		}
-	}
-
-	m_numStartSpots = max(1, m_numStartSpots);
-}
-
-const char * MapCache::m_mapCacheName = "MapCache.ini";
-
-AsciiString MapCache::getMapDir() const 
-{ 
-	return AsciiString("Maps"); 
-}
-
-AsciiString MapCache::getUserMapDir() const
-{
-	AsciiString tmp = TheGlobalData->getPath_UserData();
-	tmp.concat(getMapDir());
-	return tmp;
-}
-
-AsciiString MapCache::getMapExtension() const
-{
-	return AsciiString("map");
-}
-
-void MapCache::writeCacheINI( Bool userDir )
-{
-	AsciiString mapDir;
-	if (!userDir || TheGlobalData->m_buildMapCache)
-	{
-		mapDir = getMapDir();
-	}
-	else
-	{
-		mapDir = getUserMapDir();
-	}
-
-	AsciiString filepath = mapDir;
-	filepath.concat('\\');
-
-	TheFileSystem->createDirectory(mapDir);
-
-	filepath.concat(m_mapCacheName);
-	FILE *fp = fopen(filepath.str(), "w");
-	DEBUG_ASSERTCRASH(fp != NULL, ("Failed to create %s", filepath.str()));
-	if (fp == NULL) {
-		return;
-	}
-	fprintf(fp, "; FILE: %s /////////////////////////////////////////////////////////////\n", filepath.str());
-	fprintf(fp, "; This INI file is auto-generated - do not modify\n");
-	fprintf(fp, "; /////////////////////////////////////////////////////////////////////////////\n");
-	mapDir.toLower();
-
-	MapCache::iterator it = begin();
-	MapMetaData md;
-	while (it != end())
-	{
-		if (it->first.startsWithNoCase(mapDir.str()))
-		{
-			md = it->second;
-			fprintf(fp, "\nMapCache %s\n", AsciiStringToQuotedPrintable(it->first.str()).str());
-			fprintf(fp, "  fileSize = %u\n", md.m_filesize);
-			fprintf(fp, "  fileCRC = %u\n", md.m_CRC);
-			fprintf(fp, "  timestampLo = %d\n", md.m_timestamp.m_lowTimeStamp);
-			fprintf(fp, "  timestampHi = %d\n", md.m_timestamp.m_highTimeStamp);
-			fprintf(fp, "  isOfficial = %s\n", (md.m_isOfficial)?"yes":"no");
-
-			fprintf(fp, "  isMultiplayer = %s\n", (md.m_isMultiplayer)?"yes":"no");
-			fprintf(fp, "  numPlayers = %d\n", md.m_numPlayers);
-
-			fprintf(fp, "  extentMin = X:%2.2f Y:%2.2f Z:%2.2f\n", md.m_extent.lo.x, md.m_extent.lo.y, md.m_extent.lo.z);
-			fprintf(fp, "  extentMax = X:%2.2f Y:%2.2f Z:%2.2f\n", md.m_extent.hi.x, md.m_extent.hi.y, md.m_extent.hi.z);
-
-// BAD AND NOW UNUSED:  the mapcache.ini should not contain localized data... using the lookup tag instead
-//			fprintf(fp, "  displayName = %s\n", UnicodeStringToQuotedPrintable(md.m_displayName).str());
-			fprintf(fp, "  nameLookupTag = %s\n", md.m_nameLookupTag.str());
-
-			Coord3D pos;
-			WaypointMap::iterator itw = md.m_waypoints.begin();
-			while (itw != md.m_waypoints.end())
-			{
-				pos = itw->second;
-				fprintf(fp, "  %s = X:%2.2f Y:%2.2f Z:%2.2f\n", itw->first.str(), pos.x, pos.y, pos.z);
-				++itw;
-			}
-			Coord3DList::iterator itc3d = md.m_techPositions.begin();
-			while (itc3d != md.m_techPositions.end())
-			{
-				pos = *itc3d;
-				fprintf(fp, "  techPosition = X:%2.2f Y:%2.2f Z:%2.2f\n", pos.x, pos.y, pos.z);
-				itc3d++;
-			}
-			
-			itc3d = md.m_supplyPositions.begin();
-			while (itc3d != md.m_supplyPositions.end())
-			{
-				pos = *itc3d;
-				fprintf(fp, "  supplyPosition = X:%2.2f Y:%2.2f Z:%2.2f\n", pos.x, pos.y, pos.z);
-				itc3d++;
-			}
-			fprintf(fp, "END\n\n");
-		}
-		else
-		{
-			//DEBUG_LOG(("%s does not start %s\n", mapDir.str(), it->first.str()));
-		}
-		++it;
-	}
-
-	fclose(fp);
-}
-
-void MapCache::updateCache( void )
-{
-	setFPMode();
-
-	TheFileSystem->createDirectory(getUserMapDir());
-
-	if (loadUserMaps())
-	{
-		writeCacheINI( TRUE );
-	}
-	loadStandardMaps();	// we shall overwrite info from matching user maps to prevent munkees from getting rowdy :)
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheLocalFileSystem->doesFileExist(getMapDir().str()))
-	{
-		// only create the map cache file if "Maps" exist
-		Bool wasBuildMapCache = TheGlobalData->m_buildMapCache;
-		TheWritableGlobalData->m_buildMapCache = true;
-		loadUserMaps();
-		TheWritableGlobalData->m_buildMapCache = wasBuildMapCache;
-		writeCacheINI( FALSE );
-	}
-#endif
-}
-
-Bool MapCache::clearUnseenMaps( AsciiString dirName )
-{
-	dirName.toLower();
-	Bool erasedSomething = FALSE;
-
-	std::map<AsciiString, Bool>::iterator it = m_seen.begin();
-
-	while (it != m_seen.end())
-	{
-		AsciiString mapName = it->first;
-		if (it->second == FALSE && mapName.startsWithNoCase(dirName.str()))
-		{
-			// not seen in the dir - clear it out.
-			erase(mapName);
-			erasedSomething = TRUE;
-		}
-		++it;
-	}
-	return erasedSomething;
-}
-
-void MapCache::loadStandardMaps(void)
-{
-	INI ini;
-	AsciiString fname;
-	fname.format("%s\\%s", getMapDir().str(), m_mapCacheName);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	File *fp = TheFileSystem->openFile(fname.str(), File::READ);
-	if (fp != NULL)
-	{
-		fp->close();
-		fp = NULL;
-#endif
-		ini.load( fname, INI_LOAD_OVERWRITE, NULL );
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	}
-#endif
-}
-
-Bool MapCache::loadUserMaps()
-{
-	// Read in map list from disk
-	AsciiString mapDir;
-	if (TheGlobalData->m_buildMapCache)
-	{
-		mapDir = getMapDir();
-	}
-	else
-	{
-		mapDir = getUserMapDir();
-
-		INI ini;
-		AsciiString fname;
-		fname.format("%s\\%s", mapDir.str(), m_mapCacheName);
-		File *fp = TheFileSystem->openFile(fname.str(), File::READ);
-		if (fp)
-		{
-			fp->close();
-			ini.load( fname, INI_LOAD_OVERWRITE, NULL );
-		}
-
-	}
-
-	// mark all as unseen
-	m_seen.clear();
-	MapCache::iterator it = begin();
-	while (it != end())
-	{
-		m_seen[it->first] = FALSE;
-		++it;
-	}
-
-	FilenameList filenameList;
-	FilenameListIter iter;
-	AsciiString toplevelPattern;
-	toplevelPattern.format("%s\\", mapDir.str());
-	Bool parsedAMap = FALSE;
-	AsciiString filenamepattern;
-	filenamepattern.format("*.%s", getMapExtension().str());
-
-	TheFileSystem->getFileListInDirectory(toplevelPattern, filenamepattern, filenameList, TRUE);
-
-	iter = filenameList.begin();
-
-	while (iter != filenameList.end()) {
-		FileInfo fileInfo;
-		AsciiString tempfilename;
-		tempfilename = (*iter);
-		tempfilename.toLower();
-
-		const char *s = tempfilename.reverseFind('\\');
-		if (!s)
-		{
-			DEBUG_CRASH(("Couldn't find \\ in map name!"));
-		}
-		else
-		{
-			AsciiString endingStr;
-			AsciiString fname = s+1;
-			for (size_t i=0; i<strlen(mapExtension); ++i)
-				fname.removeLastChar();
-
-			endingStr.format("%s\\%s%s", fname.str(), fname.str(), mapExtension);
-
-			Bool skipMap = FALSE;
-			if (TheGlobalData->m_buildMapCache)
-			{
-				std::set<AsciiString>::const_iterator sit = m_allowedMaps.find(fname);
-				if (m_allowedMaps.size() != 0 && sit == m_allowedMaps.end())
-				{
-					//DEBUG_LOG(("Skipping map: '%s'\n", fname.str()));
-					skipMap = TRUE;
-				}
-				else
-				{
-					//DEBUG_LOG(("Parsing map: '%s'\n", fname.str()));
-				}
-			}
-
-			if (!skipMap)
-			{
-				if (!tempfilename.endsWithNoCase(endingStr.str()))
-				{
-					DEBUG_CRASH(("Found map '%s' in wrong spot (%s)", fname.str(), tempfilename.str()));
-				}
-				else
-				{
-					if (TheFileSystem->getFileInfo(tempfilename, &fileInfo)) {
-						char funk[_MAX_PATH];
-						strcpy(funk, tempfilename.str());
-						char *filenameptr = funk;
-						char *tempchar = funk;
-						while (*tempchar != 0) {
-							if ((*tempchar == '\\') || (*tempchar == '/')) {
-								filenameptr = tempchar+1;
-							}
-							++tempchar;
-						}
-
-						m_seen[tempfilename] = TRUE;
-						parsedAMap |= addMap(mapDir, *iter, &fileInfo, TheGlobalData->m_buildMapCache);
-					} else {
-						DEBUG_CRASH(("Could not get file info for map %s", (*iter).str()));
-					}
-				}
-			}
-		}
-		iter++;
-	}
-
-	// clean out unseen maps
-	if (clearUnseenMaps(mapDir))
-		return TRUE;
-
-	return parsedAMap;
-}
-
-//Bool MapCache::addMap( AsciiString dirName, AsciiString fname, WinTimeStamp timestamp, UnsignedInt filesize, Bool isOfficial )
-Bool MapCache::addMap( AsciiString dirName, AsciiString fname, FileInfo *fileInfo, Bool isOfficial)
-{
-	if (fileInfo == NULL) {
-		return FALSE;
-	}
-
-	AsciiString lowerFname;
-	lowerFname = fname;
-	lowerFname.toLower();
-	MapCache::iterator it = find(lowerFname);
-
-	MapMetaData md;
-	UnsignedInt filesize = fileInfo->sizeLow;
-
-	if (it != end())
-	{
-		// Found the map in our cache.  Check to see if it has changed.
-		md = it->second;
-
-		if ((md.m_filesize == filesize) &&
-				(md.m_CRC != 0))
-		{
-			// Force a lookup so that we don't display the English localization in all builds.
-			if (md.m_nameLookupTag.isEmpty())
-			{
-				// unofficial maps or maps without names
-				AsciiString tempdisplayname;
-				tempdisplayname = fname.reverseFind('\\') + 1;
-				(*this)[lowerFname].m_displayName.translate(tempdisplayname);
-				if (md.m_numPlayers >= 2)
-				{
-					UnicodeString extension;
-					extension.format(L" (%d)", md.m_numPlayers);
-					(*this)[lowerFname].m_displayName.concat(extension);
-				}
-			}
-			else
-			{
-				// official maps with name tags
-				(*this)[lowerFname].m_displayName = TheGameText->fetch(md.m_nameLookupTag);
-				if (md.m_numPlayers >= 2)
-				{
-					UnicodeString extension;
-					extension.format(L" (%d)", md.m_numPlayers);
-					(*this)[lowerFname].m_displayName.concat(extension);
-				}
-			}
-//			DEBUG_LOG(("MapCache::addMap - found match for map %s\n", lowerFname.str()));
-			return FALSE;	// OK, it checks out.
-		}
-		DEBUG_LOG(("%s didn't match file in MapCache\n", fname.str()));
-		DEBUG_LOG(("size: %d / %d\n", filesize, md.m_filesize));
-		DEBUG_LOG(("time1: %d / %d\n", fileInfo->timestampHigh, md.m_timestamp.m_highTimeStamp));
-		DEBUG_LOG(("time2: %d / %d\n", fileInfo->timestampLow, md.m_timestamp.m_lowTimeStamp));
-//		DEBUG_LOG(("size: %d / %d\n", filesize, md.m_filesize));
-//		DEBUG_LOG(("time1: %d / %d\n", timestamp.m_highTimeStamp, md.m_timestamp.m_highTimeStamp));
-//		DEBUG_LOG(("time2: %d / %d\n", timestamp.m_lowTimeStamp, md.m_timestamp.m_lowTimeStamp));
-	}
-
-	DEBUG_LOG(("MapCache::addMap(): caching '%s' because '%s' was not found\n", fname.str(), lowerFname.str()));
-
-	loadMap(fname); // Just load for querying the data, since we aren't playing this map.
-
-	// The map is now loaded.  Pick out what we need.
-	md.m_fileName = lowerFname;
-	md.m_filesize = filesize;
-	md.m_isOfficial = isOfficial;
-	md.m_waypoints.update();
-	md.m_numPlayers = md.m_waypoints.m_numStartSpots;
-	md.m_isMultiplayer = (md.m_numPlayers >= 2);
-	md.m_timestamp.m_highTimeStamp = fileInfo->timestampHigh;
-	md.m_timestamp.m_lowTimeStamp = fileInfo->timestampLow;
-	md.m_supplyPositions = m_supplyPositions;
-	md.m_techPositions = m_techPositions;
-	md.m_CRC = calcCRC(dirName, fname);
-
-	Bool exists = false;
-	AsciiString munkee = worldDict.getAsciiString(TheKey_mapName, &exists);
-	md.m_nameLookupTag = munkee;
-	if (!exists || munkee.isEmpty())
-	{
-		DEBUG_LOG(("Missing TheKey_mapName!\n"));
-		AsciiString tempdisplayname;
-		tempdisplayname = fname.reverseFind('\\') + 1;
-		md.m_displayName.translate(tempdisplayname);
-		if (md.m_numPlayers >= 2)
-		{
-			UnicodeString extension;
-			extension.format(L" (%d)", md.m_numPlayers);
-			md.m_displayName.concat(extension);
-		}
-		TheGameText->reset();
-	}
-	else
-	{
-		AsciiString stringFileName;
-		stringFileName.format("%s\\%s", dirName.str(), fname.str());
-		for (Int i=0; i<4; ++i)
-			stringFileName.removeLastChar();
-		stringFileName.concat("\\map.str");
-		TheGameText->initMapStringFile(stringFileName);
-		md.m_displayName = TheGameText->fetch(munkee);
-		if (md.m_numPlayers >= 2)
-		{
-			UnicodeString extension;
-			extension.format(L" (%d)", md.m_numPlayers);
-			md.m_displayName.concat(extension);
-		}
-		DEBUG_LOG(("Map name is now '%ls'\n", md.m_displayName.str()));
-		TheGameText->reset();
-	}
-
-	getExtent(&(md.m_extent));
-
-	(*this)[lowerFname] = md;
-
-	DEBUG_LOG(("  filesize = %d bytes\n", md.m_filesize));
-	DEBUG_LOG(("  displayName = %ls\n", md.m_displayName.str()));
-	DEBUG_LOG(("  CRC = %X\n", md.m_CRC));
-	DEBUG_LOG(("  timestamp = %d\n", md.m_timestamp));
-	DEBUG_LOG(("  isOfficial = %s\n", (md.m_isOfficial)?"yes":"no"));
-
-	DEBUG_LOG(("  isMultiplayer = %s\n", (md.m_isMultiplayer)?"yes":"no"));
-	DEBUG_LOG(("  numPlayers = %d\n", md.m_numPlayers));
-
-	DEBUG_LOG(("  extent = (%2.2f,%2.2f) -> (%2.2f,%2.2f)\n",
-		md.m_extent.lo.x, md.m_extent.lo.y,
-		md.m_extent.hi.x, md.m_extent.hi.y));
-
-	Coord3D pos;
-	WaypointMap::iterator itw = md.m_waypoints.begin();
-	while (itw != md.m_waypoints.end())
-	{
-		pos = itw->second;
-		DEBUG_LOG(("    waypoint %s: (%2.2f,%2.2f)\n", itw->first.str(), pos.x, pos.y));
-		++itw;
-	}
-
-	resetMap();
-
-	return TRUE;
-}
-
-MapCache *TheMapCache = NULL;
-
-// PUBLIC FUNCTIONS //////////////////////////////////////////////////////////////////////////////
-
-Bool WouldMapTransfer( const AsciiString& mapName )
-{
-	return mapName.startsWithNoCase(TheMapCache->getUserMapDir());
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Load the listbox with all the map files available to play */
-//-------------------------------------------------------------------------------------------------
-Int populateMapListboxNoReset( GameWindow *listbox, Bool useSystemMaps, Bool isMultiplayer, AsciiString mapToSelect )
-{
-	if(!TheMapCache)
-		return -1;
-
-	if (!listbox)
-		return -1;
-	
-	// reset the listbox content
-	//GadgetListBoxReset( listbox );
-	
-	Int numColumns = GadgetListBoxGetNumColumns( listbox );
-	const Image *easyImage = NULL;
-	const Image *mediumImage = NULL;
-	const Image *brutalImage = NULL;
-	const Image *maxBrutalImage = NULL;
-	SkirmishBattleHonors *battleHonors = NULL;
-	Int w = 10, h = 10;
-	if (numColumns > 1)
-	{
-		easyImage = TheMappedImageCollection->findImageByName("Star-Bronze");
-		mediumImage = TheMappedImageCollection->findImageByName("Star-Silver");
-		brutalImage = TheMappedImageCollection->findImageByName("Star-Gold");
-		maxBrutalImage = TheMappedImageCollection->findImageByName("RedYell_Star");
-		battleHonors = new SkirmishBattleHonors;
-
-		w = (brutalImage)?brutalImage->getImageWidth():10;
-		w = min(GadgetListBoxGetColumnWidth(listbox, 0), w);
-		h = w;
-	}
-
-	Color color = GameMakeColor( 255, 255, 255, 255 );
-	UnicodeString mapDisplayName;
-
-	Int selectionIndex = 0; // always select *something*
-
-	MapCache::iterator it = TheMapCache->begin();
-	AsciiString mapDir;
-	if (useSystemMaps)
-	{
-		mapDir = TheMapCache->getMapDir();
-	}
-	else
-	{
-		mapDir = TheGlobalData->getPath_UserData();
-		mapDir.concat(TheMapCache->getMapDir());
-	}
-	mapDir.toLower();
-
-typedef std::set<UnicodeString, rts::less_than_nocase<UnicodeString> > MapNameList;
-typedef MapNameList::iterator MapNameListIter;
-
-typedef std::map<UnicodeString, AsciiString> MapDisplayToFileNameList;
-typedef MapDisplayToFileNameList::iterator MapDisplayToFileNameListIter;
-
-	MapNameList tempCache;
-	MapDisplayToFileNameList filenameMap;
-	UnsignedInt numMapsListed = 0;
-	UnsignedInt curNumPlayersInMap = 0;
-
-	while (numMapsListed < TheMapCache->size()) {
-
-		DEBUG_LOG(("Adding maps with %d players\n", curNumPlayersInMap));
-		it = TheMapCache->begin();
-		while (it != TheMapCache->end()) {
-			const MapMetaData *md = &(it->second);
-			if (md != NULL) {
-				if (md->m_numPlayers == curNumPlayersInMap) {
-					tempCache.insert(it->second.m_displayName);
-					filenameMap[it->second.m_displayName] = it->first;
-					DEBUG_LOG(("Adding map %s to temp cache.\n", it->first.str()));
-					++numMapsListed;
-				}
-			}
-			++it;
-		}
-
-		MapNameListIter tempit = tempCache.begin();
-
-		while (tempit != tempCache.end())
-		{
-
-			AsciiString asciiMapName;
-			asciiMapName = filenameMap[*tempit];
-			it = TheMapCache->find(asciiMapName);
-			/*
-			if (it != TheMapCache->end())
-			{
-				DEBUG_LOG(("populateMapListbox(): looking at %s (displayName = %ls), mp = %d (== %d?) mapDir=%s (ok=%d)\n",
-					it->first.str(), it->second.m_displayName.str(), it->second.m_isMultiplayer, isMultiplayer,
-					mapDir.str(), it->first.startsWith(mapDir.str())));
-			}
-			*/
-			
-			//Patch 1.03 -- Purposely filter out these broken maps that exist in Generals.
-			if( !asciiMapName.compare( "maps\\armored fury\\armored fury.map" ) || 
-				!asciiMapName.compare( "maps\\scorched earth\\scorched earth.map" ) )
-			{
-				++tempit;
-				continue;
-			}
-
-			DEBUG_ASSERTCRASH(it != TheMapCache->end(), ("Map %s not found in map cache.", *tempit));
-			if (it->first.startsWithNoCase(mapDir.str()) && isMultiplayer == it->second.m_isMultiplayer && !it->second.m_displayName.isEmpty())
-			{
-				/// @todo: mapDisplayName = TheGameText->fetch(it->second.m_displayName.str());
-				mapDisplayName = it->second.m_displayName;
-				Int index = -1;
-				Int imageItemData = -1;
-				if (numColumns > 1 && it->second.m_isMultiplayer)
-				{
-					Int numEasy = battleHonors->getEnduranceMedal(it->first.str(), SLOT_EASY_AI);
-					Int numMedium = battleHonors->getEnduranceMedal(it->first.str(), SLOT_MED_AI);
-					Int numBrutal = battleHonors->getEnduranceMedal(it->first.str(), SLOT_BRUTAL_AI);
-					if (numBrutal)
-					{
-						int maxBrutalSlots = it->second.m_numPlayers - 1;
-						if (numBrutal == maxBrutalSlots)
-						{
-							index = GadgetListBoxAddEntryImage( listbox, maxBrutalImage, index, 0, w, h, TRUE);
-							imageItemData = 4;
-						}
-						else	
-						{
-							index = GadgetListBoxAddEntryImage( listbox, brutalImage, index, 0, w, h, TRUE);
-							imageItemData = 3;
-						}
-					}
-					else if (numMedium)
-					{
-						imageItemData = 2;
-						index = GadgetListBoxAddEntryImage( listbox, mediumImage, index, 0, w, h, TRUE);
-					}
-					else if (numEasy)
-					{
-						imageItemData = 1;
-						index = GadgetListBoxAddEntryImage( listbox, easyImage, index, 0, w, h, TRUE);
-					}
-					else
-					{
-						imageItemData = 0;
-						index = GadgetListBoxAddEntryImage( listbox, NULL, index, 0, w, h, TRUE);
-					}
-				}
-				index = GadgetListBoxAddEntryText( listbox, mapDisplayName, color, index, numColumns-1 );
-
-				if (it->first == mapToSelect)
-				{
-					selectionIndex = index;
-				}
-
-				// now set the char* as the item data.  this works because the map cache isn't being
-				// modified while a map listbox is up.
-				GadgetListBoxSetItemData( listbox, (void *)(it->first.str()), index );
-
-				if (numColumns > 1)
-				{
-					GadgetListBoxSetItemData( listbox, (void *)imageItemData, index, 1 );
-				}
-			}
-			++tempit;
-		}
-
-		tempCache.clear();
-		filenameMap.clear();
-		++curNumPlayersInMap;
-	}
-
-	if (battleHonors)
-	{
-		delete battleHonors;
-		battleHonors = NULL;
-	}
-
-	GadgetListBoxSetSelected(listbox, &selectionIndex, 1);
-	if (selectionIndex >= 0)
-	{
-		Int topIndex = GadgetListBoxGetTopVisibleEntry(listbox);
-		Int bottomIndex = GadgetListBoxGetBottomVisibleEntry(listbox);
-		Int rowsOnScreen = bottomIndex - topIndex;
-
-		if (selectionIndex >= bottomIndex)
-		{
-			Int newTop = max( 0, selectionIndex - max( 1, rowsOnScreen / 2 ) ); 
-		//The trouble is that rowsonscreen/2 can be zero if bottom is 1 and top is zero
-			GadgetListBoxSetTopVisibleEntry( listbox, newTop );
-		}
-	}
-	return selectionIndex;
-
-}  // end loadMapListbox
-
-//-------------------------------------------------------------------------------------------------
-/** Load the listbox with all the map files available to play */
-//-------------------------------------------------------------------------------------------------
-Int populateMapListbox( GameWindow *listbox, Bool useSystemMaps, Bool isMultiplayer, AsciiString mapToSelect )
-{
-	if(!TheMapCache)
-		return -1;
-
-	if (!listbox)
-		return -1;
-	
-	// reset the listbox content
-	GadgetListBoxReset( listbox );
-
-	return populateMapListboxNoReset( listbox, useSystemMaps, isMultiplayer, mapToSelect );
-}
-	
-
-
-//-------------------------------------------------------------------------------------------------
-/** Validate a map */
-//-------------------------------------------------------------------------------------------------
-Bool isValidMap( AsciiString mapName, Bool isMultiplayer )
-{
-	if(!TheMapCache || mapName.isEmpty())
-		return FALSE;
-	TheMapCache->updateCache();
-
-	mapName.toLower();
-	MapCache::iterator it = TheMapCache->find(mapName);
-	if (it != TheMapCache->end())
-	{
-		if (isMultiplayer == it->second.m_isMultiplayer)
-		{
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}  // end isValidMap
-
-//-------------------------------------------------------------------------------------------------
-/** Find a valid map */
-//-------------------------------------------------------------------------------------------------
-AsciiString getDefaultMap( Bool isMultiplayer )
-{
-	if(!TheMapCache)
-		return AsciiString::TheEmptyString;
-	TheMapCache->updateCache();
-
-	MapCache::iterator it = TheMapCache->begin();
-	while (it != TheMapCache->end())
-	{
-		if (isMultiplayer == it->second.m_isMultiplayer)
-		{
-			return it->first;
-		}
-		++it;
-	}
-
-	return AsciiString::TheEmptyString;
-}
-
-
-AsciiString getDefaultOfficialMap()
-{
-	if(!TheMapCache)
-		return AsciiString::TheEmptyString;
-	TheMapCache->updateCache();
-
-	MapCache::iterator it = TheMapCache->begin();
-	while (it != TheMapCache->end())
-	{
-		if (it->second.m_isMultiplayer && it->second.m_isOfficial)
-		{
-			return it->first;
-		}
-		++it;
-	}
-	return AsciiString::TheEmptyString;
-}
-
-
-Bool isOfficialMap( AsciiString mapName )
-{
-	if(!TheMapCache || mapName.isEmpty())
-		return FALSE;
-	TheMapCache->updateCache();
-	mapName.toLower();
-	MapCache::iterator it = TheMapCache->find(mapName);
-	if (it != TheMapCache->end())
-		return it->second.m_isOfficial;
-	return FALSE;
-}
-
-
-const MapMetaData *MapCache::findMap(AsciiString mapName)
-{
-	mapName.toLower();
-	MapCache::iterator it = find(mapName);
-	if (it == end())
-		return NULL;
-	return &(it->second);
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Embed the pristine map into the xfer stream */
-// ------------------------------------------------------------------------------------------------
-static void copyFromBigToDir( const AsciiString& infile, const AsciiString& outfile )
-{
-	// open the map file
-
-	File *file = TheFileSystem->openFile( infile.str(), File::READ | File::BINARY );
-	if( file == NULL )
-	{
-		DEBUG_CRASH(( "copyFromBigToDir - Error opening source file '%s'\n", infile.str() ));
-		throw SC_INVALID_DATA;
-	} // end if
-
-	// how big is the map file
-	Int fileSize = file->seek( 0, File::END );
-
-
-	// rewind to beginning of file
-	file->seek( 0, File::START );
-
-	// allocate buffer big enough to hold the entire map file
-	char *buffer = NEW char[ fileSize ];
-	if( buffer == NULL )
-	{
-		DEBUG_CRASH(( "copyFromBigToDir - Unable to allocate buffer for file '%s'\n", infile.str() ));
-		throw SC_INVALID_DATA;
-	} // end if
-
-	// copy the file to the buffer
-	if( file->read( buffer, fileSize ) < fileSize )
-	{
-		DEBUG_CRASH(( "copyFromBigToDir - Error reading from file '%s'\n", infile.str() ));
-		throw SC_INVALID_DATA;
-	} // end if
-	// close the BIG file
-	file->close();
-	
-	File *filenew = TheFileSystem->openFile( outfile.str(), File::WRITE | File::CREATE | File::BINARY );
-	
-	if( !filenew || filenew->write(buffer, fileSize) < fileSize)
-	{
-		DEBUG_CRASH(( "copyFromBigToDir - Error writing to file '%s'\n", outfile.str() ));
-		throw SC_INVALID_DATA;
-	} // end if
-
-	filenew->close();
-
-	// delete the buffer
-	delete [] buffer;
-} // end embedPristineMap
-
-Image *getMapPreviewImage( AsciiString mapName )
-{
-	if(!TheGlobalData)
-		return NULL;
-	DEBUG_LOG(("%s Map Name \n", mapName.str()));
-	AsciiString tgaName = mapName;
-	AsciiString name;
-	AsciiString tempName;
-	AsciiString filename;
-	tgaName.removeLastChar(); // p
-	tgaName.removeLastChar(); // a
-	tgaName.removeLastChar(); // m
-	tgaName.removeLastChar(); // .
-	name = tgaName;//.reverseFind('\\') + 1;
-	filename = tgaName.reverseFind('\\') + 1;
-	//tgaName = name;
-	filename.concat(".tga");
-	tgaName.concat(".tga");
-
-	AsciiString portableName = TheGameState->realMapPathToPortableMapPath(name);
-	tempName.set(AsciiString::TheEmptyString);
-	for(Int i = 0; i < portableName.getLength(); ++i)
-	{
-		char c = portableName.getCharAt(i);
-		if (c == '\\' || c == ':')
-			tempName.concat('_');
-		else
-			tempName.concat(c);
-	}
-	
-	name = tempName;
-	name.concat(".tga");
-
-	
-	// copy file over	
-	// copy source tgaName, to name
-
-	Image *image = (Image *)TheMappedImageCollection->findImageByName(tempName);
-	if(!image)
-	{
-
-		if(!TheFileSystem->doesFileExist(tgaName.str()))
-			return NULL;	
-		AsciiString mapPreviewDir;
-		mapPreviewDir.format(MAP_PREVIEW_DIR_PATH, TheGlobalData->getPath_UserData().str());
-		TheFileSystem->createDirectory(mapPreviewDir);
-
-		mapPreviewDir.concat(name);
-
-		Bool success = false;
-		try
-		{
-			copyFromBigToDir(tgaName, mapPreviewDir);	
-			success = true;
-		} 
-		catch (...)
-		{
-			success = false;	// no rethrow
-		}
-		
-		if (success)
-		{
-    	image = newInstance(Image);
-			image->setName(tempName);
-			//image->setFullPath("mission.tga");
-			image->setFilename(name);
-			image->setStatus(IMAGE_STATUS_NONE);
-			Region2D uv;
-			uv.hi.x = 1.0f;
-			uv.hi.y = 1.0f;
-			uv.lo.x	= 0.0f;
-			uv.lo.y = 0.0f;
-			image->setUV(&uv);
-			image->setTextureHeight(128);
-			image->setTextureWidth(128);
-			TheMappedImageCollection->addImage(image);
-		}
-		else
-		{
-			image = NULL;
-		}
-	}
-
-	return image;
-
-	
-	
-/*
-	// sanity
-	if( mapName.isEmpty() )
-		return NULL;
-	Region2D uv;
-	mapPreviewImage = TheMappedImageCollection->findImageByName("MapPreview");
-	if(mapPreviewImage)
-		deleteInstance(mapPreviewImage);
-	
-	mapPreviewImage = TheMappedImageCollection->newImage();
-	mapPreviewImage->setName("MapPreview");
-	mapPreviewImage->setStatus(IMAGE_STATUS_RAW_TEXTURE);
-// allocate our terrain texture
-	TextureClass * texture = new TextureClass( size.x, size.y, 
-																			 WW3D_FORMAT_X8R8G8B8, TextureClass::MIP_LEVELS_1 );
-	uv.lo.x = 0.0f;
-	uv.lo.y = 1.0f;
-	uv.hi.x = 1.0f;
-	uv.hi.y = 0.0f;
-	mapPreviewImage->setStatus( IMAGE_STATUS_RAW_TEXTURE );
-	mapPreviewImage->setRawTextureData( texture );
-	mapPreviewImage->setUV( &uv );
-	mapPreviewImage->setTextureWidth( size.x );
-	mapPreviewImage->setTextureHeight( size.y );
-	mapPreviewImage->setImageSize( &size );
-
-
-	CachedFileInputStream theInputStream;
-	if (theInputStream.open(AsciiString(mapName.str()))) 
-	{
-		ChunkInputStream *pStrm = &theInputStream;
-		pStrm->absoluteSeek(0);
-		DataChunkInput file( pStrm );
-		if (file.isValidFileType()) {	// Backwards compatible files aren't valid data chunk files.
-			// Read the waypoints.
-			file.registerParser( AsciiString("MapPreview"), AsciiString::TheEmptyString, parseMapPreviewChunk );
-			if (!file.parse(NULL)) {
-				DEBUG_ASSERTCRASH(false,("Unable to read MapPreview info."));
-				deleteInstance(mapPreviewImage);
-				return NULL;
-			}
-		}
-		theInputStream.close();
-	}
-	else
-	{
-		deleteInstance(mapPreviewImage);
-		return NULL;
-	}
-	
-
-	return mapPreviewImage;
-	
-*/
-	return NULL;
-}
-
-Bool parseMapPreviewChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-/*
-	ICoord2D size;
-	
-	SurfaceClass *surface;
-	size.x = file.readInt();
-	size.y = file.readInt();
-
-
-	surface = (TextureClass *)mapPreviewImage->getRawTextureData()->Get_Surface_Level();
-	//texture->Get_Surface_Level();
-	
-	DEBUG_LOG(("BeginMapPreviewInfo\n"));
-	UnsignedInt *buffer = new UnsignedInt[size.x * size.y];
-	Int x,y;
-	for (y=0; y<size.y; y++) {
-		for(x = 0; x< size.x; x++)
-		{
-			surface->DrawPixel( x, y, file.readInt() );
-			buffer[y + x] = file.readInt();
-			DEBUG_LOG(("x:%d, y:%d, %X\n", x, y, buffer[y + x]));
-		}
-	}
-	mapPreviewImage->setRawTextureData(buffer);
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
-	DEBUG_LOG(("EndMapPreviewInfo\n"));
-	REF_PTR_RELEASE(surface);
-	return true;
-*/
-	return FALSE;
-}
-
-void findDrawPositions( Int startX, Int startY, Int width, Int height, Region3D extent,
-															 ICoord2D *ul, ICoord2D *lr )
-{
-
-	Real ratioWidth;
-	Real ratioHeight;
-	Coord2D radar;
-	ratioWidth = extent.width()/(width * 1.0f);
-	ratioHeight = extent.height()/(height* 1.0f);
-	
-	if( ratioWidth >= ratioHeight)
-	{
-		radar.x = extent.width() / ratioWidth;
-		radar.y = extent.height()/ ratioWidth;
-		ul->x = 0;
-		ul->y = (height - radar.y) / 2.0f;
-		lr->x = radar.x;
-		lr->y = height - ul->y;
-	}
-	else
-	{
-		radar.x = extent.width() / ratioHeight;
-		radar.y = extent.height()/ ratioHeight;
-		ul->x = (width - radar.x ) / 2.0f;
-		ul->y = 0;
-		lr->x = width - ul->x;
-		lr->y = radar.y;
-	}
-
-	// make them pixel positions
-	ul->x += startX;
-	ul->y += startY;
-	lr->x += startX;
-	lr->y += startY;
-
-}  // end findDrawPositions
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
index 69cd51cf2f1..653756fa318 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
@@ -26,15 +26,17 @@
 // Translate raw input events into tactical commands
 // Author: Michael S. Booth, February 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "stdlib.h"				// VC++ wants this here, or gives compile error...
 
 #include "Common/AudioAffect.h"
 #include "Common/ActionManager.h"
+#include "Common/FramePacer.h"
 #include "Common/GameAudio.h"
 #include "Common/GameEngine.h"
 #include "Common/GameType.h"
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/MessageStream.h"
 #include "Common/MiscAudio.h"
@@ -68,7 +70,8 @@
 #include "GameLogic/ExperienceTracker.h"
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Module/BodyModule.h"
-#include "GameLogic/Object.h"						
+#include "GameLogic/Module/ProductionUpdate.h"
+#include "GameLogic/Object.h"
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/TerrainLogic.h"
@@ -86,18 +89,13 @@
 #include "GameNetwork/GameSpyOverlay.h"
 #include "GameNetwork/GameSpy/BuddyThread.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
+#include "ww3d.h"
 
 
 #define dont_ALLOW_ALT_F4
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 /*non-static*/ Real TheSkateDistOverride = 0.0f;
 
 void countObjects(Object *obj, void *userData)
@@ -106,7 +104,7 @@ void countObjects(Object *obj, void *userData)
 	if (!numObjects || !obj)
 		return;
 
-	DEBUG_LOG(("Looking at obj %d (%s) - isEffectivelyDead()==%d, isDestroyed==%d, numObjects==%d\n",
+	DEBUG_LOG(("Looking at obj %d (%s) - isEffectivelyDead()==%d, isDestroyed==%d, numObjects==%d",
 		obj->getID(), obj->getTemplate()->getName().str(), obj->isEffectivelyDead(), obj->isDestroyed(), *numObjects));
 
 	if (!obj->isEffectivelyDead() && !obj->isDestroyed() && !obj->isKindOf(KINDOF_INERT))
@@ -132,7 +130,150 @@ void printObjects(Object *obj, void *userData)
 	TheScriptEngine->AppendDebugMessage(line, FALSE);
 }
 
-#endif
+#endif // defined(RTS_DEBUG)
+
+
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+
+void giveAllSciences(Player* player)
+{
+	// cheese festival: do NOT imitate this code. it is for debug purposes only.
+	std::vector<AsciiString> v = TheScienceStore->friend_getScienceNames();
+	for (size_t i = 0; i < v.size(); ++i)
+	{
+		ScienceType st = TheScienceStore->getScienceFromInternalName(v[i]);
+		if (st != SCIENCE_INVALID && TheScienceStore->isScienceGrantable(st))
+		{
+			player->grantScience(st);
+		}
+	}
+}
+
+void objectUnderConstruction(Object* obj, void *underConstruction)
+{
+	if (obj->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION))
+	{
+		*(Bool*)underConstruction = true;
+		return;
+	}
+
+	ProductionUpdateInterface *pui = ProductionUpdate::getProductionUpdateInterfaceFromObject(obj);
+	if(pui != NULL && pui->getProductionCount() > 0)
+	{
+		*(Bool*)underConstruction = true;
+		return;
+	}
+}
+
+Bool hasThingsInProduction(Player* player)
+{
+	Bool hasThingInProduction = false;
+	player->iterateObjects( objectUnderConstruction, &hasThingInProduction );
+	return hasThingInProduction;
+}
+
+Bool hasThingsInProduction(PlayerType playerType)
+{
+	for (Int n = 0; n < ThePlayerList->getPlayerCount(); ++n)
+	{
+		Player* player = ThePlayerList->getNthPlayer(n);
+		if (player->getPlayerType() == playerType)
+		{
+			if (hasThingsInProduction(player))
+				return true;
+		}
+	}
+	return false;
+}
+
+#endif // defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+
+
+bool changeMaxRenderFps(FpsValueChange change)
+{
+	UnsignedInt maxRenderFps = TheFramePacer->getFramesPerSecondLimit();
+	maxRenderFps = RenderFpsPreset::changeFpsValue(maxRenderFps, change);
+
+	TheFramePacer->setFramesPerSecondLimit(maxRenderFps);
+	TheWritableGlobalData->m_useFpsLimit = (maxRenderFps != RenderFpsPreset::UncappedFpsValue);
+
+	UnicodeString message;
+
+	if (TheWritableGlobalData->m_useFpsLimit)
+	{
+		message = TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:SetMaxRenderFps", L"Max Render FPS is %u", maxRenderFps);
+	}
+	else
+	{
+		message = TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:SetUncappedRenderFps", L"Max Render FPS is uncapped");
+	}
+
+	TheInGameUI->messageNoFormat(message);
+
+	return true;
+}
+
+bool changeLogicTimeScale(FpsValueChange change)
+{
+	if (TheNetwork != NULL)
+		return false;
+
+	const UnsignedInt maxRenderFps = TheFramePacer->getFramesPerSecondLimit();
+	UnsignedInt maxRenderRemainder = LogicTimeScaleFpsPreset::StepFpsValue;
+	maxRenderRemainder -= maxRenderFps % LogicTimeScaleFpsPreset::StepFpsValue;
+	maxRenderRemainder %= LogicTimeScaleFpsPreset::StepFpsValue;
+
+	UnsignedInt logicTimeScaleFps = TheFramePacer->getLogicTimeScaleFps();
+	// Set the value to the max render fps value plus a bit when time scale is
+	// disabled. This ensures that the time scale does not re-enable with a
+	// 'surprise' value.
+	if (!TheFramePacer->isLogicTimeScaleEnabled())
+	{
+		logicTimeScaleFps = maxRenderFps + maxRenderRemainder;
+	}
+	// Ceil the value at the max render fps value plus a bit so that the next fps
+	// value decrease would undercut the max render fps at the correct step value.
+	// Example: render fps 72 -> logic value ceiled to 75 -> decreased to 70.
+	logicTimeScaleFps = min(logicTimeScaleFps, maxRenderFps + maxRenderRemainder);
+	logicTimeScaleFps = LogicTimeScaleFpsPreset::changeFpsValue(logicTimeScaleFps, change);
+
+	// Set value before potentially disabling it.
+	if (TheFramePacer->isLogicTimeScaleEnabled())
+	{
+		TheFramePacer->setLogicTimeScaleFps(logicTimeScaleFps);
+	}
+
+	TheFramePacer->enableLogicTimeScale(logicTimeScaleFps < maxRenderFps);
+
+	// Set value after potentially enabling it.
+	if (TheFramePacer->isLogicTimeScaleEnabled())
+	{
+		TheFramePacer->setLogicTimeScaleFps(logicTimeScaleFps);
+	}
+
+	logicTimeScaleFps = TheFramePacer->getLogicTimeScaleFps();
+	const UnsignedInt actualLogicTimeScaleFps = TheFramePacer->getActualLogicTimeScaleFps();
+	const Real actualLogicTimeScaleRatio = TheFramePacer->getActualLogicTimeScaleRatio();
+
+	UnicodeString message;
+
+	if (TheFramePacer->isLogicTimeScaleEnabled())
+	{
+		message = TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:SetLogicTimeScaleFps", L"Logic Time Scale FPS is %u (actual %u, ratio %.02f)",
+			logicTimeScaleFps, actualLogicTimeScaleFps, actualLogicTimeScaleRatio);
+	}
+	else
+	{
+		message = TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:SetUncappedLogicTimeScaleFps", L"Logic Time Scale FPS is uncapped (actual %u, ratio %.02f)",
+			actualLogicTimeScaleFps, actualLogicTimeScaleRatio);
+	}
+
+	TheInGameUI->messageNoFormat(message);
+
+	return true;
+}
+
+
 static Bool isSystemMessage( const GameMessage *msg );
 
 enum{ DROPPED_MAX_PARTICLE_COUNT = 1000};
@@ -149,17 +290,17 @@ static Bool canSelectionSalvage( const Object *targetObj)
 
 	const DrawableList *drawList = TheInGameUI->getAllSelectedDrawables();
 
-	for (DrawableListCIt cit = drawList->begin(); cit != drawList->end(); ++cit) 
+	for (DrawableListCIt cit = drawList->begin(); cit != drawList->end(); ++cit)
 	{
 		Drawable *draw = *cit;
-		if (!draw) 
+		if (!draw)
 		{
 			continue;
 		}
-		
+
 
 		Object *obj = draw->getObject();
-		if (!obj) 
+		if (!obj)
 		{
 			continue;
 		}
@@ -181,8 +322,8 @@ static CanAttackResult canObjectForceAttack( Object *obj, const Object *victim,
 	{
 		return ATTACKRESULT_NOT_POSSIBLE;
 	}
-	
-	if (victim) 
+
+	if (victim)
 	{
 		result = obj->getAbleToAttackSpecificObject(ATTACK_NEW_TARGET_FORCED, victim, CMD_FROM_PLAYER );
 
@@ -197,7 +338,7 @@ static CanAttackResult canObjectForceAttack( Object *obj, const Object *victim,
 			  {
 				  //We found the spawn interface, now get the closest slave to the target.
 				  Object *slave = spawnInterface->getClosestSlave( victim->getPosition() );
-				  if( slave ) 
+				  if( slave )
 				  {
 					  result = slave->getAbleToAttackSpecificObject( ATTACK_NEW_TARGET_FORCED, victim, CMD_FROM_PLAYER );
 				  }
@@ -218,12 +359,12 @@ static CanAttackResult canObjectForceAttack( Object *obj, const Object *victim,
         }
       }
 
-    } // end if spawnsRweapons
+    }
+
 
-		
     return result;
 	}
-	else 
+	else
 	{
 		//Almost every combat unit can force attack a position. The exceptions include stationary units
 		//that try to force attack in a location beyond their reach (range, LOS, etc).
@@ -271,16 +412,16 @@ static CanAttackResult canObjectForceAttack( Object *obj, const Object *victim,
 static CanAttackResult canAnyForceAttack(const DrawableList *allSelected, const Object *victim, const Coord3D *pos )
 {
 	// check to make sure that allSelected can attack obj.
-	for (DrawableListCIt cit = allSelected->begin(); cit != allSelected->end(); ++cit) 
+	for (DrawableListCIt cit = allSelected->begin(); cit != allSelected->end(); ++cit)
 	{
 		Drawable *draw = *cit;
-		if (!draw) 
+		if (!draw)
 		{
 			continue;
 		}
-		
+
 		Object *obj = draw->getObject();
-		if (!obj) 
+		if (!obj)
 		{
 			continue;
 		}
@@ -294,7 +435,7 @@ static CanAttackResult canAnyForceAttack(const DrawableList *allSelected, const
 //-------------------------------------------------------------------------------------------------
 void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type msgType, PickAndPlayInfo *info )
 {
-	if (!list) 
+	if (!list)
 	{
 		return;
 	}
@@ -309,7 +450,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 	{
 		target = info->m_drawTarget->getObject();
 	}
-	
+
 	//Now, loop through all the drawables (even if you find a match on the first.
 	//The innards are responsible for "upgrading" a sound that is played based on
 	//priorities. For example, the voice move or voice crush. Voice move gets set
@@ -322,15 +463,15 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 		if (obj->isKindOf( KINDOF_IGNORED_IN_GUI ))
 			continue;
 
-		// Use the object instead of the drawable to get the thing template from. This way, we get the 
+		// Use the object instead of the drawable to get the thing template from. This way, we get the
 		// sounds even if the thing is disguised as something else. (Ala bomb truck.)
 		const ThingTemplate *templ = obj->getTemplate();
-		if (!templ) 
+		if (!templ)
 		{
 			return;
 		}
 
-		switch (msgType) 
+		switch (msgType)
 		{
 			case GameMessage::MSG_DOCK:
 				soundToPlayPtr = templ->getPerUnitSound("VoiceSupply");
@@ -404,7 +545,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 				objectWithSound = obj;
 				skip = true;
 				break;
-			
+
 			case GameMessage::MSG_DO_MOVETO:
 			case GameMessage::MSG_DO_ATTACKMOVETO:
 			case GameMessage::MSG_GET_REPAIRED:
@@ -430,7 +571,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 					//Default to voice move (it'll be selected if we can't find a crush case as we iterate
 					//through the rest of the drawables)
 					if( !soundToPlayPtr )
-					{	
+					{
 						soundToPlayPtr = templ->getVoiceMove();
 						objectWithSound = obj;
 					}
@@ -444,7 +585,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 							skip = true;
 						}
 					}
-					if (msgType == GameMessage::MSG_DO_SALVAGE) 
+					if (msgType == GameMessage::MSG_DO_SALVAGE)
 					{
 						const AudioEventRTS *tempSound = templ->getPerUnitSound( "VoiceSalvage" );
 						if (TheAudio->isValidAudioEvent(tempSound))
@@ -459,7 +600,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 					static const UpgradeTemplate *workerShoeTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_GLAWorkerShoes" );
 					if (player && player->hasUpgradeComplete(workerShoeTemplate))
 					{
-						if (obj->isKindOf(KINDOF_INFANTRY) && obj->isKindOf(KINDOF_DOZER) && obj->isKindOf(KINDOF_HARVESTER)) // Only Workers fit all 3 
+						if (obj->isKindOf(KINDOF_INFANTRY) && obj->isKindOf(KINDOF_DOZER) && obj->isKindOf(KINDOF_HARVESTER)) // Only Workers fit all 3
 						{
 							soundToPlayPtr = templ->getPerUnitSound( "VoiceMoveUpgraded" );
 							objectWithSound = obj;
@@ -481,20 +622,6 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 				break;
 			}
 
-			case GameMessage::MSG_DO_FORCE_ATTACK_GROUND:
-			{
-				soundToPlayPtr = templ->getPerUnitSound( "VoiceBombard" );
-				objectWithSound = obj;
-				skip = true;
-
-				if (TheAudio->isValidAudioEvent(soundToPlayPtr)) {
-					break;
-				} else {
-					// clear out the sound to play, and drop into the attack object logic.
-					soundToPlayPtr = NULL;
-				}
-			}
-			
 			case GameMessage::MSG_SWITCH_WEAPONS:
 			{
 				if( info && info->m_weaponSlot )
@@ -516,7 +643,21 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 				}
 				break;
 			}
-			
+
+			case GameMessage::MSG_DO_FORCE_ATTACK_GROUND:
+			{
+				soundToPlayPtr = templ->getPerUnitSound( "VoiceBombard" );
+				objectWithSound = obj;
+				skip = true;
+
+				if (TheAudio->isValidAudioEvent(soundToPlayPtr)) {
+					break;
+				} else {
+					// clear out the sound to play, and drop into the attack object logic.
+					soundToPlayPtr = NULL;
+					FALLTHROUGH;
+				}
+			}
 			case GameMessage::MSG_DO_FORCE_ATTACK_OBJECT:
 			case GameMessage::MSG_DO_ATTACK_OBJECT:
 			case GameMessage::MSG_DO_WEAPON_AT_OBJECT:
@@ -591,7 +732,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 				}
 				break;
 			}
-			
+
 			case GameMessage::MSG_DO_WEAPON_AT_LOCATION:
 			{
 
@@ -682,7 +823,7 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 				break;
 
 			default:
-				DEBUG_LOG(("Requested to add voice of message type %d, but don't know how - jkmcd\n", msgType));
+				DEBUG_LOG(("Requested to add voice of message type %d, but don't know how - jkmcd", msgType));
 				break;
 		}
 		if( skip )
@@ -690,9 +831,9 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 			//The unit sound doesn't have any sort of priority or special case, so simply play the first one that comes along.
 			break;
 		}
-	
-	}//next drawable in list
-	
+
+	}
+
 
 
 
@@ -707,14 +848,14 @@ void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type m
 		soundToPlay.setObjectID( objectWithSound->getID() );
 		TheAudio->addAudioEvent(&soundToPlay);
 
-		// This seems really hacky, and MarkL admits that it is. However, we do this so that we 
+		// This seems really hacky, and MarkL admits that it is. However, we do this so that we
 		// can "randomly" pick a different sound the next time, if we have 3 or more sounds. - jkmcd
 		((AudioEventRTS*)soundToPlayPtr)->setPlayingAudioIndex( soundToPlay.getPlayingAudioIndex() );
 
 		if( objectWithSound->testStatus( OBJECT_STATUS_IS_CARBOMB ) )
 		{
 			//Additional sounds for terrorists in cars.
-			switch (msgType) 
+			switch (msgType)
 			{
 				case GameMessage::MSG_DO_FORCE_ATTACK_GROUND:
 				case GameMessage::MSG_DO_FORCE_ATTACK_OBJECT:
@@ -803,8 +944,8 @@ void findCommandCenterOrMostExpensiveBuilding(Object* obj, void* vccl)
 
 static void viewCommandCenter( void )
 {
-	Player* localPlayer = ThePlayerList->getLocalPlayer();
-	if (!localPlayer) 
+	Player* localPlayer = rts::getObservedOrLocalPlayer();
+	if (!localPlayer->isPlayerActive())
 		return;
 
 	CommandCenterLocator ccl;
@@ -813,7 +954,7 @@ static void viewCommandCenter( void )
 	if (ccl.atLeastOne) {
 		TheTacticalView->lookAt(&ccl.loc);
 	} else {
-		// @todo. Find their starting position and look at that instead?		
+		// @todo. Find their starting position and look at that instead?
 	}
 }
 
@@ -830,12 +971,12 @@ void amIAHero(Object* obj, void* heroHolder)
 {
 
 
-	if (!obj || ((HeroHolder*)heroHolder)->hero != NULL) 
+	if (!obj || ((HeroHolder*)heroHolder)->hero != NULL)
 	{
 		return;
 	}
 
-	if (obj->isKindOf( KINDOF_HERO )) 
+	if (obj->isKindOf( KINDOF_HERO ))
 	{
 		((HeroHolder*)heroHolder)->hero = obj;
 	}
@@ -845,8 +986,8 @@ void amIAHero(Object* obj, void* heroHolder)
 
 static Object *iNeedAHero( void )
 {
-	Player* localPlayer = ThePlayerList->getLocalPlayer();
-	if (!localPlayer) 
+	Player* localPlayer = rts::getObservedOrLocalPlayer();
+	if (!localPlayer->isPlayerActive())
 		return NULL;
 
 	HeroHolder heroHolder;
@@ -883,7 +1024,7 @@ GameMessage::Type CommandTranslator::issueMoveToLocationCommand( const Coord3D *
 		{
 			msgType = GameMessage::MSG_DO_ATTACKMOVETO;
 		}
-		else if( TheInGameUI->isInForceMoveToMode() ) 
+		else if( TheInGameUI->isInForceMoveToMode() )
 		{
 			msgType = GameMessage::MSG_DO_FORCEMOVETO;
 		}
@@ -903,17 +1044,17 @@ GameMessage::Type CommandTranslator::issueMoveToLocationCommand( const Coord3D *
 			else
 				movemsg->appendLocationArgument( *pos );
 
-		}  // end if
-	} 
-	
+		}
+	}
+
 	// only make sounds if we really did the command messages
 	if( commandType == DO_COMMAND )
 	{
 		PickAndPlayInfo info;
 		info.m_drawTarget = drawableInWay;
 		pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_DO_MOVETO, &info );
-	}  // end if
-	
+	}
+
 	if(TheStatsCollector)
 		TheStatsCollector->incrementMoveCount();
 
@@ -924,7 +1065,7 @@ GameMessage::Type CommandTranslator::issueMoveToLocationCommand( const Coord3D *
 
 //------------------------------------------------------------------------------------
 /// @todo Play attack command response sound on client-side to hide latency
-GameMessage::Type CommandTranslator::createAttackMessage( Drawable *draw, 
+GameMessage::Type CommandTranslator::createAttackMessage( Drawable *draw,
 																													Drawable *other,
 																													CommandEvaluateType commandType )
 {
@@ -948,7 +1089,7 @@ GameMessage::Type CommandTranslator::createAttackMessage( Drawable *draw,
 
 		attackmsg->appendObjectIDArgument( other->getObject()->getID() );	// must pass object IDs to logic
 
-	}  // end if
+	}
 
 	// return the message type created
 	return msgType;
@@ -960,7 +1101,7 @@ GameMessage::Type CommandTranslator::createAttackMessage( Drawable *draw,
  * Create DO_ATTACK_GROUND_OBJECT messages for each selected object, instructing it to attack the given enemy.
  * Return TRUE if any attacks actually occurred.
  */
-GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target,	
+GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target,
 																												 CommandEvaluateType commandType,
 																												 GUICommandType command )
 {
@@ -973,11 +1114,11 @@ GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target,
 	Object *targetObj = target->getObject();
 	if( !targetObj )
 		return msgType;
-	
+
 	if( m_teamExists )
 	{
 
-		//DEBUG_LOG(("issuing team-attack cmd against %s\n",enemy->getTemplate()->getName().str()));
+		//DEBUG_LOG(("issuing team-attack cmd against %s",enemy->getTemplate()->getName().str()));
 
 		// insert team attack command message into stream
 		switch( command )
@@ -1001,17 +1142,17 @@ GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target,
 			GameMessage *attackMsg;
 
 			attackMsg = TheMessageStream->appendMessage( msgType );
-		
+
 			attackMsg->appendObjectIDArgument( targetObj->getID() );	// must pass target object ID to logic
 
 			// if we have a stats collector, inrement the stats
 			if(TheStatsCollector)
 				TheStatsCollector->incrementAttackCount();
-		}  // end if
+		}
 	}
 	else
 	{
-		DEBUG_LOG(("issuing NON-team-attack cmd against %s\n",target->getTemplate()->getName().str()));
+		DEBUG_LOG(("issuing NON-team-attack cmd against %s",target->getTemplate()->getName().str()));
 
 		// send single attack command for selected drawable
 		const DrawableList *selected = TheInGameUI->getAllSelectedDrawables();
@@ -1024,7 +1165,7 @@ GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target,
 			msgType = createAttackMessage(draw, target, commandType );
 		}
 	}
-	
+
 	// only make sounds if the command was for real
 	if( commandType == DO_COMMAND )
 	{
@@ -1032,7 +1173,7 @@ GameMessage::Type CommandTranslator::issueAttackCommand( Drawable *target,
 		info.m_air = targetObj->isUsingAirborneLocomotor();
 		info.m_drawTarget = target;
 		pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), msgType, &info );
-	}  // end if
+	}
 
 	// return the actual message type created
 	return msgType;
@@ -1098,7 +1239,7 @@ GameMessage::Type CommandTranslator::issueSpecialPowerCommand( const CommandButt
 			info.m_drawTarget = target;
 			info.m_specialPowerType = command->getSpecialPowerTemplate()->getSpecialPowerType();
 			pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), msgType, &info );
-		
+
 		}
 	}
 	else
@@ -1118,7 +1259,7 @@ GameMessage::Type CommandTranslator::issueSpecialPowerCommand( const CommandButt
 			info.m_drawTarget = target;
 			info.m_specialPowerType = command->getSpecialPowerTemplate()->getSpecialPowerType();
 			pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), msgType, &info );
-		
+
 		}
 	}
 
@@ -1143,7 +1284,7 @@ GameMessage::Type CommandTranslator::issueSpecialPowerCommand( const CommandButt
 		}
 	}
 
-	
+
 
 	return msgType;
 }
@@ -1274,12 +1415,12 @@ GameMessage::Type CommandTranslator::issueFireWeaponCommand( const CommandButton
 			msg->appendIntegerArgument( command->getSpecialPowerTemplate()->getID() );
 		}
 	}
-	
+
 	return msgType;
 }
 
 //-------------------------------------------------------------------------------------------------
-GameMessage::Type CommandTranslator::createEnterMessage( Drawable *enter, 
+GameMessage::Type CommandTranslator::createEnterMessage( Drawable *enter,
 																												 CommandEvaluateType commandType )
 {
 	GameMessage::Type msgType = GameMessage::MSG_ENTER;
@@ -1292,7 +1433,7 @@ GameMessage::Type CommandTranslator::createEnterMessage( Drawable *enter,
 		return msgType;
 
 	// sanity
-	DEBUG_ASSERTCRASH( commandType == DO_COMMAND, ("createEnterMessage - commandType is not DO_COMMAND\n") );
+	DEBUG_ASSERTCRASH( commandType == DO_COMMAND, ("createEnterMessage - commandType is not DO_COMMAND") );
 
 	if( m_teamExists )
 	{
@@ -1304,7 +1445,7 @@ GameMessage::Type CommandTranslator::createEnterMessage( Drawable *enter,
 		enterMsg->appendObjectIDArgument( INVALID_ID );		// 0 means current "selection team" of this player
 		enterMsg->appendObjectIDArgument( enter->getObject()->getID() );
 
-	}  // end if
+	}
 	else
 	{
 		DEBUG_CRASH(("Shouldn't get here. jkmcd"));
@@ -1313,10 +1454,10 @@ GameMessage::Type CommandTranslator::createEnterMessage( Drawable *enter,
 	// return the type of the message used
 	return msgType;
 
-}  // end createEnterMessage
+}
 
 //====================================================================================
-CommandTranslator::CommandTranslator() : 
+CommandTranslator::CommandTranslator() :
 	m_objective(0),
 	m_teamExists(false),
 	m_mouseRightDown(0),
@@ -1338,21 +1479,21 @@ CommandTranslator::~CommandTranslator()
 //-------------------------------------------------------------------------------------------------
 GameMessage::Type CommandTranslator::evaluateForceAttack( Drawable *draw, const Coord3D *pos, CommandEvaluateType type )
 {
-	// evaluateForceAttack is used to determine whether or not we can force attack the 
+	// evaluateForceAttack is used to determine whether or not we can force attack the
 	// given target, and if we can, to issue the appropriate command.
 
 	GameMessage::Type retVal = GameMessage::MSG_INVALID;
-	if( !draw && !pos ) 
+	if( !draw && !pos )
 	{
 		return retVal;
 	}
 
 	const DrawableList *allSelected = TheInGameUI->getAllSelectedDrawables();
 
-	if( draw ) 
+	if( draw )
 	{
 		Object *obj = draw ? draw->getObject() : NULL;
-		if( !obj ) 
+		if( !obj )
 		{
 			return retVal;
 		}
@@ -1363,14 +1504,14 @@ GameMessage::Type CommandTranslator::evaluateForceAttack( Drawable *draw, const
 		{
 			retVal = GameMessage::MSG_DO_FORCE_ATTACK_OBJECT;
 
-			if( type == DO_COMMAND ) 
+			if( type == DO_COMMAND )
 			{
 				pickAndPlayUnitVoiceResponse( allSelected, retVal );
 				GameMessage *newMsg = TheMessageStream->appendMessage( retVal );
 				newMsg->appendObjectIDArgument( obj->getID() );
-				
-			} 
-			else if( type == DO_HINT ) 
+
+			}
+			else if( type == DO_HINT )
 			{
 				retVal = GameMessage::MSG_DO_FORCE_ATTACK_OBJECT_HINT;
 				// Don't need the message back, cause there is nothing to append to it.
@@ -1382,8 +1523,8 @@ GameMessage::Type CommandTranslator::evaluateForceAttack( Drawable *draw, const
 			retVal = GameMessage::MSG_IMPOSSIBLE_ATTACK_HINT;
 			TheMessageStream->appendMessage( retVal );
 		}
-	} 
-	else if( pos ) 
+	}
+	else if( pos )
 	{
 		CanAttackResult result = canAnyForceAttack( allSelected, NULL, pos );
 
@@ -1391,13 +1532,13 @@ GameMessage::Type CommandTranslator::evaluateForceAttack( Drawable *draw, const
 		{
 			retVal = GameMessage::MSG_DO_FORCE_ATTACK_GROUND;
 
-			if( type == DO_COMMAND ) 
+			if( type == DO_COMMAND )
 			{
 				pickAndPlayUnitVoiceResponse( allSelected, retVal );
 				GameMessage *newMsg = TheMessageStream->appendMessage( retVal );
 				newMsg->appendLocationArgument( *pos );
-			} 
-			else if( type == DO_HINT ) 
+			}
+			else if( type == DO_HINT )
 			{
 				retVal = GameMessage::MSG_DO_FORCE_ATTACK_GROUND_HINT;
 				// Don't need the message back, cause there is nothing to append to it.
@@ -1422,8 +1563,8 @@ GameMessage::Type CommandTranslator::evaluateForceAttack( Drawable *draw, const
 	* command would be if clicked
 	* NOTE: draw can be NULL, in which case we give a hint for the location */
 // ------------------------------------------------------------------------------------------------
-GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw, 
-																														 const Coord3D *pos, 
+GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
+																														 const Coord3D *pos,
 																														 CommandEvaluateType type )
 {
 	Object *obj = draw ? draw->getObject() : NULL;
@@ -1434,15 +1575,15 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 	//drawable is invalid... then convert it to a position to be evaluated instead.
 	//Added: shrubberies are the exception for interactions...
 	//Removed: GS Took out ObjectStatusUnselectable, since that status only prevents selection, not everything
-	if( obj == NULL || 
-			obj->getStatusBits().test( OBJECT_STATUS_MASKED ) && 
-			!obj->isKindOf(KINDOF_SHRUBBERY) && !obj->isKindOf(KINDOF_FORCEATTACKABLE) ) 
+	if( obj == NULL ||
+			obj->getStatusBits().test( OBJECT_STATUS_MASKED ) &&
+			!obj->isKindOf(KINDOF_SHRUBBERY) && !obj->isKindOf(KINDOF_FORCEATTACKABLE) )
 	{
-		//Nulling out the draw and obj pointer will force the remainder of this code to evaluate 
+		//Nulling out the draw and obj pointer will force the remainder of this code to evaluate
 		//a position interaction.
 		draw = NULL;
 		obj = NULL;
-	}  //  end if
+	}
 
 	// If the thing is a mine, and is locally controlled, then we should issue a moveto to its location.
 	if (obj && obj->isLocallyControlled() && obj->isKindOf(KINDOF_MINE)) {
@@ -1450,9 +1591,9 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 		obj = NULL;
 	}
 
-	if( TheInGameUI->isInForceMoveToMode() ) 
+	if( TheInGameUI->isInForceMoveToMode() )
 	{
-		//Nulling out the draw and obj pointer will force the remainder of this code to evaluate 
+		//Nulling out the draw and obj pointer will force the remainder of this code to evaluate
 		//a position interaction.
 		draw = NULL;
 		obj = NULL;
@@ -1461,7 +1602,7 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 		// if there is a location to which we should attack.
 		drawableInWay = draw;
 	}
-	
+
 	GameMessage::Type msgType = GameMessage::MSG_INVALID;
 
 	// Then we should determine if the game currently prefers selection events. If it does, then return
@@ -1474,7 +1615,13 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 
 	// Kris: Now that we can select non-controllable units/structures, don't allow any actions to be performed.
 	const CommandButton *command = TheInGameUI->getGUICommand();
-	if( TheInGameUI->areSelectedObjectsControllable() 
+
+	if (command && command->getCommandType() == GUICOMMANDMODE_PLACE_BEACON)
+	{
+		msgType = GameMessage::MSG_VALID_GUICOMMAND_HINT;
+		TheMessageStream->appendMessage(msgType);
+	}
+	else if( TheInGameUI->areSelectedObjectsControllable()
 			|| (command && command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT))
 	{
 		GameMessage *hintMessage;
@@ -1500,15 +1647,15 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 
 		CanAttackResult result;
 
-		if(command && 
-			(command->isContextCommand() 
+		if(command &&
+			(command->isContextCommand()
 				|| command->getCommandType() == GUI_COMMAND_SPECIAL_POWER
 				|| command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT))
 		{
 			if( obj && obj->isKindOf( KINDOF_SHRUBBERY ) && !BitIsSet( command->getOptions(), ALLOW_SHRUBBERY_TARGET ) )
 			{
 				//If our object is a shrubbery, and we don't allow targetting it... then null it out.
-				//Nulling out the draw and obj pointer will force the remainder of this code to evaluate 
+				//Nulling out the draw and obj pointer will force the remainder of this code to evaluate
 				//a position interaction.
 				draw = NULL;
 				obj = NULL;
@@ -1517,12 +1664,12 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 			if( obj && obj->isKindOf( KINDOF_MINE ) && !BitIsSet( command->getOptions(), ALLOW_MINE_TARGET ) )
 			{
 				//If our object is a mine, and we don't allow targetting it... then null it out.
-				//Nulling out the draw and obj pointer will force the remainder of this code to evaluate 
+				//Nulling out the draw and obj pointer will force the remainder of this code to evaluate
 				//a position interaction.
 				draw = NULL;
 				obj = NULL;
 			}
-			
+
 			//Kris: September 27, 2002
 			//Added relationship tests to make sure we're not attempting a context-command on a restricted relationship.
 			//This case prevents rebels from using tranq darts on allies.
@@ -1536,21 +1683,21 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 						{
 							draw = NULL;
 							obj = NULL;
-						}	
+						}
 						break;
 					case ENEMIES:
 						if( !BitIsSet( command->getOptions(), NEED_TARGET_ENEMY_OBJECT ) )
 						{
 							draw = NULL;
 							obj = NULL;
-						}	
+						}
 						break;
 					case NEUTRAL:
 						if( !BitIsSet( command->getOptions(), NEED_TARGET_NEUTRAL_OBJECT ) )
 						{
 							draw = NULL;
 							obj = NULL;
-						}	
+						}
 						break;
 				}
 			}
@@ -1560,7 +1707,7 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 			switch( command->getCommandType() )
 			{
 				//Kris: June 06, 2002
-				//This is a GUI command button that triggers a mode. In any of these modes, only one specific action 
+				//This is a GUI command button that triggers a mode. In any of these modes, only one specific action
 				//can occur. If the mouse isn't over a valid target, then the conditions aren't met and the code will
 				//cause an invalid version of the cursor to be shown -- and should the user click, the action won't take place.
 				case GUICOMMANDMODE_CONVERT_TO_CARBOMB:
@@ -1652,7 +1799,7 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage->appendObjectIDArgument( objectID );
 			}
 
-		}	// if a special power
+		}
 		else if( command && (command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_CONSTRUCT
 						 || command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_CONSTRUCT_FROM_SHORTCUT) )
 		{
@@ -1678,7 +1825,7 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 			}
 		}
 
-		
+
 		// ********************************************************************************************
 		else if( TheInGameUI->canSelectedObjectsOverrideSpecialPowerDestination( pos, InGameUI::SELECTION_ANY, SPECIAL_INVALID ) )
 		{
@@ -1695,9 +1842,9 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 					gameMsg->appendIntegerArgument( SPECIAL_INVALID );
 					gameMsg->appendObjectIDArgument( INVALID_ID );	// no specific source
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1705,14 +1852,14 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				msgType = GameMessage::MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 
-			}  // end else
+			}
 		}
-		
+
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
 						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_RESUME_CONSTRUCTION, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
@@ -1726,9 +1873,9 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 
 					pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_RESUME_CONSTRUCTION );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1737,13 +1884,13 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
-						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_DOCK_AT, 
-																											obj, 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
+						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_DOCK_AT,
+																											obj,
 																											InGameUI::SELECTION_ALL ) )
 		{
 
@@ -1764,7 +1911,7 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 
  					// only make sounds if we really did the command messages
  					pickAndPlayUnitVoiceResponse(TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_DOCK);
-				}  // end if
+				}
 
 			}
 			else
@@ -1779,10 +1926,10 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 
 		}
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
 						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_REPAIR_OBJECT, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
@@ -1793,12 +1940,12 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 					GameMessage *healMsg = TheMessageStream->appendMessage( msgType );
 
 					healMsg->appendObjectIDArgument( obj->getID() );
-			
+
 					pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_DO_REPAIR );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1807,11 +1954,11 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
 						TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_GET_REPAIRED_AT, obj, InGameUI::SELECTION_ANY ) )
 		{
 
@@ -1826,13 +1973,13 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 
 					healMsg->appendObjectIDArgument( obj->getID() );
 
-					
+
 					pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_GET_REPAIRED );
 
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1841,14 +1988,14 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
 						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_GET_HEALED_AT, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
@@ -1859,12 +2006,12 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 					GameMessage *healMsg = TheMessageStream->appendMessage( msgType );
 
 					healMsg->appendObjectIDArgument( obj->getID() );
-				
+
 					pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_GET_HEALED );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -1873,16 +2020,16 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType);
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
-		else if( draw && draw->getObject() && !TheInGameUI->isInForceAttackMode() && 
-						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_HIJACK_VEHICLE, 
-																											draw->getObject(), 
+		else if( draw && draw->getObject() && !TheInGameUI->isInForceAttackMode() &&
+						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_HIJACK_VEHICLE,
+																											draw->getObject(),
 																											InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
@@ -1890,109 +2037,109 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
         // I must add a test to keep him from actually entering an enemy vehicle (contained)... Lorenzen
         msgType = createEnterMessage( draw, type );
 
-			}  // end if
+			}
 			else
 			{
-				
+
 				msgType = GameMessage::MSG_HIJACK_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( draw->getObject()->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
 						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_CONVERT_OBJECT_TO_CARBOMB, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
 				// issue the command (convert to carbomb is nearly identical to enter)
 				msgType = createEnterMessage( draw, type );
 
-			}  // end if
+			}
 			else
 			{
-				
+
 				msgType = GameMessage::MSG_CONVERT_TO_CARBOMB_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 		}
 		// ********************************************************************************************
-		else if( draw && draw->getObject() && !TheInGameUI->isInForceAttackMode() && 
-						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_SABOTAGE_BUILDING, 
-																											draw->getObject(), 
+		else if( draw && draw->getObject() && !TheInGameUI->isInForceAttackMode() &&
+						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_SABOTAGE_BUILDING,
+																											draw->getObject(),
 																											InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
         msgType = createEnterMessage( draw, type );
-			}  // end if
+			}
 			else
 			{
 				msgType = GameMessage::MSG_SABOTAGE_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( draw->getObject()->getID() );
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
 		else if( draw && !TheInGameUI->isInForceAttackMode() && canSelectionSalvage(obj) )
 		{
 			GameMessage *msg;
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY ) {
 				msgType = GameMessage::MSG_DO_SALVAGE;
 				if (type == DO_COMMAND) {
 					msg = TheMessageStream->appendMessage(msgType);
 					msg->appendLocationArgument(*obj->getPosition());
 					pickAndPlayUnitVoiceResponse(TheInGameUI->getAllSelectedDrawables(), msgType);
-				} 
+				}
 
 			} else {
 				msgType = GameMessage::MSG_DO_SALVAGE_HINT;
 				msg = TheMessageStream->appendMessage(msgType);
 				msg->appendLocationArgument(*obj->getPosition());
-			} 
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
-		else if( draw && !TheInGameUI->isInForceAttackMode() && 
+		else if( draw && !TheInGameUI->isInForceAttackMode() &&
 						 TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_ENTER_OBJECT, obj, InGameUI::SELECTION_ANY, true ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
 				// issue the command
 				msgType = createEnterMessage( draw, type );
 
-			}  // end if
+			}
 			else
 			{
 
 				msgType = GameMessage::MSG_ENTER_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
 		else if( draw && (result = TheInGameUI->getCanSelectedObjectsAttack( InGameUI::ACTIONTYPE_ATTACK_OBJECT, obj, InGameUI::SELECTION_ANY, TheInGameUI->isInForceAttackMode() )) == ATTACKRESULT_POSSIBLE )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
-				
-				// issue the attack order			
+
+				// issue the attack order
 				msgType = issueAttackCommand( draw, type );
 
-			}  // end if
+			}
 			else
 			{
 
@@ -2001,19 +2148,19 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
 		else if( draw && result == ATTACKRESULT_POSSIBLE_AFTER_MOVING )
 		{
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
-				
-				// issue the attack order			
+
+				// issue the attack order
 				msgType = issueAttackCommand( draw, type );
 
-			}  // end if
+			}
 			else
 			{
 
@@ -2022,13 +2169,13 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
 		}
 		// ********************************************************************************************
 		else if( draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_CAPTURE_BUILDING, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			//@TODO: Kris
 			//PRELIMINARY CODE FOR HOOKING IN AUTO SPECIALS --- WILL BE REDONE!
 			Object *source = TheInGameUI->getFirstSelectedDrawable()->getObject();
@@ -2055,7 +2202,7 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 						else if( spType == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING )
 						{
 							//Issue the black lotus hack hint for capturing a building.
-							msgType = GameMessage::MSG_HACK_HINT; 
+							msgType = GameMessage::MSG_HACK_HINT;
 							hintMessage = TheMessageStream->appendMessage( msgType );
 							hintMessage->appendObjectIDArgument( obj->getID() );
 						}
@@ -2069,11 +2216,11 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 					}
 				}
 			}
-		}  // end else if
+		}
 		// ********************************************************************************************
 		else if( draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_DISABLE_VEHICLE_VIA_HACKING, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 				//@TODO: Kris
@@ -2097,19 +2244,19 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 						}
 					}
 				}
-			}  
+			}
 			else
 			{
 				msgType = GameMessage::MSG_HACK_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
-			}  
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
 		else if( draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_STEAL_CASH_VIA_HACKING, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 				//@TODO: Kris
@@ -2133,19 +2280,19 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 						}
 					}
 				}
-			}  // end if
+			}
 			else
 			{
 				msgType = GameMessage::MSG_HACK_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
-			}  
+			}
 
-		}  // end else if
+		}
 		// ********************************************************************************************
 		else if( draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_DISABLE_BUILDING_VIA_HACKING, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 				//@TODO: Kris
@@ -2169,45 +2316,45 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 						}
 					}
 				}
-			}  // end if
+			}
 			else
 			{
 				msgType = GameMessage::MSG_HACK_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
-			}  
-		}  // end else if
+			}
+		}
 #ifdef ALLOW_SURRENDER
 		// ********************************************************************************************
 		else if( draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_PICK_UP_PRISONER, obj, InGameUI::SELECTION_ANY ) )
 		{
-			
+
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 
-				// issue the command 
+				// issue the command
 				msgType = issueAttackCommand( draw, type, GUICOMMANDMODE_PICK_UP_PRISONER );
-				
-			}  // end if
+
+			}
 			else
 			{
-				
+
 				msgType = GameMessage::MSG_PICK_UP_PRISONER_HINT;
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendObjectIDArgument( obj->getID() );
 
-			}  // end else
+			}
 
-		}  // end else if
+		}
 #endif
 		// ********************************************************************************************
-		else if ( pos && !draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_SET_RALLY_POINT, NULL, InGameUI::SELECTION_ALL, FALSE ))
+		else if ( !draw && TheInGameUI->canSelectedObjectsDoAction( InGameUI::ACTIONTYPE_SET_RALLY_POINT, NULL, InGameUI::SELECTION_ALL, FALSE ))
 		{
 			msgType = GameMessage::MSG_SET_RALLY_POINT;
 
 			if (type == DO_COMMAND) {
 				const DrawableList *allSelectedDrawables = TheInGameUI->getAllSelectedDrawables();
-				
+
 				for (DrawableList::const_iterator it = allSelectedDrawables->begin(); it != allSelectedDrawables->end(); ++it) {
 					Drawable *draw = (*it);
 					if (draw && draw->getObject()) {
@@ -2229,7 +2376,7 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 			msgType = GameMessage::MSG_IMPOSSIBLE_ATTACK_HINT;
 			hintMessage = TheMessageStream->appendMessage( msgType );
 			hintMessage->appendLocationArgument( *pos );
-		}  // end else if
+		}
 
 		// ********************************************************************************************
 		else
@@ -2255,14 +2402,14 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 			{
 				//Can we path there?
 				const DrawableList *allSelectedDrawables = TheInGameUI->getAllSelectedDrawables();
-				for( DrawableList::const_iterator it = allSelectedDrawables->begin(); it != allSelectedDrawables->end(); ++it ) 
+				for( DrawableList::const_iterator it = allSelectedDrawables->begin(); it != allSelectedDrawables->end(); ++it )
 				{
 					Object *obj = (*it) ? (*it)->getObject() : NULL;
 					AIUpdateInterface *ai = obj ? obj->getAI() : NULL;
 					if( ai )
           {
-            if ( ai->isQuickPathAvailable( pos ) ) 
-					  { 
+            if ( ai->isQuickPathAvailable( pos ) )
+					  {
 						  validQuickPath = TRUE;
 						  break;
 					  }
@@ -2287,13 +2434,13 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 			if( type == DO_COMMAND || type == EVALUATE_ONLY )
 			{
 				// issue command
-				// Note: If draw is valid, then its one of ours and we don't have something more specific 
-				// to do. Therefore, lets not issue a move command, and instead we'll return that there 
+				// Note: If draw is valid, then its one of ours and we don't have something more specific
+				// to do. Therefore, lets not issue a move command, and instead we'll return that there
 				// wasn't a command for us to perform.
-				
+
 				if ( draw == NULL )
 					msgType = issueMoveToLocationCommand( pos, drawableInWay, type );
-			}  // end if
+			}
 			else
 			{
 				if( !validQuickPath )
@@ -2319,16 +2466,16 @@ GameMessage::Type CommandTranslator::evaluateContextCommand( Drawable *draw,
 				hintMessage = TheMessageStream->appendMessage( msgType );
 				hintMessage->appendLocationArgument( *pos );
 
-			}  // end else
+			}
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
 	// return the message type
 	return msgType;
 
-}  // end evaluateContextCommand
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -2344,12 +2491,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 	GameMessageDisposition disp = KEEP_MESSAGE;
 	// We want to always be able to get to the options menu even during no input times and a clear game data message should always go through
 	if (t != GameMessage::MSG_META_OPTIONS && t != GameMessage::MSG_CLEAR_GAME_DATA &&
-			!TheInGameUI->getInputEnabled() && !isSystemMessage(msg)) 
+			!TheInGameUI->getInputEnabled() && !isSystemMessage(msg))
 	{
 		return DESTROY_MESSAGE;
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	ExtentModType extentModType = EXTENTMOD_INVALID;
 	Real extentModAmount = 0.0f;
 #endif
@@ -2370,7 +2517,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_SELECT_NEXT_UNIT:
 		{
 			/* because list is prepended, iterate through backwards */
-			
+
 			// if there is nothing on the screen, bail
 			if( TheGameClient->firstDrawable() == NULL )
 				break;
@@ -2508,7 +2655,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 						teamMsg->appendBooleanArgument( TRUE );
 
 						teamMsg->appendObjectIDArgument( object->getID() );
-						
+
 						TheInGameUI->selectDrawable( temp );
 
 						// center on the unit
@@ -2547,7 +2694,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 							hack = TRUE;
 							const Object *tempObject = temp->getObject();
 							// must take case of this case here or else the loop will break without getting newDrawable
-							if( tempObject && temp->getNextDrawable() == selectedDrawable && !temp->isSelected() 
+							if( tempObject && temp->getNextDrawable() == selectedDrawable && !temp->isSelected()
 								&& tempObject->isMobile() && tempObject->isLocallyControlled() && !tempObject->isContained() && !tempObject->isKindOf( KINDOF_NO_SELECT ) )
 							{
 								newDrawable = temp;
@@ -2571,7 +2718,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 						//deselect other units
 						TheInGameUI->deselectAllDrawables();
 						// select the unit
-						
+
 						// create a new group.
 						GameMessage *teamMsg = TheMessageStream->appendMessage( GameMessage::MSG_CREATE_SELECTED_GROUP );
 
@@ -2591,7 +2738,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			disp = DESTROY_MESSAGE;
 			break;
 
-		}	// end select previous unit
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_SELECT_NEXT_WORKER:
@@ -2701,7 +2848,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 			disp = DESTROY_MESSAGE;
 			break;
-		}		// end select next worker
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_SELECT_PREV_WORKER:
@@ -2735,7 +2882,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 						teamMsg->appendBooleanArgument( TRUE );
 
 						teamMsg->appendObjectIDArgument( object->getID() );
-						
+
 						TheInGameUI->selectDrawable( temp );
 
 						// center on the unit
@@ -2774,7 +2921,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 							hack = TRUE;
 							const Object *tempObject = temp->getObject();
 							// must take case of this case here or else the loop will break without getting newDrawable
-							if( tempObject && temp->getNextDrawable() == selectedDrawable && !temp->isSelected() 
+							if( tempObject && temp->getNextDrawable() == selectedDrawable && !temp->isSelected()
 								&& tempObject->isMobile() && tempObject->isLocallyControlled() && !tempObject->isContained() )
 							{
 								newDrawable = temp;
@@ -2799,7 +2946,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 						//deselect other units
 						TheInGameUI->deselectAllDrawables();
 						// select the unit
-						
+
 						// create a new group.
 						GameMessage *teamMsg = TheMessageStream->appendMessage( GameMessage::MSG_CREATE_SELECTED_GROUP );
 
@@ -2819,7 +2966,16 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			disp = DESTROY_MESSAGE;
 			break;
 
-		}	// end select previous worker
+		}
+
+		//-----------------------------------------------------------------------------------------
+		case GameMessage::MSG_META_SELECT_NEXT_IDLE_WORKER:
+		{
+			TheInGameUI->selectNextIdleWorker();
+
+			disp = DESTROY_MESSAGE;
+			break;
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_SELECT_HERO:
@@ -2845,7 +3001,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 			// create a new group.
 			GameMessage *teamMsg = TheMessageStream->appendMessage( GameMessage::MSG_CREATE_SELECTED_GROUP );
-			
+
 			//New group so pass in value true
 			teamMsg->appendBooleanArgument( TRUE );
 			teamMsg->appendObjectIDArgument( hero->getID() );
@@ -2866,23 +3022,16 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_VIEW_LAST_RADAR_EVENT:
 		{
-//			Player *player = ThePlayerList->getLocalPlayer();
+			// You don't need radar for the space bar. That's silly.
+			Coord3D lastEvent;
 
-			// if the local player has a radar, center on last event (if any)
-			// Excuse me?  You don't need radar for the spacebar.  That's silly.
-//			if( TheRadar->isRadarForced() || ( TheRadar->isRadarHidden() == false && player->hasRadar() ) )
-			{
-				Coord3D lastEvent;
-
-				if( TheRadar->getLastEventLoc( &lastEvent ) )
-					TheTacticalView->lookAt( &lastEvent );
-
-			}  // end if
+			if( TheRadar->getLastEventLoc( &lastEvent ) )
+				TheTacticalView->lookAt( &lastEvent );
 
 			disp = DESTROY_MESSAGE;
 			break;
 
-		}  // end view last radar event
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_SELECT_ALL:
@@ -2894,7 +3043,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			disqualifyingKindofs.set(KINDOF_HARVESTER);
 			disqualifyingKindofs.set(KINDOF_IGNORES_SELECT_ALL);
 			Bool selectAircraft = FALSE;
-			
+
 			if( t == GameMessage::MSG_META_SELECT_ALL_AIRCRAFT )
 			{
 				requiredKindofs.set(KINDOF_AIRCRAFT);
@@ -2949,10 +3098,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				disqualifyingKindofs.set(KINDOF_DOZER);
 				disqualifyingKindofs.set(KINDOF_HARVESTER);
 				disqualifyingKindofs.set(KINDOF_IGNORES_SELECT_ALL);
-				if( object  
-					&& object->isMobile() 
-					&& object->isLocallyControlled() 
-					&& !object->isContained() 
+				if( object
+					&& object->isMobile()
+					&& object->isLocallyControlled()
+					&& !object->isContained()
 					&& !object->isAnyKindOf( disqualifyingKindofs )
 					&& !object->isEffectivelyDead()
 					&& object->isMassSelectable()
@@ -2964,9 +3113,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 						if ( !TheInGameUI->getDisplayedMaxWarning() )
 						{
 							TheInGameUI->setDisplayedMaxWarning( TRUE );
-							UnicodeString msg;
-							msg.format(TheGameText->fetch("GUI:MaxSelectionSize").str(), TheInGameUI->getMaxSelectCount());
-							TheInGameUI->message(msg);
+							TheInGameUI->message("GUI:MaxSelectionSize", TheInGameUI->getMaxSelectCount());
 						}
 					}
 					else
@@ -2981,15 +3128,14 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			if( TheInGameUI->getSelectCount() )
 			{
-				UnicodeString message = TheGameText->fetch( "GUI:SelectedAcrossMap" );
-				TheInGameUI->message( message );
+				TheInGameUI->message("GUI:SelectedAcrossMap");
 			}
 
 			disp = DESTROY_MESSAGE;
 			break;
 */
 
-		}  // end select all
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_SCATTER:
@@ -3063,7 +3209,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			if (TheGameLogic->isInMultiplayerGame() && !TheGameLogic->isInReplayGame())
 			{
 				Player *localPlayer = ThePlayerList->getLocalPlayer();
-				if (localPlayer && localPlayer->isPlayerActive() || !TheGlobalData->m_netMinPlayers)
+				// TheSuperHackers @tweak skyaero 19/07/2025 Observers can now chat
+				if (localPlayer || !TheGlobalData->m_netMinPlayers)
 				{
 					ToggleInGameChat();
 					SetInGameChatType( INGAME_CHAT_EVERYONE );
@@ -3092,7 +3239,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				Int count;
 				const ThingTemplate *thing = TheThingFactory->findTemplate( ThePlayerList->getLocalPlayer()->getPlayerTemplate()->getBeaconTemplate() );
 				ThePlayerList->getLocalPlayer()->countObjectsByThingTemplate( 1, &thing, false, &count );
-				DEBUG_LOG(("MSG_META_PLACE_BEACON - Player already has %d beacons active\n", count));
+				DEBUG_LOG(("MSG_META_PLACE_BEACON - Player already has %d beacons active", count));
 				if (count < TheMultiplayerSettings->getMaxBeaconsPerPlayer())
 				{
 					const CommandButton *commandButton = TheControlBar->findCommandButton( "Command_PlaceBeacon" );
@@ -3113,11 +3260,51 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_OPTIONS:
-			
+
 			ToggleQuitMenu();
 			disp = DESTROY_MESSAGE;
 			break;
 
+		//-----------------------------------------------------------------------------------------
+		case GameMessage::MSG_META_INCREASE_MAX_RENDER_FPS:
+		{
+			if (changeMaxRenderFps(FpsValueChange_Increase))
+			{
+				disp = DESTROY_MESSAGE;
+			}
+			break;
+		}
+
+		//-----------------------------------------------------------------------------------------
+		case GameMessage::MSG_META_DECREASE_MAX_RENDER_FPS:
+		{
+			if (changeMaxRenderFps(FpsValueChange_Decrease))
+			{
+				disp = DESTROY_MESSAGE;
+			}
+			break;
+		}
+
+		//-----------------------------------------------------------------------------------------
+		case GameMessage::MSG_META_INCREASE_LOGIC_TIME_SCALE:
+		{
+			if (changeLogicTimeScale(FpsValueChange_Increase))
+			{
+				disp = DESTROY_MESSAGE;
+			}
+			break;
+		}
+
+		//-----------------------------------------------------------------------------------------
+		case GameMessage::MSG_META_DECREASE_LOGIC_TIME_SCALE:
+		{
+			if (changeLogicTimeScale(FpsValueChange_Decrease))
+			{
+				disp = DESTROY_MESSAGE;
+			}
+			break;
+		}
+
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_TOGGLE_LOWER_DETAILS:
 		{
@@ -3149,20 +3336,20 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 					oldCloudMap = TheGlobalData->m_useCloudMap;
 					TheWritableGlobalData->m_useCloudMap = FALSE;
-					
+
 					oldBehindBuildingMarkers = TheGameLogic->getShowBehindBuildingMarkers();
 					TheGameLogic->setShowBehindBuildingMarkers(FALSE);
 
 					oldMaxParticleCount = TheGlobalData->m_maxParticleCount;
 					TheWritableGlobalData->m_maxParticleCount = DROPPED_MAX_PARTICLE_COUNT;
-					
+
 					if(TheInGameUI)
 						TheInGameUI->message("GUI:DetailsSetToLowest");
 				}
-			}  
+			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_TOGGLE_CONTROL_BAR:
@@ -3178,24 +3365,43 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			else
 			{
-				if (!(TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK))
+				Bool hide = false;
+				if (TheWindowManager)
 				{
-					Bool hide = false;
-					if (TheWindowManager)
-					{
-						Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
-						GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
-
-						if (window)
-							hide = !window->winIsHidden();
-					}
+					Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent");
+					GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
 
-					ToggleControlBar();
+					if (window)
+						hide = !window->winIsHidden();
 				}
+
+				ToggleControlBar();
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
+
+		//-----------------------------------------------------------------------------------------
+		case GameMessage::MSG_META_TOGGLE_PLAYER_OBSERVER:
+		{
+			if (Player *lookAtPlayer = TheControlBar->getObserverLookAtPlayer())
+			{
+				if (Player *observedPlayer = TheControlBar->getObservedPlayer())
+				{
+					// Set no observed player.
+					rts::changeObservedPlayer(NULL);
+					// But keep the look-at player.
+					TheControlBar->setObserverLookAtPlayer(lookAtPlayer);
+				}
+				else
+				{
+					// Set observed player to look-at player.
+					rts::changeObservedPlayer(lookAtPlayer);
+				}
+				disp = DESTROY_MESSAGE;
+			}
+			break;
+		}
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_TOGGLE_ATTACKMOVE:
@@ -3210,6 +3416,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			DEBUG_ASSERTCRASH(TheInGameUI->isCameraRotatingLeft(), ("Clearing rotate camera left, but it's already clear!"));
 			TheInGameUI->setCameraRotateLeft( false );
 			break;
+		case GameMessage::MSG_META_ALT_CAMERA_ROTATE_LEFT:
+			if (TheTacticalView->isCameraMovementFinished())
+				TheTacticalView->rotateCamera(-1.0f / 8.0f, 500, 100, 400);
+			break;
 		case GameMessage::MSG_META_BEGIN_CAMERA_ROTATE_RIGHT:
 			DEBUG_ASSERTCRASH(!TheInGameUI->isCameraRotatingRight(), ("Setting rotate camera right, but it's already set!"));
 			TheInGameUI->setCameraRotateRight( true );
@@ -3218,6 +3428,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			DEBUG_ASSERTCRASH(TheInGameUI->isCameraRotatingRight(), ("Clearing rotate camera right, but it's already clear!"));
 			TheInGameUI->setCameraRotateRight( false );
 			break;
+		case GameMessage::MSG_META_ALT_CAMERA_ROTATE_RIGHT:
+			if (TheTacticalView->isCameraMovementFinished())
+				TheTacticalView->rotateCamera(1.0f / 8.0f, 500, 100, 400);
+			break;
 		case GameMessage::MSG_META_BEGIN_CAMERA_ZOOM_IN:
 			DEBUG_ASSERTCRASH(!TheInGameUI->isCameraZoomingIn(), ("Setting zoom camera in, but it's already set!"));
 			TheInGameUI->setCameraZoomIn( true );
@@ -3250,20 +3464,21 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 #endif
 				{
 					TheWritableGlobalData->m_TiVOFastMode = 1 - TheGlobalData->m_TiVOFastMode;
-					TheInGameUI->message( UnicodeString( L"m_TiVOFastMode: %s" ),
-																TheGlobalData->m_TiVOFastMode ? L"ON" : L"OFF" );
+					TheInGameUI->messageNoFormat( TheGlobalData->m_TiVOFastMode
+						? TheGameText->FETCH_OR_SUBSTITUTE("GUI:FF_ON", L"Fast Forward is on")
+						: TheGameText->FETCH_OR_SUBSTITUTE("GUI:FF_OFF", L"Fast Forward is off")
+					);
 				}
-			}  // end if
+			}
 
 			disp = DESTROY_MESSAGE;
 			break;
 
 		}
 		case GameMessage::MSG_META_TOGGLE_PAUSE:
+		case GameMessage::MSG_META_TOGGLE_PAUSE_ALT:
 		{
-#if !defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h
-			if (TheGameLogic->isInReplayGame())
-#endif
+			if (!TheGameLogic->isInMultiplayerGame())
 			{
 				if (TheGameLogic->isGamePaused())
 				{
@@ -3276,24 +3491,25 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					Bool pauseInput = FALSE;
 					TheGameLogic->setGamePaused(pause, pauseMusic, pauseInput);
 				}
+				disp = DESTROY_MESSAGE;
 			}
 			break;
 		}
 		case GameMessage::MSG_META_STEP_FRAME:
+		case GameMessage::MSG_META_STEP_FRAME_ALT:
 		{
-#if !defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h
-			if (TheGameLogic->isInReplayGame())
-#endif
+			if (!TheGameLogic->isInMultiplayerGame())
 			{
 				TheGameLogic->setGamePaused(FALSE);
-				TheGameLogic->setGamePausedInFrame(TheGameLogic->getFrame() + 1);
+				TheGameLogic->setGamePausedInFrame(TheGameLogic->getFrame() + 1, TRUE);
+				disp = DESTROY_MESSAGE;
 			}
 			break;
 		}
 
 #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h
     case GameMessage::MSG_CHEAT_RUNSCRIPT1:
-    case GameMessage::MSG_CHEAT_RUNSCRIPT2:      
+    case GameMessage::MSG_CHEAT_RUNSCRIPT2:
     case GameMessage::MSG_CHEAT_RUNSCRIPT3:
     case GameMessage::MSG_CHEAT_RUNSCRIPT4:
     case GameMessage::MSG_CHEAT_RUNSCRIPT5:
@@ -3304,12 +3520,13 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		{
 			if ( !TheGameLogic->isInMultiplayerGame() )
 			{
-				if( TheScriptEngine ) 
+				if( TheScriptEngine )
 				{
 					Int script = t - GameMessage::MSG_CHEAT_RUNSCRIPT1 + 1;
 					AsciiString scriptName;
 					scriptName.format("KEY_F%d", script);
 					TheScriptEngine->runScript(scriptName);
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugRunScript", L"Run script %d", script) );
 				}
 				disp = DESTROY_MESSAGE;
 			}
@@ -3324,18 +3541,21 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				{
 
 					TheWritableGlobalData->m_specialPowerUsesDelay = 1 - TheGlobalData->m_specialPowerUsesDelay;
-					TheInGameUI->message( UnicodeString( L"Special Power (Superweapon) Delay: %s" ),
-																TheGlobalData->m_specialPowerUsesDelay ? L"ON" : L"OFF" );
 
-				}  // end if
+					if (TheGlobalData->m_specialPowerUsesDelay)
+						TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSpecialPowerDelaysOn", L"Special Power (Superweapon) Delay is ON") );
+					else
+						TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSpecialPowerDelaysOff", L"Special Power (Superweapon) Delay is OFF") );
+
+				}
 
 				disp = DESTROY_MESSAGE;
 			}
 			break;
 
-		}  // end toggle special power delays
+		}
     //--------------------------------------------------------------------------------------
-    case GameMessage::MSG_CHEAT_SWITCH_TEAMS:							
+    case GameMessage::MSG_CHEAT_SWITCH_TEAMS:
 		{
 			if ( !TheGameLogic->isInMultiplayerGame() )
 			{
@@ -3351,7 +3571,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 						}
 					}
 					Int idxOrig = idx;
-					do 
+					do
 					{
 						++idx;
 						if (idx >= ThePlayerList->getPlayerCount())
@@ -3361,23 +3581,16 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 							break;
 
 					} while (ThePlayerList->getNthPlayer(idx) == ThePlayerList->getNeutralPlayer());
-					
-					ThePlayerList->setLocalPlayer(ThePlayerList->getNthPlayer(idx));
-					TheInGameUI->deselectAllDrawables();
-	#ifdef DEBUG_FOG_MEMORY
-					TheGhostObjectManager->setLocalPlayerIndex(idx);
-	#endif
-					ThePartitionManager->refreshShroudForLocalPlayer();
-					TheControlBar->initSpecialPowershortcutBar(ThePlayerList->getLocalPlayer());
-					TheControlBar->setControlBarSchemeByPlayer(ThePlayerList->getLocalPlayer());
-					TheGameClient->updateFakeDrawables();
+
+					Player* player = ThePlayerList->getNthPlayer(idx);
+					rts::changeLocalPlayer(player);
 				}
 				disp = DESTROY_MESSAGE;
 			}
 			break;
-		} 
+		}
     //--------------------------------------------------------------------------------------
-    case GameMessage::MSG_CHEAT_KILL_SELECTION:						
+    case GameMessage::MSG_CHEAT_KILL_SELECTION:
 		{
 			if ( !TheGameLogic->isInMultiplayerGame() )
 			{
@@ -3387,46 +3600,44 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			break;
 		}
-    case GameMessage::MSG_CHEAT_INSTANT_BUILD:						
+    case GameMessage::MSG_CHEAT_INSTANT_BUILD:
 		{
 			if ( !TheGameLogic->isInMultiplayerGame() )
 			{
 				// Doesn't make a valid network message
 				Player *localPlayer = ThePlayerList->getLocalPlayer();
 				localPlayer->toggleInstantBuild();
+
+				if (localPlayer->buildsInstantly())
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugInstantBuildOn", L"Instant Build is ON") );
+				else
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugInstantBuildOff", L"Instant Build is OFF") );
+
 				disp = DESTROY_MESSAGE;
 			}
 			break;
 		}
-    case GameMessage::MSG_CHEAT_ADD_CASH:									
+    case GameMessage::MSG_CHEAT_ADD_CASH:
 		{
 			if ( !TheGameLogic->isInMultiplayerGame() )
 			{
 				Player *localPlayer = ThePlayerList->getLocalPlayer();
 				Money *money = localPlayer->getMoney();
 				money->deposit( 10000 );
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugAddCash", L"Add Cash") );
 			}
 			break;
 		}
-    case GameMessage::MSG_CHEAT_GIVE_ALL_SCIENCES:				
-		{ 
+    case GameMessage::MSG_CHEAT_GIVE_ALL_SCIENCES:
+		{
 			if ( !TheGameLogic->isInMultiplayerGame() )
 			{
 				Player *player = ThePlayerList->getLocalPlayer();
 				if (player)
-				{ 
-					// cheese festival: do NOT imitate this code. it is for debug purposes only.
-					std::vector<AsciiString> v = TheScienceStore->friend_getScienceNames();
-					for (int i = 0; i < v.size(); ++i) 
-					{
-						ScienceType st = TheScienceStore->getScienceFromInternalName(v[i]);
-						if (st != SCIENCE_INVALID && TheScienceStore->isScienceGrantable(st))
-						{
-							player->grantScience(st);
-						}
-					}
+				{
+					giveAllSciences(player);
 				}
-				TheInGameUI->message( UnicodeString( L"Granting all sciences!" ));
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugGiveAllSciences", L"Granting all sciences!" ) );
 				disp = DESTROY_MESSAGE;
 			}
 			break;
@@ -3438,7 +3649,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				Player *player = ThePlayerList->getLocalPlayer();
 				if (player)
 					player->addSciencePurchasePoints(1);
-				TheInGameUI->message( UnicodeString( L"Adding a SciencePurchasePoint" ));
+
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugGiveSciencePurchasePoint", L"Adding a SciencePurchasePoint" ) );
 				disp = DESTROY_MESSAGE;
 			}
 			break;
@@ -3448,11 +3660,14 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			if ( !TheGameLogic->isInMultiplayerGame() )
 			{
 				TheWritableGlobalData->m_showObjectHealth = 1 - TheGlobalData->m_showObjectHealth;
-				TheInGameUI->message( UnicodeString( L"Object Health %s" ),
-															TheGlobalData->m_showObjectHealth ? L"ON" : L"OFF" );
+
+				if (TheGlobalData->m_showObjectHealth)
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugObjectHealthOn", L"Object Health is ON") );
+				else
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugObjectHealthOff", L"Object Health is OFF") );
 			}
 			break;
-	
+
 		}
 		case GameMessage::MSG_CHEAT_TOGGLE_MESSAGE_TEXT:
 		{
@@ -3464,13 +3679,13 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 				// when messages get turned on, display a message
 				if( TheInGameUI->isMessagesOn() )
-					TheInGameUI->message( TheGameText->fetch( "GUI:MessagesOn" ) );
+					TheInGameUI->message("GUI:MessagesOn");
 
 				disp = DESTROY_MESSAGE;
 			}
 			break;
 
-		}  // end clear message text
+		}
 
 
 #endif
@@ -3541,6 +3756,26 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			break;
 		}
 
+		// --------------------------------------------------------------------------------------------
+		case GameMessage::MSG_CREATE_TEAM0:
+		case GameMessage::MSG_CREATE_TEAM1:
+		case GameMessage::MSG_CREATE_TEAM2:
+		case GameMessage::MSG_CREATE_TEAM3:
+		case GameMessage::MSG_CREATE_TEAM4:
+		case GameMessage::MSG_CREATE_TEAM5:
+		case GameMessage::MSG_CREATE_TEAM6:
+		case GameMessage::MSG_CREATE_TEAM7:
+		case GameMessage::MSG_CREATE_TEAM8:
+		case GameMessage::MSG_CREATE_TEAM9:
+		{
+			Int playerIndex = msg->getPlayerIndex();
+			Player* player = ThePlayerList->getNthPlayer(playerIndex);
+			if (player && player->isLocalPlayer())
+				player->processCreateTeamGameMessage(t - GameMessage::MSG_CREATE_TEAM0, msg);
+
+			break;
+		}
+
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CREATE_SELECTED_GROUP:
 		case GameMessage::MSG_SELECT_TEAM0:
@@ -3553,7 +3788,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_SELECT_TEAM7:
 		case GameMessage::MSG_SELECT_TEAM8:
 		case GameMessage::MSG_SELECT_TEAM9:
-		{	
+		{
 			// weed out unit responses for things we don't own.
 			DrawableList listOfUnits = *TheInGameUI->getAllSelectedDrawables();
 			for (DrawableListIt it = listOfUnits.begin(); it != listOfUnits.end(); /* empty */) {
@@ -3606,7 +3841,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_MOUSEOVER_DRAWABLE_HINT:
 		{
 			const CommandButton *command = TheInGameUI->getGUICommand();
-			if( TheInGameUI->getSelectCount() > 0 
+			if( TheInGameUI->getSelectCount() > 0
 					|| (command && command->getCommandType() == GUI_COMMAND_SPECIAL_POWER_FROM_SHORTCUT) ) // If something is selected
 			{
 				/// @todo This as well as the one in GameMessage::MSG_DRAWABLE_PICKED below should possibly have a generalized CanAttack instead of simply checking isEnemyOf
@@ -3632,7 +3867,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 		}
 		break;
-		
+
 		//-----------------------------------------------------------------------------
 		// Terrain is mouseover'd.  A hint of a command may be generated if something is selected
 		//
@@ -3653,9 +3888,13 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			// Do not eat this message, as it will do something itself at HintSpy
 			break;
 
-		}  // end case GameMessage::MSG_MOUSEOVER_LOCATION_HINT
+		}
 
 		//-----------------------------------------------------------------------------
+		// TheSuperHackers @bugfix Treat the raw double click event identical to the raw button down event
+		// because it implicitly is a raw button down event as well. Failing to do so would mess with the
+		// button timings in later events on button up.
+		case GameMessage::MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK:
 		case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN:
 		{
 			// There are two ways in which we can ignore this as a deselect:
@@ -3691,25 +3930,25 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		{
 			if( TheGlobalData->m_useAlternateMouse && TheGlobalData->m_doubleClickAttackMove )
 			{
-				// create the message and append arguments for a guard location	
+				// create the message and append arguments for a guard location
 				GameMessage *newMsg = TheMessageStream->appendMessage( GameMessage::MSG_DO_GUARD_POSITION );
 				Coord3D pos;
 				TheTacticalView->screenToTerrain( &msg->getArgument( 0 )->pixel, &pos );
 				newMsg->appendLocationArgument(pos);
 				newMsg->appendIntegerArgument(GUARDMODE_NORMAL);
-				
+
 				ThePlayerList->getLocalPlayer()->getAcademyStats()->recordDoubleClickAttackMoveOrderGiven();
 
         TheInGameUI->triggerDoubleClickAttackMoveGuardHint();
 
 				break;
 			}
-			//intentional fall through
+			FALLTHROUGH; //intentional fall through
 		}
 		case GameMessage::MSG_MOUSE_RIGHT_CLICK:
 		{
 			// right click is only actioned here if we're in alternate mouse mode
-			if (TheGlobalData->m_useAlternateMouse 
+			if (TheGlobalData->m_useAlternateMouse
 				&& TheMouse->isClick(&m_mouseRightDragAnchor, &m_mouseRightDragLift, m_mouseRightDown, m_mouseRightUp))
 			{
 				Bool isPoint = (msg->getArgument(0)->pixelRegion.height() == 0 && msg->getArgument(0)->pixelRegion.width() == 0);
@@ -3732,9 +3971,17 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				if (isPoint && controllable)
 				{
 					UnsignedInt pickType = getPickTypesForContext( TheInGameUI->isInForceAttackMode() );
-					Drawable *draw = TheTacticalView->pickDrawable(&msg->getArgument(0)->pixelRegion.lo, 
-																													TheInGameUI->isInForceAttackMode(), 
+					Drawable *draw = TheTacticalView->pickDrawable(&msg->getArgument(0)->pixelRegion.lo,
+																													TheInGameUI->isInForceAttackMode(),
 																													(PickType) pickType);
+
+					// TheSuperHackers @bugfix Stubbjax 07/08/2025 Prevent dead units blocking positional context commands
+					Object* obj = draw ? draw->getObject() : NULL;
+					if (!obj || (obj->isEffectivelyDead() && !obj->isKindOf(KINDOF_ALWAYS_SELECTABLE)))
+					{
+						draw = NULL;
+					}
+
 					if (TheInGameUI->isInForceAttackMode()) {
 						evaluateForceAttack( draw, &pos, DO_COMMAND );
 					} else {
@@ -3746,7 +3993,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				}
 			}
 
-			break;					
+			break;
 		}
 
 		//-----------------------------------------------------------------------------
@@ -3754,7 +4001,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		{
 			if( !TheGlobalData->m_useAlternateMouse && TheGlobalData->m_doubleClickAttackMove )
 			{
-				// create the message and append arguments for a guard location	
+				// create the message and append arguments for a guard location
 				GameMessage *newMsg = TheMessageStream->appendMessage( GameMessage::MSG_DO_GUARD_POSITION );
 				Coord3D pos;
 				TheTacticalView->screenToTerrain( &msg->getArgument( 0 )->pixel, &pos );
@@ -3767,7 +4014,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 				break;
 			}
-			//intentional fall through
+			FALLTHROUGH; //intentional fall through
 		}
 		case GameMessage::MSG_MOUSE_LEFT_CLICK:
 		{
@@ -3803,10 +4050,17 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			if (isPoint && controllable)
 			{
 				UnsignedInt pickType = getPickTypesForContext( TheInGameUI->isInForceAttackMode() );
-				Drawable *draw = TheTacticalView->pickDrawable(&msg->getArgument(0)->pixelRegion.lo, 
-																												TheInGameUI->isInForceAttackMode(), 
+				Drawable *draw = TheTacticalView->pickDrawable(&msg->getArgument(0)->pixelRegion.lo,
+																												TheInGameUI->isInForceAttackMode(),
 																												(PickType) pickType);
 
+				// TheSuperHackers @bugfix Stubbjax 07/08/2025 Prevent dead units blocking positional context commands
+				Object* obj = draw ? draw->getObject() : NULL;
+				if (!obj || (obj->isEffectivelyDead() && !obj->isKindOf(KINDOF_ALWAYS_SELECTABLE)))
+				{
+					draw = NULL;
+				}
+
 				if (TheInGameUI->isInForceAttackMode()) {
 					evaluateForceAttack( draw, &pos, DO_COMMAND );
 				} else {
@@ -3820,7 +4074,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			break;
 
-		}  // end case GameMessage::MSG_MOUSE_LEFT_CLICK
+		}
 
 
 
@@ -3845,7 +4099,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		//------------------------------------------------------------------------- BEGIN DEMO MESSAGES
 		//------------------------------------------------------------------------- BEGIN DEMO MESSAGES
 		//------------------------------------------------------------------------- BEGIN DEMO MESSAGES
@@ -3866,7 +4120,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					}
 				}
 				Int idxOrig = idx;
-				do 
+				do
 				{
 
 					++idx;
@@ -3879,19 +4133,13 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					}
 
 				} while (ThePlayerList->getNthPlayer(idx) == ThePlayerList->getNeutralPlayer());
-				
-				ThePlayerList->setLocalPlayer(ThePlayerList->getNthPlayer(idx));
-				TheInGameUI->deselectAllDrawables();
-#ifdef DEBUG_FOG_MEMORY
-				TheGhostObjectManager->setLocalPlayerIndex(idx);
-#endif
-				ThePartitionManager->refreshShroudForLocalPlayer();
-				TheControlBar->initSpecialPowershortcutBar(ThePlayerList->getLocalPlayer());
-				TheControlBar->setControlBarSchemeByPlayer(ThePlayerList->getLocalPlayer());
+
+				Player* player = ThePlayerList->getNthPlayer(idx);
+				rts::changeLocalPlayer(player);
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		} 
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -3908,11 +4156,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					Player *pt = ThePlayerList->getNthPlayer(i);
 					if(pt->getSide().compareNoCase("China") == 0)
 					{
-						ThePlayerList->setLocalPlayer(pt);
-						TheInGameUI->deselectAllDrawables();
-						ThePartitionManager->refreshShroudForLocalPlayer();
-						TheControlBar->setControlBarSchemeByPlayer(ThePlayerList->getLocalPlayer());
-
+						rts::changeLocalPlayer(pt);
 						break;
 					}
 				}
@@ -3925,10 +4169,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					Player *pt = ThePlayerList->getNthPlayer(i);
 					if(pt->getSide().compareNoCase("America") == 0)
 					{
-						ThePlayerList->setLocalPlayer(pt);
-						TheInGameUI->deselectAllDrawables();
-						ThePartitionManager->refreshShroudForLocalPlayer();
-						TheControlBar->setControlBarSchemeByPlayer(ThePlayerList->getLocalPlayer());
+						rts::changeLocalPlayer(pt);
 						break;
 					}
 				}
@@ -3942,19 +4183,23 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_LOD_DECREASE:
 		{
-			TheGameClient->adjustLOD(-1);
+			const Int level = clamp(0, WW3D::Get_Texture_Reduction() - 1, 4);
+			TheGameClient->setTextureLOD(level);
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugDecreaseLOD", L"Decrease LOD") );
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_LOD_INCREASE:
 		{
-			TheGameClient->adjustLOD(1);
+			const Int level = clamp(0, WW3D::Get_Texture_Reduction() + 1, 4);
+			TheGameClient->setTextureLOD(level);
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugIncreaseLOD", L"Increase LOD") );
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -3965,14 +4210,14 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 /*
 			if (TheWindowManager && TheNameKeyGenerator)
 			{
-				GameWindow *motd = TheWindowManager->winGetWindowFromId(NULL, (Int)TheNameKeyGenerator->nameToKey(AsciiString("MOTD.wnd:MOTD")));
+				GameWindow *motd = TheWindowManager->winGetWindowFromId(NULL, (Int)TheNameKeyGenerator->nameToKey("MOTD.wnd:MOTD"));
 				if (motd)
 					motd->winHide(!motd->winIsHidden());
 			}*/
-  
+
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -3991,10 +4236,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					TheGameLogic->setShowBehindBuildingMarkers(TRUE);
 					TheInGameUI->message("GUI:HideBehindBuildings");
 				}
-			}  
+			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -4014,7 +4259,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				Bool hide = false;
 				if (TheWindowManager)
 				{
-					Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
+					Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent");
 					GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
 
 					if (window)
@@ -4029,7 +4274,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -4041,12 +4286,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 			// when messages get turned on, display a message
 			if( TheInGameUI->isMessagesOn() )
-				TheInGameUI->message( TheGameText->fetch( "GUI:MessagesOn" ) );
+				TheInGameUI->message("GUI:MessagesOn");
 
 			disp = DESTROY_MESSAGE;
 			break;
 
-		}  // end clear message text
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -4057,7 +4302,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				TheTacticalView->setViewFilterMode(FM_NULL_MODE);
 				TheTacticalView->setViewFilter(FT_NULL_FILTER);
 			}
-			else 
+			else
 			{
 				static Bool saturate = false;
 				FilterModes mode = FM_VIEW_MB_IN_AND_OUT_ALPHA;
@@ -4072,9 +4317,9 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				TheTacticalView->getPosition(&curpos);
 				curpos.x += 200;
 				curpos.y += 200;
-				TheTacticalView->setViewFilterPos(&curpos); 
+				TheTacticalView->setViewFilterPos(&curpos);
 
-				TheTacticalView->setViewFilterMode(mode); 						 
+				TheTacticalView->setViewFilterMode(mode);
 				TheTacticalView->setViewFilter(FT_VIEW_MOTION_BLUR_FILTER);
 			}
 			disp = DESTROY_MESSAGE;
@@ -4126,7 +4371,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_RED_VIEW:
-		{	
+		{
 			if ((TheTacticalView->getViewFilterType()) == FT_VIEW_BW_FILTER)
 			{	//mode already set, turn it off
 				TheTacticalView->setViewFilterMode(FM_NULL_MODE);
@@ -4147,7 +4392,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_GREEN_VIEW:
-		{	
+		{
 			if ((TheTacticalView->getViewFilterType()) == FT_VIEW_BW_FILTER)
 			{	//mode already set, turn it off
 				TheTacticalView->setViewFilterMode(FM_NULL_MODE);
@@ -4177,13 +4422,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 
 			TheGameLODManager->setDynamicLODLevel((DynamicGameLODLevel)level);
 
-			UnicodeString lodName;
-			lodName.format(L"Dynamic Game Detail %hs",TheGameLODManager->getDynamicGameLODLevelName((DynamicGameLODLevel)level));
-			TheInGameUI->message(lodName);
+			const char* lodLevelName = TheGameLODManager->getDynamicGameLODLevelName((DynamicGameLODLevel)level);
+			TheInGameUI->message( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugDynamicLODLevel", L"Dynamic Game Detail %hs", lodLevelName) );
 
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -4192,26 +4436,38 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			TheDisplay->dumpModelAssets("UsedMapAssets.txt");
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
-		
+		}
+
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_SHADOW_VOLUMES:
 		{
 			TheWritableGlobalData->m_useShadowVolumes = !TheGlobalData->m_useShadowVolumes;
 			TheWritableGlobalData->m_useShadowDecals = !TheGlobalData->m_useShadowDecals;
+
+			if (TheWritableGlobalData->m_useShadowVolumes)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugShadowVolumesOn", L"Shadow Volumes is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugShadowVolumesOff", L"Shadow Volumes is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_FOGOFWAR:
 		{
 			TheWritableGlobalData->m_fogOfWarOn = !TheGlobalData->m_fogOfWarOn;
+
+			if (TheWritableGlobalData->m_fogOfWarOn)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugFogOfWarOn", L"Fog of War is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugFogOfWarOff", L"Fog of War is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -4243,47 +4499,46 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_GIVE_VETERANCY:
 		case GameMessage::MSG_META_DEBUG_TAKE_VETERANCY:
 		{
-			if ( !TheGameLogic->isInMultiplayerGame() )
+			if (TheGameLogic->isInMultiplayerGame())
+				break;
+
+			const DrawableList *list = TheInGameUI->getAllSelectedDrawables();
+			for (DrawableListCIt it = list->begin(); it != list->end(); ++it)
 			{
+				Drawable *pDraw = *it;
+				if (!pDraw)
+					continue;
 
-				const DrawableList *list = TheInGameUI->getAllSelectedDrawables();
-				for (DrawableListCIt it = list->begin(); it != list->end(); ++it) 
+				Object *pObject = pDraw->getObject();
+				if (!pObject)
+					continue;
+
+				ExperienceTracker *et = pObject->getExperienceTracker();
+				if (!et || !et->isTrainable())
+					continue;
+
+				VeterancyLevel oldVet = et->getVeterancyLevel();
+				VeterancyLevel newVet = oldVet;
+
+				if (t == GameMessage::MSG_META_DEBUG_GIVE_VETERANCY)
 				{
-					Drawable *pDraw = *it;
-					if (pDraw) 
+					if (oldVet < LEVEL_LAST)
 					{
-						Object *pObject = pDraw->getObject();
-						if (pObject)
-						{
-							ExperienceTracker *et = pObject->getExperienceTracker();
-							if (et)
-							{
-								if (et->isTrainable())
-								{
-									VeterancyLevel oldVet = et->getVeterancyLevel();
-									VeterancyLevel newVet = oldVet;
-									if (t == GameMessage::MSG_META_DEBUG_GIVE_VETERANCY)
-									{
-										if (oldVet < LEVEL_LAST)
-										{
-											newVet = (VeterancyLevel)((Int)oldVet + 1);
-										}
-									}
-									else
-									{
-										if (oldVet > LEVEL_FIRST)
-										{
-											newVet = (VeterancyLevel)((Int)oldVet - 1);
-										}
-									}
-									et->setVeterancyLevel(newVet);
-								}
-							}
-						}
+						newVet = (VeterancyLevel)((Int)oldVet + 1);
 					}
 				}
-				disp = DESTROY_MESSAGE;
+				else
+				{
+					if (oldVet > LEVEL_FIRST)
+					{
+						newVet = (VeterancyLevel)((Int)oldVet - 1);
+					}
+				}
+
+				et->setVeterancyLevel(newVet);
 			}
+
+			disp = DESTROY_MESSAGE;
 			break;
 		}
 
@@ -4292,7 +4547,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED:
 		{
 			TheSkateDistOverride += 0.25f;
-			TheInGameUI->message( UnicodeString( L"Skate Distance Override is now %f" ), TheSkateDistOverride );
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugAnimSkateSpeed", L"Skate Distance Override is now %f", TheSkateDistOverride ) );
 			break;
 		}
 
@@ -4301,7 +4556,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED:
 		{
 			TheSkateDistOverride -= 0.25f;
-			TheInGameUI->message( UnicodeString( L"Skate Distance Override is now %f" ), TheSkateDistOverride );
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugAnimSkateSpeed", L"Skate Distance Override is now %f", TheSkateDistOverride ) );
 			break;
 		}
 
@@ -4310,64 +4565,73 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_CYCLE_EXTENT_TYPE:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_TYPE;
 			if (!extentModAmount) extentModAmount = 1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_INCREASE_EXTENT_MAJOR:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MAJOR;
 			if (!extentModAmount) extentModAmount = 1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_INCREASE_EXTENT_MAJOR_BIG:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MAJOR;
 			if (!extentModAmount) extentModAmount = EXTENT_BIG_CHANGE;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_DECREASE_EXTENT_MAJOR:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MAJOR;
 			if (!extentModAmount) extentModAmount = -1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_DECREASE_EXTENT_MAJOR_BIG:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MAJOR;
 			if (!extentModAmount) extentModAmount = -EXTENT_BIG_CHANGE;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_INCREASE_EXTENT_MINOR:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MINOR;
 			if (!extentModAmount) extentModAmount = 1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_INCREASE_EXTENT_MINOR_BIG:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MINOR;
 			if (!extentModAmount) extentModAmount = EXTENT_BIG_CHANGE;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_DECREASE_EXTENT_MINOR:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MINOR;
 			if (!extentModAmount) extentModAmount = -1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_DECREASE_EXTENT_MINOR_BIG:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_MINOR;
 			if (!extentModAmount) extentModAmount = -EXTENT_BIG_CHANGE;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_HEIGHT;
 			if (!extentModAmount) extentModAmount = 1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT_BIG:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_HEIGHT;
 			if (!extentModAmount) extentModAmount = EXTENT_BIG_CHANGE;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_HEIGHT;
 			if (!extentModAmount) extentModAmount = -1.0f;
+			FALLTHROUGH;
 		case GameMessage::MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT_BIG:
 			if (extentModType == EXTENTMOD_INVALID) extentModType = EXTENTMOD_HEIGHT;
 			if (!extentModAmount) extentModAmount = -EXTENT_BIG_CHANGE;
 		{
 			const DrawableList *list = TheInGameUI->getAllSelectedDrawables();
-			for (DrawableListCIt it = list->begin(); it != list->end(); ++it) 
+			for (DrawableListCIt it = list->begin(); it != list->end(); ++it)
 			{
 				Drawable *pDraw = *it;
-				if (pDraw) 
+				if (pDraw)
 				{
 					Object *pObject = pDraw->getObject();
 					if (pObject)
 					{
 						const GeometryInfo oldGeometry = pObject->getGeometryInfo();
-						
+
 						GeometryInfo newGeometry = oldGeometry;
 						newGeometry.tweakExtents(extentModType, extentModAmount);
-						
-						AsciiString msg;
-						msg.format("Extent %s --> %s   %d %g",oldGeometry.getDescriptiveString().str(), newGeometry.getDescriptiveString().str(),	extentModType, extentModAmount);
 
-						UnicodeString umsg;
-						umsg.translate(msg);
-						TheInGameUI->message(umsg);
-						DEBUG_LOG(("%ls\n", msg.str()));
+						TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugExtent",
+							L"Extent %hs --> %hs   %d %g", oldGeometry.getDescriptiveString().str(), newGeometry.getDescriptiveString().str(), extentModType, extentModAmount ) );
+
+						DEBUG_LOG(("Extent %s --> %s   %d %g", oldGeometry.getDescriptiveString().str(), newGeometry.getDescriptiveString().str(), extentModType, extentModAmount));
 
 						pObject->setGeometryInfo( newGeometry );
 					}
@@ -4394,7 +4658,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			if (id != 0 && TheTacticalView->getCameraLock() == id)
 			{
 				if (TheTacticalView->getCameraLockDrawable())
-				{	
+				{
 					id = INVALID_ID;	// toggle it
 					d=NULL;
 					TheTacticalView->forceRedraw();	//reset camera to normal
@@ -4408,7 +4672,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			TheTacticalView->setCameraLockDrawable(d);
 			disp = DESTROY_MESSAGE;
 			break;
-		}	
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -4419,39 +4683,53 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				TheDisplay->stopMovie();
 				TheInGameUI->stopMovie();
 				TheAudio->setOn(false, AudioAffect_All);
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSoundOff", L"Sound is OFF") );
 			}
 			else
 			{
 				TheAudio->setOn(true, AudioAffect_All);
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSoundOn", L"Sound is ON") );
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_TRACKMARKS:
 		{
 			TheWritableGlobalData->m_makeTrackMarks = !TheGlobalData->m_makeTrackMarks;
+
+			if (TheGlobalData->m_makeTrackMarks)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugTrackMarksOn", L"Track Marks is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugTrackMarksOff", L"Track Marks is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_WATERPLANE:
 		{
 			TheWritableGlobalData->m_useWaterPlane = !TheGlobalData->m_useWaterPlane;
+
+			if (TheGlobalData->m_useWaterPlane)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugWaterPlaneOn", L"Water Plane is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugWaterPlaneOff", L"Water Plane is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TIME_OF_DAY:
 		{
 			TimeOfDay tod = TimeOfDay((Int) TheGlobalData->m_timeOfDay + 1);
-			if (tod >= TIME_OF_DAY_COUNT)
+			if (tod < TIME_OF_DAY_FIRST || tod >= TIME_OF_DAY_COUNT)
 				tod = TIME_OF_DAY_FIRST;
 			if (TheWritableGlobalData->setTimeOfDay(tod))
 			{
@@ -4468,31 +4746,61 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 							d->clearAndSetModelConditionFlags(empty, empty);
 						}
 					}
-        } 
+				}
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugTimeOfDay", L"Time of Day set to %hs", TimeOfDayNames[tod]) );
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_REMOVE_PREREQ:
 		{
 			// Doesn't make a valid network message
-			Player *localPlayer = ThePlayerList->getLocalPlayer();
-			localPlayer->toggleIgnorePrereqs();
+			// TheSuperHackers @info In multiplayer, all clients need to enable this cheat at the same time, otherwise game will mismatch
+			Bool enable = !ThePlayerList->getLocalPlayer()->ignoresPrereqs();
+
+			for (Int n = 0; n < ThePlayerList->getPlayerCount(); ++n)
+			{
+				Player* player = ThePlayerList->getNthPlayer(n);
+				if (player->getPlayerType() == PLAYER_HUMAN)
+					player->enableIgnorePrereqs(enable);
+			}
+
+			if (enable)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugIgnorePrereqOn", L"Ignore Prerequisites is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugIgnorePrereqOff", L"Ignore Prerequisites is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
-    } 
+    }
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_INSTANT_BUILD:
 		{
 			// Doesn't make a valid network message
-			Player *localPlayer = ThePlayerList->getLocalPlayer();
-			localPlayer->toggleInstantBuild();
-			disp = DESTROY_MESSAGE;
+			// TheSuperHackers @info In multiplayer, all clients need to enable this cheat at the same time, otherwise game will mismatch
+			if (!TheGameLogic->isInMultiplayerGame() || !hasThingsInProduction(PLAYER_HUMAN))
+			{
+				Bool enable = !ThePlayerList->getLocalPlayer()->buildsInstantly();
+
+				for (Int n = 0; n < ThePlayerList->getPlayerCount(); ++n)
+				{
+					Player* player = ThePlayerList->getNthPlayer(n);
+					if (player->getPlayerType() == PLAYER_HUMAN)
+						player->enableInstantBuild(enable);
+				}
+
+				if (enable)
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugInstantBuildOn", L"Instant Build is ON") );
+				else
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugInstantBuildOff", L"Instant Build is OFF") );
+
+				disp = DESTROY_MESSAGE;
+			}
 			break;
 		}
 
@@ -4501,8 +4809,21 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEMO_FREE_BUILD:
 		{
 			// Doesn't make a valid network message
-			Player *localPlayer = ThePlayerList->getLocalPlayer();
-			localPlayer->toggleFreeBuild();
+			// TheSuperHackers @info In multiplayer, all clients need to enable this cheat at the same time, otherwise game will mismatch
+			Bool enable = !ThePlayerList->getLocalPlayer()->buildsForFree();
+
+			for (Int n = 0; n < ThePlayerList->getPlayerCount(); ++n)
+			{
+				Player* player = ThePlayerList->getNthPlayer(n);
+				if (player->getPlayerType() == PLAYER_HUMAN)
+					player->enableFreeBuild(enable);
+			}
+
+			if (enable)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugFreeBuildOn", L"Free Build is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugFreeBuildOff", L"Free Build is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4524,6 +4845,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				Player *localPlayer = ThePlayerList->getLocalPlayer();
 				Money *money = localPlayer->getMoney();
 				money->deposit( 10000 );
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugAddCash", L"Add Cash") );
 			}
 			break;
 		}
@@ -4540,12 +4862,13 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEMO_RUNSCRIPT8:
 		case GameMessage::MSG_META_DEMO_RUNSCRIPT9:
 		{
-			if( TheScriptEngine ) 
+			if( TheScriptEngine )
 			{
 				Int script = t - GameMessage::MSG_META_DEMO_RUNSCRIPT1 + 1;
 				AsciiString scriptName;
 				scriptName.format("KEY_F%d", script);
 				TheScriptEngine->runScript(scriptName);
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugRunScript", L"Run script %d", script) );
 			}
 			disp = DESTROY_MESSAGE;
 			break;
@@ -4591,16 +4914,17 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				AsciiString name;
 				name.format("DemoObjective%02d", m_objective);
 				TheInGameUI->playMovie(name);
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugObjectiveMove", L"Objective Movie %d", m_objective) );
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_MILITARY_SUBTITLES:
 		{
-			
+
 			TheInGameUI->militarySubtitle("MSG:Testing", 10000);  // use some innocuous string
 			disp = DESTROY_MESSAGE;
 			break;
@@ -4610,41 +4934,39 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_MUSIC:
 		{
-			if (TheAudio->isMusicPlaying()) {
+			if (TheAudio->isMusicPlaying())
+			{
 				TheAudio->stopAudio(AudioAffect_Music);
-				TheInGameUI->message( UnicodeString( L"Stopping Music" ));
-			} else {
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugMusicOn", L"Music is OFF") );
+			} else
+			{
 				TheAudio->resumeAudio(AudioAffect_Music);
-				TheInGameUI->message( UnicodeString( L"Resuming Music" ));
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugMusicOff", L"Music is ON") );
 			}
 
 			disp = DESTROY_MESSAGE;
 			break;
-		} 
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_MUSIC_NEXT_TRACK:
 		{
 			TheAudio->nextMusicTrack();
-			UnicodeString ustr;
-			ustr.format(L"Playing Track: %hs", TheAudio->getMusicTrackName().str());
-			TheInGameUI->message( ustr );
+			TheInGameUI->message( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugMusicTrack", L"Playing Track: %hs", TheAudio->getMusicTrackName().str()) );
 			disp = DESTROY_MESSAGE;
 			break;
-		} 
-		
+		}
+
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_MUSIC_PREV_TRACK:
 		{
 			TheAudio->prevMusicTrack();
-			UnicodeString ustr;
-			ustr.format(L"Playing Track: %hs", TheAudio->getMusicTrackName().str());
-			TheInGameUI->message( ustr );
+			TheInGameUI->message( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugMusicTrack", L"Playing Track: %hs", TheAudio->getMusicTrackName().str()) );
 			disp = DESTROY_MESSAGE;
 			break;
-		} 
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -4666,22 +4988,30 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEMO_TOGGLE_AI_DEBUG:
 		{
 			TheWritableGlobalData->m_debugAI = (AIDebugOptions)((Int)TheGlobalData->m_debugAI + 1);
-			if (TheGlobalData->m_debugAI >= AI_DEBUG_END) 
+			if (TheGlobalData->m_debugAI >= AI_DEBUG_END)
 				TheWritableGlobalData->m_debugAI=AI_DEBUG_NONE;
+
 			UnicodeString line;
 			line.format(L"Level %d", TheGlobalData->m_debugAI);
-			TheInGameUI->message( UnicodeString( L"Debug AI Mode is %s" ), TheGlobalData->m_debugAI ? line.str() : L"OFF" );
+			if (TheGlobalData->m_debugAI != AI_DEBUG_NONE)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugAiDebugOn", L"Debug AI Mode is %s", line.str()) );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugAiDebugOff", L"Debug AI Mode is OFF") );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-		
+
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_SUPPLY_CENTER_PLACEMENT:
 		{
 			TheWritableGlobalData->m_debugSupplyCenterPlacement = !TheWritableGlobalData->m_debugSupplyCenterPlacement;
 
-			TheInGameUI->message( UnicodeString( L"Log SupplyCenter Placement is %s" ), TheGlobalData->m_debugSupplyCenterPlacement ? L"ON" : L"OFF" );
+			if (TheGlobalData->m_debugSupplyCenterPlacement)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSupplyCenterPlacementOn", L"Log SupplyCenter Placement is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSupplyCenterPlacementOff", L"Log SupplyCenter Placement is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4693,7 +5023,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			Player *player = ThePlayerList->getLocalPlayer();
 			if (player)
 				player->addSciencePurchasePoints(1);
-			TheInGameUI->message( UnicodeString( L"Adding a SciencePurchasePoint" ));
+
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugGiveSciencePurchasePoint", L"Adding a SciencePurchasePoint") );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4702,21 +5033,15 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_GIVE_ALL_SCIENCES:
 		{
-			Player *player = ThePlayerList->getLocalPlayer();
-			if (player)
+			// TheSuperHackers @info In multiplayer, all clients need to enable this cheat at the same time, otherwise game will mismatch
+			for (Int n = 0; n < ThePlayerList->getPlayerCount(); ++n)
 			{
-				// cheese festival: do NOT imitate this code. it is for debug purposes only.
-				std::vector<AsciiString> v = TheScienceStore->friend_getScienceNames();
-				for (size_t i = 0; i < v.size(); ++i) 
-				{
-					ScienceType st = TheScienceStore->getScienceFromInternalName(v[i]);
-					if (st != SCIENCE_INVALID && TheScienceStore->isScienceGrantable(st))
-					{
-						player->grantScience(st);
-					}
-				}
+				Player* player = ThePlayerList->getNthPlayer(n);
+				if (player->getPlayerType() == PLAYER_HUMAN)
+					giveAllSciences(player);
 			}
-			TheInGameUI->message( UnicodeString( L"Granting all sciences!" ));
+
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugGiveAllSciences", L"Granting all sciences!") );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4728,7 +5053,9 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			Player *player = ThePlayerList->getLocalPlayer();
 			if (player)
 				player->setRankLevel(player->getRankLevel() + 1);
-			TheInGameUI->message( UnicodeString( L"Adding a RankLevel" ));
+
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugAddRankLevel", L"Adding a Rank Level") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4740,7 +5067,9 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			Player *player = ThePlayerList->getLocalPlayer();
 			if (player)
 				player->setRankLevel(player->getRankLevel() - 1);
-			TheInGameUI->message( UnicodeString( L"Subtracting a RankLevel" ));
+
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSubRankLevel", L"Subtracting a Rank Level") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4750,7 +5079,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEMO_TOGGLE_CAMERA_DEBUG:
 		{
 			TheWritableGlobalData->m_debugCamera = !TheGlobalData->m_debugCamera;
-			TheInGameUI->message( UnicodeString( L"Debug Camera Mode is %s" ), TheGlobalData->m_debugCamera ? L"On" : L"OFF" );
+
+			if (TheTacticalView->isZoomLimited())
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugCameraModeOn", L"Debug Camera Mode is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugCameraModeOff", L"Debug Camera Mode is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4759,7 +5093,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_NO_DRAW:
 		{
-			TheWritableGlobalData->m_noDraw = REAL_TO_INT(pow(2, 32) - 1);
+			const Bool isZero = TheGlobalData->m_noDraw == 0u;
+			TheWritableGlobalData->m_noDraw = isZero ? ~0u : 0u;
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4818,13 +5153,18 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-		
+
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_VISIONDEBUG:
 		{
 			TheWritableGlobalData->m_debugVisibility = !TheGlobalData->m_debugVisibility;
-			TheInGameUI->message( UnicodeString( L"Debug Vision Mode is %s" ), TheGlobalData->m_debugVisibility? L"On" : L"OFF" );
+
+			if (TheGlobalData->m_debugVisibility)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugVisionModeOn", L"Debug Vision Mode is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugVisionModeOff", L"Debug Vision Mode is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4834,7 +5174,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEMO_TOGGLE_PROJECTILEDEBUG:
 		{
 			TheWritableGlobalData->m_debugProjectilePath = !TheGlobalData->m_debugProjectilePath;
-			TheInGameUI->message( UnicodeString( L"Debug Projectile Path Mode is %s" ), TheGlobalData->m_debugProjectilePath? L"On" : L"OFF" );
+
+			if (TheGlobalData->m_debugProjectilePath)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugProjectilePathModeOn", L"Debug Projectile Path Mode is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugProjectilePathModeOff", L"Debug Projectile Path Mode is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4847,7 +5192,12 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			if (TheGlobalData->m_debugThreatMap) {
 				TheWritableGlobalData->m_debugCashValueMap = false;
 			}
-			TheInGameUI->message( UnicodeString( L"Debug Threat Map is %s" ), TheGlobalData->m_debugThreatMap? L"On" : L"OFF" );
+
+			if (TheGlobalData->m_debugThreatMap)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugThreadMapOn", L"Debug Threat Map is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugThreadMapOff", L"Debug Threat Map is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -4860,11 +5210,16 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			if (TheGlobalData->m_debugCashValueMap) {
 				TheWritableGlobalData->m_debugThreatMap = false;
 			}
-			TheInGameUI->message( UnicodeString( L"Debug Cash Value Map is %s" ), TheGlobalData->m_debugCashValueMap? L"On" : L"OFF" );
+
+			if (TheGlobalData->m_debugCashValueMap)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugCashValueMapOn", L"Debug Cash Value Map is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugCashValueMapOff", L"Debug Cash Value Map is OFF") );
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-		
+
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_GRAPHICALFRAMERATEBAR:
@@ -4878,17 +5233,25 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEBUG_SHOW_EXTENTS:
 			TheWritableGlobalData->m_showCollisionExtents = 1 - TheGlobalData->m_showCollisionExtents;
-			TheInGameUI->message( UnicodeString( L"Show Object Extents %s" ),
-				                    TheGlobalData->m_showCollisionExtents ? L"ON" : L"OFF" );
+
+			if (TheGlobalData->m_showCollisionExtents)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugObjectExtentsOn", L"Show Object Extents is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugObjectExtentsOff", L"Show Object Extents is OFF") );
+
 			break;
 
     //------------------------------------------------------------------------------- DEMO MESSAGES
     //-----------------------------------------------------------------------------------------
     case GameMessage::MSG_META_DEBUG_SHOW_AUDIO_LOCATIONS:
       TheWritableGlobalData->m_showAudioLocations = 1 - TheGlobalData->m_showAudioLocations;
-      TheInGameUI->message( UnicodeString( L"Show AudioLocations %s" ),
-                            TheGlobalData->m_showAudioLocations ? L"ON" : L"OFF" );
-      break;       
+
+			if (TheGlobalData->m_showAudioLocations)
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugAudioLocationsOn", L"Show Audio Locations is ON") );
+			else
+				TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugAudioLocationsOff", L"Show Audio Locations is OFF") );
+
+      break;
 
     //------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -4896,10 +5259,13 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		{
 
 			TheWritableGlobalData->m_showObjectHealth = 1 - TheGlobalData->m_showObjectHealth;
-			TheInGameUI->message( UnicodeString( L"Object Health %s" ),
-				                    TheGlobalData->m_showObjectHealth ? L"ON" : L"OFF" );
+
+				if (TheGlobalData->m_showObjectHealth)
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugObjectHealthOn", L"Object Health is ON") );
+				else
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugObjectHealthOff", L"Object Health is OFF") );
 			break;
-	
+
 		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
@@ -4915,7 +5281,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			disp = DESTROY_MESSAGE;
 			break;
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
@@ -4926,15 +5292,18 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			{
 
 				TheTacticalView->setZoomLimited( !TheTacticalView->isZoomLimited() );
-				TheInGameUI->message( UnicodeString( L"Camera Zoom Limit: %s" ),
-				                      TheTacticalView->isZoomLimited() ? L"ON" : L"OFF" );
 
-			}  // end if
+				if (TheTacticalView->isZoomLimited())
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugCameraZoomLimitOn", L"Camera Zoom Limit is ON") );
+				else
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugCameraZoomLimitOff", L"Camera Zoom Limit is OFF") );
+
+			}
 
 			disp = DESTROY_MESSAGE;
 			break;
 
-		}  
+		}
 
 		//------------------------------------------------------------------------------- DEMO MESSAGES
 		//---------------------------------------------------------------------------------------------
@@ -4945,15 +5314,18 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			{
 
 				TheWritableGlobalData->m_specialPowerUsesDelay = 1 - TheGlobalData->m_specialPowerUsesDelay;
-				TheInGameUI->message( UnicodeString( L"Special Power (Superweapon) Delay: %s" ),
-															TheGlobalData->m_specialPowerUsesDelay ? L"ON" : L"OFF" );
 
-			}  // end if
+				if (TheGlobalData->m_specialPowerUsesDelay)
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSpecialPowerDelaysOn", L"Special Power (Superweapon) Delay is ON") );
+				else
+					TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugSpecialPowerDelaysOff", L"Special Power (Superweapon) Delay is OFF") );
+
+			}
 
 			disp = DESTROY_MESSAGE;
 			break;
 
-		}  // end toggle special power delays
+		}
 
 #ifdef ALLOW_SURRENDER
 		//------------------------------------------------------------------------------- DEMO MESSAGES
@@ -4993,7 +5365,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_VTUNE_ON:
 		{
 			TheScriptEngine->setEnableVTune(true);
-			TheInGameUI->message( UnicodeString( L"VTune Gathering is ON" ));
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugVTuneOff", L"VTune Gathering is ON") );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -5004,7 +5376,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_VTUNE_OFF:
 		{
 			TheScriptEngine->setEnableVTune(false);
-			TheInGameUI->message( UnicodeString( L"VTune Gathering is OFF" ));
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugVTuneOff", L"VTune Gathering is OFF") );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -5013,12 +5385,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEBUG_TOGGLE_FEATHER_WATER:
 		{
-			//TheScriptEngine->setEnableVTune(false);
-			//TheInGameUI->message( UnicodeString( L"VTune Gathering is OFF" ));
 			--TheWritableGlobalData->m_featherWater;
-			if (TheGlobalData->m_featherWater < 0) 
+			if (TheGlobalData->m_featherWater < 0)
 				TheWritableGlobalData->m_featherWater = 5;
-			
+
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -5028,7 +5398,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_DEBUG_WIN:
 		{
 			TheScriptEngine->debugVictory();
-			TheInGameUI->message( UnicodeString( L"Instant Win" ));
+
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE("GUI:DebugWin", L"Instant Win") );
 			disp = DESTROY_MESSAGE;
 			break;
 		}
@@ -5044,12 +5415,13 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-		
+
 		//------------------------------------------------------------------------DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEBUG_SLEEPY_UPDATE_PERFORMANCE:
 		{
-			TheInGameUI->message( UnicodeString(L"Number of Sleepy Modules: %d."), TheGameLogic->getNumberSleepyUpdates() );
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugIncreaseAnimSkateSpeed",
+				L"Number of Sleepy Modules: %d", TheGameLogic->getNumberSleepyUpdates() ) );
 			break;
 		}
 
@@ -5071,7 +5443,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 			double timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
 
-			TheInGameUI->message( UnicodeString(L"Time to run %d ObjectID lookups is %f.  Next index is %d."), numberLookups, timeToUpdate, (Int)TheGameLogic->getObjectIDCounter() );
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugObjectIdPerformance",
+				L"Time to run %d ObjectID lookups is %f. Next index is %d", numberLookups, timeToUpdate, (Int)TheGameLogic->getObjectIDCounter() ) );
 
 
 			QueryPerformanceCounter((LARGE_INTEGER *)&startTime64);
@@ -5085,7 +5458,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 			timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
 
-			TheInGameUI->message( UnicodeString(L"Time to run %d ObjectID lookups is %f.  Next index is %d."), numberLookups, timeToUpdate, (Int)TheGameLogic->getObjectIDCounter() );
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugObjectIdPerformance",
+				L"Time to run %d ObjectID lookups is %f. Next index is %d", numberLookups, timeToUpdate, (Int)TheGameLogic->getObjectIDCounter() ) );
 
 
 			QueryPerformanceCounter((LARGE_INTEGER *)&startTime64);
@@ -5099,7 +5473,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 			timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
 
-			TheInGameUI->message( UnicodeString(L"Time to run %d ObjectID lookups is %f.  Next index is %d."), numberLookups, timeToUpdate, (Int)TheGameLogic->getObjectIDCounter() );
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugObjectIdPerformance",
+				L"Time to run %d ObjectID lookups is %f. Next index is %d", numberLookups, timeToUpdate, (Int)TheGameLogic->getObjectIDCounter() ) );
 
 			break;
 		}
@@ -5122,7 +5497,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 			double timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
 
-			TheInGameUI->message( UnicodeString(L"Time to run %d DrawableID lookups is %f.  Next index is %d."), numberLookups, timeToUpdate, (Int)TheGameClient->getDrawableIDCounter() );
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugDrawableIdPerformance",
+				L"Time to run %d DrawableID lookups is %f. Next index is %d", numberLookups, timeToUpdate, (Int)TheGameClient->getDrawableIDCounter() ) );
 
 
 			QueryPerformanceCounter((LARGE_INTEGER *)&startTime64);
@@ -5136,7 +5512,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 			timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
 
-			TheInGameUI->message( UnicodeString(L"Time to run %d DrawableID lookups is %f.  Next index is %d."), numberLookups, timeToUpdate, (Int)TheGameClient->getDrawableIDCounter() );
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugDrawableIdPerformance",
+				L"Time to run %d DrawableID lookups is %f. Next index is %d", numberLookups, timeToUpdate, (Int)TheGameClient->getDrawableIDCounter() ) );
 
 
 			QueryPerformanceCounter((LARGE_INTEGER *)&startTime64);
@@ -5150,7 +5527,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 			timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
 
-			TheInGameUI->message( UnicodeString(L"Time to run %d DrawableID lookups is %f.  Next index is %d."), numberLookups, timeToUpdate, (Int)TheGameClient->getDrawableIDCounter() );
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugDrawableIdPerformance",
+				L"Time to run %d DrawableID lookups is %f. Next index is %d", numberLookups, timeToUpdate, (Int)TheGameClient->getDrawableIDCounter() ) );
 
 			break;
 		}
@@ -5158,11 +5536,11 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		//--------------------------------------------------------------------------- END DEMO MESSAGES
 		//--------------------------------------------------------------------------- END DEMO MESSAGES
 		//--------------------------------------------------------------------------- END DEMO MESSAGES
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		//------------------------------------------------------------------------DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) 
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_TOGGLE_AUDIODEBUG:
 		{
 			if (TheDisplay->getDebugDisplayCallback() == AudioDebugDisplay)
@@ -5173,25 +5551,27 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			break;
 		}
 
-#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG) 
-		
+#endif//defined(RTS_DEBUG)
+
 #ifdef DUMP_PERF_STATS
 		//------------------------------------------------------------------------DEMO MESSAGES
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_PERFORM_STATISTICAL_DUMP:
 			//Dump performance statistics for this frame.
 			TheWritableGlobalData->m_dumpPerformanceStatistics = TRUE;
-			TheInGameUI->message( UnicodeString( L"Statistics dump made on frame: %d" ), TheGameLogic->getFrame() );
+
+			TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:DebugPerformStatisticalDump",
+				L"Statistics dump made on frame: %d", TheGameLogic->getFrame() ) );
 			break;
 #endif // DUMP_PERF_STATS
 
 
-	}  // end switch( msg->type )
-	
+	}
+
 
 	return disp;
 
-}  // end CommandTranslator
+}
 
 static Bool isSystemMessage( const GameMessage *msg )
 {
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp
index 8ca58a23fc9..2479b0d89e7 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/GUICommandTranslator.cpp
@@ -30,7 +30,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/GameCommon.h"
@@ -47,14 +47,9 @@
 #include "GameClient/GUICommandTranslator.h"
 #include "GameClient/CommandXlat.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
-static enum CommandStatus
+enum CommandStatus
 {
 	COMMAND_INCOMPLETE = 0,
 	COMMAND_COMPLETE
@@ -92,7 +87,7 @@ static Object *validUnderCursor( const ICoord2D *mouse, const CommandButton *com
 	Object *pickObj = NULL;
 
 	// pick a drawable at the mouse location
-	Drawable *pick = TheTacticalView->pickDrawable( mouse, FALSE, pickType );																																				 
+	Drawable *pick = TheTacticalView->pickDrawable( mouse, FALSE, pickType );
 
 	// only continue if there is something there
 	if( pick && pick->getObject() )
@@ -103,20 +98,20 @@ static Object *validUnderCursor( const ICoord2D *mouse, const CommandButton *com
 		pickObj = pick->getObject();
 
 		if (!command->isValidObjectTarget(player, pickObj))
-				pickObj = NULL;		
+				pickObj = NULL;
 
-	}  // end if
+	}
 
 
 	return pickObj;
 
-}  // end validUnderCursor
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 static CommandStatus doFireWeaponCommand( const CommandButton *command, const ICoord2D *mouse )
 {
-	
+
 	// sanity
 	if( command == NULL || mouse == NULL )
 		return COMMAND_COMPLETE;
@@ -129,7 +124,7 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC
 	if( TheInGameUI->getSelectCount() == 1 )
 	{
 		Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
-		
+
 		// sanity
 		if( draw == NULL || draw->getObject() == NULL )
 			return COMMAND_COMPLETE;
@@ -137,7 +132,7 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC
 		// get object id
 		sourceID = draw->getObject()->getID();
 
-	}  // end if
+	}
 
 	// create message and send to the logic
 	GameMessage *msg;
@@ -147,8 +142,8 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC
 
 		// translate the mouse location into world coords
 		TheTacticalView->screenToTerrain( mouse, &world );
-			
-		// create the message and append arguments	
+
+		// create the message and append arguments
 		msg = TheMessageStream->appendMessage( GameMessage::MSG_DO_WEAPON_AT_LOCATION );
 		msg->appendIntegerArgument( command->getWeaponSlot() );
 		msg->appendLocationArgument( world );
@@ -160,7 +155,7 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC
 		msg->appendObjectIDArgument( targetID );
 
 
-	}  // end if
+	}
 	else if( BitIsSet( command->getOptions(), COMMAND_OPTION_NEED_OBJECT_TARGET ) )
 	{
 
@@ -185,9 +180,9 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC
 			msg->appendObjectIDArgument( target->getID() );
 			msg->appendIntegerArgument( command->getMaxShotsToFire() );
 
-		}  // end if
+		}
 
-	}  // end else
+	}
 	else
 	{
 		msg = TheMessageStream->appendMessage( GameMessage::MSG_DO_WEAPON );
@@ -196,15 +191,15 @@ static CommandStatus doFireWeaponCommand( const CommandButton *command, const IC
 
 		//This could be legit now -- think of firing a self destruct weapon
 		//-----------------------------------------------------------------
-		//DEBUG_ASSERTCRASH( 0, ("doFireWeaponCommand: Command options say it doesn't need additional user input '%s'\n", 
+		//DEBUG_ASSERTCRASH( 0, ("doFireWeaponCommand: Command options say it doesn't need additional user input '%s'",
 		//											command->m_name.str()) );
 		//return COMMAND_COMPLETE;
 
-	}  // end else
+	}
 
 	return COMMAND_COMPLETE;
 
-}  // end fire weapon
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -247,8 +242,8 @@ static CommandStatus doGuardCommand( const CommandButton *command, GuardMode gua
 				return COMMAND_COMPLETE;
 			world = *draw->getObject()->getPosition();
 		}
-			
-		// create the message and append arguments	
+
+		// create the message and append arguments
 		msg = TheMessageStream->appendMessage( GameMessage::MSG_DO_GUARD_POSITION );
 		msg->appendLocationArgument(world);
 		msg->appendIntegerArgument(guardMode);
@@ -274,7 +269,7 @@ static CommandStatus doAttackMoveCommand( const CommandButton *command, const IC
 	// so we must be sure there is only one thing selected (that thing we will set the point on)
 	//
 	Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
-	DEBUG_ASSERTCRASH( draw, ("doAttackMoveCommand: No selected object(s)\n") );
+	DEBUG_ASSERTCRASH( draw, ("doAttackMoveCommand: No selected object(s)") );
 
 	// sanity
 	if( draw == NULL || draw->getObject() == NULL )
@@ -313,7 +308,7 @@ static CommandStatus doSetRallyPointCommand( const CommandButton *command, const
 	DEBUG_ASSERTCRASH( TheInGameUI->getSelectCount() == 1,
 										 ("doSetRallyPointCommand: The selected count is not 1, we can only set a rally point on a *SINGLE* building\n") );
 	Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
-	DEBUG_ASSERTCRASH( draw, ("doSetRallyPointCommand: No selected object\n") );
+	DEBUG_ASSERTCRASH( draw, ("doSetRallyPointCommand: No selected object") );
 
 	// sanity
 	if( draw == NULL || draw->getObject() == NULL )
@@ -330,7 +325,7 @@ static CommandStatus doSetRallyPointCommand( const CommandButton *command, const
 
 	return COMMAND_COMPLETE;
 
-}  // end doSetRallyPointCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Do the beacon placement command */
@@ -352,7 +347,7 @@ static CommandStatus doPlaceBeacon( const CommandButton *command, const ICoord2D
 
 	return COMMAND_COMPLETE;
 
-}  // end doPlaceBeacon
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -383,7 +378,7 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 
 			break;
 
-		}  // end left mouse down
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_MOUSE_LEFT_DOUBLE_CLICK:
@@ -402,15 +397,15 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 					case GUI_COMMAND_FIRE_WEAPON:
 					{
 						commandStatus = doFireWeaponCommand( command, &mouse );
-						
+
 						PickAndPlayInfo info;
 						WeaponSlotType slot = command->getWeaponSlot();
 						info.m_weaponSlot = &slot;
-						
+
 	 					pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_DO_WEAPON_AT_LOCATION, &info );
 						break;
 
-					}  // end fire weapon command
+					}
 
 
 					//---------------------------------------------------------------------------------------
@@ -423,7 +418,7 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 
 							GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_EVACUATE);
 							msg->appendLocationArgument(worldPos);
-							
+
 							pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_EVACUATE );
 
 							commandStatus = COMMAND_COMPLETE;
@@ -461,7 +456,7 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 						return KEEP_MESSAGE;
 						break;
 
-					}  // end special power
+					}
 
 					case GUI_COMMAND_ATTACK_MOVE:
 					{
@@ -475,7 +470,7 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 						commandStatus = doSetRallyPointCommand( command, &mouse );
 						break;
 
-					}  // end set rally point
+					}
 
 					//---------------------------------------------------------------------------------------
 					case GUICOMMANDMODE_PLACE_BEACON:
@@ -483,9 +478,9 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 						commandStatus = doPlaceBeacon( command, &mouse );
 						break;
 
-					}  // end set rally point
+					}
 
-				}  // end switch
+				}
 
 				// used the input
 				disp = DESTROY_MESSAGE;
@@ -496,22 +491,22 @@ GameMessageDisposition GUICommandTranslator::translateGameMessage(const GameMess
 					TheInGameUI->setPreventLeftClickDeselectionInAlternateMouseModeForOneClick( TRUE );
 					TheInGameUI->setGUICommand( NULL );
 				}
-			}  // end if
+			}
 
 			break;
 
-		}  // end left mouse up
+		}
 
-	}  // end switch 
+	}
 
 	// If we're destroying the message, it means we used it. Therefore, destroy the current
 	// attack move instruction as well.
-	if (disp == DESTROY_MESSAGE) 
+	if (disp == DESTROY_MESSAGE)
 		TheInGameUI->clearAttackMoveToMode();
 
 
 	return disp;
 
-}  // end translateMessage
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HintSpy.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HintSpy.cpp
index 331fdfa6bda..14e4269627e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HintSpy.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HintSpy.cpp
@@ -23,11 +23,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // HintSpy.cpp
-// The HintSpy sits on the message stream and watches for certain messages, 
+// The HintSpy sits on the message stream and watches for certain messages,
 // for which it then generates visual "hints".
 // Author: Michael S. Booth, March 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/MessageStream.h"
 #include "GameClient/HintSpy.h"
@@ -64,9 +64,6 @@ GameMessageDisposition HintSpyTranslator::translateGameMessage(const GameMessage
 
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_DEFECTOR_HINT:
-
-			disp = DESTROY_MESSAGE; //hint no longer needed by anyone.  Eat it.
-
 		case GameMessage::MSG_DO_MOVETO_HINT:
 		case GameMessage::MSG_DO_ATTACKMOVETO_HINT:
 		case GameMessage::MSG_DO_ATTACK_OBJECT_HINT:
@@ -135,6 +132,6 @@ GameMessageDisposition HintSpyTranslator::translateGameMessage(const GameMessage
 			TheInGameUI->createGarrisonHint( msg );
 			break;
 
-	}	
+	}
 	return disp;
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp
index ea4090a7756..9e8ffd3a1c6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp
@@ -24,12 +24,12 @@
 
 // FILE: HotKey.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Sep 2002
@@ -37,8 +37,8 @@
 //	Filename: 	HotKey.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,7 +46,7 @@
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -74,7 +74,7 @@ GameMessageDisposition HotKeyTranslator::translateGameMessage(const GameMessage
 
 	if ( t == GameMessage::MSG_RAW_KEY_UP)
 	{
-		
+
 		//char key = msg->getArgument(0)->integer;
 		Int keyState = msg->getArgument(1)->integer;
 
@@ -98,7 +98,7 @@ GameMessageDisposition HotKeyTranslator::translateGameMessage(const GameMessage
 		}
 		if(newModState != 0)
 			return disp;
-		WideChar key = TheKeyboard->getPrintableKey(msg->getArgument(0)->integer, 0);
+		WideChar key = TheKeyboard->getPrintableKey((KeyDefType)msg->getArgument(0)->integer, 0);
 		UnicodeString uKey;
 		uKey.concat(key);
 		AsciiString aKey;
@@ -113,10 +113,7 @@ GameMessageDisposition HotKeyTranslator::translateGameMessage(const GameMessage
 HotKey::HotKey()
 {
 	m_win = NULL;
-	//Added By Sadullah Nader
-	//Initializations missing and needed
 	m_key.clear();
-	//
 }
 
 //-----------------------------------------------------------------------------
@@ -130,7 +127,7 @@ HotKeyManager::~HotKeyManager( void )
 {
 	m_hotKeyMap.clear();
 }
-	
+
 //-----------------------------------------------------------------------------
 void HotKeyManager::init( void )
 {
@@ -176,14 +173,14 @@ Bool HotKeyManager::executeHotKey( const AsciiString& keyIn )
 		if( BitIsSet( win->winGetStatus(), WIN_STATUS_ENABLED ) )
  		{
  			TheWindowManager->winSendSystemMsg( win->winGetParent(), GBM_SELECTED, (WindowMsgData)win, win->winGetWindowId() );
- 
+
  			// here we make the same click sound that the GUI uses when you click a button
  			AudioEventRTS buttonClick("GUIClick");
- 
+
  			if( TheAudio )
  			{
  				TheAudio->addAudioEvent( &buttonClick );
- 			}  // end if
+ 			}
 			return TRUE;
  		}
 
@@ -222,7 +219,7 @@ AsciiString HotKeyManager::searchHotKey( const UnicodeString& uStr )
 		}
 		marker++;
 	}
-	return AsciiString::TheEmptyString;	
+	return AsciiString::TheEmptyString;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
index 4259d3f53b7..6168f28233a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
@@ -26,14 +26,17 @@
 // Translate raw input events into camera movement commands
 // Author: Michael S. Booth, April 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/FramePacer.h"
 #include "Common/GameType.h"
+#include "Common/GameEngine.h"
 #include "Common/MessageStream.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Recorder.h"
 #include "Common/StatsCollector.h"
+#include "Common/UserPreferences.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/PartitionManager.h"
 #include "GameClient/Display.h"
@@ -52,7 +55,7 @@
 
 LookAtTranslator *TheLookAtTranslator = NULL;
 
-static enum
+enum
 {
 	DIR_UP = 0,
 	DIR_DOWN,
@@ -62,14 +65,24 @@ static enum
 
 static Bool scrollDir[4] = { false, false, false, false };
 
-Int SCROLL_AMT = 100;
+// TheSuperHackers @tweak Introduces the SCROLL_MULTIPLIER for all scrolling to
+//
+//  1. bring the RMB scroll speed back to how it was at 30 FPS in the retail game version
+//  2. increase the upper limit of the Scroll Factor when set from the Options Menu (0.20 to 2.90 instead of 0.10 to 1.45)
+//  3. increase the scroll speed for Edge/Key scrolling to better fit the high speeds of RMB scrolling
+//
+// The multiplier of 2 was logically chosen because originally the Scroll Factor did practically not affect the RMB scroll speed
+// and because the default Scroll Factor is/was 0.5, it needs to be doubled to get to a neutral 1x multiplier.
+
+constexpr const Real SCROLL_MULTIPLIER = 2.0f;
+constexpr const Real SCROLL_AMT = 100.0f * SCROLL_MULTIPLIER;
 
 static const Int edgeScrollSize = 3;
 
 static Mouse::MouseCursor prevCursor = Mouse::ARROW;
 
 //-----------------------------------------------------------------------------
-void LookAtTranslator::setScrolling(Int x)
+void LookAtTranslator::setScrolling(ScrollType scrollType)
 {
 	if (!TheInGameUI->getInputEnabled())
 		return;
@@ -78,7 +91,7 @@ void LookAtTranslator::setScrolling(Int x)
 	m_isScrolling = true;
 	TheInGameUI->setScrolling( TRUE );
 	TheTacticalView->setMouseLock( TRUE );
-	m_scrollType = x;
+	m_scrollType = scrollType;
 	if(TheStatsCollector)
 		TheStatsCollector->startScrollTime();
 }
@@ -91,30 +104,50 @@ void LookAtTranslator::stopScrolling( void )
 	TheTacticalView->setMouseLock( FALSE );
 	TheMouse->setCursor(prevCursor);
 	m_scrollType = SCROLL_NONE;
-		
-	// if we have a stats collectore increment the stats
+
+	// increment the stats if we have a stats collector
 	if(TheStatsCollector)
 		TheStatsCollector->endScrollTime();
 
 }
 
+//-----------------------------------------------------------------------------
+Bool LookAtTranslator::canScrollAtScreenEdge() const
+{
+	if (!TheMouse->isCursorCaptured())
+		return false;
+
+	if (TheDisplay->getWindowed())
+	{
+		if ((m_screenEdgeScrollMode & ScreenEdgeScrollMode_EnabledInWindowedApp) == 0)
+			return false;
+	}
+	else
+	{
+		if ((m_screenEdgeScrollMode & ScreenEdgeScrollMode_EnabledInFullscreenApp) == 0)
+			return false;
+	}
+
+	return true;
+}
+
 //-----------------------------------------------------------------------------
 LookAtTranslator::LookAtTranslator() :
 	m_isScrolling(false),
 	m_isRotating(false),
 	m_isPitching(false),
 	m_isChangingFOV(false),
-	m_timestamp(0),
+	m_middleButtonDownTimeMsec(0),
 	m_lastPlaneID(INVALID_DRAWABLE_ID),
-	m_lastMouseMoveFrame(0),
+	m_lastMouseMoveTimeMsec(0),
 	m_scrollType(SCROLL_NONE)
 {
-	//Added By Sadullah Nader
-	//Initializations misssing and needed
 	m_anchor.x = m_anchor.y = 0;
 	m_currentPos.x = m_currentPos.y = 0;
 	m_originalAnchor.x = m_originalAnchor.y = 0;
-	//
+
+	OptionPreferences prefs;
+	m_screenEdgeScrollMode = prefs.getScreenEdgeScrollMode();
 
 	DEBUG_ASSERTCRASH(!TheLookAtTranslator, ("Already have a LookAtTranslator - why do you need two?"));
 	TheLookAtTranslator = this;
@@ -138,13 +171,12 @@ const ICoord2D* LookAtTranslator::getRMBScrollAnchor(void)
 
 Bool LookAtTranslator::hasMouseMovedRecently( void )
 {
-	if (m_lastMouseMoveFrame > TheGameLogic->getFrame())
-		m_lastMouseMoveFrame = 0; // reset for new game
+	const UnsignedInt now = timeGetTime();
+	const UnsignedInt lastMove = m_lastMouseMoveTimeMsec;
 
-	if (m_lastMouseMoveFrame + LOGICFRAMES_PER_SECOND < TheGameLogic->getFrame())
-		return false;
+	const UnsignedInt elapsedMsec = now - lastMove;
 
-	return true;
+	return elapsedMsec <= MSEC_PER_SECOND;
 }
 
 void LookAtTranslator::setCurrentPos( const ICoord2D& pos )
@@ -152,6 +184,11 @@ void LookAtTranslator::setCurrentPos( const ICoord2D& pos )
 	m_currentPos = pos;
 }
 
+void LookAtTranslator::setScreenEdgeScrollMode(ScreenEdgeScrollMode mode)
+{
+	m_screenEdgeScrollMode = mode;
+}
+
 //-----------------------------------------------------------------------------
 /**
  * The LookAt Translator is responsible for camera movements. It is directly responsible for
@@ -173,7 +210,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			UnsignedByte key		= msg->getArgument( 0 )->integer;
 			UnsignedByte state	= msg->getArgument( 1 )->integer;
 			Bool isPressed = !(BitIsSet( state, KEY_STATE_UP ));
-			
+
 			if (TheShell && TheShell->isShellActive())
 				break;
 
@@ -218,7 +255,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN:
 		{
-			m_lastMouseMoveFrame = TheGameLogic->getFrame();
+			m_lastMouseMoveTimeMsec = timeGetTime();
 
 			m_anchor = msg->getArgument( 0 )->pixel;
 			m_currentPos = msg->getArgument( 0 )->pixel;
@@ -233,7 +270,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP:
 		{
-			m_lastMouseMoveFrame = TheGameLogic->getFrame();
+			m_lastMouseMoveTimeMsec = timeGetTime();
 
 			if (m_scrollType == SCROLL_RMB)
 			{
@@ -245,22 +282,25 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN:
 		{
-			m_lastMouseMoveFrame = TheGameLogic->getFrame();
+			const UnsignedInt now = timeGetTime();
+			m_lastMouseMoveTimeMsec = now;
+			m_middleButtonDownTimeMsec = now;
 
 			m_isRotating = true;
 			m_anchor = msg->getArgument( 0 )->pixel;
+			m_anchorAngle = TheTacticalView->getAngle();
 			m_originalAnchor = msg->getArgument( 0 )->pixel;
 			m_currentPos = msg->getArgument( 0 )->pixel;
-			m_timestamp = TheGameClient->getFrame();
 			break;
 		}
 
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_UP:
 		{
-			m_lastMouseMoveFrame = TheGameLogic->getFrame();
+			const UnsignedInt now = timeGetTime();
+			m_lastMouseMoveTimeMsec = now;
 
-			const UnsignedInt CLICK_DURATION = 5;
+			const UnsignedInt CLICK_DURATION_MSEC = 167;
 			const UnsignedInt PIXEL_OFFSET = 5;
 
 			m_isRotating = false;
@@ -268,8 +308,11 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			if (dx<0) dx = -dx;
 			Int dy = m_currentPos.y-m_originalAnchor.y;
 			Bool didMove = dx>PIXEL_OFFSET || dy>PIXEL_OFFSET;
+
+			const UnsignedInt elapsedMsec = now - m_middleButtonDownTimeMsec;
+
 			// if middle button is "clicked", reset to "home" orientation
-			if (!didMove && TheGameClient->getFrame() - m_timestamp < CLICK_DURATION)
+			if (!didMove && elapsedMsec < CLICK_DURATION_MSEC)
 			{
 				TheTacticalView->setAngleAndPitchToDefault();
 				TheTacticalView->setZoomToDefault();
@@ -282,10 +325,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_RAW_MOUSE_POSITION:
 		{
 			if (m_currentPos.x != msg->getArgument( 0 )->pixel.x || m_currentPos.y != msg->getArgument( 0 )->pixel.y)
-				m_lastMouseMoveFrame = TheGameLogic->getFrame();
+				m_lastMouseMoveTimeMsec = timeGetTime();
 
 			m_currentPos = msg->getArgument( 0 )->pixel;
-			
+
 			UnsignedInt height = TheDisplay->getHeight();
 			UnsignedInt width  = TheDisplay->getWidth();
 
@@ -296,7 +339,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 				break;
 			}
 
-			if (!TheGlobalData->m_windowed)
+			if (canScrollAtScreenEdge())
 			{
 				if (m_isScrolling)
 				{
@@ -318,10 +361,18 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			if (m_isRotating)
 			{
 				const Real FACTOR = 0.01f;
+				const Real angle = FACTOR * (m_currentPos.x - m_originalAnchor.x);
+				Real targetAngle = m_anchorAngle + angle;
 
-				Real angle = FACTOR * (m_currentPos.x - m_anchor.x);
+				// TheSuperHackers @tweak Stubbjax 13/11/2025 Snap angle to nearest 45 degrees
+				// while using force attack mode for convenience.
+				if (TheInGameUI->isInForceAttackMode())
+				{
+					const Real snapRadians = DEG_TO_RADF(45);
+					targetAngle = WWMath::Round(targetAngle / snapRadians) * snapRadians;
+				}
 
-				TheTacticalView->setAngle( TheTacticalView->getAngle() + angle );
+				TheTacticalView->setAngle(targetAngle);
 				m_anchor = msg->getArgument( 0 )->pixel;
 			}
 
@@ -336,7 +387,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 				m_anchor = msg->getArgument( 0 )->pixel;
 			}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 			// adjust the field of view
 			if (m_isChangingFOV)
 			{
@@ -354,28 +405,30 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_WHEEL:
 		{
-			m_lastMouseMoveFrame = TheGameLogic->getFrame();
+			m_lastMouseMoveTimeMsec = timeGetTime();
 
 			Int spin = msg->getArgument( 1 )->integer;
 
 			if (spin > 0)
 			{
 				for ( ; spin > 0; spin--)
-					TheTacticalView->zoomIn();
+					TheTacticalView->zoom( -View::ZoomHeightPerSecond );
 			}
 			else
 			{
 				for ( ;spin < 0; spin++ )
-					TheTacticalView->zoomOut();
+					TheTacticalView->zoom( +View::ZoomHeightPerSecond );
 			}
+
+			break;
 		}
-		
+
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_META_OPTIONS:
 		{
 			// stop the scrolling
 			stopScrolling();
-			// let the message drop through, cause we need to process this message for 
+			// let the message drop through, cause we need to process this message for
 			// selection as well.
 			break;
 		}
@@ -395,6 +448,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			// scroll the view
 			if (m_isScrolling)
 			{
+
+				// TheSuperHackers @bugfix Mauller 07/06/2025 The camera scrolling is now decoupled from the render update.
+				const Real fpsRatio = TheFramePacer->getBaseOverUpdateFpsRatio();
+
 				switch (m_scrollType)
 				{
 				case SCROLL_RMB:
@@ -415,34 +472,34 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 								m_anchor.y = m_currentPos.y - maxY;
 						}
 
-						offset.x = TheGlobalData->m_horizontalScrollSpeedFactor * (m_currentPos.x - m_anchor.x);
-						offset.y = TheGlobalData->m_verticalScrollSpeedFactor * (m_currentPos.y - m_anchor.y);
+						// TheSuperHackers @fix Mauller 16/06/2025 fix RMB scrolling to allow it to scale with the user adjusted scroll factor
 						Coord2D vec;
-						vec.x = offset.x;
-						vec.y = offset.y;
+						vec.x = (m_currentPos.x - m_anchor.x);
+						vec.y = (m_currentPos.y - m_anchor.y);
+						// TheSuperHackers @info calculate the length of the vector to obtain the movement speed before the vector is normalized
+						float vecLength = vec.length();
 						vec.normalize();
-						// Add in the window scroll amount as the minimum.
-						offset.x += TheGlobalData->m_horizontalScrollSpeedFactor * vec.x * sqr(TheGlobalData->m_keyboardScrollFactor);
-						offset.y += TheGlobalData->m_verticalScrollSpeedFactor * vec.y * sqr(TheGlobalData->m_keyboardScrollFactor);
+						offset.x = TheGlobalData->m_horizontalScrollSpeedFactor * fpsRatio * vecLength * vec.x * SCROLL_MULTIPLIER * TheGlobalData->m_keyboardScrollFactor;
+						offset.y = TheGlobalData->m_verticalScrollSpeedFactor * fpsRatio * vecLength * vec.y * SCROLL_MULTIPLIER * TheGlobalData->m_keyboardScrollFactor;
 					}
 					break;
 				case SCROLL_KEY:
 					{
 						if (scrollDir[DIR_UP])
 						{
-							offset.y -= TheGlobalData->m_verticalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.y -= TheGlobalData->m_verticalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 						if (scrollDir[DIR_DOWN])
 						{
-							offset.y += TheGlobalData->m_verticalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.y += TheGlobalData->m_verticalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 						if (scrollDir[DIR_LEFT])
 						{
-							offset.x -= TheGlobalData->m_horizontalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.x -= TheGlobalData->m_horizontalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 						if (scrollDir[DIR_RIGHT])
 						{
-							offset.x += TheGlobalData->m_horizontalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.x += TheGlobalData->m_horizontalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 					}
 					break;
@@ -452,19 +509,19 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 						UnsignedInt width  = TheDisplay->getWidth();
 						if (m_currentPos.y < edgeScrollSize)
 						{
-							offset.y -= TheGlobalData->m_verticalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.y -= TheGlobalData->m_verticalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 						if (m_currentPos.y >= height-edgeScrollSize)
 						{
-							offset.y += TheGlobalData->m_verticalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.y += TheGlobalData->m_verticalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 						if (m_currentPos.x < edgeScrollSize)
 						{
-							offset.x -= TheGlobalData->m_horizontalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.x -= TheGlobalData->m_horizontalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 						if (m_currentPos.x >= width-edgeScrollSize)
 						{
-							offset.x += TheGlobalData->m_horizontalScrollSpeedFactor * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
+							offset.x += TheGlobalData->m_horizontalScrollSpeedFactor * fpsRatio * SCROLL_AMT * TheGlobalData->m_keyboardScrollFactor;
 						}
 					}
 					break;
@@ -494,7 +551,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		}
 
 		// ------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_BEGIN_ADJUST_PITCH:
 		{
 			DEBUG_ASSERTCRASH(!m_isPitching, ("hmm, mismatched m_isPitching"));
@@ -502,10 +559,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		// ------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_END_ADJUST_PITCH:
 		{
 			DEBUG_ASSERTCRASH(m_isPitching, ("hmm, mismatched m_isPitching"));
@@ -513,20 +570,20 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		// ------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_DESHROUD:
 		{
 			ThePartitionManager->revealMapForPlayerPermanently( ThePlayerList->getLocalPlayer()->getPlayerIndex() );
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		// ------------------------------------------------------------------------
 #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
-		case GameMessage::MSG_CHEAT_DESHROUD: 
+		case GameMessage::MSG_CHEAT_DESHROUD:
 		{
 			if (!TheGameLogic->isInMultiplayerGame())
 			{
@@ -537,7 +594,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 #endif // #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 
 		// ------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_ENSHROUD:
 		{
 			// Need to first undo the permanent Look laid down by DEMO_DESHROUD, then blast a shroud dollop.
@@ -545,10 +602,10 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			ThePartitionManager->shroudMapForPlayer( ThePlayerList->getLocalPlayer()->getPlayerIndex() );
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		// ------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_BEGIN_ADJUST_FOV:
 		{
 			//DEBUG_ASSERTCRASH(!m_isChangingFOV, ("hmm, mismatched m_isChangingFOV"));
@@ -556,17 +613,17 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			m_anchor = m_currentPos;
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		// ------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_END_ADJUST_FOV:
 		{
 		//	DEBUG_ASSERTCRASH(m_isChangingFOV, ("hmm, mismatched m_isChangingFOV"));
 			m_isChangingFOV = false;
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_SAVE_VIEW1:
@@ -610,7 +667,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		}
 
 		//-----------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		case GameMessage::MSG_META_DEMO_LOCK_CAMERA_TO_PLANES:
 		{
 			Drawable *first = NULL;
@@ -660,24 +717,24 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 							done = true;
 							break;
 						}
-					} // if airborne found
+					}
 
 					// if we're back to the first, quit
 					if (d == first)
 						break;
-				} // while
-			}	// end plane lock
+				}
+			}
 
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-#endif // #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // #if defined(RTS_DEBUG)
 
-	}  // end switch
+	}
 
 	return disp;
 
-}  // end LookAtTranslator
+}
 
 void LookAtTranslator::resetModes()
 {
@@ -685,4 +742,4 @@ void LookAtTranslator::resetModes()
 	m_isRotating = FALSE;
 	m_isPitching = FALSE;
 	m_isChangingFOV = FALSE;
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
index f4be3f08d23..7c347eff727 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
@@ -28,8 +28,9 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/GameUtility.h"
 #include "Common/INI.h"
 #include "Common/MessageStream.h"
 #include "Common/Player.h"
@@ -62,11 +63,6 @@
 
 MetaMap *TheMetaMap = NULL;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -75,7 +71,7 @@ MetaMap *TheMetaMap = NULL;
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 
-static const LookupListRec GameMessageMetaTypeNames[] = 
+static const LookupListRec GameMessageMetaTypeNames[] =
 {
 	{ "SAVE_VIEW1",																GameMessage::MSG_META_SAVE_VIEW1 },
 	{ "SAVE_VIEW2",																GameMessage::MSG_META_SAVE_VIEW2 },
@@ -138,6 +134,7 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "SELECT_PREV_UNIT",													GameMessage::MSG_META_SELECT_PREV_UNIT },
 	{ "SELECT_NEXT_WORKER",												GameMessage::MSG_META_SELECT_NEXT_WORKER },
 	{ "SELECT_PREV_WORKER",												GameMessage::MSG_META_SELECT_PREV_WORKER },
+	{ "SELECT_NEXT_IDLE_WORKER",											    GameMessage::MSG_META_SELECT_NEXT_IDLE_WORKER },
 	{ "SELECT_HERO",												      GameMessage::MSG_META_SELECT_HERO },
 	{ "SELECT_ALL",																GameMessage::MSG_META_SELECT_ALL },
 	{ "SELECT_ALL_AIRCRAFT",											GameMessage::MSG_META_SELECT_ALL_AIRCRAFT },
@@ -155,8 +152,13 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "PLACE_BEACON",															GameMessage::MSG_META_PLACE_BEACON },
 	{ "DELETE_BEACON",														GameMessage::MSG_META_REMOVE_BEACON },
 	{ "OPTIONS",																	GameMessage::MSG_META_OPTIONS },
+	{ "INCREASE_MAX_RENDER_FPS",									GameMessage::MSG_META_INCREASE_MAX_RENDER_FPS },
+	{ "DECREASE_MAX_RENDER_FPS",									GameMessage::MSG_META_DECREASE_MAX_RENDER_FPS },
+	{ "INCREASE_LOGIC_TIME_SCALE",								GameMessage::MSG_META_INCREASE_LOGIC_TIME_SCALE },
+	{ "DECREASE_LOGIC_TIME_SCALE",								GameMessage::MSG_META_DECREASE_LOGIC_TIME_SCALE },
 	{ "TOGGLE_LOWER_DETAILS",											GameMessage::MSG_META_TOGGLE_LOWER_DETAILS },
 	{ "TOGGLE_CONTROL_BAR",												GameMessage::MSG_META_TOGGLE_CONTROL_BAR },
+	{ "TOGGLE_PLAYER_OBSERVER",										GameMessage::MSG_META_TOGGLE_PLAYER_OBSERVER },
 	{ "BEGIN_PATH_BUILD",													GameMessage::MSG_META_BEGIN_PATH_BUILD },
 	{ "END_PATH_BUILD",														GameMessage::MSG_META_END_PATH_BUILD },
 	{ "BEGIN_FORCEATTACK",												GameMessage::MSG_META_BEGIN_FORCEATTACK },
@@ -183,34 +185,36 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "TOGGLE_CAMERA_TRACKING_DRAWABLE",					GameMessage::MSG_META_TOGGLE_CAMERA_TRACKING_DRAWABLE },
 	{ "TOGGLE_FAST_FORWARD_REPLAY",								GameMessage::MSG_META_TOGGLE_FAST_FORWARD_REPLAY },
 	{ "TOGGLE_PAUSE",															GameMessage::MSG_META_TOGGLE_PAUSE },
+	{ "TOGGLE_PAUSE_ALT",													GameMessage::MSG_META_TOGGLE_PAUSE_ALT },
 	{ "STEP_FRAME",																GameMessage::MSG_META_STEP_FRAME },
-  	{ "DEMO_INSTANT_QUIT",												GameMessage::MSG_META_DEMO_INSTANT_QUIT },
+	{ "STEP_FRAME_ALT",														GameMessage::MSG_META_STEP_FRAME_ALT },
+	{ "DEMO_INSTANT_QUIT",												GameMessage::MSG_META_DEMO_INSTANT_QUIT },
 
 #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h
-	{ "CHEAT_RUNSCRIPT1",								        	GameMessage::MSG_CHEAT_RUNSCRIPT1 },																	
-	{ "CHEAT_RUNSCRIPT2",								        	GameMessage::MSG_CHEAT_RUNSCRIPT2 },																	
-	{ "CHEAT_RUNSCRIPT3",								        	GameMessage::MSG_CHEAT_RUNSCRIPT3 },																	
-	{ "CHEAT_RUNSCRIPT4",								        	GameMessage::MSG_CHEAT_RUNSCRIPT4 },																	
-	{ "CHEAT_RUNSCRIPT5",								        	GameMessage::MSG_CHEAT_RUNSCRIPT5 },																	
-	{ "CHEAT_RUNSCRIPT6",								        	GameMessage::MSG_CHEAT_RUNSCRIPT6 },																	
-	{ "CHEAT_RUNSCRIPT7",								        	GameMessage::MSG_CHEAT_RUNSCRIPT7 },																	
-	{ "CHEAT_RUNSCRIPT8",								        	GameMessage::MSG_CHEAT_RUNSCRIPT8 },																	
-	{ "CHEAT_RUNSCRIPT9",								        	GameMessage::MSG_CHEAT_RUNSCRIPT9 },																	
-	{ "CHEAT_TOGGLE_SPECIAL_POWER_DELAYS",	      GameMessage::MSG_CHEAT_TOGGLE_SPECIAL_POWER_DELAYS },	
-  { "CHEAT_SWITCH_TEAMS",							        	GameMessage::MSG_CHEAT_SWITCH_TEAMS },															
-	{ "CHEAT_KILL_SELECTION",						        	GameMessage::MSG_CHEAT_KILL_SELECTION },													
-	{ "CHEAT_TOGGLE_HAND_OF_GOD_MODE",		        GameMessage::MSG_CHEAT_TOGGLE_HAND_OF_GOD_MODE },					
-	{ "CHEAT_INSTANT_BUILD",							        GameMessage::MSG_CHEAT_INSTANT_BUILD },															
-	{ "CHEAT_DESHROUD",									          GameMessage::MSG_CHEAT_DESHROUD },																			
-	{ "CHEAT_ADD_CASH",									          GameMessage::MSG_CHEAT_ADD_CASH },																			
-	{ "CHEAT_GIVE_ALL_SCIENCES",					        GameMessage::MSG_CHEAT_GIVE_ALL_SCIENCES },											
+	{ "CHEAT_RUNSCRIPT1",								        	GameMessage::MSG_CHEAT_RUNSCRIPT1 },
+	{ "CHEAT_RUNSCRIPT2",								        	GameMessage::MSG_CHEAT_RUNSCRIPT2 },
+	{ "CHEAT_RUNSCRIPT3",								        	GameMessage::MSG_CHEAT_RUNSCRIPT3 },
+	{ "CHEAT_RUNSCRIPT4",								        	GameMessage::MSG_CHEAT_RUNSCRIPT4 },
+	{ "CHEAT_RUNSCRIPT5",								        	GameMessage::MSG_CHEAT_RUNSCRIPT5 },
+	{ "CHEAT_RUNSCRIPT6",								        	GameMessage::MSG_CHEAT_RUNSCRIPT6 },
+	{ "CHEAT_RUNSCRIPT7",								        	GameMessage::MSG_CHEAT_RUNSCRIPT7 },
+	{ "CHEAT_RUNSCRIPT8",								        	GameMessage::MSG_CHEAT_RUNSCRIPT8 },
+	{ "CHEAT_RUNSCRIPT9",								        	GameMessage::MSG_CHEAT_RUNSCRIPT9 },
+	{ "CHEAT_TOGGLE_SPECIAL_POWER_DELAYS",	      GameMessage::MSG_CHEAT_TOGGLE_SPECIAL_POWER_DELAYS },
+  { "CHEAT_SWITCH_TEAMS",							        	GameMessage::MSG_CHEAT_SWITCH_TEAMS },
+	{ "CHEAT_KILL_SELECTION",						        	GameMessage::MSG_CHEAT_KILL_SELECTION },
+	{ "CHEAT_TOGGLE_HAND_OF_GOD_MODE",		        GameMessage::MSG_CHEAT_TOGGLE_HAND_OF_GOD_MODE },
+	{ "CHEAT_INSTANT_BUILD",							        GameMessage::MSG_CHEAT_INSTANT_BUILD },
+	{ "CHEAT_DESHROUD",									          GameMessage::MSG_CHEAT_DESHROUD },
+	{ "CHEAT_ADD_CASH",									          GameMessage::MSG_CHEAT_ADD_CASH },
+	{ "CHEAT_GIVE_ALL_SCIENCES",					        GameMessage::MSG_CHEAT_GIVE_ALL_SCIENCES },
   { "CHEAT_GIVE_SCIENCEPURCHASEPOINTS",        	GameMessage::MSG_CHEAT_GIVE_SCIENCEPURCHASEPOINTS },
   { "CHEAT_SHOW_HEALTH",                        GameMessage::MSG_CHEAT_SHOW_HEALTH },
   { "CHEAT_TOGGLE_MESSAGE_TEXT",                GameMessage::MSG_CHEAT_TOGGLE_MESSAGE_TEXT },
 
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	{ "HELP",																			GameMessage::MSG_META_HELP },
 
 	{ "DEMO_TOGGLE_BEHIND_BUILDINGS",							GameMessage::MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS },
@@ -299,19 +303,19 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "DEMO_TOGGLE_NO_DRAW",											GameMessage::MSG_NO_DRAW },
 	{ "DEMO_CYCLE_LOD_LEVEL",											GameMessage::MSG_META_DEMO_CYCLE_LOD_LEVEL },
 	{ "DEMO_DUMP_ASSETS",													GameMessage::MSG_META_DEBUG_DUMP_ASSETS},
-																								
+
 	{ "DEMO_INSTANT_BUILD",												GameMessage::MSG_META_DEMO_INSTANT_BUILD },
 	{ "DEMO_TOGGLE_CAMERA_DEBUG",									GameMessage::MSG_META_DEMO_TOGGLE_CAMERA_DEBUG },
-																								
-	/// Begin VTUNE																
+
+	/// Begin VTUNE
 	{ "DEMO_VTUNE_ON",														GameMessage::MSG_META_DEBUG_VTUNE_ON },
 	{ "DEMO_VTUNE_OFF",														GameMessage::MSG_META_DEBUG_VTUNE_OFF },
-	/// End VTUNE	
-																	
-																								
-	//lorenzen's feather water										
+	/// End VTUNE
+
+
+	//lorenzen's feather water
 	{ "DEMO_TOGGLE_FEATHER_WATER",								GameMessage::MSG_META_DEBUG_TOGGLE_FEATHER_WATER },
-																								
+
 	{ "DEMO_INCR_ANIM_SKATE_SPEED",								GameMessage::MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED },
 	{ "DEMO_DECR_ANIM_SKATE_SPEED",								GameMessage::MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED },
 	{ "DEMO_CYCLE_EXTENT_TYPE",										GameMessage::MSG_META_DEBUG_CYCLE_EXTENT_TYPE },
@@ -335,36 +339,36 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "DEBUG_OBJECT_ID_PERFORMANCE",							GameMessage::MSG_META_DEBUG_OBJECT_ID_PERFORMANCE },
 	{ "DEBUG_DRAWABLE_ID_PERFORMANCE",						GameMessage::MSG_META_DEBUG_DRAWABLE_ID_PERFORMANCE },
 	{ "DEBUG_SLEEPY_UPDATE_PERFORMANCE",					GameMessage::MSG_META_DEBUG_SLEEPY_UPDATE_PERFORMANCE },
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#endif // defined(RTS_DEBUG)
 
 
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) 
+#if defined(RTS_DEBUG)
 	{ "DEMO_TOGGLE_AUDIODEBUG",										GameMessage::MSG_META_DEMO_TOGGLE_AUDIODEBUG },
-#endif//defined(RTS_INTERNAL) || defined(RTS_DEBUG)
+#endif//defined(RTS_DEBUG)
 #ifdef DUMP_PERF_STATS
 	{ "DEMO_PERFORM_STATISTICAL_DUMP",						GameMessage::MSG_META_DEMO_PERFORM_STATISTICAL_DUMP },
 #endif//DUMP_PERF_STATS
 
 
-	{ NULL, 0	}// keep this last!
+	{ NULL, 0	}
 };
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-static const FieldParse TheMetaMapFieldParseTable[] = 
+static const FieldParse TheMetaMapFieldParseTable[] =
 {
 
-	{ "Key",								INI::parseLookupList,						KeyNames, offsetof( MetaMapRec, m_key ) },	
-	{ "Transition",					INI::parseLookupList,						TransitionNames, offsetof( MetaMapRec, m_transition ) },		
-	{ "Modifiers",					INI::parseLookupList,						ModifierNames, offsetof( MetaMapRec, m_modState ) },		
-	{ "UseableIn",					INI::parseBitString32,					TheCommandUsableInNames, offsetof( MetaMapRec, m_usableIn ) },		
-	{ "Category",						INI::parseLookupList,						CategoryListName, offsetof( MetaMapRec, m_category ) },		
-	{ "Description",				INI::parseAndTranslateLabel,		0, offsetof( MetaMapRec, m_description ) },		
-	{ "DisplayName",				INI::parseAndTranslateLabel,		0, offsetof( MetaMapRec, m_displayName ) },		
-	
-	{ NULL,									NULL,														0, 0 }  // keep this last
+	{ "Key",								INI::parseLookupList,						KeyNames, offsetof( MetaMapRec, m_key ) },
+	{ "Transition",					INI::parseLookupList,						TransitionNames, offsetof( MetaMapRec, m_transition ) },
+	{ "Modifiers",					INI::parseLookupList,						ModifierNames, offsetof( MetaMapRec, m_modState ) },
+	{ "UseableIn",					INI::parseBitString32,					TheCommandUsableInNames, offsetof( MetaMapRec, m_usableIn ) },
+	{ "Category",						INI::parseLookupList,						CategoryListName, offsetof( MetaMapRec, m_category ) },
+	{ "Description",				INI::parseAndTranslateLabel,		0, offsetof( MetaMapRec, m_description ) },
+	{ "DisplayName",				INI::parseAndTranslateLabel,		0, offsetof( MetaMapRec, m_displayName ) },
+
+	{ NULL,									NULL,														0, 0 }
 
 };
 
@@ -373,7 +377,7 @@ static const FieldParse TheMetaMapFieldParseTable[] =
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
-MetaEventTranslator::MetaEventTranslator() : 
+MetaEventTranslator::MetaEventTranslator() :
 	m_lastKeyDown(MK_NONE),
 	m_lastModState(0)
 {
@@ -396,10 +400,39 @@ static const char * findGameMessageNameByType(GameMessage::Type type)
 		if (metaNames->value == (Int)type)
 			return metaNames->name;
 
-	DEBUG_CRASH(("MetaTypeName %d not found -- did you remember to add it to GameMessageMetaTypeNames[] ?\n"));
+	DEBUG_CRASH(("MetaTypeName %d not found -- did you remember to add it to GameMessageMetaTypeNames[] ?", (Int)type));
 	return "???";
 }
 
+//-------------------------------------------------------------------------------------------------
+static Bool isMessageUsable(CommandUsableInType usableIn)
+{
+	// We will ignore all commands if the game client has not yet incremented to frame 1.
+	// It prevents the user from doing commands during a map load, which throws the input
+	// system into whack because there isn't a client frame for the input event, and in
+	// the case of a command that pauses the game, like the quit menu, the client frame
+	// will never get beyond 0 and we lose the ability to process any input.
+	if (TheGameClient->getFrame() == 0)
+		return false;
+
+	const Bool usableInShell = (usableIn & COMMANDUSABLE_SHELL);
+	const Bool usableInGame = (usableIn & COMMANDUSABLE_GAME);
+	const Bool usableAsObserver = (usableIn & COMMANDUSABLE_OBSERVER);
+	const Bool isShellActive = TheShell && TheShell->isShellActive();
+	const Bool isObserving = !ThePlayerList->getLocalPlayer()->isPlayerActive();
+
+	if (usableInShell && isShellActive)
+		return true;
+
+	if (usableInGame && !isShellActive)
+		return true;
+
+	if (usableAsObserver && isObserving)
+		return true;
+
+	return false;
+}
+
 //-------------------------------------------------------------------------------------------------
 GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessage *msg)
 {
@@ -431,37 +464,17 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 		}
 
 
-    for (const MetaMapRec *map = TheMetaMap->getFirstMetaMapRec(); map; map = map->m_next)
+		for (const MetaMapRec *map = TheMetaMap->getFirstMetaMapRec(); map; map = map->m_next)
 		{
-			DEBUG_ASSERTCRASH(map->m_meta > GameMessage::MSG_BEGIN_META_MESSAGES && 
+			DEBUG_ASSERTCRASH(map->m_meta > GameMessage::MSG_BEGIN_META_MESSAGES &&
 				map->m_meta < GameMessage::MSG_END_META_MESSAGES, ("hmm, expected only meta-msgs here"));
-			
-			//
-			// if this command is *only* usable in the game, we will ignore it if the game client
-			// has not yet incremented to frame 1 (keeps us from doing in-game commands during
-			// a map load, which throws the input system into wack because there isn't a
-			// client frame for the input event, and in the case of a command that pauses the
-			// game, like the quit menu, the client frame will never get beyond 0 and we
-			// lose the ability to process any input
-			//
-			if( map->m_usableIn == COMMANDUSABLE_GAME && TheGameClient->getFrame() < 1 )
-				continue;
 
-			// if the shell is active, and this command is not usable in shell, continue
-			if (TheShell && TheShell->isShellActive() && !(map->m_usableIn & COMMANDUSABLE_SHELL) )
+			if (!isMessageUsable(map->m_usableIn))
 				continue;
 
-			// if the shell is not active and this command is not usable in the game, continue			
-			if (TheShell && !TheShell->isShellActive() && !(map->m_usableIn & COMMANDUSABLE_GAME) )
-				continue;
-
-
-
-
-
 			// check for the special case of mods-only-changed.
 			if (
-						map->m_key == MK_NONE && 
+						map->m_key == MK_NONE &&
 						newModState != m_lastModState &&
 						(
 							(map->m_transition == UP && map->m_modState == m_lastModState) ||
@@ -469,7 +482,7 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 						)
 					)
 			{
-				//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() Mods-only change: %s\n", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));
+				//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() Mods-only change: %s", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));
 				/*GameMessage *metaMsg =*/ TheMessageStream->appendMessage(map->m_meta);
 				disp = DESTROY_MESSAGE;
 				break;
@@ -477,21 +490,21 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 
 			// ok, now check for "normal" key transitions.
 			if (
-						map->m_key == key && 
+						map->m_key == key &&
 						map->m_modState == newModState &&
 						(
 							(map->m_transition == UP && (keyState & KEY_STATE_UP)) ||
 							(map->m_transition == DOWN && (keyState & KEY_STATE_DOWN)) //||
 							//(map->m_transition == DOUBLEDOWN && (keyState & KEY_STATE_DOWN) && m_lastKeyDown == key)
 						)
-					)			
+					)
 			{
 
 				if( keyState & KEY_STATE_AUTOREPEAT )
 				{
-					// if it's an autorepeat of a "known" key, don't generate the meta-event, 
+					// if it's an autorepeat of a "known" key, don't generate the meta-event,
 					// but DO eat the keystroke so no one else can mess with it
-					//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() auto-repeat: %s\n", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));
+					//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() auto-repeat: %s", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));
 				}
 				else
 				{
@@ -509,20 +522,23 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
                 TheWritableGlobalData->m_TiVOFastMode = 1 - TheGlobalData->m_TiVOFastMode;
 
               if ( TheInGameUI )
-  				      TheInGameUI->message( TheGlobalData->m_TiVOFastMode ? TheGameText->fetch("GUI:FF_ON") : TheGameText->fetch("GUI:FF_OFF") );
-			      }  
+								TheInGameUI->messageNoFormat( TheGlobalData->m_TiVOFastMode
+									? TheGameText->FETCH_OR_SUBSTITUTE("GUI:FF_ON", L"Fast Forward is on")
+									: TheGameText->FETCH_OR_SUBSTITUTE("GUI:FF_OFF", L"Fast Forward is off")
+								);
+			      }
 			      disp = KEEP_MESSAGE; // cause for goodness sake, this key gets used a lot by non-replay hotkeys
 			      break;
-		      }  
+		      }
 
 
 					/*GameMessage *metaMsg =*/ TheMessageStream->appendMessage(map->m_meta);
-					//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() normal: %s\n", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));
+					//DEBUG_LOG(("Frame %d: MetaEventTranslator::translateGameMessage() normal: %s", TheGameLogic->getFrame(), findGameMessageNameByType(map->m_meta)));
 				}
 				disp = DESTROY_MESSAGE;
 				break;
 			}
-		} 
+		}
 
 
 
@@ -551,77 +567,62 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 
 	if (t > GameMessage::MSG_RAW_MOUSE_BEGIN && t < GameMessage::MSG_RAW_MOUSE_END )
 	{
-		Int index = 0;
+		Int index = 3;
 		switch (t)
 		{
 			case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_DOWN:
+				--index;
+				FALLTHROUGH;
 			case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN:
+				--index;
+				FALLTHROUGH;
 			case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN:
 			{
-				// Fill out which the current mouse down position
-				if (t == GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN)
-					index = 1;
-				else if (t == GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN)
-					index = 2;
-				// else index == 0
+				--index;
 				m_mouseDownPosition[index] = msg->getArgument(0)->pixel;
 				m_nextUpShouldCreateDoubleClick[index] = FALSE;
-				
 				break;
 			}
 
 			case GameMessage::MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK:
+				--index;
+				FALLTHROUGH;
 			case GameMessage::MSG_RAW_MOUSE_MIDDLE_DOUBLE_CLICK:
+				--index;
+				FALLTHROUGH;
 			case GameMessage::MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK:
 			{
-				if (t == GameMessage::MSG_RAW_MOUSE_MIDDLE_DOUBLE_CLICK)
-					index = 1;
-				else if (t == GameMessage::MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK)
-					index = 2;
-				// else index == 0
-
+				--index;
 				m_nextUpShouldCreateDoubleClick[index] = TRUE;
 				break;
 			}
 
 			case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_UP:
+				--index;
+				FALLTHROUGH;
 			case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_UP:
+				--index;
+				FALLTHROUGH;
 			case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP:
 			{
-				ICoord2D location = msg->getArgument(0)->pixel;
+				--index;
 
-				// Fill out which the current mouse down position
-				if (t == GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_UP)
-					index = 1;
-				else if (t == GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP)
-					index = 2;
-				// else index == 0
-
-				GameMessage *newMessage = NULL;
-				if (t == GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_UP) 
+				constexpr const GameMessage::Type SingleClickMessages[3] =
 				{
-					if (m_nextUpShouldCreateDoubleClick[index])
-						newMessage = TheMessageStream->insertMessage(GameMessage::MSG_MOUSE_LEFT_DOUBLE_CLICK, const_cast<GameMessage*>(msg));
-					else
-						newMessage = TheMessageStream->insertMessage(GameMessage::MSG_MOUSE_LEFT_CLICK, const_cast<GameMessage*>(msg));
-					m_nextUpShouldCreateDoubleClick[index] = FALSE;
-				} 
-				else if (t == GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_UP)
+					GameMessage::MSG_MOUSE_LEFT_CLICK,
+					GameMessage::MSG_MOUSE_MIDDLE_CLICK,
+					GameMessage::MSG_MOUSE_RIGHT_CLICK,
+				};
+				constexpr const GameMessage::Type DoubleClickMessages[3] =
 				{
-					if (m_nextUpShouldCreateDoubleClick[index])
-						newMessage = TheMessageStream->insertMessage(GameMessage::MSG_MOUSE_MIDDLE_DOUBLE_CLICK, const_cast<GameMessage*>(msg));
-					else
-						newMessage = TheMessageStream->insertMessage(GameMessage::MSG_MOUSE_MIDDLE_CLICK, const_cast<GameMessage*>(msg));
-					m_nextUpShouldCreateDoubleClick[index] = FALSE;
-				}
-				else if (t == GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP) 
-				{
-					if (m_nextUpShouldCreateDoubleClick[index])
-						newMessage = TheMessageStream->insertMessage(GameMessage::MSG_MOUSE_RIGHT_DOUBLE_CLICK, const_cast<GameMessage*>(msg));
-					else
-						newMessage = TheMessageStream->insertMessage(GameMessage::MSG_MOUSE_RIGHT_CLICK, const_cast<GameMessage*>(msg));
-					m_nextUpShouldCreateDoubleClick[index] = FALSE;
-				}
+					GameMessage::MSG_MOUSE_LEFT_DOUBLE_CLICK,
+					GameMessage::MSG_MOUSE_MIDDLE_DOUBLE_CLICK,
+					GameMessage::MSG_MOUSE_RIGHT_DOUBLE_CLICK,
+				};
+
+				const ICoord2D location = msg->getArgument(0)->pixel;
+				const GameMessage::Type messageType = m_nextUpShouldCreateDoubleClick[index] ? DoubleClickMessages[index] : SingleClickMessages[index];
+				GameMessage *newMessage = TheMessageStream->insertMessage(messageType, const_cast<GameMessage*>(msg));
 
 				IRegion2D pixelRegion;
 				buildRegion( &m_mouseDownPosition[index], &location, &pixelRegion );
@@ -633,12 +634,15 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 				}
 
 				newMessage->appendPixelRegionArgument( pixelRegion );
-				
+
 				// append the modifier keys to the message.
 				newMessage->appendIntegerArgument( msg->getArgument(1)->integer );
+
+				// append the time to the message.
+				//newMessage->appendIntegerArgument( msg->getArgument(2)->integer );
 				break;
 			}
-		
+
 		}
 
 	}
@@ -651,7 +655,7 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 //-------------------------------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------------------------------
-MetaMap::MetaMap() : 
+MetaMap::MetaMap() :
 	m_metaMaps(NULL)
 {
 }
@@ -699,7 +703,7 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 	m->m_displayName.clear();
 	m->m_next = m_metaMaps;
 	m_metaMaps = m;
-	
+
 	return m;
 }
 
@@ -726,6 +730,61 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 	// TheSuperHackers @info A default mapping for MSG_META_SELECT_ALL_AIRCRAFT would be useful for Generals
 	// but is not recommended, because it will cause key mapping conflicts with original game languages.
 
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_INCREASE_MAX_RENDER_FPS);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_KPPLUS;
+			map->m_transition = DOWN;
+			map->m_modState = CTRL;
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_DECREASE_MAX_RENDER_FPS);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_KPMINUS;
+			map->m_transition = DOWN;
+			map->m_modState = CTRL;
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_INCREASE_LOGIC_TIME_SCALE);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_KPPLUS;
+			map->m_transition = DOWN;
+			map->m_modState = SHIFT_CTRL;
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_DECREASE_LOGIC_TIME_SCALE);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_KPMINUS;
+			map->m_transition = DOWN;
+			map->m_modState = SHIFT_CTRL;
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TOGGLE_PLAYER_OBSERVER);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_M;
+			map->m_transition = DOWN;
+			map->m_modState = NONE;
+			map->m_usableIn = COMMANDUSABLE_OBSERVER;
+		}
+	}
 	{
 		// Is mostly useful for Generals.
 		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TOGGLE_FAST_FORWARD_REPLAY);
@@ -734,7 +793,7 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 			map->m_key = MK_F;
 			map->m_transition = DOWN;
 			map->m_modState = NONE;
-			map->m_usableIn = COMMANDUSABLE_GAME;
+			map->m_usableIn = COMMANDUSABLE_GAME; // @todo COMMANDUSABLE_OBSERVER
 		}
 	}
 	{
@@ -745,7 +804,18 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 			map->m_key = MK_P;
 			map->m_transition = DOWN;
 			map->m_modState = NONE;
-			map->m_usableIn = COMMANDUSABLE_GAME;
+			map->m_usableIn = COMMANDUSABLE_OBSERVER;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TOGGLE_PAUSE_ALT);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_P;
+			map->m_transition = DOWN;
+			map->m_modState = SHIFT; // Requires modifier to avoid key conflicts as a player.
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
 		}
 	}
 	{
@@ -756,9 +826,76 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 			map->m_key = MK_O;
 			map->m_transition = DOWN;
 			map->m_modState = NONE;
+			map->m_usableIn = COMMANDUSABLE_OBSERVER;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_STEP_FRAME_ALT);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_O;
+			map->m_transition = DOWN;
+			map->m_modState = SHIFT; // Requires modifier to avoid key conflicts as a player.
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_SELECT_NEXT_IDLE_WORKER);
+		if (map->m_key == MK_NONE) {
+			map->m_key = MK_I;
+			map->m_transition = DOWN;
+			map->m_modState = CTRL;
+			map->m_usableIn = COMMANDUSABLE_GAME;
+			map->m_category = CATEGORY_SELECTION;
+			map->m_description = TheGameText->FETCH_OR_SUBSTITUTE("GUI:SelectNextIdleWorkerDescription", L"Select the next idle worker");
+			map->m_displayName = TheGameText->FETCH_OR_SUBSTITUTE("GUI:SelectNextIdleWorker", L"Next Idle Worker");
+		}
+	}
+	{
+		MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_ALT_CAMERA_ROTATE_LEFT);
+		if (map->m_key == MK_NONE) {
+			map->m_key = MK_KP4;
+			map->m_transition = DOWN;
+			map->m_modState = CTRL;
+			map->m_usableIn = COMMANDUSABLE_GAME;
+		}
+	}
+	{
+		MetaMapRec* map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_ALT_CAMERA_ROTATE_RIGHT);
+		if (map->m_key == MK_NONE) {
+			map->m_key = MK_KP6;
+			map->m_transition = DOWN;
+			map->m_modState = CTRL;
+			map->m_usableIn = COMMANDUSABLE_GAME;
+		}
+	}
+
+#if defined(RTS_DEBUG)
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_DEMO_REMOVE_PREREQ);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_P;
+			map->m_transition = DOWN;
+			map->m_modState = ALT;
+			map->m_usableIn = COMMANDUSABLE_GAME;
+		}
+	}
+	{
+		// Is useful for Generals and Zero Hour.
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_DEMO_FREE_BUILD);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_B;
+			map->m_transition = DOWN;
+			map->m_modState = ALT;
 			map->m_usableIn = COMMANDUSABLE_GAME;
 		}
 	}
+#endif // defined(RTS_DEBUG)
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/PlaceEventTranslator.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/PlaceEventTranslator.cpp
index 16ba5e79e6f..97f9b76ce93 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/PlaceEventTranslator.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/PlaceEventTranslator.cpp
@@ -25,7 +25,7 @@
 // FILE: PlaceEventTranslator.cpp ///////////////////////////////////////////////////////////
 // Author: Steven Johnson, Dec 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BuildAssistant.h"
 #include "Common/GameAudio.h"
@@ -46,11 +46,6 @@
 #include "GameLogic/Module/ProductionUpdate.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 PlaceEventTranslator::PlaceEventTranslator() : m_frameOfUpButton(-1)
@@ -73,6 +68,8 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 	{
 
 		//---------------------------------------------------------------------------------------------
+		// TheSuperHackers @bugfix Prevent double-clicks from falling through to other translators during building placement
+		case GameMessage::MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK:
 		case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_DOWN:
 		{
 			// if we're in a building placement mode, do the place and send to all players
@@ -98,10 +95,10 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 					TheInGameUI->placeBuildAvailable( NULL, NULL );
 					break;
 
-				}  // end if
+				}
 
 				// set this location as the placement anchor
-				TheInGameUI->setPlacementStart( &mouse );	
+				TheInGameUI->setPlacementStart( &mouse );
 
 /*
 //
@@ -118,12 +115,12 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 				//
 				LegalBuildCode lbc;
 				lbc = TheBuildAssistant->isLocationLegalToBuild( &world,
-																												 whatToBuild, 
+																												 whatToBuild,
 																												 TheInGameUI->getPlacementAngle(),
 																												 BuildAssistant::USE_QUICK_PATHFIND |
-																												 BuildAssistant::TERRAIN_RESTRICTIONS | 
+																												 BuildAssistant::TERRAIN_RESTRICTIONS |
 																												 BuildAssistant::CLEAR_PATH |
-																												 BuildAssistant::NO_OBJECT_OVERLAP, 
+																												 BuildAssistant::NO_OBJECT_OVERLAP,
 																												 builderObject );
 				if( lbc != LBC_OK )
 				{
@@ -135,22 +132,22 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 					// display a message to the user as to why you can't build there
 					TheInGameUI->displayCantBuildMessage( lbc );
 
-				}  // end if
+				}
 				else
 				{
 
 					// start placement anchor
-					TheInGameUI->setPlacementStart(&mouse);	
+					TheInGameUI->setPlacementStart(&mouse);
 
-				}  // end else
+				}
 */
-															
+
 				// used the input
 				disp = DESTROY_MESSAGE;
 
-			}  
+			}
 			break;
-		}  
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_MOUSE_LEFT_DOUBLE_CLICK:
@@ -181,11 +178,7 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 				// translate the screen position of start to world target location
 				TheTacticalView->screenToTerrain( &anchorStart, &world );
 
-				// get the source object ID of the thing that is "building" the object 
-				ObjectID builderID = INVALID_ID;
 				Object *builderObj = TheGameLogic->findObjectByID( TheInGameUI->getPendingPlaceSourceObjectID() );
-				if( builderObj )
-					builderID = builderObj->getID();
 
 				//Kris: September 27, 2002
 				//Make sure we have enough CASH to build it! It's possible that between the
@@ -199,7 +192,7 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 						TheEva->setShouldPlay(EVA_InsufficientFunds);
 						TheInGameUI->message( "GUI:NotEnoughMoneyToBuild" );
 						break;
-					} 
+					}
 					else if (cmt == CANMAKE_QUEUE_FULL)
 					{
 						TheInGameUI->message( "GUI:ProductionQueueFull" );
@@ -214,11 +207,13 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 					{
 						TheInGameUI->message( "GUI:UnitMaxedOut" );
 						break;
-					} 
+					}
 					// get out of pending placement mode, this will also clear the arrow anchor status
 					TheInGameUI->placeBuildAvailable( NULL, NULL );
 					break;
-				} 
+				}
+
+				DEBUG_ASSERTCRASH(builderObj != NULL, ("builderObj is NULL"));
 
 				// check to see if this is a legal location to build something at
 				LegalBuildCode lbc;
@@ -226,7 +221,7 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 																												 build,
 																												 angle,
 																												 BuildAssistant::USE_QUICK_PATHFIND |
-																												 BuildAssistant::TERRAIN_RESTRICTIONS | 
+																												 BuildAssistant::TERRAIN_RESTRICTIONS |
 																												 BuildAssistant::CLEAR_PATH |
 																												 BuildAssistant::NO_OBJECT_OVERLAP |
 																												 BuildAssistant::SHROUD_REVEALED |
@@ -245,7 +240,7 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 							if( commandButton )
 							{
 								//If we get this far, then we aren't going to really build the object using the production update
-								//interface. Instead, we're going to trigger the special power to create it magically without a 
+								//interface. Instead, we're going to trigger the special power to create it magically without a
 								//dozer/worker.
 								placeMsg = TheMessageStream->appendMessage( GameMessage::MSG_DO_SPECIAL_POWER_AT_LOCATION );
 								placeMsg->appendIntegerArgument( commandButton->getSpecialPowerTemplate()->getID() ); //The ID of the special power template.
@@ -254,7 +249,7 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 								placeMsg->appendObjectIDArgument( INVALID_ID ); //There is no object in the way.
 								placeMsg->appendIntegerArgument( commandButton->getOptions() ); //Command button options.
 								placeMsg->appendObjectIDArgument( builderObj->getID() ); //The source object responsible for firing the special.
-								
+
 								// get out of pending placement mode, this will also clear the arrow anchor status
 								TheInGameUI->placeBuildAvailable( NULL, NULL );
 
@@ -282,14 +277,14 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 						TheTacticalView->screenToTerrain( &anchorEnd, &worldEnd );
 						placeMsg->appendLocationArgument( worldEnd );
 
-					}  // end if
+					}
 
 					pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), placeMsg->getType() );
 
 					// get out of pending placement mode, this will also clear the arrow anchor status
 					TheInGameUI->placeBuildAvailable( NULL, NULL );
 
-				}  // end if, location legal to build at
+				}
 				else
 				{
 					// can't place, display why
@@ -307,20 +302,20 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 					// unhook the anchor so they can try again
 					TheInGameUI->setPlacementStart( NULL );
 
-				}  // end else
-								
+				}
+
 				// used the input
 				disp = DESTROY_MESSAGE;
 				m_frameOfUpButton = TheGameLogic->getFrame();
 
 			}
 
-			if (disp == DESTROY_MESSAGE) 
+			if (disp == DESTROY_MESSAGE)
 				TheInGameUI->clearAttackMoveToMode();
 
 			break;
 
-		}  
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_POSITION:
@@ -337,24 +332,24 @@ GameMessageDisposition PlaceEventTranslator::translateGameMessage(const GameMess
 				//
 				ICoord2D start;
 				TheInGameUI->getPlacementPoints( &start, NULL );
-				
+
 				Int x, y;
 				x = mouse.x - start.x;
 				y = mouse.y - start.y;
 				if( sqrt( (x * x) + (y * y) ) >= PLACEMENT_DRAG_THRESHOLD_DIST )
 				{
-				
+
 					TheInGameUI->setPlacementEnd(&mouse);
 					disp = DESTROY_MESSAGE;
 
-				}  // end if
+				}
 
-			}  
+			}
 			break;
 		}
-	}  
+	}
 
 	return disp;
-}  
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp
index a5dbb81428d..d4eb2977717 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp
@@ -26,7 +26,7 @@
 // Message stream translator
 // Author: Michael S. Booth, January 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/GameAudio.h"
@@ -56,22 +56,17 @@
 #include "GameClient/SelectionXlat.h"
 #include "GameClient/TerrainVisual.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Lorenzen changed this to a member of SelectionTranslator, providing external access
 // name ly in rebuildholeexposedie, where we decide whether to create GLA Holes when hand-of-Godding
-//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+//#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 //static Bool TheHandOfGodSelectionMode = false;
 //#endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 static Bool TheHurtSelectionMode = false;
 static Bool TheDebugSelectionMode = false;
 #endif
@@ -111,7 +106,7 @@ struct SFWRec
 {
 	SFWRec *info = (SFWRec *)userData;
 	return info->translator->selectFriends(draw, info->createTeamMsg, info->dragSelecting) != 0;
-}  // end selectFriendsWrapper
+}
 
 /*friend*/ Bool killThemKillThemAllWrapper( Drawable *draw, void *userData )
 {
@@ -121,9 +116,9 @@ struct SFWRec
 }
 
 //-----------------------------------------------------------------------------
-/** 
+/**
  * Returns true if the drawable can be selected under the current rules
- * of the system 
+ * of the system
  */
 Bool CanSelectDrawable( const Drawable *draw, Bool dragSelecting )
 {
@@ -133,7 +128,7 @@ Bool CanSelectDrawable( const Drawable *draw, Bool dragSelecting )
 		return FALSE;  // can't select
 	}
 	const Object *obj = draw->getObject();
-	
+
 	if( obj->isEffectivelyDead() && !obj->isKindOf(KINDOF_ALWAYS_SELECTABLE))
 	{
 		//Don't select dead/dying units.
@@ -146,7 +141,7 @@ Bool CanSelectDrawable( const Drawable *draw, Bool dragSelecting )
 	//says we should simply have the KINDOF_SELECTABLE check only... but best to be safe.
 	if( !obj->isKindOf( KINDOF_SELECTABLE ) && obj->isKindOf( KINDOF_FORCEATTACKABLE ) )
 	{
-		return FALSE;		
+		return FALSE;
 	}
 
 	// hidden objects cannot be selected
@@ -212,7 +207,7 @@ Bool CanSelectDrawable( const Drawable *draw, Bool dragSelecting )
 	//Now we can select anything that is selectable.
 	return TRUE;
 
-}  // end canSelect
+}
 
 //-----------------------------------------------------------------------------
 static Bool canSelectWrapper( Drawable *draw, void *userData )
@@ -275,16 +270,13 @@ SelectionTranslator::SelectionTranslator()
 	m_deselectFeedbackAnchor.x = 0;
 	m_deselectFeedbackAnchor.y = 0;
 	m_lastClick = 0;
-	//Added By Sadullah Nader
-	//Initializtion(s) inserted
 	m_deselectDownCameraPosition.zero();
 	m_displayedMaxWarning = FALSE;
-	//
 	m_selectCountMap.clear();
 
 	TheSelectionTranslator = this;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
   m_HandOfGodSelectionMode = FALSE;
 #endif
 }
@@ -295,10 +287,10 @@ SelectionTranslator::~SelectionTranslator()
 }
 
 //-----------------------------------------------------------------------------
-/** 
+/**
  * If this drawable is a 'friend' of mine, select it.
  */
-Bool SelectionTranslator::selectFriends( Drawable *draw, GameMessage *createTeamMsg, 
+Bool SelectionTranslator::selectFriends( Drawable *draw, GameMessage *createTeamMsg,
 																				 Bool dragSelecting )
 {
 	if (CanSelectDrawable( draw, dragSelecting ))
@@ -326,11 +318,11 @@ Bool SelectionTranslator::selectFriends( Drawable *draw, GameMessage *createTeam
 
 		return true;  // selected
 
-	}  // end if
+	}
 
 	return false;  // not selected
 
-}  // end selectFriends
+}
 
 
 //-----------------------------------------------------------------------------
@@ -364,21 +356,21 @@ Bool SelectionTranslator::killThemKillThemAll( Drawable *draw, GameMessage *kill
 		}
 	}
 	return false;
-}  // end selectFriends
+}
 
 //-----------------------------------------------------------------------------
 /**
- * The SelectionTranslator is responsible for all selection semantics, 
- * including click selection, area drag selection, right-click de-selection, 
+ * The SelectionTranslator is responsible for all selection semantics,
+ * including click selection, area drag selection, right-click de-selection,
  * and CTRL-key group selection.
- * NOTE: This handler changes the event semantics for mouse buttons from 
+ * NOTE: This handler changes the event semantics for mouse buttons from
  * LEFT_DOWN -> LEFT_UP  to  LEFT_DOWN -> { LEFT_UP, AREA_SELECTION, or DRAWABLE_PICKED }
  */
 GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessage *msg)
 {
 	GameMessageDisposition disp = KEEP_MESSAGE;
 
-	if(	!TheInGameUI->getInputEnabled() ) 
+	if(	!TheInGameUI->getInputEnabled() )
 	{
 		//Keep the message so the other translaters (WindowXlat) can handle.
 		if( m_dragSelecting )
@@ -451,7 +443,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				//Kris: We want to show information such as the popup text on objects that are forceattackable even
 				//      when we're not in force attackable mode!
 				UnsignedInt pickType = getPickTypesForContext( true /*TheInGameUI->isInForceAttackMode()*/ );
-				
+
 				Drawable *underCursor = TheTacticalView->pickDrawable( &pixel, TheInGameUI->isInForceAttackMode(), (PickType) pickType );
 				Object *objUnderCursor = underCursor ? underCursor->getObject() : NULL;
 
@@ -477,19 +469,19 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 		case GameMessage::MSG_MOUSE_LEFT_DOUBLE_CLICK:
 		{
 			Int modifiers = msg->getArgument(1)->integer;
-			
-			// Pressing ctrl is disallowed for double clicking 
+
+			// Pressing ctrl is disallowed for double clicking
 			if (TheInGameUI->isInForceAttackMode())
 				break;
 
 			const IRegion2D& region = msg->getArgument(0)->pixelRegion;
-	
+
 			// Single point. If there's a unit in there, double click will select all of them.
-			if (region.height() == 0 && region.width() == 0) 
+			if (region.height() == 0 && region.width() == 0)
 			{
 				Bool selectAcrossMap = (BitIsSet(modifiers, KEY_STATE_ALT) ? TRUE : FALSE);
 
-				// only allow things that are selectable. Also, we aren't allowed to 
+				// only allow things that are selectable. Also, we aren't allowed to
 				Drawable *picked = TheTacticalView->pickDrawable( &region.lo, FALSE, PICK_TYPE_SELECTABLE);
 
 				// If there wasn't anyone to pick, then we want to propagate this double click.
@@ -507,9 +499,9 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				if (pickedObj == NULL || !pickedObj->isLocallyControlled())
 					break;
 
-				// Ok. The logic is a little bit weird here. What we need to do is deselect everything 
+				// Ok. The logic is a little bit weird here. What we need to do is deselect everything
 				// except for this one picked thing. Store off the old selection, pick the single clicked thing.
-				// Then if 
+				// Then if
 				DrawableList listOfSelectedDrawables;
 				if (TheInGameUI->isInPreferSelectionMode()) {
 					listOfSelectedDrawables	= *TheInGameUI->getAllSelectedDrawables();
@@ -521,7 +513,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				// Yay. Either select across the screen or the world depending on selectAcrossMap
 				if (selectAcrossMap)
 					TheInGameUI->selectMatchingAcrossMap();
-				else 
+				else
 					TheInGameUI->selectMatchingAcrossScreen();
 
 				// emit "picked" message
@@ -599,7 +591,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 		case GameMessage::MSG_MOUSE_LEFT_CLICK:
 		{
 			// If the quit menu is visible, we need to not process left clicks through the selection translator.
-			if (TheInGameUI->isQuitMenuVisible()) 
+			if (TheInGameUI->isQuitMenuVisible())
 			{
 				disp = DESTROY_MESSAGE;
 				break;
@@ -609,21 +601,22 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			// If there aren't then this click should move forward.
 			IRegion2D selectionRegion = msg->getArgument(0)->pixelRegion;
 			Bool isPoint = (selectionRegion.height() == 0 && selectionRegion.width() == 0);
-			
+
 			DrawableList drawablesThatWillSelect;
 			PickDrawableStruct pds;
 			pds.drawableListToFill = &drawablesThatWillSelect;
+			pds.isPointSelection = isPoint;
 			TheTacticalView->iterateDrawablesInRegion(&selectionRegion, addDrawableToList, &pds);
 
-			if (drawablesThatWillSelect.empty()) 
+			if (drawablesThatWillSelect.empty())
 			{
 				break;
 			}
 
-			// if there were drawables in the region, then we should determine if there is a context 
+			// if there were drawables in the region, then we should determine if there is a context
 			// sensitive command that should take place. If there is, then this isn't a selection thing
 			const DrawableList *currentList = TheInGameUI->getAllSelectedDrawables();
-			if (!currentlyLookingForSelection()) 
+			if (!currentlyLookingForSelection())
 			{
 				break;
 			}
@@ -634,34 +627,34 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				break;
 			}
 
-			// There isn't a context command, so this is a selection thing. Now, based on the keys, 
+			// There isn't a context command, so this is a selection thing. Now, based on the keys,
 			// determine whether or not we should create a new group, or append these guys to our existing
 			// group.
-			
+
 			Bool addToGroup = TheInGameUI->isInPreferSelectionMode();
 
-			if (si.currentCountEnemies > 0 || 
-					si.currentCountCivilians > 0 || 
+			if (si.currentCountEnemies > 0 ||
+					si.currentCountCivilians > 0 ||
 					si.currentCountFriends > 0 ||
-					si.currentCountMineBuildings > 0) 
+					si.currentCountMineBuildings > 0)
 			{
 				// force a new group creation
 				addToGroup = FALSE;
 			}
 
 			// If there are any of my units, then select those.
-			if (si.newCountMine > 0) 
+			if (si.newCountMine > 0)
 			{
 				si.selectMine = TRUE;
 
         // EXACTLY ONE CLICKED OR DRAGGED BUILDING
-				if ( si.newCountMineBuildings == 1 && si.newCountMine == 1 ) 
+				if ( si.newCountMineBuildings == 1 && si.newCountMine == 1 )
 				{
 					addToGroup = FALSE;
 					si.selectMineBuildings = TRUE;
         }
         else if ( si.newCountMineBuildings > 0 )////////////// SO SORRY, I KNOW THIS IS MICKEY MOUSE ///////////////////
-        { // What we are after here is to allow the drag select to get the building, 
+        { // What we are after here is to allow the drag select to get the building,
           // if the other things in the list are going to be ignored anyway
           // so we find out whether the other things are not selectible
           // this came up with the new AmericaBuildingFireBase, which shows its contained
@@ -670,14 +663,14 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
           // -Mark Lorenzen, 6/12/03
           Bool onlyTheOneBuildingIsSelectableAnyway = TRUE;
           DrawableID buildingID = INVALID_DRAWABLE_ID;
-          for (DrawableListIt it = drawablesThatWillSelect.begin(); it != drawablesThatWillSelect.end(); ++it) 
+          for (DrawableListIt it = drawablesThatWillSelect.begin(); it != drawablesThatWillSelect.end(); ++it)
 				  {
             const Drawable *d = *it;
-            if ( d->isKindOf( KINDOF_STRUCTURE ) ) 
+            if ( d->isKindOf( KINDOF_STRUCTURE ) )
             {// make sure there is really only the one building in the list, as it may be multiply listed
-              
+
               if ( buildingID == INVALID_DRAWABLE_ID ) // this is the first building
-                buildingID = d->getID();  
+                buildingID = d->getID();
               else if ( buildingID != d->getID() )//oops, more than one building!
                 onlyTheOneBuildingIsSelectableAnyway = FALSE;
             }
@@ -695,29 +688,29 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				}
 
 			}
-			else if (si.newCountEnemies > 0 && si.newCountCivilians > 0 && si.newCountFriends > 0) 
+			else if (si.newCountEnemies > 0 && si.newCountCivilians > 0 && si.newCountFriends > 0)
 			{
 				// No go here
 				break;
-			} 
-			else if (si.newCountEnemies == 1) 
+			}
+			else if (si.newCountEnemies == 1)
 			{
 				addToGroup = FALSE;
 				si.selectEnemies = TRUE;
-			} 
-			else if (si.newCountCivilians == 1) 
+			}
+			else if (si.newCountCivilians == 1)
 			{
 				addToGroup = FALSE;
 				si.selectCivilians = TRUE;
-			} 
-			else if (si.newCountFriends == 1) 
+			}
+			else if (si.newCountFriends == 1)
 			{
 				addToGroup = FALSE;
 				si.selectFriends = TRUE;
 			}
 
 			// If we're not going to select anything, just bail now.
-			if (!(si.selectMine || si.selectEnemies || si.selectCivilians || si.selectFriends)) 
+			if (!(si.selectMine || si.selectEnemies || si.selectCivilians || si.selectFriends))
 			{
 				break;
 			}
@@ -727,24 +720,24 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 
 			// Whenever we manually select something, reset the last selected group.
 			m_lastGroupSelGroup = -1;
-			
-			if (TheInGameUI->isInPreferSelectionMode() && isPoint && areAllSelected(drawablesThatWillSelect)) 
+
+			if (TheInGameUI->isInPreferSelectionMode() && isPoint && areAllSelected(drawablesThatWillSelect))
 			{
 				// If this was a point, shift was pressed and we already have that unit selected, then we
 				// need to deselect those units.
 				GameMessage *newMsg = TheMessageStream->appendMessage(GameMessage::MSG_REMOVE_FROM_SELECTED_GROUP);
 				Drawable *draw = NULL;
 				DrawableListIt it;
-				for (it = drawablesThatWillSelect.begin(); it != drawablesThatWillSelect.end(); ++it) 
+				for (it = drawablesThatWillSelect.begin(); it != drawablesThatWillSelect.end(); ++it)
 				{
 					draw = *it;
-					if (!draw) 
+					if (!draw)
 					{
 						continue;
 					}
 
 					Object *objToDeselect = draw->getObject();
-					if (!objToDeselect) 
+					if (!objToDeselect)
 					{
 						continue;
 					}
@@ -752,37 +745,37 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					newMsg->appendObjectIDArgument(objToDeselect->getID());
 					TheInGameUI->deselectDrawable(draw);
 				}
-			} 
-			else 
+			}
+			else
 			{
-				if (!addToGroup) 
+				if (!addToGroup)
 				{
 					deselectAll();
 				}
 
 				GameMessage *newMsg = TheMessageStream->appendMessage(GameMessage::MSG_CREATE_SELECTED_GROUP);
 				newMsg->appendBooleanArgument(!addToGroup);
-				
+
 				Player *localPlayer = ThePlayerList->getLocalPlayer();
 
 				Int newDrawablesSelected = 0;
 				Drawable *draw = NULL;
 				DrawableListIt it;
-				for (it = drawablesThatWillSelect.begin(); it != drawablesThatWillSelect.end(); ++it) 
+				for (it = drawablesThatWillSelect.begin(); it != drawablesThatWillSelect.end(); ++it)
 				{
 					draw = *it;
-					if (!draw) 
+					if (!draw)
 					{
 						continue;
 					}
 
 					Object *obj = draw->getObject();
-					if (!obj) 
+					if (!obj)
 					{
 						continue;
 					}
-					
-					if (obj && obj->getContainedBy() != NULL) 
+
+					if (obj && obj->getContainedBy() != NULL)
 					{
 						// we're contained, and so we shouldn't be selectable.
 						continue;
@@ -790,35 +783,35 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 
 					Drawable *drawToSelect = NULL;
 					ObjectID objToAppend = INVALID_ID;
-					if (si.selectMine && obj->isLocallyControlled()) 
+					if (si.selectMine && obj->isLocallyControlled())
 					{
-						if (!obj->isKindOf(KINDOF_STRUCTURE) || si.selectMineBuildings) 
+						if (!obj->isKindOf(KINDOF_STRUCTURE) || si.selectMineBuildings)
 						{
 							drawToSelect = draw;
 							objToAppend = obj->getID();
 						}
-					} 
-					else 
+					}
+					else
 					{
 						Relationship rel = localPlayer->getRelationship(obj->getTeam());
-						if (si.selectEnemies && rel == ENEMIES) 
+						if (si.selectEnemies && rel == ENEMIES)
 						{
 							drawToSelect = draw;
 							objToAppend = obj->getID();
-						} 
-						else if (si.selectCivilians && rel == NEUTRAL) 
+						}
+						else if (si.selectCivilians && rel == NEUTRAL)
 						{
 							drawToSelect = draw;
 							objToAppend = obj->getID();
-						} 
-						else if (si.selectFriends && rel == ALLIES) 
+						}
+						else if (si.selectFriends && rel == ALLIES)
 						{
 							drawToSelect = draw;
 							objToAppend = obj->getID();
 						}
 					}
 
-					if (drawToSelect && objToAppend != INVALID_ID) 
+					if (drawToSelect && objToAppend != INVALID_ID)
 					{
 						newMsg->appendObjectIDArgument(objToAppend);
 						TheInGameUI->selectDrawable(drawToSelect);
@@ -831,11 +824,11 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					localPlayer->getAcademyStats()->recordDragSelection();
 				}
 
-				if (newDrawablesSelected == 1 && draw) 
+				if (newDrawablesSelected == 1 && draw)
 				{
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) 
+#if defined(RTS_DEBUG)
 
 
           if (m_HandOfGodSelectionMode && draw)
@@ -898,21 +891,21 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 						disp = DESTROY_MESSAGE;
 						break;
 					}
-#endif    
+#endif
+
 
-        
         }
 			}
 
 			if (disp == DESTROY_MESSAGE)
 				TheInGameUI->clearAttackMoveToMode();
-			
+
 			break;
 		}
 
 		//-----------------------------------------------------------------------------
-		// Note that the raw left messages are only used to draw feedback now when 
-		// appropriate. All actual selection code takes place in 
+		// Note that the raw left messages are only used to draw feedback now when
+		// appropriate. All actual selection code takes place in
 		// MSG_MOUSE_LEFT_CLICK & MSG_MOUSE_LEFT_DOUBLE_CLICK
 		case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_DOWN:
 		{
@@ -923,13 +916,13 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 		}
 
 		//-----------------------------------------------------------------------------
-		// Note that the raw left messages are only used to draw feedback now when 
-		// appropriate. All actual selection code takes place in 
+		// Note that the raw left messages are only used to draw feedback now when
+		// appropriate. All actual selection code takes place in
 		// MSG_MOUSE_LEFT_CLICK & MSG_MOUSE_LEFT_DOUBLE_CLICK
 		case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_UP:
 		{
 			m_leftMouseButtonIsDown = FALSE;
-			
+
 			if (m_dragSelecting) {
 				// Stop drag selecting now, thanks.
 				m_dragSelecting = FALSE;
@@ -945,7 +938,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				buildRegion( &m_selectFeedbackAnchor, &msg->getArgument(0)->pixel, &selectionRegion );
 				dragMsg->appendPixelRegionArgument( selectionRegion );
 			}
-			else 
+			else
 			{
 				// left click behavior (not right drag)
 
@@ -959,10 +952,11 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 						if( !TheInGameUI->getPreventLeftClickDeselectionInAlternateMouseModeForOneClick() )
 						{
 							deselectAll();
+							m_lastGroupSelGroup = -1;
 						}
 						else
 						{
-							//Prevent deselection of unit if it just issued some type of UI order such as attack move, guard, 
+							//Prevent deselection of unit if it just issued some type of UI order such as attack move, guard,
 							//initiating construction of a new structure.
 							TheInGameUI->setPreventLeftClickDeselectionInAlternateMouseModeForOneClick( FALSE );
 						}
@@ -990,41 +984,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP:
 		{
-			ICoord2D delta, pixel;
-			UnsignedInt currentTime;
 			Coord3D cameraPos;
-
 			TheTacticalView->getPosition(&cameraPos);
 			cameraPos.sub(&m_deselectDownCameraPosition);
-			
-			pixel = msg->getArgument( 0 )->pixel;
-			currentTime = (UnsignedInt) msg->getArgument( 2 )->integer;
-
-			delta.x = m_deselectFeedbackAnchor.x - pixel.x;
-			delta.y = m_deselectFeedbackAnchor.y - pixel.y;
 
-			Bool isClick = TRUE;
-			if (isClick && 
-					abs(delta.x) > TheMouse->m_dragTolerance || 
-					abs(delta.y) > TheMouse->m_dragTolerance)
-			{
-				isClick = FALSE;
-			}
-
-			if (isClick && 
-					currentTime - m_lastClick > TheMouse->m_dragToleranceMS)
-			{
-				isClick = FALSE;
-			}
-
-			if (isClick &&
-					cameraPos.length() > TheMouse->m_dragTolerance3D)
-			{
-				isClick = FALSE;
-			}
+			ICoord2D pixel = msg->getArgument( 0 )->pixel;
+			UnsignedInt currentTime = (UnsignedInt) msg->getArgument( 2 )->integer;
 
 			// right click behavior (not right drag)
-			if (isClick)
+			if (TheMouse->isClick(&m_deselectFeedbackAnchor, &pixel, m_lastClick, currentTime))
 			{
 				//Added support to cancel the GUI command without deselecting the unit(s) involved
 				//when you right click.
@@ -1039,10 +1007,18 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				}
 				else
 				{
-					//No GUI command mode, so deselect everyone if we're in regular mouse mode.
 					//In alternate mouse mode, right click still cancels building placement.
-					if (! TheGlobalData->m_useAlternateMouse || TheInGameUI->getPendingPlaceSourceObjectID() != INVALID_ID)
+					// TheSuperHackers @tweak Stubbjax 08/08/2025 Cancelling building placement no longer deselects the builder.
+					if (TheInGameUI->getPendingPlaceSourceObjectID() != INVALID_ID)
+					{
+						TheInGameUI->placeBuildAvailable(NULL, NULL);
+						TheInGameUI->setPreventLeftClickDeselectionInAlternateMouseModeForOneClick(FALSE);
+						disp = DESTROY_MESSAGE;
+						TheInGameUI->setScrolling(FALSE);
+					}
+					else if (!TheGlobalData->m_useAlternateMouse)
 					{
+						//No GUI command mode, so deselect everyone if we're in regular mouse mode.
 						deselectAll();
 					}
 				}
@@ -1066,7 +1042,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			Int group = t - GameMessage::MSG_META_CREATE_TEAM0;
 			if ( group >= 0 && group < 10 )
 			{
-				DEBUG_LOG(("META: create team %d\n",group));
+				DEBUG_LOG(("META: create team %d",group));
 				// Assign selected items to a group
 				GameMessage *newmsg = TheMessageStream->appendMessage((GameMessage::Type)(GameMessage::MSG_CREATE_TEAM0 + group));
 				Drawable *drawable = TheGameClient->getDrawableList();
@@ -1098,7 +1074,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			Int group = t - GameMessage::MSG_META_SELECT_TEAM0;
 			if ( group >= 0 && group < 10 )
 			{
-				DEBUG_LOG(("META: select team %d\n",group));
+				DEBUG_LOG(("META: select team %d",group));
 
 				UnsignedInt now = TheGameLogic->getFrame();
 				if ( m_lastGroupSelTime == 0 )
@@ -1106,10 +1082,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					m_lastGroupSelTime = now;
 				}
 
+				Bool performSelection = TRUE;
+
 				// check for double-press to jump view
 				if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )
 				{
-					DEBUG_LOG(("META: DOUBLETAP select team %d\n",group));
+					DEBUG_LOG(("META: DOUBLETAP select team %d",group));
+					// TheSuperHackers @bugfix Stubbjax 26/05/2025 Perform selection on double-press
+					// if the group or part of it is somehow deselected between presses.
+					performSelection = FALSE;
 					Player *player = ThePlayerList->getLocalPlayer();
 					if (player)
 					{
@@ -1121,12 +1102,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 							if (numObjs > 0)
 							{
 								// if theres someone in the group, center the camera on them.
-								TheTacticalView->lookAt( objlist[numObjs-1]->getDrawable()->getPosition() );
+								Drawable* drawable = objlist[numObjs - 1]->getDrawable();
+								TheTacticalView->lookAt( drawable->getPosition() );
+								performSelection = !TheInGameUI->areAllObjectsSelected( objlist );
 							}
 						}
 					}
-				} 
-				else 
+				}
+
+				if ( performSelection )
 				{
 					TheInGameUI->deselectAllDrawables( false ); //No need to post message because we're just creating a new group!
 
@@ -1171,7 +1155,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			Int group = t - GameMessage::MSG_META_ADD_TEAM0;
 			if ( group >= 0 && group < 10 )
 			{
-				DEBUG_LOG(("META: select team %d\n",group));
+				DEBUG_LOG(("META: select team %d",group));
 
 				UnsignedInt now = TheGameLogic->getFrame();
 				if ( m_lastGroupSelTime == 0 )
@@ -1183,7 +1167,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 
 				if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )
 				{
-					DEBUG_LOG(("META: DOUBLETAP select team %d\n",group));
+					DEBUG_LOG(("META: DOUBLETAP select team %d",group));
 					Player *player = ThePlayerList->getLocalPlayer();
 					if (player)
 					{
@@ -1223,6 +1207,13 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 						{
 							VecObjectPtr objlist = selectedSquad->getLiveObjects();
 							Int numObjs = objlist.size();
+
+							// TheSuperHackers @bugfix skyaero 22/07/2025 Can't select other units if you have a structure selected. So deselect the structure to prevent group force attack exploit.
+							if (numObjs > 0 && objlist[0]->getDrawable()->isKindOf(KINDOF_STRUCTURE))
+							{
+								TheInGameUI->deselectAllDrawables();
+							}
+
 							for (Int i = 0; i < numObjs; ++i)
 							{
 								TheInGameUI->selectDrawable(objlist[i]->getDrawable());
@@ -1252,16 +1243,16 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			Int group = t - GameMessage::MSG_META_VIEW_TEAM0;
 			if ( group >= 1 && group <= 10 )
 			{
-				DEBUG_LOG(("META: view team %d\n",group));
+				DEBUG_LOG(("META: view team %d",group));
 				Player *player = ThePlayerList->getLocalPlayer();
-				if (player) 
+				if (player)
 				{
 					Squad *selectedSquad = player->getHotkeySquad(group);
-					if (selectedSquad != NULL) 
+					if (selectedSquad != NULL)
 					{
 						VecObjectPtr objlist = selectedSquad->getLiveObjects();
 						Int numObjs = objlist.size();
-						if (numObjs > 0) 
+						if (numObjs > 0)
 						{
 							// if theres someone in the group, center the camera on them.
 							TheTacticalView->lookAt( objlist[ numObjs-1 ]->getDrawable()->getPosition() );
@@ -1272,7 +1263,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			disp = DESTROY_MESSAGE;
 			break;
 		}
-		
+
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_OPTIONS:
 		{
@@ -1283,14 +1274,14 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 		}
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) 
+#if defined(RTS_DEBUG)
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_HAND_OF_GOD_MODE:
 		{
 			if ( !TheGameLogic->isInMultiplayerGame() )
 			{
 				m_HandOfGodSelectionMode = !m_HandOfGodSelectionMode;
-				TheInGameUI->message( UnicodeString( L"Meta Hand-Of-God Mode is %s" ), m_HandOfGodSelectionMode ? L"ON" : L"OFF" );
+				TheInGameUI->message( L"Meta Hand-Of-God Mode is %s", m_HandOfGodSelectionMode ? L"ON" : L"OFF" );
 				disp = DESTROY_MESSAGE;
 			}
 			break;
@@ -1304,33 +1295,33 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			if ( !TheGameLogic->isInMultiplayerGame() )
 			{
 				m_HandOfGodSelectionMode = !m_HandOfGodSelectionMode;
-				TheInGameUI->message( UnicodeString( L"Hand-Of-God Mode is %s" ), m_HandOfGodSelectionMode ? L"ON" : L"OFF" );
+				TheInGameUI->message( L"Hand-Of-God Mode is %s", m_HandOfGodSelectionMode ? L"ON" : L"OFF" );
 				disp = DESTROY_MESSAGE;
 			}
 			break;
 		}
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_TOGGLE_HURT_ME_MODE:
 		{
 			if ( !TheGameLogic->isInMultiplayerGame() )
 			{
 				TheHurtSelectionMode = !TheHurtSelectionMode;
-				TheInGameUI->message( UnicodeString( L"Hurt-Me Mode is %s" ), TheHurtSelectionMode ? L"ON" : L"OFF" );
+				TheInGameUI->message( L"Hurt-Me Mode is %s", TheHurtSelectionMode ? L"ON" : L"OFF" );
 				disp = DESTROY_MESSAGE;
 			}
 			break;
 		}
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		//-----------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_DEMO_DEBUG_SELECTION:
 		{
 			TheDebugSelectionMode = !TheDebugSelectionMode;
-			TheInGameUI->message( UnicodeString( L"Debug-Selected-Item Mode is %s" ), TheDebugSelectionMode ? L"ON" : L"OFF" );
+			TheInGameUI->message( L"Debug-Selected-Item Mode is %s", TheDebugSelectionMode ? L"ON" : L"OFF" );
 		#ifdef DEBUG_OBJECT_ID_EXISTS
 			TheObjectIDToDebug = INVALID_ID;
 		#endif
@@ -1344,14 +1335,12 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 }
 
 
-//Added By Sadullah Nader
-
 //setDragSelecting(Bool dragSelect)
 //Added to fix the drag selection problem in control bar
 ////////////////////////////////////////////////////////////////////////
 void SelectionTranslator::setDragSelecting(Bool dragSelect)
 {
-	m_dragSelecting = dragSelect; 
+	m_dragSelecting = dragSelect;
 }
 
 //setLeftMouseButton(Bool state)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
index cce35480d41..29d30e28731 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
@@ -24,12 +24,12 @@
 
 // FILE: WindowXlat.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,7 +46,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/MessageStream.h"
@@ -55,11 +55,6 @@
 #include "GameClient/Shell.h"
 #include "GameClient/Display.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // DEFINES ////////////////////////////////////////////////////////////////////
 
@@ -75,7 +70,7 @@
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//debug hack to view object under mouse stats
+#if defined(RTS_DEBUG)	//debug hack to view object under mouse stats
 extern ICoord2D TheMousePos;
 #endif
 
@@ -91,11 +86,11 @@ static GameWindowMessage rawMouseToWindowMessage( const GameMessage *msg )
 	{
 		// ------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_POSITION:
-			gwm = GWM_MOUSE_POS; 
+			gwm = GWM_MOUSE_POS;
 			break;
 
 		// ------------------------------------------------------------------------
-		// Strange, but true. The window stuff really doesn't care about double clicks, so just 
+		// Strange, but true. The window stuff really doesn't care about double clicks, so just
 		// treat it as a down click.. Kinda like a second click.
 		case GameMessage::MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK:
 		case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_DOWN:
@@ -140,17 +135,17 @@ static GameWindowMessage rawMouseToWindowMessage( const GameMessage *msg )
 
 		// ------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_WHEEL:
-			if( msg->getArgument( 1 )->integer > 0 ) 
+			if( msg->getArgument( 1 )->integer > 0 )
 				gwm = GWM_WHEEL_UP;
-			else 
+			else
 				gwm = GWM_WHEEL_DOWN;
 			break;
 
-	}  // end switch
+	}
 
 	return gwm;
 
-}  // end rawMouseToWindowMessage
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -209,7 +204,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 
 			if( TheWindowManager )
 				TheWindowManager->winProcessMouseEvent( GWM_NONE, &mousePos, NULL );
-			
+
 			// Force it to keep the message, regardless of what the window thinks it did with the input.
 			return KEEP_MESSAGE;
 		}
@@ -222,7 +217,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 				//If we release the button outside
 				forceKeepMessage = TRUE;
 			}
-			//FALL THROUGH INTENTIONALLY!
+			FALLTHROUGH; //FALL THROUGH INTENTIONALLY!
 		}
 		case GameMessage::MSG_RAW_MOUSE_POSITION:
 		case GameMessage::MSG_RAW_MOUSE_LEFT_BUTTON_DOWN:
@@ -236,7 +231,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 		{
 			// all window events have the position of the mouse as arg 0
 			ICoord2D mousePos = msg->getArgument( 0 )->pixel;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//debug hack to view object under mouse stats
+#if defined(RTS_DEBUG)	//debug hack to view object under mouse stats
 			TheMousePos.x = mousePos.x;
 			TheMousePos.y = mousePos.y;
 #endif
@@ -248,13 +243,13 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 
 			if( TheShell && TheShell->isShellActive() )
 				returnCode = WIN_INPUT_USED;
-			
+
 			if ( TheInGameUI && TheInGameUI->getInputEnabled() == FALSE )
 				returnCode = WIN_INPUT_USED;
 
 			break;
 
-		}  // end, raw mouse position
+		}
 
 		// ------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_LEFT_DRAG:
@@ -280,7 +275,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 
 			break;
 
-		}  // end drag mouse
+		}
 
 		// ------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_WHEEL:
@@ -294,7 +289,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 			// process wheel event
 			GameWindowMessage gwm = rawMouseToWindowMessage( msg );
 			if( TheWindowManager )
-				returnCode = TheWindowManager->winProcessMouseEvent( gwm, &mousePos,	
+				returnCode = TheWindowManager->winProcessMouseEvent( gwm, &mousePos,
 																														 &wheelPos );
 
 			if( TheShell && TheShell->isShellActive() )
@@ -305,7 +300,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 
 			break;
 
-		}  // end mouse wheel
+		}
 
 		// ------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_KEY_DOWN:
@@ -321,8 +316,8 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 
 
 			// If we're in a movie, we want to be able to escape out of it
-			if(returnCode != WIN_INPUT_USED 
-				&& (key == KEY_ESC) 
+			if(returnCode != WIN_INPUT_USED
+				&& (key == KEY_ESC)
 				&& (BitIsSet( state, KEY_STATE_UP ))
 				&& TheDisplay->isMoviePlaying()
 				&& TheGlobalData->m_allowExitOutOfMovies == TRUE )
@@ -331,8 +326,8 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 				returnCode = WIN_INPUT_USED;
 			}
 
-			if(returnCode != WIN_INPUT_USED 
-				&& (key == KEY_ESC) 
+			if(returnCode != WIN_INPUT_USED
+				&& (key == KEY_ESC)
 				&& (BitIsSet( state, KEY_STATE_UP ))
 				&& (TheInGameUI && (TheInGameUI->getInputEnabled() == FALSE)) )
 			{
@@ -340,14 +335,14 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 			}
 
 			break;
-						
-		}  // end key messages
+
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			break;
 
-	}  // end switch( msg->getType() )
+	}
 
 	// remove event from the stream if the return code specifies to do so
 	// If TheShell doesn't exist, then well, we're not in RTS, we're in GUIEdit
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp
index c0ffe556a05..0bc882eae48 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp
@@ -25,7 +25,7 @@
 // RadiusDecal.cpp ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_SHADOW_NAMES
 
@@ -36,21 +36,16 @@
 #include "GameClient/Shadow.h"
 #include "GameLogic/GameLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
-RadiusDecalTemplate::RadiusDecalTemplate() : 
-	m_shadowType(SHADOW_ALPHA_DECAL), 
+RadiusDecalTemplate::RadiusDecalTemplate() :
+	m_shadowType(SHADOW_ALPHA_DECAL),
 	m_minOpacity(1.0f),
 	m_maxOpacity(1.0f),
 	m_opacityThrobTime(LOGICFRAMES_PER_SECOND),
 	m_color(0),
 	m_onlyVisibleToOwningPlayer(true),
-	m_name(AsciiString::TheEmptyString)  // Added By Sadullah Nader for Init purposes
+	m_name(AsciiString::TheEmptyString)
 {
 }
 
@@ -58,10 +53,10 @@ RadiusDecalTemplate::RadiusDecalTemplate() :
 void RadiusDecalTemplate::createRadiusDecal(const Coord3D& pos, Real radius, const Player* owningPlayer, RadiusDecal& result) const
 {
 	result.clear();
-	
+
 	if (owningPlayer == NULL)
 	{
-		DEBUG_CRASH(("You MUST specify a non-NULL owningPlayer to createRadiusDecal. (srj)\n"));
+		DEBUG_CRASH(("You MUST specify a non-NULL owningPlayer to createRadiusDecal. (srj)"));
 		return;
 	}
 
@@ -78,7 +73,7 @@ void RadiusDecalTemplate::createRadiusDecal(const Coord3D& pos, Real radius, con
 		decalInfo.allowUpdates = FALSE;										// shadow texture will never update
 		decalInfo.allowWorldAlign = TRUE;									// shadow image will wrap around world objects
 		decalInfo.m_type = m_shadowType;
-		strcpy(decalInfo.m_ShadowName, m_name.str());		// name of your texture
+		strlcpy(decalInfo.m_ShadowName, m_name.str(), ARRAY_SIZE(decalInfo.m_ShadowName));		// name of your texture
 		decalInfo.m_sizeX = radius*2;									// world space dimensions
 		decalInfo.m_sizeY = radius*2;									// world space dimensions
 
@@ -87,12 +82,12 @@ void RadiusDecalTemplate::createRadiusDecal(const Coord3D& pos, Real radius, con
 		{
 			result.m_decal->setAngle(0.0f);
 			result.m_decal->setColor(m_color == 0 ? owningPlayer->getPlayerColor() : m_color);
-			result.m_decal->setPosition(pos.x, pos.y, pos.z);	
+			result.m_decal->setPosition(pos.x, pos.y, pos.z);
 			result.m_template = this;
 		}
 		else
 		{
-			DEBUG_CRASH(("Unable to add decal %s\n",decalInfo.m_ShadowName));
+			DEBUG_CRASH(("Unable to add decal %s",decalInfo.m_ShadowName));
 		}
 	}
 }
@@ -105,8 +100,8 @@ void RadiusDecalTemplate::xferRadiusDecalTemplate( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-	xfer->xferAsciiString(&m_name);	
-	xfer->xferUser(&m_shadowType, sizeof(m_shadowType));	
+	xfer->xferAsciiString(&m_name);
+	xfer->xferUser(&m_shadowType, sizeof(m_shadowType));
 	xfer->xferReal(&m_minOpacity);
   xfer->xferReal(&m_maxOpacity);
 	xfer->xferUnsignedInt(&m_opacityThrobTime);
@@ -117,7 +112,7 @@ void RadiusDecalTemplate::xferRadiusDecalTemplate( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 /*static*/ void RadiusDecalTemplate::parseRadiusDecalTemplate(INI* ini, void *instance, void * store, const void* /*userData*/)
 {
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Texture",										INI::parseAsciiString,				NULL,							offsetof( RadiusDecalTemplate, m_name ) },
 		{ "Style",											INI::parseBitString32,				TheShadowNames,		offsetof( RadiusDecalTemplate, m_shadowType ) },
@@ -133,16 +128,16 @@ void RadiusDecalTemplate::xferRadiusDecalTemplate( Xfer *xfer )
 }
 
 // ------------------------------------------------------------------------------------------------
-RadiusDecal::RadiusDecal() : 
-	m_template(NULL), 
+RadiusDecal::RadiusDecal() :
+	m_template(NULL),
 	m_decal(NULL),
 	m_empty(true)
 {
 }
 
 // ------------------------------------------------------------------------------------------------
-RadiusDecal::RadiusDecal(const RadiusDecal& that) : 
-	m_template(NULL), 
+RadiusDecal::RadiusDecal(const RadiusDecal& that) :
+	m_template(NULL),
 	m_decal(NULL),
 	m_empty(true)
 {
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/SelectionInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/SelectionInfo.cpp
index dba71ac691a..e2f1a26cee3 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/SelectionInfo.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/SelectionInfo.cpp
@@ -39,11 +39,6 @@
 #include "GameClient/Drawable.h"
 #include "GameClient/KeyDefs.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 SelectionInfo::SelectionInfo() :
@@ -68,12 +63,8 @@ SelectionInfo::SelectionInfo() :
 { }
 
 //-------------------------------------------------------------------------------------------------
-PickDrawableStruct::PickDrawableStruct() : drawableListToFill(NULL)
+PickDrawableStruct::PickDrawableStruct() : drawableListToFill(NULL), isPointSelection(FALSE)
 {
-	//Added By Sadullah Nader
-	//Initializations inserted
-	drawableListToFill = FALSE;
-	//
 	forceAttackMode = TheInGameUI->isInForceAttackMode();
 	UnsignedInt pickType = getPickTypesForContext(forceAttackMode);
 	translatePickTypesToKindof(pickType, kindofsToMatch);
@@ -85,10 +76,10 @@ PickDrawableStruct::PickDrawableStruct() : drawableListToFill(NULL)
 
 //-------------------------------------------------------------------------------------------------
 /**
- * Given a list of currently selected things and a list of things that are currently under 
+ * Given a list of currently selected things and a list of things that are currently under
  * the selection (pointer or drag), generate some useful information about each.
  */
-extern Bool contextCommandForNewSelection(const DrawableList *currentlySelectedDrawables, 
+extern Bool contextCommandForNewSelection(const DrawableList *currentlySelectedDrawables,
 																					const DrawableList *newlySelectedDrawables,
 																					SelectionInfo *outSelectionInfo,
 																					Bool selectionIsPoint)
@@ -158,7 +149,7 @@ extern Bool contextCommandForNewSelection(const DrawableList *currentlySelectedD
 		}
 
 		if (obj->isLocallyControlled()) {
-			++outSelectionInfo->newCountMine;	
+			++outSelectionInfo->newCountMine;
 			newMine = *it;
 			if (obj->isKindOf(KINDOF_STRUCTURE)) {
 				++outSelectionInfo->newCountMineBuildings;
@@ -276,7 +267,7 @@ UnsignedInt getPickTypesForContext( Bool forceAttackMode )
 
 	return types;
 
-}  // end getPickTypesForContext
+}
 
 //-------------------------------------------------------------------------------------------------
 UnsignedInt getPickTypesForCurrentSelection( Bool forceAttackMode )
@@ -315,7 +306,7 @@ UnsignedInt getPickTypesForCurrentSelection( Bool forceAttackMode )
 	}
 
 	return retVal;
-		
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -335,7 +326,7 @@ void translatePickTypesToKindof(UnsignedInt pickTypes, KindOfMaskType& outMask)
 
 	if (BitIsSet(pickTypes, PICK_TYPE_FORCEATTACKABLE)) {
 		outMask.set(KINDOF_FORCEATTACKABLE);
-	}	
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -344,7 +335,7 @@ void translatePickTypesToKindof(UnsignedInt pickTypes, KindOfMaskType& outMask)
 Bool addDrawableToList( Drawable *draw, void *userData )
 {
 	PickDrawableStruct *pds = (PickDrawableStruct *) userData;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_allowUnselectableSelection) {
 		pds->drawableListToFill->push_back(draw);
 		return TRUE;
@@ -354,6 +345,14 @@ Bool addDrawableToList( Drawable *draw, void *userData )
 	if (!pds->drawableListToFill)
 		return FALSE;
 
+#if !RTS_GENERALS || !PRESERVE_RETAIL_BEHAVIOR
+	if (draw->getFullyObscuredByShroud())
+		return FALSE;
+
+	if (draw->isDrawableEffectivelyHidden())
+		return FALSE;
+#endif
+
 	if (!draw->getTemplate()->isAnyKindOf(pds->kindofsToMatch))
 		return FALSE;
 
@@ -362,7 +361,7 @@ Bool addDrawableToList( Drawable *draw, void *userData )
     const Object *obj = draw->getObject();
     if ( obj && obj->getContainedBy() )//hmm, interesting... he is not selectable but he is contained
     {// What we are after here is to propagate the selection the selection ti the container
-      // if the cobtainer is non-enclosing... see also selectionxlat, in the left_click case
+      // if the container is non-enclosing... see also SelectionXlat, in the left_click case
 
       ContainModuleInterface *contain = obj->getContainedBy()->getContain();
       Drawable *containDraw = obj->getContainedBy()->getDrawable();
@@ -373,28 +372,21 @@ Bool addDrawableToList( Drawable *draw, void *userData )
       return FALSE;
   }
 
-	//Kris: Aug 9, 2003!!! Wow, this bug has been around a LONG time!!
-	//Basically, it was possible to drag select a single enemy/neutral unit even if you couldn't see it
-	//including stealthed units.
-	const Object *obj = draw->getObject();
-	if( obj )
+#if !RTS_GENERALS && PRESERVE_RETAIL_BEHAVIOR
+	// TheSuperHackers @info
+	// In retail, hidden objects such as passengers are included here when drag-selected, which causes
+	// enemy selection logic to exit early (only 1 enemy unit can be selected at a time). Some players
+	// exploit this bug to determine if a transport contains passengers and consider this an important
+	// feature and an advanced skill to pull off, so we must leave the exploit.
+	if (!pds->isPointSelection)
 	{
-		const Player *player = ThePlayerList->getLocalPlayer();
-		Relationship rel = player->getRelationship( obj->getTeam() );
-		if( rel == NEUTRAL || rel == ENEMIES )
-		{
-			if( obj->getShroudedStatus( player->getPlayerIndex() ) >= OBJECTSHROUD_FOGGED )
-			{
-				return FALSE;
-			}
-
-			//If stealthed, no way!
-			if( obj->testStatus( OBJECT_STATUS_STEALTHED ) && !obj->testStatus( OBJECT_STATUS_DETECTED ) )
-			{
-				return FALSE;
-			}
-		}
+		const Object *obj = draw->getObject();
+		if (obj)
+			if (obj->getControllingPlayer() != ThePlayerList->getLocalPlayer())
+				if (obj->getContain() && draw->getObject()->getContain()->getContainCount() > 0)
+					return FALSE;
 	}
+#endif
 
 	pds->drawableListToFill->push_back(draw);
 	return TRUE;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Statistics.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Statistics.cpp
index 49a053cec24..01a376880f6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Statistics.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Statistics.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Statistics.cpp 
+// FILE: Statistics.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -37,7 +37,7 @@
 /*		4/2/2002 : Initial creation                                            */
 /*---------------------------------------------------------------------------*/
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/Statistics.h"
 
@@ -45,7 +45,7 @@
 Real MuLaw(Real valueToRun, Real maxValueForVal, Real mu)
 {
 	Real testVal = (valueToRun - maxValueForVal / 2) / (maxValueForVal / 2);
-	return (sign(testVal) * log(1 + mu * fabs(testVal)) / 
+	return (sign(testVal) * log(1 + mu * fabs(testVal)) /
 														 log(1 + mu));
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp
index 6c84603bdf7..cabff15a158 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp
@@ -29,7 +29,7 @@
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_ANIM_2D_MODE_NAMES
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
@@ -38,11 +38,6 @@
 #include "GameClient/Image.h"
 #include "GameLogic/GameLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // GLOBAL /////////////////////////////////////////////////////////////////////////////////////////
 Anim2DCollection *TheAnim2DCollection = NULL;
@@ -64,23 +59,21 @@ Anim2DTemplate::Anim2DTemplate( AsciiString name )
 	m_randomizeStartFrame = FALSE;
 	m_nextTemplate = NULL;
 
-}  // end Anim2DTemplate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 Anim2DTemplate::~Anim2DTemplate( void )
 {
 
-	// delete the images
-	if( m_images )
-		delete [] m_images;
+	delete [] m_images;
 
-}  // end ~Anim2DTemplate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Field parse table for 2D animation templates */
 // ---------i---------------------------------------------------------------------------------------
-const FieldParse Anim2DTemplate::s_anim2DFieldParseTable[] = 
+const FieldParse Anim2DTemplate::s_anim2DFieldParseTable[] =
 {
 
 	{ "NumberImages",					Anim2DTemplate::parseNumImages,			NULL,							0 },
@@ -111,16 +104,16 @@ void Anim2DTemplate::parseNumImages( INI *ini, void *instance, void *store, cons
 	if( numFrames < minimumFrames )
 	{
 
-		DEBUG_CRASH(( "Anim2DTemplate::parseNumImages - Invalid animation '%s', animations must have '%d' or more frames defined\n",
+		DEBUG_CRASH(( "Anim2DTemplate::parseNumImages - Invalid animation '%s', animations must have '%d' or more frames defined",
 									 animTemplate->getName().str(), minimumFrames ));
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// allocate the image array
 	animTemplate->allocateImages( (UnsignedShort)numFrames );
 
-}  // end parseNumImages
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Allocate the image array for an animation template and store the number of frames we have */
@@ -138,7 +131,7 @@ void Anim2DTemplate::allocateImages( UnsignedShort numFrames )
 	for( Int i = 0; i < m_numFrames; ++i )
 		m_images[ i ] = NULL;
 
-}  // end allocateImages
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Parsing a single image definition for an animation */
@@ -155,36 +148,36 @@ void Anim2DTemplate::parseImage( INI *ini, void *instance, void *store, const vo
 	{
 
 		//We don't care if we're in the builder
-		//DEBUG_CRASH(( "Anim2DTemplate::parseImage - Image not found\n" ));
+		//DEBUG_CRASH(( "Anim2DTemplate::parseImage - Image not found" ));
 		//throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	//
 	// assign the image to the animation template list of images ... note since we've pre-allocated
 	// the array of images and the index an image is loaded into depends on its order specified
 	// in INI, we need to get the number of images currently loaded into this animation template
-	// so that we can put it at the next free image spot ... and then tell the animation 
+	// so that we can put it at the next free image spot ... and then tell the animation
 	// template we've loaded one more
 	//
 	Anim2DTemplate *animTemplate = (Anim2DTemplate *)instance;
 	animTemplate->storeImage( image );
 
-}  // end parseImage
+}
 
 // ------------------------------------------------------------------------------------------------
 /** This will parse the image sequence of an animation.  You can use this as a shortcut to
 	* specifying a series of images for an animation instead of having to specify them all
 	* individually.  Image names will be assumed to start with an appended "000" to the end
-	* end of the first image name and incremented up to the number of images for the 
+	* end of the first image name and incremented up to the number of images for the
 	* animation.  NOTE: That the number images *must* have already been specified before
 	* we can parse this entry so we know how many images to allocate and look for */
 // ------------------------------------------------------------------------------------------------
-/*static*/ void Anim2DTemplate::parseImageSequence( INI *ini, void *instance, 
+/*static*/ void Anim2DTemplate::parseImageSequence( INI *ini, void *instance,
 																										void *store, const void *userData )
 {
-	
-	// get the animation template 
+
+	// get the animation template
 	Anim2DTemplate *animTemplate = (Anim2DTemplate *)instance;
 
 	//
@@ -194,11 +187,11 @@ void Anim2DTemplate::parseImage( INI *ini, void *instance, void *store, const vo
 	if( animTemplate->getNumFrames() == NUM_FRAMES_INVALID )
 	{
 
-		DEBUG_CRASH(( "Anim2DTemplate::parseImageSequence - You must specify the number of animation frames for animation '%s' *BEFORE* specifying the image sequence name\n",
+		DEBUG_CRASH(( "Anim2DTemplate::parseImageSequence - You must specify the number of animation frames for animation '%s' *BEFORE* specifying the image sequence name",
 									animTemplate->getName().str() ));
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	//
 	// the image storage has already been allocated, all we have to do now is count from
@@ -220,18 +213,18 @@ void Anim2DTemplate::parseImage( INI *ini, void *instance, void *store, const vo
 		if( image == NULL )
 		{
 
-			DEBUG_CRASH(( "Anim2DTemplate::parseImageSequence - Image '%s' not found for animation '%s'.  Check the number of images specified in INI and also make sure all the actual images exist.\n",
+			DEBUG_CRASH(( "Anim2DTemplate::parseImageSequence - Image '%s' not found for animation '%s'.  Check the number of images specified in INI and also make sure all the actual images exist.",
 										imageName.str(), animTemplate->getName().str() ));
 			throw INI_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// store the image in the next free frame
 		animTemplate->storeImage( image );
 
-	}  // end if
+	}
 
-}  // end parseImageSequence
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Store the image at the next open image slot for the animation */
@@ -253,46 +246,46 @@ void Anim2DTemplate::storeImage( const Image *image )
 			m_images[ i ] = image;
 			return;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// if we got here we tried to store an image in an array that was too small
-	DEBUG_CRASH(( "Anim2DTemplate::storeImage - Unable to store image '%s' into animation '%s' because the animation is setup to only support '%d' image frames\n",
+	DEBUG_CRASH(( "Anim2DTemplate::storeImage - Unable to store image '%s' into animation '%s' because the animation is setup to only support '%d' image frames",
 								image->getName().str(), getName().str(), m_numFrames ));
 	throw INI_INVALID_DATA;
 
-}  // end storeImage
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Return the Image* for the frame number requested */
 // ------------------------------------------------------------------------------------------------
 const Image* Anim2DTemplate::getFrame( UnsignedShort frameNumber ) const
-{ 
+{
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_images != NULL, 
-										 ("Anim2DTemplate::getFrame - Image data is NULL for animation '%s'\n",
+	DEBUG_ASSERTCRASH( m_images != NULL,
+										 ("Anim2DTemplate::getFrame - Image data is NULL for animation '%s'",
 										  getName().str()) );
-	
-	// sanity										
+
+	// sanity
 	if( frameNumber < 0 || frameNumber >= m_numFrames )
 	{
-		
-		DEBUG_CRASH(( "Anim2DTemplate::getFrame - Illegal frame number '%d' for animation '%s'\n",
+
+		DEBUG_CRASH(( "Anim2DTemplate::getFrame - Illegal frame number '%d' for animation '%s'",
 									frameNumber, getName().str() ));
 		return NULL;
 
-	}  // end if
+	}
 	else
 	{
 
 		// return the image frame
 		return m_images[ frameNumber ];
 
-	}  // end else
+	}
 
-}  // end getFrame
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -302,20 +295,14 @@ const Image* Anim2DTemplate::getFrame( UnsignedShort frameNumber ) const
 // ------------------------------------------------------------------------------------------------
 Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem )
 {
-
 	// sanity
-	DEBUG_ASSERTCRASH( animTemplate != NULL, ("Anim2D::Anim2D - NULL template\n") );
+	DEBUG_ASSERTCRASH( animTemplate != NULL, ("Anim2D::Anim2D - NULL template") );
 
-	//Added By Sadullah Nader
-	//Initialization 
-
-	m_currentFrame = 0; 
-	
-	//
+	m_currentFrame = 0;
 
 	// set the template
 	m_template = animTemplate;
-	
+
 	// initialize members
 	m_status = ANIM_2D_STATUS_NONE;
 	m_alpha = 1.0f;
@@ -329,22 +316,18 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem
 	m_minFrame = 0;
 	m_maxFrame = m_template->getNumFrames() - 1;
 	m_framesBetweenUpdates = m_template->getNumFramesBetweenUpdates();
-	
-	//added by Sadullah Nader
-	// initializing pointers to NULL, and clearing Frame counters before
+
 	// we register ourselves to the System
 	m_collectionSystemNext = NULL;
 	m_collectionSystemPrev = NULL;
-	
+
 	m_lastUpdateFrame = 0;
-	
+
 	// if a system is present, register ourselves with that system
 	m_collectionSystem = collectionSystem;
 	if( m_collectionSystem )
 		m_collectionSystem->registerAnimation( this );
-	
-	
-}  // end Anim2D
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -355,7 +338,7 @@ Anim2D::~Anim2D( void )
 	if( m_collectionSystem )
 		m_collectionSystem->unRegisterAnimation( this );
 
-}  // end ~Anim2D
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set the current animation frame */
@@ -364,16 +347,16 @@ void Anim2D::setCurrentFrame( UnsignedShort frame )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_template != NULL, ("Anim2D::reset - No template for animation\n") );
+	DEBUG_ASSERTCRASH( m_template != NULL, ("Anim2D::reset - No template for animation") );
 
 	// sanity
-	DEBUG_ASSERTCRASH( TheGameLogic != NULL,	
-										 ("Anim2D::setCurrentFrame - TheGameLogic must exist to use animation instances (%s)\n",
+	DEBUG_ASSERTCRASH( TheGameLogic != NULL,
+										 ("Anim2D::setCurrentFrame - TheGameLogic must exist to use animation instances (%s)",
 										  m_template->getName().str()) );
 
 	// sanity
 	DEBUG_ASSERTCRASH( frame >= 0 && frame < m_template->getNumFrames(),
-										 ("Anim2D::setCurrentFrame - Illegal frame number '%d' in animation\n", 
+										 ("Anim2D::setCurrentFrame - Illegal frame number '%d' in animation",
 										 frame, m_template->getName().str()) );
 
 	// set the frame
@@ -382,7 +365,7 @@ void Anim2D::setCurrentFrame( UnsignedShort frame )
 	// record the frame of this update to our current frame
 	m_lastUpdateFrame = TheGameLogic->getFrame();
 
-}  // end setCurrentFrame
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Randomize the current frame */
@@ -391,12 +374,12 @@ void Anim2D::randomizeCurrentFrame( void )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_template != NULL, ("Anim2D::reset - No template for animation\n") );
+	DEBUG_ASSERTCRASH( m_template != NULL, ("Anim2D::reset - No template for animation") );
 
 	// set the current frame to a random frame
 	setCurrentFrame( GameClientRandomValue( 0, m_template->getNumFrames() - 1 ) );
 
-}  // end randomizeCurrentFrame
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Reset this animation instance to the "start" of the animation */
@@ -405,7 +388,7 @@ void Anim2D::reset( void )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_template != NULL, ("Anim2D::reset - No template for animation\n") );
+	DEBUG_ASSERTCRASH( m_template != NULL, ("Anim2D::reset - No template for animation") );
 
 	switch( m_template->getAnimMode() )
 	{
@@ -426,13 +409,13 @@ void Anim2D::reset( void )
 
 		// --------------------------------------------------------------------------------------------
 		default:
-			DEBUG_CRASH(( "Anim2D::reset - Unknown animation mode '%d' for '%s'\n",
+			DEBUG_CRASH(( "Anim2D::reset - Unknown animation mode '%d' for '%s'",
 										m_template->getAnimMode(), m_template->getName().str() ));
 			break;
 
-	}  // end switch, animation mode
+	}
 
-}  // end reset
+}
 
 // ------------------------------------------------------------------------------------------------
 /** This is called after we are drawn ... if sufficient time has passed since our last
@@ -442,8 +425,8 @@ void Anim2D::tryNextFrame( void )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( TheGameLogic != NULL,	
-										 ("Anim2D::tryNextFrame - TheGameLogic must exist to use animation instances (%s)\n",
+	DEBUG_ASSERTCRASH( TheGameLogic != NULL,
+										 ("Anim2D::tryNextFrame - TheGameLogic must exist to use animation instances (%s)",
 										  m_template->getName().str()) );
 
 	// how many frames have passed since our last update
@@ -463,7 +446,7 @@ void Anim2D::tryNextFrame( void )
 					setStatus( ANIM_2D_STATUS_COMPLETE );
 				break;
 
-			}  // end once
+			}
 
 			// -------------------------------------------------------------------------------------------
 			case ANIM_2D_ONCE_BACKWARDS:
@@ -475,7 +458,7 @@ void Anim2D::tryNextFrame( void )
 					setStatus( ANIM_2D_STATUS_COMPLETE );
 				break;
 
-			}  // end once backwards
+			}
 
 			// -------------------------------------------------------------------------------------------
 			case ANIM_2D_LOOP:
@@ -487,7 +470,7 @@ void Anim2D::tryNextFrame( void )
 					setCurrentFrame( m_currentFrame + 1 );
 				break;
 
-			}  // end loop
+			}
 
 			// -------------------------------------------------------------------------------------------
 			case ANIM_2D_LOOP_BACKWARDS:
@@ -498,9 +481,9 @@ void Anim2D::tryNextFrame( void )
 				else
 					setCurrentFrame( m_maxFrame );
 				break;
-			
-			}  // end loop backwards
-				
+
+			}
+
 			// -------------------------------------------------------------------------------------------
 			case ANIM_2D_PING_PONG:
 			case ANIM_2D_PING_PONG_BACKWARDS:
@@ -518,15 +501,15 @@ void Anim2D::tryNextFrame( void )
 						setCurrentFrame( m_currentFrame + 1 );
 						clearStatus( ANIM_2D_STATUS_REVERSED );
 
-					}  // end if
+					}
 					else
 					{
 
 						setCurrentFrame( m_currentFrame - 1 );
 
-					}  // end else
+					}
 
-				}  // end if
+				}
 				else
 				{
 
@@ -540,35 +523,35 @@ void Anim2D::tryNextFrame( void )
 						setCurrentFrame( m_currentFrame - 1 );
 						setStatus( ANIM_2D_STATUS_REVERSED );
 
-					}  // end if
+					}
 					else
 					{
 
 						setCurrentFrame( m_currentFrame + 1 );
 
-					}  // end else
+					}
 
-				}  // end else
+				}
 
 				break;
 
-			}  // end ping pong / ping pong backwards
+			}
 
 			// -------------------------------------------------------------------------------------------
 			default:
 			{
 
-				DEBUG_CRASH(( "Anim2D::tryNextFrame - Unknown animation mode '%d' for '%s'\n",
+				DEBUG_CRASH(( "Anim2D::tryNextFrame - Unknown animation mode '%d' for '%s'",
 											m_template->getAnimMode(), m_template->getName().str() ));
 				break;
 
-			}  // end default
-							
-		}  // end switch
+			}
+
+		}
 
-	}  // end if
+	}
 
-}  // end tryNextFrame
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set status bit */
@@ -579,7 +562,7 @@ void Anim2D::setStatus( UnsignedByte statusBits )
 	// set the bits
 	BitSet( m_status, statusBits );
 
-}  // end setStatus
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Clear status bit */
@@ -590,7 +573,7 @@ void Anim2D::clearStatus( UnsignedByte statusBits )
 	// clear bits
 	BitClear( m_status, statusBits );
 
-}  // end clearStatus
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Return the "natural" width of the image for our current frame */
@@ -601,10 +584,10 @@ UnsignedInt Anim2D::getCurrentFrameWidth( void ) const
 
 	if( currentFrameImage )
 		return currentFrameImage->getImageWidth();
-	
+
 	return 0;
 
-}  // end getCurrentFrameWidth
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Return the "natural" height of the image for our current frame */
@@ -615,10 +598,10 @@ UnsignedInt Anim2D::getCurrentFrameHeight( void ) const
 
 	if( currentFrameImage )
 		return currentFrameImage->getImageHeight();
-	
+
 	return 0;
 
-}  // end getCurrentFrameHeight
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Draw an Anim2D using the natural width and height of the image data */
@@ -630,7 +613,7 @@ void Anim2D::draw( Int x, Int y )
 	const Image *image = m_template->getFrame( m_currentFrame );
 
 	// sanity
-	DEBUG_ASSERTCRASH( image != NULL, ("Anim2D::draw - Image not found for frame '%d' on animation '%s'\n",
+	DEBUG_ASSERTCRASH( image != NULL, ("Anim2D::draw - Image not found for frame '%d' on animation '%s'",
 										 m_currentFrame, m_template->getName().str()) );
 
 	// get the natural width and height of this image
@@ -648,7 +631,7 @@ void Anim2D::draw( Int x, Int y )
  	if( m_collectionSystem == NULL && BitIsSet( m_status, ANIM_2D_STATUS_FROZEN ) == FALSE )
 		tryNextFrame();
 
-}  // end draw
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Drawing an Anim2D using a forced width and height */
@@ -658,9 +641,9 @@ void Anim2D::draw( Int x, Int y, Int width, Int height )
 
 	// get the current image
 	const Image *image = m_template->getFrame( m_currentFrame );
-	
+
 	// sanity
-	DEBUG_ASSERTCRASH( image != NULL, ("Anim2D::draw - Image not found for frame '%d' on animation '%s'\n",
+	DEBUG_ASSERTCRASH( image != NULL, ("Anim2D::draw - Image not found for frame '%d' on animation '%s'",
 										 m_currentFrame, m_template->getName().str()) );
 
 
@@ -676,7 +659,7 @@ void Anim2D::draw( Int x, Int y, Int width, Int height )
  	if( m_collectionSystem == NULL && BitIsSet( m_status, ANIM_2D_STATUS_FROZEN ) == FALSE )
 		tryNextFrame();
 
-}  // end draw
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -685,7 +668,7 @@ void Anim2D::draw( Int x, Int y, Int width, Int height )
 // ------------------------------------------------------------------------------------------------
 void Anim2D::xfer( Xfer *xfer )
 {
-	
+
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
@@ -712,7 +695,7 @@ void Anim2D::xfer( Xfer *xfer )
 	// alpha
 	xfer->xferReal( &m_alpha );
 
-}  // end xfer
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -725,7 +708,7 @@ Anim2DCollection::Anim2DCollection( void )
 
 	m_templateList = NULL;
 	m_instanceList = NULL;
-}  // end Anim2DCollection
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -733,7 +716,7 @@ Anim2DCollection::~Anim2DCollection( void )
 {
 
 	// there should not be any animation instances registered with us since we're being destroyed
-	DEBUG_ASSERTCRASH( m_instanceList == NULL, ("Anim2DCollection - instance list is not NULL\n") );
+	DEBUG_ASSERTCRASH( m_instanceList == NULL, ("Anim2DCollection - instance list is not NULL") );
 
 	// delete all the templates
 	Anim2DTemplate *nextTemplate;
@@ -749,9 +732,9 @@ Anim2DCollection::~Anim2DCollection( void )
 		// set the head of our list to the next template
 		m_templateList = nextTemplate;
 
-	}  // end while
+	}
 
-}  // end ~Anim2DCollection
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Initialize 2D animation collection */
@@ -760,9 +743,9 @@ void Anim2DCollection::init( void )
 {
 	INI ini;
 
-	ini.load( "Data\\INI\\Animation2D.ini", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Animation2D", INI_LOAD_OVERWRITE, NULL );
 
-}  // end init
+}
 
 // ------------------------------------------------------------------------------------------------
 /** System update phase */
@@ -776,12 +759,12 @@ void Anim2DCollection::update( void )
 	{
 
 		// try to update the frame
-		if( BitIsSet( anim->getStatus(), ANIM_2D_STATUS_FROZEN ) == FALSE )	
+		if( BitIsSet( anim->getStatus(), ANIM_2D_STATUS_FROZEN ) == FALSE )
 			anim->tryNextFrame();
 
-	}  // end for, anim
+	}
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Search the template list for a template with a matching name */
@@ -790,19 +773,19 @@ Anim2DTemplate *Anim2DCollection::findTemplate( const AsciiString& name )
 {
 
 	// search the list
-	for( Anim2DTemplate *animTemplate = m_templateList; 
-			 animTemplate; 
+	for( Anim2DTemplate *animTemplate = m_templateList;
+			 animTemplate;
 			 animTemplate = animTemplate->friend_getNextTemplate() )
 	{
 
 		if( animTemplate->getName() == name )
 			return animTemplate;
 
-	}  // end for
+	}
 
 	return NULL;  // template not found
 
-}  // end findTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 Anim2DTemplate* Anim2DCollection::getNextTemplate( Anim2DTemplate *animTemplate ) const
@@ -830,7 +813,7 @@ Anim2DTemplate *Anim2DCollection::newTemplate( const AsciiString& name )
 	// return the new template
 	return animTemplate;
 
-}  // end newTemplate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Register animation instance with us.  When an animation instance is registered it can
@@ -846,7 +829,7 @@ void Anim2DCollection::registerAnimation( Anim2D *anim )
 	// sanity
 	DEBUG_ASSERTCRASH( anim->m_collectionSystemNext == NULL &&
 										 anim->m_collectionSystemPrev == NULL,
-										 ("Registering animation instance, instance '%s' is already in a system\n",
+										 ("Registering animation instance, instance '%s' is already in a system",
 										 anim->getAnimTemplate()->getName().str()) );
 
 	// tie to our list
@@ -856,7 +839,7 @@ void Anim2DCollection::registerAnimation( Anim2D *anim )
 		m_instanceList->m_collectionSystemPrev = anim;
 	m_instanceList = anim;
 
-}  // end registerAnimation
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -879,5 +862,5 @@ void Anim2DCollection::unRegisterAnimation( Anim2D *anim )
 	else
 		m_instanceList = anim->m_collectionSystemNext;
 
-}  // end unRegisterAnimation
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp
index 715ddf84fbb..c04aadbe0e7 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp
@@ -24,12 +24,12 @@
 
 // FILE: CampaignManager.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Jul 2002
@@ -37,7 +37,7 @@
 //	Filename: 	CampaignManager.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The flow of the campaigns are stored up in here!
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/CampaignManager.h"
 
@@ -66,14 +66,9 @@
 CampaignManager *TheCampaignManager = NULL;
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
-const FieldParse CampaignManager::m_campaignFieldParseTable[] = 
+const FieldParse CampaignManager::m_campaignFieldParseTable[] =
 {
 
 	{ "Mission",						CampaignManager::parseMissionPart,	NULL, NULL },
@@ -83,7 +78,7 @@ const FieldParse CampaignManager::m_campaignFieldParseTable[] =
 	{ "IsChallengeCampaign",			INI::parseBool,				NULL, offsetof( Campaign, m_isChallengeCampaign ) },
 	{ "PlayerFaction",		INI::parseAsciiString,					NULL, offsetof( Campaign, m_playerFactionName ) },
 
-	{ NULL,										NULL,													NULL, 0 }  // keep this last
+	{ NULL,										NULL,													NULL, 0 }
 
 };
 
@@ -99,10 +94,10 @@ void INI::parseCampaignDefinition( INI *ini )
 
 	// read the name
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	// find existing item if present
-	DEBUG_ASSERTCRASH( TheCampaignManager, ("parseCampaignDefinition: Unable to Get TheCampaignManager\n") );
+	DEBUG_ASSERTCRASH( TheCampaignManager, ("parseCampaignDefinition: Unable to Get TheCampaignManager") );
 	if( !TheCampaignManager )
 		return;
 
@@ -110,12 +105,12 @@ void INI::parseCampaignDefinition( INI *ini )
 	campaign = TheCampaignManager->newCampaign( name );
 
 	// sanity
-	DEBUG_ASSERTCRASH( campaign, ("parseCampaignDefinition: Unable to allocate campaign '%s'\n", name.str()) );
+	DEBUG_ASSERTCRASH( campaign, ("parseCampaignDefinition: Unable to allocate campaign '%s'", name.str()) );
 
 	// parse the ini definition
 	ini->initFromINI( campaign, TheCampaignManager->getFieldParse() );
 
-}  // end parseCampaignDefinition
+}
 
 //-----------------------------------------------------------------------------
 Campaign::Campaign( void ):
@@ -135,8 +130,7 @@ Campaign::~Campaign( void )
 	{
 		Mission *mission = *it;
 		it = m_missions.erase( it );
-		if(mission)
-			deleteInstance(mission);
+		deleteInstance(mission);
 	}
 }
 
@@ -163,7 +157,7 @@ Mission *Campaign::newMission( AsciiString name )
 		else
 			++it;
 	}
-	Mission *newMission = newInstance(Mission);	
+	Mission *newMission = newInstance(Mission);
 	newMission->m_name.set(name);
 	m_missions.push_back(newMission);
 	return newMission;
@@ -175,7 +169,7 @@ Mission *Campaign::getMission( AsciiString missionName )
 	if(missionName.isEmpty())
 		return NULL;
 	MissionListIt it;
-	it = m_missions.begin();	
+	it = m_missions.begin();
 	// we've reached the end of the campaign
 	while(it != m_missions.end())
 	{
@@ -201,7 +195,7 @@ Mission *Campaign::getNextMission( Mission *current)
 		name = current->m_nextMission;
 	name.toLower();
 	MissionListIt it;
-	it = m_missions.begin();	
+	it = m_missions.begin();
 	// we've reached the end of the campaign
 	if(name.isEmpty())
 		return NULL;
@@ -241,8 +235,7 @@ CampaignManager::~CampaignManager( void )
 	{
 		Campaign *campaign = *it;
 		it = m_campaignList.erase( it );
-		if(campaign)
-			deleteInstance(campaign);
+		deleteInstance(campaign);
 	}
 }
 
@@ -251,7 +244,7 @@ void CampaignManager::init( void )
 {
 	INI ini;
 	// Read from INI all the CampaignManager
-	ini.load( AsciiString( "Data\\INI\\Campaign.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Campaign", INI_LOAD_OVERWRITE, NULL );
 }
 
 //-----------------------------------------------------------------------------
@@ -273,7 +266,7 @@ Mission *CampaignManager::gotoNextMission( void )
 		return NULL;
 	m_currentMission = m_currentCampaign->getNextMission(m_currentMission);
 	return m_currentMission;
-	
+
 }
 
 //-----------------------------------------------------------------------------
@@ -298,7 +291,7 @@ void CampaignManager::setCampaignAndMission( AsciiString campaign, AsciiString m
 		}
 		++it;
 	}
-}	
+}
 
 //-----------------------------------------------------------------------------
 void CampaignManager::setCampaign( AsciiString campaign )
@@ -329,7 +322,7 @@ AsciiString CampaignManager::getCurrentMap( void )
 {
 	if(!m_currentMission)
 		return AsciiString::TheEmptyString;
-	
+
 	return m_currentMission->m_mapName;
 }
 
@@ -344,8 +337,8 @@ Int CampaignManager::getCurrentMissionNumber( void )
 	{
 		Campaign::MissionListIt it;
 
-		for( it = m_currentCampaign->m_missions.begin(); 
-				 it != m_currentCampaign->m_missions.end(); 
+		for( it = m_currentCampaign->m_missions.begin();
+				 it != m_currentCampaign->m_missions.end();
 				 ++it )
 		{
 
@@ -353,9 +346,9 @@ Int CampaignManager::getCurrentMissionNumber( void )
 			if( *it == m_currentMission )
 				return number;
 		}
-		
+
 	}
-	
+
 	return number;
 
 }
@@ -363,7 +356,7 @@ Int CampaignManager::getCurrentMissionNumber( void )
 //-----------------------------------------------------------------------------
 void CampaignManager::parseMissionPart( INI* ini, void *instance, void *store, const void *userData )
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Map",							INI::parseAsciiString,				NULL, offsetof( Mission, m_mapName ) },
 			{ "NextMission",			INI::parseAsciiString,				NULL, offsetof( Mission, m_nextMission ) },
@@ -381,16 +374,16 @@ void CampaignManager::parseMissionPart( INI* ini, void *instance, void *store, c
 			{ "LocationNameLabel",INI::parseAsciiString,				NULL, offsetof( Mission, m_locationNameLabel ) },
 			{ "VoiceLength",			INI::parseInt ,								NULL, offsetof( Mission, m_voiceLength ) },
 
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 	AsciiString name;
 	const char* c = ini->getNextToken();
-	name.set( c );	
+	name.set( c );
 
 	Mission *mission = ((Campaign*)instance)->newMission(name );
 	ini->initFromINI(mission, myFieldParse);
 }
-	
+
 
 //-----------------------------------------------------------------------------
 Campaign *CampaignManager::newCampaign(AsciiString name)
@@ -419,7 +412,7 @@ Campaign *CampaignManager::newCampaign(AsciiString name)
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Added RankPoints Saving
 	* 4: Need to have Challenge info in Mission saves as well as normal saves
 */
@@ -437,7 +430,7 @@ void CampaignManager::xfer( Xfer *xfer )
 	if( m_currentCampaign )
 		currentCampaign = m_currentCampaign->m_name;
 	xfer->xferAsciiString( &currentCampaign );
-	
+
 	// current mission
 	AsciiString currentMission;
 	if( m_currentMission )
@@ -465,24 +458,21 @@ void CampaignManager::xfer( Xfer *xfer )
 		Bool isChallengeCampaign = m_currentCampaign ? m_currentCampaign->m_isChallengeCampaign : FALSE;
 		xfer->xferBool(&isChallengeCampaign);
 
-		if( isChallengeCampaign ) 
+		if( isChallengeCampaign )
 		{
-			if( TheChallengeGameInfo==NULL ) 
+			if( TheChallengeGameInfo==NULL )
 			{
 				TheChallengeGameInfo = NEW SkirmishGameInfo;
-				TheChallengeGameInfo->init();  
+				TheChallengeGameInfo->init();
 				TheChallengeGameInfo->clearSlotList();
 				TheChallengeGameInfo->reset();
 			}
 			xfer->xferSnapshot(TheChallengeGameInfo);
-		} 
-		else 
+		}
+		else
 		{
-			if( TheChallengeGameInfo ) 
-			{
-				delete TheChallengeGameInfo;
-				TheChallengeGameInfo = NULL;
-			}
+			delete TheChallengeGameInfo;
+			TheChallengeGameInfo = NULL;
 		}
 	}
 
@@ -496,7 +486,7 @@ void CampaignManager::xfer( Xfer *xfer )
 		m_xferChallengeGeneralsPlayerTemplateNum = playerTemplateNum;
 	}
 
-}  // end xfer
+}
 
 void CampaignManager::loadPostProcess( void )
 {
@@ -526,4 +516,4 @@ Mission::~Mission( void )
 {
 
 }
-	
+
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp
deleted file mode 100644
index ee540455da7..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp	
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    Debug
-//
-// File name: AudiDebugDisplay.cpp
-//
-// Created:   11/13/01 TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/DebugDisplay.h"
-#include "Common/GameAudio.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-static DebugDisplayInterface *debugDisplay;
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-static void printFunc( char *text )
-{
-	debugDisplay->printf( text );
-}
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//============================================================================
-// AudioDebugDisplay 
-//============================================================================
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-void AudioDebugDisplay ( DebugDisplayInterface *dd, void *, FILE *fp = NULL )
-{
-	TheAudio->audioDebugDisplay( dd, NULL, fp );
-}
-#endif
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp
index f7d3310c53e..d103c4e1b86 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   Generals
@@ -42,57 +42,57 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/DebugDisplay.h"
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 
@@ -171,7 +171,7 @@ Int		DebugDisplay::getHeight( void )
 void	DebugDisplay::setTextColor( Color color )
 {
 	m_textColor = color;
-}	
+}
 
 //============================================================================
 // DebugDisplay::setRightMargin
@@ -214,7 +214,7 @@ void	DebugDisplay::printf( const Char *format, ...)
 	DEBUG_ASSERTCRASH( result < sizeof(text), ("text overflow in DebugDisplay::printf() - string too long"));
 
 	// find every line and print it
-	Char *ptr = text;;
+	Char *ptr = text;
 	Char *lineStart = ptr;
 	Int lineLen = 0;
 	Char ch;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Image.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Image.cpp
index 3f0eea99822..a701c037905 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Image.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/Image.cpp
@@ -27,11 +27,11 @@
 // Desc:      High level representation of images, this is currently being
 //						written so we have a way to refer to images in the windows
 //						GUI, this system should be replaced with something that can
-//						handle real image management or written to accomodate 
+//						handle real image management or written to accomodate
 //						all parts of the engine that need images.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_IMAGE_STATUS_NAMES
 #include "Lib/BaseType.h"
@@ -42,7 +42,7 @@
 #include "Common/NameKeyGenerator.h"
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-const FieldParse Image::m_imageFieldParseTable[] = 
+const FieldParse Image::m_imageFieldParseTable[] =
 {
 
 	{ "Texture",				INI::parseAsciiString,							NULL, 		offsetof( Image, m_filename ) },
@@ -81,19 +81,19 @@ void Image::parseImageCoords( INI* ini, void *instance, void *store, const void*
 	uvCoords.lo.y = (Real)top;
 	uvCoords.hi.x = (Real)right;
 	uvCoords.hi.y = (Real)bottom;
-	
+
 	// adjust the coords by texture size
 	const ICoord2D *textureSize = theImage->getTextureSize();
 	if( textureSize->x )
 	{
 		uvCoords.lo.x /= (Real)textureSize->x;
 		uvCoords.hi.x /= (Real)textureSize->x;
-	}  // end if
+	}
 	if( textureSize->y )
 	{
 		uvCoords.lo.y /= (Real)textureSize->y;
 		uvCoords.hi.y /= (Real)textureSize->y;
-	}  // end if
+	}
 
 	// store the uv coords
 	theImage->setUV( &uvCoords );
@@ -104,13 +104,13 @@ void Image::parseImageCoords( INI* ini, void *instance, void *store, const void*
 	imageSize.y = bottom - top;
 	theImage->setImageSize( &imageSize );
 
-}  // end parseImageCoord
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse the image status line */
 //-------------------------------------------------------------------------------------------------
 void Image::parseImageStatus( INI* ini, void *instance, void *store, const void* /*userData*/)
-{	
+{
 	// use existing INI parsing for the bit strings
 	INI::parseBitString32(ini, instance, store, imageStatusNames);
 
@@ -129,9 +129,9 @@ void Image::parseImageStatus( INI* ini, void *instance, void *store, const void*
 		imageSize.y = theImage->getImageWidth();   // note it's width not height
 		theImage->setImageSize( &imageSize );
 
-	}  // end if
+	}
 
-}  // end parseImageStatus
+}
 
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 ImageCollection *TheMappedImageCollection = NULL;  ///< mapped images
@@ -155,14 +155,14 @@ Image::Image( void )
 	m_rawTextureData = NULL;
 	m_status = IMAGE_STATUS_NONE;
 
-}  // end Image
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Image::~Image( void )
 {
 
-}  // end ~Image
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set a status bit into the existing status, return the previous status
@@ -175,7 +175,7 @@ UnsignedInt Image::setStatus( UnsignedInt bit )
 	BitSet( m_status, bit );
 	return prevStatus;
 
-}  // end setStatus
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Clear a status bit from the existing status, return the previous
@@ -188,7 +188,7 @@ UnsignedInt Image::clearStatus( UnsignedInt bit )
 	BitClear( m_status, bit );
 	return prevStatus;
 
-}  // end clearStatus
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -198,15 +198,15 @@ UnsignedInt Image::clearStatus( UnsignedInt bit )
 //-------------------------------------------------------------------------------------------------
 ImageCollection::ImageCollection( void )
 {
-}  // end ImageCollection
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ImageCollection::~ImageCollection( void )
 {
-  for (std::map<unsigned,Image *>::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
+  for (ImageMap::iterator i=m_imageMap.begin();i!=m_imageMap.end();++i)
     deleteInstance(i->second);
-}  // end ~ImageCollection
+}
 
 //-------------------------------------------------------------------------------------------------
 /** adds the given image to the collection, transfers ownership to this object */
@@ -214,16 +214,30 @@ ImageCollection::~ImageCollection( void )
 void ImageCollection::addImage( Image *image )
 {
   m_imageMap[TheNameKeyGenerator->nameToLowercaseKey(image->getName())]=image;
-}  // end newImage
+}
+
+//-------------------------------------------------------------------------------------------------
+const Image *ImageCollection::findImage( NameKeyType namekey ) const
+{
+	ImageMap::const_iterator i = m_imageMap.find(namekey);
+	return i == m_imageMap.end() ? NULL : i->second;
+}
+
+//-------------------------------------------------------------------------------------------------
+/** Find an image given the image name */
+//-------------------------------------------------------------------------------------------------
+const Image *ImageCollection::findImageByName( const AsciiString& name ) const
+{
+	return findImage(TheNameKeyGenerator->nameToLowercaseKey(name));
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Find an image given the image name */
 //-------------------------------------------------------------------------------------------------
-const Image *ImageCollection::findImageByName( const AsciiString& name )
+const Image *ImageCollection::findImageByName( const char* name ) const
 {
-  std::map<unsigned,Image *>::iterator i=m_imageMap.find(TheNameKeyGenerator->nameToLowercaseKey(name));
-  return i==m_imageMap.end()?NULL:i->second;
-}  // end findImageByName
+	return findImage(TheNameKeyGenerator->nameToLowercaseKey(name));
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Load this image collection with all the images specified in the INI files
@@ -235,14 +249,14 @@ void ImageCollection::load( Int textureSize )
 	INI ini;
 	// first load in the user created mapped image files if we have them.
 	WIN32_FIND_DATA findData;
-	AsciiString userDataPath;	
+	AsciiString userDataPath;
 	if(TheGlobalData)
 	{
 		userDataPath.format("%sINI\\MappedImages\\*.ini",TheGlobalData->getPath_UserData().str());
 		if(FindFirstFile(userDataPath.str(), &findData) !=INVALID_HANDLE_VALUE)
 		{
 			userDataPath.format("%sINI\\MappedImages",TheGlobalData->getPath_UserData().str());
-			ini.loadDirectory(userDataPath, TRUE, INI_LOAD_OVERWRITE, NULL );
+			ini.loadDirectory(userDataPath, INI_LOAD_OVERWRITE, NULL );
 		}
 	}
 
@@ -251,9 +265,9 @@ void ImageCollection::load( Int textureSize )
 
 	// load all the ine files in that directory
 
-	ini.loadDirectory( AsciiString( buffer ), TRUE, INI_LOAD_OVERWRITE, NULL );
+	ini.loadDirectory( AsciiString( buffer ), INI_LOAD_OVERWRITE, NULL );
 
-	ini.loadDirectory("Data\\INI\\MappedImages\\HandCreated", TRUE, INI_LOAD_OVERWRITE, NULL );
+	ini.loadDirectory("Data\\INI\\MappedImages\\HandCreated", INI_LOAD_OVERWRITE, NULL );
 
 
-}  // end load
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp
index b21a98250de..2cd89f13715 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp
@@ -27,7 +27,7 @@
 // Author: Michael S. Booth, November 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_PARTICLE_SYSTEM_NAMES
 
@@ -49,13 +49,8 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/TerrainLogic.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
-//------------------------------------------------------------------------------ Performance Timers 
+//------------------------------------------------------------------------------ Performance Timers
 //#include "Common/PerfMetrics.h"
 //#include "Common/PerfTimer.h"
 
@@ -73,8 +68,6 @@ ParticleSystemManager *TheParticleSystemManager = NULL;
 // ------------------------------------------------------------------------------------------------
 ParticleInfo::ParticleInfo( void )
 {
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_angleZ = 0.0f;
 	m_angularDamping = 0.0f;
 	m_angularRateZ = 0.0f;
@@ -91,9 +84,8 @@ ParticleInfo::ParticleInfo( void )
 
 	m_lifetime = 0;
 	m_particleUpTowardsEmitter = FALSE;
-	
-	//
-}  // end ParticleInfo
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -101,7 +93,7 @@ ParticleInfo::ParticleInfo( void )
 void ParticleInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -159,7 +151,7 @@ void ParticleInfo::xfer( Xfer *xfer )
 		xfer->xferReal( &m_alphaKey[ i ].value );
 		xfer->xferUnsignedInt( &m_alphaKey[ i ].frame );
 
-	}  // end for, i
+	}
 
 	// color keys
 	for( i = 0; i < MAX_KEYFRAMES; ++i )
@@ -168,7 +160,7 @@ void ParticleInfo::xfer( Xfer *xfer )
 		xfer->xferRGBColor( &m_colorKey[ i ].color );
 		xfer->xferUnsignedInt( &m_colorKey[ i ].frame );
 
-	}  // end for, i
+	}
 
 	// color scale
 	xfer->xferReal( &m_colorScale );
@@ -179,7 +171,7 @@ void ParticleInfo::xfer( Xfer *xfer )
 	// wind randomness
 	xfer->xferReal( &m_windRandomness );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -187,7 +179,7 @@ void ParticleInfo::xfer( Xfer *xfer )
 void ParticleInfo::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
@@ -267,15 +259,12 @@ Particle::Particle( ParticleSystem *system, const ParticleInfo *info )
 
 	m_angleZ = info->m_angleZ;
 
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_lastPos.zero();
-	//
-	m_windRandomness = info->m_windRandomness;	
+	m_windRandomness = info->m_windRandomness;
 	m_particleUpTowardsEmitter = info->m_particleUpTowardsEmitter;
 	m_emitterPos = info->m_emitterPos;
 
-	
+
 	m_angularRateZ = info->m_angularRateZ;
 	m_angularDamping = info->m_angularDamping;
 
@@ -318,7 +307,7 @@ Particle::Particle( ParticleSystem *system, const ParticleInfo *info )
 	// add this particle to the Particle System list, retaining local creation order
 	m_system->addParticle(this);
 
-	//DEBUG_ASSERTLOG(!(totalParticleCount % 100 == 0), ( "TotalParticleCount = %d\n", m_totalParticleCount ));
+	//DEBUG_ASSERTLOG(!(totalParticleCount % 100 == 0), ( "TotalParticleCount = %d", m_totalParticleCount ));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -340,7 +329,7 @@ Particle::~Particle()
 	// remove from the global list
 	TheParticleSystemManager->removeParticle(this);
 
-	//DEBUG_ASSERTLOG(!(totalParticleCount % 100 == 0), ( "TotalParticleCount = %d\n", m_totalParticleCount ));
+	//DEBUG_ASSERTLOG(!(totalParticleCount % 100 == 0), ( "TotalParticleCount = %d", m_totalParticleCount ));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -512,9 +501,9 @@ void Particle::doWindMotion( void )
 			systemPos.y += objPos->y;
 			systemPos.z += objPos->z;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else if( DrawableID attachedDraw = m_system->getAttachedDrawable() )
 	{
 		Drawable *draw = TheGameClient->findDrawableByID( attachedDraw );
@@ -527,9 +516,9 @@ void Particle::doWindMotion( void )
 			systemPos.y += drawPos->y;
 			systemPos.z += drawPos->z;
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 
 	//
 	// compute a vector from the system position in the world to the particle ... we will use
@@ -557,22 +546,22 @@ void Particle::doWindMotion( void )
 
 		// only apply force if still within the circle of influence
 		if( distFromWind > fullForceDistance )
-			windForceStrength *= (1.0f - ((distFromWind - fullForceDistance) / 
+			windForceStrength *= (1.0f - ((distFromWind - fullForceDistance) /
 																		(noForceDistance - fullForceDistance)));
 
 		// integate the wind motion into the position
 		m_pos.x += (Cos( windAngle ) * windForceStrength);
 		m_pos.y += (Sin( windAngle ) * windForceStrength);
 
-	}  // end if
+	}
 
-}  // doWindMotion
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Get priority of a particle ... which is the priority of it's attached system */
 // ------------------------------------------------------------------------------------------------
 ParticlePriorityType Particle::getPriority( void )
-{ 
+{
 	return m_system->getPriority();
 }
 
@@ -585,7 +574,7 @@ Bool Particle::isInvisible( void )
 	{
 		case ParticleSystemInfo::ADDITIVE:
 			// if color is black, this particle is invisible
-			
+
 			// check that we're not in the process of going to another color
 			if (m_colorKey[ m_colorTargetKey ].frame == 0)
 			{
@@ -626,7 +615,7 @@ Bool Particle::isInvisible( void )
 void Particle::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -636,7 +625,7 @@ void Particle::crc( Xfer *xfer )
 void Particle::xfer( Xfer *xfer )
 {
 
-	// version 
+	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
@@ -685,7 +674,7 @@ void Particle::xfer( Xfer *xfer )
 	ParticleSystemID systemUnderControlID = m_systemUnderControl ? m_systemUnderControl->getSystemID() : INVALID_PARTICLE_SYSTEM_ID;
 	xfer->xferUser( &systemUnderControlID, sizeof( ParticleSystemID ) );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -700,7 +689,7 @@ void Particle::loadPostProcess( void )
 	if( m_systemUnderControlID != INVALID_PARTICLE_SYSTEM_ID )
 	{
 		ParticleSystem *system;
-		
+
 		// find system
 		system = TheParticleSystemManager->findParticleSystem( m_systemUnderControlID );
 
@@ -712,14 +701,14 @@ void Particle::loadPostProcess( void )
 		if( m_systemUnderControlID == NULL )
 		{
 
-			DEBUG_CRASH(( "Particle::loadPostProcess - Unable to find system under control pointer\n" ));
+			DEBUG_CRASH(( "Particle::loadPostProcess - Unable to find system under control pointer" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end loadPostProcess
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -732,17 +721,14 @@ ParticleSystemInfo::ParticleSystemInfo()
 	m_isGroundAligned = false;
 	m_isEmitAboveGroundOnly = false;
 	m_isParticleUpTowardsEmitter = false;
-	
-	//Added By Sadullah Nader
-	//Initializations inserted
+
 	m_driftVelocity.zero();
 	m_gravity = 0.0f;
 	m_isEmissionVolumeHollow = FALSE;
 	m_isOneShot = FALSE;
 	m_slavePosOffset.zero();
 	m_systemLifetime = 0;
-	
-	//
+
 	// some default values for the wind motion values
 	m_windMotion = WIND_MOTION_NOT_USED;
 	m_windAngle = 0.0f;
@@ -774,7 +760,7 @@ void ParticleSystemInfo::tintAllColors( Color tintColor )
 		m_colorKey[ key ].color.blue  *= (Real)(rgb.blue ) / 255.0f;
 	}
 
-}  // end loadPostProcess
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -783,7 +769,7 @@ void ParticleSystemInfo::tintAllColors( Color tintColor )
 void ParticleSystemInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -794,7 +780,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 {
 	Int i;
 
-	// version 
+	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
@@ -853,7 +839,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 		xfer->xferUser( &m_alphaKey[ i ].var, sizeof( GameClientRandomVariable ) );
 		xfer->xferUnsignedInt( &m_alphaKey[ i ].frame );
 
-	}  // end for, i
+	}
 
 	// color keys
 	for( i = 0; i < MAX_KEYFRAMES; ++i )
@@ -862,26 +848,26 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 		xfer->xferRGBColor( &m_colorKey[ i ].color );
 		xfer->xferUnsignedInt( &m_colorKey[ i ].frame );
 
-	}  // end for, i
+	}
 
 	// color scale
 	xfer->xferUser( &m_colorScale, sizeof( GameClientRandomVariable ) );
-	
+
 	// burst delay
 	xfer->xferUser( &m_burstDelay, sizeof( GameClientRandomVariable ) );
-	
+
 	// burst count
 	xfer->xferUser( &m_burstCount, sizeof( GameClientRandomVariable ) );
-	
+
 	// initial delay
 	xfer->xferUser( &m_initialDelay, sizeof( GameClientRandomVariable ) );
-	
+
 	// drift velocity
 	xfer->xferCoord3D( &m_driftVelocity );
-	
+
 	// gravity
 	xfer->xferReal( &m_gravity );
-		
+
 	// slave system name
 	xfer->xferAsciiString( &m_slaveSystemName );
 
@@ -909,18 +895,18 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 			break;
 
 		// --------------------------------------------------------------------------------------------
-		case SPHERICAL:		
-			xfer->xferUser( &m_emissionVelocity.spherical.speed, sizeof( GameClientRandomVariable ) );			
+		case SPHERICAL:
+			xfer->xferUser( &m_emissionVelocity.spherical.speed, sizeof( GameClientRandomVariable ) );
 			break;
 
 		// --------------------------------------------------------------------------------------------
 		case HEMISPHERICAL:
-			xfer->xferUser( &m_emissionVelocity.hemispherical.speed, sizeof( GameClientRandomVariable ) );			
+			xfer->xferUser( &m_emissionVelocity.hemispherical.speed, sizeof( GameClientRandomVariable ) );
 			break;
 
 		// --------------------------------------------------------------------------------------------
 		case CYLINDRICAL:
-			xfer->xferUser( &m_emissionVelocity.cylindrical.radial, sizeof( GameClientRandomVariable ) );						
+			xfer->xferUser( &m_emissionVelocity.cylindrical.radial, sizeof( GameClientRandomVariable ) );
 			xfer->xferUser( &m_emissionVelocity.cylindrical.normal, sizeof( GameClientRandomVariable ) );
 			break;
 
@@ -930,7 +916,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 			xfer->xferUser( &m_emissionVelocity.outward.otherSpeed, sizeof( GameClientRandomVariable ) );
 			break;
 
-	}  // end switch, m_emissionVelocityType
+	}
 
 	// emission volume type
 	xfer->xferUser( &m_emissionVolumeType, sizeof( EmissionVolumeType ) );
@@ -941,7 +927,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 
 		// --------------------------------------------------------------------------------------------
 		case POINT:
-			// point has no data, it uses the systems position			
+			// point has no data, it uses the systems position
 			break;
 
 		// --------------------------------------------------------------------------------------------
@@ -966,7 +952,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 			xfer->xferReal( &m_emissionVolume.cylinder.length );
 			break;
 
-	}  // end switch, m_emissionVolumeType
+	}
 
 	// is emission volume hollow
 	xfer->xferBool( &m_isEmissionVolumeHollow );
@@ -1016,7 +1002,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 	// wind motion moving to end angle
 	xfer->xferByte( &m_windMotionMovingToEndAngle );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1024,7 +1010,7 @@ void ParticleSystemInfo::xfer( Xfer *xfer )
 void ParticleSystemInfo::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // ParticleSystem /////////////////////////////////////////////////////////////////////////////////
@@ -1033,8 +1019,8 @@ void ParticleSystemInfo::loadPostProcess( void )
 // ------------------------------------------------------------------------------------------------
 /** Read particle system properties from given file */
 // ------------------------------------------------------------------------------------------------
-ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate, 
-																ParticleSystemID id, 
+ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate,
+																ParticleSystemID id,
 																Bool createSlaves )
 {
 	m_systemParticlesHead = m_systemParticlesTail = NULL;
@@ -1043,12 +1029,9 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate,
 	m_template = sysTemplate;
 	m_systemID = id;
 
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_lastPos.zero();
 	m_pos.zero();
 	m_velCoeff.zero();
-	//
 
 	m_attachedToDrawableID = INVALID_DRAWABLE_ID;
 	m_attachedToObjectID = INVALID_ID;
@@ -1149,7 +1132,7 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate,
 	m_windMotionStartAngle = GameClientRandomValueReal( m_windMotionStartAngleMin, m_windMotionStartAngleMax );
 	m_windMotionEndAngle = GameClientRandomValueReal( m_windMotionEndAngleMin, m_windMotionEndAngleMax );
 	m_windAngle = GameClientRandomValueReal( m_windMotionStartAngle, m_windMotionEndAngle );
-			
+
 	m_shaderType = sysTemplate->m_shaderType;
 
 	m_particleType = sysTemplate->m_particleType;
@@ -1172,9 +1155,9 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate,
 			setSlave( slaveSystem );
 			m_slaveSystem->setMaster( this );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	m_attachedSystemName = sysTemplate->m_attachedSystemName;
 	m_particleCount = 0;
@@ -1183,7 +1166,7 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate,
 
 	TheParticleSystemManager->friend_addParticleSystem(this);
 
-	//DEBUG_ASSERTLOG(!(m_totalParticleSystemCount % 10 == 0), ( "TotalParticleSystemCount = %d\n", m_totalParticleSystemCount ));
+	//DEBUG_ASSERTLOG(!(m_totalParticleSystemCount % 10 == 0), ( "TotalParticleSystemCount = %d", m_totalParticleSystemCount ));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -1196,22 +1179,22 @@ ParticleSystem::~ParticleSystem()
 	if( m_slaveSystem )
 	{
 
-		DEBUG_ASSERTCRASH( m_slaveSystem->getMaster() == this, ("~ParticleSystem: Our slave doesn't have us as a master!\n") );
+		DEBUG_ASSERTCRASH( m_slaveSystem->getMaster() == this, ("~ParticleSystem: Our slave doesn't have us as a master!") );
 		m_slaveSystem->setMaster( NULL );
 		setSlave( NULL );
 
-	}  // end if
+	}
 
 	// tell any master system that *we* are going away
 	if( m_masterSystem )
 	{
 
-		DEBUG_ASSERTCRASH( m_masterSystem->getSlave() == this, ("~ParticleSystem: Our master doesn't have us as a slave!\n") );
+		DEBUG_ASSERTCRASH( m_masterSystem->getSlave() == this, ("~ParticleSystem: Our master doesn't have us as a slave!") );
 		m_masterSystem->setSlave( NULL );
 		setMaster( NULL );
 
-	}  // end if
-	
+	}
+
 
 	// destroy all particles "in the air"
 	while (m_systemParticlesHead)
@@ -1225,9 +1208,9 @@ ParticleSystem::~ParticleSystem()
 		m_controlParticle->detachControlledParticleSystem();
 
 	m_controlParticle = NULL;
-	
+
 	TheParticleSystemManager->friend_removeParticleSystem(this);
-	//DEBUG_ASSERTLOG(!(m_totalParticleSystemCount % 10 == 0), ( "TotalParticleSystemCount = %d\n", m_totalParticleSystemCount ));
+	//DEBUG_ASSERTLOG(!(m_totalParticleSystemCount % 10 == 0), ( "TotalParticleSystemCount = %d", m_totalParticleSystemCount ));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -1238,7 +1221,7 @@ void ParticleSystem::setMaster( ParticleSystem *master )
 	m_masterSystem = master;
 	m_masterSystemID = master ? master->getSystemID() : INVALID_PARTICLE_SYSTEM_ID;
 
-}  // end set Master
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1248,7 +1231,7 @@ void ParticleSystem::setSlave( ParticleSystem *slave )
 	m_slaveSystem = slave;
 	m_slaveSystemID = slave ? slave->getSystemID() : INVALID_PARTICLE_SYSTEM_ID;
 
-}  // end setSlave
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1405,7 +1388,7 @@ const Coord3D *ParticleSystem::computeParticleVelocity( const Coord3D *pos )
 			newVel.y = m_emissionVelocity.ortho.y.getValue();
 			newVel.z = m_emissionVelocity.ortho.z.getValue();
 			break;
-		
+
 		case CYLINDRICAL:
 		{
 			Real radialSpeed, angle;
@@ -1483,7 +1466,7 @@ const Coord3D *ParticleSystem::computeParticleVelocity( const Coord3D *pos )
 					// "speed" is in 'horizontal' plane, and "otherSpeed" is 'vertical'
 					newVel.x = speed * perp.x + otherSpeed * up.x;
 					newVel.y = speed * perp.y + otherSpeed * up.y;
-					newVel.z = speed * perp.z + otherSpeed * up.z;								
+					newVel.z = speed * perp.z + otherSpeed * up.z;
 					break;
 				}
 
@@ -1561,7 +1544,7 @@ const Coord3D *ParticleSystem::computeParticlePosition( void )
 		{
 			Real angle = GameClientRandomValueReal( 0, 2.0f*PI );
 			Real radius;
-			
+
 			if (m_isEmissionVolumeHollow)
 				radius = m_emissionVolume.cylinder.radius;
 			else
@@ -1595,10 +1578,10 @@ const Coord3D *ParticleSystem::computeParticlePosition( void )
 		}
 
 		case BOX:
-		{			
+		{
 			if (m_isEmissionVolumeHollow) {
 				// determine which side to generate on.
-				// 0 is bottom, 3 is top, 
+				// 0 is bottom, 3 is top,
 				// 1 is left , 4 is right
 				// 2 is front, 5 is right back
 
@@ -1612,7 +1595,7 @@ const Coord3D *ParticleSystem::computeParticlePosition( void )
 					} else {
 						newPos.z = m_emissionVolume.box.halfSize.z;
 					}
-															
+
 				} else if (side % 3 == 1) {
 					// generate Y, Z
 					newPos.y = GameClientRandomValueReal( -m_emissionVolume.box.halfSize.y, m_emissionVolume.box.halfSize.y );
@@ -1637,8 +1620,8 @@ const Coord3D *ParticleSystem::computeParticlePosition( void )
 				newPos.x = GameClientRandomValueReal( -m_emissionVolume.box.halfSize.x, m_emissionVolume.box.halfSize.x );
 				newPos.y = GameClientRandomValueReal( -m_emissionVolume.box.halfSize.y, m_emissionVolume.box.halfSize.y );
 				newPos.z = GameClientRandomValueReal( -m_emissionVolume.box.halfSize.z, m_emissionVolume.box.halfSize.z );
-			break;
 			}
+			break;
 		}
 
 		case LINE:
@@ -1676,7 +1659,7 @@ const Coord3D *ParticleSystem::computeParticlePosition( void )
 // ------------------------------------------------------------------------------------------------
 /** Factory method for particles. */
 // ------------------------------------------------------------------------------------------------
-Particle *ParticleSystem::createParticle( const ParticleInfo *info, 
+Particle *ParticleSystem::createParticle( const ParticleInfo *info,
 																					ParticlePriorityType priority,
 																					Bool forceCreate )
 {
@@ -1699,18 +1682,18 @@ Particle *ParticleSystem::createParticle( const ParticleInfo *info,
 		//
 
 		//
-		// Check if particle is below priorities we allow for this FPS or if it being skipped because 
-		// all particesl are being skipped (excluding special fps independent particles at 
-		// getMinDynamicParticleSkipPriority()) 
+		// Check if particle is below priorities we allow for this FPS or if it being skipped because
+		// all particesl are being skipped (excluding special fps independent particles at
+		// getMinDynamicParticleSkipPriority())
 		//
 		if( priority < TheGameLODManager->getMinDynamicParticlePriority() ||
-				(priority < TheGameLODManager->getMinDynamicParticleSkipPriority() && 
+				(priority < TheGameLODManager->getMinDynamicParticleSkipPriority() &&
 				 TheGameLODManager->isParticleSkipped()) )
 			return NULL;
 
 		if ( getParticleCount() > 0 && priority == AREA_EFFECT && m_isGroundAligned && TheParticleSystemManager->getFieldParticleCount() > (UnsignedInt)TheGlobalData->m_maxFieldParticleCount )
 			return NULL;
-		
+
 		// ALWAYS_RENDER particles are exempt from all count limits, and are always created, regardless of LOD issues.
 		if (priority != ALWAYS_RENDER)
 		{
@@ -1725,7 +1708,7 @@ Particle *ParticleSystem::createParticle( const ParticleInfo *info,
 				return NULL;
 		}
 
-	}  // end if
+	}
 
 	Particle *p = newInstance(Particle)( this, info );
 	return p;
@@ -1756,15 +1739,15 @@ const ParticleInfo *ParticleSystem::generateParticleInfo( Int particleNum, Int p
 	{
 		// transform particle position to world coordinates
 		Vector3 p, pr;
-		
+
 		Coord3D emissionAdjustment;	// this is the adjustment for inter-frame emission
-		// @todo : This should work, if m_lastPos = m_pos is removed from here but it doesn't. 
+		// @todo : This should work, if m_lastPos = m_pos is removed from here but it doesn't.
 		// @todo : Investigate why. jkmcd
 		if (m_isFirstPos) {
 			m_lastPos = m_pos;
 			m_isFirstPos = false;
 		}
-		
+
 		emissionAdjustment.x = (1 - (INT_TO_REAL(particleNum) / particleCount)) * (m_pos.x - m_lastPos.x);
 		emissionAdjustment.y = (1 - (INT_TO_REAL(particleNum) / particleCount)) * (m_pos.y - m_lastPos.y);
 		emissionAdjustment.z = (1 - (INT_TO_REAL(particleNum) / particleCount)) * (m_pos.z - m_lastPos.z);
@@ -1892,7 +1875,7 @@ Bool ParticleSystem::update( Int localPlayerIndex  )
 			m_pos = *attachedTo->getPosition();
 		}
 		else
-		{ 
+		{
 			// Drawable has been destroyed - lose our attachment to it
 			m_attachedToDrawableID = INVALID_DRAWABLE_ID;
 
@@ -1908,13 +1891,13 @@ Bool ParticleSystem::update( Int localPlayerIndex  )
 		{
 			if (!isShrouded)
 				isShrouded = (objectAttachedTo->getShroudedStatus(localPlayerIndex) >= OBJECTSHROUD_FOGGED);
- 
+
       const Drawable * draw = objectAttachedTo->getDrawable();
       if ( draw )
   			parentXfrm = draw->getTransformMatrix();
       else
   			parentXfrm = objectAttachedTo->getTransformMatrix();
-      
+
 
 
 
@@ -1922,7 +1905,7 @@ Bool ParticleSystem::update( Int localPlayerIndex  )
 			m_pos = *objectAttachedTo->getPosition();
 		}
 		else
-		{ 
+		{
 			// Drawable has been destroyed - lose our attachment to it
 			m_attachedToObjectID = INVALID_ID;
 
@@ -2036,7 +2019,7 @@ Bool ParticleSystem::update( Int localPlayerIndex  )
 							}
 						}
 					}
-						
+
 					// compute next burst delay
 					m_burstDelayLeft = (UnsignedInt)m_burstDelay.getValue();
 					m_burstDelayLeft *= m_delayCoeff;
@@ -2046,9 +2029,9 @@ Bool ParticleSystem::update( Int localPlayerIndex  )
 					m_burstDelayLeft--;
 				}
 
-			} // end if stopped check
-		} // end if system lifetime check
-	} // end if is destroyed
+			}
+		}
+	}
 
 	//
 	// Update all particles in the system
@@ -2121,7 +2104,7 @@ void ParticleSystem::updateWindMotion( void )
 			Real endAngle = m_windMotionEndAngle;
 
 			// this only works when start angle is less than end angle
-			DEBUG_ASSERTCRASH( startAngle < endAngle, ("updateWindMotion: startAngle must be < endAngle\n") );
+			DEBUG_ASSERTCRASH( startAngle < endAngle, ("updateWindMotion: startAngle must be < endAngle") );
 
 			// how big is the total angle span
 			Real totalSpan = endAngle - startAngle;
@@ -2129,7 +2112,7 @@ void ParticleSystem::updateWindMotion( void )
 
 			// given our current angle ... how far away from the "center" of the span are we
 			Real diffFromCenter = fabs( halfSpan - m_windAngle + startAngle );
-	
+
 			//
 			// given our distance from the center ... we need to compute how much we will change
 			// the angle.  When we are closer to the center we change it faster (more), and when
@@ -2141,7 +2124,7 @@ void ParticleSystem::updateWindMotion( void )
 			#define MINIMUM_CHANGE 0.005f  // lower #'s have softer swings at the edge angles
 			if( change < MINIMUM_CHANGE )
 				change = MINIMUM_CHANGE;
-			
+
 			//
 			// if we are moving toward the end angle we add the change, if we're moving away
 			// from it we subtract it
@@ -2160,20 +2143,20 @@ void ParticleSystem::updateWindMotion( void )
 					m_windMotionMovingToEndAngle = FALSE;
 
 					// pick a new change delta
-					m_windAngleChange = 
+					m_windAngleChange =
 							GameClientRandomValueReal( m_windAngleChangeMin, m_windAngleChangeMax );
 
 					// pick new start and end angles
-					m_windMotionStartAngle = 
-							GameClientRandomValueReal( m_windMotionStartAngleMin, 
+					m_windMotionStartAngle =
+							GameClientRandomValueReal( m_windMotionStartAngleMin,
 																				 m_windMotionStartAngleMax );
-					m_windMotionEndAngle = 
-							GameClientRandomValueReal( m_windMotionEndAngleMin, 
+					m_windMotionEndAngle =
+							GameClientRandomValueReal( m_windMotionEndAngleMin,
 																				 m_windMotionEndAngleMax );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -2188,24 +2171,24 @@ void ParticleSystem::updateWindMotion( void )
 					m_windMotionMovingToEndAngle = TRUE;
 
 					// pick a new change delta
-					m_windAngleChange = 
+					m_windAngleChange =
 							GameClientRandomValueReal( m_windAngleChangeMin, m_windAngleChangeMax );
 
 					// pick new start and end angles
-					m_windMotionStartAngle = 
-							GameClientRandomValueReal( m_windMotionStartAngleMin, 
+					m_windMotionStartAngle =
+							GameClientRandomValueReal( m_windMotionStartAngleMin,
 																				 m_windMotionStartAngleMax );
-					m_windMotionEndAngle = 
-							GameClientRandomValueReal( m_windMotionEndAngleMin, 
+					m_windMotionEndAngle =
+							GameClientRandomValueReal( m_windMotionEndAngleMin,
 																				 m_windMotionEndAngleMax );
 
-				}  // end if
+				}
 
-			}  // end else
+			}
 
 			break;
 
-		}  // end case
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case ParticleSystemInfo::WIND_MOTION_CIRCULAR:
@@ -2217,7 +2200,7 @@ void ParticleSystem::updateWindMotion( void )
 
 			// add to our wind angle
 			m_windAngle += m_windAngleChange;
-			
+
 			// keep in 0 to 2PI range just to keep the numbers safe and sane
 			if( m_windAngle > TWO_PI )
 				m_windAngle -= TWO_PI;
@@ -2226,7 +2209,7 @@ void ParticleSystem::updateWindMotion( void )
 
 			break;
 
-		}  // end case
+		}
 
 		// ---------------------------------------------------------------------------------------------
 		default:
@@ -2234,11 +2217,11 @@ void ParticleSystem::updateWindMotion( void )
 
 			break;
 
-		}  // end default
+		}
 
-	}  // end if
+	}
 
-}  // end updateWindMotion
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -2268,7 +2251,7 @@ void ParticleSystem::addParticle( Particle *particleToAdd )
 
 	++m_particleCount;
 
-	particleToAdd->setPersonality( m_personalityStore++ ); 
+	particleToAdd->setPersonality( m_personalityStore++ );
 
 }
 
@@ -2304,7 +2287,6 @@ ParticleInfo ParticleSystem::mergeRelatedParticleSystems( ParticleSystem *master
 	if (!masterParticleSystem || !slaveParticleSystem) {
 		DEBUG_CRASH(("masterParticleSystem or slaveParticleSystem was NULL. Should not happen. JKMCD"));
 		ParticleInfo bogus;
-		memset( &bogus, 0, sizeof( bogus ) );
 		return bogus;
 	}
 
@@ -2352,11 +2334,11 @@ ParticleInfo ParticleSystem::mergeRelatedParticleSystems( ParticleSystem *master
 		slaveParticleSystem->m_emissionVolumeType = masterParticleSystem->m_emissionVolumeType;
 		slaveParticleSystem->m_isEmissionVolumeHollow = masterParticleSystem->m_isEmissionVolumeHollow;
 
-		
+
 		slaveParticleSystem->m_startSize.setRange(masterParticleSystem->m_startSize.getMinimumValue() * slaveParticleSystem->m_startSize.getMinimumValue(),
 																							masterParticleSystem->m_startSize.getMaximumValue() * slaveParticleSystem->m_startSize.getMaximumValue(),
 																							masterParticleSystem->m_startSize.getDistributionType());
-	
+
 		slaveParticleSystem->m_sizeRate.setRange(masterParticleSystem->m_sizeRate.getMinimumValue() * slaveParticleSystem->m_sizeRate.getMinimumValue(),
 																							masterParticleSystem->m_sizeRate.getMaximumValue() * slaveParticleSystem->m_sizeRate.getMaximumValue(),
 																							masterParticleSystem->m_sizeRate.getDistributionType());
@@ -2364,11 +2346,11 @@ ParticleInfo ParticleSystem::mergeRelatedParticleSystems( ParticleSystem *master
 		slaveParticleSystem->m_sizeRateDamping.setRange(masterParticleSystem->m_sizeRateDamping.getMinimumValue() * slaveParticleSystem->m_sizeRateDamping.getMinimumValue(),
 																							masterParticleSystem->m_sizeRateDamping.getMaximumValue() * slaveParticleSystem->m_sizeRateDamping.getMaximumValue(),
 																							masterParticleSystem->m_sizeRateDamping.getDistributionType());
-		
-//		slaveParticleSystem->m_burstCount.setRange(masterParticleSystem->m_burstCount.getMinimumValue() / 2, 
+
+//		slaveParticleSystem->m_burstCount.setRange(masterParticleSystem->m_burstCount.getMinimumValue() / 2,
 //																							 masterParticleSystem->m_burstCount.getMaximumValue() / 2,
 //																							 masterParticleSystem->m_burstCount.getDistributionType());
-		
+
 	}
 
 	return mergeInfo;
@@ -2394,7 +2376,7 @@ void ParticleSystem::setControlParticle( Particle *p )
 void ParticleSystem::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -2506,9 +2488,9 @@ void ParticleSystem::xfer( Xfer *xfer )
 			// write particle information
 			xfer->xferSnapshot( particle );
 
-		}  // end for, particle
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		ParticlePriorityType priority = getPriority();
@@ -2523,16 +2505,16 @@ void ParticleSystem::xfer( Xfer *xfer )
 			particle = createParticle( info, priority, TRUE );
 
 			// sanity
-			DEBUG_ASSERTCRASH( particle, ("ParticleSyste::xfer - Unable to create particle for loading\n") );
+			DEBUG_ASSERTCRASH( particle, ("ParticleSyste::xfer - Unable to create particle for loading") );
 
 			// read in the particle data
 			xfer->xferSnapshot( particle );
 
-		}  // end for i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2551,10 +2533,10 @@ void ParticleSystem::loadPostProcess( void )
 		if( m_slaveSystem != NULL )
 		{
 
-			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_slaveSystem is not NULL but should be\n" ));
+			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_slaveSystem is not NULL but should be" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// assign system
 		m_slaveSystem = TheParticleSystemManager->findParticleSystem( m_slaveSystemID );
@@ -2563,12 +2545,12 @@ void ParticleSystem::loadPostProcess( void )
 		if( m_slaveSystem == NULL || m_slaveSystem->isDestroyed() == TRUE )
 		{
 
-			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_slaveSystem is NULL or destroyed\n" ));
+			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_slaveSystem is NULL or destroyed" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// reconnect master pointers if needed
 	if( m_masterSystemID != INVALID_PARTICLE_SYSTEM_ID )
@@ -2578,10 +2560,10 @@ void ParticleSystem::loadPostProcess( void )
 		if( m_masterSystem != NULL )
 		{
 
-			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_masterSystem is not NULL but should be\n" ));
+			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_masterSystem is not NULL but should be" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// assign system
 		m_masterSystem = TheParticleSystemManager->findParticleSystem( m_masterSystemID );
@@ -2590,14 +2572,14 @@ void ParticleSystem::loadPostProcess( void )
 		if( m_masterSystem == NULL || m_masterSystem->isDestroyed() == TRUE )
 		{
 
-			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_masterSystem is NULL or destroyed\n" ));
+			DEBUG_CRASH(( "ParticleSystem::loadPostProcess - m_masterSystem is NULL or destroyed" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end loadPostProcess
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // ParticleSystemTemplate /////////////////////////////////////////////////////////////////////////
@@ -2606,7 +2588,7 @@ void ParticleSystem::loadPostProcess( void )
 // ------------------------------------------------------------------------------------------------
 /** INI parse data */
 // ------------------------------------------------------------------------------------------------
-const FieldParse ParticleSystemTemplate::m_fieldParseTable[] = 
+const FieldParse ParticleSystemTemplate::m_fieldParseTable[] =
 {
 	{ "Priority",								INI::parseIndexList, ParticlePriorityNames, offsetof( ParticleSystemTemplate, m_priority ) },
 	{ "IsOneShot",							INI::parseBool,						NULL,		offsetof( ParticleSystemTemplate, m_isOneShot ) },
@@ -2737,7 +2719,7 @@ void ParticleSystemTemplate::parseRGBColorKeyframe( INI* ini, void *instance,
 /** Parse a RandomVariable RGB color.
  * Note that the components may be negative, as this is used for rates, as well. */
 // ------------------------------------------------------------------------------------------------
-void ParticleSystemTemplate::parseRandomRGBColor( INI* ini, void *instance, 
+void ParticleSystemTemplate::parseRandomRGBColor( INI* ini, void *instance,
 																											 void *store, const void* /*userData*/ )
 {
 #if 0
@@ -2772,15 +2754,15 @@ void ParticleSystemTemplate::parseRandomRGBColor( INI* ini, void *instance,
 			if( colors[j][i] < -255 || colors[j][i] > 255 )
 				throw INI_INVALID_DATA;
 
-		}  // end for i
+		}
 	}
 
 	// assign the color components to the "RGBColor" pointer at 'store'
 	ParticleSystemInfo::RandomRGBColor *theColor = (ParticleSystemInfo::RandomRGBColor *)store;
 
-	theColor->red.setRange( (Real)colors[ LO ][ RED ] / 255.0f, (Real)colors[ HI ][ RED ] / 255.0f ); 
-	theColor->green.setRange( (Real)colors[ LO ][ GREEN ] / 255.0f, (Real)colors[ HI ][ GREEN ] / 255.0f ); 
-	theColor->blue.setRange( (Real)colors[ LO ][ BLUE ] / 255.0f, (Real)colors[ HI ][ BLUE ] / 255.0f ); 
+	theColor->red.setRange( (Real)colors[ LO ][ RED ] / 255.0f, (Real)colors[ HI ][ RED ] / 255.0f );
+	theColor->green.setRange( (Real)colors[ LO ][ GREEN ] / 255.0f, (Real)colors[ HI ][ GREEN ] / 255.0f );
+	theColor->blue.setRange( (Real)colors[ LO ][ BLUE ] / 255.0f, (Real)colors[ HI ][ BLUE ] / 255.0f );
 #endif
 }
 
@@ -2788,18 +2770,15 @@ void ParticleSystemTemplate::parseRandomRGBColor( INI* ini, void *instance,
 // ------------------------------------------------------------------------------------------------
 ParticleSystemTemplate::ParticleSystemTemplate( const AsciiString &name ) :
 	m_name(name)
-{ 
-	//Added By Sadullah Nader
-	//Initializations inserted
+{
 	m_slaveTemplate = NULL;
-	//
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 ParticleSystemTemplate::~ParticleSystemTemplate()
 {
- 
+
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -2832,22 +2811,19 @@ ParticleSystemManager::ParticleSystemManager( void )
 
 	m_onScreenParticleCount = 0;
 	m_localPlayerIndex = 0;
-	
-	//Added By Sadullah Nader
-	//Initializations inserted
+
 	m_lastLogicFrameUpdate = 0;
 	m_particleCount = 0;
 	m_fieldParticleCount = 0;
 	m_particleSystemCount = 0;
-	//
 
 	for( Int i = 0; i < NUM_PARTICLE_PRIORITIES; ++i )
 	{
-		
+
 		m_allParticlesHead[ i ] = NULL;
 		m_allParticlesTail[ i ] = NULL;
 
-	}  // end for, i
+	}
 
 }
 
@@ -2871,21 +2847,21 @@ void ParticleSystemManager::init( void )
 {
 	/// Read INI data and build templates
 	INI ini;
-	ini.load( AsciiString( "Data\\INI\\ParticleSystem.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\ParticleSystem", INI_LOAD_OVERWRITE, NULL );
 
 	// sanity, our lists must be empty!!
 	for( Int i = 0; i < NUM_PARTICLE_PRIORITIES; ++i )
 	{
 
-		// sanity		
-		DEBUG_ASSERTCRASH( m_allParticlesHead[ i ] == NULL, ("INIT: ParticleSystem all particles head[%d] is not NULL!\n", i) );
-		DEBUG_ASSERTCRASH( m_allParticlesTail[ i ] == NULL, ("INIT: ParticleSystem all particles tail[%d] is not NULL!\n", i) );
+		// sanity
+		DEBUG_ASSERTCRASH( m_allParticlesHead[ i ] == NULL, ("INIT: ParticleSystem all particles head[%d] is not NULL!", i) );
+		DEBUG_ASSERTCRASH( m_allParticlesTail[ i ] == NULL, ("INIT: ParticleSystem all particles tail[%d] is not NULL!", i) );
 
 		// just to be clean set them to NULL
 		m_allParticlesHead[ i ] = NULL;
 		m_allParticlesTail[ i ] = NULL;
 
-	}  // end for, i
+	}
 
 }
 
@@ -2894,32 +2870,33 @@ void ParticleSystemManager::init( void )
 // ------------------------------------------------------------------------------------------------
 void ParticleSystemManager::reset( void )
 {
-	while (getParticleSystemCount()) {
-		if (m_allParticleSystemList.front()) {
-			deleteInstance(m_allParticleSystemList.front());
-		}
+	while (!m_allParticleSystemList.empty())
+	{
+		DEBUG_ASSERTCRASH(m_allParticleSystemList.front() != NULL, ("ParticleSystemManager::reset: ParticleSystem is null"));
+		deleteInstance(m_allParticleSystemList.front());
 	}
+	DEBUG_ASSERTCRASH(m_particleSystemCount == 0, ("ParticleSystemManager::reset: m_particleSystemCount is %u, not 0", m_particleSystemCount));
 
 	// sanity, our lists must be empty!!
 	for( Int i = 0; i < NUM_PARTICLE_PRIORITIES; ++i )
 	{
 
-		// sanity		
-		DEBUG_ASSERTCRASH( m_allParticlesHead[ i ] == NULL, ("RESET: ParticleSystem all particles head[%d] is not NULL!\n", i) );
-		DEBUG_ASSERTCRASH( m_allParticlesTail[ i ] == NULL, ("RESET: ParticleSystem all particles tail[%d] is not NULL!\n", i) );
+		// sanity
+		DEBUG_ASSERTCRASH( m_allParticlesHead[ i ] == NULL, ("RESET: ParticleSystem all particles head[%d] is not NULL!", i) );
+		DEBUG_ASSERTCRASH( m_allParticlesTail[ i ] == NULL, ("RESET: ParticleSystem all particles tail[%d] is not NULL!", i) );
 
 		// just to be clean set them to NULL
 		m_allParticlesHead[ i ] = NULL;
 		m_allParticlesTail[ i ] = NULL;
 
-	}  // end for, i
+	}
 
 	m_particleCount = 0;
 	m_fieldParticleCount = 0;
 	m_particleSystemCount = 0;
 
 	m_uniqueSystemID = INVALID_PARTICLE_SYSTEM_ID;
-	
+
 	m_lastLogicFrameUpdate = -1;
 	// leave templates as-is
 }
@@ -2938,15 +2915,12 @@ void ParticleSystemManager::update( void )
 	m_lastLogicFrameUpdate = TheGameLogic->getFrame();
 
 	//USE_PERF_TIMER(ParticleSystemManager)
-	ParticleSystemListIt it = m_allParticleSystemList.begin(); 
-	while( it != m_allParticleSystemList.end() )  
+	ParticleSystemListIt it = m_allParticleSystemList.begin();
+	while( it != m_allParticleSystemList.end() )
 	{
 		// TheSuperHackers @info Must increment the list iterator before potential element erasure from the list.
 		ParticleSystem* sys = *it++;
-
-		if (!sys) {
-			continue;
-		}
+		DEBUG_ASSERTCRASH(sys != NULL, ("ParticleSystemManager::update: ParticleSystem is null"));
 
 		if (sys->update(m_localPlayerIndex) == false)
 		{
@@ -2980,12 +2954,12 @@ ParticleSystem *ParticleSystemManager::createParticleSystem( const ParticleSyste
 // ------------------------------------------------------------------------------------------------
 /// given a template, instantiate a particle system attached to the given object, and return its ID
 // ------------------------------------------------------------------------------------------------
-ParticleSystemID ParticleSystemManager::createAttachedParticleSystemID( 
+ParticleSystemID ParticleSystemManager::createAttachedParticleSystemID(
 																			const ParticleSystemTemplate *sysTemplate,
 																			Object* attachTo,
 																			Bool createSlaves )
 {
-	ParticleSystem* pSystem = TheParticleSystemManager->createParticleSystem(sysTemplate, createSlaves);
+	ParticleSystem* pSystem = createParticleSystem(sysTemplate, createSlaves);
 	if (pSystem && attachTo)
 		pSystem->attachToObject(attachTo);
 	return pSystem ? pSystem->getSystemID() : INVALID_PARTICLE_SYSTEM_ID;
@@ -3003,9 +2977,7 @@ ParticleSystem *ParticleSystemManager::findParticleSystem( ParticleSystemID id )
 
 	for( ParticleSystemListIt it = m_allParticleSystemList.begin(); it != m_allParticleSystemList.end(); ++it ) {
 		system = *it;
-		if (!system) {
-			continue;
-		}
+		DEBUG_ASSERTCRASH(system != NULL, ("ParticleSystemManager::findParticleSystem: ParticleSystem is null"));
 
 		if( system->getSystemID() == id ) {
 			return system;
@@ -3014,7 +2986,7 @@ ParticleSystem *ParticleSystemManager::findParticleSystem( ParticleSystemID id )
 
 	return NULL;
 
-}  // end findParticleSystem
+}
 
 // ------------------------------------------------------------------------------------------------
 /** destroy the particle system with the given id (if it still exists) */
@@ -3079,11 +3051,11 @@ ParticleSystemTemplate *ParticleSystemManager::findParentTemplate( const AsciiSt
 		}
 	}
 
-	return NULL;	
+	return NULL;
 }
 
 // ------------------------------------------------------------------------------------------------
-/** Destroy any particle systems that are attached to this object */	
+/** Destroy any particle systems that are attached to this object */
 // ------------------------------------------------------------------------------------------------
 void ParticleSystemManager::destroyAttachedSystems( Object *obj )
 {
@@ -3093,17 +3065,14 @@ void ParticleSystemManager::destroyAttachedSystems( Object *obj )
 		return;
 
 	// iterate through all systems
-	ParticleSystem *system = NULL;
-
-	for( ParticleSystemListIt it = m_allParticleSystemList.begin(); 
-			 it != m_allParticleSystemList.end(); 
-			 ++it ) 
+	for( ParticleSystemListIt it = m_allParticleSystemList.begin();
+			 it != m_allParticleSystemList.end();
+			 ++it )
 	{
 
-		system = *it;
-		if( system == NULL )
-			continue;
-		
+		ParticleSystem *system = *it;
+		DEBUG_ASSERTCRASH(system != NULL, ("ParticleSystemManager::destroyAttachedSystems: ParticleSystem is null"));
+
 		if( system->getAttachedObject() == obj->getID() )
 			system->destroy();
 
@@ -3139,7 +3108,7 @@ void ParticleSystemManager::addParticle( Particle *particleToAdd, ParticlePriori
 	particleToAdd->m_inOverallList = TRUE;
 
 	++m_particleCount;
-	
+
 
 }
 
@@ -3178,6 +3147,7 @@ void ParticleSystemManager::removeParticle( Particle *particleToRemove)
 // ------------------------------------------------------------------------------------------------
 void ParticleSystemManager::friend_addParticleSystem( ParticleSystem *particleSystemToAdd )
 {
+	DEBUG_ASSERTCRASH(particleSystemToAdd != NULL, ("ParticleSystemManager::friend_addParticleSystem: ParticleSystem is null"));
 	m_allParticleSystemList.push_back(particleSystemToAdd);
 	++m_particleSystemCount;
 }
@@ -3191,26 +3161,27 @@ void ParticleSystemManager::friend_removeParticleSystem( ParticleSystem *particl
 	if (it != m_allParticleSystemList.end()) {
 		m_allParticleSystemList.erase(it);
 		--m_particleSystemCount;
+	} else {
+		DEBUG_CRASH(("ParticleSystemManager::friend_removeParticleSystem: ParticleSystem to remove was not recognized"));
 	}
-
 }
 
 // ------------------------------------------------------------------------------------------------
 /** Remove the oldest N number of particles from the lowest priority lists first.  We will
  * not remove particles from any priorities higher or equal to the priorityCap parameter. */
 // ------------------------------------------------------------------------------------------------
-Int ParticleSystemManager::removeOldestParticles( UnsignedInt count, 
+Int ParticleSystemManager::removeOldestParticles( UnsignedInt count,
 																									ParticlePriorityType priorityCap )
 {
 	Int countToRemove = count;
 
-	while (count-- && getParticleCount()) 
+	while (count-- && getParticleCount())
 	{
 		for( Int i = PARTICLE_PRIORITY_LOWEST;
 				 i < priorityCap;
 				 ++i )
 		{
-			if( m_allParticlesHead[ i ] ) 
+			if( m_allParticlesHead[ i ] )
 			{
 				deleteInstance(m_allParticlesHead[ i ]);
 				break;  // exit for
@@ -3247,7 +3218,7 @@ void ParticleSystemManager::preloadAssets( TimeOfDay timeOfDay )
 void ParticleSystemManager::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -3285,7 +3256,7 @@ void ParticleSystemManager::xfer( Xfer *xfer )
 
 			// ignore destroyed systems and non-saveable systems
 			if( system->isDestroyed() == TRUE || system->isSaveable() == FALSE )	{
-				AsciiString mtString = "";
+				AsciiString mtString;
 				xfer->xferAsciiString(&mtString); // write null string as key for destroyed system.
 				continue;
 			}
@@ -3297,10 +3268,10 @@ void ParticleSystemManager::xfer( Xfer *xfer )
 			// write system data
 			xfer->xferSnapshot( system );
 
-		}  // end for, it
+		}
 		DEBUG_ASSERTCRASH(systemCount==0, ("Mismatch in write count."));
 
-	}  // end if, save
+	}
 	else
 	{
 		const ParticleSystemTemplate *systemTemplate;
@@ -3320,11 +3291,11 @@ void ParticleSystemManager::xfer( Xfer *xfer )
 			if( systemTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "ParticleSystemManager::xfer - Unknown particle system template '%s'\n",
+				DEBUG_CRASH(( "ParticleSystemManager::xfer - Unknown particle system template '%s'",
 											systemName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// create system
 			system = createParticleSystem( systemTemplate, FALSE );
@@ -3332,20 +3303,20 @@ void ParticleSystemManager::xfer( Xfer *xfer )
 			if( system == NULL )
 			{
 
-				DEBUG_CRASH(( "ParticleSystemManager::xfer - Unable to allocate particle system '%s'\n",
+				DEBUG_CRASH(( "ParticleSystemManager::xfer - Unable to allocate particle system '%s'",
 											systemName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// read system data
 			xfer->xferSnapshot( system );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // end particleSystemManager
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3353,7 +3324,7 @@ void ParticleSystemManager::xfer( Xfer *xfer )
 void ParticleSystemManager::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Output particle system statistics to the screen
@@ -3366,7 +3337,7 @@ void ParticleSystemDebugDisplay( DebugDisplayInterface *dd, void *, FILE *fp )
 
 	dd->setCursorPos( 0, 0 );
 	dd->setRightMargin( 2 );
-	
+
 	dd->printf( "Total Particles: %d\n", TheParticleSystemManager->getParticleCount() );
 	dd->printf( "Total Particles (On Screen): %d\n", TheParticleSystemManager->getOnScreenParticleCount());
 	dd->printf( "Total Particle Systems: %d\n", TheParticleSystemManager->getParticleSystemCount() );
@@ -3437,7 +3408,7 @@ static Real angleBetween(const Coord2D *vecA, const Coord2D *vecB)
 	if (vecB->x > 0) {
 		return theta;
 	}
-	
+
 	return -theta;
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/RayEffect.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/RayEffect.cpp
index ad59861dbea..fb2a11ab696 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/RayEffect.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/RayEffect.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/RayEffect.h"
 #include "GameClient/Drawable.h"
@@ -56,13 +56,13 @@ RayEffectData *RayEffectSystem::findEntry( const Drawable *draw )
 			effectData = &m_effectData[ i ];
 			break;  // exit for i
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	return effectData;
 
-}  // end findEntry
+}
 
 // PUBLIC METHODS /////////////////////////////////////////////////////////////////////////////////
 
@@ -73,14 +73,14 @@ RayEffectSystem::RayEffectSystem( void )
 
 	init();
 
-}  // end RayEffectSystem
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 RayEffectSystem::~RayEffectSystem( void )
 {
 
-}  // end ~RayEffectSystem
+}
 
 //-------------------------------------------------------------------------------------------------
 /** initialize the system */
@@ -96,9 +96,9 @@ void RayEffectSystem::init( void )
 		m_effectData[ i ].startLoc.zero();
 		m_effectData[ i ].endLoc.zero();
 
-	}  // end for i
+	}
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -109,20 +109,20 @@ void RayEffectSystem::reset( void )
 	// nothing dynamic going on here, just initialize it
 	init();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** add a ray effect entry for this drawable */
 //-------------------------------------------------------------------------------------------------
-void RayEffectSystem::addRayEffect( const Drawable *draw, 
-																	  const Coord3D *startLoc, 
+void RayEffectSystem::addRayEffect( const Drawable *draw,
+																	  const Coord3D *startLoc,
 																	  const Coord3D *endLoc )
 {
 	Int i;
 	RayEffectData *effectData = NULL;
 
 	// sanity
-	if( draw == NULL || startLoc == NULL || endLoc == NULL )	
+	if( draw == NULL || startLoc == NULL || endLoc == NULL )
 		return;
 
 	/** @todo this should be more intelligent and should not be limited
@@ -133,15 +133,15 @@ void RayEffectSystem::addRayEffect( const Drawable *draw,
 	for( i = 0; i < MAX_RAY_EFFECTS; i++ )
 	{
 
-		if( m_effectData[ i ].draw == NULL )	
+		if( m_effectData[ i ].draw == NULL )
 		{
 
 			effectData = &m_effectData[ i ];
-			break;  // exit for 
+			break;  // exit for
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// if no free slots we can't do it
 	if( effectData == NULL )
@@ -173,15 +173,15 @@ void RayEffectSystem::deleteRayEffect( const Drawable *draw )
 		// remove the data for this entry
 		effectData->draw = NULL;
 
-	}  // end if
+	}
 
-}  // end deleteRayEffect
+}
 
 //-------------------------------------------------------------------------------------------------
 /** given a drawable, if it is in the ray effect system list retrieve
 	*	the ray effect data for its entry */
 //-------------------------------------------------------------------------------------------------
-void RayEffectSystem::getRayEffectData( const Drawable *draw, 
+void RayEffectSystem::getRayEffectData( const Drawable *draw,
 																			  RayEffectData *effectData )
 {
 	RayEffectData *entry = NULL;
@@ -198,7 +198,7 @@ void RayEffectSystem::getRayEffectData( const Drawable *draw,
 		// data has been found, copy to parameter
 		*effectData = *entry;
 
-	}  // end effectData
+	}
 
-}  // end getRayEffectData
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp
deleted file mode 100644
index 8ba75e2ba40..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: TerrainRoads.cpp /////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, December 2001
-// Desc:   Terrain road/bridge descriptions
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLDUES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#define DEFINE_BODYDAMAGETYPE_NAMES
-#include "Common/INI.h"
-#include "GameClient/TerrainRoads.h"
-
-// PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
-TerrainRoadCollection *TheTerrainRoads = NULL;
-
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-UnsignedInt TerrainRoadCollection::m_idCounter = 0;
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-const FieldParse TerrainRoadType::m_terrainRoadFieldParseTable[] = 
-{
-
-	{ "Texture",						INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_texture ) },
-	{ "RoadWidth",					INI::parseReal,								NULL, offsetof( TerrainRoadType, m_roadWidth ) },
-	{ "RoadWidthInTexture",	INI::parseReal,								NULL, offsetof( TerrainRoadType, m_roadWidthInTexture ) },
-
-	{ NULL,									NULL,													NULL, 0 },
-
-};
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-const FieldParse TerrainRoadType::m_terrainBridgeFieldParseTable[] = 
-{
-
-	{ "BridgeScale",									INI::parseReal,								NULL, offsetof( TerrainRoadType, m_bridgeScale ) },
-	{ "ScaffoldObjectName",						INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_scaffoldObjectName ) },
-	{ "ScaffoldSupportObjectName",		INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_scaffoldSupportObjectName ) },
-	{ "RadarColor",										INI::parseRGBColor,						NULL, offsetof( TerrainRoadType, m_radarColor ) },
-
-	{ "TransitionEffectsHeight",			INI::parseReal,								NULL, offsetof( TerrainRoadType, m_transitionEffectsHeight ) },
-	{ "NumFXPerType",									INI::parseInt,								NULL,	offsetof( TerrainRoadType, m_numFXPerType ) },
-
-	{ "BridgeModelName",							INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_bridgeModelName ) },
-	{ "Texture",											INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_texture ) },
-	{ "BridgeModelNameDamaged",				INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_bridgeModelNameDamaged ) },
-	{ "TextureDamaged",								INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_textureDamaged ) },
-	{ "BridgeModelNameReallyDamaged",	INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_bridgeModelNameReallyDamaged ) },
-	{ "TextureReallyDamaged",					INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_textureReallyDamaged ) },
-	{ "BridgeModelNameBroken",				INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_bridgeModelNameBroken ) },
-	{ "TextureBroken",								INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_textureBroken ) },
-
-	{ "TowerObjectNameFromLeft",			INI::parseAsciiString,				NULL,	offsetof( TerrainRoadType, m_towerObjectName[ BRIDGE_TOWER_FROM_LEFT ] ) },
-	{ "TowerObjectNameFromRight",			INI::parseAsciiString,				NULL,	offsetof( TerrainRoadType, m_towerObjectName[ BRIDGE_TOWER_FROM_RIGHT ] ) },
-	{ "TowerObjectNameToLeft",				INI::parseAsciiString,				NULL,	offsetof( TerrainRoadType, m_towerObjectName[ BRIDGE_TOWER_TO_LEFT ] ) },
-	{ "TowerObjectNameToRight",				INI::parseAsciiString,				NULL,	offsetof( TerrainRoadType, m_towerObjectName[ BRIDGE_TOWER_TO_RIGHT ] ) },
-
-	{ "DamagedToSound",								INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_damageToSoundString[ BODY_DAMAGED ] ) },
-	{ "RepairedToSound",							INI::parseAsciiString,				NULL, offsetof( TerrainRoadType, m_repairedToSoundString[ BODY_DAMAGED ] ) },
-	{ "TransitionToOCL",							parseTransitionToOCL,					NULL,	NULL },
-	{ "TransitionToFX",								parseTransitionToFX,					NULL, NULL },
-
-
-	{ NULL,									NULL,													NULL, 0 },
-
-};
-
-// ------------------------------------------------------------------------------------------------
-/** In the form of 
-	* Label = Transition:<Damage|Repair> ToState:<BODYTYPE> EffectNum:<INT> OCL:<OCL NAME> */
-// ------------------------------------------------------------------------------------------------
-/*static*/ void TerrainRoadType::parseTransitionToOCL( INI *ini, 
-																											 void *instance, 
-																											 void *store, 
-																											 const void *userData )
-{
-	const char *token;
-	TerrainRoadType *theInstance = (TerrainRoadType *)instance;
-
-	// which transition is this
-	Bool damageTransition;
-	token = ini->getNextSubToken( "Transition" );
-	if( stricmp( token, "Damage" ) == 0 )
-		damageTransition = TRUE;
-	else if( stricmp( token, "Repair" ) == 0 )
-		damageTransition = FALSE;
-	else
-	{
-
-		DEBUG_CRASH(( "Expected Damage/Repair transition keyword\n" ));
-		throw INI_INVALID_DATA;
-
-	}  // end else
-
-	// get body damage state
-	token = ini->getNextSubToken( "ToState" );
-	BodyDamageType state = (BodyDamageType)ini->scanIndexList( token, TheBodyDamageTypeNames );
-
-	// get effect num
-	token = ini->getNextSubToken( "EffectNum" );
-	Int effectNum = ini->scanInt( token );
-	
-	// make effectNum zero based
-	--effectNum;
-
-	// sanity check effect num
-	if( effectNum < 0 || effectNum >= MAX_BRIDGE_BODY_FX )
-	{
-
-		DEBUG_CRASH(( "Effect number max on bridge transitions is '%d'\n", MAX_BRIDGE_BODY_FX ));
-		throw INI_INVALID_DATA;
-
-	}  // end if
-
-	// read the string
-	token = ini->getNextSubToken( "OCL" );
-	if( damageTransition )
-		theInstance->friend_setDamageToOCLString( state, effectNum, AsciiString( token ) );
-	else
-		theInstance->friend_setRepairedToOCLString( state, effectNum, AsciiString( token ) );
-	
-}  // end parseTransitionToOCL
-
-// ------------------------------------------------------------------------------------------------
-/** In the form of
-	* Label = Transition:<Damage|Repair> ToState:<BODYTYPE> EffectNum:<INT> FX:<FXLIST NAME> */
-// ------------------------------------------------------------------------------------------------
-/*static*/ void TerrainRoadType::parseTransitionToFX( INI *ini, 
-																											void *instance, 
-																											void *store, 
-																											const void *userData )
-{
-	const char *token;
-	TerrainRoadType *theInstance = (TerrainRoadType *)instance;
-
-	// which transition is this
-	Bool damageTransition;
-	token = ini->getNextSubToken( "Transition" );
-	if( stricmp( token, "Damage" ) == 0 )
-		damageTransition = TRUE;
-	else if( stricmp( token, "Repair" ) == 0 )
-		damageTransition = FALSE;
-	else
-	{
-
-		DEBUG_CRASH(( "Expected Damage/Repair transition keyword\n" ));
-		throw INI_INVALID_DATA;
-
-	}  // end else
-
-	// get body damage state
-	token = ini->getNextSubToken( "ToState" );
-	BodyDamageType state = (BodyDamageType)ini->scanIndexList( token, TheBodyDamageTypeNames );
-
-	// get effect num
-	token = ini->getNextSubToken( "EffectNum" );
-	Int effectNum = ini->scanInt( token );
-	
-	// make effectNum zero based
-	--effectNum;
-
-	// sanity check effect num
-	if( effectNum < 0 || effectNum >= MAX_BRIDGE_BODY_FX )
-	{
-
-		DEBUG_CRASH(( "Effect number max on bridge transitions is '%d'\n", MAX_BRIDGE_BODY_FX ));
-		throw INI_INVALID_DATA;
-
-	}  // end if
-
-	// read the string
-	token = ini->getNextSubToken( "FX" );
-	if( damageTransition )
-		theInstance->friend_setDamageToFXString( state, effectNum, AsciiString( token ) );
-	else
-		theInstance->friend_setRepairedToFXString( state, effectNum, AsciiString( token ) );
-
-}  // end parseTransitionToFX
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType::TerrainRoadType( void )
-{
-
-	m_isBridge = FALSE;
-	m_id = 0;
-	m_next = NULL;
-	m_roadWidth = 0.0f;
-	m_roadWidthInTexture = 0.0f;
-	m_bridgeScale = 1.0f;
-	m_radarColor.red = 0.0f;
-	m_radarColor.green = 0.0f;
-	m_radarColor.blue = 0.0f;
-	m_transitionEffectsHeight = 0.0f;
-	m_numFXPerType = 0;
-
-}  // end TerrainRoadType
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType::~TerrainRoadType( void )
-{
-
-}  // end ~TerrainRoadType
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainRoadCollection::TerrainRoadCollection( void )
-{
-
-	m_roadList = NULL;
-	m_bridgeList = NULL;
-
-	m_idCounter = 1;   ///< MUST start this at 1.
-
-}  // end TerrainRoadCollection
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainRoadCollection::~TerrainRoadCollection( void )
-{
-	TerrainRoadType *temp;
-
-	// delete all roads in the list
-	while( m_roadList )
-	{
-
-		// get next road
-		temp = m_roadList->friend_getNext();
-
-		// delete this road
-		deleteInstance(m_roadList);
-
-		// set the new head of the list
-		m_roadList = temp;
-
-	}  // end while
-
-	// delete all bridges in the list
-	while( m_bridgeList )
-	{
-
-		// get next bridge
-		temp = m_bridgeList->friend_getNext();
-
-		// delete this bridge
-		deleteInstance(m_bridgeList);
-
-		// set the new head of the list
-		m_bridgeList = temp;
-
-	}  // end while
-
-}  // end ~TerrainRoadCollection
-
-//-------------------------------------------------------------------------------------------------
-/** Find road with matching name */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::findRoad( AsciiString name )
-{
-	TerrainRoadType *road;
-
-	for( road = m_roadList; road; road = nextRoad( road ) )
-	{
-
-		if( road->getName() == name )
-			return road;
-
-	}  // end for road
-
-	// not found
-	return NULL;
-
-}  // end findRoad
-
-//-------------------------------------------------------------------------------------------------
-/** Find bridge with matching name */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::findBridge( AsciiString name )
-{
-	TerrainRoadType *bridge;
-
-	for( bridge = m_bridgeList; bridge; bridge = nextBridge( bridge ) )
-	{
-
-		if( bridge->getName() == name )
-			return bridge;
-
-	}  // end for bridge
-
-	// not found
-	return NULL;
-
-}  // end findBridge
-
-//-------------------------------------------------------------------------------------------------
-/** Search the roads AND bridge lists for the name */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::findRoadOrBridge( AsciiString name )
-{
-	TerrainRoadType *road = findRoad( name );
-
-	if( road )
-		return road;
-	else
-		return findBridge( name );
-
-}  // end findRoadOrBridge
-
-//-------------------------------------------------------------------------------------------------
-/** Allocate a new road, set the name, and link to the road list */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::newRoad( AsciiString name )
-{
-	TerrainRoadType *road = newInstance(TerrainRoadType);
-
-	// assign the name
-	road->friend_setName( name );
-
-	// assign unique id
-	road->friend_setID( m_idCounter++ );
-
-	// is not a bridge
-	road->friend_setBridge( FALSE );
-
-	// set defaults from the default road
-	TerrainRoadType *defaultRoad = findRoad( AsciiString( "DefaultRoad" ) );
-	if( defaultRoad )
-	{
-		
-		road->friend_setTexture( defaultRoad->getTexture() );
-		road->friend_setRoadWidth( defaultRoad->getRoadWidth() );
-		road->friend_setRoadWidthInTexture( defaultRoad->getRoadWidthInTexture() );
-
-	}  // end if
-
-	// link to list
-	road->friend_setNext( m_roadList );
-	m_roadList = road;
-
-	// return the new road
-	return road;
-
-}  // end newRoad
-
-//-------------------------------------------------------------------------------------------------
-/** Allocate a new bridge */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::newBridge( AsciiString name )
-{
-	TerrainRoadType *bridge = newInstance(TerrainRoadType);
-
-	// assign the name
-	bridge->friend_setName( name );
-
-	// assign unique id
-	bridge->friend_setID( m_idCounter++ );
-
-	// is a bridge
-	bridge->friend_setBridge( TRUE );
-
-	// set defaults from the default bridge
-	TerrainRoadType *defaultBridge = findBridge( AsciiString( "DefaultBridge" ) );
-	if( defaultBridge )
-	{
-		
-		bridge->friend_setTexture( defaultBridge->getTexture() );
-		bridge->friend_setBridgeScale( defaultBridge->getBridgeScale() );
-		bridge->friend_setBridgeModelName( defaultBridge->getBridgeModel() );
-		bridge->friend_setBridgeModelNameDamaged( defaultBridge->getBridgeModelNameDamaged() );
-		bridge->friend_setBridgeModelNameReallyDamaged( defaultBridge->getBridgeModelNameReallyDamaged() );
-		bridge->friend_setBridgeModelNameBroken( defaultBridge->getBridgeModelNameBroken() );
-		bridge->friend_setTextureDamaged( defaultBridge->getTextureDamaged() );
-		bridge->friend_setTextureReallyDamaged( defaultBridge->getTextureReallyDamaged() );
-		bridge->friend_setTextureBroken( defaultBridge->getTextureBroken() );
-
-		bridge->friend_setTransitionEffectsHeight( defaultBridge->getTransitionEffectsHeight() );
-		bridge->friend_setNumFXPerType( defaultBridge->getNumFXPerType() );
-		for( Int state = BODY_PRISTINE; state < BODYDAMAGETYPE_COUNT; state++ )
-		{
-
-			bridge->friend_setDamageToSoundString( (BodyDamageType)state, bridge->getDamageToSoundString( (BodyDamageType)state ) );
-			bridge->friend_setRepairedToSoundString( (BodyDamageType)state, bridge->getRepairedToSoundString( (BodyDamageType)state ) );
-
-			for( Int i = 0; i < MAX_BRIDGE_BODY_FX; i++ )
-			{
-
-				bridge->friend_setDamageToOCLString( (BodyDamageType)state, i, bridge->getDamageToOCLString( (BodyDamageType)state, i ) );
-				bridge->friend_setDamageToFXString( (BodyDamageType)state, i, bridge->getDamageToOCLString( (BodyDamageType)state, i ) );
-				bridge->friend_setRepairedToOCLString( (BodyDamageType)state, i, bridge->getDamageToOCLString( (BodyDamageType)state, i ) );
-				bridge->friend_setRepairedToFXString( (BodyDamageType)state, i, bridge->getDamageToOCLString( (BodyDamageType)state, i ) );
-
-			}  // end for i
-
-		}  // end for
-
-	}  // end if
-
-	// link to list
-	bridge->friend_setNext( m_bridgeList );
-	m_bridgeList = bridge;
-
-	// return the new bridge
-	return bridge;
-
-}  // end newBridge
-
-//-------------------------------------------------------------------------------------------------
-/** Return next road in list */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::nextRoad( TerrainRoadType *road )
-{
-
-	DEBUG_ASSERTCRASH( road->isBridge() == FALSE, ("nextRoad: road not a road\n") );
-	return road->friend_getNext();
-
-}  // end nextRoad
-
-//-------------------------------------------------------------------------------------------------
-/** Return next bridge in list */
-//-------------------------------------------------------------------------------------------------
-TerrainRoadType *TerrainRoadCollection::nextBridge( TerrainRoadType *bridge )
-{
-
-	DEBUG_ASSERTCRASH( bridge->isBridge() == TRUE, ("nextBridge, bridge is not a bridge\n") );
-	return bridge->friend_getNext();
-
-}  // end nextBridge
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp
deleted file mode 100644
index 3ab6f798fed..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: TerrainVisual.cpp ////////////////////////////////////////////////////////////////////////
-// Interface for visual representation of terrain on the client
-// Author: Colin Day, April 2001
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#include "Common/Xfer.h"
-#include "GameClient/TerrainVisual.h"
-
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-
-
-// GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
-TerrainVisual *TheTerrainVisual = NULL;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// DEFINITIONS
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainVisual::TerrainVisual()
-{
-
-}  // end TerrainVisual
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainVisual::~TerrainVisual()
-{
-
-}  // end ~TerrainVisual
-
-//-------------------------------------------------------------------------------------------------
-/** initialize the device independent functionality of the visual terrain */
-//-------------------------------------------------------------------------------------------------
-void TerrainVisual::init( void )
-{
-
-}  // end init
-
-//-------------------------------------------------------------------------------------------------
-/** Reset */ 
-//-------------------------------------------------------------------------------------------------
-void TerrainVisual::reset( void )
-{
-
-	m_filenameString.clear();
-
-}  // end reset
-
-//-------------------------------------------------------------------------------------------------
-/** Update */
-//-------------------------------------------------------------------------------------------------
-void TerrainVisual::update( void )
-{
-	// All the interesting stuff happens in load.  jba.
-}  // end update
-
-//-------------------------------------------------------------------------------------------------
-/** device independent implementation for common terrain visual systems */
-//-------------------------------------------------------------------------------------------------
-Bool TerrainVisual::load( AsciiString filename )
-{
-
-	// save the filename
-	if (filename.isEmpty())
-		return FALSE;
-
-	m_filenameString = filename;
-
-	return TRUE;;  // success
-
-}  // end load
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void TerrainVisual::crc( Xfer *xfer )
-{
-
-}  // end CRC
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer
-	* Version Info:
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-void TerrainVisual::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void TerrainVisual::loadPostProcess( void )
-{
-
-}  // end loadPostProcess
-
-
-
-
-
-
-
-SeismicSimulationFilterBase::SeismicSimStatusCode DomeStyleSeismicFilter::filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node )
-{
-
-  Int life = node->m_life;
-
-  if ( heightMap == NULL )
-    return SEISMIC_STATUS_INVALID;
-
-
-  if ( life == 0 )
-    return SEISMIC_STATUS_ACTIVE;
-  if ( life < 15 )
-  {
-    // ADD HEIGHT BECAUSE THE EXPLOSION IS PUSHING DIRT UP
-
-    Real magnitude = node->m_magnitude;
-
-    Real offsScalar =  magnitude / (Real)life; // real-life, get it?
-    Int radius = node->m_radius;
-    Int border = heightMap->getBorderSize();
-    Int centerX = node->m_center.x + border ;
-    Int centerY = node->m_center.y + border ;
-
-    UnsignedInt workspaceWidth = radius*2;
-    Real *workspace = NEW Real[ sqr(workspaceWidth) ];
-    Real *workspaceEnd = workspace + sqr(workspaceWidth);
-
-
-    for ( Real *t = workspace; t < workspaceEnd; ++t ) *t = 0.0f;// clear the workspace
-
-    Int x, y;
-    for (x = 0; x < radius; ++x)
-    {
-      for (y = 0; y < radius; ++y)
-      {
-
-        Real distance = sqrt( sqr(x) + sqr(y) );//Pythagoras
-    
-        if ( distance < radius )
-        {
-          Real distScalar = cos( ( distance / radius * (PI/2) ) );
-          Real height = (offsScalar * distScalar); 
-
-          workspace[ (radius + x) +  workspaceWidth * (radius + y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX + x,  centerY + y ) ;//kaleidoscope
-          
-          if ( x != 0 ) // non-zero test prevents cross-shaped double stamp 
-          {
-      			workspace[ (radius - x) + workspaceWidth * (radius + y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX - x,  centerY + y ) ;
-            if ( y != 0 )
-              workspace[ (radius - x) + workspaceWidth * (radius - y) ] =  height + heightMap->getBilinearSampleSeismicZVelocity( centerX - x,  centerY - y ) ;
-          }
-          if ( y != 0 )
-      			workspace[ (radius + x) + workspaceWidth * (radius - y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX + x,  centerY - y ) ;
-        }
-      }
-    }
-
-    // stuff the values from the workspace into the heightmap's velocities
-    for (x = 0; x < workspaceWidth; ++x)
-      for (y = 0; y < workspaceWidth; ++y)
-    		heightMap->setSeismicZVelocity( centerX - radius + x, centerY - radius + y,  MIN( 9.0f, workspace[  x + workspaceWidth * y ])  );
-
-    delete [] workspace;
-
-    return SEISMIC_STATUS_ACTIVE;
-  }
-  else
-    return SEISMIC_STATUS_ZERO_ENERGY;
-}
-
-Real DomeStyleSeismicFilter::applyGravityCallback( Real velocityIn )
-{
-  Real velocityOut = velocityIn;
-  velocityOut -= 1.5f;
-  return velocityOut;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/VideoPlayer.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/VideoPlayer.cpp
deleted file mode 100644
index 7bc09eeec8f..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/VideoPlayer.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    GameClient
-//
-// File name: VideoPlayer.cpp
-//
-// Created:   10/22/01	TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Lib/BaseType.h"
-#include "GameClient/VideoPlayer.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-VideoPlayerInterface *TheVideoPlayer = NULL;
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-//============================================================================
-// VideoBuffer::VideoBuffer
-//============================================================================
-
-VideoBuffer::VideoBuffer( Type format)
-: m_width(0),
-	m_height(0),
-	m_textureWidth(0),
-	m_textureHeight(0),
-	m_format(format),
-	m_pitch(0),
-	m_xPos(0),
-	m_yPos(0)
-{
-
-	if ( m_format >= NUM_TYPES || m_format < 0 )
-	{
-		m_format = TYPE_UNKNOWN;
-	}
-
-}
-
-//============================================================================
-// VideoBuffer::Rect
-//============================================================================
-
-RectClass VideoBuffer::Rect( Real x1, Real y1, Real x2, Real y2 )
-{
-	RectClass rect(0,0,0,0);
-
-	if ( valid() )
-	{
-		rect.Set( 
-						((Real)m_width/(Real)m_textureWidth)*x1, ((Real)m_height/(Real)m_textureHeight)*y1, 
-						((Real)m_width/(Real)m_textureWidth)*x2, ((Real)m_height/(Real)m_textureHeight)*y2
-					);
-	}
-
-	return rect;
-
-}
-
-//============================================================================
-// VideoBuffer::free
-//============================================================================
-
-void	VideoBuffer::free( void )
-{
-	m_width = 0;
-	m_height = 0;
-	m_textureWidth = 0;
-	m_textureHeight = 0;
-}
-
-//============================================================================
-// VideoPlayer::VideoPlayer
-//============================================================================
-
-VideoPlayer::VideoPlayer()
-: m_firstStream(NULL)
-{
-
-}
-
-//============================================================================
-// VideoPlayer::~VideoPlayer
-//============================================================================
-
-VideoPlayer::~VideoPlayer()
-{
-	deinit();
-	// Set the video player to null if its us. (WB requires this.)
-	if (this == TheVideoPlayer) {
-		TheVideoPlayer = NULL;
-	}
-}
-
-//============================================================================
-// VideoPlayer::init
-//============================================================================
-
-void	VideoPlayer::init( void )
-{
-	// Load this here so that WB doesn't have to link to BinkLib, costing us (potentially)
-	// an extra license.
-	INI ini;
-	ini.load( AsciiString( "Data\\INI\\Default\\Video.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\Video.ini" ), INI_LOAD_OVERWRITE, NULL );
-}
-
-//============================================================================
-// VideoPlayer::deinit
-//============================================================================
-
-void VideoPlayer::deinit( void )
-{
-}
-
-//============================================================================
-// VideoPlayer::reset
-//============================================================================
-
-void	VideoPlayer::reset( void )
-{
-	closeAllStreams();
-}
-
-//============================================================================
-// VideoPlayer::update
-//============================================================================
-
-void	VideoPlayer::update( void )
-{
-
-	VideoStreamInterface *stream = firstStream();
-
-	while ( stream )
-	{
-		stream->update();
-		stream = stream->next();
-	}
-
-}
-
-//============================================================================
-// VideoPlayer::loseFocus
-//============================================================================
-
-void	VideoPlayer::loseFocus( void )
-{
-
-}
-
-//============================================================================
-// VideoPlayer::regainFocus
-//============================================================================
-
-void	VideoPlayer::regainFocus( void )
-{
-
-}
-
-//============================================================================
-// VideoPlayer::open
-//============================================================================
-
-VideoStreamInterface*	VideoPlayer::open( AsciiString movieTitle )
-{
-	return NULL;
-}
-
-//============================================================================
-// VideoPlayer::load
-//============================================================================
-
-VideoStreamInterface*	VideoPlayer::load( AsciiString movieTitle )
-{
-	return NULL;
-}
-
-//============================================================================
-// VideoPlayer::firstStream
-//============================================================================
-
-VideoStreamInterface* VideoPlayer::firstStream( void )
-{
-	return m_firstStream;
-}
-
-//============================================================================
-// VideoPlayer::closeAllStreams
-//============================================================================
-
-void	VideoPlayer::closeAllStreams( void )
-{
-	VideoStreamInterface *stream ;
-
-	while ( (stream = firstStream()) != 0 )
-	{
-		stream->close();
-	}
-}
-
-//============================================================================
-// VideoPlayer::remove
-//============================================================================
-
-void VideoPlayer::remove( VideoStream *stream_to_remove )
-{
-	VideoStream *last = NULL;
-	VideoStream *stream = (VideoStream*) firstStream();
-
-	while ( stream != NULL && stream != stream_to_remove )
-	{
-		last = stream;
-		stream = (VideoStream*) stream->next();
-	}
-
-	if ( stream )
-	{
-		if ( last )
-		{
-			last->m_next = stream->m_next;
-		}
-		else
-		{
-			m_firstStream = stream->m_next;
-		}
-	}
-}
-
-//============================================================================
-// VideoPlayer::addVideo
-//============================================================================
-void VideoPlayer::addVideo( Video* videoToAdd )
-{
-	for (VecVideoIt it = mVideosAvailableForPlay.begin(); it != mVideosAvailableForPlay.end(); ++it) {
-		if (it->m_internalName == videoToAdd->m_internalName) {
-			(*it) = (*videoToAdd);
-			return;
-		}
-	}
-
-	// That internal name hasn't been used, so push a new entry on the back
-	mVideosAvailableForPlay.push_back(*videoToAdd);
-}
-
-//============================================================================
-// VideoPlayer::removeVideo
-//============================================================================
-void VideoPlayer::removeVideo( Video* videoToRemove )
-{
-	for (VecVideoIt it = mVideosAvailableForPlay.begin(); it != mVideosAvailableForPlay.end(); ++it) {
-		if (it->m_internalName == videoToRemove->m_internalName) {
-			mVideosAvailableForPlay.erase(it);
-			return;
-		}
-	}
-}
-
-//============================================================================
-// VideoPlayer::getNumVideos
-//============================================================================
-Int VideoPlayer::getNumVideos( void )
-{
-	return mVideosAvailableForPlay.size();
-}
-
-//============================================================================
-// VideoPlayer::removeVideo
-//============================================================================
-const Video* VideoPlayer::getVideo( AsciiString movieTitle )
-{
-	for (VecVideoIt it = mVideosAvailableForPlay.begin(); it != mVideosAvailableForPlay.end(); ++it) {
-		if (it->m_internalName == movieTitle) {
-			return &(*it);
-		}
-	}
-	return NULL;
-}
-
-//============================================================================
-// VideoPlayer::getVideo
-//============================================================================
-const Video* VideoPlayer::getVideo( Int index )
-{
-	if (index < 0 || index >= mVideosAvailableForPlay.size()) {
-		return NULL;
-	}
-
-	return &mVideosAvailableForPlay[index];
-}
-
-//============================================================================
-// VideoStream::VideoStream
-//============================================================================
-
-VideoStream::VideoStream()
-: m_next(NULL),
-	m_player(NULL)
-{
-
-}
-
-//============================================================================
-// VideoStream::~VideoStream
-//============================================================================
-
-VideoStream::~VideoStream()
-{
-
-	if ( m_player )
-	{
-		m_player->remove( this );
-		m_player = NULL;
-	}
-
-}
-
-//============================================================================
-// VideoStream::next
-//============================================================================
-
-VideoStreamInterface* VideoStream::next( void )
-{
-	return m_next;
-}
-
-//============================================================================
-// VideoStream::update
-//============================================================================
-
-void VideoStream::update( void )
-{
-}
-
-//============================================================================
-// VideoStream::close
-//============================================================================
-
-void VideoStream::close( void )
-{
-	delete this;
-}
-
-//============================================================================
-// VideoStream::isFrameReady
-//============================================================================
-
-Bool VideoStream::isFrameReady( void )
-{
-	return TRUE;
-}
-
-//============================================================================
-// VideoStream::frameDecompress
-//============================================================================
-
-void VideoStream::frameDecompress( void )
-{
-
-}
-
-//============================================================================
-// VideoStream::frameRender
-//============================================================================
-
-void VideoStream::frameRender( VideoBuffer *buffer )
-{
-
-}
-
-//============================================================================
-// VideoStream::frameNext
-//============================================================================
-
-void VideoStream::frameNext( void )
-{
-
-}
-
-//============================================================================
-// VideoStream::frameIndex
-//============================================================================
-
-Int VideoStream::frameIndex( void )
-{
-	return 0;
-}
-
-//============================================================================
-// VideoStream::totalFrames
-//============================================================================
-
-Int	VideoStream::frameCount( void )
-{
-	return 0;
-}
-
-//============================================================================
-// VideoStream::frameGoto
-//============================================================================
-
-void VideoStream::frameGoto( Int index )
-{
-
-}
-
-//============================================================================
-// VideoStream::height
-//============================================================================
-
-Int		VideoStream::height( void )
-{
-	return 0;
-}
-
-//============================================================================
-// VideoStream::width
-//============================================================================
-
-Int		VideoStream::width( void )
-{
-	return 0;
-}
-
-
-const FieldParse VideoPlayer::m_videoFieldParseTable[] = 
-{
-	{ "Filename",								INI::parseAsciiString,							NULL, offsetof( Video, m_filename) },
-	{ "Comment",								INI::parseAsciiString,							NULL, offsetof( Video, m_commentForWB) },
-	{ NULL,											NULL,																NULL, 0 },
-};
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/VideoStream.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/VideoStream.cpp
deleted file mode 100644
index adc45d2e1ca..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/VideoStream.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    GameClient
-//
-// File name: VideoStream.cpp
-//
-// Created:   10/22/01	TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Lib/BaseType.h"
-#include "GameClient/VideoPlayer.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp
deleted file mode 100644
index c41f1080277..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// View.cpp ///////////////////////////////////////////////////////////////////
-// A "view", or window, into the World
-// Author: Michael S. Booth, February 2001
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameEngine.h"
-#include "Common/Xfer.h"
-#include "GameClient/View.h"
-#include "GameClient/Drawable.h"
-
-UnsignedInt View::m_idNext = 1;
-
-// the tactical view singleton
-View *TheTacticalView = NULL;
-
-
-View::View( void )
-{
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
-	m_currentHeightAboveGround = 0.0f;
-	m_defaultAngle = 0.0f;
-	m_defaultPitchAngle = 0.0f;
-	m_heightAboveGround = 0.0f;
-	m_lockDist = 0.0f;
-	m_maxHeightAboveGround = 0.0f;
-	m_maxZoom = 0.0f;
-	m_minHeightAboveGround = 0.0f;
-	m_minZoom = 0.0f;
-	m_next = NULL;
-	m_okToAdjustHeight = TRUE;
-	m_originX = 0;
-	m_originY = 0;
-	m_snapImmediate = FALSE;
-	m_terrainHeightUnderCamera = 0.0f;
-	m_zoom = 0.0f;
-	//
-	m_pos.x = 0;
-	m_pos.y = 0;
-	m_width = 0;
-	m_height = 0;
-	m_angle = 0.0f;
-	m_pitchAngle = 0.0f;
-	m_cameraLock = INVALID_ID;
-	m_cameraLockDrawable = NULL;
-	m_zoomLimited = TRUE;
-
-	// create unique view ID
-	m_id = m_idNext++;
-
-	// default field of view
-	m_FOV = 50.0f * PI/180.0f;
-	
-	m_mouseLocked = FALSE;
-	
-	m_guardBandBias.x = 0.0f;
-	m_guardBandBias.y = 0.0f;
-}
-
-View::~View()
-{
-}
-
-void View::init( void )
-{
-	m_width = DEFAULT_VIEW_WIDTH;
-	m_height = DEFAULT_VIEW_HEIGHT;
-	m_originX = DEFAULT_VIEW_ORIGIN_X;
-	m_originY = DEFAULT_VIEW_ORIGIN_Y;
-	m_pos.x = 0;
-	m_pos.y = 0;
-	m_angle = 0.0f;
-	m_cameraLock = INVALID_ID;
-	m_cameraLockDrawable = NULL;
-	m_zoomLimited = TRUE;
-	
-	m_maxZoom = 1.3f;
-	m_minZoom = 0.2f;
-	m_zoom = m_maxZoom;
-	m_maxHeightAboveGround = TheGlobalData->m_maxCameraHeight;
-	m_minHeightAboveGround = TheGlobalData->m_minCameraHeight;
-	m_okToAdjustHeight = FALSE;
-
-	m_defaultAngle = 0.0f;
-	m_defaultPitchAngle = 0.0f;
-}
-
-void View::reset( void )
-{
-	// Only fixing the reported bug.  Who knows what side effects resetting the rest could have.
-	m_zoomLimited = TRUE;
-}
-
-/**
- * Prepend this view to the given list, return the new list.
- */
-View *View::prependViewToList( View *list )
-{
-	m_next = list;
-	return this;
-}
-
-void View::zoomIn( void )
-{
-	setHeightAboveGround(getHeightAboveGround() - 10.0f);
-}
-
-void View::zoomOut( void )
-{
-	setHeightAboveGround(getHeightAboveGround() + 10.0f);
-}
-
-/**
- * Center the view on the given coordinate.
- */
-void View::lookAt( const Coord3D *o ) 
-{ 
-
-	/// @todo this needs to be changed to be 3D, this is still old 2D stuff
-	Coord3D pos = *getPosition();
-	pos.x = o->x - m_width * 0.5f; 
-	pos.y = o->y - m_height * 0.5f; 
-	setPosition(&pos);
-}
-
-/**
- * Shift the view by the given delta.
- */
-void View::scrollBy( Coord2D *delta ) 
-{ 
-	// update view's world position
-	m_pos.x += delta->x;
-	m_pos.y += delta->y;
-}
-
-/**
- * Rotate the view around the up axis by the given angle.
- */
-void View::setAngle( Real angle )
-{
-	m_angle = angle; 
-}
-
-/**
- * Rotate the view around the horizontal (X) axis to the given angle.
- */
-void View::setPitch( Real angle )
-{
-	m_pitchAngle = angle;
-
-	Real limit = PI/5.0f;
-
-	if (m_pitchAngle < -limit)
-		m_pitchAngle = -limit;
-	else if (m_pitchAngle > limit)
-		m_pitchAngle = limit;
-}
-
-/**
- * Set the view angle back to default
- */
-void View::setAngleAndPitchToDefault( void )
-{ 
-	m_angle = m_defaultAngle;
-	m_pitchAngle = m_defaultPitchAngle;
-}
-
-/**
- * write the view's current location in to the view location object
- */
-void View::getLocation( ViewLocation *location )
-{
-
-	const Coord3D *pos = getPosition();
-	location->init( pos->x, pos->y, pos->z, getAngle(), getPitch(), getZoom() );
-
-}
-
-
-/**
- * set the view's current location from to the view location object
- */
-void View::setLocation( const ViewLocation *location )
-{
-	if ( location->m_valid )
-	{
-		setPosition(&location->m_pos);
-		setAngle(location->m_angle);
-		setPitch(location->m_pitch);
-		setZoom(location->m_zoom);
-		forceRedraw();
-	}
-
-}
-
-//-------------------------------------------------------------------------------------------------
-/** project the 4 corners of this view into the world and return each point as a parameter,
-		the world points are at the requested Z */
-//-------------------------------------------------------------------------------------------------
-void View::getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
-																					Coord3D *bottomLeft, Coord3D *bottomRight,
-																					Real z )
-{
-	ICoord2D screenTopLeft, screenTopRight, screenBottomLeft, screenBottomRight;
-	ICoord2D origin;
-	Int viewWidth = getWidth();
-	Int viewHeight = getHeight();
-
-	// sanity
-	if( topLeft == NULL || topRight == NULL || bottomLeft == NULL || bottomRight == NULL )
-		return;
-
-	// setup the screen coords for the 4 corners of the viewable display
-	getOrigin( &origin.x, &origin.y );
-	screenTopLeft.x     = origin.x;								// upper left
-	screenTopLeft.y     = origin.y;								// upper left
-	screenTopRight.x    = origin.x + viewWidth;		// upper right
-	screenTopRight.y    = origin.y;								// upper right
-	screenBottomLeft.x  = origin.x + viewWidth;		// lower right
-	screenBottomLeft.y  = origin.y + viewHeight;  // lower right
-	screenBottomRight.x = origin.x;								// lower left
-	screenBottomRight.y = origin.y + viewHeight;	// lower left
-
-	// project
-	screenToWorldAtZ( &screenTopLeft, topLeft, z );
-	screenToWorldAtZ( &screenTopRight, topRight, z );
-	screenToWorldAtZ( &screenBottomLeft, bottomLeft, z );
-	screenToWorldAtZ( &screenBottomRight, bottomRight, z );
-
-}  // end getScreenCornerWorldPointsAtZ
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer method for a view */
-// ------------------------------------------------------------------------------------------------
-void View::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// camera angle
-	Real angle = getAngle();
-	xfer->xferReal( &angle );
-	setAngle( angle );
-
-	// view position
-	Coord3D viewPos;
-	getPosition( &viewPos );
-	xfer->xferReal( &viewPos.x );
-	xfer->xferReal( &viewPos.y );
-	xfer->xferReal( &viewPos.z );
-	lookAt( &viewPos );
-
-}  // end xfer
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Water.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Water.cpp
deleted file mode 100644
index 4584810f54d..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/Water.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Water.cpp ////////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, December 2001
-// Desc:   Map water settings
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/Water.h"
-#include "Common/INI.h"
-
-// GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
-WaterSetting WaterSettings[ TIME_OF_DAY_COUNT ];
-OVERRIDE<WaterTransparencySetting> TheWaterTransparency = NULL;
-
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-const FieldParse WaterSetting::m_waterSettingFieldParseTable[] = 
-{
-
-	{ "SkyTexture",									INI::parseAsciiString,			NULL, offsetof( WaterSetting, m_skyTextureFile ) },
-	{ "WaterTexture",								INI::parseAsciiString,			NULL, offsetof( WaterSetting, m_waterTextureFile ) },
-  { "Vertex00Color",							INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_vertex00Diffuse ) },
-	{ "Vertex10Color",							INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_vertex10Diffuse ) },
-	{ "Vertex01Color",							INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_vertex01Diffuse ) },
-  { "Vertex11Color",							INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_vertex11Diffuse ) },
-	{ "DiffuseColor",								INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_waterDiffuseColor ) },
-  { "TransparentDiffuseColor",		INI::parseRGBAColorInt,			NULL, offsetof( WaterSetting, m_transparentWaterDiffuse ) },
-  { "UScrollPerMS",								INI::parseReal,							NULL, offsetof( WaterSetting, m_uScrollPerMs ) },
-  { "VScrollPerMS",								INI::parseReal,							NULL, offsetof( WaterSetting, m_vScrollPerMs ) },
-	{ "SkyTexelsPerUnit",						INI::parseReal,							NULL, offsetof( WaterSetting, m_skyTexelsPerUnit ) },
-  { "WaterRepeatCount",						INI::parseInt,							NULL, offsetof( WaterSetting, m_waterRepeatCount ) },
-
-	{ NULL,													NULL,												NULL, 0 },
-
-};
-
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-const FieldParse WaterTransparencySetting::m_waterTransparencySettingFieldParseTable[] = 
-{
-
-	{ "TransparentWaterDepth",			INI::parseReal,				NULL,			offsetof( WaterTransparencySetting, m_transparentWaterDepth ) },
-	{ "TransparentWaterMinOpacity",	INI::parseReal,				NULL,			offsetof( WaterTransparencySetting, m_minWaterOpacity ) },
-	{ "StandingWaterColor",	INI::parseRGBColor,			NULL,			offsetof( WaterTransparencySetting, m_standingWaterColor ) },
-	{ "StandingWaterTexture",INI::parseAsciiString,		NULL,			offsetof( WaterTransparencySetting, m_standingWaterTexture ) },
-	{ "AdditiveBlending", INI::parseBool,				NULL,			offsetof( WaterTransparencySetting, m_additiveBlend) },
-	{ "RadarWaterColor", INI::parseRGBColor,			NULL,			offsetof( WaterTransparencySetting, m_radarColor) },
-	{ "SkyboxTextureN",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureN ) },
-	{ "SkyboxTextureE",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureE ) },
-	{ "SkyboxTextureS",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureS ) },
-	{ "SkyboxTextureW",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureW ) },
-	{ "SkyboxTextureT",							INI::parseAsciiString,NULL,			offsetof( WaterTransparencySetting, m_skyboxTextureT ) },
-
-
-	{ 0, 0, 0, 0 },
-};
-
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-WaterSetting::WaterSetting( void )
-{
-
-	m_skyTextureFile.clear();
-	m_waterTextureFile.clear();
-	m_waterRepeatCount = 0;
-	m_skyTexelsPerUnit = 0.0f;
-
-	m_vertex00Diffuse.red = 0;
-	m_vertex00Diffuse.green = 0; 
-	m_vertex00Diffuse.blue = 0; 
-	m_vertex00Diffuse.alpha = 0;
-
-	m_vertex01Diffuse.red = 0; 
-	m_vertex01Diffuse.green = 0; 
-	m_vertex01Diffuse.blue = 0; 
-	m_vertex01Diffuse.alpha = 0;
-
-	m_vertex10Diffuse.red = 0; 
-	m_vertex10Diffuse.green = 0; 
-	m_vertex10Diffuse.blue = 0; 
-	m_vertex10Diffuse.alpha = 0;
-
-	m_vertex11Diffuse.red = 0; 
-	m_vertex11Diffuse.green = 0; 
-	m_vertex11Diffuse.blue = 0; 
-	m_vertex11Diffuse.alpha = 0;
-
-	m_waterDiffuseColor.red = 0;
-	m_waterDiffuseColor.green = 0;
-	m_waterDiffuseColor.blue = 0;
-	m_waterDiffuseColor.alpha = 0;
-
-	m_transparentWaterDiffuse.red = 0;
-	m_transparentWaterDiffuse.green = 0;
-	m_transparentWaterDiffuse.blue = 0;
-	m_transparentWaterDiffuse.alpha = 0;
-
-	m_uScrollPerMs = 0.0f;
-	m_vScrollPerMs = 0.0f;
-
-}  // end WaterSetting
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-WaterSetting::~WaterSetting( void )
-{
-
-}  // end WaterSetting
-
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp
index 2900f19d9f1..2f4713f51c7 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp
@@ -25,7 +25,7 @@
 // AI.cpp
 // The Artificial Intelligence system
 // Author: Michael S. Booth, November 2000
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/CRCDebug.h"
 #include "Common/GameState.h"
@@ -47,29 +47,23 @@
 
 extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE CLASS ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-void TAiData::addSideInfo(AISideInfo *infoToAdd) 
+void TAiData::addSideInfo(AISideInfo *infoToAdd)
 {
 	infoToAdd->m_next = m_sideInfo;
 	m_sideInfo = infoToAdd;
 }
 
-void TAiData::addFactionBuildList(AISideBuildList *buildList) 
+void TAiData::addFactionBuildList(AISideBuildList *buildList)
 {
 
 	AISideBuildList *info = m_sideBuildLists;
 	while (info) {
 		if (buildList->m_side == info->m_side) {
-			if (info->m_buildList)
-				deleteInstance(info->m_buildList);
+			deleteInstance(info->m_buildList);
 			info->m_buildList = buildList->m_buildList;
 			buildList->m_buildList = NULL;
 			buildList->m_next = NULL;
@@ -86,7 +80,7 @@ TAiData::~TAiData()
 {
 	AISideInfo *info = m_sideInfo;
 	m_sideInfo = NULL;
-	while (info) { 
+	while (info) {
 		AISideInfo *cur = info;
 		info = info->m_next;
 		deleteInstance(cur);
@@ -94,7 +88,7 @@ TAiData::~TAiData()
 
 	AISideBuildList *build = m_sideBuildLists;
 	m_sideBuildLists = NULL;
-	while (build) { 
+	while (build) {
 		AISideBuildList *cur = build;
 		build = build->m_next;
 		deleteInstance(cur);
@@ -105,18 +99,16 @@ TAiData::~TAiData()
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE CLASS ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-AISideBuildList::AISideBuildList( AsciiString side ) : 
-	m_side(side), 
-	m_buildList(NULL), 
+AISideBuildList::AISideBuildList( AsciiString side ) :
+	m_side(side),
+	m_buildList(NULL),
 	m_next(NULL)
 {
 }
 
 AISideBuildList::~AISideBuildList()
 {
-	if (m_buildList) {
-		deleteInstance(m_buildList); // note - deletes all in the list.
-	}
+	deleteInstance(m_buildList); // note - deletes all in the list.
 	m_buildList = NULL;
 }
 
@@ -139,9 +131,9 @@ void AISideBuildList::addInfo(BuildListInfo *info)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-static const FieldParse TheAIFieldParseTable[] = 
+static const FieldParse TheAIFieldParseTable[] =
 {
-																	 
+
 	{ "StructureSeconds",				INI::parseReal,NULL,		offsetof( TAiData, m_structureSeconds ) },
 	{ "TeamSeconds",						INI::parseReal,NULL,		offsetof( TAiData, m_teamSeconds ) },
 	{ "Wealthy",								INI::parseInt,NULL,			offsetof( TAiData, m_resourcesWealthy ) },
@@ -173,7 +165,7 @@ static const FieldParse TheAIFieldParseTable[] =
 	{ "AttackUsesLineOfSight",	INI::parseBool,NULL,		offsetof( TAiData, m_attackUsesLineOfSight ) },
 	{ "AttackIgnoreInsignificantBuildings",	INI::parseBool,NULL,		offsetof( TAiData, m_attackIgnoreInsignificantBuildings ) },
 
-	
+
 	{ "AttackPriorityDistanceModifier", INI::parseReal,NULL, offsetof( TAiData, m_attackPriorityDistanceModifier) },
  	{ "MaxRecruitRadius",				INI::parseReal,NULL,		offsetof( TAiData, m_maxRecruitDistance ) },
 	{ "SkirmishBaseDefenseExtraDistance",	INI::parseReal,NULL,	offsetof( TAiData, m_skirmishBaseDefenseExtraDistance ) },
@@ -205,7 +197,7 @@ static const FieldParse TheAIFieldParseTable[] =
  	{ "RetaliationFriendsRadius",	INI::parseReal,NULL,			offsetof( TAiData, m_retaliateFriendsRadius ) },
 
 
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
+	{ NULL,					NULL,						NULL,						0 }
 
 };
 
@@ -214,7 +206,7 @@ void AI::parseSideInfo(INI *ini, void *instance, void* /*store*/, const void* /*
 	const char* c = ini->getNextToken();
 	AsciiString side(c);
 
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "ResourceGatherersEasy",				INI::parseInt,						NULL, offsetof( AISideInfo, m_easy ) },
 			{ "ResourceGatherersNormal",			INI::parseInt,						NULL, offsetof( AISideInfo, m_normal ) },
@@ -225,7 +217,7 @@ void AI::parseSideInfo(INI *ini, void *instance, void* /*store*/, const void* /*
 			{ "SkillSet3",										AI::parseSkillSet,				NULL, offsetof( AISideInfo, m_skillSet3 ) },
 			{ "SkillSet4",										AI::parseSkillSet,				NULL, offsetof( AISideInfo, m_skillSet4 ) },
 			{ "SkillSet5",										AI::parseSkillSet,				NULL, offsetof( AISideInfo, m_skillSet5 ) },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
 	AISideInfo *resourceInfo = ((TAiData*)instance)->m_sideInfo;
@@ -235,7 +227,7 @@ void AI::parseSideInfo(INI *ini, void *instance, void* /*store*/, const void* /*
 		}
 		resourceInfo = resourceInfo->m_next;
 	}
-	if (resourceInfo==NULL) 
+	if (resourceInfo==NULL)
 	{
 		resourceInfo = newInstance(AISideInfo);
 		((TAiData*)instance)->addSideInfo(resourceInfo);
@@ -247,10 +239,10 @@ void AI::parseSideInfo(INI *ini, void *instance, void* /*store*/, const void* /*
 
 void AI::parseSkillSet(INI *ini, void *instance, void* store, const void* /*userData*/)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Science",											AI::parseScience,					NULL, NULL },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
 	TSkillSet *skillset = ((TSkillSet*)store);
@@ -273,7 +265,7 @@ void AI::parseScience(INI *ini, void *instance, void* /*store*/, const void* /*u
 	ScienceType science = skillset->m_skills[skillset->m_numSkills];
 	if (science != SCIENCE_INVALID) {
 		if (TheScienceStore->getSciencePurchaseCost(science)==0) {
-			DEBUG_CRASH(("Science %s is not purchaseable, can't be bought.", 
+			DEBUG_CRASH(("Science %s is not purchaseable, can't be bought.",
 				TheScienceStore->getInternalNameForScience(science).str()));
 			return;
 		}
@@ -286,13 +278,13 @@ void AI::parseSkirmishBuildList(INI *ini, void *instance, void* /*store*/, const
 	const char* c = ini->getNextToken();
 	AsciiString faction(c);
 
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Structure",			BuildListInfo::parseStructure,			NULL, NULL },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
-	AISideBuildList *build = newInstance(AISideBuildList)(faction);	
+	AISideBuildList *build = newInstance(AISideBuildList)(faction);
 	ini->initFromINI(build, myFieldParse);
 	((TAiData*)instance)->addFactionBuildList(build);
 
@@ -333,7 +325,9 @@ void AI::reset( void )
 		m_aiData = m_aiData->m_next;
 		delete cur;
 	}
-	while (m_groupList.size())
+
+#if RETAIL_COMPATIBLE_AIGROUP
+	while (!m_groupList.empty())
 	{
 		AIGroup *groupToRemove = m_groupList.front();
 		if (groupToRemove)
@@ -345,6 +339,12 @@ void AI::reset( void )
 			m_groupList.pop_front(); // NULL group, just kill from list.  Shouldn't really happen, but just in case.
 		}
 	}
+#else
+	DEBUG_ASSERTCRASH(m_groupList.empty(), ("AI::m_groupList is expected empty already"));
+
+	m_groupList.clear(); // Clear just in case...
+#endif
+
 	m_nextGroupID = 0;
 	m_nextFormationID = NO_FORMATION_ID;
 	getNextFormationID(); // increment once past NO_FORMATION_ID.  jba.
@@ -370,11 +370,10 @@ void AI::update( void )
  */
 AI::~AI()
 {
-	if (m_pathfinder) {
-		delete m_pathfinder;
-	}
+	delete m_pathfinder;
 	m_pathfinder = NULL;
-	while (m_aiData) 
+
+	while (m_aiData)
 	{
 		TAiData *cur = m_aiData;
 		m_aiData = m_aiData->m_next;
@@ -396,7 +395,7 @@ void AI::newOverride(void)
 		newInfo->m_next = NULL;
 		addSideInfo(newInfo);
 		info = info->m_next;
-	}									
+	}
 	m_aiData->m_sideBuildLists = NULL;
 	AISideBuildList *build = cur->m_sideBuildLists;
 	while (build) {
@@ -423,18 +422,17 @@ void AI::parseAiDataDefinition( INI* ini )
 	if( TheAI )
 	{
 
-		// 
+		//
 		// if the type of loading we're doing creates override data, we need to
 		// be loading into a new override item
 		//
 		if( ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES )
 			TheAI->newOverride();
 
-	}  // end if
-
-	// parse the ini weapon definition
-	ini->initFromINI( TheAI->m_aiData, TheAIFieldParseTable );
+		// parse the ini weapon definition
+		ini->initFromINI( TheAI->m_aiData, TheAIFieldParseTable );
 
+	}
 }
 
 
@@ -444,14 +442,22 @@ void AI::parseAiDataDefinition( INI* ini )
 /**
  * Create a new AI Group
  */
-AIGroup *AI::createGroup( void )
+AIGroupPtr AI::createGroup( void )
 {
 	// create a new instance
+#if RETAIL_COMPATIBLE_AIGROUP
 	AIGroup *group = newInstance(AIGroup);
+#else
+	AIGroupPtr group = AIGroupPtr::Create_NoAddRef(newInstance(AIGroup));
+#endif
 
 	// add it to the list
-//	DEBUG_LOG(("***AIGROUP %x is being added to m_groupList.\n", group ));
+//	DEBUG_LOG(("***AIGROUP %x is being added to m_groupList.", group ));
+#if RETAIL_COMPATIBLE_AIGROUP
 	m_groupList.push_back( group );
+#else
+	m_groupList.push_back( group.Peek() );
+#endif
 
 	return group;
 }
@@ -470,7 +476,7 @@ void AI::destroyGroup( AIGroup *group )
 	DEBUG_ASSERTCRASH(group != NULL, ("A NULL group made its way into the AIGroup list.. jkmcd"));
 
 	// remove it
-//	DEBUG_LOG(("***AIGROUP %x is being removed from m_groupList.\n", group ));
+//	DEBUG_LOG(("***AIGROUP %x is being removed from m_groupList.", group ));
 	m_groupList.erase( i );
 
 	// destroy group
@@ -527,7 +533,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter
 		return true;
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterLiveMapEnemies"; }
 #endif
 };
@@ -557,13 +563,13 @@ class PartitionFilterWithinAttackRange : public PartitionFilter
 		return false;
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterWithinAttackRange"; }
 #endif
 };
 
 
-typedef struct 
+typedef struct
 {
 	Int priority;
 	const AttackPriorityInfo *info;
@@ -584,7 +590,7 @@ static void priorityFunc(Object *obj, void *userData)
 /**
  * Return the closest enemy, according to the qualifiers.
  */
-Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifiers, 
+Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifiers,
 														 const AttackPriorityInfo *info, PartitionFilter *optionalFilter)
 {
 
@@ -623,7 +629,7 @@ Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifie
 
 	// (optional) only stuff that is significant
 	PartitionFilterInsignificantBuildings filterInsignificant(true, false);
-	
+
 	// (optional) only stuff clear of fog
 	PartitionFilterFreeOfFog filterFogged(me->getControllingPlayer()->getPlayerIndex());
 
@@ -643,7 +649,7 @@ Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifie
 	// -- filterStealth is BY FAR the least common to be useful, so it goes last.
 	// GS Fog check used to be inside can attack, so it feels right to be right after it
 
-	filters[numFilters++] = &filterObvious;	
+	filters[numFilters++] = &filterObvious;
 
 	if( !(qualifiers & ATTACK_BUILDINGS) )
 		filters[numFilters++] = &filterBldgs;
@@ -665,14 +671,14 @@ Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifie
 
 	filters[numFilters++] = &filterStealth;
 
-	if (optionalFilter) 
+	if (optionalFilter)
 	{
 		filters[numFilters++] = optionalFilter;
 	}
 
 	filters[numFilters] = NULL;
 
-	if (info == NULL || info == TheScriptEngine->getDefaultAttackInfo()) 
+	if (info == NULL || info == TheScriptEngine->getDefaultAttackInfo())
 	{
 		// No additional attack info, so just return the closest one.
 		Object* o = ThePartitionManager->getClosestObject( me, range, FROM_BOUNDINGSPHERE_2D, filters );
@@ -684,10 +690,10 @@ Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifie
 	Int			actualPriority=0;
 	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(me, range, FROM_BOUNDINGSPHERE_2D, filters, ITER_SORTED_NEAR_TO_FAR);
 	MemoryPoolObjectHolder holder(iter);
-	for (Object *theEnemy = iter->first(); theEnemy; theEnemy = iter->next()) 
+	for (Object *theEnemy = iter->first(); theEnemy; theEnemy = iter->next())
 	{
 		Int curPriority = info->getPriority(theEnemy->getTemplate());
-		if (curPriority == 0) 
+		if (curPriority == 0)
 			continue; // don't attack 0 priority targets.
 
 		/* check for garrisoned buildings/vehicles & see if a higher priority unit is inside. */
@@ -704,25 +710,25 @@ Object *AI::findClosestEnemy( const Object *me, Real range, UnsignedInt qualifie
 
 		Real distSqr = ThePartitionManager->getDistanceSquared(me, theEnemy, FROM_BOUNDINGSPHERE_2D);
 		Real dist = sqrt(distSqr);
-		Int modifier = dist/TheAI->getAiData()->m_attackPriorityDistanceModifier;
+		Int modifier = dist/getAiData()->m_attackPriorityDistanceModifier;
 		Int modPriority = curPriority-modifier;
-		if (modPriority < 1) 
+		if (modPriority < 1)
 			modPriority = 1;
-		if (modPriority > effectivePriority) 
+		if (modPriority > effectivePriority)
 		{
 			effectivePriority = modPriority;
 			actualPriority = curPriority;
 			bestEnemy = theEnemy;
 		}
-		if (modPriority == effectivePriority && curPriority > actualPriority) 
+		if (modPriority == effectivePriority && curPriority > actualPriority)
 		{
 			effectivePriority = modPriority;
 			actualPriority = curPriority;
 			bestEnemy = theEnemy;
 		}
-	}	
+	}
 	if (bestEnemy) {
-		//DEBUG_LOG(("Find closest found %s, hunter %s, info %s\n", bestEnemy->getTemplate()->getName().str(), 
+		//DEBUG_LOG(("Find closest found %s, hunter %s, info %s", bestEnemy->getTemplate()->getName().str(),
 		//	me->getTemplate()->getName().str(), info->getName().str()));
 	}
 	return bestEnemy;
@@ -787,7 +793,7 @@ Object *AI::findClosestRepulsor( const Object *me, Real range)
 
 	// and only stuff that isn't stealthed (and not detected)
 	// (note that stealthed allies aren't hidden from us, but that's ok. jba.)
-	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ), 
+	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ),
 																										 MAKE_OBJECT_STATUS_MASK2( OBJECT_STATUS_DETECTED, OBJECT_STATUS_DISGUISED ) );
 
 	PartitionFilter *filters[16];
@@ -807,26 +813,26 @@ Real AI::getAdjustedVisionRangeForObject(const Object *object, Int factorsToCons
 	const AIUpdateInterface *ai = object->getAI();
 	const TAiData *aiData = TheAI->getAiData();
 
-	if (!ai) 
+	if (!ai)
 	{
 		DEBUG_CRASH(("Unit without AI ('%s') calling AI::getAdjustedVisionRangeForObject. Notify jkmcd.", object->getTemplate()->getName().str()));
 		return 0.0f;
 	}
-	
+
 	UnsignedInt moodMatrixVal = ai->getMoodMatrixValue();
 
-	if (factorsToConsider & AI_VISIONFACTOR_OWNERTYPE) 
+	if (factorsToConsider & AI_VISIONFACTOR_OWNERTYPE)
 	{
 		Bool playerIsHuman = (moodMatrixVal & MM_Controller_Player) != 0;
 
-		if (playerIsHuman) 
+		if (playerIsHuman)
 		{
-			if (factorsToConsider & AI_VISIONFACTOR_GUARDINNER) 
+			if (factorsToConsider & AI_VISIONFACTOR_GUARDINNER)
 				originalRange *= aiData->m_guardInnerModifierHuman;
 			else
 				originalRange *= aiData->m_guardOuterModifierHuman;
-		} 
-		else 
+		}
+		else
 		{
 			if (factorsToConsider & AI_VISIONFACTOR_GUARDINNER)
 				originalRange *= aiData->m_guardInnerModifierAI;
@@ -835,13 +841,13 @@ Real AI::getAdjustedVisionRangeForObject(const Object *object, Int factorsToCons
 		}
 	}
 
-	if (object->getContainedBy() != NULL) 
+	if (object->getContainedBy() != NULL)
 	{
 		originalRange = object->getLargestWeaponRange();
-	} 
-	else 
+	}
+	else
 	{
-		if ((factorsToConsider & AI_VISIONFACTOR_MOOD) && ((moodMatrixVal & MM_Controller_Player) == 0) ) 
+		if ((factorsToConsider & AI_VISIONFACTOR_MOOD) && ((moodMatrixVal & MM_Controller_Player) == 0) )
 		{
 			switch(moodMatrixVal & MM_Mood_Bitmask)
 			{
@@ -849,10 +855,10 @@ Real AI::getAdjustedVisionRangeForObject(const Object *object, Int factorsToCons
 					return 0.0f;
 
 				case MM_Mood_Passive:
-				case MM_Mood_Normal: 
+				case MM_Mood_Normal:
 					break;
-				
-				case MM_Mood_Alert: 
+
+				case MM_Mood_Alert:
 					originalRange *= TheAI->getAiData()->m_alertRangeModifier;
 					break;
 
@@ -863,31 +869,31 @@ Real AI::getAdjustedVisionRangeForObject(const Object *object, Int factorsToCons
 		}
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_debugVisibility) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugVisibility)
 	{
 		// ICK. This really nasty statement is used so that we only initialize this color once.
 		// It should be exactly double the intensity of its targettable brother.
 		static RGBColor theAdjustedVisionColor = {
-			(TheGlobalData->m_debugVisibilityTargettableColor.red * 2 <= 1.0f ? 
+			(TheGlobalData->m_debugVisibilityTargettableColor.red * 2 <= 1.0f ?
 				TheGlobalData->m_debugVisibilityTargettableColor.red * 2 :
 				1.0f),
-			(TheGlobalData->m_debugVisibilityTargettableColor.green * 2 <= 1.0f ? 
+			(TheGlobalData->m_debugVisibilityTargettableColor.green * 2 <= 1.0f ?
 				TheGlobalData->m_debugVisibilityTargettableColor.green * 2 :
 				1.0f),
-			(TheGlobalData->m_debugVisibilityTargettableColor.blue * 2 <= 1.0f ? 
+			(TheGlobalData->m_debugVisibilityTargettableColor.blue * 2 <= 1.0f ?
 				TheGlobalData->m_debugVisibilityTargettableColor.blue * 2 :
 				1.0f)
 		};
 
 		Vector3 pos(originalRange, 0, 0);
-		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i) 
+		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i)
 		{
 			pos.Rotate_Z(1.0f * i / TheGlobalData->m_debugVisibilityTileCount * 2 * PI);
 			Coord3D coord = { pos.X + object->getPosition()->x, pos.Y + object->getPosition()->y, pos.Z + object->getPosition()->z };
 
-			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth, 
-											TheGlobalData->m_debugVisibilityTileDuration, 
+			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth,
+											TheGlobalData->m_debugVisibilityTileDuration,
 											theAdjustedVisionColor);
 		}
 	}
@@ -896,15 +902,15 @@ Real AI::getAdjustedVisionRangeForObject(const Object *object, Int factorsToCons
 }
 
 //-------------------------------------------------------------------------------------------------
-TAiData::TAiData() : 
-m_next(NULL), 
-m_sideInfo(NULL), 
+TAiData::TAiData() :
+m_next(NULL),
+m_sideInfo(NULL),
 m_attackIgnoreInsignificantBuildings(false),
 m_skirmishGroupFudgeValue(0.0f),
-m_structureSeconds(0), 
-m_teamSeconds(0), 
-m_resourcesWealthy(0), 
-m_resourcesPoor(0), 
+m_structureSeconds(0),
+m_teamSeconds(0),
+m_resourcesWealthy(0),
+m_resourcesPoor(0),
 m_forceIdleFramesCount(1),
 m_structuresWealthyMod(0),
 m_teamPoorMod(0),
@@ -935,17 +941,14 @@ m_infantryPathfindDiameter(6),
 m_vehiclePathfindDiameter(6),
 m_supplyCenterSafeRadius(250),
 m_rebuildDelaySeconds(10),
-//Added By Sadullah Nader
-//Initialization(s) inserted
 m_distanceRequiresGroup(0.0f),
 m_sideBuildLists(NULL),
 m_structuresPoorMod(0.0f),
 m_teamWealthyMod(0.0f),
 m_aiDozerBoredRadiusModifier(2.0),
-m_aiCrushesInfantry(true), 
-m_maxRetaliateDistance(210.0f), 
+m_aiCrushesInfantry(true),
+m_maxRetaliateDistance(210.0f),
 m_retaliateFriendsRadius(120.0f)
-//
 {
 }
 
@@ -976,9 +979,9 @@ void TAiData::crc( Xfer *xfer )
 	xfer->xferReal( &m_skirmishBaseDefenseExtraDistance );
 	xfer->xferReal( &m_repulsedDistance );
 	xfer->xferBool( &m_enableRepulsors );
-	CRCGEN_LOG(("CRC after AI TAiData for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI TAiData for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 
-}  // end crc
+}
 
 //-----------------------------------------------------------------------------
 void TAiData::xfer( Xfer *xfer )
@@ -989,20 +992,20 @@ void TAiData::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 //-----------------------------------------------------------------------------
 void TAiData::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-----------------------------------------------------------------------------
 void AI::crc( Xfer *xfer )
 {
 
 	xfer->xferSnapshot( m_pathfinder );
-	CRCGEN_LOG(("CRC after AI pathfinder for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI pathfinder for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 
 	AsciiString marker;
 	TAiData *aiData = m_aiData;
@@ -1024,7 +1027,7 @@ void AI::crc( Xfer *xfer )
 		}
 	}
 
-}  // end crc
+}
 
 //-----------------------------------------------------------------------------
 void AI::xfer( Xfer *xfer )
@@ -1035,12 +1038,12 @@ void AI::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 //-----------------------------------------------------------------------------
 void AI::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIDock.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIDock.cpp
index 9806b88eb2d..1ac91b201cf 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIDock.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIDock.cpp
@@ -25,7 +25,7 @@
 // AIDock.cpp
 // Implementation of docking behavior
 // Author: Michael S. Booth, February 2002
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/Module.h"
@@ -38,15 +38,15 @@
 
 //----------------------------------------------------------------------------------------------------------
 /**
- * Create an AI state machine. Define all of the states the machine 
+ * Create an AI state machine. Define all of the states the machine
  * can possibly be in, and set the initial (default) state.
  */
 AIDockMachine::AIDockMachine( Object *obj ) : StateMachine( obj, "AIDockMachine" )
 {
-	static const StateConditionInfo waitForClearanceConditions[] = 
+	static const StateConditionInfo waitForClearanceConditions[] =
 	{
 		StateConditionInfo(ableToAdvance, AI_DOCK_ADVANCE_POSITION, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -67,10 +67,10 @@ AIDockMachine::~AIDockMachine()
 }
 
 //-----------------------------------------------------------------------------
-void AIDockMachine::halt() 
-{ 
+void AIDockMachine::halt()
+{
 	Object *goalObject = getGoalObject();
-		
+
 	// sanity
 	if( goalObject != NULL )
 	{
@@ -92,20 +92,20 @@ void AIDockMachine::halt()
 void AIDockMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void AIDockMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
 	xfer->xferInt(&m_approachPosition);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -113,7 +113,7 @@ void AIDockMachine::xfer( Xfer *xfer )
 void AIDockMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 // State transition conditions ----------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -158,7 +158,7 @@ void AIDockApproachState::xfer( Xfer *xfer )
 		AIInternalMoveToState::xfer(xfer);
 	}
 
-}  // end xfer
+}
 
 //----------------------------------------------------------------------------------------------
 /**
@@ -167,7 +167,7 @@ void AIDockApproachState::xfer( Xfer *xfer )
 StateReturnType AIDockApproachState::onEnter( void )
 {
 	Object *goalObject = getMachineGoalObject();
-		
+
 	// sanity
 	if( goalObject == NULL )
 		return STATE_FAILURE;
@@ -301,10 +301,10 @@ void AIDockWaitForClearanceState::onExit( StateExitType status )
 }
 
 //----------------------------------------------------------------------------------------------
-void AIDockWaitForClearanceState::xfer(Xfer *xfer ) 
+void AIDockWaitForClearanceState::xfer(Xfer *xfer )
 {
-	XferVersion cv = 2;	
-	XferVersion v = cv; 
+	XferVersion cv = 2;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 	if (v >= 2) {
 		xfer->xferUnsignedInt(&m_enterFrame);
@@ -323,7 +323,7 @@ void AIDockWaitForClearanceState::xfer(Xfer *xfer )
 StateReturnType AIDockAdvancePositionState::onEnter( void )
 {
 	Object *goalObject = getMachineGoalObject();
-		
+
 	// sanity
 	if( goalObject == NULL )
 		return STATE_FAILURE;
@@ -422,7 +422,7 @@ StateReturnType AIDockMoveToEntryState::onEnter( void )
 	}
 
 	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface();
-	if( ai  &&  dock->isAllowPassthroughType() ) 
+	if( ai  &&  dock->isAllowPassthroughType() )
 	{
 		ai->ignoreObstacle( getMachineGoalObject() );
 	}
@@ -505,7 +505,7 @@ StateReturnType AIDockMoveToDockState::onEnter( void )
 	dock->getDockPosition( getMachineOwner(), &m_goalPosition );
 
 	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface();
-	if( ai  &&  dock->isAllowPassthroughType() ) 
+	if( ai  &&  dock->isAllowPassthroughType() )
 	{
 		ai->ignoreObstacle( getMachineGoalObject() );
 		setAdjustsDestination(false);
@@ -647,7 +647,7 @@ struct DroneInfo
 void findDrone( Object *obj, void *droneInfo )
 {
 	DroneInfo *dInfo = (DroneInfo*)droneInfo;
-	
+
 	if( !dInfo->found && obj )
 	{
 		if( obj->isKindOf( KINDOF_DRONE ) && obj->getProducerID() == dInfo->owner->getID() )
@@ -721,7 +721,7 @@ StateReturnType AIDockMoveToExitState::onEnter( void )
 	dock->getExitPosition( getMachineOwner(), &m_goalPosition );
 
 	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface();
-	if( ai  &&  dock->isAllowPassthroughType() ) 
+	if( ai  &&  dock->isAllowPassthroughType() )
 	{
 		ai->ignoreObstacle( getMachineGoalObject() );
 		setAdjustsDestination(false);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp
index cf671acced3..e09a4f24a7e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp
@@ -25,7 +25,7 @@
 // AIGroup.cpp
 // Encapsulation of a simple group of AI agents
 // Author: Michael S. Booth, January 2002
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/ActionManager.h"
@@ -56,11 +56,6 @@
 #include "GameLogic/Module/SpecialPowerUpdateModule.h"
 #include "GameLogic/ObjectIter.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 /**
  * NOTE: Only AI objects (ie: having an AIUpdate module) can be in
@@ -75,14 +70,14 @@
  */
 AIGroup::AIGroup( void )
 {
-//	DEBUG_LOG(("***AIGROUP %x is being constructed.\n", this));
+//	DEBUG_LOG(("***AIGROUP %x is being constructed.", this));
 	m_groundPath = NULL;
 	m_speed = 0.0f;
 	m_dirty = false;
 	m_id = TheAI->getNextGroupID();
 	m_memberListSize = 0;
 	m_memberList.clear();
-	//DEBUG_LOG(( "AIGroup #%d created\n", m_id ));
+	//DEBUG_LOG(( "AIGroup #%d created", m_id ));
 }
 
 /**
@@ -90,8 +85,11 @@ AIGroup::AIGroup( void )
  */
 AIGroup::~AIGroup()
 {
-//	DEBUG_LOG(("***AIGROUP %x is being destructed.\n", this));
+//	DEBUG_LOG(("***AIGROUP %x is being destructed.", this));
 	// disassociate each member from the group
+
+#if RETAIL_COMPATIBLE_AIGROUP
+
 	std::list<Object *>::iterator i;
 	for( i = m_memberList.begin(); i != m_memberList.end(); /* empty */ )
 	{
@@ -99,18 +97,24 @@ AIGroup::~AIGroup()
 		if (member)
 		{
 			member->leaveGroup();
-			i = m_memberList.begin();	// jump back to the beginning, cause ai->leaveGroup will remove this element. 
+			i = m_memberList.begin();	// jump back to the beginning, cause ai->leaveGroup will remove this element.
 		}
 		else
 		{
 			i = m_memberList.erase(i);
 		}
 	}
-	if (m_groundPath) {
-		deleteInstance(m_groundPath);
-		m_groundPath = NULL;
-	}
-	//DEBUG_LOG(( "AIGroup #%d destroyed\n", m_id ));
+
+#else
+
+	removeAll();
+
+#endif
+
+	deleteInstance(m_groundPath);
+	m_groundPath = NULL;
+
+	//DEBUG_LOG(( "AIGroup #%d destroyed", m_id ));
 }
 
 /**
@@ -169,14 +173,14 @@ Bool AIGroup::isMember( Object *obj )
  */
 void AIGroup::add( Object *obj )
 {
-//	DEBUG_LOG(("***AIGROUP %x is adding Object %x (%s).\n", this, obj, obj->getTemplate()->getName().str()));
+//	DEBUG_LOG(("***AIGROUP %x is adding Object %x (%s).", this, obj, obj->getTemplate()->getName().str()));
 	DEBUG_ASSERTCRASH(obj != NULL, ("trying to add null obj to AIGroup"));
 	if (obj == NULL)
 		return;
 
 	AIUpdateInterface *ai = obj->getAIUpdateInterface();
 
-	//If this object doesn't have an AIUpdateInterface, then 
+	//If this object doesn't have an AIUpdateInterface, then
 	//don't add it to the group UNLESS it is a structure! Structures
 	//with AIUpdateInterfaces also issue similar commands, but those
 	//commands don't need AI updates... they are instant commands like
@@ -192,7 +196,7 @@ void AIGroup::add( Object *obj )
 	// add to group's list of objects
 	m_memberList.push_back( obj );
 	++m_memberListSize;
-//	DEBUG_LOG(("***AIGROUP %x has size %u now.\n", this, m_memberListSize));
+//	DEBUG_LOG(("***AIGROUP %x has size %u now.", this, m_memberListSize));
 
 	obj->enterGroup( this );
 
@@ -205,7 +209,12 @@ void AIGroup::add( Object *obj )
  */
 Bool AIGroup::remove( Object *obj )
 {
-//	DEBUG_LOG(("***AIGROUP %x is removing Object %x (%s).\n", this, obj, obj->getTemplate()->getName().str()));
+#if !RETAIL_COMPATIBLE_AIGROUP
+	// Defer deletion until the end of this function.
+	AIGroupPtr refThis = AIGroupPtr::Create_AddRef(this);
+#endif
+
+//	DEBUG_LOG(("***AIGROUP %x is removing Object %x (%s).", this, obj, obj->getTemplate()->getName().str()));
 	std::list<Object *>::iterator i = std::find( m_memberList.begin(), m_memberList.end(), obj );
 
 	// make sure object is actually in the group
@@ -215,7 +224,7 @@ Bool AIGroup::remove( Object *obj )
 	// remove it
 	m_memberList.erase( i );
 	--m_memberListSize;
-//	DEBUG_LOG(("***AIGROUP %x has size %u now.\n", this, m_memberListSize));
+//	DEBUG_LOG(("***AIGROUP %x has size %u now.", this, m_memberListSize));
 
 	// tell object to forget about group
 	obj->leaveGroup();
@@ -223,15 +232,42 @@ Bool AIGroup::remove( Object *obj )
 	// list has changed, properties need recomputation
 	m_dirty = true;
 
-	// if the group is empty, no-one is using it any longer, so destroy it
 	if (isEmpty()) {
+#if RETAIL_COMPATIBLE_AIGROUP
+		// if the group is empty, no-one is using it any longer, so destroy it
 		TheAI->destroyGroup( this );
+#endif
 		return TRUE;
 	}
 
 	return FALSE;
 }
 
+/**
+ * Remove all objects from group
+ */
+void AIGroup::removeAll( void )
+{
+#if !RETAIL_COMPATIBLE_AIGROUP
+	// Defer deletion until the end of this function.
+	AIGroupPtr refThis = AIGroupPtr::Create_AddRef(this);
+#endif
+
+	std::list<Object *> memberList;
+	memberList.swap(m_memberList);
+	m_memberListSize = 0;
+
+	std::list<Object *>::iterator i;
+	for ( i = memberList.begin(); i != memberList.end(); ++i )
+	{
+		Object *member = *i;
+		if (member)
+			member->leaveGroup();
+	}
+
+	m_dirty = true;
+}
+
 /**
  * If the group contains any objects not owned by ownerPlayer, return TRUE.
  */
@@ -295,8 +331,8 @@ Bool AIGroup::getCenter( Coord3D *center )
 
 	std::list<Object *>::iterator i;
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
-	{													 
-		if( (*i)->isDisabledByType( DISABLED_HELD) ) 
+	{
+		if( (*i)->isDisabledByType( DISABLED_HELD) )
 		{
 			continue; // don't bother counting riders in the center calculation.
 		}
@@ -316,13 +352,13 @@ Bool AIGroup::getCenter( Coord3D *center )
 		/*
 			if there are no AIs (eg, the team consists of a faction bldg), we can get here.
 
-			This was originally used to offset the centers of objects moving (still used for that) and non-ais can't move.  
+			This was originally used to offset the centers of objects moving (still used for that) and non-ais can't move.
 			So if you have a mix of ai's & not ai's, you want just the ais.
 			But it seems reasonable that if there are no ai's, it returns the center of the other stuff.  Cause they won't be moving anyway.
 		*/
 		for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 		{
-			if( (*i)->isDisabledByType( DISABLED_HELD) ) 
+			if( (*i)->isDisabledByType( DISABLED_HELD) )
 			{
 				continue; // don't bother counting riders in the center calculation.
 			}
@@ -356,7 +392,7 @@ Bool AIGroup::getMinMaxAndCenter( Coord2D *min, Coord2D *max, Coord3D *center )
 	FormationID id= NO_FORMATION_ID;
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
-		if( (*i)->isDisabledByType( DISABLED_HELD) ) 
+		if( (*i)->isDisabledByType( DISABLED_HELD) )
 		{
 			continue; // don't bother counting riders in the center calculation.
 		}
@@ -375,7 +411,7 @@ Bool AIGroup::getMinMaxAndCenter( Coord2D *min, Coord2D *max, Coord3D *center )
 			max->y = max->y < objPos->y ? objPos->y : max->y;
 			FormationID curID = (*i)->getFormationID() ;
 			if (count==0) {
-				id = curID;	
+				id = curID;
 			} else {
 				if (id == NO_FORMATION_ID) {
 					id = NO_FORMATION_ID;
@@ -408,10 +444,8 @@ void AIGroup::recompute( void )
 
 	getCenter( &center );
 
-	if (m_groundPath) {
-		deleteInstance(m_groundPath);
-		m_groundPath = NULL;
-	}
+	deleteInstance(m_groundPath);
+	m_groundPath = NULL;
 
 	m_speed = 9999999999.9f;
 
@@ -422,7 +456,7 @@ void AIGroup::recompute( void )
 		if ((*i)->isKindOf(KINDOF_IMMOBILE))
 			continue;
 
-		if( (*i)->isDisabledByType( DISABLED_HELD) ) 
+		if( (*i)->isDisabledByType( DISABLED_HELD) )
 		{
 			continue; // don't bother counting riders in the max speed calculation.
 		}
@@ -477,7 +511,7 @@ Bool AIGroup::isEmpty( void )
  * Given a destination location, compute the destination position for
  * this object such that it keeps its relative position with the group.
  */
-void AIGroup::computeIndividualDestination( Coord3D *dest, const Coord3D *groupDest, 
+void AIGroup::computeIndividualDestination( Coord3D *dest, const Coord3D *groupDest,
 																					 Object *obj, const Coord3D *center, Bool isFormation )
 {
 	Coord2D v;
@@ -546,23 +580,23 @@ Bool AIGroup::friend_computeGroundPath( const Coord3D *pos, CommandSourceType cm
 	Real distSqr = 4*sqr(TheAI->getAiData()->m_distanceRequiresGroup);
 
 	Int numInfantry = 0;
-	Int numVehicles = 0; 
+	Int numVehicles = 0;
 	Object *centerVehicle = NULL;
 	Real distSqrCenterVeh = distSqr*10;
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
 		Object *obj = (*i);
 		TheAI->pathfinder()->removeGoal(obj);
-		if (obj->isDisabledByType( DISABLED_HELD ) ) 
+		if (obj->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		if( obj->getAI()==NULL )
-		{	
+		{
 			continue;
-		}	 
+		}
 		if( obj->isKindOf( KINDOF_INFANTRY ) )
-		{	
+		{
  			numInfantry++;
 		} else if (obj->isKindOf( KINDOF_VEHICLE)) {
 			if (obj->isKindOf(KINDOF_AIRCRAFT)) {
@@ -613,7 +647,7 @@ Bool AIGroup::friend_computeGroundPath( const Coord3D *pos, CommandSourceType cm
 
 	if (!closeEnough) {
 		Bool isPassable = true;
-		// see if all units have an unobstructed path to the center.  
+		// see if all units have an unobstructed path to the center.
 		// If so, then they are close enough.
 		for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 		{
@@ -624,8 +658,8 @@ Bool AIGroup::friend_computeGroundPath( const Coord3D *pos, CommandSourceType cm
 			AIUpdateInterface *ai = (*i)->getAIUpdateInterface();
 			if (ai)
 			{
-				if (!TheAI->pathfinder()->isLinePassable(obj, 
-								ai->getLocomotorSet().getValidSurfaces(), obj->getLayer(), *obj->getPosition(), 
+				if (!TheAI->pathfinder()->isLinePassable(obj,
+								ai->getLocomotorSet().getValidSurfaces(), obj->getLayer(), *obj->getPosition(),
 								center, false, true)) {
 					isPassable = false;
 				}
@@ -634,14 +668,14 @@ Bool AIGroup::friend_computeGroundPath( const Coord3D *pos, CommandSourceType cm
 		if (isPassable) closeEnough = true;
 	}
 	if (!closeEnough) return false;
-	
+
 	m_groundPath = TheAI->pathfinder()->findGroundPath(&center, pos, PATH_DIAMETER_IN_CELLS, false);
 	return m_groundPath!=NULL;
 
 }
 
 static void clampToMap(Coord3D *dest, PlayerType pt)
-// Clamps to the player's current visible map area. jba. [8/28/2003] 
+// Clamps to the player's current visible map area. jba. [8/28/2003]
 {
 	Region3D extent;
 	if (pt==PLAYER_COMPUTER) {
@@ -657,7 +691,7 @@ static void clampToMap(Coord3D *dest, PlayerType pt)
 	extent.lo.x += PATHFIND_CELL_SIZE_F;
 	extent.lo.y += PATHFIND_CELL_SIZE_F;
 	if (!extent.isInRegionNoZ(dest)) {
-		// clamp to in region. [8/28/2003]	
+		// clamp to in region. [8/28/2003]
 		if (dest->x < extent.lo.x) {
 			dest->x = extent.lo.x;
 		}
@@ -697,7 +731,7 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 	PathNode *startNode = NULL;
 	PathNode *node;
 	for (node = m_groundPath->getFirstNode(); node; node=node->getNextOptimized()) {
-		dx = node->getPosition()->x - startPoint.x;	
+		dx = node->getPosition()->x - startPoint.x;
 		dy = node->getPosition()->y - startPoint.y;
 		if (dx*dx+dy*dy>farEnoughSqr) {
 			startNode = node;
@@ -705,9 +739,9 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 		}
 	}
 	Coord3D endPoint = *m_groundPath->getLastNode()->getPosition();
-	PathNode *endNode = NULL;		
+	PathNode *endNode = NULL;
 	for (node = m_groundPath->getFirstNode(); node; node=node->getNextOptimized()) {
-		Real dx = node->getPosition()->x - endPoint.x;	
+		Real dx = node->getPosition()->x - endPoint.x;
 		Real dy = node->getPosition()->y - endPoint.y;
 		if (dx*dx+dy*dy>farEnoughSqr) {
 			endNode = node;
@@ -718,7 +752,7 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 		m_groundPath = NULL;
 		return false;
 	}
-	
+
 	Coord2D startVector;
 	startVector.x = startNode->getPosition()->x - startPoint.x;
 	startVector.y = startNode->getPosition()->y - startPoint.y;
@@ -750,23 +784,23 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 	iterHolder2.hold(iter2);
 	std::list<Object *>::iterator i;
 	PlayerType controllingPlayerType = PLAYER_COMPUTER;
-	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	
+	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		if( !(*i)->isKindOf( KINDOF_INFANTRY ) )
-		{	
+		{
 			continue;
 		}
 		if( (*i)->getAI()==NULL )
-		{	
+		{
 			continue;
 		}
 		if ( (*i)->isKindOf( KINDOF_MOB_NEXUS ) )
 		{
-			return FALSE;// means I did NOT do a column group pathfind, 
+			return FALSE;// means I did NOT do a column group pathfind,
 			//so the nexus will have a far-away goal position for the mobsters to aim at
 		}
 		if ((*i)->getControllingPlayer()) {
@@ -857,8 +891,8 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 	iter2->sort(ITER_SORTED_FAR_TO_NEAR);
 	// Even out columns by priority.
 	Int group;
-	Int column3[3] = {0,0,0};	
-	Int column5[5] = {0,0,0,0,0};	
+	Int column3[3] = {0,0,0};
+	Int column5[5] = {0,0,0,0,0};
 	for (group = LOCO_MOVES_FRONT; group>=LOCO_MOVES_BACK; group--) {
 		for (theUnit = iter2->first(); theUnit; theUnit = iter2->next())
 		{
@@ -939,7 +973,7 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 			PathNode *tmpNode;
 			PathNode *nextNode=NULL;
 			for (tmpNode = node->getNextOptimized(); tmpNode; tmpNode=tmpNode->getNextOptimized()) {
-				Real dx = tmpNode->getPosition()->x - dest.x;	
+				Real dx = tmpNode->getPosition()->x - dest.x;
 				Real dy = tmpNode->getPosition()->y - dest.y;
 				if (dx*dx+dy*dy>farEnoughSqr) {
 					nextNode = tmpNode;
@@ -980,7 +1014,7 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 			node=node->getNextOptimized();
 
 			for (tmpNode = previousNode->getNextOptimized(); tmpNode && tmpNode!=node; tmpNode=tmpNode->getNextOptimized()) {
-				Real dx = tmpNode->getPosition()->x - node->getPosition()->x;	
+				Real dx = tmpNode->getPosition()->x - node->getPosition()->x;
 				Real dy = tmpNode->getPosition()->y - node->getPosition()->y;
 				if (dx*dx+dy*dy>farEnoughSqr) {
 					previousNode = tmpNode;
@@ -1012,7 +1046,7 @@ Bool AIGroup::friend_moveInfantryToPos( const Coord3D *pos, CommandSourceType cm
 		dest.y -= factor*offset*endVector.y;
 		dest.z = TheTerrainLogic->getLayerHeight( dest.x, dest.y, layer );
 
-		while (path.size()>0) {
+		while (!path.empty()) {
 			Coord2D curVector;
 			prevPos = path[path.size()-1];
 			curVector.x = dest.x-prevPos.x;
@@ -1047,13 +1081,13 @@ void AIGroup::friend_moveFormationToPos( const Coord3D *pos, CommandSourceType c
 	PathNode *startNode = NULL;
 	PathNode *endNode = NULL;
 	Coord3D endPoint = *pos;
-	if (m_groundPath) {	
+	if (m_groundPath) {
 		// Get the start & end vectors for the path.
 		Coord3D startPoint = *m_groundPath->getFirstNode()->getPosition();
 		Real farEnoughSqr = sqr(PATH_DIAMETER_IN_CELLS*PATHFIND_CELL_SIZE_F);
 		PathNode *node;
 		for (node = m_groundPath->getFirstNode(); node; node=node->getNextOptimized()) {
-			dx = node->getPosition()->x - startPoint.x;	
+			dx = node->getPosition()->x - startPoint.x;
 			dy = node->getPosition()->y - startPoint.y;
 			if (dx*dx+dy*dy>farEnoughSqr) {
 				startNode = node;
@@ -1062,7 +1096,7 @@ void AIGroup::friend_moveFormationToPos( const Coord3D *pos, CommandSourceType c
 		}
 		endPoint = *m_groundPath->getLastNode()->getPosition();
 		for (node = m_groundPath->getFirstNode(); node; node=node->getNextOptimized()) {
-			dx = node->getPosition()->x - endPoint.x;	
+			dx = node->getPosition()->x - endPoint.x;
 			dy = node->getPosition()->y - endPoint.y;
 			if (dx*dx+dy*dy>farEnoughSqr) {
 				endNode = node;
@@ -1083,17 +1117,22 @@ void AIGroup::friend_moveFormationToPos( const Coord3D *pos, CommandSourceType c
 		}
 	}
 
-	
+
 	// Move.
 	std::list<Object *>::iterator i;
-	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	
+	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		Object *theUnit = (*i);
 		AIUpdateInterface *ai = theUnit->getAIUpdateInterface();
+		if (ai == NULL)
+		{
+			continue;
+		}
+
 		Bool isDifferentFormation = false;
 		Coord2D offset;
 		if (isDifferentFormation) {
@@ -1163,7 +1202,7 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 	PathNode *startNode = NULL;
 	PathNode *node;
 	for (node = m_groundPath->getFirstNode(); node; node=node->getNextOptimized()) {
-		Real dx = node->getPosition()->x - startPoint.x;	
+		Real dx = node->getPosition()->x - startPoint.x;
 		Real dy = node->getPosition()->y - startPoint.y;
 		if (dx*dx+dy*dy>farEnoughSqr) {
 			startNode = node;
@@ -1171,9 +1210,9 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 		}
 	}
 	Coord3D endPoint = *m_groundPath->getLastNode()->getPosition();
-	PathNode *endNode = NULL;		
+	PathNode *endNode = NULL;
 	for (node = m_groundPath->getFirstNode(); node; node=node->getNextOptimized()) {
-		Real dx = node->getPosition()->x - endPoint.x;	
+		Real dx = node->getPosition()->x - endPoint.x;
 		Real dy = node->getPosition()->y - endPoint.y;
 		if (dx*dx+dy*dy>farEnoughSqr) {
 			endNode = node;
@@ -1187,7 +1226,7 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 		m_groundPath = NULL;
 		return false;
 	}
-	
+
 	Coord2D startVector;
 	startVector.x = startNode->getPosition()->x - startPoint.x;
 	startVector.y = startNode->getPosition()->y - startPoint.y;
@@ -1219,24 +1258,24 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 	iterHolder2.hold(iter2);
 	PlayerType controllingPlayerType = PLAYER_COMPUTER;
 	std::list<Object *>::iterator i;
-	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	
+	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		if( !(*i)->isKindOf( KINDOF_VEHICLE ) )
-		{	
+		{
 			continue;
 		}
 		if( (*i)->getAI()==NULL )
-		{	
+		{
 			continue;
 		}
 		if( !(*i)->getAI()->isDoingGroundMovement() )
-		{	
+		{
 			continue;
-		}	 
+		}
 		if ((*i)->getControllingPlayer()) {
 			controllingPlayerType = (*i)->getControllingPlayer()->getPlayerType();
 		}
@@ -1319,7 +1358,7 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 				adjust = -200*PATHFIND_CELL_SIZE_F;
 			}
 		}
-#endif 
+#endif
 		iter2->insert(theUnit, adjust + dx*startVector.x + dy*startVector.y);
 		curIndex++;
 
@@ -1328,8 +1367,8 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 	iter2->sort(ITER_SORTED_FAR_TO_NEAR);
 	// Even out columns by priority.
 	Int group;
-	Int column2[3] = {0,0,0};	
-	Int column3[3] = {0,0,0};	
+	Int column2[3] = {0,0,0};
+	Int column3[3] = {0,0,0};
 	for (group = LOCO_MOVES_FRONT; group>=LOCO_MOVES_BACK; group--) {
 		for (theUnit = iter2->first(); theUnit; theUnit = iter2->next())
 		{
@@ -1340,8 +1379,8 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 			if (ai->getCurLocomotor()) {
 				movePriority = ai->getCurLocomotor()->getMovePriority();
 			}
-			if (group!=movePriority) continue;	
-#endif 
+			if (group!=movePriority) continue;
+#endif
 			Int threeColumnDelta = tmp>>16;
 			Int columnDelta = (Short)(tmp & 0xFFFF);
 
@@ -1415,7 +1454,7 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 			PathNode *tmpNode;
 			PathNode *nextNode=NULL;
 			for (tmpNode = node->getNextOptimized(); tmpNode; tmpNode=tmpNode->getNextOptimized()) {
-				Real dx = tmpNode->getPosition()->x - dest.x;	
+				Real dx = tmpNode->getPosition()->x - dest.x;
 				Real dy = tmpNode->getPosition()->y - dest.y;
 				if (dx*dx+dy*dy>farEnoughSqr) {
 					nextNode = tmpNode;
@@ -1456,7 +1495,7 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 			node=node->getNextOptimized();
 
 			for (tmpNode = previousNode->getNextOptimized(); tmpNode && tmpNode!=node; tmpNode=tmpNode->getNextOptimized()) {
-				Real dx = tmpNode->getPosition()->x - node->getPosition()->x;	
+				Real dx = tmpNode->getPosition()->x - node->getPosition()->x;
 				Real dy = tmpNode->getPosition()->y - node->getPosition()->y;
 				if (dx*dx+dy*dy>farEnoughSqr) {
 					previousNode = tmpNode;
@@ -1490,7 +1529,7 @@ Bool AIGroup::friend_moveVehicleToPos( const Coord3D *pos, CommandSourceType cmd
 		dest.y -= factor*offset*endVector.y;
 		dest.z = TheTerrainLogic->getLayerHeight( dest.x, dest.y, layer );
 
-		while (path.size()>0) {
+		while (!path.empty()) {
 			Coord2D curVector;
 			prevPos = path[path.size()-1];
 			curVector.x = dest.x-prevPos.x;
@@ -1522,7 +1561,7 @@ void clampWaypointPosition( Coord3D &position, Int margin )
 {
 	Region3D mapExtent;
 	TheTerrainLogic->getExtent(&mapExtent);
-  
+
   // trim some fat off of all sides,
   mapExtent.hi.x -= margin;
   mapExtent.hi.y -= margin;
@@ -1565,7 +1604,7 @@ void AIGroup::groupMoveToPosition( const Coord3D *p_posIn, Bool addWaypoint, Com
 	Bool tightenGroup = FALSE;
 
 	Bool isFormation = getMinMaxAndCenter( &min, &max, &center );
-	if (addWaypoint) 
+	if (addWaypoint)
   {
     isFormation = false;
   }
@@ -1592,7 +1631,7 @@ void AIGroup::groupMoveToPosition( const Coord3D *p_posIn, Bool addWaypoint, Com
 
   Real extraMargin = 0.0f;
 
-	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	
+	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
     const Object *groupMember = (*i);
 
@@ -1611,12 +1650,12 @@ void AIGroup::groupMoveToPosition( const Coord3D *p_posIn, Bool addWaypoint, Com
 
       extraMargin = MAX( extraMargin, STD_AIRCRAFT_EXTRA_MARGIN );
 		}
-	} 
-  
+	}
+
   Int margin = STD_WAYPOINT_CLAMP_MARGIN + extraMargin;
   clampWaypointPosition( position, margin );
 
-  
+
 
 
 	if (tightenGroup)
@@ -1643,35 +1682,35 @@ void AIGroup::groupMoveToPosition( const Coord3D *p_posIn, Bool addWaypoint, Com
 	MemoryPoolObjectHolder iterHolder;
 	SimpleObjectIterator *iter = newInstance(SimpleObjectIterator);
 	iterHolder.hold(iter);
-	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	
+	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
 		Real dx, dy;
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		if( (*i)->isKindOf( KINDOF_IMMOBILE ) )
-		{	
+		{
 			continue;
 		}
 		if( (*i)->getAI()==NULL )
-		{	
+		{
 			continue;
 		}
 		if ((*i)->isKindOf(KINDOF_INFANTRY) && didInfantry) {
 			continue;
 		}
-		if ((*i)->isKindOf(KINDOF_VEHICLE) && didVehicles) 
+		if ((*i)->isKindOf(KINDOF_VEHICLE) && didVehicles)
 		{
 			if( (*i)->getAI()->isDoingGroundMovement() )
-			{	
+			{
 				Object *obj = (*i);
 				if( !obj->isKindOf( KINDOF_CLIFF_JUMPER ) )
 				{
 					//Not a cliff-jumper-offer unit.
 					continue;
 				}
-			}	 
+			}
 		}
 		Coord3D unitPos = *((*i)->getPosition());
 		TheAI->pathfinder()->removeGoal(*i);
@@ -1690,7 +1729,7 @@ void AIGroup::groupMoveToPosition( const Coord3D *p_posIn, Bool addWaypoint, Com
 				adjust = 200*200*PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F;
 			}
 		}
-#endif 
+#endif
 		iter->insert((*i), adjust + dx*dx+dy*dy);
 	}
 
@@ -1711,7 +1750,7 @@ void AIGroup::groupMoveToPosition( const Coord3D *p_posIn, Bool addWaypoint, Com
 				goalPos.x -= v.x;
 				goalPos.y -= v.y;
 			}	else {
-				center = *theUnit->getPosition();	
+				center = *theUnit->getPosition();
 			}
 			firstUnit = false;
 		}
@@ -1777,19 +1816,19 @@ void AIGroup::groupScatter( CommandSourceType cmdSource )
 	MemoryPoolObjectHolder iterHolder;
 	SimpleObjectIterator *iter = newInstance(SimpleObjectIterator);
 	iterHolder.hold(iter);
-	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	
+	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
 		Real dx, dy;
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		if( (*i)->isKindOf( KINDOF_IMMOBILE ) )
-		{	
+		{
 			continue;
 		}
 		if( (*i)->getAI()==NULL )
-		{	
+		{
 			continue;
 		}
 		Coord3D unitPos = *((*i)->getPosition());
@@ -1824,7 +1863,7 @@ void getHelicopterOffset( Coord3D& posOut, Int idx )
 {
   if (idx == 0)
     return;
-  
+
   Real assumedHeliDiameter = 70.0f;
   Real radius = assumedHeliDiameter;
   Real circumference = radius * CIRCLE;
@@ -1854,7 +1893,7 @@ void getHelicopterOffset( Coord3D& posOut, Int idx )
  * Move to given position(s), tightening the formation
  */
 void AIGroup::groupTightenToPosition( const Coord3D *pos, Bool addWaypoint, CommandSourceType cmdSource )
-{		
+{
 	//Kris: Disabled (because its not used to make a logical difference)
 	//Bool outsideOfBounds = true;
 	Coord3D center;
@@ -1878,16 +1917,16 @@ void AIGroup::groupTightenToPosition( const Coord3D *pos, Bool addWaypoint, Comm
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	{
 		Real dx, dy;
 		Coord3D unitPos = *((*i)->getPosition());
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
 		if( (*i)->isKindOf( KINDOF_IMMOBILE ) )
-		{	
+		{
 			continue;
 		}
 		if( (*i)->getAI()==NULL )
-		{	
+		{
 			continue;
 		}
 		dx = unitPos.x - pos->x;
@@ -2057,7 +2096,7 @@ void AIGroup::groupIdle(CommandSourceType cmdSource)
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
 		Object *obj = *i;
-		
+
 		AIUpdateInterface *ai = obj->getAIUpdateInterface();
 		if (ai)
 		{
@@ -2136,7 +2175,7 @@ void AIGroup::groupAttackObjectPrivate( Bool forced, Object *victim, Int maxShot
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )	{
 		Real dx, dy;
 		Coord3D unitPos = *((*i)->getPosition());
-		if ((*i)->isDisabledByType( DISABLED_HELD ) ) 
+		if ((*i)->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue; // don't bother telling the occupants to move.
 		}
@@ -2150,7 +2189,7 @@ void AIGroup::groupAttackObjectPrivate( Bool forced, Object *victim, Int maxShot
 	Object *theUnit;
 	for (theUnit = iter->first(); theUnit; theUnit = iter->next())
 	{
-		//Determine if this object is a garrisoned container capable of firing! 
+		//Determine if this object is a garrisoned container capable of firing!
 		//If so, order everyone inside to attack as well!
 		ContainModuleInterface *contain = theUnit->getContain();
 		if( contain && contain->isPassengerAllowedToFire() )
@@ -2177,7 +2216,7 @@ void AIGroup::groupAttackObjectPrivate( Bool forced, Object *victim, Int maxShot
 				}
 			}
 		}
-		
+
 		//Do a check to see if we have a hive object that has slaved objects.
 		SpawnBehaviorInterface *spawnInterface = theUnit->getSpawnBehaviorInterface();
 		if( spawnInterface && !spawnInterface->doSlavesHaveFreedom() )
@@ -2238,7 +2277,7 @@ void AIGroup::groupAttackPosition( const Coord3D *pos, Int maxShotsToFire, Comma
 
 		//This code allows garrisoned buildings to force attack a ground position
 		//-----------------------------------------------------------------------
-		//Determine if this object is a garrisoned container capable of firing! 
+		//Determine if this object is a garrisoned container capable of firing!
 		//If so, order everyone inside to attack as well!
 		ContainModuleInterface *contain = (*i)->getContain();
 		if( contain && contain->isPassengerAllowedToFire() )
@@ -2478,9 +2517,9 @@ void AIGroup::groupExecuteRailedTransport( CommandSourceType cmdSource )
 		if( ai )
 			ai->aiExecuteRailedTransport( cmdSource );
 
-	}  // end for i
+	}
 
-}  // end groupExecuteRailedTransport
+}
 
 ///< life altering state change, if this AI can do it
 void AIGroup::groupGoProne( const DamageInfo *damageInfo, CommandSourceType cmdSource )
@@ -2564,7 +2603,7 @@ void AIGroup::groupAttackArea( const PolygonTrigger *areaToGuard, CommandSourceT
 	if (!areaToGuard) {
 		return;
 	}
-	
+
 	std::list<Object *>::iterator i;
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
@@ -2675,7 +2714,7 @@ void AIGroup::groupDoSpecialPower( UnsignedInt specialPowerID, UnsignedInt comma
  */
 void AIGroup::groupDoSpecialPowerAtLocation( UnsignedInt specialPowerID, const Coord3D *location, Real angle, const Object *objectInWay, UnsignedInt commandOptions )
 {
-  
+
 
 	//This one requires a position
 	std::list<Object *>::iterator i;
@@ -2691,7 +2730,7 @@ void AIGroup::groupDoSpecialPowerAtLocation( UnsignedInt specialPowerID, const C
          // and, of course, their slowdeath behavior calls deselect(), which naturally
          // destroys the AIGroup list, in order to keep the selection sync'ed with the group.
          // M Lorenzen... 8/23/03
-    
+
     const SpecialPowerTemplate *spTemplate = TheSpecialPowerStore->findSpecialPowerTemplateByID( specialPowerID );
 		if( spTemplate )
 		{
@@ -2786,32 +2825,35 @@ void AIGroup::groupCheer( CommandSourceType cmdSource )
 }
 
 /**
-	* Sell all things in the group ... if possible 
+	* Sell all things in the group ... if possible
 	*/
 void AIGroup::groupSell( CommandSourceType cmdSource )
 {
-	std::list<Object *>::iterator i, thisIterator;
-	Object *obj;
+#if !RETAIL_COMPATIBLE_AIGROUP
+	// Defer deletion until the end of this function.
+	AIGroupPtr refThis = AIGroupPtr::Create_AddRef(this);
+#endif
 
+	std::list<Object *>::iterator i;
+	std::vector<Object *> groupObjectsCopy;
+	groupObjectsCopy.reserve(m_memberListSize);
+
+	// TheSuperHackers @bugfix Mauller 26/06/2025 when sellObject is called, the member list objects in this AIGroup get removed from it. This happens within the Object::deselectObject() function.
+	// This deletes the local AIGroup object from under the call to groupSell, therefore we need to make a local copy of the objects that need selling.
 	for( i = m_memberList.begin(); i != m_memberList.end(); /*empty*/ )
 	{
+		groupObjectsCopy.push_back( *i++ );
+	}
 
-		// work off of 'thisIterator' as we may change the contents of this list
-		thisIterator = i;
-		++i;
-
-		// get object
-		obj = *thisIterator;
-
-		// try to sell object
-		TheBuildAssistant->sellObject( obj );
-
-	}  // end for, i
+	for( size_t j = 0; j < groupObjectsCopy.size(); ++j )
+	{
+		TheBuildAssistant->sellObject( groupObjectsCopy[j] );
+	}
 
 }
 
 /**
-	* Tell all things in the group to toggle overcharge ... if possible 
+	* Tell all things in the group to toggle overcharge ... if possible
 	*/
 void AIGroup::groupToggleOvercharge( CommandSourceType cmdSource )
 {
@@ -2832,9 +2874,9 @@ void AIGroup::groupToggleOvercharge( CommandSourceType cmdSource )
 			if( obi )
 				obi->toggle();
 
-		}  // end for
+		}
 
-	}  // end for, i
+	}
 
 }
 
@@ -2852,12 +2894,12 @@ void AIGroup::groupPickUpPrisoner( Object *prisoner, enum CommandSourceType cmdS
 
 		// get object
 		obj = *i;
-		
+
 		AIUpdateInterface *ai = obj->getAIUpdateInterface();
 		if( ai )
 			ai->aiPickUpPrisoner( prisoner, cmdSource );
 
-	}  // end for, i
+	}
 
 }
 #endif
@@ -2876,12 +2918,12 @@ void AIGroup::groupReturnToPrison( Object *prison, enum CommandSourceType cmdSou
 
 		// get object
 		obj = *i;
-		
+
 		AIUpdateInterface *ai = obj->getAIUpdateInterface();
 		if( ai )
 			ai->aiReturnPrisoners( prison, cmdSource );
 
-	}  // end for, i
+	}
 }
 #endif
 
@@ -2904,12 +2946,12 @@ void AIGroup::groupCombatDrop( Object *target, const Coord3D &pos, CommandSource
 		if( ai )
 			ai->aiCombatDrop( target, pos, cmdSource );
 
-	}  // end for, i
+	}
 
 }
 
 //-------------------------------------------------------------------------------------
-// Used by scripts to issue a command button order - Note that it's possible that some 
+// Used by scripts to issue a command button order - Note that it's possible that some
 // commands are not AI commands!
 //-------------------------------------------------------------------------------------
 void AIGroup::groupDoCommandButton( const CommandButton *commandButton, CommandSourceType cmdSource )
@@ -2922,14 +2964,14 @@ void AIGroup::groupDoCommandButton( const CommandButton *commandButton, CommandS
 
 		// get object
 		source = *i;
-		
+
 		source->doCommandButton( commandButton, cmdSource );
-	}  // end for, i
+	}
 }
 
 
 //-------------------------------------------------------------------------------------
-// Used by scripts to issue a command button order - Note that it's possible that some 
+// Used by scripts to issue a command button order - Note that it's possible that some
 // commands are not AI commands!
 //-------------------------------------------------------------------------------------
 void AIGroup::groupDoCommandButtonAtPosition( const CommandButton *commandButton, const Coord3D *pos, CommandSourceType cmdSource )
@@ -2942,13 +2984,13 @@ void AIGroup::groupDoCommandButtonAtPosition( const CommandButton *commandButton
 
 		// get object
 		source = *i;
-		
+
 		source->doCommandButtonAtPosition( commandButton, pos, cmdSource );
-	}  // end for, i
+	}
 }
 
 //-------------------------------------------------------------------------------------
-// Used by scripts to issue a command button order - Note that it's possible that some 
+// Used by scripts to issue a command button order - Note that it's possible that some
 // commands are not AI commands!
 //-------------------------------------------------------------------------------------
 void AIGroup::groupDoCommandButtonUsingWaypoints( const CommandButton *commandButton, const Waypoint *way, CommandSourceType cmdSource )
@@ -2961,13 +3003,13 @@ void AIGroup::groupDoCommandButtonUsingWaypoints( const CommandButton *commandBu
 
 		// get object
 		source = *i;
-		
+
 		source->doCommandButtonUsingWaypoints( commandButton, way, cmdSource );
-	}  // end for, i
+	}
 }
 
 //-------------------------------------------------------------------------------------
-// Used by scripts to issue a command button order - Note that it's possible that some 
+// Used by scripts to issue a command button order - Note that it's possible that some
 // commands are not AI commands!
 //-------------------------------------------------------------------------------------
 void AIGroup::groupDoCommandButtonAtObject( const CommandButton *commandButton, Object *obj, CommandSourceType cmdSource )
@@ -2980,9 +3022,9 @@ void AIGroup::groupDoCommandButtonAtObject( const CommandButton *commandButton,
 
 		// get object
 		source = *i;
-		
+
 		source->doCommandButtonAtObject( commandButton, obj, cmdSource );
-	}  // end for, i
+	}
 }
 
 
@@ -3087,7 +3129,7 @@ void AIGroup::queueUpgrade( const UpgradeTemplate *upgrade )
 			if( thisMember->hasUpgrade( upgrade )  || !thisMember->affectedByUpgrade( upgrade ) )
 				continue;
 		}
-		
+
 		// Ever think to check if this thing can actually build the upgrade to "stop cheaters"?
 		if( !thisMember->canProduceUpgrade(upgrade) )
 			continue;// They have faked their button; go out of sync. (Cheater will execute it, non cheater will not execute it.)
@@ -3100,7 +3142,7 @@ void AIGroup::queueUpgrade( const UpgradeTemplate *upgrade )
 		if ( pu->canQueueUpgrade( upgrade ) == CANMAKE_QUEUE_FULL )
 			continue;//So we don't charge them for something that we can't build... happy happy
 
-		
+
 		// queue the upgrade "research"
 		pu->queueUpgrade( upgrade );
 	}
@@ -3145,13 +3187,13 @@ Bool AIGroup::isBusy( void ) const
 	for( i = m_memberList.begin(); i != m_memberList.end(); ++i )
 	{
 		Object *obj = *i;
-		if( !obj ) 
+		if( !obj )
 		{
 			continue;
 		}
 
 		const AIUpdateInterface *ai = obj->getAIUpdateInterface();
-		if( !ai ) 
+		if( !ai )
 		{
 			continue;
 		}
@@ -3213,7 +3255,7 @@ Object *AIGroup::getSpecialPowerSourceObject( UnsignedInt specialPowerID )
 Object *AIGroup::getCommandButtonSourceObject( GUICommandType type )
 {
 	std::list<Object *>::iterator it;
-	
+
 	for( it = m_memberList.begin(); it != m_memberList.end(); ++it )
 	{
 		Object *object = (*it);
@@ -3281,24 +3323,24 @@ void AIGroup::crc( Xfer *xfer )
 		if (*it)
 			id = (*it)->getID();
 		xfer->xferUser(&id, sizeof(ObjectID));
-		CRCGEN_LOG(("CRC after AI AIGroup m_memberList for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+		CRCGEN_LOG(("CRC after AI AIGroup m_memberList for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 	}
 
 	xfer->xferUnsignedInt( &m_memberListSize );
-	CRCGEN_LOG(("CRC after AI AIGroup m_memberListSize for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI AIGroup m_memberListSize for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 
 	id = INVALID_ID;	// Used to be leader id, unused now. jba.
 	xfer->xferObjectID( &id );
-	CRCGEN_LOG(("CRC after AI AIGroup m_leader for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI AIGroup m_leader for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 	xfer->xferReal( &m_speed );
-	CRCGEN_LOG(("CRC after AI AIGroup m_speed for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI AIGroup m_speed for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 	xfer->xferBool( &m_dirty );
-	CRCGEN_LOG(("CRC after AI AIGroup m_dirty for frame %d is 0x%8.8X\n", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI AIGroup m_dirty for frame %d is 0x%8.8X", TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 
 	xfer->xferUnsignedInt( &m_id );
-	CRCGEN_LOG(("CRC after AI AIGroup m_id (%d) for frame %d is 0x%8.8X\n", m_id, TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
+	CRCGEN_LOG(("CRC after AI AIGroup m_id (%d) for frame %d is 0x%8.8X", m_id, TheGameLogic->getFrame(), ((XferCRC *)xfer)->getCRC()));
 
-}  // end crc
+}
 
 //-----------------------------------------------------------------------------
 void AIGroup::xfer( Xfer *xfer )
@@ -3309,10 +3351,10 @@ void AIGroup::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 //-----------------------------------------------------------------------------
 void AIGroup::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp
index e78c0716f48..bf9f8b5934d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGuard.cpp
@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// FILE: AIGuard.cpp 
+// FILE: AIGuard.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -37,7 +37,7 @@
 /* Revision History:                                                         */
 /*		3/29/2002 : Initial creation                                           */
 /*---------------------------------------------------------------------------*/
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 #include "Common/Team.h"
@@ -55,11 +55,6 @@
 
 const Real CLOSE_ENOUGH = (25.0f);
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/ )
 {
@@ -78,10 +73,10 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
 	Object *target = TheGameLogic->findObjectByID(bmi->getClearableLastAttacker());
 	bmi->clearLastAttacker();
 
-	// We use the clearable last attacker because we should continue attacking the guy. But if he 
-	// stops attacking us, then we want our timer to kick us off of him and make us go attack 
+	// We use the clearable last attacker because we should continue attacking the guy. But if he
+	// stops attacking us, then we want our timer to kick us off of him and make us go attack
 	// other units instead.
-	
+
 
 	if (!target) {
 		return FALSE;
@@ -91,7 +86,7 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
 		return FALSE;
 	}
 
-	// This is a quick test on the target. It will be duplicated in getAbleToAttackSpecificObject, 
+	// This is a quick test on the target. It will be duplicated in getAbleToAttackSpecificObject,
 	// but the payoff is worth the duplication.
 	if (target->isEffectivelyDead()) {
 		return FALSE;
@@ -118,9 +113,9 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
  */
 Bool ExitConditions::shouldExit(const StateMachine* machine) const
 {
-	if (!machine->getGoalObject()) 
+	if (!machine->getGoalObject())
 	{
-		if (m_conditionsToConsider & ATTACK_ExitIfNoUnitFound) 
+		if (m_conditionsToConsider & ATTACK_ExitIfNoUnitFound)
 		{
 			return true;
 		}
@@ -130,15 +125,15 @@ Bool ExitConditions::shouldExit(const StateMachine* machine) const
 		}
 	}
 
-	if (m_conditionsToConsider & ATTACK_ExitIfExpiredDuration) 
+	if (m_conditionsToConsider & ATTACK_ExitIfExpiredDuration)
 	{
 		if (TheGameLogic->getFrame() >= m_attackGiveUpFrame)
 		{
 			return true;
-		} 
+		}
 	}
-	
-	if (m_conditionsToConsider & ATTACK_ExitIfOutsideRadius) 
+
+	if (m_conditionsToConsider & ATTACK_ExitIfOutsideRadius)
 	{
 		Coord3D deltaAggressor;
 		Coord3D objPos = *machine->getGoalObject()->getPosition();
@@ -151,10 +146,10 @@ Bool ExitConditions::shouldExit(const StateMachine* machine) const
 													// then it would look for a new target, get the same one, and proceed in an infinite recursive
 													// loop that eventually blew the stack.
 
-		if (deltaAggressor.lengthSqr() > m_radiusSqr) 
+		if (deltaAggressor.lengthSqr() > m_radiusSqr)
 		{
 			return true;
-		} 
+		}
 	}
 
 	return false;
@@ -163,7 +158,7 @@ Bool ExitConditions::shouldExit(const StateMachine* machine) const
 
 //-- AIGuardMachine -------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------
-AIGuardMachine::AIGuardMachine( Object *owner ) : 
+AIGuardMachine::AIGuardMachine( Object *owner ) :
 	StateMachine(owner, "AIGuardMachine"),
 	m_targetToGuard(INVALID_ID),
 	m_areaToGuard(NULL),
@@ -171,11 +166,11 @@ AIGuardMachine::AIGuardMachine( Object *owner ) :
 	m_guardMode(GUARDMODE_NORMAL)
 {
 	m_positionToGuard.zero();
-	
+
 	static const StateConditionInfo attackAggressors[] =
 	{
 		StateConditionInfo(hasAttackedMeAndICanReturnFire, AI_GUARD_ATTACK_AGGRESSOR, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -200,7 +195,7 @@ AIGuardMachine::~AIGuardMachine()
 //--------------------------------------------------------------------------------------
 /*static*/ Real AIGuardMachine::getStdGuardRange(const Object* obj)
 {
-	Real visionRange = TheAI->getAdjustedVisionRangeForObject(obj, 
+	Real visionRange = TheAI->getAdjustedVisionRangeForObject(obj,
 		AI_VISIONFACTOR_OWNERTYPE | AI_VISIONFACTOR_MOOD | AI_VISIONFACTOR_GUARDINNER);
 
 	return visionRange;
@@ -217,10 +212,10 @@ Bool AIGuardMachine::lookForInnerTarget(void)
 
 	// Check if team auto targets same victim.
 	Object *teamVictim = NULL;
-	if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+	if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 	{
 		teamVictim = owner->getTeam()->getTeamTargetObject();
-		if (teamVictim) 
+		if (teamVictim)
 		{
 			setNemesisID(teamVictim->getID());
 			return true;	// Transitions to AIGuardInnerState.
@@ -270,18 +265,18 @@ Bool AIGuardMachine::lookForInnerTarget(void)
 
 	Real visionRange = AIGuardMachine::getStdGuardRange(owner);
 
-	if (area) 
+	if (area)
 	{
 		UnsignedInt checkFrame = TheGameLogic->getFrameObjectsChangedTriggerAreas()+TheAI->getAiData()->m_guardEnemyScanRate;
 		if (TheGameLogic->getFrame()>checkFrame) {
-			return false; 
+			return false;
 		}
 		filters[count++] = &f3;
 		visionRange = area->getRadius();
 		area->getCenterPoint(&pos);
 	}
 
-	if (getGuardMode() == GUARDMODE_GUARD_FLYING_UNITS_ONLY) 
+	if (getGuardMode() == GUARDMODE_GUARD_FLYING_UNITS_ONLY)
 	{
 		// only consider flying targets
 		filters[count++] = &f4;
@@ -295,13 +290,13 @@ Bool AIGuardMachine::lookForInnerTarget(void)
 //	Object* target = iter->first();
 //
 // srj sez: the above code is stupid and slow. since we only want the closest object,
-// just ask for that; the above has to find ALL objects in range, but we ignore all 
+// just ask for that; the above has to find ALL objects in range, but we ignore all
 // but the first (closest).
 //
 	Object* target = ThePartitionManager->getClosestObject(&pos, visionRange, FROM_CENTER_2D, filters);
-	if (target) 
+	if (target)
 	{
-		setNemesisID(target->getID());	
+		setNemesisID(target->getID());
 		return true;	// Transitions to AIGuardInnerState.
 	}
 	else
@@ -315,7 +310,7 @@ Bool AIGuardMachine::lookForInnerTarget(void)
 // ------------------------------------------------------------------------------------------------
 void AIGuardMachine::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -343,16 +338,16 @@ void AIGuardMachine::xfer( Xfer *xfer )
 		if (triggerName.isNotEmpty()) {
 			m_areaToGuard = TheTerrainLogic->getTriggerAreaByName(triggerName);
 		}
-	} 
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIGuardMachine::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-- AIGuardInnerState ----------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -360,7 +355,7 @@ void AIGuardMachine::loadPostProcess( void )
 // ------------------------------------------------------------------------------------------------
 void AIGuardInnerState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -372,7 +367,7 @@ void AIGuardInnerState::xfer( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -380,7 +375,14 @@ void AIGuardInnerState::xfer( Xfer *xfer )
 void AIGuardInnerState::loadPostProcess( void )
 {
 	onEnter();
-}  // end loadPostProcess
+}
+
+// ------------------------------------------------------------------------------------------------
+AIGuardInnerState::~AIGuardInnerState(void)
+{
+	deleteInstance(m_attackState);
+	deleteInstance(m_enterState);
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardInnerState::onEnter( void )
@@ -389,9 +391,9 @@ StateReturnType AIGuardInnerState::onEnter( void )
 	if (getMachineOwner()->getTemplate()->isEnterGuard())
 	{
 		Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
-		if (nemesis == NULL) 
+		if (nemesis == NULL)
 		{
-			DEBUG_LOG(("Unexpected NULL nemesis in AIGuardInnerState.\n"));
+			DEBUG_LOG(("Unexpected NULL nemesis in AIGuardInnerState."));
 			return STATE_SUCCESS;
 		}
 		m_enterState = newInstance(AIEnterState)(getMachine());
@@ -409,14 +411,14 @@ StateReturnType AIGuardInnerState::onEnter( void )
 		Object* targetToGuard = getGuardMachine()->findTargetToGuardByID();
 		Coord3D pos = targetToGuard ? *targetToGuard->getPosition() : *getGuardMachine()->getPositionToGuard();
 		Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
-		if (nemesis == NULL) 
+		if (nemesis == NULL)
 		{
-			DEBUG_LOG(("Unexpected NULL nemesis in AIGuardInnerState.\n"));
+			DEBUG_LOG(("Unexpected NULL nemesis in AIGuardInnerState."));
 			return STATE_SUCCESS;
 		}
 		m_exitConditions.m_center = pos;
 		m_exitConditions.m_radiusSqr = sqr(AIGuardMachine::getStdGuardRange(getMachineOwner()));
-		m_exitConditions.m_conditionsToConsider = (ExitConditions::ATTACK_ExitIfOutsideRadius | 
+		m_exitConditions.m_conditionsToConsider = (ExitConditions::ATTACK_ExitIfOutsideRadius |
 																								ExitConditions::ATTACK_ExitIfNoUnitFound);
 
 		m_attackState = newInstance(AIAttackState)(getMachine(), false, true, false, &m_exitConditions);
@@ -440,11 +442,11 @@ StateReturnType AIGuardInnerState::update( void )
 	{
 		// if the position has moved (IE we're guarding an object), move with it.
 		Object* targetToGuard = getGuardMachine()->findTargetToGuardByID();
-		if (targetToGuard) 
+		if (targetToGuard)
 		{
 			m_exitConditions.m_center = *targetToGuard->getPosition();
 		}
-		
+
 		return m_attackState->update();
 	}
 	else if (m_enterState)
@@ -459,7 +461,7 @@ StateReturnType AIGuardInnerState::update( void )
 void AIGuardInnerState::onExit( StateExitType status )
 {
 	Object *obj = getMachineOwner();
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
@@ -471,8 +473,8 @@ void AIGuardInnerState::onExit( StateExitType status )
 		deleteInstance(m_enterState);
 		m_enterState = NULL;
 	}
-	
-	if (obj->getTeam()) 
+
+	if (obj->getTeam())
 	{
 		obj->getTeam()->setTeamTargetObject(NULL); // clear the target.
 	}
@@ -484,7 +486,7 @@ void AIGuardInnerState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIGuardOuterState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -496,7 +498,7 @@ void AIGuardOuterState::xfer( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -504,7 +506,13 @@ void AIGuardOuterState::xfer( Xfer *xfer )
 void AIGuardOuterState::loadPostProcess( void )
 {						 AIGuardOuterState
 	onEnter();
-}  // end loadPostProcess
+}
+
+// ------------------------------------------------------------------------------------------------
+AIGuardOuterState::~AIGuardOuterState(void)
+{
+	deleteInstance(m_attackState);
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardOuterState::onEnter( void )
@@ -519,9 +527,9 @@ StateReturnType AIGuardOuterState::onEnter( void )
 	Coord3D pos = targetToGuard ? *targetToGuard->getPosition() : *getGuardMachine()->getPositionToGuard();
 
 	Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardInnerState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardInnerState."));
 		return STATE_SUCCESS;
 	}
 	Object *obj = getMachineOwner();
@@ -529,17 +537,17 @@ StateReturnType AIGuardOuterState::onEnter( void )
 	Real range = TheAI->getAdjustedVisionRangeForObject(obj, AI_VISIONFACTOR_OWNERTYPE | AI_VISIONFACTOR_MOOD);
 
 	const PolygonTrigger *area = getGuardMachine()->getAreaToGuard();
-	if (area) 
+	if (area)
 	{
-		if (range < area->getRadius()) 
+		if (range < area->getRadius())
 			range = area->getRadius();
 		area->getCenterPoint(&pos);
 	}
 	m_exitConditions.m_center = pos;
 	m_exitConditions.m_radiusSqr = sqr(range);
 	m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
-	m_exitConditions.m_conditionsToConsider = (ExitConditions::ATTACK_ExitIfExpiredDuration | 
-																								ExitConditions::ATTACK_ExitIfOutsideRadius | 
+	m_exitConditions.m_conditionsToConsider = (ExitConditions::ATTACK_ExitIfExpiredDuration |
+																								ExitConditions::ATTACK_ExitIfOutsideRadius |
 																								ExitConditions::ATTACK_ExitIfNoUnitFound);
 
 	m_attackState = newInstance(AIAttackState)(getMachine(), false, true, false, &m_exitConditions);
@@ -561,33 +569,33 @@ StateReturnType AIGuardOuterState::update( void )
 
 	// if the position has moved (IE we're guarding an object), move with it.
 	Object* targetToGuard = getGuardMachine()->findTargetToGuardByID();
-	if (targetToGuard) 
+	if (targetToGuard)
 	{
 		m_exitConditions.m_center = *targetToGuard->getPosition();
 	}
 
 	Object* goalObj = m_attackState->getMachineGoalObject();
-	if (goalObj) 
+	if (goalObj)
 	{
 		Coord3D deltaAggr;
 		deltaAggr.x = m_exitConditions.m_center.x - goalObj->getPosition()->x;
 		deltaAggr.y = m_exitConditions.m_center.y - goalObj->getPosition()->y;
 		deltaAggr.z = m_exitConditions.m_center.z - goalObj->getPosition()->z;
 		Real visionSqr = sqr(AIGuardMachine::getStdGuardRange(getMachineOwner()));
-		if (deltaAggr.lengthSqr() <= visionSqr) 
+		if (deltaAggr.lengthSqr() <= visionSqr)
 		{
 			// reset the counter
 			m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
 		}
 	}
-	
+
 	return m_attackState->update();
 }
 
 //--------------------------------------------------------------------------------------
 void AIGuardOuterState::onExit( StateExitType status )
 {
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
@@ -601,7 +609,7 @@ void AIGuardOuterState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIGuardReturnState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -612,16 +620,16 @@ void AIGuardReturnState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
-	
+
 	xfer->xferUnsignedInt(&m_nextReturnScanTime);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIGuardReturnState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardReturnState::onEnter( void )
@@ -630,19 +638,19 @@ StateReturnType AIGuardReturnState::onEnter( void )
 	m_nextReturnScanTime = now + GameLogicRandomValue(0, TheAI->getAiData()->m_guardEnemyReturnScanRate);
 
 // no, no, no, don't do this in onEnter, unless you like really slow maps. (srj)
-//	if (getGuardMachine()->lookForInnerTarget()) 
+//	if (getGuardMachine()->lookForInnerTarget())
 //		return STATE_FAILURE; // early termination because we found a target.
 
 	Object* targetToGuard = getGuardMachine()->findTargetToGuardByID();
 	m_goalPosition = targetToGuard ? *targetToGuard->getPosition() : *getGuardMachine()->getPositionToGuard();
 
 	const PolygonTrigger *area = getGuardMachine()->getAreaToGuard();
-	if (area) 
+	if (area)
 	{
 		area->getCenterPoint(&m_goalPosition);
 	}
-	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface(); 
-	if (ai && ai->isDoingGroundMovement()) 
+	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface();
+	if (ai && ai->isDoingGroundMovement())
 	{
 		TheAI->pathfinder()->adjustDestination(getMachineOwner(), ai->getLocomotorSet(), &m_goalPosition);
 	}
@@ -657,7 +665,7 @@ StateReturnType AIGuardReturnState::update( void )
 	if (now >= m_nextReturnScanTime)
 	{
 		m_nextReturnScanTime = now + TheAI->getAiData()->m_guardEnemyReturnScanRate;
-		if (getGuardMachine()->lookForInnerTarget()) 
+		if (getGuardMachine()->lookForInnerTarget())
 			return STATE_FAILURE; // early termination because we found a target.
 	}
 
@@ -677,7 +685,7 @@ void AIGuardReturnState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIGuardIdleState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -688,22 +696,22 @@ void AIGuardIdleState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
-	
+
 	xfer->xferUnsignedInt(&m_nextEnemyScanTime);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIGuardIdleState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardIdleState::onEnter( void )
 {
 	// first time thru, use a random amount so that everyone doesn't scan on the same frame,
-	// to avoid "spikes". 
+	// to avoid "spikes".
 	UnsignedInt now = TheGameLogic->getFrame();
 	m_nextEnemyScanTime = now + GameLogicRandomValue(0, TheAI->getAiData()->m_guardEnemyScanRate);
 
@@ -713,7 +721,7 @@ StateReturnType AIGuardIdleState::onEnter( void )
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardIdleState::update( void )
 {
-	//DEBUG_LOG(("AIGuardIdleState frame %d: %08lx\n",TheGameLogic->getFrame(),getMachineOwner()));
+	//DEBUG_LOG(("AIGuardIdleState frame %d: %08lx",TheGameLogic->getFrame(),getMachineOwner()));
 
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (now < m_nextEnemyScanTime)
@@ -727,21 +735,21 @@ StateReturnType AIGuardIdleState::update( void )
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAIUpdateInterface();
 	// Check to see if we have created a crate we need to pick up.
-	if (ai->getCrateID() != INVALID_ID) 
+	if (ai->getCrateID() != INVALID_ID)
 	{
 		getMachine()->setState(AI_GUARD_GET_CRATE);
 		return STATE_SLEEP(m_nextEnemyScanTime - now);
 	}
 
 	// if anyone is in the inner area, return success.
-	if (getGuardMachine()->lookForInnerTarget()) 
+	if (getGuardMachine()->lookForInnerTarget())
 	{
 		return STATE_SUCCESS;	// Transitions to AIGuardInnerState.
 	}
 
 	// See if the object we are guarding moved.
 	Object* targetToGuard = getGuardMachine()->findTargetToGuardByID();
-	if (targetToGuard) 
+	if (targetToGuard)
 	{
 		Coord3D pos = *targetToGuard->getPosition();
 		Real delta = m_guardeePos.x-pos.x;
@@ -754,14 +762,14 @@ StateReturnType AIGuardIdleState::update( void )
 			m_guardeePos = pos;
 			return STATE_FAILURE; // goes to AIGuardReturnState.
 		}
-	} 
+	}
 	return STATE_SLEEP(m_nextEnemyScanTime - now);
 }
 
 //--------------------------------------------------------------------------------------
 void AIGuardIdleState::onExit( StateExitType status )
 {
-	
+
 }
 
 //-- AIGuardPickUpCrateState ----------------------------------------------------------------------
@@ -770,14 +778,14 @@ AIGuardPickUpCrateState::AIGuardPickUpCrateState( StateMachine *machine )	: AIPi
 {
 #ifdef STATE_MACHINE_DEBUG
 		setName("AIGuardPickUpCrateState");
-#endif	
+#endif
 }
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardPickUpCrateState::onEnter( void )
 {
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAIUpdateInterface();
-	
+
 	// Check to see if we have created a crate we need to pick up.
 	Object* crate = ai->checkForCrateToPickup();
 	if (crate)
@@ -798,17 +806,23 @@ StateReturnType AIGuardPickUpCrateState::update( void )
 //--------------------------------------------------------------------------------------
 void AIGuardPickUpCrateState::onExit( StateExitType status )
 {
-	
+
 }
 
 //-- AIGuardAttackAggressorState ------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-AIGuardAttackAggressorState::AIGuardAttackAggressorState( StateMachine *machine ) : 
+AIGuardAttackAggressorState::AIGuardAttackAggressorState( StateMachine *machine ) :
 	State( machine, "AIGuardAttackAggressorState" )
 {
 	m_attackState = NULL;
 }
 
+// ------------------------------------------------------------------------------------------------
+AIGuardAttackAggressorState::~AIGuardAttackAggressorState(void)
+{
+	deleteInstance(m_attackState);
+}
+
 //-------------------------------------------------------------------------------------------------
 StateReturnType AIGuardAttackAggressorState::onEnter( void )
 {
@@ -821,9 +835,9 @@ StateReturnType AIGuardAttackAggressorState::onEnter( void )
 	}
 
 	Object *nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID());
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardAttackAggressorState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardAttackAggressorState."));
 		return STATE_SUCCESS;
 	}
 
@@ -833,7 +847,7 @@ StateReturnType AIGuardAttackAggressorState::onEnter( void )
 	m_exitConditions.m_center = pos;
 	m_exitConditions.m_radiusSqr = sqr(AIGuardMachine::getStdGuardRange(getMachineOwner()));
 	m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
-	m_exitConditions.m_conditionsToConsider = (ExitConditions::ATTACK_ExitIfExpiredDuration | 
+	m_exitConditions.m_conditionsToConsider = (ExitConditions::ATTACK_ExitIfExpiredDuration |
 																						 ExitConditions::ATTACK_ExitIfNoUnitFound |
 																						 ExitConditions::ATTACK_ExitIfOutsideRadius );
 
@@ -855,11 +869,11 @@ StateReturnType AIGuardAttackAggressorState::update( void )
 	if (m_attackState==NULL) return STATE_SUCCESS;
 	// if the position has moved (IE we're guarding an object), move with it.
 	Object* targetToGuard = getGuardMachine()->findTargetToGuardByID();
-	if (targetToGuard) 
+	if (targetToGuard)
 	{
 		m_exitConditions.m_center = *targetToGuard->getPosition();
 	}
-	
+
 	return m_attackState->update();
 }
 
@@ -867,14 +881,14 @@ StateReturnType AIGuardAttackAggressorState::update( void )
 void AIGuardAttackAggressorState::onExit( StateExitType status )
 {
 	Object *obj = getMachineOwner();
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
 		m_attackState = NULL;
 	}
 
-	if (obj->getTeam()) 
+	if (obj->getTeam())
 	{
 		obj->getTeam()->setTeamTargetObject(NULL); // clear the target.
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGuardRetaliate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGuardRetaliate.cpp
index 018bb4279a1..c66bc9cfd17 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGuardRetaliate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGuardRetaliate.cpp
@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// FILE: AIGuardRetaliate.h 
+// FILE: AIGuardRetaliate.h
 /*---------------------------------------------------------------------------*/
 /* Electronic Arts Los Angeles                                               */
 /* Confidential Information	                                                 */
@@ -36,7 +36,7 @@
 /* Desc:       // Define Guard Retaliation states for AI                     */
 /*---------------------------------------------------------------------------*/
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 #include "Common/Team.h"
@@ -54,11 +54,6 @@
 
 const Real CLOSE_ENOUGH = (25.0f);
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/ )
 {
@@ -77,10 +72,10 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
 	Object *target = TheGameLogic->findObjectByID(bmi->getClearableLastAttacker());
 	bmi->clearLastAttacker();
 
-	// We use the clearable last attacker because we should continue attacking the guy. But if he 
-	// stops attacking us, then we want our timer to kick us off of him and make us go attack 
+	// We use the clearable last attacker because we should continue attacking the guy. But if he
+	// stops attacking us, then we want our timer to kick us off of him and make us go attack
 	// other units instead.
-	
+
 
 	if (!target) {
 		return FALSE;
@@ -90,7 +85,7 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
 		return FALSE;
 	}
 
-	// This is a quick test on the target. It will be duplicated in getAbleToAttackSpecificObject, 
+	// This is a quick test on the target. It will be duplicated in getAbleToAttackSpecificObject,
 	// but the payoff is worth the duplication.
 	if (target->isEffectivelyDead()) {
 		return FALSE;
@@ -117,9 +112,9 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
  */
 Bool GuardRetaliateExitConditions::shouldExit(const StateMachine* machine) const
 {
-	if (!machine->getGoalObject()) 
+	if (!machine->getGoalObject())
 	{
-		if (m_conditionsToConsider & ATTACK_ExitIfNoUnitFound) 
+		if (m_conditionsToConsider & ATTACK_ExitIfNoUnitFound)
 		{
 			return true;
 		}
@@ -129,15 +124,15 @@ Bool GuardRetaliateExitConditions::shouldExit(const StateMachine* machine) const
 		}
 	}
 
-	if (m_conditionsToConsider & ATTACK_ExitIfExpiredDuration) 
+	if (m_conditionsToConsider & ATTACK_ExitIfExpiredDuration)
 	{
 		if (TheGameLogic->getFrame() >= m_attackGiveUpFrame)
 		{
 			return true;
-		} 
+		}
 	}
-	
-	if (m_conditionsToConsider & ATTACK_ExitIfOutsideRadius) 
+
+	if (m_conditionsToConsider & ATTACK_ExitIfOutsideRadius)
 	{
 		Coord3D deltaAggressor, myRange;
 		Coord3D objPos = *machine->getGoalObject()->getPosition();
@@ -149,7 +144,7 @@ Bool GuardRetaliateExitConditions::shouldExit(const StateMachine* machine) const
 													// a target that is within range, then not be able to attack because its actually out of range.
 													// then it would look for a new target, get the same one, and proceed in an infinite recursive
 													// loop that eventually blew the stack.
-	
+
 		Real guardRangeSqr = sqr( AIGuardRetaliateMachine::getStdGuardRange( machine->getOwner() ) );
 		myRange.x = myPos.x - m_center.x;
 		myRange.y = myPos.y - m_center.y;
@@ -159,7 +154,7 @@ Bool GuardRetaliateExitConditions::shouldExit(const StateMachine* machine) const
 		{
 			//The aggressor is too far away now... give up retaliation.
 			return TRUE;
-		} 
+		}
 		if( myRange.lengthSqr() > guardRangeSqr )
 		{
 			//Never go beyond standard guard radius.
@@ -173,16 +168,16 @@ Bool GuardRetaliateExitConditions::shouldExit(const StateMachine* machine) const
 
 //-- AIGuardRetaliateMachine -------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------
-AIGuardRetaliateMachine::AIGuardRetaliateMachine( Object *owner ) : 
+AIGuardRetaliateMachine::AIGuardRetaliateMachine( Object *owner ) :
 	StateMachine(owner, "AIGuardRetaliateMachine"),
 	m_nemesisToAttack(INVALID_ID)
 {
 	m_positionToGuard.zero();
-	
+
 	static const StateConditionInfo attackAggressors[] =
 	{
 		StateConditionInfo(hasAttackedMeAndICanReturnFire, AI_GUARD_RETALIATE_ATTACK_AGGRESSOR, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -213,7 +208,7 @@ Bool AIGuardRetaliateMachine::isIdle() const
 //--------------------------------------------------------------------------------------
 /*static*/ Real AIGuardRetaliateMachine::getStdGuardRange(const Object* obj)
 {
-	Real visionRange = TheAI->getAdjustedVisionRangeForObject(obj, 
+	Real visionRange = TheAI->getAdjustedVisionRangeForObject(obj,
 		AI_VISIONFACTOR_OWNERTYPE | AI_VISIONFACTOR_MOOD | AI_VISIONFACTOR_GUARDINNER);
 
 	return visionRange;
@@ -230,10 +225,10 @@ Bool AIGuardRetaliateMachine::lookForInnerTarget(void)
 
 	// Check if team auto targets same victim.
 	Object *teamVictim = NULL;
-	if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+	if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 	{
 		teamVictim = owner->getTeam()->getTeamTargetObject();
-		if (teamVictim) 
+		if (teamVictim)
 		{
 			setNemesisID(teamVictim->getID());
 			return true;	// Transitions to AIGuardRetaliateInnerState.
@@ -287,14 +282,14 @@ Bool AIGuardRetaliateMachine::lookForInnerTarget(void)
 //	Object* target = iter->first();
 //
 // srj sez: the above code is stupid and slow. since we only want the closest object,
-// just ask for that; the above has to find ALL objects in range, but we ignore all 
+// just ask for that; the above has to find ALL objects in range, but we ignore all
 // but the first (closest).
 //
 	const Coord3D *pos = getPositionToGuard();
 	Object* target = ThePartitionManager->getClosestObject(pos, visionRange, FROM_CENTER_2D, filters);
-	if (target) 
+	if (target)
 	{
-		setNemesisID(target->getID());	
+		setNemesisID(target->getID());
 		return true;	// Transitions to AIGuardRetaliateInnerState.
 	}
 	else
@@ -308,7 +303,7 @@ Bool AIGuardRetaliateMachine::lookForInnerTarget(void)
 // ------------------------------------------------------------------------------------------------
 void AIGuardRetaliateMachine::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -327,14 +322,14 @@ void AIGuardRetaliateMachine::xfer( Xfer *xfer )
 	xfer->xferObjectID(&m_nemesisToAttack);
 	xfer->xferCoord3D(&m_positionToGuard);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIGuardRetaliateMachine::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-- AIGuardRetaliateInnerState ----------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -342,7 +337,7 @@ void AIGuardRetaliateMachine::loadPostProcess( void )
 // ------------------------------------------------------------------------------------------------
 void AIGuardRetaliateInnerState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -354,7 +349,7 @@ void AIGuardRetaliateInnerState::xfer( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -362,7 +357,14 @@ void AIGuardRetaliateInnerState::xfer( Xfer *xfer )
 void AIGuardRetaliateInnerState::loadPostProcess( void )
 {
 	onEnter();
-}  // end loadPostProcess
+}
+
+// ------------------------------------------------------------------------------------------------
+AIGuardRetaliateInnerState::~AIGuardRetaliateInnerState(void)
+{
+	deleteInstance(m_attackState);
+	deleteInstance(m_enterState);
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardRetaliateInnerState::onEnter( void )
@@ -371,9 +373,9 @@ StateReturnType AIGuardRetaliateInnerState::onEnter( void )
 	if (getMachineOwner()->getTemplate()->isEnterGuard())
 	{
 		Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
-		if (nemesis == NULL) 
+		if (nemesis == NULL)
 		{
-			DEBUG_LOG(("Unexpected NULL nemesis in AIGuardRetaliateInnerState.\n"));
+			DEBUG_LOG(("Unexpected NULL nemesis in AIGuardRetaliateInnerState."));
 			return STATE_SUCCESS;
 		}
 		m_enterState = newInstance(AIEnterState)(getMachine());
@@ -390,14 +392,14 @@ StateReturnType AIGuardRetaliateInnerState::onEnter( void )
 	{
 		Coord3D pos = *getGuardMachine()->getPositionToGuard();
 		Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
-		if (nemesis == NULL) 
+		if (nemesis == NULL)
 		{
-			DEBUG_LOG(("Unexpected NULL nemesis in AIGuardRetaliateInnerState.\n"));
+			DEBUG_LOG(("Unexpected NULL nemesis in AIGuardRetaliateInnerState."));
 			return STATE_SUCCESS;
 		}
 		m_exitConditions.m_center = pos;
 		m_exitConditions.m_radiusSqr = sqr( 1.5f * AIGuardRetaliateMachine::getStdGuardRange( getMachineOwner() ) );
-		m_exitConditions.m_conditionsToConsider = (GuardRetaliateExitConditions::ATTACK_ExitIfOutsideRadius | 
+		m_exitConditions.m_conditionsToConsider = (GuardRetaliateExitConditions::ATTACK_ExitIfOutsideRadius |
 																								GuardRetaliateExitConditions::ATTACK_ExitIfNoUnitFound);
 
 		m_attackState = newInstance(AIAttackState)(getMachine(), false, true, false, &m_exitConditions);
@@ -433,7 +435,7 @@ StateReturnType AIGuardRetaliateInnerState::update( void )
 void AIGuardRetaliateInnerState::onExit( StateExitType status )
 {
 	Object *obj = getMachineOwner();
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
@@ -445,8 +447,8 @@ void AIGuardRetaliateInnerState::onExit( StateExitType status )
 		deleteInstance(m_enterState);
 		m_enterState = NULL;
 	}
-	
-	if (obj->getTeam()) 
+
+	if (obj->getTeam())
 	{
 		obj->getTeam()->setTeamTargetObject(NULL); // clear the target.
 	}
@@ -458,7 +460,7 @@ void AIGuardRetaliateInnerState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIGuardRetaliateOuterState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -470,7 +472,7 @@ void AIGuardRetaliateOuterState::xfer( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -478,7 +480,13 @@ void AIGuardRetaliateOuterState::xfer( Xfer *xfer )
 void AIGuardRetaliateOuterState::loadPostProcess( void )
 {						 AIGuardRetaliateOuterState
 	onEnter();
-}  // end loadPostProcess
+}
+
+// ------------------------------------------------------------------------------------------------
+AIGuardRetaliateOuterState::~AIGuardRetaliateOuterState(void)
+{
+	deleteInstance(m_attackState);
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardRetaliateOuterState::onEnter( void )
@@ -492,9 +500,9 @@ StateReturnType AIGuardRetaliateOuterState::onEnter( void )
 	Coord3D pos = *getGuardMachine()->getPositionToGuard();
 
 	Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardRetaliateOuterState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardRetaliateOuterState."));
 		return STATE_SUCCESS;
 	}
 	Object *obj = getMachineOwner();
@@ -504,8 +512,8 @@ StateReturnType AIGuardRetaliateOuterState::onEnter( void )
 	m_exitConditions.m_center = pos;
 	m_exitConditions.m_radiusSqr = sqr( 0.67f * (range + AIGuardRetaliateMachine::getStdGuardRange( getMachineOwner() )) );
 	m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
-	m_exitConditions.m_conditionsToConsider = (GuardRetaliateExitConditions::ATTACK_ExitIfExpiredDuration | 
-																								GuardRetaliateExitConditions::ATTACK_ExitIfOutsideRadius | 
+	m_exitConditions.m_conditionsToConsider = (GuardRetaliateExitConditions::ATTACK_ExitIfExpiredDuration |
+																								GuardRetaliateExitConditions::ATTACK_ExitIfOutsideRadius |
 																								GuardRetaliateExitConditions::ATTACK_ExitIfNoUnitFound);
 
 	m_attackState = newInstance(AIAttackState)(getMachine(), false, true, false, &m_exitConditions);
@@ -526,27 +534,27 @@ StateReturnType AIGuardRetaliateOuterState::update( void )
 	if (m_attackState==NULL) return STATE_SUCCESS;
 
 	Object* goalObj = m_attackState->getMachineGoalObject();
-	if (goalObj) 
+	if (goalObj)
 	{
 		Coord3D deltaAggr;
 		deltaAggr.x = m_exitConditions.m_center.x - goalObj->getPosition()->x;
 		deltaAggr.y = m_exitConditions.m_center.y - goalObj->getPosition()->y;
 		deltaAggr.z = m_exitConditions.m_center.z - goalObj->getPosition()->z;
 		Real visionSqr = sqr(AIGuardRetaliateMachine::getStdGuardRange(getMachineOwner()));
-		if (deltaAggr.lengthSqr() <= visionSqr) 
+		if (deltaAggr.lengthSqr() <= visionSqr)
 		{
 			// reset the counter
 			m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
 		}
 	}
-	
+
 	return m_attackState->update();
 }
 
 //--------------------------------------------------------------------------------------
 void AIGuardRetaliateOuterState::onExit( StateExitType status )
 {
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
@@ -560,7 +568,7 @@ void AIGuardRetaliateOuterState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIGuardRetaliateReturnState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -571,16 +579,16 @@ void AIGuardRetaliateReturnState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
-	
+
 	xfer->xferUnsignedInt(&m_nextReturnScanTime);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIGuardRetaliateReturnState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardRetaliateReturnState::onEnter( void )
@@ -589,13 +597,13 @@ StateReturnType AIGuardRetaliateReturnState::onEnter( void )
 	m_nextReturnScanTime = now + GameLogicRandomValue(0, TheAI->getAiData()->m_guardEnemyReturnScanRate);
 
 // no, no, no, don't do this in onEnter, unless you like really slow maps. (srj)
-//	if (getGuardMachine()->lookForInnerTarget()) 
+//	if (getGuardMachine()->lookForInnerTarget())
 //		return STATE_FAILURE; // early termination because we found a target.
 
 	m_goalPosition = *getGuardMachine()->getPositionToGuard();
 
-	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface(); 
-	if (ai && ai->isDoingGroundMovement()) 
+	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface();
+	if (ai && ai->isDoingGroundMovement())
 	{
 		TheAI->pathfinder()->adjustDestination(getMachineOwner(), ai->getLocomotorSet(), &m_goalPosition);
 	}
@@ -610,7 +618,7 @@ StateReturnType AIGuardRetaliateReturnState::update( void )
 	if (now >= m_nextReturnScanTime)
 	{
 		m_nextReturnScanTime = now + TheAI->getAiData()->m_guardEnemyReturnScanRate;
-		if (getGuardMachine()->lookForInnerTarget()) 
+		if (getGuardMachine()->lookForInnerTarget())
 			return STATE_FAILURE; // early termination because we found a target.
 	}
 
@@ -630,7 +638,7 @@ void AIGuardRetaliateReturnState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIGuardRetaliateIdleState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -641,22 +649,22 @@ void AIGuardRetaliateIdleState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
-	
+
 	xfer->xferUnsignedInt(&m_nextEnemyScanTime);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIGuardRetaliateIdleState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardRetaliateIdleState::onEnter( void )
 {
 	// first time thru, use a random amount so that everyone doesn't scan on the same frame,
-	// to avoid "spikes". 
+	// to avoid "spikes".
 	UnsignedInt now = TheGameLogic->getFrame();
 	m_nextEnemyScanTime = now + GameLogicRandomValue(0, TheAI->getAiData()->m_guardEnemyScanRate);
 
@@ -666,7 +674,7 @@ StateReturnType AIGuardRetaliateIdleState::onEnter( void )
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardRetaliateIdleState::update( void )
 {
-	//DEBUG_LOG(("AIGuardRetaliateIdleState frame %d: %08lx\n",TheGameLogic->getFrame(),getMachineOwner()));
+	//DEBUG_LOG(("AIGuardRetaliateIdleState frame %d: %08lx",TheGameLogic->getFrame(),getMachineOwner()));
 
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (now < m_nextEnemyScanTime)
@@ -680,14 +688,14 @@ StateReturnType AIGuardRetaliateIdleState::update( void )
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAIUpdateInterface();
 	// Check to see if we have created a crate we need to pick up.
-	if (ai->getCrateID() != INVALID_ID) 
+	if (ai->getCrateID() != INVALID_ID)
 	{
 		getMachine()->setState(AI_GUARD_RETALIATE_GET_CRATE);
 		return STATE_SLEEP(m_nextEnemyScanTime - now);
 	}
 
 	// if anyone is in the inner area, return success.
-	if (getGuardMachine()->lookForInnerTarget()) 
+	if (getGuardMachine()->lookForInnerTarget())
 	{
 		return STATE_SUCCESS;	// Transitions to AIGuardRetaliateInnerState.
 	}
@@ -702,7 +710,7 @@ StateReturnType AIGuardRetaliateIdleState::update( void )
 //--------------------------------------------------------------------------------------
 void AIGuardRetaliateIdleState::onExit( StateExitType status )
 {
-	
+
 }
 
 //-- AIGuardRetaliatePickUpCrateState ----------------------------------------------------------------------
@@ -711,14 +719,14 @@ AIGuardRetaliatePickUpCrateState::AIGuardRetaliatePickUpCrateState( StateMachine
 {
 #ifdef STATE_MACHINE_DEBUG
 		setName("AIGuardRetaliatePickUpCrateState");
-#endif	
+#endif
 }
 //--------------------------------------------------------------------------------------
 StateReturnType AIGuardRetaliatePickUpCrateState::onEnter( void )
 {
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAIUpdateInterface();
-	
+
 	// Check to see if we have created a crate we need to pick up.
 	Object* crate = ai->checkForCrateToPickup();
 	if (crate)
@@ -739,12 +747,12 @@ StateReturnType AIGuardRetaliatePickUpCrateState::update( void )
 //--------------------------------------------------------------------------------------
 void AIGuardRetaliatePickUpCrateState::onExit( StateExitType status )
 {
-	
+
 }
 
 //-- AIGuardRetaliateAttackAggressorState ------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-AIGuardRetaliateAttackAggressorState::AIGuardRetaliateAttackAggressorState( StateMachine *machine ) : 
+AIGuardRetaliateAttackAggressorState::AIGuardRetaliateAttackAggressorState( StateMachine *machine ) :
 	State( machine, "AIGuardRetaliateAttackAggressorState" )
 {
 	m_attackState = NULL;
@@ -761,6 +769,12 @@ AsciiString AIGuardRetaliateAttackAggressorState::getName(  ) const
 }
 #endif
 
+// ------------------------------------------------------------------------------------------------
+AIGuardRetaliateAttackAggressorState::~AIGuardRetaliateAttackAggressorState(void)
+{
+	deleteInstance(m_attackState);
+}
+
 //-------------------------------------------------------------------------------------------------
 StateReturnType AIGuardRetaliateAttackAggressorState::onEnter( void )
 {
@@ -772,7 +786,7 @@ StateReturnType AIGuardRetaliateAttackAggressorState::onEnter( void )
 	Object *nemesis = TheGameLogic->findObjectByID( getGuardMachine()->getNemesisID() );
 
 	BodyModuleInterface *body = obj->getBodyModule();
-	if( !nemesis && body && body->getLastDamageInfo()->in.m_sourceID && body->getLastDamageInfo()->in.m_damageType != DAMAGE_HEALING ) 
+	if( !nemesis && body && body->getLastDamageInfo()->in.m_sourceID && body->getLastDamageInfo()->in.m_damageType != DAMAGE_HEALING )
 	{
 		nemID = obj->getBodyModule()->getLastDamageInfo()->in.m_sourceID;
 		nemesis = TheGameLogic->findObjectByID( nemID );
@@ -784,7 +798,7 @@ StateReturnType AIGuardRetaliateAttackAggressorState::onEnter( void )
 
 	if( !nemesis )
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardRetaliateAttackAggressorState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AIGuardRetaliateAttackAggressorState."));
 		return STATE_SUCCESS;
 	}
 
@@ -795,7 +809,7 @@ StateReturnType AIGuardRetaliateAttackAggressorState::onEnter( void )
 	m_exitConditions.m_center = pos;
 	m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
 	m_exitConditions.m_radiusSqr = sqr( range + AIGuardRetaliateMachine::getStdGuardRange( obj ) );
-	m_exitConditions.m_conditionsToConsider = ( GuardRetaliateExitConditions::ATTACK_ExitIfExpiredDuration | 
+	m_exitConditions.m_conditionsToConsider = ( GuardRetaliateExitConditions::ATTACK_ExitIfExpiredDuration |
 																						  GuardRetaliateExitConditions::ATTACK_ExitIfOutsideRadius |
 																						  GuardRetaliateExitConditions::ATTACK_ExitIfNoUnitFound );
 
@@ -815,7 +829,7 @@ StateReturnType AIGuardRetaliateAttackAggressorState::onEnter( void )
 StateReturnType AIGuardRetaliateAttackAggressorState::update( void )
 {
 	if (m_attackState==NULL) return STATE_SUCCESS;
-	
+
 	return m_attackState->update();
 }
 
@@ -823,14 +837,14 @@ StateReturnType AIGuardRetaliateAttackAggressorState::update( void )
 void AIGuardRetaliateAttackAggressorState::onExit( StateExitType status )
 {
 	Object *obj = getMachineOwner();
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
 		m_attackState = NULL;
 	}
 
-	if (obj->getTeam()) 
+	if (obj->getTeam())
 	{
 		obj->getTeam()->setTeamTargetObject(NULL); // clear the target.
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
index 92b4e8d3ab2..bc2eb2aed11 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
@@ -25,7 +25,7 @@
 // AIPathfind.cpp
 // AI pathfinding system
 // Author: Michael S. Booth, October 2001
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameLogic/AIPathfind.h"
 
@@ -33,9 +33,9 @@
 #include "Common/Player.h"
 #include "Common/CRCDebug.h"
 #include "Common/GlobalData.h"
-#include "Common/LatchRestore.h"	 
+#include "Common/LatchRestore.h"
 #include "Common/ThingTemplate.h"
-#include "Common/ThingFactory.h"							 
+#include "Common/ThingFactory.h"
 
 #include "GameClient/Line2D.h"
 
@@ -50,9 +50,7 @@
 #include "GameLogic/TerrainLogic.h"
 #include "GameLogic/Weapon.h"
 
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.	
-
-#include "Utility/CppMacros.h"
+#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
 
 #define no_INTENSE_DEBUG
 
@@ -65,17 +63,11 @@
 #include "Common/Xfer.h"
 #include "Common/XferCRC.h"
 
-//------------------------------------------------------------------------------ Performance Timers 
+//------------------------------------------------------------------------------ Performance Timers
 #include "Common/PerfMetrics.h"
-#include "Common/PerfTimer.h"
 
 //-------------------------------------------------------------------------------------------------
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static inline Bool IS_IMPASSABLE(PathfindCell::CellType type) {
 	// Return true if cell is impassable to ground units. jba. [8/18/2003]
@@ -97,11 +89,11 @@ struct TCheckMovementInfo
 	// Input
 	ICoord2D					cell;
 	PathfindLayerEnum layer;
-	Int								radius;	
+	Int								radius;
 	Bool							centerInCell;
 	Bool							considerTransient;
 	LocomotorSurfaceTypeMask acceptableSurfaces;
-	// Output 
+	// Output
 	Int								allyFixedCount;
 	Bool							enemyFixed;
 	Bool							allyMoving;
@@ -114,7 +106,13 @@ inline Int IABS(Int x) {	if (x>=0) return x; return -x;};
 static Int frameToShowObstacles;
 
 
-static UnsignedInt ZONE_UPDATE_FREQUENCY = 300;
+constexpr const UnsignedInt ZONE_UPDATE_FREQUENCY = 300;
+constexpr const UnsignedInt MAX_CELL_COUNT = 500;
+constexpr const UnsignedInt MAX_ADJUSTMENT_CELL_COUNT = 400;
+constexpr const UnsignedInt MAX_SAFE_PATH_CELL_COUNT = 2000;
+
+constexpr const UnsignedInt PATHFIND_CELLS_PER_FRAME = 5000; // Number of cells we will search pathfinding per frame.
+constexpr const UnsignedInt CELL_INFOS_TO_ALLOCATE = 30000;
 
 //-----------------------------------------------------------------------------------
 PathNode::PathNode() :
@@ -135,7 +133,7 @@ PathNode::PathNode() :
 PathNode::~PathNode()
 {
 }
-								 
+
 //-----------------------------------------------------------------------------------
 void PathNode::setNextOptimized(PathNode *node)
 {
@@ -145,9 +143,9 @@ void PathNode::setNextOptimized(PathNode *node)
 		m_nextOptiDirNorm2D.x = node->getPosition()->x - getPosition()->x;
 		m_nextOptiDirNorm2D.y = node->getPosition()->y - getPosition()->y;
 		m_nextOptiDist2D = m_nextOptiDirNorm2D.length();
-		if (m_nextOptiDist2D == 0.0f) 
+		if (m_nextOptiDist2D == 0.0f)
 		{
-			//DEBUG_LOG(("Warning - Path Seg length == 0, adjusting. john a.\n"));
+			//DEBUG_LOG(("Warning - Path Seg length == 0, adjusting. john a."));
 			m_nextOptiDist2D = 0.01f;
 		}
 		m_nextOptiDirNorm2D.x /= m_nextOptiDist2D;
@@ -161,20 +159,20 @@ void PathNode::setNextOptimized(PathNode *node)
 
 //-----------------------------------------------------------------------------------
 /// given a list, prepend this node, return new list
-PathNode *PathNode::prependToList( PathNode *list ) 
-{ 
-	m_next = list; 
+PathNode *PathNode::prependToList( PathNode *list )
+{
+	m_next = list;
 	if (list)
 		list->m_prev = this;
-	m_prev = NULL; 
-	return this; 
+	m_prev = NULL;
+	return this;
 }
 
 //-----------------------------------------------------------------------------------
 /// given a list, append this node, return new list.  slow implementation.
 /// @todo optimize this
-PathNode *PathNode::appendToList( PathNode *list ) 
-{ 
+PathNode *PathNode::appendToList( PathNode *list )
+{
 	if (list == NULL)
 	{
 		m_next = NULL;
@@ -190,14 +188,14 @@ PathNode *PathNode::appendToList( PathNode *list )
 	m_prev = tail;
 	m_next = NULL;
 
-	return list; 
+	return list;
 }
 
 //-----------------------------------------------------------------------------------
 /// given a node, append new node to this.
-void PathNode::append( PathNode *newNode ) 
-{ 
-	newNode->m_next = this->m_next;	
+void PathNode::append( PathNode *newNode )
+{
+	newNode->m_next = this->m_next;
 	newNode->m_prev = this;
 	if (newNode->m_next) {
 		newNode->m_next->m_prev = newNode;
@@ -244,7 +242,7 @@ const Coord3D *PathNode::computeDirectionVector( void )
 Path::Path():
 m_path(NULL),
 m_pathTail(NULL),
-m_isOptimized(FALSE), 
+m_isOptimized(FALSE),
 m_blockedByAlly(FALSE),
 m_cpopRecentStart(NULL),
 m_cpopCountdown(MAX_CPOP),
@@ -260,7 +258,7 @@ Path::~Path( void )
 {
 	PathNode *node, *nextNode;
 
-	// delete all of the path nodes	
+	// delete all of the path nodes
 	for( node = m_path; node; node = nextNode )
 	{
 		nextNode = node->getNext();
@@ -273,7 +271,7 @@ Path::~Path( void )
 // ------------------------------------------------------------------------------------------------
 void Path::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -293,7 +291,7 @@ void Path::xfer( Xfer *xfer )
 	}
 	xfer->xferInt(&count);
 
-	if (xfer->getXferMode() == XFER_SAVE)	{	
+	if (xfer->getXferMode() == XFER_SAVE)	{
 		node = m_pathTail;  // Write them out backwards.
 		while (node) {
 			node->m_id = count;
@@ -309,7 +307,7 @@ void Path::xfer( Xfer *xfer )
 				id = node->getNextOptimized()->m_id;
 			}
 			xfer->xferInt(&id);
-			count--; 
+			count--;
 			node = node->getPrevious();
 		}
 		DEBUG_ASSERTCRASH(count==0, ("Wrong data count"));
@@ -352,13 +350,13 @@ void Path::xfer( Xfer *xfer )
 
 	xfer->xferBool(&m_isOptimized);
 	Int obsolete1 = 0;
-	xfer->xferInt(&obsolete1);	
+	xfer->xferInt(&obsolete1);
 	UnsignedInt obsolete2;
 	xfer->xferUnsignedInt(&obsolete2);
 	xfer->xferBool(&m_blockedByAlly);
 
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI == AI_DEBUG_PATHS)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -385,14 +383,14 @@ void Path::xfer( Xfer *xfer )
 		TheAI->pathfinder()->setDebugPath(this);
 	}
 #endif
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void Path::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 /**
  * Create a new node at the head of the path
@@ -421,11 +419,11 @@ void Path::prependNode( const Coord3D *pos, PathfindLayerEnum layer )
  */
 void Path::appendNode( const Coord3D *pos, PathfindLayerEnum layer )
 {
-	if (m_isOptimized && m_pathTail) 
+	if (m_isOptimized && m_pathTail)
 	{
 		/* Check for duplicates. */
 		if (pos->x == m_pathTail->getPosition()->x && pos->y == m_pathTail->getPosition()->y) {
-			DEBUG_LOG(("Warning - Path Seg length == 0, ignoring. john a.\n"));
+			DEBUG_LOG(("Warning - Path Seg length == 0, ignoring. john a."));
 			return;
 		}
 	}
@@ -436,7 +434,7 @@ void Path::appendNode( const Coord3D *pos, PathfindLayerEnum layer )
 
 	m_path = node->appendToList( m_path );
 
-	if (m_isOptimized && m_pathTail) 
+	if (m_isOptimized && m_pathTail)
 	{
 		m_pathTail->setNextOptimized(node);
 	}
@@ -457,7 +455,7 @@ void Path::updateLastNode( const Coord3D *pos )
 		m_pathTail->setPosition(pos);
 		m_pathTail->setLayer(layer);
 	}
-	if (m_isOptimized && m_pathTail) 
+	if (m_isOptimized && m_pathTail)
 	{
 		PathNode *node = m_path;
 		while(node && node->getNextOptimized() != m_pathTail) {
@@ -519,15 +517,15 @@ void Path::optimize( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfa
 			firstNode = false;
 		}
 		//PathfindLayerEnum curLayer = LAYER_GROUND;
-		for( ; node != anchor; node = node->getPrevious() )		
+		for( ; node != anchor; node = node->getPrevious() )
 		{
 			Bool isPassable = false;
-			//CRCDEBUG_LOG(("Path::optimize() calling isLinePassable()\n"));
-			if (TheAI->pathfinder()->isLinePassable( obj, acceptableSurfaces, layer, *anchor->getPosition(), 
+			//CRCDEBUG_LOG(("Path::optimize() calling isLinePassable()"));
+			if (TheAI->pathfinder()->isLinePassable( obj, acceptableSurfaces, layer, *anchor->getPosition(),
 				*node->getPosition(), blocked, false))
 			{
 				isPassable = true;
-			} 
+			}
 			PathfindCell* cell = TheAI->pathfinder()->getCell( layer, node->getPosition());
 			if (cell && cell->getType()==PathfindCell::CELL_CLIFF && !cell->getPinched()) {
 				isPassable = true;
@@ -575,7 +573,7 @@ void Path::optimize( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfa
 					isPassable = true;
 				}
 			}
-			if (isPassable) 
+			if (isPassable)
 			{
 				// anchor can directly see this node, make it next in the optimized path
 				anchor->setNextOptimized( node );
@@ -584,7 +582,7 @@ void Path::optimize( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfa
 				break;
 			}
 		}
-			
+
 		if (optimizedSegment == false)
 		{
 			// for some reason, there is no clear LOS between the anchor node and the very next node
@@ -636,15 +634,15 @@ void Path::optimizeGroundPath( Bool crusher, Int pathDiameter )
 		}
 
 		// find the farthest node in the path that has a clear line-of-sight to this anchor
-		for( ; node != anchor; node = node->getPrevious() )		
+		for( ; node != anchor; node = node->getPrevious() )
 		{
 			Bool isPassable = false;
-			//CRCDEBUG_LOG(("Path::optimize() calling isLinePassable()\n"));
+			//CRCDEBUG_LOG(("Path::optimize() calling isLinePassable()"));
 			if (TheAI->pathfinder()->isGroundPathPassable( crusher, *anchor->getPosition(), layer,
 				*node->getPosition(), pathDiameter))
 			{
 				isPassable = true;
-			} 
+			}
 			// Horizontal, diagonal, and vertical steps are passable.
 			if (!isPassable) {
 				Int dx = node->getPosition()->x - anchor->getPosition()->x;
@@ -685,7 +683,7 @@ void Path::optimizeGroundPath( Bool crusher, Int pathDiameter )
 					isPassable = true;
 				}
 			}
-			if (isPassable) 
+			if (isPassable)
 			{
 				// anchor can directly see this node, make it next in the optimized path
 				anchor->setNextOptimized( node );
@@ -694,7 +692,7 @@ void Path::optimizeGroundPath( Bool crusher, Int pathDiameter )
 				break;
 			}
 		}
-			
+
 		if (optimizedSegment == false)
 		{
 			// for some reason, there is no clear LOS between the anchor node and the very next node
@@ -723,7 +721,7 @@ void Path::optimizeGroundPath( Bool crusher, Int pathDiameter )
 inline Bool isReallyClose(const Coord3D& a, const Coord3D& b)
 {
 	const Real CLOSE_ENOUGH = 0.1f;
-	return 
+	return
 		fabs(a.x-b.x) <= CLOSE_ENOUGH &&
 		fabs(a.y-b.y) <= CLOSE_ENOUGH &&
 		fabs(a.z-b.z) <= CLOSE_ENOUGH;
@@ -761,7 +759,7 @@ void Path::computePointOnPath(
 	ClosestPointOnPathInfo& out
 )
 {
-	CRCDEBUG_LOG(("Path::computePointOnPath() for %s\n", DebugDescribeObject(obj).str()));
+	CRCDEBUG_LOG(("Path::computePointOnPath() for %s", DebugDescribeObject(obj).str()));
 
 	out.layer = LAYER_GROUND;
 	out.posOnPath.zero();
@@ -778,7 +776,7 @@ void Path::computePointOnPath(
 	{
 		out = m_cpopOut;
 		m_cpopCountdown--;
-		CRCDEBUG_LOG(("Path::computePointOnPath() end because we're really close\n"));
+		CRCDEBUG_LOG(("Path::computePointOnPath() end because we're really close"));
 		return;
 	}
 	m_cpopCountdown = MAX_CPOP;
@@ -806,8 +804,8 @@ void Path::computePointOnPath(
 	Real segmentLength;
 
 	// note that the seg dir and len returned by this is the dist & vec from 'prevNode' to 'node'
-	for ( const PathNode* node = prevNode->getNextOptimized(&segmentDirNorm, &segmentLength); 
-				node != NULL; 
+	for ( const PathNode* node = prevNode->getNextOptimized(&segmentDirNorm, &segmentLength);
+				node != NULL;
 				node = node->getNextOptimized(&segmentDirNorm, &segmentLength) )
 	{
 		const Coord3D* prevNodePos = prevNode->getPosition();
@@ -819,7 +817,7 @@ void Path::computePointOnPath(
 
 		// compute distance projection of 'toPos' onto segment
 		Real alongPathDist = segmentDirNorm.x * toPos.x + segmentDirNorm.y * toPos.y;
-				
+
 		Coord3D pointOnPath;
 		if (alongPathDist < 0.0f)
 		{
@@ -888,18 +886,18 @@ void Path::computePointOnPath(
 		const PathNode* closeNext = closeNode->getNextOptimized(&segmentDirNorm, &segmentLength);
 		const Coord3D* nextNodePos = closeNext->getPosition();
 		const Coord3D* closeNodePos = closeNode->getPosition();
-		
+
 		const PathNode* closePrev = closeNode->getPrevious();
-		if (closePrev && closePrev->getLayer() > LAYER_GROUND) 
+		if (closePrev && closePrev->getLayer() > LAYER_GROUND)
 		{
 			out.layer = closeNode->getLayer();
 		}
-		if (closeNode->getLayer() > LAYER_GROUND) 
+		if (closeNode->getLayer() > LAYER_GROUND)
 		{
 			out.layer = closeNode->getLayer();
 		}
 
-		if (closeNext->getLayer() > LAYER_GROUND) 
+		if (closeNext->getLayer() > LAYER_GROUND)
 		{
 			out.layer = closeNext->getLayer();
 		}
@@ -922,7 +920,7 @@ void Path::computePointOnPath(
 
 		// If we are basically on the path, return the next path node as the movement goal.
 		// However, the farther off the path we get, the movement goal becomes closer to our
-		// projected position on the path.  If we are very far off the path, we will move 
+		// projected position on the path.  If we are very far off the path, we will move
 		// directly towards the nearest point on the path, and not the next path node.
 		const Real maxPathError = 3.0f * PATHFIND_CELL_SIZE_F;
 		const Real maxPathErrorInv = 1.0 / maxPathError;
@@ -931,19 +929,19 @@ void Path::computePointOnPath(
 			k = 1.0f;
 
 		Bool gotPos = false;
-		CRCDEBUG_LOG(("Path::computePointOnPath() calling isLinePassable() 1\n"));
-		if (TheAI->pathfinder()->isLinePassable( obj, locomotorSet.getValidSurfaces(), out.layer, pos, *nextNodePos, 
-			false, true )) 
+		CRCDEBUG_LOG(("Path::computePointOnPath() calling isLinePassable() 1"));
+		if (TheAI->pathfinder()->isLinePassable( obj, locomotorSet.getValidSurfaces(), out.layer, pos, *nextNodePos,
+			false, true ))
 		{
 			out.posOnPath = *nextNodePos;
 			gotPos = true;
 
 			Bool tryAhead = alongPathDist > segmentLength * 0.5;
-			if (closeNext->getCanOptimize() == false) 
+			if (closeNext->getCanOptimize() == false)
 			{
 				tryAhead = false; // don't go past no-opt nodes.
 			}
-			if (closeNode->getLayer() != closeNext->getLayer()) 
+			if (closeNode->getLayer() != closeNext->getLayer())
 			{
 				tryAhead = false; // don't go past layers.
 			}
@@ -955,26 +953,26 @@ void Path::computePointOnPath(
 				tryAhead = true;
 				veryClose = true;
 			}
-			if (tryAhead) 
+			if (tryAhead)
 			{
-				// try next segment middle.	
+				// try next segment middle.
 				const PathNode *next = closeNext->getNextOptimized();
-				if (next) 
+				if (next)
 				{
 					Coord3D tryPos;
 					tryPos.x = (nextNodePos->x + next->getPosition()->x) * 0.5;
 					tryPos.y = (nextNodePos->y + next->getPosition()->y) * 0.5;
 					tryPos.z = nextNodePos->z;
-					CRCDEBUG_LOG(("Path::computePointOnPath() calling isLinePassable() 2\n"));
-					if (veryClose || TheAI->pathfinder()->isLinePassable( obj, locomotorSet.getValidSurfaces(), closeNext->getLayer(), pos, tryPos, false, true )) 
+					CRCDEBUG_LOG(("Path::computePointOnPath() calling isLinePassable() 2"));
+					if (veryClose || TheAI->pathfinder()->isLinePassable( obj, locomotorSet.getValidSurfaces(), closeNext->getLayer(), pos, tryPos, false, true ))
 					{
 						gotPos = true;
 						out.posOnPath = tryPos;
 					}
 				}
 			}
-		} 
-		else if (k > 0.5f) 
+		}
+		else if (k > 0.5f)
 		{
 			Real tryDist = alongPathDist + (0.5) * (segmentLength - alongPathDist);
 
@@ -983,19 +981,19 @@ void Path::computePointOnPath(
 			out.posOnPath.y = closeNodePos->y + tryDist * segmentDirNorm.y;
 			out.posOnPath.z = closeNodePos->z;
 
-			CRCDEBUG_LOG(("Path::computePointOnPath() calling isLinePassable() 3\n"));
-			if (TheAI->pathfinder()->isLinePassable( obj, locomotorSet.getValidSurfaces(), out.layer, pos, out.posOnPath, false, true )) 
+			CRCDEBUG_LOG(("Path::computePointOnPath() calling isLinePassable() 3"));
+			if (TheAI->pathfinder()->isLinePassable( obj, locomotorSet.getValidSurfaces(), out.layer, pos, out.posOnPath, false, true ))
 			{
 				k = 0.5f;
 				gotPos = true;
 			}
-		}	
+		}
 
 		// if we are on the path (k == 0), then alongPathDist == segmentLength
 		// if we are way off the path (k == 1), then alongPathDist is unchanged, and it projection of actual pos
 		alongPathDist += (1.0f - k) * (segmentLength - alongPathDist);
 
-		if (!gotPos) 
+		if (!gotPos)
 		{
 			if (alongPathDist > segmentLength)
 			{
@@ -1026,7 +1024,7 @@ void Path::computePointOnPath(
 	delta.y = out.posOnPath.y - pos.y;
 	delta.z = 0;
 	Real lenDelta = delta.length();
-	if (lenDelta > out.distAlongPath && out.distAlongPath > PATHFIND_CLOSE_ENOUGH) 
+	if (lenDelta > out.distAlongPath && out.distAlongPath > PATHFIND_CLOSE_ENOUGH)
 	{
 		out.distAlongPath = lenDelta;
 	}
@@ -1034,7 +1032,7 @@ void Path::computePointOnPath(
 	m_cpopIn = pos;
 	m_cpopOut = out;
 	m_cpopValid = true;
-	CRCDEBUG_LOG(("Path::computePointOnPath() end\n"));
+	CRCDEBUG_LOG(("Path::computePointOnPath() end"));
 
 }
 
@@ -1101,14 +1099,45 @@ Real Path::computeFlightDistToGoal( const Coord3D *pos, Coord3D& goalPos )
 }
 //-----------------------------------------------------------------------------------
 
-enum { PATHFIND_CELLS_PER_FRAME=5000}; // Number of cells we will search pathfinding per frame.
-enum {CELL_INFOS_TO_ALLOCATE = 30000};
 PathfindCellInfo *PathfindCellInfo::s_infoArray = NULL;
-PathfindCellInfo *PathfindCellInfo::s_firstFree = NULL;						
+PathfindCellInfo *PathfindCellInfo::s_firstFree = NULL;
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+// TheSuperHackers @info This variable is here so the code will run down the retail compatible path till a failure mode is hit
+// The pathfinding will then switch over to the corrected pathfinding code for SH clients
+Bool s_useFixedPathfinding = false;
+Bool s_forceCleanCells = false;
+
+void PathfindCellInfo::forceCleanPathFindCellInfos()
+{
+	for (Int i = 0; i < CELL_INFOS_TO_ALLOCATE - 1; i++) {
+		s_infoArray[i].m_nextOpen = NULL;
+		s_infoArray[i].m_prevOpen = NULL;
+		s_infoArray[i].m_open = FALSE;
+		s_infoArray[i].m_closed = FALSE;
+	}
+}
+
+void Pathfinder::forceCleanCells()
+{
+	PathfindCellInfo::forceCleanPathFindCellInfos();
+	m_openList = NULL;
+	m_closedList = NULL;
+
+	for (int j = 0; j <= m_extent.hi.y; ++j) {
+		for (int i = 0; i <= m_extent.hi.x; ++i) {
+			if (m_map[i][j].hasInfo()) {
+				m_map[i][j].releaseInfo();
+			}
+		}
+	}
+}
+#endif
+
 /**
  * Allocates a pool of pathfind cell infos.
  */
-void PathfindCellInfo::allocateCellInfos(void) 
+void PathfindCellInfo::allocateCellInfos(void)
 {
 	releaseCellInfos();
 	s_infoArray = MSGNEW("PathfindCellInfo") PathfindCellInfo[CELL_INFOS_TO_ALLOCATE];	// pool[]ify
@@ -1117,14 +1146,14 @@ void PathfindCellInfo::allocateCellInfos(void)
 	s_firstFree = s_infoArray;
 	for (Int i=0; i<CELL_INFOS_TO_ALLOCATE-1; i++) {
 		s_infoArray[i].m_pathParent = &s_infoArray[i+1];
-		s_infoArray[i].m_isFree = true; 
+		s_infoArray[i].m_isFree = true;
 	}
 }
 
 /**
  * Releases a pool of pathfind cell infos.
  */
-void PathfindCellInfo::releaseCellInfos(void) 
+void PathfindCellInfo::releaseCellInfos(void)
 {
 	if (s_infoArray==NULL) {
 		return; // haven't allocated any yet.
@@ -1144,7 +1173,7 @@ void PathfindCellInfo::releaseCellInfos(void)
 /**
  * Gets a pathfindcellinfo.
  */
-PathfindCellInfo *PathfindCellInfo::getACellInfo(PathfindCell *cell,const ICoord2D &pos) 
+PathfindCellInfo *PathfindCellInfo::getACellInfo(PathfindCell *cell,const ICoord2D &pos)
 {
 	PathfindCellInfo *info = s_firstFree;
 	if (s_firstFree) {
@@ -1157,7 +1186,7 @@ PathfindCellInfo *PathfindCellInfo::getACellInfo(PathfindCell *cell,const ICoord
 		info->m_nextOpen = NULL;
 		info->m_prevOpen = NULL;
 		info->m_pathParent = NULL;
-		info->m_costSoFar = 0;		
+		info->m_costSoFar = 0;
 		info->m_totalCost = 0;
 		info->m_open = 0;
 		info->m_closed = 0;
@@ -1175,7 +1204,7 @@ PathfindCellInfo *PathfindCellInfo::getACellInfo(PathfindCell *cell,const ICoord
 /**
  * Returns a pathfindcellinfo.
  */
-void PathfindCellInfo::releaseACellInfo(PathfindCellInfo *theInfo) 
+void PathfindCellInfo::releaseACellInfo(PathfindCellInfo *theInfo)
 {
 	DEBUG_ASSERTCRASH(!theInfo->m_isFree, ("Shouldn't be free."));
 	//@ todo -fix this assert on usa04.  jba.
@@ -1191,15 +1220,15 @@ void PathfindCellInfo::releaseACellInfo(PathfindCellInfo *theInfo)
  * Constructor
  */
 PathfindCell::PathfindCell( void ) :m_info(NULL)
-{ 
+{
 	reset();
 }
 
 /**
  * Destructor
  */
-PathfindCell::~PathfindCell( void ) 
-{ 	
+PathfindCell::~PathfindCell( void )
+{
 	if (m_info) PathfindCellInfo::releaseACellInfo(m_info);
 	m_info = NULL;
 	static Bool warn = true;
@@ -1212,9 +1241,9 @@ PathfindCell::~PathfindCell( void )
 /**
  * Reset the cell to default values
  */
-void PathfindCell::reset( ) 
-{ 
-	m_type = PathfindCell::CELL_CLEAR; 
+void PathfindCell::reset( )
+{
+	m_type = PathfindCell::CELL_CLEAR;
 	m_flags = PathfindCell::NO_UNITS;
 	m_zone = 0;
 	m_aircraftGoal = false;
@@ -1226,14 +1255,14 @@ void PathfindCell::reset( )
 	}
 	m_connectsToLayer = LAYER_INVALID;
 	m_layer = LAYER_GROUND;
-	
+
 }
 
 /**
  * Reset the pathfinding values in the cell.
  */
-Bool PathfindCell::startPathfind( PathfindCell *goalCell  ) 
-{ 
+Bool PathfindCell::startPathfind( PathfindCell *goalCell  )
+{
 	DEBUG_ASSERTCRASH(m_info, ("Has to have info."));
 	m_info->m_nextOpen = NULL;
 	m_info->m_prevOpen = NULL;
@@ -1243,15 +1272,22 @@ Bool PathfindCell::startPathfind( PathfindCell *goalCell  )
 	if (goalCell) {
 		m_info->m_totalCost = costToGoal( goalCell );
 	}
-	m_info->m_open = TRUE;
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		m_info->m_open = TRUE;
+	} else
+#endif
+	{
+		m_info->m_open = FALSE;
+	}
 	m_info->m_closed = FALSE;
 	return true;
 }
 /**
  * Set the parent pointer.
  */
-void PathfindCell::setParentCell( PathfindCell* parent  ) 
-{ 
+void PathfindCell::setParentCell( PathfindCell* parent  )
+{
 	DEBUG_ASSERTCRASH(m_info, ("Has to have info."));
 	m_info->m_pathParent = parent->m_info;
 	Int dx = m_info->m_pos.x - parent->m_info->m_pos.x;
@@ -1264,8 +1300,8 @@ void PathfindCell::setParentCell( PathfindCell* parent  )
 /**
  * Set the parent pointer.
  */
-void PathfindCell::setParentCellHierarchical( PathfindCell* parent  ) 
-{ 
+void PathfindCell::setParentCellHierarchical( PathfindCell* parent  )
+{
 	DEBUG_ASSERTCRASH(m_info, ("Has to have info."));
 	m_info->m_pathParent = parent->m_info;
 }
@@ -1273,8 +1309,8 @@ void PathfindCell::setParentCellHierarchical( PathfindCell* parent  )
 /**
  * Reset the parent cell.
  */
-void PathfindCell::clearParentCell( void  ) 
-{ 
+void PathfindCell::clearParentCell( void  )
+{
 	DEBUG_ASSERTCRASH(m_info, ("Has to have info."));
 	m_info->m_pathParent = NULL;
 }
@@ -1283,49 +1319,59 @@ void PathfindCell::clearParentCell( void  )
 /**
  * Allocates an info record for a cell.
  */
-Bool PathfindCell::allocateInfo( const ICoord2D &pos ) 
-{ 
+Bool PathfindCell::allocateInfo( const ICoord2D &pos )
+{
 	if (!m_info) {
 		m_info = PathfindCellInfo::getACellInfo(this, pos);
 		return (m_info != NULL);
-	} 
+	}
 	return true;
 }
 
 /**
  * Releases an info record for a cell.
  */
-void PathfindCell::releaseInfo( void ) 
-{ 
-	if (m_type==PathfindCell::CELL_OBSTACLE) {
-		return;
+void PathfindCell::releaseInfo(void)
+{
+	// TheSuperHackers @bugfix Mauller/SkyAero 05/06/2025 Parent cell links need clearing to prevent dangling pointers on starting points that can link them to an invalid parent cell.
+	// Parent cells are only cleared within Pathfinder::prependCells, so cells that do not make it onto the final path do not get their parent cell cleared.
+	// Cells with a special flags also do not get their PathfindCellInfo cleared and therefore can leave a parent cell set on a starting cell.
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (s_useFixedPathfinding)
+#endif
+	{
+		if (m_info) {
+			m_info->m_pathParent = NULL;
+		}
 	}
-	if (m_flags!=NO_UNITS) {
+
+	if (m_type == PathfindCell::CELL_OBSTACLE || m_flags != NO_UNITS || m_aircraftGoal) {
 		return;
 	}
-	if (m_aircraftGoal) {
+
+	if (!m_info) {
 		return;
 	}
 
-	if (m_info) {
-		DEBUG_ASSERTCRASH(m_info->m_prevOpen==NULL && m_info->m_nextOpen==NULL, ("Shouldn't be linked."));
-		DEBUG_ASSERTCRASH(m_info->m_open==NULL && m_info->m_closed==NULL, ("Shouldn't be linked."));
-		DEBUG_ASSERTCRASH(m_info->m_goalUnitID==INVALID_ID && m_info->m_posUnitID==INVALID_ID, ("Shouldn't be occupied."));
-		DEBUG_ASSERTCRASH(m_info->m_goalAircraftID==INVALID_ID , ("Shouldn't be occupied by aircraft."));
-		if (m_info->m_prevOpen || m_info->m_nextOpen || m_info->m_open || m_info->m_closed) {
-			// Bad release.  Skip for now, better leak than crash.  jba.
-			return;
-		}
-		PathfindCellInfo::releaseACellInfo(m_info);
-		m_info = NULL;
+	DEBUG_ASSERTCRASH(m_info->m_prevOpen==NULL && m_info->m_nextOpen==NULL, ("Shouldn't be linked."));
+	DEBUG_ASSERTCRASH(m_info->m_open==NULL && m_info->m_closed==NULL, ("Shouldn't be linked."));
+	DEBUG_ASSERTCRASH(m_info->m_goalUnitID==INVALID_ID && m_info->m_posUnitID==INVALID_ID, ("Shouldn't be occupied."));
+	DEBUG_ASSERTCRASH(m_info->m_goalAircraftID==INVALID_ID , ("Shouldn't be occupied by aircraft."));
+	if (m_info->m_prevOpen || m_info->m_nextOpen || m_info->m_open || m_info->m_closed) {
+		// Bad release.  Skip for now, better leak than crash.  jba.
+		return;
 	}
+
+	PathfindCellInfo::releaseACellInfo(m_info);
+	m_info = NULL;
+
 }
 
 /**
  * Sets the goal unit into the info record for a cell.
  */
-void PathfindCell::setGoalUnit(ObjectID unitID, const ICoord2D &pos ) 
-{ 
+void PathfindCell::setGoalUnit(ObjectID unitID, const ICoord2D &pos )
+{
 	if (unitID==INVALID_ID) {
 		// removing goal.
 		if (m_info) {
@@ -1348,7 +1394,7 @@ void PathfindCell::setGoalUnit(ObjectID unitID, const ICoord2D &pos )
 			allocateInfo(pos);
 		}
 		if (!m_info) {
-			DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
+			DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
 			return;
 		}
 		m_info->m_goalUnitID = unitID;
@@ -1366,8 +1412,8 @@ void PathfindCell::setGoalUnit(ObjectID unitID, const ICoord2D &pos )
 /**
  * Sets the goal aircraft into the info record for a cell.
  */
-void PathfindCell::setGoalAircraft(ObjectID unitID, const ICoord2D &pos ) 
-{ 
+void PathfindCell::setGoalAircraft(ObjectID unitID, const ICoord2D &pos )
+{
 	if (unitID==INVALID_ID) {
 		// removing goal.
 		if (m_info) {
@@ -1384,7 +1430,7 @@ void PathfindCell::setGoalAircraft(ObjectID unitID, const ICoord2D &pos )
 			allocateInfo(pos);
 		}
 		if (!m_info) {
-			DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
+			DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
 			return;
 		}
 		m_info->m_goalAircraftID = unitID;
@@ -1396,8 +1442,8 @@ void PathfindCell::setGoalAircraft(ObjectID unitID, const ICoord2D &pos )
 /**
  * Sets the position unit into the info record for a cell.
  */
-void PathfindCell::setPosUnit(ObjectID unitID, const ICoord2D &pos ) 
-{ 
+void PathfindCell::setPosUnit(ObjectID unitID, const ICoord2D &pos )
+{
 	if (unitID==INVALID_ID) {
 		// removing position.
 		if (m_info) {
@@ -1420,7 +1466,7 @@ void PathfindCell::setPosUnit(ObjectID unitID, const ICoord2D &pos )
 			allocateInfo(pos);
 		}
 		if (!m_info) {
-			DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba. "));
+			DEBUG_CRASH(("Ran out of pathfind cells - fatal error!!!!! jba."));
 			return;
 		}
 		if (m_info->m_goalUnitID!=INVALID_ID && (m_info->m_goalUnitID==m_info->m_posUnitID)) {
@@ -1450,7 +1496,7 @@ Bool PathfindCell::setTypeAsObstacle( Object *obstacle, Bool isFence, const ICoo
 	}
 
 	Bool isRubble = false;
-	if (obstacle->getBodyModule() && obstacle->getBodyModule()->getDamageState() == BODY_RUBBLE) 
+	if (obstacle->getBodyModule() && obstacle->getBodyModule()->getDamageState() == BODY_RUBBLE)
 	{
 		isRubble = true;
 	}
@@ -1493,7 +1539,7 @@ void PathfindCell::setType( CellType type )
 
 /**
  * Unflag this cell as an obstacle, from the given one.
- * Return true if this cell was previously flagged as an obstacle by this object. 
+ * Return true if this cell was previously flagged as an obstacle by this object.
  */
 Bool PathfindCell::removeObstacle( Object *obstacle )
 {
@@ -1523,8 +1569,18 @@ PathfindCell *PathfindCell::putOnSortedOpenList( PathfindCell *list )
 	{
 		// insertion sort
 		PathfindCell *c, *lastCell = NULL;
-		for( c = list; c; c = c->getNextOpen() )
+#if RETAIL_COMPATIBLE_PATHFINDING
+		// TheSuperHackers @bugfix In the retail compatible pathfinding, on rare ocassions, we get stuck in an infinite loop
+		// External code should pickup on the bad behaviour and cleanup properly, but we need to explicitly break out here
+		// The fixed pathfinding does not have this issue due to the proper cleanup of pathfindCells and their pathfindCellInfos
+		UnsignedInt cellCount = 0;
+		for (c = list; c && cellCount < PATHFIND_CELLS_PER_FRAME; c = c->getNextOpen())
 		{
+			cellCount++;
+#else
+		for (c = list; c; c = c->getNextOpen())
+		{
+#endif
 			if (c->m_info->m_totalCost > m_info->m_totalCost)
 				break;
 
@@ -1541,7 +1597,7 @@ PathfindCell *PathfindCell::putOnSortedOpenList( PathfindCell *list )
 
 			m_info->m_prevOpen = c->m_info->m_prevOpen;
 			c->m_info->m_prevOpen = this->m_info;
-				
+
 			m_info->m_nextOpen = c->m_info;
 
 		}
@@ -1568,7 +1624,7 @@ PathfindCell *PathfindCell::removeFromOpenList( PathfindCell *list )
 	DEBUG_ASSERTCRASH(m_info->m_closed==FALSE && m_info->m_open==TRUE, ("Serious error - Invalid flags. jba"));
 	if (m_info->m_nextOpen)
 		m_info->m_nextOpen->m_prevOpen = m_info->m_prevOpen;
-	
+
 	if (m_info->m_prevOpen)
 		m_info->m_prevOpen->m_nextOpen = m_info->m_nextOpen;
 	else
@@ -1591,9 +1647,21 @@ Int PathfindCell::releaseOpenList( PathfindCell *list )
 		DEBUG_ASSERTCRASH(list->m_info->m_closed==FALSE && list->m_info->m_open==TRUE, ("Serious error - Invalid flags. jba"));
 		PathfindCell *cur = list;
 		PathfindCellInfo *curInfo = list->m_info;
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+		// TheSuperHackers @info This is only here to catch a crash point in the retail compatible pathfinding
+		// One crash mode is where a cell has no PathfindCellInfo, resulting in a nullptr access and a crash.
+		// Therefore we signal that we need to clean the maps cells and the PathfindCellInfos
+		if(!curInfo && !s_useFixedPathfinding) {
+			s_useFixedPathfinding = true;
+			s_forceCleanCells = true;
+			return count;
+		}
+#endif
+
 		if (curInfo->m_nextOpen) {
 			list = curInfo->m_nextOpen->m_cell;
-		}	else {
+		} else {
 			list = NULL;
 		}
 		DEBUG_ASSERTCRASH(cur == curInfo->m_cell, ("Bad backpointer in PathfindCellInfo"));
@@ -1615,9 +1683,20 @@ Int PathfindCell::releaseClosedList( PathfindCell *list )
 		DEBUG_ASSERTCRASH(list->m_info->m_closed==TRUE && list->m_info->m_open==FALSE, ("Serious error - Invalid flags. jba"));
 		PathfindCell *cur = list;
 		PathfindCellInfo *curInfo = list->m_info;
+#if RETAIL_COMPATIBLE_PATHFINDING
+		// TheSuperHackers @info This is only here to catch a crash point in the retail compatible pathfinding
+		// One crash mode is where a cell has no PathfindCellInfo, resulting in a nullptr access and a crash.
+		// Therefore we signal that we need to clean the maps cells and the PathfindCellInfos
+		if(!curInfo && !s_useFixedPathfinding) {
+			s_useFixedPathfinding = true;
+			s_forceCleanCells = true;
+			return count;
+		}
+#endif
+
 		if (curInfo->m_nextOpen) {
 			list = curInfo->m_nextOpen->m_cell;
-		}	else {
+		} else {
 			list = NULL;
 		}
 		DEBUG_ASSERTCRASH(cur == curInfo->m_cell, ("Bad backpointer in PathfindCellInfo"));
@@ -1644,7 +1723,7 @@ PathfindCell *PathfindCell::putOnClosedList( PathfindCell *list )
 		m_info->m_nextOpen = list?list->m_info:NULL;
 		if (list)
 			list->m_info->m_prevOpen = this->m_info;
-		
+
 		list = this;
 	}
 
@@ -1658,7 +1737,7 @@ PathfindCell *PathfindCell::removeFromClosedList( PathfindCell *list )
 	DEBUG_ASSERTCRASH(m_info->m_closed==TRUE && m_info->m_open==FALSE, ("Serious error - Invalid flags. jba"));
 	if (m_info->m_nextOpen)
 		m_info->m_nextOpen->m_prevOpen = m_info->m_prevOpen;
-	
+
 	if (m_info->m_prevOpen)
 		m_info->m_prevOpen->m_nextOpen = m_info->m_nextOpen;
 	else
@@ -1741,10 +1820,20 @@ UnsignedInt PathfindCell::costSoFar( PathfindCell *parent )
 	Int numTurns = 0;
 	PathfindCell *prevCell = parent->getParentCell();
 	if (prevCell) {
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+		// TheSuperHackers @info this is a possible crash point in the retail pathfinding, we just prevent the crash at this point
+		// External code should catch the issue in another block and cleanup the pathfinding before switching to the fixed pathfinding.
+		if (!prevCell->hasInfo())
+		{
+			return cost;
+		}
+#endif
+
 		ICoord2D dir;
 		dir.x = prevCell->getXIndex() - parent->getXIndex();
 		dir.y = prevCell->getYIndex() - parent->getYIndex();
-		
+
 		// count number of direction changes
 		if (dir.x != prevDir.x || dir.y != prevDir.y)
 		{
@@ -1770,18 +1859,18 @@ inline Bool typesMatch(const PathfindCell &targetCell, const PathfindCell &sourc
 	PathfindCell::CellType targetType = targetCell.getType();
 	PathfindCell::CellType srcType = sourceCell.getType();
 	if (targetType == srcType) return true;
-	
+
 	return false;
 }
 
 inline Bool waterGround(const PathfindCell &targetCell, const PathfindCell &sourceCell) {
 	PathfindCell::CellType targetType = targetCell.getType();
 	PathfindCell::CellType srcType = sourceCell.getType();
-	if ( (targetType==PathfindCell::CELL_CLEAR && 
+	if ( (targetType==PathfindCell::CELL_CLEAR &&
 		(srcType&PathfindCell::CELL_WATER ))) {
 			return true;
 	}
-	if ( (srcType==PathfindCell::CELL_CLEAR && 
+	if ( (srcType==PathfindCell::CELL_CLEAR &&
 		(targetType&PathfindCell::CELL_WATER ))) {
 			return true;
 	}
@@ -1792,11 +1881,11 @@ inline Bool waterGround(const PathfindCell &targetCell, const PathfindCell &sour
 inline Bool groundRubble(const PathfindCell &targetCell, const PathfindCell &sourceCell) {
 	PathfindCell::CellType targetType = targetCell.getType();
 	PathfindCell::CellType srcType = sourceCell.getType();
-	if ( (targetType==PathfindCell::CELL_CLEAR && 
+	if ( (targetType==PathfindCell::CELL_CLEAR &&
 		(srcType==PathfindCell::CELL_RUBBLE ))) {
 			return true;
 	}
-	if ( (srcType==PathfindCell::CELL_CLEAR && 
+	if ( (srcType==PathfindCell::CELL_CLEAR &&
 		(targetType==PathfindCell::CELL_RUBBLE ))) {
 			return true;
 	}
@@ -1838,12 +1927,12 @@ inline Bool crusherGround(const PathfindCell &targetCell, const PathfindCell &so
 inline Bool groundCliff(const PathfindCell &targetCell, const PathfindCell &sourceCell) {
 	PathfindCell::CellType targetType = targetCell.getType();
 	PathfindCell::CellType srcType = sourceCell.getType();
-	
-	if ( (targetType==PathfindCell::CELL_CLIFF ) && 
+
+	if ( (targetType==PathfindCell::CELL_CLIFF ) &&
 			 (srcType==PathfindCell::CELL_CLEAR) ) {
 			return true;
 	}
-	if ( (targetType==PathfindCell::CELL_CLEAR ) && 
+	if ( (targetType==PathfindCell::CELL_CLEAR ) &&
 			 (srcType==PathfindCell::CELL_CLIFF) ) {
 			return true;
 	}
@@ -1886,7 +1975,7 @@ static void __fastcall resolveZones(Int srcZone, Int targetZone, zoneStorageType
 		finalZone = zoneEquivalency[srcZone];
 	}
 	DEBUG_ASSERTCRASH(finalZone<sizeOfZE ,  ("Bad resolve zones	."));
-	for (i=0; i<sizeOfZE; i++) { 
+	for (i=0; i<sizeOfZE; i++) {
 		zoneStorageType ze = zoneEquivalency[i];
 		if (ze == targetZone || ze == srcZone) {
 			zoneEquivalency[i] = finalZone;
@@ -1920,7 +2009,6 @@ inline void applyZone(PathfindCell &targetCell, const PathfindCell &sourceCell,
 {
 	DEBUG_ASSERTCRASH(sourceCell.getZone()!=0, ("Unset source zone."));
 	Int srcZone = zoneEquivalency[sourceCell.getZone()];
-	//DEBUG_ASSERTCRASH(srcZone!=0, ("Bad zone equivalency zone."));
 	Int targetZone = zoneEquivalency[targetCell.getZone()];
 
 	if (targetZone == 0) {
@@ -1936,7 +2024,7 @@ inline void applyZone(PathfindCell &targetCell, const PathfindCell &sourceCell,
 
 inline void applyBlockZone(PathfindCell &targetCell, const PathfindCell &sourceCell,
 													 zoneStorageType *zoneEquivalency, Int firstZone, Int sizeOfZE)
-{	
+{
 	DEBUG_ASSERTCRASH(sourceCell.getZone()>=firstZone && sourceCell.getZone()<firstZone+sizeOfZE, ("Memory overrun - FATAL ERROR."));
 	Int srcZone = zoneEquivalency[sourceCell.getZone()-firstZone];
 	DEBUG_ASSERTCRASH(targetCell.getZone()>=firstZone && sourceCell.getZone()<firstZone+sizeOfZE, ("Memory overrun - FATAL ERROR."));
@@ -1949,52 +2037,44 @@ inline void applyBlockZone(PathfindCell &targetCell, const PathfindCell &sourceC
 }
 
 //------------------------  ZoneBlock  -------------------------------
-ZoneBlock::ZoneBlock() : m_firstZone(0), 
-m_numZones(0), 
-m_groundCliffZones(NULL), 
-m_groundWaterZones(NULL), 
-m_groundRubbleZones(NULL), 
-m_crusherZones(NULL), 
+ZoneBlock::ZoneBlock() : m_firstZone(0),
+m_numZones(0),
+m_groundCliffZones(NULL),
+m_groundWaterZones(NULL),
+m_groundRubbleZones(NULL),
+m_crusherZones(NULL),
 m_zonesAllocated(0),
 m_interactsWithBridge(FALSE)
-{		
+{
 	m_cellOrigin.x = 0;
 	m_cellOrigin.y = 0;
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_firstZone = 0;
 	m_markedPassable = TRUE;
-	//
 }
 
-ZoneBlock::~ZoneBlock()  
+ZoneBlock::~ZoneBlock()
 {
 	freeZones();
 }
 
-void ZoneBlock::freeZones(void) 
+void ZoneBlock::freeZones(void)
 {
-	if (m_groundCliffZones) {
-		delete [] m_groundCliffZones;
-		m_groundCliffZones = NULL;
-	}
-	if (m_groundWaterZones) {
-		delete [] m_groundWaterZones;
-		m_groundWaterZones = NULL;
-	}
-	if (m_groundRubbleZones) {
-		delete [] m_groundRubbleZones;
-		m_groundRubbleZones = NULL;
-	}
-	if (m_crusherZones) {
-		delete [] m_crusherZones;
-		m_crusherZones = NULL;
-	}
+	delete [] m_groundCliffZones;
+	m_groundCliffZones = NULL;
+
+	delete [] m_groundWaterZones;
+	m_groundWaterZones = NULL;
+
+	delete [] m_groundRubbleZones;
+	m_groundRubbleZones = NULL;
+
+	delete [] m_crusherZones;
+	m_crusherZones = NULL;
 }
 
 /* Allocate zone equivalency arrays large enough to hold required entries.  If the arrays are already
 large enough, reuse.  Then calculate terrain equivalencies. */
-void ZoneBlock::blockCalculateZones(PathfindCell **map, PathfindLayer layers[], const IRegion2D &bounds) 
+void ZoneBlock::blockCalculateZones(PathfindCell **map, PathfindLayer layers[], const IRegion2D &bounds)
 {
 	Int i, j;
 	m_cellOrigin = bounds.lo;
@@ -2058,13 +2138,13 @@ void ZoneBlock::blockCalculateZones(PathfindCell **map, PathfindLayer layers[],
 			DEBUG_ASSERTCRASH(map[i][j].getZone() != 0, ("Cleared the zone."));
 		}
 	}
-	
+
 }
 
 //
 // Return the zone at this location.
 //
-zoneStorageType ZoneBlock::getEffectiveZone( LocomotorSurfaceTypeMask acceptableSurfaces, 
+zoneStorageType ZoneBlock::getEffectiveZone( LocomotorSurfaceTypeMask acceptableSurfaces,
 																					 Bool crusher, zoneStorageType zone) const
 {
 	if (zone==PathfindZoneManager::UNINITIALIZED_ZONE) {
@@ -2077,7 +2157,7 @@ zoneStorageType ZoneBlock::getEffectiveZone( LocomotorSurfaceTypeMask acceptable
 			(acceptableSurfaces&LOCOMOTORSURFACE_WATER) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_CLIFF)) {
 		// Locomotors can go on ground, water & cliff, so all is zone 1.
-		return 1; 
+		return 1;
 	}
 	if (m_numZones<2) {
 		return m_firstZone; // if we only got 1 zone, it's all the same zone.
@@ -2098,7 +2178,7 @@ zoneStorageType ZoneBlock::getEffectiveZone( LocomotorSurfaceTypeMask acceptable
 		// Locomotors can go on ground & cliff, so use the ground cliff combiner.
 		zone = m_groundCliffZones[zone];
 		DEBUG_ASSERTCRASH(zone >=m_firstZone && zone < m_firstZone+m_numZones, ("Invalid range."));
-		return zone; 
+		return zone;
 	}
 
 	if ( (acceptableSurfaces&LOCOMOTORSURFACE_GROUND) &&
@@ -2106,20 +2186,20 @@ zoneStorageType ZoneBlock::getEffectiveZone( LocomotorSurfaceTypeMask acceptable
 		// Locomotors can go on ground & water, so use the ground water combiner.
 		zone = m_groundWaterZones[zone];
 		DEBUG_ASSERTCRASH(zone >=m_firstZone && zone < m_firstZone+m_numZones, ("Invalid range."));
-		return zone; 
+		return zone;
 	}
 
 	if ( (acceptableSurfaces&LOCOMOTORSURFACE_GROUND) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_RUBBLE)) {
 		// Locomotors can go on ground & rubble, so use the ground rubble combiner.
 		zone = m_groundRubbleZones[zone];
-		return zone; 
+		return zone;
 	}
 
 	if ( (acceptableSurfaces&LOCOMOTORSURFACE_CLIFF) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_WATER)) {
 		// Locomotors can go on ground & cliff, so use the ground cliff combiner.
-		DEBUG_CRASH(("Cliff water only locomotor sets not supported yet.")); 
+		DEBUG_CRASH(("Cliff water only locomotor sets not supported yet."));
 	}
 
 	return zone+m_firstZone;
@@ -2128,7 +2208,7 @@ zoneStorageType ZoneBlock::getEffectiveZone( LocomotorSurfaceTypeMask acceptable
 
 /* Allocate zone equivalency arrays large enough to hold m_maxZone entries.  If the arrays are already
 large enough, just return. */
-void ZoneBlock::allocateZones(void) 
+void ZoneBlock::allocateZones(void)
 {
 	if (m_zonesAllocated>m_numZones && m_groundCliffZones!=NULL) {
 		return;
@@ -2138,7 +2218,7 @@ void ZoneBlock::allocateZones(void)
 	if (m_numZones==1) {
 		return; // we don't need any zone equivalency tables.
 	}
-	
+
 	if (m_zonesAllocated == 0) {
 		m_zonesAllocated = 4;
 	}
@@ -2154,87 +2234,79 @@ void ZoneBlock::allocateZones(void)
 
 
 //------------------------  PathfindZoneManager  -------------------------------
-PathfindZoneManager::PathfindZoneManager() : m_maxZone(0), 
-m_nextFrameToCalculateZones(0), 
-m_groundCliffZones(NULL), 
-m_groundWaterZones(NULL), 
-m_groundRubbleZones(NULL), 
-m_terrainZones(NULL), 
-m_crusherZones(NULL), 
-m_hierarchicalZones(NULL), 
+PathfindZoneManager::PathfindZoneManager() : m_maxZone(0),
+m_nextFrameToCalculateZones(0),
+m_groundCliffZones(NULL),
+m_groundWaterZones(NULL),
+m_groundRubbleZones(NULL),
+m_terrainZones(NULL),
+m_crusherZones(NULL),
+m_hierarchicalZones(NULL),
 m_blockOfZoneBlocks(NULL),
 m_zoneBlocks(NULL),
 m_zonesAllocated(0)
-{		
+{
 	m_zoneBlockExtent.x = 0;
 	m_zoneBlockExtent.y = 0;
 }
 
-PathfindZoneManager::~PathfindZoneManager()  
+PathfindZoneManager::~PathfindZoneManager()
 {
 	freeZones();
 	freeBlocks();
 }
 
-void PathfindZoneManager::freeZones() 
+void PathfindZoneManager::freeZones()
 {
-	if (m_groundCliffZones) {
-		delete [] m_groundCliffZones;
-		m_groundCliffZones = NULL;
-	}
-	if (m_groundWaterZones) {
-		delete [] m_groundWaterZones;
-		m_groundWaterZones = NULL;
-	}
-	if (m_groundRubbleZones) {
-		delete [] m_groundRubbleZones;
-		m_groundRubbleZones = NULL;
-	}
-	if (m_terrainZones) {
-		delete [] m_terrainZones;
-		m_terrainZones = NULL;
-	}
-	if (m_crusherZones) {
-		delete [] m_crusherZones;
-		m_crusherZones = NULL;
-	}
-	if (m_hierarchicalZones) {
-		delete [] m_hierarchicalZones;
-		m_hierarchicalZones = NULL;
-	}
+	delete [] m_groundCliffZones;
+	m_groundCliffZones = NULL;
+
+	delete [] m_groundWaterZones;
+	m_groundWaterZones = NULL;
+
+	delete [] m_groundRubbleZones;
+	m_groundRubbleZones = NULL;
+
+	delete [] m_terrainZones;
+	m_terrainZones = NULL;
+
+	delete [] m_crusherZones;
+	m_crusherZones = NULL;
+
+	delete [] m_hierarchicalZones;
+	m_hierarchicalZones = NULL;
+
 	m_zonesAllocated = 0;
 }
 
-void PathfindZoneManager::freeBlocks() 
+void PathfindZoneManager::freeBlocks()
 {
-	if (m_blockOfZoneBlocks) {
-		delete [] m_blockOfZoneBlocks;
-		m_blockOfZoneBlocks = NULL;
-	}
-	if (m_zoneBlocks) {
-		delete [] m_zoneBlocks;
-		m_zoneBlocks = NULL;
-	}
+	delete [] m_blockOfZoneBlocks;
+	m_blockOfZoneBlocks = NULL;
+
+	delete [] m_zoneBlocks;
+	m_zoneBlocks = NULL;
+
 	m_zoneBlockExtent.x = 0;
 	m_zoneBlockExtent.y = 0;
 }
 
 /* Allocate zone equivalency arrays large enough to hold m_maxZone entries.  If the arrays are already
 large enough, just return. */
-void PathfindZoneManager::allocateZones(void) 
+void PathfindZoneManager::allocateZones(void)
 {
 	if (m_zonesAllocated>m_maxZone && m_groundCliffZones!=NULL) {
 		return;
 	}
 	freeZones();
-	
+
 	if (m_zonesAllocated == 0) {
 		m_zonesAllocated = INITIAL_ZONES;
 	}
 	while (m_zonesAllocated <= m_maxZone) {
 		m_zonesAllocated *= 2;
 	}
-	DEBUG_LOG(("Allocating zone tables of size %d\n", m_zonesAllocated));
+	DEBUG_LOG(("Allocating zone tables of size %d", m_zonesAllocated));
 	// pool[]ify
 	m_groundCliffZones = MSGNEW("PathfindZoneInfo") zoneStorageType[m_zonesAllocated];
 	m_groundWaterZones = MSGNEW("PathfindZoneInfo") zoneStorageType[m_zonesAllocated];
@@ -2245,7 +2317,7 @@ void PathfindZoneManager::allocateZones(void)
 }
 
 /* Allocate zone blocks for hierarchical pathfinding.   */
-void PathfindZoneManager::allocateBlocks(const IRegion2D &globalBounds) 
+void PathfindZoneManager::allocateBlocks(const IRegion2D &globalBounds)
 {
 	freeBlocks();
 
@@ -2264,7 +2336,7 @@ void PathfindZoneManager::reset(void)  ///< Called when the map is reset.
 {
 	freeZones();
 	freeBlocks();
-} 
+}
 
 
 void PathfindZoneManager::markZonesDirty( Bool insert )  ///< Called when the zones need to be recalculated.
@@ -2274,33 +2346,27 @@ void PathfindZoneManager::markZonesDirty( Bool insert )  ///< Called when the zo
 		m_nextFrameToCalculateZones = 2;
 		return;
 	}
-//  if ( insert )
-//  	m_nextFrameToCalculateZones = TheGameLogic->getFrame();
-//  else
     m_nextFrameToCalculateZones = MIN( m_nextFrameToCalculateZones, TheGameLogic->getFrame() + ZONE_UPDATE_FREQUENCY );
-} 
+}
 
 /**
  * Calculate zones.  A zone is an area of the same terrain - clear, water or cliff.
- * The utility of zones is that if current location and destiontion are in the same zone, 
+ * The utility of zones is that if current location and destiontion are in the same zone,
  * you can successfully pathfind.
  * If you are a multiple terrain vehicle, like amphibious transport, the lookup is a little more
  * complicated.
  */
 
-
-
 #define dont_forceRefreshCalling
 #ifdef forceRefreshCalling
 static  Bool  s_stopForceCalling = FALSE;
 #endif
 
-
 void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer layers[], const IRegion2D &globalBounds )
 {
 
 #ifdef DEBUG_QPF
-#if defined(DEBUG_LOGGING) 
+#if defined(DEBUG_LOGGING)
 	__int64 startTime64;
 	static double timeToUpdate = 0.0f;
   static double averageTimeToUpdate = 0.0f;
@@ -2311,7 +2377,6 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 #endif
 #endif
 
-
 	m_maxZone = 1;	// we start using zone 0 as a flag.
 	const Int maxZones=24000;
 	zoneStorageType zoneEquivalency[maxZones];
@@ -2340,10 +2405,6 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 			if (bounds.hi.y > globalBounds.hi.y) {
 				bounds.hi.y = globalBounds.hi.y;
 			}
-//			if (bounds.lo.x>bounds.hi.x || bounds.lo.y>bounds.hi.y) {
-//				DEBUG_CRASH(("Incorrect bounds calculation. Logic error, fix me. jba."));
-//				continue;
-//			}
 			m_zoneBlocks[xBlock][yBlock].setInteractsWithBridge(false);
 			for( j=bounds.lo.y; j<=bounds.hi.y; j++ )	{
 				for( i=bounds.lo.x; i<=bounds.hi.x; i++ )	{
@@ -2363,25 +2424,17 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 					if (cell->getZone()==0) {
 						cell->setZone(m_maxZone);
 						m_maxZone++;
-//						if (m_maxZone>= maxZones) {
-//							DEBUG_CRASH(("Ran out of pathfind zones.  SERIOUS ERROR! jba."));
-//							break;
-//						}
 					}
 					if (cell->getConnectLayer() > LAYER_GROUND) {
  						m_zoneBlocks[xBlock][yBlock].setInteractsWithBridge(true);
 					}
-					
+
 				}
 			}
-			//DEBUG_LOG(("Collapsed zones %d\n", m_maxZone));
  		}
 	}
 
 	Int totalZones = m_maxZone;
-//	if (totalZones>maxZones/2) {
-//		DEBUG_LOG(("Max zones %d\n", m_maxZone));
-//	}
 
 	// Collapse the zones into a 1,2,3... sequence, removing collapsed zones.
 	m_maxZone = 1;
@@ -2389,88 +2442,41 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 	collapsedZones[0] = 0;
 
   i = 1;
-  while ( i < totalZones ) 
+  while ( i < totalZones )
   {
 		Int zone = zoneEquivalency[ i ];
-		if (zone == i) 
+		if (zone == i)
     {
 			collapsedZones[ i ] = m_maxZone;
 			++m_maxZone;
-		}	
-    else 
+		}
+    else
 			collapsedZones[ i ] = collapsedZones[zone];
 
     ++i;
   }
 
-//	for (i=1; i<totalZones; i++) {
-//		Int zone = zoneEquivalency[i];
-//		if (zone == i) {
-//			collapsedZones[i] = m_maxZone;
-//			++m_maxZone;
-//		}	else {
-//			collapsedZones[i] = collapsedZones[zone];
-//		}
-//	}
-  
-
-
-
-
-
-//#ifdef DEBUG_QPF
-//#if defined(DEBUG_LOGGING)
-//	QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
-//	timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
-//	DEBUG_LOG(("Time to calculate first %f\n", timeToUpdate));
-//#endif
-//#endif
-
-
-
-
-
-
 	// Now map the zones in the map back into the collapsed zones.
 	j=globalBounds.lo.y;
-  while( j<=globalBounds.hi.y )	
+  while( j<=globalBounds.hi.y )
   {
     i=globalBounds.lo.x;
-		while( i<=globalBounds.hi.x )	
+		while( i<=globalBounds.hi.x )
     {
       PathfindCell &cell = map[i][j];
 			cell.setZone(collapsedZones[cell.getZone()]);
-			
-      //if (cell.getZone()==0) 
-      //{
-			//	DEBUG_CRASH(("Zone not set cell %d, %d", i, j));
-			//}
       ++i;
 		}
     ++j;
 	}
 
-//	for( j=globalBounds.lo.y; j<=globalBounds.hi.y; j++ )	{
-//		for( i=globalBounds.lo.x; i<=globalBounds.hi.x; i++ )	{
-//			map[i][j].setZone(collapsedZones[map[i][j].getZone()]);
-////			if (map[i][j].getZone()==0) {
-////				DEBUG_CRASH(("Zone not set cell %d, %d", i, j));
-////			}
-//		}
-//	}
-
-
-
-
-
-
   i = 0;
-	while ( i <= LAYER_LAST ) 
+	while ( i <= LAYER_LAST )
   {
     PathfindLayer &r_thisLayer = layers[i];
 
 		Int zone = collapsedZones[r_thisLayer.getZone()];
-		if (zone == 0) 
+		if (zone == 0)
     {
 			zone = m_maxZone;
 			m_maxZone++;
@@ -2478,215 +2484,93 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 
     r_thisLayer.setZone( zone );
     r_thisLayer.applyZone();
-		
-    if (!r_thisLayer.isUnused() && !r_thisLayer.isDestroyed()) 
+
+    if (!r_thisLayer.isUnused() && !r_thisLayer.isDestroyed())
     {
 			ICoord2D ndx;
 			r_thisLayer.getStartCellIndex(&ndx);
-			setBridge(ndx.x, ndx.y, true);	
+			setBridge(ndx.x, ndx.y, true);
 			r_thisLayer.getEndCellIndex(&ndx);
-			setBridge(ndx.x, ndx.y, true);	
+			setBridge(ndx.x, ndx.y, true);
 		}
 
     ++i;
 	}
 
-//	for (i=0; i<=LAYER_LAST; i++) {
-//		Int zone = collapsedZones[layers[i].getZone()];
-//		if (zone == 0) {
-//			zone = m_maxZone;
-//			m_maxZone++;
-//		}
-//		layers[i].setZone( zone );
-////		if (!layers[i].isUnused() && !layers[i].isDestroyed() && layers[i].getZone()==0) {
-////			DEBUG_CRASH(("Zone not set Layer %d", i));
-////		}
-//		layers[i].applyZone();
-//		if (!layers[i].isUnused() && !layers[i].isDestroyed()) {
-//			ICoord2D ndx;
-//			layers[i].getStartCellIndex(&ndx);
-//			setBridge(ndx.x, ndx.y, true);	
-//			layers[i].getEndCellIndex(&ndx);
-//			setBridge(ndx.x, ndx.y, true);	
-//		}
-//	}
-
-
-
-
-
-
 	allocateZones();
 
-
-
-//	DEBUG_ASSERTCRASH(xBlock==m_zoneBlockExtent.x && yBlock==m_zoneBlockExtent.y, ("Inconsistent allocation - SERIOUS ERROR. jba"));
-	for (xBlock=0; xBlock<xCount; xBlock++) 
+	for (xBlock=0; xBlock<xCount; xBlock++)
   {
-		for (yBlock=0; yBlock<yCount; yBlock++) 
+		for (yBlock=0; yBlock<yCount; yBlock++)
     {
 			IRegion2D bounds;
 			bounds.lo.x = globalBounds.lo.x + xBlock*ZONE_BLOCK_SIZE;
 			bounds.lo.y = globalBounds.lo.y + yBlock*ZONE_BLOCK_SIZE;
 			bounds.hi.x = bounds.lo.x + ZONE_BLOCK_SIZE - 1; // bounds are inclusive.
 			bounds.hi.y = bounds.lo.y + ZONE_BLOCK_SIZE - 1; // bounds are inclusive.
-			
-      if (bounds.hi.x > globalBounds.hi.x) 
+
+      if (bounds.hi.x > globalBounds.hi.x)
 				bounds.hi.x = globalBounds.hi.x;
-			
-      if (bounds.hi.y > globalBounds.hi.y) 
+
+      if (bounds.hi.y > globalBounds.hi.y)
 				bounds.hi.y = globalBounds.hi.y;
 
-// Although a good safeguard, the logic is already proven, thus skip the check
-//			if (bounds.lo.x>bounds.hi.x || bounds.lo.y>bounds.hi.y) {
-//				DEBUG_CRASH(("Incorrect bounds calculation. Logic error, fix me. jba."));
-//				continue;
-//			}
 			m_zoneBlocks[xBlock][yBlock].blockCalculateZones(map, layers, bounds);
 		}
 	}
 
-
-
-
-//#ifdef DEBUG_QPF
-//#if defined(DEBUG_LOGGING) 
-//	QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
-//	timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
-//	DEBUG_LOG(("Time to calculate second %f\n", timeToUpdate));
-//#endif
-//#endif
-
-
-
-
-
-	// Determine water/ground equivalent zones, and ground/cliff equivalent zones.
-//	for (i=0; i<m_zonesAllocated; i++) {
-//		m_groundCliffZones[i] = i;
-//		m_groundWaterZones[i] = i;
-//		m_groundRubbleZones[i] = i;
-//		m_terrainZones[i] = i;
-//		m_crusherZones[i] = i;
-//		m_hierarchicalZones[i] = i;
-//	}
 	i = 0;
-  while ( i < m_zonesAllocated ) 
+  while ( i < m_zonesAllocated )
 	{
     m_groundCliffZones[i] = m_groundWaterZones[i] = m_groundRubbleZones[i] = m_terrainZones[i] = m_crusherZones[i] = m_hierarchicalZones[i] = i;
     i++;
   }
 
-
-
-
-
-
-//	for( j=globalBounds.lo.y; j<=globalBounds.hi.y; j++ )	{
-//		for( i=globalBounds.lo.x; i<=globalBounds.hi.x; i++ )	{
-//			if ( (map[i][j].getConnectLayer() > LAYER_GROUND) && 
-//				(map[i][j].getType() == PathfindCell::CELL_CLEAR) ) {
-//				PathfindLayer *layer = layers + map[i][j].getConnectLayer();
-//				resolveZones(map[i][j].getZone(), layer->getZone(), m_hierarchicalZones, m_maxZone);
-//			}
-//			if (i>globalBounds.lo.x && map[i][j].getZone()!=map[i-1][j].getZone()) {
-//				if (map[i][j].getType() == map[i-1][j].getType()) {
-//					applyZone(map[i][j], map[i-1][j], m_hierarchicalZones, m_maxZone);
-//				}
-//				if (waterGround(map[i][j], map[i-1][j])) {
-//					applyZone(map[i][j], map[i-1][j], m_groundWaterZones, m_maxZone);
-//				}
-//				if (groundRubble(map[i][j], map[i-1][j])) {
-////					Int zone1 = map[i][j].getZone();
-////					Int zone2 = map[i-1][j].getZone();
-////					if (m_terrainZones[zone1] != m_terrainZones[zone2]) {
-////						//DEBUG_LOG(("Matching terrain zone %d to %d.\n", zone1, zone2));
-////					}
-//					applyZone(map[i][j], map[i-1][j], m_groundRubbleZones, m_maxZone);
-//				}
-//				if (groundCliff(map[i][j], map[i-1][j])) {
-//					applyZone(map[i][j], map[i-1][j], m_groundCliffZones, m_maxZone);
-//				}
-//				if (terrain(map[i][j], map[i-1][j])) {
-//					applyZone(map[i][j], map[i-1][j], m_terrainZones, m_maxZone);
-//				}
-//				if (crusherGround(map[i][j], map[i-1][j])) {
-//					applyZone(map[i][j], map[i-1][j], m_crusherZones, m_maxZone);
-//				}
-//			}
-//			if (j>globalBounds.lo.y && map[i][j].getZone()!=map[i][j-1].getZone()) {
-//				if (map[i][j].getType() == map[i][j-1].getType()) {
-//					applyZone(map[i][j], map[i][j-1], m_hierarchicalZones, m_maxZone);
-//				}
-//				if (waterGround(map[i][j],map[i][j-1])) {
-//					applyZone(map[i][j], map[i][j-1], m_groundWaterZones, m_maxZone);
-//				}
-//				if (groundRubble(map[i][j], map[i][j-1])) {
-////					Int zone1 = map[i][j].getZone();
-////					Int zone2 = map[i][j-1].getZone();
-////					if (m_terrainZones[zone1] != m_terrainZones[zone2]) {
-////						//DEBUG_LOG(("Matching terrain zone %d to %d.\n", zone1, zone2));
-////					}
-//					applyZone(map[i][j], map[i][j-1], m_groundRubbleZones, m_maxZone);
-//				}
-//				if (groundCliff(map[i][j],map[i][j-1])) {
-//					applyZone(map[i][j], map[i][j-1], m_groundCliffZones, m_maxZone);
-//				}
-//				if (terrain(map[i][j], map[i][j-1])) {
-//					applyZone(map[i][j], map[i][j-1], m_terrainZones, m_maxZone);
-//				}
-//				if (crusherGround(map[i][j], map[i][j-1])) {
-//					applyZone(map[i][j], map[i][j-1], m_crusherZones, m_maxZone);
-//				}
-//			}
-//		//	DEBUG_ASSERTCRASH(map[i][j].getZone() != 0, ("Cleared the zone."));
-//		}
-//	}
   REGISTER UnsignedInt maxZone = m_maxZone;
 	j=globalBounds.lo.y;
-  while( j <= globalBounds.hi.y )	
+  while( j <= globalBounds.hi.y )
   {
     i=globalBounds.lo.x;
-		while( i <= globalBounds.hi.x )	
+		while( i <= globalBounds.hi.x )
     {
       PathfindCell &r_thisCell = map[i][j];
 
-			if ( (r_thisCell.getConnectLayer() > LAYER_GROUND) && 
-				(r_thisCell.getType() == PathfindCell::CELL_CLEAR) ) 
+			if ( (r_thisCell.getConnectLayer() > LAYER_GROUND) &&
+				(r_thisCell.getType() == PathfindCell::CELL_CLEAR) )
       {
 				PathfindLayer *layer = layers + r_thisCell.getConnectLayer();
 				resolveZones(r_thisCell.getZone(), layer->getZone(), m_hierarchicalZones, maxZone);
 			}
 
-			if ( i > globalBounds.lo.x && r_thisCell.getZone() != map[i-1][j].getZone() ) 
+			if ( i > globalBounds.lo.x && r_thisCell.getZone() != map[i-1][j].getZone() )
       {
         const PathfindCell &r_leftCell = map[i-1][j];
 
-				if (r_thisCell.getType() == r_leftCell.getType()) 
+				if (r_thisCell.getType() == r_leftCell.getType())
 					applyZone(r_thisCell, r_leftCell, m_hierarchicalZones, maxZone);//if this is true, skip all the ones below
         else
         {
-          Bool notTerrainOrCrusher = TRUE; // if this is false, skip the if-else-ladder below 
+          Bool notTerrainOrCrusher = TRUE; // if this is false, skip the if-else-ladder below
 
-          if (terrain(r_thisCell, r_leftCell)) 
+          if (terrain(r_thisCell, r_leftCell))
           {
 					  applyZone(r_thisCell, r_leftCell, m_terrainZones, maxZone);
             notTerrainOrCrusher = FALSE;
           }
 
-          if (crusherGround(r_thisCell, r_leftCell)) 
+          if (crusherGround(r_thisCell, r_leftCell))
           {
-					  applyZone(r_thisCell, r_leftCell, m_crusherZones, maxZone); 
+					  applyZone(r_thisCell, r_leftCell, m_crusherZones, maxZone);
             notTerrainOrCrusher = FALSE;
           }
 
           if ( notTerrainOrCrusher )
           {
-            if (waterGround(r_thisCell, r_leftCell)) 
+            if (waterGround(r_thisCell, r_leftCell))
 					    applyZone(r_thisCell, r_leftCell, m_groundWaterZones, maxZone);
-            else if (groundRubble(r_thisCell, r_leftCell)) 
+            else if (groundRubble(r_thisCell, r_leftCell))
 					    applyZone(r_thisCell, r_leftCell, m_groundRubbleZones, maxZone);
-            else if (groundCliff(r_thisCell, r_leftCell)) 
+            else if (groundCliff(r_thisCell, r_leftCell))
 					    applyZone(r_thisCell, r_leftCell, m_groundCliffZones, maxZone);
           }
 
@@ -2694,69 +2578,50 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 
       }
 
-			if (j>globalBounds.lo.y && r_thisCell.getZone()!=map[i][j-1].getZone()) 
+			if (j>globalBounds.lo.y && r_thisCell.getZone()!=map[i][j-1].getZone())
       {
         const PathfindCell &r_topCell = map[i][j-1];
 
-        if (r_thisCell.getType() == r_topCell.getType()) 
+        if (r_thisCell.getType() == r_topCell.getType())
 					applyZone(r_thisCell, r_topCell, m_hierarchicalZones, maxZone);
         else
         {
-          Bool notTerrainOrCrusher = TRUE; // if this is false, skip the if-else-ladder below 
+          Bool notTerrainOrCrusher = TRUE; // if this is false, skip the if-else-ladder below
 
-          if (terrain(r_thisCell, r_topCell)) 
+          if (terrain(r_thisCell, r_topCell))
           {
             applyZone(r_thisCell, r_topCell, m_terrainZones, maxZone);
             notTerrainOrCrusher = FALSE;
           }
 
-          if (crusherGround(r_thisCell, r_topCell)) 
+          if (crusherGround(r_thisCell, r_topCell))
           {
 					  applyZone(r_thisCell, r_topCell, m_crusherZones, maxZone);
             notTerrainOrCrusher = FALSE;
           }
 
-          if (waterGround(r_thisCell,r_topCell)) 
+          if (waterGround(r_thisCell,r_topCell))
 					  applyZone(r_thisCell, r_topCell, m_groundWaterZones, maxZone);
-          else if (groundRubble(r_thisCell, r_topCell)) 
+          else if (groundRubble(r_thisCell, r_topCell))
 					  applyZone(r_thisCell, r_topCell, m_groundRubbleZones, maxZone);
-          else if (groundCliff(r_thisCell,r_topCell)) 
+          else if (groundCliff(r_thisCell,r_topCell))
 					  applyZone(r_thisCell, r_topCell, m_groundCliffZones, maxZone);
 
         }
 
       }
 
-//			DEBUG_ASSERTCRASH(r_thisCell.getZone() != 0, ("Cleared the zone."));
-
       ++i;
 		}
 
-    ++j; 
+    ++j;
 	}
 
-
-
-
-
-
-
-
-
-//	if (m_maxZone >= m_zonesAllocated) {
-//		RELEASE_CRASH("Pathfind allocation error - fatal. see jba.");
-//	}
-
-//	for (i=1; i<m_maxZone; i++) {
-//		// Flatten hierarchical zones.
-//		Int zone = m_hierarchicalZones[i];
-//		m_hierarchicalZones[i] = m_hierarchicalZones[zone];
-//	}
   //FLATTEN HIERARCHICAL ZONES
   {
 	  i = 1;
-    REGISTER Int zone;  
-    while ( i < maxZone ) 
+    REGISTER Int zone;
+    while ( i < maxZone )
     {		// Flatten hierarchical zones.
 		  zone = m_hierarchicalZones[i];
 		  m_hierarchicalZones[i] = m_hierarchicalZones[ zone ];
@@ -2764,32 +2629,28 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 	  }
   }
 
-  
-  
-  //THIS BLOCK IS 20% 
+  //THIS BLOCK IS 20%
 	flattenZones(m_groundCliffZones, m_hierarchicalZones, m_maxZone);
 	flattenZones(m_groundWaterZones, m_hierarchicalZones, m_maxZone);
 	flattenZones(m_groundRubbleZones, m_hierarchicalZones, m_maxZone);
 	flattenZones(m_terrainZones, m_hierarchicalZones, m_maxZone);
 	flattenZones(m_crusherZones, m_hierarchicalZones, m_maxZone);
 
-
 #ifdef DEBUG_QPF
-#if defined(DEBUG_LOGGING) 
+#if defined(DEBUG_LOGGING)
 	QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 	timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
 
-//	DEBUG_LOG(("Time to calculate zones %f, cells %d\n", timeToUpdate, (globalBounds.hi.x-globalBounds.lo.x)*(globalBounds.hi.y-globalBounds.lo.y)));
   if ( updateSamples < 400 )
   {
     averageTimeToUpdate = ((averageTimeToUpdate * updateSamples) + timeToUpdate) / (updateSamples + 1.0f);
     updateSamples++;
-  	DEBUG_LOG(("computing...: %f, \n", averageTimeToUpdate));
+  	DEBUG_LOG(("computing...: %f", averageTimeToUpdate));
   }
   else if ( updateSamples == 400 )
   {
-  	DEBUG_LOG((" =============DONE============= Average time to calculate zones: %f, \n", averageTimeToUpdate));
-  	DEBUG_LOG(("                                           Percent of baseline : %f, \n", averageTimeToUpdate/0.003335f));
+  	DEBUG_LOG((" =============DONE============= Average time to calculate zones: %f", averageTimeToUpdate));
+  	DEBUG_LOG(("                                           Percent of baseline : %f", averageTimeToUpdate/0.003335f));
     updateSamples = 777;
 #ifdef forceRefreshCalling
     s_stopForceCalling = TRUE;
@@ -2798,8 +2659,8 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 
 #endif
 #endif
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	if (TheGlobalData->m_debugAI == AI_DEBUG_ZONES) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugAI == AI_DEBUG_ZONES)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 		RGBColor color;
@@ -2808,8 +2669,6 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 		for( j=0; j<globalBounds.hi.y; j++ )	{
 			for( i=0; i<globalBounds.hi.x; i++ )	{
 				Int zone = map[i][j].getZone();
-				//zone = m_terrainZones[zone];
-				//zone = m_groundCliffZones[zone];
 				zone = m_hierarchicalZones[zone];
 
 				color.blue = (zone%3) * 0.5f;
@@ -2829,8 +2688,6 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 	m_nextFrameToCalculateZones = 0xffffffff;
 }
 
-
-
 /**
  * Update zones where a structure has been added or removed.
  * This can be done by just updating the equivalency arrays, without rezoning the map..
@@ -2839,7 +2696,7 @@ void PathfindZoneManager::updateZonesForModify(PathfindCell **map, PathfindLayer
 {
 
 #ifdef DEBUG_QPF
-#if defined(DEBUG_LOGGING) 
+#if defined(DEBUG_LOGGING)
 	__int64 startTime64;
 	double timeToUpdate=0.0f;
 	__int64 endTime64,freq64;
@@ -2933,18 +2790,16 @@ void PathfindZoneManager::updateZonesForModify(PathfindCell **map, PathfindLayer
 					}
 				}
 			}
-			//DEBUG_LOG(("Collapsed zones %d\n", m_maxZone));
  		}
 	}
 #ifdef DEBUG_QPF
-#if defined(DEBUG_LOGGING) 
+#if defined(DEBUG_LOGGING)
 	QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 	timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
-	//DEBUG_LOG(("Time to update zones %f, cells %d\n", timeToUpdate, (globalBounds.hi.x-globalBounds.lo.x)*(globalBounds.hi.y-globalBounds.lo.y)));
 #endif
 #endif
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	if (TheGlobalData->m_debugAI==AI_DEBUG_ZONES) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugAI==AI_DEBUG_ZONES)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 		RGBColor color;
@@ -2974,19 +2829,10 @@ void PathfindZoneManager::updateZonesForModify(PathfindCell **map, PathfindLayer
 
 }
 
-
-
-
-
-
-
-
-
-
 //
 // Clear the passable flags.
 //
-void PathfindZoneManager::clearPassableFlags( ) 
+void PathfindZoneManager::clearPassableFlags( )
 {	Int blockX;
 	Int blockY;
 	for (blockX = 0; blockX<m_zoneBlockExtent.x; blockX++) {
@@ -2999,7 +2845,7 @@ void PathfindZoneManager::clearPassableFlags( )
 //
 // Set the passable flags.
 //
-void PathfindZoneManager::setAllPassable( ) 
+void PathfindZoneManager::setAllPassable( )
 {	Int blockX;
 	Int blockY;
 	for (blockX = 0; blockX<m_zoneBlockExtent.x; blockX++) {
@@ -3012,7 +2858,7 @@ void PathfindZoneManager::setAllPassable( )
 //
 // Set the passable flag for the block at this location.
 //
-void PathfindZoneManager::setPassable(Int cellX, Int cellY, Bool passable) 
+void PathfindZoneManager::setPassable(Int cellX, Int cellY, Bool passable)
 {
 	Int blockX = cellX/ZONE_BLOCK_SIZE;
 	Int blockY = cellY/ZONE_BLOCK_SIZE;
@@ -3067,7 +2913,7 @@ Bool PathfindZoneManager::clipIsPassable(Int cellX, Int cellY) const
 //
 // Set the bridge flag for the block at this location.
 //
-void PathfindZoneManager::setBridge(Int cellX, Int cellY, Bool bridge) 
+void PathfindZoneManager::setBridge(Int cellX, Int cellY, Bool bridge)
 {
 	Int blockX = cellX/ZONE_BLOCK_SIZE;
 	Int blockY = cellY/ZONE_BLOCK_SIZE;
@@ -3109,7 +2955,7 @@ Bool PathfindZoneManager::interactsWithBridge(Int cellX, Int cellY) const
 //
 zoneStorageType PathfindZoneManager::getBlockZone(LocomotorSurfaceTypeMask acceptableSurfaces, Bool crusher,Int cellX, Int cellY, PathfindCell **map) const
 {
-	PathfindCell *cell = &(map[cellX][cellY]); 
+	PathfindCell *cell = &(map[cellX][cellY]);
 	Int blockX = cellX/ZONE_BLOCK_SIZE;
 	Int blockY = cellY/ZONE_BLOCK_SIZE;
 
@@ -3140,7 +2986,7 @@ zoneStorageType PathfindZoneManager::getEffectiveTerrainZone(zoneStorageType zon
 //
 // Return the zone at this location.
 //
-zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask acceptableSurfaces, 
+zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask acceptableSurfaces,
 																										Bool crusher, zoneStorageType zone) const
 {
 	//DEBUG_ASSERTCRASH(zone, ("Zone not set"));
@@ -3158,7 +3004,7 @@ zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask
 			(acceptableSurfaces&LOCOMOTORSURFACE_WATER) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_CLIFF)) {
 		// Locomotors can go on ground, water & cliff, so all is zone 1.
-		return 1; 
+		return 1;
 	}
 
 	if (crusher) {
@@ -3169,27 +3015,27 @@ zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask
 			(acceptableSurfaces&LOCOMOTORSURFACE_CLIFF)) {
 		// Locomotors can go on ground & cliff, so use the ground cliff combiner.
 		zone = m_groundCliffZones[zone];
-		return zone; 
+		return zone;
 	}
 
 	if ( (acceptableSurfaces&LOCOMOTORSURFACE_GROUND) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_WATER)) {
 		// Locomotors can go on ground & water, so use the ground water combiner.
 		zone = m_groundWaterZones[zone];
-		return zone; 
+		return zone;
 	}
 
 	if ( (acceptableSurfaces&LOCOMOTORSURFACE_GROUND) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_RUBBLE)) {
 		// Locomotors can go on ground & rubble, so use the ground rubble combiner.
 		zone = m_groundRubbleZones[zone];
-		return zone; 
+		return zone;
 	}
 
 	if ( (acceptableSurfaces&LOCOMOTORSURFACE_CLIFF) &&
 			(acceptableSurfaces&LOCOMOTORSURFACE_WATER)) {
 		// Locomotors can go on ground & cliff, so use the ground cliff combiner.
-		DEBUG_CRASH(("Cliff water only locomotor sets not supported yet.")); 
+		DEBUG_CRASH(("Cliff water only locomotor sets not supported yet."));
 	}
 	zone = m_hierarchicalZones[zone];
 
@@ -3197,15 +3043,12 @@ zoneStorageType PathfindZoneManager::getEffectiveZone( LocomotorSurfaceTypeMask
 }
 //-------------------- PathfindLayer ----------------------------------------
 PathfindLayer::PathfindLayer() : m_blockOfMapCells(NULL), m_layerCells(NULL), m_bridge(NULL),
-// Added By Sadullah Nader
-// Initializations inserted
 m_destroyed(FALSE),
 m_height(0),
 m_width(0),
 m_xOrigin(0),
 m_yOrigin(0),
 m_zone(0)
-//
 {
 	m_startCell.x = -1;
 	m_startCell.y = -1;
@@ -3213,15 +3056,15 @@ m_zone(0)
 	m_endCell.y = -1;
 }
 
-PathfindLayer::~PathfindLayer()  
+PathfindLayer::~PathfindLayer()
 {
 	reset();
 }
 
 /**
- * Returns true if the layer is avaialble for use.
+ * Returns true if the layer is available for use.
  */
-void PathfindLayer::reset(void) 
+void PathfindLayer::reset(void)
 {
 	m_bridge = NULL;
 	if (m_layerCells) {
@@ -3235,14 +3078,14 @@ void PathfindLayer::reset(void)
 		delete [] m_layerCells;
 		m_layerCells = NULL;
 	}
-	if (m_blockOfMapCells) {
-		delete [] m_blockOfMapCells;
-		m_blockOfMapCells = NULL;
-	}
+
+	delete [] m_blockOfMapCells;
+	m_blockOfMapCells = NULL;
+
 	m_width = 0;
 	m_height = 0;
 	m_xOrigin = 0;
-	m_yOrigin = 0;	 
+	m_yOrigin = 0;
 	m_startCell.x = -1;
 	m_startCell.y = -1;
 	m_endCell.x = -1;
@@ -3253,7 +3096,7 @@ void PathfindLayer::reset(void)
 /**
  * Returns true if the layer is avaialble for use.
  */
-Bool PathfindLayer::isUnused(void) 
+Bool PathfindLayer::isUnused(void)
 {
 	// Special case - wall layer is built from not a bridge.  jba.
 	if (m_layer == LAYER_WALL && m_width>0) return false;
@@ -3267,7 +3110,7 @@ Bool PathfindLayer::isUnused(void)
 /**
  * Draws debug cell info.
  */
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 void PathfindLayer::doDebugIcons(void) {
 	if (isUnused()) return;
 	extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -3275,7 +3118,7 @@ void PathfindLayer::doDebugIcons(void) {
 	{
 		Coord3D topLeftCorner;
 		RGBColor color;
-		color.red = color.green = color.blue = 0;	
+		color.red = color.green = color.blue = 0;
 		Coord3D center;
 		center.x = (m_xOrigin+m_width/2)*PATHFIND_CELL_SIZE_F;
 		center.y = (m_yOrigin+m_height/2)*PATHFIND_CELL_SIZE_F;
@@ -3297,8 +3140,8 @@ void PathfindLayer::doDebugIcons(void) {
 			for( int i=0; i<m_width; i++ )
 			{
 				topLeftCorner.x = (Real)(i+m_xOrigin) * PATHFIND_CELL_SIZE_F;
-				
-				color.red = color.green = color.blue = 0;	
+
+				color.red = color.green = color.blue = 0;
 				Bool empty = false;
 				Real size = 0.4f;
 				const PathfindCell *cell = &m_layerCells[i][j];
@@ -3324,7 +3167,7 @@ void PathfindLayer::doDebugIcons(void) {
 				}
 				if (showCells) {
 					empty = true;
-					color.red = color.green = color.blue = 0;	
+					color.red = color.green = color.blue = 0;
 					if (empty && cell) {
 						if (cell->getFlags()!=PathfindCell::NO_UNITS) {
 							empty = false;
@@ -3333,7 +3176,7 @@ void PathfindLayer::doDebugIcons(void) {
 							}	else if (cell->getFlags() == PathfindCell::UNIT_PRESENT_FIXED) {
 								color.green = color.blue = color.red = 1;
 							}	else if (cell->getFlags() == PathfindCell::UNIT_PRESENT_MOVING) {
-								color.green = 1; 
+								color.green = 1;
 							}	else {
 								color.green = color.red = 1;
 							}
@@ -3357,7 +3200,7 @@ void PathfindLayer::doDebugIcons(void) {
 /**
  * Sets the bridge & layer number for a layer.
  */
-Bool PathfindLayer::init(Bridge *theBridge, PathfindLayerEnum layer)  
+Bool PathfindLayer::init(Bridge *theBridge, PathfindLayerEnum layer)
 {
 	if (m_bridge!=NULL) return false;
 	m_bridge = theBridge;
@@ -3414,7 +3257,7 @@ void PathfindLayer::allocateCellsForWallLayer(const IRegion2D *extent, ObjectID
 	if (m_layer != LAYER_WALL) return;
 	Region2D bridgeBounds;
 
-	Int i; 
+	Int i;
 	Bool first = true;
 	for (i=0; i<numPieces; i++) {
 		Object *obj = TheGameLogic->findObjectByID(wallPieces[i]);
@@ -3509,7 +3352,7 @@ void PathfindLayer::classifyCells()
 			PathfindCell *cell = &m_layerCells[i][j];
 			cell->setConnectLayer(LAYER_INVALID);
 			cell->setLayer(m_layer);
-			classifyLayerMapCell(i+m_xOrigin, j+m_yOrigin, cell, m_bridge);	
+			classifyLayerMapCell(i+m_xOrigin, j+m_yOrigin, cell, m_bridge);
 		}
 		BridgeInfo info;
 		m_bridge->getBridgeInfo(&info);
@@ -3525,7 +3368,7 @@ void PathfindLayer::classifyCells()
 		m_startCell.y = REAL_TO_INT_FLOOR((info.from.y-bridgeDir.y) / PATHFIND_CELL_SIZE_F);
 		m_endCell.x = REAL_TO_INT_FLOOR((info.to.x+bridgeDir.x) / PATHFIND_CELL_SIZE_F);
 		m_endCell.y = REAL_TO_INT_FLOOR((info.to.y+bridgeDir.y) / PATHFIND_CELL_SIZE_F);
-	}	
+	}
 	if (m_destroyed) {
 		Int i, j;
 		for (i=0; i<m_width; i++) {
@@ -3560,7 +3403,7 @@ void PathfindLayer::classifyWallCells(ObjectID *wallPieces, Int numPieces)
 			PathfindCell *cell = &m_layerCells[i][j];
 			cell->setConnectLayer(LAYER_INVALID);
 			cell->setLayer(m_layer);
-			classifyWallMapCell(i+m_xOrigin, j+m_yOrigin, cell, wallPieces, numPieces);	
+			classifyWallMapCell(i+m_xOrigin, j+m_yOrigin, cell, wallPieces, numPieces);
 			cell->setPinched(false);
 		}
 	}
@@ -3614,7 +3457,7 @@ void PathfindLayer::classifyWallCells(ObjectID *wallPieces, Int numPieces)
 Bool PathfindLayer::setDestroyed(Bool destroyed)
 {
 	if (destroyed == m_destroyed) return false;
-	
+
 	m_destroyed = destroyed;
 	classifyCells();
 
@@ -3665,7 +3508,6 @@ PathfindCell *PathfindLayer::getCell(Int x, Int y)
 }
 
 
-
 /**
  * Classify the given map cell as clear, or not, etc.
  */
@@ -3707,7 +3549,7 @@ void PathfindLayer::classifyLayerMapCell( Int i, Int j , PathfindCell *cell, Bri
 		if (bridgeCount!=0) {
 			cell->setType(PathfindCell::CELL_BRIDGE_IMPASSABLE); // it's off the bridge.
 		}
-		
+
 		// check against the end lines.
 
 		Region2D cellBounds;
@@ -3752,7 +3594,7 @@ void PathfindLayer::classifyLayerMapCell( Int i, Int j , PathfindCell *cell, Bri
 
 Bool PathfindLayer::isPointOnWall(ObjectID *wallPieces, Int numPieces, const Coord3D *pt)
 {
-	Int i; 
+	Int i;
 	for (i=0; i<numPieces; i++) {
 		Object *obj = TheGameLogic->findObjectByID(wallPieces[i]);
 		if (obj==NULL) continue;
@@ -3820,7 +3662,7 @@ void PathfindLayer::classifyWallMapCell( Int i, Int j , PathfindCell *cell, Obje
 		if (bridgeCount!=0) {
 			cell->setType(PathfindCell::CELL_BRIDGE_IMPASSABLE); // it's off the bridge.
 		}
-		
+
 	}
 }
 
@@ -3841,16 +3683,13 @@ Pathfinder::~Pathfinder( void )
 void Pathfinder::reset( void )
 {
 	frameToShowObstacles = 0;
-	DEBUG_LOG(("Pathfind cell is %d bytes, PathfindCellInfo is %d bytes\n", sizeof(PathfindCell), sizeof(PathfindCellInfo)));
+	DEBUG_LOG(("Pathfind cell is %d bytes, PathfindCellInfo is %d bytes", sizeof(PathfindCell), sizeof(PathfindCellInfo)));
 
-	if (m_blockOfMapCells) {
-		delete []m_blockOfMapCells;
-		m_blockOfMapCells = NULL;
-	}
-	if (m_map) {	 
-		delete [] m_map;
-		m_map = NULL;
-	}
+	delete [] m_blockOfMapCells;
+	m_blockOfMapCells = NULL;
+
+	delete [] m_map;
+	m_map = NULL;
 
 	Int i;
 	for (i=0; i<=LAYER_LAST; i++) {
@@ -3876,10 +3715,9 @@ void Pathfinder::reset( void )
 	debugPathPos.y = 0.0f;
 	debugPathPos.z = 0.0f;
 
-	if (debugPath)
-		deleteInstance(debugPath);
-
+	deleteInstance(debugPath);
 	debugPath = NULL;
+
 	m_frameToShowObstacles = 0;
 
 	for (m_queuePRHead=0; m_queuePRHead<PATHFIND_QUEUE_LEN; m_queuePRHead++) {
@@ -3902,10 +3740,15 @@ void Pathfinder::reset( void )
 		m_wallHeight = 0.0f;
 	}
 	m_zoneManager.reset();
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+	s_useFixedPathfinding = false;
+	s_forceCleanCells = false;
+#endif
 }
 
-/** 
- * Adds a piece of a wall. 
+/**
+ * Adds a piece of a wall.
  */
 void Pathfinder::addWallPiece(Object *wallPiece)
 {
@@ -3942,14 +3785,14 @@ void Pathfinder::removeWallPiece(Object *wallPiece)
 			// all done
 			return;
 
-		}  // end if
+		}
 
-	}  // end for, i
+	}
 
-}  // end removeWallPiece
+}
 
-/** 
- * Checks if a point is on the wall. 
+/**
+ * Checks if a point is on the wall.
  */
 Bool Pathfinder::isPointOnWall(const Coord3D *pos)
 {
@@ -3966,8 +3809,8 @@ Bool Pathfinder::isPointOnWall(const Coord3D *pos)
 	return false;
 }
 
-/** 
- * Adds a bridge & returns the layer. 
+/**
+ * Adds a bridge & returns the layer.
  */
 PathfindLayerEnum Pathfinder::addBridge(Bridge *theBridge)
 {
@@ -3977,7 +3820,7 @@ PathfindLayerEnum Pathfinder::addBridge(Bridge *theBridge)
 			if (m_layers[layer].init(theBridge, (PathfindLayerEnum)layer) ) {
 				return (PathfindLayerEnum)layer;
 			}
-			DEBUG_LOG(("WARNING: Bridge failed to init in pathfinder\n"));
+			DEBUG_LOG(("WARNING: Bridge failed to init in pathfinder"));
 			return LAYER_GROUND; // failed to init, usually cause off of the map.  jba.
 		}
 		layer++;
@@ -3986,8 +3829,8 @@ PathfindLayerEnum Pathfinder::addBridge(Bridge *theBridge)
 	return LAYER_GROUND;
 }
 
-/** 
- * Updates an object's layer, making sure the object is actually on the bridge first. 
+/**
+ * Updates an object's layer, making sure the object is actually on the bridge first.
  */
 void Pathfinder::updateLayer(Object *obj, PathfindLayerEnum layer)
 {
@@ -3996,27 +3839,27 @@ void Pathfinder::updateLayer(Object *obj, PathfindLayerEnum layer)
 			layer = LAYER_GROUND;
 		}
 	}
-	//DEBUG_LOG(("Object layer is %d\n", layer));
+	//DEBUG_LOG(("Object layer is %d", layer));
 	obj->setLayer(layer);
 }
 
-/** 
+/**
  * Classify the cells under the given object
- * If 'insert' is true, object is being added 
- * If 'insert' is false, object is being removed 
+ * If 'insert' is true, object is being added
+ * If 'insert' is false, object is being removed
  */
 void Pathfinder::classifyFence( Object *obj, Bool insert )
-{	
+{
 	const Coord3D *pos = obj->getPosition();
   Real angle = obj->getOrientation();
- 
+
  	Real halfsizeX = obj->getTemplate()->getFenceWidth()/2;
  	Real halfsizeY = PATHFIND_CELL_SIZE_F/10.0f;
  	Real fenceOffset = obj->getTemplate()->getFenceXOffset();
 
  	Real c = (Real)Cos(angle);
  	Real s = (Real)Sin(angle);
- 		
+
  	const Real STEP_SIZE = PATHFIND_CELL_SIZE_F * 0.5f;	// in theory, should be PATHFIND_CELL_SIZE_F exactly, but needs to be smaller to avoid aliasing problems
  	Real ydx = s * STEP_SIZE;
  	Real ydy = -c * STEP_SIZE;
@@ -4032,8 +3875,12 @@ void Pathfinder::classifyFence( Object *obj, Bool insert )
 	IRegion2D cellBounds;
 	cellBounds.lo.x = REAL_TO_INT_FLOOR((pos->x + 0.5f)/PATHFIND_CELL_SIZE_F);
 	cellBounds.lo.y = REAL_TO_INT_FLOOR((pos->y + 0.5f)/PATHFIND_CELL_SIZE_F);
+	// TheSuperHackers @fix Mauller 16/06/2025 Fixes uninitialized variables.
+	// To keep retail compatibility they need to be uninitialized in VC6 builds.
+#if !(defined(_MSC_VER) && _MSC_VER < 1300)
 	cellBounds.hi.x = REAL_TO_INT_CEIL((pos->x + 0.5f)/PATHFIND_CELL_SIZE_F);
 	cellBounds.hi.y = REAL_TO_INT_CEIL((pos->y + 0.5f)/PATHFIND_CELL_SIZE_F);
+#endif
 	Bool didAnything = false;
 
  	for (Int iy = 0; iy < numStepsY; ++iy, tl_x += ydx, tl_y += ydy)
@@ -4065,73 +3912,35 @@ void Pathfinder::classifyFence( Object *obj, Bool insert )
  				if (cellBounds.lo.y>cy) cellBounds.lo.y = cy;
  				if (cellBounds.hi.x<cx) cellBounds.hi.x = cx;
  				if (cellBounds.hi.y<cy) cellBounds.hi.y = cy;
- 			} 			
+ 			}
  		}
  	}
 	if (didAnything) {
 		m_zoneManager.markZonesDirty( insert );
 		m_zoneManager.updateZonesForModify(m_map, m_layers, cellBounds, m_extent);
 	}
-#if 0 
-	// Perhaps it would make more sense to use the iteratecellsalongpath() provided in this class,
-	// but this way works well and is very traceable
-	// neither one is true Bresenham
-	// this one assumes zero fence thickness
+}
 
-	const Coord3D *fencePos = obj->getPosition();
-	Coord3D fenceNorm;
-	obj->getUnitDirectionVector2D( fenceNorm );
-	Coord3D halfLength = fenceNorm;
-	halfLength.scale( obj->getGeometryInfo().getMajorRadius() );
+/**
+ * Classify the cells under the given object
+ * If 'insert' is true, object is being added
+ * If 'insert' is false, object is being removed
+ */
+void Pathfinder::classifyObjectFootprint( Object *obj, Bool insert )
+{
+	if (obj->isKindOf(KINDOF_MINE)) {
+		return;  // don't pathfind around mines.
+	}
 
-	Coord3D head = *fencePos;
-	head.add( &halfLength );
-	Coord3D tail = *fencePos;
-	tail.sub( &halfLength );
-
-	Real stepLength = 1.0f / ((halfLength.length()*2.0f) / PATHFIND_CELL_SIZE_F);
-
-	for ( Real t = 0.0f; t <= 1.0f; t += stepLength )
-	{
-		Real lengthWalk_x = (head.x * t) + (tail.x * (1.0f-t));
-		Real lengthWalk_y = (head.y * t) + (tail.y * (1.0f-t));
-
-		Int cx = REAL_TO_INT_FLOOR( lengthWalk_x / PATHFIND_CELL_SIZE_F );
-		Int cy = REAL_TO_INT_FLOOR( lengthWalk_y / PATHFIND_CELL_SIZE_F );
-		if (cx >= 0 && cy >= 0 && cx < m_extent.hi.x && cy < m_extent.hi.y)
-		{
-			if (insert) {
-				ICoord2D pos = { cx, cy };
-				m_map[cx][cy].setTypeAsObstacle( obj, true, pos );
-			}
-			else
-				m_map[cx][cy].removeObstacle(obj);
-		}
-	}
-#endif
-
-}
-
-/** 
- * Classify the cells under the given object
- * If 'insert' is true, object is being added 
- * If 'insert' is false, object is being removed 
- */
-void Pathfinder::classifyObjectFootprint( Object *obj, Bool insert )
-{
-	if (obj->isKindOf(KINDOF_MINE)) {
-		return;  // don't pathfind around mines.
-	}
-
-	if (obj->isKindOf(KINDOF_PROJECTILE)) {
-		return;  // don't care about projectiles.
-	}
+	if (obj->isKindOf(KINDOF_PROJECTILE)) {
+		return;  // don't care about projectiles.
+	}
 
 	if (obj->isKindOf(KINDOF_BRIDGE_TOWER)) {
 		return;  // It is important to not abuse bridge towers.
 	}
 
-	if (obj->getTemplate()->getFenceWidth() > 0.0f) 
+	if (obj->getTemplate()->getFenceWidth() > 0.0f)
 	{
 		if (!obj->isKindOf(KINDOF_DEFENSIVE_WALL))
 		{
@@ -4150,7 +3959,7 @@ void Pathfinder::classifyObjectFootprint( Object *obj, Bool insert )
 
 
 		removeUnitFromPathfindMap(obj);
-		if (obj->isKindOf(KINDOF_WALK_ON_TOP_OF_WALL)) { 
+		if (obj->isKindOf(KINDOF_WALK_ON_TOP_OF_WALL)) {
 			if (!m_layers[LAYER_WALL].isUnused()) {
 				Int i;
 				ObjectID curID = obj->getID();
@@ -4163,7 +3972,7 @@ void Pathfinder::classifyObjectFootprint( Object *obj, Bool insert )
 				Object *obj;
 				for (obj = TheGameLogic->getFirstObject(); obj; obj=obj->getNextObject()) {
 					if (obj->getLayer() == LAYER_WALL) {
-						if (m_layers[LAYER_WALL].isPointOnWall(&curID, 1, obj->getPosition())) 
+						if (m_layers[LAYER_WALL].isPointOnWall(&curID, 1, obj->getPosition()))
 						{
 							// The object fell off the wall.
 							// Destroy it.
@@ -4192,7 +4001,7 @@ void Pathfinder::classifyObjectFootprint( Object *obj, Bool insert )
 		return;
 	}
 
-	if (obj->getHeightAboveTerrain() > PATHFIND_CELL_SIZE_F && ( ! obj->isKindOf( KINDOF_BLAST_CRATER ) ) ) 
+	if (obj->getHeightAboveTerrain() > PATHFIND_CELL_SIZE_F && ( ! obj->isKindOf( KINDOF_BLAST_CRATER ) ) )
   {
 		return; // Don't add bounds that are up in the air.... unless a blast crater wants to do just that
 	}
@@ -4212,7 +4021,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 		case GEOMETRY_BOX:
 		{
 			m_zoneManager.markZonesDirty( insert );
-      
+
 			Real angle = obj->getOrientation();
 
 			Real halfsizeX = obj->getGeometryInfo().getMajorRadius();
@@ -4220,7 +4029,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 
 			Real c = (Real)Cos(angle);
 			Real s = (Real)Sin(angle);
-				
+
 			const Real STEP_SIZE = PATHFIND_CELL_SIZE_F * 0.5f;	// in theory, should be PATHFIND_CELL_SIZE_F exactly, but needs to be smaller to avoid aliasing problems
 			Real ydx = s * STEP_SIZE;
 			Real ydy = -c * STEP_SIZE;
@@ -4320,13 +4129,13 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
  							if (cellBounds.hi.y<j) cellBounds.hi.y = j;
 						}
 					}
-				} // for i
-			} // for j
-		} // cylinder
+				}
+			}
+		}
 		break;
-	} // switch
+	}
 	m_zoneManager.updateZonesForModify(m_map, m_layers, cellBounds, m_extent);
-	
+
 	Int i, j;
 	cellBounds.lo.x -= 2;
 	cellBounds.lo.y -= 2;
@@ -4348,71 +4157,6 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 		cellBounds.hi.y = m_extent.hi.y;
 	}
 
-
-
-	// Expand building bounds 1 cell.
-#define no_EXPAND_ONE_CELL
-#ifdef EXPAND_ONE_CELL
-	for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )
-	{
-		for( i=cellBounds.lo.x; i<=cellBounds.hi.x; i++ )
-		{
-			if (!insert) {
-				if (m_map[i][j].getType() == PathfindCell::CELL_IMPASSABLE) {
-					m_map[i][j].setType(PathfindCell::CELL_CLEAR);
-				}
-				m_map[i][j].setPinched(false);
-			}
-			if (!insert) {
-				if (m_map[i][j].isObstaclePresent(obj->getID())) {
-					m_map[i][j].removeObstacle( obj );
-				}
-				continue;
-			}
-			if (m_map[i][j].getType() == PathfindCell::CELL_CLEAR) {
-				Bool obstacleAdjacent = false;
-				Int k, l;
-				for (k=i-1; k<i+2; k++) {
-					if (k<m_extent.lo.x || k> m_extent.hi.x) continue;
-					for (l=j-1; l<j+2; l++) {
-						if (l<m_extent.lo.y || l> m_extent.hi.y) continue;
-						if ((k==i) && (l==j)) continue;
-						if ((k!=i) && (l!=j)) continue;
-						if (m_map[k][l].getType()!=PathfindCell::CELL_CLEAR)) {	
-							objectAdjacent = true;
-							break;
-						}
-
-					}
-				}
-				if (obstacleAdjacent) {
-					m_map[i][j].setPinched(true);
-				}
-				// If the total open cells are < 2
-			}
-		}
-	}	 
-
-	if (insert) {
-		for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )
-		{
-			for( i=cellBounds.lo.x; i<=cellBounds.hi.x; i++ )
-			{
-				if (m_map[i][j].getPinched() && m_map[i][j].getType() == PathfindCell::CELL_CLEAR) {
-					ICoord2D pos;
-					pos.x = i;
-					pos.y = j;
-					m_map[i][j].setTypeAsObstacle( obj, false, pos );
-					//m_map[i][j].setType(PathfindCell::CELL_CLIFF);
-					m_map[i][j].setPinched(false);
-				}
-			}
-		}
-	}
-#endif
-
-
-
 	if (!insert) {
 		for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )
 		{
@@ -4469,8 +4213,6 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 	}
 
 	// Expand building bounds 1 cell.
-#define MARK_BORDER_PINCHED
-#ifdef MARK_BORDER_PINCHED
 	for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )
 	{
 		for( i=cellBounds.lo.x; i<=cellBounds.hi.x; i++ )
@@ -4484,7 +4226,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 						if (l<m_extent.lo.y || l> m_extent.hi.y) continue;
 						if ((k==i) && (l==j)) continue;
 						if ((k!=i) && (l!=j)) continue;
-						if (m_map[k][l].getType() == PathfindCell::CELL_OBSTACLE) {	
+						if (m_map[k][l].getType() == PathfindCell::CELL_OBSTACLE) {
 							objectAdjacent = true;
 							break;
 						}
@@ -4496,16 +4238,12 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 				}
 			}
 		}
-	}	
-#endif
-
-
-
+	}
 }
 
 /**
  * Classify the given map cell as WATER, CLIFF, etc.
- * Note that this does NOT classify cells as OBSTACLES. 
+ * Note that this does NOT classify cells as OBSTACLES.
  * OBSTACLE cells are classified only via objects.
  * @todo optimize this - lots of redundant computation
  */
@@ -4628,7 +4366,7 @@ void Pathfinder::classifyMap(void)
 					for (l=j-1; l<j+2; l++) {
 						if (l<m_extent.lo.y || l> m_extent.hi.y) continue;
 						if (m_map[k][l].getType() == PathfindCell::CELL_CLEAR) {
-							m_map[k][l].setPinched(true);	
+							m_map[k][l].setPinched(true);
 						}
 
 					}
@@ -4660,7 +4398,7 @@ void Pathfinder::classifyMap(void)
 					for (l=j-1; l<j+2; l++) {
 						if (l<m_extent.lo.y || l> m_extent.hi.y) continue;
 						if (m_map[k][l].getType() == PathfindCell::CELL_CLEAR) {
-							m_map[k][l].setPinched(true);	
+							m_map[k][l].setPinched(true);
 						}
 
 					}
@@ -4697,13 +4435,11 @@ void Pathfinder::debugShowSearch(  Bool pathFound  )
 	if (!TheGlobalData->m_debugAI) {
 		return;
 	}
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 
 	// show all explored cells for debugging
 	PathfindCell *s;
-
-		
 	RGBColor color;
 	color.red = color.blue = color.green = 1;
 	if (!pathFound) {
@@ -4726,7 +4462,6 @@ void Pathfinder::debugShowSearch(  Bool pathFound  )
 
 	for( s = m_closedList; s; s=s->getNextOpen() )
 	{
-		// create objects to show path - they decay
 		// create objects to show path - they decay
 		RGBColor color;
 		color.red = color.blue = 1;
@@ -4734,7 +4469,7 @@ void Pathfinder::debugShowSearch(  Bool pathFound  )
 		if (!pathFound)	color.blue = 0;
 
 		Int length=200;
-		if (!pathFound) 
+		if (!pathFound)
 			length *= 2;
 
 		Coord3D pos;
@@ -4760,28 +4495,28 @@ Locomotor* Pathfinder::chooseBestLocomotorForPosition(PathfindLayerEnum layer, L
 
 /*static*/ LocomotorSurfaceTypeMask Pathfinder::validLocomotorSurfacesForCellType(PathfindCell::CellType t)
 {
-	if (t == PathfindCell::CELL_OBSTACLE) {
-		return LOCOMOTORSURFACE_AIR;
-	}
-	if (t == PathfindCell::CELL_IMPASSABLE) {
-		return LOCOMOTORSURFACE_AIR;
-	}
-	if (t == PathfindCell::CELL_BRIDGE_IMPASSABLE) {
-		return LOCOMOTORSURFACE_AIR;
-	}
-	if (t==PathfindCell::CELL_CLEAR) {
-		return LOCOMOTORSURFACE_GROUND | LOCOMOTORSURFACE_AIR;
-	}
-	if (t == PathfindCell::CELL_WATER) {
-		return LOCOMOTORSURFACE_WATER | LOCOMOTORSURFACE_AIR;
-	}
-	if (t == PathfindCell::CELL_RUBBLE) {
-		return LOCOMOTORSURFACE_RUBBLE | LOCOMOTORSURFACE_AIR;
-	}
-	if ( t == PathfindCell::CELL_CLIFF ) {
-		return LOCOMOTORSURFACE_CLIFF | LOCOMOTORSURFACE_AIR;
+	switch (t)
+	{
+		case PathfindCell::CELL_CLEAR:
+			return LOCOMOTORSURFACE_GROUND | LOCOMOTORSURFACE_AIR;
+
+		case PathfindCell::CELL_WATER:
+			return LOCOMOTORSURFACE_WATER | LOCOMOTORSURFACE_AIR;
+
+		case PathfindCell::CELL_CLIFF:
+			return LOCOMOTORSURFACE_CLIFF | LOCOMOTORSURFACE_AIR;
+
+		case PathfindCell::CELL_RUBBLE:
+			return LOCOMOTORSURFACE_RUBBLE | LOCOMOTORSURFACE_AIR;
+
+		case PathfindCell::CELL_OBSTACLE:
+		case PathfindCell::CELL_BRIDGE_IMPASSABLE:
+		case PathfindCell::CELL_IMPASSABLE:
+			return LOCOMOTORSURFACE_AIR;
+
+		default:
+			return NO_SURFACES;
 	}
-	return NO_SURFACES;
 }
 
 //
@@ -4797,10 +4532,11 @@ Bool Pathfinder::validMovementTerrain( PathfindLayerEnum layer, const Locomotor*
 
 	if (toCell == NULL)
 		return false;
+	// Only do terrain, not obstacle cells.  jba.
 	if (toCell->getType()==PathfindCell::CELL_OBSTACLE) return true;
 	if (toCell->getType()==PathfindCell::CELL_IMPASSABLE) return true;
 	if (toCell->getLayer()!=LAYER_GROUND && toCell->getLayer() == PathfindCell::CELL_CLEAR) {
-		return true; 
+		return true;
 	}
 	// check validity of destination cell
 	LocomotorSurfaceTypeMask acceptableSurfaces = validLocomotorSurfacesForCellType(toCell->getType());
@@ -4817,43 +4553,40 @@ void Pathfinder::cleanOpenAndClosedLists(void) {
 	if (m_openList) {
 		count += PathfindCell::releaseOpenList(m_openList);
 		m_openList = NULL;
-	}		 
+	}
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+	// TheSuperHackers @info this is here as the map cells are contained within the pathfinder and cannot be cleaned externally.
+	// If the crash mode within PathfindCell::releaseOpenList is hit, it will set s_forceCleanCells to allow the system to cleanly recover.
+	if (s_forceCleanCells) {
+		forceCleanCells();
+		// TheSuperHackers @info cells on the closed list are forcefully cleaned up by this point
+		s_forceCleanCells = false;
+	}
+#endif
+
 	if (m_closedList) {
 		count += PathfindCell::releaseClosedList(m_closedList);
 		m_closedList = NULL;
-	}		 
-	m_cumulativeCellsAllocated += count;
-//#ifdef RTS_DEBUG
-#if 0
-	// Check for dangling cells.
-	for( int j=0; j<=m_extent.hi.y; j++ )
-		for( int i=0; i<=m_extent.hi.x; i++ )
-			if (m_map[ i ][ j ].hasInfo()) {
-				DEBUG_ASSERTCRASH((m_map[i][j].getXIndex()==i && m_map[i][j].getYIndex()==j), ("Wrong cell coordinates"));
-				Bool needInfo = (m_map[ i ][ j ].getType() == PathfindCell::CELL_OBSTACLE);
-				if (m_map[i][j].isAircraftGoal()) {
-					needInfo = true;
-				}
-				if (m_map[i][j].getFlags() != PathfindCell::NO_UNITS)  {
-					needInfo = true;
-				}				
-				if (!needInfo) {
-					DEBUG_LOG(("leaked cell %d, %d\n", m_map[i][j].getXIndex(), m_map[i][j].getYIndex()));
-					m_map[i][j].releaseInfo();
-				}
-				DEBUG_ASSERTCRASH((needInfo), ("Minor temporary memory leak - Extra cell allocated.  Tell JBA steps if repeatable."));
-			};
-	//DEBUG_LOG(("Pathfind used %d cells.\n", count));
+	}
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+	// TheSuperHackers @info this is here and performs the same function as the above block, but for when the crash occurs within the closed list.
+	// If the crash mode within PathfindCell::releaseClosedList is hit, it will set s_forceCleanCells to allow the system to cleanly recover.
+	if (s_forceCleanCells) {
+		forceCleanCells();
+		s_forceCleanCells = false;
+	}
 #endif
-//#endif
 
+	m_cumulativeCellsAllocated += count;
 }
 
 
 //
 // Return true if we can move onto this position
 //
-Bool Pathfinder::validMovementPosition( Bool isCrusher, LocomotorSurfaceTypeMask acceptableSurfaces, 
+Bool Pathfinder::validMovementPosition( Bool isCrusher, LocomotorSurfaceTypeMask acceptableSurfaces,
 																			 PathfindCell *toCell, PathfindCell *fromCell )
 {
 	if (toCell == NULL)
@@ -4873,49 +4606,6 @@ Bool Pathfinder::validMovementPosition( Bool isCrusher, LocomotorSurfaceTypeMask
 	if ((cellSurfaces & acceptableSurfaces) == 0)
 		return false;
 
-#if 0	
-	//
-	// For diagonal moves, check neighboring vertical and horizontal
-	// steps as well to avoid "squeezing through a crack".
-	//
-	if (fromCell)
-	{
-		ICoord2D delta;
-
-		delta.x = toCell->getXIndex() - fromCell->getXIndex();
-		delta.y = toCell->getYIndex() - fromCell->getYIndex();
-
-		if (delta.x != 0 && delta.y != 0)
-		{
-			// test vertical movement
-			PathfindCell *otherCell = getCell( toCell->getXIndex(), fromCell->getYIndex() );
-			Bool open = true;
-
-			// check if cell is on the map
-			if (otherCell == NULL)
-				open = false;
-
-			// check if we can move onto this new cell
-			if (validMovementPosition( locomotorSet, otherCell, fromCell ) == false)
-				open = false;
-
-			// test horizontal movement
-			if (open == false)
-			{
-				otherCell = getCell( fromCell->getXIndex(), toCell->getYIndex() );
-
-				// check if cell is on the map
-				if (otherCell == NULL)
-					return false;
-
-				// check if we can move onto this new cell
-				if (validMovementPosition( locomotorSet, otherCell, fromCell ) == false)
-					return false;
-			}
-		}
-	}
-#endif
-
 	return true;
 }
 
@@ -4941,52 +4631,67 @@ Bool Pathfinder::checkDestination(const Object *obj, Int cellX, Int cellY, Pathf
 	for (i=cellX-iRadius; i<cellX+numCellsAbove; i++) {
 		for (j=cellY-iRadius; j<cellY+numCellsAbove; j++) {
 			PathfindCell	*cell = getCell(layer, i, j);
-			if (cell) {
-				if (checkForAircraft) {
-					if (!cell->isAircraftGoal()) continue;
-					if (cell->getGoalAircraft()==objID) continue;
-					return false;
-				}
-				if (cell->getType()==PathfindCell::CELL_OBSTACLE) {
-					if (cell->isObstaclePresent( ignoreId ))
-						continue;
-					return false;
+			if (!cell) {
+				return false; // off the map, so can't place here.
+			}
+
+			if (checkForAircraft) {
+				if (!cell->isAircraftGoal()) {
+					continue;
 				}
-				if (IS_IMPASSABLE(cell->getType())) {
-					return false;
+				if (cell->getGoalAircraft() == objID) {
+					continue;
 				}
-				if (cell->getFlags() == PathfindCell::NO_UNITS) {
-					continue;  // Nobody is here, so it's ok.
-				} 
-				ObjectID goalUnitID = cell->getGoalUnit();
-				if (goalUnitID==objID) {
-					continue; // we got it.
-				} else if (ignoreId==goalUnitID) {
-					continue; // we are ignoring it.
-				} else if (goalUnitID!=INVALID_ID) {
-					if (obj==NULL) {
-						return false;
-					}
-					Object *unit = TheGameLogic->findObjectByID(goalUnitID);
-					if (unit) {
-						// order matters: we want to know if I consider it to be an ally, not vice versa
-						if (obj->getRelationship(unit) == ALLIES) {
-							return false; 	// Don't usurp your allies goals.  jba.
-						}	
-						if (cell->getFlags()==PathfindCell::UNIT_PRESENT_FIXED) {
-							Bool canCrush = obj->canCrushOrSquish(unit, TEST_CRUSH_OR_SQUISH);
-							if (!canCrush) {
-								return false; // Don't move to an occupied cell.
-							}							
-						}
-					}
+				return false;
+			}
+
+			if (cell->getType()==PathfindCell::CELL_OBSTACLE) {
+				if (cell->isObstaclePresent( ignoreId ))
+					continue;
+				return false;
+			}
+
+			if (IS_IMPASSABLE(cell->getType())) {
+				return false;
+			}
+
+			if (cell->getFlags() == PathfindCell::NO_UNITS) {
+				continue;  // Nobody is here, so it's ok.
+			}
+
+			ObjectID goalUnitID = cell->getGoalUnit();
+			if (goalUnitID == objID) {
+				continue; // we got it.
+			}
+
+			if (goalUnitID == ignoreId) {
+				continue; // we are ignoring it.
+			}
+
+			if (goalUnitID == INVALID_ID) {
+				continue;
+			}
+
+			if (!obj) {
+				return false;
+			}
+			Object *unit = TheGameLogic->findObjectByID(goalUnitID);
+			if (!unit) {
+				continue;
+			}
+
+			// order matters: we want to know if I consider it to be an ally, not vice versa
+			if (obj->getRelationship(unit) == ALLIES) {
+				return false; 	// Don't usurp your allies goals.  jba.
+			}
+			if (cell->getFlags()==PathfindCell::UNIT_PRESENT_FIXED) {
+				Bool canCrush = obj->canCrushOrSquish(unit, TEST_CRUSH_OR_SQUISH);
+				if (!canCrush) {
+					return false; // Don't move to an occupied cell.
 				}
-			} else {
-				return false; // off the map, so can't place here.
 			}
 		}
-	}	
-
+	}
 	return true;
 }
 
@@ -4995,7 +4700,7 @@ Bool Pathfinder::checkDestination(const Object *obj, Int cellX, Int cellY, Pathf
  * Returns false if there are other units already there.
  * Assumes your locomotor already said you can go there.
  */
-Bool Pathfinder::checkForMovement(const Object *obj, TCheckMovementInfo &info)	  
+Bool Pathfinder::checkForMovement(const Object *obj, TCheckMovementInfo &info)
 {
 	info.allyFixedCount = 0;
 	info.allyMoving = false;
@@ -5006,7 +4711,10 @@ Bool Pathfinder::checkForMovement(const Object *obj, TCheckMovementInfo &info)
 	ObjectID		allies[maxAlly];
 	Int					numAlly = 0;
 
-	if (!obj) return true; // not object can move there.
+	if (!obj) {
+		return true; // not object can move there.
+	}
+
 	ObjectID ignoreId = INVALID_ID;
 	if (obj->getAIUpdateInterface()) {
 		ignoreId =  obj->getAIUpdateInterface()->getIgnoredObstacleID();
@@ -5019,83 +4727,83 @@ Bool Pathfinder::checkForMovement(const Object *obj, TCheckMovementInfo &info)
 	for (i=info.cell.x-info.radius; i<info.cell.x+numCellsAbove; i++) {
 		for (j=info.cell.y-info.radius; j<info.cell.y+numCellsAbove; j++) {
 			PathfindCell	*cell = getCell(info.layer,i, j);
-			if (cell) {
-				enum PathfindCell::CellFlags flags = cell->getFlags();
-				ObjectID posUnit = cell->getPosUnit();
-				if ((flags == PathfindCell::UNIT_GOAL) || (flags == PathfindCell::UNIT_GOAL_OTHER_MOVING)) {
-					info.allyGoal = true;
-				}
-				if (flags == PathfindCell::NO_UNITS) {
-					continue;  // Nobody is here, so it's ok.
-				} else if (posUnit==obj->getID()) {
-					continue; // we got it.
-				} else if (posUnit==ignoreId) {
-					continue; // we are ignoring this one.
-				}	else {
-					Bool check = false;
-					Object *unit = NULL;
-					if (flags==PathfindCell::UNIT_PRESENT_MOVING || flags==PathfindCell::UNIT_GOAL_OTHER_MOVING) {
-						unit = TheGameLogic->findObjectByID(posUnit);
-						// order matters: we want to know if I consider it to be an ally, not vice versa
-						if (unit && obj->getRelationship(unit) == ALLIES) {
-							info.allyMoving = true;
-						}
-						if (info.considerTransient) {
-							check = true;
-						}
-					}
-					if (flags == PathfindCell::UNIT_PRESENT_FIXED) {
-						check = true;
-						unit = TheGameLogic->findObjectByID(posUnit);
-					}
-					if (check && unit!=NULL) {
-						if (obj->getAIUpdateInterface() && obj->getAIUpdateInterface()->getIgnoredObstacleID()==unit->getID()) {
-							// Don't check if it's the ignored obstacle.
-							check = false;
-						}
-					}
-					if (check && unit) {
+			if (!cell) {
+				return false; // off the map, so can't move here.
+			}
+
+			PathfindCell::CellFlags flags = cell->getFlags();
+			if ((flags == PathfindCell::UNIT_GOAL) || (flags == PathfindCell::UNIT_GOAL_OTHER_MOVING)) {
+				info.allyGoal = true;
+			} else if (flags == PathfindCell::NO_UNITS) {
+				continue;  // Nobody is here, so it's ok.
+			}
+
+			ObjectID posUnit = cell->getPosUnit();
+			if (posUnit == obj->getID()) {
+				continue; // we got it.
+			}
+
+			if (posUnit == ignoreId) {
+				continue; // we are ignoring this one.
+			}
+
+			Bool check = false;
+			Object *unit = NULL;
+			if (flags == PathfindCell::UNIT_PRESENT_MOVING || flags == PathfindCell::UNIT_GOAL_OTHER_MOVING) {
+				unit = TheGameLogic->findObjectByID(posUnit);
+				// order matters: we want to know if I consider it to be an ally, not vice versa
+				if (unit && obj->getRelationship(unit) == ALLIES) {
+					info.allyMoving = true;
+				}
+				if (info.considerTransient) {
+					check = true;
+				}
+			}
+			if (flags == PathfindCell::UNIT_PRESENT_FIXED) {
+				check = true;
+				unit = TheGameLogic->findObjectByID(posUnit);
+			}
+			if (check && unit!=NULL) {
+				if (obj->getAIUpdateInterface() && obj->getAIUpdateInterface()->getIgnoredObstacleID()==unit->getID()) {
+					// Don't check if it's the ignored obstacle.
+					check = false;
+				}
+			}
+			if (!check || !unit) {
+				continue;
+			}
+
 #ifdef INFANTRY_MOVES_THROUGH_INFANTRY
-						if (obj->isKindOf(KINDOF_INFANTRY) && unit->isKindOf(KINDOF_INFANTRY)) {
-							// Infantry can run through infantry.
-							continue; // 
-						}
-#endif
-						// See if it is an ally.
-						// order matters: we want to know if I consider it to be an ally, not vice versa
-						if (obj->getRelationship(unit) == ALLIES) {
-							if (!unit->getAIUpdateInterface()) {
-								return false; // can't path through not-idle units.
-							}
-#if 0
-							if (!unit->getAIUpdateInterface()->isIdle()) {
-								return false; // can't path through not-idle units.
-							}
+			if (obj->isKindOf(KINDOF_INFANTRY) && unit->isKindOf(KINDOF_INFANTRY)) {
+				// Infantry can run through infantry.
+				continue; //
+			}
 #endif
-							Bool found = false;
-							Int k;
-							for (k=0; k<numAlly; k++) {
-								if (allies[k] == unit->getID()) {
-									found = true;
-								}
-							}
-							if (!found) {
-								info.allyFixedCount++;
-								if (numAlly < maxAlly) {
-									allies[numAlly] = unit->getID();
-									numAlly++;
-								}
-							}
-						}	else {
-							Bool canCrush = obj->canCrushOrSquish( unit, TEST_CRUSH_OR_SQUISH );
-							if (!canCrush) {
-								info.enemyFixed = true;
-							}
-						}
+			// See if it is an ally.
+			// order matters: we want to know if I consider it to be an ally, not vice versa
+			if (obj->getRelationship(unit) == ALLIES) {
+				if (!unit->getAIUpdateInterface()) {
+					return false; // can't path through not-idle units.
+				}
+				Bool found = false;
+				Int k;
+				for (k=0; k<numAlly; k++) {
+					if (allies[k] == unit->getID()) {
+						found = true;
+					}
+				}
+				if (!found) {
+					info.allyFixedCount++;
+					if (numAlly < maxAlly) {
+						allies[numAlly] = unit->getID();
+						numAlly++;
 					}
 				}
 			} else {
-				return false; // off the map, so can't place here.
+				Bool canCrush = obj->canCrushOrSquish( unit, TEST_CRUSH_OR_SQUISH );
+				if (!canCrush) {
+					info.enemyFixed = true;
+				}
 			}
 		}
 	}
@@ -5145,44 +4853,47 @@ void Pathfinder::snapClosestGoalPosition(Object *obj, Coord3D *pos)
 
 	// Try adjusting by 1.
 	Int i,j;
-	for (i=cell.x-1; i<cell.x+2; i++) {
-		for (j=cell.y-1; j<cell.y+2; j++) {
+	for (i = cell.x - 1; i < cell.x + 2; i++) {
+		for (j = cell.y - 1; j < cell.y + 2; j++) {
 			if (checkDestination(obj, i, j, layer, iRadius, center)) {
-				adjustCoordToCell(i, j,  center, *pos, layer);
+				adjustCoordToCell(i, j, center, *pos, layer);
 				return;
 			}
 		}
 	}
-	if (iRadius==0) {
-		// Try to find an unoccupied cell.
-		for (i=cell.x-1; i<cell.x+2; i++) {
-			for (j=cell.y-1; j<cell.y+2; j++) {
-				PathfindCell	*newCell = getCell(layer,i, j);
-				if (newCell) {
-					if (newCell->getGoalUnit()==INVALID_ID || newCell->getGoalUnit()==obj->getID()) {
-						adjustCoordToCell(i, j,  center, *pos, layer);
-						return;
-					}
-				}
+
+	if (iRadius > 0)
+		return;
+
+	// Try to find an unoccupied cell.
+	for (i = cell.x - 1; i < cell.x + 2; i++) {
+		for (j = cell.y - 1; j < cell.y + 2; j++) {
+			PathfindCell* newCell = getCell(layer, i, j);
+			if (!newCell)
+				continue;
+
+			if (newCell->getGoalUnit() == INVALID_ID || newCell->getGoalUnit() == obj->getID()) {
+				adjustCoordToCell(i, j, center, *pos, layer);
+				return;
 			}
 		}
-		// Try to find an unoccupied cell.
-		for (i=cell.x-1; i<cell.x+2; i++) {
-			for (j=cell.y-1; j<cell.y+2; j++) {
-				PathfindCell	*newCell = getCell(layer,i, j);
-				if (newCell) {
-					if (newCell->getFlags()!=PathfindCell::UNIT_PRESENT_FIXED) {
-						adjustCoordToCell(i, j,  center, *pos, layer);
-						return;
-					}
-				}
+	}
+
+	for (i = cell.x - 1; i < cell.x + 2; i++) {
+		for (j = cell.y - 1; j < cell.y + 2; j++) {
+			PathfindCell* newCell = getCell(layer, i, j);
+			if (!newCell)
+				continue;
+
+			if (newCell->getFlags()!=PathfindCell::UNIT_PRESENT_FIXED) {
+				adjustCoordToCell(i, j, center, *pos, layer);
+				return;
 			}
 		}
 	}
-	//DEBUG_LOG(("Couldn't find goal.\n"));
 }
 
-/** 
+/**
  * Returns coordinates of goal.
  *
  */
@@ -5200,10 +4911,10 @@ Bool Pathfinder::goalPosition(Object *obj, Coord3D *pos)
 	return true;
 }
 
- 
+
 Bool Pathfinder::checkForAdjust(Object *obj, const LocomotorSet& locomotorSet, Bool isHuman,
-																Int cellX, Int cellY, PathfindLayerEnum layer, 
-																Int iRadius, Bool center, Coord3D *dest, const Coord3D *groupDest) 
+																Int cellX, Int cellY, PathfindLayerEnum layer,
+																Int iRadius, Bool center, Coord3D *dest, const Coord3D *groupDest)
 {
 	Coord3D adjustDest;
 	PathfindCell *cellP = getCell(layer, cellX, cellY);
@@ -5214,9 +4925,9 @@ Bool Pathfinder::checkForAdjust(Object *obj, const LocomotorSet& locomotorSet, B
 	if (isHuman) {
 		// check if new cell is in logical map.	(computer can move off logical map)
 		if (cellX < m_logicalExtent.lo.x ||
-				cellY < m_logicalExtent.lo.y || 
-				cellX > m_logicalExtent.hi.x || 
-				cellY > m_logicalExtent.hi.y) return false; 
+				cellY < m_logicalExtent.lo.y ||
+				cellX > m_logicalExtent.hi.x ||
+				cellY > m_logicalExtent.hi.y) return false;
 	}
 	if (checkDestination(obj, cellX, cellY, layer, iRadius, center)) {
 		adjustCoordToCell(cellX, cellY,  center, adjustDest, cellP->getLayer());
@@ -5228,7 +4939,7 @@ Bool Pathfinder::checkForAdjust(Object *obj, const LocomotorSet& locomotorSet, B
 		}	else {
 			pathExists = clientSafeQuickDoesPathExist( locomotorSet, obj->getPosition(), dest);
 			adjustedPathExists = clientSafeQuickDoesPathExist( locomotorSet, obj->getPosition(), &adjustDest);
-			if (!pathExists) {	
+			if (!pathExists) {
 				if (clientSafeQuickDoesPathExist( locomotorSet, dest, &adjustDest))	{
  					adjustedPathExists = true;
 				}
@@ -5242,9 +4953,9 @@ Bool Pathfinder::checkForAdjust(Object *obj, const LocomotorSet& locomotorSet, B
 				Int dx = IABS(groupDest->x-adjustDest.x);
 				Int dy = IABS(groupDest->y-adjustDest.y);
 				if (1.4f*(dx+dy)<cost) {
-					return false; 
+					return false;
 				}
-			}			
+			}
 			*dest = adjustDest;
 			return true;
 		}
@@ -5252,8 +4963,8 @@ Bool Pathfinder::checkForAdjust(Object *obj, const LocomotorSet& locomotorSet, B
 	return false;
 }
 
-Bool Pathfinder::checkForLanding(Int cellX, Int cellY, PathfindLayerEnum layer, 
-																Int iRadius, Bool center, Coord3D *dest) 
+Bool Pathfinder::checkForLanding(Int cellX, Int cellY, PathfindLayerEnum layer,
+																Int iRadius, Bool center, Coord3D *dest)
 {
 	Coord3D adjustDest;
 	PathfindCell *cellP = getCell(layer, cellX, cellY);
@@ -5301,8 +5012,7 @@ Bool Pathfinder::adjustToLandingDestination(Object *obj, Coord3D *dest)
 	}
 	worldToCell( &adjustDest, &cell );
 
-	enum {MAX_CELLS_TO_TRY=400};
-	Int limit = MAX_CELLS_TO_TRY; 
+	Int limit = MAX_ADJUSTMENT_CELL_COUNT;
 	Int i, j;
 	i = cell.x;
 	j = cell.y;
@@ -5346,9 +5056,7 @@ Bool Pathfinder::adjustToLandingDestination(Object *obj, Coord3D *dest)
 		delta++;
 	}
 	return false;
-}	
-
-
+}
 
 
 /**
@@ -5381,8 +5089,7 @@ Bool Pathfinder::adjustDestination(Object *obj, const LocomotorSet& locomotorSet
 		layer = TheTerrainLogic->getLayerForDestination(groupDest);
 	}
 
-	enum {MAX_CELLS_TO_TRY=400};
-	Int limit = MAX_CELLS_TO_TRY; 
+	Int limit = MAX_ADJUSTMENT_CELL_COUNT;
 	Int i, j;
 	i = cell.x;
 	j = cell.y;
@@ -5428,14 +5135,12 @@ Bool Pathfinder::adjustDestination(Object *obj, const LocomotorSet& locomotorSet
 		// Didn't work, so just do simple adjust.
 		return(adjustDestination(obj, locomotorSet, dest, NULL));
 	}
-	//DEBUG_LOG(("adjustDestination failed, dest (%f, %f), adj dest (%f,%f), %x %s\n", dest->x, dest->y, adjustDest.x, adjustDest.y,
-		//obj, obj->getTemplate()->getName().str()));
 	return false;
 }
 
 Bool Pathfinder::checkForTarget(const Object *obj, 	Int cellX, Int cellY, const Weapon *weapon,
 																const Object *victim, const Coord3D *victimPos,
-																Int iRadius, Bool center,Coord3D *dest) 
+																Int iRadius, Bool center,Coord3D *dest)
 {
 	Coord3D adjustDest;
 	if (checkDestination(obj, cellX, cellY, LAYER_GROUND, iRadius, center)) {
@@ -5452,7 +5157,7 @@ Bool Pathfinder::checkForTarget(const Object *obj, 	Int cellX, Int cellY, const
  * Find an unoccupied spot for a unit to move to that can fire at victim.
  * Returns false if there are no spots available within a reasonable radius.
  */
-Bool Pathfinder::adjustTargetDestination(const Object *obj, const Object *target, const Coord3D *targetPos, 
+Bool Pathfinder::adjustTargetDestination(const Object *obj, const Object *target, const Coord3D *targetPos,
 																				 const Weapon *weapon, Coord3D *dest)
 {
 	Int iRadius;
@@ -5467,8 +5172,8 @@ Bool Pathfinder::adjustTargetDestination(const Object *obj, const Object *target
 	if (worldToCell( &adjustDest, &cell )) {
 		return false; // outside of bounds.
 	}
-	enum {MAX_CELLS_TO_TRY=400};
-	Int limit = MAX_CELLS_TO_TRY; 
+
+	Int limit = MAX_ADJUSTMENT_CELL_COUNT;
 	Int i, j;
 	i = cell.x;
 	j = cell.y;
@@ -5513,8 +5218,8 @@ Bool Pathfinder::adjustTargetDestination(const Object *obj, const Object *target
 	return false;
 }
 
-Bool Pathfinder::checkForPossible(Bool isCrusher, Int fromZone,  Bool center, const LocomotorSet& locomotorSet, 
-																	Int cellX, Int cellY, PathfindLayerEnum layer, Coord3D *dest, Bool startingInObstacle) 
+Bool Pathfinder::checkForPossible(Bool isCrusher, Int fromZone,  Bool center, const LocomotorSet& locomotorSet,
+																	Int cellX, Int cellY, PathfindLayerEnum layer, Coord3D *dest, Bool startingInObstacle)
 {
 	PathfindCell *goalCell = getCell(layer, cellX, cellY);
 	if (!goalCell) return false;
@@ -5534,7 +5239,7 @@ Bool Pathfinder::checkForPossible(Bool isCrusher, Int fromZone,  Bool center, co
  * Find a pathable spot near the destination.
  * Returns false if there are no spots available within a reasonable radius.
  */
-Bool Pathfinder::adjustToPossibleDestination(Object *obj, const LocomotorSet& locomotorSet, 
+Bool Pathfinder::adjustToPossibleDestination(Object *obj, const LocomotorSet& locomotorSet,
 																						 Coord3D *dest)
 {
 	Int radius;
@@ -5553,7 +5258,7 @@ Bool Pathfinder::adjustToPossibleDestination(Object *obj, const LocomotorSet& lo
 	// determine goal cell
 	PathfindCell *goalCell;
 	PathfindLayerEnum destinationLayer = TheTerrainLogic->getLayerForDestination(dest);
-	
+
 	goalCell = getCell(destinationLayer, goalCellNdx.x, goalCellNdx.y);
 
 
@@ -5571,10 +5276,9 @@ Bool Pathfinder::adjustToPossibleDestination(Object *obj, const LocomotorSet& lo
 		return false;
 	}
 
-	//
 	Int zone1, zone2;
 	Bool isCrusher = obj ? obj->getCrusherLevel() > 0 : false;
-	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, parentCell->getZone());
 	Bool isObstacle = false;
 	if (parentCell->getType() == PathfindCell::CELL_OBSTACLE)	{
 		isObstacle = true;
@@ -5592,8 +5296,7 @@ Bool Pathfinder::adjustToPossibleDestination(Object *obj, const LocomotorSet& lo
 		}
 	}
 
-	enum {MAX_CELLS_TO_TRY=400};
-	Int limit = MAX_CELLS_TO_TRY; 
+	Int limit = MAX_ADJUSTMENT_CELL_COUNT;
 	Int i, j;
 	i = goalCellNdx.x;
 	j = goalCellNdx.y;
@@ -5657,12 +5360,12 @@ Bool Pathfinder::queueForPath(ObjectID id)
 			AIUpdateInterface *tmpAI = tmpObj->getAIUpdateInterface();
 			if (tmpAI) {
 				const Coord3D* pos = tmpAI->friend_getRequestedDestination();
-				DEBUG_ASSERTLOG(pos->x != 0.0 && pos->y != 0.0, ("Queueing pathfind to (0, 0), usually a bug. (Unit Name: '%s', Type: '%s' \n", tmpObj->getName().str(), tmpObj->getTemplate()->getName().str()));
+				DEBUG_ASSERTLOG(pos->x != 0.0 && pos->y != 0.0, ("Queueing pathfind to (0, 0), usually a bug. (Unit Name: '%s', Type: '%s')", tmpObj->getName().str(), tmpObj->getTemplate()->getName().str()));
 			}
 		}
 	}
 #endif
-	
+
 	/* Check & see if we are already queued. */
 	Int slot = m_queuePRHead;
 	while (slot != m_queuePRTail) {
@@ -5689,7 +5392,7 @@ Bool Pathfinder::queueForPath(ObjectID id)
 	return true;
 }
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 void Pathfinder::doDebugIcons(void) {
 	const Int FRAMES_TO_SHOW_OBSTACLES = 100;
 	extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -5699,7 +5402,7 @@ void Pathfinder::doDebugIcons(void) {
 	}
 
 		RGBColor color;
-		color.red = color.green = color.blue = 0;	
+		color.red = color.green = color.blue = 0;
 		addIcon(NULL, 0, 0, color);	 // clear.
 		Coord3D topLeftCorner;
 		Bool showCells = TheGlobalData->m_debugAI==AI_DEBUG_CELLS;
@@ -5710,7 +5413,7 @@ void Pathfinder::doDebugIcons(void) {
 		if (!showCells)	{
 			frameToShowObstacles = TheGameLogic->getFrame()+FRAMES_TO_SHOW_OBSTACLES;
 			//return;
-		}	
+		}
 		// show the pathfind grid
 		for( int j=0; j<getExtent()->y; j++ )
 		{
@@ -5719,10 +5422,10 @@ void Pathfinder::doDebugIcons(void) {
 			for( int i=0; i<getExtent()->x; i++ )
 			{
 				topLeftCorner.x = (Real)i * PATHFIND_CELL_SIZE_F;
-				
-				color.red = color.green = color.blue = 0;	
+
+				color.red = color.green = color.blue = 0;
 				Bool empty = true;
-				
+
 				const PathfindCell *cell = TheAI->pathfinder()->getCell( LAYER_GROUND, i, j );
 				if (cell)
 				{
@@ -5766,7 +5469,7 @@ void Pathfinder::doDebugIcons(void) {
 				}
 				if (showCells) {
 					empty = true;
-					color.red = color.green = color.blue = 0;	
+					color.red = color.green = color.blue = 0;
 					if (empty && cell) {
 						if (cell->getFlags()!=PathfindCell::NO_UNITS) {
 							empty = false;
@@ -5809,8 +5512,6 @@ Path *Pathfinder::getAircraftPath( const Object *obj, const Coord3D *to )
 {
 	// for now, quick path objects don't pathfind, generally airborne units
 	// build a trivial one-node path containing destination, then avoid buildings.
-	
-
 	Path *thePath = newInstance(Path);
 	const AIUpdateInterface *ai = obj->getAI();
 	ObjectID avoidObject = INVALID_ID;
@@ -5843,15 +5544,15 @@ Path *Pathfinder::getAircraftPath( const Object *obj, const Coord3D *to )
 		if (segmentIntersectsTallBuilding(curNode, curNode->getNext(), avoidObject, &newPos1, &newPos2, &newPos3)) {
 			PathNode *newNode3 = newInstance(PathNode);
 			newNode3->setPosition( &newPos3 );
-			newNode3->setLayer(LAYER_GROUND);	
+			newNode3->setLayer(LAYER_GROUND);
 			curNode->append(newNode3);
 			PathNode *newNode2 = newInstance(PathNode);
 			newNode2->setPosition( &newPos2 );
-			newNode2->setLayer(LAYER_GROUND);	
+			newNode2->setLayer(LAYER_GROUND);
 			curNode->append(newNode2);
 			PathNode *newNode1 = newInstance(PathNode);
 			newNode1->setPosition( &newPos1 );
-			newNode1->setLayer(LAYER_GROUND);	
+			newNode1->setLayer(LAYER_GROUND);
 			curNode->append(newNode1);
 			curNode = newNode2;
 		}
@@ -5874,10 +5575,7 @@ Path *Pathfinder::getAircraftPath( const Object *obj, const Coord3D *to )
 }
 
 
-
-
-
-/** 
+/**
  * Process some path requests in the pathfind queue.
  */
 //DECLARE_PERF_TIMER(processPathfindQueue)
@@ -5898,14 +5596,12 @@ void Pathfinder::processPathfindQueue(void)
 #endif
 #endif
 
-
-
-	if (  
+	if (
 #ifdef forceRefreshCalling
 #pragma message("AHHHH!, forced calls to pathzonerefresh still in code...  notify M Lorenzen")
-    s_stopForceCalling==FALSE || 
+    s_stopForceCalling==FALSE ||
 #endif
-    m_zoneManager.needToCalculateZones()) 
+    m_zoneManager.needToCalculateZones())
   {
 		m_zoneManager.calculateZones(m_map, m_layers, m_extent);
 		return;
@@ -5927,7 +5623,7 @@ void Pathfinder::processPathfindQueue(void)
 #ifdef DEBUG_QPF
 	Int pathsFound = 0;
 #endif
-	while (m_cumulativeCellsAllocated < PATHFIND_CELLS_PER_FRAME && 
+	while (m_cumulativeCellsAllocated < PATHFIND_CELLS_PER_FRAME &&
 		m_queuePRTail!=m_queuePRHead) {
 		Object *obj = TheGameLogic->findObjectByID(m_queuedPathfindRequests[m_queuePRHead]);
 		m_queuedPathfindRequests[m_queuePRHead] = INVALID_ID;
@@ -5950,16 +5646,15 @@ void Pathfinder::processPathfindQueue(void)
 #ifdef DEBUG_LOGGING
 		QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 		timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
-		if (timeToUpdate>0.01f) 
+		if (timeToUpdate>0.01f)
 		{
-			DEBUG_LOG(("%d Pathfind queue: %d paths, %d cells", TheGameLogic->getFrame(), pathsFound, m_cumulativeCellsAllocated));
-			DEBUG_LOG(("Time %f (%f)", timeToUpdate, (::GetTickCount()-startTimeMS)/1000.0f));
-			DEBUG_LOG(("\n"));
+			DEBUG_LOG(("%d Pathfind queue: %d paths, %d cells --", TheGameLogic->getFrame(), pathsFound, m_cumulativeCellsAllocated));
+			DEBUG_LOG(("time %f (%f)", timeToUpdate, (::GetTickCount()-startTimeMS)/1000.0f));
 		}
 #endif
 #endif
 	}
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	doDebugIcons();
 #endif
 
@@ -5968,44 +5663,41 @@ void Pathfinder::processPathfindQueue(void)
 
 void Pathfinder::checkChangeLayers(PathfindCell *parentCell)
 {
-		ICoord2D newCellCoord;
-		PathfindCell *newCell;
-		if (parentCell->getConnectLayer() != LAYER_INVALID) {
-			newCellCoord.x = parentCell->getXIndex();
-			newCellCoord.y = parentCell->getYIndex();
+	if (parentCell->getConnectLayer() == LAYER_INVALID)
+		return;
 
-			if (parentCell->getConnectLayer() == LAYER_GROUND) {
-				newCell = getCell(LAYER_GROUND, newCellCoord.x, newCellCoord.y );
-			}	else {
-				newCell = getCell(parentCell->getConnectLayer(), newCellCoord.x, newCellCoord.y);
-			}
-			DEBUG_ASSERTCRASH(newCell, ("Couldn't find cell."));
-			if (newCell) {
-				Bool onList = false;
-				if (newCell->hasInfo()) {
-					if (newCell->getOpen() || newCell->getClosed())
-					{
-						// already on one of the lists 
-						onList = true;
-					}
-				}
-				if (!onList) {
-					if (!newCell->allocateInfo(newCellCoord)) {
-						// Out of cells for pathing...
-						return;
-					}
-					// compute cost of path thus far
-					// keep track of path we're building - point back to cell we moved here from
-					newCell->setParentCell(parentCell) ;
-					// store cost of this path
-					newCell->setCostSoFar(parentCell->getCostSoFar()); // same as parent cost
-					newCell->setTotalCost(parentCell->getTotalCost()) ;
-					// insert newCell in open list such that open list is sorted, smallest total path cost first
-					m_openList = newCell->putOnSortedOpenList( m_openList );
+	ICoord2D newCellCoord = { parentCell->getXIndex(), parentCell->getYIndex() };
+	PathfindCell *newCell = getCell(parentCell->getConnectLayer(), newCellCoord.x, newCellCoord.y );
 
-				}
-			}
-		}
+	if (!newCell) {
+		DEBUG_CRASH(("Couldn't find cell."));
+		return;
+	}
+
+	// already on one of the lists
+	if (newCell->hasInfo() && (newCell->getOpen() || newCell->getClosed())) {
+		return;
+	}
+
+	if (!newCell->allocateInfo(newCellCoord)) {
+		// Out of cells for pathing...
+		return;
+	}
+	// compute cost of path thus far
+	// keep track of path we're building - point back to cell we moved here from
+	newCell->setParentCell(parentCell) ;
+	// store cost of this path
+	newCell->setCostSoFar(parentCell->getCostSoFar()); // same as parent cost
+	newCell->setTotalCost(parentCell->getTotalCost());
+	// insert newCell in open list such that open list is sorted, smallest total path cost first
+	m_openList = newCell->putOnSortedOpenList( m_openList );
+}
+
+bool Pathfinder::checkCellOutsideExtents(ICoord2D& cell) {
+	return 	cell.x < m_logicalExtent.lo.x ||
+					cell.x > m_logicalExtent.hi.x ||
+					cell.y < m_logicalExtent.lo.y ||
+					cell.y > m_logicalExtent.hi.y;
 }
 
 
@@ -6032,23 +5724,16 @@ struct ExamineCellsStruct
 			if ( (to->getLayer() == LAYER_GROUND) && !d->thePathfinder->m_zoneManager.isPassable(to_x, to_y) ) {
 				return 1;
 			}
-			Bool onList = false;
-			if (to->hasInfo()) {
-				if (to->getOpen() || to->getClosed())
-				{
-					// already on one of the lists 
-					onList = true;
-				}
-			}
+
 			if (to->getPinched()) {
 				return 1; // abort.
 			}
 			if (d->isHuman) {
 				// check if new cell is in logical map.	(computer can move off logical map)
 				if (to_x < d->thePathfinder->m_logicalExtent.lo.x) return 1; // abort
-				if (to_y < d->thePathfinder->m_logicalExtent.lo.y) return 1; // abort 
-				if (to_x > d->thePathfinder->m_logicalExtent.hi.x) return 1; // abort 
-				if (to_y > d->thePathfinder->m_logicalExtent.hi.y) return 1; // abort 
+				if (to_y < d->thePathfinder->m_logicalExtent.lo.y) return 1; // abort
+				if (to_x > d->thePathfinder->m_logicalExtent.hi.x) return 1; // abort
+				if (to_y > d->thePathfinder->m_logicalExtent.hi.y) return 1; // abort
 			}
 			TCheckMovementInfo info;
 			info.cell.x = to_x;
@@ -6058,51 +5743,50 @@ struct ExamineCellsStruct
 			info.radius = d->radius;
 			info.considerTransient = false;
 			info.acceptableSurfaces = d->theLoco->getValidSurfaces();
-			if (!d->thePathfinder->checkForMovement(d->obj, info) || info.enemyFixed) {
+			if (!d->thePathfinder->checkForMovement(d->obj, info)) {
 				return 1; //abort.
-			}	
+			}
+
 			if (info.enemyFixed) {
 				return 1; //abort.
 			}
-			ICoord2D newCellCoord;
-			newCellCoord.x = to_x;
-			newCellCoord.y = to_y;
+
+			if (info.allyFixedCount) {
+				return 1; //abort.
+			}
 
 			UnsignedInt newCostSoFar = from->getCostSoFar( ) + 0.5f*COST_ORTHOGONAL;
 			if (to->getType() == PathfindCell::CELL_CLIFF ) {
 				return 1;
 			}
-			if (info.allyFixedCount) {
-				return 1;
-			} else if (info.enemyFixed) {
-				return 1;
-			}
+
+			ICoord2D newCellCoord;
+			newCellCoord.x = to_x;
+			newCellCoord.y = to_y;
 
 			if (!to->allocateInfo(newCellCoord)) {
 				// Out of cells for pathing...
  				return 1;
-			}								
+			}
 			to->setBlockedByAlly(false);
 			Int costRemaining = 0;
 			costRemaining = to->costToGoal( d->goalCell );
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
-			if (onList)
+			if ( to->hasInfo() && (to->getOpen() || to->getClosed()) )
 			{
-				// already on one of the lists - if existing costSoFar is less, 
+				// already on one of the lists - if existing costSoFar is less,
 				// the new cell is on a longer path, so skip it
 				if (to->getCostSoFar() <= newCostSoFar)
 					return 0; // keep going.
 			}
+
 			to->setCostSoFar(newCostSoFar);
 			// keep track of path we're building - point back to cell we moved here from
 			to->setParentCell(from) ;
 			to->setTotalCost(to->getCostSoFar() + costRemaining) ;
 
-			//DEBUG_LOG(("Cell (%d,%d), Parent cost %d, newCostSoFar %d, cost rem %d, tot %d\n", 
-			//	to->getXIndex(), to->getYIndex(), 
-			//	to->costSoFar(from), newCostSoFar, costRemaining, to->getCostSoFar() + costRemaining));
-
 			// if to was on closed list, remove it from the list
 			if (to->getClosed())
 				d->thePathfinder->m_closedList = to->removeFromClosedList( d->thePathfinder->m_closedList );
@@ -6119,9 +5803,7 @@ struct ExamineCellsStruct
 }
 
 
-
-
-Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *goalCell, const LocomotorSet& locomotorSet, 
+Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *goalCell, const LocomotorSet& locomotorSet,
 																				 Bool isHuman, Bool centerInCell, Int radius, const ICoord2D &startCellNdx,
 																				 const Object *obj, Int attackDistance)
 {
@@ -6149,21 +5831,19 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 
 		Int cellCount = 0;
 		// expand search to neighboring orthogonal cells
-		static ICoord2D delta[] = 
-		{ 
-			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 }, 
-			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 } 
+		static ICoord2D delta[] =
+		{
+			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 },
+			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 }
 		};
 		const Int numNeighbors = 8;
 		const Int firstDiagonal = 4;
 		ICoord2D newCellCoord;
 		PathfindCell *newCell;
 		const Int adjacent[5] = {0, 1, 2, 3, 0};
-		Bool neighborFlags[8] = {false, false, false, false, false, false, false};
-
-		UnsignedInt newCostSoFar;
-
+		Bool neighborFlags[8] = { 0 };
 
+		UnsignedInt newCostSoFar = 0;
 
 		for( int i=0; i<numNeighbors; i++ )
 		{
@@ -6176,35 +5856,23 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 			newCell = getCell(parentCell->getLayer(), newCellCoord.x, newCellCoord.y );
 
 			// check if cell is on the map
-			if (newCell == NULL)
+			if (!newCell)
 				continue;
 
 			Bool notZonePassable = false;
 			if ((newCell->getLayer()==LAYER_GROUND) && !m_zoneManager.isPassable(newCellCoord.x, newCellCoord.y)) {
 				notZonePassable = true;
 			}
-			if (isHuman) {
-				// check if new cell is in logical map.	(computer can move off logical map)
-				if (newCellCoord.x < m_logicalExtent.lo.x) continue;
-				if (newCellCoord.y < m_logicalExtent.lo.y) continue; 
-				if (newCellCoord.x > m_logicalExtent.hi.x) continue; 
-				if (newCellCoord.y > m_logicalExtent.hi.y) continue; 
-			}
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if new cell is in logical map.	(computer can move off logical map)
+			if (isHuman && checkCellOutsideExtents(newCellCoord))
+				continue;
+
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
-			Bool onList = false;
-			if (newCell->hasInfo()) {
-				if (newCell->getOpen() || newCell->getClosed())
-				{
-					// already on one of the lists 
-					onList = true;
-				}
-			}
-			if (onList) {
-				// we have already examined this one, so continue.
+			if ( newCell->hasInfo() && (newCell->getOpen() || newCell->getClosed()) )
 				continue;
-			}
+
 			if (i>=firstDiagonal) {
 				// make sure one of the adjacent sides is open.
 				if (!neighborFlags[adjacent[i-4]] && !neighborFlags[adjacent[i-3]]) {
@@ -6229,27 +5897,21 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 					continue;
 			}
 
-
-
-			Bool movementValid = true;
+			Bool movementValid = validMovementPosition(isCrusher, locomotorSet.getValidSurfaces(), newCell, parentCell);
 			Bool dozerHack = false;
-			if (validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), newCell, parentCell )) {
-			}	else {
-				movementValid = false;
-				if (obj->isKindOf(KINDOF_DOZER)) {
-					if (newCell->getType()==PathfindCell::CELL_OBSTACLE) {
-						Object *obstacle = TheGameLogic->findObjectByID(newCell->getObstacleID());
-						if (obstacle && !(obj->getRelationship(obstacle)==ENEMIES)) {
-							movementValid = true;
-							dozerHack = true;
-						}
-					}
+			if (!movementValid && obj->isKindOf(KINDOF_DOZER) && newCell->getType() == PathfindCell::CELL_OBSTACLE) {
+				Object* obstacle = TheGameLogic->findObjectByID(newCell->getObstacleID());
+				if (obstacle && !(obj->getRelationship(obstacle) == ENEMIES)) {
+					movementValid = true;
+					dozerHack = true;
 				}
-				if (!movementValid && !m_isTunneling) {
-					continue;
-				}
-			}	
-			if (!dozerHack) 
+			}
+
+			if (!movementValid && !m_isTunneling) {
+				continue;
+			}
+
+			if (!dozerHack)
 				neighborFlags[i] = true;
 
 			TCheckMovementInfo info;
@@ -6270,16 +5932,18 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 					continue;
 				}
 				movementValid = false;
-			}	
+			}
+
 			if (movementValid && !newCell->getPinched()) {
-				//Note to self - only turn off tunneling after check for movement.jba. 
+				//Note to self - only turn off tunneling after check for movement.jba.
 				m_isTunneling = false;
 			}
+
 			if (!newCell->hasInfo()) {
 				if (!newCell->allocateInfo(newCellCoord)) {
 					// Out of cells for pathing...
  					return cellCount;
-				}								
+				}
 				cellCount++;
 			}
 
@@ -6287,6 +5951,7 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 			if (info.allyMoving && dx<10 && dy<10) {
 				newCostSoFar += 3*COST_DIAGONAL;
 			}
+
 			if (newCell->getType() == PathfindCell::CELL_CLIFF && !newCell->getPinched() ) {
 				Coord3D fromPos;
 				fromPos.x = parentCell->getXIndex() * PATHFIND_CELL_SIZE_F ;
@@ -6304,19 +5969,14 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 			} else if (newCell->getPinched()) {
 				newCostSoFar += COST_ORTHOGONAL;
 			}
+
 			newCell->setBlockedByAlly(false);
 			if (info.allyFixedCount>0) {
-				Int costFactor = 3*COST_DIAGONAL;
-				if (attackDistance != NO_ATTACK) {
-					costFactor = 3*COST_DIAGONAL;
-				}
-				if (canPathThroughUnits) {
-					newCostSoFar += costFactor;
-				}	else {
+				newCostSoFar += 3*COST_DIAGONAL;
+				if (!canPathThroughUnits)
 					newCell->setBlockedByAlly(true);
-					newCostSoFar += costFactor;
-				}
-			} 
+			}
+
 			Int costRemaining = 0;
 			if (goalCell) {
 				if (attackDistance == NO_ATTACK)  {
@@ -6326,10 +5986,11 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 					dy = newCellCoord.y - goalCell->getYIndex();
 					costRemaining = COST_ORTHOGONAL*sqrt(dx*dx + dy*dy);
 					costRemaining -= attackDistance/2;
-					if (costRemaining<0) costRemaining=0;
+					if (costRemaining<0)
+						costRemaining=0;
 					if (info.allyGoal) {
 						if (obj->isKindOf(KINDOF_VEHICLE)) {
-							newCostSoFar += 3*COST_ORTHOGONAL; 
+							newCostSoFar += 3*COST_ORTHOGONAL;
 						}	else {
 							// Infantry can pass through infantry.
 							newCostSoFar += COST_ORTHOGONAL;
@@ -6337,26 +5998,21 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 					}
 				}
 			}
+
 			if (notZonePassable) {
 				newCostSoFar += 100*COST_ORTHOGONAL;
 			}
+
 			if (newCell->getType()==PathfindCell::CELL_OBSTACLE) {
 				newCostSoFar += 100*COST_ORTHOGONAL;
 			}
-			// check if this neighbor cell is already on the open (waiting to be tried) 
-			// or closed (already tried) lists
-			if (onList)
-			{
-				// already on one of the lists - if existing costSoFar is less, 
-				// the new cell is on a longer path, so skip it
-				if (newCell->getCostSoFar() <= newCostSoFar)
-					continue;
-			}
+
 			if (m_isTunneling) {
 				if (!validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), newCell, parentCell )) {
 					newCostSoFar += 10*COST_ORTHOGONAL;
 				}
 			}
+
 			newCell->setCostSoFar(newCostSoFar);
 			// keep track of path we're building - point back to cell we moved here from
 			newCell->setParentCell(parentCell) ;
@@ -6365,10 +6021,6 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
 			}
 			newCell->setTotalCost(newCell->getCostSoFar() + costRemaining) ;
 
-			//DEBUG_LOG(("Cell (%d,%d), Parent cost %d, newCostSoFar %d, cost rem %d, tot %d\n", 
-			//	newCell->getXIndex(), newCell->getYIndex(), 
-			//	newCell->costSoFar(parentCell), newCostSoFar, costRemaining, newCell->getCostSoFar() + costRemaining));
-
 			// if newCell was on closed list, remove it from the list
 			if (newCell->getClosed())
 				m_closedList = newCell->removeFromClosedList( m_closedList );
@@ -6388,7 +6040,7 @@ Int Pathfinder::examineNeighboringCells(PathfindCell *parentCell, PathfindCell *
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-Path *Pathfinder::findPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, 
+Path *Pathfinder::findPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 													 const Coord3D *rawTo)
 {
 	if (!clientSafeQuickDoesPathExist(locomotorSet, from, rawTo)) {
@@ -6412,62 +6064,18 @@ Path *Pathfinder::findPath( Object *obj, const LocomotorSet& locomotorSet, const
 		return pat;
 	}
 
-/* hierarchical build path code.
-	if (pat) {
-
-		Path *path = newInstance(Path);
-		PathNode *prior = NULL;
-		for (PathNode *node = pat->getLastNode(); node; node=node->getPrevious()) {
-			Bool unobstructed = true;
-			if (prior!=NULL) {
-				unobstructed = isLinePassable( obj, locomotorSet.getValidSurfaces(), 
-				prior->getLayer(), *prior->getPosition(), *node->getPosition(), false, true);
-			}
-			if (unobstructed) {
-				path->prependNode( node->getPosition(), node->getLayer() );
-				path->getFirstNode()->setCanOptimize(node->getCanOptimize());	
-				path->getFirstNode()->setNextOptimized(path->getFirstNode()->getNext());
-			} else {
-				Path *linkPath = findClosestPath(obj, locomotorSet, node->getPosition(), 
-					prior->getPosition(), false, 0, true);
-				if (linkPath==NULL) {
-					DEBUG_LOG(("Couldn't find path - unexpected. jba.\n"));
-					continue;
-				}
-				PathNode *linkNode = linkPath->getLastNode();
-				if (linkNode==NULL) {
-					DEBUG_LOG(("Empty path - unexpected. jba.\n"));
-					continue;
-				}
-				for (linkNode=linkNode->getPrevious(); linkNode; linkNode=linkNode->getPrevious()) {
-					path->prependNode( linkNode->getPosition(), linkNode->getLayer() );
-					path->getFirstNode()->setCanOptimize(linkNode->getCanOptimize());
-					path->getFirstNode()->setNextOptimized(path->getFirstNode()->getNext());
-				}
-				deleteInstance(linkPath);
-			}
-			prior = node;
-		}
-		deleteInstance(pat);
-		path->optimize(obj, locomotorSet.getValidSurfaces(), false);
-		if (TheGlobalData->m_debugAI) {
-			setDebugPath(path);
-		}
-		return path;
-	}
-*/
-	return NULL; 
+	return NULL;
 }
 /**
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, 
+Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 													 const Coord3D *rawTo)
 {
-	//CRCDEBUG_LOG(("Pathfinder::findPath()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::findPath()"));
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG(("internal find path...\n"));
+	DEBUG_LOG(("internal find path..."));
 #endif
 
 #ifdef DEBUG_LOGGING
@@ -6478,14 +6086,14 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 	if (obj) {
 		getRadiusAndCenter(obj, radius, centerInCell);
 	}
-	
+
 	Bool isHuman = true;
 	if (obj && obj->getControllingPlayer() && (obj->getControllingPlayer()->getPlayerType()==PLAYER_COMPUTER)) {
 		isHuman = false; // computer gets to cheat.
 	}
 
 	if (rawTo->x == 0.0f && rawTo->y == 0.0f) {
-		DEBUG_LOG(("Attempting pathfind to 0,0, generally a bug.\n"));
+		DEBUG_LOG(("Attempting pathfind to 0,0, generally a bug."));
 		return NULL;
 	}
 	DEBUG_ASSERTCRASH(m_openList==NULL && m_closedList == NULL, ("Dangling lists."));
@@ -6511,7 +6119,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 	if (goalCell == NULL) {
 		return NULL;
 	}
-	
+
 	ICoord2D cell;
 	worldToCell( to, &cell );
 
@@ -6548,23 +6156,21 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 	// to ignore obstacle cells until it reaches a cell that is no longer
 	// classified as an obstacle.  At that point, the pathfind behaves normally.
 	//
-	if (parentCell->getType() == PathfindCell::CELL_OBSTACLE)	{
-		m_isTunneling = true;
-	}
-	else {
-		m_isTunneling = false;
-	}
+	m_isTunneling = parentCell->getType() == PathfindCell::CELL_OBSTACLE;
 
 	Int zone1, zone2;
 	Bool isCrusher = obj ? obj->getCrusherLevel() > 0 : false;
-	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, parentCell->getZone());
 	zone2 =  m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, goalCell->getZone());
 
-	if (layer==LAYER_WALL && zone1 == 0) {
-		return NULL;
-	}
-
-	if (destinationLayer==LAYER_WALL && zone2 == 0) {
+	if ( (layer==LAYER_WALL && zone1 == 0) || (destinationLayer==LAYER_WALL && zone2 == 0) ) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (s_useFixedPathfinding)
+#endif
+		{
+			goalCell->releaseInfo();
+			parentCell->releaseInfo();
+		}
 		return NULL;
 	}
 
@@ -6573,20 +6179,20 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 		zone2 = m_zoneManager.getEffectiveTerrainZone(zone2);
 		zone2 =  m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, zone2);
 		zone1 = m_zoneManager.getEffectiveTerrainZone(zone1);
-		zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, zone1); 
-	}																																 
+		zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), isCrusher, zone1);
+	}
 
-	//DEBUG_LOG(("Zones %d to %d\n", zone1, zone2));
+	//DEBUG_LOG(("Zones %d to %d", zone1, zone2));
 
 	if ( zone1 != zone2) {
-		//DEBUG_LOG(("Intense Debug Info - Pathfind Zone screen failed-cannot reach desired location.\n"));
+		//DEBUG_LOG(("Intense Debug Info - Pathfind Zone screen failed-cannot reach desired location."));
 		goalCell->releaseInfo();
 		parentCell->releaseInfo();
 		return NULL;
 	}
 
 	// sanity check - if destination is invalid, can't path there
-	if (validMovementPosition( isCrusher, destinationLayer, locomotorSet, to ) == false)	{
+	if (!validMovementPosition( isCrusher, destinationLayer, locomotorSet, to ))	{
 		m_isTunneling = false;
 		goalCell->releaseInfo();
 		parentCell->releaseInfo();
@@ -6594,7 +6200,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 	}
 
 	// sanity check - if source is invalid, we have to cheat
-	if (validMovementPosition( isCrusher, layer, locomotorSet, from ) == false)	{
+	if (!validMovementPosition( isCrusher, layer, locomotorSet, from ))	{
 		// somehow we got to an impassable location.
 		m_isTunneling = true;
 	}
@@ -6624,15 +6230,15 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 			// success - found a path to the goal
 			Bool show = TheGlobalData->m_debugAI==AI_DEBUG_PATHS;
 #ifdef INTENSE_DEBUG
-			DEBUG_LOG(("internal find path SUCCESS...\n"));
+			DEBUG_LOG(("internal find path SUCCESS..."));
 			Int count = 0;
 			if (cellCount>1000 && obj) {
 				show = true;
-				DEBUG_LOG(("cells %d obj %s %x from (%f,%f) to(%f, %f)\n", count, obj->getTemplate()->getName().str(), obj, from->x, from->y, to->x, to->y));
+				DEBUG_LOG(("cells %d obj %s %x from (%f,%f) to(%f, %f)", count, obj->getTemplate()->getName().str(), obj, from->x, from->y, to->x, to->y));
 #ifdef STATE_MACHINE_DEBUG
 				if( obj->getAIUpdateInterface() )
 				{
-					DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+					DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 				}
 #endif
 				TheScriptEngine->AppendDebugMessage("Big path", false);
@@ -6644,10 +6250,20 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 			m_isTunneling = false;
 			// construct and return path
 			Path *path =  buildActualPath( obj, locomotorSet.getValidSurfaces(), from, goalCell, centerInCell, false );
-			parentCell->releaseInfo();
-			cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding)
+			{
+				parentCell->releaseInfo();
+				cleanOpenAndClosedLists();
+			}
+			else
+#endif
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
+			}
 			return path;
-		}	
+		}
 
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
@@ -6660,9 +6276,9 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 	}
 
 	// failure - goal cannot be reached
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG(("internal find path FAILURE...\n"));
+	DEBUG_LOG(("internal find path FAILURE..."));
 #endif
 	if (TheGlobalData->m_debugAI == AI_DEBUG_PATHS)
 	{
@@ -6678,7 +6294,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);
 		pos = *to;
 		pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y ) + 0.5f;
-		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);	
+		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);
 		Real dx, dy;
 		dx = from->x - to->x;
 		dy = from->y - to->y;
@@ -6694,7 +6310,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 			addIcon(&pos, PATHFIND_CELL_SIZE_F/2, 60, color);
 
 		}
-	}	
+	}
 
 	if (obj) {
 #ifdef DUMP_PERF_STATS
@@ -6703,7 +6319,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 #ifdef STATE_MACHINE_DEBUG
 		if( obj->getAIUpdateInterface() )
 		{
-			DEBUG_LOG(("state %s\n", obj->getAIUpdateInterface()->getCurrentStateName().str()));
+			DEBUG_LOG(("state %s", obj->getAIUpdateInterface()->getCurrentStateName().str()));
 		}
 #endif
 	}
@@ -6715,15 +6331,25 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 		Bool valid;
 		valid = validMovementPosition( isCrusher, obj->getLayer(), locomotorSet, to ) ;
 
-		DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-		DEBUG_LOG(("Pathfind failed from (%f,%f) to (%f,%f), OV %d\n", from->x, from->y, to->x, to->y, valid));
-		DEBUG_LOG(("Unit '%s', time %f, cells %d\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f,cellCount));
+		DEBUG_LOG(("%d Pathfind failed from (%f,%f) to (%f,%f), OV %d --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y, valid));
+		DEBUG_LOG(("Unit '%s', time %f, cells %d", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f,cellCount));
 	}
 #endif
 
 	m_isTunneling = false;
-	goalCell->releaseInfo();
-	cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding)
+	{
+		goalCell->releaseInfo();
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+		goalCell->releaseInfo();
+	}
 	return NULL;
 }
 
@@ -6731,7 +6357,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
  * Checks to see if there is enough path width at this cell for ground
  * movement.  Returns the width available.
  */
-Int Pathfinder::clearCellForDiameter(Bool crusher, Int cellX, Int cellY, PathfindLayerEnum layer, Int pathDiameter)	  
+Int Pathfinder::clearCellForDiameter(Bool crusher, Int cellX, Int cellY, PathfindLayerEnum layer, Int pathDiameter)
 {
 	Int radius = pathDiameter/2;
 	Int numCellsAbove = radius;
@@ -6808,7 +6434,7 @@ Path *Pathfinder::buildGroundPath(Bool isCrusher, const Coord3D *fromPos, Pathfi
 	path->optimizeGroundPath( isCrusher, pathDiameter );
 
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -6840,7 +6466,7 @@ Path *Pathfinder::buildGroundPath(Bool isCrusher, const Coord3D *fromPos, Pathfi
 	}
 #endif
 	return path;
-}			 
+}
 
 /**
  * Work backwards from goal cell to construct final path.
@@ -6872,7 +6498,7 @@ Path *Pathfinder::buildHierachicalPath( const Coord3D *fromPos, PathfindCell *go
 		}
 	}
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -6899,7 +6525,7 @@ Path *Pathfinder::buildHierachicalPath( const Coord3D *fromPos, PathfindCell *go
 	}
 #endif
 	return path;
-}			 
+}
 
 
 struct MADStruct
@@ -6916,10 +6542,10 @@ struct MADStruct
 		if (to->getPosUnit()==INVALID_ID) {
 			return 0;
 		}
-		if (to->getPosUnit()==d->obj->getID()) { 
+		if (to->getPosUnit()==d->obj->getID()) {
 			return 0;	// It's us.
 		}
-		if (to->getPosUnit()==d->ignoreID) { 
+		if (to->getPosUnit()==d->ignoreID) {
 			return 0;	 // It's the one we are ignoring.
 		}
 		Object *otherObj = TheGameLogic->findObjectByID(to->getPosUnit());
@@ -6927,15 +6553,15 @@ struct MADStruct
 		if (d->obj->getRelationship(otherObj)!=ALLIES) {
 			return 0;  // Only move allies.
 		}
-		if( otherObj && otherObj->getAI() && !otherObj->getAI()->isMoving() ) 
+		if( otherObj && otherObj->getAI() && !otherObj->getAI()->isMoving() )
 		{
 			//Kris: Patch 1.01 November 3, 2003
 			//Black Lotus exploit fix -- moving while hacking.
 			if( otherObj->testStatus( OBJECT_STATUS_IS_USING_ABILITY ) || otherObj->getAI()->isBusy() )
 			{
-				return 0; // Packing or unpacking objects for example 
+				return 0; // Packing or unpacking objects for example
 			}
-			//DEBUG_LOG(("Moving ally\n"));
+			//DEBUG_LOG(("Moving ally"));
 			otherObj->getAI()->aiMoveAwayFromUnit(d->obj, CMD_FROM_AI);
 		}
 	}
@@ -6974,12 +6600,12 @@ struct GroundCellsStruct
 			if (to->hasInfo()) {
 				if (to->getOpen() || to->getClosed())
 				{
-					// already on one of the lists 
+					// already on one of the lists
 					return 1; // abort.
 				}
 			}
 			// See how wide the cell is.
-			Int clearDiameter = d->thePathfinder->clearCellForDiameter(d->crusher, to_x, to_y, to->getLayer(), d->pathDiameter); 
+			Int clearDiameter = d->thePathfinder->clearCellForDiameter(d->crusher, to_x, to_y, to->getLayer(), d->pathDiameter);
 			if (clearDiameter != d->pathDiameter) {
 				return 1;
 			}
@@ -6989,7 +6615,7 @@ struct GroundCellsStruct
 			if (!to->allocateInfo(newCellCoord)) {
 				// Out of cells for pathing...
  				return 1;
-			}								
+			}
 
 			UnsignedInt newCostSoFar = from->getCostSoFar( ) + 0.5f*COST_ORTHOGONAL;
 			to->setBlockedByAlly(false);
@@ -7012,18 +6638,18 @@ struct GroundCellsStruct
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-Path *Pathfinder::findGroundPath( const Coord3D *from, 
+Path *Pathfinder::findGroundPath( const Coord3D *from,
 													 const Coord3D *rawTo, Int pathDiameter, Bool crusher)
 {
-	//CRCDEBUG_LOG(("Pathfinder::findGroundPath()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::findGroundPath()"));
 #ifdef DEBUG_LOGGING
 	Int startTimeMS = ::GetTickCount();
 #endif
 #ifdef INTENSE_DEBUG
 	DEBUG_LOG(("Find ground path..."));
-#endif	
+#endif
 	Bool centerInCell = false;
-	
+
 	m_zoneManager.clearPassableFlags();
 	Bool isHuman = true;
 
@@ -7035,7 +6661,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 	}
 
 	if (rawTo->x == 0.0f && rawTo->y == 0.0f) {
-		DEBUG_LOG(("Attempting pathfind to 0,0, generally a bug.\n"));
+		DEBUG_LOG(("Attempting pathfind to 0,0, generally a bug."));
 		return NULL;
 	}
 	DEBUG_ASSERTCRASH(m_openList==NULL && m_closedList == NULL, ("Dangling lists."));
@@ -7051,7 +6677,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 	m_isTunneling = false;
 
 	PathfindLayerEnum destinationLayer = TheTerrainLogic->getLayerForDestination(to);
-	
+
 	ICoord2D cell;
 	worldToCell( to, &cell );
 
@@ -7099,6 +6725,12 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 	PathfindLayerEnum layer = TheTerrainLogic->getLayerForDestination(from);
 	PathfindCell *parentCell = getClippedCell( layer,&clipFrom );
 	if (parentCell == NULL) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (s_useFixedPathfinding)
+#endif
+		{
+			goalCell->releaseInfo();
+		}
 		return NULL;
 	}
 	if (parentCell!=goalCell) {
@@ -7112,10 +6744,10 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 
 	Int zone1, zone2;
 	// m_isCrusher = false;
-	zone1 = m_zoneManager.getEffectiveZone(LOCOMOTORSURFACE_GROUND, false, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(LOCOMOTORSURFACE_GROUND, false, parentCell->getZone());
 	zone2 =  m_zoneManager.getEffectiveZone(LOCOMOTORSURFACE_GROUND, false, goalCell->getZone());
 
-	//DEBUG_LOG(("Zones %d to %d\n", zone1, zone2));
+	//DEBUG_LOG(("Zones %d to %d", zone1, zone2));
 
 	if ( zone1 != zone2) {
 		goalCell->releaseInfo();
@@ -7130,6 +6762,11 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 	// "closed" list is initially empty
 	m_closedList = NULL;
 
+	// TheSuperHackers @fix helmutbuhler This was originally uninitialized and in the loop below.
+#if RETAIL_COMPATIBLE_CRC
+	UnsignedInt newCostSoFar = 0;
+#endif
+
 	//
 	// Continue search until "open" list is empty, or
 	// until goal is found.
@@ -7143,12 +6780,12 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 
 		if (parentCell == goalCell)
 		{
-			// success - found a path to the goal	 
+			// success - found a path to the goal
 #ifdef INTENSE_DEBUG
 	DEBUG_LOG((" time %d msec %d cells", (::GetTickCount()-startTimeMS), cellCount));
-	DEBUG_LOG((" SUCCESS\n"));
-#endif	
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+	DEBUG_LOG((" SUCCESS"));
+#endif
+#if defined(RTS_DEBUG)
 			Bool show = TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS;
 			if (show)
 				debugShowSearch(true);
@@ -7156,10 +6793,20 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 			m_isTunneling = false;
 			// construct and return path
 			Path *path =  buildGroundPath(crusher, from, goalCell, centerInCell, pathDiameter );
-			parentCell->releaseInfo();
-			cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding)
+			{
+				parentCell->releaseInfo();
+				cleanOpenAndClosedLists();
+			}
+			else
+#endif
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
+			}
 			return path;
-		}	
+		}
 
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
@@ -7181,22 +6828,21 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 		iterateCellsAlongLine(start, end, parentCell->getLayer(), groundCellsCallback, &info);
 
 		// expand search to neighboring orthogonal cells
-		static ICoord2D delta[] = 
-		{ 
-			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 }, 
-			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 } 
+		static ICoord2D delta[] =
+		{
+			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 },
+			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 }
 		};
 		const Int numNeighbors = 8;
 		const Int firstDiagonal = 4;
 		ICoord2D newCellCoord;
 		PathfindCell *newCell;
 		const Int adjacent[5] = {0, 1, 2, 3, 0};
-		Bool neighborFlags[8] = {false, false, false, false, false, false, false};
+		Bool neighborFlags[8] = { 0 };
 
 		// TheSuperHackers @fix Mauller 23/05/2025 Fixes uninitialized variable.
-		// To keep retail compatibility it needs to be uninitialized in VC6 builds.
-#if defined(_MSC_VER) && _MSC_VER < 1300
-		UnsignedInt newCostSoFar;
+#if RETAIL_COMPATIBLE_CRC
+		// newCostSoFar defined in outer block.
 #else
 		UnsignedInt newCostSoFar = 0;
 #endif
@@ -7225,13 +6871,13 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 				if (!passable) continue;
 			}
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
 			Bool onList = false;
 			if (newCell->hasInfo()) {
 				if (newCell->getOpen() || newCell->getClosed())
 				{
-					// already on one of the lists 
+					// already on one of the lists
 					onList = true;
 				}
 			}
@@ -7246,7 +6892,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 				}
 
 				// See how wide the cell is.
-				clearDiameter = clearCellForDiameter(crusher, newCellCoord.x, newCellCoord.y, newCell->getLayer(), pathDiameter); 
+				clearDiameter = clearCellForDiameter(crusher, newCellCoord.x, newCellCoord.y, newCell->getLayer(), pathDiameter);
 				if (newCell->getType() != PathfindCell::CELL_CLEAR) {
 					continue;
 				}
@@ -7258,9 +6904,11 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 				if (!newCell->allocateInfo(newCellCoord)) {
 					// Out of cells for pathing...
  					continue;
-				}								
+				}
 				cellCount++;
 
+#if RETAIL_COMPATIBLE_CRC
+				// TheSuperHackers @fix helmutbuhler 11/06/2025 The indentation was wrong on retail here.
 				newCostSoFar = newCell->costSoFar( parentCell );
 				if (clearDiameter<pathDiameter) {
 					int delta = pathDiameter-clearDiameter;
@@ -7268,30 +6916,32 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 				}
 				newCell->setBlockedByAlly(false);
 			}
+#else
+			}
+			newCostSoFar = newCell->costSoFar( parentCell );
+			if (clearDiameter<pathDiameter) {
+				int delta = pathDiameter-clearDiameter;
+				newCostSoFar += 0.6f*(delta*COST_ORTHOGONAL);
+			}
+			newCell->setBlockedByAlly(false);
+#endif
 			Int costRemaining = 0;
 			costRemaining = newCell->costToGoal( goalCell );
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
 			if (onList)
 			{
-				// already on one of the lists - if existing costSoFar is less, 
+				// already on one of the lists - if existing costSoFar is less,
 				// the new cell is on a longer path, so skip it
 				if (newCell->getCostSoFar() <= newCostSoFar)
 					continue;
 			}
-			//DEBUG_LOG(("CELL(%d,%d)L%d CD%d CSF %d, CR%d // ",newCell->getXIndex(), newCell->getYIndex(), 
-			//	newCell->getLayer(), clearDiameter, newCostSoFar, costRemaining));
-			//if ((cellCount&7)==0) DEBUG_LOG(("\n"));
 			newCell->setCostSoFar(newCostSoFar);
 			// keep track of path we're building - point back to cell we moved here from
 			newCell->setParentCell(parentCell) ;
 			newCell->setTotalCost(newCell->getCostSoFar() + costRemaining) ;
 
-			//DEBUG_LOG(("Cell (%d,%d), Parent cost %d, newCostSoFar %d, cost rem %d, tot %d\n", 
-			//	newCell->getXIndex(), newCell->getYIndex(), 
-			//	newCell->costSoFar(parentCell), newCostSoFar, costRemaining, newCell->getCostSoFar() + costRemaining));
-
 			// if newCell was on closed list, remove it from the list
 			if (newCell->getClosed())
 				m_closedList = newCell->removeFromClosedList( m_closedList );
@@ -7303,14 +6953,12 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 			// insert newCell in open list such that open list is sorted, smallest total path cost first
 			m_openList = newCell->putOnSortedOpenList( m_openList );
 		}
-
-
 	}
 	// failure - goal cannot be reached
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG((" FAILURE\n"));
-#endif	
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+	DEBUG_LOG((" FAILURE"));
+#endif
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -7325,7 +6973,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);
 		pos = *to;
 		pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y ) + 0.5f;
-		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);	
+		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);
 		Real dx, dy;
 		dx = from->x - to->x;
 		dy = from->y - to->y;
@@ -7341,19 +6989,29 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 			addIcon(&pos, PATHFIND_CELL_SIZE_F/2, 60, color);
 
 		}
-	}	
+	}
 #endif
 
-	DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-	DEBUG_LOG(("FindGroundPath failed from (%f,%f) to (%f,%f)\n", from->x, from->y, to->x, to->y));
-	DEBUG_LOG(("time %f\n", (::GetTickCount()-startTimeMS)/1000.0f));
+	DEBUG_LOG(("%d FindGroundPath failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
+	DEBUG_LOG(("time %f", (::GetTickCount()-startTimeMS)/1000.0f));
 
 #ifdef DUMP_PERF_STATS
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	goalCell->releaseInfo();
-	cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding)
+	{
+		goalCell->releaseInfo();
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+		goalCell->releaseInfo();
+	}
 	return NULL;
 }
 
@@ -7361,8 +7019,8 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-void Pathfinder::processHierarchicalCell( const ICoord2D &scanCell, const ICoord2D &delta, PathfindCell *parentCell, 
-																				 PathfindCell *goalCell, zoneStorageType parentZone, 
+void Pathfinder::processHierarchicalCell( const ICoord2D &scanCell, const ICoord2D &delta, PathfindCell *parentCell,
+																				 PathfindCell *goalCell, zoneStorageType parentZone,
 																				 zoneStorageType *examinedZones, Int &numExZones,
 																				 Bool crusher, Int &cellCount)
 {
@@ -7374,14 +7032,14 @@ void Pathfinder::processHierarchicalCell( const ICoord2D &scanCell, const ICoord
 		return;
 	}
 	if (parentZone == m_zoneManager.getBlockZone(LOCOMOTORSURFACE_GROUND,
-		crusher, scanCell.x, scanCell.y, m_map)) { 
+		crusher, scanCell.x, scanCell.y, m_map)) {
 		PathfindCell *newCell = getCell(LAYER_GROUND, scanCell.x, scanCell.y);
 		if( !newCell->hasInfo() )
 		{
  			return;
 		}
 
-		if( newCell->getOpen() || newCell->getClosed() ) 
+		if( newCell->getOpen() || newCell->getClosed() )
 			return; // already looked at this one.
 
 		ICoord2D adjacentCell = scanCell;
@@ -7393,7 +7051,7 @@ void Pathfinder::processHierarchicalCell( const ICoord2D &scanCell, const ICoord
 			adjacentCell.y<m_extent.lo.y || adjacentCell.y>m_extent.hi.y) {
 			return;
 		}
-		PathfindCell *adjNewCell = getCell(LAYER_GROUND, adjacentCell.x, adjacentCell.y); 
+		PathfindCell *adjNewCell = getCell(LAYER_GROUND, adjacentCell.x, adjacentCell.y);
 		if (adjNewCell->hasInfo() && (adjNewCell->getOpen() || adjNewCell->getClosed())) return; // already looked at this one.
 		zoneStorageType parentGlobalZone = m_zoneManager.getEffectiveZone(LOCOMOTORSURFACE_GROUND, crusher, parentZone);
 
@@ -7415,10 +7073,21 @@ void Pathfinder::processHierarchicalCell( const ICoord2D &scanCell, const ICoord
 		if (found) {
 			return;
 		}
-		
+
 		newCell->allocateInfo(scanCell);
-		if (!newCell->getClosed() && !newCell->getOpen()) {
-			m_closedList = newCell->putOnClosedList(m_closedList);
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (!s_useFixedPathfinding)
+		{
+			if (!newCell->getClosed() && !newCell->getOpen()) {
+				m_closedList = newCell->putOnClosedList(m_closedList);
+			}
+		}
+		else
+#endif
+		{
+			if (newCell->hasInfo() && !newCell->getClosed() && !newCell->getOpen()) {
+				m_closedList = newCell->putOnClosedList(m_closedList);
+			}
 		}
 
 		adjNewCell->allocateInfo(adjacentCell);
@@ -7450,7 +7119,7 @@ void Pathfinder::processHierarchicalCell( const ICoord2D &scanCell, const ICoord
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-Path *Pathfinder::findHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from, 
+Path *Pathfinder::findHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from,
 													 const Coord3D *to, Bool crusher)
 {
 	return internal_findHierarchicalPath(isHuman, locomotorSet.getValidSurfaces(), from, to, crusher, FALSE);
@@ -7461,7 +7130,7 @@ Path *Pathfinder::findHierarchicalPath( Bool isHuman, const LocomotorSet& locomo
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-Path *Pathfinder::findClosestHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from, 
+Path *Pathfinder::findClosestHierarchicalPath( Bool isHuman, const LocomotorSet& locomotorSet, const Coord3D *from,
 													 const Coord3D *to, Bool crusher)
 {
 	return internal_findHierarchicalPath(isHuman, locomotorSet.getValidSurfaces(), from, to, crusher, TRUE);
@@ -7473,16 +7142,16 @@ Path *Pathfinder::findClosestHierarchicalPath( Bool isHuman, const LocomotorSet&
  * Find a short, valid path between given locations.
  * Uses A* algorithm.
  */
-Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSurfaceTypeMask locomotorSurface, const Coord3D *from, 
+Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSurfaceTypeMask locomotorSurface, const Coord3D *from,
 													 const Coord3D *rawTo, Bool crusher, Bool closestOK)
 {
-	//CRCDEBUG_LOG(("Pathfinder::findGroundPath()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::findGroundPath()"));
 #ifdef DEBUG_LOGGING
 	Int startTimeMS = ::GetTickCount();
 #endif
-	
+
 	if (rawTo->x == 0.0f && rawTo->y == 0.0f) {
-		DEBUG_LOG(("Attempting pathfind to 0,0, generally a bug.\n"));
+		DEBUG_LOG(("Attempting pathfind to 0,0, generally a bug."));
 		return NULL;
 	}
 	DEBUG_ASSERTCRASH(m_openList==NULL && m_closedList == NULL, ("Dangling lists."));
@@ -7498,15 +7167,16 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 	m_isTunneling = false;
 
 	PathfindLayerEnum destinationLayer = TheTerrainLogic->getLayerForDestination(to);
-	
+
 	ICoord2D cell;
 	worldToCell( to, &cell );
 
 	// determine goal cell
 	PathfindCell *goalCell = getCell( destinationLayer, cell.x, cell.y );
-	if (goalCell == NULL) {
+	if (!goalCell) {
 		return NULL;
 	}
+
 	if (!goalCell->allocateInfo(cell)) {
 		return NULL;
 	}
@@ -7515,9 +7185,10 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 	ICoord2D startCellNdx;
 	PathfindLayerEnum layer = TheTerrainLogic->getLayerForDestination(from);
 	PathfindCell *parentCell = getClippedCell( layer,&clipFrom );
-	if (parentCell == NULL) {
+	if (!parentCell) {
 		return NULL;
 	}
+
 	if (parentCell!=goalCell) {
 		worldToCell(&clipFrom, &startCellNdx);
 		if (!parentCell->allocateInfo(startCellNdx)) {
@@ -7528,7 +7199,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 
 	Int zone1, zone2;
 	// m_isCrusher = false;
-	zone1 = m_zoneManager.getEffectiveZone(locomotorSurface, false, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(locomotorSurface, false, parentCell->getZone());
 	zone2 =  m_zoneManager.getEffectiveZone(locomotorSurface, false, goalCell->getZone());
 
 	if ( zone1 != zone2) {
@@ -7549,7 +7220,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 	if (goalCell->getLayer()==LAYER_GROUND) {
 		goalBlockZone = m_zoneManager.getBlockZone(locomotorSurface,
 			crusher, goalCell->getXIndex(), goalCell->getYIndex(), m_map);
-		
+
 		goalBlockNdx.x = goalCell->getXIndex()/PathfindZoneManager::ZONE_BLOCK_SIZE;
 		goalBlockNdx.y = goalCell->getYIndex()/PathfindZoneManager::ZONE_BLOCK_SIZE;
 	}	else {
@@ -7558,11 +7229,10 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 		goalBlockNdx.y = -1;
 	}
 
-	if (parentCell->getLayer()==LAYER_GROUND) {
-		// initialize "open" list to contain start cell
-		m_openList = parentCell;
-	}	else {
-		m_openList = parentCell;
+	// initialize "open" list to contain start cell
+	m_openList = parentCell;
+
+	if (parentCell->getLayer()!=LAYER_GROUND) {
 		PathfindLayerEnum layer = parentCell->getLayer();
 		// We're starting on a bridge, so link to land at the bridge end points.
 		ICoord2D ndx;
@@ -7575,7 +7245,22 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 			// Close parent cell;
 			m_openList = parentCell->removeFromOpenList(m_openList);
 			m_closedList = parentCell->putOnClosedList(m_closedList);
-			startCell->allocateInfo(ndx);
+			if (!startCell->allocateInfo(ndx)) {
+				// TheSuperHackers @info We need to forcefully cleanup dangling pathfinding cells if this failure condition is hit in retail
+				// Retail clients will crash beyond this point, but we attempt to recover by performing a full cleanup then enabling the fixed pathfinding codepath
+#if RETAIL_COMPATIBLE_PATHFINDING
+				if (!s_useFixedPathfinding) {
+					s_useFixedPathfinding = true;
+					forceCleanCells();
+				}
+				else
+#endif
+				{
+					cleanOpenAndClosedLists();
+					goalCell->releaseInfo();
+				}
+				return NULL;
+			}
 			startCell->setParentCellHierarchical(parentCell);
 			cellCount++;
 			Int curCost = startCell->costToHierGoal(parentCell);
@@ -7587,7 +7272,22 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 			m_openList = startCell->putOnSortedOpenList( m_openList );
 
 			cellCount++;
-			cell->allocateInfo(toNdx);
+			if(!cell->allocateInfo(toNdx)) {
+				// TheSuperHackers @info We need to forcefully cleanup dangling pathfinding cells if this failure condition is hit in retail
+				// Retail clients will crash beyond this point, but we attempt to recover by performing a full cleanup then enabling the fixed pathfinding codepath
+#if RETAIL_COMPATIBLE_PATHFINDING
+				if (!s_useFixedPathfinding) {
+					s_useFixedPathfinding = true;
+					forceCleanCells();
+				}
+				else
+#endif
+				{
+					cleanOpenAndClosedLists();
+					goalCell->releaseInfo();
+				}
+				return NULL;
+			}
 			curCost = cell->costToHierGoal(parentCell);
 			remCost = cell->costToHierGoal(goalCell);
 			cell->setCostSoFar(curCost);
@@ -7620,7 +7320,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 		}
 
 		Bool reachedGoal = false;
-		
+
 		Int blockX = parentCell->getXIndex()/PathfindZoneManager::ZONE_BLOCK_SIZE;
 		Int blockY = parentCell->getYIndex()/PathfindZoneManager::ZONE_BLOCK_SIZE;
 		if (parentZone == goalBlockZone) {
@@ -7633,7 +7333,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 
 		ICoord2D zoneBlockExtent;
 		m_zoneManager.getExtent(zoneBlockExtent);
-		
+
 		if (!reachedGoal && m_zoneManager.interactsWithBridge(parentCell->getXIndex(), parentCell->getYIndex())) {
 			Int i;
 			for (i=0; i<=LAYER_LAST; i++) {
@@ -7664,20 +7364,54 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 						break;
 					}
  					PathfindCell *cell = getCell(LAYER_GROUND, toNdx.x, toNdx.y);
-					if (cell==NULL) continue;
-					if (cell->hasInfo() && (cell->getClosed() || cell->getOpen())) {
+					if (!cell)
 						continue;
-					}
-					PathfindCell *startCell = getCell(LAYER_GROUND, ndx.x, ndx.y); 
-					if (startCell==NULL) continue;
+
+					if (cell->hasInfo() && (cell->getClosed() || cell->getOpen()))
+						continue;
+
+					PathfindCell *startCell = getCell(LAYER_GROUND, ndx.x, ndx.y);
+					if (!startCell)
+						continue;
+
 					if (startCell != parentCell) {
-						startCell->allocateInfo(ndx);
+						if(!startCell->allocateInfo(ndx)) {
+							// TheSuperHackers @info We need to forcefully cleanup dangling pathfinding cells if this failure condition is hit in retail
+							// Retail clients will crash beyond this point, but we attempt to recover by performing a full cleanup then enabling the fixed pathfinding codepath
+#if RETAIL_COMPATIBLE_PATHFINDING
+							if (!s_useFixedPathfinding) {
+								s_useFixedPathfinding = true;
+								forceCleanCells();
+							}
+							else
+#endif
+							{
+								cleanOpenAndClosedLists();
+								goalCell->releaseInfo();
+							}
+							return NULL;
+						}
 						startCell->setParentCellHierarchical(parentCell);
 						if (!startCell->getClosed() && !startCell->getOpen()) {
 							m_closedList = startCell->putOnClosedList(m_closedList);
 						}
 					}
-					cell->allocateInfo(toNdx);
+					if(!cell->allocateInfo(toNdx)) {
+						// TheSuperHackers @info We need to forcefully cleanup dangling pathfinding cells if this failure condition is hit in retail
+						// Retail clients will crash beyond this point, but we attempt to recover by performing a full cleanup then enabling the fixed pathfinding codepath
+#if RETAIL_COMPATIBLE_PATHFINDING
+						if (!s_useFixedPathfinding) {
+							s_useFixedPathfinding = true;
+							forceCleanCells();
+						}
+						else
+#endif
+						{
+							cleanOpenAndClosedLists();
+							goalCell->releaseInfo();
+						}
+						return NULL;
+					}
 					cell->setParentCellHierarchical(startCell);
 
 					cellCount++;
@@ -7699,48 +7433,39 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 			if (parentCell != goalCell) {
 				goalCell->setParentCellHierarchical(parentCell);
 			}
-			// success - found a path to the goal	 
+			// success - found a path to the goal
 
 			m_isTunneling = false;
 			// construct and return path
 			Path *path =  buildHierachicalPath( from, goalCell );
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 			Bool show = TheGlobalData->m_debugAI==AI_DEBUG_PATHS;
 			show |= (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS);
 			if (show)	{
 				debugShowSearch(true);
-#if 0 // Show hierarchical blocks (big blue ones.)
-				Int i, j;
-				ICoord2D extent;
-				m_zoneManager.getExtent(extent);
-				for (i=0; i<extent.x; i++) {
-					for (j=0; j<extent.y; j++) {
-						extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
- 						RGBColor color;
-						color.blue = 1;
-						color.red = color.green = 0;
-						Coord3D pos;
-						pos.x = ((i+0.5f)*PathfindZoneManager::ZONE_BLOCK_SIZE)*PATHFIND_CELL_SIZE_F ;
-						pos.y = ((j+0.5f)*PathfindZoneManager::ZONE_BLOCK_SIZE)*PATHFIND_CELL_SIZE_F ;
-						pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y ) + 0.5f;
-						if (m_zoneManager.isPassable(i*PathfindZoneManager::ZONE_BLOCK_SIZE, j*PathfindZoneManager::ZONE_BLOCK_SIZE)) {
-							addIcon(&pos, 5*PATHFIND_CELL_SIZE_F, 300, color);
-						}
-					}
-				}
+			}
 #endif
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding)
+			{
+				if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+					goalCell->releaseInfo();
+				}
+				parentCell->releaseInfo();
+				cleanOpenAndClosedLists();
 			}
+			else
 #endif
-			if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
 				goalCell->releaseInfo();
 			}
-			parentCell->releaseInfo();
-			cleanOpenAndClosedLists();
 			return path;
-		}	
+		}
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-#if 0 
+#if defined(RTS_DEBUG)
+#if 0
 		Bool show = TheGlobalData->m_debugAI==AI_DEBUG_PATHS;
 		show |= (TheGlobalData->m_debugAI==AI_DEBUG_GROUND_PATHS);
 		if (show)	{
@@ -7780,25 +7505,24 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 				scanCell.y += PathfindZoneManager::ZONE_BLOCK_SIZE/2;
 				Int offset = i>>1;
 				if (i&1) offset = -offset;
-				scanCell.y += offset;	
+				scanCell.y += offset;
 				ICoord2D delta;
 				delta.x = -1; // left side moves -1.
 				delta.y = 0;
+
 				PathfindCell *cell = getCell(LAYER_GROUND, scanCell.x, scanCell.y);
-				if (cell==NULL) continue;
-				if (cell->hasInfo() && (cell->getClosed() || cell->getOpen())) {
-					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface,
-						crusher, scanCell.x, scanCell.y, m_map)) { 
+				if (!cell)
+					continue;
+
+				if ( cell->hasInfo() && (cell->getClosed() || cell->getOpen()) ) {
+					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface, crusher, scanCell.x, scanCell.y, m_map))
 						break;
-					}
-				}
-				if (isHuman) {
-					if (scanCell.x < m_logicalExtent.lo.x || scanCell.x > m_logicalExtent.hi.x ||
-							scanCell.y < m_logicalExtent.lo.y || scanCell.y > m_logicalExtent.hi.y) {
-						continue;
-					}
 				}
-				processHierarchicalCell(scanCell, delta, parentCell, 
+
+				if (isHuman && checkCellOutsideExtents(scanCell))
+					continue;
+
+				processHierarchicalCell(scanCell, delta, parentCell,
 					goalCell, parentZone, examinedZones, numExZones, crusher, cellCount);
 			}
 		}
@@ -7813,25 +7537,24 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 				scanCell.y += PathfindZoneManager::ZONE_BLOCK_SIZE/2;
 				Int offset = i>>1;
 				if (i&1) offset = -offset;
-				scanCell.y += offset;	
+				scanCell.y += offset;
 				ICoord2D delta;
 				delta.x = 1; // right side moves +1.
 				delta.y = 0;
+
 				PathfindCell *cell = getCell(LAYER_GROUND, scanCell.x, scanCell.y);
-				if (cell==NULL) continue;
-				if (cell->hasInfo() && (cell->getClosed() || cell->getOpen())) {
-					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface,
-						crusher, scanCell.x, scanCell.y, m_map)) { 
+				if (!cell)
+					continue;
+
+				if ( cell->hasInfo() && (cell->getClosed() || cell->getOpen()) ) {
+					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface, crusher, scanCell.x, scanCell.y, m_map))
 						break;
-					}
 				}
-				if (isHuman) {
-					if (scanCell.x < m_logicalExtent.lo.x || scanCell.x > m_logicalExtent.hi.x ||
-							scanCell.y < m_logicalExtent.lo.y || scanCell.y > m_logicalExtent.hi.y) {
-						continue;
-					}
-				}
-				processHierarchicalCell(scanCell, delta, parentCell, 
+
+				if (isHuman && checkCellOutsideExtents(scanCell))
+					continue;
+
+				processHierarchicalCell(scanCell, delta, parentCell,
 					goalCell, parentZone, examinedZones, numExZones, crusher, cellCount);
 			}
 		}
@@ -7845,25 +7568,24 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 				scanCell.x += PathfindZoneManager::ZONE_BLOCK_SIZE/2;
 				Int offset = i>>1;
 				if (i&1) offset = -offset;
-				scanCell.x += offset;	
+				scanCell.x += offset;
 				ICoord2D delta;
-				delta.x = 0; 
+				delta.x = 0;
 				delta.y = -1;	// Top side moves -1.
+
 				PathfindCell *cell = getCell(LAYER_GROUND, scanCell.x, scanCell.y);
-				if (cell==NULL) continue;
-				if (cell->hasInfo() && (cell->getClosed() || cell->getOpen())) {
-					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface,
-						crusher, scanCell.x, scanCell.y, m_map)) { 
+				if (!cell)
+					continue;
+
+				if ( cell->hasInfo() && (cell->getClosed() || cell->getOpen()) ) {
+					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface, crusher, scanCell.x, scanCell.y, m_map))
 						break;
-					}
-				}
-				if (isHuman) {
-					if (scanCell.x < m_logicalExtent.lo.x || scanCell.x > m_logicalExtent.hi.x ||
-							scanCell.y < m_logicalExtent.lo.y || scanCell.y > m_logicalExtent.hi.y) {
-						continue;
-					}
 				}
-				processHierarchicalCell(scanCell, delta, parentCell, 
+
+				if (isHuman && checkCellOutsideExtents(scanCell))
+					continue;
+
+				processHierarchicalCell(scanCell, delta, parentCell,
 					goalCell, parentZone, examinedZones, numExZones, crusher, cellCount);
 			}
 		}
@@ -7878,25 +7600,24 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 				scanCell.x += PathfindZoneManager::ZONE_BLOCK_SIZE/2;
 				Int offset = i>>1;
 				if (i&1) offset = -offset;
-				scanCell.x += offset;	
+				scanCell.x += offset;
 				ICoord2D delta;
-				delta.x = 0; 
+				delta.x = 0;
 				delta.y = 1; // Top side moves +1.
+
 				PathfindCell *cell = getCell(LAYER_GROUND, scanCell.x, scanCell.y);
-				if (cell==NULL) continue;
-				if (cell->hasInfo() && (cell->getClosed() || cell->getOpen())) {
-					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface,
-						crusher, scanCell.x, scanCell.y, m_map)) { 
+				if (!cell)
+					continue;
+
+				if ( cell->hasInfo() && (cell->getClosed() || cell->getOpen()) ) {
+					if (parentZone == m_zoneManager.getBlockZone(locomotorSurface, crusher, scanCell.x, scanCell.y, m_map))
 						break;
-					}
 				}
-				if (isHuman) {
-					if (scanCell.x < m_logicalExtent.lo.x || scanCell.x > m_logicalExtent.hi.x ||
-							scanCell.y < m_logicalExtent.lo.y || scanCell.y > m_logicalExtent.hi.y) {
-						continue;
-					}
-				}
-				processHierarchicalCell(scanCell, delta, parentCell, 
+
+				if (isHuman && checkCellOutsideExtents(scanCell))
+					continue;
+
+				processHierarchicalCell(scanCell, delta, parentCell,
 					goalCell, parentZone, examinedZones, numExZones, crusher, cellCount);
 			}
 		}
@@ -7906,41 +7627,27 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 		m_isTunneling = false;
 		// construct and return path
 		Path *path =  buildHierachicalPath( from, closestCell );
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-#if 0
-		if (TheGlobalData->m_debugAI)
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (!s_useFixedPathfinding)
 		{
-			debugShowSearch(true);
-			Int i, j;
-			ICoord2D extent;
-			m_zoneManager.getExtent(extent);
-			for (i=0; i<extent.x; i++) {
-				for (j=0; j<extent.y; j++) {
-					extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
- 					RGBColor color;
-					color.blue = 1;
-					color.red = color.green = 0;
-					Coord3D pos;
-					pos.x = ((i+0.5f)*PathfindZoneManager::ZONE_BLOCK_SIZE)*PATHFIND_CELL_SIZE_F ;
-					pos.y = ((j+0.5f)*PathfindZoneManager::ZONE_BLOCK_SIZE)*PATHFIND_CELL_SIZE_F ;
-					pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y ) + 0.5f;
-					if (m_zoneManager.isPassable(i*PathfindZoneManager::ZONE_BLOCK_SIZE, j*PathfindZoneManager::ZONE_BLOCK_SIZE)) {
-						addIcon(&pos, 5*PATHFIND_CELL_SIZE_F, 300, color);
-					}
-				}
+			if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+				goalCell->releaseInfo();
 			}
+			cleanOpenAndClosedLists();
 		}
+		else
 #endif
-#endif
-		if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+		{
+			cleanOpenAndClosedLists();
+			parentCell->releaseInfo();
 			goalCell->releaseInfo();
 		}
-		cleanOpenAndClosedLists();
 		return path;
 	}
 
 	// failure - goal cannot be reached
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -7955,7 +7662,7 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);
 		pos = *to;
 		pos.z = TheTerrainLogic->getGroundHeight( pos.x, pos.y ) + 0.5f;
-		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);	
+		addIcon(&pos, 3*PATHFIND_CELL_SIZE_F, 600, color);
 		Real dx, dy;
 		dx = from->x - to->x;
 		dy = from->y - to->y;
@@ -7971,29 +7678,40 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 			addIcon(&pos, PATHFIND_CELL_SIZE_F/2, 60, color);
 
 		}
-	}	
+	}
 #endif
 
-	DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-	DEBUG_LOG(("FindHierarchicalPath failed from (%f,%f) to (%f,%f)\n", from->x, from->y, to->x, to->y));
-	DEBUG_LOG(("time %f\n", (::GetTickCount()-startTimeMS)/1000.0f));
+	DEBUG_LOG(("%d FindHierarchicalPath failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
+	DEBUG_LOG(("time %f", (::GetTickCount()-startTimeMS)/1000.0f));
 
 #ifdef DUMP_PERF_STATS
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	goalCell->releaseInfo();
-	cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding)
+	{
+		goalCell->releaseInfo();
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+		goalCell->releaseInfo();
+	}
+
 	return NULL;
 }
 
 
 /**
- * Does any broken bridge join from and to?  
+ * Does any broken bridge join from and to?
  * True means that if bridge BridgeID is repaired, there is a land path from to to..
  */
-Bool Pathfinder::findBrokenBridge(const LocomotorSet& locoSet, 
-																	const Coord3D *from, const Coord3D *to, ObjectID *bridgeID) 
+Bool Pathfinder::findBrokenBridge(const LocomotorSet& locoSet,
+																	const Coord3D *from, const Coord3D *to, ObjectID *bridgeID)
 {
 	// See if terrain or building is blocking the destination.
 	PathfindLayerEnum destinationLayer = TheTerrainLogic->getLayerForDestination(to);
@@ -8004,11 +7722,11 @@ Bool Pathfinder::findBrokenBridge(const LocomotorSet& locoSet,
 
 	PathfindCell *parentCell = getClippedCell(fromLayer, from);
 	PathfindCell *goalCell = getClippedCell(destinationLayer, to);
-	zone1 = m_zoneManager.getEffectiveZone(locoSet.getValidSurfaces(), false, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(locoSet.getValidSurfaces(), false, parentCell->getZone());
 	zone2 =  m_zoneManager.getEffectiveZone(locoSet.getValidSurfaces(), false, goalCell->getZone());
 	zone1 = m_zoneManager.getEffectiveTerrainZone(zone1);
 	zone2 = m_zoneManager.getEffectiveTerrainZone(zone2);
-	zone1 = m_zoneManager.getEffectiveZone(locoSet.getValidSurfaces(), false, zone1); 
+	zone1 = m_zoneManager.getEffectiveZone(locoSet.getValidSurfaces(), false, zone1);
 	zone2 =  m_zoneManager.getEffectiveZone(locoSet.getValidSurfaces(), false, zone2);
 
 	// If the terrain is connected using this locomotor set, we can path somehow.
@@ -8037,9 +7755,9 @@ Bool Pathfinder::findBrokenBridge(const LocomotorSet& locoSet,
  * False means it is impossible to path.
  * True means it is possible given the terrain, but there may be units in the way.
  */
-Bool Pathfinder::clientSafeQuickDoesPathExist( const LocomotorSet& locomotorSet, 
-																const Coord3D *from, 
-																const Coord3D *to ) 
+Bool Pathfinder::clientSafeQuickDoesPathExist( const LocomotorSet& locomotorSet,
+																const Coord3D *from,
+																const Coord3D *to )
 {
 	// See if terrain or building is blocking the destination.
 	PathfindLayerEnum destinationLayer = TheTerrainLogic->getLayerForDestination(to);
@@ -8055,7 +7773,7 @@ Bool Pathfinder::clientSafeQuickDoesPathExist( const LocomotorSet& locomotorSet,
 		return false; // No goals on cliffs.
 	}
 	Bool doingTerrainZone = false;
-	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, parentCell->getZone());
 
 	if (parentCell->getType() == PathfindCell::CELL_OBSTACLE) {
 		doingTerrainZone = true;
@@ -8072,11 +7790,11 @@ Bool Pathfinder::clientSafeQuickDoesPathExist( const LocomotorSet& locomotorSet,
 	if (doingTerrainZone) {
 		zone1 = parentCell->getZone();
 		zone1 = m_zoneManager.getEffectiveTerrainZone(zone1);
-		zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, zone1); 
+		zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, zone1);
 		zone1 = m_zoneManager.getEffectiveTerrainZone(zone1);
 		zone2 = goalCell->getZone();
 		zone2 = m_zoneManager.getEffectiveTerrainZone(zone2);
-		zone2 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, zone2); 
+		zone2 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, zone2);
 		zone2 = m_zoneManager.getEffectiveTerrainZone(zone2);
 	}
 	// If the terrain is connected using this locomotor set, we can path somehow.
@@ -8095,9 +7813,9 @@ Bool Pathfinder::clientSafeQuickDoesPathExist( const LocomotorSet& locomotorSet,
  * False means it is impossible to path.
  * True means it is possible given the terrain, but there may be units in the way.
  */
-Bool Pathfinder::clientSafeQuickDoesPathExistForUI( const LocomotorSet& locomotorSet, 
-																const Coord3D *from, 
-																const Coord3D *to ) 
+Bool Pathfinder::clientSafeQuickDoesPathExistForUI( const LocomotorSet& locomotorSet,
+																const Coord3D *from,
+																const Coord3D *to )
 {
 	// See if terrain or building is blocking the destination.
 	PathfindLayerEnum destinationLayer = TheTerrainLogic->getLayerForDestination(to);
@@ -8110,7 +7828,7 @@ Bool Pathfinder::clientSafeQuickDoesPathExistForUI( const LocomotorSet& locomoto
 		return false; // No goals on cliffs.
 	}
 
-	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, parentCell->getZone()); 
+	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, parentCell->getZone());
 	zone2 =  m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, goalCell->getZone());
 
 	if (zone1 == PathfindZoneManager::UNINITIALIZED_ZONE ||
@@ -8119,16 +7837,16 @@ Bool Pathfinder::clientSafeQuickDoesPathExistForUI( const LocomotorSet& locomoto
 		// It is better to return a false positive than a false negative. jba.
 		return true;
 	}
-	/* Do the effective terrain zone.  This feedback is for the ui, so we won't take structures into account, 
-		beacuse if they are visible it will be obvious, and if they are stealthed they should be invisible to the 
+	/* Do the effective terrain zone.  This feedback is for the ui, so we won't take structures into account,
+		beacuse if they are visible it will be obvious, and if they are stealthed they should be invisible to the
 		pathing as well. jba. */
 	zone1 = parentCell->getZone();
 	zone1 = m_zoneManager.getEffectiveTerrainZone(zone1);
-	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, zone1); 
+	zone1 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, zone1);
 	zone1 = m_zoneManager.getEffectiveTerrainZone(zone1);
 	zone2 = goalCell->getZone();
 	zone2 = m_zoneManager.getEffectiveTerrainZone(zone2);
-	zone2 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, zone2); 
+	zone2 = m_zoneManager.getEffectiveZone(locomotorSet.getValidSurfaces(), false, zone2);
 	zone2 = m_zoneManager.getEffectiveTerrainZone(zone2);
 
 	if (zone1 == PathfindZoneManager::UNINITIALIZED_ZONE) {
@@ -8152,8 +7870,8 @@ Bool Pathfinder::clientSafeQuickDoesPathExistForUI( const LocomotorSet& locomoto
  * False means it is impossible to path.
  * True means it is possible to path.
  */
-Bool Pathfinder::slowDoesPathExist( Object *obj, 
-																const Coord3D *from, 
+Bool Pathfinder::slowDoesPathExist( Object *obj,
+																const Coord3D *from,
 																const Coord3D *to,
 																ObjectID ignoreObject)
 {
@@ -8166,10 +7884,10 @@ Bool Pathfinder::slowDoesPathExist( Object *obj,
 	Path *path = findPath(obj, locoSet, from, to);
 	m_ignoreObstacleID = INVALID_ID;
 	Bool found = (path!=NULL);
-	if (path) {
-		deleteInstance(path);
-		path = NULL;
-	}
+
+	deleteInstance(path);
+	path = NULL;
+
 	return found;
 }
 
@@ -8194,16 +7912,15 @@ void Pathfinder::clip( Coord3D *from, Coord3D *to )
 
 }
 
-Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet, Coord3D *dest, 
+Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet, Coord3D *dest,
 		PathfindLayerEnum layer, const Coord3D *groupDest)
 {
-	//CRCDEBUG_LOG(("Pathfinder::pathDestination()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::pathDestination()"));
 	if (m_isMapReady == false) return NULL;
-	
+
 	if (!obj) return false;
 
 	Int cellCount = 0;
-#define MAX_CELL_COUNT 500
 
 	Coord3D adjustTo = *groupDest;
 	Coord3D *to = &adjustTo;
@@ -8234,7 +7951,7 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 	getRadiusAndCenter(obj, radius, center);
 
 	// determine start cell
-	ICoord2D startCellNdx; 
+	ICoord2D startCellNdx;
 	worldToCell(dest, &startCellNdx);
 	PathfindCell *parentCell = getCell( layer, startCellNdx.x, startCellNdx.y );
 	if (parentCell == NULL)
@@ -8247,7 +7964,11 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 
 	if (parentCell!=goalCell) {
 		if (!parentCell->allocateInfo(startCellNdx)) {
-			desiredCell->releaseInfo();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding)	{
+				desiredCell->releaseInfo();
+			}
+#endif
 			goalCell->releaseInfo();
 			return FALSE;
 		}
@@ -8284,13 +8005,12 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 		Coord3D pos;
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
-		if (checkForAdjust(obj, locomotorSet, isHuman, parentCell->getXIndex(), parentCell->getYIndex(), parentCell->getLayer(), 
-			radius, center, &pos, groupDest)) { 
+		if (checkForAdjust(obj, locomotorSet, isHuman, parentCell->getXIndex(), parentCell->getYIndex(), parentCell->getLayer(),
+			radius, center, &pos, groupDest)) {
 			Int dx = IABS(goalCell->getXIndex()-parentCell->getXIndex());
 			Int dy = IABS(goalCell->getYIndex()-parentCell->getYIndex());
 			Real distSqr = dx*dx+dy*dy;
-			//Real cost = (parentCell->getCostSoFar()*(parentCell->getCostSoFar()*COST_TO_DISTANCE_FACTOR))*0.5f;
-			//distSqr += sqr(cost);
+
 			if (distSqr < closestDistanceSqr) {
 				closestCell = parentCell;
 				closestDistanceSqr = distSqr;
@@ -8309,19 +8029,19 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 		checkChangeLayers(parentCell);
 
 		// expand search to neighboring orthogonal cells
-		static ICoord2D delta[] = 
-		{ 
-			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 }, 
-			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 } 
+		static ICoord2D delta[] =
+		{
+			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 },
+			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 }
 		};
 		const Int numNeighbors = 8;
 		const Int firstDiagonal = 4;
 		ICoord2D newCellCoord;
 		PathfindCell *newCell;
 		const Int adjacent[5] = {0, 1, 2, 3, 0};
-		Bool neighborFlags[8] = {false, false, false, false, false, false, false};
+		Bool neighborFlags[8] = { 0 };
 
-		UnsignedInt newCostSoFar;
+		UnsignedInt newCostSoFar = 0;
 
 		for( int i=0; i<numNeighbors; i++ )
 		{
@@ -8337,13 +8057,13 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 			if (newCell == NULL)
 				continue;
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
 			Bool onList = false;
 			if (newCell->hasInfo()) {
 				if (newCell->getOpen() || newCell->getClosed())
 				{
-					// already on one of the lists 
+					// already on one of the lists
 					onList = true;
 				}
 			}
@@ -8356,24 +8076,31 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 
 			if (!validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), newCell, parentCell )) {
 				continue;
-			}	
+			}
 
 			neighborFlags[i] = true;
 
 			if (!newCell->allocateInfo(newCellCoord)) {
 				// Out of cells for pathing...
+#if RETAIL_COMPATIBLE_PATHFINDING
+				if (s_useFixedPathfinding)
+#endif
+				{
+					cleanOpenAndClosedLists();
+					goalCell->releaseInfo();
+				}
  				return cellCount;
-			}								
+			}
 			cellCount++;
 
 			newCostSoFar = newCell->costSoFar( parentCell );
 			newCell->setBlockedByAlly(false);
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
 			if (onList)
 			{
-				// already on one of the lists - if existing costSoFar is less, 
+				// already on one of the lists - if existing costSoFar is less,
 				// the new cell is on a longer path, so skip it
 				if (newCell->getCostSoFar() <= newCostSoFar)
 					continue;
@@ -8384,7 +8111,7 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 
 			// store cost of this path
 			newCell->setCostSoFar(newCostSoFar);
-			
+
 			Int costRemaining = 0;
 			if (goalCell) {
 				costRemaining = newCell->costToGoal( goalCell );
@@ -8392,10 +8119,6 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 
 			newCell->setTotalCost(newCell->getCostSoFar() + costRemaining) ;
 
-			//DEBUG_LOG(("Cell (%d,%d), Parent cost %d, newCostSoFar %d, cost rem %d, tot %d\n", 
-			//	newCell->getXIndex(), newCell->getYIndex(), 
-			//	newCell->costSoFar(parentCell), newCostSoFar, costRemaining, newCell->getCostSoFar() + costRemaining));
-
 			// if newCell was on closed list, remove it from the list
 			if (newCell->getClosed())
 				m_closedList = newCell->removeFromClosedList( m_closedList );
@@ -8409,7 +8132,7 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 		}
 	}
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (closestCell) {
 		debugShowSearch(true);
 		*dest = closestPos;
@@ -8418,8 +8141,19 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 	}
 #endif
 	m_isTunneling = false;
-	cleanOpenAndClosedLists();
-	goalCell->releaseInfo();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		cleanOpenAndClosedLists();
+		goalCell->releaseInfo();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+		goalCell->releaseInfo();
+	}
+
 	return false;
 }
 
@@ -8443,18 +8177,18 @@ struct TightenPathStruct
 		return 0; // abort.
 	}
 	Coord3D pos;
-	if (!TheAI->pathfinder()->checkForAdjust(d->obj, *d->locomotorSet, true, to_x, to_y, to->getLayer(), d->radius, d->center, &pos, NULL)) 
+	if (!TheAI->pathfinder()->checkForAdjust(d->obj, *d->locomotorSet, true, to_x, to_y, to->getLayer(), d->radius, d->center, &pos, NULL))
 	{
 		return 0;	// bail early
 	}
-	d->foundDest = true; 
+	d->foundDest = true;
 	d->destPos = pos;
 
 	return 0;	// keep going
 }
 
 /* Returns the cost, which is in the same units as coord3d distance. */
-void Pathfinder::tightenPath(Object *obj, const LocomotorSet& locomotorSet, Coord3D *from, 
+void Pathfinder::tightenPath(Object *obj, const LocomotorSet& locomotorSet, Coord3D *from,
 		const Coord3D *to)
 {
 	TightenPathStruct info;
@@ -8472,16 +8206,15 @@ void Pathfinder::tightenPath(Object *obj, const LocomotorSet& locomotorSet, Coor
 
 
 /* Returns the cost, which is in the same units as coord3d distance. */
-Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, 
+Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 		const Coord3D *rawTo)
 {
-	//CRCDEBUG_LOG(("Pathfinder::checkPathCost()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::checkPathCost()"));
 	if (m_isMapReady == false) return NULL;
-	enum {MAX_COST = 0x7fff0000};	
+	enum {MAX_COST = 0x7fff0000};
 	if (!obj) return MAX_COST;
 
 	Int cellCount = 0;
-#define MAX_CELL_COUNT 500
 
 	Coord3D adjustTo = *rawTo;
 	Coord3D *to = &adjustTo;
@@ -8502,7 +8235,7 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 	getRadiusAndCenter(obj, radius, center);
 
 	// determine start cell
-	ICoord2D startCellNdx; 
+	ICoord2D startCellNdx;
 	worldToCell(from, &startCellNdx);
 	PathfindLayerEnum fromLayer = TheTerrainLogic->getLayerForDestination(from);
 	PathfindCell *parentCell = getCell( fromLayer, from );
@@ -8545,16 +8278,34 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 		parentCell = m_openList;
 		m_openList = parentCell->removeFromOpenList(m_openList);
 
-		// put parent cell onto closed list - its evaluation is finished
-		m_closedList = parentCell->putOnClosedList( m_closedList );
+		// put parent cell onto closed list - its evaluation is finished - Retail compatible behaviour
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (!s_useFixedPathfinding) {
+			m_closedList = parentCell->putOnClosedList( m_closedList );
+		}
+#endif
 
-		if (parentCell==goalCell) {	 
+		if (parentCell==goalCell) {
 			Int cost = parentCell->getTotalCost();
 			m_isTunneling = false;
 			cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (s_useFixedPathfinding)
+#endif
+			{
+				parentCell->releaseInfo();
+			}
 			return cost;
 		}
 
+		// put parent cell onto closed list - its evaluation is finished - Fixed behaviour
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (s_useFixedPathfinding)
+#endif
+		{
+			m_closedList = parentCell->putOnClosedList( m_closedList );
+		}
+
 		if (cellCount > MAX_CELL_COUNT) {
 			continue;
 		}
@@ -8562,19 +8313,19 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 		checkChangeLayers(parentCell);
 
 		// expand search to neighboring orthogonal cells
-		static ICoord2D delta[] = 
-		{ 
-			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 }, 
-			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 } 
+		static ICoord2D delta[] =
+		{
+			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 },
+			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 }
 		};
 		const Int numNeighbors = 8;
 		const Int firstDiagonal = 4;
 		ICoord2D newCellCoord;
 		PathfindCell *newCell;
 		const Int adjacent[5] = {0, 1, 2, 3, 0};
-		Bool neighborFlags[8] = {false, false, false, false, false, false, false};
+		Bool neighborFlags[8] = { 0 };
 
-		UnsignedInt newCostSoFar;
+		UnsignedInt newCostSoFar = 0;
 
 		for( int i=0; i<numNeighbors; i++ )
 		{
@@ -8590,13 +8341,13 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 			if (newCell == NULL)
 				continue;
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
 			Bool onList = false;
 			if (newCell->hasInfo()) {
 				if (newCell->getOpen() || newCell->getClosed())
 				{
-					// already on one of the lists 
+					// already on one of the lists
 					onList = true;
 				}
 			}
@@ -8609,24 +8360,32 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 
 			if (!validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), newCell, parentCell )) {
 				continue;
-			}	
+			}
 
 			neighborFlags[i] = true;
 
 			if (!newCell->allocateInfo(newCellCoord)) {
 				// Out of cells for pathing...
+#if RETAIL_COMPATIBLE_PATHFINDING
+				if (s_useFixedPathfinding)
+#endif
+				{
+					cleanOpenAndClosedLists();
+					parentCell->releaseInfo();
+					goalCell->releaseInfo();
+				}
  				return cellCount;
-			}								
+			}
 			cellCount++;
 
 			newCostSoFar = newCell->costSoFar( parentCell );
 			newCell->setBlockedByAlly(false);
 
-			// check if this neighbor cell is already on the open (waiting to be tried) 
+			// check if this neighbor cell is already on the open (waiting to be tried)
 			// or closed (already tried) lists
 			if (onList)
 			{
-				// already on one of the lists - if existing costSoFar is less, 
+				// already on one of the lists - if existing costSoFar is less,
 				// the new cell is on a longer path, so skip it
 				if (newCell->getCostSoFar() <= newCostSoFar)
 					continue;
@@ -8637,7 +8396,7 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 
 			// store cost of this path
 			newCell->setCostSoFar(newCostSoFar);
-			
+
 			Int costRemaining = 0;
 			if (goalCell) {
 				costRemaining = newCell->costToGoal( goalCell );
@@ -8645,10 +8404,6 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 
 			newCell->setTotalCost(newCell->getCostSoFar() + costRemaining) ;
 
-			//DEBUG_LOG(("Cell (%d,%d), Parent cost %d, newCostSoFar %d, cost rem %d, tot %d\n", 
-			//	newCell->getXIndex(), newCell->getYIndex(), 
-			//	newCell->costSoFar(parentCell), newCostSoFar, costRemaining, newCell->getCostSoFar() + costRemaining));
-
 			// if newCell was on closed list, remove it from the list
 			if (newCell->getClosed())
 				m_closedList = newCell->removeFromClosedList( m_closedList );
@@ -8657,30 +8412,48 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 			if (newCell->getOpen())
 				m_openList = newCell->removeFromOpenList( m_openList );
 
+#if RETAIL_COMPATIBLE_PATHFINDING
+			// TheSuperHacker @info This is here to catch a retail pathfinding crash point and to recover from it
+			// A cell has gotten onto the open list without pathfinding info due to a danling m_open pointer on the previous listed cell so we need to force a cleanup
+			if (!s_useFixedPathfinding && m_openList && !m_openList->hasInfo()) {
+				s_useFixedPathfinding = true;
+				forceCleanCells();
+				return MAX_COST;
+			}
+#endif
+
 			// insert newCell in open list such that open list is sorted, smallest total path cost first
 			m_openList = newCell->putOnSortedOpenList( m_openList );
 		}
 	}
 
 	m_isTunneling = false;
-	if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+			goalCell->releaseInfo();
+		}
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
 		goalCell->releaseInfo();
 	}
-	cleanOpenAndClosedLists();
 	return MAX_COST;
 }
 
 
-
-
 /**
  * Find a short, valid path between the FROM location and a location NEAR the to location.
  * Uses A* algorithm.
  */
-Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from, 
+Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 																	Coord3D *rawTo, Bool blocked, Real pathCostMultiplier, Bool moveAllies)
 {
-	//CRCDEBUG_LOG(("Pathfinder::findClosestPath()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::findClosestPath()"));
 #ifdef DEBUG_LOGGING
 	Int startTimeMS = ::GetTickCount();
 #endif
@@ -8748,8 +8521,8 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 				{
 					m_ignoreObstacleID = goalCell->getObstacleID();
 					goalOnObstacle = true;
-				}	
-				else 
+				}
+				else
 				{
 					if (m_ignoreObstacleID == goalCell->getObstacleID()) {
 						goalOnObstacle = true;
@@ -8803,6 +8576,12 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 	if (parentCell!=goalCell) {
 		worldToCell(&clipFrom, &pos2d);
 		if (!parentCell->allocateInfo(pos2d)) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (s_useFixedPathfinding)
+#endif
+			{
+				goalCell->releaseInfo();
+			}
 			return NULL;
 		}
 	}
@@ -8853,11 +8632,11 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 			}
 			if (count>1000) {
 				show = true;
-				DEBUG_LOG(("FCP - cells %d obj %s %x\n", count, obj->getTemplate()->getName().str(), obj));
+				DEBUG_LOG(("FCP - cells %d obj %s %x", count, obj->getTemplate()->getName().str(), obj));
 #ifdef STATE_MACHINE_DEBUG
 				if( obj->getAIUpdateInterface() )
 				{
-					DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+					DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 				}
 #endif
 				TheScriptEngine->AppendDebugMessage("Big path FCP", false);
@@ -8868,18 +8647,29 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 			m_isTunneling = false;
 			// construct and return path
 			Path *path = buildActualPath( obj, locomotorSet.getValidSurfaces(), from, goalCell, centerInCell, blocked);
-			parentCell->releaseInfo();
-			goalCell->releaseInfo();
-			cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding) {
+				parentCell->releaseInfo();
+				goalCell->releaseInfo();
+				cleanOpenAndClosedLists();
+			}
+			else
+#endif
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
+				goalCell->releaseInfo();
+			}
+
 			return path;
-		}	
+		}
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
 		if (!m_isTunneling && checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(), parentCell->getLayer(), radius, centerInCell)) {
 			if (!startedStuck || validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), parentCell )) {
 				dx = IABS(goalCell->getXIndex()-parentCell->getXIndex());
 				dy = IABS(goalCell->getYIndex()-parentCell->getYIndex());
-				distSqr = dx*dx+dy*dy;		
+				distSqr = dx*dx+dy*dy;
 				if (distSqr<closestDistScreenSqr) {
 					closestDistScreenSqr = distSqr;
 				}
@@ -8926,17 +8716,16 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 #ifdef INTENSE_DEBUG
 		if (count>5000) {
 			show = true;
-			DEBUG_LOG(("FCP CC cells %d obj %s %x\n", count, obj->getTemplate()->getName().str(), obj));
+			DEBUG_LOG(("FCP CC cells %d obj %s %x", count, obj->getTemplate()->getName().str(), obj));
 #ifdef STATE_MACHINE_DEBUG
 			if( obj->getAIUpdateInterface() )
 			{
-				DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+				DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 			}
 #endif
 
-			DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-			DEBUG_LOG(("Pathfind(findClosestPath) chugged from (%f,%f) to (%f,%f), --", from->x, from->y, to->x, to->y));
-			DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
+			DEBUG_LOG(("%d Pathfind(findClosestPath) chugged from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y));
+			DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 #ifdef INTENSE_DEBUG
 			TheScriptEngine->AppendDebugMessage("Big path FCP CC", false);
 #endif
@@ -8950,8 +8739,18 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 		rawTo->y = closesetCell->getYIndex()*PATHFIND_CELL_SIZE_F + PATHFIND_CELL_SIZE_F/2.0f;
 		// construct and return path
 		Path *path = buildActualPath( obj, locomotorSet.getValidSurfaces(), from, closesetCell, centerInCell, blocked );
-		goalCell->releaseInfo();
-		cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (!s_useFixedPathfinding) {
+			goalCell->releaseInfo();
+			cleanOpenAndClosedLists();
+		}
+		else
+#endif
+		{
+			cleanOpenAndClosedLists();
+			parentCell->releaseInfo();
+			goalCell->releaseInfo();
+		}
 		return path;
 	}
 
@@ -8960,20 +8759,29 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 	Bool valid;
 	valid = validMovementPosition( isCrusher, obj->getLayer(), locomotorSet, to ) ;
 
-	DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-	DEBUG_LOG(("Pathfind(findClosestPath) failed from (%f,%f) to (%f,%f), original valid %d --", from->x, from->y, to->x, to->y, valid));
-	DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
+	DEBUG_LOG(("Pathfind(findClosestPath) failed from (%f,%f) to (%f,%f), original valid %d --", TheGameLogic->getFrame(), from->x, from->y, to->x, to->y, valid));
+	DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 #endif
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	if (TheGlobalData->m_debugAI) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugAI)
 		debugShowSearch(false);
 #endif
 #ifdef DUMP_PERF_STATS
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	goalCell->releaseInfo();
-	cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		goalCell->releaseInfo();
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+		goalCell->releaseInfo();
+	}
 	return NULL;
 }
 
@@ -8991,12 +8799,10 @@ void Pathfinder::adjustCoordToCell(Int cellX, Int cellY, Bool centerInCell, Coor
 }
 
 
-
-
 /**
  * Work backwards from goal cell to construct final path.
  */
-Path *Pathfinder::buildActualPath( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces, const Coord3D *fromPos, 
+Path *Pathfinder::buildActualPath( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces, const Coord3D *fromPos,
 																	PathfindCell *goalCell, Bool center, Bool blocked )
 {
 	DEBUG_ASSERTCRASH( goalCell, ("Pathfinder::buildActualPath: goalCell == NULL") );
@@ -9012,8 +8818,8 @@ Path *Pathfinder::buildActualPath( const Object *obj, LocomotorSurfaceTypeMask a
 	// cleanup the path by checking line of sight
 	path->optimize(obj, acceptableSurfaces, blocked);
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
  		RGBColor color;
@@ -9044,12 +8850,12 @@ Path *Pathfinder::buildActualPath( const Object *obj, LocomotorSurfaceTypeMask a
 	}
 #endif
 	return path;
-}			 
+}
 
 /**
  * Work backwards from goal cell to construct final path.
  */
-void Pathfinder::prependCells( Path *path, const Coord3D *fromPos, 
+void Pathfinder::prependCells( Path *path, const Coord3D *fromPos,
 																	PathfindCell *goalCell, Bool center )
 {
 	// traverse path cells in REVERSE order, creating path in desired order
@@ -9071,7 +8877,7 @@ void Pathfinder::prependCells( Path *path, const Coord3D *fromPos,
 			path->getFirstNode()->setLayer(layer);
 			continue;
 		}
-		
+
 		Bool canOptimize = true;
 		if (cell->getType() == PathfindCell::CELL_CLIFF) {
 			if (prevCell && prevCell->getType() != PathfindCell::CELL_CLIFF) {
@@ -9095,6 +8901,33 @@ void Pathfinder::prependCells( Path *path, const Coord3D *fromPos,
 		}
 		prevCell = cell;
 	}
+
+#if RETAIL_COMPATIBLE_PATHFINDING
+	// TheSuperHackers @info This pathway is here for retail compatibility, it is to catch when a starting cell has a dangling parent that contains no pathing information
+	// Beyond this point a retail client will crash due to a null pointer access within cell->getXIndex()
+	// To recover from this we set the cell to the previous cell, which should be the actual starting cell then set to use the fixed pathing and perform a forced cleanup
+	if (!s_useFixedPathfinding) {
+		if (!cell->hasInfo()) {
+			cell = prevCell;
+
+			m_zoneManager.setPassable(cell->getXIndex(), cell->getYIndex(), true);
+			if (goalCellNull) {
+				// Very short path.
+				adjustCoordToCell(cell->getXIndex(), cell->getYIndex(), center, pos, cell->getLayer());
+				path->prependNode( &pos, cell->getLayer() );
+			}
+			// put actual start position as first node on the path, so it begins right at the unit's feet
+			if (fromPos->x != path->getFirstNode()->getPosition()->x || fromPos->y != path->getFirstNode()->getPosition()->y) {
+				path->prependNode( fromPos, cell->getLayer() );
+			}
+
+			s_useFixedPathfinding = true;
+			forceCleanCells();
+			return;
+		}
+	}
+#endif
+
 	m_zoneManager.setPassable(cell->getXIndex(), cell->getYIndex(), true);
 	if (goalCellNull) {
 		// Very short path.
@@ -9106,18 +8939,16 @@ void Pathfinder::prependCells( Path *path, const Coord3D *fromPos,
 		path->prependNode( fromPos, cell->getLayer() );
 	}
 
-}			 
+}
 
-void Pathfinder::setDebugPath(Path *newDebugpath) 
+void Pathfinder::setDebugPath(Path *newDebugpath)
 {
 	if (TheGlobalData->m_debugAI)
 	{
 		// copy the path for debugging
-		if (debugPath)
-			deleteInstance(debugPath);
-
+		deleteInstance(debugPath);
 		debugPath = newInstance(Path);
-					
+
 		for( PathNode *copyNode = newDebugpath->getFirstNode(); copyNode; copyNode = copyNode->getNextOptimized() )
 			debugPath->appendNode( copyNode->getPosition(), copyNode->getLayer() );
 	}
@@ -9128,7 +8959,7 @@ void Pathfinder::setDebugPath(Path *newDebugpath)
  * Given two world-space points, call callback for each cell.
  * Uses Bresenham line algorithm from www.gamedev.net.
  */
-Int Pathfinder::iterateCellsAlongLine( const Coord3D& startWorld, const Coord3D& endWorld, 
+Int Pathfinder::iterateCellsAlongLine( const Coord3D& startWorld, const Coord3D& endWorld,
 																			PathfindLayerEnum layer, CellAlongLineProc proc, void* userData )
 {
 	ICoord2D start, end;
@@ -9140,7 +8971,7 @@ Int Pathfinder::iterateCellsAlongLine( const Coord3D& startWorld, const Coord3D&
  * Given two world-space points, call callback for each cell.
  * Uses Bresenham line algorithm from www.gamedev.net.
  */
-Int Pathfinder::iterateCellsAlongLine( const ICoord2D &start, const ICoord2D &end, 
+Int Pathfinder::iterateCellsAlongLine( const ICoord2D &start, const ICoord2D &end,
 																			PathfindLayerEnum layer, CellAlongLineProc proc, void* userData )
 {
 	Int delta_x = abs(end.x - start.x);			// The difference between the x's
@@ -9199,7 +9030,7 @@ Int Pathfinder::iterateCellsAlongLine( const ICoord2D &start, const ICoord2D &en
 	{
 		PathfindCell* to = getCell( layer, x, y );
 		if (to==NULL) return 0;
-		
+
 		Int ret = (*proc)(this, from, to, x, y, userData);
 		if (ret != 0)
 			return ret;
@@ -9238,7 +9069,7 @@ static ObjectID getSlaverID(const Object* o)
 			return sdu->getSlaverID();
 		}
 	}
-	
+
 	return INVALID_ID;
 }
 
@@ -9307,7 +9138,7 @@ struct ViewBlockedStruct
 		if (to->isObstaclePresent(getSlaverID(d->obj)))
 			return 0;
 
-		// if the obstacle is the item to which objOther is slaved, ignore it as an obstacle.				
+		// if the obstacle is the item to which objOther is slaved, ignore it as an obstacle.
 		if (to->isObstaclePresent(getSlaverID(d->objOther)))
 			return 0;
 
@@ -9347,7 +9178,7 @@ struct ViewAttackBlockedStruct
 			// nor does the object we're trying to attack!
 			if (to->isObstaclePresent(d->victim->getID()))
 				return 0;
-			// if the obstacle is the item to which objOther is slaved, ignore it as an obstacle.				
+			// if the obstacle is the item to which objOther is slaved, ignore it as an obstacle.
 			if (to->isObstaclePresent(getSlaverID(d->victim)))
 				return 0;
 		}
@@ -9364,12 +9195,12 @@ struct ViewAttackBlockedStruct
 
 		if (to->isObstacleTransparent())
 			return 0;
-		//Kris: Added the check for victimCell because in China01 -- after the intro, NW of your 
-		//base is a cream colored building that lies in a negative coord. When you order units to 
+		//Kris: Added the check for victimCell because in China01 -- after the intro, NW of your
+		//base is a cream colored building that lies in a negative coord. When you order units to
 		//force attack it, it crashes.
-		if( d->victimCell && to->isObstaclePresent( d->victimCell->getObstacleID() ) ) 
+		if( d->victimCell && to->isObstaclePresent( d->victimCell->getObstacleID() ) )
 		{
-			// Victim is inside the bounds of another object.  We don't let this block us, 
+			// Victim is inside the bounds of another object.  We don't let this block us,
 			// as usually it is on the edge and it looks like we should be able to shoot it. jba.
 			return 0;
 		}
@@ -9390,38 +9221,38 @@ Bool Pathfinder::isViewBlockedByObstacle(const Object* obj, const Object* objOth
 	}
 #if 1
 	return isAttackViewBlockedByObstacle(obj, *obj->getPosition(), objOther, *objOther->getPosition());
-#else 
+#else
 	PathfindLayerEnum layer = objOther->getLayer();
 	if (layer==LAYER_GROUND) {
 		layer = obj->getLayer();
 	}
-	Int ret = iterateCellsAlongLine(*obj->getPosition(), *objOther->getPosition(), 
+	Int ret = iterateCellsAlongLine(*obj->getPosition(), *objOther->getPosition(),
 		layer, lineBlockedByObstacleCallback, &info);
 	return ret != 0;
-#endif 
+#endif
 }
 
 
 //-----------------------------------------------------------------------------
 Bool Pathfinder::isAttackViewBlockedByObstacle(const Object* attacker, const Coord3D& attackerPos, const Object* victim, const Coord3D& victimPos)
 {
-	//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() - attackerPos is (%g,%g,%g) (%X,%X,%X)\n",
+	//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() - attackerPos is (%g,%g,%g) (%X,%X,%X)",
 	//	attackerPos.x, attackerPos.y, attackerPos.z,
 	//	AS_INT(attackerPos.x),AS_INT(attackerPos.y),AS_INT(attackerPos.z)));
-	//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() - victimPos is (%g,%g,%g) (%X,%X,%X)\n",
+	//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() - victimPos is (%g,%g,%g) (%X,%X,%X)",
 	//	victimPos.x, victimPos.y, victimPos.z,
 	//	AS_INT(victimPos.x),AS_INT(victimPos.y),AS_INT(victimPos.z)));
 	// Global switch to turn this off in case it doesn't work.
-	if (!TheAI->getAiData()->m_attackUsesLineOfSight) 
+	if (!TheAI->getAiData()->m_attackUsesLineOfSight)
 	{
-		//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 1\n"));
+		//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 1"));
 		return false;
 	}
 
 	// If the attacker doesn't need line of sight, isn't blocked.
-	if (!attacker->isKindOf(KINDOF_ATTACK_NEEDS_LINE_OF_SIGHT)) 
+	if (!attacker->isKindOf(KINDOF_ATTACK_NEEDS_LINE_OF_SIGHT))
 	{
-		//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 2\n"));
+		//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 2"));
 		return false;
 	}
 
@@ -9443,7 +9274,7 @@ Bool Pathfinder::isAttackViewBlockedByObstacle(const Object* attacker, const Coo
 
 		if (viewBlocked)
 		{
-			//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 3\n"));
+			//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 3"));
 			return true;
 		}
 	}
@@ -9457,13 +9288,13 @@ Bool Pathfinder::isAttackViewBlockedByObstacle(const Object* attacker, const Coo
 		layer = victim->getLayer();
 	}
 	info.victimCell = getCell(layer, &victimPos);
-	
+
 	info.skipCount = 0;
-	if (attacker->getLayer() != LAYER_GROUND) 
+	if (attacker->getLayer() != LAYER_GROUND)
 	{
 		info.skipCount = 3;	/// srj -- someone wanna tell me what this magic number means?
-												/// jba - Yes, it means that if someone is on a bridge, or rooftop, they can see 
-												///      3 pathfind cells out of whatever they are standing on.  
+												/// jba - Yes, it means that if someone is on a bridge, or rooftop, they can see
+												///      3 pathfind cells out of whatever they are standing on.
 												/// srj -- awesome! thank you very much :-)
 		if (layer==LAYER_GROUND) {
 			layer = attacker->getLayer();
@@ -9471,11 +9302,11 @@ Bool Pathfinder::isAttackViewBlockedByObstacle(const Object* attacker, const Coo
 	}
 
 	Int ret = iterateCellsAlongLine(attackerPos, victimPos, layer, attackBlockedByObstacleCallback, &info);
-	//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 4\n"));
+	//CRCDEBUG_LOG(("Pathfinder::isAttackViewBlockedByObstacle() 4"));
 	return ret != 0;
 }
 
-static void computeNormalRadialOffset(const Coord3D& from,	Coord3D& insert, const Coord3D& to, 
+static void computeNormalRadialOffset(const Coord3D& from,	Coord3D& insert, const Coord3D& to,
 																			Object *obj, Real radius)
 {
 	Real crossProduct;
@@ -9507,7 +9338,7 @@ static void computeNormalRadialOffset(const Coord3D& from,	Coord3D& insert, cons
 }
 
 //-----------------------------------------------------------------------------
-Bool Pathfinder::segmentIntersectsTallBuilding(const PathNode *curNode, 
+Bool Pathfinder::segmentIntersectsTallBuilding(const PathNode *curNode,
 										PathNode *nextNode,  ObjectID ignoreBuilding, Coord3D *insertPos1,  Coord3D *insertPos2,  Coord3D *insertPos3 )
 {
 	segmentIntersectsStruct info;
@@ -9524,7 +9355,7 @@ Bool Pathfinder::segmentIntersectsTallBuilding(const PathNode *curNode,
 			// see if toPos is inside the radius of the tall building.
 			Coord3D bldgPos = *info.theTallBuilding->getPosition();
 			Coord2D delta;
-			Real radius = info.theTallBuilding->getGeometryInfo().getBoundingCircleRadius() + 2*PATHFIND_CELL_SIZE_F; 
+			Real radius = info.theTallBuilding->getGeometryInfo().getBoundingCircleRadius() + 2*PATHFIND_CELL_SIZE_F;
 			delta.x = toPos.x - bldgPos.x;
 			delta.y = toPos.y - bldgPos.y;
 			if (delta.length() <= radius*0.98) {
@@ -9571,11 +9402,11 @@ Bool Pathfinder::circleClipsTallBuilding(	const Coord3D *from, const Coord3D *to
 	PartitionFilter *filters[] = { &filterKindof, NULL };
 	Object* tallBuilding = ThePartitionManager->getClosestObject(to, circleRadius, FROM_BOUNDINGSPHERE_2D, filters);
 	if (tallBuilding) {
-		Real radius = tallBuilding->getGeometryInfo().getBoundingCircleRadius() + 2*PATHFIND_CELL_SIZE_F; 
+		Real radius = tallBuilding->getGeometryInfo().getBoundingCircleRadius() + 2*PATHFIND_CELL_SIZE_F;
 		computeNormalRadialOffset(*from, *adjustTo, *to, tallBuilding, circleRadius+radius);
 		Object* otherTallBuilding = ThePartitionManager->getClosestObject(adjustTo, circleRadius, FROM_BOUNDINGSPHERE_2D, filters);
 		if (otherTallBuilding && otherTallBuilding!=tallBuilding) {
-			radius = otherTallBuilding->getGeometryInfo().getBoundingCircleRadius() + 2*PATHFIND_CELL_SIZE_F; 
+			radius = otherTallBuilding->getGeometryInfo().getBoundingCircleRadius() + 2*PATHFIND_CELL_SIZE_F;
 			Coord3D tmpTo = *adjustTo;
 			computeNormalRadialOffset(*from, *adjustTo, tmpTo, otherTallBuilding, circleRadius+radius);
 		}
@@ -9614,7 +9445,7 @@ struct LinePassableStruct
 		return 1;	// bail out
 	}
 
-	if (info.allyFixedCount || info.enemyFixed) 
+	if (info.allyFixedCount || info.enemyFixed)
 	{
 		return 1;	// bail out
 	}
@@ -9664,13 +9495,13 @@ struct GroundPathPassableStruct
  * Given two world-space points, check the line of sight between them for any impassible cells.
  * Uses Bresenham line algorithm from www.gamedev.net.
  */
-Bool Pathfinder::isLinePassable( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces, 
-																PathfindLayerEnum layer, const Coord3D& startWorld, 
-																const Coord3D& endWorld, Bool blocked, 
+Bool Pathfinder::isLinePassable( const Object *obj, LocomotorSurfaceTypeMask acceptableSurfaces,
+																PathfindLayerEnum layer, const Coord3D& startWorld,
+																const Coord3D& endWorld, Bool blocked,
 																Bool allowPinched)
 {
 	LinePassableStruct info;
-	//CRCDEBUG_LOG(("Pathfinder::isLinePassable(): %d %d %d \n", m_ignoreObstacleID, m_isMapReady, m_isTunneling));
+	//CRCDEBUG_LOG(("Pathfinder::isLinePassable(): %d %d %d ", m_ignoreObstacleID, m_isMapReady, m_isTunneling));
 
 	info.obj = obj;
 	info.acceptableSurfaces = acceptableSurfaces;
@@ -9688,7 +9519,7 @@ Bool Pathfinder::isLinePassable( const Object *obj, LocomotorSurfaceTypeMask acc
  * Given two world-space points, check the line of sight between them for any impassible cells.
  * Uses Bresenham line algorithm from www.gamedev.net.
  */
-Bool Pathfinder::isGroundPathPassable( Bool isCrusher, const Coord3D& startWorld, PathfindLayerEnum startLayer, 
+Bool Pathfinder::isGroundPathPassable( Bool isCrusher, const Coord3D& startWorld, PathfindLayerEnum startLayer,
 		const Coord3D& endWorld, Int pathDiameter)
 {
 	GroundPathPassableStruct info;
@@ -9700,14 +9531,14 @@ Bool Pathfinder::isGroundPathPassable( Bool isCrusher, const Coord3D& startWorld
 	return ret == 0;
 }
 
-/** 
+/**
  * Classify the cells under the bridge
- * If 'repaired' is true, bridge is repaired 
- * If 'repaired' is false, bridge has been damaged to be impassable 
+ * If 'repaired' is true, bridge is repaired
+ * If 'repaired' is false, bridge has been damaged to be impassable
  */
 void Pathfinder::changeBridgeState( PathfindLayerEnum layer, Bool repaired)
 {
-	if (m_layers[layer].isUnused()) return;	
+	if (m_layers[layer].isUnused()) return;
 	if (m_layers[layer].setDestroyed(!repaired)) {
 		m_zoneManager.markZonesDirty( repaired );
 	}
@@ -9716,7 +9547,7 @@ void Pathfinder::changeBridgeState( PathfindLayerEnum layer, Bool repaired)
 void Pathfinder::getRadiusAndCenter(const Object *obj, Int &iRadius, Bool &center)
 {
 	enum {MAX_RADIUS = 2};
-	if (!obj) 
+	if (!obj)
 	{
 		center = true;
 		iRadius = 0;
@@ -9727,21 +9558,21 @@ void Pathfinder::getRadiusAndCenter(const Object *obj, Int &iRadius, Bool &cente
 		diameter = 2.0f*PATHFIND_CELL_SIZE_F;
 	}
 	iRadius = REAL_TO_INT_FLOOR(diameter/PATHFIND_CELL_SIZE_F+0.3f);
-	center = false;	
+	center = false;
 	if (iRadius==0) iRadius++;
-	if (iRadius&1) 
+	if (iRadius&1)
 	{
 		center = true;
 	}
 	iRadius /= 2;
-	if (iRadius > MAX_RADIUS) 
+	if (iRadius > MAX_RADIUS)
 	{
 		iRadius = MAX_RADIUS;
 		center = true;
 	}
 }
 
-/** 
+/**
  * Updates the goal cell for an ai unit.
  */
 void Pathfinder::updateGoal( Object *obj, const Coord3D *newGoalPos, PathfindLayerEnum layer)
@@ -9756,7 +9587,7 @@ void Pathfinder::updateGoal( Object *obj, const Coord3D *newGoalPos, PathfindLay
 
 
 
-  if (!ai->isDoingGroundMovement()) // exception:sniped choppers are on ground  
+  if (!ai->isDoingGroundMovement()) // exception:sniped choppers are on ground
   {
 
     Bool isUnmannedHelicopter = ( obj->isKindOf( KINDOF_PRODUCED_AT_HELIPAD ) && obj->isDisabledByType( DISABLED_UNMANNED  ) ) ;
@@ -9769,7 +9600,6 @@ void Pathfinder::updateGoal( Object *obj, const Coord3D *newGoalPos, PathfindLay
 
 	PathfindLayerEnum originalLayer = obj->getDestinationLayer();
 
-	//DEBUG_LOG(("Object Goal layer is %d\n", layer));
 	Bool layerChanged = originalLayer != layer;
 
 	Bool doGround=false;
@@ -9817,9 +9647,8 @@ void Pathfinder::updateGoal( Object *obj, const Coord3D *newGoalPos, PathfindLay
 				if (cell) {
 					if (warn && cell->getGoalUnit()!=INVALID_ID && cell->getGoalUnit() != obj->getID()) {
 						warn = false;
-						// jba intense debug
-						//DEBUG_LOG(, ("Units got stuck close to each other.  jba\n"));
-					}	
+						//Units got stuck close to each other.  jba
+					}
 					cellNdx.x = i;
 					cellNdx.y = j;
 					cell->setGoalUnit(obj->getID(), cellNdx);
@@ -9830,8 +9659,7 @@ void Pathfinder::updateGoal( Object *obj, const Coord3D *newGoalPos, PathfindLay
 				if (cell) {
 					if (warn && cell->getGoalUnit()!=INVALID_ID && cell->getGoalUnit() != obj->getID()) {
 						warn = false;
-						// jba intense debug
-						//DEBUG_LOG(, ("Units got stuck close to each other.  jba\n"));
+						//Units got stuck close to each other.  jba
 					}
 					cellNdx.x = i;
 					cellNdx.y = j;
@@ -9843,7 +9671,7 @@ void Pathfinder::updateGoal( Object *obj, const Coord3D *newGoalPos, PathfindLay
 
 }
 
-/** 
+/**
  * Updates the goal cell for an ai unit.
  */
 void Pathfinder::updateAircraftGoal( Object *obj, const Coord3D *newGoalPos)
@@ -9899,9 +9727,9 @@ void Pathfinder::updateAircraftGoal( Object *obj, const Coord3D *newGoalPos)
 
 }
 
-/** 
+/**
  * Removes the goal cell for an ai unit.
- * Used for a unit that is going to be moving several times, like following a waypoint path, 
+ * Used for a unit that is going to be moving several times, like following a waypoint path,
  * or intentionally collides with other units (like a car bomb). jba
  */
 void Pathfinder::removeGoal( Object *obj)
@@ -9961,27 +9789,27 @@ void Pathfinder::removeGoal( Object *obj)
 	}
 }
 
-/** 
+/**
  * Updates the position cell for an ai unit.
  */
 void Pathfinder::updatePos( Object *obj, const Coord3D *newPos)
 {
-	if (obj->isKindOf(KINDOF_IMMOBILE)) 
+	if (obj->isKindOf(KINDOF_IMMOBILE))
 	{
 		// Only consider mobile.
 		return;
 	}
-	if (!m_isMapReady) 
+	if (!m_isMapReady)
 		return;
 
 	AIUpdateInterface *ai = obj->getAIUpdateInterface();
-	if (!ai) 
+	if (!ai)
 		return; // only consider ai objects.
 
 	ICoord2D curCell = *ai->getCurPathfindCell();
-	if (!ai->isDoingGroundMovement()) 
+	if (!ai->isDoingGroundMovement())
 	{
-		if (curCell.x>=0 && curCell.y>=0) 
+		if (curCell.x>=0 && curCell.y>=0)
 		{
 			removePos(obj);
 		}
@@ -9993,19 +9821,19 @@ void Pathfinder::updatePos( Object *obj, const Coord3D *newPos)
 	ICoord2D newCell;
 	getRadiusAndCenter(obj, radius, centerInCell);
 	Int numCellsAbove = radius;
-	if (centerInCell) 
+	if (centerInCell)
 		numCellsAbove++;
-	if (centerInCell) 
+	if (centerInCell)
 	{
 		newCell.x = REAL_TO_INT_FLOOR(newPos->x/PATHFIND_CELL_SIZE_F);
 		newCell.y = REAL_TO_INT_FLOOR(newPos->y/PATHFIND_CELL_SIZE_F);
-	} 
-	else 
+	}
+	else
 	{
 		newCell.x = REAL_TO_INT_FLOOR(0.5f+newPos->x/PATHFIND_CELL_SIZE_F);
 		newCell.y = REAL_TO_INT_FLOOR(0.5f+newPos->y/PATHFIND_CELL_SIZE_F);
 	}
-	if (newCell.x==curCell.x && newCell.y == curCell.y) 
+	if (newCell.x==curCell.x && newCell.y == curCell.y)
 	{
 		return;
 	}
@@ -10025,7 +9853,7 @@ void Pathfinder::updatePos( Object *obj, const Coord3D *newPos)
 	ai->setCurPathfindCell(newCell);
 	Int i,j;
 	ICoord2D cellNdx;
-	//DEBUG_LOG(("Updating unit pos at cell %d, %d\n", newCell.x, newCell.y));
+	//DEBUG_LOG(("Updating unit pos at cell %d, %d", newCell.x, newCell.y));
 	if (curCell.x>=0 && curCell.y>=0) {
 		for (i=curCell.x-radius; i<curCell.x+numCellsAbove; i++) {
 			for (j=curCell.y-radius; j<curCell.y+numCellsAbove; j++) {
@@ -10070,7 +9898,7 @@ void Pathfinder::updatePos( Object *obj, const Coord3D *newPos)
 	}
 }
 
-/** 
+/**
  * Removes the position cell flags for an ai unit.
  */
 void Pathfinder::removePos( Object *obj)
@@ -10096,7 +9924,7 @@ void Pathfinder::removePos( Object *obj)
 
 	Int i,j;
 	ICoord2D cellNdx;
-	//DEBUG_LOG(("Updating unit pos at cell %d, %d\n", newCell.x, newCell.y));
+	//DEBUG_LOG(("Updating unit pos at cell %d, %d", newCell.x, newCell.y));
 	if (curCell.x>=0 && curCell.y>=0) {
 		for (i=curCell.x-radius; i<curCell.x+numCellsAbove; i++) {
 			for (j=curCell.y-radius; j<curCell.y+numCellsAbove; j++) {
@@ -10122,7 +9950,7 @@ void Pathfinder::removePos( Object *obj)
 	}
 }
 
-/** 
+/**
  * Removes a mobile unit from the pathfind grid.
  */
 void Pathfinder::removeUnitFromPathfindMap(  Object *obj )
@@ -10133,7 +9961,7 @@ void Pathfinder::removeUnitFromPathfindMap(  Object *obj )
 
 Bool Pathfinder::moveAllies(Object *obj, Path *path)
 {
-								 
+
 #ifdef DO_UNIT_TIMINGS
 #pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
 extern Bool g_UT_startTiming;
@@ -10141,10 +9969,14 @@ if (g_UT_startTiming) return false;
 #endif
 	if (!obj->isKindOf(KINDOF_DOZER) && !obj->isKindOf(KINDOF_HARVESTER)) {
 		// Harvesters & dozers want a clear path.
-		if (!path->getBlockedByAlly()) return FALSE; // Only move units if it is required.
+		if (!path->getBlockedByAlly()) {
+			return FALSE; // Only move units if it is required.
+		}
+	}
+	LatchRestore<Int> recursiveDepth(m_moveAlliesDepth, m_moveAlliesDepth+1);
+	if (m_moveAlliesDepth > 2) {
+		return false;
 	}
-	LatchRestore<Int> recursiveDepth(m_moveAlliesDepth, m_moveAlliesDepth+1);	
-	if (m_moveAlliesDepth > 2) return false;
 
 	Bool centerInCell;
 	Int radius;
@@ -10163,46 +9995,58 @@ if (g_UT_startTiming) return false;
 		for (i=curCell.x-radius; i<curCell.x+numCellsAbove; i++) {
 			for (j=curCell.y-radius; j<curCell.y+numCellsAbove; j++) {
 				PathfindCell	*cell = getCell(node->getLayer(), i, j);
-				if (cell) {
-					if (cell->getPosUnit()==INVALID_ID) {
+				if (!cell) {
+					continue; // Cell is not on the pathfinding grid
+				}
+
+				ObjectID unitId = cell->getPosUnit();
+				if (unitId==INVALID_ID) {
+					continue;
+				}
+
+				if (unitId==obj->getID()) {
+					continue;	// It's us.
+				}
+
+				if (unitId==ignoreId) {
+					continue;	 // It's the one we are ignoring.
+				}
+
+				Object *otherObj = TheGameLogic->findObjectByID(unitId);
+				if (!otherObj) {
+					continue;
+				}
+
+				if (obj->getRelationship(otherObj)!=ALLIES) {
+					continue;  // Only move allies.
+				}
+
+				if (obj->isKindOf(KINDOF_INFANTRY) && otherObj->isKindOf(KINDOF_INFANTRY)) {
+					continue;  // infantry can walk through other infantry, so just let them.
+				}
+				if (obj->isKindOf(KINDOF_INFANTRY) && !otherObj->isKindOf(KINDOF_INFANTRY)) {
+					// If this is a general clear operation, don't let infantry push vehicles.
+					if (!path->getBlockedByAlly()) {
 						continue;
 					}
-					if (cell->getPosUnit()==obj->getID()) { 
-						continue;	// It's us.
-					}
-					if (cell->getPosUnit()==ignoreId) { 
-						continue;	 // It's the one we are ignoring.
-					}
-					Object *otherObj = TheGameLogic->findObjectByID(cell->getPosUnit());
-					if (obj->getRelationship(otherObj)!=ALLIES) {
-						continue;  // Only move allies.
-					}
-					if (otherObj==NULL) continue;
-					if (obj->isKindOf(KINDOF_INFANTRY) && otherObj->isKindOf(KINDOF_INFANTRY)) {
-						continue;  // infantry can walk through other infantry, so just let them.
-					}
-					if (obj->isKindOf(KINDOF_INFANTRY) && !otherObj->isKindOf(KINDOF_INFANTRY)) {
-						// If this is a general clear operation, don't let infantry push vehicles.
-						if (!path->getBlockedByAlly()) continue;
-					}
-					if( otherObj && otherObj->getAI() && !otherObj->getAI()->isMoving() ) 
-					{
-						if( otherObj->getAI()->isAttacking() ) 
-						{
-							continue; // Don't move units that are attacking. [8/14/2003]
-						}
+				}
 
-						//Kris: Patch 1.01 November 3, 2003
-						//Black Lotus exploit fix -- moving while hacking.
-						if( otherObj->testStatus( OBJECT_STATUS_IS_USING_ABILITY ) || otherObj->getAI()->isBusy() )
-						{
-							continue; // Packing or unpacking objects for example
-						}
-						
-						//DEBUG_LOG(("Moving ally\n"));
-						otherObj->getAI()->aiMoveAwayFromUnit(obj, CMD_FROM_AI);
-					}
+				if (!otherObj->getAI() || otherObj->getAI()->isMoving()) {
+					continue;
+				}
+
+				if (otherObj->getAI()->isAttacking()) {
+					continue; // Don't move units that are attacking. [8/14/2003]
+				}
+
+				//Kris: Patch 1.01 November 3, 2003
+				//Black Lotus exploit fix -- moving while hacking.
+				if( otherObj->testStatus( OBJECT_STATUS_IS_USING_ABILITY ) || otherObj->getAI()->isBusy() ) {
+					continue; // Packing or unpacking objects for example
 				}
+
+				//DEBUG_LOG(("Moving ally"));
+				otherObj->getAI()->aiMoveAwayFromUnit(obj, CMD_FROM_AI);
 			}
 		}
 	}
@@ -10217,7 +10061,9 @@ if (g_UT_startTiming) return false;
 Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 											Path *pathToAvoid, Object *otherObj2, Path *pathToAvoid2)
 {
-	if (m_isMapReady == false) return NULL; // Should always be ok.
+	if (!m_isMapReady)
+		return NULL; // Should always be ok.
+
 #ifdef DEBUG_LOGGING
 	Int startTimeMS = ::GetTickCount();
 #endif
@@ -10247,19 +10093,20 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 		startPos.x += PATHFIND_CELL_SIZE_F*0.5f;
 	}
 	worldToCell(&startPos, &startCellNdx);
-	PathfindCell *parentCell = getClippedCell( obj->getLayer(), obj->getPosition() ); 
-	if (parentCell == NULL)
+	PathfindCell *parentCell = getClippedCell( obj->getLayer(), obj->getPosition() );
+	if (!parentCell)
 		return NULL;
-	if (!obj->getAIUpdateInterface()) {
-		return NULL; // shouldn't happen, but can't move it without an ai.
-	}
+
+	if (!obj->getAIUpdateInterface()) // shouldn't happen, but can't move it without an ai.
+		return NULL; 
+
 	const LocomotorSet& locomotorSet = obj->getAIUpdateInterface()->getLocomotorSet();
 
 	m_isTunneling = false;
 	if (validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), parentCell ) == false) {
 		m_isTunneling = true; // We can't move from our current location.  So relax the constraints.
 	}
-	
+
 	TCheckMovementInfo info;
 	info.cell = startCellNdx;
 	info.layer = obj->getLayer();
@@ -10307,12 +10154,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 		bounds.hi.y = cellCenter.y+boxHalfWidth;
 		PathNode *node;
 		Bool overlap = false;
-		if (obj) {
-			if (bounds.lo.x<obj->getPosition()->x && bounds.hi.x>obj->getPosition()->x &&
-				bounds.lo.y<obj->getPosition()->y && bounds.hi.y>obj->getPosition()->y)	{
-					//overlap = true;
-				}
-		}
+
 		for( node = pathToAvoid->getFirstNode(); node && node->getNextOptimized(); node = node->getNextOptimized() )	{
 			Coord2D start, end;
 			start.x = node->getPosition()->x;
@@ -10324,12 +10166,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 				break;
 			}
 		}
-		if (otherObj) {
-			if (bounds.lo.x<otherObj->getPosition()->x && bounds.hi.x>otherObj->getPosition()->x &&
-				bounds.lo.y<otherObj->getPosition()->y && bounds.hi.y>otherObj->getPosition()->y)	{
-					//overlap = true;
-				}
-		}
+
 		if (!overlap && pathToAvoid2) {
 			for( node = pathToAvoid2->getFirstNode(); node && node->getNextOptimized(); node = node->getNextOptimized() )	{
 				Coord2D start, end;
@@ -10350,7 +10187,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 			}
 		}
 		///@todo - Adjust cost intersecting path - closer to front is more expensive. jba.
-		if (!overlap && checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(), 
+		if (!overlap && checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(),
 				parentCell->getLayer(), radius, centerInCell)) {
 			// success - found a path to the goal
 			if (false && TheGlobalData->m_debugAI)
@@ -10358,10 +10195,19 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 			m_isTunneling = false;
 			// construct and return path
 			Path *newPath = buildActualPath( obj, locomotorSet.getValidSurfaces(), obj->getPosition(), parentCell, centerInCell, false);
-			parentCell->releaseInfo();
-			cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding) {
+				parentCell->releaseInfo();
+				cleanOpenAndClosedLists();
+			}
+			else
+#endif
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
+			}
 			return newPath;
-		}	
+		}
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
 
@@ -10372,27 +10218,34 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 
 	}
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	debugShowSearch(true);
 #endif
 
-	DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-	DEBUG_LOG(("getMoveAwayFromPath pathfind failed  -- "));
-	DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
+	DEBUG_LOG(("%d getMoveAwayFromPath pathfind failed --", TheGameLogic->getFrame()));
+	DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 
 	m_isTunneling = false;
-	cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+	}
 	return NULL;
 }
 
 
-
-/** Patch to the exiting path from the current position, either because we became blocked, 
+/** Patch to the exiting path from the current position, either because we became blocked,
   or because we had to move off the path to avoid other units. */
-Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet, 
+Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet,
 		Path *originalPath, Bool blocked )
 {
-	//CRCDEBUG_LOG(("Pathfinder::patchPath()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::patchPath()"));
 #ifdef DEBUG_LOGGING
 	Int startTimeMS = ::GetTickCount();
 #endif
@@ -10411,7 +10264,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 
 	enum {CELL_LIMIT = 2000}; // max cells to examine.
 	Int cellCount = 0;
-		 
+
 	Coord3D currentPosition = *obj->getPosition();
 
 	// determine start cell
@@ -10423,7 +10276,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 	}
 	worldToCell(&startPos, &startCellNdx);
 	//worldToCell(obj->getPosition(), &startCellNdx);
-	PathfindCell *parentCell = getClippedCell( obj->getLayer(), &currentPosition); 
+	PathfindCell *parentCell = getClippedCell( obj->getLayer(), &currentPosition);
 	if (parentCell == NULL)
 		return NULL;
 	if (!obj->getAIUpdateInterface()) {
@@ -10431,7 +10284,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 	}
 
 	m_isTunneling = false;
-	
+
 	if (!parentCell->allocateInfo(startCellNdx)) {
 		return NULL;
 	}
@@ -10448,9 +10301,9 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 	// until goal is found.
 	//
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
-	if (TheGlobalData->m_debugAI) 
+	if (TheGlobalData->m_debugAI)
 	{
 		RGBColor color;
 		color.setFromInt(0);
@@ -10471,7 +10324,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 		info.radius = radius;
 		info.considerTransient = blocked;
 		info.acceptableSurfaces = locomotorSet.getValidSurfaces();
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 		if (TheGlobalData->m_debugAI) {
 			RGBColor color;
 			color.setFromInt(0);
@@ -10488,16 +10341,24 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 		}
 		if (info.allyFixedCount || info.enemyFixed) {
 			break;	// Don't patch through cells that are occupied.
-		}	
+		}
 		Real curSqr = sqr(startNode->getPosition()->x-currentPosition.x) + sqr(startNode->getPosition()->y - currentPosition.y);
 		if (curSqr < goalDeltaSqr) {
 			goalPos = *startNode->getPosition();
 			goalDeltaSqr = curSqr;
 		}
 
-	}	
+	}
 	if (startNode == originalPath->getLastNode()) {
-		cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (!s_useFixedPathfinding) {
+			cleanOpenAndClosedLists();
+		}
+		else
+#endif
+		{
+			parentCell->releaseInfo();
+		}
 		return NULL; // no open nodes.
 	}
 	PathfindCell *candidateGoal;
@@ -10505,6 +10366,12 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 	ICoord2D goalCellNdx;
 	worldToCell(&goalPos, &goalCellNdx);
 	if (!candidateGoal->allocateInfo(goalCellNdx)) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+		if (s_useFixedPathfinding)
+#endif
+		{
+			parentCell->releaseInfo();
+		}
 		return NULL;
 	}
 
@@ -10532,86 +10399,74 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 			// construct and return path
 			Path *path = newInstance(Path);
 			PathNode *node;
-			for( node = originalPath->getLastNode(); node != matchNode; node = node->getPrevious() )	{	
+			for( node = originalPath->getLastNode(); node != matchNode; node = node->getPrevious() )	{
 				path->prependNode(node->getPosition(), node->getLayer());
 			}
 			prependCells(path, obj->getPosition(), parentCell, centerInCell);
 
 			// cleanup the path by checking line of sight
 			path->optimize(obj, locomotorSet.getValidSurfaces(), blocked);
-			parentCell->releaseInfo();
-			cleanOpenAndClosedLists();
-			candidateGoal->releaseInfo();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding) {
+				parentCell->releaseInfo();
+				cleanOpenAndClosedLists();
+				candidateGoal->releaseInfo();
+			}
+			else
+#endif
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
+				candidateGoal->releaseInfo();
+			}
 
 			return path;
-		}	
+		}
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
 
 		if (cellCount < CELL_LIMIT) {
 			// Check to see if we can change layers in this cell.
-			checkChangeLayers(parentCell); 
+			checkChangeLayers(parentCell);
 			cellCount += examineNeighboringCells(parentCell, NULL, locomotorSet, isHuman, centerInCell, radius, startCellNdx, obj, NO_ATTACK);
 		}
 	}
 
-	DEBUG_LOG(("%d ", TheGameLogic->getFrame()));
-	DEBUG_LOG(("patchPath Pathfind failed  -- "));
-	DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
+	DEBUG_LOG(("%d patchPath Pathfind failed --", TheGameLogic->getFrame()));
+	DEBUG_LOG(("Unit '%s', time %f", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI) {
 		debugShowSearch(true);
 	}
 #endif
 	m_isTunneling = false;
-	if (!candidateGoal->getOpen() && !candidateGoal->getClosed())
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		if (!candidateGoal->getOpen() && !candidateGoal->getClosed())
+		{
+			// Not on one of the lists 
+			candidateGoal->releaseInfo();
+		}
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
 	{
-		// Not on one of the lists 
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
 		candidateGoal->releaseInfo();
 	}
-	cleanOpenAndClosedLists();
 	return NULL;
 }
 
 
 /** Find a short, valid path to a location that obj can attack victim from.  */
 Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
-		const Object *victim, const Coord3D* victimPos, const Weapon *weapon ) 
-{
-	/*
-	CRCDEBUG_LOG(("Pathfinder::findAttackPath() for object %d (%s)\n", obj->getID(), obj->getTemplate()->getName().str()));
-	XferCRC xferCRC;
-	xferCRC.open("lightCRC");
-	xferCRC.xferSnapshot((Object *)obj);
-	xferCRC.close();
-	CRCDEBUG_LOG(("obj CRC is %X\n", xferCRC.getCRC()));
-	if (from)
-	{
-		CRCDEBUG_LOG(("from: (%g,%g,%g) (%X,%X,%X)\n",
-			from->x, from->y, from->z,
-			AS_INT(from->x), AS_INT(from->y), AS_INT(from->z)));
-	}
-	if (victim)
-	{
-		CRCDEBUG_LOG(("victim is %d (%s)\n", victim->getID(), victim->getTemplate()->getName().str()));
-		XferCRC xferCRC;
-		xferCRC.open("lightCRC");
-		xferCRC.xferSnapshot((Object *)victim);
-		xferCRC.close();
-		CRCDEBUG_LOG(("victim CRC is %X\n", xferCRC.getCRC()));
-	}
-	if (victimPos)
-	{
-		CRCDEBUG_LOG(("from: (%g,%g,%g) (%X,%X,%X)\n",
-			victimPos->x, victimPos->y, victimPos->z,
-			AS_INT(victimPos->x), AS_INT(victimPos->y), AS_INT(victimPos->z)));
-	}
-	*/
-	if (m_isMapReady == false) return NULL; // Should always be ok.
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-//	Int startTimeMS = ::GetTickCount();
-#endif
+		const Object *victim, const Coord3D* victimPos, const Weapon *weapon )
+{
+	if (!m_isMapReady)
+		return NULL; // Should always be ok.
 
 	Bool isCrusher = obj ? obj->getCrusherLevel() > 0 : false;
 	Int radius;
@@ -10636,31 +10491,33 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 			ICoord2D cellNdx;
 			worldToCell(&testPos, &cellNdx);
 			PathfindCell *aCell = getCell(obj->getLayer(), cellNdx.x, cellNdx.y);
-			if (aCell==NULL) break;
-			if (!validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), aCell )) {
+			if (!aCell)
 				break;
-			}
-			if (!checkDestination(obj, cellNdx.x, cellNdx.y, obj->getLayer(), radius, centerInCell)) {
+
+			if (!validMovementPosition(isCrusher, locomotorSet.getValidSurfaces(), aCell))
 				break;
+
+			if (!checkDestination(obj, cellNdx.x, cellNdx.y, obj->getLayer(), radius, centerInCell))
+				break;
+
+			if (!weapon->isGoalPosWithinAttackRange(obj, &testPos, victim, victimPos))
+				continue;
+
+			if (isAttackViewBlockedByObstacle(obj, testPos, victim, *victimPos))
+				continue;
+
+			// return path.
+			Path *path = newInstance(Path);
+			path->prependNode( &testPos, obj->getLayer() );
+			path->prependNode( &curPos, obj->getLayer() );
+			path->getFirstNode()->setNextOptimized(path->getFirstNode()->getNext());
+			if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) {
+				setDebugPath(path);
 			}
-			if (weapon->isGoalPosWithinAttackRange(obj, &testPos, victim, victimPos)) {
-				if (!isAttackViewBlockedByObstacle(obj, testPos, victim, *victimPos)) {
-					// return path.
-					Path *path = newInstance(Path);
-					path->prependNode( &testPos, obj->getLayer() );
-					path->prependNode( &curPos, obj->getLayer() );
-					path->getFirstNode()->setNextOptimized(path->getFirstNode()->getNext());
-					if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) {
-						setDebugPath(path);
-					}
-					return path;
-				}
-			}
+			return path;
 		}
 	}
 
-
-
 	const Int ATTACK_CELL_LIMIT = 2500; // this is a rather expensive operation, so limit the search.
 
 	Bool isHuman = true;
@@ -10689,19 +10546,20 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 	if (centerInCell) {
 		objPos.x += PATHFIND_CELL_SIZE_F/2.0f;
 		objPos.y += PATHFIND_CELL_SIZE_F/2.0f;
-	}	
+	}
+
+	if (!obj->getAIUpdateInterface()) // shouldn't happen, but can't move without an ai.
+		return NULL;
+
 	worldToCell(&objPos, &startCellNdx);
-	PathfindCell *parentCell = getClippedCell( obj->getLayer(), &objPos ); 
-	if (parentCell == NULL)
+	PathfindCell *parentCell = getClippedCell( obj->getLayer(), &objPos );
+	if (!parentCell)
 		return NULL;
-	if (!obj->getAIUpdateInterface()) {
-		return NULL; // shouldn't happen, but can't move it without an ai.
-	}
-	const PathfindCell *startCell = parentCell;
 
-	if (!parentCell->allocateInfo(startCellNdx)) {
+	if (!parentCell->allocateInfo(startCellNdx))
 		return NULL;
-	}
+
+	const PathfindCell *startCell = parentCell;
 	parentCell->startPathfind(NULL);
 
 	// determine start cell
@@ -10710,7 +10568,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 
 	// determine goal cell
 	PathfindCell *goalCell = getCell( LAYER_GROUND, victimCellNdx.x, victimCellNdx.y );
-	if (goalCell == NULL)
+	if (!goalCell)
 		return NULL;
 
  	if (!goalCell->allocateInfo(victimCellNdx)) {
@@ -10737,7 +10595,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 	if (victim && !victim->isSignificantlyAboveTerrain()) {
 		checkLOS = true;
 	}
-	
+
 	while( m_openList != NULL )
 	{
 		// take head cell off of open list - it has lowest estimated total path cost
@@ -10748,12 +10606,12 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 		adjustCoordToCell(parentCell->getXIndex(), parentCell->getYIndex(), centerInCell, cellCenter, parentCell->getLayer());
 
 		///@todo - Adjust cost intersecting path - closer to front is more expensive. jba.
-		if (weapon->isGoalPosWithinAttackRange(obj, &cellCenter, victim, victimPos) && 
-			checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(), 
+		if (weapon->isGoalPosWithinAttackRange(obj, &cellCenter, victim, victimPos) &&
+			checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(),
 				parentCell->getLayer(), radius, centerInCell)) {
 			// check line of sight.
 			Bool viewBlocked = false;
-			if (checkLOS) 
+			if (checkLOS)
 			{
 				viewBlocked = isAttackViewBlockedByObstacle(obj, cellCenter, victim, *victimPos);
 			}
@@ -10761,11 +10619,11 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 				// We never want to accept our starting cell.
 				// If we could attack from there, we wouldn't be calling
 				// FindAttackPath.  Usually happens cause the cell is valid for attack, but
-				// a point near the cell center isn't, and that happens to be where the 
+				// a point near the cell center isn't, and that happens to be where the
 				// attacker is standing, and it's too close to move to.
 				viewBlocked = true;
 			} else {
-				// If through some unfortunate rounding, we end up moving near ourselves, 
+				// If through some unfortunate rounding, we end up moving near ourselves,
 				// don't want it.
 				Coord3D cellPos;
 				adjustCoordToCell(parentCell->getXIndex(), parentCell->getYIndex(), centerInCell, cellPos, parentCell->getLayer());
@@ -10775,8 +10633,8 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 					viewBlocked = true;
 				}
 			}
-			if (!viewBlocked) 
-			{ 
+			if (!viewBlocked)
+			{
 				// success - found a path to the goal
 				Bool show = TheGlobalData->m_debugAI;
 	#ifdef INTENSE_DEBUG
@@ -10787,11 +10645,11 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 				}
 				if (count>1000) {
 					show = true;
-					DEBUG_LOG(("FAP cells %d obj %s %x\n", count, obj->getTemplate()->getName().str(), obj));
+					DEBUG_LOG(("FAP cells %d obj %s %x", count, obj->getTemplate()->getName().str(), obj));
 	#ifdef STATE_MACHINE_DEBUG
 					if( obj->getAIUpdateInterface() )
 					{
-						DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+						DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 					}
 	#endif
 					TheScriptEngine->AppendDebugMessage("Big Attack path", false);
@@ -10799,9 +10657,7 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 	#endif
 				if (show)
 					debugShowSearch(true);
-	#if defined RTS_DEBUG || defined RTS_INTERNAL
-				//DEBUG_LOG(("Attack path took %d cells, %f sec\n", cellCount, (::GetTickCount()-startTimeMS)/1000.0f));
-	#endif
+
 				// put parent cell onto closed list - its evaluation is finished
 				m_closedList = parentCell->putOnClosedList( m_closedList );
 				// construct and return path
@@ -10845,9 +10701,9 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 							// If the unit present is idle, it doesn't block allies. [8/18/2003]
 							blockedByAllies = false;
 						}
-						
 
-						if (!checkMovement || blockedByEnemy || blockedByAllies) {							
+
+						if (!checkMovement || blockedByEnemy || blockedByAllies) {
 							lastBlocked = cur;
 							useLargeRadius = true;
 						} else {
@@ -10859,19 +10715,28 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 						parentCell = lastBlocked;
 						if (lastBlocked->getParentCell()) {
 							parentCell = lastBlocked->getParentCell();
-						} 
+						}
 					}
 				}
 				Path *path = buildActualPath( obj, locomotorSet.getValidSurfaces(), obj->getPosition(), parentCell, centerInCell, false);
-				if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+				if (!s_useFixedPathfinding) {
+					if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+						goalCell->releaseInfo();
+					}
+					cleanOpenAndClosedLists();
+				}
+				else
+#endif
+				{
+					cleanOpenAndClosedLists();
+					parentCell->releaseInfo();
 					goalCell->releaseInfo();
 				}
-				cleanOpenAndClosedLists();
 				return path;
 			}
-		}	
-		if (checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(), 
-																parentCell->getLayer(), radius, centerInCell)) {
+		}
+		if (checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(), parentCell->getLayer(), radius, centerInCell)) {
 			if (validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), parentCell )) {
 				Real dx = IABS(victimCellNdx.x-parentCell->getXIndex());
 				Real dy = IABS(victimCellNdx.y-parentCell->getYIndex());
@@ -10889,18 +10754,18 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 		if (cellCount < ATTACK_CELL_LIMIT) {
 				// Check to see if we can change layers in this cell.
 			checkChangeLayers(parentCell);
-			cellCount += examineNeighboringCells(parentCell, goalCell, locomotorSet, isHuman, centerInCell, 
+			cellCount += examineNeighboringCells(parentCell, goalCell, locomotorSet, isHuman, centerInCell,
 				radius, startCellNdx, obj, attackDistance);
 		}
 
 	}
 
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG(("obj %s %x\n", obj->getTemplate()->getName().str(), obj));
+	DEBUG_LOG(("obj %s %x", obj->getTemplate()->getName().str(), obj));
 #ifdef STATE_MACHINE_DEBUG
 	if( obj->getAIUpdateInterface() )
 	{
-		DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+		DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 	}
 #endif
 	debugShowSearch(true);
@@ -10913,34 +10778,43 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 		cleanOpenAndClosedLists();
 		return path;
 	}
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount));
-	DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- \n", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
-	DEBUG_LOG(("Unit '%s', attacking '%s' time %f\n", obj->getTemplate()->getName().str(),  victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
+#if defined(RTS_DEBUG)
+	DEBUG_LOG(("%d (%d cells) Attack Pathfind failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), cellCount, from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
+	DEBUG_LOG(("Unit '%s', attacking '%s' time %f", obj->getTemplate()->getName().str(),  victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 #endif
 #endif
 #ifdef DUMP_PERF_STATS
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
+			goalCell->releaseInfo();
+		}
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
 		goalCell->releaseInfo();
 	}
-	cleanOpenAndClosedLists();
 	return NULL;
 }
 
 /** Find a short, valid path to a location that is safe from the repulsors.  */
-Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotorSet, 
-		const Coord3D *from, const Coord3D* repulsorPos1, const Coord3D* repulsorPos2, Real repulsorRadius) 
+Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotorSet,
+		const Coord3D *from, const Coord3D* repulsorPos1, const Coord3D* repulsorPos2, Real repulsorRadius)
 {
-	//CRCDEBUG_LOG(("Pathfinder::findSafePath()\n"));
+	//CRCDEBUG_LOG(("Pathfinder::findSafePath()"));
 	if (m_isMapReady == false) return NULL; // Should always be ok.
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 //	Int startTimeMS = ::GetTickCount();
 #endif
 
-	const Int MAX_CELLS = 2000; // this is a rather expensive operation, so limit the search.
+	const Int MAX_CELLS = MAX_SAFE_PATH_CELL_COUNT; // this is a rather expensive operation, so limit the search.
 
 	Bool centerInCell;
 	Int radius;
@@ -10959,7 +10833,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
 	// determine start cell
 	ICoord2D startCellNdx;
 	worldToCell(obj->getPosition(), &startCellNdx);
-	PathfindCell *parentCell = getClippedCell( obj->getLayer(), obj->getPosition() ); 
+	PathfindCell *parentCell = getClippedCell( obj->getLayer(), obj->getPosition() );
 	if (parentCell == NULL)
 		return NULL;
 	if (!obj->getAIUpdateInterface()) {
@@ -11013,13 +10887,13 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
 			farthestDistanceSqr = distSqr;
 			if (cellCount > MAX_CELLS) {
 #ifdef INTENSE_DEBUG
-				DEBUG_LOG(("Took intermediate path, dist %f, goal dist %f\n", sqrt(farthestDistanceSqr), repulsorRadius));
+				DEBUG_LOG(("Took intermediate path, dist %f, goal dist %f", sqrt(farthestDistanceSqr), repulsorRadius));
 #endif
 				ok = true; // Already a big search, just take this one.
 			}
 		}
-		if ( ok && 
-			checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(), 
+		if ( ok &&
+			checkDestination(obj, parentCell->getXIndex(), parentCell->getYIndex(),
 				parentCell->getLayer(), radius, centerInCell)) {
 			// success - found a path to the goal
 			Bool show = TheGlobalData->m_debugAI;
@@ -11031,11 +10905,11 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
 			}
 			if (count>2000) {
 				show = true;
-				DEBUG_LOG(("cells %d obj %s %x\n", count, obj->getTemplate()->getName().str(), obj));
+				DEBUG_LOG(("cells %d obj %s %x", count, obj->getTemplate()->getName().str(), obj));
 #ifdef STATE_MACHINE_DEBUG
 				if( obj->getAIUpdateInterface() )
 				{
-					DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+					DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 				}
 #endif
 				TheScriptEngine->AppendDebugMessage("Big Safe path", false);
@@ -11043,15 +10917,24 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
 #endif
 			if (show)
 				debugShowSearch(true);
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-			//DEBUG_LOG(("Attack path took %d cells, %f sec\n", cellCount, (::GetTickCount()-startTimeMS)/1000.0f));
+#if defined(RTS_DEBUG)
+			//DEBUG_LOG(("Attack path took %d cells, %f sec", cellCount, (::GetTickCount()-startTimeMS)/1000.0f));
 #endif
 			// construct and return path
 			Path *path = buildActualPath( obj, locomotorSet.getValidSurfaces(), obj->getPosition(), parentCell, centerInCell, false);
-			parentCell->releaseInfo();
-			cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+			if (!s_useFixedPathfinding) {
+				parentCell->releaseInfo();
+				cleanOpenAndClosedLists();
+			}
+			else
+#endif
+			{
+				cleanOpenAndClosedLists();
+				parentCell->releaseInfo();
+			}
 			return path;
-		}	
+		}
 
 		// put parent cell onto closed list - its evaluation is finished
 		m_closedList = parentCell->putOnClosedList( m_closedList );
@@ -11064,71 +10947,79 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
 	}
 
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG(("obj %s %x count %d\n", obj->getTemplate()->getName().str(), obj, cellCount));
+	DEBUG_LOG(("obj %s %x count %d", obj->getTemplate()->getName().str(), obj, cellCount));
 #ifdef STATE_MACHINE_DEBUG
 	if( obj->getAIUpdateInterface() )
 	{
-		DEBUG_LOG(("State %s\n",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
+		DEBUG_LOG(("State %s",  obj->getAIUpdateInterface()->getCurrentStateName().str()));
 	}
 #endif
 	TheScriptEngine->AppendDebugMessage("Overflowed Safe path", false);
 #endif
 #if 0
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	DEBUG_LOG(("%d (%d cells)", TheGameLogic->getFrame(), cellCount));
-	DEBUG_LOG(("Attack Pathfind failed from (%f,%f) to (%f,%f) -- \n", from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
-	DEBUG_LOG(("Unit '%s', attacking '%s' time %f\n", obj->getTemplate()->getName().str(),  victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
+#if defined(RTS_DEBUG)
+	DEBUG_LOG(("%d (%d cells) Attack Pathfind failed from (%f,%f) to (%f,%f) --", TheGameLogic->getFrame(), cellCount, from->x, from->y, victim->getPosition()->x, victim->getPosition()->y));
+	DEBUG_LOG(("Unit '%s', attacking '%s' time %f", obj->getTemplate()->getName().str(),  victim->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 #endif
 #endif
 #ifdef DUMP_PERF_STATS
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	cleanOpenAndClosedLists();
+#if RETAIL_COMPATIBLE_PATHFINDING
+	if (!s_useFixedPathfinding) {
+		cleanOpenAndClosedLists();
+	}
+	else
+#endif
+	{
+		cleanOpenAndClosedLists();
+		parentCell->releaseInfo();
+	}
 	return NULL;
 }
 
 //-----------------------------------------------------------------------------
 void Pathfinder::crc( Xfer *xfer )
 {
-	CRCDEBUG_LOG(("Pathfinder::crc() on frame %d\n", TheGameLogic->getFrame()));
-	CRCDEBUG_LOG(("beginning CRC: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("Pathfinder::crc() on frame %d", TheGameLogic->getFrame()));
+	CRCDEBUG_LOG(("beginning CRC: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
 	xfer->xferUser( &m_extent, sizeof(IRegion2D) );
-	CRCDEBUG_LOG(("m_extent: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_extent: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
 	xfer->xferBool( &m_isMapReady );
-	CRCDEBUG_LOG(("m_isMapReady: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_isMapReady: %8.8X", ((XferCRC *)xfer)->getCRC()));
 	xfer->xferBool( &m_isTunneling );
-	CRCDEBUG_LOG(("m_isTunneling: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_isTunneling: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
 	Int obsolete1 = 0;
 	xfer->xferInt( &obsolete1 );
 
 	xfer->xferUser(&m_ignoreObstacleID, sizeof(ObjectID));
-	CRCDEBUG_LOG(("m_ignoreObstacleID: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_ignoreObstacleID: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
 	xfer->xferUser(m_queuedPathfindRequests, sizeof(ObjectID)*PATHFIND_QUEUE_LEN);
-	CRCDEBUG_LOG(("m_queuedPathfindRequests: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_queuedPathfindRequests: %8.8X", ((XferCRC *)xfer)->getCRC()));
 	xfer->xferInt(&m_queuePRHead);
-	CRCDEBUG_LOG(("m_queuePRHead: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_queuePRHead: %8.8X", ((XferCRC *)xfer)->getCRC()));
 	xfer->xferInt(&m_queuePRTail);
-	CRCDEBUG_LOG(("m_queuePRTail: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_queuePRTail: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
 	xfer->xferInt(&m_numWallPieces);
-	CRCDEBUG_LOG(("m_numWallPieces: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_numWallPieces: %8.8X", ((XferCRC *)xfer)->getCRC()));
 	for (Int i=0; i<MAX_WALL_PIECES; ++i)
 	{
 		xfer->xferObjectID(&m_wallPieces[MAX_WALL_PIECES]);
 	}
-	CRCDEBUG_LOG(("m_wallPieces: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_wallPieces: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
 	xfer->xferReal(&m_wallHeight);
-	CRCDEBUG_LOG(("m_wallHeight: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_wallHeight: %8.8X", ((XferCRC *)xfer)->getCRC()));
 	xfer->xferInt(&m_cumulativeCellsAllocated);
-	CRCDEBUG_LOG(("m_cumulativeCellsAllocated: %8.8X\n", ((XferCRC *)xfer)->getCRC()));
+	CRCDEBUG_LOG(("m_cumulativeCellsAllocated: %8.8X", ((XferCRC *)xfer)->getCRC()));
 
-}  // end crc
+}
 
 //-----------------------------------------------------------------------------
 void Pathfinder::xfer( Xfer *xfer )
@@ -11139,10 +11030,10 @@ void Pathfinder::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 //-----------------------------------------------------------------------------
 void Pathfinder::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
index 12f9df6d430..74ed1cf47eb 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
@@ -28,14 +28,14 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameMemory.h"
 #include "Common/GameState.h"
 #include "Common/GlobalData.h"
 #include "Common/PerfTimer.h"
 #include "Common/Player.h"
 #include "Common/SpecialPower.h"
-#include "Common/Team.h" 
+#include "Common/Team.h"
 #include "Common/ThingFactory.h"
 #include "Common/PlayerList.h"
 #include "Common/BuildAssistant.h"
@@ -44,7 +44,7 @@
 #include "Common/WellKnownKeys.h"
 #include "Common/Xfer.h"
 #include "GameClient/ControlBar.h"
-#include "GameClient/TerrainVisual.h"	
+#include "GameClient/TerrainVisual.h"
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/AIPlayer.h"
@@ -62,11 +62,6 @@
 #include "GameLogic/Module/SupplyWarehouseDockUpdate.h"
 #include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define SUPPLY_CENTER_CLOSE_DIST (20*PATHFIND_CELL_SIZE_F)
 
@@ -76,8 +71,8 @@
 // ------------------------------------------------------------------------------------------------
 AIPlayer::AIPlayer( Player *p ) :
 m_player(p),
-m_buildDelay(0), 
-m_teamDelay(0),	
+m_buildDelay(0),
+m_teamDelay(0),
 m_teamTimer(2),	// Important - don't start building teams until frame 1.
 m_structureTimer(2), // Important - don't start building structures until frame 1.
 m_readyToBuildTeam(false),
@@ -101,7 +96,7 @@ m_curWarehouseID(INVALID_ID)
 	m_repairDozerOrigin.zero();
 	m_baseCenter.zero();
 	m_baseCenterSet = false;
-	m_difficulty = TheScriptEngine->getGlobalDifficulty(); 
+	m_difficulty = TheScriptEngine->getGlobalDifficulty();
 	m_teamSeconds = TheAI->getAiData()->m_teamSeconds;
 }
 
@@ -118,7 +113,7 @@ AIPlayer::~AIPlayer()
 void AIPlayer::onStructureProduced( Object *factory, Object *bldg )
 {
 	m_teamDelay = 0; // Cause the update queues & selection to happen immediately.
-	m_buildDelay = 0; // Cause 
+	m_buildDelay = 0; // Cause
 	/* Find the info building this. */
 	BuildListInfo *info;
 	for( info = m_player->getBuildList(); info; info = info->getNext() )
@@ -129,7 +124,7 @@ void AIPlayer::onStructureProduced( Object *factory, Object *bldg )
 		d.setAsciiString(TheKey_objectScriptAttachment, info->getScript());
 		d.setInt(TheKey_objectInitialHealth, info->getHealth());
 		d.setBool(TheKey_objectUnsellable, info->getUnsellable());
-		
+
 		info->setUnderConstruction(false);
 		bldg->updateObjValuesFromMapProperties(&d);
 		// clear the under construction status
@@ -153,9 +148,9 @@ void AIPlayer::onStructureProduced( Object *factory, Object *bldg )
 	for( info = m_player->getBuildList(); info; info = info->getNext() )
 	{
 		const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( info->getTemplateName() );
-		if (!bldgPlan) {																											 
+		if (!bldgPlan) {
 			continue;
-		}		
+		}
 		if (!bldgPlan->isEquivalentTo(bldg->getTemplate())) {
 			continue; // not the same kind of building we're looking for.
 		}
@@ -169,18 +164,18 @@ void AIPlayer::onStructureProduced( Object *factory, Object *bldg )
 					if( rhbi ) {
 						ObjectID spawnedID = rhbi->getReconstructedBuildingID();
 						if (bldg->getID() == spawnedID) {
-							DEBUG_LOG(("AI got rebuilt %s\n", bldgPlan->getName().str()));
+							DEBUG_LOG(("AI got rebuilt %s", bldgPlan->getName().str()));
 							info->setObjectID(bldg->getID());
 							return;
 						}
 					}
 				}
-			} 
+			}
 		}
 	}
 
 	if (TheGameLogic->getFrame()>0) {
-		DEBUG_LOG(("***AI PLAYER-Structure not found in production queue.\n"));
+		DEBUG_LOG(("***AI PLAYER-Structure not found in production queue."));
 	}
 }
 
@@ -208,7 +203,7 @@ void AIPlayer::checkForSupplyCenter( BuildListInfo *info, Object *bldg )
 					desiredGatherers = resInfo->m_normal;
 				}
 				if (difficulty == DIFFICULTY_HARD) {
-					desiredGatherers = resInfo->m_hard;	 
+					desiredGatherers = resInfo->m_hard;
 				}
 			}
 			resInfo = resInfo->m_next;
@@ -223,7 +218,7 @@ void AIPlayer::checkForSupplyCenter( BuildListInfo *info, Object *bldg )
 /** Queue up a supply truck to be built. */
 // ------------------------------------------------------------------------------------------------
 void AIPlayer::queueSupplyTruck( void )
-{			
+{
 	Bool truckInQueue = false;
 	for ( DLINK_ITERATOR<TeamInQueue> iter = iterate_TeamBuildQueue(); !iter.done(); iter.advance())
 	{
@@ -236,8 +231,8 @@ void AIPlayer::queueSupplyTruck( void )
 				truckInQueue = true;
 			}
 		}
-	}	
-	
+	}
+
 	if (truckInQueue) {
 		return; // already building a supply truck.
 	}
@@ -251,7 +246,7 @@ void AIPlayer::queueSupplyTruck( void )
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
-			}			
+			}
 			for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 				Object *obj = objIter.cur();
 				if (!obj)  continue;
@@ -298,7 +293,7 @@ void AIPlayer::queueSupplyTruck( void )
 				}
 				static const NameKeyType key_warehouseUpdate = NAMEKEY("SupplyWarehouseDockUpdate");
 				SupplyWarehouseDockUpdate *warehouseModule = (SupplyWarehouseDockUpdate*)supplySource->findUpdateModule( key_warehouseUpdate );
-				if( warehouseModule )	{	 
+				if( warehouseModule )	{
 					Int availableCash = warehouseModule->getBoxesStored()*TheGlobalData->m_baseValuePerSupplyBox;
 					if (availableCash<=0) continue;
 					if( m_player->getRelationship(supplySource->getTeam()) == ENEMIES ) {
@@ -316,7 +311,7 @@ void AIPlayer::queueSupplyTruck( void )
 						Team *team = iter.cur();
 						if (!team) {
 							continue;
-						}			
+						}
 						for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 							Object *obj = objIter.cur();
 							if (!obj)  continue;
@@ -340,7 +335,7 @@ void AIPlayer::queueSupplyTruck( void )
 						}
 					}
 				}
-				//DEBUG_LOG(("Expected %d harvesters, found %d, need %d\n", info->getDesiredGatherers(), 
+				//DEBUG_LOG(("Expected %d harvesters, found %d, need %d", info->getDesiredGatherers(),
 				//	curGatherers, info->getDesiredGatherers()-curGatherers) );
 				info->setCurrentGatherers(curGatherers);
 			}
@@ -361,7 +356,7 @@ void AIPlayer::queueSupplyTruck( void )
 						if( supplyTruckAI )	{
 							ObjectID dock = supplyTruckAI->getPreferredDockID();
 							if (TheGameLogic->findObjectByID(dock)!=NULL) continue;
-							if (supplyTruckAI->isCurrentlyFerryingSupplies() || supplyTruckAI->isForcedIntoWantingState()) 
+							if (supplyTruckAI->isCurrentlyFerryingSupplies() || supplyTruckAI->isForcedIntoWantingState())
 							{
 								// This thinks he is a gatherer, but doesn't have a preferred dock id.
 								Object *center = TheGameLogic->findObjectByID(info->getObjectID());
@@ -372,7 +367,7 @@ void AIPlayer::queueSupplyTruck( void )
 									// The supply truck ai issues dock commands, and they become confused.
 									// Thus, player.  jba.  ;(
 									obj->getAI()->aiDock(center, CMD_FROM_PLAYER);
-									DEBUG_LOG(("Re-attaching supply truck to supply center.\n"));
+									DEBUG_LOG(("Re-attaching supply truck to supply center."));
 									return;
 								}
 							}
@@ -387,8 +382,8 @@ void AIPlayer::queueSupplyTruck( void )
 			// If we need a supply truck thingy, turn on unit building for a moment.
 			m_player->setCanBuildUnits(true);
 			const ThingTemplate *tTemplate = TheThingFactory->firstTemplate();
-			while (tTemplate) {	 
-				Bool isSupplyTruck = tTemplate->isKindOf(KINDOF_HARVESTER);;
+			while (tTemplate) {
+				Bool isSupplyTruck = tTemplate->isKindOf(KINDOF_HARVESTER);
 				if (isSupplyTruck) {
 					Object *factory = findFactory(tTemplate, false);
 					if (factory) {
@@ -408,7 +403,7 @@ void AIPlayer::queueSupplyTruck( void )
 						team->m_workOrders = order;
 						team->m_frameStarted = TheGameLogic->getFrame();
 						// Stick it on the default team
-						team->m_team = m_player->getDefaultTeam(); 
+						team->m_team = m_player->getDefaultTeam();
 						AsciiString teamName = "Supply truck - building one at the ";
 						teamName.concat(factory->getTemplate()->getName());
 						TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -455,13 +450,13 @@ Object *AIPlayer::buildStructureNow(const ThingTemplate *bldgPlan, BuildListInfo
 {
 
 	// inst-construct the building
-	Object *bldg = TheBuildAssistant->buildObjectNow( NULL, 
+	Object *bldg = TheBuildAssistant->buildObjectNow( NULL,
 																						bldgPlan,
 																						info->getLocation(),
 																						info->getAngle(),
 																						m_player );
 
-	// store the object with the build order  
+	// store the object with the build order
 	if (bldg)
 	{
 		Dict d;
@@ -469,7 +464,7 @@ Object *AIPlayer::buildStructureNow(const ThingTemplate *bldgPlan, BuildListInfo
 		d.setAsciiString(TheKey_objectScriptAttachment, info->getScript());
 		d.setInt(TheKey_objectInitialHealth, info->getHealth());
 		d.setBool(TheKey_objectUnsellable, info->getUnsellable());
-		
+
 		bldg->updateObjValuesFromMapProperties(&d);
 
 		info->setObjectID( bldg->getID() );
@@ -506,7 +501,7 @@ Object *AIPlayer::buildStructureNow(const ThingTemplate *bldgPlan, BuildListInfo
 				exitInterface->setRallyPoint(&rallyPoint);
 			}
 		}
-	} // bldg built
+	}
 	return bldg;
 }
 
@@ -546,7 +541,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 																								 BuildAssistant::TERRAIN_RESTRICTIONS |
 																								 BuildAssistant::NO_OBJECT_OVERLAP,
 																								 dozer, m_player ) != LBC_OK ) {
-			// Warn. 
+			// Warn.
 			AsciiString bldgName = bldgPlan->getName();
 			bldgName.concat(" - Dozer unable to place.  Attempting to adjust position.");
 			TheScriptEngine->AppendDebugMessage(bldgName, false);
@@ -557,7 +552,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 			Real limit = 10*PATHFIND_CELL_SIZE_F;
 			if (isSkirmishAI()) {
 				limit = 120*PATHFIND_CELL_SIZE_F;
-			}	
+			}
 			Coord3D newPos = pos;
 			for (posOffset = 0; posOffset<limit; posOffset += 2*PATHFIND_CELL_SIZE_F) {
 				if (isSkirmishAI()) {
@@ -625,7 +620,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 		dozer->setPosition(&pos);
 	}
 
-	Object *bldg = TheBuildAssistant->buildObjectNow( dozer, 
+	Object *bldg = TheBuildAssistant->buildObjectNow( dozer,
 																						bldgPlan,
 																						&pos,
 																						angle,
@@ -633,7 +628,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 
 
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_debugAI == AI_DEBUG_PATHS)
 	{
 		extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
@@ -647,7 +642,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 		addIcon(&myPos, 2*PATHFIND_CELL_SIZE_F, 120, color);
 		myPos = pos;
 		myPos.z = TheTerrainLogic->getGroundHeight( myPos.x, myPos.y ) + 0.5f;
-		addIcon(&myPos, 2*PATHFIND_CELL_SIZE_F, 120, color);	
+		addIcon(&myPos, 2*PATHFIND_CELL_SIZE_F, 120, color);
 		Real dx, dy;
 		dx = dozer->getPosition()->x - pos.x;
 		dy = dozer->getPosition()->y - pos.y;
@@ -663,10 +658,10 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 			addIcon(&myPos, PATHFIND_CELL_SIZE_F/2, 120, color);
 
 		}
-	}	
+	}
 #endif
 
-	// store the object with the build order  
+	// store the object with the build order
 	if (bldg)
 	{
 		ExitInterface *exitInterface = bldg->getObjectExitInterface();
@@ -695,7 +690,7 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 			bldgName.concat(" - Building started.");
 			TheScriptEngine->AppendDebugMessage(bldgName, false);
 		}
-	} // bldg built
+	}
 	TheTerrainVisual->removeAllBibs();	// isLocationLegalToBuild adds bib feedback, turn it off.  jba.
 	return bldg;
 }
@@ -717,8 +712,8 @@ void AIPlayer::processBaseBuilding( void )
 			AsciiString name = info->getTemplateName();
 			if (name.isEmpty()) continue;
 			const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( name );
-			if (!bldgPlan) {																											 
-				DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.\n", name.str()));
+			if (!bldgPlan) {
+				DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.", name.str()));
 				continue;
 			}
 			// check for hole.
@@ -733,13 +728,13 @@ void AIPlayer::processBaseBuilding( void )
 					info->setObjectTimestamp(TheGameLogic->getFrame()+1);
 					// Scan for a GLA hole.	KINDOF_REBUILD_HOLE
 					Object *obj;
-					for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() ) { 
+					for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() ) {
 						if (!obj->isKindOf(KINDOF_REBUILD_HOLE)) continue;
 						RebuildHoleBehaviorInterface *rhbi = RebuildHoleBehavior::getRebuildHoleBehaviorInterfaceFromObject( obj );
 						if( rhbi ) {
 							ObjectID spawnerID = rhbi->getSpawnerID();
 							if (priorID == spawnerID) {
-								DEBUG_LOG(("AI Found hole to rebuild %s\n", bldgPlan->getName().str()));
+								DEBUG_LOG(("AI Found hole to rebuild %s", bldgPlan->getName().str()));
 								info->setObjectID(obj->getID());
 							}
 						}
@@ -747,13 +742,13 @@ void AIPlayer::processBaseBuilding( void )
 				}	else {
 					if (bldg->getControllingPlayer() == m_player) {
 						// Check for built or dozer missing.
-						if( bldg->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) ) 
+						if( bldg->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 						{
 							// make sure dozer is working on him.
 							ObjectID builder = bldg->getBuilderID();
 							Object* myDozer = TheGameLogic->findObjectByID(builder);
 							if (myDozer==NULL) {
-								DEBUG_LOG(("AI's Dozer got killed.  Find another dozer.\n"));
+								DEBUG_LOG(("AI's Dozer got killed.  Find another dozer."));
  								myDozer = findDozer(bldg->getPosition());
 								if (myDozer==NULL || myDozer->getAI()==NULL) {
 									continue;
@@ -768,7 +763,7 @@ void AIPlayer::processBaseBuilding( void )
 						// oops, got captured.
 						info->setObjectID(INVALID_ID);
 						info->setObjectTimestamp(TheGameLogic->getFrame()+1);
-					}	
+					}
 				}
 			}
 			if (info->getObjectID()==INVALID_ID && info->getObjectTimestamp()>0) {
@@ -777,7 +772,7 @@ void AIPlayer::processBaseBuilding( void )
 				if (info->getObjectTimestamp()+TheAI->getAiData()->m_rebuildDelaySeconds*LOGICFRAMES_PER_SECOND > TheGameLogic->getFrame()) {
 					continue;
 				}	else {
-					DEBUG_LOG(("Enabling rebuild for %s\n", info->getTemplateName().str()));
+					DEBUG_LOG(("Enabling rebuild for %s", info->getTemplateName().str()));
 					info->setObjectTimestamp(0); // ready to build.
 				}
 			}
@@ -809,13 +804,14 @@ void AIPlayer::processBaseBuilding( void )
 						m_frameLastBuildingBuilt = TheGameLogic->getFrame();
 						// only build one building per delay loop
 						break;
-					} // bldg built
+					}
 
 #else
 					// force delay between rebuilds
-					if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild) 
+					Int framesToBuild = bldgPlan->calcTimeToBuild(m_player);
+					if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild)
 					{
-						m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt); 
+						m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt);
 						return;
 					}	else {
 						// building is missing, (re)build it
@@ -827,7 +823,7 @@ void AIPlayer::processBaseBuilding( void )
 							m_player->getMoney()->withdraw( cost );
 
 							// inst-construct the building
-							bldg = buildStructureNow(bldgPlan, info, NULL);
+							bldg = buildStructureNow(bldgPlan, info);
 							// store the object with the build order
 							if (bldg)
 							{
@@ -844,12 +840,12 @@ void AIPlayer::processBaseBuilding( void )
 								m_frameLastBuildingBuilt = TheGameLogic->getFrame();
 								// only build one building per delay loop
 								break;
-							} // bldg built
-						} // have money
-					} // rebuild delay ok
+							}
+						}
+					}
 #endif
-				} // building missing
-			} // is buildable
+				}
+			}
 		}
 	}
 }
@@ -900,11 +896,15 @@ void AIPlayer::guardSupplyCenter( Team *team, Int minSupplies )
 	}
 	if (warehouse) {
 
-		AIGroup* theGroup = TheAI->createGroup();
+		AIGroupPtr theGroup = TheAI->createGroup();
 		if (!theGroup) {
 			return;
 		}
+#if RETAIL_COMPATIBLE_AIGROUP
 		team->getTeamAsAIGroup(theGroup);
+#else
+		team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 		Coord3D location = *warehouse->getPosition();
 		// It's probably a defensive move - position towards the enemy.
 		Region2D bounds;
@@ -951,7 +951,7 @@ Bool AIPlayer::isSupplySourceAttacked( void )
 			Team *team = iter.cur();
 			if (!team) {
 				continue;
-			}			
+			}
 			for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 				Object *obj = objIter.cur();
 				if (!obj) {
@@ -1011,7 +1011,7 @@ Bool AIPlayer::isLocationSafe(const Coord3D *pos, const ThingTemplate *tthing )
 
 	// and only stuff that isn't stealthed (and not detected)
 	// (note that stealthed allies aren't hidden from us, but we're only looking for enemies here)
-	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ), 
+	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ),
 																										 MAKE_OBJECT_STATUS_MASK2( OBJECT_STATUS_DETECTED, OBJECT_STATUS_DISGUISED ) );
 
 	// (optional) only stuff that is significant
@@ -1039,7 +1039,7 @@ Bool AIPlayer::isLocationSafe(const Coord3D *pos, const ThingTemplate *tthing )
 	}
 	return true;
 
-}  // isSupplySourceSafe
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -1137,7 +1137,7 @@ void AIPlayer::onUnitProduced( Object *factory, Object *unit )
 		}
 	}
 	if (!found) {
-		DEBUG_LOG(("***AI PLAYER-Unit not found in production queue.\n"));
+		DEBUG_LOG(("***AI PLAYER-Unit not found in production queue."));
 	}
 
 	m_teamDelay = 0; // Cause the update queues & selection to happen immediately.
@@ -1155,10 +1155,10 @@ Bool AIPlayer::computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord
 	Region2D bounds;
 	getPlayerStructureBounds(&bounds, playerNdx);
 
-	if( bounds.hi.x == 0 
-		&& bounds.lo.x == 0 
-		&& bounds.hi.y == 0 
-		&& bounds.lo.y == 0 
+	if( bounds.hi.x == 0
+		&& bounds.lo.x == 0
+		&& bounds.hi.y == 0
+		&& bounds.lo.y == 0
 		)
 	{
 		Region3D bounds3D;
@@ -1183,7 +1183,7 @@ Bool AIPlayer::computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord
 	if (bounds.hi.y<bounds.lo.y) {
 		bounds.hi.y = bounds.lo.y = (bounds.hi.y+bounds.lo.y)/2.0f;
 	}
-	
+
 	xCount = REAL_TO_INT_CEIL(bounds.width()/weaponRadius)+1;
 	yCount = REAL_TO_INT_CEIL(bounds.height()/weaponRadius)+1;
 
@@ -1232,44 +1232,48 @@ Bool AIPlayer::computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord
 
 	//Calculate the generally best position
 	xIndex = xStart;
-	for( x = 0; x < xCount; x++, xIndex += xDelta ) 
+	for( x = 0; x < xCount; x++, xIndex += xDelta )
 	{
 		yIndex = yStart;
-		for( y = 0; y < yCount; y++, yIndex += yDelta ) 
+		for( y = 0; y < yCount; y++, yIndex += yDelta )
 		{
 			pos.x = bounds.lo.x + ( bounds.width() * xIndex ) / xCount;
 			pos.y = bounds.lo.y + ( bounds.height() * yIndex ) / yCount;
 			pos.z = 0;
 			Int curCash = getPlayerSuperweaponValue( &pos, playerNdx, 2*weaponRadius, targetMilitaryUnits );
-			if ( curCash > cash) 
+			if ( curCash > cash)
 			{
 				cash = curCash;
 				bestPos = pos;
+				success = true;
 			}
 		}
 	}
 
+	if (!success)
+		return false;
+
 	//Fine tune that position by looking at a even smaller radius.
 	Coord3D veryBestPos;
 	xCount = 11;
 	yCount = 11;
 	cash = -1;
 	Int count = 0;
-	for( x = 0; x < xCount; x++ ) 
+	for( x = 0; x < xCount; x++ )
 	{
-		for( y = 0; y < yCount; y++ ) 
+		for( y = 0; y < yCount; y++ )
 		{
 			pos.x = bestPos.x + (x-5)*(weaponRadius/10);
 			pos.y = bestPos.y + (x-5)*(weaponRadius/10);
 			pos.z = 0;
 			Int curCash = getPlayerSuperweaponValue( &pos, playerNdx, weaponRadius, targetMilitaryUnits );
-			if ( curCash > cash) 
+			if ( curCash > cash)
 			{
 				cash = curCash;
 				veryBestPos = pos;
 				count = 1;
-			}	
-			else if (curCash==cash) 
+			}
+			else if (curCash==cash)
 			{
 				veryBestPos.x += pos.x;
 				veryBestPos.y += pos.y;
@@ -1298,7 +1302,7 @@ Bool AIPlayer::computeSuperweaponTarget(const SpecialPowerTemplate *power, Coord
  */
 Int AIPlayer::getPlayerSuperweaponValue(Coord3D *center, Int playerNdx, Real radius, Bool includeMilitaryUnits )
 {
-	if (radius < 4*PATHFIND_CELL_SIZE_F) 
+	if (radius < 4*PATHFIND_CELL_SIZE_F)
 	{
 		radius = 4*PATHFIND_CELL_SIZE_F;
 	}
@@ -1307,18 +1311,18 @@ Int AIPlayer::getPlayerSuperweaponValue(Coord3D *center, Int playerNdx, Real rad
 	Real radSqr = sqr(radius);
 
 	Player* pPlayer = ThePlayerList->getNthPlayer(playerNdx);
-	if (pPlayer == NULL) 
+	if (pPlayer == NULL)
 		return 0;
-	for (it = pPlayer->getPlayerTeams()->begin(); it != pPlayer->getPlayerTeams()->end(); ++it) 
+	for (it = pPlayer->getPlayerTeams()->begin(); it != pPlayer->getPlayerTeams()->end(); ++it)
 	{
-		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 		{
 			Team *team = iter.cur();
 			if (!team) continue;
-			for (DLINK_ITERATOR<Object> iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+			for (DLINK_ITERATOR<Object> iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance())
 			{
 				Object *pObj = iter.cur();
-				if (!pObj) 
+				if (!pObj)
 					continue;
 
 				Bool applyNegValue = FALSE;
@@ -1338,9 +1342,9 @@ Int AIPlayer::getPlayerSuperweaponValue(Coord3D *center, Int playerNdx, Real rad
 						}
 					}
 				}
-				else if (pObj->isKindOf(KINDOF_AIRCRAFT)) 
+				else if (pObj->isKindOf(KINDOF_AIRCRAFT))
 				{
-					if (pObj->isSignificantlyAboveTerrain()) 
+					if (pObj->isSignificantlyAboveTerrain())
 					{
 						continue; // Don't target flying aircraft.  OK if in the airstrip.
 					}
@@ -1348,19 +1352,19 @@ Int AIPlayer::getPlayerSuperweaponValue(Coord3D *center, Int playerNdx, Real rad
 				Coord3D pos = *pObj->getPosition();
 				Real dx = center->x - pos.x;
 				Real dy = center->y - pos.y;
-				if (dx*dx+dy*dy<radSqr) 
+				if (dx*dx+dy*dy<radSqr)
 				{
 					Real dist = sqrt(dx*dx+dy*dy);
 					Real factor = 1.0f - (dist/(2*radius)); // 1.0 in center, 0.5 on edges.
 					Real value = pObj->getTemplate()->calcCostToBuild(pPlayer);
-					if (pObj->isKindOf(KINDOF_COMMANDCENTER)) 
+					if (pObj->isKindOf(KINDOF_COMMANDCENTER))
 					{
 						if( !includeMilitaryUnits )
 							value = value * 5.0f; //Command centers are prime targets for sneak attacks.
 						else
 							value = value / 10; // Command centers cannot be killed by any superweapon, so we don't want to target them as highly. jba.
 					}
-					if (pObj->isKindOf( KINDOF_FS_SUPERWEAPON ) ) 
+					if (pObj->isKindOf( KINDOF_FS_SUPERWEAPON ) )
 					{
 						if( !includeMilitaryUnits )
 							value = value * 5.0f; //Superweapons are prime targets for sneak attacks.
@@ -1369,7 +1373,7 @@ Int AIPlayer::getPlayerSuperweaponValue(Coord3D *center, Int playerNdx, Real rad
 					}
 					if( applyNegValue )
 					{
-						cash -= factor * value * 5.0f; //Extremely undesired 
+						cash -= factor * value * 5.0f; //Extremely undesired
 					}
 					else
 					{
@@ -1382,9 +1386,9 @@ Int AIPlayer::getPlayerSuperweaponValue(Coord3D *center, Int playerNdx, Real rad
 	return cash;
 }
 // ------------------------------------------------------------------------------------------------
-/** Search the computer player's buildings for one that can build the given request 
+/** Search the computer player's buildings for one that can build the given request
 	* and start training the unit.
-	* If busyOK is true, it will queue a unit even if one is building.  This lets 
+	* If busyOK is true, it will queue a unit even if one is building.  This lets
 	* script invoked teams "push" to the front of the queue. */
 // ------------------------------------------------------------------------------------------------
 Bool AIPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString teamName)
@@ -1394,7 +1398,7 @@ Bool AIPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString teamNam
 	{
 		ProductionUpdateInterface *pu = factory->getProductionUpdateInterface();
 		if (pu && pu->queueCreateUnit( order->m_thing, pu->requestUniqueUnitID() )) {
-			order->m_factoryID = factory->getID(); 
+			order->m_factoryID = factory->getID();
 			if (TheGlobalData->m_debugAI) {
 				AsciiString teamStr = "Queuing ";
 				teamStr.concat(order->m_thing->getName());
@@ -1404,7 +1408,7 @@ Bool AIPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString teamNam
 			}
 			return true;
 		}
-	}  // end if
+	}
 
 	return FALSE;
 
@@ -1412,10 +1416,10 @@ Bool AIPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString teamNam
 
 // ------------------------------------------------------------------------------------------------
 /** Search the computer player's buildings for one that can build the given request.
-	* If busyOK is true, it will return a busy factory if there are no idle ones.  This is 
+	* If busyOK is true, it will return a busy factory if there are no idle ones.  This is
 	* used for script invoked teams "push" to the front of the queue. */
 // ------------------------------------------------------------------------------------------------
-Object *AIPlayer::findFactory(const ThingTemplate *thing, Bool busyOK) 
+Object *AIPlayer::findFactory(const ThingTemplate *thing, Bool busyOK)
 {
 	Object *busyFactory = NULL; // We prefer a factory that isn't busy.
 	for( BuildListInfo *info = m_player->getBuildList(); info; info = info->getNext() )
@@ -1443,9 +1447,9 @@ Object *AIPlayer::findFactory(const ThingTemplate *thing, Bool busyOK)
 			Bool busy = pu->getProductionCount()>0;
 			if (!busy) return factory; // found a not busy factory.
 			if (busyOK) busyFactory = factory;
-		}  // end if
+		}
 
-	}  // end for
+	}
 	// We didn't find an idle factory, so return the busy one.
 	if (busyOK) return busyFactory;
 	return NULL;
@@ -1482,11 +1486,11 @@ Bool AIPlayer::isPossibleToBuildTeam( TeamPrototype *proto, Bool requireIdleFact
 		notEnoughMoney = true;
 		return false; // too expensive
 	}
-	if (anyIdle) 
+	if (anyIdle)
 	{
 		return true;
 	}
-	if (!requireIdleFactory) 
+	if (!requireIdleFactory)
 	{
 		// Doesn't require an idle factory, so we're ok.
 		return true;
@@ -1495,7 +1499,7 @@ Bool AIPlayer::isPossibleToBuildTeam( TeamPrototype *proto, Bool requireIdleFact
 }
 
 // ------------------------------------------------------------------------------------------------
-/** Check if this team is buildable, doesn't exceed maximum limits, meets conditions, 
+/** Check if this team is buildable, doesn't exceed maximum limits, meets conditions,
 	* and isn't under construction. */
 // ------------------------------------------------------------------------------------------------
 Bool AIPlayer::isAGoodIdeaToBuildTeam( TeamPrototype *proto )
@@ -1506,7 +1510,7 @@ Bool AIPlayer::isAGoodIdeaToBuildTeam( TeamPrototype *proto )
 	}
 	// check build limit
 	if (proto->countTeamInstances() >= proto->getTemplateInfo()->m_maxInstances){
-		if (TheGlobalData->m_debugAI) {	
+		if (TheGlobalData->m_debugAI) {
 			AsciiString str;
 			str.format("Team %s not chosen - %d already exist.", proto->getName().str(), proto->countTeamInstances());
 			TheScriptEngine->AppendDebugMessage(str, false);
@@ -1523,7 +1527,7 @@ Bool AIPlayer::isAGoodIdeaToBuildTeam( TeamPrototype *proto )
 	}
 	Bool needMoney;
 	if (!isPossibleToBuildTeam( proto, true, needMoney)) {
-		if (TheGlobalData->m_debugAI) {	
+		if (TheGlobalData->m_debugAI) {
 			AsciiString str;
 			if (needMoney) {
 				str.format("Team %s not chosen - Not enough money.", proto->getName().str());
@@ -1564,7 +1568,7 @@ Bool AIPlayer::selectTeamToReinforce( Int minPriority )
 			for (DLINK_ITERATOR<Team> iter = proto->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 			{
 				Team *team = iter.cur();
-				if (team->hasAnyUnits() == false) 
+				if (team->hasAnyUnits() == false)
 				{
 					continue; // empty.
 				}
@@ -1576,21 +1580,21 @@ Bool AIPlayer::selectTeamToReinforce( Int minPriority )
 					if (thing==NULL) continue;
 					Int count=0;
 					team->countObjectsByThingTemplate(1, &thing, false, &count);
-					if (count < unitInfo[i].maxUnits) 
+					if (count < unitInfo[i].maxUnits)
 					{
 						// See if there is a factory available.
-						if (NULL != findFactory(thing, false)) 
+						if (NULL != findFactory(thing, false))
 						{
 							curTeam = team;
 							curPriority = proto->getTemplateInfo()->m_productionPriority;
 							curThing = thing;
 						}
 					}
-				}				
+				}
 			}
 		}
 	}
-	if (curTeam && curThing) 
+	if (curTeam && curThing)
 	{
 		/* We have something to build. */
 		TeamInQueue *teamQ = newInstance(TeamInQueue);
@@ -1608,7 +1612,7 @@ Bool AIPlayer::selectTeamToReinforce( Int minPriority )
 		order->m_next = NULL;
 		teamQ->m_workOrders = order;
 		teamQ->m_frameStarted = TheGameLogic->getFrame();
-		teamQ->m_team = curTeam; 
+		teamQ->m_team = curTeam;
 
 		AsciiString teamName = curTeam->getPrototype()->getName();
 		teamName.concat(" - AutoReinforcing one ");
@@ -1618,12 +1622,12 @@ Bool AIPlayer::selectTeamToReinforce( Int minPriority )
 		// start the creation of a new unit
 		Coord3D origin;
 		origin = curTeam->getPrototype()->getTemplateInfo()->m_homeLocation;
-		if (curTeam->getFirstItemIn_TeamMemberList()) 
+		if (curTeam->getFirstItemIn_TeamMemberList())
 		{
 			origin = *curTeam->getFirstItemIn_TeamMemberList()->getPosition();
 		}
 		Object *unit = curTeam->tryToRecruit(curThing, &origin, TheAI->getAiData()->m_maxRecruitDistance);
-		if (unit) 
+		if (unit)
 		{
 			order->m_numCompleted = 1;
 
@@ -1641,7 +1645,7 @@ Bool AIPlayer::selectTeamToReinforce( Int minPriority )
 			teamQ->m_reinforcementID = unit->getID();
 
 			AIUpdateInterface *ai = unit->getAIUpdateInterface();
-			if (ai) 
+			if (ai)
 			{
 				ai->aiIdle(CMD_FROM_AI);
 			}
@@ -1726,7 +1730,7 @@ Bool AIPlayer::selectTeamToBuild( void )
 			teamStr.concat("' has no Home Position (or Origin).");
 			TheScriptEngine->AppendDebugMessage(teamStr, false);
 		}
-		// Build it at low priority, as we have selected it automagically. 
+		// Build it at low priority, as we have selected it automagically.
 		buildSpecificAITeam(teamProto, false);
 		m_readyToBuildTeam = false;
 		m_teamTimer = m_teamSeconds*LOGICFRAMES_PER_SECOND;
@@ -1819,8 +1823,8 @@ void AIPlayer::buildUpgrade(const AsciiString &upgrade)
 				//Get the command button.
 				const CommandButton *commandButton = commandSet->getCommandButton(j);
 				if (commandButton==NULL) continue;
-				if (commandButton->getName().isEmpty() )	continue;	
-				if (commandButton->getUpgradeTemplate() == NULL )	continue;	
+				if (commandButton->getName().isEmpty() )	continue;
+				if (commandButton->getUpgradeTemplate() == NULL )	continue;
  				if (commandButton->getUpgradeTemplate()->getUpgradeName() == curUpgrade->getUpgradeName()) {
 					canUpgradeHere = true;
 				}
@@ -1839,8 +1843,8 @@ void AIPlayer::buildUpgrade(const AsciiString &upgrade)
 				TheScriptEngine->AppendDebugMessage( msg, false);
 				return;
 			}
-		}  // end if
-	}  // end for
+		}
+	}
 
 	AsciiString msg = TheNameKeyGenerator->keyToName(m_player->getPlayerNameKey());
 	msg.concat(" lacks factory to build upgrade ");
@@ -1895,7 +1899,7 @@ void AIPlayer::buildBySupplies(Int minimumCash, const AsciiString& thingName)
 		if( TheBuildAssistant->isLocationLegalToBuild( &location, tTemplate, angle,
 																									 BuildAssistant::NO_OBJECT_OVERLAP,
 																									 NULL, m_player ) != LBC_OK ) {
-			// Warn. 
+			// Warn.
 			const Coord3D *warehouseLocation = bestSupplyWarehouse->getPosition();
 			AsciiString debugMessage;
 			debugMessage.format(" %s - buildBySupplies unable to place near dock at (%.2f,%.2f).  Attempting to adjust position.",
@@ -1923,7 +1927,7 @@ void AIPlayer::buildBySupplies(Int minimumCash, const AsciiString& thingName)
 																							 NULL, m_player ) == LBC_OK;
 					if (valid) break;
 					if( TheGlobalData->m_debugSupplyCenterPlacement )
-						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)\n", newPos.x, newPos.y));
+						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)", newPos.x, newPos.y));
 					newPos.y = yPos+posOffset;
 					valid = TheBuildAssistant->isLocationLegalToBuild( &newPos, tTemplate, angle,
 																							 BuildAssistant::CLEAR_PATH |
@@ -1932,7 +1936,7 @@ void AIPlayer::buildBySupplies(Int minimumCash, const AsciiString& thingName)
 																							 NULL, m_player ) == LBC_OK;
 					if (valid) break;
 					if( TheGlobalData->m_debugSupplyCenterPlacement )
-						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)\n", newPos.x, newPos.y));
+						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)", newPos.x, newPos.y));
 				}
 				if (valid) break;
 				xPos = location.x-offset;
@@ -1946,7 +1950,7 @@ void AIPlayer::buildBySupplies(Int minimumCash, const AsciiString& thingName)
 																							 NULL, m_player ) == LBC_OK;
 					if (valid) break;
 					if( TheGlobalData->m_debugSupplyCenterPlacement )
-						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)\n", newPos.x, newPos.y));
+						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)", newPos.x, newPos.y));
 					newPos.x = xPos+posOffset;
 					valid = TheBuildAssistant->isLocationLegalToBuild( &newPos, tTemplate, angle,
 																							 BuildAssistant::CLEAR_PATH |
@@ -1955,15 +1959,15 @@ void AIPlayer::buildBySupplies(Int minimumCash, const AsciiString& thingName)
 																							 NULL, m_player ) == LBC_OK;
 					if (valid) break;
 					if( TheGlobalData->m_debugSupplyCenterPlacement )
-						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)\n", newPos.x, newPos.y));
+						DEBUG_LOG(("buildBySupplies -- Fail at (%.2f,%.2f)", newPos.x, newPos.y));
 				}
 				if (valid) break;
 			}
 		}
-		if (valid) 
+		if (valid)
 		{
 			if( TheGlobalData->m_debugSupplyCenterPlacement )
-				DEBUG_LOG(("buildAISupplyCenter -- SUCCESS at (%.2f,%.2f)\n", newPos.x, newPos.y));
+				DEBUG_LOG(("buildAISupplyCenter -- SUCCESS at (%.2f,%.2f)", newPos.x, newPos.y));
 			location = newPos;
 		}
 		TheTerrainVisual->removeAllBibs();	// isLocationLegalToBuild adds bib feedback, turn it off.  jba.
@@ -1998,19 +2002,19 @@ Bool AIPlayer::calcClosestConstructionZoneLocation( const ThingTemplate *constru
 	Coord3D newPos = *location;
 	if( TheBuildAssistant->isLocationLegalToBuild( location, constructTemplate, angle, BuildAssistant::NO_OBJECT_OVERLAP, NULL, m_player ) != LBC_OK )
 	{
-		// Warn. 
+		// Warn.
 		AsciiString bldgName = constructTemplate->getName();
 		bldgName.concat(" - calcClosestConstructionZoneLocation unable to place.  Attempting to adjust position.");
 		TheScriptEngine->AppendDebugMessage( bldgName, false );
 		// try to fix.
 		Real posOffset;
 		// Wiggle it a little :)
-		for( posOffset = 0; posOffset < 2 * SUPPLY_CENTER_CLOSE_DIST; posOffset += 2 * PATHFIND_CELL_SIZE_F ) 
+		for( posOffset = 0; posOffset < 2 * SUPPLY_CENTER_CLOSE_DIST; posOffset += 2 * PATHFIND_CELL_SIZE_F )
 		{
 			Real offset = posOffset / 2;
 			Real xPos, yPos;
 			yPos = location->y - offset;
-			for( xPos = location->x - offset; xPos <= location->x + offset; xPos += PATHFIND_CELL_SIZE_F ) 
+			for( xPos = location->x - offset; xPos <= location->x + offset; xPos += PATHFIND_CELL_SIZE_F )
 			{
 				newPos.x = xPos;
 				newPos.y = yPos;
@@ -2019,9 +2023,9 @@ Bool AIPlayer::calcClosestConstructionZoneLocation( const ThingTemplate *constru
 																						 BuildAssistant::TERRAIN_RESTRICTIONS |
 																						 BuildAssistant::NO_OBJECT_OVERLAP,
 																						 NULL, m_player ) == LBC_OK;
-				if( valid ) 
+				if( valid )
 					break;
-				
+
 				newPos.y = yPos + posOffset;
 				valid = TheBuildAssistant->isLocationLegalToBuild( &newPos, constructTemplate, angle,
 																						 BuildAssistant::CLEAR_PATH |
@@ -2029,12 +2033,12 @@ Bool AIPlayer::calcClosestConstructionZoneLocation( const ThingTemplate *constru
 																						 BuildAssistant::NO_OBJECT_OVERLAP,
 																						 NULL, m_player ) == LBC_OK;
 			}
-			
-			if( valid ) 
+
+			if( valid )
 				break;
 
 			xPos = location->x - offset;
-			for( yPos = location->y - offset; yPos <= location->y + offset; yPos += PATHFIND_CELL_SIZE_F ) 
+			for( yPos = location->y - offset; yPos <= location->y + offset; yPos += PATHFIND_CELL_SIZE_F )
 			{
 				newPos.x = xPos;
 				newPos.y = yPos;
@@ -2043,7 +2047,7 @@ Bool AIPlayer::calcClosestConstructionZoneLocation( const ThingTemplate *constru
 																						 BuildAssistant::TERRAIN_RESTRICTIONS |
 																						 BuildAssistant::NO_OBJECT_OVERLAP,
 																						 NULL, m_player ) == LBC_OK;
-				if( valid ) 
+				if( valid )
 					break;
 
 				newPos.x = xPos + posOffset;
@@ -2054,7 +2058,7 @@ Bool AIPlayer::calcClosestConstructionZoneLocation( const ThingTemplate *constru
 																						 NULL, m_player ) == LBC_OK;
 			}
 
-			if( valid ) 
+			if( valid )
 				break;
 		}
 	}
@@ -2110,19 +2114,19 @@ void AIPlayer::buildSpecificBuildingNearestTeam( const AsciiString &thingName, c
 	Coord3D newPos = *location;
 	if( TheBuildAssistant->isLocationLegalToBuild( location, tTemplate, angle, BuildAssistant::NO_OBJECT_OVERLAP, NULL, m_player ) != LBC_OK )
 	{
-		// Warn. 
+		// Warn.
 		AsciiString bldgName = tTemplate->getName();
 		bldgName.concat(" - buildSpecificBuildingNearestTeam unable to place.  Attempting to adjust position.");
 		TheScriptEngine->AppendDebugMessage( bldgName, false );
 		// try to fix.
 		Real posOffset;
 		// Wiggle it a little :)
-		for( posOffset = 0; posOffset < 2 * SUPPLY_CENTER_CLOSE_DIST; posOffset += 2 * PATHFIND_CELL_SIZE_F ) 
+		for( posOffset = 0; posOffset < 2 * SUPPLY_CENTER_CLOSE_DIST; posOffset += 2 * PATHFIND_CELL_SIZE_F )
 		{
 			Real offset = posOffset / 2;
 			Real xPos, yPos;
 			yPos = location->y-offset;
-			for( xPos = location->x - offset; xPos <= location->x + offset; xPos += PATHFIND_CELL_SIZE_F ) 
+			for( xPos = location->x - offset; xPos <= location->x + offset; xPos += PATHFIND_CELL_SIZE_F )
 			{
 				newPos.x = xPos;
 				newPos.y = yPos;
@@ -2131,9 +2135,9 @@ void AIPlayer::buildSpecificBuildingNearestTeam( const AsciiString &thingName, c
 																						 BuildAssistant::TERRAIN_RESTRICTIONS |
 																						 BuildAssistant::NO_OBJECT_OVERLAP,
 																						 NULL, m_player ) == LBC_OK;
-				if( valid ) 
+				if( valid )
 					break;
-				
+
 				newPos.y = yPos + posOffset;
 				valid = TheBuildAssistant->isLocationLegalToBuild( &newPos, tTemplate, angle,
 																						 BuildAssistant::CLEAR_PATH |
@@ -2141,12 +2145,12 @@ void AIPlayer::buildSpecificBuildingNearestTeam( const AsciiString &thingName, c
 																						 BuildAssistant::NO_OBJECT_OVERLAP,
 																						 NULL, m_player ) == LBC_OK;
 			}
-			
-			if( valid ) 
+
+			if( valid )
 				break;
 
 			xPos = location->x - offset;
-			for( yPos = location->y - offset; yPos <= location->y + offset; yPos += PATHFIND_CELL_SIZE_F ) 
+			for( yPos = location->y - offset; yPos <= location->y + offset; yPos += PATHFIND_CELL_SIZE_F )
 			{
 				newPos.x = xPos;
 				newPos.y = yPos;
@@ -2155,7 +2159,7 @@ void AIPlayer::buildSpecificBuildingNearestTeam( const AsciiString &thingName, c
 																						 BuildAssistant::TERRAIN_RESTRICTIONS |
 																						 BuildAssistant::NO_OBJECT_OVERLAP,
 																						 NULL, m_player ) == LBC_OK;
-				if( valid ) 
+				if( valid )
 					break;
 
 				newPos.x = xPos + posOffset;
@@ -2166,11 +2170,11 @@ void AIPlayer::buildSpecificBuildingNearestTeam( const AsciiString &thingName, c
 																						 NULL, m_player ) == LBC_OK;
 			}
 
-			if( valid ) 
+			if( valid )
 				break;
 		}
 	}
-	if( valid ) 
+	if( valid )
 	{
 		newPos.z = 0; // All build list locations are ground relative.
 		m_player->addToPriorityBuildList( thingName, &newPos, angle );
@@ -2204,7 +2208,7 @@ Object *AIPlayer::findSupplyCenter(Int minimumCash)
 			if (!obj->isKindOf(KINDOF_SUPPLY_SOURCE)) continue;
 			static const NameKeyType key_warehouseUpdate = NAMEKEY("SupplyWarehouseDockUpdate");
 			SupplyWarehouseDockUpdate *warehouseModule = (SupplyWarehouseDockUpdate*)obj->findUpdateModule( key_warehouseUpdate );
-			if( warehouseModule )	{	 
+			if( warehouseModule )	{
 				Int availableCash = warehouseModule->getBoxesStored()*TheGlobalData->m_baseValuePerSupplyBox;
 				if (availableCash<minimumCash) continue;
 				if( m_player->getRelationship(obj->getTeam()) == ENEMIES ) {
@@ -2287,9 +2291,9 @@ void AIPlayer::repairStructure(ObjectID structure)
 	if (structureObj==NULL) return;
 	if (structureObj->getBodyModule()==NULL) return;
 	// If the structure is not noticably damaged, don't bother.
-	enum BodyDamageType structureState = structureObj->getBodyModule()->getDamageState(); 
+	BodyDamageType structureState = structureObj->getBodyModule()->getDamageState();
 	if (structureState==BODY_PRISTINE) {
-		return; 
+		return;
 	}
 	if (structureObj->isKindOf(KINDOF_BRIDGE)) {
 		// Locate the correct post to repair.
@@ -2297,12 +2301,12 @@ void AIPlayer::repairStructure(ObjectID structure)
 	Int i;
 	for (i=0; i<m_structuresInQueue; i++) {
 		if (m_structuresToRepair[i] == structureObj->getID()) {
-			DEBUG_LOG(("info - Bridge already queued for repair.\n"));
+			DEBUG_LOG(("info - Bridge already queued for repair."));
 			return;
 		}
 	}
-	if (m_structuresInQueue==MAX_STRUCTURES_TO_REPAIR) {
-		DEBUG_LOG(("Structure repair queue is full, ignoring repair request. JBA\n"));
+	if (m_structuresInQueue>=MAX_STRUCTURES_TO_REPAIR) {
+		DEBUG_LOG(("Structure repair queue is full, ignoring repair request. JBA"));
 		return;
 	}
 	m_structuresToRepair[m_structuresInQueue] = structureObj->getID();
@@ -2314,8 +2318,8 @@ void AIPlayer::repairStructure(ObjectID structure)
 // ------------------------------------------------------------------------------------------------
 void AIPlayer::selectSkillset(Int skillset)
 {
-	DEBUG_ASSERTCRASH(m_skillsetSelector == INVALID_SKILLSET_SELECTION, 
-		("Selecting a skill set (%d) after one has already been chosen (%d) means some points have been incorrectly spent.\n", skillset + 1, m_skillsetSelector + 1));
+	DEBUG_ASSERTCRASH(m_skillsetSelector == INVALID_SKILLSET_SELECTION,
+		("Selecting a skill set (%d) after one has already been chosen (%d) means some points have been incorrectly spent.", skillset + 1, m_skillsetSelector + 1));
 
 	m_skillsetSelector = skillset;
 }
@@ -2346,7 +2350,7 @@ void AIPlayer::updateBridgeRepair(void)
 	// Got a bridge to repair.
 	Object *dozer = NULL;
 	Coord3D bridgePos = *bridgeObj->getPosition();
-	enum BodyDamageType bridgeState = bridgeObj->getBodyModule()->getDamageState(); 
+	BodyDamageType bridgeState = bridgeObj->getBodyModule()->getDamageState();
 	if (m_repairDozer==INVALID_ID) {
 		m_dozerIsRepairing = false;
 		// Need a dozer.
@@ -2358,7 +2362,7 @@ void AIPlayer::updateBridgeRepair(void)
 			m_repairDozer = dozer->getID();
 			m_repairDozerOrigin = *dozer->getPosition();
 			dozer->getAI()->aiRepair(bridgeObj, CMD_FROM_AI);
-			DEBUG_LOG(("Telling dozer to repair\n"));
+			DEBUG_LOG(("Telling dozer to repair"));
 			m_dozerIsRepairing = true;
 			return;
 		}
@@ -2383,7 +2387,7 @@ void AIPlayer::updateBridgeRepair(void)
 		if (!dozerAI->isAnyTaskPending())	{
 			// should be done repairing.
 			if (bridgeState==BODY_PRISTINE) {
-				DEBUG_LOG(("Dozer finished repairing structure.\n"));
+				DEBUG_LOG(("Dozer finished repairing structure."));
 				// we're done.
 				Int i;
 				for (i=0; i<m_structuresInQueue-1; i++) {
@@ -2392,7 +2396,7 @@ void AIPlayer::updateBridgeRepair(void)
 				m_structuresInQueue--;
 				m_dozerIsRepairing = false;
 				if (m_structuresInQueue==0) {
-					// Go home.  
+					// Go home.
 					Coord3D pos = m_baseCenter;
 					if (!m_baseCenterSet) {
 						pos = m_repairDozerOrigin;
@@ -2407,10 +2411,10 @@ void AIPlayer::updateBridgeRepair(void)
 			// dozer should be working on the bridge.
 			return;
 		}
-	}	
+	}
 	dozer->getAI()->aiRepair(bridgeObj, CMD_FROM_AI);
 	m_dozerIsRepairing = true;
-	DEBUG_LOG(("Telling dozer to repair\n"));
+	DEBUG_LOG(("Telling dozer to repair"));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -2422,7 +2426,7 @@ void AIPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool priorityBuild
 	// Create "Team in queue" based on team population
 	//
 	if (teamProto)
-	{	
+	{
 		if (!m_player->getCanBuildUnits()) {
 			AsciiString teamStr = "Can't build team '";
 			teamStr.concat(teamProto->getName());
@@ -2435,7 +2439,7 @@ void AIPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool priorityBuild
 			if (singletonTeam && singletonTeam->hasAnyObjects()) {
 				AsciiString teamStr = "Unable to build singleton team '";
 				teamStr.concat("' because team already exists.");
-				TheScriptEngine->AppendDebugMessage(teamStr, false); 
+				TheScriptEngine->AppendDebugMessage(teamStr, false);
 				return;
 			}
 		}
@@ -2448,7 +2452,7 @@ void AIPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool priorityBuild
 				teamStr.concat(teamProto->getName());
 				teamStr.concat("' but there is enough money.");
 				TheScriptEngine->AppendDebugMessage(teamStr, false);
-			} else {	
+			} else {
 				// Tech tree doesn't work.
 				AsciiString teamStr = "Unable to build team '";
 				teamStr.concat(teamProto->getName());
@@ -2499,7 +2503,7 @@ void AIPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool priorityBuild
 				orders = order;
 			}
 		}
-		if (orders) 
+		if (orders)
 		{
 			/* We have something to build. */
 			TeamInQueue *team = newInstance(TeamInQueue);
@@ -2518,7 +2522,7 @@ void AIPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool priorityBuild
 			team->m_frameStarted = TheGameLogic->getFrame();
 			// create inactive team to place members into as they are built
 			// when team is complete, the team is activated
-			team->m_team = TheTeamFactory->createInactiveTeam( teamProto->getName() ); 
+			team->m_team = TheTeamFactory->createInactiveTeam( teamProto->getName() );
 			AsciiString teamName = teamProto->getName();
 			teamName.concat(" - starting team build.");
 			TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -2550,17 +2554,17 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu
 	// Create "Team in queue" based on team population
 	//
 	if (teamProto)
-	{	
+	{
 		if (teamProto->getIsSingleton()) {
 			Team *singletonTeam = TheTeamFactory->findTeam( teamProto->getName() );
 			if (singletonTeam && singletonTeam->hasAnyObjects()) {
 				AsciiString teamStr = "Unable to recruit singleton team '";
 				teamStr.concat("' because team already exists.");
-				TheScriptEngine->AppendDebugMessage(teamStr, false); 
+				TheScriptEngine->AppendDebugMessage(teamStr, false);
 				return;
 			}
 		}
-		if (!teamProto->getTemplateInfo()->m_hasHomeLocation && !isSkirmishAI()) 
+		if (!teamProto->getTemplateInfo()->m_hasHomeLocation && !isSkirmishAI())
 		{
 			AsciiString teamStr = "Error : team '";
 			teamStr.concat(teamProto->getName());
@@ -2569,7 +2573,7 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu
 		}
 		// create inactive team to place members into as they are built
 		// when team is complete, the team is activated
-		Team *theTeam = TheTeamFactory->createInactiveTeam( teamProto->getName() ); 
+		Team *theTeam = TheTeamFactory->createInactiveTeam( teamProto->getName() );
 		AsciiString teamName = teamProto->getName();
 		teamName.concat(" - Recruiting.");
 		TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -2586,7 +2590,7 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu
 				int count = unitInfo[i].maxUnits;
 				while (count>0) {
 					Object *unit = theTeam->tryToRecruit(thing, &teamProto->getTemplateInfo()->m_homeLocation, recruitRadius);
-					if (unit) 
+					if (unit)
 					{
 						unitsRecruited++;
 
@@ -2602,12 +2606,12 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu
 						unit->setTeam(theTeam);
 
 						AIUpdateInterface *ai = unit->getAIUpdateInterface();
-						if (ai) 
+						if (ai)
 						{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#ifdef DEBUG_LOGGING
 							Coord3D pos = *unit->getPosition();
 							Coord3D to = teamProto->getTemplateInfo()->m_homeLocation;
-							DEBUG_LOG(("Moving unit from %f,%f to %f,%f\n", pos.x, pos.y , to.x, to.y ));
+							DEBUG_LOG(("Moving unit from %f,%f to %f,%f", pos.x, pos.y , to.x, to.y ));
 #endif
 							ai->aiMoveToPosition( &teamProto->getTemplateInfo()->m_homeLocation, CMD_FROM_AI);
 						}
@@ -2618,7 +2622,7 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu
 				}
 			}
 		}
-		if (unitsRecruited>0) 
+		if (unitsRecruited>0)
 		{
 			/* We have something to build. */
 			TeamInQueue *team = newInstance(TeamInQueue);
@@ -2627,7 +2631,7 @@ void AIPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadiu
 			team->m_priorityBuild = false;
 			team->m_workOrders = NULL;
 			team->m_frameStarted = TheGameLogic->getFrame();
-			team->m_team = theTeam; 
+			team->m_team = theTeam;
 			AsciiString teamName = teamProto->getName();
 			teamName.concat(" - Finished recruiting.");
 			TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -2670,19 +2674,19 @@ void AIPlayer::queueUnits( void )
 		for( WorkOrder *order = team->m_workOrders; order; order = order->m_next )
 		{
 			// check if there is a unit on the map that we can steal (recruit) instead of building
-			// @todo: Should this try to alter the home location of the recruiting area to 
+			// @todo: Should this try to alter the home location of the recruiting area to
 			// the center of the team, or to the home area of this player?
 			Coord3D home = team->m_team->getPrototype()->getTemplateInfo()->m_homeLocation;
 			Bool hasHome = false;
 			if (team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation) {
-				hasHome = true; 
+				hasHome = true;
 			} else {
 				hasHome = getBaseCenter(&home);
 			}
 			while (order->isWaitingToBuild()) {
-				
+
 				Object *unit = team->m_team->tryToRecruit(order->m_thing, &home, TheAI->getAiData()->m_maxRecruitDistance);
-				if (unit) 
+				if (unit)
 				{
 					order->m_numCompleted++;
 
@@ -2739,7 +2743,7 @@ void AIPlayer::doBaseBuilding( void )
 		}
 		// This timer is to keep from banging on the logic each frame.  If something interesting
 		// happens, like a building is added or a unit finished, the timers are shortcut.
-		m_buildDelay--;		
+		m_buildDelay--;
 		if (m_buildDelay<1) {
 			if (m_readyToBuildStructure) {
 				processBaseBuilding();
@@ -2765,7 +2769,7 @@ void AIPlayer::checkReadyTeams( void )
 			TeamInQueue *team = iter.cur();
 			// If 60 seconds passed, start anyway.
 			Bool timeExpired = team->m_frameStarted+60*LOGICFRAMES_PER_SECOND < TheGameLogic->getFrame();
-			Bool allIdle=TRUE;	
+			Bool allIdle=TRUE;
 			Bool anyIdle = FALSE;
 			if (team->m_reinforcement) {
 				Object *obj = TheGameLogic->findObjectByID(team->m_reinforcementID);
@@ -2776,7 +2780,7 @@ void AIPlayer::checkReadyTeams( void )
 			} else {
 				allIdle = team->m_team->isIdle();
 				for (DLINK_ITERATOR<Object> iter = team->m_team->iterate_TeamMemberList(); !iter.done(); iter.advance()) {
-					Object *obj = iter.cur();	
+					Object *obj = iter.cur();
 					if (obj->getAI() && obj->getAI()->isIdle()) {
 						anyIdle = true;
 					}
@@ -2794,11 +2798,11 @@ void AIPlayer::checkReadyTeams( void )
 				if (!team->m_sentToStartLocation) {
 					team->m_sentToStartLocation = true;
 					/*
-					if (team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation && 
+					if (team->m_team->getPrototype()->getTemplateInfo()->m_hasHomeLocation &&
 							!team->m_reinforcement) {
- 						AIGroup* theGroup = TheAI->createGroup();
+ 						AIGroupPtr theGroup = TheAI->createGroup();
 						if (theGroup) {
-							team->m_team->getTeamAsAIGroup(theGroup);
+							team->m_team->getTeamAsAIGroup(theGroup.Peek());
 							Coord3D destination = team->m_team->getPrototype()->getTemplateInfo()->m_homeLocation;
 							theGroup->groupTightenToPosition( &destination, false, CMD_FROM_AI );
 							team->m_frameStarted = TheGameLogic->getFrame();
@@ -2828,7 +2832,7 @@ void AIPlayer::checkReadyTeams( void )
 				}
 				deleteInstance(team);
 				iter = iterate_TeamReadyQueue();
-			}																		 
+			}
 		}
 	}
 }
@@ -2845,7 +2849,7 @@ void AIPlayer::checkQueuedTeams( void )
 		{
 			TeamInQueue *team = iter.cur();
 			if (team && team->isBuildTimeExpired())	{
-				if (team->isMinimumBuilt()) 
+				if (team->isMinimumBuilt())
 				{
 					if (team->areBuildsComplete()) {
 						// Move to ready queue
@@ -2862,7 +2866,7 @@ void AIPlayer::checkQueuedTeams( void )
 					if (isSkirmishAI()) {
 						TheScriptEngine->clearTeamFlags();
 					}
-				}	 
+				}
 				iter = iterate_TeamBuildQueue();
 			}
 		}
@@ -2883,7 +2887,7 @@ void AIPlayer::checkQueuedTeams( void )
 			}
 			Bool anyIdle = false;
 			for (DLINK_ITERATOR<Object> iter = team->m_team->iterate_TeamMemberList(); !iter.done(); iter.advance()) {
-				Object *obj = iter.cur();	
+				Object *obj = iter.cur();
 				if (obj && obj->getAI() && obj->getAI()->isIdle()) {
 					anyIdle = true;
 				}
@@ -2895,7 +2899,7 @@ void AIPlayer::checkQueuedTeams( void )
 						TheScriptEngine->friend_executeAction(script->getAction(), team->m_team);
 					}
 				}
-			}	
+			}
 		}
 	}
 }
@@ -2956,7 +2960,7 @@ void AIPlayer::doUpgradesAndSkills( void )
 	if (sideInfo == NULL) return;
 
 	if (m_skillsetSelector == INVALID_SKILLSET_SELECTION) {
-		Int limit = 0;		
+		Int limit = 0;
 		// Pick randomly among the skillsets that have skills.
 		// Designers sometimes only define skillset 1 & 2, or some such.  jba.
 		if (sideInfo->m_skillSet2.m_numSkills>0) {
@@ -3063,8 +3067,8 @@ void AIPlayer::newMap( void )
 		AsciiString name = info->getTemplateName();
 		if (name.isEmpty()) continue;
 		const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( name );
-		if (!bldgPlan) {																											 
-			DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.\n", name.str()));
+		if (!bldgPlan) {
+			DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.", name.str()));
 			continue;
 		}
 		if (info->isInitiallyBuilt()) {
@@ -3091,7 +3095,7 @@ void AIPlayer::computeCenterAndRadiusOfBase(Coord3D *center, Real *radius)
 		AsciiString name = info->getTemplateName();
 		if (name.isEmpty()) continue;
 		const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( name );
-		if (!bldgPlan) {																											 
+		if (!bldgPlan) {
 			continue;
 		}
 		Coord3D pos = *info->getLocation();
@@ -3115,7 +3119,7 @@ void AIPlayer::computeCenterAndRadiusOfBase(Coord3D *center, Real *radius)
 		AsciiString name = info->getTemplateName();
 		if (name.isEmpty()) continue;
 		const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( name );
-		if (!bldgPlan) {																											 
+		if (!bldgPlan) {
 			continue;
 		}
 		Coord3D pos = *info->getLocation();
@@ -3125,7 +3129,7 @@ void AIPlayer::computeCenterAndRadiusOfBase(Coord3D *center, Real *radius)
 		if (dy<0) dy = -dy;
 		Real bldgRadius = bldgPlan->getTemplateGeometryInfo().getBoundingCircleRadius()*0.4f;
 		dx += bldgRadius;
-		dy += bldgRadius; 
+		dy += bldgRadius;
 		Real radSqr = dx*dx+dy*dy;
 		if (radSqr>maxRadSqr) maxRadSqr=radSqr;
 	}
@@ -3185,7 +3189,7 @@ void AIPlayer::queueDozer( void )
 				team->m_workOrders = order;
 				team->m_frameStarted = TheGameLogic->getFrame();
 				// Stick it on the default team
-				team->m_team = m_player->getDefaultTeam(); 
+				team->m_team = m_player->getDefaultTeam();
 				AsciiString teamName = "DOZER - building one at the ";
 				teamName.concat(factory->getTemplate()->getName());
 				TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -3219,7 +3223,7 @@ Object * AIPlayer::findDozer( const Coord3D *pos )
 	// Add any factories placed to the build list.
 	Object *obj;
 	Object *dozer = NULL;
-	Bool needDozer = true; 
+	Bool needDozer = true;
 	Object *closestDozer=NULL;
 	Real closestDistSqr = 0;
 
@@ -3233,7 +3237,7 @@ Object * AIPlayer::findDozer( const Coord3D *pos )
 
 				AIUpdateInterface *ai = obj->getAIUpdateInterface();
 				if (ai==NULL) {
-					continue;										 
+					continue;
 				}
 
 
@@ -3243,7 +3247,7 @@ Object * AIPlayer::findDozer( const Coord3D *pos )
 					SupplyTruckAIInterface* supplyTruckAI = ai->getSupplyTruckAIInterface();
 					if( !dozerAI->isAnyTaskPending() && supplyTruckAI ) {
 						// If it is gathering supplies, don't steal it.
-						if (supplyTruckAI->isCurrentlyFerryingSupplies() || supplyTruckAI->isForcedIntoWantingState()) 
+						if (supplyTruckAI->isCurrentlyFerryingSupplies() || supplyTruckAI->isForcedIntoWantingState())
 						{
 							continue;
 						}
@@ -3294,12 +3298,12 @@ Object * AIPlayer::findDozer( const Coord3D *pos )
 void AIPlayer::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: added m_teamSeconds delay.
 	* 3: Added m_curWarehouseID.
 	* 1: Reset back to 1 with major save file changes.
@@ -3330,27 +3334,27 @@ void AIPlayer::xfer( Xfer *xfer )
 				 teamInQueueIt.done() == FALSE;
 				 teamInQueueIt.advance() )
 		{
-		
+
 			// get element data
 			teamInQueue = teamInQueueIt.cur();
 
 			// xfer it
 			xfer->xferSnapshot( teamInQueue );
 
-		}  // end for, iterate team build queue
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
 		// sanity, the list must be empty
 		if( getFirstItemIn_TeamBuildQueue() != NULL )
 		{
-		
-			DEBUG_CRASH(( "AIPlayer::xfer - TeamBuildQueue head is not NULL, you should delete it or something before loading a new list\n" ));
+
+			DEBUG_CRASH(( "AIPlayer::xfer - TeamBuildQueue head is not NULL, you should delete it or something before loading a new list" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// ready all data
 		for( UnsignedShort i = 0; i < teamBuildQueueCount; ++i )
@@ -3365,12 +3369,12 @@ void AIPlayer::xfer( Xfer *xfer )
 			// xfer data
 			xfer->xferSnapshot( teamInQueue );
 
-		}  // end for, i
+		}
 
 		// the list was loaded in reverse order, reverse the list so it's in the same order as before
 		reverse_TeamBuildQueue();
 
-	}  // end else, load
+	}
 
 	// team ready queue count
 	UnsignedShort teamReadyQueueCount = 0;
@@ -3389,27 +3393,27 @@ void AIPlayer::xfer( Xfer *xfer )
 				 teamReadyQueueIt.done() == FALSE;
 				 teamReadyQueueIt.advance() )
 		{
-		
+
 			// get element
 			teamReadyQueue = teamReadyQueueIt.cur();
-			
+
 			// xfer data
 			xfer->xferSnapshot( teamReadyQueue );
 
-		}  // end for, iterate team ready queue
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
 		// sanity, the list must be empty
 		if( getFirstItemIn_TeamReadyQueue() != NULL )
 		{
-		
-			DEBUG_CRASH(( "AIPlayer::xfer - TeamReadyQueue head is not NULL, you should delete it or something before loading a new list\n" ));
+
+			DEBUG_CRASH(( "AIPlayer::xfer - TeamReadyQueue head is not NULL, you should delete it or something before loading a new list" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read all data
 		for( UnsignedShort i = 0; i < teamReadyQueueCount; ++i )
@@ -3424,12 +3428,12 @@ void AIPlayer::xfer( Xfer *xfer )
 			// xfer data
 			xfer->xferSnapshot( teamInQueue );
 
-		}  // end for, i
+		}
 
 		// reverse the list since it was loaded in reverse order due to the prepend
 		reverse_TeamReadyQueue();
 
-	}  // end else, load
+	}
 
 	// xfer player index ... this is really just for sanity
 	PlayerIndex playerIndex = m_player->getPlayerIndex();
@@ -3437,10 +3441,10 @@ void AIPlayer::xfer( Xfer *xfer )
 	if( playerIndex != m_player->getPlayerIndex() )
 	{
 
-		DEBUG_CRASH(( "AIPlayer::xfer - player index mismatch\n" ));
+		DEBUG_CRASH(( "AIPlayer::xfer - player index mismatch" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// xfer the rest of the ai player data (it's pretty straight forward)
 	xfer->xferBool( &m_readyToBuildTeam );
@@ -3470,7 +3474,7 @@ void AIPlayer::xfer( Xfer *xfer )
 	xfer->xferBool( &m_dozerIsRepairing );
 	xfer->xferInt( &m_bridgeTimer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3478,7 +3482,7 @@ void AIPlayer::xfer( Xfer *xfer )
 void AIPlayer::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -3505,7 +3509,7 @@ Bool TeamInQueue::isAllBuilt()
 	Bool stillBuilding = false;
 	for( order = m_workOrders; order; order = order->m_next )
 	{
-		if (order->m_numRequired>order->m_numCompleted) 
+		if (order->m_numRequired>order->m_numCompleted)
 		{
 			stillBuilding = true;
 		}
@@ -3538,7 +3542,7 @@ Bool TeamInQueue::isMinimumBuilt()
 		if (order->m_factoryID != INVALID_ID) {
 			count++; // we have one building.
 		}
-		if (order->m_numRequired>count) 
+		if (order->m_numRequired>count)
 		{
 			if (order->m_required) {
 				return false; // required units not built.
@@ -3602,10 +3606,10 @@ void TeamInQueue::disband()
 void TeamInQueue::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Xfer method 
+/** Xfer method
 	* Version Info:
 	* 1: Initial version */
 // ------------------------------------------------------------------------------------------------
@@ -3614,7 +3618,7 @@ void TeamInQueue::xfer( Xfer *xfer )
 
 	// version
 	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;;
+	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
 	// xfer work order count
@@ -3635,9 +3639,9 @@ void TeamInQueue::xfer( Xfer *xfer )
 			// xfer work order data
 			xfer->xferSnapshot( workOrder );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -3645,10 +3649,10 @@ void TeamInQueue::xfer( Xfer *xfer )
 		if( m_workOrders != NULL )
 		{
 
-			DEBUG_CRASH(( "TeamInQueue::xfer - m_workOrders should be NULL but isn't.  Perhaps you should blow it away before loading\n" ));
+			DEBUG_CRASH(( "TeamInQueue::xfer - m_workOrders should be NULL but isn't.  Perhaps you should blow it away before loading" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// load all work orders
 		for( UnsignedShort i = 0; i < workOrderCount; ++i )
@@ -3670,14 +3674,14 @@ void TeamInQueue::xfer( Xfer *xfer )
 
 				last->m_next = workOrder;
 
-			}  // end else
+			}
 
 			// load work order data
 			xfer->xferSnapshot( workOrder );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// xfer the rest of the team in queue data
 	xfer->xferBool( &m_priorityBuild );
@@ -3691,7 +3695,7 @@ void TeamInQueue::xfer( Xfer *xfer )
 	xfer->xferBool( &m_reinforcement );
 	xfer->xferObjectID( &m_reinforcementID );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3699,7 +3703,7 @@ void TeamInQueue::xfer( Xfer *xfer )
 void TeamInQueue::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -3710,7 +3714,7 @@ void TeamInQueue::loadPostProcess( void )
 WorkOrder::~WorkOrder()
 {
 
-}  // end WorkOrder
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Verify factoryID still refers to an active object */
@@ -3718,7 +3722,7 @@ WorkOrder::~WorkOrder()
 void WorkOrder::validateFactory( Player *thisPlayer )
 {
 
-	if (m_factoryID == INVALID_ID) 
+	if (m_factoryID == INVALID_ID)
 		return;
 	Object *factory = TheGameLogic->findObjectByID( m_factoryID );
 	if ( factory == NULL) {
@@ -3729,7 +3733,7 @@ void WorkOrder::validateFactory( Player *thisPlayer )
 		m_factoryID = INVALID_ID;
 	}
 
-}  // end validateFactory
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -3737,7 +3741,7 @@ void WorkOrder::validateFactory( Player *thisPlayer )
 void WorkOrder::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -3773,7 +3777,7 @@ void WorkOrder::xfer( Xfer *xfer )
 	// is resource gatherer
 	xfer->xferBool( &m_isResourceGatherer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3781,7 +3785,7 @@ void WorkOrder::xfer( Xfer *xfer )
 void WorkOrder::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 
 //----------------------------------------------------------------------------------------------------------
@@ -3798,21 +3802,21 @@ void AIPlayer::getPlayerStructureBounds( Region2D *bounds, Int playerNdx, Bool c
 	objBounds.hi.x = objBounds.lo.x = objBounds.hi.y = objBounds.lo.y = 0;
 
 	Player* pPlayer = ThePlayerList->getNthPlayer(playerNdx);
-	if (pPlayer == NULL) 
+	if (pPlayer == NULL)
 		return;
-	for (it = pPlayer->getPlayerTeams()->begin(); it != pPlayer->getPlayerTeams()->end(); ++it) 
+	for (it = pPlayer->getPlayerTeams()->begin(); it != pPlayer->getPlayerTeams()->end(); ++it)
 	{
-		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 		{
 			Team *team = iter.cur();
-			if (!team) 
+			if (!team)
 				continue;
-			for (DLINK_ITERATOR<Object> iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+			for (DLINK_ITERATOR<Object> iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance())
 			{
 				Object *pObj = iter.cur();
-				if (!pObj) 
+				if (!pObj)
 					continue;
-				if( pObj->isKindOf(KINDOF_STRUCTURE) ) 
+				if( pObj->isKindOf(KINDOF_STRUCTURE) )
 				{
 					if( conservative && pObj->isKindOf( KINDOF_CONSERVATIVE_BUILDING ) )
 					{
@@ -3823,27 +3827,27 @@ void AIPlayer::getPlayerStructureBounds( Region2D *bounds, Int playerNdx, Bool c
 						//things close to the enemy base.
 						continue;
 					}
-					
+
 					Coord3D pos = *pObj->getPosition();
 					if (firstObject) {
 						objBounds.lo.x = objBounds.hi.x = pos.x;
 						objBounds.lo.y = objBounds.hi.y = pos.y;
 						firstObject = false;
-					}	
-					else 
+					}
+					else
 					{
 						if (objBounds.lo.x>pos.x) objBounds.lo.x = pos.x;
 						if (objBounds.lo.y>pos.y) objBounds.lo.y = pos.y;
 						if (objBounds.hi.x<pos.x) objBounds.hi.x = pos.x;
 						if (objBounds.hi.y<pos.y) objBounds.hi.y = pos.y;
 					}
-					if (firstStructure) 
+					if (firstStructure)
 					{
 						bounds->lo.x = bounds->hi.x = pos.x;
 						bounds->lo.y = bounds->hi.y = pos.y;
 						firstStructure = false;
-					}	
-					else 
+					}
+					else
 					{
 						if (bounds->lo.x>pos.x) bounds->lo.x = pos.x;
 						if (bounds->lo.y>pos.y) bounds->lo.y = pos.y;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
index d0ae47701b3..26db83cda7c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AISkirmishPlayer.cpp
@@ -26,14 +26,14 @@
 // Computerized opponent
 // Author: Michael S. Booth, January 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/GameMemory.h"
 #include "Common/GlobalData.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
-#include "Common/Team.h" 
+#include "Common/Team.h"
 #include "Common/ThingFactory.h"
 #include "Common/BuildAssistant.h"
 #include "Common/SpecialPower.h"
@@ -54,15 +54,10 @@
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/Module/ProductionUpdate.h"
-#include "GameClient/TerrainVisual.h"	
+#include "GameClient/TerrainVisual.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
-#define USE_DOZER 1	 
+#define USE_DOZER 1
 
 
 
@@ -70,7 +65,7 @@
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-AISkirmishPlayer::AISkirmishPlayer( Player *p ) :	AIPlayer(p), 
+AISkirmishPlayer::AISkirmishPlayer( Player *p ) :	AIPlayer(p),
 m_curFlankBaseDefense(0),
 m_curFrontBaseDefense(0),
 m_curFrontLeftDefenseAngle(0),
@@ -106,7 +101,7 @@ void AISkirmishPlayer::processBaseBuilding( void )
 	{
 		const ThingTemplate *bldgPlan=NULL;
 		BuildListInfo	*bldgInfo = NULL;
-		Bool isPriority = false;	
+		Bool isPriority = false;
 		Object *bldg = NULL;
 		const ThingTemplate *powerPlan=NULL;
 		BuildListInfo	*powerInfo = NULL;
@@ -117,11 +112,11 @@ void AISkirmishPlayer::processBaseBuilding( void )
 			AsciiString name = info->getTemplateName();
 			if (name.isEmpty()) continue;
 			const ThingTemplate *curPlan = TheThingFactory->findTemplate( name );
-			if (!curPlan) {																											 
-				DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.\n", name.str()));
+			if (!curPlan) {
+				DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.", name.str()));
 				continue;
 			}
-			bldg = TheGameLogic->findObjectByID( info->getObjectID() );	
+			bldg = TheGameLogic->findObjectByID( info->getObjectID() );
 			// check for hole.
 			if (info->getObjectID() != INVALID_ID) {
 				// used to have a building.
@@ -134,13 +129,13 @@ void AISkirmishPlayer::processBaseBuilding( void )
 					info->setObjectTimestamp(TheGameLogic->getFrame()+1);
 					// Scan for a GLA hole.	KINDOF_REBUILD_HOLE
 					Object *obj;
-					for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() ) { 
+					for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() ) {
 						if (!obj->isKindOf(KINDOF_REBUILD_HOLE)) continue;
 						RebuildHoleBehaviorInterface *rhbi = RebuildHoleBehavior::getRebuildHoleBehaviorInterfaceFromObject( obj );
 						if( rhbi ) {
 							ObjectID spawnerID = rhbi->getSpawnerID();
 							if (priorID == spawnerID) {
-								DEBUG_LOG(("AI Found hole to rebuild %s\n", curPlan->getName().str()));
+								DEBUG_LOG(("AI Found hole to rebuild %s", curPlan->getName().str()));
 								info->setObjectID(obj->getID());
 							}
 						}
@@ -148,16 +143,16 @@ void AISkirmishPlayer::processBaseBuilding( void )
 				}	else {
 					if (bldg->getControllingPlayer() == m_player) {
 						// Check for built or dozer missing.
-						if( bldg->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) ) 
+						if( bldg->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 						{
-							if (bldg->isKindOf(KINDOF_FS_POWER) && !bldg->isKindOf(KINDOF_CASH_GENERATOR)) 
+							if (bldg->isKindOf(KINDOF_FS_POWER) && !bldg->isKindOf(KINDOF_CASH_GENERATOR))
 							{
 								powerUnderConstruction = true;
 							}
 							// make sure dozer is working on him.
 							ObjectID builder = bldg->getBuilderID();
 							Object* myDozer = TheGameLogic->findObjectByID(builder);
-              
+
               if (myDozer && ( myDozer->getControllingPlayer() != m_player || myDozer->isDisabledByType( DISABLED_UNMANNED ) ) )
               {//I don't expect this dozer to work well with me.
                 myDozer = NULL;
@@ -165,7 +160,7 @@ void AISkirmishPlayer::processBaseBuilding( void )
               }
 
 							if (myDozer==NULL) {
-								DEBUG_LOG(("AI's Dozer got killed (or captured).  Find another dozer.\n"));
+								DEBUG_LOG(("AI's Dozer got killed (or captured).  Find another dozer."));
 								queueDozer();
  								myDozer = findDozer(bldg->getPosition());
 								if (myDozer==NULL || myDozer->getAI()==NULL) {
@@ -181,7 +176,7 @@ void AISkirmishPlayer::processBaseBuilding( void )
 						// oops, got captured.
 						info->setObjectID(INVALID_ID);
 						info->setObjectTimestamp(TheGameLogic->getFrame()+1);
-					}	
+					}
 				}
 			}
 			if (info->getObjectID()==INVALID_ID && info->getObjectTimestamp()>0) {
@@ -190,7 +185,7 @@ void AISkirmishPlayer::processBaseBuilding( void )
 				if (info->getObjectTimestamp()+TheAI->getAiData()->m_rebuildDelaySeconds*LOGICFRAMES_PER_SECOND > TheGameLogic->getFrame()) {
 					continue;
 				}	else {
-					DEBUG_LOG(("Enabling rebuild for %s\n", info->getTemplateName().str()));
+					DEBUG_LOG(("Enabling rebuild for %s", info->getTemplateName().str()));
 					info->setObjectTimestamp(0); // ready to build.
 				}
 			}
@@ -237,18 +232,18 @@ void AISkirmishPlayer::processBaseBuilding( void )
 			}
 			// check if this building has any "rebuilds" left
 			if (info->isBuildable())
-			{	
+			{
 				if (bldgPlan == NULL) {
 					bldgPlan = curPlan;
 					bldgInfo = info;
 				}
 			}
 		}
-		if (powerPlan && powerInfo && !powerPlan->isEquivalentTo(bldgPlan)) {
+		if (powerInfo && powerPlan && !powerPlan->isEquivalentTo(bldgPlan)) {
 			if (!powerUnderConstruction) {
 				bldgPlan = powerPlan;
 				bldgInfo = powerInfo;
-				DEBUG_LOG(("Forcing build of power plant.\n"));
+				DEBUG_LOG(("Forcing build of power plant."));
 			}
 		}
 		if (bldgPlan && bldgInfo) {
@@ -270,13 +265,14 @@ void AISkirmishPlayer::processBaseBuilding( void )
 				}
 				m_frameLastBuildingBuilt = TheGameLogic->getFrame();
 				// only build one building per delay loop
-			} // bldg built
+			}
 
 #else
 			// force delay between rebuilds
-			if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild) 
+			Int framesToBuild = bldgPlan->calcTimeToBuild(m_player);
+			if (TheGameLogic->getFrame() - m_frameLastBuildingBuilt < framesToBuild)
 			{
-				m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt); 
+				m_buildDelay = framesToBuild - (TheGameLogic->getFrame() - m_frameLastBuildingBuilt);
 				return;
 			}	else {
 				// building is missing, (re)build it
@@ -288,12 +284,12 @@ void AISkirmishPlayer::processBaseBuilding( void )
 					m_player->getMoney()->withdraw( cost );
 
 					// inst-construct the building
-					bldg = buildStructureNow(bldgPlan, info, NULL);
+					bldg = buildStructureNow(bldgPlan, bldgInfo);
 					// store the object with the build order
 					if (bldg)
 					{
-						info->setObjectID( bldg->getID() );
-						info->decrementNumRebuilds();
+						bldgInfo->setObjectID( bldg->getID() );
+						bldgInfo->decrementNumRebuilds();
 
 						m_readyToBuildStructure = false;
 						m_structureTimer = TheAI->getAiData()->m_structureSeconds*LOGICFRAMES_PER_SECOND;
@@ -303,11 +299,9 @@ void AISkirmishPlayer::processBaseBuilding( void )
 							m_structureTimer = m_structureTimer/TheAI->getAiData()->m_structuresWealthyMod;
 						}
 						m_frameLastBuildingBuilt = TheGameLogic->getFrame();
-						// only build one building per delay loop
-						break;
-					} // bldg built
-				} // have money
-			} // rebuild delay ok
+					}
+				}
+			}
 #endif
 		}
 	}
@@ -324,7 +318,7 @@ void AISkirmishPlayer::onUnitProduced( Object *factory, Object *unit )
 /**
  * Search the computer player's buildings for one that can build the given request
  * and start training the unit.
- * If busyOK is true, it will queue a unit even if one is building.  This lets 
+ * If busyOK is true, it will queue a unit even if one is building.  This lets
  * script invoked teams "push" to the front of the queue.
  */
 Bool AISkirmishPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString teamName)
@@ -334,7 +328,7 @@ Bool AISkirmishPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString
 	{
 		ProductionUpdateInterface *pu = factory->getProductionUpdateInterface();
 		if (pu && pu->queueCreateUnit( order->m_thing, pu->requestUniqueUnitID() )) {
-			order->m_factoryID = factory->getID(); 
+			order->m_factoryID = factory->getID();
 			if (TheGlobalData->m_debugAI) {
 				AsciiString teamStr = "Queuing ";
 				teamStr.concat(order->m_thing->getName());
@@ -344,7 +338,7 @@ Bool AISkirmishPlayer::startTraining( WorkOrder *order, Bool busyOK, AsciiString
 			}
 			return true;
 		}
-	}  // end if
+	}
 
 	return FALSE;
 
@@ -362,7 +356,7 @@ Bool AISkirmishPlayer::isAGoodIdeaToBuildTeam( TeamPrototype *proto )
 	}
 	// check build limit
 	if (proto->countTeamInstances() >= proto->getTemplateInfo()->m_maxInstances){
-		if (TheGlobalData->m_debugAI) {	
+		if (TheGlobalData->m_debugAI) {
 			AsciiString str;
 			str.format("Team %s not chosen - %d already exist.", proto->getName().str(), proto->countTeamInstances());
 			TheScriptEngine->AppendDebugMessage(str, false);
@@ -379,7 +373,7 @@ Bool AISkirmishPlayer::isAGoodIdeaToBuildTeam( TeamPrototype *proto )
 	}
 	Bool needMoney;
 	if (!isPossibleToBuildTeam( proto, true, needMoney)) {
-		if (TheGlobalData->m_debugAI) {	
+		if (TheGlobalData->m_debugAI) {
 			AsciiString str;
 			if (needMoney) {
 				str.format("Team %s not chosen - Not enough money.", proto->getName().str());
@@ -406,11 +400,11 @@ Bool AISkirmishPlayer::selectTeamToReinforce( Int minPriority )
  */
 Bool AISkirmishPlayer::selectTeamToBuild( void )
 {
-	return AIPlayer::selectTeamToBuild();	
+	return AIPlayer::selectTeamToBuild();
 }
 
-/** 
-	Build a specific building.  
+/**
+	Build a specific building.
 	*/
 void AISkirmishPlayer::buildSpecificAIBuilding(const AsciiString &thingName)
 {
@@ -419,13 +413,13 @@ void AISkirmishPlayer::buildSpecificAIBuilding(const AsciiString &thingName)
 	Bool foundUnbuilt = false;
 	for( BuildListInfo *info = m_player->getBuildList(); info; info = info->getNext() )
 	{
-		if (info->getTemplateName()==thingName) 
+		if (info->getTemplateName()==thingName)
 		{
 			AsciiString name = info->getTemplateName();
 			if (name.isEmpty()) continue;
 			const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( name );
-			if (!bldgPlan) {																											 
-				DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.\n", name.str()));
+			if (!bldgPlan) {
+				DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.", name.str()));
 				continue;
 			}
 			Object *bldg = TheGameLogic->findObjectByID( info->getObjectID() );
@@ -440,30 +434,30 @@ void AISkirmishPlayer::buildSpecificAIBuilding(const AsciiString &thingName)
 			info->markPriorityBuild();
 			break;
 		}
-	}	
+	}
 	if (foundUnbuilt) {
 		m_buildDelay = 0;
 		AsciiString buildingStr = "Queueing building '";
 		buildingStr.concat(thingName);
 		buildingStr.concat("' for construction.");
-		TheScriptEngine->AppendDebugMessage(buildingStr, false); 
+		TheScriptEngine->AppendDebugMessage(buildingStr, false);
 	}	else if (found) {
 		AsciiString buildingStr = "Warning - all instances of building '";
 		buildingStr.concat(thingName);
 		buildingStr.concat("' are already built or queued for build, not queueing.");
-		TheScriptEngine->AppendDebugMessage(buildingStr, false); 
+		TheScriptEngine->AppendDebugMessage(buildingStr, false);
 	}	else {
 		AsciiString buildingStr = "Error - could not find building '";
 		buildingStr.concat(thingName);
 		buildingStr.concat("' in the building template list.");
-		TheScriptEngine->AppendDebugMessage(buildingStr, false); 
+		TheScriptEngine->AppendDebugMessage(buildingStr, false);
 	}
 }
 
 
 
-/** 
-	Gets the player index of my enemy.  
+/**
+	Gets the player index of my enemy.
 	*/
 Int AISkirmishPlayer::getMyEnemyPlayerIndex(void) {
 	Int playerNdx;
@@ -479,8 +473,8 @@ Int AISkirmishPlayer::getMyEnemyPlayerIndex(void) {
 	return playerNdx;
 }
 
-/** 
-	Get the AI's enemy.  Recalc if it has been a while (5 seconds.)  
+/**
+	Get the AI's enemy.  Recalc if it has been a while (5 seconds.)
 */
 void AISkirmishPlayer::acquireEnemy(void)
 {
@@ -513,7 +507,7 @@ void AISkirmishPlayer::acquireEnemy(void)
 			if (inBadShape) {
 				curDistSqr = HUGE_DIST*HUGE_DIST*0.5f;
 			}
-			// See if other ai's are attacking this target.  
+			// See if other ai's are attacking this target.
 			// We don't want the ai's to gang up on one enemy.
 			Int k;
 			for (k=0; k<ThePlayerList->getPlayerCount(); k++) {
@@ -522,7 +516,7 @@ void AISkirmishPlayer::acquireEnemy(void)
 				if (somePlayer->isSkirmishAIPlayer() && (somePlayer->getCurrentEnemy()==curPlayer)) {
 					// Some ai is already targeting this guy.  Add a distance penalty.
 					curDistSqr += (500*500);
-				}	
+				}
 				if (somePlayer->isSkirmishAIPlayer() && (somePlayer->getCurrentEnemy()==m_player)) {
 					// he is attacking me.  So I will (gently) prefer to attack him.
 					curDistSqr -= (25*25);
@@ -548,8 +542,8 @@ void AISkirmishPlayer::acquireEnemy(void)
 
 
 
-/** 
-	Get the AI's enemy.  Recalc if it has been a while (20 seconds.)  
+/**
+	Get the AI's enemy.  Recalc if it has been a while (20 seconds.)
 */
 Player *AISkirmishPlayer::getAiEnemy(void)
 {
@@ -560,8 +554,8 @@ Player *AISkirmishPlayer::getAiEnemy(void)
 	return m_currentEnemy;
 }
 
-/** 
-	Build base defense structures on the front or flank of the base.  
+/**
+	Build base defense structures on the front or flank of the base.
 */
 void AISkirmishPlayer::buildAIBaseDefense(Bool flank)
 {
@@ -579,14 +573,14 @@ void AISkirmishPlayer::buildAIBaseDefense(Bool flank)
 	}
 }
 
-/** 
-	Build base defense structures on the front or flank of the base.  
+/**
+	Build base defense structures on the front or flank of the base.
 	Base defenses are placed as follows:
 	m_baseCenter and m_baseRadius are calculated on map load.
 	Defenses are placed along the this circle.
-	Front defenses (!flank) are placed starting at the "Center" approach path.  
+	Front defenses (!flank) are placed starting at the "Center" approach path.
 	The first front defense is placed towards th Center path.  Number 2 is placed
-	to the left of #1, #3 is placed to the right of #1, #4 is placed to the left of 
+	to the left of #1, #3 is placed to the right of #1, #4 is placed to the left of
 	#2 and so on.  So it looks like:
 
 												#1
@@ -595,8 +589,8 @@ void AISkirmishPlayer::buildAIBaseDefense(Bool flank)
 		  #8																	#9
 
 	The flank base defenses cover the "Flank" approach, and the "Backdoor" approach.
-	They alternate between these two, so the first flank defense covers flank, and the second 
-	covers backdoor, and continue to alternate.  They cover the approach using the same 
+	They alternate between these two, so the first flank defense covers flank, and the second
+	covers backdoor, and continue to alternate.  They cover the approach using the same
 	pattern as front above.
 	John A.
 
@@ -681,12 +675,15 @@ void AISkirmishPlayer::buildAIBaseDefenseStructure(const AsciiString &thingName,
 		Real s = sin(angle);
 		Real c = cos(angle);
 
-	  DEBUG_LOG(("buildAIBaseDefenseStructure -- Angle is %f sin %f, cos %f \n", 180*angle/PI, s, c));
-		DEBUG_LOG(("buildAIBaseDefenseStructure -- Offset is %f  %f, Final Position is %f, %f \n", 
-			offset.x, offset.y, 
+// TheSuperHackers @info helmutbuhler 21/04/2025 This debug mutates the code to become CRC incompatible
+#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC
+		DEBUG_LOG(("buildAIBaseDefenseStructure -- Angle is %f sin %f, cos %f", 180*angle/PI, s, c));
+		DEBUG_LOG(("buildAIBaseDefenseStructure -- Offset is %f  %f, Final Position is %f, %f",
+			offset.x, offset.y,
 			offset.x*c - offset.y*s,
 			offset.y*c + offset.x*s
-			));	
+			));
+#endif
 		Coord3D buildPos = m_baseCenter;
 		buildPos.x += offset.x*c - offset.y*s;
 		buildPos.y += offset.y*c + offset.x*s;
@@ -694,7 +691,7 @@ void AISkirmishPlayer::buildAIBaseDefenseStructure(const AsciiString &thingName,
 		/* See if we can build there. */
 		Bool canBuild;
 		Real placeAngle = tTemplate->getPlacementViewAngle();
-		canBuild = LBC_OK == TheBuildAssistant->isLocationLegalToBuild(&buildPos, tTemplate, placeAngle, 
+		canBuild = LBC_OK == TheBuildAssistant->isLocationLegalToBuild(&buildPos, tTemplate, placeAngle,
 			BuildAssistant::TERRAIN_RESTRICTIONS|BuildAssistant::NO_OBJECT_OVERLAP, NULL, m_player);
 		TheTerrainVisual->removeAllBibs();	// isLocationLegalToBuild adds bib feedback, turn it off.  jba.
 		if (flank) {
@@ -711,7 +708,7 @@ void AISkirmishPlayer::buildAIBaseDefenseStructure(const AsciiString &thingName,
 }
 
 
-/** 
+/**
 	Checks bridges along a waypoint path.  If any are destroyed, sends a dozer to fix, and returns true.
 	If there is no bridge problem, returns false.
 	*/
@@ -719,7 +716,7 @@ Bool AISkirmishPlayer::checkBridges(Object *unit, Waypoint *way)
 {
 	Coord3D unitPos = *unit->getPosition();
 	AIUpdateInterface *ai = unit->getAI();
-	if (!ai) return false; // no ai 
+	if (!ai) return false; // no ai
 	const LocomotorSet& locoSet = ai->getLocomotorSet();
 	Waypoint *curWay;
 	for (curWay = way; curWay; curWay = curWay->getNext()) {
@@ -737,7 +734,7 @@ Bool AISkirmishPlayer::checkBridges(Object *unit, Waypoint *way)
 }
 
 
-/** 
+/**
 	Build a specific team.  If priorityBuild, put at front of queue with priority set.
 	*/
 void AISkirmishPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool priorityBuild)
@@ -746,7 +743,7 @@ void AISkirmishPlayer::buildSpecificAITeam( TeamPrototype *teamProto, Bool prior
 }
 
 
-/** 
+/**
 	Recruit a specific team, within the specific radius of the home position.
 	*/
 void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recruitRadius)
@@ -756,17 +753,17 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr
 	// Create "Team in queue" based on team population
 	//
 	if (teamProto)
-	{	
+	{
 		if (teamProto->getIsSingleton()) {
 			Team *singletonTeam = TheTeamFactory->findTeam( teamProto->getName() );
 			if (singletonTeam && singletonTeam->hasAnyObjects()) {
 				AsciiString teamStr = "Unable to recruit singleton team '";
 				teamStr.concat("' because team already exists.");
-				TheScriptEngine->AppendDebugMessage(teamStr, false); 
+				TheScriptEngine->AppendDebugMessage(teamStr, false);
 				return;
 			}
 		}
-		if (!teamProto->getTemplateInfo()->m_hasHomeLocation) 
+		if (!teamProto->getTemplateInfo()->m_hasHomeLocation)
 		{
 			AsciiString teamStr = "Error : team '";
 			teamStr.concat(teamProto->getName());
@@ -775,7 +772,7 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr
 		}
 		// create inactive team to place members into as they are built
 		// when team is complete, the team is activated
-		Team *theTeam = TheTeamFactory->createInactiveTeam( teamProto->getName() ); 
+		Team *theTeam = TheTeamFactory->createInactiveTeam( teamProto->getName() );
 		AsciiString teamName = teamProto->getName();
 		teamName.concat(" - Recruiting.");
 		TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -792,7 +789,7 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr
 				int count = unitInfo[i].maxUnits;
 				while (count>0) {
 					Object *unit = theTeam->tryToRecruit(thing, &teamProto->getTemplateInfo()->m_homeLocation, recruitRadius);
-					if (unit) 
+					if (unit)
 					{
 						unitsRecruited++;
 
@@ -808,12 +805,12 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr
 						unit->setTeam(theTeam);
 
 						AIUpdateInterface *ai = unit->getAIUpdateInterface();
-						if (ai) 
+						if (ai)
 						{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#ifdef DEBUG_LOGGING
 							Coord3D pos = *unit->getPosition();
 							Coord3D to = teamProto->getTemplateInfo()->m_homeLocation;
-							DEBUG_LOG(("Moving unit from %f,%f to %f,%f\n", pos.x, pos.y , to.x, to.y ));
+							DEBUG_LOG(("Moving unit from %f,%f to %f,%f", pos.x, pos.y , to.x, to.y ));
 #endif
 							ai->aiMoveToPosition( &teamProto->getTemplateInfo()->m_homeLocation, CMD_FROM_AI);
 						}
@@ -824,7 +821,7 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr
 				}
 			}
 		}
-		if (unitsRecruited>0) 
+		if (unitsRecruited>0)
 		{
 			/* We have something to build. */
 			TeamInQueue *team = newInstance(TeamInQueue);
@@ -833,7 +830,7 @@ void AISkirmishPlayer::recruitSpecificAITeam(TeamPrototype *teamProto, Real recr
 			team->m_priorityBuild = false;
 			team->m_workOrders = NULL;
 			team->m_frameStarted = TheGameLogic->getFrame();
-			team->m_team = theTeam; 
+			team->m_team = theTeam;
 			AsciiString teamName = teamProto->getName();
 			teamName.concat(" - Finished recruiting.");
 			TheScriptEngine->AppendDebugMessage(teamName, false);
@@ -884,7 +881,7 @@ void AISkirmishPlayer::doBaseBuilding( void )
 		}
 		// This timer is to keep from banging on the logic each frame.  If something interesting
 		// happens, like a building is added or a unit finished, the timers are shortcut.
-		m_buildDelay--;		
+		m_buildDelay--;
 		if (m_buildDelay<1) {
 			if (m_readyToBuildStructure) {
 				processBaseBuilding();
@@ -966,11 +963,11 @@ void AISkirmishPlayer::adjustBuildList(BuildListInfo *list)
 {
 	Bool foundStart = false;
 	Coord3D startPos;
-	
+
 	// Find our command center location.
 	Object *obj;
 	for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() )
-	{	
+	{
 
 		Player *owner = obj->getControllingPlayer();
 		if (owner==m_player) {
@@ -986,7 +983,7 @@ void AISkirmishPlayer::adjustBuildList(BuildListInfo *list)
 		}
 	}
 	if (!foundStart) {
-		DEBUG_LOG(("Couldn't find starting command center for ai player.\n"));
+		DEBUG_LOG(("Couldn't find starting command center for ai player."));
 		return;
 	}
 	// Find the location of the command center in the build list.
@@ -1038,7 +1035,7 @@ void AISkirmishPlayer::adjustBuildList(BuildListInfo *list)
 			case 8 : angle = PI; break; // 180 degrees.
 		}
 	}
-	
+
 	angle += 3*PI/4;
 
 	Real s = sin(angle);
@@ -1052,12 +1049,12 @@ void AISkirmishPlayer::adjustBuildList(BuildListInfo *list)
 			Coord3D curPos = *cur->getLocation();
 			// Transform to new coords.
 			curPos.x -= buildPos.x;
-			curPos.y -= buildPos.y;	 
+			curPos.y -= buildPos.y;
 			Real newX = curPos.x*c - curPos.y*s;
 			Real newY = curPos.y*c + curPos.x*s;
 			curPos.x = newX + startPos.x;
 			curPos.y = newY + startPos.y;
-			cur->setLocation(curPos);	 
+			cur->setLocation(curPos);
 			cur->setAngle(cur->getAngle());
 		}
 		cur = cur->getNext();
@@ -1077,7 +1074,7 @@ void AISkirmishPlayer::newMap( void )
 
 	/* Get our proper build list. */
 	AsciiString mySide = m_player->getSide();
-	DEBUG_LOG(("AI Player side is %s\n", mySide.str()));
+	DEBUG_LOG(("AI Player side is %s", mySide.str()));
 	const AISideBuildList *build = TheAI->getAiData()->m_sideBuildLists;
 	while (build) {
 		if (build->m_side == mySide) {
@@ -1089,7 +1086,7 @@ void AISkirmishPlayer::newMap( void )
 		}
 		build = build->m_next;
 	}
-	DEBUG_ASSERTLOG(build!=NULL, ("Couldn't find build list for skirmish player.\n"));
+	DEBUG_ASSERTLOG(build!=NULL, ("Couldn't find build list for skirmish player."));
 
 	// Build any with the initially built flag.
 	for( BuildListInfo *info = m_player->getBuildList(); info; info = info->getNext() )
@@ -1097,8 +1094,8 @@ void AISkirmishPlayer::newMap( void )
 		AsciiString name = info->getTemplateName();
 		if (name.isEmpty()) continue;
 		const ThingTemplate *bldgPlan = TheThingFactory->findTemplate( name );
-		if (!bldgPlan) {																											 
-			DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.\n", name.str()));
+		if (!bldgPlan) {
+			DEBUG_LOG(("*** ERROR - Build list building '%s' doesn't exist.", name.str()));
 			continue;
 		}
 		if (info->isInitiallyBuilt()) {
@@ -1184,7 +1181,7 @@ Bool AISkirmishPlayer::computeSuperweaponTarget(const SpecialPowerTemplate *powe
 void AISkirmishPlayer::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1226,7 +1223,7 @@ void AISkirmishPlayer::xfer( Xfer *xfer )
 	// right flank right defense angle
 	xfer->xferReal( &m_curRightFlankRightDefenseAngle );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1234,5 +1231,5 @@ void AISkirmishPlayer::xfer( Xfer *xfer )
 void AISkirmishPlayer::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
index 356890e0514..c2468cbfcd5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
@@ -25,7 +25,7 @@
 // AIStates.cpp
 // Implementation of AI behavior states
 // Author: Michael S. Booth, January 2002
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/ActionManager.h"
@@ -69,18 +69,13 @@
 #include "GameLogic/Module/PhysicsUpdate.h"
 #include "GameLogic/Module/StealthUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static Bool cannotPossiblyAttackObject( State *thisState, void* userData );
 
 //----------------------------------------------------------------------------------------------------------
-AICommandParms::AICommandParms(AICommandType cmd, CommandSourceType cmdSource) : 
+AICommandParms::AICommandParms(AICommandType cmd, CommandSourceType cmdSource) :
 	m_cmd(cmd),
-	m_cmdSource(cmdSource), 
+	m_cmdSource(cmdSource),
 	m_obj(NULL),
 	m_otherObj(NULL),
 	m_team(NULL),
@@ -89,7 +84,7 @@ AICommandParms::AICommandParms(AICommandType cmd, CommandSourceType cmdSource) :
 	m_intValue(0),
 	m_commandButton(NULL),
 	m_path(NULL)
-{ 
+{
 		m_pos.zero();
 		m_coords.clear();
 }
@@ -104,8 +99,8 @@ void AICommandParmsStorage::store(const AICommandParms& parms)
   m_otherObj = parms.m_otherObj ? parms.m_otherObj->getID() : INVALID_ID;
   m_teamName = parms.m_team ? parms.m_team->getName() : AsciiString::TheEmptyString;
 	m_coords = parms.m_coords;
-  m_waypoint = parms.m_waypoint; 
-  m_polygon = parms.m_polygon;     
+  m_waypoint = parms.m_waypoint;
+  m_polygon = parms.m_polygon;
   m_intValue = parms.m_intValue;       /// misc usage
   m_damage = parms.m_damage;
 	m_commandButton = parms.m_commandButton;
@@ -131,7 +126,7 @@ void AICommandParmsStorage::reconstitute(AICommandParms& parms) const
 }
 
 //----------------------------------------------------------------------------------------------------------
-void AICommandParmsStorage::doXfer(Xfer *xfer) 
+void AICommandParmsStorage::doXfer(Xfer *xfer)
 {
 	xfer->xferUser(&m_cmd, sizeof(m_cmd));
 	xfer->xferUser(&m_cmd, sizeof(m_cmdSource));
@@ -174,7 +169,7 @@ void AICommandParmsStorage::doXfer(Xfer *xfer)
 		if (triggerName.isNotEmpty()) {
 			m_polygon = TheTerrainLogic->getTriggerAreaByName(triggerName);
 		}
-	} 
+	}
 
 	xfer->xferInt(&m_intValue);
 
@@ -237,19 +232,19 @@ static Bool isSamePosition( const Coord3D *ourPos, const Coord3D *prevTargetPos,
 void AttackStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void AttackStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -257,17 +252,17 @@ void AttackStateMachine::xfer( Xfer *xfer )
 void AttackStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 static Bool inWeaponRangeObject(State *thisState, void* userData);
 
 //----------------------------------------------------------------------------------------------------------
 /**
- * Create an AI state machine. Define all of the states the machine 
+ * Create an AI state machine. Define all of the states the machine
  * can possibly be in, and set the initial (default) state.
  */
-AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiString name, Bool follow, Bool attackingObject, Bool forceAttacking ) 
+AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiString name, Bool follow, Bool attackingObject, Bool forceAttacking )
 	: StateMachine( obj, name )
 {
 	// we want to use the CONTINUE mode (not NEW) since we already have acquired the target.
@@ -276,7 +271,7 @@ AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiSt
 		StateConditionInfo(outOfWeaponRangeObject, AttackStateMachine::CHASE_TARGET, NULL),
 		StateConditionInfo(wantToSquishTarget, AttackStateMachine::CHASE_TARGET, NULL),
 		StateConditionInfo(cannotPossiblyAttackObject, EXIT_MACHINE_WITH_FAILURE, (void*)ATTACK_CONTINUED_TARGET),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// we want to use the CONTINUE mode (not NEW) since we already have acquired the target.
@@ -285,15 +280,15 @@ AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiSt
 		StateConditionInfo(outOfWeaponRangeObject, AttackStateMachine::CHASE_TARGET, NULL),
 		StateConditionInfo(cannotPossiblyAttackObject, EXIT_MACHINE_WITH_FAILURE, (void*)ATTACK_CONTINUED_TARGET_FORCED),
 		StateConditionInfo(wantToSquishTarget, AttackStateMachine::CHASE_TARGET, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	const StateConditionInfo* objectConditions = forceAttacking ? objectConditionsForced : objectConditionsNormal;
 
-	static const StateConditionInfo positionConditions[] = 
+	static const StateConditionInfo positionConditions[] =
 	{
 		StateConditionInfo(outOfWeaponRangePosition, AttackStateMachine::CHASE_TARGET, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 #ifdef STATE_MACHINE_DEBUG
@@ -302,19 +297,19 @@ AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiSt
 		if (attackingObject) fullName.concat(" object");
 		setName(fullName);
 		//setDebugOutput(true);
-#endif 
+#endif
 
 	// order matters: first state is the default state.
 	// The default is Aim rather than Approach so things that cannot move will be able to shoot
 	// things that are in range.  Things that cannot move will automatically FAILURE on approach state.
 	/*
-		This state will succeed when we are aiming a useful weapon at the victim, and fail 
+		This state will succeed when we are aiming a useful weapon at the victim, and fail
 		if the victim is dead. (Exception: if the weapon is on a turret, we don't leave this
 		state unless we get out of range.)
 	*/
-	defineState(	AttackStateMachine::AIM_AT_TARGET, 
-								newInstance(AIAttackAimAtTargetState)( this, attackingObject, forceAttacking ), 
-								AttackStateMachine::FIRE_WEAPON, 
+	defineState(	AttackStateMachine::AIM_AT_TARGET,
+								newInstance(AIAttackAimAtTargetState)( this, attackingObject, forceAttacking ),
+								AttackStateMachine::FIRE_WEAPON,
 								EXIT_MACHINE_WITH_FAILURE,
 								attackingObject ? objectConditions : positionConditions );
 
@@ -323,7 +318,7 @@ AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiSt
 		if unable to fire. However, it may be unable to fire because the target object
 		is already dead.
 	*/
-	defineState( AttackStateMachine::FIRE_WEAPON, 
+	defineState( AttackStateMachine::FIRE_WEAPON,
 								newInstance(AIAttackFireWeaponState)( this, att ),
 								AttackStateMachine::AIM_AT_TARGET,
 								AttackStateMachine::AIM_AT_TARGET,
@@ -337,56 +332,56 @@ AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiSt
 			static const StateConditionInfo portableStructureChaseConditions[] =
 			{
 				StateConditionInfo(inWeaponRangeObject, AttackStateMachine::AIM_AT_TARGET, NULL),
-				StateConditionInfo(NULL, NULL, NULL)	// keep last
+				StateConditionInfo(NULL, NULL, NULL)
 			};
 
-			/* we're a rider on a mobile object, so we can't control our motion. 
+			/* we're a rider on a mobile object, so we can't control our motion.
 				just make bogus states that always fall back into "aim".
 			*/
-			defineState(	AttackStateMachine::CHASE_TARGET, 
-										newInstance(ContinueState)(this), 
-										EXIT_MACHINE_WITH_FAILURE, 
+			defineState(	AttackStateMachine::CHASE_TARGET,
+										newInstance(ContinueState)(this),
+										EXIT_MACHINE_WITH_FAILURE,
 										EXIT_MACHINE_WITH_FAILURE,
 										portableStructureChaseConditions );
 		}
-		else if (attackingObject) 
+		else if (attackingObject)
 		{
 			/*
-				This state will pursue a target that is moving away from it.  If it is not moving away, 
+				This state will pursue a target that is moving away from it.  If it is not moving away,
 				it will drop into the AIAttackApproachTarget state.
 			*/
-			defineState(	AttackStateMachine::CHASE_TARGET, 
-										newInstance(AIAttackPursueTargetState)( this, follow, attackingObject, forceAttacking ), 
-										AttackStateMachine::APPROACH_TARGET, 
+			defineState(	AttackStateMachine::CHASE_TARGET,
+										newInstance(AIAttackPursueTargetState)( this, follow, attackingObject, forceAttacking ),
+										AttackStateMachine::APPROACH_TARGET,
 										AttackStateMachine::APPROACH_TARGET );
 
 			/*
-				This state will succeed when we have a useful weapon within range of victim, and fail 
+				This state will succeed when we have a useful weapon within range of victim, and fail
 				if the victim is dead
 			*/
-			defineState(	AttackStateMachine::APPROACH_TARGET, 
-										newInstance(AIAttackApproachTargetState)( this, follow, attackingObject, forceAttacking ), 
-										AttackStateMachine::AIM_AT_TARGET, 
+			defineState(	AttackStateMachine::APPROACH_TARGET,
+										newInstance(AIAttackApproachTargetState)( this, follow, attackingObject, forceAttacking ),
+										AttackStateMachine::AIM_AT_TARGET,
 										EXIT_MACHINE_WITH_FAILURE );
-		}	
-		else 
+		}
+		else
 		{
 			/*
-				This state will succeed when we have a useful weapon within range of victim, and fail 
+				This state will succeed when we have a useful weapon within range of victim, and fail
 				if the victim is dead
 			*/
-			defineState(	AttackStateMachine::CHASE_TARGET, 
-										newInstance(AIAttackApproachTargetState)( this, follow, attackingObject, forceAttacking ), 
-										AttackStateMachine::AIM_AT_TARGET, 
+			defineState(	AttackStateMachine::CHASE_TARGET,
+										newInstance(AIAttackApproachTargetState)( this, follow, attackingObject, forceAttacking ),
+										AttackStateMachine::AIM_AT_TARGET,
 										EXIT_MACHINE_WITH_FAILURE );
 
 			/*
-				This state will succeed when we have a useful weapon within range of victim, and fail 
+				This state will succeed when we have a useful weapon within range of victim, and fail
 				if the victim is dead
 			*/
-			defineState(	AttackStateMachine::APPROACH_TARGET, 
-										newInstance(AIAttackApproachTargetState)( this, follow, attackingObject, forceAttacking ), 
-										AttackStateMachine::AIM_AT_TARGET, 
+			defineState(	AttackStateMachine::APPROACH_TARGET,
+										newInstance(AIAttackApproachTargetState)( this, follow, attackingObject, forceAttacking ),
+										AttackStateMachine::AIM_AT_TARGET,
 										EXIT_MACHINE_WITH_FAILURE );
 		}
 
@@ -396,9 +391,9 @@ AttackStateMachine::AttackStateMachine( Object *obj, AIAttackState* att, AsciiSt
 		/*
 			This state always instantly fails, so when immobile things transition here, we bail.
 		*/
-		defineState(	AttackStateMachine::CHASE_TARGET, 
-									newInstance(FailureState)(this), 
-									EXIT_MACHINE_WITH_FAILURE, 
+		defineState(	AttackStateMachine::CHASE_TARGET,
+									newInstance(FailureState)(this),
+									EXIT_MACHINE_WITH_FAILURE,
 									EXIT_MACHINE_WITH_FAILURE );
 	}
 
@@ -468,8 +463,8 @@ static Int killEnemiesInContainer(Object* killer, Object* bldg, Int maxToKill)
 
 //-----------------------------------------------------------------------------------------------------------
 //-----------------------------------------------------------------------------------------------------------
-AIRappelState::AIRappelState( StateMachine *machine ) : State( machine, "AIRappelState" ) 
-{ 
+AIRappelState::AIRappelState( StateMachine *machine ) : State( machine, "AIRappelState" )
+{
 }
 
 //-----------------------------------------------------------------------------------------------------------
@@ -478,7 +473,7 @@ AIRappelState::AIRappelState( StateMachine *machine ) : State( machine, "AIRappe
 // ------------------------------------------------------------------------------------------------
 void AIRappelState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -489,18 +484,18 @@ void AIRappelState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
 	xfer->xferReal(&m_rappelRate);
 	xfer->xferReal(&m_destZ);
 	xfer->xferBool(&m_targetIsBldg);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIRappelState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 //-----------------------------------------------------------------------------------------------------------
 StateReturnType AIRappelState::onEnter()
 {
@@ -544,7 +539,7 @@ StateReturnType AIRappelState::update()
 {
 
 	StateReturnType result = STATE_CONTINUE;
-	
+
 	Object* obj = getMachineOwner();
 	const Coord3D* pos = obj->getPosition();
 
@@ -556,7 +551,7 @@ StateReturnType AIRappelState::update()
 		m_targetIsBldg = false;
 		m_destZ = TheTerrainLogic->getGroundHeight(pos->x, pos->y);
 	}
-	
+
 	// nuke 2d speed...
 	obj->getPhysics()->scrubVelocity2D(0);
 	// and clamp z speed to rappel rate (gravity will have accelerated us)
@@ -573,7 +568,7 @@ StateReturnType AIRappelState::update()
 		Coord3D tmp = *pos;
 		tmp.z = m_destZ;
 		obj->setPosition(&tmp);
-		
+
 		if (m_targetIsBldg)
 		{
 			DEBUG_ASSERTCRASH(TheActionManager->canEnterObject(obj, bldg, obj->getAI()->getLastCommandSource(), COMBATDROP_INTO), ("Hmm, this seems unlikely"));
@@ -581,18 +576,18 @@ StateReturnType AIRappelState::update()
 			// otherwise we enter the bldg.
 			const Int MAX_TO_KILL = 2;
 			Int numKilled = killEnemiesInContainer(obj, bldg, MAX_TO_KILL);
-			
+
 			if (numKilled > 0)
 			{
 				const FXList* fx = obj->getTemplate()->getPerUnitFX("CombatDropKillFX");
 				FXList::doFXObj(fx, bldg, NULL);
-				DEBUG_LOG(("Killing %d enemies in combat drop!\n",numKilled));
+				DEBUG_LOG(("Killing %d enemies in combat drop!",numKilled));
 			}
 
 			if (numKilled == MAX_TO_KILL)
 			{
 				obj->kill();
-				DEBUG_LOG(("Killing SELF in combat drop!\n"));
+				DEBUG_LOG(("Killing SELF in combat drop!"));
 			}
 			else
 			{
@@ -605,10 +600,10 @@ StateReturnType AIRappelState::update()
 					// this can legitimately happen if you drop into a full (or nearly full) building.
 					// let's just place the guy on the ground nearby, since it sucks to fall from the top of a building.
 					Real exitAngle = bldg->getOrientation();
-					// Garrison doesn't have reserveDoor or exitDelay, so if we do nothing, everyone will appear on top 
+					// Garrison doesn't have reserveDoor or exitDelay, so if we do nothing, everyone will appear on top
 					// of each other and get stuck inside each others' extent (except for the first guy).  So we'll
 					// scatter the start point around a little to make it better.
-					Real offset = min(obj->getGeometryInfo().getBoundingCircleRadius(), 
+					Real offset = min(obj->getGeometryInfo().getBoundingCircleRadius(),
 														bldg->getGeometryInfo().getBoundingCircleRadius());
 					Real angle = GameLogicRandomValueReal( PI, 2*PI );//Downish.
 					Coord3D startPosition = *bldg->getPosition();
@@ -618,7 +613,7 @@ StateReturnType AIRappelState::update()
 
 					obj->setPosition( &startPosition );
 					obj->setOrientation( exitAngle );
-					
+
 					FindPositionOptions options;
 					options.startAngle = (Real)(1.5 * PI);//Down.
 					options.maxRadius = 200;
@@ -676,8 +671,8 @@ void AIRappelState::onExit( StateExitType status )
 */
 AIStateMachine::AIStateMachine( Object *obj, AsciiString name ) : StateMachine( obj, name )
 {
-	DEBUG_ASSERTCRASH(getOwner(), ("An AI State Machine '%s' was constructed without an owner, please tell JKMCD", name));
-	DEBUG_ASSERTCRASH(getOwner()->getAI(), ("An AI State Machine '%s' was constructed without an AIUpdateInterface, please tell JKMCD", name));
+	DEBUG_ASSERTCRASH(getOwner(), ("An AI State Machine '%s' was constructed without an owner, please tell JKMCD", name.str()));
+	DEBUG_ASSERTCRASH(getOwner()->getAI(), ("An AI State Machine '%s' was constructed without an AIUpdateInterface, please tell JKMCD", name.str()));
 
 	m_goalPath.clear();
 	m_goalWaypoint = NULL;
@@ -696,7 +691,7 @@ AIStateMachine::AIStateMachine( Object *obj, AsciiString name ) : StateMachine(
 	defineState( AI_ATTACK_MOVE_TO,												newInstance(AIAttackMoveToState)( this ), AI_IDLE, AI_IDLE );
 	defineState( AI_ATTACKFOLLOW_WAYPOINT_PATH_AS_TEAM,					newInstance(AIAttackFollowWaypointPathState)( this, true ), AI_IDLE, AI_IDLE );
 	defineState( AI_ATTACKFOLLOW_WAYPOINT_PATH_AS_INDIVIDUALS,	newInstance(AIAttackFollowWaypointPathState)( this, false ), AI_IDLE, AI_IDLE );
-	
+
 	defineState( AI_FOLLOW_WAYPOINT_PATH_AS_TEAM,					newInstance(AIFollowWaypointPathState)( this, true ), AI_IDLE, AI_IDLE );
 	defineState( AI_FOLLOW_WAYPOINT_PATH_AS_INDIVIDUALS,	newInstance(AIFollowWaypointPathState)( this, false ), AI_IDLE, AI_IDLE );
 	defineState( AI_FOLLOW_WAYPOINT_PATH_AS_TEAM_EXACT,		newInstance(AIFollowWaypointPathExactState)( this, true ), AI_IDLE, AI_IDLE );
@@ -736,10 +731,7 @@ AIStateMachine::AIStateMachine( Object *obj, AsciiString name ) : StateMachine(
 //----------------------------------------------------------------------------------------------------------
 AIStateMachine::~AIStateMachine()
 {
-	if (m_goalSquad) 
-	{
-		deleteInstance(m_goalSquad);
-	}
+	deleteInstance(m_goalSquad);
 }
 
 
@@ -749,7 +741,7 @@ AIStateMachine::~AIStateMachine()
 void AIStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -772,7 +764,7 @@ void AIStateMachine::xfer( Xfer *xfer )
 		if (xfer->getXferMode() != XFER_LOAD)
 		{
 			pos = m_goalPath[i];
-		} 
+		}
 		xfer->xferCoord3D(&pos);
 		if (xfer->getXferMode() == XFER_LOAD)
 		{
@@ -788,7 +780,7 @@ void AIStateMachine::xfer( Xfer *xfer )
 		if (waypointName.isNotEmpty()) {
 			m_goalWaypoint = TheTerrainLogic->getWaypointByName(waypointName);
 		}
-	} 
+	}
 	Bool hasSquad = (m_goalSquad!=NULL);
 	xfer->xferBool(&hasSquad);
 	if (xfer->getXferMode() == XFER_LOAD)
@@ -796,7 +788,7 @@ void AIStateMachine::xfer( Xfer *xfer )
 		if (hasSquad && m_goalSquad==NULL) {
 			m_goalSquad = newInstance( Squad );
 		}
-	} 
+	}
 	if (hasSquad) {
 		xfer->xferSnapshot(m_goalSquad);
 	}
@@ -815,7 +807,7 @@ void AIStateMachine::xfer( Xfer *xfer )
 	}
 
 	xfer->xferUnsignedInt(&m_temporaryStateFramEnd);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -823,7 +815,7 @@ void AIStateMachine::xfer( Xfer *xfer )
 void AIStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 /**
@@ -845,9 +837,9 @@ AsciiString AIStateMachine::getCurrentStateName(void) const
 
 	if (m_temporaryState) {
 		name.concat(" /T/");
-		name.concat(m_temporaryState->getName()); 
+		name.concat(m_temporaryState->getName());
 	}
-	return name;					
+	return name;
 }
 #endif
 
@@ -858,12 +850,12 @@ AsciiString AIStateMachine::getCurrentStateName(void) const
 StateReturnType AIStateMachine::updateStateMachine()
 {
 	//-extraLogging
-	#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+	#if defined(RTS_DEBUG)
 		Bool idle = getOwner()->getAI()->isIdle();
 		if( !idle && TheGlobalData->m_extraLogging )
 			DEBUG_LOG( ("%d - %s::update() start - %s", TheGameLogic->getFrame(), getCurrentStateName().str(), getOwner()->getTemplate()->getName().str() ) );
 	#endif
-	//end -extraLogging 
+	//end -extraLogging
 
 	if (m_temporaryState)
 	{
@@ -875,14 +867,14 @@ StateReturnType AIStateMachine::updateStateMachine()
 				status = STATE_SUCCESS;
 			}
 		}
-		if (status==STATE_CONTINUE)	
+		if (status==STATE_CONTINUE)
 		{
 			//-extraLogging
-			#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+			#if defined(RTS_DEBUG)
 				if( !idle && TheGlobalData->m_extraLogging )
-					DEBUG_LOG( (" - RETURN EARLY STATE_CONTINUE\n") );
+					DEBUG_LOG( (" - RETURN EARLY STATE_CONTINUE") );
 			#endif
-			//end -extraLogging 
+			//end -extraLogging
 
 			return status;
 		}
@@ -891,8 +883,8 @@ StateReturnType AIStateMachine::updateStateMachine()
 	}
 	StateReturnType retType = StateMachine::updateStateMachine();
 
-	//-extraLogging 
-	#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+	//-extraLogging
+	#if defined(RTS_DEBUG)
 		AsciiString result;
 		if( TheGlobalData->m_extraLogging )
 		{
@@ -910,12 +902,12 @@ StateReturnType AIStateMachine::updateStateMachine()
 				default:
 					result.format( "UNKNOWN %d", retType );
 					break;
-			}	
+			}
 			if( !idle )
-				DEBUG_LOG( (" - RETURNING %s\n", result.str() ) );
+				DEBUG_LOG( (" - RETURNING %s", result.str() ) );
 		}
 	#endif
-	//end -extraLogging 
+	//end -extraLogging
 
 	return retType;
 }
@@ -930,22 +922,22 @@ StateReturnType AIStateMachine::setTemporaryState( StateID newStateID, Int frame
 	// extract the state associated with the given ID
 	State *newState = internalGetState( newStateID );
 #ifdef STATE_MACHINE_DEBUG
-	if (getWantsDebugOutput()) 
+	if (getWantsDebugOutput())
 	{
 		StateID curState = INVALID_STATE_ID;
 		if (m_temporaryState) {
 			curState = m_temporaryState->getID();
 		}
-		DEBUG_LOG(("%d '%s' -(TEMP)- '%s' %x exit ", TheGameLogic->getFrame(), getOwner()->getTemplate()->getName().str(), getName().str(), this));
+		DEBUG_LOG_RAW(("%d '%s' -(TEMP)- '%s' %x exit ", TheGameLogic->getFrame(), getOwner()->getTemplate()->getName().str(), getName().str(), this));
 		if (m_temporaryState) {
-			DEBUG_LOG((" '%s' ", m_temporaryState->getName().str()));
+			DEBUG_LOG_RAW((" '%s' ", m_temporaryState->getName().str()));
 		} else {
-			DEBUG_LOG((" INVALID_STATE_ID "));
+			DEBUG_LOG_RAW((" INVALID_STATE_ID "));
 		}
 		if (newState) {
-			DEBUG_LOG(("enter '%s' \n", newState->getName().str()));
+			DEBUG_LOG(("enter '%s'", newState->getName().str()));
 		} else {
-			DEBUG_LOG(("to INVALID_STATE\n"));
+			DEBUG_LOG(("to INVALID_STATE"));
 		}
 	}
 #endif
@@ -967,7 +959,7 @@ StateReturnType AIStateMachine::setTemporaryState( StateID newStateID, Int frame
 		if (frameLimitCoount>FRAME_COUNT_MAX) {
 			frameLimitCoount = FRAME_COUNT_MAX;
 		}
-		m_temporaryStateFramEnd = TheGameLogic->getFrame()+frameLimitCoount; 
+		m_temporaryStateFramEnd = TheGameLogic->getFrame()+frameLimitCoount;
 		return ret;
 	}
 	return STATE_FAILURE;
@@ -978,8 +970,8 @@ StateReturnType AIStateMachine::setTemporaryState( StateID newStateID, Int frame
  * Add a point to a simple path
  */
 void AIStateMachine::addToGoalPath( const Coord3D *pathPoint)
-{	
-	if (m_goalPath.size()==0) {
+{
+	if (m_goalPath.empty()) {
 		m_goalPath.push_back(*pathPoint);
 	}	else {
 		Coord3D *finalPoint = &m_goalPath[ m_goalPath.size() - 1 ];
@@ -1004,7 +996,7 @@ const Coord3D *AIStateMachine::getGoalPathPosition( Int i ) const
 
 //----------------------------------------------------------------------------------------------------------
 /**
- * Set the current goal waypoint. If we reach this waypoint and there 
+ * Set the current goal waypoint. If we reach this waypoint and there
  * are connections to further points, continue on.
  */
 void AIStateMachine::setGoalWaypoint( const Waypoint *way )
@@ -1097,7 +1089,7 @@ Squad *AIStateMachine::getGoalSquad( void )
 
 // State transition conditions ----------------------------------------------------------------------------
 /**
- * Return true if the machine's owner's current weapon's range 
+ * Return true if the machine's owner's current weapon's range
  * cannot reach the goalObject.
  */
 Bool outOfWeaponRangeObject( State *thisState, void* userData )
@@ -1106,11 +1098,11 @@ Bool outOfWeaponRangeObject( State *thisState, void* userData )
 	Object *victim = thisState->getMachineGoalObject();
 	Weapon *weapon = obj->getCurrentWeapon();
 
-	CRCDEBUG_LOG(("outOfWeaponRangeObject()\n"));
+	CRCDEBUG_LOG(("outOfWeaponRangeObject()"));
 	if (victim && weapon)
 	{
 		Bool viewBlocked = false;
-		AIUpdateInterface *ai = obj->getAI();	 
+		AIUpdateInterface *ai = obj->getAI();
 		Bool onGround = true;
 		if (ai) {
 			onGround = ai->isDoingGroundMovement();
@@ -1132,21 +1124,21 @@ Bool outOfWeaponRangeObject( State *thisState, void* userData )
 		}
 		// srj sez: at tiny ranges, isAttackViewBlockedByObstacle() can return false positives,
 		// so just skip it for contact weapons
-		if (victim && !weapon->isContactWeapon() && onGround && !victim->isSignificantlyAboveTerrain()) 
+		if (victim && !weapon->isContactWeapon() && onGround && !victim->isSignificantlyAboveTerrain())
 		{
 			viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(obj, *obj->getPosition(), victim, *victim->getPosition());
-		}	 
+		}
 		// A weapon with leech range temporarily has unlimited range and is locked onto its target.
-		if (!weapon->hasLeechRange() && viewBlocked) 
+		if (!weapon->hasLeechRange() && viewBlocked)
 		{
-			//CRCDEBUG_LOG(("outOfWeaponRangeObject() - object %d (%s) view is blocked for attacking %d (%s)\n",
+			//CRCDEBUG_LOG(("outOfWeaponRangeObject() - object %d (%s) view is blocked for attacking %d (%s)",
 			//	obj->getID(), obj->getTemplate()->getName().str(),
 			//	victim->getID(), victim->getTemplate()->getName().str()));
 			return true;
 		}
 		if (!weapon->hasLeechRange() && !weapon->isWithinAttackRange(obj, victim))
 		{
-			//CRCDEBUG_LOG(("outOfWeaponRangeObject() - object %d (%s) is out of range for attacking %d (%s)\n",
+			//CRCDEBUG_LOG(("outOfWeaponRangeObject() - object %d (%s) is out of range for attacking %d (%s)",
 			//	obj->getID(), obj->getTemplate()->getName().str(),
 			//	victim->getID(), victim->getTemplate()->getName().str()));
 			return true;
@@ -1175,7 +1167,7 @@ Bool wantToSquishTarget( State *thisState, void* userData )
 		{
 			// I can only decide to crush-attack if I am attacking with a turreted weapon.
 			if (TheAI->getAiData()->m_aiCrushesInfantry) {
-				if (obj && obj->getControllingPlayer() && 
+				if (obj && obj->getControllingPlayer() &&
 					obj->getControllingPlayer()->getPlayerType()==PLAYER_COMPUTER) {
 					if (obj->canCrushOrSquish(victim)) {
 						if (!obj->isKindOf(KINDOF_DONT_AUTO_CRUSH_INFANTRY)) {
@@ -1220,10 +1212,10 @@ Bool outOfWeaponRangePosition( State *thisState, void* userData )
 		}
 
 		Bool viewBlocked = false;
-		if (onGround) 
+		if (onGround)
 		{
 			viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(obj, *obj->getPosition(), NULL, *pos);
-		}	 
+		}
 		if (viewBlocked)
 		{
 			return true;
@@ -1250,7 +1242,7 @@ static Bool cannotPossiblyAttackObject( State *thisState, void* userData )
 	{
 		if( !obj->isAbleToAttack() )
 		{
-			return TRUE; 
+			return TRUE;
 		}
 		CanAttackResult result = obj->getAbleToAttackSpecificObject( attackType, victim, obj->getAI()->getLastCommandSource() );
 		if( result != ATTACKRESULT_POSSIBLE && result != ATTACKRESULT_POSSIBLE_AFTER_MOVING )
@@ -1270,8 +1262,8 @@ static Bool cannotPossiblyAttackObject( State *thisState, void* userData )
 const UnsignedInt IDLE_COUNTDOWN_DELAY = (LOGICFRAMES_PER_SECOND * 2);
 
 //----------------------------------------------------------------------------------------------
-AIIdleState::AIIdleState( StateMachine *machine, AIIdleState::AIIdleTargetingType shouldLookForTargets ) : 
-	State( machine,"AIIdleState"), 
+AIIdleState::AIIdleState( StateMachine *machine, AIIdleState::AIIdleTargetingType shouldLookForTargets ) :
+	State( machine,"AIIdleState"),
 	m_shouldLookForTargets(shouldLookForTargets == AIIdleState::LOOK_FOR_TARGETS)
 {
 		m_inited = FALSE;
@@ -1283,7 +1275,7 @@ AIIdleState::AIIdleState( StateMachine *machine, AIIdleState::AIIdleTargetingTyp
 // ------------------------------------------------------------------------------------------------
 void AIIdleState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1294,18 +1286,18 @@ void AIIdleState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
 	xfer->xferUnsignedShort(&m_initialSleepOffset);
 	xfer->xferBool(&m_shouldLookForTargets);
 	xfer->xferBool(&m_inited);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIIdleState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 //----------------------------------------------------------------------------------------------
 /**
  * Stake out our space.
@@ -1318,7 +1310,7 @@ StateReturnType AIIdleState::onEnter()
 	AIUpdateInterface *ai = obj->getAI();
 
 	// We could possibly not have ai here if we were constructed this frame. Strange but true. :-<
-	if (ai) 
+	if (ai)
 		ai->resetNextMoodCheckTime();
 
 	m_inited = true;
@@ -1346,7 +1338,7 @@ void AIIdleState::doInitIdleState()
 	const Locomotor* loco = ai->getCurLocomotor();
 	Bool ultraAccurate = (loco != NULL && loco->isUltraAccurate());
 #define NO_STOP_AND_SLIDE
-	if (ai->isIdle() && ai->isDoingGroundMovement()) 
+	if (ai->isIdle() && ai->isDoingGroundMovement())
 	{
 		/*
 
@@ -1354,11 +1346,11 @@ void AIIdleState::doInitIdleState()
 
 			answer from jba:
 
-			If a unit is moving, and you hit stop, it forces it into the idle state.  
-			Depending where it is, it may be between pathfind grids.  
-			This is a bad thing. 
-			So it "cheat moves", to the nearest grid. 
-			Also, for locos the "close enough" distance is 1 or so. 
+			If a unit is moving, and you hit stop, it forces it into the idle state.
+			Depending where it is, it may be between pathfind grids.
+			This is a bad thing.
+			So it "cheat moves", to the nearest grid.
+			Also, for locos the "close enough" distance is 1 or so.
 			So it moves the rest of the way to it's goal location by cheating.
 
 		*/
@@ -1368,7 +1360,7 @@ void AIIdleState::doInitIdleState()
 		if (goalPos.x || goalPos.y || goalPos.z)
 		{
 			TheAI->pathfinder()->updateGoal(obj, &goalPos, obj->getLayer());
-			if (!ultraAccurate && TheAI->pathfinder()->goalPosition(obj, &goalPos)) 
+			if (!ultraAccurate && TheAI->pathfinder()->goalPosition(obj, &goalPos))
 			{
 				if (TheGameLogic->getFrame()<=1) {
 					obj->setPosition(&goalPos);
@@ -1383,7 +1375,7 @@ void AIIdleState::doInitIdleState()
 	}
 
 	ai->setLocomotorGoalNone();
-	ai->setCurrentVictim(NULL);	 
+	ai->setCurrentVictim(NULL);
 }
 
 //----------------------------------------------------------------------------------------------
@@ -1409,10 +1401,10 @@ StateReturnType AIIdleState::update()
 		AIUpdateInterface *ai = obj->getAI();
 
 		// do repulsor logic
-		if (obj->isKindOf(KINDOF_CAN_BE_REPULSED) && ai->isIdle()) 
+		if (obj->isKindOf(KINDOF_CAN_BE_REPULSED) && ai->isIdle())
 		{
 			Object* enemy = TheAI->findClosestRepulsor(obj, obj->getVisionRange());
-			if (enemy) 
+			if (enemy)
 			{
 				getMachine()->setState(AI_MOVE_AWAY_FROM_REPULSORS);
 				// since we just changed the state, it doesn't really matter what we return here.
@@ -1429,7 +1421,7 @@ StateReturnType AIIdleState::update()
 			return STATE_CONTINUE;
 		}
 
-		
+
 		if (! obj->isDisabledByType( DISABLED_PARALYZED ) &&
 				! obj->isDisabledByType( DISABLED_UNMANNED ) &&
 				! obj->isDisabledByType( DISABLED_EMP ) &&
@@ -1442,7 +1434,7 @@ StateReturnType AIIdleState::update()
 			{
 				// If we're supposed to attack based on mood, etc, then we will do so.
 				Object* enemy = ai->getNextMoodTarget( true, true );
-				if (enemy) 
+				if (enemy)
 				{
 	 				ai->aiAttackObject(enemy, NO_MAX_SHOTS_LIMIT, CMD_FROM_AI);
 					// weird but true. return state_continue, because if we're here, we're actually an attack state
@@ -1465,8 +1457,8 @@ StateReturnType AIIdleState::update()
 				m_initialSleepOffset = oldSleepOffset;
 			}
 		}
-	}  // end if, should look for targets
-	
+	}
+
 	return STATE_SLEEP(timeToSleep);
 }
 
@@ -1478,7 +1470,7 @@ StateReturnType AIDeadState::onEnter()
 {
 	Object *obj = getMachineOwner();
 
-	// How can an object be NULL here? I don't think it actually can, but this check must be 
+	// How can an object be NULL here? I don't think it actually can, but this check must be
 	// here for a reason. - jkmcd
 	if (obj)
 	{
@@ -1529,7 +1521,7 @@ StateReturnType AIDeadState::update()
 		if (phys)
 		{
 			// we want 'em to stop, but looks wonky if they stop dead in their tracks in onEnter.
-			// this slows 'em down quickly 
+			// this slows 'em down quickly
 			const Real FACTOR = 0.8f;	// 0.8 ^ 30 == 0.012, so they slow to 4% of speed over 1 sec
 			Real vel = phys->getVelocityMagnitude();
 			phys->scrubVelocity2D(vel * FACTOR);
@@ -1551,7 +1543,7 @@ void AIDeadState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIInternalMoveToState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1562,7 +1554,7 @@ void AIInternalMoveToState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	xfer->xferCoord3D(&m_goalPosition);
 	xfer->xferUser(&m_goalLayer, sizeof(m_goalLayer));
@@ -1571,7 +1563,7 @@ void AIInternalMoveToState::xfer( Xfer *xfer )
 	xfer->xferUnsignedInt(&m_pathTimestamp);
 	xfer->xferUnsignedInt(&m_blockedRepathTimestamp);
 	xfer->xferBool(&m_adjustDestinations);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1579,10 +1571,10 @@ void AIInternalMoveToState::xfer( Xfer *xfer )
 void AIInternalMoveToState::loadPostProcess( void )
 {
 	startMoveSound();
-}  // end loadPostProcess
+}
 
-Bool AIInternalMoveToState::getAdjustsDestination() const 
-{ 
+Bool AIInternalMoveToState::getAdjustsDestination() const
+{
 	const Object *obj = getMachineOwner();
 	if (obj->testStatus(OBJECT_STATUS_PARACHUTING))
 		return false;
@@ -1591,11 +1583,11 @@ Bool AIInternalMoveToState::getAdjustsDestination() const
 	if (ai && !ai->isAllowedToAdjustDestination())
 		return false;
 
-	return m_adjustDestinations; 
+	return m_adjustDestinations;
 }
 
 /**
- * (Re)compute a path to the goal position, if we are on our own, 
+ * (Re)compute a path to the goal position, if we are on our own,
  * or we are the leader of a group.
  */
 Bool AIInternalMoveToState::computePath()
@@ -1605,7 +1597,7 @@ Bool AIInternalMoveToState::computePath()
 
 	m_waitingForPath = true;
 	ai->requestPath(&m_goalPosition, getAdjustsDestination());
-	ai->friend_startingMove(); 
+	ai->friend_startingMove();
 	return true;
 }
 
@@ -1627,13 +1619,13 @@ StateReturnType AIInternalMoveToState::onEnter()
 
 	if (ai->getCurLocomotor()) {
 		ai->getCurLocomotor()->startMove();
-		if (ai->getCurLocomotor()->isUltraAccurate()) 
+		if (ai->getCurLocomotor()->isUltraAccurate())
 		{
 			setAdjustsDestination(false); // if we're being ultra accurate, we can't adjust the destination. jba.
 		}
 	}
 	m_tryOneMoreRepath = true;  // We may try one more repath after the first one is finished.
-	ai->friend_startingMove(); 
+	ai->friend_startingMove();
 
 	// get object physics state
 	PhysicsBehavior *physics = obj->getPhysics();
@@ -1645,23 +1637,23 @@ StateReturnType AIInternalMoveToState::onEnter()
 		//instead of moving.
 		Int cellX = REAL_TO_INT( obj->getPosition()->x / PATHFIND_CELL_SIZE );
 		Int cellY = REAL_TO_INT( obj->getPosition()->y / PATHFIND_CELL_SIZE );
-		
+
 		PathfindCell* cell = TheAI->pathfinder()->getCell( obj->getLayer(), cellX, cellY );
 		ModelConditionFlagType modelConditionFlag = (cell && cell->getType() != PathfindCell::CELL_CLIFF) ? MODELCONDITION_MOVING : MODELCONDITION_CLIMBING;
 		obj->setModelConditionState( modelConditionFlag );
 	}
 	// This is a classic January 2 type of hack
-	// Since the worker can go into its attack modelcondition in AIAttack::OnEnter(), 
-	// it needs to get its moving modelcondition set timely enough to trigger a transition 
+	// Since the worker can go into its attack modelcondition in AIAttack::OnEnter(),
+	// it needs to get its moving modelcondition set timely enough to trigger a transition
 	// from conditionX into ATTACKING|MOVING... Thanks for reading, MLorenzen,  Jan 2, 2003
 	else if ( obj->isKindOf( KINDOF_DOZER ) && obj->isKindOf( KINDOF_HARVESTER ) )
 		obj->setModelConditionState( MODELCONDITION_MOVING );
 
 
 
-	if( getAdjustsDestination() && !obj->testStatus( OBJECT_STATUS_RIDER8 ) ) 
+	if( getAdjustsDestination() && !obj->testStatus( OBJECT_STATUS_RIDER8 ) )
 	{
-		if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) 
+		if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition))
 		{
 			TheAI->pathfinder()->snapClosestGoalPosition(obj, &m_goalPosition);
 		}
@@ -1669,15 +1661,15 @@ StateReturnType AIInternalMoveToState::onEnter()
 	}
 
 	// request a path to the destination
-	if (!computePath()) 
+	if (!computePath())
 	{
 		ai->friend_endingMove();
 		return STATE_FAILURE;
 	}
 
-	// Target to stop at the end of this path.  
+	// Target to stop at the end of this path.
 	// This value will be overriden by the FollowWaypoint ai state.
-	ai->setPathExtraDistance(0); 
+	ai->setPathExtraDistance(0);
 	ai->setDesiredSpeed( FAST_AS_POSSIBLE );
 
 	startMoveSound();
@@ -1694,12 +1686,12 @@ void AIInternalMoveToState::startMoveSound(void)
 	if (objBody && IS_CONDITION_WORSE(objBody->getDamageState(), BODY_DAMAGED))
 	{
 		AudioEventRTS soundEventMoveDamaged = *obj->getTemplate()->getSoundMoveStartDamaged();
-		if (!soundEventMoveDamaged.getEventName().isEmpty()) 
+		if (!soundEventMoveDamaged.getEventName().isEmpty())
 		{
 			soundEventMoveDamaged.setObjectID(obj->getID());
 			TheAudio->addAudioEvent( &soundEventMoveDamaged );
-		} 
-		else 
+		}
+		else
 		{
 			soundEventMoveDamaged = *obj->getTemplate()->getSoundMoveLoopDamaged();
 			if (!soundEventMoveDamaged.getEventName().isEmpty())
@@ -1708,17 +1700,17 @@ void AIInternalMoveToState::startMoveSound(void)
 				m_ambientPlayingHandle = TheAudio->addAudioEvent( &soundEventMoveDamaged );
 			}
 		}
-	} 
-	else 
+	}
+	else
 	{
 		AudioEventRTS soundEventMove = *obj->getTemplate()->getSoundMoveStart();
 		soundEventMove.setObjectID(obj->getID());
 
-		if (!soundEventMove.getEventName().isEmpty()) 
+		if (!soundEventMove.getEventName().isEmpty())
 		{
 			TheAudio->addAudioEvent( &soundEventMove );
-		} 
-		else 
+		}
+		else
 		{
 			soundEventMove = *obj->getTemplate()->getSoundMoveLoop();
 			soundEventMove.setObjectID(obj->getID());
@@ -1746,12 +1738,12 @@ void AIInternalMoveToState::onExit( StateExitType status )
 	// (This is why destructors should not do game logic)
 	if (ai) {
 		ai->friend_endingMove();
-		DEBUG_ASSERTLOG(obj->getTeam(), ("AIInternalMoveToState::onExit obj has NULL team.\n"));
-		if (obj->getTeam() && ai->isDoingGroundMovement() && ai->getCurLocomotor() && 
+		DEBUG_ASSERTLOG(obj->getTeam(), ("AIInternalMoveToState::onExit obj has NULL team."));
+		if (obj->getTeam() && ai->isDoingGroundMovement() && ai->getCurLocomotor() &&
 								ai->getCurLocomotor()->isUltraAccurate()) {
 			Real dx = m_goalPosition.x-obj->getPosition()->x;
 			Real dy = m_goalPosition.y-obj->getPosition()->y;
-			if (dx*dx+dy*dy<PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F) 
+			if (dx*dx+dy*dy<PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F)
 			{
 				// We are doing accurate ground movement, so make sure we end exactly at the goal.
 				ai->setFinalPosition(&m_goalPosition);
@@ -1784,7 +1776,7 @@ StateReturnType AIInternalMoveToState::update()
 	//}
 
 	Path *thePath = ai->getPath();
-	if (m_waitingForPath) 
+	if (m_waitingForPath)
 	{
 		// bump the timer.
 		m_pathTimestamp = TheGameLogic->getFrame();
@@ -1792,7 +1784,7 @@ StateReturnType AIInternalMoveToState::update()
 			/// @todo srj -- find a way to sleep for a number of frames here, if possible
 			return STATE_CONTINUE;
 		}
-		if (thePath==NULL) 
+		if (thePath==NULL)
 		{
 			//Kris: 7/01/03 (Temporary debug hook for units not being able to leave maps)
 			if( blah )
@@ -1823,17 +1815,17 @@ StateReturnType AIInternalMoveToState::update()
 		blocked = true;
 		m_blockedRepathTimestamp = TheGameLogic->getFrame();
 		// Intense debug logging jba.
-		//DEBUG_LOG(("Info - Blocked - recomputing.\n"));
+		//DEBUG_LOG(("Info - Blocked - recomputing."));
 	}
 
 	//Determine if we are on a cliff cell... if so, use the climbing model condition
 	//instead of moving.
 	Int cellX = REAL_TO_INT( obj->getPosition()->x / PATHFIND_CELL_SIZE );
 	Int cellY = REAL_TO_INT( obj->getPosition()->y / PATHFIND_CELL_SIZE );
-	
+
 	PathfindCell* cell = TheAI->pathfinder()->getCell( obj->getLayer(), cellX, cellY );
 	ModelConditionFlagType setConditionFlag = MODELCONDITION_MOVING;
-	// Totally hacky set of conditions to make col. burton's monkey ass not slide down 
+	// Totally hacky set of conditions to make col. burton's monkey ass not slide down
 	// the cliffs backwards.  This could use some improvement at some point.  jba. 31DEC2002
 	if (cell && cell->getType() == PathfindCell::CELL_CLIFF && !cell->getPinched()) {
 
@@ -1845,11 +1837,11 @@ StateReturnType AIInternalMoveToState::update()
 			obj->clearModelConditionState( MODELCONDITION_RAPPELLING );
 		}
 	}
-	if (ai->getNumFramesBlocked()>LOGICFRAMES_PER_SECOND/4) 
+	if (ai->getNumFramesBlocked()>LOGICFRAMES_PER_SECOND/4)
 	{
 		obj->clearModelConditionState( MODELCONDITION_MOVING );
-	}	
-	else 
+	}
+	else
 	{
 		//Clear climbing if modelConditionFlag is not climbing
 		if( setConditionFlag == MODELCONDITION_MOVING )
@@ -1873,7 +1865,7 @@ StateReturnType AIInternalMoveToState::update()
 		}
 	}
 
-	if (thePath != NULL) 
+	if (thePath != NULL)
 		ai->setLocomotorGoalPositionOnPath();
 
 	// if our goal has moved, recompute our path
@@ -1882,7 +1874,7 @@ StateReturnType AIInternalMoveToState::update()
 		if (forceRecompute || !isSamePosition(obj->getPosition(), &m_pathGoalPosition, &m_goalPosition ))
 		{
 			// goal moved - repath
-			if (!computePath()) 
+			if (!computePath())
 			{
 				//Kris: 7/01/03 (Temporary debug hook for units not being able to leave maps)
 				if( blah )
@@ -1894,7 +1886,7 @@ StateReturnType AIInternalMoveToState::update()
 
 			// srj sez: must re-set setLocoGoal after computePath, since computePath
 			// can set the loco goal to NONE...
-			if (ai->getPath() != NULL) 
+			if (ai->getPath() != NULL)
 				ai->setLocomotorGoalPositionOnPath();
 			else
 			{
@@ -1907,11 +1899,11 @@ StateReturnType AIInternalMoveToState::update()
 	// Check if we have reached our destination
 	//
 	Real onPathDistToGoal = ai->getLocomotorDistanceToGoal();
-	//DEBUG_LOG(("onPathDistToGoal = %f %s\n",onPathDistToGoal, obj->getTemplate()->getName().str()));
+	//DEBUG_LOG(("onPathDistToGoal = %f %s",onPathDistToGoal, obj->getTemplate()->getName().str()));
 	if (ai->getCurLocomotor() && (onPathDistToGoal < ai->getCurLocomotor()->getCloseEnoughDist()))
 	{
 		if (ai->isDoingGroundMovement()) {
-			// sanity check 
+			// sanity check
 			Coord3D delta;
 			Coord3D goalPos = m_goalPosition;
 			if (ai->getPath()->getLastNode()) {
@@ -1921,17 +1913,17 @@ StateReturnType AIInternalMoveToState::update()
 			delta.y = obj->getPosition()->y - goalPos.y;
 			delta.z = 0;
 			if (delta.length() > 4*PATHFIND_CELL_SIZE_F) {
-				//DEBUG_LOG(("AIInternalMoveToState Trying to finish early.  Continuing...\n"));
+				//DEBUG_LOG(("AIInternalMoveToState Trying to finish early.  Continuing..."));
 				onPathDistToGoal = ai->getLocomotorDistanceToGoal();
 				return STATE_CONTINUE;
 			}
 		}
 		// we have reached the end of the path
-		if (getAdjustsDestination()) 
+		if (getAdjustsDestination())
 		{
 			ai->setLocomotorGoalNone();
 		}
-		DEBUG_ASSERTLOG(!getMachine()->getWantsDebugOutput(), ("AIInternalMoveToState::update: reached end of path, exiting state with success\n"));
+		DEBUG_ASSERTLOG(!getMachine()->getWantsDebugOutput(), ("AIInternalMoveToState::update: reached end of path, exiting state with success"));
 		//Kris: 7/01/03 (Temporary debug hook for units not being able to leave maps)
 		if( blah )
 		{
@@ -1969,19 +1961,19 @@ class AIAttackMoveStateMachine : public StateMachine
 void AIAttackMoveStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void AIAttackMoveStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1989,7 +1981,7 @@ void AIAttackMoveStateMachine::xfer( Xfer *xfer )
 void AIAttackMoveStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //-----------------------------------------------------------------------------------------------------------
 AIAttackMoveStateMachine::AIAttackMoveStateMachine(Object *owner, AsciiString name) : StateMachine(owner, name)
@@ -2009,7 +2001,7 @@ AIAttackMoveStateMachine::~AIAttackMoveStateMachine()
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 
-//  
+//
 // note - has no crc/xfer as has no member vars. jba.
 
 //-------------------------------------------------------------------------------------------------
@@ -2034,9 +2026,9 @@ StateReturnType AIMoveToState::onEnter()
 	//If we have a goal object and are trying to ignore it as an obstacle...
 	//This is used in the case of units trying to get really close.
 	AIUpdateInterface *ai = getMachineOwner()->getAI();
-	if( getMachineGoalObject() ) 
+	if( getMachineGoalObject() )
 	{
-		if( ai && getMachineGoalObject()->getID() == ai->getIgnoredObstacleID() ) 
+		if( ai && getMachineGoalObject()->getID() == ai->getIgnoredObstacleID() )
 		{
 			setAdjustsDestination( false );
 		}
@@ -2121,7 +2113,7 @@ StateReturnType AIMoveToState::update()
 			m_goalPosition.y += dir.y*leadDistance;
 			m_goalPosition.z += dir.z*leadDistance;
 		}
-		//DEBUG_LOG(("update goal pos to %f %f %f\n",m_goalPosition.x,m_goalPosition.y,m_goalPosition.z));
+		//DEBUG_LOG(("update goal pos to %f %f %f",m_goalPosition.x,m_goalPosition.y,m_goalPosition.z));
 	} else {
 		Bool isMissile = obj->isKindOf(KINDOF_PROJECTILE);
 		if (isMissile) {
@@ -2142,7 +2134,7 @@ StateReturnType AIMoveToState::update()
 //----------------------------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------------------------
 
-//  
+//
 // note - has no crc/xfer as has no member vars. jba.
 
 //----------------------------------------------------------------------------------------------------------
@@ -2161,7 +2153,7 @@ StateReturnType AIMoveOutOfTheWayState::onEnter()
 }
 
 //----------------------------------------------------------------------------------------------------------
-Bool AIMoveOutOfTheWayState::computePath() 
+Bool AIMoveOutOfTheWayState::computePath()
 {
 	Object *obj = getMachineOwner();
 	AIUpdateInterface *ai = obj->getAI();
@@ -2205,7 +2197,7 @@ void AIMoveOutOfTheWayState::onExit( StateExitType status )
 void AIMoveAndTightenState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -2216,12 +2208,12 @@ void AIMoveAndTightenState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIInternalMoveToState::xfer(xfer);
 	xfer->xferInt(&m_okToRepathTimes);
 	xfer->xferBool(&m_checkForPath);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2229,7 +2221,7 @@ void AIMoveAndTightenState::xfer( Xfer *xfer )
 void AIMoveAndTightenState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIMoveAndTightenState::onEnter()
@@ -2247,7 +2239,7 @@ StateReturnType AIMoveAndTightenState::onEnter()
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIMoveAndTightenState::update()
-{		 
+{
 	if (m_checkForPath) {
 		Object *obj = getMachineOwner();
 		AIUpdateInterface *ai = obj->getAI();
@@ -2261,7 +2253,7 @@ StateReturnType AIMoveAndTightenState::update()
 }
 
 //----------------------------------------------------------------------------------------------------------
-Bool AIMoveAndTightenState::computePath() 
+Bool AIMoveAndTightenState::computePath()
 {
 	Object *obj = getMachineOwner();
 	AIUpdateInterface *ai = obj->getAI();
@@ -2272,7 +2264,7 @@ Bool AIMoveAndTightenState::computePath()
 			ai->requestPath(&m_goalPosition, true);
 			return true;
 		}
-		//DEBUG_LOG(("AIMoveAndTightenState::computePath - stuck, failing.\n"));
+		//DEBUG_LOG(("AIMoveAndTightenState::computePath - stuck, failing."));
 		return false;		 // don't repath for now.  jba.
 	}
 	return true; // just use the existing path.  See above.
@@ -2284,7 +2276,7 @@ Bool AIMoveAndTightenState::computePath()
 //----------------------------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------------------------
 
-StateReturnType AIMoveAwayFromRepulsorsState::onEnter()	  
+StateReturnType AIMoveAwayFromRepulsorsState::onEnter()
 {
 	setAdjustsDestination(false);
 	Object *obj = getMachineOwner();
@@ -2308,7 +2300,7 @@ StateReturnType AIMoveAwayFromRepulsorsState::onEnter()
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIMoveAwayFromRepulsorsState::update()
-{		 
+{
 	if (m_checkForPath) {
 		Object *obj = getMachineOwner();
 		AIUpdateInterface *ai = obj->getAI();
@@ -2323,8 +2315,8 @@ StateReturnType AIMoveAwayFromRepulsorsState::update()
 }
 
 //----------------------------------------------------------------------------------------------------------
-Bool AIMoveAwayFromRepulsorsState::computePath() 
-{	
+Bool AIMoveAwayFromRepulsorsState::computePath()
+{
 	if (m_okToRepathTimes>0) {
 		m_okToRepathTimes--;
 		return true;
@@ -2354,7 +2346,7 @@ void AIMoveAwayFromRepulsorsState::onExit( StateExitType status )
  * 2. The other unit is moving.
  * 3. The other unit is moving away from us.
  */
-static Bool canPursue(Object *source, Weapon *weapon, Object *victim) 
+static Bool canPursue(Object *source, Weapon *weapon, Object *victim)
 {
 	/* This state is only used if the target is moving away from us, and has physics. */
 	if (!victim->getPhysics()) {
@@ -2363,7 +2355,7 @@ static Bool canPursue(Object *source, Weapon *weapon, Object *victim)
 	AIUpdateInterface *ai = source->getAI();
 	if (!ai) {
 		return false;
-	}	
+	}
 
 	// Have to have a turret to pursue.
 	WhichTurretType tur = ai->getWhichTurretForCurWeapon();
@@ -2372,7 +2364,7 @@ static Bool canPursue(Object *source, Weapon *weapon, Object *victim)
 	}
 
 	if (TheAI->getAiData()->m_aiCrushesInfantry) {
-		if ( source->getControllingPlayer() && 
+		if ( source->getControllingPlayer() &&
 			(source->getControllingPlayer()->getPlayerType() == PLAYER_COMPUTER) &&
 			source->canCrushOrSquish(victim) ) {
 			return true;	// Always pursue if we can squish.
@@ -2415,19 +2407,19 @@ Bool AIAttackApproachTargetState::computePath()
 	if( getMachineOwner()->isMobile() == false )
 		return false;
 
-	//CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - begin for object %d\n", getMachineOwner()->getID()));
+	//CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - begin for object %d", getMachineOwner()->getID()));
 
 	AIUpdateInterface *ai = getMachineOwner()->getAI();
 
-	if (ai->isBlockedAndStuck()) 
+	if (ai->isBlockedAndStuck())
 	{
 		forceRepath = true;
 		// Intense logging. jba
-		//CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - stuck, recomputing for object %d\n", getMachineOwner()->getID()));
+		//CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - stuck, recomputing for object %d", getMachineOwner()->getID()));
 	}
 	if (m_waitingForPath) return true;
 
-	if (!forceRepath && ai->getPath()==NULL && !ai->isWaitingForPath()) 
+	if (!forceRepath && ai->getPath()==NULL && !ai->isWaitingForPath())
 	{
 		forceRepath = true;
 	}
@@ -2436,7 +2428,7 @@ Bool AIAttackApproachTargetState::computePath()
 	/// @todo Unify recomputation conditions & account for obj ID so everyone doesnt compute on the same frame (MSB)
 	if (!forceRepath && TheGameLogic->getFrame() - m_approachTimestamp < MIN_RECOMPUTE_TIME)
 	{
-		//CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because of min time for object %d\n", getMachineOwner()->getID()));
+		//CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because of min time for object %d", getMachineOwner()->getID()));
 		return true;
 	}
 
@@ -2450,26 +2442,26 @@ Bool AIAttackApproachTargetState::computePath()
 		// if our victim's position hasn't changed, don't re-path
 		if (!forceRepath && isSamePosition(source->getPosition(), &m_prevVictimPos, getMachineGoalObject()->getPosition() ))
 		{
-			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because victim in same place for object %d\n", getMachineOwner()->getID()));
+			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because victim in same place for object %d", getMachineOwner()->getID()));
 			return true;
 		}
 
 		Weapon* weapon = source->getCurrentWeapon();
-		if (!weapon) 
+		if (!weapon)
 		{
-			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because of no weapon for object %d\n", getMachineOwner()->getID()));
+			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because of no weapon for object %d", getMachineOwner()->getID()));
 			return false;
 		}
 
 		// remember where we think our victim is, so if it moves, we can re-path
-		Object *victim = getMachineGoalObject();	 
+		Object *victim = getMachineGoalObject();
 		m_prevVictimPos = *victim->getPosition();
-		if (canPursue(source, weapon, victim)) 
+		if (canPursue(source, weapon, victim))
 		{
 			return false;  // break out, and do the pursuit state.
 		}
 		setAdjustsDestination(true);
-		if (weapon->isContactWeapon()) 
+		if (weapon->isContactWeapon())
 		{
 			// Weapon is basically a contact weapon, so let the attacker pathfind into the target.
 			ai->ignoreObstacle(victim);
@@ -2482,34 +2474,34 @@ Bool AIAttackApproachTargetState::computePath()
 
 		Coord3D pos;
 		victim->getGeometryInfo().getCenterPosition( *victim->getPosition(), pos );
-		
-		CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - requestAttackPath() for object %d\n", getMachineOwner()->getID()));
+
+		CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - requestAttackPath() for object %d", getMachineOwner()->getID()));
 		ai->requestAttackPath(victim->getID(), &pos );
 		m_stopIfInRange = false; // we have calculated a position to shoot from, so go there.
 
-		CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing after repathing for object %d\n", getMachineOwner()->getID()));
+		CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing after repathing for object %d", getMachineOwner()->getID()));
 		return true;
-	} 
-	else 
+	}
+	else
 	{
 		// goal position.
 		setAdjustsDestination(true);
 		m_stopIfInRange = false; // Attack position is used by missiles, and they hit the position.
 		m_goalPosition = *getMachineGoalPosition();
-		if (!forceRepath) 
+		if (!forceRepath)
 		{
-			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because we're aiming for a fixed position for object %d\n", getMachineOwner()->getID()));
+			CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing because we're aiming for a fixed position for object %d", getMachineOwner()->getID()));
 			return true; // fixed positions don't move.
 		}
 		// must use computeAttackPath so that min ranges are considered.
 		m_waitingForPath = true;
 		ai->requestAttackPath(INVALID_ID, &m_goalPosition);
-		CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing after repathing at a fixed position for object %d\n", getMachineOwner()->getID()));
+		CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing after repathing at a fixed position for object %d", getMachineOwner()->getID()));
 		return true;
 	}
 
 
-	CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing at end of function for object %d\n", getMachineOwner()->getID()));
+	CRCDEBUG_LOG(("AIAttackApproachTargetState::computePath - bailing at end of function for object %d", getMachineOwner()->getID()));
 	return true;
 }
 
@@ -2519,7 +2511,7 @@ Bool AIAttackApproachTargetState::computePath()
 void AIAttackApproachTargetState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -2533,14 +2525,14 @@ void AIAttackApproachTargetState::xfer( Xfer *xfer )
 
  // extend base class
   AIInternalMoveToState::xfer( xfer );
- 
+
 	xfer->xferCoord3D(&m_prevVictimPos);
 	xfer->xferUnsignedInt(&m_approachTimestamp);
 	xfer->xferBool(&m_follow);
 	xfer->xferBool(&m_isAttackingObject);
 	xfer->xferBool(&m_stopIfInRange);
 	xfer->xferBool(&m_isInitialApproach);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2549,14 +2541,14 @@ void AIAttackApproachTargetState::loadPostProcess( void )
 {
  // extend base class
   AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIAttackApproachTargetState::onEnter()
 {
 	// contained by AIAttackState, so no separate timer
 	// urg. hacky. if we are a projectile, turn on precise z-pos.
-	//CRCDEBUG_LOG(("AIAttackApproachTargetState::onEnter() - object %d\n", getMachineOwner()->getID()));
+	//CRCDEBUG_LOG(("AIAttackApproachTargetState::onEnter() - object %d", getMachineOwner()->getID()));
 	Object* source = getMachineOwner();
 	AIUpdateInterface* ai = source->getAI();
 	if (source->isKindOf(KINDOF_PROJECTILE))
@@ -2565,7 +2557,7 @@ StateReturnType AIAttackApproachTargetState::onEnter()
 			ai->getCurLocomotor()->setUsePreciseZPos(true);
 	}
 
-	if (getMachine()->isGoalObjectDestroyed()) 
+	if (getMachine()->isGoalObjectDestroyed())
 	{
 		return STATE_SUCCESS; // Already killed victim.
 	}
@@ -2584,50 +2576,50 @@ StateReturnType AIAttackApproachTargetState::onEnter()
 
 	// See if we're close enough.
 	Object *victim = getMachineGoalObject();
-	if (victim) 
+	if (victim)
 	{
 		Weapon* weapon = source->getCurrentWeapon();
-		if (!weapon) 
+		if (!weapon)
 		{
 			return STATE_FAILURE;
 		}
-		if (weapon->isWithinAttackRange(source, victim)) 
+		if (weapon->isWithinAttackRange(source, victim))
 		{
 			Bool viewBlocked = false;
-			if (source && victim && ai->isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain()) 
+			if (source && victim && ai->isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain())
 			{
 				viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(source, *source->getPosition(), victim, *victim->getPosition());
 			}
-			if (!viewBlocked) 
+			if (!viewBlocked)
 			{
 				return STATE_SUCCESS;
 			}
 		}
 
-		// Check here:  If we are a player, and we got to this state via an ai command (ie we auto-acquired), 
+		// Check here:  If we are a player, and we got to this state via an ai command (ie we auto-acquired),
 		// we don't want to chase the unit. isAllowedToChase is set when we are in a deploy and attack state (troop crawler).
 		// Kris (July 2003): If we are retaliating... don't fail out!
 		if( ai->getCurrentStateID() != AI_GUARD_RETALIATE )
 		{
-			if (source->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN) 
+			if (source->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN)
 			{
-				if (ai->getLastCommandSource() == CMD_FROM_AI && !ai->isAllowedToChase() ) 
+				if (ai->getLastCommandSource() == CMD_FROM_AI && !ai->isAllowedToChase() )
 				{
-					if (!weapon->isContactWeapon()) 
+					if (!weapon->isContactWeapon())
 					{
-						return STATE_FAILURE; 
+						return STATE_FAILURE;
 					}
 				}
 			} else {
 				// Computer player.  Don't chase aircraft, unless we're hunting. jba [8/27/2003]
 				Bool hunt = ai->getCurrentStateID() == AI_HUNT;
-				if (!hunt && victim->isKindOf(KINDOF_AIRCRAFT) && victim->isAirborneTarget()) 
+				if (!hunt && victim->isKindOf(KINDOF_AIRCRAFT) && victim->isAirborneTarget())
 				{
-					return STATE_FAILURE; 
+					return STATE_FAILURE;
 				}
 			}
 		}
-		if (canPursue(source, weapon, victim)) 
+		if (canPursue(source, weapon, victim))
 		{
 			return STATE_SUCCESS;  // break out, and do the pursuit state.
 		}
@@ -2650,7 +2642,7 @@ StateReturnType AIAttackApproachTargetState::onEnter()
 	}
 
 	// find a good spot to shoot from
-	//CRCDEBUG_LOG(("AIAttackApproachTargetState::onEnter() - calling computePath() for object %d\n", getMachineOwner()->getID()));
+	//CRCDEBUG_LOG(("AIAttackApproachTargetState::onEnter() - calling computePath() for object %d", getMachineOwner()->getID()));
 	if (computePath() == false)
 		return STATE_FAILURE;
 
@@ -2664,8 +2656,8 @@ StateReturnType AIAttackApproachTargetState::onEnter()
 StateReturnType AIAttackApproachTargetState::updateInternal()
 {
 	AIUpdateInterface* ai = getMachineOwner()->getAI();
-	//CRCDEBUG_LOG(("AIAttackApproachTargetState::updateInternal() - object %d\n", getMachineOwner()->getID()));
-	if (getMachine()->isGoalObjectDestroyed()) 
+	//CRCDEBUG_LOG(("AIAttackApproachTargetState::updateInternal() - object %d", getMachineOwner()->getID()));
+	if (getMachine()->isGoalObjectDestroyed())
 	{
 		ai->notifyVictimIsDead();
 		ai->setCurrentVictim(NULL);
@@ -2677,65 +2669,75 @@ StateReturnType AIAttackApproachTargetState::updateInternal()
  	Object* source = getMachineOwner();
 	Weapon* weapon = source->getCurrentWeapon();
 	Object *victim = getMachineGoalObject();
-	if (victim) 
-	{ 
- 		if (source->getControllingPlayer()->getPlayerType() == PLAYER_COMPUTER) 
+	if (victim)
+	{
+ 		if (source->getControllingPlayer()->getPlayerType() == PLAYER_COMPUTER)
 		{
 			Bool hunt = ai->getCurrentStateID() == AI_HUNT;
 			// Computer player.  Don't chase aircraft unless hunting. jba [8/27/2003]
-			if (!hunt && victim->isKindOf(KINDOF_AIRCRAFT) && victim->isAirborneTarget()) 
+			if (!hunt && victim->isKindOf(KINDOF_AIRCRAFT) && victim->isAirborneTarget())
 			{
-				return STATE_FAILURE; 
+				return STATE_FAILURE;
 			}
-		}	
-		if( victim->testStatus( OBJECT_STATUS_STEALTHED ) && !victim->testStatus( OBJECT_STATUS_DETECTED ) && !victim->testStatus( OBJECT_STATUS_DISGUISED ) ) 
+		}
+		if( victim->testStatus( OBJECT_STATUS_STEALTHED ) && !victim->testStatus( OBJECT_STATUS_DETECTED ) && !victim->testStatus( OBJECT_STATUS_DISGUISED ) )
 		{
-			return STATE_FAILURE;	// If obj is stealthed, can no longer approach.
+			// If obj is stealthed, can no longer approach.
+			// TheSuperHackers @bugfix Stubbjax 19/11/2025 Except when disarming stealthed mines or traps.
+#if RETAIL_COMPATIBLE_CRC
+			return STATE_FAILURE;
+#else
+			const Bool isTargetingMine = weapon && weapon->getDamageType() == DAMAGE_DISARM &&
+				(victim->isKindOf(KINDOF_MINE) || victim->isKindOf(KINDOF_BOOBY_TRAP) || victim->isKindOf(KINDOF_DEMOTRAP));
+
+			if (!isTargetingMine)
+				return STATE_FAILURE;
+#endif
 		}
 		ai->setCurrentVictim(victim);
 		// Attacking an object.
-		if (weapon && weapon->isContactWeapon() && weapon->isWithinAttackRange(source, victim)) 
+		if (weapon && weapon->isContactWeapon() && weapon->isWithinAttackRange(source, victim))
 		{
 			return STATE_SUCCESS;
 		}
-		if (m_stopIfInRange && weapon && weapon->isWithinAttackRange(source, victim)) 
+		if (m_stopIfInRange && weapon && weapon->isWithinAttackRange(source, victim))
 		{
 			Bool viewBlocked = false;
-			if (victim && ai->isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain()) 
+			if (victim && ai->isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain())
 			{
 				viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(source, *source->getPosition(), victim, *victim->getPosition());
 			}
-			if (!viewBlocked) 
+			if (!viewBlocked)
 			{
 				return STATE_SUCCESS;
 			}
 		}
 		// find a good spot to shoot from
-		//CRCDEBUG_LOG(("AIAttackApproachTargetState::updateInternal() - calling computePath() to victim for object %d\n", getMachineOwner()->getID()));
+		//CRCDEBUG_LOG(("AIAttackApproachTargetState::updateInternal() - calling computePath() to victim for object %d", getMachineOwner()->getID()));
 		if (computePath() == false)
 			return STATE_SUCCESS;
 		code = AIInternalMoveToState::update();
 
 
-		if (code != STATE_CONTINUE) 
+		if (code != STATE_CONTINUE)
 		{
 			return STATE_SUCCESS;	// Always return state success, as state failure exits the attack.
 			// we may need to aim & do another approach if the target moved.  jba.
 		}
-	}																			
-	else 
+	}
+	else
 	{
 		// Attacking a position.
 		// find a good spot to shoot from
-		//CRCDEBUG_LOG(("AIAttackApproachTargetState::updateInternal() - calling computePath() to position for object %d\n", getMachineOwner()->getID()));
-		if (m_stopIfInRange && weapon && weapon->isWithinAttackRange(source, &m_goalPosition)) 
+		//CRCDEBUG_LOG(("AIAttackApproachTargetState::updateInternal() - calling computePath() to position for object %d", getMachineOwner()->getID()));
+		if (m_stopIfInRange && weapon && weapon->isWithinAttackRange(source, &m_goalPosition))
 		{
 			Bool viewBlocked = false;
-			if ( ai->isDoingGroundMovement() ) 
+			if ( ai->isDoingGroundMovement() )
 			{
 				viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(source, *source->getPosition(), NULL, m_goalPosition);
 			}
-			if (!viewBlocked) 
+			if (!viewBlocked)
 			{
 				return STATE_SUCCESS;
 			}
@@ -2760,9 +2762,9 @@ StateReturnType AIAttackApproachTargetState::update()
 	{
 		// Basically, if the object is alive, we continue, in case the target moves.
 		Object* victim = getMachineGoalObject();
-		if (source && victim && source->isMobile() && !victim->getTemplate()->isKindOf(KINDOF_IMMOBILE)) 
+		if (source && victim && source->isMobile() && !victim->getTemplate()->isKindOf(KINDOF_IMMOBILE))
 		{
-			if (code != STATE_CONTINUE) 
+			if (code != STATE_CONTINUE)
 			{
 				m_isInitialApproach = false;
 			}
@@ -2772,13 +2774,13 @@ StateReturnType AIAttackApproachTargetState::update()
 		}
 	}
 
-	if (m_isInitialApproach) 
+	if (m_isInitialApproach)
 	{
 		WhichTurretType tur = ai->getWhichTurretForCurWeapon();
-		if (tur != TURRET_INVALID) 
+		if (tur != TURRET_INVALID)
 		{
 			Object *temporaryTarget = ai->getNextMoodTarget( true, false );
-			if (temporaryTarget) 
+			if (temporaryTarget)
 			{
 				ai->setTurretTargetObject(tur, temporaryTarget, m_isForceAttacking);
 			}
@@ -2798,9 +2800,9 @@ void AIAttackApproachTargetState::onExit( StateExitType status )
 	Object *obj = getMachineOwner();
 	if (ai) {
 		ai->ignoreObstacle(NULL);
-		
+
 		// Per JohnA, this state should not be calling ai->destroyPath, because we can have spastic users
-		// that click the target repeadedly. This will prevent the unit from stuttering for said spastic 
+		// that click the target repeadedly. This will prevent the unit from stuttering for said spastic
 		// users.
 		// ai->destroyPath();
 		// urg. hacky. if we are a projectile, reset precise z-pos.
@@ -2812,7 +2814,7 @@ void AIAttackApproachTargetState::onExit( StateExitType status )
 		if (ai->isDoingGroundMovement()) {
 			Real dx = m_goalPosition.x-obj->getPosition()->x;
 			Real dy = m_goalPosition.y-obj->getPosition()->y;
-			if (dx*dx+dy*dy<PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F*0.125) 
+			if (dx*dx+dy*dy<PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F*0.125)
 			{
 				// We are doing accurate ground movement, so make sure we end exactly at the goal.
 				obj->setPosition(&m_goalPosition);
@@ -2846,13 +2848,13 @@ Bool AIAttackPursueTargetState::computePath()
 
 	AIUpdateInterface *ai = getMachineOwner()->getAI();
 
-	if (ai->isBlockedAndStuck()) 
+	if (ai->isBlockedAndStuck())
 	{
 		return false;
 	}
 	if (m_waitingForPath) return true;
 
-	if (!forceRepath && ai->getPath()==NULL && !ai->isWaitingForPath()) 
+	if (!forceRepath && ai->getPath()==NULL && !ai->isWaitingForPath())
 	{
 		forceRepath = true;
 	}
@@ -2877,7 +2879,7 @@ Bool AIAttackPursueTargetState::computePath()
 			return true;
 
 		Weapon* weapon = source->getCurrentWeapon();
-		if (!weapon) 
+		if (!weapon)
 		{
 			return false;
 		}
@@ -2896,7 +2898,7 @@ Bool AIAttackPursueTargetState::computePath()
 		ai->requestPath(&m_goalPosition, false);
 		m_stopIfInRange = false; // we have calculated a position to shoot from, so go there.
 		return true;
-	} 
+	}
 
 	return false;
 }
@@ -2908,7 +2910,7 @@ Bool AIAttackPursueTargetState::computePath()
 void AIAttackPursueTargetState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -2922,14 +2924,14 @@ void AIAttackPursueTargetState::xfer( Xfer *xfer )
 
  // extend base class
   AIInternalMoveToState::xfer( xfer );
- 
+
 	xfer->xferCoord3D(&m_prevVictimPos);
 	xfer->xferUnsignedInt(&m_approachTimestamp);
 	xfer->xferBool(&m_follow);
 	xfer->xferBool(&m_isAttackingObject);
 	xfer->xferBool(&m_stopIfInRange);
 	xfer->xferBool(&m_isInitialApproach);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2938,7 +2940,7 @@ void AIAttackPursueTargetState::loadPostProcess( void )
 {
  // extend base class
   AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIAttackPursueTargetState::onEnter()
@@ -2946,34 +2948,34 @@ StateReturnType AIAttackPursueTargetState::onEnter()
 	// contained by AIAttackState, so no separate timer
 	// If we return STATE_SUCCESS or STATE_FAILURE, we proceed to AIAttackApproachTargetState.
 	Object* source = getMachineOwner();
-	AIUpdateInterface* ai = source->getAI();	 
+	AIUpdateInterface* ai = source->getAI();
 
 	if (source->isKindOf(KINDOF_PROJECTILE))
 	{
-		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - is a projectile for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - is a projectile for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 		return STATE_SUCCESS;	 // Projectiles go directly to AIAttackApproachTargetState.
 	}
 
-	if (getMachine()->isGoalObjectDestroyed()) 
+	if (getMachine()->isGoalObjectDestroyed())
 	{
-		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - goal object is destroyed for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - goal object is destroyed for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 		return STATE_SUCCESS; // Already killed victim.
 	}
 	if (!m_isAttackingObject)	{
-		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - not attacking for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - not attacking for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 		return STATE_SUCCESS; // only pursue objects - positions don't move.
 	}
 
 	setAdjustsDestination(false);
 
-	// Check here:  If we are a player, and we got to this state via an ai command (ie we auto-acquired), 
-	// we don't want to chase the unit. 
+	// Check here:  If we are a player, and we got to this state via an ai command (ie we auto-acquired),
+	// we don't want to chase the unit.
 	// Kris (July 2003): If we are retaliating... don't succeed out!
 	if( ai->getCurrentStateID() != AI_GUARD_RETALIATE )
 	{
-		if (source->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN) 
+		if (source->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN)
 		{
-			if (ai->getLastCommandSource() == CMD_FROM_AI) 
+			if (ai->getLastCommandSource() == CMD_FROM_AI)
 			{
 				return STATE_SUCCESS;
 
@@ -2989,19 +2991,19 @@ StateReturnType AIAttackPursueTargetState::onEnter()
 
 	// See if we're close enough.
 	Object *victim = getMachineGoalObject();
-	if (victim) {	
+	if (victim) {
 		Weapon* weapon = source->getCurrentWeapon();
-		if (!weapon) 
+		if (!weapon)
 		{
 			return STATE_FAILURE;
 		}
-		if (!canPursue(source, weapon, victim) ) 
+		if (!canPursue(source, weapon, victim) )
 		{
-			//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - can't pursue for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+			//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - can't pursue for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 			return STATE_SUCCESS;
 		}
 	}	else {
-		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - no victim for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - no victim for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 		return STATE_SUCCESS; // gotta have a victim.
 	}
 	// If we have a turret, start aiming.
@@ -3010,7 +3012,7 @@ StateReturnType AIAttackPursueTargetState::onEnter()
 	{
 		ai->setTurretTargetObject(tur, victim, m_isForceAttacking);
 	} else {
-		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - no turret for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+		//CRCDEBUG_LOG(("AIAttackPursueTargetState::onEnter() - no turret for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 		return STATE_SUCCESS; // we only pursue with turrets, as non-turreted weapons can't fire on the run.
 	}
 
@@ -3024,8 +3026,8 @@ StateReturnType AIAttackPursueTargetState::onEnter()
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIAttackPursueTargetState::updateInternal()
 {
-	AIUpdateInterface* ai = getMachineOwner()->getAI();	  
-	if (getMachine()->isGoalObjectDestroyed()) 
+	AIUpdateInterface* ai = getMachineOwner()->getAI();
+	if (getMachine()->isGoalObjectDestroyed())
 	{
 		ai->notifyVictimIsDead();
 		ai->setCurrentVictim(NULL);
@@ -3036,8 +3038,8 @@ StateReturnType AIAttackPursueTargetState::updateInternal()
 	Object* source = getMachineOwner();
 	StateReturnType code = STATE_FAILURE;
  	Object *victim = getMachineGoalObject();
-	if (victim) 
-	{ 
+	if (victim)
+	{
 		if( victim->testStatus( OBJECT_STATUS_STEALTHED ) && !victim->testStatus( OBJECT_STATUS_DETECTED ) && !victim->testStatus( OBJECT_STATUS_DISGUISED ) )
 		{
 			return STATE_FAILURE;	// If obj is stealthed, can no longer pursue.
@@ -3048,25 +3050,25 @@ StateReturnType AIAttackPursueTargetState::updateInternal()
 		if (computePath() == false)
 			return STATE_FAILURE;
 		code = AIInternalMoveToState::update();
-		if (code != STATE_CONTINUE) 
+		if (code != STATE_CONTINUE)
 		{
-			//CRCDEBUG_LOG(("AIAttackPursueTargetState::updateInternal() - failed internal update() for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+			//CRCDEBUG_LOG(("AIAttackPursueTargetState::updateInternal() - failed internal update() for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 			return STATE_SUCCESS;	// Always return state success, as state failure exits the attack.
 			// we may need to aim & do another approach if the target moved.  jba.
 		}
 		Weapon* weapon = source->getCurrentWeapon();
-		if (!weapon) 
+		if (!weapon)
 			return STATE_FAILURE;
 		// If we have a turret, start aiming.
 		WhichTurretType tur = ai->getWhichTurretForCurWeapon();
 		if (tur == TURRET_INVALID)
 		{
-			//CRCDEBUG_LOG(("AIAttackPursueTargetState::updateInternal() - no turret for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+			//CRCDEBUG_LOG(("AIAttackPursueTargetState::updateInternal() - no turret for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 			return STATE_SUCCESS; // We currently only pursue with a turret weapon.
 		}
 
 		Bool viewBlocked = false;
-		if (ai->isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain()) 
+		if (ai->isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain())
 		{
 			viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(source, *source->getPosition(), victim, *victim->getPosition());
 		}
@@ -3084,11 +3086,11 @@ StateReturnType AIAttackPursueTargetState::updateInternal()
 			}
 			ai->setDesiredSpeed(victimSpeed);
 			// Really intense debug info.  jba.
-			// DEBUG_LOG(("VS %f, OS %f, goal %f\n", victim->getPhysics()->getForwardSpeed2D(), source->getPhysics()->getForwardSpeed2D(), victimSpeed));
+			// DEBUG_LOG(("VS %f, OS %f, goal %f", victim->getPhysics()->getForwardSpeed2D(), source->getPhysics()->getForwardSpeed2D(), victimSpeed));
 		}	else {
 			ai->setDesiredSpeed(FAST_AS_POSSIBLE);
 		}
-	}																			
+	}
 	return code;
 }
 
@@ -3101,13 +3103,13 @@ StateReturnType AIAttackPursueTargetState::update()
 	Object* source = getMachineOwner();
 	AIUpdateInterface *ai = source->getAI();
 
-	if (m_isInitialApproach) 
+	if (m_isInitialApproach)
 	{
 		WhichTurretType tur = ai->getWhichTurretForCurWeapon();
-		if (tur != TURRET_INVALID) 
+		if (tur != TURRET_INVALID)
 		{
 			Object *temporaryTarget = ai->getNextMoodTarget( true, false );
-			if (temporaryTarget) 
+			if (temporaryTarget)
 			{
 				ai->setTurretTargetObject(tur, temporaryTarget, m_isForceAttacking);
 			}
@@ -3121,7 +3123,7 @@ StateReturnType AIAttackPursueTargetState::update()
 void AIAttackPursueTargetState::onExit( StateExitType status )
 {
 	// contained by AIAttackState, so no separate timer
-	//CRCDEBUG_LOG(("AIAttackPursueTargetState::onExit() for object %d (%s)\n", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
+	//CRCDEBUG_LOG(("AIAttackPursueTargetState::onExit() for object %d (%s)", getMachineOwner()->getID(), getMachineOwner()->getTemplate()->getName().str()));
 	AIInternalMoveToState::onExit( status );
 
 	m_isInitialApproach = false;	// We only want to allow turreted things to fire at enemies during their
@@ -3144,7 +3146,7 @@ Bool AIPickUpCrateState::computePath()
 void AIPickUpCrateState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -3158,11 +3160,11 @@ void AIPickUpCrateState::xfer( Xfer *xfer )
 
  // extend base class
   AIInternalMoveToState::xfer( xfer );
- 
+
 	xfer->xferInt(&m_delayCounter);
 	xfer->xferCoord3D(&m_goalPosition);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3171,7 +3173,7 @@ void AIPickUpCrateState::loadPostProcess( void )
 {
  // extend base class
   AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIPickUpCrateState::onEnter()
@@ -3222,7 +3224,7 @@ StateReturnType AIPickUpCrateState::update()
 void AIFollowPathState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -3239,7 +3241,7 @@ void AIFollowPathState::xfer( Xfer *xfer )
 	xfer->xferInt(&m_index);
 	xfer->xferBool(&m_adjustFinal);
 	xfer->xferBool(&m_adjustFinalOverride);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3247,7 +3249,7 @@ void AIFollowPathState::xfer( Xfer *xfer )
 void AIFollowPathState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIFollowPathState::onEnter()
@@ -3268,7 +3270,7 @@ StateReturnType AIFollowPathState::onEnter()
 
 	//Assign this value to the AIUpdateInterface so object's can access this value while
 	//determine which waypoints to plot in the waypoint renderer.
-	ai->friend_setCurrentGoalPathIndex( m_index ); 
+	ai->friend_setCurrentGoalPathIndex( m_index );
 
 
  	if (getID() == AI_FOLLOW_EXITPRODUCTION_PATH) {
@@ -3284,7 +3286,7 @@ StateReturnType AIFollowPathState::onEnter()
 			ai->setDesiredSpeed(speed);
 		}
 	}
- 	if (nextPos) 
+ 	if (nextPos)
 	{
 		Coord2D delta;
 		delta.x = nextPos->x - pos->x;
@@ -3295,8 +3297,8 @@ StateReturnType AIFollowPathState::onEnter()
 		ai->setPathExtraDistance(offset);
 		// We are in the middle of a path, so don't set the final goal location yet.
 		setAdjustsDestination(false);
-	} 
-	else 
+	}
+	else
 	{
 		setAdjustsDestination(m_adjustFinal);
 		ai->setPathExtraDistance(0);
@@ -3307,7 +3309,7 @@ StateReturnType AIFollowPathState::onEnter()
 			if (ai && ai->getCurLocomotor())
 				ai->getCurLocomotor()->setUsePreciseZPos(true);
 		}
-	}	
+	}
 	return ret;
 }
 
@@ -3325,7 +3327,7 @@ void AIFollowPathState::onExit( StateExitType status )
 
 	//Assign this value to the AIUpdateInterface so object's can access this value while
 	//determine which waypoints to plot in the waypoint renderer.
-	ai->friend_setCurrentGoalPathIndex( -1 ); 
+	ai->friend_setCurrentGoalPathIndex( -1 );
 }
 
 //----------------------------------------------------------------------------------------------------------
@@ -3339,7 +3341,7 @@ StateReturnType AIFollowPathState::update()
 	{
 		Object *obj = getMachineOwner();
 		AIUpdateInterface *ai = obj->getAI();
-		if (status == STATE_FAILURE && m_retryCount>0) { 
+		if (status == STATE_FAILURE && m_retryCount>0) {
 			// If we failed, & haven't reached retry limit, try again.  jba.
 			m_retryCount--;
 		}	else {
@@ -3360,11 +3362,11 @@ StateReturnType AIFollowPathState::update()
 				pos = ai->friend_getGoalPathPosition(m_index);
 			}
 		}
-		
+
 
 		//Assign this value to the AIUpdateInterface so object's can access this value while
 		//determine which waypoints to plot in the waypoint renderer.
-		ai->friend_setCurrentGoalPathIndex( m_index ); 
+		ai->friend_setCurrentGoalPathIndex( m_index );
 		ai->ignoreObstacleID(INVALID_ID); // we have exited whatever object we are leaving, if any.  jba.
 		if (pos == NULL)
 		{
@@ -3377,7 +3379,7 @@ StateReturnType AIFollowPathState::update()
 		m_goalPosition = *pos;
  		const Coord3D *nextPos = ai->friend_getGoalPathPosition( m_index+1 );
 
- 		if (nextPos) 
+ 		if (nextPos)
 		{
 			Coord2D delta;
 			delta.x = nextPos->x - pos->x;
@@ -3388,11 +3390,11 @@ StateReturnType AIFollowPathState::update()
 			ai->setPathExtraDistance(offset);
 			// We are in the middle of a path, so don't set the final goal location yet.
 			setAdjustsDestination(false);
-		} 
-		else 
+		}
+		else
 		{
 			setAdjustsDestination(m_adjustFinal && (m_adjustFinalOverride || ai->isDoingGroundMovement()));
-			if (getAdjustsDestination()) 
+			if (getAdjustsDestination())
 			{
 				if (!TheAI->pathfinder()->adjustDestination(getMachineOwner(), ai->getLocomotorSet(), &m_goalPosition)) {
 					return STATE_FAILURE;
@@ -3424,7 +3426,7 @@ StateReturnType AIFollowPathState::update()
 void AIMoveAndEvacuateState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -3439,7 +3441,7 @@ void AIMoveAndEvacuateState::xfer( Xfer *xfer )
 	AIInternalMoveToState::xfer(xfer);
 
 	xfer->xferCoord3D(&m_origin);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3447,7 +3449,7 @@ void AIMoveAndEvacuateState::xfer( Xfer *xfer )
 void AIMoveAndEvacuateState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIMoveAndEvacuateState::onEnter()
@@ -3471,17 +3473,17 @@ StateReturnType AIMoveAndEvacuateState::onEnter()
 StateReturnType AIMoveAndEvacuateState::update()
 {
 	Object *obj = getMachine()->getOwner();
-	if (obj->isEffectivelyDead()) 
+	if (obj->isEffectivelyDead())
 	{
 		return STATE_FAILURE;
 	}
 
 	// do movement
 	StateReturnType status = AIInternalMoveToState::update();
-	if (status != STATE_CONTINUE) 
+	if (status != STATE_CONTINUE)
 	{
 		Object *obj = getMachineOwner();
-		if (obj->isEffectivelyDead()) 
+		if (obj->isEffectivelyDead())
 		{
 			return STATE_FAILURE;
 		}
@@ -3530,7 +3532,7 @@ AIAttackMoveToState::~AIAttackMoveToState()
 // ------------------------------------------------------------------------------------------------
 void AIAttackMoveToState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -3550,14 +3552,14 @@ void AIAttackMoveToState::xfer( Xfer *xfer )
 		xfer->xferInt(&m_retryCount);
 	}
 	xfer->xferSnapshot(m_attackMoveMachine);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIAttackMoveToState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 #ifdef STATE_MACHINE_DEBUG
 //----------------------------------------------------------------------------------------------------------
@@ -3577,7 +3579,7 @@ StateReturnType AIAttackMoveToState::onEnter()
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAI();
 	m_attackMoveMachine->clear();
-	m_attackMoveMachine->setState( AI_IDLE );	
+	m_attackMoveMachine->setState( AI_IDLE );
 	m_commandSrc = ai->getLastCommandSource();
 	m_retryCount = ATTACK_RETRY_COUNT;
 	m_frameToSleepUntil = 0;
@@ -3609,12 +3611,12 @@ StateReturnType AIAttackMoveToState::update()
 		return STATE_SUCCESS;
 	}
 
-	if (!m_attackMoveMachine->isInIdleState()) 
+	if (!m_attackMoveMachine->isInIdleState())
 	{
 		ai->setLocomotorGoalNone();
 		owner->clearModelConditionState(MODELCONDITION_MOVING);
 		m_attackMoveMachine->updateStateMachine();
-		
+
 		// if the machine is now idling, then we need to attempt to get a new target
 		if (m_attackMoveMachine->isInIdleState()) {
 			forceRetargetThisFrame = true;
@@ -3636,7 +3638,7 @@ StateReturnType AIAttackMoveToState::update()
 			m_attackMoveMachine->setState( AI_PICK_UP_CRATE );
 			return STATE_CONTINUE;
 		}
-		
+
 		Object* nextObjectToAttack;
 		nextObjectToAttack = ai->getNextMoodTarget( !forceRetargetThisFrame, false );
 		if (nextObjectToAttack != NULL)
@@ -3658,7 +3660,7 @@ StateReturnType AIAttackMoveToState::update()
 		shouldRepathThisFrame = true;
 	}
 
-	if (shouldRepathThisFrame) 
+	if (shouldRepathThisFrame)
 	{
 		AIMoveToState::onEnter();
 		forceRepath();
@@ -3672,7 +3674,7 @@ StateReturnType AIAttackMoveToState::update()
 		if (distSqr < sqr(ATTACK_CLOSE_ENOUGH_CELLS*PATHFIND_CELL_SIZE_F)) {
 			return ret;
 		}
-		DEBUG_LOG(("AIAttackMoveToState::update Distance from goal %f, retrying.\n", sqrt(distSqr)));
+		DEBUG_LOG(("AIAttackMoveToState::update Distance from goal %f, retrying.", sqrt(distSqr)));
 
 		ret = STATE_CONTINUE;
 		m_retryCount--;
@@ -3693,7 +3695,7 @@ StateReturnType AIAttackMoveToState::update()
 void AIMoveAndDeleteState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -3708,7 +3710,7 @@ void AIMoveAndDeleteState::xfer( Xfer *xfer )
 	AIInternalMoveToState::xfer(xfer);
 
 	xfer->xferBool(&m_appendGoalPosition);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3716,7 +3718,7 @@ void AIMoveAndDeleteState::xfer( Xfer *xfer )
 void AIMoveAndDeleteState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIMoveAndDeleteState::onEnter()
@@ -3736,20 +3738,20 @@ StateReturnType AIMoveAndDeleteState::onEnter()
 StateReturnType AIMoveAndDeleteState::update()
 {
 	Object *obj = getMachine()->getOwner();
-	if (obj->isEffectivelyDead()) 
+	if (obj->isEffectivelyDead())
 	{
 		return STATE_FAILURE;
 	}
 	// do movement
 	AIUpdateInterface *ai = obj->getAI();
-	if (ai->getCurLocomotor()) 
+	if (ai->getCurLocomotor())
 	{
 		ai->getCurLocomotor()->setAllowInvalidPosition(true);
 	}
-	if (m_appendGoalPosition) 
+	if (m_appendGoalPosition)
 	{
 		Path *thePath = ai->getPath();
-		if (!ai->isWaitingForPath() && ai->getPath()) 
+		if (!ai->isWaitingForPath() && ai->getPath())
 		{
 			m_goalPosition.z = TheTerrainLogic->getGroundHeight(m_goalPosition.x, m_goalPosition.y);
 			thePath->appendNode( &m_goalPosition, LAYER_GROUND);
@@ -3757,7 +3759,7 @@ StateReturnType AIMoveAndDeleteState::update()
 		}
 	}
 	StateReturnType status = AIInternalMoveToState::update();
-	if (status != STATE_CONTINUE) 
+	if (status != STATE_CONTINUE)
 	{
 		Object *obj = getMachineOwner();
 		TheGameLogic->destroyObject(obj);
@@ -3789,7 +3791,7 @@ const Waypoint * AIFollowWaypointPathState::getNextWaypoint(void)
 
 	getMachine()->setGoalPosition(m_currentWaypoint->getLocation());// THANKS, JOHN
 	return nextWay;
-#else 
+#else
 	if (!hasNextWaypoint()) {
 		m_priorWaypoint = m_currentWaypoint;
 		return NULL;
@@ -3822,7 +3824,7 @@ Bool AIFollowWaypointPathState::hasNextWaypoint(void)
 {
 #ifdef ALLOW_BACKTRACK
 	return m_currentWaypoint->getNumLinks()>0;
-#else 
+#else
 	if (m_currentWaypoint->getNumLinks()==0) {
 		return false; // no links, no next.
 	}
@@ -3833,7 +3835,7 @@ Bool AIFollowWaypointPathState::hasNextWaypoint(void)
 		// Two links, always works.
 		return true;
 	}
-	// We have a prior waypoint, and 1 link. 
+	// We have a prior waypoint, and 1 link.
 	if (m_priorWaypoint == m_currentWaypoint->getLink(0)) {
 		return false; // don't go back to same waypoint.
 	}
@@ -3877,7 +3879,7 @@ void AIFollowWaypointPathState::computeGoal(Bool useGroupOffsets)
 	if (TheAI->pathfinder()->isPointOnWall(&dest)) {
 		// except when they're on the wall.  jba.
 		dest.z = TheAI->pathfinder()->getWallHeight();
-		m_goalLayer = LAYER_WALL; 
+		m_goalLayer = LAYER_WALL;
 	}
 
 	ai->setPathExtraDistance(calcExtraPathDistance());
@@ -3892,7 +3894,7 @@ void AIFollowWaypointPathState::computeGoal(Bool useGroupOffsets)
 			if (ai && ai->getCurLocomotor())
 				ai->getCurLocomotor()->setUsePreciseZPos(true);
 		}
-	}	
+	}
 
 #define NO_ROTATE_OFFSETS
 #ifdef ROTATE_OFFSETS
@@ -3915,7 +3917,7 @@ void AIFollowWaypointPathState::computeGoal(Bool useGroupOffsets)
 	}
 	m_angle = angle;
 #endif
-	
+
 
 	m_goalPosition = dest;
 	m_goalPosition.x += m_groupOffset.x;
@@ -3926,14 +3928,14 @@ void AIFollowWaypointPathState::computeGoal(Bool useGroupOffsets)
 		}
 	} else {
 		m_goalPosition.z = TheTerrainLogic->getGroundHeight(m_goalPosition.x, m_goalPosition.y);
-	}	
+	}
 	Region3D extent;
 	TheTerrainLogic->getMaximumPathfindExtent(&extent);
 
 	if (extent.isInRegionNoZ(&dest)) {
 		// The waypoint is on the map.  Check & see if the adjusted position is off map [8/28/2003]
 		if (!extent.isInRegionNoZ(&m_goalPosition)) {
-			// clamp to in region. [8/28/2003]	
+			// clamp to in region. [8/28/2003]
 			if (m_goalPosition.x < extent.lo.x+PATHFIND_CELL_SIZE_F) {
 				m_goalPosition.x = extent.lo.x+PATHFIND_CELL_SIZE_F;
 			}
@@ -3962,7 +3964,7 @@ void AIFollowWaypointPathState::computeGoal(Bool useGroupOffsets)
 void AIFollowWaypointPathState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4000,7 +4002,7 @@ void AIFollowWaypointPathState::xfer( Xfer *xfer )
 	}
 
 	xfer->xferBool(&m_appendGoalPosition);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4008,7 +4010,7 @@ void AIFollowWaypointPathState::xfer( Xfer *xfer )
 void AIFollowWaypointPathState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIFollowWaypointPathState::onEnter()
@@ -4054,7 +4056,7 @@ StateReturnType AIFollowWaypointPathState::onEnter()
 		if (group) {
 			speed = group->getSpeed();
 			Coord3D center;
-			
+
 			group->getCenter( &center );
 			m_groupOffset.x = obj->getPosition()->x - center.x;
 			m_groupOffset.y = obj->getPosition()->y - center.y;
@@ -4078,7 +4080,7 @@ StateReturnType AIFollowWaypointPathState::onEnter()
 		setAdjustsDestination(ai->isDoingGroundMovement());
 		if (getAdjustsDestination()) {
 			if (!TheAI->pathfinder()->adjustDestination(getMachineOwner(), ai->getLocomotorSet(), &m_goalPosition)) {
-				DEBUG_LOG(("Breaking out of follow waypoint path\n"));
+				DEBUG_LOG(("Breaking out of follow waypoint path"));
 				return STATE_FAILURE;
 			}
 			TheAI->pathfinder()->updateGoal(getMachineOwner(), &m_goalPosition, m_goalLayer);
@@ -4091,7 +4093,7 @@ StateReturnType AIFollowWaypointPathState::onEnter()
 		}
 	}
 	if (ret != STATE_CONTINUE) {
-		DEBUG_LOG(("Breaking out of follow waypoint path\n"));
+		DEBUG_LOG(("Breaking out of follow waypoint path"));
 	}
 	return ret;
 }
@@ -4121,7 +4123,7 @@ StateReturnType AIFollowWaypointPathState::update()
 
 
 	getMachine()->setGoalPosition(m_currentWaypoint->getLocation());
-	
+
 	UnsignedInt adjustment = ai->getMoodMatrixActionAdjustment(MM_Action_Move);
 	if (m_isFollowWaypointPathState && (adjustment & MAA_Action_To_AttackMove))	{
 		if (m_moveAsGroup) {
@@ -4131,7 +4133,7 @@ StateReturnType AIFollowWaypointPathState::update()
 		}
 	}
 
-	if (m_appendGoalPosition) {	 
+	if (m_appendGoalPosition) {
 		Path *thePath = ai->getPath();
 		if (!ai->isWaitingForPath() && ai->getPath()) {
 			//Coord3D pathEnd = *thePath->getLastNode()->getPosition();
@@ -4144,13 +4146,16 @@ StateReturnType AIFollowWaypointPathState::update()
 		m_currentWaypoint = obj->getTeam()->getCurrentWaypoint();
 		if (m_currentWaypoint == NULL) {
 			return STATE_SUCCESS;
-		}			 
+		}
 		computeGoal(false);
 		if (getAdjustsDestination() && ai->isDoingGroundMovement()) {
 			if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) {
 				if (m_currentWaypoint) {
-					DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n", 
+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible
+#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC
+					DEBUG_LOG(("Breaking out of follow waypoint path %s of %s",
 					m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str()));
+#endif
 				}
 				return STATE_FAILURE;
 			}
@@ -4164,15 +4169,19 @@ StateReturnType AIFollowWaypointPathState::update()
 
 	// do movement
 	StateReturnType status = AIInternalMoveToState::update();
-	
+
 	// We may want to allow ourselves to bail out of this one early. In order to do this, we check and
-	// see if we're moving as a group, and then if our team is owned by an AI Skirmish player. 
-	// If it is, then we compute the group centroid, and see if it is within some distance of the 
+	// see if we're moving as a group, and then if our team is owned by an AI Skirmish player.
+	// If it is, then we compute the group centroid, and see if it is within some distance of the
 	if (m_moveAsGroup) {
 		if (obj->getControllingPlayer()->isSkirmishAIPlayer()) {
 			Team *team = obj->getTeam();
-			AIGroup *group = TheAI->createGroup();
+			AIGroupPtr group = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 			team->getTeamAsAIGroup(group);
+#else
+			team->getTeamAsAIGroup(group.Peek());
+#endif
 
 			Coord3D pos;
 			group->getCenter(&pos);
@@ -4194,33 +4203,36 @@ StateReturnType AIFollowWaypointPathState::update()
 	{
 		m_currentWaypoint = getNextWaypoint();
 
-		//LORENZEN ADDED LORENZEN ADDED LORENZEN ADDED 
+		//LORENZEN ADDED LORENZEN ADDED LORENZEN ADDED
 		Object *obj = getMachineOwner();
 		AIUpdateInterface *ai = obj->getAI();
 		if ( m_priorWaypoint )
 			ai->setPriorWaypointID( m_priorWaypoint->getID() );
 		if ( m_currentWaypoint )
 			ai->setCurrentWaypointID( m_currentWaypoint->getID() );
-		//LORENZEN ADDED LORENZEN ADDED LORENZEN ADDED 
+		//LORENZEN ADDED LORENZEN ADDED LORENZEN ADDED
 
 
 
 		// if there are no links from this waypoint, we're done
 		if (m_currentWaypoint==NULL)	{
 			/// Trigger "end of waypoint path" scripts (jba)
-			ai->setCompletedWaypoint(m_priorWaypoint);			
+			ai->setCompletedWaypoint(m_priorWaypoint);
 			return STATE_SUCCESS;
 		}
 		if (m_moveAsGroup) {
 			obj->getTeam()->setCurrentWaypoint(m_currentWaypoint);
-		} 
-		
+		}
+
 		computeGoal(false);
 		if (getAdjustsDestination() && ai->isDoingGroundMovement()) {
 			if (!TheAI->pathfinder()->adjustDestination(obj, ai->getLocomotorSet(), &m_goalPosition)) {
 				if (m_currentWaypoint) {
-					DEBUG_LOG(("Breaking out of follow waypoint path %s of %s\n", 
+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible
+#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC
+					DEBUG_LOG(("Breaking out of follow waypoint path %s of %s",
 					m_currentWaypoint->getName().str(), m_currentWaypoint->getPathLabel1().str()));
+#endif
 				}
 				return STATE_FAILURE;
 			}
@@ -4234,7 +4246,7 @@ StateReturnType AIFollowWaypointPathState::update()
 		return STATE_CONTINUE;
 	}
 	if (status != STATE_CONTINUE) {
-		DEBUG_LOG(("Breaking out of follow waypoint path\n"));
+		DEBUG_LOG(("Breaking out of follow waypoint path"));
 	}
 	return status;
 }
@@ -4251,7 +4263,7 @@ StateReturnType AIFollowWaypointPathState::update()
 void AIFollowWaypointPathExactState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4273,7 +4285,7 @@ void AIFollowWaypointPathExactState::xfer( Xfer *xfer )
 	{
 		m_lastWaypoint = TheTerrainLogic->getWaypointByID(id);
 	}
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4281,7 +4293,7 @@ void AIFollowWaypointPathExactState::xfer( Xfer *xfer )
 void AIFollowWaypointPathExactState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIFollowWaypointPathExactState::onEnter()
@@ -4304,7 +4316,7 @@ StateReturnType AIFollowWaypointPathExactState::onEnter()
 		if (group) {
 			speed = group->getSpeed();
 			Coord3D center;
-			
+
 			group->getCenter( &center );
 			groupOffset.x = obj->getPosition()->x - center.x;
 			groupOffset.y = obj->getPosition()->y - center.y;
@@ -4314,7 +4326,7 @@ StateReturnType AIFollowWaypointPathExactState::onEnter()
 	setAdjustsDestination(false);
 	// set initial movement goal
 	StateReturnType ret = AIInternalMoveToState::onEnter();
-	ai->setPathFromWaypoint(currentWaypoint, &groupOffset);	
+	ai->setPathFromWaypoint(currentWaypoint, &groupOffset);
 	m_lastWaypoint = currentWaypoint;
 	ai->getCurLocomotor()->setAllowInvalidPosition(true); // allow it to move off the map.
 
@@ -4338,7 +4350,7 @@ void AIFollowWaypointPathExactState::onExit( StateExitType status )
 	// turn off precision-z-pos when we exit, just in case.
 	AIUpdateInterface *ai = getMachineOwner()->getAI();
 	if (ai) {
-		ai->setCompletedWaypoint(m_lastWaypoint);			
+		ai->setCompletedWaypoint(m_lastWaypoint);
 		ai->setCanPathThroughUnits(false);
 		ai->getCurLocomotor()->setAllowInvalidPosition(false); // turn off allow it to move off the map.
 	}
@@ -4364,12 +4376,12 @@ StateReturnType AIFollowWaypointPathExactState::update()
 //-------------------------------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------------------------------
-AIAttackFollowWaypointPathState::AIAttackFollowWaypointPathState ( StateMachine *machine, Bool asGroup ) : 
-AIFollowWaypointPathState ( machine, asGroup, false ) 
+AIAttackFollowWaypointPathState::AIAttackFollowWaypointPathState ( StateMachine *machine, Bool asGroup ) :
+AIFollowWaypointPathState ( machine, asGroup, false )
 {
 #ifdef STATE_MACHINE_DEBUG
 	setName("AIAttackFollowWaypointPathState");
-#endif	
+#endif
 	m_attackFollowMachine = newInstance(AIAttackMoveStateMachine)(getMachineOwner(), "AIAttackFollowMachine");
 	m_attackFollowMachine->initDefaultState();
 }
@@ -4385,7 +4397,7 @@ AIAttackFollowWaypointPathState::~AIAttackFollowWaypointPathState()
 // ------------------------------------------------------------------------------------------------
 void AIAttackFollowWaypointPathState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4399,16 +4411,16 @@ void AIAttackFollowWaypointPathState::xfer( Xfer *xfer )
 
  // extend base class
   AIFollowWaypointPathState::xfer( xfer );
- 
+
 	xfer->xferSnapshot(m_attackFollowMachine);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIAttackFollowWaypointPathState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 #ifdef STATE_MACHINE_DEBUG
 //----------------------------------------------------------------------------------------------------------
@@ -4426,7 +4438,7 @@ AsciiString AIAttackFollowWaypointPathState::getName(  ) const
 StateReturnType AIAttackFollowWaypointPathState ::onEnter()
 {
 	m_attackFollowMachine->clear();
-	m_attackFollowMachine->setState( AI_IDLE );	
+	m_attackFollowMachine->setState( AI_IDLE );
 
 	return AIFollowWaypointPathState::onEnter();
 }
@@ -4440,19 +4452,19 @@ StateReturnType AIAttackFollowWaypointPathState::update()
 
 	Bool forceRetargetThisFrame = false;
 	Bool shouldRepathThisFrame = false;
-	if (!m_attackFollowMachine->isInIdleState()) 
+	if (!m_attackFollowMachine->isInIdleState())
 	{
 		ai->setLocomotorGoalNone();
 		owner->clearModelConditionState(MODELCONDITION_MOVING);
 		m_attackFollowMachine->updateStateMachine();
-		
+
 		// if the machine is now idling, then we need to attempt to get a new target
-		if (m_attackFollowMachine->isInIdleState()) 
+		if (m_attackFollowMachine->isInIdleState())
 		{
 			forceRetargetThisFrame = true;
 			shouldRepathThisFrame = true;
-		} 
-		else 
+		}
+		else
 		{
 			return STATE_CONTINUE;
 		}
@@ -4485,7 +4497,7 @@ StateReturnType AIAttackFollowWaypointPathState::update()
 		}
 	}
 
-	if (shouldRepathThisFrame) 
+	if (shouldRepathThisFrame)
 	{
 		// Update the goal waypoint if we've moved along the path.
 		computeGoal(m_moveAsGroup);
@@ -4519,7 +4531,7 @@ void AIAttackFollowWaypointPathState ::onExit( StateExitType status )
 void AIWanderState::crc( Xfer *xfer )
 {
 	AIFollowWaypointPathState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4535,7 +4547,7 @@ void AIWanderState::xfer( Xfer *xfer )
 
 	xfer->xferInt(&m_waitFrames);
 	xfer->xferInt(&m_timer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4543,7 +4555,7 @@ void AIWanderState::xfer( Xfer *xfer )
 void AIWanderState::loadPostProcess( void )
 {
 	AIFollowWaypointPathState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -4599,7 +4611,7 @@ StateReturnType AIWanderState::update()
 		if (m_currentWaypoint == NULL)	{
 			/// Trigger "end of waypoint path" scripts (jba)
 			ai->setCompletedWaypoint(m_priorWaypoint);
-			
+
 			return STATE_SUCCESS;
 		}
 
@@ -4641,7 +4653,7 @@ void AIWanderState::onExit( StateExitType status )
 void AIWanderInPlaceState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4658,7 +4670,7 @@ void AIWanderInPlaceState::xfer( Xfer *xfer )
 	xfer->xferCoord3D(&m_origin);
 	xfer->xferInt(&m_waitFrames);
 	xfer->xferInt(&m_timer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** LoadPostProcess */
@@ -4666,7 +4678,7 @@ void AIWanderInPlaceState::xfer( Xfer *xfer )
 void AIWanderInPlaceState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 StateReturnType AIWanderInPlaceState::onEnter()
@@ -4751,7 +4763,7 @@ void AIWanderInPlaceState::onExit( StateExitType status )
 void AIPanicState::crc( Xfer *xfer )
 {
 	AIFollowWaypointPathState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4767,7 +4779,7 @@ void AIPanicState::xfer( Xfer *xfer )
 
 	xfer->xferInt(&m_waitFrames);
 	xfer->xferInt(&m_timer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4775,7 +4787,7 @@ void AIPanicState::xfer( Xfer *xfer )
 void AIPanicState::loadPostProcess( void )
 {
 	AIFollowWaypointPathState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 /**
  * Panic and run screaming along a waypoint path.
@@ -4840,7 +4852,7 @@ StateReturnType AIPanicState::update()
 		if (m_currentWaypoint == NULL)	{
 			/// Trigger "end of waypoint path" scripts (jba)
 			ai->setCompletedWaypoint(m_priorWaypoint);
-			
+
 			return STATE_SUCCESS;
 		}
 		Locomotor* curLoco = ai->getCurLocomotor();
@@ -4876,7 +4888,7 @@ void AIPanicState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIAttackAimAtTargetState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -4891,14 +4903,14 @@ void AIAttackAimAtTargetState::xfer( Xfer *xfer )
 	xfer->xferBool(&m_canTurnInPlace);
 	xfer->xferBool(&m_setLocomotor);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIAttackAimAtTargetState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIAttackAimAtTargetState::onEnter()
@@ -4915,7 +4927,7 @@ StateReturnType AIAttackAimAtTargetState::onEnter()
 	m_canTurnInPlace = curLoco ? curLoco->getMinSpeed() == 0.0f : false;
 
 
-//	if (!victim) 
+//	if (!victim)
 //		return STATE_CONTINUE; // Just continue till we get a victim.
 // Ick.  This was originally a safety to a single line that required victim, and was never meant
 // as an early return to all cases.  We now want to use preattack frames on ground position targets
@@ -4927,7 +4939,7 @@ StateReturnType AIAttackAimAtTargetState::onEnter()
 	//move it back so another unit with longer range can!
 	Object *containedBy = source->getContainedBy();
 	ContainModuleInterface *contain = containedBy ? containedBy->getContain() : NULL;
-  
+
 	if( containedBy && weapon && contain && contain->isEnclosingContainerFor( source ) )
 	{                                          // non enclosing garrison containers do not use firepoints. Lorenzen, 6/11/03
 		if (victim)
@@ -4949,7 +4961,7 @@ StateReturnType AIAttackAimAtTargetState::onEnter()
 	// add ourself as a targeter BEFORE calling isTemporarilyPreventingAimSuccess().
 	if (victimAI)
 		victimAI->addTargeter(source->getID(), true);
-	
+
 	if( sourceAI->areTurretsLinked() )
 	{
 		//Order all turrets to attack.
@@ -4982,13 +4994,13 @@ StateReturnType AIAttackAimAtTargetState::onEnter()
 		}
 		else
 		{
-			// GS moved contact weapon check in here, because Success can never be given to a unit in this state 
+			// GS moved contact weapon check in here, because Success can never be given to a unit in this state
 			// using a turret to attack.  Check out ::update and you will see.
 
 			Bool preventing = victimAI && victimAI->isTemporarilyPreventingAimSuccess();
 
 			// Contact weapons don't aim.  They just go boom.  jba.
-			if( weapon && weapon->isContactWeapon() && inFiringRange && !preventing ) 
+			if( weapon && weapon->isContactWeapon() && inFiringRange && !preventing )
 				return STATE_SUCCESS;
 		}
 	}
@@ -5033,7 +5045,7 @@ StateReturnType AIAttackAimAtTargetState::update()
 		// if we have a turret, but it is incapable of turning, turn ourself.
 		// (gotta do this for units like the Comanche, which have fake "turrets"
 		// solely to allow for attacking-on-the-move...)
-		if (sourceAI->getTurretTurnRate(tur) != 0.0f)	
+		if (sourceAI->getTurretTurnRate(tur) != 0.0f)
 		{
 			// The Body can never return Success if the weapon is on the turret, or else we end
 			// up shooting the current weapon (which is on the turret) in the wrong direction.
@@ -5046,27 +5058,27 @@ StateReturnType AIAttackAimAtTargetState::update()
 
 		// else fall thru!
 	}
-	
+
 	// no else here!
 	{
 		Real relAngle = m_isAttackingObject ?
-											ThePartitionManager->getRelativeAngle2D( source, victim ) : 
+											ThePartitionManager->getRelativeAngle2D( source, victim ) :
 											ThePartitionManager->getRelativeAngle2D( source, getMachineGoalPosition() );
 
 		const Real REL_THRESH = 0.035f;	// about 2 degrees. (getRelativeAngle2D is current only accurate to about 1.25 degrees)
 
 		Weapon* weapon = source->getCurrentWeapon();
 		Real aimDelta = weapon ? weapon->getAimDelta() : 0.0f;
-		
-		if (aimDelta < REL_THRESH) 
+
+		if (aimDelta < REL_THRESH)
 		{
 			aimDelta = REL_THRESH;
 		}
 
-		//DEBUG_LOG(("AIM: desired %f, actual %f, delta %f, aimDelta %f, goalpos %f %f\n",rad2deg(obj->getOrientation() + relAngle),rad2deg(obj->getOrientation()),rad2deg(relAngle),rad2deg(aimDelta),victim->getPosition()->x,victim->getPosition()->y));
+		//DEBUG_LOG(("AIM: desired %f, actual %f, delta %f, aimDelta %f, goalpos %f %f",rad2deg(obj->getOrientation() + relAngle),rad2deg(obj->getOrientation()),rad2deg(relAngle),rad2deg(aimDelta),victim->getPosition()->x,victim->getPosition()->y));
 		if (m_canTurnInPlace)
 		{
-			if (fabs(relAngle) > aimDelta) 
+			if (fabs(relAngle) > aimDelta)
 			{
 				Real desiredAngle = source->getOrientation() + relAngle;
 				sourceAI->setLocomotorGoalOrientation(desiredAngle);
@@ -5100,7 +5112,7 @@ StateReturnType AIAttackAimAtTargetState::update()
 
 	if (source->isDisabledByType(DISABLED_HELD))
 	{
-		// We are contained by something (transport, building). This means we can't 
+		// We are contained by something (transport, building). This means we can't
 		// actually move to the location and if we are firing on a specific target
 		// and that target is no longer in range, then we need to abort the state
 		// so it can fire on other targets.
@@ -5111,7 +5123,7 @@ StateReturnType AIAttackAimAtTargetState::update()
 		// NO BAD WRONG!!! How can this be the one spot to convert an Object to a center pos?  We have
 		// an attack object check for a reason!  The center and the edge can be very far apart.
 //		const Coord3D *pos = m_isAttackingObject ? victim->getPosition() : getMachineGoalPosition();
-		
+
 		Bool inRange = FALSE;
 		if( m_isAttackingObject )
 			inRange = weapon ? weapon->isWithinAttackRange(source, victim) : FALSE;
@@ -5120,7 +5132,7 @@ StateReturnType AIAttackAimAtTargetState::update()
 
 		if( !weapon || !inRange )
 		{
-			// We're no longer in range, so exit with failure so we can automatically 
+			// We're no longer in range, so exit with failure so we can automatically
 			// reacquire a closer target if possible.
 			return STATE_FAILURE;
 		}
@@ -5137,7 +5149,7 @@ void AIAttackAimAtTargetState::onExit( StateExitType status )
 	{
 		AIUpdateInterface* sourceAI = getMachineOwner()->getAI();
 		// Tell the ai we are done moving, if we set the locomotor goal.
-		if (sourceAI && m_setLocomotor) 
+		if (sourceAI && m_setLocomotor)
 			sourceAI->setLocomotorGoalNone();
 	}
 	else
@@ -5168,7 +5180,7 @@ StateReturnType AIAttackFireWeaponState::onEnter()
 
 	// Passive stuff will approach but not attack, so we check here (after approach is complete)
 	UnsignedInt adjust = ai->getMoodMatrixActionAdjustment(MM_Action_Attack);
-	if ((adjust & MAA_Action_Ok) == 0) 
+	if ((adjust & MAA_Action_Ok) == 0)
 	{
 		return STATE_FAILURE;
 	}
@@ -5182,7 +5194,7 @@ StateReturnType AIAttackFireWeaponState::onEnter()
 
 	obj->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_IS_FIRING_WEAPON ) );
 	obj->preFireCurrentWeapon( getMachineGoalObject() );
-	return STATE_CONTINUE;	
+	return STATE_CONTINUE;
 }
 
 //----------------------------------------------------------------------------------------------------------
@@ -5209,12 +5221,12 @@ StateReturnType AIAttackFireWeaponState::update()
 	{
 		return STATE_FAILURE;
 	}
-	
+
 	WeaponStatus status = weapon->getStatus();
 	if (status == PRE_ATTACK)
 	{
 		return STATE_CONTINUE;
-	} 
+	}
 	else if (status != READY_TO_FIRE)
 	{
 		return STATE_FAILURE;
@@ -5260,7 +5272,7 @@ StateReturnType AIAttackFireWeaponState::update()
 		Real continueRange = weapon->getContinueAttackRange();
 		if (
 			continueRange > 0.0f &&
-			victim && 
+			victim &&
 			(victim->isDestroyed() || victim->isEffectivelyDead() || (victim->isKindOf(KINDOF_MINE) && victim->testStatus(OBJECT_STATUS_MASKED)))
 		)
 		{
@@ -5288,7 +5300,7 @@ StateReturnType AIAttackFireWeaponState::update()
 	}
 	else
 	{
-    
+
     if( getMachineOwner()->getAI()->areTurretsLinked() ) //LINKED TURRETS
     {// it doesn;t matter which weapon slot is locked, current or whatever
       for ( Int slot = PRIMARY_WEAPON; slot < WEAPONSLOT_COUNT ; slot++ )
@@ -5308,14 +5320,14 @@ StateReturnType AIAttackFireWeaponState::update()
 		// clear this, just in case.
 		obj->clearStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_IGNORING_STEALTH ) );
 	}
-		
+
 	m_att->notifyFired();
 
 	return STATE_SUCCESS;
 }
 
 //----------------------------------------------------------------------------------------------------------
-/** 
+/**
 	Stop firing.
 	*/
 void AIAttackFireWeaponState::onExit( StateExitType status )
@@ -5355,11 +5367,11 @@ StateReturnType AIWaitState::update()
 //----------------------------------------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------------------------------------
-AIAttackState::AIAttackState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking, AttackExitConditionsInterface* attackParameters) : 
-	State( machine , "AIAttackState"), 
+AIAttackState::AIAttackState( StateMachine *machine, Bool follow, Bool attackingObject, Bool forceAttacking, AttackExitConditionsInterface* attackParameters) :
+	State( machine , "AIAttackState"),
 	m_attackMachine(NULL),
-	m_attackParameters(attackParameters), 
-	m_lockedWeaponOnEnter(NULL), 
+	m_attackParameters(attackParameters),
+	m_lockedWeaponOnEnter(NULL),
 	m_follow(follow),
 	m_isAttackingObject(attackingObject),
 	m_isForceAttacking(forceAttacking),
@@ -5368,7 +5380,7 @@ AIAttackState::AIAttackState( StateMachine *machine, Bool follow, Bool attacking
 	m_originalVictimPos.zero();
 #ifdef STATE_MACHINE_DEBUG
 	if (machine->getWantsDebugOutput()) {
-		DEBUG_LOG(("Creating attack state follow %d, attacking object %d, force attacking %d\n", 
+		DEBUG_LOG(("Creating attack state follow %d, attacking object %d, force attacking %d",
 			follow, attackingObject, forceAttacking));
 	}
 #endif
@@ -5382,7 +5394,7 @@ AIAttackState::~AIAttackState()
 	// turn it off when we do setCurrentVictim(NULL).
 	//addSelfAsTargeter(false);
 
-	if (m_attackMachine) 
+	if (m_attackMachine)
 	{
 		m_attackMachine->halt();
 		deleteInstance(m_attackMachine);
@@ -5394,7 +5406,7 @@ AIAttackState::~AIAttackState()
 // ------------------------------------------------------------------------------------------------
 void AIAttackState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -5407,7 +5419,7 @@ void AIAttackState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_attackMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 	xfer->xferCoord3D(&m_originalVictimPos);
 
@@ -5424,7 +5436,7 @@ void AIAttackState::xfer( Xfer *xfer )
 	AttackExitConditionsInterface*	m_attackParameters;					///< these are not owned by this, and will not be deleted on destruction
 	Bool										m_isForceAttacking
 	*/
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -5432,13 +5444,13 @@ void AIAttackState::xfer( Xfer *xfer )
 void AIAttackState::loadPostProcess( void )
 {
 	Object* victim = getMachineGoalObject();
-	if (victim) 
+	if (victim)
 	{
 		m_victimTeam = victim->getTeam();
 	}
 	Object* source = getMachineOwner();
 	m_lockedWeaponOnEnter = source->isCurWeaponLocked() ? source->getCurrentWeapon() : NULL;
-}  // end loadPostProcess
+}
 
 #ifdef STATE_MACHINE_DEBUG
 //----------------------------------------------------------------------------------------------------------
@@ -5466,7 +5478,7 @@ Bool AIAttackState::chooseWeapon()
 //	if (victim) // Pardon?  We still need to pick a weapon if we are attacking the ground.
 //	{
 		found = source->chooseBestWeaponForTarget(victim, PREFER_MOST_DAMAGE, ai->getLastCommandSource());
-		//DEBUG_ASSERTLOG(found, ("unable to autochoose any weapon for %s\n",source->getTemplate()->getName().str()));
+		//DEBUG_ASSERTLOG(found, ("unable to autochoose any weapon for %s",source->getTemplate()->getName().str()));
 //	}
 
 	// Check if we need to update because of the weapon choice switch.
@@ -5487,14 +5499,14 @@ void AIAttackState::notifyNewVictimChosen(Object* victim)
 //----------------------------------------------------------------------------------------------------------
 /**
  * Begin an attack on the machine's goal object.
- * To do this complex behavior, instantiate another state machine as a "sub-machine" of 
+ * To do this complex behavior, instantiate another state machine as a "sub-machine" of
  * the attack state.
  */
 DECLARE_PERF_TIMER(AIAttackState)
 StateReturnType AIAttackState::onEnter()
 {
 	USE_PERF_TIMER(AIAttackState)
-	//CRCDEBUG_LOG(("AIAttackState::onEnter() - start for object %d\n", getMachineOwner()->getID()));
+	//CRCDEBUG_LOG(("AIAttackState::onEnter() - start for object %d", getMachineOwner()->getID()));
 	Object* source = getMachineOwner();
 	AIUpdateInterface *ai = source->getAI();
 	// if we are in sleep mode, we will not attack
@@ -5502,7 +5514,7 @@ StateReturnType AIAttackState::onEnter()
 		return STATE_SUCCESS;
 
 	// if we've met the conditions specified by m_attackParameters, we consider ourselves "successful."
-	if (m_attackParameters && m_attackParameters->shouldExit(getMachine())) 
+	if (m_attackParameters && m_attackParameters->shouldExit(getMachine()))
 		return STATE_SUCCESS;
 
 	//Kris: Jan 12, 2005
@@ -5519,7 +5531,7 @@ StateReturnType AIAttackState::onEnter()
 		return STATE_FAILURE;
 
 	// create new state machine for attack behavior
-	//CRCDEBUG_LOG(("AIAttackState::onEnter() - constructing state machine for object %d\n", getMachineOwner()->getID()));
+	//CRCDEBUG_LOG(("AIAttackState::onEnter() - constructing state machine for object %d", getMachineOwner()->getID()));
 	m_attackMachine = newInstance(AttackStateMachine)(source, this, "AIAttackMachine", m_follow, m_isAttackingObject, m_isForceAttacking  );
 
 #ifdef STATE_MACHINE_DEBUG
@@ -5529,7 +5541,7 @@ StateReturnType AIAttackState::onEnter()
 	if (m_isAttackingObject)
 	{
 		Object* victim = getMachineGoalObject();
-		if (victim == NULL || victim->isEffectivelyDead())	
+		if (victim == NULL || victim->isEffectivelyDead())
 		{
 			ai->notifyVictimIsDead();
 			return STATE_FAILURE;	// we have nothing to attack!
@@ -5540,7 +5552,7 @@ StateReturnType AIAttackState::onEnter()
 	}
 	else
 	{
-		m_attackMachine->setGoalPosition(getMachineGoalPosition());		
+		m_attackMachine->setGoalPosition(getMachineGoalPosition());
 		m_originalVictimPos = *getMachineGoalPosition();
 	}
 
@@ -5579,13 +5591,13 @@ StateReturnType AIAttackState::update()
 {
 	USE_PERF_TIMER(AIAttackState)
 	// if we've met the conditions specified by m_attackParameters, we consider ourselves "successful."
-	if (m_attackParameters && m_attackParameters->shouldExit(getMachine())) 
+	if (m_attackParameters && m_attackParameters->shouldExit(getMachine()))
 	{
 		return STATE_SUCCESS;
 	}
 
 	Object* source = getMachineOwner();
-	
+
 	// if all of our weapons are out of ammo, can't attack.
 	// (this can happen for units which never auto-reload, like the Raptor)
 	if (source->isOutOfAmmo() && !source->isKindOf(KINDOF_PROJECTILE))
@@ -5597,21 +5609,21 @@ StateReturnType AIAttackState::update()
 	{
 		Object* victim = getMachineGoalObject();
 
-		if (victim == NULL || victim->isEffectivelyDead()) 	
+		if (victim == NULL || victim->isEffectivelyDead())
 		{
 			source->getAI()->notifyVictimIsDead();
 			return STATE_SUCCESS;	// my, that was easy
 		}
 
-		if (victim) 
+		if (victim)
 		{
 			source->getAI()->setCurrentVictim(victim);
 		}
 
 		if( victim->getTeam() != m_victimTeam )
 		{
-			// If, while I have been attacking my victim, it has lost its ability to attack 
-			//(a recently de-garrisoned building) I should bail here... 
+			// If, while I have been attacking my victim, it has lost its ability to attack
+			//(a recently de-garrisoned building) I should bail here...
 			// We are not sure whether the problem occurs here or sometime before, but this is an edge case failsafe for it
 			// Steven calls this hack 'greasy,' and I agreesy.-Lorenzen
 			AIUpdateInterface *ai = source->getAI();
@@ -5648,9 +5660,9 @@ StateReturnType AIAttackState::update()
 				ai->notifyVictimIsDead();	// well, not "dead", but longer attackable
 				return STATE_FAILURE;
 			}
-		}	
+		}
 
-		if (victim != m_attackMachine->getGoalObject()) 
+		if (victim != m_attackMachine->getGoalObject())
 		{
 			// Our parent machine has changed the goal.  We need to reset to the new goal.  jba.
 			m_attackMachine->setGoalObject( victim );
@@ -5698,24 +5710,21 @@ void AIAttackState::onExit( StateExitType status )
 	//addSelfAsTargeter(false);
 
 	// destroy the attack machine
-	if (m_attackMachine)
-	{
-		deleteInstance(m_attackMachine);
-		m_attackMachine = NULL;
-	}
+	deleteInstance(m_attackMachine);
+	m_attackMachine = NULL;
 
 	Object *obj = getMachineOwner();
-	obj->clearStatus( MAKE_OBJECT_STATUS_MASK4( OBJECT_STATUS_IS_FIRING_WEAPON, 
-																							OBJECT_STATUS_IS_AIMING_WEAPON, 
-																							OBJECT_STATUS_IS_ATTACKING, 
+	obj->clearStatus( MAKE_OBJECT_STATUS_MASK4( OBJECT_STATUS_IS_FIRING_WEAPON,
+																							OBJECT_STATUS_IS_AIMING_WEAPON,
+																							OBJECT_STATUS_IS_ATTACKING,
 																							OBJECT_STATUS_IGNORING_STEALTH ) );
 	obj->clearModelConditionState( MODELCONDITION_ATTACKING );
 
 	obj->clearLeechRangeModeForAllWeapons();
 
 	AIUpdateInterface *ai = obj->getAI();
-	if (ai) 
-	{	
+	if (ai)
+	{
 		//ai->notifyVictimIsDead();	no, do NOT do this here.
 		ai->setCurrentVictim(NULL);
 		for (int i = 0; i < MAX_TURRETS; ++i)
@@ -5749,19 +5758,19 @@ class AIAttackThenIdleStateMachine : public StateMachine
 void AIAttackThenIdleStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void AIAttackThenIdleStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -5769,7 +5778,7 @@ void AIAttackThenIdleStateMachine::xfer( Xfer *xfer )
 void AIAttackThenIdleStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //-----------------------------------------------------------------------------------------------------------
 AIAttackThenIdleStateMachine::AIAttackThenIdleStateMachine(Object *owner, AsciiString name) : StateMachine(owner, name)
@@ -5803,7 +5812,7 @@ AIAttackSquadState::~AIAttackSquadState()
 // ------------------------------------------------------------------------------------------------
 void AIAttackSquadState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -5814,9 +5823,9 @@ void AIAttackSquadState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
-	
+
 	Bool hasMachine = m_attackSquadMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
 	if (hasMachine && m_attackSquadMachine==NULL)	{
@@ -5827,14 +5836,14 @@ void AIAttackSquadState::xfer( Xfer *xfer )
 	if (hasMachine) {
 		xfer->xferSnapshot(m_attackSquadMachine);
 	}
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIAttackSquadState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 #ifdef STATE_MACHINE_DEBUG
 //----------------------------------------------------------------------------------------------------------
@@ -5857,7 +5866,7 @@ StateReturnType AIAttackSquadState::onEnter( void )
 {
 	// create new state machine for attack behavior
 	m_attackSquadMachine = newInstance(AIAttackThenIdleStateMachine)( getMachineOwner(), "AIAttackMachine"  );
-	
+
 	Object *victim = chooseVictim();
 	// tell the attack machine who the victim of the attack is
 	m_attackSquadMachine->setGoalObject( victim );
@@ -5879,14 +5888,14 @@ StateReturnType AIAttackSquadState::update( void )
 		return STATE_FAILURE;
 	}
 
-	/* 
+	/*
 		Note the use of CONVERT_SLEEP_TO_CONTINUE; even if the sub-machine
 		sleeps, we still need to be called every frame.
 	*/
 	StateReturnType attackStatus = CONVERT_SLEEP_TO_CONTINUE(m_attackSquadMachine->updateStateMachine());
 
-	// if we're in attack state, 
-	if (m_attackSquadMachine->getCurrentStateID() != AI_IDLE) 
+	// if we're in attack state,
+	if (m_attackSquadMachine->getCurrentStateID() != AI_IDLE)
 	{
 		return attackStatus;
 	}
@@ -5903,7 +5912,7 @@ StateReturnType AIAttackSquadState::update( void )
 
 	// choose a new target and start over.
 	Object *victim = chooseVictim();
-	if (!victim) 
+	if (!victim)
 	{
 		return STATE_SUCCESS;
 	}
@@ -5916,19 +5925,16 @@ StateReturnType AIAttackSquadState::update( void )
 //----------------------------------------------------------------------------------------------------------
 void AIAttackSquadState::onExit( StateExitType status )
 {
-	if( m_attackSquadMachine )
-	{
-		// destroy the attack machine
-		deleteInstance(m_attackSquadMachine);
-		m_attackSquadMachine = NULL;
-	}
+	// destroy the attack machine
+	deleteInstance(m_attackSquadMachine);
+	m_attackSquadMachine = NULL;
 }
 
 //----------------------------------------------------------------------------------------------------------
 Object *AIAttackSquadState::chooseVictim(void)
 {
 	Squad *victimSquad = ((AIStateMachine*)getMachine())->getGoalSquad();
-	if (!victimSquad) 
+	if (!victimSquad)
 	{
 		return NULL;
 	}
@@ -5936,23 +5942,23 @@ Object *AIAttackSquadState::chooseVictim(void)
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAI();
 	UnsignedInt moodVal = ai->getMoodMatrixValue();
-	
-	if (moodVal & MM_Controller_AI) 
+
+	if (moodVal & MM_Controller_AI)
 	{
-		if (moodVal & MM_Mood_Sleep) 
+		if (moodVal & MM_Mood_Sleep)
 		{
 			return NULL;
 		}
 
-		if (moodVal & MM_Mood_Passive) 
+		if (moodVal & MM_Mood_Passive)
 		{
 			BodyModuleInterface *bmi = owner->getBodyModule();
 			if (!bmi) {
 				return NULL;
 			}
-			
+
 			const DamageInfo *di = bmi->getLastDamageInfo();
-			if (!di) 
+			if (!di)
 			{
 				return NULL;
 			}
@@ -5963,8 +5969,8 @@ Object *AIAttackSquadState::chooseVictim(void)
 
 	GameDifficulty difficulty = owner->getControllingPlayer()->getPlayerDifficulty();
 	const CommandSourceType cmdSource = ai->getLastCommandSource();
-	
-	if (cmdSource == CMD_FROM_PLAYER) 
+
+	if (cmdSource == CMD_FROM_PLAYER)
 	{
 		// if a player did this, we want to always give them the Seek and obliterate method.
 		difficulty = DIFFICULTY_HARD;
@@ -5973,7 +5979,7 @@ Object *AIAttackSquadState::chooseVictim(void)
 	if (TheScriptEngine->getChooseVictimAlwaysUsesNormal())
 	{
 		difficulty = DIFFICULTY_NORMAL;
-	}	
+	}
 
 	switch(difficulty)
 	{
@@ -5982,7 +5988,7 @@ Object *AIAttackSquadState::chooseVictim(void)
 			// pick a random unit
 			VecObjectPtr objects = victimSquad->getLiveObjects();
 			Int numUnits = objects.size();
-			if (numUnits == 0) 
+			if (numUnits == 0)
 			{
 				return NULL;
 			}
@@ -5999,7 +6005,7 @@ Object *AIAttackSquadState::chooseVictim(void)
 			PartitionFilterAcceptOnSquad f1(victimSquad);
 			PartitionFilterSameMapStatus filterMapStatus(getMachineOwner());
 			PartitionFilter *filters[] = { &f1, &filterMapStatus, NULL };
-			
+
 			Object *victim = ThePartitionManager->getClosestObject(getMachineOwner(), HUGE_DIST, FROM_CENTER_2D, filters, NULL, NULL);
 			return victim;
 			break;
@@ -6009,7 +6015,7 @@ Object *AIAttackSquadState::chooseVictim(void)
 		{
 			// everyone picks the same unit
 			VecObjectPtr objects = victimSquad->getLiveObjects();
-			if (objects.size() > 0) 
+			if (!objects.empty())
 			{
 				return objects[0];
 			}
@@ -6040,7 +6046,7 @@ AIDockState::~AIDockState()
 // ------------------------------------------------------------------------------------------------
 void AIDockState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6053,7 +6059,7 @@ void AIDockState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_dockMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
 	if (hasMachine && m_dockMachine==NULL)	{
@@ -6064,14 +6070,14 @@ void AIDockState::xfer( Xfer *xfer )
 		xfer->xferSnapshot(m_dockMachine);
 	}
 	xfer->xferBool(&m_usingPrecisionMovement);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIDockState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 #ifdef STATE_MACHINE_DEBUG
 //----------------------------------------------------------------------------------------------------------
@@ -6098,7 +6104,7 @@ StateReturnType AIDockState::onEnter()
 	if (dockWithMe == NULL)
 	{
 		// we have nothing to dock with!
-		DEBUG_LOG(("No goal in AIDockState::onEnter - exiting.\n"));
+		DEBUG_LOG(("No goal in AIDockState::onEnter - exiting."));
 		return STATE_FAILURE;
 	}
   DockUpdateInterface *dock = NULL;
@@ -6106,13 +6112,13 @@ StateReturnType AIDockState::onEnter()
 
 	// if we have nothing to dock with, fail
 	if (dock == NULL)	{
-		DEBUG_LOG(("Goal is not a dock in AIDockState::onEnter - exiting.\n"));
+		DEBUG_LOG(("Goal is not a dock in AIDockState::onEnter - exiting."));
 		return STATE_FAILURE;
 	}
 
 	// tell the pathfinder to ignore the object we are docking with, so it doesn't block us
 	AIUpdateInterface *ai = getMachineOwner()->getAI();
-	if( ai ) 
+	if( ai )
 	{
 		ai->ignoreObstacle( dockWithMe );
 	}
@@ -6138,7 +6144,7 @@ void AIDockState::onExit( StateExitType status )
 		deleteInstance(m_dockMachine);
 		m_dockMachine = NULL;
 	}	else {
-		DEBUG_LOG(("Dock exited immediately\n"));
+		DEBUG_LOG(("Dock exited immediately"));
 	}
 
 	// stop ignoring our goal object
@@ -6148,7 +6154,7 @@ void AIDockState::onExit( StateExitType status )
 		ai->setCanPathThroughUnits(false);
 		ai->ignoreObstacle( NULL );
 	}
-	
+
 }
 
 /**
@@ -6169,13 +6175,13 @@ StateReturnType AIDockState::update()
 	{
 		ai->setCanPathThroughUnits(true);
 		//if (ai->isBlockedAndStuck()) {
-			//DEBUG_LOG(("Blocked and stuck.\n"));
+			//DEBUG_LOG(("Blocked and stuck."));
 		//}
 		//if (ai->getNumFramesBlocked()>5) {
-			//DEBUG_LOG(("Blocked %d frames\n", ai->getNumFramesBlocked()));
+			//DEBUG_LOG(("Blocked %d frames", ai->getNumFramesBlocked()));
 		//}
 	}
-	/* 
+	/*
 		Note the use of CONVERT_SLEEP_TO_CONTINUE; even if the sub-machine
 		sleeps, we still need to be called every frame.
 	*/
@@ -6192,7 +6198,7 @@ StateReturnType AIDockState::update()
 void AIEnterState::crc( Xfer *xfer )
 {
 	AIInternalMoveToState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6207,7 +6213,7 @@ void AIEnterState::xfer( Xfer *xfer )
 	AIInternalMoveToState::xfer(xfer);
 
 	xfer->xferObjectID(&m_entryToClear);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -6215,7 +6221,7 @@ void AIEnterState::xfer( Xfer *xfer )
 void AIEnterState::loadPostProcess( void )
 {
 	AIInternalMoveToState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIEnterState::onEnter()
@@ -6227,7 +6233,7 @@ StateReturnType AIEnterState::onEnter()
 	if (goal)
 	{
 		if( !TheActionManager->canEnterObject( obj, goal, obj->getAI()->getLastCommandSource(), CHECK_CAPACITY ) )
-			return STATE_FAILURE;	
+			return STATE_FAILURE;
 
 		m_goalPosition = *goal->getPosition();
 
@@ -6246,7 +6252,7 @@ StateReturnType AIEnterState::onEnter()
 	// tell the pathfinder to ignore the enterable object
 	AIUpdateInterface *ai = obj->getAI();
 	ai->ignoreObstacle( getMachineGoalObject() );
-	if (ai->getCurLocomotor()) 
+	if (ai->getCurLocomotor())
 	{
 		ai->getCurLocomotor()->setAllowInvalidPosition(true);
 	}
@@ -6262,11 +6268,11 @@ void AIEnterState::onExit( StateExitType status )
 
 	// tell the pathfinder to stop ignoring the object
 	AIUpdateInterface *ai = obj->getAI();
-	if (ai) 
+	if (ai)
 	{
 
 		ai->ignoreObstacle( NULL );
-		if (ai->getCurLocomotor()) 
+		if (ai->getCurLocomotor())
 		{
 			ai->getCurLocomotor()->setAllowInvalidPosition(false);
 		}
@@ -6304,7 +6310,7 @@ StateReturnType AIEnterState::update()
 		// this just bails in this case. (srj)
 		if (goal->getContainedBy() != NULL && goal->isAboveTerrain() && !obj->isAboveTerrain())
 		{
-			return STATE_FAILURE;	
+			return STATE_FAILURE;
 		}
 
 		m_goalPosition = *goal->getPosition();
@@ -6332,9 +6338,9 @@ StateReturnType AIEnterState::update()
 					// since we just changed the state, it doesn't really matter what we return here.
 					return STATE_CONTINUE;
 				}
-				return STATE_FAILURE;	
+				return STATE_FAILURE;
 			}
-			return STATE_FAILURE;	
+			return STATE_FAILURE;
 		}
 
 		// If we are held, then we must have entered the goal.
@@ -6342,8 +6348,8 @@ StateReturnType AIEnterState::update()
 		{
 			return STATE_SUCCESS;
 		}
-	} 
-	else 
+	}
+	else
 	{
 		return STATE_FAILURE;
 	}
@@ -6356,7 +6362,7 @@ StateReturnType AIEnterState::update()
 		code = STATE_CONTINUE;
 	}
 
-	if (code == STATE_SUCCESS) 
+	if (code == STATE_SUCCESS)
 	{
 		// Make sure we entered the container.
 		// srj sez: I don't think we want to restrict this to HELD items. See the intro of GLA02.map
@@ -6400,7 +6406,7 @@ StateReturnType AIEnterState::update()
 // ------------------------------------------------------------------------------------------------
 void AIExitState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6413,14 +6419,14 @@ void AIExitState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferObjectID(&m_entryToClear);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIExitState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIExitState::onEnter()
@@ -6478,8 +6484,8 @@ StateReturnType AIExitState::update()
 			return STATE_CONTINUE;// Not sucess, because exitViaDoor has changed us to FollowPath, and if we say Success, our machine will think FollowPath succeeded
 		else
 			return STATE_SUCCESS;
-	} 
-	else 
+	}
+	else
 	{
 		return STATE_FAILURE;
 	}
@@ -6515,7 +6521,7 @@ void AIExitState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AIExitInstantlyState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6528,14 +6534,14 @@ void AIExitInstantlyState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferObjectID(&m_entryToClear);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIExitInstantlyState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIExitInstantlyState::onEnter()
@@ -6632,7 +6638,7 @@ AsciiString AIGuardState::getName(  ) const
 // ------------------------------------------------------------------------------------------------
 void AIGuardState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6645,7 +6651,7 @@ void AIGuardState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_guardMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
 	if (hasMachine && m_guardMachine==NULL)	{
@@ -6653,17 +6659,17 @@ void AIGuardState::xfer( Xfer *xfer )
 		m_guardMachine = newInstance(AIGuardMachine)( getMachineOwner());
 	}
 	if (hasMachine) {
-		xfer->xferSnapshot(m_guardMachine);	
+		xfer->xferSnapshot(m_guardMachine);
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIGuardState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 //----------------------------------------------------------------------------------------------------------
@@ -6711,10 +6717,10 @@ StateReturnType AIGuardState::onEnter()
 	m_guardMachine->setGuardMode(ai->getGuardMode());
 
 	// now that essential parameters are set, set the machine's initial state
-	if (m_guardMachine->initDefaultState() == STATE_FAILURE) 
+	if (m_guardMachine->initDefaultState() == STATE_FAILURE)
 		return STATE_FAILURE;
 	return m_guardMachine->setState(AI_GUARD_RETURN);
-	
+
 	obj->getControllingPlayer()->getAcademyStats()->recordGuardAbilityUsed();
 }
 
@@ -6731,19 +6737,19 @@ void AIGuardState::onExit( StateExitType status )
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIGuardState::update()
 {
-	//DEBUG_LOG(("AIGuardState frame %d: %08lx\n",TheGameLogic->getFrame(),getMachineOwner()));
+	//DEBUG_LOG(("AIGuardState frame %d: %08lx",TheGameLogic->getFrame(),getMachineOwner()));
 
-	if (m_guardMachine == NULL) 
+	if (m_guardMachine == NULL)
 	{
 		return STATE_FAILURE; // We actually already exited.
 	}
 
 	// if all of our weapons are out of ammo, can't attack.
 	// (this can happen for units which never auto-reload, like the Raptor)
-	Object* owner = getMachineOwner();	
+	Object* owner = getMachineOwner();
 	if( owner->getAI()->getJetAIUpdate() && owner->isOutOfAmmo() && !owner->isKindOf(KINDOF_PROJECTILE) && !owner->getTemplate()->isEnterGuard())
 	{
-		DEBUG_CRASH(("Hmm, this should probably never happen, since this case should be intercepted by JetAIUpdate\n"));
+		DEBUG_CRASH(("Hmm, this should probably never happen, since this case should be intercepted by JetAIUpdate"));
 		return STATE_FAILURE;
 	}
 
@@ -6773,11 +6779,11 @@ AsciiString AIGuardRetaliateState::getName(  ) const
 {
 	AsciiString name = m_name;
 	name.concat("/");
-	if( m_guardRetaliateMachine ) 
+	if( m_guardRetaliateMachine )
 	{
 		name.concat(m_guardRetaliateMachine->getCurrentStateName());
 	}
-	else 
+	else
 	{
 		name.concat("*NULL guardRetaliateMachine");
 	}
@@ -6789,7 +6795,7 @@ AsciiString AIGuardRetaliateState::getName(  ) const
 // ------------------------------------------------------------------------------------------------
 void AIGuardRetaliateState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6802,27 +6808,27 @@ void AIGuardRetaliateState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_guardRetaliateMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
-	if (hasMachine && m_guardRetaliateMachine==NULL)	
+	if (hasMachine && m_guardRetaliateMachine==NULL)
 	{
 		// create new state machine for guard behavior
 		m_guardRetaliateMachine = newInstance(AIGuardRetaliateMachine)( getMachineOwner());
 	}
-	if (hasMachine) 
+	if (hasMachine)
 	{
-		xfer->xferSnapshot(m_guardRetaliateMachine);	
+		xfer->xferSnapshot(m_guardRetaliateMachine);
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIGuardRetaliateState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 //----------------------------------------------------------------------------------------------------------
@@ -6878,19 +6884,19 @@ void AIGuardRetaliateState::onExit( StateExitType status )
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIGuardRetaliateState::update()
 {
-	//DEBUG_LOG(("AIGuardRetaliateState frame %d: %08lx\n",TheGameLogic->getFrame(),getMachineOwner()));
+	//DEBUG_LOG(("AIGuardRetaliateState frame %d: %08lx",TheGameLogic->getFrame(),getMachineOwner()));
 
-	if (m_guardRetaliateMachine == NULL) 
+	if (m_guardRetaliateMachine == NULL)
 	{
 		return STATE_FAILURE; // We actually already exited.
 	}
 
 	// if all of our weapons are out of ammo, can't attack.
 	// (this can happen for units which never auto-reload, like the Raptor)
-	Object* owner = getMachineOwner();	
+	Object* owner = getMachineOwner();
 	if( owner->getAI()->getJetAIUpdate() && owner->isOutOfAmmo() && !owner->isKindOf(KINDOF_PROJECTILE) && !owner->getTemplate()->isEnterGuard())
 	{
-		DEBUG_CRASH(("Hmm, this should probably never happen, since this case should be intercepted by JetAIUpdate\n"));
+		DEBUG_CRASH(("Hmm, this should probably never happen, since this case should be intercepted by JetAIUpdate"));
 		return STATE_FAILURE;
 	}
 
@@ -6928,7 +6934,7 @@ AsciiString AITunnelNetworkGuardState::getName(  ) const
 // ------------------------------------------------------------------------------------------------
 void AITunnelNetworkGuardState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -6941,7 +6947,7 @@ void AITunnelNetworkGuardState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_guardMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
 	if (hasMachine && m_guardMachine==NULL)	{
@@ -6949,17 +6955,17 @@ void AITunnelNetworkGuardState::xfer( Xfer *xfer )
 		m_guardMachine = newInstance(AITNGuardMachine)( getMachineOwner());
 	}
 	if (hasMachine) {
-		xfer->xferSnapshot(m_guardMachine);	
+		xfer->xferSnapshot(m_guardMachine);
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AITunnelNetworkGuardState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 //----------------------------------------------------------------------------------------------------------
@@ -6987,11 +6993,11 @@ StateReturnType AITunnelNetworkGuardState::onEnter()
 	m_guardMachine = newInstance(AITNGuardMachine)( getMachineOwner());
 
 	// tell the guarding machine what it is guarding with
-	m_guardMachine->setTargetPositionToGuard( ai->getGuardLocation() ); 
+	m_guardMachine->setTargetPositionToGuard( ai->getGuardLocation() );
 	m_guardMachine->setGuardMode(ai->getGuardMode());
 
 	// now that essential parameters are set, set the machine's initial state
-	if (m_guardMachine->initDefaultState() == STATE_FAILURE) 
+	if (m_guardMachine->initDefaultState() == STATE_FAILURE)
 		return STATE_FAILURE;
 	return m_guardMachine->setState(AI_GUARD_RETURN);
 }
@@ -7009,9 +7015,9 @@ void AITunnelNetworkGuardState::onExit( StateExitType status )
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AITunnelNetworkGuardState::update()
 {
-	//DEBUG_LOG(("AITunnelNetworkGuardState frame %d: %08lx\n",TheGameLogic->getFrame(),getMachineOwner()));
+	//DEBUG_LOG(("AITunnelNetworkGuardState frame %d: %08lx",TheGameLogic->getFrame(),getMachineOwner()));
 
-	if (m_guardMachine == NULL) 
+	if (m_guardMachine == NULL)
 	{
 		return STATE_FAILURE; // We actually already exited.
 	}
@@ -7021,7 +7027,7 @@ StateReturnType AITunnelNetworkGuardState::update()
 	Object* owner = getMachineOwner();
 	if (owner->isOutOfAmmo() && !owner->isKindOf(KINDOF_PROJECTILE))
 	{
-		DEBUG_CRASH(("Hmm, this should probably never happen, since this case should be intercepted by JetAIUpdate\n"));
+		DEBUG_CRASH(("Hmm, this should probably never happen, since this case should be intercepted by JetAIUpdate"));
 		return STATE_FAILURE;
 	}
 
@@ -7042,7 +7048,7 @@ StateReturnType AITunnelNetworkGuardState::update()
 //----------------------------------------------------------------------------------------------------------
 AIHuntState::~AIHuntState()
 {
-	if (m_huntMachine) 
+	if (m_huntMachine)
 	{
 		m_huntMachine->halt();
 		deleteInstance(m_huntMachine);
@@ -7054,7 +7060,7 @@ AIHuntState::~AIHuntState()
 // ------------------------------------------------------------------------------------------------
 void AIHuntState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -7067,7 +7073,7 @@ void AIHuntState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_huntMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
 	if (hasMachine && m_huntMachine==NULL)	{
@@ -7079,14 +7085,14 @@ void AIHuntState::xfer( Xfer *xfer )
 	}
 	xfer->xferUnsignedInt(&m_nextEnemyScanTime);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIHuntState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 //Is our hunt state in an attack sub-state?
@@ -7110,7 +7116,7 @@ StateReturnType AIHuntState::onEnter()
 	m_huntMachine = newInstance(AIAttackThenIdleStateMachine)( getMachineOwner(), "AIAttackThenIdleStateMachine");
 
 	// first time thru, use a random amount so that everyone doesn't scan on the same frame,
-	// to avoid "spikes". 
+	// to avoid "spikes".
 	UnsignedInt sleepTime = GameLogicRandomValue(0, ENEMY_SCAN_RATE);
 	UnsignedInt now = TheGameLogic->getFrame();
 	m_nextEnemyScanTime = now + sleepTime;
@@ -7127,7 +7133,7 @@ void AIHuntState::onExit( StateExitType status )
 	m_huntMachine = NULL;
 
 	Object *obj = getMachineOwner();
-	if (obj) 
+	if (obj)
 	{
 		obj->releaseWeaponLock(LOCKED_TEMPORARILY);	// release any temporary locks.
 	}
@@ -7177,16 +7183,16 @@ StateReturnType AIHuntState::update()
 
 		// Check if team auto targets same victim.
 		Object* teamVictim = NULL;
-		if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+		if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 		{
 			teamVictim = owner->getTeam()->getTeamTargetObject();
 		}
 		Object* victim = NULL;
-		if (teamVictim && info==NULL) 
+		if (teamVictim && info==NULL)
 		{
 			victim = teamVictim;
-		} 
-		else 
+		}
+		else
 		{
 			// do NOT do line of sight check - we want to find everything
 			victim = TheAI->findClosestEnemy( owner, 9999.9f, AI::CAN_ATTACK, info );
@@ -7194,7 +7200,7 @@ StateReturnType AIHuntState::update()
 				// If we are doing an all hunt, try hunting without the attack priority info. jba.
 				victim = TheAI->findClosestEnemy(owner, 9999.9f, AI::CAN_ATTACK, NULL);
 			}
-			if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+			if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 			{
 				// Check priorities.
 				if (teamVictim && info) {
@@ -7218,7 +7224,7 @@ StateReturnType AIHuntState::update()
 		}
 		m_huntMachine->setGoalObject( victim );
 
-		if (m_huntMachine->getCurrentStateID() == AI_IDLE && victim)	
+		if (m_huntMachine->getCurrentStateID() == AI_IDLE && victim)
 		{
 			m_huntMachine->setState( AI_ATTACK_OBJECT );
 		}
@@ -7230,9 +7236,9 @@ StateReturnType AIHuntState::update()
 		}
 	}
 
-	getMachine()->lock("AIHuntState::update");	// The idle state in the sub machine can sometimes acquire targets. 
+	getMachine()->lock("AIHuntState::update");	// The idle state in the sub machine can sometimes acquire targets.
 												// It is important to not switch out of this state via a sub machine call. jba.
-	/* 
+	/*
 		Note the use of CONVERT_SLEEP_TO_CONTINUE; even if the sub-machine
 		sleeps, we still need to be called every frame.
 	*/
@@ -7261,7 +7267,7 @@ AIAttackAreaState::~AIAttackAreaState()
 // ------------------------------------------------------------------------------------------------
 void AIAttackAreaState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -7274,7 +7280,7 @@ void AIAttackAreaState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	Bool hasMachine = m_attackMachine!=NULL;
-	
+
 	xfer->xferBool(&hasMachine);
 
 	if (hasMachine && m_attackMachine==NULL)	{
@@ -7286,14 +7292,14 @@ void AIAttackAreaState::xfer( Xfer *xfer )
 	}
 	xfer->xferUnsignedInt(&m_nextEnemyScanTime);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AIAttackAreaState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 #ifdef STATE_MACHINE_DEBUG
 //----------------------------------------------------------------------------------------------------------
@@ -7315,7 +7321,7 @@ StateReturnType AIAttackAreaState::onEnter()
 	m_attackMachine = newInstance(AIAttackThenIdleStateMachine)( getMachineOwner(), "AIAttackThenIdleStateMachine");
 
 	// first time thru, use a random amount so that everyone doesn't scan on the same frame,
-	// to avoid "spikes". 
+	// to avoid "spikes".
 	UnsignedInt now = TheGameLogic->getFrame();
 	m_nextEnemyScanTime = now + GameLogicRandomValue(0, ENEMY_SCAN_RATE);
 
@@ -7352,7 +7358,7 @@ StateReturnType AIAttackAreaState::update()
 		m_nextEnemyScanTime = now + ENEMY_SCAN_RATE;
 
 		AIUpdateInterface *ai = owner->getAI();
-		if (ai->getAreaToGuard() == NULL) 
+		if (ai->getAreaToGuard() == NULL)
 			return STATE_FAILURE;
 
 		const AttackPriorityInfo *info = NULL;
@@ -7363,7 +7369,7 @@ StateReturnType AIAttackAreaState::update()
 		Object *victim = TheAI->findClosestEnemy( owner, 9999.9f, AI::CAN_ATTACK, info, &polyFilter );
 		m_attackMachine->setGoalObject( victim );
 
-		if (m_attackMachine->getCurrentStateID() == AI_IDLE && victim)	
+		if (m_attackMachine->getCurrentStateID() == AI_IDLE && victim)
 		{
 			m_attackMachine->setState( AI_ATTACK_OBJECT );
 		}
@@ -7372,9 +7378,9 @@ StateReturnType AIAttackAreaState::update()
 		}
 	}
 
-	getMachine()->lock("AIAttackAreaState::update");	// The idle state in the sub machine can sometimes acquire targets. 
+	getMachine()->lock("AIAttackAreaState::update");	// The idle state in the sub machine can sometimes acquire targets.
 												// It is important to not switch out of this state via a sub machine call. jba.
-	/* 
+	/*
 		Note the use of CONVERT_SLEEP_TO_CONTINUE; even if the sub-machine
 		sleeps, we still need to be called every frame.
 	*/
@@ -7395,7 +7401,7 @@ StateReturnType AIAttackAreaState::update()
 // ------------------------------------------------------------------------------------------------
 void AIFaceState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -7408,7 +7414,7 @@ void AIFaceState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferBool(&m_canTurnInPlace);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -7416,7 +7422,7 @@ void AIFaceState::xfer( Xfer *xfer )
 void AIFaceState::loadPostProcess( void )
 {
 	// empty.  jba.
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType AIFaceState::onEnter()
@@ -7431,7 +7437,7 @@ StateReturnType AIFaceState::onEnter()
 	if (m_obj && target == NULL )
 	{
 		// Nothing to face...
-		return STATE_FAILURE; 
+		return STATE_FAILURE;
 	}
 
 	return STATE_CONTINUE;
@@ -7456,7 +7462,7 @@ StateReturnType AIFaceState::update()
 		if (!target)
 		{
 			// Nothing to face.
-			return STATE_FAILURE;	
+			return STATE_FAILURE;
 		}
 		pos = target->getPosition();
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp
index 2d5c5941003..070292cd65c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AITNGuard.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: AITNGuard.cpp 
+// FILE: AITNGuard.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -36,7 +36,7 @@
 /* Revision History:                                                         */
 /*		12/20/2002 : Initial creation - modified from AIGuard.cpp                                           */
 /*---------------------------------------------------------------------------*/
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 #include "Common/Team.h"
@@ -55,11 +55,6 @@
 
 const Real CLOSE_ENOUGH = (25.0f);
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/ )
 {
@@ -78,10 +73,10 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
 	Object *target = TheGameLogic->findObjectByID(bmi->getClearableLastAttacker());
 	bmi->clearLastAttacker();
 
-	// We use the clearable last attacker because we should continue attacking the guy. But if he 
-	// stops attacking us, then we want our timer to kick us off of him and make us go attack 
+	// We use the clearable last attacker because we should continue attacking the guy. But if he
+	// stops attacking us, then we want our timer to kick us off of him and make us go attack
 	// other units instead.
-	
+
 
 	if (!target) {
 		return FALSE;
@@ -91,7 +86,7 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
 		return FALSE;
 	}
 
-	// This is a quick test on the target. It will be duplicated in getAbleToAttackSpecificObject, 
+	// This is a quick test on the target. It will be duplicated in getAbleToAttackSpecificObject,
 	// but the payoff is worth the duplication.
 	if (target->isEffectivelyDead()) {
 		return FALSE;
@@ -105,7 +100,7 @@ static Bool hasAttackedMeAndICanReturnFire( State *thisState, void* /*userData*/
 	return FALSE;
 }
 
-static Object *findBestTunnel(Player *ownerPlayer, const Coord3D *pos) 
+static Object *findBestTunnel(Player *ownerPlayer, const Coord3D *pos)
 {
 	if (!ownerPlayer) return NULL; // should never happen, but hey.  jba.
 	TunnelTracker *tunnels = ownerPlayer->getTunnelSystem();
@@ -139,25 +134,25 @@ Bool TunnelNetworkExitConditions::shouldExit(const StateMachine* machine) const
 		if (TheGameLogic->getFrame() >= m_attackGiveUpFrame)
 		{
 			return true;
-		} 
-	
+		}
+
 	return false;
 }
 
 
 //-- AITNGuardMachine -------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------
-AITNGuardMachine::AITNGuardMachine( Object *owner ) : 
+AITNGuardMachine::AITNGuardMachine( Object *owner ) :
 	StateMachine(owner, "AITNGuardMachine"),
 	m_nemesisToAttack(INVALID_ID),
 	m_guardMode(GUARDMODE_NORMAL)
 {
 	m_positionToGuard.zero();
-	
+
 	static const StateConditionInfo attackAggressors[] =
 	{
 		StateConditionInfo(hasAttackedMeAndICanReturnFire, AI_TN_GUARD_ATTACK_AGGRESSOR, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -182,7 +177,7 @@ AITNGuardMachine::~AITNGuardMachine()
 //--------------------------------------------------------------------------------------
 /*static*/ Real AITNGuardMachine::getStdGuardRange(const Object* obj)
 {
-	Real visionRange = TheAI->getAdjustedVisionRangeForObject(obj, 
+	Real visionRange = TheAI->getAdjustedVisionRangeForObject(obj,
 		AI_VISIONFACTOR_OWNERTYPE | AI_VISIONFACTOR_MOOD | AI_VISIONFACTOR_GUARDINNER);
 
 	return visionRange;
@@ -195,10 +190,10 @@ Bool AITNGuardMachine::lookForInnerTarget(void)
 
 	// Check if team auto targets same victim.
 	Object *teamVictim = NULL;
-	if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+	if (owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 	{
 		teamVictim = owner->getTeam()->getTeamTargetObject();
-		if (teamVictim) 
+		if (teamVictim)
 		{
 			setNemesisID(teamVictim->getID());
 			return true;	// Transitions to AITNGuardInnerState.
@@ -239,7 +234,7 @@ Bool AITNGuardMachine::lookForInnerTarget(void)
 						// winner.
 						ObjectID attackerID = info->in.m_sourceID;
 						Object *attacker = TheGameLogic->findObjectByID(attackerID);
-						
+
 						if( attacker )
 						{
 							if (owner->getRelationship(attacker) != ENEMIES) {
@@ -268,7 +263,7 @@ Bool AITNGuardMachine::lookForInnerTarget(void)
 // ------------------------------------------------------------------------------------------------
 void AITNGuardMachine::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -287,14 +282,14 @@ void AITNGuardMachine::xfer( Xfer *xfer )
 	xfer->xferObjectID(&m_nemesisToAttack);
 	xfer->xferCoord3D(&m_positionToGuard);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AITNGuardMachine::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-- AITNGuardInnerState ----------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -302,7 +297,7 @@ void AITNGuardMachine::loadPostProcess( void )
 // ------------------------------------------------------------------------------------------------
 void AITNGuardInnerState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -314,7 +309,7 @@ void AITNGuardInnerState::xfer( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -322,15 +317,21 @@ void AITNGuardInnerState::xfer( Xfer *xfer )
 void AITNGuardInnerState::loadPostProcess( void )
 {
 	onEnter();
-}  // end loadPostProcess
+}
+
+// ------------------------------------------------------------------------------------------------
+AITNGuardInnerState::~AITNGuardInnerState(void)
+{
+	deleteInstance(m_attackState);
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardInnerState::onEnter( void )
 {
 	Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardInnerState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardInnerState."));
 		return STATE_SUCCESS;
 	}
 	m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
@@ -348,7 +349,7 @@ StateReturnType AITNGuardInnerState::onEnter( void )
 	return STATE_SUCCESS;
 }
 
-static Object *TunnelNetworkScan(Object *owner) 
+static Object *TunnelNetworkScan(Object *owner)
 {
 		PartitionFilterRelationship					f1(owner, PartitionFilterRelationship::ALLOW_ENEMIES);
 		PartitionFilterPossibleToAttack			f2(ATTACK_NEW_TARGET, owner, CMD_FROM_AI);
@@ -371,7 +372,7 @@ static Object *TunnelNetworkScan(Object *owner)
 
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardInnerState::update( void )
-{	
+{
 	Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
 	Player *ownerPlayer = getMachineOwner()->getControllingPlayer();
 	TunnelTracker *tunnels = NULL;
@@ -382,13 +383,13 @@ StateReturnType AITNGuardInnerState::update( void )
 	Object* owner = getMachineOwner();
 	// killed him.
 	Object *teamVictim = owner->getTeam()->getTeamTargetObject();
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		if (teamVictim) 
+		if (teamVictim)
 		{
 			getGuardMachine()->setNemesisID(teamVictim->getID());
 			m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
-			return STATE_CONTINUE;	
+			return STATE_CONTINUE;
 		}
 
 		// Check tunnel.
@@ -397,7 +398,7 @@ StateReturnType AITNGuardInnerState::update( void )
 			if (nemesis) {
 				getGuardMachine()->setNemesisID(nemesis->getID());
 				m_exitConditions.m_attackGiveUpFrame = TheGameLogic->getFrame() + TheAI->getAiData()->m_guardChaseUnitFrames;
-				return STATE_CONTINUE;	
+				return STATE_CONTINUE;
 			}
 		}
 
@@ -417,7 +418,7 @@ StateReturnType AITNGuardInnerState::update( void )
 	} else {
 		if (nemesis != teamVictim && teamVictim != NULL) {
 			tunnels->updateNemesis(nemesis);
-			getGuardMachine()->setNemesisID(teamVictim->getID());	
+			getGuardMachine()->setNemesisID(teamVictim->getID());
 		}
 	}
 	return m_attackState->update();
@@ -426,7 +427,7 @@ StateReturnType AITNGuardInnerState::update( void )
 //--------------------------------------------------------------------------------------
 void AITNGuardInnerState::onExit( StateExitType status )
 {
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
@@ -440,7 +441,7 @@ void AITNGuardInnerState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AITNGuardOuterState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -452,7 +453,7 @@ void AITNGuardOuterState::xfer( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -460,7 +461,13 @@ void AITNGuardOuterState::xfer( Xfer *xfer )
 void AITNGuardOuterState::loadPostProcess( void )
 {						 AITNGuardOuterState
 	onEnter();
-}  // end loadPostProcess
+}
+
+// ------------------------------------------------------------------------------------------------
+AITNGuardOuterState::~AITNGuardOuterState(void)
+{
+	deleteInstance(m_attackState);
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardOuterState::onEnter( void )
@@ -472,9 +479,9 @@ StateReturnType AITNGuardOuterState::onEnter( void )
 	}
 
 	Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardOuterState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardOuterState."));
 		return STATE_SUCCESS;
 	}
 
@@ -496,7 +503,7 @@ StateReturnType AITNGuardOuterState::update( void )
 {
 	Object *owner = getMachineOwner();
 	Object* goalObj = m_attackState->getMachineGoalObject();
-	if (goalObj) 
+	if (goalObj)
 	{
 	}	else {
 		Object* nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID()) ;
@@ -505,25 +512,25 @@ StateReturnType AITNGuardOuterState::update( void )
 		}
 		// Check if team auto targets same victim.
 		Object *teamVictim = NULL;
-		if (goalObj == NULL && owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+		if (goalObj == NULL && owner->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 		{
 			teamVictim = owner->getTeam()->getTeamTargetObject();
-			if (teamVictim) 
-			{	
-				goalObj = teamVictim;	
+			if (teamVictim)
+			{
+				goalObj = teamVictim;
 			}
 			m_attackState->getMachine()->setGoalObject(goalObj);
 			return m_attackState->onEnter();
 		}
 	}
-	
+
 	return m_attackState->update();
 }
 
 //--------------------------------------------------------------------------------------
 void AITNGuardOuterState::onExit( StateExitType status )
 {
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
@@ -538,7 +545,7 @@ void AITNGuardOuterState::onExit( StateExitType status )
 void AITNGuardReturnState::crc( Xfer *xfer )
 {
 	AIEnterState::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -551,9 +558,9 @@ void AITNGuardReturnState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	AIEnterState::xfer(xfer);
-	
+
 	xfer->xferUnsignedInt(&m_nextReturnScanTime);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -561,7 +568,7 @@ void AITNGuardReturnState::xfer( Xfer *xfer )
 void AITNGuardReturnState::loadPostProcess( void )
 {
 	AIEnterState::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardReturnState::onEnter( void )
@@ -575,14 +582,14 @@ StateReturnType AITNGuardReturnState::onEnter( void )
 	}
 	if (getMachineOwner()->getTeam()) {
 		Object *teamVictim = getMachineOwner()->getTeam()->getTeamTargetObject();
-		if (teamVictim)	{	
+		if (teamVictim)	{
 			// We have a team target.  Go attack it rather than returning to the tunel. jba [8/24/2003]
 			getGuardMachine()->setNemesisID(teamVictim->getID());
-			return STATE_FAILURE; // Fail to return goes to inner attack state.	
+			return STATE_FAILURE; // Fail to return goes to inner attack state.
 		}
 	}
 // no, no, no, don't do this in onEnter, unless you like really slow maps. (srj)
-//	if (getGuardMachine()->lookForInnerTarget()) 
+//	if (getGuardMachine()->lookForInnerTarget())
 //		return STATE_FAILURE; // early termination because we found a target.
 
 	// Find tunnel network to enter.
@@ -592,7 +599,7 @@ StateReturnType AITNGuardReturnState::onEnter( void )
 
 	getMachine()->setGoalObject(bestTunnel);
 	getMachineOwner()->getAI()->friend_setGoalObject(bestTunnel);
-	
+
 	return AIEnterState::onEnter();
 }
 
@@ -602,9 +609,9 @@ StateReturnType AITNGuardReturnState::update( void )
 	Player *ownerPlayer = getMachineOwner()->getControllingPlayer();
 	if (getMachineOwner()->getTeam()) {
 		Object *teamVictim = getMachineOwner()->getTeam()->getTeamTargetObject();
-		if (teamVictim)	{	
+		if (teamVictim)	{
 			getGuardMachine()->setNemesisID(teamVictim->getID());
-			return STATE_FAILURE; // Fail to return goes to inner attack state.	
+			return STATE_FAILURE; // Fail to return goes to inner attack state.
 		}
 	}
 	// Check tunnel for target.
@@ -616,12 +623,12 @@ StateReturnType AITNGuardReturnState::update( void )
 	if (tunnels) {
 		Object *nemesis = tunnels->getCurNemesis();
 		if (nemesis) {
-			// Check distance.  
+			// Check distance.
 			//Coord3D dist;
 			//Coord3D curPos;
 			//dist.set()
 			getGuardMachine()->setNemesisID(nemesis->getID());
-			return STATE_FAILURE; // Fail to return goes to inner attack state.	
+			return STATE_FAILURE; // Fail to return goes to inner attack state.
 		}
 	}
 
@@ -629,7 +636,7 @@ StateReturnType AITNGuardReturnState::update( void )
 	StateReturnType ret = AIEnterState::update();
 	if (ret==STATE_CONTINUE) return STATE_CONTINUE;
 	return STATE_SUCCESS;
-	
+
 }
 
 //--------------------------------------------------------------------------------------
@@ -644,7 +651,7 @@ void AITNGuardReturnState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void AITNGuardIdleState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -655,22 +662,22 @@ void AITNGuardIdleState::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
-	
+
 	xfer->xferUnsignedInt(&m_nextEnemyScanTime);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void AITNGuardIdleState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardIdleState::onEnter( void )
 {
 	// first time thru, use a random amount so that everyone doesn't scan on the same frame,
-	// to avoid "spikes". 
+	// to avoid "spikes".
 	UnsignedInt now = TheGameLogic->getFrame();
 	m_nextEnemyScanTime = now + GameLogicRandomValue(0, TheAI->getAiData()->m_guardEnemyScanRate);
 
@@ -681,7 +688,7 @@ StateReturnType AITNGuardIdleState::onEnter( void )
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardIdleState::update( void )
 {
-	//DEBUG_LOG(("AITNGuardIdleState frame %d: %08lx\n",TheGameLogic->getFrame(),getMachineOwner()));
+	//DEBUG_LOG(("AITNGuardIdleState frame %d: %08lx",TheGameLogic->getFrame(),getMachineOwner()));
 
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (now < m_nextEnemyScanTime)
@@ -697,19 +704,19 @@ StateReturnType AITNGuardIdleState::update( void )
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAIUpdateInterface();
 	// Check to see if we have created a crate we need to pick up.
-	if (ai->getCrateID() != INVALID_ID) 
+	if (ai->getCrateID() != INVALID_ID)
 	{
 		getMachine()->setState(AI_TN_GUARD_GET_CRATE);
 		return STATE_SLEEP(m_nextEnemyScanTime - now);
 	}
 
 	// if anyone is in the inner area, return success.
-	if (getGuardMachine()->lookForInnerTarget()) 
+	if (getGuardMachine()->lookForInnerTarget())
 	{
 		Object *nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID());
-		if (nemesis == NULL) 
+		if (nemesis == NULL)
 		{
-			DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardAttackAggressorState.\n"));
+			DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardAttackAggressorState."));
 			return STATE_SLEEP(0);
 		}
 		if (getMachineOwner()->getContainedBy()) {
@@ -744,14 +751,14 @@ AITNGuardPickUpCrateState::AITNGuardPickUpCrateState( StateMachine *machine )	:
 {
 #ifdef STATE_MACHINE_DEBUG
 		setName("AITNGuardPickUpCrateState");
-#endif	
+#endif
 }
 //--------------------------------------------------------------------------------------
 StateReturnType AITNGuardPickUpCrateState::onEnter( void )
 {
 	Object *owner = getMachineOwner();
 	AIUpdateInterface *ai = owner->getAIUpdateInterface();
-	
+
 	// Check to see if we have created a crate we need to pick up.
 	Object* crate = ai->checkForCrateToPickup();
 	if (crate)
@@ -772,17 +779,23 @@ StateReturnType AITNGuardPickUpCrateState::update( void )
 //--------------------------------------------------------------------------------------
 void AITNGuardPickUpCrateState::onExit( StateExitType status )
 {
-	
+
 }
 
 //-- AITNGuardAttackAggressorState ------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-AITNGuardAttackAggressorState::AITNGuardAttackAggressorState( StateMachine *machine ) : 
+AITNGuardAttackAggressorState::AITNGuardAttackAggressorState( StateMachine *machine ) :
 	State( machine, "AITNGuardAttackAggressorState" )
 {
 	m_attackState = NULL;
 }
 
+// ------------------------------------------------------------------------------------------------
+AITNGuardAttackAggressorState::~AITNGuardAttackAggressorState(void)
+{
+	deleteInstance(m_attackState);
+}
+
 //-------------------------------------------------------------------------------------------------
 StateReturnType AITNGuardAttackAggressorState::onEnter( void )
 {
@@ -791,14 +804,14 @@ StateReturnType AITNGuardAttackAggressorState::onEnter( void )
 
 	if (obj->getBodyModule() && obj->getBodyModule()->getLastDamageInfo()->in.m_sourceID) {
 		nemID = obj->getBodyModule()->getLastDamageInfo()->in.m_sourceID;
-		getGuardMachine()->setNemesisID(nemID);	 
+		getGuardMachine()->setNemesisID(nemID);
 
 	}
 
 	Object *nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID());
-	if (nemesis == NULL) 
+	if (nemesis == NULL)
 	{
-		DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardAttackAggressorState.\n"));
+		DEBUG_LOG(("Unexpected NULL nemesis in AITNGuardAttackAggressorState."));
 		return STATE_SUCCESS;
 	}
 
@@ -824,7 +837,7 @@ StateReturnType AITNGuardAttackAggressorState::onEnter( void )
 
 //-------------------------------------------------------------------------------------------------
 StateReturnType AITNGuardAttackAggressorState::update( void )
-{	
+{
 	if (m_attackState->getMachine()->getCurrentStateID() == AttackStateMachine::FIRE_WEAPON) {
 		Object *nemesis = TheGameLogic->findObjectByID(getGuardMachine()->getNemesisID());
 		Player *ownerPlayer = getMachineOwner()->getControllingPlayer();
@@ -841,14 +854,14 @@ StateReturnType AITNGuardAttackAggressorState::update( void )
 void AITNGuardAttackAggressorState::onExit( StateExitType status )
 {
 	Object *obj = getMachineOwner();
-	if (m_attackState) 
+	if (m_attackState)
 	{
 		m_attackState->onExit(status);
 		deleteInstance(m_attackState);
 		m_attackState = NULL;
 	}
 
-	if (obj->getTeam()) 
+	if (obj->getTeam())
 	{
 		obj->getTeam()->setTeamTargetObject(NULL); // clear the target.
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/Squad.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/Squad.cpp
index 8ed94f20e64..291e622e712 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/Squad.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/Squad.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: Squad.cpp 
+// FILE: Squad.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -36,7 +36,7 @@
 /* Revision History:                                                         */
 /*		4/19/2002 : Initial creation                                          */
 /*---------------------------------------------------------------------------*/
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameLogic/Squad.h"
 
@@ -48,11 +48,6 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Object.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // addObject //////////////////////////////////////////////////////////////////////////////////////
 void Squad::addObject(Object *objectToAdd)
@@ -105,19 +100,19 @@ const VecObjectPtr& Squad::getAllObjects(void) // Not a const function cause we
 }
 
 // getLiveObjects /////////////////////////////////////////////////////////////////////////////////
-const VecObjectPtr& Squad::getLiveObjects(void) 
+const VecObjectPtr& Squad::getLiveObjects(void)
 {
 	// first get all the objects.
 	// cheat, since we are a member function, and just use m_objectsCached
 	getAllObjects();
 	for (VecObjectPtrIt it = m_objectsCached.begin(); it != m_objectsCached.end(); ) {
 		if (!(*it)->isSelectable()) {
-			it = m_objectsCached.erase(it);		
+			it = m_objectsCached.erase(it);
 		} else {
 			++it;
 		}
 	}
-	
+
 	return m_objectsCached;
 }
 
@@ -142,8 +137,8 @@ Bool Squad::isOnSquad(const Object *objToTest) const
 }
 
 /**
- * There should never be a TeamFromSqaud as Teams are entirely a construct to work with the AI. 
- * Since things can only be on one Team at a time, creating a Team from an arbitrary Squad will 
+ * There should never be a TeamFromSqaud as Teams are entirely a construct to work with the AI.
+ * Since things can only be on one Team at a time, creating a Team from an arbitrary Squad will
  * cause weird, difficult to reproduce bugs. Please don't do it.
  */
 
@@ -184,7 +179,7 @@ void Squad::aiGroupFromSquad(AIGroup* aiGroupToFill)
 	if (!aiGroupToFill) {
 		return;
 	}
-	
+
 	// cheat, since we are a member function, and just use m_objectsCached
 	getLiveObjects();
 	for (VecObjectPtr::iterator it = m_objectsCached.begin(); it != m_objectsCached.end(); ++it) {
@@ -198,7 +193,7 @@ void Squad::aiGroupFromSquad(AIGroup* aiGroupToFill)
 void Squad::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -231,20 +226,20 @@ void Squad::xfer( Xfer *xfer )
 			objectID = *it;
 			xfer->xferObjectID( &objectID );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
-		
+
 		// the cached objects list should be empty
-		if( m_objectsCached.size() != 0 )
+		if( !m_objectsCached.empty() )
 		{
 
-			DEBUG_CRASH(( "Squad::xfer - m_objectsCached should be emtpy, but is not\n" ));
+			DEBUG_CRASH(( "Squad::xfer - m_objectsCached should be emtpy, but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end of
+		}
 
 		// read all items
 		for( UnsignedShort i = 0; i < objectCount; ++i )
@@ -256,11 +251,11 @@ void Squad::xfer( Xfer *xfer )
 			// put on list
 			m_objectIDs.push_back( objectID );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -268,4 +263,4 @@ void Squad::xfer( Xfer *xfer )
 void Squad::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp
index a9dddbdc521..073f5b4fd01 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp
@@ -22,11 +22,11 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// TurretAI.cpp 
+// TurretAI.cpp
 // Turret behavior implementation
 // Author: Steven Johnson, April 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES
 
@@ -47,18 +47,13 @@
 
 const UnsignedInt WAIT_INDEFINITELY = 0xffffffff;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 static StateReturnType frameToSleepTime(
-	UnsignedInt frame1, 
-	UnsignedInt frame2 = FOREVER, 
-	UnsignedInt frame3 = FOREVER, 
+	UnsignedInt frame1,
+	UnsignedInt frame2 = FOREVER,
+	UnsignedInt frame3 = FOREVER,
 	UnsignedInt frame4 = FOREVER
 )
 {
@@ -83,15 +78,15 @@ static StateReturnType frameToSleepTime(
 
 //----------------------------------------------------------------------------------------------------------
 /**
- * Create a TurretAI state machine. Define all of the states the machine 
+ * Create a TurretAI state machine. Define all of the states the machine
  * can possibly be in, and set the initial (default) state.
  */
 TurretStateMachine::TurretStateMachine( TurretAI* tai, Object *obj, AsciiString name ) : m_turretAI(tai), StateMachine( obj, name )
 {
-	static const StateConditionInfo fireConditions[] = 
+	static const StateConditionInfo fireConditions[] =
 	{
 		StateConditionInfo(outOfWeaponRangeObject, TURRETAI_AIM, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -148,25 +143,25 @@ StateReturnType TurretStateMachine::setState(StateID newStateID)
 // ------------------------------------------------------------------------------------------------
 void TurretStateMachine::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void TurretStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void TurretStateMachine::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------------------------
@@ -233,9 +228,9 @@ void TurretAIData::parseTurretSweepSpeed(INI* ini, void *instance, void * /*stor
 }
 
 //----------------------------------------------------------------------------------------------------------
-void TurretAIData::buildFieldParse(MultiIniFieldParse& p) 
+void TurretAIData::buildFieldParse(MultiIniFieldParse& p)
 {
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "TurretTurnRate",					INI::parseAngularVelocityReal,				NULL, offsetof( TurretAIData, m_turnRate ) },
 		{ "TurretPitchRate",				INI::parseAngularVelocityReal,				NULL, offsetof( TurretAIData, m_pitchRate ) },
@@ -269,7 +264,7 @@ void TurretAIData::buildFieldParse(MultiIniFieldParse& p)
 //----------------------------------------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------------------------------------
-TurretAI::TurretAI(Object* owner, const TurretAIData* data, WhichTurretType tur) : 
+TurretAI::TurretAI(Object* owner, const TurretAIData* data, WhichTurretType tur) :
 	m_owner(owner),
 	m_whichTurret(tur),
 	m_data(data),
@@ -285,15 +280,9 @@ TurretAI::TurretAI(Object* owner, const TurretAIData* data, WhichTurretType tur)
 	m_enabled(!data->m_initiallyDisabled),
 	m_firesWhileTurning(data->m_firesWhileTurning),
 	m_isForceAttacking(false),
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_victimInitialTeam(NULL)
-	//
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_continuousFireExpirationFrame = -1;
-	//
 	if (!m_data)
 	{
 		DEBUG_CRASH(("TurretAI MUST have ModuleData"));
@@ -326,8 +315,7 @@ TurretAI::~TurretAI()
 {
 	stopRotOrPitchSound();
 
-	if (m_turretStateMachine)
-		deleteInstance(m_turretStateMachine);
+	deleteInstance(m_turretStateMachine);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -335,7 +323,7 @@ TurretAI::~TurretAI()
 // ------------------------------------------------------------------------------------------------
 void TurretAI::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -347,16 +335,16 @@ void TurretAI::xfer( Xfer *xfer )
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
 
-/* These 4 are loaded on creation, and don't change. jba. 
+/* These 4 are loaded on creation, and don't change. jba.
 	const TurretAIData*				m_data;
 	WhichTurretType						m_whichTurret;
-	Object*										m_owner;								
+	Object*										m_owner;
 	AudioEventRTS							m_turretRotOrPitchSound;		///< Sound of turret rotation
 	*/
 	xfer->xferSnapshot(m_turretStateMachine);
 
-	xfer->xferReal(&m_angle);									
-	xfer->xferReal(&m_pitch);									
+	xfer->xferReal(&m_angle);
+	xfer->xferReal(&m_pitch);
 	xfer->xferUnsignedInt(&m_enableSweepUntil);
 
 	xfer->xferUser(&m_target, sizeof(m_target));
@@ -375,7 +363,7 @@ void TurretAI::xfer( Xfer *xfer )
 	if (version >= 2)
 		xfer->xferUnsignedInt(&m_sleepUntil);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -386,7 +374,7 @@ void TurretAI::loadPostProcess( void )
 	if (victim) {
 		m_victimInitialTeam = victim->getTeam();
 	}
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 Bool TurretAI::friend_turnTowardsAngle(Real desiredAngle, Real rateModifier, Real relThresh)
@@ -409,7 +397,7 @@ Bool TurretAI::friend_turnTowardsAngle(Real desiredAngle, Real rateModifier, Rea
 	}
 	else
 	{
-		if (angleDiff > 0) 
+		if (angleDiff > 0)
 			actualAngle += turnRate;
 		else
 			actualAngle -= turnRate;
@@ -419,7 +407,7 @@ Bool TurretAI::friend_turnTowardsAngle(Real desiredAngle, Real rateModifier, Rea
 	}
 
 	m_angle = normalizeAngle(actualAngle);
-	
+
 	if( m_angle != origAngle )
 		getOwner()->reactToTurretChange( m_whichTurret, origAngle, m_pitch );
 
@@ -463,7 +451,7 @@ Bool TurretAI::friend_turnTowardsPitch(Real desiredPitch, Real rateModifier)
 //----------------------------------------------------------------------------------------------------------
 Bool TurretAI::isWeaponSlotOkToFire(WeaponSlotType wslot) const
 {
-  // If we turrets are linked, ai wants us to fire together, regardless of slot 
+  // If we turrets are linked, ai wants us to fire together, regardless of slot
   if( getOwner()->getAI()->areTurretsLinked() )
     return TRUE;
 
@@ -473,7 +461,7 @@ Bool TurretAI::isWeaponSlotOkToFire(WeaponSlotType wslot) const
 //----------------------------------------------------------------------------------------------------------
 Real TurretAI::getTurretFireAngleSweepForWeaponSlot( WeaponSlotType slot ) const
 {
-	return m_data->m_turretFireAngleSweep[slot];	
+	return m_data->m_turretFireAngleSweep[slot];
 }
 
 //----------------------------------------------------------------------------------------------------------
@@ -542,7 +530,7 @@ TurretTargetType TurretAI::friend_getTurretTarget( Object*& obj, Coord3D& pos, B
 	else if (m_target == TARGET_POSITION)
 	{
 		obj = NULL;
-		pos = *m_turretStateMachine->getGoalPosition(); 
+		pos = *m_turretStateMachine->getGoalPosition();
 	}
 
 	return m_target;
@@ -595,7 +583,7 @@ void TurretAI::setTurretTargetObject( Object *victim, Bool forceAttacking )
 	{
 		// if we're already in the aim state, don't call setState, since
 		// it would go thru the exit/enter stuff, which we don't really want
-		// to do... 
+		// to do...
 		if (sid != TURRETAI_AIM && sid != TURRETAI_FIRE)
 			m_turretStateMachine->setState( TURRETAI_AIM );
 		m_victimInitialTeam = victim->getTeam();
@@ -635,7 +623,7 @@ void TurretAI::setTurretTargetPosition( const Coord3D* pos )
 	{
 		// if we're already in the aim state, don't call setState, since
 		// it would go thru the exit/enter stuff, which we don't really want
-		// to do... 
+		// to do...
 		if (sid != TURRETAI_AIM && sid != TURRETAI_FIRE)
 			m_turretStateMachine->setState( TURRETAI_AIM );
 		m_victimInitialTeam = NULL;
@@ -664,7 +652,7 @@ Bool TurretAI::isTurretInNaturalPosition() const
 
 
 
-	if( getNaturalTurretAngle() == getTurretAngle() && 
+	if( getNaturalTurretAngle() == getTurretAngle() &&
 			getNaturalTurretPitch() == getTurretPitch() )
 	{
 		return true;
@@ -689,9 +677,9 @@ UpdateSleepTime TurretAI::updateTurretAI()
 {
 	USE_PERF_TIMER(TurretAI)
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	DEBUG_ASSERTCRASH(!m_enabled ||
-							m_turretStateMachine->peekSleepTill() == 0 || 
+							m_turretStateMachine->peekSleepTill() == 0 ||
 							m_turretStateMachine->peekSleepTill() >= m_sleepUntil, ("Turret Machine is less sleepy than turret"));
 #endif
 
@@ -701,7 +689,7 @@ UpdateSleepTime TurretAI::updateTurretAI()
 		return UPDATE_SLEEP(m_sleepUntil - now);
 	}
 
-	//DEBUG_LOG(("updateTurretAI frame %d: %08lx\n",TheGameLogic->getFrame(),getOwner()));
+	//DEBUG_LOG(("updateTurretAI frame %d: %08lx",TheGameLogic->getFrame(),getOwner()));
 	UpdateSleepTime subMachineSleep = UPDATE_SLEEP_FOREVER;	// assume the best!
 
 	// either we don't care about continuous fire stuff, or we care, but time has elapsed
@@ -739,18 +727,18 @@ UpdateSleepTime TurretAI::updateTurretAI()
 		}
 		else
 		{
-			// it's STATE_CONTINUE, STATE_SUCCESS, or STATE_FAILURE, 
+			// it's STATE_CONTINUE, STATE_SUCCESS, or STATE_FAILURE,
 			// any of which will probably require next frame
 			subMachineSleep = UPDATE_SLEEP_NONE;
 		}
 
-	}	// if enabled or recentering
+	}
 
 	m_sleepUntil = now + subMachineSleep;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	DEBUG_ASSERTCRASH(!m_enabled ||
-							m_turretStateMachine->peekSleepTill() == 0 || 
+							m_turretStateMachine->peekSleepTill() == 0 ||
 							m_turretStateMachine->peekSleepTill() >= m_sleepUntil, ("Turret Machine is less sleepy than turret"));
 #endif
 
@@ -774,7 +762,7 @@ void TurretAI::setTurretEnabled( Bool enabled )
  */
 void TurretAI::startRotOrPitchSound()
 {
-	if (!m_turretRotOrPitchSound.isCurrentlyPlaying()) 
+	if (!m_turretRotOrPitchSound.isCurrentlyPlaying())
 	{
 		m_turretRotOrPitchSound.setObjectID(m_owner->getID());
 		m_turretRotOrPitchSound.setPlayingHandle(TheAudio->addAudioEvent(&m_turretRotOrPitchSound));
@@ -787,7 +775,7 @@ void TurretAI::startRotOrPitchSound()
  */
 void TurretAI::stopRotOrPitchSound()
 {
-	if (m_turretRotOrPitchSound.isCurrentlyPlaying()) 
+	if (m_turretRotOrPitchSound.isCurrentlyPlaying())
 	{
 		TheAudio->removeAudioEvent(m_turretRotOrPitchSound.getPlayingHandle());
 	}
@@ -844,8 +832,8 @@ Bool TurretAI::friend_isAnyWeaponInRangeOf(const Object* o) const
 			continue;
 
 		if (w->isWithinAttackRange(getOwner(), o)
-				// srj sez: not sure if we want to do this or not.  
-				// jba sez: no, don't do this.  isWithinAttackRange checks terrain los now, and 
+				// srj sez: not sure if we want to do this or not.
+				// jba sez: no, don't do this.  isWithinAttackRange checks terrain los now, and
 				// some weapons (like tomahawk) can fire beyond los, so this check is problematical here.
 				//  && w->isClearFiringLineOfSightTerrain(getOwner(), o)
 			)
@@ -858,8 +846,8 @@ Bool TurretAI::friend_isAnyWeaponInRangeOf(const Object* o) const
 }
 
 //----------------------------------------------------------------------------------------------------------
-Bool TurretAI::friend_isSweepEnabled() const 
-{ 
+Bool TurretAI::friend_isSweepEnabled() const
+{
 	if (m_enableSweepUntil != 0 && m_enableSweepUntil > TheGameLogic->getFrame())
 		return true;
 
@@ -871,7 +859,7 @@ UnsignedInt TurretAI::friend_getNextIdleMoodTargetFrame() const
 {
 	const Object* obj = getOwner();
 	const AIUpdateInterface *ai = obj->getAIUpdateInterface();
-	// ai can be null during object construction. 
+	// ai can be null during object construction.
 	return ai ? ai->getNextMoodCheckTime() : TheGameLogic->getFrame();
 }
 
@@ -886,10 +874,10 @@ void TurretAI::friend_checkForIdleMoodTarget()
 	UnsignedInt moodAdjust = ai->getMoodMatrixActionAdjustment(MM_Action_Idle);
 	if (moodAdjust & MAA_Affect_Range_IgnoreAll)
 		return;
-	
+
 	// If we're supposed to attack based on mood, etc, then we will do so.
 	Object* enemy = ai->getNextMoodTarget( true, true );
-	if (enemy) 
+	if (enemy)
 	{
 		setTurretTargetObject(enemy, FALSE);
 		obj->chooseBestWeaponForTarget(enemy, PREFER_MOST_DAMAGE, CMD_FROM_AI);
@@ -967,7 +955,7 @@ StateReturnType TurretAIAimTurretState::onEnter()
  */
 StateReturnType TurretAIAimTurretState::update()
 {
-	//DEBUG_LOG(("TurretAIAimTurretState frame %d: %08lx\n",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
+	//DEBUG_LOG(("TurretAIAimTurretState frame %d: %08lx",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
 
 	TurretAI* turret = getTurretAI();
 	Object* obj = turret->getOwner();
@@ -997,20 +985,20 @@ StateReturnType TurretAIAimTurretState::update()
 			Bool isPrimaryEnemy = (enemy && enemy == ai->getGoalObject());
 			// if the enemy is gone, or we're out of range, or it changed teams, the attack is over
 			Bool ableToAttackTarget = obj->isAbleToAttack();
-			if (ableToAttackTarget) 
+			if (ableToAttackTarget)
 			{
 				// srj sez: since we have already acquired this target, we should use
 				// the CONTINUED attack tests, not the new ones.
 				CanAttackResult result = obj->getAbleToAttackSpecificObject(
-							turret->isForceAttacking() ? ATTACK_CONTINUED_TARGET_FORCED : ATTACK_CONTINUED_TARGET, 
-							enemy, 
-							ai->getLastCommandSource() 
+							turret->isForceAttacking() ? ATTACK_CONTINUED_TARGET_FORCED : ATTACK_CONTINUED_TARGET,
+							enemy,
+							ai->getLastCommandSource()
 						);
 				ableToAttackTarget = result == ATTACKRESULT_POSSIBLE || result == ATTACKRESULT_POSSIBLE_AFTER_MOVING;
 			}
-			
+
 			nothingInRange = !turret->friend_isAnyWeaponInRangeOf(enemy);
-			if (enemy == NULL || !ableToAttackTarget || 
+			if (enemy == NULL || !ableToAttackTarget ||
 					(!isPrimaryEnemy && nothingInRange) ||
 					enemy->getTeam() != turret->friend_getVictimInitialTeam()
 			)
@@ -1023,22 +1011,22 @@ StateReturnType TurretAIAimTurretState::update()
 			}
 
 			// aim turret towards enemy (turret angle is relative to its parent object)
-			if (enemy->isKindOf(KINDOF_BRIDGE)) 
+			if (enemy->isKindOf(KINDOF_BRIDGE))
 			{
 				// Special case - bridges have two attackable points at either end.
 				TBridgeAttackInfo info;
 				TheTerrainLogic->getBridgeAttackPoints(enemy, &info);
 				Real distSqr = ThePartitionManager->getDistanceSquared( obj, &info.attackPoint1, FROM_BOUNDINGSPHERE_3D );
-				if (distSqr > ThePartitionManager->getDistanceSquared( obj, &info.attackPoint2, FROM_BOUNDINGSPHERE_3D ) ) 
+				if (distSqr > ThePartitionManager->getDistanceSquared( obj, &info.attackPoint2, FROM_BOUNDINGSPHERE_3D ) )
 				{
 					enemyPosition = info.attackPoint2;
-				}	
-				else 
+				}
+				else
 				{
 					enemyPosition = info.attackPoint1;
 				}
-			}	
-			else 
+			}
+			else
 			{
 				enemyPosition = *enemy->getPosition();
 			}
@@ -1068,16 +1056,16 @@ StateReturnType TurretAIAimTurretState::update()
 
 	WeaponSlotType slot;
 	Weapon *curWeapon = obj->getCurrentWeapon( &slot );
-	if (!curWeapon) 
+	if (!curWeapon)
 	{
-		DEBUG_CRASH(("TurretAIAimTurretState::update - curWeapon is NULL.\n"));
+		DEBUG_CRASH(("TurretAIAimTurretState::update - curWeapon is NULL."));
 		return STATE_FAILURE;
 	}
 
 	Real turnSpeedModifier = 1.0f;// Just like how recentering turns you half speed, sweeping can change your turn speed
-	
+
 	Real relAngle = ThePartitionManager->getRelativeAngle2D( obj, &enemyPosition );
-	
+
 	Real aimAngle = relAngle;
 	Real sweep = turret->getTurretFireAngleSweepForWeaponSlot( slot );
 	if (sweep > 0.0f && turret->friend_isSweepEnabled())
@@ -1124,15 +1112,15 @@ StateReturnType TurretAIAimTurretState::update()
 
 			//GetVectorTo only takes Object as the first, but we want the angle from our Weapon to the
 			// target, not us to the target.  Raise our side to get the line to make sense.
-			v.z -= obj->getGeometryInfo().getMaxHeightAbovePosition() / 2; // I kinda hate our logic/client split.  
+			v.z -= obj->getGeometryInfo().getMaxHeightAbovePosition() / 2; // I kinda hate our logic/client split.
 			//The point to fire from should be intrinsic to the turret, but in reality it is very slow to look it up.
 
  			Real actualPitch;
  			if( v.length() > 0 )
- 				actualPitch = ASin( v.z / v.length() ); 
+ 				actualPitch = ASin( v.z / v.length() );
  			else
  				actualPitch = 0;// Don't point at NAN, just point at 0 if they are right on us
- 
+
 			desiredPitch = actualPitch;
 			if( desiredPitch < turret->getMinPitch() )
 			{
@@ -1152,7 +1140,7 @@ StateReturnType TurretAIAimTurretState::update()
 				if (adjust) {
 					Real range = curWeapon->getAttackRange(obj);
 					Real dist = v.length();
-					if (range<1) range = 1; // paranoia. jba.		 
+					if (range<1) range = 1; // paranoia. jba.
 					// As the unit gets closer, reduce the pitch so we don't shoot over him.
 					Real groundPitch = turret->getGroundUnitPitch() * (dist/range);
 					desiredPitch = actualPitch+groundPitch;
@@ -1167,10 +1155,10 @@ StateReturnType TurretAIAimTurretState::update()
 		pitchAlignedToNemesis = turret->friend_turnTowardsPitch(desiredPitch, 1.0f);
 	}
 
-	// For now, we require that we're within range before we can successfully exit the AIM state, 
+	// For now, we require that we're within range before we can successfully exit the AIM state,
 	// and move into the FIRE state.
-	if (turnAlignedToNemesis && pitchAlignedToNemesis && 
-		((enemyForDistanceCheckOnly && curWeapon->isWithinAttackRange(obj, enemyForDistanceCheckOnly)) || 
+	if (turnAlignedToNemesis && pitchAlignedToNemesis &&
+		((enemyForDistanceCheckOnly && curWeapon->isWithinAttackRange(obj, enemyForDistanceCheckOnly)) ||
 		 (!enemyForDistanceCheckOnly && curWeapon->isWithinAttackRange(obj, &enemyPosition))))
 	{
 #ifdef INTER_TURRET_DELAY
@@ -1225,7 +1213,7 @@ StateReturnType TurretAIRecenterTurretState::onEnter()
 
 StateReturnType TurretAIRecenterTurretState::update()
 {
-	//DEBUG_LOG(("TurretAIRecenterTurretState frame %d: %08lx\n",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
+	//DEBUG_LOG(("TurretAIRecenterTurretState frame %d: %08lx",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
 
 
   if( getMachineOwner()->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION))
@@ -1259,7 +1247,7 @@ void TurretAIRecenterTurretState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void TurretAIIdleState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1272,14 +1260,14 @@ void TurretAIIdleState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUnsignedInt(&m_nextIdleScan);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void TurretAIIdleState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 void TurretAIIdleState::resetIdleScan()
@@ -1293,13 +1281,13 @@ void TurretAIIdleState::resetIdleScan()
 StateReturnType TurretAIIdleState::onEnter()
 {
 	AIUpdateInterface *ai = getMachineOwner()->getAIUpdateInterface();
-	if (ai) 
+	if (ai)
 	{
 		ai->resetNextMoodCheckTime();
 		if (ai->friend_getTurretSync() == getTurretAI()->friend_getWhichTurret())
 			ai->friend_setTurretSync(TURRET_INVALID);
-	} // ai doesn't exist if the object was just created this frame.
-	
+	}
+
 	resetIdleScan();
 
 	TurretAI* turret = getTurretAI();
@@ -1309,12 +1297,12 @@ StateReturnType TurretAIIdleState::onEnter()
 //----------------------------------------------------------------------------------------------------------
 StateReturnType TurretAIIdleState::update()
 {
-	//DEBUG_LOG(("TurretAIIdleState frame %d: %08lx\n",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
+	//DEBUG_LOG(("TurretAIIdleState frame %d: %08lx",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
 
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (now >= m_nextIdleScan)
 	{
-		// this is redundant, since we're exiting the state, and will reset 
+		// this is redundant, since we're exiting the state, and will reset
 		// it again in onEnter next time (srj)
 		// resetIdleScan();
 
@@ -1336,7 +1324,7 @@ StateReturnType TurretAIIdleState::update()
 // ------------------------------------------------------------------------------------------------
 void TurretAIIdleScanState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1349,14 +1337,14 @@ void TurretAIIdleScanState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferReal(&m_desiredAngle);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void TurretAIIdleScanState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType TurretAIIdleScanState::onEnter()
@@ -1380,7 +1368,7 @@ StateReturnType TurretAIIdleScanState::onEnter()
 
 StateReturnType TurretAIIdleScanState::update()
 {
-	//DEBUG_LOG(("TurretAIIdleScanState frame %d: %08lx\n",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
+	//DEBUG_LOG(("TurretAIIdleScanState frame %d: %08lx",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
 
   if( getMachineOwner()->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION))
     return STATE_CONTINUE;//ML so that under-construction base-defenses do not idle-scan while under construction
@@ -1411,7 +1399,7 @@ void TurretAIIdleScanState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void TurretAIHoldTurretState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1424,14 +1412,14 @@ void TurretAIHoldTurretState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUnsignedInt(&m_timestamp);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void TurretAIHoldTurretState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------------------------
 StateReturnType TurretAIHoldTurretState::onEnter()
@@ -1454,7 +1442,7 @@ void TurretAIHoldTurretState::onExit( StateExitType status )
 
 StateReturnType TurretAIHoldTurretState::update()
 {
-	//DEBUG_LOG(("TurretAIHoldTurretState frame %d: %08lx\n",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
+	//DEBUG_LOG(("TurretAIHoldTurretState frame %d: %08lx",TheGameLogic->getFrame(),getTurretAI()->getOwner()));
 
 	if (TheGameLogic->getFrame() >= m_timestamp)
 		return STATE_SUCCESS;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp
index 5e1dc0fb657..6059e774eac 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp
@@ -26,7 +26,7 @@
 // Class to encapsulate polygon trigger areas.
 // Author: John Ahlquist, November 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/DataChunk.h"
 #include "Common/MapObject.h"
@@ -50,11 +50,8 @@ m_exportWithScripts(false),
 m_isWaterArea(false),
 m_shouldRender(true),
 m_selected(false),
-//Added By Sadullah Nader
-//Initializations inserted
 m_isRiver(FALSE),
 m_riverStart(0)
-//
 {
 	if (initialAllocation < 2) initialAllocation = 2;
 	m_points = NEW ICoord3D[initialAllocation];		// pool[]ify
@@ -71,18 +68,17 @@ m_riverStart(0)
 */
 PolygonTrigger::~PolygonTrigger(void)
 {
-	if (m_points) {
-		delete [] m_points;
-		m_points = NULL;
-	}
+	delete [] m_points;
+	m_points = NULL;
+
 	if (m_nextPolygonTrigger) {
 		PolygonTrigger *cur = m_nextPolygonTrigger;
 		PolygonTrigger *next;
 		while (cur) {
 			next = cur->getNext();
-			cur->setNextPoly(NULL); // prevents recursion. 
+			cur->setNextPoly(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
 }
@@ -94,9 +90,13 @@ PolygonTrigger::~PolygonTrigger(void)
  the poly triggers don't change.
 */
 void PolygonTrigger::reallocate(void)
-{	
+{
 	DEBUG_ASSERTCRASH(m_numPoints <= m_sizePoints, ("Invalid m_numPoints."));
 	if (m_numPoints == m_sizePoints) {
+		if (m_sizePoints > INT_MAX / 2) {
+			DEBUG_CRASH(("Too many points to allocate."));
+			return;
+		}
 		// Reallocate.
 		m_sizePoints += m_sizePoints;
 		ICoord3D *newPts = NEW ICoord3D[m_sizePoints];
@@ -129,8 +129,8 @@ PolygonTrigger *PolygonTrigger::getPolygonTriggerByID(Int triggerID)
 * PolygonTrigger::ParsePolygonTriggersDataChunk - read a polygon triggers chunk.
 * Format is the newer CHUNKY format.
 *	See PolygonTrigger::WritePolygonTriggersDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool PolygonTrigger::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -147,7 +147,7 @@ Bool PolygonTrigger::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChu
 	PolygonTrigger::deleteTriggers(); // just in case.
 	PolygonTrigger *pPrevTrig = NULL;
 	ICoord3D loc;
-	count = file.readInt(); 
+	count = file.readInt();
 	while (count>0) {
 		count--;
 		triggerName = file.readAsciiString();
@@ -166,8 +166,8 @@ Bool PolygonTrigger::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChu
 			riverStart = file.readInt();
 		}
 
-		numPoints = file.readInt(); 
-		PolygonTrigger *pTrig = newInstance(PolygonTrigger)(numPoints+1);	
+		numPoints = file.readInt();
+		PolygonTrigger *pTrig = newInstance(PolygonTrigger)(numPoints+1);
 		pTrig->setTriggerName(triggerName);
 		if (info->version >= K_TRIGGERS_VERSION_4) {
 			pTrig->setLayerName(layerName);
@@ -187,7 +187,7 @@ Bool PolygonTrigger::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChu
 			pTrig->addPoint(loc);
 		}
 		if (numPoints<2) {
-			DEBUG_LOG(("Deleting polygon trigger '%s' with %d points.\n", 
+			DEBUG_LOG(("Deleting polygon trigger '%s' with %d points.",
 					pTrig->getTriggerName().str(), numPoints));
 			deleteInstance(pTrig);
 			continue;
@@ -199,7 +199,7 @@ Bool PolygonTrigger::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChu
 		}
 		pPrevTrig = pTrig;
 	}
-	if (info->version == K_TRIGGERS_VERSION_1) 
+	if (info->version == K_TRIGGERS_VERSION_1)
 	{
 		// before water areas existed, so create a default one.
 		PolygonTrigger *pTrig = newInstance(PolygonTrigger)(4);
@@ -234,27 +234,27 @@ Bool PolygonTrigger::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChu
 * PolygonTrigger::WritePolygonTriggersDataChunk - Writes a Polygon triggers chunk.
 * Format is the newer CHUNKY format.
 *	See PolygonTrigger::ParsePolygonTriggersDataChunk for the reader.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void PolygonTrigger::WritePolygonTriggersDataChunk(DataChunkOutput &chunkWriter)
 {
 	chunkWriter.openDataChunk("PolygonTriggers", 	K_TRIGGERS_VERSION_4);
-		
+
 		PolygonTrigger *pTrig;
 		Int count = 0;
 		for (pTrig=PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
 			count++;
 		}
-		chunkWriter.writeInt(count); 
+		chunkWriter.writeInt(count);
 		for (pTrig=PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
-			chunkWriter.writeAsciiString(pTrig->getTriggerName());	
-			chunkWriter.writeAsciiString(pTrig->getLayerName());	
-			chunkWriter.writeInt(pTrig->getID()); 
+			chunkWriter.writeAsciiString(pTrig->getTriggerName());
+			chunkWriter.writeAsciiString(pTrig->getLayerName());
+			chunkWriter.writeInt(pTrig->getID());
 			chunkWriter.writeByte(pTrig->isWaterArea());
 			chunkWriter.writeByte(pTrig->isRiver());
 			chunkWriter.writeInt(pTrig->getRiverStart());
-			chunkWriter.writeInt(pTrig->getNumPoints()); 
+			chunkWriter.writeInt(pTrig->getNumPoints());
 			Int i;
 			for (i=0; i<pTrig->getNumPoints(); i++) {
 				ICoord3D loc = *pTrig->getPoint(i);
@@ -271,7 +271,7 @@ void PolygonTrigger::WritePolygonTriggersDataChunk(DataChunkOutput &chunkWriter)
  PolygonTrigger::updateBounds - Updates the bounds.
 */
 void PolygonTrigger::updateBounds(void)	const
-{	
+{
 	const Int BIG_INT=0x7ffff0;
 	m_bounds.lo.x = m_bounds.lo.y = BIG_INT;
 	m_bounds.hi.x = m_bounds.hi.y = -BIG_INT;
@@ -294,7 +294,7 @@ void PolygonTrigger::updateBounds(void)	const
  PolygonTrigger::addPolygonTrigger adds a trigger to the list of triggers.
 */
 void PolygonTrigger::addPolygonTrigger(PolygonTrigger *pTrigger)
-{	
+{
 	for (PolygonTrigger *pTrig=getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
 		DEBUG_ASSERTCRASH(pTrig != pTrigger, ("Attempting to add trigger already in list."));
 		if (pTrig==pTrigger) return;
@@ -304,11 +304,11 @@ void PolygonTrigger::addPolygonTrigger(PolygonTrigger *pTrigger)
 }
 
 /**
- PolygonTrigger::removePolygonTrigger removes a trigger to the list of 
+ PolygonTrigger::removePolygonTrigger removes a trigger to the list of
 	triggers.  note - does NOT delete pTrigger.
 */
 void PolygonTrigger::removePolygonTrigger(PolygonTrigger *pTrigger)
-{	
+{
 	PolygonTrigger *pPrev = NULL;
 	PolygonTrigger *pTrig=getFirstPolygonTrigger();
 	for (; pTrig; pTrig = pTrig->getNext()) {
@@ -333,7 +333,7 @@ void PolygonTrigger::removePolygonTrigger(PolygonTrigger *pTrigger)
 */
 void PolygonTrigger::deleteTriggers(void)
 {
-	PolygonTrigger *pList = ThePolygonTriggerListPtr;	
+	PolygonTrigger *pList = ThePolygonTriggerListPtr;
 	ThePolygonTriggerListPtr = NULL;
 	s_currentID = 1;
 	deleteInstance(pList);
@@ -345,7 +345,7 @@ void PolygonTrigger::deleteTriggers(void)
  the poly triggers don't change.
 */
 void PolygonTrigger::addPoint(const ICoord3D &point)
-{	
+{
 	DEBUG_ASSERTCRASH(m_numPoints <= m_sizePoints, ("Invalid m_numPoints."));
 	if (m_numPoints == m_sizePoints) {
 		reallocate();
@@ -361,7 +361,7 @@ void PolygonTrigger::addPoint(const ICoord3D &point)
  the poly triggers don't change.
 */
 void PolygonTrigger::setPoint(const ICoord3D &point, Int ndx)
-{	
+{
 	DEBUG_ASSERTCRASH(ndx>=0 && ndx <= m_numPoints, ("Invalid ndx."));
 	if (ndx<0) return;
 	if (ndx == m_numPoints) {	// we are setting first available unused point
@@ -381,7 +381,7 @@ void PolygonTrigger::setPoint(const ICoord3D &point, Int ndx)
  the poly triggers don't change.
 */
 void PolygonTrigger::insertPoint(const ICoord3D &point, Int ndx)
-{	
+{
 	DEBUG_ASSERTCRASH(ndx>=0 && ndx <= m_numPoints, ("Invalid ndx."));
 	if (ndx<0) return;
 	if (ndx == m_numPoints) {	// we are setting first available unused point
@@ -406,7 +406,7 @@ void PolygonTrigger::insertPoint(const ICoord3D &point, Int ndx)
  the poly triggers don't change.
 */
 void PolygonTrigger::deletePoint(Int ndx)
-{	
+{
 	DEBUG_ASSERTCRASH(ndx>=0 && ndx < m_numPoints, ("Invalid ndx."));
 	if (ndx<0 || ndx>=m_numPoints) return;
 	Int i;
@@ -446,7 +446,7 @@ Real PolygonTrigger::getRadius(void)	const
  PolygonTrigger - pointInTrigger.
 */
 Bool PolygonTrigger::pointInTrigger(ICoord3D &point) const
-{	
+{
 	if (m_boundsNeedsUpdate) {
 		updateBounds();
 	}
@@ -509,7 +509,7 @@ Bool PolygonTrigger::isValid(void) const
 void PolygonTrigger::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -538,7 +538,7 @@ void PolygonTrigger::xfer( Xfer *xfer )
 		// xfer point
 		xfer->xferICoord3D( point );
 
-	}  // end for, i
+	}
 
 	// bounds
 	xfer->xferIRegion2D( &m_bounds );
@@ -549,7 +549,7 @@ void PolygonTrigger::xfer( Xfer *xfer )
 	// bounds need update
 	xfer->xferBool( &m_boundsNeedsUpdate );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -557,4 +557,4 @@ void PolygonTrigger::xfer( Xfer *xfer )
 void PolygonTrigger::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp
index 3047c8f6b56..4824fa87b91 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp
@@ -24,12 +24,12 @@
 
 // FILE: SidesList.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,7 +43,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/DataChunk.h"
 #include "Common/GameState.h"
@@ -76,7 +76,7 @@ SidesInfo::SidesInfo(const SidesInfo& thatref) :
 }
 
 /**
- SidesInfo - Destructor - 
+ SidesInfo - Destructor -
 */
 SidesInfo::~SidesInfo(void)
 {
@@ -87,10 +87,12 @@ void SidesInfo::init(const Dict* d)
 {
 	deleteInstance(m_pBuildList);
 	m_pBuildList = NULL;
+
 	m_dict.clear();
-	if (m_scripts) 
-		deleteInstance(m_scripts);
+
+	deleteInstance(m_scripts);
 	m_scripts = NULL;
+
 	if (d)
 		m_dict = *d;
 }
@@ -106,7 +108,7 @@ SidesInfo& SidesInfo::operator=(const SidesInfo& that)
 		BuildListInfo* thisBLTail = NULL;
 		for (BuildListInfo* thatBL = that.m_pBuildList; thatBL; thatBL = thatBL->getNext())
 		{
-			BuildListInfo* thisBL = newInstance( BuildListInfo );	
+			BuildListInfo* thisBL = newInstance( BuildListInfo );
 			*thisBL = *thatBL;
 			thisBL->setNextBuildList(NULL);
 
@@ -114,7 +116,7 @@ SidesInfo& SidesInfo::operator=(const SidesInfo& that)
 				thisBLTail->setNextBuildList(thisBL);
 			else
 				this->m_pBuildList = thisBL;
-				
+
 			thisBLTail = thisBL;
 		}
 
@@ -128,7 +130,7 @@ SidesInfo& SidesInfo::operator=(const SidesInfo& that)
 
 /**
 * SidesInfo::addToBuildList - Adds a build list entry as the nth entry.
-*		
+*
 */
 void SidesInfo::addToBuildList(BuildListInfo *pBuildList, Int position)
 {
@@ -158,7 +160,7 @@ void SidesInfo::addToBuildList(BuildListInfo *pBuildList, Int position)
 
 /**
 * SidesInfo::reorderInBuildList - Reorders a build list entry as the nth entry.
-*		
+*
 */
 void SidesInfo::reorderInBuildList(BuildListInfo *pBuildList, Int newPosition)
 {
@@ -169,7 +171,7 @@ void SidesInfo::reorderInBuildList(BuildListInfo *pBuildList, Int newPosition)
 /**
 * SidesInfo::removeFromBuildList - Removes a build list entry.
 * Returns the position in the list that the item occupied.
-*		
+*
 */
 Int SidesInfo::removeFromBuildList(BuildListInfo *pBuildList)
 {
@@ -208,14 +210,14 @@ SidesList::SidesList(void) : m_numSides(0), m_numSkirmishSides(0)
 }
 
 /**
- SidesList - Destructor - 
+ SidesList - Destructor -
 */
 SidesList::~SidesList(void)
 {
 }
 
 /**
- SidesList - reset - 
+ SidesList - reset -
 */
 void SidesList::reset(void)
 {
@@ -223,7 +225,7 @@ void SidesList::reset(void)
 }
 
 /**
- SidesList - clear - 
+ SidesList - clear -
 */
 void SidesList::clear(void)
 {
@@ -237,28 +239,28 @@ void SidesList::clear(void)
 * SidesList::ParseSidesDataChunk - read a Sides chunk.
 * Format is the newer CHUNKY format.
 *	See SidesList::WriteSidesDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool SidesList::ParseSidesDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
 	DEBUG_ASSERTCRASH(TheSidesList, ("TheSidesList is null"));
 
-	if (TheSidesList==NULL) 
+	if (TheSidesList==NULL)
 		return false;
 
 	TheSidesList->clear();
 	Int count = file.readInt();
 	Int i, j;
 	TheSidesList->emptySides();
-	for (i=0; i<count; i++) 
+	for (i=0; i<count; i++)
 	{
 		if (i >= MAX_PLAYER_COUNT) break;
 		Dict d =  file.readDict();
 		TheSidesList->addSide(&d);
 		BuildListInfo* pBuildList;
 		Int count = file.readInt();
-		for (j=0; j<count; j++) 
+		for (j=0; j<count; j++)
 		{
 			pBuildList = newInstance( BuildListInfo );
 			pBuildList->setBuildingName(file.readAsciiString());
@@ -282,19 +284,19 @@ Bool SidesList::ParseSidesDataChunk(DataChunkInput &file, DataChunkInfo *info, v
 			}
 			TheSidesList->getSideInfo(i)->addToBuildList(pBuildList, j);
 		}
-	}	
+	}
 	if (info->version >= K_SIDES_DATA_VERSION_2)
 	{
 		count = file.readInt();
 		TheSidesList->emptyTeams();
-		for (i=0; i<count; i++) 
+		for (i=0; i<count; i++)
 		{
 			Dict d =  file.readDict();
 			TheSidesList->addTeam(&d);
 		}
 	}
-	
-	file.registerParser( AsciiString("PlayerScriptsList"), info->label, ScriptList::ParseScriptsDataChunk );
+
+	file.registerParser( "PlayerScriptsList", info->label, ScriptList::ParseScriptsDataChunk );
 	if (!file.parse(NULL)) {
 		throw(ERROR_CORRUPT_FILE_FORMAT);
 	}
@@ -302,8 +304,7 @@ Bool SidesList::ParseSidesDataChunk(DataChunkInput &file, DataChunkInfo *info, v
 	count = ScriptList::getReadScripts(scripts);
 	for (i=0; i<count; i++) {
 		if (i<TheSidesList->getNumSides()) {
-			ScriptList *pSL = TheSidesList->getSideInfo(i)->getScriptList();
-			deleteInstance(pSL);
+			deleteInstance(TheSidesList->getSideInfo(i)->getScriptList());
 			TheSidesList->getSideInfo(i)->setScriptList(scripts[i]);
 			scripts[i] = NULL;
 		} else {
@@ -323,21 +324,21 @@ Bool SidesList::ParseSidesDataChunk(DataChunkInput &file, DataChunkInfo *info, v
 * SidesList::WriteSidesDataChunk - Writes a Sides chunk.
 * Format is the newer CHUNKY format.
 *	See SidesList::ParseSidesDataChunk for the reader.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void SidesList::WriteSidesDataChunk(DataChunkOutput &chunkWriter)
 {
 	DEBUG_ASSERTCRASH(TheSidesList, ("TheSidesList is null"));
-	if (TheSidesList==NULL) 
+	if (TheSidesList==NULL)
 		return;
 	/**********HEIGHT MAP DATA ***********************/
-	chunkWriter.openDataChunk("SidesList", K_SIDES_DATA_VERSION_3);	
-	
+	chunkWriter.openDataChunk("SidesList", K_SIDES_DATA_VERSION_3);
+
 		chunkWriter.writeInt(TheSidesList->getNumSides());
 		Int i;
 		for (i=0; i<TheSidesList->getNumSides(); i++) {
-			chunkWriter.writeDict(*TheSidesList->getSideInfo(i)->getDict());	
+			chunkWriter.writeDict(*TheSidesList->getSideInfo(i)->getDict());
 			BuildListInfo* pBuildList = TheSidesList->getSideInfo(i)->getBuildList();
 			Int count = 0;
 			while (pBuildList) {
@@ -365,12 +366,12 @@ void SidesList::WriteSidesDataChunk(DataChunkOutput &chunkWriter)
 
 				pBuildList = pBuildList->getNext();
 			}
-		}	
-		
+		}
+
 		// BEGIN stuff new to K_SIDES_DATA_VERSION_2
 		chunkWriter.writeInt(TheSidesList->getNumTeams());
 		for (i=0; i<TheSidesList->getNumTeams(); i++) {
-			chunkWriter.writeDict(*TheSidesList->getTeamInfo(i)->getDict());	
+			chunkWriter.writeDict(*TheSidesList->getTeamInfo(i)->getDict());
 		}
 		// END stuff new to K_SIDES_DATA_VERSION_2
 
@@ -384,7 +385,7 @@ void SidesList::WriteSidesDataChunk(DataChunkOutput &chunkWriter)
 	Bool modified = TheSidesList->validateSides();
 	DEBUG_ASSERTLOG(!modified, ("*** had to clean up sideslist on read"));
 	modified = false;	// silence compiler warnings in release build
-	
+
 }
 
 TeamsInfo *SidesList::findTeamInfo(AsciiString name, Int* index /*= NULL*/)
@@ -394,7 +395,7 @@ TeamsInfo *SidesList::findTeamInfo(AsciiString name, Int* index /*= NULL*/)
 
 SidesInfo *SidesList::findSideInfo(AsciiString name, Int* index /*= NULL*/)
 {
-	for (int i = 0; i < m_numSides; i++) 
+	for (int i = 0; i < m_numSides; i++)
 	{
 		if (m_sides[i].getDict()->getAsciiString(TheKey_playerName) == name)
 		{
@@ -408,7 +409,7 @@ SidesInfo *SidesList::findSideInfo(AsciiString name, Int* index /*= NULL*/)
 
 SidesInfo *SidesList::findSkirmishSideInfo(AsciiString name, Int* index /*= NULL*/)
 {
-	for (int i = 0; i < m_numSkirmishSides; i++) 
+	for (int i = 0; i < m_numSkirmishSides; i++)
 	{
 		if (m_skirmishSides[i].getDict()->getAsciiString(TheKey_playerName) == name)
 		{
@@ -425,8 +426,8 @@ static AsciiString static_readPlayerNames[MAX_PLAYER_COUNT];
 /**
 * ParsePlayersDataChunk - read players names data chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 #define K_PLAYERS_NAMES_FOR_SCRIPTS_VERSION_1 1
 #define K_PLAYERS_NAMES_FOR_SCRIPTS_VERSION_2 2
@@ -453,8 +454,8 @@ static Bool ParsePlayersDataChunk(DataChunkInput &file, DataChunkInfo *info, voi
 /**
 * ParseTeamsDataChunk - read teams data chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 static Bool ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -466,9 +467,9 @@ static Bool ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info, void
 		if (sides->findSkirmishSideInfo(player)) {
 			// player exists, so just add it.
 			sides->addSkirmishTeam(&teamDict);
-			//DEBUG_LOG(("Adding team %s\n", teamName.str()));
+			//DEBUG_LOG(("Adding team %s", teamName.str()));
 		} else {
-			//DEBUG_LOG(("Couldn't add team %s, no player %s\n", teamName.str(), player.str()));
+			//DEBUG_LOG(("Couldn't add team %s, no player %s", teamName.str(), player.str()));
 		}
 	}
 	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
@@ -491,7 +492,7 @@ void SidesList::prepareForMP_or_Skirmish(void)
 	}
 	m_numSkirmishSides = 0;
 
-	for (i = 0; i < m_numSides; i++) 
+	for (i = 0; i < m_numSides; i++)
 	{
 		m_skirmishSides[m_numSkirmishSides] = m_sides[i];
 		m_numSkirmishSides++;
@@ -510,24 +511,24 @@ void SidesList::prepareForMP_or_Skirmish(void)
 			continue;
 		}
 		if (m_skirmishSides[i].getScriptList()==NULL) continue;
-		if (m_skirmishSides[i].getScriptList()->getScript() != NULL || 
+		if (m_skirmishSides[i].getScriptList()->getScript() != NULL ||
 			m_skirmishSides[i].getScriptList()->getScriptGroup()!=NULL) {
 			gotScripts = true;
 		}
 	}
 	if (!gotScripts) {
 		AsciiString path = "data\\Scripts\\SkirmishScripts.scb";
-		DEBUG_LOG(("Skirmish map using standard scripts\n"));
+		DEBUG_LOG(("Skirmish map using standard scripts"));
 		m_skirmishTeamrec.clear();
 		CachedFileInputStream theInputStream;
-		if (theInputStream.open(path)) { 
+		if (theInputStream.open(path)) {
 				ChunkInputStream *pStrm = &theInputStream;
 				DataChunkInput file( pStrm );
-				file.registerParser( AsciiString("PlayerScriptsList"), AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk );
-				file.registerParser( AsciiString("ScriptsPlayers"), AsciiString::TheEmptyString, ParsePlayersDataChunk );
-				file.registerParser( AsciiString("ScriptTeams"), AsciiString::TheEmptyString, ParseTeamsDataChunk );
+				file.registerParser( "PlayerScriptsList", AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk );
+				file.registerParser( "ScriptsPlayers", AsciiString::TheEmptyString, ParsePlayersDataChunk );
+				file.registerParser( "ScriptTeams", AsciiString::TheEmptyString, ParseTeamsDataChunk );
 				if (!file.parse(this)) {
-					DEBUG_LOG(("ERROR - Unable to read in skirmish scripts.\n"));
+					DEBUG_LOG(("ERROR - Unable to read in skirmish scripts."));
 					return;
 				}
 				ScriptList *scripts[MAX_PLAYER_COUNT];
@@ -545,12 +546,9 @@ void SidesList::prepareForMP_or_Skirmish(void)
 					}
 					if (curSide == -1) continue;
 
-					ScriptList *pSL = getSkirmishSideInfo(curSide)->getScriptList();
+					deleteInstance(getSkirmishSideInfo(curSide)->getScriptList());
 					getSkirmishSideInfo(curSide)->setScriptList(scripts[i]);
 					scripts[i] = NULL;
-					if (pSL) 
-						deleteInstance(pSL);
-					scripts[i] = NULL;
 				}
 				for (i=0; i<MAX_PLAYER_COUNT; i++) {
 					static_readPlayerNames[i].clear();
@@ -581,20 +579,20 @@ Bool SidesList::isPlayerDefaultTeam(TeamsInfo *t)
 	return false;
 }
 
-void SidesList::emptySides() 
-{ 
+void SidesList::emptySides()
+{
 	Int i;
 
-	m_numSides = 0; 
-	m_numSkirmishSides = 0; 
+	m_numSides = 0;
+	m_numSkirmishSides = 0;
 	for (i = 0; i < MAX_PLAYER_COUNT; i++) {
-		m_sides[i].clear(); 
+		m_sides[i].clear();
 		m_skirmishSides[i].clear();
 	}
 }
 
-void SidesList::emptyTeams() 
-{ 
+void SidesList::emptyTeams()
+{
 	m_teamrec.clear();
 	m_skirmishTeamrec.clear();
 }
@@ -642,7 +640,7 @@ Bool SidesList::validateAllyEnemyList(const AsciiString& tname, AsciiString& all
 	Bool modified = false;
 
 	AsciiString str, newstr, token;
-	
+
 	str = allies;
 	newstr.clear();
 	while (str.nextToken(&token))
@@ -702,7 +700,7 @@ void SidesList::addPlayerByTemplate(AsciiString playerTemplateName)
 	Dict d;
 
 	d.clear();
-	d.setAsciiString(TheKey_playerName, playerName);	
+	d.setAsciiString(TheKey_playerName, playerName);
 	d.setBool(TheKey_playerIsHuman, isHuman);
 	d.setUnicodeString(TheKey_playerDisplayName, playerDisplayName);
 	d.setAsciiString(TheKey_playerFaction, playerTemplateName);
@@ -745,7 +743,7 @@ Bool SidesList::validateSides()
 	}
 
 	// now ensure that every player has a proper "default team"
-	for (i = 0; i < getNumSides(); i++) 
+	for (i = 0; i < getNumSides(); i++)
 	{
 		Dict *pdict = getSideInfo(i)->getDict();
 		AsciiString pname = pdict->getAsciiString(TheKey_playerName);
@@ -771,7 +769,7 @@ Bool SidesList::validateSides()
 		}
 		else
 		{
-			DEBUG_LOG(("*** default team for player %s missing (should not be possible), adding it...\n",tname.str()));
+			DEBUG_LOG(("*** default team for player %s missing (should not be possible), adding it...",tname.str()));
 			Dict d;
 			d.setAsciiString(TheKey_teamName, tname);
 			d.setAsciiString(TheKey_teamOwner, pname);
@@ -787,14 +785,14 @@ Bool SidesList::validateSides()
 		// (note that owners can be teams or players, but allies/enemies can only be teams.)
 		if (validateAllyEnemyList(pname, allies))
 		{
-			DEBUG_LOG(("bad allies...\n"));
+			DEBUG_LOG(("bad allies..."));
 			pdict->setAsciiString(TheKey_playerAllies, allies);
 			modified = true;
 		}
 
 		if (validateAllyEnemyList(pname, enemies))
 		{
-			DEBUG_LOG(("bad enemies...\n"));
+			DEBUG_LOG(("bad enemies..."));
 			pdict->setAsciiString(TheKey_playerEnemies, enemies);
 			modified = true;
 		}
@@ -809,7 +807,7 @@ Bool SidesList::validateSides()
 		AsciiString tname = tdict->getAsciiString(TheKey_teamName);
 		if (findSideInfo(tname))
 		{
-			DEBUG_CRASH(("name %s is duplicate between player and team, removing...\n",tname.str()));
+			DEBUG_CRASH(("name %s is duplicate between player and team, removing...",tname.str()));
 			removeTeam(i);
 			modified = true;
 			goto validate_team_names;
@@ -824,14 +822,14 @@ Bool SidesList::validateSides()
 		SidesInfo* si = findSideInfo(towner);
 		if (si == NULL || towner == tname)
 		{
-			DEBUG_LOG(("bad owner %s; reparenting to neutral...\n",towner.str()));
+			DEBUG_LOG(("bad owner %s; reparenting to neutral...",towner.str()));
 			tdict->setAsciiString(TheKey_teamOwner, AsciiString::TheEmptyString);
 			modified = true;
 		}
-//		if (tdict->getType(NAMEKEY(AsciiString("teamAllies"))) != Dict::DICT_NONE)
-//			tdict->remove(NAMEKEY(AsciiString("teamAllies")));
-//		if (tdict->getType(NAMEKEY(AsciiString("teamEnemies"))) != Dict::DICT_NONE)
-//			tdict->remove(NAMEKEY(AsciiString("teamEnemies")));
+//		if (tdict->getType(NAMEKEY("teamAllies")) != Dict::DICT_NONE)
+//			tdict->remove(NAMEKEY("teamAllies"));
+//		if (tdict->getType(NAMEKEY("teamEnemies")) != Dict::DICT_NONE)
+//			tdict->remove(NAMEKEY("teamEnemies"));
 
 	}
 
@@ -844,10 +842,10 @@ Bool SidesList::validateSides()
 void SidesList::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Xfer method 
+/** Xfer method
 	* Version Info:
 	* 1: Initial version */
 // ------------------------------------------------------------------------------------------------
@@ -865,10 +863,10 @@ void SidesList::xfer( Xfer *xfer )
 	if( sideCount != getNumSides() )
 	{
 
-		DEBUG_CRASH(( "SidesList::xfer - The sides list size has changed, this was not supposed to happen, you must version this method and figure out how to translate between old and new versions now\n" ));
+		DEBUG_CRASH(( "SidesList::xfer - The sides list size has changed, this was not supposed to happen, you must version this method and figure out how to translate between old and new versions now" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// side data
 	ScriptList *scriptList;
@@ -884,16 +882,16 @@ void SidesList::xfer( Xfer *xfer )
 				(scriptList != NULL && scriptListPresent == FALSE) )
 		{
 
-			DEBUG_CRASH(( "SidesList::xfer - script list missing/present mismatch\n" ));
+			DEBUG_CRASH(( "SidesList::xfer - script list missing/present mismatch" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 		if( scriptListPresent )
 			xfer->xferSnapshot( scriptList );
 
-	}  // end for i
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -901,7 +899,7 @@ void SidesList::xfer( Xfer *xfer )
 void SidesList::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 /* ********* BuildListInfo class ****************************/
 /**
@@ -929,15 +927,13 @@ m_automaticallyBuild(true),
 m_priorityBuild(false),
 m_buildingName(AsciiString::TheEmptyString)
 {
-	// Added by Sadullah Nader
-	// these initialized values are necessary!!!
 	m_location.zero();
 	m_rallyPointOffset.x = 0.0f;
 	m_rallyPointOffset.y = 0.0f;
 	m_selected = FALSE;
 
 	Int i;
-	for (i=0; i<MAX_RESOURCE_GATHERERS; i++) 
+	for (i=0; i<MAX_RESOURCE_GATHERERS; i++)
 	{
 		m_resourceGatherers[i] = INVALID_ID;
 	}
@@ -954,9 +950,9 @@ BuildListInfo::~BuildListInfo(void)
 		BuildListInfo *next;
 		while (cur) {
 			next = cur->getNext();
-			cur->setNextBuildList(NULL); // prevents recursion. 
+			cur->setNextBuildList(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
 }
@@ -966,7 +962,7 @@ void BuildListInfo::parseStructure(INI *ini, void *instance, void* /*store*/, co
 	const char* c = ini->getNextToken();
 	AsciiString tTemplateName(c);
 
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 		{
 			{ "Name",				INI::parseAsciiString,		NULL, offsetof( BuildListInfo, m_buildingName	 ) },
 			{ "Location",		INI::parseCoord2D,				NULL, offsetof( BuildListInfo, m_location ) },
@@ -975,7 +971,7 @@ void BuildListInfo::parseStructure(INI *ini, void *instance, void* /*store*/, co
       { "InitiallyBuilt",			INI::parseBool,		NULL, offsetof( BuildListInfo, m_isInitiallyBuilt ) },
       { "RallyPointOffset",			INI::parseCoord2D,		NULL, offsetof( BuildListInfo, m_rallyPointOffset ) },
       { "AutomaticallyBuild",			INI::parseBool,	NULL, offsetof( BuildListInfo, m_automaticallyBuild ) },
-			{ NULL,							NULL,											NULL, 0 }  // keep this last
+			{ NULL,							NULL,											NULL, 0 }
 		};
 
 	BuildListInfo *buildInfo = newInstance( BuildListInfo );
@@ -1012,7 +1008,7 @@ BuildListInfo *BuildListInfo::duplicate(void)
 void BuildListInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1054,7 +1050,7 @@ void BuildListInfo::xfer( Xfer *xfer )
 		xfer->xferInt(&m_currentGatherers);
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1062,21 +1058,21 @@ void BuildListInfo::xfer( Xfer *xfer )
 void BuildListInfo::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 /* ********* TeamsInfoRec class ****************************/
-TeamsInfoRec::TeamsInfoRec() : 
+TeamsInfoRec::TeamsInfoRec() :
 	m_numTeams(0), m_numTeamsAllocated(0), m_teams(NULL)
 {
 }
 
-TeamsInfoRec::TeamsInfoRec(const TeamsInfoRec& thatref) : 
+TeamsInfoRec::TeamsInfoRec(const TeamsInfoRec& thatref) :
 	m_numTeams(0), m_numTeamsAllocated(0), m_teams(NULL)
 {
 	*this = thatref;
 }
 
-TeamsInfoRec::~TeamsInfoRec() 
+TeamsInfoRec::~TeamsInfoRec()
 {
 	clear();
 }
@@ -1088,7 +1084,7 @@ TeamsInfoRec& TeamsInfoRec::operator=(const TeamsInfoRec& thatref)
 	if (this != that)
 	{
 		this->clear();
-		for (int i = 0; i < that->m_numTeams; i++) 
+		for (int i = 0; i < that->m_numTeams; i++)
 		{
 			this->addTeam(that->m_teams[i].getDict());
 		}
@@ -1096,14 +1092,14 @@ TeamsInfoRec& TeamsInfoRec::operator=(const TeamsInfoRec& thatref)
 	return *this;
 }
 
-void TeamsInfoRec::clear() 
-{ 
+void TeamsInfoRec::clear()
+{
 	Int i;
 
-	for (i = 0; i < m_numTeamsAllocated; i++) 
-		m_teams[i].clear(); 
+	for (i = 0; i < m_numTeams; ++i)
+		m_teams[i].clear();
 
-	m_numTeams = 0; 
+	m_numTeams = 0;
 	m_numTeamsAllocated = 0;
 	delete [] m_teams;
 	m_teams = NULL;
@@ -1111,7 +1107,7 @@ void TeamsInfoRec::clear()
 
 TeamsInfo *TeamsInfoRec::findTeamInfo(AsciiString name, Int* index /*= NULL*/)
 {
-	for (int i = 0; i < m_numTeams; i++) 
+	for (int i = 0; i < m_numTeams; ++i)
 	{
 		if (m_teams[i].getDict()->getAsciiString(TheKey_teamName) == name)
 		{
@@ -1133,24 +1129,22 @@ void TeamsInfoRec::addTeam(const Dict* d)
 	DEBUG_ASSERTCRASH(m_numTeams < 2048, ("%d teams have been allocated (so far). This seems excessive.", m_numTeams ));
 	if (m_numTeams >= m_numTeamsAllocated)
 	{
-	// pool[]ify
-		TeamsInfo* nti = NEW TeamsInfo[m_numTeamsAllocated + TEAM_ALLOC_CHUNK];	// throws on failure
-		
+		// pool[]ify
+		const Int newNumTeamsAllocated = m_numTeams + TEAM_ALLOC_CHUNK;
+		TeamsInfo* nti = NEW TeamsInfo[newNumTeamsAllocated];
 		Int i;
 
-		for (i = 0; i < m_numTeams; i++)
+		for (i = 0; i < m_numTeams; ++i)
 			nti[i] = m_teams[i];
 
-		for ( ; i < m_numTeamsAllocated + TEAM_ALLOC_CHUNK; i++) 
-			nti[i].clear(); 
-		
 		delete [] m_teams;
-
 		m_teams = nti;
-		m_numTeamsAllocated += TEAM_ALLOC_CHUNK;
+		m_numTeamsAllocated = newNumTeamsAllocated;
 	}
 
-	m_teams[m_numTeams++].init(d);
+	m_teams[m_numTeams].init(d);
+
+	++m_numTeams;
 }
 
 void TeamsInfoRec::removeTeam(Int i)
@@ -1158,11 +1152,10 @@ void TeamsInfoRec::removeTeam(Int i)
 	if (i < 0 || i >= m_numTeams || m_numTeams <= 1)
 		return;
 
-	for ( ; i < m_numTeams-1; i++)
-		m_teams[i] = m_teams[i+1];
+	--m_numTeams;
 
-	for ( ; i < m_numTeamsAllocated; i++)
-		m_teams[i].clear();
+	for ( ; i < m_numTeams; ++i)
+		m_teams[i] = m_teams[i+1];
 
-	--m_numTeams;
+	m_teams[m_numTeams].clear();
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp
index 1a75d11ee71..daaa6f9f0d5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp
@@ -27,7 +27,7 @@
 // Author: Colin Day, April 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/DataChunk.h"
@@ -59,11 +59,6 @@
 #include "WWMath/plane.h"
 #include "WWMath/tri.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
 TerrainLogic *TheTerrainLogic = NULL;
@@ -75,7 +70,7 @@ WaterHandle TerrainLogic::m_gridWaterHandle;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Waypoint::Waypoint(WaypointID id, AsciiString name, const Coord3D *pLoc, AsciiString label1, AsciiString label2, 
+Waypoint::Waypoint(WaypointID id, AsciiString name, const Coord3D *pLoc, AsciiString label1, AsciiString label2,
 									 AsciiString label3, Bool biDirectional) :
 m_name(name),
 m_pNext(NULL),
@@ -91,14 +86,14 @@ m_biDirectional(biDirectional)
 	for (i=0; i<MAX_LINKS; i++) {
 		m_links[i] = NULL;
 	}
-}  // end Waypoint
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Waypoint::~Waypoint()
 {
 
-}  // end ~Waypoint
+}
 
 // Bridge ////////////////////////////////////////////////////////////////////////////////////////
 
@@ -127,8 +122,8 @@ BridgeInfo::BridgeInfo()
 /** Create a tower object for the bridge of the specified type (and therefore position) */
 // ------------------------------------------------------------------------------------------------
 Object *Bridge::createTower( Coord3D *worldPos,
-														 BridgeTowerType towerType, 
-														 const ThingTemplate *towerTemplate, 
+														 BridgeTowerType towerType,
+														 const ThingTemplate *towerTemplate,
 														 Object *bridge )
 {
 
@@ -136,10 +131,10 @@ Object *Bridge::createTower( Coord3D *worldPos,
 	if( towerTemplate == NULL || bridge == NULL )
 	{
 
-		DEBUG_CRASH(( "Bridge::createTower(): Invalid params\n" ));
+		DEBUG_CRASH(( "Bridge::createTower(): Invalid params" ));
 		return NULL;
 
-	}  // end if
+	}
 
 	// create the tower object
 	Object *tower = TheThingFactory->newObject( towerTemplate, bridge->getTeam() );
@@ -148,7 +143,7 @@ Object *Bridge::createTower( Coord3D *worldPos,
 	Real angle = 0;
 	switch( towerType )
 	{
-		
+
 		// --------------------------------------------------------------------------------------------
 		case BRIDGE_TOWER_FROM_LEFT:
 			angle = bridge->getOrientation() + PI;
@@ -171,10 +166,10 @@ Object *Bridge::createTower( Coord3D *worldPos,
 
 		// --------------------------------------------------------------------------------------------
 		default:
-			DEBUG_CRASH(( "Bridge::createTower - Unknown bridge tower type '%d'\n", towerType )); 
+			DEBUG_CRASH(( "Bridge::createTower - Unknown bridge tower type '%d'", towerType ));
 			return NULL;
 
-	}  // end switch
+	}
 
 	// set the position and angle
 	tower->setPosition( worldPos );
@@ -182,13 +177,13 @@ Object *Bridge::createTower( Coord3D *worldPos,
 
 	// tie it to the bridge
 	BridgeBehaviorInterface *bridgeInterface = BridgeBehavior::getBridgeBehaviorInterfaceFromObject( bridge );
-	DEBUG_ASSERTCRASH( bridgeInterface != NULL, ("Bridge::createTower - no 'BridgeBehaviorInterface' found\n") );
+	DEBUG_ASSERTCRASH( bridgeInterface != NULL, ("Bridge::createTower - no 'BridgeBehaviorInterface' found") );
 	if( bridgeInterface )
 		bridgeInterface->setTower( towerType, tower );
 
 	// tie the bridge to us
 	BridgeTowerBehaviorInterface *bridgeTowerInterface = BridgeTowerBehavior::getBridgeTowerBehaviorInterfaceFromObject( tower );
-	DEBUG_ASSERTCRASH( bridgeTowerInterface != NULL, ("Bridge::createTower - no 'BridgeTowerBehaviorInterface' found\n") );
+	DEBUG_ASSERTCRASH( bridgeTowerInterface != NULL, ("Bridge::createTower - no 'BridgeTowerBehaviorInterface' found") );
 	if( bridgeTowerInterface )
 	{
 
@@ -198,7 +193,7 @@ Object *Bridge::createTower( Coord3D *worldPos,
 		// save our position type
 		bridgeTowerInterface->setTowerType( towerType );
 
-	}  // end if
+	}
 
 	// if the bridge is indestructible, so is this tower
 	BodyModuleInterface *bridgeBody = bridge->getBodyModule();
@@ -208,12 +203,12 @@ Object *Bridge::createTower( Coord3D *worldPos,
 
 		towerBody->setIndestructible( TRUE );
 
-	}  // end if
+	}
 
 	// return the newly created tower
 	return tower;
 
-}  // end createTower
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -274,7 +269,7 @@ m_bridgeInfo(theInfo)
 	// get the template of the bridge
 	TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( bridgeTemplateName );
 	if( bridgeTemplate == NULL ) {
-		DEBUG_LOG(( "*** Bridge Template Not Found '%s'.", bridgeTemplateName ));
+		DEBUG_LOG(( "*** Bridge Template Not Found '%s'.", bridgeTemplateName.str() ));
 		return;
 	}
 
@@ -315,27 +310,27 @@ m_bridgeInfo(theInfo)
 				pos.y -= v.y*offset;
 				break;
 
-		}  // end switch
+		}
 		tower = createTower( &pos, type, towerTemplate, bridge );
-		
+
 		// store the tower object ID
 		m_bridgeInfo.towerObjectID[ i ] = tower->getID();
 
-	}  // end for, i
+	}
 #endif
-	
+
 	m_next = NULL;
-}  // end Bridge
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Bridge::Bridge(Object *bridgeObj) 
+Bridge::Bridge(Object *bridgeObj)
 {
 
 	// save the template name
 	m_templateName = bridgeObj->getTemplate()->getName();
 
-	DEBUG_ASSERTLOG( bridgeObj->getGeometryInfo().getGeomType()==GEOMETRY_BOX, ("Bridges need to be rectangles.\n"));
+	DEBUG_ASSERTLOG( bridgeObj->getGeometryInfo().getGeomType()==GEOMETRY_BOX, ("Bridges need to be rectangles."));
 
 	const Coord3D *pos = bridgeObj->getPosition();
 	Real angle = bridgeObj->getOrientation();
@@ -385,7 +380,7 @@ Bridge::Bridge(Object *bridgeObj)
 	AsciiString bridgeTemplateName = bridgeObj->getTemplate()->getName();
 	TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( bridgeTemplateName );
 	if( bridgeTemplate == NULL ) {
-		DEBUG_LOG(( "*** Bridge Template Not Found '%s'.", bridgeTemplateName ));
+		DEBUG_LOG(( "*** Bridge Template Not Found '%s'.", bridgeTemplateName.str() ));
 		return;
 	}
 
@@ -405,7 +400,7 @@ Bridge::Bridge(Object *bridgeObj)
 	// create objects targetable objects for the 4 tower pieces
 	const ThingTemplate *towerTemplate;
 	BridgeTowerType type;
-	Object *tower;	
+	Object *tower;
 	for( Int i = 0; i < BRIDGE_MAX_TOWERS; ++i )
 	{
 
@@ -428,7 +423,7 @@ Bridge::Bridge(Object *bridgeObj)
 				pos.y -= v.y*offset;
 				break;
 
-		}  // end switch
+		}
 		tower = createTower( &pos, type, towerTemplate, bridgeObj );
 		if( tower )
 		{
@@ -436,17 +431,17 @@ Bridge::Bridge(Object *bridgeObj)
 			m_bridgeInfo.towerObjectID[ i ] = tower->getID();
 		}
 
-	}  // end for, i
+	}
 
 	m_next = NULL;
-}  // end Bridge
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Bridge::~Bridge()
 {
 
-}  // end ~Bridge
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -478,9 +473,9 @@ Bool Bridge::isPointOnBridge(const Coord3D *pLoc)
 
 /*-------------------------------------------------------------------------------------------------
 /** Clip a floating point line to the region provided.  The source line runs from p1 to p2, and is clipped
-	* using the clipRegion.  
+	* using the clipRegion.
 	*
-	* Return values: 
+	* Return values:
 	*				TRUE  - Line intersects the region
 	*				FALSE - Line does not intersect the region
 	*/
@@ -510,7 +505,7 @@ Bool LineInRegion( const Coord2D *p1, const Coord2D *p2, const Region2D *clipReg
 	y1 = p1->y;
 	x2 = p2->x;
 	y2 = p2->y;
-		
+
 	// Test first point
 	clipCode1 = 0;
 
@@ -547,7 +542,7 @@ Bool LineInRegion( const Coord2D *p1, const Coord2D *p2, const Region2D *clipReg
 	if ((clipCode1 | clipCode2) == 0)
 	{
 		return TRUE;
-	}  // end if
+	}
 
 	// Both points outside window?
 	if (clipCode1 & clipCode2)
@@ -631,13 +626,13 @@ Bool LineInRegion( const Coord2D *p1, const Coord2D *p2, const Region2D *clipReg
 			x2 >= clipLeft && x2 <= clipRight &&
 			y2 >= clipTop && y2 <= clipBottom);
 
-}  // end LineInRegion
+}
 
 static Bool PointInRegion2D( const Coord3D *pt, const Region2D *clipRegion )
 {
-	return (pt->x>=clipRegion->lo.x && 
+	return (pt->x>=clipRegion->lo.x &&
 					pt->y>=clipRegion->lo.y &&
-					pt->x<=clipRegion->hi.x && 
+					pt->x<=clipRegion->hi.x &&
 					pt->y<=clipRegion->hi.y);
 }
 
@@ -677,17 +672,17 @@ Bool Bridge::isCellOnEnd(const Region2D *cell)
 	if (PointInRegion2D(&toLeft, cell)) return false;
 	if (PointInRegion2D(&toRight, cell)) return false; */
 	Coord2D line1, line2;
-	line1.x = fromLeft.x; 
-	line1.y = fromLeft.y; 
-	line2.x = fromRight.x; 
-	line2.y = fromRight.y; 
+	line1.x = fromLeft.x;
+	line1.y = fromLeft.y;
+	line2.x = fromRight.x;
+	line2.y = fromRight.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
-	line1.x = toLeft.x; 
-	line1.y = toLeft.y; 
-	line2.x = toRight.x; 
-	line2.y = toRight.y; 
+	line1.x = toLeft.x;
+	line1.y = toLeft.y;
+	line2.x = toRight.x;
+	line2.y = toRight.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
@@ -725,17 +720,17 @@ Bool Bridge::isCellOnSide(const Region2D *cell)
 	toRight.y += endVector.y;
 
 	Coord2D line1, line2;
-	line1.x = fromLeft.x; 
-	line1.y = fromLeft.y; 
-	line2.x = toLeft.x; 
-	line2.y = toLeft.y; 
+	line1.x = fromLeft.x;
+	line1.y = fromLeft.y;
+	line2.x = toLeft.x;
+	line2.y = toLeft.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
-	line1.x = fromRight.x; 
-	line1.y = fromRight.y; 
-	line2.x = toRight.x; 
-	line2.y = toRight.y; 
+	line1.x = fromRight.x;
+	line1.y = fromRight.y;
+	line2.x = toRight.x;
+	line2.y = toRight.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
@@ -751,17 +746,17 @@ Bool Bridge::isCellOnSide(const Region2D *cell)
 	toRight.x += endVector.x;
 	toRight.y += endVector.y;
 
-	line1.x = fromLeft.x; 
-	line1.y = fromLeft.y; 
-	line2.x = toLeft.x; 
-	line2.y = toLeft.y; 
+	line1.x = fromLeft.x;
+	line1.y = fromLeft.y;
+	line2.x = toLeft.x;
+	line2.y = toLeft.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
-	line1.x = fromRight.x; 
-	line1.y = fromRight.y; 
-	line2.x = toRight.x; 
-	line2.y = toRight.y; 
+	line1.x = fromRight.x;
+	line1.y = fromRight.y;
+	line2.x = toRight.x;
+	line2.y = toRight.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
@@ -820,17 +815,17 @@ Bool Bridge::isCellEntryPoint(const Region2D *cell)
 	if (PointInRegion2D(&toRight, cell)) return false;
 	*/
 	Coord2D line1, line2;
-	line1.x = fromLeft.x; 
-	line1.y = fromLeft.y; 
-	line2.x = fromRight.x; 
-	line2.y = fromRight.y; 
+	line1.x = fromLeft.x;
+	line1.y = fromLeft.y;
+	line2.x = fromRight.x;
+	line2.y = fromRight.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
-	line1.x = toLeft.x; 
-	line1.y = toLeft.y; 
-	line2.x = toRight.x; 
-	line2.y = toRight.y; 
+	line1.x = toLeft.x;
+	line1.y = toLeft.y;
+	line2.x = toRight.x;
+	line2.y = toRight.y;
 	if (LineInRegion(&line1, &line2, cell)) {
 		return true;
 	}
@@ -861,7 +856,7 @@ Drawable *Bridge::pickBridge(const Vector3 &from, const Vector3 &to, Vector3 *po
 
 	if (isPointOnBridge(&loc)) {
 		*pos = intersectPos;
-		//DEBUG_LOG(("Picked bridge %.2f, %.2f, %.2f\n", intersectPos.X, intersectPos.Y, intersectPos.Z));
+		//DEBUG_LOG(("Picked bridge %.2f, %.2f, %.2f", intersectPos.X, intersectPos.Y, intersectPos.Z));
 		Object *bridge = TheGameLogic->findObjectByID(m_bridgeInfo.bridgeObjectID);
 		if (bridge) {
 			return bridge->getDrawable();
@@ -881,8 +876,8 @@ void Bridge::updateDamageState( void )
 	if (bridge) {
 		// get object damage state
 		{
-			enum BodyDamageType damageState = bridge->getBodyModule()->getDamageState(); 
-			enum BodyDamageType curState = m_bridgeInfo.curDamageState;
+			BodyDamageType damageState = bridge->getBodyModule()->getDamageState();
+			BodyDamageType curState = m_bridgeInfo.curDamageState;
 			if (damageState != curState) {
 				m_bridgeInfo.curDamageState = damageState;
 				if (damageState == BODY_RUBBLE) {
@@ -893,13 +888,13 @@ void Bridge::updateDamageState( void )
 						if (obj->getLayer() == m_layer) {
 							// don't consider the bridge health, 'cuz it's already dead. (srj)
 							const Bool considerBridgeHealth = false;
-							if (TheTerrainLogic->objectInteractsWithBridgeLayer(obj, obj->getLayer(), considerBridgeHealth)) 
+							if (TheTerrainLogic->objectInteractsWithBridgeLayer(obj, obj->getLayer(), considerBridgeHealth))
 							{
 								// srj sez: if we use this threshold, then stuff on the bridge apron doesn't die but
 								// might sink thru the eyecandy of bridge drbris, looking funny. so now we just indiscriminately
 								// kill everything that was on the bridge, regardless of height they might fall.
 								//Real deltaHeight = obj->getPosition()->z - TheTerrainLogic->getGroundHeight(obj->getPosition()->x, obj->getPosition()->y);
-								//if (deltaHeight>PATHFIND_CELL_SIZE_F * 0.5f) 
+								//if (deltaHeight>PATHFIND_CELL_SIZE_F * 0.5f)
 								{
 									// The object fell off the bridge.
 									// Destroy it.
@@ -963,12 +958,9 @@ Real Bridge::getBridgeHeight(const Coord3D *pLoc, Coord3D* normal)
 TerrainLogic::TerrainLogic()
 {
 	Int i;
-	
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
+
 	m_activeBoundary = 0;
 	m_waterGridEnabled = FALSE;
-	//
 	for( i = 0; i < MAX_DYNAMIC_WATER; ++i )
 	{
 
@@ -978,7 +970,7 @@ TerrainLogic::TerrainLogic()
 		m_waterToUpdate[ i ].damageAmount = 0.0f;
 		m_waterToUpdate[ i ].currentHeight = 0.0f;
 
-	}  // end for i
+	}
 	m_numWaterToUpdate = 0;
 
 	m_waypointListHead = NULL;
@@ -989,7 +981,7 @@ TerrainLogic::TerrainLogic()
 	m_mapDY = 0;
 
 
-}  // end TerrainLogic
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -998,7 +990,7 @@ TerrainLogic::~TerrainLogic()
 
 	reset(); // just in case
 
-}  // end ~TerrainLogic
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Init */
@@ -1006,7 +998,7 @@ TerrainLogic::~TerrainLogic()
 void TerrainLogic::init( void )
 {
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -1019,7 +1011,7 @@ void TerrainLogic::reset( void )
 	PolygonTrigger::deleteTriggers();
 	m_numWaterToUpdate = 0;
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -1043,7 +1035,7 @@ void TerrainLogic::update( void )
 
 		for( Int i = m_numWaterToUpdate - 1; i >= 0; --i )
 		{
-			
+
 			// get the water info
 			water = m_waterToUpdate[ i ].waterTable;
 			changePerFrame = m_waterToUpdate[ i ].changePerFrame;
@@ -1059,25 +1051,25 @@ void TerrainLogic::update( void )
 			finalTransition = FALSE;
 			if( changePerFrame > 0 )
 			{
-			
+
 				if( currentHeight + changePerFrame >= targetHeight )
 					finalTransition = TRUE;
 
-			}  // end if
+			}
 			else
 			{
-			
+
 				if( currentHeight + changePerFrame <= targetHeight )
 					finalTransition = TRUE;
-				
-			}  // end else
+
+			}
 
 			if( finalTransition == TRUE )
 			{
 
 				//
 				// make the final water height change, note we do damage on the final transition
-				// in all situations by passing a valid damage amount 
+				// in all situations by passing a valid damage amount
 				//
 				setWaterHeight( water, targetHeight, damageAmount, TRUE );
 
@@ -1090,12 +1082,12 @@ void TerrainLogic::update( void )
 					m_waterToUpdate[ i ] = m_waterToUpdate[ j ];
 				m_numWaterToUpdate -= 1;
 
-			}  // end if
+			}
 			else
 			{
 
 				//
-				// we're not doing damage every frame (0 damage) from the water 
+				// we're not doing damage every frame (0 damage) from the water
 				// because it's an expensive process
 				//
 				if( doDamageThisFrame == FALSE )
@@ -1112,13 +1104,13 @@ void TerrainLogic::update( void )
 				// update actual water
 				setWaterHeight( water, currentHeight, damageAmount, FALSE );
 
-			}  // end else
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** newMap */
@@ -1127,14 +1119,14 @@ void TerrainLogic::newMap( Bool saveGame )
 {
 
 	// Set waypoint's z value, now that the height map is loaded.
-	for( Waypoint *way = m_waypointListHead; way; way = way->getNext() ) 
+	for( Waypoint *way = m_waypointListHead; way; way = way->getNext() )
 	{
 		const Coord3D* loc = way->getLocation();
 		way->setLocationZ(getGroundHeight(loc->x, loc->y));
 	}
 	//
 	// until we have a real way to specify different water planes in the map, we will check
-	// for a special waypoint name that we will put in maps that we want to have a 
+	// for a special waypoint name that we will put in maps that we want to have a
 	// water grid
 	/// @todo Mark W, remove this when you have water plane placements in the map done (Colin)
 	//
@@ -1144,7 +1136,7 @@ void TerrainLogic::newMap( Bool saveGame )
 		enable = TRUE;
 	enableWaterGrid( enable );
 
-}  // end newMap
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1175,7 +1167,7 @@ void TerrainLogic::enableWaterGrid( Bool enable )
 				waterSettingIndex = i;
 				break;  // exit for i
 
-			}  // end if
+			}
 
 			//
 			// no exact map name (including path) was found, try to look for a match in just the
@@ -1204,48 +1196,48 @@ void TerrainLogic::enableWaterGrid( Bool enable )
 			// now try this compare
 			if( strippedMapNameOnly.compareNoCase( strippedCompareMapNameOnly.str() ) == 0 )
 			{
-				
+
 				waterSettingIndex = i;
 				break;  // exit for i
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		// check for no match found
 		if( waterSettingIndex == -1 )
 		{
 
-			DEBUG_CRASH(( "!!!!!! Deformable water won't work because there was no group of vertex water data defined in GameData.INI for this map name '%s' !!!!!! (C. Day)\n",
+			DEBUG_CRASH(( "!!!!!! Deformable water won't work because there was no group of vertex water data defined in GameData.INI for this map name '%s' !!!!!! (C. Day)",
 										TheGlobalData->m_mapName.str() ));
 			return;
 
-		}  // end if
+		}
 
-		TheTerrainVisual->setWaterGridHeightClamps( NULL, 
-																								TheGlobalData->m_vertexWaterHeightClampLow[ waterSettingIndex ], 
+		TheTerrainVisual->setWaterGridHeightClamps( NULL,
+																								TheGlobalData->m_vertexWaterHeightClampLow[ waterSettingIndex ],
 																								TheGlobalData->m_vertexWaterHeightClampHi[ waterSettingIndex ] );
-		TheTerrainVisual->setWaterTransform( NULL, 
-																				 TheGlobalData->m_vertexWaterAngle[ waterSettingIndex ], 
-																				 TheGlobalData->m_vertexWaterXPosition[ waterSettingIndex ], 
-																				 TheGlobalData->m_vertexWaterYPosition[ waterSettingIndex ], 
+		TheTerrainVisual->setWaterTransform( NULL,
+																				 TheGlobalData->m_vertexWaterAngle[ waterSettingIndex ],
+																				 TheGlobalData->m_vertexWaterXPosition[ waterSettingIndex ],
+																				 TheGlobalData->m_vertexWaterYPosition[ waterSettingIndex ],
 																				 TheGlobalData->m_vertexWaterZPosition[ waterSettingIndex ] );
-		TheTerrainVisual->setWaterGridResolution( NULL, 
-																							TheGlobalData->m_vertexWaterXGridCells[ waterSettingIndex ], 
-																							TheGlobalData->m_vertexWaterYGridCells[ waterSettingIndex ], 
+		TheTerrainVisual->setWaterGridResolution( NULL,
+																							TheGlobalData->m_vertexWaterXGridCells[ waterSettingIndex ],
+																							TheGlobalData->m_vertexWaterYGridCells[ waterSettingIndex ],
 																							TheGlobalData->m_vertexWaterGridSize[ waterSettingIndex ] );
-		TheTerrainVisual->setWaterAttenuationFactors( NULL, 
-																									TheGlobalData->m_vertexWaterAttenuationA[ waterSettingIndex ], 
-																									TheGlobalData->m_vertexWaterAttenuationB[ waterSettingIndex ], 
-																									TheGlobalData->m_vertexWaterAttenuationC[ waterSettingIndex ], 
-																									TheGlobalData->m_vertexWaterAttenuationRange[ waterSettingIndex ] );	
+		TheTerrainVisual->setWaterAttenuationFactors( NULL,
+																									TheGlobalData->m_vertexWaterAttenuationA[ waterSettingIndex ],
+																									TheGlobalData->m_vertexWaterAttenuationB[ waterSettingIndex ],
+																									TheGlobalData->m_vertexWaterAttenuationC[ waterSettingIndex ],
+																									TheGlobalData->m_vertexWaterAttenuationRange[ waterSettingIndex ] );
 
-	}  // end if
+	}
 
 	// notify the terrain visual of the change
 	TheTerrainVisual->enableWaterGrid( enable );
 
-}  // end enableWaterGrid
+}
 
 //-------------------------------------------------------------------------------------------------
 /** device independent terrain logic load.  If query is true, we are just loading it to get
@@ -1270,14 +1262,14 @@ Bool TerrainLogic::loadMap( AsciiString filename, Bool query )
 	}
 
 	CachedFileInputStream theInputStream;
-	if (theInputStream.open(AsciiString(m_filenameString.str()))) 
+	if (theInputStream.open(AsciiString(m_filenameString.str())))
 	try {
 		ChunkInputStream *pStrm = &theInputStream;
 		pStrm->absoluteSeek(0);
 		DataChunkInput file( pStrm );
 		if (file.isValidFileType()) {	// Backwards compatible files aren't valid data chunk files.
 			// Read the waypoints.
-			file.registerParser( AsciiString("WaypointsList"), AsciiString::TheEmptyString, parseWaypointDataChunk );
+			file.registerParser( "WaypointsList", AsciiString::TheEmptyString, parseWaypointDataChunk );
 			if (!file.parse(this)) {
 				DEBUG_CRASH(("Unable to read waypoint info."));
 				return false;
@@ -1297,21 +1289,21 @@ Bool TerrainLogic::loadMap( AsciiString filename, Bool query )
 		count++;
 		Coord3D loc;
 		pWay->getLocation(&loc);
-		DEBUG_LOG(("Waypoint %d - '%s' id=%d ", count, pWay->getName().str(), pWay->getID()));
-		DEBUG_LOG(("{%.2f, %.2f, %.2f} ", loc.x, loc.y, loc.z));
+		DEBUG_LOG_RAW(("Waypoint %d - '%s' id=%d ", count, pWay->getName().str(), pWay->getID()));
+		DEBUG_LOG_RAW(("{%.2f, %.2f, %.2f} ", loc.x, loc.y, loc.z));
 		Int i;
 		if (pWay->getNumLinks()) {
-			DEBUG_LOG(("Links to: "));
+			DEBUG_LOG_RAW(("Links to: "));
 			for (i=0; i<pWay->getNumLinks(); i++) {
 				Waypoint *pLink = pWay->getLink(i);
-				DEBUG_LOG(("'%s' id=%d ", pLink->getName().str(), pLink->getID()));
+				DEBUG_LOG_RAW(("'%s' id=%d ", pLink->getName().str(), pLink->getID()));
 			}
 		} else {
-			DEBUG_LOG(("No links."));
+			DEBUG_LOG_RAW(("No links."));
 		}
-		DEBUG_LOG(("\n"));
+		DEBUG_LOG_RAW(("\n"));
 	}
-	DEBUG_LOG(("Total of %d waypoints.\n", count));
+	DEBUG_LOG(("Total of %d waypoints.", count));
 #endif
 
 	if (!query) {
@@ -1321,7 +1313,7 @@ Bool TerrainLogic::loadMap( AsciiString filename, Bool query )
 
 	return TRUE;  // success
 
-}  // end load
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reads in the waypoint chunk */
@@ -1364,7 +1356,7 @@ void TerrainLogic::addWaypoint(MapObject *pMapObj)
 	Bool biDirectional;
 	biDirectional = pMapObj->getProperties()->getBool(TheKey_waypointPathBiDirectional, &exists);
 	DEBUG_ASSERTCRASH(pMapObj->isWaypoint(), ("not a waypoint"));
-	Waypoint *pWay = newInstance(Waypoint)(pMapObj->getWaypointID(), pMapObj->getWaypointName(), 
+	Waypoint *pWay = newInstance(Waypoint)(pMapObj->getWaypointID(), pMapObj->getWaypointName(),
 																&loc, label1, label2, label3, biDirectional);
 	pWay->setNext(m_waypointListHead);
 	m_waypointListHead = pWay;
@@ -1442,7 +1434,7 @@ Real TerrainLogic::getGroundHeight( Real x, Real y, Coord3D* normal ) const
 
 	return 0;
 
-}  // end getHight
+}
 
 //-------------------------------------------------------------------------------------------------
 /** default get height for terrain logic */
@@ -1454,7 +1446,7 @@ Real TerrainLogic::getLayerHeight( Real x, Real y, PathfindLayerEnum layer, Coor
 
 	return 0;
 
-}  // end getLayerHeight
+}
 
 //-------------------------------------------------------------------------------------------------
 /** default isCliffCell for terrain logic */
@@ -1464,7 +1456,7 @@ Bool TerrainLogic::isCliffCell( Real x, Real y) const
 
 	return false;
 
-}  // end isCliffCell
+}
 
 //-------------------------------------------------------------------------------------------------
 void makeAlignToNormalMatrix( Real angle, const Coord3D& pos, const Coord3D& normal, Matrix3D& mtx)
@@ -1479,12 +1471,12 @@ void makeAlignToNormalMatrix( Real angle, const Coord3D& pos, const Coord3D& nor
 		that atan2(xvec.y, xvec.x) == angle. So we must construct
 		the matrix carefully to ensure this!
 	*/
-	x.x = Cos( angle ); 
-	x.y = Sin( angle ); 
-	x.z = 0.0f; 
+	x.x = Cos( angle );
+	x.y = Sin( angle );
+	x.z = 0.0f;
 //x.normalize();	-- redundant; is normalized by definition
 
-	// dot of two unit vectors is cos of angle between them; 
+	// dot of two unit vectors is cos of angle between them;
 	// we want there to be a 90-deg angle between the x and z
 	// vectors, so calc x.z to satisfy this (ie, cos==0)
 	/*
@@ -1497,7 +1489,7 @@ void makeAlignToNormalMatrix( Real angle, const Coord3D& pos, const Coord3D& nor
 		x.normalize();
 	}
 
-	DEBUG_ASSERTCRASH(fabs(x.x*z.x + x.y*z.y + x.z*z.z)<0.0001,("dot is not zero (%f)\n",fabs(x.x*z.x + x.y*z.y + x.z*z.z)));
+	DEBUG_ASSERTCRASH(fabs(x.x*z.x + x.y*z.y + x.z*z.z)<0.0001,("dot is not zero (%f)",fabs(x.x*z.x + x.y*z.y + x.z*z.z)));
 
 	// now computing the y vector is trivial.
 	y.crossProduct( &z, &x, &y );
@@ -1591,7 +1583,7 @@ Waypoint *TerrainLogic::getClosestWaypointOnPath( const Coord3D *pos, AsciiStrin
 	Real distSqr = 0;
 	Waypoint *pClosestWay = NULL;
 	if (label.isEmpty()) {
-		DEBUG_LOG(("***Warning - asking for empty path label.\n"));
+		DEBUG_LOG(("***Warning - asking for empty path label."));
 		return NULL;
 	}
 
@@ -1612,7 +1604,7 @@ Waypoint *TerrainLogic::getClosestWaypointOnPath( const Coord3D *pos, AsciiStrin
 			}
 		}
 	}
-		
+
 	return pClosestWay;
 }
 
@@ -1622,7 +1614,7 @@ Waypoint *TerrainLogic::getClosestWaypointOnPath( const Coord3D *pos, AsciiStrin
 Bool TerrainLogic::isPurposeOfPath( Waypoint *pWay, AsciiString label )
 {
 	if (label.isEmpty() || pWay==NULL) {
-		DEBUG_LOG(("***Warning - asking for empth path label.\n"));
+		DEBUG_LOG(("***Warning - asking for empth path label."));
 		return false;
 	}
 
@@ -1642,7 +1634,7 @@ PolygonTrigger *TerrainLogic::getTriggerAreaByName( AsciiString name )
 {
 	for (PolygonTrigger* pTrig = PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
 		AsciiString trigName = pTrig->getTriggerName();
-		if (name == trigName) 
+		if (name == trigName)
 			return pTrig;
 	}
 	return NULL;
@@ -1670,13 +1662,13 @@ Bridge * TerrainLogic::findBridgeAt( const Coord3D *pLoc) const
 //-------------------------------------------------------------------------------------------------
 Bridge * TerrainLogic::findBridgeLayerAt( const Coord3D *pLoc, PathfindLayerEnum layer, Bool clip) const
 {
-	if (layer == LAYER_GROUND) 
+	if (layer == LAYER_GROUND)
 		return NULL;
 
 	Bridge *pBridge = getFirstBridge();
-	while (pBridge) 
+	while (pBridge)
 	{
-		if (pBridge->getLayer() == layer && (!clip || pBridge->isPointOnBridge(pLoc))) 
+		if (pBridge->getLayer() == layer && (!clip || pBridge->isPointOnBridge(pLoc)))
 		{
 			return(pBridge);
 		}
@@ -1846,10 +1838,10 @@ Bool TerrainLogic::objectInteractsWithBridgeEnd(Object *obj, Int layer) const
 			if (match) {
 				Real bridgeHeight = pBridge->getBridgeHeight(obj->getPosition(), NULL);
 				Real delta = fabs(obj->getPosition()->z-bridgeHeight);
-				if (delta>LAYER_Z_CLOSE_ENOUGH_F) 
+				if (delta>LAYER_Z_CLOSE_ENOUGH_F)
 				{
 					return false;
-				}			
+				}
 				return true;
 			}
 			return false;
@@ -2015,12 +2007,12 @@ void TerrainLogic::deleteBridge( Bridge *bridge )
 
 		m_bridgeListHead = bridge->getNext();
 
-	}  // end if
+	}
 	else
 	{
 
-		for( Bridge *otherBridge = getFirstBridge(); 
-				 otherBridge; 
+		for( Bridge *otherBridge = getFirstBridge();
+				 otherBridge;
 				 otherBridge = otherBridge->getNext() )
 		{
 
@@ -2034,11 +2026,11 @@ void TerrainLogic::deleteBridge( Bridge *bridge )
 				otherBridge->setNext( bridge->getNext() );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for, otherBridge
+		}
 
-	}  // end else
+	}
 
 	// delete object associated with bridge if present
 	BridgeInfo bridgeInfo;
@@ -2052,12 +2044,12 @@ void TerrainLogic::deleteBridge( Bridge *bridge )
 	// delete the bridge in question
 	deleteInstance(bridge);
 
-}  // end deleteBridge
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Returns the ground aligned point on the bounding box closest to the given point*/
 //-------------------------------------------------------------------------------------------------
-Coord3D TerrainLogic::findClosestEdgePoint ( const Coord3D *closestTo ) const 
+Coord3D TerrainLogic::findClosestEdgePoint ( const Coord3D *closestTo ) const
 {
 	Region3D mapExtent;
 	getExtent( &mapExtent );
@@ -2109,7 +2101,7 @@ Coord3D TerrainLogic::findClosestEdgePoint ( const Coord3D *closestTo ) const
 /** Returns the ground aligned point on the bounding box farthest from the given point*/
 //-------------------------------------------------------------------------------------------------
 // Lorenzen was here
-Coord3D TerrainLogic::findFarthestEdgePoint( const Coord3D *farthestFrom ) const 
+Coord3D TerrainLogic::findFarthestEdgePoint( const Coord3D *farthestFrom ) const
 {
 	Region3D mapExtent;
 	getExtent( &mapExtent );
@@ -2192,16 +2184,16 @@ const WaterHandle* TerrainLogic::getWaterHandle( Real x, Real y )
 	iLoc.z = 0;
 
 	// Look for water areas in the polygon triggers
-	for( PolygonTrigger *pTrig = PolygonTrigger::getFirstPolygonTrigger(); 
-			 pTrig; 
-			 pTrig = pTrig->getNext() ) 
+	for( PolygonTrigger *pTrig = PolygonTrigger::getFirstPolygonTrigger();
+			 pTrig;
+			 pTrig = pTrig->getNext() )
 	{
 
-		if( !pTrig->isWaterArea() ) 
+		if( !pTrig->isWaterArea() )
 			continue;
 
 		// See if point is in a water area
-		if( pTrig->pointInTrigger( iLoc ) ) 
+		if( pTrig->pointInTrigger( iLoc ) )
 		{
 
 			if( pTrig->getPoint( 0 )->z >= waterZ )
@@ -2210,11 +2202,11 @@ const WaterHandle* TerrainLogic::getWaterHandle( Real x, Real y )
 				waterZ = pTrig->getPoint( 0 )->z;
 				waterHandle = pTrig->getWaterHandle();
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
 	/**@todo: Remove this after we have all water types included
 		in water triggers.  For now do special check for water grid mesh. */
@@ -2222,7 +2214,7 @@ const WaterHandle* TerrainLogic::getWaterHandle( Real x, Real y )
 	// We shouldn't depend on TerrainVisual here.
 	Real meshZ;
 	if( TheTerrainVisual->getWaterGridHeight( x, y, &meshZ ) )
-	{	
+	{
 
 		//
 		// point falls on water grid, return the special handle for the grid water, since we
@@ -2234,13 +2226,13 @@ const WaterHandle* TerrainLogic::getWaterHandle( Real x, Real y )
 			waterZ = meshZ;
 			waterHandle = &m_gridWaterHandle;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	return waterHandle;
 
-}  // end getWaterHandle
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Get water handle by name assigned from the editor */
@@ -2260,7 +2252,7 @@ const WaterHandle* TerrainLogic::getWaterHandleByName( AsciiString name )
 
 	return NULL;
 
-}  // end getWaterHandleByName
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -2278,18 +2270,18 @@ Real TerrainLogic::getWaterHeight( const WaterHandle *water )
 	if( water == &m_gridWaterHandle )
 	{
 
-		DEBUG_CRASH(( "TerrainLogic::getWaterHeight( WaterHandle *water ) - water is a grid handle, cannot make this query\n" ));
+		DEBUG_CRASH(( "TerrainLogic::getWaterHeight( WaterHandle *water ) - water is a grid handle, cannot make this query" ));
 		return 0.0f;
 
-	}  //  end if
+	}
 
 	// sanity
-	DEBUG_ASSERTCRASH( water->m_polygon != NULL, ("getWaterHeight: polygon trigger in water handle is NULL\n") );
+	DEBUG_ASSERTCRASH( water->m_polygon != NULL, ("getWaterHeight: polygon trigger in water handle is NULL") );
 
 	// return the height of the water using the polygon trigger
 	return water->m_polygon->getPoint( 0 )->z;
 
-}  // end getWaterHeight
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set the water height.  If the water rises, then any objects that now find themselves
@@ -2324,7 +2316,7 @@ void TerrainLogic::setWaterHeight( const WaterHandle *water, Real height, Real d
 		transform.Set_Z_Translation( height );
 		TheTerrainVisual->setWaterTransform( &transform );
 
-	}  // end if
+	}
 	else
 	{
 
@@ -2344,10 +2336,10 @@ void TerrainLogic::setWaterHeight( const WaterHandle *water, Real height, Real d
 			newPoint.z = height;
 			water->m_polygon->setPoint( newPoint, i );
 
-		}  // end for
+		}
 		height = getWaterHeight(water);
 
-	}  // end else
+	}
 
 	// find the bounding rectangle of this water area
 	Region3D affectedRegion;
@@ -2359,9 +2351,9 @@ void TerrainLogic::setWaterHeight( const WaterHandle *water, Real height, Real d
 	{
 
 		// do the pathfind remapping
-		TheAI->pathfinder()->forceMapRecalculation(); 
+		TheAI->pathfinder()->forceMapRecalculation();
 
-	}  // end if
+	}
 
 	//
 	// if the water height has risen, we need apply water damage to things that are now
@@ -2377,13 +2369,13 @@ void TerrainLogic::setWaterHeight( const WaterHandle *water, Real height, Real d
 		center.z = 0.0f;  // irrelavant
 
 		// the max radius to scan around us is the diagonal of the bounding region
-		Real maxDist = sqrt( affectedRegion.width() * affectedRegion.width() + 
+		Real maxDist = sqrt( affectedRegion.width() * affectedRegion.width() +
 												 affectedRegion.height() * affectedRegion.height() );
 
 		// scan the objects in the area of the water affected
 		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( &center,
 																																			 maxDist,
-																																			 FROM_CENTER_2D, 
+																																			 FROM_CENTER_2D,
 																																			 NULL );
 		MemoryPoolObjectHolder hold( iter );
 		Object *obj;
@@ -2406,13 +2398,13 @@ void TerrainLogic::setWaterHeight( const WaterHandle *water, Real height, Real d
 				damageInfo.in.m_amount = damageAmount;
 				obj->attemptDamage( &damageInfo );
 
-			}  // end if
+			}
 
-		}  // end for obj
+		}
 
-	}  // end if, water has risen
+	}
 
-}  // end setWaterHeight
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Change the height of a water table over time */
@@ -2427,10 +2419,10 @@ void TerrainLogic::changeWaterHeightOverTime( const WaterHandle *water,
 	if( m_numWaterToUpdate >= MAX_DYNAMIC_WATER )
 	{
 
-		DEBUG_CRASH(( "Only '%d' simultaneous water table changes are supported\n", MAX_DYNAMIC_WATER ));
+		DEBUG_CRASH(( "Only '%d' simultaneous water table changes are supported", MAX_DYNAMIC_WATER ));
 		return;
 
-	}  // end if
+	}
 
 	// sanity
 	if( water == NULL )
@@ -2455,16 +2447,16 @@ void TerrainLogic::changeWaterHeightOverTime( const WaterHandle *water,
 			//
 			--i;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// get the current height of the water
 	Real currentHeight = getWaterHeight( water );
 
 	// add the entry into the array of water to update
 	m_waterToUpdate[ m_numWaterToUpdate ].waterTable = water;
-	m_waterToUpdate[ m_numWaterToUpdate ].changePerFrame = (finalHeight - currentHeight) / 
+	m_waterToUpdate[ m_numWaterToUpdate ].changePerFrame = (finalHeight - currentHeight) /
 																												 (LOGICFRAMES_PER_SECOND * transitionTimeInSeconds);
 	m_waterToUpdate[ m_numWaterToUpdate ].targetHeight = finalHeight;
 	m_waterToUpdate[ m_numWaterToUpdate ].damageAmount = damageAmount;
@@ -2473,7 +2465,7 @@ void TerrainLogic::changeWaterHeightOverTime( const WaterHandle *water,
 	// we now have one more entry to update
 	++m_numWaterToUpdate;
 
-}  // end chanageWaterHeightOverTime
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Find the axis aligned bounding region around a water table */
@@ -2531,9 +2523,9 @@ void TerrainLogic::findAxisAlignedBoundingRect( const WaterHandle *water, Region
 			if( v.Y > region->hi.y )
 				region->hi.y = v.Y;
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 	else
 	{
 
@@ -2542,7 +2534,7 @@ void TerrainLogic::findAxisAlignedBoundingRect( const WaterHandle *water, Region
 		Int numPoints = water->m_polygon->getNumPoints();
 		for( Int i = 0; i < numPoints; i++ )
 		{
-		
+
 			// get this point
 			p = water->m_polygon->getPoint( i );
 
@@ -2562,11 +2554,11 @@ void TerrainLogic::findAxisAlignedBoundingRect( const WaterHandle *water, Region
 			if( p->z > region->hi.z )
 				region->hi.z = p->z;
 
-		}  // end for i
-				
-	}  // end else
+		}
+
+	}
 
-}  // end findAxisAlignedBoundingRect
+}
 
 void TerrainLogic::setActiveBoundary(Int newActiveBoundary)
 {
@@ -2586,10 +2578,10 @@ void TerrainLogic::setActiveBoundary(Int newActiveBoundary)
 	}
 
 	ShroudStatusStoreRestore partitionStore;
-	
+
 	// Can't have any lingering looks persist over the resize, so flush the queue now
 	ThePartitionManager->processEntirePendingUndoShroudRevealQueue();
-	
+
 	//Store fogged cells
 	ThePartitionManager->storeFoggedCells(partitionStore, TRUE);
 
@@ -2609,7 +2601,7 @@ void TerrainLogic::setActiveBoundary(Int newActiveBoundary)
 
 	//Store permanently revealed cells.
 	ThePartitionManager->storeFoggedCells(partitionStore, FALSE);
-	
+
 	ThePartitionManager->reset();
 	ThePartitionManager->init();
 	TheRadar->newMap(TheTerrainLogic);
@@ -2643,7 +2635,7 @@ void TerrainLogic::setActiveBoundary(Int newActiveBoundary)
 // ------------------------------------------------------------------------------------------------
 /** Flatten the terrain beneath a struture. */
 // ------------------------------------------------------------------------------------------------
-void TerrainLogic::flattenTerrain(Object *obj) 
+void TerrainLogic::flattenTerrain(Object *obj)
 {
 	if (obj->getGeometryInfo().getIsSmall()) {
 		return;
@@ -2707,7 +2699,7 @@ void TerrainLogic::flattenTerrain(Object *obj)
 						match = true;
 					}
 					if (match) {
-						totalHeight += TheTerrainLogic->getGroundHeight(testPt.X, testPt.Y);
+						totalHeight += getGroundHeight(testPt.X, testPt.Y);
 						numSamples++;
 					}
 				}
@@ -2716,9 +2708,9 @@ void TerrainLogic::flattenTerrain(Object *obj)
 			Real avgHeight = totalHeight/numSamples;
 			Int rawDataHeight = REAL_TO_INT_FLOOR(0.5f + avgHeight/MAP_HEIGHT_SCALE);
 
-			// Compare to the height at the building's origin, because setRawMapHeight will only lower, 
+			// Compare to the height at the building's origin, because setRawMapHeight will only lower,
 			// not raise.  jba
-			Int centerHeight = REAL_TO_INT_FLOOR(TheTerrainLogic->getGroundHeight(pos->x, pos->y)/MAP_HEIGHT_SCALE);
+			Int centerHeight = REAL_TO_INT_FLOOR(getGroundHeight(pos->x, pos->y)/MAP_HEIGHT_SCALE);
 			if (rawDataHeight>centerHeight) rawDataHeight = centerHeight;
 
 			for (i=iMin.x; i<=iMax.x; i++) {
@@ -2768,14 +2760,14 @@ void TerrainLogic::flattenTerrain(Object *obj)
 				}
 			}
 
-				
+
 		break;
 		}
 		case GEOMETRY_SPHERE:	// not quite right, but close enough
 		case GEOMETRY_CYLINDER:
 		{
 			// fill in all cells that overlap as obstacle cells
-			Real radius = obj->getGeometryInfo().getMajorRadius();	
+			Real radius = obj->getGeometryInfo().getMajorRadius();
 			Real radiusSqr = sqr(radius);
 			ICoord2D iMin, iMax;
 			iMin.x = REAL_TO_INT_FLOOR((pos->x-radius)/MAP_XY_FACTOR);
@@ -2796,7 +2788,7 @@ void TerrainLogic::flattenTerrain(Object *obj)
 						match = true;
 					}
 					if (match) {
-						totalHeight += TheTerrainLogic->getGroundHeight(testPt.X, testPt.Y);
+						totalHeight += getGroundHeight(testPt.X, testPt.Y);
 						numSamples++;
 					}
 				}
@@ -2849,10 +2841,10 @@ void TerrainLogic::flattenTerrain(Object *obj)
 					}
 				}
 			}
-		
-		} // cylinder
+
+		}
 		break;
-	} // switch
+	}
 
 }
 
@@ -2861,13 +2853,13 @@ void TerrainLogic::flattenTerrain(Object *obj)
 // ------------------------------------------------------------------------------------------------
 /** Dig a deep circular gorge into the terrain beneath an object. */
 // ------------------------------------------------------------------------------------------------
-void TerrainLogic::createCraterInTerrain(Object *obj) 
+void TerrainLogic::createCraterInTerrain(Object *obj)
 {
-	if (obj->getGeometryInfo().getIsSmall()) 
+	if (obj->getGeometryInfo().getIsSmall())
 		return;
 
 	const Coord3D *pos = obj->getPosition();
-  Real radius = obj->getGeometryInfo().getMajorRadius();	
+  Real radius = obj->getGeometryInfo().getMajorRadius();
 
   if ( radius <= 0.0f )
     return; // sanity
@@ -2880,9 +2872,9 @@ void TerrainLogic::createCraterInTerrain(Object *obj)
 
   Real deltaX, deltaY;
 
-	for (Int i = iMin.x; i <= iMax.x; i++ ) 
+	for (Int i = iMin.x; i <= iMax.x; i++ )
   {
-		for ( Int j=0; j <= iMax.y; j++ ) 
+		for ( Int j=0; j <= iMax.y; j++ )
     {
 			deltaX = ( i * MAP_XY_FACTOR ) - pos->x;
 			deltaY = ( j * MAP_XY_FACTOR ) - pos->y;
@@ -2902,8 +2894,8 @@ void TerrainLogic::createCraterInTerrain(Object *obj)
 
 				TheTerrainVisual->setRawMapHeight( &gridPos, targetHeight );
 			}
-    } // next j
-  } // next i
+    }
+  }
 
 }
 
@@ -2919,7 +2911,7 @@ void TerrainLogic::createCraterInTerrain(Object *obj)
 void TerrainLogic::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer
@@ -2932,7 +2924,7 @@ void TerrainLogic::xfer( Xfer *xfer )
 {
 
 	// version
-	const XferVersion currentVersion = 2;	
+	const XferVersion currentVersion = 2;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
@@ -2961,10 +2953,10 @@ void TerrainLogic::xfer( Xfer *xfer )
 				Int triggerID = m_waterToUpdate[ i ].waterTable->m_polygon->getID();
 				xfer->xferInt( &triggerID );
 
-			}  // end if, save
+			}
 			else if (xfer->getXferMode() == XFER_LOAD)
 			{
-				
+
 				// read trigger id
 				Int triggerID;
 				xfer->xferInt( &triggerID );
@@ -2975,12 +2967,12 @@ void TerrainLogic::xfer( Xfer *xfer )
 				// sanity
 				if( poly == NULL )
 				{
-				
-					DEBUG_CRASH(( "TerrainLogic::xfer - Unable to find polygon trigger for water table with trigger ID '%d'\n",
+
+					DEBUG_CRASH(( "TerrainLogic::xfer - Unable to find polygon trigger for water table with trigger ID '%d'",
 												triggerID ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
 				// set water handle
 				m_waterToUpdate[ i ].waterTable = poly->getWaterHandle();
@@ -2989,12 +2981,12 @@ void TerrainLogic::xfer( Xfer *xfer )
 				if( m_waterToUpdate[ i ].waterTable == NULL )
 				{
 
-					DEBUG_CRASH(( "TerrainLogic::xfer - Polygon trigger to use for water handle has no water handle!\n" ));
+					DEBUG_CRASH(( "TerrainLogic::xfer - Polygon trigger to use for water handle has no water handle!" ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
-			}  // end else, load
+			}
 
 			// change per frame
 			xfer->xferReal( &m_waterToUpdate[ i ].changePerFrame );
@@ -3008,11 +3000,11 @@ void TerrainLogic::xfer( Xfer *xfer )
 			// current height
 			xfer->xferReal( &m_waterToUpdate[ i ].currentHeight );
 
-		}  // end for, i
+		}
 
-	}  // end if
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3021,7 +3013,7 @@ void TerrainLogic::loadPostProcess( void )
 {
 	Bridge* pBridge = getFirstBridge();
 	Bridge* pNext;
-	while (pBridge) 
+	while (pBridge)
 	{
 		pNext = pBridge->getNext();
 		Object* obj = TheGameLogic->findObjectByID(pBridge->peekBridgeInfo()->bridgeObjectID);
@@ -3032,5 +3024,5 @@ void TerrainLogic::loadPostProcess( void )
 		pBridge = pNext;
 	}
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Armor.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Armor.cpp
index e038fca959e..6d4578d1971 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Armor.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Armor.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 
 #include "Common/INI.h"
@@ -64,8 +64,8 @@ void ArmorTemplate::clear()
 }
 
 //-------------------------------------------------------------------------------------------------
-Real ArmorTemplate::adjustDamage(DamageType t, Real damage) const 
-{ 
+Real ArmorTemplate::adjustDamage(DamageType t, Real damage) const
+{
 	if (t == DAMAGE_UNRESISTABLE)
 		return damage;
 	if (t == DAMAGE_SUBDUAL_UNRESISTABLE)
@@ -75,7 +75,7 @@ Real ArmorTemplate::adjustDamage(DamageType t, Real damage) const
 
 	if (damage < 0.0f)
 		damage = 0.0f;
-	
+
 	return damage;
 }
 
@@ -116,11 +116,10 @@ ArmorStore::~ArmorStore()
 }
 
 //-------------------------------------------------------------------------------------------------
-const ArmorTemplate* ArmorStore::findArmorTemplate(AsciiString name) const
+const ArmorTemplate* ArmorStore::findArmorTemplate(NameKeyType namekey) const
 {
-	NameKeyType namekey = TheNameKeyGenerator->nameToKey(name);
-  ArmorTemplateMap::const_iterator it = m_armorTemplates.find(namekey);
-  if (it == m_armorTemplates.end()) 
+	ArmorTemplateMap::const_iterator it = m_armorTemplates.find(namekey);
+	if (it == m_armorTemplates.end())
 	{
 		return NULL;
 	}
@@ -130,10 +129,22 @@ const ArmorTemplate* ArmorStore::findArmorTemplate(AsciiString name) const
 	}
 }
 
+//-------------------------------------------------------------------------------------------------
+const ArmorTemplate* ArmorStore::findArmorTemplate(const AsciiString& name) const
+{
+	return findArmorTemplate(TheNameKeyGenerator->nameToKey(name));
+}
+
+//-------------------------------------------------------------------------------------------------
+const ArmorTemplate* ArmorStore::findArmorTemplate(const char* name) const
+{
+	return findArmorTemplate(TheNameKeyGenerator->nameToKey(name));
+}
+
 //-------------------------------------------------------------------------------------------------
 /*static */ void ArmorStore::parseArmorDefinition(INI *ini)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ "Armor", ArmorTemplate::parseArmorCoefficients, NULL, 0 }
 	};
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp
index eea116b7cb3..35fd1c79f96 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp
@@ -24,12 +24,12 @@
 
 // FILE: AutoHealBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Thing.h"
 #include "Common/ThingTemplate.h"
 #include "Common/INI.h"
@@ -44,11 +44,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -57,7 +52,7 @@ struct AutoHealPlayerScanHelper
 	KindOfMaskType m_kindOfToTest;
 	KindOfMaskType m_forbiddenKindOf;
 	Object *m_theHealer;
-	ObjectPointerList *m_objectList;	
+	ObjectPointerList *m_objectList;
 	Bool m_skipSelfForHealing;
 };
 
@@ -199,7 +194,7 @@ UpdateSleepTime AutoHealBehavior::update( void )
 		return UPDATE_SLEEP_FOREVER;
 	}
 
-//DEBUG_LOG(("doing auto heal %d\n",TheGameLogic->getFrame()));
+//DEBUG_LOG(("doing auto heal %d",TheGameLogic->getFrame()));
 
 	if( d->m_affectsWholePlayer )
 	{
@@ -245,7 +240,7 @@ UpdateSleepTime AutoHealBehavior::update( void )
 	}
 	else
 	{
-		//EXPANDED SYSTEM -- HEAL FRIENDLIES IN RADIUS 
+		//EXPANDED SYSTEM -- HEAL FRIENDLIES IN RADIUS
 		// setup scan filters
 		PartitionFilterRelationship relationship( obj, PartitionFilterRelationship::ALLOW_ALLIES );
 		PartitionFilterSameMapStatus filterMapStatus(obj);
@@ -276,8 +271,8 @@ UpdateSleepTime AutoHealBehavior::update( void )
 								if ( animTemplate )
 								{
 									Coord3D iconPosition;
-									iconPosition.set(obj->getPosition()->x, 
-																	 obj->getPosition()->y, 
+									iconPosition.set(obj->getPosition()->x,
+																	 obj->getPosition()->y,
 																	 obj->getPosition()->z + obj->getGeometryInfo().getMaxHeightAbovePosition() );
 									TheInGameUI->addWorldAnimation( animTemplate,	&iconPosition, WORLD_ANIM_FADE_ON_EXPIRE,
 																									TheGlobalData->m_getHealedAnimationDisplayTimeInSeconds,
@@ -288,12 +283,12 @@ UpdateSleepTime AutoHealBehavior::update( void )
 					}
 				}
 			}
-		}  // end for obj
+		}
 
 		return UPDATE_SLEEP( d->m_singleBurst ? UPDATE_SLEEP_FOREVER : d->m_healingDelay );
 	}
 }
- 
+
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void AutoHealBehavior::pulseHealObject( Object *obj )
@@ -303,7 +298,7 @@ void AutoHealBehavior::pulseHealObject( Object *obj )
 
 	const AutoHealBehaviorModuleData *data = getAutoHealBehaviorModuleData();
 
-	
+
 	if ( data->m_radius == 0.0f )
 		obj->attemptHealing(data->m_healingAmount, getObject());
 	else
@@ -318,7 +313,7 @@ void AutoHealBehavior::pulseHealObject( Object *obj )
 			system->setPosition( obj->getPosition() );
 		}
 	}
-	
+
 	m_soonestHealFrame = TheGameLogic->getFrame() + data->m_healingDelay;// In case onDamage tries to wake us up early
 }
 
@@ -334,7 +329,7 @@ void AutoHealBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpgradeMux::upgradeMuxCRC( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -364,7 +359,7 @@ void AutoHealBehavior::xfer( Xfer *xfer )
 	// stopped
 	xfer->xferBool( &m_stopped );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -378,4 +373,4 @@ void AutoHealBehavior::loadPostProcess( void )
 	// extend base class
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BattleBusSlowDeathBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BattleBusSlowDeathBehavior.cpp
index 611956e342f..40e24c023fb 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BattleBusSlowDeathBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BattleBusSlowDeathBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 
 #include "GameLogic/Module/BattleBusSlowDeathBehavior.h"
@@ -44,11 +44,6 @@
 #include "GameLogic/Module/ContainModule.h"
 #include "GameLogic/Module/PhysicsUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 enum
 {
@@ -75,7 +70,7 @@ BattleBusSlowDeathBehaviorModuleData::BattleBusSlowDeathBehaviorModuleData( void
 	m_percentDamageToPassengers = 0.0f;
 	m_emptyHulkDestructionDelay = 0;
 
-}  // end BattleBusSlowDeathBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -83,7 +78,7 @@ BattleBusSlowDeathBehaviorModuleData::BattleBusSlowDeathBehaviorModuleData( void
 {
   SlowDeathBehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
 		{ "FXStartUndeath",	INI::parseFXList,	NULL, offsetof( BattleBusSlowDeathBehaviorModuleData, m_fxStartUndeath ) },
@@ -102,7 +97,7 @@ BattleBusSlowDeathBehaviorModuleData::BattleBusSlowDeathBehaviorModuleData( void
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -118,15 +113,15 @@ BattleBusSlowDeathBehavior::BattleBusSlowDeathBehavior( Thing *thing, const Modu
 	m_isInFirstDeath = FALSE;
 	m_groundCheckFrame = 0;
 	m_penaltyDeathFrame = 0;
-}  // end BattleBusSlowDeathBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 BattleBusSlowDeathBehavior::~BattleBusSlowDeathBehavior( void )
 {
 
-}  // end ~BattleBusSlowDeathBehavior
- 
+}
+
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void BattleBusSlowDeathBehavior::onDie( const DamageInfo *damageInfo )
@@ -135,7 +130,7 @@ void BattleBusSlowDeathBehavior::onDie( const DamageInfo *damageInfo )
 	m_isInFirstDeath = FALSE; // and clear this incase we died while in the alternate death
 
 	SlowDeathBehavior::onDie(damageInfo);
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -164,7 +159,7 @@ void BattleBusSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 			// Then stop physically
 			me->getPhysics()->clearAcceleration();
 			me->getPhysics()->scrubVelocity2D(0);
-			
+
 			// Then get chucked in the air
 			Coord3D throwForce;
 			throwForce.x = 0;
@@ -177,7 +172,7 @@ void BattleBusSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 		// And finally hit those inside for some damage
 		if( me->getContain() )
 			me->getContain()->processDamageToContained(data->m_percentDamageToPassengers);
-		
+
 		setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
 	}
 	else
@@ -186,7 +181,7 @@ void BattleBusSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 		SlowDeathBehavior::beginSlowDeath( damageInfo );
 	}
 
-}  // end beginSlowDeath
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -275,7 +270,7 @@ UpdateSleepTime BattleBusSlowDeathBehavior::update( void )
 			return UPDATE_SLEEP(EMPTY_HULK_CHECK_DELAY);// Stay awake regardless
 		}
 	}
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -283,10 +278,10 @@ UpdateSleepTime BattleBusSlowDeathBehavior::update( void )
 void BattleBusSlowDeathBehavior::crc( Xfer *xfer )
 {
 
-	// extend base class 
+	// extend base class
 	SlowDeathBehavior::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -312,7 +307,7 @@ void BattleBusSlowDeathBehavior::xfer( Xfer *xfer )
 
 	xfer->xferUnsignedInt( &m_penaltyDeathFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -323,4 +318,4 @@ void BattleBusSlowDeathBehavior::loadPostProcess( void )
 	// extend base class
 	SlowDeathBehavior::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BehaviorModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BehaviorModule.cpp
index 73c2ed59573..6effee30f6f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BehaviorModule.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BehaviorModule.cpp
@@ -41,7 +41,7 @@ void BehaviorModule::crc( Xfer *xfer )
 	// call base class
 	ObjectModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -59,7 +59,7 @@ void BehaviorModule::xfer( Xfer *xfer )
 	// call base class
 	ObjectModule::xfer( xfer );
 
-}  // xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -70,4 +70,4 @@ void BehaviorModule::loadPostProcess( void )
 	// call base class
 	ObjectModule::loadPostProcess();
 
-}  // end loadPostProcess
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp
index 71a18f3ea04..464e4f11b5c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Radar.h"
 #include "Common/ThingFactory.h"
@@ -62,7 +62,7 @@ BridgeBehaviorModuleData::BridgeBehaviorModuleData( void )
 	m_lateralScaffoldSpeed = 1.0f;
 	m_verticalScaffoldSpeed = 1.0f;
 
-}  // end BridgeBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -75,7 +75,7 @@ BridgeBehaviorModuleData::~BridgeBehaviorModuleData( void )
 	// clear the ocl list
 	m_ocl.clear();
 
-}  // end ~BridgeBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ BridgeBehaviorModuleData::~BridgeBehaviorModuleData( void )
 {
   BehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "LateralScaffoldSpeed",			INI::parseVelocityReal, NULL, offsetof( BridgeBehaviorModuleData, m_lateralScaffoldSpeed ) },
 		{ "VerticalScaffoldSpeed",		INI::parseVelocityReal, NULL, offsetof( BridgeBehaviorModuleData, m_verticalScaffoldSpeed ) },
@@ -94,13 +94,13 @@ BridgeBehaviorModuleData::~BridgeBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Parse time and location info in the form of:
 	* Delay:#### <Bone:BoneName> */
 // ------------------------------------------------------------------------------------------------
-static void parseTimeAndLocationInfo( INI *ini, void *instance, 
+static void parseTimeAndLocationInfo( INI *ini, void *instance,
 																			TimeAndLocationInfo *timeAndLocationInfo )
 {
 
@@ -109,10 +109,10 @@ static void parseTimeAndLocationInfo( INI *ini, void *instance,
 	if( stricmp( token, "Delay" ) != 0 )
 	{
 
-		DEBUG_CRASH(( "Expected 'Delay' token, found '%s'\n", token ));
+		DEBUG_CRASH(( "Expected 'Delay' token, found '%s'", token ));
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// delay value
 	ini->parseDurationUnsignedInt( ini, instance, &timeAndLocationInfo->delay, NULL );
@@ -126,23 +126,23 @@ static void parseTimeAndLocationInfo( INI *ini, void *instance,
 		if( stricmp( token, "Bone" ) != 0 )
 		{
 
-			DEBUG_CRASH(( "Expected 'Bone' token, found '%s'\n", token ));
+			DEBUG_CRASH(( "Expected 'Bone' token, found '%s'", token ));
 			throw INI_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read bone name and store
 		timeAndLocationInfo->boneName = ini->getNextAsciiString();
 
-	}  // end if
+	}
 
-}  // end parseTimeAndLocationInfo
+}
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void BridgeBehaviorModuleData::parseFX( INI *ini, 
-											 														 void *instance, 
-																									 void *store, 
+/*static*/ void BridgeBehaviorModuleData::parseFX( INI *ini,
+											 														 void *instance,
+																									 void *store,
 																									 const void *userData )
 {
 	const char *token;
@@ -159,10 +159,10 @@ static void parseTimeAndLocationInfo( INI *ini, void *instance,
 	if( stricmp( token, "FX" ) != 0 )
 	{
 
-		DEBUG_CRASH(( "Expected 'FX' token, found '%s'\n", token ));
+		DEBUG_CRASH(( "Expected 'FX' token, found '%s'", token ));
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// fx list name and store as pointer
 	FXList *fx;
@@ -177,13 +177,13 @@ static void parseTimeAndLocationInfo( INI *ini, void *instance,
 	// put on list
 	bridgeFXList->push_back( item );
 
-}  // end parseFX
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void BridgeBehaviorModuleData::parseOCL( INI *ini, 
+/*static*/ void BridgeBehaviorModuleData::parseOCL( INI *ini,
 																										void *instance,
-																										void *store, 
+																										void *store,
 																										const void *userData )
 {
 	const char *token;
@@ -200,10 +200,10 @@ static void parseTimeAndLocationInfo( INI *ini, void *instance,
 	if( stricmp( token, "OCL" ) != 0 )
 	{
 
-		DEBUG_CRASH(( "Expected 'OCL' token, found '%s'\n", token ));
+		DEBUG_CRASH(( "Expected 'OCL' token, found '%s'", token ));
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// fx list name and store as pointer
 	ObjectCreationList *ocl;
@@ -218,7 +218,7 @@ static void parseTimeAndLocationInfo( INI *ini, void *instance,
 	// put on list
 	bridgeOCLList->push_back( item );
 
-}  // end parseOCL
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -249,17 +249,17 @@ BridgeBehavior::BridgeBehavior( Thing *thing, const ModuleData *moduleData )
 			m_repairToOCL[ bodyState ][ i ] = NULL;
 			m_repairToFX[ bodyState ][ i ] = NULL;
 
-		}  // end for i
+		}
 
 		// these don't need initialization, they have constructors
 		// m_damageToSound[ bodyState ] = ???
 		// m_repairToSound[ bodyState ] = ???
 
-	}  // end for, bodyState
+	}
 
 	m_deathFrame = 0;
 
-}  // end BridgeBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -280,16 +280,16 @@ BridgeBehavior::~BridgeBehavior( void )
 		if( tower )
 			TheGameLogic->destroyObject( tower );
 
-	}  // end for i
+	}
 
-}  // end ~BridgeBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Get bridge behavior interface */
 // ------------------------------------------------------------------------------------------------
 /*static */BridgeBehaviorInterface *BridgeBehavior::getBridgeBehaviorInterfaceFromObject( Object *obj )
 {
-	
+
 	// sanity
 	if( obj == NULL )
 		return NULL;
@@ -303,12 +303,12 @@ BridgeBehavior::~BridgeBehavior( void )
 		if( bbi )
 			return bbi;
 
-	}  // end for, bmi
+	}
 
 	// interface not found
 	return NULL;
 
-}  // end getBridgeBehaviorInterfaceFromObject
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -318,7 +318,7 @@ void BridgeBehavior::onDelete( void )
 	// clear the list of scaffold objects
 	m_scaffoldObjectIDList.clear();
 
-}  // end onDelete
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -341,7 +341,7 @@ void BridgeBehavior::resolveFX( void )
 	if( bridgeTemplate == NULL )
 		return;
 
-	AsciiString name;	
+	AsciiString name;
 	for( Int bodyState = BODY_PRISTINE; bodyState < BODYDAMAGETYPE_COUNT; ++bodyState )
 	{
 
@@ -352,24 +352,24 @@ void BridgeBehavior::resolveFX( void )
 			name = bridgeTemplate->getDamageToOCLString( (BodyDamageType)bodyState, i );
 			m_damageToOCL[ bodyState ][ i ] = TheObjectCreationListStore->findObjectCreationList( name.str() );
 			if( name.isEmpty() == FALSE && m_damageToOCL[ bodyState ][ i ] == NULL )
-				DEBUG_CRASH(( "OCL list '%s' not found\n", name.str() ));
+				DEBUG_CRASH(( "OCL list '%s' not found", name.str() ));
 
 			name = bridgeTemplate->getDamageToFXString( (BodyDamageType)bodyState, i );
 			m_damageToFX[ bodyState ][ i ] = TheFXListStore->findFXList( name.str() );
 			if( name.isEmpty() == FALSE && m_damageToFX[ bodyState ][ i ] == NULL )
-				DEBUG_CRASH(( "FX list '%s' not found\n", name.str() ));
+				DEBUG_CRASH(( "FX list '%s' not found", name.str() ));
 
 			name = bridgeTemplate->getRepairedToOCLString( (BodyDamageType)bodyState, i );
 			m_repairToOCL[ bodyState ][ i ] = TheObjectCreationListStore->findObjectCreationList( name.str() );
 			if( name.isEmpty() == FALSE && m_repairToOCL[ bodyState ][ i ] == NULL )
-				DEBUG_CRASH(( "OCL list '%s' not found\n", name.str() ));
+				DEBUG_CRASH(( "OCL list '%s' not found", name.str() ));
 
 			name = bridgeTemplate->getRepairedToFXString( (BodyDamageType)bodyState, i );
-			m_repairToFX[ bodyState ][ i ] = TheFXListStore->findFXList( name.str() );;
+			m_repairToFX[ bodyState ][ i ] = TheFXListStore->findFXList( name.str() );
 			if( name.isEmpty() == FALSE && m_repairToFX[ bodyState ][ i ] == NULL )
-				DEBUG_CRASH(( "FX list '%s' not found\n", name.str() ));
+				DEBUG_CRASH(( "FX list '%s' not found", name.str() ));
 
-		}  // end for i
+		}
 
 		// audio sounds
 		name = bridgeTemplate->getDamageToSoundString( (BodyDamageType)bodyState );
@@ -380,12 +380,12 @@ void BridgeBehavior::resolveFX( void )
 		m_repairToSound[ bodyState ].setEventName( name );
 		m_repairToSound[ bodyState ].setObjectID( us->getID() );
 
-	}  // end for, bodyState
+	}
 
 	// fx are now "resolved"
 	m_fxResolved = TRUE;
 
-}  // end resolveFX
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -396,10 +396,10 @@ void BridgeBehavior::setTower( BridgeTowerType towerType, Object *tower )
 	if( towerType < 0 || towerType >= BRIDGE_MAX_TOWERS )
 	{
 
-		DEBUG_CRASH(( "BridgeBehavior::setTower - Invalid tower type index '%d'\n", towerType ));
+		DEBUG_CRASH(( "BridgeBehavior::setTower - Invalid tower type index '%d'", towerType ));
 		return;
 
-	}  // end if
+	}
 
 	// store it
 	if( tower )
@@ -407,7 +407,7 @@ void BridgeBehavior::setTower( BridgeTowerType towerType, Object *tower )
 	else
 		m_towerID[ towerType ] = INVALID_ID;
 
-}  // end setTower
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -418,15 +418,15 @@ ObjectID BridgeBehavior::getTowerID( BridgeTowerType towerType )
 	if( towerType < 0 || towerType >= BRIDGE_MAX_TOWERS )
 	{
 
-		DEBUG_CRASH(( "BridgeBehavior::setTower - Invalid tower type index '%d'\n", towerType ));
+		DEBUG_CRASH(( "BridgeBehavior::setTower - Invalid tower type index '%d'", towerType ));
 		return INVALID_ID;
 
-	}  // end if
+	}
 
 	// return the stored ID
 	return m_towerID[ towerType ];
 
-}  // end getTowerID
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -464,13 +464,13 @@ void BridgeBehavior::onDamage( DamageInfo *damageInfo )
 				towerDamage.in.m_deathType = damageInfo->in.m_deathType;
 				tower->attemptDamage( &towerDamage );
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 
-}  // end onDamage
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -502,19 +502,19 @@ void BridgeBehavior::onHealing( DamageInfo *damageInfo )
 				BodyModuleInterface *towerBody = tower->getBodyModule();
 				tower->attemptHealing(healingPercentage * towerBody->getMaxHealth(), getObject());
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 
-}  // end onHealing
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Pick a random surface spot on the bridge surface */
 // ------------------------------------------------------------------------------------------------
-void BridgeBehavior::getRandomSurfacePosition( TerrainRoadType *bridgeTemplate, 
-																							 const BridgeInfo *bridgeInfo, 
+void BridgeBehavior::getRandomSurfacePosition( TerrainRoadType *bridgeTemplate,
+																							 const BridgeInfo *bridgeInfo,
 																							 Coord3D *pos )
 {
 
@@ -552,21 +552,21 @@ void BridgeBehavior::getRandomSurfacePosition( TerrainRoadType *bridgeTemplate,
 	pos->z = v1.z + v2.z + bridgeInfo->fromLeft.z;
 
 	//
-	// we now have a position picked, the last thing to do is add in an additional 
+	// we now have a position picked, the last thing to do is add in an additional
 	// Z component so that effects can be created in a "cube" area on and above the bridge
 	//
 	pos->z += GameLogicRandomValueReal( 0.0f, bridgeTemplate->getTransitionEffectsHeight() );
 
-}  // end getRandomSurfacePosition
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void BridgeBehavior::doAreaEffects( TerrainRoadType *bridgeTemplate,
-																		Bridge *bridge, 
-																		const ObjectCreationList *ocl, 
+																		Bridge *bridge,
+																		const ObjectCreationList *ocl,
 																		const FXList *fx )
 {
-	
+
 	// sanity
 	if( bridge == NULL )
 		return;
@@ -591,7 +591,7 @@ void BridgeBehavior::doAreaEffects( TerrainRoadType *bridgeTemplate,
 			getRandomSurfacePosition( bridgeTemplate, bridgeInfo, &pos );
 			FXList::doFXPos( fx, &pos );
 
-		}  // end if
+		}
 
 		// pick spot in the bridge area and do OCL
 		if( ocl )
@@ -600,16 +600,16 @@ void BridgeBehavior::doAreaEffects( TerrainRoadType *bridgeTemplate,
 			getRandomSurfacePosition( bridgeTemplate, bridgeInfo, &pos );
 			ObjectCreationList::create( ocl, getObject(), &pos, NULL, INVALID_ANGLE );
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end doAreaEffects
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																							BodyDamageType oldState, 
+void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
+																							BodyDamageType oldState,
 																							BodyDamageType newState )
 {
 
@@ -620,7 +620,7 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 	if( newState != BODY_RUBBLE )
 		m_deathFrame = 0;
 
-	// first resolve any fx stuff if we need to 
+	// first resolve any fx stuff if we need to
 	if( m_fxResolved == FALSE )
 		resolveFX();
 
@@ -629,7 +629,7 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 		return;
 
 	// sanity
-	DEBUG_ASSERTCRASH( oldState != newState, ("BridgeBehavior::onBodyDamageStateChange - oldState and newState should be different if this is getting called\n") );
+	DEBUG_ASSERTCRASH( oldState != newState, ("BridgeBehavior::onBodyDamageStateChange - oldState and newState should be different if this is getting called") );
 
 	Object *us = getObject();
 	Bridge *bridge = TheTerrainLogic->findBridgeAt( us->getPosition() );
@@ -638,10 +638,10 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 	if( bridge == NULL )
 	{
 
-		DEBUG_CRASH(( "BridgeBehavior - Unable to find bridge\n" ));
+		DEBUG_CRASH(( "BridgeBehavior - Unable to find bridge" ));
 		return;
 
-	}  // end if
+	}
 
 	// get the bridge template name
 	AsciiString bridgeTemplateName = bridge->getBridgeTemplateName();
@@ -650,8 +650,8 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 	TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( bridgeTemplateName );
 
 	// sanity
-	DEBUG_ASSERTCRASH( bridgeTemplate, ("BridgeBehavior: Unable to find bridge template '%s' in bridge object '%s'\n",	
-																		 bridgeTemplateName,
+	DEBUG_ASSERTCRASH( bridgeTemplate, ("BridgeBehavior: Unable to find bridge template '%s' in bridge object '%s'",
+																		 bridgeTemplateName.str(),
 																		 us->getTemplate()->getName().str()) );
 
 	//
@@ -673,7 +673,7 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 		for( Int i = 0; i < MAX_BRIDGE_BODY_FX; i++ )
 			doAreaEffects( bridgeTemplate, bridge, m_repairToOCL[ newState ][ i ], m_repairToFX[ newState ][ i ] );
 
-	}  // end if
+	}
 	else
 	{
 
@@ -683,7 +683,7 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 		for( Int i = 0; i < MAX_BRIDGE_BODY_FX; i++ )
 			doAreaEffects( bridgeTemplate, bridge, m_damageToOCL[ newState ][ i ], m_damageToFX[ newState ][ i ] );
 
-	}  // end else
+	}
 
 	// update bridge damage states
 	///@todo this should be re-written, there no need for this looping bridge examination
@@ -693,13 +693,13 @@ void BridgeBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
 	// for the local player, if this bridge has switched from rubble, to usable, or from
 	// usable to rubble, we should reflect the change on the radar.  note that we
 	// request that the radar queue a refresh sometime in the future because it keeps
-	// track of how often we makes requests to do a refresh and doesn't do them too 
+	// track of how often we makes requests to do a refresh and doesn't do them too
 	// often because it's expensive to refresh the terrain
 	//
 	if( oldState == BODY_RUBBLE || newState == BODY_RUBBLE )
 		TheRadar->queueTerrainRefresh();
 
-}  // end onBodyDamageStateChange
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -723,7 +723,7 @@ UpdateSleepTime BridgeBehavior::update( void )
 		TerrainRoadType *bridgeTemplate = NULL;
 		if ( bridge )
 		{
-			DEBUG_ASSERTCRASH( bridge, ("BridgeBehavior::update - Unable to find bridge\n") );
+			DEBUG_ASSERTCRASH( bridge, ("BridgeBehavior::update - Unable to find bridge") );
 
 			// get bridge info
 			bridgeInfo = bridge->peekBridgeInfo();
@@ -731,7 +731,7 @@ UpdateSleepTime BridgeBehavior::update( void )
 			// get the bridge template info
 			AsciiString bridgeTemplateName = bridge->getBridgeTemplateName();
 			bridgeTemplate = TheTerrainRoads->findBridge( bridgeTemplateName );
-			DEBUG_ASSERTCRASH( bridgeTemplate, ("BridgeBeahvior::getRandomSurfacePosition - Encountered a bridge with no template!\n") );
+			DEBUG_ASSERTCRASH( bridgeTemplate, ("BridgeBeahvior::getRandomSurfacePosition - Encountered a bridge with no template!") );
 		}
 
 		// how much time has passed between now and our destruction frame
@@ -743,7 +743,7 @@ UpdateSleepTime BridgeBehavior::update( void )
 		{
 
 			//
-			// we'll launch an fx list if our death time is equal to exactly the delay 
+			// we'll launch an fx list if our death time is equal to exactly the delay
 			// we're waiting for to launch the list
 			//
 			if( deathTime == (*fxIt).timeAndLocationInfo.delay )
@@ -761,14 +761,14 @@ UpdateSleepTime BridgeBehavior::update( void )
 					getRandomSurfacePosition( bridgeTemplate, bridgeInfo, &pos );
 				else
 					pos.set( getObject()->getPosition() );
-					
+
 
 				// launch the fx list
 				FXList::doFXPos( (*fxIt).fx, &pos );
 
-			}  // end if
+			}
 
-		}  // end for, fxIt
+		}
 
 		// see if there are any ocl visuals we need to execute
 		BridgeOCLList::const_iterator oclIt;
@@ -776,7 +776,7 @@ UpdateSleepTime BridgeBehavior::update( void )
 		{
 
 			//
-			// we'll launch an ocl list if our death time is equal to exactly the delay 
+			// we'll launch an ocl list if our death time is equal to exactly the delay
 			// we're waiting for to launch the list
 			//
 			if( deathTime == (*oclIt).timeAndLocationInfo.delay )
@@ -795,16 +795,16 @@ UpdateSleepTime BridgeBehavior::update( void )
 					// special case for creating an OCL for using the bridge object parent center location
 					// why do we have this ... well, apparently the OCL ignores the obj parameter
 					// passed in if you give it a position parameter, and we need it to pay attention
-					// to that object parameteter so the OCL stuff can inherit the LIKE_EXISTING 
+					// to that object parameteter so the OCL stuff can inherit the LIKE_EXISTING
 					// properties from its parent
 					//
 					if( boneName.compare( "ParentObject" ) == 0 )
 					{
-						
+
 						// launch the effects just using the parent object for location info
 						ObjectCreationList::create( (*oclIt).ocl, us, NULL );
 
-					}  // endif 
+					}
 					else
 					{
 
@@ -813,10 +813,10 @@ UpdateSleepTime BridgeBehavior::update( void )
 
 						// launch the fx list
 						ObjectCreationList::create( (*oclIt).ocl, us, &pos, NULL, INVALID_ANGLE );
-					
-					}  // end else
 
-				}  // end if, bone name not empty
+					}
+
+				}
 				else
 				{
 
@@ -829,17 +829,17 @@ UpdateSleepTime BridgeBehavior::update( void )
 					// launch the fx list
 					ObjectCreationList::create( (*oclIt).ocl, us, &pos, NULL, INVALID_ANGLE );
 
-				}  // end else
+				}
 
-			}  // end if
+			}
 
-		}  // end for, oclIt
+		}
 
-	}  // end if
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -855,15 +855,15 @@ void BridgeBehavior::onDie( const DamageInfo *damageInfo )
 		if( tower )
 			tower->kill();
 
-	}  // end for, i
+	}
 
 	// we need to handle anything that was on top of us now that we've been destroyed
 	handleObjectsOnBridgeOnDie();
 
 	// we have now died, record the death frame
 	m_deathFrame = TheGameLogic->getFrame();
-			
-}  // end onDie
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -897,7 +897,7 @@ void BridgeBehavior::handleObjectsOnBridgeOnDie( void )
 		for( Int i = 0; i < 4; ++i )
 			if( bridgePolygon[ i ].z < lowBridgeZ )
 				lowBridgeZ = bridgePolygon[ i ].z;
-		
+
 		//
 		// given the polygon area, how big is the radius that we need to scan in the world
 		// to cover from the center of the bridge (the bridge object position) to the edge
@@ -909,8 +909,8 @@ void BridgeBehavior::handleObjectsOnBridgeOnDie( void )
 		Real radius = v.length();
 
 		// scan the objects in the radius
-		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( bridgePos, 
-																																			 radius, 
+		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( bridgePos,
+																																			 radius,
 																																			 FROM_CENTER_2D );
 		MemoryPoolObjectHolder hold( iter );
 		Object *other;
@@ -947,20 +947,20 @@ void BridgeBehavior::handleObjectsOnBridgeOnDie( void )
 			else
 				other->kill();
 
-		}  // end for, other	
+		}
 
-	}  // end if, terrainBridge
+	}
 
-}  // end handleObjectsOnBridgeDie
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set all the position, angle, and speed data we need to for a single scaffold object */
 // ------------------------------------------------------------------------------------------------
-void BridgeBehavior::setScaffoldData( Object *obj, 
-																			Real *angle, 
-																			Real *sunkenHeight, 
-																			const Coord3D *riseToPos, 
-																			const Coord3D *buildPos, 
+void BridgeBehavior::setScaffoldData( Object *obj,
+																			Real *angle,
+																			Real *sunkenHeight,
+																			const Coord3D *riseToPos,
+																			const Coord3D *buildPos,
 																			const Coord3D *bridgeCenter )
 {
 
@@ -973,7 +973,7 @@ void BridgeBehavior::setScaffoldData( Object *obj,
 	// get the scaffold behavior interface
 	BridgeScaffoldBehaviorInterface *scaffoldBehavior;
 	scaffoldBehavior = BridgeScaffoldBehavior::getBridgeScaffoldBehaviorInterfaceFromObject( obj );
-	DEBUG_ASSERTCRASH( scaffoldBehavior, ("Unable to find bridge scaffold behavior interface\n") );
+	DEBUG_ASSERTCRASH( scaffoldBehavior, ("Unable to find bridge scaffold behavior interface") );
 
 	// compute the sunken position that the object will initially start at
 	Real fudge = 8.0f;
@@ -985,7 +985,7 @@ void BridgeBehavior::setScaffoldData( Object *obj,
 
 	// set all the destination points for all scaffold motion
 	scaffoldBehavior->setPositions( &sunkenPos, riseToPos, buildPos );
-	
+
 	// set the scaffold object in motion rising up out of the ground
 	scaffoldBehavior->setMotion( STM_RISE );
 
@@ -1013,7 +1013,7 @@ void BridgeBehavior::setScaffoldData( Object *obj,
 	Real verticalSpeed = modData->m_verticalScaffoldSpeed;
 	scaffoldBehavior->setVerticalSpeed( verticalSpeed );
 
-}  // end setScaffoldData
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Start the bridge repair scaffolding.  If we already have scaffolding this call
@@ -1036,7 +1036,7 @@ void BridgeBehavior::createScaffolding( void )
 	// get the bridge template
 	AsciiString bridgeTemplateName = bridge->getBridgeTemplateName();
 	TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( bridgeTemplateName );
-	DEBUG_ASSERTCRASH( bridgeTemplate, ("Unable to find bridge template to create scaffolding\n") );
+	DEBUG_ASSERTCRASH( bridgeTemplate, ("Unable to find bridge template to create scaffolding") );
 
 	// get the thing template for the scaffold object we're going to use
 	AsciiString scaffoldObjectName = bridgeTemplate->getScaffoldObjectName();
@@ -1044,10 +1044,10 @@ void BridgeBehavior::createScaffolding( void )
 	if( scaffoldTemplate == NULL )
 	{
 
-		DEBUG_CRASH(( "Unable to find bridge scaffold template\n" ));
+		DEBUG_CRASH(( "Unable to find bridge scaffold template" ));
 		return;
 
-	}  // end if
+	}
 
 	// get thing template for scaffold support object
 	AsciiString scaffoldSupportObjectName = bridgeTemplate->getScaffoldSupportObjectName();
@@ -1055,10 +1055,10 @@ void BridgeBehavior::createScaffolding( void )
 	if( scaffoldSupportTemplate == NULL )
 	{
 
-		DEBUG_CRASH(( "Unable to find bridge support scaffold template\n" ));
+		DEBUG_CRASH(( "Unable to find bridge support scaffold template" ));
 		return;
 
-	}  // end if
+	}
 
 	// how much space is going to be between each of the scaffold objects at their final positions
 	Real spacing = scaffoldTemplate->getTemplateGeometryInfo().getMajorRadius() * 2.0f;
@@ -1111,7 +1111,7 @@ void BridgeBehavior::createScaffolding( void )
 	rightVector.z = leftStart.z - rightStart.z;
 
 	//
-	// how many of these scaffold objects will take to tile from each of the endpoints 
+	// how many of these scaffold objects will take to tile from each of the endpoints
 	// to the center area of the bridge
 	//
 	Real tileDistance = leftVector.length();
@@ -1127,7 +1127,7 @@ void BridgeBehavior::createScaffolding( void )
 	Int numIterations = REAL_TO_INT_CEIL( INT_TO_REAL( numObjects ) / 2.0f );
 
 	//
-	// normalize left and right vectors as it is a vector that goes from our left start 
+	// normalize left and right vectors as it is a vector that goes from our left start
 	// position to the destination right start position ... we will multiply this vector by a
 	// spacing amount and add to the left start position to find a destination position
 	// for a particular scaffold object along the bridge surface
@@ -1144,8 +1144,8 @@ void BridgeBehavior::createScaffolding( void )
 	{
 
 		// sanity
-		DEBUG_ASSERTCRASH( scaffoldObjectsCreated < numObjects, 
-											 ("Creating too many scaffold objects\n") );
+		DEBUG_ASSERTCRASH( scaffoldObjectsCreated < numObjects,
+											 ("Creating too many scaffold objects") );
 
 		// create object
 		obj = TheThingFactory->newObject( scaffoldTemplate, us->getTeam() );
@@ -1189,11 +1189,11 @@ void BridgeBehavior::createScaffolding( void )
 			supportDestinationPos.z -= scaffoldSupportHeight;
 			supportBridgeCenter.z -= scaffoldSupportHeight;
 			obj = TheThingFactory->newObject( scaffoldSupportTemplate, us->getTeam() );
-			setScaffoldData( obj, 
-											 angle, 
+			setScaffoldData( obj,
+											 angle,
 											 &scaffoldSupportHeight,
-											 &supportRiseToPos, 
-											 &supportDestinationPos, 
+											 &supportRiseToPos,
+											 &supportDestinationPos,
 											 &supportBridgeCenter );
 			m_scaffoldObjectIDList.push_back( obj->getID() );
 
@@ -1201,7 +1201,7 @@ void BridgeBehavior::createScaffolding( void )
 			// off to the next layer
 			offset -= scaffoldSupportHeight;
 
-		}  // end while
+		}
 
 		//
 		// now create the object from the "right" side of the bridge ... but note that
@@ -1212,8 +1212,8 @@ void BridgeBehavior::createScaffolding( void )
 		{
 
 			// sanity
-			DEBUG_ASSERTCRASH( scaffoldObjectsCreated < numObjects, 
-												 ("Creating too many scaffold objects\n") );
+			DEBUG_ASSERTCRASH( scaffoldObjectsCreated < numObjects,
+												 ("Creating too many scaffold objects") );
 
 			// create new object
 			obj = TheThingFactory->newObject( scaffoldTemplate, us->getTeam() );
@@ -1254,11 +1254,11 @@ void BridgeBehavior::createScaffolding( void )
 				supportDestinationPos.z -= scaffoldSupportHeight;
 				supportBridgeCenter.z -= scaffoldSupportHeight;
 				obj = TheThingFactory->newObject( scaffoldSupportTemplate, us->getTeam() );
-				setScaffoldData( obj, 
-												 angle, 
+				setScaffoldData( obj,
+												 angle,
 												 &scaffoldSupportHeight,
-												 &supportRiseToPos, 
-												 &supportDestinationPos, 
+												 &supportRiseToPos,
+												 &supportDestinationPos,
 												 &supportBridgeCenter );
 				m_scaffoldObjectIDList.push_back( obj->getID() );
 
@@ -1266,11 +1266,11 @@ void BridgeBehavior::createScaffolding( void )
 				// off to the next layer
 				offset -= scaffoldSupportHeight;
 
-			}  // end while
+			}
 
-		}  // end if
+		}
 
-	}  // end for i	
+	}
 
 	// scaffolding is now present
 	m_scaffoldPresent = TRUE;
@@ -1278,7 +1278,7 @@ void BridgeBehavior::createScaffolding( void )
 	// when scaffolding is present, a bridge cannot be used
 	TheAI->pathfinder()->changeBridgeState( bridge->getLayer(), FALSE );
 
-}  // end createScaffolding
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove the bridge scaffolding.  If we don't have any then this call is ignored */
@@ -1304,12 +1304,12 @@ void BridgeBehavior::removeScaffolding( void )
 
 		// get the scaffold behavior
 		scaffoldBehavior = BridgeScaffoldBehavior::getBridgeScaffoldBehaviorInterfaceFromObject( obj );
-		DEBUG_ASSERTCRASH( scaffoldBehavior, ("Unable to find bridge scaffold behavior interface\n") );
-		
+		DEBUG_ASSERTCRASH( scaffoldBehavior, ("Unable to find bridge scaffold behavior interface") );
+
 		// reverse the motion
 		scaffoldBehavior->reverseMotion();
 
-	}  // end for, it
+	}
 
 	// clear our scaffold object list
 	m_scaffoldObjectIDList.clear();
@@ -1328,9 +1328,9 @@ void BridgeBehavior::removeScaffolding( void )
 		if( bridge )
 			TheAI->pathfinder()->changeBridgeState( bridge->getLayer(), TRUE );
 
-	}  // end if
+	}
 
-}  // end removeScaffolding
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Is any of the scaffolding in motion */
@@ -1358,12 +1358,12 @@ Bool BridgeBehavior::isScaffoldInMotion( void )
 		if( bsbi->getCurrentMotion() != STM_STILL )
 			return TRUE;
 
-	}  // end for
+	}
 
 	// not in motion
 	return FALSE;
 
-}  // end isScaffoldInMotion
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -1374,7 +1374,7 @@ void BridgeBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1399,12 +1399,12 @@ void BridgeBehavior::xfer( Xfer *xfer )
 		Bridge *bridge = TheTerrainLogic->findBridgeAt( us->getPosition() );
 
 		// sanity
-		DEBUG_ASSERTCRASH( bridge, ("BridgeBehavior::xfer - Unable to find bridge\n" ));
+		DEBUG_ASSERTCRASH( bridge, ("BridgeBehavior::xfer - Unable to find bridge" ));
 
 		// set new object ID in bridge info to us
 		bridge->setBridgeObjectID( us->getID() );
 
-	}  // end if
+	}
 
 	// xfer the tower object ids
 	for( Int i = 0; i < BRIDGE_MAX_TOWERS; ++i )
@@ -1417,13 +1417,13 @@ void BridgeBehavior::xfer( Xfer *xfer )
 		Bridge *bridge = TheTerrainLogic->findBridgeAt( us->getPosition() );
 
 		// sanity
-		DEBUG_ASSERTCRASH( bridge, ("BridgeBehavior::xfer - Unable to find bridge\n" ));
+		DEBUG_ASSERTCRASH( bridge, ("BridgeBehavior::xfer - Unable to find bridge" ));
 
 		// set new object ID in bridge info to us
 		for( Int i = 0; i < BRIDGE_MAX_TOWERS; ++i )
 			bridge->setTowerObjectID( m_towerID[ i ], (BridgeTowerType)i );
 
-	}  // end if
+	}
 
 	// scaffold present flag
 	xfer->xferBool( &m_scaffoldPresent );
@@ -1435,7 +1435,7 @@ void BridgeBehavior::xfer( Xfer *xfer )
 	ObjectID scaffoldObjectID;
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
-		
+
 		// write out all object IDs
 		ObjectIDListIterator it;
 		for( it = m_scaffoldObjectIDList.begin(); it != m_scaffoldObjectIDList.end(); ++it )
@@ -1444,15 +1444,15 @@ void BridgeBehavior::xfer( Xfer *xfer )
 			scaffoldObjectID = *it;
 			xfer->xferObjectID( &scaffoldObjectID );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
 		// read all object IDs
-		DEBUG_ASSERTCRASH( m_scaffoldObjectIDList.size() == 0,
-											 ("BridgeBehavior::xfer - scaffold object list should be empty\n") );
+		DEBUG_ASSERTCRASH( m_scaffoldObjectIDList.empty(),
+											 ("BridgeBehavior::xfer - scaffold object list should be empty") );
 		for( Int i = 0; i < scaffoldObjectCount; ++i )
 		{
 
@@ -1462,14 +1462,14 @@ void BridgeBehavior::xfer( Xfer *xfer )
 			// put on list
 			m_scaffoldObjectIDList.push_back( scaffoldObjectID );
 
-		}  // end for i
+		}
 
-	}  // end load
+	}
 
 	// death frame
 	xfer->xferUnsignedInt( &m_deathFrame );
-		
-}  // end xfer
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1480,4 +1480,4 @@ void BridgeBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeScaffoldBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeScaffoldBehavior.cpp
index 4ea04722caa..aa3be3bdb92 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeScaffoldBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeScaffoldBehavior.cpp
@@ -49,14 +49,14 @@ BridgeScaffoldBehavior::BridgeScaffoldBehavior( Thing *thing, const ModuleData *
 	m_lateralSpeed = 1.0f;
 	m_verticalSpeed = 1.0f;
 
-}  // end BridgeScaffoldBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 BridgeScaffoldBehavior::~BridgeScaffoldBehavior( void )
 {
 
-}  // end ~BridgeScaffoldBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set all of the target positions that we're care about as a moving scaffold object */
@@ -70,12 +70,12 @@ void BridgeScaffoldBehavior::setPositions( const Coord3D *createPos,
 	m_riseToPos = *riseToPos;
 	m_buildPos = *buildPos;
 
-}  // end setPositions
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Set us moving to the right target position for the requested motion type */
 // ------------------------------------------------------------------------------------------------
-void BridgeScaffoldBehavior::setMotion( ScaffoldTargetMotion targetMotion ) 
+void BridgeScaffoldBehavior::setMotion( ScaffoldTargetMotion targetMotion )
 {
 
 	// save the target motion type
@@ -86,9 +86,9 @@ void BridgeScaffoldBehavior::setMotion( ScaffoldTargetMotion targetMotion )
 	{
 
 		// --------------------------------------------------------------------------------------------
-		case STM_RISE: 
+		case STM_RISE:
 		case STM_TEAR_DOWN_ACROSS:
-			m_targetPos = m_riseToPos; 
+			m_targetPos = m_riseToPos;
 			break;
 
 		// --------------------------------------------------------------------------------------------
@@ -101,9 +101,9 @@ void BridgeScaffoldBehavior::setMotion( ScaffoldTargetMotion targetMotion )
 			m_targetPos = m_createPos;
 			break;
 
-	}  // end switch
+	}
 
-}  // end setMotion
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Whatever our current state of motion is, reverse it */
@@ -134,9 +134,9 @@ void BridgeScaffoldBehavior::reverseMotion( void )
 			setMotion( STM_RISE );
 			break;
 
-	}  // end switch
+	}
 
-}  // end reverseMotion
+}
 
 // ------------------------------------------------------------------------------------------------
 /** The update method */
@@ -192,7 +192,11 @@ UpdateSleepTime BridgeScaffoldBehavior::update( void )
 			end = &m_riseToPos;
 			break;
 
-	}  // end switch
+		default:
+			DEBUG_CRASH(("Unhandled case in BridgeScaffoldBehavior::update()"));
+			return UPDATE_SLEEP_NONE;
+
+	}
 
 	// adjust speed so it's slower at the end of motion
 	Coord3D speedVector;
@@ -241,7 +245,7 @@ UpdateSleepTime BridgeScaffoldBehavior::update( void )
 		newPos = m_targetPos;
 
 		//
-		// we have reached our target position, switch motion to the next position in 
+		// we have reached our target position, switch motion to the next position in
 		// the chain (which may be stay still and don't move anymore)
 		//
 		switch( m_targetMotion )
@@ -258,11 +262,11 @@ UpdateSleepTime BridgeScaffoldBehavior::update( void )
 				TheGameLogic->destroyObject( us );
 				break;
 
-			}  // end case
+			}
 
-		}  // end switch
+		}
 
-	}  // end if
+	}
 
 	// set the new position
 	us->setPosition( &newPos );
@@ -270,7 +274,7 @@ UpdateSleepTime BridgeScaffoldBehavior::update( void )
 	// do not sleep
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** STATIC MEMBER:
@@ -293,12 +297,12 @@ BridgeScaffoldBehaviorInterface *BridgeScaffoldBehavior::getBridgeScaffoldBehavi
 		if( bridgeScaffoldInterface )
 			return bridgeScaffoldInterface;
 
-	}  // end for bmi
+	}
 
 	// interface not found
 	return NULL;
 
-}  // end getBridgeScaffoldBehaviorInterfaceFromObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -309,7 +313,7 @@ void BridgeScaffoldBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -348,7 +352,7 @@ void BridgeScaffoldBehavior::xfer( Xfer *xfer )
 	// current target pos
 	xfer->xferCoord3D( &m_targetPos );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -359,4 +363,4 @@ void BridgeScaffoldBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeTowerBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeTowerBehavior.cpp
index c75c10b1fce..ecdb0c41a8f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeTowerBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeTowerBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
@@ -48,14 +48,14 @@ BridgeTowerBehavior::BridgeTowerBehavior( Thing *thing, const ModuleData *module
 
 	m_bridgeID = INVALID_ID;
 
-}  // end BridgeTowerBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 BridgeTowerBehavior::~BridgeTowerBehavior( void )
 {
 
-}  // end ~BridgeTowerBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -67,7 +67,7 @@ void BridgeTowerBehavior::setBridge( Object *bridge )
 	else
 		m_bridgeID = bridge->getID();
 
-}  // end setBridge
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -76,7 +76,7 @@ ObjectID BridgeTowerBehavior::getBridgeID( void )
 
 	return m_bridgeID;
 
-}  // end getBridge
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -85,7 +85,7 @@ void BridgeTowerBehavior::setTowerType( BridgeTowerType type )
 
 	m_type = type;
 
-}  // end setTowerType
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -114,8 +114,8 @@ void BridgeTowerBehavior::onDamage( DamageInfo *damageInfo )
 		if( bridgeInterface )
 			break;
 
-	}  // end for bmi
-	DEBUG_ASSERTCRASH( bridgeInterface != NULL, ("BridgeTowerBehavior::onDamage - no 'BridgeBehaviorInterface' found\n") );
+	}
+	DEBUG_ASSERTCRASH( bridgeInterface != NULL, ("BridgeTowerBehavior::onDamage - no 'BridgeBehaviorInterface' found") );
 	if( bridgeInterface )
 	{
 
@@ -124,7 +124,7 @@ void BridgeTowerBehavior::onDamage( DamageInfo *damageInfo )
 		// or other towers
 		//
 		Object *source = TheGameLogic->findObjectByID( damageInfo->in.m_sourceID );
-		if( source == NULL || 
+		if( source == NULL ||
 			  (source->isKindOf( KINDOF_BRIDGE ) == FALSE &&
 				 source->isKindOf( KINDOF_BRIDGE_TOWER ) == FALSE) )
 		{
@@ -145,9 +145,9 @@ void BridgeTowerBehavior::onDamage( DamageInfo *damageInfo )
 					towerDamage.in.m_deathType = damageInfo->in.m_deathType;
 					tower->attemptDamage( &towerDamage );
 
-				}  // end if
+				}
 
-			}  // end for i
+			}
 
 			//
 			// damage bridge object, but make sure it's done through the bridge interface
@@ -162,11 +162,11 @@ void BridgeTowerBehavior::onDamage( DamageInfo *damageInfo )
 			bridgeDamage.in.m_deathType = damageInfo->in.m_deathType;
 			bridge->attemptDamage( &bridgeDamage );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end onDamage
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -195,8 +195,8 @@ void BridgeTowerBehavior::onHealing( DamageInfo *damageInfo )
 		if( bridgeInterface )
 			break;
 
-	}  // end for bmi
-	DEBUG_ASSERTCRASH( bridgeInterface != NULL, ("BridgeTowerBehavior::onHealing - no 'BridgeBehaviorInterface' found\n") );
+	}
+	DEBUG_ASSERTCRASH( bridgeInterface != NULL, ("BridgeTowerBehavior::onHealing - no 'BridgeBehaviorInterface' found") );
 	if( bridgeInterface )
 	{
 
@@ -205,7 +205,7 @@ void BridgeTowerBehavior::onHealing( DamageInfo *damageInfo )
 		// or other towers
 		//
 		Object *source = TheGameLogic->findObjectByID( damageInfo->in.m_sourceID );
-		if( source == NULL || 
+		if( source == NULL ||
 			  (source->isKindOf( KINDOF_BRIDGE ) == FALSE &&
 				 source->isKindOf( KINDOF_BRIDGE_TOWER ) == FALSE) )
 		{
@@ -220,9 +220,9 @@ void BridgeTowerBehavior::onHealing( DamageInfo *damageInfo )
 					BodyModuleInterface *towerBody = tower->getBodyModule();
 					tower->attemptHealing(healingPercentage * towerBody->getMaxHealth(), getObject());
 
-				}  // end if
+				}
 
-			}  // end for i
+			}
 
 			//
 			// heal bridge object, but make sure it's done through the bridge interface
@@ -231,20 +231,20 @@ void BridgeTowerBehavior::onHealing( DamageInfo *damageInfo )
 			BodyModuleInterface *bridgeBody = bridge->getBodyModule();
 			bridge->attemptHealing(healingPercentage * bridgeBody->getMaxHealth(), getObject());
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end onHealing
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void BridgeTowerBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																									 BodyDamageType oldState, 
+void BridgeTowerBehavior::onBodyDamageStateChange( const DamageInfo* damageInfo,
+																									 BodyDamageType oldState,
 																									 BodyDamageType newState )
 {
 
-}  // end onBodyDamageStateChange
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -256,7 +256,7 @@ void BridgeTowerBehavior::onDie( const DamageInfo *damageInfo )
 	if( bridge )
 		bridge->kill();
 
-}  // end onDie
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -281,12 +281,12 @@ BridgeTowerBehaviorInterface *BridgeTowerBehavior::getBridgeTowerBehaviorInterfa
 		if( bridgeTowerInterface )
 			return bridgeTowerInterface;
 
-	}  // end for bmi
+	}
 
 	// interface not found
 	return NULL;
 
-}  // getBridgeTowerBehaviorInterfaceFromObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -297,7 +297,7 @@ void BridgeTowerBehavior::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -321,7 +321,7 @@ void BridgeTowerBehavior::xfer( Xfer *xfer )
 	// xfer tower type
 	xfer->xferUser( &m_type, sizeof( BridgeTowerType ) );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -332,4 +332,4 @@ void BridgeTowerBehavior::loadPostProcess( void )
 	// extend base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BunkerBusterBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BunkerBusterBehavior.cpp
index 504c233b345..bfed83b3a9c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BunkerBusterBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BunkerBusterBehavior.cpp
@@ -41,11 +41,6 @@
 
 #include "GameClient/TerrainVisual.h"//Seismic simulations!
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
@@ -60,15 +55,15 @@ BunkerBusterBehaviorModuleData::BunkerBusterBehaviorModuleData( void )
 	m_upgradeRequired = NULL;
 	m_detonationFX = NULL;
   m_crashThroughBunkerFX = NULL;
-  m_crashThroughBunkerFXFrequency = 4; 
-  
+  m_crashThroughBunkerFXFrequency = 4;
+
   m_seismicEffectRadius = 140.0f;
   m_seismicEffectMagnitude = 6.0f;
 
   m_shockwaveWeaponTemplate = NULL;
   m_occupantDamageWeaponTemplate = NULL;
 
-}  // end BunkerBusterBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -76,7 +71,7 @@ BunkerBusterBehaviorModuleData::BunkerBusterBehaviorModuleData( void )
 {
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "UpgradeRequired",	              INI::parseAsciiString,	        NULL, offsetof( BunkerBusterBehaviorModuleData, m_upgradeRequired ) },
 		{ "DetonationFX",			              INI::parseFXList,				        NULL, offsetof( BunkerBusterBehaviorModuleData, m_detonationFX ) },
@@ -92,7 +87,7 @@ BunkerBusterBehaviorModuleData::BunkerBusterBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -108,14 +103,14 @@ BunkerBusterBehavior::BunkerBusterBehavior( Thing *thing, const ModuleData *modD
   m_victimID = INVALID_ID;
   m_upgradeRequired = NULL;
 
-}  // end BunkerBusterBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 BunkerBusterBehavior::~BunkerBusterBehavior( void )
 {
 
-}  // end ~BunkerBusterBehavior
+}
 
 
 
@@ -126,7 +121,7 @@ void BunkerBusterBehavior::onObjectCreated( void )
 	// convert module upgrade name to a pointer
 	m_upgradeRequired = TheUpgradeCenter->findUpgrade( modData->m_upgradeRequired );
 
-}  // end onObjectCreated
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -154,16 +149,16 @@ UpdateSleepTime BunkerBusterBehavior::update( void )
       if ( getObject()->testStatus( OBJECT_STATUS_MISSILE_KILLING_SELF ) && crashFX )
         FXList::doFXObj( crashFX, getObject() );// CrashFX done on the missile/bomb
     }
-  
+
   }
 
-  
+
 
 
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** The death callback */
@@ -191,7 +186,7 @@ void BunkerBusterBehavior::bustTheBunker( void )
     if ( ! weaponUpgraded )
       return;
   }
-  
+
 
 //  here is where we kill everyone inside any targeted garrisoned buildings
 //  AIUpdateInterface *ai = getObject()->getAI();
@@ -232,10 +227,10 @@ void BunkerBusterBehavior::bustTheBunker( void )
 #ifdef DO_SEISMIC_SIMULATIONS
   // Okay, the right proper way to do this is to add SeismicSim support to FXList...
   // But until that day, I'm just gonna do it here,  sorry, M Lorenzen 6/26/03
-  SeismicSimulationNode sim( 
-    objectForFX->getPosition(), 
-    modData->m_seismicEffectRadius, 
-    modData->m_seismicEffectMagnitude, 
+  SeismicSimulationNode sim(
+    objectForFX->getPosition(),
+    modData->m_seismicEffectRadius,
+    modData->m_seismicEffectMagnitude,
     &bunkerBusterHeavingEarthSeismicFilter );
 
   TheTerrainVisual->addSeismicSimulation( sim );
@@ -245,7 +240,7 @@ void BunkerBusterBehavior::bustTheBunker( void )
 		TheWeaponStore->createAndFireTempWeapon(modData->m_shockwaveWeaponTemplate, objectForFX, objectForFX->getPosition());
 
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 
@@ -265,7 +260,7 @@ void BunkerBusterBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -283,7 +278,7 @@ void BunkerBusterBehavior::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -294,4 +289,4 @@ void BunkerBusterBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/CountermeasuresBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/CountermeasuresBehavior.cpp
index 7aac00c5987..53127c72712 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/CountermeasuresBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/CountermeasuresBehavior.cpp
@@ -30,7 +30,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Thing.h"
 #include "Common/ThingTemplate.h"
 #include "Common/INI.h"
@@ -47,11 +47,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -59,7 +54,7 @@ struct CountermeasuresPlayerScanHelper
 {
 	KindOfMaskType m_kindOfToTest;
 	Object *m_theHealer;
-	ObjectPointerList *m_objectList;	
+	ObjectPointerList *m_objectList;
 };
 
 static void checkForCountermeasures( Object *testObj, void *userData )
@@ -96,7 +91,7 @@ CountermeasuresBehavior::CountermeasuresBehavior( Thing *thing, const ModuleData
 	m_divertedMissiles = 0;
 	m_incomingMissiles = 0;
 	m_nextVolleyFrame = 0;
-	
+
 	setWakeFrame( getObject(), UPDATE_SLEEP_NONE );
 }
 
@@ -119,7 +114,7 @@ void CountermeasuresBehavior::reportMissileForCountermeasures( Object *missile )
 
   if( m_availableCountermeasures + m_activeCountermeasures > 0 )
 	{
-		//We have countermeasures we can use. Determine now whether or not the incoming missile will 
+		//We have countermeasures we can use. Determine now whether or not the incoming missile will
 		//be diverted.
 		const CountermeasuresBehaviorModuleData *data = getCountermeasuresBehaviorModuleData();
 
@@ -133,16 +128,16 @@ void CountermeasuresBehavior::reportMissileForCountermeasures( Object *missile )
 				{
 					//Make sure the missile diverts after a delay. The delay needs to be larger than
 					//the countermeasure reaction time or else the missile won't have a countermeasure to divert to!
-					DEBUG_ASSERTCRASH( data->m_countermeasureReactionFrames < data->m_missileDecoyFrames, 
+					DEBUG_ASSERTCRASH( data->m_countermeasureReactionFrames < data->m_missileDecoyFrames,
 						("MissileDecoyDelay needs to be less than CountermeasureReactionTime in order to function properly.") );
 					pui->setFramesTillCountermeasureDiversionOccurs( data->m_missileDecoyFrames );
 					m_divertedMissiles++;
 
 					if( m_activeCountermeasures == 0 && m_reactionFrame == 0 )
 					{
-						//We need to launch our first volley of countermeasures, but we can't do it now. If we 
+						//We need to launch our first volley of countermeasures, but we can't do it now. If we
 						//do, it'll look too artificial. Instead, we need to set up a timer to fake a reaction
-						//delay. 
+						//delay.
 						m_reactionFrame = TheGameLogic->getFrame() + data->m_countermeasureReactionFrames;
 					}
 					break;
@@ -157,36 +152,38 @@ ObjectID CountermeasuresBehavior::calculateCountermeasureToDivertTo( const Objec
 {
 	const CountermeasuresBehaviorModuleData *data = getCountermeasuresBehaviorModuleData();
 
-	//Flares are pushed to the front of the list, but we only want to acquire the "newest" of the flares, therefore
-	//stop iterating after we've reached size of a single volley.
-	Int iteratorMax = MAX( data->m_volleySize, 1 );
+	// TheSuperHackers @bugfix Mauller/Stubbjax 27/07/2025 Fix unsafe iterator handling and correct the countermeasures behavior
+	// The code now iterates through all flares in the volley and selects the nearest one to the weapon as intended in the original EA code
+	// This can slightly change behavior but does not significantly impact the overall survivability of the aircraft
 
-	Real closestDist = 1e15f;
+	Real closestFlareDist = 1e15f;
 	Object *closestFlare = NULL;
 
+	const int volleySize = data->m_volleySize;
+	int volleyFlaresCounted = 0;
+
+	//Flares are pushed to the front of the list, but we only want to acquire the "newest" of the flares, therefore
 	//Start at the end of the list and go towards the beginning.
-	CountermeasuresVec::iterator it = m_counterMeasures.end();
-	DEBUG_ASSERTCRASH(iteratorMax <= (Int)m_counterMeasures.size(), ("Unsafe size"));
-	//end is actually the end so advance the iterator.
-	if( it != m_counterMeasures.begin() )
+	CountermeasuresVec::reverse_iterator it = m_counterMeasures.rbegin();
+	//stop iterating after we've reached size of a single volley.
+	while( it != m_counterMeasures.rend() && volleyFlaresCounted < volleySize )
 	{
-		--it;
-		while( iteratorMax-- )
+		Object *obj = TheGameLogic->findObjectByID( *it++ );
+		if( obj )
 		{
-			Object *obj = TheGameLogic->findObjectByID( *it );
-			if( obj )
-			{
-				Real dist = ThePartitionManager->getDistanceSquared( obj, getObject(), FROM_CENTER_2D );
-				if( dist < closestDist )
-				{
-					closestDist = dist;
-					closestFlare = obj;
-				}
-			}
-			else
+			Real weaponToFlareDist = ThePartitionManager->getDistanceSquared( obj, getObject(), FROM_CENTER_2D );
+			if( weaponToFlareDist < closestFlareDist )
 			{
-				--it;
+				closestFlareDist = weaponToFlareDist;
+				closestFlare = obj;
 			}
+#if RETAIL_COMPATIBLE_CRC
+			// TheSuperHackers @info Original EA code did not work as intended and stopped on the first retrieved flare
+			// The non retail behaviour corrects the code to iterate through all flares in the volley
+			break;
+#else
+			volleyFlaresCounted++;
+#endif
 		}
 	}
 
@@ -201,7 +198,7 @@ ObjectID CountermeasuresBehavior::calculateCountermeasureToDivertTo( const Objec
 Bool CountermeasuresBehavior::isActive() const
 {
 	return isUpgradeActive();
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The update callback. */
@@ -235,7 +232,7 @@ UpdateSleepTime CountermeasuresBehavior::update( void )
 			++it;
 		}
 	}
-	
+
 	if( obj->isAirborneTarget() )
 	{
 
@@ -293,7 +290,7 @@ void CountermeasuresBehavior::reloadCountermeasures()
 	m_availableCountermeasures = data->m_numberOfVolleys * data->m_volleySize;
 	m_reloadFrame = 0;
 }
- 
+
 //-------------------------------------------------------------------------------------------------
 void CountermeasuresBehavior::launchVolley()
 {
@@ -303,7 +300,7 @@ void CountermeasuresBehavior::launchVolley()
 	Real volleySize = (Real)data->m_volleySize;
 	for( UnsignedInt i = 0; i < data->m_volleySize; i++ )
 	{
-		//Each flare in a volley will calculate a different vector to fly out. We have a +/- angle to 
+		//Each flare in a volley will calculate a different vector to fly out. We have a +/- angle to
 		//spread out equally. With only one flare, it'll come straight out the back. Two flares will
 		//launch at the extreme positive and negative angle. Three flares will launch at extreme angles
 		//plus straight back. Four or more will divy it up equally.
@@ -368,7 +365,7 @@ void CountermeasuresBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpgradeMux::upgradeMuxCRC( xfer );
 
-}  // end crc
+}
 
 //------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -400,7 +397,7 @@ void CountermeasuresBehavior::xfer( Xfer *xfer )
 		xfer->xferUnsignedInt( &m_nextVolleyFrame );
 	}
 
-}  // end xfer
+}
 
 //------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -414,6 +411,6 @@ void CountermeasuresBehavior::loadPostProcess( void )
 	// extend base class
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp
index e39470c194f..f53b524ee03 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp
@@ -24,9 +24,9 @@
 
 // FILE: DumbProjectileBehavior.cpp
 // Author: Steven Johnson, July 2002
-// Desc:   
+// Desc:
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BezierSegment.h"
 #include "Common/GameCommon.h"
@@ -46,11 +46,6 @@
 #include "GameLogic/Module/PhysicsUpdate.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -60,7 +55,7 @@
 const Int DEFAULT_MAX_LIFESPAN = 10 * LOGICFRAMES_PER_SECOND;
 
 //-----------------------------------------------------------------------------
-DumbProjectileBehaviorModuleData::DumbProjectileBehaviorModuleData() : 
+DumbProjectileBehaviorModuleData::DumbProjectileBehaviorModuleData() :
 	m_maxLifespan(DEFAULT_MAX_LIFESPAN),
 	m_detonateCallsKill(FALSE),
 	m_orientToFlightPath(TRUE),
@@ -68,7 +63,7 @@ DumbProjectileBehaviorModuleData::DumbProjectileBehaviorModuleData() :
 	m_firstHeight(0.0f),
 	m_secondHeight(0.0f),
 	m_firstPercentIndent(0.0f),
-	m_secondPercentIndent(0.0f),	
+	m_secondPercentIndent(0.0f),
 	m_garrisonHitKillCount(0),
 	m_garrisonHitKillFX(NULL),
 	m_flightPathAdjustDistPerFrame(0.0f)
@@ -80,7 +75,7 @@ void DumbProjectileBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MaxLifespan", INI::parseDurationUnsignedInt, NULL, offsetof( DumbProjectileBehaviorModuleData, m_maxLifespan ) },
 		{ "TumbleRandomly", INI::parseBool, NULL, offsetof( DumbProjectileBehaviorModuleData, m_tumbleRandomly ) },
@@ -126,7 +121,7 @@ DumbProjectileBehavior::DumbProjectileBehavior( Thing *thing, const ModuleData*
 	m_extraBonusFlags = 0;
 
   m_hasDetonated = FALSE;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 DumbProjectileBehavior::~DumbProjectileBehavior()
@@ -158,7 +153,7 @@ static Bool calcTrajectory(
 	Real maxPitch,					// in: max pitch (-PI/2)
 	Bool preferShortPitch,	// in: prefer the shorter or longer path?
 	Real& angle,						// out: the angle to aim
-	Real& pitch							// out: the pitch to aim for 
+	Real& pitch							// out: the pitch to aim for
 )
 {
 	Bool exactTarget = false;
@@ -209,7 +204,7 @@ static Bool calcTrajectory(
 	Real sineOfAngle = (gravity * horizDist) / sqr(velocity);
 	if (sineOfAngle > 1.0f)
 	{
-		return false;	
+		return false;
 	}
 	Real theta = ASin(sineOfAngle)*0.5f;
 */
@@ -226,16 +221,16 @@ static Bool calcTrajectory(
 //++numLoops;
 		pitches[0] = theta;	// shallower angle
 		pitches[1] = (theta >= 0.0) ? (PI/2 - theta) : (-PI/2 - theta);	// steeper angle
-		
-		DEBUG_ASSERTCRASH(pitches[0]<=PI/2&&pitches[0]>=-PI/2,("bad pitches[0] %f\n",rad2deg(pitches[0])));
-		DEBUG_ASSERTCRASH(pitches[1]<=PI/2&&pitches[1]>=-PI/2,("bad pitches[1] %f\n",rad2deg(pitches[1])));
+
+		DEBUG_ASSERTCRASH(pitches[0]<=PI/2&&pitches[0]>=-PI/2,("bad pitches[0] %f",rad2deg(pitches[0])));
+		DEBUG_ASSERTCRASH(pitches[1]<=PI/2&&pitches[1]>=-PI/2,("bad pitches[1] %f",rad2deg(pitches[1])));
 
 		// calc the horiz-speed & time for each.
 		// note that time can only be negative for 90<angle<270, and since we
 		// ruled those out above, we're gold.
 		sinPitches[0] = Sin(pitches[0]);
 		sinPitches[1] = Sin(pitches[1]);
-		cosPitches[0] = Cos(pitches[0]); 
+		cosPitches[0] = Cos(pitches[0]);
 		cosPitches[1] = Cos(pitches[1]);
 		Real t0 = (horizDist / (velocity * cosPitches[0]));
 		Real t1 = (horizDist / (velocity * cosPitches[1]));
@@ -245,7 +240,7 @@ static Bool calcTrajectory(
 
 
 		DEBUG_ASSERTCRASH(t0>=0&&t1>=0,("neg time"));
-		
+
 		Int preferred = ((t0 < t1) == (preferShortPitch)) ? 0 : 1;
 
 		// ok, NOW... since dz is virtually NEVER zero, do a little approximation
@@ -260,7 +255,7 @@ static Bool calcTrajectory(
 		if (root < 0.0f)
 		{
 			// oops, no solution for our preferred pitch. try the other one.
-			if (preferred == 0)	
+			if (preferred == 0)
 				tooClose = true;	// if this fails for the shallow case, it's 'cuz the result is too close
 			preferred = 1 - preferred;
 			vz = velocity*sinPitches[preferred];
@@ -313,7 +308,7 @@ static Bool calcTrajectory(
 		}
 	}
 
-//DEBUG_LOG(("took %d loops to find a match\n",numLoops));
+//DEBUG_LOG(("took %d loops to find a match",numLoops));
 	if (exactTarget)
 		return true;
 
@@ -326,11 +321,11 @@ static Bool calcTrajectory(
 // Prepares the missile for launch via proper weapon-system channels.
 //-------------------------------------------------------------------------------------------------
 void DumbProjectileBehavior::projectileLaunchAtObjectOrPosition(
-	const Object* victim, 
-	const Coord3D* victimPos, 
-	const Object* launcher, 
-	WeaponSlotType wslot, 
-	Int specificBarrelToUse, 
+	const Object* victim,
+	const Coord3D* victimPos,
+	const Object* launcher,
+	WeaponSlotType wslot,
+	Int specificBarrelToUse,
 	const WeaponTemplate* detWeap,
 	const ParticleSystemTemplate* exhaustSysOverride
 )
@@ -382,7 +377,7 @@ void DumbProjectileBehavior::projectileFireAtObjectOrPosition( const Object *vic
 	{
 		m_flightPathSpeed = weaponSpeed;
 	}
-	
+
  	PhysicsBehavior* physics = projectile->getPhysics();
  	if ( d->m_tumbleRandomly && physics)
 	{
@@ -454,7 +449,7 @@ Bool DumbProjectileBehavior::calcFlightPath(Bool recalcNumSegments)
 	flightCurve.getSegmentPoints( m_flightPathSegments, &m_flightPath );
 	DEBUG_ASSERTCRASH(m_flightPathSegments == m_flightPath.size(), ("m_flightPathSegments mismatch"));
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if( TheGlobalData->m_debugProjectilePath )
 		displayFlightPath();
 #endif
@@ -475,7 +470,7 @@ Bool DumbProjectileBehavior::projectileHandleCollision( Object *other )
 			// if it's not the specific thing we were targeting, see if we should incidentally collide...
 		if (!m_detonationWeaponTmpl->shouldProjectileCollideWith(projectileLauncher, getObject(), other, m_victimID))
 		{
-			//DEBUG_LOG(("ignoring projectile collision with %s at frame %d\n",other->getTemplate()->getName().str(),TheGameLogic->getFrame()));
+			//DEBUG_LOG(("ignoring projectile collision with %s at frame %d",other->getTemplate()->getName().str(),TheGameLogic->getFrame()));
 			return true;
 		}
 
@@ -495,15 +490,15 @@ Bool DumbProjectileBehavior::projectileHandleCollision( Object *other )
 						Object* thingToKill = *it++;
 						if (!thingToKill->isEffectivelyDead() && thingToKill->isKindOfMulti(d->m_garrisonHitKillKindof, d->m_garrisonHitKillKindofNot))
 						{
-							//DEBUG_LOG(("Killed a garrisoned unit (%08lx %s) via Flash-Bang!\n",thingToKill,thingToKill->getTemplate()->getName().str()));
+							//DEBUG_LOG(("Killed a garrisoned unit (%08lx %s) via Flash-Bang!",thingToKill,thingToKill->getTemplate()->getName().str()));
 							if (projectileLauncher)
 								projectileLauncher->scoreTheKill( thingToKill );
 							thingToKill->kill();
 							++numKilled;
 						}
-					} // next contained item
-				} // if items
-				
+					}
+				}
+
 				if (numKilled > 0)
 				{
 					// note, fx is played at center of building, not at grenade's location
@@ -516,7 +511,7 @@ Bool DumbProjectileBehavior::projectileHandleCollision( Object *other )
 
 					return true;
 				}
-			}	// if a garrisonable thing
+			}
 		}
 
 	}
@@ -569,8 +564,8 @@ void DumbProjectileBehavior::detonate()
 
 	if (obj->getDrawable())
 		obj->getDrawable()->setDrawableHidden(true);
-  
-  m_hasDetonated = TRUE; 
+
+  m_hasDetonated = TRUE;
 
 }
 
@@ -636,7 +631,7 @@ UpdateSleepTime DumbProjectileBehavior::update()
   {
     if ( m_currentFlightPathStep > 0)
 	  {
-	  // this seems reasonable; however, if this object has a PhysicsBehavior on it, this calc will be wrong, 
+	  // this seems reasonable; however, if this object has a PhysicsBehavior on it, this calc will be wrong,
 	  // since Physics is applying gravity, which we duly ignore, but the prevPos won't be what we expect.
 	  // get it from the flight path instead. (srj)
 	  //Coord3D prevPos = *getObject()->getPosition();
@@ -701,14 +696,14 @@ UpdateSleepTime DumbProjectileBehavior::update()
 // ------------------------------------------------------------------------------------------------
 /** displayFlightPath for debugging */
 // ------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 void DumbProjectileBehavior::displayFlightPath()
 {
 	extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 	for( size_t pointIndex = 0; pointIndex < m_flightPath.size(); ++pointIndex )
 	{
-		addIcon(&m_flightPath[pointIndex], TheGlobalData->m_debugProjectileTileWidth, 
-										TheGlobalData->m_debugProjectileTileDuration, 
+		addIcon(&m_flightPath[pointIndex], TheGlobalData->m_debugProjectileTileWidth,
+										TheGlobalData->m_debugProjectileTileDuration,
 										TheGlobalData->m_debugProjectileTileColor);
 	}
 }
@@ -723,7 +718,7 @@ void DumbProjectileBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -772,20 +767,20 @@ void DumbProjectileBehavior::xfer( Xfer *xfer )
 			if( m_detonationWeaponTmpl == NULL )
 			{
 
-				DEBUG_CRASH(( "DumbProjectileBehavior::xfer - Unknown weapon template '%s'\n",
+				DEBUG_CRASH(( "DumbProjectileBehavior::xfer - Unknown weapon template '%s'",
 											weaponTemplateName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
 	// lifespan frame
 	xfer->xferUnsignedInt( &m_lifespanFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -796,4 +791,4 @@ void DumbProjectileBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDamagedBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDamagedBehavior.cpp
index 3e97509b69c..3e910e6bef1 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDamagedBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDamagedBehavior.cpp
@@ -24,12 +24,12 @@
 
 // FILE: FireWeaponWhenDamagedBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_SLOWDEATHPHASE_NAMES
 
 #include "Common/Thing.h"
@@ -47,7 +47,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ObjectCreationList.h"
 #include "GameLogic/Weapon.h"
-#include "GameClient/Drawable.h"
 
 const Int MAX_IDX = 32;
 
@@ -56,7 +55,7 @@ const Real END_MIDPOINT_RATIO = 0.65f;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-FireWeaponWhenDamagedBehavior::FireWeaponWhenDamagedBehavior( Thing *thing, const ModuleData* moduleData ) : 
+FireWeaponWhenDamagedBehavior::FireWeaponWhenDamagedBehavior( Thing *thing, const ModuleData* moduleData ) :
 	UpdateModule( thing, moduleData ),
 	m_reactionWeaponPristine( NULL ),
 	m_reactionWeaponDamaged( NULL ),
@@ -86,7 +85,7 @@ FireWeaponWhenDamagedBehavior::FireWeaponWhenDamagedBehavior( Thing *thing, cons
 	if ( d->m_reactionWeaponReallyDamaged )
 	{
 		m_reactionWeaponReallyDamaged		= TheWeaponStore->allocateNewWeapon(
-			d->m_reactionWeaponReallyDamaged,		PRIMARY_WEAPON); 
+			d->m_reactionWeaponReallyDamaged,		PRIMARY_WEAPON);
 		m_reactionWeaponReallyDamaged->reloadAmmo( obj );
 	}
 	if ( d->m_reactionWeaponRubble )
@@ -146,23 +145,15 @@ FireWeaponWhenDamagedBehavior::FireWeaponWhenDamagedBehavior( Thing *thing, cons
 //-------------------------------------------------------------------------------------------------
 FireWeaponWhenDamagedBehavior::~FireWeaponWhenDamagedBehavior( void )
 {
-	if (m_reactionWeaponPristine)
-		deleteInstance(m_reactionWeaponPristine);
-	if (m_reactionWeaponDamaged)
-		deleteInstance(m_reactionWeaponDamaged);
-	if (m_reactionWeaponReallyDamaged)
-		deleteInstance(m_reactionWeaponReallyDamaged);
-	if (m_reactionWeaponRubble)
-		deleteInstance(m_reactionWeaponRubble);
-
-	if (m_continuousWeaponPristine)
-		deleteInstance(m_continuousWeaponPristine);
-	if (m_continuousWeaponDamaged)
-		deleteInstance(m_continuousWeaponDamaged);
-	if (m_continuousWeaponReallyDamaged)
-		deleteInstance(m_continuousWeaponReallyDamaged);
-	if (m_continuousWeaponRubble)
-		deleteInstance(m_continuousWeaponRubble);
+	deleteInstance(m_reactionWeaponPristine);
+	deleteInstance(m_reactionWeaponDamaged);
+	deleteInstance(m_reactionWeaponReallyDamaged);
+	deleteInstance(m_reactionWeaponRubble);
+
+	deleteInstance(m_continuousWeaponPristine);
+	deleteInstance(m_continuousWeaponDamaged);
+	deleteInstance(m_continuousWeaponReallyDamaged);
+	deleteInstance(m_continuousWeaponRubble);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -277,7 +268,7 @@ void FireWeaponWhenDamagedBehavior::crc( Xfer *xfer )
 	// extend upgrade mux
 	UpgradeMux::upgradeMuxCRC( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -348,7 +339,7 @@ void FireWeaponWhenDamagedBehavior::xfer( Xfer *xfer )
 	if( weaponPresent )
 		xfer->xferSnapshot( m_continuousWeaponRubble );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -362,4 +353,4 @@ void FireWeaponWhenDamagedBehavior::loadPostProcess( void )
 	// extend upgrade mux
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp
index 5663782e464..14cf6377b3f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp
@@ -24,11 +24,11 @@
 
 // FILE: FireWeaponWhenDeadBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_SLOWDEATHPHASE_NAMES
 
 #include "Common/Thing.h"
@@ -47,13 +47,7 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ObjectCreationList.h"
 #include "GameLogic/Weapon.h"
-#include "GameClient/Drawable.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 const Int MAX_IDX = 32;
 
@@ -63,7 +57,7 @@ const Real END_MIDPOINT_RATIO = 0.65f;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-FireWeaponWhenDeadBehavior::FireWeaponWhenDeadBehavior( Thing *thing, const ModuleData* moduleData ) : 
+FireWeaponWhenDeadBehavior::FireWeaponWhenDeadBehavior( Thing *thing, const ModuleData* moduleData ) :
 	BehaviorModule( thing, moduleData )
 {
 	if (getFireWeaponWhenDeadBehaviorModuleData()->m_initiallyActive)
@@ -92,16 +86,16 @@ void FireWeaponWhenDeadBehavior::onDie( const DamageInfo *damageInfo )
 	// right type?
 	if (!d->m_dieMuxData.isDieApplicable(getObject(), damageInfo))
 		return;
-	
+
 	// This will never apply until built.  Otherwise canceling construction sets it off, and killing
 	// a one hitpoint one percent building will too.
 	if( obj->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 		return;
 
-	
+
 	UpgradeMaskType activation, conflicting;
 	getUpgradeActivationMasks( activation, conflicting );
-	
+
 	if( obj->getObjectCompletedUpgradeMask().testForAny( conflicting ) )
 	{
 		return;
@@ -110,7 +104,7 @@ void FireWeaponWhenDeadBehavior::onDie( const DamageInfo *damageInfo )
 	{
 		return;
 	}
-	
+
 	if (d->m_deathWeapon)
 	{
 		// fire the default weapon
@@ -130,7 +124,7 @@ void FireWeaponWhenDeadBehavior::crc( Xfer *xfer )
 	// extend upgrade mux
 	UpgradeMux::upgradeMuxCRC( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -151,7 +145,7 @@ void FireWeaponWhenDeadBehavior::xfer( Xfer *xfer )
 	// extend upgrade mux
 	UpgradeMux::upgradeMuxXfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -165,4 +159,4 @@ void FireWeaponWhenDeadBehavior::loadPostProcess( void )
 	// extend upgrade mux
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/FlightDeckBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/FlightDeckBehavior.cpp
index 0274c717c57..673cdc7441f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/FlightDeckBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/FlightDeckBehavior.cpp
@@ -28,11 +28,11 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/CRCDebug.h"
 #include "Common/Player.h"
-#include "Common/Team.h" 
+#include "Common/Team.h"
 #include "Common/ThingFactory.h"
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
@@ -52,11 +52,6 @@
 #include "GameLogic/Module/JetAIUpdate.h"
 #include "GameLogic/Module/ProductionUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 FlightDeckBehaviorModuleData::FlightDeckBehaviorModuleData()
 {
@@ -74,7 +69,7 @@ FlightDeckBehaviorModuleData::FlightDeckBehaviorModuleData()
 void FlightDeckBehaviorModuleData::parseRunwayStrip( INI* ini, void *instance, void *store, const void* /*userData*/ )
 {
 	AsciiString *runwayNames = (AsciiString*)store;
-	
+
 	const char *token = ini->getNextTokenOrNull();
 	if( token )
 	{
@@ -92,7 +87,7 @@ void FlightDeckBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 	AIUpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "NumRunways",							INI::parseInt,										NULL, offsetof( FlightDeckBehaviorModuleData, m_numCols ) },
 		{ "NumSpacesPerRunway",			INI::parseInt,										NULL, offsetof( FlightDeckBehaviorModuleData, m_numRows ) },
@@ -103,7 +98,7 @@ void FlightDeckBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 		{ "Runway1Taxi",						INI::parseAsciiStringVector,			NULL, offsetof( FlightDeckBehaviorModuleData, m_runwayInfo[ 0 ].m_taxiBoneNames ) },
 		{ "Runway1Creation",				INI::parseAsciiStringVector,			NULL, offsetof( FlightDeckBehaviorModuleData, m_runwayInfo[ 0 ].m_creationBoneNames ) },
 		{ "Runway1CatapultSystem",	INI::parseParticleSystemTemplate,	NULL, offsetof( FlightDeckBehaviorModuleData, m_runwayInfo[ 0 ].m_catapultParticleSystem ) },
-		
+
 		{ "Runway2Spaces",					INI::parseAsciiStringVector,			NULL, offsetof( FlightDeckBehaviorModuleData, m_runwayInfo[ 1 ].m_spacesBoneNames ) },
 		{ "Runway2Takeoff",					parseRunwayStrip,									NULL, offsetof( FlightDeckBehaviorModuleData, m_runwayInfo[ 1 ].m_takeoffBoneNames ) },
 		{ "Runway2Landing",					parseRunwayStrip,									NULL, offsetof( FlightDeckBehaviorModuleData, m_runwayInfo[ 1 ].m_landingBoneNames ) },
@@ -135,7 +130,7 @@ void FlightDeckBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 FlightDeckBehavior::FlightDeckBehavior( Thing *thing, const ModuleData* moduleData ) : AIUpdateInterface( thing, moduleData )
 {
 	m_gotInfo = false;
-	
+
 	m_nextHealFrame = FOREVER;
 	setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
 	m_nextCleanupFrame = 0;
@@ -194,12 +189,12 @@ void FlightDeckBehavior::buildInfo(Bool createUnits)
 			std::vector<AsciiString> spaces = data->m_runwayInfo[ col ].m_spacesBoneNames;
 			std::vector<AsciiString>::const_iterator it;
 
-			Int counter = 0; 
+			Int counter = 0;
 			for( it = spaces.begin(); it != spaces.end() && counter < row; it++, counter++ )
 			{
 				//just iterate to the spaces.
 			}
-				
+
 			AsciiString tmp;
 			Matrix3D mtx;
 
@@ -266,7 +261,7 @@ void FlightDeckBehavior::buildInfo(Bool createUnits)
 			info.m_taxi.push_back( taxiPos );
 		}
 
-		//Get the creation bones and store them as well 
+		//Get the creation bones and store them as well
 		locations = data->m_runwayInfo[ col ].m_creationBoneNames;
 		info.m_creation.clear();
 		Bool firstTime = TRUE;
@@ -274,7 +269,7 @@ void FlightDeckBehavior::buildInfo(Bool createUnits)
 		{
 			Coord3D pos;
 			Matrix3D mtx;
-			
+
 			//Get the position of the creation bone.
 			getObject()->getSingleLogicalBonePosition( it->str(), &pos, &mtx );
 
@@ -354,7 +349,7 @@ void FlightDeckBehavior::purgeDead()
 		}
 		if (anythingPurged)
 			resetWakeFrame();
-	}	
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -408,7 +403,7 @@ FlightDeckBehavior::FlightDeckInfo* FlightDeckBehavior::findPPI(ObjectID id)
 			return &(*it);
 	}
 
-	return NULL; 
+	return NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -439,7 +434,7 @@ Bool FlightDeckBehavior::hasAvailableSpaceFor(const ThingTemplate* thing) const
 {
 	if (!m_gotInfo)	// degenerate case, shouldn't happen, but just in case...
 		return false;
-	
+
 	for (std::vector<FlightDeckInfo>::const_iterator it = m_spaces.begin(); it != m_spaces.end(); ++it)
 	{
 		ObjectID id = it->m_objectInSpace;
@@ -484,7 +479,7 @@ Bool FlightDeckBehavior::reserveSpace(ObjectID id, Real parkingOffset, ParkingPl
 
 	ppi->m_objectInSpace = id;
 	//validateAssignments();
-	
+
 	if( d->m_landingDeckHeightOffset )
 	{
 		Object *obj = TheGameLogic->findObjectByID( id );
@@ -494,7 +489,7 @@ Bool FlightDeckBehavior::reserveSpace(ObjectID id, Real parkingOffset, ParkingPl
 		}
 	}
 
-	if( info ) 
+	if( info )
 	{
 		calcPPInfo( id, info );
 		if (parkingOffset != 0.0f)
@@ -574,6 +569,7 @@ void FlightDeckBehavior::calcPPInfo( ObjectID id, PPInfo *info )
 			if (it->m_inUseByForTakeoff == id )
 			{
 				info->runwayStart = info->runwayPrep;
+				break;
 			}
 		}
 	}
@@ -591,6 +587,7 @@ void FlightDeckBehavior::releaseSpace(ObjectID id)
 		if (it->m_objectInSpace == id)
 		{
 			it->m_objectInSpace = INVALID_ID;
+			break;
 		}
 	}
 
@@ -602,6 +599,21 @@ void FlightDeckBehavior::releaseSpace(ObjectID id)
 
 }
 
+//-------------------------------------------------------------------------------------------------
+Int FlightDeckBehavior::getRunwayIndex(ObjectID id)
+{
+	purgeDead();
+
+	for (std::vector<FlightDeckInfo>::iterator it = m_spaces.begin(); it != m_spaces.end(); ++it)
+	{
+		if (it->m_objectInSpace == id)
+		{
+			return it->m_runway;
+		}
+	}
+	return InvalidRunway;
+}
+
 //-------------------------------------------------------------------------------------------------
 ObjectID FlightDeckBehavior::getRunwayReservation( Int runway, RunwayReservationType type )
 {
@@ -728,7 +740,7 @@ const std::vector<Coord3D>* FlightDeckBehavior::getTaxiLocations( ObjectID id )
 		return NULL;
 	}
 
-	//Now get the runway we're assigned to and return it's taxi vector 
+	//Now get the runway we're assigned to and return it's taxi vector
 	return &(m_runways[ runway ].m_taxi);
 }
 
@@ -752,7 +764,7 @@ const std::vector<Coord3D>* FlightDeckBehavior::getCreationLocations( ObjectID i
 		return NULL;
 	}
 
-	//Now get the runway we're assigned to and return it's creation vector 
+	//Now get the runway we're assigned to and return it's creation vector
 	return &(m_runways[ runway ].m_creation);
 }
 
@@ -762,7 +774,7 @@ Bool FlightDeckBehavior::isAbleToGiveUpParkingSpace( Object *jet )
 	//If we're airborne or non-existant, someone else can have my spot if they need it.
 	if( !jet || jet->isAirborneTarget() )
 	{
-		return TRUE;	
+		return TRUE;
 	}
 
 	JetAIUpdate *ai = (JetAIUpdate*)jet->getAI();
@@ -910,7 +922,7 @@ Bool FlightDeckBehavior::calcBestParkingAssignment( ObjectID id, Coord3D *pos, I
 				{
 					*newIndex = bestIndex;
 				}
-				
+
 				//Promoted forward.
 				return TRUE;
 			}
@@ -1015,7 +1027,7 @@ void FlightDeckBehavior::defectAllParkedUnits(Team* newTeam, UnsignedInt detecti
 			if (obj == NULL || obj->isEffectivelyDead())
 				continue;
 
-			// srj sez: evil. fix better someday. 
+			// srj sez: evil. fix better someday.
 			static NameKeyType jetKey = TheNameKeyGenerator->nameToKey("JetAIUpdate");
 			JetAIUpdate* ju = (JetAIUpdate *)obj->findUpdateModule(jetKey);
 			Bool takeoffOrLanding = ju ? ju->friend_isTakeoffOrLandingInProgress() : false;
@@ -1056,14 +1068,14 @@ void FlightDeckBehavior::killAllParkedUnits()
 			if (obj == NULL || obj->isEffectivelyDead())
 				continue;
 
-			// srj sez: evil. fix better someday. 
+			// srj sez: evil. fix better someday.
 			static NameKeyType jetKey = TheNameKeyGenerator->nameToKey("JetAIUpdate");
 			JetAIUpdate* ju = (JetAIUpdate *)obj->findUpdateModule(jetKey);
 			Bool takeoffOrLanding = ju ? ju->friend_isTakeoffOrLandingInProgress() : false;
 
 			if (obj->isAboveTerrain() && !takeoffOrLanding)
 				continue;
-		
+
 			obj->kill();
 		}
 	}
@@ -1081,7 +1093,7 @@ void FlightDeckBehavior::onDie( const DamageInfo *damageInfo )
 UpdateSleepTime FlightDeckBehavior::update()
 {
 	// alas, we need to keep the buildInfo and dead-purged stuff pretty much up to date, for
-	// the client to be able to peek at. at this late date, the most expedient way is to ensure 
+	// the client to be able to peek at. at this late date, the most expedient way is to ensure
 	// our update is run every frame, and do this manually. the extra cost should be trivial, since
 	// there are generally at most only a few airfields at any given time.
 	buildInfo();
@@ -1150,7 +1162,7 @@ UpdateSleepTime FlightDeckBehavior::update()
 
 					if( complete[ it->m_runway ] )
 					{
-						continue;	
+						continue;
 					}
 
 					//Now we have the correct runway. Check if that spot has an idle plane in it!
@@ -1173,14 +1185,14 @@ UpdateSleepTime FlightDeckBehavior::update()
 						exitPath.push_back( it->m_prep );
 						parkedJet->getAI()->aiFollowExitProductionPath( &exitPath, getObject(), CMD_FROM_AI );
 
-						//Determine if the first plane in each row has completed a move. We want to lag the 
+						//Determine if the first plane in each row has completed a move. We want to lag the
 						//additional planes instead of moving them all simultaneously. So this is the exit
 						//condition if one plane per runway has been bumped.
 						complete[ it->m_runway ] = TRUE;
 						m_nextCleanupFrame = now + data->m_humanFollowFrames;
 					}
 					//Break through and advance to the next spot!
-					break;				
+					break;
 				}
 			}
 		}
@@ -1197,7 +1209,7 @@ UpdateSleepTime FlightDeckBehavior::update()
 	std::vector<FlightDeckInfo>::iterator it = m_spaces.begin();
 	for( ; it != m_spaces.end(); it++ )
 	{
-		//Unassigned space?... so we can build a replacement. 
+		//Unassigned space?... so we can build a replacement.
 		if( it->m_objectInSpace == INVALID_ID )
 		{
 			//But are we already building one?
@@ -1205,10 +1217,10 @@ UpdateSleepTime FlightDeckBehavior::update()
 			if( pu == NULL )
 			{
 
-				DEBUG_CRASH( ("MSG_QUEUE_UNIT_CREATE: Producer '%s' doesn't have a unit production interface\n", getObject()->getTemplate()->getName().str()) );
+				DEBUG_CRASH( ("MSG_QUEUE_UNIT_CREATE: Producer '%s' doesn't have a unit production interface", getObject()->getTemplate()->getName().str()) );
 				break;
-			}  // end if
-			DEBUG_ASSERTCRASH( m_thingTemplate != NULL, ("flightdeck has a null thingtemplate... no jets for you!\n") );
+			}
+			DEBUG_ASSERTCRASH( m_thingTemplate != NULL, ("flightdeck has a null thingtemplate... no jets for you!") );
 			if( !pu->getProductionCount() && now >= m_nextAllowedProductionFrame && m_thingTemplate != NULL )
 			{
 				//Queue the build
@@ -1282,7 +1294,7 @@ UpdateSleepTime FlightDeckBehavior::update()
 				ps->setPosition( &m_runways[ i ].m_start );
 			}
 		}
-		
+
 		//Handle lowering the ramp after the fighter has been launched.
 		if( m_rampUp[ i ] && m_lowerRampFrame[ i ] <= now )
 		{
@@ -1318,17 +1330,16 @@ void FlightDeckBehavior::exitObjectViaDoor( Object *newObj, ExitDoorType exitDoo
 				break;
 			}
 		}
+	}
 
-		if (!ppi)
-		{
-			DEBUG_CRASH(("could not find the space. what?"));
-			return;
-		}
-
-		ppi->m_objectInSpace = newObj->getID();
-		//validateAssignments();
+	if (!ppi)
+	{
+		DEBUG_CRASH(("could not find the space. what?"));
+		return;
 	}
 
+	ppi->m_objectInSpace = newObj->getID();
+	//validateAssignments();
 
 	/// @todo srj -- this is evil. fix.
 	static NameKeyType jetKey = TheNameKeyGenerator->nameToKey( "JetAIUpdate" );
@@ -1340,7 +1351,7 @@ void FlightDeckBehavior::exitObjectViaDoor( Object *newObj, ExitDoorType exitDoo
 
 	DUMPMATRIX3D(getObject()->getTransformMatrix());
 	DUMPCOORD3D(getObject()->getPosition());
-	CRCDEBUG_LOG(("Produced at hangar (door = %d)\n", exitDoor));
+	CRCDEBUG_LOG(("Produced at hangar (door = %d)", exitDoor));
 	DEBUG_ASSERTCRASH(exitDoor != DOOR_NONE_NEEDED, ("Hmm, unlikely"));
 	if (!reserveSpace(newObj->getID(), parkingOffset, &ppinfo)) //&loc, &orient, NULL, NULL, NULL, NULL, &hangarInternal, &hangOrient))
 	{
@@ -1385,7 +1396,7 @@ void FlightDeckBehavior::aiDoCommand(const AICommandParms* parms)
 	if( parms->m_cmdSource != CMD_FROM_AI )
 	{
 		//Now the only time we care about anything is if we were ordered to attack something or attack move.
-		switch( parms->m_cmd ) 
+		switch( parms->m_cmd )
 		{
 			case AICMD_GUARD_POSITION:
 				m_designatedTarget = INVALID_ID;
@@ -1454,7 +1465,7 @@ Bool FlightDeckBehavior::hasTakeoffOrders()
 	{
 		case AICMD_GUARD_POSITION:
 			return TRUE;
-		
+
 		case AICMD_ATTACK_POSITION:
 			return TRUE;
 
@@ -1465,7 +1476,7 @@ Bool FlightDeckBehavior::hasTakeoffOrders()
 		case AICMD_ATTACK_OBJECT:
 			if( target )
 			{
-				return TRUE;	
+				return TRUE;
 			}
 			m_designatedCommand = AICMD_NO_COMMAND;
 			m_designatedTarget = INVALID_ID;
@@ -1473,7 +1484,7 @@ Bool FlightDeckBehavior::hasTakeoffOrders()
 
 		case AICMD_IDLE:
 			return FALSE;
-			
+
 		default:
 			return FALSE;
 	}
@@ -1520,7 +1531,7 @@ void FlightDeckBehavior::crc( Xfer *xfer )
 	// extend base class
 	AIUpdateInterface::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1557,9 +1568,9 @@ void FlightDeckBehavior::xfer( Xfer *xfer )
 		{
 			// object in this space
 			xfer->xferObjectID( &((*it).m_objectInSpace) ); // This is the one thing not regenerated by buildInfo
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
 		ObjectID objectID;
@@ -1579,11 +1590,11 @@ void FlightDeckBehavior::xfer( Xfer *xfer )
 				(*it).m_objectInSpace = objectID;
 				//validateAssignments();
 				++it;
-			}  // end if
+			}
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// runways count and info
 	UnsignedByte runwaysCount = m_runways.size();
@@ -1600,9 +1611,9 @@ void FlightDeckBehavior::xfer( Xfer *xfer )
 			xfer->xferObjectID( &((*it).m_inUseByForTakeoff ) );
 			xfer->xferObjectID( &((*it).m_inUseByForLanding ) );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
 		// read all elements
@@ -1627,11 +1638,11 @@ void FlightDeckBehavior::xfer( Xfer *xfer )
 				(*it).m_inUseByForLanding = inUseByForLanding;
 				++it;
 
-			}  // end if
+			}
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// healees
 	UnsignedByte healCount = m_healing.size();
@@ -1648,9 +1659,9 @@ void FlightDeckBehavior::xfer( Xfer *xfer )
 			xfer->xferObjectID( &((*it).m_gettingHealedID) );
 			xfer->xferUnsignedInt( &((*it).m_healStartFrame) );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
 		// read all elements
@@ -1664,9 +1675,9 @@ void FlightDeckBehavior::xfer( Xfer *xfer )
 			xfer->xferUnsignedInt( &info.m_healStartFrame );
 			m_healing.push_back(info);
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	xfer->xferUnsignedInt( &m_nextHealFrame );
 	xfer->xferUnsignedInt( &m_nextCleanupFrame );
@@ -1687,9 +1698,9 @@ void FlightDeckBehavior::xfer( Xfer *xfer )
 		{
 			//Save and load everything.
 			xfer->xferUnsignedInt( &m_nextLaunchWaveFrame[ i ] );
-			xfer->xferUnsignedInt( &m_rampUpFrame[ i ] );					
-			xfer->xferUnsignedInt( &m_catapultSystemFrame[ i ] ); 
-			xfer->xferUnsignedInt( &m_lowerRampFrame[ i ] );			
+			xfer->xferUnsignedInt( &m_rampUpFrame[ i ] );
+			xfer->xferUnsignedInt( &m_catapultSystemFrame[ i ] );
+			xfer->xferUnsignedInt( &m_lowerRampFrame[ i ] );
 			xfer->xferBool( &m_rampUp[ MAX_RUNWAYS ] );
 		}
 		else
@@ -1705,7 +1716,7 @@ void FlightDeckBehavior::xfer( Xfer *xfer )
 		}
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1723,7 +1734,7 @@ void FlightDeckBehavior::loadPostProcess( void )
 
 	// no, this is bad.. it is NOT SAFE to call setWakeFrame from the xfer system. crap. (srj)
 	// make sure we are awake... old save games let us sleep
-	//setWakeFrame(getObject(), UPDATE_SLEEP_NONE); 
+	//setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp
index e3477ea5dc2..731fb65b48b 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GenerateMinefieldBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_SLOWDEATHPHASE_NAMES
 
 #include "Common/GlobalData.h"
@@ -52,13 +52,7 @@
 #include "GameLogic/ObjectCreationList.h"
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/Weapon.h"
-#include "GameClient/Drawable.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 GenerateMinefieldBehaviorModuleData::GenerateMinefieldBehaviorModuleData()
@@ -81,10 +75,10 @@ GenerateMinefieldBehaviorModuleData::GenerateMinefieldBehaviorModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void GenerateMinefieldBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void GenerateMinefieldBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MineName", INI::parseAsciiString,	NULL, offsetof( GenerateMinefieldBehaviorModuleData, m_mineName ) },
 		{ "UpgradedMineName", INI::parseAsciiString,	NULL, offsetof( GenerateMinefieldBehaviorModuleData, m_mineNameUpgraded ) },
@@ -270,7 +264,7 @@ void GenerateMinefieldBehavior::placeMinesAlongLine(const Coord3D& posStart, con
 		pt.z = TheTerrainLogic->getGroundHeight( pt.x, pt.y );
 		offsetBySmallRandomAmount(pt, mineJitter);
 		placeMineAt(pt, mineTemplate, team, obj);
-	} 
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -331,7 +325,7 @@ void GenerateMinefieldBehavior::placeMinesAroundCircle(const Coord3D& pos, Real
 		pt.z = TheTerrainLogic->getGroundHeight( pt.x, pt.y );
 		offsetBySmallRandomAmount(pt, mineJitter);
 		placeMineAt(pt, mineTemplate, team, obj);
-	} 
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -354,7 +348,7 @@ void GenerateMinefieldBehavior::placeMinesInFootprint(const GeometryInfo& geom,
 	{
 		Coord3D pt;
 		Int maxRetry = 100;
-		do 
+		do
 		{
 			geom.makeRandomOffsetWithinFootprint(pt);
 			pt.x += target->x;
@@ -393,7 +387,7 @@ void GenerateMinefieldBehavior::placeMines()
 
 	if (!mineTemplate)
 	{
-		DEBUG_CRASH(("mine %s not found\n",d->m_mineName.str()));
+		DEBUG_CRASH(("mine %s not found",d->m_mineName.str()));
 		return;
 	}
 
@@ -461,7 +455,7 @@ void GenerateMinefieldBehavior::placeMines()
 UpdateSleepTime GenerateMinefieldBehavior::update()
 {
 	// Test to see if we need to replace the current mines with upgraded ones
-	if (!m_upgraded && getGenerateMinefieldBehaviorModuleData()->m_upgradable) 
+	if (!m_upgraded && getGenerateMinefieldBehaviorModuleData()->m_upgradable)
 	{
 		if (m_generated)
 		{
@@ -475,7 +469,7 @@ UpdateSleepTime GenerateMinefieldBehavior::update()
 				if (objMask.testForAny(upgradeMask))
 				{
 					m_upgraded = TRUE;
-					
+
 					// Remove all old mine objects if present
 					for (std::list<ObjectID>::iterator it = m_mineList.begin(); it != m_mineList.end(); ++it)
 					{
@@ -513,7 +507,7 @@ void GenerateMinefieldBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpgradeMux::upgradeMuxCRC( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -538,7 +532,7 @@ void GenerateMinefieldBehavior::xfer( Xfer *xfer )
 	xfer->xferBool( &m_generated );
 	xfer->xferBool( &m_hasTarget );
 	xfer->xferBool( &m_upgraded );
-	
+
 	xfer->xferCoord3D( &m_target );
 
 		// spaces info count and objectID data
@@ -552,9 +546,9 @@ void GenerateMinefieldBehavior::xfer( Xfer *xfer )
 		{
 			// object in this space
 			xfer->xferObjectID( &(*it) );
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
 		ObjectID objectID;
@@ -569,10 +563,10 @@ void GenerateMinefieldBehavior::xfer( Xfer *xfer )
 			xfer->xferObjectID( &objectID );
 
 			m_mineList.push_back(objectID);
-		}  // end for, i
-	}  // end else, load
-	
-}  // end xfer
+		}
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -586,4 +580,4 @@ void GenerateMinefieldBehavior::loadPostProcess( void )
 	// extend base class
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/GrantStealthBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/GrantStealthBehavior.cpp
index 04ce8fb6c16..0ca3590becd 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/GrantStealthBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/GrantStealthBehavior.cpp
@@ -28,7 +28,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Thing.h"
 #include "Common/ThingTemplate.h"
 #include "Common/INI.h"
@@ -46,11 +46,6 @@
 #include "GameLogic/PartitionManager.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -58,7 +53,7 @@ struct GrantStealthPlayerScanHelper
 {
 	KindOfMaskType m_kindOfToTest;
 	Object *m_theGrantor;
-	ObjectPointerList *m_objectList;	
+	ObjectPointerList *m_objectList;
 };
 
 static void checkForGrantStealth( Object *testObj, void *userData )
@@ -79,7 +74,7 @@ static void checkForGrantStealth( Object *testObj, void *userData )
 		return;
 
 	listToAddTo->push_back(testObj);
-	
+
 	if( testObj->getContain() )
 	{
 		// have to tag visible riders too, or they will float around and look silly.
@@ -164,7 +159,7 @@ UpdateSleepTime GrantStealthBehavior::update( void )
 	// scan objects in our region
 	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( self->getPosition(), m_currentScanRadius, FROM_CENTER_2D, filters );
 	MemoryPoolObjectHolder hold( iter );
-	// GRANT STEALTH TO FRIENDLIES IN RADIUS 
+	// GRANT STEALTH TO FRIENDLIES IN RADIUS
 	for( Object *obj = iter->first(); obj; obj = iter->next() )
     grantStealthToObject( obj );
 
@@ -177,7 +172,7 @@ UpdateSleepTime GrantStealthBehavior::update( void )
 
   return UPDATE_SLEEP_NONE;
 }
- 
+
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void GrantStealthBehavior::grantStealthToObject( Object *obj )
@@ -185,7 +180,7 @@ void GrantStealthBehavior::grantStealthToObject( Object *obj )
 
   if ( obj == getObject() )
     return;
-  
+
 
 	const GrantStealthBehaviorModuleData *d = getGrantStealthBehaviorModuleData();
   if ( ! obj->isAnyKindOf( d->m_kindOf ) )
@@ -215,7 +210,7 @@ void GrantStealthBehavior::crc( Xfer *xfer )
 	UpdateModule::crc( xfer );
 
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -240,7 +235,7 @@ void GrantStealthBehavior::xfer( Xfer *xfer )
 	// Timer safety
 	xfer->xferReal( &m_currentScanRadius );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -252,4 +247,4 @@ void GrantStealthBehavior::loadPostProcess( void )
 	UpdateModule::loadPostProcess();
 
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/InstantDeathBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/InstantDeathBehavior.cpp
index 438da60844c..348c4ea3256 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/InstantDeathBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/InstantDeathBehavior.cpp
@@ -24,12 +24,12 @@
 
 // FILE: InstantDeathBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_SLOWDEATHPHASE_NAMES
 
 #include "Common/Thing.h"
@@ -48,7 +48,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ObjectCreationList.h"
 #include "GameLogic/Weapon.h"
-#include "GameClient/Drawable.h"
 
 //-------------------------------------------------------------------------------------------------
 InstantDeathBehaviorModuleData::InstantDeathBehaviorModuleData()
@@ -93,11 +92,11 @@ static void parseWeapon( INI* ini, void *instance, void * /*store*/, const void*
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void InstantDeathBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void InstantDeathBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   DieModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "FX",										parseFX,													NULL, 0 },
 		{ "OCL",									parseOCL,													NULL, 0 },
@@ -183,7 +182,7 @@ void InstantDeathBehavior::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -201,7 +200,7 @@ void InstantDeathBehavior::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -212,4 +211,4 @@ void InstantDeathBehavior::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp
index 24dd381036f..eddd748b5a0 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/ThingTemplate.h"
@@ -43,11 +43,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ObjectCreationList.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -80,7 +75,7 @@ JetSlowDeathBehaviorModuleData::JetSlowDeathBehaviorModuleData( void )
 	m_pitchRate = 0.0f;
 	m_fallHowFast = 0.0f;
 
-}  // end JetSlowDeathBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -88,7 +83,7 @@ JetSlowDeathBehaviorModuleData::JetSlowDeathBehaviorModuleData( void )
 {
   SlowDeathBehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
 		{ "FXOnGroundDeath",	INI::parseFXList,	NULL, offsetof( JetSlowDeathBehaviorModuleData, m_fxOnGroundDeath ) },
@@ -122,7 +117,7 @@ JetSlowDeathBehaviorModuleData::JetSlowDeathBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -138,26 +133,26 @@ JetSlowDeathBehavior::JetSlowDeathBehavior( Thing *thing, const ModuleData *modu
 	m_timerOnGroundFrame = 0;
 	m_rollRate = 0.0f;
 
-}  // end JetSlowDeathBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 JetSlowDeathBehavior::~JetSlowDeathBehavior( void )
 {
 
-}  // end ~JetSlowDeathBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void JetSlowDeathBehavior::onDie( const DamageInfo *damageInfo )
 {
 	Object *us = getObject();
-	
+
 	// if the jet is on the ground we do just our ground fx death
 	if( us->isSignificantlyAboveTerrain() == FALSE || us->getStatusBits().test( OBJECT_STATUS_DECK_HEIGHT_OFFSET ) )
 	{
 		const JetSlowDeathBehaviorModuleData *modData = getJetSlowDeathBehaviorModuleData();
-		
+
 		// execute fx
 		FXList::doFXObj( modData->m_fxOnGroundDeath, us );
 
@@ -167,18 +162,18 @@ void JetSlowDeathBehavior::onDie( const DamageInfo *damageInfo )
 		// destroy object
 		TheGameLogic->destroyObject( us );
 
-	}  // end if
+	}
 	else
 	{
 
 		// extend base class for slow death and begin the slow death behavior
 		SlowDeathBehavior::onDie( damageInfo );
 
-	}  // end else
+	}
 
 	getObject()->clearStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_DECK_HEIGHT_OFFSET ) );
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -207,7 +202,7 @@ void JetSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 		m_deathLoopSound.setObjectID( us->getID() );
 		m_deathLoopSound.setPlayingHandle( TheAudio->addAudioEvent( &m_deathLoopSound ) );
 
-	}  // end if
+	}
 
 	// initialize our roll rate to that defined as the initial value in the module data
 	m_rollRate = modData->m_rollRate;
@@ -219,7 +214,7 @@ void JetSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 	// do not allow the jet to turn anymore
 	locomotor->setMaxTurnRate( 0.0f );
 
-}  // end beginSlowDeath
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -239,7 +234,7 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 
 	// roll us around in the air
 	PhysicsBehavior *physics = us->getPhysics();
-	DEBUG_ASSERTCRASH( physics, ("JetSlowDeathBehavior::beginSlowDeath - '%s' has no physics\n",
+	DEBUG_ASSERTCRASH( physics, ("JetSlowDeathBehavior::beginSlowDeath - '%s' has no physics",
 															us->getTemplate()->getName().str()) );
 	if( physics )
 		physics->setRollRate( m_rollRate );
@@ -250,7 +245,7 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 	// do effects for death while in the air
 	if( m_timerOnGroundFrame == 0 )
 	{
-		
+
 		PathfindLayerEnum layer = TheTerrainLogic->getLayerForDestination(us->getPosition());
 		us->setLayer(layer);
 		Real height;
@@ -269,7 +264,7 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 				height = 0.0f;
 		}
 
-		
+
 
 		Bool hitATree = FALSE;
 		// Here we want to make sure we crash if we collide with a tree on the way down
@@ -305,10 +300,10 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 			if( physics )
 				physics->setPitchRate( modData->m_pitchRate );
 
-		}  // end if
+		}
 
 		// timers for the secondary effect
-		if( m_timerDeathFrame != 0 && 
+		if( m_timerDeathFrame != 0 &&
 				TheGameLogic->getFrame() - m_timerDeathFrame >= modData->m_delaySecondaryFromInitialDeath )
 		{
 
@@ -319,9 +314,9 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 			// clear the death frame timer since we've already executed the event now
 			m_timerDeathFrame = 0;
 
-		}  //end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 		// we are on the ground, pay attention to the final explosion timers
@@ -335,13 +330,13 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 			// we're all done now
 			TheGameLogic->destroyObject( us );
 
-		}  // end if
+		}
 
-	}  // end else
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -349,10 +344,10 @@ UpdateSleepTime JetSlowDeathBehavior::update( void )
 void JetSlowDeathBehavior::crc( Xfer *xfer )
 {
 
-	// extend base class 
+	// extend base class
 	SlowDeathBehavior::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -379,7 +374,7 @@ void JetSlowDeathBehavior::xfer( Xfer *xfer )
 	// roll rate
 	xfer->xferReal( &m_rollRate );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -390,4 +385,4 @@ void JetSlowDeathBehavior::loadPostProcess( void )
 	// extend base class
 	SlowDeathBehavior::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp
index e8cea87c862..f2abac47bbf 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_RELATIONSHIP_NAMES
 #include "Common/GameState.h"
 #include "Common/RandomValue.h"
@@ -45,11 +45,6 @@
 #include "GameLogic/Module/AutoHealBehavior.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // detonation never puts our health below this, since we probably auto-regen
 const Real MIN_HEALTH = 0.1f;
@@ -73,12 +68,12 @@ MinefieldBehaviorModuleData::MinefieldBehaviorModuleData()
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void MinefieldBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p ) 
+/*static*/ void MinefieldBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
 
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DetonationWeapon", INI::parseWeaponTemplate,	NULL, offsetof( MinefieldBehaviorModuleData, m_detonationWeapon ) },
 		{ "DetonatedBy", INI::parseBitString32, TheRelationshipNames, offsetof( MinefieldBehaviorModuleData, m_detonatedBy ) },
@@ -96,7 +91,7 @@ MinefieldBehaviorModuleData::MinefieldBehaviorModuleData()
 
   p.add( dataFieldParse );
 
-} 
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -104,7 +99,7 @@ MinefieldBehaviorModuleData::MinefieldBehaviorModuleData()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-MinefieldBehavior::MinefieldBehavior( Thing *thing, const ModuleData* moduleData ) 
+MinefieldBehavior::MinefieldBehavior( Thing *thing, const ModuleData* moduleData )
 								 : UpdateModule( thing, moduleData )
 {
 	const MinefieldBehaviorModuleData* d = getMinefieldBehaviorModuleData();
@@ -225,7 +220,7 @@ UpdateSleepTime MinefieldBehavior::update()
 		if (TheGameLogic->findObjectByID(m_immunes[i].id) == NULL ||
 				now > m_immunes[i].collideTime + 2)
 		{
-			//DEBUG_LOG(("expiring an immunity %d\n",m_immunes[i].id));
+			//DEBUG_LOG(("expiring an immunity %d",m_immunes[i].id));
 			m_immunes[i].id = INVALID_ID;	// he's dead, jim.
 			m_immunes[i].collideTime = 0;
 		}
@@ -360,7 +355,7 @@ void MinefieldBehavior::onCollide( Object *other, const Coord3D *loc, const Coor
 	{
 		if (m_immunes[i].id == other->getID())
 		{
-			//DEBUG_LOG(("ignoring due to immunity %d\n",m_immunes[i].id));
+			//DEBUG_LOG(("ignoring due to immunity %d",m_immunes[i].id));
 			m_immunes[i].collideTime = now;
 			return;
 		}
@@ -400,7 +395,7 @@ void MinefieldBehavior::onCollide( Object *other, const Coord3D *loc, const Coor
 		{
 			if (m_immunes[i].id == INVALID_ID || m_immunes[i].id == other->getID())
 			{
-				//DEBUG_LOG(("add/update immunity %d\n",m_immunes[i].id));
+				//DEBUG_LOG(("add/update immunity %d",m_immunes[i].id));
 				m_immunes[i].id = other->getID();
 				m_immunes[i].collideTime = now;
 
@@ -463,7 +458,7 @@ void MinefieldBehavior::onDamage( DamageInfo *damageInfo )
 	for (;;)
 	{
 		Real virtualMinesExpectedF = ((Real)d->m_numVirtualMines * body->getHealth() / body->getMaxHealth());
-		Int virtualMinesExpected = 
+		Int virtualMinesExpected =
 			damageInfo->in.m_damageType == DAMAGE_HEALING ?
 			REAL_TO_INT_FLOOR(virtualMinesExpectedF) :
 			REAL_TO_INT_CEIL(virtualMinesExpectedF);
@@ -475,7 +470,7 @@ void MinefieldBehavior::onDamage( DamageInfo *damageInfo )
 		}
 		else if (m_virtualMinesRemaining > virtualMinesExpected)
 		{
-			if (m_draining && 
+			if (m_draining &&
 						damageInfo->in.m_sourceID == getObject()->getID() &&
 						damageInfo->in.m_damageType == DAMAGE_UNRESISTABLE)
 			{
@@ -495,7 +490,7 @@ void MinefieldBehavior::onDamage( DamageInfo *damageInfo )
 
 	if (m_virtualMinesRemaining == 0)
 	{
-		// oops, if someone did weapon damage they may have nuked our health to zero, 
+		// oops, if someone did weapon damage they may have nuked our health to zero,
 		// which would be bad if we regen. prevent this. (srj)
 		if (m_regenerates && body->getHealth() < MIN_HEALTH)
 		{
@@ -631,7 +626,7 @@ void MinefieldBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -675,10 +670,10 @@ void MinefieldBehavior::xfer( Xfer *xfer )
 	if( maxImmunity != MAX_IMMUNITY )
 	{
 
-		DEBUG_CRASH(( "MinefieldBehavior::xfer - MAX_IMMUNITY has changed size, you must version this code and then you can remove this error message\n" ));
+		DEBUG_CRASH(( "MinefieldBehavior::xfer - MAX_IMMUNITY has changed size, you must version this code and then you can remove this error message" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( UnsignedByte i = 0; i < maxImmunity; ++i )
 	{
 
@@ -688,12 +683,12 @@ void MinefieldBehavior::xfer( Xfer *xfer )
 		// collide time
 		xfer->xferUnsignedInt( &m_immunes[ i ].collideTime );
 
-	}  // end for, i
+	}
 
 	if( xfer->getXferMode() == XFER_LOAD )
 		m_detonators.clear();
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -704,4 +699,4 @@ void MinefieldBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/NeutonBlastBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/NeutonBlastBehavior.cpp
index c87632b3900..048a90e69dc 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/NeutonBlastBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/NeutonBlastBehavior.cpp
@@ -28,7 +28,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "GameLogic/Module/NeutronBlastBehavior.h"
 
 #include "Common/Player.h"
@@ -40,11 +40,6 @@
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameClient/Drawable.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -67,7 +62,7 @@ void NeutronBlastBehavior::onDie( const DamageInfo *damageInfo )
 {
 	// On death, perform the Neutron Blast!!
 	Object *self = getObject();
-	if (!self) 
+	if (!self)
 		return;
 
 	const NeutronBlastBehaviorModuleData *data = getNeutronBlastBehaviorModuleData();
@@ -82,7 +77,7 @@ void NeutronBlastBehavior::onDie( const DamageInfo *damageInfo )
 	// scan objects in our region
 	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( self->getPosition(), blastRadius, FROM_CENTER_2D, filters );
 	MemoryPoolObjectHolder hold( iter );
-	
+
 	// Apply neutron blast to object
 	for( Object *obj = iter->first(); obj; obj = iter->next() )
 	{
@@ -102,13 +97,13 @@ UpdateSleepTime NeutronBlastBehavior::update( void )
 {
 	return UPDATE_SLEEP_FOREVER;
 }
- 
+
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void NeutronBlastBehavior::neutronBlastToObject( Object *obj )
 {
 	// early exit check
-  if ( !obj || obj == getObject() )	
+  if ( !obj || obj == getObject() )
 		return;
 
 	// Check for allies and quick exit if we are not suppose to hurt our own.
@@ -137,7 +132,7 @@ void NeutronBlastBehavior::neutronBlastToObject( Object *obj )
 		// If the vehicle is a combat bike, kill the whole thing
 		if ( obj->isKindOf( KINDOF_CLIFF_JUMPER ) )
 		{
-			obj->kill(); 
+			obj->kill();
 		}
 		// Just kill the pilot of the vehicle
 		else
@@ -147,7 +142,7 @@ void NeutronBlastBehavior::neutronBlastToObject( Object *obj )
 
       if ( obj->getAI() )
         obj->getAI()->aiIdle( CMD_FROM_AI );
-      
+
 			TheGameLogic->deselectObject(obj, PLAYERMASK_ALL, TRUE);
 
 			// Clear any terrain decals here
@@ -171,7 +166,7 @@ void NeutronBlastBehavior::crc( Xfer *xfer )
 	UpdateModule::crc( xfer );
 
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -189,7 +184,7 @@ void NeutronBlastBehavior::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -201,4 +196,4 @@ void NeutronBlastBehavior::loadPostProcess( void )
 	UpdateModule::loadPostProcess();
 
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp
index a9a1d5d8307..742fb6066c3 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp
@@ -30,7 +30,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Radar.h"
@@ -43,11 +43,6 @@
 #include "GameClient/InGameUI.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -57,16 +52,16 @@ OverchargeBehaviorModuleData::OverchargeBehaviorModuleData( void )
 	m_healthPercentToDrainPerSecond = 0.0f;
 	m_notAllowedWhenHealthBelowPercent = 0.0f;
 
-}  // end OverchargeBehaviorModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void OverchargeBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p ) 
+/*static*/ void OverchargeBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
 
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "HealthPercentToDrainPerSecond", INI::parsePercentToReal,	NULL, offsetof( OverchargeBehaviorModuleData, m_healthPercentToDrainPerSecond ) },
 		{ "NotAllowedWhenHealthBelowPercent", INI::parsePercentToReal, NULL, offsetof( OverchargeBehaviorModuleData, m_notAllowedWhenHealthBelowPercent ) },
@@ -75,7 +70,7 @@ OverchargeBehaviorModuleData::OverchargeBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -83,7 +78,7 @@ OverchargeBehaviorModuleData::OverchargeBehaviorModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-OverchargeBehavior::OverchargeBehavior( Thing *thing, const ModuleData* moduleData ) 
+OverchargeBehavior::OverchargeBehavior( Thing *thing, const ModuleData* moduleData )
 									 : UpdateModule( thing, moduleData )
 {
 
@@ -92,14 +87,14 @@ OverchargeBehavior::OverchargeBehavior( Thing *thing, const ModuleData* moduleDa
 	// start off sleeping forever until we become active
 	setWakeFrame( getObject(), UPDATE_SLEEP_FOREVER );
 
-}  // end OverchargeBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 OverchargeBehavior::~OverchargeBehavior( void )
 {
 
-}  // end ~OverchargeBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -140,25 +135,25 @@ UpdateSleepTime OverchargeBehavior::update( void )
 				// do radar event
 				TheRadar->createEvent( us->getPosition(), RADAR_EVENT_INFORMATION );
 
-			}  // end of
+			}
 
 			// do nothing else
 			return UPDATE_SLEEP_NONE;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void OverchargeBehavior::onDamage( DamageInfo *damageInfo )
 {
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Flip the state of our 'overcharge-ness' */
@@ -169,7 +164,7 @@ void OverchargeBehavior::toggle( void )
 	// just toggle using enable()
 	enable( !m_overchargeActive );
 
-}  // end toggle
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Enable or disable an overcharge */
@@ -200,13 +195,13 @@ void OverchargeBehavior::enable( Bool enable )
 
 			// we are no longer active
 			m_overchargeActive = FALSE;
-			
+
 			// sleep forever
 			setWakeFrame( us, UPDATE_SLEEP_FOREVER );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 
@@ -234,11 +229,11 @@ void OverchargeBehavior::enable( Bool enable )
 			// need to update every frame now
 			setWakeFrame( us, UPDATE_SLEEP_NONE );
 
-		}  // end if
+		}
 
-	}  // end else
+	}
 
-}  // end enable
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -256,7 +251,7 @@ void OverchargeBehavior::onDelete( void )
 
 	m_overchargeActive = FALSE;
 
-}  // end onDelete
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -267,7 +262,7 @@ void OverchargeBehavior::onCapture( Player *oldOwner, Player *newOwner )
 	if( m_overchargeActive == FALSE )
 		return;
 
-	if (getObject()->isDisabled()) 
+	if (getObject()->isDisabled())
 		return;
 
 	// remove power bonus from old owner
@@ -278,7 +273,7 @@ void OverchargeBehavior::onCapture( Player *oldOwner, Player *newOwner )
 	if( newOwner )
 		newOwner->addPowerBonus( getObject() );
 
-}  // end onCapture
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -289,7 +284,7 @@ void OverchargeBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -310,7 +305,7 @@ void OverchargeBehavior::xfer( Xfer *xfer )
 	// overcharge active
 	xfer->xferBool( &m_overchargeActive );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -320,9 +315,9 @@ void OverchargeBehavior::loadPostProcess( void )
 
 	// extend base class
 	UpdateModule::loadPostProcess();
-	
+
 	// Our effect is a fire and forget effect, not an upgrade state that is itself saved, so need to re-fire.
 	if( m_overchargeActive && getObject()->getControllingPlayer() )
 		getObject()->getControllingPlayer()->addPowerBonus( getObject() );
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/POWTruckBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/POWTruckBehavior.cpp
index 9704ce35276..dc9402efb0b 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/POWTruckBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/POWTruckBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
 #include "GameClient/InGameUI.h"
@@ -48,15 +48,15 @@
 POWTruckBehaviorModuleData::POWTruckBehaviorModuleData( void )
 {
 
-}  // end POWTruckBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void POWTruckBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p ) 
+/*static*/ void POWTruckBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
   OpenContainModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
 		{ 0, 0, 0, 0 }
@@ -65,7 +65,7 @@ POWTruckBehaviorModuleData::POWTruckBehaviorModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -73,18 +73,18 @@ POWTruckBehaviorModuleData::POWTruckBehaviorModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-POWTruckBehavior::POWTruckBehavior( Thing *thing, const ModuleData *moduleData ) 
+POWTruckBehavior::POWTruckBehavior( Thing *thing, const ModuleData *moduleData )
 								: OpenContain( thing, moduleData )
 {
 
-}  // end POWTruckBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 POWTruckBehavior::~POWTruckBehavior( void )
 {
 
-}  // end ~POWTruckBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -103,16 +103,16 @@ void POWTruckBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 
 	// get our AI info
 	AIUpdateInterface *ourAI = us->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ourAI, ("POWTruckBehavior::onCollide - '%s' has no AI\n",
+	DEBUG_ASSERTCRASH( ourAI, ("POWTruckBehavior::onCollide - '%s' has no AI",
 														us->getTemplate()->getName().str()) );
 	POWTruckAIUpdateInterface *powTruckAI = ourAI->getPOWTruckAIUpdateInterface();
-	DEBUG_ASSERTCRASH( powTruckAI, ("POWTruckBehavior::onCollide - '%s' has no POWTruckAI\n",
+	DEBUG_ASSERTCRASH( powTruckAI, ("POWTruckBehavior::onCollide - '%s' has no POWTruckAI",
 																 us->getTemplate()->getName().str()) );
 
 	// pick up the prisoner
 	powTruckAI->loadPrisoner( other );
 
-}  // end onCollide
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -123,7 +123,7 @@ void POWTruckBehavior::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -141,7 +141,7 @@ void POWTruckBehavior::xfer( Xfer *xfer )
 	// extend base class
 	OpenContain::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -152,6 +152,6 @@ void POWTruckBehavior::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 #endif
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
index e2a0990b2d3..ed1cfc4137d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
@@ -24,11 +24,11 @@
 
 // FILE: ParkingPlaceBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:	Steven Johnson, June 2002
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/CRCDebug.h"
 #include "Common/Xfer.h"
 #include "Common/ThingTemplate.h"
@@ -42,13 +42,8 @@
 #include "GameLogic/Module/JetAIUpdate.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/TerrainLogic.h"
-#include "Common/Team.h" 
+#include "Common/Team.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
@@ -56,14 +51,7 @@
 ParkingPlaceBehavior::ParkingPlaceBehavior( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 	m_gotInfo = false;
-	
-	//Added By Sadullah Nader
-	//Initializations 
-	
 	m_heliRallyPoint.zero();
-	
-	//
-
 	m_heliRallyPointExists = FALSE;
 	m_nextHealFrame = FOREVER;
 	setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
@@ -100,7 +88,7 @@ void ParkingPlaceBehavior::buildInfo()
 			{
 				AsciiString tmp;
 				Matrix3D mtx;
-				
+
 				tmp.format("Runway%dPark%dHan",col+1,row+1);
 				getObject()->getSingleLogicalBonePosition(tmp.str(), &info.m_hangarStart, &mtx);
 				info.m_hangarStartOrient = mtx.Get_Z_Rotation();
@@ -137,7 +125,7 @@ void ParkingPlaceBehavior::buildInfo()
 
 			tmp.format("RunwayEnd%d",col+1);
 			getObject()->getSingleLogicalBonePosition(tmp.str(), &info.m_end, NULL);
-			
+
 			info.m_inUseBy = INVALID_ID;
 			info.m_nextInLineForTakeoff = INVALID_ID;
 			info.m_wasInLine = false;
@@ -164,6 +152,7 @@ void ParkingPlaceBehavior::purgeDead()
 				{
 					it->m_objectInSpace = INVALID_ID;
 					it->m_reservedForExit = false;
+					it->m_postponedRunwayReservationForTakeoff = false;
 					if (pu)
 						pu->setHoldDoorOpen(it->m_door, false);
 				}
@@ -214,7 +203,7 @@ void ParkingPlaceBehavior::purgeDead()
 		}
 		if (anythingPurged)
 			resetWakeFrame();
-	}	
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -302,7 +291,7 @@ Bool ParkingPlaceBehavior::hasAvailableSpaceFor(const ThingTemplate* thing) cons
 {
 	if (!m_gotInfo)	// degenerate case, shouldn't happen, but just in case...
 		return false;
-	
+
 	if (thing->isKindOf(KINDOF_PRODUCED_AT_HELIPAD))
 		return true;
 
@@ -350,7 +339,7 @@ Bool ParkingPlaceBehavior::reserveSpace(ObjectID id, Real parkingOffset, Parking
 
 	ppi->m_objectInSpace = id;
 	ppi->m_reservedForExit = false;
-	
+
 	if( d->m_landingDeckHeightOffset )
 	{
 		Object *obj = TheGameLogic->findObjectByID( id );
@@ -360,7 +349,7 @@ Bool ParkingPlaceBehavior::reserveSpace(ObjectID id, Real parkingOffset, Parking
 		}
 	}
 
-	if (info) 
+	if (info)
 	{
 		calcPPInfo( id, info );
 		if (parkingOffset != 0.0f)
@@ -414,9 +403,13 @@ void ParkingPlaceBehavior::calcPPInfo( ObjectID id, PPInfo *info )
 
 		for (std::vector<RunwayInfo>::iterator it = m_runways.begin(); it != m_runways.end(); ++it)
 		{
-			if (it->m_inUseBy == id && it->m_wasInLine)
+			if (it->m_inUseBy == id)
 			{
-				info->runwayStart = info->runwayPrep;
+				if (it->m_wasInLine)
+				{
+					info->runwayStart = info->runwayPrep;
+				}
+				break;
 			}
 		}
 	}
@@ -435,8 +428,10 @@ void ParkingPlaceBehavior::releaseSpace(ObjectID id)
 		{
 			it->m_objectInSpace = INVALID_ID;
 			it->m_reservedForExit = false;
+			it->m_postponedRunwayReservationForTakeoff = false;
 			if (pu)
 				pu->setHoldDoorOpen(it->m_door, false);
+			break;
 		}
 	}
 
@@ -448,6 +443,21 @@ void ParkingPlaceBehavior::releaseSpace(ObjectID id)
 
 }
 
+//-------------------------------------------------------------------------------------------------
+Int ParkingPlaceBehavior::getRunwayIndex(ObjectID id)
+{
+	purgeDead();
+
+	for (std::vector<ParkingPlaceInfo>::iterator it = m_spaces.begin(); it != m_spaces.end(); ++it)
+	{
+		if (it->m_objectInSpace == id)
+		{
+			return it->m_runway;
+		}
+	}
+	return InvalidRunway;
+}
+
 //-------------------------------------------------------------------------------------------------
 ObjectID ParkingPlaceBehavior::getRunwayReservation( Int runway, RunwayReservationType type )
 {
@@ -464,15 +474,42 @@ void ParkingPlaceBehavior::transferRunwayReservationToNextInLineForTakeoff(Objec
 	purgeDead();
 	for (std::vector<RunwayInfo>::iterator it = m_runways.begin(); it != m_runways.end(); ++it)
 	{
-		if (it->m_inUseBy == id && it->m_nextInLineForTakeoff != INVALID_ID)
+		if (it->m_inUseBy == id)
 		{
-			it->m_inUseBy = it->m_nextInLineForTakeoff;
-			it->m_wasInLine = true;
-			it->m_nextInLineForTakeoff = INVALID_ID;
+			if (it->m_nextInLineForTakeoff != INVALID_ID)
+			{
+				it->m_inUseBy = it->m_nextInLineForTakeoff;
+				it->m_wasInLine = true;
+				it->m_nextInLineForTakeoff = INVALID_ID;
+			}
+			break;
 		}
 	}
 }
 
+//-------------------------------------------------------------------------------------------------
+Bool ParkingPlaceBehavior::postponeRunwayReservation(UnsignedInt spaceIndex, Bool forLanding)
+{
+	// TheSuperHackers @tweak Block the first attempt to reserve a runway for 'upper' space indices.
+	// This allows 'lower' space indices to reserve a runway first to ensure deterministic takeoff ordering.
+
+	if (m_spaces.size() > m_runways.size() && spaceIndex >= m_runways.size())
+	{
+		Bool& postponed = m_spaces[spaceIndex].m_postponedRunwayReservationForTakeoff;
+		if (forLanding)
+		{
+			postponed = false;
+		}
+		else if (!postponed)
+		{
+			postponed = true;
+			return true;
+		}
+	}
+
+	return false;
+}
+
 //-------------------------------------------------------------------------------------------------
 Bool ParkingPlaceBehavior::reserveRunway(ObjectID id, Bool forLanding)
 {
@@ -480,11 +517,16 @@ Bool ParkingPlaceBehavior::reserveRunway(ObjectID id, Bool forLanding)
 	purgeDead();
 
 	Int runway = -1;
-	for (std::vector<ParkingPlaceInfo>::iterator it = m_spaces.begin(); it != m_spaces.end(); ++it)
+	for (UnsignedInt i = 0; i < m_spaces.size(); ++i)
 	{
-		if (it->m_objectInSpace == id)
+		if (m_spaces[i].m_objectInSpace == id)
 		{
-			runway = it->m_runway;
+#if !RETAIL_COMPATIBLE_CRC
+			if (postponeRunwayReservation(i, forLanding))
+				return false;
+#endif
+
+			runway = m_spaces[i].m_runway;
 			break;
 		}
 	}
@@ -609,7 +651,7 @@ void ParkingPlaceBehavior::defectAllParkedUnits(Team* newTeam, UnsignedInt detec
 			if (obj == NULL || obj->isEffectivelyDead())
 				continue;
 
-			// srj sez: evil. fix better someday. 
+			// srj sez: evil. fix better someday.
 			static NameKeyType jetKey = TheNameKeyGenerator->nameToKey("JetAIUpdate");
 			JetAIUpdate* ju = (JetAIUpdate *)obj->findUpdateModule(jetKey);
 			Bool takeoffOrLanding = ju ? ju->friend_isTakeoffOrLandingInProgress() : false;
@@ -648,14 +690,14 @@ void ParkingPlaceBehavior::killAllParkedUnits()
 			if (obj == NULL || obj->isEffectivelyDead())
 				continue;
 
-			// srj sez: evil. fix better someday. 
+			// srj sez: evil. fix better someday.
 			static NameKeyType jetKey = TheNameKeyGenerator->nameToKey("JetAIUpdate");
 			JetAIUpdate* ju = (JetAIUpdate *)obj->findUpdateModule(jetKey);
 			Bool takeoffOrLanding = ju ? ju->friend_isTakeoffOrLandingInProgress() : false;
 
 			if (obj->isAboveTerrain() && !takeoffOrLanding)
 				continue;
-		
+
 			obj->kill();
 		}
 	}
@@ -673,7 +715,7 @@ void ParkingPlaceBehavior::onDie( const DamageInfo *damageInfo )
 UpdateSleepTime ParkingPlaceBehavior::update()
 {
 	// alas, we need to keep the buildInfo and dead-purged stuff pretty much up to date, for
-	// the client to be able to peek at. at this late date, the most expedient way is to ensure 
+	// the client to be able to peek at. at this late date, the most expedient way is to ensure
 	// our update is run every frame, and do this manually. the extra cost should be trivial, since
 	// there are generally at most only a few airfields at any given time.
 	buildInfo();
@@ -775,7 +817,7 @@ void ParkingPlaceBehavior::exitObjectViaDoor( Object *newObj, ExitDoorType exitD
 	DUMPCOORD3D(getObject()->getPosition());
 	if (producedAtHelipad)
 	{
-		CRCDEBUG_LOG(("Produced at helipad (door = %d)\n", exitDoor));
+		CRCDEBUG_LOG(("Produced at helipad (door = %d)", exitDoor));
 		DEBUG_ASSERTCRASH(exitDoor == DOOR_NONE_NEEDED, ("Hmm, unlikely"));
 		Matrix3D mtx;
 #ifdef DEBUG_CRASHING
@@ -790,7 +832,7 @@ void ParkingPlaceBehavior::exitObjectViaDoor( Object *newObj, ExitDoorType exitD
 	}
 	else
 	{
-		CRCDEBUG_LOG(("Produced at hangar (door = %d)\n", exitDoor));
+		CRCDEBUG_LOG(("Produced at hangar (door = %d)", exitDoor));
 		DEBUG_ASSERTCRASH(exitDoor != DOOR_NONE_NEEDED, ("Hmm, unlikely"));
 		if (!reserveSpace(newObj->getID(), parkingOffset, &ppinfo)) //&loc, &orient, NULL, NULL, NULL, NULL, &hangarInternal, &hangOrient))
 		{
@@ -831,7 +873,7 @@ void ParkingPlaceBehavior::exitObjectViaDoor( Object *newObj, ExitDoorType exitD
 			}
 			else
 			{
-				// Lorenzen sez: aiMoveToPosition has an added benefit. 
+				// Lorenzen sez: aiMoveToPosition has an added benefit.
 				// It invokes the pathfinder to find a vacant destination.
 	      ai->aiMoveToPosition( &ppinfo.parkingSpace, CMD_FROM_AI );
 			}
@@ -848,14 +890,14 @@ void ParkingPlaceBehavior::unreserveDoorForExit( ExitDoorType exitDoor )
 		{
 			if (it->m_door == exitDoor)
 			{
-				//DEBUG_ASSERTCRASH(it->m_reservedForExit, ("ParkingPlaceBehavior::unreserveDoorForExit: door %d was not reserved\n",exitDoor));
+				//DEBUG_ASSERTCRASH(it->m_reservedForExit, ("ParkingPlaceBehavior::unreserveDoorForExit: door %d was not reserved",exitDoor));
 				it->m_objectInSpace = INVALID_ID;
 				it->m_reservedForExit = false;
 				return;
 			}
 		}
 
-		DEBUG_CRASH(("ParkingPlaceBehavior::unreserveDoorForExit: door %d was not found\n",exitDoor));
+		DEBUG_CRASH(("ParkingPlaceBehavior::unreserveDoorForExit: door %d was not found",exitDoor));
 	}
 }
 
@@ -902,7 +944,7 @@ void ParkingPlaceBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -944,9 +986,9 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 			// reserved for exit
 			xfer->xferBool( &((*it).m_reservedForExit) );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
 		ObjectID objectID;
@@ -972,11 +1014,11 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 				(*it).m_reservedForExit = reservedForExit;
 				++it;
 
-			}  // end if
+			}
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// runways cound and info
 	UnsignedByte runwaysCount = m_runways.size();
@@ -994,9 +1036,9 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 			xfer->xferObjectID( &((*it).m_nextInLineForTakeoff) );
 			xfer->xferBool( &((*it).m_wasInLine) );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
 		// read all elements
@@ -1023,11 +1065,11 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 				(*it).m_wasInLine = wasInLine;
 				++it;
 
-			}  // end if
+			}
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// healees
 	UnsignedByte healCount = m_healing.size();
@@ -1044,9 +1086,9 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 			xfer->xferObjectID( &((*it).m_gettingHealedID) );
 			xfer->xferUnsignedInt( &((*it).m_healStartFrame) );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else if( xfer->getXferMode() == XFER_LOAD )
 	{
 		// read all elements
@@ -1060,9 +1102,9 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 			xfer->xferUnsignedInt( &info.m_healStartFrame );
 			m_healing.push_back(info);
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	if (version >= 2)
 	{
@@ -1083,7 +1125,7 @@ void ParkingPlaceBehavior::xfer( Xfer *xfer )
 		}
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1096,6 +1138,6 @@ void ParkingPlaceBehavior::loadPostProcess( void )
 
 	// no, this is bad.. it is NOT SAFE to call setWakeFrame from the xfer system. crap. (srj)
 	// make sure we are awake... old save games let us sleep
-	//setWakeFrame(getObject(), UPDATE_SLEEP_NONE); 
+	//setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp
index 8dcfa01097c..3c32fe58a78 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
 #include "GameLogic/Module/PoisonedBehavior.h"
@@ -37,11 +37,6 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Object.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // tinting is all handled in drawable, now, Graham look near the bottom of Drawable::UpdateDrawable()
 //static const RGBColor poisonedTint = {0.0f, 1.0f, 0.0f};
@@ -54,10 +49,10 @@ PoisonedBehaviorModuleData::PoisonedBehaviorModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void PoisonedBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void PoisonedBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "PoisonDamageInterval", INI::parseDurationUnsignedInt, NULL, offsetof(PoisonedBehaviorModuleData, m_poisonDamageIntervalData) },
 		{ "PoisonDuration", INI::parseDurationUnsignedInt, NULL, offsetof(PoisonedBehaviorModuleData, m_poisonDurationData) },
@@ -75,6 +70,7 @@ PoisonedBehavior::PoisonedBehavior( Thing *thing, const ModuleData* moduleData )
 	m_poisonDamageFrame = 0;
 	m_poisonOverallStopFrame = 0;
 	m_poisonDamageAmount = 0.0f;
+	m_poisonSource = INVALID_ID;
 	m_deathType = DEATH_POISONED;
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 }
@@ -122,7 +118,7 @@ UpdateSleepTime PoisonedBehavior::update()
 		// If it is time to do damage, then do it and reset the damage timer
 		DamageInfo damage;
 		damage.in.m_amount = m_poisonDamageAmount;
-		damage.in.m_sourceID = INVALID_ID;
+		damage.in.m_sourceID = m_poisonSource;
 		damage.in.m_damageType = DAMAGE_UNRESISTABLE; // Not poison, as that will infect us again
 		damage.in.m_damageFXOverride = DAMAGE_POISON; // but this will ensure that the right effect is played
 		damage.in.m_deathType = m_deathType;
@@ -131,9 +127,9 @@ UpdateSleepTime PoisonedBehavior::update()
 		m_poisonDamageFrame = now + d->m_poisonDamageIntervalData;
 	}
 
-	// If we are now at zero we need to turn off our special effects... 
+	// If we are now at zero we need to turn off our special effects...
 	// unless the poison killed us, then we continue to be a pulsating toxic pus ball
-	if( m_poisonOverallStopFrame != 0 && 
+	if( m_poisonOverallStopFrame != 0 &&
 			now >= m_poisonOverallStopFrame &&
 			!getObject()->isEffectivelyDead())
 	{
@@ -147,7 +143,7 @@ UpdateSleepTime PoisonedBehavior::update()
 // ------------------------------------------------------------------------------------------------
 UpdateSleepTime PoisonedBehavior::calcSleepTime()
 {
-	// UPDATE_SLEEP requires a count-of-frames, not an absolute-frame, so subtract 'now' 
+	// UPDATE_SLEEP requires a count-of-frames, not an absolute-frame, so subtract 'now'
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (m_poisonOverallStopFrame == 0 || m_poisonOverallStopFrame == now)
 		return UPDATE_SLEEP_FOREVER;
@@ -163,7 +159,11 @@ void PoisonedBehavior::startPoisonedEffects( const DamageInfo *damageInfo )
 
 	// We are going to take the damage dealt by the original poisoner every so often for a while.
 	m_poisonDamageAmount = damageInfo->out.m_actualDamageDealt;
-	
+#if !RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix Stubbjax 03/09/2025 Allow poison damage to award xp to the poison source.
+	m_poisonSource = damageInfo->in.m_sourceID;
+#endif
+
 	m_poisonOverallStopFrame = now + d->m_poisonDurationData;
 
 	// If we are getting re-poisoned, don't reset the damage counter if running, but do set it if unset
@@ -188,6 +188,7 @@ void PoisonedBehavior::stopPoisonedEffects()
 	m_poisonDamageFrame = 0;
 	m_poisonOverallStopFrame = 0;
 	m_poisonDamageAmount = 0.0f;
+	m_poisonSource = INVALID_ID;
 
 	Drawable *myDrawable = getObject()->getDrawable();
 	if( myDrawable )
@@ -203,7 +204,7 @@ void PoisonedBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -213,8 +214,12 @@ void PoisonedBehavior::crc( Xfer *xfer )
 void PoisonedBehavior::xfer( Xfer *xfer )
 {
 
-	// version 
+	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
 	const XferVersion currentVersion = 2;
+#else
+	const XferVersion currentVersion = 3;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
@@ -235,7 +240,13 @@ void PoisonedBehavior::xfer( Xfer *xfer )
 		xfer->xferUser(&m_deathType, sizeof(m_deathType));
 	}
 
-}  // end xfer
+#if !RETAIL_COMPATIBLE_XFER_SAVE
+	if (version >= 3)
+	{
+		xfer->xferObjectID(&m_poisonSource);
+	}
+#endif
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -246,4 +257,4 @@ void PoisonedBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PrisonBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PrisonBehavior.cpp
index 59f36177b3b..47b95ce8dd6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PrisonBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PrisonBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameState.h"
 #include "Common/Player.h"
 #include "Common/RandomValue.h"
@@ -74,14 +74,14 @@ PrisonVisual::PrisonVisual( void )
 	m_drawableID = INVALID_DRAWABLE_ID;
 	m_next = NULL;
 
-}  // end PrisonVisual
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 PrisonVisual::~PrisonVisual( void )
 {
 
-}  // end ~PrisonVisual
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -94,7 +94,7 @@ PrisonBehaviorModuleData::PrisonBehaviorModuleData( void )
 
 	m_showPrisoners = FALSE;
 
-}  // end PrisonBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -102,10 +102,10 @@ PrisonBehaviorModuleData::PrisonBehaviorModuleData( void )
 {
   OpenContainModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
-		{ "ShowPrisoners",	INI::parseBool,					NULL,		offsetof( PrisonBehaviorModuleData, m_showPrisoners ) },		
+		{ "ShowPrisoners",	INI::parseBool,					NULL,		offsetof( PrisonBehaviorModuleData, m_showPrisoners ) },
 		{ "YardBonePrefix",	INI::parseAsciiString,	NULL,		offsetof( PrisonBehaviorModuleData, m_prisonYardBonePrefix ) },
 		{ 0, 0, 0, 0 }
 
@@ -113,7 +113,7 @@ PrisonBehaviorModuleData::PrisonBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -127,14 +127,14 @@ PrisonBehavior::PrisonBehavior( Thing *thing, const ModuleData *moduleData )
 
 	m_visualList = NULL;
 
-}  // end PrisonBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 PrisonBehavior::~PrisonBehavior( void )
 {
 
-}  // end ~PrisonBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -160,9 +160,9 @@ void PrisonBehavior::onDelete( void )
 		deleteInstance(m_visualList);
 		m_visualList = visual;
 
-	}  // end while
+	}
 
-}  // end onDelete
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -180,7 +180,7 @@ void PrisonBehavior::onContaining( Object *obj, Bool wasSelected )
 	if( modData->m_showPrisoners )
 		addVisual( obj );
 
-}  // end onContaining
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -198,7 +198,7 @@ void PrisonBehavior::onRemoving( Object *obj )
 	// extend functionality
 	OpenContain::onRemoving( obj );
 
-}  // end onRemoving
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
@@ -227,9 +227,9 @@ void PrisonBehavior::pickVisualLocation( Coord3D *pos )
 																									 MAX_YARD_BONES,
 																									 yardPositions,
 																									 NULL );
-	
+
 	//
-	// we must have at least 3 bone locations to make a yard polygon, otherwise we'll 
+	// we must have at least 3 bone locations to make a yard polygon, otherwise we'll
 	// default to the object position
 	//
 	if( yardBones >= 3 )
@@ -253,7 +253,7 @@ void PrisonBehavior::pickVisualLocation( Coord3D *pos )
 			if( yardPositions[ i ].y > yardRegion.hi.y )
 				yardRegion.hi.y = yardPositions[ i ].y;
 
-		}  // end for i
+		}
 
 		//
 		// now that we have a yard region, the default visual position will be in the middle
@@ -282,16 +282,16 @@ void PrisonBehavior::pickVisualLocation( Coord3D *pos )
 				pickedLocation = loc;
 				break;  // exit for i
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 
 	// return the location picked
 	*pos = pickedLocation;
 
-}  // end pickVisualLocation
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add prisoner visual to the prison yard */
@@ -329,7 +329,7 @@ void PrisonBehavior::addVisual( Object *obj )
 	visual->m_next = m_visualList;
 	m_visualList = visual;
 
-}  // end addVisual
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove prisoner visual from the prison yard */
@@ -367,19 +367,19 @@ void PrisonBehavior::removeVisual( Object *obj )
 
 			break;  // exit for
 
-		}  // end if
+		}
 
 		// keep a pointer to the previous element
 		prevVisual = visual;
 
-	}  // end for
+	}
 
 	// find the drawable visual and destroy it
 	Drawable *draw = TheGameClient->findDrawableByID( drawableID );
 	if( draw )
 		TheGameClient->destroyDrawable( draw );
 
-}  // end removeVisual
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -390,7 +390,7 @@ void PrisonBehavior::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -427,9 +427,9 @@ void PrisonBehavior::xfer( Xfer *xfer )
 			// drawable id
 			xfer->xferDrawableID( &visual->m_drawableID );
 
-		}  // end for, visual
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -437,10 +437,10 @@ void PrisonBehavior::xfer( Xfer *xfer )
 		if( m_visualList != NULL )
 		{
 
-			DEBUG_CRASH(( "PrisonBehavior::xfer - the visual list should be empty but is not\n" ));
+			DEBUG_CRASH(( "PrisonBehavior::xfer - the visual list should be empty but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each item
 		for( UnsignedShort i = 0; i < visualCount; ++i )
@@ -457,11 +457,11 @@ void PrisonBehavior::xfer( Xfer *xfer )
 			// read drawable id
 			xfer->xferDrawableID( &visual->m_drawableID );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -472,7 +472,7 @@ void PrisonBehavior::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 #endif
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaCenterBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaCenterBehavior.cpp
index d29147d3d0e..a2f1f509dff 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaCenterBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaCenterBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
@@ -51,7 +51,7 @@ PropagandaCenterBehaviorModuleData::PropagandaCenterBehaviorModuleData( void )
 
 	m_brainwashDuration = 0;
 
-}  // end PropagandaCenterBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -59,9 +59,9 @@ PropagandaCenterBehaviorModuleData::PropagandaCenterBehaviorModuleData( void )
 {
   PrisonBehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
-		
+
 		{	"BrainwashDuration", INI::parseDurationUnsignedInt, NULL, offsetof( PropagandaCenterBehaviorModuleData, m_brainwashDuration ) },
 		{ 0, 0, 0, 0 }
 
@@ -69,7 +69,7 @@ PropagandaCenterBehaviorModuleData::PropagandaCenterBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -84,14 +84,14 @@ PropagandaCenterBehavior::PropagandaCenterBehavior( Thing *thing, const ModuleDa
 	m_brainwashingSubjectID = INVALID_ID;
 	m_brainwashingSubjectStartFrame = 0;
 
-}  // end PropagandaCenterBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 PropagandaCenterBehavior::~PropagandaCenterBehavior( void )
 {
 
-}  // end ~PropagandaCenterBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -105,8 +105,8 @@ void PropagandaCenterBehavior::onDelete( void )
 	// go through our list of brainwashed objects, and if they are still under our
 	// control, return them to their original owners
 	//
-	for( BrainwashedIDListContIterator it = m_brainwashedList.begin(); 
-			 it != m_brainwashedList.end(); 
+	for( BrainwashedIDListContIterator it = m_brainwashedList.begin();
+			 it != m_brainwashedList.end();
 			 ++it )
 	{
 		Object *obj;
@@ -119,14 +119,14 @@ void PropagandaCenterBehavior::onDelete( void )
 			// return this object under the control of the original owner
 			obj->restoreOriginalTeam();
 
-		}  // end if
-		
-	}  // end for
-	
+		}
+
+	}
+
 	// clear the list
 	m_brainwashedList.clear();
 
-}  // end onDelete
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -157,7 +157,7 @@ UpdateSleepTime PropagandaCenterBehavior::update( void )
 
 					// place this object under the control of the player
 					Player *player = us->getControllingPlayer();
-					DEBUG_ASSERTCRASH( player, ("Brainwashing: No controlling player for '%s'\n", us->getTemplate()->getName().str()) );
+					DEBUG_ASSERTCRASH( player, ("Brainwashing: No controlling player for '%s'", us->getTemplate()->getName().str()) );
 					if( player )
 						brainwashingSubject->setTemporaryTeam( player->getDefaultTeam() );
 
@@ -178,13 +178,13 @@ UpdateSleepTime PropagandaCenterBehavior::update( void )
 					// exit the prison
 					exitObjectViaDoor( brainwashingSubject, exitDoor );
 
-				}  // end if
-						
-			}  // end if
+				}
 
-		}  // end if, 
+			}
 
-	}  // end if
+		}
+
+	}
 
 	// if we have no brainwashing subject, hook one up if we have people inside us
 	if( m_brainwashingSubjectID == INVALID_ID )
@@ -202,14 +202,14 @@ UpdateSleepTime PropagandaCenterBehavior::update( void )
 				m_brainwashingSubjectID = obj->getID();
 				m_brainwashingSubjectStartFrame = TheGameLogic->getFrame();
 
-			}  // end if
- 
-		}  // end if
+			}
+
+		}
 
-	}  // end if
+	}
 
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -223,12 +223,12 @@ void PropagandaCenterBehavior::onRemoving( Object *obj )
 		m_brainwashingSubjectID = INVALID_ID;
 		m_brainwashingSubjectStartFrame = 0;
 
-	}  // end if
+	}
 
 	// extend functionality
 	PrisonBehavior::onRemoving( obj );
 
-}  // end onRemoving
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -239,7 +239,7 @@ void PropagandaCenterBehavior::crc( Xfer *xfer )
 	// extend base class
 	PrisonBehavior::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -266,7 +266,7 @@ void PropagandaCenterBehavior::xfer( Xfer *xfer )
 	// brainwashed list size and data
 	xfer->xferSTLObjectIDList( &m_brainwashedList );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -277,6 +277,6 @@ void PropagandaCenterBehavior::loadPostProcess( void )
 	// extend base class
 	PrisonBehavior::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 #endif
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
index 2965a676923..0283d17197f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
@@ -30,6 +30,7 @@
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "PreRTS.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Upgrade.h"
@@ -40,15 +41,11 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/Weapon.h"
+#include "GameLogic/Module/ContainModule.h"
 #include "GameLogic/Module/PropagandaTowerBehavior.h"
 #include "GameLogic/Module/BodyModule.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
@@ -90,7 +87,7 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void )
 	m_upgradedPulseFX = NULL;
 	m_affectsSelf = FALSE;
 
-}  // end PropagandaTowerBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -98,7 +95,7 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void )
 {
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Radius",									INI::parseReal,									NULL,	offsetof( PropagandaTowerBehaviorModuleData, m_scanRadius ) },
 		{ "DelayBetweenUpdates",		INI::parseDurationUnsignedInt,	NULL,	offsetof( PropagandaTowerBehaviorModuleData, m_scanDelayInFrames ) },
@@ -113,7 +110,7 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -124,21 +121,18 @@ PropagandaTowerBehaviorModuleData::PropagandaTowerBehaviorModuleData( void )
 PropagandaTowerBehavior::PropagandaTowerBehavior( Thing *thing, const ModuleData *modData )
 											 : UpdateModule( thing, modData )
 {
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_lastScanFrame = 0;
-	//
 	m_insideList = NULL;
 	setWakeFrame( getObject(), UPDATE_SLEEP_NONE );
 
-}  // end PropagandaTowerBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 PropagandaTowerBehavior::~PropagandaTowerBehavior( void )
 {
 
-}  // end ~PropagandaTowerBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Module is being deleted */
@@ -149,7 +143,7 @@ void PropagandaTowerBehavior::onDelete( void )
 	// remove any benefits from anybody in our area of influence
 	removeAllInfluence();
 
-}  // end onDelete
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Resolve */
@@ -161,12 +155,12 @@ void PropagandaTowerBehavior::onObjectCreated( void )
 	// convert module upgrade name to a pointer
 	m_upgradeRequired = TheUpgradeCenter->findUpgrade( modData->m_upgradeRequired );
 
-}  // end onObjectCreated
+}
 
 // ------------------------------------------------------------------------------------------------
 void PropagandaTowerBehavior::onCapture( Player *oldOwner, Player *newOwner )
 {
-	// We don't function for the neutral player.  
+	// We don't function for the neutral player.
 	if( newOwner == ThePlayerList->getNeutralPlayer() )
 	{
 		removeAllInfluence();
@@ -183,7 +177,7 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 {
 /// @todo srj use SLEEPY_UPDATE here
 	const PropagandaTowerBehaviorModuleData *modData = getPropagandaTowerBehaviorModuleData();
-	
+
 	//Sep 27, 2002 (Kris): Added this code to prevent the tower from working while under construction.
 	Object *self = getObject();
 	if( self->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
@@ -197,7 +191,7 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 
 	if( self->isEffectivelyDead() )
 		return UPDATE_SLEEP_FOREVER;
-	
+
 	if( self->isDisabled() )
 	{
 		// We need to let go of everyone if we are EMPd or underpowered or yadda, but not if we are only held
@@ -211,16 +205,18 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 			return UPDATE_SLEEP_NONE;
 		}
 	}
-	
-	if( self->getContainedBy()  &&  self->getContainedBy()->getContainedBy() )
+
+#if RETAIL_COMPATIBLE_CRC
+	if (self->getContainedBy() && self->getContainedBy()->getContainedBy())
+#else
+	// TheSuperHackers @bugfix If our container or any parent containers are enclosing, we turn the heck off.
+	if (self->getEnclosingContainedBy())
+#endif
 	{
-		// If our container is contained, we turn the heck off.  Seems like a weird specific check, but all of 
-		// attacking is guarded by the same check in isPassengersAllowedToFire.  We similarly work in a container,
-		// but not in a double container.
 		removeAllInfluence();
 		return UPDATE_SLEEP_NONE;
 	}
-	
+
 	// if it's not time to scan, nothing to do
 	UnsignedInt currentFrame = TheGameLogic->getFrame();
 	if( currentFrame - m_lastScanFrame >= modData->m_scanDelayInFrames )
@@ -230,14 +226,14 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 		doScan();
 		m_lastScanFrame = currentFrame;
 
-	}  // end if
+	}
 
 	// go through any objects in our area of influence and do the effect logic on them
 	Object *obj;
 	ObjectTracker *curr = NULL, *prev = NULL, *next = NULL;
 	for( curr = m_insideList; curr; curr = next )
 	{
-		
+
 		// get the next link
 		next = curr->next;
 
@@ -253,7 +249,7 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 			// record this element as the previous one found in the list
 			prev = curr;
 
-		}  // end if
+		}
 		else
 		{
 
@@ -266,14 +262,14 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 			else
 				m_insideList = curr->next;
 			deleteInstance(curr);
-				
-		}  // end else
 
-	}  // end for, curr
+		}
+
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** The death callback */
@@ -284,7 +280,7 @@ void PropagandaTowerBehavior::onDie( const DamageInfo *damageInfo )
 	// remove any benefits from anybody in our area of influence
 	removeAllInfluence();
 
-}  // end onDie
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -313,7 +309,7 @@ void PropagandaTowerBehavior::effectLogic( Object *obj, Bool giving,
 					obj->setWeaponBonusCondition( WEAPONBONUSCONDITION_SUBLIMINAL );
 			}
 
-		} // hasdamageweapon
+		}
 
 
 		// grant health to this object as well
@@ -330,15 +326,15 @@ void PropagandaTowerBehavior::effectLogic( Object *obj, Bool giving,
 
 	// Dustin wants the healing effect not to stack from multiple propaganda towers...
 	// To accomplish this, I'll give every object a single healing-sender (ID)
-	// Any given healing recipient (object) can only receive healing from one particular healing sender 
+	// Any given healing recipient (object) can only receive healing from one particular healing sender
 	// and cannot change healing senders until the previous one expires (its scandelay)
 
-//		obj->attemptHealing(amount, getObject()); // the regular way to give healing... 
+//		obj->attemptHealing(amount, getObject()); // the regular way to give healing...
 			obj->attemptHealingFromSoleBenefactor( amount, getObject(), modData->m_scanDelayInFrames );//the non-stacking way
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 
@@ -346,9 +342,9 @@ void PropagandaTowerBehavior::effectLogic( Object *obj, Bool giving,
 		obj->clearWeaponBonusCondition( WEAPONBONUSCONDITION_ENTHUSIASTIC );
 		obj->clearWeaponBonusCondition( WEAPONBONUSCONDITION_SUBLIMINAL );
 
-	}	  // end else
+	}
 
-}  // end effectLogic
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove all influence from objects we've given bonuses to */
@@ -361,12 +357,12 @@ void PropagandaTowerBehavior::removeAllInfluence( void )
 	Object *obj;
 	for( o = m_insideList; o; o = o->next )
 	{
-		
+
 		obj = TheGameLogic->findObjectByID( o->objectID );
 		if( obj )
 			effectLogic( obj, FALSE, getPropagandaTowerBehaviorModuleData() );
 
-	}  // end for
+	}
 
 	// delete the list of objects under our influence
 	while( m_insideList )
@@ -376,9 +372,9 @@ void PropagandaTowerBehavior::removeAllInfluence( void )
 		deleteInstance(m_insideList);
 		m_insideList = o;
 
-	}  // end while
+	}
 
-}  // end removeAllInfluence
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do a scan */
@@ -406,38 +402,38 @@ void PropagandaTowerBehavior::doScan( void )
 				upgradePresent = player->hasUpgradeComplete( m_upgradeRequired );
 				break;
 
-			}  // end player upgrade
+			}
 
 			// ------------------------------------------------------------------------------------------
 			case UPGRADE_TYPE_OBJECT:
 			{
-				
-				upgradePresent = us->hasUpgrade( m_upgradeRequired );				
+
+				upgradePresent = us->hasUpgrade( m_upgradeRequired );
 				break;
 
-			}  // end object upgrade
+			}
 
 			// ------------------------------------------------------------------------------------------
 			default:
 			{
 
-				DEBUG_CRASH(( "PropagandaTowerBehavior::doScan - Unknown upgrade type '%d'\n",
+				DEBUG_CRASH(( "PropagandaTowerBehavior::doScan - Unknown upgrade type '%d'",
 											m_upgradeRequired->getUpgradeType() ));
 				break;
 
-			}  // end default
+			}
 
-		}  // end switch
+		}
 
-	}  // end if
+	}
 
 
   Bool doFX = TRUE;
-    // if it is us, or if it is he and we do see him 
+    // if it is us, or if it is he and we do see him
   Object *overlord = us->getContainedBy();
   if ( overlord )
   {
-	  if ( us->getControllingPlayer() != ThePlayerList->getLocalPlayer() )// daling with someone else's tower
+	  if ( us->getControllingPlayer() != rts::getObservedOrLocalPlayer() )// dealing with someone else's tower
     {
       if ( overlord->testStatus( OBJECT_STATUS_STEALTHED ) && !overlord->testStatus( OBJECT_STATUS_DETECTED ) )
         doFX = FALSE;// so they don't give up their position
@@ -462,12 +458,12 @@ void PropagandaTowerBehavior::doScan( void )
       return; // proptowers that are riding ON things that are in-turn riding IN things cannot do their scan!
 
   }
-	
-	if ( us->getControllingPlayer() != ThePlayerList->getLocalPlayer() )// daling with someone else's tower
+
+	if ( us->getControllingPlayer() != rts::getObservedOrLocalPlayer() )// dealing with someone else's tower
 	{
 		if ( us->testStatus( OBJECT_STATUS_STEALTHED ) && !us->testStatus( OBJECT_STATUS_DETECTED ) )
 		{
-			doFX = FALSE;// Certainly don't play if we ourselves are stelthed.
+			doFX = FALSE;// Certainly don't play if we ourselves are stealthed.
 		}
 	}
 
@@ -485,17 +481,17 @@ void PropagandaTowerBehavior::doScan( void )
 	PartitionFilterAlive filterAlive;
 	PartitionFilterSameMapStatus filterMapStatus(us);
 	PartitionFilterAcceptByKindOf filterOutBuildings(KINDOFMASK_NONE, MAKE_KINDOF_MASK(KINDOF_STRUCTURE));
-	PartitionFilter *filters[] = {	&relationship, 
-																	&filterAlive, 
-																	&filterMapStatus, 
-																	&filterOutBuildings, 
-																	NULL 
+	PartitionFilter *filters[] = {	&relationship,
+																	&filterAlive,
+																	&filterMapStatus,
+																	&filterOutBuildings,
+																	NULL
 																};
 
 	// scan objects in our region
 	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( us->getPosition(),
 																																		 modData->m_scanRadius,
-																																		 FROM_CENTER_2D, 
+																																		 FROM_CENTER_2D,
 																																		 filters );
 	MemoryPoolObjectHolder hold( iter );
 	Object *obj;
@@ -513,7 +509,7 @@ void PropagandaTowerBehavior::doScan( void )
 		newEntry->next = newInsideList;
 		newInsideList = newEntry;
 
-	}  // end for obj
+	}
 
 	//
 	// now that we have a list of objects that are in our area of influence, look through
@@ -523,7 +519,7 @@ void PropagandaTowerBehavior::doScan( void )
 	//
 	for( ObjectTracker *curr = m_insideList; curr; curr = curr->next )
 	{
-	
+
 		// find this entry in the new list
 		ObjectTracker *o = NULL;
 		for( o = newInsideList; o; o = o->next )
@@ -538,10 +534,10 @@ void PropagandaTowerBehavior::doScan( void )
 			if( obj )
 				effectLogic( obj, FALSE, modData );
 
-		}  // end if
+		}
+
+	}
 
-	}  // end for
-		
 	// delete the inside list we have recoreded
 	ObjectTracker *next;
 	while( m_insideList )
@@ -551,12 +547,12 @@ void PropagandaTowerBehavior::doScan( void )
 		deleteInstance(m_insideList);
 		m_insideList = next;
 
-	}  // end while
+	}
 
 	// set the new inside list to the one we're recording
 	m_insideList = newInsideList;
 
-}  // end doScan
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -567,7 +563,7 @@ void PropagandaTowerBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -604,9 +600,9 @@ void PropagandaTowerBehavior::xfer( Xfer *xfer )
 			// object id
 			xfer->xferObjectID( &trackerEntry->objectID );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -614,10 +610,10 @@ void PropagandaTowerBehavior::xfer( Xfer *xfer )
 		if( m_insideList != NULL )
 		{
 
-			DEBUG_CRASH(( "PropagandaTowerBehavior::xfer - m_insideList should be empty but is not\n" ));
+			DEBUG_CRASH(( "PropagandaTowerBehavior::xfer - m_insideList should be empty but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read all entries
 		for( UnsignedShort i = 0; i < insideCount; ++i )
@@ -631,11 +627,11 @@ void PropagandaTowerBehavior::xfer( Xfer *xfer )
 			// read object id
 			xfer->xferObjectID( &trackerEntry->objectID );
 
-		}  // end for i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -646,4 +642,4 @@ void PropagandaTowerBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/RebuildHoleBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/RebuildHoleBehavior.cpp
index 4c2129e5e56..13ea128aa94 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/RebuildHoleBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/RebuildHoleBehavior.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameState.h"
 #include "Common/ThingFactory.h"
 #include "Common/ThingTemplate.h"
@@ -42,11 +42,6 @@
 #include "GameLogic/Module/RebuildHoleBehavior.h"
 #include "GameLogic/Module/StickyBombUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -56,16 +51,16 @@ RebuildHoleBehaviorModuleData::RebuildHoleBehaviorModuleData( void )
 	m_workerRespawnDelay = 0.0f;
 	m_holeHealthRegenPercentPerSecond = 0.1f;
 
-}  // end RebuildHoleBehaviorModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void RebuildHoleBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p ) 
+/*static*/ void RebuildHoleBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
 
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 	  { "WorkerObjectName", INI::parseAsciiString, NULL, offsetof( RebuildHoleBehaviorModuleData, m_workerTemplateName ) },
 		{ "WorkerRespawnDelay", INI::parseDurationReal,	NULL, offsetof( RebuildHoleBehaviorModuleData, m_workerRespawnDelay ) },
@@ -75,7 +70,7 @@ RebuildHoleBehaviorModuleData::RebuildHoleBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -83,7 +78,7 @@ RebuildHoleBehaviorModuleData::RebuildHoleBehaviorModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-RebuildHoleBehavior::RebuildHoleBehavior( Thing *thing, const ModuleData* moduleData ) 
+RebuildHoleBehavior::RebuildHoleBehavior( Thing *thing, const ModuleData* moduleData )
 									 : UpdateModule( thing, moduleData )
 {
 
@@ -94,7 +89,7 @@ RebuildHoleBehavior::RebuildHoleBehavior( Thing *thing, const ModuleData* module
 	m_workerTemplate = NULL;
 	m_rebuildTemplate = NULL;
 
-}  // end RebuildHoleBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -112,7 +107,7 @@ RebuildHoleBehavior::~RebuildHoleBehavior( void )
 		}
 	}
 
-}  // end ~RebuildHoleBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 /** we need to start all the timers and ID ties to make a new worker at the correct time */
@@ -128,7 +123,7 @@ void RebuildHoleBehavior::newWorkerRespawnProcess( Object *existingWorker )
 		TheGameLogic->destroyObject( existingWorker );
 	}
 	m_workerID = INVALID_ID;
-	
+
 	// set the timer for the next worker respawn
 	m_workerWaitCounter = modData->m_workerRespawnDelay;
 
@@ -140,8 +135,8 @@ void RebuildHoleBehavior::newWorkerRespawnProcess( Object *existingWorker )
 	// "focus" of this small area again
 	//
 	getObject()->maskObject( FALSE );
-			
-}  // end newWorkerRespawnProcess
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -149,7 +144,7 @@ void RebuildHoleBehavior::startRebuildProcess( const ThingTemplate *rebuild, Obj
 {
 
 	// save what we're gonna do
-	m_rebuildTemplate = rebuild; 
+	m_rebuildTemplate = rebuild;
 
 	// store the object that spawned this hole (even though it's likely being destroyed)
 	m_spawnerObjectID = spawnerID;
@@ -158,7 +153,7 @@ void RebuildHoleBehavior::startRebuildProcess( const ThingTemplate *rebuild, Obj
 	Object *worker = TheGameLogic->findObjectByID(m_workerID);
 	newWorkerRespawnProcess( worker ); //Kill the worker if we have one.
 
-} /// end startRebuildProcess
+}
 
 
 //----------------------------------------------------------------------------------------------
@@ -203,7 +198,7 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 		if( worker == NULL )
 			newWorkerRespawnProcess( NULL );
 
-	}  // end if
+	}
 
 	// if we have a reconstructing object built, get the actual object pointer
 	if( m_reconstructingID != 0 )
@@ -220,9 +215,9 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 		{
 			newWorkerRespawnProcess( worker );
 			m_reconstructingID = INVALID_ID;
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// see if it's time for us to spawn a worker
 	if( worker == NULL && m_workerWaitCounter > 0 )
@@ -256,14 +251,14 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 				{
 
 					if( reconstructing == NULL )
-						reconstructing = ai->construct( m_rebuildTemplate, 
-																						hole->getPosition(), 
-																						hole->getOrientation(), 
+						reconstructing = ai->construct( m_rebuildTemplate,
+																						hole->getPosition(),
+																						hole->getOrientation(),
 																						hole->getControllingPlayer(),
 																						TRUE );
 					else
 						ai->aiResumeConstruction( reconstructing, CMD_FROM_AI );
-					
+
 					for ( Object *obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() )
 					{
 						// Just like the building transfers attackers to the hole when it creates us, we need to transfer
@@ -274,11 +269,11 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 
 						ai->transferAttack(hole->getID(), reconstructing->getID());
 					}
-											
+
 					// save the id of what we are reconstructing
 					m_reconstructingID = reconstructing->getID();
 
-					//Kris: Hacking the building to set the hole as the producer... so if the site dies, we 
+					//Kris: Hacking the building to set the hole as the producer... so if the site dies, we
 					//can transfer the attack back to the hole. The object has OBJECT_STATUS_RECONSTRUCTING
 					//which we check when the object dies.
 					reconstructing->setProducer( hole );
@@ -294,14 +289,14 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 					hole->maskObject( TRUE );
 
 					transferBombs( reconstructing );
-					
-				}  // end if
 
-			}  // end if, worker
+				}
 
-		}  // end if, time to spawn a worker
+			}
+
+		}
 
-	}  // end if, check for working respawn
+	}
 
 	// holes get auto-healed when they're sittin around
 	BodyModuleInterface *body = hole->getBodyModule();
@@ -310,14 +305,14 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 		DamageInfo healingInfo;
 
 		// do some healing
-		healingInfo.in.m_amount = (modData->m_holeHealthRegenPercentPerSecond / LOGICFRAMES_PER_SECOND) * 
+		healingInfo.in.m_amount = (modData->m_holeHealthRegenPercentPerSecond / LOGICFRAMES_PER_SECOND) *
 															body->getMaxHealth();
 		healingInfo.in.m_sourceID = hole->getID();
 		healingInfo.in.m_damageType = DAMAGE_HEALING;
 		healingInfo.in.m_deathType = DEATH_NONE;
 		body->attemptHealing( &healingInfo );
 
-	}  // end if
+	}
 
 	// when re-construction is complete, we remove this hole and worker
 	if( reconstructing && !reconstructing->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
@@ -331,12 +326,12 @@ UpdateSleepTime RebuildHoleBehavior::update( void )
 
 		// make the hole go away
 		TheGameLogic->destroyObject( hole );
-		
-	}  // end if
+
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -344,7 +339,7 @@ void RebuildHoleBehavior::onDie( const DamageInfo *damageInfo )
 {
 	if( m_workerID != INVALID_ID )
 	{
-		// Our rebuilding building and us the hole can be killed in the same frame, which means we may not have 
+		// Our rebuilding building and us the hole can be killed in the same frame, which means we may not have
 		// deleted our generated worker since we do that in our update.
 		Object *worker = TheGameLogic->findObjectByID(m_workerID);
 		if( worker )
@@ -359,7 +354,7 @@ void RebuildHoleBehavior::onDie( const DamageInfo *damageInfo )
 	// destroy us
 	TheGameLogic->destroyObject( obj );
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Helper method to get interface given an object */
@@ -378,13 +373,13 @@ void RebuildHoleBehavior::onDie( const DamageInfo *damageInfo )
 			if( rhbi )
 				break;  // exit for
 
-		}  // end for i
+		}
 
-	}  // end if, obj
+	}
 
 	return rhbi;
 
-}  // end getRebuildHoleBehaviorInterfaceFromObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -395,7 +390,7 @@ void RebuildHoleBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -440,17 +435,17 @@ void RebuildHoleBehavior::xfer( Xfer *xfer )
 			if( m_workerTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "RebuildHoleBehavior::xfer - Unable to find template '%s'\n",
+				DEBUG_CRASH(( "RebuildHoleBehavior::xfer - Unable to find template '%s'",
 											workerName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else
 			m_workerTemplate = NULL;
 
-	}  // end if
+	}
 
 	// rebuild template
 	AsciiString rebuildName = m_rebuildTemplate ? m_rebuildTemplate->getName() : AsciiString::TheEmptyString;
@@ -465,19 +460,19 @@ void RebuildHoleBehavior::xfer( Xfer *xfer )
 			if( m_rebuildTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "RebuildHoleBehavior::xfer - Unable to find template '%s'\n",
+				DEBUG_CRASH(( "RebuildHoleBehavior::xfer - Unable to find template '%s'",
 											rebuildName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else
 			m_rebuildTemplate = NULL;
 
-	}  // end if
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -488,4 +483,4 @@ void RebuildHoleBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp
index 144afc9480f..47832bfadc5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp
@@ -24,12 +24,12 @@
 
 // FILE: SlowDeathBehavior.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_SLOWDEATHPHASE_NAMES
 #include "Common/GameLOD.h"
 #include "Common/INI.h"
@@ -49,13 +49,7 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ObjectCreationList.h"
 #include "GameLogic/Weapon.h"
-#include "GameClient/Drawable.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 const Real BEGIN_MIDPOINT_RATIO = 0.35f;
 const Real END_MIDPOINT_RATIO = 0.65f;
@@ -125,11 +119,11 @@ static void parseWeapon( INI* ini, void *instance, void * /*store*/, const void*
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void SlowDeathBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void SlowDeathBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SinkRate",													INI::parseVelocityReal,						NULL, offsetof( SlowDeathBehaviorModuleData, m_sinkRate ) },
 		{ "ProbabilityModifier",							INI::parseInt,										NULL, offsetof( SlowDeathBehaviorModuleData, m_probabilityModifier ) },
@@ -164,7 +158,7 @@ SlowDeathBehavior::SlowDeathBehavior( Thing *thing, const ModuleData* moduleData
 
 	if (getSlowDeathBehaviorModuleData()->m_probabilityModifier < 1)
 	{
-		DEBUG_CRASH(("ProbabilityModifer must be >= 1.\n"));
+		DEBUG_CRASH(("ProbabilityModifer must be >= 1."));
 		throw INI_INVALID_DATA;
 	}
 
@@ -235,19 +229,19 @@ void SlowDeathBehavior::beginSlowDeath(const DamageInfo *damageInfo)
 
 		}
 
-		
+
 		// Ask game detail manager if we need to speedup all deaths to improve performance
 		Real timeScale = TheGameLODManager->getSlowDeathScale();
 		m_acceleratedTimeScale = 1.0f;	// assume normal death speed.
 
 		if (timeScale == 0.0f && !d->hasNonLodEffects())
-		{	
+		{
 			// Deaths happen instantly so just delete the object and return
 			TheGameLogic->destroyObject(obj);
 			return;
 		}
 		else
-		{	
+		{
 			// timescale is some non-zero value so we may need to speed up death
 			if( getObject()->isKindOf( KINDOF_HULK ) && TheGameLogic->getHulkMaxLifetimeOverride() != -1 )
 			{
@@ -271,7 +265,7 @@ void SlowDeathBehavior::beginSlowDeath(const DamageInfo *damageInfo)
 		if (d->m_flingForce > 0)
 		{
 
-			
+
 			//Just in case this is a stingersoldier or other HELD object, lets set them free so they will fly
 			// with their own physics during slow death
 			if( obj->isDisabledByType( DISABLED_HELD ) )
@@ -282,7 +276,7 @@ void SlowDeathBehavior::beginSlowDeath(const DamageInfo *damageInfo)
 				{
 					slave->onSlaverDie( NULL );
 				}
-			}				
+			}
 
 			PhysicsBehavior* physics = obj->getPhysics();
 			if (physics)
@@ -298,7 +292,7 @@ void SlowDeathBehavior::beginSlowDeath(const DamageInfo *damageInfo)
 				}
 
 				Coord3D force;
-				calcRandomForce(d->m_flingForce, d->m_flingForce + d->m_flingForceVariance, 
+				calcRandomForce(d->m_flingForce, d->m_flingForce + d->m_flingForceVariance,
 												d->m_flingPitch, d->m_flingPitch + d->m_flingPitchVariance, force);
 				physics->setAllowToFall(true);
 				physics->applyForce(&force);
@@ -317,9 +311,9 @@ void SlowDeathBehavior::beginSlowDeath(const DamageInfo *damageInfo)
 			// we don't need to wake up immediately, but only when the first of these
 			// counters wants to trigger....
 			Int whenToWakeTime = m_sinkFrame;
-			if (whenToWakeTime > m_destructionFrame) 
+			if (whenToWakeTime > m_destructionFrame)
 				whenToWakeTime = m_destructionFrame;
-			if (whenToWakeTime > m_midpointFrame) 
+			if (whenToWakeTime > m_midpointFrame)
 				whenToWakeTime = m_midpointFrame;
 			setWakeFrame(obj, UPDATE_SLEEP(whenToWakeTime));
 		}
@@ -382,7 +376,7 @@ void SlowDeathBehavior::doPhaseStuff(SlowDeathPhaseType sdphase)
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime SlowDeathBehavior::update()
 {
-	//DEBUG_LOG(("updating SlowDeathBehavior %08lx\n",this));
+	//DEBUG_LOG(("updating SlowDeathBehavior %08lx",this));
 	DEBUG_ASSERTCRASH(isSlowDeathActivated(), ("hmm, this should not be possible"));
 
 	const SlowDeathBehaviorModuleData* d = getSlowDeathBehaviorModuleData();
@@ -392,11 +386,11 @@ UpdateSleepTime SlowDeathBehavior::update()
 
 	// Check if we have normal time scale but LODManager is requeseting acceleration
 	if (timeScale != 1.0f && m_acceleratedTimeScale == 1.0f && !d->hasNonLodEffects())
-	{	
+	{
 		// speed of deaths has been increased since beginning of death
 		// so adjust it to current levels.
 		if (timeScale == 0)
-		{	
+		{
 			// instant death
 			TheGameLogic->destroyObject(obj);
 			return UPDATE_SLEEP_NONE;
@@ -406,10 +400,10 @@ UpdateSleepTime SlowDeathBehavior::update()
 		m_midpointFrame = (Real)m_midpointFrame * timeScale;
 		m_destructionFrame = (Real)m_destructionFrame * timeScale;
 		m_acceleratedTimeScale = timeScale;
-	};	
+	};
 
 	UnsignedInt now = TheGameLogic->getFrame();
-	
+
 
 	if ((m_flags & (1<<FLUNG_INTO_AIR)) != 0)
 	{
@@ -420,11 +414,11 @@ UpdateSleepTime SlowDeathBehavior::update()
 			++m_destructionFrame;
 			if (!obj->isAboveTerrain())
 			{
-				obj->clearAndSetModelConditionFlags(MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_FLAILING), 
+				obj->clearAndSetModelConditionFlags(MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_FLAILING),
 																						MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_BOUNCING));
 				m_flags |= (1<<BOUNCED);
 			}
-			
+
 			// Here we want to make sure we die if we collide with a tree on the way down
 			PhysicsBehavior *phys = obj->getPhysics();
 			if ( phys )
@@ -436,8 +430,8 @@ UpdateSleepTime SlowDeathBehavior::update()
 					if (tree->isKindOf( KINDOF_SHRUBBERY ) )
 					{
 						obj->setDisabled( DISABLED_HELD );
-						obj->clearModelConditionFlags( MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_FLAILING) ); 
-						obj->clearModelConditionFlags( MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_BOUNCING) ); 
+						obj->clearModelConditionFlags( MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_FLAILING) );
+						obj->clearModelConditionFlags( MAKE_MODELCONDITION_MASK(MODELCONDITION_EXPLODED_BOUNCING) );
 						obj->setModelConditionFlags(   MAKE_MODELCONDITION_MASK(MODELCONDITION_PARACHUTING) ); //looks like he is snagged in a tree
 						obj->setPositionZ( obj->getPosition()->z - (d->m_sinkRate * 50.0f) );// make him sink faster
 						if ( !obj->isAboveTerrain() )
@@ -538,7 +532,7 @@ void SlowDeathBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -571,7 +565,7 @@ void SlowDeathBehavior::xfer( Xfer *xfer )
 	// flags
 	xfer->xferUnsignedInt( &m_flags );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -582,4 +576,4 @@ void SlowDeathBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp
index 0c18aae37de..81ca57e86ee 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp
@@ -27,7 +27,7 @@
 // Desc:   Update will create and monitor a group of spawned units and replace as needed
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/ThingFactory.h"
@@ -49,17 +49,12 @@
 #define NONE_SPAWNED_YET (0xffffffff)
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
 #define SPAWN_DELAY_MIN_FRAMES (16) // about as rapidly as you'd expect people to successively exit through the same door
 //-------------------------------------------------------------------------------------------------
-SpawnBehavior::SpawnBehavior( Thing *thing, const ModuleData* moduleData ) 
+SpawnBehavior::SpawnBehavior( Thing *thing, const ModuleData* moduleData )
 						 : UpdateModule( thing, moduleData )
 {
 	const SpawnBehaviorModuleData* md = getSpawnBehaviorModuleData();
@@ -73,10 +68,7 @@ SpawnBehavior::SpawnBehavior( Thing *thing, const ModuleData* moduleData )
 	//looping back to the beginning
 
 	m_framesToWait = 0;
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_firstBatchCount = 0;
-	//
 	if( md->m_isOneShotData )
 		m_oneShotCountdown = md->m_spawnNumberData;
 	else
@@ -90,19 +82,19 @@ SpawnBehavior::SpawnBehavior( Thing *thing, const ModuleData* moduleData )
 	m_initialBurstTimesInited = FALSE;
 
 
-	
+
 	m_aggregateHealth = md->m_aggregateHealth;
 
 	m_spawnCount = NONE_SPAWNED_YET;
 	m_active = TRUE;
 	m_selfTaskingSpawnCount = 0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 SpawnBehavior::~SpawnBehavior( void )
 {
 	m_replacementTimes.clear();
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 void SpawnBehavior::onDelete()
@@ -129,13 +121,13 @@ void SpawnBehavior::onDelete()
 			// and will *DESTROY* our spawned things if we ourselves are destroyed and they
 			// are still alive (such a case would be calling destroy object on us directly)
 			//
-			if( obj && obj->isEffectivelyDead() == FALSE )	
+			if( obj && obj->isEffectivelyDead() == FALSE )
 				TheGameLogic->destroyObject( obj );
 
-		}  // end for, it
+		}
+
+	}
 
-	}  // end if
-		
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -190,9 +182,9 @@ void SpawnBehavior::onDie( const DamageInfo *damageInfo )
 			if( obj && obj->isEffectivelyDead() == FALSE )
 				obj->kill();
 
-		}  // end for, it
+		}
 
-	}  // end if
+	}
 
 }
 
@@ -204,7 +196,7 @@ UpdateSleepTime SpawnBehavior::update( void )
 	//EVERY FRAME
 	if ( m_aggregateHealth )
 	{
-		computeAggregateStates();	
+		computeAggregateStates();
 	}
 
 	const SpawnBehaviorModuleData* md = getSpawnBehaviorModuleData();
@@ -257,9 +249,9 @@ UpdateSleepTime SpawnBehavior::update( void )
 			if( currentTime > replacementTime )
 			{
 				//If you create one, you pop the number off the list
-				if( createSpawn() )	
+				if( createSpawn() )
 					iterator = m_replacementTimes.erase( iterator );
-				else 
+				else
 					iterator++;
 			}
 			else
@@ -280,7 +272,7 @@ Bool SpawnBehavior::maySpawnSelfTaskAI( Real maxSelfTaskersRatio )
 	if ( maxSelfTaskersRatio == 0)
 		return FALSE;
 
-	
+
 	//if my last attack command was from player or script, I need to forbid my spawn from disobeying that command
 	//otherwise (since my attack state was autoacquired my ny own ai), let them deviate by the ratio specified.
 	Object* obj = getObject();
@@ -289,13 +281,13 @@ Bool SpawnBehavior::maySpawnSelfTaskAI( Real maxSelfTaskersRatio )
 	AIUpdateInterface *ai = obj->getAI();
 	if ( ! ai )
 		return FALSE;
-	
+
 	CommandSourceType lastAttackCommandSource = ai->getLastCommandSource();
-	
+
 
 	if ( lastAttackCommandSource != CMD_FROM_AI )
 		return FALSE;
-	
+
 
 	Real curSelfTaskersRatio = (Real)m_selfTaskingSpawnCount / (Real)m_spawnCount;
 
@@ -313,8 +305,8 @@ Object* SpawnBehavior::getClosestSlave( const Coord3D *pos )
 		if( obj )
 		{
 			Real distance = ThePartitionManager->getDistanceSquared( obj, pos, FROM_CENTER_2D );
-			
-			if( !closest || closestDistance > distance ) 
+
+			if( !closest || closestDistance > distance )
 			{
 				closest = obj;
 				closestDistance = distance;
@@ -425,7 +417,7 @@ CanAttackResult SpawnBehavior::getCanAnySlavesAttackSpecificTarget( AbleToAttack
 
 				case ATTACKRESULT_NOT_POSSIBLE:
 					break;
-				
+
 				case ATTACKRESULT_INVALID_SHOT:
 					invalidShot = TRUE;
 					break;
@@ -463,7 +455,7 @@ CanAttackResult SpawnBehavior::getCanAnySlavesUseWeaponAgainstTarget( AbleToAtta
 
 				case ATTACKRESULT_NOT_POSSIBLE:
 					break;
-				
+
 				case ATTACKRESULT_INVALID_SHOT:
 					invalidShot = TRUE;
 					break;
@@ -559,13 +551,13 @@ static void findClosestOrphan( Object *obj, void *userData )
 	Real distSq = ThePartitionManager->getDistanceSquared( orphanData->m_source, obj, FROM_CENTER_2D );
 	if( distSq < orphanData->m_closestDistSq )
 	{
-	
+
 		orphanData->m_closest = obj;
 		orphanData->m_closestDistSq = distSq;
 
-	}  // end if
-			
-}  // findClosestOrphan
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 Object *SpawnBehavior::reclaimOrphanSpawn( void )
@@ -578,18 +570,18 @@ Object *SpawnBehavior::reclaimOrphanSpawn( void )
 	// that we would normally spawn, if found we'll just make it our own
 	//
 	// EVEN MORE NEW AND DIFFERENT
-	// This block scans the list for matchTemplates 
+	// This block scans the list for matchTemplates
 	//
 
 	OrphanData orphanData;
-	AsciiString prevName = "";
+	AsciiString prevName;
 	for (std::vector<AsciiString>::const_iterator tempName = md->m_spawnTemplateNameData.begin();
-			tempName != md->m_spawnTemplateNameData.end(); 
+			tempName != md->m_spawnTemplateNameData.end();
 			++tempName)
 	{
 		if (prevName.compare(*tempName)) // the list may have redundancy, this will skip some of it
 			continue;
-		orphanData.m_matchTemplate = TheThingFactory->findTemplate( *tempName );;
+		orphanData.m_matchTemplate = TheThingFactory->findTemplate( *tempName );
 		orphanData.m_source = getObject();
 		orphanData.m_closest = NULL;
 		orphanData.m_closestDistSq = BIG_DISTANCE;
@@ -612,13 +604,13 @@ Bool SpawnBehavior::createSpawn()
 		DEBUG_ASSERTCRASH( exitInterface != NULL, ("Something cannot have SpawnBehavior without an exit interface") );
 		return FALSE;
 	}
-	
+
 	ExitDoorType exitDoor = exitInterface->reserveDoorForExit(NULL, NULL);
 	if (exitDoor == DOOR_NONE_AVAILABLE)
 		return FALSE;
 
 	Object *newSpawn = NULL;
-	
+
 	// try to reclaim orphaned objects if possible
 	Bool reclaimedOrphan = FALSE;
 	if( md->m_canReclaimOrphans && md->m_isOneShotData == FALSE )
@@ -689,14 +681,14 @@ Bool SpawnBehavior::createSpawn()
 						--m_initialBurstCountdown;
 						barracksExitSuccess = TRUE;
 					}
-					
+
 				}
 
 			}
-			
+
 			if ( ! barracksExitSuccess )
 			{
-				// find the closest spawn to the nexus... 
+				// find the closest spawn to the nexus...
 				//there is probably a more elegant way to choose the budHost, but oh well
 				Object *budHost = NULL;
 				Object *curSpawn = NULL;
@@ -743,7 +735,7 @@ Bool SpawnBehavior::createSpawn()
 	}
 	else
 	{
-		++ m_spawnCount; 
+		++ m_spawnCount;
 	}
 
 
@@ -754,7 +746,7 @@ Bool SpawnBehavior::createSpawn()
 void SpawnBehavior::onSpawnDeath( ObjectID deadSpawn, DamageInfo *damageInfo )
 {
 	objectIDListIterator it = std::find(m_spawnIDs.begin(), m_spawnIDs.end(), deadSpawn);
-	
+
 	// If the iterator is at the end, we didn't find deadSpawn, so bail out.
 	// Otherwise, bad crash stuff will happen.
 	if (it == m_spawnIDs.end())
@@ -762,7 +754,7 @@ void SpawnBehavior::onSpawnDeath( ObjectID deadSpawn, DamageInfo *damageInfo )
 
 	//When one dies, you push (now + delay) as the time a new one should be made
 	const SpawnBehaviorModuleData* md = getSpawnBehaviorModuleData();
-	
+
 	Int replacementTime = md->m_spawnReplaceDelayData + TheGameLogic->getFrame();
 	m_replacementTimes.push_back( replacementTime );
 
@@ -854,7 +846,7 @@ Bool SpawnBehavior::shouldTryToSpawn()
 //*   spawn health, and dividing by optimal health of full population
 //*   (that is, the max spawn, SpawnBehaviorModuleData::m_spawnNumberData)
 //*   at full health.
-//* Veterancy is sucked out of any unit that has any and put into the 
+//* Veterancy is sucked out of any unit that has any and put into the
 //* Spawner, scaled by 1/SpawnBehaviorModuleData::m_spawnNumberData;
 //* The HealthBoxPosition (maybe to include moodicon, vet icon) is calc'd
 //* as an average position of all the spawn.
@@ -870,7 +862,7 @@ void SpawnBehavior::computeAggregateStates(void)
 
 	Int spawnCount = 0;
 	Int spawnCountMax = md->m_spawnNumberData;
-	Coord3D avgSpawnPos; 
+	Coord3D avgSpawnPos;
 
 	avgSpawnPos.set(0,0,0);
 	Real acrHealth = 0.0f;
@@ -885,7 +877,7 @@ void SpawnBehavior::computeAggregateStates(void)
 	Drawable *spawnDraw = NULL;
 	Object *currentSpawn = NULL;
 
-	WeaponBonusConditionFlags spawnWeaponBonus; 
+	WeaponBonusConditionFlags spawnWeaponBonus;
 
 
 	m_selfTaskingSpawnCount = 0;
@@ -903,7 +895,7 @@ void SpawnBehavior::computeAggregateStates(void)
 				SlavedUpdateInterface* sdu = (*update)->getSlavedUpdateInterface();
 				if (sdu != NULL)
 				{
-					m_selfTaskingSpawnCount += ( sdu->isSelfTasking());;
+					m_selfTaskingSpawnCount += ( sdu->isSelfTasking());
 					break;
 				}
 			}
@@ -941,10 +933,10 @@ void SpawnBehavior::computeAggregateStates(void)
 
 			spawnCount++;
 		}
-	} // next iter
+	}
+
 
 
-	
 	// SELECTION STATE *****************************************
 	// THIS LOGIC IS SIMPLE
 	// IF ANY ONE OF MY SPAWN ARE SELECTED RIGHT NOW,
@@ -976,7 +968,7 @@ void SpawnBehavior::computeAggregateStates(void)
 						teamMsg->appendObjectIDArgument( currentSpawn->getID() );
 					}
 				}
-			} // next iter
+			}
 		}
 		// if somebody is selected then I sure need to be!
 		if ( ! obj->getDrawable()->isSelected())
@@ -992,7 +984,7 @@ void SpawnBehavior::computeAggregateStates(void)
 
 
 	// HEALTH BOX POSITION *****************************
-	// pick a centered, average spot to draw the health box 
+	// pick a centered, average spot to draw the health box
 	avgSpawnPos.scale(1.0f / spawnCount);
 	avgSpawnPos.sub(obj->getPosition());
 	obj->setHealthBoxOffset(avgSpawnPos);
@@ -1000,7 +992,7 @@ void SpawnBehavior::computeAggregateStates(void)
 
 
 	// HEALTH STATE *************************************
-	// make my health an aggregate of all my spawns' healths 
+	// make my health an aggregate of all my spawns' healths
 	if ( spawnCount )
 	{
 		avgHealthMax /= spawnCount;
@@ -1070,13 +1062,13 @@ void SpawnBehavior::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
-	* 2: Added m_initialBurstTimesInited to the save. jba. 
+	* 1: Initial version
+	* 2: Added m_initialBurstTimesInited to the save. jba.
 */
 // ------------------------------------------------------------------------------------------------
 void SpawnBehavior::xfer( Xfer *xfer )
@@ -1091,7 +1083,7 @@ void SpawnBehavior::xfer( Xfer *xfer )
 	// extend base class
 	BehaviorModule::xfer( xfer );
 
-	
+
 	if (version >= 2) {
 		xfer->xferBool(&m_initialBurstTimesInited);
 	}
@@ -1105,19 +1097,19 @@ void SpawnBehavior::xfer( Xfer *xfer )
 		m_spawnTemplate = NULL;
 		if( name.isEmpty() == FALSE )
 		{
-		
+
 			m_spawnTemplate = TheThingFactory->findTemplate( name );
 			if( m_spawnTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "SpawnBehavior::xfer - Unable to find template '%s'\n", name.str() ));
+				DEBUG_CRASH(( "SpawnBehavior::xfer - Unable to find template '%s'", name.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// one shot countdown
 	xfer->xferInt( &m_oneShotCountdown );
@@ -1148,7 +1140,7 @@ void SpawnBehavior::xfer( Xfer *xfer )
 	// self tasking spawn count
 	xfer->xferUnsignedInt( &m_selfTaskingSpawnCount );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1159,4 +1151,4 @@ void SpawnBehavior::loadPostProcess( void )
 	// extend base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SupplyWarehouseCripplingBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SupplyWarehouseCripplingBehavior.cpp
index 49c2e78afad..78b096c4958 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SupplyWarehouseCripplingBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SupplyWarehouseCripplingBehavior.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameLogic/Module/SupplyWarehouseCripplingBehavior.h"
 #include "GameLogic/GameLogic.h"
@@ -45,10 +45,10 @@ SupplyWarehouseCripplingBehaviorModuleData::SupplyWarehouseCripplingBehaviorModu
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void SupplyWarehouseCripplingBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void SupplyWarehouseCripplingBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SelfHealSupression",	INI::parseDurationUnsignedInt,	NULL, offsetof(SupplyWarehouseCripplingBehaviorModuleData, m_selfHealSupression) },
 		{ "SelfHealDelay",			INI::parseDurationUnsignedInt,	NULL, offsetof(SupplyWarehouseCripplingBehaviorModuleData, m_selfHealDelay) },
@@ -146,7 +146,7 @@ void SupplyWarehouseCripplingBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -170,7 +170,7 @@ void SupplyWarehouseCripplingBehavior::xfer( Xfer *xfer )
 	// next healing frame
 	xfer->xferUnsignedInt( &m_nextHealingFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -181,4 +181,4 @@ void SupplyWarehouseCripplingBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/TechBuildingBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/TechBuildingBehavior.cpp
index df5267a2fc4..6f98771bbd3 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/TechBuildingBehavior.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/TechBuildingBehavior.cpp
@@ -52,7 +52,7 @@ TechBuildingBehaviorModuleData::TechBuildingBehaviorModuleData( void )
 {
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "PulseFX",								INI::parseFXList,								NULL,	offsetof( TechBuildingBehaviorModuleData, m_pulseFX ) },
 		{ "PulseFXRate",						INI::parseDurationUnsignedInt,	NULL,	offsetof( TechBuildingBehaviorModuleData, m_pulseFXRate ) },
@@ -61,7 +61,7 @@ TechBuildingBehaviorModuleData::TechBuildingBehaviorModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -90,7 +90,7 @@ UpdateSleepTime TechBuildingBehavior::update( void )
 	Object *us = getObject();
 	const TechBuildingBehaviorModuleData* d = getTechBuildingBehaviorModuleData();
 	Bool captured = false;
-	
+
 	// update our model condition for the captured status
 	Player *player = us->getControllingPlayer();
 	if( player && player->isPlayableSide() )
@@ -129,7 +129,7 @@ void TechBuildingBehavior::onDie( const DamageInfo *damageInfo )
 	us->clearModelConditionState( MODELCONDITION_CAPTURED );
 	us->setTeam( ThePlayerList->getNeutralPlayer()->getDefaultTeam() );
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -142,7 +142,7 @@ void TechBuildingBehavior::onCapture( Player *oldOwner, Player *newOwner )
 	// wake up next frame so we can re-evaluate our captured status
 	setWakeFrame( getObject(), UPDATE_SLEEP_NONE );
 
-}  // end onCapture
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -152,7 +152,7 @@ void TechBuildingBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -163,11 +163,11 @@ void TechBuildingBehavior::xfer( Xfer *xfer )
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
-	
+
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -177,5 +177,5 @@ void TechBuildingBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp
index ccd21e7e322..6ea3f866f7b 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/BitFlagsIO.h"
 #include "Common/CRCDebug.h"
 #include "Common/DamageFX.h"
@@ -61,11 +61,6 @@
 #include "GameLogic/Module/DieModule.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define YELLOW_DAMAGE_PERCENT (0.25f)
 
@@ -94,7 +89,7 @@ class BodyParticleSystem : public MemoryPoolObject
 BodyParticleSystem::~BodyParticleSystem( void )
 {
 
-}  // end ~BodyParticleSystem
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -140,11 +135,11 @@ ActiveBodyModuleData::ActiveBodyModuleData()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void ActiveBodyModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void ActiveBodyModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MaxHealth",						INI::parseReal,						NULL,		offsetof( ActiveBodyModuleData, m_maxHealth ) },
 		{ "InitialHealth",				INI::parseReal,						NULL,		offsetof( ActiveBodyModuleData, m_initialHealth ) },
@@ -159,8 +154,8 @@ void ActiveBodyModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-ActiveBody::ActiveBody( Thing *thing, const ModuleData* moduleData ) : 
-	BodyModule(thing, moduleData), 
+ActiveBody::ActiveBody( Thing *thing, const ModuleData* moduleData ) :
+	BodyModule(thing, moduleData),
 	m_curDamageFX(NULL),
 	m_curArmorSet(NULL),
 	m_frontCrushed(false),
@@ -201,7 +196,7 @@ void ActiveBody::onDelete( void )
 	// delete all particle systems
 	deleteAllParticleSystems();
 
-}  // end onDelete
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -218,14 +213,14 @@ void ActiveBody::setCorrectDamageState()
 			rubbleHeight = TheGlobalData->m_defaultStructureRubbleHeight;
 
 		/** @todo I had to change this to a Z only version to keep it from disappearing from the
-			PartitionManager for a frame.  That didn't used to happen.		 
+			PartitionManager for a frame.  That didn't used to happen.
 		*/
 		getObject()->setGeometryInfoZ(rubbleHeight);
 
 		// Have to tell pathfind as well, as rubble pathfinds differently.
 		TheAI->pathfinder()->removeObjectFromPathfindMap(getObject());
 		TheAI->pathfinder()->addObjectToPathfindMap(getObject());
-		
+
 
 		// here we make sure nobody collides with us, ever again...			//Lorenzen
 		//THis allows projectiles shot from infantry that are inside rubble to get out of said rubble safely
@@ -301,7 +296,7 @@ Real ActiveBody::estimateDamage( DamageInfoInput& damageInfo ) const
 		else
 			return 0.0f;
 	}
-	
+
 	if( damageInfo.m_damageType == DAMAGE_SNIPER )
 	{
 		if( getObject()->isKindOf( KINDOF_STRUCTURE ) && getObject()->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
@@ -365,7 +360,7 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 	Object *damager = TheGameLogic->findObjectByID( damageInfo->in.m_sourceID );
 	if( damager )
 	{
-		//Store the template so later if the attacking object dies, we use script conditions to look at the 
+		//Store the template so later if the attacking object dies, we use script conditions to look at the
 		//damager's template inside evaluateTeamAttackedByType or evaluateNameAttackedByType.
 		damageInfo->in.m_sourceTemplate = damager->getTemplate();
 	}
@@ -388,11 +383,11 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 
 		case DAMAGE_KILLPILOT:
 		{
-			// This type of damage doesn't actually damage the unit, but it does kill it's 
+			// This type of damage doesn't actually damage the unit, but it does kill it's
 			// pilot, in the case of a vehicle.
 			if( obj->isKindOf( KINDOF_VEHICLE ) )
 			{
-				//Handle special case for combat bike. We actually will kill the bike by 
+				//Handle special case for combat bike. We actually will kill the bike by
 				//forcing the rider to leave the bike. That way the bike will automatically
 				//scuttle and be unusable.
 				ContainModuleInterface *contain = obj->getContain();
@@ -410,14 +405,19 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 					}
 					else
 					{
-						//Removing the rider will scuttle the bike.
-						Object *rider = *(contain->getContainedItemsList()->begin());
-						ai->aiEvacuateInstantly( TRUE, CMD_FROM_AI );
+						// TheSuperHackers @bugfix Caball009 04/09/2025 Check whether a bike still has a rider.
+						// A rider may dismount or be sniped off a bike when it's disabled, resulting in a bike object with an empty contain list.
+						if ( !contain->getContainedItemsList()->empty() )
+						{
+							//Removing the rider will scuttle the bike.
+							Object* rider = *(contain->getContainedItemsList()->begin());
+							ai->aiEvacuateInstantly(TRUE, CMD_FROM_AI);
 
-						//Kill the rider.
-						if (damager)
-							damager->scoreTheKill( rider );
-						rider->kill();
+							//Kill the rider.
+							if (damager)
+								damager->scoreTheKill(rider);
+							rider->kill();
+						}
 					}
 				}
 				else
@@ -472,15 +472,15 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 							++numKilled;
 							thingToKill->getControllingPlayer()->getAcademyStats()->recordClearedGarrisonedBuilding();
 						}
-					} // next contained item
+					}
 
-				} // if items
-			}	// if a garrisonable thing
+				}
+			}
 			alreadyHandled = TRUE;
 			allowModifier = FALSE;
 			break;
 		}
-		
+
 		case DAMAGE_STATUS:
 		{
 			// Damage amount is msec time we set the status given in damageStatusType
@@ -496,10 +496,12 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 	{
 		if( !canBeSubdued() )
 			return;
-		
+
+		// TheSuperHackers @bugfix Stubbjax 20/09/2025 The isSubdued() function now directly checks status instead
+		// of health to prevent indefinite subdue status when internally shifting health across the threshold.
 		Bool wasSubdued = isSubdued();
 		internalAddSubdualDamage(amount);
-		Bool nowSubdued = isSubdued();
+		Bool nowSubdued = m_maxHealth <= m_currentSubdualDamage;
 		alreadyHandled = TRUE;
 		allowModifier = FALSE;
 
@@ -532,7 +534,7 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 			amount = m_currentHealth;
 		}
 
-		if (!alreadyHandled) 
+		if (!alreadyHandled)
 		{
 			// do the damage simplistic damage subtraction
 			internalChangeHealth( -amount );
@@ -564,7 +566,7 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 		damageInfo->out.m_actualDamageDealt = amount;
 		damageInfo->out.m_actualDamageClipped = m_prevHealth - m_currentHealth;
 
-		// then copy the whole DamageInfo struct for easy lookup 
+		// then copy the whole DamageInfo struct for easy lookup
 		// (object pointer loses scope as soon as atteptdamage's caller ends)
 		// m_lastDamageTimestamp is initialized to FFFFFFFFFF, so doing a < compare is problematic.
 		// jba.
@@ -594,9 +596,9 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 				// no change.
 			}
 		}
-	
+
 		// Notify the player that they have been attacked by this player
-		if (m_lastDamageInfo.in.m_sourceID != INVALID_ID) 
+		if (m_lastDamageInfo.in.m_sourceID != INVALID_ID)
 		{
 			Object *srcObj = TheGameLogic->findObjectByID(m_lastDamageInfo.in.m_sourceID);
 			if (srcObj)
@@ -629,9 +631,9 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 
 				d->onBodyDamageStateChange( damageInfo, oldState, m_curDamageState );
 			}
-			
+
 			// @todo: This really feels like it should be in the TransitionFX lists.
-			if (m_curDamageState == BODY_DAMAGED) 
+			if (m_curDamageState == BODY_DAMAGED)
 			{
 				AudioEventRTS damaged = *obj->getTemplate()->getSoundOnDamaged();
 				damaged.setObjectID(obj->getID());
@@ -645,10 +647,10 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 			}
 
 		}
-		
+
 		// Should we play our fear sound?
-		if( (m_prevHealth / m_maxHealth) > YELLOW_DAMAGE_PERCENT && 
-				(m_currentHealth / m_maxHealth) < YELLOW_DAMAGE_PERCENT && 
+		if( (m_prevHealth / m_maxHealth) > YELLOW_DAMAGE_PERCENT &&
+				(m_currentHealth / m_maxHealth) < YELLOW_DAMAGE_PERCENT &&
 				(m_currentHealth > 0) )
 		{
 			// 25% chance to play
@@ -669,7 +671,7 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 			{
 				damager->scoreTheKill( obj );
 			}
-	
+
 			obj->onDie( damageInfo );
 		}
 	}
@@ -677,9 +679,9 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 	doDamageFX(damageInfo);
 
 	// Damaged repulsable civilians scare (repulse) other civs.	jba.
-	if( TheAI->getAiData()->m_enableRepulsors ) 
+	if( TheAI->getAiData()->m_enableRepulsors )
 	{
-		if( obj->isKindOf( KINDOF_CAN_BE_REPULSED ) ) 
+		if( obj->isKindOf( KINDOF_CAN_BE_REPULSED ) )
 		{
 			obj->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_REPULSOR ) );
 		}
@@ -689,7 +691,7 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 	//Also only retaliate if we're controlled by a human player and the thing that attacked me
 	//is an enemy.
 	Player *controllingPlayer = obj->getControllingPlayer();
-	if( controllingPlayer && controllingPlayer->isLogicalRetaliationModeEnabled() && controllingPlayer->getPlayerType() == PLAYER_HUMAN ) 
+	if( controllingPlayer && controllingPlayer->isLogicalRetaliationModeEnabled() && controllingPlayer->getPlayerType() == PLAYER_HUMAN )
 	{
 		if( shouldRetaliateAgainstAggressor(obj, damager))
 		{
@@ -697,11 +699,11 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 			PartitionFilterOnMap filterMapStatus;
 			PartitionFilter *filters[] = { &f1, &filterMapStatus, 0 };
 
-			
+
 			Real distance = TheAI->getAiData()->m_retaliateFriendsRadius + obj->getGeometryInfo().getBoundingCircleRadius();
 			SimpleObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( obj->getPosition(), distance, FROM_CENTER_2D, filters, ITER_FASTEST );
 			MemoryPoolObjectHolder hold( iter );
-			for( Object *them = iter->first(); them; them = iter->next() ) 
+			for( Object *them = iter->first(); them; them = iter->next() )
 			{
 				if (!shouldRetaliate(them)) {
 					continue;
@@ -730,7 +732,7 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
 Bool ActiveBody::shouldRetaliateAgainstAggressor(Object *obj, Object *damager)
 {
 	/* This considers whether obj should invoke his friends to retaliate against damager.
-		 Note that obj could be a structure, so we don't actually check whether obj will 
+		 Note that obj could be a structure, so we don't actually check whether obj will
 		 retaliate, as in many cases he wouldn't. */
 	if (damager==NULL) {
 		return false;
@@ -763,7 +765,7 @@ Bool ActiveBody::shouldRetaliate(Object *obj)
 	// Cannot retaliate objects dont. [8/25/2003]
 	if (obj->isKindOf(KINDOF_CANNOT_RETALIATE)) {
 		return false;
-	}	
+	}
 	if (obj->isKindOf( KINDOF_IMMOBILE )) {
 		return false;
 	}
@@ -780,14 +782,14 @@ Bool ActiveBody::shouldRetaliate(Object *obj)
 		return false; // Non-ai can't retaliate. [8/26/2003]
 	}
 	// Stealthed units don't retaliate unless they're detected. [8/25/2003]
-	if ( obj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) && 
+	if ( obj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) &&
 		!obj->getStatusBits().test( OBJECT_STATUS_DETECTED ) ) {
-		return false; 
+		return false;
 	}
 	// If we're using an ability, don't stop. [8/25/2003]
 	if (obj->testStatus(OBJECT_STATUS_IS_USING_ABILITY)) {
 		return false;
-	}	
+	}
 	return true;
 }
 
@@ -813,7 +815,7 @@ void ActiveBody::attemptHealing( DamageInfo *damageInfo )
 	// srj sez: sorry, once yer dead, yer dead.
 	// Special case for bridges, cause the system now things they're dead
 	///@todo we need to figure out what has changed so we don't have to hack this (CBD 11-1-2002)
-	if( obj->isKindOf( KINDOF_BRIDGE ) == FALSE && 
+	if( obj->isKindOf( KINDOF_BRIDGE ) == FALSE &&
 			obj->isKindOf( KINDOF_BRIDGE_TOWER ) == FALSE &&
 			obj->isEffectivelyDead())
 		return;
@@ -836,11 +838,13 @@ void ActiveBody::attemptHealing( DamageInfo *damageInfo )
 		damageInfo->out.m_actualDamageDealt = amount;
 		damageInfo->out.m_actualDamageClipped = m_prevHealth - m_currentHealth;
 
-		//then copy the whole DamageInfo struct for easy lookup 
+		//then copy the whole DamageInfo struct for easy lookup
 		//(object pointer loses scope as soon as atteptdamage's caller ends)
 		m_lastDamageInfo = *damageInfo;
 		m_lastDamageCleared = false;
+#if PRESERVE_RETAIL_BEHAVIOR
 		m_lastDamageTimestamp = TheGameLogic->getFrame();
+#endif
 		m_lastHealingTimestamp = TheGameLogic->getFrame();
 
 		// if our health has gone UP then do run the damage module callback
@@ -883,12 +887,12 @@ void ActiveBody::setInitialHealth(Int initialPercent)
 	m_prevHealth = m_currentHealth;
 
 	Real factor = initialPercent/100.0f;
-	Real newHealth = factor * m_initialHealth; 
-	
+	Real newHealth = factor * m_initialHealth;
+
 	// change the health to the requested percentage.
 	internalChangeHealth(newHealth - m_currentHealth);
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Simple setting of the health value, it does *NOT* track any transition
@@ -923,7 +927,7 @@ void ActiveBody::setMaxHealth( Real maxHealth, MaxHealthChangeType healthChangeT
 		case SAME_CURRENTHEALTH:
 			//do nothing
 			break;
-			
+
 		case FULLY_HEAL:
 		{
 			// Set current to the new Max.
@@ -945,7 +949,7 @@ void ActiveBody::setMaxHealth( Real maxHealth, MaxHealthChangeType healthChangeT
 		internalChangeHealth( maxHealth - m_currentHealth );
 	}
 
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given the current damage state of the object, evaluate the visual model conditions
@@ -973,7 +977,7 @@ void ActiveBody::evaluateVisualCondition()
 	* specified by the bone base name.  If there are more bones than maxSystems then the
 	* bones will be randomly selected */
 // ------------------------------------------------------------------------------------------------
-void ActiveBody::createParticleSystems( const AsciiString &boneBaseName, 
+void ActiveBody::createParticleSystems( const AsciiString &boneBaseName,
 																				const ParticleSystemTemplate *systemTemplate,
 																				Int maxSystems )
 {
@@ -982,14 +986,14 @@ void ActiveBody::createParticleSystems( const AsciiString &boneBaseName,
 	// sanity
 	if( systemTemplate == NULL )
 		return;
-	
+
 	// get the bones
 	enum { MAX_BONES = 16 };
 	Coord3D bonePositions[ MAX_BONES ];
-	Int numBones = us->getMultiLogicalBonePosition( boneBaseName.str(), 
-																									MAX_BONES, 
-																									bonePositions, 
-																									NULL, 
+	Int numBones = us->getMultiLogicalBonePosition( boneBaseName.str(),
+																									MAX_BONES,
+																									bonePositions,
+																									NULL,
 																									FALSE );
 
 	// if no bones found nothing else to do
@@ -1010,7 +1014,7 @@ void ActiveBody::createParticleSystems( const AsciiString &boneBaseName,
 	// but don't want to repeat any
 	//
 	Bool usedBoneIndices[ MAX_BONES ] = { FALSE };
-	
+
 	// create the particle systems
 	const Coord3D *pos;
 	for( Int i = 0; i < maxSystems; ++i )
@@ -1039,20 +1043,20 @@ void ActiveBody::createParticleSystems( const AsciiString &boneBaseName,
 				usedBoneIndices[ j ] = TRUE;
 				break;  // exit for j
 
-			}  // end if
+			}
 			else
 			{
 
 				// we won't use this index, increment count until we find a suitable index to use
 				++count;
 
-			}  // end else
+			}
 
-		}  // end for, j
+		}
 
 		// sanity
-		DEBUG_ASSERTCRASH( j != numBones, 
-											 ("ActiveBody::createParticleSystems, Unable to select particle system index\n") );
+		DEBUG_ASSERTCRASH( j != numBones,
+											 ("ActiveBody::createParticleSystems, Unable to select particle system index") );
 
 		// create particle system here
 		ParticleSystem *particleSystem = TheParticleSystemManager->createParticleSystem( systemTemplate );
@@ -1071,11 +1075,11 @@ void ActiveBody::createParticleSystems( const AsciiString &boneBaseName,
 			newEntry->m_next = m_particleSystems;
 			m_particleSystems = newEntry;
 
-		}  // end if
+		}
 
-	}  // end for, i
+	}
 
-}  // end createParticleSystems
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Delete all the body particle systems */
@@ -1102,9 +1106,9 @@ void ActiveBody::deleteAllParticleSystems( void )
 		// set the body systems head to the next
 		m_particleSystems = nextBodySystem;
 
-	}  // end while
+	}
 
-}  // end deleteAllParticleSystems
+}
 
 // ------------------------------------------------------------------------------------------------
 /* 	This function is called on state changes only.  Body Type or Aflameness. */
@@ -1143,7 +1147,7 @@ void ActiveBody::updateBodyParticleSystems( void )
 		// we get to make more of them all too
 		countModifier = 2;
 
-	}  // end if
+	}
 	else
 	{
 
@@ -1158,7 +1162,7 @@ void ActiveBody::updateBodyParticleSystems( void )
 		// we make just the normal amount of these
 		countModifier = 1;
 
-	}  // end else
+	}
 
 	//
 	// remove any particle systems we have currently in the list in favor of any new ones
@@ -1171,41 +1175,41 @@ void ActiveBody::updateBodyParticleSystems( void )
 	//
 
 	// small fire bones
-	createParticleSystems( TheGlobalData->m_autoFireParticleSmallPrefix, 
+	createParticleSystems( TheGlobalData->m_autoFireParticleSmallPrefix,
 												 fireSmall, TheGlobalData->m_autoFireParticleSmallMax * countModifier );
 
 	// medium fire bones
-	createParticleSystems( TheGlobalData->m_autoFireParticleMediumPrefix, 
+	createParticleSystems( TheGlobalData->m_autoFireParticleMediumPrefix,
 												 fireMedium, TheGlobalData->m_autoFireParticleMediumMax * countModifier );
 
 	// large fire bones
-	createParticleSystems( TheGlobalData->m_autoFireParticleLargePrefix, 
+	createParticleSystems( TheGlobalData->m_autoFireParticleLargePrefix,
 												 fireLarge, TheGlobalData->m_autoFireParticleLargeMax * countModifier );
 
 	// small smoke bones
-	createParticleSystems( TheGlobalData->m_autoSmokeParticleSmallPrefix, 
+	createParticleSystems( TheGlobalData->m_autoSmokeParticleSmallPrefix,
 												 smokeSmall, TheGlobalData->m_autoSmokeParticleSmallMax * countModifier );
 
 	// medium smoke bones
-	createParticleSystems( TheGlobalData->m_autoSmokeParticleMediumPrefix, 
+	createParticleSystems( TheGlobalData->m_autoSmokeParticleMediumPrefix,
 												 smokeMedium, TheGlobalData->m_autoSmokeParticleMediumMax * countModifier );
 
 	// large smoke bones
-	createParticleSystems( TheGlobalData->m_autoSmokeParticleLargePrefix, 
+	createParticleSystems( TheGlobalData->m_autoSmokeParticleLargePrefix,
 												 smokeLarge, TheGlobalData->m_autoSmokeParticleLargeMax * countModifier );
 
 	// actively on fire
 	if( getObject()->testStatus( OBJECT_STATUS_AFLAME ) )
-		createParticleSystems( TheGlobalData->m_autoAflameParticlePrefix, 
+		createParticleSystems( TheGlobalData->m_autoAflameParticlePrefix,
 													 aflameTemplate, TheGlobalData->m_autoAflameParticleMax * countModifier );
 
-}  // end updatebodyParticleSystems
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Simple changing of the health value, it does *NOT* track any transition
 	* states for the event of "damage" or the event of "death".  If you
 	* with to kill an object and give these modules a chance to react
-	* to that event use the proper damage method calls. 
+	* to that event use the proper damage method calls.
 	* No game logic should go in here.  This is the low level math and flag maintenance.
 	* Game stuff goes in attemptDamage and attemptHealing.
 */
@@ -1244,13 +1248,13 @@ void ActiveBody::internalChangeHealth( Real delta )
 		if( !getObject()->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 			evaluateVisualCondition();
 
-	}  // end if
+	}
 
 	// mark the bit according to our health. (if our AI is dead but our health improves, it will
 	// still re-flag this bit in the AIDeadState every frame.)
 	getObject()->setEffectivelyDead(m_currentHealth <= 0);
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1277,7 +1281,7 @@ void ActiveBody::onSubdualChange( Bool isNowSubdued )
 	if( !getObject()->isKindOf(KINDOF_PROJECTILE) )
 	{
 		Object *me = getObject();
-		
+
 		if( isNowSubdued )
 		{
 			me->setDisabled(DISABLED_SUBDUED);
@@ -1316,7 +1320,16 @@ void ActiveBody::onSubdualChange( Bool isNowSubdued )
 //-------------------------------------------------------------------------------------------------
 Bool ActiveBody::isSubdued() const
 {
+#if RETAIL_COMPATIBLE_CRC
 	return m_maxHealth <= m_currentSubdualDamage;
+#else
+  // TheSuperHackers @info Projectiles don't receive the DISABLED_SUBDUED flag (or any flag for
+	// that matter) when jammed, so we have to check their subdual damage directly.
+	if (getObject()->isKindOf(KINDOF_PROJECTILE))
+		return m_maxHealth <= m_currentSubdualDamage;
+
+	return getObject()->isDisabledByType(DISABLED_SUBDUED);
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1335,10 +1348,10 @@ BodyDamageType ActiveBody::getDamageState() const
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Real ActiveBody::getMaxHealth() const 
+Real ActiveBody::getMaxHealth() const
 {
 	return m_maxHealth;
-}  ///< return max health
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1363,10 +1376,10 @@ Bool ActiveBody::hasAnySubdualDamage() const
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Real ActiveBody::getInitialHealth() const 
-{ 
+Real ActiveBody::getInitialHealth() const
+{
 	return m_initialHealth;
-}  // return initial health
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -1398,15 +1411,15 @@ void ActiveBody::setIndestructible( Bool indestructible )
 					if( body )
 						body->setIndestructible( indestructible );
 
-				}  // end if
+				}
 
-			}  // end for, i
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end setIndestructible
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1414,7 +1427,7 @@ void ActiveBody::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLeve
 {
 	if (oldLevel == newLevel)
 		return;
-	
+
 	if (oldLevel < newLevel)
 	{
 		if( provideFeedback )
@@ -1432,7 +1445,7 @@ void ActiveBody::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLeve
 					veterancyChanged = *getObject()->getTemplate()->getSoundPromotedHero();
 					break;
 			}
-	
+
 			veterancyChanged.setObjectID(getObject()->getID());
 			TheAudio->addAudioEvent(&veterancyChanged);
 		}
@@ -1511,7 +1524,7 @@ void ActiveBody::setAflame( Bool )
 	// All this does now is act like a major body state change. It is called after Aflame has been
 	// set or cleared as an Object Status
 	//
-	updateBodyParticleSystems();	
+	updateBodyParticleSystems();
 
 }
 
@@ -1524,7 +1537,7 @@ void ActiveBody::crc( Xfer *xfer )
   // extend base class
 	BodyModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1604,9 +1617,9 @@ void ActiveBody::xfer( Xfer *xfer )
 			// write particle system ID
 			xfer->xferUser( &system->m_particleSystemID, sizeof( ParticleSystemID ) );
 
-		}  // end for, system
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		ParticleSystemID particleSystemID;
@@ -1615,10 +1628,10 @@ void ActiveBody::xfer( Xfer *xfer )
 		if( m_particleSystems != NULL )
 		{
 
-			DEBUG_CRASH(( "ActiveBody::xfer - m_particleSystems should be empty, but is not\n" ));
+			DEBUG_CRASH(( "ActiveBody::xfer - m_particleSystems should be empty, but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read all data elements
 		BodyParticleSystem *newEntry;
@@ -1634,14 +1647,14 @@ void ActiveBody::xfer( Xfer *xfer )
 			newEntry->m_next = m_particleSystems;  // the list will be reversed, but we don't care
 			m_particleSystems = newEntry;
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// armor set flags
 	m_curArmorSetFlags.xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1652,4 +1665,4 @@ void ActiveBody::loadPostProcess( void )
 	// extend base class
 	BodyModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/BodyModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/BodyModule.cpp
index 62e3065a02f..7171b5b2820 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/BodyModule.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/BodyModule.cpp
@@ -24,7 +24,7 @@
 
 // FILE: BodyModule.cpp ///////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, September 2002
-// Desc:   BodyModule base class 
+// Desc:   BodyModule base class
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
@@ -41,7 +41,7 @@ void BodyModule::crc( Xfer *xfer )
 	// call base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -57,12 +57,12 @@ void BodyModule::xfer( Xfer *xfer )
 	xfer->xferVersion( &version, currentVersion );
 
 	// call base class
-	BehaviorModule::xfer( xfer ); 
+	BehaviorModule::xfer( xfer );
 
 	// damage scalar
 	xfer->xferReal( &m_damageScalar );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -72,5 +72,5 @@ void BodyModule::loadPostProcess( void )
 
 	// call base class
 	BehaviorModule::loadPostProcess();
-	
-}  // end loadPostProcess
+
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/HighlanderBody.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/HighlanderBody.cpp
index 9165ef79140..083d3fa8569 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/HighlanderBody.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/HighlanderBody.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 
 #include "GameLogic/Module/HighlanderBody.h"
@@ -37,7 +37,7 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-HighlanderBody::HighlanderBody( Thing *thing, const ModuleData* moduleData ) 
+HighlanderBody::HighlanderBody( Thing *thing, const ModuleData* moduleData )
 						 : ActiveBody( thing, moduleData )
 {
 }
@@ -69,7 +69,7 @@ void HighlanderBody::crc( Xfer *xfer )
 	// extend base class
 	ActiveBody::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -87,7 +87,7 @@ void HighlanderBody::xfer( Xfer *xfer )
 	// extend base class
 	ActiveBody::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -98,4 +98,4 @@ void HighlanderBody::loadPostProcess( void )
 	// extend base class
 	ActiveBody::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/HiveStructureBody.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/HiveStructureBody.cpp
index c10e08c8112..460f494c180 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/HiveStructureBody.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/HiveStructureBody.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "Common/ThingTemplate.h"
@@ -55,7 +55,7 @@ HiveStructureBodyModuleData::HiveStructureBodyModuleData()
 
 
 //-------------------------------------------------------------------------------------------------
-HiveStructureBody::HiveStructureBody( Thing *thing, const ModuleData* moduleData ) 
+HiveStructureBody::HiveStructureBody( Thing *thing, const ModuleData* moduleData )
 							: StructureBody( thing, moduleData )
 {
 }
@@ -70,10 +70,10 @@ void HiveStructureBody::attemptDamage( DamageInfo *damageInfo )
 {
 	const HiveStructureBodyModuleData *data = getHiveStructureBodyModuleData();
 	Object *hive = getObject();
-	
+
 	if( getDamageTypeFlag( data->m_damageTypesToPropagateToSlaves, damageInfo->in.m_damageType ) )
 	{
-		
+
     //We have the right type of damage types incoming to propagate to slaves. Do we have slaves?
 		SpawnBehaviorInterface *spawnInterface = hive->getSpawnBehaviorInterface();
 		if( spawnInterface )
@@ -131,7 +131,7 @@ void HiveStructureBody::attemptDamage( DamageInfo *damageInfo )
 
 	}
 
-	//Nothing to propagate (either different damage type or no slaves), 
+	//Nothing to propagate (either different damage type or no slaves),
 	//so damage me instead!
 	StructureBody::attemptDamage( damageInfo );
 }
@@ -143,7 +143,7 @@ void HiveStructureBody::crc( Xfer *xfer )
 	// extend parent class
 	StructureBody::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/ImmortalBody.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/ImmortalBody.cpp
index d7970249732..061e2fb2fda 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/ImmortalBody.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/ImmortalBody.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/Damage.h"
@@ -38,7 +38,7 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-ImmortalBody::ImmortalBody( Thing *thing, const ModuleData* moduleData ) 
+ImmortalBody::ImmortalBody( Thing *thing, const ModuleData* moduleData )
 						 : ActiveBody( thing, moduleData )
 {
 }
@@ -74,7 +74,7 @@ void ImmortalBody::crc( Xfer *xfer )
 	// extend base class
 	ActiveBody::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -92,7 +92,7 @@ void ImmortalBody::xfer( Xfer *xfer )
 	// extend base class
 	ActiveBody::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -103,4 +103,4 @@ void ImmortalBody::loadPostProcess( void )
 	// extend base class
 	ActiveBody::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/InactiveBody.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/InactiveBody.cpp
index cb17a1b0572..434d1420530 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/InactiveBody.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/InactiveBody.cpp
@@ -30,7 +30,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
 #include "GameLogic/Module/InactiveBody.h"
@@ -43,18 +43,18 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-InactiveBody::InactiveBody( Thing *thing, const ModuleData* moduleData ) 
+InactiveBody::InactiveBody( Thing *thing, const ModuleData* moduleData )
 						: BodyModule( thing, moduleData ), m_dieCalled(false)
 {
 	getObject()->setEffectivelyDead(true);
-}  // end InactiveBody
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 InactiveBody::~InactiveBody( void )
 {
 
-}  // end ~InactiveBody
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -146,7 +146,7 @@ Real InactiveBody::getHealth() const
 	// Inactive bodies have no health to get
 	return 0.0f;
 
-}  // end getHealth
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -171,7 +171,7 @@ void InactiveBody::crc( Xfer *xfer )
 	// extend base class
 	BodyModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -189,7 +189,7 @@ void InactiveBody::xfer( Xfer *xfer )
 	// base class
 	BodyModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -200,6 +200,6 @@ void InactiveBody::loadPostProcess( void )
 	// extend base class
 	BodyModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/StructureBody.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/StructureBody.cpp
index ab188e29c02..ff35172448c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/StructureBody.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/StructureBody.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/Damage.h"
@@ -39,30 +39,30 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-StructureBody::StructureBody( Thing *thing, const ModuleData* moduleData ) 
+StructureBody::StructureBody( Thing *thing, const ModuleData* moduleData )
 							: ActiveBody( thing, moduleData )
 {
 
 	m_constructorObjectID = INVALID_ID;
 
-}  // end StructureBody
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 StructureBody::~StructureBody( void )
 {
 
-}  // end ~StructureBody
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void StructureBody::setConstructorObject( Object *obj )
-{ 
+{
 
-	if( obj ) 
-		m_constructorObjectID = obj->getID(); 
+	if( obj )
+		m_constructorObjectID = obj->getID();
 
-}  // end setConstructorObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -73,7 +73,7 @@ void StructureBody::crc( Xfer *xfer )
 	// extend base class
 	ActiveBody::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -94,7 +94,7 @@ void StructureBody::xfer( Xfer *xfer )
 	// constructor object id
 	xfer->xferObjectID( &m_constructorObjectID );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -105,4 +105,4 @@ void StructureBody::loadPostProcess( void )
 	// extend base class
 	ActiveBody::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp
index 5125d580835..cd5d795ef8f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameLogic/Module/UndeadBody.h"
 
@@ -38,10 +38,10 @@
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
-void UndeadBodyModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void UndeadBodyModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ActiveBodyModuleData::buildFieldParse(p);
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SecondLifeMaxHealth",			INI::parseReal,	NULL,		offsetof( UndeadBodyModuleData, m_secondLifeMaxHealth ) },
 		{ 0, 0, 0, 0 }
@@ -58,7 +58,7 @@ UndeadBodyModuleData::UndeadBodyModuleData()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-UndeadBody::UndeadBody( Thing *thing, const ModuleData* moduleData ) 
+UndeadBody::UndeadBody( Thing *thing, const ModuleData* moduleData )
 						 : ActiveBody( thing, moduleData )
 {
 	m_isSecondLife = FALSE;
@@ -79,9 +79,14 @@ void UndeadBody::attemptDamage( DamageInfo *damageInfo )
 	// remaining, then go ahead and take it.
 	Bool shouldStartSecondLife = FALSE;
 
-	if( damageInfo->in.m_damageType != DAMAGE_UNRESISTABLE  
+	if( damageInfo->in.m_damageType != DAMAGE_UNRESISTABLE
 			&& !m_isSecondLife
+#if RETAIL_COMPATIBLE_CRC
 			&& damageInfo->in.m_amount >= getHealth()
+#else
+			// TheSuperHackers @bugfix Stubbjax 20/09/2025 Battle Buses now correctly apply damage modifiers when calculating lethal damage
+			&& estimateDamage(damageInfo->in) >= getHealth()
+#endif
 			&& IsHealthDamagingDamage(damageInfo->in.m_damageType)
 			)
 	{
@@ -154,7 +159,7 @@ void UndeadBody::crc( Xfer *xfer )
 	// extend base class
 	ActiveBody::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -174,7 +179,7 @@ void UndeadBody::xfer( Xfer *xfer )
 
 	xfer->xferBool(&m_isSecondLife);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -185,4 +190,4 @@ void UndeadBody::loadPostProcess( void )
 	// extend base class
 	ActiveBody::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CollideModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CollideModule.cpp
index 13950eb4a5f..f802c789f2f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CollideModule.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CollideModule.cpp
@@ -41,7 +41,7 @@ void CollideModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -57,7 +57,7 @@ void CollideModule::xfer( Xfer *xfer )
 	// call base class
 	BehaviorModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -68,4 +68,4 @@ void CollideModule::loadPostProcess( void )
 	// call base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToCarBombCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToCarBombCrateCollide.cpp
index a918ba23e33..456f8008fc2 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToCarBombCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToCarBombCrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/Radar.h"
 #include "Common/ThingTemplate.h"
@@ -39,21 +39,20 @@
 #include "GameLogic/Module/ConvertToCarBombCrateCollide.h"
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/ScriptEngine.h"
-#include "GameLogic/ExperienceTracker.h"
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ConvertToCarBombCrateCollide::ConvertToCarBombCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ConvertToCarBombCrateCollide::~ConvertToCarBombCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -68,7 +67,7 @@ Bool ConvertToCarBombCrateCollide::isValidToExecute( const Object *other ) const
 	{
 		return FALSE;
 	}
-	
+
 	if( other->isKindOf( KINDOF_AIRCRAFT ) || other->isKindOf( KINDOF_BOAT ) )
 	{
 		//Can't make carbombs out of planes and boats!
@@ -95,7 +94,7 @@ Bool ConvertToCarBombCrateCollide::isValidToExecute( const Object *other ) const
 		//weaponset.
 		return FALSE;
 	}
-	
+
 	// Also make sure that the car isn't already a carbomb!
 	if( other->testWeaponSetFlag( WEAPONSET_CARBOMB ) )
 	{
@@ -168,7 +167,7 @@ void ConvertToCarBombCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -186,7 +185,7 @@ void ConvertToCarBombCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -197,4 +196,4 @@ void ConvertToCarBombCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp
index 4783437ea5a..44da72449dc 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp
@@ -23,19 +23,19 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: ConvertToHijackedVehicleCrateCollide.cpp 
+//
+// FILE: ConvertToHijackedVehicleCrateCollide.cpp
 // Author: Mark Lorenzen, July 2002
-// Desc:   A crate (actually a terrorist - mobile crate) that makes the target vehicle switch 
+// Desc:   A crate (actually a terrorist - mobile crate) that makes the target vehicle switch
 //				 sides, and kills its driver
 //	@todo	 Needs to set the science of that vehicle (dozer) so still can build same stuff as always
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
+
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Radar.h"
@@ -56,23 +56,18 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/Module/DozerAIUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ConvertToHijackedVehicleCrateCollide::ConvertToHijackedVehicleCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ConvertToHijackedVehicleCrateCollide::~ConvertToHijackedVehicleCrateCollide( void )
 {
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -87,7 +82,7 @@ Bool ConvertToHijackedVehicleCrateCollide::isValidToExecute( const Object *other
 	{
 		return FALSE;// can't hijack a dead vehicle
 	}
-	
+
 	if( other->isKindOf( KINDOF_IMMUNE_TO_CAPTURE ) )
 	{
 		return FALSE; //Kris: Patch 1.03 -- Prevent hijackers from being able to hijack battle buses.
@@ -160,11 +155,11 @@ Bool ConvertToHijackedVehicleCrateCollide::executeCrateBehavior( Object *other )
 
 	//Before the actual defection takes place, play the "vehicle stolen" EVA
 	//event if the local player is the victim!
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_VehicleStolen );
 	}
-	
+
 	other->setTeam( obj->getControllingPlayer()->getDefaultTeam() );
 	other->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_HIJACKED ) );// I claim this car in the name of the GLA
 
@@ -210,12 +205,12 @@ Bool ConvertToHijackedVehicleCrateCollide::executeCrateBehavior( Object *other )
 			targetCanEject = TRUE;
 			break;
 		}
-	}  // end for dmi
+	}
 
 	if ( ! targetCanEject )
 	{
 		TheGameLogic->destroyObject( obj );
-		return TRUE; 
+		return TRUE;
 	}
 
 	// I we have made it this far, we are going to ride in this vehicle for a while
@@ -254,7 +249,7 @@ Bool ConvertToHijackedVehicleCrateCollide::executeCrateBehavior( Object *other )
 		obj->getDrawable()->setDrawableHidden( true );
 
 	// By returning FALSE, we will not remove the object (Hijacker)
-	return FALSE; 
+	return FALSE;
 //	return TRUE;
 }
 
@@ -267,7 +262,7 @@ void ConvertToHijackedVehicleCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -285,7 +280,7 @@ void ConvertToHijackedVehicleCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -296,4 +291,4 @@ void ConvertToHijackedVehicleCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp
index 0be6e01aa8e..6e4cbf8d39a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/BitFlagsIO.h"
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -42,11 +42,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/CrateCollide.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -60,22 +55,16 @@ CrateCollideModuleData::CrateCollideModuleData()
 	m_isHumanOnlyPickup = FALSE;
 	m_executeFX = NULL;
 	m_pickupScience = SCIENCE_INVALID;
-
-	// Added By Sadullah Nader
-	// Initializations missing and needed
-	
 	m_executionAnimationTemplate = AsciiString::TheEmptyString;
-	
-	// End Add
 }
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void CrateCollideModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void CrateCollideModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "RequiredKindOf", KindOfMaskType::parseFromINI, NULL, offsetof( CrateCollideModuleData, m_kindof ) },
 		{ "ForbiddenKindOf", KindOfMaskType::parseFromINI, NULL, offsetof( CrateCollideModuleData, m_kindofnot ) },
@@ -99,14 +88,14 @@ void CrateCollideModuleData::buildFieldParse(MultiIniFieldParse& p)
 CrateCollide::CrateCollide( Thing *thing, const ModuleData* moduleData ) : CollideModule( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 CrateCollide::~CrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The collide event.
@@ -122,7 +111,7 @@ void CrateCollide::onCollide( Object *other, const Coord3D *, const Coord3D * )
 		{
 			if( modData->m_executeFX != NULL )
 			{
-				// Note: We pass in other here, because the crate is owned by the neutral player, and 
+				// Note: We pass in other here, because the crate is owned by the neutral player, and
 				// we want to do things that only the other person can see.
 				FXList::doFXObj( modData->m_executeFX, other );
 			}
@@ -145,7 +134,7 @@ void CrateCollide::onCollide( Object *other, const Coord3D *, const Coord3D * )
 
 	}
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool CrateCollide::isValidToExecute( const Object *other ) const
@@ -166,7 +155,7 @@ Bool CrateCollide::isValidToExecute( const Object *other ) const
 		return FALSE;
 
 	// must match our kindof flags (if any)
-	if (md && !other->isKindOfMulti(md->m_kindof, md->m_kindofnot))
+	if ( !other->isKindOfMulti(md->m_kindof, md->m_kindofnot) )
 		return FALSE;
 
 	if( other->isEffectivelyDead() )
@@ -252,7 +241,7 @@ void CrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CollideModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -270,7 +259,7 @@ void CrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CollideModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -281,4 +270,4 @@ void CrateCollide::loadPostProcess( void )
 	// extend base class
 	CollideModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/HealCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/HealCrateCollide.cpp
index 2decbb142df..b9914fe9c9c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/HealCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/HealCrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/AudioEventRTS.h"
 #include "Common/MiscAudio.h"
 #include "Common/Player.h"
@@ -41,14 +41,14 @@
 HealCrateCollide::HealCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 HealCrateCollide::~HealCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool HealCrateCollide::executeCrateBehavior( Object *other )
@@ -60,7 +60,7 @@ Bool HealCrateCollide::executeCrateBehavior( Object *other )
 	AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateHeal;
 	soundToPlay.setPosition( other->getPosition() );
 	TheAudio->addAudioEvent(&soundToPlay);
-	
+
 	return TRUE;
 }
 
@@ -73,7 +73,7 @@ void HealCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -91,7 +91,7 @@ void HealCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -102,5 +102,5 @@ void HealCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/MoneyCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/MoneyCrateCollide.cpp
index 6055713c2cb..2302d0b4de6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/MoneyCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/MoneyCrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/AudioEventRTS.h"
 #include "Common/MiscAudio.h"
 #include "Common/Player.h"
@@ -41,20 +41,20 @@
 MoneyCrateCollide::MoneyCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 MoneyCrateCollide::~MoneyCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool MoneyCrateCollide::executeCrateBehavior( Object *other )
 {
 	UnsignedInt money = getMoneyCrateCollideModuleData()->m_moneyProvided;
-	
+
 	money += getUpgradedSupplyBoost(other);
 
 	other->getControllingPlayer()->getMoney()->deposit( money );
@@ -64,7 +64,7 @@ Bool MoneyCrateCollide::executeCrateBehavior( Object *other )
 	AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateMoney;
 	soundToPlay.setObjectID( other->getID() );
 	TheAudio->addAudioEvent(&soundToPlay);
-	
+
 	return TRUE;
 }
 
@@ -103,7 +103,7 @@ void MoneyCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -121,7 +121,7 @@ void MoneyCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -132,4 +132,4 @@ void MoneyCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageCommandCenterCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageCommandCenterCrateCollide.cpp
index 5f40cfa6b85..1d6e1fc9e6c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageCommandCenterCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageCommandCenterCrateCollide.cpp
@@ -23,17 +23,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageCommandCenterCrateCollide.cpp 
+//
+// FILE: SabotageCommandCenterCrateCollide.cpp
 // Author: Kris Morness, June 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that resets the timer on the target supply dropzone.
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
+
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/MiscAudio.h"
@@ -62,23 +62,18 @@
 #include "GameLogic/Module/SpecialPowerModule.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageCommandCenterCrateCollide::SabotageCommandCenterCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageCommandCenterCrateCollide::~SabotageCommandCenterCrateCollide( void )
 {
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -102,6 +97,14 @@ Bool SabotageCommandCenterCrateCollide::isValidToExecute( const Object *other )
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+#endif
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
@@ -133,7 +136,7 @@ Bool SabotageCommandCenterCrateCollide::executeCrateBehavior( Object *other )
 
 	//When the sabotage occurs, play the appropriate EVA
 	//event if the local player is the victim!
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_BuildingSabotaged );
 	}
@@ -161,7 +164,7 @@ void SabotageCommandCenterCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -179,7 +182,7 @@ void SabotageCommandCenterCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -190,4 +193,4 @@ void SabotageCommandCenterCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageFakeBuilding.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageFakeBuilding.cpp
index 1e93289966f..ba7eaa92092 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageFakeBuilding.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageFakeBuilding.cpp
@@ -23,17 +23,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageFakeBuildingCrateCollide.cpp 
+//
+// FILE: SabotageFakeBuildingCrateCollide.cpp
 // Author: Kris Morness, July 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that destroys a fake building.
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
+
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/MiscAudio.h"
@@ -57,23 +57,18 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/Module/DozerAIUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageFakeBuildingCrateCollide::SabotageFakeBuildingCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageFakeBuildingCrateCollide::~SabotageFakeBuildingCrateCollide( void )
 {
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -97,6 +92,14 @@ Bool SabotageFakeBuildingCrateCollide::isValidToExecute( const Object *other ) c
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+#endif
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
@@ -128,7 +131,7 @@ Bool SabotageFakeBuildingCrateCollide::executeCrateBehavior( Object *other )
 
 	//When the sabotage occurs, play the appropriate EVA
 	//event if the local player is the victim!
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_BuildingSabotaged );
 	}
@@ -143,7 +146,7 @@ Bool SabotageFakeBuildingCrateCollide::executeCrateBehavior( Object *other )
 		damageInfo.in.m_amount = other->getBodyModule()->getMaxHealth();
 		other->attemptDamage( &damageInfo );
 	}
-	
+
 	return TRUE;
 }
 
@@ -156,7 +159,7 @@ void SabotageFakeBuildingCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -174,7 +177,7 @@ void SabotageFakeBuildingCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -185,4 +188,4 @@ void SabotageFakeBuildingCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageInternetCenterCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageInternetCenterCrateCollide.cpp
index f590b1b2e52..b9fb327dad2 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageInternetCenterCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageInternetCenterCrateCollide.cpp
@@ -23,17 +23,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageInternetCenterCrateCollide.cpp 
+//
+// FILE: SabotageInternetCenterCrateCollide.cpp
 // Author: Kris Morness, July 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that temporarily disables an internet center
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
+
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/MiscAudio.h"
@@ -63,23 +63,18 @@
 #include "GameLogic/Module/SpyVisionUpdate.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageInternetCenterCrateCollide::SabotageInternetCenterCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageInternetCenterCrateCollide::~SabotageInternetCenterCrateCollide( void )
 {
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -103,6 +98,14 @@ Bool SabotageInternetCenterCrateCollide::isValidToExecute( const Object *other )
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+#endif
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
@@ -136,7 +139,7 @@ static void disableInternetCenterSpyVision( Object *obj, void *userData )
 			if( svUpdate )
 			{
 				//Turn off the vision temporarily. When it recovers from being disabled, the
-				//timer will need to start over from scratch so it won't come on right away unless 
+				//timer will need to start over from scratch so it won't come on right away unless
 				//it's a permanent spy vision.
 				svUpdate->setDisabledUntilFrame( frame );
 			}
@@ -163,14 +166,14 @@ Bool SabotageInternetCenterCrateCollide::executeCrateBehavior( Object *other )
 
   doSabotageFeedbackFX( other, CrateCollide::SAB_VICTIM_INTERNET_CENTER );
 
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_BuildingSabotaged );
 	}
 
 	//Loop through every internet center to temporarily disable the spy vision upgrades.
 	UnsignedInt frame = TheGameLogic->getFrame() + getSabotageInternetCenterCrateCollideModuleData()->m_sabotageFrames;
-	
+
 	//Disable all internet center spy visions (they stack) without visually disabling the other centers.
 	//Kris: Note -- Design has changed that we only can have one center at a time... logically, this code
 	//doesn't need to change.
@@ -186,7 +189,7 @@ Bool SabotageInternetCenterCrateCollide::executeCrateBehavior( Object *other )
 	//Disable all the hackers inside.
 	ContainModuleInterface *contain = other->getContain();
 	contain->iterateContained( disableHacker, (void*)frame, FALSE );
-		
+
 	return TRUE;
 }
 
@@ -199,7 +202,7 @@ void SabotageInternetCenterCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -217,7 +220,7 @@ void SabotageInternetCenterCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -228,4 +231,4 @@ void SabotageInternetCenterCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageMilitaryFactoryCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageMilitaryFactoryCrateCollide.cpp
index f779d2db2f8..16cb150bd95 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageMilitaryFactoryCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageMilitaryFactoryCrateCollide.cpp
@@ -23,17 +23,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageMilitaryFactoryCrateCollide.cpp 
+//
+// FILE: SabotageMilitaryFactoryCrateCollide.cpp
 // Author: Kris Morness, June 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that steals cash from the target supply center.
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
+
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/MiscAudio.h"
@@ -61,23 +61,18 @@
 #include "GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageMilitaryFactoryCrateCollide::SabotageMilitaryFactoryCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageMilitaryFactoryCrateCollide::~SabotageMilitaryFactoryCrateCollide( void )
 {
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -107,6 +102,14 @@ Bool SabotageMilitaryFactoryCrateCollide::isValidToExecute( const Object *other
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+#endif
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
@@ -136,14 +139,14 @@ Bool SabotageMilitaryFactoryCrateCollide::executeCrateBehavior( Object *other )
 
   doSabotageFeedbackFX( other, CrateCollide::SAB_VICTIM_MILITARY_FACTORY );
 
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_BuildingSabotaged );
 	}
 
 	UnsignedInt frame = TheGameLogic->getFrame() + getSabotageMilitaryFactoryCrateCollideModuleData()->m_sabotageFrames;
 	other->setDisabledUntil( DISABLED_HACKED, frame );
-		
+
 	return TRUE;
 }
 
@@ -156,7 +159,7 @@ void SabotageMilitaryFactoryCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -174,7 +177,7 @@ void SabotageMilitaryFactoryCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -185,4 +188,4 @@ void SabotageMilitaryFactoryCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotagePowerPlantCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotagePowerPlantCrateCollide.cpp
index 69e0c5fa1ca..9a4968fb08f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotagePowerPlantCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotagePowerPlantCrateCollide.cpp
@@ -23,17 +23,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotagePowerPlantCrateCollide.cpp 
+//
+// FILE: SabotagePowerPlantCrateCollide.cpp
 // Author: Kris Morness, June 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that makes the target powerplant lose power
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
+
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/MiscAudio.h"
@@ -57,23 +57,18 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/Module/DozerAIUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotagePowerPlantCrateCollide::SabotagePowerPlantCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotagePowerPlantCrateCollide::~SabotagePowerPlantCrateCollide( void )
 {
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -97,6 +92,14 @@ Bool SabotagePowerPlantCrateCollide::isValidToExecute( const Object *other ) con
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+#endif
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
@@ -128,7 +131,7 @@ Bool SabotagePowerPlantCrateCollide::executeCrateBehavior( Object *other )
 
 	//When the sabotage occurs, play the appropriate EVA
 	//event if the local player is the victim!
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_BuildingSabotaged );
 	}
@@ -145,7 +148,7 @@ Bool SabotagePowerPlantCrateCollide::executeCrateBehavior( Object *other )
 
 		//Note: Player::update() will check to turn it back on again once the timer expires.
 	}
-	
+
 	return TRUE;
 }
 
@@ -158,7 +161,7 @@ void SabotagePowerPlantCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -176,7 +179,7 @@ void SabotagePowerPlantCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -187,4 +190,4 @@ void SabotagePowerPlantCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSuperweaponCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSuperweaponCrateCollide.cpp
index 5963eb4859a..af44d63584e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSuperweaponCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSuperweaponCrateCollide.cpp
@@ -23,17 +23,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageSuperweaponCrateCollide.cpp 
+//
+// FILE: SabotageSuperweaponCrateCollide.cpp
 // Author: Kris Morness, June 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that resets the timer on the target supply dropzone.
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
+
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/MiscAudio.h"
@@ -62,23 +62,18 @@
 #include "GameLogic/Module/SpecialPowerModule.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageSuperweaponCrateCollide::SabotageSuperweaponCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageSuperweaponCrateCollide::~SabotageSuperweaponCrateCollide( void )
 {
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -102,6 +97,14 @@ Bool SabotageSuperweaponCrateCollide::isValidToExecute( const Object *other ) co
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+#endif
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
@@ -133,7 +136,7 @@ Bool SabotageSuperweaponCrateCollide::executeCrateBehavior( Object *other )
 
 	//When the sabotage occurs, play the appropriate EVA
 	//event if the local player is the victim!
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_BuildingSabotaged );
 	}
@@ -161,7 +164,7 @@ void SabotageSuperweaponCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -179,7 +182,7 @@ void SabotageSuperweaponCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -190,4 +193,4 @@ void SabotageSuperweaponCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyCenterCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyCenterCrateCollide.cpp
index 62d4ff26763..532fefa0248 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyCenterCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyCenterCrateCollide.cpp
@@ -23,17 +23,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageSupplyCenterCrateCollide.cpp 
+//
+// FILE: SabotageSupplyCenterCrateCollide.cpp
 // Author: Kris Morness, June 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that steals cash from the target supply center.
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
+
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/MiscAudio.h"
@@ -61,23 +61,18 @@
 #include "GameLogic/Module/SabotageSupplyCenterCrateCollide.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageSupplyCenterCrateCollide::SabotageSupplyCenterCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageSupplyCenterCrateCollide::~SabotageSupplyCenterCrateCollide( void )
 {
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -101,6 +96,14 @@ Bool SabotageSupplyCenterCrateCollide::isValidToExecute( const Object *other ) c
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+#endif
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
@@ -149,7 +152,7 @@ Bool SabotageSupplyCenterCrateCollide::executeCrateBehavior( Object *other )
 				controller->getScoreKeeper()->addMoneyEarned( cash );
 
 			//Play the "cash stolen" EVA event if the local player is the victim!
-			if( other && other->isLocallyControlled() )
+			if( other->isLocallyViewed() )
 			{
 				TheEva->setShouldPlay( EVA_CashStolen );
 			}
@@ -161,7 +164,7 @@ Bool SabotageSupplyCenterCrateCollide::executeCrateBehavior( Object *other )
 			pos.set( obj->getPosition() );
 			pos.z += 20.0f; //add a little z to make it show up above the unit.
 			TheInGameUI->addFloatingText( moneyString, &pos, GameMakeColor( 0, 255, 0, 255 ) );
-		
+
 			//Display cash lost floating over the target
 			moneyString.format( TheGameText->fetch( "GUI:LoseCash" ), cash );
 			pos.set( other->getPosition() );
@@ -170,13 +173,13 @@ Bool SabotageSupplyCenterCrateCollide::executeCrateBehavior( Object *other )
 		}
 		else
 		{
-			if( other->isLocallyControlled() )
+			if( other->isLocallyViewed() )
 			{
 				TheEva->setShouldPlay( EVA_BuildingSabotaged );
 			}
 		}
 	}
-		
+
 	return TRUE;
 }
 
@@ -189,7 +192,7 @@ void SabotageSupplyCenterCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -207,7 +210,7 @@ void SabotageSupplyCenterCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -218,4 +221,4 @@ void SabotageSupplyCenterCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyDropzoneCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyDropzoneCrateCollide.cpp
index 741f35a4884..8c67c347d9a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyDropzoneCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyDropzoneCrateCollide.cpp
@@ -23,17 +23,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-//	
-// FILE: SabotageSupplyDropzoneCrateCollide.cpp 
+//
+// FILE: SabotageSupplyDropzoneCrateCollide.cpp
 // Author: Kris Morness, June 2003
 // Desc:   A crate (actually a saboteur - mobile crate) that resets the timer on the target supply dropzone.
-//	
+//
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
+
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/MiscAudio.h"
@@ -61,23 +61,18 @@
 #include "GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageSupplyDropzoneCrateCollide::SabotageSupplyDropzoneCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SabotageSupplyDropzoneCrateCollide::~SabotageSupplyDropzoneCrateCollide( void )
 {
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -101,6 +96,14 @@ Bool SabotageSupplyDropzoneCrateCollide::isValidToExecute( const Object *other )
 		return FALSE;
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
+	if (other->getStatusBits().testForAny(MAKE_OBJECT_STATUS_MASK2(OBJECT_STATUS_UNDER_CONSTRUCTION, OBJECT_STATUS_SOLD)))
+	{
+		// TheSuperHackers @bugfix Stubbjax 03/08/2025 Can't enter something being sold or under construction.
+		return FALSE;
+	}
+#endif
+
 	Relationship r = getObject()->getRelationship( other );
 	if( r != ENEMIES )
 	{
@@ -130,7 +133,7 @@ Bool SabotageSupplyDropzoneCrateCollide::executeCrateBehavior( Object *other )
 
   doSabotageFeedbackFX( other, CrateCollide::SAB_VICTIM_DROP_ZONE );
 
-	//Reset the timer on the dropzone. Um... only the dropzone has an OCLUpdate and one, so 
+	//Reset the timer on the dropzone. Um... only the dropzone has an OCLUpdate and one, so
 	//we can "assume" it's going to be safe. Otherwise, we'll have to write code to search for
 	//a specific OCLUpdate.
 	static NameKeyType key_ocl = NAMEKEY( "OCLUpdate" );
@@ -159,7 +162,7 @@ Bool SabotageSupplyDropzoneCrateCollide::executeCrateBehavior( Object *other )
 				controller->getScoreKeeper()->addMoneyEarned( cash );
 
 			//Play the "cash stolen" EVA event if the local player is the victim!
-			if( other && other->isLocallyControlled() )
+			if( other->isLocallyViewed() )
 			{
 				TheEva->setShouldPlay( EVA_CashStolen );
 			}
@@ -171,7 +174,7 @@ Bool SabotageSupplyDropzoneCrateCollide::executeCrateBehavior( Object *other )
 			pos.set( obj->getPosition() );
 			pos.z += 20.0f; //add a little z to make it show up above the unit.
 			TheInGameUI->addFloatingText( moneyString, &pos, GameMakeColor( 0, 255, 0, 255 ) );
-		
+
 			//Display cash lost floating over the target
 			moneyString.format( TheGameText->fetch( "GUI:LoseCash" ), cash );
 			pos.set( other->getPosition() );
@@ -180,7 +183,7 @@ Bool SabotageSupplyDropzoneCrateCollide::executeCrateBehavior( Object *other )
 		}
 		else
 		{
-			if( other->isLocallyControlled() )
+			if( other->isLocallyViewed() )
 			{
 				TheEva->setShouldPlay( EVA_BuildingSabotaged );
 			}
@@ -200,7 +203,7 @@ void SabotageSupplyDropzoneCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -218,7 +221,7 @@ void SabotageSupplyDropzoneCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -229,4 +232,4 @@ void SabotageSupplyDropzoneCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SalvageCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SalvageCrateCollide.cpp
index 4a19ec26e20..047cc1d6d82 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SalvageCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SalvageCrateCollide.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "GameLogic/Module/SalvageCrateCollide.h"
 
 #include "Common/AudioEventRTS.h"
@@ -49,14 +49,14 @@
 SalvageCrateCollide::SalvageCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SalvageCrateCollide::~SalvageCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool SalvageCrateCollide::isValidToExecute( const Object *other ) const
@@ -79,7 +79,7 @@ Bool SalvageCrateCollide::executeCrateBehavior( Object *other )
 		doArmorSet(other);
 
 		//Play the salvage installation crate pickup sound.
-		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateSalvage;	
+		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateSalvage;
 		soundToPlay.setObjectID( other->getID() );
 		TheAudio->addAudioEvent( &soundToPlay );
 	}
@@ -88,10 +88,10 @@ Bool SalvageCrateCollide::executeCrateBehavior( Object *other )
 		doWeaponSet( other );
 
 		//Play the salvage installation crate pickup sound.
-		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateSalvage;	
+		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateSalvage;
 		soundToPlay.setObjectID( other->getID() );
 		TheAudio->addAudioEvent( &soundToPlay );
-		
+
 		//Play the unit voice acknowledgement for upgrading weapons.
 		//Already handled by the "move order"
 		//const AudioEventRTS *soundToPlayPtr = other->getTemplate()->getPerUnitSound( "VoiceSalvage" );
@@ -102,20 +102,20 @@ Bool SalvageCrateCollide::executeCrateBehavior( Object *other )
 	else if( eligibleForLevel( other ) && testLevelChance() )
 	{
 		doLevelGain( other );
-		
+
 		//Sound will play in
-		//soundToPlay = TheAudio->getMiscAudio()->m_unitPromoted;	
+		//soundToPlay = TheAudio->getMiscAudio()->m_unitPromoted;
 	}
 	else // just assume the testMoneyChance
 	{
 		doMoney( other );
-		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateMoney;	
+		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_crateMoney;
 		soundToPlay.setObjectID( other->getID() );
 		TheAudio->addAudioEvent(&soundToPlay);
 	}
 
 	other->getControllingPlayer()->getAcademyStats()->recordSalvageCollected();
-	
+
 	return TRUE;
 }
 
@@ -158,7 +158,7 @@ Bool SalvageCrateCollide::eligibleForLevel( Object *other )
 	// Sorry, you are max level
 	if( other->getExperienceTracker()->getVeterancyLevel() == LEVEL_HEROIC )
 		return FALSE;
-	
+
 	// Sorry, you can't gain levels
 	if( !other->getExperienceTracker()->isTrainable() )
 		return FALSE;
@@ -247,7 +247,7 @@ void SalvageCrateCollide::doMoney( Object *other )
 	{
 		other->getControllingPlayer()->getMoney()->deposit( money );
 		other->getControllingPlayer()->getScoreKeeper()->addMoneyEarned( money );
-		
+
 		//Display cash income floating over the crate.  Position is me, everything else is them.
 		UnicodeString moneyString;
 		moneyString.format( TheGameText->fetch( "GUI:AddCash" ), money );
@@ -268,7 +268,7 @@ void SalvageCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -286,7 +286,7 @@ void SalvageCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -297,4 +297,4 @@ void SalvageCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ShroudCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ShroudCrateCollide.cpp
index c6732ce933f..6c44bbfe30f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ShroudCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ShroudCrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/AudioEventRTS.h"
 #include "Common/MiscAudio.h"
 #include "Common/Player.h"
@@ -41,14 +41,14 @@
 ShroudCrateCollide::ShroudCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ShroudCrateCollide::~ShroudCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool ShroudCrateCollide::executeCrateBehavior( Object *other )
@@ -73,7 +73,7 @@ void ShroudCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -91,7 +91,7 @@ void ShroudCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -102,4 +102,4 @@ void ShroudCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/UnitCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/UnitCrateCollide.cpp
index 67bb3a20333..bed736f817b 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/UnitCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/UnitCrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/AudioEventRTS.h"
 #include "Common/MiscAudio.h"
 #include "Common/Player.h"
@@ -43,14 +43,14 @@
 UnitCrateCollide::UnitCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 UnitCrateCollide::~UnitCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool UnitCrateCollide::executeCrateBehavior( Object *other )
@@ -80,7 +80,7 @@ Bool UnitCrateCollide::executeCrateBehavior( Object *other )
 
 			newObj->setOrientation( other->getOrientation() );
 			newObj->setPosition( &creationPoint );
-		} 
+		}
 	}
 
 	//Play a crate pickup sound.
@@ -100,7 +100,7 @@ void UnitCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -118,7 +118,7 @@ void UnitCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -129,4 +129,4 @@ void UnitCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/VeterancyCrateCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/VeterancyCrateCollide.cpp
index ae7b98d1a14..0c35d459a90 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/VeterancyCrateCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/VeterancyCrateCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/Xfer.h"
 #include "GameLogic/ExperienceTracker.h"
@@ -43,14 +43,14 @@
 VeterancyCrateCollide::VeterancyCrateCollide( Thing *thing, const ModuleData* moduleData ) : CrateCollide( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 VeterancyCrateCollide::~VeterancyCrateCollide( void )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -103,12 +103,12 @@ Bool VeterancyCrateCollide::isValidToExecute( const Object *other ) const
 	{
 		if( other->getControllingPlayer() != getObject()->getControllingPlayer() )
 		{
-			//This is a pilot and we are checking to make sure the pilot is entering a vehicle on 
+			//This is a pilot and we are checking to make sure the pilot is entering a vehicle on
 			//the same team. If it's not, then don't allow it.. this is particularly the case for
 			//pilots attempting to enter civilian vehicles.
 			return false;
 		}
-		
+
 		if( other->isUsingAirborneLocomotor() )
 		{
 			// Can't upgrade a helicopter or plane, but we will think we can for a moment while it
@@ -125,7 +125,7 @@ Bool VeterancyCrateCollide::isValidToExecute( const Object *other ) const
 Bool VeterancyCrateCollide::executeCrateBehavior( Object *other )
 {
  	//Make sure the pilot is actually *TRYING* to enter the object
- 	//unlike other crates 
+ 	//unlike other crates
  	AIUpdateInterface *ai = (AIUpdateInterface*)getObject()->getAIUpdateInterface();
 	const VeterancyCrateCollideModuleData *md = getVeterancyCrateCollideModuleData();
 
@@ -158,7 +158,7 @@ Bool VeterancyCrateCollide::executeCrateBehavior( Object *other )
 			potentialObject->getExperienceTracker()->gainExpForLevel( levelsToGain, ( ! md->m_isPilot) );
 		}
 	}
-	
+
 	//In order to make things easier for the designers, we are going to transfer the terrorist name
 	//to the car... so the designer can control the car with their scripts.
 	if( md->m_isPilot )
@@ -178,7 +178,7 @@ void VeterancyCrateCollide::crc( Xfer *xfer )
 	// extend base class
 	CrateCollide::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -196,7 +196,7 @@ void VeterancyCrateCollide::xfer( Xfer *xfer )
 	// extend base class
 	CrateCollide::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -207,4 +207,4 @@ void VeterancyCrateCollide::loadPostProcess( void )
 	// extend base class
 	CrateCollide::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/FireWeaponCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/FireWeaponCollide.cpp
index 6003c17ffd5..0280700e07c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/FireWeaponCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/FireWeaponCollide.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_OBJECT_STATUS_NAMES
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -37,11 +37,11 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void FireWeaponCollideModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void FireWeaponCollideModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   CollideModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "CollideWeapon",		INI::parseWeaponTemplate,						NULL, offsetof( FireWeaponCollideModuleData, m_collideWeaponTemplate ) },
 		{ "FireOnce",					INI::parseBool,											NULL, offsetof( FireWeaponCollideModuleData, m_fireOnce ) },
@@ -54,7 +54,7 @@ void FireWeaponCollideModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-FireWeaponCollide::FireWeaponCollide( Thing *thing, const ModuleData* moduleData ) : 
+FireWeaponCollide::FireWeaponCollide( Thing *thing, const ModuleData* moduleData ) :
 	CollideModule( thing, moduleData ),
 	m_collideWeapon(NULL)
 {
@@ -66,8 +66,7 @@ FireWeaponCollide::FireWeaponCollide( Thing *thing, const ModuleData* moduleData
 //-------------------------------------------------------------------------------------------------
 FireWeaponCollide::~FireWeaponCollide( void )
 {
-	if (m_collideWeapon)
-		deleteInstance(m_collideWeapon);
+	deleteInstance(m_collideWeapon);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -81,7 +80,7 @@ void FireWeaponCollide::onCollide( Object *other, const Coord3D *loc, const Coor
 	Object *me = getObject();
 
 	// This will fire at you every frame, because multiple people could be colliding and we want
-	// to hurt them all.  Another solution would be to keep a Map of other->objetIDs and 
+	// to hurt them all.  Another solution would be to keep a Map of other->objetIDs and
 	// delays for each individually.  However, this solution here is so quick and simple that it
 	// warrants the "do it eventually if we need it" clause.
 	if( shouldFireWeapon() )
@@ -97,14 +96,14 @@ Bool FireWeaponCollide::shouldFireWeapon()
 	const FireWeaponCollideModuleData *d = getFireWeaponCollideModuleData();
 
 	ObjectStatusMaskType status = getObject()->getStatusBits();
-	
+
 	//We need all required status or else we fail
 	if( !status.testForAll( d->m_requiredStatus ) )
-		return FALSE; 
+		return FALSE;
 
 	//If we have any forbidden statii, then fail
 	if( status.testForAny( d->m_forbiddenStatus ) )
-		return FALSE; 
+		return FALSE;
 
 	if( m_everFired && d->m_fireOnce )
 		return FALSE;// can only fire once ever
@@ -121,7 +120,7 @@ void FireWeaponCollide::crc( Xfer *xfer )
 	// extend base class
 	CollideModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -146,22 +145,22 @@ void FireWeaponCollide::xfer( Xfer *xfer )
 	{
 
 		DEBUG_ASSERTCRASH( m_collideWeapon != NULL,
-											 ("FireWeaponCollide::xfer - m_collideWeapon present mismatch\n") );
+											 ("FireWeaponCollide::xfer - m_collideWeapon present mismatch") );
 		xfer->xferSnapshot( m_collideWeapon );
 
-	}  // end else
+	}
 	else
 	{
 
 		DEBUG_ASSERTCRASH( m_collideWeapon == NULL,
-											 ("FireWeaponCollide::Xfer - m_collideWeapon missing mismatch\n" ));
+											 ("FireWeaponCollide::Xfer - m_collideWeapon missing mismatch" ));
 
-	}  // end else
+	}
 
 	// ever fired
 	xfer->xferBool( &m_everFired );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -172,4 +171,4 @@ void FireWeaponCollide::loadPostProcess( void )
 	// extend base class
 	CollideModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/SquishCollide.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/SquishCollide.cpp
index e98f4c249b2..e66b5eaf701 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/SquishCollide.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/SquishCollide.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingFactory.h"
 #include "Common/Xfer.h"
@@ -41,11 +41,6 @@
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -69,7 +64,7 @@ void SquishCollide::onCollide( Object *other, const Coord3D *loc, const Coord3D
 	// Note that other == null means "collide with ground"
 	if (other == NULL)
 		return;
-	
+
 	Object *self = getObject();
 	AIUpdateInterface *ai = self->getAI();
 	if( ai && ai->getGoalObject() == other )
@@ -104,7 +99,7 @@ void SquishCollide::onCollide( Object *other, const Coord3D *loc, const Coord3D
  		GeometryInfo myGeom = self->getGeometryInfo();
 		myGeom.setMajorRadius(1.0f);
 		myGeom.setMinorRadius(1.0f);
-		if (!ThePartitionManager->geomCollidesWithGeom(other->getPosition(), other->getGeometryInfo(), other->getOrientation(), 
+		if (!ThePartitionManager->geomCollidesWithGeom(other->getPosition(), other->getGeometryInfo(), other->getOrientation(),
 			self->getPosition(), myGeom, self->getOrientation())) {
 			return;
 		}
@@ -143,7 +138,7 @@ void SquishCollide::crc( Xfer *xfer )
 	// extend base class
 	CollideModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -161,7 +156,7 @@ void SquishCollide::xfer( Xfer *xfer )
 	// extend base class
 	CollideModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -172,4 +167,4 @@ void SquishCollide::loadPostProcess( void )
 	// extend base class
 	CollideModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/CaveContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/CaveContain.cpp
index a40b98e413d..cca17ecd0c1 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/CaveContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/CaveContain.cpp
@@ -25,12 +25,12 @@
 // FILE: CaveContain.cpp ////////////////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, July 2002
 // Desc:   A version of OpenContain that overrides where the passengers are stored: one of CaveSystem's
-//					entries. Changing entry is a script or ini command.  All queries about capacity and 
+//					entries. Changing entry is a script or ini command.  All queries about capacity and
 //					contents are also redirected.  They change sides like Garrison too.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameState.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -94,14 +94,14 @@ void CaveContain::removeFromContain( Object *obj, Bool exposeStealthUnits )
 	}
 
 	// This must come before the onRemov*, because CaveContain's version has a edge-0 triggered event.
-	// If that were to go first, the number would still be 1 at that time.  Noone else cares about 
+	// If that were to go first, the number would still be 1 at that time.  Noone else cares about
 	// order.
 	myTracker->removeFromContain( obj, exposeStealthUnits );
 
 	// trigger an onRemoving event for 'm_object' no longer containing 'itemToRemove->m_object'
 	if (getObject()->getContain())
 		getObject()->getContain()->onRemoving( obj );
-		
+
 	// trigger an onRemovedFrom event for 'remove'
 	obj->onRemovedFrom( getObject() );
 
@@ -144,7 +144,7 @@ void CaveContain::onContaining( Object *obj, Bool wasSelected )
 
 	//
 	// the team of the building is now the same as those that have garrisoned it, be sure
-	// to save our original team tho so that we can revert back to it when all the 
+	// to save our original team tho so that we can revert back to it when all the
 	// occupants are gone
 	//
 	recalcApparentControllingPlayer();
@@ -152,7 +152,7 @@ void CaveContain::onContaining( Object *obj, Bool wasSelected )
 }
 
 //-------------------------------------------------------------------------------------------------
-void CaveContain::onRemoving( Object *obj ) 
+void CaveContain::onRemoving( Object *obj )
 {
 	OpenContain::onRemoving(obj);
 	// object is no longer held inside a garrisoned building
@@ -188,7 +188,7 @@ void CaveContain::onRemoving( Object *obj )
 			draw->clearModelConditionState( MODELCONDITION_GARRISONED );
 		}
 
-	}  // end if
+	}
 }
 
 Bool CaveContain::isValidContainerFor(const Object* obj, Bool checkCapacity) const
@@ -203,8 +203,8 @@ UnsignedInt CaveContain::getContainCount() const
 	return myTracker->getContainCount();
 }
 
-Int CaveContain::getContainMax( void ) const 
-{ 
+Int CaveContain::getContainMax( void ) const
+{
 	TunnelTracker *myTracker = TheCaveSystem->getTunnelTrackerForCaveIndex( m_caveIndex );
 	return myTracker->getContainMax();
 }
@@ -232,7 +232,7 @@ void CaveContain::onDie( const DamageInfo * damageInfo )
 	TheCaveSystem->unregisterCave( m_caveIndex );
 
 	myTracker->onTunnelDestroyed( getObject() );
-}  
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -254,7 +254,7 @@ void CaveContain::onBuildComplete( void )
 	TunnelTracker *myTracker = TheCaveSystem->getTunnelTrackerForCaveIndex( m_caveIndex );
 
 	myTracker->onTunnelCreated( getObject() );
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void CaveContain::tryToSetCaveIndex( Int newIndex )
@@ -341,18 +341,18 @@ void CaveContain::changeTeamOnAllConnectedCaves( Team *newTeam, Bool setOriginal
 		Object *currentCave = TheGameLogic->findObjectByID( *iter );
 		if( currentCave )
 		{
-			// This is a distributed Garrison in terms of capturing, so when one node 
+			// This is a distributed Garrison in terms of capturing, so when one node
 			// triggers the change, he needs to tell everyone, so anyone can do the un-change.
 			CaveInterface *caveModule = findCave(currentCave);
 			if( caveModule == NULL )
 				continue;
 			if( setOriginalTeams )
 				caveModule->setOriginalTeam( currentCave->getTeam() );
-			else 
+			else
 				caveModule->setOriginalTeam( NULL );
 
 			// Now do the actual switch for this one.
-			
+
 			currentCave->defect( newTeam, 0 );
 //			currentCave->setTeam( newTeam );
 		}
@@ -370,11 +370,11 @@ void CaveContain::setOriginalTeam( Team *oldTeam )
 // ------------------------------------------------------------------------------------------------
 void CaveContain::crc( Xfer *xfer )
 {
-	
+
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -411,18 +411,18 @@ void CaveContain::xfer( Xfer *xfer )
 			if( m_originalTeam == NULL )
 			{
 
-				DEBUG_CRASH(( "CaveContain::xfer - Unable to find original team by id\n" ));
+				DEBUG_CRASH(( "CaveContain::xfer - Unable to find original team by id" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else
 			m_originalTeam = NULL;
 
-	}  // end if
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -433,4 +433,4 @@ void CaveContain::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
index a31e291badb..cebefa404a7 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/PerfTimer.h"
@@ -54,10 +54,6 @@
 #include "GameClient/InGameUI.h"
 #include "GameClient/View.h"
 
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 enum { MUZZLE_FLASH_LIFETIME = LOGICFRAMES_PER_SECOND / 7 };
@@ -80,7 +76,7 @@ GarrisonContainModuleData::GarrisonContainModuleData( void )
   m_isEnclosingContainer = TRUE; ///< a sensible default for a garrison container... few exceptions, firebase is one
 
 	m_initialRoster.count = 0;
-}  // end if
+}
 
 //-----------------------------------------------------------------------------
 inline Real calcDistSqr(const Coord3D& a, const Coord3D& b)
@@ -91,10 +87,13 @@ inline Real calcDistSqr(const Coord3D& a, const Coord3D& b)
 // ------------------------------------------------------------------------------------------------
 /** Given the target position, find the garrison point that is closest to it */
 // ------------------------------------------------------------------------------------------------
-Int GarrisonContain::findClosestFreeGarrisonPointIndex( Int conditionIndex, 
+Int GarrisonContain::findClosestFreeGarrisonPointIndex( Int conditionIndex,
 																												const Coord3D *targetPos )
 {
+// TheSuperHackers @info helmutbuhler 05/05/2025 This debug mutates the code to become CRC incompatible
+#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC
 	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
+#endif
 
 	// sanity
 	if( targetPos == NULL || m_garrisonPointsInUse == MAX_GARRISON_POINTS )
@@ -119,15 +118,15 @@ Int GarrisonContain::findClosestFreeGarrisonPointIndex( Int conditionIndex,
 				closestDistSq = distSq;
 				closestIndex = i;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	return closestIndex;
 
-}  // end findClosestFreeGarrisonPointIndex
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given the object, return the garrison point index the object is placed at ... if any */
@@ -140,19 +139,19 @@ Int GarrisonContain::getObjectGarrisonPointIndex( Object *obj )
 		return GARRISON_INDEX_INVALID;
 
 	for( Int i = 0; i < MAX_GARRISON_POINTS; ++i )
-		if( m_garrisonPointData[ i ].object == obj ) 
+		if( m_garrisonPointData[ i ].object == obj )
 			return i;
 
 	return GARRISON_INDEX_INVALID;
 
-}  // end getObjectGarrisonPointIndex
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Put the object at the specified garrison point by index */
 // ------------------------------------------------------------------------------------------------
-void GarrisonContain::putObjectAtGarrisonPoint( Object *obj, 
+void GarrisonContain::putObjectAtGarrisonPoint( Object *obj,
 																								ObjectID targetID,
-																								Int conditionIndex, 
+																								Int conditionIndex,
 																								Int pointIndex )
 {
 	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
@@ -162,22 +161,22 @@ void GarrisonContain::putObjectAtGarrisonPoint( Object *obj,
 			conditionIndex < 0 || conditionIndex >= MAX_GARRISON_POINT_CONDITIONS )
 	{
 
-		DEBUG_CRASH(( "GarrisionContain::putObjectAtGarrisionPoint - Invalid arguments\n" ));
+		DEBUG_CRASH(( "GarrisionContain::putObjectAtGarrisionPoint - Invalid arguments" ));
 		return;
 
-	}  // end if
+	}
 
 	// make sure this point is empty
 	if( m_garrisonPointData[ pointIndex ].object != NULL )
 	{
 
-		DEBUG_CRASH(( "GarrisonContain::putObjectAtGarrisonPoint - Garrison Point '%d' is not empty\n", 
+		DEBUG_CRASH(( "GarrisonContain::putObjectAtGarrisonPoint - Garrison Point '%d' is not empty",
 									pointIndex ));
 		return;
 
-	}  // end if
+	}
 
-	// get the position we're going to use 
+	// get the position we're going to use
 	Coord3D pos = m_garrisonPoint[ conditionIndex ][ pointIndex ];
 
 	// set the object position
@@ -194,7 +193,7 @@ void GarrisonContain::putObjectAtGarrisonPoint( Object *obj,
 	// garrison point ready to shoot
 	//
 	static const ThingTemplate *muzzle = TheThingFactory->findTemplate( "GarrisonGun" );
-	DEBUG_ASSERTCRASH( muzzle, ("Warning, Object 'GarrisonGun' not found and is need for Garrison gun effects\n") );
+	DEBUG_ASSERTCRASH( muzzle, ("Warning, Object 'GarrisonGun' not found and is need for Garrison gun effects") );
 	if( muzzle && isEnclosingContainerFor( obj ) )// If we are showing the contained, we need no gun barrel drawable added
 	{
 		Drawable *draw = TheThingFactory->newDrawable( muzzle );
@@ -213,20 +212,20 @@ void GarrisonContain::putObjectAtGarrisonPoint( Object *obj,
 			if (containerDrawable)
 				draw->setFullyObscuredByShroud(containerDrawable->getFullyObscuredByShroud());
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 /*
 UnicodeString msg;
-msg.format( L"Added object '%S'(%d) to point '%d'", 
+msg.format( L"Added object '%S'(%d) to point '%d'",
 						obj->getTemplate()->getName().str(),
 						obj->getID(),
 						pointIndex );
 TheInGameUI->message( msg );
 */
 
-}  // end putObjectAtGarrisonPoint
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given the current state of the structure, return the condition index we are to use
@@ -244,7 +243,7 @@ Int GarrisonContain::findConditionIndex( void )
 		// --------------------------------------------------------------------------------------------
 		case BODY_PRISTINE:
 
-			index = GARRISON_POINT_PRISTINE; 
+			index = GARRISON_POINT_PRISTINE;
 			break;
 
 		// --------------------------------------------------------------------------------------------
@@ -257,21 +256,21 @@ Int GarrisonContain::findConditionIndex( void )
 		case BODY_REALLYDAMAGED:
 		case BODY_RUBBLE:
 
-			index = GARRISON_POINT_REALLY_DAMAGED; 
+			index = GARRISON_POINT_REALLY_DAMAGED;
 			break;
 
 		// --------------------------------------------------------------------------------------------
 		default:
 
-			DEBUG_CRASH(( "GarrisonContain::findConditionIndex - Unknown body damage type '%d'\n",
+			DEBUG_CRASH(( "GarrisonContain::findConditionIndex - Unknown body damage type '%d'",
 										bodyDamage ));
 			break;
 
-	}  // end switch
+	}
 
 	return index;
 
-}  // end findConditionIndex
+}
 
 //-------------------------------------------------------------------------------------------------
 //The weapon system would like to perform a range check assuming the object is placed in the
@@ -283,7 +282,7 @@ Bool GarrisonContain::calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3
 	if( !sourcePos || !targetPos )
 		return FALSE;
 
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("calcBestGarrisonPosition... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -297,7 +296,7 @@ Bool GarrisonContain::calcBestGarrisonPosition( Coord3D *sourcePos, const Coord3
 	Int placeIndex = findClosestFreeGarrisonPointIndex( conditionIndex, targetPos );
 	if( placeIndex == GARRISON_INDEX_INVALID )
 	{
-		DEBUG_CRASH( ("GarrisonContain::calcBestGarrisonPosition - Unable to find suitable garrison point.\n") );
+		DEBUG_CRASH( ("GarrisonContain::calcBestGarrisonPosition - Unable to find suitable garrison point.") );
 		return FALSE;
 	}
 
@@ -317,7 +316,7 @@ Bool GarrisonContain::attemptBestFirePointPosition( Object *source, Weapon *weap
 		return FALSE;
 	}
 
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("calcBestGarrisonPosition... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -357,7 +356,7 @@ Bool GarrisonContain::attemptBestFirePointPosition( Object *source, Weapon *weap
 	{
 		return FALSE;
 	}
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("calcBestGarrisonPosition... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -398,7 +397,7 @@ void GarrisonContain::putObjectAtBestGarrisonPoint( Object *obj, Object *target,
 	if( obj == NULL || (target == NULL && targetPos == NULL) )
 		return;
 
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("calcBestGarrisonPosition... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -415,14 +414,14 @@ void GarrisonContain::putObjectAtBestGarrisonPoint( Object *obj, Object *target,
 
 	// get the index of the garrison point that is closest to the target position
 	Int placeIndex = findClosestFreeGarrisonPointIndex( conditionIndex, targetPos );
-	DEBUG_ASSERTCRASH( placeIndex != GARRISON_INDEX_INVALID, 
-										 ("GarrisonContain::putObjectAtBestGarrisonPoint - Unable to find suitable garrison point for '%s'\n", 
+	DEBUG_ASSERTCRASH( placeIndex != GARRISON_INDEX_INVALID,
+										 ("GarrisonContain::putObjectAtBestGarrisonPoint - Unable to find suitable garrison point for '%s'",
 										 obj->getTemplate()->getName().str()) );
 
 	// put it here
 	putObjectAtGarrisonPoint( obj, target ? target->getID() : INVALID_ID, conditionIndex, placeIndex );
 
-}  // end putObjectAtBestGarrisonPoint
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove the object from the garrison point position and replace at the center of the building */
@@ -433,7 +432,7 @@ void GarrisonContain::removeObjectFromGarrisonPoint( Object *obj, Int index )
   if ( ! isEnclosingContainerFor(obj) )
     return;// since I am not enclosed, I am not at a garrison point!
 
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("calcBestGarrisonPosition... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -456,11 +455,11 @@ void GarrisonContain::removeObjectFromGarrisonPoint( Object *obj, Int index )
 				removeIndex = i;
 				break;
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 
 	// validate the index slot to remove
 	if( removeIndex < 0 || removeIndex >= MAX_GARRISON_POINTS )
@@ -472,7 +471,7 @@ void GarrisonContain::removeObjectFromGarrisonPoint( Object *obj, Int index )
 		//
 		return;
 
-	}  // end if
+	}
 
 	// remove from this spot
 	m_garrisonPointData[ removeIndex ].object = NULL;
@@ -491,18 +490,18 @@ void GarrisonContain::removeObjectFromGarrisonPoint( Object *obj, Int index )
 
 /*
 UnicodeString msg;
-msg.format( L"Removed object '%S'(%d) from point '%d'", 
+msg.format( L"Removed object '%S'(%d) from point '%d'",
 						obj->getTemplate()->getName().str(),
 						obj->getID(),
 						removeIndex );
 TheInGameUI->message( msg );
 */
 
-}  // end removeObjectFromGarrisonPoint
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-GarrisonContain::GarrisonContain( Thing *thing, const ModuleData *moduleData ) : 
+GarrisonContain::GarrisonContain( Thing *thing, const ModuleData *moduleData ) :
 								 OpenContain( thing, moduleData )
 {
 	Int i, j;
@@ -515,7 +514,7 @@ GarrisonContain::GarrisonContain( Thing *thing, const ModuleData *moduleData ) :
 
 	for( i = 0; i < MAX_GARRISON_POINTS; i++ )
 	{
-		
+
 		m_garrisonPointData[ i ].object = NULL;
 		m_garrisonPointData[ i ].targetID = INVALID_ID;
 		m_garrisonPointData[ i ].placeFrame = 0;
@@ -525,7 +524,7 @@ GarrisonContain::GarrisonContain( Thing *thing, const ModuleData *moduleData ) :
 		for( j = 0; j < MAX_GARRISON_POINT_CONDITIONS; ++j )
 			m_garrisonPoint[ j ][ i ].zero();
 
-	}  // end for i
+	}
 
 	m_rallyValid = FALSE;
 	m_exitRallyPoint.zero();
@@ -534,20 +533,20 @@ GarrisonContain::GarrisonContain( Thing *thing, const ModuleData *moduleData ) :
   m_evacDisposition = EVAC_BURST_FROM_CENTER; // default, anyway
 
 
-  m_stationPointList.clear(); 
+  m_stationPointList.clear();
 
-}  // end GarrisonContain
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 GarrisonContain::~GarrisonContain( void )
 {
 
-}  // end ~GarrisonContain
+}
 
 //-------------------------------------------------------------------------------------------------
-/** can this container contain this kind of object? 
-	and, if checkCapacity is TRUE, does this container have enough space 
+/** can this container contain this kind of object?
+	and, if checkCapacity is TRUE, does this container have enough space
 	left to hold the given unit? */
 // ------------------------------------------------------------------------------------------------
 Bool GarrisonContain::isValidContainerFor(const Object* obj, Bool checkCapacity) const
@@ -587,7 +586,7 @@ Bool GarrisonContain::isValidContainerFor(const Object* obj, Bool checkCapacity)
 // ------------------------------------------------------------------------------------------------
 void GarrisonContain::removeInvalidObjectsFromGarrisonPoints( void )
 {
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("removeinvalidobjFromGarrisonPoint... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -611,24 +610,24 @@ void GarrisonContain::removeInvalidObjectsFromGarrisonPoints( void )
 				Weapon *weapon = obj->getCurrentWeapon();
 				if( !weapon || !weapon->isWithinAttackRange( obj, goalObject ) )
 				{
-					//As a garrisoned member, if our target is out of range, 
+					//As a garrisoned member, if our target is out of range,
 					//then get out of the space, because someone else might
 					//be able to shoot it.
 					targetIsValid = false;
 				}
 			}
-			
+
 			// note that we can be attacking a position, rather than an object...
-			if( !obj->testStatus(OBJECT_STATUS_IS_ATTACKING) || !targetIsValid ) 
+			if( !obj->testStatus(OBJECT_STATUS_IS_ATTACKING) || !targetIsValid )
 			{
 				removeObjectFromGarrisonPoint( obj, i );
 			}
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end removeInvalidObjectsFromGarrisonPoints
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Are there any objects in the center that have now obtained targets and need to move to
@@ -638,7 +637,7 @@ void GarrisonContain::addValidObjectsToGarrisonPoints( void )
 {
 
 
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("addvalidobjtoGarrisonPoint... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -657,7 +656,7 @@ void GarrisonContain::addValidObjectsToGarrisonPoints( void )
 		{
 			Object *victim = ai->getCurrentVictim();
 			const Coord3D *victimPos = ai->getCurrentVictimPos();
-			
+
 			//
 			// add this object to the garrison point that is closest to its target if it's not
 			// already in there
@@ -667,11 +666,11 @@ void GarrisonContain::addValidObjectsToGarrisonPoints( void )
 			else if( victimPos )
 				putObjectAtBestGarrisonPoint( obj, NULL, victimPos );
 
-		}  // end if
+		}
 
-	}  // end for it
+	}
 
-}  // end addValidObjectsToGarrisonPoints
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Every frame this method is called.  It keeps any of the attacking units at any of the
@@ -693,11 +692,10 @@ void GarrisonContain::trackTargets( void )
 	AIUpdateInterface *ai;
 	Object *obj;
 
+	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized || containList.empty(), ("garrisonPoints are not inited"));
+
 	for( ContainedItemsList::const_iterator it = containList.begin(); it != containList.end(); ++it )
 	{
-
-		DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
-
 		// get the object
 		obj = *it;
 
@@ -721,7 +719,7 @@ void GarrisonContain::trackTargets( void )
 					const Coord3D *ourPos = obj->getPosition();
 
 					// find the closest free (of all remaining) garrison points to our target
-					Int newIndex = findClosestFreeGarrisonPointIndex( conditionIndex, 
+					Int newIndex = findClosestFreeGarrisonPointIndex( conditionIndex,
 																														victimPos );
 
 					// if unable to find another garrison point, don't bother
@@ -744,9 +742,9 @@ void GarrisonContain::trackTargets( void )
 							// place at the new index
 							putObjectAtGarrisonPoint( obj, victim ? victim->getID() : INVALID_ID, conditionIndex, newIndex );
 
-						}  // end if, new index is closer
+						}
 
-					}  // end if, possible closer index was found
+					}
 
 					//
 					// we are now either at a new garrison fire point, or we have remained at our
@@ -763,17 +761,17 @@ void GarrisonContain::trackTargets( void )
 						// orient the effect object towards the victim position
 						m_garrisonPointData[ ourIndex ].effect->setOrientation( v.toAngle() );
 
-					}  // end if
+					}
 
-				}  // end if, victim present
+				}
 
-			}  // end if, ai
+			}
 
-		}  // end if, we're at a garrison point
+		}
 
-	}  // end for it
+	}
 
-}  // end trackTargets
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove all the objects at garrison points back to the center and redeploy them among the
@@ -820,11 +818,11 @@ void GarrisonContain::redeployOccupants( void )
 			if( index != GARRISON_INDEX_INVALID )
 				m_garrisonPointData[ index ].placeFrame = garrisonPointDataCopy[ i ].placeFrame;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end redeployOccupants
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do any effects during an update cycle that we need to */
@@ -833,7 +831,7 @@ void GarrisonContain::updateEffects( void )
 {
 
 
-#if defined __DEBUG || defined RTS_INTERNAL
+#ifdef DEBUG_CRASHING
   const GarrisonContainModuleData *modData = getGarrisonContainModuleData();
   DEBUG_ASSERTCRASH(modData->m_isEnclosingContainer, ("updateeffects... SHOULD NOT GET HERE, since this container is non-enclosing") );
 #endif
@@ -870,25 +868,25 @@ void GarrisonContain::updateEffects( void )
 					{
 						// set the model condition
 						effect->setModelConditionState( MODELCONDITION_FIRING_A );
-						
+
 						// mark this "fire frame" so we can turn it off in a little while
 						m_garrisonPointData[ garrisonIndex ].lastEffectFrame = currentFrame;
-					
+
 					}
-				}  // end if
+				}
+
+			}
 
-			}  // end if, object is at garrision point
-						
-		}  // end if, object shot last frame
+		}
 
-	}  // end for containment iterator
+	}
 
 	// remove any firing effects for time that has passed
 	for( Int i = 0; i < MAX_GARRISON_POINTS; ++i )
 	{
 
-		if( m_garrisonPointData[ i ].effect && 
-				m_garrisonPointData[ i ].lastEffectFrame != 0 && 
+		if( m_garrisonPointData[ i ].effect &&
+				m_garrisonPointData[ i ].lastEffectFrame != 0 &&
 				currentFrame - m_garrisonPointData[ i ].lastEffectFrame > MUZZLE_FLASH_LIFETIME  )
 		{
 
@@ -898,11 +896,11 @@ void GarrisonContain::updateEffects( void )
 			// clear the last effect frame
 			m_garrisonPointData[ i ].lastEffectFrame = 0;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end updateEffects
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -936,10 +934,10 @@ UpdateSleepTime GarrisonContain::update( void )
 			#define HUGE_FRAME_IN_FUTURE (LOGICFRAMES_PER_SECOND * 1000)
 			contained->setSafeOcclusionFrame( TheGameLogic->getFrame() + HUGE_FRAME_IN_FUTURE );
 
-		}  // end if
+		}
+
+	}
 
-	}  // end for, it
-	
 // Lorenzen changed, 6/11/03, so that garrisoncontains that are not enclosing will keep units at their assigned stations,
 // rather than Bamphing them all over the building as they fire.
 //	// are there any objects at the garrison points who now need to go back to the center of the structure
@@ -954,7 +952,7 @@ UpdateSleepTime GarrisonContain::update( void )
 
 	healObjects();
 
-	if (modData->m_mobileGarrison && (getObject()->isMobile() == TRUE) ) 
+	if (modData->m_mobileGarrison && (getObject()->isMobile() == TRUE) )
 	{
 		moveObjectsWithMe();
 	}
@@ -962,11 +960,11 @@ UpdateSleepTime GarrisonContain::update( void )
 	{
 		// sanity information
 		DEBUG_ASSERTCRASH( getObject()->isMobile() == FALSE,
-		 ("GarrisonContain::update - Objects with garrison contain can be spec'd as 'mobile' in the INI. Do you really want to do this? \n") );
+		 ("GarrisonContain::update - Objects with garrison contain can be spec'd as 'mobile' in the INI. Do you really want to do this?") );
 	}
 
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 
 
@@ -1021,7 +1019,7 @@ void GarrisonContain::positionObjectsAtStationGarrisonPoints()
     // now lets find him in our station point list, and make sure he stays put there.
     for( std::vector<StationPointData>::const_iterator pt = m_stationPointList.begin();
     pt != m_stationPointList.end();
-    ++pt) 
+    ++pt)
     {
       const StationPointData *spd = &*pt;
 
@@ -1031,15 +1029,15 @@ void GarrisonContain::positionObjectsAtStationGarrisonPoints()
         foundHisSpot = TRUE;
         break;
       }
-      
+
     }
 
     if ( ! foundHisSpot && ! pickAStationForMe( contained ))
     {
       DEBUG_ASSERTCRASH( foundHisSpot, ("GarrisonContain::positionObjectsAtStationGarrisonPoints found something terribly wrong... \nthere is either a station point shortage, or some other bug."));
     }
-  
-	}  // end for, it
+
+	}
 
 }
 
@@ -1051,7 +1049,7 @@ void GarrisonContain::positionObjectsAtStationGarrisonPoints()
 Bool GarrisonContain::pickAStationForMe( const Object *obj )
 {
   Bool foundVacancy = FALSE;
-  for( std::vector<StationPointData>::iterator pt = m_stationPointList.begin(); pt != m_stationPointList.end(); ++pt) 
+  for( std::vector<StationPointData>::iterator pt = m_stationPointList.begin(); pt != m_stationPointList.end(); ++pt)
   {
     StationPointData *spd = &*pt; // non const
     if ( spd->occupantID  == INVALID_ID ) // found a vacancy
@@ -1076,7 +1074,7 @@ void GarrisonContain::removeObjectFromStationPoint( const Object *obj )
     return;
 
   Bool foundOccupant = FALSE;
-  for( std::vector<StationPointData>::iterator pt = m_stationPointList.begin(); pt != m_stationPointList.end(); ++pt) 
+  for( std::vector<StationPointData>::iterator pt = m_stationPointList.begin(); pt != m_stationPointList.end(); ++pt)
   {
     StationPointData *spd = &*pt; // non const
     if ( spd->occupantID  == obj->getID() ) // found him sitting there
@@ -1112,7 +1110,7 @@ void GarrisonContain::onDamage( DamageInfo * /*info*/ )
 //
 //		healSingleObject(obj, modData->m_framesForFullHeal);
 //	}
-  
+
 
 
 }
@@ -1161,14 +1159,14 @@ void GarrisonContain::healSingleObject( Object *obj, Real framesForFullHeal)
 	// if we've been in here long enough ... set our health to max
 	if( TheGameLogic->getFrame() - obj->getContainedByFrame() >= framesForFullHeal )
 	{
-	
+
 		// set the amount to max just to be sure we're at the top
 		healInfo.in.m_amount = body->getMaxHealth();
-		
+
 		// set max health
 		body->attemptHealing( &healInfo );
 
-	}  // end if
+	}
 	else
 	{
 		//
@@ -1181,11 +1179,11 @@ void GarrisonContain::healSingleObject( Object *obj, Real framesForFullHeal)
 		// do the healing
 		body->attemptHealing( &healInfo );
 
-	}  // end else
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
-/** return the player that *appears* to control this unit. if null, 
+/** return the player that *appears* to control this unit. if null,
 		use getObject()->getControllingPlayer() instead. */
 // ------------------------------------------------------------------------------------------------
 const Player* GarrisonContain::getApparentControllingPlayer( const Player* observingPlayer ) const
@@ -1226,7 +1224,7 @@ void GarrisonContain::recalcApparentControllingPlayer( void )
 		// since the Radar refresh in setTeam will want to use it to decide our color.
 		Bool detected = rider->getStatusBits().test( OBJECT_STATUS_DETECTED );
 		m_hideGarrisonedStateFromNonallies = ( !detected && ( getStealthUnitsContained() == getContainCount() ) );
-		
+
 		Player* controller = rider->getControllingPlayer();
 		Team *team = controller ? controller->getDefaultTeam() : NULL;
 		if( team )
@@ -1354,7 +1352,7 @@ void GarrisonContain::loadGarrisonPoints( void )
 		conditionIndex = GARRISON_POINT_PRISTINE;
 
 		count = structure->getMultiLogicalBonePosition("FIREPOINT", MAX_GARRISON_POINTS, m_garrisonPoint[ conditionIndex ], NULL);
-		
+
 		if ( count > 0) gBonesFound = TRUE;
 
 		// damaged garrisoned
@@ -1387,15 +1385,15 @@ void GarrisonContain::loadGarrisonPoints( void )
 
 		// restore the original condition flags
 		draw->replaceModelConditionFlags( originalFlags );
-		
-	}  // end if, draw
 
-	// garrison points are now initialized 
+	}
+
+	// garrison points are now initialized
 	m_garrisonPointsInitialized = TRUE;
 
 
 
-	if (gBonesFound && modData->m_mobileGarrison && (getObject()->isMobile() == TRUE) ) 
+	if (gBonesFound && modData->m_mobileGarrison && (getObject()->isMobile() == TRUE) )
 	{
 		DEBUG_ASSERTCRASH( getObject()->isMobile() == FALSE,
 		 ("GarrisonContain::update - You have specified this garrisonContain as mobile,\n yet you want garrison point placement bones... \n what are you thinking?") );
@@ -1403,7 +1401,7 @@ void GarrisonContain::loadGarrisonPoints( void )
 
 
 
-}  // end loadGarrisonPoints
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Validate any exit rally point that has been chosen (if any).  If it's not valid,
@@ -1427,7 +1425,7 @@ void GarrisonContain::validateRallyPoint( void )
 		if( ThePartitionManager->findPositionAround( &m_exitRallyPoint, &options, &result ) == FALSE )
 			m_rallyValid = FALSE;
 
-	}  // end if
+	}
 
 	// if no rally point is present, try to find one
 	if( m_rallyValid == FALSE )
@@ -1443,9 +1441,9 @@ void GarrisonContain::validateRallyPoint( void )
 		m_rallyValid = ThePartitionManager->findPositionAround( getObject()->getPosition(),
 																													  &options,
 																													  &m_exitRallyPoint );
-	}  // end if
+	}
 
-}  // end validateRallyPoint
+}
 
 
 
@@ -1482,14 +1480,14 @@ void GarrisonContain::removeAllContained( Bool exposeStealthUnits )
 		// validate the current rally point is still a good one, or pick a new one
 		validateRallyPoint();
 
-	}  // end if
+	}
 
 	// call the base class to extend functionality and do the actual removal
 	OpenContain::removeAllContained( exposeStealthUnits );
 
 	recalcApparentControllingPlayer();
 
-}  // end removeAllContained
+}
 
 // ------------------------------------------------------------------------------------------------
 /** 'exitObj' is one of the things we contain, it needs to 'exit' us */
@@ -1498,7 +1496,7 @@ void GarrisonContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor
 {
 	DEBUG_ASSERTCRASH(exitDoor == DOOR_1, ("multiple exit doors not supported here"));
 
-	// We don't use the ExitPath system of the general OpenContain, we just send people out.  The 
+	// We don't use the ExitPath system of the general OpenContain, we just send people out.  The
 	// direction of outing has been picked by Design to be the Screen Down at the default camera angle.
 	removeFromContain( exitObj );
 
@@ -1507,14 +1505,14 @@ void GarrisonContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor
 
 	Real exitAngle = getObject()->getOrientation();
 
-  // Garrison doesn't have reserveDoor or exitDelay, so if we do nothing, everyone will appear on top 
+  // Garrison doesn't have reserveDoor or exitDelay, so if we do nothing, everyone will appear on top
 	// of each other and get stuck inside each others' extent (except for the first guy).  So we'll
 	// scatter the start point around a little to make it better.
 	startPosition = *getObject()->getPosition();
 	// In the case of cliff bunkers, the units start in a cliff.  So we want to adjust.
 	AIUpdateInterface  *ai = exitObj->getAI();
 	if (ai) {
-		Locomotor *loco = ai->getCurLocomotor(); 
+		Locomotor *loco = ai->getCurLocomotor();
 		if (loco && !TheAI->pathfinder()->validMovementTerrain( LAYER_GROUND, loco, &startPosition)) {
 			// try front & back.
 			Real offset = getObject()->getGeometryInfo().getMajorRadius();
@@ -1530,7 +1528,7 @@ void GarrisonContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor
 		}
 	}
 
-  
+
 
 
   if ( m_evacDisposition == EVAC_TO_LEFT || m_evacDisposition == EVAC_TO_RIGHT  )
@@ -1540,7 +1538,7 @@ void GarrisonContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor
 
     Real containerHalfLength = getObject()->getGeometryInfo().getMajorRadius() ;
     Real containerHalfWidth = getObject()->getGeometryInfo().getMinorRadius() ;
-    
+
     Vector3 doorPosition;
     doorPosition.X = GameLogicRandomValueReal( -containerHalfLength/4, containerHalfLength/4 );// a rectangular pocket to act as the "doorway"
     doorPosition.Y = GameLogicRandomValueReal( containerHalfWidth/2, containerHalfWidth * 2) * EVAC__SCALAR;
@@ -1563,7 +1561,7 @@ void GarrisonContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor
 
 	  exitObj->setPosition( &startPosition );
 	  exitObj->setOrientation( exitAngle );
-  
+
 	  ///< @todo This really should be automatically wrapped up in an activation sequence	for objects in general
 	  // tell the AI about it
 	  TheAI->pathfinder()->addObjectToPathfindMap( exitObj );
@@ -1636,7 +1634,7 @@ void GarrisonContain::onContaining( Object *obj, Bool wasSelected )
 
 	//
 	// the team of the building is now the same as those that have garrisoned it, be sure
-	// to save our original team tho so that we can revert back to it when all the 
+	// to save our original team tho so that we can revert back to it when all the
 	// occupants are gone
 	//
 	recalcApparentControllingPlayer();
@@ -1646,7 +1644,7 @@ void GarrisonContain::onContaining( Object *obj, Bool wasSelected )
     TheInGameUI->deselectDrawable( draw );
 
 
-}  // end onContaining
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1696,7 +1694,7 @@ void GarrisonContain::onRemoving( Object *obj )
 			draw->clearModelConditionState( MODELCONDITION_GARRISONED );
 		}
 
-	}  // end if
+	}
 	else if( getStealthUnitsContained() != getContainCount() )
 	{
 		m_hideGarrisonedStateFromNonallies = false;
@@ -1707,7 +1705,7 @@ void GarrisonContain::onRemoving( Object *obj )
 	obj->setSafeOcclusionFrame(TheGameLogic->getFrame()+obj->getTemplate()->getOcclusionDelay());
 
 	recalcApparentControllingPlayer();
-}  // end onRemoving
+}
 
 // ------------------------------------------------------------------------------------------------
 /** A GarrisonContain always lets people shoot out */
@@ -1721,7 +1719,7 @@ Bool GarrisonContain::isPassengerAllowedToFire( ObjectID id ) const
 
 	return TRUE;
 
-}  // end isPassengerAllowedToFire
+}
 
 // ------------------------------------------------------------------------------------------------
 /** A Mobile garrison keeps its occupants with it when it moves */
@@ -1776,7 +1774,7 @@ void GarrisonContain::onObjectCreated()
 		}
 		else
 		{
-			DEBUG_CRASH( ( "DeliverPayload: PutInContainer %s is full, or not valid for the payload %s!", 
+			DEBUG_CRASH( ( "DeliverPayload: PutInContainer %s is full, or not valid for the payload %s!",
 				object->getName().str(), self->m_initialRoster.templateName.str() ) );
 		}
 	}
@@ -1791,7 +1789,7 @@ void GarrisonContain::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1823,16 +1821,16 @@ void GarrisonContain::xfer( Xfer *xfer )
 			if( m_originalTeam == NULL )
 			{
 
-				DEBUG_CRASH(( "GarrisonContain::xfer - Unable to find original team by id\n" ));
+				DEBUG_CRASH(( "GarrisonContain::xfer - Unable to find original team by id" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else
 			m_originalTeam = NULL;
 
-	}  // end if
+	}
 
 	xfer->xferBool( &m_hideGarrisonedStateFromNonallies );
 
@@ -1852,7 +1850,7 @@ void GarrisonContain::xfer( Xfer *xfer )
 
 			// target
 			xfer->xferObjectID( &m_garrisonPointData[ i ].targetID );
-			
+
 			// placement frame
 			xfer->xferUnsignedInt( &m_garrisonPointData[ i ].placeFrame );
 
@@ -1864,7 +1862,7 @@ void GarrisonContain::xfer( Xfer *xfer )
 			DrawableID drawableID = draw ? draw->getID() : INVALID_DRAWABLE_ID;
 			xfer->xferDrawableID( &drawableID );
 
-		}  // end if, save
+		}
 		else
 		{
 
@@ -1875,7 +1873,7 @@ void GarrisonContain::xfer( Xfer *xfer )
 			// target
 			ObjectID targetID;
 			xfer->xferObjectID( &targetID );
-			
+
 			// placement frame
 			UnsignedInt placeFrame;
 			xfer->xferUnsignedInt( &placeFrame );
@@ -1898,11 +1896,11 @@ void GarrisonContain::xfer( Xfer *xfer )
 				m_garrisonPointData[ i ].lastEffectFrame = lastEffectFrame;
 				m_garrisonPointData[ i ].effectID = drawableID;
 
-			}  // end if
+			}
 
-		}  // end else, load
+		}
 
-	}  // end for i
+	}
 
 	// garrison points in use
 	xfer->xferInt( &m_garrisonPointsInUse );
@@ -1919,7 +1917,7 @@ void GarrisonContain::xfer( Xfer *xfer )
 	// exit rally point
 	xfer->xferCoord3D( &m_exitRallyPoint );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1934,7 +1932,7 @@ void GarrisonContain::loadPostProcess( void )
 	for( Int i = 0; i < MAX_GARRISON_POINTS; i++ )
 	{
 
-		// object pointer		
+		// object pointer
 		if( m_garrisonPointData[ i ].objectID != INVALID_ID )
 		{
 
@@ -1942,12 +1940,12 @@ void GarrisonContain::loadPostProcess( void )
 			if( m_garrisonPointData[ i ].object == NULL )
 			{
 
-				DEBUG_CRASH(( "GarrisonContain::loadPostProcess - Unable to find object for point data\n" ));
+				DEBUG_CRASH(( "GarrisonContain::loadPostProcess - Unable to find object for point data" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else
 			m_garrisonPointData[ i ].object = NULL;
 
@@ -1959,18 +1957,18 @@ void GarrisonContain::loadPostProcess( void )
 			if( m_garrisonPointData[ i ].effect == NULL )
 			{
 
-				DEBUG_CRASH(( "GarrisonContain::loadPostProcess - Unable to find effect for point data\n" ));
+				DEBUG_CRASH(( "GarrisonContain::loadPostProcess - Unable to find effect for point data" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else
 			m_garrisonPointData[ i ].effect = NULL;
 
-	}  // end for i
+	}
 
-}  // end loadPostProcess
+}
 
 
 
@@ -1989,7 +1987,7 @@ void GarrisonContain::loadStationGarrisonPoints( void )
 
 	//
 	// in order to get all the station point positions we will actually switch the model
-	// condition to garrisoned pristine, and use these for any modelcondition 
+	// condition to garrisoned pristine, and use these for any modelcondition
 	{
 		Int conditionIndex;
 		Int count = 0;
@@ -2034,21 +2032,21 @@ void GarrisonContain::loadStationGarrisonPoints( void )
 		draw->replaceModelConditionFlags( originalFlags );
 
     //tempBuffer pops
-    
-	} 
 
-	// garrison points are now initialized 
+	}
+
+	// garrison points are now initialized
 	m_stationGarrisonPointsInitialized = TRUE;
 
 
 
-	if (stationBonesFound && modData->m_mobileGarrison && (getObject()->isMobile() == TRUE) ) 
+	if (stationBonesFound && modData->m_mobileGarrison && (getObject()->isMobile() == TRUE) )
 	{
 		DEBUG_ASSERTCRASH( getObject()->isMobile() == FALSE,
 		 ("GarrisonContain::update - You have specified this garrisonContain as mobile,\n yet you want station garrison point placement bones... \n what are you thinking?") );
 	}
 
-}  // end loadStationGarrisonPoints
+}
 
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/HealContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/HealContain.cpp
index b5ab09722d1..6ad5180f880 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/HealContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/HealContain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameLogic/Damage.h"
 #include "GameLogic/GameLogic.h"
@@ -48,7 +48,7 @@ HealContainModuleData::HealContainModuleData( void )
 
 	m_framesForFullHeal = 0;
 
-}  // end HealContainModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -57,7 +57,7 @@ HealContainModuleData::HealContainModuleData( void )
 
   OpenContainModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "TimeForFullHeal", INI::parseDurationUnsignedInt, NULL, offsetof( HealContainModuleData, m_framesForFullHeal ) },
 		{ 0, 0, 0, 0 }
@@ -65,7 +65,7 @@ HealContainModuleData::HealContainModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -77,14 +77,14 @@ HealContain::HealContain( Thing *thing, const ModuleData *moduleData )
 					 : OpenContain( thing, moduleData )
 {
 
-}  // end HealContain
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 HealContain::~HealContain( void )
 {
 
-}  // end ~HealContain
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Per frame update */
@@ -123,13 +123,13 @@ UpdateSleepTime HealContain::update( void )
 			ExitDoorType exitDoor = reserveDoorForExit(obj->getTemplate(), obj);
 			if (exitDoor != DOOR_NONE_AVAILABLE)
 				exitObjectViaDoor( obj, exitDoor );
-		}  // end if
+		}
 
-	}  // end for, it
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do the healing for a single object for a single frame. */
@@ -150,17 +150,17 @@ Bool HealContain::doHeal( Object *obj, UnsignedInt framesForFullHeal )
 	// if we've been in here long enough ... set our health to max
 	if( TheGameLogic->getFrame() - obj->getContainedByFrame() >= framesForFullHeal )
 	{
-	
+
 		// set the amount to max just to be sure we're at the top
 		healInfo.in.m_amount = body->getMaxHealth();
-		
+
 		// set max health
 		body->attemptHealing( &healInfo );
 
 		// we're done healing
 		doneHealing = TRUE;
 
-	}  // end if
+	}
 	else
 	{
 
@@ -174,12 +174,12 @@ Bool HealContain::doHeal( Object *obj, UnsignedInt framesForFullHeal )
 		// do the healing
 		body->attemptHealing( &healInfo );
 
-	}  // end else
+	}
 
 	// return if we're done healing
 	return doneHealing;
-				
-}  // end doHeal
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -190,7 +190,7 @@ void HealContain::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -208,7 +208,7 @@ void HealContain::xfer( Xfer *xfer )
 	// extend base class
 	OpenContain::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -219,4 +219,4 @@ void HealContain::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/HelixContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/HelixContain.cpp
index e25ffe78af7..84f1f50988e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/HelixContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/HelixContain.cpp
@@ -27,12 +27,12 @@
 //  FILE: HelixContain.cpp ////////////////////////////////////////////////////////////////////////
 //  Author: Mark Lorenzen, April, 2003
 //
-//  Desc:   
+//  Desc:
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/Xfer.h"
 #include "Common/ThingTemplate.h"
@@ -47,11 +47,6 @@
 #include "GameLogic/Weapon.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // ------------------------------------------------------------------------------------------------
@@ -69,8 +64,8 @@ void HelixContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   TransportContainModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
-	{		
+	static const FieldParse dataFieldParse[] =
+	{
     { "PayloadTemplateName",  INI::parseAsciiStringVectorAppend, NULL, offsetof(HelixContainModuleData, m_payloadTemplateNameData) },
     {"ShouldDrawPips",  INI::parseBool, NULL, offsetof(HelixContainModuleData, m_drawPips) },
 
@@ -86,14 +81,14 @@ void HelixContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 //	const char* name = ini->getNextToken();
 //	const char* countStr = ini->getNextTokenOrNull();
 //	Int count = countStr ? INI::scanInt(countStr) : 1;
-	
+
 //	self->m_initialPayload.name.set(name);
 //	self->m_initialPayload.count = count;
 //}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-HelixContain::HelixContain( Thing *thing, const ModuleData *moduleData ) : 
+HelixContain::HelixContain( Thing *thing, const ModuleData *moduleData ) :
 								 TransportContain( thing, moduleData )
 {
 
@@ -137,7 +132,7 @@ void HelixContain::redeployOccupants( void )
 {
   Coord3D firePos = *getObject()->getPosition();
   firePos.z += 8;
-  
+
 
 	for (ContainedItemsList::iterator it = m_containList.begin(); it != m_containList.end(); ++it)
   {
@@ -169,7 +164,7 @@ void HelixContain::createPayload()
 		  const ThingTemplate* temp = TheThingFactory->findTemplate( *iter );
 		  if (temp)
 		  {
-			  Object* payload = TheThingFactory->newObject( temp, object->getTeam() ); 
+			  Object* payload = TheThingFactory->newObject( temp, object->getTeam() );
 
 			  if( contain->isValidContainerFor( payload, true ) )
 			  {
@@ -187,7 +182,7 @@ void HelixContain::createPayload()
 
 		contain->enableLoadSounds( TRUE );
 
-  } // endif contain
+  }
 
 	m_payloadCreated = TRUE;
 
@@ -195,8 +190,8 @@ void HelixContain::createPayload()
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void HelixContain::onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+void HelixContain::onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState)  ///< state change callback
 {
   // Need to apply state change to the portable structure
@@ -205,7 +200,7 @@ void HelixContain::onBodyDamageStateChange( const DamageInfo* damageInfo,
   {
 		portable->getBodyModule()->setDamageState( newState );
   }
-  
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -249,7 +244,7 @@ void HelixContain::onCapture( Player *oldOwner, Player *newOwner )
 //-------------------------------------------------------------------------------------------------
 void HelixContain::addToContainList( Object *obj )
 {
-  if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && m_portableStructureID == INVALID_ID)  
+  if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && m_portableStructureID == INVALID_ID)
   {
     Object *portable = getPortableStructure();
     if ( portable )
@@ -267,7 +262,7 @@ void HelixContain::addToContainList( Object *obj )
 //-------------------------------------------------------------------------------------------------
 void HelixContain::addToContain( Object *obj )
 {
-  if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && m_portableStructureID == INVALID_ID)  
+  if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && m_portableStructureID == INVALID_ID)
   {
     Object *portable = getPortableStructure();
     if ( portable )
@@ -285,7 +280,7 @@ void HelixContain::addToContain( Object *obj )
 //-------------------------------------------------------------------------------------------------
 void HelixContain::removeFromContain( Object *obj, Bool exposeStealthUnits )
 {
-  if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && obj->getID() == m_portableStructureID )  
+  if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && obj->getID() == m_portableStructureID )
 	{
     Object *portable = getPortableStructure();
     if ( portable )
@@ -304,7 +299,7 @@ void HelixContain::removeFromContain( Object *obj, Bool exposeStealthUnits )
 //-------------------------------------------------------------------------------------------------
 Bool HelixContain::isValidContainerFor(const Object* obj, Bool checkCapacity) const
 {
-  if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && INVALID_ID == m_portableStructureID )  
+  if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && INVALID_ID == m_portableStructureID )
     return TRUE;
 
 	return TransportContain::isValidContainerFor( obj, checkCapacity );
@@ -314,7 +309,7 @@ Bool HelixContain::isValidContainerFor(const Object* obj, Bool checkCapacity) co
 //-------------------------------------------------------------------------------------------------
 const Object *HelixContain::friend_getRider() const
 {
-// The draw order dependency bug for riders means that our draw module needs to cheat to get around it.	
+// The draw order dependency bug for riders means that our draw module needs to cheat to get around it.
 
   if ( m_portableStructureID != INVALID_ID )
   {
@@ -369,7 +364,7 @@ Bool HelixContain::isPassengerAllowedToFire( ObjectID id ) const
 
   if ( getObject() && getObject()->getContainedBy() ) // nested containment voids firing, always
     return FALSE;
-  
+
   if ( m_portableStructureID != INVALID_ID && m_portableStructureID == id )
     return TRUE;
   else
@@ -397,7 +392,7 @@ void HelixContain::onContaining( Object *obj, Bool wasSelected )
 	// give the object a garrisoned version of its weapon
 	obj->setWeaponBonusCondition( WEAPONBONUSCONDITION_GARRISONED );
   obj->setDisabled( DISABLED_HELD );
-  
+
 
   if ( obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) && getObject()->testStatus( OBJECT_STATUS_STEALTHED ) )
   {
@@ -405,7 +400,7 @@ void HelixContain::onContaining( Object *obj, Bool wasSelected )
     if ( myStealth )
     {
       myStealth->receiveGrant( true );
-      // note to anyone... once stealth is granted to this gattlingcannon ( or such ) 
+      // note to anyone... once stealth is granted to this gattlingcannon ( or such )
       // let its own stealthupdate govern the allowedtostealth cases
       // a portable structure never gets removed, so...
     }
@@ -414,7 +409,7 @@ void HelixContain::onContaining( Object *obj, Bool wasSelected )
 
 
 
-}  // end onContaining
+}
 
 void HelixContain::onRemoving( Object *obj )
 {
@@ -425,7 +420,7 @@ void HelixContain::onRemoving( Object *obj )
 	obj->clearWeaponBonusCondition( WEAPONBONUSCONDITION_GARRISONED );
   obj->clearDisabled( DISABLED_HELD );
 
-} // end onRemoving
+}
 
 
 
@@ -445,7 +440,7 @@ void HelixContain::crc( Xfer *xfer )
 	// extend base class
 	TransportContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -467,7 +462,7 @@ void HelixContain::xfer( Xfer *xfer )
   	TransportContain::xfer( xfer );
 
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -478,4 +473,4 @@ void HelixContain::loadPostProcess( void )
 	// extend base class
 	TransportContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/InternetHackContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/InternetHackContain.cpp
index 809eaba3571..4e1e5f6a184 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/InternetHackContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/InternetHackContain.cpp
@@ -28,18 +28,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameLogic/Module/InternetHackContain.h"
 
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/AIUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -54,7 +49,7 @@ void InternetHackContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   TransportContainModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ 0, 0, 0, 0 }
 	};
@@ -68,7 +63,7 @@ void InternetHackContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-InternetHackContain::InternetHackContain( Thing *thing, const ModuleData *moduleData ) : 
+InternetHackContain::InternetHackContain( Thing *thing, const ModuleData *moduleData ) :
 								 TransportContain( thing, moduleData )
 {
 }
@@ -99,7 +94,7 @@ void InternetHackContain::crc( Xfer *xfer )
 	// extend base class
 	TransportContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -117,7 +112,7 @@ void InternetHackContain::xfer( Xfer *xfer )
 	// extend base class
 	TransportContain::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -128,4 +123,4 @@ void InternetHackContain::loadPostProcess( void )
 	// extend base class
 	TransportContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/MobNexusContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/MobNexusContain.cpp
index aca07d4fde3..b6eca3e85ea 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/MobNexusContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/MobNexusContain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/ThingTemplate.h"
 #include "Common/ThingFactory.h"
@@ -73,7 +73,7 @@ void MobNexusContainModuleData::parseInitialPayload( INI* ini, void *instance, v
 	const char* name = ini->getNextToken();
 	const char* countStr = ini->getNextTokenOrNull();
 	Int count = countStr ? INI::scanInt(countStr) : 1;
-	
+
 	self->m_initialPayload.name.set(name);
 	self->m_initialPayload.count = count;
 }
@@ -84,7 +84,7 @@ void MobNexusContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   OpenContainModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Slots",	INI::parseInt,		NULL, offsetof( MobNexusContainModuleData, m_slotCapacity ) },
 		{ "ScatterNearbyOnExit",	INI::parseBool,		NULL, offsetof( MobNexusContainModuleData, m_scatterNearbyOnExit ) },
@@ -105,8 +105,8 @@ void MobNexusContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Int MobNexusContain::getContainMax( void ) const 
-{ 
+Int MobNexusContain::getContainMax( void ) const
+{
 	if (getMobNexusContainModuleData())
 		return getMobNexusContainModuleData()->m_slotCapacity;
 
@@ -116,7 +116,7 @@ Int MobNexusContain::getContainMax( void ) const
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-MobNexusContain::MobNexusContain( Thing *thing, const ModuleData *moduleData ) : 
+MobNexusContain::MobNexusContain( Thing *thing, const ModuleData *moduleData ) :
 								 OpenContain( thing, moduleData )
 {
 	m_extraSlotsInUse = 0;
@@ -131,8 +131,8 @@ MobNexusContain::~MobNexusContain( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-/** 
-	can this container contain this kind of object? 
+/**
+	can this container contain this kind of object?
 	and, if checkCapacity is TRUE, does this container have enough space left to hold the given unit?
 */
 Bool MobNexusContain::isValidContainerFor(const Object* rider, Bool checkCapacity) const
@@ -143,7 +143,7 @@ Bool MobNexusContain::isValidContainerFor(const Object* rider, Bool checkCapacit
 		return false;
 
 	//The point of this new code is to determine when something has a negative 1 contain max, to
-	//look at the object inside of it to use that as the valid check. There is a case, when a 
+	//look at the object inside of it to use that as the valid check. There is a case, when a
 	//paratrooper (an infantry contained in a parachute). In this case, when we pass this object
 	//to contain in a --- plane, we want to check the infantry, not the parachute.
 //	const MobNexusContainModuleData *modData = getMobNexusContainModuleData();
@@ -221,7 +221,7 @@ void MobNexusContain::onContaining( Object *rider, Bool wasSelected )
 		if( draw )
 			draw->setModelConditionState( MODELCONDITION_LOADED );
 
-	}  // end if
+	}
 
 }
 
@@ -289,11 +289,11 @@ void MobNexusContain::onRemoving( Object *rider )
 		if( draw )
 			draw->clearModelConditionState( MODELCONDITION_LOADED );
 
-	}  // end if
+	}
 
 	if (getObject()->isAboveTerrain())
 	{
-		// temporarily mark the guy as being allowed to fall 
+		// temporarily mark the guy as being allowed to fall
 		// (overriding his locomotor's stick-to-ground attribute).
 		// this will be reset (by PhysicsBehavior) when he touches the ground.
 		PhysicsBehavior* physics = rider->getPhysics();
@@ -389,8 +389,8 @@ ExitDoorType MobNexusContain::reserveDoorForExit( const ThingTemplate* objType,
 	// This is an override, not an extend.  I will check for game legality for
 	// okaying the call to exitObjectViaDoor.
   Object *me = getObject();
- 
-	// this is present solely for some MobNexuss to override, so that they can land before 
+
+	// this is present solely for some MobNexuss to override, so that they can land before
 	// allowing people to exit...
 	AIUpdateInterface* ai = me->getAIUpdateInterface();
 	if (ai && ai->getAiFreeToExit(me) != FREE_TO_EXIT)
@@ -399,7 +399,7 @@ ExitDoorType MobNexusContain::reserveDoorForExit( const ThingTemplate* objType,
   // I can always kick people out if I am in the air, I know what I'm doing
   if( me->isUsingAirborneLocomotor() )
    	return DOOR_1;
- 
+
   const Coord3D *myPosition = me->getPosition();
  	if( !specificObject->getAIUpdateInterface() )
 	{
@@ -409,7 +409,7 @@ ExitDoorType MobNexusContain::reserveDoorForExit( const ThingTemplate* objType,
   // He can't get to this spot naturally, so I can't force him there.  (amphib MobNexus)
   if( ! TheAI->pathfinder()->validMovementTerrain(me->getLayer(), hisLocomotor, myPosition ) )
    	return DOOR_NONE_AVAILABLE;
- 
+
   return DOOR_1;
 }
 
@@ -462,7 +462,7 @@ void MobNexusContain::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -483,7 +483,7 @@ void MobNexusContain::xfer( Xfer *xfer )
 	// extra slots in use
 	xfer->xferInt( &m_extraSlotsInUse );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -494,4 +494,4 @@ void MobNexusContain::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
index 4bb528e6c12..51f088d961a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
@@ -25,13 +25,13 @@
 // FILE: OpenContain.cpp //////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, November 2001
 // Desc:   The OpenContain ContainModule allows objects to be contained inside of other
-//				 objects.  There is a set of functionality that will be common to 
+//				 objects.  There is a set of functionality that will be common to
 //				 all container modules that provides the actual containment
 //				 implementations, those implementations are found here
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BitFlagsIO.h"
 #include "Common/GameAudio.h"
@@ -57,11 +57,6 @@
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -85,15 +80,15 @@ OpenContainModuleData::OpenContainModuleData( void )
  	m_allowAlliesInside = TRUE;
  	m_allowEnemiesInside = TRUE;
  	m_allowNeutralInside = TRUE;
-}  // end OpenContainModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void OpenContainModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void OpenContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ContainMax",								INI::parseInt, NULL, offsetof( OpenContainModuleData, m_containMax ) },
 		{ "EnterSound",								INI::parseAudioEventRTS,		NULL, offsetof( OpenContainModuleData, m_enterSound ) },
@@ -134,13 +129,12 @@ OpenContain::OpenContain( Thing *thing, const ModuleData* moduleData ) : UpdateM
 	m_lastLoadSoundFrame = 0;
 	m_containListSize = 0;
 	m_stealthUnitsContained = 0;
+	m_heroUnitsContained = 0;
+	m_xferVersion = 1;
 	m_doorCloseCountdown = 0;
 
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_rallyPoint.zero();
 	m_rallyPointExists = FALSE;
-	//
 	m_conditionState.clear();
 	m_firePointStart = -1;
 	m_firePointNext = 0;
@@ -148,14 +142,14 @@ OpenContain::OpenContain( Thing *thing, const ModuleData* moduleData ) : UpdateM
 	m_noFirePointsInArt = false;
 	m_whichExitPath = 1;
 	m_loadSoundsEnabled = TRUE;
-  
-  m_passengerAllowedToFire = getOpenContainModuleData()->m_passengersAllowedToFire; 
+
+  m_passengerAllowedToFire = getOpenContainModuleData()->m_passengersAllowedToFire;
   // overridable by setPass...()  in the parent interface (for use by upgrade module)
 
 	for( Int i = 0; i < MAX_FIRE_POINTS; i++ )
-	{		
+	{
 		m_firePoints[ i ].Make_Identity();
-	}  // end for i
+	}
 
 }
 
@@ -167,7 +161,7 @@ Int OpenContain::getContainMax( void ) const
 
 	return modData->m_containMax;
 
-}  // end getContainMax
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -175,13 +169,13 @@ OpenContain::~OpenContain()
 {
 
 	// sanity, the system should be cleaning these up itself if all is going well
-	DEBUG_ASSERTCRASH( m_containList.empty(), 
-										 ("OpenContain %s: destroying a container that still has items in it!\n", 
+	DEBUG_ASSERTCRASH( m_containList.empty(),
+										 ("OpenContain %s: destroying a container that still has items in it!",
 										  getObject()->getTemplate()->getName().str() ) );
 
 	// sanity
 	DEBUG_ASSERTCRASH( m_xferContainIDList.empty(),
-										 ("OpenContain %s: m_xferContainIDList is not empty but should be\n", 
+										 ("OpenContain %s: m_xferContainIDList is not empty but should be",
 											getObject()->getTemplate()->getName().str() ) );
 
 }
@@ -220,16 +214,16 @@ UpdateSleepTime OpenContain::update( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void OpenContain::addOrRemoveObjFromWorld(Object* obj, Bool add) 
-{ 
+void OpenContain::addOrRemoveObjFromWorld(Object* obj, Bool add)
+{
 
 	//
 	// it's expensive to add and remove structures from the pathfinder, but we really shouldn't
-	// be doing it anyway as it doesn't make much sense to contain a structure, but we'll 
+	// be doing it anyway as it doesn't make much sense to contain a structure, but we'll
 	// check for it here and print a warning
 	//
 	if( obj->isKindOf( KINDOF_STRUCTURE ) )
-		DEBUG_LOG(( "WARNING: Containing/Removing structures like '%s' is potentially a very expensive and slow operation\n",
+		DEBUG_LOG(( "WARNING: Containing/Removing structures like '%s' is potentially a very expensive and slow operation",
 								obj->getTemplate()->getName().str() ));
 
 
@@ -263,7 +257,7 @@ void OpenContain::addOrRemoveObjFromWorld(Object* obj, Bool add)
 
 	}
 
-	// if we're a non-enclosing container (eg, parachute), and we're inside an 
+	// if we're a non-enclosing container (eg, parachute), and we're inside an
 	// enclosing container (eg, b52), we need to be able to show/hide the contained riders...
 	if( obj->getContain() )
 	{
@@ -306,7 +300,7 @@ void OpenContain::addToContain( Object *rider )
 		wasSelected = TRUE;
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if( !isValidContainerFor( rider, false ) )
 	{
 		Object *reportObject = rider;
@@ -327,7 +321,7 @@ void OpenContain::addToContain( Object *rider )
 	if( rider->getContainedBy() != NULL )
 	{
 
-		DEBUG_LOG(( "'%s' is trying to contain '%s', but '%s' is already contained by '%s'\n",
+		DEBUG_LOG(( "'%s' is trying to contain '%s', but '%s' is already contained by '%s'",
 								getObject()->getTemplate()->getName().str(),
 								rider->getTemplate()->getName().str(),
 								rider->getTemplate()->getName().str(),
@@ -346,8 +340,11 @@ void OpenContain::addToContain( Object *rider )
 		addOrRemoveObjFromWorld(rider, false);
 	}
 
-	// ensure our contents are positions correctly.
+#if RETAIL_COMPATIBLE_CRC
+	// ensure our occupants are positioned correctly.
+	// TheSuperHackers @info Moving this call elsewhere will cause retail mismatch.
 	redeployOccupants();
+#endif
 
 	// trigger an onContaining event for the object that just "ate" something
 	if( getObject()->getContain() )
@@ -355,6 +352,13 @@ void OpenContain::addToContain( Object *rider )
 		getObject()->getContain()->onContaining( rider, wasSelected );
 	}
 
+	// ensure our occupants are positioned correctly.
+	// TheSuperHackers @fix Skyaero 10/07/2025 Now (re)deploys the occupants after the garrison points
+	// had a chance to initialize with prior call to onContaining(). No user facing bug was observed.
+#if !RETAIL_COMPATIBLE_CRC
+	redeployOccupants();
+#endif
+
 	// trigger an onContainedBy event for the object that just got "eaten" by us
 	rider->onContainedBy( getObject() );
 
@@ -372,6 +376,10 @@ void OpenContain::addToContainList( Object *rider )
 	{
 		m_stealthUnitsContained++;
 	}
+	if( rider->isKindOf( KINDOF_HERO ) )
+	{
+		m_heroUnitsContained++;
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -394,7 +402,7 @@ void OpenContain::removeFromContain( Object *rider, Bool exposeStealthUnits )
 	if( containedBy != getObject() )
 	{
 
-		DEBUG_LOG(( "'%s' is trying to un-contain '%s', but '%s' is really contained by '%s'\n",
+		DEBUG_LOG(( "'%s' is trying to un-contain '%s', but '%s' is really contained by '%s'",
 								getObject()->getTemplate()->getName().str(),
 								rider->getTemplate()->getName().str(),
 								rider->getTemplate()->getName().str(),
@@ -408,7 +416,7 @@ void OpenContain::removeFromContain( Object *rider, Bool exposeStealthUnits )
 	{
 		// note that this invalidates the iterator!
 		removeFromContainViaIterator( it, exposeStealthUnits );
-	}	
+	}
 
 }
 
@@ -425,9 +433,9 @@ void OpenContain::removeAllContained( Bool exposeStealthUnits )
  		// note that this invalidates the iterator!
  		removeFromContainViaIterator( it, exposeStealthUnits );
 
-	}  // end while
+	}
 
-}  // end removeAllContained
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Kill all contained objects in the contained list */
@@ -440,35 +448,27 @@ void OpenContain::killAllContained( void )
 	// to the host container, which then attempts to remove all remaining occupants
 	// on the death of the host container. This is reproducible by shooting with
 	// Neutron Shells on a GLA Technical containing GLA Terrorists.
+
 	ContainedItemsList list;
 	list.swap(m_containList);
 	m_containListSize = 0;
 
 	ContainedItemsList::iterator it = list.begin();
 
- 	while ( it != list.end() )
+	while ( it != list.end() )
 	{
-    Object *rider = *it;
-
-    DEBUG_ASSERTCRASH( rider, ("Contain list must not contain NULL element"));
-    if ( rider )
-    {
-	    it = list.erase(it);
+		Object *rider = *it++;
 
-      onRemoving( rider );
-	    rider->onRemovedFrom( getObject() );
-      rider->kill();
-
-    }
-    else
-      ++it;
-
-	}  // end while
-
-
-  DEBUG_ASSERTCRASH( m_containListSize == 0, ("killallcontain just made a booboo, list size != zero.") );
+		DEBUG_ASSERTCRASH( rider, ("Contain list must not contain NULL element"));
+		if ( rider )
+		{
+			onRemoving( rider );
+			rider->onRemovedFrom( getObject() );
+			rider->kill();
+		}
+	}
 
-}  // end killAllContained
+}
 
 //--------------------------------------------------------------------------------------------------------
 /** Force all contained objects in the contained list to exit, and kick them in the pants on the way out*/
@@ -488,19 +488,19 @@ void OpenContain::harmAndForceExitAllContained( DamageInfo *info )
 		  rider->attemptDamage( info );
 		}
 
-		//Kris: Patch 1.03 -- Crash fix when neutral bunker on Alpine Assault is occupied with 10 demo general 
+		//Kris: Patch 1.03 -- Crash fix when neutral bunker on Alpine Assault is occupied with 10 demo general
 		//infantry units with the suicide upgrade and US stealth fighters with bunker busters kill the guys inside.
-		//Causes recursive damage where a bunker buster destroys an infantry, the infantry explodes and blows up 
+		//Causes recursive damage where a bunker buster destroys an infantry, the infantry explodes and blows up
 		//another missile which kills everyone inside while the first missile is killing everyone. And the game blows up.
 		//Fix is to reset the list.
 		it = m_containList.begin();
 
-	}  // end while
+	}
 
 
   DEBUG_ASSERTCRASH( m_containListSize == 0, ("harmAndForceExitAllContained just made a booboo, list size != zero.") );
 
-}  // end harmAndForceExitAllContained
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -563,11 +563,11 @@ void OpenContain::iterateContained( ContainIterateFunc func, void *userData, Boo
 		{
 			// save the rider...
 			Object* rider = *it;
-			
+
 			// incr the iterator BEFORE calling the func (if the func removes the rider,
 			// the iterator becomes invalid)
 			++it;
-			
+
 			// call it
 			(*func)( rider, userData );
 		}
@@ -580,15 +580,15 @@ void OpenContain::iterateContained( ContainIterateFunc func, void *userData, Boo
 		{
 			// save the rider...
 			Object* rider = *it;
-			
+
 			// incr the iterator BEFORE calling the func (if the func removes the rider,
 			// the iterator becomes invalid)
 			++it;
-			
+
 			// call it
 			(*func)( rider, userData );
 		}
-  } 
+  }
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -605,10 +605,10 @@ Object* OpenContain::getClosestRider( const Coord3D *pos )
     if (rider)
     {
       Real distance = ThePartitionManager->getDistanceSquared( rider, pos, FROM_CENTER_2D );
-	    if( !closest || closestDistance > distance ) 
+	    if( !closest || closestDistance > distance )
 	    {
 		    closest = rider;
-		    closestDistance = distance; 
+		    closestDistance = distance;
 	    }
     }
 
@@ -642,7 +642,7 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,
 
 /*
 	#ifdef RTS_DEBUG
-		TheInGameUI->message( UnicodeString( L"'%S(%d)' no longer contains '%S(%d)'" ), 
+		TheInGameUI->message( L"'%S(%d)' no longer contains '%S(%d)'",
 													getObject()->getTemplate()->getName().str(),
 													getObject()->getID(),
 													itemToRemove->m_object->getTemplate()->getName().str(),
@@ -656,6 +656,7 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,
 	m_containListSize--;
 	if( rider->isKindOf( KINDOF_STEALTH_GARRISON ) )
 	{
+		DEBUG_ASSERTCRASH( m_stealthUnitsContained > 0, ("OpenContain::removeFromContainViaIterator - Removing stealth unit but stealth count is %d", m_stealthUnitsContained) );
 		m_stealthUnitsContained--;
 		if( exposeStealthUnits )
 		{
@@ -666,6 +667,11 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,
 			}
 		}
 	}
+	if( rider->isKindOf( KINDOF_HERO ) )
+	{
+		DEBUG_ASSERTCRASH( m_heroUnitsContained > 0, ("OpenContain::removeFromContainViaIterator - Removing hero but hero count is %d", m_heroUnitsContained) );
+		m_heroUnitsContained--;
+	}
 
 
 	if (isEnclosingContainerFor( rider ))
@@ -687,7 +693,7 @@ void OpenContain::removeFromContainViaIterator( ContainedItemsList::iterator it,
 	{
 		getObject()->getContain()->onRemoving( rider );
 	}
-		
+
 	// trigger an onRemovedFrom event for 'remove'
 	DEBUG_ASSERTCRASH(getObject()->getContain() == this, ("hmm, wrong container 2"));
 	rider->onRemovedFrom( getObject() );
@@ -703,7 +709,7 @@ void OpenContain::scatterToNearbyPosition(Object* rider)
 	// for now we will just set the position of the object that is being removed from us
 	// at a random angle away from our center out some distance
 	//
-	
+
 	//
 	// pick an angle that is in the view of the current camera position so that
 	// the thing will come out "toward" the player and they can see it
@@ -735,14 +741,14 @@ void OpenContain::scatterToNearbyPosition(Object* rider)
 		ai->ignoreObstacle(theContainer);
 		ai->aiMoveToPosition( &pos, CMD_FROM_AI );
 
-	}  // end if
+	}
 	else
 	{
 
 		// no ai, just set position at the target pos
 		rider->setPosition( &pos );
 
-	}  // end else
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -758,7 +764,7 @@ void OpenContain::onContaining( Object *rider, Bool wasSelected )
 }
 
 //-------------------------------------------------------------------------------------------------
-void OpenContain::onRemoving( Object *rider) 
+void OpenContain::onRemoving( Object *rider)
 {
 	// Play audio
 	AudioEventRTS exitSound = *getObject()->getTemplate()->getSoundExit();
@@ -814,11 +820,11 @@ void OpenContain::onCollide( Object *other, const Coord3D *loc, const Coord3D *n
 	{
 		// save the rider...
 		Object* rider = *it;
-		
+
 		// incr the iterator BEFORE calling the func (if the func removes the rider,
 		// the iterator becomes invalid)
 		++it;
-		
+
 		// call it
 		if( rider->getControllingPlayer() != other->getControllingPlayer() )
 		{
@@ -846,7 +852,7 @@ void OpenContain::onCollide( Object *other, const Coord3D *loc, const Coord3D *n
 		return;
 
 	addToContain(other);
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -878,11 +884,11 @@ void OpenContain::onDie( const DamageInfo * damageInfo )
 
 	killRidersWhoAreNotFreeToExit();
 
-	// Leaving this commented out to show it can't work.  We are about to die, so they will have zero 
+	// Leaving this commented out to show it can't work.  We are about to die, so they will have zero
 	// chance to hit an exitState::Update.  At least we would clean them up in onDelete.
 //	orderAllPassengersToExit( CMD_FROM_AI, FALSE );
 	removeAllContained();
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Check to see if we are a valid container for 'obj' */
@@ -911,31 +917,31 @@ Bool OpenContain::isValidContainerFor(const Object* obj, Bool checkCapacity) con
  			if( modData->m_allowAlliesInside == FALSE )
  				relationshipRestricted = TRUE;
  			break;
- 
+
  		case ENEMIES:
  			if( modData->m_allowEnemiesInside == FALSE )
  				relationshipRestricted = TRUE;
  			break;
- 
+
  		case NEUTRAL:
  			if( modData->m_allowNeutralInside == FALSE )
  				relationshipRestricted = TRUE;
  			break;
- 
+
  		default:
  			DEBUG_CRASH(( "isValidContainerFor: Undefined relationship (%d) between '%s' and '%s'",
  										r, getObject()->getTemplate()->getName().str(),
  										obj->getTemplate()->getName().str() ));
  			return FALSE;
- 
- 	}  // end switch
+
+ 	}
  	if( relationshipRestricted == TRUE )
  		return FALSE;
- 
+
 	// all is well
 	return true;
 
-}  // end isValidContainerFor
+}
 
 // ------------------------------------------------------------------------------------------------
 /**
@@ -957,7 +963,7 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 	m_doorCloseCountdown = getOpenContainModuleData()->m_doorOpenTime;
 	if (m_doorCloseCountdown)
 	{
-		// srj sez: only diddle the doors if this countdown is nonzero. 
+		// srj sez: only diddle the doors if this countdown is nonzero.
 		// this allows us to prevent this module from messing with the doors
 		// at all, which is required for DeliverPayloadAIUpdate.
 		/// @todo srj -- for now, OpenContain assumes at most one door
@@ -982,7 +988,7 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 				startBone.concat('0');
 				endBone.concat('0');
 			}
-			
+
 			m_whichExitPath = (m_whichExitPath % numberExits) + 1;// To cycle from 1 to n
 
 			startBone.concat(suffix);
@@ -996,20 +1002,20 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 		PhysicsBehavior *physics = exitObj->getPhysics();
 		// Can fall problem - When units exit from planes, they are airborne for a while as they drop.
 		// Airborne units dont' do pathfinding, and this is fine.
-		// However, amphibious transports unload 3 feet off the ground.  This is enough to trigger the 
+		// However, amphibious transports unload 3 feet off the ground.  This is enough to trigger the
 		// airborne flag, and they don't pathfind.  So they all unload at the same exact point, and life
-		// is ugly.  So temporarily, we turn off the allowToFall flag, so they aren't considered airborne, 
+		// is ugly.  So temporarily, we turn off the allowToFall flag, so they aren't considered airborne,
 		// and their final destination (adjustToPossibleDestination) considers them as pathfinding, so they
 		// don't stack up.  Then we turn the flag back, so if they are parachuting, they can fly down
 		//  on their parachute.  jba.
 		Bool canFall = false;
-		if (physics) 
+		if (physics)
 		{
 			canFall = physics->getAllowToFall();
 		}
 		exitObj->setPosition( &startPosition );
 		exitObj->setOrientation( exitAngle );
-		
+
 		// Per JohnA: We need to set our layer to match our transports layer, or we'll try to pick a spot
 		// on the ground.
 		exitObj->setLayer( me->getLayer() );
@@ -1018,7 +1024,7 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 		AIUpdateInterface *ai = exitObj->getAI();
 		AIUpdateInterface *myAi = me->getAI();
 		TheAI->pathfinder()->addObjectToPathfindMap( exitObj );
-		if (ai) 
+		if (ai)
 		{
 			if (myAi && myAi->isIdle() && me->isKindOf(KINDOF_VEHICLE)) {
 				TheAI->pathfinder()->removeUnitFromPathfindMap(me);
@@ -1040,7 +1046,7 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 
 		if( ai )
 		{
-			if (physics) 
+			if (physics)
 			{
 				physics->setAllowToFall(false);
 			}
@@ -1049,7 +1055,7 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 
 			TheAI->pathfinder()->updateGoal(exitObj, &endPosition, TheTerrainLogic->getLayerForDestination(&endPosition));
 		}
-		if (physics) 
+		if (physics)
 		{
 			physics->setAllowToFall(canFall);
 		}
@@ -1076,7 +1082,7 @@ void OpenContain::exitObjectInAHurry( Object *exitObj )
 	m_doorCloseCountdown = getOpenContainModuleData()->m_doorOpenTime;
 	if (m_doorCloseCountdown)
 	{
-		// srj sez: only diddle the doors if this countdown is nonzero. 
+		// srj sez: only diddle the doors if this countdown is nonzero.
 		// this allows us to prevent this module from messing with the doors
 		// at all, which is required for DeliverPayloadAIUpdate.
 		/// @todo srj -- for now, OpenContain assumes at most one door
@@ -1101,7 +1107,7 @@ void OpenContain::exitObjectInAHurry( Object *exitObj )
 				startBone.concat('0');
 				endBone.concat('0');
 			}
-			
+
 			m_whichExitPath = (m_whichExitPath % numberExits) + 1;// To cycle from 1 to n
 
 			startBone.concat(suffix);
@@ -1114,7 +1120,7 @@ void OpenContain::exitObjectInAHurry( Object *exitObj )
 		Real exitAngle = me->getOrientation();
 		exitObj->setPosition( &startPosition );
 		exitObj->setOrientation( exitAngle );
-		
+
 		// Per JohnA: We need to set our layer to match our transports layer, or we'll try to pick a spot
 		// on the ground.
 		exitObj->setLayer( me->getLayer() );
@@ -1123,7 +1129,7 @@ void OpenContain::exitObjectInAHurry( Object *exitObj )
 		AIUpdateInterface *ai = exitObj->getAI();
 		AIUpdateInterface *myAi = me->getAI();
 		TheAI->pathfinder()->addObjectToPathfindMap( exitObj );
-		if (ai) 
+		if (ai)
 		{
 			if (myAi && myAi->isIdle() && me->isKindOf(KINDOF_VEHICLE)) {
 				TheAI->pathfinder()->removeUnitFromPathfindMap(me);
@@ -1201,7 +1207,7 @@ void OpenContain::monitorConditionChanges( void )
 		m_conditionState = currCondition;
 	}
 
-}  // end monitorConditionChanges
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1229,7 +1235,7 @@ void OpenContain::redeployOccupants( void )
 		putObjAtNextFirePoint( *it );
 	}
 
-}  // end redeployOccupants
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Place the object at the 3D position of the next fire point to use */
@@ -1238,7 +1244,7 @@ void OpenContain::putObjAtNextFirePoint( Object *obj )
 {
 
 	//
-	// first, if we need to load the 3D point data from the art do so, if we've already 
+	// first, if we need to load the 3D point data from the art do so, if we've already
 	// determined there is no firepoints in the current art we will avoid searching for
 	// it all the time
 	//
@@ -1254,7 +1260,7 @@ void OpenContain::putObjAtNextFirePoint( Object *obj )
 		if( m_firePointSize == 0 )
 			m_noFirePointsInArt = TRUE;
 
-	}  // end if
+	}
 
 	//
 	// if there are no fire points in the art we just put the object at the center
@@ -1267,7 +1273,7 @@ void OpenContain::putObjAtNextFirePoint( Object *obj )
 		obj->setPosition( pos );
 		return;
 
-	}  // end if
+	}
 
 	// get the position
 	Matrix3D matrix;
@@ -1305,7 +1311,7 @@ void OpenContain::putObjAtNextFirePoint( Object *obj )
 	if( m_firePointNext >= m_firePointSize )
 		m_firePointNext = 0;
 
-}  // end putObjAtNextFirePoint
+}
 
 //-------------------------------------------------------------------------------------------------
 /**
@@ -1359,11 +1365,11 @@ void OpenContain::markAllPassengersDetected( )
 	{
 		// save the rider...
 		Object* rider = *it;
-		
+
 		// incr the iterator BEFORE calling the func (if the func removes the rider,
 		// the iterator becomes invalid)
 		++it;
-		
+
 		// call it
 		if( rider->isKindOf( KINDOF_STEALTH_GARRISON ) )
 		{
@@ -1390,11 +1396,11 @@ void OpenContain::orderAllPassengersToExit( CommandSourceType commandSource, Boo
 	{
 		// save the rider...
 		Object* rider = *it;
-		
+
 		// incr the iterator BEFORE calling the func (if the func removes the rider,
 		// the iterator becomes invalid)
 		++it;
-		
+
 		// call it
 		if( rider->getAI() )
 		{
@@ -1402,7 +1408,7 @@ void OpenContain::orderAllPassengersToExit( CommandSourceType commandSource, Boo
 			{
 				rider->getAI()->aiExitInstantly( getObject(), commandSource );
 			}
-			else 
+			else
 			{
 				rider->getAI()->aiExit( getObject(), commandSource );
 			}
@@ -1410,7 +1416,7 @@ void OpenContain::orderAllPassengersToExit( CommandSourceType commandSource, Boo
 	}
 }
 
- 
+
 //-------------------------------------------------------------------------------------------------
 void OpenContain::orderAllPassengersToIdle( CommandSourceType commandSource )
 {
@@ -1418,7 +1424,7 @@ void OpenContain::orderAllPassengersToIdle( CommandSourceType commandSource )
 	{
 		Object* rider = *it;
 		++it;
-		
+
 		if( rider->getAI() )
 		{
 			rider->getAI()->aiIdle( commandSource );
@@ -1452,20 +1458,17 @@ void OpenContain::processDamageToContained(Real percentDamage)
 {
 	const OpenContainModuleData *data = getOpenContainModuleData();
 
+#if RETAIL_COMPATIBLE_CRC
+
 	const ContainedItemsList* items = getContainedItemsList();
 	if( items )
 	{
-		ContainedItemsList::const_iterator it;
-		it = items->begin();
+		ContainedItemsList::const_iterator it = items->begin();
+		const size_t listSize = items->size();
 
 		while( it != items->end() )
 		{
-			Object *object = *it;
-
-			//Advance to the next iterator before we apply the damage.
-			//It's possible that the damage will kill the unit and foobar
-			//the iterator list.
-			++it;
+			Object *object = *it++;
 
 			//Calculate the damage to be inflicted on each unit.
 			Real damage = object->getBodyModule()->getMaxHealth() * percentDamage;
@@ -1478,9 +1481,82 @@ void OpenContain::processDamageToContained(Real percentDamage)
 			object->attemptDamage( &damageInfo );
 
 			if( !object->isEffectivelyDead() && percentDamage == 1.0f )
-				object->kill(); // in case we are carrying flame proof troops we have been asked to kill			
+				object->kill(); // in case we are carrying flame proof troops we have been asked to kill
+
+			// TheSuperHackers @info Calls to Object::attemptDamage and Object::kill will not remove
+			// the occupant from the host container straight away. Instead it will be removed when the
+			// Object deletion is finalized in a Game Logic update. This will lead to strange behavior
+			// where the occupant will be removed after death with a delay. This behavior cannot be
+			// changed without breaking retail compatibility.
+
+			// TheSuperHackers @bugfix xezon 05/06/2025 Stop iterating when the list was cleared.
+			// This scenario can happen if the killed occupant(s) apply deadly damage on death
+			// to the host container, which then attempts to remove all remaining occupants
+			// on the death of the host container. This is reproducible by destroying a
+			// GLA Battle Bus with at least 2 half damaged GLA Terrorists inside.
+			if (listSize != items->size())
+			{
+				DEBUG_ASSERTCRASH( listSize == 0, ("List is expected empty") );
+				break;
+			}
+		}
+	}
+
+#else
+
+	// TheSuperHackers @bugfix xezon 05/06/2025 Temporarily empty the m_containList
+	// to prevent a potential child call to catastrophically modify the m_containList.
+	// This scenario can happen if the killed occupant(s) apply deadly damage on death
+	// to the host container, which then attempts to remove all remaining occupants
+	// on the death of the host container. This is reproducible by destroying a
+	// GLA Battle Bus with at least 2 half damaged GLA Terrorists inside.
+
+	// Caveat: While the m_containList is empty, it will not be possible to apply damage
+	// on death of a unit to another unit in the host container. If this functionality
+	// is desired, then this implementation needs to be revisited.
+
+	ContainedItemsList list;
+	m_containList.swap(list);
+	m_containListSize = 0;
+
+	ContainedItemsList::iterator it = list.begin();
+
+	while ( it != list.end() )
+	{
+		Object *object = *it;
+
+		DEBUG_ASSERTCRASH( object, ("Contain list must not contain NULL element") );
+
+		// Calculate the damage to be inflicted on each unit.
+		Real damage = object->getBodyModule()->getMaxHealth() * percentDamage;
+
+		DamageInfo damageInfo;
+		damageInfo.in.m_damageType = DAMAGE_UNRESISTABLE;
+		damageInfo.in.m_deathType = data->m_isBurnedDeathToUnits ? DEATH_BURNED : DEATH_NORMAL;
+		damageInfo.in.m_sourceID = getObject()->getID();
+		damageInfo.in.m_amount = damage;
+		object->attemptDamage( &damageInfo );
+
+		if( !object->isEffectivelyDead() && percentDamage == 1.0f )
+			object->kill(); // in case we are carrying flame proof troops we have been asked to kill
+
+		if ( object->isEffectivelyDead() )
+		{
+			onRemoving( object );
+			object->onRemovedFrom( getObject() );
+			it = list.erase( it );
+		}
+		else
+		{
+			++it;
 		}
 	}
+
+	// Swap the list back where it belongs.
+	m_containList.swap(list);
+	m_containListSize = (UnsignedInt)m_containList.size();
+
+#endif // RETAIL_COMPATIBLE_CRC
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1497,15 +1573,15 @@ WeaponBonusConditionFlags OpenContain::getWeaponBonusPassedToPassengers() const
 }
 
 //-------------------------------------------------------------------------------------------------
-Real OpenContain::getDamagePercentageToUnits( void ) 
-{ 
-	return getOpenContainModuleData()->m_damagePercentageToUnits; 
+Real OpenContain::getDamagePercentageToUnits( void )
+{
+	return getOpenContainModuleData()->m_damagePercentageToUnits;
 }
 
 //-------------------------------------------------------------------------------------------------
 Bool OpenContain::isEnclosingContainerFor( const Object * ) const
 {
-	return TRUE; 
+	return TRUE;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1560,7 +1636,7 @@ Bool OpenContain::getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset )  cons
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void testForAttackingProc( Object *obj, void *userData )
-{	
+{
 	Bool *info = (Bool*)userData;
   if ( *info == TRUE )
     return;
@@ -1598,20 +1674,28 @@ void OpenContain::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version */
+	* 1: Initial version
+	* 2: Added m_passengerAllowedToFire
+	* 3: TheSuperHackers @tweak Serialize hero units contained count
+	*/
 // ------------------------------------------------------------------------------------------------
 void OpenContain::xfer( Xfer *xfer )
 {
 
-	// version 
-	const XferVersion currentVersion = 2;
+	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
+	XferVersion currentVersion = 2;
+#else
+	XferVersion currentVersion = 3;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
+	m_xferVersion = version;
 
 	// extend base class
 	UpdateModule::xfer( xfer );
@@ -1630,9 +1714,9 @@ void OpenContain::xfer( Xfer *xfer )
 			objectID = (*it)->getID();
 			xfer->xferObjectID( &objectID );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -1652,11 +1736,11 @@ void OpenContain::xfer( Xfer *xfer )
 			}
 			m_containList.clear();
 #else
-			DEBUG_CRASH(( "OpenContain::xfer - Contain list should be empty before load but is not\n" ));
+			DEBUG_CRASH(( "OpenContain::xfer - Contain list should be empty before load but is not" ));
 			throw SC_INVALID_DATA;
 #endif
 
-		}  // end if
+		}
 
 		// contain list size
 		xfer->xferUnsignedInt( &m_containListSize );
@@ -1671,9 +1755,9 @@ void OpenContain::xfer( Xfer *xfer )
 			// put on list for later processing once objects are loaded
 			m_xferContainIDList.push_back( objectID );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// player entered mask
 	xfer->xferUser( &m_playerEnteredMask, sizeof( PlayerMaskType ) );
@@ -1687,6 +1771,12 @@ void OpenContain::xfer( Xfer *xfer )
 	// stealth units contained
 	xfer->xferUnsignedInt( &m_stealthUnitsContained );
 
+	// hero units contained
+	if (version >= 3)
+	{
+		xfer->xferUnsignedInt( &m_heroUnitsContained );
+	}
+
 	// door close countdown
 	xfer->xferUnsignedInt( &m_doorCloseCountdown );
 
@@ -1733,20 +1823,20 @@ void OpenContain::xfer( Xfer *xfer )
 			enterExitType = (*it).second;
 			xfer->xferUser( &enterExitType, sizeof( ObjectEnterExitType ) );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
-		
+
 		// the map should be emtpy now
 		if( m_objectEnterExitInfo.empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "OpenContain::xfer - m_objectEnterExitInfo should be empty, but is not\n" ));
+			DEBUG_CRASH(( "OpenContain::xfer - m_objectEnterExitInfo should be empty, but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read all data items
 		for( UnsignedShort i = 0; i < enterExitCount; ++i )
@@ -1761,10 +1851,10 @@ void OpenContain::xfer( Xfer *xfer )
 			// assign
 			m_objectEnterExitInfo[ objectID ] = enterExitType;
 
-		}  // end for, i
+		}
+
+	}
 
-	}  // end else, load
-	
 	// which exit path
 	xfer->xferInt( &m_whichExitPath );
 
@@ -1775,7 +1865,7 @@ void OpenContain::xfer( Xfer *xfer )
   }
 
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1791,10 +1881,10 @@ void OpenContain::loadPostProcess( void )
 	if( m_containList.empty() == FALSE )
 	{
 
-		DEBUG_CRASH(( "OpenContain::loadPostProcess - Contain list should be empty before load but is not\n" ));
+		DEBUG_CRASH(( "OpenContain::loadPostProcess - Contain list should be empty before load but is not" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// turn the contained id list into actual object pointers in the contain list
 	Object *obj;
@@ -1809,10 +1899,10 @@ void OpenContain::loadPostProcess( void )
 		if( obj == NULL )
 		{
 
-			DEBUG_CRASH(( "OpenContain::loadPostProcess - Unable to find object to put on contain list\n" ));
+			DEBUG_CRASH(( "OpenContain::loadPostProcess - Unable to find object to put on contain list" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// put object on list
 		m_containList.push_back( obj );
@@ -1824,13 +1914,26 @@ void OpenContain::loadPostProcess( void )
 		// record in the object who we are contained by
 		obj->friend_setContainedBy( us );
 
-	}  // end for, idIt
+	}
+
+	if (m_xferVersion < 3)
+	{
+		// Restore hero count by iterating hero objects for old save versions
+		m_heroUnitsContained = 0;
+		for( ContainedItemsList::const_iterator it = m_containList.begin(); it != m_containList.end(); ++it )
+		{
+			if( (*it)->isKindOf( KINDOF_HERO ) )
+			{
+				m_heroUnitsContained++;
+			}
+		}
+	}
 
 	// sanity
 	DEBUG_ASSERTCRASH( m_containListSize == m_containList.size(),
-										 ("OpenContain::loadPostProcess - contain list count mismatch\n") );
+										 ("OpenContain::loadPostProcess - contain list count mismatch") );
 
 	// clear the list as we don't need it anymore
 	m_xferContainIDList.clear();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp
index cc744ad4a6d..ce039ed6f84 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp
@@ -33,7 +33,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Player.h"
 #include "Common/Xfer.h"
 #include "Common/ThingTemplate.h"
@@ -47,11 +47,6 @@
 #include "GameLogic/PartitionManager.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // ------------------------------------------------------------------------------------------------
@@ -68,8 +63,8 @@ void OverlordContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   TransportContainModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
-	{		
+	static const FieldParse dataFieldParse[] =
+	{
     { "PayloadTemplateName",  INI::parseAsciiStringVectorAppend, NULL, offsetof(OverlordContainModuleData, m_payloadTemplateNameData) },
     { "ExperienceSinkForRider",  INI::parseBool, NULL, offsetof(OverlordContainModuleData, m_experienceSinkForRider) },
 
@@ -85,14 +80,14 @@ void OverlordContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 //	const char* name = ini->getNextToken();
 //	const char* countStr = ini->getNextTokenOrNull();
 //	Int count = countStr ? INI::scanInt(countStr) : 1;
-	
+
 //	self->m_initialPayload.name.set(name);
 //	self->m_initialPayload.count = count;
 //}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-OverlordContain::OverlordContain( Thing *thing, const ModuleData *moduleData ) : 
+OverlordContain::OverlordContain( Thing *thing, const ModuleData *moduleData ) :
 								 TransportContain( thing, moduleData )
 {
 	m_redirectionActivated = FALSE;
@@ -135,7 +130,7 @@ void OverlordContain::createPayload()
 		  const ThingTemplate* temp = TheThingFactory->findTemplate( *iter );
 		  if (temp)
 		  {
-			  Object* payload = TheThingFactory->newObject( temp, object->getTeam() ); 
+			  Object* payload = TheThingFactory->newObject( temp, object->getTeam() );
 
 			  if( contain->isValidContainerFor( payload, true ) )
 			  {
@@ -153,7 +148,7 @@ void OverlordContain::createPayload()
 
 		contain->enableLoadSounds( TRUE );
 
-  } // endif contain
+  }
 
 	m_payloadCreated = TRUE;
 
@@ -161,8 +156,8 @@ void OverlordContain::createPayload()
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void OverlordContain::onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																				BodyDamageType oldState, 
+void OverlordContain::onBodyDamageStateChange( const DamageInfo* damageInfo,
+																				BodyDamageType oldState,
 																				BodyDamageType newState)  ///< state change callback
 {
 	// I can't use any convienience functions, as they will all get routed to the bunker I may carry.
@@ -216,15 +211,15 @@ void OverlordContain::onDie( const DamageInfo *damageInfo )
 	}
 	//Everything is fine if I am empty or carrying a regular guy.  If I have a redirected contain
 	// set up, then I need to handle the order of death explicitly, or things will become confused
-	// when I stop redirecting in the middle of the process.  Or I will get confused as my commands 
+	// when I stop redirecting in the middle of the process.  Or I will get confused as my commands
 	// get sucked up the pipe.
 
 	// So this is an extend that lets me control the order of death.
-	
+
 	deactivateRedirectedContain();
 	Object *myGuy = m_containList.front();
 	myGuy->kill();
-	
+
 	TransportContain::onDie( damageInfo );
 }
 
@@ -252,7 +247,7 @@ void OverlordContain::onCapture( Player *oldOwner, Player *newOwner )
 {
 	if( m_containListSize < 1 )
 		return;
-	
+
 	// Need to capture our specific rider.  He will then kick passengers out if he is a Transport
 	Object *myGuy = m_containList.front();
 	myGuy->setTeam( newOwner->getDefaultTeam() );
@@ -264,7 +259,7 @@ Bool OverlordContain::isGarrisonable() const
 	if( getRedirectedContain() == NULL )
 		return FALSE;
 
-	return getRedirectedContain()->isGarrisonable(); 
+	return getRedirectedContain()->isGarrisonable();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -272,8 +267,8 @@ Bool OverlordContain::isKickOutOnCapture()
 {
 	if( getRedirectedContain() == NULL )
 		return FALSE;// Me the Overlord doesn't want to
-	
-	return getRedirectedContain()->isKickOutOnCapture(); 
+
+	return getRedirectedContain()->isKickOutOnCapture();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -285,7 +280,7 @@ void OverlordContain::addToContainList( Object *obj )
 		TransportContain::addToContainList( obj );
 		return;
 	}
-	
+
 	getRedirectedContain()->addToContainList( obj );
 }
 
@@ -298,7 +293,7 @@ void OverlordContain::addToContain( Object *obj )
 		TransportContain::addToContain( obj );
 		return;
 	}
-	
+
 	getRedirectedContain()->addToContain( obj );
 
 }
@@ -332,7 +327,7 @@ void OverlordContain::removeAllContained( Bool exposeStealthUnits )
 		TransportContain::removeAllContained( exposeStealthUnits );
 		return;
 	}
-	
+
 	const ContainedItemsList *fullList = getRedirectedContain()->getContainedItemsList();
 
 	Object *obj;
@@ -357,7 +352,7 @@ void OverlordContain::iterateContained( ContainIterateFunc func, void *userData,
 		TransportContain::iterateContained( func, userData, reverse );
 		return;
 	}
-	
+
 	getRedirectedContain()->iterateContained( func, userData, reverse );
 }
 
@@ -385,18 +380,18 @@ void OverlordContain::onContaining( Object *obj, Bool wasSelected )
         if ( myStealth )
         {
           myStealth->receiveGrant( true );
-          // note to anyone... once stealth is granted to this gattlingcannon ( or such ) 
+          // note to anyone... once stealth is granted to this gattlingcannon ( or such )
           // let its own stealthupdate govern the allowedtostealth cases
           // a portable structure never gets removed, so...
         }
       }
-  
 
 
 
-    }	
-    
-    
+
+    }
+
+
     return;
 	}
 
@@ -417,7 +412,7 @@ void OverlordContain::killAllContained( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-void OverlordContain::onRemoving( Object *obj ) 
+void OverlordContain::onRemoving( Object *obj )
 {
 	// Do you mean me the Overlord, or my behavior of passing stuff on to my passengers?
 	if( getRedirectedContain() == NULL )
@@ -438,7 +433,7 @@ Bool OverlordContain::isValidContainerFor(const Object* obj, Bool checkCapacity)
 	// Do you mean me the Overlord, or my behavior of passing stuff on to my passengers?
 	if( getRedirectedContain() == NULL )
 		return TransportContain::isValidContainerFor( obj, checkCapacity );
-	
+
 	return getRedirectedContain()->isValidContainerFor( obj, checkCapacity );
 }
 
@@ -450,7 +445,7 @@ UnsignedInt OverlordContain::getContainCount() const
 	// Do you mean me the Overlord, or my behavior of passing stuff on to my passengers?
 	if( redir == NULL )
 		return TransportContain::getContainCount( );
-	
+
 	return redir->getContainCount();
 }
 
@@ -471,12 +466,12 @@ Bool OverlordContain::getContainerPipsToShow(Int& numTotal, Int& numFull)
 }
 
 //-------------------------------------------------------------------------------------------------
-Int OverlordContain::getContainMax( ) const 
-{ 
+Int OverlordContain::getContainMax( ) const
+{
 	// Do you mean me the Overlord, or my behavior of passing stuff on to my passengers?
 	if( getRedirectedContain() == NULL )
 		return TransportContain::getContainMax( );
-	
+
 	return getRedirectedContain()->getContainMax();
 }
 
@@ -486,7 +481,7 @@ const ContainedItemsList* OverlordContain::getContainedItemsList() const
 	// Do you mean me the Overlord, or my behavior of passing stuff on to my passengers?
 	if( getRedirectedContain() == NULL )
 		return TransportContain::getContainedItemsList( );
-	
+
 	return getRedirectedContain()->getContainedItemsList();
 }
 
@@ -509,14 +504,14 @@ Bool OverlordContain::isDisplayedOnControlBar() const
 	// Do you mean me the Overlord, or my behavior of passing stuff on to my passengers?
 	if( getRedirectedContain() == NULL )
 		return FALSE;//No need to call up inheritance, this is a module based question, and I say no.
-	
+
 	return getRedirectedContain()->isDisplayedOnControlBar();
 }
 
 //-------------------------------------------------------------------------------------------------
 const Object *OverlordContain::friend_getRider() const
 {
-// The draw order dependency bug for riders means that our draw module needs to cheat to get 
+// The draw order dependency bug for riders means that our draw module needs to cheat to get
 	//around it.	So this is another function that knows it is getting around redirection to ask
 	// an Overlord specific function.
 
@@ -529,14 +524,14 @@ const Object *OverlordContain::friend_getRider() const
 
 //-------------------------------------------------------------------------------------------------
 void OverlordContain::activateRedirectedContain()
-{ 
-	m_redirectionActivated = TRUE; 
+{
+	m_redirectionActivated = TRUE;
 }
 
 //-------------------------------------------------------------------------------------------------
 void OverlordContain::deactivateRedirectedContain()
-{ 
-	m_redirectionActivated = FALSE; 
+{
+	m_redirectionActivated = FALSE;
 }
 
 
@@ -546,7 +541,7 @@ void OverlordContain::deactivateRedirectedContain()
 // this gets called from
 void OverlordContain::clientVisibleContainedFlashAsSelected()
 {
-	// THIS OVERRIDES GRAHAMS NASTY OVERRIDE THING 
+	// THIS OVERRIDES GRAHAMS NASTY OVERRIDE THING
 	// SO WE CAN FLASH THE PORTABLE BUNKER INSTEAD OF ITS OCCUPANTS
 	const ContainedItemsList* items = TransportContain::getContainedItemsList();
 
@@ -566,7 +561,7 @@ void OverlordContain::clientVisibleContainedFlashAsSelected()
 					draw->flashAsSelected(); //WOW!
 				}
 			}
-			
+
 			++it;
 		}
 	}
@@ -584,8 +579,8 @@ Bool OverlordContain::isPassengerAllowedToFire( ObjectID id ) const
 		if(passenger->isKindOf(KINDOF_INFANTRY) == FALSE && passenger->isKindOf(KINDOF_PORTABLE_STRUCTURE) == FALSE)
 			return FALSE;
 	}
-	
-  
+
+
   if ( getObject() && getObject()->getContainedBy() ) // nested containment voids firing, always
     return FALSE;
 
@@ -603,7 +598,7 @@ void OverlordContain::crc( Xfer *xfer )
 	// extend base class
 	TransportContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -624,7 +619,7 @@ void OverlordContain::xfer( Xfer *xfer )
 	// redirection activated
 	xfer->xferBool( &m_redirectionActivated );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -635,4 +630,4 @@ void OverlordContain::loadPostProcess( void )
 	// extend base class
 	TransportContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp
index 1a75a22778a..f7dbe009737 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/ParachuteContain.cpp
@@ -28,13 +28,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/CRCDebug.h"
 #include "Common/Player.h"
 #include "Common/RandomValue.h"
 #include "Common/ThingTemplate.h"
-#include "Common/Xfer.h" 
+#include "Common/Xfer.h"
 
 #include "GameLogic/AIPathfind.h"
 #include "GameLogic/Locomotor.h"
@@ -50,17 +50,12 @@
 const Real NO_START_Z = 1e10;
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
-ParachuteContainModuleData::ParachuteContainModuleData() : 
+ParachuteContainModuleData::ParachuteContainModuleData() :
 	m_pitchRateMax(0),
 	m_rollRateMax(0),
 	m_lowAltitudeDamping(0.2f),
@@ -71,11 +66,11 @@ ParachuteContainModuleData::ParachuteContainModuleData() :
 }
 
 //-------------------------------------------------------------------------------------------------
-void ParachuteContainModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void ParachuteContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   OpenContainModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "PitchRateMax",	INI::parseAngularVelocityReal,		NULL, offsetof( ParachuteContainModuleData, m_pitchRateMax ) },
 		{ "RollRateMax",	INI::parseAngularVelocityReal,		NULL, offsetof( ParachuteContainModuleData, m_rollRateMax ) },
@@ -92,7 +87,7 @@ void ParachuteContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData ) : 
+ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData ) :
 								 OpenContain( thing, moduleData )
 {
 	m_opened = false;
@@ -104,9 +99,7 @@ ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData )
 	m_rollRate = 0;
 	m_isLandingOverrideSet = FALSE;
 	m_startZ = NO_START_Z;
-	
-	//Added By Sadullah Nader
-	//Initializations 
+
 	m_landingOverride.zero();
 	m_paraAttachBone.zero();
 	m_paraAttachOffset.zero();
@@ -117,7 +110,6 @@ ParachuteContain::ParachuteContain( Thing *thing, const ModuleData *moduleData )
 	m_riderSwayBone.zero();
 	m_riderSwayOffset.zero();
 
-	//
 	const ParachuteContainModuleData* d = getParachuteContainModuleData();
 	if (d)
 	{
@@ -136,7 +128,7 @@ ParachuteContain::~ParachuteContain( void )
 
 //-------------------------------------------------------------------------------------------------
 /**
-	this is called whenever a drawable is bound to the object. 
+	this is called whenever a drawable is bound to the object.
 	drawable is NOT guaranteed to be non-null.
 */
 void ParachuteContain::onDrawableBoundToObject()
@@ -162,23 +154,23 @@ void ParachuteContain::updateBonePositions()
 	if (m_needToUpdateParaBones)
 	{
 		m_needToUpdateParaBones = false;	// yeah, even if not found.
-		
+
 		Drawable* parachuteDraw = getObject()->getDrawable();
 		if (parachuteDraw)
 		{
 			if (parachuteDraw->getPristineBonePositions( "PARA_COG", 0, &m_paraSwayBone, NULL, 1) != 1)
 			{
-				DEBUG_CRASH(("PARA_COG not found\n"));
+				DEBUG_CRASH(("PARA_COG not found"));
 				m_paraSwayBone.zero();
 			}
 
 			if (parachuteDraw->getPristineBonePositions( "PARA_ATTCH", 0, &m_paraAttachBone, NULL, 1 ) != 1)
 			{
-				DEBUG_CRASH(("PARA_ATTCH not found\n"));
+				DEBUG_CRASH(("PARA_ATTCH not found"));
 				m_paraAttachBone.zero();
 			}
 		}
-		//DEBUG_LOG(("updating para bone positions %d...\n",TheGameLogic->getFrame()));
+		//DEBUG_LOG(("updating para bone positions %d...",TheGameLogic->getFrame()));
 	}
 
 	if (m_needToUpdateRiderBones)
@@ -192,13 +184,13 @@ void ParachuteContain::updateBonePositions()
 		{
 			if (riderDraw->getPristineBonePositions( "PARA_MAN", 0, &m_riderAttachBone, NULL, 1) != 1)
 			{
-				//DEBUG_LOG(("*** No parachute-attach bone... using object height!\n"));
+				//DEBUG_LOG(("*** No parachute-attach bone... using object height!"));
 				m_riderAttachBone.zero();
 				m_riderAttachBone.z += riderDraw->getDrawableGeometryInfo().getMaxHeightAbovePosition();
 			}
 		}
 
-		//DEBUG_LOG(("updating rider bone positions %d...\n",TheGameLogic->getFrame()));
+		//DEBUG_LOG(("updating rider bone positions %d...",TheGameLogic->getFrame()));
 	}
 }
 
@@ -239,8 +231,8 @@ void ParachuteContain::updateOffsetsFromBones()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-/** 
-	can this container contain this kind of object? 
+/**
+	can this container contain this kind of object?
 	and, if checkCapacity is TRUE, does this container have enough space left to hold the given unit?
 */
 Bool ParachuteContain::isValidContainerFor(const Object* rider, Bool checkCapacity) const
@@ -299,11 +291,11 @@ UpdateSleepTime ParachuteContain::update( void )
 	Object* rider = (getContainCount() > 0) ? getContainList().front() : NULL;
 
 	if (m_startZ == NO_START_Z)	{
-		m_startZ = parachute->getPosition()->z;	
+		m_startZ = parachute->getPosition()->z;
 		Real groundHeight = TheTerrainLogic->getGroundHeight(parachute->getPosition()->x, parachute->getPosition()->y);
 		if (m_startZ-groundHeight < 2*d->m_paraOpenDist) {
 			// Oh dear - we ejected too close to the ground, and there isn't enough
-			// room to open the chute.  Well, since it's only a game, we'll fudge 
+			// room to open the chute.  Well, since it's only a game, we'll fudge
 			// a little so that the pilot doesn't slam into the ground & stick.
 			m_startZ = groundHeight+2*d->m_paraOpenDist;
 		}
@@ -326,11 +318,11 @@ UpdateSleepTime ParachuteContain::update( void )
 				soundToPlay.setObjectID( rider->getID() );
 				TheAudio->addAudioEvent( &soundToPlay );
 			}
-			
+
 
 			// When a parachute opens, it should look for a good place to land.  This could be explicitly set
 			// by a DeliverPayload, otherwise any place clear is good.
-			if( parachuteAI ) 
+			if( parachuteAI )
 			{
 				Coord3D target = *parachute->getPosition();
 				if( m_isLandingOverrideSet )
@@ -345,7 +337,7 @@ UpdateSleepTime ParachuteContain::update( void )
 					fpOptions.minRadius = 0.0f;
 					fpOptions.maxRadius = 100.0f;
 					fpOptions.relationshipObject = NULL;
-					fpOptions.flags = FPF_NONE; 
+					fpOptions.flags = FPF_NONE;
 					ThePartitionManager->findPositionAround( &target, &fpOptions, &target );
 				}
 				parachuteAI->aiMoveToPosition( &target, CMD_FROM_AI );
@@ -374,11 +366,11 @@ UpdateSleepTime ParachuteContain::update( void )
 	}
 
 	AIUpdateInterface* ai = parachute->getAIUpdateInterface();
-	if (ai && !parachute->isEffectivelyDead()) 
+	if (ai && !parachute->isEffectivelyDead())
 	{
 		ai->chooseLocomotorSet(m_opened ? LOCOMOTORSET_NORMAL : LOCOMOTORSET_FREEFALL);
 
-		Locomotor* locomotor = ai->getCurLocomotor(); 
+		Locomotor* locomotor = ai->getCurLocomotor();
 		if (locomotor)
 		{
 			// damp the swaying a bunch when we get close, so that things land vertically (or nearly so)
@@ -455,7 +447,7 @@ UpdateSleepTime ParachuteContain::update( void )
 //-------------------------------------------------------------------------------------------------
 void ParachuteContain::onContaining( Object *rider, Bool wasSelected )
 {
-	OpenContain::onContaining( rider, wasSelected );	
+	OpenContain::onContaining( rider, wasSelected );
 
 	// objects inside a transport are held
 	rider->setDisabled( DISABLED_HELD );
@@ -472,7 +464,7 @@ void ParachuteContain::onContaining( Object *rider, Bool wasSelected )
 //-------------------------------------------------------------------------------------------------
 void ParachuteContain::onRemoving( Object *rider )
 {
-	OpenContain::onRemoving(rider);	
+	OpenContain::onRemoving(rider);
 
 	const ParachuteContainModuleData* d = getParachuteContainModuleData();
 
@@ -491,7 +483,7 @@ void ParachuteContain::onRemoving( Object *rider )
 	rider->clearModelConditionFlags(MAKE_MODELCONDITION_MASK2(MODELCONDITION_FREEFALL, MODELCONDITION_PARACHUTING));
 	m_needToUpdateRiderBones = true;
 
-	// temporarily mark the guy as being allowed to fall 
+	// temporarily mark the guy as being allowed to fall
 	// (overriding his locomotor's stick-to-ground attribute).
 	// this will be reset (by PhysicsBehavior) when he touches the ground.
 	PhysicsBehavior* physics = rider->getPhysics();
@@ -530,7 +522,7 @@ void ParachuteContain::onRemoving( Object *rider )
 					{
 						exitInterface->exitObjectViaDoor(rider, DOOR_1);
 						hasRallyPoint = true;
-					}			
+					}
 				}
 			}
 
@@ -538,7 +530,7 @@ void ParachuteContain::onRemoving( Object *rider )
 				riderAI->aiIdle(CMD_FROM_AI); // become idle.
 		}
 	}
-	
+
 	// if we land in the water, we die. alas.
 	const Coord3D* riderPos = rider->getPosition();
 	Real waterZ, terrainZ;
@@ -554,19 +546,19 @@ void ParachuteContain::onRemoving( Object *rider )
 		damageInfo.in.m_amount = HUGE_DAMAGE_AMOUNT;
 		rider->attemptDamage( &damageInfo );
 	}
-	
+
 	// Kill if we landed on impassable ground
 	Int cellX = REAL_TO_INT( rider->getPosition()->x / PATHFIND_CELL_SIZE );
 	Int cellY = REAL_TO_INT( rider->getPosition()->y / PATHFIND_CELL_SIZE );
-	
+
 	PathfindCell* cell = TheAI->pathfinder()->getCell( rider->getLayer(), cellX, cellY );
 	PathfindCell::CellType cellType = cell ? cell->getType() : PathfindCell::CELL_IMPASSABLE;
-	
-	// If we land outside the map from a faulty parachute, we die too.  
+
+	// If we land outside the map from a faulty parachute, we die too.
 	// Otherwise we exist outside the PartitionManger like a cheater.
-	if( rider->isOffMap() 
-    || (cellType == PathfindCell::CELL_CLIFF) 
-    || (cellType == PathfindCell::CELL_WATER) 
+	if( rider->isOffMap()
+    || (cellType == PathfindCell::CELL_CLIFF)
+    || (cellType == PathfindCell::CELL_WATER)
     || (cellType == PathfindCell::CELL_IMPASSABLE) )
 	{
 		// The Paradrop command was legal, the parachute destination was legal, but the parachute
@@ -575,7 +567,7 @@ void ParachuteContain::onRemoving( Object *rider )
 	}
 
   // Note: for future enhancement of this feature, we should test the object against the cell type he is on,
-  // using obj->getAI()->hasLocomotorForSurface( __ ). We cshould not assume here that the parachutist can not 
+  // using obj->getAI()->hasLocomotorForSurface( __ ). We cshould not assume here that the parachutist can not
   // find happiness on cliffs or water or whatever.
 
 
@@ -694,7 +686,7 @@ void ParachuteContain::onCollide( Object *other, const Coord3D *loc, const Coord
 		// kill it, so that the chute's SlowDeath will trigger!
 		getObject()->kill();
 	}
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -705,7 +697,7 @@ void ParachuteContain::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -740,7 +732,7 @@ void ParachuteContain::xfer( Xfer *xfer )
 
 	// is landing override set
 	xfer->xferBool( &m_isLandingOverrideSet );
-	
+
 	// landing override
 	xfer->xferCoord3D( &m_landingOverride );
 
@@ -777,7 +769,7 @@ void ParachuteContain::xfer( Xfer *xfer )
 	// opened
 	xfer->xferBool( &m_opened );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -788,4 +780,4 @@ void ParachuteContain::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RailedTransportContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RailedTransportContain.cpp
index 0b6d37b523e..aca71d6d8b6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RailedTransportContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RailedTransportContain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/RailedTransportContain.h"
@@ -43,7 +43,7 @@ static RailedTransportDockUpdateInterface *getRailedTransportDockUpdateInterface
 	if( obj == NULL )
 		return NULL;
 
-	// find us our dock interface	
+	// find us our dock interface
 	RailedTransportDockUpdateInterface *rtdui = NULL;
 	for( BehaviorModule **u = obj->getBehaviorModules(); *u; ++u )
 		if( (rtdui = (*u)->getRailedTransportDockUpdateInterface()) != NULL )
@@ -51,7 +51,7 @@ static RailedTransportDockUpdateInterface *getRailedTransportDockUpdateInterface
 
 	return rtdui;
 
-}  // end getRailedTransportDockUpdateInterface
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -59,20 +59,20 @@ RailedTransportContain::RailedTransportContain( Thing *thing, const ModuleData *
 											: TransportContain( thing, moduleData )
 {
 
-}  // end RailedTransportContain
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 RailedTransportContain::~RailedTransportContain( void )
 {
 
-}  // end ~RailedTransportContain
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void RailedTransportContain::onRemoving( Object *obj )
 {
-	
+
 	// extend functionality
 	TransportContain::onRemoving( obj );
 
@@ -83,9 +83,9 @@ void RailedTransportContain::onRemoving( Object *obj )
 		if( dui )
 			dui->setDockOpen( TRUE );
 
-	}  // end if
+	}
 
-}  // end onRemoving
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -101,7 +101,7 @@ Bool RailedTransportContain::isSpecificRiderFreeToExit( Object *obj )
 	// we can now exit, note we're not extending the base class cause *we* handle it all
 	return TRUE;
 
-}  // end isSpecificRiderFreeToExit
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -115,7 +115,7 @@ void RailedTransportContain::exitObjectViaDoor( Object *newObj, ExitDoorType exi
 	// tell the railed dock to exit ONE object, this one
 	rtdui->unloadSingleObject( newObj );
 
-}  // end exitObjectViaDoor
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -126,7 +126,7 @@ void RailedTransportContain::crc( Xfer *xfer )
 	// extend base class
 	TransportContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -144,7 +144,7 @@ void RailedTransportContain::xfer( Xfer *xfer )
 	// extend base class
 	TransportContain::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -155,4 +155,4 @@ void RailedTransportContain::loadPostProcess( void )
 	// extend base class
 	TransportContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RiderChangeContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RiderChangeContain.cpp
index 5d4764906f1..563071c09d9 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RiderChangeContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RiderChangeContain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_LOCOMOTORSET_NAMES //Gain access to TheLocomotorSetNames[]
 
@@ -55,11 +55,6 @@
 #include "GameLogic/Module/RiderChangeContain.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -102,7 +97,7 @@ void RiderChangeContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   TransportContainModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Rider1",					parseRiderInfo,					NULL, offsetof( RiderChangeContainModuleData, m_riders[0] ) },
 		{ "Rider2",					parseRiderInfo,					NULL, offsetof( RiderChangeContainModuleData, m_riders[1] ) },
@@ -125,8 +120,8 @@ void RiderChangeContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Int RiderChangeContain::getContainMax( void ) const 
-{ 
+Int RiderChangeContain::getContainMax( void ) const
+{
 	if (getRiderChangeContainModuleData())
 		return getRiderChangeContainModuleData()->m_slotCapacity;
 
@@ -136,7 +131,7 @@ Int RiderChangeContain::getContainMax( void ) const
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-RiderChangeContain::RiderChangeContain( Thing *thing, const ModuleData *moduleData ) : 
+RiderChangeContain::RiderChangeContain( Thing *thing, const ModuleData *moduleData ) :
 								 TransportContain( thing, moduleData )
 {
 	m_extraSlotsInUse = 0;
@@ -154,8 +149,8 @@ RiderChangeContain::~RiderChangeContain( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-/** 
-	can this container contain this kind of object? 
+/**
+	can this container contain this kind of object?
 	and, if checkCapacity is TRUE, does this container have enough space left to hold the given unit?
 */
 Bool RiderChangeContain::isValidContainerFor(const Object* rider, Bool checkCapacity) const
@@ -175,7 +170,7 @@ Bool RiderChangeContain::isValidContainerFor(const Object* rider, Bool checkCapa
 		for( int i = 0; i < MAX_RIDERS; i++ )
 		{
 			const ThingTemplate *thing = TheThingFactory->findTemplate( data->m_riders[ i ].m_templateName );
-			if( thing->isEquivalentTo( rider->getTemplate() ) )
+			if( thing && thing->isEquivalentTo( rider->getTemplate() ) )
 			{
 				//We found a valid rider, so return success.
 				return TRUE;
@@ -198,7 +193,7 @@ void RiderChangeContain::onContaining( Object *rider, Bool wasSelected )
 	}
 
 	//If the rider is currently selected, transfer selection to the container and preserve other units
-	//that may be already selected. Note that containing the rider will automatically cause it to be 
+	//that may be already selected. Note that containing the rider will automatically cause it to be
 	//deselected, so all we have to do is select the container (if not already selected)!
 	Drawable *containDraw = getObject()->getDrawable();
 	if( containDraw && wasSelected && !containDraw->isSelected() )
@@ -216,7 +211,7 @@ void RiderChangeContain::onContaining( Object *rider, Bool wasSelected )
 	for( int i = 0; i < MAX_RIDERS; i++ )
 	{
 		const ThingTemplate *thing = TheThingFactory->findTemplate( data->m_riders[ i ].m_templateName );
-		if( thing->isEquivalentTo( rider->getTemplate() ) )
+		if( thing && thing->isEquivalentTo( rider->getTemplate() ) )
 		{
 
 			//This is our rider, so set the correct model condition.
@@ -251,13 +246,18 @@ void RiderChangeContain::onContaining( Object *rider, Bool wasSelected )
 			//Transfer experience from the rider to the bike.
 			ExperienceTracker *riderTracker = rider->getExperienceTracker();
 			ExperienceTracker *bikeTracker = obj->getExperienceTracker();
+#if !RETAIL_COMPATIBLE_CRC
+			// TheSuperHackers @bugfix Stubbjax 15/12/2025 Copy trainable flag from the rider to prevent
+			// Workers and other untrainable riders from ranking up via the bike's experience tracker.
+			bikeTracker->setTrainable(riderTracker->isTrainable());
+#endif
 			bikeTracker->setVeterancyLevel( riderTracker->getVeterancyLevel(), FALSE );
 			riderTracker->setExperienceAndLevel( 0, FALSE );
 
 			break;
 		}
 	}
-	
+
 	//Extend base class
 	TransportContain::onContaining( rider, wasSelected );
 
@@ -287,7 +287,7 @@ void RiderChangeContain::onRemoving( Object *rider )
 	for( int i = 0; i < MAX_RIDERS; i++ )
 	{
 		const ThingTemplate *thing = TheThingFactory->findTemplate( data->m_riders[ i ].m_templateName );
-		if( thing->isEquivalentTo( rider->getTemplate() ) )
+		if( thing && thing->isEquivalentTo( rider->getTemplate() ) )
 		{
 			//This is our rider, so clear the current model condition.
 			bike->clearModelConditionFlags( MAKE_MODELCONDITION_MASK2( data->m_riders[ i ].m_modelConditionFlagType, MODELCONDITION_DOOR_1_CLOSING ) );
@@ -297,7 +297,7 @@ void RiderChangeContain::onRemoving( Object *rider )
 
 			//Also clear the object status
 			bike->clearStatus( MAKE_OBJECT_STATUS_MASK( data->m_riders[ i ].m_objectStatusType ) );
-			
+
 			if( rider->getControllingPlayer() != NULL )
 			{
 				//Wow, completely unforseeable game teardown order crash.  SetVeterancyLevel results in a call to player
@@ -306,6 +306,7 @@ void RiderChangeContain::onRemoving( Object *rider )
 				//Transfer experience from the bike to the rider.
 				ExperienceTracker *riderTracker = rider->getExperienceTracker();
 				ExperienceTracker *bikeTracker = bike->getExperienceTracker();
+				bikeTracker->resetTrainable();
 				riderTracker->setVeterancyLevel( bikeTracker->getVeterancyLevel(), FALSE );
 				bikeTracker->setExperienceAndLevel( 0, FALSE );
 			}
@@ -454,7 +455,7 @@ void RiderChangeContain::crc( Xfer *xfer )
 	// extend base class
 	TransportContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -481,7 +482,7 @@ void RiderChangeContain::xfer( Xfer *xfer )
 	// frame exit not busy
 	xfer->xferUnsignedInt( &m_frameExitNotBusy );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -492,4 +493,4 @@ void RiderChangeContain::loadPostProcess( void )
 	// extend base class
 	TransportContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp
index e14faf7f9d6..e024d449da9 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingTemplate.h"
@@ -46,11 +46,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -87,7 +82,7 @@ void TransportContainModuleData::parseInitialPayload( INI* ini, void *instance,
 	const char* name = ini->getNextToken();
 	const char* countStr = ini->getNextTokenOrNull();
 	Int count = countStr ? INI::scanInt(countStr) : 1;
-	
+
 	self->m_initialPayload.name.set(name);
 	self->m_initialPayload.count = count;
 }
@@ -98,7 +93,7 @@ void TransportContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   OpenContainModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Slots",	INI::parseInt,		NULL, offsetof( TransportContainModuleData, m_slotCapacity ) },
 		{ "ScatterNearbyOnExit",	INI::parseBool,		NULL, offsetof( TransportContainModuleData, m_scatterNearbyOnExit ) },
@@ -114,7 +109,7 @@ void TransportContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 		{ "ExitDelay",	INI::parseDurationUnsignedInt,		NULL, offsetof( TransportContainModuleData, m_exitDelay ) },
 		{ "ArmedRidersUpgradeMyWeaponSet",	INI::parseBool,		NULL, offsetof( TransportContainModuleData, m_armedRidersUpgradeWeaponSet ) },
 		{ "DelayExitInAir",	INI::parseBool,		NULL, offsetof( TransportContainModuleData, m_isDelayExitInAir ) },
-	
+
     { 0, 0, 0, 0 }
   };
   p.add(dataFieldParse);
@@ -126,8 +121,8 @@ void TransportContainModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Int TransportContain::getContainMax( void ) const 
-{ 
+Int TransportContain::getContainMax( void ) const
+{
 	if (getTransportContainModuleData())
 		return getTransportContainModuleData()->m_slotCapacity;
 
@@ -137,7 +132,7 @@ Int TransportContain::getContainMax( void ) const
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-TransportContain::TransportContain( Thing *thing, const ModuleData *moduleData ) : 
+TransportContain::TransportContain( Thing *thing, const ModuleData *moduleData ) :
 								 OpenContain( thing, moduleData )
 {
 	m_extraSlotsInUse = 0;
@@ -153,8 +148,8 @@ TransportContain::~TransportContain( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-/** 
-	can this container contain this kind of object? 
+/**
+	can this container contain this kind of object?
 	and, if checkCapacity is TRUE, does this container have enough space left to hold the given unit?
 */
 Bool TransportContain::isValidContainerFor(const Object* rider, Bool checkCapacity) const
@@ -165,7 +160,7 @@ Bool TransportContain::isValidContainerFor(const Object* rider, Bool checkCapaci
 		return false;
 
 	// The point of this new code is to determine when something is a "fake" container, to
-	// look at the object inside of it to use that as the valid check. There is a case, when a 
+	// look at the object inside of it to use that as the valid check. There is a case, when a
 	// paratrooper (an infantry contained in a parachute). In this case, when we pass this object
 	// to contain in a transport plane, we want to check the infantry, not the parachute.
 	if (rider->getContain() && rider->getContain()->isSpecialZeroSlotContainer())
@@ -206,7 +201,7 @@ Bool TransportContain::isValidContainerFor(const Object* rider, Bool checkCapaci
 	{
     Int containMax = getContainMax();
     Int containCount = getContainCount();
-    
+
 		return (m_extraSlotsInUse + containCount + transportSlotCount <= containMax);
 
 	}
@@ -264,7 +259,7 @@ void TransportContain::letRidersUpgradeWeaponSet( void )
             }
           }
         }
-      }//end if rider
+      }
 
     }
   }
@@ -283,7 +278,7 @@ void TransportContain::letRidersUpgradeWeaponSet( void )
 void TransportContain::onContaining( Object *rider, Bool wasSelected )
 {
 	OpenContain::onContaining( rider, wasSelected );
-	
+
 	// objects inside a transport are held
 	rider->setDisabled( DISABLED_HELD );
 
@@ -304,7 +299,7 @@ void TransportContain::onContaining( Object *rider, Bool wasSelected )
 		if( draw )
 			draw->setModelConditionState( MODELCONDITION_LOADED );
 
-	}  // end if
+	}
 
   if ( getTransportContainModuleData()->m_armedRidersUpgradeWeaponSet )
     letRidersUpgradeWeaponSet();
@@ -386,11 +381,11 @@ void TransportContain::onRemoving( Object *rider )
 		if( draw )
 			draw->clearModelConditionState( MODELCONDITION_LOADED );
 
-	}  // end if
+	}
 
 	if (getObject()->isAboveTerrain())
 	{
-		// temporarily mark the guy as being allowed to fall 
+		// temporarily mark the guy as being allowed to fall
 		// (overriding his locomotor's stick-to-ground attribute).
 		// this will be reset (by PhysicsBehavior) when he touches the ground.
 		PhysicsBehavior* physics = rider->getPhysics();
@@ -444,7 +439,7 @@ void TransportContain::createPayload()
 	const ThingTemplate* payloadTemplate = TheThingFactory->findTemplate( self->m_initialPayload.name );
 	Object* object = getObject();
 	ContainModuleInterface *contain = object->getContain();
-	
+
 	if( contain )
 	{
 		contain->enableLoadSounds( FALSE );
@@ -560,8 +555,8 @@ Bool TransportContain::isSpecificRiderFreeToExit(Object* specificObject)
 	// This is a override, not an extend.  I will check for game legality for
 	// okaying the call to exitObjectViaDoor.
   const Object* me = getObject();
- 
-	// this is present solely for some transports to override, so that they can land before 
+
+	// this is present solely for some transports to override, so that they can land before
 	// allowing people to exit...
 	const AIUpdateInterface* ai = me->getAIUpdateInterface();
 	if (ai && ai->getAiFreeToExit(specificObject) != FREE_TO_EXIT)
@@ -570,7 +565,7 @@ Bool TransportContain::isSpecificRiderFreeToExit(Object* specificObject)
   // I can always kick people out if I am in the air, I know what I'm doing
   if (me->isUsingAirborneLocomotor())
    	return TRUE;
- 
+
   const Coord3D *myPosition = me->getPosition();
  	if (!specificObject->getAIUpdateInterface())
 		return FALSE;
@@ -578,11 +573,11 @@ Bool TransportContain::isSpecificRiderFreeToExit(Object* specificObject)
 	const Locomotor *hisLocomotor = specificObject->getAIUpdateInterface()->getCurLocomotor();
 	if( hisLocomotor == FALSE )
    	return FALSE;
- 
+
   // He can't get to this spot naturally, so I can't force him there.  (amphib transport)
   if (!TheAI->pathfinder()->validMovementTerrain(me->getLayer(), hisLocomotor, myPosition))
    	return FALSE;
- 
+
   return TRUE;
 }
 
@@ -663,7 +658,7 @@ void TransportContain::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -690,7 +685,7 @@ void TransportContain::xfer( Xfer *xfer )
 	// frame exit not busy
 	xfer->xferUnsignedInt( &m_frameExitNotBusy );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -701,4 +696,4 @@ void TransportContain::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp
index b5402ba3123..1f998a53ff4 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/RandomValue.h"
@@ -43,11 +43,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -70,6 +65,10 @@ TunnelContain::~TunnelContain()
 void TunnelContain::addToContainList( Object *obj )
 {
 	Player *owningPlayer = getObject()->getControllingPlayer();
+
+	if(!owningPlayer->getTunnelSystem())
+		return;
+
 	owningPlayer->getTunnelSystem()->addToContainList( obj );
 }
 
@@ -90,7 +89,7 @@ void TunnelContain::removeFromContain( Object *obj, Bool exposeStealthUnits )
 	{
 		getObject()->getContain()->onRemoving( obj );
 	}
-			
+
 	// trigger an onRemovedFrom event for 'remove'
 	obj->onRemovedFrom( getObject() );
 
@@ -102,13 +101,10 @@ void TunnelContain::removeFromContain( Object *obj, Bool exposeStealthUnits )
 	if( owningPlayer == NULL )
 		return; //game tear down.  We do the onRemove* stuff first because this is allowed to fail but that still needs to be done
 
-	if( ! owningPlayer->getTunnelSystem()->isInContainer( obj ) )
-	{
+	if(!owningPlayer->getTunnelSystem())
 		return;
-	}
 
 	owningPlayer->getTunnelSystem()->removeFromContain( obj, exposeStealthUnits );
-
 }
 
 
@@ -119,6 +115,10 @@ void TunnelContain::removeFromContain( Object *obj, Bool exposeStealthUnits )
 void TunnelContain::harmAndForceExitAllContained( DamageInfo *info )
 {
 	Player *owningPlayer = getObject()->getControllingPlayer();
+
+	if(!owningPlayer->getTunnelSystem())
+		return;
+
 	const ContainedItemsList *fullList = owningPlayer->getTunnelSystem()->getContainedItemsList();
 
 	Object *obj;
@@ -128,7 +128,7 @@ void TunnelContain::harmAndForceExitAllContained( DamageInfo *info )
 	//No longer advances the iterator and saves it. The iterator is fetched from the beginning after
 	//each loop. This is to prevent a crash where dropping a bunker buster on a tunnel network containing
 	//multiple units (if they have the suicide bomb upgrade - demo general). In this case, multiple bunker
-	//busters would hit the tunnel network in close succession. Missile #1 would iterate the list, killing 
+	//busters would hit the tunnel network in close succession. Missile #1 would iterate the list, killing
 	//infantry #1. Infantry #1 would explode and destroy Missile #2. Missile #2 would start iterating the
 	//same list, killing the remaining units. When Missile #1 picked up and continued processing the list
 	//it would crash because it's iterator was deleted from under it.
@@ -139,9 +139,9 @@ void TunnelContain::harmAndForceExitAllContained( DamageInfo *info )
 		removeFromContain( obj, true );
     obj->attemptDamage( info );
 		it = (*fullList).begin();
-	}  // end while
+	}
 
-}  // end removeAllContained
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -149,18 +149,31 @@ void TunnelContain::harmAndForceExitAllContained( DamageInfo *info )
 //-------------------------------------------------------------------------------------------------
 void TunnelContain::killAllContained( void )
 {
+	// TheSuperHackers @bugfix xezon 04/06/2025 Empty the TunnelSystem's Contained Items List
+	// straight away to prevent a potential child call to catastrophically modify it as well.
+	// This scenario can happen if the killed occupant(s) apply deadly damage on death
+	// to the host container, which then attempts to remove all remaining occupants
+	// on the death of the host container. This is reproducible by shooting with
+	// Neutron Shells on a GLA Tunnel containing GLA Terrorists.
+
 	Player *owningPlayer = getObject()->getControllingPlayer();
-	const ContainedItemsList *fullList = owningPlayer->getTunnelSystem()->getContainedItemsList();
 
-	Object *obj;
-	ContainedItemsList::const_iterator it;
-	it = (*fullList).begin();
-	while( it != (*fullList).end() )
+	if(!owningPlayer->getTunnelSystem())
+		return;
+
+	ContainedItemsList list;
+	owningPlayer->getTunnelSystem()->swapContainedItemsList(list);
+
+	ContainedItemsList::iterator it = list.begin();
+
+	while ( it != list.end() )
 	{
-		obj = *it;
-		it++;
+		Object *obj = *it++;
+		DEBUG_ASSERTCRASH( obj, ("Contain list must not contain NULL element"));
+
 		removeFromContain( obj, true );
-    obj->kill();
+
+		obj->kill();
 	}
 }
 //-------------------------------------------------------------------------------------------------
@@ -169,15 +182,20 @@ void TunnelContain::killAllContained( void )
 void TunnelContain::removeAllContained( Bool exposeStealthUnits )
 {
 	Player *owningPlayer = getObject()->getControllingPlayer();
-	const ContainedItemsList *fullList = owningPlayer->getTunnelSystem()->getContainedItemsList();
 
-	Object *obj;
-	ContainedItemsList::const_iterator it;
-	it = (*fullList).begin();
-	while( it != (*fullList).end() )
+	if(!owningPlayer->getTunnelSystem())
+		return;
+
+	ContainedItemsList list;
+	owningPlayer->getTunnelSystem()->swapContainedItemsList(list);
+
+	ContainedItemsList::iterator it = list.begin();
+
+	while ( it != list.end() )
 	{
-		obj = *it;
-		it++;
+		Object *obj = *it++;
+		DEBUG_ASSERTCRASH( obj, ("Contain list must not contain NULL element"));
+
 		removeFromContain( obj, exposeStealthUnits );
 	}
 }
@@ -188,6 +206,10 @@ void TunnelContain::removeAllContained( Bool exposeStealthUnits )
 void TunnelContain::iterateContained( ContainIterateFunc func, void *userData, Bool reverse )
 {
 	Player *owningPlayer = getObject()->getControllingPlayer();
+
+	if(!owningPlayer->getTunnelSystem())
+		return;
+
 	owningPlayer->getTunnelSystem()->iterateContained( func, userData, reverse );
 }
 
@@ -200,17 +222,17 @@ void TunnelContain::onContaining( Object *obj, Bool wasSelected )
 	obj->setDisabled( DISABLED_HELD );
 
 	obj->getControllingPlayer()->getAcademyStats()->recordUnitEnteredTunnelNetwork();
-  
 
 
-  
+
+
   obj->handlePartitionCellMaintenance();
 
 
 }
 
 //-------------------------------------------------------------------------------------------------
-void TunnelContain::onRemoving( Object *obj ) 
+void TunnelContain::onRemoving( Object *obj )
 {
 	OpenContain::onRemoving(obj);
 
@@ -218,6 +240,7 @@ void TunnelContain::onRemoving( Object *obj )
 	obj->clearDisabled( DISABLED_HELD );
 
 	/// place the object in the world at position of the container m_object
+#if RETAIL_COMPATIBLE_CRC
 	ThePartitionManager->registerObject( obj );
 	obj->setPosition( getObject()->getPosition() );
 	if( obj->getDrawable() )
@@ -225,10 +248,14 @@ void TunnelContain::onRemoving( Object *obj )
 		obj->setSafeOcclusionFrame(TheGameLogic->getFrame()+obj->getTemplate()->getOcclusionDelay());
 		obj->getDrawable()->setDrawableHidden( false );
 	}
+#else
+	// TheSuperHackers @bugfix Now correctly adds the objects to the world without issues with shrouded portable structures.
+	obj->setPosition(getObject()->getPosition());
+	obj->setSafeOcclusionFrame(TheGameLogic->getFrame() + obj->getTemplate()->getOcclusionDelay());
+	addOrRemoveObjFromWorld(obj, TRUE);
+#endif
 
 	doUnloadSound();
-
-
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -241,7 +268,7 @@ void TunnelContain::onSelling()
 	TunnelTracker *tunnelTracker = owningPlayer->getTunnelSystem();
 	if( tunnelTracker == NULL )
 		return;
-	
+
 	// We are the last tunnel, so kick everyone out.  This makes tunnels act like Palace and Bunker
 	// rather than killing the occupants as if the last tunnel died.
 	if( tunnelTracker->friend_getTunnelCount() == 1 )
@@ -261,7 +288,11 @@ void TunnelContain::onSelling()
 Bool TunnelContain::isValidContainerFor(const Object* obj, Bool checkCapacity) const
 {
 	Player *owningPlayer = getObject()->getControllingPlayer();
-	return owningPlayer->getTunnelSystem()->isValidContainerFor( obj, checkCapacity );
+	if( owningPlayer && owningPlayer->getTunnelSystem() )
+	{
+		return owningPlayer->getTunnelSystem()->isValidContainerFor( obj, checkCapacity );
+	}
+	return false;
 }
 
 UnsignedInt TunnelContain::getContainCount() const
@@ -274,19 +305,31 @@ UnsignedInt TunnelContain::getContainCount() const
 	return 0;
 }
 
-Int TunnelContain::getContainMax( void ) const 
-{ 
+Int TunnelContain::getContainMax( void ) const
+{
 	Player *owningPlayer = getObject()->getControllingPlayer();
-	return owningPlayer->getTunnelSystem()->getContainMax();
+	if( owningPlayer && owningPlayer->getTunnelSystem() )
+	{
+		return owningPlayer->getTunnelSystem()->getContainMax();
+	}
+	return 0;
 }
 
 const ContainedItemsList* TunnelContain::getContainedItemsList() const
 {
 	Player *owningPlayer = getObject()->getControllingPlayer();
-	return owningPlayer->getTunnelSystem()->getContainedItemsList();
+	if( owningPlayer && owningPlayer->getTunnelSystem() )
+	{
+		return owningPlayer->getTunnelSystem()->getContainedItemsList();
+	}
+	return NULL;
 }
 
-
+UnsignedInt TunnelContain::getFullTimeForHeal(void) const
+{
+	const TunnelContainModuleData* modData = getTunnelContainModuleData();
+	return modData->m_framesForFullHeal;
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////////////////////////
@@ -302,7 +345,7 @@ void TunnelContain::scatterToNearbyPosition(Object* obj)
 	// for now we will just set the position of the object that is being removed from us
 	// at a random angle away from our center out some distance
 	//
-	
+
 	//
 	// pick an angle that is in the view of the current camera position so that
 	// the thing will come out "toward" the player and they can see it
@@ -334,14 +377,14 @@ void TunnelContain::scatterToNearbyPosition(Object* obj)
 		ai->ignoreObstacle(theContainer);
  		ai->aiMoveToPosition( &pos, CMD_FROM_AI );
 
-	}  // end if
+	}
 	else
 	{
 
 		// no ai, just set position at the target pos
 		obj->setPosition( &pos );
 
-	}  // end else
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -365,7 +408,7 @@ void TunnelContain::onDie( const DamageInfo * damageInfo )
 
 	tunnelTracker->onTunnelDestroyed( getObject() );
 	m_isCurrentlyRegistered = FALSE;
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 void TunnelContain::onDelete( void )
@@ -433,7 +476,7 @@ void TunnelContain::onBuildComplete( void )
 	tunnelTracker->onTunnelCreated( getObject() );
 	m_isCurrentlyRegistered = TRUE;
 	*/
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -459,6 +502,26 @@ void TunnelContain::onCapture( Player *oldOwner, Player *newOwner )
 	OpenContain::onCapture( oldOwner, newOwner );
 }
 
+//-------------------------------------------------------------------------------------------------
+void TunnelContain::orderAllPassengersToExit( CommandSourceType commandSource, Bool instantly )
+{
+	Player *owningPlayer = getObject()->getControllingPlayer();
+	if( !owningPlayer || !owningPlayer->getTunnelSystem() )
+		return;
+
+	OpenContain::orderAllPassengersToExit( commandSource, instantly );
+}
+
+//-------------------------------------------------------------------------------------------------
+void TunnelContain::orderAllPassengersToIdle( CommandSourceType commandSource )
+{
+	Player *owningPlayer = getObject()->getControllingPlayer();
+	if( !owningPlayer || !owningPlayer->getTunnelSystem() )
+		return;
+
+	OpenContain::orderAllPassengersToIdle( commandSource );
+}
+
 // ------------------------------------------------------------------------------------------------
 /** Per frame update */
 // ------------------------------------------------------------------------------------------------
@@ -466,8 +529,7 @@ UpdateSleepTime TunnelContain::update( void )
 {
 	// extending functionality to heal the units within the tunnel system
 	OpenContain::update();
-	const TunnelContainModuleData *modData = getTunnelContainModuleData();
-	
+
 	Object *obj = getObject();
 	Player *controllingPlayer = NULL;
 	if (obj)
@@ -477,10 +539,13 @@ UpdateSleepTime TunnelContain::update( void )
 	if (controllingPlayer)
 	{
 		TunnelTracker *tunnelSystem = controllingPlayer->getTunnelSystem();
+#if PRESERVE_RETAIL_BEHAVIOR || RETAIL_COMPATIBLE_CRC
 		if (tunnelSystem)
 		{
+			const TunnelContainModuleData* modData = getTunnelContainModuleData();
 			tunnelSystem->healObjects(modData->m_framesForFullHeal);
 		}
+#endif
 
 		// check for attacked.
 		BodyModuleInterface *body = obj->getBodyModule();
@@ -514,7 +579,7 @@ void TunnelContain::crc( Xfer *xfer )
 	// extend base class
 	OpenContain::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -538,7 +603,7 @@ void TunnelContain::xfer( Xfer *xfer )
 	// Currently registered with owning player
 	xfer->xferBool( &m_isCurrentlyRegistered );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -549,4 +614,4 @@ void TunnelContain::loadPostProcess( void )
 	// extend base class
 	OpenContain::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/CreateModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/CreateModule.cpp
index 853c7d999d5..c4708aa0f06 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/CreateModule.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/CreateModule.cpp
@@ -34,19 +34,19 @@
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-CreateModule::CreateModule( Thing *thing, const ModuleData* moduleData ) 
+CreateModule::CreateModule( Thing *thing, const ModuleData* moduleData )
 						: BehaviorModule( thing, moduleData ),
 						  m_needToRunOnBuildComplete(TRUE)
 {
 
-}  // end createModule
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 CreateModule::~CreateModule()
 {
 
-}  // end ~CreateModule
+}
 
 //-------------------------------------------------------------------------------------------------
 /** CRC */
@@ -57,7 +57,7 @@ void CreateModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -78,7 +78,7 @@ void CreateModule::xfer( Xfer *xfer )
 	// need to run on build complete
 	xfer->xferBool( &m_needToRunOnBuildComplete );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -89,6 +89,6 @@ void CreateModule::loadPostProcess( void )
 	// extend base class
 	BehaviorModule::loadPostProcess();
 
-}  // ene loadPostProcess
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp
index 27798a62a65..2c4e347f274 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/GrantUpgradeCreate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_OBJECT_STATUS_NAMES
 #include "Common/Player.h"
@@ -41,7 +41,6 @@
 // ------------------------------------------------------------------------------------------------
 GrantUpgradeCreateModuleData::GrantUpgradeCreateModuleData()
 {
-	m_upgradeName = "";
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -50,7 +49,7 @@ void GrantUpgradeCreateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   CreateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "UpgradeToGrant",	INI::parseAsciiString,							NULL, offsetof( GrantUpgradeCreateModuleData, m_upgradeName ) },
 		{ "ExemptStatus",		ObjectStatusMaskType::parseFromINI, NULL, offsetof( GrantUpgradeCreateModuleData, m_exemptStatus ) },
@@ -68,14 +67,14 @@ void GrantUpgradeCreateModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 GrantUpgradeCreate::GrantUpgradeCreate( Thing *thing, const ModuleData* moduleData ) : CreateModule( thing, moduleData )
 {
-}  // end GrantUpgradeCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 GrantUpgradeCreate::~GrantUpgradeCreate( void )
 {
 
-}  // end ~GrantUpgradeCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The create callback. */
@@ -87,12 +86,12 @@ void GrantUpgradeCreate::onCreate( void )
 	ObjectStatusMaskType currentStatus = getObject()->getStatusBits();
 	if( exemptStatus.test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 	{
-		if(	!currentStatus.test( OBJECT_STATUS_UNDER_CONSTRUCTION ) ) 
+		if(	!currentStatus.test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 		{
 			const UpgradeTemplate *upgradeTemplate = TheUpgradeCenter->findUpgrade( getGrantUpgradeCreateModuleData()->m_upgradeName );
 			if( !upgradeTemplate )
 			{
-				DEBUG_ASSERTCRASH( 0, ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName(), getGrantUpgradeCreateModuleData()->m_upgradeName ) );
+				DEBUG_ASSERTCRASH( 0, ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName().str(), getGrantUpgradeCreateModuleData()->m_upgradeName.str() ) );
 				return;
 			}
 
@@ -106,12 +105,12 @@ void GrantUpgradeCreate::onCreate( void )
 			{
 				getObject()->giveUpgrade( upgradeTemplate );
 			}
-			
+
 			player->getAcademyStats()->recordUpgrade( upgradeTemplate, TRUE );
 		}
 	}
 
-}  // end onCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -125,7 +124,7 @@ void GrantUpgradeCreate::onBuildComplete( void )
 	const UpgradeTemplate *upgradeTemplate = TheUpgradeCenter->findUpgrade( getGrantUpgradeCreateModuleData()->m_upgradeName );
 	if( !upgradeTemplate )
 	{
-		DEBUG_ASSERTCRASH( 0, ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName(), getGrantUpgradeCreateModuleData()->m_upgradeName ) );
+		DEBUG_ASSERTCRASH( 0, ("GrantUpdateCreate for %s can't find upgrade template %s.", getObject()->getName().str(), getGrantUpgradeCreateModuleData()->m_upgradeName.str() ) );
 		return;
 	}
 
@@ -139,7 +138,7 @@ void GrantUpgradeCreate::onBuildComplete( void )
 	{
 		getObject()->giveUpgrade( upgradeTemplate );
 	}
-}  // end onBuildComplete
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -150,7 +149,7 @@ void GrantUpgradeCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -168,7 +167,7 @@ void GrantUpgradeCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -179,4 +178,4 @@ void GrantUpgradeCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/LockWeaponCreate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/LockWeaponCreate.cpp
index 974bd6f1ca1..391f07d0b23 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/LockWeaponCreate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/LockWeaponCreate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES
 #include "Common/Xfer.h"
@@ -49,7 +49,7 @@ void LockWeaponCreateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   CreateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SlotToLock",	INI::parseLookupList,	TheWeaponSlotTypeNamesLookupList, offsetof( LockWeaponCreateModuleData, m_slotToLock ) },
 		{ 0, 0, 0, 0 }
@@ -66,21 +66,21 @@ void LockWeaponCreateModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 LockWeaponCreate::LockWeaponCreate( Thing *thing, const ModuleData* moduleData ) : CreateModule( thing, moduleData )
 {
-}  // end GrantUpgradeCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 LockWeaponCreate::~LockWeaponCreate( void )
 {
 
-}  // end ~GrantUpgradeCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The create callback. */
 //-------------------------------------------------------------------------------------------------
 void LockWeaponCreate::onCreate( void )
 {
-}  // end onCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -91,7 +91,7 @@ void LockWeaponCreate::onBuildComplete( void )
 	Object *me = getObject();
 	WeaponSlotType slot = getLockWeaponCreateModuleData()->m_slotToLock;
 	me->setWeaponLock( slot, LOCKED_PERMANENTLY );
-}  // end onBuildComplete
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -102,7 +102,7 @@ void LockWeaponCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -120,7 +120,7 @@ void LockWeaponCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -131,4 +131,4 @@ void LockWeaponCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/PreorderCreate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/PreorderCreate.cpp
index ac0334f4d23..1710d8d1a04 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/PreorderCreate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/PreorderCreate.cpp
@@ -28,18 +28,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/PreorderCreate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -53,7 +48,7 @@ PreorderCreate::PreorderCreate( Thing *thing, const ModuleData* moduleData ) : C
 PreorderCreate::~PreorderCreate( void )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void PreorderCreate::onCreate( void )
@@ -82,7 +77,7 @@ void PreorderCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -100,7 +95,7 @@ void PreorderCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -111,4 +106,4 @@ void PreorderCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/SpecialPowerCreate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/SpecialPowerCreate.cpp
index 7d0573d6aea..9cb0960ed0a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/SpecialPowerCreate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/SpecialPowerCreate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -47,7 +47,7 @@ SpecialPowerCreate::SpecialPowerCreate( Thing *thing, const ModuleData* moduleDa
 SpecialPowerCreate::~SpecialPowerCreate( void )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void SpecialPowerCreate::onCreate( void )
@@ -70,7 +70,7 @@ void SpecialPowerCreate::onBuildComplete( void )
 
 		sp->onSpecialPowerCreation();
 	}
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -81,7 +81,7 @@ void SpecialPowerCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -99,7 +99,7 @@ void SpecialPowerCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -110,4 +110,4 @@ void SpecialPowerCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/SupplyCenterCreate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/SupplyCenterCreate.cpp
index dfb28ad3d59..6100a0824da 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/SupplyCenterCreate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/SupplyCenterCreate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -48,7 +48,7 @@ SupplyCenterCreate::SupplyCenterCreate( Thing *thing, const ModuleData* moduleDa
 SupplyCenterCreate::~SupplyCenterCreate( void )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void SupplyCenterCreate::onCreate( void )
@@ -76,7 +76,7 @@ void SupplyCenterCreate::onBuildComplete( void )
 			continue;
 		manager->addSupplyCenter( getObject() );
 	}
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -87,7 +87,7 @@ void SupplyCenterCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -105,7 +105,7 @@ void SupplyCenterCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -116,4 +116,4 @@ void SupplyCenterCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/SupplyWarehouseCreate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/SupplyWarehouseCreate.cpp
index a1ff54c95ac..bfcb644e3e5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/SupplyWarehouseCreate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/SupplyWarehouseCreate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -48,7 +48,7 @@ SupplyWarehouseCreate::SupplyWarehouseCreate( Thing *thing, const ModuleData* mo
 SupplyWarehouseCreate::~SupplyWarehouseCreate( void )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void SupplyWarehouseCreate::onCreate( void )
@@ -78,7 +78,7 @@ void SupplyWarehouseCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -96,7 +96,7 @@ void SupplyWarehouseCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -107,4 +107,4 @@ void SupplyWarehouseCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/VeterancyGainCreate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/VeterancyGainCreate.cpp
index d876bf6fb78..9ebe0753568 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/VeterancyGainCreate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Create/VeterancyGainCreate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_VETERANCY_NAMES				// for TheVeterancyNames[]
 #include "Common/Player.h"
@@ -51,7 +51,7 @@ void VeterancyGainCreateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   CreateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "StartingLevel",		INI::parseIndexList,	TheVeterancyNames,	offsetof( VeterancyGainCreateModuleData, m_startingLevel ) },
 		{ "ScienceRequired",	INI::parseScience,		NULL,								offsetof( VeterancyGainCreateModuleData, m_scienceRequired ) },
@@ -85,14 +85,14 @@ void VeterancyGainCreate::onCreate( void )
 
 	const VeterancyGainCreateModuleData *md = getVeterancyGainCreateModuleData();
 	Player *myPlayer = getObject()->getControllingPlayer();
-	if( myPlayer && (md->m_scienceRequired == SCIENCE_INVALID || 
+	if( myPlayer && (md->m_scienceRequired == SCIENCE_INVALID ||
 									 myPlayer->hasScience( md->m_scienceRequired )) )
 	{
 		ExperienceTracker* myExp = getObject()->getExperienceTracker();
 		if( myExp  &&  myExp->isTrainable() )
 		{
 			// srj sez: use "setMin" here so that we never lose levels
-			myExp->setMinVeterancyLevel( md->m_startingLevel );// sVL can override isTrainable, but this module should not.
+			myExp->setMinVeterancyLevel( md->m_startingLevel, false );// sVL can override isTrainable, but this module should not.
 		}
 	}
 
@@ -107,7 +107,7 @@ void VeterancyGainCreate::crc( Xfer *xfer )
 	// extend base class
 	CreateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -125,7 +125,7 @@ void VeterancyGainCreate::xfer( Xfer *xfer )
 	// extend base class
 	CreateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -136,4 +136,4 @@ void VeterancyGainCreate::loadPostProcess( void )
 	// extend base class
 	CreateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/BoneFXDamage.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/BoneFXDamage.cpp
index 1b1955c3ced..f6da3866e17 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/BoneFXDamage.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/BoneFXDamage.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
@@ -39,17 +39,17 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-BoneFXDamage::BoneFXDamage( Thing *thing, const ModuleData* moduleData ) 
+BoneFXDamage::BoneFXDamage( Thing *thing, const ModuleData* moduleData )
 																		  : DamageModule( thing, moduleData )
 {
-}  // end BoneFXDamage
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 BoneFXDamage::~BoneFXDamage( void )
 {
 
-}  // end ~BoneFXDamage
+}
 
 //-------------------------------------------------------------------------------------------------
 void BoneFXDamage::onObjectCreated()
@@ -66,8 +66,8 @@ void BoneFXDamage::onObjectCreated()
 //-------------------------------------------------------------------------------------------------
 /** Switching damage states */
 //-------------------------------------------------------------------------------------------------
-void BoneFXDamage::onBodyDamageStateChange( const DamageInfo *damageInfo, 
-																						BodyDamageType oldState, 
+void BoneFXDamage::onBodyDamageStateChange( const DamageInfo *damageInfo,
+																						BodyDamageType oldState,
 																						BodyDamageType newState )
 {
 	static NameKeyType key_BoneFXUpdate = NAMEKEY("BoneFXUpdate");
@@ -75,7 +75,7 @@ void BoneFXDamage::onBodyDamageStateChange( const DamageInfo *damageInfo,
 	if (bfxu)
 		bfxu->changeBodyDamageState(oldState, newState);
 
-}  // end onBodyDamageStateChange
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -86,7 +86,7 @@ void BoneFXDamage::crc( Xfer *xfer )
 	// extend base class
 	DamageModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -104,7 +104,7 @@ void BoneFXDamage::xfer( Xfer *xfer )
 	// extend base class
 	DamageModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -115,4 +115,4 @@ void BoneFXDamage::loadPostProcess( void )
 	// extend base class
 	DamageModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/DamageModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/DamageModule.cpp
index 102c1ff3372..248d470d3a0 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/DamageModule.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/DamageModule.cpp
@@ -41,7 +41,7 @@ void DamageModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -57,7 +57,7 @@ void DamageModule::xfer( Xfer *xfer )
 	// call base class
 	BehaviorModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -68,4 +68,4 @@ void DamageModule::loadPostProcess( void )
 	// call base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/TransitionDamageFX.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/TransitionDamageFX.cpp
index dd4a8fb0a93..62082147f25 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/TransitionDamageFX.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Damage/TransitionDamageFX.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
@@ -69,9 +69,9 @@ TransitionDamageFXModuleData::TransitionDamageFXModuleData( void )
 			m_particleSystem[ i ][ j ].locInfo.locType = FX_DAMAGE_LOC_TYPE_COORD;
 			m_particleSystem[ i ][ j ].locInfo.randomBone = FALSE;
 
-		}  // end for j
+		}
 
-	}  // end for i
+	}
 
 	m_damageFXTypes = DAMAGE_TYPE_FLAGS_NONE;
 	m_damageFXTypes.flip();
@@ -80,7 +80,7 @@ TransitionDamageFXModuleData::TransitionDamageFXModuleData( void )
 	m_damageParticleTypes = DAMAGE_TYPE_FLAGS_NONE;
 	m_damageParticleTypes.flip();
 
-}  // end TransitionDamageFXModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse fx location info ... that is a named bone or a coord3d position */
@@ -108,12 +108,12 @@ static void parseFXLocInfo( INI *ini, void *instance, FXLocInfo *locInfo )
 			DEBUG_CRASH(( "parseFXLocInfo: Bone name not followed by RandomBone specifier\nPress IGNORE to see which INI file and line # is incorrect." ));
 			throw INI_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// parse the Bool definition
 		ini->parseBool( ini, instance, &locInfo->randomBone, NULL );
 
-	}  // end if
+	}
 	else if( stricmp( token, "loc" ) == 0 )
 	{
 
@@ -123,22 +123,22 @@ static void parseFXLocInfo( INI *ini, void *instance, FXLocInfo *locInfo )
 		locInfo->loc.z = ini->scanReal( ini->getNextSubToken("Z") );
 		locInfo->locType = FX_DAMAGE_LOC_TYPE_COORD;
 
-	}  // end else
+	}
 	else
 	{
 
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end else
+	}
 
-}  // end parseFXLocInfo
+}
 
 //-------------------------------------------------------------------------------------------------
 /** In the form of:
 	* FXListSlot = <<Bone:BoneName BoneRandom:<Yes|No>> | <Loc: X:x Y:y Z:z>> FXList:FXListName */
 //-------------------------------------------------------------------------------------------------
-void TransitionDamageFXModuleData::parseFXList( INI *ini, void *instance, 
+void TransitionDamageFXModuleData::parseFXList( INI *ini, void *instance,
 																								void *store, const void *userData )
 {
 	const char *token;
@@ -155,18 +155,18 @@ void TransitionDamageFXModuleData::parseFXList( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// parse the fx list name
 	ini->parseFXList( ini, instance, &info->fx, NULL );
 
-}  // end parseFXList
+}
 
 //-------------------------------------------------------------------------------------------------
 /** In the form of:
 	* OCLSlot = <<Bone:BoneName BoneRandom:<Yes|No>> | <Loc: X:x Y:y Z:z>> OCL:OCLName */
 //-------------------------------------------------------------------------------------------------
-void TransitionDamageFXModuleData::parseObjectCreationList( INI *ini, void *instance, 
+void TransitionDamageFXModuleData::parseObjectCreationList( INI *ini, void *instance,
 																														void *store, const void *userData )
 {
 	const char *token;
@@ -183,18 +183,18 @@ void TransitionDamageFXModuleData::parseObjectCreationList( INI *ini, void *inst
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// parse the ocl name
 	ini->parseObjectCreationList( ini, instance, store, &info->ocl );
 
-}  // end parseObjectCreationList
+}
 
 //-------------------------------------------------------------------------------------------------
 /** In the form of:
 	* ParticleSlot = <<Bone:BoneName BoneRandom:<Yes|No>> | <Loc: X:x Y:y Z:z>> PSys:PSysName */
 //-------------------------------------------------------------------------------------------------
-void TransitionDamageFXModuleData::parseParticleSystem( INI *ini, void *instance, 
+void TransitionDamageFXModuleData::parseParticleSystem( INI *ini, void *instance,
 																												void *store, const void *userData )
 {
 	const char *token;
@@ -211,16 +211,16 @@ void TransitionDamageFXModuleData::parseParticleSystem( INI *ini, void *instance
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// parse the particle system name
 	ini->parseParticleSystemTemplate( ini, instance, store, &info->particleSysTemplate );
 
-}  // end parseParticleSystem
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-TransitionDamageFX::TransitionDamageFX( Thing *thing, const ModuleData* moduleData ) 
+TransitionDamageFX::TransitionDamageFX( Thing *thing, const ModuleData* moduleData )
 																		  : DamageModule( thing, moduleData )
 {
 	Int i, j;
@@ -229,14 +229,14 @@ TransitionDamageFX::TransitionDamageFX( Thing *thing, const ModuleData* moduleDa
 		for( j = 0; j < DAMAGE_MODULE_MAX_FX; j++ )
 			m_particleSystemID[ i ][ j ] = INVALID_PARTICLE_SYSTEM_ID;
 
-}  // end TransitionDamageFX
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 TransitionDamageFX::~TransitionDamageFX( void )
 {
 
-}  // end ~TransitionDamageFX
+}
 
 /*
 //-------------------------------------------------------------------------------------------------
@@ -249,17 +249,17 @@ void TransitionDamageFX::onDelete( void )
 	// particle system will automatically delete itself when the object is destroyed
 	//
 
-}  // end onDelete
+}
 */
 
 //-------------------------------------------------------------------------------------------------
-/** Given an FXLoc info struct, return the effect position that we are supposed to use. 
+/** Given an FXLoc info struct, return the effect position that we are supposed to use.
 	* The position is local to to the object */
 //-------------------------------------------------------------------------------------------------
 static Coord3D getLocalEffectPos( const FXLocInfo *locInfo, Drawable *draw )
 {
 
-	DEBUG_ASSERTCRASH( locInfo, ("getLocalEffectPos: locInfo is NULL\n") );
+	DEBUG_ASSERTCRASH( locInfo, ("getLocalEffectPos: locInfo is NULL") );
 
 	if( locInfo->locType == FX_DAMAGE_LOC_TYPE_BONE && draw )
 	{
@@ -267,7 +267,7 @@ static Coord3D getLocalEffectPos( const FXLocInfo *locInfo, Drawable *draw )
 		if( locInfo->randomBone == FALSE )
 		{
 			Coord3D pos;
-		
+
 			// get the bone position
 			Int count = draw->getPristineBonePositions( locInfo->boneName.str(), 0, &pos, NULL, 1 );
 
@@ -278,7 +278,7 @@ static Coord3D getLocalEffectPos( const FXLocInfo *locInfo, Drawable *draw )
 			// return the position retrieved
 			return pos;
 
-		}  // end if
+		}
 		else
 		{
 		  const Int MAX_BONES = 32;
@@ -296,19 +296,19 @@ static Coord3D getLocalEffectPos( const FXLocInfo *locInfo, Drawable *draw )
 			Int pick = GameLogicRandomValue( 0, boneCount - 1 );
 			return positions[ pick ];
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 	else
 		return locInfo->loc;
 
-}  // end getLocalEffectPos
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Switching damage states */
 //-------------------------------------------------------------------------------------------------
-void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo, 
-																									BodyDamageType oldState, 
+void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
+																									BodyDamageType oldState,
 																									BodyDamageType newState )
 {
 	Object *damageSource = NULL;
@@ -319,7 +319,7 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 	// get the source of the damage if present
 	if( damageInfo )
 		damageSource = TheGameLogic->findObjectByID( damageInfo->in.m_sourceID );
-	
+
 	// remove any particle systems that might be emitting from our old state
 	for( i = 0; i < DAMAGE_MODULE_MAX_FX; i++ )
 	{
@@ -330,9 +330,9 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 			TheParticleSystemManager->destroyParticleSystemByID( m_particleSystemID[ oldState ][ i ] );
 			m_particleSystemID[ oldState ][ i ] = INVALID_PARTICLE_SYSTEM_ID;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	//
 	// when we are transitioning to a "worse" state we will play a set of effects for that
@@ -353,7 +353,7 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 			if( modData->m_fxList[ newState ][ i ].fx )
 			{
 
-				if( lastDamageInfo == NULL || 
+				if( lastDamageInfo == NULL ||
 						getDamageTypeFlag( modData->m_damageFXTypes, lastDamageInfo->in.m_damageType ) )
 				{
 
@@ -361,33 +361,33 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 					getObject()->convertBonePosToWorldPos( &pos, NULL, &pos, NULL );
 					FXList::doFXPos( modData->m_fxList[ newState ][ i ].fx, &pos );
 
-				}  // end if
+				}
+
+			}
 
-			}  // end if
-					
 			// do any object creation list for our new state
-			if( modData->m_OCL[ newState ][ i ].ocl )
+			if( damageSource && modData->m_OCL[ newState ][ i ].ocl )
 			{
 
-				if( lastDamageInfo == NULL || 
+				if( lastDamageInfo == NULL ||
 						getDamageTypeFlag( modData->m_damageOCLTypes, lastDamageInfo->in.m_damageType ) )
 				{
 
 					pos = getLocalEffectPos( &modData->m_OCL[ newState ][ i ].locInfo, draw );
 					getObject()->convertBonePosToWorldPos( &pos, NULL, &pos, NULL );
-					ObjectCreationList::create( modData->m_OCL[ newState ][ i ].ocl, 
+					ObjectCreationList::create( modData->m_OCL[ newState ][ i ].ocl,
 																			getObject(), &pos, damageSource->getPosition(), INVALID_ANGLE );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
 			// get the template of the system to create
 			pSystemT = modData->m_particleSystem[ newState ][ i ].particleSysTemplate;
 			if( pSystemT )
 			{
 
-				if( lastDamageInfo == NULL || 
+				if( lastDamageInfo == NULL ||
 						getDamageTypeFlag( modData->m_damageParticleTypes, lastDamageInfo->in.m_damageType ) )
 				{
 
@@ -395,7 +395,7 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 					ParticleSystem* pSystem = TheParticleSystemManager->createParticleSystem( pSystemT );
 					if( pSystem )
 					{
-			
+
 						// get the what is the position we're going to playe the effect at
 						pos = getLocalEffectPos( &modData->m_particleSystem[ newState ][ i ].locInfo, draw );
 
@@ -413,17 +413,17 @@ void TransitionDamageFX::onBodyDamageStateChange( const DamageInfo* damageInfo,
 						// save the id of this particle system so we can remove it later if it still exists
 						m_particleSystemID[ newState ][ i ] = pSystem->getSystemID();
 
-					}  // end if
+					}
+
+				}
+
+			}
 
-				}  // end if
+		}
 
-			}  // end if
-						
-		}  // end for i
+	}
 
-	}  // end if
-			
-}  // end onBodyDamageStateChange
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -434,7 +434,7 @@ void TransitionDamageFX::crc( Xfer *xfer )
 	// extend base class
 	DamageModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -455,7 +455,7 @@ void TransitionDamageFX::xfer( Xfer *xfer )
 	// particle systems ids
 	xfer->xferUser( m_particleSystemID, sizeof( ParticleSystemID ) * BODYDAMAGETYPE_COUNT * DAMAGE_MODULE_MAX_FX );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -466,4 +466,4 @@ void TransitionDamageFX::loadPostProcess( void )
 	// extend base class
 	DamageModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Destroy/DestroyModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Destroy/DestroyModule.cpp
index 11452aa9af7..fb82997cf48 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Destroy/DestroyModule.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Destroy/DestroyModule.cpp
@@ -34,18 +34,18 @@
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-DestroyModule::DestroyModule( Thing *thing, const ModuleData* moduleData ) 
+DestroyModule::DestroyModule( Thing *thing, const ModuleData* moduleData )
 							: BehaviorModule( thing, moduleData )
 {
 
-}  // end DestroyModule
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 DestroyModule::~DestroyModule( void )
 {
 
-}  // end ~DestroyModule
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -56,7 +56,7 @@ void DestroyModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -74,7 +74,7 @@ void DestroyModule::xfer( Xfer *xfer )
 	// extend base class
 	BehaviorModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -85,5 +85,5 @@ void DestroyModule::loadPostProcess( void )
 	// extend base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CreateCrateDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CreateCrateDie.cpp
index 028190af250..de3a54c8c2d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CreateCrateDie.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CreateCrateDie.cpp
@@ -27,7 +27,7 @@
 // Desc:   A chance to create a crate on death according to certain condition checks
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PlayerList.h"
 #include "Common/Player.h"
@@ -95,7 +95,7 @@ void CreateCrateDie::onDie( const DamageInfo * damageInfo )
 
 			if( KINDOFMASK_ANY_SET(currentCrateData->m_killedByTypeKindof) && !testKillerType( currentCrateData, killer ) )
 				continue; //If this is set up to test and it fails
-			
+
 			if( (currentCrateData->m_killerScience != SCIENCE_INVALID)  &&  !testKillerScience( currentCrateData, killer ) )
 				continue; //If this is set up to test and it fails
 
@@ -108,14 +108,14 @@ void CreateCrateDie::onDie( const DamageInfo * damageInfo )
 					crate->setTeam( me->getControllingPlayer()->getDefaultTeam() );
 				}
 
-				if (killer) 
+				if (killer)
 				{
 					// If the killer is a computer controlled player, notify that the crate exists.
-					if (killer->getControllingPlayer() &&	
-						killer->getControllingPlayer()->getPlayerType()==PLAYER_COMPUTER) 
+					if (killer->getControllingPlayer() &&
+						killer->getControllingPlayer()->getPlayerType()==PLAYER_COMPUTER)
 					{
 						AIUpdateInterface *ai = killer->getAIUpdateInterface();
-						if (ai) 
+						if (ai)
 						{
 							ai->notifyCrate( crate->getID() );
 						}
@@ -124,7 +124,7 @@ void CreateCrateDie::onDie( const DamageInfo * damageInfo )
 			}
 		}
 	}
-}  
+}
 
 Bool CreateCrateDie::testCreationChance( CrateTemplate const *currentCrateData )
 {
@@ -179,7 +179,7 @@ Object *CreateCrateDie::createCrate( CrateTemplate const *currentCrateData )
 	// CreationChance is used for the success of this block, but this block can have any number of potential actual crates
 	Real multipleCratePick = GameLogicRandomValueReal( 0, 1 );
 	Real multipleCrateRunningTotal = 0;
-	AsciiString crateName = "";
+	AsciiString crateName;
 
 	for( crateCreationEntryConstIterator iter = currentCrateData->m_possibleCrates.begin();
 				iter != currentCrateData->m_possibleCrates.end();
@@ -223,7 +223,7 @@ Object *CreateCrateDie::createCrate( CrateTemplate const *currentCrateData )
 		fpOptions.minRadius = 0.0f;
 		fpOptions.maxRadius = 125.0f;
 		fpOptions.relationshipObject = NULL;
-		fpOptions.flags = FPF_NONE; 
+		fpOptions.flags = FPF_NONE;
 		if( ThePartitionManager->findPositionAround( &centerPoint, &fpOptions, &creationPoint ) )
 		{
 			spotFound = TRUE;
@@ -242,7 +242,7 @@ Object *CreateCrateDie::createCrate( CrateTemplate const *currentCrateData )
 		if( crateDrawable )
 		{
 			crateDrawable->setTerrainDecal(TERRAIN_DECAL_CRATE);
-			crateDrawable->setTerrainDecalSize(2.5f * newCrate->getGeometryInfo().getMajorRadius(), 
+			crateDrawable->setTerrainDecalSize(2.5f * newCrate->getGeometryInfo().getMajorRadius(),
 																2.5f * newCrate->getGeometryInfo().getMajorRadius() )	;
 			crateDrawable->setTerrainDecalFadeTarget(1.0f, 0.03f);
 		}
@@ -261,7 +261,7 @@ void CreateCrateDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -279,7 +279,7 @@ void CreateCrateDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -290,4 +290,4 @@ void CreateCrateDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp
index 84dc17cd129..19db01c59b6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp
@@ -27,7 +27,7 @@
 // Desc:   Create an object upon this object's death
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_OBJECT_STATUS_NAMES
 #include "GameLogic/Module/AIUpdate.h"
@@ -38,12 +38,7 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ObjectCreationList.h"
 #include "GameLogic/Module/BodyModule.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
+#include "GameClient/InGameUI.h"
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -52,7 +47,7 @@ CreateObjectDieModuleData::CreateObjectDieModuleData()
 
 	m_ocl = NULL;
 	m_transferPreviousHealth = FALSE;
-
+	m_transferSelection = FALSE;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -61,10 +56,11 @@ CreateObjectDieModuleData::CreateObjectDieModuleData()
 {
 	DieModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "CreationList",	INI::parseObjectCreationList,		NULL,											offsetof( CreateObjectDieModuleData, m_ocl ) },
 		{ "TransferPreviousHealth", INI::parseBool, NULL	,offsetof( CreateObjectDieModuleData, m_transferPreviousHealth ) },
+		{ "TransferSelection", INI::parseBool, NULL, offsetof( CreateObjectDieModuleData, m_transferSelection ) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
@@ -100,11 +96,13 @@ void CreateObjectDie::onDie( const DamageInfo * damageInfo )
 	Object *damageDealer = TheGameLogic->findObjectByID( damageInfo->in.m_sourceID );
 
 	Object *newObject = ObjectCreationList::create( data->m_ocl, getObject(), damageDealer );
+	if (!newObject)
+		return;
 
 	//If we're transferring previous health, we're transfering the last known
 	//health before we died. In the case of the sneak attack tunnel network, it
 	//is killed after the lifetime update expires.
-	if( newObject && data->m_transferPreviousHealth )
+	if( data->m_transferPreviousHealth )
 	{
 		//Convert old health to new health.
 		Object *oldObject = getObject();
@@ -120,7 +118,7 @@ void CreateObjectDie::onDie( const DamageInfo * damageInfo )
 				damInfo.in.m_amount = subdualDamageAmount;
 				damInfo.in.m_damageType = DAMAGE_SUBDUAL_UNRESISTABLE;
 				damInfo.in.m_sourceID = INVALID_ID;
-				newBody->attemptDamage( &damInfo );				
+				newBody->attemptDamage( &damInfo );
 			}
 
 			//Now transfer the previous health from the old object to the new.
@@ -145,8 +143,23 @@ void CreateObjectDie::onDie( const DamageInfo * damageInfo )
 		}
 	}
 
-	
-}  // end onDie
+	// TheSuperHackers @bugfix Stubbjax 02/10/2025 If the old object was selected, select the new one.
+	// This is important for the Sneak Attack, which is spawned via a CreateObjectDie module.
+	if (data->m_transferSelection)
+	{
+		Object* oldObject = getObject();
+		Drawable* selectedDrawable = TheInGameUI->getFirstSelectedDrawable();
+		Bool oldObjectSelected = selectedDrawable && selectedDrawable->getID() == oldObject->getDrawable()->getID();
+
+		if (oldObjectSelected)
+		{
+			GameMessage* msg = TheMessageStream->appendMessage(GameMessage::MSG_CREATE_SELECTED_GROUP_NO_SOUND);
+			msg->appendBooleanArgument(TRUE);
+			msg->appendObjectIDArgument(newObject->getID());
+			TheInGameUI->selectDrawable(newObject->getDrawable());
+		}
+	}
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -157,7 +170,7 @@ void CreateObjectDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -175,7 +188,7 @@ void CreateObjectDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -186,4 +199,4 @@ void CreateObjectDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CrushDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CrushDie.cpp
index 90ea8b23b2c..2bb5cf33b06 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CrushDie.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CrushDie.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -165,7 +165,7 @@ void CrushDie::onDie( const DamageInfo * damageInfo )
 	if (!isDieApplicable(damageInfo))
 		return;
 
-	DEBUG_ASSERTCRASH(damageInfo->in.m_damageType == DAMAGE_CRUSH, ("this should only be used for crush damage\n"));
+	DEBUG_ASSERTCRASH(damageInfo->in.m_damageType == DAMAGE_CRUSH, ("this should only be used for crush damage"));
 	if (damageInfo->in.m_damageType != DAMAGE_CRUSH)
 		return;
 
@@ -200,12 +200,12 @@ void CrushDie::onDie( const DamageInfo * damageInfo )
 				newCrushed.set(MODELCONDITION_BACKCRUSHED, crushType == TOTAL_CRUSH || crushType == BACK_END_CRUSH);
 
 				me->getDrawable()->clearAndSetModelConditionFlags(
-					MAKE_MODELCONDITION_MASK2(MODELCONDITION_BACKCRUSHED, MODELCONDITION_FRONTCRUSHED), 
+					MAKE_MODELCONDITION_MASK2(MODELCONDITION_BACKCRUSHED, MODELCONDITION_FRONTCRUSHED),
 					newCrushed);
 			}
 		}
 	}
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -216,7 +216,7 @@ void CrushDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -234,7 +234,7 @@ void CrushDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -245,4 +245,4 @@ void CrushDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DamDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DamDie.cpp
index 48d7650d153..e01942aa8f5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DamDie.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DamDie.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
@@ -48,7 +48,7 @@
 DamDieModuleData::DamDieModuleData( void )
 {
 
-}  // end DamDieModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -57,14 +57,14 @@ DamDieModuleData::DamDieModuleData( void )
 
   DieModuleData::buildFieldParse( p );
 
-//	static const FieldParse dataFieldParse[] = 
+//	static const FieldParse dataFieldParse[] =
 //	{
 //		{ 0, 0, 0, 0 }
 //	};
 //
 //  p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -76,14 +76,14 @@ DamDie::DamDie( Thing *thing, const ModuleData *moduleData )
 			 :DieModule( thing, moduleData )
 {
 
-}  // end DamDie
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 DamDie::~DamDie( void )
 {
 
-}  // end ~DamDie
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -104,9 +104,9 @@ void DamDie::onDie( const DamageInfo *damageInfo )
 		// clear any disabled status of the water wave
 		obj->clearDisabled( DISABLED_DEFAULT );
 
-	}  // end for, obj
+	}
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -117,7 +117,7 @@ void DamDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -135,7 +135,7 @@ void DamDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -146,4 +146,4 @@ void DamDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DestroyDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DestroyDie.cpp
index 8881c5a2f4c..d7e6eafa2c4 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DestroyDie.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DestroyDie.cpp
@@ -28,18 +28,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Module/DestroyDie.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -73,7 +68,7 @@ void DestroyDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -91,7 +86,7 @@ void DestroyDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -102,4 +97,4 @@ void DestroyDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp
index 2dcea456b2b..adbd99e57f2 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp
@@ -24,10 +24,10 @@
 
 // FILE: DieModule.cpp ////////////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:   
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_OBJECT_STATUS_NAMES
 #include "Common/Xfer.h"
@@ -38,11 +38,6 @@
 #include "GameLogic/Object.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
@@ -54,9 +49,9 @@ DieMuxData::DieMuxData() :
 }
 
 //-------------------------------------------------------------------------------------------------
-const FieldParse* DieMuxData::getFieldParse() 
+const FieldParse* DieMuxData::getFieldParse()
 {
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DeathTypes",				INI::parseDeathTypeFlags,						NULL, offsetof( DieMuxData, m_deathTypes ) },
 		{ "VeterancyLevels",	INI::parseVeterancyLevelFlags,			NULL, offsetof( DieMuxData, m_veterancyLevels ) },
@@ -99,7 +94,7 @@ void DieModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -115,7 +110,7 @@ void DieModule::xfer( Xfer *xfer )
 	// call base class
 	BehaviorModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -126,4 +121,4 @@ void DieModule::loadPostProcess( void )
 	// call base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/EjectPilotDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/EjectPilotDie.cpp
index c10e93c2ea3..0e742370673 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/EjectPilotDie.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/EjectPilotDie.cpp
@@ -27,7 +27,7 @@
 // Desc:   Create an object upon this object's death
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/Player.h"
@@ -51,11 +51,11 @@ EjectPilotDieModuleData::EjectPilotDieModuleData() :
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void EjectPilotDieModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void EjectPilotDieModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   DieModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "AirCreationList",		INI::parseObjectCreationList,		NULL, offsetof( EjectPilotDieModuleData, m_oclInAir ) },
 		{ "GroundCreationList",		INI::parseObjectCreationList,		NULL, offsetof( EjectPilotDieModuleData, m_oclOnGround ) },
@@ -109,7 +109,7 @@ void EjectPilotDie::onDie( const DamageInfo * damageInfo )
 	const EjectPilotDieModuleData* d = getEjectPilotDieModuleData();
 	const ObjectCreationList* ocl = getObject()->isSignificantlyAboveTerrain() ? d->m_oclInAir : d->m_oclOnGround;
 	ejectPilot(ocl, getObject(), damageDealer);
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -120,7 +120,7 @@ void EjectPilotDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -138,7 +138,7 @@ void EjectPilotDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -149,4 +149,4 @@ void EjectPilotDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/FXListDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/FXListDie.cpp
index 573ff4f6d19..0e56cccecdd 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/FXListDie.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/FXListDie.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/Player.h"
@@ -105,7 +105,7 @@ void FXListDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -123,7 +123,7 @@ void FXListDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -134,4 +134,4 @@ void FXListDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/KeepObjectDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/KeepObjectDie.cpp
index 69c37b8a651..4a5065f45a0 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/KeepObjectDie.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/KeepObjectDie.cpp
@@ -31,7 +31,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
@@ -70,7 +70,7 @@ void KeepObjectDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -88,7 +88,7 @@ void KeepObjectDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -99,4 +99,4 @@ void KeepObjectDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp
index 6e9e22ca83d..819d7451d3d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/RebuildHoleExposeDie.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDE FILES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -46,11 +46,6 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameClient/SelectionXlat.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -67,7 +62,7 @@ RebuildHoleExposeDieModuleData::RebuildHoleExposeDieModuleData()
 {
 	DieModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "HoleName", INI::parseAsciiString, NULL, offsetof( RebuildHoleExposeDieModuleData, m_holeName ) },
 		{ "HoleMaxHealth", INI::parseReal, NULL, offsetof( RebuildHoleExposeDieModuleData, m_holeMaxHealth ) },
@@ -77,7 +72,7 @@ RebuildHoleExposeDieModuleData::RebuildHoleExposeDieModuleData()
 
 	p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -89,14 +84,14 @@ RebuildHoleExposeDie::RebuildHoleExposeDie( Thing *thing, const ModuleData* modu
 										: DieModule( thing, moduleData )
 {
 
-}  // end RebuildHoleExposeDie
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 RebuildHoleExposeDie::~RebuildHoleExposeDie( void )
 {
 
-}  // end ~RebuildHoleExposeDie
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The die callback. */
@@ -105,9 +100,9 @@ void RebuildHoleExposeDie::onDie( const DamageInfo *damageInfo )
 {
 	if (!isDieApplicable(damageInfo))
 		return;
-  
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
   if(TheSelectionTranslator->isHandOfGodSelectionMode())
   {
     if ( getObject()->isKindOf( KINDOF_STRUCTURE ) )
@@ -129,8 +124,8 @@ void RebuildHoleExposeDie::onDie( const DamageInfo *damageInfo )
 	// if we are being constructed from either the first time or from a hole reconstruction
 	// we do not "spawn" a hole object
 	//
-	if( us->getControllingPlayer() != ThePlayerList->getNeutralPlayer() 
-		  && us->getControllingPlayer()->isPlayerActive() 
+	if( us->getControllingPlayer() != ThePlayerList->getNeutralPlayer()
+		  && us->getControllingPlayer()->isPlayerActive()
 			&& !us->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 	{
 		Object *hole;
@@ -168,7 +163,7 @@ void RebuildHoleExposeDie::onDie( const DamageInfo *damageInfo )
 		RebuildHoleBehaviorInterface *rhbi = RebuildHoleBehavior::getRebuildHoleBehaviorInterfaceFromObject( hole );
 
 		// sanity
-		DEBUG_ASSERTCRASH( rhbi, ("RebuildHoleExposeDie: No Rebuild Hole Behavior interface on hole\n") );
+		DEBUG_ASSERTCRASH( rhbi, ("RebuildHoleExposeDie: No Rebuild Hole Behavior interface on hole") );
 
 		// start the rebuild process
 		if( rhbi )
@@ -186,9 +181,9 @@ void RebuildHoleExposeDie::onDie( const DamageInfo *damageInfo )
 			}
 		}
 
-	}  // end if
+	}
 
-}  // end onDie
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -199,7 +194,7 @@ void RebuildHoleExposeDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -217,7 +212,7 @@ void RebuildHoleExposeDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -228,4 +223,4 @@ void RebuildHoleExposeDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/SpecialPowerCompletionDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/SpecialPowerCompletionDie.cpp
index 1257574160b..249dcb12cb9 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/SpecialPowerCompletionDie.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/SpecialPowerCompletionDie.cpp
@@ -27,7 +27,7 @@
 // Desc:   Die method responsible for telling TheScriptEngine that a special power has been completed
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/SpecialPower.h"
@@ -42,14 +42,14 @@ SpecialPowerCompletionDie::SpecialPowerCompletionDie( Thing *thing, const Module
 {
 	m_creatorID = INVALID_ID;
 	m_creatorSet = FALSE;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 SpecialPowerCompletionDie::~SpecialPowerCompletionDie( void )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -71,7 +71,7 @@ void SpecialPowerCompletionDie::notifyScriptEngine( void )
 			getSpecialPowerCompletionDieModuleData()->m_specialPowerTemplate->getName(),
 			m_creatorID);
 	}
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -93,7 +93,7 @@ void SpecialPowerCompletionDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -117,7 +117,7 @@ void SpecialPowerCompletionDie::xfer( Xfer *xfer )
 	// creator set
 	xfer->xferBool( &m_creatorSet );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -128,4 +128,4 @@ void SpecialPowerCompletionDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp
index 32be4c7ec50..f94b69a5db0 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/UpgradeDie.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/Upgrade.h"
@@ -79,7 +79,7 @@ void UpgradeDie::onDie( const DamageInfo *damageInfo )
 				DEBUG_ASSERTCRASH( 0, ("Object %s just died, but is trying to free upgrade %s in it's producer %s%s",
 					getObject()->getTemplate()->getName().str(),
 					getUpgradeDieModuleData()->m_upgradeName.str(),
-					producer->getTemplate()->getName().str(), 
+					producer->getTemplate()->getName().str(),
 					", which the producer doesn't have. This is used in cases where the producer builds an upgrade that can die... like ranger building scout drones.") );
 			}
 		}
@@ -95,7 +95,7 @@ void UpgradeDie::crc( Xfer *xfer )
 	// extend base class
 	DieModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -113,7 +113,7 @@ void UpgradeDie::xfer( Xfer *xfer )
 	// extend base class
 	DieModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -124,4 +124,4 @@ void UpgradeDie::loadPostProcess( void )
 	// extend base class
 	DieModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp
index c076cb5c525..21364efd904 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp
@@ -27,7 +27,7 @@
 // Desc:   Keeps track of experience points so Veterance levels can be gained
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "Common/ThingTemplate.h"
@@ -36,11 +36,6 @@
 #include "GameLogic/Object.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 ExperienceTracker::ExperienceTracker(Object *parent) :
@@ -48,8 +43,9 @@ ExperienceTracker::ExperienceTracker(Object *parent) :
 	m_currentLevel(LEVEL_REGULAR),
 	m_experienceSink(INVALID_ID),
 	m_experienceScalar( 1.0f ),
-	m_currentExperience(0) // Added By Sadullah Nader
+	m_currentExperience(0)
 {
+	resetTrainable();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -70,7 +66,19 @@ Int ExperienceTracker::getExperienceValue( const Object* killer ) const
 //-------------------------------------------------------------------------------------------------
 Bool ExperienceTracker::isTrainable() const
 {
-	return m_parent->getTemplate()->isTrainable();
+	return m_isTrainable;
+}
+
+//-------------------------------------------------------------------------------------------------
+void ExperienceTracker::setTrainable(Bool trainable)
+{
+	m_isTrainable = trainable;
+}
+
+//-------------------------------------------------------------------------------------------------
+void ExperienceTracker::resetTrainable()
+{
+	m_isTrainable = m_parent->getTemplate()->isTrainable();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -85,9 +93,15 @@ void ExperienceTracker::setExperienceSink( ObjectID sink )
 	m_experienceSink = sink;
 }
 
+//-------------------------------------------------------------------------------------------------
+ObjectID ExperienceTracker::getExperienceSink() const
+{
+	return m_experienceSink;
+}
+
 //-------------------------------------------------------------------------------------------------
 // Set Level to AT LEAST this... if we are already >= this level, do nothing.
-void ExperienceTracker::setMinVeterancyLevel( VeterancyLevel newLevel )
+void ExperienceTracker::setMinVeterancyLevel( VeterancyLevel newLevel, Bool provideFeedback )
 {
 	// This does not check for IsTrainable, because this function is for explicit setting,
 	// so the setter is assumed to know what they are doing.  The game function
@@ -98,7 +112,7 @@ void ExperienceTracker::setMinVeterancyLevel( VeterancyLevel newLevel )
 		m_currentLevel = newLevel;
 		m_currentExperience = m_parent->getTemplate()->getExperienceRequired(m_currentLevel); //Minimum for this level
 		if (m_parent)
-			m_parent->onVeterancyLevelChanged( oldLevel, newLevel );
+			m_parent->onVeterancyLevelChanged( oldLevel, newLevel, provideFeedback );
 	}
 }
 
@@ -172,8 +186,8 @@ void ExperienceTracker::addExperiencePoints( Int experienceGain, Bool canScaleFo
 	m_currentExperience += amountToGain;
 
 	Int levelIndex = 0;
-	while( ( (levelIndex + 1) < LEVEL_COUNT) 
-		&&  m_currentExperience >= m_parent->getTemplate()->getExperienceRequired(levelIndex + 1) 
+	while( ( (levelIndex + 1) < LEVEL_COUNT)
+		&&  m_currentExperience >= m_parent->getTemplate()->getExperienceRequired(levelIndex + 1)
 		)
 	{
 		// If there is a higher level to qualify for, and I qualify for it, advance the index
@@ -212,7 +226,7 @@ void ExperienceTracker::setExperienceAndLevel( Int experienceIn, Bool provideFee
 	m_currentExperience = experienceIn;
 
 	Int levelIndex = 0;
-	while( ( (levelIndex + 1) < LEVEL_COUNT) 
+	while( ( (levelIndex + 1) < LEVEL_COUNT)
 		&&  m_currentExperience >= m_parent->getTemplate()->getExperienceRequired(levelIndex + 1)
 		)
 	{
@@ -235,19 +249,27 @@ void ExperienceTracker::crc( Xfer *xfer )
 {
 	xfer->xferInt( &m_currentExperience );
 	xfer->xferUser( &m_currentLevel, sizeof( VeterancyLevel ) );
-}  // end crc
+#if !RETAIL_COMPATIBLE_CRC
+	xfer->xferBool(&m_isTrainable);
+#endif
+}
 
 //-----------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
+	* 2: TheSuperHackers @tweak Serialize m_isTrainable
 	*/
 // ----------------------------------------------------------------------------
 void ExperienceTracker::xfer( Xfer *xfer )
 {
 
 	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
 	XferVersion currentVersion = 1;
+#else
+	XferVersion currentVersion = 2;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
@@ -266,11 +288,13 @@ void ExperienceTracker::xfer( Xfer *xfer )
 	// experience scalar
 	xfer->xferReal( &m_experienceScalar );
 
-}  // end xfer
+	if (version >= 2)
+		xfer->xferBool(&m_isTrainable);
+}
 
 //-----------------------------------------------------------------------------
 void ExperienceTracker::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp
index e620b587fd0..61969926d65 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp
@@ -27,7 +27,7 @@
 // Desc:   Keeps track of shots fired and people targeted for weapons that want a history of such a thing
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioHandleSpecialValues.h"
 #include "Common/GameType.h"
@@ -42,11 +42,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 FiringTracker::FiringTracker(Thing* thing, const ModuleData *modData) : UpdateModule( thing, modData )
@@ -196,7 +191,7 @@ UpdateSleepTime FiringTracker::update()
  		getObject()->reloadAllAmmo(TRUE);
  		m_frameToForceReload = 0;
  	}
- 
+
 	// If it has been too long since I fired.  I have to start over.
 	// (don't call if we don't need to cool down... it's expensive!)
 
@@ -226,11 +221,11 @@ UpdateSleepTime FiringTracker::update()
 UpdateSleepTime FiringTracker::calcTimeToSleep()
 {
  	// Figure out the longest amount of time we can sleep as unneeded
- 
+
  	// If all the timers are off, then we aren't needed at all
  	if (m_frameToStopLoopingSound == 0 && m_frameToStartCooldown == 0 && m_frameToForceReload == 0)
    		return UPDATE_SLEEP_FOREVER;
-   
+
  	// Otherwise, we need to wake up to service the shortest timer
    	UnsignedInt now = TheGameLogic->getFrame();
  	UnsignedInt sleepTime = UPDATE_SLEEP_FOREVER;
@@ -255,7 +250,7 @@ UpdateSleepTime FiringTracker::calcTimeToSleep()
  		else if( (m_frameToForceReload - now) < sleepTime )
  			sleepTime = m_frameToForceReload - now;
  	}
- 
+
  	return UPDATE_SLEEP(sleepTime);
 }
 
@@ -264,7 +259,7 @@ void FiringTracker::speedUp()
 {
 	ModelConditionFlags clr, set;
 	Object *self = getObject();
-	
+
 	if( self->testWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_FAST ) )
 	{
 		//self->clearWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_MEAN );
@@ -289,7 +284,7 @@ void FiringTracker::speedUp()
 
 
 	}
-	else 
+	else
 	{
 
 		self->setWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_MEAN );
@@ -311,13 +306,13 @@ void FiringTracker::coolDown()
 {
 	ModelConditionFlags clr, set;
 
-	if( getObject()->testWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_FAST ) 
+	if( getObject()->testWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_FAST )
 	 || getObject()->testWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_MEAN ))
 	{
 
 		// Straight to zero from wherever it is
 		set.set(MODELCONDITION_CONTINUOUS_FIRE_SLOW);
-		
+
 		getObject()->clearWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_FAST );
 		getObject()->clearWeaponBonusCondition( WEAPONBONUSCONDITION_CONTINUOUS_FIRE_MEAN );
 		clr.set(MODELCONDITION_CONTINUOUS_FIRE_FAST);
@@ -354,7 +349,7 @@ void FiringTracker::crc( Xfer *xfer )
 	// object helper base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -381,7 +376,7 @@ void FiringTracker::xfer( Xfer *xfer )
 	// frame to start cooldown
 	xfer->xferUnsignedInt( &m_frameToStartCooldown );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -392,4 +387,4 @@ void FiringTracker::loadPostProcess( void )
 	// object helper back class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp
index 1206b9f14f5..7c8dd524d64 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/GhostObject.cpp
@@ -26,21 +26,19 @@
 // Simple base object
 // Author: Michael S. Booth, October 2000
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/GhostObject.h"
 #include "GameLogic/Object.h"
 
-GhostObjectManager *TheGhostObjectManager=NULL;
+GhostObjectManager *TheGhostObjectManager = NULL;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 GhostObject::GhostObject(void):
-//Added By Sadullah Nader
-//Initializations missing and needed
 m_parentAngle(0.0f),
 // TheSuperHackers @bugfix tomsons26 26/04/2025 Change initialization of m_parentGeometryIsSmall from 0.0f.
 // Assigning a float to a bool results in the compiler using a random 1 byte value to assign to the bool.
@@ -50,16 +48,14 @@ m_parentGeometryMajorRadius(0.0f),
 m_parentGeometryminorRadius(0.0f),
 m_parentObject(NULL),
 m_partitionData(NULL)
-{ 
+{
 	m_parentPosition.zero();
-	// End Initializations
-}  // end Object
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 GhostObject::~GhostObject()
 {
-
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -67,8 +63,7 @@ GhostObject::~GhostObject()
 // ------------------------------------------------------------------------------------------------
 void GhostObject::crc( Xfer *xfer )
 {
-
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -77,7 +72,6 @@ void GhostObject::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 void GhostObject::xfer( Xfer *xfer )
 {
-
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
@@ -90,20 +84,16 @@ void GhostObject::xfer( Xfer *xfer )
 	xfer->xferObjectID( &parentObjectID );
 	if( xfer->getXferMode() == XFER_LOAD )
 	{
-
 		// tie up parent object pointer
 		m_parentObject = TheGameLogic->findObjectByID( parentObjectID );
 
 		// sanity
 		if( parentObjectID != INVALID_ID && m_parentObject == NULL )
 		{
-
-			DEBUG_CRASH(( "GhostObject::xfer - Unable to connect m_parentObject\n" ));
+			DEBUG_CRASH(( "GhostObject::xfer - Unable to connect m_parentObject" ));
 			throw INI_INVALID_DATA;
-
-		}  // end if
-
-	}  // end if
+		}
+	}
 
 	// parent geometry type
 	xfer->xferUser( &m_parentGeometryType, sizeof( GeometryType ) );
@@ -126,16 +116,14 @@ void GhostObject::xfer( Xfer *xfer )
 	// partition data
 	///@todo write me ---> !!!!!
 	// PartitionData	*m_partitionData;	///< our PartitionData
-
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void GhostObject::loadPostProcess( void )
 {
-
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -143,6 +131,7 @@ GhostObjectManager::GhostObjectManager(void)
 {
 	m_lockGhostObjects = FALSE;
 	m_saveLockGhostObjects = FALSE;
+	m_trackAllPlayers = TheGlobalData->m_enablePlayerObserver;
 	m_localPlayer = 0;
 }
 
@@ -150,14 +139,13 @@ GhostObjectManager::GhostObjectManager(void)
 // ------------------------------------------------------------------------------------------------
 GhostObjectManager::~GhostObjectManager()
 {
-
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void GhostObjectManager::reset(void)
 {
-
+	m_trackAllPlayers = TheGlobalData->m_enablePlayerObserver;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -171,14 +159,12 @@ GhostObject *GhostObjectManager::addGhostObject(Object *object, PartitionData *p
 // ------------------------------------------------------------------------------------------------
 void GhostObjectManager::removeGhostObject(GhostObject *mod)
 {
-
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void GhostObjectManager::updateOrphanedObjects(int *playerIndexList, int numNonLocalPlayers)
+void GhostObjectManager::updateOrphanedObjects(int *playerIndexList, int playerIndexCount)
 {
-
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -197,8 +183,7 @@ void GhostObjectManager::restorePartitionData(void)
 // ------------------------------------------------------------------------------------------------
 void GhostObjectManager::crc( Xfer *xfer )
 {
-
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method:
@@ -207,7 +192,6 @@ void GhostObjectManager::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 void GhostObjectManager::xfer( Xfer *xfer )
 {
-
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
@@ -215,13 +199,11 @@ void GhostObjectManager::xfer( Xfer *xfer )
 
 	// local player
 	xfer->xferInt( &m_localPlayer );
-
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void GhostObjectManager::loadPostProcess( void )
 {
-
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp
index c80618523de..62452b8046f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp
@@ -36,11 +36,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/ObjectDefectionHelper.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -58,7 +53,7 @@ UpdateSleepTime ObjectDefectionHelper::update()
 	// if we are here, we should be an undetected defector, but
 	// just in case someone has changed us behind our backs...
 	if (!obj->getIsUndetectedDefector())
-		return UPDATE_SLEEP_FOREVER; 
+		return UPDATE_SLEEP_FOREVER;
 
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (now >= m_defectionDetectionEnd)
@@ -72,12 +67,12 @@ UpdateSleepTime ObjectDefectionHelper::update()
 			if (draw)
 				draw->flashAsSelected( &white ); //Whew! that's easier, now, isn't it!
 
-		
+
 			AudioEventRTS defectorVulnerableSound = TheAudio->getMiscAudio()->m_defectorTimerDingSound;
 			defectorVulnerableSound.setObjectID( obj->getID() );
 			TheAudio->addAudioEvent(&defectorVulnerableSound);
 		}
-		return UPDATE_SLEEP_FOREVER;	// hey, we're done. 
+		return UPDATE_SLEEP_FOREVER;	// hey, we're done.
 	}
 
 	// dead or attacking... our cover is blown.
@@ -87,7 +82,7 @@ UpdateSleepTime ObjectDefectionHelper::update()
 		// checking the is_attacking statusbit above, only handles weapon related attacks...
 		// I also set m_undetectedDefector = FALSE in the groupDoSpecialPower[...]( ) functions;
 		obj->friend_setUndetectedDefector(FALSE);
-		return UPDATE_SLEEP_FOREVER;	// hey, we're done. 
+		return UPDATE_SLEEP_FOREVER;	// hey, we're done.
 	}
 
 	if (draw && m_doDefectorFX) // skip fx if merely 'invulnerable'
@@ -97,7 +92,7 @@ UpdateSleepTime ObjectDefectionHelper::update()
 		m_defectionDetectionFlashPhase += 0.5f * ( 1.0f - ((Real)timeLeft / DEFECTION_DETECTION_TIME_MAX ) );
 		Bool thisPhase = ( ((Int)m_defectionDetectionFlashPhase) & 1 );// are we in a flashy phase this frame?
 
-		if ( lastPhase && ( ! thisPhase ) ) 
+		if ( lastPhase && ( ! thisPhase ) )
 		{
 			draw->flashAsSelected(); //Whew! that's easier, now, isn't it!
 
@@ -108,7 +103,7 @@ UpdateSleepTime ObjectDefectionHelper::update()
 		}
 	}
 
-	return UPDATE_SLEEP_NONE; 
+	return UPDATE_SLEEP_NONE;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -141,7 +136,7 @@ void ObjectDefectionHelper::crc( Xfer *xfer )
 	// object helper crc
 	ObjectHelper::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -171,7 +166,7 @@ void ObjectDefectionHelper::xfer( Xfer *xfer )
 	// do defector fx
 	xfer->xferBool( &m_doDefectorFX );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -182,4 +177,4 @@ void ObjectDefectionHelper::loadPostProcess( void )
 	// object helper base class
 	ObjectHelper::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp
index 3e66caac251..39683f41572 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp
@@ -34,18 +34,13 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/ObjectHelper.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 ObjectHelper::~ObjectHelper( void )
 {
 
-}  // end ~ObjectHelper
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -57,7 +52,7 @@ void ObjectHelper::sleepUntil(UnsignedInt when)
 	// note the setWakeFrame(NEVER) actually awakens immediately, since NEVER==0.
 	// when we get NEVER in this case, we really want to sleep forever.
 	// so just special case it.
-	UpdateSleepTime wakeDelay = (when == NEVER || when == FOREVER) ? 
+	UpdateSleepTime wakeDelay = (when == NEVER || when == FOREVER) ?
 																UPDATE_SLEEP_FOREVER :
 																UPDATE_SLEEP(when - TheGameLogic->getFrame());
 	setWakeFrame(getObject(), wakeDelay);
@@ -72,7 +67,7 @@ void ObjectHelper::crc( Xfer *xfer )
 	// update module crc
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /* Xfer method
@@ -90,7 +85,7 @@ void ObjectHelper::xfer( Xfer *xfer )
 	// update module xfer
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -101,4 +96,4 @@ void ObjectHelper::loadPostProcess( void )
 	// update module post process
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectRepulsorHelper.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectRepulsorHelper.cpp
index ad934198338..dcfdebe262d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectRepulsorHelper.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectRepulsorHelper.cpp
@@ -48,7 +48,7 @@ UpdateSleepTime ObjectRepulsorHelper::update()
 	getObject()->clearStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_REPULSOR ) );
 
 	// then go back to sleep until we are forcibly awakened.
-	return UPDATE_SLEEP_FOREVER; 
+	return UPDATE_SLEEP_FOREVER;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -60,7 +60,7 @@ void ObjectRepulsorHelper::crc( Xfer *xfer )
 	// object helper crc
 	ObjectHelper::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -78,7 +78,7 @@ void ObjectRepulsorHelper::xfer( Xfer *xfer )
 	// object helper base class
 	ObjectHelper::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -89,5 +89,5 @@ void ObjectRepulsorHelper::loadPostProcess( void )
 	// object helper base class
 	ObjectHelper::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectSMCHelper.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectSMCHelper.cpp
index 3607c1e90b8..f646d56d9be 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectSMCHelper.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectSMCHelper.cpp
@@ -48,7 +48,7 @@ UpdateSleepTime ObjectSMCHelper::update()
 	getObject()->clearSpecialModelConditionStates();
 
 	// then go back to sleep until we are forcibly awakened.
-	return UPDATE_SLEEP_FOREVER; 
+	return UPDATE_SLEEP_FOREVER;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -60,7 +60,7 @@ void ObjectSMCHelper::crc( Xfer *xfer )
 	// object helper crc
 	ObjectHelper::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -78,7 +78,7 @@ void ObjectSMCHelper::xfer( Xfer *xfer )
 	// object helper base class
 	ObjectHelper::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -89,5 +89,5 @@ void ObjectSMCHelper::loadPostProcess( void )
 	// object helper base class
 	ObjectHelper::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectWeaponStatusHelper.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectWeaponStatusHelper.cpp
index a242b212223..ef46a8abaeb 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectWeaponStatusHelper.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/ObjectWeaponStatusHelper.cpp
@@ -34,8 +34,8 @@
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-ObjectWeaponStatusHelper::~ObjectWeaponStatusHelper( void ) 
-{ 
+ObjectWeaponStatusHelper::~ObjectWeaponStatusHelper( void )
+{
 
 }
 
@@ -48,7 +48,7 @@ void ObjectWeaponStatusHelper::crc( Xfer *xfer )
 	// object helper crc
 	ObjectHelper::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -66,7 +66,7 @@ void ObjectWeaponStatusHelper::xfer( Xfer *xfer )
 	// object helper base class
 	ObjectHelper::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -77,4 +77,4 @@ void ObjectWeaponStatusHelper::loadPostProcess( void )
 	// object helper base class
 	ObjectHelper::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/StatusDamageHelper.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/StatusDamageHelper.cpp
index c4d11685188..be3f7e6e15e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/StatusDamageHelper.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/StatusDamageHelper.cpp
@@ -38,8 +38,8 @@
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-StatusDamageHelper::StatusDamageHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) 
-{ 
+StatusDamageHelper::StatusDamageHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData )
+{
 	m_statusToHeal = OBJECT_STATUS_NONE;
 	m_frameToHeal = 0;
 
@@ -80,7 +80,7 @@ void StatusDamageHelper::clearStatusCondition()
 void StatusDamageHelper::doStatusDamage( ObjectStatusTypes status, Real duration )
 {
 	Int durationAsInt = REAL_TO_INT_FLOOR(duration);
-	
+
 	// Clear any different status we may have.  Re-getting the same status will just reset the timer
 	if( m_statusToHeal != status )
 		clearStatusCondition();
@@ -101,7 +101,7 @@ void StatusDamageHelper::crc( Xfer *xfer )
 	// object helper crc
 	ObjectHelper::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -122,7 +122,7 @@ void StatusDamageHelper::xfer( Xfer *xfer )
 	xfer->xferUser( &m_statusToHeal, sizeof(ObjectStatusTypes) );// an enum
 	xfer->xferUnsignedInt( &m_frameToHeal );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -133,5 +133,5 @@ void StatusDamageHelper::loadPostProcess( void )
 	// object helper base class
 	ObjectHelper::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/SubdualDamageHelper.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/SubdualDamageHelper.cpp
index 335ef4b2f94..2f50597c8a6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/SubdualDamageHelper.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/SubdualDamageHelper.cpp
@@ -37,8 +37,8 @@
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-SubdualDamageHelper::SubdualDamageHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) 
-{ 
+SubdualDamageHelper::SubdualDamageHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData )
+{
 	m_healingStepCountdown = 0;
 
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
@@ -69,7 +69,7 @@ UpdateSleepTime SubdualDamageHelper::update()
 	body->attemptDamage(&removeSubdueDamage);
 
 	if( body->hasAnySubdualDamage() )
-		return UPDATE_SLEEP_NONE; 
+		return UPDATE_SLEEP_NONE;
 	else
 		return UPDATE_SLEEP_FOREVER;
 }
@@ -94,7 +94,7 @@ void SubdualDamageHelper::crc( Xfer *xfer )
 	// object helper crc
 	ObjectHelper::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -114,7 +114,7 @@ void SubdualDamageHelper::xfer( Xfer *xfer )
 
 	xfer->xferUnsignedInt( &m_healingStepCountdown );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -125,5 +125,5 @@ void SubdualDamageHelper::loadPostProcess( void )
 	// object helper base class
 	ObjectHelper::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/TempWeaponBonusHelper.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/TempWeaponBonusHelper.cpp
index 9c5aed48588..0bd0a027681 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/TempWeaponBonusHelper.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Helper/TempWeaponBonusHelper.cpp
@@ -40,8 +40,8 @@
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-TempWeaponBonusHelper::TempWeaponBonusHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData ) 
-{ 
+TempWeaponBonusHelper::TempWeaponBonusHelper( Thing *thing, const ModuleData *modData ) : ObjectHelper( thing, modData )
+{
 	m_currentBonus = WEAPONBONUSCONDITION_INVALID;
 	m_frameToRemove = 0;
 
@@ -115,7 +115,7 @@ void TempWeaponBonusHelper::crc( Xfer *xfer )
 	// object helper crc
 	ObjectHelper::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -136,7 +136,7 @@ void TempWeaponBonusHelper::xfer( Xfer *xfer )
 	xfer->xferUser( &m_currentBonus, sizeof(WeaponBonusConditionType) );// an enum
 	xfer->xferUnsignedInt( &m_frameToRemove );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -147,5 +147,5 @@ void TempWeaponBonusHelper::loadPostProcess( void )
 	// object helper base class
 	ObjectHelper::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp
index b7c217df760..9b2a9bba467 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_SURFACECATEGORY_NAMES
 #define DEFINE_LOCO_Z_NAMES
@@ -46,11 +46,6 @@
 #include "GameLogic/Module/BodyModule.h"
 #include "GameLogic/Module/AIUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static const Real DONUT_TIME_DELAY_SECONDS=2.5f;
 static const Real DONUT_DISTANCE=4.0*PATHFIND_CELL_SIZE_F;
@@ -64,7 +59,7 @@ LocomotorStore *TheLocomotorStore = NULL;					///< the Locomotor store definitio
 
 const Real BIGNUM = 99999.0f;
 
-static const char *TheLocomotorPriorityNames[] = 
+static const char *const TheLocomotorPriorityNames[] =
 {
 	"MOVES_BACK",
 	"MOVES_MIDDLE",
@@ -72,7 +67,7 @@ static const char *TheLocomotorPriorityNames[] =
 
 	NULL
 };
-
+static_assert(ARRAY_SIZE(TheLocomotorPriorityNames) == LOCOMOTOR_PRIORITY_COUNT + 1, "Array size");
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -168,7 +163,7 @@ static Real tryToRotateVector3D(
 		Matrix3D rotMtx(objCrossGoal, angleBetween);
 		actualDir = rotMtx.Rotate_Vector(curDir);
 	}
-	
+
 	return angleBetween;
 }
 
@@ -197,8 +192,8 @@ inline Real tryToOrientInThisDirection3D(Object* obj, Real maxTurnRate, const Co
 
 //-----------------------------------------------------------------------------
 static void calcDirectionToApplyThrust(
-	const Object* obj, 
-	const PhysicsBehavior* physics, 
+	const Object* obj,
+	const PhysicsBehavior* physics,
 	const Coord3D& ingoalPos,
 	Real maxAccel,
 	Vector3& goalDir
@@ -210,7 +205,7 @@ static void calcDirectionToApplyThrust(
 
 		this is complicated by the fact that we generally have an intrinsic velocity already,
 		that must be accounted for, and by the fact that we can only apply force in our
-		forward-x-direction (with a thrust-angle-range), and (due to limited range) might not 
+		forward-x-direction (with a thrust-angle-range), and (due to limited range) might not
 		be able to apply the force in the optimal direction!
 	*/
 
@@ -252,7 +247,7 @@ static void calcDirectionToApplyThrust(
 			// choose the smallest positive t.
 			if (t < 0 || (t2 >= 0 && t2 < t))
 				t = t2;
-			
+
 			// plug it in.
 			if (!isNearlyZero(t))
 			{
@@ -349,9 +344,9 @@ LocomotorTemplate::LocomotorTemplate()
 	m_wanderWidthFactor = 0.0f;
 	m_wanderLengthFactor = 1.0f;
 	m_wanderAboutPointRadius = 0.0f;
-  
+
 	m_rudderCorrectionDegree    = 0.0f;
-	m_rudderCorrectionRate      = 0.0f;	
+	m_rudderCorrectionRate      = 0.0f;
 	m_elevatorCorrectionDegree  = 0.0f;
 	m_elevatorCorrectionRate    = 0.0f;
 
@@ -369,13 +364,13 @@ void LocomotorTemplate::validate()
 	// this is ok; parachutes need it!
 	//DEBUG_ASSERTCRASH(m_lift == 0.0f || m_lift > fabs(TheGlobalData->m_gravity), ("Lift is too low to counteract gravity!"));
 	//DEBUG_ASSERTCRASH(m_liftDamaged == 0.0f || m_liftDamaged > fabs(TheGlobalData->m_gravity), ("LiftDamaged is too low to counteract gravity!"));
-	//DEBUG_ASSERTCRASH(m_preferredHeight == 0.0f || (m_behaviorZ == Z_SURFACE_RELATIVE_HEIGHT || m_behaviorZ == Z_ABSOLUTE_HEIGHT || m_appearance == LOCO_THRUST), 
+	//DEBUG_ASSERTCRASH(m_preferredHeight == 0.0f || (m_behaviorZ == Z_SURFACE_RELATIVE_HEIGHT || m_behaviorZ == Z_ABSOLUTE_HEIGHT || m_appearance == LOCO_THRUST),
 	//	("You must use Z_SURFACE_RELATIVE_HEIGHT or Z_ABSOLUTE_HEIGHT (or THRUST) to use preferredHeight"));
 
 	// for 'damaged' stuff that was omitted, set 'em to be the same as 'undamaged'...
 	if (m_maxSpeedDamaged < 0.0f)
 		m_maxSpeedDamaged = m_maxSpeed;
-	
+
 	if (m_maxTurnRateDamaged < 0.0f)
 		m_maxTurnRateDamaged = m_maxTurnRate;
 
@@ -405,25 +400,25 @@ void LocomotorTemplate::validate()
 				m_lift != 0.0f ||
 				m_liftDamaged != 0.0f)
 		{
-			DEBUG_CRASH(("THRUST locos may not use ZAxisBehavior or lift!\n"));
+			DEBUG_CRASH(("THRUST locos may not use ZAxisBehavior or lift!"));
 			throw INI_INVALID_DATA;
 		}
 		if (m_maxSpeed <= 0.0f)
 		{
 			// if one of these was omitted, it defaults to zero... just quietly heal it here, rather than crashing
-			DEBUG_LOG(("THRUST locos may not have zero m_maxSpeed; healing...\n"));
+			DEBUG_LOG(("THRUST locos may not have zero m_maxSpeed; healing..."));
 			m_maxSpeed = 0.01f;
 		}
 		if (m_maxSpeedDamaged <= 0.0f)
 		{
 			// if one of these was omitted, it defaults to zero... just quietly heal it here, rather than crashing
-			DEBUG_LOG(("THRUST locos may not have zero m_maxSpeedDamaged; healing...\n"));
+			DEBUG_LOG(("THRUST locos may not have zero m_maxSpeedDamaged; healing..."));
 			m_maxSpeedDamaged = 0.01f;
 		}
 		if (m_minSpeed <= 0.0f)
 		{
 			// if one of these was omitted, it defaults to zero... just quietly heal it here, rather than crashing
-			DEBUG_LOG(("THRUST locos may not have zero m_minSpeed; healing...\n"));
+			DEBUG_LOG(("THRUST locos may not have zero m_minSpeed; healing..."));
 			m_minSpeed = 0.01f;
 		}
 	}
@@ -435,69 +430,69 @@ static void parseFrictionPerSec( INI* ini, void * /*instance*/, void *store, con
 	Real fricPerSec = INI::scanReal(ini->getNextToken());
 	Real fricPerFrame = fricPerSec * SECONDS_PER_LOGICFRAME_REAL;
 	*(Real *)store = fricPerFrame;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
-const FieldParse* LocomotorTemplate::getFieldParse() const  
+const FieldParse* LocomotorTemplate::getFieldParse() const
 {
 	static const FieldParse TheFieldParse[] =
 	{
-		{ "Surfaces", INI::parseBitString32, TheLocomotorSurfaceTypeNames, offsetof(LocomotorTemplate, m_surfaces) },		
-		{ "Speed", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_maxSpeed) },		
+		{ "Surfaces", INI::parseBitString32, TheLocomotorSurfaceTypeNames, offsetof(LocomotorTemplate, m_surfaces) },
+		{ "Speed", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_maxSpeed) },
 		{ "SpeedDamaged", INI::parseVelocityReal, NULL, offsetof( LocomotorTemplate, m_maxSpeedDamaged ) },
-		{ "TurnRate", INI::parseAngularVelocityReal, NULL, offsetof(LocomotorTemplate, m_maxTurnRate) },		
+		{ "TurnRate", INI::parseAngularVelocityReal, NULL, offsetof(LocomotorTemplate, m_maxTurnRate) },
 		{ "TurnRateDamaged", INI::parseAngularVelocityReal, NULL, offsetof( LocomotorTemplate, m_maxTurnRateDamaged ) },
-		{ "Acceleration", INI::parseAccelerationReal, NULL, offsetof(LocomotorTemplate, m_acceleration) },		
+		{ "Acceleration", INI::parseAccelerationReal, NULL, offsetof(LocomotorTemplate, m_acceleration) },
 		{ "AccelerationDamaged", INI::parseAccelerationReal, NULL, offsetof( LocomotorTemplate, m_accelerationDamaged ) },
-		{ "Lift", INI::parseAccelerationReal, NULL, offsetof(LocomotorTemplate, m_lift) },		
+		{ "Lift", INI::parseAccelerationReal, NULL, offsetof(LocomotorTemplate, m_lift) },
 		{ "LiftDamaged", INI::parseAccelerationReal, NULL, offsetof( LocomotorTemplate, m_liftDamaged ) },
-		{ "Braking", INI::parseAccelerationReal, NULL, offsetof(LocomotorTemplate, m_braking) },		
-		{ "MinSpeed", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_minSpeed) },		
-		{ "MinTurnSpeed", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_minTurnSpeed) },		
+		{ "Braking", INI::parseAccelerationReal, NULL, offsetof(LocomotorTemplate, m_braking) },
+		{ "MinSpeed", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_minSpeed) },
+		{ "MinTurnSpeed", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_minTurnSpeed) },
 		{ "PreferredHeight", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_preferredHeight) },
 		{ "PreferredHeightDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_preferredHeightDamping) },
 		{ "CirclingRadius", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_circlingRadius) },
 		{ "Extra2DFriction", parseFrictionPerSec, NULL, offsetof(LocomotorTemplate, m_extra2DFriction) },
 		{ "SpeedLimitZ", INI::parseVelocityReal, NULL, offsetof(LocomotorTemplate, m_speedLimitZ) },
 		{ "MaxThrustAngle", INI::parseAngleReal, NULL, offsetof(LocomotorTemplate, m_maxThrustAngle) },		// yes, angle, not angular-vel
-		{ "ZAxisBehavior", INI::parseIndexList, TheLocomotorBehaviorZNames, offsetof(LocomotorTemplate, m_behaviorZ) },		
+		{ "ZAxisBehavior", INI::parseIndexList, TheLocomotorBehaviorZNames, offsetof(LocomotorTemplate, m_behaviorZ) },
 		{ "Appearance", INI::parseIndexList, TheLocomotorAppearanceNames, offsetof(LocomotorTemplate, m_appearance) },		\
 		{ "GroupMovementPriority", INI::parseIndexList, TheLocomotorPriorityNames, offsetof(LocomotorTemplate, m_movePriority) },		\
 
 		{ "AccelerationPitchLimit", INI::parseAngleReal, NULL, offsetof(LocomotorTemplate, m_accelPitchLimit) },
 		{ "DecelerationPitchLimit", INI::parseAngleReal, NULL, offsetof(LocomotorTemplate, m_decelPitchLimit) },
-		{ "BounceAmount", INI::parseAngularVelocityReal, NULL, offsetof(LocomotorTemplate, m_bounceKick) },		
-		{ "PitchStiffness", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_pitchStiffness) },		
-		{ "RollStiffness", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_rollStiffness) },		
-		{ "PitchDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_pitchDamping) },		
-		{ "RollDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_rollDamping) },		
+		{ "BounceAmount", INI::parseAngularVelocityReal, NULL, offsetof(LocomotorTemplate, m_bounceKick) },
+		{ "PitchStiffness", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_pitchStiffness) },
+		{ "RollStiffness", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_rollStiffness) },
+		{ "PitchDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_pitchDamping) },
+		{ "RollDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_rollDamping) },
 		{ "ThrustRoll", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_thrustRoll) },
 		{ "ThrustWobbleRate",	INI::parseReal, NULL, offsetof(LocomotorTemplate, m_wobbleRate) },
 		{ "ThrustMinWobble",	INI::parseReal, NULL, offsetof(LocomotorTemplate, m_minWobble) },
 		{ "ThrustMaxWobble",	INI::parseReal, NULL, offsetof(LocomotorTemplate, m_maxWobble) },
-		{ "PitchInDirectionOfZVelFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_pitchByZVelCoef) },		
-		{ "ForwardVelocityPitchFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_forwardVelCoef) },		
-		{ "LateralVelocityRollFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_lateralVelCoef) },		
-		{ "ForwardAccelerationPitchFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_forwardAccelCoef) },		
-		{ "LateralAccelerationRollFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_lateralAccelCoef) },		
-		{ "UniformAxialDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_uniformAxialDamping) },		
-		{ "TurnPivotOffset", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_turnPivotOffset) },		
+		{ "PitchInDirectionOfZVelFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_pitchByZVelCoef) },
+		{ "ForwardVelocityPitchFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_forwardVelCoef) },
+		{ "LateralVelocityRollFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_lateralVelCoef) },
+		{ "ForwardAccelerationPitchFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_forwardAccelCoef) },
+		{ "LateralAccelerationRollFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_lateralAccelCoef) },
+		{ "UniformAxialDamping", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_uniformAxialDamping) },
+		{ "TurnPivotOffset", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_turnPivotOffset) },
 		{ "Apply2DFrictionWhenAirborne", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_apply2DFrictionWhenAirborne) },
-		{ "DownhillOnly", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_downhillOnly) },		
+		{ "DownhillOnly", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_downhillOnly) },
 		{ "AllowAirborneMotiveForce", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_allowMotiveForceWhileAirborne) },
 		{ "LocomotorWorksWhenDead", INI::parseBool, NULL, offsetof(LocomotorTemplate, m_locomotorWorksWhenDead) },
 		{ "AirborneTargetingHeight", INI::parseInt, NULL, offsetof( LocomotorTemplate, m_airborneTargetingHeight ) },
-		{ "StickToGround",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_stickToGround) },		
-		{ "CanMoveBackwards",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_canMoveBackward) },		
-		{ "HasSuspension",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_hasSuspension) },		
-		{ "FrontWheelTurnAngle", INI::parseAngleReal, NULL, offsetof(LocomotorTemplate, m_wheelTurnAngle) },		
-		{ "MaximumWheelExtension", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_maximumWheelExtension) },		
-		{ "MaximumWheelCompression", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_maximumWheelCompression) },		
+		{ "StickToGround",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_stickToGround) },
+		{ "CanMoveBackwards",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_canMoveBackward) },
+		{ "HasSuspension",				INI::parseBool,			NULL,	offsetof(LocomotorTemplate, m_hasSuspension) },
+		{ "FrontWheelTurnAngle", INI::parseAngleReal, NULL, offsetof(LocomotorTemplate, m_wheelTurnAngle) },
+		{ "MaximumWheelExtension", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_maximumWheelExtension) },
+		{ "MaximumWheelCompression", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_maximumWheelCompression) },
 		{ "CloseEnoughDist",				 INI::parseReal, NULL, offsetof(LocomotorTemplate, m_closeEnoughDist) },
 		{ "CloseEnoughDist3D",			 INI::parseBool, NULL, offsetof(LocomotorTemplate, m_isCloseEnoughDist3D) },
 		{ "SlideIntoPlaceTime",		INI::parseDurationReal, NULL, offsetof(LocomotorTemplate, m_ultraAccurateSlideIntoPlaceFactor) },
 
-		{ "WanderWidthFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_wanderWidthFactor) },		
+		{ "WanderWidthFactor", INI::parseReal, NULL, offsetof(LocomotorTemplate, m_wanderWidthFactor) },
 		{ "WanderLengthFactor",				 INI::parseReal, NULL, offsetof(LocomotorTemplate, m_wanderLengthFactor) },
 		{ "WanderAboutPointRadius",				 INI::parseReal, NULL, offsetof(LocomotorTemplate, m_wanderAboutPointRadius) },
 
@@ -505,8 +500,8 @@ const FieldParse* LocomotorTemplate::getFieldParse() const
 		{ "RudderCorrectionRate",			 INI::parseReal, NULL, offsetof(LocomotorTemplate, m_rudderCorrectionRate) },
 		{ "ElevatorCorrectionDegree",	 INI::parseReal, NULL, offsetof(LocomotorTemplate, m_elevatorCorrectionDegree) },
 		{ "ElevatorCorrectionRate",		 INI::parseReal, NULL, offsetof(LocomotorTemplate, m_elevatorCorrectionRate) },
-		{ NULL, NULL, NULL, 0 }  // keep this last	
-	
+		{ NULL, NULL, NULL, 0 }
+
 	};
 	return TheFieldParse;
 }
@@ -516,7 +511,7 @@ const FieldParse* LocomotorTemplate::getFieldParse() const
 //-------------------------------------------------------------------------------------------------
 LocomotorStore::LocomotorStore()
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 LocomotorStore::~LocomotorStore()
@@ -537,7 +532,7 @@ LocomotorTemplate* LocomotorStore::findLocomotorTemplate(NameKeyType namekey)
 		return NULL;
 
   LocomotorTemplateMap::iterator it = m_locomotorTemplates.find(namekey);
-  if (it == m_locomotorTemplates.end()) 
+  if (it == m_locomotorTemplates.end())
 		return NULL;
 	else
 		return (*it).second;
@@ -550,7 +545,7 @@ const LocomotorTemplate* LocomotorStore::findLocomotorTemplate(NameKeyType namek
 		return NULL;
 
   LocomotorTemplateMap::const_iterator it = m_locomotorTemplates.find(namekey);
-  if (it == m_locomotorTemplates.end()) 
+  if (it == m_locomotorTemplates.end())
 	{
 		return NULL;
 	}
@@ -601,7 +596,7 @@ LocomotorTemplate *LocomotorStore::newOverride( LocomotorTemplate *locoTemplate
 	// return the newly created override for us to set values with etc
 	return newTemplate;
 
-}  // end newOverride
+}
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ void LocomotorStore::parseLocomotorTemplateDefinition(INI* ini)
@@ -613,12 +608,12 @@ LocomotorTemplate *LocomotorStore::newOverride( LocomotorTemplate *locoTemplate
 	// read the Locomotor name
 	const char* token = ini->getNextToken();
 	NameKeyType namekey = NAMEKEY(token);
-	
+
 	LocomotorTemplate *loco = TheLocomotorStore->findLocomotorTemplate(namekey);
 	if (loco) {
 		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES) {
 			loco = TheLocomotorStore->newOverride((LocomotorTemplate*) loco->friend_getFinalOverride());
-		} 
+		}
 		isOverride = true;
 	} else {
 		loco = newInstance(LocomotorTemplate);
@@ -630,8 +625,8 @@ LocomotorTemplate *LocomotorStore::newOverride( LocomotorTemplate *locoTemplate
 	loco->friend_setName(token);
 	ini->initFromINI(loco, loco->getFieldParse());
 	loco->validate();
-	
-	// if this is an override, then we want the pointer on the existing named locomotor to point us 
+
+	// if this is an override, then we want the pointer on the existing named locomotor to point us
 	// to the override, so don't add it to the map.
 	if (!isOverride)
 		TheLocomotorStore->m_locomotorTemplates[namekey] = loco;
@@ -677,13 +672,8 @@ Locomotor::Locomotor(const LocomotorTemplate* tmpl)
 //-------------------------------------------------------------------------------------------------
 Locomotor::Locomotor(const Locomotor& that)
 {
-	//Added By Sadullah Nader
-	//Initializations 
 	m_angleOffset = 0.0f;
 	m_maintainPos.zero();
-
-	//
-	
 	m_template = that.m_template;
 	m_brakingFactor = that.m_brakingFactor;
 	m_maxLift = that.m_maxLift;
@@ -726,7 +716,7 @@ Locomotor& Locomotor::operator=(const Locomotor& that)
 }
 
 //-------------------------------------------------------------------------------------------------
-Locomotor::~Locomotor() 
+Locomotor::~Locomotor()
 {
 }
 
@@ -736,7 +726,7 @@ Locomotor::~Locomotor()
 void Locomotor::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -771,7 +761,7 @@ void Locomotor::xfer( Xfer *xfer )
 	xfer->xferReal(&m_angleOffset);
 	xfer->xferReal(&m_offsetIncrement);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -779,10 +769,10 @@ void Locomotor::xfer( Xfer *xfer )
 void Locomotor::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
-void Locomotor::startMove(void) 
+void Locomotor::startMove(void)
 {
 	// Reset the donut timer.
 	m_donutTimer = TheGameLogic->getFrame()+DONUT_TIME_DELAY_SECONDS*LOGICFRAMES_PER_SECOND;
@@ -889,7 +879,7 @@ void Locomotor::locoUpdate_moveTowardsAngle(Object* obj, Real goalAngle)
 	}
 
 #ifdef DEBUG_OBJECT_ID_EXISTS
-//	DEBUG_ASSERTLOG(obj->getID() != TheObjectIDToDebug, ("locoUpdate_moveTowardsAngle %f (%f deg), spd %f (%f)\n",goalAngle,goalAngle*180/PI,physics->getSpeed(),physics->getForwardSpeed2D()));
+//	DEBUG_ASSERTLOG(obj->getID() != TheObjectIDToDebug, ("locoUpdate_moveTowardsAngle %f (%f deg), spd %f (%f)",goalAngle,goalAngle*180/PI,physics->getSpeed(),physics->getForwardSpeed2D()));
 #endif
 
 	Real minSpeed = getMinSpeed();
@@ -904,13 +894,13 @@ void Locomotor::locoUpdate_moveTowardsAngle(Object* obj, Real goalAngle)
 		const Real onPathDistToGoal = 99999.0f;
 		Bool blocked = false;
 		locoUpdate_moveTowardsPosition(obj, desiredPos, onPathDistToGoal, minSpeed, &blocked);
-		
+
 		// don't need to call handleBehaviorZ() here, since locoUpdate_moveTowardsPosition() will do so
 		return;
 	}
 	else
 	{
-		DEBUG_ASSERTCRASH(m_template->m_appearance != LOCO_THRUST, ("THRUST should always have minspeeds!\n"));
+		DEBUG_ASSERTCRASH(m_template->m_appearance != LOCO_THRUST, ("THRUST should always have minspeeds!"));
 		Coord3D desiredPos = *obj->getPosition();
 		desiredPos.x += Cos(goalAngle) * 1000.0f;
 		desiredPos.y += Sin(goalAngle) * 1000.0f;
@@ -950,20 +940,20 @@ void Locomotor::setPhysicsOptions(Object* obj)
 }
 
 //-------------------------------------------------------------------------------------------------
-void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalPos, 
+void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalPos,
 																							 Real onPathDistToGoal, Real desiredSpeed, Bool *blocked)
 {
 	setFlag(MAINTAIN_POS_IS_VALID, false);
 
 	BodyDamageType bdt = obj->getBodyModule()->getDamageState();
 	Real maxSpeed = getMaxSpeedForCondition(bdt);
-	
+
 	// sanity, we cannot use desired speed that is greater than our max speed we are capable of moving at
 	if( desiredSpeed > maxSpeed )
 		desiredSpeed = maxSpeed;
 
 	Real distToStopAtMaxSpeed = (maxSpeed/getBraking()) * (maxSpeed)/2.0f;
-	if (onPathDistToGoal>PATHFIND_CELL_SIZE_F && onPathDistToGoal > distToStopAtMaxSpeed) 
+	if (onPathDistToGoal>PATHFIND_CELL_SIZE_F && onPathDistToGoal > distToStopAtMaxSpeed)
 	{
 		setFlag(IS_BRAKING, false);
 		m_brakingFactor = 1.0f;
@@ -982,7 +972,7 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 	}
 
 #ifdef DEBUG_OBJECT_ID_EXISTS
-//	DEBUG_ASSERTLOG(obj->getID() != TheObjectIDToDebug, ("locoUpdate_moveTowardsPosition %f %f %f (dtg %f, spd %f), speed %f (%f)\n",goalPos.x,goalPos.y,goalPos.z,onPathDistToGoal,desiredSpeed,physics->getSpeed(),physics->getForwardSpeed2D()));
+//	DEBUG_ASSERTLOG(obj->getID() != TheObjectIDToDebug, ("locoUpdate_moveTowardsPosition %f %f %f (dtg %f, spd %f), speed %f (%f)",goalPos.x,goalPos.y,goalPos.z,onPathDistToGoal,desiredSpeed,physics->getSpeed(),physics->getForwardSpeed2D()));
 #endif
 
 	//
@@ -990,11 +980,11 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 	// objects we don't need the pathfinder so we'll ignore this
 	//
 	if( BitIsSet( m_template->m_surfaces, LOCOMOTORSURFACE_AIR ) == false &&
-			!TheAI->pathfinder()->validMovementTerrain(obj->getLayer(), this, obj->getPosition()) && 
-			!getFlag(ALLOW_INVALID_POSITION)) 
+			!TheAI->pathfinder()->validMovementTerrain(obj->getLayer(), this, obj->getPosition()) &&
+			!getFlag(ALLOW_INVALID_POSITION))
 	{
 		// Somehow, we have gotten to an invalid location.
-		if (fixInvalidPosition(obj, physics)) 
+		if (fixInvalidPosition(obj, physics))
 		{
 			// the we adjusted us toward a legal position, so just return.
 			return;
@@ -1006,69 +996,69 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 	Real dy = goalPos.y - obj->getPosition()->y;
 	Real dz = goalPos.z - obj->getPosition()->z;
 	Real dist = sqrt(dx*dx+dy*dy);
-	if (dist>onPathDistToGoal) 
+	if (dist>onPathDistToGoal)
 	{
-		if (!obj->isKindOf(KINDOF_PROJECTILE) && dist>2*onPathDistToGoal) 
+		if (!obj->isKindOf(KINDOF_PROJECTILE) && dist>2*onPathDistToGoal)
 		{
 			setFlag(IS_BRAKING, true);
 		}
 		onPathDistToGoal = dist;
 	}
 
-	Coord3D nullAccel;							
-	
+	Coord3D nullAccel;
+
 	Bool treatAsAirborne = false;
 	Coord3D pos = *obj->getPosition();
 	Real heightAboveSurface = pos.z - TheTerrainLogic->getLayerHeight(pos.x, pos.y, obj->getLayer());
-	
+
 	if( obj->getStatusBits().test( OBJECT_STATUS_DECK_HEIGHT_OFFSET ) )
 	{
 		heightAboveSurface -= obj->getCarrierDeckHeight();
 	}
 
-	if (heightAboveSurface > -(3*3)*TheGlobalData->m_gravity) 
+	if (heightAboveSurface > -(3*3)*TheGlobalData->m_gravity)
 	{
 		// If we get high enough to stay up for 3 frames, then we left the ground.
 		treatAsAirborne = true;
 	}
-	// We apply a zero acceleration to all units, as the call to 
+	// We apply a zero acceleration to all units, as the call to
 	// applyMotiveForce flags an object as being "driven" by a locomotor, rather
 	// than being pushed around by objects bumping it.
 	nullAccel.x = nullAccel.y = nullAccel.z = 0;
 	physics->applyMotiveForce(&nullAccel);
 
-	if (*blocked) 
+	if (*blocked)
 	{
-		if (desiredSpeed > physics->getVelocityMagnitude()) 
+		if (desiredSpeed > physics->getVelocityMagnitude())
 		{
 			*blocked = false;
 		}
-		if (treatAsAirborne && BitIsSet( m_template->m_surfaces, LOCOMOTORSURFACE_AIR ) ) 
+		if (treatAsAirborne && BitIsSet( m_template->m_surfaces, LOCOMOTORSURFACE_AIR ) )
 		{
 			// Airborne flying objects don't collide for now.  jba.
 			*blocked = false;
 		}
 	}
 
-	if (*blocked) 
+	if (*blocked)
 	{
 		physics->scrubVelocity2D(desiredSpeed); // stop if we are about to run into the blocking object.
 		Real turnRate = getMaxTurnRate(obj->getBodyModule()->getDamageState());
-		if (m_template->m_wanderWidthFactor == 0.0f) 
+		if (m_template->m_wanderWidthFactor == 0.0f)
 		{
 			*blocked = (TURN_NONE != rotateObjAroundLocoPivot(obj, goalPos, turnRate));
 		}
-		
+
 		// it is very important to be sure to call this in all situations, even if not moving in 2d space.
 		handleBehaviorZ(obj, physics, goalPos);
 		return;
 	}
 
-	if ( 
+	if (
 // srj sez: I don't know why we didn't want HOVERs to allow to "brake".
 // we actually really want them to, because it allows much more precise destination positioning.
 //			m_template->m_appearance == LOCO_HOVER ||
-				m_template->m_appearance == LOCO_WINGS) 
+				m_template->m_appearance == LOCO_WINGS)
 	{
 		setFlag(IS_BRAKING, false);
 	}
@@ -1078,7 +1068,7 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 	physics->setTurning(TURN_NONE);
 	if (getAllowMotiveForceWhileAirborne() || !treatAsAirborne)
 	{
-		switch (m_template->m_appearance) 
+		switch (m_template->m_appearance)
 		{
 			case LOCO_LEGS_TWO:
 					moveTowardsPositionLegs(obj, physics, goalPos, onPathDistToGoal, desiredSpeed);
@@ -1113,12 +1103,12 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 	// Objects that are braking don't follow the normal physics, so they end up at their destination exactly.
 	obj->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_BRAKING ), getFlag(IS_BRAKING) );
 
-	if (wasBraking) 
+	if (wasBraking)
 	{
 	#define MIN_VEL (PATHFIND_CELL_SIZE_F/(LOGICFRAMES_PER_SECOND))
 
 		Coord3D pos = *obj->getPosition();
-		if (obj->isKindOf(KINDOF_PROJECTILE)) 
+		if (obj->isKindOf(KINDOF_PROJECTILE))
 		{
 			// Projectiles never stop braking once they start.  jba.
 			obj->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_BRAKING ) );
@@ -1130,7 +1120,7 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 			if (vel > dist)
 				vel = dist;	// do not overcompensate!
 			// Normalize.
-			if (dist > 0.001f) 
+			if (dist > 0.001f)
 			{
 				dist = 1.0f / dist;
 				dx *= dist;
@@ -1140,15 +1130,15 @@ void Locomotor::locoUpdate_moveTowardsPosition(Object* obj, const Coord3D& goalP
 				pos.y += dy * vel;
 				pos.z += dz * vel;
 			}
-		}	
-		else 
+		}
+		else
 		{
 			// not projectiles only cheat in x & y.
 			// Normalize.
-			if (dist > 0.001f) 
+			if (dist > 0.001f)
 			{
 				Real vel = fabs(physics->getForwardSpeed2D());
-				if (vel < MIN_VEL) 
+				if (vel < MIN_VEL)
 					vel = MIN_VEL;
 				if (vel > dist)
 					vel = dist;	// do not overcompensate!
@@ -1199,7 +1189,7 @@ void Locomotor::moveTowardsPositionTreads(Object* obj, PhysicsBehavior *physics,
 
 	Real dx = obj->getPosition()->x - goalPos.x;
 	Real dy = obj->getPosition()->y - goalPos.y;
-	
+
 
 	Real goalSpeed = (1.0f - angleCoeff) * desiredSpeed;
 
@@ -1209,7 +1199,7 @@ void Locomotor::moveTowardsPositionTreads(Object* obj, PhysicsBehavior *physics,
 
 	Real actualSpeed = physics->getForwardSpeed2D();
 	Real slowDownTime = actualSpeed / getBraking();
-	Real slowDownDist = (actualSpeed/1.50f) * slowDownTime;	
+	Real slowDownDist = (actualSpeed/1.50f) * slowDownTime;
 
 	if (sqr(dx)+sqr(dy)<sqr(2*PATHFIND_CELL_SIZE_F) && angleCoeff > 0.05) {
 		goalSpeed = actualSpeed*0.6f;
@@ -1221,12 +1211,12 @@ void Locomotor::moveTowardsPositionTreads(Object* obj, PhysicsBehavior *physics,
 		m_brakingFactor = 1.1f;
 	}
 
-	if (onPathDistToGoal>PATHFIND_CELL_SIZE_F && onPathDistToGoal > 2.0*slowDownDist) 
+	if (onPathDistToGoal>PATHFIND_CELL_SIZE_F && onPathDistToGoal > 2.0*slowDownDist)
 	{
 		setFlag(IS_BRAKING, false);
 	}
 
-	if (getFlag(IS_BRAKING)) 
+	if (getFlag(IS_BRAKING))
 	{
 		m_brakingFactor = slowDownDist/onPathDistToGoal;
 		m_brakingFactor *= m_brakingFactor;
@@ -1245,7 +1235,7 @@ void Locomotor::moveTowardsPositionTreads(Object* obj, PhysicsBehavior *physics,
 	}
 
 
-	//DEBUG_LOG(("Actual speed %f, Braking factor %f, slowDownDist %f, Pathdist %f, goalSpeed %f\n", 
+	//DEBUG_LOG(("Actual speed %f, Braking factor %f, slowDownDist %f, Pathdist %f, goalSpeed %f",
 	//	actualSpeed, m_brakingFactor, slowDownDist, onPathDistToGoal, goalSpeed));
 
 	//
@@ -1259,7 +1249,7 @@ void Locomotor::moveTowardsPositionTreads(Object* obj, PhysicsBehavior *physics,
 		Real accelForce = mass * acceleration;
 
 		/*
-			don't accelerate/brake more than necessary. do a quick calc to 
+			don't accelerate/brake more than necessary. do a quick calc to
 			see how much force we really need to achieve our goal speed...
 		*/
 		Real maxForceNeeded = mass * speedDelta;
@@ -1304,7 +1294,7 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 	Bool moveBackwards = false;
 
 	// Wheeled vehicles can only turn while moving, so make sure the turn speed is reasonable.
-	if (turnSpeed < maxSpeed/4.0f) 
+	if (turnSpeed < maxSpeed/4.0f)
 	{
 		turnSpeed = maxSpeed/4.0f;
 	}
@@ -1318,7 +1308,7 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 		if (m_template->m_canMoveBackward && fabs(relAngle) > PI/2) {
 			setFlag(MOVING_BACKWARDS, true );
 			setFlag(DOING_THREE_POINT_TURN, onPathDistToGoal>5*obj->getGeometryInfo().getMajorRadius());
-		}																						
+		}
 
 	}
 	if (getFlag(MOVING_BACKWARDS)) {
@@ -1333,14 +1323,14 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 				desiredAngle = stdAngleDiff(desiredAngle, PI);
 				relAngle = stdAngleDiff(desiredAngle, angle);
 			}
-		} 
+		}
 	}
 #endif
 
 	const Real SMALL_TURN = PI / 20.0f;
-	if ((Real)fabs( relAngle ) > SMALL_TURN) 
+	if ((Real)fabs( relAngle ) > SMALL_TURN)
 	{
-		if (desiredSpeed>turnSpeed) 
+		if (desiredSpeed>turnSpeed)
 		{
 			desiredSpeed = turnSpeed;
 		}
@@ -1354,7 +1344,7 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 
 
 	Real slowDownTime = actualSpeed / getBraking() + 1.0f;
-	Real slowDownDist = (actualSpeed/1.5f) * slowDownTime + actualSpeed;	
+	Real slowDownDist = (actualSpeed/1.5f) * slowDownTime + actualSpeed;
 	Real effectiveSlowDownDist = slowDownDist;
 	if (effectiveSlowDownDist < 1*PATHFIND_CELL_SIZE) {
 		effectiveSlowDownDist = 1*PATHFIND_CELL_SIZE;
@@ -1363,20 +1353,20 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 
 	const Real FIFTEEN_DEGREES = PI / 12.0f;
 	const Real PROJECT_FRAMES = LOGICFRAMES_PER_SECOND/2; // Project out 1/2 second.
-	if (fabs( relAngle ) > FIFTEEN_DEGREES) 
+	if (fabs( relAngle ) > FIFTEEN_DEGREES)
 	{
 		// If we're turning more than 10 degrees, check & see if we're moving into "impassable territory"
 		Real distance = PROJECT_FRAMES * (goalSpeed+actualSpeed)/2.0f;
 		Real targetAngle = obj->getOrientation();
 		Real turnFactor = ((goalSpeed+actualSpeed)/2.0f)/turnSpeed;
-		if (turnFactor > 1.0f) 
+		if (turnFactor > 1.0f)
 			turnFactor = 1.0f;
 		Real turnAmount = PROJECT_FRAMES*turnFactor*maxTurnRate/4.0f;
-		if (relAngle < 0) 
+		if (relAngle < 0)
 		{
 			targetAngle -= turnAmount;
-		}	
-		else 
+		}
+		else
 		{
 			targetAngle += turnAmount;
 		}
@@ -1400,7 +1390,7 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 		halfPos.z = pos->z;
 
 		if (!TheAI->pathfinder()->validMovementTerrain(obj->getLayer(), this, &halfPos) ||
-			!TheAI->pathfinder()->validMovementTerrain(obj->getLayer(), this, &nextPos)) 
+			!TheAI->pathfinder()->validMovementTerrain(obj->getLayer(), this, &nextPos))
 		{
 			PhysicsTurningType rotating = rotateTowardsPosition(obj, goalPos);
 			physics->setTurning(rotating);
@@ -1421,7 +1411,7 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 	}
 
 
-	if (onPathDistToGoal>PATHFIND_CELL_SIZE_F && onPathDistToGoal > 2.0*slowDownDist) 
+	if (onPathDistToGoal>PATHFIND_CELL_SIZE_F && onPathDistToGoal > 2.0*slowDownDist)
 	{
 		setFlag(IS_BRAKING, false);
 	}
@@ -1434,13 +1424,13 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 		}
 	}
 
-	if (getFlag(IS_BRAKING)) 
+	if (getFlag(IS_BRAKING))
 	{
 		m_brakingFactor = slowDownDist/onPathDistToGoal;
 		m_brakingFactor *= m_brakingFactor;
 		if (m_brakingFactor>MAX_BRAKING_FACTOR) {
 			m_brakingFactor = MAX_BRAKING_FACTOR;
-		}	
+		}
 		m_brakingFactor = 1.0f;
 		if (slowDownDist>onPathDistToGoal) {
 			goalSpeed = actualSpeed-getBraking();
@@ -1454,7 +1444,7 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 	}
 
 
-	//DEBUG_LOG(("Actual speed %f, Braking factor %f, slowDownDist %f, Pathdist %f, goalSpeed %f\n", 
+	//DEBUG_LOG(("Actual speed %f, Braking factor %f, slowDownDist %f, Pathdist %f, goalSpeed %f",
 	//	actualSpeed, m_brakingFactor, slowDownDist, onPathDistToGoal, goalSpeed));
 
 
@@ -1463,18 +1453,18 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 	if (turnFactor<0) {
 		turnFactor = -turnFactor; // in case we're sliding backwards in a 3 pt turn.
 	}
-	if (turnFactor > 1.0f) 
+	if (turnFactor > 1.0f)
 		turnFactor = 1.0f;
-	Real turnAmount = turnFactor*maxTurnRate;	
+	Real turnAmount = turnFactor*maxTurnRate;
 
 	PhysicsTurningType rotating;
 	if (moveBackwards && !do3pointTurn) {
 		Coord3D backwardPos = *obj->getPosition();
 		backwardPos.x += -(goalPos.x - obj->getPosition()->x);
 		backwardPos.y += -(goalPos.y - obj->getPosition()->y);
-		rotating = rotateObjAroundLocoPivot(obj, backwardPos, turnAmount);	
+		rotating = rotateObjAroundLocoPivot(obj, backwardPos, turnAmount);
 	} else {
-		rotating = rotateObjAroundLocoPivot(obj, goalPos, turnAmount);	
+		rotating = rotateObjAroundLocoPivot(obj, goalPos, turnAmount);
 	}
 
 	physics->setTurning(rotating);
@@ -1498,14 +1488,14 @@ void Locomotor::moveTowardsPositionWheels(Object* obj, PhysicsBehavior *physics,
 		Real accelForce = mass * acceleration;
 
 		/*
-			don't accelerate/brake more than necessary. do a quick calc to 
+			don't accelerate/brake more than necessary. do a quick calc to
 			see how much force we really need to achieve our goal speed...
 		*/
 		Real maxForceNeeded = mass * speedDelta;
 		if (fabs(accelForce) > fabs(maxForceNeeded))
 			accelForce = maxForceNeeded;
 
-		//DEBUG_LOG(("Braking %d, actualSpeed %f, goalSpeed %f, delta %f, accel %f\n", getFlag(IS_BRAKING),
+		//DEBUG_LOG(("Braking %d, actualSpeed %f, goalSpeed %f, delta %f, accel %f", getFlag(IS_BRAKING),
 			//actualSpeed, goalSpeed, speedDelta, accelForce));
 
 		const Coord3D *dir = obj->getUnitDirectionVector2D();
@@ -1567,8 +1557,8 @@ Bool Locomotor::fixInvalidPosition(Object* obj, PhysicsBehavior *physics)
 			// It was already leaving.
 			return false;
 		}
-		
-		
+
+
 		// Kill current accel
 		//physics->clearAcceleration();
 
@@ -1595,11 +1585,11 @@ Real Locomotor::calcMinTurnRadius(BodyDamageType condition, Real* timeToTravelTh
 
 	/*
 		our minimum circumference will be like so:
-		
+
 		Real minTurnCircum = maxSpeed * (2*PI / maxTurnRate);
 
 		so therefore our minimum turn radius is:
-		
+
 		Real minTurnRadius = minTurnCircum / 2*PI;
 
 		so we just eliminate the middleman:
@@ -1621,7 +1611,7 @@ void Locomotor::moveTowardsPositionLegs(Object* obj, PhysicsBehavior *physics, c
 	{
 		return;
 	}
-	
+
 	Real maxAcceleration = getMaxAcceleration( obj->getBodyModule()->getDamageState() );
 
 	// sanity, we cannot use desired speed that is greater than our max speed we are capable of moving at
@@ -1655,7 +1645,7 @@ void Locomotor::moveTowardsPositionLegs(Object* obj, PhysicsBehavior *physics, c
 		}
 		desiredAngle = normalizeAngle(desiredAngle+m_angleOffset);
 	}
-	
+
 	Real relAngle = stdAngleDiff(desiredAngle, angle);
 	locoUpdate_moveTowardsAngle(obj, desiredAngle);
 
@@ -1689,7 +1679,7 @@ void Locomotor::moveTowardsPositionLegs(Object* obj, PhysicsBehavior *physics, c
 		Real accelForce = mass * acceleration;
 
 		/*
-			don't accelerate/brake more than necessary. do a quick calc to 
+			don't accelerate/brake more than necessary. do a quick calc to
 			see how much force we really need to achieve our goal speed...
 		*/
 		Real maxForceNeeded = mass * speedDelta;
@@ -1703,7 +1693,7 @@ void Locomotor::moveTowardsPositionLegs(Object* obj, PhysicsBehavior *physics, c
 		force.y = accelForce * dir->y;
 		force.z = 0.0f;
 
-		
+
 
 		// apply forces to object
 		physics->applyMotiveForce( &force );
@@ -1728,13 +1718,13 @@ void Locomotor::moveTowardsPositionClimb(Object* obj, PhysicsBehavior *physics,
 	Real dx, dy, dz;
 
 	Coord3D pos = *obj->getPosition();
-	
+
 	dx = pos.x - goalPos.x;
 	dy = pos.y - goalPos.y;
 	dz = pos.z - goalPos.z;
 	if (dz*dz > sqr(PATHFIND_CELL_SIZE_F)) {
 		setFlag(CLIMBING, true);
-	} 
+	}
 	if (fabs(dz)<1) {
 		setFlag(CLIMBING, false);
 	}
@@ -1757,7 +1747,7 @@ void Locomotor::moveTowardsPositionClimb(Object* obj, PhysicsBehavior *physics,
 
 		Real groundSlope = fabs(delta.z - pos.z);
 		if (groundSlope<1.0f) groundSlope = 1.0f;
-		
+
 		if (groundSlope>1.0f) {
 			desiredSpeed /= groundSlope*4;
 		}
@@ -1822,7 +1812,7 @@ void Locomotor::moveTowardsPositionClimb(Object* obj, PhysicsBehavior *physics,
 		Real accelForce = mass * acceleration;
 
 		/*
-			don't accelerate/brake more than necessary. do a quick calc to 
+			don't accelerate/brake more than necessary. do a quick calc to
 			see how much force we really need to achieve our goal speed...
 		*/
 		Real maxForceNeeded = mass * speedDelta;
@@ -1858,7 +1848,7 @@ void Locomotor::moveTowardsPositionWings(Object* obj, PhysicsBehavior *physics,
 			// aim for the spot on the opposite side of the circle.
 
 			// find the direction towards our goal pos
-			Real angleTowardPos = 
+			Real angleTowardPos =
 					(isNearlyZero(dx) && isNearlyZero(dy)) ?
 					obj->getOrientation() :
 					atan2(dy, dx);
@@ -1942,7 +1932,7 @@ void Locomotor::moveTowardsPositionThrust(Object* obj, PhysicsBehavior *physics,
 		localGoalPos.z = m_preferredHeight + surfaceHt;
 //		localGoalPos.z = goalPos.z;
 		Real delta = localGoalPos.z - pos.z;
-		delta *= getPreferredHeightDamping();	  
+		delta *= getPreferredHeightDamping();
 		localGoalPos.z = pos.z + delta;
 
 #ifdef USE_ZDIR_DAMPING
@@ -1951,7 +1941,7 @@ void Locomotor::moveTowardsPositionThrust(Object* obj, PhysicsBehavior *physics,
 		// below, but go ahead and calc it now...
 		Real MAX_VERTICAL_DAMP_RANGE = m_preferredHeight * 0.5;
 		delta = fabs(delta);
-		if (delta > MAX_VERTICAL_DAMP_RANGE) 
+		if (delta > MAX_VERTICAL_DAMP_RANGE)
 			delta = MAX_VERTICAL_DAMP_RANGE;
 		zDirDamping = 1.0f - (delta / MAX_VERTICAL_DAMP_RANGE);
 #endif
@@ -1979,7 +1969,7 @@ void Locomotor::moveTowardsPositionThrust(Object* obj, PhysicsBehavior *physics,
 		const Coord3D* veltmp = physics->getVelocity();
 		Vector3 vel(veltmp->x, veltmp->y, veltmp->z);
 		Bool adjust = true;
-		if( obj->getStatusBits().test( OBJECT_STATUS_BRAKING ) ) 
+		if( obj->getStatusBits().test( OBJECT_STATUS_BRAKING ) )
 		{
 			// align to target, cause that's where we're going anyway.
 
@@ -2005,7 +1995,7 @@ void Locomotor::moveTowardsPositionThrust(Object* obj, PhysicsBehavior *physics,
 
 	if (forwardSpeedDelta != 0.0f || thrustAngle != 0.0f)
 	{
-		if (maxForwardSpeed <= 0.0f) 
+		if (maxForwardSpeed <= 0.0f)
 		{
 			maxForwardSpeed = 0.01f; // In some cases, this is 0, hack for now.  jba.
 		}
@@ -2013,7 +2003,7 @@ void Locomotor::moveTowardsPositionThrust(Object* obj, PhysicsBehavior *physics,
 		Vector3 curVel(physics->getVelocity()->x, physics->getVelocity()->y, physics->getVelocity()->z);
 
 		Vector3 accelVec = thrustDir * maxAccel - curVel * damping;
-		//DEBUG_LOG(("accel %f (max %f) vel %f (max %f) damping %f\n",accelVec.Length(),maxAccel,curVel.Length(),maxForwardSpeed,damping));
+		//DEBUG_LOG(("accel %f (max %f) vel %f (max %f) damping %f",accelVec.Length(),maxAccel,curVel.Length(),maxForwardSpeed,damping));
 
 		Real mass = physics->getMass();
 
@@ -2038,7 +2028,7 @@ Real Locomotor::getSurfaceHtAtPt(Real x, Real y)
 	} else {
 		ht += z;
 	}
-	
+
 	return ht;
 }
 
@@ -2049,7 +2039,7 @@ Real Locomotor::calcLiftToUseAtPt(Object* obj, PhysicsBehavior *physics, Real cu
 		take the classic equation:
 
 			x = x0 + v*t + 0.5*a*t^2
-		
+
 		and solve for acceleration.
 	*/
 	BodyDamageType bdt = obj->getBodyModule()->getDamageState();
@@ -2097,7 +2087,7 @@ Real Locomotor::calcLiftToUseAtPt(Object* obj, PhysicsBehavior *physics, Real cu
 			//	and
 			// t = (-v +- sqrt(v*v + 2*a*dz))/a
 			//
-			// but if we assume t=1, then 
+			// but if we assume t=1, then
 			//	a=2(dz-v)
 			// then, plug it back in and see if t is really 1...
 			desiredAccel = 2.0f * (deltaZ - curVelZ);
@@ -2134,11 +2124,11 @@ Real Locomotor::calcLiftToUseAtPt(Object* obj, PhysicsBehavior *physics, Real cu
 }
 
 //-------------------------------------------------------------------------------------------------
-PhysicsTurningType Locomotor::rotateObjAroundLocoPivot(Object* obj, const Coord3D& goalPos, 
+PhysicsTurningType Locomotor::rotateObjAroundLocoPivot(Object* obj, const Coord3D& goalPos,
 																											 Real maxTurnRate, Real *relAngle)
 {
 	Real angle = obj->getOrientation();
-	Real offset = getTurnPivotOffset();	
+	Real offset = getTurnPivotOffset();
 
 	PhysicsTurningType turn = TURN_NONE;
 
@@ -2156,7 +2146,7 @@ PhysicsTurningType Locomotor::rotateObjAroundLocoPivot(Object* obj, const Coord3
 		Real dx =goalPos.x - turnPos.x;
 		Real dy = goalPos.y - turnPos.y;
 		// If we are very close to the goal, we twitch due to rounding error.  So just return. jba.
-		if (fabs(dx)<0.1f && fabs(dy)<0.1f) return TURN_NONE; 
+		if (fabs(dx)<0.1f && fabs(dy)<0.1f) return TURN_NONE;
 		Real desiredAngle = atan2(dy, dx);
 		Real amount = stdAngleDiff(desiredAngle, angle);
 		if (relAngle) *relAngle = amount;
@@ -2225,7 +2215,7 @@ Bool Locomotor::handleBehaviorZ(Object* obj, PhysicsBehavior *physics, const Coo
 	switch(m_template->m_behaviorZ)
 	{
 		case Z_NO_Z_MOTIVE_FORCE:
-			// nothing to do. 
+			// nothing to do.
 			requiresConstantCalling = FALSE;
 			break;
 
@@ -2275,7 +2265,7 @@ Bool Locomotor::handleBehaviorZ(Object* obj, PhysicsBehavior *physics, const Coo
 				if (m_preferredHeight != 0.0f || getFlag(PRECISE_Z_POS))
 				{
 					Coord3D pos = *obj->getPosition();
-					
+
 					// srj sez: if we aren't on the ground, never find the ground layer
 					PathfindLayerEnum layerAtDest = obj->getLayer();
 					if (layerAtDest == LAYER_GROUND)
@@ -2296,7 +2286,7 @@ Bool Locomotor::handleBehaviorZ(Object* obj, PhysicsBehavior *physics, const Coo
 
 					Real liftToUse = calcLiftToUseAtPt(obj, physics, pos.z, surfaceHt, preferredHeight);
 
-					//DEBUG_LOG(("HandleBZ %d LiftToUse %f\n",TheGameLogic->getFrame(),liftToUse));
+					//DEBUG_LOG(("HandleBZ %d LiftToUse %f",TheGameLogic->getFrame(),liftToUse));
 					if (liftToUse != 0.0f)
 					{
 						Coord3D force;
@@ -2308,7 +2298,7 @@ Bool Locomotor::handleBehaviorZ(Object* obj, PhysicsBehavior *physics, const Coo
 				}
 			}
 			break;
-	
+
 		case Z_SURFACE_RELATIVE_HEIGHT:
 		case Z_ABSOLUTE_HEIGHT:
 			requiresConstantCalling = TRUE;
@@ -2316,7 +2306,7 @@ Bool Locomotor::handleBehaviorZ(Object* obj, PhysicsBehavior *physics, const Coo
 				if (m_preferredHeight != 0.0f || getFlag(PRECISE_Z_POS))
 				{
 					Coord3D pos = *obj->getPosition();
-					
+
 					Bool surfaceRel = (m_template->m_behaviorZ == Z_SURFACE_RELATIVE_HEIGHT);
 					Real surfaceHt = surfaceRel ? getSurfaceHtAtPt(pos.x, pos.y) : 0.0f;
 					Real preferredHeight = m_preferredHeight + (surfaceRel ? surfaceHt : 0);
@@ -2329,7 +2319,7 @@ Bool Locomotor::handleBehaviorZ(Object* obj, PhysicsBehavior *physics, const Coo
 
 					Real liftToUse = calcLiftToUseAtPt(obj, physics, pos.z, surfaceHt, preferredHeight);
 
-					//DEBUG_LOG(("HandleBZ %d LiftToUse %f\n",TheGameLogic->getFrame(),liftToUse));
+					//DEBUG_LOG(("HandleBZ %d LiftToUse %f",TheGameLogic->getFrame(),liftToUse));
 					if (liftToUse != 0.0f)
 					{
 						Coord3D force;
@@ -2369,11 +2359,11 @@ void Locomotor::moveTowardsPositionOther(Object* obj, PhysicsBehavior *physics,
 	const Coord3D* pos =  obj->getPosition();
 	Coord3D dirToApplyForce = *obj->getUnitDirectionVector2D();
 
-//DEBUG_ASSERTLOG(!getFlag(ULTRA_ACCURATE),("thresh %f %f (%f %f)\n",
+//DEBUG_ASSERTLOG(!getFlag(ULTRA_ACCURATE),("thresh %f %f (%f %f)",
 //fabs(goalPos.y - pos->y),fabs(goalPos.x - pos->x),
 //fabs(goalPos.y - pos->y)/goalSpeed,fabs(goalPos.x - pos->x)/goalSpeed));
-	if (getFlag(ULTRA_ACCURATE) && 
-				fabs(goalPos.y - pos->y) <= goalSpeed * m_template->m_ultraAccurateSlideIntoPlaceFactor && 
+	if (getFlag(ULTRA_ACCURATE) &&
+				fabs(goalPos.y - pos->y) <= goalSpeed * m_template->m_ultraAccurateSlideIntoPlaceFactor &&
 				fabs(goalPos.x - pos->x) <= goalSpeed * m_template->m_ultraAccurateSlideIntoPlaceFactor)
 	{
 		// don't turn, just slide in the right direction
@@ -2409,7 +2399,7 @@ void Locomotor::moveTowardsPositionOther(Object* obj, PhysicsBehavior *physics,
 		Real accelForce = mass * acceleration;
 
 		/*
-			don't accelerate/brake more than necessary. do a quick calc to 
+			don't accelerate/brake more than necessary. do a quick calc to
 			see how much force we really need to achieve our goal speed...
 		*/
 		Real maxForceNeeded = mass * speedDelta;
@@ -2451,11 +2441,11 @@ Bool Locomotor::locoUpdate_maintainCurrentPosition(Object* obj)
 	}
 
 #ifdef DEBUG_OBJECT_ID_EXISTS
-//	DEBUG_ASSERTLOG(obj->getID() != TheObjectIDToDebug, ("locoUpdate_maintainCurrentPosition %f %f %f, speed %f (%f)\n",m_maintainPos.x,m_maintainPos.y,m_maintainPos.z,physics->getSpeed(),physics->getForwardSpeed2D()));
+//	DEBUG_ASSERTLOG(obj->getID() != TheObjectIDToDebug, ("locoUpdate_maintainCurrentPosition %f %f %f, speed %f (%f)",m_maintainPos.x,m_maintainPos.y,m_maintainPos.z,physics->getSpeed(),physics->getForwardSpeed2D()));
 #endif
 
 	Bool requiresConstantCalling = TRUE;	// assume the worst.
-	switch (m_template->m_appearance) 
+	switch (m_template->m_appearance)
 	{
 		case LOCO_THRUST:
 			maintainCurrentPositionThrust(obj, physics);
@@ -2526,7 +2516,7 @@ void Locomotor::maintainCurrentPositionWings(Object* obj, PhysicsBehavior *physi
 		const Coord3D* pos = obj->getPosition();
 		Real dx = m_maintainPos.x - pos->x;
 		Real dy = m_maintainPos.y - pos->y;
-		Real angleTowardMaintainPos = 
+		Real angleTowardMaintainPos =
 				(isNearlyZero(dx) && isNearlyZero(dy)) ?
 				obj->getOrientation() :
 				atan2(dy, dx);
@@ -2561,7 +2551,7 @@ void Locomotor::maintainCurrentPositionHover(Object* obj, PhysicsBehavior *physi
 		//
 		// Stop
 		//
-		Real minSpeed = max( 1.0E-10f, m_template->m_minSpeed ); 
+		Real minSpeed = max( 1.0E-10f, m_template->m_minSpeed );
 		Real speedDelta = minSpeed - actualSpeed;
 		if (fabs(speedDelta) > minSpeed)
 		{
@@ -2570,7 +2560,7 @@ void Locomotor::maintainCurrentPositionHover(Object* obj, PhysicsBehavior *physi
 			Real accelForce = mass * acceleration;
 
 			/*
-				don't accelerate/brake more than necessary. do a quick calc to 
+				don't accelerate/brake more than necessary. do a quick calc to
 				see how much force we really need to achieve our goal speed...
 			*/
 			Real maxForceNeeded = mass * speedDelta;
@@ -2588,7 +2578,7 @@ void Locomotor::maintainCurrentPositionHover(Object* obj, PhysicsBehavior *physi
       // Apply a random kick (if applicable) to dirty-up visually.
       // The idea is that chopper pilots have to do course corrections all the time
       // Because of changes in wind, pressure, etc.
-      // Those changes are added here, then the 
+      // Those changes are added here, then the
 
 
 
@@ -2653,7 +2643,7 @@ LocomotorSet::~LocomotorSet()
 void LocomotorSet::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -2687,7 +2677,7 @@ void LocomotorSet::xfer( Xfer *xfer )
 		// vector should be empty at this point
 		if (m_locomotors.empty() == FALSE)
 		{
-			DEBUG_CRASH(( "LocomotorSet::xfer - vector is not empty, but should be\n" ));
+			DEBUG_CRASH(( "LocomotorSet::xfer - vector is not empty, but should be" ));
 			throw XFER_LIST_NOT_EMPTY;
 		}
 
@@ -2699,13 +2689,13 @@ void LocomotorSet::xfer( Xfer *xfer )
 			const LocomotorTemplate* lt = TheLocomotorStore->findLocomotorTemplate(NAMEKEY(name));
 			if (lt == NULL)
 			{
-				DEBUG_CRASH(( "LocomotorSet::xfer - template %s not found\n", name.str() ));
+				DEBUG_CRASH(( "LocomotorSet::xfer - template %s not found", name.str() ));
 				throw XFER_UNKNOWN_STRING;
 			}
 
 			Locomotor* loco = TheLocomotorStore->newLocomotor(lt);
 			xfer->xferSnapshot(loco);
-			m_locomotors.push_back(loco);		
+			m_locomotors.push_back(loco);
 		}
 	}
 
@@ -2720,7 +2710,7 @@ void LocomotorSet::xfer( Xfer *xfer )
 void LocomotorSet::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 void LocomotorSet::xferSelfAndCurLocoPtr(Xfer *xfer, Locomotor** loco)
@@ -2754,7 +2744,7 @@ void LocomotorSet::xferSelfAndCurLocoPtr(Xfer *xfer, Locomotor** loco)
 				}
 			}
 
-			DEBUG_CRASH(( "LocomotorSet::xfer - template %s not found\n", name.str() ));
+			DEBUG_CRASH(( "LocomotorSet::xfer - template %s not found", name.str() ));
 			throw XFER_UNKNOWN_STRING;
 		}
 	}
@@ -2765,8 +2755,7 @@ void LocomotorSet::clear()
 {
 	for (size_t i = 0; i < m_locomotors.size(); ++i)
 	{
-		if (m_locomotors[i])
-			deleteInstance(m_locomotors[i]);
+		deleteInstance(m_locomotors[i]);
 	}
 	m_locomotors.clear();
 	m_validLocomotorSurfaces = 0;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
index 169ce1eda60..7052147358b 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -26,15 +26,16 @@
 // Simple base object
 // Author: Michael S. Booth, October 2000
 ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
-// INCLUDES /////////////////////////////////////////////////////////////////////////////////////// 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+
+// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #define DEFINE_WEAPONCONDITIONMAP
 #include "Common/BitFlagsIO.h"
 #include "Common/BuildAssistant.h"
 #include "Common/Dict.h"
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/ModuleFactory.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -111,18 +112,13 @@
 #include "Common/AudioEventInfo.h"
 #include "Common/DynamicAudioEventInfo.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #ifdef DEBUG_OBJECT_ID_EXISTS
 ObjectID TheObjectIDToDebug = INVALID_ID;
 #endif
 
 // ------------------------------------------------------------------------------------------------
-static const ModelConditionFlags s_allWeaponFireFlags[WEAPONSLOT_COUNT] = 
+static const ModelConditionFlags s_allWeaponFireFlags[WEAPONSLOT_COUNT] =
 {
 	MAKE_MODELCONDITION_MASK5(
 		MODELCONDITION_FIRING_A,
@@ -179,7 +175,7 @@ AsciiString DebugDescribeObject(const Object *obj)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatusMask, Team *team ) : 
+Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatusMask, Team *team ) :
 	Thing(tt),
 	m_indicatorColor(0),
 	m_ai(NULL),
@@ -222,26 +218,23 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 	m_visionSpiedMask (PLAYERMASK_NONE),
 	m_numTriggerAreasActive(0)
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	m_hasDiedAlready = false;
 #endif
 	//Modules have not been created yet!
 	m_modulesReady = false;
 
 	// Force the thing template to use the most overridden version of itself - jkmcd
-	// Note that after this, the object will be using m_template, which forces the usage of the 
+	// Note that after this, the object will be using m_template, which forces the usage of the
 	// most overridden version of tt, so this is okay.
 	tt = (const ThingTemplate *) tt->getFinalOverride();
-		
+
 	Int i, modIdx;
 	AsciiString modName;
-	
-	//Added By Sadullah Nader
-	//Initializations inserted
+
 	m_formationOffset.x = m_formationOffset.y = 0.0f;
 	m_iPos.zero();
-	//
-	for (i = 0; i < MAX_PLAYER_COUNT; ++i) 
+	for (i = 0; i < MAX_PLAYER_COUNT; ++i)
 	{
 		m_visionSpiedBy[i] = 0;
 	}
@@ -261,7 +254,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// Object's set of these persist for the life of the object.
 	m_partitionLastLook = newInstance(SightingInfo);
@@ -294,7 +287,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 	if( m_shroudClearingRange == -1.0f )
 		m_shroudClearingRange = m_visionRange;// Backwards compatible, and perfectly logical default to assign
 	m_shroudRange = 0.0f;
-	
+
 	m_singleUseCommandUsed = false;
 
 	// assign unique object id
@@ -323,7 +316,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 	static const NameKeyType smcHelperModuleDataTagNameKey = NAMEKEY( "ModuleTag_SMCHelper" );
 	static ObjectSMCHelperModuleData smcModuleData;
 	smcModuleData.setModuleTagNameKey( smcHelperModuleDataTagNameKey );
-	m_smcHelper = newInstance(ObjectSMCHelper)(this, &smcModuleData);		
+	m_smcHelper = newInstance(ObjectSMCHelper)(this, &smcModuleData);
 	*curB++ = m_smcHelper;
 
 	//Inactive bodies can't take special damage since they can't take damage
@@ -346,13 +339,13 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		static const NameKeyType statusHelperModuleDataTagNameKey = NAMEKEY( "ModuleTag_StatusDamageHelper" );
 		static StatusDamageHelperModuleData statusModuleData;
 		statusModuleData.setModuleTagNameKey( statusHelperModuleDataTagNameKey );
-		m_statusDamageHelper = newInstance(StatusDamageHelper)(this, &statusModuleData);		
+		m_statusDamageHelper = newInstance(StatusDamageHelper)(this, &statusModuleData);
 		*curB++ = m_statusDamageHelper;
 
 		static const NameKeyType subdualHelperModuleDataTagNameKey = NAMEKEY( "ModuleTag_SubdualDamageHelper" );
 		static SubdualDamageHelperModuleData subdualModuleData;
 		subdualModuleData.setModuleTagNameKey( subdualHelperModuleDataTagNameKey );
-		m_subdualDamageHelper = newInstance(SubdualDamageHelper)(this, &subdualModuleData);		
+		m_subdualDamageHelper = newInstance(SubdualDamageHelper)(this, &subdualModuleData);
 		*curB++ = m_subdualDamageHelper;
 	}
 
@@ -364,7 +357,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		static const NameKeyType repulsorHelperModuleDataTagNameKey = NAMEKEY( "ModuleTag_RepulsorHelper" );
 		static ObjectRepulsorHelperModuleData repulsorModuleData;
 		repulsorModuleData.setModuleTagNameKey( repulsorHelperModuleDataTagNameKey );
-		m_repulsorHelper = newInstance(ObjectRepulsorHelper)(this, &repulsorModuleData);		
+		m_repulsorHelper = newInstance(ObjectRepulsorHelper)(this, &repulsorModuleData);
 		*curB++ = m_repulsorHelper;
 	}
 
@@ -379,7 +372,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		static const NameKeyType defectionModuleDataTagNameKey = NAMEKEY( "ModuleTag_DefectionHelper" );
 		static ObjectDefectionHelperModuleData defectionModuleData;
 		defectionModuleData.setModuleTagNameKey( defectionModuleDataTagNameKey );
-		m_defectionHelper = newInstance(ObjectDefectionHelper)(this, &defectionModuleData);		
+		m_defectionHelper = newInstance(ObjectDefectionHelper)(this, &defectionModuleData);
 		*curB++ = m_defectionHelper;
 	}
 
@@ -389,7 +382,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		static const NameKeyType weaponStatusModuleDataTagNameKey = NAMEKEY( "ModuleTag_WeaponStatusHelper" );
 		static ObjectWeaponStatusHelperModuleData weaponStatusModuleData;
 		weaponStatusModuleData.setModuleTagNameKey( weaponStatusModuleDataTagNameKey );
-		m_wsHelper = newInstance(ObjectWeaponStatusHelper)(this, &weaponStatusModuleData);		
+		m_wsHelper = newInstance(ObjectWeaponStatusHelper)(this, &weaponStatusModuleData);
 		*curB++ = m_wsHelper;
 
 		static const NameKeyType firingTrackerModuleDataTagNameKey = NAMEKEY( "ModuleTag_FiringTrackerHelper" );
@@ -401,7 +394,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		static const NameKeyType tempWeaponBonusHelperModuleDataTagNameKey = NAMEKEY( "ModuleTag_TempWeaponBonusHelper" );
 		static TempWeaponBonusHelperModuleData tempWeaponBonusModuleData;
 		tempWeaponBonusModuleData.setModuleTagNameKey( tempWeaponBonusHelperModuleDataTagNameKey );
-		m_tempWeaponBonusHelper = newInstance(TempWeaponBonusHelper)(this, &tempWeaponBonusModuleData);		
+		m_tempWeaponBonusHelper = newInstance(TempWeaponBonusHelper)(this, &tempWeaponBonusModuleData);
 		*curB++ = m_tempWeaponBonusHelper;
 	}
 
@@ -417,14 +410,14 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		*curB++ = newMod;
 
 		BodyModuleInterface* body = newMod->getBody();
-		if (body) 
+		if (body)
 		{
 			DEBUG_ASSERTCRASH(m_body == NULL, ("Duplicate bodies"));
 			m_body = body;
 		}
 
 		ContainModuleInterface* contain = newMod->getContain();
-		if (contain) 
+		if (contain)
 		{
 			DEBUG_ASSERTCRASH(m_contain == NULL, ("Duplicate containers"));
 			m_contain = contain;
@@ -441,9 +434,9 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		AIUpdateInterface* ai = newMod->getAIUpdateInterface();
 		if (ai)
 		{
-			if( m_ai ) 
+			if( m_ai )
 			{
-				DEBUG_ASSERTCRASH( m_ai == NULL, ("%s has more than one AI module. This is illegal!\n", getTemplate()->getName().str()) );
+				DEBUG_ASSERTCRASH( m_ai == NULL, ("%s has more than one AI module. This is illegal!", getTemplate()->getName().str()) );
 			}
 			m_ai = ai;
 		}
@@ -451,7 +444,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 		static NameKeyType key_PhysicsUpdate = NAMEKEY("PhysicsBehavior");
 		if (newMod->getModuleNameKey() == key_PhysicsUpdate)
 		{
-			DEBUG_ASSERTCRASH(m_physics == NULL, ("You should never have more than one Physics module (%s)\n",getTemplate()->getName().str()));
+			DEBUG_ASSERTCRASH(m_physics == NULL, ("You should never have more than one Physics module (%s)",getTemplate()->getName().str()));
 			m_physics = (PhysicsBehavior*)newMod;
 		}
 	}
@@ -467,7 +460,7 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 			if (info && info->getName().isNotEmpty()) {
 				ai->setAttackInfo(info);
 			}
-		}	
+		}
 	}
 
 	// allocate experience tracker
@@ -504,14 +497,18 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu
 	m_soleHealingBenefactorID = INVALID_ID; ///< who is the only other object that can give me this non-stacking heal benefit?
 	m_soleHealingBenefactorExpirationFrame = 0; ///< on what frame can I accept healing (thus to switch) from a new benefactor
 
+	// TheSuperHackers @bugfix Mauller/xezon 02/08/2025 sendObjectCreated needs calling before CreateModule's are initialized to prevent drawable related crashes
+	// This predominantly occurs with the veterancy create module when the chemical suits upgrade is unlocked as it tries to set the terrain decal.
 
+	// emit message announcing object's creation
+	TheGameLogic->sendObjectCreated( this );
 
-}  // end Object
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Emit message announcing object's creation
- * Note: Have to do this in virtual init() method because virtual methods 
- * don't become virtual until AFTER the constructor has completed, and we 
+ * Note: Have to do this in virtual init() method because virtual methods
+ * don't become virtual until AFTER the constructor has completed, and we
  * need to send our type in this message via virtual getType(). */
 //-------------------------------------------------------------------------------------------------
 void Object::initObject()
@@ -529,9 +526,6 @@ void Object::initObject()
 	for (int i = 0; i < WEAPONSLOT_COUNT; ++i)
 		m_lastWeaponCondition[i] = WSF_INVALID;
 
-	// emit message announcing object's creation
-	TheGameLogic->sendObjectCreated( this );
-
 	// If I have a valid team assigned, I can run through my Upgrade modules with his flags
 	updateUpgradeModules();
 
@@ -544,7 +538,7 @@ void Object::initObject()
 		{
 			setReceivingDifficultyBonus(TRUE);
 		}
-			
+
 		if (controller->getNumBattlePlansActive() > 0)
 		{
 			controller->applyBattlePlanBonusesForObject( this );
@@ -569,7 +563,7 @@ void Object::initObject()
 
 	// Kris -- All missiles must be projectiles! This is the perfect place to assert them!
 	// srj: yes, but only in debug...
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if( !isKindOf( KINDOF_PROJECTILE ) )
 	{
 		if( isKindOf( KINDOF_SMALL_MISSILE ) || isKindOf( KINDOF_BALLISTIC_MISSILE ) )
@@ -589,10 +583,10 @@ void Object::initObject()
 
 	// Everything (like weaponSet flags) is inited, so check if the WeaponSet needs to change.
 	m_weaponSet.updateWeaponSet(this);
-	
+
 	if( isKindOf( KINDOF_MINE ) || isKindOf( KINDOF_BOOBY_TRAP ) || isKindOf( KINDOF_DEMOTRAP ) )
 	{
-		ThePlayerList->getNeutralPlayer()->getAcademyStats()->recordMine();	
+		ThePlayerList->getNeutralPlayer()->getAcademyStats()->recordMine();
 	}
 }
 
@@ -645,9 +639,8 @@ Object::~Object()
 		ThePartitionManager->unRegisterObject( this );
 
 	// if we are in a group, remove us
-	if (m_group)
-		m_group->remove( this );
-	
+	leaveGroup();
+
 	// note, do NOT free these, there are just a shadow copy!
 	m_ai = NULL;
 	m_physics = NULL;
@@ -659,12 +652,10 @@ Object::~Object()
 		*b = NULL;	// in case other modules call findModule from their dtor!
 	}
 
-	delete [] m_behaviors;		
+	delete [] m_behaviors;
 	m_behaviors = NULL;
 
-	if( m_experienceTracker )
-		deleteInstance(m_experienceTracker);
-
+	deleteInstance(m_experienceTracker);
 	m_experienceTracker = NULL;
 
 	// we don't need to delete these, there were deleted on the m_behaviors list
@@ -701,7 +692,7 @@ void Object::onContainedBy( Object *containedBy )
 	m_containedByFrame = TheGameLogic->getFrame();
 
   handlePartitionCellMaintenance(); // which should unlook me now that I am contained
-  
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -738,6 +729,26 @@ Int Object::getTransportSlotCount() const
 	return count;
 }
 
+const Object* Object::getEnclosingContainedBy() const
+{
+	for (const Object* child = this, *container = getContainedBy(); container; child = container, container = container->getContainedBy())
+	{
+		ContainModuleInterface* containModule = container->getContain();
+		if (containModule && containModule->isEnclosingContainerFor(child))
+			return container;
+	}
+
+	return NULL;
+}
+
+const Object* Object::getOuterObject() const
+{
+	if (const Object* enclosing = getEnclosingContainedBy())
+		return enclosing;
+
+	return this;
+}
+
 //-------------------------------------------------------------------------------------------------
 /** Run from GameLogic::destroyObject */
 //-------------------------------------------------------------------------------------------------
@@ -761,17 +772,17 @@ void Object::onDestroy()
 
 	//Have to remove ourself from looking as well.  RebuildHoleWorkers definately hit here.
 	handlePartitionCellMaintenance();
-}  // end onDestroy
+}
 
 //=============================================================================
 //=============================================================================
-void Object::setGeometryInfo(const GeometryInfo& geom) 
-{ 
-	m_geometryInfo = geom; 
+void Object::setGeometryInfo(const GeometryInfo& geom)
+{
+	m_geometryInfo = geom;
 	if( m_partitionData )
 	{
 		// if our geometry changes, we unregister and re-register with the partitionmgr
-		// so that our size gets updated appropriately. this shouldn't be a problem 
+		// so that our size gets updated appropriately. this shouldn't be a problem
 		// unless setGeometryInfo gets called frequently. (srj)
 		ThePartitionManager->unRegisterObject( this );
 		ThePartitionManager->registerObject( this );
@@ -783,8 +794,8 @@ void Object::setGeometryInfo(const GeometryInfo& geom)
 
 //=============================================================================
 //=============================================================================
-void Object::setGeometryInfoZ( Real newZ ) 
-{ 
+void Object::setGeometryInfoZ( Real newZ )
+{
 	// A Z change only does not need to un/register with the PartitionManager
 	m_geometryInfo.setMaxHeightAbovePosition( newZ );
 
@@ -806,17 +817,17 @@ void Object::restoreOriginalTeam()
 {
 	if( m_team == NULL || m_originalTeamName.isEmpty() )
 		return;
-	
+
 	Team* origTeam = TheTeamFactory->findTeam(m_originalTeamName);
 	if (origTeam == NULL)
 	{
-		DEBUG_CRASH(("Object original team (%s) could not be found or created! (srj)\n",m_originalTeamName.str()));
+		DEBUG_CRASH(("Object original team (%s) could not be found or created! (srj)",m_originalTeamName.str()));
 		return;
 	}
 
 	if (m_team == origTeam)
 	{
-		DEBUG_CRASH(("Object appears to still be on its original team, so why are we attempting to restore it? (srj)\n"));
+		DEBUG_CRASH(("Object appears to still be on its original team, so why are we attempting to restore it? (srj)"));
 		return;
 	}
 
@@ -863,7 +874,7 @@ void Object::setOrRestoreTeam( Team* team, Bool restoring )
 			m_team->getControllingPlayer()->becomingTeamMember(this, false);
 		}
 	}
-		
+
 	// Switch //////////////////////////
 	m_team = team;
 
@@ -875,13 +886,13 @@ void Object::setOrRestoreTeam( Team* team, Bool restoring )
 			m_team->prependTo_TeamMemberList(this);
 			m_team->getControllingPlayer()->becomingTeamMember(this, true);
 		}
-		
+
 		// now, adjust the attitude of the unit to its new team.
 		const TeamPrototype* proto = m_team->getPrototype();
-		if (proto && proto->getTemplateInfo()) 
+		if (proto && proto->getTemplateInfo())
 		{
 			AIUpdateInterface *ai = getAIUpdateInterface();
-			if (ai) 
+			if (ai)
 			{
 				ai->setAttitude(proto->getTemplateInfo()->m_initialTeamAttitude);
 				if (proto->getAttackPriorityName().isNotEmpty()) {
@@ -890,7 +901,7 @@ void Object::setOrRestoreTeam( Team* team, Bool restoring )
 					if (info && info->getName().isNotEmpty()) {
 						ai->setAttackInfo(info);
 					}
-				}	
+				}
 			}
 		}
 		// emit message announcing object's new alliance
@@ -925,7 +936,7 @@ void Object::setOrRestoreTeam( Team* team, Bool restoring )
 }
 
 //=============================================================================
-enum 
+enum
 {
 	BOOBY_TRAP_SCAN_RANGE = 25
 };
@@ -941,7 +952,7 @@ Bool Object::checkAndDetonateBoobyTrap(const Object *victim)
 	filters[1] = &filterMapStatus;
 	filters[2] = NULL;
 
-	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( getPosition(), BOOBY_TRAP_SCAN_RANGE + getGeometryInfo().getBoundingCircleRadius(), 
+	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( getPosition(), BOOBY_TRAP_SCAN_RANGE + getGeometryInfo().getBoundingCircleRadius(),
 		FROM_CENTER_2D, filters, ITER_SORTED_NEAR_TO_FAR );
 	MemoryPoolObjectHolder hold(iter);// This is the magic thing that frees the dynamically made iter in its destructor
 
@@ -1007,8 +1018,8 @@ void Object::setStatus( ObjectStatusMaskType objectStatus, Bool set )
 		if( m_status.test( OBJECT_STATUS_UNDER_CONSTRUCTION ) != oldStatus.test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
 		{
 
-			// CHECK FOR MINES, AND DETONATE THEM NOW 
-			ObjectIterator *iter = 
+			// CHECK FOR MINES, AND DETONATE THEM NOW
+			ObjectIterator *iter =
 					ThePartitionManager->iteratePotentialCollisions( getPosition(), getGeometryInfo(), getOrientation() );
 			MemoryPoolObjectHolder hold( iter );
 			Object *them;
@@ -1020,14 +1031,14 @@ void Object::setStatus( ObjectStatusMaskType objectStatus, Bool set )
 					Relationship r = getRelationship(them);
 					if (r == ENEMIES)
 					{
-						them->kill(); // detonate mine 
+						them->kill(); // detonate mine
 					}
 					else
 					{
-						TheGameLogic->destroyObject(them); 
+						TheGameLogic->destroyObject(them);
 					}
 				}
-			}// next object
+			}
 
 			if (m_partitionData)
 				m_partitionData->makeDirty(true);
@@ -1058,7 +1069,7 @@ void Object::setScriptStatus( ObjectScriptStatusBit bit, Bool set )
 			if( m_partitionData )
 			{
 				// if an object becomes disabled or unpowered, then you have to update its partition data because it will
-				// change how far it can see. 
+				// change how far it can see.
 				m_partitionData->makeDirty(true);
 			}
 			if( m_scriptStatus & OBJECT_STATUS_SCRIPT_DISABLED )
@@ -1077,7 +1088,7 @@ void Object::setScriptStatus( ObjectScriptStatusBit bit, Bool set )
 			if( m_partitionData )
 			{
 				// if an object becomes disabled or unpowered, then you have to update its partition data because it will
-				// change how far it can see. 
+				// change how far it can see.
 				m_partitionData->makeDirty(true);
 			}
 			if( m_scriptStatus & OBJECT_STATUS_SCRIPT_UNPOWERED )
@@ -1099,10 +1110,10 @@ Bool Object::canCrushOrSquish(Object *otherObj, CrushSquishTestType testType ) c
 {
 	DEBUG_ASSERTCRASH(this, ("null this in canCrushOrSquish"));
 
-	if( !otherObj ) 
+	if( !otherObj )
 	{
 		//Can't crush anything.
-		return false;  
+		return false;
 	}
 
 	if( isDisabledByType( DISABLED_UNMANNED ) )
@@ -1114,12 +1125,12 @@ Bool Object::canCrushOrSquish(Object *otherObj, CrushSquishTestType testType ) c
 	}
 
 	UnsignedByte crusherLevel = getCrusherLevel();
-	
+
 	// order matters: we want to know if I consider it to be an ally, not vice versa
-	if( getRelationship( otherObj ) == ALLIES ) 
+	if( getRelationship( otherObj ) == ALLIES )
 	{
 		//Friends don't let friends crush friends.
-		return false; 
+		return false;
 	}
 
 	if( !crusherLevel )
@@ -1153,7 +1164,7 @@ Bool Object::canCrushOrSquish(Object *otherObj, CrushSquishTestType testType ) c
 		{
 			// See if other is squishable
 			static NameKeyType key_squish = NAMEKEY( "SquishCollide" );
-			if( otherObj->findModule( key_squish ) ) 
+			if( otherObj->findModule( key_squish ) )
 			{
 				return true; // squishable.
 			}
@@ -1170,7 +1181,7 @@ Bool Object::canCrushOrSquish(Object *otherObj, CrushSquishTestType testType ) c
 			return true;
 		}
 	}
-		
+
 	return false;
 }
 
@@ -1201,9 +1212,9 @@ void Object::topple( const Coord3D *toppleDirection, Real toppleSpeed, UnsignedI
 		// apply the topple force
 		toppleUpdate->applyTopplingForce( toppleDirection, toppleSpeed, options );
 
-	}  // end if
+	}
 
-}  // end topple
+}
 
 //=============================================================================
 void Object::setArmorSetFlag(ArmorSetType ast)
@@ -1218,9 +1229,9 @@ void Object::clearArmorSetFlag(ArmorSetType ast)
 }
 
 //=============================================================================
-Bool Object::testArmorSetFlag(ArmorSetType ast) const 
-{ 
-	return m_body->testArmorSetFlag(ast); 
+Bool Object::testArmorSetFlag(ArmorSetType ast) const
+{
+	return m_body->testArmorSetFlag(ast);
 }
 
 //=============================================================================
@@ -1348,9 +1359,9 @@ void Object::clearAndSetModelConditionFlags( const ModelConditionFlags& clr, con
 }
 
 //=============================================================================
-// Special model states are states that are turned on for a period of time, and 
-// turned off automatically -- used for cheer, and scripted special moment 
-// animations. Setting a special state will automatically clear any other 
+// Special model states are states that are turned on for a period of time, and
+// turned off automatically -- used for cheer, and scripted special moment
+// animations. Setting a special state will automatically clear any other
 // special states that may be turned on so you can only have one at a time.
 //=============================================================================
 void Object::setSpecialModelConditionState( ModelConditionFlagType set, UnsignedInt frames )
@@ -1378,10 +1389,10 @@ void Object::clearSpecialModelConditionStates()
 // Lorenzen has some interest in this, ask before deleting
 //=============================================================================
 //const ModelConditionFlags& Object::getModelConditionFlags() const
-//{ 
+//{
 //	if (m_drawable)
 //	{
-//		return m_drawable->getModelConditionFlags(); 
+//		return m_drawable->getModelConditionFlags();
 //	}
 //	else
 //	{
@@ -1438,7 +1449,7 @@ Bool Object::getAmmoPipShowingInfo(Int& numTotal, Int& numFull) const
 
 //=============================================================================
 /*
-	NOTE: getAbleToAttackSpecificObject NO LONGER internally calls isAbleToAttack(), 
+	NOTE: getAbleToAttackSpecificObject NO LONGER internally calls isAbleToAttack(),
 	since that isn't an incredibly fast call, and this is called repeatedly in some inner loops
 	where we already know that isAbleToAttack() == true. so you should always
 	call isAbleToAttack prior to calling this! (srj)
@@ -1494,7 +1505,7 @@ void Object::fireCurrentWeapon(Object *target)
 
 //=============================================================================
 void Object::fireCurrentWeapon(const Coord3D* pos)
-{ 
+{
 	//USE_PERF_TIMER(fireCurrentWeapon)
 
 	if (pos == NULL)
@@ -1515,7 +1526,7 @@ void Object::fireCurrentWeapon(const Coord3D* pos)
 }
 
 //==============================================================================
-void Object::notifyFiringTrackerShotFired( const Weapon* weaponFired, ObjectID victimID ) 
+void Object::notifyFiringTrackerShotFired( const Weapon* weaponFired, ObjectID victimID )
 {
   if ( m_firingTracker )
     m_firingTracker->shotFired( weaponFired, victimID );
@@ -1562,13 +1573,13 @@ UnsignedInt Object::getLastShotFiredFrame() const
 ObjectID Object::getLastVictimID() const
 {
 	return m_firingTracker ? m_firingTracker->getLastShotVictim() : INVALID_ID;
-} 
+}
 
 //=============================================================================
 // Object::getRelationship
 //=============================================================================
 Relationship Object::getRelationship(const Object *that) const
-{ 
+{
 	const Team *myTeam = getTeam();
 
 	if (myTeam && that)
@@ -1595,10 +1606,10 @@ Relationship Object::getRelationship(const Object *that) const
 // Object::getControllingPlayer
 //=============================================================================
 Player * Object::getControllingPlayer() const
-{ 
-	const Team* myTeam = this->getTeam();	
+{
+	const Team* myTeam = this->getTeam();
 	if (myTeam)
-		return myTeam->getControllingPlayer(); 
+		return myTeam->getControllingPlayer();
 
 	return NULL;
 }
@@ -1621,8 +1632,8 @@ void Object::setBuilder( const Object *obj )
 }
 
 //=============================================================================
-void Object::setCustomIndicatorColor(Color c) 
-{ 
+void Object::setCustomIndicatorColor(Color c)
+{
 	if (m_indicatorColor != c)
 	{
 		m_indicatorColor = c;
@@ -1632,9 +1643,9 @@ void Object::setCustomIndicatorColor(Color c)
 }
 
 //=============================================================================
-void Object::removeCustomIndicatorColor() 
-{ 
-	setCustomIndicatorColor(0); 
+void Object::removeCustomIndicatorColor()
+{
+	setCustomIndicatorColor(0);
 }
 
 //=============================================================================
@@ -1685,6 +1696,31 @@ Color Object::getNightIndicatorColor() const
 	}
 }
 
+//=============================================================================
+// Object::isLogicallyVisible
+//=============================================================================
+Bool Object::isLogicallyVisible() const
+{
+	const Object* obj = getOuterObject();
+
+	// Disguisers are always visible to all players, irrespective of any stealth
+	// status. We thus need to check the type rather than the status as the
+	// disguise status is absent during the disguise transition phase.
+	if (obj->isKindOf(KINDOF_DISGUISER))
+		return true;
+
+	if (obj->testStatus(OBJECT_STATUS_STEALTHED) && !obj->testStatus(OBJECT_STATUS_DETECTED))
+	{
+		const Player* player = rts::getObservedOrLocalPlayer();
+		const Relationship relationship = player->getRelationship(getTeam());
+
+		if (player->isPlayerActive() && relationship != ALLIES)
+			return false;
+	}
+
+	return true;
+}
+
 //=============================================================================
 // Object::isLocallyControlled
 //=============================================================================
@@ -1693,6 +1729,14 @@ Bool Object::isLocallyControlled() const
 	return getControllingPlayer() == ThePlayerList->getLocalPlayer();
 }
 
+//=============================================================================
+// Object::isLocallyViewed
+//=============================================================================
+Bool Object::isLocallyViewed() const
+{
+	return getControllingPlayer() == rts::getObservedOrLocalPlayer();
+}
+
 //=============================================================================
 // Object::isLocallyControlled
 //=============================================================================
@@ -1704,7 +1748,7 @@ Bool Object::isNeutralControlled() const
 //-------------------------------------------------------------------------------------------------
 inline Bool isPosDifferent(const Coord3D* a, const Coord3D* b)
 {
-	// this is necessary because PhysicsBehavior may generate tiny changes even when 
+	// this is necessary because PhysicsBehavior may generate tiny changes even when
 	// "standing still", due to roundoff errors. It's important that we only invalidate
 	// the PartitionManager stuff when the pos/orientation really changes (for efficiency purposes)
 	// so we must put in some cleverness...
@@ -1725,7 +1769,7 @@ inline Bool isPosDifferent(const Coord3D* a, const Coord3D* b)
 //-------------------------------------------------------------------------------------------------
 inline Bool isAngleDifferent(Real a, Real b)
 {
-	// this is necessary because PhysicsBehavior may generate tiny changes even when 
+	// this is necessary because PhysicsBehavior may generate tiny changes even when
 	// "standing still", due to roundoff errors. It's important that we only invalidate
 	// the PartitionManager stuff when the pos/orientation really changes (for efficiency purposes)
 	// so we must put in some cleverness...
@@ -1778,7 +1822,7 @@ void Object::reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPo
 	{
 		if (m_partitionData)
 			m_partitionData->makeDirty(true);
-		
+
 		if (getContain())
 			getContain()->containReactToTransformChange();
 	}
@@ -1786,7 +1830,7 @@ void Object::reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPo
 	if (posDiff)
 	{
 		setTriggerAreaFlagsForChangeInPosition(); // Update for entered/exited
-		
+
 		Region3D mapExtent;
 		TheTerrainLogic->getExtent(&mapExtent);
 		if (mapExtent.isInRegionNoZ(getPosition()))
@@ -1797,16 +1841,16 @@ void Object::reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPo
 }
 
 //-------------------------------------------------------------------------------------------------
-ObjectShroudStatus Object::getShroudedStatus(Int playerIndex) const 
+ObjectShroudStatus Object::getShroudedStatus(Int playerIndex) const
 {
 	if (getTemplate()->isKindOf( KINDOF_ALWAYS_VISIBLE ))
 		return OBJECTSHROUD_CLEAR;
 
 	if (m_partitionData)
-		return m_partitionData->getShroudedStatus(playerIndex); 
+		return m_partitionData->getShroudedStatus(playerIndex);
 
 	// This can happen for objects removed from the partition system (e.g.,
-	// for soldiers that are garrisoned inside a building). 
+	// for soldiers that are garrisoned inside a building).
 	return OBJECTSHROUD_CLEAR;
 }
 
@@ -1818,7 +1862,7 @@ void Object::attemptDamage( DamageInfo *damageInfo )
 	BodyModuleInterface* body = getBodyModule();
 	if (body)
 		body->attemptDamage( damageInfo );
-			
+
 	// Process any shockwave forces that might affect this object due to the incurred damage
 	if (damageInfo->in.m_shockWaveAmount > 0.0f && damageInfo->in.m_shockWaveRadius > 0.0f)
 	{
@@ -1829,10 +1873,10 @@ void Object::attemptDamage( DamageInfo *damageInfo )
 		PhysicsBehavior *behavior = getPhysics();
 		if ( behavior && (isAirborneTarget() == FALSE) && (! isKindOf(KINDOF_PROJECTILE) ) )
 //		if (behavior && isAnyKindOf( immuneToShockwaveKindofs ) == FALSE )//NEW RESTRICTIONS ADDED
-		{ 
+		{
 			// Calculate the shockwave taperoff amount due to distance from ground zero
 			Real shockWaveScalar = damageInfo->in.m_shockWaveVector.length();
-			Real distanceFromCenter = min(1.0f, shockWaveScalar / damageInfo->in.m_shockWaveRadius); 
+			Real distanceFromCenter = min(1.0f, shockWaveScalar / damageInfo->in.m_shockWaveRadius);
 			Real distanceTaper = (distanceFromCenter) * (1.0f - damageInfo->in.m_shockWaveTaperOff);
 			Real shockTaperMult = 1.0f - distanceTaper;
 
@@ -1847,21 +1891,21 @@ void Object::attemptDamage( DamageInfo *damageInfo )
 			behavior->applyShock(&shockWaveForce);
 
 			// Add random rotation to the object for drama
-      
+
 			behavior->applyRandomRotation();
 
 			// Set stunned state due to the shock for the object
       behavior->setStunned(true);
-			
+
       setModelConditionState(MODELCONDITION_STUNNED_FLAILING);
 		}
 	}
 
-	
+
 	/// @todo track damage dealt/attempted
 
 	//
-	// if actual damage occurred, and this is an object owned by the local player we 
+	// if actual damage occurred, and this is an object owned by the local player we
 	// might do a radar event for under attack. Note that we do not even try
 	// to do radar events for DAMAGE_PENALTY as that damage type is a type of damage
 	// that occurs with explicit player knowledge
@@ -1870,7 +1914,7 @@ void Object::attemptDamage( DamageInfo *damageInfo )
 			damageInfo->in.m_damageType != DAMAGE_PENALTY &&
 			damageInfo->in.m_damageType != DAMAGE_HEALING &&
 			getControllingPlayer() &&
-			!BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) && 
+			!BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) &&
 			m_radarData != NULL &&
 			getControllingPlayer() == ThePlayerList->getLocalPlayer() )
 		TheRadar->tryUnderAttackEvent( this );
@@ -1892,13 +1936,13 @@ void Object::attemptHealing(Real amount, const Object* source)
 	}
 }
 
-ObjectID Object::getSoleHealingBenefactor( void ) const 
+ObjectID Object::getSoleHealingBenefactor( void ) const
 {
 	UnsignedInt now = TheGameLogic->getFrame();
 	if( now > m_soleHealingBenefactorExpirationFrame )
 		return INVALID_ID;
 
-	return	m_soleHealingBenefactorID; 
+	return	m_soleHealingBenefactorID;
 
 }
 
@@ -1912,7 +1956,7 @@ Bool Object::attemptHealingFromSoleBenefactor ( Real amount, const Object* sourc
 	ObjectID id = source->getID();
 
 // Either it is ok to accept healing from any who offer or this is my guy, calling again
-	if( now > m_soleHealingBenefactorExpirationFrame || m_soleHealingBenefactorID == id ) 
+	if( now > m_soleHealingBenefactorExpirationFrame || m_soleHealingBenefactorID == id )
 	{
 		m_soleHealingBenefactorID = id;
 		m_soleHealingBenefactorExpirationFrame = now + duration;
@@ -1942,7 +1986,7 @@ Real Object::estimateDamage( DamageInfoInput& damageInfo ) const
 	BodyModuleInterface* body = getBodyModule();
 	if (body)
 		return body->estimateDamage( damageInfo );
-			
+
 	return 0.0f;
 }
 
@@ -1961,14 +2005,14 @@ void Object::kill( DamageType damageType, DeathType deathType )
 	damageInfo.in.m_kill = TRUE; // Triggers object to die no matter what.
 	attemptDamage( &damageInfo );
 
-	DEBUG_ASSERTCRASH(!damageInfo.out.m_noEffect, ("Attempting to kill an unKillable object (InactiveBody?)\n"));
+	DEBUG_ASSERTCRASH(!damageInfo.out.m_noEffect, ("Attempting to kill an unKillable object (InactiveBody?)"));
 
-}  // end kill
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Restore max health to this Object */
 //-------------------------------------------------------------------------------------------------
-void Object::healCompletely()	
+void Object::healCompletely()
 {
 	attemptHealing(HUGE_DAMAGE_AMOUNT, NULL);
 }
@@ -1994,7 +2038,7 @@ void Object::setCaptured(Bool isCaptured)
 {
 	if (isCaptured)
 		BitSet(m_privateStatus, CAPTURED);
-	else 
+	else
 	{
 		DEBUG_LOG(("Clearing Captured Status. This should never happen. jkmcd"));
 		BitClear(m_privateStatus, CAPTURED);
@@ -2023,25 +2067,14 @@ Bool Object::isNonFactionStructure(void) const
 	return isStructure() && !isFactionStructure();
 }
 
-void localIsHero( Object *obj, void* userData )
-{
-	Bool *hero = (Bool*)userData;
-	
-	if( obj && obj->isKindOf( KINDOF_HERO ) )
-	{
-		*hero = TRUE;
-	}
-}
-
 //-------------------------------------------------------------------------------------------------
+// TheSuperHackers @performance bobtista 13/11/2025 Use cached hero count for O(1) lookup instead of O(n) iteration.
 Bool Object::isHero(void) const
 {
 	ContainModuleInterface *contain = getContain();
 	if( contain )
 	{
-		Bool heroInside = FALSE;
-		contain->iterateContained( localIsHero, (void*)(&heroInside), FALSE );
-		if( heroInside )
+		if( contain->getHeroUnitsContained() > 0 )
 		{
 			return TRUE;
 		}
@@ -2092,7 +2125,7 @@ void Object::setDisabledUntil( DisabledType type, UnsignedInt frame )
 	{
 		//We've lost power -- make sure we aren't already out of power as the sounds shouldn't happen
 		//if you were already disabled.
-		if( !isDisabledByType( DISABLED_UNDERPOWERED ) && 
+		if( !isDisabledByType( DISABLED_UNDERPOWERED ) &&
 				!isDisabledByType( DISABLED_EMP ) &&
 				!isDisabledByType( DISABLED_SUBDUED ) &&
 				!isDisabledByType( DISABLED_HACKED ) )
@@ -2118,7 +2151,7 @@ void Object::setDisabledUntil( DisabledType type, UnsignedInt frame )
 		// srj sez: HELD nevers disables special powers.
 		if ( type != DISABLED_HELD && !isDisabledByType( type ) )
 			pauseAllSpecialPowers( TRUE );
-		
+
 		m_disabledTillFrame[ type ] = frame;
 		m_disabledMask.set( type, frame > TheGameLogic->getFrame() );
 
@@ -2166,9 +2199,9 @@ void Object::setDisabledUntil( DisabledType type, UnsignedInt frame )
 
 	if( type == DISABLED_UNMANNED && !isKindOf( KINDOF_DRONE ) )
 	{
-		//strange but true: If I am a carbomb, 
-		//my driver actually has a dead-man's 
-		//trigger for my dynamite... 
+		//strange but true: If I am a carbomb,
+		//my driver actually has a dead-man's
+		//trigger for my dynamite...
 		//If he gets sniped, I blow up! Wheeee!
 
 		WeaponSetFlags flags;
@@ -2179,7 +2212,7 @@ void Object::setDisabledUntil( DisabledType type, UnsignedInt frame )
 			Object* sniper = TheGameLogic->findObjectByID( getBodyModule()->getLastDamageInfo()->in.m_sourceID );
 			if ( sniper )
 				sniper->scoreTheKill( this );
-			
+
 			kill();
 		}
 		else
@@ -2196,13 +2229,13 @@ void Object::setDisabledUntil( DisabledType type, UnsignedInt frame )
 				AutoHealBehavior* autoHeal = (AutoHealBehavior*)(findUpdateModule( key_AutoHealBehavior ));
 				if (autoHeal)
 					autoHeal->undoUpgrade();
-				
+
 
 			}
 		}
-		
+
 	}
-  
+
 	// This will only be called if we were NOT disabled before coming into this function.
 	if (edgeCase) {
 		onDisabledEdge(true);
@@ -2312,11 +2345,11 @@ Bool Object::clearDisabled( DisabledType type )
 	myFlagsMinusExceptions.clearAndSet(exceptions, DISABLEDMASK_NONE);
 
 	// to clarify, if I am NOT disabled by anything other than DISABLED_HELD, or DISABLED_SCRIPT_DISABLED
-	
-	// to clarify, count inverse intersection gives you the number of exceptions you don't have, 
+
+	// to clarify, count inverse intersection gives you the number of exceptions you don't have,
 	// and has nothing to do with checking other disabled types
-//	if( !isDisabled() || getDisabledFlags().countInverseIntersection( exceptions ) == 0 )  
-	if( myFlagsMinusExceptions.count() == 0 )  
+//	if( !isDisabled() || getDisabledFlags().countInverseIntersection( exceptions ) == 0 )
+	if( myFlagsMinusExceptions.count() == 0 )
 	{
 		// I have no disabled flag that is not one of the exceptions above.
 		if (m_drawable)
@@ -2355,7 +2388,7 @@ void Object::checkDisabledStatus()
 
 //-------------------------------------------------------------------------------------------------
 void Object::pauseAllSpecialPowers( const Bool disabling ) const
-{ 
+{
 	for (BehaviorModule** m = m_behaviors; *m; ++m)
 	{
 		SpecialPowerModuleInterface* sp = (*m)->getSpecialPower();
@@ -2374,9 +2407,9 @@ void Object::updateTriggerAreaFlags()
 {
 	Int j = 0;
 	// Update the flags, and remove any trigger areas that this object isn't inside.
-	for (Int i=0; i<m_numTriggerAreasActive; i++) 
+	for (Int i=0; i<m_numTriggerAreasActive; i++)
 	{
-		if (!m_triggerInfo[j].isInside) 
+		if (!m_triggerInfo[j].isInside)
 			continue;
 		m_triggerInfo[j].entered = false;
 		m_triggerInfo[j].exited = false;
@@ -2400,12 +2433,12 @@ void Object::onCollide( Object *other, const Coord3D *loc, const Coord3D *normal
 		if( getStatusBits().test( OBJECT_STATUS_NO_COLLISIONS ) )
 		{
 #ifdef DEBUG_CRC
-			//DEBUG_LOG(("Object::onCollide() - OBJECT_STATUS_NO_COLLISIONS set\n"));
+			//DEBUG_LOG(("Object::onCollide() - OBJECT_STATUS_NO_COLLISIONS set"));
 #endif
 			break;
 		}
 #ifdef DEBUG_CRC
-		//DEBUG_LOG(("Object::onCollide() - calling collide module\n"));
+		//DEBUG_LOG(("Object::onCollide() - calling collide module"));
 #endif
 		collide->onCollide(other, loc, normal);
 	}
@@ -2426,17 +2459,17 @@ Bool Object::isSalvageCrate() const
 }
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
 	Our owning player is telling us to recheck our UpgradeModules, as an upgrade has completed
  */
 void Object::updateUpgradeModules()
 {
 	if( testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
 		return; // No upgrade can run if we are under construction.  The three places that clear UnderConstruction will re-update us.
-	
+
 	if( testStatus( OBJECT_STATUS_DESTROYED ) )
 		return; // Patch 1.03 -- Fixes crash when you upgrade a fake GLA command center to a real one if (toxic or demo).
-	
+
 	if( getControllingPlayer() == NULL )
 		return;  // This can only happen in game teardown.  No upgrades for you without a player.  Weird crashes are bad.
 
@@ -2462,10 +2495,10 @@ void Object::updateUpgradeModules()
 
 //-------------------------------------------------------------------------------------------------
 //This function sucks.
-//It was added for objects that can disguise as other objects and contain upgraded subobject overrides. 
+//It was added for objects that can disguise as other objects and contain upgraded subobject overrides.
 //A concrete example is the bomb truck. Different payloads are displayed based on which upgrades have been
 //made. When the bomb truck disguises as something else, these subobjects are lost because the vector is
-//stored in W3DDrawModule. When we revert back to the original bomb truck, we call this function to 
+//stored in W3DDrawModule. When we revert back to the original bomb truck, we call this function to
 //recalculate those upgraded subobjects.
 //-------------------------------------------------------------------------------------------------
 void Object::forceRefreshSubObjectUpgradeStatus()
@@ -2506,14 +2539,14 @@ Bool Object::didEnterOrExit() const
 //-------------------------------------------------------------------------------------------------
 Bool Object::didEnter(const PolygonTrigger *pTrigger) const
 {
-	if (!didEnterOrExit()) 
+	if (!didEnterOrExit())
 		return false;
 
-	DEBUG_ASSERTCRASH(!isKindOf(KINDOF_INERT), ("Asking whether an inert object entered or exited. This is invalid.\n"));
+	DEBUG_ASSERTCRASH(!isKindOf(KINDOF_INERT), ("Asking whether an inert object entered or exited. This is invalid."));
 
-	for (Int i=0; i<m_numTriggerAreasActive; i++) 
+	for (Int i=0; i<m_numTriggerAreasActive; i++)
 	{
-		if (m_triggerInfo[i].entered && m_triggerInfo[i].pTrigger == pTrigger) 
+		if (m_triggerInfo[i].entered && m_triggerInfo[i].pTrigger == pTrigger)
 			return true;
 	}
 	return false;
@@ -2524,13 +2557,13 @@ Bool Object::didEnter(const PolygonTrigger *pTrigger) const
 //-------------------------------------------------------------------------------------------------
 Bool Object::didExit(const PolygonTrigger *pTrigger) const
 {
-	if (!didEnterOrExit()) 
+	if (!didEnterOrExit())
 		return false;
 
-	DEBUG_ASSERTCRASH(!isKindOf(KINDOF_INERT), ("Asking whether an inert object entered or exited. This is invalid.\n"));
-	for (Int i=0; i<m_numTriggerAreasActive; i++) 
+	DEBUG_ASSERTCRASH(!isKindOf(KINDOF_INERT), ("Asking whether an inert object entered or exited. This is invalid."));
+	for (Int i=0; i<m_numTriggerAreasActive; i++)
 	{
-		if (m_triggerInfo[i].exited && m_triggerInfo[i].pTrigger == pTrigger) 
+		if (m_triggerInfo[i].exited && m_triggerInfo[i].pTrigger == pTrigger)
 			return true;
 	}
 	return false;
@@ -2541,11 +2574,11 @@ Bool Object::didExit(const PolygonTrigger *pTrigger) const
 //-------------------------------------------------------------------------------------------------
 Bool Object::isInside(const PolygonTrigger *pTrigger) const
 {
-	DEBUG_ASSERTCRASH(!isKindOf(KINDOF_INERT), ("Asking whether an inert is inside a trigger area. This is invalid.\n"));
+	DEBUG_ASSERTCRASH(!isKindOf(KINDOF_INERT), ("Asking whether an inert is inside a trigger area. This is invalid."));
 
-	for (Int i=0; i<m_numTriggerAreasActive; i++) 
+	for (Int i=0; i<m_numTriggerAreasActive; i++)
 	{
-		if (m_triggerInfo[i].isInside && m_triggerInfo[i].pTrigger == pTrigger) 
+		if (m_triggerInfo[i].isInside && m_triggerInfo[i].pTrigger == pTrigger)
 			return true;
 	}
 	return false;
@@ -2577,7 +2610,7 @@ ExitInterface *Object::getObjectExitInterface() const
 
 	return exitInterface;
 
-}  // end getObjectExitInterface
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Checks the object against trigger areas when the position changes. */
@@ -2586,7 +2619,7 @@ void Object::setTriggerAreaFlagsForChangeInPosition()
 {
 	// projectiles cannot trigger areas. (jkmcd)
 	// neither can inert objects, like the radar ping, etc. (jkmcd)
-	if (isKindOf(KINDOF_PROJECTILE) || isKindOf(KINDOF_INERT)) 
+	if (isKindOf(KINDOF_PROJECTILE) || isKindOf(KINDOF_INERT))
 		return;
 
 	ICoord3D iPos;
@@ -2594,10 +2627,10 @@ void Object::setTriggerAreaFlagsForChangeInPosition()
 	iPos.x = REAL_TO_INT(pos.x);
 	iPos.y = REAL_TO_INT(pos.y);
 	iPos.z = 0; // Trigger areas compare on xy only.
-	if (m_iPos.x == iPos.x && m_iPos.y == iPos.y) 
+	if (m_iPos.x == iPos.x && m_iPos.y == iPos.y)
 	{
 		return; // didn't move enough to change integer position.
-	}			 
+	}
 
 	if (!isKindOf(KINDOF_IMMOBILE)) {
 		if (isKindOf(KINDOF_INFANTRY) || isKindOf(KINDOF_VEHICLE) ) {
@@ -2605,7 +2638,7 @@ void Object::setTriggerAreaFlagsForChangeInPosition()
 		}
 	}
 
-	if (getAIUpdateInterface()) 
+	if (getAIUpdateInterface())
 	{
 		TheAI->pathfinder()->updatePos(this, getPosition());
 	}
@@ -2616,14 +2649,14 @@ void Object::setTriggerAreaFlagsForChangeInPosition()
 
 	// Check for exited.
 	Int i;
-	for (i=0; i<m_numTriggerAreasActive; i++) 
+	for (i=0; i<m_numTriggerAreasActive; i++)
 	{
-		if (!m_triggerInfo[i].pTrigger->pointInTrigger(m_iPos)) 
+		if (!m_triggerInfo[i].pTrigger->pointInTrigger(m_iPos))
 		{
 			m_triggerInfo[i].isInside = false;
 			m_triggerInfo[i].exited = true;
 			m_enteredOrExitedFrame = now;
-			if (m_team) 
+			if (m_team)
 				m_team->setEnteredExited();
 			TheGameLogic->updateObjectsChangedTriggerAreas();
 #ifdef RTS_DEBUG
@@ -2634,42 +2667,42 @@ void Object::setTriggerAreaFlagsForChangeInPosition()
 
 	m_iPos = iPos;
 
-	for (const PolygonTrigger *pTrig = PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) 
+	for (const PolygonTrigger *pTrig = PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext())
 	{
 		Bool skip = false;
-		for (i = 0; i < m_numTriggerAreasActive; i++) 
+		for (i = 0; i < m_numTriggerAreasActive; i++)
 		{
-			if (m_triggerInfo[i].pTrigger == pTrig) 
+			if (m_triggerInfo[i].pTrigger == pTrig)
 			{
 				// Already handled this one in the check for exited above.
 				skip = true;
 				break;
 			}
 		}
-		if (skip) 
+		if (skip)
 			continue;
-		if (pTrig->pointInTrigger(m_iPos)) 
+		if (pTrig->pointInTrigger(m_iPos))
 		{
-			if (m_numTriggerAreasActive < MAX_TRIGGER_AREA_INFOS) 
+			if (m_numTriggerAreasActive < MAX_TRIGGER_AREA_INFOS)
 			{
 				m_triggerInfo[m_numTriggerAreasActive].isInside = true;
 				m_triggerInfo[m_numTriggerAreasActive].entered = true;
 				m_triggerInfo[m_numTriggerAreasActive].exited = false;
-				m_triggerInfo[m_numTriggerAreasActive].pTrigger = pTrig;  
+				m_triggerInfo[m_numTriggerAreasActive].pTrigger = pTrig;
 				m_enteredOrExitedFrame = now;
-				if (m_team) 
+				if (m_team)
 					m_team->setEnteredExited();
 				TheGameLogic->updateObjectsChangedTriggerAreas();
 				++m_numTriggerAreasActive;
 #ifdef RTS_DEBUG
 				//TheScriptEngine->AppendDebugMessage("Object entered.", false);
 #endif
-			} 
-			else 
+			}
+			else
 			{
 				// Shouldn't happen.
 				static Bool didWarn = false;
-				if (!didWarn) 
+				if (!didWarn)
 				{
 					didWarn = true;
 					TheScriptEngine->AppendDebugMessage("***WARNING - Too many nested trigger areas. ***", true);
@@ -2723,7 +2756,7 @@ void Object::setLayer(PathfindLayerEnum layer)
 	if (layer!=m_layer) {
 #define no_SET_LAYER_INTENSE_DEBUG
 #ifdef SET_LAYER_INTENSE_DEBUG
-		DEBUG_LOG(("Changing layer from %d to %d\n", m_layer, layer));
+		DEBUG_LOG(("Changing layer from %d to %d", m_layer, layer));
 		if (m_layer != LAYER_GROUND) {
 			if (TheTerrainLogic->objectInteractsWithBridgeLayer(this, m_layer)) {
 				DEBUG_CRASH(("Probably shouldn't be chaging layer. jba."));
@@ -2751,13 +2784,13 @@ void Object::setDestinationLayer(PathfindLayerEnum layer)
 void Object::setID( ObjectID id )
 {
 
-	// sanity 
-	DEBUG_ASSERTCRASH( id != INVALID_ID, ("Object::setID - Invalid id\n") );
+	// sanity
+	DEBUG_ASSERTCRASH( id != INVALID_ID, ("Object::setID - Invalid id") );
 
 	// if id hasn't changed do nothing
 	if( m_id == id )
 		return;
-			
+
 	// remove this objects previous id from the lookup table
 	TheGameLogic->removeObjectFromLookupTable( this );
 
@@ -2767,10 +2800,10 @@ void Object::setID( ObjectID id )
 	// add new id to lookup table
 	TheGameLogic->addObjectToLookupTable( this );
 
-}  // end setID
+}
 
 // ------------------------------------------------------------------------------------------------
-Real Object::calculateHeightAboveTerrain(void) const 
+Real Object::calculateHeightAboveTerrain(void) const
 {
 	const Coord3D* pos = getPosition();
 	Real terrainZ = TheTerrainLogic->getLayerHeight( pos->x, pos->y, m_layer );
@@ -2801,11 +2834,11 @@ void Object::friend_prepareForMapBoundaryAdjust(void)
 	// NOTE - DO NOT remove from pathfind map. jba.
 	// NO NO. jba. TheAI->pathfinder()->removeObjectFromPathfindMap( this );
 
-	// remove from the radar, remove from the partition manager	
+	// remove from the radar, remove from the partition manager
 	TheRadar->removeObject(this);
 	ThePartitionManager->unRegisterObject(this);
 
-	// The whole PartitionManager and all of the Looker data is about to be blown away, 
+	// The whole PartitionManager and all of the Looker data is about to be blown away,
 	// so forget what I think I have done
 	m_partitionLastLook->reset();
 	m_partitionRevealAllLastLook->reset();
@@ -2813,7 +2846,7 @@ void Object::friend_prepareForMapBoundaryAdjust(void)
 
 	m_partitionLastThreat->reset();
 	m_partitionLastValue->reset();
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2866,7 +2899,7 @@ void Object::calcNaturalRallyPoint(Coord2D *pt)
 }
 
 //-------------------------------------------------------------------------------------------------
-Module* Object::findModule(NameKeyType key) const 
+Module* Object::findModule(NameKeyType key) const
 {
 	Module* m = NULL;
 
@@ -2881,7 +2914,7 @@ Module* Object::findModule(NameKeyType key) const
 			}
 			else
 			{
-				DEBUG_CRASH(("Duplicate modules found for name %s!\n",TheNameKeyGenerator->keyToName(key).str()));
+				DEBUG_CRASH(("Duplicate modules found for name %s!",TheNameKeyGenerator->keyToName(key).str()));
 			}
 #else
 			m = *b;
@@ -2922,7 +2955,7 @@ void Object::scoreTheKill( const Object *victim )
 		return;
 	}
 
-	
+
 	if ( victim->isKindOf( KINDOF_IGNORED_IN_GUI ) )
 		return;
 
@@ -2964,14 +2997,14 @@ void Object::scoreTheKill( const Object *victim )
 }
 
 //-------------------------------------------------------------------------------------------------
-VeterancyLevel Object::getVeterancyLevel() const 
-{ 
-	return m_experienceTracker ? m_experienceTracker->getVeterancyLevel() : LEVEL_REGULAR; 
+VeterancyLevel Object::getVeterancyLevel() const
+{
+	return m_experienceTracker ? m_experienceTracker->getVeterancyLevel() : LEVEL_REGULAR;
 }
 
 //-------------------------------------------------------------------------------------------------
-void Object::friend_bindToDrawable( Drawable *draw ) 
-{ 
+void Object::friend_bindToDrawable( Drawable *draw )
+{
 	m_drawable = draw;
 	if (m_drawable)
 	{
@@ -3007,12 +3040,12 @@ void Object::friend_bindToDrawable( Drawable *draw )
 	{
 		(*b)->onDrawableBoundToObject();
 	}
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
-void Object::setSelectable(Bool selectable) 
-{ 
-	m_isSelectable = selectable; 
+void Object::setSelectable(Bool selectable)
+{
+	m_isSelectable = selectable;
 	if (m_drawable)
 	{
 		m_drawable->setSelectable(selectable);
@@ -3022,19 +3055,19 @@ void Object::setSelectable(Bool selectable)
 //-------------------------------------------------------------------------------------------------
 Bool Object::isSelectable() const
 {
-//	return getTemplate()->isKindOf(KINDOF_ALWAYS_SELECTABLE) 
-//				|| (m_isSelectable 
-//						&& !testStatus(OBJECT_STATUS_UNSELECTABLE) 
+//	return getTemplate()->isKindOf(KINDOF_ALWAYS_SELECTABLE)
+//				|| (m_isSelectable
+//						&& !testStatus(OBJECT_STATUS_UNSELECTABLE)
 //						&& !isEffectivelyDead()
 //						&& !getTemplate()->isKindOf(KINDOF_DRONE)//Most drones are unselectable from being slaved, but the SpyDrone needs help
 //						);
- 
+
 
 	if (getTemplate()->isKindOf(KINDOF_ALWAYS_SELECTABLE))
     return TRUE;
 
 	if ( m_isSelectable )
-    if ( !testStatus(OBJECT_STATUS_UNSELECTABLE) ) 
+    if ( !testStatus(OBJECT_STATUS_UNSELECTABLE) )
 		  if ( !isEffectivelyDead() )
 				//if ( !getTemplate()->isKindOf(KINDOF_DRONE) )//Most drones are unselectable from being slaved, but the SpyDrone needs help
 					return TRUE;
@@ -3049,9 +3082,9 @@ Bool Object::isMassSelectable() const
 }
 
 //-------------------------------------------------------------------------------------------------
-void Object::setWeaponSetFlag(WeaponSetType wst) 
-{ 
-	m_curWeaponSetFlags.set(wst); 
+void Object::setWeaponSetFlag(WeaponSetType wst)
+{
+	m_curWeaponSetFlags.set(wst);
 	m_weaponSet.updateWeaponSet(this);
 	if (m_drawable)
 	{
@@ -3060,9 +3093,9 @@ void Object::setWeaponSetFlag(WeaponSetType wst)
 }
 
 //-------------------------------------------------------------------------------------------------
-void Object::clearWeaponSetFlag(WeaponSetType wst) 
-{ 
-	m_curWeaponSetFlags.set(wst, 0); 
+void Object::clearWeaponSetFlag(WeaponSetType wst)
+{
+	m_curWeaponSetFlags.set(wst, 0);
 	m_weaponSet.updateWeaponSet(this);
 	if (m_drawable)
 	{
@@ -3094,19 +3127,6 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 	BodyModuleInterface* body = getBodyModule();
 	if (body)
 		body->onVeterancyLevelChanged( oldLevel, newLevel, provideFeedback );
-	
-	Bool hideAnimationForStealth = FALSE;
-	if( !isLocallyControlled() && 
-			testStatus( OBJECT_STATUS_STEALTHED ) && 
-			!testStatus( OBJECT_STATUS_DETECTED ) && 
-			!testStatus( OBJECT_STATUS_DISGUISED ) )
-	{
-		hideAnimationForStealth = TRUE;
-	}
-
-	Bool doAnimation = ( ! hideAnimationForStealth 
-											&& (newLevel > oldLevel) 
-											&& ( ! isKindOf(KINDOF_IGNORED_IN_GUI))); //First, we plan to do the animation if the level went up
 
 	switch (newLevel)
 	{
@@ -3117,7 +3137,6 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 			clearWeaponBonusCondition(WEAPONBONUSCONDITION_VETERAN);
 			clearWeaponBonusCondition(WEAPONBONUSCONDITION_ELITE);
 			clearWeaponBonusCondition(WEAPONBONUSCONDITION_HERO);
-			doAnimation = FALSE;//... but not if somehow up to Regular
 			break;
 		case LEVEL_VETERAN:
 			setWeaponSetFlag(WEAPONSET_VETERAN);
@@ -3145,13 +3164,18 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 			break;
 	}
 
-	if( doAnimation && TheGameLogic->getDrawIconUI() && provideFeedback )
+	Bool doAnimation = provideFeedback
+		&& newLevel > oldLevel
+		&& !isKindOf(KINDOF_IGNORED_IN_GUI)
+		&& isLogicallyVisible();
+
+	if( doAnimation && TheGameLogic->getDrawIconUI() )
 	{
 		if( TheAnim2DCollection && TheGlobalData->m_levelGainAnimationName.isEmpty() == FALSE )
 		{
 			Anim2DTemplate *animTemplate = TheAnim2DCollection->findTemplate( TheGlobalData->m_levelGainAnimationName );
 
-			Coord3D pos = *getPosition(); 
+			Coord3D pos = *getPosition();
 			pos.add(&m_healthBoxOffset);
 
 			TheInGameUI->addWorldAnimation( animTemplate,
@@ -3161,7 +3185,7 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 																			TheGlobalData->m_levelGainAnimationZRisePerSecond);
 		}
 
-		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_unitPromoted;	
+		AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_unitPromoted;
 		soundToPlay.setObjectID( getID() );
 		TheAudio->addAudioEvent( &soundToPlay );
 	}
@@ -3188,7 +3212,7 @@ Bool Object::isAbleToAttack() const
 	DEBUG_ASSERTCRASH( (containedBy == NULL) || (containedBy->getContain() != NULL), ("A %s thinks they are contained by something with no contain module!", getTemplate()->getName().str() ) );
 	if( containedBy && containedBy->getContain() && !containedBy->getContain()->isPassengerAllowedToFire( getID() ) )
 		return false;
-	
+
 
 	// We can't fire if under construction
 	if( testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
@@ -3201,7 +3225,7 @@ Bool Object::isAbleToAttack() const
   if ( isDisabledByType( DISABLED_SUBDUED ) )
     return FALSE; // A Microwave Tank is cooking me
 
-	//We can't fire if we, as a portable structure, are aptly disabled 
+	//We can't fire if we, as a portable structure, are aptly disabled
 	if ( isKindOf( KINDOF_PORTABLE_STRUCTURE ) || isKindOf( KINDOF_SPAWNS_ARE_THE_WEAPONS ))
 	{
 		if( isDisabledByType( DISABLED_HACKED ) || isDisabledByType( DISABLED_EMP ) )
@@ -3230,9 +3254,9 @@ Bool Object::isAbleToAttack() const
 
 	}
 
-  
 
-	//We can't fire if all our weapons are disabled! 
+
+	//We can't fire if all our weapons are disabled!
 	//Currently, only turreted weapons can be disabled.
 	//ONLY DO THIS CHECK IF OUR UNIT DOESN'T HAVE THE
 	//KINDOF_CAN_ATTACK flag... nuke cannons have disabled
@@ -3251,7 +3275,7 @@ Bool Object::isAbleToAttack() const
 				continue;
 
 			anyWeapon = TRUE;
-			
+
 			//We found a weapon, is it a turret?
 			Real dummy;
 			WhichTurretType tur = ai->getWhichTurretForWeaponSlot( (WeaponSlotType)i, &dummy );
@@ -3262,12 +3286,12 @@ Bool Object::isAbleToAttack() const
 				anyEnabled = TRUE;
 				break;
 			}
-			
+
 			if( ai->isTurretEnabled( tur ) )
 			{
 				//The turret is enable, meaning we have an enabled weapon. Quit.
 				anyEnabled = TRUE;
-				break;;	
+				break;
 			}
 		}
 		if( anyWeapon && !anyEnabled )
@@ -3289,7 +3313,7 @@ Bool Object::isAbleToAttack() const
 	// for garrisonned buildings that can attack sometimes
 	if( getStatusBits().test( OBJECT_STATUS_CAN_ATTACK ) )
 		return true;
-	
+
 	// for weaponless transports.  This will make me think I can, but I will check if I literally can by looking
 	// at passenger weapons in CanAttack.
 	const ContainModuleInterface* contain = getContain();
@@ -3349,7 +3373,7 @@ void Object::maskObject( Bool mask )
 	if (mask)
 		TheGameLogic->deselectObject(this, ~getControllingPlayer()->getPlayerMask(), TRUE);
 
-}  // end maskObject
+}
 
 //-------------------------------------------------------------------------------------------------
 /*
@@ -3366,8 +3390,8 @@ Bool Object::isUsingAirborneLocomotor( void ) const
 //IT WOULD PROBABLY BE WISE TO MOVE ALL THE HARD-CODED DEFAULTS BELOW
 //INTO A NEW Drawable::getHealthBox..() WHICH USES GEOM0INFO, MODEL DATA, INI DATA, ETC.
 void Object::getHealthBoxPosition(Coord3D& pos) const
-{ 
-	pos = *getPosition(); 
+{
+	pos = *getPosition();
 	pos.z += getGeometryInfo().getMaxHeightAbovePosition() + 10;
 	pos.add(&m_healthBoxOffset);
 
@@ -3384,7 +3408,7 @@ void Object::getHealthBoxPosition(Coord3D& pos) const
 //IT WOULD PROBABLY BE WISE TO MOVE ALL THE HARD-CODED DEFAULTS BELOW
 //INTO A NEW Drawable::getHealthBox..() WHICH USES GEOM0INFO, MODEL DATA, INI DATA, ETC.
 Bool Object::getHealthBoxDimensions(Real &healthBoxHeight, Real &healthBoxWidth) const
-{ 
+{
 
 #ifdef CALC_HEALTHBAR_FROM_HITPOINTS
 	Real maxHP = getBodyModule()->getMaxHealth();
@@ -3397,7 +3421,7 @@ Bool Object::getHealthBoxDimensions(Real &healthBoxHeight, Real &healthBoxWidth)
 		healthBoxWidth = min(150.0f, max(100.0f, maxHP/10));
 		return true;
 	}
-	else if ( isKindOf(KINDOF_MOB_NEXUS) ) 
+	else if ( isKindOf(KINDOF_MOB_NEXUS) )
 	{
 		//enforce healthBoxHeightMinimum/Maximum
 		healthBoxHeight = min(3.0f, max(5.0f, maxHP/50));
@@ -3430,7 +3454,7 @@ Bool Object::getHealthBoxDimensions(Real &healthBoxHeight, Real &healthBoxWidth)
 
 	//just add the major and minor axes
 	Real size = MAX(20.0f, MIN(150.0f, (getGeometryInfo().getMajorRadius() + getGeometryInfo().getMinorRadius())) );
-	healthBoxHeight = 3.0f; 
+	healthBoxHeight = 3.0f;
 	healthBoxWidth = MAX(20.0f, size * 2.0f);
 	return TRUE;
 
@@ -3442,7 +3466,7 @@ Bool Object::getHealthBoxDimensions(Real &healthBoxHeight, Real &healthBoxWidth)
 //-------------------------------------------------------------------------------------------------
 /**
  * Update this object instance with properties from the map object
- * 
+ *
  */
 void Object::updateObjValuesFromMapProperties(Dict* properties)
 {
@@ -3492,7 +3516,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
 			ai->setAttitude((AttitudeType)valInt);
 		}
 	}
-	
+
 	// set recruitable
 	valBool = properties->getBool(TheKey_objectRecruitableAI, &exists);
 	if (exists) {
@@ -3501,7 +3525,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
 			getAIUpdateInterface()->setIsRecruitable(valBool);
 		}
 	}
-	
+
 	// set selectable
 	valBool = properties->getBool(TheKey_objectSelectable, &exists);
 	if (exists) {
@@ -3509,7 +3533,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
 			setSelectable(valBool);
 		}
 	}
-	
+
 	// set the stopping distance
 	valReal = properties->getReal(TheKey_objectStoppingDistance, &exists);
 	if (exists && valReal >= 0.5f)
@@ -3520,7 +3544,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
 			loco->setCloseEnoughDist(valReal);
 		}
 	}
-	
+
 	// set the disabledness of this object
 	valBool = properties->getBool(TheKey_objectEnabled, &exists);
 	if (exists) {
@@ -3550,7 +3574,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
 
 	//Set the player targetable setting of the object
 	valBool = properties->getBool( TheKey_objectTargetable, &exists );
-	if( exists ) 
+	if( exists )
 	{
 		setScriptStatus(OBJECT_STATUS_SCRIPT_TARGETABLE, valBool);
 	}
@@ -3575,26 +3599,26 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
 
 
 	Int upgradeNum = 0;
-	do 
+	do
 	{
 		AsciiString keyName;
 		keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_objectGrantUpgrade).str(), upgradeNum);
 		valStr = properties->getAsciiString(NAMEKEY(keyName), &exists);
 
-		if (exists) 
+		if (exists)
 		{
 			const UpgradeTemplate *ut = TheUpgradeCenter->findUpgrade(valStr);
 			if (ut)
 				giveUpgrade(ut);
 		}
-		else 
+		else
 		{
 			valStr.clear();
 		}
 
 		++upgradeNum;
 	} while (!valStr.isEmpty());
-	
+
 	Drawable	*drawable = getDrawable();
   if ( drawable )
   {
@@ -3613,7 +3637,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
         break;
       }
     }
-    
+
     valInt = properties->getInt(TheKey_objectWeather, &exists);
     if (exists)
     {
@@ -3629,11 +3653,11 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
         break;
       }
     }
-    
+
     // See if we are supposed to playing the ambient sound
     Bool soundEnabledExists;
     Bool soundEnabled = properties->getBool( TheKey_objectSoundAmbientEnabled, &soundEnabledExists );
-     
+
     DynamicAudioEventInfo * audioToModify = NULL;
     Bool infoModified = false;
     valStr = properties->getAsciiString( TheKey_objectSoundAmbient, &exists );
@@ -3709,7 +3733,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
             audioToModify->overrideMinRange( valReal );
             infoModified = true;
           }
-          
+
           valReal = properties->getReal( TheKey_objectSoundAmbientMaxRange, &exists );
           if ( exists )
           {
@@ -3756,7 +3780,7 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
       // ...FromScript because this is also controlled by the map designer not the game logic
       drawable->enableAmbientSoundFromScript( false );
     }
-    
+
     if ( infoModified && audioToModify != NULL )
     {
       // Give a custom, level-specific name
@@ -3769,11 +3793,8 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
       audioToModify = NULL; // Belongs to TheAudio now
     }
 
-    if ( audioToModify != NULL )
-    {
-      deleteInstance(audioToModify);
-      audioToModify = NULL;
-    }
+    deleteInstance(audioToModify);
+    audioToModify = NULL;
 
     if ( soundEnabledExists && soundEnabled )
     {
@@ -3783,15 +3804,15 @@ void Object::updateObjValuesFromMapProperties(Dict* properties)
       if ( !drawable->getAmbientSoundEnabledFromScript() )
       {
         drawable->enableAmbientSoundFromScript( true );
-      }      
-    } 
+      }
+    }
   }
 }
 
 //-------------------------------------------------------------------------------------------------
 void Object::friend_adjustPowerForPlayer( Bool incoming )
 {
-	if (isDisabled() && getTemplate()->getEnergyProduction() > 0) 
+	if (isDisabled() && getTemplate()->getEnergyProduction() > 0)
 	{
 		// Disabledness only affects Producers, not Consumers.
 		return;
@@ -3828,7 +3849,7 @@ void Object::onDisabledEdge(Bool becomingDisabled)
 	if (controller)
 	{
 		//@todo jkmcd - Colin suggested we rewrite this to use the interface stuff. I agree, but need
-		// to get some more bugs fixed today. 
+		// to get some more bugs fixed today.
 		static NameKeyType radar = NAMEKEY("RadarUpgrade");
 		Module *mod = mod = findModule(radar);
 		if (mod) {
@@ -3846,15 +3867,20 @@ void Object::onDisabledEdge(Bool becomingDisabled)
 
 	// We will need to adjust power ... somehow ...
 	Int powerToAdjust = getTemplate()->getEnergyProduction();
-	
-	if( powerToAdjust > 0 )
+
+	// TheSuperHackers @bugfix Caball009 18/07/2025 Don't adjust the power for power plants that are still under construction.
+#if !RETAIL_COMPATIBLE_CRC
+	if ( powerToAdjust > 0 && !testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
+#else
+	if ( powerToAdjust > 0 )
+#endif
 	{
 		// We can't affect something that consumes, or else we go low power which removes the consumption
 		// which makes us not low power so we add the consumption so we go low power...
 		// This check also guaards the IsDisabled in friend_adjustPower above
 		static NameKeyType powerPlant = NAMEKEY("PowerPlantUpgrade");
 		static NameKeyType overCharge = NAMEKEY("OverchargeBehavior");
-		
+
 		Module* mod = findModule(powerPlant);
 		if (mod) {
 			PowerPlantUpgrade *powerPlantMod = (PowerPlantUpgrade*) mod;
@@ -3862,7 +3888,7 @@ void Object::onDisabledEdge(Bool becomingDisabled)
 				powerToAdjust += getTemplate()->getEnergyBonus();
 			}
 		}
-		
+
 		mod = findModule(overCharge);
 		if (mod) {
 			OverchargeBehavior *overChargeMod = (OverchargeBehavior*) mod;
@@ -3870,7 +3896,7 @@ void Object::onDisabledEdge(Bool becomingDisabled)
 				powerToAdjust += getTemplate()->getEnergyBonus();
 			}
 		}
-		
+
 		// Now, adjust the power for the player.
 		if (controller)
 			controller->getEnergy()->adjustPower(powerToAdjust, !becomingDisabled);
@@ -3919,7 +3945,7 @@ void Object::crc( Xfer *xfer )
 		logString.concat(tmp);
 	}
 #endif // DEBUG_CRC
-	
+
 
 	xfer->xferUser(&m_id,															sizeof(m_id));
 #ifdef DEBUG_CRC
@@ -3975,7 +4001,7 @@ void Object::crc( Xfer *xfer )
 #ifdef DEBUG_CRC
 	if (doLogging)
 	{
-		tmp.format("damage scalar: %g/%8.8X\n", scalar, AS_INT(scalar));
+		tmp.format("damage scalar: %g/%8.8X", scalar, AS_INT(scalar));
 		logString.concat(tmp);
 
 		CRCDEBUG_LOG(("%s", logString.str()));
@@ -3990,13 +4016,13 @@ void Object::crc( Xfer *xfer )
 			xfer->xferSnapshot( thisWeapon );
 		}
 	}
-	
-}  // end crc
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Object xfer implemtation
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Xfers m_singleUseCommandUsed... determines if the single use command button has been used or not.
 	* 3: Xfers the solehealingbenefactor ID and expiration frame
 	* 4: misc stuff that got missed somehow
@@ -4009,7 +4035,7 @@ void Object::crc( Xfer *xfer )
 //-------------------------------------------------------------------------------------------------
 void Object::xfer( Xfer *xfer )
 {
-	
+
 	// version
 	const XferVersion currentVersion = 9;
 	XferVersion version = currentVersion;
@@ -4020,7 +4046,7 @@ void Object::xfer( Xfer *xfer )
 	xfer->xferObjectID( &id );
 	setID( id );
 
-	DEBUG_LOG(("Xfer Object %s id=%d\n",getTemplate()->getName().str(),id));
+	DEBUG_LOG(("Xfer Object %s id=%d",getTemplate()->getName().str(),id));
 
 	if (version >= 7)
 	{
@@ -4044,7 +4070,7 @@ void Object::xfer( Xfer *xfer )
 	// team
 	TeamID teamID = m_team ? m_team->getID() : TEAM_ID_INVALID;
 	xfer->xferUser( &teamID, sizeof( TeamID ) );
-	// DON'T set the team yet; must wait till we read our status bits, 
+	// DON'T set the team yet; must wait till we read our status bits,
 	// since setTeam can affect the player's power usage, but that could
 	// be done incorrectly if our status bits aren't accurate yet... (srj)
 
@@ -4064,7 +4090,7 @@ void Object::xfer( Xfer *xfer )
 		// change the ID of the drawable attached to be the same ID as it was when it was saved
 		draw->setID( drawableID );
 
-	}  // end if
+	}
 
 	// internal name
 	xfer->xferAsciiString( &m_name );
@@ -4106,7 +4132,7 @@ void Object::xfer( Xfer *xfer )
 		Team *team = TheTeamFactory->findTeamByID( teamID );
 		if( team == NULL )
 		{
-			DEBUG_CRASH(( "Object::xfer - Unable to load team\n" ));
+			DEBUG_CRASH(( "Object::xfer - Unable to load team" ));
 			throw SC_INVALID_DATA;
 		}
 		const Bool restoring = true;
@@ -4223,10 +4249,10 @@ void Object::xfer( Xfer *xfer )
 	xfer->xferUnsignedInt(&m_enteredOrExitedFrame);
 	xfer->xferICoord3D(&m_iPos);
 	if (m_numTriggerAreasActive<0 || m_numTriggerAreasActive>MAX_TRIGGER_AREA_INFOS) {
-		DEBUG_CRASH(("Invalid m_numTriggerAreasActive = %d, max is %d", m_numTriggerAreasActive, 
+		DEBUG_CRASH(("Invalid m_numTriggerAreasActive = %d, max is %d", m_numTriggerAreasActive,
 			MAX_TRIGGER_AREA_INFOS));
 		throw SC_INVALID_DATA;
-	}	 
+	}
 	for (i=0; i<m_numTriggerAreasActive; i++) {
 		AsciiString triggerName;
 		if (m_triggerInfo[i].pTrigger) {
@@ -4296,9 +4322,9 @@ void Object::xfer( Xfer *xfer )
 			// end data block
 			xfer->endBlock();
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		AsciiString otherModuleIdentifier;
@@ -4322,7 +4348,7 @@ void Object::xfer( Xfer *xfer )
 					break;
 				}
 
-			}  // end for, moduleIt
+			}
 
 			// start of a new block
 			Int dataSize = xfer->beginBlock();
@@ -4336,27 +4362,27 @@ void Object::xfer( Xfer *xfer )
 			{
 
 				// for testing purposes, this module better be found
-//				DEBUG_CRASH(( "Object::xfer - Module '%s' was indicated in file, but not found on object '%s'(%d)\n",
+//				DEBUG_CRASH(( "Object::xfer - Module '%s' was indicated in file, but not found on object '%s'(%d)",
 //											moduleIdentifier.str(), getTemplate()->getName().str(), getID() ));
 
 				// skip this data in the file
 				xfer->skip( dataSize );
 
-			}  // end if
+			}
 			else
 			{
 
 				// xfer the data into this module
 				xfer->xferSnapshot( module );
 
-			}  // end else
-			
+			}
+
 			// end block
 			xfer->endBlock();
 
-		}  // end for, i module count recorded in file
+		}
 
-	}  // end else, load
+	}
 
 
 	if ( version >= 3 )
@@ -4371,7 +4397,7 @@ void Object::xfer( Xfer *xfer )
 	}
 
 	// Doesn't need to be saved.  These are created as needed.  jba.
-	//AIGroup*		m_group;															///< if non-NULL, we are part of this group of agents
+	//m_group;
 
 	// don't need to save m_partitionData.
 	DEBUG_ASSERTCRASH(!(xfer->getXferMode() == XFER_LOAD && m_partitionData == NULL), ("should not be in partitionmgr yet"));
@@ -4386,7 +4412,7 @@ void Object::xfer( Xfer *xfer )
 	//m_body;
 	//m_ai;
 	//m_physics;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	//m_hasDiedAlready;
 #endif
 
@@ -4410,11 +4436,11 @@ void Object::xfer( Xfer *xfer )
 	if (version >= 5)
 	{
 		xfer->xferBool(&m_isReceivingDifficultyBonus);
-	} 
+	}
 	else
 		m_isReceivingDifficultyBonus = FALSE;
 
-}  // end xfer
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Object load game post process phase */
@@ -4426,24 +4452,24 @@ void Object::loadPostProcess()
 	else
 		m_containedBy = NULL;
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Does this object have this upgrade */
 //-------------------------------------------------------------------------------------------------
-Bool Object::hasUpgrade( const UpgradeTemplate *upgradeT ) const 
+Bool Object::hasUpgrade( const UpgradeTemplate *upgradeT ) const
 {
 	if( m_objectUpgradesCompleted.testForAll( upgradeT->getUpgradeMask() ) )
 	{
 		return TRUE;
 	}
 	return FALSE;
-}  // end hasUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is this object capable of having this upgrade */
 //-------------------------------------------------------------------------------------------------
-Bool Object::affectedByUpgrade( const UpgradeTemplate *upgradeT ) const 
+Bool Object::affectedByUpgrade( const UpgradeTemplate *upgradeT ) const
 {
 	UpgradeMaskType objectMask = getObjectCompletedUpgradeMask();
 	UpgradeMaskType playerMask = getControllingPlayer()->getCompletedUpgradeMask();
@@ -4468,7 +4494,7 @@ Bool Object::affectedByUpgrade( const UpgradeTemplate *upgradeT ) const
 	}
 	return FALSE;
 
-}  // end affectedByUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Give this upgrade to this object */
@@ -4485,7 +4511,7 @@ void Object::giveUpgrade( const UpgradeTemplate *upgradeT )
 		//
 		updateUpgradeModules();
 	}
-}  // end giveUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove this upgrade from this object */
@@ -4526,7 +4552,7 @@ void Object::onCapture( Player *oldOwner, Player *newOwner )
 	// onCapture is used now, so it better be called after ownership changes and not before.
 	//
 	handlePartitionCellMaintenance();
-	
+
 	// Design needs the player to be able to sell buildings he steals from the AI's build list, and this is the
 	// easiest fix.  The only snafu would be a key building build listed by the AI that the player can capture
 	// and the AI tries to capture back but needs to not sell.  In that case, a Cinematic Unsellable version
@@ -4543,7 +4569,7 @@ void Object::onCapture( Player *oldOwner, Player *newOwner )
 		}
 	}
 
-}  // end onCapture
+}
 
 //-------------------------------------------------------------------------------------------------
 /// Object level events that need to happen upon game death
@@ -4552,11 +4578,11 @@ void Object::onDie( DamageInfo *damageInfo )
 
 	checkAndDetonateBoobyTrap(NULL);// Already dying, so no need to handle death case of explosion
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	DEBUG_ASSERTCRASH(m_hasDiedAlready == false, ("Object::onDie has been called multiple times. This is invalid. jkmcd"));
 	m_hasDiedAlready = true;
 #endif
-	
+
 	Bool selfInflicted = (damageInfo->in.m_sourceID == getID());
 
 	// FIRST, call our die modules.
@@ -4570,7 +4596,7 @@ void Object::onDie( DamageInfo *damageInfo )
 	// When objects die we remove from the radar as they're really not interesting anymore
 	if( m_radarData )
 		TheRadar->removeObject( this );
-	
+
 	// Just in case I have been sporting one of thise fancy Terrain Decals,
 	//I naturally lose it now, because I'm dead.
 	Drawable *draw = getDrawable();
@@ -4594,13 +4620,13 @@ void Object::onDie( DamageInfo *damageInfo )
 	if(m_team)
 		m_team->notifyTeamOfObjectDeath();
 
-	if (isLocallyControlled() && !selfInflicted) // wasLocallyControlled? :-)
+	if (isLocallyViewed() && !selfInflicted) // wasLocallyViewed? :-)
 	{
-		if (isKindOf(KINDOF_STRUCTURE) && isKindOf(KINDOF_MP_COUNT_FOR_VICTORY)) 
+		if (isKindOf(KINDOF_STRUCTURE) && isKindOf(KINDOF_MP_COUNT_FOR_VICTORY))
 		{
 			TheEva->setShouldPlay(EVA_BuldingLost);
-		} 
-		else if (isKindOf(KINDOF_INFANTRY) || isKindOf(KINDOF_VEHICLE)) 
+		}
+		else if (isKindOf(KINDOF_INFANTRY) || isKindOf(KINDOF_VEHICLE))
 		{
 			TheEva->setShouldPlay(EVA_UnitLost);
 			//Create a fake radar event so the user can use the spacebar to quickly jump to this!
@@ -4626,7 +4652,7 @@ void Object::onDie( DamageInfo *damageInfo )
 			RebuildHoleBehaviorInterface *rhbi = RebuildHoleBehavior::getRebuildHoleBehaviorInterfaceFromObject( hole );
 
 			// sanity
-			DEBUG_ASSERTCRASH( rhbi, ("Object::onDie() -  No Rebuild Hole Behavior interface on hole\n") );
+			DEBUG_ASSERTCRASH( rhbi, ("Object::onDie() -  No Rebuild Hole Behavior interface on hole") );
 
 			// start the rebuild process
 			if( rhbi )
@@ -4649,10 +4675,10 @@ void Object::onDie( DamageInfo *damageInfo )
 }
 
 //-------------------------------------------------------------------------------------------------
-void Object::setWeaponBonusCondition(WeaponBonusConditionType wst) 
+void Object::setWeaponBonusCondition(WeaponBonusConditionType wst)
 {
 	WeaponBonusConditionFlags oldCondition = m_weaponBonusCondition;
-	m_weaponBonusCondition |= (1 << wst); 
+	m_weaponBonusCondition |= (1 << wst);
 
 	if( oldCondition != m_weaponBonusCondition )
 	{
@@ -4662,10 +4688,10 @@ void Object::setWeaponBonusCondition(WeaponBonusConditionType wst)
 }
 
 //-------------------------------------------------------------------------------------------------
-void Object::clearWeaponBonusCondition(WeaponBonusConditionType wst) 
+void Object::clearWeaponBonusCondition(WeaponBonusConditionType wst)
 {
 	WeaponBonusConditionFlags oldCondition = m_weaponBonusCondition;
-	m_weaponBonusCondition &= ~(1 << wst); 
+	m_weaponBonusCondition &= ~(1 << wst);
 
 	if( oldCondition != m_weaponBonusCondition )
 	{
@@ -4675,7 +4701,7 @@ void Object::clearWeaponBonusCondition(WeaponBonusConditionType wst)
 }
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
 	A weapon cannot be in charge of maintaining condition flags as it is all event driven.
 	I will maintain my ModelCondition myself if it should change.  Firing is set by firing logic,
 	so I don't include it here.  It is only the states that expire on timers that noone watches
@@ -4694,7 +4720,7 @@ void Object::adjustModelConditionForWeaponStatus()
 			m_lastWeaponCondition[i] = WSF_NONE;
 			continue;
 		}
-		
+
 		WeaponSetConditionType conditionToSet = WSF_INVALID;
 		if (i != m_weaponSet.getCurWeaponSlot())
 		{
@@ -4732,7 +4758,7 @@ void Object::adjustModelConditionForWeaponStatus()
 			// then we might have a frame where we have reloaded and are ready-to-fire,
 			// but haven't fired yet this frame. in that case, use 'between' so we still have
 			// a firing pose, 'cuz if we use 'none' we will 'pop' back to idle for a frame. (srj)
-			// additional note: only do if aiming or firing, since we could also be in this state if 
+			// additional note: only do if aiming or firing, since we could also be in this state if
 			// we are approaching or pursuing a target! (srj)
 			if (newStatus == READY_TO_FIRE && conditionToSet == WSF_NONE && testStatus( OBJECT_STATUS_IS_ATTACKING ) &&
 					(testStatus( OBJECT_STATUS_IS_AIMING_WEAPON ) || testStatus( OBJECT_STATUS_IS_FIRING_WEAPON )))
@@ -4762,6 +4788,15 @@ void Object::adjustModelConditionForWeaponStatus()
 	}
 }
 
+//-------------------------------------------------------------------------------------------------
+Bool Object::hasGhostObject() const
+{
+	if (m_partitionData == NULL)
+		return false;
+
+	return m_partitionData->getGhostObject() != NULL;
+}
+
 //-------------------------------------------------------------------------------------------------
 /// We have moved a 'significant' amount, so do maintenence that can be considered 'cell-based'
 void Object::onPartitionCellChange()
@@ -4814,7 +4849,7 @@ void Object::addValue()
 		return;
 	}
 
-	if (!getControllingPlayer()) 
+	if (!getControllingPlayer())
 		return;
 
 	if( getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) || isEffectivelyDead() || getShroudClearingRange() <= 0.0f )
@@ -4845,8 +4880,8 @@ void Object::removeValue()
 		return;
 	}
 
-	ThePartitionManager->undoValueAffect(m_partitionLastValue->m_where.x, 
-																			 m_partitionLastValue->m_where.y, 
+	ThePartitionManager->undoValueAffect(m_partitionLastValue->m_where.x,
+																			 m_partitionLastValue->m_where.y,
 																			 m_partitionLastValue->m_howFar,
 																			 m_partitionLastValue->m_data,
 																			 m_partitionLastValue->m_forWhom
@@ -4863,8 +4898,8 @@ void Object::addThreat()
 		DEBUG_CRASH( ("An Object is adding threat, but hasn't removed his previous threat. (He hasn't finished the threat?)") );
 		return;
 	}
-	
-	if (!getControllingPlayer()) 
+
+	if (!getControllingPlayer())
 		return;
 
 	if( getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) || isEffectivelyDead() || getShroudClearingRange() <= 0.0f )
@@ -4895,8 +4930,8 @@ void Object::removeThreat()
 		return;
 	}
 
-	ThePartitionManager->undoThreatAffect(m_partitionLastThreat->m_where.x, 
-																			  m_partitionLastThreat->m_where.y, 
+	ThePartitionManager->undoThreatAffect(m_partitionLastThreat->m_where.x,
+																			  m_partitionLastThreat->m_where.y,
 																			  m_partitionLastThreat->m_howFar,
 																				m_partitionLastThreat->m_data,
 																			  m_partitionLastThreat->m_forWhom
@@ -4922,7 +4957,7 @@ void Object::look()
 		// I removed the check for objects under construction by request of designers since
 		// they want constructing objects to have a reduced sight range now. -MW
 		// dead or blind things don't reveal shroud
-		
+
 
 
 		// Some things get Destroyed directly without hitting Death.
@@ -4933,7 +4968,7 @@ void Object::look()
       if ( contain && !contain->isGarrisonable() )
           return;// dont look, 'cause you are in a tunnel, now
 			// GS 10-20 Need to expand that exception to all transports or else you get a perma reveal where
-			// you entered the transport.  Remember, this hackiness is caused by the fact that we never realized that 
+			// you entered the transport.  Remember, this hackiness is caused by the fact that we never realized that
 			// garrisoned buildings weren't looking, we were just seeing the leftover last look of the guy inside.
 			// Otherwise we'd just have enclosingContainer control looking which is the 'correct' answer.
 
@@ -4951,15 +4986,15 @@ void Object::look()
 					for( Int currentIndex = ThePlayerList->getPlayerCount() - 1; currentIndex >=0; currentIndex-- )
 					{
 						const Player *currentPlayer = ThePlayerList->getNthPlayer( currentIndex );
-						
-						// Build mask of of allies who can see me. 
+
+						// Build mask of of allies who can see me.
 						// This is the Object-centric game level that cares
 						if( getControllingPlayer()->getRelationship( currentPlayer->getDefaultTeam() ) == ALLIES )
 						{
 							lookingMask |= currentPlayer->getPlayerMask();
 						}
 					}
-					
+
 					// Other players can also be looking through our eyes.
 					lookingMask |= m_visionSpiedMask;
 				}
@@ -4971,7 +5006,7 @@ void Object::look()
 				m_partitionLastLook->m_forWhom = lookingMask;
 				m_partitionLastLook->m_howFar = getShroudClearingRange();
 
-	//			DEBUG_LOG(( "A %s looks at %f, %f for %x at range %f\n",
+	//			DEBUG_LOG(( "A %s looks at %f, %f for %x at range %f",
 	//									getTemplate()->getName().str(),
 	//									pos.x,
 	//									pos.y,
@@ -5015,13 +5050,13 @@ void Object::unlook()
 		return;
 	}
 
-	ThePartitionManager->queueUndoShroudReveal(m_partitionLastLook->m_where.x, 
-																				m_partitionLastLook->m_where.y, 
-																				m_partitionLastLook->m_howFar, 
+	ThePartitionManager->queueUndoShroudReveal(m_partitionLastLook->m_where.x,
+																				m_partitionLastLook->m_where.y,
+																				m_partitionLastLook->m_howFar,
 																				m_partitionLastLook->m_forWhom
 																				);
 
-//			DEBUG_LOG(( "A %s queues an unlook at %f, %f for %x at range %f\n",
+//			DEBUG_LOG(( "A %s queues an unlook at %f, %f for %x at range %f",
 //									getTemplate()->getName().str(),
 //									m_partitionLastLook.m_where.x,
 //									m_partitionLastLook.m_where.y,
@@ -5033,12 +5068,12 @@ void Object::unlook()
 
 	if( !m_partitionRevealAllLastLook->isInvalid() )
 	{
-		ThePartitionManager->queueUndoShroudReveal(m_partitionRevealAllLastLook->m_where.x, 
-																				m_partitionRevealAllLastLook->m_where.y, 
-																				m_partitionRevealAllLastLook->m_howFar, 
+		ThePartitionManager->queueUndoShroudReveal(m_partitionRevealAllLastLook->m_where.x,
+																				m_partitionRevealAllLastLook->m_where.y,
+																				m_partitionRevealAllLastLook->m_howFar,
 																				m_partitionRevealAllLastLook->m_forWhom
 																				);
-		
+
 		m_partitionRevealAllLastLook->reset();
 	}
 }
@@ -5070,8 +5105,8 @@ void Object::shroud()
 			}
 
 			Coord3D pos = *getPosition();
-			ThePartitionManager->doShroudCover(pos.x, pos.y, 
-				getShroudRange(), 
+			ThePartitionManager->doShroudCover(pos.x, pos.y,
+				getShroudRange(),
 				shroudingMask);
 
 			m_partitionLastShroud->m_where = pos;
@@ -5091,9 +5126,9 @@ void Object::unshroud()
 		return;
 	}
 
-	ThePartitionManager->undoShroudCover(m_partitionLastShroud->m_where.x, 
-		m_partitionLastShroud->m_where.y, 
-		m_partitionLastShroud->m_howFar, 
+	ThePartitionManager->undoShroudCover(m_partitionLastShroud->m_where.x,
+		m_partitionLastShroud->m_where.y,
+		m_partitionLastShroud->m_howFar,
 		m_partitionLastShroud->m_forWhom);
 
 	m_partitionLastShroud->reset();
@@ -5102,17 +5137,17 @@ void Object::unshroud()
 //-------------------------------------------------------------------------------------------------
 Real Object::getVisionRange() const
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_debugVisibility) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugVisibility)
 	{
 		Vector3 pos(m_visionRange, 0, 0);
-		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i) 
+		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i)
 		{
 			pos.Rotate_Z(1.0f * i / TheGlobalData->m_debugVisibilityTileCount * 2 * PI);
 			Coord3D coord = { pos.X + getPosition()->x, pos.Y + getPosition()->y, pos.Z + getPosition()->z };
 
-			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth, 
-											TheGlobalData->m_debugVisibilityTileDuration, 
+			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth,
+											TheGlobalData->m_debugVisibilityTileDuration,
 											TheGlobalData->m_debugVisibilityTargettableColor);
 		}
 	}
@@ -5132,23 +5167,23 @@ Real Object::getShroudClearingRange() const
 	Real shroudClearingRange=m_shroudClearingRange;
 
 	if( getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) )
-	{	
+	{
 		//structures under construction have limited vision range.  For now, base it
 		//on the geometry extents so the structure can only see itself.
 		shroudClearingRange = getGeometryInfo().getBoundingCircleRadius();
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_debugVisibility) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugVisibility)
 	{
 		Vector3 pos(shroudClearingRange, 0, 0);
-		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i) 
+		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i)
 		{
 			pos.Rotate_Z(1.0f * i / TheGlobalData->m_debugVisibilityTileCount * 2 * PI);
 			Coord3D coord = { pos.X + getPosition()->x, pos.Y + getPosition()->y, pos.Z + getPosition()->z };
 
-			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth, 
-											TheGlobalData->m_debugVisibilityTileDuration, 
+			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth,
+											TheGlobalData->m_debugVisibilityTileDuration,
 											TheGlobalData->m_debugVisibilityDeshroudColor);
 		}
 	}
@@ -5167,7 +5202,7 @@ void Object::setShroudClearingRange( Real newShroudClearingRange )
  		m_shroudClearingRange = newShroudClearingRange;
 
 		/*
-			Complete and total monkey hack fix. 
+			Complete and total monkey hack fix.
 
 			The problem: newObject doesn't get an initial pos, so all objects start at 0,0,0.
 			Most code paths instantly move 'em to a good pos, but in some cases, that is too late:
@@ -5180,7 +5215,7 @@ void Object::setShroudClearingRange( Real newShroudClearingRange )
 			object anyway and we should just ignore you.
 
 			Proper fix for next version is to require initial pos to be passed in to newObject so that
-			all objects can start at their proper initial position from the start of the ctor. 
+			all objects can start at their proper initial position from the start of the ctor.
 
 			(srj)
 		*/
@@ -5195,17 +5230,17 @@ void Object::setShroudClearingRange( Real newShroudClearingRange )
 //-------------------------------------------------------------------------------------------------
 Real Object::getShroudRange() const
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_debugVisibility) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugVisibility)
 	{
 		Vector3 pos(m_shroudRange, 0, 0);
-		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i) 
+		for (int i = 0; i < TheGlobalData->m_debugVisibilityTileCount; ++i)
 		{
 			pos.Rotate_Z(1.0f * i / TheGlobalData->m_debugVisibilityTileCount * 2 * PI);
 			Coord3D coord = { pos.X + getPosition()->x, pos.Y + getPosition()->y, pos.Z + getPosition()->z };
 
-			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth, 
-											TheGlobalData->m_debugVisibilityTileDuration, 
+			addIcon(&coord, TheGlobalData->m_debugVisibilityTileWidth,
+											TheGlobalData->m_debugVisibilityTileDuration,
 											TheGlobalData->m_debugVisibilityGapColor);
 		}
 	}
@@ -5241,7 +5276,7 @@ void Object::setVisionSpied(Bool setting, Int byWhom)
 	if( needRefresh )
 	{
 		PlayerMaskType workingMask = 0;
-		for (Int i = 0; i < MAX_PLAYER_COUNT; ++i) 
+		for (Int i = 0; i < MAX_PLAYER_COUNT; ++i)
 		{
 			if( m_visionSpiedBy[i] > 0 )
 				BitSet( workingMask, ( 1 << i ) );
@@ -5274,7 +5309,7 @@ void Object::notifySubdualDamage( Real amount )
 {
 	if(m_subdualDamageHelper)
 		m_subdualDamageHelper->notifySubdualDamage( amount );
-	
+
 	// If we are gaining subdual damage, we are slowly tinting
 	if( getDrawable() )
 	{
@@ -5319,7 +5354,7 @@ void Object::doSpecialPower( const SpecialPowerTemplate *specialPowerTemplate, U
 
 	if (isDisabled())
 		return;
-	
+
 	// sanity
 	if( !forced && TheSpecialPowerStore->canUseSpecialPower( this, specialPowerTemplate ) == FALSE )
 		return;
@@ -5339,7 +5374,7 @@ void Object::doSpecialPowerAtObject( const SpecialPowerTemplate *specialPowerTem
 
 	if (isDisabled())
 		return;
-	
+
 	// sanity
 	if( !forced && TheSpecialPowerStore->canUseSpecialPower( this, specialPowerTemplate ) == FALSE )
 		return;
@@ -5353,13 +5388,13 @@ void Object::doSpecialPowerAtObject( const SpecialPowerTemplate *specialPowerTem
 //-------------------------------------------------------------------------------------------------
 /** Execute special power */
 //-------------------------------------------------------------------------------------------------
-void Object::doSpecialPowerAtLocation( const SpecialPowerTemplate *specialPowerTemplate, 
+void Object::doSpecialPowerAtLocation( const SpecialPowerTemplate *specialPowerTemplate,
 																			 const Coord3D *loc, Real angle, UnsignedInt commandOptions, Bool forced )
 {
 
 	if (isDisabled())
 		return;
-	
+
 	// sanity
 	if( !forced && TheSpecialPowerStore->canUseSpecialPower( this, specialPowerTemplate ) == FALSE )
 		return;
@@ -5369,7 +5404,7 @@ void Object::doSpecialPowerAtLocation( const SpecialPowerTemplate *specialPowerT
 	if( mod )
 		mod->doSpecialPowerAtLocation( loc, angle, commandOptions );
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Execute special power */
@@ -5379,7 +5414,7 @@ void Object::doSpecialPowerUsingWaypoints( const SpecialPowerTemplate *specialPo
 
 	if (isDisabled())
 		return;
-	
+
 	// sanity
 	if( !forced && TheSpecialPowerStore->canUseSpecialPower( this, specialPowerTemplate ) == FALSE )
 		return;
@@ -5398,7 +5433,7 @@ void Object::doCommandButton( const CommandButton *commandButton, CommandSourceT
 {
 	if (isDisabled())
 		return;
-	
+
 	AIUpdateInterface *ai = getAIUpdateInterface();
 	if( commandButton )
 	{
@@ -5435,7 +5470,8 @@ void Object::doCommandButton( const CommandButton *commandButton, CommandSourceT
 					{
 						setWeaponLock( commandButton->getWeaponSlot(), LOCKED_TEMPORARILY );
 						//LOCATION BASED FIRE WEAPON
-						ai->aiAttackPosition( NULL, commandButton->getMaxShotsToFire(), cmdSource );
+						// TheSuperHackers @bugfix Caball009 09/08/2025 Position should be irrelevant, but aiAttackPosition requires a valid position pointer to avoid a crash.
+						ai->aiAttackPosition( getPosition(), commandButton->getMaxShotsToFire(), cmdSource );
 					}
 					else
 					{
@@ -5449,7 +5485,7 @@ void Object::doCommandButton( const CommandButton *commandButton, CommandSourceT
 			case GUI_COMMAND_PLAYER_UPGRADE:
 				{
 					const UpgradeTemplate *upgradeT = commandButton->getUpgradeTemplate();
-					DEBUG_ASSERTCRASH( upgradeT, ("Undefined upgrade '%s' in player upgrade command\n", "UNKNOWN") );
+					DEBUG_ASSERTCRASH( upgradeT, ("Undefined upgrade '%s' in player upgrade command", "UNKNOWN") );
 					// sanity
 					if( upgradeT == NULL )
 						break;
@@ -5488,7 +5524,7 @@ void Object::doCommandButton( const CommandButton *commandButton, CommandSourceT
 			case GUI_COMMAND_SELL:
 				TheBuildAssistant->sellObject( this );
 				return;
-			
+
 			//Feel free to implement object based command buttons.
 			case GUI_COMMAND_COMBATDROP:
 			case GUI_COMMAND_DOZER_CONSTRUCT_CANCEL:
@@ -5527,13 +5563,18 @@ void Object::doCommandButtonAtObject( const CommandButton *commandButton, Object
 {
 	if (isDisabled())
 		return;
-	
+
 	AIUpdateInterface *ai = getAIUpdateInterface();
 	if( commandButton )
 	{
 		switch( commandButton->getCommandType() )
 		{
 			case GUI_COMMAND_COMBATDROP:
+#if RETAIL_COMPATIBLE_CRC
+				if (!obj)
+					return;
+#endif
+
 				if( ai )
 				{
 					ai->aiCombatDrop( obj, *(obj->getPosition()), cmdSource );
@@ -5541,6 +5582,11 @@ void Object::doCommandButtonAtObject( const CommandButton *commandButton, Object
 				return;
 			case GUI_COMMAND_SPECIAL_POWER:
 			{
+#if RETAIL_COMPATIBLE_CRC
+				if (!obj)
+					return;
+#endif
+
 				if( commandButton->getSpecialPowerTemplate() )
 				{
 					CommandOption commandOptions = (CommandOption)(commandButton->getOptions() | COMMAND_FIRED_BY_SCRIPT);
@@ -5591,7 +5637,7 @@ void Object::doCommandButtonAtObject( const CommandButton *commandButton, Object
 					return;
 				}
 				break;
-				
+
 			case GUICOMMANDMODE_HIJACK_VEHICLE:
 			case GUICOMMANDMODE_CONVERT_TO_CARBOMB:
 			case GUICOMMANDMODE_SABOTAGE_BUILDING:
@@ -5642,7 +5688,7 @@ void Object::doCommandButtonAtPosition( const CommandButton *commandButton, cons
 {
 	if (isDisabled())
 		return;
-	
+
 	AIUpdateInterface *ai = getAIUpdateInterface();
 	if( commandButton )
 	{
@@ -5697,7 +5743,7 @@ void Object::doCommandButtonAtPosition( const CommandButton *commandButton, cons
 					return;
 				}
 				break;
-				
+
 			case GUI_COMMAND_DOZER_CONSTRUCT_CANCEL:
 			case GUI_COMMAND_UNIT_BUILD:
 			case GUI_COMMAND_CANCEL_UNIT_BUILD:
@@ -5740,7 +5786,7 @@ void Object::doCommandButtonUsingWaypoints( const CommandButton *commandButton,
 {
 	if (isDisabled())
 		return;
-	
+
 	if( commandButton )
 	{
 		if( !BitIsSet( commandButton->getOptions(), CAN_USE_WAYPOINTS ) )
@@ -5822,11 +5868,11 @@ ProductionUpdateInterface* Object::getProductionUpdateInterface( void )
 		if( pui )
 			return pui;
 
-	}  // end for
+	}
 
 	return NULL;
 
-}  // end getProductionUpdateInterface
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -5842,7 +5888,7 @@ DockUpdateInterface *Object::getDockUpdateInterface( void )
 
 	return NULL;
 
-}  // end getDockUpdateInterface
+}
 
 // ------------------------------------------------------------------------------------------------
 // Search our special power modules for a specific one.
@@ -5858,7 +5904,7 @@ SpecialPowerModuleInterface* Object::findSpecialPowerModuleInterface( SpecialPow
 		const SpecialPowerTemplate *spTemplate = sp->getSpecialPowerTemplate();
 		if (spTemplate && spTemplate->getSpecialPowerType() == type || type == SPECIAL_INVALID )
 		{
-			return sp; 
+			return sp;
 		}
 	}
 	return NULL;
@@ -5878,7 +5924,7 @@ SpecialPowerModuleInterface* Object::findAnyShortcutSpecialPowerModuleInterface(
 		const SpecialPowerTemplate *spTemplate = sp->getSpecialPowerTemplate();
 		if( spTemplate && spTemplate->isShortcutPower() )
 		{
-			return sp; 
+			return sp;
 		}
 	}
 	return NULL;
@@ -5898,7 +5944,7 @@ SpawnBehaviorInterface* Object::getSpawnBehaviorInterface() const
 		}
 	}
 	return NULL;
-}  // end getSpawnBehaviorInterfaceFromObject
+}
 
 // ------------------------------------------------------------------------------------------------
 ProjectileUpdateInterface* Object::getProjectileUpdateInterface() const
@@ -5929,7 +5975,7 @@ SpecialPowerUpdateInterface* Object::findSpecialPowerWithOverridableDestinationA
 				return spInterface;
 			}
 		}
-	}  // end for
+	}
 	return NULL;
 }
 
@@ -5948,7 +5994,7 @@ SpecialPowerUpdateInterface* Object::findSpecialPowerWithOverridableDestination(
 				return spInterface;
 			}
 		}
-	}  // end for
+	}
 	return NULL;
 }
 
@@ -5969,7 +6015,7 @@ SpecialAbilityUpdate* Object::findSpecialAbilityUpdate( SpecialPowerType type )
 				return spUpdate;
 			}
 		}
-	}  // end for
+	}
 
 	return NULL;
 }
@@ -5998,9 +6044,9 @@ Bool Object::getSingleLogicalBonePosition(const char* boneName, Coord3D* positio
 	}
 	else
 	{
-		if (position) 
+		if (position)
 			*position = *getPosition();
-		if (transform) 
+		if (transform)
 			*transform = *getTransformMatrix();
 		return false;
 	}
@@ -6026,11 +6072,11 @@ Bool Object::getSingleLogicalBonePositionOnTurret( WhichTurretType whichTurret,
 
 	Matrix3D boneOffset(TRUE);// This will be from the turret to the requested bone
 
-//	Vector3 bonePositionVector(	bonePosition.x - turretPosition.x, 
-//															bonePosition.y - turretPosition.y, 
+//	Vector3 bonePositionVector(	bonePosition.x - turretPosition.x,
+//															bonePosition.y - turretPosition.y,
 //															bonePosition.z - turretPosition.z );
-	Vector3 bonePositionVector(	bonePosition.x, 
-															bonePosition.y, 
+	Vector3 bonePositionVector(	bonePosition.x,
+															bonePosition.y,
 															bonePosition.z );
 	boneOffset.Translate(bonePositionVector);
 
@@ -6062,8 +6108,8 @@ Bool Object::getSingleLogicalBonePositionOnTurret( WhichTurretType whichTurret,
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Int Object::getMultiLogicalBonePosition(const char* boneNamePrefix, Int maxBones, 
-																				Coord3D* positions, Matrix3D* transforms, 
+Int Object::getMultiLogicalBonePosition(const char* boneNamePrefix, Int maxBones,
+																				Coord3D* positions, Matrix3D* transforms,
 																				Bool convertToWorld ) const
 {
 	Int count;
@@ -6083,10 +6129,10 @@ Int Object::getMultiLogicalBonePosition(const char* boneNamePrefix, Int maxBones
 }
 
 //=============================================================================
-const AsciiString& Object::getCommandSetString() const 
-{ 
+const AsciiString& Object::getCommandSetString() const
+{
 	if (m_commandSetStringOverride.isNotEmpty())
-		return m_commandSetStringOverride; 
+		return m_commandSetStringOverride;
 
 	return getTemplate()->friend_getCommandSetString();
 }
@@ -6103,7 +6149,7 @@ Bool Object::canProduceUpgrade( const UpgradeTemplate *upgrade )
 	for( Int buttonIndex = 0; buttonIndex < MAX_COMMANDS_PER_SET; buttonIndex++ )
 	{
 		const CommandButton *button = set->getCommandButton(buttonIndex);
-		if( button  &&  button->getUpgradeTemplate()  &&  (button->getUpgradeTemplate() == upgrade) )		
+		if( button  &&  button->getUpgradeTemplate()  &&  (button->getUpgradeTemplate() == upgrade) )
 			return TRUE; // getUpgradeTemplate only returns something if it is actually an upgrade
 	}
 
@@ -6115,7 +6161,7 @@ Bool Object::canProduceUpgrade( const UpgradeTemplate *upgrade )
 //=============================================================================
 void Object::defect( Team* newTeam, UnsignedInt detectionTime )
 {
-	if ( isContained() ) //@todo (KRIS?) make contained units unselectable, until then... lorenzen 
+	if ( isContained() ) //@todo (KRIS?) make contained units unselectable, until then... lorenzen
 	{
 		return;
 	}
@@ -6127,17 +6173,17 @@ void Object::defect( Team* newTeam, UnsignedInt detectionTime )
 	Team* myTeam = player->getDefaultTeam();
 	if ( myTeam == newTeam ) // can't defect from my own team, that would be silly
 		return;
-	
+
 	// things that are under construction, or sold, cannot defect.
 	if (testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) ||
 			testStatus(OBJECT_STATUS_SOLD))
 	{
 		return;
-	}	
+	}
 
 	// Before switch ////////////////////////////////////////
 
-	//Design says: 
+	//Design says:
 	ProductionUpdateInterface *production = getProductionUpdateInterface();
 	if ( production )
 	{
@@ -6146,7 +6192,7 @@ void Object::defect( Team* newTeam, UnsignedInt detectionTime )
 
 	// pop it up on the radar, so as to warn those who care
 	// do this first, since after setTeam() the infiltrator
-	// becomes the controllingplayer, not me 
+	// becomes the controllingplayer, not me
 
 	// But don't do this is if the new team is not a real team.  "'Enemy' infiltration" wouldn't make
 	// sense, and we are probably just reverting a cave or something.
@@ -6164,7 +6210,7 @@ void Object::defect( Team* newTeam, UnsignedInt detectionTime )
 	setTeam( newTeam );
 
 	// After switch ////////////////////////////////////////
-	
+
 	AIUpdateInterface *ai = getAI();
 
 	handlePartitionCellMaintenance();// to clear the shoud for my new master
@@ -6188,7 +6234,7 @@ void Object::defect( Team* newTeam, UnsignedInt detectionTime )
 		defectorTimerSound.setObjectID( getID() );
 		TheAudio->addAudioEvent(&defectorTimerSound);
 	}
-	
+
 	ContainModuleInterface *ct = getContain();
 	if( ct  &&  ct->isKickOutOnCapture() )
 	{
@@ -6242,12 +6288,10 @@ void Object::goInvulnerable( UnsignedInt time )
 // ------------------------------------------------------------------------------------------------
 /** Return the radar priority for this object type */
 // ------------------------------------------------------------------------------------------------
-RadarPriorityType Object::getRadarPriority( void ) const 
+RadarPriorityType Object::getRadarPriority( void ) const
 {
-	RadarPriorityType priority = RADAR_PRIORITY_INVALID;
-
 	// first, get the priority at the thing template level
-	priority = getTemplate()->getDefaultRadarPriority();
+	RadarPriorityType priority = getTemplate()->getDefaultRadarPriority();
 
 	//
 	// there are some objects that we want to show up on the radar when they have
@@ -6269,7 +6313,7 @@ RadarPriorityType Object::getRadarPriority( void ) const
 			priority = RADAR_PRIORITY_STRUCTURE;
 
 
-	}  // end if
+	}
 
 	// Carbombs will show up as units regardless of their default priority
 	if ( testStatus( OBJECT_STATUS_IS_CARBOMB ) )
@@ -6279,33 +6323,41 @@ RadarPriorityType Object::getRadarPriority( void ) const
 	// return the priority we're going to use
 	return priority;
 
-}  // end getRadarPriority
+}
 
 // ------------------------------------------------------------------------------------------------
 AIGroup *Object::getGroup(void)
 {
+#if RETAIL_COMPATIBLE_AIGROUP
 	return m_group;
+#else
+	return m_group.Peek();
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------
 void Object::enterGroup( AIGroup *group )
 {
-//	DEBUG_LOG(("***AIGROUP %x involved in enterGroup on %x\n", group, this));
+//	DEBUG_LOG(("***AIGROUP %x involved in enterGroup on %x", group, this));
 	// if we are in another group, remove ourselves from it first
 	leaveGroup();
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	m_group = group;
+#else
+	m_group = AIGroupPtr::Create_AddRef(group);
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------
 void Object::leaveGroup( void )
 {
-//	DEBUG_LOG(("***AIGROUP %x involved in leaveGroup on %x\n", m_group, this));
+//	DEBUG_LOG(("***AIGROUP %x involved in leaveGroup on %x", m_group, this));
 	// if we are in a group, remove ourselves from it
 	if (m_group)
 	{
 		// to avoid recursion, set m_group to NULL before removing
-		AIGroup *group = m_group;
+		AIGroupPtr group = m_group;
 		m_group = NULL;
 		group->remove( this );
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
index 9500d090113..215763f9c50 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_SHADOW_NAMES								// for TheShadowNames[]
 #define DEFINE_WEAPONSLOTTYPE_NAMES
@@ -73,11 +73,6 @@
 
 #include "Common/CRCDebug.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
@@ -128,11 +123,11 @@ Object* ObjectCreationNugget::create( const Object *primaryObj, const Coord3D *p
 //-------------------------------------------------------------------------------------------------
 class FireWeaponNugget : public ObjectCreationNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FireWeaponNugget, "FireWeaponNugget")		
-	
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(FireWeaponNugget, "FireWeaponNugget")
+
 public:
 
-	FireWeaponNugget() : 
+	FireWeaponNugget() :
     m_weapon(NULL)
 	{
 	}
@@ -140,7 +135,7 @@ class FireWeaponNugget : public ObjectCreationNugget
 	virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const
 	{
 		if (!primaryObj || !primary || !secondary)
-		{ 
+		{
 			DEBUG_CRASH(("You must have a primary and secondary source for this effect"));
       return NULL;
     }
@@ -154,7 +149,7 @@ class FireWeaponNugget : public ObjectCreationNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "Weapon", INI::parseWeaponTemplate,	NULL, offsetof( FireWeaponNugget, m_weapon ) },
 			{ 0, 0, 0, 0 }
@@ -167,17 +162,17 @@ class FireWeaponNugget : public ObjectCreationNugget
 
 private:
 	const WeaponTemplate* m_weapon;
-};  
+};
 EMPTY_DTOR(FireWeaponNugget)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 class AttackNugget : public ObjectCreationNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AttackNugget, "AttackNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AttackNugget, "AttackNugget")
 public:
 
-	AttackNugget() : 
+	AttackNugget() :
     m_numberOfShots(1),
 		m_weaponSlot(PRIMARY_WEAPON),
 		m_deliveryDecalRadius(0)
@@ -187,7 +182,7 @@ class AttackNugget : public ObjectCreationNugget
 	virtual Object* create( const Object* primaryObj, const Coord3D *primary, const Coord3D* secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const
 	{
 		if (!primaryObj || !primary || !secondary)
-		{ 
+		{
 			DEBUG_CRASH(("You must have a primary and secondary source for this effect"));
       return NULL;
     }
@@ -195,7 +190,7 @@ class AttackNugget : public ObjectCreationNugget
 		// Star trekkin, across the universe.
 		// Boldly goin forward now, cause we can't find reverse!
 
-		// 1:30 left on the clock, Demo looming, should I de-const all of OCL since this one effect needs the 
+		// 1:30 left on the clock, Demo looming, should I de-const all of OCL since this one effect needs the
 		// Primary to help make the objects?  Should I rewrite superweapons to completely subsume them
 		// into normal special powers, so I can have a spell attack with a global timer and a spinny clock?
 		// Should I const cast?  Should I eat them?  No!  I'd rather hurt them stomp them crush them hurt them
@@ -222,7 +217,7 @@ class AttackNugget : public ObjectCreationNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "NumberOfShots",	INI::parseInt,				NULL, offsetof( AttackNugget, m_numberOfShots ) },
 			{ "WeaponSlot",			INI::parseLookupList,	TheWeaponSlotTypeNamesLookupList, offsetof( AttackNugget, m_weaponSlot ) },
@@ -241,17 +236,17 @@ class AttackNugget : public ObjectCreationNugget
 	Real								m_deliveryDecalRadius;
 	Int									m_numberOfShots;
 	WeaponSlotType			m_weaponSlot;
-};  
+};
 EMPTY_DTOR(AttackNugget)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 class DeliverPayloadNugget : public ObjectCreationNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DeliverPayloadNugget, "DeliverPayloadNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DeliverPayloadNugget, "DeliverPayloadNugget")
 public:
 
-	DeliverPayloadNugget() : 
+	DeliverPayloadNugget() :
 		m_startAtPreferredHeight(true),
 		m_startAtMaxSpeed(false),
 		m_formationSize(1),
@@ -261,15 +256,9 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		m_convergenceFactor( 0.0f )
 	{
 		//Note: m_data is constructed with default values.
-		
-		// Added by Sadullah Nader
-		// Initialization missing and needed
-		
 		m_payload.clear();
 		m_putInContainerName.clear();
 		m_transportName.clear();
-
-		// End Add
 	}
 
 	virtual Object* create(const Object *primaryObj, const Coord3D *primary, const Coord3D *secondary, Real angle, UnsignedInt lifetimeFrames = 0 ) const
@@ -288,8 +277,8 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		Team* owner = primaryObj ? primaryObj->getControllingPlayer()->getDefaultTeam() : NULL;
 
 
-		//What I'm doing for the purposes of the formations is to calculate the relative positions of 
-		//each member of the formation. To do so, we take the vector from the target location to the 
+		//What I'm doing for the purposes of the formations is to calculate the relative positions of
+		//each member of the formation. To do so, we take the vector from the target location to the
 		//lead plane location, normalize it, then rotate it 90 degrees (CW and CCW). When we add the
 		//resultant vectors to the initial vectors, we can calculate the delta positions for each plane.
 		Real CCWx = 0.0f, CCWy = 0.0f, CWx = 0.0f, CWy = 0.0f;
@@ -299,7 +288,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 			//Get the delta x and y values from the target to the origin.
 			Real dx = primary->x - secondary->x;
 			Real dy = primary->y - secondary->y;
-			
+
 			//Calc length
 			Real length = sqrt( dx*dx + dy*dy );
 
@@ -320,7 +309,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 			CWx = dx * c + dy * -s + dx;
 			CWy = dx * s + dy * c + dy;
 		}
-		
+
 		Object *firstTransport = NULL;
 		for( UnsignedInt formationIndex = 0; formationIndex < m_formationSize; formationIndex++ )
 		{
@@ -350,9 +339,9 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 
 			Coord3D targetPos = *secondary;
 
-			
-			//Our target position only applies when using fireweapon and when we have multiple planes, 
-			//as is the case with the napalm strike. The target position either be somewhere between the 
+
+			//Our target position only applies when using fireweapon and when we have multiple planes,
+			//as is the case with the napalm strike. The target position either be somewhere between the
 			//moveToPos of the lead plane and that of the relative offset -- determined by the convergenceFactor.
 			targetPos.x += offset.x * (1.0f - m_convergenceFactor);
 			targetPos.y += offset.y * (1.0f - m_convergenceFactor);
@@ -434,7 +423,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 						physics->applyMotiveForce( &startingForce );
 					}
 				}
-				
+
 				// only the first guy in each formation gets a delivery decal
 				DeliverPayloadData data = m_data;
 				if (formationIndex != 0)
@@ -452,7 +441,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 					const ThingTemplate* payloadTmpl = TheThingFactory->findTemplate(it->m_payloadName);
 					if( !payloadTmpl )
 					{
-						DEBUG_CRASH( ("DeliverPayloadNugget::create() -- %s couldn't create %s (template not found).", 
+						DEBUG_CRASH( ("DeliverPayloadNugget::create() -- %s couldn't create %s (template not found).",
 							transport->getTemplate()->getName().str(), it->m_payloadName.str() ) );
 						return NULL;
 					}
@@ -524,7 +513,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		const char* name = ini->getNextToken();
 		const char* countStr = ini->getNextTokenOrNull();
 		Int count = countStr ? INI::scanInt(countStr) : 1;
-		
+
 		Payload p;
 		p.m_payloadName.set(name);
 		p.m_payloadCount = count;
@@ -533,7 +522,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			//***************************************************************
 			//OBJECT CREATION LIST SPECIFIC DATA -- once created data no longer needed
@@ -554,7 +543,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 			{ "PutInContainer",						INI::parseAsciiString,				NULL, offsetof( DeliverPayloadNugget, m_putInContainerName) },
 			//END OBJECT CREATION LIST SPECIFIC DATA
 			//***************************************************************
-			
+
 			//***************************************************************
 			//DELIVERPAYLOADDATA contains the rest (and most) of the parsed data.
 			//***************************************************************
@@ -592,7 +581,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 
 	//AI specific data passed over to DeliverPayloadAIUpdate::deliver()
 	DeliverPayloadData		m_data;
-};  
+};
 EMPTY_DTOR(DeliverPayloadNugget)
 
 //-------------------------------------------------------------------------------------------------
@@ -618,10 +607,10 @@ static void calcRandomForce(Real minMag, Real maxMag, Real minPitch, Real maxPit
 //-------------------------------------------------------------------------------------------------
 class ApplyRandomForceNugget : public ObjectCreationNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ApplyRandomForceNugget, "ApplyRandomForceNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ApplyRandomForceNugget, "ApplyRandomForceNugget")
 public:
 
-	ApplyRandomForceNugget() : 
+	ApplyRandomForceNugget() :
 		m_spinRate(0.0f),
 		m_minMag(0.0f),
 		m_maxMag(0.0f),
@@ -669,7 +658,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 
 	static void parse(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "SpinRate",					INI::parseAngularVelocityReal,	NULL, offsetof(ApplyRandomForceNugget, m_spinRate) },
 			{ "MinForceMagnitude",	INI::parseReal,	NULL, offsetof(ApplyRandomForceNugget, m_minMag) },
@@ -690,7 +679,7 @@ class ApplyRandomForceNugget : public ObjectCreationNugget
 	Real											m_spinRate;
 	Real											m_minMag, m_maxMag;
 	Real											m_minPitch, m_maxPitch;
-};  
+};
 EMPTY_DTOR(ApplyRandomForceNugget)
 
 //-------------------------------------------------------------------------------------------------
@@ -707,7 +696,7 @@ enum DebrisDisposition CPP_11(: Int)
 	WHIRLING								= 0x00000100
 };
 
-static const char* DebrisDispositionNames[] =
+static const char* const DebrisDispositionNames[] =
 {
 	"LIKE_EXISTING",
 	"ON_GROUND_ALIGNED",
@@ -718,6 +707,7 @@ static const char* DebrisDispositionNames[] =
 	"FLOATING",
 	"INHERIT_VELOCITY",
 	"WHIRLING",
+	NULL
 };
 
 std::vector<AsciiString>	debrisModelNamesGlobalHack;
@@ -729,18 +719,18 @@ static void parseFrictionPerSec( INI* ini, void * /*instance*/, void *store, con
 	Real fricPerSec = INI::scanReal(ini->getNextToken());
 	Real fricPerFrame = fricPerSec * SECONDS_PER_LOGICFRAME_REAL;
 	*(Real *)store = fricPerFrame;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 class GenericObjectCreationNugget : public ObjectCreationNugget
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GenericObjectCreationNugget, "GenericObjectCreationNugget")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(GenericObjectCreationNugget, "GenericObjectCreationNugget")
 public:
 
-	GenericObjectCreationNugget() : 
+	GenericObjectCreationNugget() :
 		m_requiresLivePlayer(FALSE),
-		m_debrisToGenerate(1), 
-		m_mass(0), 
+		m_debrisToGenerate(1),
+		m_mass(0),
 		m_extraBounciness(0),
 		m_extraFriction(0),
 		m_disposition(ON_GROUND_ALIGNED),
@@ -768,9 +758,9 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		m_fadeIn(false),
 		m_fadeOut(false),
 		m_fadeFrames(0),
-		m_fadeSoundName(AsciiString::TheEmptyString), // Added By Sadullah Nader
-		m_particleSysName(AsciiString::TheEmptyString), // Added By Sadullah Nader
-		m_putInContainer(AsciiString::TheEmptyString), // Added By Sadullah Nader
+		m_fadeSoundName(AsciiString::TheEmptyString),
+		m_particleSysName(AsciiString::TheEmptyString),
+		m_putInContainer(AsciiString::TheEmptyString),
 		m_minMag(0.0f),
 		m_maxMag(0.0f),
 		m_minPitch(0.0f),
@@ -780,11 +770,9 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		m_shadowType(SHADOW_NONE),
 		m_fxFinal(NULL),
 		m_preserveLayer(true),
-		m_objectCount(0) // Added By Sadullah Nader
+		m_objectCount(0)
 	{
-		// Change Made by Sadullah Nader
-		// for init purposes, easier to read
-		m_offset.zero(); 
+		m_offset.zero();
 	}
 
 	virtual Object* create(const Object* primary, const Object* secondary, UnsignedInt lifetimeFrames = 0 ) const
@@ -863,7 +851,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 	static void parseObject(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "ContainInsideSourceObject", INI::parseBool, NULL, offsetof( GenericObjectCreationNugget, m_containInsideSourceObject) },
 			{ "ObjectNames",				parseDebrisObjectNames,		NULL, 0 },
@@ -891,7 +879,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 	static void parseDebris(INI *ini, void *instance, void* /*store*/, const void* /*userData*/)
 	{
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "ModelNames",							parseDebrisObjectNames,							NULL,					0 },
 			{ "Mass",										INI::parsePositiveNonZeroReal,			NULL,					offsetof( GenericObjectCreationNugget, m_mass ) },
@@ -913,7 +901,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 		ini->initFromINIMulti(nugget, p);
 
-		DEBUG_ASSERTCRASH(nugget->m_mass > 0.0f, ("Zero masses are not allowed for debris!\n"));
+		DEBUG_ASSERTCRASH(nugget->m_mass > 0.0f, ("Zero masses are not allowed for debris!"));
 		((ObjectCreationList*)instance)->addObjectCreationNugget(nugget);
 	}
 
@@ -929,11 +917,11 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 protected:
 
 	void doStuffToObj(
-		Object* obj, 
-		const AsciiString& modelName, 
-		const Coord3D *pos, 
-		const Matrix3D *mtx, 
-		Real orientation, 
+		Object* obj,
+		const AsciiString& modelName,
+		const Coord3D *pos,
+		const Matrix3D *mtx,
+		Real orientation,
 		const Object *sourceObj,
 		UnsignedInt lifetimeFrames
 	) const
@@ -956,7 +944,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				lup->setLifetimeRange(m_minFrames, m_maxFrames);
 			}
 		}
-		
+
 		if (!m_nameAreObjects)
 		{
 			for (DrawModule** dm = obj->getDrawable()->getDrawModules(); *dm; ++dm)
@@ -965,7 +953,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				if (di)
 				{
 					di->setModelName(modelName, m_okToChangeModelColor ? obj->getIndicatorColor() : 0, m_shadowType);
-					if (m_animSets.size() > 0)
+					if (!m_animSets.empty())
 					{
 						Int which = GameLogicRandomValue(0, m_animSets.size()-1);
 						di->setAnimNames(m_animSets[which].m_animInitial, m_animSets[which].m_animFlying, m_animSets[which].m_animFinal, m_fxFinal);
@@ -982,7 +970,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		chunkPos.x = pos->x + offset.x;
 		chunkPos.y = pos->y + offset.y;
 		chunkPos.z = pos->z + offset.z;
-		
+
 		if (!m_particleSysName.isEmpty())
 		{
 			const ParticleSystemTemplate *tmp = TheParticleSystemManager->findTemplate(m_particleSysName);
@@ -992,7 +980,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				sys->attachToObject(obj);
 			}
 		}
-		
+
 		if (m_ignorePrimaryObstacle)
 		{
 			PhysicsBehavior* p = obj->getPhysics();
@@ -1019,7 +1007,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 		if (m_inheritsVeterancy && sourceObj && obj->getExperienceTracker()->isTrainable())
 		{
-			DEBUG_LOG(("Object %s inherits veterancy level %d from %s\n",
+			DEBUG_LOG(("Object %s inherits veterancy level %d from %s",
 				obj->getTemplate()->getName().str(), sourceObj->getVeterancyLevel(), sourceObj->getTemplate()->getName().str()));
 			VeterancyLevel v = sourceObj->getVeterancyLevel();
 			obj->getExperienceTracker()->setVeterancyLevel(v);
@@ -1031,7 +1019,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 		if ( m_invulnerableTime > 0 )
 		{
-			obj->goInvulnerable( m_invulnerableTime ); 
+			obj->goInvulnerable( m_invulnerableTime );
 		}
 
 		if( BitIsSet( m_disposition, INHERIT_VELOCITY ) && sourceObj )
@@ -1056,7 +1044,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				PhysicsBehavior* physics = obj->getPhysics();
 				if (physics)
 					physics->setAllowToFall(true);
-			}	
+			}
 
       //Lorenzen sez:
       //Since the sneak attack is a structure created with an ocl, it bypasses a lot of the
@@ -1140,7 +1128,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 					DUMPREAL(m_mass);
 					objUp->setMass( m_mass );
 				}
-				DEBUG_ASSERTCRASH(objUp->getMass() > 0.0f, ("Zero masses are not allowed for obj!\n"));
+				DEBUG_ASSERTCRASH(objUp->getMass() > 0.0f, ("Zero masses are not allowed for obj!"));
 
 				objUp->setExtraBounciness(m_extraBounciness);
 				objUp->setExtraFriction(m_extraFriction);
@@ -1148,7 +1136,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				objUp->setBounceSound(&m_bounceSound);
 				DUMPREAL(m_extraBounciness);
 				DUMPREAL(m_extraFriction);
-				
+
 				// if omitted from INI, calc it based on intensity.
 				Real spinRate		= m_spinRate >= 0.0f ? m_spinRate : (PI/32.0f) * m_dispositionIntensity;
 
@@ -1161,7 +1149,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				DUMPREAL(yawRate);
 				DUMPREAL(rollRate);
 				DUMPREAL(pitchRate);
-				
+
 				Real yaw = GameLogicRandomValueReal( -yawRate, yawRate );
 				Real roll = GameLogicRandomValueReal( -rollRate, rollRate );
 				Real pitch = GameLogicRandomValueReal( -pitchRate, pitchRate );
@@ -1184,8 +1172,8 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				else if (BitIsSet(m_disposition, SEND_IT_UP) )
 				{
 					Real horizForce = 2.0f * m_dispositionIntensity;
-					Real vertForce = 4.0f * m_dispositionIntensity;	
-					
+					Real vertForce = 4.0f * m_dispositionIntensity;
+
 					force.x = GameLogicRandomValueReal( -horizForce, horizForce );
 					force.y = GameLogicRandomValueReal( -horizForce, horizForce );
 					force.z = GameLogicRandomValueReal( vertForce * 0.75f, vertForce );
@@ -1193,7 +1181,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 					DUMPREAL(vertForce);
 					DUMPCOORD3D(&force);
 				}
-				else 
+				else
 				{
 					calcRandomForce(m_minMag, m_maxMag, m_minPitch, m_maxPitch, &force);
 					DUMPREAL(m_minMag);
@@ -1232,7 +1220,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				objUp->setPitchRate(pitch);
 			}
 		}
-		
+
 		if( BitIsSet( m_disposition, FLOATING ) )
 		{
 			static NameKeyType key = NAMEKEY( "FloatUpdate" );
@@ -1261,7 +1249,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				TheGameLogic->destroyObject(obj);
 			}
 		}
-    
+
 
 
     if ( m_diesOnBadLand && obj )
@@ -1281,19 +1269,19 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 		    damageInfo.in.m_amount = HUGE_DAMAGE_AMOUNT;
 		    obj->attemptDamage( &damageInfo );
 	    }
-	    
+
 	    // Kill if materialized on impassable ground
 	    Int cellX = REAL_TO_INT( obj->getPosition()->x / PATHFIND_CELL_SIZE );
 	    Int cellY = REAL_TO_INT( obj->getPosition()->y / PATHFIND_CELL_SIZE );
-	    
+
 	    PathfindCell* cell = TheAI->pathfinder()->getCell( obj->getLayer(), cellX, cellY );
 	    PathfindCell::CellType cellType = cell ? cell->getType() : PathfindCell::CELL_IMPASSABLE;
-	    
-	    // If we land outside the map, we die too.  
+
+	    // If we land outside the map, we die too.
 	    // Otherwise we exist outside the PartitionManger like a cheater.
-	  if( obj->isOffMap() 
-      || (cellType == PathfindCell::CELL_CLIFF) 
-      || (cellType == PathfindCell::CELL_WATER) 
+	  if( obj->isOffMap()
+      || (cellType == PathfindCell::CELL_CLIFF)
+      || (cellType == PathfindCell::CELL_WATER)
       || (cellType == PathfindCell::CELL_IMPASSABLE) )
 	    {
 		    // We are sorry, for reasons beyond our control, we are experiencing technical difficulties. Please die.
@@ -1301,7 +1289,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 	    }
 
   // Note: for future enhancement of this feature, we should test the object against the cell type he is on,
-  // using obj->getAI()->hasLocomotorForSurface( __ ). We cshould not assume here that the object can not 
+  // using obj->getAI()->hasLocomotorForSurface( __ ). We cshould not assume here that the object can not
   // find happiness on cliffs or water or whatever.
 
 
@@ -1316,7 +1304,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 	{
 		static const ThingTemplate* debrisTemplate = TheThingFactory->findTemplate("GenericDebris");
 
-		if (m_names.size() <= 0)
+		if (m_names.empty())
 			return NULL;
 
 		if (m_requiresLivePlayer && (!sourceObj || !sourceObj->getControllingPlayer() || !sourceObj->getControllingPlayer()->isPlayerActive()))
@@ -1327,7 +1315,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 		if( sourceObj && sourceObj->getControllingPlayer() )
 			debrisOwner = sourceObj->getControllingPlayer()->getDefaultTeam();
-		
+
 		Object* container = NULL;
 		Object *firstObject = NULL;
 		if (!m_putInContainer.isEmpty())
@@ -1362,7 +1350,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 
 				tmpl = debrisTemplate;
 			}
-			DEBUG_ASSERTCRASH(tmpl, ("Object %s not found\n",m_names[pick].str()));
+			DEBUG_ASSERTCRASH(tmpl, ("Object %s not found",m_names[pick].str()));
 			if (!tmpl)
 				continue;
 
@@ -1392,7 +1380,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 			// objects that are placed in the same location are no longer placed in a
 			// diagonal line but rather in random locations nearby, this logic will no
 			// longer be necessary and can be taken out -- amit
-			if (m_spreadFormation) 
+			if (m_spreadFormation)
 			{
 				Coord3D resultPos;
 				FindPositionOptions fpOptions;
@@ -1402,13 +1390,13 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				ThePartitionManager->findPositionAround(pos, &fpOptions, &resultPos);
 				doStuffToObj( debris, m_names[pick], &resultPos, mtx, orientation, sourceObj, lifetimeFrames );
 			}
-			else 
+			else
 			{
 				// do stuff to contained objects too
 				doStuffToObj( debris, m_names[pick], pos, mtx, orientation, sourceObj, lifetimeFrames );
 			}
 
-			if (m_fadeIn) 
+			if (m_fadeIn)
 			{
 				AudioEventRTS fadeAudioEvent(m_fadeSoundName);
 				fadeAudioEvent.setObjectID(sourceObj->getID());
@@ -1416,7 +1404,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 				debris->getDrawable()->fadeIn(m_fadeFrames);
 			}
 
-			if (m_fadeOut) 
+			if (m_fadeOut)
 			{
 				AudioEventRTS fadeAudioEvent(m_fadeSoundName);
 				fadeAudioEvent.setObjectID(sourceObj->getID());
@@ -1425,9 +1413,14 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 			}
 		}
 
+#if !RETAIL_COMPATIBLE_CRC && !PRESERVE_RETAIL_BEHAVIOR
+		ObjectID sinkID = sourceObj->getExperienceTracker()->getExperienceSink();
+		firstObject->getExperienceTracker()->setExperienceSink(sinkID != INVALID_ID ? sinkID : sourceObj->getID());
+#endif
+
 		if (container)
 			doStuffToObj( container, AsciiString::TheEmptyString, pos, mtx, orientation, sourceObj, lifetimeFrames );
-    
+
 		return firstObject;
 	}
 
@@ -1495,7 +1488,7 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
   Bool                      m_diesOnBadLand;
 	Bool											m_skipIfSignificantlyAirborne;
 
-};  
+};
 EMPTY_DTOR(GenericObjectCreationNugget)
 
 //-------------------------------------------------------------------------------------------------
@@ -1506,13 +1499,13 @@ EMPTY_DTOR(GenericObjectCreationNugget)
 //-------------------------------------------------------------------------------------------------
 static const FieldParse TheObjectCreationListFieldParse[] =
 {
-	{ "CreateObject",			GenericObjectCreationNugget::parseObject, 0, 0},		
-	{ "CreateDebris",			GenericObjectCreationNugget::parseDebris, 0, 0},		
+	{ "CreateObject",			GenericObjectCreationNugget::parseObject, 0, 0},
+	{ "CreateDebris",			GenericObjectCreationNugget::parseDebris, 0, 0},
 	{ "ApplyRandomForce",	ApplyRandomForceNugget::parse, 0, 0},
 	{ "DeliverPayload",		DeliverPayloadNugget::parse, 0, 0},
 	{ "FireWeapon",				FireWeaponNugget::parse, 0, 0},
 	{ "Attack",						AttackNugget::parse, 0, 0},
-	{ NULL, NULL, 0, 0 }  // keep this last
+	{ NULL, NULL, 0, 0 }
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -1588,8 +1581,7 @@ ObjectCreationListStore::~ObjectCreationListStore()
 {
 	for (ObjectCreationNuggetVector::iterator i = m_nuggets.begin(); i != m_nuggets.end(); ++i)
 	{
-		if (*i)
-			deleteInstance(*i);
+		deleteInstance(*i);
 	}
 	m_nuggets.clear();
 }
@@ -1601,7 +1593,7 @@ const ObjectCreationList *ObjectCreationListStore::findObjectCreationList(const
 		return NULL;
 
   ObjectCreationListMap::const_iterator it = m_ocls.find(NAMEKEY(name));
-  if (it == m_ocls.end()) 
+  if (it == m_ocls.end())
 	{
 		return NULL;
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectTypes.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectTypes.cpp
index a97057286e9..ed071ac211a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectTypes.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectTypes.cpp
@@ -169,9 +169,9 @@ void ObjectTypes::xfer(Xfer *xfer)
 			// write type name
 			xfer->xferAsciiString( &(*it) );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -179,10 +179,10 @@ void ObjectTypes::xfer(Xfer *xfer)
 		if( m_objectTypes.empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "ObjectTypes::xfer - m_objectTypes vector should be emtpy but is not!\n" ));
+			DEBUG_CRASH(( "ObjectTypes::xfer - m_objectTypes vector should be emtpy but is not!" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read all data
 		AsciiString typeName;
@@ -195,9 +195,9 @@ void ObjectTypes::xfer(Xfer *xfer)
 			// put on vector
 			m_objectTypes.push_back( typeName );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp
index c7e6d4b5a0c..e5f48c12136 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp
@@ -24,12 +24,12 @@
 
 // FILE: PartitionManager.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -39,20 +39,21 @@
 // Created:   Steven Johnson, September 2001
 //
 // Desc:      Partition management, this system will allow us to partition the
-//					  objects in space, iterate objects in specified volumes, 
+//					  objects in space, iterate objects in specified volumes,
 //					  regions, by types and other properties.
 //
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/DiscreteCircle.h"
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/MessageStream.h"
 #include "Common/NameKeyGenerator.h"
 #include "Common/PerfTimer.h"
@@ -81,7 +82,6 @@
 
 #ifdef RTS_DEBUG
 //#include "GameClient/InGameUI.h"	// for debugHints
-#include "Common/PlayerList.h"
 #endif
 
 #ifdef PM_CACHE_TERRAIN_HEIGHT
@@ -94,34 +94,29 @@
 	Int64 s_timeInClosestObjects = 0;
 	Int64 s_timeInClosestObjectsThisFrame = 0;
 	UnsignedInt s_gcoPerfFrame = 0xffffffff;
-#endif 
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
 #endif
 
+
 extern void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 
 const Real HUGE_DIST_SQR = (HUGE_DIST*HUGE_DIST);
 
 #define DISABLE_INVALID_PREVENTION	//Steven, I had to turn this off because it was causing problem with map border resizing (USA04). -MW
 
-//------------------------------------------------------------------------------ Performance Timers 
+//------------------------------------------------------------------------------ Performance Timers
 //#include "Common/PerfMetrics.h"
 //#include "Common/PerfTimer.h"
 
 //-------------------------------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 static PartitionContactList* TheContactList = NULL;
 
 //-----------------------------------------------------------------------------
-//         Local Types                                                      
+//         Local Types
 //-----------------------------------------------------------------------------
 struct ThreatValueParms
 {
@@ -157,8 +152,8 @@ static int cellValueProc(PartitionCell* cell, void* userData);
 	-- collideLoc and collideNormal will only be filled in if result is true;
 			they are undefined if result is false.
 	-- either collideLoc or collideNormal may be null if you don't need 'em.
-	-- collideLoc is not guaranteed to lie precisely on either 'a' or 'b'! 
-			(this matters iff the objects are overlapping and thus have multiple/ambiguous 
+	-- collideLoc is not guaranteed to lie precisely on either 'a' or 'b'!
+			(this matters iff the objects are overlapping and thus have multiple/ambiguous
 			collision points; we pick an 'in-between' spot to simplify matters, such that
 			the same spot will be used for the collision in both directions)
 	-- collideNormal is the normal the collision surface at 'a' at collideLoc.
@@ -170,17 +165,17 @@ typedef Bool (*CollideTestProc)(const CollideInfo *a, const CollideInfo *b, Coll
 // if the dist is greater than maxDist, return false, and the output stuff is undefined.
 typedef Bool (*DistCalcProc)
 (
-	const Coord3D *posA, 
-	const Object *objA, 
-	const Coord3D *posB, 
-	const Object *objB, 
-	Real& abDistSqr, 
+	const Coord3D *posA,
+	const Object *objA,
+	const Coord3D *posB,
+	const Object *objB,
+	Real& abDistSqr,
 	Coord3D& abVec,
 	Real maxDistSqr
-); 
+);
 
 //-----------------------------------------------------------------------------
-//         Inline Functions                                                      
+//         Inline Functions
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
@@ -251,10 +246,10 @@ inline Bool filtersAllow(PartitionFilter **filters, Object *objOther)
 
 	if (DoFilterProfiling && calls > 0 && calls % 1000==0)
 	{
-		DEBUG_LOG(("\n\n"));
+		DEBUG_LOG(("\n"));
 		for (idx = 0; idx < maxEver; idx++)
 		{
-			DEBUG_LOG(("rejections[%s] = %d (useful = %d)\n",names[idx],rejections[idx],usefulRejections[idx]));
+			DEBUG_LOG(("rejections[%s] = %d (useful = %d)",names[idx],rejections[idx],usefulRejections[idx]));
 		}
 	}
 
@@ -267,7 +262,7 @@ inline Bool filtersAllow(PartitionFilter **filters, Object *objOther)
 			return false;
 		}
 	}
-	// assume true if no filters rejected it	
+	// assume true if no filters rejected it
 	return true;
 #endif
 }
@@ -333,7 +328,7 @@ inline Real maxReal(Real a, Real b)
 }
 
 //-----------------------------------------------------------------------------
-//         Local Functions                                                      
+//         Local Functions
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
@@ -375,10 +370,10 @@ static Bool collideTest_Box_Sphere(const CollideInfo *a, const CollideInfo *b, C
 static Bool collideTest_Box_Cylinder(const CollideInfo *a, const CollideInfo *b, CollideLocAndNormal *cinfo);
 static Bool collideTest_Box_Box(const CollideInfo *a, const CollideInfo *b, CollideLocAndNormal *cinfo);
 
-static Bool distCalcProc_CenterAndCenter_2D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr); 
-static Bool distCalcProc_BoundaryAndBoundary_2D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr); 
-static Bool distCalcProc_CenterAndCenter_3D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr); 
-static Bool distCalcProc_BoundaryAndBoundary_3D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr); 
+static Bool distCalcProc_CenterAndCenter_2D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr);
+static Bool distCalcProc_BoundaryAndBoundary_2D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr);
+static Bool distCalcProc_CenterAndCenter_3D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr);
+static Bool distCalcProc_BoundaryAndBoundary_3D(const Coord3D *posA, const Object *objA, const Coord3D *posB, const Object *objB, Real& abDistSqr, Coord3D& abVec, Real maxDistSqr);
 
 //-----------------------------------------------------------------------------
 inline void projectCoord3D(Coord3D *coord, const Coord3D *unitDir, Real dist)
@@ -424,7 +419,7 @@ static void testRotatedPointsAgainstRect(
 		#ifdef INTENSE_DEBUG
 		Real mag_a = sqr(ptx)+sqr(pty);
 		Real mag_b = sqr(ptx_new)+sqr(pty_new);
-		DEBUG_ASSERTCRASH(fabs(mag_a - mag_b) <= 1.0, ("hmm, unlikely")); 
+		DEBUG_ASSERTCRASH(fabs(mag_a - mag_b) <= 1.0, ("hmm, unlikely"));
 		#endif
 
 		if (ptx_new <= major && pty_new <= minor)
@@ -544,7 +539,7 @@ static Bool xy_collideTest_Circle_Circle(const CollideInfo *a, const CollideInfo
 			cinfo->loc = a->position;
 			projectCoord3D(&cinfo->loc, &cinfo->normal, a->geom.getMajorRadius());
 		}
-		
+
 		return true;
 	}
 	return false;
@@ -565,7 +560,7 @@ static Bool xy_collideTest_Rect_Rect(const CollideInfo *a, const CollideInfo *b,
 
 	rectToFourPoints(b, pts);
 	testRotatedPointsAgainstRect(pts, a, &avg, &avgTot);
-	
+
 	if (avgTot > 0)
 	{
 		if (cinfo)
@@ -576,16 +571,16 @@ static Bool xy_collideTest_Rect_Rect(const CollideInfo *a, const CollideInfo *b,
 			cinfo->loc.z = (a->position.z + b->position.z) * 0.5f;
 
 			// yow, what exactly does it mean to find the normal to two *intersecting*
-			// rects? with "true" physics we could project ahead and determine 
+			// rects? with "true" physics we could project ahead and determine
 			// what the collision point would be, which would of course always
 			// give a perfect, symmetrical normal. however, we almost always determine
 			// collisions "after the fact" and thus the rects already intersect, meaning
-			// that it's tricky to find the normal. we could do it the "right" way, which 
+			// that it's tricky to find the normal. we could do it the "right" way, which
 			// would be to back up the objects to find the perfect point (see above), but
 			// we don't have velocity information at this point, so we can't really
 			// do that. so, naturally, we provide a (poor) guess by just doing the center-to-center
 			// normal. this is rarely the correct surface normal for a box-box collision,
-			// but until I either (a) rewrite everything to have predictive collisions, 
+			// but until I either (a) rewrite everything to have predictive collisions,
 			// or (b) come up with a better definition of a useful normal in this case,
 			// I'm not sure we can do a whole lot better... (srj)
 			vecDiff_2D(&b->position, &a->position, &cinfo->normal);
@@ -672,7 +667,7 @@ inline Bool z_collideTest_Nonsphere_Nonsphere(CollideTestProc xyproc, const Coll
 	if (minRadius>r) minRadius = r;
 	r = b->geom.getMinorRadius();
 	if (minRadius>r) minRadius = r;
-	
+
 	Bool closeEnough = sqr(minRadius) > dSqr;
 
 	if (closeEnough || xyproc(a, b, cinfo))
@@ -776,11 +771,11 @@ static Bool collideTest_Box_Box(const CollideInfo *a, const CollideInfo *b, Coll
 
 //-----------------------------------------------------------------------------
 static Bool distCalcProc_CenterAndCenter_2D(
-	const Coord3D *posA, 
-	const Object *objA, 
-	const Coord3D *posB, 
-	const Object *objB, 
-	Real& abDistSqr, 
+	const Coord3D *posA,
+	const Object *objA,
+	const Coord3D *posB,
+	const Object *objB,
+	Real& abDistSqr,
 	Coord3D& abVec,
 	Real maxDistSqr
 )
@@ -791,7 +786,7 @@ static Bool distCalcProc_CenterAndCenter_2D(
 	diff.x = posB->x - posA->x;
 	diff.y = posB->y - posA->y;
 	diff.z = 0.0f;
-	
+
 	//if (abDistSqr)
 	{
 		abDistSqr = sqr(diff.x) + sqr(diff.y);
@@ -807,11 +802,11 @@ static Bool distCalcProc_CenterAndCenter_2D(
 
 //-----------------------------------------------------------------------------
 static Bool distCalcProc_BoundaryAndBoundary_2D(
-	const Coord3D *posA, 
-	const Object *objA, 
-	const Coord3D *posB, 
-	const Object *objB, 
-	Real& abDistSqr, 
+	const Coord3D *posA,
+	const Object *objA,
+	const Coord3D *posB,
+	const Object *objB,
+	Real& abDistSqr,
 	Coord3D& abVec,
 	Real maxDistSqr
 )
@@ -820,24 +815,24 @@ static Bool distCalcProc_BoundaryAndBoundary_2D(
 	diff.x = posB->x - posA->x;
 	diff.y = posB->y - posA->y;
 	diff.z = 0.0f;
-	
+
 	Real actualDistSqr = sqr(diff.x) + sqr(diff.y);
 
 	Real shrinkFactor = 1.0f;
 	Real shrunkenDistSqr = actualDistSqr;
-	Real totalRad = (objA ? objA->getGeometryInfo().getBoundingCircleRadius() : 0.0f) + 
+	Real totalRad = (objA ? objA->getGeometryInfo().getBoundingCircleRadius() : 0.0f) +
 							(objB ? objB->getGeometryInfo().getBoundingCircleRadius() : 0.0f);
 
 	if (totalRad > 0.0f)
 	{
 		Real actualDist = sqrtf(actualDistSqr);
 		Real shrunkenDist = actualDist - totalRad;
-		if (shrunkenDist <= 0.0f) 
+		if (shrunkenDist <= 0.0f)
 		{
 			shrinkFactor = 0.0f;
 			shrunkenDistSqr = 0.0f;	// sorry, distances can't be negative
 		}
-		else 
+		else
 		{
 			shrinkFactor = shrunkenDist / actualDist;
 			shrunkenDistSqr = sqr(shrunkenDist);
@@ -861,11 +856,11 @@ static Bool distCalcProc_BoundaryAndBoundary_2D(
 
 //-----------------------------------------------------------------------------
 static Bool distCalcProc_CenterAndCenter_3D(
-	const Coord3D *posA, 
-	const Object *objA, 
-	const Coord3D *posB, 
-	const Object *objB, 
-	Real& abDistSqr, 
+	const Coord3D *posA,
+	const Object *objA,
+	const Coord3D *posB,
+	const Object *objB,
+	Real& abDistSqr,
 	Coord3D& abVec,
 	Real maxDistSqr
 )
@@ -876,7 +871,7 @@ static Bool distCalcProc_CenterAndCenter_3D(
 	diff.x = posB->x - posA->x;
 	diff.y = posB->y - posA->y;
 	diff.z = posB->z - posA->z;
-	
+
 	//if (abDistSqr)
 	{
 		abDistSqr = sqr(diff.x) + sqr(diff.y) + sqr(diff.z);
@@ -891,11 +886,11 @@ static Bool distCalcProc_CenterAndCenter_3D(
 
 //-----------------------------------------------------------------------------
 static Bool distCalcProc_BoundaryAndBoundary_3D(
-	const Coord3D *posA, 
-	const Object *objA, 
-	const Coord3D *posB, 
-	const Object *objB, 
-	Real& abDistSqr, 
+	const Coord3D *posA,
+	const Object *objA,
+	const Coord3D *posB,
+	const Object *objB,
+	Real& abDistSqr,
 	Coord3D& abVec,
 	Real maxDistSqr
 )
@@ -908,9 +903,9 @@ static Bool distCalcProc_BoundaryAndBoundary_3D(
 	Coord3D diff;
 	diff.x = posB->x - posA->x;
 	diff.y = posB->y - posA->y;
-	diff.z = ((posB->z + (geomB ? geomB->getZDeltaToCenterPosition() : 0.0f)) 
+	diff.z = ((posB->z + (geomB ? geomB->getZDeltaToCenterPosition() : 0.0f))
 						- (posA->z + (geomA ? geomA->getZDeltaToCenterPosition() : 0.0f)));
-	
+
 	Real actualDistSqr = sqr(diff.x) + sqr(diff.y) + sqr(diff.z);
 
 	Real shrinkFactor = 1.0f;
@@ -920,12 +915,12 @@ static Bool distCalcProc_BoundaryAndBoundary_3D(
 	{
 		Real actualDist = sqrtf(actualDistSqr);
 		Real shrunkenDist = actualDist - totalRad;
-		if (shrunkenDist <= 0.0f) 
+		if (shrunkenDist <= 0.0f)
 		{
 			shrinkFactor = 0.0f;
 			shrunkenDistSqr = 0.0f;	// sorry, distances can't be negative
 		}
-		else 
+		else
 		{
 			shrinkFactor = shrunkenDist / actualDist;
 			shrunkenDistSqr = sqr(shrunkenDist);
@@ -949,23 +944,23 @@ static Bool distCalcProc_BoundaryAndBoundary_3D(
 }
 
 //-----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 
-static DistCalcProc theDistCalcProcs[] = 
-{ 
-	distCalcProc_CenterAndCenter_2D, 
+static DistCalcProc theDistCalcProcs[] =
+{
+	distCalcProc_CenterAndCenter_2D,
 	distCalcProc_CenterAndCenter_3D,
-	distCalcProc_BoundaryAndBoundary_2D, 
-	distCalcProc_BoundaryAndBoundary_3D, 
+	distCalcProc_BoundaryAndBoundary_2D,
+	distCalcProc_BoundaryAndBoundary_3D,
 };
 
 // NOTE: This *DEPENDS* on the order of the geometry enum defines
-static CollideTestProc theCollideTestProcs[] = 
+static CollideTestProc theCollideTestProcs[] =
 {
 	collideTest_Sphere_Sphere,
 	collideTest_Sphere_Cylinder,
@@ -979,7 +974,7 @@ static CollideTestProc theCollideTestProcs[] =
 };
 
 //-----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //-----------------------------------------------------------------------------
 PartitionManager *ThePartitionManager = NULL;  ///< the object manager singleton
 
@@ -992,11 +987,11 @@ class PartitionContactListNode : public MemoryPoolObject
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(PartitionContactListNode, "PartitionContactListNode" )
 
 public:
-	PartitionContactListNode*			m_nextHash;	///< next node with same hash value 
+	PartitionContactListNode*			m_nextHash;	///< next node with same hash value
 	PartitionContactListNode*			m_next;			///< next node
 	PartitionData*								m_obj;			///< one object that is possibly colliding
 	PartitionData*								m_other;		///< the other object (or null for collisions with the terrain)
-	Int														m_hashValue;///< index into hash table 
+	Int														m_hashValue;///< index into hash table
 };
 
 inline PartitionContactListNode::~PartitionContactListNode() { }
@@ -1009,7 +1004,7 @@ class PartitionContactList
 
 	/*
 		socketcount should be prime (and "not too close to a power of 2) for best results.
-		
+
 		if this one isn't large enough, try this website:
 		http://www.utm.edu/research/primes/lists/small/1000.txt
 
@@ -1151,7 +1146,7 @@ CellAndObjectIntersection::~CellAndObjectIntersection()
 void CellAndObjectIntersection::friend_addToCellList(CellAndObjectIntersection **pListHead)
 {
 	DEBUG_ASSERTCRASH(m_prevCoi == NULL && m_nextCoi == NULL && *pListHead != this, ("trying to add a cell to list, but it appears to already be in a list"));
-	
+
 	this->m_nextCoi = *pListHead;
 	if (*pListHead)
 		(*pListHead)->m_prevCoi = this;
@@ -1230,10 +1225,7 @@ void CellAndObjectIntersection::removeAllCoverage()
 //-----------------------------------------------------------------------------
 PartitionCell::PartitionCell()
 {
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_cellX = m_cellY = 0;
-	//
 	m_firstCoiInCell = NULL;
 	m_coiCount = 0;
 #ifdef PM_CACHE_TERRAIN_HEIGHT
@@ -1285,9 +1277,9 @@ void PartitionCell::addLooker(Int playerIndex)
 
 	CellShroudStatus newShroud = getShroudStatusForPlayer( playerIndex );
 
-//	DEBUG_LOG(( "ADD    %d, %d.  CS = %d, AS = %d for player %d.\n", 
-//							m_cellX, 
-//							m_cellY, 
+//	DEBUG_LOG(( "ADD    %d, %d.  CS = %d, AS = %d for player %d.",
+//							m_cellX,
+//							m_cellY,
 //							m_shroudLevel[playerIndex].m_currentShroud,
 //							m_shroudLevel[playerIndex].m_activeShroudLevel,
 //							playerIndex
@@ -1298,7 +1290,7 @@ void PartitionCell::addLooker(Int playerIndex)
 		// On an edge trigger, tell all objects to think about their shroudedness
 		invalidateShroudedStatusForAllCois( playerIndex );
 
-		if( playerIndex == ThePlayerList->getLocalPlayer()->getPlayerIndex() )
+		if( playerIndex == rts::getObservedOrLocalPlayer()->getPlayerIndex() )
 		{
 			// and if this is the local player, do the Client update.
 			TheDisplay->setShroudLevel(m_cellX, m_cellY, newShroud);
@@ -1321,9 +1313,9 @@ void PartitionCell::removeLooker(Int playerIndex)
 	}
 	CellShroudStatus newShroud = getShroudStatusForPlayer( playerIndex );
 
-//	DEBUG_LOG(( "REMOVE %d, %d.  CS = %d, AS = %d for player %d.\n", 
-//							m_cellX, 
-//							m_cellY, 
+//	DEBUG_LOG(( "REMOVE %d, %d.  CS = %d, AS = %d for player %d.",
+//							m_cellX,
+//							m_cellY,
 //							m_shroudLevel[playerIndex].m_currentShroud,
 //							m_shroudLevel[playerIndex].m_activeShroudLevel,
 //							playerIndex
@@ -1334,7 +1326,7 @@ void PartitionCell::removeLooker(Int playerIndex)
 		// On an edge trigger, tell all objects to think about their shroudedness
 		invalidateShroudedStatusForAllCois( playerIndex );
 
-		if( playerIndex == ThePlayerList->getLocalPlayer()->getPlayerIndex() )
+		if( playerIndex == rts::getObservedOrLocalPlayer()->getPlayerIndex() )
 		{
 			// and if this is the local player, do the Client update.
 			TheDisplay->setShroudLevel(m_cellX, m_cellY, newShroud);
@@ -1362,7 +1354,7 @@ void PartitionCell::addShrouder( Int playerIndex )
 		invalidateShroudedStatusForAllCois( playerIndex );
 
 		// and update the client if we are on the local player
-		if( playerIndex == ThePlayerList->getLocalPlayer()->getPlayerIndex() )
+		if( playerIndex == rts::getObservedOrLocalPlayer()->getPlayerIndex() )
 		{
 			TheDisplay->setShroudLevel(m_cellX, m_cellY, newShroud);
 			TheRadar->setShroudLevel(m_cellX, m_cellY, newShroud);
@@ -1517,7 +1509,7 @@ void PartitionCell::crc( Xfer *xfer )
 	xfer->xferUser(&m_cellX, sizeof(m_cellX));
 	xfer->xferUser(&m_cellY, sizeof(m_cellY));
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1533,7 +1525,7 @@ void PartitionCell::xfer( Xfer *xfer )
 	// xfer shroud data
 	xfer->xferUser( &m_shroudLevel, sizeof( ShroudLevel ) * MAX_PLAYER_COUNT );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1541,7 +1533,7 @@ void PartitionCell::xfer( Xfer *xfer )
 void PartitionCell::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -1550,7 +1542,7 @@ void PartitionCell::loadPostProcess( void )
 //-----------------------------------------------------------------------------
 PartitionData::PartitionData()
 {
-	//DEBUG_LOG(("create pd %08lx\n",this));
+	//DEBUG_LOG(("create pd %08lx",this));
 	m_next = NULL;
 	m_prev = NULL;
 	m_nextDirty = NULL;
@@ -1574,17 +1566,17 @@ PartitionData::PartitionData()
 //-----------------------------------------------------------------------------
 PartitionData::~PartitionData()
 {
-	//DEBUG_LOG(("toss pd for pd %08lx obj %08lx\n",this,m_object));
+	//DEBUG_LOG(("toss pd for pd %08lx obj %08lx",this,m_object));
 	removeAllTouchedCells();
 	freeCoiArray();
 	DEBUG_ASSERTCRASH(ThePartitionManager, ("ThePartitionManager is null"));
 	if (ThePartitionManager && ThePartitionManager->isInListDirtyModules(this))
 	{
-		//DEBUG_LOG(("remove pd %08lx from dirty list (%08lx %08lx)\n",this,m_prevDirty,m_nextDirty));
+		//DEBUG_LOG(("remove pd %08lx from dirty list (%08lx %08lx)",this,m_prevDirty,m_nextDirty));
 		ThePartitionManager->removeFromDirtyModules(this);
-		//DEBUG_ASSERTCRASH(!ThePartitionManager->isInListDirtyModules(this), ("hmm\n"));
+		//DEBUG_ASSERTCRASH(!ThePartitionManager->isInListDirtyModules(this), ("hmm"));
 	}
-} 
+}
 
 //-----------------------------------------------------------------------------
 Int PartitionData::getControllingPlayerIndex() const
@@ -1604,7 +1596,7 @@ Int PartitionData::getControllingPlayerIndex() const
 
 //-----------------------------------------------------------------------------
 // only used to restore state after map border resizing and/or xfer!
-void PartitionData::friend_setShroudednessPrevious(Int playerIndex, ObjectShroudStatus status) 
+void PartitionData::friend_setShroudednessPrevious(Int playerIndex, ObjectShroudStatus status)
 {
 	m_shroudednessPrevious[playerIndex] = status;
 
@@ -1616,16 +1608,16 @@ void PartitionData::friend_setShroudednessPrevious(Int playerIndex, ObjectShroud
 	if (m_shroudedness[playerIndex] == OBJECTSHROUD_INVALID)
 		m_shroudedness[playerIndex] = OBJECTSHROUD_INVALID_BUT_PREVIOUS_VALID;
 #endif
-} 
+}
 
 //-----------------------------------------------------------------------------
 ObjectShroudStatus PartitionData::getShroudedStatus(Int playerIndex)
 {
 	// sanity
-	DEBUG_ASSERTCRASH( playerIndex >= 0 && playerIndex < MAX_PLAYER_COUNT, 
-										 ("PartitionData::getShroudedStatus - Invalid player index '%d'\n", playerIndex) );
+	DEBUG_ASSERTCRASH( playerIndex >= 0 && playerIndex < MAX_PLAYER_COUNT,
+										 ("PartitionData::getShroudedStatus - Invalid player index '%d'", playerIndex) );
 
-	if (!ThePartitionManager->getUpdatedSinceLastReset()) 
+	if (!ThePartitionManager->getUpdatedSinceLastReset())
 	{
 		// The shroud should be invalid until update has been called.
 		// I'll set myself as invalid so the next time you ask I'll recompute.  (If I just return Invalid, then the old state will persist unfairly over a reset)
@@ -1665,7 +1657,7 @@ ObjectShroudStatus PartitionData::getShroudedStatus(Int playerIndex)
 			}
 		}
 		else if( shroudedCells + foggedCells == m_coiInUseCount )
-		{	
+		{
 			m_shroudedness[playerIndex] = OBJECTSHROUD_FOGGED;	//object is visible but fogged.
 			if (m_object && m_ghostObject)	//object does not exist for modules holding only GhostObjects
 			{
@@ -1702,7 +1694,7 @@ ObjectShroudStatus PartitionData::getShroudedStatus(Int playerIndex)
 				//need a ghost object.
 				m_ghostObject->freeSnapShot(playerIndex);
 			}
-		}	// no cell I use has anything
+		}
 		else
 		{	//Record that this object was seen by the player.  This info will be used to show fogged enemy faction buildings.
 			m_everSeenByPlayer[playerIndex] = true;
@@ -1714,11 +1706,11 @@ ObjectShroudStatus PartitionData::getShroudedStatus(Int playerIndex)
 			}
 		}
 #ifndef DISABLE_INVALID_PREVENTION
- 		if (m_coiInUseCount && updateShroudednessPrevious) 
-		{	
+ 		if (m_coiInUseCount && updateShroudednessPrevious)
+		{
 #else
- 		if (m_coiInUseCount) 
-		{	
+ 		if (m_coiInUseCount)
+		{
 #endif
 			//only remember the previous state of objects actually on the map.
  			m_shroudednessPrevious[playerIndex] = m_shroudedness[playerIndex];
@@ -1750,7 +1742,7 @@ void PartitionData::addSubPixToCoverage(PartitionCell *cell)
 {
 	DEBUG_ASSERTCRASH(m_coiInUseCount < m_coiArrayCount, ("not enough cois allocated for this object"));
 	if (cell)
-	{			
+	{
 		// see if we already have a coi for this cell.
 		CellAndObjectIntersection *coi = m_coiArray;
 		CellAndObjectIntersection *coiToUse = NULL;
@@ -1809,7 +1801,7 @@ void PartitionData::doRectFill(
 	Int numStepsX = REAL_TO_INT_CEIL(halfsizeX * stepSizeInvTimes2);
 	Int numStepsY = REAL_TO_INT_CEIL(halfsizeY * stepSizeInvTimes2);
 	// GS 12-26-02  Oh my part 2.  Now that we are no longer greatly underestimating our COI imprint,
-	// we don't need this fudge.  The fudge is not in the calcMaxCOIForShape, so it just results in 
+	// we don't need this fudge.  The fudge is not in the calcMaxCOIForShape, so it just results in
 	// good COIs getting dropped since we didn't allocate enough to handle this fudge.
 
 	Real tl_x = centerX - halfsizeX*c - halfsizeY*s;
@@ -1847,6 +1839,8 @@ void PartitionData::hLineCircle(Int x1, Int x2, Int y)
 }
 
 // -----------------------------------------------------------------------------
+// Marks all partition cells that intersect a circle of the given center and radius
+// as covered by this object using a variation of the midpoint circle algorithm.
 void PartitionData::doCircleFill(
 	Real centerX,
 	Real centerY,
@@ -1859,12 +1853,20 @@ void PartitionData::doCircleFill(
 	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 
 	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	Int y = cellRadius - 1;
 	Int dec = 3 - 2*cellRadius;
-	for (Int x = 0; x < cellRadius; x++)
+
+#if RETAIL_COMPATIBLE_CRC
+	// Cell coverage diverges at radii >= 240 between algorithms.
+	Int end = cellRadius - 1;
+	Int& endRef = (cellRadius < 240) ? y : end;
+	for (Int x = 0; x <= endRef; ++x)
+#else
+	for (Int x = 0; x <= y; ++x)
+#endif
 	{
 		hLineCircle(cellCenterX - x, cellCenterX + x, cellCenterY + y);
 		hLineCircle(cellCenterX - x, cellCenterX + x, cellCenterY - y);
@@ -1892,7 +1894,7 @@ void PartitionData::doSmallFill(
 	Real halfCellSize = ThePartitionManager->getCellSize() * 0.5f;
 	if (radius > halfCellSize)
 	{
-		DEBUG_CRASH(("object is too large to use a 'small' geometry, truncating size to cellsize\n"));
+		DEBUG_CRASH(("object is too large to use a 'small' geometry, truncating size to cellsize"));
 		radius = halfCellSize;
 	}
 
@@ -1943,7 +1945,7 @@ void PartitionData::addPossibleCollisions(PartitionContactList *ctList)
 	}
 #endif
 
-	//DEBUG_LOG(("adding possible collision for %s\n",getObject()->getTemplate()->getName().str()));
+	//DEBUG_LOG(("adding possible collision for %s",getObject()->getTemplate()->getName().str()));
 
 	CellAndObjectIntersection *myCoi = m_coiArray;
 	for (Int i = m_coiInUseCount; i > 0; --i, ++myCoi)
@@ -2001,10 +2003,10 @@ Bool PartitionData::collidesWith(const PartitionData *that, CollideLocAndNormal
 
 //-----------------------------------------------------------------------------
 /* See if thisObj collides with geom at pos & angle. */
-Bool PartitionManager::geomCollidesWithGeom(const Coord3D* pos1, 
+Bool PartitionManager::geomCollidesWithGeom(const Coord3D* pos1,
 		const GeometryInfo& geom1,
 		Real angle1,
-		const Coord3D* pos2, 
+		const Coord3D* pos2,
 		const GeometryInfo& geom2,
 		Real angle2) const
 {
@@ -2012,7 +2014,7 @@ Bool PartitionManager::geomCollidesWithGeom(const Coord3D* pos1,
 	CollideInfo thatInfo(pos2, geom2, angle2);
 
 	// invariant for all geometries: first do z collision check.
-	if (thisInfo.position.z + thisInfo.geom.getMaxHeightAbovePosition() >= thatInfo.position.z && 
+	if (thisInfo.position.z + thisInfo.geom.getMaxHeightAbovePosition() >= thatInfo.position.z &&
 			thisInfo.position.z <= thatInfo.position.z + thatInfo.geom.getMaxHeightAbovePosition())
 	{
 		GeometryType thisGeom = geom1.getGeomType();
@@ -2043,10 +2045,9 @@ void PartitionData::updateCellsTouched()
 
 
 	Object *obj = getObject();
-	DEBUG_ASSERTCRASH(obj != NULL || m_ghostObject != NULL, ("must be attached to an Object here 1"));
 
 	if (obj)
-	{	
+	{
 		//we have no object using this PartitionData but we still have a GhostObject so copy its data.
 		geom = obj->getGeometryInfo().getGeomType();
 		isSmall = obj->getGeometryInfo().getIsSmall();
@@ -2064,6 +2065,11 @@ void PartitionData::updateCellsTouched()
 		majorRadius = m_ghostObject->getGeometryMajorRadius();
 		minorRadius = m_ghostObject->getGeometryMinorRadius();
 	}
+	else
+	{
+		DEBUG_CRASH(("must be attached to an Object here"));
+		return;
+	}
 
 	removeAllTouchedCells();
 	if (isSmall)
@@ -2094,10 +2100,10 @@ void PartitionData::updateCellsTouched()
 	const PartitionCell *currentCell = ThePartitionManager->getCellAt( currentCellIndexX, currentCellIndexY );
 	if(obj && currentCell != m_lastCell )
 	{
-		// To not expose PartitionCells, he will think in terms of points.  He will 
-		// unlook at a point and look at the new point.  We do the rounding and the 
+		// To not expose PartitionCells, he will think in terms of points.  He will
+		// unlook at a point and look at the new point.  We do the rounding and the
 		// changing into PartitionCells
-		obj->onPartitionCellChange(); 
+		obj->onPartitionCellChange();
 		m_lastCell = currentCell;
 	}
 
@@ -2121,8 +2127,8 @@ void PartitionData::updateCellsTouched()
 }
 
 //-----------------------------------------------------------------------------
-void PartitionData::invalidateShroudedStatusForPlayer(Int playerIndex) 
-{ 
+void PartitionData::invalidateShroudedStatusForPlayer(Int playerIndex)
+{
 #ifndef DISABLE_INVALID_PREVENTION
 	if (m_shroudedness[playerIndex] != OBJECTSHROUD_INVALID && m_shroudedness[playerIndex] != OBJECTSHROUD_INVALID_BUT_PREVIOUS_VALID)
 #endif
@@ -2130,15 +2136,15 @@ void PartitionData::invalidateShroudedStatusForPlayer(Int playerIndex)
 }
 
 //-----------------------------------------------------------------------------
-void PartitionData::invalidateShroudedStatusForAllPlayers() 
-{ 
-	for (Int i = 0; i < MAX_PLAYER_COUNT; i++) 
+void PartitionData::invalidateShroudedStatusForAllPlayers()
+{
+	for (Int i = 0; i < MAX_PLAYER_COUNT; i++)
 	{
 		invalidateShroudedStatusForPlayer(i);
 	}
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 static AsciiString theObjName;
 #endif
 
@@ -2152,9 +2158,9 @@ Int PartitionData::calcMaxCoiForShape(GeometryType geom, Real majorRadius, Real
   //M Lorenzen 8/26/03
 //	if (isSmall)
 //	{
-//		#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+//		#if defined(RTS_DEBUG)
 //		Int chk = calcMaxCoiForShape(geom, majorRadius, minorRadius, false);
-//		DEBUG_ASSERTCRASH(chk <= 4, ("Small objects should be <= 4 cells, but I calced %s as %d\n",theObjName.str(),chk));
+//		DEBUG_ASSERTCRASH(chk <= 4, ("Small objects should be <= 4 cells, but I calced %s as %d",theObjName.str(),chk));
 //		#endif
 //		result = 4;
 //	}
@@ -2169,14 +2175,21 @@ Int PartitionData::calcMaxCoiForShape(GeometryType geom, Real majorRadius, Real
 				// this actually allocates a few too many, but that's ok.
 				Int cells = ThePartitionManager->worldToCellDist(majorRadius*2) + 1;
 				result = cells * cells;
+#if !RETAIL_COMPATIBLE_CRC
+				break;
+#endif
 			}
 			case GEOMETRY_BOX:
 			{
 				Real diagonal = (Real)(sqrtf(majorRadius*majorRadius + minorRadius*minorRadius));
 				Int cells = ThePartitionManager->worldToCellDist(diagonal*2) + 1;
 				result = cells * cells;
+				break;
 			}
+			default:
+				return 4;
 		};
+		static_assert(GEOMETRY_NUM_TYPES == 3, "GEOMETRY_NUM_TYPES has changed");
 	}
 	if (result < 4)
 		result = 4;
@@ -2188,12 +2201,12 @@ Int PartitionData::calcMaxCoiForObject()
 {
 	Object *obj = getObject();
 	DEBUG_ASSERTCRASH(obj != NULL, ("must be attached to an Object here 2"));
-	
+
 	GeometryType geom = obj->getGeometryInfo().getGeomType();
 	Real majorRadius = obj->getGeometryInfo().getMajorRadius();
 	Real minorRadius = obj->getGeometryInfo().getMinorRadius();
 	Bool isSmall = obj->getGeometryInfo().getIsSmall();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 theObjName = obj->getTemplate()->getName();
 #endif
 	return calcMaxCoiForShape(geom, majorRadius, minorRadius, isSmall);
@@ -2202,7 +2215,7 @@ theObjName = obj->getTemplate()->getName();
 //-----------------------------------------------------------------------------
 void PartitionData::makeDirty(Bool needToUpdateCells)
 {
-	//DEBUG_LOG(("makeDirty for pd %08lx obj %08lx\n",this,m_object));
+	//DEBUG_LOG(("makeDirty for pd %08lx obj %08lx",this,m_object));
 	if (!ThePartitionManager->isInListDirtyModules(this))
 	{
 		if (needToUpdateCells)
@@ -2264,7 +2277,7 @@ void PartitionData::attachToObject(Object* object)
 			m_ghostObject = TheGhostObjectManager->addGhostObject(object, this);
 	}
 
-	//DEBUG_LOG(("attach pd for pd %08lx obj %08lx\n",this,m_object));
+	//DEBUG_LOG(("attach pd for pd %08lx obj %08lx",this,m_object));
 
 	// (re)calc maxCoi and (re)alloc cois
 	DEBUG_ASSERTCRASH(m_coiArrayCount == 0 && m_coiArray == NULL, ("hmm, coi should probably be null here"));
@@ -2295,7 +2308,7 @@ void PartitionData::detachFromObject()
 	removeAllTouchedCells();
 	freeCoiArray();
 
-	//DEBUG_LOG(("detach pd for pd %08lx obj %08lx\n",this,m_object));
+	//DEBUG_LOG(("detach pd for pd %08lx obj %08lx",this,m_object));
 
 	// no longer attached to object
 	m_object = NULL;
@@ -2341,7 +2354,7 @@ void PartitionData::detachFromGhostObject(void)
 	removeAllTouchedCells();
 	freeCoiArray();
 
-	//DEBUG_LOG(("detach pd for pd %08lx obj %08lx\n",this,m_object));
+	//DEBUG_LOG(("detach pd for pd %08lx obj %08lx",this,m_object));
 
 	// no longer attached to object
 	m_object = NULL;
@@ -2374,7 +2387,7 @@ void PartitionContactList::addToContactList( PartitionData *obj, PartitionData *
 {
 	if (obj == other || obj == NULL || other == NULL)
 		return;
-	
+
 	Object* obj_obj = obj->getObject();
 	Object* other_obj = other->getObject();
 	if (obj_obj == NULL || other_obj == NULL)
@@ -2384,28 +2397,28 @@ void PartitionContactList::addToContactList( PartitionData *obj, PartitionData *
 	UnsignedInt hashValue = hash2ints(obj_obj->getID(), other_obj->getID());
 	hashValue %= PartitionContactList_SOCKET_COUNT;
 
-	// make sure given hit has not already been recorded 
+	// make sure given hit has not already been recorded
 	for (PartitionContactListNode* cd = m_contactHash[ hashValue ]; cd; cd = cd->m_nextHash )
 	{
 		if ((cd->m_obj == obj && cd->m_other == other) ||
-				(cd->m_obj == other && cd->m_other == obj)) 
+				(cd->m_obj == other && cd->m_other == obj))
 		{
-			// already noted 
+			// already noted
 			return;
 		}
 	}
 
-	// new hit 
+	// new hit
 	PartitionContactListNode *ncd = newInstance(PartitionContactListNode);
 	ncd->m_obj = obj;
 	ncd->m_other = other;
 	ncd->m_hashValue = hashValue;
 
-	// add to hash table 
+	// add to hash table
 	ncd->m_nextHash = m_contactHash[ hashValue ];
 	m_contactHash[ hashValue ] = ncd;
 
-	// add to list of contacts for this frame 
+	// add to list of contacts for this frame
 	ncd->m_next = m_contactList;
 	m_contactList = ncd;
 
@@ -2419,7 +2432,7 @@ for (PartitionContactListNode *cd2 = m_contactHash[ hashValue ]; cd2; cd2 = cd2-
 }
 if (depth > 3)
 {
-	DEBUG_LOG(("depth is %d for %s %08lx (%d) - %s %08lx (%d)\n",
+	DEBUG_LOG(("depth is %d for %s %08lx (%d) - %s %08lx (%d)",
 		depth,obj_obj->getTemplate()->getName().str(),obj_obj,obj_obj->getID(),
 		other_obj->getTemplate()->getName().str(),other_obj,other_obj->getID()
 		));
@@ -2430,7 +2443,7 @@ if (depth > 3)
 		//hashValue %= PartitionContactList_SOCKET_COUNT;
 
 
-		DEBUG_LOG(("ENTRY: %s %08lx (%d) - %s %08lx (%d) [rawhash %d]\n",
+		DEBUG_LOG(("ENTRY: %s %08lx (%d) - %s %08lx (%d) [rawhash %d]",
 			cd2->m_obj->getObject()->getTemplate()->getName().str(),cd2->m_obj->getObject(),cd2->m_obj->getObject()->getID(),
 			cd2->m_other->getObject()->getTemplate()->getName().str(),cd2->m_other->getObject(),cd2->m_other->getObject()->getID(),
 			rawhash));
@@ -2451,7 +2464,7 @@ for (int ii = 0; ii < PartitionContactList_SOCKET_COUNT; ++ii)
 	}
 }
 aggcount += 1.0f;
-DEBUG_ASSERTLOG(((Int)aggcount)%1000!=0,("avg hash depth at %f is %f, fullness %f%%\n",
+DEBUG_ASSERTLOG(((Int)aggcount)%1000!=0,("avg hash depth at %f is %f, fullness %f%%",
 aggcount,aggtotal/(aggcount*PartitionContactList_SOCKET_COUNT),(aggfull*100)/(aggcount*PartitionContactList_SOCKET_COUNT)));
 #endif
 
@@ -2474,7 +2487,7 @@ void PartitionContactList::removeSpecificPartitionData(PartitionData* data)
 //-----------------------------------------------------------------------------
 void PartitionContactList::resetContactList()
 {
-	// remove items from hash table 
+	// remove items from hash table
 	PartitionContactListNode* cdnext;
 	for (PartitionContactListNode* cd = m_contactList; cd; cd = cdnext)
 	{
@@ -2489,12 +2502,12 @@ void PartitionContactList::resetContactList()
 //-----------------------------------------------------------------------------
 void PartitionContactList::processContactList()
 {
-	for (PartitionContactListNode* cd = m_contactList; cd; cd = cd->m_next) 
+	for (PartitionContactListNode* cd = m_contactList; cd; cd = cd->m_next)
 	{
 		if (cd->m_obj == NULL || cd->m_other == NULL)
 			continue;
 
-		// we know that their partitions overlap; determine if they REALLY collide 
+		// we know that their partitions overlap; determine if they REALLY collide
 		// before proceeding...
 		CollideLocAndNormal cinfo;
 		if (!cd->m_obj->friend_collidesWith(cd->m_other, &cinfo))
@@ -2502,12 +2515,12 @@ void PartitionContactList::processContactList()
 
 		Object* obj = cd->m_obj->getObject();
 		Object* other = cd->m_other->getObject();
-		
+
 		if( obj->getStatusBits().test( OBJECT_STATUS_NO_COLLISIONS ) ||
 				other->getStatusBits().test( OBJECT_STATUS_NO_COLLISIONS ) )
 			continue;
 
-		DEBUG_ASSERTCRASH(!(obj->isKindOf(KINDOF_IMMOBILE) && other->isKindOf(KINDOF_IMMOBILE)), 
+		DEBUG_ASSERTCRASH(!(obj->isKindOf(KINDOF_IMMOBILE) && other->isKindOf(KINDOF_IMMOBILE)),
 			("we should never have collisions between two immobile things reported"));
 
 		// the onCollide() calls can remove the object(s) from the partition mgr,
@@ -2521,7 +2534,7 @@ void PartitionContactList::processContactList()
 
  		//Before checking the "other" case, make sure that the previous collision didn't
  		//absorb him. This becomes a conflict for pilots giving veterancy to transports
- 		//and pilots entering transports. Both would occur if these isDestroyed checks 
+ 		//and pilots entering transports. Both would occur if these isDestroyed checks
  		//were missing.
  		if( !obj->isDestroyed() && !other->isDestroyed() )
  		{
@@ -2536,12 +2549,12 @@ void PartitionContactList::processContactList()
 		//
 		if (!obj->isDestroyed() && obj->friend_getPartitionData() != NULL && !obj->isKindOf(KINDOF_IMMOBILE))
 		{
-//DEBUG_LOG(("%d: re-dirtying collision of %s %08lx with %s %08lx\n",TheGameLogic->getFrame(),obj->getTemplate()->getName().str(),obj,other->getTemplate()->getName().str(),other));
+//DEBUG_LOG(("%d: re-dirtying collision of %s %08lx with %s %08lx",TheGameLogic->getFrame(),obj->getTemplate()->getName().str(),obj,other->getTemplate()->getName().str(),other));
 			obj->friend_getPartitionData()->makeDirty(false);
 		}
 		if (!other->isDestroyed() && other->friend_getPartitionData() != NULL && !other->isKindOf(KINDOF_IMMOBILE))
 		{
-//DEBUG_LOG(("%d: re-dirtying collision of %s %08lx with %s %08lx [other]\n",TheGameLogic->getFrame(),other->getTemplate()->getName().str(),other,obj->getTemplate()->getName().str(),obj));
+//DEBUG_LOG(("%d: re-dirtying collision of %s %08lx with %s %08lx [other]",TheGameLogic->getFrame(),other->getTemplate()->getName().str(),other,obj->getTemplate()->getName().str(),obj));
 			other->friend_getPartitionData()->makeDirty(false);
 		}
 	}
@@ -2567,7 +2580,7 @@ PartitionManager::PartitionManager()
 #ifdef FASTER_GCO
 	m_maxGcoRadius = 0;
 #endif
-} 
+}
 
 //-----------------------------------------------------------------------------
 PartitionManager::~PartitionManager()
@@ -2575,7 +2588,7 @@ PartitionManager::~PartitionManager()
 
 	shutdown();
 
-}  // end ~PartitionManager
+}
 
 //-----------------------------------------------------------------------------
 #ifdef PM_CACHE_TERRAIN_HEIGHT
@@ -2589,9 +2602,9 @@ static void calcHeights(const Region3D& world, Real cellSize, Int x, Int y, Real
 	Real step = cellSize / numSteps;
 	loZ = HUGE_DIST;		// huge positive
 	hiZ = -HUGE_DIST;		// huge negative
-	for (Real yy = 0; yy <= cellSize; yy += step) 
+	for (Real yy = 0; yy <= cellSize; yy += step)
 	{
-		for (Real xx = 0; xx <= cellSize; xx += step) 
+		for (Real xx = 0; xx <= cellSize; xx += step)
 		{
 			Real h = TheTerrainLogic->getGroundHeight( xbase + xx, ybase + yy );
 			if (h < loZ) loZ = h;
@@ -2693,7 +2706,7 @@ void PartitionManager::reset()
 void PartitionManager::shutdown()
 {
 	m_updatedSinceLastReset = false;
-	ThePartitionManager->removeAllDirtyModules();
+	removeAllDirtyModules();
 
 #ifdef RTS_DEBUG
 	// the above *should* remove all the touched cells (via unRegisterObject), but let's check:
@@ -2712,7 +2725,7 @@ void PartitionManager::shutdown()
 #endif
 
 	resetPendingUndoShroudRevealQueue();
-	
+
 	delete [] m_cells;
 	m_cells = NULL;
 
@@ -2733,7 +2746,7 @@ void PartitionManager::update()
 #ifdef INTENSE_DEBUG
 		Int cc = 0;
 #endif
-		if (!m_updatedSinceLastReset) 
+		if (!m_updatedSinceLastReset)
 		{
 			m_updatedSinceLastReset = true;
 		}
@@ -2748,14 +2761,14 @@ void PartitionManager::update()
 
 			// save it.
 			PartitionData *dirty = m_dirtyModules;
-			DEBUG_ASSERTCRASH(dirty->getObject() != NULL || dirty->getGhostObject() != NULL, 
+			DEBUG_ASSERTCRASH(dirty->getObject() != NULL || dirty->getGhostObject() != NULL,
 												("must be attached to an Object here %08lx",dirty));
 
 			// get this BEFORE removing from dirty list, since that clears the
 			// flag in question.
 			Bool updateEm = dirty->isInNeedOfUpdatingCells();
 			Bool collideEm = dirty->isInNeedOfCollisionCheck() && dirty->getObject();	//only update collisions if we have object
-			
+
 			// detach it from the dirty list.
 			removeFromDirtyModules(dirty);
 
@@ -2769,34 +2782,34 @@ void PartitionManager::update()
 				dirty->addPossibleCollisions(&ctList);
 			}
 		}
-		
+
 		ctList.processContactList();
 #ifdef INTENSE_DEBUG
-		DEBUG_ASSERTLOG(cc==0,("updated partition info for %d objects\n",cc));
+		DEBUG_ASSERTLOG(cc==0,("updated partition info for %d objects",cc));
 #endif
 		TheContactList = NULL;
 
 		processPendingUndoShroudRevealQueue();
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_debugThreatMap) 
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_debugThreatMap)
 	{
 		if (TheGameLogic->getFrame() % TheGlobalData->m_debugThreatMapTileDuration)
 		{
 			Int cellCount = m_cellCountX * m_cellCountY;
-			for (int i = 0; i < cellCount; ++i) 
+			for (int i = 0; i < cellCount; ++i)
 			{
-				UnsignedInt threat = m_cells[i].getThreatValue(ThePlayerList->getLocalPlayer()->getPlayerIndex());
-				if (threat > 0) 
+				UnsignedInt threat = m_cells[i].getThreatValue(rts::getObservedOrLocalPlayer()->getPlayerIndex());
+				if (threat > 0)
 				{
 					Real threatMul = INT_TO_REAL(threat) / TheGlobalData->m_maxDebugThreat;
 					if (threatMul > 1.0f)
 						threatMul = 1.0f;
 
 					Real size = TheGlobalData->m_partitionCellSize;
-					Coord3D pos = { m_cells[i].getCellX() * size, 
-													m_cells[i].getCellY() * size, 
+					Coord3D pos = { m_cells[i].getCellX() * size,
+													m_cells[i].getCellY() * size,
 													0 };
 					pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y);
 					RGBColor color;
@@ -2815,18 +2828,18 @@ void PartitionManager::update()
 		if (TheGameLogic->getFrame() % TheGlobalData->m_debugCashValueMapTileDuration)
 		{
 			Int cellCount = m_cellCountX * m_cellCountY;
-			for (int i = 0; i < cellCount; ++i) 
+			for (int i = 0; i < cellCount; ++i)
 			{
-				UnsignedInt value = m_cells[i].getCashValue(ThePlayerList->getLocalPlayer()->getPlayerIndex());
-				if (value > 0) 
+				UnsignedInt value = m_cells[i].getCashValue(rts::getObservedOrLocalPlayer()->getPlayerIndex());
+				if (value > 0)
 				{
 					Real valueMul = INT_TO_REAL(value) / TheGlobalData->m_maxDebugValue;
 					if (valueMul > 1.0f)
 						valueMul = 1.0f;
 
 					Real size = TheGlobalData->m_partitionCellSize;
-					Coord3D pos = { m_cells[i].getCellX() * size, 
-													m_cells[i].getCellY() * size, 
+					Coord3D pos = { m_cells[i].getCellX() * size,
+													m_cells[i].getCellY() * size,
 													0 };
 					pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y);
 					RGBColor color;
@@ -2836,11 +2849,11 @@ void PartitionManager::update()
 
 					addIcon(&pos, size, TheGlobalData->m_debugCashValueMapTileDuration, color);
 				}
-			}			
+			}
 		}
 	}
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-}  // end update
+#endif // defined(RTS_DEBUG)
+}
 
 //------------------------------------------------------------------------------
 void PartitionManager::registerObject( Object* object )
@@ -2852,10 +2865,10 @@ void PartitionManager::registerObject( Object* object )
 	// if object is already part of this system get out of here
 	if( object->friend_getPartitionData() != NULL )
 	{
-		DEBUG_LOG(( "Object '%s' already registered with partition manager\n",
+		DEBUG_LOG(( "Object '%s' already registered with partition manager",
 								object->getTemplate()->getName().str() ));
 		return;
-	}  // end if
+	}
 
 	// allocate a new module of partition data
 	PartitionData *mod = newInstance( PartitionData );
@@ -2927,9 +2940,9 @@ void PartitionManager::registerGhostObject( GhostObject* object)
 	// if object is already part of this system get out of here
 	if( object->friend_getPartitionData() != NULL )
 	{
-		DEBUG_LOG(( "GhostObject already registered with partition manager\n"));
+		DEBUG_LOG(( "GhostObject already registered with partition manager"));
 		return;
-	}  // end if
+	}
 
 	// allocate a new module of partition data
 	PartitionData *mod = newInstance( PartitionData );
@@ -2974,35 +2987,35 @@ void PartitionManager::unRegisterGhostObject( GhostObject* object )
 	deleteInstance(mod);
 }
 
-/** 
+/**
 	Reveals the map for the given player, but does not override Shroud generation.  (Script)
 */
 void PartitionManager::revealMapForPlayer( Int playerIndex )
 {
 	// By looking and then stopping on every cell, I clear all Passive Shroud
 	// By adding a looker directly I don't hit the Ally logic of the normal look/doShroudReveal
-	for (int i = 0; i < m_totalCellCount; ++i) 
+	for (int i = 0; i < m_totalCellCount; ++i)
 	{
 		m_cells[i].addLooker( playerIndex );
 		m_cells[i].removeLooker( playerIndex );
 	}
 }
 
-/** 
+/**
 	Reveals the map for the given player, AND permanently disables all Shroud generation (Observer Mode).
 	*/
 void PartitionManager::revealMapForPlayerPermanently( Int playerIndex )
 {
-	// By skipping the removeLooker, I consider myself as actively looking at everything, 
+	// By skipping the removeLooker, I consider myself as actively looking at everything,
 	// so Shroud generation will no longer function
 	// By adding a looker directly I don't hit the Ally logic of the normal look/doShroudReveal
-	for (int i = 0; i < m_totalCellCount; ++i) 
+	for (int i = 0; i < m_totalCellCount; ++i)
 	{
 		m_cells[i].addLooker( playerIndex );
 	}
 }
 
-/** 
+/**
 		Adds a layer of permanent blindness.  Used solely to undo the permanent reveal for debugging
 	*/
 void PartitionManager::undoRevealMapForPlayerPermanently( Int playerIndex )
@@ -3012,13 +3025,13 @@ void PartitionManager::undoRevealMapForPlayerPermanently( Int playerIndex )
 
 	// This will have amusing consequences if done without a preceding revealMapForPlayerPermanently.
 	// Everything you own can become shrouded.
-	for (int i = 0; i < m_totalCellCount; ++i) 
+	for (int i = 0; i < m_totalCellCount; ++i)
 	{
 		m_cells[i].removeLooker( playerIndex );
 	}
 }
 
-/** 
+/**
 	Resets the shroud for the given player with passive shroud (can re-explore).
 	*/
 void PartitionManager::shroudMapForPlayer( Int playerIndex )
@@ -3027,7 +3040,7 @@ void PartitionManager::shroudMapForPlayer( Int playerIndex )
 	processEntirePendingUndoShroudRevealQueue();
 
 	// By pulsing a blast of shroud like this, we will set everything not actively looked at as Passive Shroud
-	for (int i = 0; i < m_totalCellCount; ++i) 
+	for (int i = 0; i < m_totalCellCount; ++i)
 	{
 		m_cells[i].addShrouder( playerIndex );
 		m_cells[i].removeShrouder( playerIndex );
@@ -3041,7 +3054,7 @@ void PartitionManager::refreshShroudForLocalPlayer()
 	TheDisplay->clearShroud();
 	TheRadar->clearShroud();
 
-	Int playerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+	const Int playerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
 	for (int i = 0; i < m_totalCellCount; ++i)
 	{
 		Int x = m_cells[i].getCellX();
@@ -3068,7 +3081,7 @@ CellShroudStatus PartitionManager::getShroudStatusForPlayer(Int playerIndex, con
 {
 	Int x, y;
 
-	ThePartitionManager->worldToCell( loc->x, loc->y, &x, &y );
+	worldToCell( loc->x, loc->y, &x, &y );
 
 	return getShroudStatusForPlayer( playerIndex, x, y );
 }
@@ -3079,7 +3092,7 @@ ObjectShroudStatus PartitionManager::getPropShroudStatusForPlayer(Int playerInde
 {
 	Int x, y;
 
-	ThePartitionManager->worldToCell( loc->x - m_cellSize*0.5f, loc->y - m_cellSize*0.5f, &x, &y );
+	worldToCell( loc->x - m_cellSize*0.5f, loc->y - m_cellSize*0.5f, &x, &y );
 
 	CellShroudStatus cellStat = getShroudStatusForPlayer( playerIndex, x, y );
 	if (cellStat != getShroudStatusForPlayer( playerIndex, x+1, y )) {
@@ -3115,22 +3128,22 @@ Int PartitionManager::calcMinRadius(const ICoord2D& cur)
 		and objects in adjacent cells can be nearly-zero distance apart!
 	*/
 	Real halfCell = m_cellSize * 0.5;
-	Coord3D centerPos[4] = 
-	{ 
-		{ -halfCell, -halfCell }, 
-		{ halfCell, -halfCell }, 
-		{ -halfCell, halfCell }, 
-		{ halfCell, halfCell } 
+	Coord3D centerPos[4] =
+	{
+		{ -halfCell, -halfCell },
+		{ halfCell, -halfCell },
+		{ -halfCell, halfCell },
+		{ halfCell, halfCell }
 	};
 
 	Real x = cur.x * m_cellSize;
 	Real y = cur.y * m_cellSize;
-	Coord3D otherPos[4] = 
-	{ 
-		{ x - halfCell, y - halfCell }, 
-		{ x + halfCell, y - halfCell }, 
-		{ x - halfCell, y + halfCell }, 
-		{ x + halfCell, y + halfCell } 
+	Coord3D otherPos[4] =
+	{
+		{ x - halfCell, y - halfCell },
+		{ x + halfCell, y - halfCell },
+		{ x - halfCell, y + halfCell },
+		{ x + halfCell, y + halfCell }
 	};
 
 	/*
@@ -3172,9 +3185,9 @@ void PartitionManager::calcRadiusVec()
 	double dx = (double)cx * (double)cellSize;
 	double dy = (double)cy * (double)cellSize;
 	double maxPossibleDist = sqrt(dx*dx + dy*dy);
-	
+
 	m_maxGcoRadius = REAL_TO_INT_CEIL(maxPossibleDist / cellSize);
-	
+
 	m_radiusVec.clear();
 	m_radiusVec.resize(m_maxGcoRadius+1, OffsetVec());
 
@@ -3188,20 +3201,20 @@ void PartitionManager::calcRadiusVec()
 				contain objects that are <= (curRadius * cellSize) distance away from cell (0,0).
 			*/
 			Int curRadius = calcMinRadius(cur);
-			DEBUG_ASSERTCRASH(curRadius <= m_maxGcoRadius, ("expected max of %d but got %d\n",m_maxGcoRadius,curRadius));
+			DEBUG_ASSERTCRASH(curRadius <= m_maxGcoRadius, ("expected max of %d but got %d",m_maxGcoRadius,curRadius));
 			if (curRadius <= m_maxGcoRadius)
 				m_radiusVec[curRadius].push_back(cur);
 		}
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	Int total = 0;
 	for (Int i = 0; i <= m_maxGcoRadius; ++i)
 	{
 		total += m_radiusVec[i].size();
-		//DEBUG_LOG(("radius %d has %d entries\n",i,m_radiusVec[i].size()));
+		//DEBUG_LOG(("radius %d has %d entries",i,m_radiusVec[i].size()));
 	}
-	DEBUG_ASSERTCRASH(total == (cx*2-1)*(cy*2-1),("expected %d, got %d\n",(cx*2-1)*(cy*2-1),total));
+	DEBUG_ASSERTCRASH(total == (cx*2-1)*(cy*2-1),("expected %d, got %d",(cx*2-1)*(cy*2-1),total));
 #endif
 
 }
@@ -3210,11 +3223,11 @@ void PartitionManager::calcRadiusVec()
 //-----------------------------------------------------------------------------
 //DECLARE_PERF_TIMER(getClosestObjects)
 Object *PartitionManager::getClosestObjects(
-	const Object *obj, 
-	const Coord3D *pos, 
-	Real maxDist, 
-	DistanceCalculationType dc, 
-	PartitionFilter **filters, 
+	const Object *obj,
+	const Coord3D *pos,
+	Real maxDist,
+	DistanceCalculationType dc,
+	PartitionFilter **filters,
 	SimpleObjectIterator *iterArg,	// if nonnull, append ALL satisfactory objects to the iterator (not just the single closest)
 	Real *closestDistArg,
 	Coord3D *closestVecArg
@@ -3235,7 +3248,7 @@ Object *PartitionManager::getClosestObjects(
 	Int64 startTime64;
 	GetPrecisionTimer(&startTime64);
 #endif
-	
+
 #ifdef RTS_DEBUG
 	static Int theEntrancyCount = 0;
 	DEBUG_ASSERTCRASH(theEntrancyCount == 0, ("sorry, this routine is not reentrant"));
@@ -3248,7 +3261,7 @@ Object *PartitionManager::getClosestObjects(
 
 	const Coord3D *objPos;
 	const Object *objToUse;
-	if (pos) 
+	if (pos)
 	{
 		objPos = pos;
 		objToUse = NULL;
@@ -3264,6 +3277,11 @@ Object *PartitionManager::getClosestObjects(
 	Object* closestObj = NULL;
 	Real closestDistSqr = maxDist * maxDist;	// if it's not closer than this, we shouldn't consider it anyway...
 	Coord3D closestVec;
+#if !RETAIL_COMPATIBLE_CRC // TheSuperHackers @info This should be safe to initialize because it is unused, but let us be extra safe for now.
+	closestVec.x = maxDist;
+	closestVec.y = maxDist;
+	closestVec.z = maxDist;
+#endif
 
 #ifdef FASTER_GCO
 
@@ -3310,7 +3328,7 @@ Object *PartitionManager::getClosestObjects(
 				Object *thisObj = thisMod->getObject();
 
 				// never compare against ourself.
-				if (thisObj == obj || thisObj == NULL) 
+				if (thisObj == obj || thisObj == NULL)
 					continue;
 
 				// since an object can exist in multiple COIs, we use this to avoid processing
@@ -3318,7 +3336,7 @@ Object *PartitionManager::getClosestObjects(
 				if (thisMod->friend_getDoneFlag() == theIterFlag)
 					continue;
 				thisMod->friend_setDoneFlag(theIterFlag);
-			
+
 				Real thisDistSqr;
 				Coord3D distVec;
 				if (!(*distProc)(objPos, objToUse, thisObj->getPosition(), thisObj, thisDistSqr, distVec, closestDistSqr))
@@ -3344,15 +3362,15 @@ Object *PartitionManager::getClosestObjects(
 
 					if (!foundAny)
 					{
-						// if not adding to iterArg, we want to stop once we have the closest object. 
+						// if not adding to iterArg, we want to stop once we have the closest object.
 						maxRadiusLimit = curRadius;
 					}
 					foundAny = true;
 				}
 
-			} // next coi
-		}	// next cell in this radius
-  } // next radius
+			}
+		}
+  }
 
 #else // not FASTER_GCO
 
@@ -3379,20 +3397,20 @@ Object *PartitionManager::getClosestObjects(
 		for (CellAndObjectIntersection *thisCoi = thisCell->getFirstCoiInCell(); thisCoi; thisCoi = nextCoi)
 		{
 			nextCoi = thisCoi->getNextCoi();
-		
+
 			PartitionData *thisMod = thisCoi->getModule();
 
 			Object *thisObj = thisMod->getObject();
 
 			// never compare against ourself.
-			if (thisObj == obj) 
+			if (thisObj == obj)
 				continue;
 
 			if (thisMod->friend_getDoneFlag() == theIterFlag)
 				continue;
 
 			thisMod->friend_setDoneFlag(theIterFlag);
-		
+
 			// hmm, ok, calc the distance.
 			Real thisDistSqr;
 			Coord3D distVec;
@@ -3416,7 +3434,7 @@ Object *PartitionManager::getClosestObjects(
 
 				if (!foundAny)
 				{
-					// if not adding to iterArg, we want to stop once we have the closest object. 
+					// if not adding to iterArg, we want to stop once we have the closest object.
 					// since all objects in this radius (and the next radius, due to slop) might
 					// be slightly closer, we still have to check all of them. so set the termination
 					// radius to be our-current-radius-plus-1. (if we ARE adding to the iterArg, we skip
@@ -3427,7 +3445,7 @@ Object *PartitionManager::getClosestObjects(
 			}
 		}
 	}
-	
+
 #endif  // not FASTER_GCO
 
 	if (closestVecArg)
@@ -3456,10 +3474,10 @@ Object *PartitionManager::getClosestObjects(
 
 //-----------------------------------------------------------------------------
 Object *PartitionManager::getClosestObject(
-	const Object *obj, 
-	Real maxDist, 
-	DistanceCalculationType dc, 
-	PartitionFilter **filters, 
+	const Object *obj,
+	Real maxDist,
+	DistanceCalculationType dc,
+	PartitionFilter **filters,
 	Real *closestDist,
 	Coord3D *closestDistVec
 )
@@ -3469,10 +3487,10 @@ Object *PartitionManager::getClosestObject(
 
 //-----------------------------------------------------------------------------
 Object *PartitionManager::getClosestObject(
-	const Coord3D *pos, 
-	Real maxDist, 
-	DistanceCalculationType dc, 
-	PartitionFilter **filters, 
+	const Coord3D *pos,
+	Real maxDist,
+	DistanceCalculationType dc,
+	PartitionFilter **filters,
 	Real *closestDist,
 	Coord3D *closestDistVec
 )
@@ -3556,7 +3574,7 @@ Real PartitionManager::getRelativeAngle2D( const Object *obj, const Object *othe
 Real PartitionManager::getRelativeAngle2D( const Object *obj, const Coord3D *pos )
 {
 	Coord3D v;
-	
+
 	// compute vector to given position
 	Coord3D objPos = *obj->getPosition();
 	v.x = pos->x - objPos.x;
@@ -3603,10 +3621,10 @@ Real PartitionManager::getRelativeAngle2D( const Object *obj, const Coord3D *pos
 
 //-----------------------------------------------------------------------------
 SimpleObjectIterator *PartitionManager::iterateObjectsInRange(
-	const Object *obj, 
-	Real maxDist, 
-	DistanceCalculationType dc, 
-	PartitionFilter **filters, 
+	const Object *obj,
+	Real maxDist,
+	DistanceCalculationType dc,
+	PartitionFilter **filters,
 	IterOrderType order
 )
 {
@@ -3623,10 +3641,10 @@ SimpleObjectIterator *PartitionManager::iterateObjectsInRange(
 
 //-----------------------------------------------------------------------------
 SimpleObjectIterator *PartitionManager::iterateObjectsInRange(
-	const Coord3D *pos, 
-	Real maxDist, 
-	DistanceCalculationType dc, 
-	PartitionFilter **filters, 
+	const Coord3D *pos,
+	Real maxDist,
+	DistanceCalculationType dc,
+	PartitionFilter **filters,
 	IterOrderType order
 )
 {
@@ -3643,12 +3661,12 @@ SimpleObjectIterator *PartitionManager::iterateObjectsInRange(
 
 //-----------------------------------------------------------------------------
 SimpleObjectIterator* PartitionManager::iteratePotentialCollisions(
-	const Coord3D* pos, 
+	const Coord3D* pos,
 	const GeometryInfo& geom,
 	Real angle,
 	Bool use2D
 )
-{	
+{
 	Real maxDist = geom.getBoundingSphereRadius();
 	maxDist *= 1.1f;	// just a little slop
 
@@ -3786,18 +3804,18 @@ Bool PartitionManager::tryPosition( const Coord3D *center,
 		else if( isUnderwater == TRUE && layer == LAYER_GROUND )
 			return FALSE;
 
-	}  // end if
+	}
 
 	// object checks
 	if( BitIsSet( options->flags, FPF_IGNORE_ALL_OBJECTS ) == FALSE )
 	{
 
 		//
-		// iterate the potential collisions at this location using a 
+		// iterate the potential collisions at this location using a
 		// very small sphere geometry around the point
 		//
 		GeometryInfo geometry( GEOMETRY_SPHERE, TRUE, 5.0f, 5.0f, 5.0f );
-		ObjectIterator *iter = ThePartitionManager->iteratePotentialCollisions( &pos, geometry, angle, true );
+		ObjectIterator *iter = iteratePotentialCollisions( &pos, geometry, angle, true );
 		MemoryPoolObjectHolder hold( iter );
 //	Bool overlap = FALSE;
 
@@ -3836,7 +3854,7 @@ Bool PartitionManager::tryPosition( const Coord3D *center,
 						them->isKindOf( KINDOF_STRUCTURE ) )
 					continue;
 
-			}  // end if, relationship checks
+			}
 
 			//
 			// if we have a source that must path to the destination we will ignore that too
@@ -3851,9 +3869,9 @@ Bool PartitionManager::tryPosition( const Coord3D *center,
 			// oops, we have overlapped something
 			return FALSE;
 
-		}  // end for, them
+		}
 
-	}  // end if
+	}
 
 	//
 	// finally ... if sourceToPathDest is valid ... the source object must be able to
@@ -3870,13 +3888,13 @@ Bool PartitionManager::tryPosition( const Coord3D *center,
 																									&pos ) == FALSE )
 				return FALSE;
 
-	}  // end if
+	}
 
 	// save result and return TRUE for position found
 	*result = pos;
 	return TRUE;
 
-}  // end tryPosition
+}
 
 //
 // the following determines how fast we expand our concentric ring search for the
@@ -3889,11 +3907,11 @@ static Real ringSpacing = 5.0f;
 	* at least minRadis away from it, but no more than maxRadius away.
 	*
 	* Return TRUE if position is found and that position is returned in 'result'
-	* return FALSE no legal position exists or invalid params 
+	* return FALSE no legal position exists or invalid params
 	*/
 //-------------------------------------------------------------------------------------------------
-Bool PartitionManager::findPositionAround( const Coord3D *center, 
-																					 const FindPositionOptions *options, 
+Bool PartitionManager::findPositionAround( const Coord3D *center,
+																					 const FindPositionOptions *options,
 																					 Coord3D *result )
 {
 
@@ -3912,7 +3930,7 @@ Bool PartitionManager::findPositionAround( const Coord3D *center,
 	// sanity, FPF_IGNORE_WATER and FPF_WATER_ONLY are mutually exclusive
 	DEBUG_ASSERTCRASH( !(BitIsSet( options->flags, FPF_IGNORE_WATER ) == TRUE &&
 										   BitIsSet( options->flags, FPF_WATER_ONLY ) == TRUE),
-										 ("PartitionManager::findPositionAround - The options FPF_WATER_ONLY and FPF_IGNORE_WATER are mutually exclusive.  You cannot use them together\n") );
+										 ("PartitionManager::findPositionAround - The options FPF_WATER_ONLY and FPF_IGNORE_WATER are mutually exclusive.  You cannot use them together") );
 
 	// pick a random angle from the center location to start at
 	Real startAngle;
@@ -3957,30 +3975,30 @@ Bool PartitionManager::findPositionAround( const Coord3D *center,
 			//
 			if( i != 0 )
 				if( tryPosition( center, dist, startAngle - angleSpacing * i, options, result ) == TRUE )
-					return TRUE;	
+					return TRUE;
 
-		}  // end if
+		}
 
-	}  // end for, dist
+	}
 
 	// no position was able to be found
 	return FALSE;
 
-}  // end findPositionAround
+}
 
 //-----------------------------------------------------------------------------
 // This is the main accessor of the shroud system.  At this level, allies are taken
 // into consideration as specified by the caller.  Look/Unlook are the ones sending Ally info, as that
 // is in Object where Allies make sense.  AddLooker literally just adds a looker for the player you specify.
-// This way, Full map reveals and Observer mode active look will not carry over to all 
+// This way, Full map reveals and Observer mode active look will not carry over to all
 // allies.  They'll use the RevealWholeDamnMap series, which call addLooker directly.
-void PartitionManager::doShroudReveal(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask) 
+void PartitionManager::doShroudReveal(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	DiscreteCircle circle(cellCenterX, cellCenterY, cellRadius);
@@ -3996,7 +4014,7 @@ void PartitionManager::doShroudReveal(Real centerX, Real centerY, Real radius, P
 		}
 	}
 }
-	
+
 //-----------------------------------------------------------------------------
 void PartitionManager::processPendingUndoShroudRevealQueue( Bool considerTimestamp )
 {
@@ -4041,13 +4059,13 @@ void PartitionManager::resetPendingUndoShroudRevealQueue()
 }
 
 //-----------------------------------------------------------------------------
-void PartitionManager::undoShroudReveal(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask) 
+void PartitionManager::undoShroudReveal(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	DiscreteCircle circle(cellCenterX, cellCenterY, cellRadius);
@@ -4061,9 +4079,9 @@ void PartitionManager::undoShroudReveal(Real centerX, Real centerY, Real radius,
 		}
 	}
 }
-	
+
 //-----------------------------------------------------------------------------
-void PartitionManager::queueUndoShroudReveal(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask) 
+void PartitionManager::queueUndoShroudReveal(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask)
 {
 	UnsignedInt now = TheGameLogic->getFrame();
 	SightingInfo *newInfo = newInstance(SightingInfo);
@@ -4076,15 +4094,15 @@ void PartitionManager::queueUndoShroudReveal(Real centerX, Real centerY, Real ra
 
 	m_pendingUndoShroudReveals.push(newInfo);
 }
-	
+
 //-----------------------------------------------------------------------------
-void PartitionManager::doShroudCover(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask) 
+void PartitionManager::doShroudCover(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	DiscreteCircle circle(cellCenterX, cellCenterY, cellRadius);
@@ -4102,13 +4120,13 @@ void PartitionManager::doShroudCover(Real centerX, Real centerY, Real radius, Pl
 }
 
 //-----------------------------------------------------------------------------
-void PartitionManager::undoShroudCover(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask) 
+void PartitionManager::undoShroudCover(Real centerX, Real centerY, Real radius, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	DiscreteCircle circle(cellCenterX, cellCenterY, cellRadius);
@@ -4127,12 +4145,12 @@ void PartitionManager::undoShroudCover(Real centerX, Real centerY, Real radius,
 void PartitionManager::doThreatAffect( Real centerX, Real centerY, Real radius, UnsignedInt threatVal, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 	Real fCellCenterX = INT_TO_REAL(cellCenterX);
 	Real fCellCenterY = INT_TO_REAL(cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	Real fCellRadius = INT_TO_REAL(cellRadius + 1);
@@ -4160,12 +4178,12 @@ void PartitionManager::doThreatAffect( Real centerX, Real centerY, Real radius,
 void PartitionManager::undoThreatAffect( Real centerX, Real centerY, Real radius, UnsignedInt threatVal, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 	Real fCellCenterX = INT_TO_REAL(cellCenterX);
 	Real fCellCenterY = INT_TO_REAL(cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	Real fCellRadius = INT_TO_REAL(cellRadius + 1);
@@ -4193,12 +4211,12 @@ void PartitionManager::undoThreatAffect( Real centerX, Real centerY, Real radius
 void PartitionManager::doValueAffect( Real centerX, Real centerY, Real radius, UnsignedInt valueVal, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 	Real fCellCenterX = INT_TO_REAL(cellCenterX);
 	Real fCellCenterY = INT_TO_REAL(cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	Real fCellRadius = INT_TO_REAL(cellRadius + 1);
@@ -4226,12 +4244,12 @@ void PartitionManager::doValueAffect( Real centerX, Real centerY, Real radius, U
 void PartitionManager::undoValueAffect( Real centerX, Real centerY, Real radius, UnsignedInt valueVal, PlayerMaskType playerMask)
 {
 	Int cellCenterX, cellCenterY;
-	ThePartitionManager->worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
+	worldToCell(centerX, centerY, &cellCenterX, &cellCenterY);
 	Real fCellCenterX = INT_TO_REAL(cellCenterX);
 	Real fCellCenterY = INT_TO_REAL(cellCenterY);
 
-	Int cellRadius = ThePartitionManager->worldToCellDist(radius);
-	if (cellRadius < 1) 
+	Int cellRadius = worldToCellDist(radius);
+	if (cellRadius < 1)
 		cellRadius = 1;
 
 	Real fCellRadius = INT_TO_REAL(cellRadius + 1);
@@ -4243,7 +4261,7 @@ void PartitionManager::undoValueAffect( Real centerX, Real centerY, Real radius,
 	parms.threatOrValue = valueVal;
 	parms.xCenter = fCellCenterX;
 	parms.yCenter = fCellCenterY;
-	
+
 	for( Int currentIndex = ThePlayerList->getPlayerCount() - 1; currentIndex >=0; currentIndex-- )
 	{
 		const Player *currentPlayer = ThePlayerList->getNthPlayer( currentIndex );
@@ -4279,7 +4297,7 @@ void PartitionManager::getCellCenterPos(Int x, Int y, Real& xx, Real& yy)
 static Int checkTerrainExtreme(PartitionCell* cell, void* userData)
 {
 	TerrainExtremeData* data = (TerrainExtremeData*)userData;
-	
+
 	data->isValid = true;
 
 	Real tmp;
@@ -4287,7 +4305,7 @@ static Int checkTerrainExtreme(PartitionCell* cell, void* userData)
 	if (data->minZ)
 	{
 		tmp = cell->getLoTerrain();
-		if (tmp < *data->minZ ) 
+		if (tmp < *data->minZ )
 		{
 			*data->minZ = tmp;
 			if (data->minZPos)
@@ -4300,7 +4318,7 @@ static Int checkTerrainExtreme(PartitionCell* cell, void* userData)
 	if (data->maxZ)
 	{
 		tmp = cell->getHiTerrain();
-		if (tmp > *data->maxZ ) 
+		if (tmp > *data->maxZ )
 		{
 			*data->maxZ = tmp;
 			if (data->maxZPos)
@@ -4394,7 +4412,7 @@ Int PartitionManager::iterateCellsAlongLine(const Coord3D& pos, const Coord3D& p
 
 	for (Int curpixel = 0; curpixel <= numpixels; curpixel++)
 	{
-		PartitionCell* cell = ThePartitionManager->getCellAt(x, y);	// might be null if off the edge
+		PartitionCell* cell = getCellAt(x, y);	// might be null if off the edge
 		DEBUG_ASSERTCRASH(cell != NULL, ("off the map"));
 		if (cell)
 		{
@@ -4413,7 +4431,7 @@ Int PartitionManager::iterateCellsAlongLine(const Coord3D& pos, const Coord3D& p
 		x += xinc2;												// Change the x as appropriate
 		y += yinc2;												// Change the y as appropriate
 	}
-	
+
 	return 0;
 }
 
@@ -4427,8 +4445,8 @@ Int PartitionManager::iterateCellsBreadthFirst(const Coord3D *pos, CellBreadthFi
 	// -1 means error, but we should add a define later for this.
 
 	Int cellX, cellY;
-	ThePartitionManager->worldToCell(pos->x, pos->y, &cellX, &cellY);
-	
+	worldToCell(pos->x, pos->y, &cellX, &cellY);
+
 	// Note, bool. not Bool, cause bool will cause this to be a bitfield.
 	std::vector<bool> bitField;
 	Int cellCount = m_cellCountX * m_cellCountY;
@@ -4504,7 +4522,7 @@ static Real calcDist2D(Real x1, Real y1, Real x2, Real y2)
 Bool PartitionManager::isClearLineOfSightTerrain(const Object* obj, const Coord3D& objPos, const Object* other, const Coord3D& otherPos)
 {
 	Coord3D pos, posOther;
-	
+
 	if (obj)
 	{
 		pos = *obj->getPosition();
@@ -4551,7 +4569,7 @@ Bool PartitionManager::isClearLineOfSightTerrain(const Object* obj, const Coord3
 
 	Real totalDist2D = calcDist2D(pos.x, pos.y, posOther.x, posOther.y);
 	Real terrainDist2D = calcDist2D(pos.x, pos.y, maxZPos.x, maxZPos.y);
-	
+
 	const Real TINY_DIST = 0.01f;
 	Real percent = (totalDist2D > TINY_DIST) ? (terrainDist2D / totalDist2D) : 0.0f;
 	if (percent < 0.0f) percent = 0.0f;
@@ -4564,7 +4582,7 @@ Bool PartitionManager::isClearLineOfSightTerrain(const Object* obj, const Coord3
 	const Real LOS_FUDGE = 0.5f;
 	if (terrainAtHighPoint > lineOfSightAtHighPoint + LOS_FUDGE)
 	{
-		//DEBUG_LOG(("isClearLineOfSightTerrain fails\n"));
+		//DEBUG_LOG(("isClearLineOfSightTerrain fails"));
 		return false;
 	}
 
@@ -4586,7 +4604,7 @@ void PartitionManager::crc( Xfer *xfer )
 		m_cells[i].crc(xfer);
 	}
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -4615,24 +4633,24 @@ void PartitionManager::xfer( Xfer *xfer )
 	if( cellSize != m_cellSize )
 	{
 
-		DEBUG_CRASH(( "Partition cell size has changed, this save game file is invalid\n" ));
+		DEBUG_CRASH(( "Partition cell size has changed, this save game file is invalid" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// cell count
 	Int totalCellCount = m_totalCellCount;
 	xfer->xferInt( &totalCellCount );
-	
+
 	// total cell count better match what we have allocated for cells in the partition manager
 	if( totalCellCount != m_totalCellCount )
 	{
 
-		DEBUG_CRASH(( "Partition total cell count mismatch %d, should be %d\n",
+		DEBUG_CRASH(( "Partition total cell count mismatch %d, should be %d",
 									totalCellCount, m_totalCellCount ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// xfer each cell information
 	PartitionCell *cell;
@@ -4645,7 +4663,7 @@ void PartitionManager::xfer( Xfer *xfer )
 		// xfer the data for this cell
 		xfer->xferSnapshot( cell );
 
-	}  // end for i
+	}
 
 	// when loading tell the partition manager to rethink and refresh all shroud information
 	if( xfer->getXferMode() == XFER_LOAD )
@@ -4657,21 +4675,21 @@ void PartitionManager::xfer( Xfer *xfer )
 		// refresh the shroud for the local player which will update the radar and everything
 		refreshShroudForLocalPlayer();
 
-	}  // end if
+	}
 
 	if( version >= 2 )
 	{
 		Int queueSize = m_pendingUndoShroudReveals.size();
 		xfer->xferInt(&queueSize);
-		// This xfer thing is still cool.  On save, I just wrote the number of elements.  On load, the first line 
+		// This xfer thing is still cool.  On save, I just wrote the number of elements.  On load, the first line
 		// above was a decoy, and the second found out the size.
 
 		if(xfer->getXferMode() == XFER_LOAD)
 		{
-			// have to remove this assert, because during load there is a setTeam call for each guy on a sub-team, and that results 
+			// have to remove this assert, because during load there is a setTeam call for each guy on a sub-team, and that results
 			// in a queued unlook, so we actually have stuff in here at the start.  I am fairly certain that setTeam should wait
 			// until loadPostProcess, but I ain't gonna change it now.
-//			DEBUG_ASSERTCRASH(m_pendingUndoShroudReveals.size() == 0, ("At load, we appear to not be in a reset state.") );
+//			DEBUG_ASSERTCRASH(m_pendingUndoShroudReveals.empty(), ("At load, we appear to not be in a reset state.") );
 
 			// I have to split this up though, since on Load I need to make new instances.
 			for( Int infoIndex = 0; infoIndex < queueSize; infoIndex++ )
@@ -4700,7 +4718,7 @@ void PartitionManager::xfer( Xfer *xfer )
 		// Version 1 save games will just not have any SightingInfos in the queue to be undone.
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4708,7 +4726,7 @@ void PartitionManager::xfer( Xfer *xfer )
 void PartitionManager::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-----------------------------------------------------------------------------
 Real PartitionManager::getGroundOrStructureHeight(Real posx, Real posy)
@@ -4737,7 +4755,7 @@ Real PartitionManager::getGroundOrStructureHeight(Real posx, Real posy)
 			tallestHeight = thisHeight;
 
 	}
-		
+
   return terrainHeightHere + tallestHeight;
 }
 
@@ -4752,10 +4770,10 @@ void PartitionManager::getMostValuableLocation( Int playerIndex, UnsignedInt whi
 		return;
 
 	Int cellCount = m_cellCountX * m_cellCountY;
-	
+
 	PlayerMaskType allPlayerMasks[MAX_PLAYER_COUNT] = { 0 };
 	Int totalPlayerCount = ThePlayerList->getPlayerCount();
-	
+
 	Int i;
 	for (i = 0; i < totalPlayerCount; ++i) {
 		Player *player = ThePlayerList->getNthPlayer(i);
@@ -4808,10 +4826,10 @@ void PartitionManager::getNearestGroupWithValue( Int playerIndex, UnsignedInt wh
 	PlayerMaskType playerMask = ThePlayerList->getPlayersWithRelationship(playerIndex, whichPlayerTypes);
 	if (playerMask == 0)
 		return;
-	
+
 	PlayerMaskType allPlayerMasks[MAX_PLAYER_COUNT] = { 0 };
 	Int totalPlayerCount = ThePlayerList->getPlayerCount();
-	
+
 	Int i;
 	for (i = 0; i < totalPlayerCount; ++i) {
 		Player *player = ThePlayerList->getNthPlayer(i);
@@ -4827,9 +4845,9 @@ void PartitionManager::getNearestGroupWithValue( Int playerIndex, UnsignedInt wh
 	parms.greaterThan = valueRequired;
 	parms.valueType = valType;
 	parms.allowedPlayersMasks = playerMask;
-	for (i = 0; i < MAX_PLAYER_COUNT; ++i) 
+	for (i = 0; i < MAX_PLAYER_COUNT; ++i)
 		parms.allPlayersMask[i] = allPlayerMasks[i];
-	
+
 	Int nearestGreat = iterateCellsBreadthFirst(sourceLocation, cellValueProc, &parms);
 	if (nearestGreat != -1) {
 		(*outLocation).x = m_cells[nearestGreat].getCellX() * TheGlobalData->m_partitionCellSize;
@@ -4848,7 +4866,7 @@ void PartitionManager::storeFoggedCells(ShroudStatusStoreRestore &outPartitionSt
 	if (storeToFog) {
 		// This is the first pass
 		outPartitionStore.m_cellsWide = m_cellCountX;
-		
+
 		// Resize all of our arrays.
 		for (p = 0; p < MAX_PLAYER_COUNT; ++p) {
 			outPartitionStore.m_foggedOrRevealed[p].resize(m_totalCellCount);
@@ -4866,12 +4884,12 @@ void PartitionManager::storeFoggedCells(ShroudStatusStoreRestore &outPartitionSt
 
 		for (j = 0; j < m_cellCountY; ++j) {
 			for (i = 0; i < m_cellCountX; ++i) {
-				UnsignedByte &byteToWrite = outPartitionStore.m_foggedOrRevealed[p][j * m_cellCountX + i]; 
+				UnsignedByte &byteToWrite = outPartitionStore.m_foggedOrRevealed[p][j * m_cellCountX + i];
 
 				if (storeToFog && m_cells[j * m_cellCountX + i].getShroudStatusForPlayer(p) == CELLSHROUD_FOGGED) {
 					byteToWrite = STORE_FOG;
 				}
-					
+
 				if (!storeToFog && m_cells[j * m_cellCountX + i].getShroudStatusForPlayer(p) == CELLSHROUD_CLEAR) {
 					byteToWrite = STORE_PERMANENTLY_REVEALED;
 				}
@@ -4927,10 +4945,10 @@ void PartitionManager::restoreFoggedCells(const ShroudStatusStoreRestore &inPart
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-PartitionFilterRejectBuildings::PartitionFilterRejectBuildings(const Object *o) : 
+PartitionFilterRejectBuildings::PartitionFilterRejectBuildings(const Object *o) :
 	m_self(o),
 	m_acquireEnemies(false)
-{ 
+{
 	// if I am a computer-controlled opponent, auto-aquire enemy buildings
 	if (m_self->getControllingPlayer()->getPlayerType() == PLAYER_COMPUTER)
 	{
@@ -5005,7 +5023,7 @@ Bool PartitionFilterInsignificantBuildings::allow( Object *other )
 			}
 		}
 		return true;
-		
+
 	} else {
 		if (m_allowNonBuildings) {
 			return true;
@@ -5024,23 +5042,23 @@ Bool PartitionFilterInsignificantBuildings::allow( Object *other )
 
 Bool PartitionFilterRepulsor::allow( Object *other )
 {
-	if (other == m_self) 
+	if (other == m_self)
 	{
 		// don't repulse yourself. :)
 		return false;
 	}
 
 	// If it's flagged, it's a repulsor.
-	if (other->testStatus(OBJECT_STATUS_REPULSOR)) 
+	if (other->testStatus(OBJECT_STATUS_REPULSOR))
 	{
 		return	true;
 	}
 
-	if (other->isEffectivelyDead()) 
+	if (other->isEffectivelyDead())
 		return false; // no dead enemies.
 
 	Relationship r = m_self->getRelationship(other);
-	if (r != ENEMIES) 
+	if (r != ENEMIES)
 	{
 		return false; // only enemies auto repulse.
 	}
@@ -5052,7 +5070,7 @@ Bool PartitionFilterRepulsor::allow( Object *other )
 			return true;
 		return false;
 	}
-	
+
 	if ( other->isKindOf( KINDOF_INERT ))
 		return false;
 
@@ -5100,7 +5118,7 @@ Bool PartitionFilterPlayerAffiliation::allow( Object *other )
 	Relationship rel = m_player->getRelationship(other->getTeam());
 	switch (rel)
 	{
-		case ENEMIES:	
+		case ENEMIES:
 			if (m_affiliation & ALLOW_ENEMIES) {
 				return m_match;
 			}
@@ -5120,7 +5138,7 @@ Bool PartitionFilterPlayerAffiliation::allow( Object *other )
 	}
 
 	if (other->getControllingPlayer() == m_player) {
-		return m_match;		
+		return m_match;
 	}
 
 	return !m_match;
@@ -5194,7 +5212,7 @@ Bool PartitionFilterWouldCollide::allow(Object *objOther)
   Bool doesCollide;
 
 	// invariant for all geometries: first do z collision check.
-	if (thisInfo.position.z + thisInfo.geom.getMaxHeightAbovePosition() >= thatInfo.position.z && 
+	if (thisInfo.position.z + thisInfo.geom.getMaxHeightAbovePosition() >= thatInfo.position.z &&
 			thisInfo.position.z <= thatInfo.position.z + thatInfo.geom.getMaxHeightAbovePosition())
 	{
 		GeometryType thisGeom = m_geom.getGeomType();
@@ -5254,7 +5272,7 @@ PartitionFilterAcceptOnTeam::PartitionFilterAcceptOnTeam(const Team *team) : m_t
 }
 
 //-----------------------------------------------------------------------------
-Bool PartitionFilterAcceptOnTeam::allow(Object *objOther) 
+Bool PartitionFilterAcceptOnTeam::allow(Object *objOther)
 {
 	// objOther is guaranteed to be non-null, so we don't need to check (srj)
 	return (objOther->getTeam() == m_team);
@@ -5374,12 +5392,10 @@ PartitionFilterPossibleToAttack::PartitionFilterPossibleToAttack(AbleToAttackTyp
 Bool PartitionFilterPossibleToAttack::allow(Object *objOther)
 {
 	// objOther is guaranteed to be non-null, so we don't need to check (srj)
-	
+
 	// we should have already filtered out isAbleToAttack!
-#ifdef RTS_DEBUG
-	// disable this assert for INTERNAL builds (srj)
-	DEBUG_ASSERTCRASH(m_obj && m_obj->isAbleToAttack(), ("if the object is unable to attack at all, you should filter that out ahead of time!"));
-#endif
+	DEBUG_ASSERTCRASH(m_obj->isAbleToAttack(), ("if the object is unable to attack at all, you should filter that out ahead of time!"));
+
 	CanAttackResult result = m_obj->getAbleToAttackSpecificObject( m_attackType, objOther, m_commandSource );
 	if( result == ATTACKRESULT_POSSIBLE || result == ATTACKRESULT_POSSIBLE_AFTER_MOVING )
 	{
@@ -5399,7 +5415,7 @@ PartitionFilterPossibleToEnter::PartitionFilterPossibleToEnter(const Object *obj
 //-----------------------------------------------------------------------------
 Bool PartitionFilterPossibleToEnter::allow(Object *objOther)
 {
-	if (!objOther || !m_obj) 
+	if (!objOther || !m_obj)
 		return FALSE;
 
 	if( TheActionManager->canEnterObject( m_obj, objOther, m_commandSource, DONT_CHECK_CAPACITY ) )
@@ -5420,7 +5436,7 @@ PartitionFilterPossibleToHijack::PartitionFilterPossibleToHijack(const Object *o
 //-----------------------------------------------------------------------------
 Bool PartitionFilterPossibleToHijack::allow(Object *objOther)
 {
-	if (!objOther || !m_obj) 
+	if (!objOther || !m_obj)
 		return FALSE;
 
 	if( TheActionManager->canHijackVehicle(m_obj, objOther, m_commandSource) )
@@ -5433,7 +5449,7 @@ Bool PartitionFilterPossibleToHijack::allow(Object *objOther)
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-PartitionFilterLastAttackedBy::PartitionFilterLastAttackedBy(Object *obj) 
+PartitionFilterLastAttackedBy::PartitionFilterLastAttackedBy(Object *obj)
 {
 	if (obj && obj->getBodyModule()) {
 		m_lastAttackedBy = obj->getBodyModule()->getLastDamageInfo()->in.m_sourceID;
@@ -5460,7 +5476,7 @@ Bool PartitionFilterLastAttackedBy::allow(Object *other)
 
 //-----------------------------------------------------------------------------
 Bool PartitionFilterAcceptByObjectStatus::allow(Object *objOther)
-{ 
+{
 	ObjectStatusMaskType status = objOther->getStatusBits();
 	return status.testForAll( m_mustBeSet ) && status.testForNone( m_mustBeClear );
 }
@@ -5472,7 +5488,7 @@ Bool PartitionFilterAcceptByObjectStatus::allow(Object *objOther)
 
 //-----------------------------------------------------------------------------
 Bool PartitionFilterRejectByObjectStatus::allow(Object *objOther)
-{ 
+{
 	ObjectStatusMaskType status = objOther->getStatusBits();
 
 	return !( status.testForAll( m_mustBeSet ) && status.testForNone( m_mustBeClear ) );
@@ -5497,7 +5513,7 @@ Bool PartitionFilterAcceptByKindOf::allow(Object *objOther)
 //-----------------------------------------------------------------------------
 Bool PartitionFilterRejectByKindOf::allow(Object *objOther)
 {
-	return !objOther->isKindOfMulti(m_mustBeSet, m_mustBeClear); 
+	return !objOther->isKindOfMulti(m_mustBeSet, m_mustBeClear);
 }
 
 
@@ -5524,7 +5540,7 @@ Bool PartitionFilterStealthedAndUndetected::allow( Object *objOther )
 		else if( disguised )
 		{
 			//Exception case -- bomb trucks can't be considered stealthed units when they are disguised as the enemy.
-      
+
       StealthUpdate *update = objOther->getStealth();
 
 			if( update && update->isDisguised() )
@@ -5597,7 +5613,7 @@ static int cellValueProc(PartitionCell* cell, void* userData)
 		}
 	}
 
-	if ((val > parms->valueRequired && parms->greaterThan) || 
+	if ((val > parms->valueRequired && parms->greaterThan) ||
 			(val < parms->valueRequired && !parms->greaterThan)) {
 		return 1;
 	}
@@ -5692,7 +5708,7 @@ static void hLineAddThreat(Int x1, Int x2, Int y, void *threatValueParms)
 
 		distance = sqrt( pow(x - parms->xCenter, 2) + pow(y - parms->yCenter, 2) );
 		mulVal = 1 - distance / parms->radius;
-		if (mulVal < 0.0f) 
+		if (mulVal < 0.0f)
 			mulVal = 0.0f;
 		else if (mulVal > 1.0f)
 			mulVal = 1.0f;
@@ -5720,11 +5736,11 @@ static void hLineRemoveThreat(Int x1, Int x2, Int y, void *threatValueParms)
 
 		distance = sqrt( pow(x - parms->xCenter, 2) + pow(y - parms->yCenter, 2) );
 		mulVal = 1 - distance / parms->radius;
-		if (mulVal < 0.0f) 
+		if (mulVal < 0.0f)
 			mulVal = 0.0f;
 		else if (mulVal > 1.0f)
 			mulVal = 1.0f;
-		
+
 		cell->removeThreatValue( parms->playerIndex, REAL_TO_UNSIGNEDINT(parms->threatOrValue * mulVal) );
 	}
 }
@@ -5748,11 +5764,11 @@ static void hLineAddValue(Int x1, Int x2, Int y, void *threatValueParms)
 
 		distance = sqrt( pow(x - parms->xCenter, 2) + pow(y - parms->yCenter, 2) );
 		mulVal = 1 - distance / parms->radius;
-		if (mulVal < 0.0f) 
+		if (mulVal < 0.0f)
 			mulVal = 0.0f;
 		else if (mulVal > 1.0f)
 			mulVal = 1.0f;
-		
+
 		cell->addCashValue( parms->playerIndex, REAL_TO_UNSIGNEDINT(parms->threatOrValue * mulVal) );
 	}
 }
@@ -5776,7 +5792,7 @@ static void hLineRemoveValue(Int x1, Int x2, Int y, void *threatValueParms)
 
 		distance = sqrt( pow(x - parms->xCenter, 2) + pow(y - parms->yCenter, 2) );
 		mulVal = 1 - distance / parms->radius;
-		if (mulVal < 0.0f) 
+		if (mulVal < 0.0f)
 			mulVal = 0.0f;
 		else if (mulVal > 1.0f)
 			mulVal = 1.0f;
@@ -5787,7 +5803,7 @@ static void hLineRemoveValue(Int x1, Int x2, Int y, void *threatValueParms)
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-SightingInfo::SightingInfo() 
+SightingInfo::SightingInfo()
 {
 	reset();
 }
@@ -5816,7 +5832,7 @@ Bool SightingInfo::isInvalid() const
 void SightingInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -5843,7 +5859,7 @@ void SightingInfo::xfer( Xfer *xfer )
 	// how much
 	xfer->xferUnsignedInt( &m_data );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -5851,11 +5867,11 @@ void SightingInfo::xfer( Xfer *xfer )
 void SightingInfo::loadPostProcess()
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 SightingInfo::~SightingInfo()
 {
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SimpleObjectIterator.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SimpleObjectIterator.cpp
index 3845fc00d7e..d31cb753e99 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SimpleObjectIterator.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SimpleObjectIterator.cpp
@@ -25,7 +25,7 @@
 // SimpleObjectIterator
 // Implementation of a simple object iterator
 // Author: Steven Johnson, September 2001
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameLogic/ObjectIter.h"
 
@@ -35,8 +35,8 @@
 
 /// @todo Doxygenize this file
 
-SimpleObjectIterator::ClumpCompareProc SimpleObjectIterator::theClumpCompareProcs[] = 
-{ 
+SimpleObjectIterator::ClumpCompareProc SimpleObjectIterator::theClumpCompareProcs[] =
+{
 	NULL,						// "fastest" gets no proc
 	SimpleObjectIterator::sortNearToFar,
 	SimpleObjectIterator::sortFarToNear,
@@ -99,7 +99,7 @@ Object *SimpleObjectIterator::nextWithNumeric(Real *num)
 			*num = m_curClump->m_numeric;
 		m_curClump = m_curClump->m_nextClump;
 	}
-		
+
 	return obj;
 }
 
@@ -134,10 +134,10 @@ void SimpleObjectIterator::sort(IterOrderType order)
 
 #ifdef INTENSE_DEBUG
 {
-	DEBUG_LOG(("\n\n---------- BEFORE sort for %d -----------\n",order));
+	DEBUG_LOG(("\n\n---------- BEFORE sort for %d -----------",order));
 	for (Clump *p = m_firstClump; p; p = p->m_nextClump)
 	{
-		DEBUG_LOG(("    obj %08lx numeric %f\n",p->m_obj,p->m_numeric));
+		DEBUG_LOG(("    obj %08lx numeric %f",p->m_obj,p->m_numeric));
 	}
 }
 #endif
@@ -150,7 +150,7 @@ void SimpleObjectIterator::sort(IterOrderType order)
 	// do a basic mergesort, which works nicely for linked lists,
 	// and is reasonably efficient (N log N).
 
-  for ( Int n = 1 ; ; n *= 2 ) 
+  for ( Int n = 1 ; ; n *= 2 )
 	{
 		Clump *to_do = m_firstClump;
 		Clump *tail = NULL;
@@ -158,19 +158,19 @@ void SimpleObjectIterator::sort(IterOrderType order)
 
 		Int mergeCount = 0;
 
-		while (to_do) 
+		while (to_do)
 		{
 			++mergeCount;
 
 			Int to_do_count = 0;
-			
+
 			// make two lists of length 'n' (to_do is one, sub is the other)
 			Clump *sub = to_do;
-			for (Int i = 0; i < n; i++) 
+			for (Int i = 0; i < n; i++)
 			{
 				++to_do_count;
 				sub = sub->m_nextClump;
-				if (!sub) 
+				if (!sub)
 					break;
 			}
 			Int subCount = sub ? n : 0;
@@ -180,44 +180,44 @@ void SimpleObjectIterator::sort(IterOrderType order)
 			while (to_do_count + subCount > 0) {
 
 				DEBUG_ASSERTCRASH(to_do_count + subCount >= 0, ("uhoh"));
-	
+
 				Clump *tmp;
-				
+
 				// bleah, coalesce into more elegant test case
 				if (subCount == 0)
 				{
 					DEBUG_ASSERTCRASH(to_do_count > 0, ("hmm, expected nonzero to_do_count"));
-					tmp = to_do; 
-					to_do = to_do->m_nextClump; 
+					tmp = to_do;
+					to_do = to_do->m_nextClump;
 					--to_do_count;
 				}
 				else if (to_do_count == 0)
 				{
 					DEBUG_ASSERTCRASH(subCount > 0, ("hmm, expected nonzero subCount"));
-					tmp = sub; 
-					sub = sub->m_nextClump; 
+					tmp = sub;
+					sub = sub->m_nextClump;
 					--subCount;
-				} 
-				else if ((*cmpProc)(to_do, sub) <= 0.0f) 
+				}
+				else if ((*cmpProc)(to_do, sub) <= 0.0f)
 				{
 					DEBUG_ASSERTCRASH(to_do_count > 0, ("hmm, expected nonzero to_do_count"));
-					tmp = to_do; 
-					to_do = to_do->m_nextClump; 
+					tmp = to_do;
+					to_do = to_do->m_nextClump;
 					--to_do_count;
-				} 
-				else 
+				}
+				else
 				{
 					DEBUG_ASSERTCRASH(subCount > 0, ("hmm, expected nonzero subCount"));
-					tmp = sub; 
-					sub = sub->m_nextClump; 
+					tmp = sub;
+					sub = sub->m_nextClump;
 					--subCount;
 				}
 				if (!sub) subCount = 0;
 				if (!to_do) to_do_count = 0;
 
-				if (tail) 
+				if (tail)
 					tail->m_nextClump = tmp;
-				else 
+				else
 					m_firstClump = tmp;
 				tail = tmp;
 			}
@@ -233,10 +233,10 @@ void SimpleObjectIterator::sort(IterOrderType order)
 
 #ifdef INTENSE_DEBUG
 {
-	DEBUG_LOG(("\n\n---------- sort for %d -----------\n",order));
+	DEBUG_LOG(("\n\n---------- sort for %d -----------",order));
 	for (Clump *p = m_firstClump; p; p = p->m_nextClump)
 	{
-		DEBUG_LOG(("    obj %08lx numeric %f\n",p->m_obj,p->m_numeric));
+		DEBUG_LOG(("    obj %08lx numeric %f",p->m_obj,p->m_numeric));
 	}
 }
 #endif
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/BaikonurLaunchPower.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/BaikonurLaunchPower.cpp
index 84e48f4090e..999841efe80 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/BaikonurLaunchPower.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/BaikonurLaunchPower.cpp
@@ -24,12 +24,12 @@
 
 // FILE: BaikonurLaunchPower.cpp////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	November 2002
@@ -43,7 +43,7 @@
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingFactory.h"
@@ -61,15 +61,15 @@ BaikonurLaunchPowerModuleData::BaikonurLaunchPowerModuleData( void )
 /*static*/ void BaikonurLaunchPowerModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 	SpecialPowerModuleData::buildFieldParse( p );
-	
-	static const FieldParse dataFieldParse[] = 
+
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DetonationObject", INI::parseAsciiString, NULL, offsetof( BaikonurLaunchPowerModuleData, m_detonationObject ) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
-	
-}  // end buildFieldParse
+
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ BaikonurLaunchPower::BaikonurLaunchPower( Thing *thing, const ModuleData *module
 BaikonurLaunchPower::~BaikonurLaunchPower( void )
 {
 
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 void BaikonurLaunchPower::doSpecialPower( UnsignedInt commandOptions )
@@ -95,7 +95,7 @@ void BaikonurLaunchPower::doSpecialPower( UnsignedInt commandOptions )
 	SpecialPowerModule::doSpecialPower( commandOptions );
 
 	getObject()->setModelConditionState( MODELCONDITION_DOOR_1_OPENING );
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 void BaikonurLaunchPower::doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions )
@@ -118,7 +118,7 @@ void BaikonurLaunchPower::doSpecialPowerAtLocation( const Coord3D *loc, Real ang
 			detonation->setPosition( loc );
 		}
 	}
-}  
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -130,7 +130,7 @@ void BaikonurLaunchPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -148,7 +148,7 @@ void BaikonurLaunchPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -159,4 +159,4 @@ void BaikonurLaunchPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashBountyPower.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashBountyPower.cpp
index 14d632a2c7e..c0a9ba4bcac 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashBountyPower.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashBountyPower.cpp
@@ -24,12 +24,12 @@
 
 // FILE: CashBountyPower.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	CashBountyPower.cpp
 //
 //	author:		Steven Johnson
-//	
+//
 //	purpose:
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -49,7 +49,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -77,7 +77,7 @@ CashBountyPowerModuleData::CashBountyPowerModuleData()
 	m_upgrades.clear();
 #endif
 	m_defaultBounty = 0.0;
-} 
+}
 
 #ifdef NOT_IN_USE
 //-------------------------------------------------------------------------------------------------
@@ -91,7 +91,7 @@ static void parseBountyUpgradePair( INI* ini, void * /*instance*/, void *store,
 
 	std::vector<CashBountyPowerModuleData::Upgrades>* s = (std::vector<CashBountyPowerModuleData::Upgrades>*)store;
 	s->push_back(up);
-} 
+}
 #endif
 
 //-------------------------------------------------------------------------------------------------
@@ -100,17 +100,17 @@ static void parseBountyUpgradePair( INI* ini, void * /*instance*/, void *store,
 {
 	SpecialPowerModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 #ifdef NOT_IN_USE
 		{ "UpgradeBounty", parseBountyUpgradePair, NULL, offsetof( CashBountyPowerModuleData, m_upgrades ) },
 #endif
 		{ "Bounty",			INI::parsePercentToReal, NULL, offsetof( CashBountyPowerModuleData, m_defaultBounty ) },
-		{ 0, 0, 0, 0 } 
+		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -118,17 +118,17 @@ static void parseBountyUpgradePair( INI* ini, void * /*instance*/, void *store,
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-CashBountyPower::CashBountyPower( Thing *thing, const ModuleData* moduleData ) : 
+CashBountyPower::CashBountyPower( Thing *thing, const ModuleData* moduleData ) :
 							SpecialPowerModule( thing, moduleData )
 {
-}  // end CashBountyPower
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 CashBountyPower::~CashBountyPower()
 {
 
-}  // end ~CashBountyPower
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -152,7 +152,7 @@ Real CashBountyPower::findBounty() const
 	const Player* controller = getObject()->getControllingPlayer();
 	if (controller != NULL)
 	{
-		for (std::vector<CashBountyPowerModuleData::Upgrades>::const_iterator it = d->m_upgrades.begin(); 
+		for (std::vector<CashBountyPowerModuleData::Upgrades>::const_iterator it = d->m_upgrades.begin();
 					it != d->m_upgrades.end();
 					++it)
 		{
@@ -188,7 +188,7 @@ void CashBountyPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -206,7 +206,7 @@ void CashBountyPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -217,4 +217,4 @@ void CashBountyPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashHackSpecialPower.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashHackSpecialPower.cpp
index ce82d70da5a..1e5b9b75d9c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashHackSpecialPower.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CashHackSpecialPower.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Team.h"
@@ -58,23 +58,23 @@ static void parseCashHackUpgradePair( INI* ini, void * /*instance*/, void *store
 
 	std::vector<CashHackSpecialPowerModuleData::Upgrades>* s = (std::vector<CashHackSpecialPowerModuleData::Upgrades>*)store;
 	s->push_back(up);
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 /*static*/ void CashHackSpecialPowerModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 	SpecialPowerModuleData::buildFieldParse( p );
-	
-	static const FieldParse dataFieldParse[] = 
+
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "UpgradeMoneyAmount", parseCashHackUpgradePair, NULL, offsetof( CashHackSpecialPowerModuleData, m_upgrades ) },
 		{ "MoneyAmount", INI::parseInt, NULL, offsetof( CashHackSpecialPowerModuleData, m_defaultAmountToSteal ) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
-	
-}  // end buildFieldParse
+
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -86,14 +86,14 @@ CashHackSpecialPower::CashHackSpecialPower( Thing *thing, const ModuleData *modu
 												: SpecialPowerModule( thing, moduleData )
 {
 
-}  // end CashHackSpecialPower
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 CashHackSpecialPower::~CashHackSpecialPower( void )
 {
 
-}  // end ~CashHackSpecialPower
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -104,7 +104,7 @@ void CashHackSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real an
 
 	// only allowed at objects
 	return;
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -114,7 +114,7 @@ Int CashHackSpecialPower::findAmountToSteal() const
 	const Player* controller = getObject()->getControllingPlayer();
 	if (controller != NULL)
 	{
-		for (std::vector<CashHackSpecialPowerModuleData::Upgrades>::const_iterator it = d->m_upgrades.begin(); 
+		for (std::vector<CashHackSpecialPowerModuleData::Upgrades>::const_iterator it = d->m_upgrades.begin();
 					it != d->m_upgrades.end();
 					++it)
 		{
@@ -166,7 +166,7 @@ void CashHackSpecialPower::doSpecialPowerAtObject( Object *victim, UnsignedInt c
 			pos.add( self->getPosition() );
 			pos.z += 20.0f; //add a little z to make it show up above the unit.
 			TheInGameUI->addFloatingText( moneyString, &pos, GameMakeColor( 0, 255, 0, 255 ) );
-		
+
 			//Display cash lost floating over the target
 			moneyString.format( TheGameText->fetch( "GUI:LoseCash" ), cash );
 			pos.zero();
@@ -176,7 +176,7 @@ void CashHackSpecialPower::doSpecialPowerAtObject( Object *victim, UnsignedInt c
 		}
 	}
 
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -187,7 +187,7 @@ void CashHackSpecialPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -205,7 +205,7 @@ void CashHackSpecialPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -216,4 +216,4 @@ void CashHackSpecialPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CleanupAreaPower.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CleanupAreaPower.cpp
index ded01c24718..5183b4e100c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CleanupAreaPower.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/CleanupAreaPower.cpp
@@ -24,25 +24,25 @@
 
 // FILE: CleanupAreaPower.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	September 2002
 //
 //	Author:		Kris Morness
-//	
-//  Makes use of the cleanup hazard update by augmenting the cleanup range 
+//
+//  Makes use of the cleanup hazard update by augmenting the cleanup range
 //  until there is nothing left to cleanup at which time it goes idle.
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingTemplate.h"
@@ -55,21 +55,21 @@
 CleanupAreaPowerModuleData::CleanupAreaPowerModuleData()
 {
 	m_cleanupMoveRange = 0.0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void CleanupAreaPowerModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 	SpecialPowerModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MaxMoveDistanceFromLocation",			INI::parseReal, NULL, offsetof( CleanupAreaPowerModuleData, m_cleanupMoveRange ) },
-		{ 0, 0, 0, 0 } 
+		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 //-------------------------------------------------------------------------------------------------
 CleanupAreaPower::CleanupAreaPower( Thing *thing, const ModuleData* moduleData ) : SpecialPowerModule( thing, moduleData )
@@ -113,12 +113,12 @@ void CleanupAreaPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 //-------------------------------------------------------------------------------------------------
 // Xfer method
 // Version Info:
-// 1: Initial version 
+// 1: Initial version
 //-------------------------------------------------------------------------------------------------
 void CleanupAreaPower::xfer( Xfer *xfer )
 {
@@ -131,7 +131,7 @@ void CleanupAreaPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 //-------------------------------------------------------------------------------------------------
 void CleanupAreaPower::loadPostProcess( void )
@@ -140,4 +140,4 @@ void CleanupAreaPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DefectorSpecialPower.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DefectorSpecialPower.cpp
index d5fee6c6113..55f414cbf8e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DefectorSpecialPower.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DefectorSpecialPower.cpp
@@ -24,14 +24,14 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //
-// FILE: DefectorSpecialPower.cpp 
+// FILE: DefectorSpecialPower.cpp
 // Author: Mark Lorenzen, JULY 2002
 // Desc:   General can click command cursor on any enemy, and it becomes his
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/SpecialPower.h"
@@ -48,7 +48,7 @@ DefectorSpecialPowerModuleData::DefectorSpecialPowerModuleData( void )
 
 	m_fatCursorRadius = 0.0f;
 
-}  // end DefectorSpecialPowerModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -58,15 +58,15 @@ DefectorSpecialPowerModuleData::DefectorSpecialPowerModuleData( void )
  void DefectorSpecialPowerModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 	SpecialPowerModuleData::buildFieldParse( p );
-	
-	static const FieldParse dataFieldParse[] = 
+
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "FatCursorRadius", INI::parseReal, NULL, offsetof( DefectorSpecialPowerModuleData, m_fatCursorRadius ) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
-	
-}  // end buildFieldParse
+
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -78,16 +78,16 @@ DefectorSpecialPower::DefectorSpecialPower( Thing *thing, const ModuleData *modu
 												: SpecialPowerModule( thing, moduleData )
 {
 
-}  // end DefectorSpecialPower
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 DefectorSpecialPower::~DefectorSpecialPower( void )
 {
 
-}  // end ~DefectorSpecialPower
+}
+
 
- 
 // ------------------------------------------------------------------------------------------------
 
 void DefectorSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions )
@@ -123,7 +123,7 @@ void DefectorSpecialPower::doSpecialPowerAtObject( Object *objectToMakeDefector,
 
 	//AIUpdateInterface *hisAI = objectToMakeDefector->getAIUpdateInterface();
 	//if (hisAI)
-	//{			
+	//{
 		// how do I get at SpecialPowerTemplate::getDetectionTime() from here?
 		const SpecialPowerTemplate *specPowTemp = getSpecialPowerTemplate();
 		UnsignedInt time = specPowTemp->getDetectionTime();
@@ -132,7 +132,7 @@ void DefectorSpecialPower::doSpecialPowerAtObject( Object *objectToMakeDefector,
 		objectToMakeDefector->defect(self->getControllingPlayer()->getDefaultTeam(), time );// @todo lorenzen hook into the new AIUpdateI methods
 	//}
 
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -143,7 +143,7 @@ void DefectorSpecialPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -161,7 +161,7 @@ void DefectorSpecialPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -172,4 +172,4 @@ void DefectorSpecialPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DemoralizeSpecialPower.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DemoralizeSpecialPower.cpp
index 5307939efd6..7d3d18fb89c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DemoralizeSpecialPower.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/DemoralizeSpecialPower.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #ifdef ALLOW_DEMORALIZE
 
@@ -54,15 +54,15 @@ DemoralizeSpecialPowerModuleData::DemoralizeSpecialPowerModuleData( void )
 	m_maxDurationInFrames = 0;
 	m_fxList = NULL;
 
-}  // end DemoralizeSpecialPowerModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void DemoralizeSpecialPowerModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
 	SpecialPowerModuleData::buildFieldParse( p );
-	
-	static const FieldParse dataFieldParse[] = 
+
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "BaseRange",									INI::parseReal,			NULL,			offsetof( DemoralizeSpecialPowerModuleData, m_baseRange ) },
 		{ "BonusRangePerCaptured",			INI::parseReal,			NULL,			offsetof( DemoralizeSpecialPowerModuleData, m_bonusRangePerCaptured ) },
@@ -74,8 +74,8 @@ void DemoralizeSpecialPowerModuleData::buildFieldParse( MultiIniFieldParse &p )
 		{ 0, 0, 0, 0 }
 	};
 	p.add( dataFieldParse );
-	
-}  // end buildFieldParse
+
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -87,14 +87,14 @@ DemoralizeSpecialPower::DemoralizeSpecialPower( Thing *thing, const ModuleData *
 												: SpecialPowerModule( thing, moduleData )
 {
 
-}  // end DemoralizeSpecialPower
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 DemoralizeSpecialPower::~DemoralizeSpecialPower( void )
 {
 
-}  // end ~DemoralizeSpecialPower
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -132,7 +132,7 @@ void DemoralizeSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real
 		// cap at the max
 		if( duration > modData->m_maxDurationInFrames )
 			duration = modData->m_maxDurationInFrames;
-					
+
 		// increase the range for every prisoner we got
 		range += contain->getContainCount() * modData->m_bonusRangePerCaptured;
 
@@ -140,7 +140,7 @@ void DemoralizeSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real
 		if( range > modData->m_maxRange )
 			range = modData->m_maxRange;
 
-	}  // end if
+	}
 
 	// scan the objects in the area range and demoralize them
 	PartitionFilterRelationship filter1( source, PartitionFilterRelationship::ALLOW_ENEMIES |
@@ -164,18 +164,18 @@ void DemoralizeSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real
 		if( ai )
 			ai->setDemoralized( duration );
 
-	}  // end for obj
+	}
 
 	// play an effect at the destination location
 	if( modData->m_fxList )
 	{
-	
+
 		// execute FX
 		FXList::doFXPos( modData->m_fxList, loc );
 
-	}  // end if
-		
-}    // end doSpecialPowerAtLocation
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -187,7 +187,7 @@ void DemoralizeSpecialPower::doSpecialPowerAtObject( const Object *obj, Real ang
 	if( obj )
 		doSpecialPowerAtLocation( obj->getPosition(), angle, commandOptions );
 
-}  // end doSpecialPowerAtObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -198,7 +198,7 @@ void DemoralizeSpecialPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -216,7 +216,7 @@ void DemoralizeSpecialPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -227,7 +227,7 @@ void DemoralizeSpecialPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 #endif	// #ifdef ALLOW_DEMORALIZE
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/FireWeaponPower.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/FireWeaponPower.cpp
index f52ccc7d2cb..523f1e89554 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/FireWeaponPower.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/FireWeaponPower.cpp
@@ -24,12 +24,12 @@
 
 // FILE: FireWeaponPower.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	August 2003
@@ -42,7 +42,7 @@
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES //For access to TheWeaponSlotTypeNames
 
@@ -57,11 +57,6 @@
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/Module/FireWeaponPower.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 FireWeaponPowerModuleData::FireWeaponPowerModuleData( void )
 {
@@ -73,15 +68,15 @@ FireWeaponPowerModuleData::FireWeaponPowerModuleData( void )
 /*static*/ void FireWeaponPowerModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 	SpecialPowerModuleData::buildFieldParse( p );
-	
-	static const FieldParse dataFieldParse[] = 
+
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MaxShotsToFire", INI::parseUnsignedInt, NULL, offsetof( FireWeaponPowerModuleData, m_maxShotsToFire ) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
-	
-}  // end buildFieldParse
+
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -95,7 +90,7 @@ FireWeaponPower::FireWeaponPower( Thing *thing, const ModuleData *moduleData )
 FireWeaponPower::~FireWeaponPower( void )
 {
 
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 void FireWeaponPower::doSpecialPower( UnsignedInt commandOptions )
@@ -114,7 +109,8 @@ void FireWeaponPower::doSpecialPower( UnsignedInt commandOptions )
 	AIUpdateInterface *ai = self->getAI();
 	if( ai )
 	{
-		ai->aiAttackPosition( NULL, data->m_maxShotsToFire, CMD_FROM_AI );
+		// TheSuperHackers @bugfix Caball009 09/08/2025 Position should be irrelevant, but aiAttackPosition requires a valid position pointer to avoid a crash.
+		ai->aiAttackPosition( self->getPosition(), data->m_maxShotsToFire, CMD_FROM_AI );
 
 		//Order any turrets to attack as well.
 		for( Int i = 0; i < MAX_TURRETS; i++ )
@@ -122,7 +118,7 @@ void FireWeaponPower::doSpecialPower( UnsignedInt commandOptions )
 			ai->setTurretTargetPosition( (WhichTurretType)i, self->getPosition() );
 		}
 	}
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 void FireWeaponPower::doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions )
@@ -150,7 +146,7 @@ void FireWeaponPower::doSpecialPowerAtLocation( const Coord3D *loc, Real angle,
 		}
 	}
 
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 void FireWeaponPower::doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions )
@@ -189,7 +185,7 @@ void FireWeaponPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -207,7 +203,7 @@ void FireWeaponPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -218,4 +214,4 @@ void FireWeaponPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp
index 18857c33e7e..175a99b57d5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/RandomValue.h"
@@ -44,19 +44,14 @@
 // MODULE DATA ////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
-enum 
+enum
 {
 	CREATE_ABOVE_LOCATION_HEIGHT = 300,
 	MAX_ADJUST_RADIUS = 500
 };
 
-static const char* TheOCLCreateLocTypeNames[] =
+static const char* const TheOCLCreateLocTypeNames[] =
 {
 	"CREATE_AT_EDGE_NEAR_SOURCE",
 	"CREATE_AT_EDGE_NEAR_TARGET",
@@ -66,6 +61,7 @@ static const char* TheOCLCreateLocTypeNames[] =
 	"CREATE_AT_EDGE_FARTHEST_FROM_TARGET",
 	NULL
 };
+static_assert(ARRAY_SIZE(TheOCLCreateLocTypeNames) == OCL_CREATE_LOC_COUNT + 1, "Incorrect array size");
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -88,7 +84,7 @@ static void parseOCLUpgradePair( INI* ini, void * /*instance*/, void *store, con
 
 	std::vector<OCLSpecialPowerModuleData::Upgrades>* s = (std::vector<OCLSpecialPowerModuleData::Upgrades>*)store;
 	s->push_back(up);
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -96,7 +92,7 @@ static void parseOCLUpgradePair( INI* ini, void * /*instance*/, void *store, con
 {
 	SpecialPowerModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "UpgradeOCL", parseOCLUpgradePair, NULL, offsetof( OCLSpecialPowerModuleData, m_upgradeOCL ) },
 		{ "OCL", INI::parseObjectCreationList, NULL, offsetof( OCLSpecialPowerModuleData, m_defaultOCL ) },
@@ -119,7 +115,7 @@ OCLSpecialPower::OCLSpecialPower( Thing *thing, const ModuleData *moduleData )
 							 : SpecialPowerModule( thing, moduleData )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -129,7 +125,7 @@ const ObjectCreationList* OCLSpecialPower::findOCL() const
 	const Player* controller = getObject()->getControllingPlayer();
 	if (controller != NULL)
 	{
-		for (std::vector<OCLSpecialPowerModuleData::Upgrades>::const_iterator it = d->m_upgradeOCL.begin(); 
+		for (std::vector<OCLSpecialPowerModuleData::Upgrades>::const_iterator it = d->m_upgradeOCL.begin();
 					it != d->m_upgradeOCL.end();
 					++it)
 		{
@@ -173,13 +169,19 @@ void OCLSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real angle,
     { // if findPosition() fails, then don't monkey with target Coord!
     	targetCoord = *loc;
     }
-    
+
 
 	}
 
 	// call the base class action cause we are *EXTENDING* functionality
 	SpecialPowerModule::doSpecialPowerAtLocation( &targetCoord, angle, commandOptions );
 
+#if RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @info we need to leave early if we are in the MissileLauncherBuildingUpdate crash fix codepath
+	if (m_availableOnFrame == 0xFFFFFFFF)
+		return;
+#endif
+
 	const ObjectCreationList* ocl = findOCL();
 
 	// at what point will the "deliverer" come in
@@ -215,7 +217,7 @@ void OCLSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real angle,
 			ObjectCreationList::create( ocl, getObject(), &creationCoord, &targetCoord, angle );
 			break;
 	}
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -228,7 +230,7 @@ void OCLSpecialPower::doSpecialPowerAtObject( Object *obj, UnsignedInt commandOp
 	if( !obj )
 		return;
 	doSpecialPowerAtLocation( obj->getPosition(), INVALID_ANGLE, commandOptions );
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 void OCLSpecialPower::doSpecialPower( UnsignedInt commandOptions )
@@ -238,7 +240,7 @@ void OCLSpecialPower::doSpecialPower( UnsignedInt commandOptions )
 
 	Coord3D creationCoord;
 	creationCoord.set( getObject()->getPosition() );
-	
+
 	// call the base class action cause we are *EXTENDING* functionality
 	SpecialPowerModule::doSpecialPowerAtLocation( &creationCoord, INVALID_ANGLE, commandOptions );
 
@@ -261,7 +263,7 @@ void OCLSpecialPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -279,7 +281,7 @@ void OCLSpecialPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -290,5 +292,5 @@ void OCLSpecialPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp
index 6a37a750b6f..a90ac83b697 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp
@@ -24,12 +24,12 @@
 
 // FILE: SpecialAbility.cpp /////////////////////////////////////////////////////////////
 // Author: Kris Morness, July 2002
-// Desc:   This is the class that handles processing of any special attack from a unit. There are 
+// Desc:   This is the class that handles processing of any special attack from a unit. There are
 //         many different styles and rules for various attacks.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -39,11 +39,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -51,14 +46,14 @@ SpecialAbility::SpecialAbility( Thing *thing, const ModuleData *moduleData )
 												: SpecialPowerModule( thing, moduleData )
 {
 
-}  // end SpecialAbility
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 SpecialAbility::~SpecialAbility( void )
 {
 
-}  // end ~SpecialAbility
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -73,7 +68,7 @@ void SpecialAbility::doSpecialPowerAtLocation( const Coord3D *loc, Real angle, U
 
 	// call the base class action cause we are *EXTENDING* functionality
 	SpecialPowerModule::doSpecialPowerAtLocation( loc, angle, commandOptions );
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -87,7 +82,7 @@ void SpecialAbility::doSpecialPowerAtObject( Object *obj, UnsignedInt commandOpt
 
 	// call the base class action cause we are *EXTENDING* functionality
 	SpecialPowerModule::doSpecialPowerAtObject( obj, commandOptions );
-}  
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -99,7 +94,7 @@ void SpecialAbility::doSpecialPower( UnsignedInt commandOptions )
 
 	// call the base class action cause we are *EXTENDING* functionality
 	SpecialPowerModule::doSpecialPower( commandOptions );
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -110,7 +105,7 @@ void SpecialAbility::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -128,7 +123,7 @@ void SpecialAbility::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -139,4 +134,4 @@ void SpecialAbility::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp
index e65918f50a8..5ab7d481272 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp
@@ -28,9 +28,10 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/INI.h"
 #include "Common/Player.h"
@@ -54,11 +55,6 @@
 #include "GameClient/ControlBar.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -70,7 +66,7 @@ SpecialPowerModuleData::SpecialPowerModuleData()
 	m_startsPaused = FALSE;
 	m_scriptedSpecialPowerOnly = FALSE;
 
-}  // end SpecialPowerModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -78,7 +74,7 @@ SpecialPowerModuleData::SpecialPowerModuleData()
 {
 	BehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SpecialPowerTemplate",			INI::parseSpecialPowerTemplate, NULL, offsetof( SpecialPowerModuleData, m_specialPowerTemplate ) },
 		{ "UpdateModuleStartsAttack", INI::parseBool,									NULL, offsetof( SpecialPowerModuleData, m_updateModuleStartsAttack ) },
@@ -89,7 +85,7 @@ SpecialPowerModuleData::SpecialPowerModuleData()
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -101,7 +97,11 @@ SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleDa
 									: BehaviorModule( thing, moduleData )
 {
 
+#if RETAIL_COMPATIBLE_CRC
 	m_availableOnFrame = 0;
+#else
+	m_availableOnFrame = 0xFFFFFFFF;
+#endif
 	m_pausedCount = 0;
 	m_pausedOnFrame = 0;
 	m_pausedPercent = 0.0f;
@@ -123,10 +123,10 @@ SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleDa
 	const SpecialPowerModuleData *md = (const SpecialPowerModuleData *)moduleData;
 	if( md->m_startsPaused )
 		pauseCountdown( TRUE );
-	
+
 	resolveSpecialPower();
 
-	// Now, if we find that we have just come into being, 
+	// Now, if we find that we have just come into being,
 	// but there is already a science granted for our shared superweapon,
 	// lets make sure TheIngameUI knows about our public timer
 	// add this weapon to the UI if it has a public timer for all to see
@@ -136,14 +136,14 @@ SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleDa
 			getObject()->getControllingPlayer() &&
 			getObject()->isKindOf( KINDOF_STRUCTURE ) )
 	{
-		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(), 
-																 getPowerName(), 
-																 getObject()->getID(), 
+		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(),
+																 getPowerName(),
+																 getObject()->getID(),
 																 getSpecialPowerModuleData()->m_specialPowerTemplate );
 	}
 
 
-}  // end SpecialPowerModule
+}
 
 //-------------------------------------------------------------------------------------------------
 const AudioEventRTS& SpecialPowerModule::getInitiateSound() const
@@ -158,17 +158,17 @@ SpecialPowerModule::~SpecialPowerModule()
 
  	if( getSpecialPowerModuleData()->m_specialPowerTemplate->hasPublicTimer() == TRUE &&
 			getObject()->getControllingPlayer() )
- 		TheInGameUI->removeSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(), 
-																		getPowerName(), 
-																		getObject()->getID(), 
+ 		TheInGameUI->removeSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(),
+																		getPowerName(),
+																		getObject()->getID(),
 																		getSpecialPowerModuleData()->m_specialPowerTemplate );
 
-}  // end ~SpecialPowerModule
+}
 
 //-------------------------------------------------------------------------------------------------
 void SpecialPowerModule::setReadyFrame( UnsignedInt frame )
-{ 
-	m_availableOnFrame = frame; 
+{
+	m_availableOnFrame = frame;
 
 	//If a script should change the ready frame, we need to update the paused frame. This value isn't
 	//used directly to determine if paused or not... it uses m_pausedCount.
@@ -189,9 +189,9 @@ void SpecialPowerModule::resolveSpecialPower( void )
 	{
 		//KM: The KINDOF_STRUCTURE check was made to prevent scripted bombers from registering their
 		//    special powers as public timers.
-		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(), 
-																 getPowerName(), 
-																 getObject()->getID(), 
+		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(),
+																 getPowerName(),
+																 getObject()->getID(),
 																 getSpecialPowerModuleData()->m_specialPowerTemplate );
 	}
 	*/
@@ -201,13 +201,13 @@ void SpecialPowerModule::resolveSpecialPower( void )
 //-------------------------------------------------------------------------------------------------
 void SpecialPowerModule::onSpecialPowerCreation( void )
 {
-	// THIS gets called by addScience(), that is, when the General has purchased a new special power, 
+	// THIS gets called by addScience(), that is, when the General has purchased a new special power,
 	// and this module is thus activated.
 
 	// start a power recharge going
 	startPowerRecharge();
 
-	// Dustin wants these special powers to start ready to fire, 
+	// Dustin wants these special powers to start ready to fire,
 	// so here (and only here) we will expressly set them to ready-now.
 	if ( getSpecialPowerTemplate()->isSharedNSync())
 	{
@@ -229,9 +229,9 @@ void SpecialPowerModule::onSpecialPowerCreation( void )
 			getObject()->getControllingPlayer() &&
 			getObject()->isKindOf( KINDOF_STRUCTURE ) )
 	{
-		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(), 
-																 getPowerName(), 
-																 getObject()->getID(), 
+		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(),
+																 getPowerName(),
+																 getObject()->getID(),
 																 getSpecialPowerModuleData()->m_specialPowerTemplate );
 	}
 }
@@ -242,7 +242,7 @@ ScienceType SpecialPowerModule::getRequiredScience( void ) const
 {
 
 	return getSpecialPowerModuleData()->m_specialPowerTemplate->getRequiredScience();
-}  // end ~SpecialPowerModule
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -250,7 +250,7 @@ const SpecialPowerTemplate * SpecialPowerModule::getSpecialPowerTemplate( void )
 {
 
 	return getSpecialPowerModuleData()->m_specialPowerTemplate;
-}  // end ~SpecialPowerModule
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -258,14 +258,14 @@ AsciiString SpecialPowerModule::getPowerName( void ) const
 {
 
 	return getSpecialPowerModuleData()->m_specialPowerTemplate->getName();
-}  // end ~SpecialPowerModule
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is this module designed for the power identier template passed in? */
 //-------------------------------------------------------------------------------------------------
 Bool SpecialPowerModule::isModuleForPower( const SpecialPowerTemplate *specialPowerTemplate ) const
 {
-	
+
 	// get the module data
 	const SpecialPowerModuleData *modData = getSpecialPowerModuleData();
 
@@ -280,15 +280,15 @@ Bool SpecialPowerModule::isModuleForPower( const SpecialPowerTemplate *specialPo
 	}
 	//We don't match templates.
 	return FALSE;
-		
-}  // end canExecutePower
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is this special power ready to use */
 //-------------------------------------------------------------------------------------------------
 Bool SpecialPowerModule::isReady() const
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	// this is a cheat ... remove this for release!
 	if( TheGlobalData->m_specialPowerUsesDelay == FALSE )
 		return TRUE;
@@ -306,10 +306,10 @@ Bool SpecialPowerModule::isReady() const
 				return (TheGameLogic->getFrame() >= player->getOrStartSpecialPowerReadyFrame( modData->m_specialPowerTemplate ) );
 		}
 	}
-	
+
 	return (m_pausedCount == 0) && (TheGameLogic->getFrame() >= m_availableOnFrame);
 
-}  // end isReady
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the percentage ready a special power is to use
@@ -326,11 +326,11 @@ Real SpecialPowerModule::getPercentReady() const
 		return 0.99999f;
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
-	if( TheGlobalData->m_specialPowerUsesDelay == FALSE ) 
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+	if( TheGlobalData->m_specialPowerUsesDelay == FALSE )
 		return 1.0f;
 #endif
-	
+
 	// easy case ... is ready
 	if( isReady() )
 		return 1.0f;
@@ -363,8 +363,8 @@ Real SpecialPowerModule::getPercentReady() const
 		}
 	}
 
-	// calculate the percent	
-	Real percent = 1.0f - ((readyFrame - TheGameLogic->getFrame()) / 
+	// calculate the percent
+	Real percent = 1.0f - ((readyFrame - TheGameLogic->getFrame()) /
 												 (Real)modData->m_specialPowerTemplate->getReloadTime());
 
 	return percent;
@@ -388,9 +388,9 @@ Bool SpecialPowerModule::isScriptOnly() const
 //-------------------------------------------------------------------------------------------------
 void SpecialPowerModule::startPowerRecharge()
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	// this is a cheat ... remove this for release!
-	if( TheGlobalData->m_specialPowerUsesDelay == FALSE ) 
+	if( TheGlobalData->m_specialPowerUsesDelay == FALSE )
 		return;
 #endif
 
@@ -455,14 +455,23 @@ Bool SpecialPowerModule::initiateIntentToDoSpecialPower( const Object *targetObj
 		}
 	}
 
+#if RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @info we need to leave early if we are in the MissileLauncherBuildingUpdate crash fix codepath
+	if (m_availableOnFrame == 0xFFFFFFFF)
+	{
+		DEBUG_ASSERTCRASH(!valid, ("Using MissileLauncherBuildingUpdate escape path when valid is set to true"));
+		return false;
+	}
+#endif
+
 	getObject()->getControllingPlayer()->getAcademyStats()->recordSpecialPowerUsed( getSpecialPowerModuleData()->m_specialPowerTemplate );
-	
+
 	//If we depend on our update module to trigger the special power, make sure we have the
 	//appropriate update module!
 	if( !valid && getSpecialPowerModuleData()->m_updateModuleStartsAttack )
 	{
-		DEBUG_CRASH( ("Object does not contain a special power module to execute.  Did you forget to add it to the object INI?\n"));
-		//DEBUG_CRASH(( "Object does not contain special power module (%s) to execute.  Did you forget to add it to the object INI?\n",
+		DEBUG_CRASH( ("Object does not contain a special power module to execute.  Did you forget to add it to the object INI?"));
+		//DEBUG_CRASH(( "Object does not contain special power module (%s) to execute.  Did you forget to add it to the object INI?",
 		//							command->m_specialPower->getName().str() ));
 	}
 
@@ -476,7 +485,7 @@ void SpecialPowerModule::triggerSpecialPower( const Coord3D *location )
 	aboutToDoSpecialPower( location );	// do BEFORE recharge
 
 	createViewObject(location);
-	
+
 	// we won't be able to use the power for X number of frames now
 	startPowerRecharge();
 }
@@ -518,7 +527,7 @@ void SpecialPowerModule::createViewObject( const Coord3D *location )
 	if( dup )
 	{
 		dup->setLifetimeRange( visionDuration, visionDuration );
-	}	
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -535,20 +544,21 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
 {
 	// Tell the scripting engine!
 	TheScriptEngine->notifyOfTriggeredSpecialPower(
-		getObject()->getControllingPlayer()->getPlayerIndex(), 
+		getObject()->getControllingPlayer()->getPlayerIndex(),
 		getSpecialPowerModuleData()->m_specialPowerTemplate->getName(),
 		getObject()->getID());
 
 	// Let EVA do her thing
 	SpecialPowerType type = getSpecialPowerModuleData()->m_specialPowerTemplate->getSpecialPowerType();
 
-  Player *localPlayer = ThePlayerList->getLocalPlayer();
+	Player *localPlayer = rts::getObservedOrLocalPlayer();
+	Relationship relationship = localPlayer->getRelationship(getObject()->getTeam());
 
-  // Only play the EVA sounds if this is not the local player, and the local player doesn't consider the 
+  // Only play the EVA sounds if this is not the local player, and the local player doesn't consider the
 	// person an enemy.
 	// Kris: Actually, all players need to hear these warnings.
   // Ian: But now there are different Eva messages depending on who launched
-	//if (localPlayer != getObject()->getControllingPlayer() && localPlayer->getRelationship(getObject()->getTeam()) != ENEMIES) 
+	//if (localPlayer != getObject()->getControllingPlayer() && localPlayer->getRelationship(getObject()->getTeam()) != ENEMIES)
   {
 		if( type == SPECIAL_PARTICLE_UPLINK_CANNON || type == SUPW_SPECIAL_PARTICLE_UPLINK_CANNON || type == LAZR_SPECIAL_PARTICLE_UPLINK_CANNON )
     {
@@ -556,7 +566,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
       {
         TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_ParticleCannon);
       }
-      else if ( localPlayer->getRelationship(getObject()->getTeam()) != ENEMIES )
+      else if (relationship != ENEMIES)
       {
         // Note: counting relationship NEUTRAL as ally. Not sure if this makes a difference???
         TheEva->setShouldPlay(EVA_SuperweaponLaunched_Ally_ParticleCannon);
@@ -572,7 +582,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
       {
         TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_Nuke);
       }
-      else if ( localPlayer->getRelationship(getObject()->getTeam()) != ENEMIES )
+      else if (relationship != ENEMIES)
       {
         // Note: counting relationship NEUTRAL as ally. Not sure if this makes a difference???
         TheEva->setShouldPlay(EVA_SuperweaponLaunched_Ally_Nuke);
@@ -588,7 +598,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
       {
         TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_ScudStorm);
       }
-      else if ( localPlayer->getRelationship(getObject()->getTeam()) != ENEMIES )
+      else if (relationship != ENEMIES)
       {
         // Note: counting relationship NEUTRAL as ally. Not sure if this makes a difference???
         TheEva->setShouldPlay(EVA_SuperweaponLaunched_Ally_ScudStorm);
@@ -600,13 +610,13 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
     }
 		else if (type == SPECIAL_GPS_SCRAMBLER || type == SLTH_SPECIAL_GPS_SCRAMBLER )
     {
-			// This is Ghetto.  Voices should be ini lines in the special power entry.  You shouldn't have to 
+			// This is Ghetto.  Voices should be ini lines in the special power entry.  You shouldn't have to
 			// add to an enum to get a new voice
       if ( localPlayer == getObject()->getControllingPlayer() )
       {
         TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_GPS_Scrambler);
       }
-      else if ( localPlayer->getRelationship(getObject()->getTeam()) != ENEMIES )
+      else if (relationship != ENEMIES)
       {
         // Note: counting relationship NEUTRAL as ally. Not sure if this makes a difference???
         TheEva->setShouldPlay(EVA_SuperweaponLaunched_Ally_GPS_Scrambler);
@@ -622,7 +632,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
       {
         TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_Sneak_Attack);
       }
-      else if ( localPlayer->getRelationship(getObject()->getTeam()) != ENEMIES )
+      else if (relationship != ENEMIES)
       {
         // Note: counting relationship NEUTRAL as ally. Not sure if this makes a difference???
         TheEva->setShouldPlay(EVA_SuperweaponLaunched_Ally_Sneak_Attack);
@@ -651,14 +661,14 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
 		soundAtLocation.setPlayerIndex(getObject()->getControllingPlayer()->getPlayerIndex());
 		TheAudio->addAudioEvent( &soundAtLocation );
 
-	}  // end if
+	}
 
 }
 
 //-------------------------------------------------------------------------------------------------
 //By default, special powers are not triggered by it's update module -- in which case
 //it triggers it and resets its timer immediately. When the update module triggers it,
-//then all we do is initiate the special power, and trust that the update module will 
+//then all we do is initiate the special power, and trust that the update module will
 //do the rest.
 //-------------------------------------------------------------------------------------------------
 void SpecialPowerModule::doSpecialPower( UnsignedInt commandOptions )
@@ -672,14 +682,14 @@ void SpecialPowerModule::doSpecialPower( UnsignedInt commandOptions )
 	initiateIntentToDoSpecialPower( NULL, NULL, NULL, commandOptions );
 
 	//Only trigger the special power immediately if the updatemodule doesn't start the attack.
-	//An example of a case that wouldn't trigger immediately is for a unit that needs to 
+	//An example of a case that wouldn't trigger immediately is for a unit that needs to
 	//close to range before firing the special attack. A case that would trigger immediately
 	//is the napalm strike. If we don't call this now, it's up to the update module to do so.
 	if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
 	{
 		triggerSpecialPower( NULL );// Location-less trigger
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -694,14 +704,14 @@ void SpecialPowerModule::doSpecialPowerAtObject( Object *obj, UnsignedInt comman
 	initiateIntentToDoSpecialPower( obj, NULL, NULL, commandOptions );
 
 	//Only trigger the special power immediately if the updatemodule doesn't start the attack.
-	//An example of a case that wouldn't trigger immediately is for a unit that needs to 
+	//An example of a case that wouldn't trigger immediately is for a unit that needs to
 	//close to range before firing the special attack. A case that would trigger immediately
 	//is the napalm strike. If we don't call this now, it's up to the update module to do so.
 	if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
 	{
 		triggerSpecialPower( obj->getPosition() );
 	}
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -715,15 +725,21 @@ void SpecialPowerModule::doSpecialPowerAtLocation( const Coord3D *loc, Real angl
 	//will then start processing each frame.
 	initiateIntentToDoSpecialPower( NULL, loc, NULL, commandOptions );
 
+#if RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @info we need to leave early if we are in the MissileLauncherBuildingUpdate crash fix codepath
+	if (m_availableOnFrame == 0xFFFFFFFF)
+		return;
+#endif
+
 	//Only trigger the special power immediately if the updatemodule doesn't start the attack.
-	//An example of a case that wouldn't trigger immediately is for a unit that needs to 
+	//An example of a case that wouldn't trigger immediately is for a unit that needs to
 	//close to range before firing the special attack. A case that would trigger immediately
 	//is the napalm strike. If we don't call this now, it's up to the update module to do so.
 	if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
 	{
 		triggerSpecialPower( loc );
 	}
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -738,7 +754,7 @@ void SpecialPowerModule::doSpecialPowerUsingWaypoints( const Waypoint *way, Unsi
 	initiateIntentToDoSpecialPower( NULL, NULL, way, commandOptions );
 
 	//Only trigger the special power immediately if the updatemodule doesn't start the attack.
-	//An example of a case that wouldn't trigger immediately is for a unit that needs to 
+	//An example of a case that wouldn't trigger immediately is for a unit that needs to
 	//close to range before firing the special attack. A case that would trigger immediately
 	//is the napalm strike. If we don't call this now, it's up to the update module to do so.
 	if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
@@ -768,12 +784,12 @@ void SpecialPowerModule::pauseCountdown( Bool pause )
 		--m_pausedCount;
 
 		// And only update the ready time if we are fully unpaused now.
-		if( m_pausedCount == 0 )	
+		if( m_pausedCount == 0 )
 		{
 			m_availableOnFrame += (TheGameLogic->getFrame() - m_pausedOnFrame);
 		}
 	}
-}  // end pauseCountdown
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -810,7 +826,7 @@ void SpecialPowerModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -840,7 +856,7 @@ void SpecialPowerModule::xfer( Xfer *xfer )
 	// paused percent
 	xfer->xferReal( &m_pausedPercent );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -853,7 +869,7 @@ void SpecialPowerModule::loadPostProcess( void )
 
 
 
-	// Now, if we find that we have just come into being, 
+	// Now, if we find that we have just come into being,
 	// but there is already a science granted for our shared superweapon,
 	// lets make sure TheIngameUI knows about our public timer
 	// add this weapon to the UI if it has a public timer for all to see
@@ -863,9 +879,9 @@ void SpecialPowerModule::loadPostProcess( void )
 			getObject()->getControllingPlayer() &&
 			getObject()->isKindOf( KINDOF_STRUCTURE ) )
 	{
-		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(), 
-																 getPowerName(), 
-																 getObject()->getID(), 
+		TheInGameUI->addSuperweapon( getObject()->getControllingPlayer()->getPlayerIndex(),
+																 getPowerName(),
+																 getObject()->getID(),
 																 getSpecialPowerModuleData()->m_specialPowerTemplate );
 	}
 
@@ -874,4 +890,4 @@ void SpecialPowerModule::loadPostProcess( void )
 
 
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpyVisionSpecialPower.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpyVisionSpecialPower.cpp
index 2c0dea54988..a9891985b94 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpyVisionSpecialPower.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpyVisionSpecialPower.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -52,8 +52,8 @@ SpyVisionSpecialPowerModuleData::SpyVisionSpecialPowerModuleData( void )
 void SpyVisionSpecialPowerModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
 	SpecialPowerModuleData::buildFieldParse( p );
-	
-	static const FieldParse dataFieldParse[] = 
+
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "BaseDuration",								INI::parseDurationUnsignedInt,	NULL,   offsetof( SpyVisionSpecialPowerModuleData, m_baseDurationInFrames ) },
 		{ "BonusDurationPerCaptured",		INI::parseDurationUnsignedInt,	NULL,   offsetof( SpyVisionSpecialPowerModuleData, m_bonusDurationPerCapturedInFrames ) },
@@ -61,8 +61,8 @@ void SpyVisionSpecialPowerModuleData::buildFieldParse( MultiIniFieldParse &p )
 		{ 0, 0, 0, 0 }
 	};
 	p.add( dataFieldParse );
-	
-}  // end buildFieldParse
+
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -74,14 +74,14 @@ SpyVisionSpecialPower::SpyVisionSpecialPower( Thing *thing, const ModuleData *mo
 												: SpecialPowerModule( thing, moduleData )
 {
 
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 SpyVisionSpecialPower::~SpyVisionSpecialPower( void )
 {
 
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -93,7 +93,7 @@ void SpyVisionSpecialPower::doSpecialPower( UnsignedInt commandOptions )
 	// call the base class action cause we are *EXTENDING* functionality
 	SpecialPowerModule::doSpecialPower( commandOptions );
 
-	
+
 	// get the source of this power
 	Object *source = getObject();
 
@@ -124,7 +124,7 @@ void SpyVisionSpecialPower::doSpecialPower( UnsignedInt commandOptions )
 	}
 
 	update->activateSpyVision( duration );
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -135,7 +135,7 @@ void SpyVisionSpecialPower::crc( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -153,7 +153,7 @@ void SpyVisionSpecialPower::xfer( Xfer *xfer )
 	// extend base class
 	SpecialPowerModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -164,4 +164,4 @@ void SpyVisionSpecialPower::loadPostProcess( void )
 	// extend base class
 	SpecialPowerModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
index 400386bb094..7bc310b7d61 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
@@ -27,7 +27,7 @@
 // Author: Michael S. Booth, 2001-2002
 // Subsequently : John Ahlquist 2002 and a cast of thousands.
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_LOCOMOTORSET_NAMES					// for TheLocomotorSetNames[]
 #define DEFINE_AUTOACQUIRE_NAMES
@@ -73,11 +73,6 @@
 
 #define SLEEPY_AI
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 AIUpdateModuleData::AIUpdateModuleData()
@@ -103,8 +98,7 @@ AIUpdateModuleData::~AIUpdateModuleData()
 		if (m_turretData[i])
 		{
 			TurretAIData* td = const_cast<TurretAIData*>(m_turretData[i]);
-			if (td)
-				deleteInstance(td);
+			deleteInstance(td);
 		}
 	}
 }
@@ -116,7 +110,7 @@ const LocomotorTemplateVector* AIUpdateModuleData::findLocomotorTemplateVector(L
 		return NULL;
 
   LocomotorTemplateMap::const_iterator it = m_locomotorTemplates.find(t);
-  if (it == m_locomotorTemplates.end()) 
+  if (it == m_locomotorTemplates.end())
 	{
 		return NULL;
 	}
@@ -127,11 +121,11 @@ const LocomotorTemplateVector* AIUpdateModuleData::findLocomotorTemplateVector(L
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void AIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void AIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Turret",											AIUpdateModuleData::parseTurret,	NULL, offsetof(AIUpdateModuleData, m_turretData[0]) },
 		{ "AltTurret",									AIUpdateModuleData::parseTurret,	NULL, offsetof(AIUpdateModuleData, m_turretData[1]) },
@@ -166,7 +160,7 @@ const LocomotorTemplateVector* AIUpdateModuleData::findLocomotorTemplateVector(L
 {
 	ThingTemplate *tt = (ThingTemplate *)instance;
 	AIUpdateModuleData *self = tt->friend_getAIModuleInfo();
-	if (!self) 
+	if (!self)
 	{
 		DEBUG_CRASH( ("Attempted to specify a locomotor for object %s without an AIUpdate block.", tt->getName().str() ) );
 		throw INI_INVALID_DATA;
@@ -177,7 +171,7 @@ const LocomotorTemplateVector* AIUpdateModuleData::findLocomotorTemplateVector(L
 	{
 		if (ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES)
 		{
-			DEBUG_CRASH(("re-specifying a LocomotorSet is no longer allowed\n"));
+			DEBUG_CRASH(("re-specifying a LocomotorSet is no longer allowed"));
 			throw INI_INVALID_DATA;
 		}
 	}
@@ -185,14 +179,14 @@ const LocomotorTemplateVector* AIUpdateModuleData::findLocomotorTemplateVector(L
 	self->m_locomotorTemplates[set].clear();
 	for (const char* locoName = ini->getNextToken(); locoName; locoName = ini->getNextTokenOrNull())
 	{
-		if (!*locoName || !stricmp(locoName, "None"))
+		if (!*locoName || stricmp(locoName, "None") == 0)
 			continue;
 
 		NameKeyType locoKey = NAMEKEY(locoName);
 		const LocomotorTemplate* lt = TheLocomotorStore->findLocomotorTemplate(locoKey);
 		if (!lt)
 		{
-			DEBUG_CRASH(("Locomotor %s not found!\n",locoName));
+			DEBUG_CRASH(("Locomotor %s not found!",locoName));
 			throw INI_INVALID_DATA;
 		}
 		self->m_locomotorTemplates[set].push_back(lt);
@@ -209,7 +203,7 @@ AIStateMachine* AIUpdateInterface::makeStateMachine()
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-AIUpdateInterface::AIUpdateInterface( Thing *thing, const ModuleData* moduleData ) : 
+AIUpdateInterface::AIUpdateInterface( Thing *thing, const ModuleData* moduleData ) :
 	UpdateModule( thing, moduleData )
 {
 	int i;
@@ -320,7 +314,7 @@ void AIUpdateInterface::setSurrendered( const Object *objWeSurrenderedTo, Bool s
 
 		if (m_surrenderedFramesLeft < d->m_surrenderDuration)
 			m_surrenderedFramesLeft = d->m_surrenderDuration;
-		
+
 		const Player* playerWeSurrenderedTo = objWeSurrenderedTo ? objWeSurrenderedTo->getControllingPlayer() : NULL;
 		m_surrenderedPlayerIndex = playerWeSurrenderedTo ? playerWeSurrenderedTo->getPlayerIndex() : -1;
 
@@ -336,12 +330,12 @@ void AIUpdateInterface::setSurrendered( const Object *objWeSurrenderedTo, Bool s
 			// Play our sound surrendered
 			AudioEventRTS surrenderSound = *getObject()->getTemplate()->getVoiceSurrender();
 			surrenderSound.setObjectID(getObject()->getID());
-			TheAudio->addAudioEvent(&surrenderSound);		
+			TheAudio->addAudioEvent(&surrenderSound);
 		}
 	}
 	else
 	{
-		// GS During the act of surrendering, we dipped to 0 and then were manually set to have hit points.  
+		// GS During the act of surrendering, we dipped to 0 and then were manually set to have hit points.
 		// That made us alive but marked as Dead.  Gotta undo that.
 
 		getObject()->setEffectivelyDead( FALSE );
@@ -404,8 +398,8 @@ void AIUpdateInterface::doPathfind( PathfindServicesInterface *pathfinder )
 	if (!m_waitingForPath) {
 		return;
 	}
-	//CRCDEBUG_LOG(("AIUpdateInterface::doPathfind() for object %d\n", getObject()->getID()));
-	m_waitingForPath = FALSE;	 
+	//CRCDEBUG_LOG(("AIUpdateInterface::doPathfind() for object %d", getObject()->getID()));
+	m_waitingForPath = FALSE;
 	if (m_isSafePath) {
 		destroyPath();
 		Coord3D pos1, pos2;
@@ -419,9 +413,9 @@ void AIUpdateInterface::doPathfind( PathfindServicesInterface *pathfinder )
 		if (repulsor) {
 			pos2 = *repulsor->getPosition();
 		}
-		m_path = pathfinder->findSafePath(getObject(), m_locomotorSet, 
-			getObject()->getPosition(), 
-			&pos1, 	&pos2, 
+		m_path = pathfinder->findSafePath(getObject(), m_locomotorSet,
+			getObject()->getPosition(),
+			&pos1, 	&pos2,
 			getObject()->getVisionRange() + TheAI->getAiData()->m_repulsedDistance);
 		return;
 	}
@@ -430,7 +424,7 @@ void AIUpdateInterface::doPathfind( PathfindServicesInterface *pathfinder )
 	}
 	if (m_isApproachPath) {
 		destroyPath();
-		m_path = pathfinder->findClosestPath(getObject(), m_locomotorSet, getObject()->getPosition(), 
+		m_path = pathfinder->findClosestPath(getObject(), m_locomotorSet, getObject()->getPosition(),
 			&m_requestedDestination, m_isBlockedAndStuck, 0.2f, FALSE );
 		if (isDoingGroundMovement() && getPath()) {
 			TheAI->pathfinder()->updateGoal(getObject(), getPath()->getLastNode()->getPosition(),
@@ -440,27 +434,27 @@ void AIUpdateInterface::doPathfind( PathfindServicesInterface *pathfinder )
 	}
 	if (m_isAttackPath) {
 		Object *victim = NULL;
-		if (m_requestedVictimID != INVALID_ID) { 
+		if (m_requestedVictimID != INVALID_ID) {
 			victim = TheGameLogic->findObjectByID(m_requestedVictimID);
 		}
-		if (computeAttackPath(pathfinder, victim, &m_requestedDestination))	{	
+		if (computeAttackPath(pathfinder, victim, &m_requestedDestination))	{
 			if (getPath()) {
 				TheAI->pathfinder()->updateGoal(getObject(), getPath()->getLastNode()->getPosition(),
 					getPath()->getLastNode()->getLayer());
 			}
-			//CRCDEBUG_LOG(("AIUpdateInterface::doPathfind() - m_isAttackPath = TRUE after computeAttackPath\n"));
-			m_isAttackPath = TRUE; 
+			//CRCDEBUG_LOG(("AIUpdateInterface::doPathfind() - m_isAttackPath = TRUE after computeAttackPath"));
+			m_isAttackPath = TRUE;
 			return;
 		}
-		//CRCDEBUG_LOG(("AIUpdateInterface::doPathfind() - m_isAttackPath = FALSE after computeAttackPath()\n"));
+		//CRCDEBUG_LOG(("AIUpdateInterface::doPathfind() - m_isAttackPath = FALSE after computeAttackPath()"));
 		m_isAttackPath = FALSE;
 		if (victim) {
 			m_requestedDestination = *victim->getPosition();
 			/* find a pathable destination near the victim.*/
 			TheAI->pathfinder()->adjustToPossibleDestination(getObject(), getLocomotorSet(), &m_requestedDestination);
-			ignoreObstacle(victim); 
+			ignoreObstacle(victim);
 		}
-	} 
+	}
 	computePath(pathfinder, &m_requestedDestination);
 	if (m_isFinalGoal && isDoingGroundMovement() && getPath()) {
 		TheAI->pathfinder()->updateGoal(getObject(), getPath()->getLastNode()->getPosition(),
@@ -478,23 +472,23 @@ void AIUpdateInterface::doPathfind( PathfindServicesInterface *pathfinder )
 #endif
 }
 
-/* Requests a path to be found.  Note that if it is possible to do it without having to use the 
+/* Requests a path to be found.  Note that if it is possible to do it without having to use the
 pathfinder (air units just move point to point) it generates the path immediately.  Otherwise the path
 will be processed when we get to the front of the pathfind queue. jba */
 //-------------------------------------------------------------------------------------------------
-void AIUpdateInterface::requestPath( Coord3D *destination, Bool isFinalGoal ) 
+void AIUpdateInterface::requestPath( Coord3D *destination, Bool isFinalGoal )
 {
 
 	if (m_locomotorSet.getValidSurfaces() == 0) {
 		DEBUG_CRASH(("Attempting to path immobile unit."));
 	}
 
-	//DEBUG_LOG(("Request Frame %d, obj %s %x\n", TheGameLogic->getFrame(), getObject()->getTemplate()->getName().str(), getObject()));
+	//DEBUG_LOG(("Request Frame %d, obj %s %x", TheGameLogic->getFrame(), getObject()->getTemplate()->getName().str(), getObject()));
 	m_requestedDestination = *destination;
 	m_isFinalGoal = isFinalGoal;
-	CRCDEBUG_LOG(("AIUpdateInterface::requestPath() - m_isAttackPath = FALSE for object %d\n", getObject()->getID()));
-	m_isAttackPath = FALSE;	
-	m_requestedVictimID = INVALID_ID;	
+	CRCDEBUG_LOG(("AIUpdateInterface::requestPath() - m_isAttackPath = FALSE for object %d", getObject()->getID()));
+	m_isAttackPath = FALSE;
+	m_requestedVictimID = INVALID_ID;
 	m_isApproachPath = FALSE;
 	m_isSafePath = FALSE;
 	if (canComputeQuickPath()) {
@@ -504,12 +498,12 @@ void AIUpdateInterface::requestPath( Coord3D *destination, Bool isFinalGoal )
 	m_waitingForPath = TRUE;
 	if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
 		/* Requesting path very quickly.  Can cause a spin. */
-		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 1 second\n",
+		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 1 second",
 			//TheGameLogic->getFrame()));
 		setQueueForPathTime(LOGICFRAMES_PER_SECOND);
 		// See if it has been too soon.
 		// jba intense debug
-		//DEBUG_LOG(("Info - RePathing very quickly %d, %d.\n", m_pathTimestamp, TheGameLogic->getFrame()));
+		//DEBUG_LOG(("Info - RePathing very quickly %d, %d.", m_pathTimestamp, TheGameLogic->getFrame()));
 		if (m_path && m_isBlockedAndStuck) {
 			setIgnoreCollisionTime(2*LOGICFRAMES_PER_SECOND);
 			m_blockedFrames = 0;
@@ -523,21 +517,21 @@ void AIUpdateInterface::requestPath( Coord3D *destination, Bool isFinalGoal )
 }
 
 //-------------------------------------------------------------------------------------------------
-void AIUpdateInterface::requestAttackPath( ObjectID victimID, const Coord3D* victimPos ) 
+void AIUpdateInterface::requestAttackPath( ObjectID victimID, const Coord3D* victimPos )
 {
 	if (m_locomotorSet.getValidSurfaces() == 0) {
 		DEBUG_CRASH(("Attempting to path immobile unit."));
 	}
-	CRCDEBUG_LOG(("AIUpdateInterface::requestAttackPath() - m_isAttackPath = TRUE for object %d\n", getObject()->getID()));
+	CRCDEBUG_LOG(("AIUpdateInterface::requestAttackPath() - m_isAttackPath = TRUE for object %d", getObject()->getID()));
 	m_requestedDestination = *victimPos;
-	m_requestedVictimID = victimID;	
+	m_requestedVictimID = victimID;
 	m_isAttackPath = TRUE;
 	m_isApproachPath = FALSE;
 	m_isSafePath = FALSE;
 	m_waitingForPath = TRUE;
 	if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
 		/* Requesting path very quickly.  Can cause a spin. */
-		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 2 second\n",TheGameLogic->getFrame()));
+		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 2 second",TheGameLogic->getFrame()));
 		setQueueForPathTime(2*LOGICFRAMES_PER_SECOND);
 		setLocomotorGoalNone();
 		return;
@@ -546,22 +540,22 @@ void AIUpdateInterface::requestAttackPath( ObjectID victimID, const Coord3D* vic
 }
 
 //-------------------------------------------------------------------------------------------------
-void AIUpdateInterface::requestApproachPath( Coord3D *destination ) 
+void AIUpdateInterface::requestApproachPath( Coord3D *destination )
 {
 	if (m_locomotorSet.getValidSurfaces() == 0) {
 		DEBUG_CRASH(("Attempting to path immobile unit."));
 	}
 	m_requestedDestination = *destination;
 	m_isFinalGoal = TRUE;
-	CRCDEBUG_LOG(("AIUpdateInterface::requestApproachPath() - m_isAttackPath = FALSE for object %d\n", getObject()->getID()));
-	m_isAttackPath = FALSE;	
-	m_requestedVictimID = INVALID_ID;	
+	CRCDEBUG_LOG(("AIUpdateInterface::requestApproachPath() - m_isAttackPath = FALSE for object %d", getObject()->getID()));
+	m_isAttackPath = FALSE;
+	m_requestedVictimID = INVALID_ID;
 	m_isApproachPath = TRUE;
 	m_isSafePath = FALSE;
 	m_waitingForPath = TRUE;
 	if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
 		/* Requesting path very quickly.  Can cause a spin. */
-		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 2 second\n",TheGameLogic->getFrame()));
+		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 2 second",TheGameLogic->getFrame()));
 		setQueueForPathTime(2*LOGICFRAMES_PER_SECOND);
 		return;
 	}
@@ -570,22 +564,22 @@ void AIUpdateInterface::requestApproachPath( Coord3D *destination )
 
 //-------------------------------------------------------------------------------------------------
 // Requests a safe path away from the repulsor.
-void AIUpdateInterface::requestSafePath( ObjectID repulsor ) 
+void AIUpdateInterface::requestSafePath( ObjectID repulsor )
 {
 	if (repulsor != m_repulsor1) {
 		m_repulsor2 = m_repulsor1; // save the prior repulsor.
 	}
-	m_repulsor1 = repulsor;	
+	m_repulsor1 = repulsor;
 	m_isFinalGoal = FALSE;
-	CRCDEBUG_LOG(("AIUpdateInterface::requestSafePath() - m_isAttackPath = FALSE for object %d\n", getObject()->getID()));
-	m_isAttackPath = FALSE;	
-	m_requestedVictimID = INVALID_ID;	
+	CRCDEBUG_LOG(("AIUpdateInterface::requestSafePath() - m_isAttackPath = FALSE for object %d", getObject()->getID()));
+	m_isAttackPath = FALSE;
+	m_requestedVictimID = INVALID_ID;
 	m_isApproachPath = FALSE;
 	m_isSafePath = TRUE;
 	m_waitingForPath = TRUE;
 	if (m_pathTimestamp > TheGameLogic->getFrame()-3) {
 		/* Requesting path very quickly.  Can cause a spin. */
-		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 2 second\n",TheGameLogic->getFrame()));
+		//DEBUG_LOG(("%d Pathfind - repathing in less than 3 frames.  Waiting 2 second",TheGameLogic->getFrame()));
 		setQueueForPathTime(2*LOGICFRAMES_PER_SECOND);
 		return;
 	}
@@ -594,8 +588,8 @@ void AIUpdateInterface::requestSafePath( ObjectID repulsor )
 
 enum {WAYPOINT_PATH_LIMIT=1024};
 //-------------------------------------------------------------------------------------------------
-// 
-void AIUpdateInterface::setPathFromWaypoint(const Waypoint *way, const Coord2D *offset) 
+//
+void AIUpdateInterface::setPathFromWaypoint(const Waypoint *way, const Coord2D *offset)
 {
 	destroyPath();
 	m_path = newInstance(Path);
@@ -615,7 +609,7 @@ void AIUpdateInterface::setPathFromWaypoint(const Waypoint *way, const Coord2D *
 		count++;
 		if (count>WAYPOINT_PATH_LIMIT) break;
 	}
-	m_waitingForPath = FALSE;	 
+	m_waitingForPath = FALSE;
 	TheAI->pathfinder()->setDebugPath(m_path);
 #ifdef SLEEPY_AI
 	// if we're no longer waiting for a path, make sure we wake up right away!
@@ -649,8 +643,7 @@ AIUpdateInterface::~AIUpdateInterface( void )
 
 	for (int i = 0; i < MAX_TURRETS; i++)
 	{
-		if (m_turretAI[i])
-			deleteInstance(m_turretAI[i]);
+		deleteInstance(m_turretAI[i]);
 		m_turretAI[i] = NULL;
 	}
 	m_stateMachine = NULL;
@@ -866,13 +859,13 @@ void AIUpdateInterface::chooseGoodLocomotorFromCurrentSet( void )
 		{
 		/* due to physics, we might slight into a cell for which we have no loco
 			(eg, cliff) and get stuck. this is bad. as a solution, we do this.
-			this may look a little funny, but as a practical matter, it works well, 
+			this may look a little funny, but as a practical matter, it works well,
 			since the pathfinder will prevent us from doing any significant "wrong" terrain. */
 			newLoco = prevLoco;
 		}
 		else
 		{
-			/* this can happen for a newly-created object, which might come into being in 
+			/* this can happen for a newly-created object, which might come into being in
 				the middle of an obstacle. for now, we just fake it and choose a ground locomotor. */
 			newLoco = m_locomotorSet.findLocomotor(LOCOMOTORSURFACE_GROUND);
 		}
@@ -899,11 +892,11 @@ void AIUpdateInterface::chooseGoodLocomotorFromCurrentSet( void )
 //----------------------------------------------------------------------------------------------------------
 Object* AIUpdateInterface::checkForCrateToPickup()
 {
-	if (m_crateCreated != INVALID_ID) 
+	if (m_crateCreated != INVALID_ID)
 	{
 		m_crateCreated = INVALID_ID; // we have processed it, so clear it.
 		Object* crate = TheGameLogic->findObjectByID(m_crateCreated);
-		if (crate) 
+		if (crate)
 		{
 			for (BehaviorModule** m = crate->getBehaviorModules(); *m; ++m)
 			{
@@ -928,7 +921,7 @@ void AIUpdateInterface::doSurrenderUpdateStuff()
 	RELEASE_CRASH(("Read the comment in doSurrenderUpdateStuff"));
 
 	/*
-		If you ever re-enable this code, you must convert it to be 
+		If you ever re-enable this code, you must convert it to be
 		properly sleepy. It is crucial that we avoid requiring a call
 		to AIUpdate every frame just to support this. (srj)
 	*/
@@ -1006,12 +999,12 @@ void AIUpdateInterface::friend_notifyStateMachineChanged()
  * The "main loop" of the AI subsystem
  */
 DECLARE_PERF_TIMER(AIUpdateInterface_update)
-UpdateSleepTime AIUpdateInterface::update( void )	 
+UpdateSleepTime AIUpdateInterface::update( void )
 {
-	//DEBUG_LOG(("AIUpdateInterface frame %d: %08lx\n",TheGameLogic->getFrame(),getObject()));
+	//DEBUG_LOG(("AIUpdateInterface frame %d: %08lx",TheGameLogic->getFrame(),getObject()));
 
 	USE_PERF_TIMER(AIUpdateInterface_update)
-	
+
 	m_isInUpdate = TRUE;
 
 	m_completedWaypoint = NULL; // Reset so state machine update can set it if we just completed the path.
@@ -1029,7 +1022,7 @@ UpdateSleepTime AIUpdateInterface::update( void )
 	}
 	else
 	{
-		// it's STATE_CONTINUE, STATE_SUCCESS, or STATE_FAILURE, 
+		// it's STATE_CONTINUE, STATE_SUCCESS, or STATE_FAILURE,
 		// any of which will probably require next frame
 		subMachineSleep = UPDATE_SLEEP_NONE;
 	}
@@ -1039,7 +1032,7 @@ UpdateSleepTime AIUpdateInterface::update( void )
 	// which we just called. thus we should
 	// never have worry about waking ourselves up when this changes, since
 	// if it changes the code will always flow thru here anyway. (srj)
-	if (m_movementComplete) 
+	if (m_movementComplete)
 	{
 		setQueueForPathTime(0);
 
@@ -1050,12 +1043,12 @@ UpdateSleepTime AIUpdateInterface::update( void )
 		getObject()->clearModelConditionState(MODELCONDITION_MOVING);
 
 		Coord3D goalPos;
-		if (TheAI->pathfinder()->goalPosition(getObject(), &goalPos)) 
+		if (TheAI->pathfinder()->goalPosition(getObject(), &goalPos))
 		{
 			// Pop to goal - This shouldn't happen (often), but make sure we got to where we're going.
 			Real dx = goalPos.x-getObject()->getPosition()->x;
 			Real dy = goalPos.y-getObject()->getPosition()->y;
-			if (dx*dx+dy*dy>=PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F) 
+			if (dx*dx+dy*dy>=PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F)
 			{
 				// Too far, so just grid current pos.
 				goalPos = *getObject()->getPosition();
@@ -1071,7 +1064,7 @@ UpdateSleepTime AIUpdateInterface::update( void )
 	UnsignedInt now = TheGameLogic->getFrame();
 	if (m_queueForPathFrame != 0)
 	{
-		if (now >= m_queueForPathFrame) 
+		if (now >= m_queueForPathFrame)
 		{
 			TheAI->pathfinder()->queueForPath(getObject()->getID());
 			setQueueForPathTime(0);
@@ -1094,9 +1087,9 @@ UpdateSleepTime AIUpdateInterface::update( void )
 			! obj->isDisabledByType( DISABLED_HACKED ) )
 	{
 		// If we are dead, don't let the turrets do anything anymore, or else they will keep attacking
-		for (int i = 0; i < MAX_TURRETS; ++i) 
+		for (int i = 0; i < MAX_TURRETS; ++i)
 		{
-			if (m_turretAI[i]) 
+			if (m_turretAI[i])
 			{
 				UpdateSleepTime tmp = m_turretAI[i]->updateTurretAI();
 				if (tmp < subMachineSleep)
@@ -1152,7 +1145,7 @@ UpdateSleepTime AIUpdateInterface::update( void )
 		return UPDATE_SLEEP_NONE;
 #endif
 	}
-} 
+}
 
 
 
@@ -1210,7 +1203,7 @@ The way to have a higher priority is:
 1. If the paths were assigned when both units were in the same ai group, we use the path priority assigned.
 2. If not, the unit that is in front has the higher priority.
 3. If exactly tied (usually beacause both units got unfortunately snapped to the same location), ObjectID is used
-to break the tie. 
+to break the tie.
 */
 Bool AIUpdateInterface::hasHigherPathPriority(AIUpdateInterface *otherAI) const
 {
@@ -1238,7 +1231,7 @@ Bool AIUpdateInterface::hasHigherPathPriority(AIUpdateInterface *otherAI) const
 	if (ourDir.x*otherDir.x + ourDir.y*otherDir.y <= 0) {
 		return getObject()->getID() < other->getID();
 	}
-	Coord2D	combinedDir; 
+	Coord2D	combinedDir;
 	combinedDir.x = ourDir.x + otherDir.x;
 	combinedDir.y = ourDir.y + otherDir.y;
 	Coord2D vectorToOther;
@@ -1248,7 +1241,7 @@ Bool AIUpdateInterface::hasHigherPathPriority(AIUpdateInterface *otherAI) const
 	Real dotProduct = combinedDir.x*vectorToOther.x	+ combinedDir.y*vectorToOther.y;
 	if (dotProduct>0) return FALSE;  // other is ahead of us along our directional vector.
 	if (dotProduct<0) return TRUE; // We are ahead of other.
-	// Exactly equal.  Use object id's to break the tie.  
+	// Exactly equal.  Use object id's to break the tie.
 	return getObject()->getID() < other->getID();
 }
 
@@ -1271,11 +1264,11 @@ Real AIUpdateInterface::calculateMaxBlockedSpeed(Object *other) const
 	PhysicsBehavior *otherPhysics = other->getPhysics();
 	if (!otherPhysics) {
 		return m_curMaxBlockedSpeed;
-	}	
+	}
 	Coord3D otherVel = *otherPhysics->getVelocity();
 	otherVel.z = 0;
 	// Calculate how fast other is moving away from us...
-	Real awaySpeed = otherVel.length() * speedFactor;				 
+	Real awaySpeed = otherVel.length() * speedFactor;
 
 	// Now calculate the amount we are moving relative to towards them...
 	dotProduct = vectorToOther.x*ourDir.x	+ vectorToOther.y*ourDir.y;
@@ -1335,7 +1328,7 @@ Bool AIUpdateInterface::blockedBy(Object *other)
 		if (!otherMoving) {
 			return FALSE;  // Infantry can run through other infantry.
 		}
-		return FALSE; 
+		return FALSE;
 #else
 		// If we are crossing, just pass through.
 		Coord3D ourDir = *obj->getUnitDirectionVector2D();
@@ -1363,7 +1356,7 @@ Bool AIUpdateInterface::blockedBy(Object *other)
 
 	Real collisionAngle = ThePartitionManager->getRelativeAngle2D( obj, &otherPos );
 	Real otherAngle = ThePartitionManager->getRelativeAngle2D( other, &pos );
-	//DEBUG_LOG(("Collision angle %.2f, %.2f, %s, %x %s\n", collisionAngle*180/PI, otherAngle*180/PI, obj->getTemplate()->getName().str(), obj, other->getTemplate()->getName().str()));
+	//DEBUG_LOG(("Collision angle %.2f, %.2f, %s, %x %s", collisionAngle*180/PI, otherAngle*180/PI, obj->getTemplate()->getName().str(), obj, other->getTemplate()->getName().str()));
 	Real angleLimit = PI/4; // 45 degrees.
 	if (collisionAngle>PI/2 || collisionAngle<-PI/2) {
 		return FALSE; // we're moving away.
@@ -1383,7 +1376,7 @@ Bool AIUpdateInterface::blockedBy(Object *other)
 					return FALSE;
 				}
 			}	else {
-				//DEBUG_LOG(("Moving Away From EachOther\n"));
+				//DEBUG_LOG(("Moving Away From EachOther"));
 				return FALSE;  // moving away, so no need for corrective action.
 			}
 		} else {
@@ -1392,7 +1385,7 @@ Bool AIUpdateInterface::blockedBy(Object *other)
 	}
 
 
-	if (!aiOther->isAiInDeadState())	
+	if (!aiOther->isAiInDeadState())
 	{
 		return TRUE;
 	}
@@ -1404,22 +1397,22 @@ Bool AIUpdateInterface::blockedBy(Object *other)
 Bool AIUpdateInterface::needToRotate(void)
 /* Returns TRUE if we need to rotate to point in our path's direcion.*/
 {
-	if (isWaitingForPath()) 
+	if (isWaitingForPath())
 		return TRUE; // new path will probably require rotation.
 
-	if (this->getCurLocomotor() && this->getCurLocomotor()->getWanderWidthFactor()>0.0f) 
+	if (this->getCurLocomotor() && this->getCurLocomotor()->getWanderWidthFactor()>0.0f)
 		return FALSE; // wanderers don't need to rotate.
 
 	Real deltaAngle = 0;
 	if (getPath())
 	{
 		ClosestPointOnPathInfo info;
-		CRCDEBUG_LOG(("AIUpdateInterface::needToRotate() - calling computePointOnPath() for object %d\n", getObject()->getID()));
+		CRCDEBUG_LOG(("AIUpdateInterface::needToRotate() - calling computePointOnPath() for object %d", getObject()->getID()));
 		getPath()->computePointOnPath(getObject(), m_locomotorSet, *getObject()->getPosition(), info);
 		deltaAngle = ThePartitionManager->getRelativeAngle2D( getObject(), &info.posOnPath );
-	}	
+	}
 
-	if (fabs(deltaAngle)>PI/30) 
+	if (fabs(deltaAngle)>PI/30)
 	{
 		return TRUE;
 	}
@@ -1429,7 +1422,7 @@ Bool AIUpdateInterface::needToRotate(void)
 
 
 //-------------------------------------------------------------------------------------------------
-/* Returns TRUE if the physics collide should apply the force.  Normally not.  
+/* Returns TRUE if the physics collide should apply the force.  Normally not.
 Also determines whether objects are blocked, and if so, if they are stuck.  jba.*/
 Bool AIUpdateInterface::processCollision(PhysicsBehavior *physics, Object *other)
 {
@@ -1438,48 +1431,48 @@ Bool AIUpdateInterface::processCollision(PhysicsBehavior *physics, Object *other
 	return false;
 #endif
 
-	if (m_ignoreCollisionsUntil > TheGameLogic->getFrame()) 
+	if (m_ignoreCollisionsUntil > TheGameLogic->getFrame())
 		return FALSE;
 
-	if (m_canPathThroughUnits) 
+	if (m_canPathThroughUnits)
 		return FALSE;
 
 	AIUpdateInterface* aiOther = other->getAI();
-	if (aiOther == NULL) 
+	if (aiOther == NULL)
 		return FALSE;
 
 	Bool selfMoving = isMoving();
 	Bool otherMoving = ( aiOther && aiOther->isMoving() );
 	if (!isDoingGroundMovement()) return FALSE;
 	if (!aiOther->isDoingGroundMovement()) return FALSE;
-	if (selfMoving) 
+	if (selfMoving)
 	{
 		Bool blocked = blockedBy(other);
-		if (blocked) 
+		if (blocked)
 		{
-			if (getObject()->isKindOf(KINDOF_INFANTRY)) 
+			if (getObject()->isKindOf(KINDOF_INFANTRY))
 			{
 				// Panic bounces around.
-				if (getStateMachine()->getCurrentStateID() == AI_PANIC) 
+				if (getStateMachine()->getCurrentStateID() == AI_PANIC)
 				{
 					return TRUE; // just bounce off of other humans.
 				}
 			}
 			m_isBlocked = TRUE; // we are blocked.
- 			if (otherMoving && aiOther->isWaitingForPath()) 
+ 			if (otherMoving && aiOther->isWaitingForPath())
 			{
 				return FALSE; // let them get their path;
 			}
 
 			Real maxSpeed = calculateMaxBlockedSpeed(other);
-			if (maxSpeed < m_curMaxBlockedSpeed) 
+			if (maxSpeed < m_curMaxBlockedSpeed)
 			{
 				m_curMaxBlockedSpeed = maxSpeed;
 			}
 
 			if (!aiOther->isMovingAwayFrom(getObject())) {
 
-				if (other->isKindOf(KINDOF_INFANTRY) && !getObject()->isKindOf(KINDOF_INFANTRY)) 
+				if (other->isKindOf(KINDOF_INFANTRY) && !getObject()->isKindOf(KINDOF_INFANTRY))
 				{
 					//Kris: Patch 1.01 -- November 5, 2003
 					//Prevent busy units from being told to move out of the way!
@@ -1491,7 +1484,7 @@ Bool AIUpdateInterface::processCollision(PhysicsBehavior *physics, Object *other
 					return FALSE;
 				}
 #define dont_MOVE_AROUND // It just causes more problems than it fixes. jba.
-#ifdef MOVE_AROUND 
+#ifdef MOVE_AROUND
 				if (m_curLocomotor!=NULL && (other->isKindOf(KINDOF_INFANTRY)==getObject()->isKindOf(KINDOF_INFANTRY))) {
 					Real myMaxSpeed = m_curLocomotor->getMaxSpeedForCondition(getObject()->getBodyModule()->getDamageState());
 					Locomotor *hisLoco = aiOther->getCurLocomotor();
@@ -1506,53 +1499,53 @@ Bool AIUpdateInterface::processCollision(PhysicsBehavior *physics, Object *other
 #endif
 			}
 
-			//DEBUG_LOG(("Blocked %s, %x, %s\n", getObject()->getTemplate()->getName().str(), getObject(), other->getTemplate()->getName().str()));
+			//DEBUG_LOG(("Blocked %s, %x, %s", getObject()->getTemplate()->getName().str(), getObject(), other->getTemplate()->getName().str()));
 			if (m_blockedFrames==0) m_blockedFrames = 1;
-			if (!needToRotate()) 
+			if (!needToRotate())
 			{
 				// If we are already pointing in the right direction, we may be stuck.
-				if (!otherMoving) 
+				if (!otherMoving)
 				{
 					// Intense logging jba
-					// DEBUG_LOG(("Blocked&Stuck !otherMoving\n"));
+					// DEBUG_LOG(("Blocked&Stuck !otherMoving"));
 					m_isBlockedAndStuck = TRUE;
 					return FALSE;
 				}
 
 				// See if other is blocked by us.
-				if (aiOther->blockedBy(getObject())) 
+				if (aiOther->blockedBy(getObject()))
 				{
-					if (!aiOther->needToRotate()) 
+					if (!aiOther->needToRotate())
 					{
 						// Deadlocked.
-						if (!hasHigherPathPriority(aiOther)) 
+						if (!hasHigherPathPriority(aiOther))
 						{
 							// get out of his way.
 							aiMoveAwayFromUnit(aiOther->getObject(), CMD_FROM_AI);
 							//m_isBlockedAndStuck = TRUE;
 							// Intense logging jba.
-							// DEBUG_LOG(("Blocked&Stuck other is blockedByUs, has higher priority\n"));
+							// DEBUG_LOG(("Blocked&Stuck other is blockedByUs, has higher priority"));
 						}
 					}
-				}	
-				else 
+				}
+				else
 				{
 					// Just wait.
 				}
-			}	
-			else 
+			}
+			else
 			{
 				// We are rotating, so don't accumulate blocked frames.
 				m_blockedFrames = 1;
 			}
 		}
-	}	
-	else 
+	}
+	else
 	{
-		if (isAiInDeadState()) 
+		if (isAiInDeadState())
 		{
 			// Dead infantry get pushed around by crushers.
-			if (getObject()->isKindOf(KINDOF_INFANTRY) && other->canCrushOrSquish(getObject(), TEST_SQUISH_ONLY)) 
+			if (getObject()->isKindOf(KINDOF_INFANTRY) && other->canCrushOrSquish(getObject(), TEST_SQUISH_ONLY))
 			{
 				return TRUE;
 			}
@@ -1562,8 +1555,8 @@ Bool AIUpdateInterface::processCollision(PhysicsBehavior *physics, Object *other
 		Real dx = getObject()->getPosition()->x - otherPos.x;
 		Real dy = getObject()->getPosition()->y - otherPos.y;
 		Real curDSqr = dx*dx+dy*dy;
-		if (!otherMoving && curDSqr < PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F*0.25f) 
-		{	
+		if (!otherMoving && curDSqr < PATHFIND_CELL_SIZE_F*PATHFIND_CELL_SIZE_F*0.25f)
+		{
 			if (this->getCurrentStateID() == AI_BUSY) {
 				return false;
 			}
@@ -1571,15 +1564,15 @@ Bool AIUpdateInterface::processCollision(PhysicsBehavior *physics, Object *other
 				return false;  // we are doing a special ability.  Shouldn't move at this time.  jba.
 			}
 			// jba intense debug
-			//DEBUG_LOG(("*****Units ended up on top of each other.  Shouldn't happen.\n"));
+			//DEBUG_LOG(("*****Units ended up on top of each other.  Shouldn't happen."));
 			if (isIdle()) {
 				Coord3D safePosition = *getObject()->getPosition();
-				
+
 				TheAI->pathfinder()->adjustToPossibleDestination(getObject(), getLocomotorSet(), &safePosition);
-				aiMoveToPosition( &safePosition, CMD_FROM_AI ); 
+				aiMoveToPosition( &safePosition, CMD_FROM_AI );
 			}
 			if (aiOther->isIdle()) {
-				TheAI->pathfinder()->adjustToPossibleDestination(other, aiOther->getLocomotorSet(), 
+				TheAI->pathfinder()->adjustToPossibleDestination(other, aiOther->getLocomotorSet(),
 					&otherPos);
 				aiOther->aiMoveToPosition( &otherPos, CMD_FROM_AI);
 			}
@@ -1624,7 +1617,7 @@ Bool AIUpdateInterface::computeQuickPath( const Coord3D *destination )
 	// for now, quick path objects don't pathfind, generally airborne units
 	// build a trivial one-node path containing destination
 
-	
+
 	// First, see if our path already goes to the destination.
 	if (m_path) {
 		PathNode *closeNode = NULL;
@@ -1643,7 +1636,7 @@ Bool AIUpdateInterface::computeQuickPath( const Coord3D *destination )
 	}
 	// destroy previous path
 	destroyPath();
-	if (getObject()->isKindOf(KINDOF_AIRCRAFT) && !getObject()->isKindOf(KINDOF_PROJECTILE)) {	
+	if (getObject()->isKindOf(KINDOF_AIRCRAFT) && !getObject()->isKindOf(KINDOF_PROJECTILE)) {
 		m_path = TheAI->pathfinder()->getAircraftPath(getObject(), destination);
 	} else {
 		m_path = newInstance(Path);
@@ -1653,7 +1646,7 @@ Bool AIUpdateInterface::computeQuickPath( const Coord3D *destination )
 		m_path->prependNode( &pos, getObject()->getLayer() );
 		m_path->getFirstNode()->setNextOptimized(m_path->getFirstNode()->getNext());
 
-		if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) 
+		if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS)
 		{
 			TheAI->pathfinder()->setDebugPath(m_path);
 		}
@@ -1713,7 +1706,7 @@ Bool AIUpdateInterface::computePath( PathfindServicesInterface *pathServices, Co
 	// sanity check - if destination cell is invalid, don't bother pathing
 
 	LocomotorSurfaceTypeMask surfaces = m_locomotorSet.getValidSurfaces();
-	if (!m_isFinalGoal && TheAI->pathfinder()->isLinePassable( getObject(), surfaces, 
+	if (!m_isFinalGoal && TheAI->pathfinder()->isLinePassable( getObject(), surfaces,
 			getObject()->getLayer(), *getObject()->getPosition(), originalDestination, false, true)) {
 		return computeQuickPath(destination);
 	}
@@ -1727,16 +1720,16 @@ Bool AIUpdateInterface::computePath( PathfindServicesInterface *pathServices, Co
 	{
 		// compute a ground-based path
 		if (m_isBlockedAndStuck) {
-			theNewPath = pathServices->patchPath( getObject(), m_locomotorSet, 
+			theNewPath = pathServices->patchPath( getObject(), m_locomotorSet,
 				getPath(), m_isBlockedAndStuck);
 		}	else {
-			theNewPath = pathServices->findPath( getObject(), m_locomotorSet, getObject()->getPosition(), 
+			theNewPath = pathServices->findPath( getObject(), m_locomotorSet, getObject()->getPosition(),
 				destination);
 		}
 	}
 	if (theNewPath==NULL && m_path==NULL) {
-		Real pathCostFactor = 0.0f;	
-		theNewPath = pathServices->findClosestPath( getObject(), m_locomotorSet, getObject()->getPosition(), 
+		Real pathCostFactor = 0.0f;
+		theNewPath = pathServices->findClosestPath( getObject(), m_locomotorSet, getObject()->getPosition(),
 			destination, m_isBlockedAndStuck, pathCostFactor, FALSE );
 		m_retryPath = true;
 	}
@@ -1788,13 +1781,13 @@ Bool AIUpdateInterface::computePath( PathfindServicesInterface *pathServices, Co
  */
 Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServices, const Object *victim, const Coord3D* victimPos )
 {
-	//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() for object %d\n", getObject()->getID()));
+	//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() for object %d", getObject()->getID()));
 	// See if it has been too soon.
-	if (m_pathTimestamp >= TheGameLogic->getFrame()-2) 
+	if (m_pathTimestamp >= TheGameLogic->getFrame()-2)
 	{
 		// jba intense debug
-		//CRCDEBUG_LOG(("Info - RePathing very quickly %d, %d.\n", m_pathTimestamp, TheGameLogic->getFrame()));
-		if (m_path && m_isBlockedAndStuck) 
+		//CRCDEBUG_LOG(("Info - RePathing very quickly %d, %d.", m_pathTimestamp, TheGameLogic->getFrame()));
+		if (m_path && m_isBlockedAndStuck)
 		{
 			setIgnoreCollisionTime(2*LOGICFRAMES_PER_SECOND);
 			m_blockedFrames = 0;
@@ -1812,9 +1805,9 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 	}
 
 	Object* source = getObject();
-	if (!victim && !victimPos) 
+	if (!victim && !victimPos)
 	{
-		//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() - victim is NULL\n"));
+		//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() - victim is NULL"));
 		return FALSE;
 	}
 
@@ -1837,17 +1830,17 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 		if (weapon->isWithinAttackRange(source, victim))
 		{
 			Bool viewBlocked = FALSE;
-			if (isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain()) 
+			if (isDoingGroundMovement() && !victim->isSignificantlyAboveTerrain())
 			{
 				viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(source, *source->getPosition(), victim, *victim->getPosition());
 			}
-			if (!viewBlocked) 
+			if (!viewBlocked)
 			{
 				destroyPath();
-				//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() - target is in range and visible\n"));
+				//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() - target is in range and visible"));
 				return TRUE;
 			}
-			
+
 		}
 	}
 	else if (victimPos != NULL)
@@ -1855,26 +1848,26 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 		if (weapon->isWithinAttackRange(source, victimPos))
 		{
 			Bool viewBlocked = FALSE;
-			if (isDoingGroundMovement()) 
+			if (isDoingGroundMovement())
 			{
 				viewBlocked = TheAI->pathfinder()->isAttackViewBlockedByObstacle(source, *source->getPosition(), NULL, *victimPos);
 			}
 			if (!viewBlocked) {
 				destroyPath();
-				//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() target pos is in range and visible\n"));
+				//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() target pos is in range and visible"));
 				return TRUE;
 			}
 		}
 	}
 
 	// Contact weapon
-	if (weapon->isContactWeapon()) 
+	if (weapon->isContactWeapon())
 	{
 		// Weapon is basically a contact weapon, like a car bomb.  The approach target logic
 		// has been modified to let it approach the object, so just approach the target position.	jba.
 		Coord3D tmp = *victimPos;
 		destroyPath();
-		if (this->getCurLocomotor()) 
+		if (this->getCurLocomotor())
 		{
 			getCurLocomotor()->setNoSlowDownAsApproachingDest(TRUE);
 		}
@@ -1884,7 +1877,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 		dx = victimPos->x - m_path->getLastNode()->getPosition()->x;
 		dy = victimPos->y - m_path->getLastNode()->getPosition()->y;
 		if (sqr(dx)+sqr(dy) < sqr(PATHFIND_CELL_SIZE_F*3)) {
-			if (m_path) 
+			if (m_path)
 			{
 				m_path->updateLastNode(victimPos); // jam in the coordinates of the target.
 			}
@@ -1896,7 +1889,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 			destroyPath();
 			return false;
 		}
-		//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() is contact weapon\n"));
+		//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() is contact weapon"));
 		return ok;
 	}
 
@@ -1904,7 +1897,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 	Coord3D localVictimPos;
 	if (victim != NULL)
 	{
-		if (victim->isKindOf(KINDOF_BRIDGE)) 
+		if (victim->isKindOf(KINDOF_BRIDGE))
 		{
 			TBridgeAttackInfo info;
 			TheTerrainLogic->getBridgeAttackPoints(victim, &info);
@@ -1935,10 +1928,10 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 
 		weapon->computeApproachTarget(getObject(), victim, &localVictimPos, 0, localVictimPos);
 		//DEBUG_ASSERTCRASH(weapon->isGoalPosWithinAttackRange(getObject(), &localVictimPos, victim, victimPos, NULL),
-		//	("position we just calced is not acceptable\n"));
-		
+		//	("position we just calced is not acceptable"));
+
 		// First, see if our path already goes to the destination.
-		if (m_path) 
+		if (m_path)
 		{
 			PathNode *startNode, *closeNode = NULL;
 			startNode = m_path->getFirstNode();
@@ -1948,7 +1941,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 				dxSqr *= dxSqr;
 				Real dySqr = localVictimPos.y - closeNode->getPosition()->y;
 				dySqr *= dySqr;
-				if (dxSqr+dySqr<0.25f) 
+				if (dxSqr+dySqr<0.25f)
 				{
 					return TRUE;
 				}
@@ -1962,7 +1955,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 		pos.z = localVictimPos.z;
 		m_path->prependNode( &pos, LAYER_GROUND );
 		m_path->getFirstNode()->setNextOptimized(m_path->getFirstNode()->getNext());
-		if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS) 
+		if (TheGlobalData->m_debugAI==AI_DEBUG_PATHS)
 		{
 			TheAI->pathfinder()->setDebugPath(m_path);
 		}
@@ -1975,7 +1968,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 		TheAI->pathfinder()->setIgnoreObstacleID( getIgnoredObstacleID() );
 
 		// compute a ground-based path
-		m_path = pathServices->findAttackPath( getObject(), m_locomotorSet, getObject()->getPosition(), 
+		m_path = pathServices->findAttackPath( getObject(), m_locomotorSet, getObject()->getPosition(),
 			victim, &localVictimPos, weapon);
 		if (m_path) {
 			Coord3D goal = *m_path->getLastNode()->getPosition();
@@ -1988,7 +1981,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 				if (goal.length()<3*PATHFIND_CELL_SIZE_F) {
 					destroyPath();
 					TheAI->pathfinder()->adjustDestination(getObject(), m_locomotorSet, &objPos);
-					m_path = pathServices->findClosestPath(getObject(), m_locomotorSet, getObject()->getPosition(), 
+					m_path = pathServices->findClosestPath(getObject(), m_locomotorSet, getObject()->getPosition(),
 								&objPos, false, 0.2f, true );
 				}
 				if (m_path==NULL) {
@@ -1997,7 +1990,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 			}
 			goal = *m_path->getLastNode()->getPosition();
 			TheAI->pathfinder()->updateGoal(getObject(), &goal, TheTerrainLogic->getLayerForDestination(&goal));
-			if (m_path->getBlockedByAlly()) 
+			if (m_path->getBlockedByAlly())
 			{
 	 			if( !getObject()->isKindOf(KINDOF_NO_COLLIDE))// If I don't collide with things, I don't need to tell them to get out of the way
 					TheAI->pathfinder()->moveAllies(getObject(), m_path);
@@ -2011,7 +2004,7 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 
 	m_blockedFrames = 0;
 	m_isBlockedAndStuck = FALSE;
-	//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() done\n"));
+	//CRCDEBUG_LOG(("AIUpdateInterface::computeAttackPath() done"));
 	if (m_path)
 		return TRUE;
 
@@ -2025,12 +2018,11 @@ Bool AIUpdateInterface::computeAttackPath( PathfindServicesInterface *pathServic
 void AIUpdateInterface::destroyPath( void )
 {
 	// destroy previous path
-	if (m_path)
-		deleteInstance(m_path);
-
+	deleteInstance(m_path);
 	m_path = NULL;
+
 	m_waitingForPath = FALSE; // we no longer need it.
-	//CRCDEBUG_LOG(("AIUpdateInterface::destroyPath() - m_isAttackPath = FALSE for object %d\n", getObject()->getID()));
+	//CRCDEBUG_LOG(("AIUpdateInterface::destroyPath() - m_isAttackPath = FALSE for object %d", getObject()->getID()));
 	m_isAttackPath = FALSE;
 	setLocomotorGoalNone();
 }
@@ -2039,7 +2031,7 @@ void AIUpdateInterface::destroyPath( void )
 /**
  * This is used by the internal move to state to indicate that a move started.
  */
-void AIUpdateInterface::friend_startingMove(void) 
+void AIUpdateInterface::friend_startingMove(void)
 {
 	m_movementComplete = FALSE; // we aren't finished moving.
 	m_isMoving = TRUE;
@@ -2086,7 +2078,7 @@ void AIUpdateInterface::friend_setGoalObject(Object *obj)
 //-------------------------------------------------------------------------------------------------
 Bool AIUpdateInterface::isPathAvailable( const Coord3D *destination ) const
 {
-	
+
 	// sanity
 	if( destination == NULL )
 		return FALSE;
@@ -2095,7 +2087,7 @@ Bool AIUpdateInterface::isPathAvailable( const Coord3D *destination ) const
 
 	return TheAI->pathfinder()->clientSafeQuickDoesPathExist( m_locomotorSet, myPos, destination );
 
-}  // end isPathAvailable
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is there a path (computed using the less accurate but quick method )
@@ -2103,7 +2095,7 @@ Bool AIUpdateInterface::isPathAvailable( const Coord3D *destination ) const
 //-------------------------------------------------------------------------------------------------
 Bool AIUpdateInterface::isQuickPathAvailable( const Coord3D *destination ) const
 {
-	
+
 	// sanity
 	if( destination == NULL )
 		return FALSE;
@@ -2112,7 +2104,7 @@ Bool AIUpdateInterface::isQuickPathAvailable( const Coord3D *destination ) const
 
 	return TheAI->pathfinder()->clientSafeQuickDoesPathExistForUI( m_locomotorSet, myPos, destination );
 
-}  // end isQuickPathAvailable
+}
 
 
 
@@ -2137,11 +2129,11 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 
 	chooseGoodLocomotorFromCurrentSet();
 
-	if (m_isBlocked) 
+	if (m_isBlocked)
 	{
 		++m_blockedFrames;
-	} 
-	else 
+	}
+	else
 	{
 		m_blockedFrames = 0;
 	}
@@ -2170,23 +2162,23 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 						Real myMaxSpeed = m_curLocomotor->getMaxSpeedForCondition(getObject()->getBodyModule()->getDamageState());
 						if( speed == FAST_AS_POSSIBLE || speed > myMaxSpeed )
 							speed = myMaxSpeed;
-						m_curLocomotor->locoUpdate_moveTowardsPosition(getObject(), 
+						m_curLocomotor->locoUpdate_moveTowardsPosition(getObject(),
 							m_locomotorGoalData, 0.0f, speed, &blocked);
 						m_doFinalPosition = FALSE;
 					}
 					break;
 
 				case POSITION_ON_PATH:
-					{	 
+					{
 						if (!getPath())
 						{
-							if (m_waitingForPath) 
+							if (m_waitingForPath)
 							{
 								return UPDATE_SLEEP_FOREVER;  // Can't move till we get our path.
 							}
-							DEBUG_LOG(("Dead %d, obj %s %x\n", isAiInDeadState(), getObject()->getTemplate()->getName().str(), getObject()));
+							DEBUG_LOG(("Dead %d, obj %s %x", isAiInDeadState(), getObject()->getTemplate()->getName().str(), getObject()));
 #ifdef STATE_MACHINE_DEBUG
-							DEBUG_LOG(("Waiting %d, state %s\n", m_waitingForPath, getStateMachine()->getCurrentStateName().str()));
+							DEBUG_LOG(("Waiting %d, state %s", m_waitingForPath, getStateMachine()->getCurrentStateName().str()));
 							m_stateMachine->setDebugOutput(1);
 #endif
 							DEBUG_CRASH(("must have a path here (doLocomotor)"));
@@ -2194,17 +2186,17 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 						}
 						Coord3D goalPos;
 						Real onPathDistToGoal;
-						if (!isDoingGroundMovement()) 
+						if (!isDoingGroundMovement())
 						{
 							// airborne locomotor.  Get the goal and distance direct to the goal, don't consider obstacles.
 							onPathDistToGoal = getPath()->computeFlightDistToGoal(getObject()->getPosition(), goalPos);
-						} 
-						else 
+						}
+						else
 						{
 							// Compute the actual goal position along the path to move towards.  Consider
 							// obstacles, and follow the intermediate path points.
 							ClosestPointOnPathInfo info;
-							CRCDEBUG_LOG(("AIUpdateInterface::doLocomotor() - calling computePointOnPath() for %s\n",
+							CRCDEBUG_LOG(("AIUpdateInterface::doLocomotor() - calling computePointOnPath() for %s",
 								DebugDescribeObject(getObject()).str()));
 							getPath()->computePointOnPath(getObject(), m_locomotorSet, *getObject()->getPosition(), info);
 							onPathDistToGoal = info.distAlongPath;
@@ -2212,13 +2204,13 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 							// layer is a possible bridge in the path.  Check & set the layer if applicable.
 							TheAI->pathfinder()->updateLayer(getObject(), info.layer);
 						}
-				 
+
 						Real speed = m_desiredSpeed;
 						Real myMaxSpeed = m_curLocomotor->getMaxSpeedForCondition(getObject()->getBodyModule()->getDamageState());
 						if( speed == FAST_AS_POSSIBLE || speed > myMaxSpeed )
 							speed = myMaxSpeed;
 
-						if (blocked && speed>m_curMaxBlockedSpeed) 
+						if (blocked && speed>m_curMaxBlockedSpeed)
 						{
 							speed = m_curMaxBlockedSpeed;
 							if (m_bumpSpeedLimit>speed) {
@@ -2226,8 +2218,8 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 							}
 							m_bumpSpeedLimit *= 0.95f;
 							speed = m_bumpSpeedLimit;
-						} 
-						else 
+						}
+						else
 						{
 							blocked = FALSE;
 							if (m_bumpSpeedLimit<FAST_AS_POSSIBLE) {
@@ -2241,7 +2233,7 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 							}
 						}
 
-						m_curLocomotor->locoUpdate_moveTowardsPosition(getObject(), goalPos, 
+						m_curLocomotor->locoUpdate_moveTowardsPosition(getObject(), goalPos,
 							onPathDistToGoal+getPathExtraDistance(), speed, &blocked);
 
 						m_doFinalPosition = FALSE;
@@ -2257,7 +2249,7 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 
 				case NONE:
 					{
-						if (m_doFinalPosition) 
+						if (m_doFinalPosition)
 						{
 							Coord3D pos = *getObject()->getPosition();
 							Bool onGround = !getObject()->isAboveTerrain() && getObject()->getLayer() == LAYER_GROUND;
@@ -2265,16 +2257,16 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 							Real dy = m_finalPosition.y - pos.y;
 							Real dSqr = dx*dx+dy*dy;
 							const Real DARN_CLOSE = 0.25f;
-							if (dSqr < DARN_CLOSE) 
+							if (dSqr < DARN_CLOSE)
 							{
-								m_doFinalPosition = FALSE; 
+								m_doFinalPosition = FALSE;
 								if (onGround)
 									m_finalPosition.z = TheTerrainLogic->getGroundHeight( m_finalPosition.x, m_finalPosition.y );
 								else
 									m_finalPosition.z = pos.z;
 								getObject()->setPosition(&m_finalPosition);
-							} 
-							else 
+							}
+							else
 							{
 								Real dist = sqrtf(dSqr);
 								if (dist<1) dist = 1;
@@ -2290,8 +2282,8 @@ UpdateSleepTime AIUpdateInterface::doLocomotor( void )
 					break;
 			}
 		}
-		
-		if (!blocked && m_blockedFrames>1) 
+
+		if (!blocked && m_blockedFrames>1)
 		{
 			m_blockedFrames = 1;
 		}
@@ -2362,31 +2354,31 @@ void AIUpdateInterface::setLocomotorGoalNone()
 //-------------------------------------------------------------------------------------------------
 Bool AIUpdateInterface::isDoingGroundMovement(void) const
 {
-  
-  if (getObject()->isDisabledByType( DISABLED_UNMANNED ) 
+
+  if (getObject()->isDisabledByType( DISABLED_UNMANNED )
    && getObject()->isKindOf( KINDOF_PRODUCED_AT_HELIPAD ) )
   {
     return TRUE; // an unmanned helicopter gets grounded, eventually.
   }
 
-	if (m_locomotorSet.getValidSurfaces() == LOCOMOTORSURFACE_AIR) 
+	if (m_locomotorSet.getValidSurfaces() == LOCOMOTORSURFACE_AIR)
 	{
 		return FALSE;  // air only loco.
 	}
 
-	if (m_curLocomotor == NULL) 
+	if (m_curLocomotor == NULL)
 	{
 		return FALSE;	// No loco, so we aren't moving.
 	}
 
 	// Cur loco is air, so not ground.
-	if (m_curLocomotor->getLegalSurfaces() & LOCOMOTORSURFACE_AIR) 
+	if (m_curLocomotor->getLegalSurfaces() & LOCOMOTORSURFACE_AIR)
 	{
-		return FALSE; 
+		return FALSE;
 	}
 
 	// We are held, so not moving on ground.
-	if( getObject()->isDisabledByType( DISABLED_HELD ) ) 
+	if( getObject()->isDisabledByType( DISABLED_HELD ) )
 	{
 		return FALSE;
 	}
@@ -2400,7 +2392,7 @@ Bool AIUpdateInterface::isDoingGroundMovement(void) const
 	}
 
 	// After all exceptions, we must be doing ground movement.
-	//DEBUG_ASSERTLOG(getObject()->isSignificantlyAboveTerrain(), ("Object %s is significantly airborne but also doing ground movement. What?\n",getObject()->getTemplate()->getName().str()));
+	//DEBUG_ASSERTLOG(getObject()->isSignificantlyAboveTerrain(), ("Object %s is significantly airborne but also doing ground movement. What?",getObject()->getTemplate()->getName().str()));
 	return TRUE;
 }
 
@@ -2411,12 +2403,12 @@ destinations, and this routine identifies non-ground units that should unstack.
 
 Bool AIUpdateInterface::isAircraftThatAdjustsDestination(void) const
 {
-	if (m_curLocomotor == NULL) 
+	if (m_curLocomotor == NULL)
 	{
 		return FALSE;	// No loco, so we aren't moving.
 	}
 
-	if (m_curLocomotor->getAppearance() == LOCO_HOVER) 
+	if (m_curLocomotor->getAppearance() == LOCO_HOVER)
 	{
 		return TRUE;	// Hover adjusts.
 	}
@@ -2436,12 +2428,12 @@ Bool AIUpdateInterface::isAircraftThatAdjustsDestination(void) const
 Bool AIUpdateInterface::getTreatAsAircraftForLocoDistToGoal() const
 {
 	Bool treatAsAircraft = !isDoingGroundMovement();
-	if (getPathExtraDistance() > PATHFIND_CLOSE_ENOUGH) 
+	if (getPathExtraDistance() > PATHFIND_CLOSE_ENOUGH)
 	{
 		// We are following a waypoint or other multiple point path, so use the "easy" success criteria.
 		treatAsAircraft = TRUE;
 	}
-	if (m_curLocomotor && m_curLocomotor->getAppearance() == LOCO_HOVER) 
+	if (m_curLocomotor && m_curLocomotor->getAppearance() == LOCO_HOVER)
 	{
 		// Hovercrafts are very sloppy.  So use aircraft tests for distance to goal.  jba.
 		treatAsAircraft = TRUE;
@@ -2450,7 +2442,7 @@ Bool AIUpdateInterface::getTreatAsAircraftForLocoDistToGoal() const
 }
 
 //-------------------------------------------------------------------------------------------------
-Real AIUpdateInterface::getLocomotorDistanceToGoal() 
+Real AIUpdateInterface::getLocomotorDistanceToGoal()
 {
 	switch (m_locomotorGoalType)
 	{
@@ -2459,16 +2451,16 @@ Real AIUpdateInterface::getLocomotorDistanceToGoal()
 			return 0.0f;
 
 		case POSITION_ON_PATH:
-			if (!getPath()) 
+			if (!getPath())
 			{
 				DEBUG_CRASH(("must have a path here (getLocomotorDistanceToGoal)"));
 				return 0.0f;
 			}
-			else if (!m_curLocomotor) 
+			else if (!m_curLocomotor)
 			{
-				//DEBUG_LOG(("no locomotor here, so no dist. (this is ok.)\n"));
+				//DEBUG_LOG(("no locomotor here, so no dist. (this is ok.)"));
 				return 0.0f;
-			}	
+			}
 			else if( m_curLocomotor->isCloseEnoughDist3D() || getObject()->isKindOf(KINDOF_PROJECTILE))
 			{
 				const Object *me = getObject();
@@ -2479,48 +2471,48 @@ Real AIUpdateInterface::getLocomotorDistanceToGoal()
 				Real distance = ThePartitionManager->getDistanceSquared( me, dest, FROM_CENTER_3D );
 				return sqrt( distance );// Other paths return dots of normalized vectors, so one sqrt ain't so bad
 			}
-			else 
+			else
 			{
 				Coord3D goalPos;
 				Bool treatAsAircraft = getTreatAsAircraftForLocoDistToGoal();
 				Real dist;
-				if (treatAsAircraft) 
+				if (treatAsAircraft)
 				{
 					// airborne locomotor.  Get the goal and distance direct to the goal, don't consider obstacles.
 					dist =  getPath()->computeFlightDistToGoal(getObject()->getPosition(), goalPos);
 				}	else {
 					// Ground based locomotor.
 					ClosestPointOnPathInfo info;
-					CRCDEBUG_LOG(("AIUpdateInterface::getLocomotorDistanceToGoal() - calling computePointOnPath() for object %d\n", getObject()->getID()));
+					CRCDEBUG_LOG(("AIUpdateInterface::getLocomotorDistanceToGoal() - calling computePointOnPath() for object %d", getObject()->getID()));
 					getPath()->computePointOnPath(getObject(), m_locomotorSet, *getObject()->getPosition(), info);
-					goalPos = info.posOnPath;	 
+					goalPos = info.posOnPath;
 					dist = info.distAlongPath;
 				}
 				if (m_path->getLastNode()) {
 					goalPos = *m_path->getLastNode()->getPosition();
 				}
-				// We are trying to get to goal.  So, 
+				// We are trying to get to goal.  So,
 				// If the actual distance is farther, then use the actual distance so we get there.
 				Real dx = goalPos.x - getObject()->getPosition()->x;
 				Real dy = goalPos.y - getObject()->getPosition()->y;
 				Real distSqr = dx*dx + dy*dy;
-				
-				if (treatAsAircraft) 
+
+				if (treatAsAircraft)
 				{
-					if (sqr(dist) > distSqr) 
+					if (sqr(dist) > distSqr)
 					{
 						return sqrt(distSqr);
 					}
 					else
 					{
-						return dist; 
+						return dist;
 					}
 				}
 
 				if (dist<PATHFIND_CELL_SIZE_F || sqr(dist) < distSqr)
 					return sqrtf(distSqr);
 				else
-					return dist;			 
+					return dist;
 
 			}
 
@@ -2532,7 +2524,7 @@ Real AIUpdateInterface::getLocomotorDistanceToGoal()
 
 	return 0.0f;
 }
- 
+
 
 /**
  * Catch up with the rest of the team.
@@ -2555,18 +2547,18 @@ void AIUpdateInterface::joinTeam( void )
 	for (DLINK_ITERATOR<Object> iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		Object *anObj = iter.cur();
-		if (!anObj) 
+		if (!anObj)
 		{
 			continue;
 		}
-		if (obj == anObj) 
+		if (obj == anObj)
 		{
 			// it's us.
 			continue;
-		}	
-		else if (anObj->getAI()) 
+		}
+		else if (anObj->getAI())
 		{
-			if( !anObj->isDisabledByType( DISABLED_HELD ) ) 
+			if( !anObj->isDisabledByType( DISABLED_HELD ) )
 			{
 				other = anObj;
 				break;
@@ -2590,7 +2582,7 @@ void AIUpdateInterface::joinTeam( void )
 		getStateMachine()->setState( state );
 	}
 
-}  // end joinTeam
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool AIUpdateInterface::isAllowedToRespondToAiCommands(const AICommandParms* parms) const
@@ -2612,9 +2604,9 @@ Bool AIUpdateInterface::isAllowedToRespondToAiCommands(const AICommandParms* par
   Bool forbidden = data->m_forbidPlayerCommands;
 
   if ( parms->m_cmdSource == CMD_FROM_PLAYER && forbidden )
-    return FALSE; 
-  // THIS IS JUST FOR THE SPECTREGUNSHIP FOR NOW... 
-  // IT LOCKS OUT USER INPUT, 
+    return FALSE;
+  // THIS IS JUST FOR THE SPECTREGUNSHIP FOR NOW...
+  // IT LOCKS OUT USER INPUT,
   // ALLOWING ONLY THE SPECTREUPDATE TO COMMAND IT VIA CMD_FROM_AI
   // AUTHOR, LORENZEN... 5/15/03
 
@@ -2654,7 +2646,7 @@ void AIUpdateInterface::aiDoCommand(const AICommandParms* parms)
 	}
 #endif
 
-  
+
 	switch (parms->m_cmd)
 	{
 		case AICMD_MOVE_TO_POSITION:
@@ -2773,64 +2765,60 @@ void AIUpdateInterface::aiDoCommand(const AICommandParms* parms)
 			break;
 		case AICMD_GUARD_POSITION:
 		{
-			//Kris: Aug 18, 2003 -- If you were retaliating and ordered to enter guard mode, 
+			//Kris: Aug 18, 2003 -- If you were retaliating and ordered to enter guard mode,
 			//the state needs to be cleared before doing so or else we leave the state too
-			//late and clear data AFTER we go into the new guard mode causing units to 
+			//late and clear data AFTER we go into the new guard mode causing units to
 			//move to zero (bottom left corner).
 			AIStateMachine *state = getStateMachine();
 			if( state && state->getCurrentStateID() == AI_GUARD_RETALIATE )
 			{
 				state->clear();
 			}
-			//end
 
 			privateGuardPosition(&parms->m_pos, (GuardMode)parms->m_intValue, parms->m_cmdSource);
 			break;
 		}
 		case AICMD_GUARD_OBJECT:
 		{
-			//Kris: Aug 18, 2003 -- If you were retaliating and ordered to enter guard mode, 
+			//Kris: Aug 18, 2003 -- If you were retaliating and ordered to enter guard mode,
 			//the state needs to be cleared before doing so or else we leave the state too
-			//late and clear data AFTER we go into the new guard mode causing units to 
+			//late and clear data AFTER we go into the new guard mode causing units to
 			//move to zero (bottom left corner).
 			AIStateMachine *state = getStateMachine();
 			if( state && state->getCurrentStateID() == AI_GUARD_RETALIATE )
 			{
 				state->clear();
 			}
-			//end
 
 			privateGuardObject(parms->m_obj, (GuardMode)parms->m_intValue, parms->m_cmdSource);
 			break;
 		}
 		case AICMD_GUARD_TUNNEL_NETWORK:
 		{
-			//Kris: Aug 18, 2003 -- If you were retaliating and ordered to enter guard mode, 
+			//Kris: Aug 18, 2003 -- If you were retaliating and ordered to enter guard mode,
 			//the state needs to be cleared before doing so or else we leave the state too
-			//late and clear data AFTER we go into the new guard mode causing units to 
+			//late and clear data AFTER we go into the new guard mode causing units to
 			//move to zero (bottom left corner).
 			AIStateMachine *state = getStateMachine();
 			if( state && state->getCurrentStateID() == AI_GUARD_RETALIATE )
 			{
 				state->clear();
 			}
-			//end
 
 			privateGuardTunnelNetwork((GuardMode)parms->m_intValue, parms->m_cmdSource);
 			break;
 		}
 		case AICMD_GUARD_AREA:
 		{
-			//Kris: Aug 18, 2003 -- If you were retaliating and ordered to enter guard mode, 
+			//Kris: Aug 18, 2003 -- If you were retaliating and ordered to enter guard mode,
 			//the state needs to be cleared before doing so or else we leave the state too
-			//late and clear data AFTER we go into the new guard mode causing units to 
+			//late and clear data AFTER we go into the new guard mode causing units to
 			//move to zero (bottom left corner).
 			AIStateMachine *state = getStateMachine();
 			if( state && state->getCurrentStateID() == AI_GUARD_RETALIATE )
 			{
 				state->clear();
 			}
-			//end
 
 			privateGuardArea(parms->m_polygon, (GuardMode)parms->m_intValue, parms->m_cmdSource);
 			break;
@@ -2890,7 +2878,7 @@ void AIUpdateInterface::aiDoCommand(const AICommandParms* parms)
  */
 void AIUpdateInterface::privateMoveToPosition( const Coord3D *pos, CommandSourceType cmdSource )
 {
-	if (getObject()->isMobile() == FALSE) 
+	if (getObject()->isMobile() == FALSE)
 		return;
 
 	//Resetting the locomotor here was initially added for scripting purposes. It has been moved
@@ -2901,7 +2889,7 @@ void AIUpdateInterface::privateMoveToPosition( const Coord3D *pos, CommandSource
 
 	if (!isIdle() && cmdSource == CMD_FROM_AI) {
 		// This is an internally generated move to, and we are in a non-idle state. [8/19/2003]
-		// Our state could be the source of this command, so 
+		// Our state could be the source of this command, so
 		// Move for 20 seconds [8/19/2003]
 		// Things like attack state don't take kindly to being booted out unceremoniously. jba. [8/19/2003]
 		setGoalPositionClipped(pos, cmdSource);
@@ -2926,7 +2914,7 @@ void AIUpdateInterface::privateMoveToPosition( const Coord3D *pos, CommandSource
 /**
  * Move to given object
  */
-void AIUpdateInterface::privateMoveToObject( Object *obj, CommandSourceType cmdSource ) 
+void AIUpdateInterface::privateMoveToObject( Object *obj, CommandSourceType cmdSource )
 {
 	// the dead don't listen very well
 	if (m_isAiDead)
@@ -2940,7 +2928,7 @@ void AIUpdateInterface::privateMoveToObject( Object *obj, CommandSourceType cmdS
 	//other systems (like the battle drone) change the locomotor based on what it's trying to do, and
 	//doesn't want to get reset when ordered to move.
 	//chooseLocomotorSet(LOCOMOTORSET_NORMAL);
-	
+
 	getStateMachine()->clear();
 	getStateMachine()->setGoalObject( obj );
 	m_blockedFrames = 0;
@@ -3185,7 +3173,7 @@ Bool AIUpdateInterface::isMovingAwayFrom(Object *obj)	 const
 	ObjectID id = obj->getID();
 	if (m_stateMachine->getTemporaryState() == AI_MOVE_OUT_OF_THE_WAY) {
 		if (m_moveOutOfWay1 == id) return TRUE;
-		if (m_moveOutOfWay2 == id) return TRUE; 
+		if (m_moveOutOfWay2 == id) return TRUE;
 	}
 	return FALSE;
 }
@@ -3214,7 +3202,7 @@ Bool AIUpdateInterface::isMoving() const
 void AIUpdateInterface::privateMoveAwayFromUnit( Object *unit, CommandSourceType cmdSource )
 {
 	// the dead don't listen very well
-	if (isAiInDeadState() || (getObject()->isMobile() == FALSE) || !isAllowedToMoveAwayFromUnit()) 
+	if (isAiInDeadState() || (getObject()->isMobile() == FALSE) || !isAllowedToMoveAwayFromUnit())
 	{
 		return;
 	}
@@ -3257,13 +3245,13 @@ void AIUpdateInterface::privateMoveAwayFromUnit( Object *unit, CommandSourceType
 		setCanPathThroughUnits(TRUE);
 		newPath = TheAI->pathfinder()->getMoveAwayFromPath(getObject(), unit, unitPath, obj2, path2);
 	}
-		
+
 	if (newPath) {
 		destroyPath();
 		m_path = newPath;
 		wakeUpNow();
 		m_stateMachine->setTemporaryState(AI_MOVE_OUT_OF_THE_WAY, 10*LOGICFRAMES_PER_SECOND);
-		if (m_path) 
+		if (m_path)
 		{
 	 		if( !getObject()->isKindOf(KINDOF_NO_COLLIDE))// If I don't collide with things, I don't need to tell them to get out of the way
 				TheAI->pathfinder()->moveAllies(getObject(), m_path);
@@ -3403,7 +3391,7 @@ void AIUpdateInterface::privateFollowPath( const std::vector<Coord3D>* path, Obj
 	// clear current state machine
 	getStateMachine()->clear();
 
-	if (path->size()>0) {
+	if (!path->empty()) {
 		const Coord3D goal = (*path)[path->size()-1];
 		getStateMachine()->setGoalPosition(&goal);
 	}
@@ -3433,7 +3421,7 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,
 	//doesn't want to get reset when ordered to move.
 	//chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 
-	if (!victim) 
+	if (!victim)
 	{
 		// Hard to kill em if they're already dead.  jba
 		return;
@@ -3694,7 +3682,7 @@ void AIUpdateInterface::privateRepair( Object *obj, CommandSourceType cmdSource
 
 	// there is no "default" way for generic objects to repair each other
 	return;
-				
+
 }
 
 #ifdef ALLOW_SURRENDER
@@ -3838,7 +3826,7 @@ void AIUpdateInterface::privateExit( Object *objectToExit, CommandSourceType cmd
     return;
 
 
-	// we must go thru this state (rather than calling exitObjectViaDoor directly!), 
+	// we must go thru this state (rather than calling exitObjectViaDoor directly!),
 	// because a few containers might need to delay to allow
 	// us to exit (eg, Chinooks must land), meaning we might have to wait a bit, and coordinate
 	// with the container by actually NOTIFYING it that we want to exit...
@@ -3866,7 +3854,7 @@ void AIUpdateInterface::privateExitInstantly( Object *objectToExit, CommandSourc
   if ( objectToExit->isDisabledByType( DISABLED_SUBDUED ) )
     return;
 
-	// we must go thru this state (rather than calling exitObjectViaDoor directly!), 
+	// we must go thru this state (rather than calling exitObjectViaDoor directly!),
 	// because a few containers might need to delay to allow
 	// us to exit (eg, Chinooks must land), meaning we might have to wait a bit, and coordinate
 	// with the container by actually NOTIFYING it that we want to exit...
@@ -3979,7 +3967,7 @@ void AIUpdateInterface::privateWander( const Waypoint *way, CommandSourceType cm
 	setLastCommandSource( cmdSource );
 	getStateMachine()->setGoalWaypoint( way );
 	getStateMachine()->setState( AI_WANDER );
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4001,7 +3989,7 @@ void AIUpdateInterface::privateWanderInPlace( CommandSourceType cmdSource )
 	getStateMachine()->clear();
 	setLastCommandSource( cmdSource );
 	getStateMachine()->setState( AI_WANDER_IN_PLACE );
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4019,12 +4007,12 @@ void AIUpdateInterface::privatePanic( const Waypoint *way, CommandSourceType cmd
 	//other systems (like the battle drone) change the locomotor based on what it's trying to do, and
 	//doesn't want to get reset when ordered to move.
 	//chooseLocomotorSet(LOCOMOTORSET_PANIC);
-	
+
 	getStateMachine()->clear();
 	setLastCommandSource( cmdSource );
 	getStateMachine()->setGoalWaypoint( way );
 	getStateMachine()->setState( AI_PANIC );
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4267,7 +4255,7 @@ void AIUpdateInterface::setAttitude( AttitudeType tude )
 }
 
 /**
- * Get the current behavior modifier state	
+ * Get the current behavior modifier state
  */
 AttitudeType AIUpdateInterface::getAttitude( void ) const
 {
@@ -4296,8 +4284,8 @@ void AIUpdateInterface::ignoreObstacleID( ObjectID id )
 
 //-------------------------------------------------------------------------------------------------
 ObjectID AIUpdateInterface::getIgnoredObstacleID( void ) const
-{ 
-	return m_ignoreObstacleID; 
+{
+	return m_ignoreObstacleID;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4305,7 +4293,7 @@ Object* AIUpdateInterface::getEnterTarget()
 {
 	AIStateType stateType = getAIStateType();
 
-	if( stateType != AI_ENTER && 
+	if( stateType != AI_ENTER &&
 			stateType != AI_GUARD_TUNNEL_NETWORK &&
 			stateType != AI_GET_REPAIRED )
 		return NULL;
@@ -4316,7 +4304,7 @@ Object* AIUpdateInterface::getEnterTarget()
 //-------------------------------------------------------------------------------------------------
 void AIUpdateInterface::setLastCommandSource( CommandSourceType source )
 {
-	m_lastCommandSource = source; 
+	m_lastCommandSource = source;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4324,26 +4312,26 @@ UnsignedInt AIUpdateInterface::getMoodMatrixValue( void ) const
 {
 	UnsignedInt returnVal = 0;
 	// seems like a weird way to get my controlling object, but I don't see another
-	if (!getStateMachine()) 
+	if (!getStateMachine())
 	{
 		return returnVal;
 	}
-	
+
 	const Object *owner = getObject();
 	Player *player = owner->getControllingPlayer();
 
-	if (!player) 
+	if (!player)
 	{
 		return returnVal;
 	}
-	
-	if (player->getPlayerType() == PLAYER_HUMAN) 
+
+	if (player->getPlayerType() == PLAYER_HUMAN)
 	{
 		returnVal |= MM_Controller_Player;
 		// Human units don't have a mood.
 
-	} 
-	else 
+	}
+	else
 	{
 		returnVal |= MM_Controller_AI;
 		switch (getAttitude())
@@ -4353,24 +4341,24 @@ UnsignedInt AIUpdateInterface::getMoodMatrixValue( void ) const
 			case ATTITUDE_NORMAL:			returnVal |= MM_Mood_Normal; break;
 			case ATTITUDE_ALERT:			returnVal |= MM_Mood_Alert; break;
 			case ATTITUDE_AGGRESSIVE:	returnVal |= MM_Mood_Aggressive; break;
-			default: 
+			default:
 				DEBUG_CRASH(("Unknown mood '%d' in getMoodMatrixValue. (Team '%s'). Using normal. (jkmcd)", getAttitude(), getObject()->getTeam()->getName().str() ));
 				returnVal |= MM_Mood_Normal;
 				break;
 		}
 	}
 
-	if (getLocomotorSet().getValidSurfaces() & LOCOMOTORSURFACE_AIR) 
+	if (getLocomotorSet().getValidSurfaces() & LOCOMOTORSURFACE_AIR)
 	{
 		returnVal |= MM_UnitType_Air;
-	} 
-	else 
+	}
+	else
 	{
-		if (m_turretAI[0] != NULL) 
+		if (m_turretAI[0] != NULL)
 		{
 			returnVal |= MM_UnitType_Turreted;
-		} 
-		else 
+		}
+		else
 		{
 			returnVal |= MM_UnitType_NonTurreted;
 		}
@@ -4397,7 +4385,7 @@ UnsignedInt AIUpdateInterface::getMoodMatrixActionAdjustment( MoodMatrixAction a
 	UnsignedInt moodMatrix = getMoodMatrixValue();
 	UnsignedInt returnVal = 0;
 
-	if (moodMatrix & MM_Controller_Player) 
+	if (moodMatrix & MM_Controller_Player)
 	{
 		// Player-controlled units can always do actions (from a mood perspective, at any rate)
 		returnVal = MAA_Action_Ok;
@@ -4407,7 +4395,7 @@ UnsignedInt AIUpdateInterface::getMoodMatrixActionAdjustment( MoodMatrixAction a
 	returnVal = MAA_Action_Ok;
 	switch (action)
 	{
-		case MM_Action_Idle: 
+		case MM_Action_Idle:
 		{
 			switch( moodMatrix & MM_Mood_Bitmask )
 			{
@@ -4492,8 +4480,8 @@ void AIUpdateInterface::setNextMoodCheckTime( UnsignedInt frame )
 
 
 
-Bool AIUpdateInterface::canAutoAcquireWhileStealthed() const 
-{ 
+Bool AIUpdateInterface::canAutoAcquireWhileStealthed() const
+{
   if ( getObject() && getObject()->getStealth() && getObject()->getStealth()->isGrantedBySpecialPower() )
     return TRUE;
   return getAIUpdateModuleData()->m_autoAcquireEnemiesWhenIdle & AAS_Idle_Stealthed;
@@ -4509,7 +4497,7 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	Object *obj = getObject();
 
 	// if we're dead, we can't attack
-	if (obj->isEffectivelyDead()) 
+	if (obj->isEffectivelyDead())
 		return NULL;
 
 	if (obj->testStatus(OBJECT_STATUS_IS_USING_ABILITY)) {
@@ -4517,10 +4505,10 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	}
 
 	const AIUpdateModuleData* d = getAIUpdateModuleData();
-	
+
 	if (calledDuringIdle)
 	{
-		if ((d->m_autoAcquireEnemiesWhenIdle & AAS_Idle) == 0) 
+		if ((d->m_autoAcquireEnemiesWhenIdle & AAS_Idle) == 0)
 		{
 			return NULL;
 		}
@@ -4536,9 +4524,9 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	//AutoAcquireWhenIdle = Yes Stealthed.
 	if ( calledDuringIdle )
 	{
-		if( obj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) ) 
+		if( obj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) )
 		{
-			if( !canAutoAcquireWhileStealthed() ) 
+			if( !canAutoAcquireWhileStealthed() )
 			{
   			const Object *container = obj->getContainedBy();
   			if( ! (container && container->getContain()->isPassengerAllowedToFire()) )
@@ -4555,7 +4543,7 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 
 	// Check if team auto targets same victim.
 	Object *teamVictim = NULL;
-	if (calledByAI && obj->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget) 
+	if (calledByAI && obj->getTeam()->getPrototype()->getTemplateInfo()->m_attackCommonTarget)
 	{
 		teamVictim = obj->getTeam()->getTeamTargetObject();
 		if (teamVictim) {
@@ -4566,8 +4554,8 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 				teamVictim = NULL; // Can't attack him. jba [8/27/2003]
 			}
 		}
-		
-		if (teamVictim && getAttitude()>=ATTITUDE_NORMAL) 
+
+		if (teamVictim && getAttitude()>=ATTITUDE_NORMAL)
 			return teamVictim;
 	}
 
@@ -4592,7 +4580,7 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	// Use Guard Outer, which typically corresponds to the total range
 	Real rangeToFindWithin = TheAI->getAdjustedVisionRangeForObject(obj, AI_VISIONFACTOR_OWNERTYPE | AI_VISIONFACTOR_MOOD);
 
-	if (rangeToFindWithin <= 0.0f) 
+	if (rangeToFindWithin <= 0.0f)
 		return NULL;
 
 	//If we are contained by an object, add it's bounding radius so that large buildings can auto acquire everything in
@@ -4605,7 +4593,7 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	}
 
 	UnsignedInt moodMatrixVal = getMoodMatrixValue();
-	if ((moodMatrixVal & MM_Controller_AI) && (moodMatrixVal & MM_Mood_Passive)) 
+	if ((moodMatrixVal & MM_Controller_AI) && (moodMatrixVal & MM_Mood_Passive))
 	{
 		BodyModuleInterface *bmi = obj->getBodyModule();
 		if (!bmi)
@@ -4626,9 +4614,9 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	}
 
 	if (TheAI->getAiData()->m_attackIgnoreInsignificantBuildings) {
-		flags |= AI::IGNORE_INSIGNIFICANT_BUILDINGS; 
+		flags |= AI::IGNORE_INSIGNIFICANT_BUILDINGS;
 	}
-	
+
 	if( d->m_autoAcquireEnemiesWhenIdle & AAS_Idle_Attack_Buildings )
 	{
 		flags |= AI::ATTACK_BUILDINGS;
@@ -4641,11 +4629,11 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	{
 		flags |= AI::WITHIN_ATTACK_RANGE;
 	}
-	
+
 	// Instead of shroud affecting the ability to attack, it affects the ability to target.
 	// The same checks apply as the old WeaponSet check (now commented out, search for getShroudedStatus)
 	if( calledByAI
-			&& obj->getControllingPlayer() 
+			&& obj->getControllingPlayer()
 			&& obj->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN
 		)
 	{
@@ -4655,7 +4643,7 @@ Object* AIUpdateInterface::getNextMoodTarget( Bool calledByAI, Bool calledDuring
 	Object *newVictim = TheAI->findClosestEnemy(obj, rangeToFindWithin, flags, getAttackInfo());
 
 /*
-DEBUG_LOG(("GNMT frame %d: %s %08lx (con %s %08lx) uses range %f, flags %08lx, %s finds %s %08lx\n",
+DEBUG_LOG(("GNMT frame %d: %s %08lx (con %s %08lx) uses range %f, flags %08lx, %s finds %s %08lx",
 	now,
 	obj->getTemplate()->getName().str(),
 	obj,
@@ -4671,7 +4659,7 @@ DEBUG_LOG(("GNMT frame %d: %s %08lx (con %s %08lx) uses range %f, flags %08lx, %
 
 	if (newVictim)
 	{
-		CRCDEBUG_LOG(("AIUpdateInterface::getNextMoodTarget() - %d is attacking %d\n", obj->getID(), newVictim->getID()));
+		CRCDEBUG_LOG(("AIUpdateInterface::getNextMoodTarget() - %d is attacking %d", obj->getID(), newVictim->getID()));
 /*
 srj debug hack. ignore.
 Int ot = getTmpValue();
@@ -4686,122 +4674,156 @@ setTmpValue(now);
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void AIUpdateInterface::evaluateMoraleBonus( void )
+Bool AIUpdateInterface::hasNationalism() const
 {
-	Object *us = getObject();
-#ifdef ALLOW_DEMORALIZE
-	Bool demoralized = isDemoralized();
-#endif
-	Bool horde = FALSE;
-	Bool nationalism = FALSE;
-	Bool fanaticism = FALSE;
-
-	// do we have nationalism
-	///@todo Find a better way to represent nationalism without hardcoding here (CBD)
-	static const UpgradeTemplate *nationalismTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_Nationalism" );
-	DEBUG_ASSERTCRASH( nationalismTemplate != NULL, ("AIUpdateInterface::evaluateMoraleBonus - Nationalism upgrade not found\n") );
-	Player *player = us->getControllingPlayer();
-	if( player && player->hasUpgradeComplete( nationalismTemplate ) )
-		nationalism = TRUE;
-
-	// do we have fanaticism
-	///@todo Find a better way to represent fanaticism without hardcoding here (MAL)
-	static const UpgradeTemplate *fanaticismTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_Fanaticism" );
-	DEBUG_ASSERTCRASH( fanaticismTemplate != NULL, ("AIUpdateInterface::evaluateMoraleBonus - Fanaticism upgrade not found\n") );
-	if( player && player->hasUpgradeComplete( fanaticismTemplate ) )
-		fanaticism = TRUE;
-
-	// are we in a horde
-	HordeUpdateInterface *hui;
-	for( BehaviorModule** u = us->getBehaviorModules(); *u; ++u )
-	{
-
-		hui = (*u)->getHordeUpdateInterface();
-		if( hui && hui->isInHorde() )
+	if (const Player *player = getObject()->getControllingPlayer())
+	{
+		///@todo Find a better way to represent nationalism without hard coding here (CBD)
+		static const UpgradeTemplate *nationalismTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_Nationalism" );
+		if (nationalismTemplate != NULL)
 		{
-			horde = TRUE;
-
-			if( !hui->isAllowedNationalism() )
-			{
-				// Sorry CBD and MAL, but the cancer has spread to the lymph nodes.  After Alpha, just pump full of painkillers.
-				nationalism = FALSE;
-				fanaticism = FALSE;
-			}
+			return player->hasUpgradeComplete( nationalismTemplate );
 		}
+	}
+	return false;
+}
 
-	}  // end for
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+Bool AIUpdateInterface::hasFanaticism() const
+{
+	if (const Player *player = getObject()->getControllingPlayer())
+	{
+		///@todo Find a better way to represent fanaticism without hard coding here (MAL)
+		static const UpgradeTemplate *fanaticismTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_Fanaticism" );
+		if (fanaticismTemplate != NULL)
+		{
+			return player->hasUpgradeComplete( fanaticismTemplate );
+		}
+	}
+	return false;
+}
 
+// ------------------------------------------------------------------------------------------------
+// TheSuperHackers @refactor The implementation has been improved and simplified.
+// ------------------------------------------------------------------------------------------------
+void AIUpdateInterface::evaluateMoraleBonus( Bool inHorde, Bool allowNationalism, HordeActionType type )
+{
 #ifdef ALLOW_DEMORALIZE
-	// if we are are not demoralized we can have horde and nationalism effects
-	if( demoralized == FALSE )
-#endif
+
+	// if we are demoralized, then we can not have horde and nationalism effects
+	if( isDemoralized() )
 	{
+		Object *us = getObject();
 
-#ifdef ALLOW_DEMORALIZE
 		// demoralized
-		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_DEMORALIZED );
-#endif		
-		
-		//Lorenzen temporarily disabled, since it fights with the horde buff
-		//Drawable *draw = us->getDrawable();
-		//if ( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
-		//	draw->setTerrainDecal(TERRAIN_DECAL_NONE);
-
-		// horde
-		if( horde )
+		us->setWeaponBonusCondition( WEAPONBONUSCONDITION_DEMORALIZED );
+
+		// we cannot have horde bonuses
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+
+		Drawable *draw = us->getDrawable();
+		if( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
 		{
-			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
+			draw->setTerrainDecal(TERRAIN_DECAL_DEMORALIZED);
+		}
 
-		}  // end if
-		else
-			us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
+		return;
+	}
 
-		// nationalism
-		if( nationalism )
-    {
-			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
-      // fanaticism
-      if ( fanaticism )
-        us->setWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );// FOR THE NEW GC INFANTRY GENERAL
-      else 
-        us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
-    }
-		else
-			us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+	// demoralized
+	us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_DEMORALIZED );
 
+#endif // ALLOW_DEMORALIZE
 
+	//Lorenzen temporarily disabled, since it fights with the horde buff
+	//Object *us = getObject();
+	//Drawable *draw = us->getDrawable();
+	//if ( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
+	//	draw->setTerrainDecal(TERRAIN_DECAL_NONE);
 
-	}  // end if
-#ifdef ALLOW_DEMORALIZE
-	else
+	switch (type)
 	{
+	case HORDEACTION_HORDE:
+		evaluateNationalismBonusClassic(inHorde, allowNationalism);
+		break;
 
-		// demoralized
-		us->setWeaponBonusCondition( WEAPONBONUSCONDITION_DEMORALIZED );
+#if !RETAIL_COMPATIBLE_CRC
+	case HORDEACTION_HORDE_FIXED:
+		evaluateNationalismBonus(inHorde, allowNationalism);
+		break;
+#endif
+	}
+}
+
+// ------------------------------------------------------------------------------------------------
+// TheSuperHackers @info The classic Nationalism Bonus implementation.
+// Is not great, because Nationalism and Fanaticism bonuses are not disabled when leaving the horde.
+// ------------------------------------------------------------------------------------------------
+void AIUpdateInterface::evaluateNationalismBonusClassic( Bool inHorde, Bool allowNationalism )
+{
+	Object *us = getObject();
 
-		// we cannot have horde bonus condition
+	if( inHorde )
+	{
+		us->setWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
+	}
+	else
+	{
 		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
-		Drawable *draw = us->getDrawable();
-		if( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
-		{	
-			draw->setTerrainDecal(TERRAIN_DECAL_DEMORALIZED);
+	}
+
+	if( allowNationalism && hasNationalism() )
+	{
+		us->setWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+
+		if ( hasFanaticism() )
+		{
+			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
 		}
-				
-		// we cannot have nationalism bonus condition
+		else
+		{
+			us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+		}
+	}
+	else
+	{
 		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
-    us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+	}
+}
 
-	}  // end else
-#endif
+// ------------------------------------------------------------------------------------------------
+// TheSuperHackers @bugfix The fixed Nationalism Bonus implementation.
+// Nationalism and Fanaticism are now tied to the horde status.
+// And Fanaticism is no longer dependent on Nationalism.
+// ------------------------------------------------------------------------------------------------
+void AIUpdateInterface::evaluateNationalismBonus( Bool inHorde, Bool allowNationalism )
+{
+	Object *us = getObject();
 
-/*
-	UnicodeString msg;
-	msg.format( L"'%S' Horde=%d,Nationalism=%d,Demoralized=%d",
-							us->getTemplate()->getName().str(), horde, nationalism, demoralized );
-	TheInGameUI->message( msg );
-*/
+	if( inHorde )
+	{
+		us->setWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
 
-}  // end evaluateMoraleBonus
+		if( allowNationalism && hasNationalism() )
+		{
+			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+		}
+
+		if( allowNationalism && hasFanaticism() )
+		{
+			us->setWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+		}
+	}
+	else
+	{
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_HORDE );
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM );
+		us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_FANATICISM );
+	}
+}
 
 #ifdef ALLOW_DEMORALIZE
 // ------------------------------------------------------------------------------------------------
@@ -4817,12 +4839,16 @@ void AIUpdateInterface::setDemoralized( UnsignedInt durationInFrames )
 	if( (prevDemoralizedFrames == 0 && m_demoralizedFramesLeft > 0) ||
 			(prevDemoralizedFrames > 0 && m_demoralizedFramesLeft == 0) )
 	{
-
 		// evaluate demoralization, nationalism, and horde effect as they are all intertwined
-		evaluateMoraleBonus();
-
-	}  // end if
-
+		Object *us = getObject();
+		for( BehaviorModule** u = us->getBehaviorModules(); *u; ++u )
+		{
+			if ( HordeUpdateInterface *hui = (*u)->getHordeUpdateInterface() )
+			{
+				evaluateMoraleBonus( hui->isInHorde(), hui->isAllowedNationalism(), hui->getHordeActionType() );
+			}
+		}
+	}
 }
 #endif
 
@@ -5011,15 +5037,15 @@ AIGroup *AIUpdateInterface::getGroup(void)
 // ------------------------------------------------------------------------------------------------
 void AIUpdateInterface::crc( Xfer *x )
 {
-	CRCGEN_LOG(("AIUpdateInterface::crc() begin - %8.8X\n", ((XferCRC *)x)->getCRC()));
+	CRCGEN_LOG(("AIUpdateInterface::crc() begin - %8.8X", ((XferCRC *)x)->getCRC()));
 	// extend base class
 	UpdateModule::crc( x );
 
 	xfer(x);
 
-	CRCGEN_LOG(("AIUpdateInterface::crc() end - %8.8X\n", ((XferCRC *)x)->getCRC()));
+	CRCGEN_LOG(("AIUpdateInterface::crc() end - %8.8X", ((XferCRC *)x)->getCRC()));
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -5032,18 +5058,18 @@ void AIUpdateInterface::xfer( Xfer *xfer )
   const XferVersion currentVersion = 4;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
   UpdateModule::xfer( xfer );
- 
+
 	xfer->xferUnsignedInt(&m_priorWaypointID);
 	xfer->xferUnsignedInt(&m_currentWaypointID);
 	xfer->xferSnapshot(m_stateMachine);
 	xfer->xferBool(&m_isAiDead);
 	xfer->xferBool(&m_isRecruitable);
 
-	xfer->xferUnsignedInt(&m_nextEnemyScanTime);		
-	xfer->xferObjectID(&m_currentVictimID);	
+	xfer->xferUnsignedInt(&m_nextEnemyScanTime);
+	xfer->xferObjectID(&m_currentVictimID);
 	xfer->xferReal(&m_desiredSpeed);
 	xfer->xferUser(&m_lastCommandSource, sizeof(m_lastCommandSource));
 	xfer->xferUser(&m_guardTargetType[0], sizeof(m_guardTargetType));
@@ -5060,7 +5086,7 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 		if (triggerName.isNotEmpty()) {
 			m_areaToGuard = TheTerrainLogic->getTriggerAreaByName(triggerName);
 		}
-	} 
+	}
 
 	AsciiString attackName;
 	if (m_attackInfo) attackName = m_attackInfo->getName();
@@ -5070,7 +5096,7 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 		if (attackName.isNotEmpty()) {
 			m_attackInfo = TheScriptEngine->getAttackInfo(attackName);
 		}
-	}  
+	}
 
 	xfer->xferInt(&m_waypointCount);
 	if (m_waypointCount<0 || m_waypointCount>MAX_WAYPOINTS) {
@@ -5110,8 +5136,8 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 	xfer->xferCoord3D(&m_requestedDestination2);
 
 	// Not needed - we will recompute paths on load.
-	//xfer->xferUnsignedInt(&m_pathTimestamp);		
-	
+	//xfer->xferUnsignedInt(&m_pathTimestamp);
+
 	xfer->xferObjectID(&m_ignoreObstacleID);
 	xfer->xferReal(&m_pathExtraDistance);
 	xfer->xferICoord2D(&m_pathfindGoalCell);
@@ -5155,12 +5181,12 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 		// Read in from .ini
 		//LocomotorSet			m_locomotorSet;
 		AsciiString setName;
-		if (m_curLocomotorSet > LOCOMOTORSET_INVALID && m_curLocomotorSet < LOCOMOTORSET_COUNT) 
+		if (m_curLocomotorSet > LOCOMOTORSET_INVALID && m_curLocomotorSet < LOCOMOTORSET_COUNT)
 			setName = TheLocomotorSetNames[m_curLocomotorSet];
 
 		xfer->xferAsciiString(&setName);
 
-		if (setName.isNotEmpty()) 
+		if (setName.isNotEmpty())
 			m_curLocomotorSet = (LocomotorSetType)INI::scanIndexList(setName.str(), TheLocomotorSetNames);
 
 		m_fixLocoInPostProcess = TRUE;
@@ -5170,7 +5196,7 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 		if (xfer->getXferMode() == XFER_LOAD)
 		{
 			// our ctor choose a NORMAL set for us. it's simpler
-			// to simply clear out whatever we have here and allow 
+			// to simply clear out whatever we have here and allow
 			// xferSelfAndCurLocoPtr() to continue to require a pristine,
 			// empty set. (srj)
 			m_locomotorSet.clear();
@@ -5192,7 +5218,7 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 	xfer->xferUser(&m_attitude, sizeof(m_attitude));
 
 	xfer->xferUnsignedInt(&m_nextMoodCheckTime);
-	if (version == 1)	
+	if (version == 1)
 	{
 		// surrender + demoralize
 #ifdef ALLOW_DEMORALIZE
@@ -5243,7 +5269,7 @@ void AIUpdateInterface::xfer( Xfer *xfer )
 	}
 
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -5252,7 +5278,7 @@ void AIUpdateInterface::loadPostProcess( void )
 {
 	UpdateModule::loadPostProcess();
 
-	if (m_fixLocoInPostProcess && m_curLocomotorSet!=LOCOMOTORSET_INVALID) 
+	if (m_fixLocoInPostProcess && m_curLocomotorSet!=LOCOMOTORSET_INVALID)
 	{
 		m_fixLocoInPostProcess = FALSE;
 
@@ -5280,14 +5306,14 @@ void AIUpdateInterface::loadPostProcess( void )
 		}
 	}
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Int AIUpdateInterface::friend_getWaypointGoalPathSize() const 
-{ 
+Int AIUpdateInterface::friend_getWaypointGoalPathSize() const
+{
 			//
-			// it is VERY IMPORTANT to check for the current state type as being follow-path, 
+			// it is VERY IMPORTANT to check for the current state type as being follow-path,
 			// because "getGoalPath" and friends are used for other things (eg, jet takeoff and landing).
 			// if you don't do this check, you will end up with really bizarre behavior in obscure jet-related
 			// cases, and our users will all laugh at us.
@@ -5298,7 +5324,7 @@ Int AIUpdateInterface::friend_getWaypointGoalPathSize() const
 	if (getAIStateType() != AI_FOLLOW_PATH)
 		return 0;
 
-	return getStateMachine()->getGoalPathSize(); 
+	return getStateMachine()->getGoalPathSize();
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp
index 193419c929b..32ec0f80af8 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp
@@ -28,7 +28,7 @@
 //         troops, order them to attack, then return. Can do extra things like ordering
 //         injured troops to return to the transport for healing purposes.
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingFactory.h"
@@ -43,11 +43,6 @@
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -58,7 +53,7 @@ AssaultTransportAIUpdate::AssaultTransportAIUpdate( Thing *thing, const ModuleDa
 {
 	m_currentMembers = MAX_TRANSPORT_SLOTS; //First time, max it out, to ensure clearing arrays in reset.
 	reset();
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void AssaultTransportAIUpdate::reset()
@@ -82,7 +77,7 @@ void AssaultTransportAIUpdate::reset()
 //-------------------------------------------------------------------------------------------------
 AssaultTransportAIUpdate::~AssaultTransportAIUpdate( void )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void AssaultTransportAIUpdate::aiDoCommand(const AICommandParms* parms)
@@ -91,7 +86,7 @@ void AssaultTransportAIUpdate::aiDoCommand(const AICommandParms* parms)
 	if( parms->m_cmdSource != CMD_FROM_AI )
 	{
 		//Now the only time we care about anything is if we were ordered to attack something or attack move.
-		switch( parms->m_cmd ) 
+		switch( parms->m_cmd )
 		{
 			case AICMD_ATTACKMOVE_TO_POSITION:
 				//Reset because we have been ordered to do something.
@@ -118,7 +113,7 @@ void AssaultTransportAIUpdate::aiDoCommand(const AICommandParms* parms)
 		}
 	}
 
-	//Note, in both cases, the transport will fire a dummy DEPLOY weapon that will trigger the 
+	//Note, in both cases, the transport will fire a dummy DEPLOY weapon that will trigger the
 	//evacuation of the troops.
 	AIUpdateInterface::aiDoCommand( parms );
 }
@@ -235,7 +230,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 					//Generally only player commands allow this, so this flag allows AI commands to do the same.
 					passenger->getAI()->setAllowedToChase( TRUE );
 				}
-				
+
 				//Check if the passenger is wounded below threshhold (if so make sure we heal him before ordering him to fight!)
 				if( isMemberWounded( passenger ) )
 				{
@@ -278,7 +273,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 		{
 			Object *member = TheGameLogic->findObjectByID( m_memberIDs[ i ] );
 			AIUpdateInterface *ai = member ? member->getAI() : NULL;
-			
+
 			if( member && ai )
 			{
 				Bool contained = member->isContained();
@@ -289,7 +284,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 					//New members are exempt!
 					ai->aiExit( transport, CMD_FROM_AI );
 				}
-				if( !contained ) 
+				if( !contained )
 				{
 					if( wounded )
 					{
@@ -299,7 +294,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 							ai->aiEnter( transport, CMD_FROM_AI );
 						}
 					}
-					else 
+					else
 					{
 						//Increment the number of fighters and their position.
 						fighterCentroidPos.add( member->getPosition() );
@@ -333,7 +328,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 
 	/*
 	//Keep near the troops.
-	if( !m_framesRemaining ) 
+	if( !m_framesRemaining )
 	{
 		if( !isMoving() && fightingMembers && designatedTarget )
 		{
@@ -345,7 +340,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 
 			Coord3D designatedTargetPos = *designatedTarget->getPosition();
 
-			//Calculate a vector from the target passed the fighters to be at a safe place 
+			//Calculate a vector from the target passed the fighters to be at a safe place
 			//to be as a transport.
 			Coord3D vector;
 			vector.set( &fighterCentroidPos );
@@ -375,7 +370,7 @@ UpdateSleepTime AssaultTransportAIUpdate::update( void )
 		//aiFaceObject( designatedTarget, CMD_FROM_AI );
 	}
 	*/
-	
+
 	/*UpdateSleepTime ret =*/ AIUpdateInterface::update();
 	//return (mine < ret) ? mine : ret;
 	/// @todo srj -- someday, make sleepy. for now, must not sleep.
@@ -453,7 +448,7 @@ void AssaultTransportAIUpdate::retrieveMembers()
 				//This contained member is healthy so order him to exit to start fighting!
 				if (ai->getAIStateType() != AI_ENTER) {
 					ai->aiEnter( getObject(), CMD_FROM_AI );
-				} 
+				}
 			}
 		}
 	}
@@ -492,7 +487,7 @@ void AssaultTransportAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -505,7 +500,7 @@ void AssaultTransportAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -519,16 +514,16 @@ void AssaultTransportAIUpdate::xfer( Xfer *xfer )
 
 	xfer->xferCoord3D( &m_attackMoveGoalPos );
 	xfer->xferObjectID( &m_designatedTarget );
-	
+
 	Int state = (Int)m_state;
 	xfer->xferInt( &state );
 	m_state = (AssaultStateTypes)state;
-	
+
 	xfer->xferUnsignedInt( &m_framesRemaining );
 	xfer->xferBool( &m_isAttackMove );
 	xfer->xferBool( &m_isAttackObject );
 
-}  // end xfer
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -537,5 +532,5 @@ void AssaultTransportAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
index e5e216bff7b..afed8280036 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
@@ -24,13 +24,14 @@
 
 // ChinookAIUpdate.cpp //////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_VETERANCY_NAMES				// for TheVeterancyNames[]
 
 #include "Common/ActionManager.h"
 #include "Common/DrawModule.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/RandomValue.h"
 #include "Common/Team.h"
@@ -51,11 +52,6 @@
 
 const Real BIGNUM = 99999.0f;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 enum ChinookAIStateType CPP_11(: Int)
@@ -67,17 +63,17 @@ enum ChinookAIStateType CPP_11(: Int)
 	LANDING,
 
 	MOVE_TO_AND_LAND,
-	
+
 	MOVE_TO_AND_EVAC,
 	LAND_AND_EVAC,
 	EVAC_AND_TAKEOFF,
-	
+
 	MOVE_TO_AND_EVAC_AND_EXIT,
 	LAND_AND_EVAC_AND_EXIT,
 	EVAC_AND_EXIT,
 	TAKEOFF_AND_EXIT,
 	HEAD_OFF_MAP,
-	
+
 	MOVE_TO_COMBAT_DROP,
 	DO_COMBAT_DROP,
 	MOVE_TO_AND_EVAC_AND_EXIT_INIT
@@ -113,9 +109,9 @@ static Object* getPotentialRappeller(Object* obj)
 }
 
 //----------------------------------------------------------------------------------------------------------
-class ChinookEvacuateState : public State 
+class ChinookEvacuateState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookEvacuateState, "ChinookEvacuateState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookEvacuateState, "ChinookEvacuateState")
 protected:
 	// snapshot interface	STUBBED - no member vars to save. jba.
 	virtual void crc( Xfer *xfer ){};
@@ -145,7 +141,7 @@ EMPTY_DTOR(ChinookEvacuateState)
 //-------------------------------------------------------------------------------------------------
 class ChinookHeadOffMapState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookHeadOffMapState, "ChinookHeadOffMapState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookHeadOffMapState, "ChinookHeadOffMapState")
 	//I'm outta here
 protected:
 	// snapshot interface	STUBBED - no member vars to save. jba.
@@ -191,9 +187,9 @@ class ChinookHeadOffMapState :  public State
 EMPTY_DTOR(ChinookHeadOffMapState)
 
 //-------------------------------------------------------------------------------------------------
-class ChinookTakeoffOrLandingState : public State 
+class ChinookTakeoffOrLandingState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookTakeoffOrLandingState, "ChinookTakeoffOrLandingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookTakeoffOrLandingState, "ChinookTakeoffOrLandingState")
 private:
 	Coord3D		m_destLoc;
 	Bool			m_landing;
@@ -222,7 +218,7 @@ class ChinookTakeoffOrLandingState : public State
 	}
 
 public:
-	ChinookTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), State( machine, "ChinookTakeoffOrLandingState" ) 
+	ChinookTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), State( machine, "ChinookTakeoffOrLandingState" )
 	{
 		m_destLoc.zero();
 	}
@@ -257,7 +253,7 @@ class ChinookTakeoffOrLandingState : public State
 			Coord3D tmp;
 			FindPositionOptions options;
 			options.maxRadius = obj->getGeometryInfo().getBoundingCircleRadius() * 100.0f;
-			if (ThePartitionManager->findPositionAround(&m_destLoc, &options, &tmp)) 
+			if (ThePartitionManager->findPositionAround(&m_destLoc, &options, &tmp))
 			{
 				m_destLoc = tmp;
 				TheAI->pathfinder()->adjustToLandingDestination(obj, &m_destLoc);
@@ -309,7 +305,7 @@ class ChinookTakeoffOrLandingState : public State
 
 		ai->friend_setFlightStatus(m_landing ? CHINOOK_LANDED : CHINOOK_FLYING);
 
-		// Paranoia checks - sometimes onExit is called when we are 
+		// Paranoia checks - sometimes onExit is called when we are
 		// shutting down, and not all pieces are valid.  CurLocomotor
 		// is definitely null in some cases. jba.
 		Locomotor* loco = ai->getCurLocomotor();
@@ -340,9 +336,9 @@ class ChinookTakeoffOrLandingState : public State
 EMPTY_DTOR(ChinookTakeoffOrLandingState)
 
 //-------------------------------------------------------------------------------------------------
-class ChinookCombatDropState : public State 
+class ChinookCombatDropState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookCombatDropState, "ChinookCombatDropState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookCombatDropState, "ChinookCombatDropState")
 
 private:
 
@@ -366,7 +362,11 @@ class ChinookCombatDropState : public State
 			for (std::list<ObjectID>::iterator oit = it->rappellerIDs.begin(); oit != it->rappellerIDs.end(); )
 			{
 				Object* rappeller = TheGameLogic->findObjectByID(*oit);
+#if RETAIL_COMPATIBLE_CRC
 				if (rappeller == NULL || rappeller->isEffectivelyDead() || !rappeller->isAboveTerrain())
+#else
+				if (rappeller == NULL || rappeller->isEffectivelyDead() || !rappeller->isAboveTerrain() || rappeller->isContained())
+#endif
 				{
 					oit = it->rappellerIDs.erase(oit);
 				}
@@ -437,12 +437,12 @@ class ChinookCombatDropState : public State
 			{
 				if (!m_ropes.empty())
 				{
-					DEBUG_CRASH(( "ChinookCombatDropState - ropes should be empty\n" ));
+					DEBUG_CRASH(( "ChinookCombatDropState - ropes should be empty" ));
 					throw SC_INVALID_DATA;
 				}
 				m_ropes.resize(numRopes);
 			}
-			
+
 			for (Int i = 0; i < numRopes; ++i)
 			{
 				RopeInfo info;
@@ -501,7 +501,7 @@ class ChinookCombatDropState : public State
 		UnsignedInt now = TheGameLogic->getFrame();
 
 		const ThingTemplate* ropeTmpl = TheThingFactory->findTemplate(d->m_ropeName);
-		
+
 		const Int MAX_BONES = 32;
     Coord3D ropePos[MAX_BONES];
     Matrix3D dropMtx[MAX_BONES];
@@ -521,7 +521,7 @@ class ChinookCombatDropState : public State
 			RopeInfo info;
 
 			obj->convertBonePosToWorldPos( NULL, &dropMtx[i], NULL, &info.dropStartMtx );
-			
+
 			info.ropeDrawable = ropeTmpl ? TheThingFactory->newDrawable(ropeTmpl) : NULL;
 			if (info.ropeDrawable)
 			{
@@ -553,7 +553,7 @@ class ChinookCombatDropState : public State
 		Object* obj = getMachineOwner();
 		ChinookAIUpdate* ai = (ChinookAIUpdate*)obj->getAIUpdateInterface();
 		const ChinookAIUpdateModuleData* d = ai->friend_getData();
-		
+
 		if (obj->isEffectivelyDead())
 		{
 			return STATE_FAILURE;
@@ -588,6 +588,7 @@ class ChinookCombatDropState : public State
 				Object* rappeller = getPotentialRappeller(obj);
 				if (rappeller != NULL)
 				{
+#if RETAIL_COMPATIBLE_CRC
 					ExitInterface *exitInterface = obj->getObjectExitInterface();
 					ExitDoorType exitDoor = exitInterface ? exitInterface->reserveDoorForExit(rappeller->getTemplate(), rappeller) : DOOR_NONE_AVAILABLE;
 					if(exitDoor != DOOR_NONE_AVAILABLE)
@@ -598,6 +599,15 @@ class ChinookCombatDropState : public State
 					{
 						DEBUG_CRASH(("rappeller is not free to exit... what?"));
 					}
+#else
+					// TheSuperHackers @bugfix 03/01/2026 Bypass door reservation as rappellers are always
+					// expected to be free to exit. This avoids prior rappel conditions in getAiFreeToExit
+					// from allowing rappellers to be freely 'dropped' from the Chinook during this state.
+					if (ExitInterface* exitInterface = obj->getObjectExitInterface())
+					{
+						exitInterface->exitObjectViaDoor(rappeller, DOOR_1);
+					}
+#endif
 
 					rappeller->setTransformMatrix(&it->dropStartMtx);
 
@@ -681,7 +691,7 @@ EMPTY_DTOR(ChinookCombatDropState)
  */
 class ChinookMoveToBldgState : public AIMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookMoveToBldgState, "ChinookMoveToBldgState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookMoveToBldgState, "ChinookMoveToBldgState")
 private:
 	Real m_oldPreferredHeight;
 	Real m_newPreferredHeight;
@@ -777,7 +787,7 @@ EMPTY_DTOR(ChinookMoveToBldgState)
  */
 class ChinookRecordCreationState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookRecordCreationState, "ChinookRecordCreationState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ChinookRecordCreationState, "ChinookRecordCreationState")
 protected:
 	// snapshot interface
 	virtual void crc( Xfer *xfer )
@@ -890,11 +900,11 @@ ChinookAIUpdateModuleData::ChinookAIUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void ChinookAIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void ChinookAIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   SupplyTruckAIUpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "RappelSpeed", INI::parseVelocityReal, 0, offsetof(ChinookAIUpdateModuleData, m_rappelSpeed) },
 		{ "RopeDropSpeed", INI::parseVelocityReal, 0, offsetof(ChinookAIUpdateModuleData, m_ropeDropSpeed) },
@@ -931,7 +941,7 @@ AIStateMachine* ChinookAIUpdate::makeStateMachine()
 //-------------------------------------------------------------------------------------------------
 ChinookAIUpdate::ChinookAIUpdate( Thing *thing, const ModuleData* moduleData ) : SupplyTruckAIUpdate( thing, moduleData )
 {
-	m_hasPendingCommand = false;	
+	m_hasPendingCommand = false;
 	m_flightStatus = CHINOOK_FLYING;	// yep, that's right, even if we start "on ground"
 	m_airfieldForHealing = INVALID_ID;
 	m_originalPos.zero();
@@ -1025,13 +1035,13 @@ Bool ChinookAIUpdate::isAllowedToAdjustDestination() const
 	{
 		return FALSE;
 	}
-	
-	return SupplyTruckAIUpdate::isAllowedToAdjustDestination(); 
+
+	return SupplyTruckAIUpdate::isAllowedToAdjustDestination();
 }
 
 //-------------------------------------------------------------------------------------------------
-ObjectID ChinookAIUpdate::getBuildingToNotPathAround() const 
-{ 
+ObjectID ChinookAIUpdate::getBuildingToNotPathAround() const
+{
 	if (getAIStateType() == MOVE_TO_COMBAT_DROP || getAIStateType() == DO_COMBAT_DROP)
 	{
 		const Object* goalObj = getStateMachine()->getGoalObject();
@@ -1039,17 +1049,21 @@ ObjectID ChinookAIUpdate::getBuildingToNotPathAround() const
 			return goalObj->getID();
 	}
 
-	return INVALID_ID; 
+	return INVALID_ID;
 }
 
 //-------------------------------------------------------------------------------------------------
-AIFreeToExitType ChinookAIUpdate::getAiFreeToExit(const Object* exiter) const 
-{ 
-	 if (m_flightStatus == CHINOOK_LANDED 
+AIFreeToExitType ChinookAIUpdate::getAiFreeToExit(const Object* exiter) const
+{
+#if RETAIL_COMPATIBLE_CRC
+	 if (m_flightStatus == CHINOOK_LANDED
 				|| (m_flightStatus == CHINOOK_DOING_COMBAT_DROP && exiter->isKindOf(KINDOF_CAN_RAPPEL)))
+#else
+	if (m_flightStatus == CHINOOK_LANDED)
+#endif
 		return FREE_TO_EXIT;
-	
-	return WAIT_TO_EXIT; 
+
+	return WAIT_TO_EXIT;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1064,9 +1078,16 @@ Bool ChinookAIUpdate::chooseLocomotorSet(LocomotorSetType wst)
 UpdateSleepTime ChinookAIUpdate::update()
 {
 	ParkingPlaceBehaviorInterface* pp = getPP(m_airfieldForHealing);
+	const ContainModuleInterface* contain = getObject()->getContain();
+	const Bool waitingToEnterOrExit = contain && contain->hasObjectsWantingToEnterOrExit();
+
 	if (pp != NULL)
 	{
-		if (m_flightStatus == CHINOOK_LANDED && 
+		if (m_flightStatus == CHINOOK_LANDED &&
+#if !RETAIL_COMPATIBLE_CRC
+				// TheSuperHackers @bugfix Stubbjax 03/11/2025 Prevent Chinooks from taking off while there are still units wanting to enter or exit.
+				!waitingToEnterOrExit &&
+#endif
 				!m_hasPendingCommand &&
 				getObject()->getBodyModule()->getHealth() == getObject()->getBodyModule()->getMaxHealth())
 		{
@@ -1085,15 +1106,13 @@ UpdateSleepTime ChinookAIUpdate::update()
 	}
 
 
-  
+
 	// have to call our parent's isIdle, because we override it to never return true
 	// when we have a pending command...
-	ContainModuleInterface* contain = getObject()->getContain();
 	if( contain )
 	{
 	  if (SupplyTruckAIUpdate::isIdle())
 		{
-			Bool waitingToEnterOrExit = contain->hasObjectsWantingToEnterOrExit();
 			if (m_hasPendingCommand)
 			{
 				AICommandParms parms(AICMD_MOVE_TO_POSITION, CMD_FROM_AI);	// values don't matter, will be wiped by next line
@@ -1152,7 +1171,9 @@ UpdateSleepTime ChinookAIUpdate::update()
 
 
   // Just a handy spot to handle that groovy client effect of the rotor wash
-  if ( getObject()->getShroudedStatus( ThePlayerList->getLocalPlayer()->getPlayerIndex()) == OBJECTSHROUD_CLEAR )
+  const Int playerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
+
+  if ( getObject()->getShroudedStatus(playerIndex) == OBJECTSHROUD_CLEAR )
   {
     if ( m_flightStatus == CHINOOK_LANDING || m_flightStatus == CHINOOK_TAKING_OFF || m_flightStatus == CHINOOK_LANDED )
     {
@@ -1229,7 +1250,7 @@ void ChinookAIUpdate::privateCombatDrop( Object* target, const Coord3D& pos, Com
 	// when there is a target present, we must verify that we can logically do the action when
 	// we get commands from players (we'll assume AI knows what its doing)
 	//
-	if( target != NULL && cmdSource == CMD_FROM_PLAYER && 
+	if( target != NULL && cmdSource == CMD_FROM_PLAYER &&
 			TheActionManager->canEnterObject( getObject(), target, cmdSource, COMBATDROP_INTO ) == FALSE )
 		return;
 
@@ -1256,14 +1277,20 @@ void ChinookAIUpdate::privateCombatDrop( Object* target, const Coord3D& pos, Com
 //-------------------------------------------------------------------------------------------------
 void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
 {
+#if RETAIL_COMPATIBLE_CRC
 	// this gets reset every time a command is issued.
 	setAirfieldForHealing(INVALID_ID);
+#else
+	// TheSuperHackers @bugfix Stubbjax 31/10/2025 Don't leave healing state for evacuation commands.
+	if (parms->m_cmd != AICMD_EVACUATE && parms->m_cmd != AICMD_EXIT)
+		setAirfieldForHealing(INVALID_ID);
+#endif
 
 	if (!isAllowedToRespondToAiCommands(parms))
 		return;
 
-	if (m_flightStatus == CHINOOK_TAKING_OFF || 
-				m_flightStatus == CHINOOK_LANDING || 
+	if (m_flightStatus == CHINOOK_TAKING_OFF ||
+				m_flightStatus == CHINOOK_LANDING ||
 				m_flightStatus == CHINOOK_DOING_COMBAT_DROP)
 	{
 		// have to wait for takeoff or landing (or rappel) to complete, just store the sucker.
@@ -1289,7 +1316,7 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
 		{
 			const Real THRESH = 3.0f;
 			const Real THRESH_SQR = THRESH*THRESH;
-			if (calcDistSqr(*getObject()->getPosition(), parms->m_pos) > THRESH_SQR && 
+			if (calcDistSqr(*getObject()->getPosition(), parms->m_pos) > THRESH_SQR &&
 					m_flightStatus == CHINOOK_LANDED)
 			{
 				// gotta take off first!
@@ -1303,7 +1330,7 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
 			{
 				// do this INSTEAD of the standard stuff
 				setMyState(
-					(parms->m_cmd == AICMD_MOVE_TO_POSITION_AND_EVACUATE) ? MOVE_TO_AND_EVAC : MOVE_TO_AND_EVAC_AND_EXIT_INIT, 
+					(parms->m_cmd == AICMD_MOVE_TO_POSITION_AND_EVACUATE) ? MOVE_TO_AND_EVAC : MOVE_TO_AND_EVAC_AND_EXIT_INIT,
 					NULL, &parms->m_pos, CMD_FROM_AI);
 				passItThru = false;
 			}
@@ -1353,7 +1380,7 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
 void ChinookAIUpdate::crc( Xfer *xfer )
 {
 	SupplyTruckAIUpdate::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1382,7 +1409,7 @@ void ChinookAIUpdate::xfer( Xfer *xfer )
 		xfer->xferCoord3D( &m_originalPos );
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1390,7 +1417,7 @@ void ChinookAIUpdate::xfer( Xfer *xfer )
 void ChinookAIUpdate::loadPostProcess( void )
 {
 	SupplyTruckAIUpdate::loadPostProcess();
-}  // end loadPostProcess
+}
 
 
 
@@ -1435,7 +1462,7 @@ void ChinookAIUpdate::privateAttackObject( Object *victim, Int maxShotsToFire, C
   ContainModuleInterface* contain = getObject()->getContain();
 	if( contain != NULL )
 	{
-		// As an extension of the normal attack, I may want to tell my passengers to attack 
+		// As an extension of the normal attack, I may want to tell my passengers to attack
 		// too, but only if this is a direct command.  (As opposed to a passive aquire)
 		if( (cmdSource == CMD_FROM_PLAYER  ||  cmdSource == CMD_FROM_SCRIPT) )
 		{
@@ -1461,13 +1488,13 @@ void ChinookAIUpdate::privateAttackObject( Object *victim, Int maxShotsToFire, C
 				  // If I am an overlord with a gattling upgrade, I do not tell it to fire if it is disabled
 				  if ( passenger->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
 				  {
-					  if( passenger->isDisabledByType( DISABLED_HACKED ) 
-						  || passenger->isDisabledByType( DISABLED_EMP ) 
-						  || passenger->isDisabledByType( DISABLED_SUBDUED ) 
+					  if( passenger->isDisabledByType( DISABLED_HACKED )
+						  || passenger->isDisabledByType( DISABLED_EMP )
+						  || passenger->isDisabledByType( DISABLED_SUBDUED )
 						  || passenger->isDisabledByType( DISABLED_PARALYZED) )
 						  continue;
 				  }
-				  
+
 				  AIUpdateInterface *passengerAI = passenger->getAIUpdateInterface();
 				  if( passengerAI )
 				  {
@@ -1494,11 +1521,11 @@ void ChinookAIUpdate::private___TellPortableStructureToAttackWithMe( Object *vic
 	{
     //--------- THE GATTLING UPGRADE OR THE GUYS IN THE BUNKER_NOT_A_BUNKER-------------
     Object *rider = (Object*)contain->friend_getRider();
-		if ( rider 
-      && rider->isKindOf( KINDOF_PORTABLE_STRUCTURE ) 
-      && !rider->isDisabledByType( DISABLED_HACKED ) 
-			&& !rider->isDisabledByType( DISABLED_EMP ) 
-			&& !rider->isDisabledByType( DISABLED_SUBDUED ) 
+		if ( rider
+      && rider->isKindOf( KINDOF_PORTABLE_STRUCTURE )
+      && !rider->isDisabledByType( DISABLED_HACKED )
+			&& !rider->isDisabledByType( DISABLED_EMP )
+			&& !rider->isDisabledByType( DISABLED_SUBDUED )
 			&& !rider->isDisabledByType( DISABLED_PARALYZED) )
     {
 			AIUpdateInterface *riderAI = rider->getAIUpdateInterface();
@@ -1524,7 +1551,7 @@ void ChinookAIUpdate::privateForceAttackObject( Object *victim, Int maxShotsToFi
   ContainModuleInterface* contain = getObject()->getContain();
 	if( contain != NULL )
 	{
-		// As an extension of the normal attack, I may want to tell my passengers to attack 
+		// As an extension of the normal attack, I may want to tell my passengers to attack
 		// too, but only if this is a direct command.  (As opposed to a passive aquire)
 		if( (cmdSource == CMD_FROM_PLAYER  ||  cmdSource == CMD_FROM_SCRIPT) )
 		{
@@ -1549,13 +1576,13 @@ void ChinookAIUpdate::privateForceAttackObject( Object *victim, Int maxShotsToFi
 				  // If I am an overlord with a gattling upgrade, I do not tell it to fire if it is disabled
 				  if ( passenger->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
 				  {
-					  if( passenger->isDisabledByType( DISABLED_HACKED ) 
-						  || passenger->isDisabledByType( DISABLED_EMP ) 
-						  || passenger->isDisabledByType( DISABLED_SUBDUED ) 
+					  if( passenger->isDisabledByType( DISABLED_HACKED )
+						  || passenger->isDisabledByType( DISABLED_EMP )
+						  || passenger->isDisabledByType( DISABLED_SUBDUED )
 						  || passenger->isDisabledByType( DISABLED_PARALYZED) )
 						  continue;
 				  }
-				  
+
 				  AIUpdateInterface *passengerAI = passenger->getAIUpdateInterface();
 				  if( passengerAI )
 				  {
@@ -1568,11 +1595,11 @@ void ChinookAIUpdate::privateForceAttackObject( Object *victim, Int maxShotsToFi
 
       //--------- THE GATTLING UPGRADE OR THE GUYS IN THE BUNKER_NOT_A_BUNKER-------------
       Object *rider = (Object*)contain->friend_getRider();
-			if ( rider 
-        && rider->isKindOf( KINDOF_PORTABLE_STRUCTURE ) 
-        && !rider->isDisabledByType( DISABLED_HACKED ) 
-				&& !rider->isDisabledByType( DISABLED_EMP ) 
-				&& !rider->isDisabledByType( DISABLED_SUBDUED ) 
+			if ( rider
+        && rider->isKindOf( KINDOF_PORTABLE_STRUCTURE )
+        && !rider->isDisabledByType( DISABLED_HACKED )
+				&& !rider->isDisabledByType( DISABLED_EMP )
+				&& !rider->isDisabledByType( DISABLED_SUBDUED )
 				&& !rider->isDisabledByType( DISABLED_PARALYZED) )
       {
 				AIUpdateInterface *riderAI = rider->getAIUpdateInterface();
@@ -1601,7 +1628,7 @@ void ChinookAIUpdate::privateAttackPosition( const Coord3D *pos, Int maxShotsToF
 	ContainModuleInterface* contain = getObject()->getContain();
 	if( contain != NULL )
 	{
-		// As an extension of the normal attack, I may want to tell my passengers to attack 
+		// As an extension of the normal attack, I may want to tell my passengers to attack
 		// too, but only if this is a direct command.  (As opposed to a passive aquire)
 		if( (cmdSource == CMD_FROM_PLAYER  ||  cmdSource == CMD_FROM_SCRIPT) )
 		{
@@ -1627,9 +1654,9 @@ void ChinookAIUpdate::privateAttackPosition( const Coord3D *pos, Int maxShotsToF
           // If I am an overlord with a gattling upgrade, I do not tell it ti fire if it is disabled
 				  if ( passenger->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
 				  {
-					  if( passenger->isDisabledByType( DISABLED_HACKED ) 
-						  || passenger->isDisabledByType( DISABLED_EMP) 
-						  || passenger->isDisabledByType( DISABLED_SUBDUED) 
+					  if( passenger->isDisabledByType( DISABLED_HACKED )
+						  || passenger->isDisabledByType( DISABLED_EMP)
+						  || passenger->isDisabledByType( DISABLED_SUBDUED)
 						  || passenger->isDisabledByType( DISABLED_PARALYZED) )
 						  continue;
 				  }
@@ -1645,11 +1672,11 @@ void ChinookAIUpdate::privateAttackPosition( const Coord3D *pos, Int maxShotsToF
 
       //--------- THE GATTLING UPGRADE OR THE GUYS IN THE BUNKER_NOT_A_BUNKER-------------
       Object *rider = (Object*)contain->friend_getRider();
-			if ( rider 
-        && rider->isKindOf( KINDOF_PORTABLE_STRUCTURE ) 
-        && !rider->isDisabledByType( DISABLED_HACKED ) 
-				&& !rider->isDisabledByType( DISABLED_EMP ) 
-				&& !rider->isDisabledByType( DISABLED_SUBDUED ) 
+			if ( rider
+        && rider->isKindOf( KINDOF_PORTABLE_STRUCTURE )
+        && !rider->isDisabledByType( DISABLED_HACKED )
+				&& !rider->isDisabledByType( DISABLED_EMP )
+				&& !rider->isDisabledByType( DISABLED_SUBDUED )
 				&& !rider->isDisabledByType( DISABLED_PARALYZED) )
       {
 				AIUpdateInterface *riderAI = rider->getAIUpdateInterface();
@@ -1669,7 +1696,7 @@ Int ChinookAIUpdate::getUpgradedSupplyBoost() const
 {
 	Player *player = getObject()->getControllingPlayer();
 	static const UpgradeTemplate *supplyLinesTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_AmericaSupplyLines" );
-		
+
 	if (player && supplyLinesTemplate && player->hasUpgradeComplete(supplyLinesTemplate))
 		return getChinookAIUpdateModuleData()->m_upgradedSupplyBoost;
 	else
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp
index 4fea2f57a9a..f69f7004ad9 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp
@@ -25,7 +25,7 @@
 // DeliverPayloadAIUpdate.cpp ////////////
 // Author: Graham Smallwood, March 2002
 // Desc:   State machine that controls the approach and deployment of airborne cargo
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES
 
@@ -50,16 +50,11 @@
 #include "GameLogic/Weapon.h"
 #include "GameLogic/WeaponSet.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 const FieldParse* DeliverPayloadData::getFieldParse()
 {
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
 		{ "DeliveryDistance",								INI::parseReal,								NULL, offsetof( DeliverPayloadData, m_distToTarget) },
@@ -82,10 +77,10 @@ const FieldParse* DeliverPayloadData::getFieldParse()
 		{ "VisiblePayloadTemplateName",			INI::parseAsciiString,				NULL, offsetof( DeliverPayloadData, m_visiblePayloadTemplateName ) },
 		{ "VisiblePayloadWeaponTemplate",		INI::parseWeaponTemplate,			NULL, offsetof( DeliverPayloadData, m_visiblePayloadWeaponTemplate ) },
 		{ "SelfDestructObject",		          INI::parseBool,		           	NULL, offsetof( DeliverPayloadData, m_selfDestructObject ) },
-		
-		//Weapon based payload 
+
+		//Weapon based payload
 		{ "FireWeapon",											INI::parseBool,								NULL, offsetof( DeliverPayloadData, m_fireWeapon ) },
-		
+
 		//Specify an additional weaponslot to be fired while strafing
 		{ "DiveStartDistance",							INI::parseReal,								NULL, offsetof( DeliverPayloadData, m_diveStartDistance ) },
 		{ "DiveEndDistance",								INI::parseReal,								NULL, offsetof( DeliverPayloadData, m_diveEndDistance ) },
@@ -121,34 +116,25 @@ DeliverPayloadAIUpdate::DeliverPayloadAIUpdate( Thing *thing, const ModuleData*
 	m_visibleItemsDelivered = 0;
 	m_deliveryDecal.clear();
 	m_previousDistanceSqr = 0;
-
 	m_freeToExit = FALSE;
 	m_acceptingCommands = TRUE;
-
-	// Added By Sadullah Nader
-	// Initialization missing and needed
-	
 	m_diveState = DIVESTATE_PREDIVE;
-	
-	// End Add
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 DeliverPayloadAIUpdate::~DeliverPayloadAIUpdate( void )
 {
 	m_deliveryDecal.clear();
-
-	if (m_deliverPayloadStateMachine)
-		deleteInstance(m_deliverPayloadStateMachine);
-} 
+	deleteInstance(m_deliverPayloadStateMachine);
+}
 
 //-------------------------------------------------------------------------------------------------
-AIFreeToExitType DeliverPayloadAIUpdate::getAiFreeToExit(const Object* exiter) const 
-{ 
+AIFreeToExitType DeliverPayloadAIUpdate::getAiFreeToExit(const Object* exiter) const
+{
 	if( getObject()->isEffectivelyDead() )
 		return NOT_FREE_TO_EXIT;
-	
-	return m_freeToExit ? FREE_TO_EXIT : NOT_FREE_TO_EXIT; 
+
+	return m_freeToExit ? FREE_TO_EXIT : NOT_FREE_TO_EXIT;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -190,14 +176,14 @@ UpdateSleepTime DeliverPayloadAIUpdate::update( void )
 				getObject()->getAIUpdateInterface()->getCurLocomotor()->setUsePreciseZPos( true );
 
 				AudioEventRTS soundDive = *(getObject()->getTemplate()->getPerUnitSound("StartDive"));
-				if( soundDive.getEventName().isNotEmpty() ) 
+				if( soundDive.getEventName().isNotEmpty() )
 				{
 					soundDive.setPosition( getObject()->getPosition() );
 					TheAudio->addAudioEvent( &soundDive );
 				}
 			}
 		}
-		else 
+		else
 		{
 			//Check to see when we shall end diving
 			Real endDiveDistanceSquared = sqr( getData()->m_diveEndDistance );
@@ -220,7 +206,7 @@ UpdateSleepTime DeliverPayloadAIUpdate::update( void )
 					Real currentDistance = sqrt( currentDistanceSquared );
 
 					Real diveRatio = (startDiveDistance - currentDistance) / (startDiveDistance - endDiveDistance);
-					
+
 					Coord3D velocity = *getObject()->getPhysics()->getVelocity();
 					velocity.z = 0.0f;
 					velocity.normalize();
@@ -252,7 +238,7 @@ UpdateSleepTime DeliverPayloadAIUpdate::update( void )
 //-------------------------------------------------------------------------------------------------
 void DeliverPayloadAIUpdate::deliverPayload(
 	const Coord3D *moveToPos,
-	const Coord3D *targetPos, 
+	const Coord3D *targetPos,
 	const DeliverPayloadData *data
 )
 {
@@ -260,17 +246,16 @@ void DeliverPayloadAIUpdate::deliverPayload(
 	//****************************************************
 	//THIS GETS CALLED VIA OBJECT CREATION LISTS ONLY!!!
 	//****************************************************
-	
-	if (m_deliverPayloadStateMachine)
-		deleteInstance(m_deliverPayloadStateMachine);
+
+	deleteInstance(m_deliverPayloadStateMachine);
 	m_deliverPayloadStateMachine = NULL;
 
 	m_moveToPos = *moveToPos;
 	m_targetPos = *targetPos;
 	m_data			= *data;
-	
+
 	m_deliveryDecal.clear();
-	m_data.m_deliveryDecalTemplate.createRadiusDecal(*targetPos, 
+	m_data.m_deliveryDecalTemplate.createRadiusDecal(*targetPos,
 		m_data.m_deliveryDecalRadius, getObject()->getControllingPlayer(), m_deliveryDecal);
 
 	if( m_data.m_diveStartDistance <= 0.0f )
@@ -350,11 +335,11 @@ Real DeliverPayloadAIUpdate::calcMinTurnRadius(Real* timeToTravelThatDist) const
 
 	/*
 		our minimum circumference will be like so:
-		
+
 		Real minTurnCircum = maxSpeed * (2*PI / maxTurnRate);
 
 		so therefore our minimum turn radius is:
-		
+
 		Real minTurnRadius = minTurnCircum / 2*PI;
 
 		so we just eliminate the middleman:
@@ -369,10 +354,10 @@ Real DeliverPayloadAIUpdate::calcMinTurnRadius(Real* timeToTravelThatDist) const
 
 
 //-------------------------------------------------------------------------------------------------
-Bool DeliverPayloadAIUpdate::isCloseEnoughToTarget() 
+Bool DeliverPayloadAIUpdate::isCloseEnoughToTarget()
 {
 	// In addition to testing distance, it is also sensitive to being in/outward bound
-////The new getPreOpenDistance() allows the deliver state to fire early, but only if inbound, 
+////The new getPreOpenDistance() allows the deliver state to fire early, but only if inbound,
 ////so the doors can open and payload can get ready...
 
 	Real allowedDistanceSqr = sqr( getAllowedDistanceToTarget() );
@@ -383,7 +368,7 @@ Bool DeliverPayloadAIUpdate::isCloseEnoughToTarget()
 	if ( inBound )
 		allowedDistanceSqr = sqr(getAllowedDistanceToTarget() + getPreOpenDistance());
 
-	//DEBUG_LOG(("Dist to target is %f (allowed %f)\n",sqrt(currentDistanceSqr),sqrt(allowedDistanceSqr)));
+	//DEBUG_LOG(("Dist to target is %f (allowed %f)",sqrt(currentDistanceSqr),sqrt(allowedDistanceSqr)));
 
 
 	if ( allowedDistanceSqr > currentDistanceSqr )
@@ -412,12 +397,12 @@ void DeliverPayloadAIUpdate::crc( Xfer *xfer )
 {
  // extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 5: Whoops version.  preOpenDistance just wasn't saved.
 */
 // ------------------------------------------------------------------------------------------------
@@ -427,7 +412,7 @@ void DeliverPayloadAIUpdate::xfer( Xfer *xfer )
   const XferVersion currentVersion = 5;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -438,8 +423,8 @@ void DeliverPayloadAIUpdate::xfer( Xfer *xfer )
 
 	DeliverPayloadData data = m_data;
 
-	xfer->xferAsciiString(&data.m_visibleDropBoneName);	
-	xfer->xferAsciiString(&data.m_visibleSubObjectName);	
+	xfer->xferAsciiString(&data.m_visibleDropBoneName);
+	xfer->xferAsciiString(&data.m_visibleSubObjectName);
 	xfer->xferAsciiString(&data.m_visiblePayloadTemplateName);
   xfer->xferReal(&data.m_distToTarget);
 	if( version >= 5 )
@@ -450,23 +435,23 @@ void DeliverPayloadAIUpdate::xfer( Xfer *xfer )
 	xfer->xferUnsignedInt(&data.m_dropDelay);
 	xfer->xferBool(&data.m_fireWeapon);
 	xfer->xferBool(&data.m_selfDestructObject);
-	xfer->xferInt(&data.m_visibleNumBones);						
+	xfer->xferInt(&data.m_visibleNumBones);
 	xfer->xferReal(&data.m_diveStartDistance);
 	xfer->xferReal(&data.m_diveEndDistance);
 	xfer->xferUser(&data.m_strafingWeaponSlot, sizeof(data.m_strafingWeaponSlot));
 	xfer->xferInt(&data.m_visibleItemsDroppedPerInterval);
 	xfer->xferBool(&data.m_inheritTransportVelocity);
-	xfer->xferBool(&data.m_isParachuteDirectly);		
+	xfer->xferBool(&data.m_isParachuteDirectly);
 	xfer->xferReal(&data.m_exitPitchRate);
 	// const FXList					*m_strafeFX;
 	xfer->xferReal(&data.m_strafeLength);
 	AsciiString weaponTemplateName;
-	if (data.m_visiblePayloadWeaponTemplate) 
+	if (data.m_visiblePayloadWeaponTemplate)
 	{
 		weaponTemplateName = data.m_visiblePayloadWeaponTemplate->getName();
 	}
 	xfer->xferAsciiString(&weaponTemplateName);
-	if( xfer->getXferMode() == XFER_LOAD && weaponTemplateName.isNotEmpty()) 
+	if( xfer->getXferMode() == XFER_LOAD && weaponTemplateName.isNotEmpty())
 	{
 		data.m_visiblePayloadWeaponTemplate = TheWeaponStore->findWeaponTemplate(weaponTemplateName);
 	}
@@ -476,7 +461,7 @@ void DeliverPayloadAIUpdate::xfer( Xfer *xfer )
 
 	Bool hasStateMachine = m_deliverPayloadStateMachine!=NULL;
 	xfer->xferBool(&hasStateMachine);
-	if (hasStateMachine && m_deliverPayloadStateMachine==NULL) 
+	if (hasStateMachine && m_deliverPayloadStateMachine==NULL)
 	{
 		m_deliverPayloadStateMachine = newInstance(DeliverPayloadStateMachine)( getObject() );
 	}
@@ -484,7 +469,7 @@ void DeliverPayloadAIUpdate::xfer( Xfer *xfer )
 	{
 		xfer->xferSnapshot(m_deliverPayloadStateMachine);
 	}
-	
+
 	m_deliveryDecal.xferRadiusDecal(xfer);
 
 	if (version >= 2)
@@ -501,7 +486,7 @@ void DeliverPayloadAIUpdate::xfer( Xfer *xfer )
 	}
 
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -510,7 +495,7 @@ void DeliverPayloadAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -521,10 +506,10 @@ DeliverPayloadStateMachine::DeliverPayloadStateMachine( Object *owner ) : StateM
 {
 //	DeliverPayloadAIUpdate *ai = (DeliverPayloadAIUpdate*)owner->getAIUpdateInterface();
 
-	static const StateConditionInfo considerConditions[] = 
+	static const StateConditionInfo considerConditions[] =
 	{
 		StateConditionInfo(DeliverPayloadStateMachine::isOffMap, RECOVER_FROM_OFF_MAP, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -547,19 +532,19 @@ DeliverPayloadStateMachine::~DeliverPayloadStateMachine()
 void DeliverPayloadStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void DeliverPayloadStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -567,7 +552,7 @@ void DeliverPayloadStateMachine::xfer( Xfer *xfer )
 void DeliverPayloadStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ Bool DeliverPayloadStateMachine::isOffMap( State *thisState, void* userData )
@@ -646,7 +631,7 @@ StateReturnType ApproachState::update()
 // ------------------------------------------------------------------------------------------------
 void DeliveringState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -660,14 +645,14 @@ void DeliveringState::xfer( Xfer *xfer )
 
 	xfer->xferUnsignedInt(&m_dropDelayLeft);
 	xfer->xferBool(&m_didOpen);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DeliveringState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -712,7 +697,7 @@ StateReturnType DeliveringState::update() // Kick a dude out every so often
 		return STATE_FAILURE;
 
 	const ContainedItemsList* items = owner->getContain() ? owner->getContain()->getContainedItemsList() : NULL;
-	if( (!items || !items->size()) && ai->getVisibleItemsDelivered() == ai->getData()->m_visibleNumBones )
+	if( (!items || items->empty()) && ai->getVisibleItemsDelivered() == ai->getData()->m_visibleNumBones )
 	{
 		//We are out of payload to drop AND our visible payload is empty. It's possible for deliverers to
 		//have one or the other or even both.
@@ -764,7 +749,7 @@ StateReturnType DeliveringState::update() // Kick a dude out every so often
 				// This will most likely be ignored, as the item is still in the transport, and therefore Held.
 				itemAI->aiMoveToPosition( ai->getMoveToPos(), CMD_FROM_AI );
 			}
-			
+
 			/// @todo srj -- urg. icky.
 			static NameKeyType key_GenerateMinefieldBehavior = NAMEKEY("GenerateMinefieldBehavior");
 			GenerateMinefieldBehavior* mfb = (GenerateMinefieldBehavior *)item->findUpdateModule(key_GenerateMinefieldBehavior);
@@ -816,7 +801,7 @@ StateReturnType DeliveringState::update() // Kick a dude out every so often
 				{
 					const ThingTemplate* thing = TheThingFactory->findTemplate( ai->getData()->m_visiblePayloadTemplateName.str() );
 					Object *payload = TheThingFactory->newObject( thing, owner->getControllingPlayer()->getDefaultTeam() );
-					
+
 					if( payload )
 					{
 						payload->setProducer( owner );
@@ -862,7 +847,7 @@ StateReturnType DeliveringState::update() // Kick a dude out every so often
 							ProjectileUpdateInterface* pui = (*u)->getProjectileUpdateInterface();
 							if( pui  )
 							{
-								//Missile! 
+								//Missile!
 								const WeaponTemplate *weaponTemplate = ai->getData()->m_visiblePayloadWeaponTemplate;
 								if( !weaponTemplate )
 								{
@@ -900,7 +885,7 @@ StateReturnType DeliveringState::update() // Kick a dude out every so often
 					}
 				}
 			}
-			
+
 			//Update the counters
 			attemptDrops--;
 			ai->setVisibleItemsDelivered( ai->getVisibleItemsDelivered() + 1 );
@@ -936,7 +921,7 @@ void DeliveringState::onExit( StateExitType ) // Close the doors
 // ------------------------------------------------------------------------------------------------
 void ConsiderNewApproachState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -949,14 +934,14 @@ void ConsiderNewApproachState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferInt(&m_numberEntriesToState);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void ConsiderNewApproachState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -971,10 +956,10 @@ StateReturnType ConsiderNewApproachState::onEnter() // Increment local counter o
 
 	++m_numberEntriesToState;
 
-	DEBUG_LOG(("Considering approach #%d...\n",m_numberEntriesToState));
+	DEBUG_LOG(("Considering approach #%d...",m_numberEntriesToState));
 	if( m_numberEntriesToState > ai->getMaxNumberAttempts() )
 	{
-		DEBUG_LOG(("Too many approaches! Time to give up.\n"));
+		DEBUG_LOG(("Too many approaches! Time to give up."));
 		return STATE_FAILURE;
 	}
 
@@ -1048,7 +1033,7 @@ void ConsiderNewApproachState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void RecoverFromOffMapState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1061,14 +1046,14 @@ void RecoverFromOffMapState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUnsignedInt(&m_reEntryFrame);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void RecoverFromOffMapState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -1200,15 +1185,15 @@ StateReturnType HeadOffMapState::update()
 
 	if (ai->isOffMap())
 		return STATE_SUCCESS;
-  
+
   // greasy as this hack seems... if terrain or objects or whatever have turned me away from the map-edge that I had first headed for,...
   //I blow up, rather than face eternally spinning on the point of a mineret or derrick or something awful.
   if ( owner->getPhysics()->getTurning() != 0 )
   {
     Coord3D currentDirection;
     owner->getUnitDirectionVector3D( currentDirection );
-  	Real dot = facingDirectionUponDelivery.x * currentDirection.x 
-             + facingDirectionUponDelivery.y * currentDirection.y 
+  	Real dot = facingDirectionUponDelivery.x * currentDirection.x
+             + facingDirectionUponDelivery.y * currentDirection.y
              + facingDirectionUponDelivery.z * currentDirection.z;
 
     if ( dot < 0.3f )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp
index 3fff2db6606..eaabef13d55 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp
@@ -26,7 +26,7 @@
 // Author: Kris Morness, August 2002
 // Desc:   A standard ai update that also handles units that must deploy to attack and pack before moving.
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingFactory.h"
@@ -46,11 +46,6 @@
 #include "GameLogic/Module/DeployStyleAIUpdate.h"
 #include "GameLogic/Module/PhysicsUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -61,12 +56,12 @@ DeployStyleAIUpdate::DeployStyleAIUpdate( Thing *thing, const ModuleData* module
 {
 	m_state = READY_TO_MOVE;
 	m_frameToWaitForDeploy = 0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 DeployStyleAIUpdate::~DeployStyleAIUpdate( void )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool DeployStyleAIUpdate::isIdle() const
@@ -108,7 +103,7 @@ UpdateSleepTime DeployStyleAIUpdate::update( void )
 
 	//Are we attempting to move? If so we can't do it unless we are undeployed.
 	Bool isTryingToMove = isWaitingForPath() || getPath();
-	
+
 	//Are we trying to attack something. If so, we need to be in range before we can do so.
 	Bool isTryingToAttack = getStateMachine()->isInAttackState();
 	Bool isInRange = FALSE;
@@ -125,7 +120,7 @@ UpdateSleepTime DeployStyleAIUpdate::update( void )
 		{
 			isInRange = weapon->isWithinAttackRange( self, victim );
 		}
-		else 
+		else
 		{
 			const Coord3D *pos = ai->getCurrentVictimPos();
 			if( pos )
@@ -147,7 +142,7 @@ UpdateSleepTime DeployStyleAIUpdate::update( void )
 				break;
 		}
 	}
-	
+
 	if( isInRange || isInGuardIdleState )
 	{
 		switch( m_state )
@@ -283,13 +278,13 @@ void DeployStyleAIUpdate::setMyState( DeployStateTypes stateID, Bool reverseDepl
 	Object *self = getObject();
 	UnsignedInt now = TheGameLogic->getFrame();
 	const DeployStyleAIUpdateModuleData *data = getDeployStyleAIUpdateModuleData();
-	
+
 	switch( stateID )
 	{
 		case DEPLOY:
 		{
 			//Tell our object to deploy (so it can continue the same attack later).
-			self->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_PACKING ), 
+			self->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_PACKING ),
 																						 MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ) );
 
 			if( reverseDeploy )
@@ -309,7 +304,7 @@ void DeployStyleAIUpdate::setMyState( DeployStateTypes stateID, Bool reverseDepl
 			}
 			else
 			{
-				m_frameToWaitForDeploy = getUnpackTime() + now; 
+				m_frameToWaitForDeploy = getUnpackTime() + now;
 			}
 
 			//Play deploy sound
@@ -321,7 +316,7 @@ void DeployStyleAIUpdate::setMyState( DeployStateTypes stateID, Bool reverseDepl
 				soundToPlay.setObjectID( self->getID() );
 				TheAudio->addAudioEvent( &soundToPlay );
 			}
-			
+
 			break;
 		}
 		case UNDEPLOY:
@@ -363,7 +358,7 @@ void DeployStyleAIUpdate::setMyState( DeployStateTypes stateID, Bool reverseDepl
 					setTurretEnabled( tur, false );
 				}
 			}
-			
+
 			//Play undeploy sound
 			const ThingTemplate *thing = self->getTemplate();
 			const AudioEventRTS* soundToPlayPtr = thing->getPerUnitSound( "Undeploy" );
@@ -391,7 +386,7 @@ void DeployStyleAIUpdate::setMyState( DeployStateTypes stateID, Bool reverseDepl
 
 			m_frameToWaitForDeploy = 0;
 
-			self->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ), 
+			self->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ),
 																						 MAKE_MODELCONDITION_MASK( MODELCONDITION_DEPLOYED) );
 
 			if( doTurretsFunctionOnlyWhenDeployed() )
@@ -426,12 +421,12 @@ void DeployStyleAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Added support for attack move
 	* 3: Added improved support for guard, and support for hunt AI
  **/
@@ -442,7 +437,7 @@ void DeployStyleAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 4;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -490,7 +485,7 @@ void DeployStyleAIUpdate::xfer( Xfer *xfer )
 		m_state = READY_TO_MOVE;
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -499,5 +494,5 @@ void DeployStyleAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
index cbb950a7be1..40c16a53d47 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/Team.h"
@@ -55,11 +55,6 @@
 #include "GameLogic/Module/DozerAIUpdate.h"
 #include "GameClient/InGameUI.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
 class DozerPrimaryStateMachine;
@@ -86,7 +81,7 @@ enum DozerActionType CPP_11(: Int)
 //-------------------------------------------------------------------------------------------------
 class DozerActionPickActionPosState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionPickActionPosState, "DozerActionPickActionPosState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionPickActionPosState, "DozerActionPickActionPosState")
 
 public:
 
@@ -100,9 +95,9 @@ class DozerActionPickActionPosState : public State
 	virtual void loadPostProcess();
 
 protected:
-	
+
 	DozerTask m_task;							///< our task
-	Int m_failedAttempts;					/**< counter for successive unsuccessfull attempts to pick 
+	Int m_failedAttempts;					/**< counter for successive unsuccessfull attempts to pick
 																		 and move to an action position */
 
 };
@@ -118,14 +113,14 @@ DozerActionPickActionPosState::DozerActionPickActionPosState( StateMachine *mach
 	m_task = task;
 	m_failedAttempts = 0;
 
-}  // end DozerActionPickActionPosState
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
 // ------------------------------------------------------------------------------------------------
 void DozerActionPickActionPosState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -139,14 +134,14 @@ void DozerActionPickActionPosState::xfer( Xfer *xfer )
 
 	xfer->xferUser(&m_task, sizeof(m_task));
 	xfer->xferInt(&m_failedAttempts);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DozerActionPickActionPosState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Pick a position around the target */
@@ -172,7 +167,7 @@ StateReturnType DozerActionPickActionPosState::update( void )
 	Object *goalObject = TheGameLogic->findObjectByID( dozerAI->getTaskTarget( m_task ) );
 
 	// if there is no goal, get out of this machine with a failure code (success is done in the action state )
-	if( goalObject == NULL )	
+	if( goalObject == NULL )
 	{
 
 		// to be clean get rid of the goal object we set
@@ -184,7 +179,7 @@ StateReturnType DozerActionPickActionPosState::update( void )
 		// exit with failure
 		return STATE_FAILURE;
 
-	}  // end if
+	}
 
 	// pick a location to move to
 	Coord3D goalPos;
@@ -203,7 +198,7 @@ StateReturnType DozerActionPickActionPosState::update( void )
 		Coord2D v;
 		v.x = dozer->getPosition()->x - goalObject->getPosition()->x;
 		v.y = dozer->getPosition()->y - goalObject->getPosition()->y;
-	
+
 		Real radius = goalObject->getGeometryInfo().getBoundingSphereRadius();
 		FindPositionOptions fpOptions;
 		fpOptions.minRadius = radius;
@@ -218,7 +213,7 @@ StateReturnType DozerActionPickActionPosState::update( void )
 			// if ai.
 			goalPos = *goalObject->getPosition();
 
-		}  // end if	
+		}
 
 		//
 		// we only ignore the goal object when we did the point selection in this more
@@ -226,7 +221,7 @@ StateReturnType DozerActionPickActionPosState::update( void )
 		//
 		ai->ignoreObstacle( goalObject );
 
-	}  // end if
+	}
 
 	// set goal position and object
 	machine->setGoalObject( goalObject );
@@ -236,14 +231,14 @@ StateReturnType DozerActionPickActionPosState::update( void )
 
 	return STATE_SUCCESS;
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Dozer moves to the action position */
 //-------------------------------------------------------------------------------------------------
 class DozerActionMoveToActionPosState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionMoveToActionPosState, "DozerActionMoveToActionPosState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionMoveToActionPosState, "DozerActionMoveToActionPosState")
 
 public:
 
@@ -268,7 +263,7 @@ EMPTY_DTOR(DozerActionMoveToActionPosState)
 // ------------------------------------------------------------------------------------------------
 void DozerActionMoveToActionPosState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -281,14 +276,14 @@ void DozerActionMoveToActionPosState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUser(&m_task, sizeof(m_task));
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DozerActionMoveToActionPosState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 /** We are supposed to be on route to our action position now, see when we get there or
@@ -304,10 +299,10 @@ StateReturnType DozerActionMoveToActionPosState::update( void )
 		return STATE_FAILURE;
 
 	AIUpdateInterface *ai = dozer->getAIUpdateInterface();
-	ObjectID currentRepairer = goalObject->getSoleHealingBenefactor(); 
+	ObjectID currentRepairer = goalObject->getSoleHealingBenefactor();
 	if( m_task==DOZER_TASK_REPAIR && currentRepairer != INVALID_ID && currentRepairer != dozer->getID() )//oops I guess someone beat me to it!
 	{
-		if ( ai )	
+		if ( ai )
 		{
 			DozerAIInterface *dozerAI = ai->getDozerAIInterface();
 			if ( dozerAI )
@@ -329,7 +324,7 @@ StateReturnType DozerActionMoveToActionPosState::update( void )
 	if( (m_task == DOZER_TASK_BUILD) && goalObject && (goalObject->getBuilderID() != dozer->getID()) )
 	{
 		// Geebus.  Returning failure is ignored, so you have to explicitly make the ai stop trying to restart the machine
-		if ( ai )	
+		if ( ai )
 		{
 			DozerAIInterface *dozerAI = ai->getDozerAIInterface();
 			if ( dozerAI )
@@ -357,40 +352,38 @@ StateReturnType DozerActionMoveToActionPosState::update( void )
 			// but the setting of the same model condition doesn't have any adverse effects
 			//
 			goalObject->clearAndSetModelConditionFlags(
-				MAKE_MODELCONDITION_MASK(MODELCONDITION_AWAITING_CONSTRUCTION), 
+				MAKE_MODELCONDITION_MASK(MODELCONDITION_AWAITING_CONSTRUCTION),
 				MAKE_MODELCONDITION_MASK2(MODELCONDITION_PARTIALLY_CONSTRUCTED, MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED));
 
-		}  // end if
+		}
 
 		return STATE_SUCCESS;
 
-	}  // end if
+	}
 
 
 	// if we're in the idle state fail our move
-	// Failure transition is back to DOZER_ACTION_PICK_ACTION_POS, so 
+	// Failure transition is back to DOZER_ACTION_PICK_ACTION_POS, so
 	// it is ok to fail. jba.
 	if( ai && ai->isIdle() )
 		return STATE_FAILURE;
 
 	return STATE_CONTINUE;
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Dozer does the "action" */
 //-------------------------------------------------------------------------------------------------
 class DozerActionDoActionState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionDoActionState, "DozerActionDoActionState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionDoActionState, "DozerActionDoActionState")
 
 public:
 
-	DozerActionDoActionState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionDoActionState" ) 
-	{ 
-		m_task = task; 
-		//Added By Sadullah Nader
-		// Initializations missing and needed
+	DozerActionDoActionState( StateMachine *machine, DozerTask task ) : State( machine, "DozerActionDoActionState" )
+	{
+		m_task = task;
 		m_enterFrame = 0;
 	}
 	virtual StateReturnType update( void );
@@ -404,7 +397,7 @@ class DozerActionDoActionState : public State
 	virtual void loadPostProcess();
 
 protected:
-	
+
 	DozerTask m_task;						///< our task
 	UnsignedInt m_enterFrame;		///< frame we entered this state on
 
@@ -416,7 +409,7 @@ EMPTY_DTOR(DozerActionDoActionState)
 // ------------------------------------------------------------------------------------------------
 void DozerActionDoActionState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -430,14 +423,14 @@ void DozerActionDoActionState::xfer( Xfer *xfer )
 
 	xfer->xferUser(&m_task, sizeof(m_task));
 	xfer->xferUnsignedInt(&m_enterFrame);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DozerActionDoActionState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Entering the do action state */
@@ -451,7 +444,7 @@ StateReturnType DozerActionDoActionState::onEnter( void )
 		return STATE_FAILURE;
 	}
 	// DozerAIUpdate *dozerAI = static_cast<DozerAIUpdate *>(dozer->getAIUpdateInterface());
-	
+
 	// record the frame we came in on
 	m_enterFrame = TheGameLogic->getFrame();
 
@@ -461,7 +454,7 @@ StateReturnType DozerActionDoActionState::onEnter( void )
 
 	return STATE_CONTINUE;
 
-}  // end onEnter
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Do the action */
@@ -513,8 +506,8 @@ StateReturnType DozerActionDoActionState::update( void )
 				// we're now moving to the dock location
 				dozerAI->setBuildSubTask( DOZER_MOVING_TO_BUILD_DOCK_LOCATION );
 
-			}  // end if
-			
+			}
+
 			// if we're moving to the build dock location, when we become idle we are there
 			if( dozerAI->getBuildSubTask() == DOZER_MOVING_TO_BUILD_DOCK_LOCATION )
 			{
@@ -525,7 +518,7 @@ StateReturnType DozerActionDoActionState::update( void )
 					// from the building itself)
 					dozerAI->startBuildingSound( goalObject->getTemplate()->getPerUnitSound( "UnderConstruction" ), goalObject->getID() );
 				}
-			}  // end if
+			}
 
 			// only do the build if we've moved into the dock position
 			if( dozerAI->getBuildSubTask() == DOZER_DO_BUILD_AT_DOCK )
@@ -533,12 +526,12 @@ StateReturnType DozerActionDoActionState::update( void )
 
 				// the builder is now actively constructing something
 				dozer->setModelConditionState( MODELCONDITION_ACTIVELY_CONSTRUCTING );
-				
+
 
 				// increase the construction percent of the goal object
 				Int framesToBuild = goalObject->getTemplate()->calcTimeToBuild( dozer->getControllingPlayer() );
 				Real percentProgressThisFrame = 100.0f / framesToBuild;
-				goalObject->setConstructionPercent( goalObject->getConstructionPercent() + 
+				goalObject->setConstructionPercent( goalObject->getConstructionPercent() +
 																						percentProgressThisFrame );
 
 				//
@@ -606,11 +599,11 @@ StateReturnType DozerActionDoActionState::update( void )
 							create->onBuildComplete();
 						}
 
-					}  // end if
+					}
 
 					// Creation is another valid and essential time to call this.  This building now Looks.
 					goalObject->handlePartitionCellMaintenance();
-					
+
 					// UnderConstruction just cleared, so update our upgrades
 					goalObject->updateUpgradeModules();
 
@@ -618,7 +611,7 @@ StateReturnType DozerActionDoActionState::update( void )
 					/// @todo need to write this
 
 					// do some UI stuff for the constrolling player
-					if( dozer->isLocallyControlled() )
+					if( dozer->isLocallyViewed() )
 					{
 
 						// message the the building player
@@ -630,7 +623,7 @@ StateReturnType DozerActionDoActionState::update( void )
 
 							objectName.format( format, goalObject->getTemplate()->getName().str() );
 
-						}  // end if
+						}
 
 						UnicodeString msg;
 						msg.format( format.str(), objectName.str() );
@@ -643,11 +636,11 @@ StateReturnType DozerActionDoActionState::update( void )
 						/// make radar neat-o attention grabber event at build location
 						TheRadar->createEvent( goalObject->getPosition(), RADAR_EVENT_CONSTRUCTION );
 
-					}  // end if
+					}
 
 					// this will allow us to exit the state machine with success
 					complete = TRUE;
-	
+
 					// move off to the end dock position if present
 					const Coord3D *endPos = dozerAI->getDockPoint( m_task, DOZER_DOCK_POINT_END );
 					Coord3D pos = *dozer->getPosition();
@@ -658,13 +651,13 @@ StateReturnType DozerActionDoActionState::update( void )
 					TheAI->pathfinder()->adjustToPossibleDestination(dozer, ai->getLocomotorSet(), &pos);
 					ai->aiMoveToPosition( &pos, CMD_FROM_AI );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end build
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case DOZER_TASK_REPAIR:
@@ -681,7 +674,7 @@ StateReturnType DozerActionDoActionState::update( void )
 				// we're now complete
 				complete = TRUE;
 
-			}  // end if
+			}
 			else
 			{
 				Bool canHeal = TRUE;
@@ -700,16 +693,16 @@ StateReturnType DozerActionDoActionState::update( void )
 				if( goalObject->isKindOf( KINDOF_BRIDGE_TOWER ) )
 				{
 					BridgeTowerBehaviorInterface *btbi = BridgeTowerBehavior::getBridgeTowerBehaviorInterfaceFromObject( goalObject );
-					DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower interface\n") );
+					DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower interface") );
 					Object *bridgeObject = TheGameLogic->findObjectByID( btbi->getBridgeID() );
-					DEBUG_ASSERTCRASH( bridgeObject, ("Unable to find bridge center object\n") );
+					DEBUG_ASSERTCRASH( bridgeObject, ("Unable to find bridge center object") );
 					BridgeBehaviorInterface *bbi = BridgeBehavior::getBridgeBehaviorInterfaceFromObject( bridgeObject );
-					DEBUG_ASSERTCRASH( bbi, ("Unable to find bridge interface from tower goal object during repair\n") );
+					DEBUG_ASSERTCRASH( bbi, ("Unable to find bridge interface from tower goal object during repair") );
 
 					if( bbi->isScaffoldInMotion() == TRUE )
 						canHeal = FALSE;
 
-				}  // end if
+				}
 
 				// do healing
 				if( canHeal )
@@ -735,15 +728,15 @@ StateReturnType DozerActionDoActionState::update( void )
 
 
 
-				}  // end if
+				}
 
-			}  // end else
+			}
 
 			// play a repairing sound
 
 			break;
 
-		}  // end repair
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case DOZER_TASK_FORTIFY:
@@ -752,18 +745,18 @@ StateReturnType DozerActionDoActionState::update( void )
 			/// @todo write me
 			break;
 
-		}  // end fortify
+		}
 
 		//---------------------------------------------------------------------------------------------
 		default:
 		{
 
-			DEBUG_CRASH(( "Unknown task for the dozer action do action state\n" ));
+			DEBUG_CRASH(( "Unknown task for the dozer action do action state" ));
 			return STATE_FAILURE;
 
-		}  // end default
+		}
 
-	}  // end switch
+	}
 
 	// if we're complete with the task we exit success
 	if( complete == TRUE )
@@ -774,20 +767,20 @@ StateReturnType DozerActionDoActionState::update( void )
 
 		// to be clean get rid of the goal object we set
 		getMachine()->setGoalObject( NULL );
- 
+
 
 		getMachineOwner()->setWeaponSetFlag(WEAPONSET_MINE_CLEARING_DETAIL);//maybe go clear some mines, if I feel like it
 		// we're done
 		return STATE_SUCCESS;
 
-	}  // end if
+	}
 
 	// just continue sitting here for a while
 	getMachineOwner()->clearWeaponSetFlag(WEAPONSET_MINE_CLEARING_DETAIL);// no mine clearing fun while I'm on the job
 
 	return STATE_CONTINUE;
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The Dozer action state machine */
@@ -817,7 +810,7 @@ EMPTY_DTOR(DozerActionStateMachine)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-DozerActionStateMachine::DozerActionStateMachine( Object *owner, DozerTask task ) : 
+DozerActionStateMachine::DozerActionStateMachine( Object *owner, DozerTask task ) :
 												 StateMachine( owner, "DozerActionStateMachine" )
 {
 
@@ -836,7 +829,7 @@ DozerActionStateMachine::DozerActionStateMachine( Object *owner, DozerTask task
 // ------------------------------------------------------------------------------------------------
 void DozerActionStateMachine::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -849,14 +842,14 @@ void DozerActionStateMachine::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUser(&m_task, sizeof(m_task));
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DozerActionStateMachine::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -873,7 +866,7 @@ static Object *findObjectToRepair( Object *dozer )
 		return  NULL;
 	if( !dozer->getAIUpdateInterface() )
 	{
-		return NULL; 
+		return NULL;
 	}
 	const DozerAIInterface *dozerAI = dozer->getAIUpdateInterface()->getDozerAIInterface();
 
@@ -905,7 +898,7 @@ static Object *findObjectToRepair( Object *dozer )
 			closestRepairTarget = obj;
 			closestRepairTargetDistSqr = ThePartitionManager->getDistanceSquared( dozer, obj, FROM_CENTER_2D );
 
-		}  // end if
+		}
 		else
 		{
 
@@ -913,19 +906,19 @@ static Object *findObjectToRepair( Object *dozer )
 			Real distSqr = ThePartitionManager->getDistanceSquared( dozer, obj, FROM_CENTER_2D );
 			if( distSqr < closestRepairTargetDistSqr )
 			{
-				
+
 				closestRepairTarget = obj;
 				closestRepairTargetDistSqr = distSqr;
 
-			}  // end if
+			}
 
-		}  // end else
+		}
 
-	}  // end for obj
+	}
 
 	return closestRepairTarget;
 
-}  // end findObjectToRepair
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -937,7 +930,7 @@ static Object *findMine( Object *dozer )
 		return  NULL;
 	if( !dozer->getAIUpdateInterface() )
 	{
-		return NULL; 
+		return NULL;
 	}
 	const DozerAIInterface *dozerAI = dozer->getAIUpdateInterface()->getDozerAIInterface();
 
@@ -950,7 +943,7 @@ static Object *findMine( Object *dozer )
 	Object* mine = ThePartitionManager->getClosestObject(dozer, dozerAI->getBoredRange(), FROM_CENTER_2D, filters);
 
 	return mine;
-}  // end findMine
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Available primary Dozer states */
@@ -969,11 +962,11 @@ enum
 //-------------------------------------------------------------------------------------------------
 class DozerPrimaryIdleState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerPrimaryIdleState, "DozerPrimaryIdleState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerPrimaryIdleState, "DozerPrimaryIdleState")
 
 public:
 
-	DozerPrimaryIdleState( StateMachine *machine ) : State( machine, "DozerPrimaryIdleState" ) 
+	DozerPrimaryIdleState( StateMachine *machine ) : State( machine, "DozerPrimaryIdleState" )
 	{
 		m_idleTooLongTimestamp = 0;
 		m_idlePlayerNumber = 0;
@@ -1002,7 +995,7 @@ EMPTY_DTOR(DozerPrimaryIdleState)
 // ------------------------------------------------------------------------------------------------
 void DozerPrimaryIdleState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1017,14 +1010,14 @@ void DozerPrimaryIdleState::xfer( Xfer *xfer )
 	xfer->xferUnsignedInt(&m_idleTooLongTimestamp);
 	xfer->xferInt(&m_idlePlayerNumber);
 	xfer->xferBool(&m_isMarkedAsIdle);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DozerPrimaryIdleState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -1045,7 +1038,7 @@ StateReturnType DozerPrimaryIdleState::onEnter( void )
 
 	return STATE_CONTINUE;
 
-}  // end onEnter
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Upon exiting the dozer primary idle state */
@@ -1103,7 +1096,7 @@ StateReturnType DozerPrimaryIdleState::update( void )
 	//
 	if( !ai->isIdle() )
 		m_idleTooLongTimestamp = TheGameLogic->getFrame();
-	
+
 	//
 	// if we're just sitting here in idle, and there is no task pending ... after so long we'll
 	// try to go to the nearest command center
@@ -1140,19 +1133,19 @@ StateReturnType DozerPrimaryIdleState::update( void )
 			}
 		}
 
-					
-	}  // end if
+
+	}
 
 	return STATE_CONTINUE;
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Dozer action state */
 //-------------------------------------------------------------------------------------------------
 class DozerActionState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionState, "DozerActionState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerActionState, "DozerActionState")
 
 public:
 
@@ -1162,9 +1155,9 @@ class DozerActionState : public State
 		m_actionMachine = newInstance(DozerActionStateMachine)( getMachineOwner(), task );
 		m_actionMachine->initDefaultState();
 	}
-	/* 
+	/*
 		Note that we DON'T use CONVERT_SLEEP_TO_CONTINUE; since we're not doing anything else
-		interesting in update, we can sleep when this machine sleeps 
+		interesting in update, we can sleep when this machine sleeps
 	*/
 	virtual StateReturnType update( void ) { return m_actionMachine->updateStateMachine(); }
 
@@ -1183,14 +1176,14 @@ class DozerActionState : public State
 	StateMachine *m_actionMachine;
 
 };
-inline DozerActionState::~DozerActionState( void ) { if (m_actionMachine) deleteInstance(m_actionMachine); }
+inline DozerActionState::~DozerActionState( void ) { deleteInstance(m_actionMachine); }
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
 // ------------------------------------------------------------------------------------------------
 void DozerActionState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -1204,14 +1197,14 @@ void DozerActionState::xfer( Xfer *xfer )
 
 	xfer->xferUser(&m_task, sizeof(m_task));
 	xfer->xferSnapshot(m_actionMachine);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void DozerActionState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -1238,7 +1231,7 @@ StateReturnType DozerActionState::onEnter( void )
 
 	return STATE_CONTINUE;
 
-}  // end onEnter
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1254,14 +1247,14 @@ void DozerActionState::onExit( StateExitType status )
 	DozerAIInterface *dozerAI = dozer->getAIUpdateInterface()->getDozerAIInterface();
 	dozerAI->setCurrentTask( DOZER_TASK_INVALID );
 
-}  // end onExit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Dozer primary going home state */
 //-------------------------------------------------------------------------------------------------
 class DozerPrimaryGoingHomeState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerPrimaryGoingHomeState, "DozerPrimaryGoingHomeState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DozerPrimaryGoingHomeState, "DozerPrimaryGoingHomeState")
 
 protected:
 	// snapshot interface	 STUBBED no member vars
@@ -1281,12 +1274,12 @@ EMPTY_DTOR(DozerPrimaryGoingHomeState)
 //-------------------------------------------------------------------------------------------------
 DozerPrimaryStateMachine::DozerPrimaryStateMachine( Object *owner ) : StateMachine( owner, "DozerPrimaryStateMachine" )
 {
-	static const StateConditionInfo idleConditions[] = 
+	static const StateConditionInfo idleConditions[] =
 	{
 		StateConditionInfo(isBuildMostImportant, DOZER_PRIMARY_BUILD, NULL),
 		StateConditionInfo(isRepairMostImportant, DOZER_PRIMARY_REPAIR, NULL),
 		StateConditionInfo(isFortifyMostImportant, DOZER_PRIMARY_FORTIFY, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -1296,14 +1289,14 @@ DozerPrimaryStateMachine::DozerPrimaryStateMachine( Object *owner ) : StateMachi
 	defineState( DOZER_PRIMARY_FORTIFY, newInstance(DozerActionState)( this, DOZER_TASK_FORTIFY ), DOZER_PRIMARY_IDLE, DOZER_PRIMARY_IDLE );
 	defineState( DOZER_PRIMARY_GO_HOME, newInstance(DozerPrimaryGoingHomeState)( this ), DOZER_PRIMARY_IDLE, DOZER_PRIMARY_IDLE );
 
-}  // end DozerPrimaryStateMachine
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 DozerPrimaryStateMachine::~DozerPrimaryStateMachine( void )
 {
 
-}  // end ~DozerPrimaryStateMachine
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -1311,19 +1304,19 @@ DozerPrimaryStateMachine::~DozerPrimaryStateMachine( void )
 void DozerPrimaryStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void DozerPrimaryStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1331,7 +1324,7 @@ void DozerPrimaryStateMachine::xfer( Xfer *xfer )
 void DozerPrimaryStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1356,7 +1349,7 @@ Bool DozerPrimaryStateMachine::isBuildMostImportant( State *thisState, void* use
 	DozerTask task = dozerAI->getMostRecentCommand();
 	return task == DOZER_TASK_BUILD;
 
-}  // end isBuildMostImportant
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1381,7 +1374,7 @@ Bool DozerPrimaryStateMachine::isRepairMostImportant( State *thisState, void* us
 	DozerTask task = dozerAI->getMostRecentCommand();
 	return task == DOZER_TASK_REPAIR;
 
-}  // end isRepairMostImportant
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1406,7 +1399,7 @@ Bool DozerPrimaryStateMachine::isFortifyMostImportant( State *thisState, void* u
 	DozerTask task = dozerAI->getMostRecentCommand();
 	return task == DOZER_TASK_FORTIFY;
 
-}  // end isFortifyMostImportat
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1421,14 +1414,14 @@ DozerAIUpdateModuleData::DozerAIUpdateModuleData( void )
 	m_boredTime = 0.0f;
 	m_boredRange = 0.0f;
 
-}  // end DozerAIUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 void DozerAIUpdateModuleData::buildFieldParse( MultiIniFieldParse& p)
 {
   AIUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "RepairHealthPercentPerSecond",	INI::parsePercentToReal,	NULL, offsetof( DozerAIUpdateModuleData, m_repairHealthPercentPerSecond ) },
 		{ "BoredTime",										INI::parseDurationReal,		NULL, offsetof( DozerAIUpdateModuleData, m_boredTime ) },
@@ -1438,13 +1431,13 @@ void DozerAIUpdateModuleData::buildFieldParse( MultiIniFieldParse& p)
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-DozerAIUpdate::DozerAIUpdate( Thing *thing, const ModuleData* moduleData ) : 
+DozerAIUpdate::DozerAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 							 AIUpdateInterface( thing, moduleData )
-               
+
 {
 	Int i, j;
 
@@ -1460,9 +1453,9 @@ DozerAIUpdate::DozerAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 			m_dockPoint[ i ][ j ].valid = FALSE;
 			m_dockPoint[ i ][ j ].location.zero();
 
-		}  // end for j
+		}
 
-	}  // end for i
+	}
 	m_currentTask = DOZER_TASK_INVALID;
 
 	m_buildSubTask = DOZER_SELECT_BUILD_DOCK_LOCATION;  // irrelavant, but I want non-garbage value
@@ -1474,7 +1467,7 @@ DozerAIUpdate::DozerAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 	m_dozerMachine = NULL;
 
 	createMachines();
-}  // end DozerAIUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1482,8 +1475,7 @@ DozerAIUpdate::~DozerAIUpdate( void )
 {
 
 	// delete our behavior state machine
-	if( m_dozerMachine )
-		deleteInstance(m_dozerMachine);
+	deleteInstance(m_dozerMachine);
 
 	// no orders
 	for( Int i = 0; i < DOZER_NUM_TASKS; i++ )
@@ -1492,9 +1484,9 @@ DozerAIUpdate::~DozerAIUpdate( void )
 		m_task[ i ].m_targetObjectID = INVALID_ID;
 		m_task[ i ].m_taskOrderFrame = 0;
 
-	}  // end for i
+	}
 
-}  // end ~DozerAIUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Create any sub machines we need to do all our behavior */
@@ -1508,9 +1500,9 @@ void DozerAIUpdate::createMachines( void )
 		m_dozerMachine = newInstance(DozerPrimaryStateMachine)( getObject() );
 		m_dozerMachine->initDefaultState();
 
-	}  // end if
+	}
 
-}  // end createMachines
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Create the bridge scaffolding if necessary for the bridge that is attached to this tower */
@@ -1536,7 +1528,7 @@ void DozerAIUpdate::createBridgeScaffolding( Object *bridgeTower )
 	// tell the bridge to create scaffolding if necessary
 	bbi->createScaffolding();
 
-}  // end createBridgeScaffolding
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove the bridge scaffolding from the bridge object that is attached to this tower */
@@ -1562,7 +1554,7 @@ void DozerAIUpdate::removeBridgeScaffolding( Object *bridgeTower )
 	// tell the bridge to end any scaffolding from repairing
 	bbi->removeScaffolding();
 
-}  // end removeBridgeScaffolding
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1586,7 +1578,7 @@ UpdateSleepTime DozerAIUpdate::update( void )
 			getCurLocomotor()->setUltraAccurate( TRUE );
 			getCurLocomotor()->setAllowInvalidPosition(TRUE);
 	}*/
-	
+
 	// extend the normal AI system
 	UpdateSleepTime result;
 	result = AIUpdateInterface::update();
@@ -1600,22 +1592,27 @@ UpdateSleepTime DozerAIUpdate::update( void )
 	DozerTask currentTask = getCurrentTask();
 	if( currentTask != DOZER_TASK_INVALID )
 	{
-		
+
 
 		ObjectID taskTarget = getTaskTarget( currentTask );
 		Object *targetObject = TheGameLogic->findObjectByID( taskTarget );
 		Bool invalidTask = FALSE;
 
 		// validate the task and the target
+		// TheSuperHackers @bugfix Stubbjax 16/11/2025 Invalidate the task when the build scaffold is destroyed.
 		if( currentTask == DOZER_TASK_REPAIR &&
 				TheActionManager->canRepairObject( getObject(), targetObject, getLastCommandSource() ) == FALSE )
 			invalidTask = TRUE;
-		
+#if !RETAIL_COMPATIBLE_CRC
+		else if (currentTask == DOZER_TASK_BUILD && targetObject == NULL)
+			invalidTask = TRUE;
+#endif
+
 		// cancel the task if it's now invalid
 		if( invalidTask == TRUE )
 			cancelTask( currentTask );
 
-	}  // end if
+	}
 	else
 		getObject()->setWeaponSetFlag(WEAPONSET_MINE_CLEARING_DETAIL);//maybe go clear some mines, if I feel like it
 
@@ -1623,15 +1620,15 @@ UpdateSleepTime DozerAIUpdate::update( void )
 	m_dozerMachine->updateStateMachine();
 
 	return UPDATE_SLEEP_NONE;
-		
-}  // end update
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** The entry point of a construct command to the Dozer */
 //-------------------------------------------------------------------------------------------------
-Object *DozerAIUpdate::construct( const ThingTemplate *what, 
-																	const Coord3D *pos, 
-																	Real angle, 
+Object *DozerAIUpdate::construct( const ThingTemplate *what,
+																	const Coord3D *pos,
+																	Real angle,
 																	Player *owningPlayer,
 																	Bool isRebuild )
 {
@@ -1651,8 +1648,8 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 
 	// sanity
 	DEBUG_ASSERTCRASH( getObject()->getControllingPlayer() == owningPlayer,
-										 ("Dozer::Construct - The controlling player of the Dozer is not the owning player passed in\n") );
-	
+										 ("Dozer::Construct - The controlling player of the Dozer is not the owning player passed in") );
+
 	// if we're not rebuilding, we have a few checks to pass first for sanity
 	if( isRebuild == FALSE )
 	{
@@ -1663,8 +1660,8 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 		{
 
 			// Just build it.  The ai will validate, or cheat.  jba.
-			
-		}  // end if
+
+		}
 		else
 		{
 
@@ -1681,9 +1678,9 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 																										 getObject(), NULL ) != LBC_OK )
 				return NULL;
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
 	//
 	// what will our initial status bits be, it is important to do this early
@@ -1707,7 +1704,7 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 
 		money->withdraw( what->calcCostToBuild( owningPlayer ) );
 
-	}  // end if	
+	}
 
 	// initialize object
 	obj->setPosition( pos );
@@ -1718,7 +1715,7 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 	Coord3D adjustedPos = *pos;
 	adjustedPos.z = TheTerrainLogic->getGroundHeight(pos->x, pos->y);
 	obj->setPosition(&adjustedPos);
-	
+
 	// Note - very important that we add to map AFTER we flatten terrain. jba.
 	TheAI->pathfinder()->addObjectToPathfindMap( obj );
 	// "callback" event for structure created (note that it's not yet "complete")
@@ -1733,7 +1730,7 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 
 	// set the model action state to awaiting construction
 	obj->clearAndSetModelConditionFlags(
-		MAKE_MODELCONDITION_MASK2(MODELCONDITION_PARTIALLY_CONSTRUCTED, MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED), 
+		MAKE_MODELCONDITION_MASK2(MODELCONDITION_PARTIALLY_CONSTRUCTED, MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED),
 		MAKE_MODELCONDITION_MASK(MODELCONDITION_AWAITING_CONSTRUCTION)
 	);
 
@@ -1741,8 +1738,8 @@ Object *DozerAIUpdate::construct( const ThingTemplate *what,
 	newTask( DOZER_TASK_BUILD, obj );
 
 	return obj;
-				
-}  // end construct
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given our current task and repair target, can we accept this as a new repair target */
@@ -1769,7 +1766,7 @@ Bool DozerAIUpdate::canAcceptNewRepair( Object *obj )
 			return FALSE;
 
 		// check for repairing any tower on the same bridge
-		if( currentRepair->isKindOf( KINDOF_BRIDGE_TOWER ) && 
+		if( currentRepair->isKindOf( KINDOF_BRIDGE_TOWER ) &&
 				obj->isKindOf( KINDOF_BRIDGE_TOWER ) )
 		{
 			BridgeTowerBehaviorInterface *currentTowerInterface = NULL;
@@ -1782,23 +1779,23 @@ Bool DozerAIUpdate::canAcceptNewRepair( Object *obj )
 			if( currentTowerInterface == NULL || newTowerInterface == NULL )
 			{
 
-				DEBUG_CRASH(( "Unable to find bridge tower interface on object\n" ));
+				DEBUG_CRASH(( "Unable to find bridge tower interface on object" ));
 				return FALSE;
 
-			}  // end if
+			}
 
 			// if they are part of the same bridge, ignore this repair command
 			if( currentTowerInterface->getBridgeID() == newTowerInterface->getBridgeID() )
 				return FALSE;
 
-		}  // end if
+		}
 
-	}  // end if, currentRepair object exists
+	}
 
 	// all is well
 	return TRUE;
 
-}  // end canAcceptNewRepair
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Issue an order for the Dozer to go repair the target 'obj' */
@@ -1828,24 +1825,24 @@ void DozerAIUpdate::privateRepair( Object *obj, CommandSourceType cmdSource )
 	//if( obj->isKindOf( KINDOF_BRIDGE_TOWER ) )
 	//{
 	//	BridgeTowerBehaviorInterface *btbi = BridgeTowerBehavior::getBridgeTowerBehaviorInterfaceFromObject( obj );
-	//	DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower behavior interface\n") );
+	//	DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower behavior interface") );
   //
 	//	Object *bridge = TheGameLogic->findObjectByID( btbi->getBridgeID() );
-	//	DEBUG_ASSERTCRASH( bridge, ("Unable to find bridge object\n") );
+	//	DEBUG_ASSERTCRASH( bridge, ("Unable to find bridge object") );
 	//	if( BitIsSet( bridge->getStatusBits(), OBJECT_STATUS_UNDERGOING_REPAIR ) == TRUE )
 	//		return;
   //
 	//}  // end if
-	
-	
+
+
 	// for bridges, set the status for the bridge object
 	//if( obj->isKindOf( KINDOF_BRIDGE_TOWER ) )
 	//{
 	//	BridgeTowerBehaviorInterface *btbi = BridgeTowerBehavior::getBridgeTowerBehaviorInterfaceFromObject( obj );
-	//	DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower behavior interface\n") );
+	//	DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower behavior interface") );
 	//
 	//  Object *bridge = TheGameLogic->findObjectByID( btbi->getBridgeID() );
-	//	DEBUG_ASSERTCRASH( bridge, ("Unable to find bridge object\n") );
+	//	DEBUG_ASSERTCRASH( bridge, ("Unable to find bridge object") );
 	//	bridge->setStatus( OBJECT_STATUS_UNDERGOING_REPAIR );
   //
 	//}  // end if
@@ -1853,7 +1850,7 @@ void DozerAIUpdate::privateRepair( Object *obj, CommandSourceType cmdSource )
 	// start the new task
 	newTask( DOZER_TASK_REPAIR, obj );
 
-}  // end repair
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Resume construction on a building */
@@ -1872,7 +1869,7 @@ void DozerAIUpdate::privateResumeConstruction( Object *obj, CommandSourceType cm
 	// start the new task for construction
 	newTask( DOZER_TASK_BUILD, obj );
 
-}  // end privateResumeConstruction
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -1881,12 +1878,12 @@ void DozerAIUpdate::privateResumeConstruction( Object *obj, CommandSourceType cm
 	// The place we go to build or repair is the closest spot from us to them
 	Coord3D ourPosition = *me->getPosition();
 	Coord3D theirPosition = *target->getPosition();
-	
+
 	Coord3D bestPosition = theirPosition;// This answer is the best, as it includes findPositionAround
 	Coord3D workingPosition = theirPosition;// But if findPositionAround fails, we need to say something.
-	
-	Vector3 offset( ourPosition.x - theirPosition.x, 
-									ourPosition.y - theirPosition.y, 
+
+	Vector3 offset( ourPosition.x - theirPosition.x,
+									ourPosition.y - theirPosition.y,
 									ourPosition.z - theirPosition.z );
 	offset.Normalize();
 	// This scaler makes FindPositionAround bias towards our side
@@ -1973,7 +1970,7 @@ void DozerAIUpdate::newTask( DozerTask task, Object *target )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	// sanity
 	if( target == NULL )
@@ -2001,7 +1998,7 @@ void DozerAIUpdate::newTask( DozerTask task, Object *target )
 
 		//
 		// for building, we say that even "thinking" about building or rebuilding an object
-		// sets us as the current builder of that object.  this allows any dozers that are 
+		// sets us as the current builder of that object.  this allows any dozers that are
 		// ordered later to resume construction on something to see that somebody is already taking
 		// care of it and then they won't be even try to resume a build since we don't allow
 		// multiple dozers/workers to double up on construction efforts
@@ -2021,7 +2018,7 @@ void DozerAIUpdate::newTask( DozerTask task, Object *target )
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_END ].valid				= TRUE;
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_END ].location		= position;
 
-	}  // end if
+	}
 
 	// set the new task target and the frame in which we got this order
 	m_task[ task ].m_targetObjectID = target->getID();
@@ -2030,10 +2027,10 @@ void DozerAIUpdate::newTask( DozerTask task, Object *target )
 	// reset the dozer behavior so that it can re-evluate which task to continue working on
 	m_dozerMachine->resetToDefaultState();
 
-}  // end newTask
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Cancel a task and reset the dozer behavior state machine so that it can 
+/** Cancel a task and reset the dozer behavior state machine so that it can
 	* re-evaluate what it wants to do if it was working on the task being
 	* cancelled */
 //-------------------------------------------------------------------------------------------------
@@ -2046,7 +2043,7 @@ void DozerAIUpdate::cancelTask( DozerTask task )
 	// reset the machine to we can re-evaluate what we want to do
 	m_dozerMachine->resetToDefaultState();
 
-}  // end cancelTask
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is there a given task waiting to be done */
@@ -2055,25 +2052,25 @@ Bool DozerAIUpdate::isTaskPending( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	return m_task[ task ].m_targetObjectID != 0 ? TRUE : FALSE;
-		
-}  // end isTaskPending
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is there any task pending */
 //-------------------------------------------------------------------------------------------------
 Bool DozerAIUpdate::isAnyTaskPending( void )
 {
-	
+
 	for( Int i = 0; i < DOZER_NUM_TASKS; i++ )
 		if( isTaskPending( (DozerTask)i ) )
 			return TRUE;
 
 	return FALSE;
 
-}  // end isAnyTaskPending
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the target object of a given task */
@@ -2082,11 +2079,11 @@ ObjectID DozerAIUpdate::getTaskTarget( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	return m_task[ task ].m_targetObjectID;
 
-}  // end getTaskTarget
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set a task as successfully completed */
@@ -2095,7 +2092,7 @@ void DozerAIUpdate::internalTaskComplete( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	// call the single method that gets called for completing and canceling tasks
 	internalTaskCompleteOrCancelled( task );
@@ -2108,7 +2105,7 @@ void DozerAIUpdate::internalTaskComplete( DozerTask task )
 	for( Int i = 0; i < DOZER_NUM_DOCK_POINTS; i++ )
 		m_dockPoint[ task ][ i ].valid = FALSE;
 
-}  // end internalTaskComplete
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Clear a task from the Dozer for consideration, we can use this when a goal object becomes
@@ -2118,8 +2115,8 @@ void DozerAIUpdate::internalCancelTask( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
-	
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
+
 	if(task < 0 || task >= DOZER_NUM_TASKS)
 		return;  //DAMNIT!  You CANNOT assert and then not handle the damn error!  The.  Code.  Must.  Not.  Crash.
 
@@ -2129,16 +2126,16 @@ void DozerAIUpdate::internalCancelTask( DozerTask task )
 	// remove the info for this task
 	m_task[ task ].m_targetObjectID = INVALID_ID;
 	m_task[ task ].m_taskOrderFrame = 0;
-	
+
 	// remove dock point info for this task
 	for( Int i = 0; i < DOZER_NUM_DOCK_POINTS; i++ )
 		m_dockPoint[ task ][ i ].valid = FALSE;
-	
+
 	// stop the dozer from moving
 	AIUpdateInterface *ai = getObject()->getAIUpdateInterface();
 	ai->aiIdle( CMD_FROM_AI );
 
-}  // end internalCancelTask
+}
 
 // ------------------------------------------------------------------------------------------------
 /** This method is called whenever a task is completed *OR* cancelled */
@@ -2150,13 +2147,13 @@ void DozerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 	{
 
 		// --------------------------------------------------------------------------------------------
-		case DOZER_TASK_INVALID:	
+		case DOZER_TASK_INVALID:
 		{
 
-			break;  // do nothing, this is really no task 
+			break;  // do nothing, this is really no task
+
+		}
 
-		}  // end invalid
-						
 		// --------------------------------------------------------------------------------------------
 		case DOZER_TASK_BUILD:
 		{
@@ -2173,8 +2170,8 @@ void DozerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 //				goalObject->clearModelConditionState(MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED);
 //			}
 			break;
-		
-		}  // end build
+
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case DOZER_TASK_REPAIR:
@@ -2191,29 +2188,29 @@ void DozerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 			//if( obj )
 			//{
       //
-			//	
+			//
 			//	 when we're done repairing bridges, tell the scaffolding to go away and also remove
 			//	 the undergoing repair status from the bridge object itself
-			//	
+			//
 			//	if( obj->isKindOf( KINDOF_BRIDGE_TOWER ) )
 			//	{
 			//		// remove the bridge scaffold
 			//		removeBridgeScaffolding( obj );
-      //  
+      //
 			//		// clear the repair bit from the bridge
 			//		BridgeTowerBehaviorInterface *btbi = BridgeTowerBehavior::getBridgeTowerBehaviorInterfaceFromObject( obj );
-			//		DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower behavior interface\n") );
+			//		DEBUG_ASSERTCRASH( btbi, ("Unable to find bridge tower behavior interface") );
 			//		Object *bridge = TheGameLogic->findObjectByID( btbi->getBridgeID() );
-			//		DEBUG_ASSERTCRASH( bridge, ("Unable to find bridge object\n") );
+			//		DEBUG_ASSERTCRASH( bridge, ("Unable to find bridge object") );
 			//		bridge->clearStatus( OBJECT_STATUS_UNDERGOING_REPAIR );
-			//	
+			//
 			//	}  // end if
       //
 			//}  // end if
 
 			break;
 
-		}  // end repair
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case DOZER_TASK_FORTIFY:
@@ -2221,20 +2218,20 @@ void DozerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 
 			break;
 
-		}  // end fortify
+		}
 
 		// --------------------------------------------------------------------------------------------
 		default:
 		{
 
-			DEBUG_CRASH(( "internalTaskCompleteOrCancelled: Unknown Dozer task '%d'\n", task ));
+			DEBUG_CRASH(( "internalTaskCompleteOrCancelled: Unknown Dozer task '%d'", task ));
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch( task )
+	}
 
-}  // end internalTaskCompleteOrCancelled
+}
 
 //-------------------------------------------------------------------------------------------------
 /** If we were building something, kill the active-construction flag on it */
@@ -2246,11 +2243,11 @@ void DozerAIUpdate::onDelete( void )
 	// cancel any of the tasks we had queued up
 	for( i = DOZER_TASK_FIRST; i < DOZER_NUM_TASKS; ++i )
 	{
-		
+
 		if( isTaskPending( (DozerTask)i ) )
 			cancelTask( (DozerTask)i );
-			
-	}  // end for i
+
+	}
 
 	for( i = 0; i < DOZER_NUM_TASKS; i++ )
 	{
@@ -2283,15 +2280,15 @@ DozerTask DozerAIUpdate::getMostRecentCommand( void )
 				mostRecentTask = (DozerTask)i;
 				mostRecentFrame = m_task[ i ].m_taskOrderFrame;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	return mostRecentTask;
-			
-}  // end getMostRecentCommand
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -2313,7 +2310,7 @@ const Coord3D* DozerAIUpdate::getDockPoint( DozerTask task, DozerDockPoint point
 	// no valid point has been set for this dock point on this task
 	return NULL;
 
-}  // end getDockPoint
+}
 
 // ------------------------------------------------------------------------------------------------
 Real DozerAIUpdate::getRepairHealthPerSecond( void ) const
@@ -2386,7 +2383,7 @@ void DozerAIUpdate::aiDoCommand(const AICommandParms* parms)
 			privateRepair(parms->m_obj, parms->m_cmdSource);
 			break;
 
-		}  // end repair
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case AICMD_RESUME_CONSTRUCTION:
@@ -2400,7 +2397,7 @@ void DozerAIUpdate::aiDoCommand(const AICommandParms* parms)
 			privateResumeConstruction( parms->m_obj, parms->m_cmdSource );
 			break;
 
-		}  // end resume construction
+		}
 
 		// --------------------------------------------------------------------------------------------
 		default:
@@ -2418,11 +2415,11 @@ void DozerAIUpdate::aiDoCommand(const AICommandParms* parms)
 				m_dozerMachine->resetToDefaultState();
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch
+	}
 
-}  // end aiDoCommand
+}
 
 //------------------------------------------------------------------------------------------------
 void DozerAIUpdate::startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID )
@@ -2446,7 +2443,7 @@ void DozerAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -2459,7 +2456,7 @@ void DozerAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -2491,7 +2488,7 @@ void DozerAIUpdate::xfer( Xfer *xfer )
 	}
 	xfer->xferUser(&m_buildSubTask, sizeof(m_buildSubTask));
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2500,6 +2497,6 @@ void DozerAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp
index 0b1f90090a0..d7f60873e89 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp
@@ -26,7 +26,7 @@
 // Author: Kris Morness, June 2002
 // Desc:   State machine that handles internet hacking (free cash)
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingFactory.h"
@@ -42,11 +42,6 @@
 #include "GameLogic/Object.h"
 //#include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -61,13 +56,13 @@ AIStateMachine* HackInternetAIUpdate::makeStateMachine()
 //-------------------------------------------------------------------------------------------------
 HackInternetAIUpdate::HackInternetAIUpdate( Thing *thing, const ModuleData* moduleData ) : AIUpdateInterface( thing, moduleData )
 {
-	m_hasPendingCommand = false;	
-} 
+	m_hasPendingCommand = false;
+}
 
 //-------------------------------------------------------------------------------------------------
 HackInternetAIUpdate::~HackInternetAIUpdate( void )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool HackInternetAIUpdate::isIdle() const
@@ -93,7 +88,7 @@ Bool HackInternetAIUpdate::isHacking() const
 //-------------------------------------------------------------------------------------------------
 Bool HackInternetAIUpdate::isHackingPackingOrUnpacking() const
 {
-	if( getStateMachine()->getCurrentStateID() == HACK_INTERNET || 
+	if( getStateMachine()->getCurrentStateID() == HACK_INTERNET ||
 			getStateMachine()->getCurrentStateID() == PACKING ||
 			getStateMachine()->getCurrentStateID() == UNPACKING )
 	{
@@ -131,16 +126,26 @@ void HackInternetAIUpdate::aiDoCommand(const AICommandParms* parms)
 	if (!isAllowedToRespondToAiCommands(parms))
 		return;
 
+	const StateID currentState = getStateMachine()->getCurrentStateID();
+
+#if !RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix andrew-2e128 / Mauller 14/07/2025 prevent hacking hackers packing and unpacking when commanded to hack the internet
+	if (parms->m_cmd == AICMD_HACK_INTERNET && ( currentState == HACK_INTERNET || currentState == UNPACKING ) )
+	{
+		return;
+	}
+#endif
+
 	//If our hacker is currently packing up his gear, we need to prevent him
 	//from moving until completed. In order to accomplish this, we'll detect,
-	//then 
-	if( getStateMachine()->getCurrentStateID() == HACK_INTERNET || getStateMachine()->getCurrentStateID() == PACKING )
+	//then
+	if( currentState == HACK_INTERNET || currentState == PACKING )
 	{
 		// nuke any existing pending cmd
 		m_pendingCommand.store(*parms);
 		m_hasPendingCommand = true;
 
-		if( getStateMachine()->getCurrentStateID() == HACK_INTERNET )
+		if( currentState == HACK_INTERNET )
 		{
 			getStateMachine()->clear();
 			setLastCommandSource( CMD_FROM_AI );
@@ -183,16 +188,16 @@ UnsignedInt HackInternetAIUpdate::getPackTime() const
 	if( getObject()->getContainedBy() != NULL )
 		return 0; //We don't need to pack if exiting a building
 
-	return getHackInternetAIUpdateModuleData()->m_packTime; 
+	return getHackInternetAIUpdateModuleData()->m_packTime;
 }
 
 // ------------------------------------------------------------------------------------------------
 UnsignedInt HackInternetAIUpdate::getCashUpdateDelay() const
 {
 	if( getObject()->getContainedBy() != NULL )
-		return getHackInternetAIUpdateModuleData()->m_cashUpdateDelayFast; 
+		return getHackInternetAIUpdateModuleData()->m_cashUpdateDelayFast;
 	else
-		return getHackInternetAIUpdateModuleData()->m_cashUpdateDelay; 
+		return getHackInternetAIUpdateModuleData()->m_cashUpdateDelay;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -202,7 +207,7 @@ void HackInternetAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -215,14 +220,14 @@ void HackInternetAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 	xfer->xferBool(&m_hasPendingCommand);
 	if (m_hasPendingCommand) {
 		m_pendingCommand.doXfer(xfer);
 	}
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -231,7 +236,7 @@ void HackInternetAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -259,7 +264,7 @@ HackInternetStateMachine::~HackInternetStateMachine()
 // ------------------------------------------------------------------------------------------------
 void UnpackingState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -272,14 +277,14 @@ void UnpackingState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUnsignedInt(&m_framesRemaining);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void UnpackingState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 StateReturnType UnpackingState::onEnter()
@@ -292,13 +297,13 @@ StateReturnType UnpackingState::onEnter()
 	}
 
 	owner->clearModelConditionFlags( MAKE_MODELCONDITION_MASK3( MODELCONDITION_PACKING, MODELCONDITION_FIRING_A, MODELCONDITION_UNPACKING ) );
-	
+
 	owner->setModelConditionState( MODELCONDITION_UNPACKING );
 
 	AudioEventRTS sound = *owner->getTemplate()->getPerUnitSound( "UnitUnpack" );
 	sound.setObjectID( owner->getID() );
 	TheAudio->addAudioEvent( &sound );
-	
+
 	Real variationFactor = ai->getPackUnpackVariationFactor();
 	Real variation = GameLogicRandomValueReal( 1.0f - variationFactor, 1.0f + variationFactor );
 	m_framesRemaining = ai->getUnpackTime() * variation; //In frames
@@ -348,7 +353,7 @@ void UnpackingState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void PackingState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -361,17 +366,17 @@ void PackingState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUnsignedInt(&m_framesRemaining);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void PackingState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
-StateReturnType PackingState::onEnter() 
+StateReturnType PackingState::onEnter()
 {
 	Object *owner = getMachineOwner();
 	HackInternetAIUpdate *ai = (HackInternetAIUpdate*)owner->getAIUpdateInterface();
@@ -380,13 +385,13 @@ StateReturnType PackingState::onEnter()
 		return STATE_FAILURE;
 	}
 
-	owner->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_FIRING_A ), 
+	owner->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_FIRING_A ),
 																				 MAKE_MODELCONDITION_MASK( MODELCONDITION_PACKING ) );
 
 	AudioEventRTS sound = *owner->getTemplate()->getPerUnitSound( "UnitPack" );
 	sound.setObjectID( owner->getID() );
 	TheAudio->addAudioEvent( &sound );
-	
+
 	Real variationFactor = ai->getPackUnpackVariationFactor();
 	Real variation = GameLogicRandomValueReal( 1.0f - variationFactor, 1.0f + variationFactor );
 	m_framesRemaining = ai->getPackTime() * variation; //In frames
@@ -424,7 +429,7 @@ void PackingState::onExit( StateExitType status )
 // ------------------------------------------------------------------------------------------------
 void HackInternetState::crc( Xfer *xfer )
 {
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -437,14 +442,14 @@ void HackInternetState::xfer( Xfer *xfer )
   xfer->xferVersion( &version, currentVersion );
 
 	xfer->xferUnsignedInt(&m_framesRemaining);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void HackInternetState::loadPostProcess( void )
 {
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 StateReturnType HackInternetState::onEnter()
@@ -456,8 +461,8 @@ StateReturnType HackInternetState::onEnter()
 	{
 		return STATE_FAILURE;
 	}
-	
-	owner->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ), 
+
+	owner->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ),
 																				 MAKE_MODELCONDITION_MASK( MODELCONDITION_FIRING_A ) );
 
 	m_framesRemaining = ai->getCashUpdateDelay();
@@ -489,7 +494,7 @@ StateReturnType HackInternetState::update()
 	else
 	{
 		//We have waited the full amount of the delay, so hack some cash from the heavens!
-		
+
 		//Add cash
 		Money *money = owner->getControllingPlayer()->getMoney();
 		if( money )
@@ -506,28 +511,28 @@ StateReturnType HackInternetState::update()
 						{
 							break;
 						}
-						//If entry missing, fall through!
+						FALLTHROUGH; //If entry missing, fall through!
 					case LEVEL_ELITE:
 						amount = ai->getEliteCashAmount();
 						if( amount )
 						{
 							break;
 						}
-						//If entry missing, fall through!
+						FALLTHROUGH; //If entry missing, fall through!
 					case LEVEL_VETERAN:
 						amount = ai->getVeteranCashAmount();
 						if( amount )
 						{
 							break;
 						}
-						//If entry missing, fall through!
+						FALLTHROUGH; //If entry missing, fall through!
 					case LEVEL_REGULAR:
 						amount = ai->getRegularCashAmount();
 						if( amount )
 						{
 							break;
 						}
-						//If entry missing, fall through!
+						FALLTHROUGH; //If entry missing, fall through!
 					default:
 						amount = 1;
 						break;
@@ -538,25 +543,7 @@ StateReturnType HackInternetState::update()
 				//Grant the unit some experience for a successful hack.
 				xp->addExperiencePoints( ai->getXpPerCashUpdate() );
 
-				Bool displayMoney = TRUE;
-				if( owner->testStatus(OBJECT_STATUS_STEALTHED) )
-				{
-					// OY LOOK!  I AM USING LOCAL PLAYER.  Do not put anything other than TheInGameUI->addFloatingText in the block this controls!!!
-					if( !owner->isLocallyControlled() && !owner->testStatus(OBJECT_STATUS_DETECTED) )
-					{
-						displayMoney = FALSE;
-					}
-				}
-				if( owner->getContainedBy() && owner->getContainedBy()->testStatus(OBJECT_STATUS_STEALTHED) )
-				{
-					// OY LOOK!  I AM USING LOCAL PLAYER.  Do not put anything other than TheInGameUI->addFloatingText in the block this controls!!!
-					if( !owner->getContainedBy()->isLocallyControlled() && !owner->getContainedBy()->testStatus(OBJECT_STATUS_DETECTED) )
-					{
-						displayMoney = FALSE;
-					}
-				}
-				
-				if( displayMoney )
+				if (owner->isLogicallyVisible())
 				{
 					// OY LOOK!  I AM USING LOCAL PLAYER.  Do not put anything other than TheInGameUI->addFloatingText in the block this controls!!!
 					//Display cash income floating over the hacker.
@@ -566,7 +553,7 @@ StateReturnType HackInternetState::update()
 					pos.zero();
 					pos.add( owner->getPosition() );
 					pos.z += 20.0f; //add a little z to make it show up above the unit.
-          
+
 
           Object *internetCenter = owner->getContainedBy();
           if ( internetCenter )
@@ -590,7 +577,7 @@ StateReturnType HackInternetState::update()
 
 		//Reset timer and start a new cycle.
 		m_framesRemaining = ai->getCashUpdateDelay();
-		
+
 	}
 
 	//This is a persistent state until told otherwise.
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
index cca2a49e8d7..4e3b24a426c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
@@ -24,7 +24,7 @@
 
 // JetAIUpdate.cpp //////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_LOCOMOTORSET_NAMES
 
@@ -49,11 +49,6 @@
 
 const Real BIGNUM = 99999.0f;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 enum TaxiType CPP_11(: Int)
@@ -88,18 +83,18 @@ enum JetAIStateType CPP_11(: Int)
 
 
 //-------------------------------------------------------------------------------------------------
-Bool JetAIUpdate::getFlag( FlagType f ) const 
-{ 
-	return (m_flags & (1<<f)) != 0; 
+Bool JetAIUpdate::getFlag( FlagType f ) const
+{
+	return (m_flags & (1<<f)) != 0;
 }
 
 //-------------------------------------------------------------------------------------------------
-void JetAIUpdate::setFlag( FlagType f, Bool v) 
-{ 
-	if (v) 
-		m_flags |= (1<<f); 
-	else 
-		m_flags &= ~(1<<f); 
+void JetAIUpdate::setFlag( FlagType f, Bool v)
+{
+	if (v)
+		m_flags |= (1<<f);
+	else
+		m_flags &= ~(1<<f);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -154,7 +149,7 @@ class PartitionFilterHasParkingPlace : public PartitionFilter
 public:
 	PartitionFilterHasParkingPlace(ObjectID id) : m_id(id) { }
 protected:
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterHasParkingPlace"; }
 #endif
 	virtual Bool allow(Object *objOther)
@@ -202,7 +197,7 @@ static Object* findSuitableAirfield(Object* jet)
 */
 class JetAwaitingRunwayState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetAwaitingRunwayState, "JetAwaitingRunwayState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetAwaitingRunwayState, "JetAwaitingRunwayState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -250,14 +245,14 @@ class JetAwaitingRunwayState : public State
 			DEBUG_ASSERTCRASH(m_landing, ("hmm, this should never happen for taking-off things"));
 			return STATE_FAILURE;
 		}
-		
+
 		if (pp->reserveRunway(jet->getID(), m_landing))
 		{
 			return STATE_SUCCESS;
 		}
 		else if( jet->testStatus( OBJECT_STATUS_DECK_HEIGHT_OFFSET ) && !m_landing )
 		{
-			//If we're trying to take off an aircraft carrier and fail to reserve a 
+			//If we're trying to take off an aircraft carrier and fail to reserve a
 			//runway, it's because we need to be at the front of the carrier queue.
 			//Therefore, we need to move forward whenever possible until we are in
 			//the front.
@@ -267,7 +262,7 @@ class JetAwaitingRunwayState : public State
 				jetAI->friend_setTaxiInProgress(true);
 				jetAI->friend_setAllowAirLoco(false);
 				jetAI->chooseLocomotorSet(LOCOMOTORSET_TAXIING);
-				
+
 				jetAI->destroyPath();
 				Path *movePath;
 				movePath = newInstance(Path);
@@ -314,7 +309,7 @@ EMPTY_DTOR(JetAwaitingRunwayState)
 */
 class JetOrHeliCirclingDeadAirfieldState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliCirclingDeadAirfieldState, "JetOrHeliCirclingDeadAirfieldState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliCirclingDeadAirfieldState, "JetOrHeliCirclingDeadAirfieldState")
 protected:
 	// snapshot interface	 STUBBED.
 	// The state will check immediately after a load game, but I think that's ok.  jba.
@@ -332,7 +327,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 	};
 
 public:
-	JetOrHeliCirclingDeadAirfieldState( StateMachine *machine ) : 
+	JetOrHeliCirclingDeadAirfieldState( StateMachine *machine ) :
 		State( machine, "JetOrHeliCirclingDeadAirfieldState"),
 		m_checkAirfield(0) { }
 
@@ -344,7 +339,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 		{
 			return STATE_FAILURE;
 		}
-		
+
 		// obscure case: if the jet wasn't spawned, but just placed directly on the map,
 		// it might not have an owning airfield, and it might be trying to return
 		// simply due to being idle, not out of ammo. so check and don't die in that
@@ -378,7 +373,7 @@ class JetOrHeliCirclingDeadAirfieldState : public State
 
 		// just stay where we are.
 		jetAI->setLocomotorGoalNone();
-		
+
 		Real damageRate = jetAI->friend_getOutOfAmmoDamagePerSecond();
 		if (damageRate > 0)
 		{
@@ -419,7 +414,7 @@ EMPTY_DTOR(JetOrHeliCirclingDeadAirfieldState)
 */
 class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliReturningToDeadAirfieldState, "JetOrHeliReturningToDeadAirfieldState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliReturningToDeadAirfieldState, "JetOrHeliReturningToDeadAirfieldState")
 public:
 	JetOrHeliReturningToDeadAirfieldState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturningToDeadAirfieldState") { }
 
@@ -442,13 +437,13 @@ class JetOrHeliReturningToDeadAirfieldState : public AIInternalMoveToState
 EMPTY_DTOR(JetOrHeliReturningToDeadAirfieldState)
 
 //-------------------------------------------------------------------------------------------------
-// This solution uses the 
-// http://www.faqs.org/faqs/graphics/algorithms-faq/ 
+// This solution uses the
+// http://www.faqs.org/faqs/graphics/algorithms-faq/
 // Subject 1.03
 static Bool intersectInfiniteLine2D
 (
-	Real ax, Real ay, Real ao, 
-	Real cx, Real cy, Real co, 
+	Real ax, Real ay, Real ao,
+	Real cx, Real cy, Real co,
 	Real& ix, Real& iy
 )
 {
@@ -458,7 +453,7 @@ static Bool intersectInfiniteLine2D
 	Real dy = cy + Sin(co);
 
 	Real denom = ((bx - ax) * (dy - cy) - (by - ay) * (dx - cx));
-	if (denom == 0.0f) 
+	if (denom == 0.0f)
 	{
 		// the lines are parallel.
 		return false;
@@ -476,9 +471,9 @@ static Bool intersectInfiniteLine2D
 	Success: we are on the ground at the runway start
 	Failure: we are unable to get on the ground
 */
-class JetOrHeliTaxiState : public AIMoveOutOfTheWayState 
+class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliTaxiState, "JetOrHeliTaxiState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliTaxiState, "JetOrHeliTaxiState")
 private:
 	TaxiType m_taxiMode;
 public:
@@ -490,12 +485,12 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
 		if( !jetAI )
 			return STATE_FAILURE;
-		
+
 		jetAI->setCanPathThroughUnits(true);
 		jetAI->friend_setTakeoffInProgress(m_taxiMode != TO_PARKING);
 		jetAI->friend_setLandingInProgress(m_taxiMode == TO_PARKING);
 		jetAI->friend_setTaxiInProgress(true);
-		
+
 		if( m_taxiMode == TO_PARKING )
 		{
 			//Instantly reload flares.
@@ -514,11 +509,11 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 		ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID(), &airfield);
 		if (pp == NULL)
 			return STATE_SUCCESS;	// no airfield? just skip this step.
-		
+
 		ParkingPlaceBehaviorInterface::PPInfo ppinfo;
 		if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), &ppinfo))
 			return STATE_FAILURE;	// full?
-		
+
 		Coord3D intermedPt;
 		Bool intermed = false;
 		Real orient = atan2(ppinfo.runwayPrep.y - ppinfo.parkingSpace.y, ppinfo.runwayPrep.x - ppinfo.parkingSpace.x);
@@ -553,7 +548,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 					}
 				}
 
-				//We just landed... see if we can get a better space forward so we don't stop and pause 
+				//We just landed... see if we can get a better space forward so we don't stop and pause
 				//at our initially assigned spot.
 				Coord3D pos;
 				pp->calcBestParkingAssignment( jet->getID(), &pos );
@@ -573,7 +568,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 		{
 			if( jet->testStatus( OBJECT_STATUS_DECK_HEIGHT_OFFSET ) )
 			{
-				if( !(ppinfo.runwayStart == ppinfo.runwayPrep) )	
+				if( !(ppinfo.runwayStart == ppinfo.runwayPrep) )
 				{
 					movePath->appendNode( &ppinfo.runwayStart, LAYER_GROUND );
 				}
@@ -629,7 +624,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 			}
 		}
 
-		m_waitingForPath = FALSE;	 
+		m_waitingForPath = FALSE;
 		TheAI->pathfinder()->setDebugPath(movePath);
 
 		setAdjustsDestination(false);	// precision is necessary
@@ -702,9 +697,9 @@ EMPTY_DTOR(JetOrHeliTaxiState)
 	Success: we are on the ground at the runway start
 	Failure: we are unable to get on the ground
 */
-class JetTakeoffOrLandingState : public AIFollowPathState 
+class JetTakeoffOrLandingState : public AIFollowPathState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetTakeoffOrLandingState, "JetTakeoffOrLandingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetTakeoffOrLandingState, "JetTakeoffOrLandingState")
 private:
 	Real			m_maxLift;
 	Real			m_maxSpeed;
@@ -753,14 +748,14 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID());
 		if (pp == NULL)
 			return STATE_SUCCESS;	// no airfield? just skip this step
-		
+
 		ParkingPlaceBehaviorInterface::PPInfo ppinfo;
 		if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), &ppinfo))
 		{
 			// it's full.
 			return STATE_FAILURE;
 		}
-		
+
 		// only check this for landing; we might have already given up the reservation to the guy behind us for takeoff
 		if (m_landing)
 		{
@@ -770,7 +765,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 				return STATE_FAILURE;
 			}
 		}
-		
+
 		std::vector<Coord3D> path;
 		if (m_landing)
 		{
@@ -806,7 +801,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		jetAI->friend_setGoalPath( &path );
 
 		StateReturnType ret = AIFollowPathState::onEnter();
-		
+
 		return ret;
 	}
 
@@ -819,7 +814,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
 		if( !jetAI )
 			return STATE_FAILURE;
-		
+
 		if (m_landing)
 		{
 #ifdef CIRCLE_FOR_LANDING
@@ -850,11 +845,11 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 				{
 					groundZ += pp->getLandingDeckHeightOffset();
 				}
-				
+
 				if( zPos - zSlop <= groundZ )
 				{
 					m_landingSoundPlayed = TRUE;
-					AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_aircraftWheelScreech;	
+					AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_aircraftWheelScreech;
 					soundToPlay.setPosition( jet->getPosition() );
 					TheAudio->addAudioEvent( &soundToPlay );
 				}
@@ -875,7 +870,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 			Coord3D vector = ppinfo.runwayEnd;
 			vector.sub( jet->getPosition() );
 			Real dist = vector.length();
-			
+
 			Real ratio = 1.0f - (dist / ppinfo.runwayTakeoffDist);
 			ratio *= ratio; //dampen it....
 			if (ratio < 0.0f) ratio = 0.0f;
@@ -901,7 +896,7 @@ class JetTakeoffOrLandingState : public AIFollowPathState
 		jetAI->friend_setLandingInProgress(false);
 		jetAI->friend_enableAfterburners(false);
 
-		// Paranoia checks - sometimes onExit is called when we are 
+		// Paranoia checks - sometimes onExit is called when we are
 		// shutting down, and not all pieces are valid.  CurLocomotor
 		// is definitely null in some cases. jba.
 		Locomotor* loco = jetAI->getCurLocomotor();
@@ -940,9 +935,9 @@ static Real calcDistSqr(const Coord3D& a, const Coord3D& b)
 	Success: we are on the ground at the runway start
 	Failure: we are unable to get on the ground
 */
-class HeliTakeoffOrLandingState : public State 
+class HeliTakeoffOrLandingState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(HeliTakeoffOrLandingState, "HeliTakeoffOrLandingState")
 protected:
 	// snapshot interface
 	virtual void crc( Xfer *xfer )
@@ -976,9 +971,9 @@ class HeliTakeoffOrLandingState : public State
 	Real			m_parkingOrientation;
 	Bool			m_landing;
 public:
-	HeliTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing), 
+	HeliTakeoffOrLandingState( StateMachine *machine, Bool landing ) : m_landing(landing),
 		State( machine, "HeliTakeoffOrLandingState" ), m_index(0)
-		{ 
+		{
 			m_parkingLoc.zero();
 		}
 
@@ -1004,7 +999,7 @@ class HeliTakeoffOrLandingState : public State
 		ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID(), &airfield);
 		if (pp == NULL)
 			return STATE_SUCCESS;	// no airfield? just skip this step
-		
+
 		Coord3D landingApproach;
 		if (jet->isKindOf(KINDOF_PRODUCED_AT_HELIPAD))
 		{
@@ -1031,7 +1026,7 @@ class HeliTakeoffOrLandingState : public State
 			landingApproach = m_parkingLoc;
 			landingApproach.z += (ppinfo.runwayApproach.z - ppinfo.runwayEnd.z);
 		}
-		
+
 		if (m_landing)
 		{
 			m_path[0] = landingApproach;
@@ -1070,11 +1065,11 @@ class HeliTakeoffOrLandingState : public State
 		Real dy = hoverloc.y - pos.y;
 		Real dSqr = dx*dx+dy*dy;
 		const Real DARN_CLOSE = 0.25f;
-		if (dSqr < DARN_CLOSE) 
+		if (dSqr < DARN_CLOSE)
 		{
 			jet->setPosition(&hoverloc);
-		} 
-		else 
+		}
+		else
 		{
 			Real dist = sqrtf(dSqr);
 			if (dist<1) dist = 1;
@@ -1103,7 +1098,7 @@ class HeliTakeoffOrLandingState : public State
 		Real distSqr = calcDistSqr(*a, *b);
 		if (distSqr <= THRESH_SQR)
 			++m_index;
-		
+
 		if (m_index >= 2)
 			return STATE_SUCCESS;
 
@@ -1121,7 +1116,7 @@ class HeliTakeoffOrLandingState : public State
 		jetAI->friend_setTakeoffInProgress(false);
 		jetAI->friend_setLandingInProgress(false);
 
-		// Paranoia checks - sometimes onExit is called when we are 
+		// Paranoia checks - sometimes onExit is called when we are
 		// shutting down, and not all pieces are valid.  CurLocomotor
 		// is definitely null in some cases. jba.
 		Locomotor* loco = jetAI->getCurLocomotor();
@@ -1154,7 +1149,7 @@ EMPTY_DTOR(HeliTakeoffOrLandingState)
 //-------------------------------------------------------------------------------------------------
 class JetOrHeliParkOrientState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliParkOrientState, "JetOrHeliParkOrientState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -1198,7 +1193,7 @@ class JetOrHeliParkOrientState : public State
 		ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID());
 		if (pp == NULL)
 			return STATE_FAILURE;
-		
+
 		ParkingPlaceBehaviorInterface::PPInfo ppinfo;
 		if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), &ppinfo))
 			return STATE_FAILURE;
@@ -1240,7 +1235,7 @@ EMPTY_DTOR(JetOrHeliParkOrientState)
 //-------------------------------------------------------------------------------------------------
 class JetPauseBeforeTakeoffState : public AIFaceState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetPauseBeforeTakeoffState, "JetPauseBeforeTakeoffState")
 protected:
 	// snapshot interface
 	virtual void crc( Xfer *xfer )
@@ -1251,29 +1246,52 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 	virtual void xfer( Xfer *xfer )
 	{
 		// version
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
 		XferVersion currentVersion = 1;
+#else
+		XferVersion currentVersion = 2;
+#endif
 		XferVersion version = currentVersion;
 		xfer->xferVersion( &version, currentVersion );
 
 		// set on create. xfer->xferBool(&m_landing);
-		xfer->xferUnsignedInt(&m_when);
+		xfer->xferUnsignedInt(&m_whenTakeoff);
 		xfer->xferUnsignedInt(&m_whenTransfer);
-		xfer->xferBool(&m_afterburners);
-		xfer->xferBool(&m_resetTimer);
+
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
+		if (version <= 1)
+		{
+			xfer->xferBool(&m_afterburners);
+			xfer->xferBool(&m_resetTimer);
+		}
+#else
+		if (version <= 1)
+		{
+			Bool afterburners = false;
+			Bool resetTimer = false;
+			xfer->xferBool(&afterburners);
+			xfer->xferBool(&resetTimer);
+		}
+#endif
+
 		xfer->xferObjectID(&m_waitedForTaxiID);
 	}
+
 	virtual void loadPostProcess()
 	{
 		// empty. jba.
 	}
 
 private:
-	UnsignedInt		m_when;
+	UnsignedInt		m_whenTakeoff;
 	UnsignedInt		m_whenTransfer;
 	ObjectID			m_waitedForTaxiID;
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
 	Bool					m_resetTimer;
 	Bool					m_afterburners;
+#endif
 
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
 	Bool findWaiter()
 	{
 		Object* jet = getMachineOwner();
@@ -1303,16 +1321,51 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		}
 		return false;
 	}
+#else
+	Object* findJetToWaitFor() const
+	{
+		const Object* thisJet = getMachineOwner();
+		ParkingPlaceBehaviorInterface* pp = getPP(getMachineOwner()->getProducerID());
+
+		if (pp != NULL)
+		{
+			const Int thisJetRunway = pp->getRunwayIndex(thisJet->getID());
+			const Int runwayCount = pp->getRunwayCount();
+
+			for (Int runway = 0; runway < runwayCount; ++runway)
+			{
+				if (runway == thisJetRunway)
+					continue;
+
+				Object* otherJet = TheGameLogic->findObjectByID(pp->getRunwayReservation(runway, RESERVATION_TAKEOFF));
+				if (otherJet == NULL)
+					continue;
+
+				AIUpdateInterface* ai = otherJet->getAIUpdateInterface();
+				if (ai == NULL)
+					continue;
+
+				if (ai->getCurrentStateID() != TAXI_TO_TAKEOFF)
+					continue;
+				
+				return otherJet;
+			}
+		}
+		return NULL;
+	}
+#endif
 
 public:
-	JetPauseBeforeTakeoffState( StateMachine *machine ) : 
-		AIFaceState(machine, false), 
-		m_when(0), 
-		m_whenTransfer(0),
-		m_waitedForTaxiID(INVALID_ID), 
-		m_resetTimer(false),
-		m_afterburners(false) 
-	{ 
+	JetPauseBeforeTakeoffState( StateMachine *machine )
+		: AIFaceState(machine, false)
+		, m_whenTakeoff(0)
+		, m_whenTransfer(0)
+		, m_waitedForTaxiID(INVALID_ID)
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
+		, m_resetTimer(false)
+		, m_afterburners(false)
+#endif
+	{
 		// nothing
 	}
 
@@ -1326,25 +1379,28 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		jetAI->friend_setTakeoffInProgress(true);
 		jetAI->friend_setLandingInProgress(false);
 
-		m_when = 0;
+		m_whenTakeoff = 0;
 		m_whenTransfer = 0;
 		m_waitedForTaxiID = INVALID_ID;
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
 		m_resetTimer = false;
 		m_afterburners = false;
+#endif
 
 		ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID());
 		if (pp == NULL)
 			return STATE_SUCCESS;	// no airfield? just skip this step.
-		
+
 		ParkingPlaceBehaviorInterface::PPInfo ppinfo;
 		if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), &ppinfo))
 			return STATE_SUCCESS;	// full?
 
 		getMachine()->setGoalPosition(&ppinfo.runwayEnd);
-		
+
 		return AIFaceState::onEnter();
 	}
 
+#if RETAIL_COMPATIBLE_CRC || RETAIL_COMPATIBLE_XFER_SAVE
 	virtual StateReturnType update()
 	{
 		Object* jet = getMachineOwner();
@@ -1354,7 +1410,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 
 		// always call this.
 		StateReturnType superStatus = AIFaceState::update();
-		
+
 		if (findWaiter())
 			return STATE_CONTINUE;
 
@@ -1362,11 +1418,11 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 		if (!m_resetTimer)
 		{
 			// we had to wait, but now everyone else is ready, so restart our countdown.
-			m_when = now + jetAI->friend_getTakeoffPause();
+			m_whenTakeoff = now + jetAI->friend_getTakeoffPause();
 			if (m_waitedForTaxiID == INVALID_ID)
 			{
 				m_waitedForTaxiID = jet->getID();	// just so we don't pick up anyone else
-				m_whenTransfer = now + 1;	
+				m_whenTransfer = now + 1;
 			}
 			else
 			{
@@ -1381,7 +1437,7 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 			m_afterburners = true;
 		}
 
-		DEBUG_ASSERTCRASH(m_when != 0, ("hmm"));
+		DEBUG_ASSERTCRASH(m_whenTakeoff != 0, ("hmm"));
 		DEBUG_ASSERTCRASH(m_whenTransfer != 0, ("hmm"));
 
 			// once we start the final wait, release the runways for guys behind us, so they can start taxiing
@@ -1391,11 +1447,86 @@ class JetPauseBeforeTakeoffState : public AIFaceState
 			pp->transferRunwayReservationToNextInLineForTakeoff(jet->getID());
 		}
 
-		if (now >= m_when)
+		if (now >= m_whenTakeoff)
 			return superStatus;
 
 		return STATE_CONTINUE;
 	}
+#else
+	// TheSuperHackers @bugfix Reimplements the update to wait for another Jet on another runway.
+	// If this must work with more than 2 runways, then this logic needs another look.
+	virtual StateReturnType update()
+	{
+		Object* jet = getMachineOwner();
+		JetAIUpdate* jetAI = (JetAIUpdate*)jet->getAIUpdateInterface();
+
+		if (jet->isEffectivelyDead())
+			return STATE_FAILURE;
+
+		// always call this.
+		StateReturnType superStatus = AIFaceState::update();
+
+		if (Object* otherJet = findJetToWaitFor())
+		{
+			// Found a jet on another runway to wait for.
+			if (m_waitedForTaxiID == INVALID_ID)
+			{
+				// Save the other Jet to wait for.
+				m_waitedForTaxiID = otherJet->getID();
+			}
+
+			if (m_waitedForTaxiID == otherJet->getID())
+			{
+				// Wait for the other Jet to get ready.
+				return STATE_CONTINUE;
+			}
+		}
+
+		const UnsignedInt now = TheGameLogic->getFrame();
+
+		if (m_whenTakeoff == 0)
+		{
+			// The other Jet (if any) is ready. Prepare runway transfer and takeoff.
+			// Transfer the runway after one or two frames earliest to give the other
+			// Jet a chance to update as well before the runway is transfered.
+			if (m_waitedForTaxiID == INVALID_ID)
+			{
+				// Do not wait for any other Jet from now on.
+				m_waitedForTaxiID = jet->getID();
+				m_whenTransfer = now + 1;
+			}
+			else
+			{
+				m_whenTransfer = now + 2; // 2 seems odd, but is correct
+			}
+
+			// Take off soon, but not before the runway transfer.
+			m_whenTakeoff = std::max(m_whenTransfer, now + jetAI->friend_getTakeoffPause());
+			jetAI->friend_enableAfterburners(true);
+		}
+		else
+		{
+			// once we start the final wait, release the runways for guys behind us, so they can start taxiing
+			if (now >= m_whenTransfer)
+			{
+				if (ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID()))
+				{
+					pp->transferRunwayReservationToNextInLineForTakeoff(jet->getID());
+				}
+				// Do not transfer the runway again in the next update.
+				m_whenTransfer = ~0u;
+			}
+
+			if (now >= m_whenTakeoff)
+			{
+				// Ready to take off!
+				return superStatus;
+			}
+		}
+
+		return STATE_CONTINUE;
+	}
+#endif
 
 	virtual void onExit(StateExitType status)
 	{
@@ -1412,7 +1543,7 @@ EMPTY_DTOR(JetPauseBeforeTakeoffState)
 //-------------------------------------------------------------------------------------------------
 class JetOrHeliReloadAmmoState : public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliReloadAmmoState, "JetOrHeliReloadAmmoState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliReloadAmmoState, "JetOrHeliReloadAmmoState")
 private:
 	UnsignedInt		m_reloadTime;
 	UnsignedInt		m_reloadDoneFrame;
@@ -1454,14 +1585,14 @@ class JetOrHeliReloadAmmoState : public State
 		jetAI->friend_setTakeoffInProgress(false);
 		jetAI->friend_setLandingInProgress(false);
 		jetAI->friend_setUseSpecialReturnLoco(false);
-		
+
 		m_reloadTime = 0;
 		for (Int i = 0; i < WEAPONSLOT_COUNT;	++i)
 		{
 			const Weapon* w = jet->getWeaponInWeaponSlot((WeaponSlotType)i);
 			if (w == NULL)
 				continue;
-			
+
 			Int remaining = w->getRemainingAmmo();
 			Int clipSize = w->getClipSize();
 			Int rt = w->getClipReloadTime(jet);
@@ -1474,7 +1605,7 @@ class JetOrHeliReloadAmmoState : public State
 			if (rt > m_reloadTime)
 				m_reloadTime = rt;
 		}
-		
+
 		if (m_reloadTime < 1)
 			m_reloadTime = 1;
 		m_reloadDoneFrame = m_reloadTime + TheGameLogic->getFrame();
@@ -1491,7 +1622,7 @@ class JetOrHeliReloadAmmoState : public State
 			Weapon* w = jet->getWeaponInWeaponSlot((WeaponSlotType)i);
 			if (w == NULL)
 				continue;
-			
+
 			if (now >= m_reloadDoneFrame)
 				w->setClipPercentFull(1.0f, false);
 			else
@@ -1525,7 +1656,7 @@ EMPTY_DTOR(JetOrHeliReloadAmmoState)
 */
 class JetOrHeliReturnForLandingState : public AIInternalMoveToState
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliReturnForLandingState, "JetOrHeliReturnForLandingState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(JetOrHeliReturnForLandingState, "JetOrHeliReturnForLandingState")
 public:
 	JetOrHeliReturnForLandingState( StateMachine *machine ) : AIInternalMoveToState( machine, "JetOrHeliReturnForLandingState") { }
 
@@ -1551,7 +1682,7 @@ class JetOrHeliReturnForLandingState : public AIInternalMoveToState
 				return STATE_FAILURE;
 			}
 		}
-		
+
 		if (jet->isKindOf(KINDOF_PRODUCED_AT_HELIPAD))
 		{
 			m_goalPosition = jetAI->friend_getLandingPosForHelipadStuff();
@@ -1670,11 +1801,11 @@ JetAIUpdateModuleData::JetAIUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void JetAIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void JetAIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   AIUpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "OutOfAmmoDamagePerSecond",			INI::parsePercentToReal, NULL, offsetof( JetAIUpdateModuleData, m_outOfAmmoDamagePerSecond ) },
 		{ "NeedsRunway",									INI::parseBool, NULL, offsetof( JetAIUpdateModuleData, m_needsRunway ) },
@@ -1726,10 +1857,7 @@ JetAIUpdate::JetAIUpdate( Thing *thing, const ModuleData* moduleData ) : AIUpdat
 	m_lockonDrawable = NULL;
 	m_landingPosForHelipadStuff.zero();
 
-	//Added By Sadullah Nader
-	//Initializations missing and needed 
 	m_producerLocation.zero();
-	//
 	m_enginesOn = TRUE;
 }
 
@@ -1859,7 +1987,7 @@ UpdateSleepTime JetAIUpdate::update()
 	{
 		if (pp != NULL)
 		{
-			if (!getFlag(ALLOW_AIR_LOCO) && 
+			if (!getFlag(ALLOW_AIR_LOCO) &&
 					!getFlag(HAS_PENDING_COMMAND) &&
 						jet->isKindOf(KINDOF_PRODUCED_AT_HELIPAD) &&
 						jet->getBodyModule()->getHealth() == jet->getBodyModule()->getMaxHealth())
@@ -1889,7 +2017,7 @@ UpdateSleepTime JetAIUpdate::update()
 			setLastCommandSource( CMD_FROM_AI );
 			getStateMachine()->setState(RETURNING_FOR_LANDING);
 		}
-		else if (getFlag(HAS_PENDING_COMMAND) 
+		else if (getFlag(HAS_PENDING_COMMAND)
 			// srj sez: if we are reloading ammo, wait will we are done before processing the pending command.
 			&& getStateMachine()->getCurrentStateID() != RELOAD_AMMO)
 		{
@@ -1921,7 +2049,7 @@ UpdateSleepTime JetAIUpdate::update()
 			pp->setHealee(getObject(), false);
 		}
 		m_returnToBaseFrame = 0;
-		if (getFlag(ALLOW_INTERRUPT_AND_RESUME_OF_CUR_STATE_FOR_RELOAD) && 
+		if (getFlag(ALLOW_INTERRUPT_AND_RESUME_OF_CUR_STATE_FOR_RELOAD) &&
 						isOutOfSpecialReloadAmmo() && getFlag(ALLOW_AIR_LOCO))
 		{
 			setFlag(USE_SPECIAL_RETURN_LOCO, true);
@@ -1942,7 +2070,7 @@ UpdateSleepTime JetAIUpdate::update()
 	if (draw != NULL)
 	{
 		StateID id = getStateMachine()->getCurrentStateID();
-		Bool needToCheckMinHeight = (id >= JETAISTATETYPE_FIRST && id <= JETAISTATETYPE_LAST) || 
+		Bool needToCheckMinHeight = (id >= JETAISTATETYPE_FIRST && id <= JETAISTATETYPE_LAST) ||
 																	!jet->isAboveTerrain() ||
 																	!getFlag(ALLOW_AIR_LOCO);
 		if( needToCheckMinHeight || jet->getStatusBits().test( OBJECT_STATUS_DECK_HEIGHT_OFFSET ) )
@@ -1994,7 +2122,7 @@ UpdateSleepTime JetAIUpdate::update()
 	}
 
 	positionLockon();
-	
+
 	if (m_attackLocoExpireFrame != 0)
 	{
 		chooseLocomotorSet(d->m_attackingLoco);
@@ -2004,21 +2132,21 @@ UpdateSleepTime JetAIUpdate::update()
 		chooseLocomotorSet(d->m_returningLoco);
 	}
 
-	
+
 	if( !jet->isKindOf( KINDOF_PRODUCED_AT_HELIPAD ) )
 	{
 		Drawable *draw = jet->getDrawable();
 		if( draw )
 		{
-			if( getFlag(TAKEOFF_IN_PROGRESS) 
-					|| getFlag(LANDING_IN_PROGRESS) 
-					|| getObject()->isSignificantlyAboveTerrain() 
-					|| isMoving() 
+			if( getFlag(TAKEOFF_IN_PROGRESS)
+					|| getFlag(LANDING_IN_PROGRESS)
+					|| getObject()->isSignificantlyAboveTerrain()
+					|| isMoving()
 					|| isWaitingForPath() )
 			{
 				if( !m_enginesOn )
 				{
-					//We just started moving, therefore turn on the engines!			
+					//We just started moving, therefore turn on the engines!
 					draw->enableAmbientSound( TRUE );
 					m_enginesOn = TRUE;
 				}
@@ -2104,7 +2232,7 @@ void JetAIUpdate::pruneDeadTargeters()
 {
 	if (!m_targetedBy.empty())
 	{
-		for (std::list<ObjectID>::iterator it = m_targetedBy.begin(); it != m_targetedBy.end(); /* empty */ ) 
+		for (std::list<ObjectID>::iterator it = m_targetedBy.begin(); it != m_targetedBy.end(); /* empty */ )
 		{
 			if (TheGameLogic->findObjectByID(*it) == NULL)
 			{
@@ -2162,7 +2290,7 @@ void JetAIUpdate::positionLockon()
 	Bool lastPhase = ((Int)(factor * elapsedTimeSumPrev) & 1) != 0;
 	Bool thisPhase = ((Int)(factor * elapsedTimeSumCurr) & 1) != 0;
 
-	if (lastPhase && (!thisPhase)) 
+	if (lastPhase && (!thisPhase))
 	{
 		AudioEventRTS lockonSound = TheAudio->getMiscAudio()->m_lockonTickSound;
 		lockonSound.setObjectID(getObject()->getID());
@@ -2207,7 +2335,7 @@ void JetAIUpdate::addTargeter(ObjectID id, Bool add)
 		{
 			if (it == m_targetedBy.end())
 			{
-				m_targetedBy.push_back(id); 
+				m_targetedBy.push_back(id);
 				if (m_untargetableExpireFrame == 0 && m_targetedBy.size() == 1)
 				{
 					m_untargetableExpireFrame = TheGameLogic->getFrame() + lockonTime;
@@ -2219,7 +2347,7 @@ void JetAIUpdate::addTargeter(ObjectID id, Bool add)
 		{
 			if (it != m_targetedBy.end())
 			{
-				m_targetedBy.erase(it); 
+				m_targetedBy.erase(it);
 				if (m_targetedBy.empty())
 				{
 					m_untargetableExpireFrame = 0;
@@ -2316,7 +2444,7 @@ void JetAIUpdate::doLandingCommand(Object *airfield, CommandSourceType cmdSource
 		ParkingPlaceBehaviorInterface* pp = (*i)->getParkingPlaceBehaviorInterface();
 		if (pp == NULL)
 			continue;
-		
+
 		if (getObject()->isKindOf(KINDOF_PRODUCED_AT_HELIPAD) ||
 				pp->reserveSpace(getObject()->getID(), friend_getParkingOffset(), NULL))
 		{
@@ -2408,7 +2536,7 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 
 	if (!isAllowedToRespondToAiCommands(parms))
 		return;
-		
+
 	// note that we always store this, even if nothing will be "pending".
 	m_mostRecentCommand.store(*parms);
 
@@ -2449,8 +2577,8 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 				// if we're already parked at the airfield in question, just ignore.
 				if (isParkedAt(parms->m_obj))
 					return;
-			
-				// else fall thru to the default case!
+
+				FALLTHROUGH; // else fall thru to the default case!
 
 			default:
 			{
@@ -2461,7 +2589,7 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 				getStateMachine()->clear();
 				setLastCommandSource( CMD_FROM_AI );
 				getStateMachine()->setState( TAKING_OFF_AWAIT_CLEARANCE );
-				
+
 				return;
 			}
 		}
@@ -2486,9 +2614,9 @@ void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
 }
 
 //-------------------------------------------------------------------------------------------------
-void JetAIUpdate::friend_setAllowAirLoco(Bool allowAirLoco) 
-{ 
-	setFlag(ALLOW_AIR_LOCO, allowAirLoco); 
+void JetAIUpdate::friend_setAllowAirLoco(Bool allowAirLoco)
+{
+	setFlag(ALLOW_AIR_LOCO, allowAirLoco);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2521,8 +2649,8 @@ void JetAIUpdate::friend_addWaypointToGoalPath( const Coord3D &bestPos )
 }
 
 //-------------------------------------------------------------------------------------------------
-AICommandType JetAIUpdate::friend_getPendingCommandType() const 
-{ 
+AICommandType JetAIUpdate::friend_getPendingCommandType() const
+{
 	if( getFlag( HAS_PENDING_COMMAND ) )
 	{
 		return m_mostRecentCommand.getCommandType();
@@ -2543,7 +2671,7 @@ void JetAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -2557,7 +2685,7 @@ void JetAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 2;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -2579,7 +2707,7 @@ void JetAIUpdate::xfer( Xfer *xfer )
 		drawName = m_lockonDrawable->getTemplate()->getName();
 	}
 	xfer->xferAsciiString(&drawName);
-	if (drawName.isNotEmpty() && m_lockonDrawable==NULL) 
+	if (drawName.isNotEmpty() && m_lockonDrawable==NULL)
 	{
 		const ThingTemplate* tt = TheThingFactory->findTemplate(drawName);
 		if (tt)
@@ -2606,7 +2734,7 @@ void JetAIUpdate::xfer( Xfer *xfer )
 		}
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2626,4 +2754,4 @@ void JetAIUpdate::loadPostProcess( void )
 
 	// extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp
index 657593267d9..385fadf28e4 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp
@@ -26,7 +26,7 @@
 // Author: Michael S. Booth, December 2001
 // Desc:   Implementation of missile behavior
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Thing.h"
 #include "Common/ThingTemplate.h"
@@ -52,11 +52,6 @@
 
 const Real BIGNUM = 99999.0f;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -76,7 +71,7 @@ MissileAIUpdateModuleData::MissileAIUpdateModuleData()
 	m_detonateOnNoFuel = FALSE;
 	m_garrisonHitKillCount = 0;
 	m_garrisonHitKillFX = NULL;
-	m_lockDistance = 75.0f;	
+	m_lockDistance = 75.0f;
 	m_distanceScatterWhenJammed = 75.0f;
     m_detonateCallsKill = FALSE;
     m_killSelfDelay   = 3; // just long enough for the contrail to catch up to me
@@ -87,7 +82,7 @@ void MissileAIUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   AIUpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "TryToFollowTarget",			INI::parseBool,		NULL, offsetof( MissileAIUpdateModuleData, m_tryToFollowTarget ) },
 		{ "FuelLifetime",						INI::parseDurationUnsignedInt,		NULL, offsetof( MissileAIUpdateModuleData, m_fuelLifetime ) },
@@ -141,7 +136,7 @@ MissileAIUpdate::MissileAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 	m_framesTillDecoyed = 0;
 	m_noDamage = FALSE;
 	m_isJammed = FALSE;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 MissileAIUpdate::~MissileAIUpdate()
@@ -186,11 +181,11 @@ void MissileAIUpdate::switchToState(MissileStateType s)
 // Prepares the missile for launch via proper weapon-system channels.
 //-------------------------------------------------------------------------------------------------
 void MissileAIUpdate::projectileLaunchAtObjectOrPosition(
-	const Object *victim, 
-	const Coord3D* victimPos, 
-	const Object *launcher, 
-	WeaponSlotType wslot, 
-	Int specificBarrelToUse, 
+	const Object *victim,
+	const Coord3D* victimPos,
+	const Object *launcher,
+	WeaponSlotType wslot,
+	Int specificBarrelToUse,
 	const WeaponTemplate* detWeap,
 	const ParticleSystemTemplate* exhaustSysOverride
 )
@@ -278,7 +273,7 @@ void MissileAIUpdate::projectileFireAtObjectOrPosition( const Object *victim, co
 		// ick. const-cast is evil. fix. (srj)
  		aiMoveToObject(const_cast<Object*>(victim), CMD_FROM_AI );
 		m_originalTargetPos = *victim->getPosition();
-		m_isTrackingTarget = TRUE;// Remember that I was originally shot at a moving object, so if the 
+		m_isTrackingTarget = TRUE;// Remember that I was originally shot at a moving object, so if the
 		// target dies I can do something cool.
 		m_victimID = victim->getID();
 	}
@@ -329,11 +324,11 @@ Bool MissileAIUpdate::projectileHandleCollision( Object *other )
 	if (other != NULL)
 	{
  		Object *projectileLauncher = TheGameLogic->findObjectByID( projectileGetLauncherID() );
- 				
+
  		// if it's not the specific thing we were targeting, see if we should incidentally collide...
  		if (!m_detonationWeaponTmpl->shouldProjectileCollideWith(projectileLauncher, obj, other, m_victimID))
 		{
-			//DEBUG_LOG(("ignoring projectile collision with %s at frame %d\n",other->getTemplate()->getName().str(),TheGameLogic->getFrame()));
+			//DEBUG_LOG(("ignoring projectile collision with %s at frame %d",other->getTemplate()->getName().str(),TheGameLogic->getFrame()));
 			return true;
 		}
 
@@ -353,15 +348,15 @@ Bool MissileAIUpdate::projectileHandleCollision( Object *other )
 						Object* thingToKill = *it++;
 						if (!thingToKill->isEffectivelyDead() && thingToKill->isKindOfMulti(d->m_garrisonHitKillKindof, d->m_garrisonHitKillKindofNot))
 						{
-							//DEBUG_LOG(("Killed a garrisoned unit (%08lx %s) via Flash-Bang!\n",thingToKill,thingToKill->getTemplate()->getName().str()));
+							//DEBUG_LOG(("Killed a garrisoned unit (%08lx %s) via Flash-Bang!",thingToKill,thingToKill->getTemplate()->getName().str()));
 							if (projectileLauncher)
 								projectileLauncher->scoreTheKill( thingToKill );
 							thingToKill->kill();
 							++numKilled;
 						}
-					} // next contained item
-				} // if items
-				
+					}
+				}
+
 				if (numKilled > 0)
 				{
 					// note, fx is played at center of building, not at grenade's location
@@ -369,10 +364,10 @@ Bool MissileAIUpdate::projectileHandleCollision( Object *other )
 
 					// don't do the normal explosion; just destroy ourselves & return
 					TheGameLogic->destroyObject(obj);
-					
+
 					return true;
 				}
-			}	// if a garrisonable thing
+			}
 		}
 	}
 
@@ -391,9 +386,9 @@ void MissileAIUpdate::detonate()
 
 	if (m_detonationWeaponTmpl)
 	{
-		
+
 		TheWeaponStore->handleProjectileDetonation(m_detonationWeaponTmpl, obj, obj->getPosition(), m_extraBonusFlags, !m_noDamage );
-	
+
 		if( m_detonationWeaponTmpl->getDieOnDetonate() )
 		{
 			DamageInfo damageInfo;
@@ -438,18 +433,18 @@ void MissileAIUpdate::doKillSelfState()
 {
   const MissileAIUpdateModuleData *modData = getMissileAIUpdateModuleData();
 
-	if (m_stateTimestamp > TheGameLogic->getFrame() - modData->m_killSelfDelay ) 
+	if (m_stateTimestamp > TheGameLogic->getFrame() - modData->m_killSelfDelay )
   {
 		// Hold in this state [modData->m_killSelfDelay] frames to let the contrail catch up. jba.
 		return;
 	}
 	Object* obj = getObject();
-	if (m_detonationWeaponTmpl)	
+	if (m_detonationWeaponTmpl)
   {
     if ( modData->m_detonateCallsKill )
       obj->kill(); // kill it (vs destroying it) so that its Die modules are called
-    else  
-		  TheGameLogic->destroyObject( obj );	
+    else
+		  TheGameLogic->destroyObject( obj );
 	}
 	switchToState(DEAD);
 }
@@ -499,7 +494,7 @@ void MissileAIUpdate::doIgnitionState()
 
 //-------------------------------------------------------------------------------------------------
 void MissileAIUpdate::doAttackState(Bool turnOK)
-{	
+{
 	Locomotor* curLoco = getCurLocomotor();
 
 	const MissileAIUpdateModuleData* d = getMissileAIUpdateModuleData();
@@ -547,10 +542,10 @@ void MissileAIUpdate::doAttackState(Bool turnOK)
 					// Ground pos.  Change to original goal.
 					aiMoveToPosition(&m_originalTargetPos, CMD_FROM_AI );
 				}
-				switchToState(KILL); 
+				switchToState(KILL);
 				return;
 			}
-		} 
+		}
 	}
 
 	if(curLoco && curLoco->getPreferredHeight() > 0)
@@ -579,7 +574,7 @@ void MissileAIUpdate::doAttackState(Bool turnOK)
 
 //-------------------------------------------------------------------------------------------------
 void MissileAIUpdate::doKillState(void)
-{		 
+{
 	if (TheGameLogic->getFrame() >= m_fuelExpirationDate)
 	{
 		if( getMissileAIUpdateModuleData()->m_detonateOnNoFuel )
@@ -597,7 +592,7 @@ void MissileAIUpdate::doKillState(void)
 		"Cheat" and move directly towards the target.  This ensures that the missile will hit.
 		jba. */
 	Locomotor* curLoco = getCurLocomotor();
-	Object *obj = getObject();	
+	Object *obj = getObject();
 	// Objects that are braking don't follow the normal physics, so they end up at their destination exactly.
 	obj->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_BRAKING ) );
 
@@ -616,7 +611,7 @@ void MissileAIUpdate::doKillState(void)
 				closeEnough = curLoco->getMaxSpeedForCondition(BODY_PRISTINE);
 			}
 			Real distanceToTargetSq = ThePartitionManager->getDistanceSquared( getObject(), getGoalObject(), FROM_BOUNDINGSPHERE_3D);
-			//DEBUG_LOG(("Distance to target %f, closeEnough %f\n", sqrt(distanceToTargetSq), closeEnough));
+			//DEBUG_LOG(("Distance to target %f, closeEnough %f", sqrt(distanceToTargetSq), closeEnough));
 			if (distanceToTargetSq < closeEnough*closeEnough) {
 				Coord3D pos = *getGoalObject()->getPosition();
 				getObject()->setPosition(&pos);
@@ -636,7 +631,7 @@ void MissileAIUpdate::doKillState(void)
 
 //-------------------------------------------------------------------------------------------------
 void MissileAIUpdate::doDeadState()
-{	
+{
 	Locomotor* curLoco = getCurLocomotor();
 	if (curLoco)
 	{
@@ -677,15 +672,15 @@ UpdateSleepTime MissileAIUpdate::update()
 				// ick. const-cast is evil. fix. (srj)
  				aiMoveToObject(const_cast<Object*>(victim), CMD_FROM_AI );
 				m_originalTargetPos = *victim->getPosition();
-				m_isTrackingTarget = TRUE;// Remember that I was originally shot at a moving object, so if the 
+				m_isTrackingTarget = TRUE;// Remember that I was originally shot at a moving object, so if the
 				// target dies I can do something cool.
 				m_victimID = victim->getID();
 			}
 		}
 	}
 
-	if (newPos.z < 0) 
-	{	 
+	if (newPos.z < 0)
+	{
 		// we ended up under the world.  go away.
 		TheGameLogic->destroyObject(getObject());
 		return UPDATE_SLEEP_FOREVER;
@@ -707,6 +702,8 @@ UpdateSleepTime MissileAIUpdate::update()
 			{
 				break;
 			}
+			FALLTHROUGH;
+
 		case IGNITION:
 			doIgnitionState();
 			break;
@@ -772,7 +769,7 @@ UpdateSleepTime MissileAIUpdate::update()
 
 //-------------------------------------------------------------------------------------------------
 Bool MissileAIUpdate::processCollision(PhysicsBehavior *physics, Object *other)
-/* Returns true if the physics collide should apply the force.  Normally not.  
+/* Returns true if the physics collide should apply the force.  Normally not.
 Also determines whether objects are blocked, and if so, if they are stuck.  jba.*/
 {
 	// Missiles dont' get blocked by other objects.
@@ -816,15 +813,15 @@ void MissileAIUpdate::projectileNowJammed()
 	Real scatter = data->m_distanceScatterWhenJammed;
 	targetPosition.x += GameLogicRandomValue(-scatter, scatter);
 	targetPosition.y += GameLogicRandomValue(-scatter, scatter);
-	targetPosition.z = TheTerrainLogic->getLayerHeight(	targetPosition.x, 
-																											targetPosition.y, 
+	targetPosition.z = TheTerrainLogic->getLayerHeight(	targetPosition.x,
+																											targetPosition.y,
 																											TheTerrainLogic->getHighestLayerForDestination(&targetPosition) );
 
 	getStateMachine()->setGoalObject(NULL);
 	// Projectiles are expressly forbidden from getting AIIdle.  Who am I to argue.
-	// I need to do something though, because I can no longer give a new move command 
+	// I need to do something though, because I can no longer give a new move command
 	// while moving because of the big state machine crash fix.
-	// 
+	//
 	aiMoveToPosition( &targetPosition, CMD_FROM_AI );
 
 	m_isTrackingTarget = FALSE;
@@ -839,7 +836,7 @@ void MissileAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -852,7 +849,7 @@ void MissileAIUpdate::xfer( Xfer *xfer )
   const XferVersion currentVersion = 6;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -871,23 +868,23 @@ void MissileAIUpdate::xfer( Xfer *xfer )
 	xfer->xferReal(&m_maxAccel);
 
 	AsciiString weaponName;
-	if (m_detonationWeaponTmpl) 
+	if (m_detonationWeaponTmpl)
 	{
 		weaponName = m_detonationWeaponTmpl->getName();
 	}
 	xfer->xferAsciiString(&weaponName);
-	if (weaponName.isNotEmpty() && m_detonationWeaponTmpl == NULL) 
+	if (weaponName.isNotEmpty() && m_detonationWeaponTmpl == NULL)
 	{
 		m_detonationWeaponTmpl = TheWeaponStore->findWeaponTemplate(weaponName);
 	}
 
 	AsciiString exhaustName;
-	if (m_exhaustSysTmpl) 
+	if (m_exhaustSysTmpl)
 	{
 		exhaustName = m_exhaustSysTmpl->getName();
 	}
 	xfer->xferAsciiString(&exhaustName);
-	if (exhaustName.isNotEmpty() && m_exhaustSysTmpl == NULL) 
+	if (exhaustName.isNotEmpty() && m_exhaustSysTmpl == NULL)
 	{
 		m_exhaustSysTmpl = TheParticleSystemManager->findTemplate(exhaustName);
 	}
@@ -914,7 +911,7 @@ void MissileAIUpdate::xfer( Xfer *xfer )
 	if( version>= 6 )
 		xfer->xferBool( &m_isJammed );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -923,4 +920,4 @@ void MissileAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/POWTruckAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/POWTruckAIUpdate.cpp
index 1ebe3ba2df8..2939167495a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/POWTruckAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/POWTruckAIUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/GlobalData.h"
@@ -58,14 +58,14 @@ POWTruckAIUpdateModuleData::POWTruckAIUpdateModuleData( void )
 	m_boredTimeInFrames = 0;
 	m_hangAroundPrisonDistance = 0;
 
-}  // end POWTruckAIUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 void POWTruckAIUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
   AIUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "BoredTime",					INI::parseDurationUnsignedInt,	NULL, offsetof( POWTruckAIUpdateModuleData, m_boredTimeInFrames ) },
 		{ "AtPrisonDistance",		INI::parseReal,		NULL,		offsetof( POWTruckAIUpdateModuleData, m_hangAroundPrisonDistance ) },
@@ -74,7 +74,7 @@ void POWTruckAIUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
@@ -83,7 +83,7 @@ void POWTruckAIUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 POWTruckAIUpdate::POWTruckAIUpdate( Thing *thing, const ModuleData *moduleData )
-								: AIUpdateInterface( thing, moduleData )              
+								: AIUpdateInterface( thing, moduleData )
 {
 
 	m_aiMode = AUTOMATIC;
@@ -93,21 +93,21 @@ POWTruckAIUpdate::POWTruckAIUpdate( Thing *thing, const ModuleData *moduleData )
 	m_enteredWaitingFrame = 0;
 	m_lastFindFrame = 0;
 
-}  // end POWTruckAIUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 POWTruckAIUpdate::~POWTruckAIUpdate( void )
 {
 
-}  // end ~POWTruckAIUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void POWTruckAIUpdate::onDelete( void )
 {
 
-}  // end onDelete
+}
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -127,7 +127,7 @@ void POWTruckAIUpdate::aiDoCommand( const AICommandParms *parms )
 		// set our task to waiting
 		setTask( POW_TRUCK_TASK_WAITING );
 
-	}  // end if
+	}
 
 	switch( parms->m_cmd )
 	{
@@ -139,7 +139,7 @@ void POWTruckAIUpdate::aiDoCommand( const AICommandParms *parms )
 			privatePickUpPrisoner( parms->m_obj, parms->m_cmdSource );
 			break;
 
-		}  // end pick up prisoner
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case AICMD_RETURN_PRISONERS:
@@ -148,7 +148,7 @@ void POWTruckAIUpdate::aiDoCommand( const AICommandParms *parms )
 			privateReturnPrisoners( parms->m_obj, parms->m_cmdSource );
 			break;
 
-		}  // end return prisoners
+		}
 
 		// --------------------------------------------------------------------------------------------
 		default:
@@ -158,11 +158,11 @@ void POWTruckAIUpdate::aiDoCommand( const AICommandParms *parms )
 			AIUpdateInterface::aiDoCommand( parms );
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch( parms->m_cmd )
+	}
 
-}  // end aiDoCommand
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -198,14 +198,14 @@ UpdateSleepTime POWTruckAIUpdate::update( void )
 			updateReturnPrisoners();
 			break;
 		default:
-			DEBUG_CRASH(( "POWTruckAIUpdate::update - Unknown current task '%d'\n", m_currentTask ));
+			DEBUG_CRASH(( "POWTruckAIUpdate::update - Unknown current task '%d'", m_currentTask ));
 			break;
 
-	}  // end switch, current task
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PROTECTED //////////////////////////////////////////////////////////////////////////////////////
@@ -219,15 +219,15 @@ void POWTruckAIUpdate::setTask( POWTruckTask task, Object *taskObject )
 	POWTruckTask oldTask = m_currentTask;
 
 	// sanity, POW_TRUCK_TASK_COLLECTING_TARGET and POW_TRUCK_TASK_RETURNING_PRISONERS require taskObject parameters
-	if( (task == POW_TRUCK_TASK_COLLECTING_TARGET || task == POW_TRUCK_TASK_RETURNING_PRISONERS) && 
+	if( (task == POW_TRUCK_TASK_COLLECTING_TARGET || task == POW_TRUCK_TASK_RETURNING_PRISONERS) &&
 			taskObject == NULL )
 	{
 
-		DEBUG_CRASH(( "POWTruckAIUpdate::setTask - Illegal arguments\n" ));
+		DEBUG_CRASH(( "POWTruckAIUpdate::setTask - Illegal arguments" ));
 		setTask( POW_TRUCK_TASK_WAITING );
 		return;
 
-	}  // end if
+	}
 
 	// when leaving the collecting target state, we need to do some bookeeping
 	if( oldTask == POW_TRUCK_TASK_COLLECTING_TARGET )
@@ -236,7 +236,7 @@ void POWTruckAIUpdate::setTask( POWTruckTask task, Object *taskObject )
 		// target cleanup
 		m_targetID = INVALID_ID;
 
-	}  // end if
+	}
 
 	// to be clean, when leaving the POW_TRUCK_TASK_RETURNING_PRISONERS state, clear out the prison ID we were watching
 	if( oldTask == POW_TRUCK_TASK_RETURNING_PRISONERS )
@@ -250,33 +250,33 @@ void POWTruckAIUpdate::setTask( POWTruckTask task, Object *taskObject )
 		m_targetID = taskObject->getID();
 
 		// mark this target as slated for pickup
-		DEBUG_ASSERTCRASH( taskObject->getAIUpdateInterface(), ("POWTruckAIUpdate::setTask - '%s' has no ai module\n",
+		DEBUG_ASSERTCRASH( taskObject->getAIUpdateInterface(), ("POWTruckAIUpdate::setTask - '%s' has no ai module",
 													 taskObject->getTemplate()->getName().str()) );
 
-	}  // end if
+	}
 	else if( task == POW_TRUCK_TASK_RETURNING_PRISONERS )
 	{
 
 		// save ID of the prison we're going to
 		m_prisonID = taskObject->getID();
 
-	}  // end else
+	}
 	else if( task == POW_TRUCK_TASK_WAITING )
 	{
 
 		// mark the frame and always go idle
 		m_enteredWaitingFrame = TheGameLogic->getFrame();
 
-	}  // end else if
+	}
 
 	// store the new current task
 	m_currentTask = task;
 
-}  // end task
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Set this unit into automatic or manual AI mode, when automatic the AI will look for 
-	* prisoners, collect them, and bring them back automatically.  When in manual, the 
+/** Set this unit into automatic or manual AI mode, when automatic the AI will look for
+	* prisoners, collect them, and bring them back automatically.  When in manual, the
 	* player must direct the actions of the unit explicitly */
 // ------------------------------------------------------------------------------------------------
 void POWTruckAIUpdate::setAIMode( POWTruckAIMode mode )
@@ -285,7 +285,7 @@ void POWTruckAIUpdate::setAIMode( POWTruckAIMode mode )
 	// save the mode
 	m_aiMode = mode;
 
-}  // end setAIModel
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -317,7 +317,7 @@ void POWTruckAIUpdate::privatePickUpPrisoner( Object *prisoner, CommandSourceTyp
 		getCurLocomotor()->setUltraAccurate( TRUE );
 	aiMoveToObject( prisoner, CMD_FROM_AI );
 
-}  // end privatePickUpPrisoner
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -344,7 +344,7 @@ void POWTruckAIUpdate::privateReturnPrisoners( Object *prison, CommandSourceType
 		getCurLocomotor()->setUltraAccurate( TRUE );
 	aiDock( prison, cmdSource );
 
-}  // end privateReturnPrisoners
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -358,7 +358,7 @@ void POWTruckAIUpdate::updateWaiting( void )
 	// get our info
 	Object *us = getObject();
 	AIUpdateInterface *ai = us->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::updateWaiting - '%s' has no ai\n",
+	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::updateWaiting - '%s' has no ai",
 													us->getTemplate()->getName().str()) );
 
 	//
@@ -376,7 +376,7 @@ void POWTruckAIUpdate::updateWaiting( void )
 	if( TheGameLogic->getFrame() - m_enteredWaitingFrame > modData->m_boredTimeInFrames )
 		setTask( POW_TRUCK_TASK_FIND_TARGET );
 
-}  // updateWaiting
+}
 
 static const UnsignedInt FIND_DELAY = LOGICFRAMES_PER_SECOND * 1;
 // ------------------------------------------------------------------------------------------------
@@ -385,7 +385,7 @@ void POWTruckAIUpdate::updateFindTarget( void )
 {
 
 	// we never find targets when in manual ai mode
-	DEBUG_ASSERTCRASH( m_aiMode != MANUAL, ("POWTruckAIUpdate::updateFindTarget - We shouldn't be here with a manual ai mode\n") );
+	DEBUG_ASSERTCRASH( m_aiMode != MANUAL, ("POWTruckAIUpdate::updateFindTarget - We shouldn't be here with a manual ai mode") );
 	if( m_aiMode == MANUAL )
 		return;
 
@@ -399,7 +399,7 @@ void POWTruckAIUpdate::updateFindTarget( void )
 	// get our info
 	Object *us = getObject();
 	AIUpdateInterface *ai = us->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::updateFindTarget - '%s' has no ai\n",
+	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::updateFindTarget - '%s' has no ai",
 													us->getTemplate()->getName().str()) );
 
 	// if we're full we should return to prison
@@ -410,7 +410,7 @@ void POWTruckAIUpdate::updateFindTarget( void )
 		doReturnPrisoners();
 		return;
 
-	}  // end if
+	}
 
 	// find closest target not already targeted for pickup by another POW truck
 	Object *target = findBestTarget();
@@ -418,23 +418,23 @@ void POWTruckAIUpdate::updateFindTarget( void )
 	// if target exists, go get it
 	if( target )
 	{
-		
+
 		// send the pickup command
 		ai->aiPickUpPrisoner( target, CMD_FROM_AI );
 
-	}  // end if
+	}
 	else
 	{
-	
+
 		// no target exists, if we have prisoners return them
 		if( contain->getContainCount() != 0 )
 			doReturnPrisoners();
 		else
 			doReturnToPrison( NULL );
 
-	}  // end else
-			
-}  // end updateFindTarget
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -454,7 +454,7 @@ void POWTruckAIUpdate::updateCollectingTarget( void )
 
 		return;
 
-	}  // end if
+	}
 
 	// we should never become idle while collecting a target, if we do, find a target
 	Object *us = getObject();
@@ -467,7 +467,7 @@ void POWTruckAIUpdate::updateCollectingTarget( void )
 		else
 			setTask( POW_TRUCK_TASK_WAITING );
 
-	}  // end if
+	}
 
 /*
 	//
@@ -487,12 +487,12 @@ void POWTruckAIUpdate::updateCollectingTarget( void )
 			// tell them to start moving to us
 			targetAI->aiMoveToObject( us, CMD_FROM_AI );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 */
 
-}  // end updateCollectingTarget
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -510,7 +510,7 @@ static void putContainedInPrison( Object *obj, void *userData )
 
 	// sanity
 	DEBUG_ASSERTCRASH( returnData != NULL && returnData->source != NULL && returnData->dest != NULL,
-										 ("putContainedInPrison: Invalid arguments\n") );
+										 ("putContainedInPrison: Invalid arguments") );
 
 	// take 'obj' out of the source
 	ContainModuleInterface *sourceContain = returnData->source->getContain();
@@ -526,7 +526,7 @@ static void putContainedInPrison( Object *obj, void *userData )
 		destContain->addToContain( obj );
 	}
 
-}  // end putContainedInPrison
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -534,12 +534,12 @@ void POWTruckAIUpdate::updateReturnPrisoners( void )
 {
 	Object *us = getObject();
 	AIUpdateInterface *ai = us->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::updateReturnPrisoners - '%s' has no AI\n",
+	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::updateReturnPrisoners - '%s' has no AI",
 												 us->getTemplate()->getName().str()) );
 
 	// get the prison we're returning to
 	Object *prison = TheGameLogic->findObjectByID( m_prisonID );
-	
+
 	// prison has gone away, do this all over again
 	if( prison == NULL )
 	{
@@ -547,13 +547,13 @@ void POWTruckAIUpdate::updateReturnPrisoners( void )
 		doReturnPrisoners();
 		return;
 
-	}  // end if
+	}
 
 	// we should not go idle, we should collide with the prison to return the prisoners
 	if( ai->isIdle() )
 		doReturnPrisoners();
 
-}  // end updateReturnPrisoners
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Is the object 'target' a valid target for collection */
@@ -563,14 +563,14 @@ Bool POWTruckAIUpdate::validateTarget( const Object *target )
 
 	return TheActionManager->canPickUpPrisoner( getObject(), target, getLastCommandSource() );
 
-}  // end validateTarget
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Initiate a return prisoners contained in us to prison */
 // ------------------------------------------------------------------------------------------------
 void POWTruckAIUpdate::doReturnPrisoners( void )
 {
-	
+
 	// find the closest prison
 	Object *prison = findBestPrison();
 
@@ -581,16 +581,16 @@ void POWTruckAIUpdate::doReturnPrisoners( void )
 		setTask( POW_TRUCK_TASK_WAITING );
 		return;
 
-	}  // end if
+	}
 
 	// start the prisoner return process
 	Object *us = getObject();
 	AIUpdateInterface *ai = us->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::doReturnPrisoners - '%s' has no AI\n",
+	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::doReturnPrisoners - '%s' has no AI",
 												 us->getTemplate()->getName().str()) );
 	ai->aiReturnPrisoners( prison, CMD_FROM_AI );
 
-}  // end doReturnPrisoners
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Initate a return of our empty truck back near the closest prison */
@@ -624,7 +624,7 @@ void POWTruckAIUpdate::doReturnToPrison( Object *prison )
 	// dock us with the prison
 	aiDock( prison, CMD_FROM_AI );
 
-}  // end doReturnToPrison
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Find the best prison for us to use given our current position */
@@ -641,7 +641,7 @@ Object *POWTruckAIUpdate::findBestPrison( void )
 
 	return prison;
 
-}  // end findBestPrison
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Find the best prisoner for us to go pick up given our current situation */
@@ -657,7 +657,7 @@ Object *POWTruckAIUpdate::findBestTarget( void )
 
 	// get our info
 	const AIUpdateInterface *ai = us->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::findBestTarget- '%s' has no AI\n",
+	DEBUG_ASSERTCRASH( ai, ("POWTruckAIUpdate::findBestTarget- '%s' has no AI",
 												 us->getTemplate()->getName().str()) );
 
 	// scan all objects, there is no range
@@ -679,13 +679,13 @@ Object *POWTruckAIUpdate::findBestTarget( void )
 			continue;
 
 		// is this target closer than the one we've found so far
-		Real distSq = ThePartitionManager->getDistanceSquared( us, other, FROM_CENTER_2D ); 
+		Real distSq = ThePartitionManager->getDistanceSquared( us, other, FROM_CENTER_2D );
 		if( closestTarget == NULL || distSq < closestTargetDistSq )
 		{
 
-			// we must be able to pathfind to this target 
+			// we must be able to pathfind to this target
 			if( TheAI->pathfinder()->quickDoesPathExist( ai->getLocomotorSet(),
-																							us->getPosition(), 
+																							us->getPosition(),
 																							other->getPosition() ) == TRUE )
 			{
 
@@ -693,15 +693,15 @@ Object *POWTruckAIUpdate::findBestTarget( void )
 				closestTarget = other;
 				closestTargetDistSq = distSq;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end for other
+	}
 
 	return closestTarget;
 
-}  // end findBestTarget
+}
 
 // ------------------------------------------------------------------------------------------------
 /** We are chosing to pass a structure through the iterate function to unload the
@@ -727,9 +727,9 @@ static void putPrisonersInPrison( Object *obj, void *userData )
 	Object *prison = prisonUnloadData->destPrison;
 
 	// sanity
-	DEBUG_ASSERTCRASH( prison, ("putPrisonersInPrison: NULL user data\n") );
+	DEBUG_ASSERTCRASH( prison, ("putPrisonersInPrison: NULL user data") );
 	DEBUG_ASSERTCRASH( obj->getContainedBy() != NULL,
-										 ("putPrisonersInPrison: Prisoner '%s' is not contained by anything, it should be contained by a POW truck\n",
+										 ("putPrisonersInPrison: Prisoner '%s' is not contained by anything, it should be contained by a POW truck",
 										 obj->getTemplate()->getName().str()) );
 
 	// extra super sanity, just so that we don't crash ... this is in the assert above
@@ -752,10 +752,10 @@ static void putPrisonersInPrison( Object *obj, void *userData )
 
 	// add up bounty for this prisoner
 	Player *prisonerOwningPlayer = obj->getControllingPlayer();
-	prisonUnloadData->bounty += TheGlobalData->m_prisonBountyMultiplier * 
+	prisonUnloadData->bounty += TheGlobalData->m_prisonBountyMultiplier *
 															obj->getTemplate()->calcCostToBuild( prisonerOwningPlayer );
 
-}  // end putPrisonersInPrison
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -771,15 +771,15 @@ void POWTruckAIUpdate::unloadPrisonersToPrison( Object *prison )
 	ContainModuleInterface *truckContain = us->getContain();
 
 	// sanity
-	DEBUG_ASSERTCRASH( prison->getContain(), ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no contain\n",
+	DEBUG_ASSERTCRASH( prison->getContain(), ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no contain",
 																		prison->getTemplate()->getName().str()) );
-	DEBUG_ASSERTCRASH( prison->getContain()->asOpenContain(), 
-										 ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no OPEN contain\n",
+	DEBUG_ASSERTCRASH( prison->getContain()->asOpenContain(),
+										 ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no OPEN contain",
 										 prison->getTemplate()->getName().str()) );
-	DEBUG_ASSERTCRASH( truckContain, ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no contain\n",
+	DEBUG_ASSERTCRASH( truckContain, ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no contain",
 																	 us->getTemplate()->getName().str()) );
-	DEBUG_ASSERTCRASH( truckContain->asOpenContain(), 
-										 ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no OPEN contain\n",
+	DEBUG_ASSERTCRASH( truckContain->asOpenContain(),
+										 ("POWTruckAIUpdate::unloadPrisonersToPrison - '%s' has no OPEN contain",
 										 us->getTemplate()->getName().str()) );
 
 	// put the prisoners in the prison
@@ -801,7 +801,7 @@ void POWTruckAIUpdate::unloadPrisonersToPrison( Object *prison )
 
 			if( money )
 			{
-				
+
 				// deposit the money
 				money->deposit( prisonUnloadData.bounty );
 				player->getScoreKeeper()->addMoneyEarned( prisonUnloadData.bounty );
@@ -815,16 +815,16 @@ void POWTruckAIUpdate::unloadPrisonersToPrison( Object *prison )
 				moneyString.format( TheGameText->fetch( "GUI:AddCash" ), prisonUnloadData.bounty );
 				TheInGameUI->addFloatingText( moneyString, &pos, moneyColor );
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// set our state to waiting and become idle
 	setTask( POW_TRUCK_TASK_WAITING );
 
-}  // end unloadPrisonersToPrison
+}
 
 // ------------------------------------------------------------------------------------------------
 /** We have arrived at a prisoner to load into us ... do it */
@@ -850,7 +850,7 @@ void POWTruckAIUpdate::loadPrisoner( Object *prisoner )
 		doReturnPrisoners();
 		return;
 
-	}  // end if
+	}
 
 	// add object to our containment
 	contain->addToContain( prisoner );
@@ -870,7 +870,7 @@ void POWTruckAIUpdate::loadPrisoner( Object *prisoner )
 	else
 		setTask( POW_TRUCK_TASK_WAITING );
 
-}  // end loadPrisoner
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -879,7 +879,7 @@ void POWTruckAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -892,7 +892,7 @@ void POWTruckAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -903,7 +903,7 @@ void POWTruckAIUpdate::xfer( Xfer *xfer )
 	xfer->xferUnsignedInt(&m_enteredWaitingFrame);
 	xfer->xferUnsignedInt(&m_lastFindFrame);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -912,6 +912,6 @@ void POWTruckAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
 #endif
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailedTransportAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailedTransportAIUpdate.cpp
index de8638ed41c..46de82863b4 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailedTransportAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailedTransportAIUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/GameState.h"
@@ -45,7 +45,7 @@ static const Int INVALID_PATH = -1;
 RailedTransportAIUpdateModuleData::RailedTransportAIUpdateModuleData( void )
 {
 
-}  // end RailedTransportAIUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -53,7 +53,7 @@ void RailedTransportAIUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
   AIUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "PathPrefixName",		INI::parseAsciiString, NULL,	offsetof( RailedTransportAIUpdateModuleData, m_pathPrefixName ) },
 		{ 0, 0, 0, 0 }
@@ -61,12 +61,12 @@ void RailedTransportAIUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 RailedTransportAIUpdate::RailedTransportAIUpdate( Thing *thing, const ModuleData *moduleData )
-											 : AIUpdateInterface( thing, moduleData )              
+											 : AIUpdateInterface( thing, moduleData )
 {
 
 	m_inTransit = FALSE;
@@ -76,19 +76,19 @@ RailedTransportAIUpdate::RailedTransportAIUpdate( Thing *thing, const ModuleData
 		m_path[ i ].startWaypointID = 0;
 		m_path[ i ].endWaypointID = 0;
 
-	}  // end for i
+	}
 	m_numPaths = 0;
 	m_currentPath = INVALID_PATH;
 	m_waypointDataLoaded = FALSE;
 
-}  // end RailedTransportAIUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 RailedTransportAIUpdate::~RailedTransportAIUpdate( void )
 {
 
-}  // end ~RailedTransportAIUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -118,14 +118,14 @@ void RailedTransportAIUpdate::loadWaypointData( void )
 			m_path[ i ].endWaypointID = end->getID();
 			m_numPaths++;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// waypoint data is loaded
 	m_waypointDataLoaded = TRUE;
 
-}  // end loadWaypointData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -163,15 +163,15 @@ void RailedTransportAIUpdate::pickAndMoveToInitialLocation( void )
 				closestPath = i;
 				closestEndWaypoint = waypoint;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// a path must have been found
 	DEBUG_ASSERTCRASH( closestPath != INVALID_PATH,
-										 ("No suitable starting waypoint path could be found for '%s'\n",
+										 ("No suitable starting waypoint path could be found for '%s'",
 										 us->getTemplate()->getName().str()) );
 
 	// follow the waypoint path to its destination end point
@@ -183,7 +183,7 @@ void RailedTransportAIUpdate::pickAndMoveToInitialLocation( void )
 	// we are now "in transit"
 	setInTransit( TRUE );
 
-}  // end pickAndMoveToInitialLocation
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -203,7 +203,7 @@ UpdateSleepTime RailedTransportAIUpdate::update( void )
 	Locomotor *currentLocomotor = getCurLocomotor();
 	if( currentLocomotor )
 		currentLocomotor->setUltraAccurate( TRUE );
-	
+
 	//
 	// if we have no current path selected pick one and move to the end waypoint of that
 	// path.  this will set us up in an initial position at the end of the closest path
@@ -218,38 +218,45 @@ UpdateSleepTime RailedTransportAIUpdate::update( void )
 	//
 	if( m_inTransit )
 	{
-	
+
 		// sanity
 		DEBUG_ASSERTCRASH( m_currentPath != INVALID_PATH,
-											 ("RailedTransportAIUpdate: Invalid current path '%s'\n", m_currentPath) );
+											 ("RailedTransportAIUpdate: Invalid current path '%s'", m_currentPath) );
 
 		// get our target waypoint
 		Waypoint *waypoint = TheTerrainLogic->getWaypointByID( m_path[ m_currentPath ].endWaypointID );
-		
+
 		// sanity
-		DEBUG_ASSERTCRASH( waypoint, ("RailedTransportAIUpdate: Invalid target waypoint\n") );
-
-		// how far away are we from the target waypoint
-		const Coord3D *start = us->getPosition();
-		const Coord3D *end = waypoint->getLocation();
-		Coord3D v;
-		v.x = end->x - start->x;
-		v.y = end->y - start->y;
-		v.z = end->z - start->z;
-		Real dist = v.length();
-		if( dist <= 5.0f || isIdle() )
+		DEBUG_ASSERTCRASH( waypoint, ("RailedTransportAIUpdate: Invalid target waypoint") );
+
+		if (waypoint)
 		{
+			// how far away are we from the target waypoint
+			const Coord3D *start = us->getPosition();
+			const Coord3D *end = waypoint->getLocation();
+			Coord3D v;
+			v.x = end->x - start->x;
+			v.y = end->y - start->y;
+			v.z = end->z - start->z;
+			Real dist = v.length();
+			if( dist <= 5.0f || isIdle() )
+			{
 
-			// we are no longer in transit
-			setInTransit( FALSE );
+				// we are no longer in transit
+				setInTransit( FALSE );
 
-		}  // end if
+			}
+		}
+		else
+		{
+			setInTransit( FALSE );
+		}
 
-	}  // end if
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -261,15 +268,15 @@ void RailedTransportAIUpdate::aiDoCommand( const AICommandParms *parms )
 		return;
 
 	// we ignore all commands from the player except the one to start a transit and to unload
-	if( parms->m_cmdSource == CMD_FROM_PLAYER && 
+	if( parms->m_cmdSource == CMD_FROM_PLAYER &&
 			parms->m_cmd != AICMD_EXECUTE_RAILED_TRANSPORT &&
 			parms->m_cmd != AICMD_EVACUATE )
 		return;
 
 	// call the default do command
 	AIUpdateInterface::aiDoCommand( parms );
-	
-}  // end aiDoCommand
+
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE ////////////////////////////////////////////////////////////////////////////////////////
@@ -289,7 +296,7 @@ void RailedTransportAIUpdate::setInTransit( Bool inTransit )
 	// no longer in transit
 	m_inTransit = inTransit;
 
-}  // end setInTransit
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -317,7 +324,7 @@ void RailedTransportAIUpdate::privateExecuteRailedTransport( CommandSourceType c
 
 	// find the start waypoint for our current path
 	Waypoint *startWaypoint = TheTerrainLogic->getWaypointByID( m_path[ m_currentPath ].startWaypointID );
-	DEBUG_ASSERTCRASH( startWaypoint, ("RailedTransportAIUpdate: Start waypoint not found\n") );
+	DEBUG_ASSERTCRASH( startWaypoint, ("RailedTransportAIUpdate: Start waypoint not found") );
 
 	// follow this waypoint path
 	aiFollowWaypointPath( startWaypoint, CMD_FROM_AI );
@@ -325,7 +332,7 @@ void RailedTransportAIUpdate::privateExecuteRailedTransport( CommandSourceType c
 	// we are now in transit
 	setInTransit( TRUE );
 
-}  // end privateExecuteRailedTransport
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -358,7 +365,7 @@ void RailedTransportAIUpdate::privateEvacuate( Int exposeStealthUnits, CommandSo
 	// start the manual undocking process
 	rtdui->unloadAll();
 
-}  // end privateEvacuate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -367,7 +374,7 @@ void RailedTransportAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -379,7 +386,7 @@ void RailedTransportAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -397,7 +404,7 @@ void RailedTransportAIUpdate::xfer( Xfer *xfer )
 	xfer->xferInt(&m_currentPath);
 	xfer->xferBool(&m_waypointDataLoaded);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -406,4 +413,4 @@ void RailedTransportAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
index b6d70d045ac..4551ebea2e1 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc: The railroad track following railroad carriage/locomotive logic module
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	
+#include "PreRTS.h"
 
 #include "Common/Player.h"
 #include "Common/ThingFactory.h"
@@ -60,24 +60,19 @@ static const Int INVALID_PATH = -1;
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 #define FRAMES_UNPULLED_LONG_ENOUGH_TO_UNHITCH (2)
 
 
-void TrainTrack::incReference() 
-{ 
-	++m_refCount; 
+void TrainTrack::incReference()
+{
+	++m_refCount;
 }
 
-Bool TrainTrack::releaseReference() 
-{ 
-	return ( --m_refCount == 0 ); 
+Bool TrainTrack::releaseReference()
+{
+	return ( --m_refCount == 0 );
 }
 
 
@@ -88,7 +83,7 @@ RailroadBehaviorModuleData::RailroadBehaviorModuleData( void )
 	m_carriageTemplateNameData.clear();
 	m_pathPrefixName.clear();
 	m_CrashFXTemplateName.clear();
-	
+
 	m_isLocomotive = FALSE;
 	m_runningGarrisonSpeedMax = 1.0f;
 	m_killSpeedMin = 1.0f;
@@ -97,13 +92,13 @@ RailroadBehaviorModuleData::RailroadBehaviorModuleData( void )
 	m_braking = 0.99f;
 	m_friction = 0.97f;
 	m_waitAtStationTime = 150;
-}  // end RailroadBehaviorModuleData
+}
 
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-RailroadBehavior::RailroadBehavior( Thing *thing, const ModuleData *moduleData ) 
-											 : PhysicsBehavior( thing, moduleData )          
+RailroadBehavior::RailroadBehavior( Thing *thing, const ModuleData *moduleData )
+											 : PhysicsBehavior( thing, moduleData )
 {
 	const RailroadBehaviorModuleData *modData = getRailroadBehaviorModuleData();
 
@@ -148,17 +143,17 @@ RailroadBehavior::RailroadBehavior( Thing *thing, const ModuleData *moduleData )
 	m_waitAtStationTimer = 0;
 
 
-	
+
 	m_anchorWaypointID = INVALID_WAYPOINT_ID;
 
 	m_carriagesCreated = FALSE;
 	m_hasEverBeenHitched = FALSE;
 	m_trackDataLoaded = FALSE;
 	m_waitingInWings = TRUE;
-	m_endOfLine = FALSE;			
+	m_endOfLine = FALSE;
 	m_isLocomotive = modData->m_isLocomotive;
 	m_isLeadCarraige = m_isLocomotive;  // for now, I am the lead, only if I am the locomotive
-	m_wantsToBeLeadCarraige = FALSE; 
+	m_wantsToBeLeadCarraige = FALSE;
 	m_disembark = FALSE;
 	m_inTunnel = FALSE;
   m_held = FALSE;
@@ -167,7 +162,7 @@ RailroadBehavior::RailroadBehavior( Thing *thing, const ModuleData *moduleData )
 	m_conductorState = m_isLocomotive ? ACCELERATE : COAST;
 
 
-}  // end RailroadBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -185,12 +180,12 @@ RailroadBehavior::~RailroadBehavior( void )
 	}
 
 
-}  // end ~RailroadBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 
-Bool RailroadBehavior::isRailroad() const 
+Bool RailroadBehavior::isRailroad() const
 {
 	if ( ! m_track )
 		return FALSE;// I haven't even started yet!
@@ -247,7 +242,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 				other->kill();
 				obj->kill();//and I am dead, too
 			}
-			
+
 			return ;//// its a train, folks
 		}
 
@@ -264,7 +259,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 				other->isKindOf( KINDOF_REBUILD_HOLE ) )
 		{
 			playImpactSound(other, other->getPosition());
-			other->kill(); 
+			other->kill();
 			return;
 		}
 
@@ -281,7 +276,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 		}
 	}
 
-	
+
 	PhysicsBehavior *theirPhys = other->getPhysics();
 	if( ! theirPhys )
 		return;
@@ -291,7 +286,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 	if ( m_conductorState == WAIT_AT_STATION && (m_pullInfo.speed < modData->m_runningGarrisonSpeedMax) ) // they can grab on safely
 	{
 		AIUpdateInterface *ai = other->getAI();
-		if (ai && ai->getEnterTarget() == obj) // other intends to garrison me. 
+		if (ai && ai->getEnterTarget() == obj) // other intends to garrison me.
 		{
 			return;
 		}
@@ -310,7 +305,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 	const Coord3D *myLoc = obj->getPosition();
 	const Coord3D *theirLoc = other->getPosition();
 
-  
+
 	//---------------------------
 	// if we made it this far, it is something we dont want to share space with
 
@@ -320,7 +315,7 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 	dlt.y = theirLoc->y - myLoc->y;
 	dlt.z = theirLoc->z - myLoc->z;
 
-	//Alert all the players of recent disaster 
+	//Alert all the players of recent disaster
 	if ( ! m_whistleSound.isCurrentlyPlaying())
 		m_whistleSound.setPlayingHandle(TheAudio->addAudioEvent( &m_whistleSound ));
 
@@ -417,11 +412,11 @@ void RailroadBehavior::onCollide( Object *other, const Coord3D *loc, const Coord
 
 	if (dot > 0)
 		theirPhys->setYawRate( deviationCOG * -0.06f * m_pullInfo.speed);
-	
 
 
 
-}  // end RailroadBehavior:: on collide
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -478,7 +473,7 @@ void RailroadBehavior::playImpactSound(Object *victim, const Coord3D *impactPosi
 		vel /= 2;
 		mass /= 2;//average of him and me
 		impact.setPosition(victim->getPosition());
-	} 
+	}
 
 	vel = MIN(NORMAL_VEL_Z, MAX(0, vel));
 	mass = MIN(NORMAL_MASS, MAX(0, mass));
@@ -505,7 +500,7 @@ void RailroadBehavior::loadTrackData( void )
 	if ( m_track != NULL )
 		return;// lets do this only once!
 
- 
+
 	//First we scan the map for the nearest waypoint
 	Object *obj = getObject();
 	const Coord3D *myPos =  obj->getPosition();
@@ -516,10 +511,10 @@ void RailroadBehavior::loadTrackData( void )
 
 	// m_anchorWaypointID COULD HAVE BEEN RECORDED IN XFER, WHICH MEANS I LOADED MY TRACK DATA IN A PRIOR LIFE,
 	// SO LETS JUST RE_INIT THE TRACK BASED ON THAT POINT, AUTOMAGICALLY
-	Waypoint *anchorWaypoint = NULL; 
+	Waypoint *anchorWaypoint = NULL;
 	if ( m_anchorWaypointID == INVALID_WAYPOINT_ID )
 	{
-		Waypoint *anyWaypoint = TheTerrainLogic->getFirstWaypoint(); 
+		Waypoint *anyWaypoint = TheTerrainLogic->getFirstWaypoint();
 
 		while ( anyWaypoint )
 		{
@@ -554,12 +549,12 @@ void RailroadBehavior::loadTrackData( void )
 
 
 	m_track = NEW( TrainTrack );// this constructor inc's the refcount to 1
-	
+
 	// From now until the next carriage is added, this track is writable using getWritablePointList();
 	// This method will return NULL when refcount is 2 or more
 	// getPointList returns the list as const to any caller
 	// each carriage must increment the reference when this pointer is passed to it,
-	// any subsequent carriage (destructor) will delete this memory here if it releases refcount to zero 
+	// any subsequent carriage (destructor) will delete this memory here if it releases refcount to zero
 
 	Coord3D fromPos, toPos, fromToDelta;
 	m_track->m_length = 0.0f;
@@ -635,7 +630,7 @@ void RailroadBehavior::loadTrackData( void )
 		}
 	}
 
-}  // end loadTrackData
+}
 
 
 
@@ -722,7 +717,7 @@ UpdateSleepTime RailroadBehavior::update( void )
 					disembark();
 					m_disembark = FALSE;
 				}
-      } 
+      }
 		}
 		else if ( m_conductorState == WAIT_AT_STATION)
 		{
@@ -757,7 +752,7 @@ UpdateSleepTime RailroadBehavior::update( void )
 				conductorPullInfo.speed = -modData->m_speedMax;
 			}
 
-			
+
 			if ( ! m_runningSound.isCurrentlyPlaying() )
 				m_runningSound.setPlayingHandle(TheAudio->addAudioEvent( &m_runningSound ));
 
@@ -768,7 +763,7 @@ UpdateSleepTime RailroadBehavior::update( void )
 
 
 
-  
+
 
 
 
@@ -781,24 +776,24 @@ UpdateSleepTime RailroadBehavior::update( void )
 
 	if ( m_isLeadCarraige )
 	{
-	
+
 		if ( m_conductorState == COAST )
 		{
 			conductorPullInfo.speed *= modData->m_friction;
 			TheAudio->removeAudioEvent( m_runningSound.getPlayingHandle() );
 		}
-		
+
 		conductorPullInfo.trackDistance += conductorPullInfo.speed ;
 		// only normalize track position for a looping track, otherwise, let train exit by exceeding tracklength
-		while ( (conductorPullInfo.trackDistance > m_track->m_length) && m_track->m_isLooping) 
+		while ( (conductorPullInfo.trackDistance > m_track->m_length) && m_track->m_isLooping)
 			conductorPullInfo.trackDistance -= m_track->m_length;
-		while ( (conductorPullInfo.trackDistance < 0.0f ) && m_track->m_isLooping) 
+		while ( (conductorPullInfo.trackDistance < 0.0f ) && m_track->m_isLooping)
 			conductorPullInfo.trackDistance += m_track->m_length;
 
-		FindPosByPathDistance( &conductorPullInfo.towHitchPosition, 
-														conductorPullInfo.trackDistance, 
+		FindPosByPathDistance( &conductorPullInfo.towHitchPosition,
+														conductorPullInfo.trackDistance,
 														m_track->m_length);
-					
+
 		//let the conductor pull "me" while reseting my info, then...
 		updatePositionTrackDistance( &conductorPullInfo, &m_pullInfo);
 
@@ -820,7 +815,7 @@ UpdateSleepTime RailroadBehavior::update( void )
 		{
 			m_trailerID = INVALID_ID;// so I will forget about my trailer and designate myself as the caboose
 
-			if ( m_endOfLine ) 
+			if ( m_endOfLine )
 				TheGameLogic->destroyObject( getObject() );
 		}
 	}
@@ -845,13 +840,13 @@ UpdateSleepTime RailroadBehavior::update( void )
 			draw->setModelConditionState(MODELCONDITION_OVER_WATER);
 		else
 			draw->clearModelConditionState(MODELCONDITION_OVER_WATER);
-	
+
 	}
 
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -867,7 +862,7 @@ void RailroadBehavior::disembark(void)
 		contain->orderAllPassengersToExit( CMD_FROM_AI, FALSE );
 	}
 
-	
+
 
 	Object *trailer = TheGameLogic->findObjectByID( m_trailerID );
 	if ( trailer )
@@ -906,8 +901,8 @@ class PartitionFilterIsValidCarriage : public PartitionFilter
 public:
 
 	PartitionFilterIsValidCarriage(Object* obj, const RailroadBehaviorModuleData* data) : m_obj(obj), m_data(data) { }
-	
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterIsValidCarriage"; }
 #endif
 
@@ -996,15 +991,15 @@ void RailroadBehavior::createCarriages( void )
 					firstCarriage = closeCarriage;
 				else // or else let's use the defualt template list prvided in the INI
 				{
-					firstCarriage = TheThingFactory->newObject( temp, self->getTeam() ); 
-					DEBUG_LOG(("%s Added a carriage, %s \n", self->getTemplate()->getName().str(),firstCarriage->getTemplate()->getName().str()));
+					firstCarriage = TheThingFactory->newObject( temp, self->getTeam() );
+					DEBUG_LOG(("%s Added a carriage, %s ", self->getTemplate()->getName().str(),firstCarriage->getTemplate()->getName().str()));
 				}
-				
+
 				if ( firstCarriage )
 				{
 					firstCarriage->setProducer(self);
 					m_trailerID = firstCarriage->getID();
-					
+
 					static NameKeyType key_rb = NAMEKEY("RailroadBehavior");
 					RailroadBehavior *rb = (RailroadBehavior*)firstCarriage->findUpdateModule(key_rb);
 					if( rb )
@@ -1016,8 +1011,8 @@ void RailroadBehavior::createCarriages( void )
 					}
 					else
 					{
-						DEBUG_ASSERTCRASH( rb, 
-							("%s is attempting to hitch carriage, %s without a RailroadBehavior... \nwhat kind of nutty conductor are you? ", 
+						DEBUG_ASSERTCRASH( rb,
+							("%s is attempting to hitch carriage, %s without a RailroadBehavior... \nwhat kind of nutty conductor are you? ",
 							self->getTemplate()->getName().str(),
 							firstCarriage->getTemplate()->getName().str() ) );
 					}
@@ -1075,16 +1070,16 @@ void RailroadBehavior::hitchNewCarriagebyTemplate( ObjectID locoID, const Templa
 			}
 			else
 			{
-				DEBUG_ASSERTCRASH( rb, 
-					("%s could not hitch a %s without a RailroadBehavior... \nwhat kind of nutty conductor are you? \nThe next carriage would have been a %s.", 
+				DEBUG_ASSERTCRASH( rb,
+					("%s could not hitch a %s without a RailroadBehavior... \nwhat kind of nutty conductor are you? \nThe next carriage would have been a %s.",
 					locomotive->getTemplate()->getName().str(),
 					newCarriage->getTemplate()->getName().str(),
-					*iter
+					iter->str()
 					) );
 			}
 
 		}
-	} 
+	}
 
 
 }
@@ -1128,7 +1123,7 @@ void RailroadBehavior::hitchNewCarriagebyProximity( ObjectID locoID, TrainTrack
 
 	Object* xferCarriage = NULL;
 	Object *closeCarriage = NULL;
-	
+
 	if ( m_trailerID != INVALID_ID )
 	{
 		xferCarriage = TheGameLogic->findObjectByID( m_trailerID );
@@ -1138,20 +1133,20 @@ void RailroadBehavior::hitchNewCarriagebyProximity( ObjectID locoID, TrainTrack
 	else
 		closeCarriage = ThePartitionManager->getClosestObject( &myHitchLoc, maxRadius, FROM_CENTER_2D, filters);
 
-	
+
 	if ( closeCarriage )
 	{
 		closeCarriage->setProducer(self);
 		m_trailerID = closeCarriage->getID();
-		
+
 		static NameKeyType key_rb = NAMEKEY("RailroadBehavior");
 		RailroadBehavior *rb = (RailroadBehavior*)closeCarriage->findUpdateModule(key_rb);
 		if( rb )
 			rb->hitchNewCarriagebyProximity( self->getID(), m_track );
 		else
 		{
-			DEBUG_ASSERTCRASH( rb, 
-				("%s is attempting to hitch carriage, %s without a RailroadBehavior... \nwhat kind of nutty conductor are you? ", 
+			DEBUG_ASSERTCRASH( rb,
+				("%s is attempting to hitch carriage, %s without a RailroadBehavior... \nwhat kind of nutty conductor are you? ",
 				self->getTemplate()->getName().str(),
 				closeCarriage->getTemplate()->getName().str() ) );
 		}
@@ -1190,7 +1185,7 @@ void RailroadBehavior::getPulled( PullInfo *info )
 	info->previousWaypoint = info->currentWaypoint;
 
 	updatePositionTrackDistance( info, &m_pullInfo );
-	
+
 
 	//get pointer to my trailer
 	Object *trailer = TheGameLogic->findObjectByID( m_trailerID );
@@ -1208,7 +1203,7 @@ void RailroadBehavior::getPulled( PullInfo *info )
 	else
 	{
 		m_trailerID = INVALID_ID;// so I will forget about my trailer and designate myself as the caboose
-		if ( m_endOfLine ) 
+		if ( m_endOfLine )
 			TheGameLogic->destroyObject( getObject() );
 
 	}
@@ -1229,16 +1224,16 @@ void alignToTerrain( Real angle, const Coord3D& pos, const Coord3D& normal, Matr
 
 	z = normal;
 
-	x.x = Cos( angle ); 
-	x.y = Sin( angle ); 
-	x.z = 0.0f; 
+	x.x = Cos( angle );
+	x.y = Sin( angle );
+	x.z = 0.0f;
 	if (z.z != 0.0f)
 	{
 		x.z = -(x.x*z.x + x.y*z.y) / z.z;
 		x.normalize();
 	}
 
-	DEBUG_ASSERTCRASH(fabs(x.x*z.x + x.y*z.y + x.z*z.z)<0.0001,("dot is not zero\n"));
+	DEBUG_ASSERTCRASH(fabs(x.x*z.x + x.y*z.y + x.z*z.z)<0.0001,("dot is not zero"));
 
 	// now computing the y vector is trivial.
 	y.crossProduct( &z, &x, &y );
@@ -1271,7 +1266,7 @@ void RailroadBehavior::updatePositionTrackDistance( PullInfo *pullerInfo, PullIn
 	// my conductor, or another car
 
 	Real hitchRadius = obj->getGeometryInfo().getMajorRadius();
-	myInfo->trackDistance = pullerInfo->trackDistance - (hitchRadius * 2);      
+	myInfo->trackDistance = pullerInfo->trackDistance - (hitchRadius * 2);
 	myInfo->speed = pullerInfo->speed;// YES, if I am getting pulled, I must obey puller
 	myInfo->m_direction = pullerInfo->m_direction;// YES, if I am getting pulled, I must obey puller
 
@@ -1280,13 +1275,13 @@ void RailroadBehavior::updatePositionTrackDistance( PullInfo *pullerInfo, PullIn
 
 
 // I THINK THE TURN_TO POINT SHOULD BE A BONE ON THE PREVIOUS CAR!!!!!!
-	FindPosByPathDistance( &myInfo->towHitchPosition, 
+	FindPosByPathDistance( &myInfo->towHitchPosition,
 													myInfo->trackDistance, // the look ahead
 													m_track->m_length);
 
 	Coord3D carPosition;
-	FindPosByPathDistance( &carPosition, 
-													myInfo->trackDistance, 
+	FindPosByPathDistance( &carPosition,
+													myInfo->trackDistance,
 													m_track->m_length, TRUE);
 
 
@@ -1325,7 +1320,7 @@ void RailroadBehavior::updatePositionTrackDistance( PullInfo *pullerInfo, PullIn
 	//enforce ground elevation
 	Coord3D normal ;
 	Real enforceElevation = TheTerrainLogic->getGroundHeight( turnPos.x, turnPos.y, &normal );
-	
+
 
 
 
@@ -1376,7 +1371,7 @@ void RailroadBehavior::destroyTheWholeTrainNow( void )
 // ------------------------------------------------------------------------------------------------
 void RailroadBehavior::FindPosByPathDistance( Coord3D *pos, const Real dist, const Real length, Bool setState )
 {
-	
+
 	if ( ! m_track )
 		return;
 
@@ -1421,7 +1416,7 @@ void RailroadBehavior::FindPosByPathDistance( Coord3D *pos, const Real dist, con
 	std::list<TrackPoint>::const_iterator pointIter = pointList->begin();
 
 
-	while ( pointIter != pointList->end() ) 
+	while ( pointIter != pointList->end() )
 	{
 		const TrackPoint *thisPoint = &(*pointIter);
 		++pointIter;// next pointIter in this list, so then...
@@ -1436,7 +1431,7 @@ void RailroadBehavior::FindPosByPathDistance( Coord3D *pos, const Real dist, con
 			if (pointIter != pointList->end()) {
 				 nextPoint = &(*pointIter);
 			}
-			
+
 			if (nextPoint && nextPoint->m_distanceFromFirst > actualDistance)
 			{
 				//I am between this point and the next
@@ -1517,13 +1512,13 @@ void RailroadBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
-	* 2: Added... like, everything.	
+	* 1: Initial version
+	* 2: Added... like, everything.
 	* 3: m_held script driven flag for hanging out
 	**/
 // ------------------------------------------------------------------------------------------------
@@ -1534,9 +1529,9 @@ void RailroadBehavior::xfer( Xfer *xfer )
 	XferVersion currentVersion = 3;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
-	
+
 	// PLEASE NOTE:
-	// m_track and trackDataLoaded are indeed NOT xferred, 
+	// m_track and trackDataLoaded are indeed NOT xferred,
 	// since these are inited afresh within the update module,
 
 
@@ -1544,46 +1539,46 @@ void RailroadBehavior::xfer( Xfer *xfer )
 	{
 		// extend base class
 		PhysicsBehavior::xfer( xfer );
-		
+
 		//StationTask m_nextStationTask;
 		xfer->xferUser( &m_nextStationTask, sizeof( StationTask ) );
-		
+
 		//ObjectID m_trailerID; ///< the ID of the object I am directly pulling
 		xfer->xferObjectID( &m_trailerID );
-		
-		//Int m_currentPointHandle; 
+
+		//Int m_currentPointHandle;
 		xfer->xferInt( &m_currentPointHandle );
-		
+
 		//Int m_waitAtStationTimer;
 		xfer->xferInt( &m_waitAtStationTimer );
-		
+
 		//Bool m_carriagesCreated; ///< TRUE once we have made all the cars in the train
 		xfer->xferBool( &m_carriagesCreated );
-		
+
 		//Bool m_hasEverBeenHitched; /// has somebody ever hitched me? Remains true, even after puller dies.
 		xfer->xferBool( &m_hasEverBeenHitched );
-	
+
 		//Bool m_waitingInWings; /// I have not entered the real track yet, so leave me alone
 		xfer->xferBool( &m_waitingInWings );
-		
+
 		//Bool m_endOfLine;				/// I have reached the end of a non looping track
 		xfer->xferBool( &m_endOfLine );
-		
-		//Bool m_isLocomotive; ///< Am I a locomotive, 
+
+		//Bool m_isLocomotive; ///< Am I a locomotive,
 		xfer->xferBool( &m_isLocomotive );
-		
-		//Bool m_isLeadCarraige; ///< Am the carraige in front,  
+
+		//Bool m_isLeadCarraige; ///< Am the carraige in front,
 		xfer->xferBool( &m_isLeadCarraige );
-		
-		//Int m_wantsToBeLeadCarraige; ///< Am the carraige in front,  
+
+		//Int m_wantsToBeLeadCarraige; ///< Am the carraige in front,
 		xfer->xferInt( &m_wantsToBeLeadCarraige );
-		
+
 		//Bool m_disembark; ///< If I wait at a station, I should also evacuate everybody when I get theres
 		xfer->xferBool( &m_disembark );
-		
-		//Bool m_inTunnel; ///< Am I in a tunnel, so I wil not snap to ground height, until the next waypoint, 
+
+		//Bool m_inTunnel; ///< Am I in a tunnel, so I wil not snap to ground height, until the next waypoint,
 		xfer->xferBool( &m_inTunnel );
-		
+
 		//ConductorState m_conductorState;
 		xfer->xferUser( &m_conductorState, sizeof( ConductorState ) );
 
@@ -1596,14 +1591,14 @@ void RailroadBehavior::xfer( Xfer *xfer )
 		conductorPullInfo.xferPullInfo( xfer );
 
 	}
-	
+
 	if( version >= 3 )
 	{
 		xfer->xferBool( &m_held );
 	}
 
 
-}  // end xfer
+}
 
 
 
@@ -1645,7 +1640,7 @@ void RailroadBehavior::loadPostProcess( void )
 	m_whistleSound.setObjectID( getObject()->getID() ) ;
 	m_clicketyClackSound.setObjectID( getObject()->getID() ) ;
 
-}  // end loadPostProcess
+}
 
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
index 5e4f499781c..0abfd3b1270 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
@@ -26,7 +26,7 @@
 // Author: Graham Smallwood, February 2002
 // Desc:   State machine that controls when and with who a Truck docks
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ResourceGatheringManager.h"
@@ -41,13 +41,8 @@
 #include "GameClient/Drawable.h"
 #include "GameClient/InGameUI.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 #define NO_DEBUG_SUPPLY_STATE
 #endif
 
@@ -86,16 +81,16 @@ SupplyTruckAIUpdate::SupplyTruckAIUpdate( Thing *thing, const ModuleData* module
 	m_forcedBusyPending = FALSE;
 	m_supplyTruckStateMachine = newInstance(SupplyTruckStateMachine)( getObject() );
 	m_supplyTruckStateMachine->initDefaultState();
-	
+
 	m_suppliesDepletedVoice = getSupplyTruckAIUpdateModuleData()->m_suppliesDepletedVoice;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 SupplyTruckAIUpdate::~SupplyTruckAIUpdate( void )
 {
 	deleteInstance(m_supplyTruckStateMachine);
-} 
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -131,8 +126,8 @@ Bool SupplyTruckAIUpdate::isCurrentlyFerryingSupplies() const
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool SupplyTruckAIUpdate::isAvailableForSupplying() const 
-{ 
+Bool SupplyTruckAIUpdate::isAvailableForSupplying() const
+{
 	return true;
 }
 
@@ -160,18 +155,18 @@ Bool SupplyTruckAIUpdate::gainOneBox( Int remainingStock )
 	++m_numberBoxes;
 
 
-	//if I just took the last box, 
+	//if I just took the last box,
 	//i will announce that this supply source is now empty
 	if (remainingStock == 0)
 	{
 		Object* bestWarehouse = getObject()->getControllingPlayer()->getResourceGatheringManager()->findBestSupplyWarehouse( getObject() );
-		
+
 		Bool playDepleted = FALSE;
 		if ( bestWarehouse )
 		{
 			//figure out whether the best one is considerably far from the previous one (current position)
 			Coord3D delta = *getObject()->getPosition();
-			delta.sub( bestWarehouse->getPosition() ); 
+			delta.sub( bestWarehouse->getPosition() );
 			if ( delta.length() > getWarehouseScanDistance()/4)
 			playDepleted = TRUE;
 		}
@@ -256,7 +251,7 @@ void SupplyTruckAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -268,7 +263,7 @@ void SupplyTruckAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -277,7 +272,7 @@ void SupplyTruckAIUpdate::xfer( Xfer *xfer )
 	xfer->xferInt(&m_numberBoxes);
 	xfer->xferBool(&m_forcePending);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -286,7 +281,7 @@ void SupplyTruckAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------
@@ -295,7 +290,7 @@ void SupplyTruckAIUpdate::loadPostProcess( void )
 
 class SupplyTruckBusyState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckBusyState, "SupplyTruckBusyState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckBusyState, "SupplyTruckBusyState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -304,8 +299,8 @@ class SupplyTruckBusyState :  public State
 
 public:
 	SupplyTruckBusyState( StateMachine *machine ) : State( machine, "SupplyTruckBusyState" ) { }
-	virtual StateReturnType onEnter() 
-	{ 
+	virtual StateReturnType onEnter()
+	{
 		if( getMachineOwner() && getMachineOwner()->getAI() )
 		{
 			// Have to check, since constructor sets a state.  Phhbbt. Constructor = set up, init = do first thing.
@@ -320,11 +315,11 @@ class SupplyTruckBusyState :  public State
 #ifdef DEBUG_SUPPLY_STATE
 TheInGameUI->DEBUG_addFloatingText("entering busy state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
 #endif
-		return STATE_CONTINUE; 
-	}	
-	virtual StateReturnType update() 
-	{ 
-		return STATE_CONTINUE; 
+		return STATE_CONTINUE;
+	}
+	virtual StateReturnType update()
+	{
+		return STATE_CONTINUE;
 	}
 	virtual void onExit(StateExitType status)
 	{
@@ -339,7 +334,7 @@ EMPTY_DTOR(SupplyTruckBusyState)
 //-----------------------------------------------------------------------------------------------------------
 class SupplyTruckIdleState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckIdleState, "SupplyTruckIdleState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(SupplyTruckIdleState, "SupplyTruckIdleState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -349,9 +344,9 @@ class SupplyTruckIdleState :  public State
 public:
 	SupplyTruckIdleState( StateMachine *machine ) : State( machine, "SupplyTruckIdleState" ) { }
 	virtual StateReturnType onEnter();
-	virtual StateReturnType update() 
-	{ 
-		return STATE_CONTINUE; 
+	virtual StateReturnType update()
+	{
+		return STATE_CONTINUE;
 	}
 	virtual void onExit(StateExitType status)
 	{
@@ -363,12 +358,12 @@ TheInGameUI->DEBUG_addFloatingText("exiting idle state", getMachineOwner()->getP
 };
 EMPTY_DTOR(SupplyTruckIdleState)
 
-StateReturnType SupplyTruckIdleState::onEnter() 
-{ 
+StateReturnType SupplyTruckIdleState::onEnter()
+{
 #ifdef DEBUG_SUPPLY_STATE
 TheInGameUI->DEBUG_addFloatingText("entering idle state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
 #endif
- 
+
  	Object *owner = getMachineOwner();
  	if (owner != NULL) {
  		AIUpdateInterface * ownerAI = owner->getAIUpdateInterface();
@@ -386,8 +381,8 @@ TheInGameUI->DEBUG_addFloatingText("entering idle state", getMachineOwner()->get
  		}
  	}
 
-	return STATE_CONTINUE; 
-}	
+	return STATE_CONTINUE;
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -397,41 +392,41 @@ TheInGameUI->DEBUG_addFloatingText("entering idle state", getMachineOwner()->get
 //-------------------------------------------------------------------------------------------------
 SupplyTruckStateMachine::SupplyTruckStateMachine( Object *owner ) : StateMachine( owner, "SupplyTruckStateMachine" )
 {
-	static const StateConditionInfo busyConditions[] = 
+	static const StateConditionInfo busyConditions[] =
 	{
 		StateConditionInfo(ownerIdle, ST_IDLE, NULL),
 		StateConditionInfo(ownerDocking, ST_DOCKING, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
-	static const StateConditionInfo idleConditions[] = 
+	static const StateConditionInfo idleConditions[] =
 	{
 		StateConditionInfo(isForcedIntoBusyState, ST_BUSY, NULL),
 		StateConditionInfo(isForcedIntoWantingState, ST_WANTING, NULL),
 		StateConditionInfo(ownerDocking, ST_DOCKING, NULL),
 		StateConditionInfo(ownerNotDockingOrIdle, ST_BUSY, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
-	static const StateConditionInfo wantingConditions[] = 
+	static const StateConditionInfo wantingConditions[] =
 	{
 		StateConditionInfo(ownerDocking, ST_DOCKING, NULL),
 		StateConditionInfo(ownerNotDockingOrIdle, ST_BUSY, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
-	static const StateConditionInfo regroupingConditions[] = 
+	static const StateConditionInfo regroupingConditions[] =
 	{
 		StateConditionInfo(ownerPlayerCommanded, ST_BUSY, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
-	static const StateConditionInfo dockingConditions[] = 
+	static const StateConditionInfo dockingConditions[] =
 	{
 		StateConditionInfo(isForcedIntoBusyState, ST_BUSY, NULL),
 		StateConditionInfo(ownerAvailableForSupplying, ST_WANTING, NULL),
 		StateConditionInfo(ownerNotDockingOrIdle, ST_BUSY, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -453,19 +448,19 @@ SupplyTruckStateMachine::~SupplyTruckStateMachine()
 void SupplyTruckStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void SupplyTruckStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -473,7 +468,7 @@ void SupplyTruckStateMachine::xfer( Xfer *xfer )
 void SupplyTruckStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -560,7 +555,7 @@ StateReturnType RegroupingState::onEnter()
 TheInGameUI->DEBUG_addFloatingText("entering regrouping state", getMachineOwner()->getPosition(), GameMakeColor(255, 0, 0, 255));
 #endif
 	// I have failed to find a dock, so my first choice is to go hang out at a Supply Center (I may have
-	// failed to find a Warehouse).  My second choices is to go to a ConYard.  My last choice is just to 
+	// failed to find a Warehouse).  My second choices is to go to a ConYard.  My last choice is just to
 	// go to a friendly building.
 
 	Object* owner = getMachineOwner();
@@ -577,7 +572,7 @@ TheInGameUI->DEBUG_addFloatingText("entering regrouping state", getMachineOwner(
 	}
 
 	Object *destinationObject = NULL;
-	
+
 	KindOfMaskType kindof;
 	KindOfMaskType kindofnot;
 	kindof.set(KINDOF_CASH_GENERATOR);
@@ -605,7 +600,7 @@ TheInGameUI->DEBUG_addFloatingText("entering regrouping state", getMachineOwner(
 
 	if( ThePartitionManager->getDistanceSquared(owner, destinationObject, FROM_BOUNDINGSPHERE_2D) < REGROUP_SUCCESS_DISTANCE_SQUARED )
 		return STATE_CONTINUE; // Don't say Success so we don't spin the machine.  After one update we'll go back.
-	
+
 	Coord3D destination;
 	FindPositionOptions fpOptions;
 	fpOptions.minRadius = 0.0f;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp
index 33093b8667f..849d6630982 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp
@@ -23,10 +23,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // TransportAIUpdate.cpp //////////
-// Needs to check legality of evacuate, and may move to a place that is better to evacuate at 
+// Needs to check legality of evacuate, and may move to a place that is better to evacuate at
 // Author: Graham Smallwood, July 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "GameLogic/Module/TransportAIUpdate.h"
@@ -36,11 +36,6 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
@@ -69,7 +64,7 @@ void TransportAIUpdate::privateAttackObject( Object *victim, Int maxShotsToFire,
 	ContainModuleInterface* contain = getObject()->getContain();
 	if( contain != NULL  &&  contain->isPassengerAllowedToFire() )
 	{
-		// As an extension of the normal attack, I may want to tell my passengers to attack 
+		// As an extension of the normal attack, I may want to tell my passengers to attack
 		// too, but only if this is a direct command.  (As opposed to a passive aquire)
 		if( cmdSource == CMD_FROM_PLAYER  ||  cmdSource == CMD_FROM_SCRIPT )
 		{
@@ -86,13 +81,13 @@ void TransportAIUpdate::privateAttackObject( Object *victim, Int maxShotsToFire,
 				// If I am an overlord with a gattling upgrade, I do not tell it to fire if it is disabled
 				if ( passenger->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
 				{
-					if( passenger->isDisabledByType( DISABLED_HACKED ) 
-						|| passenger->isDisabledByType( DISABLED_EMP ) 
-						|| passenger->isDisabledByType( DISABLED_SUBDUED ) 
+					if( passenger->isDisabledByType( DISABLED_HACKED )
+						|| passenger->isDisabledByType( DISABLED_EMP )
+						|| passenger->isDisabledByType( DISABLED_SUBDUED )
 						|| passenger->isDisabledByType( DISABLED_PARALYZED) )
 						continue;
 				}
-				
+
 				AIUpdateInterface *passengerAI = passenger->getAIUpdateInterface();
 				if( passengerAI )
 				{
@@ -114,7 +109,7 @@ void TransportAIUpdate::privateForceAttackObject( Object *victim, Int maxShotsTo
 	ContainModuleInterface* contain = getObject()->getContain();
 	if( contain != NULL  &&  contain->isPassengerAllowedToFire() )
 	{
-		// As an extension of the normal attack, I may want to tell my passengers to attack 
+		// As an extension of the normal attack, I may want to tell my passengers to attack
 		// too, but only if this is a direct command.  (As opposed to a passive aquire)
 		if( cmdSource == CMD_FROM_PLAYER  ||  cmdSource == CMD_FROM_SCRIPT )
 		{
@@ -131,13 +126,13 @@ void TransportAIUpdate::privateForceAttackObject( Object *victim, Int maxShotsTo
 				// If I am an overlord with a gattling upgrade, I do not tell it to fire if it is disabled
 				if ( passenger->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
 				{
-					if( passenger->isDisabledByType( DISABLED_HACKED ) 
-						|| passenger->isDisabledByType( DISABLED_EMP ) 
-						|| passenger->isDisabledByType( DISABLED_SUBDUED ) 
+					if( passenger->isDisabledByType( DISABLED_HACKED )
+						|| passenger->isDisabledByType( DISABLED_EMP )
+						|| passenger->isDisabledByType( DISABLED_SUBDUED )
 						|| passenger->isDisabledByType( DISABLED_PARALYZED) )
 						continue;
 				}
-				
+
 				AIUpdateInterface *passengerAI = passenger->getAIUpdateInterface();
 				if( passengerAI )
 				{
@@ -159,7 +154,7 @@ void TransportAIUpdate::privateAttackPosition( const Coord3D *pos, Int maxShotsT
 	ContainModuleInterface* contain = getObject()->getContain();
 	if( contain != NULL  &&  contain->isPassengerAllowedToFire() )
 	{
-		// As an extension of the normal attack, I may want to tell my passengers to attack 
+		// As an extension of the normal attack, I may want to tell my passengers to attack
 		// too, but only if this is a direct command.  (As opposed to a passive aquire)
 		if( cmdSource == CMD_FROM_PLAYER  ||  cmdSource == CMD_FROM_SCRIPT )
 		{
@@ -176,9 +171,9 @@ void TransportAIUpdate::privateAttackPosition( const Coord3D *pos, Int maxShotsT
 				// If I am an overlord with a gattling upgrade, I do not tell it ti fire if it is disabled
 				if ( passenger->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )
 				{
-					if( passenger->isDisabledByType( DISABLED_HACKED ) 
-						|| passenger->isDisabledByType( DISABLED_EMP) 
-						|| passenger->isDisabledByType( DISABLED_SUBDUED ) 
+					if( passenger->isDisabledByType( DISABLED_HACKED )
+						|| passenger->isDisabledByType( DISABLED_EMP)
+						|| passenger->isDisabledByType( DISABLED_SUBDUED )
 						|| passenger->isDisabledByType( DISABLED_PARALYZED) )
 						continue;
 				}
@@ -196,10 +191,10 @@ void TransportAIUpdate::privateAttackPosition( const Coord3D *pos, Int maxShotsT
 }
 
 //-------------------------------------------------------------------------------------------------
-AIFreeToExitType TransportAIUpdate::getAiFreeToExit(const Object* exiter) const 
-{ 
+AIFreeToExitType TransportAIUpdate::getAiFreeToExit(const Object* exiter) const
+{
 	// Transports have a speed at which you can exit.
-	return FREE_TO_EXIT; 
+	return FREE_TO_EXIT;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -209,7 +204,7 @@ void TransportAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -221,11 +216,11 @@ void TransportAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -234,4 +229,4 @@ void TransportAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WanderAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WanderAIUpdate.cpp
index 9eebd53fde4..c27faef256d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WanderAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WanderAIUpdate.cpp
@@ -26,7 +26,7 @@
 // Will give self random move commands
 // Author: Graham Smallwood, April 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "GameLogic/Module/WanderAIUpdate.h"
@@ -66,7 +66,7 @@ UpdateSleepTime WanderAIUpdate::update( void )
 	//return (mine < ret) ? mine : ret;
 	/// @todo srj -- someday, make sleepy. for now, must not sleep.
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -75,7 +75,7 @@ void WanderAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -87,11 +87,11 @@ void WanderAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -100,4 +100,4 @@ void WanderAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
index 391fb39ae8a..5233e93bf05 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ActionManager.h"
 #include "Common/Team.h"
@@ -62,11 +62,6 @@
 #include "GameLogic/Module/WorkerAIUpdate.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
@@ -84,20 +79,15 @@ enum
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-WorkerAIUpdate::WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ) : 
+WorkerAIUpdate::WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 							 AIUpdateInterface( thing, moduleData )
-               
+
 {
 
 	//
 	// initialize the dozer machine to NULL, we want to do this and create it during the update
 	// implementation because at this point we don't have the object all setup
-	//
-
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_isRebuild = FALSE;
-	//
 	m_dozerMachine = NULL;
 	for( Int i = 0; i < DOZER_NUM_TASKS; i++ )
 	{
@@ -108,10 +98,10 @@ WorkerAIUpdate::WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 			m_dockPoint[ i ][ j ].valid = FALSE;
 			m_dockPoint[ i ][ j ].location.zero();
 		}
-	} 
+	}
 	m_currentTask = DOZER_TASK_INVALID;
 	m_buildSubTask = DOZER_SELECT_BUILD_DOCK_LOCATION;  // irrelavant, but I want non-garbage value
-	
+
 	m_supplyTruckStateMachine = NULL;
 	m_numberBoxes = 0;
 	m_forcePending = FALSE;
@@ -120,7 +110,7 @@ WorkerAIUpdate::WorkerAIUpdate( Thing *thing, const ModuleData* moduleData ) :
 	m_workerMachine = NULL;
 
  	m_suppliesDepletedVoice = getWorkerAIUpdateModuleData()->m_suppliesDepletedVoice;
-	
+
 	createMachines();
 
 }
@@ -131,14 +121,9 @@ WorkerAIUpdate::~WorkerAIUpdate( void )
 {
 
 	// delete our behavior state machine
-	if( m_dozerMachine )
-		deleteInstance(m_dozerMachine);
-
-	if( m_supplyTruckStateMachine )
-		deleteInstance(m_supplyTruckStateMachine);
-
-	if( m_workerMachine )
-		deleteInstance(m_workerMachine);
+	deleteInstance(m_dozerMachine);
+	deleteInstance(m_supplyTruckStateMachine);
+	deleteInstance(m_workerMachine);
 
 }
 
@@ -162,8 +147,8 @@ Bool WorkerAIUpdate::isCurrentlyFerryingSupplies() const
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool WorkerAIUpdate::isAvailableForSupplying() const 
-{ 
+Bool WorkerAIUpdate::isAvailableForSupplying() const
+{
 	return true;
 }
 
@@ -290,20 +275,25 @@ UpdateSleepTime WorkerAIUpdate::update( void )
 			Bool invalidTask = FALSE;
 
 			// validate the task and the target
+			// TheSuperHackers @bugfix Stubbjax 16/11/2025 Invalidate the task when the build scaffold is destroyed.
 			if( currentTask == DOZER_TASK_REPAIR &&
 					TheActionManager->canRepairObject( getObject(), targetObject, getLastCommandSource() ) == FALSE )
 				invalidTask = TRUE;
-			
+#if !RETAIL_COMPATIBLE_CRC
+			else if (currentTask == DOZER_TASK_BUILD && targetObject == NULL)
+				invalidTask = TRUE;
+#endif
+
 			// cancel the task if it's now invalid
 			if( invalidTask == TRUE )
 				cancelTask( currentTask );
 
-		}  // end if
+		}
 
 		// update dozer behavior
 		m_dozerMachine->updateStateMachine();
 
-	}  // end if
+	}
 	else
 	{
 		m_supplyTruckStateMachine->updateStateMachine();
@@ -311,7 +301,7 @@ UpdateSleepTime WorkerAIUpdate::update( void )
 		getObject()->setWeaponSetFlag(WEAPONSET_MINE_CLEARING_DETAIL);//maybe go clear some mines, if I feel like it
 	}
 	return UPDATE_SLEEP_NONE;
-} 
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -324,19 +314,19 @@ UpdateSleepTime WorkerAIUpdate::update( void )
 //-------------------------------------------------------------------------------------------------
 /** The entry point of a construct command to the Dozer */
 //-------------------------------------------------------------------------------------------------
-Object *WorkerAIUpdate::construct( const ThingTemplate *what, 
-																	 const Coord3D *pos, 
-																	 Real angle, 
+Object *WorkerAIUpdate::construct( const ThingTemplate *what,
+																	 const Coord3D *pos,
+																	 Real angle,
 																	 Player *owningPlayer,
 																	 Bool isRebuild )
 {
 
 	// !!! NOTE: If you modify this you must modify the dozer too !!!
 	// !!! Graham: Please please please have inspiration for how to *not* duplicate this code
-	// GS - Construct needs to be an AI primitive.  Inheriting off of AIUpdate means you are writing a 
+	// GS - Construct needs to be an AI primitive.  Inheriting off of AIUpdate means you are writing a
 	// master brain that will call AI primitives on the object, not something that does stuff itself.
-  // SupplyTruckAI decides who to call AIDock on.  Worker should decide to AIDock or AIConstruct 
-	// or AIRepair.  Dozer should just use the latter two.  No construction logic should be in 
+  // SupplyTruckAI decides who to call AIDock on.  Worker should decide to AIDock or AIConstruct
+	// or AIRepair.  Dozer should just use the latter two.  No construction logic should be in
 	// the inherited AIUpdates at all.
 
 	// create our machines if they don't yet exist
@@ -352,7 +342,7 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 
 	// sanity
 	DEBUG_ASSERTCRASH( getObject()->getControllingPlayer() == owningPlayer,
-										 ("Dozer::Construct - The controlling player of the Dozer is not the owning player passed in\n") );
+										 ("Dozer::Construct - The controlling player of the Dozer is not the owning player passed in") );
 
 	// if we're not rebuilding, we have a few checks to pass first for sanity
 	if( isRebuild == FALSE )
@@ -369,8 +359,8 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 																										 BuildAssistant::NO_OBJECT_OVERLAP,
 																										 getObject(), NULL ) != LBC_OK )
 				return NULL;
-		
-		}  // end if
+
+		}
 		else
 		{
 
@@ -387,9 +377,9 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 																										 getObject(), NULL ) != LBC_OK )
 				return NULL;
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 
 	// what will our initial status bits
 	ObjectStatusMaskType statusBits = MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_UNDER_CONSTRUCTION );
@@ -405,7 +395,7 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 
 	// leave the supply truck state and now behave like a dozer.
 	exitingSupplyTruckState();
-	
+
 	// take the required money away from the player
 	if( isRebuild == FALSE )
 	{
@@ -413,8 +403,8 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 
 		money->withdraw( what->calcCostToBuild( owningPlayer ) );
 
-	}  // end if
-		
+	}
+
 	//
 	// set a bit that this object is under construction, it is important to do this early
 	// before the hooks add/subtract power from a player are executed
@@ -446,7 +436,7 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 
 	// set the model action state to awaiting construction
 	obj->clearAndSetModelConditionFlags(
-		MAKE_MODELCONDITION_MASK2(MODELCONDITION_PARTIALLY_CONSTRUCTED, MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED), 
+		MAKE_MODELCONDITION_MASK2(MODELCONDITION_PARTIALLY_CONSTRUCTED, MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED),
 		MAKE_MODELCONDITION_MASK(MODELCONDITION_AWAITING_CONSTRUCTION)
 	);
 
@@ -454,8 +444,8 @@ Object *WorkerAIUpdate::construct( const ThingTemplate *what,
 	newTask( DOZER_TASK_BUILD, obj );
 
 	return obj;
-				
-} 
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** We just exited from a supply truck task and are now idle, we should go back to Dozer idle
@@ -478,7 +468,7 @@ void WorkerAIUpdate::exitingSupplyTruckState()
  		// I'm not busy.  Both states are being polite, so I must force the switch.
 	}
 }
-  
+
 
 // ------------------------------------------------------------------------------------------------
 /** Given our current task and repair target, can we accept this as a new repair target */
@@ -505,7 +495,7 @@ Bool WorkerAIUpdate::canAcceptNewRepair( Object *obj )
 			return FALSE;
 
 		// check for repairing any tower on the same bridge
-		if( currentRepair->isKindOf( KINDOF_BRIDGE_TOWER ) && 
+		if( currentRepair->isKindOf( KINDOF_BRIDGE_TOWER ) &&
 				obj->isKindOf( KINDOF_BRIDGE_TOWER ) )
 		{
 			BridgeTowerBehaviorInterface *currentTowerInterface = NULL;
@@ -518,23 +508,23 @@ Bool WorkerAIUpdate::canAcceptNewRepair( Object *obj )
 			if( currentTowerInterface == NULL || newTowerInterface == NULL )
 			{
 
-				DEBUG_CRASH(( "Unable to find bridge tower interface on object\n" ));
+				DEBUG_CRASH(( "Unable to find bridge tower interface on object" ));
 				return FALSE;
 
-			}  // end if
+			}
 
 			// if they are part of the same bridge, ignore this repair command
 			if( currentTowerInterface->getBridgeID() == newTowerInterface->getBridgeID() )
 				return FALSE;
 
-		}  // end if
+		}
 
-	}  // end if, currentRepair object exists
+	}
 
 	// all is well
 	return TRUE;
 
-}  // end canAcceptNewRepair
+}
 
 //----------------------------------------------------------------------------------------
 void WorkerAIUpdate::privateIdle(CommandSourceType cmdSource)
@@ -545,7 +535,7 @@ void WorkerAIUpdate::privateIdle(CommandSourceType cmdSource)
 	// If the user gives a stop command, I have to turn off autopilot
 //	if( cmdSource == CMD_FROM_PLAYER )
 //		setForceBusyState(TRUE);
-	
+
 	AIUpdateInterface::privateIdle(cmdSource);
 }
 
@@ -589,7 +579,7 @@ void WorkerAIUpdate::privateRepair( Object *obj, CommandSourceType cmdSource )
 	// start the new task
 	newTask( DOZER_TASK_REPAIR, obj );
 
-}  // end privateRepair
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Resume construction on a building */
@@ -608,7 +598,7 @@ void WorkerAIUpdate::privateResumeConstruction( Object *obj, CommandSourceType c
 	// start the new task for construction
 	newTask( DOZER_TASK_BUILD, obj );
 
-}  // end privateResumeConstruction
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Issue and order to the dozer */
@@ -617,7 +607,7 @@ void WorkerAIUpdate::newTask( DozerTask task, Object* target )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	// sanity
 	if( target == NULL )
@@ -647,7 +637,7 @@ void WorkerAIUpdate::newTask( DozerTask task, Object* target )
 
 		//
 		// for building, we say that even "thinking" about building or rebuilding an object
-		// sets us as the current builder of that object.  this allows any dozers that are 
+		// sets us as the current builder of that object.  this allows any dozers that are
 		// ordered later to resume construction on something to see that somebody is already taking
 		// care of it and then they won't be even try to resume a build since we don't allow
 		// multiple dozers/workers to double up on construction efforts
@@ -662,7 +652,7 @@ void WorkerAIUpdate::newTask( DozerTask task, Object* target )
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_END ].valid				= TRUE;
 		m_dockPoint[ task ][ DOZER_DOCK_POINT_END ].location		= position;
 
-	}  // end if, build task
+	}
 
 	// set the new task target and the frame in which we got this order
 	m_task[ task ].m_targetObjectID = target->getID();
@@ -687,10 +677,10 @@ void WorkerAIUpdate::newTask( DozerTask task, Object* target )
 		// I'm not busy.  Both states are being polite, so I must force the switch.
 	}
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Cancel a task and reset the dozer behavior state machine so that it can 
+/** Cancel a task and reset the dozer behavior state machine so that it can
 	* re-evaluate what it wants to do if it was working on the task being
 	* cancelled */
 //-------------------------------------------------------------------------------------------------
@@ -703,7 +693,7 @@ void WorkerAIUpdate::cancelTask( DozerTask task )
 	// reset the machine to we can re-evaluate what we want to do
 	m_dozerMachine->resetToDefaultState();
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is there a given task waiting to be done */
@@ -712,25 +702,25 @@ Bool WorkerAIUpdate::isTaskPending( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	return m_task[ task ].m_targetObjectID != 0 ? TRUE : FALSE;
-		
-}  
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is there any task pending */
 //-------------------------------------------------------------------------------------------------
 Bool WorkerAIUpdate::isAnyTaskPending( void )
 {
-	
+
 	for( Int i = 0; i < DOZER_NUM_TASKS; i++ )
 		if( isTaskPending( (DozerTask)i ) )
 			return TRUE;
 
 	return FALSE;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the target object of a given task */
@@ -739,11 +729,11 @@ ObjectID WorkerAIUpdate::getTaskTarget( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	return m_task[ task ].m_targetObjectID;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set a task as successfully completed */
@@ -752,7 +742,7 @@ void WorkerAIUpdate::internalTaskComplete( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
 
 	// call the single method that gets called for completing and canceling tasks
 	internalTaskCompleteOrCancelled( task );
@@ -765,7 +755,7 @@ void WorkerAIUpdate::internalTaskComplete( DozerTask task )
 	for( Int i = 0; i < DOZER_NUM_DOCK_POINTS; i++ )
 		m_dockPoint[ task ][ i ].valid = FALSE;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Clear a task from the Dozer for consideration, we can use this when a goal object becomes
@@ -775,8 +765,8 @@ void WorkerAIUpdate::internalCancelTask( DozerTask task )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'\n", task) );
-	
+	DEBUG_ASSERTCRASH( task >= 0 && task < DOZER_NUM_TASKS, ("Illegal dozer task '%d'", task) );
+
 	if(task < 0 || task >= DOZER_NUM_TASKS)
 		return;  //DAMNIT!  You CANNOT assert and then not handle the damn error!  The.  Code.  Must.  Not.  Crash.
 
@@ -786,11 +776,11 @@ void WorkerAIUpdate::internalCancelTask( DozerTask task )
 	// remove the info for this task
 	m_task[ task ].m_targetObjectID = INVALID_ID;
 	m_task[ task ].m_taskOrderFrame = 0;
-	
+
 	// remove dock point info for this task
 	for( Int i = 0; i < DOZER_NUM_DOCK_POINTS; i++ )
 		m_dockPoint[ task ][ i ].valid = FALSE;
-	
+
 	// stop the dozer from moving
 	AIUpdateInterface *ai = getObject()->getAIUpdateInterface();
 	if( !ai )
@@ -800,7 +790,7 @@ void WorkerAIUpdate::internalCancelTask( DozerTask task )
 	/// @todo we really need a stop command instead of making it move to it's current location
 	ai->aiMoveToPosition( getObject()->getPosition(), CMD_FROM_AI );
 
-}  
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -811,13 +801,13 @@ void WorkerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 	{
 
 		// --------------------------------------------------------------------------------------------
-		case DOZER_TASK_INVALID:	
+		case DOZER_TASK_INVALID:
 		{
 
-			break;  // do nothing, this is really no task 
+			break;  // do nothing, this is really no task
+
+		}
 
-		}  // end invalid
-		
 		// --------------------------------------------------------------------------------------------
 		case DOZER_TASK_BUILD:
 		{
@@ -834,8 +824,8 @@ void WorkerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 //				goalObject->clearModelConditionState(MODELCONDITION_ACTIVELY_BEING_CONSTRUCTED);
 //			}
 			break;
-		
-		}  // end build
+
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case DOZER_TASK_REPAIR:
@@ -854,11 +844,11 @@ void WorkerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
  				if( obj->isKindOf( KINDOF_BRIDGE_TOWER ) )
  					removeBridgeScaffolding( obj );
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end repair
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case DOZER_TASK_FORTIFY:
@@ -866,18 +856,18 @@ void WorkerAIUpdate::internalTaskCompleteOrCancelled( DozerTask task )
 
 			break;
 
-		}  // end fortify
+		}
 
 		// --------------------------------------------------------------------------------------------
 		default:
 		{
 
-			DEBUG_CRASH(( "internalTaskCompleteOrCancelled: Unknown Dozer task '%d'\n", task ));
+			DEBUG_CRASH(( "internalTaskCompleteOrCancelled: Unknown Dozer task '%d'", task ));
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch( task )
+	}
 
 }
 
@@ -891,11 +881,11 @@ void WorkerAIUpdate::onDelete( void )
 	// cancel any of the tasks we had queued up
 	for( i = DOZER_TASK_FIRST; i < DOZER_NUM_TASKS; ++i )
 	{
-		
+
 		if( isTaskPending( (DozerTask)i ) )
 			cancelTask( (DozerTask)i );
-			
-	}  // end for i
+
+	}
 
 	for( i = 0; i < DOZER_NUM_TASKS; i++ )
 	{
@@ -924,11 +914,11 @@ DozerTask WorkerAIUpdate::getMostRecentCommand( void )
 			{
 				mostRecentTask = (DozerTask)i;
 				mostRecentFrame = m_task[ i ].m_taskOrderFrame;
-			} 
-		}  
-	} 
-	return mostRecentTask;			
-} 
+			}
+		}
+	}
+	return mostRecentTask;
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -950,7 +940,7 @@ const Coord3D* WorkerAIUpdate::getDockPoint( DozerTask task, DozerDockPoint poin
 	// no valid point has been set for this dock point on this task
 	return NULL;
 
-}  // end getDockPoint
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -971,7 +961,7 @@ void WorkerAIUpdate::aiDoCommand(const AICommandParms* parms)
 
 	if (!isAllowedToRespondToAiCommands(parms))
 		return;
-	
+
 	// create our machines if they don't yet exist
 	createMachines();
 
@@ -990,7 +980,7 @@ void WorkerAIUpdate::aiDoCommand(const AICommandParms* parms)
 			privateRepair(parms->m_obj, parms->m_cmdSource);
 			break;
 
-		}  // end repair
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case AICMD_RESUME_CONSTRUCTION:
@@ -1004,7 +994,7 @@ void WorkerAIUpdate::aiDoCommand(const AICommandParms* parms)
 			privateResumeConstruction( parms->m_obj, parms->m_cmdSource );
 			break;
 
-		}  // end resume construction
+		}
 
 		// --------------------------------------------------------------------------------------------
 		default:
@@ -1022,9 +1012,9 @@ void WorkerAIUpdate::aiDoCommand(const AICommandParms* parms)
 				m_dozerMachine->resetToDefaultState();
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch
+	}
 
 	if (isClearingMines() && m_numberBoxes > 0 )
 	{
@@ -1075,18 +1065,18 @@ Bool WorkerAIUpdate::gainOneBox( Int remainingStock )
 
 	++m_numberBoxes;
 
-	//if I just took the last box, 
+	//if I just took the last box,
 	//i will announce that this supply source is now empty
 	if (remainingStock == 0)
 	{
 		Object* bestWarehouse = getObject()->getControllingPlayer()->getResourceGatheringManager()->findBestSupplyWarehouse( getObject() );
-		
+
 		Bool playDepleted = FALSE;
 		if ( bestWarehouse )
 		{
 			//figure out whether the best one is considerably far from the previous one (current position)
 			Coord3D delta = *getObject()->getPosition();
-			delta.sub( bestWarehouse->getPosition() ); 
+			delta.sub( bestWarehouse->getPosition() );
 			if ( delta.length() > getWarehouseScanDistance()/4)
 			playDepleted = TRUE;
 		}
@@ -1141,7 +1131,7 @@ void WorkerAIUpdate::resetDozerBrain()
 // Worker's master state machine, that controls Dozerness or Supplytruckness
 class ActAsDozerState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsDozerState, "ActAsDozerState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsDozerState, "ActAsDozerState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -1160,7 +1150,7 @@ EMPTY_DTOR(ActAsDozerState)
 // ------------------------------------------------------------------------------------------------
 class ActAsSupplyTruckState :  public State
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsSupplyTruckState, "ActAsSupplyTruckState")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(ActAsSupplyTruckState, "ActAsSupplyTruckState")
 protected:
 	// snapshot interface STUBBED.
 	virtual void crc( Xfer *xfer ){};
@@ -1179,16 +1169,16 @@ EMPTY_DTOR(ActAsSupplyTruckState)
 // ------------------------------------------------------------------------------------------------
 WorkerStateMachine::WorkerStateMachine( Object *owner ) : StateMachine( owner, "WorkerStateMachine" )
 {
-	static const StateConditionInfo asDozerConditions[] = 
+	static const StateConditionInfo asDozerConditions[] =
 	{
 		StateConditionInfo(supplyTruckSubMachineWantsToEnter, AS_SUPPLY_TRUCK, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
-	static const StateConditionInfo asTruckConditions[] = 
+	static const StateConditionInfo asTruckConditions[] =
 	{
 		StateConditionInfo(supplyTruckSubMachineReadyToLeave, AS_DOZER, NULL),
-		StateConditionInfo(NULL, NULL, NULL)	// keep last
+		StateConditionInfo(NULL, NULL, NULL)
 	};
 
 	// order matters: first state is the default state.
@@ -1208,19 +1198,19 @@ WorkerStateMachine::~WorkerStateMachine()
 void WorkerStateMachine::crc( Xfer *xfer )
 {
 	StateMachine::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
 // ------------------------------------------------------------------------------------------------
 void WorkerStateMachine::xfer( Xfer *xfer )
 {
-	XferVersion cv = 1;	
-	XferVersion v = cv; 
+	XferVersion cv = 1;
+	XferVersion v = cv;
 	xfer->xferVersion( &v, cv );
 
 	StateMachine::xfer(xfer);
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1228,7 +1218,7 @@ void WorkerStateMachine::xfer( Xfer *xfer )
 void WorkerStateMachine::loadPostProcess( void )
 {
 	StateMachine::loadPostProcess();
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1354,7 +1344,7 @@ void WorkerAIUpdate::createBridgeScaffolding( Object *bridgeTower )
 	// tell the bridge to create scaffolding if necessary
 	bbi->createScaffolding();
 
-}  // end createBridgeScaffolding
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove the bridge scaffolding from the bridge object that is attached to this tower */
@@ -1380,7 +1370,7 @@ void WorkerAIUpdate::removeBridgeScaffolding( Object *bridgeTower )
 	// tell the bridge to end any scaffolding from repairing
 	bbi->removeScaffolding();
 
-}  // end removeBridgeScaffolding
+}
 
 //------------------------------------------------------------------------------------------------
 void WorkerAIUpdate::startBuildingSound( const AudioEventRTS *sound, ObjectID constructionSiteID )
@@ -1401,7 +1391,7 @@ Int WorkerAIUpdate::getUpgradedSupplyBoost() const
 {
 	Player *player = getObject()->getControllingPlayer();
 	static const UpgradeTemplate *workerShoeTemplate = TheUpgradeCenter->findUpgrade( "Upgrade_GLAWorkerShoes" );
-		
+
 	if (player && workerShoeTemplate && player->hasUpgradeComplete(workerShoeTemplate))
 		return getWorkerAIUpdateModuleData()->m_upgradedSupplyBoost;
 	else
@@ -1416,7 +1406,7 @@ void WorkerAIUpdate::crc( Xfer *xfer )
 {
 	// extend base class
 	AIUpdateInterface::crc(xfer);
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1428,7 +1418,7 @@ void WorkerAIUpdate::xfer( Xfer *xfer )
   XferVersion currentVersion = 1;
   XferVersion version = currentVersion;
   xfer->xferVersion( &version, currentVersion );
- 
+
  // extend base class
 	AIUpdateInterface::xfer(xfer);
 
@@ -1473,7 +1463,7 @@ void WorkerAIUpdate::xfer( Xfer *xfer )
 	//-------------------------- xfer Worker info
 	xfer->xferSnapshot(m_workerMachine);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1482,4 +1472,4 @@ void WorkerAIUpdate::loadPostProcess( void )
 {
  // extend base class
 	AIUpdateInterface::loadPostProcess();
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AnimationSteeringUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AnimationSteeringUpdate.cpp
index fb1ffc4798e..c8265828e57 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AnimationSteeringUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AnimationSteeringUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ModelState.h"
 #include "Common/Xfer.h"
@@ -145,7 +145,7 @@ void AnimationSteeringUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp
index c5c7b650137..0c91b46ac67 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES
 #include "Common/Player.h"
@@ -42,20 +42,15 @@
 #include "GameLogic/Module/LaserUpdate.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void AssistedTargetingUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void AssistedTargetingUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "AssistingClipSize",		INI::parseInt,		NULL, offsetof( AssistedTargetingUpdateModuleData, m_clipSize ) },
 		{ "AssistingWeaponSlot",	INI::parseLookupList,	TheWeaponSlotTypeNamesLookupList, offsetof( AssistedTargetingUpdateModuleData, m_weaponSlot ) },
@@ -127,7 +122,7 @@ void AssistedTargetingUpdate::makeFeedbackLaser( const ThingTemplate *laserTempl
 
 	// Give it a good basis in reality to ensure it can draw when on screen.
 	laser->setPosition(from->getPosition());
-	
+
 	Drawable *draw = laser->getDrawable();
 	static const NameKeyType key_LaserUpdate = NAMEKEY( "LaserUpdate" );
 	LaserUpdate *update = (LaserUpdate*)draw->findClientUpdateModule( key_LaserUpdate );
@@ -165,7 +160,7 @@ void AssistedTargetingUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -183,7 +178,7 @@ void AssistedTargetingUpdate::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -198,4 +193,4 @@ void AssistedTargetingUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AutoDepositUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AutoDepositUpdate.cpp
index 95236b6b331..7c423f04ff4 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AutoDepositUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AutoDepositUpdate.cpp
@@ -24,12 +24,12 @@
 
 // FILE: AutoDepositUpdate.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	AutoDepositUpdate.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The meat of the auto deposit update module
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BuildAssistant.h"
 #include "Common/Thing.h"
@@ -63,6 +63,7 @@
 #include "GameLogic/Module/AutoDepositUpdate.h"
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/Object.h"
+#include "GameClient/Drawable.h"
 #include "GameClient/InGameUI.h"
 #include "GameClient/Color.h"
 #include "GameClient/GameText.h"
@@ -71,7 +72,6 @@
 void parseUpgradePair( INI *ini, void *instance, void *store, const void *userData )
 {
 	upgradePair info;
-	info.type = "";
 	info.amount = 0;
 
 	const char *token = ini->getNextToken( ini->getSepsColon() );
@@ -96,8 +96,8 @@ void parseUpgradePair( INI *ini, void *instance, void *store, const void *userDa
 	// Insert the info into the upgrade list
 	std::list<upgradePair> * theList = (std::list<upgradePair>*)store;
 	theList->push_back(info);
-	
-}  // end parseFactionObjectCreationList
+
+}
 
 //-----------------------------------------------------------------------------
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -150,20 +150,20 @@ UpdateSleepTime AutoDepositUpdate::update( void )
 	if( TheGameLogic->getFrame() >= m_depositOnFrame)
 	{
 		if (!m_initialized) {
-			// Note - we have to set these in update, because during load the team is set, 
+			// Note - we have to set these in update, because during load the team is set,
 			// and we don't want to award initial bonus on load.  jba :)
 			m_awardInitialCaptureBonus = TRUE;
 			m_initialized = TRUE;
 		}
 		m_depositOnFrame = TheGameLogic->getFrame() + modData->m_depositFrame;
-		
+
 		if(getObject()->isNeutralControlled() || modData->m_depositAmount <= 0 )
 			return UPDATE_SLEEP_NONE;
 
 		// makes sure that buildings under construction do not get a bonus CCB
 		if( getObject()->getConstructionPercent() != CONSTRUCTION_COMPLETE )
 			return UPDATE_SLEEP_NONE;
-		
+
 		int moneyAmount = modData->m_depositAmount + getUpgradedSupplyBoost();
 
 		if( modData->m_isActualMoney )
@@ -171,19 +171,8 @@ UpdateSleepTime AutoDepositUpdate::update( void )
 			getObject()->getControllingPlayer()->getMoney()->deposit( moneyAmount );
 			getObject()->getControllingPlayer()->getScoreKeeper()->addMoneyEarned( modData->m_depositAmount);
 		}
-		
-		Bool displayMoney = moneyAmount > 0 ? TRUE : FALSE;
-		if( getObject()->testStatus(OBJECT_STATUS_STEALTHED) )
-		{
-			// OY LOOK!  I AM USING LOCAL PLAYER.  Do not put anything other than TheInGameUI->addFloatingText in the block this controls!!!
-			if( !getObject()->isLocallyControlled() && !getObject()->testStatus(OBJECT_STATUS_DETECTED) )
-			{
-				displayMoney = FALSE;
-			}
 
-		}
-		
-		if( displayMoney )
+		if (moneyAmount > 0 && getObject()->isLogicallyVisible())
 		{
 
       const Object *owner = getObject();
@@ -196,7 +185,7 @@ UpdateSleepTime AutoDepositUpdate::update( void )
 			  Coord3D pos;
 			  pos.set( getObject()->getPosition() );
 			  pos.z += 10.0f; //add a little z to make it show up above the unit.
-		  
+
         if ( owner->isKindOf( KINDOF_STRUCTURE ) )
         {
           Real width = owner->getGeometryInfo().getMajorRadius() * 0.3f;
@@ -204,12 +193,12 @@ UpdateSleepTime AutoDepositUpdate::update( void )
           pos.x += GameClientRandomValue(-width,width);
           pos.y += GameClientRandomValue(-depth,depth);
         }
-      
-      
+
+
         Color color = getObject()->getControllingPlayer()->getPlayerColor() | GameMakeColor( 0, 0, 0, 230 );
 			  TheInGameUI->addFloatingText( moneyString, &pos, color );
       }
-		}		
+		}
 	}
 
 	return UPDATE_SLEEP_NONE;
@@ -250,7 +239,7 @@ void AutoDepositUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -277,7 +266,7 @@ void AutoDepositUpdate::xfer( Xfer *xfer )
 		xfer->xferBool(&m_initialized);
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -288,4 +277,4 @@ void AutoDepositUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AutoFindHealingUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AutoFindHealingUpdate.cpp
index d932dd4c09e..aacb8a3e7b3 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AutoFindHealingUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AutoFindHealingUpdate.cpp
@@ -65,7 +65,7 @@ AutoFindHealingUpdateModuleData::AutoFindHealingUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ScanRate",							INI::parseDurationUnsignedInt,	NULL, offsetof( AutoFindHealingUpdateModuleData, m_scanFrames ) },
 		{ "ScanRange",						INI::parseReal,									NULL, offsetof( AutoFindHealingUpdateModuleData, m_scanRange ) },
@@ -80,7 +80,7 @@ AutoFindHealingUpdateModuleData::AutoFindHealingUpdateModuleData()
 AutoFindHealingUpdate::AutoFindHealingUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 	m_nextScanFrames						= 0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -93,14 +93,14 @@ AutoFindHealingUpdate::~AutoFindHealingUpdate( void )
 //-------------------------------------------------------------------------------------------------
 void AutoFindHealingUpdate::onObjectCreated()
 {
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime AutoFindHealingUpdate::update()
-{	
+{
 /// @todo srj use SLEEPY_UPDATE here
 	Object *obj = getObject();
 	if (obj->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN) {
@@ -179,7 +179,7 @@ Object* AutoFindHealingUpdate::scanClosestTarget()
 			closestDistSqr = fDistSqr;
 			continue;
 		}
-	}  // end for, other
+	}
 
 	return bestTarget;
 }
@@ -193,7 +193,7 @@ void AutoFindHealingUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -214,7 +214,7 @@ void AutoFindHealingUpdate::xfer( Xfer *xfer )
 	// next scan frames
 	xfer->xferInt( &m_nextScanFrames );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -225,4 +225,4 @@ void AutoFindHealingUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BaseRenerateUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BaseRenerateUpdate.cpp
index 23752d6dbba..ba7a4650447 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BaseRenerateUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BaseRenerateUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/Xfer.h"
@@ -50,11 +50,11 @@ BaseRegenerateUpdateModuleData::BaseRegenerateUpdateModuleData()
 
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void BaseRegenerateUpdateModuleData::buildFieldParse( MultiIniFieldParse &p ) 
+void BaseRegenerateUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ 0, 0, 0, 0 }
 	};
@@ -69,7 +69,7 @@ void BaseRegenerateUpdateModuleData::buildFieldParse( MultiIniFieldParse &p )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-BaseRegenerateUpdate::BaseRegenerateUpdate( Thing *thing, const ModuleData* moduleData ) 
+BaseRegenerateUpdate::BaseRegenerateUpdate( Thing *thing, const ModuleData* moduleData )
 										: UpdateModule( thing, moduleData )
 {
 
@@ -114,7 +114,7 @@ UpdateSleepTime BaseRegenerateUpdate::update( void )
 {
 	// this is us!
 	Object *me = getObject();
-	
+
 	if( me->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
 	{
 		return UPDATE_SLEEP_NONE;
@@ -137,13 +137,13 @@ UpdateSleepTime BaseRegenerateUpdate::update( void )
 		const Int HEAL_RATE = 3;
 
 		// do some healing
-		Real amount = HEAL_RATE * (body->getMaxHealth() * TheGlobalData->m_baseRegenHealthPercentPerSecond) / 
+		Real amount = HEAL_RATE * (body->getMaxHealth() * TheGlobalData->m_baseRegenHealthPercentPerSecond) /
 														 LOGICFRAMES_PER_SECOND;
 		me->attemptHealing(amount, me);
 
 		return UPDATE_SLEEP(HEAL_RATE);
 	}
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -154,7 +154,7 @@ void BaseRegenerateUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -172,7 +172,7 @@ void BaseRegenerateUpdate::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -183,4 +183,4 @@ void BaseRegenerateUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp
index 88dadb84725..2cf23405c6c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   Update module to handle building states and battle plan execution & changes
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_MAXHEALTHCHANGETYPE_NAMES						// for TheMaxHealthChangeTypeNames[]
 
@@ -61,11 +61,6 @@
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/Module/StealthDetectorUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -77,7 +72,7 @@ BattlePlanUpdateModuleData::BattlePlanUpdateModuleData()
 	m_searchAndDestroyPlanAnimationFrames = 0;
 	m_battlePlanParalyzeFrames						= 0;
 
-	
+
 	m_holdTheLineArmorDamageScalar				= 1.0f;
 	m_searchAndDestroySightRangeScalar		= 1.0f;
 	m_strategyCenterSearchAndDestroySightRangeScalar = 1.0f;
@@ -92,7 +87,7 @@ BattlePlanUpdateModuleData::BattlePlanUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SpecialPowerTemplate",									INI::parseSpecialPowerTemplate,	NULL, offsetof( BattlePlanUpdateModuleData, m_specialPowerTemplate ) },
 
@@ -124,7 +119,7 @@ BattlePlanUpdateModuleData::BattlePlanUpdateModuleData()
 		{ "StrategyCenterSearchAndDestroySightRangeScalar", INI::parseReal,				NULL, offsetof( BattlePlanUpdateModuleData, m_strategyCenterSearchAndDestroySightRangeScalar ) },
 		{ "StrategyCenterSearchAndDestroyDetectsStealth",   INI::parseBool,				NULL, offsetof( BattlePlanUpdateModuleData, m_strategyCenterSearchAndDestroyDetectsStealth ) },
 		{ "StrategyCenterHoldTheLineMaxHealthScalar",				INI::parseReal,				NULL, offsetof( BattlePlanUpdateModuleData, m_strategyCenterHoldTheLineMaxHealthScalar ) },
-    { "StrategyCenterHoldTheLineMaxHealthChangeType",		INI::parseIndexList,  TheMaxHealthChangeTypeNames, offsetof( BattlePlanUpdateModuleData, m_strategyCenterHoldTheLineMaxHealthChangeType ) }, 
+    { "StrategyCenterHoldTheLineMaxHealthChangeType",		INI::parseIndexList,  TheMaxHealthChangeTypeNames, offsetof( BattlePlanUpdateModuleData, m_strategyCenterHoldTheLineMaxHealthChangeType ) },
 
 		{ "VisionObjectName",											INI::parseAsciiString,					NULL, offsetof( BattlePlanUpdateModuleData, m_visionObjectName ) },
 
@@ -134,7 +129,7 @@ BattlePlanUpdateModuleData::BattlePlanUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-BattlePlanUpdate::BattlePlanUpdate( Thing *thing, const ModuleData* moduleData ) : 
+BattlePlanUpdate::BattlePlanUpdate( Thing *thing, const ModuleData* moduleData ) :
 	SpecialPowerUpdateModule( thing, moduleData ),
 	m_bonuses(NULL)
 {
@@ -160,13 +155,8 @@ BattlePlanUpdate::BattlePlanUpdate( Thing *thing, const ModuleData* moduleData )
 
 	m_visionObjectID = INVALID_ID;
 
-	//------------------------//
-	// Added by Sadullah Nader//
-	//------------------------//
-
 	m_specialPowerModule   = NULL;
-	//
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -198,7 +188,7 @@ void BattlePlanUpdate::onDelete()
 		obj = TheGameLogic->findObjectByID( m_visionObjectID );
 		if( obj )
 			TheGameLogic->destroyObject( obj );
-	}  // end if
+	}
 
 	// If we get destroyed, then make sure we remove our bonus!
 	// srj sez: we can't do this in the dtor because our team
@@ -320,7 +310,7 @@ CommandOption BattlePlanUpdate::getCommandOption() const
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime BattlePlanUpdate::update()
-{	
+{
 
 	if( m_invalidSettings )
 	{
@@ -359,7 +349,7 @@ UpdateSleepTime BattlePlanUpdate::update()
 				}
 				break;
 			case TRANSITIONSTATUS_ACTIVE:
-				//If we're active and the user has selected a different plan, then we need to 
+				//If we're active and the user has selected a different plan, then we need to
 				//pack up.
 				if( m_currentPlan != m_desiredPlan )
 				{
@@ -415,7 +405,7 @@ void BattlePlanUpdate::createVisionObject()
 
 	// get template of object to create
 	const ThingTemplate *tt = TheThingFactory->findTemplate( data->m_visionObjectName );
-	DEBUG_ASSERTCRASH( tt, ("BattlePlanUpdate::setStatus - Invalid vision object name '%s'\n",
+	DEBUG_ASSERTCRASH( tt, ("BattlePlanUpdate::setStatus - Invalid vision object name '%s'",
 													data->m_visionObjectName.str()) );
 
 	if (!tt)
@@ -442,9 +432,9 @@ void BattlePlanUpdate::createVisionObject()
 		// set the shroud clearing range
 		visionObject->setShroudClearingRange( obj->getGeometryInfo().getBoundingSphereRadius() );
 
-	}  // end if
+	}
 
-}  // end createVisionObject
+}
 
 //-------------------------------------------------------------------------------------------------
 void BattlePlanUpdate::setStatus( TransitionStatus newStatus )
@@ -782,7 +772,7 @@ void BattlePlanUpdate::setBattlePlan( BattlePlanStatus plan )
 						update->setSDEnabled( false );
 					}
 				}
-				
+
 				break;
 			}
 		}
@@ -801,7 +791,7 @@ void BattlePlanUpdate::setBattlePlan( BattlePlanStatus plan )
 				//Paralyze troops!
 				player->iterateObjects( paralyzeTroop, (void*)data );
 				break;
-				
+
 			case PLANSTATUS_BOMBARDMENT:
 				//Set the bombardment bonuses
 				m_bonuses->m_bombardment	= 1; //for weapon bonuses
@@ -857,7 +847,7 @@ void BattlePlanUpdate::setBattlePlan( BattlePlanStatus plan )
 }
 
 //------------------------------------------------------------------------------------------------
-//Returns the currently active battle plan -- unpacked and ready... returns PLANSTATUS_NONE if in 
+//Returns the currently active battle plan -- unpacked and ready... returns PLANSTATUS_NONE if in
 //transition!
 //------------------------------------------------------------------------------------------------
 BattlePlanStatus BattlePlanUpdate::getActiveBattlePlan() const
@@ -876,7 +866,7 @@ void BattlePlanUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 //------------------------------------------------------------------------------------------------
 // Xfer method
@@ -930,7 +920,7 @@ void BattlePlanUpdate::xfer( Xfer *xfer )
 	// vision object data
 	xfer->xferObjectID( &m_visionObjectID );
 
-}  // end xfer
+}
 
 //------------------------------------------------------------------------------------------------
 void BattlePlanUpdate::loadPostProcess( void )
@@ -939,4 +929,4 @@ void BattlePlanUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp
index c7d817b5d75..d2bd3ef3d1d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BoneFXUpdate.cpp
@@ -24,11 +24,11 @@
 
 // FILE: BoneFXUpdate.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/Thing.h"
@@ -91,7 +91,6 @@ BoneFXUpdate::BoneFXUpdate( Thing *thing, const ModuleData* moduleData ) : Updat
 	m_particleSystemIDs.clear();
 	m_active = FALSE;
 
-	//Added By Sadullah Nader
 	m_curBodyState = BODY_PRISTINE;
 }
 
@@ -127,16 +126,16 @@ static void parseFXLocInfo( INI *ini, void *instance, BoneLocInfo *locInfo )
 		// save bone name and location type
 		locInfo->boneName = ini->getNextToken();
 
-	}  // end if
+	}
 	else
 	{
 
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end else
+	}
 
-}  // end parseFXLocInfo
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Parse a random delay.  This is a number pair, where the numbers are a min and max time in miliseconds. */
@@ -163,7 +162,7 @@ static void parseGameLogicRandomDelay( INI *ini, void *instance, GameLogicRandom
 /** In the form of:
 	* <BodyDamageState>FXList<index> = Bone:<BoneName> OnlyOnce:<Yes|No> <Min delay> <Max delay> FXList:<FXListName> */
 //-------------------------------------------------------------------------------------------------
-void BoneFXUpdateModuleData::parseFXList( INI *ini, void *instance, 
+void BoneFXUpdateModuleData::parseFXList( INI *ini, void *instance,
 																								void *store, const void *userData )
 {
 	const char *token;
@@ -180,7 +179,7 @@ void BoneFXUpdateModuleData::parseFXList( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	} // end if
+	}
 
 	ini->parseBool( ini, instance, &info->onlyOnce, NULL);
 
@@ -194,18 +193,18 @@ void BoneFXUpdateModuleData::parseFXList( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// parse the fx list name
 	ini->parseFXList( ini, instance, &info->fx, NULL );
 
-}  // end parseFXList
+}
 
 //-------------------------------------------------------------------------------------------------
 /** In the form of:
 	* <BodyDamageState>OCL<index> = Bone:<BoneName> OnlyOnce:<Yes|No> <Min delay> <Max delay> OCL:<OCLName> */
 //-------------------------------------------------------------------------------------------------
-void BoneFXUpdateModuleData::parseObjectCreationList( INI *ini, void *instance, 
+void BoneFXUpdateModuleData::parseObjectCreationList( INI *ini, void *instance,
 																														void *store, const void *userData )
 {
 	const char *token;
@@ -222,7 +221,7 @@ void BoneFXUpdateModuleData::parseObjectCreationList( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	} // end if
+	}
 
 	ini->parseBool( ini, instance, &info->onlyOnce, NULL );
 
@@ -236,18 +235,18 @@ void BoneFXUpdateModuleData::parseObjectCreationList( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// parse the ocl name
 	ini->parseObjectCreationList( ini, instance, &info->ocl, NULL );
 
-}  // end parseObjectCreationList
+}
 
 //-------------------------------------------------------------------------------------------------
 /** In the form of:
 	* <BodyDamageState>ParticleSystem<index> = <Bone:BoneName> OnlyOnce:<Yes|No> <Min delay> <Max delay> PSys:<PSysName> */
 //-------------------------------------------------------------------------------------------------
-void BoneFXUpdateModuleData::parseParticleSystem( INI *ini, void *instance, 
+void BoneFXUpdateModuleData::parseParticleSystem( INI *ini, void *instance,
 																												void *store, const void *userData )
 {
 	const char *token;
@@ -264,7 +263,7 @@ void BoneFXUpdateModuleData::parseParticleSystem( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	} // end if
+	}
 
 	ini->parseBool( ini, instance, &info->onlyOnce, NULL );
 
@@ -278,12 +277,12 @@ void BoneFXUpdateModuleData::parseParticleSystem( INI *ini, void *instance,
 		// error
 		throw INI_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// parse the particle system name
 	ini->parseParticleSystemTemplate( ini, instance, &info->particleSysTemplate, NULL );
 
-}  // end parseParticleSystem
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -364,7 +363,7 @@ static void buildNonDupRandomIndexList(Int range, Int count, Int idxList[])
 		do
 		{
 			idx = GameLogicRandomValue(0, range-1);
-		} 
+		}
 		while (inList(idx, i, idxList));
 		idxList[i] = idx;
 	}
@@ -448,13 +447,13 @@ void BoneFXUpdate::doParticleSystemAtBone(const ParticleSystemTemplate *particle
 	Object *building = getObject();
 
 	ParticleSystem *psys = TheParticleSystemManager->createParticleSystem(particleSystemTemplate);
-	if (psys != NULL) 
+	if (psys != NULL)
 	{
 		m_particleSystemIDs.push_back(psys->getSystemID());
 		psys->setPosition(bonePosition);
 		psys->attachToObject(building);
 		Drawable *drawable = building->getDrawable();
-		if (drawable && drawable->isDrawableEffectivelyHidden()) 
+		if (drawable && drawable->isDrawableEffectivelyHidden())
 		{
 			psys->stop();
 		}
@@ -511,26 +510,23 @@ void BoneFXUpdate::resolveBoneLocations() {
 	Drawable *drawable = building->getDrawable();
 	if (drawable == NULL) {
 		DEBUG_ASSERTCRASH(drawable != NULL, ("There is no drawable?"));
-	}
-
-	if (d == NULL) {
 		return;
 	}
 
 	for (i = 0; i < BONE_FX_MAX_BONES; ++i) {
-		if (d->m_fxList[m_curBodyState][i].locInfo.boneName.compare(AsciiString::TheEmptyString) != 0) 
+		if (d->m_fxList[m_curBodyState][i].locInfo.boneName.compare(AsciiString::TheEmptyString) != 0)
 		{
 			const BoneFXListInfo *info = &(d->m_fxList[m_curBodyState][i]);
 			drawable->getPristineBonePositions(info->locInfo.boneName.str(), 0, &m_FXBonePositions[m_curBodyState][i], NULL, 1);
 		}
 
-		if (d->m_OCL[m_curBodyState][i].locInfo.boneName.compare(AsciiString::TheEmptyString) != 0) 
+		if (d->m_OCL[m_curBodyState][i].locInfo.boneName.compare(AsciiString::TheEmptyString) != 0)
 		{
 			const BoneOCLInfo *info = &(d->m_OCL[m_curBodyState][i]);
 			drawable->getPristineBonePositions(info->locInfo.boneName.str(), 0, &m_OCLBonePositions[m_curBodyState][i], NULL, 1);
 		}
 
-		if (d->m_particleSystem[m_curBodyState][i].locInfo.boneName.compare(AsciiString::TheEmptyString) != 0) 
+		if (d->m_particleSystem[m_curBodyState][i].locInfo.boneName.compare(AsciiString::TheEmptyString) != 0)
 		{
 			const BoneParticleSystemInfo *info = &(d->m_particleSystem[m_curBodyState][i]);
 			drawable->getPristineBonePositions(info->locInfo.boneName.str(), 0, &m_PSBonePositions[m_curBodyState][i], NULL, 1);
@@ -562,7 +558,7 @@ void BoneFXUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -594,9 +590,9 @@ void BoneFXUpdate::xfer( Xfer *xfer )
 			systemID = *it;
 			xfer->xferUser( &systemID, sizeof( ParticleSystemID ) );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -604,10 +600,10 @@ void BoneFXUpdate::xfer( Xfer *xfer )
 		if( m_particleSystemIDs.empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "BoneFXUpdate::xfer - m_particleSystemIDs should be empty but is not\n" ));
+			DEBUG_CRASH(( "BoneFXUpdate::xfer - m_particleSystemIDs should be empty but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read all data
 		for( UnsignedShort i = 0; i < particleSystemCount; ++i )
@@ -619,13 +615,13 @@ void BoneFXUpdate::xfer( Xfer *xfer )
 			// put at end of vector
 			m_particleSystemIDs.push_back( systemID );
 
-		}  // end for, i
+		}
 
-	}  // end else
+	}
 
 	// next fx frame
 	xfer->xferUser( m_nextFXFrame, sizeof( Int ) * BODYDAMAGETYPE_COUNT * BONE_FX_MAX_BONES );
-	
+
 	// next OCL farme
 	xfer->xferUser( m_nextOCLFrame, sizeof( Int ) * BODYDAMAGETYPE_COUNT * BONE_FX_MAX_BONES );
 
@@ -650,7 +646,7 @@ void BoneFXUpdate::xfer( Xfer *xfer )
 	// active
 	xfer->xferBool( &m_active );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -661,4 +657,4 @@ void BoneFXUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/CheckpointUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/CheckpointUpdate.cpp
index f2afae5a00a..0d04efe6106 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/CheckpointUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/CheckpointUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 #include "Common/ThingTemplate.h"
@@ -62,7 +62,7 @@ CheckpointUpdate::~CheckpointUpdate( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Look around us for enemies.
  */
 void CheckpointUpdate::checkForAlliesAndEnemies( void )
@@ -107,10 +107,10 @@ void CheckpointUpdate::checkForAlliesAndEnemies( void )
 UpdateSleepTime CheckpointUpdate::update()
 {
 /// @todo srj use SLEEPY_UPDATE here
-	
+
 	Bool wasAnAlly  = m_allyNear;
 	Bool wasAnEnemy = m_enemyNear;
-	
+
 	checkForAlliesAndEnemies();
 
 	Bool change = ( (wasAnAlly != m_allyNear) || (wasAnEnemy != m_enemyNear) );
@@ -141,7 +141,7 @@ UpdateSleepTime CheckpointUpdate::update()
 				}
 			}
 
-		}// end if change
+		}
 
 		GeometryInfo geom = obj->getGeometryInfo();
 
@@ -151,7 +151,7 @@ UpdateSleepTime CheckpointUpdate::update()
 
 		// THis method is more accidental than above, but it works for an unimportant thing like checkpoint
 		Real radius = geom.getMinorRadius();
-		
+
 		if ( open )
 		{
 			if ( radius > 0 ) geom.setMinorRadius( radius - 0.333f );
@@ -160,11 +160,11 @@ UpdateSleepTime CheckpointUpdate::update()
 		{
 			if ( radius < m_maxMinorRadius ) geom.setMinorRadius( radius + 0.333f );
 		}
-		
+
 
 		obj->setGeometryInfo( geom );
 
-	} // end if draw
+	}
 
 	return UPDATE_SLEEP_NONE;
 
@@ -179,7 +179,7 @@ void CheckpointUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -209,7 +209,7 @@ void CheckpointUpdate::xfer( Xfer *xfer )
 	// enemy scan delay
 	xfer->xferUnsignedInt( &m_enemyScanDelay );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -220,4 +220,4 @@ void CheckpointUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/CleanupHazardUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/CleanupHazardUpdate.cpp
index 8e5f84d8651..82633a38927 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/CleanupHazardUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/CleanupHazardUpdate.cpp
@@ -46,11 +46,6 @@
 #include "GameLogic/WeaponSet.h"
 #include "GameLogic/Module/AIUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -66,7 +61,7 @@ CleanupHazardUpdateModuleData::CleanupHazardUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "WeaponSlot",						INI::parseLookupList,						TheWeaponSlotTypeNamesLookupList, offsetof( CleanupHazardUpdateModuleData, m_weaponSlot ) },
 		{ "ScanRate",							INI::parseDurationUnsignedInt,	NULL, offsetof( CleanupHazardUpdateModuleData, m_scanFrames ) },
@@ -87,7 +82,7 @@ CleanupHazardUpdate::CleanupHazardUpdate( Thing *thing, const ModuleData* module
 	m_moveRange									= 0.0f;
 	m_pos.zero();
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -102,13 +97,13 @@ void CleanupHazardUpdate::onObjectCreated()
 {
 	const CleanupHazardUpdateModuleData *data = getCleanupHazardUpdateModuleData();
 	Object *self = getObject();
-	
+
 	//Make sure we have a weapon template
 	self->setWeaponSetFlag( WEAPONSET_VETERAN );
 	Weapon *weapon = self->getWeaponInWeaponSlot( data->m_weaponSlot );
 	if( !weapon )
 	{
-		DEBUG_CRASH( ("CleanupHazardUpdate for %s doesn't have a valid weapon template", 
+		DEBUG_CRASH( ("CleanupHazardUpdate for %s doesn't have a valid weapon template",
 			getObject()->getTemplate()->getName().str() ) );
 		return;
 	}
@@ -129,7 +124,7 @@ void CleanupHazardUpdate::onObjectCreated()
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime CleanupHazardUpdate::update()
-{	
+{
 /// @todo srj use SLEEPY_UPDATE here
 	const CleanupHazardUpdateModuleData *data = getCleanupHazardUpdateModuleData();
 	Object *obj = getObject();
@@ -172,7 +167,7 @@ UpdateSleepTime CleanupHazardUpdate::update()
 	}
 	else if( m_moveRange )
 	{
-		//There's nothing nearby, so if we are cleaning up an area versus hazards 
+		//There's nothing nearby, so if we are cleaning up an area versus hazards
 		//immediately in range, set the AI to idle so it can advance to the next script!
 		AIUpdateInterface *ai = obj->getAI();
 		if( ai && (ai->isIdle() || ai->isBusy()) )
@@ -219,7 +214,7 @@ void CleanupHazardUpdate::fireWhenReady()
 		{
 			if( m_inRange )
 			{
-				//We were in range last frame, but the target has moved out of firing range, so 
+				//We were in range last frame, but the target has moved out of firing range, so
 				//re-evaluate by forcing a new scan.
 				m_nextScanFrames = GameLogicRandomValue( 0, 3 );
 				m_bestTargetID = INVALID_ID;
@@ -237,7 +232,7 @@ void CleanupHazardUpdate::fireWhenReady()
 			}
 		}
 	}
-	
+
 	if( m_nextShotAvailableInFrames > 0 )
 	{
 		//We can't fire this frame.
@@ -285,7 +280,7 @@ Object* CleanupHazardUpdate::scanClosestTarget()
 		bestTargetInRange = ThePartitionManager->getClosestObject( me->getPosition(), data->m_scanRange, FROM_CENTER_2D, filters );
 	}
 
-	if( bestTargetInRange ) 
+	if( bestTargetInRange )
 	{
 		m_bestTargetID = bestTargetInRange->getID();
 	}
@@ -310,7 +305,7 @@ void CleanupHazardUpdate::setCleanupAreaParameters( const Coord3D *pos, Real ran
 		//CMD_FROM_AI important because it'll abort when other types are used -- like if a player
 		//or script orders the unit to do something else, we need a way to cancel this passive
 		//situation.
-		ai->aiMoveToPosition( pos, CMD_FROM_AI ); 
+		ai->aiMoveToPosition( pos, CMD_FROM_AI );
 	}
 }
 
@@ -323,7 +318,7 @@ void CleanupHazardUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -362,7 +357,7 @@ void CleanupHazardUpdate::xfer( Xfer *xfer )
 	// move range
 	xfer->xferReal( &m_moveRange );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -373,4 +368,4 @@ void CleanupHazardUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/CommandButtonHuntUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/CommandButtonHuntUpdate.cpp
index 9c9422fcfbf..3ed8abdbdc0 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/CommandButtonHuntUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/CommandButtonHuntUpdate.cpp
@@ -24,9 +24,9 @@
 
 // FILE: CommandButtonHuntUpdate.cpp //////////////////////////////////////////////////////////////////////////
 // Author: John Ahlquist, Sept. 2002
-// Desc:   Update module to handle "Hunting" using a special power.  If the unit is idle, and the 
+// Desc:   Update module to handle "Hunting" using a special power.  If the unit is idle, and the
 // power is not active, it targets a new unit with the power.	 Note that this is an update rather than
-// an AI state because many of the special abilities use the ai to perform portions of the special 
+// an AI state because many of the special abilities use the ai to perform portions of the special
 // ability.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -52,11 +52,6 @@
 #include "GameLogic/Module/SpecialPowerModule.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -71,7 +66,7 @@ CommandButtonHuntUpdateModuleData::CommandButtonHuntUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ScanRate",							INI::parseDurationUnsignedInt,	NULL, offsetof( CommandButtonHuntUpdateModuleData, m_scanFrames ) },
 		{ "ScanRange",						INI::parseReal,									NULL, offsetof( CommandButtonHuntUpdateModuleData, m_scanRange ) },
@@ -81,13 +76,13 @@ CommandButtonHuntUpdateModuleData::CommandButtonHuntUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-CommandButtonHuntUpdate::CommandButtonHuntUpdate( Thing *thing, const ModuleData* moduleData ) : 
+CommandButtonHuntUpdate::CommandButtonHuntUpdate( Thing *thing, const ModuleData* moduleData ) :
 UpdateModule( thing, moduleData ),
 m_commandButton(NULL)
 {
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 	m_commandButtonName = AsciiString::TheEmptyString;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -100,14 +95,14 @@ CommandButtonHuntUpdate::~CommandButtonHuntUpdate( void )
 //-------------------------------------------------------------------------------------------------
 void CommandButtonHuntUpdate::onObjectCreated()
 {
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
 void CommandButtonHuntUpdate::setCommandButton(const AsciiString& buttonName)
 {
 	Object *obj = getObject();
-	m_commandButtonName = buttonName;	
+	m_commandButtonName = buttonName;
 	m_commandButton = NULL;
 	const CommandSet *commandSet = TheControlBar->findCommandSet( obj->getCommandSetString() );
 	if( commandSet )
@@ -146,7 +141,7 @@ void CommandButtonHuntUpdate::setCommandButton(const AsciiString& buttonName)
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime CommandButtonHuntUpdate::update()
-{	
+{
 
 	Object *obj = getObject();
 
@@ -255,7 +250,7 @@ Object* CommandButtonHuntUpdate::scanClosestTarget(void)
 
 	// only consider enemies (unless it's convert to carbomb).
 	PartitionFilterRelationship::RelationshipAllowTypes relationship = PartitionFilterRelationship::ALLOW_ENEMIES;
-	
+
 	Bool isEnter = FALSE;
 	switch( m_commandButton->getCommandType() )
 	{
@@ -272,7 +267,7 @@ Object* CommandButtonHuntUpdate::scanClosestTarget(void)
 	PartitionFilterSameMapStatus filterMapStatus(getObject());
 	PartitionFilterRelationship	filterTeam(me, relationship );
 	PartitionFilterStealthedAndUndetected filterStealthed( me, FALSE );
-	
+
 	PartitionFilter *filters[5];
 	filters[0] = &aliveFilter;
 	filters[1] = &filterMapStatus;
@@ -286,21 +281,21 @@ Object* CommandButtonHuntUpdate::scanClosestTarget(void)
  	const SpecialPowerTemplate *spTemplate = m_commandButton->getSpecialPowerTemplate();
 	if( !isEnter )
 	{
-		if( !spTemplate ) 
+		if( !spTemplate )
 			return NULL;  // isn't going to happen.
 		isBlackLotusVehicleHack = 	(spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK);
 		isCaptureBuilding = 	(spTemplate->getSpecialPowerType() == SPECIAL_INFANTRY_CAPTURE_BUILDING);
-		if (isCaptureBuilding) 
+		if (isCaptureBuilding)
 		{
 			filters[3] = NULL;  // It's ok (in fact necessary for oil derricks) to capture special buildings.
-			if (spTemplate->getSpecialPowerType() == SPECIAL_TIMED_CHARGES) 
+			if (spTemplate->getSpecialPowerType() == SPECIAL_TIMED_CHARGES)
 				isPlaceExplosive = true;
-			if (spTemplate->getSpecialPowerType() == SPECIAL_TANKHUNTER_TNT_ATTACK) 
+			if (spTemplate->getSpecialPowerType() == SPECIAL_TANKHUNTER_TNT_ATTACK)
 				isPlaceExplosive = true;
 		}
 	}
 
-	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( me->getPosition(), data->m_scanRange, 
+	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( me->getPosition(), data->m_scanRange,
 		FROM_CENTER_2D, filters, ITER_SORTED_NEAR_TO_FAR );
 	MemoryPoolObjectHolder hold(iter);
 
@@ -320,7 +315,7 @@ Object* CommandButtonHuntUpdate::scanClosestTarget(void)
 			if (other->isDisabled() && isBlackLotusVehicleHack) {
 				// The hack disables the vehicle, so we don't want to do it again.
 				continue;
-			}	
+			}
 			if (isCaptureBuilding) {
 				if (me->getControllingPlayer() == other->getControllingPlayer()) {
 					continue; // no need to capture our own buildings.
@@ -346,19 +341,19 @@ Object* CommandButtonHuntUpdate::scanClosestTarget(void)
 				Real dist = sqrt(distSqr);
 				Int curPriority = data->m_scanRange - dist;
 				if (info) curPriority = info->getPriority(other->getTemplate());
-				if (curPriority == 0) 
+				if (curPriority == 0)
 					continue; // don't attack 0 priority targets.
 				Int modifier = dist/TheAI->getAiData()->m_attackPriorityDistanceModifier;
 				Int modPriority = curPriority-modifier;
-				if (modPriority < 1) 
+				if (modPriority < 1)
 					modPriority = 1;
-				if (modPriority > effectivePriority) 
+				if (modPriority > effectivePriority)
 				{
 					effectivePriority = modPriority;
 					actualPriority = curPriority;
 					bestTarget = other;
 				}
-				if (modPriority == effectivePriority && curPriority > actualPriority) 
+				if (modPriority == effectivePriority && curPriority > actualPriority)
 				{
 					effectivePriority = modPriority;
 					actualPriority = curPriority;
@@ -405,7 +400,7 @@ void CommandButtonHuntUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -438,7 +433,7 @@ void CommandButtonHuntUpdate::xfer( Xfer *xfer )
 		{
 			Object *us = getObject();
 			const CommandSet *commandSet = TheControlBar->findCommandSet( us->getCommandSetString() );
-	
+
 			if( commandSet )
 			{
 				const CommandButton *button;
@@ -449,21 +444,21 @@ void CommandButtonHuntUpdate::xfer( Xfer *xfer )
 					button = commandSet->getCommandButton(i);
 					if( button && button->getName() == m_commandButtonName )
 					{
-					
+
 						m_commandButton = button;
 						break;  // exit for, i
 
-					}  // end if
+					}
 
-				}  // end for, i
+				}
 
-			} // end if, commandSet
+			}
 
-		}  // end if, command button name present
+		}
 
-	}  // end if, loading
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -474,4 +469,4 @@ void CommandButtonHuntUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DeletionUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DeletionUpdate.cpp
index 6261c61fe77..e6726621abb 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DeletionUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DeletionUpdate.cpp
@@ -58,7 +58,7 @@ DeletionUpdate::~DeletionUpdate( void )
 //-------------------------------------------------------------------------------------------------
 void DeletionUpdate::setLifetimeRange( UnsignedInt minFrames, UnsignedInt maxFrames )
 {
-	
+
 #if defined RTS_DEBUG && defined CRISS_CROSS_GEOMETRY
 	setWakeFrame(getObject(), UPDATE_SLEEP(2));
 #else
@@ -115,7 +115,7 @@ void DeletionUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -136,7 +136,7 @@ void DeletionUpdate::xfer( Xfer *xfer )
 	// die frame
 	xfer->xferUnsignedInt( &m_dieFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -147,4 +147,4 @@ void DeletionUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DemoTrapUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DemoTrapUpdate.cpp
index dd4ba265446..e4d7dfb820a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DemoTrapUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DemoTrapUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   Update module to handle demo trap proximity triggering.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES
 
@@ -65,7 +65,7 @@ DemoTrapUpdateModuleData::DemoTrapUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
     { "DefaultProximityMode",      INI::parseBool,								NULL, offsetof( DemoTrapUpdateModuleData, m_defaultsToProximityMode ) },
     { "DetonationWeaponSlot",      INI::parseLookupList,					TheWeaponSlotTypeNamesLookupList, offsetof( DemoTrapUpdateModuleData, m_detonationWeaponSlot ) },
@@ -87,7 +87,7 @@ DemoTrapUpdate::DemoTrapUpdate( Thing *thing, const ModuleData* moduleData ) : U
 {
 	m_nextScanFrames = 0;
 	m_detonated = false;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -129,7 +129,7 @@ void DemoTrapUpdate::onObjectCreated()
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime DemoTrapUpdate::update()
-{	
+{
 /// @todo srj use SLEEPY_UPDATE here
 	const DemoTrapUpdateModuleData *data = getDemoTrapUpdateModuleData();
 
@@ -171,7 +171,7 @@ UpdateSleepTime DemoTrapUpdate::update()
 		return UPDATE_SLEEP_NONE;
 	}
 
-	
+
 	if( weaponSlot == data->m_manualModeWeaponSlot )
 	{
 		//Don't scan!
@@ -201,7 +201,7 @@ UpdateSleepTime DemoTrapUpdate::update()
 		{
 			continue;
 		}
-		
+
 		if( other->isKindOf( KINDOF_DOZER ) )
 		{
 			//If we're dealing with a dozer... check if it's trying to disarm me. If so, don't blow up!
@@ -283,7 +283,7 @@ void DemoTrapUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -307,7 +307,7 @@ void DemoTrapUpdate::xfer( Xfer *xfer )
 	// detonated
 	xfer->xferBool( &m_detonated );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -318,4 +318,4 @@ void DemoTrapUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp
index ec06be50cda..78e61ac97da 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   Behavior common to all DockUpdates is here.  Everything but action()
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/Debug.h"
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
@@ -51,7 +51,7 @@ DockUpdateModuleData::DockUpdateModuleData( void )
 
 	UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "NumberApproachPositions"	,INI::parseInt,		NULL, offsetof( DockUpdateModuleData, m_numberApproachPositionsData ) },
 		{ "AllowsPassthrough"				,INI::parseBool,	NULL, offsetof( DockUpdateModuleData, m_isAllowPassthrough ) },
@@ -61,7 +61,7 @@ DockUpdateModuleData::DockUpdateModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 DockUpdate::DockUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
@@ -228,7 +228,7 @@ Bool DockUpdate::isClearToAdvance( Object const* docker, Int dockerIndex ) const
 	Bool correctRequest = dockerID == m_approachPositionOwners[dockerIndex];
 	Bool approachReached = m_approachPositionReached[dockerIndex];
 	Bool nextSpotFree = (dockerIndex > 0)  &&  (m_approachPositionOwners[dockerIndex - 1] == INVALID_ID);
-	
+
 	return correctRequest && approachReached && nextSpotFree;
 }
 
@@ -356,9 +356,9 @@ void DockUpdate::onDockReached( Object* docker )
 void DockUpdate::onExitReached( Object* docker )
 {
 	Object *me = getObject();
-	me->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK2(MODELCONDITION_DOCKING_ACTIVE, MODELCONDITION_DOCKING), 
+	me->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK2(MODELCONDITION_DOCKING_ACTIVE, MODELCONDITION_DOCKING),
 																			MAKE_MODELCONDITION_MASK(MODELCONDITION_DOCKING_ENDING) );
-	docker->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK2(MODELCONDITION_DOCKING_ACTIVE, MODELCONDITION_DOCKING), 
+	docker->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK2(MODELCONDITION_DOCKING_ACTIVE, MODELCONDITION_DOCKING),
 																					MAKE_MODELCONDITION_MASK(MODELCONDITION_DOCKING_ENDING) );
 	m_dockerInside = FALSE;
 
@@ -394,7 +394,7 @@ void DockUpdate::cancelDock( Object* docker )
 		Object *dockingObject = TheGameLogic->findObjectByID(m_activeDocker);
 		m_activeDocker = INVALID_ID;
 		m_dockerInside = FALSE;
-		// clear any model conditions related to docking that may be set on us and them.  
+		// clear any model conditions related to docking that may be set on us and them.
 		// (Normal clear is part of each stage, but we won't get there.)
 		ModelConditionFlags clear;
 		clear.set( MODELCONDITION_DOCKING_ENDING );
@@ -430,7 +430,7 @@ UpdateSleepTime DockUpdate::update()
 	else if ( getObject()->isKindOf( KINDOF_SUPPLY_SOURCE ) )
 	{
 		Object *docker = TheGameLogic->findObjectByID( m_activeDocker );
-		if ( docker && docker->isKindOf( KINDOF_DOZER ) && docker->isKindOf( KINDOF_HARVESTER ))// a worker 
+		if ( docker && docker->isKindOf( KINDOF_DOZER ) && docker->isKindOf( KINDOF_HARVESTER ))// a worker
 		{
 			ModelConditionFlags test;
 			test.set( MODELCONDITION_DOCKING_BEGINNING );
@@ -452,10 +452,10 @@ Coord3D DockUpdate::computeApproachPosition( Int positionIndex, Object *forWhom
 
 	Coord3D bestPosition;// This answer is the best, as it includes findPositionAround
 	Coord3D workingPosition;// But if findPositionAround fails, we need to say something.
-	
+
 	FindPositionOptions fpOptions;
 	// Start with the pristine bone, then convert it to the world, then find a clean spot around it.
-	
+
 	Object *us = getObject();
 	us->convertBonePosToWorldPos( &m_approachPositions[positionIndex], NULL, &workingPosition, NULL );
 
@@ -497,10 +497,10 @@ void DockUpdate::loadDockPositions()
 	if (myDrawable)
 	{
 		//Patch 1.03 - Kris - Jan 19, 2005
-		//Some of the GLASupplyStash assets still have docking bones in them. When found, the docking positions must be 
+		//Some of the GLASupplyStash assets still have docking bones in them. When found, the docking positions must be
 		//observed. This occurs when upgrading to fortified structures which still have the bones. This has the negative
 		//side-effect of workers suddenly slowing down their gathering rate. The proper fix would be to remove the bones
-		//from the assets, but the artists could not find the original max files, hence the code solution. 
+		//from the assets, but the artists could not find the original max files, hence the code solution.
 		if( !obj->isKindOf( KINDOF_IGNORE_DOCKING_BONES ) )
 		{
 
@@ -555,7 +555,7 @@ void DockUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -631,7 +631,7 @@ void DockUpdate::xfer( Xfer *xfer )
 	// dock open
 	xfer->xferBool( &m_dockOpen );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -642,5 +642,5 @@ void DockUpdate::loadPostProcess( void )
 	// call base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/PrisonDockUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/PrisonDockUpdate.cpp
index 149b5fb0c1a..3ec47ffad9d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/PrisonDockUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/PrisonDockUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
@@ -45,14 +45,14 @@ PrisonDockUpdate::PrisonDockUpdate( Thing *thing, const ModuleData* moduleData )
 								: DockUpdate( thing, moduleData )
 {
 
-}  // end PrisonDockUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 PrisonDockUpdate::~PrisonDockUpdate( void )
 {
 
-}  // end ~PrisonDockUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do the action while docked
@@ -73,10 +73,10 @@ Bool PrisonDockUpdate::action( Object *docker, Object *drone )
 
 	// unload the prisoners from the docker into us
 	AIUpdateInterface *ai = docker->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH( ai, ("'%s' docking with prison has no AI\n",
+	DEBUG_ASSERTCRASH( ai, ("'%s' docking with prison has no AI",
 												 docker->getTemplate()->getName().str()) );
 	POWTruckAIUpdateInterface *powAI = ai->getPOWTruckAIUpdateInterface();
-	DEBUG_ASSERTCRASH( powAI, ("'s' docking with prison has no POW Truck AI\n",
+	DEBUG_ASSERTCRASH( powAI, ("'s' docking with prison has no POW Truck AI",
 														docker->getTemplate()->getName().str()) );
 
 	powAI->unloadPrisonersToPrison( getObject() );
@@ -84,7 +84,7 @@ Bool PrisonDockUpdate::action( Object *docker, Object *drone )
 	// end docking
 	return FALSE;
 
-}  // end action
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -95,7 +95,7 @@ void PrisonDockUpdate::crc( Xfer *xfer )
 	// extend base class
 	DockUpdate::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -113,7 +113,7 @@ void PrisonDockUpdate::xfer( Xfer *xfer )
 	// extend base class
 	DockUpdate::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -124,6 +124,6 @@ void PrisonDockUpdate::loadPostProcess( void )
 	// extend base class
 	DockUpdate::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 #endif
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RailedTransportDockUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RailedTransportDockUpdate.cpp
index 45fbfb2348e..4fc9e293c6f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RailedTransportDockUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RailedTransportDockUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
@@ -53,7 +53,7 @@ RailedTransportDockUpdateModuleData::RailedTransportDockUpdateModuleData( void )
 	m_pullInsideDurationInFrames = 0;
 	m_pushOutsideDurationInFrames = 0;
 	m_toleranceDistance = 50.0f;
-}  // end RailedTransportDockUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -61,10 +61,10 @@ RailedTransportDockUpdateModuleData::RailedTransportDockUpdateModuleData( void )
 {
   DockUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
-		{ "PullInsideDuration", INI::parseDurationUnsignedInt, NULL, offsetof( RailedTransportDockUpdateModuleData, m_pullInsideDurationInFrames ) },	
+		{ "PullInsideDuration", INI::parseDurationUnsignedInt, NULL, offsetof( RailedTransportDockUpdateModuleData, m_pullInsideDurationInFrames ) },
 		{ "PushOutsideDuration",INI::parseDurationUnsignedInt, NULL, offsetof( RailedTransportDockUpdateModuleData, m_pushOutsideDurationInFrames ) },
 		{ "ToleranceDistance",  INI::parseReal,								 NULL, offsetof( RailedTransportDockUpdateModuleData, m_toleranceDistance ) },
 		{ 0, 0, 0, 0 }
@@ -73,7 +73,7 @@ RailedTransportDockUpdateModuleData::RailedTransportDockUpdateModuleData( void )
 
   p.add( dataFieldParse );
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -91,23 +91,23 @@ RailedTransportDockUpdate::RailedTransportDockUpdate( Thing *thing, const Module
 	m_pushOutsideDistancePerFrame = 0.0f;
 	m_unloadCount = UNLOAD_ALL;
 
-}  // end RailedTransportDockUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 RailedTransportDockUpdate::~RailedTransportDockUpdate( void )
 {
 
-}  // end ~RailedTransportDockUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 UpdateSleepTime RailedTransportDockUpdate::update( void )
 {
-	
+
 	// extend functionality
 	UpdateSleepTime result;
-	
+
 	result = DockUpdate::update();
 
 	// do any pull in docking we need to
@@ -117,7 +117,7 @@ UpdateSleepTime RailedTransportDockUpdate::update( void )
 	doPushOutDocking();
 
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** The dock action callback, return FALSE when done docking */
@@ -170,12 +170,12 @@ Bool RailedTransportDockUpdate::action( Object *docker, Object *drone )
 			angleVector.y = dockPos->y - dockerPos->y;
 			docker->setOrientation( angleVector.toAngle() );
 		}
-		
-	}  // end if	
+
+	}
 
 	return TRUE;
 
-}  // end action
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Is clear to enter the railed transport */
@@ -195,8 +195,8 @@ Bool RailedTransportDockUpdate::isClearToEnter( Object const *docker ) const
 		return FALSE;
 
 	return TRUE;
-		
-}  // end isClearToEnter
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Is anything currently loading or unloading */
@@ -206,10 +206,10 @@ Bool RailedTransportDockUpdate::isLoadingOrUnloading( void )
 
 	if( m_unloadingObjectID != INVALID_ID || m_dockingObjectID != INVALID_ID )
 		return TRUE;
-	
+
 	return FALSE;
 
-}  // end isLoadingOrUnloading
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Start the unload process */
@@ -225,7 +225,7 @@ void RailedTransportDockUpdate::unloadAll( void )
 	m_unloadCount = UNLOAD_ALL;
 	unloadNext();
 
-}  // end manualUnload
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Unload a single individual only */
@@ -237,7 +237,7 @@ void RailedTransportDockUpdate::unloadSingleObject( Object *obj )
 	m_unloadCount = 1;
 	unloadNext();
 
-}  // end unloadSingleObject
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -259,7 +259,7 @@ void RailedTransportDockUpdate::doPullInDocking( void )
 	{
 		Object *us = getObject();
 		Object *docker = TheGameLogic->findObjectByID( m_dockingObjectID );
-		
+
 		// check for docker gone
 		if( docker == NULL )
 			m_dockingObjectID = INVALID_ID;
@@ -319,17 +319,17 @@ void RailedTransportDockUpdate::doPullInDocking( void )
 				{
 					contain->addToContain( docker );
 				}
-				
+
 				// no object is docking now
 				m_dockingObjectID = INVALID_ID;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end doPullInDocking
+}
 
 // ------------------------------------------------------------------------------------------------
 /** If we have an object recorded as being pushed out of us then do that here */
@@ -348,7 +348,7 @@ void RailedTransportDockUpdate::doPushOutDocking( void )
 			unloadNext();
 			return;
 
-		}  // end if
+		}
 
 		// pull it
 		if( unloader )
@@ -417,18 +417,18 @@ void RailedTransportDockUpdate::doPushOutDocking( void )
 					us->convertBonePosToWorldPos( &finalPos, NULL, &finalPos, NULL );
 					unloaderAI->aiMoveToPosition( &finalPos, CMD_FROM_AI );
 
-				}  // end if
-						
+				}
+
 				// unload the next object
-				unloadNext();				
+				unloadNext();
 
-			}  // end if
-		
-		}  // end if
+			}
 
-	}  // end if, m_unloadingID
+		}
 
-}  // end doPushOutDocking
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Iterate callback for the finding the first contained object */
@@ -444,7 +444,7 @@ static void getFirstContain( Object *obj, void *userData )
 	// assign this as the first object found
 	*firstContain = obj;
 
-}  // end getFirstContain
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Start the next object contained by us as "unloading and coming out" */
@@ -466,7 +466,7 @@ void RailedTransportDockUpdate::unloadNext( void )
 	// better be an open container
 	ContainModuleInterface *contain = us->getContain();
 	OpenContain *openContain = contain ? contain->asOpenContain() : NULL;
-	DEBUG_ASSERTCRASH( openContain, ("Unloading next from railed transport, but '%s' has no open container\n",
+	DEBUG_ASSERTCRASH( openContain, ("Unloading next from railed transport, but '%s' has no open container",
 										 us->getTemplate()->getName().str()) );
 
 	// get the first contained object
@@ -480,7 +480,7 @@ void RailedTransportDockUpdate::unloadNext( void )
 
 		// set position of the loader to our position
 		unloader->setPosition( us->getPosition() );
-	
+
 		// orient unloader to the same angle as us so we can drive out the front
 		unloader->setOrientation( us->getOrientation() );
 
@@ -507,17 +507,17 @@ void RailedTransportDockUpdate::unloadNext( void )
 		// now that we know how far we must go, now much distance should we travel every frame
 		const RailedTransportDockUpdateModuleData *modData = getRailedTransportDockUpdateModuleData();
 		m_pushOutsideDistancePerFrame = mag / modData->m_pushOutsideDurationInFrames;
-		
+
 		// set this as our current unloader
 		m_unloadingObjectID = unloader->getID();
-	
+
 		// we've now used an unload (if we're keeping count for single exits)
 		if( m_unloadCount != UNLOAD_ALL )
 			--m_unloadCount;
-						
-	}  // end if
 
-}  // end unloadNext
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -528,7 +528,7 @@ void RailedTransportDockUpdate::crc( Xfer *xfer )
 	// extend base class
 	DockUpdate::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -545,7 +545,7 @@ void RailedTransportDockUpdate::xfer( Xfer *xfer )
 
 	// extend base class
 	DockUpdate::xfer( xfer );
-	
+
 	// docking object id
 	xfer->xferObjectID( &m_dockingObjectID );
 
@@ -561,7 +561,7 @@ void RailedTransportDockUpdate::xfer( Xfer *xfer )
 	// unload count
 	xfer->xferInt( &m_unloadCount );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -572,4 +572,4 @@ void RailedTransportDockUpdate::loadPostProcess( void )
 	// extend base class
 	DockUpdate::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RepairDockUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RepairDockUpdate.cpp
index db1834d4345..62f452f4986 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RepairDockUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/RepairDockUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -42,7 +42,7 @@ RepairDockUpdateModuleData::RepairDockUpdateModuleData( void )
 
 	m_framesForFullHeal = 1.0f;  // 1 frame, instant heal by default (keeps away from divide by 0's)
 
-}  // end RepairDockUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -51,7 +51,7 @@ RepairDockUpdateModuleData::RepairDockUpdateModuleData( void )
 
 	DockUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "TimeForFullHeal", INI::parseDurationReal, NULL, offsetof( RepairDockUpdateModuleData, m_framesForFullHeal ) },
 		{ 0, 0, 0, 0 }
@@ -59,7 +59,7 @@ RepairDockUpdateModuleData::RepairDockUpdateModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -74,14 +74,14 @@ RepairDockUpdate::RepairDockUpdate( Thing *thing, const ModuleData* moduleData )
   m_lastRepair = INVALID_ID;
 	m_healthToAddPerFrame = 0.0f;
 
-}  // end RepairDockUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 RepairDockUpdate::~RepairDockUpdate( void )
 {
 
-}  // end ~RepairDockUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do the action while docked
@@ -120,7 +120,7 @@ Bool RepairDockUpdate::action( Object *docker, Object *drone )
 		//
 		m_healthToAddPerFrame = (body->getMaxHealth() - body->getHealth()) / modData->m_framesForFullHeal;
 
-	}  // end if
+	}
 
 	// if we're at max health we're done
 	if( body->getHealth() >= body->getMaxHealth() )
@@ -132,7 +132,7 @@ Bool RepairDockUpdate::action( Object *docker, Object *drone )
 		// returning false will complete the docking process
 		return FALSE;
 
-	}  // end if
+	}
 
 	// give us some health buddy
 	DamageInfo healingInfo;
@@ -147,11 +147,11 @@ Bool RepairDockUpdate::action( Object *docker, Object *drone )
 		healingInfo.in.m_amount = body->getMaxHealth();
 		body->attemptHealing( &healingInfo );
 	}
-	
+
 	// stay docked
 	return TRUE;
 
-}  // end action
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -162,7 +162,7 @@ void RepairDockUpdate::crc( Xfer *xfer )
 	// extend base class
 	DockUpdate::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -186,7 +186,7 @@ void RepairDockUpdate::xfer( Xfer *xfer )
 	// health to add per frame
 	xfer->xferReal( &m_healthToAddPerFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -197,4 +197,4 @@ void RepairDockUpdate::loadPostProcess( void )
 	// extend base class
 	DockUpdate::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp
index 8cf7600af42..769a8843bfb 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp
@@ -27,21 +27,17 @@
 // Desc:   The action of this dock update is taking boxes and turning them into money for my ownerplayer
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Xfer.h"
 #include "GameLogic/Module/SupplyCenterDockUpdate.h"
 #include "GameLogic/Module/SupplyTruckAIUpdate.h"
 #include "GameClient/Color.h"
+#include "GameClient/Drawable.h"
 #include "GameClient/InGameUI.h"
 #include "GameClient/GameText.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -57,7 +53,7 @@ SupplyCenterDockUpdateModuleData::SupplyCenterDockUpdateModuleData( void )
 
 	DockUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "GrantTemporaryStealth",		INI::parseDurationUnsignedInt,  NULL, offsetof( SupplyCenterDockUpdateModuleData, m_grantTemporaryStealthFrames ) },
 		{ 0, 0, 0, 0 }
@@ -65,7 +61,7 @@ SupplyCenterDockUpdateModuleData::SupplyCenterDockUpdateModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -102,7 +98,7 @@ Bool SupplyCenterDockUpdate::action( Object* docker, Object *drone )
 	Player *ownerPlayer = getObject()->getControllingPlayer();
 	while( supplyTruckAI->loseOneBox() )
 		value += ownerPlayer->getSupplyBoxValue();
-	
+
 	// Add money boost from upgrades that give extra money
 	value += supplyTruckAI->getUpgradedSupplyBoost();
 
@@ -117,7 +113,7 @@ Bool SupplyCenterDockUpdate::action( Object* docker, Object *drone )
 		{
 			StealthUpdate *stealth = docker->getStealth();
 			//Only grant temporary stealth to the default stealth update. It's
-			//possible that another type of stealth was granted... like the 
+			//possible that another type of stealth was granted... like the
 			//GPS scrambler. We want that to take precendence.
 			if( getObject()->testStatus( OBJECT_STATUS_STEALTHED ) )
 			{
@@ -132,18 +128,8 @@ Bool SupplyCenterDockUpdate::action( Object* docker, Object *drone )
 			}
 		}
 	}
-	
-	Bool displayMoney = value > 0 ? TRUE : FALSE;
-	if( getObject()->testStatus(OBJECT_STATUS_STEALTHED) )
-	{
-		// OY LOOK!  I AM USING LOCAL PLAYER.  Do not put anything other than TheInGameUI->addFloatingText in the block this controls!!!
-		if( !getObject()->isLocallyControlled() && !getObject()->testStatus(OBJECT_STATUS_DETECTED) )
-		{
-			displayMoney = FALSE;
-		}
-	}
-		
-	if( displayMoney )
+
+	if (value > 0 && getObject()->isLogicallyVisible())
 	{
 		// OY LOOK!  I AM USING LOCAL PLAYER.  Do not put anything other than TheInGameUI->addFloatingText in the block this controls!!!
 		// Setup info for adding a floating text
@@ -156,11 +142,11 @@ Bool SupplyCenterDockUpdate::action( Object* docker, Object *drone )
 		pos.y = dockerPos->y;
 		pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y);//dockerPos->z + docker->getGeometryInfo().getHeight();
 		Color color = ownerPlayer->getPlayerColor() | GameMakeColor( 0, 0, 0, 230 );
-		
+
 		TheInGameUI->addFloatingText(moneys, &pos, color);
 	}
 
-		
+
 	return FALSE;
 }
 
@@ -176,7 +162,7 @@ UpdateSleepTime SupplyCenterDockUpdate::update()
 	SupplyCenterCreate* create = (SupplyCenterCreate*)getObject()->findCreateModule(key_SupplyCenterCreate);
 	DEBUG_ASSERTCRASH( create && ! create->shouldDoOnBuildComplete(), ("A Supply center did not call onBuildComplete.") );
 #endif
-	
+
 	return result;
 }
 
@@ -189,7 +175,7 @@ void SupplyCenterDockUpdate::crc( Xfer *xfer )
 	// extend base class
 	DockUpdate::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -207,7 +193,7 @@ void SupplyCenterDockUpdate::xfer( Xfer *xfer )
 	// extend base class
 	DockUpdate::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -218,4 +204,4 @@ void SupplyCenterDockUpdate::loadPostProcess( void )
 	// extend base class
 	DockUpdate::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyWarehouseDockUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyWarehouseDockUpdate.cpp
index a96848cc684..364da3d25dd 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyWarehouseDockUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyWarehouseDockUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   The action of this dock update is identifying who is docking and either taking Boxes away or giving them
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GlobalData.h"
 #include "Common/Xfer.h"
@@ -38,11 +38,6 @@
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/AIPathfind.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 SupplyWarehouseDockUpdateModuleData::SupplyWarehouseDockUpdateModuleData( void )
@@ -58,7 +53,7 @@ SupplyWarehouseDockUpdateModuleData::SupplyWarehouseDockUpdateModuleData( void )
 
 	DockUpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "StartingBoxes",	INI::parseInt,	NULL, offsetof( SupplyWarehouseDockUpdateModuleData, m_startingBoxesData ) },
 		{ "DeleteWhenEmpty",	INI::parseBool,	NULL, offsetof( SupplyWarehouseDockUpdateModuleData, m_deleteWhenEmpty ) },
@@ -67,7 +62,7 @@ SupplyWarehouseDockUpdateModuleData::SupplyWarehouseDockUpdateModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -100,7 +95,7 @@ Bool SupplyWarehouseDockUpdate::action( Object* docker, Object *drone )
 	Real closeEnoughSqr = sqr(docker->getGeometryInfo().getBoundingCircleRadius()*2);
 	Real curDistSqr = ThePartitionManager->getDistanceSquared(docker, getObject(), FROM_BOUNDINGSPHERE_2D);
 	if (curDistSqr > closeEnoughSqr) {
-		DEBUG_LOG(("Failing dock, dist %f, not close enough(%f).\n", sqrt(curDistSqr), sqrt(closeEnoughSqr)));
+		DEBUG_LOG(("Failing dock, dist %f, not close enough(%f).", sqrt(curDistSqr), sqrt(closeEnoughSqr)));
 		// Make it twitch a little.
 		Coord3D newPos = *docker->getPosition();
 		Real range = 0.4*PATHFIND_CELL_SIZE_F;
@@ -109,7 +104,7 @@ Bool SupplyWarehouseDockUpdate::action( Object* docker, Object *drone )
 		docker->setPosition(&newPos);
 		return FALSE;  //not close enough.
 	}
-	
+
 	--m_boxesStored;// so the docker sees that I am shy by one box (or empty) from within his gainOneBox()
 
 	SupplyTruckAIInterface *ai = docker->getAIUpdateInterface()->getSupplyTruckAIInterface();
@@ -131,7 +126,7 @@ Bool SupplyWarehouseDockUpdate::action( Object* docker, Object *drone )
 
 		return TRUE;
 	}
-	else 
+	else
 		++m_boxesStored; //take it back, since there was noone to gain the box
   									 //this is important so that I have one less boxes as perceived by the docker when he gains one
 
@@ -192,7 +187,7 @@ void SupplyWarehouseDockUpdate::crc( Xfer *xfer )
 	// extend base class
 	DockUpdate::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -213,7 +208,7 @@ void SupplyWarehouseDockUpdate::xfer( Xfer *xfer )
 	// boxes stored
 	xfer->xferInt( &m_boxesStored );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -231,4 +226,4 @@ void SupplyWarehouseDockUpdate::loadPostProcess( void )
 	if( draw )
 		draw->updateDrawableSupplyStatus( modData->m_startingBoxesData, m_boxesStored );
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DynamicGeometryInfoUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DynamicGeometryInfoUpdate.cpp
index 15b51a9a2f6..4f7892ae6c8 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DynamicGeometryInfoUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DynamicGeometryInfoUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Module/DynamicGeometryInfoUpdate.h"
@@ -59,7 +59,7 @@ DynamicGeometryInfoUpdateModuleData::DynamicGeometryInfoUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
 		{ "InitialDelay",					INI::parseDurationUnsignedInt,		NULL, offsetof(DynamicGeometryInfoUpdateModuleData, m_initialDelay) },
@@ -94,7 +94,7 @@ DynamicGeometryInfoUpdate::DynamicGeometryInfoUpdate( Thing *thing, const Module
 
 	m_reverseAtTransitionTime = modData->m_reverseAtTransitionTime;
 	m_switchedDirections = FALSE;
-	
+
 	// record in our instance what initial and final height are
 	m_initialHeight = modData->m_initialHeight;
 	m_initialMajorRadius = modData->m_initialMajorRadius;
@@ -103,7 +103,7 @@ DynamicGeometryInfoUpdate::DynamicGeometryInfoUpdate( Thing *thing, const Module
 	m_finalMajorRadius = modData->m_finalMajorRadius;
 	m_finalMinorRadius = modData->m_finalMinorRadius;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -129,7 +129,7 @@ UpdateSleepTime DynamicGeometryInfoUpdate::update( void )
 
 		m_started = TRUE;
 
-	}  // end if
+	}
 
 	// Either we've been running, or we just started right now.  Doesn't matter.
 	const DynamicGeometryInfoUpdateModuleData *data = getDynamicGeometryInfoUpdateModuleData();
@@ -171,16 +171,16 @@ UpdateSleepTime DynamicGeometryInfoUpdate::update( void )
 			m_finalMajorRadius = data->m_initialMajorRadius;
 			m_finalMinorRadius = data->m_initialMinorRadius;
 
-		}  // end if
+		}
 		else
 		{
 
 			// no switch needed ... we're all done
 			m_finished = TRUE;
 
-		}  // end else
+		}
 
-	}  // end if, time active is longer than transition time
+	}
 
 	return UPDATE_SLEEP_NONE;
 }
@@ -194,7 +194,7 @@ void DynamicGeometryInfoUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -251,7 +251,7 @@ void DynamicGeometryInfoUpdate::xfer( Xfer *xfer )
 	// final minor radius
 	xfer->xferReal( &m_finalMinorRadius );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -262,4 +262,4 @@ void DynamicGeometryInfoUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp
index 8f26958d6c9..b7934fe544d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp
@@ -37,11 +37,6 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 DynamicShroudClearingRangeUpdateModuleData::DynamicShroudClearingRangeUpdateModuleData()
@@ -58,11 +53,11 @@ DynamicShroudClearingRangeUpdateModuleData::DynamicShroudClearingRangeUpdateModu
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void DynamicShroudClearingRangeUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void DynamicShroudClearingRangeUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ChangeInterval",			INI::parseDurationUnsignedInt,	NULL, offsetof( DynamicShroudClearingRangeUpdateModuleData, m_changeInterval ) },
 		{ "GrowInterval",			INI::parseDurationUnsignedInt,	NULL, offsetof( DynamicShroudClearingRangeUpdateModuleData, m_growInterval ) },
@@ -78,13 +73,13 @@ DynamicShroudClearingRangeUpdateModuleData::DynamicShroudClearingRangeUpdateModu
 }
 
 //-------------------------------------------------------------------------------------------------
-//                                                                                                 
-//  doneForeverFrame                                                                               
-//  o                |                                     shrinkdelay                    |        
-//  |<-----------------------------------stateCountDown---------------------------------->|        
-//  |  shrinktime    |                                     |   growtime  |   growdelay    |        
-//  |                shrinkStartDeadline                   sustain       growStartDeadline|        
-//                                                                                                 
+//
+//  doneForeverFrame
+//  o                |                                     shrinkdelay                    |
+//  |<-----------------------------------stateCountDown---------------------------------->|
+//  |  shrinktime    |                                     |   growtime  |   growdelay    |
+//  |                shrinkStartDeadline                   sustain       growStartDeadline|
+//
 //-------------------------------------------------------------------------------------------------
 DynamicShroudClearingRangeUpdate::DynamicShroudClearingRangeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
@@ -106,8 +101,8 @@ DynamicShroudClearingRangeUpdate::DynamicShroudClearingRangeUpdate( Thing *thing
 
 	m_doneForeverFrame = TheGameLogic->getFrame() + m_stateCountDown;// a failsafe to force a shutdown on schedule
 
-//	m_shrinkStartDeadline;	
-//	m_doneForeverFrame; //	
+//	m_shrinkStartDeadline;
+//	m_doneForeverFrame; //
 
 	m_decalsCreated = FALSE;
 	m_nativeClearingRange = 200;// a sensible default
@@ -342,7 +337,7 @@ void DynamicShroudClearingRangeUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -379,11 +374,11 @@ void DynamicShroudClearingRangeUpdate::xfer( Xfer *xfer )
 	xfer->xferBool( &m_decalsCreated );
 
 	xfer->xferReal( &m_visionChangePerInterval );
-	
+
 	xfer->xferReal( &m_nativeClearingRange );
 	xfer->xferReal( &m_currentClearingRange );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -394,4 +389,4 @@ void DynamicShroudClearingRangeUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp
index 0873b59b777..8023998b8f0 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Thing.h"
 #include "Common/ThingTemplate.h"
@@ -50,11 +50,6 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
@@ -85,18 +80,18 @@ static void saturateRGB(RGBColor& color, Real factor)
 EMPUpdate::EMPUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 
-	//s_lastInstanceSpunPositive = !s_lastInstanceSpunPositive; //TOGGLES STATIC BOOL 
+	//s_lastInstanceSpunPositive = !s_lastInstanceSpunPositive; //TOGGLES STATIC BOOL
 
 	const EMPUpdateModuleData *data = getEMPUpdateModuleData();
 	if ( data )
 	{
 		//SANITY
-		DEBUG_ASSERTCRASH( TheGameLogic, ("EMPUpdate::EMPUpdate - TheGameLogic is NULL\n" ) );
+		DEBUG_ASSERTCRASH( TheGameLogic, ("EMPUpdate::EMPUpdate - TheGameLogic is NULL" ) );
 		UnsignedInt now = TheGameLogic->getFrame();
 
 		m_currentScale = data->m_startScale;
-		m_dieFrame = REAL_TO_UNSIGNEDINT( now + data->m_lifeFrames );			
-		m_tintEnvPlayFrame = REAL_TO_UNSIGNEDINT( now + data->m_startFadeFrame );	
+		m_dieFrame = REAL_TO_UNSIGNEDINT( now + data->m_lifeFrames );
+		m_tintEnvPlayFrame = REAL_TO_UNSIGNEDINT( now + data->m_startFadeFrame );
 		m_tintEnvFadeFrames = m_dieFrame - m_tintEnvPlayFrame;
 		//m_spinRate = GameLogicRandomValueReal(data->m_spinRateMax * 0.5f, data->m_spinRateMax);
 		m_targetScale = GameLogicRandomValueReal(data->m_targetScaleMin, data->m_targetScaleMax);
@@ -107,17 +102,17 @@ EMPUpdate::EMPUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModul
 
 		getObject()->setOrientation(GameLogicRandomValueReal(-PI,PI));
 
-		DEBUG_ASSERTCRASH( m_tintEnvPlayFrame < m_dieFrame, ("EMPUpdate::EMPUpdate - you cant play fade after death\n" ) );
-		
+		DEBUG_ASSERTCRASH( m_tintEnvPlayFrame < m_dieFrame, ("EMPUpdate::EMPUpdate - you cant play fade after death" ) );
+
 		return;
 	}
 
 	//SANITY
-	DEBUG_ASSERTCRASH( data, ("EMPUpdate::EMPUpdate - getEMPUpdateModuleData is NULL\n" ) );
+	DEBUG_ASSERTCRASH( data, ("EMPUpdate::EMPUpdate - getEMPUpdateModuleData is NULL" ) );
 	m_currentScale = 1.0f;
-	m_dieFrame = 0;			
+	m_dieFrame = 0;
 	m_tintEnvFadeFrames = 0;
-	m_tintEnvPlayFrame  = 0;	
+	m_tintEnvPlayFrame  = 0;
 	//m_spinRate = 0;
 	m_targetScale = 1;
 }
@@ -140,7 +135,7 @@ UpdateSleepTime EMPUpdate::update( void )
 	const EMPUpdateModuleData *data = getEMPUpdateModuleData();
 	Drawable *dr = obj->getDrawable();
 	UnsignedInt now = TheGameLogic->getFrame();
-	
+
 	m_currentScale += ( m_targetScale - m_currentScale ) * 0.05f;
 	dr->setInstanceScale( m_currentScale );
 
@@ -154,7 +149,7 @@ UpdateSleepTime EMPUpdate::update( void )
 	{
 		RGBColor end = data->m_endColor;
 		saturateRGB( end, 5 );
-		dr->colorFlash( &end, 9999, m_tintEnvFadeFrames, TRUE );
+		dr->colorFlash( &end, 0, m_tintEnvFadeFrames, ~0u );
 		doDisableAttack();
 	}
 
@@ -198,16 +193,16 @@ void EMPUpdate::doDisableAttack( void )
 		}
 	}
 
-	SimpleObjectIterator *iter;
-	Object *curVictim;
+	SimpleObjectIterator *iter = NULL;
+	Object *curVictim = NULL;
 
 	if (radius > 0.0f)
 	{
-		iter = ThePartitionManager->iterateObjectsInRange(pos, 
+		iter = ThePartitionManager->iterateObjectsInRange(pos,
 			radius, FROM_BOUNDINGSPHERE_3D);
 
 		curVictim = iter->firstWithNumeric(&curVictimDistSqr);
-	} 
+	}
 
 	MemoryPoolObjectHolder hold(iter);
 
@@ -244,7 +239,7 @@ void EMPUpdate::doDisableAttack( void )
 
 
 
-      
+
 
 
       if ( !curVictim->isKindOf( KINDOF_VEHICLE ) && !curVictim->isKindOf(KINDOF_STRUCTURE) && !curVictim->isKindOf(KINDOF_SPAWNS_ARE_THE_WEAPONS) )
@@ -278,7 +273,7 @@ void EMPUpdate::doDisableAttack( void )
 					continue;
 			}
 			// handle cases where we do not want allies to be hit by it's own EMP weapons
-			else if ( (data->m_rejectMask & WEAPON_AFFECTS_ALLIES) && curVictim->getRelationship( object ) == ALLIES) 
+			else if ( (data->m_rejectMask & WEAPON_AFFECTS_ALLIES) && curVictim->getRelationship( object ) == ALLIES)
 			{
 				continue;
 			}
@@ -306,12 +301,12 @@ void EMPUpdate::doDisableAttack( void )
 					Real victimVolume = victimFootprintArea * MIN(victimHeight, 10.0f);
 
 					UnsignedInt emitterCount = MAX(15, REAL_TO_INT_CEIL(data->m_sparksPerCubicFoot * victimVolume));
-			
+
 					for (UnsignedInt e = 0 ; e < emitterCount; ++e)
 					{
 
 						ParticleSystem *sys = TheParticleSystemManager->createParticleSystem(tmp);
-						
+
 						if (sys)
 						{
 							Coord3D offs = {0,0,0};
@@ -336,7 +331,7 @@ void EMPUpdate::doDisableAttack( void )
 							sys->setInitialDelay(GameLogicRandomValue(1,100));
 						}
 					}
-				} 
+				}
 			}
 
 		}
@@ -370,7 +365,7 @@ void EMPUpdate::doDisableAttack( void )
 void EMPUpdate::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -385,7 +380,7 @@ void EMPUpdate::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -393,7 +388,7 @@ void EMPUpdate::xfer( Xfer *xfer )
 void EMPUpdate::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
                                                                                                                                                   ///
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -409,7 +404,7 @@ void EMPUpdate::loadPostProcess( void )
 //  ////////////////^^^
 //  /////////////^
 //  ///////////
- 
+
 
 
 
@@ -419,22 +414,22 @@ LeafletDropBehavior::LeafletDropBehavior( Thing *thing, const ModuleData* module
 {
 
   m_fxFired = FALSE;
-	//s_lastInstanceSpunPositive = !s_lastInstanceSpunPositive; //TOGGLES STATIC BOOL 
+	//s_lastInstanceSpunPositive = !s_lastInstanceSpunPositive; //TOGGLES STATIC BOOL
 
 	const LeafletDropBehaviorModuleData *data = getLeafletDropBehaviorModuleData();
 	if ( data )
 	{
 		//SANITY
-		DEBUG_ASSERTCRASH( TheGameLogic, ("LeafletDropBehavior::LeafletDropBehavior - TheGameLogic is NULL\n" ) );
+		DEBUG_ASSERTCRASH( TheGameLogic, ("LeafletDropBehavior::LeafletDropBehavior - TheGameLogic is NULL" ) );
 		UnsignedInt now = TheGameLogic->getFrame();
     m_startFrame = now + data->m_delayFrames;
-		
+
 		return;
 	}
 
 	//SANITY
-	DEBUG_ASSERTCRASH( data, ("LeafletDropBehavior::LeafletDropBehavior - getLeafletDropBehaviorModuleData is NULL\n" ) );
-	m_startFrame = TheGameLogic->getFrame() + 1;			
+	DEBUG_ASSERTCRASH( data, ("LeafletDropBehavior::LeafletDropBehavior - getLeafletDropBehaviorModuleData is NULL" ) );
+	m_startFrame = TheGameLogic->getFrame() + 1;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -499,16 +494,16 @@ void LeafletDropBehavior::doDisableAttack( void )
 	Real curVictimDistSqr;
 	const Coord3D *pos = object->getPosition();
 
-	SimpleObjectIterator *iter;
-	Object *curVictim;
+	SimpleObjectIterator *iter = NULL;
+	Object *curVictim = NULL;
 
 	if (radius > 0.0f)
 	{
-		iter = ThePartitionManager->iterateObjectsInRange(pos, 
+		iter = ThePartitionManager->iterateObjectsInRange(pos,
 			radius, FROM_BOUNDINGSPHERE_3D);
 
 		curVictim = iter->firstWithNumeric(&curVictimDistSqr);
-	} 
+	}
 
 	MemoryPoolObjectHolder hold(iter);
 
@@ -521,7 +516,7 @@ void LeafletDropBehavior::doDisableAttack( void )
 
       if ( curVictim->getRelationship( object ) != ENEMIES ) // only enemies
 				continue;
-    
+
 			//Disable the target for a specified amount of time.
 			curVictim->setDisabledUntil( DISABLED_EMP, TheGameLogic->getFrame() + data->m_disabledDuration );
 
@@ -536,7 +531,7 @@ void LeafletDropBehavior::doDisableAttack( void )
 void LeafletDropBehavior::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -553,7 +548,7 @@ void LeafletDropBehavior::xfer( Xfer *xfer )
 
   xfer->xferUnsignedInt( &m_startFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -561,7 +556,7 @@ void LeafletDropBehavior::xfer( Xfer *xfer )
 void LeafletDropBehavior::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/EnemyNearUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/EnemyNearUpdate.cpp
index 734086a2a73..b752365d731 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/EnemyNearUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/EnemyNearUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/PerfTimer.h"
 #include "Common/ThingTemplate.h"
@@ -59,7 +59,7 @@ EnemyNearUpdate::~EnemyNearUpdate( void )
 
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Look around us for enemies.
  */
 void EnemyNearUpdate::checkForEnemies( void )
@@ -115,7 +115,7 @@ void EnemyNearUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -139,7 +139,7 @@ void EnemyNearUpdate::xfer( Xfer *xfer )
 	// enemy near
 	xfer->xferBool( &m_enemyNear );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -150,4 +150,4 @@ void EnemyNearUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp
index 0cf18532c87..c2d48595eac 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp
@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES  //TheWeaponSlotTypeNamesLookupList
 
@@ -51,16 +51,11 @@
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/Module/BodyModule.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 FireOCLAfterWeaponCooldownUpdateModuleData::FireOCLAfterWeaponCooldownUpdateModuleData()
 {
-	m_weaponSlot						= PRIMARY_WEAPON; 
+	m_weaponSlot						= PRIMARY_WEAPON;
 	m_minShotsRequired			= 1;
 	m_oclLifetimePerSecond	= 1000;
 	m_oclMaxFrames					= 1000;
@@ -71,7 +66,7 @@ FireOCLAfterWeaponCooldownUpdateModuleData::FireOCLAfterWeaponCooldownUpdateModu
 void FireOCLAfterWeaponCooldownUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "WeaponSlot",						INI::parseLookupList,						TheWeaponSlotTypeNamesLookupList, offsetof( FireOCLAfterWeaponCooldownUpdateModuleData, m_weaponSlot ) },
 		{ "OCL",									INI::parseObjectCreationList,		NULL, offsetof( FireOCLAfterWeaponCooldownUpdateModuleData, m_ocl ) },
@@ -100,7 +95,7 @@ FireOCLAfterWeaponCooldownUpdate::~FireOCLAfterWeaponCooldownUpdate( void )
 
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime FireOCLAfterWeaponCooldownUpdate::update( void )
-{	
+{
 	const FireOCLAfterWeaponCooldownUpdateModuleData* data = getFireOCLAfterWeaponCooldownUpdateModuleData();
 	UpgradeMaskType activation, conflicting;
 	getUpgradeActivationMasks( activation, conflicting );
@@ -114,7 +109,7 @@ UpdateSleepTime FireOCLAfterWeaponCooldownUpdate::update( void )
 	{
 		if( weapon->getWeaponSlot() != data->m_weaponSlot )
 		{
-			//Not the right weapon slot -- it's possible we switched weapons in which case it's 
+			//Not the right weapon slot -- it's possible we switched weapons in which case it's
 			//possible to fire the OCL.
 			validThisFrame = false;
 		}
@@ -145,14 +140,14 @@ UpdateSleepTime FireOCLAfterWeaponCooldownUpdate::update( void )
 			m_consecutiveShots++;
 			if( m_consecutiveShots == 1 )
 			{
-				//Our first shot -- so record the frame number so we can easily calculate the 
+				//Our first shot -- so record the frame number so we can easily calculate the
 				//time we've been firing!
 				m_startFrame = now;
 			}
 		}
 		else if( weapon->getPossibleNextShotFrame() < now )
 		{
-			//Means we could have shot but didn't! 
+			//Means we could have shot but didn't!
 
 			if( data->m_minShotsRequired <= m_consecutiveShots )
 			{
@@ -173,12 +168,12 @@ UpdateSleepTime FireOCLAfterWeaponCooldownUpdate::update( void )
 	}
 
 	if( validThisFrame != m_valid )
-	{	
+	{
 		//There has been a validity change, so reset all values!
 		m_valid = validThisFrame;
 		resetStats();
 	}
-	
+
 	return UPDATE_SLEEP_NONE;
 }
 
@@ -219,7 +214,7 @@ void FireOCLAfterWeaponCooldownUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpgradeMux::upgradeMuxCRC( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -249,7 +244,7 @@ void FireOCLAfterWeaponCooldownUpdate::xfer( Xfer *xfer )
 	// start frame
 	xfer->xferUnsignedInt( &m_startFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -263,4 +258,4 @@ void FireOCLAfterWeaponCooldownUpdate::loadPostProcess( void )
 	// extend base class
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
index e645bd874e2..e28c8238cd5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
@@ -49,9 +49,9 @@ class PartitionFilterFlammable : public PartitionFilter
 public:
 
 	PartitionFilterFlammable(){ }
-	
+
 	virtual Bool allow(Object *objOther);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterFlammable"; }
 #endif
 };
@@ -84,11 +84,11 @@ FireSpreadUpdateModuleData::FireSpreadUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void FireSpreadUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void FireSpreadUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "OCLEmbers",				INI::parseObjectCreationList,		NULL, offsetof( FireSpreadUpdateModuleData, m_oclEmbers ) },
 		{ "MinSpreadDelay",		INI::parseDurationUnsignedInt,	NULL, offsetof( FireSpreadUpdateModuleData, m_minSpreadTryDelayData ) },
@@ -131,17 +131,17 @@ UpdateSleepTime FireSpreadUpdate::update( void )
 			PartitionFilter *filters[] = { &fFilter, NULL };
 
 //			SimpleObjectIterator *iter = NULL;
-//			iter = ThePartitionManager->iterateObjectsInRange(getObject(), 
-//																									d->m_spreadTryRange, 
-//																									FROM_CENTER_3D, 
-//																									filters, 
+//			iter = ThePartitionManager->iterateObjectsInRange(getObject(),
+//																									d->m_spreadTryRange,
+//																									FROM_CENTER_3D,
+//																									filters,
 //																									ITER_SORTED_NEAR_TO_FAR
 //																									);
 //			MemoryPoolObjectHolder hold(iter);
 //			Object *objectToLight = iter->first();
 //
 // srj sez: the above code is stupid and slow. since we only want the closest object,
-// just ask for that; the above has to find ALL objects in range, but we ignore all 
+// just ask for that; the above has to find ALL objects in range, but we ignore all
 // but the first (closest).
 //
 			Object* objectToLight = ThePartitionManager->getClosestObject(getObject(), d->m_spreadTryRange, FROM_CENTER_3D, filters);
@@ -188,7 +188,7 @@ void FireSpreadUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -206,7 +206,7 @@ void FireSpreadUpdate::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -217,4 +217,4 @@ void FireSpreadUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireWeaponUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireWeaponUpdate.cpp
index 329af9ae047..539288e56d7 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireWeaponUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireWeaponUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -37,11 +37,6 @@
 #include "GameLogic/GameLogic.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 FireWeaponUpdateModuleData::FireWeaponUpdateModuleData()
@@ -52,11 +47,11 @@ FireWeaponUpdateModuleData::FireWeaponUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void FireWeaponUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void FireWeaponUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Weapon",								INI::parseWeaponTemplate,	      NULL, offsetof( FireWeaponUpdateModuleData, m_weaponTemplate ) },
 		{ "InitialDelay",					INI::parseDurationUnsignedInt,	NULL, offsetof( FireWeaponUpdateModuleData, m_initialDelayFrames ) },
@@ -68,7 +63,7 @@ FireWeaponUpdateModuleData::FireWeaponUpdateModuleData()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-FireWeaponUpdate::FireWeaponUpdate( Thing *thing, const ModuleData* moduleData ) : 
+FireWeaponUpdate::FireWeaponUpdate( Thing *thing, const ModuleData* moduleData ) :
 	UpdateModule( thing, moduleData ),
 	m_weapon(NULL)
 {
@@ -88,15 +83,14 @@ FireWeaponUpdate::FireWeaponUpdate( Thing *thing, const ModuleData* moduleData )
 //-------------------------------------------------------------------------------------------------
 FireWeaponUpdate::~FireWeaponUpdate( void )
 {
-	if (m_weapon)
-		deleteInstance(m_weapon);
+	deleteInstance(m_weapon);
 }
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime FireWeaponUpdate::update( void )
 {
-  
+
   if ( TheGameLogic->getFrame() < m_initialDelayFrame )
     return UPDATE_SLEEP_NONE;
 
@@ -122,7 +116,7 @@ Bool FireWeaponUpdate::isOkayToFire()
 	// Weapon is reloading
 	if( m_weapon->getStatus() != READY_TO_FIRE )
 		return FALSE;
-	
+
 	if( me->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
 		return FALSE; // no hitting with a 0% building, cheater
 
@@ -141,7 +135,7 @@ void FireWeaponUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -165,7 +159,7 @@ void FireWeaponUpdate::xfer( Xfer *xfer )
   if ( version >= 2 )
     xfer->xferUnsignedInt( &m_initialDelayFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -176,4 +170,4 @@ void FireWeaponUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FirestormDynamicGeometryInfoUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FirestormDynamicGeometryInfoUpdate.cpp
index ee02157bd34..3ea46047374 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FirestormDynamicGeometryInfoUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FirestormDynamicGeometryInfoUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -49,7 +49,7 @@
 //-------------------------------------------------------------------------------------------------
 FirestormDynamicGeometryInfoUpdateModuleData::FirestormDynamicGeometryInfoUpdateModuleData() : DynamicGeometryInfoUpdateModuleData()
 {
-	
+
 	for( Int i = 0; i < MAX_FIRESTORM_SYSTEMS; i++ )
 		m_particleSystem[ i ] = NULL;
 	m_fxList = NULL;
@@ -66,7 +66,7 @@ FirestormDynamicGeometryInfoUpdateModuleData::FirestormDynamicGeometryInfoUpdate
 {
 	DynamicGeometryInfoUpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DelayBetweenDamageFrames", INI::parseDurationReal, NULL, offsetof( FirestormDynamicGeometryInfoUpdateModuleData, m_delayBetweenDamageFrames ) },
 		{ "DamageAmount", INI::parseReal, NULL, offsetof( FirestormDynamicGeometryInfoUpdateModuleData, m_damageAmount ) },
@@ -98,14 +98,14 @@ FirestormDynamicGeometryInfoUpdateModuleData::FirestormDynamicGeometryInfoUpdate
 //-------------------------------------------------------------------------------------------------
 FirestormDynamicGeometryInfoUpdate::FirestormDynamicGeometryInfoUpdate( Thing *thing, const ModuleData* moduleData ) : DynamicGeometryInfoUpdate( thing, moduleData )
 {
-	
+
 	for( Int i = 0; i < MAX_FIRESTORM_SYSTEMS; i++ )
 		m_myParticleSystemID[ i ] = INVALID_PARTICLE_SYSTEM_ID;
 	m_effectsFired = FALSE;
 	m_scorchPlaced = FALSE;
 	m_lastDamageFrame = 0;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -118,7 +118,7 @@ FirestormDynamicGeometryInfoUpdate::~FirestormDynamicGeometryInfoUpdate( void )
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 {
-	
+
 	// extend functionality
 	DynamicGeometryInfoUpdate::update();
 
@@ -135,7 +135,7 @@ UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 		ParticleSystem *sys;
 
 		//
-		// construct a position to play the particle effects ... that is on the ground, but 
+		// construct a position to play the particle effects ... that is on the ground, but
 		// note that we add a small amount to it to avoid particles from the system (especially
 		// flat XY particles) from popping up through the terrain
 		//
@@ -155,9 +155,9 @@ UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 				sys->setPosition( &pos );
 				m_myParticleSystemID[ i ] = sys->getSystemID();
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		// do the FX list
 		FXList::doFXObj( modData->m_fxList, getObject() );
@@ -179,7 +179,7 @@ UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 		if( m_myParticleSystemID[ i ] )
 		{
 			ParticleSystem *sys = TheParticleSystemManager->findParticleSystem( m_myParticleSystemID[ i ] );
-		
+
 			if( sys )
 			{
 				ParticleSystemInfo::EmissionVolumeType type = sys->getEmisionVolumeType();
@@ -189,18 +189,18 @@ UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 				else if( type == ParticleSystemInfo::EmissionVolumeType::CYLINDER )
 					sys->setEmissionVolumeCylinderRadius( getObject()->getGeometryInfo().getMajorRadius() );
 
-			}  // end if
+			}
 			else
 			{
 
 				// this system not found (it probably died)... stop trying to find it in the future
 				m_myParticleSystemID[ i ] = INVALID_PARTICLE_SYSTEM_ID;
 
-			}  // end else
+			}
 
-		}  // end if
+		}
 
-	}  // end for, i
+	}
 
 	// when we first start running backward ... make a scorch mark
 	if( m_switchedDirections == TRUE && m_scorchPlaced == FALSE )
@@ -209,7 +209,7 @@ UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 		TheGameClient->addScorch( getObject()->getPosition(), modData->m_scorchSize, SCORCH_1 );
 		m_scorchPlaced = TRUE;
 
-	}  // end if
+	}
 
 	// scan and do some damage every once in a while
 	if( TheGameLogic->getFrame() - m_lastDamageFrame >= modData->m_delayBetweenDamageFrames )
@@ -218,7 +218,7 @@ UpdateSleepTime FirestormDynamicGeometryInfoUpdate::update( void )
 		doDamageScan();
 		m_lastDamageFrame = TheGameLogic->getFrame();
 
-	}  // end if
+	}
 
 	return UPDATE_SLEEP_NONE;
 }
@@ -250,7 +250,7 @@ void FirestormDynamicGeometryInfoUpdate::doDamageScan( void )
 	{
 		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( firestormPos,
 																																			 boundingCircle,
-																																			 FROM_BOUNDINGSPHERE_2D, 
+																																			 FROM_BOUNDINGSPHERE_2D,
 																																			 NULL );
 		MemoryPoolObjectHolder hold( iter );
 		Object *other;
@@ -263,11 +263,11 @@ void FirestormDynamicGeometryInfoUpdate::doDamageScan( void )
 			// do damage
 			other->attemptDamage( &damageInfo );
 
-		}  // end for, other
+		}
 
-	}  // end if, an boundingCircle radius exists
+	}
 
-}  // end doDamageScan
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -278,7 +278,7 @@ void FirestormDynamicGeometryInfoUpdate::crc( Xfer *xfer )
 	// extend base class
 	DynamicGeometryInfoUpdate::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -308,7 +308,7 @@ void FirestormDynamicGeometryInfoUpdate::xfer( Xfer *xfer )
 	// last damage frame
 	xfer->xferUnsignedInt( &m_lastDamageFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -319,4 +319,4 @@ void FirestormDynamicGeometryInfoUpdate::loadPostProcess( void )
 	// extend base class
 	DynamicGeometryInfoUpdate::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp
index 8de2c056e7b..a665abaaa47 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FlammableUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioEventRTS.h"
 #include "Common/GameAudio.h"
@@ -47,20 +47,17 @@ FlammableUpdateModuleData::FlammableUpdateModuleData()
 	m_aflameDuration = 0;
 	m_aflameDamageDelay = 0;
 	m_aflameDamageAmount = 0;
-	// Enabled By Sadullah Nader
-	// Initialization needed
 	m_burningSoundName.clear();
-	//
 	m_flameDamageLimitData = 20.0f;
 	m_flameDamageExpirationDelay = LOGICFRAMES_PER_SECOND * 2;
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void FlammableUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void FlammableUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "BurnedDelay",						INI::parseDurationUnsignedInt,	NULL, offsetof( FlammableUpdateModuleData, m_burnedDelay ) },
 		{ "AflameDuration",					INI::parseDurationUnsignedInt,	NULL, offsetof( FlammableUpdateModuleData, m_aflameDuration ) },
@@ -84,6 +81,7 @@ FlammableUpdate::FlammableUpdate( Thing *thing, const ModuleData* moduleData ) :
 	m_damageEndFrame = 0;
 	m_audioHandle = NULL;
 	m_flameDamageLimit = getFlammableUpdateModuleData()->m_flameDamageLimitData;
+	m_flameSource = INVALID_ID;
 	m_lastFlameDamageDealt = 0;
 
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
@@ -110,7 +108,13 @@ void FlammableUpdate::onDamage( DamageInfo *damageInfo )
 			m_flameDamageLimit = getFlammableUpdateModuleData()->m_flameDamageLimitData;
 		}
 		m_lastFlameDamageDealt = now;
-		
+#if RETAIL_COMPATIBLE_CRC
+		m_flameSource = getObject()->getID();
+#else
+		// TheSuperHackers @bugfix Stubbjax 03/09/2025 Allow flame damage to award xp to the flame source.
+		m_flameSource = damageInfo->in.m_sourceID;
+#endif
+
 		Object *me = getObject();
 		if( !me->getStatusBits().test( OBJECT_STATUS_AFLAME ) && !me->getStatusBits().test( OBJECT_STATUS_BURNED ) )
 		{
@@ -180,7 +184,7 @@ UpdateSleepTime FlammableUpdate::calcSleepTime()
 		if (m_burnedEndFrame != 0 && m_burnedEndFrame < soonest && m_burnedEndFrame > now) soonest = m_burnedEndFrame;
 		if (m_damageEndFrame != 0 && m_damageEndFrame < soonest && m_damageEndFrame > now) soonest = m_damageEndFrame;
 		DEBUG_ASSERTCRASH(soonest - now > 0, ("hmm"));
-		// UPDATE_SLEEP requires a count-of-frames, not an absolute-frame, so subtract 'now' 
+		// UPDATE_SLEEP requires a count-of-frames, not an absolute-frame, so subtract 'now'
 		return UPDATE_SLEEP(soonest - now);
 	}
 	else
@@ -229,7 +233,7 @@ void FlammableUpdate::doAflameDamage()
 
 	DamageInfo info;
 	info.in.m_amount = data->m_aflameDamageAmount;
-	info.in.m_sourceID = getObject()->getID();
+	info.in.m_sourceID = m_flameSource;
 	info.in.m_damageType = DAMAGE_FLAME;
 	info.in.m_deathType = DEATH_BURNED;
 
@@ -276,7 +280,7 @@ void FlammableUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -287,7 +291,11 @@ void FlammableUpdate::xfer( Xfer *xfer )
 {
 
 	// version
+#if RETAIL_COMPATIBLE_XFER_SAVE
 	XferVersion currentVersion = 1;
+#else
+	XferVersion currentVersion = 2;
+#endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
@@ -312,7 +320,13 @@ void FlammableUpdate::xfer( Xfer *xfer )
 	// last flame damage dealt
 	xfer->xferUnsignedInt( &m_lastFlameDamageDealt );
 
-}  // end xfer
+#if !RETAIL_COMPATIBLE_XFER_SAVE
+	if (version >= 2)
+	{
+		xfer->xferObjectID(&m_flameSource);
+	}
+#endif
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -323,4 +337,4 @@ void FlammableUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp
index 05bf0b0bced..18e1ceb8903 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FloatUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -40,11 +40,6 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // ------------------------------------------------------------------------------------------------
@@ -54,7 +49,7 @@ FloatUpdateModuleData::FloatUpdateModuleData( void )
 
 	m_enabled = FALSE;
 
-}  // end FloatUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -63,14 +58,14 @@ FloatUpdateModuleData::FloatUpdateModuleData( void )
 
 	UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Enabled",	INI::parseBool,	NULL, offsetof( FloatUpdateModuleData, m_enabled ) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -85,14 +80,14 @@ FloatUpdate::FloatUpdate( Thing *thing, const ModuleData *moduleData )
 	// save our initial enabled status based on INI settings
 	m_enabled = ((FloatUpdateModuleData *)moduleData)->m_enabled;
 
-}  // end FloatUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 FloatUpdate::~FloatUpdate( void )
 {
 
-}  // end ~FloatUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -105,7 +100,7 @@ UpdateSleepTime FloatUpdate::update( void )
 	{
 		// get object position
 		const Coord3D *pos = getObject()->getPosition();
-		
+
 		// get the height of the water here
 		Real waterZ;
 		TheTerrainLogic->isUnderwater( pos->x, pos->y, &waterZ );
@@ -134,12 +129,12 @@ UpdateSleepTime FloatUpdate::update( void )
 		mx.Rotate_Z(zRot);
 		mx.Rotate_Y(yaw);
 		mx.Rotate_X(pitch);
-		
+
 		draw->setInstanceMatrix(&mx);
 	}
 
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -150,7 +145,7 @@ void FloatUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -171,7 +166,7 @@ void FloatUpdate::xfer( Xfer *xfer )
 	// enabled
 	xfer->xferBool( &m_enabled );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -182,4 +177,4 @@ void FloatUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp
index e9c7ea6ae98..40bc35633a6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
@@ -42,11 +42,6 @@
 #include "GameLogic/Module/HeightDieUpdate.h"
 #include "GameLogic/Module/PhysicsUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -60,16 +55,16 @@ HeightDieUpdateModuleData::HeightDieUpdateModuleData( void )
 	m_snapToGroundOnDeath = FALSE;
 	m_initialDelay = 0;
 
-}  // end HeightDieUpdateModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void HeightDieUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void HeightDieUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "TargetHeight", INI::parseReal, NULL, offsetof( HeightDieUpdateModuleData, m_targetHeightAboveTerrain ) },
 		{ "TargetHeightIncludesStructures", INI::parseBool, NULL, offsetof( HeightDieUpdateModuleData, m_targetHeightIncludesStructures ) },
@@ -83,7 +78,7 @@ void HeightDieUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -102,14 +97,14 @@ HeightDieUpdate::HeightDieUpdate( Thing *thing, const ModuleData* moduleData )
 	m_earliestDeathFrame = UINT_MAX;
 	// m_lastPosition = *thing->getPosition();
 
-}  // end HeightDieUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 HeightDieUpdate::~HeightDieUpdate( void )
 {
 
-}  // end ~HeightDieUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -133,7 +128,7 @@ UpdateSleepTime HeightDieUpdate::update( void )
 		// get outta here
 		return UPDATE_SLEEP_NONE;
 
-	}  // end if
+	}
 
 	// get the module data
 	const HeightDieUpdateModuleData *modData = getHeightDieUpdateModuleData();
@@ -151,11 +146,11 @@ UpdateSleepTime HeightDieUpdate::update( void )
 			if( pos->z >= m_lastPosition.z )
 				directionOK = FALSE;
 
-		}  // end fi
+		}
 
 		// get the terrain height
 		Real terrainHeightAtPos = TheTerrainLogic->getGroundHeight( pos->x, pos->y );
-		
+
 		// if including structures, check for bridges
 		if (modData->m_targetHeightIncludesStructures)
 		{
@@ -187,8 +182,8 @@ UpdateSleepTime HeightDieUpdate::update( void )
 			PartitionFilter *filters[] = { &filter1, NULL };
 			Real range = getObject()->getGeometryInfo().getBoundingCircleRadius();
 			ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( getObject(),
-																																				 range, 
-																																				 FROM_BOUNDINGSPHERE_3D, 
+																																				 range,
+																																				 FROM_BOUNDINGSPHERE_3D,
 																																				 filters );
 			MemoryPoolObjectHolder hold( iter );
 			Object *obj;
@@ -208,8 +203,8 @@ UpdateSleepTime HeightDieUpdate::update( void )
 				if( thisHeight > tallestHeight )
 					tallestHeight = thisHeight;
 
-			}  // end for obj
-			
+			}
+
 			//
 			// our target height is either the height above the terrain as specified by the INI
 			// entry for the object that has this update ... or it is the building height of the
@@ -218,14 +213,14 @@ UpdateSleepTime HeightDieUpdate::update( void )
 			if( tallestHeight > modData->m_targetHeightAboveTerrain )
 				targetHeight = tallestHeight + terrainHeightAtPos;
 
-		}  // end if
+		}
 
 		// if we are below the target height ... DIE!
 		if( pos->z < targetHeight && directionOK )
 		{
 
 			// if we're supposed to snap us to the ground on death do so
-			// AND: even if we're not snapping to ground, be sure we don't go BELOW ground 
+			// AND: even if we're not snapping to ground, be sure we don't go BELOW ground
 			if( modData->m_snapToGroundOnDeath || pos->z < terrainHeightAtPos )
 			{
 				Coord3D ground;
@@ -243,9 +238,9 @@ UpdateSleepTime HeightDieUpdate::update( void )
 			// we have died ... don't do this again
 			m_hasDied = TRUE;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	//
 	// if our height is below the destroy attached particles height above the terrain, clean
@@ -260,14 +255,14 @@ UpdateSleepTime HeightDieUpdate::update( void )
 		// don't do this again
 		m_particlesDestroyed = TRUE;
 
-	}  // end if
+	}
 
 	// save our current position as the last position we monitored
 	m_lastPosition = *pos;
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -278,12 +273,12 @@ void HeightDieUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: m_earliestDeathFrame
 */
 // ------------------------------------------------------------------------------------------------
@@ -312,7 +307,7 @@ void HeightDieUpdate::xfer( Xfer *xfer )
 	else
 		m_earliestDeathFrame = 0;
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -323,4 +318,4 @@ void HeightDieUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp
index 03d590984a5..03b7d9ed595 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HelicopterSlowDeathUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/GlobalData.h"
@@ -55,24 +55,16 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( void )
 {
-	//Added By Sadullah Nader
-	//Initializations missing and needed
 	m_attachParticleBone.clear();
 	m_bladeBone.clear();
 	m_bladeObjectName.clear();
 	m_finalRubbleObject.clear();
-	//
 
 	m_spiralOrbitTurnRate = 0.0f;
 	m_spiralOrbitForwardSpeed = 0.0f;
@@ -99,15 +91,15 @@ HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( vo
 	m_delayFromGroundToFinalDeath = 0;
 	m_maxBraking = 99999.0f;
 
-}  // end HelicopterSlowDeathBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-/*static*/ void HelicopterSlowDeathBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p ) 
+/*static*/ void HelicopterSlowDeathBehaviorModuleData::buildFieldParse( MultiIniFieldParse &p )
 {
   SlowDeathBehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SpiralOrbitTurnRate",	INI::parseAngularVelocityReal, NULL, offsetof( HelicopterSlowDeathBehaviorModuleData, m_spiralOrbitTurnRate ) },
 		{ "SpiralOrbitForwardSpeed", INI::parseVelocityReal, NULL, offsetof( HelicopterSlowDeathBehaviorModuleData, m_spiralOrbitForwardSpeed ) },
@@ -142,7 +134,7 @@ HelicopterSlowDeathBehaviorModuleData::HelicopterSlowDeathBehaviorModuleData( vo
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Helicopter slow death update ///////////////////////////////////////////////////////////////////
@@ -170,14 +162,14 @@ HelicopterSlowDeathBehavior::HelicopterSlowDeathBehavior( Thing *thing, const Mo
 	m_bladeFlyOffFrame = 0;
 	m_hitGroundFrame = 0;
 
-}  // end HelicopterSlowDeathBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 HelicopterSlowDeathBehavior::~HelicopterSlowDeathBehavior( void )
 {
 
-}  // end ~HelicopterSlowDeathBehavior
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -188,7 +180,7 @@ void HelicopterSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 	SlowDeathBehavior::beginSlowDeath( damageInfo );
 
 	// stop the current movement sound
-	if (getObject()->getDrawable()) 
+	if (getObject()->getDrawable())
 	{
 		getObject()->getDrawable()->stopAmbientSound();
 	}
@@ -197,7 +189,7 @@ void HelicopterSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 	const HelicopterSlowDeathBehaviorModuleData *modData = getHelicopterSlowDeathBehaviorModuleData();
 
 	m_deathSound = modData->m_deathSound;
-	
+
 	if (m_deathSound.getEventName().isEmpty() == false)
 	{
 		m_deathSound.setObjectID(getObject()->getID());
@@ -223,7 +215,7 @@ void HelicopterSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 
 	// start our self spinning at the min self spin rate
 	m_selfSpin = modData->m_minSelfSpin;
-	
+
 	// we will start off changing the self spin towards the MaxSelfSpin
 	m_selfSpinTowardsMax = TRUE;
 
@@ -242,7 +234,7 @@ void HelicopterSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 		ParticleSystem *pSys = TheParticleSystemManager->createParticleSystem( modData->m_attachParticleSystem );
 		if( pSys )
 		{
-			
+
 			// where do the offset attachment to
 			if( modData->m_attachParticleBone.isEmpty() == FALSE )
 			{
@@ -255,27 +247,27 @@ void HelicopterSlowDeathBehavior::beginSlowDeath( const DamageInfo *damageInfo )
 					if( draw->getPristineBonePositions( modData->m_attachParticleBone.str(), 0, &pos, NULL, 1 ) )
 						pSys->setPosition( &pos );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
 
 				// use location coord specified ... it will be zero if not given which is center of obj anyway
 				pSys->setPosition( &modData->m_attachParticleLoc );
 
-			}  // end else
+			}
 
 			// attach the particle system to the object
 			pSys->attachToObject( getObject() );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 
 
-}  // end beginSlowDeath
+}
 
 
 
@@ -325,7 +317,7 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 			if( m_selfSpinTowardsMax == TRUE )
 			{
 
-				// we're going towards the max self spin, increase it		
+				// we're going towards the max self spin, increase it
 				m_selfSpin += modData->m_selfSpinUpdateAmount / LOGICFRAMES_PER_SECOND;
 				if( m_selfSpin > modData->m_maxSelfSpin )
 				{
@@ -333,12 +325,12 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 					m_selfSpin = modData->m_maxSelfSpin;  // cap at max
 					m_selfSpinTowardsMax = FALSE;					// now start changing spin towards min again
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else
 			{
-			
+
 				// we're going towards the min self spin, decrease it
 				m_selfSpin -= modData->m_selfSpinUpdateAmount / LOGICFRAMES_PER_SECOND;
 				if( m_selfSpin < modData->m_minSelfSpin )
@@ -347,18 +339,18 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 					m_selfSpin = modData->m_minSelfSpin;  // cap at min
 					m_selfSpinTowardsMax = TRUE;					// now start chaning spin towards max again
 
-				}  // end if
+				}
 
-			}  // end else
+			}
 
 			// we have made a change to the self spinning
 			m_lastSelfSpinUpdateFrame = TheGameLogic->getFrame();
 
-		}  // end if
+		}
 
 		// get the physics update module
 		PhysicsBehavior *physics = copter->getPhysics();
-		DEBUG_ASSERTCRASH( physics, ("HelicopterSlowDeathBehavior: object '%s' does not have a physics module\n", 
+		DEBUG_ASSERTCRASH( physics, ("HelicopterSlowDeathBehavior: object '%s' does not have a physics module",
 																 copter->getTemplate()->getName().str()) );
 
 		//
@@ -395,17 +387,17 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 					draw->getPristineBonePositions( modData->m_bladeBone.str(), 0, &bladePos, NULL, 1 );
 					draw->convertBonePosToWorldPos( &bladePos, NULL, &bladePos, NULL );
 
-				}  // end if
-		
+				}
+
 				// create the blades flying through the air
 	//			const ObjectCreationList *ocl = TheObjectCreationListStore->findObjectCreationList( "OCL_ComancheBlades" );
 	//			ObjectCreationList::create( ocl, &bladePos );
-		
+
 				// run the fx at the blade position
 				FXList::doFXPos( modData->m_fxBlade, &bladePos );
 				ObjectCreationList::create( modData->m_oclBlade, copter, &bladePos, NULL, INVALID_ANGLE );
 
-				//				
+				//
 				// if we have (potentially) a pilot ejection, do it here.
 				// note that we call EjectPilotDie::ejectPilot() rather than ObjectCreationList::create(),
 				// because the former makes the right sounds, and also constrains to veteran-or-better status.
@@ -413,11 +405,11 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 				if( modData->m_oclEjectPilot && copter->getVeterancyLevel() > LEVEL_REGULAR )
 					EjectPilotDie::ejectPilot( modData->m_oclEjectPilot, copter, NULL );
 
-			}  // end if
+			}
 
-		}  // endif
+		}
 
-	}  // end if, not on ground
+	}
 
 
 
@@ -451,7 +443,7 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 
 		if (pos->z <= ground + 1.0f || hitATree )
 		{
-			
+
 			// mark the frame we hit the ground on
 			m_hitGroundFrame = TheGameLogic->getFrame();
 
@@ -470,11 +462,11 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 			// Stop the sound from playing.
 			TheAudio->removeAudioEvent(m_deathSound.getPlayingHandle());
 
-		}  // end if
+		}
 	}
 
 	// if we're on the ground, see if it's time for our final boom
-	if( m_hitGroundFrame && 
+	if( m_hitGroundFrame &&
 			TheGameLogic->getFrame() - m_hitGroundFrame > modData->m_delayFromGroundToFinalDeath )
 	{
 
@@ -490,16 +482,16 @@ UpdateSleepTime HelicopterSlowDeathBehavior::update( void )
 
 			rubble->setTransformMatrix( copter->getTransformMatrix() );
 
-		}  // end if
+		}
 
 		// destroy the copter finally
 		TheGameLogic->destroyObject( copter );
 
-	}  // end if
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -510,7 +502,7 @@ void HelicopterSlowDeathBehavior::crc( Xfer *xfer )
 	// extend base class
 	SlowDeathBehavior::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -552,7 +544,7 @@ void HelicopterSlowDeathBehavior::xfer( Xfer *xfer )
 	// hit ground frame
 	xfer->xferUnsignedInt( &m_hitGroundFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -563,4 +555,4 @@ void HelicopterSlowDeathBehavior::loadPostProcess( void )
 	// extend base class
 	SlowDeathBehavior::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HijackerUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HijackerUpdate.cpp
index 5b2afb61433..1315d661762 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HijackerUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HijackerUpdate.cpp
@@ -24,15 +24,15 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //
-// FILE: HijackerUpdate.cpp 
+// FILE: HijackerUpdate.cpp
 // Author: Mark Lorenzen, July 2002
-// Desc:   Allows hijacker to kepp with his hijacked vehicle (though hidden) until it dies, then 
+// Desc:   Allows hijacker to kepp with his hijacked vehicle (though hidden) until it dies, then
 // to become a hijacker once more
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/ThingFactory.h"
@@ -59,7 +59,7 @@ HijackerUpdate::HijackerUpdate( Thing *thing, const ModuleData *moduleData ) : U
 	m_ejectPos.zero();
 //	m_ejectPilotDMI = NULL;
 }
-  
+
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 HijackerUpdate::~HijackerUpdate( void )
@@ -90,7 +90,7 @@ UpdateSleepTime HijackerUpdate::update( void )
 			obj->setPosition( target->getPosition() );
 			m_wasTargetAirborne = target->isSignificantlyAboveTerrain();
 			m_ejectPos = *target->getPosition();
-			
+
 			// So, if while I am driving this American war vehicle, I gain skill points, I get to keep them when I wreck the vehicle
 			ExperienceTracker *targetExp = target->getExperienceTracker();
 			ExperienceTracker *jackerExp = obj->getExperienceTracker();
@@ -110,7 +110,7 @@ UpdateSleepTime HijackerUpdate::update( void )
 				//THIS BLOCK RESTORES HIJACKER TO PARTITION MANAGER AND UNHIDES HIM
 				ThePartitionManager->registerObject( obj );
 
-				if( obj->getDrawable() ) 
+				if( obj->getDrawable() )
 				{
 					// so it is time to unhide ourselves and be a pedestrian hijacker again
 					obj->getDrawable()->setDrawableHidden( false );
@@ -146,14 +146,14 @@ UpdateSleepTime HijackerUpdate::update( void )
 				}
 
 
-			}// end if (! hostVehicleHasEjection)
+			}
 
-			setTargetObject( NULL ); 
+			setTargetObject( NULL );
 			setIsInVehicle( FALSE );
 			setUpdate( FALSE );
 			m_wasTargetAirborne = false;
 
-		}// end if( target )
+		}
 
 	}
 	else	// not in vehicle
@@ -210,7 +210,7 @@ void HijackerUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -243,7 +243,7 @@ void HijackerUpdate::xfer( Xfer *xfer )
 	// was target airborne
 	xfer->xferBool( &m_wasTargetAirborne );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -258,4 +258,4 @@ void HijackerUpdate::loadPostProcess( void )
 	Object *obj = TheGameLogic->findObjectByID( m_targetID );
 	setTargetObject( obj );
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
index 0dca314a714..aac30b83c4f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_HORDEACTION_NAMES
 #include "Common/Player.h"
@@ -47,11 +47,6 @@
 //-------------------------------------------------------------------------------------------------
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 static HordeUpdateInterface* getHUI(Object* obj)
@@ -78,8 +73,8 @@ class PartitionFilterHordeMember : public PartitionFilter
 public:
 
 	PartitionFilterHordeMember(Object* obj, const HordeUpdateModuleData* data) : m_obj(obj), m_data(data) { }
-	
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterHordeMember"; }
 #endif
 
@@ -118,15 +113,15 @@ class PartitionFilterHordeMember : public PartitionFilter
 const Int DEFAULT_UPDATE_RATE = LOGICFRAMES_PER_SECOND;
 
 //-------------------------------------------------------------------------------------------------
-HordeUpdateModuleData::HordeUpdateModuleData() :
-	m_updateRate(DEFAULT_UPDATE_RATE),
-  m_minCount(0),
-  m_minDist(0.0f),
-	m_rubOffRadius(20.0f),
-	m_alliesOnly(true),
-	m_exactMatch(false),
-	m_allowedNationalism(TRUE),
-	m_action(HORDEACTION_HORDE)
+HordeUpdateModuleData::HordeUpdateModuleData()
+	: m_updateRate(DEFAULT_UPDATE_RATE)
+	, m_minCount(0)
+	, m_minDist(0.0f)
+	, m_rubOffRadius(20.0f)
+	, m_alliesOnly(true)
+	, m_exactMatch(false)
+	, m_allowedNationalism(TRUE)
+	, m_action(HORDEACTION_DEFAULT)
 {
 }
 
@@ -135,7 +130,7 @@ HordeUpdateModuleData::HordeUpdateModuleData() :
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "UpdateRate", INI::parseDurationUnsignedInt, NULL, offsetof(HordeUpdateModuleData, m_updateRate) },
 		{ "KindOf", KindOfMaskType::parseFromINI, NULL, offsetof(HordeUpdateModuleData, m_kindof) },
@@ -162,10 +157,7 @@ HordeUpdate::HordeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateM
 	m_inHorde = FALSE;
 	m_hasFlag = FALSE;
 	m_lastHordeRefreshFrame = TheGameLogic->getFrame();
-	// Added By Sadullah Nader
-	// Initializations missing and needed
 	m_trueHordeMember = FALSE;
-	//
 
 	UnsignedInt delay = getHordeUpdateModuleData()->m_updateRate;
 	setWakeFrame(getObject(), UPDATE_SLEEP(GameLogicRandomValue(1, delay)));
@@ -187,7 +179,7 @@ Bool HordeUpdate::isAllowedNationalism() const
 //-------------------------------------------------------------------------------------------------
 /** @todo I think we should model the horde list ... so we can do all this without doing
   * all this scanning, plus we can give exactly 1 flag to the right person in the
-	* center of the horde which I think would look better (CBD) 
+	* center of the horde which I think would look better (CBD)
 	*
 	* Redesign occurred 10/15, where the flags have been removed replaced by a teraindecal for each horde member
 	* Thank You for reading, MLorenzen
@@ -195,36 +187,22 @@ Bool HordeUpdate::isAllowedNationalism() const
 // ------------------------------------------------------------------------------------------------
 void HordeUpdate::joinOrLeaveHorde(SimpleObjectIterator *iter, Bool join)
 {
-	Bool prevInHorde = m_inHorde;
-
-	m_inHorde = join;
-
-
-
-
-	const HordeUpdateModuleData* d = getHordeUpdateModuleData();
-	switch (d->m_action)
+	// give/remove bonus effects
+	if( m_inHorde != join )
 	{
-		case HORDEACTION_HORDE:
-			{
-
-				// give/remove bonus effects
-				if( prevInHorde != m_inHorde )
-				{
-					AIUpdateInterface *ai = getObject()->getAIUpdateInterface();
+		m_inHorde = join;
 
-					if( ai )
-						ai->evaluateMoraleBonus();
-					else
-						DEBUG_CRASH(( "HordeUpdate::joinOrLeaveHorde - We (%s) must have an AI to benefit from horde\n",
-													getObject()->getTemplate()->getName().str() ));
-				}  // end if
-
-			}
-			break;
+		if( AIUpdateInterface *ai = getObject()->getAIUpdateInterface() )
+		{
+			const HordeUpdateModuleData* md = getHordeUpdateModuleData();
+			ai->evaluateMoraleBonus(m_inHorde, md->m_allowedNationalism, md->m_action);
+		}
+		else
+		{
+			DEBUG_CRASH(( "HordeUpdate::joinOrLeaveHorde - We (%s) must have an AI to benefit from horde",
+										getObject()->getTemplate()->getName().str() ));
+		}
 	}
-
-
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -246,7 +224,7 @@ void HordeUpdate::showHideFlag(Bool show)
 
 //-------------------------------------------------------------------------------------------------
 /**
-	this is called whenever a drawable is bound to the object. 
+	this is called whenever a drawable is bound to the object.
 	drawable is NOT guaranteed to be non-null.
 */
 void HordeUpdate::onDrawableBoundToObject()
@@ -271,13 +249,13 @@ UpdateSleepTime HordeUpdate::update( void )
 	Bool wasInHorde = m_inHorde;
 
 	// This is a sticky situation, where refreshing the model state (like from default to damaged, for example)
-	// will rebuild the terraindecal and set its size to the default size.... since Vehicles have a special size,
-	// we want to keep it fresh, here, but not do the horde-ing test every frame...
+	// will rebuild the terrain decal and set its size to the default size.... since Vehicles have a special size,
+	// we want to keep it fresh, here, but not do the hording test every frame...
 	Bool isInfantry = ( obj->isKindOf(KINDOF_INFANTRY) );
 	if ( isInfantry || (TheGameLogic->getFrame() > m_lastHordeRefreshFrame + md->m_updateRate) )
 	{
 		m_lastHordeRefreshFrame = TheGameLogic->getFrame();
-		
+
 		PartitionFilterHordeMember hmFilter(getObject(), md);
 		PartitionFilter *filters[] = { &hmFilter, NULL };
 		SimpleObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(getObject(), md->m_minDist, FROM_BOUNDINGSPHERE_3D, filters);
@@ -313,22 +291,22 @@ UpdateSleepTime HordeUpdate::update( void )
 
 		AIUpdateInterface *ai = getObject()->getAIUpdateInterface();
 		if( ai )
-			ai->evaluateMoraleBonus();
+			ai->evaluateMoraleBonus(m_inHorde, md->m_allowedNationalism, md->m_action);
 
 	}
 
 
 
-	
+
 
 
 	// This is a sticky situation, where refreshing the model state (like from default to damaged, for example)
-	// will rebuild the terraindecal and set its size to the default size.... since Vehicles have a special size,
-	// we want to keep it fresh, here, but not do the horde-ing test every frame...
-	// This is a weak solution, in that It causes this update to fight the defualt behavior of the modelstate methods,
-	// But in the interest of not breaking the modelstate changing logic for five hundred other units a week before golden, 
+	// will rebuild the terrain decal and set its size to the default size.... since Vehicles have a special size,
+	// we want to keep it fresh, here, but not do the hording test every frame...
+	// This is a weak solution, in that It causes this update to fight the default behavior of the model state methods,
+	// But in the interest of not breaking the model state changing logic for five hundred other units a week before golden,
 	// this is my solution... If anyone gets this note on the next project... please please please, fix the resetting of the
-	// shadows/terraindecals in W3DModelDraw. THanks, ML
+	// shadows/terrain decals in W3DModelDraw. Thanks, ML
 
 	Drawable* draw = getObject()->getDrawable();
 	if ( draw && ! obj->isEffectivelyDead() )
@@ -337,7 +315,7 @@ UpdateSleepTime HordeUpdate::update( void )
 		{
 			if(m_inHorde && !obj->isKindOf( KINDOF_PORTABLE_STRUCTURE ) )// this not is a ride-on for overlord
 			{
-				
+
 				TerrainDecalType nuType;// uninitialized
 
 				if ( isInfantry )
@@ -403,7 +381,7 @@ void HordeUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -421,13 +399,10 @@ void HordeUpdate::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-	// in horder
 	xfer->xferBool( &m_inHorde );
-
-	// has flag
 	xfer->xferBool( &m_hasFlag );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -438,4 +413,4 @@ void HordeUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp
index d03fd4b6597..60d0baf30e2 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp
@@ -28,8 +28,9 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
+#include "Common/GameUtility.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Xfer.h"
@@ -38,16 +39,11 @@
 #include "GameClient/Drawable.h"
 #include "GameClient/GameClient.h"
 #include "GameClient/ParticleSys.h"
-#include "GameLogic/Object.h" 
+#include "GameLogic/Object.h"
 #include "GameLogic/GameLogic.h" // For frame number
 #include "GameLogic/Module/LaserUpdate.h"
 #include "WWMath/vector3.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -61,7 +57,7 @@ LaserUpdateModuleData::LaserUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MuzzleParticleSystem",		INI::parseAsciiString,	NULL, offsetof( LaserUpdateModuleData, m_particleSystemName ) },
 		{ "TargetParticleSystem",		INI::parseAsciiString,  NULL, offsetof( LaserUpdateModuleData, m_targetParticleSystemName ) },
@@ -89,18 +85,15 @@ LaserRadiusUpdate::LaserRadiusUpdate()
 //-------------------------------------------------------------------------------------------------
 LaserUpdate::LaserUpdate( Thing *thing, const ModuleData* moduleData ) : ClientUpdateModule( thing, moduleData )
 {
-	//Added By Sadullah Nader
-	//Initialization missing and needed
 	m_dirty = FALSE;
 	m_endPos.zero();
 	m_startPos.zero();
-	//
 	m_particleSystemID = INVALID_PARTICLE_SYSTEM_ID;
 	m_targetParticleSystemID = INVALID_PARTICLE_SYSTEM_ID;
 	m_parentID = INVALID_DRAWABLE_ID;
 	m_targetID = INVALID_DRAWABLE_ID;
 	m_parentBoneName.clear();
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -125,11 +118,11 @@ void LaserUpdate::updateStartPos()
 	const Drawable *parentDrawable = TheGameClient->findDrawableByID(m_parentID);
 	if( parentDrawable == NULL )
 		return;// Can't update if no one to ask
-		
+
 	if( m_parentBoneName.isNotEmpty() )
 	{
 		Matrix3D startPosMatrix;
-		
+
 		if( !parentDrawable->getCurrentWorldspaceClientBonePositions( m_parentBoneName.str(), startPosMatrix ) )
 		{
 			// failed to find the required bone, so just die
@@ -137,15 +130,15 @@ void LaserUpdate::updateStartPos()
 			//Kris: Doing this CRASHES THE GAME LATER!!!! Instead, let's set the position to the drawable, then
 			//      create a nasty assert.
 			//TheGameClient->destroyDrawable( getDrawable() );
-			
+
 			m_startPos.set( parentDrawable->getPosition() );
-			DEBUG_CRASH( ("LaserUpdate::updateStartPos() -- Drawable %s is expecting to find a bone %s but can't. Defaulting to position of drawable.", 
+			DEBUG_CRASH( ("LaserUpdate::updateStartPos() -- Drawable %s is expecting to find a bone %s but can't. Defaulting to position of drawable.",
 				parentDrawable->getTemplate()->getName().str(), m_parentBoneName.str() ) );
 
 			return;
 		}
 
-		
+
 
 		m_startPos.x = startPosMatrix.Get_X_Translation();
 		m_startPos.y = startPosMatrix.Get_Y_Translation();
@@ -171,8 +164,8 @@ void LaserUpdate::updateEndPos()
 		return;// Can't update if not told to update
 
 	const Drawable *targetDrawable = TheGameClient->findDrawableByID(m_targetID);
-	Bool targetDead = (targetDrawable && targetDrawable->getObject()) 
-										? targetDrawable->getObject()->isEffectivelyDead() 
+	Bool targetDead = (targetDrawable && targetDrawable->getObject())
+										? targetDrawable->getObject()->isEffectivelyDead()
 										: FALSE;
 	if( targetDrawable == NULL || targetDead )
 	{
@@ -340,7 +333,7 @@ void LaserUpdate::initLaser( const Object *parent, const Object *target, const C
 	}
 	else if( endPos )
 	{
-		// just use what they gave, no override here 
+		// just use what they gave, no override here
 		m_endPos = *endPos;
 	}
 	else
@@ -354,7 +347,7 @@ void LaserUpdate::initLaser( const Object *parent, const Object *target, const C
 	//PLEASE NOTE You cannot check an ID for NULL.  This should be a check against INVALID_PARTICLE_SYSTEM_ID.  Can't change it on the last day without a bug though.
 	if( !m_particleSystemID )
 	{
-		const Player *localPlayer = ThePlayerList->getLocalPlayer();
+		const Player *localPlayer = rts::getObservedOrLocalPlayer();
 
 		//Make sure the laser flare is visible to the player. If no parent, assume laser owner will handle it.
 		if (!parent || parent->getShroudedStatus( localPlayer->getPlayerIndex() ) <= OBJECTSHROUD_PARTIAL_CLEAR )
@@ -400,7 +393,7 @@ void LaserUpdate::initLaser( const Object *parent, const Object *target, const C
 			system->setPosition( &m_startPos );
 		}
 	}
-	
+
 	//PLEASE NOTE You cannot check an ID for NULL.  This should be a check against INVALID_PARTICLE_SYSTEM_ID.  Can't change it on the last day without a bug though.
 	if( m_targetParticleSystemID )
 	{
@@ -447,7 +440,7 @@ Real LaserUpdate::getTemplateLaserRadius() const
 		{
 			//***NOTE***
 			//While it appears the logic is accessing client data, it is actually accessing template module
-			//data from the client. This value is INI constant thus can't change. It's grouped with other 
+			//data from the client. This value is INI constant thus can't change. It's grouped with other
 			//laser defining attributes and having it there makes it easier for artists.
 			return ldi->getLaserTemplateWidth();
 		}
@@ -470,7 +463,7 @@ void LaserUpdate::crc( Xfer *xfer )
 	// extend base class
 	ClientUpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -510,7 +503,7 @@ void LaserUpdate::xfer( Xfer *xfer )
 
 	xfer->xferAsciiString(&m_parentBoneName);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -521,4 +514,4 @@ void LaserUpdate::loadPostProcess( void )
 	// extend base class
 	ClientUpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp
index fb2405b3110..974d94bc216 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
@@ -36,21 +36,13 @@
 #include "GameLogic/Module/LifetimeUpdate.h"
 #include "GameLogic/Object.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 LifetimeUpdate::LifetimeUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 	const LifetimeUpdateModuleData* d = getLifetimeUpdateModuleData();
-	// Added By Sadullah Nader
-	// Initializations needed
 	m_dieFrame = 0;
-	//
 	UnsignedInt delay;
 	if( getObject()->isKindOf( KINDOF_HULK ) && TheGameLogic->getHulkMaxLifetimeOverride() != -1 )
 	{
@@ -106,7 +98,7 @@ void LifetimeUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -127,7 +119,7 @@ void LifetimeUpdate::xfer( Xfer *xfer )
 	// die frame
 	xfer->xferUnsignedInt( &m_dieFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -138,4 +130,4 @@ void LifetimeUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp
index e8a349afa50..1075be90305 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   Update will change model state conditions based on special power state
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/GlobalData.h"
@@ -42,11 +42,6 @@
 #include "GameClient/Drawable.h"
 #include "GameClient/FXList.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 MissileLauncherBuildingUpdate::MissileLauncherBuildingUpdate( Thing *thing, const ModuleData* moduleData ) : SpecialPowerUpdateModule( thing, moduleData )
@@ -56,16 +51,16 @@ MissileLauncherBuildingUpdate::MissileLauncherBuildingUpdate( Thing *thing, cons
 	m_timeoutFrame = 0;
 	m_openIdleAudio = getMissileLauncherBuildingUpdateModuleData()->m_openIdleAudio;
 	m_openIdleAudio.setObjectID(getObject()->getID());
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 MissileLauncherBuildingUpdate::~MissileLauncherBuildingUpdate( void )
 {
-	if (m_openIdleAudio.isCurrentlyPlaying()) 
+	if (m_openIdleAudio.isCurrentlyPlaying())
 	{
 		TheAudio->removeAudioEvent(m_openIdleAudio.getPlayingHandle());
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
@@ -79,7 +74,7 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 	switch (dst)
 	{
 		case DOOR_CLOSED:
-			DEBUG_LOG(("switch to state DOOR_CLOSED at %d\n",now));
+			DEBUG_LOG(("switch to state DOOR_CLOSED at %d",now));
 			/// @todo srj -- for now, this assumes at most one door
 			clr.set(MODELCONDITION_DOOR_1_WAITING_TO_CLOSE);
 			clr.set(MODELCONDITION_DOOR_1_CLOSING);
@@ -92,14 +87,14 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 				const Coord3D *pos = getObject()->getPosition();
 				FXList::doFXPos(d->m_closedFX, pos);
 			}
-			if (m_openIdleAudio.isCurrentlyPlaying()) 
+			if (m_openIdleAudio.isCurrentlyPlaying())
 			{
 				TheAudio->removeAudioEvent(m_openIdleAudio.getPlayingHandle());
 			}
 			break;
 
 		case DOOR_OPENING:
-			DEBUG_LOG(("switch to state DOOR_OPENING at %d\n",now));
+			DEBUG_LOG(("switch to state DOOR_OPENING at %d",now));
 			/// @todo srj -- for now, this assumes at most one door
 			clr.set(MODELCONDITION_DOOR_1_WAITING_TO_CLOSE);
 			clr.set(MODELCONDITION_DOOR_1_CLOSING);
@@ -114,14 +109,14 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 				const Coord3D *pos = getObject()->getPosition();
 				FXList::doFXPos(d->m_openingFX, pos);
 			}
-			if (m_openIdleAudio.isCurrentlyPlaying()) 
+			if (m_openIdleAudio.isCurrentlyPlaying())
 			{
 				TheAudio->removeAudioEvent(m_openIdleAudio.getPlayingHandle());
 			}
 			break;
 
 		case DOOR_OPEN:
-			DEBUG_LOG(("switch to state DOOR_OPEN at %d\n",now));
+			DEBUG_LOG(("switch to state DOOR_OPEN at %d",now));
 			/// @todo srj -- for now, this assumes at most one door
 			clr.set(MODELCONDITION_DOOR_1_WAITING_TO_CLOSE);
 			clr.set(MODELCONDITION_DOOR_1_CLOSING);
@@ -141,7 +136,7 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 			break;
 
 		case DOOR_WAITING_TO_CLOSE:
-			DEBUG_LOG(("switch to state DOOR_WAITING_TO_CLOSE at %d\n",now));
+			DEBUG_LOG(("switch to state DOOR_WAITING_TO_CLOSE at %d",now));
 			/// @todo srj -- for now, this assumes at most one door
 			clr.set(MODELCONDITION_DOOR_1_CLOSING);
 			clr.set(MODELCONDITION_DOOR_1_OPENING);
@@ -154,14 +149,14 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 				const Coord3D *pos = getObject()->getPosition();
 				FXList::doFXPos(d->m_waitingToCloseFX, pos);
 			}
-			if (m_openIdleAudio.isCurrentlyPlaying()) 
+			if (m_openIdleAudio.isCurrentlyPlaying())
 			{
 				TheAudio->removeAudioEvent(m_openIdleAudio.getPlayingHandle());
 			}
 			break;
 
 		case DOOR_CLOSING:
-			DEBUG_LOG(("switch to state DOOR_CLOSING at %d\n",now));
+			DEBUG_LOG(("switch to state DOOR_CLOSING at %d",now));
 			/// @todo srj -- for now, this assumes at most one door
 			clr.set(MODELCONDITION_DOOR_1_WAITING_TO_CLOSE);
 			clr.set(MODELCONDITION_DOOR_1_WAITING_OPEN);
@@ -181,7 +176,7 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 				const Coord3D *pos = getObject()->getPosition();
 				FXList::doFXPos(d->m_closingFX, pos);
 			}
-			if (m_openIdleAudio.isCurrentlyPlaying()) 
+			if (m_openIdleAudio.isCurrentlyPlaying())
 			{
 				TheAudio->removeAudioEvent(m_openIdleAudio.getPlayingHandle());
 			}
@@ -206,12 +201,21 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 //-------------------------------------------------------------------------------------------------
 Bool MissileLauncherBuildingUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions )
 {
+#if RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix Mauller 29/06/2025 prevent a game crash when told to launch before ready to do so
+	if (!m_specialPowerModule) {
+		Object* us = getObject();
+		us->getSpecialPowerModule(specialPowerTemplate)->setReadyFrame(0xFFFFFFFF);
+		return FALSE;
+	}
+#endif
+
 	if( m_specialPowerModule->getSpecialPowerTemplate() != specialPowerTemplate )
 	{
 		return FALSE;
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	DEBUG_ASSERTCRASH(!TheGlobalData->m_specialPowerUsesDelay || m_doorState == DOOR_OPEN, ("door is not fully open when specialpower is fired!"));
 #endif
 
@@ -224,7 +228,7 @@ Bool MissileLauncherBuildingUpdate::initiateIntentToDoSpecialPower( const Specia
 Bool MissileLauncherBuildingUpdate::isPowerCurrentlyInUse( const CommandButton *command ) const
 {
 	//@todo -- Implement me in such a way that it still works with Ctrl+s cheat key...
-	//In fact, this code doesn't really care because in legit mode, the game will 
+	//In fact, this code doesn't really care because in legit mode, the game will
 	//never require this check to disable the cameo button.
 	return false;
 }
@@ -235,7 +239,7 @@ UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
 	const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();
 
 	UnsignedInt now = TheGameLogic->getFrame();
-	
+
 	// If we are under construction, any decision we make about door status could be wrong.
 	// Our special power module is randomly going to be initialized or not (which would result
 	// in him reporting a 0 frame ready, which means we will start open).
@@ -247,7 +251,7 @@ UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
 		m_specialPowerModule = getObject()->getSpecialPowerModule(d->m_specialPowerTemplate);
 		DEBUG_ASSERTCRASH(m_specialPowerModule, ("Missing special power"));
 	}
-	
+
 	if (m_specialPowerModule)
 	{
 		UnsignedInt readyFrame = m_specialPowerModule->getReadyFrame();
@@ -258,13 +262,13 @@ UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
 			switchToState(m_timeoutState);
 		}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 		DEBUG_ASSERTCRASH(!TheGlobalData->m_specialPowerUsesDelay || !(m_specialPowerModule->isReady() && m_doorState != DOOR_OPEN), ("door is not fully open when specialpower is ready!"));
 #endif
 
 		if (m_doorState != DOOR_OPEN && m_specialPowerModule->isReady())
 		{
-			DEBUG_LOG(("*** had to POP the door open!\n"));
+			DEBUG_LOG(("*** had to POP the door open!"));
 			switchToState(DOOR_OPEN);
 		}
 		else if (m_doorState == DOOR_CLOSED && now >= whenToStartOpening)
@@ -291,7 +295,7 @@ void MissileLauncherBuildingUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -321,7 +325,7 @@ void MissileLauncherBuildingUpdate::xfer( Xfer *xfer )
 	// timeout frame
 	xfer->xferUnsignedInt( &m_timeoutFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -332,4 +336,4 @@ void MissileLauncherBuildingUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MobMemberSlavedUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MobMemberSlavedUpdate.cpp
index 6b07341869b..0edb6bb8a62 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MobMemberSlavedUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MobMemberSlavedUpdate.cpp
@@ -29,13 +29,12 @@
 // Desc:  Slaved unit(s) remain close to their master. Used by angry Mob members (various)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/InGameUI.h"// selection logic
 #include "GameClient/Drawable.h"
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
-#include "GameClient/Drawable.h"
 #include "GameClient/ParticleSys.h"
 #include "GameLogic/AIPathfind.h"
 #include "GameLogic/Damage.h"
@@ -48,18 +47,11 @@
 #include "GameLogic/Module/BodyModule.h"
 #include "GameLogic/Module/MobMemberSlavedUpdate.h"
 #include "GameLogic/Module/SpawnBehavior.h"
-#include "GameClient/InGameUI.h"// selection logic
-#include "GameClient/Drawable.h"
 #include "Common/ThingFactory.h"
-#include "Common/ThingTemplate.h" 
+#include "Common/ThingTemplate.h"
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 #define STRAY_MULTIPLIER 2.0f // Multiplier from stating diestance from tunnel, to max distance from
@@ -78,7 +70,7 @@ MobMemberSlavedUpdate::MobMemberSlavedUpdate( Thing *thing, const ModuleData* mo
 	m_personalColor.red = GameLogicRandomValueReal( 0.2f, 0.4f );
 	m_personalColor.green = GameLogicRandomValueReal( 0.2f, 0.4f );
 	m_personalColor.blue = GameLogicRandomValueReal( 0.2f, 0.4f );
-	
+
 //	Drawable *myDraw = getObject()->getDrawable();
 //	if ( myDraw )
 //		myDraw->colorTint( &m_personalColor );
@@ -92,12 +84,12 @@ MobMemberSlavedUpdate::MobMemberSlavedUpdate( Thing *thing, const ModuleData* mo
 	// MDC: moving to GameLogicRandomValue.  This does not need to be synced, but having it so makes searches *so* much nicer.
 	//getObject()->getDrawable()->setInstanceScale(GameLogicRandomValueReal( 5.0f, 1.5f ));
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 MobMemberSlavedUpdate::~MobMemberSlavedUpdate( void )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void MobMemberSlavedUpdate::onObjectCreated()
@@ -128,7 +120,7 @@ void MobMemberSlavedUpdate::onSlaverDamage( const DamageInfo *info )
 	if( ai )
 		ai->aiGoProne( info, CMD_FROM_AI );
 }
- 
+
 
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime MobMemberSlavedUpdate::update( void )
@@ -138,7 +130,7 @@ UpdateSleepTime MobMemberSlavedUpdate::update( void )
 	const MobMemberSlavedUpdateModuleData* data = getMobMemberSlavedUpdateModuleData();
 	Object *me = getObject();
 	if( !me )
-	{ 
+	{
 		return UPDATE_SLEEP_NONE;
 	}
 
@@ -146,7 +138,7 @@ UpdateSleepTime MobMemberSlavedUpdate::update( void )
 	if( master == NULL )
 	{
 		stopSlavedEffects();
-		
+
 		//TheGameLogic->destroyObject( me );
 		me->kill();
 		return UPDATE_SLEEP_NONE;	// you cannot return SLEEP_FOREVER unless you make yourself sleepy...
@@ -186,10 +178,10 @@ UpdateSleepTime MobMemberSlavedUpdate::update( void )
 
 	if ( ++m_framesToWait < 16)
 		return UPDATE_SLEEP_NONE;
-	
+
 	m_framesToWait = 0;
 
-	
+
 	Locomotor *locomotor = myAI->getCurLocomotor();
 	if( !locomotor )
 	{
@@ -230,7 +222,7 @@ UpdateSleepTime MobMemberSlavedUpdate::update( void )
 			{
 				myAI->aiMoveToPosition( master->getPosition(), CMD_FROM_AI ); // NASTY BEEHIVE EFFECT
 			}
-			else 
+			else
 			{
 				Coord3D goalDelta = *myAI->getGoalPosition();
 				goalDelta.sub( &nuPos );
@@ -240,7 +232,7 @@ UpdateSleepTime MobMemberSlavedUpdate::update( void )
 					myAI->aiMoveToPosition( &nuPos, CMD_FROM_AI ); // Whither thou goest... THis causes the mob to reconverge
 				}
 			}
-				
+
 																															// on the fly, instead of doubling back to reconverge
 		}
 		else // master is still, so let's re group in a hurry
@@ -286,19 +278,19 @@ UpdateSleepTime MobMemberSlavedUpdate::update( void )
 		m_catchUpCrisisTimer = 0; // I'm not too far from the nexus this frame
 
 		Int seed = GameLogicRandomValue( 0, 10 );
-		if ( seed == 1 ) 
+		if ( seed == 1 )
 			myAI->chooseLocomotorSet(LOCOMOTORSET_WANDER);
-		else if ( seed == 2 ) 
-			myAI->chooseLocomotorSet(LOCOMOTORSET_PANIC); 
-		else if ( seed == 3 ) 
-			myAI->chooseLocomotorSet(LOCOMOTORSET_NORMAL); 
+		else if ( seed == 2 )
+			myAI->chooseLocomotorSet(LOCOMOTORSET_PANIC);
+		else if ( seed == 3 )
+			myAI->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 	//	else if ( seed >= 5 ) // go towards mommy's goal
 	//	{
 	//		Coord3D destination = *me->getPosition();
 	//		TheAI->pathfinder()->adjustToPossibleDestination(me, myAI->getLocomotorSet(), &destination);
 	//		myAI->aiMoveToPosition( &destination, CMD_FROM_AI ); // reconverge
 	//	}
-		
+
 	}
 	else // give me something to do while I'm standing here...
 	{
@@ -390,7 +382,7 @@ void MobMemberSlavedUpdate::startSlavedEffects( const Object *slaver )
 		return;
 
 	m_slaver = slaver->getID();
-	
+
 	// mark selves as not selectable
 	//getObject()->setStatus( OBJECT_STATUS_UNSELECTABLE );
 
@@ -415,7 +407,7 @@ void MobMemberSlavedUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -453,11 +445,11 @@ void MobMemberSlavedUpdate::xfer( Xfer *xfer )
 
 	// is self tasking
 	xfer->xferBool( &m_isSelfTasking );
-	
+
 	// catch up crisis timer
   xfer->xferUnsignedInt( &m_catchUpCrisisTimer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -468,4 +460,4 @@ void MobMemberSlavedUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileSlowDeathUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileSlowDeathUpdate.cpp
index d044f1afa40..13814396128 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileSlowDeathUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileSlowDeathUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 #include "Common/GameState.h"
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -53,7 +53,7 @@
 // ------------------------------------------------------------------------------------------------
 NeutronMissileSlowDeathBehaviorModuleData::NeutronMissileSlowDeathBehaviorModuleData( void )
 {
-	
+
 	for( Int i = 0; i < MAX_NEUTRON_BLASTS; ++i )
 	{
 
@@ -67,11 +67,11 @@ NeutronMissileSlowDeathBehaviorModuleData::NeutronMissileSlowDeathBehaviorModule
 		m_blastInfo[ i ].toppleSpeed = 0.0f;
 		m_blastInfo[ i ].pushForceMag = 0.0f;
 
-	}  // end for i
+	}
 	m_scorchSize = 0.0f;
 	m_fxList		 = NULL;
 
-}  // end NeutronMissileSlowDeathBehaviorModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -80,98 +80,98 @@ NeutronMissileSlowDeathBehaviorModuleData::NeutronMissileSlowDeathBehaviorModule
 
   SlowDeathBehaviorModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
-		{ "ScorchMarkSize", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_scorchSize ) },	
+		{ "ScorchMarkSize", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_scorchSize ) },
 		{ "FXList",					INI::parseFXList, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_fxList ) },
 
-		{ "Blast1Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].enabled ) },	
-		{ "Blast1Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].delay ) },	
-		{ "Blast1ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].scorchDelay ) },	
-		{ "Blast1InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].innerRadius ) },	
-		{ "Blast1OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].outerRadius ) },	
-		{ "Blast1MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].maxDamage ) },	
-		{ "Blast1MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].minDamage ) },	
+		{ "Blast1Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].enabled ) },
+		{ "Blast1Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].delay ) },
+		{ "Blast1ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].scorchDelay ) },
+		{ "Blast1InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].innerRadius ) },
+		{ "Blast1OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].outerRadius ) },
+		{ "Blast1MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].maxDamage ) },
+		{ "Blast1MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].minDamage ) },
 		{ "Blast1ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].toppleSpeed ) },
 		{ "Blast1PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_1 ].pushForceMag ) },
 
-		{ "Blast2Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].enabled ) },	
-		{ "Blast2Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].delay ) },	
-		{ "Blast2ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].scorchDelay ) },	
-		{ "Blast2InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].innerRadius ) },	
-		{ "Blast2OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].outerRadius ) },	
-		{ "Blast2MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].maxDamage ) },	
-		{ "Blast2MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].minDamage ) },	
+		{ "Blast2Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].enabled ) },
+		{ "Blast2Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].delay ) },
+		{ "Blast2ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].scorchDelay ) },
+		{ "Blast2InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].innerRadius ) },
+		{ "Blast2OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].outerRadius ) },
+		{ "Blast2MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].maxDamage ) },
+		{ "Blast2MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].minDamage ) },
 		{ "Blast2ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].toppleSpeed ) },
 		{ "Blast2PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_2 ].pushForceMag ) },
 
-		{ "Blast3Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].enabled ) },	
-		{ "Blast3Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].delay ) },	
-		{ "Blast3ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].scorchDelay ) },	
-		{ "Blast3InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].innerRadius ) },	
-		{ "Blast3OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].outerRadius ) },	
-		{ "Blast3MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].maxDamage ) },	
-		{ "Blast3MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].minDamage ) },	
+		{ "Blast3Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].enabled ) },
+		{ "Blast3Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].delay ) },
+		{ "Blast3ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].scorchDelay ) },
+		{ "Blast3InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].innerRadius ) },
+		{ "Blast3OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].outerRadius ) },
+		{ "Blast3MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].maxDamage ) },
+		{ "Blast3MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].minDamage ) },
 		{ "Blast3ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].toppleSpeed ) },
 		{ "Blast3PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_3 ].pushForceMag ) },
 
-		{ "Blast4Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].enabled ) },	
-		{ "Blast4Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].delay ) },	
-		{ "Blast4ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].scorchDelay ) },	
-		{ "Blast4InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].innerRadius ) },	
-		{ "Blast4OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].outerRadius ) },	
-		{ "Blast4MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].maxDamage ) },	
-		{ "Blast4MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].minDamage ) },	
+		{ "Blast4Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].enabled ) },
+		{ "Blast4Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].delay ) },
+		{ "Blast4ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].scorchDelay ) },
+		{ "Blast4InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].innerRadius ) },
+		{ "Blast4OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].outerRadius ) },
+		{ "Blast4MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].maxDamage ) },
+		{ "Blast4MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].minDamage ) },
 		{ "Blast4ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].toppleSpeed ) },
 		{ "Blast4PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_4 ].pushForceMag ) },
 
-		{ "Blast5Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].enabled ) },	
-		{ "Blast5Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].delay ) },	
-		{ "Blast5ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].scorchDelay ) },	
-		{ "Blast5InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].innerRadius ) },	
-		{ "Blast5OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].outerRadius ) },	
-		{ "Blast5MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].maxDamage ) },	
-		{ "Blast5MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].minDamage ) },	
+		{ "Blast5Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].enabled ) },
+		{ "Blast5Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].delay ) },
+		{ "Blast5ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].scorchDelay ) },
+		{ "Blast5InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].innerRadius ) },
+		{ "Blast5OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].outerRadius ) },
+		{ "Blast5MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].maxDamage ) },
+		{ "Blast5MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].minDamage ) },
 		{ "Blast5ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].toppleSpeed ) },
 		{ "Blast5PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_5 ].pushForceMag ) },
 
-		{ "Blast6Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].enabled ) },	
-		{ "Blast6Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].delay ) },	
-		{ "Blast6ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].scorchDelay ) },			
-		{ "Blast6InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].innerRadius ) },	
-		{ "Blast6OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].outerRadius ) },	
-		{ "Blast6MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].maxDamage ) },	
-		{ "Blast6MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].minDamage ) },	
+		{ "Blast6Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].enabled ) },
+		{ "Blast6Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].delay ) },
+		{ "Blast6ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].scorchDelay ) },
+		{ "Blast6InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].innerRadius ) },
+		{ "Blast6OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].outerRadius ) },
+		{ "Blast6MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].maxDamage ) },
+		{ "Blast6MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].minDamage ) },
 		{ "Blast6ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].toppleSpeed ) },
 		{ "Blast6PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_6 ].pushForceMag ) },
 
-		{ "Blast7Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].enabled ) },	
-		{ "Blast7Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].delay ) },	
-		{ "Blast7ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].scorchDelay ) },			
-		{ "Blast7InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].innerRadius ) },	
-		{ "Blast7OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].outerRadius ) },	
-		{ "Blast7MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].maxDamage ) },	
-		{ "Blast7MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].minDamage ) },	
+		{ "Blast7Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].enabled ) },
+		{ "Blast7Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].delay ) },
+		{ "Blast7ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].scorchDelay ) },
+		{ "Blast7InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].innerRadius ) },
+		{ "Blast7OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].outerRadius ) },
+		{ "Blast7MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].maxDamage ) },
+		{ "Blast7MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].minDamage ) },
 		{ "Blast7ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].toppleSpeed ) },
 		{ "Blast7PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_7 ].pushForceMag ) },
 
-		{ "Blast8Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].enabled ) },	
-		{ "Blast8Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].delay ) },	
-		{ "Blast8ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].scorchDelay ) },			
-		{ "Blast8InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].innerRadius ) },	
-		{ "Blast8OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].outerRadius ) },	
-		{ "Blast8MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].maxDamage ) },	
-		{ "Blast8MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].minDamage ) },	
+		{ "Blast8Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].enabled ) },
+		{ "Blast8Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].delay ) },
+		{ "Blast8ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].scorchDelay ) },
+		{ "Blast8InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].innerRadius ) },
+		{ "Blast8OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].outerRadius ) },
+		{ "Blast8MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].maxDamage ) },
+		{ "Blast8MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].minDamage ) },
 		{ "Blast8ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].toppleSpeed ) },
 		{ "Blast8PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_8 ].pushForceMag ) },
 
-		{ "Blast9Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].enabled ) },	
-		{ "Blast9Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].delay ) },	
-		{ "Blast9ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].scorchDelay ) },			
-		{ "Blast9InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].innerRadius ) },	
-		{ "Blast9OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].outerRadius ) },	
-		{ "Blast9MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].maxDamage ) },	
-		{ "Blast9MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].minDamage ) },	
+		{ "Blast9Enabled", INI::parseBool, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].enabled ) },
+		{ "Blast9Delay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].delay ) },
+		{ "Blast9ScorchDelay", INI::parseDurationReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].scorchDelay ) },
+		{ "Blast9InnerRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].innerRadius ) },
+		{ "Blast9OuterRadius", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].outerRadius ) },
+		{ "Blast9MaxDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].maxDamage ) },
+		{ "Blast9MinDamage", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].minDamage ) },
 		{ "Blast9ToppleSpeed", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].toppleSpeed ) },
 		{ "Blast9PushForce", INI::parseReal, NULL, offsetof( NeutronMissileSlowDeathBehaviorModuleData, m_blastInfo[ NEUTRON_BLAST_9 ].pushForceMag ) },
 
@@ -180,7 +180,7 @@ NeutronMissileSlowDeathBehaviorModuleData::NeutronMissileSlowDeathBehaviorModule
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -188,7 +188,7 @@ NeutronMissileSlowDeathBehaviorModuleData::NeutronMissileSlowDeathBehaviorModule
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-NeutronMissileSlowDeathBehavior::NeutronMissileSlowDeathBehavior( Thing *thing, const ModuleData *moduleData ) 
+NeutronMissileSlowDeathBehavior::NeutronMissileSlowDeathBehavior( Thing *thing, const ModuleData *moduleData )
 															: SlowDeathBehavior( thing, moduleData )
 {
 	Int i;
@@ -201,16 +201,16 @@ NeutronMissileSlowDeathBehavior::NeutronMissileSlowDeathBehavior( Thing *thing,
 		m_completedBlasts[ i ] = FALSE;
 		m_completedScorchBlasts[ i ] = FALSE;
 
-	}  // end for i
+	}
 
-}  // end NeutronMissileSlowDeathBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 NeutronMissileSlowDeathBehavior::~NeutronMissileSlowDeathBehavior( void )
 {
 
-}  // end ~NeutronMissileSlowDeathBehavior
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -245,7 +245,7 @@ UpdateSleepTime NeutronMissileSlowDeathBehavior::update( void )
 		m_activationFrame = currFrame;
 
 		FXList::doFXPos( modData->m_fxList, &pos );
-	}  // end if
+	}
 
 	// see if it's time for any explosions
 	for( Int i = 0; i < MAX_NEUTRON_BLASTS; i++ )
@@ -257,7 +257,7 @@ UpdateSleepTime NeutronMissileSlowDeathBehavior::update( void )
 
 		// has the time of this blast come
 		if( m_completedBlasts[ i ] == FALSE &&
-				(currFrame - m_activationFrame > modData->m_blastInfo[ i ].delay) ) 
+				(currFrame - m_activationFrame > modData->m_blastInfo[ i ].delay) )
 		{
 
 			// do the blast
@@ -266,7 +266,7 @@ UpdateSleepTime NeutronMissileSlowDeathBehavior::update( void )
 			// mark this blast as complete now
 			m_completedBlasts[ i ] = TRUE;
 
-		}  // end if
+		}
 
 		// has the time for a scorch blast come
 		if( m_completedScorchBlasts[ i ] == FALSE &&
@@ -279,13 +279,13 @@ UpdateSleepTime NeutronMissileSlowDeathBehavior::update( void )
 			// mark this scorch blast as complete now
 			m_completedScorchBlasts[ i ] = TRUE;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do a single blast for the bomb */
@@ -316,7 +316,7 @@ void NeutronMissileSlowDeathBehavior::doBlast( const BlastInfo *blastInfo )
 	{
 		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( missilePos,
 																																			 blastInfo->outerRadius,
-																																			 FROM_CENTER_2D, 
+																																			 FROM_CENTER_2D,
 																																			 NULL );
 		MemoryPoolObjectHolder hold( iter );
 		Object *other;
@@ -335,7 +335,7 @@ void NeutronMissileSlowDeathBehavior::doBlast( const BlastInfo *blastInfo )
 			forceVector.z = otherPos->z - missilePos->z;
 
 			// try to topple other object
-			other->topple( &forceVector, blastInfo->toppleSpeed, TOPPLE_OPTIONS_NO_BOUNCE | 
+			other->topple( &forceVector, blastInfo->toppleSpeed, TOPPLE_OPTIONS_NO_BOUNCE |
 																													 TOPPLE_OPTIONS_NO_FX );
 
 			//
@@ -356,8 +356,8 @@ void NeutronMissileSlowDeathBehavior::doBlast( const BlastInfo *blastInfo )
 				if( damageInfo.in.m_amount < blastInfo->minDamage )
 					damageInfo.in.m_amount = blastInfo->minDamage;
 
-			}  // end else
-					
+			}
+
 			// do actual damage
 			if( damageInfo.in.m_amount )
 			{
@@ -372,9 +372,9 @@ void NeutronMissileSlowDeathBehavior::doBlast( const BlastInfo *blastInfo )
 					TheGameClient->addScorch( missilePos, modData->m_scorchSize, SCORCH_1 );
 					m_scorchPlaced = TRUE;
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
 /*
 			// apply a small force to the object from the shockwave center
@@ -397,14 +397,14 @@ void NeutronMissileSlowDeathBehavior::doBlast( const BlastInfo *blastInfo )
 				// apply the force
 				physics->applyForce( &physicsForce );
 
-			}  // end if, physics
+			}
 */
 
-		}  // end for, other
+		}
 
-	}  // end if, an outer radius exists
-		
-}  // end doBlast
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do a scorch blast event ... this doesn't do actual damage, but it "scorches" things */
@@ -428,13 +428,13 @@ void NeutronMissileSlowDeathBehavior::doScorchBlast( const BlastInfo *blastInfo
 	{
 		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( missilePos,
 																																			 blastInfo->outerRadius,
-																																			 FROM_CENTER_2D, 
+																																			 FROM_CENTER_2D,
 																																			 NULL );
 		MemoryPoolObjectHolder hold( iter );
 		Object *other;
 		for( other = iter->first(); other; other = iter->next() )
 		{
-					
+
 			// set things aflame
 			///@todo can't to this now, flames eat too many particles
 	//		static NameKeyType flammableKey = NAMEKEY( "FlammableUpdate" );
@@ -453,13 +453,13 @@ void NeutronMissileSlowDeathBehavior::doScorchBlast( const BlastInfo *blastInfo
 				if( draw )
 					draw->setShadowsEnabled( FALSE );
 
-			}  // end if
+			}
 
-		}  // end for, other
+		}
 
-	}  // end if, outer radius exists
+	}
 
-}  // end doScorchBlast
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -470,7 +470,7 @@ void NeutronMissileSlowDeathBehavior::crc( Xfer *xfer )
 	// extend base class
 	SlowDeathBehavior::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -497,10 +497,10 @@ void NeutronMissileSlowDeathBehavior::xfer( Xfer *xfer )
 	if( maxNeutronBlasts != MAX_NEUTRON_BLASTS )
 	{
 
-		DEBUG_CRASH(( "NeutronMissileSlowDeathBehavior::xfer - Size of MAX_NEUTRON_BLASTS has changed, you must version this xfer code and then you can remove this error message\n" ));
+		DEBUG_CRASH(( "NeutronMissileSlowDeathBehavior::xfer - Size of MAX_NEUTRON_BLASTS has changed, you must version this xfer code and then you can remove this error message" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 
 	// completed blasts
 	UnsignedByte i;
@@ -514,7 +514,7 @@ void NeutronMissileSlowDeathBehavior::xfer( Xfer *xfer )
 	// scorch placed
 	xfer->xferBool( &m_scorchPlaced );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -525,4 +525,4 @@ void NeutronMissileSlowDeathBehavior::loadPostProcess( void )
 	// extend base class
 	SlowDeathBehavior::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileUpdate.cpp
index 144bf3c4351..695c65a63af 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/NeutronMissileUpdate.cpp
@@ -26,7 +26,7 @@
 // Author: Michael S. Booth, December 2001
 // Desc:   Implementation of missile behavior
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/Thing.h"
@@ -76,7 +76,7 @@ void NeutronMissileUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DistanceToTravelBeforeTurning",	INI::parseReal,		NULL, offsetof( NeutronMissileUpdateModuleData, m_initialDist ) },
 		{ "MaxTurnRate",			INI::parseAngularVelocityReal,		NULL, offsetof( NeutronMissileUpdateModuleData, m_maxTurnRate ) },
@@ -126,7 +126,7 @@ NeutronMissileUpdate::NeutronMissileUpdate( Thing *thing, const ModuleData* modu
 
 	m_exhaustSysTmpl = NULL;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 NeutronMissileUpdate::~NeutronMissileUpdate( void )
@@ -215,7 +215,7 @@ void NeutronMissileUpdate::doLaunch( void )
 		if (!launcher->getDrawable() ||
 			!launcher->getDrawable()->getProjectileLaunchOffset(m_attach_wslot, m_attach_specificBarrelToUse, &attachTransform, TURRET_INVALID, NULL))
 		{
-			DEBUG_CRASH(("ProjectileLaunchPos %d %d not found!\n",m_attach_wslot, m_attach_specificBarrelToUse));
+			DEBUG_CRASH(("ProjectileLaunchPos %d %d not found!",m_attach_wslot, m_attach_specificBarrelToUse));
 			attachTransform.Make_Identity();
 		}
 
@@ -230,7 +230,7 @@ void NeutronMissileUpdate::doLaunch( void )
 
 		//
 		// the missile on the raising up launch platform is actually 45 degrees from the missile
-		// that is flying around the world ... we want to rotate it "on end and in place" so 
+		// that is flying around the world ... we want to rotate it "on end and in place" so
 		// that we don't see any decals on the side of the missile 'pop' to the new angle
 		/// @todo, this should not be a hard coded value ... I love demos!!!
 		//
@@ -263,7 +263,7 @@ void NeutronMissileUpdate::doLaunch( void )
 	getObject()->setPosition( &pos );
 
 	FXList::doFXObj(getNeutronMissileUpdateModuleData()->m_ignitionFX, getObject());
-	
+
 	if (m_exhaustSysTmpl != NULL)
 		TheParticleSystemManager->createAttachedParticleSystemID(m_exhaustSysTmpl, getObject());
 
@@ -338,7 +338,7 @@ void NeutronMissileUpdate::doAttack( void )
 
 	if (getNeutronMissileUpdateModuleData()->m_targetFromDirectlyAbove && m_reachedIntermediatePos)
 		speed *= STRAIGHT_DOWN_SLOW_FACTOR;
-	
+
 	// if we're still in the no-turning-time, OR if we're out of fuel
 	if (m_noTurnDistLeft > 0.0f)
 	{
@@ -365,7 +365,7 @@ void NeutronMissileUpdate::doAttack( void )
 	Vector3 trueDir = mx.Get_X_Vector();
 	trueDir.Normalize();
 
-	// 
+	//
 	// Move forward along forward direction
 	//
 	Real damping = getNeutronMissileUpdateModuleData()->m_forwardDamping;
@@ -417,9 +417,9 @@ void NeutronMissileUpdate::doAttack( void )
 	pos.y += m_vel.y;
 	pos.z += m_vel.z;
 
-//DEBUG_LOG(("vel %f accel %f z %f\n",m_vel.length(),m_accel.length(), pos.z));
+//DEBUG_LOG(("vel %f accel %f z %f",m_vel.length(),m_accel.length(), pos.z));
 //Real vm = sqrt(m_vel.x*m_vel.x+m_vel.y*m_vel.y+m_vel.z*m_vel.z);
-//DEBUG_LOG(("vel is %f %f %f (%f)\n",m_vel.x,m_vel.y,m_vel.z,vm));
+//DEBUG_LOG(("vel is %f %f %f (%f)",m_vel.x,m_vel.y,m_vel.z,vm));
 	getObject()->setTransformMatrix( &mx );
 	getObject()->setPosition( &pos );
 
@@ -484,7 +484,7 @@ UpdateSleepTime NeutronMissileUpdate::update( void )
 			Real vel = m_vel.length();
 			m_vel.x = 0;
 			m_vel.y = 0;
-			m_vel.z = -vel * STRAIGHT_DOWN_SLOW_FACTOR;	
+			m_vel.z = -vel * STRAIGHT_DOWN_SLOW_FACTOR;
 
 		}
 	}
@@ -513,7 +513,7 @@ UpdateSleepTime NeutronMissileUpdate::update( void )
 	{
 		Coord3D newPos = *getObject()->getPosition();
 		Real distThisTurn = sqrt(sqr(newPos.x-oldPos.x) + sqr(newPos.y-oldPos.y) + sqr(newPos.z-oldPos.z));
-		//DEBUG_LOG(("noTurnDist goes from %f to %f\n",m_noTurnDistLeft,m_noTurnDistLeft-distThisTurn));
+		//DEBUG_LOG(("noTurnDist goes from %f to %f",m_noTurnDistLeft,m_noTurnDistLeft-distThisTurn));
 		m_noTurnDistLeft -= distThisTurn;
 	}
 
@@ -538,7 +538,7 @@ void NeutronMissileUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -619,16 +619,16 @@ void NeutronMissileUpdate::xfer( Xfer *xfer )
 			if( m_exhaustSysTmpl == NULL )
 			{
 
-				DEBUG_CRASH(( "NeutronMissileUpdate::xfer - Unable to find particle system '%s'\n", name.str() ));
+				DEBUG_CRASH(( "NeutronMissileUpdate::xfer - Unable to find particle system '%s'", name.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -639,4 +639,4 @@ void NeutronMissileUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/OCLUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/OCLUpdate.cpp
index 73b5fab525e..a05d9ff2b3c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/OCLUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/OCLUpdate.cpp
@@ -46,8 +46,7 @@
 void parseFactionObjectCreationList( INI *ini, void *instance, void *store, const void *userData )
 {
 	OCLUpdateModuleData::FactionOCLInfo info;
-	info.m_factionName = "";
-	info.m_ocl = 0;
+	info.m_ocl = NULL;
 
 	const char *token = ini->getNextToken( ini->getSepsColon() );
 
@@ -71,8 +70,8 @@ void parseFactionObjectCreationList( INI *ini, void *instance, void *store, cons
 	// Insert the info into the ocl hashmap
 	OCLUpdateModuleData::FactionOCLList * theList = (OCLUpdateModuleData::FactionOCLList*)store;
 	theList->push_back(info);
-	
-}  // end parseFactionObjectCreationList
+
+}
 
 //-------------------------------------------------------------------------------------------------
 OCLUpdateModuleData::OCLUpdateModuleData()
@@ -86,11 +85,11 @@ OCLUpdateModuleData::OCLUpdateModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void OCLUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void OCLUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "OCL",					INI::parseObjectCreationList,		NULL, offsetof( OCLUpdateModuleData, m_ocl ) },
 		{ "FactionOCL",		parseFactionObjectCreationList,	NULL, offsetof( OCLUpdateModuleData, m_factionOCL ) },
@@ -123,11 +122,22 @@ OCLUpdate::~OCLUpdate( void )
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime OCLUpdate::update( void )
 {
+#if RETAIL_COMPATIBLE_CRC
 	if( getObject()->isDisabled() )
 	{
 		m_nextCreationFrame++;
 		return UPDATE_SLEEP_NONE;
 	}
+#else
+	// TheSuperHackers @bugfix dizzyj/Caball009/Mauller 14/07/2025 prevent triggering supply drop when subdued while under construction
+	// When the construction is finished, we allow the timer to be initialized and then start shifting the timer while subdued
+	if ( m_timerStartedFrame > 0 && getObject()->isDisabled() )
+	{
+		m_nextCreationFrame++;
+		m_timerStartedFrame++;
+		return UPDATE_SLEEP_NONE;
+	}
+#endif
 
 	const OCLUpdateModuleData *data = getOCLUpdateModuleData();
 
@@ -188,11 +198,11 @@ UpdateSleepTime OCLUpdate::update( void )
 		// If this is faction triggered, search through the faction specific OCLs to find the match
 		if (data->m_isFactionTriggered)
 		{
-			std::string playerFactionName("");
+			std::string playerFactionName;
 
 			Player *player = getObject()->getControllingPlayer();
 			if (!player) return UPDATE_SLEEP_NONE;
-			
+
 			const PlayerTemplate *playerT = player->getPlayerTemplate();
 			if (!playerT) return UPDATE_SLEEP_NONE;
 
@@ -242,7 +252,7 @@ Bool OCLUpdate::shouldCreate()
 // ------------------------------------------------------------------------------------------------
 void OCLUpdate::setNextCreationFrame()
 {
-	UnsignedInt delay = GameLogicRandomValue( getOCLUpdateModuleData()->m_minDelay, 
+	UnsignedInt delay = GameLogicRandomValue( getOCLUpdateModuleData()->m_minDelay,
 																						getOCLUpdateModuleData()->m_maxDelay );
 	m_timerStartedFrame = TheGameLogic->getFrame();
 	m_nextCreationFrame = m_timerStartedFrame + delay;
@@ -276,7 +286,7 @@ void OCLUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -302,11 +312,11 @@ void OCLUpdate::xfer( Xfer *xfer )
 
 	// faction status
 	xfer->xferBool( &m_isFactionNeutral );
-	
+
 	// current owning player color
 	xfer->xferInt( &m_currentPlayerColor );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -317,4 +327,4 @@ void OCLUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
index ba9035085d2..d2d1d07928e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
@@ -27,11 +27,12 @@
 // Desc:   Update module to handle building states and weapon firing of the particle uplink cannon.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_DEATH_NAMES
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "Common/GameUtility.h"
 #include "Common/ThingTemplate.h"
 #include "Common/ThingFactory.h"
 #include "Common/Player.h"
@@ -57,11 +58,6 @@
 #include "GameLogic/Module/PhysicsUpdate.h"
 #include "GameLogic/Module/ActiveBody.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
@@ -90,11 +86,8 @@ ParticleUplinkCannonUpdateModuleData::ParticleUplinkCannonUpdateModuleData()
   m_manualDrivingSpeed						= 0.0f;
   m_manualFastDrivingSpeed				= 0.0f;
   m_doubleClickToFastDriveDelay		= 500;
-	//Added by Sadullah Nader
-	//Initializations inserted
 	m_swathOfDeathAmplitude					= 0.0f;
 	m_swathOfDeathDistance					=	0.0f;
-	//
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -102,7 +95,7 @@ ParticleUplinkCannonUpdateModuleData::ParticleUplinkCannonUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SpecialPowerTemplate",									INI::parseSpecialPowerTemplate,	NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_specialPowerTemplate ) },
     { "BeginChargeTime",											INI::parseDurationUnsignedInt,	NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_beginChargeFrames ) },
@@ -112,7 +105,7 @@ ParticleUplinkCannonUpdateModuleData::ParticleUplinkCannonUpdateModuleData()
 		{ "BeamTravelTime",												INI::parseDurationUnsignedInt,	NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_beamTravelFrames ) },
 		{ "TotalFiringTime",											INI::parseDurationUnsignedInt,  NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_totalFiringFrames ) },
 		{ "RevealRange",													INI::parseReal,									NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_revealRange ) },
-		
+
 		{ "OuterEffectBoneName",									INI::parseAsciiString,					NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_outerEffectBaseBoneName ) },
 		{ "OuterEffectNumBones",									INI::parseUnsignedInt,					NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_outerEffectNumBones ) },
 		{ "OuterNodesLightFlareParticleSystem",		INI::parseAsciiString,					NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_outerNodesLightFlareParticleSystemName ) },
@@ -142,8 +135,8 @@ ParticleUplinkCannonUpdateModuleData::ParticleUplinkCannonUpdateModuleData()
 
 		{ "DamagePerSecond",											INI::parseReal,									NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_damagePerSecond ) },
 		{ "TotalDamagePulses",										INI::parseUnsignedInt,					NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_totalDamagePulses ) },
-		{ "DamageType",														DamageTypeFlags::parseSingleBitFromINI,	NULL,	offsetof( ParticleUplinkCannonUpdateModuleData, m_damageType ) },		
-		{ "DeathType",														INI::parseIndexList,						TheDeathNames,	offsetof( ParticleUplinkCannonUpdateModuleData, m_deathType ) },		
+		{ "DamageType",														DamageTypeFlags::parseSingleBitFromINI,	NULL,	offsetof( ParticleUplinkCannonUpdateModuleData, m_damageType ) },
+		{ "DeathType",														INI::parseIndexList,						TheDeathNames,	offsetof( ParticleUplinkCannonUpdateModuleData, m_deathType ) },
 		{ "DamageRadiusScalar",										INI::parseReal,									NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_damageRadiusScalar ) },
 
 		{ "PoweringUpSoundLoop",									INI::parseAsciiString,					NULL, offsetof( ParticleUplinkCannonUpdateModuleData, m_powerupSoundName ) },
@@ -203,7 +196,7 @@ ParticleUplinkCannonUpdate::ParticleUplinkCannonUpdate( Thing *thing, const Modu
 		m_outerNodePositions[ i ].zero();
 		m_outerNodeOrientations[ i ].Make_Identity();
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -279,14 +272,17 @@ Bool ParticleUplinkCannonUpdate::initiateIntentToDoSpecialPower(const SpecialPow
 		return FALSE;
 	}
 
-//	getObject()->getControllingPlayer()->getAcademyStats()->recordSpecialPowerUsed( specialPowerTemplate );
-
 	if( !BitIsSet( commandOptions, COMMAND_FIRED_BY_SCRIPT ) )
 	{
+		DEBUG_ASSERTCRASH(targetPos, ("Particle Cannon target data must not be NULL"));
+
 		//All human players have manual control and must "drive" the beam around!
 		m_startAttackFrame = TheGameLogic->getFrame();
 		m_laserStatus = LASERSTATUS_NONE;
 		m_manualTargetMode = TRUE;
+#if !RETAIL_COMPATIBLE_CRC
+		m_scriptedWaypointMode = FALSE;
+#endif
 		m_initialTargetPosition.set( targetPos );
 		m_overrideTargetDestination.set( targetPos );
 		m_currentTargetPosition.set( targetPos );
@@ -295,25 +291,21 @@ Bool ParticleUplinkCannonUpdate::initiateIntentToDoSpecialPower(const SpecialPow
 	{
 		//Script fired with a specific waypoint path, so set things up to follow the waypoint!
 		UnsignedInt now = TheGameLogic->getFrame();
-		
+
 		Coord3D pos;
-		if( way )
-		{
-			pos.set( way->getLocation() );
-		}
-		else if( targetObj )
-		{
-			pos.set( targetObj->getPosition() );
-		}
-   	m_startAttackFrame = max( now, (UnsignedInt)1 );
+		pos.set( way->getLocation() );
+
+		m_startAttackFrame = max( now, (UnsignedInt)1 );
+#if !RETAIL_COMPATIBLE_CRC
+		m_manualTargetMode = FALSE;
+#endif
 		m_scriptedWaypointMode = TRUE;
-   	m_laserStatus = LASERSTATUS_NONE;
+		m_laserStatus = LASERSTATUS_NONE;
 		setLogicalStatus( STATUS_READY_TO_FIRE );
 		m_specialPowerModule->setReadyFrame( now );
-	  m_initialTargetPosition.set( &pos );
+		m_initialTargetPosition.set( &pos );
 		m_currentTargetPosition.set( &pos );
 
-		m_nextDestWaypointID = way->getID();
 		Int linkCount = way->getNumLinks();
 		Int which = GameLogicRandomValue( 0, linkCount-1 );
 		Waypoint *next = way->getLink( which );
@@ -322,13 +314,18 @@ Bool ParticleUplinkCannonUpdate::initiateIntentToDoSpecialPower(const SpecialPow
 			m_nextDestWaypointID = next->getID();
 			m_overrideTargetDestination.set( next->getLocation() );
 		}
-
+		else
+		{
+			m_nextDestWaypointID = way->getID();
+		}
 	}
 	else
 	{
+		DEBUG_ASSERTCRASH(targetPos || targetObj, ("Particle Cannon target data must not be NULL"));
+
 		//All computer controlled players have automatic control -- the "S" curve.
 		UnsignedInt now = TheGameLogic->getFrame();
-		
+
 		Coord3D pos;
 		if( targetPos )
 		{
@@ -338,12 +335,17 @@ Bool ParticleUplinkCannonUpdate::initiateIntentToDoSpecialPower(const SpecialPow
 		{
 			pos.set( targetObj->getPosition() );
 		}
-   	m_initialTargetPosition.set( &pos );
-   	m_startAttackFrame = max( now, (UnsignedInt)1 );
-   	m_laserStatus = LASERSTATUS_NONE;
+#if !RETAIL_COMPATIBLE_CRC
+		m_manualTargetMode = FALSE;
+		m_scriptedWaypointMode = FALSE;
+#endif
+		m_initialTargetPosition.set( &pos );
+		m_startAttackFrame = max( now, (UnsignedInt)1 );
+		m_laserStatus = LASERSTATUS_NONE;
 		setLogicalStatus( STATUS_READY_TO_FIRE );
 		m_specialPowerModule->setReadyFrame( now );
 	}
+
 	m_startDecayFrame = m_startAttackFrame + data->m_totalFiringFrames;
 
 	SpecialPowerModuleInterface *spmInterface = getObject()->getSpecialPowerModule( specialPowerTemplate );
@@ -367,11 +369,11 @@ Bool ParticleUplinkCannonUpdate::isPowerCurrentlyInUse( const CommandButton *com
 
 //-------------------------------------------------------------------------------------------------
 void ParticleUplinkCannonUpdate::setSpecialPowerOverridableDestination( const Coord3D *loc )
-{ 
+{
 	if( !getObject()->isDisabled() )
 	{
-		m_overrideTargetDestination = *loc; 
-		m_manualTargetMode = TRUE; 
+		m_overrideTargetDestination = *loc;
+		m_manualTargetMode = TRUE;
 		m_2ndLastDrivingClickFrame = m_lastDrivingClickFrame;
 		m_lastDrivingClickFrame = TheGameLogic->getFrame();
 	}
@@ -382,7 +384,7 @@ void ParticleUplinkCannonUpdate::setSpecialPowerOverridableDestination( const Co
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime ParticleUplinkCannonUpdate::update()
-{	
+{
 	if( m_invalidSettings )
 	{
 		// can't return UPDATE_SLEEP_FOREVER unless we are sleepy...
@@ -428,7 +430,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 	{
 		if( m_startDecayFrame > now )
 		{
-			if( me->isDisabledByType( DISABLED_UNDERPOWERED ) || 
+			if( me->isDisabledByType( DISABLED_UNDERPOWERED ) ||
 					me->isDisabledByType( DISABLED_EMP ) ||
 					me->isDisabledByType( DISABLED_SUBDUED ) ||
 					me->isDisabledByType( DISABLED_HACKED ) )
@@ -450,7 +452,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 					createOrbitToTargetLaser( data->m_widthGrowFrames );
 					m_laserStatus = LASERSTATUS_BORN;
 					m_scorchMarksMade		= 0;
-					m_nextScorchMarkFrame = now; 
+					m_nextScorchMarkFrame = now;
 					m_damagePulsesMade = 0;
 					m_nextDamagePulseFrame = now;
 				}
@@ -502,13 +504,19 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 				break;
 		}
 
-		if( orbitalBirthFrame <= now && now < orbitalDeathFrame )
+#if RETAIL_COMPATIBLE_CRC
+		// TheSuperHackers @info helmutbuhler 12/06/2025
+		// Note that this code is very brittle for retail compatibility. Inlining isFiring
+		// can cause incompatibility in some circumstances.
+#endif
+		const Bool isFiring = orbitalBirthFrame <= now && now < orbitalDeathFrame;
+		if ( isFiring )
 		{
-		
+
 			if( !m_manualTargetMode && !m_scriptedWaypointMode )
 			{
 				//Calculate the position of the beam because it swaths -- a nice S curve centering at the target location!
-				
+
 				//First determine the factor of time completed (ranges between 0.0 and 1.0)
 				Real factor = (Real)(now - orbitalBirthFrame) / (Real)(orbitalDeathFrame - orbitalBirthFrame);
 
@@ -587,8 +595,17 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 							Int linkCount = way->getNumLinks();
 							Int which = GameLogicRandomValue( 0, linkCount-1 );
 							way = way->getLink( which );
-							m_nextDestWaypointID = way->getID();
-							m_overrideTargetDestination.set( way->getLocation() );
+
+							// TheSuperHackers @bugfix Caball009 27/06/2025 Check if the last way point has been reached before attempting to access the next way point.
+							if ( way )
+							{
+								m_nextDestWaypointID = way->getID();
+								m_overrideTargetDestination.set(way->getLocation());
+							}
+							else
+							{
+								m_nextDestWaypointID = INVALID_WAYPOINT_ID;
+							}
 						}
 					}
 				}
@@ -638,7 +655,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 			scorchRadius = logicalLaserRadius * data->m_scorchMarkScalar;
 #if defined(RETAIL_COMPATIBLE_CRC)
 			DEBUG_ASSERTCRASH(logicalLaserRadius == visualLaserRadius,
-				("ParticleUplinkCannonUpdate's laser radius does not match LaserUpdate's laser radius - will cause mismatch in VS6 retail compatible builds\n"));
+				("ParticleUplinkCannonUpdate's laser radius does not match LaserUpdate's laser radius - will cause mismatch in VS6 retail compatible builds"));
 #endif
 
 			//Create scorch marks periodically
@@ -692,7 +709,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 					{
 						body->attemptDamage( &damageInfo );
 					}
-				} 
+				}
 
 				if( data->m_damagePulseRemnantObjectName.isNotEmpty() )
 				{
@@ -714,7 +731,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 				m_nextDamagePulseFrame = orbitalBirthFrame + nextFactor * (orbitalDeathFrame - orbitalBirthFrame);
 			}
 		}
-		
+
 		if( endDecayFrame <= now )
 		{
 			setLogicalStatus( STATUS_PACKING );
@@ -769,7 +786,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 	}
 
 	//Handle shrouded status changes for the client player.
-	Player *localPlayer = ThePlayerList->getLocalPlayer();
+	Player *localPlayer = rts::getObservedOrLocalPlayer();
 	if( localPlayer )
 	{
 		Bool shrouded = me->getShroudedStatus( localPlayer->getPlayerIndex() ) != OBJECTSHROUD_CLEAR;
@@ -853,7 +870,7 @@ void ParticleUplinkCannonUpdate::createConnectorLasers( IntensityTypes intensity
 		case IT_LIGHT:
 			break;
 		case IT_MEDIUM:
-			str = data->m_connectorMediumLaserNameName;;
+			str = data->m_connectorMediumLaserNameName;
 			break;
 		case IT_INTENSE:
 			str = data->m_connectorIntenseLaserNameName;
@@ -1186,7 +1203,7 @@ void ParticleUplinkCannonUpdate::setLogicalStatus( PUCStatus newStatus )
 			}
 			TheAudio->removeAudioEvent( m_firingToIdleSound.getPlayingHandle() );
 			TheAudio->removeAudioEvent( m_annihilationSound.getPlayingHandle() );
-			
+
 			m_laserStatus = LASERSTATUS_NONE;
 			break;
 		}
@@ -1264,7 +1281,7 @@ void ParticleUplinkCannonUpdate::setClientStatus( PUCStatus newStatus, Bool reve
 
 	//This isn't the most efficient way to do this. Various effects can live in more than
 	//one status state, but keeping track of them properly is error-prone and hard to read.
-	//Therefore, the new philosophy is to delete EVERYTHING between status changes and 
+	//Therefore, the new philosophy is to delete EVERYTHING between status changes and
 	//create the ones we want!
 	removeAllEffects();
 
@@ -1370,7 +1387,7 @@ void ParticleUplinkCannonUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1458,7 +1475,7 @@ void ParticleUplinkCannonUpdate::xfer( Xfer *xfer )
 
 	// next scorch mark frame
 	xfer->xferUnsignedInt( &m_nextScorchMarkFrame );
-	
+
 	// next launch FX frame
 	xfer->xferUnsignedInt( &m_nextLaunchFXFrame );
 
@@ -1499,7 +1516,7 @@ void ParticleUplinkCannonUpdate::xfer( Xfer *xfer )
 		m_orbitToTargetLaserRadius.xfer( xfer );
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1528,9 +1545,9 @@ void ParticleUplinkCannonUpdate::loadPostProcess( void )
 		}
 		else
 		{
-			DEBUG_CRASH(( "ParticleUplinkCannonUpdate::loadPostProcess - Unable to find drawable for m_orbitToTargetBeamID\n" ));
+			DEBUG_CRASH(( "ParticleUplinkCannonUpdate::loadPostProcess - Unable to find drawable for m_orbitToTargetBeamID" ));
 		}
 	}
 #endif
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp
index dff994e3d9d..ed6fc31c190 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp
@@ -22,11 +22,11 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// PhysicsBehavior.cpp 
+// PhysicsBehavior.cpp
 // Simple rigid body physics
 // Author: Michael S. Booth, November 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 // please talk to MDC (x36804) before taking this out
 #define NO_DEBUG_CRC
@@ -71,11 +71,6 @@ const Int MOTIVE_FRAMES = LOGICFRAMES_PER_SECOND / 3;
 
 #define SLEEPY_PHYSICS
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 static Real angleBetweenVectors(const Coord3D& inCurDir, const Coord3D& inGoalDir)
@@ -107,7 +102,7 @@ static Real heightToSpeed(Real height)
 	// don't bother trying to remember how far we've fallen; instead,
 	// back-calc it from our speed & gravity... v = sqrt(2*g*h)
 	return sqrt(fabs(2.0f * TheGlobalData->m_gravity * height));
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 PhysicsBehaviorModuleData::PhysicsBehaviorModuleData()
@@ -117,7 +112,7 @@ PhysicsBehaviorModuleData::PhysicsBehaviorModuleData()
 	m_shockMaxYaw = DEFAULT_SHOCK_YAW;
 	m_shockMaxPitch = DEFAULT_SHOCK_PITCH;
 	m_shockMaxRoll = DEFAULT_SHOCK_ROLL;
-	
+
 	m_forwardFriction = DEFAULT_FORWARD_FRICTION;
 	m_lateralFriction = DEFAULT_LATERAL_FRICTION;
 	m_ZFriction = DEFAULT_Z_FRICTION;
@@ -132,7 +127,7 @@ PhysicsBehaviorModuleData::PhysicsBehaviorModuleData()
 		thru some bizarre editing mishap, we have been double-apply pitch/roll/yaw rates
 		to objects for, well, a long time, it looks like. I have corrected that problem
 		in the name of efficiency, but to maintain the same visual appearance without having
-		to edit every freaking INI in the world at this point, I am just multiplying 
+		to edit every freaking INI in the world at this point, I am just multiplying
 		all the results by a factor so that the effect is the same (but with less execution time).
 		I have put this factor into INI in the unlikely event we ever need to change it,
 		but defaulting it to 2 is, in fact, the right thing for now... (srj)
@@ -150,7 +145,7 @@ static void parseHeightToSpeed( INI* ini, void * /*instance*/, void *store, cons
 	// back-calc it from our speed & gravity... v = sqrt(2*g*h)
 	Real height = INI::scanReal(ini->getNextToken());
 	*(Real *)store = heightToSpeed(height);
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 static void parseFrictionPerSec( INI* ini, void * /*instance*/, void *store, const void* /*userData*/ )
@@ -158,14 +153,14 @@ static void parseFrictionPerSec( INI* ini, void * /*instance*/, void *store, con
 	Real fricPerSec = INI::scanReal(ini->getNextToken());
 	Real fricPerFrame = fricPerSec * SECONDS_PER_LOGICFRAME_REAL;
 	*(Real *)store = fricPerFrame;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void PhysicsBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void PhysicsBehaviorModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Mass",								INI::parsePositiveNonZeroReal,		NULL, offsetof( PhysicsBehaviorModuleData, m_mass ) },
 
@@ -260,17 +255,14 @@ void PhysicsBehavior::onObjectCreated()
 //-------------------------------------------------------------------------------------------------
 PhysicsBehavior::~PhysicsBehavior()
 {
-	if (m_bounceSound)
-	{
-		deleteInstance(m_bounceSound);
-		m_bounceSound = NULL;
-	}
+	deleteInstance(m_bounceSound);
+	m_bounceSound = NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
 void PhysicsBehavior::setIgnoreCollisionsWith(const Object* obj)
 {
-	m_ignoreCollisionsWith = obj ? obj->getID() : INVALID_ID; 
+	m_ignoreCollisionsWith = obj ? obj->getID() : INVALID_ID;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -321,14 +313,17 @@ Real PhysicsBehavior::getZFriction() const
  */
 void PhysicsBehavior::applyForce( const Coord3D *force )
 {
-	DEBUG_ASSERTCRASH(!(_isnan(force->x) || _isnan(force->y) || _isnan(force->z)), ("PhysicsBehavior::applyForce force NAN!\n"));
+// TheSuperHackers @info helmutbuhler 06/05/2025 This debug mutates the code to become CRC incompatible
+#if defined(RTS_DEBUG) || !RETAIL_COMPATIBLE_CRC
+	DEBUG_ASSERTCRASH(!(_isnan(force->x) || _isnan(force->y) || _isnan(force->z)), ("PhysicsBehavior::applyForce force NAN!"));
+#endif
 	if (_isnan(force->x) || _isnan(force->y) || _isnan(force->z)) {
 		return;
 	}
 	// F = ma  -->  a = F/m  (divide force by mass)
 	Real mass = getMass();
 	Coord3D modForce = *force;
-	if (isMotive()) 
+	if (isMotive())
 	{
 		const Coord3D *dir = getObject()->getUnitDirectionVector2D();
 		// Only accept the lateral acceleration.
@@ -342,8 +337,8 @@ void PhysicsBehavior::applyForce( const Coord3D *force )
 	m_accel.y += modForce.y * massInv;
 	m_accel.z += modForce.z * massInv;
 
-	//DEBUG_ASSERTCRASH(!(_isnan(m_accel.x) || _isnan(m_accel.y) || _isnan(m_accel.z)), ("PhysicsBehavior::applyForce accel NAN!\n"));
-	//DEBUG_ASSERTCRASH(!(_isnan(m_vel.x) || _isnan(m_vel.y) || _isnan(m_vel.z)), ("PhysicsBehavior::applyForce vel NAN!\n"));
+	//DEBUG_ASSERTCRASH(!(_isnan(m_accel.x) || _isnan(m_accel.y) || _isnan(m_accel.z)), ("PhysicsBehavior::applyForce accel NAN!"));
+	//DEBUG_ASSERTCRASH(!(_isnan(m_vel.x) || _isnan(m_vel.y) || _isnan(m_vel.z)), ("PhysicsBehavior::applyForce vel NAN!"));
 	//DEBUG_ASSERTCRASH(fabs(force->z) < 3, ("unlikely z-force"));
 #ifdef SLEEPY_PHYSICS
 	if (getFlag(IS_IN_UPDATE))
@@ -410,9 +405,9 @@ void PhysicsBehavior::applyRandomRotation()
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool PhysicsBehavior::isMotive() const 
-{ 
-	return m_motiveForceExpires > TheGameLogic->getFrame(); 
+Bool PhysicsBehavior::isMotive() const
+{
+	return m_motiveForceExpires > TheGameLogic->getFrame();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -451,11 +446,11 @@ void PhysicsBehavior::applyGravitationalForces()
 void PhysicsBehavior::applyFrictionalForces()
 {
 	//Are we a plane that is taxiing on a deck with a height offset?
-	Bool deckTaxiing = getObject()->testStatus( OBJECT_STATUS_DECK_HEIGHT_OFFSET ) 
-										 && getObject()->getAI() 
+	Bool deckTaxiing = getObject()->testStatus( OBJECT_STATUS_DECK_HEIGHT_OFFSET )
+										 && getObject()->getAI()
 										 && getObject()->getAI()->getCurLocomotorSetType() == LOCOMOTORSET_TAXIING;
 
-	if (getFlag(APPLY_FRICTION2D_WHEN_AIRBORNE) || !getObject()->isSignificantlyAboveTerrain() || deckTaxiing ) 
+	if (getFlag(APPLY_FRICTION2D_WHEN_AIRBORNE) || !getObject()->isSignificantlyAboveTerrain() || deckTaxiing )
 	{
 		applyYPRDamping(1.0f - DEFAULT_LATERAL_FRICTION);
 
@@ -568,23 +563,23 @@ inline Bool isZero3D(const Coord3D& v)
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::setPitchRate(Real pitch) 
-{ 
+void PhysicsBehavior::setPitchRate(Real pitch)
+{
 	m_pitchRate = pitch;
 	setFlag(HAS_PITCHROLLYAW, (m_pitchRate != 0.0f || m_rollRate != 0.0f || m_yawRate != 0.0f));
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::setRollRate(Real roll) 
-{ 
+void PhysicsBehavior::setRollRate(Real roll)
+{
 	m_rollRate = roll;
 	setFlag(HAS_PITCHROLLYAW, (m_pitchRate != 0.0f || m_rollRate != 0.0f || m_yawRate != 0.0f));
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::setYawRate(Real yaw) 
-{ 
-	m_yawRate = yaw; 
+void PhysicsBehavior::setYawRate(Real yaw)
+{
+	m_yawRate = yaw;
 	setFlag(HAS_PITCHROLLYAW, (m_pitchRate != 0.0f || m_rollRate != 0.0f || m_yawRate != 0.0f));
 }
 
@@ -598,22 +593,19 @@ void PhysicsBehavior::applyYPRDamping(Real factor)
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::setBounceSound(const AudioEventRTS* bounceSound) 
-{ 
+void PhysicsBehavior::setBounceSound(const AudioEventRTS* bounceSound)
+{
 	if (bounceSound)
 	{
 		if (m_bounceSound == NULL)
 			m_bounceSound = newInstance(DynamicAudioEventRTS);
 
-		m_bounceSound->m_event = *bounceSound; 
+		m_bounceSound->m_event = *bounceSound;
 	}
 	else
 	{
-		if (m_bounceSound)
-		{
-			deleteInstance(m_bounceSound);
-			m_bounceSound = NULL;
-		}
+		deleteInstance(m_bounceSound);
+		m_bounceSound = NULL;
 	}
 }
 
@@ -670,7 +662,7 @@ UpdateSleepTime PhysicsBehavior::update()
 		Real oldPosZ = mtx.Get_Z_Translation();
 
 		// integrate velocity into position
-		if (obj->testStatus(OBJECT_STATUS_BRAKING)) 
+		if (obj->testStatus(OBJECT_STATUS_BRAKING))
 		{
 			// Don't update position if the locomotor is braking.
 			if (!obj->isKindOf(KINDOF_PROJECTILE))
@@ -678,8 +670,8 @@ UpdateSleepTime PhysicsBehavior::update()
 				// Things other than projectiles don't cheat in z.  jba.
 				mtx.Adjust_Z_Translation(m_vel.z);
 			}
-		}	
-		else 
+		}
+		else
 		{
 			mtx.Adjust_X_Translation(m_vel.x);
 			mtx.Adjust_Y_Translation(m_vel.y);
@@ -695,8 +687,8 @@ UpdateSleepTime PhysicsBehavior::update()
 		// Check when to clear the stunned status
 		if (getIsStunned())
 		{
-			if ( (fabs(m_vel.x) < STUN_RELIEF_EPSILON && 
-				    fabs(m_vel.y) < STUN_RELIEF_EPSILON && 
+			if ( (fabs(m_vel.x) < STUN_RELIEF_EPSILON &&
+				    fabs(m_vel.y) < STUN_RELIEF_EPSILON &&
 				    fabs(m_vel.z) < STUN_RELIEF_EPSILON)
           ||
            obj->isSignificantlyAboveTerrain() == FALSE )
@@ -712,7 +704,7 @@ UpdateSleepTime PhysicsBehavior::update()
 
 			/*
 				You may be tempted to do something like this:
-				
+
 					Real rollAngle = -mtx.Get_X_Rotation();
 					Real pitchAngle = mtx.Get_Y_Rotation();
 					Real yawAngle = mtx.Get_Z_Rotation();
@@ -720,7 +712,7 @@ UpdateSleepTime PhysicsBehavior::update()
 
 				You must resist this temptation, because your code will be wrong!
 
-				The problem is that you can't use these calls to later reconstruct 
+				The problem is that you can't use these calls to later reconstruct
 				the matrix... because doing such a thing is highly order-dependent,
 				and furthermore, you'd have to use Euler angles (Not the Get_?_Rotation
 				calls) to be able to reconstruct 'em, and that's too slow to do for
@@ -729,7 +721,7 @@ UpdateSleepTime PhysicsBehavior::update()
 				The one exception is that it is OK to use Get_Z_Rotation() to get
 				the yaw angle.
 			*/
-			
+
 			// only update the position if we are not HELD
 			// (otherwise, slowdeath sinking into ground won't work)
 			Real yawRateToUse = m_yawRate * d->m_pitchRollYawFactor;
@@ -763,7 +755,7 @@ UpdateSleepTime PhysicsBehavior::update()
 		Real groundZ = TheTerrainLogic->getLayerHeight(mtx.Get_X_Translation(), mtx.Get_Y_Translation(), obj->getLayer());
 		if( obj->getStatusBits().test( OBJECT_STATUS_DECK_HEIGHT_OFFSET ) )
 		{
-			groundZ += obj->getCarrierDeckHeight(); 
+			groundZ += obj->getCarrierDeckHeight();
 		}
 		gotBounceForce = handleBounce(oldPosZ, mtx.Get_Z_Translation(), groundZ, &bounceForce);
 
@@ -771,16 +763,16 @@ UpdateSleepTime PhysicsBehavior::update()
 		activeVelZ = m_vel.z;
 		if (mtx.Get_Z_Translation() <= groundZ)
 		{
-			// Note - when vehicles are going down a slope, they will maintain a small negative 
+			// Note - when vehicles are going down a slope, they will maintain a small negative
 			// z velocity as they go down.  So don't slam it to 0 if they aren't slamming into the
 			// ground.
 			Real dz = groundZ - mtx.Get_Z_Translation();  // Our excess z velocity.
 			m_vel.z += dz;							// Remove the excess z velocity.
 			if (m_vel.z > 0.0f)
-				m_vel.z = 0.0f;	
+				m_vel.z = 0.0f;
 
 			m_velMag = INVALID_VEL_MAG;
-			
+
 			mtx.Set_Z_Translation(groundZ);
 
 			// this flag is ALWAYS cleared once we hit the ground.
@@ -793,14 +785,14 @@ UpdateSleepTime PhysicsBehavior::update()
 				obj->setModelConditionState(MODELCONDITION_STUNNED);
 			}
 		}
-		else if (mtx.Get_Z_Translation() > groundZ) 
+		else if (mtx.Get_Z_Translation() > groundZ)
 		{
 			if (getFlag(IS_IN_FREEFALL))
 			{
 				obj->setDisabled(DISABLED_FREEFALL);
 				obj->setModelConditionState(MODELCONDITION_FREEFALL);
 			}
-			else if (getFlag(STICK_TO_GROUND) && !getFlag(ALLOW_TO_FALL)) 
+			else if (getFlag(STICK_TO_GROUND) && !getFlag(ALLOW_TO_FALL))
 			{
 				mtx.Set_Z_Translation(groundZ);
 			}
@@ -819,11 +811,11 @@ UpdateSleepTime PhysicsBehavior::update()
 			// Set the result of the after bounce matrix as the object's final matrix
 			obj->setTransformMatrix(&afterBounceMatrix);
 		}
-		else 
+		else
 		{
 			obj->setTransformMatrix(&mtx);
 		}
-	} // if not held
+	}
 
 	// reset the acceleration for accumulation next frame
 	m_accel.zero();
@@ -839,9 +831,9 @@ UpdateSleepTime PhysicsBehavior::update()
 
 	Bool airborneAtEnd = obj->isAboveTerrain();
 
-	// it's not good enough to check for airborne being different between 
+	// it's not good enough to check for airborne being different between
 	// the start and end of this func... we have to compare since last frame,
-	// since (if we're held by a parachute, for instance) we might have been 
+	// since (if we're held by a parachute, for instance) we might have been
 	// moved by other bits of code!
 	if (getFlag(WAS_AIRBORNE_LAST_FRAME) && !airborneAtEnd && !getFlag(IMMUNE_TO_FALLING_DAMAGE))
 	{
@@ -863,26 +855,26 @@ UpdateSleepTime PhysicsBehavior::update()
 		// even bother doing this check here.
 		//
 		Real netSpeed = -activeVelZ - d->m_minFallSpeedForDamage;
-		
+
 		if (netSpeed > 0.0f && m_pui == NULL)
 		{
 			// only apply force if it's a pretty steep fall, so that things
 			// going down hills don't injure themselves (unless the hill is really steep)
 			const Real MIN_ANGLE_TAN = 3.0f;	//	roughly 71 degrees
 			const Real TINY_DELTA = 0.01f;
-			if ((fabs(m_vel.x) <= TINY_DELTA || fabs(activeVelZ / m_vel.x) >= MIN_ANGLE_TAN) && 
+			if ((fabs(m_vel.x) <= TINY_DELTA || fabs(activeVelZ / m_vel.x) >= MIN_ANGLE_TAN) &&
 				(fabs(m_vel.y) <= TINY_DELTA || fabs(activeVelZ / m_vel.y) >= MIN_ANGLE_TAN))
 			{
 				Real damageAmt = netSpeed * getMass() * d->m_fallHeightDamageFactor;
 
 				DamageInfo damageInfo;
 				damageInfo.in.m_damageType = DAMAGE_FALLING;
-				damageInfo.in.m_deathType = DEATH_SPLATTED;	
+				damageInfo.in.m_deathType = DEATH_SPLATTED;
 				damageInfo.in.m_sourceID = obj->getID();
-				damageInfo.in.m_amount = damageAmt;	
+				damageInfo.in.m_amount = damageAmt;
         damageInfo.in.m_shockWaveAmount = 0.0f;
 				obj->attemptDamage( &damageInfo );
-				//DEBUG_LOG(("Dealing %f (%f %f) points of falling damage to %s!\n",damageAmt,damageInfo.out.m_actualDamageDealt, damageInfo.out.m_actualDamageClipped,obj->getTemplate()->getName().str()));
+				//DEBUG_LOG(("Dealing %f (%f %f) points of falling damage to %s!",damageAmt,damageInfo.out.m_actualDamageDealt, damageInfo.out.m_actualDamageClipped,obj->getTemplate()->getName().str()));
 
 				// if this killed us, add SPLATTED to get a cool death.
 				if (obj->isEffectivelyDead())
@@ -927,7 +919,7 @@ UpdateSleepTime PhysicsBehavior::update()
 UpdateSleepTime PhysicsBehavior::calcSleepTime() const
 {
 #ifdef SLEEPY_PHYSICS
-	if (isZero3D(m_vel) 
+	if (isZero3D(m_vel)
 			&& isZero3D(m_accel)
 			&& !getFlag(HAS_PITCHROLLYAW)
 			&& !isMotive()
@@ -957,7 +949,7 @@ Real PhysicsBehavior::getVelocityMagnitude() const
 
 //-------------------------------------------------------------------------------------------------
 /**
- * Return the current velocity magnitude in the forward direction.  
+ * Return the current velocity magnitude in the forward direction.
  * If velocity is opposite facing vector, the returned value will be negative.
  */
 Real PhysicsBehavior::getForwardSpeed2D() const
@@ -971,7 +963,7 @@ Real PhysicsBehavior::getForwardSpeed2D() const
 
 	Real speedSquared = vx*vx + vy*vy;
 //	DEBUG_ASSERTCRASH( speedSquared != 0, ("zero speedSquared will overflow sqrtf()!") );// lorenzen... sanity check
-	
+
 	Real speed = (Real)sqrtf( speedSquared );
 
 	if (dot >= 0.0f)
@@ -982,7 +974,7 @@ Real PhysicsBehavior::getForwardSpeed2D() const
 
 //-------------------------------------------------------------------------------------------------
 /**
- * Return the current velocity magnitude in the forward direction.  
+ * Return the current velocity magnitude in the forward direction.
  * If velocity is opposite facing vector, the returned value will be negative.
  */
 Real PhysicsBehavior::getForwardSpeed3D() const
@@ -1005,26 +997,26 @@ Real PhysicsBehavior::getForwardSpeed3D() const
 
 //-------------------------------------------------------------------------------------------------
 Bool PhysicsBehavior::isCurrentlyOverlapped(Object *obj) const
-{ 
+{
 	return obj != NULL && obj->getID() == m_currentOverlap;
 }
 
 //-------------------------------------------------------------------------------------------------
 Bool PhysicsBehavior::wasPreviouslyOverlapped(Object *obj) const
-{ 
+{
 	return obj != NULL && obj->getID() == m_previousOverlap;
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::scrubVelocityZ( Real desiredVelocity ) 
-{ 	 
-	if (fabs(desiredVelocity) < 0.001f) 
+void PhysicsBehavior::scrubVelocityZ( Real desiredVelocity )
+{
+	if (fabs(desiredVelocity) < 0.001f)
 	{
-		m_vel.z = 0; 
-	} 
-	else 
+		m_vel.z = 0;
+	}
+	else
 	{
-		if ((desiredVelocity < 0 && m_vel.z < desiredVelocity) || (desiredVelocity > 0 && m_vel.z > desiredVelocity)) 
+		if ((desiredVelocity < 0 && m_vel.z < desiredVelocity) || (desiredVelocity > 0 && m_vel.z > desiredVelocity))
 		{
 			m_vel.z = desiredVelocity;
 		}
@@ -1033,30 +1025,30 @@ void PhysicsBehavior::scrubVelocityZ( Real desiredVelocity )
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::scrubVelocity2D( Real desiredVelocity ) 
-{ 	 
-	if (desiredVelocity < 0.001f) 
+void PhysicsBehavior::scrubVelocity2D( Real desiredVelocity )
+{
+	if (desiredVelocity < 0.001f)
 	{
-		m_vel.x = 0; 
+		m_vel.x = 0;
 		m_vel.y = 0;
-	} 
-	else 
+	}
+	else
 	{
 		Real curVelocity = sqrtf(m_vel.x*m_vel.x + m_vel.y*m_vel.y);
-		if (desiredVelocity > curVelocity) 
+		if (desiredVelocity > curVelocity)
 		{
 			return;
 		}
 		desiredVelocity /= curVelocity;
 		m_vel.x *= desiredVelocity;
-		m_vel.y *= desiredVelocity;	 
+		m_vel.y *= desiredVelocity;
 	}
 	m_velMag = INVALID_VEL_MAG;
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::addOverlap(Object *obj) 
-{ 
+void PhysicsBehavior::addOverlap(Object *obj)
+{
 	if (obj && !isCurrentlyOverlapped(obj))
 	{
 		m_currentOverlap = obj->getID();
@@ -1067,12 +1059,14 @@ void PhysicsBehavior::addOverlap(Object *obj)
 void PhysicsBehavior::transferVelocityTo(PhysicsBehavior* that) const
 {
 	if (that != NULL)
+	{
 		that->m_vel.add(&m_vel);
-	that->m_velMag = INVALID_VEL_MAG;
+		that->m_velMag = INVALID_VEL_MAG;
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
-void PhysicsBehavior::addVelocityTo( const Coord3D *vel) 
+void PhysicsBehavior::addVelocityTo( const Coord3D *vel)
 {
 	if (vel != NULL)
 		m_vel.add( vel );
@@ -1094,7 +1088,7 @@ void PhysicsBehavior::setAngles( Real yaw, Real pitch, Real roll )
 }
 
 //-------------------------------------------------------------------------------------------------
-Real PhysicsBehavior::getMass() const 
+Real PhysicsBehavior::getMass() const
 {
 	Real mass = m_mass;
 	ContainModuleInterface* contain = getObject()->getContain();
@@ -1152,9 +1146,9 @@ void PhysicsBehavior::doBounceSound(const Coord3D& prevPos)
 }
 
 //-------------------------------------------------------------------------------------------------
-/** 
+/**
  * Resolve the collision between getObject() and other by computing
- * the amount the objects have overlapd, and applying proportional forces to 
+ * the amount the objects have overlapd, and applying proportional forces to
  * push them apart.
  * Note that this call only applies forces to our object, not to "other".  Since the
  * forces should be equal and opposite, this could be optimized.
@@ -1218,7 +1212,7 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 			//We need to be able to test whether an object on a team has been captured, so set here that this object
 			//was captured.
 			other->setCaptured(true);
-			
+
 			other->defect( obj->getTeam(), 0 );
 			//other->setTeam( obj->getTeam() );
 
@@ -1276,7 +1270,7 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 	if (immobile)
 		mass = 999999.0f;
 
-	if (ai) 
+	if (ai)
 	{
 		// AI objects move under their own initiative, not by getting bounced.  jba.
 		// unless they are dead & colliding with something immobile. (srj)
@@ -1284,7 +1278,7 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 		if (!((obj->isEffectivelyDead() || obj->testStatus(OBJECT_STATUS_PARACHUTING)) && otherImmobile))
 		{
 			Bool doForce = ai->processCollision(this, other);
-			if (!doForce) 
+			if (!doForce)
 				return;
 		}
 
@@ -1321,8 +1315,8 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 		// We don't overlap at all.  How did we get here?
 		return;
 	}
-	
-	
+
+
 	m_lastCollidee = other->getID();
 
 	Real dist = sqrtf(distSqr);
@@ -1346,7 +1340,7 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 				Object* objToBounce = obj;
 				while (objToBounce->getContainedBy() != NULL)
 					objToBounce = objToBounce->getContainedBy();
-				
+
 				Real bounceOutDist = usRadius * 0.1f;
 				Coord3D tmp = *objToBounce->getPosition();
 				tmp.x -= bounceOutDist * delta.x / dist;
@@ -1367,15 +1361,15 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 			if (stiffness < MIN_STIFF) stiffness = MIN_STIFF;
 			if (stiffness > MAX_STIFF) stiffness = MAX_STIFF;
 			// huh huh, he said "stiff"
-			
+
 			Real mag = getVelocityMagnitude();
 			const Real MINBOUNCESPEED = 1.0f/(LOGICFRAMES_PER_SECOND*5.0f);
-			if (mag < MINBOUNCESPEED) 
+			if (mag < MINBOUNCESPEED)
 				mag = MINBOUNCESPEED;
 			factor = -mag * getMass() * stiffness;
-			
+
 			// if we are moving down, we may want to blow ourselves into smithereens....
-			if (delta.z < 0.0f && 
+			if (delta.z < 0.0f &&
 					obj->getPosition()->z >= TheGlobalData->m_defaultStructureRubbleHeight)
 			{
 				if (other->isKindOf(KINDOF_STRUCTURE))
@@ -1403,13 +1397,13 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 			// but then if we were still colliding next frame, we'd get a sudden 'aceleration' of bounce
 			// that would look freakish. so cheat.
 			m_vel.x = 0;
-			m_vel.y = 0;	 
-			m_vel.z = 0;	 
+			m_vel.y = 0;
+			m_vel.z = 0;
 			m_velMag = INVALID_VEL_MAG;
 		}
 		else
 		{
-			if (overlap > 5.0f) 
+			if (overlap > 5.0f)
 				overlap = 5.0f;
 			factor = -overlap;
 		}
@@ -1417,7 +1411,7 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
 		force.x = factor * delta.x / dist;
 		force.y = factor * delta.y / dist;
 		force.z = factor * delta.z / dist;	// will be zero for 2d case.
-		DEBUG_ASSERTCRASH(!(_isnan(force.x) || _isnan(force.y) || _isnan(force.z)), ("PhysicsBehavior::onCollide force NAN!\n"));
+		DEBUG_ASSERTCRASH(!(_isnan(force.x) || _isnan(force.y) || _isnan(force.z)), ("PhysicsBehavior::onCollide force NAN!"));
 
 		applyForce( &force );
 	}
@@ -1462,7 +1456,7 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 	if( selfCrushingOther && selfBeingCrushed )
 	{
 		//Is it possible to crush and be crushed at the same time?
-		DEBUG_CRASH( ("%s (Crusher:%d, Crushable:%d) is attempting to crush %s (Crusher:%d, Crushable:%d) but it is reciprocating -- shouldn't be possible!", 
+		DEBUG_CRASH( ("%s (Crusher:%d, Crushable:%d) is attempting to crush %s (Crusher:%d, Crushable:%d) but it is reciprocating -- shouldn't be possible!",
 			crusherMe->getTemplate()->getName().str(), crusherMe->getCrusherLevel(), crusherMe->getCrushableLevel(),
 			crusheeOther->getTemplate()->getName().str(), crusheeOther->getCrusherLevel(), crusheeOther->getCrushableLevel() ) );
 		return false;
@@ -1530,7 +1524,7 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 			// Degenerate case; there is only one point to consider.
 			if( frontCrushed )
 				crushTarget = BACK_END_CRUSH;
-			else 
+			else
 				crushTarget = FRONT_END_CRUSH;
 		}
 		else
@@ -1606,8 +1600,8 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 			// Now find the shortest.  Use the straightline distance to crush point as tie breaker
 			if( (frontPerpLength <= centerPerpLength)  && (frontPerpLength <= backPerpLength) )
 			{
-				if( perpsLogicallyEqual(frontPerpLength, centerPerpLength) 
-					|| perpsLogicallyEqual(frontPerpLength, backPerpLength) 
+				if( perpsLogicallyEqual(frontPerpLength, centerPerpLength)
+					|| perpsLogicallyEqual(frontPerpLength, backPerpLength)
 					)
 				{
 					Real frontVectorLength = frontVector.length();
@@ -1635,8 +1629,8 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 			}
 			else if( (backPerpLength <= centerPerpLength)  && (backPerpLength <= frontPerpLength) )
 			{
-				if( perpsLogicallyEqual(backPerpLength, centerPerpLength) 
-					|| perpsLogicallyEqual(backPerpLength, frontPerpLength) 
+				if( perpsLogicallyEqual(backPerpLength, centerPerpLength)
+					|| perpsLogicallyEqual(backPerpLength, frontPerpLength)
 					)
 				{
 					Real backVectorLength = backVector.length();
@@ -1665,7 +1659,7 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 			else // centerperp is shortest
 			{
 				if( perpsLogicallyEqual(centerPerpLength, backPerpLength)
-					|| perpsLogicallyEqual(centerPerpLength, frontPerpLength) 
+					|| perpsLogicallyEqual(centerPerpLength, frontPerpLength)
 					)
 				{
 					Real centerVectorLength = centerVector.length();
@@ -1718,7 +1712,7 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 		}
 		else if( crushTarget == FRONT_END_CRUSH )
 		{
-			// Check the front point.  
+			// Check the front point.
 			comparisonCoord = *crusheePos;
 			comparisonCoord.x += crushPointOffset.x;
 			comparisonCoord.y += crushPointOffset.y;
@@ -1766,7 +1760,7 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 			crusheeOther->attemptDamage( &damageInfo );
 		}
 
-	} // if crushable
+	}
 
 	return true;
 }
@@ -1777,7 +1771,7 @@ Bool PhysicsBehavior::checkForOverlapCollision(Object *other)
 void PhysicsBehavior::testStunnedUnitForDestruction(void)
 {
 	// Only do test if unit is stunned
-	if (!getFlag(IS_STUNNED)) 
+	if (!getFlag(IS_STUNNED))
 		return;
 
 	// Grab the object
@@ -1785,14 +1779,14 @@ void PhysicsBehavior::testStunnedUnitForDestruction(void)
 	const Coord3D *pos = obj->getPosition();
 
 	// If a stunned object is upside down when it hits the ground, kill it
-	if(obj->getTransformMatrix()->Get_Z_Vector().Z < 0.0f) 
+	if(obj->getTransformMatrix()->Get_Z_Vector().Z < 0.0f)
 	{
 		obj->kill();
 		return;
 	}
 
 	// Check if unit has exited playable area. If so, kill it
-  if (obj->isOffMap()) 
+  if (obj->isOffMap())
 	{
      obj->kill();
 		 return;
@@ -1807,11 +1801,11 @@ void PhysicsBehavior::testStunnedUnitForDestruction(void)
 	{
 		obj->kill();
 		return;
-	} 
+	}
 
 	// Check for object being stuck on water. If so kill it
 	if (TheTerrainLogic->isUnderwater(pos->x, pos->y) && !aiInt->hasLocomotorForSurface(LOCOMOTORSURFACE_WATER))
-	{	
+	{
 		obj->kill();
 		return;
 	}
@@ -1826,7 +1820,7 @@ void PhysicsBehavior::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1849,7 +1843,7 @@ void PhysicsBehavior::xfer( Xfer *xfer )
 
 	// roll rate
 	xfer->xferReal( &m_rollRate );
-	
+
 	// pitch rate
 	xfer->xferReal( &m_pitchRate );
 
@@ -1906,7 +1900,7 @@ void PhysicsBehavior::xfer( Xfer *xfer )
 	// mag of current vel
 	xfer->xferReal( &m_velMag );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1917,4 +1911,4 @@ void PhysicsBehavior::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PilotFindVehicleUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PilotFindVehicleUpdate.cpp
index fa3e03acb65..fcf555c705c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PilotFindVehicleUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PilotFindVehicleUpdate.cpp
@@ -64,7 +64,7 @@ PilotFindVehicleUpdateModuleData::PilotFindVehicleUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ScanRate",							INI::parseDurationUnsignedInt,	NULL, offsetof( PilotFindVehicleUpdateModuleData, m_scanFrames ) },
 		{ "ScanRange",						INI::parseReal,									NULL, offsetof( PilotFindVehicleUpdateModuleData, m_scanRange ) },
@@ -79,7 +79,7 @@ PilotFindVehicleUpdate::PilotFindVehicleUpdate( Thing *thing, const ModuleData*
 {
 	m_didMoveToBase = false;
 	setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -92,19 +92,19 @@ PilotFindVehicleUpdate::~PilotFindVehicleUpdate( void )
 //-------------------------------------------------------------------------------------------------
 void PilotFindVehicleUpdate::onObjectCreated()
 {
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime PilotFindVehicleUpdate::update()
-{	
+{
 
 	Object *obj = getObject();
 	if (obj->getControllingPlayer()->getPlayerType() == PLAYER_HUMAN) {
 		// This is an ai only behavior.
-		return UPDATE_SLEEP_FOREVER; 
+		return UPDATE_SLEEP_FOREVER;
 	}
 	const PilotFindVehicleUpdateModuleData *data = getPilotFindVehicleUpdateModuleData();
 
@@ -151,7 +151,7 @@ Object* PilotFindVehicleUpdate::scanClosestTarget()
 	filters[3] = &filterMapStatus;
 	filters[4] = NULL;
 
-	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( me->getPosition(), data->m_scanRange, 
+	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( me->getPosition(), data->m_scanRange,
 		FROM_CENTER_2D, filters, ITER_SORTED_NEAR_TO_FAR );
 	MemoryPoolObjectHolder hold(iter);
 
@@ -161,7 +161,7 @@ Object* PilotFindVehicleUpdate::scanClosestTarget()
 		BodyModuleInterface *body = other->getBodyModule();
 		if (!body) continue;
 		//	If we're real healthy, don't bother looking for healing.
-		if (body->getHealth() < body->getMaxHealth()*data->m_minHealth) 
+		if (body->getHealth() < body->getMaxHealth()*data->m_minHealth)
 		{
 			continue;
 		}
@@ -190,7 +190,7 @@ void PilotFindVehicleUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -211,7 +211,7 @@ void PilotFindVehicleUpdate::xfer( Xfer *xfer )
 	// did move to base
 	xfer->xferBool( &m_didMoveToBase );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -222,4 +222,4 @@ void PilotFindVehicleUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PointDefenseLaserUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PointDefenseLaserUpdate.cpp
index 995dd0addd3..e1424a2da39 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PointDefenseLaserUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PointDefenseLaserUpdate.cpp
@@ -62,7 +62,7 @@ PointDefenseLaserUpdateModuleData::PointDefenseLaserUpdateModuleData()
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "WeaponTemplate",				INI::parseWeaponTemplate,				NULL, offsetof( PointDefenseLaserUpdateModuleData, m_weaponTemplate ) },
 		{ "PrimaryTargetTypes",		KindOfMaskType::parseFromINI,								NULL, offsetof( PointDefenseLaserUpdateModuleData, m_primaryTargetKindOf ) },
@@ -83,7 +83,7 @@ PointDefenseLaserUpdate::PointDefenseLaserUpdate( Thing *thing, const ModuleData
 	m_nextShotAvailableInFrames = 0;
 	m_inRange  					= false;
 	setWakeFrame(getObject(), UPDATE_SLEEP_NONE);// No starting sleep, but we want to sleep later.
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -97,11 +97,11 @@ PointDefenseLaserUpdate::~PointDefenseLaserUpdate( void )
 void PointDefenseLaserUpdate::onObjectCreated()
 {
 	const PointDefenseLaserUpdateModuleData *data = getPointDefenseLaserUpdateModuleData();
-	
+
 	//Make sure we have a weapon template
 	if( !data->m_weaponTemplate )
 	{
-		DEBUG_CRASH( ("PointDefenseLaserUpdate for %s doesn't have a valid weapon template", 
+		DEBUG_CRASH( ("PointDefenseLaserUpdate for %s doesn't have a valid weapon template",
 			getObject()->getTemplate()->getName().str() ) );
 		return;
 	}
@@ -121,15 +121,15 @@ void PointDefenseLaserUpdate::onObjectCreated()
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime PointDefenseLaserUpdate::update()
-{	
+{
 /// @todo srj use SLEEPY_UPDATE here
 	//*** HERE'S THE UPDATE PHILOSOPHY ***
-	//The point defense laser typically has short range, high rate of fire, and shoots at incoming projectiles 
+	//The point defense laser typically has short range, high rate of fire, and shoots at incoming projectiles
 	//that move fast. This amounts to a potentially very expensive system. Instead of frantically scanning for
 	//targets, we will scan less frequently (data->m_scanFrames) in a larger radius (data->m_scanRange). When
 	//this occurs, we'll store the "best" target, and track only that target until the next update or if it is
 	//killed.
-	
+
 	Object *me = getObject();
 	if( me->isEffectivelyDead() )
 		return UPDATE_SLEEP_FOREVER;//No more laser fo you.
@@ -177,7 +177,7 @@ void PointDefenseLaserUpdate::fireWhenReady()
 		{
 			if( m_inRange )
 			{
-				//We were in range last frame, but the target has moved out of firing range, so 
+				//We were in range last frame, but the target has moved out of firing range, so
 				//re-evaluate by forcing a new scan.
 				m_nextScanFrames = GameLogicRandomValue( 0, 3 );
 				m_bestTargetID = INVALID_ID;
@@ -195,14 +195,14 @@ void PointDefenseLaserUpdate::fireWhenReady()
 			}
 		}
 	}
-	
+
 	if( m_nextShotAvailableInFrames > 0 )
 	{
 		//We can't fire this frame.
 		m_nextShotAvailableInFrames--;
 		return;
 	}
-	
+
 	WeaponTemplate *wt = data->m_weaponTemplate;
 	if( wt )
 	{
@@ -315,7 +315,7 @@ Object* PointDefenseLaserUpdate::scanClosestTarget()
 					pos.set( physics->getVelocity() );
 					pos.scale( data->m_velocityFactor );
 					pos.add( other->getPosition() );
-					
+
 					//Recalculate the distance.
 					fDist = sqrt( ThePartitionManager->getDistanceSquared( me, other, FROM_CENTER_2D ) );
 				}
@@ -328,7 +328,7 @@ Object* PointDefenseLaserUpdate::scanClosestTarget()
 				bestTargetOutOfRange[index] = other;
 			}
 		}
-	}  // end for, other
+	}
 
 	if( bestTargetInRange[ 0 ] )
 	{
@@ -361,7 +361,7 @@ Object* PointDefenseLaserUpdate::scanClosestTarget()
 		m_inRange = false;
 		return bestTargetOutOfRange[ 1 ];
 	}
-	
+
 	//Utter failure -- nothing on the scope.
 	m_bestTargetID = INVALID_ID;
 	m_inRange = false;
@@ -377,7 +377,7 @@ void PointDefenseLaserUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -407,7 +407,7 @@ void PointDefenseLaserUpdate::xfer( Xfer *xfer )
 	// next shot available in frames
 	xfer->xferInt( &m_nextShotAvailableInFrames );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -418,4 +418,4 @@ void PointDefenseLaserUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PowerPlantUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PowerPlantUpdate.cpp
index 26559bea17c..e131769db96 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PowerPlantUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PowerPlantUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ModelState.h"
 #include "Common/Xfer.h"
@@ -38,11 +38,6 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/Module/PowerPlantUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -51,7 +46,7 @@ PowerPlantUpdateModuleData::PowerPlantUpdateModuleData( void )
 
 	m_rodsExtendTime = 0;
 
-}  // end PowerPlantUpdateModuleData
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -66,14 +61,14 @@ PowerPlantUpdate::PowerPlantUpdate( Thing *thing, const ModuleData *moduleData )
 	m_extended = FALSE;
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 
-}  // end PowerPlantUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 PowerPlantUpdate::~PowerPlantUpdate( void )
 {
 
-}  // end PowerPlantUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -99,14 +94,14 @@ void PowerPlantUpdate::extendRods( Bool extend )
 		// they de-extend instantly.
 		Drawable *draw = getObject()->getDrawable();
 		if( draw )
-			draw->clearModelConditionFlags( MAKE_MODELCONDITION_MASK2( MODELCONDITION_POWER_PLANT_UPGRADING, 
+			draw->clearModelConditionFlags( MAKE_MODELCONDITION_MASK2( MODELCONDITION_POWER_PLANT_UPGRADING,
 																														MODELCONDITION_POWER_PLANT_UPGRADED) );
-		
+
 		m_extended = FALSE;
 		setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 	}
 
-}  // end PowerPlantUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -117,10 +112,10 @@ UpdateSleepTime PowerPlantUpdate::update( void )
 	if( draw )
 		draw->clearAndSetModelConditionState( MODELCONDITION_POWER_PLANT_UPGRADING,
 																					MODELCONDITION_POWER_PLANT_UPGRADED );
-	
+
 	m_extended = TRUE;
 	return UPDATE_SLEEP_FOREVER;
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -131,7 +126,7 @@ void PowerPlantUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -152,7 +147,7 @@ void PowerPlantUpdate::xfer( Xfer *xfer )
 	// extend complete
 	xfer->xferBool( &m_extended );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -163,4 +158,4 @@ void PowerPlantUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp
index 6c4c8283ef5..b6b360bae8e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp
@@ -28,7 +28,7 @@
 //					This instance simply spits the guy out at a point.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/ThingTemplate.h"
@@ -46,13 +46,7 @@ DefaultProductionExitUpdate::DefaultProductionExitUpdate( Thing *thing, const Mo
 {
 	// no rally point has been set
 	m_rallyPointExists = false;
-	// Added By Sadullah Nader
-	// Initialization missing and needed
-
 	m_rallyPoint.zero();
-
-	//
-
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 }
 
@@ -109,7 +103,7 @@ void DefaultProductionExitUpdate::exitObjectViaDoor( Object *newObj, ExitDoorTyp
 		if (m_rallyPointExists)
 		{
 			tmp = m_rallyPoint;
-			if (ai && ai->isDoingGroundMovement()) 
+			if (ai && ai->isDoingGroundMovement())
 			{
 				if (TheAI->pathfinder()->adjustDestination(newObj, ai->getLocomotorSet(), &tmp))
 					exitPath.push_back(tmp);
@@ -142,7 +136,7 @@ Bool DefaultProductionExitUpdate::getExitPosition( Coord3D& exitPosition ) const
 	exitPosition.x = loc.X;
 	exitPosition.y = loc.Y;
 	exitPosition.z = loc.Z;
-	
+
 	return TRUE;
 
 }
@@ -186,7 +180,7 @@ void DefaultProductionExitUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -210,7 +204,7 @@ void DefaultProductionExitUpdate::xfer( Xfer *xfer )
 	// rally point exists
 	xfer->xferBool( &m_rallyPointExists );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -221,4 +215,4 @@ void DefaultProductionExitUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp
index 28d0cd47e07..f7748360caa 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/QueueProductionExitUpdate.cpp
@@ -28,7 +28,7 @@
 //					This instance refuses to spit a second out until the first is clear
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/ThingTemplate.h"
@@ -46,12 +46,8 @@ QueueProductionExitUpdate::QueueProductionExitUpdate( Thing *thing, const Module
 {
 	m_currentDelay = 0;
 
-	//Added By Sadullah Nader
-	//Initializations inserted 
 	m_creationClearDistance = 0;
 	m_rallyPoint.zero();
-	//
-	
 	// no rally point has been set
 	m_rallyPointExists = false;
 	m_currentBurstCount = 0;
@@ -109,8 +105,8 @@ void QueueProductionExitUpdate::exitObjectViaDoor( Object *newObj, ExitDoorType
 		newObj->setOrientation( exitAngle );
 
 		//
-		// Objects that are created in the air from producers that are in the air get 
-		// a kick that will make their starting speed equal mine.  
+		// Objects that are created in the air from producers that are in the air get
+		// a kick that will make their starting speed equal mine.
 		//
 		PhysicsBehavior *newObjectPhysics = newObj->getPhysics();
 		PhysicsBehavior *myPhysics = creationObject->getPhysics();
@@ -144,7 +140,7 @@ void QueueProductionExitUpdate::exitObjectViaDoor( Object *newObj, ExitDoorType
 		if (m_rallyPointExists)
 		{
 			tmp = m_rallyPoint;
-			if (ai && ai->isDoingGroundMovement()) 
+			if (ai && ai->isDoingGroundMovement())
 			{
 				if (TheAI->pathfinder()->adjustDestination(newObj, ai->getLocomotorSet(), &tmp))
 					exitPath.push_back(tmp);
@@ -184,7 +180,7 @@ Bool QueueProductionExitUpdate::getExitPosition( Coord3D& exitPosition ) const
 	exitPosition.x = loc.X;
 	exitPosition.y = loc.Y;
 	exitPosition.z = loc.Z;
-	
+
 	return TRUE;
 
 }
@@ -306,7 +302,7 @@ void QueueProductionExitUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -339,7 +335,7 @@ void QueueProductionExitUpdate::xfer( Xfer *xfer )
 	// current burst count
 	xfer->xferUnsignedInt( &m_currentBurstCount );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -350,4 +346,4 @@ void QueueProductionExitUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SpawnPointProductionExitUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SpawnPointProductionExitUpdate.cpp
index 71fe264075b..469155cbe7d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SpawnPointProductionExitUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SpawnPointProductionExitUpdate.cpp
@@ -28,7 +28,7 @@
 //					This instance puts guys at named bones.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
@@ -197,7 +197,7 @@ void SpawnPointProductionExitUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -227,7 +227,7 @@ void SpawnPointProductionExitUpdate::xfer( Xfer *xfer )
 	// spawn point occupants
 	xfer->xferUser( &m_spawnPointOccupier, sizeof( ObjectID ) * MAX_SPAWN_POINTS );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -238,4 +238,4 @@ void SpawnPointProductionExitUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SupplyCenterProductionExitUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SupplyCenterProductionExitUpdate.cpp
index d93a370a602..8f4a9af5363 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SupplyCenterProductionExitUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/SupplyCenterProductionExitUpdate.cpp
@@ -28,7 +28,7 @@
 //					This instance kicks things it outputs into SupplyTruck autopilot after exiting.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/ThingTemplate.h"
@@ -42,11 +42,6 @@
 #include "GameLogic/Object.h"
 //#include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 SupplyCenterProductionExitUpdate::SupplyCenterProductionExitUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
@@ -99,7 +94,7 @@ void SupplyCenterProductionExitUpdate::exitObjectViaDoor( Object *newObj, ExitDo
 		for objects in general */
 		// tell the AI about it
 		TheAI->pathfinder()->addObjectToPathfindMap( newObj );
-		
+
 		Vector3 p;
 
 		//
@@ -134,12 +129,12 @@ void SupplyCenterProductionExitUpdate::exitObjectViaDoor( Object *newObj, ExitDo
 			if( supplyTruckAI )
 				supplyTruckAI->setForceWantingState(true);
 		}
-		
+
 		if( md->m_grantTemporaryStealthFrames )
 		{
 			StealthUpdate *stealth = newObj->getStealth();
 			//Only grant temporary stealth to the default stealth update. It's
-			//possible that another type of stealth was granted... like the 
+			//possible that another type of stealth was granted... like the
 			//GPS scrambler. We want that to take precendence.
 			if( getObject()->testStatus( OBJECT_STATUS_STEALTHED ) )
 			{
@@ -171,7 +166,7 @@ Bool SupplyCenterProductionExitUpdate::getExitPosition( Coord3D& exitPosition )
 	exitPosition.x = loc.X;
 	exitPosition.y = loc.Y;
 	exitPosition.z = loc.Z;
-	
+
 	return TRUE;
 
 }
@@ -215,7 +210,7 @@ void SupplyCenterProductionExitUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -239,7 +234,7 @@ void SupplyCenterProductionExitUpdate::xfer( Xfer *xfer )
 	// rally point exists
 	xfer->xferBool( &m_rallyPointExists );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -250,4 +245,4 @@ void SupplyCenterProductionExitUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp
index 66a14c302ea..9eb841a70bf 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/BitFlagsIO.h"
 #include "Common/BuildAssistant.h"
@@ -55,15 +55,10 @@
 #include "GameLogic/Object.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
 
-static const ModelConditionFlagType theOpeningFlags[DOOR_COUNT_MAX] = 
+static const ModelConditionFlagType theOpeningFlags[DOOR_COUNT_MAX] =
 {
 	MODELCONDITION_DOOR_1_OPENING,
 	MODELCONDITION_DOOR_2_OPENING,
@@ -71,7 +66,7 @@ static const ModelConditionFlagType theOpeningFlags[DOOR_COUNT_MAX] =
 	MODELCONDITION_DOOR_4_OPENING
 };
 
-static const ModelConditionFlagType theClosingFlags[DOOR_COUNT_MAX] = 
+static const ModelConditionFlagType theClosingFlags[DOOR_COUNT_MAX] =
 {
 	MODELCONDITION_DOOR_1_CLOSING,
 	MODELCONDITION_DOOR_2_CLOSING,
@@ -79,7 +74,7 @@ static const ModelConditionFlagType theClosingFlags[DOOR_COUNT_MAX] =
 	MODELCONDITION_DOOR_4_CLOSING
 };
 
-static const ModelConditionFlagType theWaitingOpenFlags[DOOR_COUNT_MAX] = 
+static const ModelConditionFlagType theWaitingOpenFlags[DOOR_COUNT_MAX] =
 {
 	MODELCONDITION_DOOR_1_WAITING_OPEN,
 	MODELCONDITION_DOOR_2_WAITING_OPEN,
@@ -87,7 +82,7 @@ static const ModelConditionFlagType theWaitingOpenFlags[DOOR_COUNT_MAX] =
 	MODELCONDITION_DOOR_4_WAITING_OPEN
 };
 
-static const ModelConditionFlagType theWaitingToCloseFlags[DOOR_COUNT_MAX] = 
+static const ModelConditionFlagType theWaitingToCloseFlags[DOOR_COUNT_MAX] =
 {
 	MODELCONDITION_DOOR_1_WAITING_TO_CLOSE,
 	MODELCONDITION_DOOR_2_WAITING_TO_CLOSE,
@@ -126,11 +121,11 @@ ProductionUpdateModuleData::ProductionUpdateModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-/*static*/ void ProductionUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void ProductionUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MaxQueueEntries",	INI::parseInt, NULL, offsetof( ProductionUpdateModuleData, m_maxQueueEntries ) },
 		{ "NumDoorAnimations",	INI::parseInt, NULL, offsetof( ProductionUpdateModuleData, m_numDoorAnimations ) },
@@ -163,19 +158,16 @@ ProductionEntry::ProductionEntry( void )
 	m_framesUnderConstruction = 0;
 	m_next = NULL;
 	m_prev = NULL;
-	//Added By Sadullah Nader
-	//Initializations inserted
 	m_productionQuantityProduced = 0;
 	m_productionQuantityTotal = 0;
-	//
-}  // end ProductionEntry
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ProductionEntry::~ProductionEntry( void )
 {
 
-}  // end ~ProductionEntry
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -183,7 +175,7 @@ ProductionEntry::~ProductionEntry( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-ProductionUpdate::ProductionUpdate( Thing *thing, const ModuleData* moduleData ) : 
+ProductionUpdate::ProductionUpdate( Thing *thing, const ModuleData* moduleData ) :
 									UpdateModule( thing, moduleData )
 {
 
@@ -204,7 +196,7 @@ ProductionUpdate::ProductionUpdate( Thing *thing, const ModuleData* moduleData )
 	m_flagsDirty = FALSE;
 	m_specialPowerConstructionCommandButton = NULL;
 
-}  // end ProductionUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -221,9 +213,9 @@ ProductionUpdate::~ProductionUpdate( void )
 		// TheSuperHackers @fix Mauller 13/04/2025 Delete instance of production item
 		deleteInstance(production);
 
-	}  // end while
+	}
 
-}  // end ~ProductionUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -239,8 +231,8 @@ CanMakeType ProductionUpdate::canQueueUpgrade( const UpgradeTemplate *upgrade )
 //-------------------------------------------------------------------------------------------------
 CanMakeType ProductionUpdate::canQueueCreateUnit( const ThingTemplate *unitType ) const
 {
-	/// @todo srj -- this is horrible, but the "right" way to do it is to move 
-	// ProductionUpdate to be part of ParkingPlaceBehavior, which I don't currently 
+	/// @todo srj -- this is horrible, but the "right" way to do it is to move
+	// ProductionUpdate to be part of ParkingPlaceBehavior, which I don't currently
 	// have time for...
 	ParkingPlaceBehaviorInterface* pp = NULL;
 	for (BehaviorModule** i = getObject()->getBehaviorModules(); *i; ++i)
@@ -273,7 +265,7 @@ Bool ProductionUpdate::queueUpgrade( const UpgradeTemplate *upgrade )
 	Player *player = getObject()->getControllingPlayer();
 
 	// sanity check to make sure we can build this upgrade
-	if( upgrade->getUpgradeType() == UPGRADE_TYPE_PLAYER && 
+	if( upgrade->getUpgradeType() == UPGRADE_TYPE_PLAYER &&
 			TheUpgradeCenter->canAffordUpgrade( player, upgrade ) == FALSE )
 		return FALSE;
 	else if( upgrade->getUpgradeType() == UPGRADE_TYPE_OBJECT &&
@@ -284,7 +276,7 @@ Bool ProductionUpdate::queueUpgrade( const UpgradeTemplate *upgrade )
 	// you cannot queue the production of an upgrade twice in this queue
 	if( isUpgradeInQueue( upgrade ) == TRUE )
 		return FALSE;
-	
+
 	// STOP cheaters by making sure they can actually build this
 	if( !getObject()->canProduceUpgrade(upgrade) )
 		return FALSE;
@@ -294,7 +286,7 @@ Bool ProductionUpdate::queueUpgrade( const UpgradeTemplate *upgrade )
 	// (or that somewhere else could even possibly be here)
 	//
 	if( upgrade->getUpgradeType() == UPGRADE_TYPE_PLAYER &&
-      (player->hasUpgradeComplete( upgrade ) || player->hasUpgradeInProduction( upgrade )) ) 
+      (player->hasUpgradeComplete( upgrade ) || player->hasUpgradeInProduction( upgrade )) )
 		return FALSE;
 
 	if (m_productionCount >= getProductionUpdateModuleData()->m_maxQueueEntries)
@@ -322,11 +314,11 @@ Bool ProductionUpdate::queueUpgrade( const UpgradeTemplate *upgrade )
 	// add this upgrade as in progress in the player
 	player->addUpgrade( upgrade, UPGRADE_STATUS_IN_PRODUCTION );
 
-	
+
 
 	return TRUE;  // queued
 
-}  // end queueUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Cancel an upgrade being produced here */
@@ -357,7 +349,7 @@ void ProductionUpdate::cancelUpgrade( const UpgradeTemplate *upgrade )
 				production->m_upgradeToResearch == upgrade )
 			break;
 
-	}  // end for
+	}
 
 	// sanity, entry not found
 	if( production == NULL )
@@ -365,7 +357,7 @@ void ProductionUpdate::cancelUpgrade( const UpgradeTemplate *upgrade )
 
 	// refund money back to the player
 	Money *money = player->getMoney();
-	money->deposit( production->m_upgradeToResearch->calcCostToBuild( player ) );
+	money->deposit( production->m_upgradeToResearch->calcCostToBuild( player ), TRUE, FALSE );
 
 	// remove this production from the queue
 	removeFromProductionQueue( production );
@@ -379,8 +371,8 @@ void ProductionUpdate::cancelUpgrade( const UpgradeTemplate *upgrade )
 	//
 	if( upgrade->getUpgradeType() == UPGRADE_TYPE_PLAYER )
 		player->removeUpgrade( upgrade );
-	
-}  // end cancelUpgrade
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Queue the prodcution of a unit.  Returns TRUE if unit was added to queue, FALSE if it
@@ -396,8 +388,8 @@ Bool ProductionUpdate::queueCreateUnit( const ThingTemplate *unitType, Productio
 
 	ExitDoorType exitDoor = DOOR_NONE_AVAILABLE;
 
-	/// @todo srj -- this is horrible, but the "right" way to do it is to move 
-	// ProductionUpdate to be part of ParkingPlaceBehavior, which I don't currently 
+	/// @todo srj -- this is horrible, but the "right" way to do it is to move
+	// ProductionUpdate to be part of ParkingPlaceBehavior, which I don't currently
 	// have time for...
 	ParkingPlaceBehaviorInterface* pp = NULL;
 	for (BehaviorModule** i = getObject()->getBehaviorModules(); *i; ++i)
@@ -449,7 +441,7 @@ Bool ProductionUpdate::queueCreateUnit( const ThingTemplate *unitType, Productio
 			break;
 		}
 	}
-	
+
 	// assing production entry data
 	production->m_type = PRODUCTION_UNIT;
 	production->m_objectToProduce = unitType;
@@ -461,7 +453,7 @@ Bool ProductionUpdate::queueCreateUnit( const ThingTemplate *unitType, Productio
 
 	return TRUE;  // unit queued
 
-}  // end queueMakeUnit
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Cancel the construction of the unit with the matching production ID */
@@ -481,7 +473,7 @@ void ProductionUpdate::cancelUnitCreate( ProductionID productionID )
 			// give the player the cost of the object back
 			Player *player = getObject()->getControllingPlayer();
 			Money *money = player->getMoney();
-			money->deposit( production->m_objectToProduce->calcCostToBuild( player ) );
+			money->deposit( production->m_objectToProduce->calcCostToBuild( player ), TRUE, FALSE );
 
 			// remove from queue list
 			removeFromProductionQueue( production );
@@ -491,11 +483,11 @@ void ProductionUpdate::cancelUnitCreate( ProductionID productionID )
 
 			return;
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
-}  // end cancelUnitCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Cancel all production of type unitType */
@@ -516,22 +508,22 @@ void ProductionUpdate::cancelAllUnitsOfType( const ThingTemplate *unitType)
 
 			// cancel the production
 			cancelUnitCreate( production->getProductionID() );
-		
+
 			// advance
 			production = temp;
 
-		}  // end if 
-		else 
+		}
+		else
 		{
 
 			// advance
 			production = production->m_next;
 
-		}  // end else
+		}
 
-	}  // end for
+	}
 
-}  // end cancelAllUnitsOfType
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update the door behavior */
@@ -553,7 +545,7 @@ void ProductionUpdate::updateDoors()
 
 			if( now - m_doors[i].m_doorOpenedFrame > d->m_doorOpeningTime )
 			{
-			
+
 				// set our frame markers for door states
 				m_doors[i].m_doorOpenedFrame = 0;
 				m_doors[i].m_doorWaitOpenFrame = now;
@@ -565,9 +557,9 @@ void ProductionUpdate::updateDoors()
 				m_setFlags.set( theWaitingOpenFlags[i] );
 				m_flagsDirty = TRUE;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else if( m_doors[i].m_doorWaitOpenFrame )
 		{
 
@@ -585,9 +577,9 @@ void ProductionUpdate::updateDoors()
 				m_setFlags.set( theClosingFlags[i] );
 				m_flagsDirty = TRUE;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 		else if( m_doors[i].m_doorClosedFrame && !m_doors[i].m_holdOpen )
 		{
 
@@ -602,9 +594,9 @@ void ProductionUpdate::updateDoors()
 				m_setFlags.set( theClosingFlags[i], false );
 				m_flagsDirty = TRUE;
 
-			}  // end if
+			}
 
-		}  // end else if
+		}
 	}
 }
 
@@ -628,7 +620,7 @@ UpdateSleepTime ProductionUpdate::update( void )
 	//
 	if( m_constructionCompleteFrame )
 	{
-	
+
 		if( now - m_constructionCompleteFrame > d->m_constructionCompleteDuration )
 		{
 
@@ -640,9 +632,9 @@ UpdateSleepTime ProductionUpdate::update( void )
 			m_setFlags.set( MODELCONDITION_CONSTRUCTION_COMPLETE, false );
 			m_flagsDirty = TRUE;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// if we have dirty bits that need to be set and cleared, do it here all at once
 	if( m_flagsDirty == TRUE )
@@ -657,10 +649,10 @@ UpdateSleepTime ProductionUpdate::update( void )
 		m_setFlags.clear();
 		m_flagsDirty = FALSE;
 
-	}  // end if
+	}
 
 	// if nothing in the queue get outta here
-	if( production == NULL )	
+	if( production == NULL )
 		return UPDATE_SLEEP_NONE;
 
 	//
@@ -688,7 +680,7 @@ UpdateSleepTime ProductionUpdate::update( void )
 
 		return UPDATE_SLEEP_NONE;
 
-	}  // end if
+	}
 
 	//
 	// you can disallow types of units on the fly in scripts, so if there is something
@@ -696,18 +688,18 @@ UpdateSleepTime ProductionUpdate::update( void )
 	//
 	if( production->getProductionType() == PRODUCTION_UNIT &&
 			player->allowedToBuild( production->getProductionObject() ) == FALSE )
-	{	
-	
+	{
+
 		// Don't cancel dozers in the queue.  jba.
-		if (!production->getProductionObject()->isKindOf(KINDOF_DOZER)) 
+		if (!production->getProductionObject()->isKindOf(KINDOF_DOZER))
 		{
 
 			cancelUnitCreate(production->getProductionID());
 			return UPDATE_SLEEP_NONE;
-	
-		}  // end if
 
-	}  // end if
+		}
+
+	}
 
 	// increase the frames we've been under production for
 	production->m_framesUnderConstruction++;
@@ -777,14 +769,14 @@ UpdateSleepTime ProductionUpdate::update( void )
 								m_setFlags.set( theOpeningFlags[exitDoor] );
 								m_flagsDirty = TRUE;
 
-							}  // end if
+							}
 							// if the door is waiting-open, keep it there
 							else if( door->m_doorWaitOpenFrame != 0 )
 							{
 
 								door->m_doorWaitOpenFrame = now;
 
-							}  // end else if
+							}
 							// if the door is closing, for now, pop it to waiting open
 							else if( door->m_doorClosedFrame != 0 )
 							{
@@ -799,9 +791,9 @@ UpdateSleepTime ProductionUpdate::update( void )
 								m_setFlags.set( theWaitingOpenFlags[exitDoor] );
 								m_flagsDirty = TRUE;
 
-							}  // end else
+							}
 
-						}  // end if, has door animation
+						}
 
 						// we now go into the construction complete condition for a while
 						if( m_constructionCompleteFrame == 0 )
@@ -811,8 +803,8 @@ UpdateSleepTime ProductionUpdate::update( void )
 							m_setFlags.set( MODELCONDITION_CONSTRUCTION_COMPLETE );
 							m_flagsDirty = TRUE;
 
-						}  // end if
-											
+						}
+
 						//
 						// make a new object, note that for production buildings that have door
 						// animations we will not make the object until the door has been totally
@@ -820,9 +812,9 @@ UpdateSleepTime ProductionUpdate::update( void )
 						//
 						if( d->m_numDoorAnimations == 0 || door == NULL || door->m_doorWaitOpenFrame != 0 )
 						{
-							Object *newObj = TheThingFactory->newObject( production->m_objectToProduce, 
+							Object *newObj = TheThingFactory->newObject( production->m_objectToProduce,
 																	creationBuilding->getControllingPlayer()->getDefaultTeam() );
-							
+
 							newObj->setProducer(creationBuilding);
 
 							// call the exit interface to do the rally point and position stuff
@@ -864,27 +856,27 @@ UpdateSleepTime ProductionUpdate::update( void )
 							// This is last so the voice check can easily check for "first" guy
 							production->oneProductionSuccessful();
 
-						}  // end if, door open or no door animation ... make the object
+						}
 
-					}  // end, if we got a door reservation
+					}
 
-				} //end of trying to exit all the things we were planning on attempting
+				}
 
 				if( production->getProductionQuantityRemaining() == 0 )
 				{
 					// remove this production entry so we can go on to the next if we are totally finished
 					removeFromProductionQueue( production );
-					
+
 					// delete the production entry
 					deleteInstance(production);
 				}
 
-			}  // end if we found an exit interface
+			}
 			else
 			{
 
 				// there is no exit interface, this is an error
-				DEBUG_ASSERTCRASH( 0, ("Cannot create '%s', there is no ExitUpdate interface defined for producer object '%s'\n", 
+				DEBUG_ASSERTCRASH( 0, ("Cannot create '%s', there is no ExitUpdate interface defined for producer object '%s'",
 															production->m_objectToProduce->getName().str(),
 															creationBuilding->getTemplate()->getName().str()) );
 
@@ -894,16 +886,16 @@ UpdateSleepTime ProductionUpdate::update( void )
 				// delete the production entry
 				deleteInstance(production);
 
-			}  // end else
-	
-		}  // end if, production unit
+			}
+
+		}
 		else if( production->m_type == PRODUCTION_UPGRADE )
 		{
 			const UpgradeTemplate *upgrade = production->m_upgradeToResearch;
 
 			// we finished an upgrade, lets add that money spent on it to the scorekeeper
 			player->getScoreKeeper()->addMoneySpent(upgrade->calcCostToBuild(player));
-			
+
 			// notify the script engine
 			TheScriptEngine->notifyOfCompletedUpgrade(
 				us->getControllingPlayer()->getPlayerIndex(),
@@ -911,7 +903,7 @@ UpdateSleepTime ProductionUpdate::update( void )
 				us->getID());
 
 			// print a message to the local player, if it wants one
-			if( us->isLocallyControlled() && !upgrade->getDisplayNameLabel().isEmpty() )
+			if( us->isLocallyViewed() && !upgrade->getDisplayNameLabel().isEmpty() )
 			{
 				UnicodeString msg;
 				UnicodeString format = TheGameText->fetch( "UPGRADE:UpgradeComplete" );
@@ -922,10 +914,10 @@ UpdateSleepTime ProductionUpdate::update( void )
 
 				// upgrades are a more rare event, play a nifty radar event thingie
 				TheRadar->createEvent( us->getPosition(), RADAR_EVENT_UPGRADE );
-				
+
 				//Play the sound for the upgrade, because we just built it!
 				AudioEventRTS sound = *upgrade->getResearchCompleteSound();
-				if( TheAudio->isValidAudioEvent( &sound ) ) 
+				if( TheAudio->isValidAudioEvent( &sound ) )
 				{
 					//We have a custom upgrade complete sound.
 					sound.setObjectID( us->getID() );
@@ -941,8 +933,8 @@ UpdateSleepTime ProductionUpdate::update( void )
 				sound = *upgrade->getUnitSpecificSound();
 				sound.setObjectID( us->getID() );
 				TheAudio->addAudioEvent( &sound );
-			
-			}  // end if
+
+			}
 
 			// update the upgrade status in the player or give the upgrade to the object
 			if( upgrade->getUpgradeType() == UPGRADE_TYPE_PLAYER )
@@ -955,7 +947,7 @@ UpdateSleepTime ProductionUpdate::update( void )
 			}
 
 			player->getAcademyStats()->recordUpgrade( upgrade, FALSE );
-			
+
 			//Also mark the UI dirty -- incase object with upgrade cameo is selected.
 			Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
 			Object *selectedObject = draw ? draw->getObject() : NULL;
@@ -981,12 +973,12 @@ UpdateSleepTime ProductionUpdate::update( void )
 			// delete the production entry
 			deleteInstance(production);
 
-		}  // end else, production upgrade
+		}
+
+	}
 
-	}  // end if, production is 100% complete
-	
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Add the production entry to the *END* of the production queue list */
@@ -1005,7 +997,7 @@ void ProductionUpdate::addToProductionQueue( ProductionEntry *production )
 		m_productionQueueTail->m_next = production;
 		production->m_prev = m_productionQueueTail;
 
-	}  // end if
+	}
 
 	// this production entry is now the new tail at the end of the list
 	m_productionQueueTail = production;
@@ -1025,11 +1017,11 @@ void ProductionUpdate::addToProductionQueue( ProductionEntry *production )
 			m_setFlags.set( MODELCONDITION_ACTIVELY_CONSTRUCTING );
 			m_flagsDirty = TRUE;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
-}  // end addToProductionQueue
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove the production entry from the production queue list */
@@ -1073,13 +1065,13 @@ void ProductionUpdate::removeFromProductionQueue( ProductionEntry *production )
 			m_clearFlags.set( MODELCONDITION_ACTIVELY_CONSTRUCTING, true );
 			m_setFlags.set( MODELCONDITION_ACTIVELY_CONSTRUCTING, false );
 			m_flagsDirty = TRUE;
-		
-		}  // end if
 
-	}  // end if
+		}
+
+	}
 
 /*
-	// Debugging 
+	// Debugging
 	UnicodeString msg;
 	if( production->getProductionType() == ProductionEntry::PRODUCTION_UNIT )
 	{
@@ -1094,10 +1086,10 @@ void ProductionUpdate::removeFromProductionQueue( ProductionEntry *production )
 	}
 */
 
-}  // end removeFromProductionQueue
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Is the upgrade already in the production queue.  Note that you can only have one 
+/** Is the upgrade already in the production queue.  Note that you can only have one
 	* production entry for any given upgrade in the queue */
 //-------------------------------------------------------------------------------------------------
 Bool ProductionUpdate::isUpgradeInQueue( const UpgradeTemplate *upgrade ) const
@@ -1111,7 +1103,7 @@ Bool ProductionUpdate::isUpgradeInQueue( const UpgradeTemplate *upgrade ) const
 
 	return FALSE;  // not in queue
 
-}  // end isUpgradeInQueue
+}
 
 // ------------------------------------------------------------------------------------------------
 /** count number of units with matching unit type in the production queue */
@@ -1122,13 +1114,13 @@ UnsignedInt ProductionUpdate::countUnitTypeInQueue( const ThingTemplate *unitTyp
 	const ProductionEntry *production;
 
 	for( production = firstProduction(); production; production = nextProduction( production ) )
-		if( production->getProductionType() == PRODUCTION_UNIT && 
+		if( production->getProductionType() == PRODUCTION_UNIT &&
 				production->getProductionObject() == unitType )
 			count++;
 
 	return count;
 
-}  // end countUnitTypeInQueue
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1147,7 +1139,7 @@ void ProductionUpdate::cancelAndRefundAllProduction( void )
 	// Empirically, in release the code can loop forever.  So we limit to 100 passes. jba. [8/31/2003]
 	const Int productionLimit = 100;// With luck, we never queue up 100 units. [8/31/2003]
 	Int i;
-	for (i=0; i<productionLimit; i++) 
+	for (i=0; i<productionLimit; i++)
 	{
 		// iterate through our production queue
 		if( m_productionQueue )
@@ -1159,12 +1151,12 @@ void ProductionUpdate::cancelAndRefundAllProduction( void )
 			else
 			{
 				// unknown production type
-				DEBUG_CRASH(( "ProductionUpdate::cancelAndRefundAllProduction - Unknown production type '%d'\n", m_productionQueue->getProductionType() ));
+				DEBUG_CRASH(( "ProductionUpdate::cancelAndRefundAllProduction - Unknown production type '%d'", m_productionQueue->getProductionType() ));
 				return;
-			}  // end else
-		}  // end if
+			}
+		}
 	}
-}  // end cancelAndRefundAllProduction
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -1188,7 +1180,7 @@ void ProductionUpdate::setHoldDoorOpen(ExitDoorType exitDoor, Bool holdIt)
 // ------------------------------------------------------------------------------------------------
 /*static*/ ProductionUpdateInterface *ProductionUpdate::getProductionUpdateInterfaceFromObject( Object *obj )
 {
-	
+
 	// sanity
 	if( obj == NULL )
 		return NULL;
@@ -1202,13 +1194,13 @@ void ProductionUpdate::setHoldDoorOpen(ExitDoorType exitDoor, Bool holdIt)
 		if( pui )
 			return pui;
 
-	}  // end for, bmi
+	}
 
 	// interface not found
 	return NULL;
 
 
-}  // end getProductionUpdateInterfaceFromObject
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -1219,7 +1211,7 @@ void ProductionUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1243,7 +1235,7 @@ void ProductionUpdate::xfer( Xfer *xfer )
 	for( production = m_productionQueue; production; production = production->m_next )
 		productionCount++;
 	xfer->xferUnsignedShort( &productionCount );
-	
+
 	// production queue data
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
@@ -1281,9 +1273,9 @@ void ProductionUpdate::xfer( Xfer *xfer )
 			// exit door
 			xfer->xferInt( (Int*)&production->m_exitDoor );
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		AsciiString name;
@@ -1291,11 +1283,11 @@ void ProductionUpdate::xfer( Xfer *xfer )
 		// the queue should be emtpy now
 		if( m_productionQueue != NULL )
 		{
-		
-			DEBUG_CRASH(( "ProductionUpdate::xfer - m_productionQueue is not empty, but should be\n" ));
+
+			DEBUG_CRASH(( "ProductionUpdate::xfer - m_productionQueue is not empty, but should be" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each element
 		for( UnsignedShort i = 0; i < productionCount; ++i )
@@ -1315,7 +1307,7 @@ void ProductionUpdate::xfer( Xfer *xfer )
 				m_productionQueueTail->m_next = production;
 				production->m_prev = m_productionQueueTail;
 
-			}  // end if
+			}
 
 			// this production entry is now the new tail at the end of the list
 			m_productionQueueTail = production;
@@ -1331,13 +1323,13 @@ void ProductionUpdate::xfer( Xfer *xfer )
 				production->m_objectToProduce = TheThingFactory->findTemplate( name );
 				if( production->m_objectToProduce == NULL )
 				{
-	
-					DEBUG_CRASH(( "ProductionUpdate::xfer - Cannot find template '%s'\n", name.str() ));
+
+					DEBUG_CRASH(( "ProductionUpdate::xfer - Cannot find template '%s'", name.str() ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
-			}  // end if, unit production
+			}
 			else
 			{
 
@@ -1345,12 +1337,12 @@ void ProductionUpdate::xfer( Xfer *xfer )
 				if( production->m_upgradeToResearch == NULL )
 				{
 
-					DEBUG_CRASH(( "ProductionUpdate::xfer - Cannot find upgrade '%s'\n", name.str() ));
+					DEBUG_CRASH(( "ProductionUpdate::xfer - Cannot find upgrade '%s'", name.str() ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
-			}  // end else, upgrade production
+			}
 
 			// production ID
 			xfer->xferUser( &production->m_productionID, sizeof( ProductionID ) );
@@ -1370,19 +1362,19 @@ void ProductionUpdate::xfer( Xfer *xfer )
 			// exit door
 			xfer->xferInt( (Int*)&production->m_exitDoor );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// unique id
 	xfer->xferUser( &m_uniqueID, sizeof( ProductionID ) );
-	
+
 	// production count
 	xfer->xferUnsignedInt( &m_productionCount );
-	
+
 	// construction complete frame
 	xfer->xferUnsignedInt( &m_constructionCompleteFrame );
-	
+
 	// door info
 	xfer->xferUser( &m_doors, sizeof( DoorInfo ) * DOOR_COUNT_MAX );
 
@@ -1395,7 +1387,7 @@ void ProductionUpdate::xfer( Xfer *xfer )
 	// flags dirty
 	xfer->xferBool( &m_flagsDirty );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1406,4 +1398,4 @@ void ProductionUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp
index b16859b14f3..96bb28994cd 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/GameLogic.h"
@@ -36,11 +36,6 @@
 #include "GameLogic/Module/ProjectileStreamUpdate.h"
 #include "WWMath/vector3.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -55,10 +50,10 @@ ProjectileStreamUpdate::ProjectileStreamUpdate( Thing *thing, const ModuleData*
 	m_owningObject = INVALID_ID;
 	m_nextFreeIndex = 0;
 	m_firstValidIndex = 0;
-	
+
 	m_targetObject = INVALID_ID;
 	m_targetPosition.zero();
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -174,7 +169,7 @@ void ProjectileStreamUpdate::getAllPoints( Vector3 *points, Int *count )
 			points[pointCount].X = thisPoint.x;
 			points[pointCount].Y = thisPoint.y;
 			points[pointCount].Z = thisPoint.z;
-			
+
 
 			if ( obj && obj->isKindOf( KINDOF_VEHICLE ) )				// this makes the stream skim along my roof, if I have a roof
 			{
@@ -221,12 +216,12 @@ void ProjectileStreamUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Target tracking for line breaking
 */
 // ------------------------------------------------------------------------------------------------
@@ -259,7 +254,7 @@ void ProjectileStreamUpdate::xfer( Xfer *xfer )
 		xfer->xferCoord3D( &m_targetPosition );
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -270,4 +265,4 @@ void ProjectileStreamUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProneUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProneUpdate.cpp
index a153e79cc61..78d66c09640 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProneUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProneUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 
@@ -51,7 +51,7 @@ ProneUpdateModuleData::ProneUpdateModuleData() :
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DamageToFramesRatio", INI::parseReal, NULL, offsetof(ProneUpdateModuleData, m_damageToFramesRatio) },
 		{ 0, 0, 0, 0 }
@@ -63,7 +63,7 @@ ProneUpdateModuleData::ProneUpdateModuleData() :
 ProneUpdate::ProneUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 	m_proneFrames = 0;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -127,7 +127,7 @@ void ProneUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -148,7 +148,7 @@ void ProneUpdate::xfer( Xfer *xfer )
 	// prone frames
 	xfer->xferInt( &m_proneFrames );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -159,5 +159,5 @@ void ProneUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/RadarUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/RadarUpdate.cpp
index abd91bf834d..be033d09285 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/RadarUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/RadarUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ModelState.h"
 #include "Common/Xfer.h"
@@ -44,7 +44,7 @@ RadarUpdateModuleData::RadarUpdateModuleData( void )
 
 	m_radarExtendTime = 0.0f;
 
-}  // end RadarUpdateModuleData
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -60,14 +60,14 @@ RadarUpdate::RadarUpdate( Thing *thing, const ModuleData *moduleData )
 	m_extendDoneFrame = 0;
 	m_extendComplete = FALSE;
 
-}  // end RadarUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 RadarUpdate::~RadarUpdate( void )
 {
 
-}  // end RadarUpdate
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -86,7 +86,7 @@ void RadarUpdate::extendRadar( void )
 	//Change this to make the radar active after extension...
 	m_radarActive = true;
 
-}  // end extendRadar
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -116,11 +116,11 @@ UpdateSleepTime RadarUpdate::update( void )
 			draw->clearAndSetModelConditionState( MODELCONDITION_RADAR_EXTENDING,
 																						MODELCONDITION_RADAR_UPGRADED );
 
-	}  // end if
-	
+	}
+
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -131,7 +131,7 @@ void RadarUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -158,7 +158,7 @@ void RadarUpdate::xfer( Xfer *xfer )
 	// radar active
 	xfer->xferBool( &m_radarActive );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -169,5 +169,5 @@ void RadarUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/RadiusDecalUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/RadiusDecalUpdate.cpp
index 5ec8773e7e3..973912987bd 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/RadiusDecalUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/RadiusDecalUpdate.cpp
@@ -26,7 +26,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
@@ -90,7 +90,7 @@ void RadiusDecalUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -113,7 +113,7 @@ void RadiusDecalUpdate::xfer( Xfer *xfer )
 
 	xfer->xferBool(&m_killWhenNoLongerAttacking);
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -124,4 +124,4 @@ void RadiusDecalUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SlavedUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SlavedUpdate.cpp
index a675a77114e..eed6fa5f8b6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SlavedUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SlavedUpdate.cpp
@@ -30,7 +30,7 @@
 //				can use any or all features, some of which are specialized.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
@@ -50,11 +50,6 @@
 #include "GameLogic/Module/SlavedUpdate.h"
 #include "GameLogic/Weapon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 #define STRAY_MULTIPLIER 2.0f // Multiplier from stating diestance from tunnel, to max distance from
 const Real CLOSE_ENOUGH = 15;				// Our moveTo commands and pathfinding can't handle people in the way, so quit trying to hump someone on your spot
@@ -70,12 +65,12 @@ SlavedUpdate::SlavedUpdate( Thing *thing, const ModuleData* moduleData ) : Updat
 	m_framesToWait = 0;
 	m_repairState = REPAIRSTATE_NONE;
 	m_repairing = false;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 SlavedUpdate::~SlavedUpdate( void )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void SlavedUpdate::onObjectCreated()
@@ -152,7 +147,7 @@ UpdateSleepTime SlavedUpdate::update( void )
 	if( !master || master->isEffectivelyDead() || master->isDisabledByType( DISABLED_UNMANNED ) )
 	{
 		stopSlavedEffects();
-		
+
 		//Killing is lame.
 		//me->kill();
 
@@ -164,7 +159,7 @@ UpdateSleepTime SlavedUpdate::update( void )
 
 		return UPDATE_SLEEP_NONE;
 	}
-	else 
+	else
 	{
 		Team *masterTeam = master->getTeam();
 		Team *myTeam     = me->getTeam();
@@ -173,25 +168,25 @@ UpdateSleepTime SlavedUpdate::update( void )
 			me->defect( masterTeam, 0 );
 		}
 
-    
+
 
 
 	}
-	
+
 	if (data->m_stayOnSameLayerAsMaster)
 		me->setLayer(master->getLayer());
-	
+
 	//Clear the drone spotting bonus to the master. Up to the drone
 	//to satisfy the conditions to set it again for the next update.
 	master->clearWeaponBonusCondition( WEAPONBONUSCONDITION_DRONE_SPOTTING );
-	
+
 	//Get my master's AI. If he is attacking something, grant him a range bonus,
 	//and I'll fly over the target.
 	Object *target = NULL;
 	AIUpdateInterface *masterAI = master->getAIUpdateInterface();
 	if( masterAI )
 	{
-		target = masterAI->getCurrentVictim(); 
+		target = masterAI->getCurrentVictim();
 	}
 
 	//Calculate the health percentage of the master -- there are two places we care.
@@ -208,7 +203,7 @@ UpdateSleepTime SlavedUpdate::update( void )
 			healthPercentage = (Int)(health / maxHealth * 100.0f);
 		}
 	}
-		
+
 	//Determine whether or not we need to go back to the master to repair him
 	if( healthPercentage <= data->m_repairWhenHealthBelowPercentage )
 	{
@@ -222,7 +217,7 @@ UpdateSleepTime SlavedUpdate::update( void )
 		//2ND PRIORITY: Go to the master's current victim (as close as wander distance allows)
 		if( target )
 		{
-			//At this point, we officially are in an attack mode! Now, simply 
+			//At this point, we officially are in an attack mode! Now, simply
 			endRepair();
 			doAttackLogic( target );
 			return UPDATE_SLEEP_NONE;
@@ -294,7 +289,7 @@ void SlavedUpdate::doAttackLogic( const Object *target )
 	Object *master = TheGameLogic->findObjectByID( m_slaver );
 	Coord3D attackPosition;
 
-	//First, determine the attack position. If the target is too far away, then we'll 
+	//First, determine the attack position. If the target is too far away, then we'll
 	//calculate the closest allowable position.
 	const Coord3D *targetPos = target->getPosition();
 	Real dist = ThePartitionManager->getDistanceSquared( me, targetPos, FROM_BOUNDINGSPHERE_2D );
@@ -342,7 +337,7 @@ void SlavedUpdate::doAttackLogic( const Object *target )
 
 	if( dist < sqr( data->m_distToTargetToGrantRangeBonus ) )
 	{
-		//Finally, seeing we are close enough to the target, grant our 
+		//Finally, seeing we are close enough to the target, grant our
 		//master extended weapon range!
 		master->setWeaponBonusCondition( WEAPONBONUSCONDITION_DRONE_SPOTTING );
 	}
@@ -358,7 +353,7 @@ void SlavedUpdate::doScoutLogic( const Coord3D *mastersDestination )
 	Object *master = TheGameLogic->findObjectByID( m_slaver );
 	Coord3D scoutPosition;
 
-	//First, determine the scout position. If our master's destination is too far away, then we'll 
+	//First, determine the scout position. If our master's destination is too far away, then we'll
 	//calculate the closest allowable position.
 	Real dist = ThePartitionManager->getDistanceSquared( me, mastersDestination, FROM_BOUNDINGSPHERE_2D );
 	if( dist > sqr( data->m_scoutRange ) )
@@ -509,7 +504,7 @@ void SlavedUpdate::doRepairLogic()
 		{
 			//Calculate the repair rate per frame.
 			Real repairAmount = data->m_repairRatePerSecond / LOGICFRAMES_PER_SECOND;
-			
+
 			DamageInfo healingInfo;
 			healingInfo.in.m_amount = repairAmount;
 			healingInfo.in.m_damageType = DAMAGE_HEALING;
@@ -570,7 +565,7 @@ void SlavedUpdate::setRepairState( RepairStates repairState )
 	const SlavedUpdateModuleData* data = getSlavedUpdateModuleData();
 
 	if( repairState == m_repairState )
-	{	
+	{
 		return;
 	}
 
@@ -646,7 +641,7 @@ void SlavedUpdate::setRepairState( RepairStates repairState )
 							Real time = (Real)(m_framesToWait * LOGICFRAMES_PER_SECOND);
 							weldingSys->setLifetimeRange( time, time );
 
-							AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_repairSparks;	
+							AudioEventRTS soundToPlay = TheAudio->getMiscAudio()->m_repairSparks;
 							soundToPlay.setPosition( &pos );
 							TheAudio->addAudioEvent( &soundToPlay );
 						}
@@ -720,7 +715,7 @@ void SlavedUpdate::startSlavedEffects( const Object *slaver )
 	m_guardPointOffset.zero();
 	m_guardPointOffset.x += data->m_guardMaxRange * Cos( randomDirection );
 	m_guardPointOffset.y += data->m_guardMaxRange * Sin( randomDirection );
-	
+
 	// mark selves as not selectable
 	getObject()->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_UNSELECTABLE ) );
 
@@ -731,7 +726,7 @@ void SlavedUpdate::startSlavedEffects( const Object *slaver )
     if ( myStealth )
     {
       myStealth->receiveGrant( true );
-      // note to anyone... once stealth is granted to this drone(or such) 
+      // note to anyone... once stealth is granted to this drone(or such)
       // let its own stealthupdate govern the allowedtostealth cases
     }
   }
@@ -759,7 +754,7 @@ void SlavedUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -792,7 +787,7 @@ void SlavedUpdate::xfer( Xfer *xfer )
 	// repairing
 	xfer->xferBool( &m_repairing );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -803,5 +798,5 @@ void SlavedUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SmartBombTargetHomingUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SmartBombTargetHomingUpdate.cpp
index 6cc2bf70e92..af4de02c9a2 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SmartBombTargetHomingUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SmartBombTargetHomingUpdate.cpp
@@ -119,7 +119,7 @@ void SmartBombTargetHomingUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -138,7 +138,7 @@ void SmartBombTargetHomingUpdate::xfer( Xfer *xfer )
 	UpdateModule::xfer( xfer );
 
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -149,4 +149,4 @@ void SmartBombTargetHomingUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp
index f38cf423b8c..0d87c22f891 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   Handles processing of unit special abilities.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h" // This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameAudio.h"
 #include "Common/GlobalData.h"
@@ -64,23 +64,15 @@
 #include "GameLogic/Module/StealthUpdate.h"
 #include "GameLogic/Module/ContainModule.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
 SpecialAbilityUpdate::SpecialAbilityUpdate( Thing *thing, const ModuleData* moduleData ) : SpecialPowerUpdateModule( thing, moduleData )
 {
-  //Added By Sadullah Nader
-  //Initialization(s) inserted
   m_captureFlashPhase = 0.0f;
-  //
   m_active = false;
   m_prepFrames = 0;
-  m_animFrames = 0; 
+  m_animFrames = 0;
   m_targetID = INVALID_ID;
   m_targetPos.zero();
   m_locationCount = 0;
@@ -94,13 +86,13 @@ SpecialAbilityUpdate::SpecialAbilityUpdate( Thing *thing, const ModuleData* modu
   setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 //  This is the althernate way to one-at-a-time BlackLotus' specials; we'll keep it commented her until Dustin decides, or until 12/10/02
 //  setBusy( FALSE );
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 SpecialAbilityUpdate::~SpecialAbilityUpdate( void )
 {
   onExit( true );
-} 
+}
 
 /*------------------------------------------------------------------------------------------------
 void SpecialAbilityUpdate::update( void )
@@ -113,7 +105,7 @@ that has every option will do the following in order:
   2 -- UNPACK: If I need to unpack before I can prepare, then do so now (this uses the model
        condition unpack).
   3 -- PREPARE: If I need to perform a task for a period of time before I can trigger my special
-       ability, then do so now. A good example is aiming with a targetting laser for a few 
+       ability, then do so now. A good example is aiming with a targetting laser for a few
        seconds before firing your special weapon.
   4 -- TRIGGER: Once preparation is complete, fire your special ability now.
   5 -- PACK: If I need to pack after finishing my attack, do so now.
@@ -124,7 +116,7 @@ that has every option will do the following in order:
   Persistent Specials -- A persistent special will continually trigger it's effect every so often
      and never end. A good example of this is the disable building hack. The hacker will run up
      to the target building, unpack, prepare (firing hack stream), then after a period of time,
-     the building becomes disabled. But because it's persistent, we reset the preparation and 
+     the building becomes disabled. But because it's persistent, we reset the preparation and
      trigger the building disabled code over and over again -- which is on a timer.
   No Target Specials -- You can link two different main specials together. Colonel Burton has the
      ability to lay C4 charges on multiple targets. Activating these specials require a target.
@@ -138,9 +130,9 @@ that has every option will do the following in order:
   AbilityAbortRange    -- After starting an attack, it'll allow preparation unless the target goes
                           beyond this range. If this happens, the ability is aborted outright.
   PreparationTime      -- How long it takes to prepare your special once in position and unpacked.
-  PersistentPrepTime   -- This value defines whether or not you are using a persistent special. 
+  PersistentPrepTime   -- This value defines whether or not you are using a persistent special.
                           Once the special ability is triggered, it'll wait until this specified
-                          delay occurs and it'll trigger it again, for ever until the unit dies, 
+                          delay occurs and it'll trigger it again, for ever until the unit dies,
                           the target dies, or the unit decides to do something else.
   PackTime             -- How long it takes to pack up the unit after triggering a non persistent
                           special ability or after ordering the unit to do something else, or the
@@ -164,7 +156,7 @@ that has every option will do the following in order:
                           time. The laser example only has one, but the C4 charges can have more.
   SpecialObjectsPersistent -- If this flag is set, then the objects will remain should the owner
                           decides to do something else... C4 charges are a good example.
-  EffectDuration       -- Defines the duration of the special ability. In the case of disabling 
+  EffectDuration       -- Defines the duration of the special ability. In the case of disabling
                           the building (hacker), this value will dictate how long the building
                           will be disabled should the hacker die or stop the attack.
   UniqueSpecialObjectTargets -- Prevents the owner from placing multiple special objects on the
@@ -174,7 +166,7 @@ that has every option will do the following in order:
                           is a bad example -- because it requires the owner to detonate them.
   FlipObjectAfterPacking -- Simply rotates the object 180 degrees after packing (due to special
                           animation case).
-  FlipObjectAfterUnPacking -- Simply rotates the object 180 degrees after unpacking (due to 
+  FlipObjectAfterUnPacking -- Simply rotates the object 180 degrees after unpacking (due to
                           special animation case). Used by colonel burton after planting charge.
 
 
@@ -206,7 +198,7 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
 	const SpecialAbilityUpdateModuleData* data = getSpecialAbilityUpdateModuleData();
 
 	validateSpecialObjects();
-  
+
   //Important! This check will see if there has been any commands issued by either the player
   //or script. When told to do something else, we need to immediately cleanup our special ability.
   //This also means some things might be left around like timed charges to detonate.
@@ -218,7 +210,7 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
 
   if( !m_active ) // Not active.
     return calcSleepTime();
-  
+
   AIUpdateInterface *ai = getObject()->getAIUpdateInterface();
   if( !ai )
   {
@@ -236,7 +228,7 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
 		// However, the time of Facing the target is considered isPowerCurrentlyInUse, but isMoving.  So let that slide.
 		switch(data->m_specialPowerTemplate->getSpecialPowerType() )
 		{
-      case SPECIAL_INFANTRY_CAPTURE_BUILDING: 
+      case SPECIAL_INFANTRY_CAPTURE_BUILDING:
       case SPECIAL_BLACKLOTUS_CAPTURE_BUILDING:
 			{
 				onExit( false );
@@ -271,7 +263,7 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
         shouldAbort = TRUE;
       else switch (data->m_specialPowerTemplate->getSpecialPowerType())
       {
-        case SPECIAL_INFANTRY_CAPTURE_BUILDING: 
+        case SPECIAL_INFANTRY_CAPTURE_BUILDING:
         case SPECIAL_BLACKLOTUS_CAPTURE_BUILDING:
         case SPECIAL_HACKER_DISABLE_BUILDING:
         {
@@ -280,7 +272,7 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
             // it's been captured by a colleague! we should stop.
             shouldAbort = TRUE;
           }
-          //deliberately falling through...
+          FALLTHROUGH; //deliberately falling through...
         }
         case SPECIAL_BLACKLOTUS_STEAL_CASH_HACK:
         case SPECIAL_BOOBY_TRAP:
@@ -309,7 +301,7 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
         {
           if ( target->isKindOf( KINDOF_STRUCTURE ) )
             shouldAbort = TRUE;
-          //deliberately falling through
+          FALLTHROUGH; //deliberately falling through
         }
         case SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK:
         {
@@ -374,8 +366,8 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
         endPreparation();
         if( needToPack() )
         {
-          //STEP 5 -- PACK 
-          //Note: If we actually do pack, then cleanup will be handled in 
+          //STEP 5 -- PACK
+          //Note: If we actually do pack, then cleanup will be handled in
           //handlePackingProcess(), near the top of this function.
           startPacking(true);
         }
@@ -396,8 +388,8 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
         endPreparation();
         if( needToPack() )
         {
-          //STEP 5 -- PACK 
-          //Note: If we actually do pack, then cleanup will be handled in 
+          //STEP 5 -- PACK
+          //Note: If we actually do pack, then cleanup will be handled in
           //handlePackingProcess(), near the top of this function.
           startPacking(false);
         }
@@ -454,8 +446,8 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
 
         if( needToPack() )
         {
-          //STEP 5 -- PACK 
-          //Note: If we actually do pack, then cleanup will be handled in 
+          //STEP 5 -- PACK
+          //Note: If we actually do pack, then cleanup will be handled in
           //handlePackingProcess(), near the top of this function.
           startPacking(true);
         }
@@ -476,10 +468,10 @@ UpdateSleepTime SpecialAbilityUpdate::update( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool SpecialAbilityUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTemplate *specialPowerTemplate, 
-                                                           const Object *targetObj, 
-                                                           const Coord3D *targetPos, 
-                                                           const Waypoint *way, 
+Bool SpecialAbilityUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTemplate *specialPowerTemplate,
+                                                           const Object *targetObj,
+                                                           const Coord3D *targetPos,
+                                                           const Waypoint *way,
                                                            UnsignedInt commandOptions )
 {
   const SpecialAbilityUpdateModuleData* data = getSpecialAbilityUpdateModuleData();
@@ -504,7 +496,7 @@ Bool SpecialAbilityUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTem
 
 //  getObject()->getControllingPlayer()->getAcademyStats()->recordSpecialPowerUsed( specialPowerTemplate );
 
-  getObject()->clearModelConditionFlags( 
+  getObject()->clearModelConditionFlags(
     MAKE_MODELCONDITION_MASK4( MODELCONDITION_UNPACKING, MODELCONDITION_PACKING, MODELCONDITION_FIRING_A, MODELCONDITION_RAISING_FLAG ) );
 
   if( targetObj )
@@ -517,7 +509,7 @@ Bool SpecialAbilityUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTem
     //Get the position!
     m_targetPos = *targetPos;
   }
-  
+
   //Clear any old AI before starting this special ability.
   if( !getObject()->getAIUpdateInterface() )
   {
@@ -533,7 +525,7 @@ Bool SpecialAbilityUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTem
     //Only unpack if we need to -- setting it to unpacked will skip step 2 in the update
     m_packingState = STATE_UNPACKED;
   }
-  
+
   m_active = true;
 
   //Prevent other mutually exclusive specials from running (kill them now if we're starting something else)
@@ -542,22 +534,22 @@ Bool SpecialAbilityUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTem
   if( disableSA && disableSA != this )
     disableSA->onExit( FALSE );
   disableSA = getObject()->findSpecialAbilityUpdate( SPECIAL_BLACKLOTUS_STEAL_CASH_HACK );
-  if( disableSA && disableSA != this ) 
+  if( disableSA && disableSA != this )
     disableSA->onExit( FALSE );
   disableSA = getObject()->findSpecialAbilityUpdate( SPECIAL_BLACKLOTUS_CAPTURE_BUILDING );
-  if( disableSA && disableSA != this ) 
+  if( disableSA && disableSA != this )
     disableSA->onExit( FALSE );
   disableSA = getObject()->findSpecialAbilityUpdate( SPECIAL_REMOTE_CHARGES );
-  if( disableSA && disableSA != this ) 
+  if( disableSA && disableSA != this )
     disableSA->onExit( FALSE );
   disableSA = getObject()->findSpecialAbilityUpdate( SPECIAL_TIMED_CHARGES );
-  if( disableSA && disableSA != this ) 
+  if( disableSA && disableSA != this )
     disableSA->onExit( FALSE );
   disableSA = getObject()->findSpecialAbilityUpdate( SPECIAL_INFANTRY_CAPTURE_BUILDING );
-  if( disableSA && disableSA != this ) 
+  if( disableSA && disableSA != this )
     disableSA->onExit( FALSE );
   disableSA = getObject()->findSpecialAbilityUpdate( SPECIAL_BOOBY_TRAP );
-  if( disableSA && disableSA != this ) 
+  if( disableSA && disableSA != this )
     disableSA->onExit( FALSE );
 
 
@@ -586,7 +578,7 @@ Bool SpecialAbilityUpdate::isPowerCurrentlyInUse( const CommandButton *command )
   if( m_packingState != STATE_NONE )
   {
     //exception for powers with zero reload time... they are ready to use immediately!
-    if ( (m_packingState == STATE_PACKING || m_packingState == STATE_PACKED) && 
+    if ( (m_packingState == STATE_PACKING || m_packingState == STATE_PACKED) &&
                     command && command->getSpecialPowerTemplate()->getReloadTime() == 0 )
       return false;
 
@@ -595,7 +587,7 @@ Bool SpecialAbilityUpdate::isPowerCurrentlyInUse( const CommandButton *command )
       return true;
     }
   }
-  
+
   return false;
 }
 
@@ -604,7 +596,7 @@ void SpecialAbilityUpdate::onExit( Bool cleanup )
 {
   const SpecialAbilityUpdateModuleData* data = getSpecialAbilityUpdateModuleData();
 
-  getObject()->clearModelConditionFlags( 
+  getObject()->clearModelConditionFlags(
     MAKE_MODELCONDITION_MASK4( MODELCONDITION_UNPACKING, MODELCONDITION_PACKING, MODELCONDITION_FIRING_A, MODELCONDITION_RAISING_FLAG ) );
   getObject()->clearStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_IS_USING_ABILITY ) );
 
@@ -626,7 +618,7 @@ void SpecialAbilityUpdate::onExit( Bool cleanup )
 //  setBusy( FALSE );// My owner is no longer using me
 
 
-// no, actually, we DON'T want to call this here, since onExit is always called 
+// no, actually, we DON'T want to call this here, since onExit is always called
 // (directly or indirectly) from update()... and calling setWakeFrame() from your
 // own update() method is a no-no (since it would just be ignored in favor
 // of the return value from update() anyway). just set m_active to false,
@@ -746,8 +738,8 @@ void SpecialAbilityUpdate::startPacking(Bool success)
   m_animFrames = data->m_packTime * variation;
 
   //Set the animation state
-  getObject()->clearAndSetModelConditionFlags( 
-        MAKE_MODELCONDITION_MASK2( MODELCONDITION_UNPACKING, MODELCONDITION_RAISING_FLAG ), 
+  getObject()->clearAndSetModelConditionFlags(
+        MAKE_MODELCONDITION_MASK2( MODELCONDITION_UNPACKING, MODELCONDITION_RAISING_FLAG ),
         MAKE_MODELCONDITION_MASK( MODELCONDITION_PACKING ) );
 
   AudioEventRTS sound = data->m_packSound;
@@ -799,8 +791,8 @@ void SpecialAbilityUpdate::startUnpacking()
   m_animFrames = data->m_unpackTime * variation;
 
   //Set the animation state
-  getObject()->clearAndSetModelConditionFlags( 
-        MAKE_MODELCONDITION_MASK( MODELCONDITION_PACKING ), 
+  getObject()->clearAndSetModelConditionFlags(
+        MAKE_MODELCONDITION_MASK( MODELCONDITION_PACKING ),
         MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ) );
 
 
@@ -870,10 +862,10 @@ Bool SpecialAbilityUpdate::isWithinStartAbilityRange() const
         {
           return true;
         }
-      }  
+      }
       return false;
     }
-    
+
     if( data->m_approachRequiresLOS )
     {
       //Make sure we can see the target!
@@ -881,7 +873,7 @@ Bool SpecialAbilityUpdate::isWithinStartAbilityRange() const
       PartitionFilter *filters[] = { &filterLOS, NULL };
       ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( self, range, FROM_BOUNDINGSPHERE_2D, filters, ITER_SORTED_NEAR_TO_FAR );
       MemoryPoolObjectHolder hold(iter);
-      for( Object *theTarget = iter->first(); theTarget; theTarget = iter->next() ) 
+      for( Object *theTarget = iter->first(); theTarget; theTarget = iter->next() )
       {
         //LOS check succeeded.
         if( target == theTarget )
@@ -945,7 +937,7 @@ Bool SpecialAbilityUpdate::isWithinAbilityAbortRange() const
         {
           return true;
         }
-      }  
+      }
       return false;
     }
 
@@ -1010,7 +1002,7 @@ void SpecialAbilityUpdate::startPreparation()
       }
       break;
     }
-    case SPECIAL_INFANTRY_CAPTURE_BUILDING: 
+    case SPECIAL_INFANTRY_CAPTURE_BUILDING:
     {
       Object *target = TheGameLogic->findObjectByID( m_targetID );
       if (target)
@@ -1038,12 +1030,12 @@ void SpecialAbilityUpdate::startPreparation()
         draw->setAnimationCompletionTime(data->m_preparationFrames);
 
       //Warn the victim so he might have a chance to react!
-      if( target && target->isLocallyControlled() )
+      if( target && target->isLocallyViewed() )
       {
         TheEva->setShouldPlay( EVA_BuildingBeingStolen );
       }
       TheRadar->tryInfiltrationEvent( target );
-      
+
       break;
     }
 
@@ -1066,14 +1058,14 @@ void SpecialAbilityUpdate::startPreparation()
         {
           if (!initLaser(specialObject, target))
             return;
-          
+
           //For the hacker this sets up the looping typing animation.
           getObject()->clearAndSetModelConditionFlags( MAKE_MODELCONDITION_MASK( MODELCONDITION_UNPACKING ),
                                                        MAKE_MODELCONDITION_MASK( MODELCONDITION_FIRING_A ) );
         }
 
         //Warn the victim so he might have a chance to react!
-        if( spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING && target && target->isLocallyControlled() )
+        if( spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING && target && target->isLocallyViewed() )
         {
           TheEva->setShouldPlay( EVA_BuildingBeingStolen );
         }
@@ -1090,7 +1082,7 @@ void SpecialAbilityUpdate::startPreparation()
   {
     spmInterface->markSpecialPowerTriggered(NULL);// Null for not creating a view object
   }
-  
+
   if (getObject()->getAI()) {
     getObject()->getAI()->aiIdle( CMD_FROM_AI ); // just in case.  jba.
   }
@@ -1133,7 +1125,7 @@ Bool SpecialAbilityUpdate::initLaser(Object* specialObject, Object* target )
     //If we can't find the bone, then set it to our current position.
     startPos.set( getObject()->getPosition() );
   }
-  
+
   Coord3D endPos;
   if (target)
   {
@@ -1181,7 +1173,7 @@ Bool SpecialAbilityUpdate::continuePreparation()
         //It's been captured by a colleague, so cancel!
         return false;
       }
-        
+
       //Specialized code that specifically creates and looks up a laser update.
       for( std::list<ObjectID>::iterator it = m_specialObjectIDList.begin(); it != m_specialObjectIDList.end(); ++it )
       {
@@ -1223,17 +1215,17 @@ Bool SpecialAbilityUpdate::continuePreparation()
         if (targetDraw) // skip fx if merely 'invulnerable'
         {
           Bool lastPhase = ( ((Int)m_captureFlashPhase) & 1 );// were we in a flashy phase last frame?
-          
+
           Real denominator = MAX(1, data->m_preparationFrames);
           Real increment = 1.0f - ((Real)m_prepFrames / denominator );
           m_captureFlashPhase += increment / 3.0f;
 
           Bool thisPhase = ( ((Int)m_captureFlashPhase) & 1 );// are we in a flashy phase this frame?
 
-          if ( lastPhase && ( ! thisPhase ) ) 
+          if ( lastPhase && ( ! thisPhase ) )
           {
 
-            RGBColor myHouseColor; 
+            RGBColor myHouseColor;
             myHouseColor.setFromInt( getObject()->getIndicatorColor() );
 
             Real saturation = TheGlobalData->m_selectionFlashSaturationFactor;
@@ -1292,7 +1284,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
   AudioEventRTS sound = data->m_triggerSound;
   sound.setObjectID( object->getID() );
   TheAudio->addAudioEvent( &sound );
-  
+
 
   Bool okToLoseStealth = TRUE;
 
@@ -1343,7 +1335,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
           return;
         }
       }
-			
+
 			if( (spTemplate->getSpecialPowerType() == SPECIAL_BOOBY_TRAP)  &&  target->testStatus(OBJECT_STATUS_BOOBY_TRAPPED) )
 			{
 				// The only way it can be booby trapped after a detonate would be if it is an allied booby trap.
@@ -1358,8 +1350,8 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
         StickyBombUpdate *update = (StickyBombUpdate*)charge->findUpdateModule( key_StickyBombUpdate );
         if( !update )
         {
-          DEBUG_ASSERTCRASH( 0, 
-            ("Unit '%s' attempted to place %s on %s but the bomb requires a StickyBombUpdate module.", 
+          DEBUG_ASSERTCRASH( 0,
+            ("Unit '%s' attempted to place %s on %s but the bomb requires a StickyBombUpdate module.",
             object->getTemplate()->getName().str(),
             charge->getTemplate()->getName().str(),
             target->getTemplate()->getName().str() ) );
@@ -1369,13 +1361,13 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
         //Setting the producer ID allows the sticky bomb update module to initialize
         //and setup timers, etc.
         update->initStickyBomb( target, object );
-        
+
 
       }
       break;
     }
     case SPECIAL_HACKER_DISABLE_BUILDING:
-    case SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK: 
+    case SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK:
     {
       //Disable the target temporarily.
       Object *target = TheGameLogic->findObjectByID( m_targetID );
@@ -1402,7 +1394,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
         durationInterleaveFactor = 2;
       }
 
-      
+
       if ( m_doDisableFXParticles )
       {
         const ParticleSystemTemplate *tmp = data->m_disableFXParticleSystem;
@@ -1424,7 +1416,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
       break;
     }
 
-    case SPECIAL_INFANTRY_CAPTURE_BUILDING: 
+    case SPECIAL_INFANTRY_CAPTURE_BUILDING:
     case SPECIAL_BLACKLOTUS_CAPTURE_BUILDING:
     {
       Object *target = TheGameLogic->findObjectByID( m_targetID );
@@ -1434,7 +1426,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
       {
         return;
       }
-      
+
       if( target->checkAndDetonateBoobyTrap(getObject()) )
       {
         // Whoops, it was mined.  Cancel if it or us is now dead.
@@ -1459,12 +1451,12 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
       }
 
       //Play the "building stolen" EVA event if the local player is the victim!
-      if( target && target->isLocallyControlled() )
+      if( target && target->isLocallyViewed() )
       {
         TheEva->setShouldPlay( EVA_BuildingStolen );
       }
 
-      target->defect( object->getControllingPlayer()->getDefaultTeam(), 1); // one frame of flash! 
+      target->defect( object->getControllingPlayer()->getDefaultTeam(), 1); // one frame of flash!
 
       SpecialPowerModuleInterface *spmInterface = getMySPM();
       if (spmInterface && spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING )
@@ -1472,7 +1464,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
         // only for black lotus, not infantry capture which resets in contunueprep()
         spmInterface->startPowerRecharge();
       }
-      
+
       object->getControllingPlayer()->getAcademyStats()->recordBuildingCapture();
       break;
     }
@@ -1486,14 +1478,18 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
         return;
       }
 
-      //Steal a thousand cash from the other team!
+      //Steal cash from the other team!
       Money *targetMoney = target->getControllingPlayer()->getMoney();
       Money *objectMoney = object->getControllingPlayer()->getMoney();
       if( targetMoney && objectMoney )
       {
         UnsignedInt cash = targetMoney->countMoney();
+#if RETAIL_COMPATIBLE_CRC || PRESERVE_RETAIL_BEHAVIOR
         UnsignedInt desiredAmount = 1000;
-        //Check to see if they have 1000 cash, otherwise, take the remainder!
+#else
+        UnsignedInt desiredAmount = data->m_effectValue;
+#endif
+        //Check to see if they have the cash, otherwise, take the remainder!
         cash = min( desiredAmount, cash );
         if( cash > 0 )
         {
@@ -1505,7 +1501,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
             controller->getScoreKeeper()->addMoneyEarned( cash );
 
           //Play the "cash stolen" EVA event if the local player is the victim!
-          if( target && target->isLocallyControlled() )
+          if( target && target->isLocallyViewed() )
           {
             TheEva->setShouldPlay( EVA_CashStolen );
           }
@@ -1517,7 +1513,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
           pos.set( object->getPosition() );
           pos.z += 20.0f; //add a little z to make it show up above the unit.
           TheInGameUI->addFloatingText( moneyString, &pos, GameMakeColor( 0, 255, 0, 255 ) );
-        
+
           //Display cash lost floating over the target
           moneyString.format( TheGameText->fetch( "GUI:LoseCash" ), cash );
           pos.set( target->getPosition() );
@@ -1542,7 +1538,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
       }
 
       static NameKeyType key_StickyBombUpdate = NAMEKEY( "StickyBombUpdate" );
-      if( m_targetID == INVALID_ID && !m_targetPos.x && !m_targetPos.y && !m_targetPos.z ) 
+      if( m_targetID == INVALID_ID && !m_targetPos.x && !m_targetPos.y && !m_targetPos.z )
       {
         //If there is no target object nor position, then we are detonating the existing charges.
         std::list<ObjectID>::iterator i;
@@ -1558,7 +1554,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
               update->detonate();
               okToLoseStealth = FALSE;
               //Note: while the objects are detonating, they will still exist in the game.
-              //Our update will be responsible for validating their existance and removing them.. 
+              //Our update will be responsible for validating their existance and removing them..
               //in case either the enemy player cleans one up, or after it's gone.
             }
           }
@@ -1579,8 +1575,8 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
           StickyBombUpdate *update = (StickyBombUpdate*)charge->findUpdateModule( key_StickyBombUpdate );
           if( !update )
           {
-            DEBUG_ASSERTCRASH( 0, 
-              ("Unit '%s' attempted to place remote charge but the charge '%s' requires a StickyBombUpdate module.", 
+            DEBUG_ASSERTCRASH( 0,
+              ("Unit '%s' attempted to place remote charge but the charge '%s' requires a StickyBombUpdate module.",
               object->getTemplate()->getName().str(),
               charge->getTemplate()->getName().str() ) );
             killSpecialObjects();
@@ -1593,7 +1589,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
       }
       break;
     }
-    
+
     case SPECIAL_DISGUISE_AS_VEHICLE:
     {
       Object *target = TheGameLogic->findObjectByID( m_targetID );
@@ -1633,7 +1629,7 @@ Object* SpecialAbilityUpdate::createSpecialObject()
     {
       //If we are dealing with persistent objects, and we have reached our
       //limit we can have, then don't allow any more to be created....
-      //We could add recycling code if need be.. but the logic that handles 
+      //We could add recycling code if need be.. but the logic that handles
       //canDoSpecialPowerXXX should prevent this triggering.
       return NULL;
     }
@@ -1657,7 +1653,7 @@ Object* SpecialAbilityUpdate::createSpecialObject()
       specialObject->setPosition( getObject()->getPosition() );
 
       specialObject->setOrientation( getObject()->getOrientation() );
-      
+
       //So we can get experience from it when it blows up (if applicable)
       //specialObject->setProducer( getObject() ); --This causes it to be an enemy which is naughty.
       ExperienceTracker *xpTracker = specialObject->getExperienceTracker();
@@ -1665,7 +1661,7 @@ Object* SpecialAbilityUpdate::createSpecialObject()
       {
         xpTracker->setExperienceSink( getObject()->getID() );
       }
-      
+
 
       PhysicsBehavior* specialObjectPhysics = specialObject->getPhysics();
       if (specialObjectPhysics)
@@ -1699,7 +1695,7 @@ void SpecialAbilityUpdate::killSpecialObjects()
       TheGameLogic->destroyObject( specialObject );
     }
   }
-  
+
   //Reset the list
   m_specialObjectIDList.clear();
   m_specialObjectEntries = 0;
@@ -1727,7 +1723,7 @@ UnsignedInt SpecialAbilityUpdate::getSpecialObjectCount() const
 }
 
 //-------------------------------------------------------------------------------------------------
-UnsignedInt SpecialAbilityUpdate::getSpecialObjectMax() const 
+UnsignedInt SpecialAbilityUpdate::getSpecialObjectMax() const
 {
   const SpecialAbilityUpdateModuleData* data = getSpecialAbilityUpdateModuleData();
   return data->m_maxSpecialObjects;
@@ -1834,7 +1830,7 @@ void SpecialAbilityUpdate::finishAbility()
 		if (ai)
 	  	ai->aiIdle(CMD_FROM_AI);
 	}
-	
+
 	//// Emit finished sound //Moved to StartPacking(), thank you, ML
 	//AudioEventRTS event = *getObject()->getTemplate()->getVoiceTaskComplete();
 	//event.setObjectID(getObject()->getID());
@@ -1906,10 +1902,10 @@ void SpecialAbilityUpdate::startFacing()
 	if (getObject()->getPhysics())
 		getObject()->getPhysics()->resetDynamicPhysics();
 
-// NO, do not do this; we promise Update modules that they will be 
+// NO, do not do this; we promise Update modules that they will be
 // called *exactly* once per frame... no more, no less! (srj)
 //ai->update();
-	
+
 	m_facingInitiated = true;
 	if( target )
 	{
@@ -1981,10 +1977,10 @@ void SpecialAbilityUpdate::endPreparation()
 
 		case SPECIAL_MISSILE_DEFENDER_LASER_GUIDED_MISSILES:
 		case SPECIAL_HACKER_DISABLE_BUILDING:
-		case SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK: 
+		case SPECIAL_BLACKLOTUS_DISABLE_VEHICLE_HACK:
 		case SPECIAL_BLACKLOTUS_CAPTURE_BUILDING:
 		case SPECIAL_BLACKLOTUS_STEAL_CASH_HACK:
-		case SPECIAL_INFANTRY_CAPTURE_BUILDING:	
+		case SPECIAL_INFANTRY_CAPTURE_BUILDING:
 			killSpecialObjects();
 			break;
 
@@ -2002,7 +1998,7 @@ void SpecialAbilityUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -2065,7 +2061,7 @@ void SpecialAbilityUpdate::xfer( Xfer *xfer )
   // capture flash phase
   xfer->xferReal( &m_captureFlashPhase );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -2076,4 +2072,4 @@ void SpecialAbilityUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialPowerUpdateModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialPowerUpdateModule.cpp
index 38af9894003..9d54a458341 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialPowerUpdateModule.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialPowerUpdateModule.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -41,14 +41,9 @@
 #include "GameLogic/Module/SpecialPowerUpdateModule.h"
 #include "GameLogic/Module/SpecialPowerModule.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
-SpecialPowerUpdateModule::SpecialPowerUpdateModule( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData ) 
+SpecialPowerUpdateModule::SpecialPowerUpdateModule( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
 }
 
@@ -61,9 +56,9 @@ SpecialPowerUpdateModule::~SpecialPowerUpdateModule()
 Bool SpecialPowerUpdateModule::doesSpecialPowerUpdatePassScienceTest() const
 {
 	//Kris: July 24, 2003 -- Added an additional optional check for objects with multiple SpecialPowerModules referencing
-	//the same SpecialPowerTemplate but with special ScienceType checks. An example of this is the three 
+	//the same SpecialPowerTemplate but with special ScienceType checks. An example of this is the three
 	//SpectreGunshipDeploymentUpdate modules inside AirF_AmericaCommandCenter. Each one has a different duration which
-	//is hooked into different objects. This sucked and became necessary because the way the stackable changable icon system 
+	//is hooked into different objects. This sucked and became necessary because the way the stackable changable icon system
 	//for multilevel buttons.
 	ScienceType science = getExtraRequiredScience();
 	if( science != SCIENCE_INVALID )
@@ -87,10 +82,10 @@ Bool SpecialPowerUpdateModule::doesSpecialPowerUpdatePassScienceTest() const
 void SpecialPowerUpdateModule::crc( Xfer *xfer )
 {
 
-	// extend base class 
+	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 //------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -107,7 +102,7 @@ void SpecialPowerUpdateModule::xfer( Xfer *xfer )
 
 	// extend base class
 	UpdateModule::xfer( xfer );
-}  // end xfer
+}
 
 //------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -118,4 +113,4 @@ void SpecialPowerUpdateModule::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipDeploymentUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipDeploymentUpdate.cpp
index 024367e7d66..8282a29d2fe 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipDeploymentUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipDeploymentUpdate.cpp
@@ -27,7 +27,7 @@
 // Desc:   Update module to handle deployment of the SpectreGunship Generals special power.from command center
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_DEATH_NAMES
 
@@ -44,7 +44,6 @@
 #include "GameClient/Drawable.h"
 #include "GameClient/ParticleSys.h"
 #include "GameClient/FXList.h"
-#include "GameClient/ParticleSys.h"
 
 #include "GameLogic/Locomotor.h"
 #include "GameLogic/GameLogic.h"
@@ -63,11 +62,6 @@
 #include "GameLogic/Module/ContainModule.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
@@ -82,7 +76,7 @@ SpectreGunshipDeploymentUpdateModuleData::SpectreGunshipDeploymentUpdateModuleDa
 }
 
 
-static const char* TheGunshipCreateLocTypeNames[] =
+static const char* const TheGunshipCreateLocTypeNames[] =
 {
 	"CREATE_AT_EDGE_NEAR_SOURCE",
   "CREATE_AT_EDGE_FARTHEST_FROM_SOURCE",
@@ -90,7 +84,7 @@ static const char* TheGunshipCreateLocTypeNames[] =
 	"CREATE_AT_EDGE_FARTHEST_FROM_TARGET",
 	NULL
 };
-
+static_assert(ARRAY_SIZE(TheGunshipCreateLocTypeNames) == GUNSHIP_CREATE_LOC_COUNT + 1, "Wrong array size");
 
 
 static Real zero = 0.0f;
@@ -99,7 +93,7 @@ static Real zero = 0.0f;
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "GunshipTemplateName",	    INI::parseAsciiString,				    NULL, offsetof( SpectreGunshipDeploymentUpdateModuleData, m_gunshipTemplateName ) },
 		{ "RequiredScience",					INI::parseScience,								NULL, offsetof( SpectreGunshipDeploymentUpdateModuleData, m_extraRequiredScience ) },
@@ -117,7 +111,7 @@ SpectreGunshipDeploymentUpdate::SpectreGunshipDeploymentUpdate( Thing *thing, co
 {
 	m_specialPowerModule = NULL;
   m_gunshipID  = INVALID_ID;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 SpectreGunshipDeploymentUpdate::~SpectreGunshipDeploymentUpdate( void )
@@ -153,7 +147,7 @@ Bool SpectreGunshipDeploymentUpdate::initiateIntentToDoSpecialPower(const Specia
 	}
 
 //	getObject()->getControllingPlayer()->getAcademyStats()->recordSpecialPowerUsed( specialPowerTemplate );
-	
+
 	if( !BitIsSet( commandOptions, COMMAND_FIRED_BY_SCRIPT ) )
 	{
 /******CHANGE*******/		m_initialTargetPosition.set( targetPos );
@@ -174,11 +168,11 @@ Bool SpectreGunshipDeploymentUpdate::initiateIntentToDoSpecialPower(const Specia
     m_gunshipID = INVALID_ID;
     newGunship = NULL;
   }
-  
+
 
   // Lets make a gunship, since we have none.
 	{
-		newGunship = TheThingFactory->newObject( gunshipTemplate, getObject()->getTeam() ); 
+		newGunship = TheThingFactory->newObject( gunshipTemplate, getObject()->getTeam() );
   }
 
   DEBUG_ASSERTCRASH( newGunship, ("SpecterGunshipUpdate failed to find or create a gunship object"));
@@ -205,9 +199,9 @@ Bool SpectreGunshipDeploymentUpdate::initiateIntentToDoSpecialPower(const Specia
 			  creationCoord = TheTerrainLogic->findFarthestEdgePoint(targetPos);
 			  break;
 	  }
-    
-    
-    
+
+
+
 
       // HERE WE NEED TO CREATE THE POINT FURTHER OFF THE MAP SO WE CANT SEE THE LAME HOVER AND ACCELLERATE BEHAVIOR
     Coord3D deltaToCreationPoint = m_initialTargetPosition;
@@ -226,7 +220,7 @@ Bool SpectreGunshipDeploymentUpdate::initiateIntentToDoSpecialPower(const Specia
     //ORIENTATION
 		Real orient = atan2( m_initialTargetPosition.y - creationCoord.y, m_initialTargetPosition.x - creationCoord.x);
     newGunship->setOrientation( orient );
-    
+
     // ID
     m_gunshipID = newGunship->getID();
 
@@ -254,7 +248,7 @@ Bool SpectreGunshipDeploymentUpdate::initiateIntentToDoSpecialPower(const Specia
 		SpecialPowerModule *spModule = (SpecialPowerModule*)spmInterface;
 		spModule->markSpecialPowerTriggered( &m_initialTargetPosition );
 	}
-  
+
   return TRUE;
 }
 
@@ -265,7 +259,7 @@ Bool SpectreGunshipDeploymentUpdate::initiateIntentToDoSpecialPower(const Specia
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime SpectreGunshipDeploymentUpdate::update()
-{	
+{
 //	const SpectreGunshipDeploymentUpdateModuleData *data = getSpectreGunshipDeploymentUpdateModuleData();
 
 
@@ -301,7 +295,7 @@ void SpectreGunshipDeploymentUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -321,7 +315,7 @@ void SpectreGunshipDeploymentUpdate::xfer( Xfer *xfer )
 	UpdateModule::xfer( xfer );
   xfer->xferObjectID( &m_gunshipID );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -331,4 +325,4 @@ void SpectreGunshipDeploymentUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
index 48aa5f3c643..201a1580eb2 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
@@ -27,12 +27,13 @@
 // Desc:   Update module to handle weapon firing of the SpectreGunship Generals special power.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_DEATH_NAMES
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameAudio.h"
+#include "Common/GameUtility.h"
 #include "Common/ThingTemplate.h"
 #include "Common/ThingFactory.h"
 #include "Common/Player.h"
@@ -45,7 +46,6 @@
 #include "GameClient/Drawable.h"
 #include "GameClient/ParticleSys.h"
 #include "GameClient/FXList.h"
-#include "GameClient/ParticleSys.h"
 
 #include "GameLogic/Locomotor.h"
 #include "GameLogic/GameLogic.h"
@@ -64,11 +64,6 @@
 #include "GameLogic/Module/ContainModule.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
@@ -105,7 +100,7 @@ static Real zero = 0.0f;
 {
 	ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
     { "SpecialPowerTemplate",           INI::parseSpecialPowerTemplate,   NULL, offsetof( SpectreGunshipUpdateModuleData, m_specialPowerTemplate ) },
     { "GattlingTemplateName",           INI::parseAsciiString,				    NULL, offsetof( SpectreGunshipUpdateModuleData, m_gattlingTemplateName ) },
@@ -122,7 +117,7 @@ static Real zero = 0.0f;
 		{ "GattlingStrafeFXParticleSystem",	INI::parseParticleSystemTemplate, NULL, offsetof( SpectreGunshipUpdateModuleData, m_gattlingStrafeFXParticleSystem ) },
 		{ "AttackAreaDecal",		            RadiusDecalTemplate::parseRadiusDecalTemplate,	NULL, offsetof( SpectreGunshipUpdateModuleData, m_attackAreaDecalTemplate ) },
 		{ "TargetingReticleDecal",		      RadiusDecalTemplate::parseRadiusDecalTemplate,	NULL, offsetof( SpectreGunshipUpdateModuleData, m_targetingReticleDecalTemplate ) },
-    
+
 
 
 
@@ -153,7 +148,7 @@ SpectreGunshipUpdate::SpectreGunshipUpdate( Thing *thing, const ModuleData* modu
 m_howitzerTrackerDecal.clear();
 #endif
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 SpectreGunshipUpdate::~SpectreGunshipUpdate( void )
@@ -231,7 +226,7 @@ Bool SpectreGunshipUpdate::initiateIntentToDoSpecialPower(const SpecialPowerTemp
     friend_enableAfterburners(TRUE);
 
     setLogicalStatus( GUNSHIP_STATUS_INSERTING ); // The gunship is en route to the tharget area, from map-edge
- 
+
 
     // TELL THE GUNNERS ABOARD THE GUNSHIP TO HOLD THEIR FIRE UNTIL ORBIT INSERTION
         ContainModuleInterface *shipContain = gunShip->getContain();
@@ -247,7 +242,7 @@ Bool SpectreGunshipUpdate::initiateIntentToDoSpecialPower(const SpecialPowerTemp
       }
       if ( gattlingTemplate )
       {
-        newGattling = TheThingFactory->newObject( gattlingTemplate, getObject()->getTeam() ); 
+        newGattling = TheThingFactory->newObject( gattlingTemplate, getObject()->getTeam() );
         DEBUG_ASSERTCRASH( gunShip, ("SpecterGunshipUpdate failed to find or create a GATTLING object"));
         shipContain->addToContain( newGattling );
         m_gattlingID = newGattling->getID();
@@ -278,7 +273,7 @@ Bool SpectreGunshipUpdate::initiateIntentToDoSpecialPower(const SpecialPowerTemp
 		SpecialPowerModule *spModule = (SpecialPowerModule*)spmInterface;
 		spModule->markSpecialPowerTriggered( &m_initialTargetPosition );
 	}
-  
+
 	return TRUE;
 }
 
@@ -290,11 +285,11 @@ Bool SpectreGunshipUpdate::isPowerCurrentlyInUse( const CommandButton *command )
 
 //-------------------------------------------------------------------------------------------------
 void SpectreGunshipUpdate::setSpecialPowerOverridableDestination( const Coord3D *loc )
-{ 
+{
 	Object *me = getObject();
 	if( !me->isDisabled() )
 	{
-		m_overrideTargetDestination = *loc; 
+		m_overrideTargetDestination = *loc;
 
 		if( me->getControllingPlayer()  &&  me->getControllingPlayer()->isLocalPlayer() )
 		{
@@ -344,7 +339,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter
 		return true;
 	}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterLiveMapEnemies"; }
 #endif
 };
@@ -358,7 +353,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter
 /** The update callback. */
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime SpectreGunshipUpdate::update()
-{	
+{
 	const SpectreGunshipUpdateModuleData *data = getSpectreGunshipUpdateModuleData();
 
    Object *gunship = getObject();
@@ -393,21 +388,21 @@ UpdateSleepTime SpectreGunshipUpdate::update()
       {
 
 
-  //   init'l    apogee                                          
-  //   target *<-------->*                                               
-  //    posi  ^\         /                                     
-  //          | \      /                                        
-  //  perigee |  \   /                                        
-  //          |   */ declination                                          
-  //          |  / \                                           
-  //          v/    * m_satelliteposition                                         
-  //          *                                                
-  //          |                                              
-  //          |                                              
-  //          |                                              
-  //          |                                              
-  //          |                                              
-  //          * gunship->getPosition()                                             
+  //   init'l    apogee
+  //   target *<-------->*
+  //    posi  ^\         /
+  //          | \      /
+  //  perigee |  \   /
+  //          |   */ declination
+  //          |  / \
+  //          v/    * m_satelliteposition
+  //          *
+  //          |
+  //          |
+  //          |
+  //          |
+  //          |
+  //          * gunship->getPosition()
 
         //perigee is the point in the orbital arc nearest the satellite being captured
         Coord3D perigee = *gunship->getPosition();
@@ -429,7 +424,7 @@ UpdateSleepTime SpectreGunshipUpdate::update()
         declination.z = zero;
         declination.x = ( perigee.x * n1 ) + ( apogee.x * n2 );
         declination.y = ( perigee.y * n1 ) + ( apogee.y * n2 );
-      
+
         //scale out to the orbital radius
         Real orbitalRadius = data->m_gunshipOrbitRadius;
         declination.x *= orbitalRadius;
@@ -437,10 +432,10 @@ UpdateSleepTime SpectreGunshipUpdate::update()
 
         m_satellitePosition.x = m_initialTargetPosition.x + declination.x;
         m_satellitePosition.y = m_initialTargetPosition.y + declination.y;
-   
+
         if ( shipAI)
         {
-           shipAI->aiMoveToPosition( &m_satellitePosition, CMD_FROM_AI ); 
+           shipAI->aiMoveToPosition( &m_satellitePosition, CMD_FROM_AI );
         }
 
         Real constraintRadius = data->m_attackAreaRadius - data->m_targetingReticleRadius;
@@ -452,7 +447,7 @@ UpdateSleepTime SpectreGunshipUpdate::update()
         {
           overrideTargetDelta.normalize();
           overrideTargetDelta.x *= constraintRadius;
-          overrideTargetDelta.y *= constraintRadius; 
+          overrideTargetDelta.y *= constraintRadius;
 
           m_overrideTargetDestination.x = m_initialTargetPosition.x - overrideTargetDelta.x;
           m_overrideTargetDestination.y = m_initialTargetPosition.y - overrideTargetDelta.y;
@@ -492,30 +487,30 @@ UpdateSleepTime SpectreGunshipUpdate::update()
 
         }
 
-      } // endif status == ORBITING || INSERTING
+      }
 
 
       if ( m_status == GUNSHIP_STATUS_ORBITING )
       {
-        Object *validTargetObject = NULL; 
+        Object *validTargetObject = NULL;
 
 
         if ( TheGameLogic->getFrame() >= m_orbitEscapeFrame )
         {
           cleanUp();
-          setLogicalStatus( GUNSHIP_STATUS_DEPARTING ); 
+          setLogicalStatus( GUNSHIP_STATUS_DEPARTING );
 
           // CEASE FIRE, RETURN TO BASE
           disengageAndDepartAO( gunship );
 
 
-        }//endif escapeframe
+        }
         else
         {
 
           // ONLY EVERY FEW FRAMES DO WE RE_EVALUATE THE TARGET OBJECT
           if ( TheGameLogic->getFrame() %data->m_howitzerFiringRate < ONE )
-          { 
+          {
 
             m_positionToShootAt = m_overrideTargetDestination; // unless we get a hit, below
 
@@ -525,33 +520,33 @@ UpdateSleepTime SpectreGunshipUpdate::update()
 	          PartitionFilterFreeOfFog filterFogged( gunship->getControllingPlayer()->getPlayerIndex() );
 	          PartitionFilter *filters[6];
 	          Int numFilters = 0;
-	          filters[numFilters++] = &filterObvious;	
-	          filters[numFilters++] = &filterStealth;	
-	          filters[numFilters++] = &filterAttack;	
-	          filters[numFilters++] = &filterFogged;	
+	          filters[numFilters++] = &filterObvious;
+	          filters[numFilters++] = &filterStealth;
+	          filters[numFilters++] = &filterAttack;
+	          filters[numFilters++] = &filterFogged;
 	          filters[numFilters] = NULL;
 
 
 
             // THIS WILL FIND A VALID TARGET WITHIN THE TARGETING RETICLE
-	          ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(&m_overrideTargetDestination, 
+	          ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(&m_overrideTargetDestination,
               data->m_targetingReticleRadius,
-              FROM_BOUNDINGSPHERE_2D, 
-              filters, 
+              FROM_BOUNDINGSPHERE_2D,
+              filters,
               ITER_SORTED_NEAR_TO_FAR);
 	          MemoryPoolObjectHolder holder(iter);
-	          for (Object *theEnemy = iter->first(); theEnemy; theEnemy = iter->next()) 
+	          for (Object *theEnemy = iter->first(); theEnemy; theEnemy = iter->next())
 	          {
               if ( theEnemy && isFairDistanceFromShip( theEnemy ) )
               {
                 validTargetObject = theEnemy;
                 break;
               }
-	          }	
-            
+	          }
+
 
 
-            // WE WANT THE WIDE_RANGE AUTOACQUIRE POWER DISABLED FOR HUMAN PLAYERS 
+            // WE WANT THE WIDE_RANGE AUTOACQUIRE POWER DISABLED FOR HUMAN PLAYERS
             // SO THAT THE SPECTREGUNSHIP REQUIRES BABYSITTING AT ALL TIMES
             if (gunship->getControllingPlayer()->getPlayerType() != PLAYER_HUMAN )
             {
@@ -559,13 +554,13 @@ UpdateSleepTime SpectreGunshipUpdate::update()
               {
                 // set a flag to start the targeting decal fading, since there is nothing to kill there
                 // THIS WILL FIND A VALID TARGET ANYWHERE INSIDE THE TARGETING AREA (THE BIG CIRCLE)
-	              ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(&m_initialTargetPosition, 
-                  data->m_attackAreaRadius, 
-                  FROM_BOUNDINGSPHERE_2D, 
-                  filters, 
+	              ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(&m_initialTargetPosition,
+                  data->m_attackAreaRadius,
+                  FROM_BOUNDINGSPHERE_2D,
+                  filters,
                   ITER_SORTED_NEAR_TO_FAR);
 	              MemoryPoolObjectHolder holder(iter);
-	              for (Object *theEnemy = iter->first(); theEnemy; theEnemy = iter->next()) 
+	              for (Object *theEnemy = iter->first(); theEnemy; theEnemy = iter->next())
 	              {
                   if ( theEnemy && isFairDistanceFromShip( theEnemy ) )
                   {
@@ -575,12 +570,12 @@ UpdateSleepTime SpectreGunshipUpdate::update()
 
                     break;
                   }
-	              }	
+	              }
               }
             }
 
 
-            
+
             //lets keep a constant barrage of gattling bullets on the current aim location
 				    if( gattlingAI )
 				    {
@@ -613,7 +608,7 @@ UpdateSleepTime SpectreGunshipUpdate::update()
             }
 
 
-          }//endif frame modulator
+          }
 
 
 
@@ -646,8 +641,8 @@ UpdateSleepTime SpectreGunshipUpdate::update()
               m_gattlingTargetPosition.add( &delta );
             }
 
-			
-			const Player *localPlayer = ThePlayerList->getLocalPlayer();
+
+			const Player *localPlayer = rts::getObservedOrLocalPlayer();
 
 			//Make sure the gunship is visible to the player before drawing effects.
 			if ( gunship->getShroudedStatus( localPlayer->getPlayerIndex() ) <= OBJECTSHROUD_PARTIAL_CLEAR )
@@ -667,15 +662,15 @@ UpdateSleepTime SpectreGunshipUpdate::update()
 			}
 
           }
-        }// end else
+        }
+
 
-        
-      }//not orbiting
+      }
       else if ( m_status == GUNSHIP_STATUS_DEPARTING )
       {
         if ( isPointOffMap( *gunship->getPosition() ) )
         {
-          
+
           TheGameLogic->destroyObject( gunship );
           setLogicalStatus( GUNSHIP_STATUS_IDLE );
 
@@ -686,7 +681,7 @@ UpdateSleepTime SpectreGunshipUpdate::update()
         }
       }
 
-   } // endif gunship
+   }
    else if ( m_status != GUNSHIP_STATUS_IDLE )
    {
      //OH MY GOODNESS, THE GUNSHIP MUST HAVE GOTTEN SHOT DOWN!
@@ -801,7 +796,7 @@ void SpectreGunshipUpdate::disengageAndDepartAO( Object *gunship )
     exitPoint.add( gunship->getPosition() );
 
     shipAI->aiMoveToPosition( &exitPoint, CMD_FROM_AI );
-    
+
 
 
   }
@@ -850,12 +845,12 @@ void SpectreGunshipUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Can't flat-save decals, that's a hella crash (they aren't saved (no memory) and they have a pointer in them).  And half the class wasn't saved.
 */
 // ------------------------------------------------------------------------------------------------
@@ -872,8 +867,8 @@ void SpectreGunshipUpdate::xfer( Xfer *xfer )
 	UpdateModule::xfer( xfer );
 
 
-  
-  
+
+
   // The initial target destination.
 	xfer->xferCoord3D( &m_initialTargetPosition );
 	// The manual override target destination.
@@ -890,7 +885,7 @@ void SpectreGunshipUpdate::xfer( Xfer *xfer )
 	{
 		xfer->xferUser( &m_attackAreaDecal, sizeof( RadiusDecal ) );
 		xfer->xferUser( &m_targetingReticleDecal, sizeof( RadiusDecal ) );
-		
+
 #if defined TRACKERS
 		xfer->xferUser( &m_howitzerTrackerDecal, sizeof( RadiusDecal ) );
 #endif
@@ -904,7 +899,7 @@ void SpectreGunshipUpdate::xfer( Xfer *xfer )
 		xfer->xferObjectID( &m_gattlingID );
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -915,4 +910,4 @@ void SpectreGunshipUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpyVisionUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpyVisionUpdate.cpp
index e9f5effa2b3..bd35bb5849a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpyVisionUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpyVisionUpdate.cpp
@@ -24,13 +24,13 @@
 
 // FILE: SpyVisionUpdate.cpp /////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, September 2002
-// Desc:   Special Power will spy on the vision of all enemy players.  
+// Desc:   Special Power will spy on the vision of all enemy players.
 //				Putting a SpecialPower in a behavior takes a big huge amount of code duplication and
 //				has no precedent.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -38,11 +38,6 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Module/SpyVisionUpdate.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -113,8 +108,8 @@ void SpyVisionUpdate::setDisabledUntilFrame( UnsignedInt frame )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void SpyVisionUpdate::onCapture( Player *oldOwner, Player *newOwner ) 
-{ 
+void SpyVisionUpdate::onCapture( Player *oldOwner, Player *newOwner )
+{
 	if( m_currentlyActive )
 	{
 		// If on, flick the switch real fast to get everything to update for the new owner
@@ -142,11 +137,11 @@ UpdateSleepTime SpyVisionUpdate::update( void )
 
 	//Once disable has complete and we are waking up from it, then reset the interval so
 	//it has to wait before going on again. If it doesn't have an interval, we turn it on
-	//immediately, but only for self powered objects. 
+	//immediately, but only for self powered objects.
 	if( m_resetTimersNextUpdate )
 	{
 		m_resetTimersNextUpdate = FALSE;
-		
+
 		if( data->m_selfPowered )
 		{
 			if( data->m_selfPoweredInterval == 0 )
@@ -196,7 +191,7 @@ void SpyVisionUpdate::doActivationWork( Player *playerToSetFor, Bool setting )
 	const SpyVisionUpdateModuleData *data = getSpyVisionUpdateModuleData();
 	if( playerToSetFor == NULL  ||  ThePlayerList == NULL )
 		return;
-	
+
 	for (Int i=0; i < ThePlayerList->getPlayerCount(); ++i)
 	{
 		Player *player = ThePlayerList->getNthPlayer(i);
@@ -217,7 +212,7 @@ void SpyVisionUpdate::onDelete( void )
 	{
 		doActivationWork( getObject()->getControllingPlayer(), FALSE );
 	}
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 void SpyVisionUpdate::upgradeImplementation()
@@ -238,7 +233,7 @@ void SpyVisionUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -267,7 +262,7 @@ void SpyVisionUpdate::xfer( Xfer *xfer )
 		xfer->xferUnsignedInt( &m_disabledUntilFrame );
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -278,4 +273,4 @@ void SpyVisionUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
index d4e41809890..15eb2a74ebe 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
@@ -27,11 +27,12 @@
 // Desc:	 An update that checks for a status bit to stealth the owning object
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_STEALTHLEVEL_NAMES
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
+#include "Common/GameUtility.h"
 #include "Common/MiscAudio.h"
 #include "Common/Radar.h"
 #include "Common/ThingTemplate.h"
@@ -51,18 +52,13 @@
 #include "Common/PlayerList.h"
 #include "Common/Player.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
-void StealthDetectorUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void StealthDetectorUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DetectionRate",							INI::parseDurationUnsignedInt,			NULL, offsetof( StealthDetectorUpdateModuleData, m_updateRate ) },
 		{ "DetectionRange",							INI::parseReal,											NULL, offsetof( StealthDetectorUpdateModuleData, m_detectionRange ) },
@@ -92,7 +88,7 @@ StealthDetectorUpdate::StealthDetectorUpdate( Thing *thing, const ModuleData* mo
 	// start these guys with random phasings so that we don't
 	// have all of 'em check on the same frame.
 	setWakeFrame(getObject(), m_enabled ? UPDATE_SLEEP(GameLogicRandomValue(1, data->m_updateRate)) : UPDATE_SLEEP_FOREVER);
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -102,9 +98,9 @@ StealthDetectorUpdate::~StealthDetectorUpdate( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StealthDetectorUpdate::setSDEnabled( Bool enabled ) 
-{ 
-	m_enabled = enabled; 
+void StealthDetectorUpdate::setSDEnabled( Bool enabled )
+{
+	m_enabled = enabled;
 	setWakeFrame(getObject(), m_enabled ? UPDATE_SLEEP_NONE : UPDATE_SLEEP_FOREVER);
 }
 
@@ -117,11 +113,11 @@ void StealthDetectorUpdate::setSDEnabled( Bool enabled )
 class PartitionFilterStealthedOrStealthGarrisoned : public PartitionFilter
 {
 public:
-	PartitionFilterStealthedOrStealthGarrisoned() { } 
+	PartitionFilterStealthedOrStealthGarrisoned() { }
 
 	virtual Bool allow(Object *objOther);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterStealthedOrStealthGarrisoned"; }
 #endif
 };
@@ -150,8 +146,8 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 	Object* self = getObject();
 
 	if (self->isEffectivelyDead())
-		return UPDATE_SLEEP_FOREVER; 
-	
+		return UPDATE_SLEEP_FOREVER;
+
 	// We have to wait until we are fully constructed, but we will detect the moment we finish
 	if( self->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
 		return UPDATE_SLEEP_NONE;
@@ -180,7 +176,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 			else if( !data->m_canDetectWhileTransported )
 			{
 				//We are in a normal container and can't detect!
-				return UPDATE_SLEEP(data->m_updateRate);	
+				return UPDATE_SLEEP(data->m_updateRate);
 			}
 		}
 	}
@@ -201,7 +197,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 	Bool foundSomeone = FALSE;
 
 	SimpleObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(
-								self, visionRange, FROM_CENTER_2D, filters); 
+								self, visionRange, FROM_CENTER_2D, filters);
 	MemoryPoolObjectHolder hold(iter);
 	for (Object *them = iter->first(); them; them = iter->next())
 	{
@@ -209,7 +205,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 			continue;
 
 		StealthUpdate* stealth = them->getStealth();
-		if ( stealth ) 
+		if ( stealth )
 		{
 
 			// we have found someone
@@ -223,7 +219,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 			{
 
 				// for the player revealing the stealth unit do some UI feedback
-				if( ThePlayerList->getLocalPlayer() == self->getControllingPlayer() &&
+				if( rts::getObservedOrLocalPlayer() == self->getControllingPlayer() &&
 						self->getRelationship( them ) != ALLIES )
 				{
 					Bool doFeedback = TRUE;
@@ -260,12 +256,12 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
             {
               TheEva->setShouldPlay( message );
             }
-					}  // end if				 
+					}
 
-				}  // end if
+				}
 
 				// for the unit being revealed, do some UI feedback
-				if( ThePlayerList->getLocalPlayer() == them->getControllingPlayer() &&
+				if( rts::getObservedOrLocalPlayer() == them->getControllingPlayer() &&
 						self->getRelationship( them ) != ALLIES )
 				{
  					Bool doFeedback = TRUE;
@@ -278,7 +274,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 						doFeedback = TheRadar->tryEvent( RADAR_EVENT_STEALTH_NEUTRALIZED, them->getPosition() );
 					else
  						TheRadar->createEvent( them->getPosition(), RADAR_EVENT_STEALTH_NEUTRALIZED );
-					
+
 					// do audio and UI message if we need to do feedback
 					if( doFeedback )
 					{
@@ -296,15 +292,15 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
             {
               TheEva->setShouldPlay( message );
             }
-					}  // end if
-				
-				}  // end if
-					 
-			}  // end if, them was not previously detected
+					}
+
+				}
+
+			}
 
 			// updateRate PLUS 1 is necessary to ensure it stays detected 'till we are called again...
 			stealth->markAsDetected(data->m_updateRate + 1);
-			
+
 			/** @todo srj -- evil hack here... this whole heat-vision thing is fucked.
 				don't want it on mines but no good way to do that. hack for now. */
 			Drawable *theirDraw = them->getDrawable();
@@ -331,7 +327,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 				}
 			}
 
-		}//end if them has stealthupdate
+		}
 		else // perhaps they are garrisoning something stealthy, eh?
 		{
 			ContainModuleInterface *contain = them->getContain();
@@ -343,7 +339,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 					rider = *it;
 
           StealthUpdate *stealth = rider->getStealth();
-					if ( stealth ) 
+					if ( stealth )
 					{
 						// we have found someone
 						foundSomeone = TRUE;
@@ -359,7 +355,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 	}
 
 
-  const Player *localPlayer = ThePlayerList->getLocalPlayer();
+  const Player *localPlayer = rts::getObservedOrLocalPlayer();
 
 	//Make sure the detector is visible to the local player before we add effects or sounds.
 	if ( self->getShroudedStatus( localPlayer->getPlayerIndex() ) <= OBJECTSHROUD_PARTIAL_CLEAR )
@@ -403,7 +399,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 					  sys->attachToObject( self );
 
 				  sys->setPosition( &bonePosition );
-				  
+
 			  }
 		  }
 
@@ -418,7 +414,7 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 
     }
 
-	} // end if doIRFX
+	}
 
 
 	return UPDATE_SLEEP(data->m_updateRate);
@@ -434,7 +430,7 @@ void StealthDetectorUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -455,7 +451,7 @@ void StealthDetectorUpdate::xfer( Xfer *xfer )
 	// enabled
 	xfer->xferBool( &m_enabled );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -466,4 +462,4 @@ void StealthDetectorUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp
index 1b36389eea7..a390bc943f5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp
@@ -27,13 +27,14 @@
 // Desc:	 An update that checks for a status bit to stealth the owning object
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_STEALTHLEVEL_NAMES
 #define DEFINE_OBJECT_STATUS_NAMES
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Radar.h"
@@ -60,19 +61,11 @@
 #include "GameLogic/Module/SpawnBehavior.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 StealthUpdateModuleData::StealthUpdateModuleData()
 {
-		//Added By Sadullah Nader
-		//Initialization(s) inserted
 		m_disguiseFX = NULL;
     m_disguiseRevealFX = NULL;
-    //
     m_stealthDelay		= UINT_MAX;
     m_stealthLevel		= 0;
     m_stealthSpeed		= 0.0f;
@@ -93,15 +86,15 @@ StealthUpdateModuleData::StealthUpdateModuleData()
 
 
 //-------------------------------------------------------------------------------------------------
-void StealthUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void StealthUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "StealthDelay",									INI::parseDurationUnsignedInt,	NULL, offsetof( StealthUpdateModuleData, m_stealthDelay ) },
 		{ "MoveThresholdSpeed",						INI::parseVelocityReal,					NULL, offsetof( StealthUpdateModuleData, m_stealthSpeed ) },
-		{ "StealthForbiddenConditions",		INI::parseBitString32,					TheStealthLevelNames, offsetof( StealthUpdateModuleData, m_stealthLevel) }, 
+		{ "StealthForbiddenConditions",		INI::parseBitString32,					TheStealthLevelNames, offsetof( StealthUpdateModuleData, m_stealthLevel) },
 		{ "HintDetectableConditions",	  	ObjectStatusMaskType::parseFromINI,	NULL, offsetof( StealthUpdateModuleData, m_hintDetectableStates) },
 		{ "RequiredStatus",								ObjectStatusMaskType::parseFromINI,	NULL, offsetof( StealthUpdateModuleData, m_requiredStatus ) },
 		{ "ForbiddenStatus",							ObjectStatusMaskType::parseFromINI,	NULL, offsetof( StealthUpdateModuleData, m_forbiddenStatus ) },
@@ -137,10 +130,7 @@ StealthUpdate::StealthUpdate( Thing *thing, const ModuleData* moduleData ) : Upd
 	//Must be enabled manually if using disguise system (bomb truck uses)
 	m_enabled = !data->m_teamDisguised;
 
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_detectionExpiresFrame = 0;
-	//
 	m_pulsePhaseRate		= 0.2f;
 	m_pulsePhase				= GameClientRandomValueReal(0, PI);
 
@@ -152,7 +142,7 @@ StealthUpdate::StealthUpdate( Thing *thing, const ModuleData* moduleData ) : Upd
 	m_disguiseHalfpointReached  = false;
 	m_nextBlackMarketCheckFrame = 0;
 	m_framesGranted = 0;
-	
+
 	if( data->m_innateStealth )
 	{
 		//Giving innate stealth units this status bit allows other code to easily check the status bit.
@@ -168,7 +158,7 @@ StealthUpdate::StealthUpdate( Thing *thing, const ModuleData* moduleData ) : Upd
 	// we do not need to restore a disguise
 	m_xferRestoreDisguise = FALSE;
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -240,7 +230,7 @@ void StealthUpdate::receiveGrant( Bool active, UnsignedInt frames )
   const ContainModuleInterface *contain = obj->getContain();
   if ( contain && contain->isRiderChangeContain() )
   {
-    const Object *rider = contain->friend_getRider(); 
+    const Object *rider = contain->friend_getRider();
     if ( rider )
     {
       StealthUpdate *riderStealth = rider->getStealth();
@@ -294,18 +284,18 @@ Bool StealthUpdate::allowedToStealth( Object *stealthOwner ) const
 		//Doesn't stealth while aggressive (includes approaching).
 		return FALSE;
 	}
-	
+
 	if( flags & STEALTH_NOT_WHILE_USING_ABILITY && self->getStatusBits().test( OBJECT_STATUS_IS_USING_ABILITY ) )
 	{
 		//Doesn't stealth while using a special ability (starting with preparation, which takes place after unpacking).
 		return FALSE;
 	}
-	
+
 	if( flags & STEALTH_ONLY_WITH_BLACK_MARKET && m_nextBlackMarketCheckFrame < now )
 	{
 		//randomize timer a little incase we have a whole bunch on the same frame.
-		m_nextBlackMarketCheckFrame += data->m_blackMarketCheckFrames + GameLogicRandomValue( 0, 10 ); 
-		
+		m_nextBlackMarketCheckFrame += data->m_blackMarketCheckFrames + GameLogicRandomValue( 0, 10 );
+
 		//If we can't find an active black market, then we can't stealth.
 		Bool blackMarket = FALSE;
 		self->getControllingPlayer()->iterateObjects( isBlackMarket, &blackMarket );
@@ -319,16 +309,18 @@ Bool StealthUpdate::allowedToStealth( Object *stealthOwner ) const
 	{
 		return FALSE;
 	}
-	
+
 	if( flags & STEALTH_NOT_WHILE_TAKING_DAMAGE && self->getBodyModule()->getLastDamageTimestamp() >= now - 1 )
 	{
+#if PRESERVE_RETAIL_BEHAVIOR
 		//Only if it's not healing damage.
 		if( self->getBodyModule()->getLastDamageInfo()->in.m_damageType != DAMAGE_HEALING )
+#endif
 		{
 			//Can't stealth if we just took damage in the last frame or two.
 			if( self->getBodyModule()->getLastDamageTimestamp() != 0xffffffff )
 			{
-				//But it's initialized to 0xffffffff so we don't think we took damage on the first frame. 
+				//But it's initialized to 0xffffffff so we don't think we took damage on the first frame.
 				return FALSE;
 			}
 		}
@@ -337,11 +329,11 @@ Bool StealthUpdate::allowedToStealth( Object *stealthOwner ) const
 	//We need all required status or else we fail
 	// If we have any requirements
 	if( data->m_requiredStatus.any()  &&  !self->getStatusBits().testForAll( data->m_requiredStatus ) )
-		return FALSE; 
+		return FALSE;
 
 	//If we have any forbidden statii, then fail
 	if( self->getStatusBits().testForAny( data->m_forbiddenStatus ) )
-		return FALSE; 
+		return FALSE;
 
 
 	//Do a quick preliminary test to see if we are restricted by firing particular weapons and we fired a shot last frame or this frame.
@@ -411,10 +403,10 @@ Bool StealthUpdate::allowedToStealth( Object *stealthOwner ) const
 
 
 	const PhysicsBehavior *physics = self->getPhysics();
-	if ((flags & STEALTH_NOT_WHILE_MOVING) && physics != NULL && 
+	if ((flags & STEALTH_NOT_WHILE_MOVING) && physics != NULL &&
 					physics->getVelocityMagnitude() > getStealthUpdateModuleData()->m_stealthSpeed)
 		return FALSE;
-	
+
 	if( self->testScriptStatusBit(OBJECT_STATUS_SCRIPT_UNSTEALTHED))
 	{
 		//We can't stealth because a script disabled this ability for this object!
@@ -428,14 +420,14 @@ Bool StealthUpdate::allowedToStealth( Object *stealthOwner ) const
 //---------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------------------------------
-void StealthUpdate::hintDetectableWhileUnstealthed() 
+void StealthUpdate::hintDetectableWhileUnstealthed()
 {
 	Object *self = getObject();
 	const StealthUpdateModuleData *md = getStealthUpdateModuleData();
 
 	if( self && md->m_hintDetectableStates.testForAny( self->getStatusBits() ) )
 	{
-		if ( self->getControllingPlayer() == ThePlayerList->getLocalPlayer() )
+		if ( self->getControllingPlayer() == rts::getObservedOrLocalPlayer() )
 		{
 			Drawable *selfDraw = self->getDrawable();
 			if ( selfDraw )
@@ -451,7 +443,7 @@ void StealthUpdate::hintDetectableWhileUnstealthed()
 
 Real StealthUpdate::getFriendlyOpacity() const
 {
-	return getStealthUpdateModuleData()->m_friendlyOpacityMin; 
+	return getStealthUpdateModuleData()->m_friendlyOpacityMin;
 }
 
 
@@ -463,7 +455,7 @@ StealthLookType StealthUpdate::calcStealthedStatusForPlayer(const Object* obj, c
 		for stealthy things, there are these distinct "logical" states:
 
 		-- not stealthed at all (ie, totally visible)
-		-- stealthed 
+		-- stealthed
 		-- stealthed-but-detected
 
 		and the following visual states:
@@ -474,7 +466,7 @@ StealthLookType StealthUpdate::calcStealthedStatusForPlayer(const Object* obj, c
 		-- stealthed-but-visible-to-everyone-due-to-being-detected (sd)
 
 		Let's be ubergeeks and make a matrix of the possibilities:
-				
+
 								Ally		Nonally
 		normal:			(n)			(n)
 		stealthed:	(sv)		(i)
@@ -484,7 +476,7 @@ StealthLookType StealthUpdate::calcStealthedStatusForPlayer(const Object* obj, c
 		Or, to put it another way:
 
 		If normal, you always appear normal.
-		If stealthed (and not detected), you appear as (sv) to allies and (i) to others. 
+		If stealthed (and not detected), you appear as (sv) to allies and (i) to others.
 		If detected, you always appears as (sd).
 
 		Sorry, there is one more condition, stealthed, but visible to friendly folks, YET detected
@@ -493,7 +485,7 @@ StealthLookType StealthUpdate::calcStealthedStatusForPlayer(const Object* obj, c
 
 
 	*/
-	
+
 
 	if (obj->isEffectivelyDead())
 		return STEALTHLOOK_NONE;			// making sure he turns visible when he dies
@@ -610,7 +602,7 @@ UpdateSleepTime StealthUpdate::update( void )
 		if( wasHidden && draw )
 			draw->setDrawableHidden( TRUE );
 
-	}  // end if
+	}
 
 	Object *self = getObject();
 	Object *stealthOwner = calcStealthOwner();
@@ -765,7 +757,7 @@ UpdateSleepTime StealthUpdate::update( void )
 	else
 	{
 		m_stealthAllowedFrame = now + stealthDelay;
-		
+
 		// if you are destealthing on your own free will, play sound for all to hear
 		if( self->getStatusBits().test( OBJECT_STATUS_STEALTHED ) )
 		{
@@ -775,7 +767,7 @@ UpdateSleepTime StealthUpdate::update( void )
 		}
 
 		self->clearStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ) );
-		
+
 		hintDetectableWhileUnstealthed();
 	}
 
@@ -834,7 +826,7 @@ UpdateSleepTime StealthUpdate::update( void )
 
 	if (draw)
 	{
-		StealthLookType stealthLook = calcStealthedStatusForPlayer( self, ThePlayerList->getLocalPlayer() );
+		StealthLookType stealthLook = calcStealthedStatusForPlayer( self, rts::getObservedOrLocalPlayer() );
 		draw->setStealthLook( stealthLook );
 	}
 
@@ -920,7 +912,7 @@ void StealthUpdate::markAsDetected(UnsignedInt numFrames)
 	if( orderIdlesToAttack )
 	{
 		// This can't be a partitionmanager thing, because we need to know which objects can see
-		// us. Therefore, walk the play list, and for each player that considers us an enemy, 
+		// us. Therefore, walk the play list, and for each player that considers us an enemy,
 		// check if any of their units can see us.
 
 		Int numPlayers = ThePlayerList->getPlayerCount();
@@ -957,7 +949,7 @@ void StealthUpdate::disguiseAsObject( const Object *target )
 			m_disguiseAsTemplate				= target->getTemplate();
 			m_disguiseAsPlayerIndex			= target->getControllingPlayer()->getPlayerIndex();
 		}
-		
+
 		m_enabled										= true;
 		m_transitioningToDisguise		= true; //Means we are gaining disguise over time.
 		m_disguiseTransitionFrames	= data->m_disguiseTransitionFrames;
@@ -981,7 +973,7 @@ void StealthUpdate::disguiseAsObject( const Object *target )
 	{
 		TheControlBar->markUIDirty();
 	}
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -999,7 +991,7 @@ void StealthUpdate::changeVisualDisguise()
 		Player *player = ThePlayerList->getNthPlayer( m_disguiseAsPlayerIndex );
 
 		ModelConditionFlags flags = draw->getModelConditionFlags();
-		
+
 		//Get rid of the old instance!
 		TheGameClient->destroyDrawable( draw );
 
@@ -1053,7 +1045,7 @@ void StealthUpdate::changeVisualDisguise()
 	{
 		m_disguiseAsPlayerIndex = -1;
 		ModelConditionFlags flags = draw->getModelConditionFlags();
-		
+
 		//Get rid of the old instance!
 		TheGameClient->destroyDrawable( draw );
 
@@ -1082,7 +1074,7 @@ void StealthUpdate::changeVisualDisguise()
 			//UGH!
 			//A concrete example is the bomb truck. Different payloads are displayed based on which upgrades have been
 			//made. When the bomb truck disguises as something else, these subobjects are lost because the vector is
-			//stored in W3DDrawModule. When we revert back to the original bomb truck, we call this function to 
+			//stored in W3DDrawModule. When we revert back to the original bomb truck, we call this function to
 			//recalculate those upgraded subobjects.
 			self->forceRefreshSubObjectUpgradeStatus();
 		}
@@ -1135,7 +1127,7 @@ void StealthUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -1167,7 +1159,7 @@ void StealthUpdate::xfer( Xfer *xfer )
 
 	// pulse phase
 	xfer->xferReal( &m_pulsePhase );
-	
+
 	// disguise as player index
 	xfer->xferInt( &m_disguiseAsPlayerIndex );
 
@@ -1185,14 +1177,14 @@ void StealthUpdate::xfer( Xfer *xfer )
 			if( m_disguiseAsTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "StealthUpdate::xfer - Unknown template '%s'\n", name.str() ));
+				DEBUG_CRASH(( "StealthUpdate::xfer - Unknown template '%s'", name.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// disguise transition frames
 	xfer->xferUnsignedInt( &m_disguiseTransitionFrames );
@@ -1211,7 +1203,7 @@ void StealthUpdate::xfer( Xfer *xfer )
 		xfer->xferUnsignedInt( &m_framesGranted );
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -1232,4 +1224,4 @@ void StealthUpdate::loadPostProcess( void )
 	if( isDisguised() )
 		m_xferRestoreDisguise = TRUE;
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp
index e3fe0ab8c79..a94c348d04b 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StickyBombUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameLogic/Module/StickyBombUpdate.h"
 
@@ -56,10 +56,7 @@ StickyBombUpdate::StickyBombUpdate( Thing *thing, const ModuleData *moduleData )
 {
 	m_targetID		= INVALID_ID;
 	m_dieFrame		= 0;
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_nextPingFrame = 0;
-	//
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 }
 
@@ -110,7 +107,7 @@ void StickyBombUpdate::initStickyBomb( Object *target, const Object *bomber, con
 	{
 		//we are a timer bomb
 		m_dieFrame = update->getDieFrame();
-	
+
 		//Calculate the number of seconds (rounded down)
 		UnsignedInt pings = (m_dieFrame - now) / LOGICFRAMES_PER_SECOND;
 		//Now determine the next frame we will make a "ping" sound.
@@ -158,8 +155,8 @@ void StickyBombUpdate::initStickyBomb( Object *target, const Object *bomber, con
 		AudioEventRTS soundCreateBomb = *(getObject()->getTemplate()->getPerUnitSound("StickyBombCreated"));
 		soundCreateBomb.setPosition( getObject()->getPosition() );
 		TheAudio->addAudioEvent(&soundCreateBomb);
-		
-	}	
+
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -261,7 +258,7 @@ void StickyBombUpdate::detonate()
 			damageInfo.in.m_sourceID = getObject()->getID();
 			damageInfo.in.m_sourcePlayerMask = getObject()->getControllingPlayer()->getPlayerMask();
 			damageInfo.in.m_damageStatusType = data->m_geometryBasedDamageWeaponTemplate->getDamageStatusType();
-			
+
 			for (; curVictim != NULL; curVictim = iter ? iter->nextWithNumeric(&curVictimDistSqr) : NULL)
 			{
 				damageInfo.in.m_amount = (curVictimDistSqr <= primaryDamageRangeSqr) ? primaryDamage : secondaryDamage;
@@ -275,7 +272,7 @@ void StickyBombUpdate::detonate()
 			}
 		}
 	}
-	
+
 	if( getObject()->isKindOf(KINDOF_BOOBY_TRAP) && boobyTrappedObject )
 	{
 		// This kind of sticky bomb needs to set a status, so the poor victim can trigger us from assorted places
@@ -294,7 +291,7 @@ void StickyBombUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -321,7 +318,7 @@ void StickyBombUpdate::xfer( Xfer *xfer )
 	//Next frame that a ping sound will play.
 	xfer->xferUnsignedInt( &m_nextPingFrame );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -332,4 +329,4 @@ void StickyBombUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp
index c3b75031542..11128be257d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureCollapseUpdate.cpp
@@ -24,11 +24,11 @@
 
 // FILE: StructureCollapseUpdate.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Thing.h"
 #include "Common/ThingTemplate.h"
@@ -50,7 +50,7 @@ const Int MAX_IDX = 32;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-static const char *TheStructureCollapsePhaseNames[] = 
+static const char *const TheStructureCollapsePhaseNames[] =
 {
 	"INITIAL",
 	"DELAY",
@@ -59,6 +59,7 @@ static const char *TheStructureCollapsePhaseNames[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(TheStructureCollapsePhaseNames) == SC_PHASE_COUNT + 1, "Wrong array size");
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -67,11 +68,8 @@ StructureCollapseUpdate::StructureCollapseUpdate( Thing *thing, const ModuleData
 	m_collapseFrame = 0;
 	m_collapseState = COLLAPSESTATE_STANDING;
 	m_collapseVelocity = 0.0f;
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_burstFrame = 0;
 	m_currentHeight = 0.0f;
-	//
 	setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 }
 
@@ -106,11 +104,11 @@ static void parseOCL( INI* ini, void *instance, void * /*store*/, const void* /*
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void StructureCollapseUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void StructureCollapseUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MinCollapseDelay",						INI::parseDurationUnsignedInt,		NULL, offsetof( StructureCollapseUpdateModuleData, m_minCollapseDelay ) },
 		{ "MaxCollapseDelay",						INI::parseDurationUnsignedInt,		NULL, offsetof( StructureCollapseUpdateModuleData, m_maxCollapseDelay ) },
@@ -180,7 +178,7 @@ UpdateSleepTime StructureCollapseUpdate::update( void )
 
 	// We are in the dramatic pause between when the building has lost all its hit points and
 	// when it starts toppling over.
-	if (m_collapseState == COLLAPSESTATE_WAITINGFORCOLLAPSESTART) 
+	if (m_collapseState == COLLAPSESTATE_WAITINGFORCOLLAPSESTART)
 	{
 		UnsignedInt now = TheGameLogic->getFrame();
 		Object *building = getObject();
@@ -196,7 +194,7 @@ UpdateSleepTime StructureCollapseUpdate::update( void )
 
 		building->getDrawable()->setInstanceMatrix(&newInstMatrix);
 
-		if (now >= m_collapseFrame) 
+		if (now >= m_collapseFrame)
 		{
 			m_collapseState = COLLAPSESTATE_COLLAPSING;
 			doPhaseStuff(SCPHASE_BURST, currentPosition);
@@ -206,7 +204,7 @@ UpdateSleepTime StructureCollapseUpdate::update( void )
 	}
 
 	// The building is in the process of falling over.
-	if (m_collapseState == COLLAPSESTATE_COLLAPSING) 
+	if (m_collapseState == COLLAPSESTATE_COLLAPSING)
 	{
 		Object *building = getObject();
 		UnsignedInt now = TheGameLogic->getFrame();
@@ -223,13 +221,13 @@ UpdateSleepTime StructureCollapseUpdate::update( void )
 
 		building->getDrawable()->setInstanceMatrix(&newInstMatrix);
 
-		if (now >= m_burstFrame) 
+		if (now >= m_burstFrame)
 		{
-			if (GameLogicRandomValue(1, d->m_bigBurstFrequency) == 1) 
+			if (GameLogicRandomValue(1, d->m_bigBurstFrequency) == 1)
 			{
 				doPhaseStuff(SCPHASE_BURST, currentPosition);
-			} 
-			else 
+			}
+			else
 			{
 				doPhaseStuff(SCPHASE_DELAY, currentPosition);
 			}
@@ -237,7 +235,7 @@ UpdateSleepTime StructureCollapseUpdate::update( void )
 			m_burstFrame += GameLogicRandomValue(d->m_minBurstDelay, d->m_maxBurstDelay);
 		}
 
-//		if ((m_currentHeight + building->getGeometryInfo().getMaxHeightAbovePosition()) <= 0) 
+//		if ((m_currentHeight + building->getGeometryInfo().getMaxHeightAbovePosition()) <= 0)
 		if ((m_currentHeight + building->getTemplate()->getTemplateGeometryInfo().getMaxHeightAbovePosition()) <= 0)
 		{
 			m_collapseState = COLLAPSESTATE_DONE;
@@ -250,7 +248,7 @@ UpdateSleepTime StructureCollapseUpdate::update( void )
 			drawable->setModelConditionState(MODELCONDITION_POST_COLLAPSE);
 			building->setOrientation(building->getOrientation());
 
-			
+
 			// Need to update body particle systems, now
 			BodyModuleInterface *body = building->getBodyModule();
 			body->updateBodyParticleSystems();
@@ -293,7 +291,7 @@ static void buildNonDupRandomIndexList(Int range, Int count, Int idxList[])
 		do
 		{
 			idx = GameLogicRandomValue(0, range-1);
-		} 
+		}
 		while (inList(idx, i, idxList));
 		idxList[i] = idx;
 	}
@@ -303,7 +301,7 @@ static void buildNonDupRandomIndexList(Int range, Int count, Int idxList[])
 //-------------------------------------------------------------------------------------------------
 void StructureCollapseUpdate::doPhaseStuff(StructureCollapsePhaseType scphase, const Coord3D *target)
 {
-	DEBUG_LOG(("Firing phase %d on frame %d\n", scphase, TheGameLogic->getFrame()));
+	DEBUG_LOG(("Firing phase %d on frame %d", scphase, TheGameLogic->getFrame()));
 
 	const StructureCollapseUpdateModuleData* d = getStructureCollapseUpdateModuleData();
 	Int i, idx, count, listSize;
@@ -342,11 +340,11 @@ void StructureCollapseUpdate::doPhaseStuff(StructureCollapsePhaseType scphase, c
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StructureCollapseUpdate::doCollapseDoneStuff() 
+void StructureCollapseUpdate::doCollapseDoneStuff()
 {
 	static NameKeyType key_BoneFXUpdate = NAMEKEY("BoneFXUpdate");
 	BoneFXUpdate *bfxu = (BoneFXUpdate *)getObject()->findUpdateModule(key_BoneFXUpdate);
-	if (bfxu != NULL) 
+	if (bfxu != NULL)
 	{
 		bfxu->stopAllBoneFX();
 	}
@@ -361,7 +359,7 @@ void StructureCollapseUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -394,7 +392,7 @@ void StructureCollapseUpdate::xfer( Xfer *xfer )
 	// current height
 	xfer->xferReal( &m_currentHeight );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -405,4 +403,4 @@ void StructureCollapseUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp
index ad36ca66f37..005fa4a8afa 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp
@@ -24,11 +24,11 @@
 
 // FILE: StructureToppleUpdate.cpp ///////////////////////////////////////////////////////////////////////
 // Author:
-// Desc:  
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Thing.h"
 #include "Common/ThingTemplate.h"
@@ -48,11 +48,6 @@
 #include "GameClient/InGameUI.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 const Int MAX_IDX = 32;
 
@@ -60,13 +55,9 @@ const Int MAX_IDX = 32;
 //-------------------------------------------------------------------------------------------------
 StructureToppleUpdate::StructureToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
-	
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_delayBurstLocation.zero();
 	m_structuralIntegrity = 0.0f;
 	m_toppleDirection.x = m_toppleDirection.y = 0;
-	//
 	m_toppleFrame = 0;
 	m_toppleState = TOPPLESTATE_STANDING;
 	m_toppleVelocity = 0.0f;
@@ -111,11 +102,11 @@ static void parseAngleFX(INI* ini, void *instance, void * /* store */, const voi
 }
 
 //-------------------------------------------------------------------------------------------------
-/*static*/ void StructureToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+/*static*/ void StructureToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "MinToppleDelay",						INI::parseDurationUnsignedInt,		NULL, offsetof( StructureToppleUpdateModuleData, m_minToppleDelay ) },
 		{ "MaxToppleDelay",						INI::parseDurationUnsignedInt,		NULL, offsetof( StructureToppleUpdateModuleData, m_maxToppleDelay ) },
@@ -241,9 +232,9 @@ UpdateSleepTime StructureToppleUpdate::update( void )
 	if (m_toppleState == TOPPLESTATE_TOPPLING) {
 		UnsignedInt now = TheGameLogic->getFrame();
 		Real toppleAcceleration = TOPPLE_ACCELERATION_FACTOR * (Sin(m_accumulatedAngle) * (1.0 - m_structuralIntegrity));
-//		DEBUG_LOG(("toppleAcceleration = %f\n", toppleAcceleration));
+//		DEBUG_LOG(("toppleAcceleration = %f", toppleAcceleration));
 		m_toppleVelocity += toppleAcceleration;
-//		DEBUG_LOG(("m_toppleVelocity = %f\n", m_toppleVelocity));
+//		DEBUG_LOG(("m_toppleVelocity = %f", m_toppleVelocity));
 
 		// doesn't make sense to have a structural integrity less than zero.
 		if (m_structuralIntegrity > 0.0f) {
@@ -252,7 +243,7 @@ UpdateSleepTime StructureToppleUpdate::update( void )
 				m_structuralIntegrity = 0.0f;
 			}
 		}
-//		DEBUG_LOG(("m_structuralIntegrity = %f\n\n", m_structuralIntegrity));
+//		DEBUG_LOG(("m_structuralIntegrity = %f", m_structuralIntegrity));
 
 		doAngleFX(m_accumulatedAngle, m_accumulatedAngle + m_toppleVelocity);
 
@@ -288,16 +279,16 @@ UpdateSleepTime StructureToppleUpdate::update( void )
 	}
 
 	// The building is now flat on the ground and done with all the crushing and all that.
-	if (m_toppleState == TOPPLESTATE_WAITINGFORDONE) 
+	if (m_toppleState == TOPPLESTATE_WAITINGFORDONE)
 	{
-		if (m_toppleFrame <= TheGameLogic->getFrame()) 
+		if (m_toppleFrame <= TheGameLogic->getFrame())
 		{
 			Object *building = getObject();
 			Drawable *drawable = building->getDrawable();
 			drawable->clearModelConditionState(MODELCONDITION_RUBBLE);
 			drawable->setModelConditionState(MODELCONDITION_POST_COLLAPSE);
 
-			
+
 			// Need to update body particle systems, now
 			BodyModuleInterface *body = building->getBodyModule();
 			body->updateBodyParticleSystems();
@@ -315,7 +306,7 @@ UpdateSleepTime StructureToppleUpdate::update( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StructureToppleUpdate::doToppleDoneStuff() 
+void StructureToppleUpdate::doToppleDoneStuff()
 {
 	static NameKeyType key_BoneFXUpdate = NAMEKEY("BoneFXUpdate");
 	BoneFXUpdate *bfxu = (BoneFXUpdate *)getObject()->findUpdateModule(key_BoneFXUpdate);
@@ -337,14 +328,14 @@ void StructureToppleUpdate::doToppleDoneStuff()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StructureToppleUpdate::doAngleFX(Real curAngle, Real newAngle) 
+void StructureToppleUpdate::doAngleFX(Real curAngle, Real newAngle)
 {
 	const StructureToppleUpdateModuleData *d = getStructureToppleUpdateModuleData();
 	const DamageInfo *lastDamageInfo = getObject()->getBodyModule()->getLastDamageInfo();
 
 	for (std::vector<AngleFXInfo>::const_iterator it = d->angleFX.begin(); it != d->angleFX.end(); ++it)
 	{
-		if ((it->angle > curAngle) && (it->angle <= newAngle)) 
+		if ((it->angle > curAngle) && (it->angle <= newAngle))
 		{
 			if( lastDamageInfo == NULL || getDamageTypeFlag( d->m_damageFXTypes, lastDamageInfo->in.m_damageType ) )
 				FXList::doFXObj(it->fxList, getObject());
@@ -356,7 +347,7 @@ void StructureToppleUpdate::doAngleFX(Real curAngle, Real newAngle)
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 // theta is the angle of the building with respect to the ground.
-void StructureToppleUpdate::applyCrushingDamage(Real theta) 
+void StructureToppleUpdate::applyCrushingDamage(Real theta)
 {
 //	static const Real THETA_CEILING = PI/8; // This weapon won't do any damage until theta is less than this value.
 	static const Real THETA_CEILING = PI/6; // This weapon won't do any damage until theta is less than this value.
@@ -384,7 +375,7 @@ void StructureToppleUpdate::applyCrushingDamage(Real theta)
 	temp3D.x = majorComponent;
 	temp3D.y = minorComponent;
 	temp3D.z = 0.0f;
-	
+
 	Real facingWidth = temp3D.length() / 2;
 
 	// Get the crushing weapon.
@@ -420,7 +411,7 @@ void StructureToppleUpdate::applyCrushingDamage(Real theta)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StructureToppleUpdate::doDamageLine(Object *building, const WeaponTemplate* wt, Real jcos, Real jsin, Real facingWidth, Real toppleAngle) 
+void StructureToppleUpdate::doDamageLine(Object *building, const WeaponTemplate* wt, Real jcos, Real jsin, Real facingWidth, Real toppleAngle)
 {
 	const DamageInfo *lastDamageInfo = getObject()->getBodyModule()->getLastDamageInfo();
 	static const Real WEAPON_SPACING_PARALLEL = 25;				// The spacing between weapon firing locations,
@@ -431,7 +422,7 @@ void StructureToppleUpdate::doDamageLine(Object *building, const WeaponTemplate*
 
 	Coord3D target;
 
-	for (Real i = -facingWidth; i < facingWidth; i += WEAPON_SPACING_PARALLEL) 
+	for (Real i = -facingWidth; i < facingWidth; i += WEAPON_SPACING_PARALLEL)
 	{
 		target.x = building->getPosition()->x + jcos + (i * Sin(toppleAngle));
 		target.y = building->getPosition()->y + jsin + (i * Cos(toppleAngle));
@@ -465,12 +456,12 @@ void StructureToppleUpdate::doDamageLine(Object *building, const WeaponTemplate*
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StructureToppleUpdate::doToppleStartFX(Object *building, const DamageInfo *damageInfo) 
+void StructureToppleUpdate::doToppleStartFX(Object *building, const DamageInfo *damageInfo)
 {
 	const StructureToppleUpdateModuleData *d = getStructureToppleUpdateModuleData();
 	const DamageInfo *lastDamageInfo = getObject()->getBodyModule()->getLastDamageInfo();
 
-	if( lastDamageInfo == NULL || getDamageTypeFlag( d->m_damageFXTypes, lastDamageInfo->in.m_damageType ) )	
+	if( lastDamageInfo == NULL || getDamageTypeFlag( d->m_damageFXTypes, lastDamageInfo->in.m_damageType ) )
 		FXList::doFXPos(d->m_toppleStartFXList, building->getPosition());
 
 	doPhaseStuff(STPHASE_INITIAL, building->getPosition());
@@ -478,12 +469,12 @@ void StructureToppleUpdate::doToppleStartFX(Object *building, const DamageInfo *
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StructureToppleUpdate::doToppleDelayBurstFX() 
+void StructureToppleUpdate::doToppleDelayBurstFX()
 {
 	const StructureToppleUpdateModuleData *d = getStructureToppleUpdateModuleData();
 	const DamageInfo *lastDamageInfo = getObject()->getBodyModule()->getLastDamageInfo();
 
-	DEBUG_LOG(("Doing topple delay burst on frame %d\n", TheGameLogic->getFrame()));
+	DEBUG_LOG(("Doing topple delay burst on frame %d", TheGameLogic->getFrame()));
 	if( lastDamageInfo == NULL || getDamageTypeFlag( d->m_damageFXTypes, lastDamageInfo->in.m_damageType ) )
 		FXList::doFXPos(d->m_toppleDelayFXList, &m_delayBurstLocation);
 
@@ -496,10 +487,10 @@ void StructureToppleUpdate::doToppleDelayBurstFX()
 		for (std::vector<FXBoneInfo>::const_iterator it = d->fxbones.begin(); it != d->fxbones.end(); ++it)
 		{
 			ParticleSystem *sys = TheParticleSystemManager->createParticleSystem(it->particleSystemTemplate);
-			if (sys != NULL) 
+			if (sys != NULL)
 			{
 				Coord3D pos;
-				if (drawable->getPristineBonePositions(it->boneName.str(), 0, &pos, NULL, 1) == 1) 
+				if (drawable->getPristineBonePositions(it->boneName.str(), 0, &pos, NULL, 1) == 1)
 				{
 					// got the bone position...
 					sys->setPosition(&pos);
@@ -537,7 +528,7 @@ static void buildNonDupRandomIndexList(Int range, Int count, Int idxList[])
 		do
 		{
 			idx = GameLogicRandomValue(0, range-1);
-		} 
+		}
 		while (inList(idx, i, idxList));
 		idxList[i] = idx;
 	}
@@ -576,7 +567,7 @@ void StructureToppleUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -621,7 +612,7 @@ void StructureToppleUpdate::xfer( Xfer *xfer )
 	// delay burst location
 	xfer->xferCoord3D( &m_delayBurstLocation );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -632,4 +623,4 @@ void StructureToppleUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
index 62b45d402bf..30ba4157596 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "Common/AudioEventRTS.h"
@@ -38,7 +38,7 @@
 #include "GameLogic/Module/TensileFormationUpdate.h"
 #include "GameLogic/Module/BodyModule.h"
 #include "GameLogic/PartitionManager.h"
-#include "GameLogic/GameLogic.h" 
+#include "GameLogic/GameLogic.h"
 #include "GameLogic/AI.h"
 #include "GameLogic/AIPathfind.h"
 
@@ -47,11 +47,6 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 #define MAP_XY_FACTOR			(10.0f)	 //How wide and tall each height map square is in world space.
@@ -76,7 +71,7 @@ class PartitionFilterTensileFormationMember : public PartitionFilter
 
 public:
 	PartitionFilterTensileFormationMember( Object* obj ) : m_obj( obj ) { }
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual const char* debugGetName() { return "PartitionFilterTensileFormationMember"; }
 #endif
 	virtual Bool allow( Object *objOther )
@@ -93,7 +88,7 @@ TensileFormationUpdateModuleData::TensileFormationUpdateModuleData( void )
 
 	m_enabled = FALSE;
 
-}  // end TensileFormationUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -102,7 +97,7 @@ TensileFormationUpdateModuleData::TensileFormationUpdateModuleData( void )
 
 	UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Enabled",	    INI::parseBool,	NULL, offsetof( TensileFormationUpdateModuleData, m_enabled ) },
 		{ "CrackSound",	INI::parseAudioEventRTS,	NULL,	offsetof( TensileFormationUpdateModuleData, m_crackSound) },
@@ -110,7 +105,7 @@ TensileFormationUpdateModuleData::TensileFormationUpdateModuleData( void )
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -135,7 +130,7 @@ TensileFormationUpdate::TensileFormationUpdate( Thing *thing, const ModuleData *
 
 	for ( int t = 0; t < 4; ++t)
 	{
-		m_links[ t ].id = INVALID_ID; 
+		m_links[ t ].id = INVALID_ID;
 		m_links[ t ].tensor.set(0,0,0);
 	}
 
@@ -154,14 +149,14 @@ TensileFormationUpdate::TensileFormationUpdate( Thing *thing, const ModuleData *
 
 
 
-}  // end TensileFormationUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 TensileFormationUpdate::~TensileFormationUpdate( void )
 {
 
-}  // end ~TensileFormationUpdate
+}
 
 
 
@@ -193,8 +188,8 @@ void TensileFormationUpdate::initLinks( void )
 		if ( closestDistance > thisDistance )
 		{
 			closestDistance = thisDistance;
-			
-			//push a new link 
+
+			//push a new link
 			for ( int t = 3; t > 0; --t )
 				m_links[ t ] = m_links[ t-1 ];
 
@@ -214,7 +209,7 @@ void TensileFormationUpdate::initLinks( void )
 
 
 
- 
+
 
 
 // ------------------------------------------------------------------------------------------------
@@ -272,7 +267,7 @@ UpdateSleepTime TensileFormationUpdate::update( void )
 	}
 
 
-	if ( m_life%30 == 29 )		
+	if ( m_life%30 == 29 )
 		propagateDislodgement( TRUE );
 
 
@@ -321,9 +316,9 @@ UpdateSleepTime TensileFormationUpdate::update( void )
 			desiredPos.sub( &tensor );
 
 			//Coord3D desiredPos = { theirPos->x - m_links[ t ].tensor.x, theirPos->y - m_links[ t ].tensor.y, theirPos->z - m_links[ t ].tensor.z };
-			
+
 			newPos.x = newPos.x*0.93f + desiredPos.x*0.07f;
-			newPos.y = newPos.y*0.93f + desiredPos.y*0.07f; 
+			newPos.y = newPos.y*0.93f + desiredPos.y*0.07f;
 			newPos.z = MIN( m_lowestSlideElevation, TheTerrainLogic->getGroundHeight(newPos.x, newPos.y) );//rest on surface here
 
 			tensor.normalize();
@@ -347,7 +342,7 @@ UpdateSleepTime TensileFormationUpdate::update( void )
 
 
 	draw->setModelConditionFlags(MAKE_MODELCONDITION_MASK(MODELCONDITION_POST_COLLAPSE));
-			
+
 	if ( m_life < 200 )
 		draw->setModelConditionFlags(MAKE_MODELCONDITION_MASK(MODELCONDITION_MOVING));
 	else
@@ -357,13 +352,13 @@ UpdateSleepTime TensileFormationUpdate::update( void )
 		draw->setModelConditionFlags(MAKE_MODELCONDITION_MASK(MODELCONDITION_FREEFALL));
 	else
 		draw->clearModelConditionFlags(MAKE_MODELCONDITION_MASK(MODELCONDITION_FREEFALL));
-		
+
 //	{
 //		RGBColor cyan = {0,1,1};
 //		draw->flashAsSelected(&cyan);
 //	}
 
-	
+
 
 	//else
 		//m_motionlessCounter = 0;
@@ -379,7 +374,7 @@ UpdateSleepTime TensileFormationUpdate::update( void )
 
 
 	return UPDATE_SLEEP_NONE;
-}  // end update
+}
 
 
 
@@ -445,7 +440,7 @@ void TensileFormationUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc  
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -466,7 +461,7 @@ void TensileFormationUpdate::xfer( Xfer *xfer )
 	// enabled
 	xfer->xferBool( &m_enabled );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -477,4 +472,4 @@ void TensileFormationUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp
index f37e0c29a8c..7af9b83cfcc 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ToppleUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ThingTemplate.h"
 #include "Common/ThingFactory.h"
@@ -50,7 +50,7 @@
 
 //-------------------------------------------------------------------------------------------------
 // this is our "bounce" limit -- slightly less that 90 degrees, to account for slop.
-static const Real ANGULAR_LIMIT = PI/2 - PI/64;		
+static const Real ANGULAR_LIMIT = PI/2 - PI/64;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -74,11 +74,11 @@ ToppleUpdateModuleData::ToppleUpdateModuleData()
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void ToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void ToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ToppleFX",	INI::parseFXList, NULL, offsetof( ToppleUpdateModuleData, m_toppleFX ) },
 		{ "BounceFX",	INI::parseFXList, NULL, offsetof( ToppleUpdateModuleData, m_bounceFX ) },
@@ -104,15 +104,12 @@ void ToppleUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 ToppleUpdate::ToppleUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_angleDeltaX = 0.0f;
 	m_doBounceFX = FALSE;
 	m_numAngleDeltaX = 0;
-	//
 	m_angularVelocity = 0;
 	m_angularAccumulation = 0;
-	m_angularAcceleration = 0;	
+	m_angularAcceleration = 0;
 	m_toppleDirection.x = 0;
 	m_toppleDirection.y = 0;
 	m_toppleDirection.z = 0;
@@ -145,7 +142,7 @@ void ToppleUpdate::applyTopplingForce( const Coord3D* toppleDirection, Real topp
 	if (getObject()->isEffectivelyDead())
 		return;
 
-	//DEBUG_LOG(("awaking ToppleUpdate %08lx\n",this));
+	//DEBUG_LOG(("awaking ToppleUpdate %08lx",this));
 	setWakeFrame(getObject(), UPDATE_SLEEP_NONE);
 
 	const ToppleUpdateModuleData* d = getToppleUpdateModuleData();
@@ -252,7 +249,7 @@ Bool ToppleUpdate::isAbleToBeToppled() const
 static void deathByToppling(Object* obj)
 {
 	// use a special "topppling" damage type here so that
-	// toppled stuff can have different damage/die modules 
+	// toppled stuff can have different damage/die modules
 	// for toppled-death vs other-death
 	DamageInfo damageInfo;
 	damageInfo.in.m_damageType = DAMAGE_UNRESISTABLE;
@@ -267,7 +264,7 @@ static void deathByToppling(Object* obj)
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime ToppleUpdate::update()
 {
-	//DEBUG_LOG(("updating ToppleUpdate %08lx\n",this));
+	//DEBUG_LOG(("updating ToppleUpdate %08lx",this));
 	DEBUG_ASSERTCRASH(m_toppleState != TOPPLE_UPRIGHT, ("hmm, we should be sleeping here"));
 	if ( (m_toppleState == TOPPLE_UPRIGHT)  ||  (m_toppleState == TOPPLE_DOWN) )
 		return UPDATE_SLEEP_FOREVER;
@@ -300,7 +297,7 @@ UpdateSleepTime ToppleUpdate::update()
 		// Hit so either bounce or stop if too little remaining velocity.
 		m_angularVelocity *= -d->m_bounceVelocityPercent;
 
-		if( BitIsSet( m_options, TOPPLE_OPTIONS_NO_BOUNCE ) == TRUE || 
+		if( BitIsSet( m_options, TOPPLE_OPTIONS_NO_BOUNCE ) == TRUE ||
 				fabs(m_angularVelocity) < VELOCITY_BOUNCE_LIMIT )
 		{
 			// too slow, just stop
@@ -330,7 +327,7 @@ UpdateSleepTime ToppleUpdate::update()
 					obj->setOrientation(obj->getOrientation());
 
 				}
-			} // if kill when toppled
+			}
 
 			if (d->m_killStumpWhenToppled)
 			{
@@ -381,7 +378,7 @@ void ToppleUpdate::onCollide( Object *other, const Coord3D *loc, const Coord3D *
 		toppleVector.x -= other->getPosition()->x;
 		toppleVector.y -= other->getPosition()->y;
 		toppleVector.z = 0;
-		
+
 		Coord3D vel;
 		PhysicsBehavior* phys = other->getPhysics();
 		if (phys)
@@ -403,7 +400,7 @@ void ToppleUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -451,7 +448,7 @@ void ToppleUpdate::xfer( Xfer *xfer )
 	// stump id
 	xfer->xferObjectID( &m_stumpID );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -462,4 +459,4 @@ void ToppleUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp
index 25e01dea46f..6509fb22a5e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/UpdateModule.cpp
@@ -33,18 +33,13 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Module/UpdateModule.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 UpdateSleepTime UpdateModule::frameToSleepTime(
-	UnsignedInt frame1, 
-	UnsignedInt frame2, 
-	UnsignedInt frame3, 
+	UnsignedInt frame1,
+	UnsignedInt frame2,
+	UnsignedInt frame3,
 	UnsignedInt frame4
 )
 {
@@ -97,12 +92,12 @@ void UpdateModule::crc( Xfer *xfer )
 	// extend base class
 	BehaviorModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info;
-	* 1: Initial version 
+	* 1: Initial version
 	*/
 // ------------------------------------------------------------------------------------------------
 void UpdateModule::xfer( Xfer *xfer )
@@ -116,18 +111,18 @@ void UpdateModule::xfer( Xfer *xfer )
 	// extend base class
 	BehaviorModule::xfer( xfer );
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	/*
 		this is a fix for the following scenario:
 
 		save a game that has an object that uses module "FOO"
 		now change the code for module "FOO" from being nonsleepy to being sleepy
 		now reload that saved game
-		as soon as "FOO" attempts to wake itself up, you're dead. 
-		
+		as soon as "FOO" attempts to wake itself up, you're dead.
+
 		this fix simply looks to see if the module in question is now sleepy in code,
 		but was saved in sleepy form, and if so, quietly nudges a reasonable
-		value into m_nextCallFrameAndPhase. 
+		value into m_nextCallFrameAndPhase.
 	*/
 	#define FIX_OLD_SAVES
 #endif
@@ -142,7 +137,7 @@ void UpdateModule::xfer( Xfer *xfer )
 
 	// next call frame and phase
 	xfer->xferUnsignedInt( &m_nextCallFrameAndPhase );
-	
+
 	if (xfer->getXferMode() == XFER_LOAD)
 	{
 		/*
@@ -152,7 +147,7 @@ void UpdateModule::xfer( Xfer *xfer )
 				PHASE_INITIAL				= 0,
 				PHASE_NORMAL				= 1,
 				PHASE_FINAL					= 2
-			
+
 			post-Jan 2, 2003:
 				PHASE_INITIAL				= 0,
 				PHASE_PHYSICS				= 1,
@@ -165,7 +160,7 @@ void UpdateModule::xfer( Xfer *xfer )
 
 #ifdef FIX_OLD_SAVES
 	if (xfer->getXferMode() == XFER_LOAD
-			&& thisModuleIsNowSleepy 
+			&& thisModuleIsNowSleepy
 			&& m_nextCallFrameAndPhase == 0)
 	{
 	#ifdef ALLOW_NONSLEEPY_UPDATES
@@ -183,7 +178,7 @@ void UpdateModule::xfer( Xfer *xfer )
 		m_indexInLogic = -1;
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -194,7 +189,7 @@ void UpdateModule::loadPostProcess( void )
 	// extned base class
 	BehaviorModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp
index f5890cc18e7..a628657312c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WaveGuideUpdate.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Radar.h"
 #include "Common/ThingFactory.h"
@@ -58,12 +58,9 @@
 // ------------------------------------------------------------------------------------------------
 WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void )
 {
-	//Added By Sadullah Nader
-	//Initialization(s) inserted
 	m_bridgeParticleAngleFudge = 0.0f;
 	m_randomSplashSoundFrequency = 0;
 	m_waveDelay = 0.0f;
-	//
 	m_ySize = 0.0f;
 	m_linearWaveSpacing = 0.0f;
 	m_waveBendMagnitude = 0.0f;
@@ -74,7 +71,7 @@ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void )
 	m_damageAmount = 0.0f;
 	m_toppleForce = 0.0f;
 
-}  // end WaveGuideUpdateModuleData
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -83,10 +80,10 @@ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void )
 
   UpdateModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 
-		{ "WaveDelay", INI::parseDurationReal, NULL, offsetof( WaveGuideUpdateModuleData, m_waveDelay ) },	
+		{ "WaveDelay", INI::parseDurationReal, NULL, offsetof( WaveGuideUpdateModuleData, m_waveDelay ) },
 		{ "YSize", INI::parseReal, NULL, offsetof( WaveGuideUpdateModuleData, m_ySize ) },
 		{ "LinearWaveSpacing", INI::parseReal, NULL, offsetof( WaveGuideUpdateModuleData, m_linearWaveSpacing ) },
 		{ "WaveBendMagnitude", INI::parseReal, NULL, offsetof( WaveGuideUpdateModuleData, m_waveBendMagnitude ) },
@@ -106,7 +103,7 @@ WaveGuideUpdateModuleData::WaveGuideUpdateModuleData( void )
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -138,16 +135,16 @@ WaveGuideUpdate::WaveGuideUpdate( Thing *thing, const ModuleData *moduleData )
 		for( Int j = 0; j < MAX_SHAPE_EFFECTS; j++ )
 			m_shapeEffects[ i ][ j ] = INVALID_PARTICLE_SYSTEM_ID;
 
-	}  // end for i
+	}
 
-}  // end WaveGuideUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 WaveGuideUpdate::~WaveGuideUpdate( void )
 {
 
-}  // end ~WaveGuideUpdate
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Start the waveguide moving along its waypoint path, bringing water destruction and havok
@@ -174,15 +171,15 @@ Bool WaveGuideUpdate::startMoving( void )
 		Waypoint *verify = waypoint;
 		while( verify )
 		{
-		
+
 			// can't have more than one link
 			if( verify->getNumLinks() > 1 )
 			{
 
-				DEBUG_CRASH(( "WaveGuideUpdate::startMoving - The waypoint path cannot have multiple link choices at any node\n" ));
+				DEBUG_CRASH(( "WaveGuideUpdate::startMoving - The waypoint path cannot have multiple link choices at any node" ));
 				return FALSE;
 
-			}  // end if
+			}
 
 			// set our destination location to this waypoint position
 			m_finalDestination = *verify->getLocation();
@@ -190,18 +187,18 @@ Bool WaveGuideUpdate::startMoving( void )
 			// on to the next
 			verify = verify->getLink( 0 );
 
-		}  // end while
+		}
 
 		// there must be at least one link
 		Waypoint *next = waypoint->getLink( 0 );
 		if( next == NULL )
 		{
 
-			DEBUG_CRASH(( "WaveGuideUpdate:startMoving - There must be a linked waypoint path to follow\n" ));
+			DEBUG_CRASH(( "WaveGuideUpdate:startMoving - There must be a linked waypoint path to follow" ));
 			return FALSE;
 
-		}  // end if
-				
+		}
+
 		// get vector from next waypoint to first waypoint
 		Coord2D v;
 		v.x = next->getLocation()->x - waypoint->getLocation()->x;
@@ -234,13 +231,13 @@ Bool WaveGuideUpdate::startMoving( void )
 			//
 			ai->setPathExtraDistance( PATH_EXTRA_DISTANCE );
 
-		}  // end if
+		}
 
-	}  // endif
+	}
 
 	return TRUE;  // all is well
 
-}  // end startMoving
+}
 
 // ------------------------------------------------------------------------------------------------
 /** The wave guide has started moving ... this is called once */
@@ -273,7 +270,7 @@ Bool WaveGuideUpdate::initWaveGuide( void )
 			particleSys->attachToObject( getObject() );
 			m_shapeEffects[ i ][ 0 ] = particleSys->getSystemID();
 
-		}  // end if
+		}
 
 		// create spray 2 effect
 		particleSys = TheParticleSystemManager->createParticleSystem( wave2 );
@@ -284,7 +281,7 @@ Bool WaveGuideUpdate::initWaveGuide( void )
 			particleSys->attachToObject( getObject() );
 			m_shapeEffects[ i ][ 1 ] = particleSys->getSystemID();
 
-		}  // end if
+		}
 
 		// create spray 3 every few points across the wave
 		if( i % 5  == 0 )
@@ -298,15 +295,15 @@ Bool WaveGuideUpdate::initWaveGuide( void )
 				particleSys->attachToObject( getObject() );
 				m_shapeEffects[ i ][ 2 ] = particleSys->getSystemID();
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	return TRUE;  // all is well
 
-}  // end initWaveGuide
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -342,9 +339,9 @@ void WaveGuideUpdate::computeWaveShapePoints( void )
 		m_shapePoints[ m_shapePointCount ].z = 0.0f;
 		m_shapePointCount++;
 
-	}  // end for width
+	}
 
-}  // end computeWaveShapePoints
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given the current position and orientation of the wave guide, transform all the wave
@@ -365,9 +362,9 @@ void WaveGuideUpdate::transformWaveShape( void )
 		m_transformedShapePoints[ i ].z = TheTerrainLogic->getGroundHeight( m_transformedShapePoints[ i ].x,
 																																	m_transformedShapePoints[ i ].y );
 
-	}  // end for i
+	}
 
-}  // end transformWaveShape
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Update phase for the effects that make up the front shape of the wave */
@@ -375,7 +372,7 @@ void WaveGuideUpdate::transformWaveShape( void )
 void WaveGuideUpdate::doShapeEffects( void )
 {
 	const WaveGuideUpdateModuleData *modData = getWaveGuideUpdateModuleData();
-	
+
 	//
 	// the particle systems that make up the wave shape need to maintain a position that is
 	// just above the ground
@@ -406,15 +403,15 @@ void WaveGuideUpdate::doShapeEffects( void )
 					pos.z = m_transformedShapePoints[ i ].z;
 					particleSys->setPosition( &pos );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
-		}  // end for j
+		}
 
-	}  // end for i
+	}
 
-}  // end doShapeEffects
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given all our sample points, make the wave go */
@@ -435,13 +432,13 @@ void WaveGuideUpdate::doWaterMotion( void )
 		// push up the water here
 		TheTerrainVisual->addWaterVelocity( m_transformedShapePoints[ i ].x,
 																				m_transformedShapePoints[ i ].y,
-																				modData->m_waterVelocity, 
+																				modData->m_waterVelocity,
 																				modData->m_preferredHeight );
 
 
-	}  // end for i
+	}
 
-}  // end doWaterMotion
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Any points in our wave that are on the shoreline that are close enough to the effect
@@ -476,7 +473,7 @@ void WaveGuideUpdate::doShoreEffects( void )
 		// transform the point
 		waveGuide->transformPoint( &effectPoints[ i ], &effectPoints[ i ] );
 
-	}  // end for i
+	}
 
 	//
 	// go across the shape of our wave ... when we detect a transition from underground to
@@ -508,17 +505,17 @@ void WaveGuideUpdate::doShoreEffects( void )
 			if( underWater == TRUE && i != 0 )
 			{
 				Coord3D *prevPoint = &effectPoints[ i - 1 ];  // the prev point is actuall on the water so we'll use it
-						
+
 				particleSystem = TheParticleSystemManager->createParticleSystem( right );
 				if( particleSystem )
 					particleSystem->setPosition( prevPoint );
 
-			}  // end if
+			}
 
 			// we are now 'above'
 			underWater = FALSE;
 
-		}  // end if
+		}
 		else
 		{
 
@@ -533,16 +530,16 @@ void WaveGuideUpdate::doShoreEffects( void )
 				if( particleSystem )
 					particleSystem->setPosition( point );
 
-			}  // end if
+			}
 
 			// we are now 'under'
 			underWater = TRUE;
 
-		}  // end else
+		}
 
-	}  // end for i
+	}
 
-}  // end doShoreEffects
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Do damage to things that have fallen victim in the path of this enourmous wave */
@@ -561,8 +558,8 @@ void WaveGuideUpdate::doDamage( void )
 
 		// scan objects around us and do damage to objects we have "passed over" and are behind us
 		ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( &m_transformedShapePoints[ i ],
-																																			 modData->m_damageRadius, 
-																																			 FROM_CENTER_2D, 
+																																			 modData->m_damageRadius,
+																																			 FROM_CENTER_2D,
 																																			 NULL );
 		MemoryPoolObjectHolder hold( iter );
 		Object *obj;
@@ -573,7 +570,7 @@ void WaveGuideUpdate::doDamage( void )
 		{
 
 			// ignore all waveguide types
-			if( obj->isKindOf( KINDOF_WAVEGUIDE ) )	
+			if( obj->isKindOf( KINDOF_WAVEGUIDE ) )
 				continue;
 
 			//
@@ -589,7 +586,7 @@ void WaveGuideUpdate::doDamage( void )
 			//
 			// only damage objects that are below the preferred height of the wave doing the damage,
 			// bridges are an exception as their object is raised above the ground, but we'll
-			// say the water is destroying the foundation of it 
+			// say the water is destroying the foundation of it
 			//
 			if( objPos->z > modData->m_preferredHeight && obj->isKindOf( KINDOF_BRIDGE ) == FALSE )
 				continue;
@@ -599,7 +596,7 @@ void WaveGuideUpdate::doDamage( void )
 			v.y = objPos->y - m_transformedShapePoints[ i ].y;
 			v.z = 0.0f;		// forget Z, this is really a top down 2D calculation
 			v.normalize();
-			
+
 			//
 			// get the cosine of the angle between the our forward direction and the vector to the obj
 			// otherwise known as a dot product
@@ -638,7 +635,7 @@ void WaveGuideUpdate::doDamage( void )
 						particleSystem->setPosition( &pos );
 						particleSystem->attachToObject( waveGuide );
 
-					}  // end if
+					}
 
 					// this object is now wet
 					obj->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_WET ) );
@@ -648,7 +645,7 @@ void WaveGuideUpdate::doDamage( void )
 					toppleVector.x = obj->getPosition()->x - m_transformedShapePoints[ i ].x;
 					toppleVector.y = obj->getPosition()->y - m_transformedShapePoints[ i ].y;
 					toppleVector.z = 0;
-					obj->topple( &toppleVector, modData->m_toppleForce, TOPPLE_OPTIONS_NO_BOUNCE | 
+					obj->topple( &toppleVector, modData->m_toppleForce, TOPPLE_OPTIONS_NO_BOUNCE |
 																															TOPPLE_OPTIONS_NO_FX );
 
 					// do a lot of water damage
@@ -660,8 +657,8 @@ void WaveGuideUpdate::doDamage( void )
 					obj->attemptDamage( &damageInfo );
 
 					//
-					// set flooded condition for model and turn off shadows cause we're inside water, 
-					// note that we want to do this after we damage the object so that we switch 
+					// set flooded condition for model and turn off shadows cause we're inside water,
+					// note that we want to do this after we damage the object so that we switch
 					// off the shadows on the new model data loaded after damage is dealt
 					//
 					Drawable *draw = obj->getDrawable();
@@ -671,7 +668,7 @@ void WaveGuideUpdate::doDamage( void )
 						draw->setModelConditionState( MODELCONDITION_FLOODED );
 						draw->setShadowsEnabled( FALSE );
 
-					}  // end if
+					}
 
 					//
 					// Temp demo hack, replace bridges destroyed with the special destroyed bridge art
@@ -700,7 +697,7 @@ void WaveGuideUpdate::doDamage( void )
 								v.y = bridgeInfo.to.y - bridgeInfo.from.y;
 								angle = v.toAngle();
 
-							}  // end if
+							}
 
 							// put new bridge looking object in the world
 							newBridge->setPosition( obj->getPosition() );
@@ -734,24 +731,24 @@ void WaveGuideUpdate::doDamage( void )
 
 								particleSystem->setLocalTransform( &transform );
 
-							}  // end if
+							}
 
 							// destroy the old bridge and bridge object
 							TheTerrainLogic->deleteBridge( oldBridge );
 
-						}  // end if
+						}
 
-					}  // end if
+					}
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
-		}  // end for obj
+		}
 
-	}  // end for i
+	}
 
-}  // end doDamage
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -797,12 +794,12 @@ UpdateSleepTime WaveGuideUpdate::update( void )
 			TheGameLogic->destroyObject( getObject() );
 			return UPDATE_SLEEP_NONE;
 
-		}  // end if
+		}
 
 		// we are now in motion
 		m_initialized = TRUE;
 
-	}  // end if
+	}
 
 	// every half second we try to play a random spash sound
 	if( TheGameLogic->getFrame() - m_splashSoundFrame > LOGICFRAMES_PER_SECOND / 2.0f )
@@ -812,13 +809,13 @@ UpdateSleepTime WaveGuideUpdate::update( void )
 		m_splashSoundFrame = TheGameLogic->getFrame();
 
 		// pick a random number and play according to frequency
-		if( GameLogicRandomValue( 1, 100 ) > modData->m_randomSplashSoundFrequency )  
+		if( GameLogicRandomValue( 1, 100 ) > modData->m_randomSplashSoundFrequency )
 		{
 			AudioEventRTS randomSplash(modData->m_randomSplashSound);
 			randomSplash.setObjectID(waveGuide->getID());
 			TheAudio->addAudioEvent(&randomSplash);
-		}  // end if
-	}  // end if
+		}
+	}
 
 	//
 	// transform the wave shape points once for the current position ... we have this array
@@ -850,7 +847,7 @@ UpdateSleepTime WaveGuideUpdate::update( void )
 
 		return UPDATE_SLEEP_NONE;
 
-	}  // end if
+	}
 
 	// do wavefront effects
 	doShapeEffects();
@@ -866,7 +863,7 @@ UpdateSleepTime WaveGuideUpdate::update( void )
 
 	return UPDATE_SLEEP_NONE;
 
-}  // end update
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -877,7 +874,7 @@ void WaveGuideUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -901,17 +898,17 @@ void WaveGuideUpdate::xfer( Xfer *xfer )
 	// need disable
 	xfer->xferBool( &m_needDisable );
 
-	// initialized 
+	// initialized
 	xfer->xferBool( &m_initialized );
 
 	// shape points
 	xfer->xferUser( m_shapePoints, sizeof( Coord3D ) * MAX_WAVEGUIDE_SHAPE_POINTS );
-		
+
 	// transformed shape points
 	xfer->xferUser( &m_transformedShapePoints, sizeof( Coord3D ) * MAX_WAVEGUIDE_SHAPE_POINTS );
 
 	// particle shape effects
-	xfer->xferUser( m_shapeEffects, sizeof( ParticleSystemID ) * MAX_WAVEGUIDE_SHAPE_POINTS * MAX_SHAPE_EFFECTS );	
+	xfer->xferUser( m_shapeEffects, sizeof( ParticleSystemID ) * MAX_WAVEGUIDE_SHAPE_POINTS * MAX_SHAPE_EFFECTS );
 
 	// shape point count
 	xfer->xferInt( &m_shapePointCount );
@@ -922,7 +919,7 @@ void WaveGuideUpdate::xfer( Xfer *xfer )
 	// final destination
 	xfer->xferCoord3D( &m_finalDestination );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -933,4 +930,4 @@ void WaveGuideUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WeaponBonusUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WeaponBonusUpdate.cpp
index dcc43dadbd9..d4d670b02d2 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WeaponBonusUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WeaponBonusUpdate.cpp
@@ -24,12 +24,12 @@
 
 // FILE: WeaponBonusUpdate.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002-2003 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002-2003 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	July 2003
@@ -37,8 +37,8 @@
 //	Filename: 	WeaponBonusUpdate.cpp
 //
 //	author:		Graham Smallwood
-//	
-//	purpose:	Like healing in that it can affect just me or people around, 
+//
+//	purpose:	Like healing in that it can affect just me or people around,
 //						except this gives a Weapon Bonus instead of health
 //
 //-----------------------------------------------------------------------------
@@ -51,7 +51,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameLogic/Module/WeaponBonusUpdate.h"
 
@@ -74,12 +74,12 @@ WeaponBonusUpdateModuleData::WeaponBonusUpdateModuleData()
 }
 
 //-----------------------------------------------------------------------------
-void WeaponBonusUpdateModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void WeaponBonusUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpdateModuleData::buildFieldParse(p);
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
-		{ "RequiredAffectKindOf",		KindOfMaskType::parseFromINI,		NULL, offsetof( WeaponBonusUpdateModuleData, m_requiredAffectKindOf ) },		
+		{ "RequiredAffectKindOf",		KindOfMaskType::parseFromINI,		NULL, offsetof( WeaponBonusUpdateModuleData, m_requiredAffectKindOf ) },
 		{ "ForbiddenAffectKindOf",	KindOfMaskType::parseFromINI,		NULL, offsetof( WeaponBonusUpdateModuleData, m_forbiddenAffectKindOf ) },
 		{ "BonusDuration",					INI::parseDurationUnsignedInt,	NULL, offsetof( WeaponBonusUpdateModuleData, m_bonusDuration ) },
 		{ "BonusDelay",							INI::parseDurationUnsignedInt,	NULL, offsetof( WeaponBonusUpdateModuleData, m_bonusDelay ) },
@@ -138,9 +138,9 @@ UpdateSleepTime WeaponBonusUpdate::update( void )
 	PartitionFilter *filters[] = { &relationship, &filterAlive, &filterMapStatus, NULL };
 
 	// scan objects in our region
-	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( me->getPosition(), 
-																																			data->m_bonusRange, 
-																																			FROM_CENTER_2D, 
+	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange( me->getPosition(),
+																																			data->m_bonusRange,
+																																			FROM_CENTER_2D,
 																																			filters );
 	MemoryPoolObjectHolder hold( iter );
 	tempWeaponBonusData weaponBonusData;
@@ -148,7 +148,7 @@ UpdateSleepTime WeaponBonusUpdate::update( void )
 	weaponBonusData.m_duration = data->m_bonusDuration;
 	weaponBonusData.m_requiredMask = data->m_requiredAffectKindOf;
 	weaponBonusData.m_forbiddenMask = data->m_forbiddenAffectKindOf;
-	
+
 	for( Object *currentObj = iter->first(); currentObj != NULL; currentObj = iter->next() )
 	{
 		if( currentObj->isKindOfMulti(data->m_requiredAffectKindOf, data->m_forbiddenAffectKindOf) )
@@ -174,7 +174,7 @@ void WeaponBonusUpdate::crc( Xfer *xfer )
 	// extend base class
 	UpdateModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -192,7 +192,7 @@ void WeaponBonusUpdate::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -203,4 +203,4 @@ void WeaponBonusUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ActiveShroudUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ActiveShroudUpgrade.cpp
index bf839a2f899..9b95be8397c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ActiveShroudUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ActiveShroudUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Module/ActiveShroudUpgrade.h"
@@ -41,7 +41,7 @@ ActiveShroudUpgradeModuleData::ActiveShroudUpgradeModuleData( void )
 
 	m_newShroudRange = 0.0f;
 
-}  // end SpecialPowerModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -49,14 +49,14 @@ ActiveShroudUpgradeModuleData::ActiveShroudUpgradeModuleData( void )
 {
 	UpgradeModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "NewShroudRange", INI::parseReal, NULL, offsetof( ActiveShroudUpgradeModuleData, m_newShroudRange ) },
 		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -64,18 +64,18 @@ ActiveShroudUpgradeModuleData::ActiveShroudUpgradeModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-ActiveShroudUpgrade::ActiveShroudUpgrade( Thing *thing, const ModuleData* moduleData ) : 
+ActiveShroudUpgrade::ActiveShroudUpgrade( Thing *thing, const ModuleData* moduleData ) :
 							UpgradeModule( thing, moduleData )
 {
 
-}  // end ActiveShroudUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ActiveShroudUpgrade::~ActiveShroudUpgrade( void )
 {
 
-}  // end ~ActiveShroudUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -87,7 +87,7 @@ void ActiveShroudUpgrade::upgradeImplementation( void )
 		getObject()->setShroudRange( getActiveShroudUpgradeModuleData()->m_newShroudRange );
 		getObject()->handlePartitionCellMaintenance();// To shroud where I am without waiting.
 	}
-}  // end upgradeImplementation
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -98,7 +98,7 @@ void ActiveShroudUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -116,7 +116,7 @@ void ActiveShroudUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -127,4 +127,4 @@ void ActiveShroudUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ArmorUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ArmorUpgrade.cpp
index 3a308587112..b3758f6bcc4 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ArmorUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ArmorUpgrade.cpp
@@ -24,12 +24,12 @@
 
 // FILE: ArmorUpgrade.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	May 2002
@@ -37,8 +37,8 @@
 //	Filename: 	ArmorUpgrade.cpp
 //
 //	author:		Chris Brue
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "Common/Player.h"
@@ -86,7 +86,7 @@ ArmorUpgrade::~ArmorUpgrade( void )
 //-------------------------------------------------------------------------------------------------
 void ArmorUpgrade::upgradeImplementation( )
 {
-	// Very simple; just need to flag the Object as having the player upgrade, and the WeaponSet chooser 
+	// Very simple; just need to flag the Object as having the player upgrade, and the WeaponSet chooser
 	// will do the work of picking the right one from ini.  This comment is as long as the code.
 	// STILL IN PROGRESS
 	Object *obj = getObject();
@@ -113,7 +113,7 @@ void ArmorUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -131,7 +131,7 @@ void ArmorUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -142,4 +142,4 @@ void ArmorUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/CommandSetUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/CommandSetUpgrade.cpp
index c0cd9a2d4ac..56c7b3b76bf 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/CommandSetUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/CommandSetUpgrade.cpp
@@ -26,7 +26,7 @@
 // Author: Graham Smallwood, September 2002
 // Desc:	 UpgradeModule that sets a new override string for Command Set look ups
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "Common/Player.h"
@@ -36,11 +36,11 @@
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void CommandSetUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void CommandSetUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpgradeModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "CommandSet",			INI::parseAsciiString,	NULL, offsetof( CommandSetUpgradeModuleData, m_newCommandSet ) },
 		{ "CommandSetAlt",	INI::parseAsciiString,	NULL, offsetof( CommandSetUpgradeModuleData, m_newCommandSetAlt ) },
@@ -66,11 +66,11 @@ CommandSetUpgrade::~CommandSetUpgrade( void )
 //-------------------------------------------------------------------------------------------------
 void CommandSetUpgrade::upgradeImplementation( )
 {
-	Object *obj = getObject();	
+	Object *obj = getObject();
 
-	const char * upgradeAlt = getCommandSetUpgradeModuleData()->m_triggerAlt.str();
+	const AsciiString& upgradeAlt = getCommandSetUpgradeModuleData()->m_triggerAlt;
 	const UpgradeTemplate *upgradeTemplate = TheUpgradeCenter->findUpgrade( upgradeAlt );
-	
+
 	if (upgradeTemplate)
 	{
 		UpgradeMaskType upgradeMask = upgradeTemplate->getUpgradeMask();
@@ -111,7 +111,7 @@ void CommandSetUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -129,7 +129,7 @@ void CommandSetUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -140,4 +140,4 @@ void CommandSetUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/CostModifierUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/CostModifierUpgrade.cpp
index 438ba178d88..5c6b7ed9550 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/CostModifierUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/CostModifierUpgrade.cpp
@@ -24,12 +24,12 @@
 
 // FILE: CostModifierUpgrade.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Aug 2002
@@ -37,7 +37,7 @@
 //	Filename: 	CostModifierUpgrade.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	Upgrade that modifies the cost by a certain percentage
 //
 //-----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -78,7 +78,7 @@ CostModifierUpgradeModuleData::CostModifierUpgradeModuleData( void )
 	m_kindOf = KINDOFMASK_NONE;
 	m_percentage = 0;
 
-}  // end CostModifierUpgradeModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -86,15 +86,15 @@ CostModifierUpgradeModuleData::CostModifierUpgradeModuleData( void )
 {
 	UpgradeModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "EffectKindOf",		KindOfMaskType::parseFromINI, NULL, offsetof( CostModifierUpgradeModuleData, m_kindOf ) },
 		{ "Percentage",			INI::parsePercentToReal, NULL, offsetof( CostModifierUpgradeModuleData, m_percentage ) },
-		{ 0, 0, 0, 0 } 
+		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -102,18 +102,18 @@ CostModifierUpgradeModuleData::CostModifierUpgradeModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-CostModifierUpgrade::CostModifierUpgrade( Thing *thing, const ModuleData* moduleData ) : 
+CostModifierUpgrade::CostModifierUpgrade( Thing *thing, const ModuleData* moduleData ) :
 							UpgradeModule( thing, moduleData )
 {
 
-}  // end CostModifierUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 CostModifierUpgrade::~CostModifierUpgrade( void )
 {
 
-}  // end ~CostModifierUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -132,7 +132,7 @@ void CostModifierUpgrade::onDelete( void )
 	// this upgrade module is now "not upgraded"
 	setUpgradeExecuted(FALSE);
 
-}  // end onDelete
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -150,16 +150,16 @@ void CostModifierUpgrade::onCapture( Player *oldOwner, Player *newOwner )
 		oldOwner->removeKindOfProductionCostChange(getCostModifierUpgradeModuleData()->m_kindOf,getCostModifierUpgradeModuleData()->m_percentage );
 		setUpgradeExecuted(FALSE);
 
-	}  // end if
+	}
 	if( newOwner )
 	{
 
 		newOwner->addKindOfProductionCostChange(getCostModifierUpgradeModuleData()->m_kindOf,getCostModifierUpgradeModuleData()->m_percentage );
 		setUpgradeExecuted(TRUE);
 
-	}  // end if
+	}
 
-}  // end onCapture
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -170,7 +170,7 @@ void CostModifierUpgrade::upgradeImplementation( void )
 	// update the player with another TypeOfProductionCostChange
 	player->addKindOfProductionCostChange(getCostModifierUpgradeModuleData()->m_kindOf,getCostModifierUpgradeModuleData()->m_percentage );
 
-}  // end upgradeImplementation
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -181,7 +181,7 @@ void CostModifierUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -199,7 +199,7 @@ void CostModifierUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -210,4 +210,4 @@ void CostModifierUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ExperienceScalarUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ExperienceScalarUpgrade.cpp
index 5b8fb098fe9..2ec700db65f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ExperienceScalarUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ExperienceScalarUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -44,12 +44,12 @@ ExperienceScalarUpgradeModuleData::ExperienceScalarUpgradeModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void ExperienceScalarUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void ExperienceScalarUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
   UpgradeModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "AddXPScalar",	INI::parseReal,		NULL, offsetof( ExperienceScalarUpgradeModuleData, m_addXPScalar ) },
 		{ 0, 0, 0, 0 }
@@ -57,7 +57,7 @@ void ExperienceScalarUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -95,7 +95,7 @@ void ExperienceScalarUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -113,7 +113,7 @@ void ExperienceScalarUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -124,4 +124,4 @@ void ExperienceScalarUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/GrantScienceUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/GrantScienceUpgrade.cpp
index c55c8b9723b..4f35f73bdf6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/GrantScienceUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/GrantScienceUpgrade.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GrantScienceUpgrade.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
+//
 //                       Electronic Arts Los Angeles
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2003 - All Rights Reserved                  
-//                                                                          
+//
+//                       Confidential Information
+//                Copyright (C) 2003 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	  August 2, 2003
@@ -37,13 +37,13 @@
 //	Filename: 	GrantScienceUpgrade.cpp
 //
 //	Author:		  Kris Morness
-//	
+//
 //	Purpose:	  Grants specified science once requirements met (typically an upgrade).
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Player.h"
 #include "Common/Xfer.h"
@@ -52,19 +52,14 @@
 
 #include "GameLogic/Module/GrantScienceUpgrade.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void GrantScienceUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void GrantScienceUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpgradeModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "GrantScience",		INI::parseAsciiString,	NULL, offsetof( GrantScienceUpgradeModuleData, m_grantScienceName ) },
 		{ 0, 0, 0, 0 }
@@ -95,7 +90,7 @@ void GrantScienceUpgrade::upgradeImplementation( )
 		m_scienceType = TheScienceStore->getScienceFromInternalName( data->m_grantScienceName );
 	}
 
-	Object *obj = getObject();	
+	Object *obj = getObject();
 	Player *player = obj->getControllingPlayer();
 	if( player )
 	{
@@ -112,7 +107,7 @@ void GrantScienceUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -130,7 +125,7 @@ void GrantScienceUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -141,4 +136,4 @@ void GrantScienceUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/LocomotorSetUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/LocomotorSetUpgrade.cpp
index 23dad7fd2b7..ba067156d5d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/LocomotorSetUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/LocomotorSetUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -65,7 +65,7 @@ void LocomotorSetUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -83,7 +83,7 @@ void LocomotorSetUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -94,4 +94,4 @@ void LocomotorSetUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/MaxHealthUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/MaxHealthUpgrade.cpp
index 59015144ea4..f66a9db86ae 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/MaxHealthUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/MaxHealthUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_MAXHEALTHCHANGETYPE_NAMES
 #include "Common/Xfer.h"
@@ -47,12 +47,12 @@ MaxHealthUpgradeModuleData::MaxHealthUpgradeModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void MaxHealthUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void MaxHealthUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
 
   UpgradeModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "AddMaxHealth",					INI::parseReal,					NULL,										offsetof( MaxHealthUpgradeModuleData, m_addMaxHealth ) },
 		{ "ChangeType",						INI::parseIndexList,		TheMaxHealthChangeTypeNames, offsetof( MaxHealthUpgradeModuleData, m_maxHealthChangeType ) },
@@ -61,7 +61,7 @@ void MaxHealthUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 
   p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -100,7 +100,7 @@ void MaxHealthUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -118,7 +118,7 @@ void MaxHealthUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -129,4 +129,4 @@ void MaxHealthUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ModelConditionUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ModelConditionUpgrade.cpp
index 6180f64790d..92a6b84b83c 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ModelConditionUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ModelConditionUpgrade.cpp
@@ -26,7 +26,7 @@
 // Author: Graham Smallwood, July 2003
 // Desc:	 UpgradeModule that sets a modelcondition flag
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameLogic/Module/ModelConditionUpgrade.h"
 
@@ -42,11 +42,11 @@ ModelConditionUpgradeModuleData::ModelConditionUpgradeModuleData()
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void ModelConditionUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void ModelConditionUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpgradeModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ConditionFlag",	ModelConditionFlags::parseSingleBitFromINI,	NULL, offsetof( ModelConditionUpgradeModuleData, m_conditionFlag ) },
 		{ 0, 0, 0, 0 }
@@ -72,7 +72,7 @@ void ModelConditionUpgrade::upgradeImplementation( )
 {
 	const ModelConditionUpgradeModuleData *data = getModelConditionUpgradeModuleData();
 
-	Object *me = getObject();	
+	Object *me = getObject();
 
 	if( data->m_conditionFlag != MODELCONDITION_INVALID )
 		me->setModelConditionState(data->m_conditionFlag);
@@ -87,7 +87,7 @@ void ModelConditionUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -105,7 +105,7 @@ void ModelConditionUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -116,4 +116,4 @@ void ModelConditionUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ObjectCreationUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ObjectCreationUpgrade.cpp
index a4c6808700e..e486ff7a85d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ObjectCreationUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ObjectCreationUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ModelState.h"
 #include "Common/Player.h"
@@ -45,7 +45,7 @@ ObjectCreationUpgradeModuleData::ObjectCreationUpgradeModuleData( void )
 
 	m_ocl = NULL;
 
-}  // end SpecialPowerModuleData
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -53,14 +53,14 @@ ObjectCreationUpgradeModuleData::ObjectCreationUpgradeModuleData( void )
 {
 	UpgradeModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "UpgradeObject", INI::parseObjectCreationList, NULL, offsetof( ObjectCreationUpgradeModuleData, m_ocl ) },
-		{ 0, 0, 0, 0 } 
+		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -68,24 +68,24 @@ ObjectCreationUpgradeModuleData::ObjectCreationUpgradeModuleData( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-ObjectCreationUpgrade::ObjectCreationUpgrade( Thing *thing, const ModuleData* moduleData ) : 
+ObjectCreationUpgrade::ObjectCreationUpgrade( Thing *thing, const ModuleData* moduleData ) :
 							UpgradeModule( thing, moduleData )
 {
 
-}  // end ObjectCreationUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ObjectCreationUpgrade::~ObjectCreationUpgrade( void )
 {
 
-}  // end ~ObjectCreationUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void ObjectCreationUpgrade::onDelete( void )
 {
-}  // end onDelete
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -107,7 +107,7 @@ void ObjectCreationUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -125,7 +125,7 @@ void ObjectCreationUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -136,4 +136,4 @@ void ObjectCreationUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/PassengersFireUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/PassengersFireUpgrade.cpp
index 47892845c9b..d872635af96 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/PassengersFireUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/PassengersFireUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -53,11 +53,11 @@ void PassengersFireUpgrade::upgradeImplementation( )
 {
 	// Just need to flag the containmodule having the passengersallowedtofire true, .
 
-  
+
   Object *obj = getObject();
 //	obj->setWeaponSetFlag( WEAPONSET_PLAYER_UPGRADE );
 
-  ContainModuleInterface *contain = obj->getContain();  
+  ContainModuleInterface *contain = obj->getContain();
   if ( contain )
   {
     contain->setPassengerAllowedToFire( TRUE );
@@ -74,7 +74,7 @@ void PassengersFireUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -92,7 +92,7 @@ void PassengersFireUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -103,4 +103,4 @@ void PassengersFireUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/PowerPlantUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/PowerPlantUpgrade.cpp
index 5acc292a6b0..c0c493a98a4 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/PowerPlantUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/PowerPlantUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ModelState.h"
 #include "Common/Player.h"
@@ -41,18 +41,18 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-PowerPlantUpgrade::PowerPlantUpgrade( Thing *thing, const ModuleData* moduleData ) : 
+PowerPlantUpgrade::PowerPlantUpgrade( Thing *thing, const ModuleData* moduleData ) :
 							UpgradeModule( thing, moduleData )
 {
 
-}  // end PowerPlantUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 PowerPlantUpgrade::~PowerPlantUpgrade( void )
 {
 
-}  // end ~PowerPlantUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -71,7 +71,7 @@ void PowerPlantUpgrade::onDelete( void )
 	// this upgrade module is now "not upgraded"
 	setUpgradeExecuted(FALSE);
 
-}  // end onDelete
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -81,7 +81,7 @@ void PowerPlantUpgrade::onCapture( Player *oldOwner, Player *newOwner )
 	// do nothing if we haven't upgraded yet
 	if( isAlreadyUpgraded() == FALSE )
 		return;
-	
+
 	if (getObject()->isDisabled())
 		return;
 
@@ -103,7 +103,7 @@ void PowerPlantUpgrade::onCapture( Player *oldOwner, Player *newOwner )
 
 	}
 
-}  // end onCapture
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -111,7 +111,7 @@ void PowerPlantUpgrade::upgradeImplementation( void )
 {
 
 	Player *player = getObject()->getControllingPlayer();
-	
+
 	// add the new power production to the object
 	if( player )
 		player->addPowerBonus(getObject());
@@ -124,8 +124,8 @@ void PowerPlantUpgrade::upgradeImplementation( void )
 		if( ppui )
 			ppui->extendRods(TRUE);
 	}
-	
-}  // end upgradeImplementation
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -136,7 +136,7 @@ void PowerPlantUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -154,7 +154,7 @@ void PowerPlantUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -164,16 +164,16 @@ void PowerPlantUpgrade::loadPostProcess( void )
 
 	// extend base class
 	UpgradeModule::loadPostProcess();
-	
+
 	// Most upgrade modules have state change effects that are themselves saved.  This one is a fire and forget.
 	// So we need to re-fire on load if we are turned on.
 	if( isAlreadyUpgraded() )
 	{
 		Player *player = getObject()->getControllingPlayer();
-		
+
 		// add the new power production to the object
 		if( player )
 			player->addPowerBonus(getObject());
 	}
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/RadarUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/RadarUpgrade.cpp
index 4da76556cbd..4be2d345ac6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/RadarUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/RadarUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/ModelState.h"
 #include "Common/Player.h"
@@ -40,11 +40,11 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void RadarUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void RadarUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpgradeModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "DisableProof",	INI::parseBool,	NULL, offsetof( RadarUpgradeModuleData, m_isDisableProof ) },
 		{ 0, 0, 0, 0 }
@@ -54,18 +54,18 @@ void RadarUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-RadarUpgrade::RadarUpgrade( Thing *thing, const ModuleData* moduleData ) : 
+RadarUpgrade::RadarUpgrade( Thing *thing, const ModuleData* moduleData ) :
 							UpgradeModule( thing, moduleData )
 {
 
-}  // end RadarUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 RadarUpgrade::~RadarUpgrade( void )
 {
 
-}  // end ~RadarUpgrade
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -89,7 +89,7 @@ void RadarUpgrade::onDelete( void )
 	// this upgrade module is now "not upgraded"
 	setUpgradeExecuted(FALSE);
 
-}  // end onDelete
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -112,16 +112,16 @@ void RadarUpgrade::onCapture( Player *oldOwner, Player *newOwner )
 		oldOwner->removeRadar( md->m_isDisableProof );
 		setUpgradeExecuted(FALSE);
 
-	}  // end if
+	}
 	if( newOwner )
 	{
 
 		newOwner->addRadar( md->m_isDisableProof );
 		setUpgradeExecuted(TRUE);
 
-	}  // end if
+	}
 
-}  // end onCapture
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -140,7 +140,7 @@ void RadarUpgrade::upgradeImplementation( void )
 	if( radarUpdate )
 		radarUpdate->extendRadar();
 
-}  // end upgradeImplementation
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -151,7 +151,7 @@ void RadarUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -169,7 +169,7 @@ void RadarUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -180,4 +180,4 @@ void RadarUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ReplaceObjectUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ReplaceObjectUpgrade.cpp
index 91ec4ee4be9..3406cc3545a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ReplaceObjectUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ReplaceObjectUpgrade.cpp
@@ -26,7 +26,7 @@
 // Author: Graham Smallwood, July 2003
 // Desc:	 UpgradeModule that creates a new Object in our exact location and then deletes our object
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameLogic/Module/ReplaceObjectUpgrade.h"
 
@@ -38,14 +38,15 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Module/CreateModule.h"
 #include "GameLogic/Object.h"
+#include "GameClient/InGameUI.h"
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void ReplaceObjectUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void ReplaceObjectUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpgradeModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ReplaceObject",	INI::parseAsciiString,	NULL, offsetof( ReplaceObjectUpgradeModuleData, m_replaceObjectName ) },
 		{ 0, 0, 0, 0 }
@@ -70,23 +71,34 @@ ReplaceObjectUpgrade::~ReplaceObjectUpgrade( void )
 void ReplaceObjectUpgrade::upgradeImplementation( )
 {
 	const ReplaceObjectUpgradeModuleData *data = getReplaceObjectUpgradeModuleData();
+	const ThingTemplate* replacementTemplate = TheThingFactory->findTemplate(data->m_replaceObjectName);
 
-	Object *me = getObject();	
+	Bool oldObjectSelected;
+	Int oldObjectSquadNumber;
+	Matrix3D myMatrix;
+	Team* myTeam;
 
-	Matrix3D myMatrix = *me->getTransformMatrix();
-	Team *myTeam = me->getTeam();// Team implies player.  It is a subset.
-
-	const ThingTemplate *replacementTemplate = TheThingFactory->findTemplate(data->m_replaceObjectName);
-	if( replacementTemplate == NULL )
 	{
-		DEBUG_ASSERTCRASH(replacementTemplate != NULL, ("No such object '%s' in ReplaceObjectUpgrade.", data->m_replaceObjectName.str() ) );
-		return;
-	}
+		Object* me = getObject();
+
+		myMatrix = *me->getTransformMatrix();
+		myTeam = me->getTeam();// Team implies player.  It is a subset.
 
-	// Remove us first since occupation of cells is apparently not a refcount, but a flag.  If I don't remove, then the new
-	// thing will be placed, and then on deletion I will remove "his" marks.
-	TheAI->pathfinder()->removeObjectFromPathfindMap( me );
-	TheGameLogic->destroyObject(me);
+		if (replacementTemplate == NULL)
+		{
+			DEBUG_ASSERTCRASH(replacementTemplate != NULL, ("No such object '%s' in ReplaceObjectUpgrade.", data->m_replaceObjectName.str()));
+			return;
+		}
+
+		Drawable* selectedDrawable = TheInGameUI->getFirstSelectedDrawable();
+		oldObjectSelected = selectedDrawable && selectedDrawable->getID() == me->getDrawable()->getID();
+		oldObjectSquadNumber = me->getControllingPlayer()->getSquadNumberForObject(me);
+
+		// Remove us first since occupation of cells is apparently not a refcount, but a flag.  If I don't remove, then the new
+		// thing will be placed, and then on deletion I will remove "his" marks.
+		TheAI->pathfinder()->removeObjectFromPathfindMap(me);
+		TheGameLogic->destroyObject(me);
+	}
 
 	Object *replacementObject = TheThingFactory->newObject(replacementTemplate, myTeam);
 	replacementObject->setTransformMatrix(&myMatrix);
@@ -104,7 +116,26 @@ void ReplaceObjectUpgrade::upgradeImplementation( )
 
 	if( replacementObject->getControllingPlayer() )
 	{
-		replacementObject->getControllingPlayer()->onStructureConstructionComplete(me, replacementObject, FALSE);
+		replacementObject->getControllingPlayer()->onStructureConstructionComplete(NULL, replacementObject, FALSE);
+
+		// TheSuperHackers @bugfix Stubbjax 26/05/2025 If the old object was selected, select the new one.
+		if (oldObjectSelected)
+		{
+			GameMessage* msg = TheMessageStream->appendMessage(GameMessage::MSG_CREATE_SELECTED_GROUP_NO_SOUND);
+			msg->appendBooleanArgument(TRUE);
+			msg->appendObjectIDArgument(replacementObject->getID());
+			TheInGameUI->selectDrawable(replacementObject->getDrawable());
+		}
+
+		// TheSuperHackers @bugfix Stubbjax 26/05/2025 If the old object was grouped, group the new one.
+		if (oldObjectSquadNumber != NO_HOTKEY_SQUAD)
+		{
+			if (replacementObject->isLocallyControlled())
+			{
+				GameMessage* msg = TheMessageStream->appendMessage((GameMessage::Type)(GameMessage::MSG_CREATE_TEAM0 + oldObjectSquadNumber));
+				msg->appendObjectIDArgument(replacementObject->getID());
+			}
+		}
 	}
 }
 
@@ -117,7 +148,7 @@ void ReplaceObjectUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -135,7 +166,7 @@ void ReplaceObjectUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -146,4 +177,4 @@ void ReplaceObjectUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/StatusBitsUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/StatusBitsUpgrade.cpp
index 99f6b0275cc..18b889e7ba4 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/StatusBitsUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/StatusBitsUpgrade.cpp
@@ -24,12 +24,12 @@
 
 // FILE: StatusBitsUpgrade.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	May 2002
@@ -37,8 +37,8 @@
 //	Filename: 	StatusBitsUpgrade.cpp
 //
 //	author:		Steven Johnson
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -51,7 +51,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_OBJECT_STATUS_NAMES
 #include "Common/Xfer.h"
@@ -73,11 +73,11 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void StatusBitsUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void StatusBitsUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpgradeModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "StatusToSet",		ObjectStatusMaskType::parseFromINI,	NULL, offsetof( StatusBitsUpgradeModuleData, m_statusToSet ) },
 		{ "StatusToClear",	ObjectStatusMaskType::parseFromINI,	NULL, offsetof( StatusBitsUpgradeModuleData, m_statusToClear ) },
@@ -102,7 +102,7 @@ StatusBitsUpgrade::~StatusBitsUpgrade( void )
 //-------------------------------------------------------------------------------------------------
 void StatusBitsUpgrade::upgradeImplementation( )
 {
-	Object *obj = getObject();	
+	Object *obj = getObject();
 	obj->setStatus( getStatusBitsUpgradeModuleData()->m_statusToSet );
 	obj->clearStatus( getStatusBitsUpgradeModuleData()->m_statusToClear );
 }
@@ -116,7 +116,7 @@ void StatusBitsUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -134,7 +134,7 @@ void StatusBitsUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -145,4 +145,4 @@ void StatusBitsUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/StealthUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/StealthUpgrade.cpp
index 97f1695a2fb..2d31e174846 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/StealthUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/StealthUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Module/StealthUpgrade.h"
@@ -53,7 +53,7 @@ void StealthUpgrade::upgradeImplementation( )
 	// The logic that does the stealthupdate will notice this and start stealthing
 	Object *me = getObject();
 	me->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_CAN_STEALTH ) );
-	
+
 	//Grant stealth to spawns if applicable.
 	if( me->isKindOf( KINDOF_SPAWNS_ARE_THE_WEAPONS ) )
 	{
@@ -74,7 +74,7 @@ void StealthUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -92,7 +92,7 @@ void StealthUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -103,4 +103,4 @@ void StealthUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/SubObjectsUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/SubObjectsUpgrade.cpp
index ecc512a7690..2c1fe9a2358 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/SubObjectsUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/SubObjectsUpgrade.cpp
@@ -24,12 +24,12 @@
 
 // FILE: SubObjectsUpgrade.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	Created:	September 2002
@@ -37,14 +37,14 @@
 //	Filename: SubObjectsUpgrade.cpp
 //
 //	Author:		Kris Morness
-//	
+//
 //	Purpose:	Shows or hides a list of subobjects based on upgrade statii. It
 //            will override any animation subobjects states.
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_OBJECT_STATUS_NAMES
 #include "Common/Player.h"
@@ -55,11 +55,11 @@
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void SubObjectsUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void SubObjectsUpgradeModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   UpgradeModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "ShowSubObjects", INI::parseAsciiStringVectorAppend, NULL, offsetof( SubObjectsUpgradeModuleData, m_showSubObjectNames ) },
 		{ "HideSubObjects", INI::parseAsciiStringVectorAppend, NULL, offsetof( SubObjectsUpgradeModuleData, m_hideSubObjectNames ) },
@@ -87,7 +87,7 @@ void SubObjectsUpgrade::upgradeImplementation( )
 	const SubObjectsUpgradeModuleData *data = getSubObjectsUpgradeModuleData();
 	UpgradeMaskType activation, conflicting;
 	getUpgradeActivationMasks( activation, conflicting );
-	
+
 	//First make sure we have the right combination of upgrades
 
 	if( getObject()->getObjectCompletedUpgradeMask().testForAny( conflicting ) )
@@ -136,12 +136,12 @@ void SubObjectsUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 //------------------------------------------------------------------------------------------------
 // Xfer method
 // Version Info:
-// 1: Initial version 
+// 1: Initial version
 //------------------------------------------------------------------------------------------------
 void SubObjectsUpgrade::xfer( Xfer *xfer )
 {
@@ -154,7 +154,7 @@ void SubObjectsUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 //------------------------------------------------------------------------------------------------
 void SubObjectsUpgrade::loadPostProcess( void )
@@ -163,4 +163,4 @@ void SubObjectsUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/UnpauseSpecialPowerUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/UnpauseSpecialPowerUpgrade.cpp
index 3ac6ca9a3de..135f71b26a5 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/UnpauseSpecialPowerUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/UnpauseSpecialPowerUpgrade.cpp
@@ -24,7 +24,7 @@
 
 // FILE: UnpauseSpecialPowerUpgrade.cpp ///////////////////////////////////////////////////////////////////////////
 // Author: Graham Smallwood, August 2002
-// Desc:	 An upgrade that starts the timer on a Special Power module, so you can have them 
+// Desc:	 An upgrade that starts the timer on a Special Power module, so you can have them
 // dependent on upgrades on the logic side, like NEED_UPGRADE does on the client side by disabling
 // the button.
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -42,7 +42,7 @@
 UnpauseSpecialPowerUpgradeModuleData::UnpauseSpecialPowerUpgradeModuleData( void )
 {
 	m_specialPower = NULL;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -50,14 +50,14 @@ UnpauseSpecialPowerUpgradeModuleData::UnpauseSpecialPowerUpgradeModuleData( void
 {
 	UpgradeModuleData::buildFieldParse( p );
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SpecialPowerTemplate", INI::parseSpecialPowerTemplate, NULL, offsetof( UnpauseSpecialPowerUpgradeModuleData, m_specialPower ) },
-		{ 0, 0, 0, 0 } 
+		{ 0, 0, 0, 0 }
 	};
 	p.add(dataFieldParse);
 
-}  // end buildFieldParse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -65,18 +65,18 @@ UnpauseSpecialPowerUpgradeModuleData::UnpauseSpecialPowerUpgradeModuleData( void
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-UnpauseSpecialPowerUpgrade::UnpauseSpecialPowerUpgrade( Thing *thing, const ModuleData* moduleData ) : 
+UnpauseSpecialPowerUpgrade::UnpauseSpecialPowerUpgrade( Thing *thing, const ModuleData* moduleData ) :
 							UpgradeModule( thing, moduleData )
 {
 
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 UnpauseSpecialPowerUpgrade::~UnpauseSpecialPowerUpgrade( void )
 {
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -102,7 +102,7 @@ void UnpauseSpecialPowerUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -120,7 +120,7 @@ void UnpauseSpecialPowerUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -131,4 +131,4 @@ void UnpauseSpecialPowerUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp
index 7661c675f95..314cb8ee26e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp
@@ -32,11 +32,6 @@
 #include "Common/Xfer.h"
 #include "GameLogic/Module/UpgradeModule.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -46,11 +41,11 @@ void UpgradeModule::crc( Xfer *xfer )
 
 	// extend base class
 	BehaviorModule::crc( xfer );
-	
+
 	// extned base class
 	UpgradeMux::upgradeMuxCRC( xfer );
-	
-}  // end crc
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method */
@@ -69,7 +64,7 @@ void UpgradeModule::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeMux::upgradeMuxXfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -83,7 +78,7 @@ void UpgradeModule::loadPostProcess( void )
 	// extend base class
 	UpgradeMux::upgradeMuxLoadPostProcess();
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -94,9 +89,9 @@ UpgradeMux::UpgradeMux() : m_upgradeExecuted(false)
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Bool UpgradeMux::isAlreadyUpgraded() const 
-{ 
-	return m_upgradeExecuted; 
+Bool UpgradeMux::isAlreadyUpgraded() const
+{
+	return m_upgradeExecuted;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -146,7 +141,7 @@ Bool UpgradeMux::wouldUpgrade( UpgradeMaskType keyMask ) const
 					return TRUE;
 				}
 			}
-			else 
+			else
 			{
 				//Check if ANY trigger requirements are met.
 				if( keyMask.testForAny( activation ) )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponBonusUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponBonusUpgrade.cpp
index 2dcd00745f6..0e816f3a730 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponBonusUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponBonusUpgrade.cpp
@@ -24,12 +24,12 @@
 
 // FILE: WeaponBonusUpgrade.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	May 2002
@@ -37,8 +37,8 @@
 //	Filename: 	WeaponBonusUpgrade.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@
 //-----------------------------------------------------------------------------
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -85,11 +85,11 @@ WeaponBonusUpgrade::~WeaponBonusUpgrade( void )
 //-------------------------------------------------------------------------------------------------
 void WeaponBonusUpgrade::upgradeImplementation( )
 {
-	// Very simple; just need to flag the Object as having the player upgrade, and the WeaponSet chooser 
+	// Very simple; just need to flag the Object as having the player upgrade, and the WeaponSet chooser
 	// will do the work of picking the right one from ini.  This comment is as long as the code.
 	Object *obj = getObject();
 	obj->setWeaponBonusCondition( WEAPONBONUSCONDITION_PLAYER_UPGRADE );
-	
+
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -101,7 +101,7 @@ void WeaponBonusUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -119,7 +119,7 @@ void WeaponBonusUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -130,4 +130,4 @@ void WeaponBonusUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponSetUpgrade.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponSetUpgrade.cpp
index 07076cfc497..d1039100528 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponSetUpgrade.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/WeaponSetUpgrade.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/Xfer.h"
 #include "GameLogic/Object.h"
@@ -50,7 +50,7 @@ WeaponSetUpgrade::~WeaponSetUpgrade( void )
 //-------------------------------------------------------------------------------------------------
 void WeaponSetUpgrade::upgradeImplementation( )
 {
-	// Very simple; just need to flag the Object as having the player upgrade, and the WeaponSet chooser 
+	// Very simple; just need to flag the Object as having the player upgrade, and the WeaponSet chooser
 	// will do the work of picking the right one from ini.  This comment is as long as the code.
 	Object *obj = getObject();
 	obj->setWeaponSetFlag( WEAPONSET_PLAYER_UPGRADE );
@@ -65,7 +65,7 @@ void WeaponSetUpgrade::crc( Xfer *xfer )
 	// extend base class
 	UpgradeModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -83,7 +83,7 @@ void WeaponSetUpgrade::xfer( Xfer *xfer )
 	// extend base class
 	UpgradeModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -94,4 +94,4 @@ void WeaponSetUpgrade::loadPostProcess( void )
 	// extend base class
 	UpgradeModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
index 2686ad2798a..473f284ab41 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_DEATH_NAMES
 #define DEFINE_WEAPONBONUSCONDITION_NAMES
@@ -48,7 +48,7 @@
 #include "Common/ThingFactory.h"
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
- 
+
 #include "GameClient/Drawable.h"
 #include "GameClient/FXList.h"
 #include "GameClient/InGameUI.h"
@@ -85,11 +85,6 @@
 	const DistanceCalculationType ATTACK_RANGE_CALC_TYPE = FROM_BOUNDINGSPHERE_3D;
 #endif
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // damage is ALWAYS 3d
 const DistanceCalculationType DAMAGE_RANGE_CALC_TYPE = FROM_BOUNDINGSPHERE_3D;
@@ -164,86 +159,86 @@ WeaponStore *TheWeaponStore = NULL;					///< the weapon store definition
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-const FieldParse WeaponTemplate::TheWeaponTemplateFieldParseTable[] = 
-{
-
-	{ "PrimaryDamage",						INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_primaryDamage) },		
-	{ "PrimaryDamageRadius",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_primaryDamageRadius) },		
-	{ "SecondaryDamage",					INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_secondaryDamage) },		
-	{ "SecondaryDamageRadius",		INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_secondaryDamageRadius) },		
-	{ "ShockWaveAmount",					INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_shockWaveAmount) },		
-	{ "ShockWaveRadius",					INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_shockWaveRadius) },		
-	{ "ShockWaveTaperOff",				INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_shockWaveTaperOff) },		
-	{ "AttackRange",							INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_attackRange) },		
-	{ "MinimumAttackRange",				INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_minimumAttackRange) },		
-	{ "RequestAssistRange",				INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_requestAssistRange) },		
-	{ "AcceptableAimDelta",				INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_aimDelta) },		
-	{ "ScatterRadius",						INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_scatterRadius) },		
-	{ "ScatterTargetScalar",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_scatterTargetScalar) },		
+const FieldParse WeaponTemplate::TheWeaponTemplateFieldParseTable[] =
+{
+
+	{ "PrimaryDamage",						INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_primaryDamage) },
+	{ "PrimaryDamageRadius",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_primaryDamageRadius) },
+	{ "SecondaryDamage",					INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_secondaryDamage) },
+	{ "SecondaryDamageRadius",		INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_secondaryDamageRadius) },
+	{ "ShockWaveAmount",					INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_shockWaveAmount) },
+	{ "ShockWaveRadius",					INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_shockWaveRadius) },
+	{ "ShockWaveTaperOff",				INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_shockWaveTaperOff) },
+	{ "AttackRange",							INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_attackRange) },
+	{ "MinimumAttackRange",				INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_minimumAttackRange) },
+	{ "RequestAssistRange",				INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_requestAssistRange) },
+	{ "AcceptableAimDelta",				INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_aimDelta) },
+	{ "ScatterRadius",						INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_scatterRadius) },
+	{ "ScatterTargetScalar",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_scatterTargetScalar) },
 	{ "ScatterRadiusVsInfantry",	INI::parseReal,													NULL,							offsetof( WeaponTemplate, m_infantryInaccuracyDist ) },
-	{ "DamageType",								DamageTypeFlags::parseSingleBitFromINI,	NULL,							offsetof(WeaponTemplate, m_damageType) },		
-	{ "DamageStatusType",					ObjectStatusMaskType::parseSingleBitFromINI,	NULL,				offsetof(WeaponTemplate, m_damageStatusType) },		
-	{ "DeathType",								INI::parseIndexList,										TheDeathNames,		offsetof(WeaponTemplate, m_deathType) },		
-	{ "WeaponSpeed",							INI::parseVelocityReal,									NULL,							offsetof(WeaponTemplate, m_weaponSpeed) },		
-	{ "MinWeaponSpeed",						INI::parseVelocityReal,									NULL,							offsetof(WeaponTemplate, m_minWeaponSpeed) },		
-	{ "ScaleWeaponSpeed",					INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_isScaleWeaponSpeed) },		
-	{ "WeaponRecoil",							INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_weaponRecoil) },		
-	{ "MinTargetPitch",						INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_minTargetPitch) },		
-	{ "MaxTargetPitch",						INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_maxTargetPitch) },		
-	{ "RadiusDamageAngle",				INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_radiusDamageAngle) },		
-	{ "ProjectileObject",					INI::parseAsciiString,									NULL,							offsetof(WeaponTemplate, m_projectileName) },		
-	{ "FireSound",								INI::parseAudioEventRTS,								NULL,							offsetof(WeaponTemplate, m_fireSound) },		
-	{ "FireSoundLoopTime",				INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_fireSoundLoopTime) },		
-	{ "FireFX",											parseAllVetLevelsFXList,							NULL,							offsetof(WeaponTemplate, m_fireFXs) },		
-	{ "ProjectileDetonationFX",			parseAllVetLevelsFXList,							NULL,							offsetof(WeaponTemplate, m_projectileDetonateFXs) },		
-	{ "FireOCL",										parseAllVetLevelsAsciiString,					NULL,							offsetof(WeaponTemplate, m_fireOCLNames) },		
-	{ "ProjectileDetonationOCL",		parseAllVetLevelsAsciiString,					NULL,							offsetof(WeaponTemplate, m_projectileDetonationOCLNames) },		
-	{ "ProjectileExhaust",					parseAllVetLevelsPSys,								NULL,							offsetof(WeaponTemplate, m_projectileExhausts) },		
-	{ "VeterancyFireFX",										parsePerVetLevelFXList,				NULL,							offsetof(WeaponTemplate, m_fireFXs) },		
-	{ "VeterancyProjectileDetonationFX",		parsePerVetLevelFXList,				NULL,							offsetof(WeaponTemplate, m_projectileDetonateFXs) },		
-	{ "VeterancyFireOCL",										parsePerVetLevelAsciiString,	NULL,							offsetof(WeaponTemplate, m_fireOCLNames) },		
-	{ "VeterancyProjectileDetonationOCL",		parsePerVetLevelAsciiString,	NULL,							offsetof(WeaponTemplate, m_projectileDetonationOCLNames) },		
-	{ "VeterancyProjectileExhaust",					parsePerVetLevelPSys,					NULL,							offsetof(WeaponTemplate, m_projectileExhausts) },		
-	{ "ClipSize",									INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_clipSize) },		
-	{ "ContinuousFireOne",				INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_continuousFireOneShotsNeeded) },		
-	{ "ContinuousFireTwo",				INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_continuousFireTwoShotsNeeded) },		
-	{ "ContinuousFireCoast",			INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_continuousFireCoastFrames) },		
- 	{ "AutoReloadWhenIdle",				INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_autoReloadWhenIdleFrames) },		
-	{ "ClipReloadTime",						INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_clipReloadTime) },		
+	{ "DamageType",								DamageTypeFlags::parseSingleBitFromINI,	NULL,							offsetof(WeaponTemplate, m_damageType) },
+	{ "DamageStatusType",					ObjectStatusMaskType::parseSingleBitFromINI,	NULL,				offsetof(WeaponTemplate, m_damageStatusType) },
+	{ "DeathType",								INI::parseIndexList,										TheDeathNames,		offsetof(WeaponTemplate, m_deathType) },
+	{ "WeaponSpeed",							INI::parseVelocityReal,									NULL,							offsetof(WeaponTemplate, m_weaponSpeed) },
+	{ "MinWeaponSpeed",						INI::parseVelocityReal,									NULL,							offsetof(WeaponTemplate, m_minWeaponSpeed) },
+	{ "ScaleWeaponSpeed",					INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_isScaleWeaponSpeed) },
+	{ "WeaponRecoil",							INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_weaponRecoil) },
+	{ "MinTargetPitch",						INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_minTargetPitch) },
+	{ "MaxTargetPitch",						INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_maxTargetPitch) },
+	{ "RadiusDamageAngle",				INI::parseAngleReal,										NULL,							offsetof(WeaponTemplate, m_radiusDamageAngle) },
+	{ "ProjectileObject",					INI::parseAsciiString,									NULL,							offsetof(WeaponTemplate, m_projectileName) },
+	{ "FireSound",								INI::parseAudioEventRTS,								NULL,							offsetof(WeaponTemplate, m_fireSound) },
+	{ "FireSoundLoopTime",				INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_fireSoundLoopTime) },
+	{ "FireFX",											parseAllVetLevelsFXList,							NULL,							offsetof(WeaponTemplate, m_fireFXs) },
+	{ "ProjectileDetonationFX",			parseAllVetLevelsFXList,							NULL,							offsetof(WeaponTemplate, m_projectileDetonateFXs) },
+	{ "FireOCL",										parseAllVetLevelsAsciiString,					NULL,							offsetof(WeaponTemplate, m_fireOCLNames) },
+	{ "ProjectileDetonationOCL",		parseAllVetLevelsAsciiString,					NULL,							offsetof(WeaponTemplate, m_projectileDetonationOCLNames) },
+	{ "ProjectileExhaust",					parseAllVetLevelsPSys,								NULL,							offsetof(WeaponTemplate, m_projectileExhausts) },
+	{ "VeterancyFireFX",										parsePerVetLevelFXList,				NULL,							offsetof(WeaponTemplate, m_fireFXs) },
+	{ "VeterancyProjectileDetonationFX",		parsePerVetLevelFXList,				NULL,							offsetof(WeaponTemplate, m_projectileDetonateFXs) },
+	{ "VeterancyFireOCL",										parsePerVetLevelAsciiString,	NULL,							offsetof(WeaponTemplate, m_fireOCLNames) },
+	{ "VeterancyProjectileDetonationOCL",		parsePerVetLevelAsciiString,	NULL,							offsetof(WeaponTemplate, m_projectileDetonationOCLNames) },
+	{ "VeterancyProjectileExhaust",					parsePerVetLevelPSys,					NULL,							offsetof(WeaponTemplate, m_projectileExhausts) },
+	{ "ClipSize",									INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_clipSize) },
+	{ "ContinuousFireOne",				INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_continuousFireOneShotsNeeded) },
+	{ "ContinuousFireTwo",				INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_continuousFireTwoShotsNeeded) },
+	{ "ContinuousFireCoast",			INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_continuousFireCoastFrames) },
+ 	{ "AutoReloadWhenIdle",				INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_autoReloadWhenIdleFrames) },
+	{ "ClipReloadTime",						INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_clipReloadTime) },
 	{ "DelayBetweenShots",				WeaponTemplate::parseShotDelay,					NULL,							0 },
 	{ "ShotsPerBarrel",						INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_shotsPerBarrel) },
-	{ "DamageDealtAtSelfPosition",INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_damageDealtAtSelfPosition) },		
-	{ "RadiusDamageAffects",			INI::parseBitString32,	TheWeaponAffectsMaskNames,				offsetof(WeaponTemplate, m_affectsMask) },		
-	{ "ProjectileCollidesWith",		INI::parseBitString32,	TheWeaponCollideMaskNames,				offsetof(WeaponTemplate, m_collideMask) },		
-	{ "AntiAirborneVehicle",			INI::parseBitInInt32,										(void*)WEAPON_ANTI_AIRBORNE_VEHICLE,	offsetof(WeaponTemplate, m_antiMask) },		
-	{ "AntiGround",								INI::parseBitInInt32,										(void*)WEAPON_ANTI_GROUND,						offsetof(WeaponTemplate, m_antiMask) },		
-	{ "AntiProjectile",						INI::parseBitInInt32,										(void*)WEAPON_ANTI_PROJECTILE,				offsetof(WeaponTemplate, m_antiMask) },		
+	{ "DamageDealtAtSelfPosition",INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_damageDealtAtSelfPosition) },
+	{ "RadiusDamageAffects",			INI::parseBitString32,	TheWeaponAffectsMaskNames,				offsetof(WeaponTemplate, m_affectsMask) },
+	{ "ProjectileCollidesWith",		INI::parseBitString32,	TheWeaponCollideMaskNames,				offsetof(WeaponTemplate, m_collideMask) },
+	{ "AntiAirborneVehicle",			INI::parseBitInInt32,										(void*)WEAPON_ANTI_AIRBORNE_VEHICLE,	offsetof(WeaponTemplate, m_antiMask) },
+	{ "AntiGround",								INI::parseBitInInt32,										(void*)WEAPON_ANTI_GROUND,						offsetof(WeaponTemplate, m_antiMask) },
+	{ "AntiProjectile",						INI::parseBitInInt32,										(void*)WEAPON_ANTI_PROJECTILE,				offsetof(WeaponTemplate, m_antiMask) },
 	{ "AntiSmallMissile",					INI::parseBitInInt32,										(void*)WEAPON_ANTI_SMALL_MISSILE,			offsetof(WeaponTemplate, m_antiMask) },
 	{ "AntiMine",									INI::parseBitInInt32,										(void*)WEAPON_ANTI_MINE,							offsetof(WeaponTemplate, m_antiMask) },
 	{ "AntiParachute",						INI::parseBitInInt32,										(void*)WEAPON_ANTI_PARACHUTE,					offsetof(WeaponTemplate, m_antiMask) },
 	{ "AntiAirborneInfantry",			INI::parseBitInInt32,										(void*)WEAPON_ANTI_AIRBORNE_INFANTRY, offsetof(WeaponTemplate, m_antiMask) },
 	{ "AntiBallisticMissile",			INI::parseBitInInt32,										(void*)WEAPON_ANTI_BALLISTIC_MISSILE, offsetof(WeaponTemplate, m_antiMask) },
-	{ "AutoReloadsClip",					INI::parseIndexList,										TheWeaponReloadNames,							offsetof(WeaponTemplate, m_reloadType) },		
+	{ "AutoReloadsClip",					INI::parseIndexList,										TheWeaponReloadNames,							offsetof(WeaponTemplate, m_reloadType) },
 	{ "ProjectileStreamName",			INI::parseAsciiString,									NULL,							offsetof(WeaponTemplate, m_projectileStreamName) },
 	{ "LaserName",								INI::parseAsciiString,									NULL,							offsetof(WeaponTemplate, m_laserName) },
 	{ "LaserBoneName",						INI::parseAsciiString,									NULL,							offsetof(WeaponTemplate, m_laserBoneName) },
-	{ "WeaponBonus",							WeaponTemplate::parseWeaponBonusSet,		NULL,							0 },		
-	{ "HistoricBonusTime",				INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_historicBonusTime) },		
-	{ "HistoricBonusRadius",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_historicBonusRadius) },		
-	{ "HistoricBonusCount",				INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_historicBonusCount) },		
-	{ "HistoricBonusWeapon",			INI::parseWeaponTemplate,								NULL,							offsetof(WeaponTemplate, m_historicBonusWeapon) },		
+	{ "WeaponBonus",							WeaponTemplate::parseWeaponBonusSet,		NULL,							0 },
+	{ "HistoricBonusTime",				INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_historicBonusTime) },
+	{ "HistoricBonusRadius",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_historicBonusRadius) },
+	{ "HistoricBonusCount",				INI::parseInt,													NULL,							offsetof(WeaponTemplate, m_historicBonusCount) },
+	{ "HistoricBonusWeapon",			INI::parseWeaponTemplate,								NULL,							offsetof(WeaponTemplate, m_historicBonusWeapon) },
 	{ "LeechRangeWeapon",					INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_leechRangeWeapon) },
-	{ "ScatterTarget",						WeaponTemplate::parseScatterTarget,			NULL,							0 },		
+	{ "ScatterTarget",						WeaponTemplate::parseScatterTarget,			NULL,							0 },
 	{ "CapableOfFollowingWaypoints", INI::parseBool,											NULL,							offsetof(WeaponTemplate, m_capableOfFollowingWaypoint) },
 	{ "ShowsAmmoPips",						INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_isShowsAmmoPips) },
 	{ "AllowAttackGarrisonedBldgs", INI::parseBool,												NULL,							offsetof(WeaponTemplate, m_allowAttackGarrisonedBldgs) },
 	{ "PlayFXWhenStealthed",			INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_playFXWhenStealthed) },
 	{ "PreAttackDelay",						INI::parseDurationUnsignedInt,					NULL,							offsetof( WeaponTemplate, m_preAttackDelay ) },
-	{ "PreAttackType",						INI::parseIndexList,										TheWeaponPrefireNames, offsetof(WeaponTemplate, m_prefireType) },		
+	{ "PreAttackType",						INI::parseIndexList,										TheWeaponPrefireNames, offsetof(WeaponTemplate, m_prefireType) },
 	{ "ContinueAttackRange",			INI::parseReal,													NULL,							offsetof(WeaponTemplate, m_continueAttackRange) },
-	{ "SuspendFXDelay",						INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_suspendFXDelay) },		
+	{ "SuspendFXDelay",						INI::parseDurationUnsignedInt,					NULL,							offsetof(WeaponTemplate, m_suspendFXDelay) },
 	{ "MissileCallsOnDie",			INI::parseBool,													NULL,							offsetof(WeaponTemplate, m_dieOnDetonate) },
-	{ NULL,												NULL,																		NULL,							0 }  // keep this last
+	{ NULL,												NULL,																		NULL,							0 }
 
 };
 
@@ -327,25 +322,24 @@ WeaponTemplate::WeaponTemplate() : m_nextTemplate(NULL)
 	m_damageStatusType							= OBJECT_STATUS_NONE;
 	m_suspendFXDelay								= 0;
 	m_dieOnDetonate						= FALSE;
+
+	m_historicDamageTriggerId = 0;
 }
 
 //-------------------------------------------------------------------------------------------------
 WeaponTemplate::~WeaponTemplate()
 {
-	if (m_nextTemplate) {
-		deleteInstance(m_nextTemplate);
-	}
+	deleteInstance(m_nextTemplate);
 
 	// delete any extra-bonus that's present
-	if (m_extraBonus)
-		deleteInstance(m_extraBonus);
+	deleteInstance(m_extraBonus);
 }
 
 // ------------------------------------------------------------------------------------------------
 void WeaponTemplate::reset( void )
 {
 	m_historicDamage.clear();
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ void WeaponTemplate::parseWeaponBonusSet( INI* ini, void *instance, void * /*store*/, const void* /*userData*/ )
@@ -395,14 +389,14 @@ void WeaponTemplate::reset( void )
 		else
 			self->m_maxDelayBetweenShots = INI::scanInt(ini->getNextToken(ini->getSepsColon()));
 	}
-	else 
+	else
 	{
 		// single entry, as in no label so the first token is just a number
 		self->m_minDelayBetweenShots = INI::scanInt(token);
 		self->m_maxDelayBetweenShots = self->m_minDelayBetweenShots;
 	}
 
-	// No matter what we have now, we want to convert it to frames from msec. 
+	// No matter what we have now, we want to convert it to frames from msec.
 	// ShotDelay used to use parseDurationUnsignedInt, and we are expanding on that.
 	self->m_minDelayBetweenShots = ceilf(ConvertDurationFromMsecsToFrames((Real)self->m_minDelayBetweenShots));
 	self->m_maxDelayBetweenShots = ceilf(ConvertDurationFromMsecsToFrames((Real)self->m_maxDelayBetweenShots));
@@ -417,7 +411,7 @@ void WeaponTemplate::postProcessLoad()
 		DEBUG_CRASH(("you must call this after TheThingFactory is inited"));
 		return;
 	}
-	
+
 	if (m_projectileName.isEmpty())
 	{
 		m_projectileTmpl = NULL;
@@ -455,37 +449,37 @@ void WeaponTemplate::postProcessLoad()
 		m_projectileDetonationOCLNames[i].clear();
 	}
 
-}  // end postProcessLoad
+}
 
 //-------------------------------------------------------------------------------------------------
-Real WeaponTemplate::getAttackRange(const WeaponBonus& bonus) const 
+Real WeaponTemplate::getAttackRange(const WeaponBonus& bonus) const
 {
 #ifdef RATIONALIZE_ATTACK_RANGE
 	// Note - undersize by 1/4 of a pathfind cell, so that the goal is not teetering on the edge
 	// of firing range.  jba.
 	const Real UNDERSIZE = PATHFIND_CELL_SIZE_F*0.25f;
-	Real r = m_attackRange * bonus.getField(WeaponBonus::RANGE) - UNDERSIZE; 
+	Real r = m_attackRange * bonus.getField(WeaponBonus::RANGE) - UNDERSIZE;
 	if (r < 0.0f) r = 0.0f;
 	return r;
 #else
 // fudge this a little to account for pathfinding roundoff & such
 	const Real ATTACK_RANGE_FUDGE = 1.05f;
-	return m_attackRange * bonus.getField(WeaponBonus::RANGE) * ATTACK_RANGE_FUDGE; 
+	return m_attackRange * bonus.getField(WeaponBonus::RANGE) * ATTACK_RANGE_FUDGE;
 #endif
 }
 
 //-------------------------------------------------------------------------------------------------
-Real WeaponTemplate::getMinimumAttackRange() const 
-{ 
+Real WeaponTemplate::getMinimumAttackRange() const
+{
 #ifdef RATIONALIZE_ATTACK_RANGE
 	// Note - undersize by 1/4 of a pathfind cell, so that the goal is not teetering on the edge
 	// of firing range.  jba.
 	const Real UNDERSIZE = PATHFIND_CELL_SIZE_F*0.25f;
-	Real r = m_minimumAttackRange - UNDERSIZE; 
+	Real r = m_minimumAttackRange - UNDERSIZE;
 	if (r < 0.0f) r = 0.0f;
 	return r;
 #else
-	return m_minimumAttackRange; 
+	return m_minimumAttackRange;
 #endif
 }
 
@@ -496,7 +490,7 @@ Real WeaponTemplate::getUnmodifiedAttackRange() const
 }
 
 //-------------------------------------------------------------------------------------------------
-Int WeaponTemplate::getDelayBetweenShots(const WeaponBonus& bonus) const 
+Int WeaponTemplate::getDelayBetweenShots(const WeaponBonus& bonus) const
 {
 	// yes, divide, not multiply; the larger the rate-of-fire bonus, the shorter
 	// we want the delay time to be.
@@ -507,48 +501,48 @@ Int WeaponTemplate::getDelayBetweenShots(const WeaponBonus& bonus) const
 		delayToUse = GameLogicRandomValue( m_minDelayBetweenShots, m_maxDelayBetweenShots );
 
 	Real bonusROF = bonus.getField(WeaponBonus::RATE_OF_FIRE);
-	//CRCDEBUG_LOG(("WeaponTemplate::getDelayBetweenShots() - min:%d max:%d val:%d, bonusROF=%g/%8.8X\n",
+	//CRCDEBUG_LOG(("WeaponTemplate::getDelayBetweenShots() - min:%d max:%d val:%d, bonusROF=%g/%8.8X",
 		//m_minDelayBetweenShots, m_maxDelayBetweenShots, delayToUse, bonusROF, AS_INT(bonusROF)));
 
-	return REAL_TO_INT_FLOOR(delayToUse / bonusROF); 
+	return REAL_TO_INT_FLOOR(delayToUse / bonusROF);
 }
 
 //-------------------------------------------------------------------------------------------------
-Int WeaponTemplate::getClipReloadTime(const WeaponBonus& bonus) const 
+Int WeaponTemplate::getClipReloadTime(const WeaponBonus& bonus) const
 {
 	// yes, divide, not multiply; the larger the rate-of-fire bonus, the shorter
 	// we want the reload time to be.
-	return REAL_TO_INT_FLOOR(m_clipReloadTime / bonus.getField(WeaponBonus::RATE_OF_FIRE));	
+	return REAL_TO_INT_FLOOR(m_clipReloadTime / bonus.getField(WeaponBonus::RATE_OF_FIRE));
 }
 
 //-------------------------------------------------------------------------------------------------
 Int WeaponTemplate::getPreAttackDelay( const WeaponBonus& bonus ) const
 {
-	return m_preAttackDelay * bonus.getField( WeaponBonus::PRE_ATTACK ); 
+	return m_preAttackDelay * bonus.getField( WeaponBonus::PRE_ATTACK );
 }
 
 //-------------------------------------------------------------------------------------------------
-Real WeaponTemplate::getPrimaryDamage(const WeaponBonus& bonus) const 
+Real WeaponTemplate::getPrimaryDamage(const WeaponBonus& bonus) const
 {
-	return m_primaryDamage * bonus.getField(WeaponBonus::DAMAGE); 
+	return m_primaryDamage * bonus.getField(WeaponBonus::DAMAGE);
 }
 
 //-------------------------------------------------------------------------------------------------
-Real WeaponTemplate::getPrimaryDamageRadius(const WeaponBonus& bonus) const 
+Real WeaponTemplate::getPrimaryDamageRadius(const WeaponBonus& bonus) const
 {
-	return m_primaryDamageRadius * bonus.getField(WeaponBonus::RADIUS); 
+	return m_primaryDamageRadius * bonus.getField(WeaponBonus::RADIUS);
 }
 
 //-------------------------------------------------------------------------------------------------
-Real WeaponTemplate::getSecondaryDamage(const WeaponBonus& bonus) const 
+Real WeaponTemplate::getSecondaryDamage(const WeaponBonus& bonus) const
 {
-	return m_secondaryDamage * bonus.getField(WeaponBonus::DAMAGE); 
+	return m_secondaryDamage * bonus.getField(WeaponBonus::DAMAGE);
 }
 
 //-------------------------------------------------------------------------------------------------
-Real WeaponTemplate::getSecondaryDamageRadius(const WeaponBonus& bonus) const 
+Real WeaponTemplate::getSecondaryDamageRadius(const WeaponBonus& bonus) const
 {
-	return m_secondaryDamageRadius * bonus.getField(WeaponBonus::RADIUS); 
+	return m_secondaryDamageRadius * bonus.getField(WeaponBonus::RADIUS);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -557,20 +551,20 @@ Bool WeaponTemplate::isContactWeapon() const
 #ifdef RATIONALIZE_ATTACK_RANGE
 	// Note - undersize by 1/4 of a pathfind cell, so that the goal is not teetering on the edge
 	// of firing range.  jba.
-	const Real UNDERSIZE = PATHFIND_CELL_SIZE_F*0.25f; 
+	const Real UNDERSIZE = PATHFIND_CELL_SIZE_F*0.25f;
 	return (m_attackRange - UNDERSIZE) < PATHFIND_CELL_SIZE_F;
 #else
 // fudge this a little to account for pathfinding roundoff & such
 	const Real ATTACK_RANGE_FUDGE = 1.05f;
-	return m_attackRange * ATTACK_RANGE_FUDGE < PATHFIND_CELL_SIZE_F; 
+	return m_attackRange * ATTACK_RANGE_FUDGE < PATHFIND_CELL_SIZE_F;
 #endif
 }
 
 //-------------------------------------------------------------------------------------------------
 Real WeaponTemplate::estimateWeaponTemplateDamage(
-	const Object *sourceObj, 
-	const Object *victimObj, 
-	const Coord3D* victimPos, 
+	const Object *sourceObj,
+	const Object *victimObj,
+	const Coord3D* victimPos,
 	const WeaponBonus& bonus
 ) const
 {
@@ -580,10 +574,16 @@ Real WeaponTemplate::estimateWeaponTemplateDamage(
 		return 0.0f;
 	}
 
+	const Real damageAmount = getPrimaryDamage(bonus);
+	if ( victimObj == NULL )
+	{
+		return damageAmount;
+	}
+
 	DamageType damageType = getDamageType();
 	DeathType deathType = getDeathType();
 
-	if (victimObj && victimObj->isKindOf(KINDOF_SHRUBBERY))
+	if ( victimObj->isKindOf(KINDOF_SHRUBBERY) )
 	{
 		if (deathType == DEATH_BURNED)
 		{
@@ -596,7 +596,7 @@ Real WeaponTemplate::estimateWeaponTemplateDamage(
 		}
 	}
 
-  
+
   // hmm.. must be shooting a firebase or such, if there is noone home to take the bullet, return 0!
   if ( victimObj->isKindOf( KINDOF_STRUCTURE) && damageType == DAMAGE_SNIPER )
   {
@@ -610,7 +610,7 @@ Real WeaponTemplate::estimateWeaponTemplateDamage(
 
 
 
-	if (damageType == DAMAGE_SURRENDER || m_allowAttackGarrisonedBldgs)
+	if ( damageType == DAMAGE_SURRENDER || m_allowAttackGarrisonedBldgs )
 	{
 		ContainModuleInterface* contain = victimObj->getContain();
 		if( contain && contain->getContainCount() > 0 && contain->isGarrisonable() && !contain->isImmuneToClearBuildingAttacks() )
@@ -620,75 +620,58 @@ Real WeaponTemplate::estimateWeaponTemplateDamage(
 		}
 	}
 
-	if( victimObj )
+	if( damageType == DAMAGE_DISARM )
 	{
-		if( damageType == DAMAGE_DISARM )
-		{
-			if( victimObj->isKindOf( KINDOF_MINE ) || victimObj->isKindOf( KINDOF_BOOBY_TRAP ) || victimObj->isKindOf( KINDOF_DEMOTRAP ) )
-			{
-				// this is just a nonzero value, to ensure we can target mines with disarm weapons, regardless...
-				return 1.0f;
-			}
-			return 0.0f;
-		}
-		if( damageType == DAMAGE_DEPLOY && !victimObj->isAirborneTarget() )
+		if( victimObj->isKindOf( KINDOF_MINE ) || victimObj->isKindOf( KINDOF_BOOBY_TRAP ) || victimObj->isKindOf( KINDOF_DEMOTRAP ) )
 		{
+			// this is just a nonzero value, to ensure we can target mines with disarm weapons, regardless...
 			return 1.0f;
 		}
+		return 0.0f;
+	}
+	if( damageType == DAMAGE_DEPLOY && !victimObj->isAirborneTarget() )
+	{
+		return 1.0f;
 	}
 
 	//@todo Kris need to examine the DAMAGE_HACK type for damage estimation purposes.
 	//Likely this damage type will have threat implications that won't properly be dealt with until resolved.
 
-//	const Coord3D* sourcePos = sourceObj->getPosition();
-	if (victimPos == NULL)
-	{
-		victimPos = victimObj->getPosition();
-	}
-
-	Real damageAmount = getPrimaryDamage(bonus);
-	if (victimObj == NULL)
-	{
-		return damageAmount;
-	}
-	else
-	{
-		DamageInfoInput damageInfo;
-		damageInfo.m_damageType = damageType;
-		damageInfo.m_deathType = deathType;
-		damageInfo.m_sourceID = sourceObj->getID();
-		damageInfo.m_amount = damageAmount;
-		return victimObj->estimateDamage(damageInfo);
-	}
+	DamageInfoInput damageInfo;
+	damageInfo.m_damageType = damageType;
+	damageInfo.m_deathType = deathType;
+	damageInfo.m_sourceID = sourceObj->getID();
+	damageInfo.m_amount = damageAmount;
+	return victimObj->estimateDamage(damageInfo);
 }
 
 //-------------------------------------------------------------------------------------------------
 Bool WeaponTemplate::shouldProjectileCollideWith(
-	const Object* projectileLauncher, 
-	const Object* projectile, 
+	const Object* projectileLauncher,
+	const Object* projectile,
 	const Object* thingWeCollidedWith,
 	ObjectID intendedVictimID	// could be INVALID_ID for a position-shot
 ) const
 {
  	if (!projectile || !thingWeCollidedWith)
  		return false;
- 
+
 	// if it's our intended victim, we want to collide with it, regardless of any other considerations.
 	if (intendedVictimID == thingWeCollidedWith->getID())
 		return true;
 
  	if (projectileLauncher != NULL)
  	{
- 
+
  		// Don't hit your own launcher, ever.
  		if (projectileLauncher == thingWeCollidedWith)
  			return false;
- 
+
  		// If our launcher is inside something, and that something is 'thingWeCollidedWith' we won't collide
  		const Object *launcherContainedBy = projectileLauncher->getContainedBy();
  		if( launcherContainedBy == thingWeCollidedWith )
  			return false;
- 
+
  	}
 
 	// never bother burning already-burned things. (srj)
@@ -706,7 +689,7 @@ Bool WeaponTemplate::shouldProjectileCollideWith(
 	if (thingWeCollidedWith->isKindOf(KINDOF_FS_AIRFIELD))
 	{
 		//
-		// ok, so if we are an airfield, and our intended victim has a reserved space 
+		// ok, so if we are an airfield, and our intended victim has a reserved space
 		// with us, it "belongs" to us and collisions intended for it should not detonate
 		// as a result of colliding with us.
 		//
@@ -749,23 +732,23 @@ Bool WeaponTemplate::shouldProjectileCollideWith(
 	if (thingWeCollidedWith->getTemplate()->getFenceWidth() > 0)	requiredMask |= WEAPON_COLLIDE_WALLS;
 	if (thingWeCollidedWith->isKindOf(KINDOF_SMALL_MISSILE))			requiredMask |= WEAPON_COLLIDE_SMALL_MISSILES;			//All missiles are also projectiles!
 	if (thingWeCollidedWith->isKindOf(KINDOF_BALLISTIC_MISSILE))	requiredMask |= WEAPON_COLLIDE_BALLISTIC_MISSILES;	//All missiles are also projectiles!
-		
+
 	// if any in requiredMask are present in collidemask, do the collision. (srj)
 	if ((getProjectileCollideMask() & requiredMask) != 0)
 		return true;
 
-	//DEBUG_LOG(("Rejecting projectile collision between %s and %s!\n",projectile->getTemplate()->getName().str(),thingWeCollidedWith->getTemplate()->getName().str()));
+	//DEBUG_LOG(("Rejecting projectile collision between %s and %s!",projectile->getTemplate()->getName().str(),thingWeCollidedWith->getTemplate()->getName().str()));
 	return false;
 }
 
 //-------------------------------------------------------------------------------------------------
 UnsignedInt WeaponTemplate::fireWeaponTemplate
 (
-	const Object *sourceObj, 
-	WeaponSlotType wslot, 
-	Int specificBarrelToUse, 
-	Object *victimObj, 
-	const Coord3D* victimPos, 
+	const Object *sourceObj,
+	WeaponSlotType wslot,
+	Int specificBarrelToUse,
+	Object *victimObj,
+	const Coord3D* victimPos,
 	const WeaponBonus& bonus,
 	Bool isProjectileDetonation,
 	Bool ignoreRanges,
@@ -775,8 +758,8 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 ) const
 {
 
-	//-extraLogging 
-	#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+	//-extraLogging
+	#if defined(RTS_DEBUG)
 		AsciiString targetStr;
 		if( TheGlobalData->m_extraLogging )
 		{
@@ -787,23 +770,23 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 			else
 				targetStr.format( "SELF." );
 
-			DEBUG_LOG( ("%d - WeaponTemplate::fireWeaponTemplate() begin - %s attacking %s - ", 
+			DEBUG_LOG( ("%d - WeaponTemplate::fireWeaponTemplate() begin - %s attacking %s",
 				TheGameLogic->getFrame(), sourceObj->getTemplate()->getName().str(), targetStr.str() ) );
 		}
 	#endif
-	//end -extraLogging 
+	//end -extraLogging
 
-	//CRCDEBUG_LOG(("WeaponTemplate::fireWeaponTemplate() from %s\n", DescribeObject(sourceObj).str()));
-	DEBUG_ASSERTCRASH(specificBarrelToUse >= 0, ("specificBarrelToUse should no longer be -1\n"));
+	//CRCDEBUG_LOG(("WeaponTemplate::fireWeaponTemplate() from %s", DescribeObject(sourceObj).str()));
+	DEBUG_ASSERTCRASH(specificBarrelToUse >= 0, ("specificBarrelToUse should no longer be -1"));
 
 	if (sourceObj == NULL || (victimObj == NULL && victimPos == NULL))
 	{
-		//-extraLogging 
-		#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+		//-extraLogging
+		#if defined(RTS_DEBUG)
 			if( TheGlobalData->m_extraLogging )
-				DEBUG_LOG( ("FAIL 1 (sourceObj %d == NULL || (victimObj %d == NULL && victimPos %d == NULL)\n", sourceObj != 0, victimObj != 0, victimPos != 0) );
+				DEBUG_LOG( ("FAIL 1 (sourceObj %d == NULL || (victimObj %d == NULL && victimPos %d == NULL)", sourceObj != 0, victimObj != 0, victimPos != 0) );
 		#endif
-		//end -extraLogging 
+		//end -extraLogging
 
 		return 0;
 	}
@@ -819,7 +802,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 	Coord3D victimPosStorage;
 	if (victimObj)
 	{
-		DEBUG_ASSERTLOG(sourceObj != victimObj, ("*** firing weapon at self -- is this really what you want?\n"));
+		DEBUG_ASSERTLOG(sourceObj != victimObj, ("*** firing weapon at self -- is this really what you want?"));
 		victimPos = victimObj->getPosition();
 		victimID = victimObj->getID();
 
@@ -840,21 +823,21 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		}
 		else
 		{
-			if (victimObj->isKindOf(KINDOF_BRIDGE)) 
+			if (victimObj->isKindOf(KINDOF_BRIDGE))
 			{
 				// Bridges are kind of oddball - they have 2 target points at either end.
 				TheTerrainLogic->getBridgeAttackPoints(victimObj, &info);
 				distSqr = ThePartitionManager->getDistanceSquared( sourceObj, &info.attackPoint1, ATTACK_RANGE_CALC_TYPE );
 				victimPos = &info.attackPoint1;
  				Real distSqr2 = ThePartitionManager->getDistanceSquared( sourceObj, &info.attackPoint2, ATTACK_RANGE_CALC_TYPE );
-				if (distSqr > distSqr2) 
+				if (distSqr > distSqr2)
 				{
 					// Try the other one.
 					distSqr = distSqr2;
 					victimPos = &info.attackPoint2;
 				}
-			}	
-			else 
+			}
+			else
 			{
 				distSqr = ThePartitionManager->getDistanceSquared(sourceObj, victimObj, ATTACK_RANGE_CALC_TYPE);
 			}
@@ -866,7 +849,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		distSqr = ThePartitionManager->getDistanceSquared(sourceObj, victimPos, ATTACK_RANGE_CALC_TYPE);
 	}
 
-//	DEBUG_LOG(("WeaponTemplate::fireWeaponTemplate: firing weapon %s (source=%s, victim=%s)\n",
+//	DEBUG_LOG(("WeaponTemplate::fireWeaponTemplate: firing weapon %s (source=%s, victim=%s)",
 //		m_name.str(),sourceObj->getTemplate()->getName().str(),victimObj?victimObj->getTemplate()->getName().str():"NULL"));
 
 	//Only perform this check if the weapon isn't a leech range weapon (which can have unlimited range!)
@@ -875,14 +858,14 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		Real attackRangeSqr = sqr(getAttackRange(bonus));
 		if (distSqr > attackRangeSqr)
 		{
-			//DEBUG_ASSERTCRASH(distSqr < 5*5 || distSqr < attackRangeSqr*1.2f, ("*** victim is out of range (%f vs %f) of this weapon -- why did we attempt to fire?\n",sqrtf(distSqr),sqrtf(attackRangeSqr)));
-			
-			//-extraLogging 
-			#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+			//DEBUG_ASSERTCRASH(distSqr < 5*5 || distSqr < attackRangeSqr*1.2f, ("*** victim is out of range (%f vs %f) of this weapon -- why did we attempt to fire?",sqrtf(distSqr),sqrtf(attackRangeSqr)));
+
+			//-extraLogging
+			#if defined(RTS_DEBUG)
 				if( TheGlobalData->m_extraLogging )
-					DEBUG_LOG( ("FAIL 2 (distSqr %.2f > attackRangeSqr %.2f)\n", distSqr, attackRangeSqr ) );
+					DEBUG_LOG( ("FAIL 2 (distSqr %.2f > attackRangeSqr %.2f)", distSqr, attackRangeSqr ) );
 			#endif
-			//end -extraLogging 
+			//end -extraLogging
 
 			return 0;
 		}
@@ -897,14 +880,14 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		if (distSqr < minAttackRangeSqr-0.5f && !isProjectileDetonation)
 #endif
 		{
-			DEBUG_ASSERTCRASH(distSqr > minAttackRangeSqr*0.8f, ("*** victim is closer than min attack range (%f vs %f) of this weapon -- why did we attempt to fire?\n",sqrtf(distSqr),sqrtf(minAttackRangeSqr)));
+			DEBUG_ASSERTCRASH(distSqr > minAttackRangeSqr*0.8f, ("*** victim is closer than min attack range (%f vs %f) of this weapon -- why did we attempt to fire?",sqrtf(distSqr),sqrtf(minAttackRangeSqr)));
 
-			//-extraLogging 
-			#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+			//-extraLogging
+			#if defined(RTS_DEBUG)
 				if( TheGlobalData->m_extraLogging )
-					DEBUG_LOG( ("FAIL 3 (distSqr %.2f< minAttackRangeSqr %.2f - 0.5f && !isProjectileDetonation %d)\n", distSqr, minAttackRangeSqr, isProjectileDetonation ) );
+					DEBUG_LOG( ("FAIL 3 (distSqr %.2f< minAttackRangeSqr %.2f - 0.5f && !isProjectileDetonation %d)", distSqr, minAttackRangeSqr, isProjectileDetonation ) );
 			#endif
-			//end -extraLogging 
+			//end -extraLogging
 
 			return 0;
 		}
@@ -926,16 +909,15 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		Real reDir = reAngle != 0.0f ? (atan2(victimPos->y - sourcePos->y, victimPos->x - sourcePos->x)) : 0.0f;
 		VeterancyLevel v = sourceObj->getVeterancyLevel();
 		const FXList* fx = isProjectileDetonation ? getProjectileDetonateFX(v) : getFireFX(v);
-		
+
 		if ( TheGameLogic->getFrame() < firingWeapon->getSuspendFXFrame() )
 			fx = NULL;
 
 		Bool handled;
-		
-		if(!sourceObj->isLocallyControlled()									// if user watching is not controller and
-			&&  sourceObj->testStatus(OBJECT_STATUS_STEALTHED)	// if unit is stealthed (like a Pathfinder)
-			&& !sourceObj->testStatus(OBJECT_STATUS_DETECTED)		// but not detected...
-			&& !sourceObj->testStatus(OBJECT_STATUS_DISGUISED)  // and not disguised...
+
+		// TheSuperHackers @todo: Remove hardcoded KINDOF_MINE check and apply PlayFXWhenStealthed = Yes to the mine weapons instead.
+
+		if (!sourceObj->isLogicallyVisible()									// if user watching cannot see us
 			&& !sourceObj->isKindOf(KINDOF_MINE)								// and not a mine (which always do the FX, even if hidden)...
 			&& !isPlayFXWhenStealthed()													// and not a weapon marked to playwhenstealthed
 			)
@@ -944,12 +926,12 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		}
 		else
 		{
-			handled = sourceObj->getDrawable()->handleWeaponFireFX(wslot, 
-																															specificBarrelToUse, 
-																															fx, 
-																															getWeaponSpeed(), 
-																															reAngle, 
-																															reDir, 
+			handled = sourceObj->getDrawable()->handleWeaponFireFX(wslot,
+																															specificBarrelToUse,
+																															fx,
+																															getWeaponSpeed(),
+																															reAngle,
+																															reDir,
 																															&targetPos,
 																															getPrimaryDamageRadius(bonus)
 																															);
@@ -958,7 +940,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		if (handled == false && fx != NULL)
 		{
 			// bah. just play it at the drawable's pos.
-			//DEBUG_LOG(("*** WeaponFireFX not fully handled by the client\n"));
+			//DEBUG_LOG(("*** WeaponFireFX not fully handled by the client"));
 			const Coord3D* where = isContactWeapon() ? &targetPos : sourceObj->getDrawable()->getPosition();
 			FXList::doFXPos(fx, where, sourceObj->getDrawable()->getTransformMatrix(), getWeaponSpeed(), &targetPos, getPrimaryDamageRadius(bonus));
 		}
@@ -1060,18 +1042,18 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		if (delayInFrames < 1.0f)
 		{
 			// go ahead and do it now
-			//DEBUG_LOG(("WeaponTemplate::fireWeaponTemplate: firing weapon immediately!\n"));
+			//DEBUG_LOG(("WeaponTemplate::fireWeaponTemplate: firing weapon immediately!"));
 			if( inflictDamage )
 			{
 				dealDamageInternal(sourceID, damageID, damagePos, bonus, isProjectileDetonation);
 			}
 
-			//-extraLogging 
-			#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+			//-extraLogging
+			#if defined(RTS_DEBUG)
 				if( TheGlobalData->m_extraLogging )
-					DEBUG_LOG( ("EARLY 4 (delayed damage applied now)\n") );
+					DEBUG_LOG( ("EARLY 4 (delayed damage applied now)") );
 			#endif
-			//end -extraLogging 
+			//end -extraLogging
 
 
 			return TheGameLogic->getFrame();
@@ -1083,16 +1065,16 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 			{
 				UnsignedInt delayInWholeFrames = REAL_TO_INT_CEIL(delayInFrames);
 				when = TheGameLogic->getFrame() + delayInWholeFrames;
-				//DEBUG_LOG(("WeaponTemplate::fireWeaponTemplate: firing weapon in %d frames (= %d)!\n", delayInWholeFrames,when));
+				//DEBUG_LOG(("WeaponTemplate::fireWeaponTemplate: firing weapon in %d frames (= %d)!", delayInWholeFrames,when));
 				TheWeaponStore->setDelayedDamage(this, damagePos, when, sourceID, damageID, bonus);
 			}
 
-			//-extraLogging 
-			#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+			//-extraLogging
+			#if defined(RTS_DEBUG)
 				if( TheGlobalData->m_extraLogging )
-					DEBUG_LOG( ("EARLY 5 (delaying damage applied until frame %d)\n", when ) );
+					DEBUG_LOG( ("EARLY 5 (delaying damage applied until frame %d)", when ) );
 			#endif
-			//end -extraLogging 
+			//end -extraLogging
 
 
 			return when;
@@ -1103,7 +1085,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		Player *owningPlayer = sourceObj->getControllingPlayer(); //Need to know so missiles don't collide with firer
 		Object *projectile = TheThingFactory->newObject( getProjectileTemplate(), owningPlayer->getDefaultTeam() );
 		projectile->setProducer(sourceObj);
-		
+
 		//If the player has battle plans (America Strategy Center), then apply those bonuses
 		//to this object if applicable. Internally it validates certain kinds of objects.
 		//When projectiles are created, weapon bonuses such as damage may get applied.
@@ -1137,7 +1119,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 			}
 		}
 
-		firingWeapon->newProjectileFired( sourceObj, projectile, victimObj, victimPos );//The actual logic weapon needs to know this was created. 
+		firingWeapon->newProjectileFired( sourceObj, projectile, victimObj, victimPos );//The actual logic weapon needs to know this was created.
 
 		ProjectileUpdateInterface* pui = NULL;
 		for (BehaviorModule** u = projectile->getBehaviorModules(); *u; ++u)
@@ -1160,7 +1142,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		}
 		else
 		{
-			//DEBUG_CRASH(("Projectiles should implement ProjectileUpdateInterface!\n"));
+			//DEBUG_CRASH(("Projectiles should implement ProjectileUpdateInterface!"));
 			// actually, this is ok, for things like Firestorm.... (srj)
 			projectile->setPosition(&projectileDestination);
 		}
@@ -1176,24 +1158,25 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 				//an available decoy flare.
 				victimObj->reportMissileForCountermeasures( projectile );
 			}
-			
+
 		}
-		//-extraLogging 
-		#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+		//-extraLogging
+		#if defined(RTS_DEBUG)
 			if( TheGlobalData->m_extraLogging )
-				DEBUG_LOG( ("DONE\n") );
+				DEBUG_LOG( ("DONE") );
 		#endif
-		//end -extraLogging 
+		//end -extraLogging
 
 		return 0;
 	}
 }
 
 //-------------------------------------------------------------------------------------------------
+#if RETAIL_COMPATIBLE_CRC
 void WeaponTemplate::trimOldHistoricDamage() const
 {
 	UnsignedInt expirationDate = TheGameLogic->getFrame() - TheGlobalData->m_historicDamageLimit;
-	while (m_historicDamage.size() > 0)
+	while (!m_historicDamage.empty())
 	{
 		HistoricWeaponDamageInfo& h = m_historicDamage.front();
 		if (h.frame <= expirationDate)
@@ -1209,6 +1192,40 @@ void WeaponTemplate::trimOldHistoricDamage() const
 		}
 	}
 }
+#else
+void WeaponTemplate::trimOldHistoricDamage() const
+{
+	if (m_historicDamage.empty())
+		return;
+
+	const UnsignedInt currentFrame = TheGameLogic->getFrame();
+	const UnsignedInt expirationFrame = currentFrame - m_historicBonusTime;
+
+	HistoricWeaponDamageList::iterator it = m_historicDamage.begin();
+
+	while (it != m_historicDamage.end())
+	{
+		if (it->frame <= expirationFrame)
+			it = m_historicDamage.erase(it);
+		else
+			break;
+	}
+}
+#endif
+
+//-------------------------------------------------------------------------------------------------
+void WeaponTemplate::trimTriggeredHistoricDamage() const
+{
+	HistoricWeaponDamageList::iterator it = m_historicDamage.begin();
+
+	while (it != m_historicDamage.end())
+	{
+		if (it->triggerId == m_historicDamageTriggerId)
+			it = m_historicDamage.erase(it);
+		else
+			++it;
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 static Bool is2DDistSquaredLessThan(const Coord3D& a, const Coord3D& b, Real distSqr)
@@ -1218,16 +1235,9 @@ static Bool is2DDistSquaredLessThan(const Coord3D& a, const Coord3D& b, Real dis
 }
 
 //-------------------------------------------------------------------------------------------------
-void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, const Coord3D *pos, const WeaponBonus& bonus, Bool isProjectileDetonation) const
+#if RETAIL_COMPATIBLE_CRC
+void WeaponTemplate::processHistoricDamage(const Object* source, const Coord3D* pos) const
 {
-	if (sourceID == 0)	// must have a source
-		return;
-
-	if (victimID == 0 && pos == NULL)	// must have some sort of destination
-		return;
-
-	Object *source = TheGameLogic->findObjectByID(sourceID);	// might be null...
-
 	//
 	/** @todo We need to rewrite the historic stuff ... if you fire 5 missiles, and the 5th,
 	// one creates a firestorm ... and then half a second later another volley of 5 missiles
@@ -1235,17 +1245,17 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 	// firestorms (CBD) */
 	//
 
-	trimOldHistoricDamage();
-
 	if( m_historicBonusCount > 0 && m_historicBonusWeapon != this )
 	{
+		trimOldHistoricDamage();
+
 		Real radSqr = m_historicBonusRadius * m_historicBonusRadius;
 		Int count = 0;
 		UnsignedInt frameNow = TheGameLogic->getFrame();
 		UnsignedInt oldestThatWillCount = frameNow - m_historicBonusTime; // Anything before this frame is "more than two seconds ago" eg
 		for( HistoricWeaponDamageList::const_iterator it = m_historicDamage.begin(); it != m_historicDamage.end(); ++it )
 		{
-			if( it->frame >= oldestThatWillCount && 
+			if( it->frame >= oldestThatWillCount &&
 					is2DDistSquaredLessThan( *pos, it->location, radSqr ) )
 			{
 				// This one is close enough in time and distance, so count it. This is tracked by template since it applies
@@ -1253,7 +1263,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 				++count;
 			}
 		}
-		
+
 		if( count >= m_historicBonusCount - 1 )	// minus 1 since we include ourselves implicitly
 		{
 		  TheWeaponStore->createAndFireTempWeapon(m_historicBonusWeapon, source, pos);
@@ -1266,15 +1276,67 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 		}
 		else
 		{
-			
+
 			// add AFTER checking for historic stuff
 			m_historicDamage.push_back( HistoricWeaponDamageInfo(frameNow, *pos) );
 
-		}  // end else
+		}
 
-	} // if historic bonuses
+	}
+}
+#else
+void WeaponTemplate::processHistoricDamage(const Object* source, const Coord3D* pos) const
+{
+	if (m_historicBonusCount > 0 && m_historicBonusWeapon != this)
+	{
+		trimOldHistoricDamage();
 
-//DEBUG_LOG(("WeaponTemplate::dealDamageInternal: dealing damage %s at frame %d\n",m_name.str(),TheGameLogic->getFrame()));
+		++m_historicDamageTriggerId;
+
+		const Int requiredCount = m_historicBonusCount - 1; // minus 1 since we include ourselves implicitly
+		if (m_historicDamage.size() >= requiredCount)
+		{
+			const Real radSqr = m_historicBonusRadius * m_historicBonusRadius;
+			Int count = 0;
+
+			for (HistoricWeaponDamageList::iterator it = m_historicDamage.begin(); it != m_historicDamage.end(); ++it)
+			{
+				if (is2DDistSquaredLessThan(*pos, it->location, radSqr))
+				{
+					// This one is close enough in time and distance, so count it. This is tracked by template since it applies
+					// across units, so don't try to clear historicDamage on success in here.
+					it->triggerId = m_historicDamageTriggerId;
+
+					if (++count == requiredCount)
+					{
+						TheWeaponStore->createAndFireTempWeapon(m_historicBonusWeapon, source, pos);
+						trimTriggeredHistoricDamage();
+						return;
+					}
+				}
+			}
+		}
+
+		// add AFTER checking for historic stuff
+		m_historicDamage.push_back(HistoricWeaponDamageInfo(TheGameLogic->getFrame(), *pos));
+	}
+}
+#endif
+
+//-------------------------------------------------------------------------------------------------
+void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, const Coord3D *pos, const WeaponBonus& bonus, Bool isProjectileDetonation) const
+{
+	if (sourceID == 0)	// must have a source
+		return;
+
+	if (victimID == 0 && pos == NULL)	// must have some sort of destination
+		return;
+
+	Object *source = TheGameLogic->findObjectByID(sourceID);	// might be null...
+
+	processHistoricDamage(source, pos);
+
+//DEBUG_LOG(("WeaponTemplate::dealDamageInternal: dealing damage %s at frame %d",m_name.str(),TheGameLogic->getFrame()));
 
 	// if there's a specific victim, use it's pos (overriding the value passed in)
 	Object *primaryVictim = victimID ? TheGameLogic->findObjectByID(victimID) : NULL;	// might be null...
@@ -1298,7 +1360,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 		Real secondaryDamage = getSecondaryDamage(bonus);
 		Int affects = getAffectsMask();
 
-		DEBUG_ASSERTCRASH(secondaryRadius >= primaryRadius || secondaryRadius == 0.0f, ("secondary radius should be >= primary radius (or zero)\n"));
+		DEBUG_ASSERTCRASH(secondaryRadius >= primaryRadius || secondaryRadius == 0.0f, ("secondary radius should be >= primary radius (or zero)"));
 
 		Real primaryRadiusSqr = sqr(primaryRadius);
 		Real radius = max(primaryRadius, secondaryRadius);
@@ -1306,7 +1368,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 		{
 			iter = ThePartitionManager->iterateObjectsInRange(pos, radius, DAMAGE_RANGE_CALC_TYPE);
 			curVictim = iter->firstWithNumeric(&curVictimDistSqr);
-		} 
+		}
 		else
 		{
 			//DEBUG_ASSERTCRASH(primaryVictim != NULL, ("weapons without radii should always pass in specific victims"));
@@ -1348,7 +1410,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 					}
 					else
 					{
-					
+
 						// should object ever be allowed to damage themselves? methinks not...
 						// exception: a few weapons allow this (eg, for suicide bombers).
 						if( (affects & WEAPON_AFFECTS_SELF) == 0 )
@@ -1356,7 +1418,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 							// Remember that source is a missile for some units, and they don't want to injure them'selves' either
 							if( source == curVictim || source->getProducerID() == curVictim->getID() )
 							{
-								//DEBUG_LOG(("skipping damage done to SELF...\n"));
+								//DEBUG_LOG(("skipping damage done to SELF..."));
 								continue;
 							}
 						}
@@ -1379,13 +1441,13 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 
 						/*
 							The idea here is: if its our ally(/enemies), AND it's not the direct target, AND the weapon doesn't
-							do radius-damage to allies(/enemies)... skip it. 
+							do radius-damage to allies(/enemies)... skip it.
 						*/
 						Relationship r = curVictim->getRelationship(source);
 						Int requiredMask;
-						if (r == ALLIES) 
+						if (r == ALLIES)
 							requiredMask = WEAPON_AFFECTS_ALLIES;
-						else if (r == ENEMIES) 
+						else if (r == ENEMIES)
 							requiredMask = WEAPON_AFFECTS_ENEMIES;
 						else /* r == NEUTRAL */
 							requiredMask = WEAPON_AFFECTS_NEUTRALS;
@@ -1405,7 +1467,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 			damageInfo.in.m_sourceID = sourceID;
 			damageInfo.in.m_sourcePlayerMask = 0;
 			damageInfo.in.m_damageStatusType = damageStatusType;
-			
+
 			Coord3D damageDirection;
 			damageDirection.zero();
 			if( curVictim && source )
@@ -1419,7 +1481,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 			{
 				if( curVictim == NULL  ||  source == NULL )
 					continue; // We are directional damage, but can't figure out our direction.  Just bail.
-				
+
 				// People can only be hit in a cone oriented as the firer is oriented
 				Vector3 sourceVector = source->getTransformMatrix()->Get_X_Vector();
 				Vector3 damageVector(damageDirection.x, damageDirection.y, damageDirection.z);
@@ -1441,8 +1503,8 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 				Coord3D shockWaveVector = damageDirection;
 
 				// Guard against zero vector. Make vector stright up if that is the case
-				if (fabs(shockWaveVector.x) < WWMATH_EPSILON && 
-						fabs(shockWaveVector.y) < WWMATH_EPSILON && 
+				if (fabs(shockWaveVector.x) < WWMATH_EPSILON &&
+						fabs(shockWaveVector.y) < WWMATH_EPSILON &&
 						fabs(shockWaveVector.z) < WWMATH_EPSILON)
 				{
 					shockWaveVector.z = 1.0f;
@@ -1457,7 +1519,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
       if (source && source->getControllingPlayer()) {
 				damageInfo.in.m_sourcePlayerMask = source->getControllingPlayer()->getPlayerMask();
 			}
-			// note, don't bother with damage multipliers here... 
+			// note, don't bother with damage multipliers here...
 			// that's handled internally by the attemptDamage() method.
 			damageInfo.in.m_amount = (curVictimDistSqr <= primaryRadiusSqr) ? primaryDamage : secondaryDamage;
 
@@ -1492,14 +1554,14 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 			}
 
 			curVictim->attemptDamage(&damageInfo);
-			//DEBUG_ASSERTLOG(damageInfo.out.m_noEffect, ("WeaponTemplate::dealDamageInternal: dealt to %s %08lx: attempted %f, actual %f (%f)\n",
+			//DEBUG_ASSERTLOG(damageInfo.out.m_noEffect, ("WeaponTemplate::dealDamageInternal: dealt to %s %08lx: attempted %f, actual %f (%f)",
 			//	curVictim->getTemplate()->getName().str(),curVictim,
 			//	damageInfo.in.m_amount, damageInfo.out.m_actualDamageDealt, damageInfo.out.m_actualDamageClipped));
 		}
 	}
 	else
 	{
-		DEBUG_CRASH(("projectile weapons should never get dealDamage called directly\n"));
+		DEBUG_CRASH(("projectile weapons should never get dealDamage called directly"));
 	}
 }
 
@@ -1508,7 +1570,7 @@ void WeaponTemplate::dealDamageInternal(ObjectID sourceID, ObjectID victimID, co
 //-------------------------------------------------------------------------------------------------
 WeaponStore::WeaponStore()
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 WeaponStore::~WeaponStore()
@@ -1518,16 +1580,16 @@ WeaponStore::~WeaponStore()
 	for (size_t i = 0; i < m_weaponTemplateVector.size(); i++)
 	{
 		WeaponTemplate* wt = m_weaponTemplateVector[i];
-		if (wt)
-			deleteInstance(wt);
+		deleteInstance(wt);
 	}
 	m_weaponTemplateVector.clear();
+	m_weaponTemplateHashMap.clear();
 }
 
 //-------------------------------------------------------------------------------------------------
 void WeaponStore::handleProjectileDetonation(const WeaponTemplate* wt, const Object *source, const Coord3D* pos, WeaponBonusConditionFlags extraBonusFlags, Bool inflictDamage )
 {
-	Weapon* w = TheWeaponStore->allocateNewWeapon(wt, PRIMARY_WEAPON);
+	Weapon* w = allocateNewWeapon(wt, PRIMARY_WEAPON);
 	w->loadAmmoNow(source);
 	w->fireProjectileDetonationWeapon( source, pos, extraBonusFlags, inflictDamage );
 	deleteInstance(w);
@@ -1538,7 +1600,7 @@ void WeaponStore::createAndFireTempWeapon(const WeaponTemplate* wt, const Object
 {
 	if (wt == NULL)
 		return;
-	Weapon* w = TheWeaponStore->allocateNewWeapon(wt, PRIMARY_WEAPON);
+	Weapon* w = allocateNewWeapon(wt, PRIMARY_WEAPON);
 	w->loadAmmoNow(source);
 	w->fireWeapon(source, pos);
 	deleteInstance(w);
@@ -1547,22 +1609,32 @@ void WeaponStore::createAndFireTempWeapon(const WeaponTemplate* wt, const Object
 //-------------------------------------------------------------------------------------------------
 void WeaponStore::createAndFireTempWeapon(const WeaponTemplate* wt, const Object *source, Object *target)
 {
-	//CRCDEBUG_LOG(("WeaponStore::createAndFireTempWeapon() for %s\n", DescribeObject(source)));
+	//CRCDEBUG_LOG(("WeaponStore::createAndFireTempWeapon() for %s", DescribeObject(source)));
 	if (wt == NULL)
 		return;
-	Weapon* w = TheWeaponStore->allocateNewWeapon(wt, PRIMARY_WEAPON);
+	Weapon* w = allocateNewWeapon(wt, PRIMARY_WEAPON);
 	w->loadAmmoNow(source);
 	w->fireWeapon(source, target);
 	deleteInstance(w);
 }
 
 //-------------------------------------------------------------------------------------------------
-const WeaponTemplate *WeaponStore::findWeaponTemplate( AsciiString name ) const 
-{ 
-	if (stricmp(name.str(), "None") == 0)
+const WeaponTemplate *WeaponStore::findWeaponTemplate( const AsciiString& name ) const
+{
+	if (name.compareNoCase("None") == 0)
 		return NULL;
 	const WeaponTemplate * wt = findWeaponTemplatePrivate( TheNameKeyGenerator->nameToKey( name ) );
-	DEBUG_ASSERTCRASH(wt != NULL, ("Weapon %s not found!\n",name.str()));
+	DEBUG_ASSERTCRASH(wt != NULL, ("Weapon %s not found!",name));
+	return wt;
+}
+
+//-------------------------------------------------------------------------------------------------
+const WeaponTemplate *WeaponStore::findWeaponTemplate( const char* name ) const
+{
+	if (stricmp(name, "None") == 0)
+		return NULL;
+	const WeaponTemplate * wt = findWeaponTemplatePrivate( TheNameKeyGenerator->nameToKey( name ) );
+	DEBUG_ASSERTCRASH(wt != NULL, ("Weapon %s not found!",name));
 	return wt;
 }
 
@@ -1570,9 +1642,9 @@ const WeaponTemplate *WeaponStore::findWeaponTemplate( AsciiString name ) const
 WeaponTemplate *WeaponStore::findWeaponTemplatePrivate( NameKeyType key ) const
 {
 	// search weapon list for name
-	for (size_t i = 0; i < m_weaponTemplateVector.size(); i++)
-		if( m_weaponTemplateVector[ i ]->getNameKey() == key )
-			return m_weaponTemplateVector[i];
+	WeaponTemplateMap::const_iterator it = m_weaponTemplateHashMap.find(key);
+	if(it != m_weaponTemplateHashMap.end())
+		return it->second;
 
 	return NULL;
 
@@ -1591,23 +1663,24 @@ WeaponTemplate *WeaponStore::newWeaponTemplate(AsciiString name)
 	wt->m_name = name;
 	wt->m_nameKey = TheNameKeyGenerator->nameToKey( name );
 	m_weaponTemplateVector.push_back(wt);
+	m_weaponTemplateHashMap[wt->m_nameKey] = wt;
 
 	return wt;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 WeaponTemplate *WeaponStore::newOverride(WeaponTemplate *weaponTemplate)
 {
 	if (!weaponTemplate)
 		return NULL;
-	
+
 	// allocate a new weapon
 	WeaponTemplate *wt = newInstance(WeaponTemplate);
 	(*wt) = (*weaponTemplate);
 	(wt)->friend_setNextTemplate(weaponTemplate);
-	
+
 	return wt;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void WeaponStore::update()
@@ -1654,7 +1727,7 @@ void WeaponStore::reset()
 	for (size_t i = 0; i < m_weaponTemplateVector.size(); ++i)
 	{
 		WeaponTemplate *wt = m_weaponTemplateVector[i];
-		if (wt->isOverride()) 
+		if (wt->isOverride())
 		{
 			WeaponTemplate *override = wt;
 			wt = wt->friend_clearNextTemplate();
@@ -1695,7 +1768,7 @@ void WeaponStore::postProcessLoad()
 			wt->postProcessLoad();
 	}
 
-}  // end postProcessLoad
+}
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ void WeaponStore::parseWeaponTemplateDefinition(INI* ini)
@@ -1704,7 +1777,7 @@ void WeaponStore::postProcessLoad()
 
 	// read the weapon name
 	const char* c = ini->getNextToken();
-	name.set(c);	
+	name.set(c);
 
 	// find existing item if present
 	WeaponTemplate *weapon = TheWeaponStore->findWeaponTemplatePrivate( TheNameKeyGenerator->nameToKey( name ) );
@@ -1712,7 +1785,7 @@ void WeaponStore::postProcessLoad()
 	{
 		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES)
 			weapon = TheWeaponStore->newOverride(weapon);
-		else 
+		else
 		{
 			DEBUG_CRASH(("Weapon '%s' already exists, but OVERRIDE not specified", c));
 			return;
@@ -1723,7 +1796,7 @@ void WeaponStore::postProcessLoad()
 	{
 		// no item is present, create a new one
 		weapon = TheWeaponStore->newWeaponTemplate(name);
-	} 
+	}
 
 	// parse the ini weapon definition
 	ini->initFromINI(weapon, weapon->getFieldParse());
@@ -1731,10 +1804,10 @@ void WeaponStore::postProcessLoad()
 	if (weapon->m_projectileName.isNone())
 		weapon->m_projectileName.clear();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (!weapon->getFireSound().getEventName().isEmpty() && weapon->getFireSound().getEventName().compareNoCase("NoSound") != 0) 
-	{ 
-		DEBUG_ASSERTCRASH(TheAudio->isValidAudioEvent(&weapon->getFireSound()), ("Invalid FireSound %s in Weapon '%s'.", weapon->getFireSound().getEventName().str(), weapon->getName().str())); 
+#if defined(RTS_DEBUG)
+	if (!weapon->getFireSound().getEventName().isEmpty() && weapon->getFireSound().getEventName().compareNoCase("NoSound") != 0)
+	{
+		DEBUG_ASSERTCRASH(TheAudio->isValidAudioEvent(&weapon->getFireSound()), ("Invalid FireSound %s in Weapon '%s'.", weapon->getFireSound().getEventName().str(), weapon->getName().str()));
 	}
 #endif
 
@@ -1822,9 +1895,9 @@ void Weapon::computeBonus(const Object *source, WeaponBonusConditionFlags extraB
 {
 	bonus.clear();
 	WeaponBonusConditionFlags flags = source->getWeaponBonusCondition();
-	//CRCDEBUG_LOG(("Weapon::computeBonus() - flags are %X for %s\n", flags, DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::computeBonus() - flags are %X for %s", flags, DescribeObject(source).str()));
 	flags |= extraBonusFlags;
-	
+
 	if( source->getContainedBy() )
 	{
 		// We may be able to add in our container's flags
@@ -1876,10 +1949,10 @@ void Weapon::setClipPercentFull(Real percent, Bool allowReduction)
 	{
 		m_ammoInClip = ammo;
 		m_status = m_ammoInClip ? OUT_OF_AMMO : READY_TO_FIRE;
-		//CRCDEBUG_LOG(("Weapon::setClipPercentFull() just set m_status to %d (ammo in clip is %d)\n", m_status, m_ammoInClip));
+		//CRCDEBUG_LOG(("Weapon::setClipPercentFull() just set m_status to %d (ammo in clip is %d)", m_status, m_ammoInClip));
 		m_whenLastReloadStarted = TheGameLogic->getFrame();
-		m_whenWeCanFireAgain = m_whenLastReloadStarted;		
-		//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::setClipPercentFull\n", m_whenWeCanFireAgain));
+		m_whenWeCanFireAgain = m_whenLastReloadStarted;
+		//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::setClipPercentFull", m_whenWeCanFireAgain));
 		rebuildScatterTargets();
 	}
 }
@@ -1900,7 +1973,7 @@ void Weapon::rebuildScatterTargets()
 //-------------------------------------------------------------------------------------------------
 void Weapon::reloadWithBonus(const Object *sourceObj, const WeaponBonus& bonus, Bool loadInstantly)
 {
-	if (m_template->getClipSize() > 0 
+	if (m_template->getClipSize() > 0
 			&& m_ammoInClip == m_template->getClipSize()
 			&& !sourceObj->isReloadTimeShared())
 		return;	// don't restart our reload delay.
@@ -1912,22 +1985,22 @@ void Weapon::reloadWithBonus(const Object *sourceObj, const WeaponBonus& bonus,
 	m_status = RELOADING_CLIP;
 	Real reloadTime = loadInstantly ? 0 : m_template->getClipReloadTime(bonus);
 	m_whenLastReloadStarted = TheGameLogic->getFrame();
-	m_whenWeCanFireAgain = m_whenLastReloadStarted + reloadTime;			
-	//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::reloadWithBonus 1\n", m_whenWeCanFireAgain));
+	m_whenWeCanFireAgain = m_whenLastReloadStarted + reloadTime;
+	//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::reloadWithBonus 1", m_whenWeCanFireAgain));
 
 			// if we are sharing reload times
 			// go through other weapons in weapon set
-			// set their m_whenWeCanFireAgain to this guy's delay	
+			// set their m_whenWeCanFireAgain to this guy's delay
 			// set their m_status to this guy's status
 	if (sourceObj->isReloadTimeShared())
-	{	
+	{
 		for (Int wt = 0; wt<WEAPONSLOT_COUNT; wt++)
 		{
 			Weapon *weapon = sourceObj->getWeaponInWeaponSlot((WeaponSlotType)wt);
 			if (weapon)
 			{
 				weapon->setPossibleNextShotFrame(m_whenWeCanFireAgain);
-				//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::reloadWithBonus 2\n", m_whenWeCanFireAgain));
+				//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::reloadWithBonus 2", m_whenWeCanFireAgain));
 				weapon->setStatus(RELOADING_CLIP);
 			}
 		}
@@ -1941,7 +2014,7 @@ static void clipToTerrainExtent(Coord3D& approachTargetPos)
 {
 	Region3D bounds;
 	TheTerrainLogic->getExtent(&bounds);
-	if (approachTargetPos.x < bounds.lo.x+PATHFIND_CELL_SIZE_F) {	 
+	if (approachTargetPos.x < bounds.lo.x+PATHFIND_CELL_SIZE_F) {
 		approachTargetPos.x = bounds.lo.x+PATHFIND_CELL_SIZE_F;
 	}
 	if (approachTargetPos.y < bounds.lo.y+PATHFIND_CELL_SIZE_F) {
@@ -1980,10 +2053,10 @@ void Weapon::onWeaponBonusChange(const Object *source)
 	if( needUpdate )
 	{
 		m_whenLastReloadStarted = TheGameLogic->getFrame();
-		m_whenWeCanFireAgain = m_whenLastReloadStarted + newDelay;	
-		
+		m_whenWeCanFireAgain = m_whenLastReloadStarted + newDelay;
+
 		if (source->isReloadTimeShared())
-		{	
+		{
 			for (Int wt = 0; wt<WEAPONSLOT_COUNT; wt++)
 			{
 				Weapon *weapon = source->getWeaponInWeaponSlot((WeaponSlotType)wt);
@@ -2003,12 +2076,12 @@ Bool Weapon::computeApproachTarget(const Object *source, const Object *target, c
 	// compute unit direction vector from us to our victim
 	const Coord3D *targetPos;
 	Coord3D dir;
-	if (target) 
+	if (target)
 	{
 		targetPos = target->getPosition();
 		ThePartitionManager->getVectorTo( target, source, ATTACK_RANGE_CALC_TYPE, dir );
-	}	
-	else if (pos) 
+	}
+	else if (pos)
 	{
 		targetPos = pos;
 		ThePartitionManager->getVectorTo( source, pos, ATTACK_RANGE_CALC_TYPE, dir );
@@ -2026,10 +2099,10 @@ Bool Weapon::computeApproachTarget(const Object *source, const Object *target, c
 
 	Real dist = dir.length();
 	Real minAttackRange = m_template->getMinimumAttackRange();
-	if (minAttackRange > PATHFIND_CELL_SIZE_F && dist < minAttackRange) 
+	if (minAttackRange > PATHFIND_CELL_SIZE_F && dist < minAttackRange)
 	{
 		// We aret too close, so move away from the target.
-		DEBUG_ASSERTCRASH((minAttackRange<0.9f*getAttackRange(source)), ("Min attack range is too near attack range.\n"));
+		DEBUG_ASSERTCRASH((minAttackRange<0.9f*getAttackRange(source)), ("Min attack range is too near attack range."));
 		// Recompute dir, cause if the bounding spheres touch, it will be 0.
 		Coord3D srcPos = *source->getPosition();
 		dir.x = srcPos.x-targetPos->x;
@@ -2066,11 +2139,11 @@ Bool Weapon::computeApproachTarget(const Object *source, const Object *target, c
 		// select a spot along the line between us, halfway between the min & max range.
 		Real attackRange = (getAttackRange(source) + minAttackRange)/2.0f;
 #ifdef ATTACK_RANGE_IS_2D
-		if (target) 
+		if (target)
 			attackRange += target->getGeometryInfo().getBoundingCircleRadius();
 		attackRange += source->getGeometryInfo().getBoundingCircleRadius();
 #else
-		if (target) 
+		if (target)
 			attackRange += target->getGeometryInfo().getBoundingSphereRadius();
 		attackRange += source->getGeometryInfo().getBoundingSphereRadius();
 #endif
@@ -2085,13 +2158,13 @@ Bool Weapon::computeApproachTarget(const Object *source, const Object *target, c
 	const Real FUDGE = 0.001f;
 	if (dist < FUDGE)
 	{
-		// we're close enough! 
+		// we're close enough!
 		approachTargetPos = *source->getPosition();
 		return true;
 	}
 	else
 	{
-		if (isContactWeapon()) 
+		if (isContactWeapon())
 		{
 			// Weapon is basically a contact weapon, like a car bomb.  The approach target logic
 			// has been modified to let it approach the object, so just return the target position.	jba.
@@ -2128,12 +2201,12 @@ Bool Weapon::computeApproachTarget(const Object *source, const Object *target, c
 
 //-------------------------------------------------------------------------------------------------
 //Special case attack range calculate that fakes moving the object (to a garrisoned point) without
-//actually moving the object. This is used to help determine if a garrisoned unit not yet 
+//actually moving the object. This is used to help determine if a garrisoned unit not yet
 //positioned can attack someone.
 //-------------------------------------------------------------------------------------------------
 Bool Weapon::isSourceObjectWithGoalPositionWithinAttackRange( const Object *source, const Coord3D *goalPos, const Object *target, const Coord3D *targetPos ) const
 {
-	
+
 	Real distSqr;
 	if( target )
 		distSqr = ThePartitionManager->getGoalDistanceSquared( source, goalPos, target, ATTACK_RANGE_CALC_TYPE );
@@ -2181,20 +2254,20 @@ Bool Weapon::isWithinAttackRange(const Object *source, const Object *target) con
 	if( !target->isKindOf(KINDOF_BRIDGE) )
 	{
 		distSqr = ThePartitionManager->getDistanceSquared( source, target, ATTACK_RANGE_CALC_TYPE );
-	}	
-	else 
+	}
+	else
 	{
 		// Special case - bridges have two attackable points at either end.
 		TBridgeAttackInfo info;
 		TheTerrainLogic->getBridgeAttackPoints(target, &info);
 		distSqr = ThePartitionManager->getDistanceSquared( source, &info.attackPoint1, ATTACK_RANGE_CALC_TYPE );
-		if (distSqr>attackRangeSqr) 
+		if (distSqr>attackRangeSqr)
 		{
 			// Try the other one.
 			distSqr = ThePartitionManager->getDistanceSquared( source, &info.attackPoint2, ATTACK_RANGE_CALC_TYPE );
 		}
 	}
-	
+
 	Real minAttackRangeSqr = sqr(m_template->getMinimumAttackRange());
 #ifdef RATIONALIZE_ATTACK_RANGE
 	if (distSqr < minAttackRangeSqr)
@@ -2223,12 +2296,12 @@ Bool Weapon::isWithinAttackRange(const Object *source, const Object *target) con
 				{
 					return true;
 				}
-			}  
+			}
 			return false;
 		}
 		return true;
 	}
-	return false;	
+	return false;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2243,7 +2316,7 @@ Bool Weapon::isTooClose(const Object *source, const Object *target) const
 	{
 		return true;
 	}
-	return false;	
+	return false;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2258,7 +2331,7 @@ Bool Weapon::isTooClose( const Object *source, const Coord3D *pos ) const
 	{
 		return true;
 	}
-	return false;	
+	return false;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2267,8 +2340,8 @@ Bool Weapon::isGoalPosWithinAttackRange(const Object *source, const Coord3D* goa
 	Real distSqr;
 	// Note - undersize by 1/4 of a pathfind cell, so that the goal is not teetering on the edge
 	// of firing range.  jba.
-	// Note 2 - even with RATIONALIZE_ATTACK_RANGE, we still need to subtract 1/4 of a pathfind cell, 
-	// otherwise if it teters on the edge, attacks can fail.  jba. 
+	// Note 2 - even with RATIONALIZE_ATTACK_RANGE, we still need to subtract 1/4 of a pathfind cell,
+	// otherwise if it teters on the edge, attacks can fail.  jba.
 	Real attackRangeSqr = sqr(getAttackRange(source)-(PATHFIND_CELL_SIZE_F*0.25f));
 
 	if (target != NULL)
@@ -2279,13 +2352,13 @@ Bool Weapon::isGoalPosWithinAttackRange(const Object *source, const Coord3D* goa
 			TBridgeAttackInfo info;
 			TheTerrainLogic->getBridgeAttackPoints(target, &info);
 			distSqr = ThePartitionManager->getGoalDistanceSquared( source, goalPos, &info.attackPoint1, ATTACK_RANGE_CALC_TYPE );
-			if (distSqr>attackRangeSqr) 
+			if (distSqr>attackRangeSqr)
 			{
 				// Try the other one.
 				distSqr = ThePartitionManager->getGoalDistanceSquared( source, goalPos, &info.attackPoint2, ATTACK_RANGE_CALC_TYPE );
 			}
-		}	
-		else 
+		}
+		else
 		{
 			distSqr = ThePartitionManager->getGoalDistanceSquared( source, goalPos, target, ATTACK_RANGE_CALC_TYPE );
 		}
@@ -2297,8 +2370,8 @@ Bool Weapon::isGoalPosWithinAttackRange(const Object *source, const Coord3D* goa
 
 	// Note - oversize by 1/4 of a pathfind cell, so that the goal is not teetering on the edge
 	// of firing range.  jba.
-	// Note 2 - even with RATIONALIZE_ATTACK_RANGE, we still need to add 1/4 of a pathfind cell, 
-	// otherwise if it teters on the edge, attacks can fail.  jba. 
+	// Note 2 - even with RATIONALIZE_ATTACK_RANGE, we still need to add 1/4 of a pathfind cell,
+	// otherwise if it teters on the edge, attacks can fail.  jba.
 	Real minAttackRangeSqr = sqr(m_template->getMinimumAttackRange()+(PATHFIND_CELL_SIZE_F*0.25f));
 #ifdef RATIONALIZE_ATTACK_RANGE
 	if (distSqr < minAttackRangeSqr)
@@ -2358,10 +2431,10 @@ Real Weapon::getPercentReadyToFire() const
 
 //-------------------------------------------------------------------------------------------------
 Real Weapon::getAttackRange(const Object *source) const
-{ 
+{
 	WeaponBonus bonus;
 	computeBonus(source, 0, bonus);
-	return m_template->getAttackRange(bonus); 
+	return m_template->getAttackRange(bonus);
 
 	//Contained objects have longer ranges.
 	//const Object *container = source->getContainedBy();
@@ -2374,7 +2447,7 @@ Real Weapon::getAttackRange(const Object *source) const
 
 //-------------------------------------------------------------------------------------------------
 Real Weapon::getAttackDistance(const Object *source, const Object *victimObj, const Coord3D* victimPos) const
-{ 
+{
 	Real range = getAttackRange(source);
 
 	if (victimObj != NULL)
@@ -2444,7 +2517,7 @@ void Weapon::createLaser( const Object *sourceObj, const Object *victimObj, cons
 	const ThingTemplate* pst = TheThingFactory->findTemplate(m_template->getLaserName());
 	if( !pst )
 	{
-		DEBUG_CRASH( ("Weapon::createLaser(). %s could not find template for its laser %s.", 
+		DEBUG_CRASH( ("Weapon::createLaser(). %s could not find template for its laser %s.",
 			sourceObj->getTemplate()->getName().str(), m_template->getLaserName().str() ) );
 		return;
 	}
@@ -2454,7 +2527,7 @@ void Weapon::createLaser( const Object *sourceObj, const Object *victimObj, cons
 
 	// Give it a good basis in reality to ensure it can draw when on screen.
 	laser->setPosition(sourceObj->getPosition());
-	
+
 	//Check for laser update
 	Drawable *draw = laser->getDrawable();
 	if( draw )
@@ -2479,17 +2552,17 @@ void Weapon::createLaser( const Object *sourceObj, const Object *victimObj, cons
 // return true if we auto-reloaded our clip after firing.
 //DECLARE_PERF_TIMER(fireWeapon)
 Bool Weapon::privateFireWeapon(
-	const Object *sourceObj, 
-	Object *victimObj, 
-	const Coord3D* victimPos, 
-	Bool isProjectileDetonation, 
-	Bool ignoreRanges, 
+	const Object *sourceObj,
+	Object *victimObj,
+	const Coord3D* victimPos,
+	Bool isProjectileDetonation,
+	Bool ignoreRanges,
 	WeaponBonusConditionFlags extraBonusFlags,
 	ObjectID* projectileID,
 	Bool inflictDamage
 )
 {
-	//CRCDEBUG_LOG(("Weapon::privateFireWeapon() for %s\n", DescribeObject(sourceObj).str()));
+	//CRCDEBUG_LOG(("Weapon::privateFireWeapon() for %s", DescribeObject(sourceObj).str()));
 	//USE_PERF_TIMER(fireWeapon)
 	if (projectileID)
 		*projectileID = INVALID_ID;
@@ -2501,8 +2574,8 @@ Bool Weapon::privateFireWeapon(
 	if( m_template->getRequestAssistRange()  &&  victimObj )
 		processRequestAssistance( sourceObj, victimObj );
 
-	//For weapon templates that have the leech range weapon flag set, it essentially grants 
-	//the weapon unlimited range for the remainder of the attack. While it's triggered here 
+	//For weapon templates that have the leech range weapon flag set, it essentially grants
+	//the weapon unlimited range for the remainder of the attack. While it's triggered here
 	//it's the AIAttackState machine that actually uses and resets this value.
 	//This makes the ASSUMPTION that it is IMPOSSIBLE TO FIRE A WEAPON WITHOUT BEING IN AN AIATTACKSTATE
 	//
@@ -2581,7 +2654,7 @@ Bool Weapon::privateFireWeapon(
 			//We're using a hacker unit to hack a target. Hacking has various effects and
 			//instead of inflicting damage, we are waiting for a period of time until the hack takes effect.
 			//return FALSE;
-		}	
+		}
 	}
 
 	WeaponBonus bonus;
@@ -2607,7 +2680,7 @@ Bool Weapon::privateFireWeapon(
 			m_numShotsForCurBarrel = m_template->getShotsPerBarrel();
 		}
 
-		if( m_scatterTargetsUnused.size() )
+		if( !m_scatterTargetsUnused.empty() )
 		{
 			// If I have a set scatter pattern, I need to offset the target by a random pick from that pattern
 			if( victimObj )
@@ -2639,7 +2712,7 @@ Bool Weapon::privateFireWeapon(
 		{
 			m_template->fireWeaponTemplate(sourceObj, m_wslot, m_curBarrel, victimObj, victimPos, bonus, isProjectileDetonation, ignoreRanges, this, projectileID, inflictDamage );
 		}
-		
+
 		m_lastFireFrame = now;
 		--m_ammoInClip;
 		--m_maxShotCount;
@@ -2661,40 +2734,40 @@ Bool Weapon::privateFireWeapon(
 			{
 				m_status = OUT_OF_AMMO;
 				m_whenWeCanFireAgain = 0x7fffffff;
-				//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::privateFireWeapon 1\n", m_whenWeCanFireAgain));
+				//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::privateFireWeapon 1", m_whenWeCanFireAgain));
 			}
 		}
 		else
 		{
 			m_status = BETWEEN_FIRING_SHOTS;
-			//CRCDEBUG_LOG(("Weapon::privateFireWeapon() just set m_status to BETWEEN_FIRING_SHOTS\n"));
+			//CRCDEBUG_LOG(("Weapon::privateFireWeapon() just set m_status to BETWEEN_FIRING_SHOTS"));
 			Int delay = m_template->getDelayBetweenShots(bonus);
 			m_whenLastReloadStarted = now;
 			m_whenWeCanFireAgain = now + delay;
-			//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d (delay is %d) in Weapon::privateFireWeapon\n", m_whenWeCanFireAgain, delay));
-			
+			//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d (delay is %d) in Weapon::privateFireWeapon", m_whenWeCanFireAgain, delay));
+
 			// if we are sharing reload times
 			// go through other weapons in weapon set
 			// set their m_whenWeCanFireAgain to this guy's delay
 			// set their m_status to this guy's status
 
 			if ( sourceObj->isReloadTimeShared() )
-			{	
+			{
 				for (Int wt = 0; wt<WEAPONSLOT_COUNT; wt++)
 				{
 					Weapon *weapon = sourceObj->getWeaponInWeaponSlot((WeaponSlotType)wt);
 					if (weapon)
 					{
 						weapon->setPossibleNextShotFrame(m_whenWeCanFireAgain);
-						//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::privateFireWeapon 3\n", m_whenWeCanFireAgain));
+						//CRCDEBUG_LOG(("Just set m_whenWeCanFireAgain to %d in Weapon::privateFireWeapon 3", m_whenWeCanFireAgain));
 						weapon->setStatus(BETWEEN_FIRING_SHOTS);
 					}
 				}
 			}
- 
+
 		}
 	}
- 
+
 	return reloaded;
 }
 
@@ -2717,7 +2790,7 @@ void Weapon::preFireWeapon( const Object *source, const Object *victim )
 //-------------------------------------------------------------------------------------------------
 Bool Weapon::fireWeapon(const Object *source, Object *target, ObjectID* projectileID)
 {
-	//CRCDEBUG_LOG(("Weapon::fireWeapon() for %s at %s\n", DescribeObject(source).str(), DescribeObject(target).str()));
+	//CRCDEBUG_LOG(("Weapon::fireWeapon() for %s at %s", DescribeObject(source).str(), DescribeObject(target).str()));
 	return privateFireWeapon( source, target, NULL, false, false, 0, projectileID, TRUE );
 }
 
@@ -2725,21 +2798,21 @@ Bool Weapon::fireWeapon(const Object *source, Object *target, ObjectID* projecti
 // return true if we auto-reloaded our clip after firing.
 Bool Weapon::fireWeapon(const Object *source, const Coord3D* pos, ObjectID* projectileID)
 {
-	//CRCDEBUG_LOG(("Weapon::fireWeapon() for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::fireWeapon() for %s", DescribeObject(source).str()));
 	return privateFireWeapon( source, NULL, pos, false, false, 0, projectileID, TRUE );
 }
 
 //-------------------------------------------------------------------------------------------------
 void Weapon::fireProjectileDetonationWeapon(const Object *source, Object *target, WeaponBonusConditionFlags extraBonusFlags, Bool inflictDamage )
 {
-	//CRCDEBUG_LOG(("Weapon::fireProjectileDetonationWeapon() for %sat %s\n", DescribeObject(source).str(), DescribeObject(target).str()));
+	//CRCDEBUG_LOG(("Weapon::fireProjectileDetonationWeapon() for %sat %s", DescribeObject(source).str(), DescribeObject(target).str()));
 	privateFireWeapon( source, target, NULL, true, false, extraBonusFlags, NULL, inflictDamage );
 }
 
 //-------------------------------------------------------------------------------------------------
 void Weapon::fireProjectileDetonationWeapon(const Object *source, const Coord3D* pos, WeaponBonusConditionFlags extraBonusFlags, Bool inflictDamage )
 {
-	//CRCDEBUG_LOG(("Weapon::fireProjectileDetonationWeapon() for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::fireProjectileDetonationWeapon() for %s", DescribeObject(source).str()));
 	privateFireWeapon( source, NULL, pos, true, false, extraBonusFlags, NULL, inflictDamage );
 }
 
@@ -2748,7 +2821,7 @@ void Weapon::fireProjectileDetonationWeapon(const Object *source, const Coord3D*
 //and immediately gain control of the weapon that was fired to give it special orders...
 Object* Weapon::forceFireWeapon( const Object *source, const Coord3D *pos)
 {
-	//CRCDEBUG_LOG(("Weapon::forceFireWeapon() for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::forceFireWeapon() for %s", DescribeObject(source).str()));
 	//Force the ammo to load instantly.
 	//loadAmmoNow( source );
 	//Fire the weapon at the position. Internally, it'll store the weapon projectile ID if so created.
@@ -2772,7 +2845,7 @@ WeaponStatus Weapon::getStatus() const
 			m_status = READY_TO_FIRE;
 		else
 			m_status = OUT_OF_AMMO;
-		//CRCDEBUG_LOG(("Weapon::getStatus() just set m_status to %d (ammo in clip is %d)\n", m_status, m_ammoInClip));
+		//CRCDEBUG_LOG(("Weapon::getStatus() just set m_status to %d (ammo in clip is %d)", m_status, m_ammoInClip));
 	}
 	return m_status;
 }
@@ -2799,7 +2872,7 @@ Bool Weapon::isWithinTargetPitch(const Object *source, const Object *victim) con
 			(minPitch <= m_template->getMinTargetPitch() && maxPitch >= m_template->getMaxTargetPitch()))
 		return true;
 
-	//DEBUG_LOG(("pitch %f-%f is out of range\n",rad2deg(minPitch),rad2deg(maxPitch),rad2deg(m_template->getMinTargetPitch()),rad2deg(m_template->getMaxTargetPitch())));
+	//DEBUG_LOG(("pitch %f-%f is out of range",rad2deg(minPitch),rad2deg(maxPitch),rad2deg(m_template->getMinTargetPitch()),rad2deg(m_template->getMaxTargetPitch())));
 	return false;
 }
 
@@ -2831,7 +2904,7 @@ Bool Weapon::isDamageWeapon() const
 		case DAMAGE_HACK:
 			return FALSE;
 	}
-	
+
 	//Use no bonus
 	WeaponBonus whoCares;
 	if( m_template->getPrimaryDamage( whoCares ) > 0.0f || m_template->getSecondaryDamage( whoCares ) > 0.0f )
@@ -2921,7 +2994,7 @@ static void makeAssistanceRequest( Object *requestOf, void *userData )
 //-------------------------------------------------------------------------------------------------
 void Weapon::processRequestAssistance( const Object *requestingObject, Object *victimObject )
 {
-	// Iterate through our player's objects, and tell everyone like us within our assistance range 
+	// Iterate through our player's objects, and tell everyone like us within our assistance range
 	// who is free to do so to assist us on this shot.
 	Player *ourPlayer = requestingObject->getControllingPlayer();
 	if( !ourPlayer )
@@ -2937,8 +3010,8 @@ void Weapon::processRequestAssistance( const Object *requestingObject, Object *v
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ void Weapon::calcProjectileLaunchPosition(
-	const Object* launcher, 
-	WeaponSlotType wslot, 
+	const Object* launcher,
+	WeaponSlotType wslot,
 	Int specificBarrelToUse,
 	Matrix3D& worldTransform,
 	Coord3D& worldPos
@@ -2963,17 +3036,17 @@ void Weapon::processRequestAssistance( const Object *requestingObject, Object *v
 	Real turretPitch = 0.0f;
 	const AIUpdateInterface* ai = launcher->getAIUpdateInterface();
 	WhichTurretType tur = ai ? ai->getWhichTurretForWeaponSlot(wslot, &turretAngle, &turretPitch) : TURRET_INVALID;
-	//CRCDEBUG_LOG(("calcProjectileLaunchPosition(): Turret %d, slot %d, barrel %d for %s\n", tur, wslot, specificBarrelToUse, DescribeObject(launcher).str()));
+	//CRCDEBUG_LOG(("calcProjectileLaunchPosition(): Turret %d, slot %d, barrel %d for %s", tur, wslot, specificBarrelToUse, DescribeObject(launcher).str()));
 
 	Matrix3D attachTransform(true);
 	Coord3D turretRotPos = {0.0f, 0.0f, 0.0f};
 	Coord3D turretPitchPos = {0.0f, 0.0f, 0.0f};
 	const Drawable* draw = launcher->getDrawable();
-	//CRCDEBUG_LOG(("Do we have a drawable? %d\n", (draw != NULL)));
+	//CRCDEBUG_LOG(("Do we have a drawable? %d", (draw != NULL)));
 	if (!draw || !draw->getProjectileLaunchOffset(wslot, specificBarrelToUse, &attachTransform, tur, &turretRotPos, &turretPitchPos))
 	{
-		//CRCDEBUG_LOG(("ProjectileLaunchPos %d %d not found!\n",wslot, specificBarrelToUse));
-		DEBUG_CRASH(("ProjectileLaunchPos %d %d not found!\n",wslot, specificBarrelToUse));
+		//CRCDEBUG_LOG(("ProjectileLaunchPos %d %d not found!",wslot, specificBarrelToUse));
+		DEBUG_CRASH(("ProjectileLaunchPos %d %d not found!",wslot, specificBarrelToUse));
 		attachTransform.Make_Identity();
 		turretRotPos.zero();
 		turretPitchPos.zero();
@@ -3005,11 +3078,11 @@ void Weapon::processRequestAssistance( const Object *requestingObject, Object *v
 #endif
 	}
 
-//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+//#if defined(RTS_DEBUG)
 //  Real muzzleHeight = attachTransform.Get_Z_Translation();
 //  DEBUG_ASSERTCRASH( muzzleHeight > 0.001f, ("YOUR TURRET HAS A VERY LOW PROJECTILE LAUNCH POSITION, BUT FOUND A VALID BONE. DID YOU PICK THE WRONG ONE? %s", launcher->getTemplate()->getName().str()));
 //#endif
-  
+
   launcher->convertBonePosToWorldPos(NULL, &attachTransform, NULL, &worldTransform);
 
 	Vector3 tmp = worldTransform.Get_Translation();
@@ -3020,13 +3093,13 @@ void Weapon::processRequestAssistance( const Object *requestingObject, Object *v
 
 //-------------------------------------------------------------------------------------------------
 /*static*/ void Weapon::positionProjectileForLaunch(
-	Object* projectile, 
-	const Object* launcher, 
-	WeaponSlotType wslot, 
+	Object* projectile,
+	const Object* launcher,
+	WeaponSlotType wslot,
 	Int specificBarrelToUse
 )
 {
-	//CRCDEBUG_LOG(("Weapon::positionProjectileForLaunch() for %s from %s\n",
+	//CRCDEBUG_LOG(("Weapon::positionProjectileForLaunch() for %s from %s",
 		//DescribeObject(projectile).str(), DescribeObject(launcher).str()));
 
 	// if our launch vehicle is gone, destroy ourselves
@@ -3061,7 +3134,7 @@ void Weapon::getFiringLineOfSightOrigin(const Object* source, Coord3D& origin) c
 {
 	//GS 1-6-03
 	// Sorry, but we have to simplify this.  If we take the actual projectile launch pos, then
-	// that point can change. Take a Ranger with his gun on his shoulder.  His point is very high so 
+	// that point can change. Take a Ranger with his gun on his shoulder.  His point is very high so
 	// he clears this check and transitions to attacking.  This puts his gun at waist level and
 	// now he fails this check so he transitions back.  Our height won't change.
 	origin.z += source->getGeometryInfo().getMaxHeightAbovePosition();
@@ -3093,12 +3166,12 @@ Bool Weapon::isClearFiringLineOfSightTerrain(const Object* source, const Object*
 {
 	Coord3D origin;
 	origin = *source->getPosition();
-	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain(Object) for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain(Object) for %s", DescribeObject(source).str()));
 	//DUMPCOORD3D(&origin);
 	getFiringLineOfSightOrigin(source, origin);
 	Coord3D victimPos;
 	victim->getGeometryInfo().getCenterPosition( *victim->getPosition(), victimPos );
-	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain() - victimPos is (%g,%g,%g) (%X,%X,%X)\n",
+	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain() - victimPos is (%g,%g,%g) (%X,%X,%X)",
 	//	victimPos.x, victimPos.y, victimPos.z,
 	//	AS_INT(victimPos.x),AS_INT(victimPos.y),AS_INT(victimPos.z)));
 	return ThePartitionManager->isClearLineOfSightTerrain(NULL, origin, NULL, victimPos);
@@ -3110,7 +3183,7 @@ Bool Weapon::isClearFiringLineOfSightTerrain(const Object* source, const Coord3D
 {
 	Coord3D origin;
 	origin = *source->getPosition();
-	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain(Coord3D) for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain(Coord3D) for %s", DescribeObject(source).str()));
 	//DUMPCOORD3D(&origin);
 	getFiringLineOfSightOrigin(source, origin);
 	return ThePartitionManager->isClearLineOfSightTerrain(NULL, origin, NULL, victimPos);
@@ -3122,7 +3195,7 @@ Bool Weapon::isClearFiringLineOfSightTerrain(const Object* source, const Coord3D
 Bool Weapon::isClearGoalFiringLineOfSightTerrain(const Object* source, const Coord3D& goalPos, const Object* victim) const
 {
 	Coord3D origin=goalPos;
-	//CRCDEBUG_LOG(("Weapon::isClearGoalFiringLineOfSightTerrain(Object) for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::isClearGoalFiringLineOfSightTerrain(Object) for %s", DescribeObject(source).str()));
 	//DUMPCOORD3D(&origin);
 	getFiringLineOfSightOrigin(source, origin);
 	Coord3D victimPos;
@@ -3136,10 +3209,10 @@ Bool Weapon::isClearGoalFiringLineOfSightTerrain(const Object* source, const Coo
 Bool Weapon::isClearGoalFiringLineOfSightTerrain(const Object* source, const Coord3D& goalPos, const Coord3D& victimPos) const
 {
 	Coord3D origin=goalPos;
-	//CRCDEBUG_LOG(("Weapon::isClearGoalFiringLineOfSightTerrain(Coord3D) for %s\n", DescribeObject(source).str()));
+	//CRCDEBUG_LOG(("Weapon::isClearGoalFiringLineOfSightTerrain(Coord3D) for %s", DescribeObject(source).str()));
 	//DUMPCOORD3D(&origin);
 	getFiringLineOfSightOrigin(source, origin);
-	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain() - victimPos is (%g,%g,%g) (%X,%X,%X)\n",
+	//CRCDEBUG_LOG(("Weapon::isClearFiringLineOfSightTerrain() - victimPos is (%g,%g,%g) (%X,%X,%X)",
 	//	victimPos.x, victimPos.y, victimPos.z,
 	//	AS_INT(victimPos.x),AS_INT(victimPos.y),AS_INT(victimPos.z)));
 	return ThePartitionManager->isClearLineOfSightTerrain(NULL, origin, NULL, victimPos);
@@ -3150,8 +3223,8 @@ Bool Weapon::isClearGoalFiringLineOfSightTerrain(const Object* source, const Coo
 //This function was added to transfer key weapon stats for Jarmen Kell to and from the bike for
 //the sniper attack, so he can share the stats.
 //-------------------------------------------------------------------------------------------------
-void Weapon::transferNextShotStatsFrom( const Weapon &weapon ) 
-{ 
+void Weapon::transferNextShotStatsFrom( const Weapon &weapon )
+{
 	m_whenWeCanFireAgain = weapon.getPossibleNextShotFrame();
 	m_whenLastReloadStarted = weapon.getLastReloadStartedFrame();
 	m_status = weapon.getStatus();
@@ -3327,7 +3400,7 @@ void Weapon::crc( Xfer *xfer )
 		}
 #endif // DEBUG_CRC
 
-	}  // end for, it
+	}
 
 	// pitch limited
 	xfer->xferBool( &m_pitchLimited );
@@ -3353,11 +3426,11 @@ void Weapon::crc( Xfer *xfer )
 #ifdef DEBUG_CRC
 	if (doLogging)
 	{
-		CRCDEBUG_LOG(("%s\n", logString.str()));
+		CRCDEBUG_LOG(("%s", logString.str()));
 	}
 #endif // DEBUG_CRC
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer
@@ -3430,7 +3503,7 @@ void Weapon::xfer( Xfer *xfer )
 	UnsignedShort scatterCount = m_scatterTargetsUnused.size();
 	xfer->xferUnsignedShort( &scatterCount );
 	Int intData;
-	if( xfer->getXferMode() == XFER_SAVE )	
+	if( xfer->getXferMode() == XFER_SAVE )
 	{
 		std::vector< Int >::const_iterator it;
 
@@ -3440,9 +3513,9 @@ void Weapon::xfer( Xfer *xfer )
 			intData = *it;
 			xfer->xferInt( &intData );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -3455,9 +3528,9 @@ void Weapon::xfer( Xfer *xfer )
 			xfer->xferInt( &intData );
 			m_scatterTargetsUnused.push_back( intData );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// pitch limited
 	xfer->xferBool( &m_pitchLimited );
@@ -3465,7 +3538,7 @@ void Weapon::xfer( Xfer *xfer )
 	// leech weapon range active
 	xfer->xferBool( &m_leechWeaponRangeActive );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -3526,7 +3599,7 @@ void WeaponBonusSet::appendBonuses(WeaponBonusConditionFlags flags, WeaponBonus&
 	{
 		if ((flags & (1 << i)) == 0)
 			continue;
-		
+
 		this->m_bonus[i].appendBonuses(bonus);
 	}
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp
index a243494d221..79235cd92b4 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp
@@ -29,7 +29,7 @@
 
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_WEAPONSLOTTYPE_NAMES
 #define DEFINE_COMMANDSOURCEMASK_NAMES
@@ -53,17 +53,13 @@
 #include "GameLogic/Weapon.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC DATA ////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-const char* WeaponSetFlags::s_bitNameList[] = 
+template<>
+const char* const WeaponSetFlags::s_bitNameList[] =
 {
 	"VETERAN",
 	"ELITE",
@@ -85,6 +81,7 @@ const char* WeaponSetFlags::s_bitNameList[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(WeaponSetFlags::s_bitNameList) == WeaponSetFlags::NumBits + 1, "Incorrect array size");
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
@@ -104,7 +101,7 @@ void WeaponTemplateSet::clear()
 	m_isReloadTimeShared = false;
 	m_isWeaponLockSharedAcrossSets = FALSE;
 	m_types.clear();
-	for (int i = 0; i < WEAPONSLOT_COUNT; ++i) 
+	for (int i = 0; i < WEAPONSLOT_COUNT; ++i)
 	{
 		m_template[i] = NULL;
 		m_autoChooseMask[i] = 0xffffffff;					// by default, allow autochoosing from any CommandSource
@@ -115,7 +112,7 @@ void WeaponTemplateSet::clear()
 //-------------------------------------------------------------------------------------------------
 Bool WeaponTemplateSet::hasAnyWeapons() const
 {
-	for (int i = 0; i < WEAPONSLOT_COUNT; ++i) 
+	for (int i = 0; i < WEAPONSLOT_COUNT; ++i)
 	{
 		if (m_template[i])
 			return true;
@@ -150,7 +147,7 @@ void WeaponTemplateSet::parsePreferredAgainst(INI* ini, void *instance, void * /
 //-------------------------------------------------------------------------------------------------
 void WeaponTemplateSet::parseWeaponTemplateSet( INI* ini, const ThingTemplate* tt )
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ "Conditions", WeaponSetFlags::parseFromINI, NULL, offsetof( WeaponTemplateSet, m_types ) },
 		{ "Weapon",	WeaponTemplateSet::parseWeapon,	NULL, 0 },
@@ -194,8 +191,7 @@ WeaponSet::WeaponSet()
 WeaponSet::~WeaponSet()
 {
 	for (Int i = 0; i < WEAPONSLOT_COUNT; ++i)
-		if (m_weapons[i])
-			deleteInstance(m_weapons[i]);
+		deleteInstance(m_weapons[i]);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -204,7 +200,7 @@ WeaponSet::~WeaponSet()
 void WeaponSet::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -250,7 +246,7 @@ void WeaponSet::xfer( Xfer *xfer )
 			const ThingTemplate* tt = m_curWeaponTemplateSet->friend_getThingTemplate();
 			if (tt == NULL)
 				throw INI_INVALID_DATA;
-		
+
 			ttName = tt->getName();
 			wsFlags = m_curWeaponTemplateSet->friend_getWeaponSetFlags();
 		}
@@ -293,7 +289,7 @@ void WeaponSet::xfer( Xfer *xfer )
 void WeaponSet::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 //-------------------------------------------------------------------------------------------------
 void WeaponSet::updateWeaponSet(const Object* obj)
@@ -304,7 +300,7 @@ void WeaponSet::updateWeaponSet(const Object* obj)
 	{
 		if( ! set->isWeaponLockSharedAcrossSets() )
 		{
-			DEBUG_ASSERTLOG(!isCurWeaponLocked(), ("changing WeaponSet while Weapon is Locked... implicit unlock occurring!\n"));
+			DEBUG_ASSERTLOG(!isCurWeaponLocked(), ("changing WeaponSet while Weapon is Locked... implicit unlock occurring!"));
 			releaseWeaponLock(LOCKED_PERMANENTLY);	// release all locks. sorry!
 			m_curWeapon = PRIMARY_WEAPON;
 		}
@@ -315,11 +311,8 @@ void WeaponSet::updateWeaponSet(const Object* obj)
 		m_hasDamageWeapon = false;
 		for (Int i = WEAPONSLOT_COUNT - 1; i >= PRIMARY_WEAPON ; --i)
 		{
-			if (m_weapons[i] != NULL)
-			{
-				deleteInstance(m_weapons[i]);
-				m_weapons[i] = NULL;
-			}
+			deleteInstance(m_weapons[i]);
+			m_weapons[i] = NULL;
 
 			if (set->getNth((WeaponSlotType)i))
 			{
@@ -340,7 +333,7 @@ void WeaponSet::updateWeaponSet(const Object* obj)
 			}
 		}
 		m_curWeaponTemplateSet = set;
-		//DEBUG_LOG(("WeaponSet::updateWeaponSet -- changed curweapon to %s\n",getCurWeapon()->getName().str()));
+		//DEBUG_LOG(("WeaponSet::updateWeaponSet -- changed curweapon to %s",getCurWeapon()->getName().str()));
 	}
 }
 
@@ -359,7 +352,7 @@ void WeaponSet::updateWeaponSet(const Object* obj)
 	ModelConditionFlagType f = Lookup[a][wslot];
 	if (f != MODELCONDITION_INVALID)
 		flags.set(f);
-	
+
 	static const ModelConditionFlagType Using[WEAPONSLOT_COUNT] = { MODELCONDITION_USING_WEAPON_A, MODELCONDITION_USING_WEAPON_B, MODELCONDITION_USING_WEAPON_C };
 	if (a != WSF_NONE)
 		flags.set(Using[wslot]);
@@ -448,12 +441,12 @@ CanAttackResult WeaponSet::getAbleToAttackSpecificObject( AbleToAttackType attac
 {
 
 	// basic sanity checks.
-	if (!source || 
-			!victim || 
-			source->isEffectivelyDead() || 
-			victim->isEffectivelyDead() || 
-			source->isDestroyed() || 
-			victim->isDestroyed() || 
+	if (!source ||
+			!victim ||
+			source->isEffectivelyDead() ||
+			victim->isEffectivelyDead() ||
+			source->isDestroyed() ||
+			victim->isDestroyed() ||
 			victim == source)
 		return ATTACKRESULT_NOT_POSSIBLE;
 
@@ -491,10 +484,10 @@ CanAttackResult WeaponSet::getAbleToAttackSpecificObject( AbleToAttackType attac
   	  allowStealthToPreventAttacks = FALSE;
   }
 
-	// If an object is stealthed and hasn't been detected yet, then it is not a valid target to fire 
+	// If an object is stealthed and hasn't been detected yet, then it is not a valid target to fire
 	// on.
-	if (allowStealthToPreventAttacks && 
-				victim->testStatus(OBJECT_STATUS_STEALTHED) && 
+	if (allowStealthToPreventAttacks &&
+				victim->testStatus(OBJECT_STATUS_STEALTHED) &&
 				!victim->testStatus(OBJECT_STATUS_DETECTED))
 	{
 		if( !victim->isKindOf( KINDOF_DISGUISER ) )
@@ -524,7 +517,7 @@ CanAttackResult WeaponSet::getAbleToAttackSpecificObject( AbleToAttackType attac
 	// If the victim is fully fogged or fully shrouded, then we cannot attack them
 	// GS -- Shroud only applies in decision making to Player owned objects and when the source is not from script
 	// SRJ -- ignore shroud checks if mode is CONTINUED and the target is immobile, since presumably
-	// we know where it is (and it's not going anywhere); this prevents wonky behavior if you have planes attack 
+	// we know where it is (and it's not going anywhere); this prevents wonky behavior if you have planes attack
 	// a deshrouded thing, which becomes reshrouded before they get there (basically the planes circle once in order
 	// to deshroud it again, and get nailed by AA fire in the meantime)
 
@@ -535,7 +528,7 @@ CanAttackResult WeaponSet::getAbleToAttackSpecificObject( AbleToAttackType attac
  //   && sourceController->getPlayerType() == PLAYER_HUMAN
 //		&& commandSource != CMD_FROM_SCRIPT
 //		&& !(isContinuedAttack(attackType) && victim->isKindOf(KINDOF_IMMOBILE))
-//		&&  victim->getShroudedStatus(sourceController->getPlayerIndex()) >= OBJECTSHROUD_FOGGED 
+//		&&  victim->getShroudedStatus(sourceController->getPlayerIndex()) >= OBJECTSHROUD_FOGGED
 //		)
 //	{
 //		return ATTACKRESULT_NOT_POSSIBLE;
@@ -605,7 +598,7 @@ CanAttackResult WeaponSet::getAbleToAttackSpecificObject( AbleToAttackType attac
 CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType attackType, const Object *source, const Object *victim, const Coord3D *pos, CommandSourceType commandSource, WeaponSlotType specificSlot ) const
 {
 
-	//First determine if we are attacking an object or the ground and get the 
+	//First determine if we are attacking an object or the ground and get the
 	//appropriate weapon anti mask.
 	WeaponAntiMaskType targetAntiMask;
 	if( victim )
@@ -621,7 +614,7 @@ CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType att
 		//Attacking the ground so this is obvious.
 		targetAntiMask = WEAPON_ANTI_GROUND;
 	}
-	
+
 
 	// Special Case test for turreted weapons on buildings... since they cannot move, they must be within range of target
 	//Kris: Actually -- let's just do this for all immobile objects. If we can give it orders to attack, then we must check
@@ -685,7 +678,7 @@ CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType att
 	}
 
 	CanAttackResult okResult = withinAttackRange ? ATTACKRESULT_POSSIBLE : ATTACKRESULT_POSSIBLE_AFTER_MOVING;
-	
+
 
 // ----- things we examine about SOURCE to determine legality of attack
 
@@ -698,7 +691,7 @@ CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType att
 		//of the weapon mask check preceding this, the attack is possible!
 		if( !victim )
 			return okResult;
-		
+
 		if (!isAnyWithinTargetPitch(source, victim))
 			return ATTACKRESULT_INVALID_SHOT;
 
@@ -764,15 +757,15 @@ CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType att
 
 	// Do a check to see if we have a hive object that has slaved objects.
 	SpawnBehaviorInterface* spawnInterface = source->getSpawnBehaviorInterface();
-	if( spawnInterface && 
+	if( spawnInterface &&
 		spawnInterface->getCanAnySlavesUseWeaponAgainstTarget( attackType, victim, pos, commandSource ) == ATTACKRESULT_POSSIBLE )
 	{
 
-// srj sez: this bit is intended to fix the situation where you have a stinger site 
+// srj sez: this bit is intended to fix the situation where you have a stinger site
 // selected and get the "attack if I move" cursor against an enemy. since the stinger site can't
 // move or fire, you shouldn't really EVER get this cursor for it. and since we just verified above
 // that our slaves (the soldiers) can attack correctly, just nork it.
-		if (source->isKindOf( KINDOF_IMMOBILE ) 
+		if (source->isKindOf( KINDOF_IMMOBILE )
 				&& source->isKindOf( KINDOF_SPAWNS_ARE_THE_WEAPONS )
 				&& okResult == ATTACKRESULT_POSSIBLE_AFTER_MOVING)
 			okResult = ATTACKRESULT_POSSIBLE;
@@ -788,7 +781,7 @@ CanAttackResult WeaponSet::getAbleToUseWeaponAgainstTarget( AbleToAttackType att
 Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victim, WeaponChoiceCriteria criteria, CommandSourceType cmdSource)
 {
 	/*
-		1) The first criteria is weapon fitness.  If the object has two weapons that can fire concurrently, 
+		1) The first criteria is weapon fitness.  If the object has two weapons that can fire concurrently,
 			find the set of weapons that can hit the given target.  If two weapons can hit the given target,
 		2) Figure potential damage. If both weapons have the same potential damage (should never happen) then,
 		3) Pick one.
@@ -835,7 +828,7 @@ Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victi
 		// no weapon in this slot.
 		if (!m_weapons[i])
 			continue;
-		
+
 		// weapon not allowed to be specified via this command source.
 		CommandSourceMask okSrcs = m_curWeaponTemplateSet->getNthCommandSourceMask((WeaponSlotType)i);
 		if( ( okSrcs & (1 << cmdSource) ) == 0 )
@@ -858,14 +851,14 @@ Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victi
 		// weapon out of ammo.
 		if (weapon->getStatus() == OUT_OF_AMMO && !weapon->getAutoReloadsClip())
 			continue;
-		
+
 		// weapon not allowed to target this kind of thing.
 		if (!(weapon->getAntiMask() & getVictimAntiMask(victim)))
 			continue;
 
 		if (!weapon->isWithinTargetPitch(obj, victim))
 			continue;
-		
+
 		Real damage = weapon->estimateWeaponDamage(obj, victim);
 		Real attackRange = weapon->getAttackRange(obj);
 		Bool weaponIsReady = (weapon->getStatus() == READY_TO_FIRE);
@@ -878,7 +871,7 @@ Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victi
 		// exception: 'unresistable' weapons are allowed to do zero damage.
 		if (damage <= 0.0f && weapon->getDamageType() != DAMAGE_UNRESISTABLE)
 			continue;
-	
+
 		/*
 			now that we've eliminated the impossible ones, let's decide which
 			one we will prefer.
@@ -894,7 +887,7 @@ Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victi
 		if (KINDOFMASK_ANY_SET(preferredAgainst) && victim->isKindOfMulti(preferredAgainst, KINDOFMASK_NONE))
 		{
 			const Real HUGE_DAMAGE = 1e10;		// wow, that's a lot of damage.
-			const Real HUGE_RANGE = 1e10;			
+			const Real HUGE_RANGE = 1e10;
 			damage = HUGE_DAMAGE;
 			attackRange = HUGE_RANGE;
 			// preferred weapons are also kept if they are merely reloading. (if out of ammo, we can punt.)
@@ -960,13 +953,13 @@ Bool WeaponSet::chooseBestWeaponForTarget(const Object* obj, const Object* victi
 		m_curWeapon = currentDecisionBackup;
 		found = TRUE;
 	}
-	else 
+	else
 	{
 		// No weapon at all was found, so we go back to primary.
 		m_curWeapon = PRIMARY_WEAPON;
 	}
 
-	//DEBUG_LOG(("WeaponSet::chooseBestWeaponForTarget -- changed curweapon to %s\n",getCurWeapon()->getName().str()));
+	//DEBUG_LOG(("WeaponSet::chooseBestWeaponForTarget -- changed curweapon to %s",getCurWeapon()->getName().str()));
 
 	return found;
 }
@@ -1060,7 +1053,7 @@ Bool WeaponSet::setWeaponLock( WeaponSlotType weaponSlot, WeaponLockType lockTyp
 {
 	if (lockType == NOT_LOCKED)
 	{
-		DEBUG_CRASH(("calling setWeaponLock with NOT_LOCKED, so I am doing nothing... did you mean to use releaseWeaponLock()?\n"));
+		DEBUG_CRASH(("calling setWeaponLock with NOT_LOCKED, so I am doing nothing... did you mean to use releaseWeaponLock()?"));
 		return false;
 	}
 
@@ -1072,19 +1065,19 @@ Bool WeaponSet::setWeaponLock( WeaponSlotType weaponSlot, WeaponLockType lockTyp
 		{
 			m_curWeapon = weaponSlot;
 			m_curWeaponLockedStatus = lockType;
-			//DEBUG_LOG(("WeaponSet::setWeaponLock permanently -- changed curweapon to %s\n",getCurWeapon()->getName().str()));
+			//DEBUG_LOG(("WeaponSet::setWeaponLock permanently -- changed curweapon to %s",getCurWeapon()->getName().str()));
 		}
 		else if( lockType == LOCKED_TEMPORARILY && m_curWeaponLockedStatus != LOCKED_PERMANENTLY )
 		{
 			m_curWeapon = weaponSlot;
 			m_curWeaponLockedStatus = lockType;
-			//DEBUG_LOG(("WeaponSet::setWeaponLock temporarily -- changed curweapon to %s\n",getCurWeapon()->getName().str()));
+			//DEBUG_LOG(("WeaponSet::setWeaponLock temporarily -- changed curweapon to %s",getCurWeapon()->getName().str()));
 		}
 
 		return true;
 	}
 
-	DEBUG_CRASH(("setWeaponLock: weapon %d not found (missing an upgrade?)\n", (Int)weaponSlot));
+	DEBUG_CRASH(("setWeaponLock: weapon %d not found (missing an upgrade?)", (Int)weaponSlot));
 	return false;
 }
 
@@ -1109,14 +1102,14 @@ void WeaponSet::releaseWeaponLock(WeaponLockType lockType)
 	}
 	else
 	{
-		DEBUG_CRASH(("calling releaseWeaponLock with NOT_LOCKED makes no sense. why did you do this?\n"));
+		DEBUG_CRASH(("calling releaseWeaponLock with NOT_LOCKED makes no sense. why did you do this?"));
 	}
 }
 
 //-------------------------------------------------------------------------------------------------
 Weapon* WeaponSet::getWeaponInWeaponSlot(WeaponSlotType wslot) const
-{ 
-	return m_weapons[wslot]; 
+{
+	return m_weapons[wslot];
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1142,4 +1135,4 @@ Bool WeaponSet::isSharedReloadTime() const
 		return m_curWeaponTemplateSet->isSharedReloadTime();
 	return false;
 }
- 
+
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
index a39849d8b57..753a0d57cec 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
@@ -27,12 +27,12 @@
 // Author: John Ahlquist, Nov. 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioAffect.h"
 #include "Common/AudioHandleSpecialValues.h"
+#include "Common/FramePacer.h"
 #include "Common/GameAudio.h"
-#include "Common/GameEngine.h"
 #include "Common/MapObject.h"							// For MAP_XY_FACTOR
 #include "Common/PartitionSolver.h"
 #include "Common/Player.h"
@@ -86,11 +86,6 @@
 #include "GameLogic/VictoryConditions.h"
 #include "GameLogic/AIPathfind.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // Kind of hacky, but we need to dance on the guts of the terrain.
 extern void oversizeTheTerrain(Int amount);
@@ -104,7 +99,7 @@ static void updateTeamAndPlayerStuff( Object *obj, void *userData )
 	if (obj)
 	{
 		obj->updateUpgradeModules();
-		
+
 		// srj sez: apparently we have to do this too, since Team::setControllingPlayer
 		// does not. Might make more sense to do it there, but am scared to at this point.
 		Drawable* draw = obj->getDrawable();
@@ -136,14 +131,14 @@ ScriptActions::ScriptActions()
 	m_suppressNewWindows = FALSE;
 	m_unnamedUnit = AsciiString::TheEmptyString;
 
-}  // end ScriptActions
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ScriptActions::~ScriptActions()
 {
 	reset(); // just in case.
-}  // end ~ScriptActions
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Init */
@@ -153,7 +148,7 @@ void ScriptActions::init( void )
 
 	reset();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -163,7 +158,7 @@ void ScriptActions::reset( void )
 	m_suppressNewWindows = FALSE;
 	closeWindows(FALSE); // Close victory or defeat windows.
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -171,7 +166,7 @@ void ScriptActions::reset( void )
 void ScriptActions::update( void )
 {
 	// Empty for now.  jba.
-}  // end update
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -185,7 +180,7 @@ void ScriptActions::closeWindows( Bool suppressNewWindows )
 		TheWindowManager->winDestroy(m_messageWindow);
 		m_messageWindow = NULL;
 	}
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** doQuickVictory */
@@ -227,7 +222,7 @@ void ScriptActions::doVictory( void )
 		{
 			m_messageWindow = TheWindowManager->winCreateFromScript("Menus/Victorious.wnd");
 		}
-	}	
+	}
 	if(TheCampaignManager)
 		TheCampaignManager->SetVictorious(TRUE);
 	TheScriptEngine->startEndGameTimer();
@@ -345,7 +340,7 @@ void ScriptActions::changeObjectPanelFlagForSingleObject(Object *obj, const Asci
 void ScriptActions::doDebugMessage(const AsciiString& msg, Bool pause )
 {
 	TheScriptEngine->AppendDebugMessage(msg, pause);
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** doPlaySoundEffect */
@@ -356,14 +351,14 @@ void ScriptActions::doPlaySoundEffect(const AsciiString& sound)
 	audioEvent.setIsLogicalAudio(true);
 	audioEvent.setPlayerIndex(ThePlayerList->getLocalPlayer()->getPlayerIndex());
 	TheAudio->addAudioEvent( &audioEvent );
-}  
+}
 
 
 //-------------------------------------------------------------------------------------------------
 /** doPlaySoundEffectAt */
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doPlaySoundEffectAt(const AsciiString& sound, const AsciiString& waypoint)
-{	
+{
 	Waypoint *way = TheTerrainLogic->getWaypointByName(waypoint);
 	if (!way) {
 		return;
@@ -373,13 +368,13 @@ void ScriptActions::doPlaySoundEffectAt(const AsciiString& sound, const AsciiStr
 	audioEvent.setIsLogicalAudio(true);
 	audioEvent.setPlayerIndex(ThePlayerList->getLocalPlayer()->getPlayerIndex());
 	TheAudio->addAudioEvent( &audioEvent );
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** doEnableObjectSound */
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doEnableObjectSound(const AsciiString& objectName, Bool enable )
-{	
+{
 	Object *object = TheScriptEngine->getUnitNamed(objectName);
 	if (!object)
 	{
@@ -393,7 +388,7 @@ void ScriptActions::doEnableObjectSound(const AsciiString& objectName, Bool enab
 	}
 
   drawable->enableAmbientSoundFromScript( enable );
-}	
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -407,7 +402,7 @@ void ScriptActions::doDamageTeamMembers(const AsciiString& team, Real amount)
 	if (theTeam) {
 		theTeam->damageTeamMembers(amount);
 	}
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** doMoveToWaypoint */
@@ -419,16 +414,19 @@ void ScriptActions::doMoveToWaypoint(const AsciiString& team, const AsciiString&
 	// The team is the team based on the name, and the calling team (if any) and the team that
 	// triggered the condition.  jba. :)
 	if (theTeam) {
-		AIGroup* theGroup = TheAI->createGroup();
+		AIGroupPtr theGroup = TheAI->createGroup();
 		if (!theGroup) {
 			return;
 		}
-
+#if RETAIL_COMPATIBLE_AIGROUP
 		theTeam->getTeamAsAIGroup(theGroup);
+#else
+		theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 		Waypoint *way = TheTerrainLogic->getWaypointByName(waypoint);
 		if (way) {
 			Coord3D destination = *way->getLocation();
-			//DEBUG_LOG(("Moving team to waypoint %f, %f, %f\n", destination.x, destination.y, destination.z));
+			//DEBUG_LOG(("Moving team to waypoint %f, %f, %f", destination.x, destination.y, destination.z));
  			theGroup->groupMoveToPosition( &destination, false, CMD_FROM_SCRIPT );
 		}
 	}
@@ -440,7 +438,7 @@ void ScriptActions::doMoveToWaypoint(const AsciiString& team, const AsciiString&
 void ScriptActions::doNamedMoveToWaypoint(const AsciiString& unit, const AsciiString& waypoint)
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
-	if (theObj) 
+	if (theObj)
 	{
 		Waypoint *way = TheTerrainLogic->getWaypointByName(waypoint);
 		if (!way) {
@@ -453,7 +451,7 @@ void ScriptActions::doNamedMoveToWaypoint(const AsciiString& unit, const AsciiSt
 		if (!aiUpdate) {
 			return;
 		}
-		
+
 		aiUpdate->clearWaypointQueue();
 		theObj->leaveGroup();
 		aiUpdate->chooseLocomotorSet( LOCOMOTORSET_NORMAL );
@@ -468,8 +466,8 @@ void ScriptActions::doNamedMoveToWaypoint(const AsciiString& unit, const AsciiSt
 void ScriptActions::doCameraFollowNamed(const AsciiString& unit, Bool snapToUnit)
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
-	if (theObj) 
-	{	
+	if (theObj)
+	{
 		TheTacticalView->setCameraLock(theObj->getID());
 		if (snapToUnit)
 			TheTacticalView->snapToCameraLock();
@@ -497,7 +495,7 @@ void ScriptActions::doSetTeamState(const AsciiString& team, const AsciiString& s
 	if (theTeam) {
 		theTeam->setState(state);
 	}
-}	
+}
 
 /** doCreateReinforcements */
 //-------------------------------------------------------------------------------------------------
@@ -509,15 +507,15 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 
 	Bool needToMoveToDestination = false;
 	//Validate the waypoint
-	Waypoint *way = TheTerrainLogic->getWaypointByName(waypoint); 
-	if (way==NULL) 
+	Waypoint *way = TheTerrainLogic->getWaypointByName(waypoint);
+	if (way==NULL)
 	{
 		return;
 	}
 
 	destination = *way->getLocation();
 	if (!theTeamProto) {
-		DEBUG_LOG(("***WARNING - Team %s not found.\n", team));
+		DEBUG_LOG(("***WARNING - Team %s not found.", team.str()));
 		return;
 	}
 	const TeamTemplateInfo *pInfo = theTeamProto->getTemplateInfo();
@@ -543,12 +541,12 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 	Object *transport=NULL;
 	ContainModuleInterface *contain = NULL;
 	transportTemplate = TheThingFactory->findTemplate( pInfo->m_transportUnitType );
-	if( transportTemplate ) 
+	if( transportTemplate )
 	{
 		transport = TheThingFactory->newObject( transportTemplate, theTeam );
 		transport->setPosition( &origin );
 		transport->setOrientation( 0.0f );
-		if( transport ) 
+		if( transport )
 		{
 			contain = transport->getContain();
 		}
@@ -575,15 +573,15 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 
 	//Now create the units that make up the team.
 	Int i, j;
-	for (i=0; i<pInfo->m_numUnitsInfo; i++) 
+	for (i=0; i<pInfo->m_numUnitsInfo; i++)
 	{
 		// get thing template based from map object name
 		unitTemplate = TheThingFactory->findTemplate(pInfo->m_unitsInfo[i].unitThingName);
 		Coord3D pos = origin;
-		if (unitTemplate && theTeam) 
+		if (unitTemplate && theTeam)
 		{
 			Object *obj = NULL;
-			for (j=0; j<pInfo->m_unitsInfo[i].maxUnits; j++) 
+			for (j=0; j<pInfo->m_unitsInfo[i].maxUnits; j++)
 			{
 				// create new object in the world
 				obj = TheThingFactory->newObject( unitTemplate, theTeam );
@@ -594,21 +592,21 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 					pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y);
 					obj->setPosition( &pos );
 					obj->setOrientation(0.0f);
-          
 
-				}  // end if
+
+				}
 			}
 			if (obj) pos.y += 2*obj->getGeometryInfo().getMajorRadius();
 		}
 		origin.y = pos.y;
 	}
 	origin = destination;
-	if (pInfo->m_teamStartsFull) 
+	if (pInfo->m_teamStartsFull)
 	{
 		// Have them load into transports in the team.
 		EntriesVec vecOfUnits;
 		SpacesVec vecOfTransports;
-		
+
 		for (DLINK_ITERATOR<Object> iter = theTeam->iterate_TeamMemberList(); !iter.done(); iter.advance())
 		{
 			Object *obj = iter.cur();
@@ -618,7 +616,7 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 			if (obj==transport) {
 				continue; // Skip the one we created.  The team loads into the transports on the team for team starts full. jba
 			}
-			if (obj->isKindOf(KINDOF_TRANSPORT)) 
+			if (obj->isKindOf(KINDOF_TRANSPORT))
 			{
 				ContainModuleInterface *contain = obj->getContain();
 				if( contain )
@@ -629,8 +627,8 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 				{
 					DEBUG_CRASH( ("doCreateReinforcement script -- transport doesn't have contain to hold guys.") );
 				}
-			} 
-			else 
+			}
+			else
 			{
 				Int slots = obj->getTransportSlotCount();
 				if (slots==0) slots = 0x7fffff; // 0 means lots.
@@ -650,11 +648,11 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 				continue;
 			}
 			ContainModuleInterface *contain = trans->getContain();
-			if (contain) 
+			if (contain)
 			{
 				contain->addToContain(unit);
 			}
-		}		
+		}
 
 	}
 	contain = NULL;
@@ -662,21 +660,21 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 	{
 		contain = transport->getContain();
 	}
-	if (contain) 
+	if (contain)
 	{
 		for (DLINK_ITERATOR<Object> iter = theTeam->iterate_TeamMemberList(); !iter.done(); iter.advance())
 		{
 			Object *obj = iter.cur();
-			if (!obj) 
+			if (!obj)
 			{
 				continue;
 			}
-			if (obj->getTemplate()->isEquivalentTo(transport->getTemplate()) ) 
+			if (obj->getTemplate()->isEquivalentTo(transport->getTemplate()) )
 			{
 				// it's our transport.
 				continue;
 			}
-			if (obj->getContainedBy() != NULL) 
+			if (obj->getContainedBy() != NULL)
 			{
 				continue;
 			}
@@ -685,19 +683,19 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 			Coord3D pos = origin;
 			pos.x += transportCount*transport->getGeometryInfo().getMajorRadius();
 			pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y);
-			
-			if (contain && contain->isValidContainerFor(obj, false)) 
+
+			if (contain && contain->isValidContainerFor(obj, false))
 			{
 				//Now that we know it fits in the transport, check to see if it's full. If it is,
 				//then we'll create a new transport.
-				if (!contain->isValidContainerFor(obj, true)) 
+				if (!contain->isValidContainerFor(obj, true))
 				{
 					// full, try building another.
 					transport = TheThingFactory->newObject( transportTemplate, theTeam );
 					transport->setPosition( &pos );
 					transportCount++;
 					transport->setOrientation(0.0f);
-					if (transport) 
+					if (transport)
 					{
 						contain = transport->getContain();
 					}
@@ -728,19 +726,19 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 	}
 
 
-	if (theTeam) 
+	if (theTeam)
 	{
-		if (transport) 
+		if (transport)
 		{
 			for (DLINK_ITERATOR<Object> iter = theTeam->iterate_TeamMemberList(); !iter.done(); iter.advance())
 			{
 				Object *obj = iter.cur();
-				if (!obj) 
+				if (!obj)
 				{
 					continue;
 				}
 				AIUpdateInterface *ai = obj->getAIUpdateInterface();
-				if (obj->getTemplate()->isEquivalentTo(transport->getTemplate()) ) 
+				if (obj->getTemplate()->isEquivalentTo(transport->getTemplate()) )
 				{
 					if( dp )
 					{
@@ -763,11 +761,11 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 							ai->aiMoveToAndEvacuate( &destination, CMD_FROM_SCRIPT );
 						}
 					}
-				}	
-				else 
+				}
+				else
 				{
 					// If there are any units that aren't transportable, move them to the goal.
-					if( !obj->isDisabledByType( DISABLED_HELD ) ) 
+					if( !obj->isDisabledByType( DISABLED_HELD ) )
 					{
 						if( ai )
 						{
@@ -777,18 +775,22 @@ void ScriptActions::doCreateReinforcements(const AsciiString& team, const AsciiS
 					}
 				}
 			}
-		} 
-		else 
+		}
+		else
 		{
 			theTeam->setActive();
-			if (needToMoveToDestination) 
+			if (needToMoveToDestination)
 			{
-				AIGroup* theGroup = TheAI->createGroup();
-				if (!theGroup) 
+				AIGroupPtr theGroup = TheAI->createGroup();
+				if (!theGroup)
 				{
 					return;
 				}
+#if RETAIL_COMPATIBLE_AIGROUP
 				theTeam->getTeamAsAIGroup(theGroup);
+#else
+				theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 				theGroup->groupMoveToPosition( &destination, false, CMD_FROM_SCRIPT );
 			}
 		}
@@ -803,7 +805,7 @@ void ScriptActions::doMoveCameraTo(const AsciiString& waypoint, Real sec, Real c
 	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext()) {
 		if (way->getName() == waypoint) {
 			Coord3D destination = *way->getLocation();
-			TheTacticalView->moveCameraTo(&destination, sec*1000, cameraStutterSec*1000, true, easeIn*1000.0f, easeOut*1000.0f);			
+			TheTacticalView->moveCameraTo(&destination, sec*1000, cameraStutterSec*1000, true, easeIn*1000.0f, easeOut*1000.0f);
 			break;
 		}
 	}
@@ -848,11 +850,11 @@ void ScriptActions::doSetupCamera(const AsciiString& waypoint, Real zoom, Real p
 	Waypoint *way = TheTerrainLogic->getWaypointByName(waypoint);
 	if (way==NULL) return;
 	Coord3D	pos = *way->getLocation();
-	Waypoint *lookat = TheTerrainLogic->getWaypointByName(lookAtWaypoint); 
+	Waypoint *lookat = TheTerrainLogic->getWaypointByName(lookAtWaypoint);
 	if (lookat==NULL) return;
 	Coord3D destination = *lookat->getLocation();
-	TheTacticalView->moveCameraTo(&pos, 0, 0, true, 0.0f, 0.0f);			
-	TheTacticalView->cameraModLookToward(&destination);			
+	TheTacticalView->moveCameraTo(&pos, 0, 0, true, 0.0f, 0.0f);
+	TheTacticalView->cameraModLookToward(&destination);
 	TheTacticalView->cameraModFinalPitch(pitch, 0.0f, 0.0f);
 	TheTacticalView->cameraModFinalZoom(zoom, 0.0f, 0.0f);
 }
@@ -865,7 +867,7 @@ void ScriptActions::doModCameraLookToward(const AsciiString& waypoint)
 	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext()) {
 		if (way->getName() == waypoint) {
 			Coord3D destination = *way->getLocation();
-			TheTacticalView->cameraModLookToward(&destination);			
+			TheTacticalView->cameraModLookToward(&destination);
 			break;
 		}
 	}
@@ -879,7 +881,7 @@ void ScriptActions::doModCameraFinalLookToward(const AsciiString& waypoint)
 	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext()) {
 		if (way->getName() == waypoint) {
 			Coord3D destination = *way->getLocation();
-			TheTacticalView->cameraModFinalLookToward(&destination);			
+			TheTacticalView->cameraModFinalLookToward(&destination);
 			break;
 		}
 	}
@@ -897,7 +899,7 @@ void ScriptActions::doModCameraMoveToSelection(void)
 	for (Drawable *d = TheGameClient->firstDrawable(); d; d = d->getNextDrawable())
 	{
 		if (d->isSelected())
-		{	
+		{
 			Coord3D pos = *d->getPosition();
 			destination.x += pos.x;
 			destination.y += pos.y;
@@ -909,7 +911,7 @@ void ScriptActions::doModCameraMoveToSelection(void)
 		destination.z /= count;
 		destination.x /= count;
 		destination.y /= count;
-		TheTacticalView->cameraModFinalMoveTo(&destination);			
+		TheTacticalView->cameraModFinalMoveTo(&destination);
 	}
 
 }
@@ -922,7 +924,7 @@ void ScriptActions::doResetCamera(const AsciiString& waypoint, Real sec, Real ea
 	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext()) {
 		if (way->getName() == waypoint) {
 			Coord3D destination = *way->getLocation();
-			TheTacticalView->resetCamera(&destination, sec*1000, easeIn*1000.0f, easeOut*1000.0f);			
+			TheTacticalView->resetCamera(&destination, sec*1000, easeIn*1000.0f, easeOut*1000.0f);
 			break;
 		}
 	}
@@ -933,7 +935,7 @@ void ScriptActions::doResetCamera(const AsciiString& waypoint, Real sec, Real ea
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doRotateCamera(Real rotations, Real sec, Real easeIn, Real easeOut)
 {
-	TheTacticalView->rotateCamera(rotations, sec*1000.0f, easeIn*1000.0f, easeOut*1000.0f);			
+	TheTacticalView->rotateCamera(rotations, sec*1000.0f, easeIn*1000.0f, easeOut*1000.0f);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -944,7 +946,7 @@ void ScriptActions::doRotateCameraTowardObject(const AsciiString& unitName, Real
 	const Object *unit = TheScriptEngine->getUnitNamed(unitName);
 	if (!unit)
 		return;
-	TheTacticalView->rotateCameraTowardObject(unit->getID(), sec*1000.0f, holdSec*1000.0f, easeIn*1000.0f, easeOut*1000.0f);			
+	TheTacticalView->rotateCameraTowardObject(unit->getID(), sec*1000.0f, holdSec*1000.0f, easeIn*1000.0f, easeOut*1000.0f);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -954,7 +956,7 @@ void ScriptActions::doRotateCameraTowardWaypoint(const AsciiString& waypointName
 {
 	Waypoint *way = TheTerrainLogic->getWaypointByName(waypointName);
 	if (way==NULL) return;
-	TheTacticalView->rotateCameraTowardPosition(way->getLocation(), sec*1000.0f, easeIn*1000.0f, easeOut*1000.0f, reverseRotation);			
+	TheTacticalView->rotateCameraTowardPosition(way->getLocation(), sec*1000.0f, easeIn*1000.0f, easeOut*1000.0f, reverseRotation);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -964,7 +966,7 @@ void ScriptActions::doMoveCameraAlongWaypointPath(const AsciiString& waypoint, R
 {
 	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext()) {
 		if (way->getName() == waypoint) {
-			TheTacticalView->moveCameraAlongWaypointPath(way, sec*1000, cameraStutterSec*1000, true, easeIn*1000.0f, easeOut*1000.0f);			
+			TheTacticalView->moveCameraAlongWaypointPath(way, sec*1000, cameraStutterSec*1000, true, easeIn*1000.0f, easeOut*1000.0f);
 			break;
 		}
 	}
@@ -1000,7 +1002,7 @@ void ScriptActions::doCreateObject(const AsciiString& objectName, const AsciiStr
 	if (!theTeam) {
 		TheScriptEngine->AppendDebugMessage("***WARNING - Team not found:***", false);
 		TheScriptEngine->AppendDebugMessage(teamName, true);
-		DEBUG_LOG(("WARNING - Team %s not found.\n", teamName.str()));
+		DEBUG_LOG(("WARNING - Team %s not found.", teamName.str()));
 		return;
 	}
 	const ThingTemplate *thingTemplate;
@@ -1022,7 +1024,7 @@ void ScriptActions::doCreateObject(const AsciiString& objectName, const AsciiStr
 
 			obj->setOrientation(angle);
 			obj->setPosition( pos );
-      
+
       if ( obj->isKindOf( KINDOF_BLAST_CRATER ) ) // since these footprints are permanent
       {
         TheTerrainLogic->createCraterInTerrain( obj );
@@ -1030,9 +1032,9 @@ void ScriptActions::doCreateObject(const AsciiString& objectName, const AsciiStr
       }
 
 
-		}  // end if
+		}
 	} else {
-		DEBUG_LOG(("WARNING - ThingTemplate '%s' not found.\n", thingName.str()));
+		DEBUG_LOG(("WARNING - ThingTemplate '%s' not found.", thingName.str()));
 	}
 }
 
@@ -1045,17 +1047,21 @@ void ScriptActions::doAttack(const AsciiString& attackerName, const AsciiString&
 	// The team is the team based on the name, and the calling team (if any) and the team that
 	// triggered the condition.  jba. :)
 	const Team *victimTeam = TheScriptEngine->getTeamNamed( victimName );
-	
+
 	// sanity
 	if( attackingTeam == NULL || victimTeam == NULL )
 		return;
 
-	AIGroup *aiGroup = TheAI->createGroup();
+	AIGroupPtr aiGroup = TheAI->createGroup();
 	if (!aiGroup) {
 		return;
 	}
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	attackingTeam->getTeamAsAIGroup(aiGroup);
+#else
+	attackingTeam->getTeamAsAIGroup(aiGroup.Peek());
+#endif
 	aiGroup->groupAttackTeam(victimTeam, NO_MAX_SHOTS_LIMIT, CMD_FROM_SCRIPT);
 
 }
@@ -1118,7 +1124,7 @@ void ScriptActions::doBuildObjectNearestTeam( const AsciiString& playerName, con
 {
 	Player *thePlayer = TheScriptEngine->getPlayerFromAsciiString( playerName );
 	Team *theTeam = TheScriptEngine->getTeamNamed( teamName );
-	if( thePlayer && theTeam ) 
+	if( thePlayer && theTeam )
 	{
 		thePlayer->buildSpecificBuildingNearestTeam( buildingType, theTeam );
 	}
@@ -1187,7 +1193,7 @@ void ScriptActions::createUnitOnTeamAt(const AsciiString& unitName, const AsciiS
 	if (!theTeam) {
 		TheScriptEngine->AppendDebugMessage("***WARNING - Team not found:***", false);
 		TheScriptEngine->AppendDebugMessage(teamName, true);
-		DEBUG_LOG(("WARNING - Team %s not found.\n", teamName.str()));
+		DEBUG_LOG(("WARNING - Team %s not found.", teamName.str()));
 		return;
 	}
 	const ThingTemplate *thingTemplate;
@@ -1206,16 +1212,16 @@ void ScriptActions::createUnitOnTeamAt(const AsciiString& unitName, const AsciiS
 					TheScriptEngine->addObjectToCache(obj);
 				}
 			}
-	
+
 			Waypoint *way = TheTerrainLogic->getWaypointByName( waypoint );
 			if (way)
 			{
 				Coord3D destination = *way->getLocation();
 				obj->setPosition(&destination);
 			}
-		}  // end if
+		}
 	} else {
-		DEBUG_LOG(("WARNING - ThingTemplate '%s' not found.\n", objType.str()));
+		DEBUG_LOG(("WARNING - ThingTemplate '%s' not found.", objType.str()));
 	}
 }
 
@@ -1233,7 +1239,7 @@ void ScriptActions::updateNamedAttackPrioritySet(const AsciiString& unitName, co
 	if (!pInterface) {
 		return;
 	}
-	
+
 	const AttackPriorityInfo *info = TheScriptEngine->getAttackInfo(attackPrioritySet);
 
 	pInterface->setAttackInfo(info);
@@ -1252,7 +1258,7 @@ void ScriptActions::updateTeamAttackPrioritySet(const AsciiString& teamName, con
 	}
 
 	const AttackPriorityInfo *info = TheScriptEngine->getAttackInfo(attackPrioritySet);
-	
+
 	if (info->getName().isNotEmpty()) {
 		team->setAttackPriorityName(info->getName());
 	}
@@ -1294,7 +1300,7 @@ void ScriptActions::updateNamedSetAttitude(const AsciiString& unitName, Int atti
 	if (!pInterface) {
 		return;
 	}
-	
+
 	pInterface->setAttitude((AttitudeType) attitude);
 }
 
@@ -1308,12 +1314,16 @@ void ScriptActions::updateTeamSetAttitude(const AsciiString& teamName, Int attit
 		return;
 	}
 
-	AIGroup *pAIGroup = TheAI->createGroup();
+	AIGroupPtr pAIGroup = TheAI->createGroup();
 	if (!pAIGroup) {
 		return;
 	}
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	theSrcTeam->getTeamAsAIGroup(pAIGroup);
+#else
+	theSrcTeam->getTeamAsAIGroup(pAIGroup.Peek());
+#endif
 	pAIGroup->setAttitude((AttitudeType) attitude);
 }
 
@@ -1339,12 +1349,12 @@ void ScriptActions::doTeamSetRepulsor(const AsciiString& teamName, Bool repulsor
 		return;
 	}
 
-	if (theSrcTeam) 
+	if (theSrcTeam)
 	{
 		for (DLINK_ITERATOR<Object> iter = theSrcTeam->iterate_TeamMemberList(); !iter.done(); iter.advance())
 		{
 			Object *obj = iter.cur();
-			if (!obj) 
+			if (!obj)
 			{
 				continue;
 			}
@@ -1363,7 +1373,7 @@ void ScriptActions::doNamedAttackArea(const AsciiString& unitName, const AsciiSt
 	if (!theSrcUnit) {
 		return;
 	}
-	
+
 	PolygonTrigger *pTrig = TheScriptEngine->getQualifiedTriggerAreaByName(areaName);
 	if (!pTrig) {
 		return;
@@ -1389,7 +1399,7 @@ void ScriptActions::doNamedAttackTeam(const AsciiString& unitName, const AsciiSt
 	if (!theSrcUnit) {
 		return;
 	}
-	
+
 	const Team *theTeam = TheScriptEngine->getTeamNamed( teamName );
 	if (!theTeam) {
 		return;
@@ -1417,12 +1427,16 @@ void ScriptActions::doTeamAttackArea(const AsciiString& teamName, const AsciiStr
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	PolygonTrigger *pTrig = TheScriptEngine->getQualifiedTriggerAreaByName(areaName);
 	if (!pTrig) {
@@ -1449,12 +1463,16 @@ void ScriptActions::doTeamAttackNamed(const AsciiString& teamName, const AsciiSt
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
 
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupAttackObject(theVictim, NO_MAX_SHOTS_LIMIT, CMD_FROM_SCRIPT);
 }
 
@@ -1472,7 +1490,7 @@ void ScriptActions::doLoadAllTransports(const AsciiString& teamName)
 
 	EntriesVec vecOfUnits;
 	SpacesVec vecOfTransports;
-	
+
 	for (DLINK_ITERATOR<Object> iter = theTeam->iterate_TeamMemberList(); !iter.done(); iter.advance())
 	{
 		Object *obj = iter.cur();
@@ -1480,7 +1498,7 @@ void ScriptActions::doLoadAllTransports(const AsciiString& teamName)
 			continue;
 		}
 
-		if( obj->isKindOf(KINDOF_TRANSPORT) ) 
+		if( obj->isKindOf(KINDOF_TRANSPORT) )
 		{
 			ContainModuleInterface *contain = obj->getContain();
 			if( contain )
@@ -1491,8 +1509,8 @@ void ScriptActions::doLoadAllTransports(const AsciiString& teamName)
 			{
 				DEBUG_CRASH( ("doLoadAllTransports script -- transport doesn't have a container!") );
 			}
-		} 
-		else 
+		}
+		else
 		{
 			vecOfUnits.push_back(std::make_pair(obj->getID(), obj->getTransportSlotCount()));
 		}
@@ -1514,7 +1532,7 @@ void ScriptActions::doLoadAllTransports(const AsciiString& teamName)
 			unit->getAIUpdateInterface()->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 			unit->getAIUpdateInterface()->aiEnter(trans, CMD_FROM_SCRIPT);
 		}
-	}		
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1526,7 +1544,7 @@ void ScriptActions::doNamedEnterNamed(const AsciiString& unitSrcName, const Asci
 	if (!theSrcUnit) {
 		return;
 	}
-	
+
 	Object *theTransport = TheScriptEngine->getUnitNamed( unitDestName );
 	if (!theTransport) {
 		return;
@@ -1550,15 +1568,19 @@ void ScriptActions::doTeamEnterNamed(const AsciiString& teamName, const AsciiStr
 	if (!theSrcTeam) {
 		return;
 	}
-	
+
 	Object *theTransport = TheScriptEngine->getUnitNamed( unitDestName );
 	if (!theTransport) {
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
-	theSrcTeam->getTeamAsAIGroup(theGroup);
+	AIGroupPtr theGroup = TheAI->createGroup();
 
+#if RETAIL_COMPATIBLE_AIGROUP
+	theSrcTeam->getTeamAsAIGroup(theGroup);
+#else
+	theSrcTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupEnter(theTransport, CMD_FROM_SCRIPT);
 }
 
@@ -1592,9 +1614,13 @@ void ScriptActions::doTeamExitAll(const AsciiString& teamName)
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
-	theTeamOfTransports->getTeamAsAIGroup(theGroup);
+	AIGroupPtr theGroup = TheAI->createGroup();
 
+#if RETAIL_COMPATIBLE_AIGROUP
+	theTeamOfTransports->getTeamAsAIGroup(theGroup);
+#else
+	theTeamOfTransports->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupEvacuate( CMD_FROM_SCRIPT );
 }
 
@@ -1611,8 +1637,8 @@ void ScriptActions::doNamedSetGarrisonEvacDisposition(const AsciiString& unitNam
 
 	ContainModuleInterface *contain = theUnit->getContain();
   if( contain )
-		contain->setEvacDisposition( (EvacDisposition)disp ); 
-    // should be safe to cast any-old int to this enum, 
+		contain->setEvacDisposition( (EvacDisposition)disp );
+    // should be safe to cast any-old int to this enum,
     // since only 1(EVAC_TO_LEFT) and 2(EVAC_TO_RIGHT) differ from default case
 
 }
@@ -1640,8 +1666,8 @@ void ScriptActions::doNamedFollowWaypoints(const AsciiString& unitName, const As
 		return;
 	}
 
-	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this.\n"));
-	
+	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this."));
+
 	theUnit->leaveGroup();
 	aiUpdate->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 	aiUpdate->aiFollowWaypointPath(way, CMD_FROM_SCRIPT);
@@ -1667,8 +1693,8 @@ void ScriptActions::doNamedFollowWaypointsExact(const AsciiString& unitName, con
 		return;
 	}
 
-	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this.\n"));
-	
+	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this."));
+
 	theUnit->leaveGroup();
 	aiUpdate->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 	aiUpdate->aiFollowWaypointPathExact(way, CMD_FROM_SCRIPT);
@@ -1684,11 +1710,15 @@ void ScriptActions::doTeamFollowSkirmishApproachPath(const AsciiString& teamName
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	Int count = 0;
 	Coord3D pos;
 	pos.x=pos.y=pos.z=0;
@@ -1728,8 +1758,8 @@ void ScriptActions::doTeamFollowSkirmishApproachPath(const AsciiString& teamName
 		aiPlayer->checkBridges(firstUnit, way);
 	}
 
-	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, pathLabel), ("***Wrong waypoint purpose. Make jba fix this.\n"));
-	if (asTeam) 
+	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, pathLabel), ("***Wrong waypoint purpose. Make jba fix this."));
+	if (asTeam)
 	{
 		theGroup->groupFollowWaypointPathAsTeam(way, CMD_FROM_SCRIPT);
 	}	else {
@@ -1747,11 +1777,15 @@ void ScriptActions::doTeamMoveToSkirmishApproachPath(const AsciiString& teamName
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	Int count = 0;
 	Coord3D pos;
 	pos.x=pos.y=pos.z=0;
@@ -1781,7 +1815,7 @@ void ScriptActions::doTeamMoveToSkirmishApproachPath(const AsciiString& teamName
 	if (!way) {
 		return;
 	}
-	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, pathLabel), ("***Wrong waypoint purpose. Make jba fix this.\n"));
+	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, pathLabel), ("***Wrong waypoint purpose. Make jba fix this."));
 	theGroup->groupMoveToPosition(way->getLocation(), false, CMD_FROM_SCRIPT);
 }
 
@@ -1795,11 +1829,15 @@ void ScriptActions::doTeamFollowWaypoints(const AsciiString& teamName, const Asc
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	Int count = 0;
 	Coord3D pos;
 	pos.x=pos.y=pos.z=0;
@@ -1823,8 +1861,8 @@ void ScriptActions::doTeamFollowWaypoints(const AsciiString& teamName, const Asc
 	if (!way) {
 		return;
 	}
-	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this.\n"));
-	if (asTeam) 
+	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this."));
+	if (asTeam)
 	{
 		theGroup->groupFollowWaypointPathAsTeam(way, CMD_FROM_SCRIPT);
 	}	else {
@@ -1842,11 +1880,15 @@ void ScriptActions::doTeamFollowWaypointsExact(const AsciiString& teamName, cons
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	Int count = 0;
 	Coord3D pos;
 	pos.x=pos.y=pos.z=0;
@@ -1870,8 +1912,8 @@ void ScriptActions::doTeamFollowWaypointsExact(const AsciiString& teamName, cons
 	if (!way) {
 		return;
 	}
-	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this.\n"));
-	if (asTeam) 
+	DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPathLabel), ("***Wrong waypoint purpose. Make jba fix this."));
+	if (asTeam)
 	{
 		theGroup->groupFollowWaypointPathAsTeamExact(way, CMD_FROM_SCRIPT);
 	}	else {
@@ -1893,7 +1935,7 @@ void ScriptActions::doNamedGuard(const AsciiString& unitName)
 	if (!aiUpdate) {
 		return;
 	}
-	
+
 	theUnit->leaveGroup();
 	Coord3D position = *theUnit->getPosition();
 	aiUpdate->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
@@ -1928,17 +1970,21 @@ void ScriptActions::doTeamGuard(const AsciiString& teamName)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doTeamGuardPosition(const AsciiString& teamName, const AsciiString& waypointName)
 {
-	Waypoint *way = TheTerrainLogic->getWaypointByName(waypointName); 
+	Waypoint *way = TheTerrainLogic->getWaypointByName(waypointName);
 	Team *theTeam = TheScriptEngine->getTeamNamed( teamName );
 	if (!theTeam || !way) {
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	Coord3D position = *way->getLocation();
 
 	theGroup->groupGuardPosition( &position, GUARDMODE_NORMAL, CMD_FROM_SCRIPT );
@@ -1955,12 +2001,15 @@ void ScriptActions::doTeamGuardObject(const AsciiString& teamName, const AsciiSt
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
-
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupGuardObject( theUnit, GUARDMODE_NORMAL, CMD_FROM_SCRIPT );
 }
 
@@ -1975,12 +2024,15 @@ void ScriptActions::doTeamGuardArea(const AsciiString& teamName, const AsciiStri
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
-
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupGuardArea( pTrig, GUARDMODE_NORMAL, CMD_FROM_SCRIPT );
 }
 
@@ -2013,12 +2065,15 @@ void ScriptActions::doTeamHunt(const AsciiString& teamName)
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
-
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupHunt( CMD_FROM_SCRIPT );
 }
 //-------------------------------------------------------------------------------------------------
@@ -2044,7 +2099,7 @@ void ScriptActions::doTeamHuntWithCommandButton(const AsciiString& teamName, con
 			case GUI_COMMAND_SPECIAL_POWER:
 				if( commandButton->getSpecialPowerTemplate() )
 				{
-					if (BitIsSet( commandButton->getOptions(), COMMAND_OPTION_NEED_OBJECT_TARGET )) 
+					if (BitIsSet( commandButton->getOptions(), COMMAND_OPTION_NEED_OBJECT_TARGET ))
 					{
 						// OK, we can hunt with a power that targets an object.
 						break;
@@ -2061,7 +2116,7 @@ void ScriptActions::doTeamHuntWithCommandButton(const AsciiString& teamName, con
 					// ok, we can hunt with a weapon.
 					break;
 				}
-			
+
 			case GUICOMMANDMODE_HIJACK_VEHICLE:
 			case GUICOMMANDMODE_CONVERT_TO_CARBOMB:
 			case GUICOMMANDMODE_SABOTAGE_BUILDING:
@@ -2160,16 +2215,16 @@ void ScriptActions::doTeamHuntWithCommandButton(const AsciiString& teamName, con
 						msg.concat("' requires CommandButtonHuntUpdate in .ini definition to hunt with ");
 						msg.concat(ability);
 						TheScriptEngine->AppendDebugMessage(msg, false);
-					}  // end if
+					}
 				}
 				break;
-				
+
 		}
-			
+
 	}
 
 }
-								
+
 //-------------------------------------------------------------------------------------------------
 /** doTeamHunt */
 //-------------------------------------------------------------------------------------------------
@@ -2228,7 +2283,7 @@ void ScriptActions::doPlayerDisableFactories(const AsciiString& playerName, cons
 void ScriptActions::doPlayerDisableUnitConstruction(const AsciiString& playerName)
 {
 	Player* pPlayer = TheScriptEngine->getPlayerFromAsciiString(playerName);
- 
+
 	if (!pPlayer) {
 		return;
 	}
@@ -2313,7 +2368,7 @@ void ScriptActions::doBuildTeam(const AsciiString& teamName)
 		if (player) {
 			player->buildSpecificTeam(theTeamProto);
 		}
-	}	
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2327,7 +2382,7 @@ void ScriptActions::doRecruitTeam(const AsciiString& teamName, Real recruitRadiu
 		if (player) {
 			player->recruitSpecificTeam(theTeamProto, recruitRadius);
 		}
-	}	
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2546,7 +2601,7 @@ void ScriptActions::doPlayerKill(const AsciiString& playerName)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doDisplayText(const AsciiString& displayText)
 {
-	TheInGameUI->message(displayText);	
+	TheInGameUI->message(displayText);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2572,13 +2627,12 @@ void ScriptActions::doDisplayCinematicText(const AsciiString& displayText, const
 
 	// get the font name
 	AsciiString fontName = AsciiString::TheEmptyString;
-	char buf[256];
-	char *c;
-	strcpy(buf, fontType.str());
+
 	// TheSuperHackers @fix xezon 16/03/2025 Fixes potential buffer overrun via prior c!='\0' test.
-	for( c = buf; *c != '\0'; c++ )
+	const char* c = fontType.str();
+	for (; *c != '\0'; c++)
 	{
-		if( *c != ' ' && *c++ != '-' ) 
+		if( *c != ' ' && *c++ != '-' )
 			fontName.concat(c);
 		else
 			break;
@@ -2608,7 +2662,7 @@ void ScriptActions::doDisplayCinematicText(const AsciiString& displayText, const
 		bold = TRUE;
 
 	// phew, now set as new font
-	GameFont *font = TheFontLibrary->getFont( fontName, 
+	GameFont *font = TheFontLibrary->getFont( fontName,
 		TheGlobalLanguageData->adjustFontSize(size), bold );
 	TheDisplay->setCinematicFont( font );
 
@@ -2628,6 +2682,7 @@ void ScriptActions::doCameoFlash(const AsciiString& name, Int timeInSeconds)
 	if( button == NULL )
 	{
 		DEBUG_CRASH(( "ScriptActions::doCameoFlash can't find AsciiString cameoflash" ));
+		return;
 	}
 
 	Int frames = LOGICFRAMES_PER_SECOND * timeInSeconds;
@@ -2661,7 +2716,7 @@ void ScriptActions::doNamedCustomColor(const AsciiString& unitName, Color c)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doNamedFlash(const AsciiString& unitName, Int timeInSeconds, const RGBColor *color)
 {
-	/** This is called the first time this unit is told by the script to flash. timeInSeconds will tell the drawable 
+	/** This is called the first time this unit is told by the script to flash. timeInSeconds will tell the drawable
 	how long to flash for.  Sets drawable to start flashing but only allows drawable's update to
 	call the actual flash method */
 
@@ -2752,7 +2807,7 @@ void ScriptActions::doSoundPlayFromNamed(const AsciiString& soundName, const Asc
 	if (!pUnit) {
 		return;
 	}
-	
+
 	AudioEventRTS sfx(soundName, pUnit->getID());
 	sfx.setIsLogicalAudio(true);
 	TheAudio->addAudioEvent(&sfx);
@@ -2766,18 +2821,18 @@ enum
 	SUBTITLE_DURATION = 8000
 };
 void ScriptActions::doSpeechPlay(const AsciiString& speechName, Bool allowOverlap)
-{	
+{
 	AudioEventRTS speech(speechName);
 	speech.setIsLogicalAudio(true);
 	speech.setPlayerIndex(ThePlayerList->getLocalPlayer()->getPlayerIndex());
 	speech.setUninterruptable(!allowOverlap);
 	TheAudio->addAudioEvent(&speech);
-	
-	
+
+
 	AsciiString subtitleLabel("DIALOGEVENT:");
 	subtitleLabel.concat(speechName);
 	subtitleLabel.concat("Subtitle");
-	
+
 	// Found is important, because a failure will return a valid "Missing: 'Label'" string.
 	Bool found = FALSE;
 	UnicodeString subtitle = TheGameText->fetch(subtitleLabel, &found);
@@ -2800,7 +2855,7 @@ void ScriptActions::doPlayerTransferAssetsToPlayer(const AsciiString& playerSrcN
 	if (!pPlayerDest || !pPlayerSrc) {
 		return;
 	}
-	
+
 	pPlayerDest->transferAssetsFromThat(pPlayerSrc);
 }
 
@@ -2878,12 +2933,12 @@ void ScriptActions::doObjectRadarCreateEvent(const AsciiString& unitName, Int ev
 	Object *theBuilding = TheScriptEngine->getUnitNamed( unitName );
 	if (!theBuilding)
 		return;
-	
+
 	// get building's position
 	const Coord3D *pos = theBuilding->getPosition();
 	if (!pos)
 		return;
-	
+
 	// create event
 	TheRadar->createEvent(pos, (RadarEventType)eventType);
 }
@@ -2899,7 +2954,7 @@ void ScriptActions::doTeamRadarCreateEvent(const AsciiString& teamName, Int even
 		return;
 	if (!theTeam->hasAnyUnits())
 		return;
-	
+
 	// get team's position
 	const Coord3D *pos = theTeam->getEstimateTeamPosition();
 	if (!pos)
@@ -2914,7 +2969,7 @@ void ScriptActions::doTeamRadarCreateEvent(const AsciiString& teamName, Int even
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doRadarDisable(void)
 {
-	TheRadar->hide(true);
+	TheRadar->hide(ThePlayerList->getLocalPlayer()->getPlayerIndex(), true);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2922,7 +2977,7 @@ void ScriptActions::doRadarDisable(void)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doRadarEnable(void)
 {
-	TheRadar->hide(false);
+	TheRadar->hide(ThePlayerList->getLocalPlayer()->getPlayerIndex(), false);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -2970,7 +3025,7 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)
 {
 	if (TheTacticalView->setViewFilter(FT_VIEW_MOTION_BLUR_FILTER))
 	{
-		enum FilterModes mode;
+		FilterModes mode;
 		if (saturate) {
 			if (zoomIn) {
 				mode = FM_VIEW_MB_IN_SATURATE;
@@ -2993,15 +3048,23 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)
 
 static PlayerMaskType getHumanPlayerMask( void )
 {
+#if RETAIL_COMPATIBLE_CRC
 	PlayerMaskType mask;
+#else
+	PlayerMaskType mask = 0;
+#endif
 	for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)
 	{
 		const Player *player = ThePlayerList->getNthPlayer(i);
 		if (player->getPlayerType() == PLAYER_HUMAN)
+#if RETAIL_COMPATIBLE_CRC
 			mask &= player->getPlayerMask();
+#else
+			mask |= player->getPlayerMask();
+#endif
 	}
 
-	//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X\n", mask));
+	//DEBUG_LOG(("getHumanPlayerMask(): mask was %4.4X", mask));
 	return mask;
 }
 
@@ -3060,22 +3123,22 @@ void ScriptActions::doShroudMapAtWaypoint(const AsciiString& waypointName, Real
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doRevealMapEntire(const AsciiString& playerName)
 {
-	DEBUG_LOG(("ScriptActions::doRevealMapEntire() for player named '%s'\n", playerName.str()));
+	DEBUG_LOG(("ScriptActions::doRevealMapEntire() for player named '%s'", playerName.str()));
 	Player* player = TheScriptEngine->getPlayerFromAsciiString(playerName);
 	if (player && playerName.isNotEmpty())
 	{
-		DEBUG_LOG(("ScriptActions::doRevealMapEntire() for player named '%ls' in position %d\n", player->getPlayerDisplayName().str(), player->getPlayerIndex()));
+		DEBUG_LOG(("ScriptActions::doRevealMapEntire() for player named '%ls' in position %d", player->getPlayerDisplayName().str(), player->getPlayerIndex()));
 		ThePartitionManager->revealMapForPlayer( player->getPlayerIndex() );
 	}
 	else
 	{
-		DEBUG_LOG(("ScriptActions::doRevealMapEntire() - no player, so doing all human players\n"));
+		DEBUG_LOG(("ScriptActions::doRevealMapEntire() - no player, so doing all human players"));
 		for (Int i=0; i<ThePlayerList->getPlayerCount(); ++i)
 		{
 			Player *player = ThePlayerList->getNthPlayer(i);
 			if (player->getPlayerType() == PLAYER_HUMAN)
 			{
-				DEBUG_LOG(("ScriptActions::doRevealMapEntire() for player %d\n", i));
+				DEBUG_LOG(("ScriptActions::doRevealMapEntire() for player %d", i));
 				ThePartitionManager->revealMapForPlayer( i );
 			}
 		}
@@ -3099,7 +3162,7 @@ void ScriptActions::doRevealMapEntirePermanently( Bool reveal, const AsciiString
 			Player *player = ThePlayerList->getNthPlayer(i);
 			if (player->getPlayerType() == PLAYER_HUMAN)
 			{
-				DEBUG_LOG(("ScriptActions::doRevealMapEntirePermanently() for player %d\n", i));
+				DEBUG_LOG(("ScriptActions::doRevealMapEntirePermanently() for player %d", i));
 				if( reveal )
 					ThePartitionManager->revealMapForPlayerPermanently( i );
 				else
@@ -3126,7 +3189,7 @@ void ScriptActions::doShroudMapEntire(const AsciiString& playerName)
 			Player *player = ThePlayerList->getNthPlayer(i);
 			if (player->getPlayerType() == PLAYER_HUMAN)
 			{
-				DEBUG_LOG(("ScriptActions::doShroudMapEntire() for player %d\n", i));
+				DEBUG_LOG(("ScriptActions::doShroudMapEntire() for player %d", i));
 				ThePartitionManager->shroudMapForPlayer( i );
 			}
 		}
@@ -3169,7 +3232,7 @@ void ScriptActions::doMergeTeamIntoTeam(const AsciiString& teamSrcName, const As
 	}
 
 //	Bool done = FALSE;
-	
+
 	DLINK_ITERATOR<Object> iter = teamSrc->iterate_TeamMemberList();
 	Object *nextObj = iter.cur();
 
@@ -3200,7 +3263,7 @@ void ScriptActions::doMergeTeamIntoTeam(const AsciiString& teamSrcName, const As
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doDisableInput()
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (!TheGlobalData->m_disableScriptedInputDisabling)
 #endif
 	{
@@ -3251,7 +3314,7 @@ void ScriptActions::doIdleAllPlayerUnits(const AsciiString& playerName)
 			Player *player = ThePlayerList->getNthPlayer(i);
 			if (player->getPlayerType() == PLAYER_HUMAN)
 			{
-				DEBUG_LOG(("ScriptActions::doIdleAllPlayerUnits() for player %d\n", i));
+				DEBUG_LOG(("ScriptActions::doIdleAllPlayerUnits() for player %d", i));
 				player->setUnitsShouldIdleOrResume(true);
 			}
 		}
@@ -3275,7 +3338,7 @@ void ScriptActions::doResumeSupplyTruckingForIdleUnits(const AsciiString& player
 			Player *player = ThePlayerList->getNthPlayer(i);
 			if (player->getPlayerType() == PLAYER_HUMAN)
 			{
-				DEBUG_LOG(("ScriptActions::doResumeSupplyTruckingForIdleUnits() for player %d\n", i));
+				DEBUG_LOG(("ScriptActions::doResumeSupplyTruckingForIdleUnits() for player %d", i));
 				player->setUnitsShouldIdleOrResume(false);
 			}
 		}
@@ -3332,17 +3395,20 @@ void ScriptActions::doTeamGarrisonSpecificBuilding(const AsciiString& teamName,
 	}
 	PlayerMaskType player = theBuilding->getContain()->getPlayerWhoEntered();
 
-	if (!(theBuilding->isKindOf(KINDOF_STRUCTURE) && 
+	if (!(theBuilding->isKindOf(KINDOF_STRUCTURE) &&
 		(player == 0) || (player == theTeam->getControllingPlayer()->getPlayerMask()))) {
 		return;
 	}
-	
-	AIGroup* theGroup = TheAI->createGroup();
+
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
-	
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupEnter(theBuilding, CMD_FROM_SCRIPT);
 }
 
@@ -3352,18 +3418,18 @@ void ScriptActions::doTeamGarrisonSpecificBuilding(const AsciiString& teamName,
 void ScriptActions::doExitSpecificBuilding(const AsciiString& buildingName)
 {
 	Object *theBuilding = TheScriptEngine->getUnitNamed(buildingName);
-	if (!theBuilding) 
+	if (!theBuilding)
 	{
 		return;
 	}
-	
-	if (!theBuilding->isKindOf(KINDOF_STRUCTURE)) 
+
+	if (!theBuilding->isKindOf(KINDOF_STRUCTURE))
 	{
 		return;
 	}
 
 	AIUpdateInterface *ai = theBuilding->getAIUpdateInterface();
-	if (ai) 
+	if (ai)
 	{
 		ai->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 		ai->aiEvacuate( FALSE, CMD_FROM_SCRIPT );
@@ -3371,7 +3437,7 @@ void ScriptActions::doExitSpecificBuilding(const AsciiString& buildingName)
 	}
 
 	ContainModuleInterface *contain = theBuilding->getContain();
-	if (contain) 
+	if (contain)
 	{
 		contain->removeAllContained( FALSE );
 	}
@@ -3386,7 +3452,7 @@ void ScriptActions::doTeamGarrisonNearestBuilding(const AsciiString& teamName)
 	if (!theTeam) {
 		return;
 	}
-	
+
 	DLINK_ITERATOR<Object> diter = theTeam->iterate_TeamMemberList();
 	Object *leader = diter.cur();
 	if (!leader) {
@@ -3419,10 +3485,10 @@ void ScriptActions::doTeamGarrisonNearestBuilding(const AsciiString& teamName)
 	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(leader, REALLY_FAR, FROM_CENTER_3D, filters, ITER_SORTED_NEAR_TO_FAR);
 	MemoryPoolObjectHolder hold(iter);
 
-	
-	// here's what we do. Find out how many slots each building has open, and tell each unit individually to 
+
+	// here's what we do. Find out how many slots each building has open, and tell each unit individually to
 	// garrison a specific building. We won't use the partition solver because we've already done most of the work
-	
+
 	for (Object *theBuilding = iter->first(); theBuilding; theBuilding = iter->next()) {
 		ContainModuleInterface *cmi = theBuilding->getContain();
 		if (!cmi) {
@@ -3455,7 +3521,7 @@ void ScriptActions::doTeamExitAllBuildings(const AsciiString& teamName)
 	if (!theTeam) {
 		return;
 	}
-		
+
 	for (DLINK_ITERATOR<Object> iter = theTeam->iterate_TeamMemberList(); !iter.done(); iter.advance()) {
 		Object *obj = iter.cur();
 		if (!obj) {
@@ -3495,7 +3561,7 @@ void ScriptActions::doUnitGarrisonSpecificBuilding(const AsciiString& unitName,
 	}
 	PlayerMaskType player = theBuilding->getContain()->getPlayerWhoEntered();
 
-	if (!(theBuilding->isKindOf(KINDOF_STRUCTURE) && 
+	if (!(theBuilding->isKindOf(KINDOF_STRUCTURE) &&
 		(player == 0) || (player == theUnit->getControllingPlayer()->getPlayerMask()))) {
 		return;
 	}
@@ -3536,7 +3602,7 @@ void ScriptActions::doUnitGarrisonNearestBuilding(const AsciiString& unitName)
 
 	PartitionFilterAcceptByKindOf f2( MAKE_KINDOF_MASK( KINDOF_FS_INTERNET_CENTER ), KINDOFMASK_NONE );
 	PartitionFilterRejectByKindOf f3( MAKE_KINDOF_MASK( KINDOF_FS_INTERNET_CENTER ), KINDOFMASK_NONE );
-	
+
 	if( theUnit->isKindOf( KINDOF_MONEY_HACKER ) )
 	{
 		//If the unit is a hacker, then look for an internet center instead of a normal building!
@@ -3549,11 +3615,11 @@ void ScriptActions::doUnitGarrisonNearestBuilding(const AsciiString& unitName)
 	}
 
 	filters[count++] = NULL;
-	
+
 	ObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(theUnit, REALLY_FAR, FROM_CENTER_3D, filters, ITER_SORTED_NEAR_TO_FAR);
 	MemoryPoolObjectHolder hold(iter);
 
-	for (Object *theBuilding = iter->first(); theBuilding; theBuilding = iter->next()) 
+	for (Object *theBuilding = iter->first(); theBuilding; theBuilding = iter->next())
 	{
 		ContainModuleInterface *contain = theBuilding->getContain();
 		if( !contain )
@@ -3590,15 +3656,15 @@ void ScriptActions::doNamedEnableStealth( const AsciiString& unitName, Bool enab
 void ScriptActions::doTeamEnableStealth( const AsciiString& teamName, Bool enabled )
 {
 	Team *team = TheScriptEngine->getTeamNamed( teamName );
-	if( !team ) 
+	if( !team )
 	{
 		return;
 	}
-		
+
 	for( DLINK_ITERATOR<Object> iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance() )
 	{
 		Object *obj = iter.cur();
-		if( obj ) 
+		if( obj )
 		{
 			obj->setScriptStatus( OBJECT_STATUS_SCRIPT_UNSTEALTHED, !enabled );
 		}
@@ -3626,21 +3692,21 @@ void ScriptActions::doNamedSetUnmanned( const AsciiString& unitName )
 void ScriptActions::doTeamSetUnmanned( const AsciiString& teamName )
 {
 	Team *team = TheScriptEngine->getTeamNamed( teamName );
-	if( !team ) 
+	if( !team )
 	{
 		return;
 	}
-		
+
 	for( DLINK_ITERATOR<Object> iter = team->iterate_TeamMemberList(); !iter.done(); )
 	{
 		Object *obj = iter.cur();
 
-		//Advance the iterator NOW because when we unman the object, the team gets nuked, and 
+		//Advance the iterator NOW because when we unman the object, the team gets nuked, and
 		//the iterator stops after the first iteration!
 		iter.advance();
 		//*************
 
-		if( obj ) 
+		if( obj )
 		{
 			obj->setDisabled( DISABLED_UNMANNED );
 			TheGameLogic->deselectObject( obj, PLAYERMASK_ALL, TRUE );
@@ -3671,7 +3737,7 @@ void ScriptActions::doNamedSetBoobytrapped( const AsciiString& thingTemplateName
 					obj->getGeometryInfo().makeRandomOffsetOnPerimeter( pos );
 
 					//Get the angle and transform matrix from the obj... then transform the calculated
-					//position 
+					//position
 					const Matrix3D *transform = obj->getTransformMatrix();
 					transform->Transform_Vector( *transform, *(Vector3*)(&pos), (Vector3*)(&pos) );
 
@@ -3686,11 +3752,11 @@ void ScriptActions::doNamedSetBoobytrapped( const AsciiString& thingTemplateName
 void ScriptActions::doTeamSetBoobytrapped( const AsciiString& thingTemplateName, const AsciiString& teamName )
 {
 	Team *team = TheScriptEngine->getTeamNamed( teamName );
-	if( !team ) 
+	if( !team )
 	{
 		return;
 	}
-		
+
 	for( DLINK_ITERATOR<Object> iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance() )
 	{
 		Object *obj = iter.cur();
@@ -3710,7 +3776,7 @@ void ScriptActions::doTeamSetBoobytrapped( const AsciiString& thingTemplateName,
 					obj->getGeometryInfo().makeRandomOffsetOnPerimeter( pos );
 
 					//Get the angle and transform matrix from the obj... then transform the calculated
-					//position 
+					//position
 					const Matrix3D *transform = obj->getTransformMatrix();
 					transform->Transform_Vector( *transform, *(Vector3*)(&pos), (Vector3*)(&pos) );
 
@@ -3746,12 +3812,12 @@ void ScriptActions::doUnitExitBuilding(const AsciiString& unitName)
 void ScriptActions::doPlayerGarrisonAllBuildings(const AsciiString& playerName)
 {
 	Player* player = TheScriptEngine->getPlayerFromAsciiString(playerName);
-	
+
 	if (!player) {
 		return;
 	}
 
-	player->garrisonAllUnits(CMD_FROM_SCRIPT);	
+	player->garrisonAllUnits(CMD_FROM_SCRIPT);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -3760,7 +3826,7 @@ void ScriptActions::doPlayerGarrisonAllBuildings(const AsciiString& playerName)
 void ScriptActions::doPlayerExitAllBuildings(const AsciiString& playerName)
 {
 	Player* player = TheScriptEngine->getPlayerFromAsciiString(playerName);
-	
+
 	if (!player) {
 		return;
 	}
@@ -3852,7 +3918,7 @@ void ScriptActions::doUnfreezeTime(void)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doMilitaryCaption(const AsciiString& briefing, Int duration)
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_disableMilitaryCaption)
 		duration = 1;
 #endif
@@ -3885,7 +3951,7 @@ void ScriptActions::doSetStoppingDistance(const AsciiString& team, Real stopping
 			if (!aiUpdate || !aiUpdate->getCurLocomotor()) {
 				return;
 			}
-			
+
 			if (stoppingDistance >= 0.5f)
 			{
 				aiUpdate->getCurLocomotor()->setCloseEnoughDist(stoppingDistance);
@@ -3900,7 +3966,7 @@ void ScriptActions::doSetStoppingDistance(const AsciiString& team, Real stopping
 void ScriptActions::doNamedSetHeld(const AsciiString& unit, Bool held)
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
-	if (theObj) 
+	if (theObj)
 	{
 		theObj->setDisabledUntil( DISABLED_HELD, held ? FOREVER : NEVER );
 	}
@@ -3912,13 +3978,13 @@ void ScriptActions::doNamedSetHeld(const AsciiString& unit, Bool held)
 void ScriptActions::doNamedSetStoppingDistance(const AsciiString& unit, Real stoppingDistance)
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
-	if (theObj) 
+	if (theObj)
 	{
 		AIUpdateInterface *aiUpdate = theObj->getAIUpdateInterface();
 		if (!aiUpdate || !aiUpdate->getCurLocomotor()) {
 			return;
 		}
-		
+
 		if (stoppingDistance >= 0.5f)
 		{
 			aiUpdate->getCurLocomotor()->setCloseEnoughDist(stoppingDistance);
@@ -4015,7 +4081,7 @@ void ScriptActions::doSetMoney(const AsciiString& playerName, Int money)
 		return;
 
 	m->withdraw(m->countMoney());
-	m->deposit(money);
+	m->deposit(money, FALSE, FALSE);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -4172,32 +4238,32 @@ void ScriptActions::doSkirmishFireSpecialPowerAtMostCost( const AsciiString &pla
 	enemyNdx = enemyPlayer->getPlayerIndex();
 
 	const SpecialPowerTemplate *power = TheSpecialPowerStore->findSpecialPowerTemplate(specialPower);
-	if (power==NULL) 
+	if (power==NULL)
 		return;
 	Real radius = 50.0f;
 	if (power->getRadiusCursorRadius()>radius) {
 		radius = power->getRadiusCursorRadius();
 	}
-	
+
 	Player::PlayerTeamList::const_iterator it;
-	
+
 	Player *pPlayer = TheScriptEngine->getPlayerFromAsciiString(player);
-	if (pPlayer==NULL) 
+	if (pPlayer==NULL)
 		return;
 
 
-	for (it = pPlayer->getPlayerTeams()->begin(); it != pPlayer->getPlayerTeams()->end(); ++it) 
+	for (it = pPlayer->getPlayerTeams()->begin(); it != pPlayer->getPlayerTeams()->end(); ++it)
 	{
-		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) 
+		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance())
 		{
 			Team *team = iter.cur();
-			if (!team) 
+			if (!team)
 				continue;
 
-			for (DLINK_ITERATOR<Object> iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance()) 
+			for (DLINK_ITERATOR<Object> iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance())
 			{
 				Object *pObj = iter.cur();
-				if (!pObj) 
+				if (!pObj)
 					continue;
 
 				SpecialPowerModuleInterface *mod = pObj->getSpecialPowerModule(power);
@@ -4205,8 +4271,8 @@ void ScriptActions::doSkirmishFireSpecialPowerAtMostCost( const AsciiString &pla
 				{
 					if( !mod->isReady() )
 						continue;
-					
-          
+
+
 	        Coord3D location;
           Bool locationFound = FALSE;
 
@@ -4258,7 +4324,7 @@ void ScriptActions::doNamedFireSpecialPowerAtNamed( const AsciiString& unit, con
 void ScriptActions::doNamedUseCommandButtonAbility( const AsciiString& unit, const AsciiString& ability )
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
-	
+
 	//Sanity check
 	if( !theObj )
 	{
@@ -4292,7 +4358,7 @@ void ScriptActions::doNamedUseCommandButtonAbilityOnNamed( const AsciiString& un
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
 	Object *theTarget = TheScriptEngine->getUnitNamed( target );
-	
+
 	//Sanity check
 	if( !theObj || !theTarget )
 	{
@@ -4326,7 +4392,7 @@ void ScriptActions::doNamedUseCommandButtonAbilityAtWaypoint( const AsciiString&
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
 	Waypoint *pWaypoint = TheTerrainLogic->getWaypointByName( waypoint );
-	
+
 	//Sanity check
 	if( !theObj || !pWaypoint )
 	{
@@ -4365,7 +4431,7 @@ void ScriptActions::doNamedUseCommandButtonAbilityUsingWaypointPath( const Ascii
 	}
 
 	Waypoint *pWaypoint = TheTerrainLogic->getClosestWaypointOnPath( theObj->getPosition(), waypointPath );
-	
+
 	//Sanity check
 	if( !pWaypoint )
 	{
@@ -4400,7 +4466,7 @@ void ScriptActions::doTeamUseCommandButtonAbility( const AsciiString& team, cons
 	Team *theTeam = TheScriptEngine->getTeamNamed( team );
 	// The team is the team based on the name, and the calling team (if any) and the team that
 	// triggered the condition.  jba. :)
-	if( !theTeam ) 
+	if( !theTeam )
 	{
 		return;
 	}
@@ -4412,14 +4478,17 @@ void ScriptActions::doTeamUseCommandButtonAbility( const AsciiString& team, cons
 	}
 
 
-	AIGroup* theGroup = TheAI->createGroup();
-	if( !theGroup ) 
+	AIGroupPtr theGroup = TheAI->createGroup();
+	if( !theGroup )
 	{
 		return;
 	}
 
-	theTeam->getTeamAsAIGroup( theGroup );
-	
+#if RETAIL_COMPATIBLE_AIGROUP
+	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupDoCommandButton( commandButton, CMD_FROM_SCRIPT );
 }
 
@@ -4429,7 +4498,7 @@ void ScriptActions::doTeamUseCommandButtonAbilityOnNamed( const AsciiString& tea
 	Team *theTeam = TheScriptEngine->getTeamNamed( team );
 	// The team is the team based on the name, and the calling team (if any) and the team that
 	// triggered the condition.  jba. :)
-	if( !theTeam ) 
+	if( !theTeam )
 	{
 		return;
 	}
@@ -4447,14 +4516,17 @@ void ScriptActions::doTeamUseCommandButtonAbilityOnNamed( const AsciiString& tea
 	}
 
 
-	AIGroup* theGroup = TheAI->createGroup();
-	if( !theGroup ) 
+	AIGroupPtr theGroup = TheAI->createGroup();
+	if( !theGroup )
 	{
 		return;
 	}
 
-	theTeam->getTeamAsAIGroup( theGroup );
-	
+#if RETAIL_COMPATIBLE_AIGROUP
+	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupDoCommandButtonAtObject( commandButton, theObj, CMD_FROM_SCRIPT );
 }
 
@@ -4464,7 +4536,7 @@ void ScriptActions::doTeamUseCommandButtonAbilityAtWaypoint( const AsciiString&
 	Team *theTeam = TheScriptEngine->getTeamNamed( team );
 	// The team is the team based on the name, and the calling team (if any) and the team that
 	// triggered the condition.  jba. :)
-	if( !theTeam ) 
+	if( !theTeam )
 	{
 		return;
 	}
@@ -4482,18 +4554,21 @@ void ScriptActions::doTeamUseCommandButtonAbilityAtWaypoint( const AsciiString&
 	}
 
 
-	AIGroup* theGroup = TheAI->createGroup();
-	if( !theGroup ) 
+	AIGroupPtr theGroup = TheAI->createGroup();
+	if( !theGroup )
 	{
 		return;
 	}
 
-	theTeam->getTeamAsAIGroup( theGroup );
-	
+#if RETAIL_COMPATIBLE_AIGROUP
+	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupDoCommandButtonAtPosition( commandButton, pWaypoint->getLocation(), CMD_FROM_SCRIPT );
 }
 
-		
+
 
 
 
@@ -4512,8 +4587,8 @@ void ScriptActions::doRadarRefresh( void )
 void ScriptActions::doCameraTetherNamed(const AsciiString& unit, Bool snapToUnit, Real play)
 {
 	Object *theObj = TheScriptEngine->getUnitNamed( unit );
-	if (theObj) 
-	{	
+	if (theObj)
+	{
 		TheTacticalView->setCameraLock(theObj->getID());
 		if (snapToUnit)
 			TheTacticalView->snapToCameraLock();
@@ -4566,17 +4641,20 @@ void ScriptActions::doTeamStop(const AsciiString& teamName, Bool shouldDisband)
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
-
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupIdle(CMD_FROM_SCRIPT);
 
 	if (shouldDisband) {
 		Team *playerDefaultTeam = theTeam->getControllingPlayer()->getDefaultTeam();
-		
+
 		for (DLINK_ITERATOR<Object> iter = theTeam->iterate_TeamMemberList(); !iter.done(); iter.advance()) {
 			Object *obj = iter.cur();
 
@@ -4695,7 +4773,7 @@ void ScriptActions::doUnitStartSequentialScript(const AsciiString& unitName, con
 	seqScript->m_objectID = obj->getID();
 	seqScript->m_scriptToExecuteSequentially = script;
 	seqScript->m_timesToLoop = loopVal;
-	
+
 	TheScriptEngine->appendSequentialScript(seqScript);
 
 	deleteInstance(seqScript);
@@ -4725,11 +4803,11 @@ void ScriptActions::doNamedFireWeaponFollowingWaypointPath( const AsciiString& u
 {
 	//Get the unit... if it fails, abort.
 	Object *theUnit = TheScriptEngine->getUnitNamed( unit );
-	if( !theUnit ) 
+	if( !theUnit )
 	{
 		return;
 	}
-	
+
 	Coord3D pos = *theUnit->getPosition();
 
 
@@ -4755,8 +4833,8 @@ void ScriptActions::doNamedFireWeaponFollowingWaypointPath( const AsciiString& u
 		{
 			return;
 		}
-		DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPath), ("***Wrong waypoint purpose. Make jba fix this.\n"));
-		
+		DEBUG_ASSERTLOG(TheTerrainLogic->isPurposeOfPath(way, waypointPath), ("***Wrong waypoint purpose. Make jba fix this."));
+
 		projectile->leaveGroup();
 		aiUpdate->chooseLocomotorSet(LOCOMOTORSET_NORMAL);
 		aiUpdate->aiFollowWaypointPath(way, CMD_FROM_SCRIPT);
@@ -4779,12 +4857,15 @@ void ScriptActions::doTeamStartSequentialScript(const AsciiString& teamName, con
 	}
 
 	// Idle the team so the seq script will start executing. jba.
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
-
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	theGroup->groupIdle(CMD_FROM_SCRIPT);
 
 
@@ -4792,7 +4873,7 @@ void ScriptActions::doTeamStartSequentialScript(const AsciiString& teamName, con
 	seqScript->m_teamToExecOn = team;
 	seqScript->m_scriptToExecuteSequentially = script;
 	seqScript->m_timesToLoop = loopVal;
-	
+
 	TheScriptEngine->appendSequentialScript(seqScript);
 
 	deleteInstance(seqScript);
@@ -4886,12 +4967,15 @@ void ScriptActions::doTeamIdleForFramecount(const AsciiString& teamName, Int fra
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
 	if (!theGroup) {
 		return;
 	}
-
+#if RETAIL_COMPATIBLE_AIGROUP
 	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
 	Coord3D center;
 	theGroup->getCenter(&center);
 
@@ -4956,7 +5040,7 @@ void ScriptActions::doBorderSwitch(Int borderToUse)
 	{
 		ThePartitionManager->revealMapForPlayerPermanently( observerPlayerIndex );
 	}
-	
+
 	ThePartitionManager->refreshShroudForLocalPlayer();
 }
 
@@ -4966,7 +5050,7 @@ void ScriptActions::doBorderSwitch(Int borderToUse)
 void ScriptActions::doForceObjectSelection(const AsciiString& teamName, const AsciiString& objectType, Bool centerInView, const AsciiString& audioToPlay)
 {
 	Team *team = TheScriptEngine->getTeamNamed(teamName);
-	
+
 	if (!team) {
 		return;
 	}
@@ -4978,14 +5062,14 @@ void ScriptActions::doForceObjectSelection(const AsciiString& teamName, const As
 		if (!obj) {
 			continue;
 		}
-		
+
 		if (obj->getTemplate() && obj->getTemplate()->getName() == objectType) {
 			if (bestGuess == NULL || obj->getID() < bestGuess->getID()) { // lower ID means its newer
-				bestGuess = obj;				
+				bestGuess = obj;
 			}
 		}
 	}
-	
+
 	if (!(bestGuess && bestGuess->getDrawable())) {
 		return;
 	}
@@ -5022,7 +5106,7 @@ void ScriptActions::doDestroyAllContained(const AsciiString& unitName, Int damag
 	}
 
 	ContainModuleInterface *cmi = obj->getContain();
-	if( !cmi || cmi->getContainCount() == 0 ) 
+	if( !cmi || cmi->getContainCount() == 0 )
 	{
 		return;
 	}
@@ -5035,7 +5119,7 @@ void ScriptActions::doDestroyAllContained(const AsciiString& unitName, Int damag
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doRadarForceEnable(void)
 {
-	TheRadar->forceOn(true);
+	TheRadar->forceOn(ThePlayerList->getLocalPlayer()->getPlayerIndex(), true);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -5043,7 +5127,7 @@ void ScriptActions::doRadarForceEnable(void)
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doRadarRevertNormal(void)
 {
-	TheRadar->forceOn(false);
+	TheRadar->forceOn(ThePlayerList->getLocalPlayer()->getPlayerIndex(), false);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -5062,7 +5146,7 @@ void ScriptActions::doScreenShake( UnsignedInt intensity )
 void ScriptActions::doModifyBuildableStatus( const AsciiString& objectType, Int buildableStatus )
 {
 	const ThingTemplate *templ = TheThingFactory->findTemplate(objectType);
-	if (!templ) 
+	if (!templ)
 	{
 		return;
 	}
@@ -5088,7 +5172,7 @@ static CaveInterface* findCave(Object* obj)
 void ScriptActions::doSetCaveIndex( const AsciiString& caveName, Int caveIndex )
 {
 	Object *obj = TheScriptEngine->getUnitNamed(caveName);
-	if (!obj) 
+	if (!obj)
 	{
 		return;
 	}
@@ -5106,7 +5190,7 @@ void ScriptActions::doSetCaveIndex( const AsciiString& caveName, Int caveIndex )
 void ScriptActions::doSetWarehouseValue( const AsciiString& warehouseName, Int cashValue )
 {
 	Object *obj = TheScriptEngine->getUnitNamed(warehouseName);
-	if (!obj) 
+	if (!obj)
 	{
 		return;
 	}
@@ -5130,7 +5214,7 @@ void ScriptActions::doSoundEnableType( const AsciiString& soundEventName, Bool e
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doSoundRemoveAllDisabled()
 {
-	TheAudio->removeDisabledEvents(); 
+	TheAudio->removeDisabledEvents();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -5161,19 +5245,19 @@ void ScriptActions::doSetToppleDirection( const AsciiString& unitName, const Coo
 void ScriptActions::doMoveUnitTowardsNearest( const AsciiString& unitName, const AsciiString& objectType, AsciiString triggerName)
 {
 	Object *obj = TheScriptEngine->getUnitNamed(unitName);
-	if (!obj) 
+	if (!obj)
 	{
 		return;
 	}
 
 	AIUpdateInterface *ai = obj->getAIUpdateInterface();
-	if (!ai) 
+	if (!ai)
 	{
 		return;
 	}
-	
+
 	PolygonTrigger *trig = TheScriptEngine->getQualifiedTriggerAreaByName(triggerName);
-	if (!trig) 
+	if (!trig)
 	{
 		return;
 	}
@@ -5181,7 +5265,7 @@ void ScriptActions::doMoveUnitTowardsNearest( const AsciiString& unitName, const
 	Object *bestObj = NULL;
 
 	const ThingTemplate *templ = TheThingFactory->findTemplate( objectType, FALSE );
-	if( templ ) 
+	if( templ )
 	{
 		PartitionFilterThing thingsToAccept(templ, true);
 		PartitionFilterPolygonTrigger acceptWithin(trig);
@@ -5190,7 +5274,7 @@ void ScriptActions::doMoveUnitTowardsNearest( const AsciiString& unitName, const
 		PartitionFilter *filters[] = { &thingsToAccept, &acceptWithin, &filterMapStatus, NULL };
 
 		bestObj = ThePartitionManager->getClosestObject( obj->getPosition(), REALLY_FAR, FROM_CENTER_2D, filters );
-		if( !bestObj ) 
+		if( !bestObj )
 		{
 			return;
 		}
@@ -5229,7 +5313,7 @@ void ScriptActions::doMoveUnitTowardsNearest( const AsciiString& unitName, const
 			}
 		}
 	}
-	
+
 	ai->chooseLocomotorSet( LOCOMOTORSET_NORMAL );
 	ai->aiMoveToObject( bestObj, CMD_FROM_SCRIPT );
 }
@@ -5240,13 +5324,13 @@ void ScriptActions::doMoveUnitTowardsNearest( const AsciiString& unitName, const
 void ScriptActions::doMoveTeamTowardsNearest( const AsciiString& teamName, const AsciiString& objectType, AsciiString triggerName)
 {
 	Team *team = TheScriptEngine->getTeamNamed(teamName);
-	if (!team) 
+	if (!team)
 	{
 		return;
 	}
-	
+
 	PolygonTrigger *trig = TheScriptEngine->getQualifiedTriggerAreaByName(triggerName);
-	if (!trig) 
+	if (!trig)
 	{
 		return;
 	}
@@ -5257,7 +5341,7 @@ void ScriptActions::doMoveTeamTowardsNearest( const AsciiString& teamName, const
 	for (; !iter.done(); iter.advance())
 	{
 		teamObj = iter.cur();
-		if( teamObj ) 
+		if( teamObj )
 		{
 			AIUpdateInterface *ai = teamObj->getAIUpdateInterface();
 			if( ai )
@@ -5283,7 +5367,7 @@ void ScriptActions::doMoveTeamTowardsNearest( const AsciiString& teamName, const
 		PartitionFilterThing thingsToAccept( templ, true );
 		PartitionFilter *filters[] = { &thingsToAccept, &acceptWithin, &filterMapStatus, NULL };
 		bestObj = ThePartitionManager->getClosestObject( &teamPos, REALLY_FAR, FROM_CENTER_2D, filters );
-		if (!bestObj) 
+		if (!bestObj)
 		{
 			return;
 		}
@@ -5304,7 +5388,7 @@ void ScriptActions::doMoveTeamTowardsNearest( const AsciiString& teamName, const
 				{
 					PartitionFilterThing thingToAccept( thisType, true );
 					PartitionFilter *filters[] = { &thingToAccept, &acceptWithin, &filterMapStatus, NULL };
-						
+
 					Object *obj = ThePartitionManager->getClosestObject( &teamPos, REALLY_FAR, FROM_CENTER_2D, filters, &dist );
 					if( obj )
 					{
@@ -5365,8 +5449,12 @@ void ScriptActions::doSkirmishAttackNearestGroupWithValue( const AsciiString& te
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	Player *player = team->getControllingPlayer();
 
@@ -5377,7 +5465,7 @@ void ScriptActions::doSkirmishAttackNearestGroupWithValue( const AsciiString& te
 	Coord3D groupLoc;
 	theGroup->getCenter(&groupLoc);
 	if (comparison == Parameter::GREATER_EQUAL || comparison == Parameter::GREATER) {
-		ThePartitionManager->getNearestGroupWithValue(player->getPlayerIndex(), ALLOW_ENEMIES, VOT_CashValue, 
+		ThePartitionManager->getNearestGroupWithValue(player->getPlayerIndex(), ALLOW_ENEMIES, VOT_CashValue,
 			&groupLoc, value, true, &loc);
 	}
 
@@ -5394,8 +5482,12 @@ void ScriptActions::doSkirmishCommandButtonOnMostValuable( const AsciiString& te
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	Player *player = team->getControllingPlayer();
 	if (!player)
@@ -5457,8 +5549,12 @@ void ScriptActions::doTeamUseCommandButtonOnNamed( const AsciiString& teamName,
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if(!commandButton) {
@@ -5496,8 +5592,12 @@ void ScriptActions::doTeamUseCommandButtonOnNearestEnemy( const AsciiString& tea
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if(!commandButton) {
@@ -5542,8 +5642,12 @@ void ScriptActions::doTeamUseCommandButtonOnNearestGarrisonedBuilding( const Asc
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if(!commandButton) {
@@ -5590,8 +5694,12 @@ void ScriptActions::doTeamUseCommandButtonOnNearestKindof( const AsciiString& te
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if (!commandButton) {
@@ -5637,8 +5745,12 @@ void ScriptActions::doTeamUseCommandButtonOnNearestBuilding( const AsciiString&
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if (!commandButton) {
@@ -5684,8 +5796,12 @@ void ScriptActions::doTeamUseCommandButtonOnNearestBuildingClass( const AsciiStr
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if (!commandButton) {
@@ -5732,8 +5848,12 @@ void ScriptActions::doTeamUseCommandButtonOnNearestObjectType( const AsciiString
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	const CommandButton *commandButton = TheControlBar->findCommandButton(commandAbility);
 	if (!commandButton) {
@@ -5755,7 +5875,7 @@ void ScriptActions::doTeamUseCommandButtonOnNearestObjectType( const AsciiString
 
 	//First look for a specific object type (object lists will fail)
 	const ThingTemplate *thingTemplate = TheThingFactory->findTemplate( objectType, FALSE );
-	if( thingTemplate ) 
+	if( thingTemplate )
 	{
 		PartitionFilterPlayerAffiliation f1(team->getControllingPlayer(), ALLOW_ENEMIES | ALLOW_NEUTRAL, true);
 		PartitionFilterThing f2(thingTemplate, true);
@@ -5767,10 +5887,10 @@ void ScriptActions::doTeamUseCommandButtonOnNearestObjectType( const AsciiString
 		theGroup->getCenter(&pos);
 
 		bestObj = ThePartitionManager->getClosestObject(&pos, REALLY_FAR, FROM_CENTER_2D, filters);
-		if( !bestObj ) 
-		{
+#if RETAIL_COMPATIBLE_CRC
+		if (!bestObj)
 			return;
-		}
+#endif
 	}
 	else
 	{
@@ -5809,6 +5929,11 @@ void ScriptActions::doTeamUseCommandButtonOnNearestObjectType( const AsciiString
 		}
 	}
 
+#if !RETAIL_COMPATIBLE_CRC
+	if (!bestObj)
+		return;
+#endif
+
 	// already been checked for validity
 	theGroup->groupDoCommandButtonAtObject(commandButton, bestObj, CMD_FROM_SCRIPT);
 }
@@ -5833,18 +5958,18 @@ void ScriptActions::doTeamPartialUseCommandButton( Real percentage, const AsciiS
 
 	for (iter = team->iterate_TeamMemberList(); !iter.done(); iter.advance()) {
 		Object *obj = iter.cur();
-		if (commandButton->isValidToUseOn(obj, NULL, NULL, CMD_FROM_SCRIPT)) {	
+		if (commandButton->isValidToUseOn(obj, NULL, NULL, CMD_FROM_SCRIPT)) {
 			objList.push_back(obj);
 		}
 	}
-	
+
 	Int numObjs = /*REAL_TO_INT_CEIL*/(percentage / 100.0f * objList.size());
 	Int count = 0;
 	for (std::vector<Object*>::const_iterator it = objList.begin(); it != objList.end(); ++it)
 	{
 		Object *obj = (*it);
 
-		if (count >= numObjs) 
+		if (count >= numObjs)
 			return;
 
 		obj->doCommandButton(commandButton, CMD_FROM_SCRIPT);
@@ -5862,8 +5987,12 @@ void ScriptActions::doTeamCaptureNearestUnownedFactionUnit( const AsciiString& t
 		return;
 	}
 
-	AIGroup *theGroup = TheAI->createGroup();
+	AIGroupPtr theGroup = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 	team->getTeamAsAIGroup(theGroup);
+#else
+	team->getTeamAsAIGroup(theGroup.Peek());
+#endif
 
 	PartitionFilterPlayerAffiliation f1(team->getControllingPlayer(), ALLOW_ENEMIES | ALLOW_NEUTRAL, true);
 	PartitionFilterUnmannedObject f2(true);
@@ -5973,18 +6102,22 @@ void ScriptActions::doPlayerSetScienceAvailability( const AsciiString& playerNam
 void ScriptActions::doTeamEmoticon(const AsciiString& teamName, const AsciiString& emoticonName, Real duration)
 {
 	Team *theTeam = TheScriptEngine->getTeamNamed( teamName );
-	if( !theTeam ) 
+	if( !theTeam )
 	{
 		return;
 	}
 
-	AIGroup* theGroup = TheAI->createGroup();
-	if( !theGroup ) 
+	AIGroupPtr theGroup = TheAI->createGroup();
+	if( !theGroup )
 	{
 		return;
 	}
-	theTeam->getTeamAsAIGroup( theGroup );
-	
+#if RETAIL_COMPATIBLE_AIGROUP
+	theTeam->getTeamAsAIGroup(theGroup);
+#else
+	theTeam->getTeamAsAIGroup(theGroup.Peek());
+#endif
+
 	Int frames = (Int)( duration * LOGICFRAMES_PER_SECOND );
 	theGroup->groupSetEmoticon( emoticonName, frames );
 }
@@ -6005,7 +6138,7 @@ void ScriptActions::doNamedEmoticon(const AsciiString& unitName, const AsciiStri
 }
 
 //-------------------------------------------------------------------------------------------------
-// if addObject, we're adding an object to a list. If not addObject, we're removing the associated 
+// if addObject, we're adding an object to a list. If not addObject, we're removing the associated
 // object.
 //-------------------------------------------------------------------------------------------------
 void ScriptActions::doObjectTypeListMaintenance(const AsciiString& objectList, const AsciiString& objectType, Bool addObject)
@@ -6072,8 +6205,8 @@ void ScriptActions::doOverrideHulkLifetime( Real seconds )
 //
 void ScriptActions::doC3CameraEnableSlaveMode
 (
-	const AsciiString& thingTemplateName, 
-	const AsciiString& boneName 
+	const AsciiString& thingTemplateName,
+	const AsciiString& boneName
 )
 {
 	TheTacticalView->cameraEnableSlaveMode( thingTemplateName, boneName );
@@ -6089,15 +6222,15 @@ void ScriptActions::doC3CameraDisableSlaveMode( void )
 // WST 11.12.2002 CNC3 INCURSION - This is for New Camera Shake
 //
 void ScriptActions::doC3CameraShake
-( 
-	const AsciiString &waypointName, 
-	const Real amplitude, 
-	const Real duration_seconds, 
-	const Real radius 
+(
+	const AsciiString &waypointName,
+	const Real amplitude,
+	const Real duration_seconds,
+	const Real radius
 )
 {
 	Waypoint *way = TheTerrainLogic->getWaypointByName(waypointName);
-	DEBUG_ASSERTLOG( (way != NULL), ("Camera shake with No Valid Waypoint\n") );
+	DEBUG_ASSERTLOG( (way != NULL), ("Camera shake with No Valid Waypoint") );
 	Coord3D pos = *way->getLocation();
 
 	TheTacticalView->Add_Camera_Shake(pos, radius, duration_seconds, amplitude);
@@ -6107,7 +6240,7 @@ void ScriptActions::doC3CameraShake
 void ScriptActions::doNamedFaceNamed( const AsciiString &unitName, const AsciiString &faceUnitName )
 {
 	Object *obj = TheScriptEngine->getUnitNamed( unitName );
-	if( obj ) 
+	if( obj )
 	{
 		Object *faceObj = TheScriptEngine->getUnitNamed( faceUnitName );
 		if( faceObj )
@@ -6128,7 +6261,7 @@ void ScriptActions::doNamedFaceNamed( const AsciiString &unitName, const AsciiSt
 void ScriptActions::doNamedFaceWaypoint( const AsciiString &unitName, const AsciiString &faceWaypointName )
 {
 	Object *obj = TheScriptEngine->getUnitNamed( unitName );
-	if( obj ) 
+	if( obj )
 	{
 		Waypoint *way = TheTerrainLogic->getWaypointByName( faceWaypointName );
 		if( way )
@@ -6288,15 +6421,15 @@ void ScriptActions::doRemoveCommandBarButton(const AsciiString& buttonName, cons
 	}
 
 	Int slotNum = -1;
-	for (Int i = 0; i < MAX_COMMANDS_PER_SET; ++i) 
+	for (Int i = 0; i < MAX_COMMANDS_PER_SET; ++i)
 	{
-		if (cs->getCommandButton(i) && (cs->getCommandButton(i)->getName() == buttonName)) 
+		if (cs->getCommandButton(i) && (cs->getCommandButton(i)->getName() == buttonName))
 		{
 			slotNum = i;
 			break;
 		}
 	}
-	
+
 	if (slotNum >= 0)
 	{
 		TheGameLogic->setControlBarOverride(templ->friend_getCommandSetString(), slotNum, NULL);
@@ -6337,7 +6470,7 @@ void ScriptActions::doAffectSkillPointsModifier(const AsciiString& playerName, R
 	}
 
 	playerDst->setSkillPointsModifier(newModifier);
-		
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -6387,7 +6520,7 @@ void ScriptActions::doChooseVictimAlwaysUsesNormal(Bool enable)
 void ScriptActions::doNamedSetTrainHeld( const AsciiString &locoName, const Bool set )
 {
 	Object *obj = TheScriptEngine->getUnitNamed( locoName );
-	if( obj ) 
+	if( obj )
 	{
 
 		static const NameKeyType rrkey = NAMEKEY( "RailroadBehavior" );
@@ -6397,7 +6530,7 @@ void ScriptActions::doNamedSetTrainHeld( const AsciiString &locoName, const Bool
     {
       rBehavior->RailroadBehavior::setHeld( set );
     }
-    
+
 	}
 }
 
@@ -6408,89 +6541,89 @@ void ScriptActions::doNamedSetTrainHeld( const AsciiString &locoName, const Bool
 void ScriptActions::executeAction( ScriptAction *pAction )
 {
 	switch (pAction->getActionType()) {
-		default: 
+		default:
 			DEBUG_CRASH(("Unknown ScriptAction type %d", pAction->getActionType())); return;
-		case ScriptAction::DEBUG_MESSAGE_BOX: 
+		case ScriptAction::DEBUG_MESSAGE_BOX:
 			doDebugMessage(pAction->getParameter(0)->getString(), true);
 			return;
-		case ScriptAction::DEBUG_STRING: 
+		case ScriptAction::DEBUG_STRING:
 			doDebugMessage(pAction->getParameter(0)->getString(), false);
 			return;
-		case ScriptAction::DAMAGE_MEMBERS_OF_TEAM: 
+		case ScriptAction::DAMAGE_MEMBERS_OF_TEAM:
 			doDamageTeamMembers(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal());
 			return;
-		case ScriptAction::MOVE_TEAM_TO: 
+		case ScriptAction::MOVE_TEAM_TO:
 			doMoveToWaypoint(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::MOVE_NAMED_UNIT_TO: 
+		case ScriptAction::MOVE_NAMED_UNIT_TO:
 			doNamedMoveToWaypoint(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::TEAM_SET_STATE: 
+		case ScriptAction::TEAM_SET_STATE:
 			doSetTeamState(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::TEAM_FOLLOW_WAYPOINTS: 
-			doTeamFollowWaypoints(pAction->getParameter(0)->getString(), 
-				pAction->getParameter(1)->getString(), 
+		case ScriptAction::TEAM_FOLLOW_WAYPOINTS:
+			doTeamFollowWaypoints(pAction->getParameter(0)->getString(),
+				pAction->getParameter(1)->getString(),
 				pAction->getParameter(2)->getInt());
 			return;
-		case ScriptAction::TEAM_FOLLOW_WAYPOINTS_EXACT: 
-			doTeamFollowWaypointsExact(pAction->getParameter(0)->getString(), 
-				pAction->getParameter(1)->getString(), 
+		case ScriptAction::TEAM_FOLLOW_WAYPOINTS_EXACT:
+			doTeamFollowWaypointsExact(pAction->getParameter(0)->getString(),
+				pAction->getParameter(1)->getString(),
 				pAction->getParameter(2)->getInt());
 			return;
-		case ScriptAction::NAMED_FOLLOW_WAYPOINTS_EXACT: 
-			doNamedFollowWaypointsExact(pAction->getParameter(0)->getString(), 
+		case ScriptAction::NAMED_FOLLOW_WAYPOINTS_EXACT:
+			doNamedFollowWaypointsExact(pAction->getParameter(0)->getString(),
 				pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::SKIRMISH_FOLLOW_APPROACH_PATH: 
-			doTeamFollowSkirmishApproachPath(pAction->getParameter(0)->getString(), 
-				pAction->getParameter(1)->getString(), 
+		case ScriptAction::SKIRMISH_FOLLOW_APPROACH_PATH:
+			doTeamFollowSkirmishApproachPath(pAction->getParameter(0)->getString(),
+				pAction->getParameter(1)->getString(),
 				pAction->getParameter(2)->getInt());
 			return;
-		case ScriptAction::SKIRMISH_MOVE_TO_APPROACH_PATH: 
-			doTeamMoveToSkirmishApproachPath(pAction->getParameter(0)->getString(), 
+		case ScriptAction::SKIRMISH_MOVE_TO_APPROACH_PATH:
+			doTeamMoveToSkirmishApproachPath(pAction->getParameter(0)->getString(),
 				pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::CREATE_REINFORCEMENT_TEAM: 
+		case ScriptAction::CREATE_REINFORCEMENT_TEAM:
 			doCreateReinforcements(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::SKIRMISH_BUILD_BUILDING: 
+		case ScriptAction::SKIRMISH_BUILD_BUILDING:
 			doBuildBuilding(pAction->getParameter(0)->getString());
 			return;
-		case ScriptAction::AI_PLAYER_BUILD_SUPPLY_CENTER: 
+		case ScriptAction::AI_PLAYER_BUILD_SUPPLY_CENTER:
 			doBuildSupplyCenter(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), pAction->getParameter(2)->getInt());
 			return;
 		case ScriptAction::AI_PLAYER_BUILD_TYPE_NEAREST_TEAM:
 			doBuildObjectNearestTeam( pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), pAction->getParameter(2)->getString() );
 			return;
-		case ScriptAction::AI_PLAYER_BUILD_UPGRADE: 
+		case ScriptAction::AI_PLAYER_BUILD_UPGRADE:
 			doBuildUpgrade(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString());
 			return;
-		case ScriptAction::SKIRMISH_BUILD_BASE_DEFENSE_FRONT: 
+		case ScriptAction::SKIRMISH_BUILD_BASE_DEFENSE_FRONT:
 			doBuildBaseDefense(false);
 			return;
-		case ScriptAction::SKIRMISH_BUILD_BASE_DEFENSE_FLANK: 
+		case ScriptAction::SKIRMISH_BUILD_BASE_DEFENSE_FLANK:
 			doBuildBaseDefense(true);
 			return;
-		case ScriptAction::SKIRMISH_BUILD_STRUCTURE_FRONT: 
+		case ScriptAction::SKIRMISH_BUILD_STRUCTURE_FRONT:
 			doBuildBaseStructure(pAction->getParameter(0)->getString(), false);
 			return;
-		case ScriptAction::SKIRMISH_BUILD_STRUCTURE_FLANK: 
+		case ScriptAction::SKIRMISH_BUILD_STRUCTURE_FLANK:
 			doBuildBaseStructure(pAction->getParameter(0)->getString(), true);
 			return;
-		case ScriptAction::RECRUIT_TEAM: 
+		case ScriptAction::RECRUIT_TEAM:
 			doRecruitTeam(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal());
 			return;
-		case ScriptAction::PLAY_SOUND_EFFECT: 
+		case ScriptAction::PLAY_SOUND_EFFECT:
 			doPlaySoundEffect(pAction->getParameter(0)->getString());
 			return;
-		case ScriptAction::MOVE_CAMERA_TO: 
+		case ScriptAction::MOVE_CAMERA_TO:
 			doMoveCameraTo(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal(), pAction->getParameter(3)->getReal(), pAction->getParameter(4)->getReal());
 			return;
-		case ScriptAction::SETUP_CAMERA: 
+		case ScriptAction::SETUP_CAMERA:
 			doSetupCamera(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal(), pAction->getParameter(3)->getString());
 			return;
-		case ScriptAction::ZOOM_CAMERA: 
+		case ScriptAction::ZOOM_CAMERA:
 			doZoomCamera(pAction->getParameter(0)->getReal(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal(), pAction->getParameter(3)->getReal());
 			return;
 		case ScriptAction::PITCH_CAMERA:
@@ -6502,19 +6635,19 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::CAMERA_STOP_FOLLOW:
 			doStopCameraFollowUnit();
 			return;
-		case ScriptAction::OVERSIZE_TERRAIN:  
+		case ScriptAction::OVERSIZE_TERRAIN:
 			doOversizeTheTerrain(pAction->getParameter(0)->getInt());
 			return;
-		case ScriptAction::CAMERA_MOD_LOOK_TOWARD: 
+		case ScriptAction::CAMERA_MOD_LOOK_TOWARD:
 			doModCameraLookToward(pAction->getParameter(0)->getString());
 			return;
-		case ScriptAction::CAMERA_MOD_FINAL_LOOK_TOWARD: 
+		case ScriptAction::CAMERA_MOD_FINAL_LOOK_TOWARD:
 			doModCameraFinalLookToward(pAction->getParameter(0)->getString());
 			return;
-		case ScriptAction::MOVE_CAMERA_ALONG_WAYPOINT_PATH: 
+		case ScriptAction::MOVE_CAMERA_ALONG_WAYPOINT_PATH:
 			doMoveCameraAlongWaypointPath(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal(), pAction->getParameter(3)->getReal(), pAction->getParameter(4)->getReal());
 			return;
-		case ScriptAction::ROTATE_CAMERA: 
+		case ScriptAction::ROTATE_CAMERA:
 			doRotateCamera(pAction->getParameter(0)->getReal(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal(), pAction->getParameter(3)->getReal());
 			return;
 		case ScriptAction::CAMERA_LOOK_TOWARD_OBJECT:
@@ -6523,40 +6656,40 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::CAMERA_LOOK_TOWARD_WAYPOINT:
 			doRotateCameraTowardWaypoint(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal(), pAction->getParameter(3)->getReal(), pAction->getParameter(4)->getInt());
 			return;
-		case ScriptAction::RESET_CAMERA: 
+		case ScriptAction::RESET_CAMERA:
 			doResetCamera(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal(), pAction->getParameter(3)->getReal());
 			return;
-		case ScriptAction::MOVE_CAMERA_TO_SELECTION: 
+		case ScriptAction::MOVE_CAMERA_TO_SELECTION:
 			doModCameraMoveToSelection();
 			return;
-		case ScriptAction::CAMERA_MOD_FREEZE_TIME: 
+		case ScriptAction::CAMERA_MOD_FREEZE_TIME:
 			TheTacticalView->cameraModFreezeTime();
 			return;
-		case ScriptAction::CAMERA_MOD_FREEZE_ANGLE: 
+		case ScriptAction::CAMERA_MOD_FREEZE_ANGLE:
 			TheTacticalView->cameraModFreezeAngle();
 			return;
-		case ScriptAction::CAMERA_MOD_SET_FINAL_ZOOM: 
+		case ScriptAction::CAMERA_MOD_SET_FINAL_ZOOM:
 			TheTacticalView->cameraModFinalZoom(pAction->getParameter(0)->getReal(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal());
 			return;
-		case ScriptAction::CAMERA_MOD_SET_FINAL_PITCH: 
+		case ScriptAction::CAMERA_MOD_SET_FINAL_PITCH:
 			TheTacticalView->cameraModFinalPitch(pAction->getParameter(0)->getReal(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal());
 			return;
-		case ScriptAction::CAMERA_MOD_SET_FINAL_SPEED_MULTIPLIER: 
+		case ScriptAction::CAMERA_MOD_SET_FINAL_SPEED_MULTIPLIER:
 			TheTacticalView->cameraModFinalTimeMultiplier(pAction->getParameter(0)->getInt());
 			return;
-		case ScriptAction::CAMERA_MOD_SET_ROLLING_AVERAGE: 
+		case ScriptAction::CAMERA_MOD_SET_ROLLING_AVERAGE:
 			TheTacticalView->cameraModRollingAverage(pAction->getParameter(0)->getInt());
 			return;
-		case ScriptAction::SET_VISUAL_SPEED_MULTIPLIER: 
+		case ScriptAction::SET_VISUAL_SPEED_MULTIPLIER:
 			TheTacticalView->setTimeMultiplier(pAction->getParameter(0)->getInt());
 			return;
 		case ScriptAction::SUSPEND_BACKGROUND_SOUNDS:
 			TheAudio->pauseAudio(AudioAffect_Sound);
 			return;
-		case ScriptAction::RESUME_BACKGROUND_SOUNDS: 
+		case ScriptAction::RESUME_BACKGROUND_SOUNDS:
 			TheAudio->resumeAudio(AudioAffect_Sound);
 			return;
-		case ScriptAction::PLAY_SOUND_EFFECT_AT: 
+		case ScriptAction::PLAY_SOUND_EFFECT_AT:
 			doPlaySoundEffectAt(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString());
 			return;
 		case ScriptAction::SET_INFANTRY_LIGHTING_OVERRIDE:
@@ -6757,7 +6890,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 			{
 				const char* MSG = "Your Script requested the following message be displayed:\n\n";
 				const char* MSG2 = "\n\nTHIS IS NOT A BUG. DO NOT REPORT IT.";
-				DEBUG_CRASH(("%s%s%s\n",MSG,pAction->getParameter(0)->getString().str(),MSG2));
+				DEBUG_CRASH(("%s%s%s",MSG,pAction->getParameter(0)->getString().str(),MSG2));
 			}
 #endif
 			return;
@@ -6970,11 +7103,11 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 			doCameraMotionBlurJump(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getInt());
 			return;
 		case ScriptAction::CAMERA_MOTION_BLUR_FOLLOW:
-			TheTacticalView->setViewFilterMode((enum FilterModes)(FM_VIEW_MB_PAN_ALPHA+pAction->getParameter(0)->getInt())); 						 
+			TheTacticalView->setViewFilterMode((FilterModes)(FM_VIEW_MB_PAN_ALPHA+pAction->getParameter(0)->getInt()));
 			TheTacticalView->setViewFilter(FT_VIEW_MOTION_BLUR_FILTER);
 			return;
 		case ScriptAction::CAMERA_MOTION_BLUR_END_FOLLOW:
-			TheTacticalView->setViewFilterMode(FM_VIEW_MB_END_PAN_ALPHA); 						 
+			TheTacticalView->setViewFilterMode(FM_VIEW_MB_END_PAN_ALPHA);
 			TheTacticalView->setViewFilter(FT_VIEW_MOTION_BLUR_FILTER);
 			return;
 		case ScriptAction::FREEZE_TIME:
@@ -6995,16 +7128,16 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::SET_FPS_LIMIT:
 			if (!pAction->getParameter(0)->getInt())
 			{
-				TheGameEngine->setFramesPerSecondLimit(TheGlobalData->m_framesPerSecondLimit);
+				TheFramePacer->setFramesPerSecondLimit(TheGlobalData->m_framesPerSecondLimit);
 			}
 			else
 			{
-				TheGameEngine->setFramesPerSecondLimit(pAction->getParameter(0)->getInt());
+				TheFramePacer->setFramesPerSecondLimit(pAction->getParameter(0)->getInt());
 			}
 			// Setting the fps limit doesn't do much good if we don't use it.  jba.
-			TheWritableGlobalData->m_useFpsLimit = true; 
+			TheWritableGlobalData->m_useFpsLimit = true;
 			return;
-			
+
 		case ScriptAction::DISABLE_SPECIAL_POWER_DISPLAY:
 			doDisableSpecialPowerDisplay();
 			return;
@@ -7106,7 +7239,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::REFRESH_RADAR:
 			doRadarRefresh();
 			return;
-		
+
 		case ScriptAction::NAMED_STOP:
 			doNamedStop(pAction->getParameter(0)->getString());
 			return;
@@ -7119,22 +7252,22 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 			doTeamStop(pAction->getParameter(0)->getString(), TRUE);
 			return;
 
-		case ScriptAction::CAMERA_TETHER_NAMED: 
+		case ScriptAction::CAMERA_TETHER_NAMED:
 			doCameraTetherNamed(pAction->getParameter(0)->getString(), (Bool)(pAction->getParameter(1)->getInt()), pAction->getParameter(2)->getReal());
 			return;
 
-		case ScriptAction::CAMERA_STOP_TETHER_NAMED: 
+		case ScriptAction::CAMERA_STOP_TETHER_NAMED:
 			doCameraStopTetherNamed();
 			return;
 
-		case ScriptAction::CAMERA_SET_DEFAULT: 
+		case ScriptAction::CAMERA_SET_DEFAULT:
 			doCameraSetDefault(pAction->getParameter(0)->getReal(), pAction->getParameter(1)->getReal(), pAction->getParameter(2)->getReal());
 			return;
 
 		case ScriptAction::TEAM_SET_OVERRIDE_RELATION_TO_TEAM:
 			doTeamSetOverrideRelationToTeam(pAction->getParameter(0)->getString(),		// first team
 									pAction->getParameter(1)->getString(),		// second team
-									pAction->getParameter(2)->getInt());				// relation (ENEMIES, etc) 
+									pAction->getParameter(2)->getInt());				// relation (ENEMIES, etc)
 			return;
 
 		case ScriptAction::TEAM_REMOVE_OVERRIDE_RELATION_TO_TEAM:
@@ -7149,7 +7282,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::TEAM_SET_OVERRIDE_RELATION_TO_PLAYER:
 			doTeamSetOverrideRelationToPlayer(pAction->getParameter(0)->getString(),		// first team
 									pAction->getParameter(1)->getString(),			// second player
-									pAction->getParameter(2)->getInt());				// relation (ENEMIES, etc) 
+									pAction->getParameter(2)->getInt());				// relation (ENEMIES, etc)
 			return;
 
 		case ScriptAction::TEAM_REMOVE_OVERRIDE_RELATION_TO_PLAYER:
@@ -7160,7 +7293,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::PLAYER_SET_OVERRIDE_RELATION_TO_TEAM:
 			doPlayerSetOverrideRelationToTeam(pAction->getParameter(0)->getString(),		// first player
 									pAction->getParameter(1)->getString(),		// second team
-									pAction->getParameter(2)->getInt());				// relation (ENEMIES, etc) 
+									pAction->getParameter(2)->getInt());				// relation (ENEMIES, etc)
 			return;
 
 		case ScriptAction::PLAYER_REMOVE_OVERRIDE_RELATION_TO_TEAM:
@@ -7183,11 +7316,11 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::NAMED_USE_COMMANDBUTTON_ABILITY_AT_WAYPOINT:
 			doNamedUseCommandButtonAbilityAtWaypoint( pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), pAction->getParameter(2)->getString() );
 			return;
-		
+
 		case ScriptAction::NAMED_USE_COMMANDBUTTON_ABILITY_USING_WAYPOINT_PATH:
 			doNamedUseCommandButtonAbilityUsingWaypointPath( pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), pAction->getParameter(2)->getString() );
 			return;
-		
+
 		case ScriptAction::TEAM_USE_COMMANDBUTTON_ABILITY:
 			doTeamUseCommandButtonAbility( pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString() );
 			return;
@@ -7199,7 +7332,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::TEAM_USE_COMMANDBUTTON_ABILITY_AT_WAYPOINT:
 			doTeamUseCommandButtonAbilityAtWaypoint( pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), pAction->getParameter(2)->getString() );
 			return;
-		
+
 		case ScriptAction::UNIT_EXECUTE_SEQUENTIAL_SCRIPT:
 			doUnitStartSequentialScript(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), 0);
 			return;
@@ -7231,11 +7364,11 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::UNIT_IDLE_FOR_FRAMECOUNT:
 			doUnitIdleForFramecount(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getInt());
 			return;
-		
+
 		case ScriptAction::TEAM_GUARD_FOR_FRAMECOUNT:
 			doTeamIdleForFramecount(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getInt());
 			return;
-		
+
 		case ScriptAction::TEAM_IDLE_FOR_FRAMECOUNT:
 			doTeamIdleForFramecount(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getInt());
 			return;
@@ -7252,7 +7385,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::MAP_SWITCH_BORDER:
 			doBorderSwitch(pAction->getParameter(0)->getInt());
 			return;
-			
+
 		case ScriptAction::OBJECT_FORCE_SELECT:
 			doForceObjectSelection(pAction->getParameter(0)->getString(),
 														 pAction->getParameter(1)->getString(),
@@ -7299,7 +7432,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::SOUND_ENABLE_ALL:
 			doSoundEnableType(AsciiString::TheEmptyString, true);
 			return;
-			
+
 		case ScriptAction::SOUND_REMOVE_ALL_DISABLED:
 			doSoundRemoveAllDisabled();
 			return;
@@ -7497,7 +7630,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::TEAM_FACE_WAYPOINT:
 			doTeamFaceWaypoint( pAction->getParameter( 0 )->getString(), pAction->getParameter( 1 )->getString() );
 			return;
-			
+
 		case ScriptAction::UNIT_AFFECT_OBJECT_PANEL_FLAGS:
 			doAffectObjectPanelFlagsUnit(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), pAction->getParameter(2)->getInt());
 			return;
@@ -7525,7 +7658,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 			doCreateObject( pAction->getParameter(0)->getString(), pAction->getParameter(1)->getString(), pAction->getParameter(2)->getString(), &pos, pAction->getParameter(4)->getReal() );
 			return;
 		}
-		
+
 		case ScriptAction::PLAYER_AFFECT_RECEIVING_EXPERIENCE:
 			doAffectSkillPointsModifier(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getReal());
 			return;
@@ -7541,7 +7674,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 		case ScriptAction::TEAM_GUARD_IN_TUNNEL_NETWORK:
 			doTeamGuardInTunnelNetwork(pAction->getParameter(0)->getString());
 			return;
-			
+
 		case ScriptAction::RESIZE_VIEW_GUARDBAND:
 			doResizeViewGuardband( pAction->getParameter(0)->getReal(), pAction->getParameter(1)->getReal() );
 			return;
@@ -7564,7 +7697,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
 
 		case ScriptAction::DISABLE_OBJECT_SOUND:
 			doEnableObjectSound(pAction->getParameter(0)->getString(), false);
-			return;			
+			return;
 
-	}  
+	}
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp
index 3e81e83fe2c..23020d21599 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptConditions.cpp
@@ -27,7 +27,7 @@
 // Author: John Ahlquist, Nov. 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/MapObject.h"
@@ -37,7 +37,6 @@
 #include "Common/ThingTemplate.h"
 #include "Common/ThingFactory.h"
 #include "Common/Team.h"
-#include "Common/Player.h"
 #include "Common/ObjectStatusTypes.h"
 
 #include "GameClient/ControlBar.h"
@@ -61,11 +60,6 @@
 #include "GameLogic/Scripts.h"
 #include "GameLogic/VictoryConditions.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 class ObjectTypesTemp
 {
@@ -79,15 +73,14 @@ class ObjectTypesTemp
 
 	~ObjectTypesTemp()
 	{
-		if (m_types)
-			deleteInstance(m_types);
+		deleteInstance(m_types);
 	}
 };
 
 // STATICS ////////////////////////////////////////////////////////////////////////////////////////
 namespace rts
 {
-	template<typename T> 
+	template<typename T>
 		T sum(std::vector<T>& vecOfValues )
 	{
 		T retVal = 0;
@@ -104,7 +97,7 @@ ScriptConditionsInterface *TheScriptConditions = NULL;
 
 class TransportStatus : public MemoryPoolObject
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TransportStatus, "TransportStatus")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(TransportStatus, "TransportStatus")
 public:
 	TransportStatus *	m_nextStatus;
 	ObjectID					m_objID;
@@ -117,10 +110,9 @@ class TransportStatus : public MemoryPoolObject
 };
 
 //-------------------------------------------------------------------------------------------------
-TransportStatus::~TransportStatus() 
-{ 
-	if (m_nextStatus) 
-		deleteInstance(m_nextStatus); 
+TransportStatus::~TransportStatus()
+{
+	deleteInstance(m_nextStatus);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -131,14 +123,14 @@ static TransportStatus *s_transportStatuses;
 ScriptConditions::ScriptConditions()
 {
 
-}  // end ScriptConditions
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 ScriptConditions::~ScriptConditions()
 {
 	reset(); // just in case.
-}  // end ~ScriptConditions
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Init */
@@ -148,7 +140,7 @@ void ScriptConditions::init( void )
 
 	reset();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -159,7 +151,7 @@ void ScriptConditions::reset( void )
 	deleteInstance(s_transportStatuses);
 	s_transportStatuses = NULL;
 	// Empty for now.  jba.
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -168,7 +160,7 @@ void ScriptConditions::update( void )
 {
 
 	// Empty for now. jba
-}  // end update
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -232,7 +224,7 @@ Bool ScriptConditions::evaluateAllDestroyed(Parameter *pSideParm )
 		return (!pPlayer->hasAnyObjects());
 	}
 	return true; // Non existent player is all destroyed. :)
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateAllBuildFacilitiesDestroyed */
@@ -244,7 +236,7 @@ Bool ScriptConditions::evaluateAllBuildFacilitiesDestroyed(Parameter *pSideParm
 		return (!pPlayer->hasAnyBuildFacility());
 	}
 	return true; // Non existent player is all destroyed. :)
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateIsDestroyed */
@@ -257,8 +249,8 @@ Bool ScriptConditions::evaluateIsDestroyed(Parameter *pTeamParm)
 	if (theTeam) {
 		return (!theTeam->hasAnyObjects());
 	}
-	return false; // Non existent team is not destroyed. 
-}  
+	return false; // Non existent team is not destroyed.
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateBridgeBroken */
@@ -274,7 +266,7 @@ Bool ScriptConditions::evaluateBridgeBroken(Parameter *pBridgeParm)
 		return (TheTerrainLogic->isBridgeBroken(theBridge));
 	}
 	return false;
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateBridgeRepaired */
@@ -290,7 +282,7 @@ Bool ScriptConditions::evaluateBridgeRepaired(Parameter *pBridgeParm)
 		return (TheTerrainLogic->isBridgeRepaired(theBridge));
 	}
 	return false;
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateNamedUnitDestroyed */
@@ -298,7 +290,7 @@ Bool ScriptConditions::evaluateBridgeRepaired(Parameter *pBridgeParm)
 Bool ScriptConditions::evaluateNamedUnitDestroyed(Parameter *pUnitParm)
 {
 	Object *theUnit = TheScriptEngine->getUnitNamed( pUnitParm->getString() );
-	if (theUnit) 
+	if (theUnit)
 	{
 		return theUnit->isEffectivelyDead();
 	}
@@ -306,7 +298,7 @@ Bool ScriptConditions::evaluateNamedUnitDestroyed(Parameter *pUnitParm)
 	if (TheScriptEngine->didUnitExist(pUnitParm->getString())) {
 		return true;
 	}
-	return false; // Non existent unit is not destroyed. 
+	return false; // Non existent unit is not destroyed.
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -315,12 +307,12 @@ Bool ScriptConditions::evaluateNamedUnitDestroyed(Parameter *pUnitParm)
 Bool ScriptConditions::evaluateNamedUnitExists(Parameter *pUnitParm)
 {
 	Object *theUnit = TheScriptEngine->getUnitNamed( pUnitParm->getString() );
-	if (theUnit) 
+	if (theUnit)
 	{
 		return !theUnit->isEffectivelyDead();
 	}
 
-	return false; // Doesn't exist. 
+	return false; // Doesn't exist.
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -329,16 +321,16 @@ Bool ScriptConditions::evaluateNamedUnitExists(Parameter *pUnitParm)
 Bool ScriptConditions::evaluateNamedUnitDying(Parameter *pUnitParm)
 {
 	Object *theUnit = TheScriptEngine->getUnitNamed( pUnitParm->getString() );
-	if (theUnit) 
+	if (theUnit)
 	{
 		return theUnit->isEffectivelyDead();
 	}
 
-	if (TheScriptEngine->didUnitExist(pUnitParm->getString())) 
+	if (TheScriptEngine->didUnitExist(pUnitParm->getString()))
 	{
 		return false; // already totally killed
 	}
-	return false; // Non existent unit is not dying. 
+	return false; // Non existent unit is not dying.
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -355,7 +347,7 @@ Bool ScriptConditions::evaluateNamedUnitTotallyDead(Parameter *pUnitParm)
 		// Did exist, now it doesnt.  So it is really, really dead.
 		return true; // totally killed
 	}
-	return false; // Non existent unit is not dead. 
+	return false; // Non existent unit is not dead.
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -372,7 +364,7 @@ Bool ScriptConditions::evaluateHasUnits(Parameter *pTeamParm)
 		if (theTeam) {
 			return (theTeam->hasAnyUnits());
 		}
-		return false; // Non existent team has no units. 
+		return false; // Non existent team has no units.
 	}
 	Team *thisTeam = TheScriptEngine->getTeamNamed(THIS_TEAM);
 	if (thisTeam && thisTeam->getName()==desiredTeamName)	{
@@ -385,7 +377,7 @@ Bool ScriptConditions::evaluateHasUnits(Parameter *pTeamParm)
 	pProto = TheTeamFactory->findTeamPrototype(desiredTeamName);
 
 	if (pProto) {
-		// We have a team referred to in the conditions.  Iterate over the instances of the team, 
+		// We have a team referred to in the conditions.  Iterate over the instances of the team,
 		// applying the script conditions (and possibly actions) to each instance of the team.
 		for (DLINK_ITERATOR<Team> iter = pProto->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			if (iter.cur()->hasAnyUnits()) {
@@ -393,8 +385,8 @@ Bool ScriptConditions::evaluateHasUnits(Parameter *pTeamParm)
 			}
 		}
 	}
-	return false; // Non existent team has no units. 
-}  
+	return false; // Non existent team has no units.
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateUnitsEntered */
@@ -406,14 +398,14 @@ Bool ScriptConditions::evaluateTeamInsideAreaPartially(Parameter *pTeamParm, Par
 	// is being considered for the condition.  jba. :)
 	AsciiString triggerName = pTriggerAreaParm->getString();
 	PolygonTrigger *pTrig = TheScriptEngine->getQualifiedTriggerAreaByName(pTriggerAreaParm->getString());
-	
+
 	if (pTrig == NULL) return false;
 	if (theTeam) {
 		return (theTeam->someInsideSomeOutside(pTrig, (UnsignedInt) pTypeParm->getInt()) ||
 						theTeam->allInside(pTrig, (UnsignedInt) pTypeParm->getInt()));
 	}
 	return false; // Non existent team isn't in trigger area. :)
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateNamedInsideArea */
@@ -436,7 +428,7 @@ Bool ScriptConditions::evaluateNamedInsideArea(Parameter *pUnitParm, Parameter *
 		return pTrig->pointInTrigger(iCoord);
 	}
 	return false; // Non existent team isn't in trigger area. :)
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluatePlayerHasUnitTypeInArea */
@@ -466,7 +458,7 @@ Bool ScriptConditions::evaluatePlayerHasUnitTypeInArea(Condition *pCondition, Pa
 				continue;
 			}
 			if (team->didEnterOrExit()) {
-				anyChanges = true; 
+				anyChanges = true;
 			}
 		}
 	}
@@ -512,13 +504,13 @@ Bool ScriptConditions::evaluatePlayerHasUnitTypeInArea(Condition *pCondition, Pa
 			}
 		}
 	}
-	
+
 	Bool comparison = false;
 	switch (pComparisonParm->getInt())
 	{
 		case Parameter::LESS_THAN :			comparison = (count < pCountParm->getInt()); break;
 		case Parameter::LESS_EQUAL :		comparison = (count <= pCountParm->getInt()); break;
-		case Parameter::EQUAL :					comparison = (count == pCountParm->getInt()); break; 
+		case Parameter::EQUAL :					comparison = (count == pCountParm->getInt()); break;
 		case Parameter::GREATER_EQUAL :	comparison = (count >= pCountParm->getInt()); break;
 		case Parameter::GREATER :				comparison = (count > pCountParm->getInt()); break;
 		case Parameter::NOT_EQUAL :			comparison = (count != pCountParm->getInt()); break;
@@ -529,7 +521,7 @@ Bool ScriptConditions::evaluatePlayerHasUnitTypeInArea(Condition *pCondition, Pa
 	}
 	pCondition->setCustomFrame(TheScriptEngine->getFrameObjectCountChanged());
 	return comparison;
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluatePlayerHasUnitKindInArea */
@@ -541,7 +533,7 @@ Bool ScriptConditions::evaluatePlayerHasUnitKindInArea(Condition *pCondition, Pa
 	if (pTrig == NULL) return false;
 
 	KindOfType kind = (KindOfType)pKindParm->getInt();
-	
+
 	Player* pPlayer = playerFromParam(pPlayerParm);
 	if (!pPlayer) {
 		return false;
@@ -561,7 +553,7 @@ Bool ScriptConditions::evaluatePlayerHasUnitKindInArea(Condition *pCondition, Pa
 				continue;
 			}
 			if (team->didEnterOrExit()) {
-				anyChanges = true; 
+				anyChanges = true;
 			}
 		}
 	}
@@ -597,20 +589,20 @@ Bool ScriptConditions::evaluatePlayerHasUnitKindInArea(Condition *pCondition, Pa
 			}
 		}
 	}
-	
+
 	Bool comparison = false;
 	switch (pComparisonParm->getInt())
 	{
 		case Parameter::LESS_THAN :			comparison = (count < pCountParm->getInt()); break;
 		case Parameter::LESS_EQUAL :		comparison = (count <= pCountParm->getInt()); break;
-		case Parameter::EQUAL :					comparison = (count == pCountParm->getInt()); break; 
+		case Parameter::EQUAL :					comparison = (count == pCountParm->getInt()); break;
 		case Parameter::GREATER_EQUAL :	comparison = (count >= pCountParm->getInt()); break;
 		case Parameter::GREATER :				comparison = (count > pCountParm->getInt()); break;
 		case Parameter::NOT_EQUAL :			comparison = (count != pCountParm->getInt()); break;
 	}
 	pCondition->setCustomData(TheScriptEngine->getFrameObjectCountChanged());
 	return comparison;
-}  
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateTeamStateIs */
@@ -624,8 +616,8 @@ Bool ScriptConditions::evaluateTeamStateIs(Parameter *pTeamParm, Parameter *pSta
 	if (theTeam) {
 		return (theTeam->getState() == stateName);
 	}
-	return false; // Non existent team isn't in any state. 
-}  
+	return false; // Non existent team isn't in any state.
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -640,8 +632,8 @@ Bool ScriptConditions::evaluateTeamStateIsNot(Parameter *pTeamParm, Parameter *p
 	if (theTeam) {
 		return (!(theTeam->getState() == stateName));
 	}
-	return false; // Non existent team isn't in any state. 
-}  
+	return false; // Non existent team isn't in any state.
+}
 
 //-------------------------------------------------------------------------------------------------
 /** evaluateNamedOutsideArea */
@@ -653,7 +645,7 @@ Bool ScriptConditions::evaluateNamedOutsideArea(Parameter *pUnitParm, Parameter
 }
 
 //-------------------------------------------------------------------------------------------------
-/** evaluateTeamInsideAreaEntirely */ 
+/** evaluateTeamInsideAreaEntirely */
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateTeamInsideAreaEntirely(Parameter *pTeamParm, Parameter *pTriggerParm, Parameter *pTypeParm)
 {// This is actually TeamInside(...)
@@ -662,8 +654,8 @@ Bool ScriptConditions::evaluateTeamInsideAreaEntirely(Parameter *pTeamParm, Para
 	// is being considered for the condition.  jba. :)
 	AsciiString triggerName = pTriggerParm->getString();
 	PolygonTrigger *pTrig = TheScriptEngine->getQualifiedTriggerAreaByName(pTriggerParm->getString());
-	
-	if (pTrig == NULL) 
+
+	if (pTrig == NULL)
 		return false;
 
 	if (theTeam) {
@@ -695,13 +687,13 @@ Bool ScriptConditions::evaluateNamedAttackedByType(Parameter *pUnitParm, Paramet
 	if (!theBodyModule) {
 		return false;
 	}
-	
+
 	const DamageInfo* lastDamageInfo = theBodyModule->getLastDamageInfo();
-	
+
 	if (!lastDamageInfo) {
 		return false;
 	}
-	
+
 	const ThingTemplate *attackerTemplate = lastDamageInfo->in.m_sourceTemplate;
 	if( attackerTemplate )
 	{
@@ -718,7 +710,7 @@ Bool ScriptConditions::evaluateNamedAttackedByType(Parameter *pUnitParm, Paramet
 		//Old system... just incase m_sourceTemplate doesn't get set, don't want to foobar the logic.
 		ObjectID id = lastDamageInfo->in.m_sourceID;
 		Object* pAttacker = TheGameLogic->findObjectByID(id);
-		if (!pAttacker || !pAttacker->getTemplate()) 
+		if (!pAttacker || !pAttacker->getTemplate())
 		{
 			return FALSE;
 		}
@@ -751,14 +743,14 @@ Bool ScriptConditions::evaluateTeamAttackedByType(Parameter *pTeamParm, Paramete
 		if (!pCur) {
 			continue;
 		}
-		
+
 		BodyModuleInterface* theBodyModule = pCur->getBodyModule();
 		if (!theBodyModule) {
 			continue;
 		}
-		
+
 		const DamageInfo* lastDamageInfo = theBodyModule->getLastDamageInfo();
-		
+
 		if (!lastDamageInfo) {
 			continue;
 		}
@@ -780,7 +772,7 @@ Bool ScriptConditions::evaluateTeamAttackedByType(Parameter *pTeamParm, Paramete
 			//Old system... just incase m_sourceTemplate doesn't get set, don't want to foobar the logic.
 			ObjectID id = lastDamageInfo->in.m_sourceID;
 			Object* pAttacker = TheGameLogic->findObjectByID(id);
-			if (!pAttacker || !pAttacker->getTemplate()) 
+			if (!pAttacker || !pAttacker->getTemplate())
 			{
 				//Kris: Woah... do not return false here... because we need to iterate other team members!
 				//return FALSE;
@@ -791,7 +783,7 @@ Bool ScriptConditions::evaluateTeamAttackedByType(Parameter *pTeamParm, Paramete
 				return TRUE;
 			}
 		}
-		
+
 	}
 
 	return FALSE;
@@ -811,13 +803,13 @@ Bool ScriptConditions::evaluateNamedAttackedByPlayer(Parameter *pUnitParm, Param
 	if (!theBodyModule) {
 		return false;
 	}
-	
+
 	const DamageInfo* lastDamageInfo = theBodyModule->getLastDamageInfo();
-	
+
 	if (!lastDamageInfo) {
 		return false;
 	}
-	
+
 	ObjectID id = lastDamageInfo->in.m_sourceID;
 	Object* pAttacker = TheGameLogic->findObjectByID(id);
 	Player *pPlayer = NULL;
@@ -827,7 +819,7 @@ Bool ScriptConditions::evaluateNamedAttackedByPlayer(Parameter *pUnitParm, Param
 	if (pPlayer || pAttacker) {
 		Player *victimPlayer = playerFromParam(pPlayerParm);
 		if (pPlayer == victimPlayer) {
-			return true;	
+			return true;
 		}
 		if (!pAttacker) return false; // wasn't attacked.
 		return (pAttacker->getControllingPlayer() == victimPlayer);
@@ -854,19 +846,19 @@ Bool ScriptConditions::evaluateTeamAttackedByPlayer(Parameter *pTeamParm, Parame
 		if (!theBodyModule) {
 			continue;
 		}
-		
+
 		const DamageInfo* lastDamageInfo = theBodyModule->getLastDamageInfo();
-		
+
 		if (!lastDamageInfo) {
 			continue;
 		}
-		
+
 		ObjectID id = lastDamageInfo->in.m_sourceID;
 		Object* pAttacker = TheGameLogic->findObjectByID(id);
 		if (!pAttacker) {
 			continue;
 		}
-		
+
 		if (pAttacker->getControllingPlayer() == playerFromParam(pPlayerParm)) {
 			return true;
 		}
@@ -959,9 +951,9 @@ Bool ScriptConditions::evaluateUnitHealth(Parameter *pUnitParm, Parameter* pComp
 
 	switch (pComparisonParm->getInt())
 	{
-		case Parameter::LESS_THAN :			return (curPercent < pHealthPercent->getInt()); 
+		case Parameter::LESS_THAN :			return (curPercent < pHealthPercent->getInt());
 		case Parameter::LESS_EQUAL :		return (curPercent <= pHealthPercent->getInt());
-		case Parameter::EQUAL :					return (curPercent == pHealthPercent->getInt()); 
+		case Parameter::EQUAL :					return (curPercent == pHealthPercent->getInt());
 		case Parameter::GREATER_EQUAL :	return (curPercent >= pHealthPercent->getInt());
 		case Parameter::GREATER :				return (curPercent > pHealthPercent->getInt());
 		case Parameter::NOT_EQUAL :			return (curPercent != pHealthPercent->getInt());
@@ -979,7 +971,7 @@ Bool ScriptConditions::evaluatePlayerHasCredits(Parameter *pCreditsParm, Paramet
 	if (!pPlayer) {
 		return false;
 	}
-	
+
 	if (pPlayer && pPlayer->getMoney()) {
 		switch (pComparisonParm->getInt())
 		{
@@ -1036,7 +1028,7 @@ Bool ScriptConditions::evaluateIsBuildingEmpty( Parameter *pItemParm )
 	if (!theBuilding) {
 		return false;
 	}
-	
+
 	ContainModuleInterface* contain = theBuilding->getContain();
 	if (!contain) {
 		return false;
@@ -1075,6 +1067,10 @@ Bool ScriptConditions::evaluateEnemySighted(Parameter *pItemParm, Parameter *pAl
 		case Parameter::REL_ENEMY:
 			relationDescriber = PartitionFilterRelationship::ALLOW_ENEMIES;
 			break;
+		default:
+			DEBUG_CRASH(("Unhandled case in ScriptConditions::evaluateEnemySighted()"));
+			relationDescriber = 0;
+			break;
 	}
 	PartitionFilterRelationship	filterTeam(theObj, relationDescriber);
 
@@ -1082,9 +1078,9 @@ Bool ScriptConditions::evaluateEnemySighted(Parameter *pItemParm, Parameter *pAl
 	PartitionFilterAlive filterAlive;
 
 	// and only nonstealthed items.
-	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ), 
+	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ),
 																										 MAKE_OBJECT_STATUS_MASK2( OBJECT_STATUS_DETECTED, OBJECT_STATUS_DISGUISED ) );
-	
+
 	// and only on-map (or not)
 	PartitionFilterSameMapStatus filterMapStatus(theObj);
 
@@ -1093,7 +1089,7 @@ Bool ScriptConditions::evaluateEnemySighted(Parameter *pItemParm, Parameter *pAl
 	Real visionRange = theObj->getVisionRange();
 
 	SimpleObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(
-								theObj, visionRange, FROM_CENTER_2D, filters); 
+								theObj, visionRange, FROM_CENTER_2D, filters);
 	MemoryPoolObjectHolder hold(iter);
 	for (Object *them = iter->first(); them; them = iter->next())
 	{
@@ -1127,7 +1123,7 @@ Bool ScriptConditions::evaluateTypeSighted(Parameter *pItemParm, Parameter *pTyp
 	PartitionFilterAlive filterAlive;
 
 	// and only nonstealthed items.
-	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ), 
+	PartitionFilterRejectByObjectStatus filterStealth( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_STEALTHED ),
 																										 MAKE_OBJECT_STATUS_MASK2( OBJECT_STATUS_DETECTED, OBJECT_STATUS_DISGUISED ) );
 
 	// and only on-map (or not)
@@ -1138,7 +1134,7 @@ Bool ScriptConditions::evaluateTypeSighted(Parameter *pItemParm, Parameter *pTyp
 	Real visionRange = theObj->getVisionRange();
 
 	SimpleObjectIterator *iter = ThePartitionManager->iterateObjectsInRange(
-								theObj, visionRange, FROM_CENTER_2D, filters); 
+								theObj, visionRange, FROM_CENTER_2D, filters);
 	MemoryPoolObjectHolder hold(iter);
 	for (Object *them = iter->first(); them; them = iter->next())
 	{
@@ -1164,17 +1160,17 @@ Bool ScriptConditions::evaluateNamedDiscovered(Parameter *pItemParm, Parameter*
 	if (!pPlayer) {
 		return false;
 	}
-	
+
 	// We are held, so we are not visible.
-	if( theObj->isDisabledByType( DISABLED_HELD ) ) 
+	if( theObj->isDisabledByType( DISABLED_HELD ) )
 	{
 		return false;
 	}
 
 	// If we are stealthed we are not visible.
-	if( theObj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) && 
+	if( theObj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) &&
 			!theObj->getStatusBits().test( OBJECT_STATUS_DETECTED ) &&
-			!theObj->getStatusBits().test( OBJECT_STATUS_DISGUISED ) ) 
+			!theObj->getStatusBits().test( OBJECT_STATUS_DISGUISED ) )
 	{
 		return false;
 	}
@@ -1186,7 +1182,7 @@ Bool ScriptConditions::evaluateNamedDiscovered(Parameter *pItemParm, Parameter*
 /** evaluateTeamDiscovered */
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateTeamDiscovered(Parameter *pTeamParm, Parameter *pPlayerParm)
-{	
+{
 	Team *theTeam = TheScriptEngine->getTeamNamed( pTeamParm->getString() );
 	if (!theTeam) {
 		return false;
@@ -1204,20 +1200,20 @@ Bool ScriptConditions::evaluateTeamDiscovered(Parameter *pTeamParm, Parameter *p
 		}
 
 		// We are held, so we are not visible.
-		if( pObj->isDisabledByType( DISABLED_HELD ) ) 
+		if( pObj->isDisabledByType( DISABLED_HELD ) )
 		{
 			continue;
 		}
-		
+
 		// If we are stealthed we are not visible.
-		if( pObj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) && 
+		if( pObj->getStatusBits().test( OBJECT_STATUS_STEALTHED ) &&
 				!pObj->getStatusBits().test( OBJECT_STATUS_DETECTED ) &&
 				!pObj->getStatusBits().test( OBJECT_STATUS_DISGUISED ) )
 		{
 			continue;
 		}
 		ObjectShroudStatus shroud = pObj->getShroudedStatus(pPlayer->getPlayerIndex());
-		
+
 		if (shroud == OBJECTSHROUD_CLEAR || shroud == OBJECTSHROUD_PARTIAL_CLEAR) {
 			return true;
 		}
@@ -1230,7 +1226,7 @@ Bool ScriptConditions::evaluateTeamDiscovered(Parameter *pTeamParm, Parameter *p
 /** evaluateMissionAttempts */
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateMissionAttempts(Parameter *pPlayerParm, Parameter *pComparisonParm, Parameter *pAttemptsParm)
-{	
+{
 //Player* pPlayer = playerFromParam(pPlayerParm);
 	return false;
 }
@@ -1250,7 +1246,7 @@ Bool ScriptConditions::evaluateNamedOwnedByPlayer(Parameter *pUnitParm, Paramete
 	if (!pObj) {
 		return false;
 	}
-	
+
 	return (pObj->getControllingPlayer() == pPlayer);
 }
 
@@ -1268,7 +1264,7 @@ Bool ScriptConditions::evaluateTeamOwnedByPlayer(Parameter *pTeamParm, Parameter
 	if (!pTeam) {
 		return false;
 	}
-	
+
 	return (pTeam->getControllingPlayer() == pPlayer);
 }
 
@@ -1311,7 +1307,7 @@ Bool ScriptConditions::evaluatePlayerHasPower(Parameter *pPlayerParm)
 	if (!pPlayer) {
 		return false;
 	}
-	
+
 	Energy* pPlayersEnergy = pPlayer->getEnergy();
 	if (!pPlayersEnergy) {
 		return false;
@@ -1328,9 +1324,9 @@ Bool ScriptConditions::evaluateNamedReachedWaypointsEnd(Parameter *pUnitParm, Pa
 	if (!theObj) {
 		return false;
 	}
-	
+
 	AIUpdateInterface *ai = theObj->getAIUpdateInterface();
-	if (!ai) 
+	if (!ai)
 		return false;
 
 	const Waypoint *targetWay = ai->getCompletedWaypoint();
@@ -1395,7 +1391,7 @@ Bool ScriptConditions::evaluateTeamReachedWaypointsEnd(Parameter *pTeamParm, Par
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateNamedSelected(Condition *pCondition, Parameter *pUnitParm)
 {
-	if (TheGameEngine->isMultiplayerSession()) 
+	if (TheGameEngine->isMultiplayerSession())
 	{
 		return false;
 	}
@@ -1422,7 +1418,7 @@ Bool ScriptConditions::evaluateNamedSelected(Condition *pCondition, Parameter *p
 	{
 		draw = *it;
 
-		if (draw->getObject()->getName() == (pUnitParm->getString())) { 
+		if (draw->getObject()->getName() == (pUnitParm->getString())) {
 			isSelected = true;
 			break;
 		}
@@ -1651,7 +1647,7 @@ Bool ScriptConditions::evaluateNamedEnteredArea(Parameter *pUnitParm, Parameter
 	if (!pTrig) {
 		return false;
 	}
-	
+
 	return (pUnit->didEnter(pTrig));
 }
 
@@ -1670,7 +1666,7 @@ Bool ScriptConditions::evaluateNamedExitedArea(Parameter *pUnitParm, Parameter *
 	if (!pTrig) {
 		return false;
 	}
-	
+
 	return (pUnit->didExit(pTrig));
 }
 
@@ -1689,7 +1685,7 @@ Bool ScriptConditions::evaluateTeamEnteredAreaEntirely(Parameter *pTeamParm, Par
 	if (pTrig) {
 		return pTeam->didAllEnter(pTrig, (UnsignedInt)pTypeParm->getInt());
 	}
-	
+
 	return false;
 }
 
@@ -1708,7 +1704,7 @@ Bool ScriptConditions::evaluateTeamEnteredAreaPartially(Parameter *pTeamParm, Pa
 	if (pTrig) {
 		return pTeam->didPartialEnter(pTrig, (UnsignedInt)pTypeParm->getInt());
 	}
-	
+
 	return false;
 }
 
@@ -1727,7 +1723,7 @@ Bool ScriptConditions::evaluateTeamExitedAreaEntirely(Parameter *pTeamParm, Para
 	if (!pTrig) {
 		return false;
 	}
-	
+
 	return (pTeam->didAllExit(pTrig, (UnsignedInt)pTypeParm->getInt()));
 }
 
@@ -1746,7 +1742,7 @@ Bool ScriptConditions::evaluateTeamExitedAreaPartially(Parameter *pTeamParm, Par
 	if (!pTrig) {
 		return false;
 	}
-	
+
 	return (pTeam->didPartialExit(pTrig, (UnsignedInt)pTypeParm->getInt()));
 }
 
@@ -1778,18 +1774,18 @@ Bool ScriptConditions::evaluateMultiplayerPlayerDefeat(void)
 /** evaluatePlayerUnitCondition */
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluatePlayerUnitCondition(Condition *pCondition, Parameter *pPlayerParm, Parameter *pComparisonParm, Parameter *pCountParm, Parameter *pUnitTypeParm)
-{					
-	if (pCondition->getCustomData()!=0) 
+{
+	if (pCondition->getCustomData()!=0)
 	{
 		// We have a cached value.
-		if( TheScriptEngine->getFrameObjectCountChanged() == pCondition->getCustomFrame() ) 
+		if( TheScriptEngine->getFrameObjectCountChanged() == pCondition->getCustomFrame() )
 		{
 			// object count hasn't changed since we cached.  Use cached value.
-			if( pCondition->getCustomData() == 1 ) 
+			if( pCondition->getCustomData() == 1 )
 			{
 				return true;
 			}
-			if( pCondition->getCustomData() == -1 ) 
+			if( pCondition->getCustomData() == -1 )
 			{
 				return false;
 			}
@@ -1797,7 +1793,7 @@ Bool ScriptConditions::evaluatePlayerUnitCondition(Condition *pCondition, Parame
 	}
 
 	Player* pPlayer = playerFromParam(pPlayerParm);
-	if (!pPlayer) 
+	if (!pPlayer)
 	{
 		return false;
 	}
@@ -1811,39 +1807,39 @@ Bool ScriptConditions::evaluatePlayerUnitCondition(Condition *pCondition, Parame
 	Int numObjs = types.m_types->prepForPlayerCounting(templates, counts);
 	Int count = 0;
 
-	if (numObjs > 0) 
+	if (numObjs > 0)
 	{
 		pPlayer->countObjectsByThingTemplate(numObjs, &(*templates.begin()), false, &(*counts.begin()));
 		count = rts::sum(counts);
 	}
-	
+
 	Bool comparison = false;
 	switch (pComparisonParm->getInt())
 	{
-		case Parameter::LESS_THAN :			
-			comparison = (count < pCountParm->getInt()); 
+		case Parameter::LESS_THAN :
+			comparison = (count < pCountParm->getInt());
+			break;
+		case Parameter::LESS_EQUAL :
+			comparison = (count <= pCountParm->getInt());
 			break;
-		case Parameter::LESS_EQUAL :		
-			comparison = (count <= pCountParm->getInt()); 
+		case Parameter::EQUAL :
+			comparison = (count == pCountParm->getInt());
 			break;
-		case Parameter::EQUAL :					
-			comparison = (count == pCountParm->getInt()); 
-			break; 
-		case Parameter::GREATER_EQUAL :	
-			comparison = (count >= pCountParm->getInt()); 
+		case Parameter::GREATER_EQUAL :
+			comparison = (count >= pCountParm->getInt());
 			break;
-		case Parameter::GREATER :				
-			comparison = (count > pCountParm->getInt()); 
+		case Parameter::GREATER :
+			comparison = (count > pCountParm->getInt());
 			break;
-		case Parameter::NOT_EQUAL :			
-			comparison = (count != pCountParm->getInt()); 
+		case Parameter::NOT_EQUAL :
+			comparison = (count != pCountParm->getInt());
 			break;
 		default:
 			DEBUG_CRASH(("ScriptConditions::evaluatePlayerUnitCondition: Invalid comparison type. (jkmcd)"));
 			break;
 	}
 	pCondition->setCustomData(-1); // false.
-	if (comparison) 
+	if (comparison)
 	{
 		pCondition->setCustomData(1); // true.
 	}
@@ -1864,9 +1860,9 @@ Bool ScriptConditions::evaluatePlayerHasComparisonPercentPower(Parameter *pPlaye
 	Real testRatio = pPercentParm->getInt()/100.0f;
 	switch (pComparisonParm->getInt())
 	{
-		case Parameter::LESS_THAN :			return (powerRatio < testRatio); 
+		case Parameter::LESS_THAN :			return (powerRatio < testRatio);
 		case Parameter::LESS_EQUAL :		return (powerRatio <= testRatio);
-		case Parameter::EQUAL :					return (powerRatio == testRatio); 
+		case Parameter::EQUAL :					return (powerRatio == testRatio);
 		case Parameter::GREATER_EQUAL :	return (powerRatio >= testRatio);
 		case Parameter::GREATER :				return (powerRatio > testRatio);
 		case Parameter::NOT_EQUAL:			return (powerRatio != testRatio);
@@ -1886,9 +1882,9 @@ Bool ScriptConditions::evaluatePlayerHasComparisonValueExcessPower(Parameter *pP
 	Int actualKilowats = pPlayer->getEnergy()->getProduction() - pPlayer->getEnergy()->getConsumption();
 	switch (pComparisonParm->getInt())
 	{
-		case Parameter::LESS_THAN :			return (actualKilowats < desiredKilowattExcess); 
+		case Parameter::LESS_THAN :			return (actualKilowats < desiredKilowattExcess);
 		case Parameter::LESS_EQUAL :		return (actualKilowats <= desiredKilowattExcess);
-		case Parameter::EQUAL :					return (actualKilowats == desiredKilowattExcess); 
+		case Parameter::EQUAL :					return (actualKilowats == desiredKilowattExcess);
 		case Parameter::GREATER_EQUAL :	return (actualKilowats >= desiredKilowattExcess);
 		case Parameter::GREATER :				return (actualKilowats > desiredKilowattExcess);
 		case Parameter::NOT_EQUAL:			return (actualKilowats != desiredKilowattExcess);
@@ -1914,7 +1910,7 @@ Bool ScriptConditions::evaluateSkirmishSpecialPowerIsReady(Parameter *pSkirmishP
 	Bool found = false;
 	Player::PlayerTeamList::const_iterator it;
 	Player *pPlayer = playerFromParam(pSkirmishPlayerParm);
-	if (pPlayer==NULL) 
+	if (pPlayer==NULL)
 		return false;
 
 	for (it = pPlayer->getPlayerTeams()->begin(); it != pPlayer->getPlayerTeams()->end(); ++it) {
@@ -1989,7 +1985,7 @@ Bool ScriptConditions::evaluateUnitHasEmptied(Parameter *pUnitParm)
 	UnsignedInt frameNum = TheGameLogic->getFrame();
 
 
-	if (stats == NULL) 
+	if (stats == NULL)
 	{
 		TransportStatus *transportStatus = newInstance(TransportStatus);
 		transportStatus->m_objID = object->getID();
@@ -2028,7 +2024,7 @@ Bool ScriptConditions::evaluateTeamIsContained(Parameter *pTeamParm, Bool allCon
 		if (!obj) {
 			continue;
 		}
-		
+
 		Bool isContained = (obj->getContainedBy() != NULL);
 		if (!isContained) {
 			// we could still be exiting, in which case we should pretend like we are contained.
@@ -2087,10 +2083,10 @@ Bool ScriptConditions::evaluateTeamHasObjectStatus(Parameter *pTeamParm, Paramet
 		ObjectStatusMaskType objStatus = pObjectStatus->getStatus();
 		Bool currObjHasStatus = pObj->getStatusBits().testForAny( objStatus );
 
-		if( entireTeam && !currObjHasStatus ) 
+		if( entireTeam && !currObjHasStatus )
 		{
 			return false;
-		} 
+		}
 		else if( !entireTeam && currObjHasStatus )
 		{
 			return true;
@@ -2101,12 +2097,12 @@ Bool ScriptConditions::evaluateTeamHasObjectStatus(Parameter *pTeamParm, Paramet
 	if (entireTeam) {
 		return true;
 	}
-	
+
 	return false;
 }
 
 //-------------------------------------------------------------------------------------------------
-// @todo: PERF_EVALUATE Get a perf timer on this. Should we adjust this function so that it runs like 
+// @todo: PERF_EVALUATE Get a perf timer on this. Should we adjust this function so that it runs like
 // evaluatePlayerHasUnitKindInArea
 // ?
 Bool ScriptConditions::evaluateSkirmishValueInArea(Condition *pCondition, Parameter *pSkirmishPlayerParm, Parameter *pComparisonParm, Parameter *pMoneyParm, Parameter *pTriggerParm)
@@ -2136,8 +2132,8 @@ Bool ScriptConditions::evaluateSkirmishValueInArea(Condition *pCondition, Parame
 			if (!team) {
 				continue;
 			}
-			if (team->didEnterOrExit()) {	
-				anyChanges = true; 
+			if (team->didEnterOrExit()) {
+				anyChanges = true;
 			}
 		}
 	}
@@ -2178,7 +2174,7 @@ Bool ScriptConditions::evaluateSkirmishValueInArea(Condition *pCondition, Parame
 	{
 		case Parameter::LESS_THAN :			comparison = (totalCost < pMoneyParm->getInt()); break;
 		case Parameter::LESS_EQUAL :		comparison = (totalCost <= pMoneyParm->getInt()); break;
-		case Parameter::EQUAL :					comparison = (totalCost == pMoneyParm->getInt()); break; 
+		case Parameter::EQUAL :					comparison = (totalCost == pMoneyParm->getInt()); break;
 		case Parameter::GREATER_EQUAL :	comparison = (totalCost >= pMoneyParm->getInt()); break;
 		case Parameter::GREATER :				comparison = (totalCost > pMoneyParm->getInt()); break;
 		case Parameter::NOT_EQUAL :			comparison = (totalCost != pMoneyParm->getInt()); break;
@@ -2221,7 +2217,7 @@ Bool ScriptConditions::evaluateSkirmishSuppliesWithinDistancePerimeter(Parameter
 	Coord3D center;
 	trigger->getCenterPoint(&center);
 	Real distance = trigger->getRadius() + pDistanceParm->getReal();
-	
+
 	Real compareToValue = pValueParm->getReal();
 
 	PartitionFilterAcceptByKindOf f1(MAKE_KINDOF_MASK(KINDOF_STRUCTURE), KINDOFMASK_NONE);
@@ -2345,13 +2341,13 @@ Bool ScriptConditions::evaluateSkirmishUnownedFactionUnitComparison( Parameter *
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 				Object *obj = objIter.cur();
 				if (!obj) {
 					continue;
 				}
-				
+
 				if( obj->isDisabledByType( DISABLED_UNMANNED ) )
 				{
 					++numFactionUnits;
@@ -2359,7 +2355,7 @@ Bool ScriptConditions::evaluateSkirmishUnownedFactionUnitComparison( Parameter *
 			}
 		}
 	}
-		
+
 	switch (pComparisonParm->getInt())
 	{
 		case Parameter::LESS_THAN			:	return numFactionUnits < pCountParm->getInt();	break;
@@ -2396,7 +2392,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasComparisonGarrisoned(Parameter *
 		return FALSE;
 	}
 
-	// Note: This looks slow, and probably is. 
+	// Note: This looks slow, and probably is.
 	// @todo: PERF_EVALUATE
 	Int numGarrisonedBuildings = 0;
 	Player::PlayerTeamList::const_iterator it;
@@ -2406,18 +2402,18 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasComparisonGarrisoned(Parameter *
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 				Object *obj = objIter.cur();
 				if (!obj) {
 					continue;
 				}
-				
+
 				ContainModuleInterface *cmi = obj->getContain();
 				if (!cmi) {
 					continue;
 				}
-				
+
 				if (cmi->isGarrisonable() && cmi->getContainCount() > 0) {
 					++numGarrisonedBuildings;
 				}
@@ -2447,7 +2443,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasComparisonCapturedUnits(Paramete
 		return FALSE;
 	}
 
-	// Note: This looks slow, and probably is. 
+	// Note: This looks slow, and probably is.
 	// @todo: PERF_EVALUATE
 	Int numCapturedUnits = 0;
 	Player::PlayerTeamList::const_iterator it;
@@ -2457,7 +2453,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasComparisonCapturedUnits(Paramete
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 				Object *obj = objIter.cur();
 				if (!obj) {
@@ -2518,7 +2514,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasUnitsInArea(Condition *pConditio
 				continue;
 			}
 			if (team->didEnterOrExit()) {
-				anyChanges = true; 
+				anyChanges = true;
 			}
 		}
 	}
@@ -2557,7 +2553,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasUnitsInArea(Condition *pConditio
 			}
 		}
 	}
-	
+
 	Bool comparison = count > 0;
 	pCondition->setCustomData(-1); // false.
 	if (comparison) {
@@ -2587,7 +2583,7 @@ Bool ScriptConditions::evaluateSkirmishSupplySourceSafe(Condition *pCondition, P
 		pCondition->setCustomData(1); // true.
 	}
 	return isSafe;
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateSkirmishSupplySourceAttacked(Parameter *pSkirmishPlayerParm)
@@ -2597,7 +2593,7 @@ Bool ScriptConditions::evaluateSkirmishSupplySourceAttacked(Parameter *pSkirmish
 		return FALSE;
 	}
 	return player->isSupplySourceAttacked( );
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateSkirmishStartPosition(Parameter *pSkirmishPlayerParm, Parameter *pStartNdx)
@@ -2609,7 +2605,7 @@ Bool ScriptConditions::evaluateSkirmishStartPosition(Parameter *pSkirmishPlayerP
 	Int ndx = pStartNdx->getInt()-1;  // externally 1, 2, 3, internally 0, 1, 2.
 	Int startNdx = player->getMpStartIndex();
 	return ndx == startNdx;
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 Bool ScriptConditions::evaluateSkirmishPlayerHasBeenAttackedByPlayer(Parameter *pSkirmishPlayerParm, Parameter *pAttackedByParm )
@@ -2618,7 +2614,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasBeenAttackedByPlayer(Parameter *
 	if (!player) {
 		return FALSE;
 	}
-	
+
 	Player *srcPlayer = playerFromParam(pAttackedByParm);
 	if (!srcPlayer ) {
 		return FALSE;
@@ -2666,7 +2662,7 @@ Bool ScriptConditions::evaluateSkirmishPlayerHasDiscoveredPlayer(Parameter *pSki
 			if (!team) {
 				continue;
 			}
-			
+
 			for (DLINK_ITERATOR<Object> objIter = team->iterate_TeamMemberList(); !objIter.done(); objIter.advance()) {
 				Object *obj = objIter.cur();
 				if (!obj) {
@@ -2698,7 +2694,7 @@ Bool ScriptConditions::evaluatePlayerLostObjectType(Parameter *pPlayerParm, Para
 	if (!player) {
 		return FALSE;
 	}
-	
+
 	ObjectTypesTemp objs;
 	objectTypesFromParam(pTypeParm, objs.m_types);
 
@@ -2728,34 +2724,34 @@ Bool ScriptConditions::evaluatePlayerLostObjectType(Parameter *pPlayerParm, Para
 Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 {
 	switch (pCondition->getConditionType()) {
-		default: 
-			DEBUG_CRASH(("Unknown ScriptCondition type %d", pCondition->getConditionType())); 
+		default:
+			DEBUG_CRASH(("Unknown ScriptCondition type %d", pCondition->getConditionType()));
 			return false;
-		case Condition::PLAYER_ALL_DESTROYED: 
+		case Condition::PLAYER_ALL_DESTROYED:
 			return evaluateAllDestroyed(pCondition->getParameter(0));
-		case Condition::PLAYER_ALL_BUILDFACILITIES_DESTROYED: 
+		case Condition::PLAYER_ALL_BUILDFACILITIES_DESTROYED:
 			return evaluateAllBuildFacilitiesDestroyed(pCondition->getParameter(0));
-		case Condition::TEAM_INSIDE_AREA_PARTIALLY: 
+		case Condition::TEAM_INSIDE_AREA_PARTIALLY:
 			return evaluateTeamInsideAreaPartially(pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2));
-		case Condition::NAMED_INSIDE_AREA: 
+		case Condition::NAMED_INSIDE_AREA:
 			return evaluateNamedInsideArea(pCondition->getParameter(0), pCondition->getParameter(1));
-		case Condition::TEAM_DESTROYED: 
+		case Condition::TEAM_DESTROYED:
 			return evaluateIsDestroyed(pCondition->getParameter(0));
-		case Condition::NAMED_DESTROYED: 
+		case Condition::NAMED_DESTROYED:
 			return evaluateNamedUnitDestroyed(pCondition->getParameter(0));
-		case Condition::NAMED_DYING: 
+		case Condition::NAMED_DYING:
 			return evaluateNamedUnitDying(pCondition->getParameter(0));
-		case Condition::NAMED_TOTALLY_DEAD: 
+		case Condition::NAMED_TOTALLY_DEAD:
 			return evaluateNamedUnitTotallyDead(pCondition->getParameter(0));
-		case Condition::NAMED_NOT_DESTROYED: 
+		case Condition::NAMED_NOT_DESTROYED:
 			return evaluateNamedUnitExists(pCondition->getParameter(0));
-		case Condition::TEAM_HAS_UNITS: 
+		case Condition::TEAM_HAS_UNITS:
 			return evaluateHasUnits(pCondition->getParameter(0));
-		case Condition::CAMERA_MOVEMENT_FINISHED: 
+		case Condition::CAMERA_MOVEMENT_FINISHED:
 			return TheTacticalView->isCameraMovementFinished();
-		case Condition::TEAM_STATE_IS: 
+		case Condition::TEAM_STATE_IS:
 			return evaluateTeamStateIs(pCondition->getParameter(0), pCondition->getParameter(1));
-		case Condition::TEAM_STATE_IS_NOT: 
+		case Condition::TEAM_STATE_IS_NOT:
 			return evaluateTeamStateIsNot(pCondition->getParameter(0), pCondition->getParameter(1));
 		case Condition::NAMED_OUTSIDE_AREA:
 			return evaluateNamedOutsideArea(pCondition->getParameter(0), pCondition->getParameter(1));
@@ -2790,7 +2786,7 @@ Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 		case Condition::BUILDING_ENTERED_BY_PLAYER:
 			return evaluateBuildingEntered(pCondition->getParameter(0), pCondition->getParameter(1));
 		case Condition::ENEMY_SIGHTED:
-		{	
+		{
 			Int numParameters = pCondition->getNumParameters();
 			DEBUG_ASSERTCRASH(numParameters == 3, ("'Condition: [Unit] Unit has sighted a(n) friendly/neutral/enemy unit belonging to a side.' has too few parameters. Please fix in WB. (jkmcd)"));
 
@@ -2872,7 +2868,7 @@ Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 			return evaluateNamedHasFreeContainerSlots(pCondition->getParameter(0));
 		case Condition::DEFUNCT_PLAYER_SELECTED_GENERAL:
 		case Condition::DEFUNCT_PLAYER_SELECTED_GENERAL_FROM_NAMED:
-			DEBUG_CRASH(("PLAYER_SELECTED_GENERAL script conditions are no longer in use\n")); 
+			DEBUG_CRASH(("PLAYER_SELECTED_GENERAL script conditions are no longer in use"));
 			return false;
 		case Condition::PLAYER_BUILT_UPGRADE:
 			return evaluateUpgradeFromUnitComplete(pCondition->getParameter(0), pCondition->getParameter(1), NULL);
@@ -2883,7 +2879,7 @@ Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 		case Condition::PLAYER_DESTROYED_N_BUILDINGS_PLAYER:
 			return evaluatePlayerDestroyedNOrMoreBuildings(pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2));
 		case Condition::PLAYER_HAS_COMPARISON_UNIT_TYPE_IN_TRIGGER_AREA:
-		{	
+		{
 			Int numParameters = pCondition->getNumParameters();
 			DEBUG_ASSERTCRASH(numParameters == 5, ("'Condition: [Player] has (comparison) unit type in an area' has too few parameters. Please fix in WB. (jkmcd)"));
 
@@ -2906,16 +2902,16 @@ Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 		}
 		case Condition::UNIT_EMPTIED:
 			return evaluateUnitHasEmptied(pCondition->getParameter(0));
-			
+
 		case Condition::PLAYER_POWER_COMPARE_PERCENT:
 			return evaluatePlayerHasComparisonPercentPower(pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2));
-			
+
 		case Condition::PLAYER_EXCESS_POWER_COMPARE_VALUE:
 			return evaluatePlayerHasComparisonValueExcessPower(pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2));
-			
+
 		case Condition::SKIRMISH_SPECIAL_POWER_READY:
 			return evaluateSkirmishSpecialPowerIsReady(pCondition->getParameter(0), pCondition->getParameter(1));
-			
+
 		case Condition::UNIT_HAS_OBJECT_STATUS:
 			return evaluateUnitHasObjectStatus(pCondition->getParameter(0), pCondition->getParameter(1));
 
@@ -2924,7 +2920,7 @@ Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 
 		case Condition::TEAM_SOME_HAVE_OBJECT_STATUS:
 			return evaluateTeamHasObjectStatus(pCondition->getParameter(0), pCondition->getParameter(1), false);
-			
+
 		case Condition::SKIRMISH_VALUE_IN_AREA:
 			return evaluateSkirmishValueInArea(pCondition, pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2), pCondition->getParameter(3));
 
@@ -2948,44 +2944,44 @@ Bool ScriptConditions::evaluateCondition( Condition *pCondition )
 
 		case Condition::SKIRMISH_PLAYER_HAS_PREREQUISITE_TO_BUILD:
 			return evaluateSkirmishPlayerHasPrereqsToBuild(pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::SKIRMISH_PLAYER_HAS_COMPARISON_GARRISONED:
 			return evaluateSkirmishPlayerHasComparisonGarrisoned(pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2));
-		
+
 		case Condition::SKIRMISH_PLAYER_HAS_COMPARISON_CAPTURED_UNITS:
 			return evaluateSkirmishPlayerHasComparisonCapturedUnits(pCondition->getParameter(0), pCondition->getParameter(1), pCondition->getParameter(2));
-		
+
 		case Condition::SKIRMISH_NAMED_AREA_EXIST:
 			return evaluateSkirmishNamedAreaExists(pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::SKIRMISH_PLAYER_HAS_UNITS_IN_AREA:
 			return evaluateSkirmishPlayerHasUnitsInArea(pCondition, pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::SKIRMISH_PLAYER_HAS_BEEN_ATTACKED_BY_PLAYER:
 			return evaluateSkirmishPlayerHasBeenAttackedByPlayer(pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::SKIRMISH_PLAYER_IS_OUTSIDE_AREA:
 			return evaluateSkirmishPlayerIsOutsideArea(pCondition, pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::SKIRMISH_PLAYER_HAS_DISCOVERED_PLAYER:
 			return evaluateSkirmishPlayerHasDiscoveredPlayer(pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::MUSIC_TRACK_HAS_COMPLETED:
 			return evaluateMusicHasCompleted(pCondition->getParameter(0), pCondition->getParameter(1));
 
 		case Condition::SUPPLY_SOURCE_SAFE:
 			return evaluateSkirmishSupplySourceSafe(pCondition, pCondition->getParameter(0), pCondition->getParameter(1));
-		
+
 		case Condition::SUPPLY_SOURCE_ATTACKED:
 			return evaluateSkirmishSupplySourceAttacked(pCondition->getParameter(0));
-		
+
 		case Condition::START_POSITION_IS:
 			return evaluateSkirmishStartPosition(pCondition->getParameter(0), pCondition->getParameter(1));
 
 		case Condition::PLAYER_LOST_OBJECT_TYPE:
 			return evaluatePlayerLostObjectType(pCondition->getParameter(0), pCondition->getParameter(1));
 
-		
+
 	}
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
index 1f90248a31d..1afe8e19c1e 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
@@ -26,12 +26,12 @@
 // The game scripting engine.  Interprets scripts.
 // Author: John Ahlquist, Nov. 2001
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/DataChunk.h"
 #include "Common/file.h"
 #include "Common/FileSystem.h"
-#include "Common/GameEngine.h"
+#include "Common/FramePacer.h"
 #include "Common/GameState.h"
 #include "Common/LatchRestore.h"
 #include "Common/MessageStream.h"
@@ -57,11 +57,6 @@
 #include "GameLogic/ScriptEngine.h"
 #include "GameLogic/SidesList.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // These are for debugger window
 static int st_LastCurrentFrame;
@@ -105,7 +100,7 @@ Bool st_particleSystemNeedsStopping = FALSE; ///< Set along with st_particleSyst
 #define FORMAT_STRING_LEADING_STRING		"%s%.2f"
 // That's it for particle editor
 
-#if defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	#define DO_VTUNE_STUFF
 #endif
 
@@ -113,7 +108,7 @@ Bool st_particleSystemNeedsStopping = FALSE; ///< Set along with st_particleSyst
 
 //typedef __declspec(dllimport) void __cdecl (*VTProc)();
 	typedef void (*VTProc)();
-	
+
 	static Bool						st_EnableVTune = false;
 	static HMODULE				st_vTuneDLL = NULL;
 	static VTProc VTPause = NULL;
@@ -135,21 +130,21 @@ static const Int FRAMES_TO_SHOW_WIN_LOSE_MESSAGE = 120;
 static const Int FRAMES_TO_FADE_IN_AT_START = 33;
 
 
-//------------------------------------------------------------------------------ Performance Timers 
+//------------------------------------------------------------------------------ Performance Timers
 //#include "Common/PerfMetrics.h"
 //#include "Common/PerfTimer.h"
 
 // GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
 ScriptEngine *TheScriptEngine = NULL;
 
-/// Local classes 
+/// Local classes
 /// AttackPriorityInfo class
 
 static const Int ATTACK_PRIORITY_DEFAULT = 1;
 //-------------------------------------------------------------------------------------------------
 /** Ctor */
 //-------------------------------------------------------------------------------------------------
-AttackPriorityInfo::AttackPriorityInfo() :m_defaultPriority(ATTACK_PRIORITY_DEFAULT), m_priorityMap(NULL) 
+AttackPriorityInfo::AttackPriorityInfo() :m_defaultPriority(ATTACK_PRIORITY_DEFAULT), m_priorityMap(NULL)
 {
 	m_name.clear();
 }
@@ -159,7 +154,7 @@ AttackPriorityInfo::AttackPriorityInfo() :m_defaultPriority(ATTACK_PRIORITY_DEFA
 //-------------------------------------------------------------------------------------------------
 AttackPriorityInfo::~AttackPriorityInfo()
 {
-	if (m_priorityMap) delete m_priorityMap;
+	delete m_priorityMap;
 	m_priorityMap = NULL;
 }
 
@@ -186,7 +181,7 @@ Int AttackPriorityInfo::getPriority(const ThingTemplate *tThing) const
 	tThing = (const ThingTemplate *)tThing->getFinalOverride();
 	if (m_priorityMap && !m_priorityMap->empty()) {
 		AttackPriorityMap::const_iterator it = m_priorityMap->find(tThing);
-		if (it != m_priorityMap->end()) 
+		if (it != m_priorityMap->end())
 		{
 			priority = (*it).second;
 		}
@@ -200,13 +195,13 @@ Int AttackPriorityInfo::getPriority(const ThingTemplate *tThing) const
 void AttackPriorityInfo::dumpPriorityInfo(void)
 {
 #ifdef DEBUG_LOGGING
-	DEBUG_LOG(("Attack priority '%s', default %d\n", m_name.str(), m_defaultPriority));
+	DEBUG_LOG(("Attack priority '%s', default %d", m_name.str(), m_defaultPriority));
 	if (m_priorityMap==NULL) return;
-	for (AttackPriorityMap::const_iterator it = m_priorityMap->begin(); it != m_priorityMap->end(); ++it) 
+	for (AttackPriorityMap::const_iterator it = m_priorityMap->begin(); it != m_priorityMap->end(); ++it)
     {
 		const ThingTemplate *tThing = (*it).first;
 		Int priority = (*it).second;
-		DEBUG_LOG(("  Thing '%s' priority %d\n",tThing->getName().str(), priority));
+		DEBUG_LOG(("  Thing '%s' priority %d",tThing->getName().str(), priority));
 	}
 #endif
 }
@@ -224,16 +219,10 @@ void AttackPriorityInfo::reset( void )
 	// go back to default priority
 	m_defaultPriority = ATTACK_PRIORITY_DEFAULT;
 
-	// delete the priority map if present
-	if( m_priorityMap )
-	{
-
-		delete m_priorityMap;
-		m_priorityMap = NULL;
-
-	}  // end if
+	delete m_priorityMap;
+	m_priorityMap = NULL;
 
-}  // end reset
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -241,7 +230,7 @@ void AttackPriorityInfo::reset( void )
 void AttackPriorityInfo::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -274,11 +263,11 @@ void AttackPriorityInfo::xfer( Xfer *xfer )
 	if( m_priorityMap )
 	{
 		AttackPriorityMap::const_iterator it;
-		
+
 		for( it = m_priorityMap->begin(); it != m_priorityMap->end(); ++it )
 			++priorityMapCount;
-	
-	}  // end if
+
+	}
 	xfer->xferUnsignedShort( &priorityMapCount );
 
 	// priority map
@@ -303,24 +292,24 @@ void AttackPriorityInfo::xfer( Xfer *xfer )
 				// write thing template name
 				thingTemplate = (*it).first;
 				thingTemplateName = thingTemplate->getName();
-				DEBUG_ASSERTCRASH( thingTemplateName.isEmpty() == FALSE, 
-													 ("AttackPriorityInfo::xfer - Writing an empty thing template name\n") );
+				DEBUG_ASSERTCRASH( thingTemplateName.isEmpty() == FALSE,
+													 ("AttackPriorityInfo::xfer - Writing an empty thing template name") );
 				xfer->xferAsciiString( &thingTemplateName );
 
 				// write priority
 				priority = (*it).second;
 				xfer->xferInt( &priority );
 
-			}  // end for i
+			}
 
 			// sanity
-			DEBUG_ASSERTCRASH( count == priorityMapCount, 
-												("AttackPriorityInfo::xfer - Mismatch in priority map size.  Size() method returned '%d' but actual iteration count was '%d'\n",
+			DEBUG_ASSERTCRASH( count == priorityMapCount,
+												("AttackPriorityInfo::xfer - Mismatch in priority map size.  Size() method returned '%d' but actual iteration count was '%d'",
 												 priorityMapCount, count) );
 
-		}  // end if
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -334,11 +323,11 @@ void AttackPriorityInfo::xfer( Xfer *xfer )
 			if( thingTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "AttackPriorityInfo::xfer - Unable to find thing template '%s'\n",
+				DEBUG_CRASH(( "AttackPriorityInfo::xfer - Unable to find thing template '%s'",
 											thingTemplateName.str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// read priority
 			xfer->xferInt( &priority );
@@ -346,11 +335,11 @@ void AttackPriorityInfo::xfer( Xfer *xfer )
 			// set priority (this will allocate the map on the first call as well)
 			setPriority( thingTemplate, priority );
 
-		}  // end for
+		}
 
-	}  // end else, load
+	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -358,21 +347,21 @@ void AttackPriorityInfo::xfer( Xfer *xfer )
 void AttackPriorityInfo::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ScriptEngine class
-static const FieldParse TheTemplateFieldParseTable[] = 
-{																	 
+static const FieldParse TheTemplateFieldParseTable[] =
+{
 	{ "InternalName",	INI::parseAsciiString,NULL,		offsetof( Template, m_internalName ) },
 	{ "UIName",				INI::parseAsciiString,NULL,		offsetof( Template, m_uiName ) },
 	{ "UIName2",			INI::parseAsciiString,NULL,		offsetof( Template, m_uiName2 ) },
 	{ "HelpText",			INI::parseAsciiString,NULL,		offsetof( Template, m_helpText ) },
-	{ NULL,						NULL,									NULL, 0 }  // keep this last
+	{ NULL,						NULL,									NULL, 0 }
 };
 
 //-------------------------------------------------------------------------------------------------
 /** Parse script action entry.  The InternalName has to match the action's internal name, and then it
-overrides the ui name and help text.  If no entry is present in the ini file, the default code 
+overrides the ui name and help text.  If no entry is present in the ini file, the default code
 initialized value in ScriptEngine::init() is used. jba*/
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::parseScriptAction( INI* ini )
@@ -386,9 +375,9 @@ void ScriptEngine::parseScriptAction( INI* ini )
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Update the info from a script action's .ini entry.  The InternalName has to match the action's 
+/** Update the info from a script action's .ini entry.  The InternalName has to match the action's
 internal name, and then it
-overrides the ui name and help text.  If no entry is present in the ini file, the default code 
+overrides the ui name and help text.  If no entry is present in the ini file, the default code
 initialized value in ScriptEngine::init() is used. jba*/
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::addActionTemplateInfo( Template *actionTemplate)
@@ -402,17 +391,17 @@ void ScriptEngine::addActionTemplateInfo( Template *actionTemplate)
 			return;
 		}
 	}
-	DEBUG_LOG(("Couldn't find script action named %s\n", actionTemplate->m_internalName.str()));
+	DEBUG_LOG(("Couldn't find script action named %s", actionTemplate->m_internalName.str()));
 }
 
 //-------------------------------------------------------------------------------------------------
 /** Parse script condition entry.  The InternalName has to match the condition's internal name, and then it
-overrides the ui name and help text.  If no entry is present in the ini file, the default code 
+overrides the ui name and help text.  If no entry is present in the ini file, the default code
 initialized value in ScriptEngine::init() is used. jba*/
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::parseScriptCondition( INI* ini )
 {
-	// parse the ini weapon definition			 
+	// parse the ini weapon definition
 	ActionTemplate scriptTemplate;
 	ini->initFromINI( &scriptTemplate, TheTemplateFieldParseTable );
 	if (TheScriptEngine) {
@@ -421,9 +410,9 @@ void ScriptEngine::parseScriptCondition( INI* ini )
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Update the info from a script action's .ini entry.  The InternalName has to match the action's 
+/** Update the info from a script action's .ini entry.  The InternalName has to match the action's
 internal name, and then it
-overrides the ui name and help text.  If no entry is present in the ini file, the default code 
+overrides the ui name and help text.  If no entry is present in the ini file, the default code
 initialized value in ScriptEngine::init() is used. jba*/
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::addConditionTemplateInfo( Template *actionTemplate)
@@ -456,8 +445,6 @@ m_skirmishHumanPlayer(NULL),
 m_fade(FADE_NONE),
 m_freezeByScript(FALSE),
 m_frameObjectCountChanged(0),
-//Added By Sadullah Nader
-//Initializations inserted
 m_closeWindowTimer(0),
 m_curFadeFrame(0),
 m_curFadeValue(0.0f),
@@ -472,14 +459,13 @@ m_numAttackInfo(0),
 m_shownMPLocalDefeatWindow(FALSE),
 m_objectsShouldReceiveDifficultyBonus(TRUE),
 m_ChooseVictimAlwaysUsesNormal(false)
-//
 {
 	st_CanAppCont = true;
 	st_LastCurrentFrame = st_CurrentFrame = 0;
 	// By default, difficulty should be normal.
 	setGlobalDifficulty(DIFFICULTY_NORMAL);
 
-}  // end ScriptEngine
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -513,18 +499,18 @@ ScriptEngine::~ScriptEngine()
 #ifdef COUNT_SCRIPT_USAGE
 	Int i;
 	for (i=0; i<ScriptAction::NUM_ITEMS; i++) {
-		DEBUG_LOG(("ScriptAction%d, %4d, %s, %s, %s\n", i, m_actionTemplates[i].m_numTimesUsed, 
+		DEBUG_LOG(("ScriptAction%d, %4d, %s, %s, %s", i, m_actionTemplates[i].m_numTimesUsed,
 			m_actionTemplates[i].m_internalName.str(), m_actionTemplates[i].m_firstMapUsed.str(),
 			m_actionTemplates[i].m_uiName.str()));
 	}
 	for (i=0; i<Condition::NUM_ITEMS; i++) {
-		DEBUG_LOG(("ScriptCondition%d, %4d, %s, %s, %s\n", i, m_conditionTemplates[i].m_numTimesUsed, 
+		DEBUG_LOG(("ScriptCondition%d, %4d, %s, %s, %s", i, m_conditionTemplates[i].m_numTimesUsed,
 			m_conditionTemplates[i].m_internalName.str(), m_conditionTemplates[i].m_firstMapUsed.str(),
 			m_conditionTemplates[i].m_uiName.str()));
 	}
 #endif
 
-}  // end ~ScriptEngine
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Init */
@@ -537,7 +523,7 @@ void ScriptEngine::init( void )
 		} else {
 			st_DebugDLL = NULL;
 		}
-		
+
 		if (TheGlobalData->m_particleEdit) {
 			st_ParticleDLL = LoadLibrary("ParticleEditor.dll");
 		} else {
@@ -569,7 +555,7 @@ void ScriptEngine::init( void )
 	m_maxUpdateTime=0;
 #endif
 #endif
-	
+
 	if (TheScriptActions) {
 		TheScriptActions->init();
 	}
@@ -580,7 +566,7 @@ void ScriptEngine::init( void )
 			1. In Scripts.h, add an enum element to enum ScriptActionType just before NUM_ITEMS.
 			2. Go to the end of this section of templates, and create a template.
 			3. Go to ScriptActions.h and add a protected method.
-			4. Go to ScriptActions.cpp, and add your enum to the 
+			4. Go to ScriptActions.cpp, and add your enum to the
 					switch in ScriptActions::executeAction to call your method in 3 above.
 	*/
 
@@ -603,7 +589,7 @@ void ScriptEngine::init( void )
 
 	curTemplate = &m_actionTemplates[ScriptAction::DEBUG_CRASH_BOX];
 	curTemplate->m_internalName = "DEBUG_CRASH_BOX";
-	curTemplate->m_uiName = "{INTERNAL}_/Debug/Display a crash box (debug/internal builds only).";
+	curTemplate->m_uiName = "{INTERNAL}_/Debug/Display a crash box (debug builds only).";
 	curTemplate->m_numParameters = 1;
 	curTemplate->m_parameters[0] = Parameter::TEXT_STRING;
 	curTemplate->m_numUiStrings = 1;
@@ -944,7 +930,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numParameters = 2;
 	curTemplate->m_parameters[0] = Parameter::TEAM;
 	curTemplate->m_parameters[1] = Parameter::INT;
-	curTemplate->m_numUiStrings = 3;									  
+	curTemplate->m_numUiStrings = 3;
 	curTemplate->m_uiStrings[0] = "Have Team ";
 	curTemplate->m_uiStrings[1] = " guard attacked or closest supply src with at least ";
 	curTemplate->m_uiStrings[2] = " available resources";
@@ -1573,7 +1559,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[0] = " ";
 	curTemplate->m_uiStrings[1] = " attempts to purchase Science ";
 	curTemplate->m_uiStrings[2] = ".";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::PLAYER_SCIENCE_AVAILABILITY];
 	curTemplate->m_internalName = "PLAYER_SCIENCE_AVAILABILITY";
 	curTemplate->m_uiName = "Player_/Science/Set science availability.";
@@ -1586,7 +1572,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[1] = " set ";
 	curTemplate->m_uiStrings[2] = " availability to ";
 	curTemplate->m_uiStrings[3] = ".";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::SET_BASE_CONSTRUCTION_SPEED];
 	curTemplate->m_internalName = "SET_BASE_CONSTRUCTION_SPEED";
 	curTemplate->m_uiName = "Player_/AI/Set the delay between building teams.";
@@ -2213,7 +2199,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = "A radar event occurs at ";
 	curTemplate->m_uiStrings[1] = " of type ";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::RADAR_DISABLE];
 	curTemplate->m_internalName = "RADAR_DISABLE";
 	curTemplate->m_uiName = "Radar_/Control/Disable the radar.";
@@ -2644,7 +2630,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_parameters[0] = Parameter::REAL;
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = "Set the audible range during camera-up shots to ";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::NAMED_SET_HELD];
 	curTemplate->m_internalName = "NAMED_SET_HELD";
 	curTemplate->m_uiName = "Unit_/Move/Set unit to be held in place, ignoring Physics, Locomotors, etc.";
@@ -2910,7 +2896,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numParameters = 0;
 	curTemplate->m_numUiStrings = 1;
 	curTemplate->m_uiStrings[0] = "Refresh radar terrain.";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::NAMED_STOP];
 	curTemplate->m_internalName = "NAMED_STOP";
 	curTemplate->m_uiName = "Unit_/ Set a specific unit to stop.";
@@ -3503,7 +3489,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[0] = " ";
 	curTemplate->m_uiStrings[1] = " will move towards the nearest ";
 	curTemplate->m_uiStrings[2] = " within ";
-	
+
  	curTemplate = &m_actionTemplates[ScriptAction::SKIRMISH_ATTACK_NEAREST_GROUP_WITH_VALUE];
 	curTemplate->m_internalName = "SKIRMISH_ATTACK_NEAREST_GROUP_WITH_VALUE";
 	curTemplate->m_uiName = "Skirmish_/ Team attacks nearest group matching value comparison.";
@@ -3543,7 +3529,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[1] = " 's ";
 	curTemplate->m_uiStrings[2] = " all wait until ";
 	curTemplate->m_uiStrings[3] = " is ready.";
-	
+
  	curTemplate = &m_actionTemplates[ScriptAction::SKIRMISH_WAIT_FOR_COMMANDBUTTON_AVAILABLE_PARTIAL];
 	curTemplate->m_internalName = "SKIRMISH_WAIT_FOR_COMMANDBUTTON_AVAILABLE_PARTIAL";
 	curTemplate->m_uiName = "Skirmish_/ Delay a sequential script until the specified command ability is ready - partial.";
@@ -3556,7 +3542,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[1] = " 's ";
 	curTemplate->m_uiStrings[2] = " wait until at least one member is ";
 	curTemplate->m_uiStrings[3] = " ready.";
-	
+
  	curTemplate = &m_actionTemplates[ScriptAction::TEAM_SPIN_FOR_FRAMECOUNT];
 	curTemplate->m_internalName = "TEAM_SPIN_FOR_FRAMECOUNT";
 	curTemplate->m_uiName = "Team_/ Set to continue current action for some number of frames.";
@@ -3908,7 +3894,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = " ";
 	curTemplate->m_uiStrings[1] = " begin facing ";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::TEAM_FACE_NAMED];
 	curTemplate->m_internalName = "TEAM_FACE_NAMED";
 	curTemplate->m_uiName = "Team_/ Set team to face another unit.";
@@ -3928,7 +3914,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = " ";
 	curTemplate->m_uiStrings[1] = " begin facing ";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::COMMANDBAR_REMOVE_BUTTON_OBJECTTYPE];
 	curTemplate->m_internalName = "COMMANDBAR_REMOVE_BUTTON_OBJECTTYPE";
 	curTemplate->m_uiName = "Scripting_/ Remove a command button from an object type.";
@@ -4007,7 +3993,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = "Enable Object Bonuses based on difficulty ";
 	curTemplate->m_uiStrings[1] = " (true to enable, false to disable).";
-	
+
 	curTemplate = &m_actionTemplates[ScriptAction::TEAM_GUARD_IN_TUNNEL_NETWORK];
 	curTemplate->m_internalName = "TEAM_GUARD_IN_TUNNEL_NETWORK";
 	curTemplate->m_uiName = "Team_/ Set to guard - from inside tunnel network.";
@@ -4084,7 +4070,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = " ";
 	curTemplate->m_uiStrings[1] = " will exit its riders on its ";
- 
+
   curTemplate = &m_actionTemplates[ScriptAction::ENABLE_OBJECT_SOUND];
   curTemplate->m_internalName = "ENABLE_OBJECT_SOUND";
   curTemplate->m_uiName = "Multimedia_/Sound Effect/Enable object's ambient sound";
@@ -4093,7 +4079,7 @@ void ScriptEngine::init( void )
   curTemplate->m_numUiStrings = 2;
   curTemplate->m_uiStrings[0] = "Enable (or trigger) ";
   curTemplate->m_uiStrings[1] = "'s ambient sound.";
-  
+
   curTemplate = &m_actionTemplates[ScriptAction::DISABLE_OBJECT_SOUND];
   curTemplate->m_internalName = "DISABLE_OBJECT_SOUND";
   curTemplate->m_uiName = "Multimedia_/Sound Effect/Disable object's ambient sound";
@@ -4102,7 +4088,7 @@ void ScriptEngine::init( void )
   curTemplate->m_numUiStrings = 2;
   curTemplate->m_uiStrings[0] = "Disable ";
   curTemplate->m_uiStrings[1] = "'s ambient sound.";
-  
+
 
 	///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -4110,7 +4096,7 @@ void ScriptEngine::init( void )
 			1. In Scripts.h, add an enum element to enum ConditionType just before NUM_ITEMS.
 			2. Go to the end of this section of templates, and create a template.
 			3. Go to ScriptConditions.h and add a protected method.
-			4. Go to ScriptConditions.cpp, and add your enum to the 
+			4. Go to ScriptConditions.cpp, and add your enum to the
 					switch in ScriptConditions::evaluateCondition to call your method in 3 above.
 	*/
 
@@ -4176,7 +4162,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_numUiStrings = 2;
 	curTemplate->m_uiStrings[0] = " ";
 	curTemplate->m_uiStrings[1] = " state IS NOT ";
-																										 
+
 	curTemplate = &m_conditionTemplates[Condition::CONDITION_TRUE];
 	curTemplate->m_internalName = "CONDITION_TRUE";
 	curTemplate->m_uiName = "Scripting_/ True.";
@@ -4836,7 +4822,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[0] = "Player ";
 	curTemplate->m_uiStrings[1] = " has at least ";
 	curTemplate->m_uiStrings[2] = " Science Purchase Points available.";
-	
+
 	curTemplate = &m_conditionTemplates[Condition::NAMED_HAS_FREE_CONTAINER_SLOTS];
 	curTemplate->m_internalName = "NAMED_HAS_FREE_CONTAINER_SLOTS";
 	curTemplate->m_uiName = "Unit_/ Unit has free container slots.";
@@ -5094,8 +5080,8 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[1] = ". There are ";
 	curTemplate->m_uiStrings[2] = " ";
 	curTemplate->m_uiStrings[3] = " unowned faction units.";
-	
-	
+
+
 	curTemplate = &m_conditionTemplates[Condition::SKIRMISH_PLAYER_HAS_PREREQUISITE_TO_BUILD];
 	curTemplate->m_internalName = "SKIRMISH_PLAYER_HAS_PREREQUISITE_TO_BUILD";
 	curTemplate->m_uiName = "Skirmish_/ Player has prerequisites to build an object type.";
@@ -5106,7 +5092,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[0] = " ";
 	curTemplate->m_uiStrings[1] = " can build ";
 	curTemplate->m_uiStrings[2] = ".";
-	
+
 	curTemplate = &m_conditionTemplates[Condition::SKIRMISH_PLAYER_HAS_COMPARISON_GARRISONED];
 	curTemplate->m_internalName = "SKIRMISH_PLAYER_HAS_COMPARISON_GARRISONED";
 	curTemplate->m_uiName = "Skirmish_/ Player has garrisoned buildings -- comparison.";
@@ -5143,7 +5129,7 @@ void ScriptEngine::init( void )
 	curTemplate->m_uiStrings[0] = " ";
 	curTemplate->m_uiStrings[1] = ". ";
 	curTemplate->m_uiStrings[2] = " exists.";
-	
+
 	curTemplate = &m_conditionTemplates[Condition::SKIRMISH_PLAYER_HAS_UNITS_IN_AREA];
 	curTemplate->m_internalName = "SKIRMISH_PLAYER_HAS_UNITS_IN_AREA";
 	curTemplate->m_uiName = "Skirmish_/ Player has units in an area";
@@ -5254,7 +5240,7 @@ void ScriptEngine::init( void )
 	for (i=0; i<Condition::NUM_ITEMS; i++) {
 		AsciiString str;
 		str.format("[%d]", i);
-		m_conditionTemplates[i].m_uiName.concat(str);	 
+		m_conditionTemplates[i].m_uiName.concat(str);
 		m_conditionTemplates[i].m_internalNameKey = NAMEKEY(m_conditionTemplates[i].m_internalName);
 	}
 
@@ -5268,7 +5254,7 @@ void ScriptEngine::init( void )
 
 	reset();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -5276,11 +5262,11 @@ void ScriptEngine::init( void )
 void ScriptEngine::reset( void )
 {
 	// setting FPS limit in case a script had changed it
-	if (TheGameEngine && TheGlobalData)
-		TheGameEngine->setFramesPerSecondLimit(TheGlobalData->m_framesPerSecondLimit);
+	if (TheFramePacer && TheGlobalData)
+		TheFramePacer->setFramesPerSecondLimit(TheGlobalData->m_framesPerSecondLimit);
 
 	if (TheScriptActions) {
-		TheScriptActions->reset();	 
+		TheScriptActions->reset();
 	}
 	if (TheScriptConditions) {
 		TheScriptConditions->reset();
@@ -5328,9 +5314,10 @@ void ScriptEngine::reset( void )
 #ifdef SPECIAL_SCRIPT_PROFILING
 #ifdef DEBUG_LOGGING
 	if (m_numFrames > 1) {
-		DEBUG_LOG(("\n***SCRIPT ENGINE STATS %.0f frames:\n", m_numFrames));
-		DEBUG_LOG(("Avg time to update %.3f milisec\n", 1000*m_totalUpdateTime/m_numFrames));
-		DEBUG_LOG(("  Max time to update %.3f miliseconds.\n", m_maxUpdateTime*1000));
+		DEBUG_LOG_RAW(("\n"));
+		DEBUG_LOG(("***SCRIPT ENGINE STATS %.0f frames:", m_numFrames));
+		DEBUG_LOG(("Avg time to update %.3f milisec", 1000*m_totalUpdateTime/m_numFrames));
+		DEBUG_LOG(("  Max time to update %.3f miliseconds.", m_maxUpdateTime*1000));
 	}
 	m_numFrames=0;
 	m_totalUpdateTime=0;
@@ -5364,24 +5351,32 @@ void ScriptEngine::reset( void )
 				}
 			}
 			if (maxScript) {
-				DEBUG_LOG(("   SCRIPT %s total time %f seconds,\n        evaluated %d times, avg execution %2.3f msec (Goal less than 0.05)\n",
+				DEBUG_LOG(("   SCRIPT %s total time %f seconds,\n        evaluated %d times, avg execution %2.3f msec (Goal less than 0.05)",
 					maxScript->getName().str(),
 					maxScript->getConditionTime(), maxScript->getConditionCount(), 1000*maxScript->getConditionTime()/maxScript->getConditionCount()) );
 				maxScript->addToConditionTime(-2*maxTime); // reset to negative.
 			}
 
 		}
-		DEBUG_LOG(("***\n"));
+		DEBUG_LOG(("***"));
 	}
 #endif
 #endif
 
 	_updateCurrentParticleCap();
 
-	VecSequentialScriptPtrIt seqScriptIt;
-	for (seqScriptIt = m_sequentialScripts.begin(); seqScriptIt != m_sequentialScripts.end(); ) {
-		cleanupSequentialScript(seqScriptIt, TRUE);
+	// delete and clear all sequential scripts.
+	VecSequentialScriptPtrIt seqScriptIt = m_sequentialScripts.begin();
+	while (seqScriptIt != m_sequentialScripts.end()) {
+		SequentialScript* seqScript = *seqScriptIt;
+		while (seqScript != NULL) {
+			SequentialScript* scriptToDelete = seqScript;
+			seqScript = seqScript->m_nextScriptInSequence;
+			deleteInstance(scriptToDelete);
+		}
+		++seqScriptIt;
 	}
+	m_sequentialScripts.clear();
 
 	// clear out all the lists of object types that were in the old map.
 	for (AllObjectTypesIt it = m_allObjectTypeLists.begin(); it != m_allObjectTypeLists.end(); it = m_allObjectTypeLists.begin() ) {
@@ -5391,11 +5386,11 @@ void ScriptEngine::reset( void )
 			m_allObjectTypeLists.erase(it);
 		}
 	}
-	DEBUG_ASSERTCRASH( m_allObjectTypeLists.empty() == TRUE, ("ScriptEngine::reset - m_allObjectTypeLists should be empty but is not!\n") );
+	DEBUG_ASSERTCRASH( m_allObjectTypeLists.empty() == TRUE, ("ScriptEngine::reset - m_allObjectTypeLists should be empty but is not!") );
 
 	// reset all the reveals that have taken place.
 	m_namedReveals.clear();
-	
+
 	// Clear the named objects list.
  	m_namedObjects.clear();
 
@@ -5424,8 +5419,8 @@ void ScriptEngine::reset( void )
 
 	// clear topple directions
 	m_toppleDirections.clear();
-		
-}  // end reset
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** newMap */
@@ -5482,7 +5477,7 @@ void ScriptEngine::newMap( void )
 				checkConditionsForTeamNames(pScr);
 			}
 		}
-	}	
+	}
 	m_firstUpdate = true;
 
 	m_fade = FADE_MULTIPLY; //default to a fade in from black.
@@ -5494,7 +5489,7 @@ void ScriptEngine::newMap( void )
 	m_fadeFramesDecrease = FRAMES_TO_FADE_IN_AT_START;
 	m_curFadeValue = 0.0f;
 
-}  // end newMap
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -5515,9 +5510,9 @@ void ScriptEngine::update( void )
 		AsciiString name = it->first;
 		Object * obj = it->second;
 		if (obj && obj->getAIUpdateInterface())
-			DEBUG_LOG(("%s=%x('%s'), isDead%d\n", name.str(), obj, obj->getName().str(), obj->getAIUpdateInterface()->isDead()));
+			DEBUG_LOG(("%s=%x('%s'), isDead%d", name.str(), obj, obj->getName().str(), obj->getAIUpdateInterface()->isDead()));
 	}
-	DEBUG_LOG(("\n\n"));
+	DEBUG_LOG(("\n"));
 */
 #endif
 #endif
@@ -5528,7 +5523,7 @@ void ScriptEngine::update( void )
 	} else {
 		particleEditorUpdate();
 	}
-	
+
 	if (m_closeWindowTimer>0) {
 		m_closeWindowTimer--;
 		if (m_closeWindowTimer < 1) {
@@ -5538,8 +5533,7 @@ void ScriptEngine::update( void )
 	if (m_endGameTimer>0) {
 		m_endGameTimer--;
 		if (m_endGameTimer < 1) {
-			// clear out all the game data
-			/*GameMessage *msg =*/ TheMessageStream->appendMessage( GameMessage::MSG_CLEAR_GAME_DATA );
+			TheGameLogic->exitGame();
 			//TheScriptActions->closeWindows(FALSE); // Close victory or defeat windows.
 		}
 	}
@@ -5550,13 +5544,13 @@ void ScriptEngine::update( void )
 	}
 
 	if (m_fade!=FADE_NONE) {
-		updateFades(); 
+		updateFades();
 	}
 
 	if (m_endGameTimer>=0) {
-		return; // we are just timing down 
+		return; // we are just timing down
 	}
-	
+
 	if (TheScriptActions) {
 		TheScriptActions->update();
 	}
@@ -5593,8 +5587,8 @@ void ScriptEngine::update( void )
 		}
 		m_currentPlayer = NULL;
 	}
-	
-	// Reset the entered/exited flag in teams, so the next update sets them 
+
+	// Reset the entered/exited flag in teams, so the next update sets them
 	// correctly.  Also, execute any team created scripts.
 	ThePlayerList->updateTeamStates();
 
@@ -5606,7 +5600,7 @@ void ScriptEngine::update( void )
 
 	// Script debugger stuff
 	st_CurrentFrame++;
-	if (st_DebugDLL) { 
+	if (st_DebugDLL) {
 		for (int j = 1; j < m_numCounters; ++j) {
 			_adjustVariable(m_counters[j].name.str(), m_counters[j].value);
 		}
@@ -5633,12 +5627,12 @@ void ScriptEngine::update( void )
 	m_curUpdateTime = timeToUpdate;
 #endif
 #endif
-	
+
 #ifdef DO_VTUNE_STUFF
 	_updateVTune();
 #endif
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** getStats */
@@ -5696,7 +5690,7 @@ AsciiString ScriptEngine::getStats(Real *curTimePtr, Real *script1Time, Real *sc
 #endif
 #endif
 	return msg;
-}  // end getStats
+}
 
 //-------------------------------------------------------------------------------------------------
 /** startQuickEndGameTimer */
@@ -5704,7 +5698,7 @@ AsciiString ScriptEngine::getStats(Real *curTimePtr, Real *script1Time, Real *sc
 void ScriptEngine::startQuickEndGameTimer( void )
 {
 	m_endGameTimer = 1;
-}  // end startQuickEndGameTimer
+}
 
 //-------------------------------------------------------------------------------------------------
 /** startEndGameTimer */
@@ -5712,7 +5706,7 @@ void ScriptEngine::startQuickEndGameTimer( void )
 void ScriptEngine::startEndGameTimer( void )
 {
 	m_endGameTimer = FRAMES_TO_SHOW_WIN_LOSE_MESSAGE;
-}  // end startEndGameTimer
+}
 
 //-------------------------------------------------------------------------------------------------
 /** startCloseWindowTimer */
@@ -5720,7 +5714,7 @@ void ScriptEngine::startEndGameTimer( void )
 void ScriptEngine::startCloseWindowTimer( void )
 {
 	m_closeWindowTimer = FRAMES_TO_SHOW_WIN_LOSE_MESSAGE;
-}  // end startCloseWindowTimer
+}
 
 //-------------------------------------------------------------------------------------------------
 /** updateFades */
@@ -5734,7 +5728,7 @@ void ScriptEngine::updateFades( void )
 		factor = (Real)m_curFadeFrame/m_fadeFramesIncrease;
 		m_curFadeValue = m_minFade + factor*(m_maxFade-m_minFade);
 		return;
-	}	
+	}
 	fade -= m_fadeFramesIncrease;
 	if (fade<=m_fadeFramesHold) {
 		m_curFadeValue = m_maxFade;
@@ -5747,10 +5741,10 @@ void ScriptEngine::updateFades( void )
 		factor = (Real)fade/divisor;
 		m_curFadeValue = m_maxFade + factor*(m_minFade-m_maxFade);
 		return;
-	}	
+	}
 	// time is up.
 	m_fade = FADE_NONE;
-}  // end updateFades
+}
 
 //-------------------------------------------------------------------------------------------------
 /** getCurrentPlayer */
@@ -5760,7 +5754,7 @@ Player *ScriptEngine::getCurrentPlayer(void)
 	if (m_currentPlayer==NULL)
 		AppendDebugMessage("***Unexpected NULL player:***", false);
 	return m_currentPlayer;
-}  // end getCurrentPlayer
+}
 
 //-------------------------------------------------------------------------------------------------
 /** clearFlag */
@@ -5779,7 +5773,7 @@ void ScriptEngine::clearFlag(const AsciiString &name)
 			}
 		}
 	}
-}  // end clearFlag
+}
 
 //-------------------------------------------------------------------------------------------------
 /** clearTeamFlags */
@@ -5795,7 +5789,7 @@ void ScriptEngine::clearTeamFlags(void)
 	clearFlag("GLA Team is Building");
 	clearFlag("GLA Inf Team is Building");
 
-}  // end clearTeamFlags
+}
 
 //-------------------------------------------------------------------------------------------------
 /** getSkirmishEnemyPlayer */
@@ -5814,7 +5808,7 @@ Player *ScriptEngine::getSkirmishEnemyPlayer(void)
 					if (is_GeneralsChallengeContext && enemy->getPlayerNameKey() == NAMEKEY(THE_PLAYER)) {
 						continue; // In generals challenge, ThePlayer is a dummy player. jba. [8/15/2003]
 					}
-					
+
 					return enemy;
 				}
 				enemy = NULL;
@@ -5848,7 +5842,7 @@ Player *ScriptEngine::getPlayerFromAsciiString(const AsciiString& playerString)
 			return pPlayer;
 		}
 	}
-	
+
 	AppendDebugMessage("***Invalid Player name:***", false);
 
 	return NULL;
@@ -5883,7 +5877,7 @@ ObjectTypes *ScriptEngine::getObjectTypes(const AsciiString& objectTypeList)
 void ScriptEngine::doObjectTypeListMaintenance(const AsciiString& objectTypeList, const AsciiString& objectType, Bool addObject)
 {
 	ObjectTypes *currentObjectTypeVec = getObjectTypes(objectTypeList);
-	
+
 	if (!currentObjectTypeVec) {
 		ObjectTypes *newVec = newInstance(ObjectTypes)(objectTypeList);
 		m_allObjectTypeLists.push_back(newVec);
@@ -5891,7 +5885,7 @@ void ScriptEngine::doObjectTypeListMaintenance(const AsciiString& objectTypeList
 	}
 
 	if (addObject) {
-		currentObjectTypeVec->addObjectType(objectType);	
+		currentObjectTypeVec->addObjectType(objectType);
 	} else {
 		currentObjectTypeVec->removeObjectType(objectType);
 	}
@@ -5899,7 +5893,7 @@ void ScriptEngine::doObjectTypeListMaintenance(const AsciiString& objectTypeList
 	// Remove it. Its dead Jim.
 	if (currentObjectTypeVec->getListSize() == 0) {
 		removeObjectTypes(currentObjectTypeVec);
-		
+
 		// Semantic emphasis
 		currentObjectTypeVec = NULL;
 	}
@@ -5962,7 +5956,7 @@ Team * ScriptEngine::getTeamNamed(const AsciiString& teamName)
 		// However, they've also built many of their single player maps with this string, where "teamThePlayer" is not intended as an alias.
 		return ThePlayerList->getLocalPlayer()->getDefaultTeam();
 	if (teamName == THIS_TEAM) {
-		if (m_callingTeam) 
+		if (m_callingTeam)
 			return m_callingTeam;
 		return m_conditionTeam;
 	}
@@ -5981,7 +5975,7 @@ Team * ScriptEngine::getTeamNamed(const AsciiString& teamName)
 		}
 		return NULL; // team wasn't active.
 	}
-	
+
 	static int warnCount = 0;
 	if (theTeamProto->countTeamInstances()>1) {
 		if (warnCount<10) {
@@ -5991,7 +5985,7 @@ Team * ScriptEngine::getTeamNamed(const AsciiString& teamName)
 		}
 	}
 	return theTeamProto->getFirstItemIn_TeamInstanceList();
-}  // end getTeamNamed
+}
 
 //-------------------------------------------------------------------------------------------------
 /** getUnitNamed */
@@ -6037,7 +6031,7 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team *pThisTeam)
 	if (scriptName==NONE_STRING) {
 		return; // no script
 	}
-	
+
 
 	Player *savPlayer = m_currentPlayer;
 //	Team *pSavConditionTeam = m_conditionTeam;
@@ -6058,7 +6052,7 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team *pThisTeam)
 		}	else {
 				AppendDebugMessage("***Attempting to call script that is not a subroutine:***", false);
 				AppendDebugMessage(scriptName, false);
-				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.\n", scriptName.str()));
+				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.", scriptName.str()));
 		}
 	}	else {
 		pScript = findScript(scriptName);
@@ -6068,18 +6062,18 @@ void ScriptEngine::runScript(const AsciiString& scriptName, Team *pThisTeam)
 			} else {
 				AppendDebugMessage("***Attempting to call script that is not a subroutine:***", false);
 				AppendDebugMessage(scriptName, false);
-				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.\n", scriptName.str()));
+				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.", scriptName.str()));
 			}
 		} else {
 			AppendDebugMessage("***Script not defined:***", false);
 			AppendDebugMessage(scriptName, false);
-			DEBUG_LOG(("WARNING: Script '%s' not defined.\n", scriptName.str()));
+			DEBUG_LOG(("WARNING: Script '%s' not defined.", scriptName.str()));
 		}
 	}
 	// m_callingTeam is restored automatically via LatchRestore
 	m_conditionTeam = m_conditionTeam;
 	m_currentPlayer = savPlayer;
-}  // end runScript
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -6105,7 +6099,7 @@ void ScriptEngine::runObjectScript(const AsciiString& scriptName, Object *pThisO
 		}	else {
 				AppendDebugMessage("***Attempting to call script that is not a subroutine:***", false);
 				AppendDebugMessage(scriptName, false);
-				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.\n", scriptName.str()));
+				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.", scriptName.str()));
 		}
 	}	else {
 		pScript = findScript(scriptName);
@@ -6115,16 +6109,16 @@ void ScriptEngine::runObjectScript(const AsciiString& scriptName, Object *pThisO
 			} else {
 				AppendDebugMessage("***Attempting to call script that is not a subroutine:***", false);
 				AppendDebugMessage(scriptName, false);
-				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.\n", scriptName.str()));
+				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.", scriptName.str()));
 			}
 		} else {
 			AppendDebugMessage("***Script not defined:***", false);
 			AppendDebugMessage(scriptName, false);
-			DEBUG_LOG(("WARNING: Script '%s' not defined.\n", scriptName.str()));
+			DEBUG_LOG(("WARNING: Script '%s' not defined.", scriptName.str()));
 		}
 	}
 	m_callingObject = pSavCallingObject;
-}  // end runScript
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -6139,7 +6133,7 @@ Int ScriptEngine::allocateCounter( const AsciiString& name)
 			return i;
 		}
 	}
-	DEBUG_ASSERTCRASH(m_numCounters<MAX_COUNTERS, ("Too many counters, failed to make '%s'.\n", name.str()));
+	DEBUG_ASSERTCRASH(m_numCounters<MAX_COUNTERS, ("Too many counters, failed to make '%s'.", name.str()));
 	if (m_numCounters < MAX_COUNTERS) {
 		m_counters[m_numCounters].name = name;
 		i = m_numCounters;
@@ -6173,7 +6167,7 @@ void ScriptEngine::createNamedMapReveal(const AsciiString& revealName, const Asc
 	// Will fail if there's already one in existence of the same name.
 	for (it = m_namedReveals.begin(); it != m_namedReveals.end(); ++it) {
 		if (it->m_revealName == revealName) {
-			DEBUG_CRASH(("ScriptEngine::createNamedMapReveal: Attempted to redefine named Reveal '%s', so I won't change it.\n", revealName.str()));
+			DEBUG_CRASH(("ScriptEngine::createNamedMapReveal: Attempted to redefine named Reveal '%s', so I won't change it.", revealName.str()));
 			return;
 		}
 	}
@@ -6256,7 +6250,7 @@ void ScriptEngine::undoNamedMapReveal(const AsciiString& revealName)
 void ScriptEngine::removeNamedMapReveal(const AsciiString& revealName)
 {
 	VecNamedRevealIt it;
-	
+
 	for (it = m_namedReveals.begin(); it != m_namedReveals.end(); ++it) {
 		if (it->m_revealName == revealName) {
 			m_namedReveals.erase(it);
@@ -6277,7 +6271,7 @@ Int ScriptEngine::allocateFlag( const AsciiString& name)
 			return i;
 		}
 	}
-	DEBUG_ASSERTCRASH(m_numFlags < MAX_FLAGS, ("Too many flags, failed to make '%s'..\n", name.str()));
+	DEBUG_ASSERTCRASH(m_numFlags < MAX_FLAGS, ("Too many flags, failed to make '%s'..", name.str()));
 	if (m_numFlags < MAX_FLAGS) {
 		m_flags[m_numFlags].name = name;
 		i = m_numFlags;
@@ -6338,8 +6332,8 @@ Script  *ScriptEngine::findScript(const AsciiString& name)
 //-------------------------------------------------------------------------------------------------
 Bool ScriptEngine::evaluateCounter( Condition *pCondition )
 {
-	DEBUG_ASSERTCRASH(pCondition->getNumParameters() >= 3, ("Not enough parameters.\n"));
-	DEBUG_ASSERTCRASH(pCondition->getConditionType() == Condition::COUNTER, ("Wrong condition.\n"));
+	DEBUG_ASSERTCRASH(pCondition->getNumParameters() >= 3, ("Not enough parameters."));
+	DEBUG_ASSERTCRASH(pCondition->getConditionType() == Condition::COUNTER, ("Wrong condition."));
 	Int counterNdx = pCondition->getParameter(0)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pCondition->getParameter(0)->getString());
@@ -6362,7 +6356,7 @@ Bool ScriptEngine::evaluateCounter( Condition *pCondition )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setCounter( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	Int counterNdx = pAction->getParameter(0)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pAction->getParameter(0)->getString());
@@ -6377,7 +6371,7 @@ void ScriptEngine::setCounter( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setFade( ScriptAction *pAction )
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData->m_disableCameraFade)
 	{
 		m_fade = FADE_NONE;
@@ -6385,7 +6379,7 @@ void ScriptEngine::setFade( ScriptAction *pAction )
 	}
 #endif
 
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 5, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 5, ("Not enough parameters."));
 	switch (pAction->getActionType()) {
 		default:	m_fade = FADE_NONE; return;
 		case ScriptAction::CAMERA_FADE_ADD: m_fade = FADE_ADD; break;
@@ -6411,7 +6405,7 @@ void ScriptEngine::setFade( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setSway( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 5, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 5, ("Not enough parameters."));
 	++m_breezeInfo.m_breezeVersion;
 	m_breezeInfo.m_direction = pAction->getParameter(0)->getReal();
 	m_breezeInfo.m_directionVec.x = Sin(m_breezeInfo.m_direction);
@@ -6419,7 +6413,7 @@ void ScriptEngine::setSway( ScriptAction *pAction )
 	m_breezeInfo.m_intensity = pAction->getParameter(1)->getReal();
 	m_breezeInfo.m_lean = pAction->getParameter(2)->getReal();
 	m_breezeInfo.m_breezePeriod = pAction->getParameter(3)->getInt();
-	if (m_breezeInfo.m_breezePeriod<1) 
+	if (m_breezeInfo.m_breezePeriod<1)
 		m_breezeInfo.m_breezePeriod = 1;
 	m_breezeInfo.m_randomness = pAction->getParameter(4)->getReal();
 
@@ -6430,7 +6424,7 @@ void ScriptEngine::setSway( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::addCounter( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	Int value = pAction->getParameter(0)->getInt();
 	Int counterNdx = pAction->getParameter(1)->getInt();
 	if (counterNdx == 0) {
@@ -6445,7 +6439,7 @@ void ScriptEngine::addCounter( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::subCounter( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	Int value = pAction->getParameter(0)->getInt();
 	Int counterNdx = pAction->getParameter(1)->getInt();
 	if (counterNdx == 0) {
@@ -6460,8 +6454,8 @@ void ScriptEngine::subCounter( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 Bool ScriptEngine::evaluateFlag( Condition *pCondition )
 {
-	DEBUG_ASSERTCRASH(pCondition->getNumParameters() >= 2, ("Not enough parameters.\n"));
-	DEBUG_ASSERTCRASH(pCondition->getConditionType() == Condition::FLAG, ("Wrong condition.\n"));
+	DEBUG_ASSERTCRASH(pCondition->getNumParameters() >= 2, ("Not enough parameters."));
+	DEBUG_ASSERTCRASH(pCondition->getConditionType() == Condition::FLAG, ("Wrong condition."));
 	Int flagNdx = pCondition->getParameter(0)->getInt();
 	if (flagNdx == 0) {
 		flagNdx = allocateFlag(pCondition->getParameter(0)->getString());
@@ -6470,7 +6464,7 @@ Bool ScriptEngine::evaluateFlag( Condition *pCondition )
 	Int value = pCondition->getParameter(1)->getInt();
 	Bool boolVal = (value!=0);
 	Bool boolFlag = (m_flags[flagNdx].value != 0);
-	
+
 	if (boolVal == boolFlag) {
 		return true;
 	}
@@ -6489,7 +6483,7 @@ Bool ScriptEngine::evaluateFlag( Condition *pCondition )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setFlag( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	Int flagNdx = pAction->getParameter(0)->getInt();
 	if (flagNdx == 0) {
 		flagNdx = allocateFlag(pAction->getParameter(0)->getString());
@@ -6532,7 +6526,7 @@ const AttackPriorityInfo *ScriptEngine::getDefaultAttackInfo(void)
 }
 
 //-------------------------------------------------------------------------------------------------
-/** Returns the named attack info, if non-existent returns default attack priority info.  
+/** Returns the named attack info, if non-existent returns default attack priority info.
 		Never returns null. */
 //-------------------------------------------------------------------------------------------------
 const AttackPriorityInfo *ScriptEngine::getAttackInfo(const AsciiString& name)
@@ -6552,13 +6546,13 @@ const AttackPriorityInfo *ScriptEngine::getAttackInfo(const AsciiString& name)
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setPriorityThing( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 3, ("Not enough parameters.\n"));
-	
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 3, ("Not enough parameters."));
+
 	AsciiString typeArgument = pAction->getParameter(1)->getString();
 
 	// Our argument could be an individual type, or a list name.
-	const ObjectTypes *types = TheScriptEngine->getObjectTypes(typeArgument);
-	if( !types ) 
+	const ObjectTypes *types = getObjectTypes(typeArgument);
+	if( !types )
 	{
 		// Lookup failed, so it is just a single type
 
@@ -6588,7 +6582,7 @@ void ScriptEngine::setPriorityThing( ScriptAction *pAction )
 
 		return;
 	}
-	else 
+	else
 	{
 		// Found a list by this name, so we have a bunch of things
 
@@ -6628,7 +6622,7 @@ void ScriptEngine::setPriorityThing( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setPriorityKind( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 3, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 3, ("Not enough parameters."));
 	AttackPriorityInfo *info = findAttackInfo(pAction->getParameter(0)->getString(), true);
 	if (info==NULL) {
 		AppendDebugMessage("***Error allocating attack priority set - fix or raise limit. ***", false);
@@ -6652,7 +6646,7 @@ void ScriptEngine::setPriorityKind( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setPriorityDefault( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	AttackPriorityInfo *info = findAttackInfo(pAction->getParameter(0)->getString(), true);
 	if (info==NULL) {
 		AppendDebugMessage("***Error allocating attack priority set - fix or raise limit. ***", false);
@@ -6683,7 +6677,7 @@ Int ScriptEngine::getObjectCount(Int playerIndex, const AsciiString& objectTypeN
 void ScriptEngine::setObjectCount(Int playerIndex, const AsciiString& objectTypeName, Int newCount)
 {
 	// Don't really need inactive player checks here.
-	
+
 	ObjectTypeCount &ocm = m_objectCounts[playerIndex];
 	ocm[objectTypeName] = newCount;
 }
@@ -6717,8 +6711,8 @@ void ScriptEngine::removeObjectTypes(ObjectTypes *typesToRemove)
 //-------------------------------------------------------------------------------------------------
 Bool ScriptEngine::evaluateTimer( Condition *pCondition )
 {
-	DEBUG_ASSERTCRASH(pCondition->getNumParameters() >= 1, ("Not enough parameters.\n"));
-	DEBUG_ASSERTCRASH(pCondition->getConditionType() == Condition::TIMER_EXPIRED, ("Wrong condition.\n"));
+	DEBUG_ASSERTCRASH(pCondition->getNumParameters() >= 1, ("Not enough parameters."));
+	DEBUG_ASSERTCRASH(pCondition->getConditionType() == Condition::TIMER_EXPIRED, ("Wrong condition."));
 	Int counterNdx = pCondition->getParameter(0)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pCondition->getParameter(0)->getString());
@@ -6737,7 +6731,7 @@ Bool ScriptEngine::evaluateTimer( Condition *pCondition )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::setTimer( ScriptAction *pAction, Bool millisecondTimer, Bool random )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	Int counterNdx = pAction->getParameter(0)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pAction->getParameter(0)->getString());
@@ -6766,7 +6760,7 @@ void ScriptEngine::setTimer( ScriptAction *pAction, Bool millisecondTimer, Bool
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::pauseTimer( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters."));
 	Int counterNdx = pAction->getParameter(0)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pAction->getParameter(0)->getString());
@@ -6780,7 +6774,7 @@ void ScriptEngine::pauseTimer( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::restartTimer( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters."));
 	Int counterNdx = pAction->getParameter(0)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pAction->getParameter(0)->getString());
@@ -6796,7 +6790,7 @@ void ScriptEngine::restartTimer( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::adjustTimer( ScriptAction *pAction, Bool millisecondTimer, Bool add)
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 2, ("Not enough parameters."));
 	Int counterNdx = pAction->getParameter(1)->getInt();
 	if (counterNdx == 0) {
 		counterNdx = allocateCounter(pAction->getParameter(1)->getString());
@@ -6820,7 +6814,7 @@ void ScriptEngine::adjustTimer( ScriptAction *pAction, Bool millisecondTimer, Bo
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::enableScript( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters."));
 	ScriptGroup *pGroup = findGroup(pAction->getParameter(0)->getString());
 	if (pGroup) {
 		pGroup->setActive(true);
@@ -6836,7 +6830,7 @@ void ScriptEngine::enableScript( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::disableScript( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters."));
 	Script *pScript = findScript(pAction->getParameter(0)->getString());
 	if (pScript) {
 		pScript->setActive(false);
@@ -6852,7 +6846,7 @@ void ScriptEngine::disableScript( ScriptAction *pAction )
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::callSubroutine( ScriptAction *pAction )
 {
-	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters.\n"));
+	DEBUG_ASSERTCRASH(pAction->getNumParameters() >= 1, ("Not enough parameters."));
 	AsciiString scriptName = pAction->getParameter(0)->getString();
 	Script  *pScript;
 	ScriptGroup *pGroup = findGroup(scriptName);
@@ -6864,7 +6858,7 @@ void ScriptEngine::callSubroutine( ScriptAction *pAction )
 		}	else {
 				AppendDebugMessage("***Attempting to call script that is not a subroutine:***", false);
 				AppendDebugMessage(scriptName, false);
-				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.\n", scriptName.str()));
+				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.", scriptName.str()));
 		}
 	}	else {
 		pScript = findScript(scriptName);
@@ -6874,12 +6868,12 @@ void ScriptEngine::callSubroutine( ScriptAction *pAction )
 			} else {
 				AppendDebugMessage("***Attempting to call script that is not a subroutine:***", false);
 				AppendDebugMessage(scriptName, false);
-				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.\n", scriptName.str()));
+				DEBUG_LOG(("Attempting to call script '%s' that is not a subroutine.", scriptName.str()));
 			}
 		} else {
 			AppendDebugMessage("***Script not defined:***", false);
 			AppendDebugMessage(scriptName, false);
-			DEBUG_LOG(("WARNING: Script '%s' not defined.\n", scriptName.str()));
+			DEBUG_LOG(("WARNING: Script '%s' not defined.", scriptName.str()));
 		}
 	}
 }
@@ -6926,7 +6920,7 @@ void ScriptEngine::checkConditionsForTeamNames(Script *pScript)
 							AppendDebugMessage(scriptName, false);
 							AppendDebugMessage(multiTeamName, false);
 							AppendDebugMessage(teamName, false);
-							DEBUG_LOG(("WARNING: Script '%s' contains multiple non-singleton team conditions: %s & %s.\n", scriptName.str(), 
+							DEBUG_LOG(("WARNING: Script '%s' contains multiple non-singleton team conditions: %s & %s.", scriptName.str(),
 								multiTeamName.str(), teamName.str()));
 						}
 					}
@@ -6938,7 +6932,7 @@ void ScriptEngine::checkConditionsForTeamNames(Script *pScript)
 		if (!singletonTeamName.isEmpty()) {
 			pScript->setConditionTeamName(singletonTeamName);
 		}
-  } else { 
+  } else {
 		pScript->setConditionTeamName(multiTeamName);
 	}
 
@@ -6992,7 +6986,7 @@ void ScriptEngine::executeScript( Script *pScript )
 	}
 
 	if (pProto && pProto->countTeamInstances() > 0) {
-		// We have a team referred to in the conditions.  Iterate over the instances of the team, 
+		// We have a team referred to in the conditions.  Iterate over the instances of the team,
 		// applying the script conditions (and possibly actions) to each instance of the team.
 		for (DLINK_ITERATOR<Team> iter = pProto->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			m_conditionTeam = iter.cur();
@@ -7003,7 +6997,7 @@ void ScriptEngine::executeScript( Script *pScript )
 					_appendMessage(pScript->getName());
 					executeActions(pScript->getAction());
 				}
-				
+
 				if (pScript->isOneShot()) {
 					pScript->setActive(false);
 				}
@@ -7014,7 +7008,7 @@ void ScriptEngine::executeScript( Script *pScript )
 
 				// Only do this is there are actually false actions.
 				executeActions(pScript->getFalseAction());
-      } 
+      }
 		}
 
 	} else {
@@ -7059,7 +7053,7 @@ void ScriptEngine::executeScript( Script *pScript )
 Bool ScriptEngine::evaluateCondition( Condition *pCondition )
 {
 	switch (pCondition->getConditionType()) {
-		default: 
+		default:
 			return TheScriptConditions->evaluateCondition(pCondition);
 		case Condition::CONDITION_FALSE: return false;
 		case Condition::CONDITION_TRUE: return true;
@@ -7105,15 +7099,15 @@ void ScriptEngine::addObjectToCache(Object* pNewObject)
 		if (it->first == objName) {
 			if (it->second == NULL) {
 				AsciiString newNameForDead;
-				newNameForDead.format("Reassigning dead object's name '%s' to object (%d) of type '%s'\n", objName.str(), pNewObject->getID(), pNewObject->getTemplate()->getName().str());
-				TheScriptEngine->AppendDebugMessage(newNameForDead, FALSE);
+				newNameForDead.format("Reassigning dead object's name '%s' to object (%d) of type '%s'", objName.str(), pNewObject->getID(), pNewObject->getTemplate()->getName().str());
+				AppendDebugMessage(newNameForDead, FALSE);
 				DEBUG_LOG((newNameForDead.str()));
 				it->second = pNewObject;
 				return;
 			} else {
-				DEBUG_CRASH(("Attempting to assign the name '%s' to object (%d) of type '%s'," 
-										 " but object (%d) of type '%s' already has that name\n",
-										 objName.str(), pNewObject->getID(), pNewObject->getTemplate()->getName().str(), 
+				DEBUG_CRASH(("Attempting to assign the name '%s' to object (%d) of type '%s',"
+										 " but object (%d) of type '%s' already has that name",
+										 objName.str(), pNewObject->getID(), pNewObject->getTemplate()->getName().str(),
 										 it->second->getID(), it->second->getTemplate()->getName().str()));
 				return;
 			}
@@ -7147,7 +7141,7 @@ void ScriptEngine::removeObjectFromCache( Object* pDeadObject )
 
 //-------------------------------------------------------------------------------------------------
 /** Kris:
-		Looks for existing cached object with same name and replaces that object point with the supplied one. 
+		Looks for existing cached object with same name and replaces that object point with the supplied one.
 		This is an important feature for units that change into something else. Good examples include terrorists
 		entering a vehicle to convert it to a carbomb, pilots adding veterancy to vehicles, hijackers stealing
 		vehicles, and infantry taking over disabled vehicles.
@@ -7161,9 +7155,9 @@ void ScriptEngine::transferObjectName( const AsciiString& unitName, Object *pNew
 		return;
 	}
 
-	//John Ahlquist: When transferring an object name, make sure the new object isn't already in 
+	//John Ahlquist: When transferring an object name, make sure the new object isn't already in
 	//							 the vector. If so, remove it, or it'll end up there twice and cause a crash.
-	if( pNewObject->getName().isNotEmpty() ) 
+	if( pNewObject->getName().isNotEmpty() )
 	{
 		removeObjectFromCache(pNewObject);
 	}
@@ -7198,7 +7192,7 @@ void ScriptEngine::transferObjectName( const AsciiString& unitName, Object *pNew
 //-------------------------------------------------------------------------------------------------
 void ScriptEngine::notifyOfObjectDestruction( Object *pDeadObject )
 {
-	if (!pDeadObject->getName().isEmpty()) 
+	if (!pDeadObject->getName().isEmpty())
 	{
 		removeObjectFromCache(pDeadObject);
 	}
@@ -7215,7 +7209,7 @@ void ScriptEngine::notifyOfObjectDestruction( Object *pDeadObject )
 //-------------------------------------------------------------------------------------------------
 /** Notify the script engine that a video has completed */
 //-------------------------------------------------------------------------------------------------
-void ScriptEngine::notifyOfCompletedVideo( const AsciiString& completedVideo ) 
+void ScriptEngine::notifyOfCompletedVideo( const AsciiString& completedVideo )
 {
 	m_completedVideo.push_back(completedVideo);
 }
@@ -7496,7 +7490,7 @@ Bool ScriptEngine::isScienceAcquired( Int playerIndex, ScienceType science, Bool
 	{
 		if (*it == science)
 		{
-			if (removeFromList) 
+			if (removeFromList)
 			{
 				specialList->erase(it);
 			}
@@ -7602,7 +7596,7 @@ Bool ScriptEngine::evaluateConditions( Script *pScript, Team *thisTeam, Player *
 	for (pCurCondition = pConditionHead; pCurCondition; pCurCondition = pCurCondition->getNextOrCondition()) {
 		Condition *pCondition = pCurCondition->getFirstAndCondition();
 		if (!pCondition) continue; // No conditions, so go to the next or.
-		Bool andTerm = true; 
+		Bool andTerm = true;
 		while (pCondition && andTerm) {
 			if (!evaluateCondition(pCondition)) {
 				andTerm = false;
@@ -7655,10 +7649,10 @@ void ScriptEngine::executeActions( ScriptAction *pActionHead )
 			case ScriptAction::CALL_SUBROUTINE: callSubroutine(pCurAction);break;
 
 			// Fade operations.
-			case ScriptAction::CAMERA_FADE_ADD : 
-			case ScriptAction::CAMERA_FADE_SUBTRACT : 
-			case ScriptAction::CAMERA_FADE_SATURATE : 
-			case ScriptAction::CAMERA_FADE_MULTIPLY : 
+			case ScriptAction::CAMERA_FADE_ADD :
+			case ScriptAction::CAMERA_FADE_SUBTRACT :
+			case ScriptAction::CAMERA_FADE_SATURATE :
+			case ScriptAction::CAMERA_FADE_MULTIPLY :
 				setFade(pCurAction); break;
 
 			// Attack priority set operations.
@@ -7670,7 +7664,7 @@ void ScriptEngine::executeActions( ScriptAction *pActionHead )
 		}
 	}
 }
-																		
+
 //-------------------------------------------------------------------------------------------------
 /** Execute a linked list of scripts */
 //-------------------------------------------------------------------------------------------------
@@ -7685,7 +7679,7 @@ void ScriptEngine::executeScripts( Script *pScriptHead )
 		}
 		executeScript(pCurScript);
 	}
-}  // end update
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -7693,23 +7687,23 @@ void ScriptEngine::executeScripts( Script *pScriptHead )
 //-------------------------------------------------------------------------------------------------
 const ActionTemplate * ScriptEngine::getActionTemplate( Int ndx )
 {
-	DEBUG_ASSERTCRASH(ndx >= 0 && ndx < ScriptAction::NUM_ITEMS, ("Out of range.\n"));
+	DEBUG_ASSERTCRASH(ndx >= 0 && ndx < ScriptAction::NUM_ITEMS, ("Out of range."));
 	if (ndx <0 || ndx >= ScriptAction::NUM_ITEMS) ndx = 0;
-	DEBUG_ASSERTCRASH (!m_actionTemplates[ndx].getName().isEmpty(), ("Need to initialize action enum=%d.\n", ndx));
-	
+	DEBUG_ASSERTCRASH (!m_actionTemplates[ndx].getName().isEmpty(), ("Need to initialize action enum=%d.", ndx));
+
 	return &m_actionTemplates[ndx];
-}  // end getActionTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Gets the ui and parameter template for a script condition */
 //-------------------------------------------------------------------------------------------------
 const ConditionTemplate * ScriptEngine::getConditionTemplate( Int ndx )
 {
-	DEBUG_ASSERTCRASH(ndx >= 0 && ndx < ScriptAction::NUM_ITEMS, ("Out of range.\n"));
+	DEBUG_ASSERTCRASH(ndx >= 0 && ndx < ScriptAction::NUM_ITEMS, ("Out of range."));
 	if (ndx <0 || ndx >= Condition::NUM_ITEMS) ndx = 0;
-	DEBUG_ASSERTCRASH (!m_conditionTemplates[ndx].getName().isEmpty(), ("Need to initialize Condition enum=%d.\n", ndx));
+	DEBUG_ASSERTCRASH (!m_conditionTemplates[ndx].getName().isEmpty(), ("Need to initialize Condition enum=%d.", ndx));
 	return &m_conditionTemplates[ndx];
-}  // end getConditionTemplate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Fills the named object cache initally. */
@@ -7737,7 +7731,7 @@ void ScriptEngine::createNamedCache( void )
 
 void ScriptEngine::appendSequentialScript(const SequentialScript *scriptToSequence)
 {
-	SequentialScript *newSequentialScript = newInstance( SequentialScript );	
+	SequentialScript *newSequentialScript = newInstance( SequentialScript );
 	(*newSequentialScript) = (*scriptToSequence);
 
 	// Must set this to NULL, as we don't want an infinite loop.
@@ -7745,7 +7739,7 @@ void ScriptEngine::appendSequentialScript(const SequentialScript *scriptToSequen
 
 	// reset the instruction pointer
 	newSequentialScript->m_currentInstruction = -1;
-	
+
 	VecSequentialScriptPtrIt it;
 	Bool found = false;
 	for (it = m_sequentialScripts.begin(); it != m_sequentialScripts.end(); ++it) {
@@ -7757,7 +7751,7 @@ void ScriptEngine::appendSequentialScript(const SequentialScript *scriptToSequen
 		if ((scriptToSequence->m_objectID && scriptToSequence->m_objectID == seqScript->m_objectID) ||
 				 (scriptToSequence->m_teamToExecOn && scriptToSequence->m_teamToExecOn == seqScript->m_teamToExecOn)) {
 			found = true;
-			while (seqScript->m_nextScriptInSequence) { 
+			while (seqScript->m_nextScriptInSequence) {
 				seqScript = seqScript->m_nextScriptInSequence;
 			}
 
@@ -7770,12 +7764,12 @@ void ScriptEngine::appendSequentialScript(const SequentialScript *scriptToSequen
 		m_sequentialScripts.push_back(newSequentialScript);
 	}
 
-	// do not delete either of these here. 
+	// do not delete either of these here.
 }
 
 void ScriptEngine::removeSequentialScript(SequentialScript *scriptToRemove)
 {
-	
+
 }
 
 void ScriptEngine::removeAllSequentialScripts(Object *obj)
@@ -7814,7 +7808,7 @@ void ScriptEngine::notifyOfObjectCreationOrDestruction(void)
 void ScriptEngine::notifyOfTeamDestruction(Team *teamDestroyed)
 {
 	if (!teamDestroyed) {
-		return;		
+		return;
 	}
 
 	VecSequentialScriptPtrIt it;
@@ -7823,7 +7817,7 @@ void ScriptEngine::notifyOfTeamDestruction(Team *teamDestroyed)
 		if (!seqScript) {
 			continue;
 		}
-		
+
 		if (seqScript->m_teamToExecOn == teamDestroyed) {
 			it = cleanupSequentialScript(it, TRUE);
 			continue;
@@ -7898,7 +7892,7 @@ void ScriptEngine::evaluateAndProgressAllSequentialScripts( void )
 		if (spinCount > MAX_SPIN_COUNT) {
 			SequentialScript *seqScript = (*it);
 			if (seqScript) {
-				DEBUG_LOG(("Sequential script %s appears to be in an infinite loop.\n", 
+				DEBUG_LOG(("Sequential script %s appears to be in an infinite loop.",
 					seqScript->m_scriptToExecuteSequentially->getName().str()));
 			}
 			++it;
@@ -7906,7 +7900,7 @@ void ScriptEngine::evaluateAndProgressAllSequentialScripts( void )
 		}
 
 		lastScript = (*it);
-		
+
 		itAdvanced = false;
 
 		SequentialScript *seqScript = (*it);
@@ -7933,16 +7927,20 @@ void ScriptEngine::evaluateAndProgressAllSequentialScripts( void )
 		}
 
 		AIUpdateInterface *ai = obj ? obj->getAIUpdateInterface() : NULL;
-		AIGroup *aigroup = (team ? TheAI->createGroup() : NULL);
+		AIGroupPtr aigroup = (team ? TheAI->createGroup() : NULL);
 		if (aigroup) {
+#if RETAIL_COMPATIBLE_AIGROUP
 			team->getTeamAsAIGroup(aigroup);
+#else
+			team->getTeamAsAIGroup(aigroup.Peek());
+#endif
 		}
 
 		if( ai || aigroup ) {
-			if (((ai && (ai->isIdle()) || (aigroup && aigroup->isIdle())) && 
+			if (((ai && (ai->isIdle()) || (aigroup && aigroup->isIdle())) &&
 				seqScript->m_framesToWait < 1) || (seqScript->m_framesToWait == 0)) {
-				
-				// We want to supress messages if we're repeatedly waiting for an event to occur, cause 
+
+				// We want to supress messages if we're repeatedly waiting for an event to occur, cause
 				// it KILLS our debug framerate.
 				Bool displayMessage = TRUE;
 
@@ -8006,7 +8004,7 @@ void ScriptEngine::evaluateAndProgressAllSequentialScripts( void )
 					}
 
 					action->setNextAction(nextAction);
-					
+
 					// Check to see if executing our action told us to wait. If so, skip to the next Sequential script
 					if (seqScript->m_dontAdvanceInstruction) {
 						++it;
@@ -8020,7 +8018,11 @@ void ScriptEngine::evaluateAndProgressAllSequentialScripts( void )
 					} else if (team) {
 						// attempt to rebuild the aigroup, as it probably expired during the action execution
 						aigroup = (team ? TheAI->createGroup() : NULL);
+#if RETAIL_COMPATIBLE_AIGROUP
 						team->getTeamAsAIGroup(aigroup);
+#else
+						team->getTeamAsAIGroup(aigroup.Peek());
+#endif
 					}
 
 					if (aigroup && aigroup->isIdle()) {
@@ -8069,7 +8071,7 @@ ScriptEngine::VecSequentialScriptPtrIt ScriptEngine::cleanupSequentialScript(Vec
 	SequentialScript *seqScript;
 	seqScript = (*it);
 	if (!seqScript) {
-		return it;				
+		return it;
 	}
 
 	SequentialScript *scriptToDelete = seqScript;
@@ -8125,9 +8127,9 @@ void ScriptEngine::setEnableVTune(Bool value)
 }
 
 //----SequentialScript-----------------------------------------------------------------------------
-SequentialScript::SequentialScript() : m_teamToExecOn(NULL), 
-																			 m_objectID(INVALID_ID), 
-																			 m_scriptToExecuteSequentially(NULL), 
+SequentialScript::SequentialScript() : m_teamToExecOn(NULL),
+																			 m_objectID(INVALID_ID),
+																			 m_scriptToExecuteSequentially(NULL),
 																			 m_currentInstruction(START_INSTRUCTION),
 																			 m_timesToLoop(0),
 																			 m_framesToWait(-1),
@@ -8142,7 +8144,7 @@ SequentialScript::SequentialScript() : m_teamToExecOn(NULL),
 void SequentialScript::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -8170,13 +8172,13 @@ void SequentialScript::xfer( Xfer *xfer )
 		if( teamID != TEAM_ID_INVALID && m_teamToExecOn == NULL )
 		{
 
-			DEBUG_CRASH(( "SequentialScript::xfer - Unable to find team by ID (#%d) for m_teamToExecOn\n", 
+			DEBUG_CRASH(( "SequentialScript::xfer - Unable to find team by ID (#%d) for m_teamToExecOn",
 										teamID ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// object id
 	xfer->xferObjectID( &m_objectID );
@@ -8190,7 +8192,7 @@ void SequentialScript::xfer( Xfer *xfer )
 		scriptName = m_scriptToExecuteSequentially->getName();
 		xfer->xferAsciiString( &scriptName );
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -8198,16 +8200,16 @@ void SequentialScript::xfer( Xfer *xfer )
 		xfer->xferAsciiString( &scriptName );
 
 		// script pointer
-		DEBUG_ASSERTCRASH( m_scriptToExecuteSequentially == NULL, ("SequentialScript::xfer - m_scripttoExecuteSequentially\n") );
-			
+		DEBUG_ASSERTCRASH( m_scriptToExecuteSequentially == NULL, ("SequentialScript::xfer - m_scripttoExecuteSequentially") );
+
 		// find script
 		m_scriptToExecuteSequentially = const_cast<Script*>(TheScriptEngine->findScriptByName(scriptName));
 
-		// sanity	
+		// sanity
 		DEBUG_ASSERTCRASH( m_scriptToExecuteSequentially != NULL,
-											 ("SequentialScript::xfer - m_scriptToExecuteSequentially is NULL but should not be\n") );
+											 ("SequentialScript::xfer - m_scriptToExecuteSequentially is NULL but should not be") );
 
-	}  // end else, load
+	}
 
 	// current instruction
 	xfer->xferInt( &m_currentInstruction );
@@ -8220,8 +8222,8 @@ void SequentialScript::xfer( Xfer *xfer )
 
 	// dont advance instruction
 	xfer->xferBool( &m_dontAdvanceInstruction );
-	
-}  // end xfer
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -8229,7 +8231,7 @@ void SequentialScript::xfer( Xfer *xfer )
 void SequentialScript::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 #ifdef NOT_IN_USE
 //----SequentialScriptStatus Stuff ----------------------------------------------------------------
@@ -8239,7 +8241,7 @@ void SequentialScript::loadPostProcess( void )
 void SequentialScriptStatus::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -8263,7 +8265,7 @@ void SequentialScriptStatus::xfer( Xfer *xfer )
 	// is executing sequentially
 	xfer->xferBool( &m_isExecutingSequentially );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 // Load post process */
@@ -8271,7 +8273,7 @@ void SequentialScriptStatus::xfer( Xfer *xfer )
 void SequentialScriptStatus::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 #endif
 
 //----Particle Editor Stuff------------------------------------------------------------------------
@@ -8285,7 +8287,7 @@ void ScriptEngine::particleEditorUpdate( void )
 	}
 
 	_updateCurrentParticleCount();
-	
+
 	Bool busyWait = false;
 	do {
 		if (m_firstUpdate) {
@@ -8293,7 +8295,7 @@ void ScriptEngine::particleEditorUpdate( void )
 			_appendAllThingTemplates();
 		} else {
 			switch (_getEditorBehavior())
-			{			
+			{
 				case 0x00:
 				{
 					busyWait = false;
@@ -8307,7 +8309,7 @@ void ScriptEngine::particleEditorUpdate( void )
 					busyWait = false;
 					break;
 				}
-				
+
 				case 0x03:
 				{
 					AsciiString particleSystemName = _getParticleSystemName();
@@ -8329,7 +8331,7 @@ void ScriptEngine::particleEditorUpdate( void )
 					busyWait = false;
 					return;
 				}
-				
+
 				case 0x05:
 				{
 					int newCap = _getNewCurrentParticleCap();
@@ -8463,12 +8465,12 @@ Bool ScriptEngine::isTimeFast(void)
 		} else {
 			if (st_AppIsFast) {
 				st_AppIsFast = false;
-			} 
+			}
 		}
 		if (st_AppIsFast) {
 			if ((TheGameLogic->getFrame()%10) == 0) {
 				return false;
-			}	 
+			}
 			return true;
 		} else {
 			return false;
@@ -8492,7 +8494,7 @@ void ScriptEngine::forceUnfreezeTime(void)
 void ScriptEngine::AppendDebugMessage(const AsciiString& strToAdd, Bool forcePause)
 {
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG(("-SCRIPT- %d %s\n", TheGameLogic->getFrame(), strToAdd.str()));
+	DEBUG_LOG(("-SCRIPT- %d %s", TheGameLogic->getFrame(), strToAdd.str()));
 #endif
 	typedef void (*funcptr)(const char*);
 	if (!st_DebugDLL) {
@@ -8526,7 +8528,7 @@ void ScriptEngine::AdjustDebugVariableData(const AsciiString& variableName, Int
 void ScriptEngine::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Version Info:
@@ -8536,7 +8538,7 @@ static void xferListAsciiString( Xfer *xfer, ListAsciiString *list )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiString - Invalid parameters\n") );
+	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiString - Invalid parameters") );
 
 	// version
 	XferVersion currentVersion = 1;
@@ -8560,9 +8562,9 @@ static void xferListAsciiString( Xfer *xfer, ListAsciiString *list )
 			string = *it;
 			xfer->xferAsciiString( &string );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -8570,10 +8572,10 @@ static void xferListAsciiString( Xfer *xfer, ListAsciiString *list )
 		if( list->empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "xferListAsciiString - list should be empty upon loading but is not\n" ));
+			DEBUG_CRASH(( "xferListAsciiString - list should be empty upon loading but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each string
 		for( UnsignedShort i = 0; i < count; ++i )
@@ -8585,11 +8587,11 @@ static void xferListAsciiString( Xfer *xfer, ListAsciiString *list )
 			// put on list
 			list->push_back( string );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xferListAsciiString
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Version Info:
@@ -8599,7 +8601,7 @@ static void xferListAsciiStringUINT( Xfer *xfer, ListAsciiStringUINT *list )
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiStringUINT - Invalid parameters\n") );
+	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiStringUINT - Invalid parameters") );
 
 	// version
 	XferVersion currentVersion = 1;
@@ -8629,9 +8631,9 @@ static void xferListAsciiStringUINT( Xfer *xfer, ListAsciiStringUINT *list )
 			unsignedIntData = it->second;
 			xfer->xferUnsignedInt( &unsignedIntData );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		PairAsciiStringUINT newPair;
@@ -8640,10 +8642,10 @@ static void xferListAsciiStringUINT( Xfer *xfer, ListAsciiStringUINT *list )
 		if( list->empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "xferListAsciiStringUINT - list should be empty upon loading but is not\n" ));
+			DEBUG_CRASH(( "xferListAsciiStringUINT - list should be empty upon loading but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each string
 		for( UnsignedShort i = 0; i < count; ++i )
@@ -8660,11 +8662,11 @@ static void xferListAsciiStringUINT( Xfer *xfer, ListAsciiStringUINT *list )
 			newPair.second = unsignedIntData;
 			list->push_back( newPair );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xferListAsciiStringUINT
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Version Info:
@@ -8674,7 +8676,7 @@ static void xferListAsciiStringObjectID( Xfer *xfer, ListAsciiStringObjectID *li
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiStringObjectID - Invalid parameters\n") );
+	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiStringObjectID - Invalid parameters") );
 
 	// version
 	XferVersion currentVersion = 1;
@@ -8704,9 +8706,9 @@ static void xferListAsciiStringObjectID( Xfer *xfer, ListAsciiStringObjectID *li
 			objectID = it->second;
 			xfer->xferObjectID( &objectID );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		AsciiStringObjectIDPair newPair;
@@ -8715,10 +8717,10 @@ static void xferListAsciiStringObjectID( Xfer *xfer, ListAsciiStringObjectID *li
 		if( list->empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "xferListAsciiStringObjectID - list should be empty upon loading but is not\n" ));
+			DEBUG_CRASH(( "xferListAsciiStringObjectID - list should be empty upon loading but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each string
 		for( UnsignedShort i = 0; i < count; ++i )
@@ -8735,11 +8737,11 @@ static void xferListAsciiStringObjectID( Xfer *xfer, ListAsciiStringObjectID *li
 			newPair.second = objectID;
 			list->push_back( newPair );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // end xferListAsciiStringObjectID
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Version Info:
@@ -8749,7 +8751,7 @@ static void xferListAsciiStringCoord3D( Xfer *xfer, ListAsciiStringCoord3D *list
 {
 
 	// sanity
-	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiStringCoord3D - Invalid parameters\n") );
+	DEBUG_ASSERTCRASH( list != NULL, ("xferListAsciiStringCoord3D - Invalid parameters") );
 
 	// version
 	XferVersion currentVersion = 1;
@@ -8779,9 +8781,9 @@ static void xferListAsciiStringCoord3D( Xfer *xfer, ListAsciiStringCoord3D *list
 			coord = it->second;
 			xfer->xferCoord3D( &coord );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		AsciiStringCoord3DPair newPair;
@@ -8790,10 +8792,10 @@ static void xferListAsciiStringCoord3D( Xfer *xfer, ListAsciiStringCoord3D *list
 		if( list->empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "xferListAsciiStringCoord3D - list should be empty upon loading but is not\n" ));
+			DEBUG_CRASH(( "xferListAsciiStringCoord3D - list should be empty upon loading but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each string
 		for( UnsignedShort i = 0; i < count; ++i )
@@ -8802,7 +8804,7 @@ static void xferListAsciiStringCoord3D( Xfer *xfer, ListAsciiStringCoord3D *list
 			// read string
 			xfer->xferAsciiString( &string );
 
-			// read coord 
+			// read coord
 			xfer->xferCoord3D( &coord );
 
 			// put on list
@@ -8810,22 +8812,22 @@ static void xferListAsciiStringCoord3D( Xfer *xfer, ListAsciiStringCoord3D *list
 			newPair.second = coord;
 			list->push_back( newPair );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
-}  // ene xferListAsciiStringCoord3D
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 void ScriptEngine::setGlobalDifficulty( GameDifficulty difficulty )
 {
-	DEBUG_LOG(("ScriptEngine::setGlobalDifficulty(%d)\n", ((Int)difficulty)));
+	DEBUG_LOG(("ScriptEngine::setGlobalDifficulty(%d)", ((Int)difficulty)));
 	m_gameDifficulty = difficulty;
 }
 
 // ------------------------------------------------------------------------------------------------
-/** Xfer method 
+/** Xfer method
 	* Version Info:
 	* 1: Initial version
 	* 2: Added m_namedReveals and m_allObjectTypeLists (CBD)
@@ -8861,20 +8863,20 @@ void ScriptEngine::xfer( Xfer *xfer )
 			// xfer data
 			xfer->xferSnapshot( sequentialScript );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
 		// this list should be empty on loading
-		if( m_sequentialScripts.size() != 0 )
+		if( !m_sequentialScripts.empty() )
 		{
 
-			DEBUG_CRASH(( "ScriptEngine::xfer - m_sequentialScripts should be empty but is not\n" ));
+			DEBUG_CRASH(( "ScriptEngine::xfer - m_sequentialScripts should be empty but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each entry
 		for( UnsignedShort i = 0; i < sequentialScriptCount; ++i )
@@ -8889,9 +8891,9 @@ void ScriptEngine::xfer( Xfer *xfer )
 			// xfer data
 			xfer->xferSnapshot( sequentialScript );
 
-		}  // end for i
+		}
 
-	}  // end else, load
+	}
 
 	// counters
 	UnsignedShort countersSize = m_numCounters;
@@ -8899,10 +8901,10 @@ void ScriptEngine::xfer( Xfer *xfer )
 	if( countersSize > MAX_COUNTERS )
 	{
 
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_COUNTERS has changed size, need to version this\n" ));
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_COUNTERS has changed size, need to version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < countersSize; ++i )
 	{
 
@@ -8914,8 +8916,8 @@ void ScriptEngine::xfer( Xfer *xfer )
 
 		// countdown timer
 		xfer->xferBool( &m_counters[ i ].isCountdownTimer );
-		
-	}  // end for, i
+
+	}
 
 	// num counters
 	xfer->xferInt( &m_numCounters );
@@ -8925,22 +8927,22 @@ void ScriptEngine::xfer( Xfer *xfer )
 	xfer->xferUnsignedShort( &flagsSize );
 	if( flagsSize > MAX_FLAGS )
 	{
-	
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_FLAGS has changed size, need to version this\n" ));
+
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_FLAGS has changed size, need to version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < flagsSize; ++i )
 	{
 
 		// value
 		xfer->xferBool( &m_flags[ i ].value );
-		
+
 		// name
 		xfer->xferAsciiString( &m_flags[ i ].name );
 
-	}  // end for i
-		
+	}
+
 	// num flags
 	xfer->xferInt( &m_numFlags );
 
@@ -8950,17 +8952,17 @@ void ScriptEngine::xfer( Xfer *xfer )
 	if( attackPriorityInfoSize > MAX_ATTACK_PRIORITIES )
 	{
 
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_ATTACK_PRIORITIES size has changed, need to version this\n" ));
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_ATTACK_PRIORITIES size has changed, need to version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < attackPriorityInfoSize; ++i )
 	{
 
 		// xfer each data
 		xfer->xferSnapshot( &m_attackPriorityInfo[ i ] );
 
-	}  // end for i
+	}
 
 	// num attack info
 	xfer->xferInt( &m_numAttackInfo );
@@ -8992,9 +8994,9 @@ void ScriptEngine::xfer( Xfer *xfer )
 			objectID = obj ? obj->getID() : INVALID_ID;
 			xfer->xferObjectID( &objectID );
 
-		}  // end for i
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		NamedRequest req;
@@ -9018,19 +9020,19 @@ void ScriptEngine::xfer( Xfer *xfer )
 			if( obj == NULL && objectID != INVALID_ID )
 			{
 
-				DEBUG_CRASH(( "ScriptEngine::xfer - Unable to find object by ID for m_namedObjects\n" ));
+				DEBUG_CRASH(( "ScriptEngine::xfer - Unable to find object by ID for m_namedObjects" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// assign
 			req.first = namedObjectName;
 			req.second = obj;
 			m_namedObjects.push_back( req );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// first update
 	xfer->xferBool( &m_firstUpdate );
@@ -9076,11 +9078,11 @@ void ScriptEngine::xfer( Xfer *xfer )
 	xfer->xferUnsignedShort( &triggeredSpecialPowersSize );
 	if( triggeredSpecialPowersSize != MAX_PLAYER_COUNT )
 	{
-	
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_triggeredSpecialPowers size is now different and we must version this\n" ));
+
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_triggeredSpecialPowers size is now different and we must version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < triggeredSpecialPowersSize; ++i )
 		xferListAsciiStringObjectID( xfer, &m_triggeredSpecialPowers[ i ] );
 
@@ -9089,11 +9091,11 @@ void ScriptEngine::xfer( Xfer *xfer )
 	xfer->xferUnsignedShort( &midwaySpecialPowersSize );
 	if( midwaySpecialPowersSize != MAX_PLAYER_COUNT )
 	{
-	
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_midwaySpecialPowers size is now different and we must version this\n" ));
+
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_midwaySpecialPowers size is now different and we must version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < midwaySpecialPowersSize; ++i )
 		xferListAsciiStringObjectID( xfer, &m_midwaySpecialPowers[ i ] );
 
@@ -9102,11 +9104,11 @@ void ScriptEngine::xfer( Xfer *xfer )
 	xfer->xferUnsignedShort( &finishedSpecialPowersSize );
 	if( finishedSpecialPowersSize != MAX_PLAYER_COUNT )
 	{
-	
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_finishedSpecialPowers size is now different and we must version this\n" ));
+
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_finishedSpecialPowers size is now different and we must version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < finishedSpecialPowersSize; ++i )
 		xferListAsciiStringObjectID( xfer, &m_finishedSpecialPowers[ i ] );
 
@@ -9115,11 +9117,11 @@ void ScriptEngine::xfer( Xfer *xfer )
 	xfer->xferUnsignedShort( &completedUpgradesSize );
 	if( completedUpgradesSize != MAX_PLAYER_COUNT )
 	{
-	
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_completedUpgrades size is now different and we must version this\n" ));
+
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_completedUpgrades size is now different and we must version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < completedUpgradesSize; ++i )
 		xferListAsciiStringObjectID( xfer, &m_completedUpgrades[ i ] );
 
@@ -9128,11 +9130,11 @@ void ScriptEngine::xfer( Xfer *xfer )
 	xfer->xferUnsignedShort( &acquiredSciencesSize );
 	if( acquiredSciencesSize != MAX_PLAYER_COUNT )
 	{
-	
-		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_acquiredSciences size is now different and we must version this\n" ));
+
+		DEBUG_CRASH(( "ScriptEngine::xfer - MAX_PLAYER_COUNT has changed, m_acquiredSciences size is now different and we must version this" ));
 		throw SC_INVALID_DATA;
 
-	}  // end if
+	}
 	for( i = 0; i < acquiredSciencesSize; ++i )
 		xfer->xferScienceVec( &m_acquiredSciences[ i ] );
 
@@ -9154,7 +9156,7 @@ void ScriptEngine::xfer( Xfer *xfer )
 
 	// freeze by script
 	xfer->xferBool( &m_freezeByScript );
-	
+
 	// version 2
 	if( version >= 2 )
 	{
@@ -9183,10 +9185,10 @@ void ScriptEngine::xfer( Xfer *xfer )
 
 				// player name
 				xfer->xferAsciiString( &it->m_playerName );
-				
-			}  // end for, it
 
-		}  // end if, save
+			}
+
+		}
 		else
 		{
 
@@ -9194,16 +9196,16 @@ void ScriptEngine::xfer( Xfer *xfer )
 			if( m_namedReveals.empty() == FALSE )
 			{
 
-				DEBUG_CRASH(( "ScriptEngine::xfer - m_namedReveals should be empty but is not!\n" ));
+				DEBUG_CRASH(( "ScriptEngine::xfer - m_namedReveals should be empty but is not!" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// read all entries
 			NamedReveal reveal;
 			for( UnsignedShort i = 0; i < namedRevealCount; ++i )
 			{
-				
+
 				// read name
 				xfer->xferAsciiString( &reveal.m_revealName );
 
@@ -9212,16 +9214,16 @@ void ScriptEngine::xfer( Xfer *xfer )
 
 				// read radius
 				xfer->xferReal( &reveal.m_radiusToReveal );
-				
+
 				// read player name
 				xfer->xferAsciiString( &reveal.m_playerName );
 
 				// put on list
 				m_namedReveals.push_back( reveal );
 
-			}  // end for, i
+			}
 
-		}  // end else, load
+		}
 
 		// all object type lists size
 		UnsignedShort allObjectTypesCount = m_allObjectTypeLists.size();
@@ -9230,7 +9232,7 @@ void ScriptEngine::xfer( Xfer *xfer )
 		// all object type lists data
 		if( xfer->getXferMode() == XFER_SAVE )
 		{
-			
+
 			// iterate list
 			AllObjectTypesIt it;
 			ObjectTypes *objectTypes;
@@ -9243,9 +9245,9 @@ void ScriptEngine::xfer( Xfer *xfer )
 				// save object types
 				xfer->xferSnapshot( objectTypes );
 
-			}  // end for, it
+			}
 
-		}  // end if, save
+		}
 		else
 		{
 
@@ -9253,10 +9255,10 @@ void ScriptEngine::xfer( Xfer *xfer )
 			if( m_allObjectTypeLists.empty() == FALSE )
 			{
 
-				DEBUG_CRASH(( "ScriptEngine::xfer - m_allObjectTypeLists should be empty but is not!\n" ));
+				DEBUG_CRASH(( "ScriptEngine::xfer - m_allObjectTypeLists should be empty but is not!" ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// read all data
 			ObjectTypes *objectTypes;
@@ -9272,11 +9274,11 @@ void ScriptEngine::xfer( Xfer *xfer )
 				// put on list
 				m_allObjectTypeLists.push_back( objectTypes );
 
-			}  // end for, i
+			}
 
-		}  //  end else, load
+		}
 
-	}  // end if, version 2
+	}
 
 	if (version >= 3) {
 		xfer->xferBool(&m_objectsShouldReceiveDifficultyBonus);
@@ -9304,14 +9306,14 @@ void ScriptEngine::xfer( Xfer *xfer )
 			m_fade = FADE_MULTIPLY; //default to a fade in from black.
 			m_curFadeFrame = 0;
 			m_minFade = 1.0f;
-			m_maxFade = 0.0f;	
+			m_maxFade = 0.0f;
 			m_fadeFramesIncrease = 0;
 			m_fadeFramesHold = 0;
 			m_fadeFramesDecrease = FRAMES_TO_FADE_IN_AT_START;
 			m_curFadeValue = 0.0f;
 		}
 	}
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -9330,9 +9332,9 @@ void ScriptEngine::loadPostProcess( void )
 		TheAudio->addAudioEvent(&event);
 	}
 
-}  // end loadPostProcess
+}
 
-//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+//#if defined(RTS_DEBUG)
 void ScriptEngine::debugVictory( void )
 {
 	ScriptAction *action = newInstance(ScriptAction)(ScriptAction::VICTORY);
@@ -9368,7 +9370,7 @@ void _appendMessage(const AsciiString& str, Bool isTrueMessage, Bool shouldPause
 	msg.concat(str);
 
 #ifdef INTENSE_DEBUG
-	DEBUG_LOG(("-SCRIPT- %s\n", msg.str()));
+	DEBUG_LOG(("-SCRIPT- %s", msg.str()));
 #endif
 	if (!st_DebugDLL) {
 		return;
@@ -9499,7 +9501,7 @@ void _addUpdatedParticleSystem( AsciiString particleSystemName )
 	if (TheParticleSystemManager->findTemplate(particleSystemName)) {
 		return;
 	}
-	
+
 	FARPROC proc, proc2;
 	proc = GetProcAddress(st_ParticleDLL, "AppendParticleSystem");
 	if (!proc) {
@@ -9545,12 +9547,12 @@ AsciiString _getParticleSystemName( void )
 void _updatePanelParameters( ParticleSystemTemplate *particleTemplate )
 {
 	typedef void (*funcptr)(ParticleSystemTemplate*);
-	
+
 	if (!st_ParticleDLL) {
 		return;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "UpdateCurrentParticleSystem");
 	if (!proc) {
 		return;
@@ -9567,22 +9569,22 @@ void _updateAsciiStringParmsToSystem( ParticleSystemTemplate *particleTemplate )
 		return;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "GetSelectedParticleAsciiStringParm");
 
 	if (!proc) {
 		return;
 	}
-	
+
 	char buff[ARBITRARY_BUFF_SIZE];
 	ParticleSystemTemplate* otherTemp;
 
 	((funcptr) proc)(0, buff, &otherTemp); // PARM_ParticleTypeName
 	if (otherTemp == particleTemplate) {
-		particleTemplate->m_particleTypeName.set(buff);	
+		particleTemplate->m_particleTypeName.set(buff);
 	}
 
-	
+
 	((funcptr) proc)(1, buff, &otherTemp); // PARM_SlaveSystemName
 	if (otherTemp == particleTemplate) {
 		particleTemplate->m_slaveSystemName.set(buff);
@@ -9590,7 +9592,7 @@ void _updateAsciiStringParmsToSystem( ParticleSystemTemplate *particleTemplate )
 
 	((funcptr) proc)(2, buff, &otherTemp); // PARM_AttachedSystemName
 	if (otherTemp == particleTemplate) {
-		particleTemplate->m_attachedSystemName.set(buff);	
+		particleTemplate->m_attachedSystemName.set(buff);
 	}
 }
 
@@ -9602,7 +9604,7 @@ extern void _updateAsciiStringParmsFromSystem( ParticleSystemTemplate *particleT
 		return;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "UpdateParticleAsciiStringParm");
 
 	if (!proc) {
@@ -9619,13 +9621,13 @@ extern void _updateAsciiStringParmsFromSystem( ParticleSystemTemplate *particleT
 #define BACKUP_EXT				"BAK"
 static void _writeOutINI( void )
 {
-	// currently, this uses NO intelligence. It blindly iterates through all of the 
+	// currently, this uses NO intelligence. It blindly iterates through all of the
 	// particle system templates and writes out every field that it thinks it should.
 	const int maxFileLength = 128;
 	char buff[maxFileLength];
-	
+
 	File *saveFile = NULL;
-	
+
 	int i = 0;
 	do {
 		if (saveFile) {
@@ -9641,10 +9643,10 @@ static void _writeOutINI( void )
 	if (!saveFile) {
 		return;
 	}
-	
+
 	// save the old file
 	File *oldINI = TheFileSystem->openFile("Data\\INI\\ParticleSystem.ini", File::READ | File::TEXT);
-	
+
 	if (oldINI) {
 		char singleChar;
 		while (oldINI->position() != oldINI->size()) {
@@ -9771,9 +9773,9 @@ static const std::string F_VOLCYLRAD =		"VolCylinderRadius";
 static const std::string F_VOLCYLLEN =		"VolCylinderLength";
 static const std::string F_ISHOLLOW =			"IsHollow";
 static const std::string F_ISXYPLANAR =		"IsGroundAligned";
-static const std::string F_ISEMITABOVEGROUNDONLY 
+static const std::string F_ISEMITABOVEGROUNDONLY
 																			=		"IsEmitAboveGroundOnly";
-static const std::string F_ISPARTICLEUPTOWARDSEMITTER 
+static const std::string F_ISPARTICLEUPTOWARDSEMITTER
 																			=		"IsParticleUpTowardsEmitter";
 
 static const std::string F_WINDMOTION = "WindMotion";
@@ -9795,20 +9797,20 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 	static char buff2[ARBITRARY_BUFF_SIZE];
 	static char buff3[ARBITRARY_BUFF_SIZE];
 	static char buff4[ARBITRARY_BUFF_SIZE];
-	
 
-	// the .append looks REALLY ugly, but this code was written with streams in mind, and so 
+
+	// the .append looks REALLY ugly, but this code was written with streams in mind, and so
 	// these were all originally << (feed-operator for streams)
 	// I might come back and re-write this later, if there are enough complaints. ;-) jkmcd
 	// in the meantime, move along...
-	std::string thisEntry = "";
+	std::string thisEntry;
 	thisEntry.append(HEADER).append(SEP_SPACE).append(templ->getName().str()).append(SEP_EOL);
 	thisEntry.append(SEP_HEAD).append(F_PRIORITY).append(EQ_WITH_SPACES).append(ParticlePriorityNames[templ->m_priority]).append(SEP_EOL);
 	thisEntry.append(SEP_HEAD).append(F_ISONESHOT).append(EQ_WITH_SPACES).append((templ->m_isOneShot ? STR_TRUE : STR_FALSE)).append(SEP_EOL);
 	thisEntry.append(SEP_HEAD).append(F_SHADER).append(EQ_WITH_SPACES).append(ParticleShaderTypeNames[templ->m_shaderType]).append(SEP_EOL);
 	thisEntry.append(SEP_HEAD).append(F_TYPE).append(EQ_WITH_SPACES).append(ParticleTypeNames[templ->m_particleType]).append(SEP_EOL);
 	thisEntry.append(SEP_HEAD).append(F_PARTICLENAME).append(EQ_WITH_SPACES).append(templ->m_particleTypeName.str()).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_angleZ.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_angleZ.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_ANGLEZ).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
@@ -9824,7 +9826,7 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 	sprintf(buff1, FORMAT_STRING, templ->m_velDamping.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_velDamping.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_VELOCITYDAMP).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_gravity);
 	thisEntry.append(SEP_HEAD).append(F_GRAVITY).append(EQ_WITH_SPACES).append(buff1).append(SEP_EOL);
 	if (!templ->m_slaveSystemName.isEmpty()) {
@@ -9849,15 +9851,15 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 	sprintf(buff1, FORMAT_STRING, templ->m_startSize.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_startSize.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_SIZE).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_startSizeRate.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_startSizeRate.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_STARTSIZERATE).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_sizeRate.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_sizeRate.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_SIZERATE).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_sizeRateDamping.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_sizeRateDamping.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_SIZERATEDAMP).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
@@ -9876,27 +9878,27 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 	sprintf(buff2, FORMAT_STRING, templ->m_alphaKey[2].var.getMaximumValue());
 	sprintf(buff3, "%d", templ->m_alphaKey[2].frame);
 	thisEntry.append(SEP_HEAD).append(F_ALPHA3).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_alphaKey[3].var.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_alphaKey[3].var.getMaximumValue());
 	sprintf(buff3, "%d", templ->m_alphaKey[3].frame);
 	thisEntry.append(SEP_HEAD).append(F_ALPHA4).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_alphaKey[4].var.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_alphaKey[4].var.getMaximumValue());
 	sprintf(buff3, "%d", templ->m_alphaKey[4].frame);
 	thisEntry.append(SEP_HEAD).append(F_ALPHA5).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_alphaKey[5].var.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_alphaKey[5].var.getMaximumValue());
 	sprintf(buff3, "%d", templ->m_alphaKey[5].frame);
 	thisEntry.append(SEP_HEAD).append(F_ALPHA6).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_alphaKey[6].var.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_alphaKey[6].var.getMaximumValue());
 	sprintf(buff3, "%d", templ->m_alphaKey[6].frame);
 	thisEntry.append(SEP_HEAD).append(F_ALPHA7).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_alphaKey[7].var.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_alphaKey[7].var.getMaximumValue());
 	sprintf(buff3, "%d", templ->m_alphaKey[7].frame);
@@ -9919,53 +9921,53 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 	sprintf(buff3, "%s%d", STR_B.c_str(), REAL_TO_INT(templ->m_colorKey[2].color.blue * 255 + 0.5));
 	sprintf(buff4, "%d", templ->m_colorKey[2].frame);
 	thisEntry.append(SEP_HEAD).append(F_COLOR3).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_SPACE).append(buff4).append(SEP_EOL);
-	
+
 	sprintf(buff1, "%s%d", STR_R.c_str(), REAL_TO_INT(templ->m_colorKey[3].color.red * 255 + 0.5));
 	sprintf(buff2, "%s%d", STR_G.c_str(), REAL_TO_INT(templ->m_colorKey[3].color.green * 255 + 0.5));
 	sprintf(buff3, "%s%d", STR_B.c_str(), REAL_TO_INT(templ->m_colorKey[3].color.blue * 255 + 0.5));
 	sprintf(buff4, "%d", templ->m_colorKey[3].frame);
 	thisEntry.append(SEP_HEAD).append(F_COLOR4).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_SPACE).append(buff4).append(SEP_EOL);
-	
+
 	sprintf(buff1, "%s%d", STR_R.c_str(), REAL_TO_INT(templ->m_colorKey[4].color.red * 255 + 0.5));
 	sprintf(buff2, "%s%d", STR_G.c_str(), REAL_TO_INT(templ->m_colorKey[4].color.green * 255 + 0.5));
 	sprintf(buff3, "%s%d", STR_B.c_str(), REAL_TO_INT(templ->m_colorKey[4].color.blue * 255 + 0.5));
 	sprintf(buff4, "%d", templ->m_colorKey[4].frame);
 	thisEntry.append(SEP_HEAD).append(F_COLOR5).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_SPACE).append(buff4).append(SEP_EOL);
-	
+
 	sprintf(buff1, "%s%d", STR_R.c_str(), REAL_TO_INT(templ->m_colorKey[5].color.red * 255 + 0.5));
 	sprintf(buff2, "%s%d", STR_G.c_str(), REAL_TO_INT(templ->m_colorKey[5].color.green * 255 + 0.5));
 	sprintf(buff3, "%s%d", STR_B.c_str(), REAL_TO_INT(templ->m_colorKey[5].color.blue * 255 + 0.5));
 	sprintf(buff4, "%d", templ->m_colorKey[5].frame);
 	thisEntry.append(SEP_HEAD).append(F_COLOR6).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_SPACE).append(buff4).append(SEP_EOL);
-	
+
 	sprintf(buff1, "%s%d", STR_R.c_str(), REAL_TO_INT(templ->m_colorKey[6].color.red * 255 + 0.5));
 	sprintf(buff2, "%s%d", STR_G.c_str(), REAL_TO_INT(templ->m_colorKey[6].color.green * 255 + 0.5));
 	sprintf(buff3, "%s%d", STR_B.c_str(), REAL_TO_INT(templ->m_colorKey[6].color.blue * 255 + 0.5));
 	sprintf(buff4, "%d", templ->m_colorKey[6].frame);
 	thisEntry.append(SEP_HEAD).append(F_COLOR7).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_SPACE).append(buff4).append(SEP_EOL);
-	
+
 	sprintf(buff1, "%s%d", STR_R.c_str(), REAL_TO_INT(templ->m_colorKey[7].color.red * 255 + 0.5));
 	sprintf(buff2, "%s%d", STR_G.c_str(), REAL_TO_INT(templ->m_colorKey[7].color.green * 255 + 0.5));
 	sprintf(buff3, "%s%d", STR_B.c_str(), REAL_TO_INT(templ->m_colorKey[7].color.blue * 255 + 0.5));
 	sprintf(buff4, "%d", templ->m_colorKey[7].frame);
 	thisEntry.append(SEP_HEAD).append(F_COLOR8).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_SPACE).append(buff3).append(SEP_SPACE).append(buff4).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_colorScale.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_colorScale.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_COLORSCALE).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_burstDelay.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_burstDelay.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_BURSTDELAY).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_burstCount.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_burstCount.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_BURSTCOUNT).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING, templ->m_initialDelay.getMinimumValue());
 	sprintf(buff2, FORMAT_STRING, templ->m_initialDelay.getMaximumValue());
 	thisEntry.append(SEP_HEAD).append(F_INITIALDELAY).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	
+
 	sprintf(buff1, FORMAT_STRING_LEADING_STRING, STR_X.c_str(), templ->m_driftVelocity.x);
 	sprintf(buff2, FORMAT_STRING_LEADING_STRING, STR_Y.c_str(), templ->m_driftVelocity.y);
 	sprintf(buff3, FORMAT_STRING_LEADING_STRING, STR_Z.c_str(), templ->m_driftVelocity.z);
@@ -9978,11 +9980,11 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 		sprintf(buff1, FORMAT_STRING, templ->m_emissionVelocity.ortho.x.getMinimumValue());
 		sprintf(buff2, FORMAT_STRING, templ->m_emissionVelocity.ortho.x.getMaximumValue());
 		thisEntry.append(SEP_HEAD).append(F_VELORTHOX).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-		
+
 		sprintf(buff1, FORMAT_STRING, templ->m_emissionVelocity.ortho.y.getMinimumValue());
 		sprintf(buff2, FORMAT_STRING, templ->m_emissionVelocity.ortho.y.getMaximumValue());
 		thisEntry.append(SEP_HEAD).append(F_VELORTHOY).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-		
+
 		sprintf(buff1, FORMAT_STRING, templ->m_emissionVelocity.ortho.z.getMinimumValue());
 		sprintf(buff2, FORMAT_STRING, templ->m_emissionVelocity.ortho.z.getMaximumValue());
 		thisEntry.append(SEP_HEAD).append(F_VELORTHOZ).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
@@ -10013,7 +10015,7 @@ void _writeSingleParticleSystem( File *out, ParticleSystemTemplate *templ )
 		sprintf(buff1, FORMAT_STRING, templ->m_emissionVelocity.outward.otherSpeed.getMinimumValue());
 		sprintf(buff2, FORMAT_STRING, templ->m_emissionVelocity.outward.otherSpeed.getMaximumValue());
 		thisEntry.append(SEP_HEAD).append(F_VELOUTOTHER).append(EQ_WITH_SPACES).append(buff1).append(SEP_SPACE).append(buff2).append(SEP_EOL);
-	}	
+	}
 
 	thisEntry.append(SEP_HEAD).append(F_VOLUMETYPE).append(EQ_WITH_SPACES).append(EmissionVolumeTypeNames[templ->m_emissionVolumeType]).append(SEP_EOL);
 
@@ -10085,7 +10087,7 @@ static int _getEditorBehavior( void )
 		return 0x00;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "NextParticleEditorBehavior");
 
 	if (!proc) {
@@ -10105,14 +10107,14 @@ static void _updateAndSetCurrentSystem( void )
 		_updateAsciiStringParmsFromSystem(pTemp);
 		_updatePanelParameters(pTemp);
 
-		if( st_particleSystemNeedsStopping ) 
+		if( st_particleSystemNeedsStopping )
 		{
 			st_particleSystem->stop();
 			st_particleSystem->destroy();
 			st_particleSystemNeedsStopping = FALSE;
 		}
 		st_particleSystem = TheParticleSystemManager->createParticleSystem(pTemp);
-		if( st_particleSystem ) 
+		if( st_particleSystem )
 		{
 			if( st_particleSystem->isSystemForever() )
 				st_particleSystemNeedsStopping = TRUE;// Only infinite lifetime systems need to be stopped.
@@ -10161,7 +10163,7 @@ static void _reloadParticleSystemFromINI( AsciiString particleSystemName )
 	if (!iniFile) {
 		return;
 	}
-	
+
 	try {
 		// find the entry
 		while (!((iniFile->eof()) || INI::isDeclarationOfType("ParticleSystem", particleSystemName, linebuff))) {
@@ -10172,9 +10174,9 @@ static void _reloadParticleSystemFromINI( AsciiString particleSystemName )
 			if (iniFile->eof()) {
 				throw 0;
 			}
-			
+
 			outTempINI = TheFileSystem->openFile("temporary.ini", File::WRITE | File::TEXT);
-			if (!outTempINI) {	
+			if (!outTempINI) {
 				throw 0;
 			}
 
@@ -10187,7 +10189,7 @@ static void _reloadParticleSystemFromINI( AsciiString particleSystemName )
 			if (iniFile->eof()) {
 				throw 1;
 			}
-			
+
 
 			// write out the closing "END"
 			outTempINI->write(linebuff, strlen(linebuff));
@@ -10196,7 +10198,7 @@ static void _reloadParticleSystemFromINI( AsciiString particleSystemName )
 		}
 
 		// force the current system to stop.
-		if (st_particleSystemNeedsStopping) 
+		if (st_particleSystemNeedsStopping)
 		{
 			st_particleSystem->stop();
 			st_particleSystem->destroy();
@@ -10205,7 +10207,7 @@ static void _reloadParticleSystemFromINI( AsciiString particleSystemName )
 		// reload that entry
 		INI ini;
 		ini.load("temporary.ini", INI_LOAD_OVERWRITE, NULL);
-		
+
 		// delete the file
 //		unlink("temporary.ini");
 
@@ -10215,9 +10217,9 @@ static void _reloadParticleSystemFromINI( AsciiString particleSystemName )
 		_updatePanelParameters(pTemp);
 
 	} catch (int why) {
-		switch(why) 
+		switch(why)
 		{
-			case 2:	
+			case 2:
 			case 1: if (outTempINI) { outTempINI->close(); }
 			case 0: if (iniFile) { iniFile->close(); }
 		}
@@ -10233,7 +10235,7 @@ static int _getNewCurrentParticleCap( void )
 		return -1;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "GetNewParticleCap");
 
 	if (!proc) {
@@ -10251,7 +10253,7 @@ static void _updateCurrentParticleCap( void )
 		return;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "UpdateCurrentParticleCap");
 
 	if (!proc) {
@@ -10269,7 +10271,7 @@ static void _updateCurrentParticleCount( void )
 		return;
 	}
 
-	FARPROC proc;	
+	FARPROC proc;
 	proc = GetProcAddress(st_ParticleDLL, "UpdateCurrentNumParticles");
 
 	if (!proc) {
@@ -10292,12 +10294,12 @@ static void _initVTune()
 	st_vTuneDLL = ::LoadLibrary("vtuneapi.dll");
 // nope, not here...
 //DEBUG_ASSERTCRASH(st_vTuneDLL != NULL, "VTuneAPI DLL not found!"));
-	
+
 	if (st_vTuneDLL)
 	{
 		VTPause = (VTProc)::GetProcAddress(st_vTuneDLL, "VTPause");
 		VTResume = (VTProc)::GetProcAddress(st_vTuneDLL, "VTResume");
-		DEBUG_ASSERTCRASH(VTPause != NULL && VTResume != NULL, ("VTuneAPI procs not found!\n"));
+		DEBUG_ASSERTCRASH(VTPause != NULL && VTResume != NULL, ("VTuneAPI procs not found!"));
 	}
 	else
 	{
@@ -10305,14 +10307,14 @@ static void _initVTune()
 		VTResume = NULL;
 	}
 
-	if (TheGlobalData->m_vTune) 
+	if (TheGlobalData->m_vTune)
 	{
 		// if -vtune was specified, start it paused.
 		st_EnableVTune = false;
 		if (VTPause)
-			VTPause();		
+			VTPause();
 		// only complain about it being missing if they were expecting it to be present
-		DEBUG_ASSERTCRASH(st_vTuneDLL != NULL, ("VTuneAPI DLL not found!\n"));
+		DEBUG_ASSERTCRASH(st_vTuneDLL != NULL, ("VTuneAPI DLL not found!"));
 	}
 	else
 	{
@@ -10325,7 +10327,7 @@ static void _initVTune()
 
 static void _updateVTune()
 {
-	if (!st_vTuneDLL) 
+	if (!st_vTuneDLL)
 		return;
 
 	if (st_EnableVTune)
@@ -10336,13 +10338,13 @@ static void _updateVTune()
 	else
 	{
 		if (VTPause)
-			VTPause();		
+			VTPause();
 	}
 }
 
 static void _cleanUpVTune()
 {
-	if (st_vTuneDLL) 
+	if (st_vTuneDLL)
 	{
 		FreeLibrary(st_vTuneDLL);
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp
index 90ec1bdcd23..31b589c9055 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Scripts.cpp /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   Generals
@@ -41,7 +41,7 @@
 // Desc:      Contains the information describing scripts.
 //
 //-----------------------------------------------------------------------------
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Lib/BaseType.h"
 
@@ -67,21 +67,16 @@
 #include "GameLogic/Module/ContainModule.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 static Script *s_mtScript = NULL;
 static ScriptGroup *s_mtGroup = NULL;
 
 //
-// These strings must be in the same order as they are in their definitions 
+// These strings must be in the same order as they are in their definitions
 // (See SHELL_SCRIPT_HOOK_* )
 //
-const char *TheShellHookNames[]=
+static const char *const TheShellHookNames[]=
 {
 	"ShellMainMenuCampaignPushed", //SHELL_SCRIPT_HOOK_MAIN_MENU_CAMPAIGN_SELECTED,
 	"ShellMainMenuCampaignHighlighted", //SHELL_SCRIPT_HOOK_MAIN_MENU_CAMPAIGN_HIGHLIGHTED,
@@ -122,6 +117,8 @@ const char *TheShellHookNames[]=
 	"ShellLANClosed", //SHELL_SCRIPT_HOOK_LAN_CLOSED,
 	"ShellLANEnteredFromGame", //SHELL_SCRIPT_HOOK_LAN_ENTERED_FROM_GAME,
 };
+static_assert(ARRAY_SIZE(TheShellHookNames) == SHELL_SCRIPT_HOOK_TOTAL, "Incorrect array size");
+
 void SignalUIInteraction(Int interaction)
 {
 	if (TheScriptEngine)
@@ -139,7 +136,7 @@ enum { K_SCRIPT_LIST_DATA_VERSION_1 = 1,
 			K_SCRIPT_GROUP_DATA_VERSION_2 = 2,
 			K_SCRIPT_DATA_VERSION_1 = 1,
 			K_SCRIPT_DATA_VERSION_2 = 2,
-			K_SCRIPT_OR_CONDITION_DATA_VERSION_1=1, 
+			K_SCRIPT_OR_CONDITION_DATA_VERSION_1=1,
 			K_SCRIPT_ACTION_VERSION_1 = 1,
 			K_SCRIPT_ACTION_VERSION_2 = 2,
 			K_SCRIPT_CONDITION_VERSION_1 = 1,
@@ -150,16 +147,16 @@ enum { K_SCRIPT_LIST_DATA_VERSION_1 = 1,
 			end_of_the_enumeration
 };
 
-static Condition::ConditionType ParameterChangesVer2[] = 
-{ 
+static Condition::ConditionType ParameterChangesVer2[] =
+{
 	// Seven Changed from version 1.
-	Condition::TEAM_INSIDE_AREA_PARTIALLY, 
-	Condition::TEAM_INSIDE_AREA_ENTIRELY, 
-	Condition::TEAM_OUTSIDE_AREA_ENTIRELY, 
-	Condition::TEAM_ENTERED_AREA_PARTIALLY, 
-	Condition::TEAM_ENTERED_AREA_ENTIRELY, 
-	Condition::TEAM_EXITED_AREA_ENTIRELY, 
-	Condition::TEAM_EXITED_AREA_PARTIALLY, 
+	Condition::TEAM_INSIDE_AREA_PARTIALLY,
+	Condition::TEAM_INSIDE_AREA_ENTIRELY,
+	Condition::TEAM_OUTSIDE_AREA_ENTIRELY,
+	Condition::TEAM_ENTERED_AREA_PARTIALLY,
+	Condition::TEAM_ENTERED_AREA_ENTIRELY,
+	Condition::TEAM_EXITED_AREA_ENTIRELY,
+	Condition::TEAM_EXITED_AREA_PARTIALLY,
 	(Condition::ConditionType) -1,
 };
 
@@ -178,14 +175,14 @@ Int ScriptList::m_curId = 0;
  ScriptList::updateDefaults -  checks for empty script lists, and adds some default stuff
  so you don't get a totally blank screen in the editor.
 */
-void ScriptList::updateDefaults(void) 
+void ScriptList::updateDefaults(void)
 {
 	Int i;
-	for (i=0; i<TheSidesList->getNumSides(); i++) 
+	for (i=0; i<TheSidesList->getNumSides(); i++)
 	{
 		ScriptList* pList = TheSidesList->getSideInfo(i)->getScriptList();
 		if (pList == NULL) {
-			pList = newInstance(ScriptList);	
+			pList = newInstance(ScriptList);
 			TheSidesList->getSideInfo(i)->setScriptList(pList);
 		}
 	}
@@ -194,11 +191,11 @@ void ScriptList::updateDefaults(void)
 /**
   Deletes any script lists attached to sides.  Used for editor cleanup.
 */
-void ScriptList::reset(void) 
+void ScriptList::reset(void)
 {
 	Int i;
 	if (TheSidesList == NULL) return; /// @todo - move this code into sides list.
-	for (i=0; i<TheSidesList->getNumSides(); i++) 
+	for (i=0; i<TheSidesList->getNumSides(); i++)
 	{
 		ScriptList* pList = TheSidesList->getSideInfo(i)->getScriptList();
 		TheSidesList->getSideInfo(i)->setScriptList(NULL);
@@ -221,16 +218,13 @@ m_firstScript(NULL)
   Dtor.  Deletes any script lists or group lists.  Note that dtors for groups and script lists
 	delete the whole list, so don't need to traverse here.
 */
-ScriptList::~ScriptList(void) 
+ScriptList::~ScriptList(void)
 {
-	if (m_firstGroup) {
-		deleteInstance(m_firstGroup);
-		m_firstGroup = NULL;
-	}
-	if (m_firstScript) {
-		deleteInstance(m_firstScript);
-		m_firstScript = NULL;
-	}
+	deleteInstance(m_firstGroup);
+	m_firstGroup = NULL;
+
+	deleteInstance(m_firstScript);
+	m_firstScript = NULL;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -260,7 +254,7 @@ void ScriptList::xfer( Xfer *xfer )
 	UnsignedShort scriptCount = 0;
 	for( script = getScript(); script; script = script->getNext() )
 		scriptCount++;
-	countVerify = scriptCount; 
+	countVerify = scriptCount;
 	xfer->xferUnsignedShort( &scriptCount );
 	if( countVerify != scriptCount )
 	{
@@ -268,7 +262,7 @@ void ScriptList::xfer( Xfer *xfer )
 		DEBUG_CRASH(( "ScriptList::xfer - Script list count has changed, attempting to recover."));
 		// throw SC_INVALID_DATA; try to recover. jba.
 
-	}  // end if
+	}
 
 	// all script data here
 	for( script = getScript(); script; script = script->getNext() )	{
@@ -297,7 +291,7 @@ void ScriptList::xfer( Xfer *xfer )
 
 		DEBUG_CRASH(( "ScriptList::xfer - Script group count has changed, attempting to recover."));
 
-	}  // end if
+	}
 
 	// all script group data
 	for( scriptGroup = getScriptGroup(); scriptGroup; scriptGroup = scriptGroup->getNext() ) {
@@ -325,9 +319,9 @@ void ScriptList::loadPostProcess( void )
 }
 
 /**
-  ScriptList::duplicate - Creates a full, "deep" copy of scriptlist. 
+  ScriptList::duplicate - Creates a full, "deep" copy of scriptlist.
 */
-ScriptList *ScriptList::duplicate(void) const 
+ScriptList *ScriptList::duplicate(void) const
 {
 	ScriptList *pNew = newInstance(ScriptList);
 
@@ -370,10 +364,10 @@ ScriptList *ScriptList::duplicate(void) const
 
 /**
   ScriptList::duplicateAndQualify - Creates a full, "deep" copy of scriptlist,
-	adding the qualifier to names. 
+	adding the qualifier to names.
 */
-ScriptList *ScriptList::duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const 
+ScriptList *ScriptList::duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const
 {
 	ScriptList *pNew = newInstance(ScriptList);
 
@@ -415,9 +409,9 @@ ScriptList *ScriptList::duplicateAndQualify(const AsciiString& qualifier,
 }
 
 /**
-  ScriptList::discard - Deletes a script list, but not any children. 
+  ScriptList::discard - Deletes a script list, but not any children.
 */
-void ScriptList::discard(void)  
+void ScriptList::discard(void)
 {
 	m_firstGroup = NULL;
 	m_firstScript = NULL;
@@ -525,19 +519,17 @@ void ScriptList::deleteGroup(ScriptGroup *pGrp)
 * ScriptList::ParseScriptsDataChunk - read a Scripts chunk.
 * Format is the newer CHUNKY format.
 *	See ScriptList::ScriptList for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptList::ParseScriptsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
 	Int i;
-	file.registerParser( AsciiString("ScriptList"), info->label, ScriptList::ParseScriptListDataChunk );
+	file.registerParser( "ScriptList", info->label, ScriptList::ParseScriptListDataChunk );
 	DEBUG_ASSERTCRASH(s_numInReadList==0, ("Leftover scripts floating aroung."));
 	for (i=0; i<s_numInReadList; i++) {
-		if (s_readLists[i]) {
-			deleteInstance(s_readLists[i]);
-			s_readLists[i] = NULL;
-		}
+		deleteInstance(s_readLists[i]);
+		s_readLists[i] = NULL;
 	}
 	TScriptListReadInfo readInfo;
 	for (i=0; i<MAX_PLAYER_COUNT; i++) {
@@ -558,10 +550,10 @@ Bool ScriptList::ParseScriptsDataChunk(DataChunkInput &file, DataChunkInfo *info
 /**
 * ScriptList::getReadScripts - Gets the scripts read in from a file by .
 * ScriptList::ParseScriptsDataChunk.
-*		
+*
 */
 Int ScriptList::getReadScripts(ScriptList *scriptLists[MAX_PLAYER_COUNT])
-{		 
+{
 	Int i;
 	Int count = s_numInReadList;
 	s_numInReadList = 0;
@@ -570,19 +562,19 @@ Int ScriptList::getReadScripts(ScriptList *scriptLists[MAX_PLAYER_COUNT])
 		s_readLists[i] = NULL;
 	}
 	return count;
-}								 
+}
 
 /**
 * ScriptList::WriteScriptsDataChunk - Writes a Scripts chunk.
 * Format is the newer CHUNKY format.
 *	See ScriptEngine::ParseScriptsDataChunk for the reader.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void ScriptList::WriteScriptsDataChunk(DataChunkOutput &chunkWriter, ScriptList *scriptLists[], Int numLists )
 {
 	/**********SCRIPTS DATA ***********************/
-	chunkWriter.openDataChunk("PlayerScriptsList", K_SCRIPTS_DATA_VERSION_1);	
+	chunkWriter.openDataChunk("PlayerScriptsList", K_SCRIPTS_DATA_VERSION_1);
 		Int i;
 		for (i=0; i<numLists; i++) {
 			chunkWriter.openDataChunk("ScriptList", K_SCRIPT_LIST_DATA_VERSION_1);
@@ -590,7 +582,7 @@ void ScriptList::WriteScriptsDataChunk(DataChunkOutput &chunkWriter, ScriptList
 			chunkWriter.closeDataChunk();
 		}
 	chunkWriter.closeDataChunk();
-	
+
 }
 
 
@@ -598,8 +590,8 @@ void ScriptList::WriteScriptsDataChunk(DataChunkOutput &chunkWriter, ScriptList
 /**
 * ScriptList::WriteScriptListDataChunk - Writes a Scripts chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void ScriptList::WriteScriptListDataChunk(DataChunkOutput &chunkWriter)
 {
@@ -613,8 +605,8 @@ void ScriptList::WriteScriptListDataChunk(DataChunkOutput &chunkWriter)
 * ScriptList::ParseScriptListDataChunk - read a Scripts chunk.
 * Format is the newer CHUNKY format.
 *	See ScriptList::WriteScriptListDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptList::ParseScriptListDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -624,10 +616,10 @@ Bool ScriptList::ParseScriptListDataChunk(DataChunkInput &file, DataChunkInfo *i
 	pInfo->readLists[pInfo->numLists] = newInstance(ScriptList);
 	Int cur = pInfo->numLists;
 	pInfo->numLists++;
-	file.registerParser( AsciiString("Script"), info->label, Script::ParseScriptFromListDataChunk );
-	file.registerParser( AsciiString("ScriptGroup"), info->label, ScriptGroup::ParseGroupDataChunk );
+	file.registerParser( "Script", info->label, Script::ParseScriptFromListDataChunk );
+	file.registerParser( "ScriptGroup", info->label, ScriptGroup::ParseGroupDataChunk );
 	return file.parse(pInfo->readLists[cur]);
-	
+
 }
 
 
@@ -643,10 +635,7 @@ m_firstScript(NULL),
 m_hasWarnings(false),
 m_isGroupActive(true),
 m_isGroupSubroutine(false),
-//Added By Sadullah Nader
-//Initializations inserted
 m_nextGroup(NULL)
-//
 {
 	m_groupName.format("Script Group %d", ScriptList::getNextID());
 }
@@ -655,22 +644,21 @@ m_nextGroup(NULL)
   Dtor - The script list deletes the rest of the list, but we have to loop & delete
 	sll the script groups in out list.
 */
-ScriptGroup::~ScriptGroup(void) 
+ScriptGroup::~ScriptGroup(void)
 {
-	if (m_firstScript) {
-		// Delete the first script.  m_firstScript deletes the entire list.
-		deleteInstance(m_firstScript);
-		m_firstScript = NULL;
-	}
+	// Delete the first script.  m_firstScript deletes the entire list.
+	deleteInstance(m_firstScript);
+	m_firstScript = NULL;
+
 	if (m_nextGroup) {
 		// Delete all the subsequent groups in our list.
 		ScriptGroup *cur = m_nextGroup;
 		ScriptGroup *next;
 		while (cur) {
 			next = cur->getNext();
-			cur->setNextGroup(NULL); // prevents recursion. 
+			cur->setNextGroup(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
 }
@@ -681,12 +669,12 @@ ScriptGroup::~ScriptGroup(void)
 void ScriptGroup::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: m_isGroupActive, since it is twiddled by other scripts.  Only its initial state is determined by the map.
 */
 // ------------------------------------------------------------------------------------------------
@@ -714,7 +702,7 @@ void ScriptGroup::xfer( Xfer *xfer )
 		DEBUG_CRASH(( "ScriptGroup::xfer - Script list count has changed, attempting to recover."));
 		// throw SC_INVALID_DATA; try to recover. jba.
 
-	}  // end if
+	}
 
 	// xfer script data
 	for( script = getScript(); script; script = script->getNext() )	{
@@ -731,7 +719,7 @@ void ScriptGroup::xfer( Xfer *xfer )
 		}
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -739,15 +727,15 @@ void ScriptGroup::xfer( Xfer *xfer )
 void ScriptGroup::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 /**
   ScriptGroup::duplicate - Creates a full, "deep" copy of ScriptGroup.
 	m_nextGroup is NULL on the copy.
 */
-ScriptGroup *ScriptGroup::duplicate(void) const 
+ScriptGroup *ScriptGroup::duplicate(void) const
 {
-	ScriptGroup *pNew = newInstance(ScriptGroup);	
+	ScriptGroup *pNew = newInstance(ScriptGroup);
 
 	{
 		Script *src = this->m_firstScript;
@@ -775,12 +763,12 @@ ScriptGroup *ScriptGroup::duplicate(void) const
 }
 
 /**
-  ScriptGroup::duplicateAndQualify - Creates a full, "deep" copy of ScriptGroup, 
+  ScriptGroup::duplicateAndQualify - Creates a full, "deep" copy of ScriptGroup,
 	adding qualifier to names.
 	m_nextGroup is NULL on the copy.
 */
-ScriptGroup *ScriptGroup::duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const 
+ScriptGroup *ScriptGroup::duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const
 {
 	ScriptGroup *pNew = newInstance(ScriptGroup);
 
@@ -860,8 +848,8 @@ void ScriptGroup::addScript(Script *pScr, Int ndx)
 /**
 * ScriptGroup::WriteGroupDataChunk - Writes a Scripts chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void ScriptGroup::WriteGroupDataChunk(DataChunkOutput &chunkWriter, ScriptGroup *pGroup)
 {
@@ -876,15 +864,15 @@ void ScriptGroup::WriteGroupDataChunk(DataChunkOutput &chunkWriter, ScriptGroup
 		chunkWriter.closeDataChunk();
 		pGroup = pGroup->getNext();
 	}
-	
+
 }
 
 /**
 * ScriptGroup::ParseGroupDataChunk - read a Group chunk.
 * Format is the newer CHUNKY format.
 *	See ScriptList::WriteScriptListDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptGroup::ParseGroupDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -897,9 +885,9 @@ Bool ScriptGroup::ParseGroupDataChunk(DataChunkInput &file, DataChunkInfo *info,
 		pGroup->m_isGroupSubroutine= file.readByte();
 	}
 	pList->addGroup(pGroup, AT_END);
-	file.registerParser( AsciiString("Script"), info->label, Script::ParseScriptFromGroupDataChunk );
+	file.registerParser( "Script", info->label, Script::ParseScriptFromGroupDataChunk );
 	return file.parse(pGroup);
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -913,7 +901,7 @@ m_isActive(true),
 m_isOneShot(true),
 m_easy(true),
 m_normal(true),
-m_hard(true),	
+m_hard(true),
 m_delayEvaluationSeconds(0),
 m_conditionTime(0),
 m_conditionExecutedCount(0),
@@ -923,11 +911,8 @@ m_hasWarnings(false),
 m_nextScript(NULL),
 m_condition(NULL),
 m_action(NULL),
-//Added By Sadullah Nader
-//Initializations inserted
 m_actionFalse(NULL),
 m_curTime(0.0f)
-//
 {
 }
 
@@ -935,28 +920,22 @@ m_curTime(0.0f)
   Dtor - The condition and action deletes the rest of the list, but we have to loop & delete
 	all the scripts in out list.
 */
-Script::~Script(void) 
+Script::~Script(void)
 {
 	if (m_nextScript) {
 		Script *cur = m_nextScript;
 		Script *next;
 		while (cur) {
 			next = cur->getNext();
-			cur->setNextScript(NULL); // prevents recursion. 
+			cur->setNextScript(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
-	if (m_condition) {
-		deleteInstance(m_condition);
-	}
-	if (m_action) {
-		deleteInstance(m_action);
-	}
 
-	if (m_actionFalse) {
-		deleteInstance(m_actionFalse);
-	}
+	deleteInstance(m_condition);
+	deleteInstance(m_action);
+	deleteInstance(m_actionFalse);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -965,7 +944,7 @@ Script::~Script(void)
 void Script::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -985,7 +964,7 @@ void Script::xfer( Xfer *xfer )
 	xfer->xferBool( &active );
 	setActive( active );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -993,22 +972,17 @@ void Script::xfer( Xfer *xfer )
 void Script::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 /**
   Script::duplicate - Creates a full, "deep" copy of script. Condition list and action
   list is duplicated as well.  Note - just the script, doesn't
 	duplicate a list of scripts.  m_nextScript is NULL on the copy.
 */
-Script *Script::duplicate(void) const 
+Script *Script::duplicate(void) const
 {
-	Script *pNew = newInstance(Script);	
-	if (pNew->m_condition) {
-		deleteInstance(pNew->m_condition);
-	}
-	if (pNew->m_action) {
-		deleteInstance(pNew->m_action);
-	}
+	Script *pNew = newInstance(Script);
+
 	pNew->m_scriptName = m_scriptName;
 	pNew->m_comment = m_comment;
 	pNew->m_conditionComment = m_conditionComment;
@@ -1020,6 +994,7 @@ Script *Script::duplicate(void) const
 	pNew->m_normal = m_normal;
 	pNew->m_hard = m_hard;
 	pNew->m_delayEvaluationSeconds = m_delayEvaluationSeconds;
+
 	if (m_condition) {
 		pNew->m_condition = m_condition->duplicate();
 	}
@@ -1033,21 +1008,16 @@ Script *Script::duplicate(void) const
 }
 
 /**
-  Script::duplicate - Creates a full, "deep" copy of script, with qualifier 
+  Script::duplicate - Creates a full, "deep" copy of script, with qualifier
   added to names. Condition list and action
   list is duplicated as well.  Note - just the script, doesn't
 	duplicate a list of scripts.  m_nextScript is NULL on the copy.
 */
-Script *Script::duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const 
+Script *Script::duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const
 {
 	Script *pNew = newInstance(Script);
-	if (pNew->m_condition) {
-		deleteInstance(pNew->m_condition);
-	}
-	if (pNew->m_action) {
-		deleteInstance(pNew->m_action);
-	}
+
 	pNew->m_scriptName = m_scriptName;
 	pNew->m_scriptName.concat(qualifier);
 	pNew->m_comment = m_comment;
@@ -1060,6 +1030,7 @@ Script *Script::duplicateAndQualify(const AsciiString& qualifier,
 	pNew->m_normal = m_normal;
 	pNew->m_hard = m_hard;
 	pNew->m_delayEvaluationSeconds = m_delayEvaluationSeconds;
+
 	if (m_condition) {
 		pNew->m_condition = m_condition->duplicateAndQualify(qualifier, playerTemplateName, newPlayerName);
 	}
@@ -1073,12 +1044,12 @@ Script *Script::duplicateAndQualify(const AsciiString& qualifier,
 }
 
 /**
-  Script::updateFrom - Copies all the data from pSrc into this.  Any data in this 
+  Script::updateFrom - Copies all the data from pSrc into this.  Any data in this
 	is deleted (conditions, actions).  Note that this guts pSrc, and removes it's conditions
 	and actions.  Intended for use in an edit dialog, where pSrc is a copy edited, and if cancelled
 	discarded, and if not cancelled, updated into the real script, then discarded.
 */
-void Script::updateFrom(Script *pSrc) 
+void Script::updateFrom(Script *pSrc)
 {
 	this->m_scriptName = pSrc->m_scriptName;
 	this->m_comment = pSrc->m_comment;
@@ -1091,19 +1062,16 @@ void Script::updateFrom(Script *pSrc)
 	this->m_easy = pSrc->m_easy;
 	this->m_normal = pSrc->m_normal;
 	this->m_hard = pSrc->m_hard;
-	if (this->m_condition) {
-		deleteInstance(this->m_condition);
-	}
+
+	deleteInstance(this->m_condition);
 	this->m_condition = pSrc->m_condition;
 	pSrc->m_condition = NULL;
-	if (this->m_action) {
-		deleteInstance(this->m_action);
-	}
+
+	deleteInstance(this->m_action);
 	this->m_action = pSrc->m_action;
 	pSrc->m_action = NULL;
-	if (this->m_actionFalse) {
-		deleteInstance(this->m_actionFalse);
-	}
+
+	deleteInstance(this->m_actionFalse);
 	this->m_actionFalse = pSrc->m_actionFalse;
 	pSrc->m_actionFalse = NULL;
 }
@@ -1180,7 +1148,7 @@ void Script::deleteFalseAction(ScriptAction *pAct)
 /**
   Script::getUiText - Creates the string to display in the scripts dialog box.
 */
-AsciiString Script::getUiText(void) 
+AsciiString Script::getUiText(void)
 {
 	AsciiString uiText("*** IF ***\r\n");
 	OrCondition *pOr = m_condition;
@@ -1227,8 +1195,8 @@ AsciiString Script::getUiText(void)
 /**
 * Script::WriteScriptDataChunk - Writes a Scripts chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void Script::WriteScriptDataChunk(DataChunkOutput &chunkWriter, Script *pScript)
 {
@@ -1244,22 +1212,22 @@ void Script::WriteScriptDataChunk(DataChunkOutput &chunkWriter, Script *pScript)
 			chunkWriter.writeByte(pScript->m_isOneShot);
 			chunkWriter.writeByte(pScript->m_easy);
 			chunkWriter.writeByte(pScript->m_normal);
-			chunkWriter.writeByte(pScript->m_hard);	 
-			chunkWriter.writeByte(pScript->m_isSubroutine);	
-			chunkWriter.writeInt(pScript->m_delayEvaluationSeconds);	
+			chunkWriter.writeByte(pScript->m_hard);
+			chunkWriter.writeByte(pScript->m_isSubroutine);
+			chunkWriter.writeInt(pScript->m_delayEvaluationSeconds);
 			if (pScript->m_condition) OrCondition::WriteOrConditionDataChunk(chunkWriter, pScript->m_condition);
 			if (pScript->m_action) ScriptAction::WriteActionDataChunk(chunkWriter, pScript->m_action);
 			if (pScript->m_actionFalse) ScriptAction::WriteActionFalseDataChunk(chunkWriter, pScript->m_actionFalse);
 		chunkWriter.closeDataChunk();
 		pScript = pScript->getNext();
-	}	
+	}
 }
 /**
 * Script::ParseScript - read a script chunk.
 * Format is the newer CHUNKY format.
 *	See ScriptList::WriteScriptDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Script *Script::ParseScript(DataChunkInput &file, unsigned short version)
 {
@@ -1279,14 +1247,14 @@ Script *Script::ParseScript(DataChunkInput &file, unsigned short version)
 	if (version>=K_SCRIPT_DATA_VERSION_2) {
 		pScript->m_delayEvaluationSeconds = file.readInt();
 	}
-	file.registerParser( AsciiString("OrCondition"), AsciiString("Script"), OrCondition::ParseOrConditionDataChunk );
-	file.registerParser( AsciiString("ScriptAction"),  AsciiString("Script"), ScriptAction::ParseActionDataChunk );
-	file.registerParser( AsciiString("ScriptActionFalse"),  AsciiString("Script"), ScriptAction::ParseActionFalseDataChunk );
-	if (! file.parse(pScript) ) 
+	file.registerParser( "OrCondition", "Script", OrCondition::ParseOrConditionDataChunk );
+	file.registerParser( "ScriptAction",  "Script", ScriptAction::ParseActionDataChunk );
+	file.registerParser( "ScriptActionFalse",  "Script", ScriptAction::ParseActionFalseDataChunk );
+	if (! file.parse(pScript) )
 	{
 		return NULL;
 	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return pScript;
 }
 
@@ -1294,15 +1262,15 @@ Script *Script::ParseScript(DataChunkInput &file, unsigned short version)
 * Script::ParseScriptFromListDataChunk - read a script chunk in a script list.
 * Format is the newer CHUNKY format.
 *	See ScriptList::WriteScriptListDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool Script::ParseScriptFromListDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
 	ScriptList *pList = (ScriptList *)userData;
 	Script *pScript = ParseScript(file, info->version);
 	pList->addScript(pScript, AT_END);
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return true;
 }
 
@@ -1310,23 +1278,23 @@ Bool Script::ParseScriptFromListDataChunk(DataChunkInput &file, DataChunkInfo *i
 * Script::ParseScriptFromGroupDataChunk - read a script chunk in a script group.
 * Format is the newer CHUNKY format.
 *	See ScriptList::WriteScriptListDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool Script::ParseScriptFromGroupDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
 	ScriptGroup *pGroup = (ScriptGroup *)userData;
 	Script *pScript = ParseScript(file, info->version);
 	pGroup->addScript(pScript, AT_END);
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return true;
 }
 
 
 /**
 * Script::findPreviousOrCondition - find the OrCondition that immediately proceeds curOr.
-*	Input: OrCondition 
-*		
+*	Input: OrCondition
+*
 */
 OrCondition *Script::findPreviousOrCondition( OrCondition *curOr )
 {
@@ -1334,7 +1302,7 @@ OrCondition *Script::findPreviousOrCondition( OrCondition *curOr )
 	if ( myConditions == curOr ) {
 		return NULL;
 	}
-	
+
 	while (myConditions) {
 		if (myConditions->getNextOrCondition() == curOr) {
 			return myConditions;
@@ -1349,27 +1317,26 @@ OrCondition *Script::findPreviousOrCondition( OrCondition *curOr )
 //-------------------------------------------------------------------------------------------------
 // ******************************** class  OrCondition *********************************************
 //-------------------------------------------------------------------------------------------------
-OrCondition::~OrCondition(void) 
+OrCondition::~OrCondition(void)
 {
-	if (m_firstAnd) {
-		deleteInstance(m_firstAnd);
-		m_firstAnd = NULL;
-	}
+	deleteInstance(m_firstAnd);
+	m_firstAnd = NULL;
+
 	if (m_nextOr) {
 		OrCondition *cur = m_nextOr;
 		OrCondition *next;
 		while (cur) {
 			next = cur->getNextOrCondition();
-			cur->setNextOrCondition(NULL); // prevents recursion. 
+			cur->setNextOrCondition(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
 }
 
-OrCondition *OrCondition::duplicate(void) const 
+OrCondition *OrCondition::duplicate(void) const
 {
-	OrCondition *pNew = newInstance(OrCondition);	
+	OrCondition *pNew = newInstance(OrCondition);
 	if (m_firstAnd) {
 		pNew->m_firstAnd = m_firstAnd->duplicate();
 	}
@@ -1386,8 +1353,8 @@ OrCondition *OrCondition::duplicate(void) const
 	return pNew;
 }
 
-OrCondition *OrCondition::duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const 
+OrCondition *OrCondition::duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const
 {
 	OrCondition *pNew = newInstance(OrCondition);
 	if (m_firstAnd) {
@@ -1416,7 +1383,7 @@ Condition *OrCondition::removeCondition(Condition *pCond)
 	}
 
 	DEBUG_ASSERTCRASH(pCur, ("Couldn't find condition."));
-	if (pCur==NULL) 
+	if (pCur==NULL)
 		return NULL;
 	if (pPrev) {
 		pPrev->setNextCondition(pCur->getNext());
@@ -1432,7 +1399,7 @@ void OrCondition::deleteCondition(Condition *pCond)
 {
 	Condition *pCur = removeCondition(pCond);
 	DEBUG_ASSERTCRASH(pCur, ("Couldn't find condition."));
-	if (pCur==NULL) 
+	if (pCur==NULL)
 		return;
 	deleteInstance(pCur);
 }
@@ -1441,8 +1408,8 @@ void OrCondition::deleteCondition(Condition *pCond)
 /**
 * OrCondition::WriteOrConditionDataChunk - Writes a Or condition chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void OrCondition::WriteOrConditionDataChunk(DataChunkOutput &chunkWriter, OrCondition	*pOrCondition)
 {
@@ -1453,15 +1420,15 @@ void OrCondition::WriteOrConditionDataChunk(DataChunkOutput &chunkWriter, OrCond
 		chunkWriter.closeDataChunk();
 		pOrCondition = pOrCondition->getNextOrCondition();
 	}
-	
+
 }
 
 /**
 * OrCondition::ParseOrConditionDataChunk - read a Or condition chunk.
 * Format is the newer CHUNKY format.
 *	See OrCondition::WriteOrConditionDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool OrCondition::ParseOrConditionDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1476,17 +1443,17 @@ Bool OrCondition::ParseOrConditionDataChunk(DataChunkInput &file, DataChunkInfo
 	} else {
 		pScript->setOrCondition(pOrCondition);
 	}
-	file.registerParser( AsciiString("Condition"), info->label, Condition::ParseConditionDataChunk );
+	file.registerParser( "Condition", info->label, Condition::ParseConditionDataChunk );
 	return file.parse(pOrCondition);
-	
+
 }
 
 /**
 * OrCondition::findPreviousCondition - find the condition that immediately proceeds curCond.
 * Format is the newer CHUNKY format.
 *	See OrCondition::WriteOrConditionDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Condition *OrCondition::findPreviousCondition( Condition *curCond )
 {
@@ -1519,7 +1486,7 @@ m_numParms(0),
 m_nextAndCondition(NULL)
 {
 	Int i;
-	for (i = 0; i < MAX_PARMS; i++) 
+	for (i = 0; i < MAX_PARMS; i++)
 	{
 		m_parms[i] = NULL;
 	}
@@ -1544,21 +1511,20 @@ void Condition::setConditionType(enum ConditionType type)
 {
 	Int i;
 	for (i=0; i<m_numParms; i++) {
-		if (m_parms[i]) 
-			deleteInstance(m_parms[i]);
+		deleteInstance(m_parms[i]);
 		m_parms[i] = NULL;
 	}
 	m_conditionType = type;
 	const ConditionTemplate *pTemplate = TheScriptEngine->getConditionTemplate(m_conditionType);
 	m_numParms = pTemplate->getNumParameters();
 	for (i=0; i<m_numParms; i++) {
-		m_parms[i] = newInstance(Parameter)(pTemplate->getParameterType(i));	
+		m_parms[i] = newInstance(Parameter)(pTemplate->getParameterType(i));
 	}
 }
 
-Condition *Condition::duplicate(void) const 
+Condition *Condition::duplicate(void) const
 {
-	Condition *pNew = newInstance(Condition)(m_conditionType);	
+	Condition *pNew = newInstance(Condition)(m_conditionType);
 	Int i;
 	for (i=0; i<m_numParms && i<pNew->m_numParms; i++) {
 		*pNew->m_parms[i] = *m_parms[i];
@@ -1576,8 +1542,8 @@ Condition *Condition::duplicate(void) const
 	return pNew;
 }
 
-Condition *Condition::duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const 
+Condition *Condition::duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const
 {
 	Condition *pNew = newInstance(Condition)(m_conditionType);
 	Int i;
@@ -1599,7 +1565,7 @@ Condition *Condition::duplicateAndQualify(const AsciiString& qualifier,
 	return pNew;
 }
 
-Condition::~Condition(void) 
+Condition::~Condition(void)
 {
 	Int i;
 	for (i=0; i<m_numParms; i++) {
@@ -1611,9 +1577,9 @@ Condition::~Condition(void)
 		Condition *next;
 		while (cur) {
 			next = cur->getNext();
-			cur->setNextCondition(NULL); // prevents recursion. 
+			cur->setNextCondition(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
 }
@@ -1653,8 +1619,8 @@ AsciiString Condition::getUiText(void)
 /**
 * Condition::WriteConditionDataChunk - Writes a condition chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void Condition::WriteConditionDataChunk(DataChunkOutput &chunkWriter, Condition	*pCondition)
 {
@@ -1676,14 +1642,14 @@ void Condition::WriteConditionDataChunk(DataChunkOutput &chunkWriter, Condition
 			}
 		chunkWriter.closeDataChunk();
 		pCondition = pCondition->getNext();
-	}	
+	}
 }
 /**
 * Condition::ParseConditionDataChunk - read a condition.
 * Format is the newer CHUNKY format.
 *	See Condition::WriteActionDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool Condition::ParseConditionDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1704,7 +1670,7 @@ Bool Condition::ParseConditionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 				ct = TheScriptEngine->getConditionTemplate(i);
 				if (key == ct->m_internalNameKey) {
 					match = true;
-					DEBUG_LOG(("Rematching script condition %s\n", KEYNAME(key).str()));
+					DEBUG_LOG(("Rematching script condition %s", KEYNAME(key).str()));
 					pCondition->m_conditionType = (enum ConditionType)i;
 					break;
 				}
@@ -1719,11 +1685,11 @@ Bool Condition::ParseConditionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 	}
 	pCondition->m_numParms =file.readInt();
 	Int i;
-	for (i=0; i<pCondition->m_numParms; i++) 
+	for (i=0; i<pCondition->m_numParms; i++)
 	{
 		pCondition->m_parms[i] = Parameter::ReadParameter(file);
 	}
-	
+
 	if (file.getChunkVersion() < K_SCRIPT_CONDITION_VERSION_2) {
 		for (int j = 0; ParameterChangesVer2[j] != -1; ++j) {
 			if (pCondition->m_conditionType == ParameterChangesVer2[j]) {
@@ -1733,7 +1699,7 @@ Bool Condition::ParseConditionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 		}
 	}
 	// heal old files.
-	switch (pCondition->getConditionType()) 
+	switch (pCondition->getConditionType())
 	{
 		case SKIRMISH_SPECIAL_POWER_READY:
 			if (pCondition->m_numParms == 1)
@@ -1765,7 +1731,7 @@ Bool Condition::ParseConditionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 	} else {
 		pOr->setFirstAndCondition(pCondition);
 	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return true;
 }
 
@@ -1795,7 +1761,7 @@ Int Template::getUiStrings(AsciiString strings[MAX_PARMS]) const
 //-------------------------------------------------------------------------------------------------
 // ******************************** class Parameter ***********************************************
 //-------------------------------------------------------------------------------------------------
-enum Parameter::ParameterType Template::getParameterType(Int ndx) const 
+enum Parameter::ParameterType Template::getParameterType(Int ndx) const
 {
 	if (ndx >= 0 && ndx < m_numParameters) {
 		return m_parameters[ndx];
@@ -1821,8 +1787,8 @@ void Parameter::setCoord3D(const Coord3D *pLoc)
 	}
 }
 
-void Parameter::qualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) 
+void Parameter::qualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName)
 {
 	AsciiString tmpString;
 	switch (m_paramType) {
@@ -1833,11 +1799,11 @@ void Parameter::qualify(const AsciiString& qualifier,
 				m_string = newPlayerName;
 			}
 			break;
-		case TEAM:	
+		case TEAM:
 			if (m_string == THIS_TEAM) {
 				break;
 			}
-			/// otherwise drop down & qualify.
+			FALLTHROUGH; /// otherwise drop down & qualify.
 		case SCRIPT:
 		case COUNTER:
 		case FLAG:
@@ -1855,7 +1821,7 @@ AsciiString Parameter::getUiText(void) const
 	}
 
 	Coord3D pos;
-	switch (m_paramType) 
+	switch (m_paramType)
 	{
 		default:
 			DEBUG_CRASH(("Unknown parameter type."));
@@ -1914,14 +1880,14 @@ AsciiString Parameter::getUiText(void) const
 		case COORD3D:
 			getCoord3D(&pos);
 			uiText.format("(%.2f,%.2f,%.2f)", pos.x,pos.y,pos.z);
-			break;	
+			break;
 		case OBJECT_TYPE:
 			uiText.format("'%s'", uiString.str());
 			break;
 		case KIND_OF_PARAM:
 			if (m_int >= KINDOF_FIRST && m_int < KINDOF_COUNT )
 				uiText.format("Kind is '%s'", KindOfMaskType::getNameFromSingleBit(m_int));
-			else 
+			else
 				uiText.format("Kind is ???");
 			break;
 		case SIDE:
@@ -1936,7 +1902,7 @@ AsciiString Parameter::getUiText(void) const
 		case BOOLEAN:
 			uiText.concat(m_int?"TRUE":"FALSE");
 			break;
-					 
+
 		case REAL:
 			uiText.format("%.2f", m_real);
 			break;
@@ -1955,7 +1921,7 @@ AsciiString Parameter::getUiText(void) const
 				default : DEBUG_CRASH(("Unknown comparison type."));
 			}
 			break;
-		
+
 		case RELATION:
 			switch (m_int) {
 				case REL_ENEMY: uiText.format("Enemy"); break;
@@ -1979,7 +1945,7 @@ AsciiString Parameter::getUiText(void) const
 		case RADAR_EVENT_TYPE:
 			switch (m_int) {
 				//case RADAR_EVENT_INVALID: ++m_int;	// continue to the next case.
-				case RADAR_EVENT_INVALID: DEBUG_CRASH(("Invalid radar event\n")); uiText.format("Construction"); break;
+				case RADAR_EVENT_INVALID: DEBUG_CRASH(("Invalid radar event")); uiText.format("Construction"); break;
 				case RADAR_EVENT_CONSTRUCTION: uiText.format("Construction"); break;
 				case RADAR_EVENT_UPGRADE: uiText.format("Upgrade"); break;
 				case RADAR_EVENT_UNDER_ATTACK: uiText.format("Under Attack"); break;
@@ -1988,7 +1954,7 @@ AsciiString Parameter::getUiText(void) const
 				default : DEBUG_CRASH(("Unknown Radar event type."));
 			}
 			break;
-			
+
     case LEFT_OR_RIGHT:
       switch (m_int)
       {
@@ -1998,7 +1964,7 @@ AsciiString Parameter::getUiText(void) const
         default :  uiText.format("unspecified"); break;
       }
       break;
-      
+
 
 
 		case DIALOG:
@@ -2036,16 +2002,16 @@ AsciiString Parameter::getUiText(void) const
 		case UPGRADE:
 			uiText.format("Upgrade '%s'", uiString.str());
 			break;
-		
+
 		case COMMANDBUTTON_ABILITY:
 		case COMMANDBUTTON_ALL_ABILITIES:
 			uiText.format( "Ability '%s'", uiString.str() );
 			break;
-			
+
 		case EMOTICON:
 			uiText.format( "Emoticon '%s'", uiString.str() );
 			break;
-			
+
 		case BOUNDARY:
 			uiText.format("Boundary %s", BORDER_COLORS[m_int % BORDER_COLORS_SIZE].m_colorName);
 			break;
@@ -2053,15 +2019,15 @@ AsciiString Parameter::getUiText(void) const
 		case BUILDABLE:
 			if (m_int >= BSTATUS_YES && m_int < BSTATUS_NUM_TYPES )
 				uiText.format("Buildable (%s)", BuildableStatusNames[m_int - BSTATUS_YES]);
-			else 
+			else
 				uiText.format("Buildable ???");
 			break;
-		
+
 		case SURFACES_ALLOWED:
 		{
 			if (m_int > 0 && m_int <= 3)
 				uiText.format("Surfaces Allowed: %s", Surfaces[m_int - 1]);
-			else 
+			else
 				uiText.format("Surfaces Allowed: ???");
 			break;
 		}
@@ -2074,7 +2040,7 @@ AsciiString Parameter::getUiText(void) const
 				uiText.format("Shake Intensity: ???");
 			break;
 		}
-		
+
 		case OBJECT_STATUS:
 		{
 			if (m_string.isEmpty()) {
@@ -2094,7 +2060,7 @@ AsciiString Parameter::getUiText(void) const
 		case OBJECT_TYPE_LIST:
 			uiText.format("'%s'", uiString.str());
 			break;
-			
+
 		case REVEALNAME:
 			uiText.format("Reveal Name: %s", uiString.str());
 			break;
@@ -2109,8 +2075,8 @@ AsciiString Parameter::getUiText(void) const
 /**
 * Parameter::WriteParameter - Writes an Parameter.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void Parameter::WriteParameter(DataChunkOutput &chunkWriter)
 {
@@ -2136,8 +2102,8 @@ void Parameter::WriteParameter(DataChunkOutput &chunkWriter)
 * Parameter::ReadParameter - read a parameter.
 * Format is the newer CHUNKY format.
 *	See Parameter::WriteParameter for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Parameter *Parameter::ReadParameter(DataChunkInput &file)
 {
@@ -2149,46 +2115,46 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)
 		pos.y = file.readReal();
 		pos.z = file.readReal();
 		pParm->setCoord3D(&pos);
-	} 
-	else 
+	}
+	else
 	{
 		pParm->m_int = file.readInt();
 		pParm->m_real = file.readReal();
 		pParm->m_string = file.readAsciiString();
 	}
 
-	if (pParm->getParameterType() == OBJECT_TYPE) 
+	if (pParm->getParameterType() == OBJECT_TYPE)
 	{
 		// quick hack to make loading models with "Fundamentalist" switch to "GLA"
-		if (pParm->m_string.startsWith("Fundamentalist")) 
+		if (pParm->m_string.startsWith("Fundamentalist"))
 		{
-			char oldName[256];
+			const char* replacePrefix = "Fundamentalist";
+			const size_t offset = pParm->m_string.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
 			char newName[256];
-			strcpy(oldName, pParm->m_string.str());
 			strcpy(newName, "GLA");
-			strcat(newName, oldName+strlen("Fundamentalist"));
+			strlcat(newName, pParm->m_string.str() + offset, ARRAY_SIZE(newName));
+			DEBUG_LOG(("Changing Script Ref from %s to %s", pParm->m_string.str(), newName));
 			pParm->m_string.set(newName);
-			DEBUG_LOG(("Changing Script Ref from %s to %s\n", oldName, newName));
 		}
 	}
 
-	if (pParm->getParameterType() == UPGRADE) 
+	if (pParm->getParameterType() == UPGRADE)
 	{
 		// quick hack to make obsolete capture building upgrades switch to the new one. jba.
 		if (pParm->m_string == "Upgrade_AmericaRangerCaptureBuilding" ||
 			pParm->m_string == "Upgrade_ChinaRedguardCaptureBuilding" ||
-			pParm->m_string == "Upgrade_GLARebelCaptureBuilding") 
+			pParm->m_string == "Upgrade_GLARebelCaptureBuilding")
 		{
 			pParm->m_string.set("Upgrade_InfantryCaptureBuilding");
 		}
 	}
 
-	if (pParm->getParameterType() == OBJECT_STATUS) 
+	if (pParm->getParameterType() == OBJECT_STATUS)
 	{
 		// Need to change the string to an ObjectStatusMaskType
-		for( int i = 0; i < OBJECT_STATUS_COUNT; ++i ) 
+		for( int i = 0; i < OBJECT_STATUS_COUNT; ++i )
 		{
-			if( !pParm->m_string.compareNoCase( ObjectStatusMaskType::getBitNames()[i] ) ) 
+			if( !pParm->m_string.compareNoCase( ObjectStatusMaskType::getBitNames()[i] ) )
 			{
 				pParm->setStatus( MAKE_OBJECT_STATUS_MASK( i ) );
 				break;
@@ -2196,16 +2162,16 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)
 		}
 	}
 
-	if (pParm->getParameterType() == KIND_OF_PARAM) 
+	if (pParm->getParameterType() == KIND_OF_PARAM)
   {
 		// Need to change the string to an integer
-		const char** kindofNames = KindOfMaskType::getBitNames();
-		if (!pParm->m_string.isEmpty()) 
+		const char* const* kindofNames = KindOfMaskType::getBitNames();
+		if (!pParm->m_string.isEmpty())
     {
 			Bool found = false;
-			for (int i = 0; kindofNames[i]; ++i) 
+			for (int i = 0; kindofNames[i]; ++i)
 			{
-				if (pParm->m_string.compareNoCase(kindofNames[i]) == 0) 
+				if (pParm->m_string.compareNoCase(kindofNames[i]) == 0)
         {
 					pParm->setInt(i);
 					found = true;
@@ -2241,7 +2207,7 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)
 					pParm->m_string.format( "SMALL_MISSILE" );
 					for( i = 0; kindofNames[i]; ++i )
 					{
-						if (pParm->m_string.compareNoCase("SMALL_MISSILE") == 0) 
+						if (pParm->m_string.compareNoCase("SMALL_MISSILE") == 0)
 						{
 							pParm->setInt(i);
 							found = true;
@@ -2250,15 +2216,15 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)
 					}
 					DEBUG_CRASH(("Unable to find Kindof SMALL_MISSILE', please call KrisM (x36844).", pParm->m_string.str()));
 				}
-				
+
 			}
-			if (!found) 
+			if (!found)
       {
 				DEBUG_CRASH(("Unable to find Kindof '%s', please call JKM (x36872).", pParm->m_string.str()));
 				throw ERROR_BUG;
 			}
-		} 
-    else 
+		}
+    else
     {
 			// Seems weird, but this is so WB will load them into the proper format.
 			pParm->m_string = kindofNames[pParm->m_int];
@@ -2275,10 +2241,7 @@ ScriptAction::ScriptAction():
 m_actionType(NO_OP),
 m_hasWarnings(false),
 m_numParms(0),
-//Added By Sadullah Nader
-//Initializations inserted
 m_nextAction(NULL)
-//
 {
 }
 
@@ -2297,8 +2260,7 @@ void ScriptAction::setActionType(enum ScriptActionType type)
 {
 	Int i;
 	for (i=0; i<m_numParms; i++) {
-		if (m_parms[i]) 
-			deleteInstance(m_parms[i]);
+		deleteInstance(m_parms[i]);
 		m_parms[i] = NULL;
 	}
 	m_actionType = type;
@@ -2309,9 +2271,9 @@ void ScriptAction::setActionType(enum ScriptActionType type)
 	}
 }
 
-ScriptAction *ScriptAction::duplicate(void) const 
+ScriptAction *ScriptAction::duplicate(void) const
 {
-	ScriptAction *pNew = newInstance(ScriptAction)(m_actionType);	
+	ScriptAction *pNew = newInstance(ScriptAction)(m_actionType);
 	Int i;
 	for (i=0; i<m_numParms; i++) {
 		if (pNew->m_parms[i]) {
@@ -2333,8 +2295,8 @@ ScriptAction *ScriptAction::duplicate(void) const
 	return pNew;
 }
 
-ScriptAction *ScriptAction::duplicateAndQualify(const AsciiString& qualifier, 
-			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const 
+ScriptAction *ScriptAction::duplicateAndQualify(const AsciiString& qualifier,
+			const AsciiString& playerTemplateName, const AsciiString& newPlayerName) const
 {
 	ScriptAction *pNew = newInstance(ScriptAction)(m_actionType);
 	Int i;
@@ -2360,7 +2322,7 @@ ScriptAction *ScriptAction::duplicateAndQualify(const AsciiString& qualifier,
 	return pNew;
 }
 
-ScriptAction::~ScriptAction(void) 
+ScriptAction::~ScriptAction(void)
 {
 	Int i;
 	for (i=0; i<m_numParms; i++) {
@@ -2372,9 +2334,9 @@ ScriptAction::~ScriptAction(void)
 		ScriptAction *next;
 		while (cur) {
 			next = cur->getNext();
-			cur->setNextAction(NULL); // prevents recursion. 
+			cur->setNextAction(NULL); // prevents recursion.
 			deleteInstance(cur);
-			cur = next; 
+			cur = next;
 		}
 	}
 }
@@ -2413,8 +2375,8 @@ AsciiString ScriptAction::getUiText(void)
 /**
 * ScriptAction::WriteActionDataChunk - Writes an Action chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void ScriptAction::WriteActionDataChunk(DataChunkOutput &chunkWriter, ScriptAction	*pScriptAction)
 {
@@ -2436,15 +2398,15 @@ void ScriptAction::WriteActionDataChunk(DataChunkOutput &chunkWriter, ScriptActi
 			}
 		chunkWriter.closeDataChunk();
 		pScriptAction = pScriptAction->getNext();
-	}	
+	}
 }
 
 /**
 * ScriptAction::ParseAction - read an action chunk in a script list.
 * Format is the newer CHUNKY format.
 *	See ScriptAction::WriteActionDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 ScriptAction *ScriptAction::ParseAction(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -2466,7 +2428,7 @@ ScriptAction *ScriptAction::ParseAction(DataChunkInput &file, DataChunkInfo *inf
 				at = TheScriptEngine->getActionTemplate(i);
 				if (key == at->m_internalNameKey) {
 					match = true;
-					DEBUG_LOG(("Rematching script action %s\n", KEYNAME(key).str()));
+					DEBUG_LOG(("Rematching script action %s", KEYNAME(key).str()));
 					pScriptAction->m_actionType = (enum ScriptActionType)i;
 					break;
 				}
@@ -2482,7 +2444,7 @@ ScriptAction *ScriptAction::ParseAction(DataChunkInput &file, DataChunkInfo *inf
 #ifdef DEBUG_CRASHING
 	Script *pScript = (Script *)userData;
 	if (at && (at->getName().isEmpty() || (at->getName().compareNoCase("(placeholder)") == 0))) {
-		DEBUG_CRASH(("Invalid Script Action found in script '%s'\n", pScript->getName().str()));
+		DEBUG_CRASH(("Invalid Script Action found in script '%s'", pScript->getName().str()));
 	}
 #endif
 #ifdef COUNT_SCRIPT_USAGE
@@ -2492,13 +2454,13 @@ ScriptAction *ScriptAction::ParseAction(DataChunkInput &file, DataChunkInfo *inf
 #endif
 	pScriptAction->m_numParms =file.readInt();
 	Int i;
-	for (i=0; i<pScriptAction->m_numParms; i++) 
+	for (i=0; i<pScriptAction->m_numParms; i++)
 	{
 		pScriptAction->m_parms[i] = Parameter::ReadParameter(file);
 	}
 
 	// heal old files.
-	switch (pScriptAction->getActionType()) 
+	switch (pScriptAction->getActionType())
 	{
 		case SKIRMISH_FIRE_SPECIAL_POWER_AT_MOST_COST:
 			if (pScriptAction->m_numParms == 1)
@@ -2518,7 +2480,7 @@ ScriptAction *ScriptAction::ParseAction(DataChunkInput &file, DataChunkInfo *inf
 			break;
 		case SKIRMISH_BUILD_BASE_DEFENSE_FRONT:
 			if (pScriptAction->m_numParms == 1)
-			{		
+			{
 				Bool flank = pScriptAction->m_parms[0]->getInt()!=0;
 				deleteInstance(pScriptAction->m_parms[0]);
 				pScriptAction->m_numParms = 0;
@@ -2527,7 +2489,7 @@ ScriptAction *ScriptAction::ParseAction(DataChunkInput &file, DataChunkInfo *inf
 			break;
 		case NAMED_SET_ATTITUDE:
 		case TEAM_SET_ATTITUDE:
-			if (pScriptAction->m_numParms >= 2 && pScriptAction->m_parms[1]->getParameterType() == Parameter::INT) 
+			if (pScriptAction->m_numParms >= 2 && pScriptAction->m_parms[1]->getParameterType() == Parameter::INT)
 			{
 				pScriptAction->m_parms[1] = newInstance(Parameter)(Parameter::AI_MOOD, pScriptAction->m_parms[1]->getInt());
 			}
@@ -2551,13 +2513,13 @@ ScriptAction *ScriptAction::ParseAction(DataChunkInput &file, DataChunkInfo *inf
 			}
 			break;
 		case SPEECH_PLAY:
-			if (pScriptAction->getNumParameters() == 1) 
+			if (pScriptAction->getNumParameters() == 1)
 			{
 				pScriptAction->m_numParms = 2;
 				// Default it to TRUE, as per conversation with JohnL
 				pScriptAction->m_parms[1] = newInstance(Parameter)(Parameter::BOOLEAN, 1);
-				break;
 			}
+			break;
 		case CAMERA_MOD_SET_FINAL_ZOOM:
 		case CAMERA_MOD_SET_FINAL_PITCH:
 			if (pScriptAction->getNumParameters() == 1)
@@ -2611,7 +2573,7 @@ ScriptAction *ScriptAction::ParseAction(DataChunkInput &file, DataChunkInfo *inf
 		pScriptAction->m_actionType = ScriptAction::NO_OP;
 		pScriptAction->m_numParms = 0;
 	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return pScriptAction;
 }
 
@@ -2619,8 +2581,8 @@ ScriptAction *ScriptAction::ParseAction(DataChunkInput &file, DataChunkInfo *inf
 * ScriptAction::ParseActionDataChunk - read an action chunk in a script list.
 * Format is the newer CHUNKY format.
 *	See ScriptAction::WriteActionDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptAction::ParseActionDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -2629,20 +2591,20 @@ Bool ScriptAction::ParseActionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 	ScriptAction	*pScriptAction = ParseAction(file, info, userData);
 
 	ScriptAction *pLast = pScript->getAction();
-	while (pLast && pLast->getNext()) 
+	while (pLast && pLast->getNext())
 	{
 		pLast = pLast->getNext();
 	}
 
-	if (pLast) 
+	if (pLast)
 	{
 		pLast->setNextAction(pScriptAction);
-	} 
-	else 
+	}
+	else
 	{
 		pScript->setAction(pScriptAction);
 	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return true;
 }
 
@@ -2650,8 +2612,8 @@ Bool ScriptAction::ParseActionDataChunk(DataChunkInput &file, DataChunkInfo *inf
 /**
 * ScriptAction::WriteActionFalseDataChunk - Writes a false Action chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 void ScriptAction::WriteActionFalseDataChunk(DataChunkOutput &chunkWriter, ScriptAction	*pScriptAction)
 {
@@ -2673,15 +2635,15 @@ void ScriptAction::WriteActionFalseDataChunk(DataChunkOutput &chunkWriter, Scrip
 			}
 		chunkWriter.closeDataChunk();
 		pScriptAction = pScriptAction->getNext();
-	}	
+	}
 }
 
 /**
 * ScriptAction::ParseActionFalseDataChunk - read a false action chunk in a script list.
 * Format is the newer CHUNKY format.
 *	See ScriptAction::WriteActionDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptAction::ParseActionFalseDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -2698,15 +2660,15 @@ Bool ScriptAction::ParseActionFalseDataChunk(DataChunkInput &file, DataChunkInfo
 	} else {
 		pScript->setFalseAction(pScriptAction);
 	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));	
+	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return true;
 }
 
-// NOTE: Changing these or adding ot TheOBjectFlagNames requires changes to 
+// NOTE: Changing these or adding to TheObjectFlagsNames requires changes to
 // ScriptActions::changeObjectPanelFlagForSingleObject
 // THEY SHOULD STAY IN SYNC.
-const char* TheObjectFlagsNames[] = 
-{ 
+const char* const TheObjectFlagsNames[] =
+{
 	"Enabled",
 	"Powered",
 	"Indestructible",
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
index babe8b88b50..901ea818d55 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/VictoryConditions.cpp
@@ -26,12 +26,13 @@
 // Generals multiplayer victory condition specifications
 // Author: Matthew D. Campbell, February 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioEventRTS.h"
 #include "Common/GameAudio.h"
 #include "Common/GameCommon.h"
 #include "Common/GameEngine.h"
+#include "Common/GameUtility.h"
 #include "Common/KindOf.h"
 #include "Common/PlayerList.h"
 #include "Common/Player.h"
@@ -52,11 +53,6 @@
 #include "GameNetwork/GameInfo.h"
 #include "GameNetwork/NetworkDefs.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 #define ISSET(x) (m_victoryConditions & VICTORY_##x)
@@ -67,7 +63,7 @@ VictoryConditionsInterface *TheVictoryConditions = NULL;
 //-------------------------------------------------------------------------------------------------
 inline static Bool areAllies(const Player *p1, const Player *p2)
 {
-	if (p1 != p2 && 
+	if (p1 != p2 &&
 		p1->getRelationship(p2->getDefaultTeam()) == ALLIES &&
 		p2->getRelationship(p1->getDefaultTeam()) == ALLIES)
 		return true;
@@ -80,7 +76,7 @@ class VictoryConditions : public VictoryConditionsInterface
 {
 public:
 	VictoryConditions();
-	
+
 	void init( void );
 	void reset( void );
 	void update( void );
@@ -118,7 +114,7 @@ VictoryConditions::VictoryConditions()
 {
 	reset();
 }
-	
+
 //-------------------------------------------------------------------------------------------------
 void VictoryConditions::init( void )
 {
@@ -146,7 +142,7 @@ void VictoryConditions::reset( void )
 //-------------------------------------------------------------------------------------------------
 void VictoryConditions::update( void )
 {
-	if (!TheRecorder->isMultiplayer() || (m_localSlotNum == -1 && !m_isObserver))
+	if (!TheRecorder->isMultiplayer() || (m_localSlotNum < 0 && !m_isObserver))
 		return;
 
 	// Check for a single winning alliance
@@ -194,7 +190,7 @@ void VictoryConditions::update( void )
 			{
 				ThePartitionManager->revealMapForPlayerPermanently( p->getPlayerIndex() );
 				TheGameClient->updateFakeDrawables();
-				
+
 				TheInGameUI->message("GUI:PlayerHasBeenDefeated", p->getPlayerDisplayName().str() );
 				// People are boneheads. Also play a sound
 				static AudioEventRTS leftGameSound("GUIMessageReceived");
@@ -210,7 +206,7 @@ void VictoryConditions::update( void )
 					GameSlot *slot = (TheGameInfo)?TheGameInfo->getSlot(idx):NULL;
 					if (slot && slot->isAI())
 					{
-						DEBUG_LOG(("Marking AI player %s as defeated\n", pName.str()));
+						DEBUG_LOG(("Marking AI player %s as defeated", pName.str()));
 						slot->setLastFrameInGame(TheGameLogic->getFrame());
 					}
 				}
@@ -233,7 +229,7 @@ void VictoryConditions::update( void )
 				//MessageBoxOk(TheGameText->fetch("GUI:Defeat"), TheGameText->fetch("GUI:LocalDefeat"), NULL);
 			}
 			m_localPlayerDefeated = true;	// don't check again
-			TheRadar->forceOn(TRUE);
+			TheRadar->forceOn(localPlayer->getPlayerIndex(), TRUE);
 			SetInGameChatType( INGAME_CHAT_EVERYONE ); // can't chat to allies after death.  Only to other observers.
 		}
 	}
@@ -315,10 +311,10 @@ void VictoryConditions::cachePlayerPtrs( void )
 	for (Int i=0; i<MAX_PLAYER_COUNT; ++i)
 	{
 		Player *player = ThePlayerList->getNthPlayer(i);
-		DEBUG_LOG(("Checking whether to cache player %d - [%ls], house [%ls]\n", i, player?player->getPlayerDisplayName().str():L"<NOBODY>", (player&&player->getPlayerTemplate())?player->getPlayerTemplate()->getDisplayName().str():L"<NONE>"));
+		DEBUG_LOG(("Checking whether to cache player %d - [%ls], house [%ls]", i, player?player->getPlayerDisplayName().str():L"<NOBODY>", (player&&player->getPlayerTemplate())?player->getPlayerTemplate()->getDisplayName().str():L"<NONE>"));
 		if (player && player != ThePlayerList->getNeutralPlayer() && player->getPlayerTemplate() && player->getPlayerTemplate() != civTemplate && !player->isPlayerObserver())
 		{
-			DEBUG_LOG(("Caching player\n"));
+			DEBUG_LOG(("Caching player"));
 			m_players[playerCount] = player;
 			if (m_players[playerCount]->isLocalPlayer())
 				m_localSlotNum = playerCount;
@@ -333,8 +329,6 @@ void VictoryConditions::cachePlayerPtrs( void )
 	if (m_localSlotNum < 0)
 	{
 		m_localPlayerDefeated = true;	// if we have no local player, don't check for defeat
-		DEBUG_ASSERTCRASH(TheRadar, ("No Radar!"));
-		TheRadar->forceOn(TRUE);
 		m_isObserver = true;
 	}
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/CaveSystem.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/CaveSystem.cpp
index 4647bbff0e7..878e3e70551 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/CaveSystem.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/CaveSystem.cpp
@@ -27,7 +27,7 @@
 // Desc:   System responsible for keeping track of all cave systems on the map
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameState.h"
 #include "Common/TunnelTracker.h"
@@ -52,11 +52,8 @@ void CaveSystem::reset()
 {
 	for( std::vector<TunnelTracker*>::iterator iter = m_tunnelTrackerVector.begin(); iter != m_tunnelTrackerVector.end(); iter++ )
 	{
-		TunnelTracker *currentTracker = *iter;
-		if( currentTracker )// could be NULL, since we don't slide back to fill deleted entries so offsets don't shift
-		{
-			deleteInstance(currentTracker);
-		}
+		TunnelTracker *currentTracker = *iter; // could be NULL, since we don't slide back to fill deleted entries so offsets don't shift
+		deleteInstance(currentTracker);
 	}
 	m_tunnelTrackerVector.clear();
 }
@@ -83,7 +80,7 @@ Bool CaveSystem::canSwitchIndexToIndex( Int oldIndex, Int newIndex )
 			return FALSE;// You can't switch a connection if one of the two is non empty
 	}
 
-	// Both are either empty or non-existent, so go ahead.  
+	// Both are either empty or non-existent, so go ahead.
 	// (Remember non-exist is only a valid case because you are going to do the switch now.)
 
 	return TRUE;
@@ -159,9 +156,9 @@ void CaveSystem::xfer( Xfer *xfer )
 			tracker = *it;
 			xfer->xferSnapshot( tracker );
 
-		}  // end
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -169,10 +166,10 @@ void CaveSystem::xfer( Xfer *xfer )
 		if( m_tunnelTrackerVector.empty() == FALSE )
 		{
 
-			DEBUG_CRASH(( "CaveSystem::xfer - m_tunnelTrackerVector should be empty but is not\n" ));
+			DEBUG_CRASH(( "CaveSystem::xfer - m_tunnelTrackerVector should be empty but is not" ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// read each item
 		for( UnsignedShort i = 0; i < count; ++i )
@@ -187,10 +184,10 @@ void CaveSystem::xfer( Xfer *xfer )
 			// put in vector
 			m_tunnelTrackerVector.push_back( tracker );
 
-		}  // end for, i
+		}
 
-	}  // end else, laod
+	}
 
-}  // end xfer
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp
index 5bae8f4c4f5..33eb9cef8e6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp
@@ -27,7 +27,7 @@
 // Desc:   System responsible for Crates as code objects - ini, new/delete etc
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #define DEFINE_VETERANCY_NAMES				// for TheVeterancyNames[]
 
@@ -47,10 +47,7 @@ CrateSystem::~CrateSystem()
 	for( Int templateIndex = 0; templateIndex < count; templateIndex ++ )
 	{
 		CrateTemplate *currentTemplate = m_crateTemplateVector[templateIndex];
-		if( currentTemplate )
-		{
-			deleteInstance(currentTemplate);
-		}
+		deleteInstance(currentTemplate);
 	}
 	m_crateTemplateVector.clear();
 }
@@ -93,7 +90,7 @@ void CrateSystem::parseCrateTemplateDefinition(INI* ini)
 
 	// read the crateTemplate name
 	const char* c = ini->getNextToken();
-	name.set(c);	
+	name.set(c);
 
 	CrateTemplate *crateTemplate = TheCrateSystem->friend_findCrateTemplate(name);
 	if (crateTemplate == NULL) {
@@ -122,7 +119,7 @@ CrateTemplate *CrateSystem::newCrateTemplate( AsciiString name )
 	CrateTemplate *ct = newInstance(CrateTemplate);
 
 	// if the default template is present, get it and copy over any data to the new template
-	const CrateTemplate *defaultCT = findCrateTemplate(AsciiString("DefaultCrate"));
+	const CrateTemplate *defaultCT = findCrateTemplate("DefaultCrate");
 	if(defaultCT)
 	{
 		*ct = *defaultCT;
@@ -157,7 +154,7 @@ const CrateTemplate *CrateSystem::findCrateTemplate(AsciiString name) const
 			CrateTemplateOverride overridable(m_crateTemplateVector[i]);
 			return overridable;
 		}
-		
+
 
 	return NULL;
 }
@@ -180,7 +177,7 @@ CrateTemplate *CrateSystem::friend_findCrateTemplate(AsciiString name)
 //--------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------
-const FieldParse CrateTemplate::TheCrateTemplateFieldParseTable[] = 
+const FieldParse CrateTemplate::TheCrateTemplateFieldParseTable[] =
 {
 	{ "CreationChance",		INI::parseReal,													NULL,									offsetof( CrateTemplate, m_creationChance ) },
 	{ "VeterancyLevel",		INI::parseIndexList,										TheVeterancyNames,		offsetof( CrateTemplate, m_veterancyLevel ) },
@@ -188,13 +185,11 @@ const FieldParse CrateTemplate::TheCrateTemplateFieldParseTable[] =
 	{ "CrateObject",			CrateTemplate::parseCrateCreationEntry,	NULL,									NULL },
 	{ "KillerScience",		INI::parseScience,											NULL,									offsetof( CrateTemplate, m_killerScience) },
 	{ "OwnedByMaker",			INI::parseBool,													NULL,									offsetof( CrateTemplate, m_isOwnedByMaker) },
-	{ NULL,								NULL,																		NULL,									NULL },		// keep this last!
+	{ NULL,								NULL,																		NULL,									NULL },
 };
 
 CrateTemplate::CrateTemplate()
 {
-	m_name = "";
-
 	m_creationChance = 0;
 	CLEAR_KINDOFMASK(m_killedByTypeKindof);
 	m_veterancyLevel = LEVEL_INVALID;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/Damage.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/Damage.cpp
index 6012a3361e6..15a07b0c608 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/Damage.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/Damage.cpp
@@ -39,39 +39,40 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-const char* DamageTypeFlags::s_bitNameList[] = 
+template<>
+const char* const DamageTypeFlags::s_bitNameList[] =
 {
-	"EXPLOSION",			
-	"CRUSH",					
+	"EXPLOSION",
+	"CRUSH",
 	"ARMOR_PIERCING",
-	"SMALL_ARMS",		
-	"GATTLING",			
-	"RADIATION",			
-	"FLAME",					
-	"LASER",					
-	"SNIPER",				
-	"POISON",			
-	"HEALING",	
-	"UNRESISTABLE",	
+	"SMALL_ARMS",
+	"GATTLING",
+	"RADIATION",
+	"FLAME",
+	"LASER",
+	"SNIPER",
+	"POISON",
+	"HEALING",
+	"UNRESISTABLE",
 	"WATER",
-	"DEPLOY",	
-	"SURRENDER",	
-	"HACK",	
-	"KILL_PILOT",	
-	"PENALTY",	
-	"FALLING",	
-	"MELEE",	
-	"DISARM",	
-	"HAZARD_CLEANUP",	
+	"DEPLOY",
+	"SURRENDER",
+	"HACK",
+	"KILL_PILOT",
+	"PENALTY",
+	"FALLING",
+	"MELEE",
+	"DISARM",
+	"HAZARD_CLEANUP",
 	"PARTICLE_BEAM",
 	"TOPPLING",
-	"INFANTRY_MISSILE",	
-	"AURORA_BOMB",	
-	"LAND_MINE",	
-	"JET_MISSILES",	
-	"STEALTHJET_MISSILES",	
-	"MOLOTOV_COCKTAIL",	
-	"COMANCHE_VULCAN",	
+	"INFANTRY_MISSILE",
+	"AURORA_BOMB",
+	"LAND_MINE",
+	"JET_MISSILES",
+	"STEALTHJET_MISSILES",
+	"MOLOTOV_COCKTAIL",
+	"COMANCHE_VULCAN",
 	"SUBDUAL_MISSILE",
 	"SUBDUAL_VEHICLE",
 	"SUBDUAL_BUILDING",
@@ -82,6 +83,7 @@ const char* DamageTypeFlags::s_bitNameList[] =
 
 	NULL
 };
+static_assert(ARRAY_SIZE(DamageTypeFlags::s_bitNameList) == DamageTypeFlags::NumBits + 1, "Incorrect array size");
 
 DamageTypeFlags DAMAGE_TYPE_FLAGS_NONE; 	// inits to all zeroes
 DamageTypeFlags DAMAGE_TYPE_FLAGS_ALL;
@@ -110,12 +112,12 @@ void DamageInfo::xfer( Xfer *xfer )
 	// xfer output
 	xfer->xferSnapshot( &out );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version 
+	* 1: Initial version
 	* 2: Damage FX override
 */
 // ------------------------------------------------------------------------------------------------
@@ -169,7 +171,7 @@ void DamageInfoInput::xfer( Xfer *xfer )
 		}
 	}
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -193,5 +195,5 @@ void DamageInfoOutput::xfer( Xfer *xfer )
 	// no effect
 	xfer->xferBool( &m_noEffect );
 
-}  // end xfer
+}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
index db71d5c7eb9..67a23d92c0d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
@@ -27,20 +27,23 @@
 // Author: Michael S. Booth, October 2000
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/AudioAffect.h"
 #include "Common/AudioHandleSpecialValues.h"
 #include "Common/BuildAssistant.h"
 #include "Common/CRCDebug.h"
+#include "Common/FramePacer.h"
 #include "Common/GameAudio.h"
 #include "Common/GameEngine.h"
 #include "Common/GameLOD.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/INI.h"
 #include "Common/LatchRestore.h"
 #include "Common/MapObject.h"
 #include "Common/MultiplayerSettings.h"
+#include "Common/OSDisplay.h"
 #include "Common/PerfTimer.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -72,7 +75,6 @@
 #include "GameClient/ParticleSys.h"
 #include "GameClient/TerrainVisual.h"
 #include "GameClient/View.h"
-#include "GameClient/ControlBar.h"
 #include "GameClient/CampaignManager.h"
 #include "GameClient/GameWindowTransitions.h"
 
@@ -113,7 +115,7 @@
 
 DECLARE_PERF_TIMER(SleepyMaintenance)
 
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.		 
+#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
 // If defined, the game times various units.
 #ifdef DO_UNIT_TIMINGS
 #pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
@@ -129,16 +131,11 @@ extern void externalAddTree(Coord3D location, Real scale, Real angle, AsciiStrin
 #endif
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 
 
-// I'm making this larger now that we know how big our maps are going to be. 
+// I'm making this larger now that we know how big our maps are going to be.
 enum { OBJ_HASH_SIZE	= 8192 };
 
 /// The GameLogic singleton instance
@@ -221,8 +218,6 @@ void setFPMode( void )
 // ------------------------------------------------------------------------------------------------
 GameLogic::GameLogic( void )
 {
-	//Added By Sadullah Nader
-	//Initializations missing and necessary 
 	m_background = NULL;
 	m_CRC = 0;
 	m_isInUpdate = FALSE;
@@ -236,11 +231,11 @@ GameLogic::GameLogic( void )
 	}
 
 	m_shouldValidateCRCs = FALSE;
-	
+
 	m_startNewGame = FALSE;
-	//
 
 	m_frame = 0;
+	m_hasUpdated = FALSE;
 	m_frameObjectsChangedTriggerAreas = 0;
 	m_width = 0;
 	m_height = 0;
@@ -257,6 +252,7 @@ GameLogic::GameLogic( void )
 	m_pauseInput = FALSE;
 	m_inputEnabledMemory = TRUE;
 	m_mouseVisibleMemory = TRUE;
+	m_logicTimeScaleEnabledMemory = FALSE;
 	m_loadScreen = NULL;
 	m_forceGameStartByTimeOut = FALSE;
 #ifdef DUMP_PERF_STATS
@@ -268,41 +264,12 @@ GameLogic::GameLogic( void )
 	m_clearingGameData = FALSE;
 }
 
-// ------------------------------------------------------------------------------------------------
-/** Utility function to set class variables to default values. */
-// ------------------------------------------------------------------------------------------------
-void GameLogic::setDefaults( Bool loadingSaveGame )
-{
-	m_frame = 0;
-	m_width = DEFAULT_WORLD_WIDTH;
-	m_height = DEFAULT_WORLD_HEIGHT;
-	m_objList = NULL;
-#ifdef ALLOW_NONSLEEPY_UPDATES
-	m_normalUpdates.clear();
-#endif
-	for (std::vector<UpdateModulePtr>::iterator it = m_sleepyUpdates.begin(); it != m_sleepyUpdates.end(); ++it)
-	{
-		(*it)->friend_setIndexInLogic(-1);
-	}
-	m_sleepyUpdates.clear();
-	m_curUpdateModule = NULL;
-
-	//
-	// only reset the next object ID allocater counter when we're not loading a save game.
-	// for save games, we read this value out of the save game file and it is important
-	// that we preserve it as we load and execute the game
-	//
-	if( loadingSaveGame == FALSE )
-		m_nextObjID = (ObjectID)1;
-
-}
-
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Bool GameLogic::isInSinglePlayerGame( void )
 {
 	return (m_gameMode == GAME_SINGLE_PLAYER ||
-		(TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK && TheRecorder->getGameMode() == GAME_SINGLE_PLAYER));
+		(TheRecorder && TheRecorder->isPlaybackMode() && TheRecorder->getGameMode() == GAME_SINGLE_PLAYER));
 }
 
 
@@ -331,9 +298,9 @@ void GameLogic::destroyAllObjectsImmediate()
 
 	// process the destroy list immediately
 	processDestroyList();
-	DEBUG_ASSERTCRASH( m_objList == NULL, ("destroyAllObjectsImmediate: Object list not cleared\n") );
+	DEBUG_ASSERTCRASH( m_objList == NULL, ("destroyAllObjectsImmediate: Object list not cleared") );
 
-}  // end destroyAllObjectsImmediate
+}
 
 //-------------------------------------------------------------------------------------------------
 /**GameLogic class destructor, the destruction order should mirror the
@@ -375,7 +342,7 @@ GameLogic::~GameLogic()
 	// delete the Script Engine
 	delete TheScriptEngine;
 	TheScriptEngine = NULL;
-	
+
 	// Null out TheGameLogic
 	TheGameLogic = NULL;
 }
@@ -388,9 +355,6 @@ void GameLogic::init( void )
 
 	setFPMode();
 
-	/// @todo Clear object and destroy lists
-	setDefaults( FALSE );
-
 	// create the partition manager
 	ThePartitionManager = NEW PartitionManager;
 	ThePartitionManager->init();
@@ -417,31 +381,8 @@ void GameLogic::init( void )
 	// create a team for the player
 	//DEBUG_ASSERTCRASH(ThePlayerList, ("null ThePlayerList"));
 	//ThePlayerList->setLocalPlayer(0);
-
-	m_CRC = 0;
-	m_pauseFrame = 0;
-	m_gamePaused = FALSE;
-	m_pauseSound = FALSE;
-	m_pauseMusic = FALSE;
-	m_pauseInput = FALSE;
-	m_inputEnabledMemory = TRUE;
-	m_mouseVisibleMemory = TRUE;
-	for(Int i = 0; i < MAX_SLOTS; ++i)
-	{
-		m_progressComplete[i] = FALSE;
-		m_progressCompleteTimeout[i] = 0;
-	}
-	m_forceGameStartByTimeOut = FALSE;
-
-	m_isScoringEnabled = TRUE;
-	m_showBehindBuildingMarkers = TRUE;
-	m_drawIconUI = TRUE;
-	m_showDynamicLOD = TRUE;
-	m_scriptHulkMaxLifetimeOverride = -1;
-	
+	reset();
 	m_isInUpdate = FALSE;
-
-	m_rankPointsToAddAtGameStart = 0;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -465,6 +406,8 @@ void GameLogic::reset( void )
 	m_pauseInput = FALSE;
 	m_inputEnabledMemory = TRUE;
 	m_mouseVisibleMemory = TRUE;
+	m_logicTimeScaleEnabledMemory = FALSE;
+
 	setFPMode();
 
 	// destroy all objects
@@ -488,16 +431,26 @@ void GameLogic::reset( void )
 	}
 	m_forceGameStartByTimeOut = FALSE;
 
-	if(TheStatsCollector)
-	{
-		delete TheStatsCollector;
-		TheStatsCollector = NULL;
-	}
+	delete TheStatsCollector;
+	TheStatsCollector = NULL;
 
 	// clear any table of contents we have
 	m_objectTOC.clear();
 
-	setDefaults( FALSE );
+	m_frame = 0;
+	m_hasUpdated = FALSE;
+	m_width = DEFAULT_WORLD_WIDTH;
+	m_height = DEFAULT_WORLD_HEIGHT;
+	m_objList = NULL;
+#ifdef ALLOW_NONSLEEPY_UPDATES
+	m_normalUpdates.clear();
+#endif
+	for (std::vector<UpdateModulePtr>::iterator it = m_sleepyUpdates.begin(); it != m_sleepyUpdates.end(); ++it)
+	{
+		(*it)->friend_setIndexInLogic(-1);
+	}
+	m_sleepyUpdates.clear();
+	m_curUpdateModule = NULL;
 
 	m_isScoringEnabled = TRUE;
 	m_showBehindBuildingMarkers = TRUE;
@@ -514,7 +467,7 @@ void GameLogic::reset( void )
 	TheWeatherSetting = (WeatherSetting*) ws->deleteOverrides();
 
 	m_rankPointsToAddAtGameStart = 0;
-}  // end reset
+}
 
 static Object * placeObjectAtPosition(Int slotNum, AsciiString objectTemplateName, Coord3D& pos, Player *pPlayer,
 																	const PlayerTemplate *pTemplate)
@@ -524,15 +477,15 @@ static Object * placeObjectAtPosition(Int slotNum, AsciiString objectTemplateNam
 	DEBUG_ASSERTCRASH(btt, ("TheThingFactory didn't find a template in placeObjectAtPosition()") );
 
 	Object *obj = TheThingFactory->newObject( btt, pPlayer->getDefaultTeam() );
-	DEBUG_ASSERTCRASH(obj, ("TheThingFactory didn't give me a valid Object for player %d's (%ls) starting building\n",
+	DEBUG_ASSERTCRASH(obj, ("TheThingFactory didn't give me a valid Object for player %d's (%ls) starting building",
 		slotNum, pTemplate->getDisplayName().str()));
 	if (obj)
 	{
-		obj->setOrientation(obj->getTemplate()->getPlacementViewAngle());	
+		obj->setOrientation(obj->getTemplate()->getPlacementViewAngle());
 		obj->setPosition( &pos );
 
-		//DEBUG_LOG(("Placed a starting building for %s at waypoint %s\n", playerName.str(), waypointName.str()));
-		CRCDEBUG_LOG(("Placed an object for %ls at pos (%g,%g,%g)\n", pPlayer->getPlayerDisplayName().str(),
+		//DEBUG_LOG(("Placed a starting building for %s at waypoint %s", playerName.str(), waypointName.str()));
+		CRCDEBUG_LOG(("Placed an object for %ls at pos (%g,%g,%g)", pPlayer->getPlayerDisplayName().str(),
 			pos.x, pos.y, pos.z));
 		DUMPCOORD3D(&pos);
 
@@ -553,7 +506,7 @@ static Object * placeObjectAtPosition(Int slotNum, AsciiString objectTemplateNam
 			team->setActive();
 		TheAI->pathfinder()->addObjectToPathfindMap(obj);
 		if (obj->getAIUpdateInterface() && !obj->isKindOf(KINDOF_IMMOBILE)) {
-			CRCDEBUG_LOG(("Not immobile - adjusting dest\n"));
+			CRCDEBUG_LOG(("Not immobile - adjusting dest"));
 			if (TheAI->pathfinder()->adjustDestination(obj, obj->getAIUpdateInterface()->getLocomotorSet(), &pos)) {
 				DUMPCOORD3D(&pos);
 				TheAI->pathfinder()->updateGoal(obj, &pos, LAYER_GROUND);	// Units always start on the ground for now.  jba.
@@ -576,7 +529,7 @@ static void placeNetworkBuildingsForPlayer(Int slotNum, const GameSlot *pSlot, P
 
 	Waypoint *waypoint = findNamedWaypoint(waypointName);
 	Waypoint *rallyWaypoint = findNamedWaypoint(rallyWaypointName);
-	DEBUG_ASSERTCRASH(waypoint, ("Player %d has no starting waypoint (Player_%d_Start)\n", slotNum, startPos));
+	DEBUG_ASSERTCRASH(waypoint, ("Player %d has no starting waypoint (Player_%d_Start)", slotNum, startPos));
 	if (!waypoint)
 		return;
 
@@ -585,12 +538,12 @@ static void placeNetworkBuildingsForPlayer(Int slotNum, const GameSlot *pSlot, P
 
 	AsciiString buildingTemplateName = pTemplate->getStartingBuilding();
 
-	DEBUG_ASSERTCRASH(!buildingTemplateName.isEmpty(), ("no starting building type for player %d (playertemplate %ls)\n",
+	DEBUG_ASSERTCRASH(!buildingTemplateName.isEmpty(), ("no starting building type for player %d (playertemplate %ls)",
 		slotNum, pTemplate->getDisplayName().str()));
 	if (buildingTemplateName.isEmpty())
 		return;
 
-	DEBUG_LOG(("Placing starting building at waypoint %s\n", waypointName.str()));
+	DEBUG_LOG(("Placing starting building at waypoint %s", waypointName.str()));
 	Object *conYard = placeObjectAtPosition(slotNum, buildingTemplateName, pos, pPlayer, pTemplate);
 
 	if (!conYard)
@@ -618,7 +571,7 @@ static void placeNetworkBuildingsForPlayer(Int slotNum, const GameSlot *pSlot, P
 			FindPositionOptions options;
 			options.minRadius = conYard->getGeometryInfo().getBoundingSphereRadius() * 0.7f;
 			options.maxRadius = conYard->getGeometryInfo().getBoundingSphereRadius() * 1.3f;
-			DEBUG_LOG(("Placing starting object %d (%s)\n", i, objName.str()));
+			DEBUG_LOG(("Placing starting object %d (%s)", i, objName.str()));
 			ThePartitionManager->update();
 			Bool foundPos = ThePartitionManager->findPositionAround(&pos, &options, &objPos);
 			if (foundPos)
@@ -630,7 +583,7 @@ static void placeNetworkBuildingsForPlayer(Int slotNum, const GameSlot *pSlot, P
 			}
 			else
 			{
-				DEBUG_LOG(("Could not find position\n"));
+				DEBUG_LOG(("Could not find position"));
 			}
 		}
 	}
@@ -640,17 +593,17 @@ static void placeNetworkBuildingsForPlayer(Int slotNum, const GameSlot *pSlot, P
 // ------------------------------------------------------------------------------------------------
 LoadScreen *GameLogic::getLoadScreen( Bool loadingSaveGame )
 {
-	switch (m_gameMode) 
+	switch (m_gameMode)
 	{
 	case GAME_SHELL:
 		return NEW ShellGameLoadScreen;
-		break;                         
+		break;
 	case GAME_SINGLE_PLAYER:
 	{
 		Campaign* currentCampaign = TheCampaignManager->getCurrentCampaign();
 		if( currentCampaign && loadingSaveGame == FALSE )
 		{
-			if ( currentCampaign->m_isChallengeCampaign) 
+			if ( currentCampaign->m_isChallengeCampaign)
 			{
 				return NEW ChallengeLoadScreen;
 			}
@@ -728,7 +681,7 @@ static void checkForDuplicateColors( GameInfo *game )
 		}
 		else if (colorIdx >= 0)
 		{
-			DEBUG_LOG(("Clearing color %d for player %d\n", colorIdx, i));
+			DEBUG_LOG(("Clearing color %d for player %d", colorIdx, i));
 		}
 	}
 }
@@ -778,16 +731,16 @@ static void populateRandomSideAndColor( GameInfo *game )
 
 		// clean up random factions
 		Int playerTemplateIdx = slot->getPlayerTemplate();
-		DEBUG_LOG(("Player %d has playerTemplate index %d\n", i, playerTemplateIdx));
+		DEBUG_LOG(("Player %d has playerTemplate index %d", i, playerTemplateIdx));
 		while (playerTemplateIdx != PLAYERTEMPLATE_OBSERVER && (playerTemplateIdx < 0 || playerTemplateIdx >= ThePlayerTemplateStore->getPlayerTemplateCount()))
 		{
-			DEBUG_ASSERTCRASH(playerTemplateIdx == PLAYERTEMPLATE_RANDOM, ("Non-random bad playerTemplate %d in slot %d\n", playerTemplateIdx, i));
+			DEBUG_ASSERTCRASH(playerTemplateIdx == PLAYERTEMPLATE_RANDOM, ("Non-random bad playerTemplate %d in slot %d", playerTemplateIdx, i));
 #ifdef MORE_RANDOM
 			// our RNG is basically shit -- horribly nonrandom at the start of the sequence.
 			// get a few values at random to get rid of the dreck.
 			// there's no mathematical basis for this, but empirically, it helps a lot.
 			UnsignedInt silly = GetGameLogicRandomSeed() % 7;
-			for (UnsignedInt poo = 0; poo < silly; ++poo) 
+			for (UnsignedInt poo = 0; poo < silly; ++poo)
 			{
 				GameLogicRandomValue(0, 1);	// ignore result
 			}
@@ -806,7 +759,7 @@ static void populateRandomSideAndColor( GameInfo *game )
 			}
 			else
 			{
-				DEBUG_LOG(("Setting playerTemplateIdx %d to %d\n", i, playerTemplateIdx));
+				DEBUG_LOG(("Setting playerTemplateIdx %d to %d", i, playerTemplateIdx));
 				slot->setPlayerTemplate(playerTemplateIdx);
 			}
 		}
@@ -814,14 +767,14 @@ static void populateRandomSideAndColor( GameInfo *game )
 		Int colorIdx = slot->getColor();
 		if (colorIdx < 0 || colorIdx >= TheMultiplayerSettings->getNumColors())
 		{
-			DEBUG_ASSERTCRASH(colorIdx == -1, ("Non-random bad color %d in slot %d\n", colorIdx, i));
+			DEBUG_ASSERTCRASH(colorIdx == -1, ("Non-random bad color %d in slot %d", colorIdx, i));
 			while (colorIdx == -1)
 			{
 				colorIdx = GameLogicRandomValue(0, TheMultiplayerSettings->getNumColors()-1);
 				if (game->isColorTaken(colorIdx))
 					colorIdx = -1;
 			}
-			DEBUG_LOG(("Setting color %d to %d\n", i, colorIdx));
+			DEBUG_LOG(("Setting color %d to %d", i, colorIdx));
 			slot->setColor(colorIdx);
 		}
 	}
@@ -829,6 +782,8 @@ static void populateRandomSideAndColor( GameInfo *game )
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
+static const WaypointMap s_emptyWaypoints = WaypointMap();
+
 static void populateRandomStartPosition( GameInfo *game )
 {
 	if(!game)
@@ -837,9 +792,11 @@ static void populateRandomStartPosition( GameInfo *game )
 	Int i;
 	Int numPlayers = MAX_SLOTS;
 	const MapMetaData *md = TheMapCache->findMap( game->getMap() );
-  DEBUG_ASSERTCRASH( md , ("Could not find map %s in the mapcache", game->getMap().str()));
 	if (md)
 		numPlayers = md->m_numPlayers;
+	else
+		printf("Could not find map \"%s\"\n", game->getMap().str());
+	DEBUG_ASSERTCRASH( md , ("Could not find map %s in the mapcache", game->getMap().str()));
 
 	// generate a map of start spot distances
 	Real startSpotDistance[MAX_SLOTS][MAX_SLOTS];
@@ -849,12 +806,13 @@ static void populateRandomStartPosition( GameInfo *game )
 		{
 			if (i != j && (i<numPlayers && j<numPlayers))
 			{
+				const WaypointMap& waypoints = md ? md->m_waypoints : s_emptyWaypoints;
 				AsciiString w1, w2;
 				w1.format("Player_%d_Start", i+1);
 				w2.format("Player_%d_Start", j+1);
-				WaypointMap::const_iterator c1 = md->m_waypoints.find(w1);
-				WaypointMap::const_iterator c2 = md->m_waypoints.find(w2);
-				if (c1 == md->m_waypoints.end() || c2 == md->m_waypoints.end())
+				WaypointMap::const_iterator c1 = waypoints.find(w1);
+				WaypointMap::const_iterator c2 = waypoints.find(w2);
+				if (c1 == waypoints.end() || c2 == waypoints.end())
 				{
 					// couldn't find a waypoint.  must be kinda far away.
 					startSpotDistance[i][j] = 1000000.0f;
@@ -908,7 +866,7 @@ static void populateRandomStartPosition( GameInfo *game )
 		Int posIdx = slot->getStartPos();
 		if (posIdx < 0 || posIdx >= numPlayers)
 		{
-			DEBUG_ASSERTCRASH(posIdx == -1, ("Non-random bad start position %d in slot %d\n", posIdx, i));
+			DEBUG_ASSERTCRASH(posIdx == -1, ("Non-random bad start position %d in slot %d", posIdx, i));
 			if (hasStartSpotBeenPicked)
 			{
 				// pick the farthest spot away
@@ -943,7 +901,7 @@ static void populateRandomStartPosition( GameInfo *game )
 						}
 					}
 				}
-				DEBUG_ASSERTCRASH(farthestIndex >= 0, ("Couldn't find a farthest spot!\n"));
+				DEBUG_ASSERTCRASH(farthestIndex >= 0, ("Couldn't find a farthest spot!"));
 				slot->setStartPos(farthestIndex);
 				taken[farthestIndex] = TRUE;
 			}
@@ -957,7 +915,7 @@ static void populateRandomStartPosition( GameInfo *game )
 					if (game->isStartPositionTaken(posIdx))
 						posIdx = -1;
 				}
-				DEBUG_LOG(("Setting start position %d to %d (random choice)\n", i, posIdx));
+				DEBUG_LOG(("Setting start position %d to %d (random choice)", i, posIdx));
 				slot->setStartPos(posIdx);
 				taken[posIdx] = TRUE;
 				hasStartSpotBeenPicked = TRUE;
@@ -980,7 +938,7 @@ static void populateRandomStartPosition( GameInfo *game )
 		Int posIdx = slot->getStartPos();
 		if (posIdx >= 0  &&  posIdx < numPlayers)
 			continue;  //position already assigned
-		DEBUG_ASSERTCRASH(posIdx == -1, ("Non-random bad start position %d in slot %d\n", posIdx, i));
+		DEBUG_ASSERTCRASH(posIdx == -1, ("Non-random bad start position %d in slot %d", posIdx, i));
 
 		//choose a starting position
 		Int team = slot->getTeamNumber();
@@ -992,7 +950,7 @@ static void populateRandomStartPosition( GameInfo *game )
 				if (game->isStartPositionTaken(posIdx))
 					posIdx = -1;
 			}
-			DEBUG_LOG(("Setting start position %d to %d (random choice)\n", i, posIdx));
+			DEBUG_LOG(("Setting start position %d to %d (random choice)", i, posIdx));
 			hasStartSpotBeenPicked = TRUE;
 			slot->setStartPos(posIdx);
 			taken[posIdx] = TRUE;
@@ -1032,14 +990,14 @@ static void populateRandomStartPosition( GameInfo *game )
 							farthestIndex = posIdx;
 						}
 					}
-				} //for posInx
+				}
 
-				DEBUG_ASSERTCRASH(farthestIndex >= 0, ("Couldn't find a farthest spot!\n"));
+				DEBUG_ASSERTCRASH(farthestIndex >= 0, ("Couldn't find a farthest spot!"));
 				slot->setStartPos(farthestIndex);
 				taken[farthestIndex] = TRUE;
 				if( team > -1 )
 					teamPosIdx[team] = farthestIndex;  //remember where this team is
-			} //pick farthest
+			}
 			else  //team already has a starting position
 			{	//pick position closest to team
 				Real closestDist = FLT_MAX;
@@ -1052,13 +1010,13 @@ static void populateRandomStartPosition( GameInfo *game )
 						closestDist = dist;
 						closestIdx = n;
 					}
-				} //for n
-				DEBUG_ASSERTCRASH( closestDist < FLT_MAX, ("Couldn't find a closest starting positon!\n"));
+				}
+				DEBUG_ASSERTCRASH( closestDist < FLT_MAX, ("Couldn't find a closest starting positon!"));
 				slot->setStartPos(closestIdx);
 				taken[closestIdx] = TRUE;
 			}
 		}
-	} //for i
+	}
 #endif // 0
 
 	// now go back & assign observer spots
@@ -1089,7 +1047,7 @@ static void populateRandomStartPosition( GameInfo *game )
 			if (!game->isStartPositionTaken(posIdx))
 				posIdx = -1;
 		}
-		DEBUG_LOG(("Setting observer start position %d to %d\n", i, posIdx));
+		DEBUG_LOG(("Setting observer start position %d to %d", i, posIdx));
 		slot->setStartPos(posIdx);
 	}
 }
@@ -1099,11 +1057,11 @@ static void populateRandomStartPosition( GameInfo *game )
 // ------------------------------------------------------------------------------------------------
 void GameLogic::updateLoadProgress( Int progress )
 {
-	
+
 	if( m_loadScreen )
 		m_loadScreen->update( progress );
 
-}  // end updateLoadProgress
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Delete the load screen */
@@ -1111,15 +1069,32 @@ void GameLogic::updateLoadProgress( Int progress )
 void GameLogic::deleteLoadScreen( void )
 {
 
-	if( m_loadScreen )
-	{
+	delete m_loadScreen;
+	m_loadScreen = NULL;
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void GameLogic::updateDisplayBusyState()
+{
+	const Bool busySystem = isInInteractiveGame() && !isGamePaused();
+	const Bool busyDisplay = busySystem && !TheGlobalData->m_headless;
+
+	OSDisplaySetBusyState(busyDisplay, busySystem);
+}
 
-		delete m_loadScreen;
-		m_loadScreen = NULL;
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+void GameLogic::setGameMode( GameMode mode )
+{
+	GameMode prev = m_gameMode;
+	m_gameMode = mode;
 
-	}  // end if
+	TheMouse->onGameModeChanged(prev, mode);
 
-}  // end deleteLoadScreen
+	updateDisplayBusyState();
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Entry point for starting a new game, the engine is already in clean state at this
@@ -1137,6 +1112,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 
 	// reset the frame counter
 	m_frame = 0;
+	m_hasUpdated = FALSE;
 
 #ifdef DEBUG_CRC
 	// TheSuperHackers @info helmutbuhler 04/09/2025
@@ -1159,9 +1135,9 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 		if (TheGameState->isInSaveDirectory(TheGlobalData->m_mapName))
 		{
 
-			DEBUG_CRASH(( "FATAL SAVE/LOAD ERROR! - Setting a pristine map name that refers to a map in the save directory.  The pristine map should always refer to the ORIGINAL map in the Maps directory, if the pristine map string is corrupt then map.ini files will not load correctly.\n" ));
+			DEBUG_CRASH(( "FATAL SAVE/LOAD ERROR! - Setting a pristine map name that refers to a map in the save directory.  The pristine map should always refer to the ORIGINAL map in the Maps directory, if the pristine map string is corrupt then map.ini files will not load correctly." ));
 
-		}  // end if
+		}
 
 		if( m_startNewGame == FALSE )
 		{
@@ -1189,53 +1165,55 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			m_startNewGame = TRUE;
 			return;
 
-		}  
+		}
 
-	}  // end if
+	}
 
 	m_rankLevelLimit = 1000;	// this is reset every game.
-	setDefaults( loadingSaveGame );
-	TheWritableGlobalData->m_loadScreenRender = TRUE;	///< mark it so only a few select things are rendered during load	
-	TheWritableGlobalData->m_TiVOFastMode = FALSE;	//always disable the TIVO fast-forward mode at the start of a new game.
 
-	m_showBehindBuildingMarkers = TRUE;
-	m_drawIconUI = TRUE;
-	m_showDynamicLOD = TRUE;
-	m_scriptHulkMaxLifetimeOverride = -1;
+	//
+	// only reset the next object ID allocater counter when we're not loading a save game.
+	// for save games, we read this value out of the save game file and it is important
+	// that we preserve it as we load and execute the game
+	//
+	if( loadingSaveGame == FALSE )
+		m_nextObjID = (ObjectID)1;
+
+	TheWritableGlobalData->m_loadScreenRender = TRUE;	///< mark it so only a few select things are rendered during load
+	TheWritableGlobalData->m_TiVOFastMode = FALSE;	//always disable the TIVO fast-forward mode at the start of a new game.
 
 	Campaign* currentCampaign = TheCampaignManager->getCurrentCampaign();
 	Bool isChallengeCampaign = m_gameMode == GAME_SINGLE_PLAYER && currentCampaign && currentCampaign->m_isChallengeCampaign;
 
 	// Fill in the game color and Factions before we do the Load Screen
-	GameInfo *game = NULL;
 	TheGameInfo = NULL;
 	Int localSlot = 0;
 	if (TheNetwork)
 	{
 		if (TheLAN)
 		{
-			DEBUG_LOG(("Starting network game\n"));
-			TheGameInfo = game = TheLAN->GetMyGame();
+			DEBUG_LOG(("Starting network game"));
+			TheGameInfo = TheLAN->GetMyGame();
 		}
 		else
 		{
-			DEBUG_LOG(("Starting gamespy game\n"));
-			TheGameInfo = game = TheGameSpyGame;	/// @todo: MDC add back in after demo
+			DEBUG_LOG(("Starting gamespy game"));
+			TheGameInfo = TheGameSpyGame;	/// @todo: MDC add back in after demo
 		}
 	}
 	else
 	{
-		if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK)
+		if (TheRecorder && TheRecorder->isPlaybackMode())
 		{
-			TheGameInfo = game = TheRecorder->getGameInfo();
+			TheGameInfo = TheRecorder->getGameInfo();
 		}
 		else if(m_gameMode == GAME_SKIRMISH)
 		{
-		  TheGameInfo = game = TheSkirmishGameInfo;
+		  TheGameInfo = TheSkirmishGameInfo;
 		}
 		else if(isChallengeCampaign)
 		{
-			TheGameInfo = game = TheChallengeGameInfo;
+			TheGameInfo = TheChallengeGameInfo;
 		}
 	}
 
@@ -1255,49 +1233,45 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
     }
   }
 
-	checkForDuplicateColors( game );
+	checkForDuplicateColors( TheGameInfo );
 
 	Bool isSkirmishOrSkirmishReplay = FALSE;
-	if (game)
+	if (TheGameInfo)
 	{
 		for (Int i=0; i<MAX_SLOTS; ++i)
 		{
-			GameSlot *slot = game->getSlot(i);
+			GameSlot *slot = TheGameInfo->getSlot(i);
 			if (!loadingSaveGame) {
 				slot->saveOffOriginalInfo();
 			}
 			if (slot->isAI())
 			{
 				isSkirmishOrSkirmishReplay = TRUE;
-				continue;
 			}
 		}
 	} else {
 		if (m_gameMode == GAME_SINGLE_PLAYER)	{
-			if (TheSkirmishGameInfo) {
-				delete TheSkirmishGameInfo;
-				TheSkirmishGameInfo = NULL;
-			}
+			delete TheSkirmishGameInfo;
+			TheSkirmishGameInfo = NULL;
 		}
 	}
 
-	populateRandomSideAndColor( game );
-	populateRandomStartPosition( game );
+	populateRandomSideAndColor( TheGameInfo );
+	populateRandomStartPosition( TheGameInfo );
 
 	//****************************//
 	// Start the LoadScreen Now!	//
 	//****************************//
 
 	// Get the m_loadScreen for this kind of game
-	if(!m_loadScreen && !TheGlobalData->m_headless)
+	if(!m_loadScreen && !(TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_SIMULATION_PLAYBACK))
 	{
 		m_loadScreen = getLoadScreen( loadingSaveGame );
 		if(m_loadScreen)
 		{
 			TheMouse->setVisibility(FALSE);
-			m_loadScreen->init(game);
+			m_loadScreen->init(TheGameInfo);
 
-			// 
 			updateLoadProgress( LOAD_PROGRESS_START );
 		}
 	}
@@ -1312,11 +1286,11 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 		TheCampaignManager->SetVictorious(FALSE);
 	m_startNewGame = FALSE;
 
-	// update the loadscreen 
+	// update the loadscreen
 	if(m_loadScreen)
 		updateLoadProgress(LOAD_PROGRESS_POST_PARTICLE_INI_LOAD);
 
-	DEBUG_ASSERTCRASH(m_frame == 0, ("framecounter expected to be 0 here\n"));
+	DEBUG_ASSERTCRASH(m_frame == 0, ("framecounter expected to be 0 here"));
 
 	// before loading the map, load the map.ini file in the same directory.
 	loadMapINI( TheGlobalData->m_mapName );
@@ -1326,33 +1300,33 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	// anytime the world's size changes, must reset the partition mgr
 	//ThePartitionManager->init();
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_LOAD_MAP);
 
 	#ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
 	char Buf[256];
-	sprintf(Buf,"After terrainlogic->loadmap=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
-		//DEBUG_LOG(("Placed a starting building for %s at waypoint %s\n", playerName.str(), waypointName.str()));
+	sprintf(Buf,"After terrainlogic->loadmap=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+		//DEBUG_LOG(("Placed a starting building for %s at waypoint %s", playerName.str(), waypointName.str()));
 	DEBUG_LOG(("%s", Buf));
 	#endif
 
 	Int progressCount = LOAD_PROGRESS_SIDE_POPULATION;
-	if (game)
+	if (TheGameInfo)
 	{
-		 
+
 		if (TheGameEngine->isMultiplayerSession() || isSkirmishOrSkirmishReplay)
 		{
 			// Saves off any player, and resets the sides to 0 players so we can add the skirmish players.
 			TheSidesList->prepareForMP_or_Skirmish();
 		}
 
-		//DEBUG_LOG(("Starting LAN game with %d players\n", game->getNumPlayers()));
+		//DEBUG_LOG(("Starting LAN game with %d players", game->getNumPlayers()));
 		Dict d;
 		for (int i=0; i<MAX_SLOTS; ++i)
 		{
 			// Add a Side to TheSidesList
-			GameSlot *slot = game->getSlot(i);
+			GameSlot *slot = TheGameInfo->getSlot(i);
 
 			if (!slot || !slot->isHuman())
 			{
@@ -1378,31 +1352,31 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			{
 				d.setAsciiString(TheKey_playerFaction, KEYNAME(pt->getNameKey()));
 			}
-			
-			if (game->isPlayerPreorder(i))
+
+			if (TheGameInfo->isPlayerPreorder(i))
 			{
 				d.setBool(TheKey_playerIsPreorder, TRUE);
 			}
-					
+
 			AsciiString enemiesString, alliesString;
 			Int team = slot->getTeamNumber();
-			DEBUG_LOG(("Looking for allies of player %d, team %d\n", i, team));
+			DEBUG_LOG(("Looking for allies of player %d, team %d", i, team));
 			for(int j=0; j < MAX_SLOTS; ++j)
 			{
-				GameSlot *teamSlot = game->getSlot(j);
+				GameSlot *teamSlot = TheGameInfo->getSlot(j);
 				// for check to see if we're trying to add ourselves
 				if(i == j || !teamSlot->isOccupied())
 					continue;
-				
-				DEBUG_LOG(("Player %d is team %d\n", j, teamSlot->getTeamNumber()));
+
+				DEBUG_LOG(("Player %d is team %d", j, teamSlot->getTeamNumber()));
 
 				AsciiString teamPlayerName;
 				teamPlayerName.format("player%d", j);
-				// if our team is None, or our team is not equal to their team, 
+				// if our team is None, or our team is not equal to their team,
 				// then their our enemy
 				Bool isEnemy = FALSE;
 				if(team == -1 || teamSlot->getTeamNumber() != team ) isEnemy = TRUE;
-				DEBUG_LOG(("Player %d is %s\n", j, (isEnemy)?"enemy":"ally"));
+				DEBUG_LOG(("Player %d is %s", j, (isEnemy)?"enemy":"ally"));
 
 				if (isEnemy)
 				{
@@ -1416,24 +1390,24 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 					if(!alliesString.isEmpty())
 						alliesString.concat(" ");
 					alliesString.concat(teamPlayerName);
-				}				
+				}
 			}
 			d.setAsciiString(TheKey_playerAllies, alliesString);
 			d.setAsciiString(TheKey_playerEnemies, enemiesString);
-			DEBUG_LOG(("Player %d's teams are: allies=%s, enemies=%s\n", i,alliesString.str(),enemiesString.str()));
+			DEBUG_LOG(("Player %d's teams are: allies=%s, enemies=%s", i,alliesString.str(),enemiesString.str()));
 /*
 
 			Int colorIdx = slot->getColor();
 			if (colorIdx < 0 || colorIdx >= TheMultiplayerSettings->getNumColors())
 			{
-				DEBUG_ASSERTCRASH(colorIdx == -1, ("Non-random bad color %d in slot %d\n", colorIdx, i));
+				DEBUG_ASSERTCRASH(colorIdx == -1, ("Non-random bad color %d in slot %d", colorIdx, i));
 				while (colorIdx == -1)
 				{
 					colorIdx = GameLogicRandomValue(0, TheMultiplayerSettings->getNumColors()-1);
 					if (game->isColorTaken(colorIdx))
 						colorIdx = -1;
 				}
-				DEBUG_LOG(("Setting color %d to %d\n", i, colorIdx));
+				DEBUG_LOG(("Setting color %d to %d", i, colorIdx));
 				slot->setColor(colorIdx);
 			}
 			*/
@@ -1443,17 +1417,17 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			d.setInt(TheKey_multiplayerStartIndex, slot->getStartPos());
 //			d.setBool(TheKey_multiplayerIsLocal, slot->isLocalPlayer());
 //			d.setBool(TheKey_multiplayerIsLocal, slot->getIP() == game->getLocalIP());
-			d.setBool(TheKey_multiplayerIsLocal, slot->isHuman() && (slot->getName().compare(game->getSlot(game->getLocalSlotNum())->getName().str()) == 0));
+			d.setBool(TheKey_multiplayerIsLocal, slot->isHuman() && (slot->getName().compare(TheGameInfo->getSlot(TheGameInfo->getLocalSlotNum())->getName().str()) == 0));
 
 /*
 			if (slot->getIP() == game->getLocalIP())
 			{
 				localSlot = i;
-				DEBUG_LOG(("GameLogic::StartNewGame - local slot is %d\n", localSlot));
+				DEBUG_LOG(("GameLogic::StartNewGame - local slot is %d", localSlot));
 			}
 */
 
-			if (isSkirmishOrSkirmishReplay) 
+			if (isSkirmishOrSkirmishReplay)
 			{
 				d.setBool(TheKey_playerIsSkirmish, true);
 				switch (slot->getState()) {
@@ -1466,7 +1440,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 
 			AsciiString slotNameAscii;
 			slotNameAscii.translate(slot->getName());
-			if (slot->isHuman() && game->getSlotNum(slotNameAscii) == game->getLocalSlotNum()) {
+			if (slot->isHuman() && TheGameInfo->getSlotNum(slotNameAscii) == TheGameInfo->getLocalSlotNum()) {
 				localSlot = i;
 			}
 			TheSidesList->addSide(&d);
@@ -1481,18 +1455,18 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			d.setBool(TheKey_teamIsSingleton, true);
 			TheSidesList->addTeam(&d);
 
-			DEBUG_LOG(("Added side %d\n", i));
+			DEBUG_LOG(("Added side %d", i));
 			updateLoadProgress(progressCount + i);
-		}		
+		}
 	}
 	//if(m_gameMode != GAME_REPLAY)
 	//{
-	
+
 		// Always add in an observer Player
 		Dict d;
 		d.setAsciiString(TheKey_playerName, "ReplayObserver");
 		d.setBool(TheKey_playerIsHuman, TRUE);
-		d.setUnicodeString(TheKey_playerDisplayName, UnicodeString(L"Observer"));
+		d.setUnicodeString(TheKey_playerDisplayName, L"Observer");
 		const PlayerTemplate* pt;
 		pt = ThePlayerTemplateStore->findPlayerTemplate( TheNameKeyGenerator->nameToKey("FactionObserver") );
 		if (pt)
@@ -1506,29 +1480,29 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 		d.setInt(TheKey_multiplayerStartIndex, 0);
 		d.setBool(TheKey_multiplayerIsLocal, FALSE);
 
-		TheSidesList->addSide(&d);	
+		TheSidesList->addSide(&d);
 		d.clear();
 		d.setAsciiString(TheKey_teamName, "teamReplayObserver");
 		d.setAsciiString(TheKey_teamOwner, "ReplayObserver");
 		d.setBool(TheKey_teamIsSingleton, true);
 		TheSidesList->addTeam(&d);
 	//}
-	TheSidesList->validateSides();		
+	TheSidesList->validateSides();
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_SIDE_LIST_INIT);
 
 	// update the player list to match the new map.
 	TheTeamFactory->reset();
 	ThePlayerList->newGame();
-	
-	// update the loadscreen 
+
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_PLAYER_LIST_RESET);
 
 	// Tell the script engine that a newe set of scripts is loaded.
 	TheScriptEngine->newMap();
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_SCRIPT_ENGINE_NEW_MAP);
 
 	if (TheGameEngine->isMultiplayerSession() || isSkirmishOrSkirmishReplay)
@@ -1536,11 +1510,11 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 		// if there are no other teams (happens for debugging) don't end the game immediately
 		Int numTeams = 0; // this can be higher than expected, but is accurate for determining 0, 1, 2+
 		Int lastTeam = -1;
-		if (game)
+		if (TheGameInfo)
 		{
 			for (int i=0; i<MAX_SLOTS; ++i)
 			{
-				const GameSlot *slot = game->getConstSlot(i);
+				const GameSlot *slot = TheGameInfo->getConstSlot(i);
 				if (slot->isOccupied() && slot->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
 				{
 					if (slot->getTeamNumber() == -1 || slot->getTeamNumber() != lastTeam)
@@ -1558,12 +1532,12 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			AsciiString path = "Data\\Scripts\\MultiplayerScripts.scb";
 			CachedFileInputStream theInputStream;
 			if (theInputStream.open(path))
-			{ 
+			{
 				ChunkInputStream *pStrm = &theInputStream;
 				DataChunkInput file( pStrm );
-				file.registerParser( AsciiString("PlayerScriptsList"), AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk );
+				file.registerParser( "PlayerScriptsList", AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk );
 				if (!file.parse(NULL)) {
-					DEBUG_LOG(("ERROR - Unable to read in multiplayer scripts.\n"));
+					DEBUG_LOG(("ERROR - Unable to read in multiplayer scripts."));
 					return;
 				}
 				ScriptList *scripts[MAX_PLAYER_COUNT];
@@ -1571,12 +1545,15 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 				if (count)
 				{
 					ScriptList *pSL = TheSidesList->getSideInfo(0)->getScriptList();
-					Script *next = scripts[0]->getScript();
-					while (next)
+					if (pSL != NULL)
 					{
-						Script *dupe = next->duplicate();
-						pSL->addScript(dupe, 0);
-						next = next->getNext();
+						Script *next = scripts[0]->getScript();
+						while (next)
+						{
+							Script *dupe = next->duplicate();
+							pSL->addScript(dupe, 0);
+							next = next->getNext();
+						}
 					}
 				}
 				for (Int i=0; i<count; ++i)
@@ -1649,71 +1626,78 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 		*/
 	}
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_VICTORY_CONDITION_SETUP);
 
+	Player *localPlayer = ThePlayerList->getLocalPlayer();
+	Player *observerPlayer = ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey("ReplayObserver"));
+
 	// set the radar as on a new map
 	TheRadar->newMap( TheTerrainLogic );
+
+	// TheSuperHackers @tweak Force on radar for all observers.
+	for (Int i = 0; i < MAX_PLAYER_COUNT; ++i)
+	{
+		Player *player = ThePlayerList->getNthPlayer(i);
+		if (player->isPlayerObserver())
+		{
+			TheRadar->forceOn(i, TRUE);
+		}
+	}
+
 	TheInGameUI->setClientQuiet( FALSE ); // okay to start beeping and stuff
 
 	// Tell the multiplayer victory condition singleton that the players are created
 	TheVictoryConditions->cachePlayerPtrs();
 	TheVictoryConditions->setVictoryConditions(VICTORY_NOBUILDINGS);
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_VICTORY_CONDITION_SET_VICTORY_CONDITION);
 
 	// set the world extents to that of the map
 	Region3D extent;
 	TheTerrainLogic->getExtent( &extent );
 
-	TheGameLogic->setWidth( extent.hi.x - extent.lo.x );
-	TheGameLogic->setHeight( extent.hi.y - extent.lo.y );
+	setWidth( extent.hi.x - extent.lo.x );
+	setHeight( extent.hi.y - extent.lo.y );
 
 	// anytime the world's size changes, must reset the partition mgr
 	ThePartitionManager->init();
 	ThePartitionManager->refreshShroudForLocalPlayer();// Can't do this until after init, and doesn't seem right to do in init
 
-	TheGhostObjectManager->setLocalPlayerIndex(ThePlayerList->getLocalPlayer()->getPlayerIndex());
+	TheGhostObjectManager->setLocalPlayerIndex(localPlayer->getPlayerIndex());
 	TheGhostObjectManager->reset();
-	
-	// update the loadscreen 
+
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_GHOST_OBJECT_MANAGER_RESET);
 
 	// update the terrain logic now that all is loaded
 	TheTerrainLogic->newMap( loadingSaveGame );
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_TERRAIN_LOGIC_NEW_MAP);
 
 	#ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
-	sprintf(Buf,"After terrainlogic->newmap=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+	sprintf(Buf,"After terrainlogic->newmap=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
 	DEBUG_LOG(("%s", Buf));
 	#endif
 
 		// Special case, load any bridge map objects.
  	const ThingTemplate *thingTemplate;
 	MapObject *pMapObj;
-	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
 
-		if (pMapObj->getFlag(FLAG_BRIDGE_FLAGS) || pMapObj->getFlag(FLAG_ROAD_FLAGS)) 
+		if (pMapObj->getFlag(FLAG_BRIDGE_FLAGS) || pMapObj->getFlag(FLAG_ROAD_FLAGS))
 			continue;	// these roads & bridges are special cased in the terrain side.
 
 		// get thing template based from map object name
 		thingTemplate = pMapObj->getThingTemplate();
 		if( thingTemplate == NULL )
-			continue;	
-
-		Bool isBridgeLikeObject = false;
-
-		if (thingTemplate->isBridge()) 
-			isBridgeLikeObject = true;
-		if (thingTemplate->isKindOf(KINDOF_WALK_ON_TOP_OF_WALL)) 
-			isBridgeLikeObject = true;
+			continue;
 
-		if (!isBridgeLikeObject)
+		if (!thingTemplate->isBridgeLike())
 			continue;
 
 		Team *team = ThePlayerList->getNeutralPlayer()->getDefaultTeam();
@@ -1724,7 +1708,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			Coord3D pos = *pMapObj->getLocation();
 			pos.z += TheTerrainLogic->getGroundHeight( pos.x, pos.y );
 
-			Real angle = normalizeAngle(pMapObj->getAngle());  
+			Real angle = normalizeAngle(pMapObj->getAngle());
 			obj->setOrientation(angle);
 			obj->setPosition( &pos );
 			if (thingTemplate->isBridge()) {
@@ -1738,11 +1722,11 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			// in the map object properties.
 			// update this object instance with properties from the map object
 			obj->updateObjValuesFromMapProperties( pMapObj->getProperties() );
-		}  // end if
+		}
 
-	}	// for, loading bridge map objects
+	}
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_BRIDGE_LOAD);
 
 	// refresh the radar to reflect loaded bridges
@@ -1752,29 +1736,29 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	// Note that it is important that the pathfinder be called before the map objects are loaded.
 	TheAI->pathfinder()->newMap( );
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_PATHFINDER_NEW_MAP);
 
 	// reveal the map for the permanent observer
-	ThePartitionManager->revealMapForPlayerPermanently( ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey("ReplayObserver"))->getPlayerIndex() );
-	DEBUG_LOG(("Reveal shroud for %ls whose index is %d\n", ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey("ReplayObserver"))->getPlayerDisplayName().str(),ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey("ReplayObserver"))->getPlayerIndex()));
-	
-	if (game)
+	ThePartitionManager->revealMapForPlayerPermanently( observerPlayer->getPlayerIndex() );
+	DEBUG_LOG(("Reveal shroud for %ls whose index is %d", observerPlayer->getPlayerDisplayName().str(), observerPlayer->getPlayerIndex()));
+
+	if (TheGameInfo)
 	{
 		for (int i=0; i<MAX_SLOTS; ++i)
 		{
-			GameSlot *slot = game->getSlot(i);
-			
+			GameSlot *slot = TheGameInfo->getSlot(i);
+
 			if (!slot || !slot->isOccupied())
 				continue;
-			
+
 			AsciiString playerName;
 			playerName.format("player%d", i);
 			Player *player = ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(playerName));
-			
+
 			if (slot->getPlayerTemplate() == PLAYERTEMPLATE_OBSERVER)
 			{
-				DEBUG_LOG(("Clearing shroud for observer %s in playerList slot %d\n", playerName.str(), player->getPlayerIndex()));
+				DEBUG_LOG(("Clearing shroud for observer %s in playerList slot %d", playerName.str(), player->getPlayerIndex()));
 				ThePartitionManager->revealMapForPlayerPermanently( player->getPlayerIndex() );
 			}
 			else
@@ -1788,7 +1772,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 
 	#ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
-	sprintf(Buf,"Before loading objects=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+	sprintf(Buf,"Before loading objects=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
 	DEBUG_LOG(("%s", Buf));
 	#endif
 
@@ -1796,8 +1780,8 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 
 	// If forceFluffToProp == true, removable objects get created on client only. [7/14/2003]
 	// If static lod is HIGH, we don't do force fluff to client side only (create logic side props, more expensive. jba)
-	Bool forceFluffToProp = TheGameLODManager->getStaticLODLevel() != STATIC_GAME_LOD_HIGH;
-	if (TheGameLODManager->getStaticLODLevel() == STATIC_GAME_LOD_CUSTOM && 
+	Bool forceFluffToProp = TheGameLODManager->getStaticLODLevel() < STATIC_GAME_LOD_HIGH;
+	if (TheGameLODManager->getStaticLODLevel() == STATIC_GAME_LOD_CUSTOM &&
 			TheGlobalData->m_useShadowVolumes) {
 		// Custom LOD, and volumetric shadows turned on - very high detail.  So use logic props too. jba. [7/14/2003]
 		forceFluffToProp = false;
@@ -1812,7 +1796,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	Int timer = timeGetTime();
 	if( loadingSaveGame ) {
 		// Loading a loadingSaveGame, need to add the trees to the client. jba. [8/11/2003]
-		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 		{
 			// get thing template based from map object name
 			thingTemplate = pMapObj->getThingTemplate();
@@ -1825,24 +1809,18 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			Coord3D pos = *pMapObj->getLocation();
 			pos.z += TheTerrainLogic->getGroundHeight( pos.x, pos.y );
 			Real angle = normalizeAngle(pMapObj->getAngle());
+
 			if (thingTemplate->isKindOf(KINDOF_OPTIMIZED_TREE)) {
-				// Opt trees and props just get drawables to tell the client about it, then deleted. jba [6/5/2003]
-				// This way there is no logic object to slow down partition manager and core logic stuff.				
-				Drawable *draw = TheThingFactory->newDrawable(thingTemplate, DRAWABLE_STATUS_NONE);
-				if (draw) {
-					draw->setOrientation(angle);
-					draw->setPosition( &pos );
-					TheGameClient->destroyDrawable(draw);
-				}
+				createOptimizedTree(thingTemplate, &pos, angle);
 			}
 		}
-	} 
-	else 
+	}
+	else
 	{
 
-		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 		{
-		
+
 			if (pMapObj->getFlag(FLAG_BRIDGE_FLAGS) || pMapObj->getFlag(FLAG_ROAD_FLAGS)) {
 				continue;	// roads & bridges are special cased in the terrain side.
 			}
@@ -1855,19 +1833,16 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 
 			//
 			// if no template continue, some map objects don't have thing templates like
-			// lights (handled in the device).  Objects that are test objects have a 
-			// test string (designated with *** and the define TEST_STRING) and will 
-			// have temporary templates created 'on the fly' during a 
+			// lights (handled in the device).  Objects that are test objects have a
+			// test string (designated with *** and the define TEST_STRING) and will
+			// have temporary templates created 'on the fly' during a
 			// ThingFactory->findTemplate() call when loading from the map file
 			//
 			if( thingTemplate == NULL )
 				continue;
 
-			Bool isBridgeLikeObject = false;
-			if (thingTemplate->isBridge()) isBridgeLikeObject = true;
-			if (thingTemplate->isKindOf(KINDOF_WALK_ON_TOP_OF_WALL)) isBridgeLikeObject = true;
-			if (isBridgeLikeObject)
-				continue;	// bridges have to be added earlier.
+			if (thingTemplate->isBridgeLike())
+				continue; // bridges have to be added earlier.
 
 			// don't create trees and shrubs if this is one and we have that option off
 			if( thingTemplate->isKindOf( KINDOF_SHRUBBERY ) && !useTrees )
@@ -1876,19 +1851,12 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			Coord3D pos = *pMapObj->getLocation();
 			pos.z += TheTerrainLogic->getGroundHeight( pos.x, pos.y );
 			Real angle = normalizeAngle(pMapObj->getAngle());
-			if (thingTemplate->isKindOf(KINDOF_OPTIMIZED_TREE)) {
-				// Opt trees and props just get drawables to tell the client about it, then deleted. jba [6/5/2003]
-				// This way there is no logic object to slow down partition manager and core logic stuff.
-				
-				Drawable *draw = TheThingFactory->newDrawable(thingTemplate, DRAWABLE_STATUS_NONE);
-				if (draw) {
-					draw->setOrientation(angle);
-					draw->setPosition( &pos );
 
-					TheGameClient->destroyDrawable(draw);
-				}
+			if (thingTemplate->isKindOf(KINDOF_OPTIMIZED_TREE)) {
+				createOptimizedTree(thingTemplate, &pos, angle);
 				continue;
 			}
+
 #if 1
 			Bool isProp = thingTemplate->isKindOf(KINDOF_PROP);
 			Bool isFluff = false;
@@ -1903,9 +1871,9 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 				continue;
 			}
 #endif
-			
+
 			// Get the team information
-			DEBUG_ASSERTCRASH(pMapObj->getProperties()->getType(TheKey_originalOwner) == Dict::DICT_ASCIISTRING, ("unit %s has no original owner specified (obsolete map file)\n",pMapObj->getName().str()));
+			DEBUG_ASSERTCRASH(pMapObj->getProperties()->getType(TheKey_originalOwner) == Dict::DICT_ASCIISTRING, ("unit %s has no original owner specified (obsolete map file)",pMapObj->getName().str()));
 			AsciiString originalOwner = pMapObj->getProperties()->getAsciiString(TheKey_originalOwner);
 			Team *team = ThePlayerList->validateTeam(originalOwner);
 
@@ -1913,7 +1881,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			Object *obj = TheThingFactory->newObject( thingTemplate, team ); //, OBJECT_STATUS_LOADING_FROM_MAP );
 			if( obj )
 			{
-				if(pMapObj->getFlag(FLAG_DRAWS_IN_MIRROR) || obj->isKindOf(KINDOF_CAN_CAST_REFLECTIONS)) 
+				if(pMapObj->getFlag(FLAG_DRAWS_IN_MIRROR) || obj->isKindOf(KINDOF_CAN_CAST_REFLECTIONS))
 				{
 					Drawable* draw = obj->getDrawable();
 					if(draw)
@@ -1943,8 +1911,8 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 				team->setActive();
 				TheAI->pathfinder()->addObjectToPathfindMap( obj );
 
-			}  // end if
-		
+			}
+
 			if(timeGetTime() > timer + 500)
 			{
 				if(progressCount < LOAD_PROGRESS_MAX_ALL_THE_FREAKN_OBJECTS)
@@ -1953,31 +1921,31 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 				timer = timeGetTime();
 			}
 
-		}	// for, loading map objects
+		}
 
-	}  // end if, not loading save game
+	}
 
 	#ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
-	sprintf(Buf,"After loading objects=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+	sprintf(Buf,"After loading objects=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
 	DEBUG_LOG(("%s", Buf));
 	#endif
 
 	progressCount = LOAD_PROGRESS_LOOP_INITIAL_NETWORK_BUILDINGS;
 	// place initial network buildings/units
-	if (game && !loadingSaveGame)
+	if (TheGameInfo && !loadingSaveGame)
 	{
 		for (int i=0; i<MAX_SLOTS; ++i)
 		{
-			GameSlot *slot = game->getSlot(i);
-			
+			GameSlot *slot = TheGameInfo->getSlot(i);
+
 			if (!slot || !slot->isOccupied())
 				continue;
-			
+
 			AsciiString playerName;
 			playerName.format("player%d", i);
 			Player *player = ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(playerName));
-			
+
 			if (slot->getPlayerTemplate() == PLAYERTEMPLATE_OBSERVER)
 			{
 				slot->setPlayerTemplate(0);
@@ -1993,7 +1961,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 						}
 					}
 				}
-				DEBUG_LOG(("Setting observer's playerTemplate to %d in slot %d\n", slot->getPlayerTemplate(), i));
+				DEBUG_LOG(("Setting observer's playerTemplate to %d in slot %d", slot->getPlayerTemplate(), i));
 			}
 			else
 			{
@@ -2004,7 +1972,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 				// The game will start, but the cheater will be instantly defeated because he has no troops.
 				// This is also enforced at GUI setup (GUIUtil.cpp and UserPreferences.cpp).
 				// @todo: unlock these when something rad happens
-				
+
 				// TheSuperHackers @logic-client-separation helmutbuhler 11/04/2025
 				// TheChallengeGenerals belongs to client, we shouldn't depend on that here.
 				Bool disallowLockedGenerals = TRUE;
@@ -2014,13 +1982,13 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 					continue;
 
 				// prevent from loading disallowed templates, in case your peer hacked their GUI.
-        
+
 
         // So that the global flag for restricting factions to "OLD" is applied only in the appropriate context!
         // Trouble was that skirmish games would get no command centers upon start, if this was set true in a GameSpyMenu
         if ( isInInternetGame() )
         {
-				  if ( game->oldFactionsOnly() && !pt->isOldFaction() )
+				  if ( TheGameInfo->oldFactionsOnly() && !pt->isOldFaction() )
 				    continue;
         }
 
@@ -2034,7 +2002,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 
 		}
 	}
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_INITIAL_NETWORK_BUILDINGS);
 
 	//
@@ -2058,7 +2026,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	//put this here somewhat randomly.
 	TheControlBar->hideCommunicator( FALSE );
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_PRELOAD_ASSETS);
 
 	TheTacticalView->setAngleAndPitchToDefault();
@@ -2071,20 +2039,20 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	// Note - We construct the multiplayer start spot name manually here, so change this if you
 	//        change TheKey_Player_1_Start etc.  mdc
 	AsciiString startingCamName = TheNameKeyGenerator->keyToName(TheKey_InitialCameraPosition);
-	if (game)
+	if (TheGameInfo)
 	{
-		GameSlot *slot = game->getSlot(localSlot);
+		GameSlot *slot = TheGameInfo->getSlot(localSlot);
 		DEBUG_ASSERTCRASH(slot, ("Starting a LAN game without ourselves!"));
-		
+
 		if (slot->isHuman())
 		{
 			Int startPos = slot->getStartPos();
 			startingCamName.format("Player_%d_Start", startPos+1); // start pos waypoints are 1-based
-			DEBUG_LOG(("Using %s as the multiplayer initial camera position\n", startingCamName.str()));
+			DEBUG_LOG(("Using %s as the multiplayer initial camera position", startingCamName.str()));
 		}
 	}
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_STARTING_CAMERA);
 
 	Waypoint *way = findNamedWaypoint(startingCamName);
@@ -2102,7 +2070,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 		pos.y = 50;
 		pos.z = 0;
 		TheTacticalView->lookAt( &pos );
-		DEBUG_LOG(("Failed to find initial camera position waypoint %s\n", startingCamName.str()));
+		DEBUG_LOG(("Failed to find initial camera position waypoint %s", startingCamName.str()));
 	}
 
 	// Set up the camera height based on the map height & globalData.
@@ -2110,7 +2078,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	TheTacticalView->setAngleAndPitchToDefault();
 	TheTacticalView->setZoomToDefault();
 
-	// update the loadscreen 
+	// update the loadscreen
 	updateLoadProgress(LOAD_PROGRESS_POST_STARTING_CAMERA_2);
 
 	// update partition info - We need to do the initial update so that it can be queried
@@ -2119,7 +2087,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 
 	#ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
-	sprintf(Buf,"After partition manager update=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+	sprintf(Buf,"After partition manager update=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
 	DEBUG_LOG(("%s", Buf));
 	#endif
 
@@ -2132,13 +2100,12 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	{
 		// Establish local player relationships with other teams as
 		// they're set up for "ThePlayer" in challenge mode map.
-		// Some designers have used "ThePlayer" as an empty player for Generals' 
-		// Challenge maps which they reference in script and by which they set 
+		// Some designers have used "ThePlayer" as an empty player for Generals'
+		// Challenge maps which they reference in script and by which they set
 		// player relationships.  The skirmish local player will receive these
 		// relationships.  If there is no "ThePlayer", we have to assume that
 		// all players on the map are the local player's enemy, except neutral
 		// and civilian players.
-		Player *localPlayer = ThePlayerList->getLocalPlayer();
 		DEBUG_ASSERTCRASH(localPlayer, ("Local player has not been established for Challenge map."));
 		Player *placeholderThePlayer = ThePlayerList->findPlayerWithNameKey(NAMEKEY("ThePlayer"));
 		DEBUG_ASSERTCRASH(placeholderThePlayer, ("Challenge maps without player \"ThePlayer\" assume that the local player is mutual enemies with all other players except the neutral and civilian players."));
@@ -2153,10 +2120,10 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 				thePlayerEnemy->setPlayerRelationship(localPlayer, ENEMIES);
 				localPlayer->setPlayerRelationship(thePlayerEnemy, ENEMIES);
 			}
-		} 
-		else 
+		}
+		else
 		{
-			// This map has no "ThePlayer" by which to model the local player's 
+			// This map has no "ThePlayer" by which to model the local player's
 			// relationships, so make assumptions.
 			for (Int i = 0; i < ThePlayerList->getPlayerCount(); i++)
 			{
@@ -2165,12 +2132,12 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 				if (thatPlayer == localPlayer)
 				{
 					rel = ALLIES;
-				} 
+				}
 				else if (thatPlayer != ThePlayerList->getNeutralPlayer()
 					&& thatPlayer != ThePlayerList->findPlayerWithNameKey(NAMEKEY("PlyrCivilian")))
 				{
 					rel = ENEMIES;
-				} 
+				}
 				thatPlayer->setPlayerRelationship(localPlayer, rel);
 				localPlayer->setPlayerRelationship(thatPlayer, rel);
 			}
@@ -2190,7 +2157,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			if (pPlayer)
 			{
 				pPlayer->addSkillPoints(m_rankPointsToAddAtGameStart);
-				DEBUG_LOG(("GameLogic::startNewGame() - adding m_rankPointsToAddAtGameStart==%d to player %d(%ls)\n",
+				DEBUG_LOG(("GameLogic::startNewGame() - adding m_rankPointsToAddAtGameStart==%d to player %d(%ls)",
 					m_rankPointsToAddAtGameStart, i, pPlayer->getPlayerDisplayName().str()));
 			}
 		}
@@ -2212,7 +2179,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	}
 
 	// if we're in a load game, don't fade yet
-	if(loadingSaveGame == FALSE && TheTransitionHandler != NULL)
+	if(loadingSaveGame == FALSE && TheTransitionHandler != NULL && m_loadScreen)
 	{
 		TheTransitionHandler->setGroup("FadeWholeScreen");
 		while(!TheTransitionHandler->isFinished())
@@ -2224,7 +2191,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 				setFPMode();
 				Sleep(33);
 			}
-			
+
 		}
 	}
 
@@ -2243,10 +2210,10 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			deleteLoadScreen();
 
 	}
-	
+
 	#ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
-	sprintf(Buf,"After delete load screen=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+	sprintf(Buf,"After delete load screen=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
 	DEBUG_LOG(("%s", Buf));
 	#endif
 
@@ -2255,7 +2222,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 		if (!TheGlobalData->m_headless)
 		{
 			if(TheShell->getScreenCount() == 0)
-				TheShell->push( AsciiString("Menus/MainMenu.wnd") );
+				TheShell->push( "Menus/MainMenu.wnd" );
 			else if (TheShell->top())
 			{
 				TheShell->top()->hide(FALSE);
@@ -2266,7 +2233,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	}
 	else
 	{
-		
+
 //		TheShell->hideShell();
 		if(TheStatsCollector)
 		{
@@ -2283,17 +2250,17 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 		// explicitly set the Control bar to Observer Mode
 		if(m_gameMode == GAME_REPLAY )
 		{
-			
-			ThePlayerList->setLocalPlayer(ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey("ReplayObserver")));
-			TheRadar->forceOn(TRUE);
-			ThePartitionManager->refreshShroudForLocalPlayer();
-			TheControlBar->setControlBarSchemeByPlayer( ThePlayerList->getLocalPlayer());
-			DEBUG_LOG(("Start of a replay game %ls, %d\n",ThePlayerList->getLocalPlayer()->getPlayerDisplayName().str(), ThePlayerList->getLocalPlayer()->getPlayerIndex()));
+			rts::changeLocalPlayer(observerPlayer);
+
+			DEBUG_LOG(("Start of a replay game %ls, %d", localPlayer->getPlayerDisplayName().str(), localPlayer->getPlayerIndex()));
 		}
 		else
-			TheControlBar->setControlBarSchemeByPlayer(ThePlayerList->getLocalPlayer());
+		{
+			TheControlBar->setControlBarSchemeByPlayer(localPlayer);
+			TheControlBar->initSpecialPowershortcutBar(localPlayer);
+		}
 //		ShowControlBar();
-		
+
 	}
 	TheTacticalView->setOkToAdjustHeight(TRUE);
 
@@ -2302,9 +2269,9 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	g_UT_curThing = TheThingFactory->firstTemplate();
 	g_UT_startTiming = true;
 	g_UT_gotUnit = false;
-	g_UT_timingLog = fopen("TimingLog.txt", "w");	 
+	g_UT_timingLog = fopen("TimingLog.txt", "w");
 	g_UT_commaLog = fopen("TimingCDL.txt", "w");
-	fputs("Full,100*ms,NoPart-NoSpawn,,No Spawn,100*ms,Logic,100*ms,Thing,Model,Kind,Side,DrawCalls All,DrawCalls NoPart-NoSpawn,DrawCalls NoSpawn\n", g_UT_commaLog); 
+	fputs("Full,100*ms,NoPart-NoSpawn,,No Spawn,100*ms,Logic,100*ms,Thing,Model,Kind,Side,DrawCalls All,DrawCalls NoPart-NoSpawn,DrawCalls NoSpawn\n", g_UT_commaLog);
 
 	// Turn off shadows
 	TheWritableGlobalData->m_useShadowVolumes = false;
@@ -2329,9 +2296,9 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	// We'll ask the Recorder, so we survive replays
 	if( TheRecorder->isMultiplayer() )
 	{
-		// Iterate through each player's objects, and ask if the object 
+		// Iterate through each player's objects, and ask if the object
 		//is a command center, and if so, select it for that player
-		for (Int i = 0; i < MAX_PLAYER_COUNT; ++i) 
+		for (Int i = 0; i < MAX_PLAYER_COUNT; ++i)
 		{
 			Player *player = ThePlayerList->getNthPlayer(i);
 			if (player && player->isPlayerActive())
@@ -2342,7 +2309,6 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 			}
 		}
 	}
-	TheControlBar->initSpecialPowershortcutBar(ThePlayerList->getLocalPlayer());
 
 	if(m_gameMode == GAME_SHELL)
 	{
@@ -2358,7 +2324,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	HideControlBar();
 #endif
 	TheWritableGlobalData->m_loadScreenRender = FALSE;	///< mark to resume rendering as normal
-	
+
 	// if we're in a gamespy game, mark us as playing
 	if (TheGameSpyBuddyMessageQueue && TheGameSpyGame && isInInternetGame())
 	{
@@ -2368,29 +2334,27 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 		strcpy(req.arg.status.statusString, "Playing");
 		sprintf(req.arg.status.locationString, "%s", WideCharStringToMultiByte(TheGameSpyGame->getGameName().str()).c_str());
 		TheGameSpyBuddyMessageQueue->addRequest(req);
-	}	
-	
+	}
+
   if( loadingSaveGame == FALSE )
   {
     // Drawables need to do some work on level start; give them a chance to do it
     Drawable * drawable = TheGameClient->getDrawableList();
-  
+
     while ( drawable != NULL )
     {
       drawable->onLevelStart();
       drawable = drawable->getNextDrawable();
     }
   }
-  
-	//Added By Sadullah Nader
-	//Added to fix the quit menu 
+
 	//ReAllows quit menu to work during loading scene
 	//setGameLoading(FALSE);
 	setLoadingMap( FALSE );
 
 #ifdef DUMP_PERF_STATS
 	GetPrecisionTimer(&endTime64);
-	sprintf(Buf,"Total startnewgame=%f\n",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
+	sprintf(Buf,"Total startnewgame=%f",((double)(endTime64-startTime64)/(double)(freq64)*1000.0));
 	DEBUG_LOG(("%s", Buf));
 #endif
 
@@ -2399,14 +2363,28 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
 	if (TheGameSpyInfo)
 		TheGameSpyInfo->updateAdditionalGameSpyDisconnections(1);
 
-  
+
   if ( isInReplayGame() && TheInGameUI && TheGameText )
   {
-		TheInGameUI->message( TheGameText->fetch( "GUI:FastForwardInstructions" ) );
+		TheInGameUI->messageNoFormat( TheGameText->FETCH_OR_SUBSTITUTE( "GUI:FastForwardInstructions", L"Press F to toggle Fast Forward" ) );
   }
 
 
-}  // end startNewGame
+}
+
+//-----------------------------------------------------------------------------------------
+void GameLogic::createOptimizedTree(const ThingTemplate *thingTemplate, Coord3D *pos, Real angle)
+{
+	// Opt trees and props just get drawables to tell the client about it, then deleted. jba [6/5/2003]
+	// This way there is no logic object to slow down partition manager and core logic stuff.
+	// TheSuperHackers @info Destroying the drawable will register the tree in the tree buffer.
+	Drawable *draw = TheThingFactory->newDrawable(thingTemplate);
+	if (draw) {
+		draw->setOrientation(angle);
+		draw->setPosition(pos);
+		TheGameClient->destroyDrawable(draw);
+	}
+}
 
 //-----------------------------------------------------------------------------------------
 static void findAndSelectCommandCenter(Object *obj, void* alreadyFound)
@@ -2435,24 +2413,22 @@ void GameLogic::loadMapINI( AsciiString mapName )
 		return;
 	}
 
-	char filename[_MAX_PATH];
-	char fullFledgeFilename[_MAX_PATH];
-
-	memset(filename, 0, _MAX_PATH);
-	strcpy(filename, mapName.str());
-
 	//
 	// if map name begins with a "SAVE_DIRECTORY\", then the map refers to a map
 	// that has been extracted from a save game file ... in that case we need to get
 	// the pristine map name string in order to manipulate and load the right map.ini
 	// for that map from it's original location
 	//
-	if (TheGameState->isInSaveDirectory(filename))
-		strcpy( filename, TheGameState->getSaveGameInfo()->pristineMapName.str() );
+	const char* pristineMapName = TheGameState->isInSaveDirectory(mapName.str())
+		? TheGameState->getSaveGameInfo()->pristineMapName.str()
+		: mapName.str();
+
+	char filename[_MAX_PATH];
+	strlcpy(filename, pristineMapName, ARRAY_SIZE(filename));
 
 	// sanity
 	int length = strlen(filename);
-	if (length < 4) { 
+	if (length < 4) {
 		return;
 	}
 
@@ -2464,20 +2440,24 @@ void GameLogic::loadMapINI( AsciiString mapName )
 	*extension = 0;
 
 
+	char fullFledgeFilename[_MAX_PATH];
 	sprintf(fullFledgeFilename, "%s\\map.ini", filename);
 	if (TheFileSystem->doesFileExist(fullFledgeFilename)) {
-		DEBUG_LOG(("Loading map.ini\n"));
+		DEBUG_LOG(("Loading map.ini"));
 		INI ini;
 		ini.load( AsciiString(fullFledgeFilename), INI_LOAD_CREATE_OVERRIDES, NULL );
 	}
 
+	// TheSuperHackers @todo Implement ini load directory for map folder.
+	// Requires adjustments in map transfer.
+
 	sprintf(fullFledgeFilename, "%s\\solo.ini", filename);
 	if (TheFileSystem->doesFileExist(fullFledgeFilename)) {
-		DEBUG_LOG(("Loading solo.ini\n"));
+		DEBUG_LOG(("Loading solo.ini"));
 		INI ini;
 		ini.load( AsciiString(fullFledgeFilename), INI_LOAD_CREATE_OVERRIDES, NULL );
 	}
-	
+
 	// No error here. There could've just *not* been a map.ini file.
 
 	// now look for a string file
@@ -2530,8 +2510,8 @@ void GameLogic::processDestroyList( void )
 		/*
 			this looks odd, but is necessary; since erasing a single entry can shuffle others in the list
 			(in order to maintain its heap-ness), we must do two passes: one to find the updates for this
-			object, another to actually erase 'em. 
-			
+			object, another to actually erase 'em.
+
 			(in case you're wondering: yes, this is still more efficient than just deleting them
 			and rebalancing the entire heap afterwards, at least for real-world maps, since an individual
 			rebalance is O(log N) and a full rebalance is O(N)... so unless you are deleting the majority
@@ -2611,14 +2591,14 @@ void GameLogic::processCommandList( CommandList *list )
 			}
 			else
 			{
-				//DEBUG_LOG(("Comparing %d CRCs on frame %d\n", m_cachedCRCs.size(), m_frame));
+				//DEBUG_LOG(("Comparing %d CRCs on frame %d", m_cachedCRCs.size(), m_frame));
 				std::map<Int, UnsignedInt>::const_iterator crcIt = m_cachedCRCs.begin();
 				Int validatorCRC = crcIt->second;
-				//DEBUG_LOG(("Validator CRC from player %d is %8.8X\n", crcIt->first, validatorCRC));
+				//DEBUG_LOG(("Validator CRC from player %d is %8.8X", crcIt->first, validatorCRC));
 				while (++crcIt != m_cachedCRCs.end())
 				{
 					Int validatedCRC = crcIt->second;
-					//DEBUG_LOG(("CRC to validate is from player %d: %8.8X\n", crcIt->first, validatedCRC));
+					//DEBUG_LOG(("CRC to validate is from player %d: %8.8X", crcIt->first, validatedCRC));
 					if (validatorCRC != validatedCRC)
 					{
 						DEBUG_CRASH(("CRC mismatch!"));
@@ -2631,11 +2611,11 @@ void GameLogic::processCommandList( CommandList *list )
 		if (sawCRCMismatch)
 		{
 #ifdef DEBUG_LOGGING
-			DEBUG_LOG(("CRC Mismatch - saw %d CRCs from %d players\n", m_cachedCRCs.size(), numPlayers));
+			DEBUG_LOG(("CRC Mismatch - saw %d CRCs from %d players", m_cachedCRCs.size(), numPlayers));
 			for (std::map<Int, UnsignedInt>::const_iterator crcIt = m_cachedCRCs.begin(); crcIt != m_cachedCRCs.end(); ++crcIt)
 			{
 				Player *player = ThePlayerList->getNthPlayer(crcIt->first);
-				DEBUG_LOG(("CRC from player %d (%ls) = %X\n", crcIt->first,
+				DEBUG_LOG(("CRC from player %d (%ls) = %X", crcIt->first,
 					player?player->getPlayerDisplayName().str():L"<NONE>", crcIt->second));
 			}
 #endif // DEBUG_LOGGING
@@ -2643,7 +2623,7 @@ void GameLogic::processCommandList( CommandList *list )
 		}
 	}
 
-}  // end processCommandList
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -2657,46 +2637,57 @@ Bool GameLogic::isIntroMoviePlaying()
 // ------------------------------------------------------------------------------------------------
 void GameLogic::selectObject(Object *obj, Bool createNewSelection, PlayerMaskType playerMask, Bool affectClient)
 {
-	if (!obj) 
+	if (!obj)
 	{
 		return;
 	}
 
-	if (!obj->isMassSelectable() && !createNewSelection) 
+	if (!obj->isMassSelectable() && !createNewSelection)
 	{
-		DEBUG_LOG(("GameLogic::selectObject() - Object attempted to be added to selection, but isn't mass-selectable.\n"));
+		DEBUG_LOG(("GameLogic::selectObject() - Object attempted to be added to selection, but isn't mass-selectable."));
 		return;
 	}
 
-	while( playerMask ) 
+	while( playerMask )
 	{
 		Player *player = ThePlayerList->getEachPlayerFromMask(playerMask);
-		if( !player ) 
+		if( !player )
 		{
 			return;
 		}
 
-		AIGroup *group = NULL;
-		CRCGEN_LOG(( "Creating AIGroup in GameLogic::selectObject()\n" ));
-		group = TheAI->createGroup();
+		CRCGEN_LOG(( "Creating AIGroup in GameLogic::selectObject()" ));
+		AIGroupPtr group = TheAI->createGroup();
 		group->add(obj);
 
 		// add all selected agents to the AI group
-		if (createNewSelection)	
+		if (createNewSelection)
 		{
+#if RETAIL_COMPATIBLE_AIGROUP
 			player->setCurrentlySelectedAIGroup(group);
-		} 
-		else 
+#else
+			player->setCurrentlySelectedAIGroup(group.Peek());
+#endif
+		}
+		else
 		{
+#if RETAIL_COMPATIBLE_AIGROUP
 			player->addAIGroupToCurrentSelection(group);
+#else
+			player->addAIGroupToCurrentSelection(group.Peek());
+#endif
 		}
 
+#if RETAIL_COMPATIBLE_AIGROUP
 		TheAI->destroyGroup(group);
+#else
+		group->removeAll();
+#endif
 
-		if( affectClient ) 
+		if( affectClient )
 		{
 			Drawable *draw = obj->getDrawable();
-			if( draw ) 
+			if( draw )
 			{
 				TheInGameUI->selectDrawable(draw);
 			}
@@ -2718,25 +2709,28 @@ void GameLogic::deselectObject(Object *obj, PlayerMaskType playerMask, Bool affe
 			return;
 		}
 
-		AIGroup *group = NULL;
-		CRCGEN_LOG(( "Removing a unit from a selected group in GameLogic::deselectObject()\n" ));
-		group = TheAI->createGroup();
+		CRCGEN_LOG(( "Removing a unit from a selected group in GameLogic::deselectObject()" ));
+		AIGroupPtr group = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 		player->getCurrentSelectionAsAIGroup(group);
-		
-		Bool deleted = FALSE;
-		Bool actuallyRemoved = FALSE;
-		
+#else
+		player->getCurrentSelectionAsAIGroup(group.Peek());
+#endif
+
 		if (group) {
-			deleted = group->remove(obj);
-			actuallyRemoved = TRUE;
-		}
-		
-		if (actuallyRemoved) {
+			Bool emptied = group->remove(obj);
+
 			// Set this to be the currently selected group.
-			if (!deleted) {
+			if (!emptied) {
+#if RETAIL_COMPATIBLE_AIGROUP
 				player->setCurrentlySelectedAIGroup(group);
 				// Then, cleanup the group.
 				TheAI->destroyGroup(group);
+#else
+				player->setCurrentlySelectedAIGroup(group.Peek());
+				// Then, cleanup the group.
+				group->removeAll();
+#endif
 			} else {
 				// NULL will clear the group.
 				player->setCurrentlySelectedAIGroup(NULL);
@@ -2765,14 +2759,14 @@ inline void GameLogic::validateSleepyUpdate() const
 		return;
 
 	int i;
-	//DEBUG_LOG(("\n\n"));
+	//DEBUG_LOG(("\n"));
 	//for (i = 0; i < sz; ++i)
 	//{
-	//	DEBUG_LOG(("u %04d: %08lx %08lx\n",i,m_sleepyUpdates[i],m_sleepyUpdates[i]->friend_getNextCallFrame()));
+	//	DEBUG_LOG(("u %04d: %08lx %08lx",i,m_sleepyUpdates[i],m_sleepyUpdates[i]->friend_getNextCallFrame()));
 	//}
 	for (i = 0; i < sz; ++i)
 	{
-		DEBUG_ASSERTCRASH(m_sleepyUpdates[i]->friend_getIndexInLogic() == i, ("index mismatch: expected %d, got %d\n",i,m_sleepyUpdates[i]->friend_getIndexInLogic()));
+		DEBUG_ASSERTCRASH(m_sleepyUpdates[i]->friend_getIndexInLogic() == i, ("index mismatch: expected %d, got %d",i,m_sleepyUpdates[i]->friend_getIndexInLogic()));
 		UnsignedInt pri = m_sleepyUpdates[i]->friend_getPriority();
 		if (i > 0)
 		{
@@ -2868,7 +2862,7 @@ Int GameLogic::rebalanceChildSleepyUpdate(Int i)
 // this function gets the brunt of the work (we frequently
 // balance down, not up), so this one is hand-unrolled for
 // max efficiency. I have left the pristine non-unrolled
-// version present for clarity. (Yes, this is worth doing.) (srj) 
+// version present for clarity. (Yes, this is worth doing.) (srj)
 #if 1
 	UpdateModulePtr* pI = &m_sleepyUpdates[i];
 
@@ -2877,7 +2871,7 @@ Int GameLogic::rebalanceChildSleepyUpdate(Int i)
 	UpdateModulePtr* pChild = &m_sleepyUpdates[0] + child;
 	UpdateModulePtr* pSZ = &m_sleepyUpdates[0] + m_sleepyUpdates.size();	// yes, this is off the end.
 
-  while (pChild < pSZ) 
+  while (pChild < pSZ)
 	{
 		// choose the higher-priority of the two children; we must be higher-pri than that.
 		if (pChild < pSZ-1 && isLowerPriority(*pChild, *(pChild+1)))
@@ -2912,12 +2906,12 @@ Int GameLogic::rebalanceChildSleepyUpdate(Int i)
 	// our children are i*2 and i*2+1
 	Int sz = m_sleepyUpdates.size();
   Int child = ((i)<<1)+1;
-  while (child < sz) 
+  while (child < sz)
 	{
 		// choose the higher-priority of the two children; we must be higher-pri than that.
 		if (child < sz-1 && isLowerPriority(m_sleepyUpdates[child], m_sleepyUpdates[child+1]))
       ++child;
-		
+
 		// if we're higher-pri than our children, we're done.
 		if (!isLowerPriority(m_sleepyUpdates[i], m_sleepyUpdates[child]))
 		{
@@ -2955,7 +2949,7 @@ void GameLogic::remakeSleepyUpdate()
 	USE_PERF_TIMER(SleepyMaintenance)
 
 	Int parent = m_sleepyUpdates.size() / 2;
-  while (true) 
+  while (true)
 	{
     rebalanceChildSleepyUpdate(parent);
     if (parent == 0)
@@ -2975,7 +2969,7 @@ void GameLogic::pushSleepyUpdate(UpdateModulePtr u)
 
 	m_sleepyUpdates.push_back(u);
 	u->friend_setIndexInLogic(m_sleepyUpdates.size() - 1);
-	
+
 	rebalanceParentSleepyUpdate(m_sleepyUpdates.size()-1);
 }
 
@@ -2985,7 +2979,7 @@ UpdateModulePtr GameLogic::peekSleepyUpdate() const
 	USE_PERF_TIMER(SleepyMaintenance)
 
 	UpdateModulePtr u = m_sleepyUpdates.front();
-	DEBUG_ASSERTCRASH(u->friend_getIndexInLogic() == 0, ("index mismatch: expected %d, got %d\n",0,u->friend_getIndexInLogic()));
+	DEBUG_ASSERTCRASH(u->friend_getIndexInLogic() == 0, ("index mismatch: expected %d, got %d",0,u->friend_getIndexInLogic()));
 	return u;
 }
 
@@ -3022,12 +3016,12 @@ void GameLogic::popSleepyUpdate()
 void GameLogic::friend_awakenUpdateModule(Object* obj, UpdateModulePtr u, UnsignedInt whenToWakeUp)
 {
 	//USE_PERF_TIMER(friend_awakenUpdateModule)
-	UnsignedInt now = TheGameLogic->getFrame();
+	UnsignedInt now = getFrame();
 	DEBUG_ASSERTCRASH(whenToWakeUp >= now, ("setWakeFrame frame is in the past... are you sure this is what you want?"));
 
 	if (u == m_curUpdateModule)
 	{
-		DEBUG_CRASH(("You should not call setWakeFrame() from inside your update(), because it will be ignored, in favor of the return code from update.\n"));
+		DEBUG_CRASH(("You should not call setWakeFrame() from inside your update(), because it will be ignored, in favor of the return code from update."));
 		return;
 	}
 
@@ -3036,7 +3030,7 @@ void GameLogic::friend_awakenUpdateModule(Object* obj, UpdateModulePtr u, Unsign
 
 	if ((now > 0) && (u->friend_getNextCallFrame() == now) && (whenToWakeUp == now + 1))
 	{
-		// subtle but important case: if we already awake, and someone calls 
+		// subtle but important case: if we already awake, and someone calls
 		// setWakeFrame(self, UPDATE_SLEEP_NONE), we don't want to reset our wake frame,
 		// since that would prevent us from getting called THIS frame. since UPDATE_SLEEP_NONE
 		// really means "wake up as soon as possible", we don't want to change our status
@@ -3049,13 +3043,13 @@ void GameLogic::friend_awakenUpdateModule(Object* obj, UpdateModulePtr u, Unsign
 	{
 		if (idx < 0 || idx >= m_sleepyUpdates.size())
 		{
-			RELEASE_CRASH("fatal error! sleepy update module illegal index.\n");
+			RELEASE_CRASH("fatal error! sleepy update module illegal index.");
 			return;
 		}
 
 		if (m_sleepyUpdates[idx] != u)
 		{
-			RELEASE_CRASH("fatal error! sleepy update module index mismatch.\n");
+			RELEASE_CRASH("fatal error! sleepy update module index mismatch.");
 			return;
 		}
 
@@ -3064,7 +3058,7 @@ void GameLogic::friend_awakenUpdateModule(Object* obj, UpdateModulePtr u, Unsign
 
 		// rebalance.
 		rebalanceSleepyUpdate(idx);
-		
+
 		// validate. (harmless except in debug mode)
 		validateSleepyUpdate();
 
@@ -3074,11 +3068,11 @@ void GameLogic::friend_awakenUpdateModule(Object* obj, UpdateModulePtr u, Unsign
 	{
 		if (idx != -1)
 		{
-			RELEASE_CRASH("fatal error! sleepy update module index mismatch.\n");
+			RELEASE_CRASH("fatal error! sleepy update module index mismatch.");
 			return;
 		}
 
-		// this can happen if stuff happens during object initialization. fortunately, 
+		// this can happen if stuff happens during object initialization. fortunately,
 		// it's easy to deal with:
 		u->friend_setNextCallFrame(whenToWakeUp);
 		return;
@@ -3100,10 +3094,10 @@ void drawGraph( const char* style, Real scale, double value )
   {
     DEBUG_LOG((style));
     if ( t%200 == 199 )
-      DEBUG_LOG(("...\n"));
+      DEBUG_LOG(("..."));
   }
 
-  DEBUG_LOG(("\n"));
+  DEBUG_LOG_RAW(("\n"));
 
 }
 
@@ -3114,7 +3108,7 @@ static void unitTimings(void)
 {
 	static Int settleFrames = 0;
 	static Int timeFrames = 0;
-	enum { INFANTRY, VEHICLE, STRUCTURE, OTHER, END}; 
+	enum { INFANTRY, VEHICLE, STRUCTURE, OTHER, END};
 	static Int unitTypes = INFANTRY;
 	AsciiString sides[16];
 
@@ -3177,7 +3171,7 @@ static void unitTimings(void)
 	static enum { LOGIC, NO_PARTICLES, NO_SPAWN, ALL} mode;
 	static double timeAll, timeAllNoAnim, timeNoPart, timeNoSpawn, timeLogic, timeLogicNoAnim;
 	static float drawCallAll,drawCallNoPart,drawCallNoSpawn,drawCallLogic;
-	
+
 	if (settleFrames>0) {
 		settleFrames--;
 		if (settleFrames>0) return;
@@ -3194,7 +3188,7 @@ static void unitTimings(void)
 		drawCallTotal += TheDisplay->getLastFrameDrawCalls();
 		timeFrames--;
 		if (timeFrames>0) return;
-		
+
 		QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
 		double timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));
 
@@ -3220,14 +3214,14 @@ static void unitTimings(void)
 			timeAll = timeToUpdate;
 			drawCallAll = (float)drawCallTotal / (float)(TIME_FRAMES * TOTAL_UNITS);  // 100 units for TIME_FRAMES
 
-			mode = NO_PARTICLES; 
+			mode = NO_PARTICLES;
 			settleFrames = SETTLE_FRAMES;
 			if (TheParticleSystemManager->getParticleCount()>1) {
 				TheParticleSystemManager->reset();
-				DEBUG_LOG(("Starting noParticles - \n"));
+				DEBUG_LOG(("Starting noParticles - "));
 			}
 			return;
-		} 
+		}
 		if (mode == NO_PARTICLES) {
 			timeNoPart = timeToUpdate;
 			drawCallNoPart = (float)drawCallTotal / (float)(TIME_FRAMES * TOTAL_UNITS);  // 100 units for TIME_FRAMES
@@ -3241,13 +3235,13 @@ static void unitTimings(void)
 					gotSpawn = true;
 				}
 				obj = obj->getNextObject();
-			}	
+			}
 			if (gotSpawn) {
-				DEBUG_LOG(("Starting noSpawn - \n"));
+				DEBUG_LOG(("Starting noSpawn - "));
 				settleFrames = SETTLE_FRAMES;
 				return;
 			}
-		}	
+		}
 		if (mode==NO_SPAWN) {
 			timeNoSpawn = timeToUpdate;
 			drawCallNoSpawn = (float)drawCallTotal / (float)(TIME_FRAMES * TOTAL_UNITS);  // 100 units for TIME_FRAMES
@@ -3269,7 +3263,7 @@ static void unitTimings(void)
 		sprintf(remark, "Without Particles %f\n", timeNoPart);
     DEBUG_LOG((remark));
     drawGraph( "@", graphScale, timeNoPart );
-        
+
  		sprintf(remark, "Without Spawn %f  \n", timeNoSpawn );
     DEBUG_LOG((remark));
     drawGraph( "@", graphScale, timeNoSpawn );
@@ -3277,8 +3271,8 @@ static void unitTimings(void)
  		sprintf(remark, "Logic %f \n", timeLogic);
     DEBUG_LOG((remark));
     drawGraph( "@", graphScale, timeLogic );
-    
-    
+
+
 		sprintf(remark, "DrawCalls for %s \n", thingName.str() ) ;
 		DEBUG_LOG((remark));
 
@@ -3312,7 +3306,7 @@ static void unitTimings(void)
 				type="Structure";
 			}	else {
 				type="Other";
-			}						 
+			}
 			AsciiString modelName;
 			ModelConditionFlags state;
 			state.clear();
@@ -3330,10 +3324,10 @@ static void unitTimings(void)
 				modelName = "**NO MODEL**";
 				veryFirstTime = false;
 			}
-			sprintf(remark, "%f,%d,%f,%d,%f,%d,%f,%d,%s,%s,%s,%s,%f,%f,%f\n", timeAll, 
-			(Int)(timeAll*1000/TIME_FRAMES),timeNoPart, 
-			(Int)(timeNoPart*1000/TIME_FRAMES),timeNoSpawn, 
-			(Int)(timeNoSpawn*1000/TIME_FRAMES),timeLogic, 
+			sprintf(remark, "%f,%d,%f,%d,%f,%d,%f,%d,%s,%s,%s,%s,%f,%f,%f\n", timeAll,
+			(Int)(timeAll*1000/TIME_FRAMES),timeNoPart,
+			(Int)(timeNoPart*1000/TIME_FRAMES),timeNoSpawn,
+			(Int)(timeNoSpawn*1000/TIME_FRAMES),timeLogic,
 			(Int)(timeLogic*1000/TIME_FRAMES), thingName.str(), modelName.str(), type.str(),
 			sides[side].str(),
 			drawCallAll,drawCallNoPart,drawCallNoSpawn);
@@ -3356,10 +3350,10 @@ static void unitTimings(void)
 			}
 			return;
 		}
-		while (g_UT_curThing->friend_getNextTemplate() 
-			&& g_UT_curThing->friend_getNextTemplate()->getName()!=SINGLE_UNIT) 
+		while (g_UT_curThing->friend_getNextTemplate()
+			&& g_UT_curThing->friend_getNextTemplate()->getName()!=SINGLE_UNIT)
 			g_UT_curThing = g_UT_curThing->friend_getNextTemplate();
-		
+
 	}
 #endif
 
@@ -3367,7 +3361,7 @@ static void unitTimings(void)
 	while (obj) {
 		TheGameLogic->destroyObject(obj);
 		obj = obj->getNextObject();
-	}												
+	}
 
 	if (g_UT_startTiming && g_UT_curThing && !g_UT_gotUnit) {
 		TheWritableGlobalData->m_framesPerSecondLimit = 10000;
@@ -3387,12 +3381,12 @@ static void unitTimings(void)
 					if (sides[side].isEmpty() ) // end of sides list
           {
 						g_UT_startTiming = false;
-						if (g_UT_timingLog) 
+						if (g_UT_timingLog)
             {
 							fclose(g_UT_timingLog);
 							g_UT_timingLog = NULL;
 						}
-						if (g_UT_commaLog) 
+						if (g_UT_commaLog)
             {
 							fclose(g_UT_commaLog);
 							g_UT_commaLog = NULL;
@@ -3407,11 +3401,11 @@ static void unitTimings(void)
 
 #ifndef SINGLE_UNIT
       Bool unspecified = FALSE;
-			if (btt->getDefaultOwningSide() != sides[side]) 
+			if (btt->getDefaultOwningSide() != sides[side])
       {
         if (sides[side] == "*")
         {
-          if ( btt->getDefaultOwningSide() == ("") )// wildcard for unspecified side
+          if ( btt->getDefaultOwningSide().isEmpty() )// wildcard for unspecified side
             unspecified = TRUE;
           else
             continue;
@@ -3438,7 +3432,7 @@ static void unitTimings(void)
 #endif
 
 
-      static char *illegalTemplateNames[] = 
+      static const char *const illegalTemplateNames[] =
       {
 	      "EMPPulseBomb",
 	      "GLAAngryMobRockProjectileObject",
@@ -3472,24 +3466,24 @@ static void unitTimings(void)
         if ( illegalTemplateNames[test] == NULL )
           break;
 
-        if (btt->getName().startsWith(illegalTemplateNames[test])) 
+        if (btt->getName().startsWith(illegalTemplateNames[test]))
         {
           skip = TRUE;
           break;
         }
-        if (btt->getName().endsWith(illegalTemplateNames[test])) 
+        if (btt->getName().endsWith(illegalTemplateNames[test]))
         {
           skip = TRUE;
           break;
         }
-        if (btt->getName() == illegalTemplateNames[test] ) 
+        if (btt->getName() == illegalTemplateNames[test] )
         {
           skip = TRUE;
           break;
         }
       }
 
-      if ( skip ) 
+      if ( skip )
         continue;
 
 //			if (btt->getName() endsWith("EMPPulseBomb")) continue; // 100 overloads system.
@@ -3501,7 +3495,7 @@ static void unitTimings(void)
 //			if (btt->getName().startsWith("Firestorm"))	continue;	// 100 crashes
 //			if (btt->getName().startsWith("Avalanche"))	continue;	// 100 crashes
 //			if (btt->getName().startsWith("InfernoTankShell"))	continue;	// 100 crashes
-//			
+//
 //			if (btt->getName() endsWith("ChinaArtilleryBarrageShell") continue; // 100 takes really, freaking long. Doesn't crash jba.
 //			if (btt->getName() endsWith("ChinaTankOverlordBattleBunker") continue; // 100 seems to hang gth.
 //			if (btt->getName() endsWith("ChinaTankOverlordPropagandaTower") continue; // 100 seems to hang gth.
@@ -3510,18 +3504,18 @@ static void unitTimings(void)
 //			if (btt->getName() endsWith("GLAInfantryAngryMobNexus") continue;
 //
 //      //missiondisk perps
-//      
+//
 //      if (btt->getName() == "AmericaAircraftCarrier") continue;
 
 
 
 #ifdef SINGLE_UNIT
 			if (btt->getName()!=SINGLE_UNIT) {
-				DEBUG_LOG(("Skipping %s\n", btt->getName().str()));
+				DEBUG_LOG(("Skipping %s", btt->getName().str()));
 				continue;
 			}
 #endif
-			DEBUG_LOG(("\n===Doing thing %s ===\n", btt->getName().str()));
+			DEBUG_LOG(("\n===Doing thing %s ===", btt->getName().str()));
 
 
 #define dont_DO_ATTACK
@@ -3552,10 +3546,10 @@ static void unitTimings(void)
 					if (obj)
 					{
 						g_UT_gotUnit = true;
-					
-						obj->setOrientation(0);	
+
+						obj->setOrientation(0);
 						obj->setPosition( &pos );
-						
+
 						// Now onCreates were called at the constructor.  This magically created
 						// thing needs to be considered as Built for Game specific stuff.
 						for (BehaviorModule** m = obj->getBehaviorModules(); *m; ++m)
@@ -3576,7 +3570,7 @@ static void unitTimings(void)
 						}
 #endif
 					}
-#endif 
+#endif
 				}
 			}
 		}
@@ -3618,7 +3612,7 @@ void GameLogic::update( void )
 #endif
 
 	setFPMode();
-	
+
 	/// @todo remove this hack
 	if ( m_startNewGame && !TheDisplay->isMoviePlaying())
 	{
@@ -3643,7 +3637,7 @@ void GameLogic::update( void )
 		__int64 freq64;
 		GetPrecisionTimerTicksPerSec(&freq64);
 
-		sprintf(Buf,"Texture=%f, Anim=%f, CreateRobj=%f, Load3DAssets=%f\n",
+		sprintf(Buf,"Texture=%f, Anim=%f, CreateRobj=%f, Load3DAssets=%f",
 			((double)Total_Get_Texture_Time/(double)(freq64)*1000.0),
 			((double)Total_Get_HAnim_Time/(double)(freq64)*1000.0),
 			((double)Total_Create_Render_Obj_Time/(double)(freq64)*1000.0),
@@ -3654,8 +3648,7 @@ void GameLogic::update( void )
 	}
 
 	// send the current time to the GameClient
-	DEBUG_ASSERTCRASH(TheGameLogic == this, ("hmm, TheGameLogic is not right"));
-	UnsignedInt now = TheGameLogic->getFrame();
+	UnsignedInt now = getFrame();
 	TheGameClient->setFrame(now);
 
 	// update (execute) scripts
@@ -3663,22 +3656,6 @@ void GameLogic::update( void )
 		TheScriptEngine->UPDATE();
 	}
 
-	Bool freezeTime = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
-	freezeTime = freezeTime || TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript();
-	
-	if (freezeTime) 
-	{
-		if (TheCommandList->containsMessageOfType(GameMessage::MSG_CLEAR_GAME_DATA)) 
-		{
-			TheScriptEngine->forceUnfreezeTime();
-		} 
-		else 
-		{
-			/// @todo - make sure this never happens during a network game.  jba.
-			return;
-		}
-	}
-
 	// Note - TerrainLogic update needs to happen after ScriptEngine update, but before object updates.  jba.
 	// This way changes in bridges are noted in the script engine before being cleared in TerrainLogic->update
 	{
@@ -3700,20 +3677,21 @@ void GameLogic::update( void )
 	if (generateForSolo || generateForMP)
 	{
 		m_CRC = getCRC( CRC_RECALC );
-		if (isMPGameOrReplay)
-		{
-			GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_LOGIC_CRC );
-			msg->appendIntegerArgument( m_CRC );
-			msg->appendBooleanArgument( (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK) ); // playback CRC
-			DEBUG_LOG(("Appended CRC on frame %d: %8.8X\n", m_frame, m_CRC));
-		}
-		else
-		{
-			GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_LOGIC_CRC );
-			msg->appendIntegerArgument( m_CRC );
-			msg->appendBooleanArgument( (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK) ); // playback CRC
-			DEBUG_LOG(("Appended Playback CRC on frame %d: %8.8X\n", m_frame, m_CRC));
-		}
+		bool isPlayback = (TheRecorder && TheRecorder->isPlaybackMode());
+
+		GameMessage *msg = newInstance(GameMessage)(GameMessage::MSG_LOGIC_CRC);
+		msg->appendIntegerArgument(m_CRC);
+		msg->appendBooleanArgument(isPlayback);
+
+		// TheSuperHackers @info helmutbuhler 13/04/2025
+		// During replay simulation, we bypass TheMessageStream and instead put the CRC message
+		// directly into TheCommandList because we don't update TheMessageStream during simulation.
+		GameMessageList *messageList = TheMessageStream;
+		if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_SIMULATION_PLAYBACK)
+			messageList = TheCommandList;
+		messageList->appendMessage(msg);
+
+		DEBUG_LOG(("Appended %sCRC on frame %d: %8.8X", isPlayback ? "Playback " : "", m_frame, m_CRC));
 	}
 
 	// collect stats
@@ -3768,7 +3746,7 @@ void GameLogic::update( void )
 				continue;
 			}
 
-			// we're done, everyone else is sleeping. 
+			// we're done, everyone else is sleeping.
 			// break from the loop BEFORE we pop this item off.
 			if (u->friend_getNextCallFrame() > now)
 			{
@@ -3782,12 +3760,12 @@ void GameLogic::update( void )
 			{
 				USE_PERF_TIMER(GameLogic_update_sleepy)
 
-				//DEBUG_LOG(("calling update %08lx (%d %d)... ",update,update->friend_getNextCallFrame(),update->friend_getNextCallPhase()));
+				//DEBUG_LOG(("calling update %08lx (%d %d)...",update,update->friend_getNextCallFrame(),update->friend_getNextCallPhase()));
 				m_curUpdateModule = u;
 
 				sleepLen = u->update();
 				DEBUG_ASSERTCRASH(sleepLen > 0, ("you may not return 0 from update"));
-				if (sleepLen < 1) 
+				if (sleepLen < 1)
 					sleepLen = UPDATE_SLEEP_NONE;
 
 				m_curUpdateModule = NULL;
@@ -3827,8 +3805,8 @@ void GameLogic::update( void )
 	// reset the command list, destroying all messages
 	TheCommandList->reset();
 
-	TheWeaponStore->UPDATE();	
-	TheLocomotorStore->UPDATE();	
+	TheWeaponStore->UPDATE();
+	TheLocomotorStore->UPDATE();
 	TheVictoryConditions->UPDATE();
 
 	{
@@ -3842,7 +3820,7 @@ void GameLogic::update( void )
 		}
 	}
 
-  
+
 
 
 
@@ -3850,6 +3828,7 @@ void GameLogic::update( void )
 	if (!m_startNewGame)
 	{
 		m_frame++;
+		m_hasUpdated = TRUE;
 	}
 }
 
@@ -3857,13 +3836,15 @@ void GameLogic::update( void )
 // ------------------------------------------------------------------------------------------------
 void GameLogic::preUpdate()
 {
+	m_hasUpdated = FALSE;
+
 	if (m_pauseFrame == m_frame && m_pauseFrame != 0)
 	{
 		m_pauseFrame = 0;
 		Bool pause = TRUE;
 		Bool pauseMusic = FALSE;
 		Bool pauseInput = FALSE;
-		TheGameLogic->setGamePaused(pause, pauseMusic, pauseInput);
+		setGamePaused(pause, pauseMusic, pauseInput);
 	}
 }
 
@@ -3904,7 +3885,7 @@ void GameLogic::addObjectToLookupTable( Object *obj )
 
 	m_objVector[ newID ] = obj;
 
-}  // end addObjectToLookupTable
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Remove object from the ID lookup table */
@@ -3921,7 +3902,7 @@ void GameLogic::removeObjectFromLookupTable( Object *obj )
 //	m_objHash.erase( obj->getID() );
 	m_objVector[ obj->getID() ] = NULL;
 
-}  // end removeObjectFromLookupTable
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given an object, register it with the GameLogic and give it a unique ID. */
@@ -3935,7 +3916,7 @@ void GameLogic::registerObject( Object *obj )
 	// add object to lookup table
 	addObjectToLookupTable( obj );
 
-	UnsignedInt now = TheGameLogic->getFrame();
+	UnsignedInt now = getFrame();
 	if (now == 0)
 		now = 1;
 	for (BehaviorModule** b = obj->getBehaviorModules(); *b; ++b)
@@ -3992,7 +3973,7 @@ Object *GameLogic::friend_createObject( const ThingTemplate *thing, const Object
 	obj = newInstance(Object)( thing, statusBits, team );
 
 	return obj;
-} 
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Mark the object as destroyed, and place on list for deletion at the end of the next update.
@@ -4046,7 +4027,7 @@ void GameLogic::destroyObject( Object *obj )
 	}
 
 
-}  // end destroyObject
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -4096,7 +4077,7 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 	DEBUG_ASSERTCRASH(this == TheGameLogic, ("Not in GameLogic"));
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("CRC at start of frame %d is 0x%8.8X\n", m_frame, xferCRC->getCRC()));
+		CRCGEN_LOG(("CRC at start of frame %d is 0x%8.8X", m_frame, xferCRC->getCRC()));
 	}
 
 	marker = "MARKER:Objects";
@@ -4108,12 +4089,12 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 	UnsignedInt seed = GetGameLogicRandomSeedCRC();
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("CRC after objects for frame %d is 0x%8.8X\n", m_frame, xferCRC->getCRC()));
+		CRCGEN_LOG(("CRC after objects for frame %d is 0x%8.8X", m_frame, xferCRC->getCRC()));
 	}
 
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("RandomSeed: %d\n", seed));
+		CRCGEN_LOG(("RandomSeed: %d", seed));
 	}
 	if (xferCRC->getXferMode() == XFER_CRC)
 	{
@@ -4124,7 +4105,7 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 	xferCRC->xferSnapshot( ThePartitionManager );
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("CRC after partition manager for frame %d is 0x%8.8X\n", m_frame, xferCRC->getCRC()));
+		CRCGEN_LOG(("CRC after partition manager for frame %d is 0x%8.8X", m_frame, xferCRC->getCRC()));
 	}
 
 #ifdef DEBUG_CRC
@@ -4136,7 +4117,7 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 		xferCRC->xferSnapshot( TheModuleFactory );
 		if (isInGameLogicUpdate())
 		{
-			CRCGEN_LOG(("CRC after module factory for frame %d is 0x%8.8X\n", m_frame, xferCRC->getCRC()));
+			CRCGEN_LOG(("CRC after module factory for frame %d is 0x%8.8X", m_frame, xferCRC->getCRC()));
 		}
 	}
 #endif // DEBUG_CRC
@@ -4146,7 +4127,7 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 	xferCRC->xferSnapshot( ThePlayerList );
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("CRC after PlayerList for frame %d is 0x%8.8X\n", m_frame, xferCRC->getCRC()));
+		CRCGEN_LOG(("CRC after PlayerList for frame %d is 0x%8.8X", m_frame, xferCRC->getCRC()));
 	}
 
 	marker = "MARKER:TheAI";
@@ -4154,7 +4135,7 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 	xferCRC->xferSnapshot( TheAI );
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("CRC after AI for frame %d is 0x%8.8X\n", m_frame, xferCRC->getCRC()));
+		CRCGEN_LOG(("CRC after AI for frame %d is 0x%8.8X", m_frame, xferCRC->getCRC()));
 	}
 
 	if (xferCRC->getXferMode() == XFER_SAVE)
@@ -4173,11 +4154,22 @@ UnsignedInt GameLogic::getCRC( Int mode, AsciiString deepCRCFileName )
 
 	if (isInGameLogicUpdate())
 	{
-		CRCGEN_LOG(("CRC for frame %d is 0x%8.8X\n", m_frame, theCRC));
+		CRCGEN_LOG(("CRC for frame %d is 0x%8.8X", m_frame, theCRC));
 	}
 	return theCRC;
 }
 
+// ------------------------------------------------------------------------------------------------
+void GameLogic::exitGame()
+{
+	// TheSuperHackers @fix The logic update must not be halted to process the game exit message.
+	setGamePaused(FALSE);
+	TheScriptEngine->forceUnfreezeTime();
+	TheScriptEngine->doUnfreezeTime();
+
+	TheMessageStream->appendMessage(GameMessage::MSG_CLEAR_GAME_DATA);
+}
+
 // ------------------------------------------------------------------------------------------------
 /** A new GameLogic object has been constructed, therefore create
  * a corresponding drawable and bind them together. */
@@ -4233,11 +4225,17 @@ Bool GameLogic::isGamePaused( void )
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void GameLogic::setGamePausedInFrame( UnsignedInt frame )
+void GameLogic::setGamePausedInFrame( UnsignedInt frame, Bool disableLogicTimeScale )
 {
 	if (frame >= m_frame)
 	{
 		m_pauseFrame = frame;
+
+		if (disableLogicTimeScale)
+		{
+			m_logicTimeScaleEnabledMemory = TheFramePacer->isLogicTimeScaleEnabled();
+			TheFramePacer->enableLogicTimeScale(FALSE);
+		}
 	}
 }
 
@@ -4262,6 +4260,8 @@ void GameLogic::setGamePaused( Bool paused, Bool pauseMusic, Bool pauseInput )
 	pauseGameSound(paused);
 	pauseGameMusic(paused && pauseMusic);
 	pauseGameInput(paused && pauseInput);
+
+	updateDisplayBusyState();
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -4269,6 +4269,12 @@ void GameLogic::setGamePaused( Bool paused, Bool pauseMusic, Bool pauseInput )
 void GameLogic::pauseGameLogic(Bool paused)
 {
 	m_gamePaused = paused;
+
+	if (!paused && m_logicTimeScaleEnabledMemory)
+	{
+		m_logicTimeScaleEnabledMemory = FALSE;
+		TheFramePacer->enableLogicTimeScale(TRUE);
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -4284,11 +4290,11 @@ void GameLogic::pauseGameSound(Bool paused)
 	{
 		TheAudio->pauseAudio((AudioAffect)(AudioAffect_All & ~AudioAffect_Music));
 
-#if 0 // Kris added this code some time ago. I'm not sure why -- the pauseAudio should stop the 
-      // ambients by itself. Everything seems to work fine without it and it's messing up my 
+#if 0 // Kris added this code some time ago. I'm not sure why -- the pauseAudio should stop the
+      // ambients by itself. Everything seems to work fine without it and it's messing up my
       // custom ambient code. Hopefully he can explain it to me, but until he gets back, I'm
       // disabling it. -Ian
-    
+
 		//Stop all ambient sounds!
 		Drawable *drawable = TheGameClient->getDrawableList();
 		while( drawable )
@@ -4342,16 +4348,18 @@ void GameLogic::pauseGameInput(Bool paused)
 
 	m_pauseInput = paused;
 
+	TheMouse->onGamePaused(paused);
+
 	if(paused)
 	{
 		// remember the state of the mouse/input so we can return to the same state once we "unpause"
 		m_inputEnabledMemory = TheInGameUI->getInputEnabled();
 		m_mouseVisibleMemory = TheMouse->getVisibility();
-		
+
 		// Make sure the mouse is visible and the cursor is an arrow
 		TheMouse->setVisibility(TRUE);
 		TheMouse->setCursor( Mouse::ARROW );
-		
+
 		// if Input is enabled, disable it
 		if(m_inputEnabledMemory)
 		{
@@ -4386,15 +4394,15 @@ void GameLogic::processProgressComplete(Int playerId)
 {
 	if(playerId < 0 || playerId >= MAX_SLOTS)
 	{
-		DEBUG_ASSERTCRASH(FALSE,("GameLogic::processProgressComplete, Invalid playerid was passed in %d\n", playerId));
+		DEBUG_ASSERTCRASH(FALSE,("GameLogic::processProgressComplete, Invalid playerid was passed in %d", playerId));
 		return;
 	}
 	if(m_progressComplete[playerId] == TRUE)
 	{
-		DEBUG_LOG(("GameLogic::processProgressComplete, playerId %d is marked TRUE already yet we're trying to mark him as true again\n", playerId));
+		DEBUG_LOG(("GameLogic::processProgressComplete, playerId %d is marked TRUE already yet we're trying to mark him as true again", playerId));
 		return;
 	}
-	DEBUG_LOG(("Progress Complete for Player %d\n", playerId));
+	DEBUG_LOG(("Progress Complete for Player %d", playerId));
 	m_progressComplete[playerId] = TRUE;
 	lastHeardFrom(playerId);
 }
@@ -4452,7 +4460,7 @@ void GameLogic::testTimeOut( void )
 // ------------------------------------------------------------------------------------------------
 void GameLogic::timeOutGameStart( void )
 {
-	DEBUG_LOG(("We got the Force TimeOut Start Message\n"));
+	DEBUG_LOG(("We got the Force TimeOut Start Message"));
 	m_forceGameStartByTimeOut = TRUE;
 }
 
@@ -4485,7 +4493,7 @@ UnsignedInt GameLogic::getObjectCount( void )
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 GhostObjectManager *GameLogic::createGhostObjectManager(void)
-{ 
+{
 	return NEW GhostObjectManager;
 }
 
@@ -4587,7 +4595,7 @@ void GameLogic::getAIMetricsStatistics( UnsignedInt *numAI, UnsignedInt *numMovi
 void GameLogic::crc( Xfer *xfer )
 {
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given a string name, find the object TOC entry (if any) associated with it */
@@ -4601,7 +4609,7 @@ GameLogic::ObjectTOCEntry *GameLogic::findTOCEntryByName( AsciiString name )
 
 	return NULL;
 
-}  // end findTOCEntryByname
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Given a object TOC identifier, find the object TOC if any */
@@ -4615,7 +4623,7 @@ GameLogic::ObjectTOCEntry *GameLogic::findTOCEntryById( UnsignedShort id )
 
 	return NULL;
 
-}  // end findTOCEntryById
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Add an object TOC entry */
@@ -4628,7 +4636,7 @@ void GameLogic::addTOCEntry( AsciiString name, UnsignedShort id )
 	tocEntry.id = id;
 	m_objectTOC.push_back( tocEntry );
 
-}  // end addTOCEntry
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer object table of contents */
@@ -4660,11 +4668,11 @@ void GameLogic::xferObjectTOC( Xfer *xfer )
 			// if is this object name already in the TOC, skip it
 			if( findTOCEntryByName( templateName ) != NULL )
 				continue;
-			
+
 			// add this entry to the TOC
 			addTOCEntry( obj->getTemplate()->getName(), ++tocCount );
 
-		}  // end for obj
+		}
 
 		// xfer entries in the TOC
 		xfer->xferUnsignedInt( &tocCount );
@@ -4684,9 +4692,9 @@ void GameLogic::xferObjectTOC( Xfer *xfer )
 			// xfer the paired id
 			xfer->xferUnsignedShort( &tocEntry->id );
 
-		}  // end for
+		}
 
-	}  // end if
+	}
 	else
 	{
 		AsciiString templateName;
@@ -4704,15 +4712,15 @@ void GameLogic::xferObjectTOC( Xfer *xfer )
 
 			// read the id
 			xfer->xferUnsignedShort( &id );
-			
+
 			// add this to the TOC
 			addTOCEntry( templateName, id );
-					
-		}  // end for i
 
-	}  // end else
+		}
 
-}  // end xferObjectTOC
+	}
+
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -4738,13 +4746,13 @@ void GameLogic::prepareLogicForObjectLoad( void )
 			Bridge *bridge = TheTerrainLogic->findBridgeAt( obj->getPosition() );
 
 			// sanity
-			DEBUG_ASSERTCRASH( bridge, ("GameLogic::prepareLogicForObjectLoad - Unable to find bridge\n" ));
+			DEBUG_ASSERTCRASH( bridge, ("GameLogic::prepareLogicForObjectLoad - Unable to find bridge" ));
 
 			// get the old object that is in the bridge info
 			const BridgeInfo *bridgeInfo = bridge->peekBridgeInfo();
 			Object *oldObject = findObjectByID( bridgeInfo->bridgeObjectID );
-			DEBUG_ASSERTCRASH( oldObject, ("GameLogic::prepareLogicForObjectLoad - Unable to find old bridge object\n") );
-			DEBUG_ASSERTCRASH( oldObject == obj, ("GameLogic::prepareLogicForObjectLoad - obj != oldObject\n") );
+			DEBUG_ASSERTCRASH( oldObject, ("GameLogic::prepareLogicForObjectLoad - Unable to find old bridge object") );
+			DEBUG_ASSERTCRASH( oldObject == obj, ("GameLogic::prepareLogicForObjectLoad - obj != oldObject") );
 
 			//
 			// destroy the 4 towers that are attached to this old object (they will be loaded from
@@ -4759,48 +4767,48 @@ void GameLogic::prepareLogicForObjectLoad( void )
 					destroyObject( oldTower );
 				}
 
-			}  // end for, i
+			}
 
 			// destroy the old bridge object
 			destroyObject( oldObject );
 
-		}  // end if, bridge
+		}
 		else if( obj->isKindOf( KINDOF_WALK_ON_TOP_OF_WALL ) )
 		{
 
 			// destroy walk on top of wall things too
 			destroyObject( obj );
 
-		}  // end else if
+		}
 
-	}  // end for, obj
+	}
 
 	// process the destruction of these objects immediately before we proceed with the load process
 	processDestroyList();
 
 	// there should be no objects anywhere
 	DEBUG_ASSERTCRASH( getFirstObject() == NULL,
-										 ("GameLogic::prepareLogicForObjectLoad - There are still objects loaded in the engine, but it should be empty (Top is '%s')\n",
+										 ("GameLogic::prepareLogicForObjectLoad - There are still objects loaded in the engine, but it should be empty (Top is '%s')",
 										 getFirstObject()->getTemplate()->getName().str()) );
 
-}  // end prepareLogicForObjectLoad
+}
 
 // ------------------------------------------------------------------------------------------------
-/** Load/Save game logic to xfer 
+/** Load/Save game logic to xfer
 	*	Version Info:
 	* 1: Initial version
-	* 2: Added m_isScoringEnabled flag (BGC) 
+	* 2: Added m_isScoringEnabled flag (BGC)
 	* 3: Added polygon triggers (CBD)
 	* 4: Added block markers around object data, no version checking is done and therefore
 	*		 this version breaks compatibility with previous versions. (CBD)
 	* 5: Added xfering the BuildAssistant's sell list.
 	* 9: Added m_rankPointsToAddAtGameStart, or else on a load game, your RestartGame button will forget your exp
   * 10: xfer m_superweaponRestriction
-	*/	
+	*/
 // ------------------------------------------------------------------------------------------------
 void GameLogic::xfer( Xfer *xfer )
 {
-  
+
 	// version
 	const XferVersion currentVersion = 10;
 	XferVersion version = currentVersion;
@@ -4813,7 +4821,7 @@ void GameLogic::xfer( Xfer *xfer )
 	// note that we do not do the id counter here, we did it in the game state block because
 	// it's important to do that part very early in the load process
 	//
-	// !!!DON'T DO THIS!!! ----> xfer->xferObjectID( &m_nextObjectID ); <---- !!!DON'T DO THIS!!! 
+	// !!!DON'T DO THIS!!! ----> xfer->xferObjectID( &m_nextObjectID ); <---- !!!DON'T DO THIS!!!
 
 	//
 	// xfer a table of contents that contain thing template and indentifier pairs.  this
@@ -4844,10 +4852,10 @@ void GameLogic::xfer( Xfer *xfer )
 			if( tocEntry == NULL )
 			{
 
-				DEBUG_CRASH(( "GameLogic::xfer - Object TOC entry not found for '%s'\n", obj->getTemplate()->getName().str() ));
+				DEBUG_CRASH(( "GameLogic::xfer - Object TOC entry not found for '%s'", obj->getTemplate()->getName().str() ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// transfer TOC id entry
 			xfer->xferUnsignedShort( &tocEntry->id );
@@ -4861,9 +4869,9 @@ void GameLogic::xfer( Xfer *xfer )
 			// end a block of data
 			xfer->endBlock();
 
-		}  // end for
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 		Team *defaultTeam = ThePlayerList->getNeutralPlayer()->getDefaultTeam();
@@ -4884,10 +4892,10 @@ void GameLogic::xfer( Xfer *xfer )
 			if( tocEntry == NULL )
 			{
 
-				DEBUG_CRASH(( "GameLogic::xfer - No TOC entry match for id '%d'\n", tocID ));
+				DEBUG_CRASH(( "GameLogic::xfer - No TOC entry match for id '%d'", tocID ));
 				throw SC_INVALID_DATA;
 
-			}  // end if
+			}
 
 			// a block of data has begun
 			objectDataSize = xfer->beginBlock();
@@ -4897,12 +4905,12 @@ void GameLogic::xfer( Xfer *xfer )
 			if( thingTemplate == NULL )
 			{
 
-				DEBUG_CRASH(( "GameLogic::xfer - Unrecognized thing template name '%s', skipping.  ENGINEERS - Are you *sure* it's OK to be ignoring this object from the save file???  Think hard about it!\n",
+				DEBUG_CRASH(( "GameLogic::xfer - Unrecognized thing template name '%s', skipping.  ENGINEERS - Are you *sure* it's OK to be ignoring this object from the save file???  Think hard about it!",
 											tocEntry->name.str() ));
 				xfer->skip( objectDataSize );
 				continue;
-							
-			}  // end if
+
+			}
 
 			// create new object
 			obj = TheThingFactory->newObject( thingTemplate, defaultTeam );
@@ -4917,9 +4925,9 @@ void GameLogic::xfer( Xfer *xfer )
 			if( obj->isKindOf( KINDOF_WALK_ON_TOP_OF_WALL ) )
 				TheAI->pathfinder()->addWallPiece( obj );
 
-		}  // end for, i
+		}
 
-	}  // end else
+	}
 
 	// campaign info
 	xfer->xferSnapshot( TheCampaignManager );
@@ -4928,7 +4936,7 @@ void GameLogic::xfer( Xfer *xfer )
 	xfer->xferSnapshot( TheCaveSystem );
 
 	// is scoring enabled
-	if( version >= 2 ) 
+	if( version >= 2 )
 		xfer->xferBool(&m_isScoringEnabled);
 
 	// polygon triggers
@@ -4954,11 +4962,11 @@ void GameLogic::xfer( Xfer *xfer )
 		if( sanityTriggerCount != triggerCount )
 		{
 
-			DEBUG_CRASH(( "GameLogic::xfer - Polygon trigger count mismatch.  Save file has a count of '%d', but map had '%d' triggers\n",
+			DEBUG_CRASH(( "GameLogic::xfer - Polygon trigger count mismatch.  Save file has a count of '%d', but map had '%d' triggers",
 										sanityTriggerCount, triggerCount ));
 			throw SC_INVALID_DATA;
 
-		}  // end if
+		}
 
 		// xfer each of the polygon triggers
 		if( xfer->getXferMode() == XFER_SAVE )
@@ -4969,15 +4977,15 @@ void GameLogic::xfer( Xfer *xfer )
 			{
 
 				// write polygon ID
-				triggerID = poly->getID();	
+				triggerID = poly->getID();
 				xfer->xferInt( &triggerID );
 
 				// xfer polygon data
 				xfer->xferSnapshot( poly );
 
-			}  // end for, poly
+			}
 
-		}  // end if, save
+		}
 		else
 		{
 			Int triggerID;
@@ -4996,16 +5004,16 @@ void GameLogic::xfer( Xfer *xfer )
 				if( poly == NULL )
 				{
 
-					DEBUG_CRASH(( "GameLogic::xfer - Unable to find polygon trigger with id '%d'\n",
+					DEBUG_CRASH(( "GameLogic::xfer - Unable to find polygon trigger with id '%d'",
 												triggerID ));
 					throw SC_INVALID_DATA;
 
-				}  // end if
+				}
 
 				// xfer polygon data
 				xfer->xferSnapshot( poly );
 
-			}  // end for, i
+			}
 
 			//
 			// force a recalculation of the pathfinding cause some of these polygon triggers
@@ -5014,9 +5022,9 @@ void GameLogic::xfer( Xfer *xfer )
 			//
 			TheAI->pathfinder()->newMap();
 
-		}  // end else, load
+		}
 
-	}	 // end if, version >= 3
+	}
 
 	// note that version=4 is the same as version=3
 	if (version >= 5)
@@ -5029,7 +5037,7 @@ void GameLogic::xfer( Xfer *xfer )
 		TheBuildAssistant->xferTheSellList(xfer);
 	}
 
-	if (version >= 7) 
+	if (version >= 7)
 	{
 		if( xfer->getXferMode() == XFER_SAVE )
 		{
@@ -5047,11 +5055,11 @@ void GameLogic::xfer( Xfer *xfer )
 		{
 			if (m_thingTemplateBuildableOverrides.empty() == false)
 			{
-				DEBUG_CRASH(( "GameLogic::xfer - m_thingTemplateBuildableOverrides should be empty, but is not\n"));
+				DEBUG_CRASH(( "GameLogic::xfer - m_thingTemplateBuildableOverrides should be empty, but is not"));
 				throw SC_INVALID_DATA;
 			}
-			
-			for (;;) 
+
+			for (;;)
 			{
 				AsciiString name;
 				xfer->xferAsciiString(&name);
@@ -5087,11 +5095,11 @@ void GameLogic::xfer( Xfer *xfer )
 		{
 			if (m_controlBarOverrides.empty() == false)
 			{
-				DEBUG_CRASH(( "GameLogic::xfer - m_controlBarOverrides should be empty, but is not\n"));
+				DEBUG_CRASH(( "GameLogic::xfer - m_controlBarOverrides should be empty, but is not"));
 				throw SC_INVALID_DATA;
 			}
-			
-			for (;;) 
+
+			for (;;)
 			{
 				AsciiString name;
 				xfer->xferAsciiString(&name);
@@ -5103,7 +5111,7 @@ void GameLogic::xfer( Xfer *xfer )
 				if (value.isNotEmpty())
 				{
 					button = TheControlBar->findCommandButton(value);
-					DEBUG_ASSERTCRASH(button != NULL, ("Could not find button %s\n",value.str()));
+					DEBUG_ASSERTCRASH(button != NULL, ("Could not find button %s",value.str()));
 				}
 				m_controlBarOverrides[name] = button;
 			}
@@ -5123,7 +5131,7 @@ void GameLogic::xfer( Xfer *xfer )
   {
     m_superweaponRestriction = 0;
   }
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process entry point */
@@ -5132,7 +5140,7 @@ void GameLogic::loadPostProcess( void )
 {
 
 	//
-	// the act of loading objects can (theoretically) as a side effect create other objects, 
+	// the act of loading objects can (theoretically) as a side effect create other objects,
 	// our m_nextObjID that we maintain to give objects unique ID is also continually
 	// climbing higher and higher due to us allocating objects during load (even though
 	// those objects have their ids overwritten with data from the file.  To prevent the
@@ -5154,7 +5162,7 @@ void GameLogic::loadPostProcess( void )
 #ifdef ALLOW_NONSLEEPY_UPDATES
 	m_normalUpdates.clear();
 #else
-	UnsignedInt now = TheGameLogic->getFrame();
+	UnsignedInt now = getFrame();
 	if (now == 0)
 		now = 1;
 #endif
@@ -5174,7 +5182,7 @@ void GameLogic::loadPostProcess( void )
 #endif
 			if (!u)
 				continue;
-			
+
 			DEBUG_ASSERTCRASH(u->friend_getIndexInLogic() == -1, ("Hmm, expected index to be -1 here"));
 
 			// check each update module
@@ -5195,14 +5203,14 @@ void GameLogic::loadPostProcess( void )
 				m_sleepyUpdates.push_back(u);
 				u->friend_setIndexInLogic(m_sleepyUpdates.size() - 1);
 			}
-				
-		}  // end for, u
 
-	}  // end for, obj
+		}
+
+	}
 
 	// re-sort the priority queue all at once now that all modules are on it
 	remakeSleepyUpdate();
 
-}  // end loadPostProcess
+}
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
index 7003423f037..ef0b9794c01 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
@@ -28,9 +28,10 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/CRCDebug.h"
+#include "Common/FramePacer.h"
 #include "Common/GameAudio.h"
 #include "Common/GameEngine.h"
 #include "Common/GlobalData.h"
@@ -86,11 +87,6 @@
 #include "GameNetwork/NetworkInterface.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 #define MAX_PATH_SUBJECTS 64
@@ -105,7 +101,7 @@ static int thePlanSubjectCount = 0;
 static void doMoveTo( Object *obj, const Coord3D *pos )
 {
 	AIUpdateInterface *ai = obj->getAIUpdateInterface();
-	DEBUG_ASSERTCRASH(ai, ("Attemped doMoveTo() on an Object with no AI\n"));
+	DEBUG_ASSERTCRASH(ai, ("Attemped doMoveTo() on an Object with no AI"));
 	if (ai)
 	{
 		if (theBuildPlan)
@@ -167,13 +163,14 @@ static void doSetRallyPoint( Object *obj, const Coord3D& pos )
 			// play the no can do sound
 			static AudioEventRTS rallyNotSet("UnableToSetRallyPoint");
 			rallyNotSet.setPosition(&pos);
+			rallyNotSet.setPlayerIndex(obj->getControllingPlayer()->getPlayerIndex());
 			TheAudio->addAudioEvent(&rallyNotSet);
 
-		}  // end if
+		}
 
 		return;
 
-	}  // end if
+	}
 
 	// feedback to the player
 	if( isLocalPlayer )
@@ -181,7 +178,7 @@ static void doSetRallyPoint( Object *obj, const Coord3D& pos )
 
 		// print a message to the user
 		UnicodeString info;
-		info.format( TheGameText->fetch( "GUI:RallyPointSet" ), 
+		info.format( TheGameText->fetch( "GUI:RallyPointSet" ),
 								 obj->getTemplate()->getDisplayName().str() );
 		TheInGameUI->message( info );
 
@@ -196,7 +193,7 @@ static void doSetRallyPoint( Object *obj, const Coord3D& pos )
 		if( draw && draw->isSelected() )
 			TheControlBar->markUIDirty();
 
-	}  // end if
+	}
 
 	// if this object has a ProductionExitUpdate interface, we are setting a rally point
 	ExitInterface *exitInterface = obj->getObjectExitInterface();
@@ -232,13 +229,13 @@ void GameLogic::closeWindows( void )
 	TheControlBar->hidePurchaseScience();
 	TheControlBar->hideSpecialPowerShortcut();
 	HideQuitMenu();
-	
+
 	// hide the options menu
 	NameKeyType buttonID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonBack" );
 	GameWindow *button = TheWindowManager->winGetWindowFromId( NULL, buttonID );
 	GameWindow *window = TheWindowManager->winGetWindowFromId( NULL, TheNameKeyGenerator->nameToKey("OptionsMenu.wnd:OptionsMenuParent") );
 	if(window)
-		TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, 
+		TheWindowManager->winSendSystemMsg( window, GBM_SELECTED,
 																			(WindowMsgData)button, buttonID );
 }
 
@@ -251,7 +248,7 @@ void GameLogic::clearGameData( Bool showScoreScreen )
 		DEBUG_CRASH(("We tried to clear the game data when we weren't in a game"));
 		return;
 	}
-	
+
 	setClearingGameData( TRUE );
 
 //	m_background = TheWindowManager->winCreateLayout("Menus/BlankWindow.wnd");
@@ -282,7 +279,7 @@ void GameLogic::clearGameData( Bool showScoreScreen )
 //	m_background->bringForward();
 //	if(shellGame)
 
-	
+
 	if (TheGlobalData->m_initialFile.isEmpty() == FALSE)
 	{
 		TheGameEngine->setQuitting(TRUE);
@@ -301,18 +298,15 @@ void GameLogic::clearGameData( Bool showScoreScreen )
 	}
 
 	setClearingGameData( FALSE );
-	
+
 }
 
 // ------------------------------------------------------------------------------------------------
 /** Prepare for a new game */
 // ------------------------------------------------------------------------------------------------
-void GameLogic::prepareNewGame( Int gameMode, GameDifficulty diff, Int rankPoints )
+void GameLogic::prepareNewGame( GameMode gameMode, GameDifficulty diff, Int rankPoints )
 {
-	//Added By Sadullah Nader
-	//Fix for loading game scene
-
-	//Kris: Commented this out, but leaving it around incase it bites us later. I cleaned up the 
+	//Kris: Commented this out, but leaving it around incase it bites us later. I cleaned up the
 	//      nomenclature. Look for setLoadingMap() and setLoadingSave()
 	//setGameLoading(TRUE);
 
@@ -326,7 +320,7 @@ void GameLogic::prepareNewGame( Int gameMode, GameDifficulty diff, Int rankPoint
 		m_background->bringForward();
 	}
 	m_background->getFirstWindow()->winClearStatus(WIN_STATUS_IMAGE);
-	TheGameLogic->setGameMode( gameMode );
+	setGameMode( gameMode );
 	if (!TheGlobalData->m_pendingFile.isEmpty())
 	{
 		TheWritableGlobalData->m_mapName = TheGlobalData->m_pendingFile;
@@ -334,20 +328,20 @@ void GameLogic::prepareNewGame( Int gameMode, GameDifficulty diff, Int rankPoint
 	}
 
 	m_rankPointsToAddAtGameStart = rankPoints;
-	DEBUG_LOG(("GameLogic::prepareNewGame() - m_rankPointsToAddAtGameStart = %d\n", m_rankPointsToAddAtGameStart));
+	DEBUG_LOG(("GameLogic::prepareNewGame() - m_rankPointsToAddAtGameStart = %d", m_rankPointsToAddAtGameStart));
 
 	// If we're about to start a game, hide the shell.
-	if(!TheGameLogic->isInShellGame())
+	if(!isInShellGame())
 		TheShell->hideShell();
 
 	m_startNewGame = FALSE;
 
-}  // end prepareNewGame
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This message handles dispatches object command messages to the
   * appropriate objects.
-	* @todo Rename this to "CommandProcessor", or similiar. */
+	* @todo Rename this to "CommandProcessor", or similar. */
 //-------------------------------------------------------------------------------------------------
 void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 {
@@ -356,10 +350,10 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 #endif
 
 	Player *thisPlayer = ThePlayerList->getNthPlayer( msg->getPlayerIndex() );
-	DEBUG_ASSERTCRASH( thisPlayer, ("logicMessageDispatcher: Processing message from unknown player (player index '%d')\n", 
+	DEBUG_ASSERTCRASH( thisPlayer, ("logicMessageDispatcher: Processing message from unknown player (player index '%d')",
 																	msg->getPlayerIndex()) );
-	
-	AIGroup *currentlySelectedGroup = NULL;
+
+	AIGroupPtr currentlySelectedGroup = NULL;
 
 	if (isInGame())
 	{
@@ -368,15 +362,21 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			if (msg->getType() != GameMessage::MSG_LOGIC_CRC && msg->getType() != GameMessage::MSG_SET_REPLAY_CAMERA)
 			{
 				currentlySelectedGroup = TheAI->createGroup(); // can't do this outside a game - it'll cause sync errors galore.
-				CRCGEN_LOG(( "Creating AIGroup %d in GameLogic::logicMessageDispatcher()\n", (currentlySelectedGroup)?currentlySelectedGroup->getID():0 ));
+				CRCGEN_LOG(( "Creating AIGroup %d in GameLogic::logicMessageDispatcher()", currentlySelectedGroup?currentlySelectedGroup->getID():0 ));
+#if RETAIL_COMPATIBLE_AIGROUP
 				thisPlayer->getCurrentSelectionAsAIGroup(currentlySelectedGroup);
+#else
+				thisPlayer->getCurrentSelectionAsAIGroup(currentlySelectedGroup.Peek());
+#endif
 
-				// We can't issue commands to groups that contain units that don't belong the issuing player, so pretend like 
+				// We can't issue commands to groups that contain units that don't belong to the issuing player, so pretend like
 				// there's nothing selected. Also, if currentlySelectedGroup is empty, go ahead and delete it, so that we can skip
 				// any processing on it.
 				if (currentlySelectedGroup->isEmpty())
 				{
+#if RETAIL_COMPATIBLE_AIGROUP
 					TheAI->destroyGroup(currentlySelectedGroup);
+#endif
 					currentlySelectedGroup = NULL;
 				}
 
@@ -394,7 +394,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 #ifdef DEBUG_LOGGING
 	AsciiString commandName;
 
-	commandName = msg->getCommandAsAsciiString();
+	commandName = msg->getCommandAsString();
 	if (msg->getType() < GameMessage::MSG_BEGIN_NETWORK_MESSAGES || msg->getType() > GameMessage::MSG_END_NETWORK_MESSAGES)
 	{
 		commandName.concat(" (NON-LOGIC-MESSAGE!!!)");
@@ -406,7 +406,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 #if 0
 	if (commandName.isNotEmpty() /*&& msg->getType() != GameMessage::MSG_FRAME_TICK*/)
 	{
-		DEBUG_LOG(("Frame %d: GameLogic::logicMessageDispatcher() saw a %s from player %d (%ls)\n", getFrame(), commandName.str(),
+		DEBUG_LOG(("Frame %d: GameLogic::logicMessageDispatcher() saw a %s from player %d (%ls)", getFrame(), commandName.str(),
 			msg->getPlayerIndex(), thisPlayer->getPlayerDisplayName().str()));
 	}
 #endif
@@ -420,21 +420,21 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		case GameMessage::MSG_NEW_GAME:
 		{
 			//DEBUG_ASSERTCRASH(msg->getArgumentCount() == 1 || msg->getArgumentCount() == 2, ("%d arguments to MSG_NEW_GAME", msg->getArgumentCount()));
-			Int gameMode = msg->getArgument( 0 )->integer;
+			GameMode gameMode = (GameMode)msg->getArgument( 0 )->integer;
 			Int rankPoints = 0;
 			GameDifficulty diff = DIFFICULTY_NORMAL;
 			if ( msg->getArgumentCount() >= 2 )
 				diff = (GameDifficulty)msg->getArgument( 1 )->integer;
 			if ( msg->getArgumentCount() >= 3 )
 				rankPoints = msg->getArgument( 2 )->integer;
-			
+
 			if ( msg->getArgumentCount() >= 4 )
 			{
 				Int maxFPS = msg->getArgument( 3 )->integer;
 				if (maxFPS < 1 || maxFPS > 1000)
 					maxFPS = TheGlobalData->m_framesPerSecondLimit;
-				DEBUG_LOG(("Setting max FPS limit to %d FPS\n", maxFPS));
-				TheGameEngine->setFramesPerSecondLimit(maxFPS);
+				DEBUG_LOG(("Setting max FPS limit to %d FPS", maxFPS));
+				TheFramePacer->setFramesPerSecondLimit(maxFPS);
 				TheWritableGlobalData->m_useFpsLimit = true;
 			}
 
@@ -446,29 +446,35 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end new game
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CLEAR_GAME_DATA:
 		{
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 			if (TheDisplay && TheGlobalData->m_dumpAssetUsage)
 				TheDisplay->dumpAssetUsage(TheGlobalData->m_mapName.str());
 #endif
 
 			if (currentlySelectedGroup)
+			{
+#if RETAIL_COMPATIBLE_AIGROUP
 				TheAI->destroyGroup(currentlySelectedGroup);
+#else
+				currentlySelectedGroup->removeAll();
+#endif
+			}
 			currentlySelectedGroup = NULL;
-			TheGameLogic->clearGameData();
+			clearGameData();
 			break;
 
-		}  // end clear game data
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_BEGIN_PATH_BUILD:
 		{
-			DEBUG_LOG(("META: begin path build\n"));
+			DEBUG_LOG(("META: begin path build"));
 			DEBUG_ASSERTCRASH(!theBuildPlan, ("mismatched theBuildPlan"));
 
 			if (theBuildPlan == false)
@@ -483,7 +489,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_META_END_PATH_BUILD:
 		{
-			DEBUG_LOG(("META: end path build\n"));
+			DEBUG_LOG(("META: end path build"));
 			DEBUG_ASSERTCRASH(theBuildPlan, ("mismatched theBuildPlan"));
 
 			// tell everyone who participated in the plan to move
@@ -503,7 +509,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SET_RALLY_POINT:
 		{
-			Object *obj = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *obj = findObjectByID( msg->getArgument( 0 )->objectID );
 			Coord3D dest = msg->getArgument( 1 )->location;
 			if (obj)
 			{
@@ -519,7 +525,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		{
 			WeaponSlotType weaponSlot = (WeaponSlotType)msg->getArgument( 0 )->integer;
 			Int maxShotsToFire = msg->getArgument( 1 )->integer;
-			
+
 			// lock it just till the weapon is empty or the attack is "done"
 			if( currentlySelectedGroup && currentlySelectedGroup->setWeaponLockForGroup( weaponSlot, LOCKED_TEMPORARILY ))
 			{
@@ -527,17 +533,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			}
 
 			break;
-		}  
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_COMBATDROP_AT_OBJECT:
 		{
-			Object *targetObject = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *targetObject = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// issue command for either single object or for selected group
 			if( currentlySelectedGroup )
-				currentlySelectedGroup->groupCombatDrop( targetObject, 
-																								 *targetObject->getPosition(), 
+				currentlySelectedGroup->groupCombatDrop( targetObject,
+																								 *targetObject->getPosition(),
 																								 CMD_FROM_PLAYER );
 
 /*
@@ -553,7 +559,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end GameMessage::MSG_COMBATDROP_AT_OBJECT
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_COMBATDROP_AT_LOCATION:
@@ -576,7 +582,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end GameMessage::MSG_COMBATDROP_AT_LOCATION
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_WEAPON_AT_OBJECT:
@@ -584,13 +590,13 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			// Lock the weapon choice to the right weapon, then give an attack command
 
 			WeaponSlotType weaponSlot = (WeaponSlotType)msg->getArgument( 0 )->integer;
-			Object *targetObject = TheGameLogic->findObjectByID( msg->getArgument( 1 )->objectID );
+			Object *targetObject = findObjectByID( msg->getArgument( 1 )->objectID );
 			Int maxShotsToFire = msg->getArgument( 2 )->integer;
 
 			// sanity
 			if( targetObject == NULL )
 				break;
-			
+
 
 			// issue command for either single object or for selected group
 			if( currentlySelectedGroup )
@@ -598,10 +604,10 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					// lock it just till the weapon is empty or the attack is "done"
 				if (currentlySelectedGroup->setWeaponLockForGroup( weaponSlot, LOCKED_TEMPORARILY ))
 					currentlySelectedGroup->groupAttackObject( targetObject, maxShotsToFire, CMD_FROM_PLAYER );
-			}  // end if, command for group
+			}
 			break;
 
-		}  // end do weapon at object
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SWITCH_WEAPONS:
@@ -613,7 +619,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				currentlySelectedGroup->setWeaponLockForGroup( weaponSlot, LOCKED_PERMANENTLY );
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SET_MINE_CLEARING_DETAIL:
 		{
@@ -653,11 +659,11 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
  					currentlySelectedGroup->groupAttackPosition( &targetLoc, maxShotsToFire, CMD_FROM_PLAYER );
 
 
-			}  // end if, command for group
+			}
 
 			break;
 
-		}  //end do weapon at location
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_SPECIAL_POWER:
@@ -671,13 +677,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			// check for possible specific source, ignoring selection.
 			ObjectID sourceID = msg->getArgument(2)->objectID;
-			Object* source = TheGameLogic->findObjectByID(sourceID);
+			Object* source = findObjectByID(sourceID);
 			if (source != NULL)
 			{
-				AIGroup* theGroup = TheAI->createGroup();
+				AIGroupPtr theGroup = TheAI->createGroup();
 				theGroup->add(source);
 				theGroup->groupDoSpecialPower( specialPowerID, options );
+#if RETAIL_COMPATIBLE_AIGROUP
 				TheAI->destroyGroup(theGroup);
+#else
+				theGroup->removeAll();
+#endif
 			}
 			else
 			{
@@ -689,7 +699,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			}
 			break;
 
-		}  // end do special 
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_SPECIAL_POWER_AT_LOCATION:
@@ -705,20 +715,24 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			// Object in way -- if applicable (some specials care, others don't)
 			ObjectID objectID = msg->getArgument( 3 )->objectID;
-			Object *objectInWay = TheGameLogic->findObjectByID( objectID );
+			Object *objectInWay = findObjectByID( objectID );
 
 			// Command button options -- special power may care about variance options
 			UnsignedInt options = msg->getArgument( 4 )->integer;
 
 			// check for possible specific source, ignoring selection.
 			ObjectID sourceID = msg->getArgument(5)->objectID;
-			Object* source = TheGameLogic->findObjectByID(sourceID);
+			Object* source = findObjectByID(sourceID);
 			if (source != NULL)
 			{
-				AIGroup* theGroup = TheAI->createGroup();
+				AIGroupPtr theGroup = TheAI->createGroup();
 				theGroup->add(source);
 				theGroup->groupDoSpecialPowerAtLocation( specialPowerID, &targetCoord, angle, objectInWay, options );
+#if RETAIL_COMPATIBLE_AIGROUP
 				TheAI->destroyGroup(theGroup);
+#else
+				theGroup->removeAll();
+#endif
 			}
 			else
 			{
@@ -730,7 +744,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			}
 			break;
 
-		}  // end do special at location
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_SPECIAL_POWER_AT_OBJECT:
@@ -740,7 +754,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			// argument 2 is target object
 			ObjectID targetID = msg->getArgument(1)->objectID;
-			Object *target = TheGameLogic->findObjectByID( targetID );
+			Object *target = findObjectByID( targetID );
 			if( !target )
 			{
 				break;
@@ -748,16 +762,20 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			// Command button options -- special power may care about variance options
 			UnsignedInt options = msg->getArgument( 2 )->integer;
-			
+
 			// check for possible specific source, ignoring selection.
 			ObjectID sourceID = msg->getArgument(3)->objectID;
-			Object* source = TheGameLogic->findObjectByID(sourceID);
+			Object* source = findObjectByID(sourceID);
 			if (source != NULL)
 			{
-				AIGroup* theGroup = TheAI->createGroup();
+				AIGroupPtr theGroup = TheAI->createGroup();
 				theGroup->add(source);
 				theGroup->groupDoSpecialPowerAtObject( specialPowerID, target, options );
+#if RETAIL_COMPATIBLE_AIGROUP
 				TheAI->destroyGroup(theGroup);
+#else
+				theGroup->removeAll();
+#endif
 			}
 			else
 			{
@@ -768,8 +786,8 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			}
 			break;
 
-		}  // end do special at object
-		
+		}
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_ATTACKMOVETO:
 		{
@@ -783,7 +801,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_FORCEMOVETO:
 		{
@@ -797,7 +815,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		// MSG_DO_SALVAGE is intentionally set up to mimic the moveto.
 		case GameMessage::MSG_DO_SALVAGE:
@@ -807,7 +825,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			if( currentlySelectedGroup )
 			{
-				//DEBUG_LOG(("GameLogicDispatch - got a MSG_DO_MOVETO command\n"));
+				//DEBUG_LOG(("GameLogicDispatch - got a MSG_DO_MOVETO command"));
 				currentlySelectedGroup->releaseWeaponLockForGroup(LOCKED_TEMPORARILY);	// release any temporary locks.
 				currentlySelectedGroup->groupMoveToPosition( &dest, false, CMD_FROM_PLAYER );
 			}
@@ -822,14 +840,14 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			if( currentlySelectedGroup )
 			{
-				//DEBUG_LOG(("GameLogicDispatch - got a MSG_DO_MOVETO command\n"));
+				//DEBUG_LOG(("GameLogicDispatch - got a MSG_DO_MOVETO command"));
 				currentlySelectedGroup->releaseWeaponLockForGroup(LOCKED_TEMPORARILY);	// release any temporary locks.
 				currentlySelectedGroup->groupMoveToPosition( &dest, true, CMD_FROM_PLAYER );
 			}
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_GUARD_POSITION:
 		{
@@ -846,7 +864,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_GUARD_OBJECT:
 		{
-			Object* obj = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object* obj = findObjectByID( msg->getArgument( 0 )->objectID );
 			if (!obj)
 				break;
 
@@ -869,7 +887,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_SCATTER:
 		{
@@ -880,7 +898,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CREATE_FORMATION:
 		{
@@ -891,11 +909,11 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 		}
-		
+
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CLEAR_INGAME_POPUP_MESSAGE:
 		{
-		
+
 			if( TheInGameUI )
 			{
 				TheInGameUI->clearPopupMessageData();
@@ -913,8 +931,8 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			}
 			break;
 		}
-		
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined (_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+
+#if defined(RTS_DEBUG) || defined (_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DEBUG_KILL_SELECTION:
 		{
@@ -982,7 +1000,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_ENTER:
 		{
-			Object *enter = TheGameLogic->findObjectByID( msg->getArgument( 1 )->objectID );
+			Object *enter = findObjectByID( msg->getArgument( 1 )->objectID );
 
 			// sanity
 			if( enter == NULL )
@@ -996,13 +1014,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end GameMessage::MSG_ENTER
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_EXIT:
 		{
-			Object *objectWantingToExit = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *objectWantingToExit = findObjectByID( msg->getArgument( 0 )->objectID );
+#if RETAIL_COMPATIBLE_AIGROUP
 			Object *objectContainingExiter = getSingleObjectFromSelection(currentlySelectedGroup);
+#else
+			Object *objectContainingExiter = getSingleObjectFromSelection(currentlySelectedGroup.Peek());
+#endif
 
 			// sanity
 			if( objectWantingToExit == NULL )
@@ -1014,7 +1036,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			// sanity, the player must actually control this object
 			if( objectWantingToExit->getControllingPlayer() != thisPlayer )
 				break;
-			
+
 			objectWantingToExit->releaseWeaponLock(LOCKED_TEMPORARILY);	// release any temporary locks.
 
 			// exit whatever objectWantingToExit is INSIDE of
@@ -1027,7 +1049,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end GameMessage::MSG_EXIT
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_EVACUATE:
@@ -1054,23 +1076,23 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 // no, this is bad, don't do here, do when POSTING message
 //			pickAndPlayUnitVoiceResponse( TheInGameUI->getAllSelectedDrawables(), GameMessage::MSG_EVACUATE );
 
-			}  // end if, command for group
+			}
 
 			break;
 
-		}  // end GameMessage::MSG_EVACUATE
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_EXECUTE_RAILED_TRANSPORT:
 		{
-		
+
 			// issue command to currently selected objects
 			if( currentlySelectedGroup )
 				currentlySelectedGroup->groupExecuteRailedTransport( CMD_FROM_PLAYER );
 
 			break;
 
-		}  // end GameMessage::MSG_EXECUTE_RAILED_TRANSPORT
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_INTERNET_HACK:
@@ -1087,7 +1109,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_GET_REPAIRED:
 		{
-			Object *repairDepot = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *repairDepot = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// sanity
 			if( repairDepot == NULL )
@@ -1099,12 +1121,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end get repaired
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DOCK:
 		{
-			Object *dockBuilding = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *dockBuilding = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// sanity
 			if( dockBuilding == NULL )
@@ -1116,12 +1138,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end get repaired
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_GET_HEALED:
 		{
-			Object *healDest = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *healDest = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// sanity
 			if( healDest == NULL )
@@ -1133,12 +1155,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end get repaired
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_REPAIR:
 		{
-			Object *repairTarget = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *repairTarget = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// sanity
 			if( repairTarget == NULL )
@@ -1153,12 +1175,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end get repaired
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_RESUME_CONSTRUCTION:
 		{
-			Object *constructTarget = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *constructTarget = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// sanity
 			if( constructTarget == NULL )
@@ -1177,8 +1199,8 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end resume construction
-		
+		}
+
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION:
 		{
@@ -1186,13 +1208,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			SpecialPowerType spType = (SpecialPowerType)msg->getArgument( 1 )->integer;
 
 			ObjectID sourceID = msg->getArgument(2)->objectID;
-			Object* source = TheGameLogic->findObjectByID(sourceID);
+			Object* source = findObjectByID(sourceID);
 			if (source != NULL)
 			{
-				AIGroup* theGroup = TheAI->createGroup();
+				AIGroupPtr theGroup = TheAI->createGroup();
 				theGroup->add(source);
 				theGroup->groupOverrideSpecialPowerDestination( spType, loc, CMD_FROM_PLAYER );
+#if RETAIL_COMPATIBLE_AIGROUP
 				TheAI->destroyGroup(theGroup);
+#else
+				theGroup->removeAll();
+#endif
 			}
 			else
 			{
@@ -1201,15 +1227,18 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					currentlySelectedGroup->groupOverrideSpecialPowerDestination( spType, loc, CMD_FROM_PLAYER );
 				}
 			}
+
+			break;
+
 		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_ATTACK_OBJECT:
 		{
-			Object *enemy = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *enemy = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// Check enemy, as it is possible that he died this frame.
-			if (enemy) 
+			if (enemy)
 			{
 				if (currentlySelectedGroup)
 				{
@@ -1223,15 +1252,15 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end GameMessage::MSG_DO_ATTACK_GROUND_OBJECT
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_FORCE_ATTACK_OBJECT:
 		{
-			Object *enemy = TheGameLogic->findObjectByID( msg->getArgument( 0 )->objectID );
+			Object *enemy = findObjectByID( msg->getArgument( 0 )->objectID );
 
 			// Check enemy, as it is possible that he died this frame.
-			if (enemy) 
+			if (enemy)
 			{
 				if (currentlySelectedGroup)
 				{
@@ -1243,7 +1272,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end GameMessage::MSG_DO_ATTACK_GROUND_OBJECT
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DO_FORCE_ATTACK_GROUND:
@@ -1258,7 +1287,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				//Kris: This code was added to allow the toxin tractor to force attack
 				//      while contaminating. When this change was made, it was causing
 				//      rangers and scud launchers to reset to primary weapon mode whenever
-				//      force attacking while not idle. I fixed this by enforcing the 
+				//      force attacking while not idle. I fixed this by enforcing the
 				//      temporary and permanent modes that are already set when attempting
 				//      the new lock. In this case, the temp lock attempt will fail whenever
 				//      a permanent lock is in effect, thus fixing the ranger and scud and
@@ -1277,12 +1306,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					currentlySelectedGroup->groupAttackPosition( pos, NO_MAX_SHOTS_LIMIT, CMD_FROM_PLAYER );
 				}
 
-			
+
 			}
 
 			break;
 
-		}  // end GameMessage::MSG_DO_ATTACK_GROUND_OBJECT
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_QUEUE_UPGRADE:
@@ -1296,12 +1325,16 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end queue upgrade
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CANCEL_UPGRADE:
 		{
+#if RETAIL_COMPATIBLE_AIGROUP
 			Object *producer = getSingleObjectFromSelection(currentlySelectedGroup);
+#else
+			Object *producer = getSingleObjectFromSelection(currentlySelectedGroup.Peek());
+#endif
 			const UpgradeTemplate *upgradeT = TheUpgradeCenter->findUpgradeByKey( (NameKeyType)(msg->getArgument( 0 )->integer) );
 
 			// sanity
@@ -1322,12 +1355,16 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end cancel upgrade
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_QUEUE_UNIT_CREATE:
 		{
+#if RETAIL_COMPATIBLE_AIGROUP
 			Object *producer = getSingleObjectFromSelection(currentlySelectedGroup);
+#else
+			Object *producer = getSingleObjectFromSelection(currentlySelectedGroup.Peek());
+#endif
 			const ThingTemplate *whatToCreate;
 			ProductionID productionID;
 
@@ -1344,44 +1381,48 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			if( pu == NULL )
 			{
 
-				DEBUG_ASSERTCRASH( 0, ("MSG_QUEUE_UNIT_CREATE: Producer '%s' doesn't have a unit production interface\n", 
+				DEBUG_ASSERTCRASH( 0, ("MSG_QUEUE_UNIT_CREATE: Producer '%s' doesn't have a unit production interface",
 															producer->getTemplate()->getName().str()) );
 				break;
 
-			}  // end if
+			}
 
 			// queue the build
 			pu->queueCreateUnit( whatToCreate, productionID );
 
 			break;
 
-		}  // end GameMessage::MSG_QUEUE_UNIT_CREATE
+		}
 
 		//-------------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CANCEL_UNIT_CREATE:
 		{
+#if RETAIL_COMPATIBLE_AIGROUP
 			Object *producer = getSingleObjectFromSelection(currentlySelectedGroup);
+#else
+			Object *producer = getSingleObjectFromSelection(currentlySelectedGroup.Peek());
+#endif
 			ProductionID productionID = (ProductionID)msg->getArgument( 0 )->integer;
-			
+
 			// sanity
 			if( producer == NULL )
 				break;
-				
-			// sanity, the player must control the producer			
+
+			// sanity, the player must control the producer
 			if( producer->getControllingPlayer() != thisPlayer )
 				break;
 
 			// get the unit production interface
 			ProductionUpdateInterface *pu = producer->getProductionUpdateInterface();
 			if( pu == NULL )
-				return;
+				break;
 
 			// cancel the production
 			pu->cancelUnitCreate( productionID );
 
 			break;
 
-		}  // end GameMessage::MSG_CANCEL_UNIT_CREATE
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DOZER_CONSTRUCT:
@@ -1392,7 +1433,11 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			Real angle;
 
 			// get player, what to place, and location
+#if RETAIL_COMPATIBLE_AIGROUP
 			Object *constructorObject = getSingleObjectFromSelection(currentlySelectedGroup);
+#else
+			Object *constructorObject = getSingleObjectFromSelection(currentlySelectedGroup.Peek());
+#endif
 			place = TheThingFactory->findByTemplateID( msg->getArgument( 0 )->integer );
 			loc = msg->getArgument( 1 )->location;
 			angle = msg->getArgument( 2 )->real;
@@ -1403,10 +1448,10 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			if( msg->getType() == GameMessage::MSG_DOZER_CONSTRUCT )
 			{
 
-				TheBuildAssistant->buildObjectNow( constructorObject, place, &loc, angle, 
+				TheBuildAssistant->buildObjectNow( constructorObject, place, &loc, angle,
 																					 constructorObject->getControllingPlayer() );
 
-			}  // end if
+			}
 			else
 			{
 				Coord3D locEnd;
@@ -1415,14 +1460,14 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				locEnd = msg->getArgument( 3 )->location;
 
 				// place the line of structures, the end location being present will make it happen
-				TheBuildAssistant->buildObjectLineNow( constructorObject, place, &loc, &locEnd, angle, 
+				TheBuildAssistant->buildObjectLineNow( constructorObject, place, &loc, &locEnd, angle,
 																							 constructorObject->getControllingPlayer() );
 
-			}  // end else
+			}
 
 			// place the sound for putting a building down
 
-			static AudioEventRTS placeBuilding(AsciiString("PlaceBuilding"));
+			static AudioEventRTS placeBuilding("PlaceBuilding");
 			placeBuilding.setObjectID(constructorObject->getID());
 			TheAudio->addAudioEvent( &placeBuilding );
 
@@ -1432,21 +1477,25 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end build start
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DOZER_CANCEL_CONSTRUCT:
 		{
 
 			// get the building to cancel construction on
+#if RETAIL_COMPATIBLE_AIGROUP
 			Object *building = getSingleObjectFromSelection(currentlySelectedGroup);
+#else
+			Object *building = getSingleObjectFromSelection(currentlySelectedGroup.Peek());
+#endif
 			if( building == NULL )
 				break;
 
 			// the player sending this message must actually control this building
 			if( building->getControllingPlayer() != thisPlayer )
 				break;
-			
+
 			// Check to make sure it is actually under construction
 			if( !building->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
 				break;
@@ -1456,19 +1505,19 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			{
 				Money *money = thisPlayer->getMoney();
 				UnsignedInt amount = building->getTemplate()->calcCostToBuild( thisPlayer );
-				money->deposit( amount );
+				money->deposit( amount, TRUE, FALSE );
 			}
 
 			//
 			// Destroy the building ... killing the
-			// building will automatically cause the dozer also cancel its own building 
+			// building will automatically cause the dozer also cancel its own building
 			// behavior and it will go on its merry way doing other assigned tasks
 			//
 			building->kill();
 
 			break;
 
-		}  // end cancel dozer construction
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SELL:
@@ -1480,7 +1529,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end sell
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_TOGGLE_OVERCHARGE:
@@ -1492,7 +1541,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end toggle overcharge
+		}
 
 #ifdef ALLOW_SURRENDER
 		// --------------------------------------------------------------------------------------------
@@ -1507,11 +1556,11 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				if( currentlySelectedGroup )
 					currentlySelectedGroup->groupPickUpPrisoner( prisoner, CMD_FROM_PLAYER );
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end pick up prisoner
+		}
 #endif
 
 #ifdef ALLOW_SURRENDER
@@ -1525,7 +1574,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end return to prison
+		}
 #endif
 
 		//---------------------------------------------------------------------------------------------
@@ -1544,18 +1593,18 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			Bool firstObject = TRUE;
 
 			for (Int i = 1; i < msg->getArgumentCount(); ++i) {
-				Object *obj = TheGameLogic->findObjectByID( msg->getArgument( i )->objectID );
+				Object *obj = findObjectByID( msg->getArgument( i )->objectID );
 				if (!obj) {
 					continue;
 				}
 
-				TheGameLogic->selectObject(obj, createNewGroup && firstObject, player->getPlayerMask());
+				selectObject(obj, createNewGroup && firstObject, player->getPlayerMask());
 				firstObject = FALSE;
 			}
-			
+
 			break;
 
-		}  // end build start
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_REMOVE_FROM_SELECTED_GROUP:
@@ -1569,17 +1618,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			for (Int i = 0; i < msg->getArgumentCount(); ++i) {
 				ObjectID objID = msg->getArgument(i)->objectID;
-				Object *objToRemove = TheGameLogic->findObjectByID(objID);
+				Object *objToRemove = findObjectByID(objID);
 				if (!objToRemove) {
 					continue;
 				}
-				
-				TheGameLogic->deselectObject(objToRemove, player->getPlayerMask());
+
+				deselectObject(objToRemove, player->getPlayerMask());
 			}
 
 			break;
 
-		}  // end MSG_REMOVE_FROM_SELECTED_GROUP
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_DESTROY_SELECTED_GROUP:
@@ -1592,7 +1641,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end build start
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SELECTED_GROUP_COMMAND:
@@ -1600,8 +1649,8 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 			break;
 
-		}  // end selected group command
-		
+		}
+
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_PLACE_BEACON:
 		{
@@ -1618,7 +1667,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				// how many does this player have active?
 				Int count;
 				thisPlayer->countObjectsByThingTemplate( 1, &thing, false, &count );
-				DEBUG_LOG(("Player already has %d beacons active\n", count));
+				DEBUG_LOG(("Player already has %d beacons active", count));
 				if (count >= TheMultiplayerSettings->getMaxBeaconsPerPlayer())
 				{
 					if (thisPlayer == ThePlayerList->getLocalPlayer())
@@ -1654,7 +1703,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 					// beacons are a rare event; play a nifty radar event thingie
 					TheRadar->createEvent( object->getPosition(), RADAR_EVENT_INFORMATION );
-					
+
 					if (ThePlayerList->getLocalPlayer()->getRelationship(thisPlayer->getDefaultTeam()) == ALLIES)
 						TheEva->setShouldPlay(EVA_BeaconDetected);
 
@@ -1695,15 +1744,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				TheAudio->addAudioEvent(&aSound);
 			}
 			break;
-		} // end beacon placement
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_REMOVE_BEACON:
 		{
-	
-			AIGroup *allSelectedObjects = NULL;
-			allSelectedObjects = TheAI->createGroup();
+			AIGroupPtr allSelectedObjects = TheAI->createGroup();
+#if RETAIL_COMPATIBLE_AIGROUP
 			thisPlayer->getCurrentSelectionAsAIGroup(allSelectedObjects); // need to act on all objects, so we can hide teammates' beacons.
+#else
+			thisPlayer->getCurrentSelectionAsAIGroup(allSelectedObjects.Peek()); // need to act on all objects, so we can hide teammates' beacons.
+#endif
 			if( allSelectedObjects )
 			{
 				const VecObjectID& selectedObjects = allSelectedObjects->getAllIDs();
@@ -1712,12 +1763,17 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					Object *beacon = findObjectByID(*it);
 					if (beacon)
 					{
-						const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );
-						if (thing->isEquivalentTo(beacon->getTemplate()))
+						// TheSuperHackers @bugfix Prevent runtime crashing when a beacon is no longer associated with an initialized player.
+						const PlayerTemplate *playerTemplate = beacon->getControllingPlayer()->getPlayerTemplate();
+						if (!playerTemplate)
+							continue;
+
+						const ThingTemplate *thing = TheThingFactory->findTemplate( playerTemplate->getBeaconTemplate() );
+						if (thing && thing->isEquivalentTo(beacon->getTemplate()))
 						{
 							if (beacon->getControllingPlayer() == thisPlayer)
 							{
-								TheGameLogic->destroyObject(beacon); // the owner is telling it to go away.  such is life.
+								destroyObject(beacon); // the owner is telling it to go away.  such is life.
 
 								TheControlBar->markUIDirty(); // check if we should un-grey out the button
 							}
@@ -1744,14 +1800,16 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 						}
 					}
 				}
+#if RETAIL_COMPATIBLE_AIGROUP
 				if (allSelectedObjects->isEmpty())
 				{
 					TheAI->destroyGroup(allSelectedObjects);
 					allSelectedObjects = NULL;
 				}
+#endif
 			}
 			break;
-		} // end beacon removal
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SET_BEACON_TEXT:
@@ -1782,7 +1840,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				}
 			}
 			break;
-		} // end beacon text
+		}
 
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SELF_DESTRUCT:
@@ -1827,7 +1885,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 		// --------------------------------------------------------------------------------------------
 		case GameMessage::MSG_SET_REPLAY_CAMERA:
 		{
-			if (TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK && TheGlobalData->m_useCameraInReplay && TheControlBar->getObserverLookAtPlayer() == thisPlayer)
+			if (TheRecorder->isPlaybackMode() && TheGlobalData->m_useCameraInReplay && TheControlBar->getObserverLookAtPlayer() == thisPlayer)
 			{
 				if (TheTacticalView->isCameraMovementFinished())
 				{
@@ -1841,6 +1899,9 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					loc.init(pos.x, pos.y, pos.z, angle, pitch, zoom);
 					TheTacticalView->setLocation( &loc );
 
+					// TheSuperHackers @fix xezon 18/09/2025 Lock the new location to avoid user input from changing the camera in this frame.
+					TheTacticalView->lockViewUntilFrame( getFrame() + 1 );
+
 					if (!TheLookAtTranslator->hasMouseMovedRecently())
 					{
 						TheMouse->setCursor( (Mouse::MouseCursor)(msg->getArgument( 4 )->integer) );
@@ -1851,7 +1912,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 				}
 			}
 			break;
-		} // end beacon text
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_CREATE_TEAM0:
@@ -1869,14 +1930,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			Player *player = ThePlayerList->getNthPlayer(playerIndex);
 			DEBUG_ASSERTCRASH(player != NULL, ("Could not find player for create team message"));
 
-			if (player == NULL)
-			{
-				break;
-			}
+			// TheSuperHackers @tweak Stubbjax 17/08/2025 The local player processes this message in CommandXlat for immediate assignment.
+			if (player && !player->isLocalPlayer())
+				player->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg);
 
-			player->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg);
 			break;
-		} // end create team command
+		}
 
 		case GameMessage::MSG_SELECT_TEAM0:
 		case GameMessage::MSG_SELECT_TEAM1:
@@ -1947,34 +2006,34 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 				if (thisPlayer->isLocalPlayer())
 				{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 					// don't even put this in release, cause someone might hack it.
 					if (!TheDebugIgnoreSyncErrors)
 					{
 #endif
 						m_shouldValidateCRCs = TRUE;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 					}
 #endif
 				}
 
 				//UnsignedInt oldCRC = m_cachedCRCs[msg->getPlayerIndex()];
 				UnsignedInt newCRC = msg->getArgument(0)->integer;
-				//DEBUG_LOG(("Recieved CRC of %8.8X from %ls on frame %d\n", newCRC,
+				//DEBUG_LOG(("Recieved CRC of %8.8X from %ls on frame %d", newCRC,
 					//thisPlayer->getPlayerDisplayName().str(), m_frame));
 				m_cachedCRCs[msg->getPlayerIndex()] = newCRC; // to mask problem: = (oldCRC < newCRC)?newCRC:oldCRC;
 			}
-			else if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK)
+			else if (TheRecorder && TheRecorder->isPlaybackMode())
 			{
 				UnsignedInt newCRC = msg->getArgument(0)->integer;
-				//DEBUG_LOG(("Saw CRC of %X from player %d.  Our CRC is %X.  Arg count is %d\n",
+				//DEBUG_LOG(("Saw CRC of %X from player %d.  Our CRC is %X.  Arg count is %d",
 					//newCRC, thisPlayer->getPlayerIndex(), getCRC(), msg->getArgumentCount()));
 
 				TheRecorder->handleCRCMessage(newCRC, thisPlayer->getPlayerIndex(), (msg->getArgument(1)->boolean));
 			}
 			break;
 
-		}  // end CRC message
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GameMessage::MSG_PURCHASE_SCIENCE:
@@ -1984,17 +2043,25 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 			// sanity
 			if( science == SCIENCE_INVALID || thisPlayer == NULL )
 				break;
-			
+
 			thisPlayer->attemptToPurchaseScience(science);
 
 			break;
 
-		}  // end pick specialized science
+		}
 
-	}  // end switch
+	}
+
+#if RETAIL_COMPATIBLE_AIGROUP
+	// TheSuperHackers @bugfix xezon 28/06/2025 This hack avoids crashing when players are selected during Replay playback.
+	// It can read data from an already deleted AIGroup and return this function when its member size is 0, signifying that
+	// it is indeed deleted.
+	if (currentlySelectedGroup && currentlySelectedGroup->getCount() == 0)
+		return;
+#endif
 
 	/**/ /// @todo: multiplayer semantics
-	if (currentlySelectedGroup && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK && TheGlobalData->m_useCameraInReplay && TheControlBar->getObserverLookAtPlayer() == thisPlayer /*&& !TheRecorder->isMultiplayer()*/)
+	if (currentlySelectedGroup && TheRecorder->isPlaybackMode() && TheGlobalData->m_useCameraInReplay && TheControlBar->getObserverLookAtPlayer() == thisPlayer /*&& !TheRecorder->isMultiplayer()*/)
 	{
 		const VecObjectID& selectedObjects = currentlySelectedGroup->getAllIDs();
 		TheInGameUI->deselectAllDrawables();
@@ -2013,7 +2080,11 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 
 	if( currentlySelectedGroup != NULL )
 	{
+#if RETAIL_COMPATIBLE_AIGROUP
 		TheAI->destroyGroup(currentlySelectedGroup);
+#else
+		currentlySelectedGroup->removeAll();
+#endif
 	}
 
-}  // end logicMessageDispatches
+}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/RankInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/RankInfo.cpp
index 405330c4065..f7435bcd740 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/RankInfo.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/RankInfo.cpp
@@ -24,10 +24,10 @@
 
 // FILE: RankInfo.cpp /////////////////////////////////////////////////////////
 // Created:   Steven Johnson, Sep 2002
-// Desc:      
+// Desc:
 //-----------------------------------------------------------------------------
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/INI.h"
 #include "Common/Player.h"
@@ -35,11 +35,6 @@
 
 RankInfoStore* TheRankInfoStore = NULL;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 RankInfo::~RankInfo()
@@ -54,10 +49,7 @@ RankInfoStore::~RankInfoStore()
 	for (level =0; level < getRankLevelCount(); level++)
 	{
 		RankInfo* ri = m_rankInfos[level];
-		if (ri)
-		{
-			deleteInstance(ri);
-		}
+		deleteInstance(ri);
 	}
 	m_rankInfos.clear();
 }
@@ -97,14 +89,14 @@ void RankInfoStore::reset()
 
 //-----------------------------------------------------------------------------
 Int RankInfoStore::getRankLevelCount() const
-{ 
-	return m_rankInfos.size(); 
+{
+	return m_rankInfos.size();
 }
 
 //-----------------------------------------------------------------------------
 // note that level is 1...n, NOT 0...n-1
-const RankInfo* RankInfoStore::getRankInfo(Int level) const 
-{ 
+const RankInfo* RankInfoStore::getRankInfo(Int level) const
+{
 	if (level >= 1 && level <= getRankLevelCount())
 	{
 		const RankInfo* ri = m_rankInfos[level-1];
@@ -123,7 +115,7 @@ void RankInfoStore::friend_parseRankDefinition( INI* ini )
 	{
 		Int rank = INI::scanInt(ini->getNextToken());
 
-		static const FieldParse myFieldParse[] = 
+		static const FieldParse myFieldParse[] =
 		{
 			{ "RankName", INI::parseAndTranslateLabel, NULL, offsetof( RankInfo, m_rankName ) },
 			{ "SkillPointsNeeded", INI::parseInt, NULL, offsetof( RankInfo, m_skillPointsNeeded ) },
@@ -132,7 +124,7 @@ void RankInfoStore::friend_parseRankDefinition( INI* ini )
 			{ 0, 0, 0, 0 }
 		};
 
-		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES) 
+		if (ini->getLoadType() == INI_LOAD_CREATE_OVERRIDES)
 		{
 			// we aren't allowed to add ranks in overrides, only to override existing ones.
 			if (rank < 1 || rank > TheRankInfoStore->m_rankInfos.size())
@@ -140,7 +132,7 @@ void RankInfoStore::friend_parseRankDefinition( INI* ini )
 				DEBUG_CRASH(("Rank not found in map.ini"));
 				throw INI_INVALID_DATA;
 			}
-			
+
 			RankInfo* info = TheRankInfoStore->m_rankInfos[rank-1];
 			if (!info)
 			{
@@ -149,7 +141,7 @@ void RankInfoStore::friend_parseRankDefinition( INI* ini )
 			}
 
 			RankInfo* newInfo = newInstance(RankInfo);
-			
+
 			// copy data from final override to 'newInfo' as a set of initial default values
 			info = (RankInfo*)(info->friend_getFinalOverride());
 
@@ -160,7 +152,7 @@ void RankInfoStore::friend_parseRankDefinition( INI* ini )
 			ini->initFromINI(newInfo, myFieldParse);
 			//TheRankInfoStore->m_rankInfos.push_back(newInfo);	// NO, BAD, WRONG -- don't add in this case.
 
-		} 
+		}
 		else
 		{
 			if (rank != TheRankInfoStore->m_rankInfos.size() + 1)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Connection.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Connection.cpp
deleted file mode 100644
index f9df1dfae14..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Connection.cpp
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/Connection.h"
-#include "GameNetwork/networkutil.h"
-#include "GameLogic/GameLogic.h"
-
-enum { MaxQuitFlushTime = 30000 }; // wait this many milliseconds at most to retry things before quitting
-
-/**
- * The constructor.
- */
-Connection::Connection() {
-	m_transport = NULL;
-	m_user = NULL;
-	m_netCommandList = NULL;
-	m_retryTime = 2000; // set retry time to 2 seconds.
-	m_lastTimeSent = 0;
-	m_frameGrouping = 1;
-	m_isQuitting = false;
-	m_quitTime = 0;
-	// Added By Sadullah Nader
-	// clearing out the latency tracker
-	m_averageLatency = 0.0f;
-	Int i;
-	for(i = 0; i < CONNECTION_LATENCY_HISTORY_LENGTH; i++)
-	{
-		m_latencies[i] = 0.0f;
-	}
-	// End Add
-}
-
-/**
- * The destructor.
- */
-Connection::~Connection() {
-	if (m_user != NULL) {
-		deleteInstance(m_user);
-		m_user = NULL;
-	}
-
-	if (m_netCommandList != NULL) {
-		deleteInstance(m_netCommandList);
-		m_netCommandList = NULL;
-	}
-}
-
-/**
- * Initialize the connection and any subsystems.
- */
-void Connection::init() {
-	m_transport = NULL;
-
-	if (m_user != NULL) {
-		deleteInstance(m_user);
-		m_user = NULL;
-	}
-
-	if (m_netCommandList == NULL) {
-		m_netCommandList = newInstance(NetCommandList);
-		m_netCommandList->init();
-	}
-	m_netCommandList->reset();
-
-	m_lastTimeSent = 0;
-	m_frameGrouping = 1;
-	m_numRetries = 0;
-	m_retryMetricsTime = 0;
-
-	for (Int i = 0; i < CONNECTION_LATENCY_HISTORY_LENGTH; ++i) {
-		m_latencies[i] = 0;
-	}
-	m_averageLatency = 0;
-	m_isQuitting = FALSE;
-	m_quitTime = 0;
-}
-
-/**
- * Take the connection back to the initial state.
- */
-void Connection::reset() {
-	init();
-}
-
-/**
- * Doesn't really do anything.
- */
-void Connection::update() {
-}
-
-/**
- * Attach the transport object that this connection should use.
- */
-void Connection::attachTransport(Transport *transport) {
-	m_transport = transport;
-}
-
-/**
- * Assign this connection a user.  This is the user to whome we send all our packetized goodies.
- */
-void Connection::setUser(User *user) {
-	if (m_user != NULL) {
-		deleteInstance(m_user);
-	}
-
-	m_user = user;
-}
-
-/**
- * Return the user object.
- */
-User * Connection::getUser() {
-	return m_user;
-}
-
-/**
- * Add this network command to the send queue for this connection.
- * The relay is the mask specifying the people the person we are sending to should send to.
- * The relay mostly has to do with the packet router.
- */
-void Connection::sendNetCommandMsg(NetCommandMsg *msg, UnsignedByte relay) {
-	static NetPacket *packet = NULL;
-
-	// this is done so we don't have to allocate and delete a packet every time we send a message.
-	if (packet == NULL) {
-		packet = newInstance(NetPacket);
-	}
-
-
-	if (m_isQuitting)
-		return;
-
-	if (m_netCommandList != NULL) {
-		// check to see if this command will fit in a packet.  If not, we need to split it up.
-		// we are splitting up the command here so that the retry logic will not try to 
-		// resend the ENTIRE command (i.e. multiple packets work of data) and only do the retry
-		// one wrapper command at a time.
-		packet->reset();
-
-		NetCommandRef *tempref = NEW_NETCOMMANDREF(msg);
-
-		Bool msgFits = packet->addCommand(tempref);
-		deleteInstance(tempref); // delete the temporary reference.
-		tempref = NULL;
-
-		if (!msgFits) {
-			NetCommandRef *origref = NEW_NETCOMMANDREF(msg);
-			origref->setRelay(relay);
-			// the message doesn't fit in a single packet, need to split it up.
-			NetPacketList packetList = NetPacket::ConstructBigCommandPacketList(origref);
-			NetPacketListIter tempPacketPtr = packetList.begin();
-
-			while (tempPacketPtr != packetList.end()) {
-				NetPacket *tempPacket = (*tempPacketPtr);
-
-				NetCommandList *list = tempPacket->getCommandList();
-				NetCommandRef *ref1 = list->getFirstMessage();
-				while (ref1 != NULL) {
-					NetCommandRef *ref2 = m_netCommandList->addMessage(ref1->getCommand());
-					ref2->setRelay(relay);
-
-					ref1 = ref1->getNext();
-				}
-
-				deleteInstance(tempPacket);
-				tempPacket = NULL;
-				++tempPacketPtr;
-
-				deleteInstance(list);
-				list = NULL;
-			}
-
-			deleteInstance(origref);
-			origref = NULL;
-
-			return;
-		}
-
-		// the message fits in a packet, add to the command list normally.
-		NetCommandRef *ref = m_netCommandList->addMessage(msg);
-
-		if (ref != NULL) {
-
-/*
-#if ((defined(RTS_DEBUG)) || (defined(RTS_INTERNAL)))
-			if (msg->getNetCommandType() == NETCOMMANDTYPE_GAMECOMMAND) {
-				DEBUG_LOG(("Connection::sendNetCommandMsg - added game command %d to net command list for frame %d.\n",
-					msg->getID(), msg->getExecutionFrame()));
-			} else if (msg->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) {
-				DEBUG_LOG(("Connection::sendNetCommandMsg - added frame info for frame %d\n", msg->getExecutionFrame()));
-			}
-#endif // RTS_DEBUG || RTS_INTERNAL
-*/
-
-			ref->setRelay(relay);
-		}
-	}
-}
-
-void Connection::clearCommandsExceptFrom( Int playerIndex )
-{
-	NetCommandRef *tmp = m_netCommandList->getFirstMessage();
-	while (tmp)
-	{
-		NetCommandMsg *msg = tmp->getCommand();
-		if (msg->getPlayerID() != playerIndex)
-		{
-			DEBUG_LOG(("Connection::clearCommandsExceptFrom(%d) - clearing a command from %d for frame %d\n",
-				playerIndex, tmp->getCommand()->getPlayerID(), tmp->getCommand()->getExecutionFrame()));
-			m_netCommandList->removeMessage(tmp);
-			NetCommandRef *toDelete = tmp;
-			tmp = tmp->getNext();
-			deleteInstance(toDelete);
-		} else {
-			tmp = tmp->getNext();
-		}
-	}
-}
-
-Bool Connection::isQueueEmpty() {
-	if (m_netCommandList->getFirstMessage() == NULL) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-void Connection::setQuitting( void )
-{
-	m_isQuitting = TRUE;
-	m_quitTime = timeGetTime();
-	DEBUG_LOG(("Connection::setQuitting() at time %d\n", m_quitTime));
-}
-
-/**
- * This is the good part. We take all the network commands queued up for this connection,
- * packetize them and put them on the transport's send queue for actual sending.
- */
-UnsignedInt Connection::doSend() {
-	Int numpackets = 0;
-	time_t curtime = timeGetTime();
-	Bool couldQueue = TRUE;
-
-	// Do this check first, since it's an important fail-safe
-	if (m_isQuitting && curtime > m_quitTime + MaxQuitFlushTime)
-	{
-		DEBUG_LOG(("Timed out a quitting connection.  Deleting all %d messages\n", m_netCommandList->length()));
-		m_netCommandList->reset();
-		return 0;
-	}
-
-	if ((curtime - m_lastTimeSent) < m_frameGrouping) {
-//		DEBUG_LOG(("not sending packet, time = %d, m_lastFrameSent = %d, m_frameGrouping = %d\n", curtime, m_lastTimeSent, m_frameGrouping));
-		return 0;
-	}
-	
-	// iterate through all the messages and put them into a packet(s).
-	NetCommandRef *msg = m_netCommandList->getFirstMessage();
-
-	while ((msg != NULL) && couldQueue) {
-		NetPacket *packet = newInstance(NetPacket);
-		packet->init();
-		packet->setAddress(m_user->GetIPAddr(), m_user->GetPort());
-
-		Bool notDone = TRUE;
-
-		// add the command messages until either we run out of messages or the packet is full.
-		while ((msg != NULL) && notDone) {
-			NetCommandRef *next = msg->getNext(); // Need this since msg could be deleted
-
-			time_t timeLastSent = msg->getTimeLastSent();
-
-			if (((curtime - timeLastSent) > m_retryTime) || (timeLastSent == -1)) {
-				notDone = packet->addCommand(msg);
-				if (notDone) {
-					// the msg command was added to the packet.
-					if (CommandRequiresAck(msg->getCommand())) {
-						if (timeLastSent != -1) {
-							++m_numRetries;
-						}
-						doRetryMetrics();
-						msg->setTimeLastSent(curtime);
-					} else {
-						m_netCommandList->removeMessage(msg);
-						deleteInstance(msg);
-					}
-				}
-			}
-			msg = next;
-		}
-
-		if (msg != NULL) {
-			DEBUG_LOG(("didn't finish sending all commands in connection\n"));
-		}
-
-		++numpackets;
-
-		/// @todo Make the act of giving the transport object a packet to send more efficient.  Make the transport take a NetPacket object rather than the raw data, thus avoiding an extra memcpy.
-		if (packet->getNumCommands() > 0) {
-			// If the packet actually has any information to give, give it to the transport object
-			// for transmission.
-			couldQueue = m_transport->queueSend(packet->getAddr(), packet->getPort(), packet->getData(), packet->getLength());
-			m_lastTimeSent = curtime;
-		}
-		if (packet != NULL) {
-			deleteInstance(packet); // delete the packet now that we're done with it.
-		}
-	}
-
-	return numpackets;
-}
-
-NetCommandRef * Connection::processAck(NetAckStage1CommandMsg *msg) {
-	return processAck(msg->getCommandID(), msg->getOriginalPlayerID());
-}
-
-NetCommandRef * Connection::processAck(NetAckBothCommandMsg *msg) {
-	return processAck(msg->getCommandID(), msg->getOriginalPlayerID());
-}
-
-NetCommandRef * Connection::processAck(NetCommandMsg *msg) {
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) {
-		NetAckStage1CommandMsg *ackmsg = (NetAckStage1CommandMsg *)msg;
-		return processAck(ackmsg);
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
-		NetAckBothCommandMsg *ackmsg = (NetAckBothCommandMsg *)msg;
-		return processAck(ackmsg);
-	}
-
-	return NULL;
-}
-
-/**
- * The person we are sending to has ack'd one of the messages we sent him.
- * Take that message off the list of commands to send.
- */
-NetCommandRef * Connection::processAck(UnsignedShort commandID, UnsignedByte originalPlayerID) {
-	NetCommandRef *temp = m_netCommandList->getFirstMessage();
-	while ((temp != NULL) && ((temp->getCommand()->getID() != commandID) || (temp->getCommand()->getPlayerID() != originalPlayerID))) {
-
-		// cycle through the commands till we find the one we need to remove.
-		// Need to check for both the command ID and the player ID.
-		temp = temp->getNext();
-	}
-	if (temp == NULL) {
-		return NULL;
-	}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	Bool doDebug = FALSE;
-	if (temp->getCommand()->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) {
-		doDebug = TRUE;
-	}
-#endif
-
-	Int index = temp->getCommand()->getID() % CONNECTION_LATENCY_HISTORY_LENGTH;
-	m_averageLatency -= ((Real)(m_latencies[index])) / CONNECTION_LATENCY_HISTORY_LENGTH;
-	Real lat = timeGetTime() - temp->getTimeLastSent();
-	m_averageLatency += lat / CONNECTION_LATENCY_HISTORY_LENGTH;
-	m_latencies[index] = lat;
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (doDebug == TRUE) {
-		DEBUG_LOG(("Connection::processAck - disconnect frame command %d found, removing from command list.\n", commandID));
-	}
-#endif
-	m_netCommandList->removeMessage(temp);
-	return temp;
-}
-
-void Connection::setFrameGrouping(time_t frameGrouping) {
-	m_frameGrouping = frameGrouping;
-//	m_retryTime = frameGrouping * 4;
-}
-
-void Connection::doRetryMetrics() {
-	static Int numSeconds = 0;
-	time_t curTime = timeGetTime();
-
-	if ((curTime - m_retryMetricsTime) > 10000) {
-		m_retryMetricsTime = curTime;
-		++numSeconds;
-//		DEBUG_LOG(("Retries in the last 10 seconds = %d, average latency = %fms\n", m_numRetries, m_averageLatency));
-		m_numRetries = 0;
-//		m_retryTime = m_averageLatency * 1.5;
-	}
-}
-
-#if defined(RTS_DEBUG) || (RTS_INTERNAL)
-void Connection::debugPrintCommands() {
-	NetCommandRef *ref = m_netCommandList->getFirstMessage();
-	while (ref != NULL) {
-		DEBUG_LOG(("Connection::debugPrintCommands - ID: %d\tType: %s\tRelay: 0x%X for frame %d\n",
-			ref->getCommand()->getID(), GetAsciiNetCommandType(ref->getCommand()->getNetCommandType()).str(),
-			ref->getRelay(), ref->getCommand()->getExecutionFrame()));
-		ref = ref->getNext();
-	}
-}
-#endif
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
deleted file mode 100644
index 83f8bd5f144..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
+++ /dev/null
@@ -1,2442 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Compression.h"
-#include "strtok_r.h"
-#include "Common/AudioEventRTS.h"
-#include "Common/CRCDebug.h"
-#include "Common/Debug.h"
-#include "Common/file.h"
-#include "Common/GameAudio.h"
-#include "Common/LocalFileSystem.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "Common/RandomValue.h"
-#include "Common/Recorder.h"
-
-#include "GameClient/Diplomacy.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MessageBox.h"
-#include "GameNetwork/ConnectionManager.h"
-#include "GameNetwork/LANAPICallbacks.h"
-#include "GameNetwork/NAT.h"
-#include "GameNetwork/NetCommandWrapperList.h"
-#include "GameNetwork/networkutil.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/ScriptActions.h"
-#include "GameLogic/ScriptEngine.h"
-#include "GameLogic/VictoryConditions.h"
-#include "GameClient/DisconnectMenu.h"
-#include "GameClient/InGameUI.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-/**
- * Le destructor.
- */
-ConnectionManager::~ConnectionManager(void)
-{
-	if (m_localUser != NULL) {
-		deleteInstance(m_localUser);
-		m_localUser = NULL;
-	}
-
-//	m_transport = NULL; // Network will delete transports; we just forget them
-	if (m_transport != NULL) {
-		delete m_transport;
-		m_transport = NULL;
-	}
-
-	Int i = 0;
-	for (; i < MAX_SLOTS; ++i) {
-		if (m_frameData[i] != NULL) {
-			deleteInstance(m_frameData[i]);
-			m_frameData[i] = NULL;
-		}
-	}
-
-	for (i = 0; i < NUM_CONNECTIONS; ++i) {
-		if (m_connections[i] != NULL) {
-			deleteInstance(m_connections[i]);
-			m_connections[i] = NULL;
-		}
-	}
-
-	if (TheDisconnectMenu != NULL) {
-		// This is done here since TheDisconnectMenu should only be there if we are in a network game.
-		delete TheDisconnectMenu;
-		TheDisconnectMenu = NULL;
-	}
-
-	if (m_disconnectManager != NULL) {
-		delete m_disconnectManager;
-		m_disconnectManager = NULL;
-	}
-
-	if (m_pendingCommands != NULL) {
-		deleteInstance(m_pendingCommands);
-		m_pendingCommands = NULL;
-	}
-
-	if (m_relayedCommands != NULL) {
-		deleteInstance(m_relayedCommands);
-		m_relayedCommands = NULL;
-	}
-
-	if (m_netCommandWrapperList != NULL) {
-		deleteInstance(m_netCommandWrapperList);
-		m_netCommandWrapperList = NULL;
-	}
-
-	s_fileCommandMap.clear();
-	s_fileRecipientMaskMap.clear();
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		s_fileProgressMap[i].clear();
-	}
-}
-
-/**
- * Le constructor
- */
-ConnectionManager::ConnectionManager(void)
-{
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		m_frameData[i] = NULL;
-	}
-	m_transport = NULL;
-	m_disconnectManager = NULL;
-	m_pendingCommands = NULL;
-	m_relayedCommands = NULL;
-	m_localAddr = 0;
-	m_localPort = 0;
-	m_netCommandWrapperList = NULL;
-	m_localUser = NULL;
-	m_localUser = newInstance(User);
-}
-
-/**
- * Initialize the connection manager and any subsystems.
- */
-void ConnectionManager::init() 
-{
-//	if (m_transport == NULL) {
-//		m_transport = new Transport;
-//	}
-//	m_transport->reset();
-
-	UnsignedInt i = 0;
-	for (; i < NUM_CONNECTIONS; ++i) {
-		m_connections[i] = NULL;
-	}
-
-	if (m_pendingCommands == NULL) {
-		m_pendingCommands = newInstance(NetCommandList);
-		m_pendingCommands->init();
-	}
-	m_pendingCommands->reset();
-
-	if (m_relayedCommands == NULL) {
-		m_relayedCommands = newInstance(NetCommandList);
-		m_relayedCommands->init();
-	}
-	m_relayedCommands->reset();
-
-	m_localSlot = -1;
-#ifdef MEMORYPOOL_DEBUG
-	TheMemoryPoolFactory->debugSetInitFillerIndex(m_localSlot);
-#endif
-	m_packetRouterSlot = 0; /// @todo The LAN/WOL interface should be telling us who the packet router is based on machine specs passed around through game options.
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		m_packetRouterFallback[i] = -1;
-	}
-
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		if (m_frameData[i] != NULL) {
-			deleteInstance(m_frameData[i]);
-			m_frameData[i] = NULL;
-		}
-	}
-
-//	m_averageFps = 30;			// since 30 fps is the desired rate, we'll start off at that.
-//	m_averageLatency = (Real)0.2; // 200ms seems like a good starting point.
-
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		m_fpsAverages[i] = -1;
-	}
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		m_latencyAverages[i] = 0.0; // using zero since all floating point standards should be able to specify 0.0 accurately.
-	}
-	m_smallestPacketArrivalCushion = -1;
-
-	m_frameMetrics.init();
-
-	TheDisconnectMenu = NEW DisconnectMenu;
-	TheDisconnectMenu->init();
-
-	m_disconnectManager = NEW DisconnectManager;
-	m_disconnectManager->init();
-
-	TheDisconnectMenu->attachDisconnectManager(m_disconnectManager);
-	TheDisconnectMenu->hideScreen();
-
-	m_netCommandWrapperList = newInstance(NetCommandWrapperList);
-	m_netCommandWrapperList->init();
-
-	s_fileCommandMap.clear();
-	s_fileRecipientMaskMap.clear();
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		s_fileProgressMap[i].clear();
-	}
-}
-
-/**
- * Reset the connection manager and any subsystems.
- */
-void ConnectionManager::reset() 
-{
-//	if (m_transport == NULL) {
-//		m_transport = new Transport;
-//	}
-//	m_transport->reset();
-	if (m_transport != NULL) {
-		delete m_transport;
-		m_transport = NULL;
-	}
-
-	UnsignedInt i = 0;
-	for (; i < (UnsignedInt)NUM_CONNECTIONS; ++i) {
-		if (m_connections[i] != NULL) {
-			deleteInstance(m_connections[i]);
-			m_connections[i] = NULL;
-		}
-	}
-
-	for (i=0; i<(UnsignedInt)MAX_SLOTS; ++i)
-	{
-		if (m_frameData[i] != NULL) {
-			deleteInstance(m_frameData[i]);
-			m_frameData[i] = NULL;
-		}
-	}
-
-	if (m_pendingCommands == NULL) {
-		m_pendingCommands = newInstance(NetCommandList);
-		m_pendingCommands->init();
-	}
-	m_pendingCommands->reset();
-
-	if (m_relayedCommands == NULL) {
-		m_relayedCommands = newInstance(NetCommandList);
-		m_relayedCommands->init();
-	}
-	m_relayedCommands->reset();
-
-	if (m_netCommandWrapperList == NULL) {
-		m_netCommandWrapperList = newInstance(NetCommandWrapperList);
-		m_netCommandWrapperList->init();
-	}
-	m_netCommandWrapperList->reset();
-
-	m_localSlot = -1;
-#ifdef MEMORYPOOL_DEBUG
-	TheMemoryPoolFactory->debugSetInitFillerIndex(m_localSlot);
-#endif
-	m_packetRouterSlot = -1;
-
-	for (i = 0; i < TheGlobalData->m_networkFPSHistoryLength; ++i) {
-		m_fpsAverages[i] = -1;
-	}
-	for (i = 0; i < TheGlobalData->m_networkLatencyHistoryLength; ++i) {
-		m_latencyAverages[i] = 0.0;
-	}
-
-	for (i = 0; i < (UnsignedInt)MAX_SLOTS; ++i) {
-		m_packetRouterFallback[i] = -1;
-	}
-
-	m_frameMetrics.reset();
-}
-
-UnsignedInt ConnectionManager::getPingFrame()
-{
-	return (m_disconnectManager)?m_disconnectManager->getPingFrame():0;
-}
-
-Int ConnectionManager::getPingsSent()
-{
-	return (m_disconnectManager)?m_disconnectManager->getPingsSent():0;
-}
-
-Int ConnectionManager::getPingsRecieved()
-{
-	return (m_disconnectManager)?m_disconnectManager->getPingsRecieved():0;
-}
-
-Bool ConnectionManager::isPlayerConnected( Int playerID )
-{
-	return ( playerID == m_localSlot || (m_connections[playerID] && !m_connections[playerID]->isQuitting()) );
-}
-
-void ConnectionManager::attachTransport(Transport *transport) {
-	if (m_transport != NULL) {
-		delete m_transport;
-		m_transport = NULL;
-	}
-	m_transport = transport;
-}
-
-/**
- * zero out the command counts for the given frames.  Presently this is used for
- * the start of a game since there won't be any commands for the first few frames due to runahead.
- */
-void ConnectionManager::zeroFrames(UnsignedInt startingFrame, UnsignedInt numFrames) {
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_frameData[i] != NULL) {
-//			DEBUG_LOG(("Calling zeroFrames on player %d, starting frame %d, numFrames %d\n", i, startingFrame, numFrames));
-			m_frameData[i]->zeroFrames(startingFrame, numFrames);
-		}
-	}
-}
-
-/**
- * Destroy any game messages that are left over due to the run ahead.
- */
-void ConnectionManager::destroyGameMessages() {
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		// Need to destroy these game messages because when the game ends, there are
-		// still some game messages left over because of the run ahead aspect of
-		// network play.
-		if (m_frameData[i] != NULL) {
-			m_frameData[i]->destroyGameMessages();
-		}
-	}
-}
-
-/**
- * ConnectionManager::doRelay()
- * Queries the transport for commands that need to be relayed to another client.
- * Get those commands and relay them to the appropriate Connection(s). We make the
- * assumption that a command will only be relayed once.
- */
-void ConnectionManager::doRelay() {
-	static Int numPackets = 0;
-	static Int numCommands = 0;
-
-	NetPacket *packet = NULL;
-
-	for (Int i = 0; i < MAX_MESSAGES; ++i) {
-		if (m_transport->m_inBuffer[i].length != 0) {
-			// This transport buffer has yet to be processed.
-
-			// make a NetPacket out of this data so it can be broken up into individual commands.
-			packet = newInstance(NetPacket)(&(m_transport->m_inBuffer[i]));
-
-			//DEBUG_LOG(("ConnectionManager::doRelay() - got a packet with %d commands\n", packet->getNumCommands()));
-			//LOGBUFFER( packet->getData(), packet->getLength() );
-
-			// Get the command list from the packet.
-			NetCommandList *cmdList = packet->getCommandList();
-			NetCommandRef *cmd = cmdList->getFirstMessage();
-
-			// Iterate through the commands in this packet and send them to the proper connections.
-			while (cmd != NULL) {
-				//DEBUG_LOG(("ConnectionManager::doRelay() - Looking at a command of type %s\n",
-					//GetAsciiNetCommandType(cmd->getCommand()->getNetCommandType()).str()));
-				if (CommandRequiresAck(cmd->getCommand())) {
-					ackCommand(cmd, m_localSlot);
-				}
-				if (!processNetCommand(cmd)) {
-					sendRemoteCommand(cmd);
-				}
-				cmd = cmd->getNext();
-
-				++numCommands;
-			}
-			++numPackets;
-
-			// Delete this packet since we won't be needing it anymore.
-			deleteInstance(packet);
-			packet = NULL;
-
-			deleteInstance(cmdList);
-			cmdList = NULL;
-
-			// signal that this has been processed.
-			m_transport->m_inBuffer[i].length = 0;
-		}
-	}
-
-	NetCommandList *cmdList = m_netCommandWrapperList->getReadyCommands();
-	NetCommandRef *cmd = cmdList->getFirstMessage();
-	while (cmd != NULL) {
-		if (CommandRequiresAck(cmd->getCommand())) {
-			ackCommand(cmd, m_localSlot);
-		}
-		if (!processNetCommand(cmd)) {
-			sendRemoteCommand(cmd);
-		}
-		cmd = cmd->getNext();
-
-		++numCommands;
-	}
-	++numPackets;
-
-	// Delete this packet since we won't be needing it anymore.
-	deleteInstance(packet);
-	packet = NULL;
-
-	deleteInstance(cmdList);
-	cmdList = NULL;
-}
-
-/**
- * This is where the non-synchronized network commands should be processed.
- * Return TRUE if the command should not be relayed. Return FALSE if it should be relayed.
- */
-Bool ConnectionManager::processNetCommand(NetCommandRef *ref) {
-	NetCommandMsg *msg = ref->getCommand();
-
-	if ((msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH)) {
-
-		processAck(msg);
-		return FALSE;
-	}
-
-	if ((m_connections[msg->getPlayerID()] == NULL) && (msg->getPlayerID() != m_localSlot)) {
-		// if this is from a player that is no longer in the game, then ignore them.
-		return TRUE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_WRAPPER) {
-		processWrapper(ref); // need to send the NetCommandRef since we have to construct the relay for the wrapped command.
-		return FALSE;
-	}
-
-	if ((msg->getPlayerID() >= 0) && (msg->getPlayerID() < MAX_SLOTS) && (msg->getPlayerID() != m_localSlot)) {
-		if (m_connections[msg->getPlayerID()] == NULL) {
-			return TRUE;
-		}
-	}
-
-	// Don't allow an out of date command to be sent through.
-	// Its unnecessary traffic and it could cause problems.
-	//
-	// This was a fix for a command count bug where a command would be
-	// executed, then a command for that old frame would be added to the
-	// FrameData for that frame + 256, and would screw up the command count.
-
-	if (IsCommandSynchronized(msg->getNetCommandType())) {
-		if (ref->getCommand()->getExecutionFrame() < TheGameLogic->getFrame()) {
-			return TRUE;
-		}
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) {
-		processFrameInfo((NetFrameCommandMsg *)msg);
-		
-		// need to set the relay so we don't send it to ourselves.
-		UnsignedByte relay = ref->getRelay();
-		relay = relay & (0xff ^ (1 << m_localSlot));
-		ref->setRelay(relay);
-		return FALSE;
-	}
-	
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_PROGRESS)
-	{
-		//DEBUG_LOG(("ConnectionManager::processNetCommand - got a progress net command from player %d\n", msg->getPlayerID()));
-		processProgress((NetProgressCommandMsg *) msg);
-
-		// need to set the relay so we don't send it to ourselves.
-		UnsignedByte relay = ref->getRelay();
-		relay = relay & (0xff ^ (1 << m_localSlot));
-		ref->setRelay(relay);
-		return FALSE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_TIMEOUTSTART)
-	{
-		DEBUG_LOG(("ConnectionManager::processNetCommand - got a TimeOut GameStart net command from player %d\n", msg->getPlayerID()));
-		processTimeOutGameStart(msg);
-		return FALSE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEADMETRICS) {
-		processRunAheadMetrics((NetRunAheadMetricsCommandMsg *)msg);
-		return TRUE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_KEEPALIVE) {
-		return TRUE;
-	}
-
-	if ((msg->getNetCommandType() > NETCOMMANDTYPE_DISCONNECTSTART) && (msg->getNetCommandType() < NETCOMMANDTYPE_DISCONNECTEND)) {
-		m_disconnectManager->processDisconnectCommand(ref, this);
-		return TRUE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTCHAT) {
-		processDisconnectChat((NetDisconnectChatCommandMsg *)msg);
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_LOADCOMPLETE)
-	{
-		DEBUG_LOG(("ConnectionManager::processNetCommand - got a Load Complete net command from player %d\n", msg->getPlayerID()));
-		processLoadComplete(msg);
-		return FALSE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_CHAT) {
-		processChat((NetChatCommandMsg *)msg);
-		return FALSE;
-	} 
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_FILE) {
-		processFile((NetFileCommandMsg *)msg);
-		return FALSE;
-	} 
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_FILEANNOUNCE) {
-		processFileAnnounce((NetFileAnnounceCommandMsg *)msg);
-		return FALSE;
-	} 
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_FILEPROGRESS) {
-		processFileProgress((NetFileProgressCommandMsg *)msg);
-		return FALSE;
-	}
-
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_FRAMERESENDREQUEST) {
-		processFrameResendRequest((NetFrameResendRequestCommandMsg *)msg);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-void ConnectionManager::processFrameResendRequest(NetFrameResendRequestCommandMsg *msg) {
-	// first make sure this is a valid slot
-	Int playerID = msg->getPlayerID();
-	if ((playerID < 0) || (playerID >= MAX_SLOTS)) {	
-		return;
-	}
-
-	// make sure this player is still in our game.
-	if ((m_connections[playerID] == NULL) || (m_connections[playerID]->isQuitting() == TRUE)) {
-		return;
-	}
-
-	sendFrameDataToPlayer(playerID, msg->getFrameToResend());
-}
-
-/**
- * We have received a wrapper for a command too big to fit in a packet.
- */
-void ConnectionManager::processWrapper(NetCommandRef *ref) 
-{
-	NetWrapperCommandMsg *wrapperMsg = (NetWrapperCommandMsg *)(ref->getCommand());
-	UnsignedShort commandID = wrapperMsg->getWrappedCommandID();
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processWrapper() - wrapped commandID is %d, commandID is %d\n",
-		commandID, wrapperMsg->getID()));
-	Int origProgress = 0;
-	FileCommandMap::iterator fcIt = s_fileCommandMap.find(commandID);
-	if (fcIt != s_fileCommandMap.end())
-	{
-		origProgress = s_fileProgressMap[m_localSlot][commandID];
-	}
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processWrapper() - origProgress[%d] == %d for command %d\n",
-		m_localSlot, origProgress, commandID));
-
-	m_netCommandWrapperList->processWrapper(ref);
-
-	if (fcIt != s_fileCommandMap.end())
-	{
-		Int newProgress = m_netCommandWrapperList->getPercentComplete(commandID);
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processWrapper() - newProgress[%d] == %d for command %d\n",
-			m_localSlot, newProgress, commandID));
-		if (newProgress > origProgress && newProgress < 100)
-		{
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processWrapper() - sending a NetFileProgressCommandMsg\n"));
-			s_fileProgressMap[m_localSlot][commandID] = newProgress;
-
-			Int progressMask = 0xff ^ (1 << m_localSlot);
-			NetFileProgressCommandMsg *msg = newInstance(NetFileProgressCommandMsg);
-			msg->setPlayerID(m_localSlot);
-			msg->setID(0);
-			if (DoesCommandRequireACommandID(msg->getNetCommandType()))
-			{
-				msg->setID(GenerateNextCommandID());
-			}
-			msg->setFileID(commandID);
-			msg->setProgress(newProgress);
-			sendLocalCommand(msg, progressMask);
-			processFileProgress(msg);
-			msg->detach();
-		}
-	}
-}
-
-/**
- * A client has sent us their run ahead metrics, lets store them away for future calculations.
- */
-void ConnectionManager::processRunAheadMetrics(NetRunAheadMetricsCommandMsg *msg) 
-{
-	UnsignedInt player = msg->getPlayerID();
-	if ((player >= 0) && (player < MAX_SLOTS) && (isPlayerConnected(player))) {
-		m_latencyAverages[player] = msg->getAverageLatency();
-		m_fpsAverages[player] = msg->getAverageFps();
-		//DEBUG_LOG(("ConnectionManager::processRunAheadMetrics - player %d, fps = %d, latency = %f\n", player, msg->getAverageFps(), msg->getAverageLatency()));
-		if (m_fpsAverages[player] > 100) {
-			// limit the reported frame rate average to 100.  This is done because if a
-			// user alt-tab's out of the game their frame rate climbs to in the neighborhood of
-			// 300, that was deemed "ugly" by the powers that be.
-			m_fpsAverages[player] = 100;
-		}
-	}
-}
-
-void ConnectionManager::processDisconnectChat(NetDisconnectChatCommandMsg *msg) 
-{
-	UnicodeString unitext;
-	UnicodeString name;
-	UnsignedByte playerID = msg->getPlayerID();
-	if (playerID == m_localSlot) {
-		name = m_localUser->GetName();
-	} else if (isPlayerConnected(playerID)) {
-		name = m_connections[playerID]->getUser()->GetName();
-	}
-	unitext.format(L"[%ls] %ls", name.str(), msg->getText().str());
-//	DEBUG_LOG(("ConnectionManager::processDisconnectChat - got message from player %d, message is %ls\n", playerID, unitext.str()));
-	TheDisconnectMenu->showChat(unitext); // <-- need to implement this
-}
-
-void ConnectionManager::processChat(NetChatCommandMsg *msg) 
-{
-	UnicodeString unitext;
-	UnicodeString name;
-	UnsignedByte playerID = msg->getPlayerID();
-	//DEBUG_LOG(("processChat(): playerID = %d\n", playerID));
-	if (playerID == m_localSlot) {
-		name = m_localUser->GetName();
-		//DEBUG_LOG(("connection is NULL, using %ls\n", name.str()));
-	} else if (((m_connections[playerID] != NULL) && (m_connections[playerID]->isQuitting() == FALSE))) {
-		name = m_connections[playerID]->getUser()->GetName();
-		//DEBUG_LOG(("connection is non-NULL, using %ls\n", name.str()));
-	}
-	unitext.format(L"[%ls] %ls", name.str(), msg->getText().str());
-//	DEBUG_LOG(("ConnectionManager::processChat - got message from player %d (mask %8.8X), message is %ls\n", playerID, msg->getPlayerMask(), unitext.str()));
-	
-	AsciiString playerName;
-	playerName.format("player%d", msg->getPlayerID());
-	const Player *player = ThePlayerList->findPlayerWithNameKey( TheNameKeyGenerator->nameToKey( playerName ) );
-	if (!player)
-	{
-		TheInGameUI->message(UnicodeString(L"%ls"), unitext.str());
-		return;
-	}
-	
-	Bool fromObserver = !player->isPlayerActive();
-	Bool amIObserver = !ThePlayerList->getLocalPlayer()->isPlayerActive();
-	Bool canSeeChat = amIObserver || !fromObserver && !TheGameInfo->getConstSlot(playerID)->isMuted();
-	
-	if ( ((1<<m_localSlot) & msg->getPlayerMask() ) && canSeeChat  )
-	{
-		RGBColor rgb;
-		rgb.setFromInt(player->getPlayerColor());
-		TheInGameUI->messageColor(&rgb, UnicodeString(L"%ls"), unitext.str());
-
-		// feedback for received chat messages in-game
-		AudioEventRTS audioEvent("GUICommunicatorIncoming");
-		TheAudio->addAudioEvent(&audioEvent);
-	}
-}
-
-void ConnectionManager::processFile(NetFileCommandMsg *msg) 
-{
-#ifdef RTS_INTERNAL
-	UnicodeString log;
-	log.format(L"Saw file transfer: '%hs' of %d bytes from %d", msg->getPortableFilename().str(), msg->getFileLength(), msg->getPlayerID());
-	DEBUG_LOG(("%ls\n", log.str()));
-#endif
-
-	if (TheFileSystem->doesFileExist(msg->getRealFilename().str()))
-	{
-		DEBUG_LOG(("File exists already!\n"));
-		//return;
-	}
-
-	UnsignedByte *buf = msg->getFileData();
-	Int len = msg->getFileLength();
-
-	// uncompress Targas
-#ifdef COMPRESS_TARGAS
-	Bool deleteBuf = FALSE;
-	if (msg->getFilename().endsWith(".tga") && CompressionManager::isDataCompressed(buf, len))
-	{
-		Int uncompLen = CompressionManager::getUncompressedSize(buf, len);
-		UnsignedByte *uncompBuffer = NEW UnsignedByte[uncompLen];
-		Int actualLen = CompressionManager::decompressData(buf, len, uncompBuffer, uncompLen);
-		if (actualLen == uncompLen)
-		{
-			DEBUG_LOG(("Uncompressed Targa after map transfer\n"));
-			deleteBuf = TRUE;
-			buf = uncompBuffer;
-			len = uncompLen;
-		}
-		else
-		{
-			DEBUG_LOG(("Failed to uncompress Targa after map transfer\n"));
-			delete[] uncompBuffer; // failed to decompress, so just use the source
-		}
-	}
-#endif // COMPRESS_TARGAS
-
-	File *fp = TheFileSystem->openFile(msg->getRealFilename().str(), File::CREATE | File::BINARY | File::WRITE);
-	if (fp)
-	{
-		fp->write(buf, len);
-		fp->close();
-		fp = NULL;
-		DEBUG_LOG(("Wrote %d bytes to file %s!\n",len,msg->getRealFilename().str()));
-
-	}
-	else
-	{
-		DEBUG_LOG(("Cannot open file!\n"));
-	}
-
-	DEBUG_LOG(("ConnectionManager::processFile() - sending a NetFileProgressCommandMsg\n"));
-	
-	Int commandID = msg->getID();
-	Int newProgress = 100;
-
-	s_fileProgressMap[m_localSlot][commandID] = newProgress;
-
-	Int progressMask = 0xff ^ (1 << m_localSlot);
-	NetFileProgressCommandMsg *progressMsg = newInstance(NetFileProgressCommandMsg);
-	progressMsg->setPlayerID(m_localSlot);
-	progressMsg->setID(0);
-	if (DoesCommandRequireACommandID(progressMsg->getNetCommandType()))
-	{
-		progressMsg->setID(GenerateNextCommandID());
-	}
-	progressMsg->setFileID(commandID);
-	progressMsg->setProgress(newProgress);
-	sendLocalCommand(progressMsg, progressMask);
-	processFileProgress(progressMsg);
-	progressMsg->detach();
-
-#ifdef COMPRESS_TARGAS
-	if (deleteBuf)
-	{
-		delete[] buf;
-		buf = NULL;
-	}
-#endif // COMPRESS_TARGAS
-}
-
-void ConnectionManager::processFileAnnounce(NetFileAnnounceCommandMsg *msg) 
-{
-	DEBUG_LOG(("ConnectionManager::processFileAnnounce() - expecting '%s' (%s) in command %d\n", msg->getPortableFilename().str(), msg->getRealFilename().str(), msg->getFileID()));
-	s_fileCommandMap[msg->getFileID()] = msg->getRealFilename();
-	s_fileRecipientMaskMap[msg->getFileID()] = msg->getPlayerMask();
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if ( (1<<i) & msg->getPlayerMask() )
-		{
-			s_fileProgressMap[i][msg->getFileID()] = 0;
-		}
-		else
-		{
-			s_fileProgressMap[i][msg->getFileID()] = 100; // they don't need to get it, so they're already done.
-		}
-	}
-}
-
-void ConnectionManager::processFileProgress(NetFileProgressCommandMsg *msg) 
-{
-	DEBUG_LOG(("ConnectionManager::processFileProgress() - command %d is at %d%%\n",
-		msg->getFileID(), msg->getProgress()));
-	Int oldProgress = s_fileProgressMap[msg->getPlayerID()][msg->getFileID()];
-
-	s_fileProgressMap[msg->getPlayerID()][msg->getFileID()] = max(oldProgress, msg->getProgress());
-}
-
-void ConnectionManager::processProgress( NetProgressCommandMsg *msg )
-{
-	TheGameLogic->processProgress(msg->getPlayerID(), msg->getPercentage());
-}
-
-void ConnectionManager::processLoadComplete( NetCommandMsg *msg )
-{
-	TheGameLogic->processProgressComplete(msg->getPlayerID());
-}
-
-void ConnectionManager::processTimeOutGameStart( NetCommandMsg *msg )
-{
-	TheGameLogic->timeOutGameStart();
-}
-
-/**
- * Another client has sent us the command count for a new frame.
- */
-void ConnectionManager::processFrameInfo(NetFrameCommandMsg *msg) {
-	//stupid frame info, why don't you process yourself?
-
-	UnsignedInt playerID = msg->getPlayerID();
-
-	if ((playerID >= 0) && (playerID < MAX_SLOTS)) {
-		if (m_frameData[playerID] != NULL) {
-//			DEBUG_LOG(("ConnectionManager::processFrameInfo - player %d, frame %d, command count %d, received on frame %d\n", playerID, msg->getExecutionFrame(), msg->getCommandCount(), TheGameLogic->getFrame()));
-			m_frameData[playerID]->setFrameCommandCount(msg->getExecutionFrame(), msg->getCommandCount());
-		}
-	}
-}
-
-/**
- * We just got a stage 1 ack from someone.  So we should remove it from the connection that sent it so
- * it doesn't keep resending it.
- */
-void ConnectionManager::processAckStage1(NetCommandMsg *msg) {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	Bool doDebug = (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ? TRUE : FALSE;
-#endif
-
-	UnsignedByte playerID = msg->getPlayerID();
-	NetCommandRef *ref = NULL;
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (doDebug == TRUE) {
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processAck - processing ack for command %d from player %d\n", ((NetAckStage1CommandMsg *)msg)->getCommandID(), playerID));
-	}
-#endif
-	
-	if ((playerID >= 0) && (playerID < NUM_CONNECTIONS)) {
-		if (m_connections[playerID] != NULL) {
-			ref = m_connections[playerID]->processAck(msg);
-		}
-	} else {
-		DEBUG_ASSERTCRASH((playerID >= 0) && (playerID < NUM_CONNECTIONS), ("ConnectionManager::processAck - %d is an invalid player number"));
-	}
-
-	if (ref != NULL) {
-		if (ref->getCommand()->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) {
-			m_frameMetrics.processLatencyResponse(((NetFrameCommandMsg *)(ref->getCommand()))->getExecutionFrame());
-		}
-
-		deleteInstance(ref);
-		ref = NULL;
-	}
-}
-
-/**
- * We just got a stage 2 ack from someone.  So remove it from the pending commands list so it doesn't
- * get sent in the case of a new packet router.
- */
-void ConnectionManager::processAckStage2(NetCommandMsg *msg) {
-	UnsignedShort commandID = 0;
-	UnsignedByte playerID = 0;
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) {
-		commandID = ((NetAckStage2CommandMsg *)msg)->getCommandID();
-		playerID = ((NetAckStage2CommandMsg *)msg)->getOriginalPlayerID();
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
-		commandID = ((NetAckBothCommandMsg *)msg)->getCommandID();
-		playerID = ((NetAckBothCommandMsg *)msg)->getOriginalPlayerID();
-	} else {
-		return;
-	}
-
-	NetCommandRef *ref = m_pendingCommands->findMessage(commandID, playerID);
-	if (ref != NULL) {
-		//DEBUG_LOG(("ConnectionManager::processAckStage2 - removing command %d from the pending commands list.\n", commandID));
-		DEBUG_ASSERTCRASH((m_localSlot == playerID), ("Found a command in the pending commands list that wasn't originated by the local player"));
-		m_pendingCommands->removeMessage(ref);
-		deleteInstance(ref);
-		ref = NULL;
-	} else {
-		//DEBUG_LOG(("ConnectionManager::processAckStage2 - Couldn't find command %d from player %d in the pending commands list.\n", commandID, playerID));
-	}
-
-	ref = m_relayedCommands->findMessage(commandID, playerID);
-	if (ref != NULL) {
-		//DEBUG_LOG(("ConnectionManager::processAckStage2 - found command ID %d from player %d in the relayed commands list.\n", commandID, playerID));
-		UnsignedByte relay = ref->getRelay();
-		//DEBUG_LOG(("ConnectionManager::processAckStage2 - relay was %d and is now ", relay));
-		relay = relay & ~(1 << msg->getPlayerID());
-		//DEBUG_LOG(("%d\n", relay));
-		if (relay == 0) {
-			//DEBUG_LOG(("ConnectionManager::processAckStage2 - relay is 0, removing command from the relayed commands list.\n"));
-			m_relayedCommands->removeMessage(ref);
-			NetAckStage2CommandMsg *ackmsg = newInstance(NetAckStage2CommandMsg)(ref->getCommand());
-			sendLocalCommand(ackmsg, 1 << ackmsg->getOriginalPlayerID());
-			deleteInstance(ref);
-			ref = NULL;
-
-			ackmsg->detach();
-			ackmsg = NULL;
-		} else {
-			ref->setRelay(relay);
-		}
-	}
-}
-
-/**
- * We just got a "both" ack from someone.  So process it as both a stage 1 and stage 2 ack.
- */
-void ConnectionManager::processAck(NetCommandMsg *msg) {
-	if ((msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) || (msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH)) {
-		processAckStage1(msg);
-	}
-	if ((msg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) || (msg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH)) {
-		processAckStage2(msg);
-	}
-}
-
-/**
- * A player has just left our game. Delete their connection and frame data manager.
- * return codes are:
- * PLAYERLEAVECODE_UNKNOWN - player didn't have a valid slot number.
- * PLAYERLEAVECODE_CLIENT - someone in the game that wasn't us or the packet router.
- * PLAYERLEAVECODE_LOCAL - We are leaving the game, we could also be the packet router.
- * PLAYERLEAVECODE_PACKETROUTER - The packet router left the game.
- *
- * If we are leaving and are also the packet router, it will return the PLAYERLEAVECODE_LOCAL return code.
- */
-PlayerLeaveCode ConnectionManager::processPlayerLeave(NetPlayerLeaveCommandMsg *msg) {
-	UnsignedByte playerID = msg->getLeavingPlayerID();
-	if ((playerID != m_localSlot) && (m_connections[playerID] != NULL)) {
-		DEBUG_LOG(("ConnectionManager::processPlayerLeave() - setQuitting() on player %d on frame %d\n", playerID, TheGameLogic->getFrame()));
-		m_connections[playerID]->setQuitting();
-	}
-	DEBUG_ASSERTCRASH(m_frameData[playerID]->getIsQuitting() == FALSE, ("Player %d is already quitting", playerID));
-	if ((playerID != m_localSlot) && (m_frameData[playerID] != NULL) && (m_frameData[playerID]->getIsQuitting() == FALSE)) {
-		DEBUG_LOG(("ConnectionManager::processPlayerLeave - setQuitFrame on player %d for frame %d\n", playerID, TheGameLogic->getFrame()+1));
-		m_frameData[playerID]->setQuitFrame(TheGameLogic->getFrame() + FRAMES_TO_KEEP + 1);
-	}
-
-	if (playerID == m_localSlot)
-	{
-		// we're leaving, so mark our connections and frame datas to go away.
-		for (Int i=0; i<MAX_SLOTS; ++i)
-		{
-			if (m_connections[i])
-			{
-				m_connections[i]->clearCommandsExceptFrom(m_localSlot);
-				m_connections[i]->setQuitting();
-			}
-		}
-	}
-
-	PlayerLeaveCode code = disconnectPlayer(playerID);
-	DEBUG_LOG(("ConnectionManager::processPlayerLeave() - just disconnected player %d with ret code %d\n", playerID, code));
-	if (code == PLAYERLEAVECODE_PACKETROUTER)
-		resendPendingCommands();
-
-	PopulateInGameDiplomacyPopup();
-	return code;
-}
-
-UnsignedInt ConnectionManager::getPacketRouterFallbackSlot(Int packetRouterNumber) {
-	if ((packetRouterNumber >= 0) && (packetRouterNumber < MAX_SLOTS)) {
-		return m_packetRouterFallback[packetRouterNumber];
-	}
-	return MAX_SLOTS;
-}
-
-UnsignedInt ConnectionManager::getPacketRouterSlot() {
-	return m_packetRouterSlot;
-}
-
-Bool ConnectionManager::areAllQueuesEmpty(void) {
-	Bool retval = TRUE;
-	for (Int i = 0; (i < MAX_SLOTS) && retval; ++i) {
-		if (m_connections[i] != NULL) {
-			if (m_connections[i]->isQueueEmpty() == FALSE) {
-				//DEBUG_LOG(("ConnectionManager::areAllQueuesEmpty() - m_connections[%d] is not empty\n", i));
-				//m_connections[i]->debugPrintCommands();
-				retval = FALSE;
-			}
-		}
-	}
-
-	return retval;
-}
-
-Bool ConnectionManager::canILeave() {
-	return areAllQueuesEmpty();
-}
-
-/**
- * The local player is leaving. Tell the local player as well as the other players
- * to remove this player at the specified frame.
- */
-void ConnectionManager::handleLocalPlayerLeaving(UnsignedInt frame) {
-	NetPlayerLeaveCommandMsg *msg = newInstance(NetPlayerLeaveCommandMsg);
-
-	msg->setLeavingPlayerID(m_localSlot);
-	msg->setExecutionFrame(frame);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-	msg->setPlayerID(m_localSlot);
-
-	DEBUG_LOG(("ConnectionManager::handleLocalPlayerLeaving - Local player leaving on frame %d\n", frame));
-	DEBUG_ASSERTCRASH(m_packetRouterSlot >= 0, ("ConnectionManager::handleLocalPlayerLeaving, packet router is %d, illegal value.", m_packetRouterSlot));
-
-	sendLocalCommand(msg);
-
-	msg->detach();
-}
-
-/**
- * We just got a message that needs to be ack'd, so ack it!
- */
-void ConnectionManager::ackCommand(NetCommandRef *ref, UnsignedInt localSlot) {
-	NetCommandMsg *msg = ref->getCommand();
-	NetCommandMsg *ackmsg;
-	UnsignedShort commandID;
-	UnsignedByte originalPlayerID;
-	UnsignedByte sendRelay = 0;
-
-	// Make send relay a bitmask for the connections that the relay will actually be sent to. This is
-	// necessary to determine whether or not we have to wait to send a stage 2 ack.
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE))) {
-			sendRelay = sendRelay | (1 << i);
-		}
-	}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	Bool doDebug = (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ? TRUE : FALSE;
-#endif
-
-	sendRelay = sendRelay & ref->getRelay();
-	if (sendRelay == 0) {
-		NetAckBothCommandMsg *bothmsg = newInstance(NetAckBothCommandMsg)(ref->getCommand());
-		ackmsg = bothmsg;
-		commandID = bothmsg->getCommandID();
-		originalPlayerID = bothmsg->getOriginalPlayerID();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		if (doDebug) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::ackCommand - doing ack both for command %d from player %d\n", bothmsg->getCommandID(), bothmsg->getOriginalPlayerID()));
-		}
-#endif
-	} else {
-		NetAckStage1CommandMsg *stage1msg = newInstance(NetAckStage1CommandMsg)(ref->getCommand());
-		ackmsg = stage1msg;
-		commandID = stage1msg->getCommandID();
-		originalPlayerID = stage1msg->getOriginalPlayerID();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		if (doDebug) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::ackCommand - doing ack stage 1 for command %d from player %d\n", stage1msg->getCommandID(), stage1msg->getOriginalPlayerID()));
-		}
-#endif
-	}
-
-	ackmsg->setPlayerID(localSlot); // Tell the player who this ack is coming from.
-
-	if (CommandRequiresDirectSend(msg) && CommandRequiresAck(msg)) {
-		// Send this ack directly back to the sending player, don't go through the packet router.
-		if ((msg->getPlayerID() >= 0) && (msg->getPlayerID() < MAX_SLOTS)) {
-			if (m_connections[msg->getPlayerID()] != NULL) {
-				m_connections[msg->getPlayerID()]->sendNetCommandMsg(ackmsg, 1 << msg->getPlayerID());
-			}
-		}
-	} else {
-		// The local connection may be the packet router, in that case, the connection would be NULL.  So do something about it!
-		if ((m_packetRouterSlot >= 0) && (m_packetRouterSlot < MAX_SLOTS)) {
-			if (m_connections[m_packetRouterSlot] != NULL) {
-//				DEBUG_LOG(("ConnectionManager::ackCommand - acking command %d from player %d to packet router.\n", commandID, m_packetRouterSlot));
-				m_connections[m_packetRouterSlot]->sendNetCommandMsg(ackmsg, 1 << m_packetRouterSlot);
-			} else if (m_localSlot == m_packetRouterSlot) {
-				// we are the packet router, send the ack to the player that sent the command.
-				if ((msg->getPlayerID() >= 0) && (msg->getPlayerID() < MAX_SLOTS)) {
-					if (m_connections[msg->getPlayerID()] != NULL) {
-//						DEBUG_LOG(("ConnectionManager::ackCommand - acking command %d from player %d directly to player.\n", commandID, msg->getPlayerID()));
-						m_connections[msg->getPlayerID()]->sendNetCommandMsg(ackmsg, 1 << msg->getPlayerID());
-					} else {
-	//					DEBUG_ASSERTCRASH(m_connections[msg->getPlayerID()] != NULL, ("Connection to player is NULL"));
-					}
-				} else {
-					DEBUG_ASSERTCRASH((msg->getPlayerID() >= 0) && (msg->getPlayerID() < MAX_SLOTS), ("Command sent by an invalid player ID."));
-				}
-			} else {
-				DEBUG_ASSERTCRASH(m_connections[m_packetRouterSlot] != NULL, ("Connection to packet router is NULL"));
-			}
-		} else {
-			DEBUG_ASSERTCRASH((m_packetRouterSlot >= 0) && (m_packetRouterSlot < MAX_SLOTS), ("I don't know who the packet router is."));
-		}
-	}
-
-	ackmsg->detach();
-}
-
-/**
- * This is where we relay a command from one client to others (including ourselves).
- * This should only be done by the current packet router.
- */
-void ConnectionManager::sendRemoteCommand(NetCommandRef *msg) {
-	UnsignedByte actualRelay = 0;
-	if (msg->getCommand() == NULL) {
-		return;
-	}
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - sending net command %d of type %s from player %d, relay is 0x%x\n",
-		msg->getCommand()->getID(), GetAsciiNetCommandType(msg->getCommand()->getNetCommandType()).str(), msg->getCommand()->getPlayerID(), msg->getRelay()));
-
-	UnsignedByte relay = msg->getRelay();
-	if ((relay & (1 << m_localSlot)) && (m_frameData[msg->getCommand()->getPlayerID()] != NULL)) {
-		if (IsCommandSynchronized(msg->getCommand()->getNetCommandType())) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - adding net command of type %s to player %d for frame %d\n", GetAsciiNetCommandType(msg->getCommand()->getNetCommandType()).str(), msg->getCommand()->getPlayerID(), msg->getCommand()->getExecutionFrame()));
-			m_frameData[msg->getCommand()->getPlayerID()]->addNetCommandMsg(msg->getCommand());
-		}
-	}
-
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if ((relay & (1 << i)) && ((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE))) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendRemoteCommand - relaying command %d to player %d\n", msg->getCommand()->getID(), i));
-			m_connections[i]->sendNetCommandMsg(msg->getCommand(), 1 << i);
-			actualRelay = actualRelay | (1 << i);
-		}
-	}
-
-	if ((actualRelay != 0) && (CommandRequiresAck(msg->getCommand()) == TRUE)) {
-		NetCommandRef *ref = m_relayedCommands->addMessage(msg->getCommand());
-		if (ref != NULL) {
-			ref->setRelay(actualRelay);
-			//DEBUG_LOG(("ConnectionManager::sendRemoteCommand - command %d added to relayed commands with relay %d\n", msg->getCommand()->getID(), ref->getRelay()));
-		}
-	}
-
-	// Do some metrics to find the minimum packet arrival cushion.
-	if (IsCommandSynchronized(msg->getCommand()->getNetCommandType())) {
-//		DEBUG_LOG(("ConnectionManager::sendRemoteCommand - about to call allCommandsReady\n"));
-		if (allCommandsReady(msg->getCommand()->getExecutionFrame(), TRUE)) {
-			UnsignedInt cushion = msg->getCommand()->getExecutionFrame() - TheGameLogic->getFrame();
-			if ((cushion < m_smallestPacketArrivalCushion) || (m_smallestPacketArrivalCushion == -1)) {
-				m_smallestPacketArrivalCushion = cushion;
-			}
-			m_frameMetrics.addCushion(cushion);
-//			DEBUG_LOG(("Adding %d to cushion for frame %d\n", cushion, msg->getCommand()->getExecutionFrame()));
-		}
-	}
-}
-
-/**
- * ConnectionManager::update
- * Update the connections. Tell them to do the receive and send.  Also relay
- * commands to their final destinations as necessary.
- */
-void ConnectionManager::update(Bool isInGame) {
-//
-// 1. do this
-// 2. do that
-// 3. do something else
-// 4. blow something up
-// 5. bust some cap
-//
-
-	if ((m_localAddr == 0) || (m_localPort == 0)) {
-		// we don't have a local address or port yet, this is bad.
-		DEBUG_ASSERTCRASH((m_localAddr != 0) && (m_localPort != 0), ("ConnectionManager doesn't have a local address."));
-		return;
-	}
-
-	m_transport->doRecv();
-
-	if (isInGame) {
-		m_disconnectManager->update(this);
-	}
-
-	// take the packets from the transport, break them up into commands, and give them to the appropriate connections.
-	doRelay();
-
-	// send any necessary keep-alive packets.
-	doKeepAlive();
-
-	for (Int i = 0; i < NUM_CONNECTIONS; ++i) {
-		if (m_connections[i] != NULL) {
-			/*
-			if (m_connections[i]->isQueueEmpty() == FALSE) {
-//				DEBUG_LOG(("ConnectionManager::update - calling doSend on connection %d\n", i));
-			}
-			*/
-
-			m_connections[i]->doSend();
-
-			if (m_connections[i]->isQuitting() && m_connections[i]->isQueueEmpty())
-			{
-				DEBUG_LOG(("ConnectionManager::update - deleting connection for slot %d\n", i));
-				deleteInstance(m_connections[i]);
-				m_connections[i] = NULL;
-			}
-		}
-
-		if ((m_frameData[i] != NULL) && (m_frameData[i]->getIsQuitting() == TRUE)) {
-			if (m_frameData[i]->getQuitFrame() == TheGameLogic->getFrame()) {
-				DEBUG_LOG(("ConnectionManager::update - deleting frame data for slot %d on quitting frame %d\n", i, m_frameData[i]->getQuitFrame()));
-				deleteInstance(m_frameData[i]);
-				m_frameData[i] = NULL;
-			}
-		}
-	}
-
-	m_transport->doSend();
-}
-
-void ConnectionManager::updateRunAhead(Int oldRunAhead, Int frameRate, Bool didSelfSlug, Int nextExecutionFrame) {
-	static time_t lasttimesent = 0;
-	time_t curTime = timeGetTime();
-
-	if ((lasttimesent == 0) || ((curTime - lasttimesent) > TheGlobalData->m_networkRunAheadMetricsTime)) {
-		if (m_localSlot == m_packetRouterSlot) {
-			// We are the packet router, time to compute a new run ahead for this game.
-			m_latencyAverages[m_localSlot] = m_frameMetrics.getAverageLatency();
-
-			// since we are now using the display frame rate rather than the logic frame rate to get our average FPS,
-			// it doesn't make sense to send the desired logic frame rate if we "slugged" ourself.
-//			if (didSelfSlug) {
-//				m_fpsAverages[m_localSlot] = frameRate;
-//			} else {
-				m_fpsAverages[m_localSlot] = m_frameMetrics.getAverageFPS();
-//			}
-			if (didSelfSlug) {
-				//DEBUG_LOG(("ConnectionManager::updateRunAhead - local player run ahead metrics, fps = %d, actual fps = %d, latency = %f, didSelfSlug = true\n", m_fpsAverages[m_localSlot], m_frameMetrics.getAverageFPS(), m_latencyAverages[m_localSlot]));
-			} else {
-				//DEBUG_LOG(("ConnectionManager::updateRunAhead - local player run ahead metrics, fps = %d, latency = %f, didSelfSlug = false\n", m_fpsAverages[m_localSlot], m_latencyAverages[m_localSlot]));
-			}
-			Int minFps;
-			Int minFpsPlayer;
-			getMinimumFps(minFps, minFpsPlayer);
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::updateRunAhead - max latency = %f, min fps = %d, min fps player = %d old FPS = %d\n", getMaximumLatency(), minFps, minFpsPlayer, frameRate));
-			if ((minFps >= ((frameRate * 9) / 10)) && (minFps < frameRate)) {
-				// if the minimum fps is within 10% of the desired framerate, then keep the current minimum fps.
-				minFps = frameRate;
-			}
-			if (minFps < 5) {
-				minFps = 5; // Absolutely do not run below 5 fps.
-			}
-			if (minFps > TheGlobalData->m_framesPerSecondLimit) {
-				minFps = TheGlobalData->m_framesPerSecondLimit; // Cap to 30 FPS.
-			}
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::updateRunAhead - minFps after adjustment is %d\n", minFps));
-			Int newRunAhead = (Int)((getMaximumLatency() / 2.0) * (Real)minFps);
-			newRunAhead += (newRunAhead * TheGlobalData->m_networkRunAheadSlack) / 100; // Add in 10% of slack to the run ahead in case of network hiccups.
-			if (newRunAhead < MIN_RUNAHEAD) {
-				newRunAhead = MIN_RUNAHEAD; // make sure its at least MIN_RUNAHEAD.
-			}
-
-			if (newRunAhead > (MAX_FRAMES_AHEAD / 2)) {
-				newRunAhead = MAX_FRAMES_AHEAD / 2; // dont let run ahead get out of hand.
-			}
-
-			NetRunAheadCommandMsg *msg = newInstance(NetRunAheadCommandMsg);
-			msg->setPlayerID(m_localSlot);
-			if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-				msg->setID(GenerateNextCommandID());
-			}
-
-			// needs to be set to the greater of getExecutionFrame and TheGameLogic->getFrame() + oldRunAhead
-			// This prevents the case of...
-			// run ahead starts at 30
-			// run ahead changes to 10 at frame 31 (the command was created on frame 1)
-			// run ahead changes to 10 at frame 56 (the command was created on frame 46)
-			// notice that 56 is within the previous run ahead of 30 which has triggered
-			// the frame command count being set for frames 1 through 60 since run ahead
-			// didn't change for the first time till frame 31.  This creates an extra command
-			// for frame 56 that isn't accounted for in the frame command count that is sent
-			// out in the NetFrameCommandMsg.  sheesh.
-			if (nextExecutionFrame > (TheGameLogic->getFrame() + oldRunAhead)) {
-				msg->setExecutionFrame(nextExecutionFrame);
-			} else {
-				msg->setExecutionFrame(TheGameLogic->getFrame() + oldRunAhead);
-			}
-
-			msg->setRunAhead(newRunAhead);
-			msg->setFrameRate(minFps);
-			//DEBUG_LOG(("ConnectionManager::updateRunAhead - new run ahead = %d, new frame rate = %d, execution frame %d\n", newRunAhead, minFps, msg->getExecutionFrame()));
-			sendLocalCommand(msg, 0xff ^ (1 << minFpsPlayer)); // Send the packet to everyone but the lowest FPS player.
-
-			NetRunAheadCommandMsg *msg2 = newInstance(NetRunAheadCommandMsg);
-			msg2->setPlayerID(m_localSlot);
-			if (DoesCommandRequireACommandID(msg2->getNetCommandType())) {
-				/*
-				 * Ok there needs to be a big friggin comment about this change...
-				 * What happens is that the two run ahead commands get sent to different players
-				 * using different command ID's.  So player 1 has the run ahead command as command x
-				 * and player 2 has the command as command x+1.  This is all good except when it comes
-				 * to players being disconnected.  With the new disconnect scheme player 1 could potentially
-				 * send his run ahead command to player 2 (or the other way around) to let player 2 catch
-				 * up to him.  So if player 2 has his run ahead command as x+1 and now he gets player 1's
-				 * command list with the run ahead command listed as command x, he won't see them as being
-				 * the same command and will now think he has two different run ahead commands for that frame
-				 * and thus his command list will have an extra command and he will never be able to recover.
-				 * So to fix this we have to use the same command ID for both run ahead commands.  That way
-				 * when the commands are copied places for the disconnect screen they will be seen as the
-				 * same command, and all will be good.
-				 */
-//				msg2->setID(GenerateNextCommandID());
-				msg2->setID(msg->getID());
-			}
-			if (nextExecutionFrame > (TheGameLogic->getFrame() + oldRunAhead)) {
-				msg2->setExecutionFrame(nextExecutionFrame);
-			} else {
-				msg2->setExecutionFrame(TheGameLogic->getFrame() + oldRunAhead);
-			}
-
-			// Let the player with the slowest FPS run a little faster than the other computers...
-			// just in case they are able to.  Then we might be able to run the game faster which would be good.
-			Int newMinFps = (minFps * 11) / 10;
-			if (newMinFps == minFps) {
-				newMinFps = minFps + 1;
-			}
-			if (newMinFps > 30) {
-				newMinFps = 30; // Cap FPS to 30.
-			}
-			msg2->setRunAhead(newRunAhead);
-			msg2->setFrameRate(newMinFps);
-
-			sendLocalCommand(msg2, 1 << minFpsPlayer);
-
-			msg->detach();
-			msg2->detach();
-		} else {
-			// We are not the packet router, send our metrics info to the packet router.
-			NetRunAheadMetricsCommandMsg *msg = newInstance(NetRunAheadMetricsCommandMsg);
-			msg->setPlayerID(m_localSlot);
-			if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-				msg->setID(GenerateNextCommandID());
-			}
-			msg->setAverageLatency(m_frameMetrics.getAverageLatency());
-
-			// see above for explanation.
-//			if (didSelfSlug) {
-//				msg->setAverageFps(frameRate);
-//			} else {
-				msg->setAverageFps(m_frameMetrics.getAverageFPS());
-//			}
-			if (didSelfSlug) {
-				//DEBUG_LOG(("ConnectionManager::updateRunAhead - average latency = %f, average fps = %d, actual fps = %d, didSelfSlug = true\n", m_frameMetrics.getAverageLatency(), m_frameMetrics.getAverageFPS(), m_frameMetrics.getAverageFPS()));
-			} else {
-				//DEBUG_LOG(("ConnectionManager::updateRunAhead - average latency = %f, average fps = %d, didSelfSlug = false\n", m_frameMetrics.getAverageLatency(), m_frameMetrics.getAverageFPS()));
-			}
-			m_connections[m_packetRouterSlot]->sendNetCommandMsg(msg, 1 << m_packetRouterSlot);
-			msg->detach();
-		}
-		lasttimesent = curTime;
-	}
-}
-
-Real ConnectionManager::getMaximumLatency() {
-	// This works for 2 player games because the latency for the packet router is always 0.
-	Real lat1 = 0.0;
-	Real lat2 = 0.0;
-
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (isPlayerConnected(i)) {
-			if (m_latencyAverages[i] != 0.0) {
-				if (m_latencyAverages[i] > lat1) {
-					lat2 = lat1;
-					lat1 = m_latencyAverages[i];
-				} else if (m_latencyAverages[i] > lat2) {
-					lat2 = m_latencyAverages[i];
-				}
-			}
-		}
-	}
-
-	return (lat1 + lat2);
-}
-
-void ConnectionManager::getMinimumFps(Int &minFps, Int &minFpsPlayer) {
-	minFps = -1;
-	minFpsPlayer = -1;
-//	DEBUG_LOG(("ConnectionManager::getMinimumFps -"));
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if ((m_connections[i] != NULL) || (i == m_localSlot)) {
-//			DEBUG_LOG((" %d: %d,", i, m_fpsAverages[i]));
-			if (m_fpsAverages[i] != -1) {
-				if ((minFps == -1) || (m_fpsAverages[i] < minFps)) {
-					minFps = m_fpsAverages[i];
-					minFpsPlayer = i;
-				}
-			}
-		}
-	}
-//	DEBUG_LOG(("\n"));
-}
-
-UnsignedInt ConnectionManager::getMinimumCushion() {
-	return m_frameMetrics.getMinimumCushion();
-}
-
-/**
- * The commands for the given frame are all ready, time to send out our command count for that frame.
- */
-void ConnectionManager::processFrameTick(UnsignedInt frame) {
-	if ((m_frameData[m_localSlot] == NULL) || (m_frameData[m_localSlot]->getIsQuitting() == TRUE)) {
-		// if the local frame data stuff is NULL, we must be leaving the game.
-		return;
-	}
-	UnsignedShort commandCount = m_frameData[m_localSlot]->getCommandCount(frame);
-	NetFrameCommandMsg *msg = newInstance(NetFrameCommandMsg);
-	msg->setExecutionFrame(frame);
-	msg->setCommandCount(commandCount);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-	msg->setPlayerID(m_localSlot);
-
-	m_frameMetrics.doPerFrameMetrics(frame);
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::processFrameTick - sending frame info for frame %d, ID %d, command count %d\n", frame, msg->getID(), commandCount));
-
-	sendLocalCommand(msg, 0xff & ~(1 << m_localSlot));
-
-	msg->detach();
-}
-
-/**
- * Set the local address.
- */
-void ConnectionManager::setLocalAddress(UnsignedInt ip, UnsignedInt port) {
-	DEBUG_LOG(("ConnectionManager::setLocalAddress() - local address is %X:%d\n", ip, port));
-	m_localAddr = ip;
-	m_localPort = port;
-}
-
-/**
- * Initialize the transport object
- */
-void ConnectionManager::initTransport() {
-	DEBUG_ASSERTCRASH((m_transport == NULL), ("m_transport already exists when trying to init it."));
-	DEBUG_LOG(("ConnectionManager::initTransport - Initializing Transport\n"));
-	if (m_transport != NULL) {
-		delete m_transport;
-		m_transport = NULL;
-	}
-	m_transport = new Transport;
-	m_transport->reset();
-	m_transport->init(m_localAddr, m_localPort);
-}
-
-/**
- * This is where the commands from the local client are sent to the other clients in
- * the game.  This is also where the local commands are put into the frame data for
- * future execution.
- */
-void ConnectionManager::sendLocalGameMessage(GameMessage *msg, UnsignedInt frame) {
-	UnsignedShort currentID = 0;
-	if (DoesCommandRequireACommandID(NETCOMMANDTYPE_GAMECOMMAND)) {
-		currentID = GenerateNextCommandID();
-	}
-
-	NetCommandMsg *netmsg = newInstance(NetGameCommandMsg)(msg);
-	netmsg->setExecutionFrame(frame);
-	netmsg->setPlayerID(m_localSlot);
-	netmsg->setID(currentID);
-
-	sendLocalCommand(netmsg);
-
-	netmsg->detach();
-}
-
-/**
- * This is a NetCommandMsg that originated on the local computer. Send this to everyone specified
- * in the relay field.  Commands sent in this way go through the packet router.
- */
-void ConnectionManager::sendLocalCommand(NetCommandMsg *msg, UnsignedByte relay /* = 0xff by default*/) {
-	if (CommandRequiresDirectSend(msg) || (m_packetRouterSlot < 0) || (m_packetRouterSlot >= MAX_SLOTS) || (m_connections[m_packetRouterSlot] == NULL)) {
-		sendLocalCommandDirect(msg, relay);
-		return;
-	}
-	msg->attach();
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommand - sending net command %d of type %s\n", msg->getID(),
-		GetAsciiNetCommandType(msg->getNetCommandType()).str()));
-
-	if (relay & (1 << m_localSlot)) {
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommand - adding net command of type %s to player %d for frame %d\n", GetAsciiNetCommandType(msg->getNetCommandType()).str(), msg->getPlayerID(), msg->getExecutionFrame()));
-		m_frameData[m_localSlot]->addNetCommandMsg(msg);
-	}
-
-	// Send the packet to everyone else
-	if (m_localSlot == m_packetRouterSlot) {
-		// I am the packet router, I need to send this packet to everyone individually.
-		for (Int i = 0; i < MAX_SLOTS; ++i) {
-			// Send it to all open connections.
-			if (((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE)) && (relay & (1 << i))) {
-				// Set the relay mask to only go to this player so he knows not to relay it to anyone else.
-				UnsignedByte temprelay = 1 << i;
-				m_connections[i]->sendNetCommandMsg(msg, temprelay); // This will create a new copy of netmsg for this connection.
-			}
-		}
-	} else {
-		// Send the command to everyone else via the packet router.
-		UnsignedByte temprelay = relay & ~(1 << m_localSlot);	// Tell the packet router to relay the message to everyone but myself.
-														// Hopefully the packet router is smart enough to not send it
-														// to slots that are not in the game.
-
-		m_connections[m_packetRouterSlot]->sendNetCommandMsg(msg, temprelay); // This will create a new copy of netmsg for this connection.
-
-		if (CommandRequiresAck(msg)) {
-			NetCommandRef *ref = m_pendingCommands->addMessage(msg);
-			//DEBUG_LOG(("ConnectionManager::sendLocalCommand - added command %d to pending commands list.\n", msg->getID()));
-			if (ref != NULL) {
-				ref->setRelay(temprelay);
-			}
-		}
-	}
-
-	msg->detach(); // detach from the command msg.
-}
-
-/**
- * This is a NetCommandMsg that originated on the local computer.  Send this to everyone specified
- * in the relay field.  Commands sent in this way do not go through the packet router.
- */
-void ConnectionManager::sendLocalCommandDirect(NetCommandMsg *msg, UnsignedByte relay) {
-	msg->attach();
-
-	if (((relay & (1 << m_localSlot)) != 0) && (m_frameData[m_localSlot] != NULL)) {
-		if (IsCommandSynchronized(msg->getNetCommandType()) == TRUE) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - adding net command of type %s to player %d for frame %d\n", GetAsciiNetCommandType(msg->getNetCommandType()).str(), msg->getPlayerID(), msg->getExecutionFrame()));
-			m_frameData[m_localSlot]->addNetCommandMsg(msg);
-		}
-	}
-
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if ((relay & (1 << i)) != 0) {
-			if ((m_connections[i] != NULL) && (m_connections[i]->isQuitting() == FALSE)) {
-				UnsignedByte temprelay = 1 << i;
-				m_connections[i]->sendNetCommandMsg(msg, temprelay);
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendLocalCommandDirect - Sending direct command %d of type %s to player %d\n", msg->getID(), GetAsciiNetCommandType(msg->getNetCommandType()).str(), i));
-			}
-		}
-	}
-
-	msg->detach();
-}
-
-Int commandsReadyDebugSpewage = 0;
-
-/**
- * Returns true if all the commands for the given frame are ready to be executed.
- */
-Bool ConnectionManager::allCommandsReady(UnsignedInt frame, Bool justTesting /* = FALSE */) {
-	Bool retval = TRUE;
-	FrameDataReturnType frameRetVal = FRAMEDATA_NOTREADY;
-//	retval = FALSE;  // ****for testing purposes only!!!!!!****
-	Int i = 0;
-	for (; (i < MAX_SLOTS) && retval; ++i) {
-		if ((m_frameData[i] != NULL) && (m_frameData[i]->getIsQuitting() == FALSE)) {
-/*
-			if (!(m_frameData[i]->allCommandsReady(frame, (frame != commandsReadyDebugSpewage) && (justTesting == FALSE)))) {
-				if ((frame != commandsReadyDebugSpewage) && (justTesting == FALSE)) {
-					DEBUG_LOG(("ConnectionManager::allCommandsReady, frame %d player %d not ready.\n", frame, i));
-					commandsReadyDebugSpewage = frame;
-				}
-				retval = FALSE;
-			} else {
-//				DEBUG_LOG(("ConnectionManager::allCommandsReady, frame %d player %d is ready.\n", frame, i));
-			}
-*/
-
-			frameRetVal = m_frameData[i]->allCommandsReady(frame, (frame != commandsReadyDebugSpewage) && (justTesting == FALSE));
-			if (frameRetVal == FRAMEDATA_NOTREADY) {
-				retval = FALSE;
-			} else if (frameRetVal == FRAMEDATA_RESEND) {
-				requestFrameDataResend(i, frame);
-				retval = FALSE;
-			}
-		}
-	}
-
-	if (frameRetVal == FRAMEDATA_RESEND) {
-		// this frame's data is really screwed up, we need to clean it out so it can be resent to us.
-		for (i = 0; i < MAX_SLOTS; ++i) {
-			if ((m_frameData[i] != NULL) && (i != m_localSlot)) {
-				m_frameData[i]->resetFrame(frame, FALSE);
-			}
-		}
-	}
-
-	if ((retval == TRUE) && (justTesting == FALSE)) {
-		m_disconnectManager->allCommandsReady(TheGameLogic->getFrame(), this);
-		retval = m_disconnectManager->allowedToContinue(); // allow the disconnect manager to keep us on this frame
-																											// in case we are waiting for a new packet router or something.
-	}
-
-	return retval;
-}
-
-void ConnectionManager::handleAllCommandsReady(void)
-{
-	m_disconnectManager->allCommandsReady(TheGameLogic->getFrame(), this, FALSE);
-}
-
-
-/**
- * Only call this after making sure that all the commands are there for this frame.
- * After calling this the commands for this frame will be removed from the connection.
- *
- * BGC - To account for the case where the host disconnects without sending the
- *       same commands to all players, we now have to keep around the last 'run ahead'
- *       frames so we can potentially send those commands to the other players in the
- *       game so they can catch up.
- */
-NetCommandList *ConnectionManager::getFrameCommandList(UnsignedInt frame) 
-{
-	NetCommandList *retlist = newInstance(NetCommandList);
-	retlist->init();
-
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_frameData[i] != NULL) {
-			retlist->appendList(m_frameData[i]->getFrameCommandList(frame));
-			if (frame > FRAMES_TO_KEEP) {
-				m_frameData[i]->resetFrame(frame - FRAMES_TO_KEEP);	// After getting the commands for that frame from this
-													// FrameDataManager object, we need to tell it that we're
-													// done with the messages for that frame.
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("getFrameCommandList - called reset frame on player %d for frame %d\n", i, frame - FRAMES_TO_KEEP));
-			}
-		}
-	}
-
-	return retlist; // retlist deallocated by calling function.
-}
-
-void ConnectionManager::setFrameGrouping(time_t frameGrouping) {
-	// Since we are the packet router, we should send more packets per second since we
-	// may become the latency bottleneck for sending packets from one player to the next.
-	// This is probably ok since the packet router should have the fastest connection of all
-	// the players in the game.
-	if (m_localSlot == m_packetRouterSlot) {
-		frameGrouping = frameGrouping / 2;
-	}
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_connections[i] != NULL) {
-			m_connections[i]->setFrameGrouping(frameGrouping);
-		}
-	}
-}
-
-/*
-void ConnectionManager::determineRouterFallbackPlan() {
-	memset(m_packetRouterFallback, 0, sizeof(m_packetRouterFallback));
-	Int curnum = 1;
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_connections[i] != NULL) {
-			m_packetRouterFallback[i] = curnum;
-			if (curnum == 1) {
-				m_packetRouterSlot = i;
-			}
-			++curnum;
-		}
-	}
-}
-*/
-
-void ConnectionManager::doKeepAlive() {
-	static Int nextIndex = 0;
-	static time_t startTime = 0;
-
-	time_t curTime = timeGetTime();
-
-	if (startTime == 0) {
-		startTime = curTime;
-		return;
-	}
-
-	time_t numSeconds = (curTime - startTime) / 1000;
-
-	while ((nextIndex <= numSeconds) && (nextIndex < MAX_SLOTS)) {
-//		DEBUG_LOG(("ConnectionManager::doKeepAlive - trying to send keep alive message to player %d\n", nextIndex));
-		if (m_connections[nextIndex] != NULL) {
-			NetKeepAliveCommandMsg *msg = newInstance(NetKeepAliveCommandMsg);
-			msg->setPlayerID(m_localSlot);
-			if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
-				msg->setID(GenerateNextCommandID());
-			}
-//			DEBUG_LOG(("ConnectionManager::doKeepAlive - sending keep alive message to player %d\n", nextIndex));
-			sendLocalCommandDirect(msg, 1 << nextIndex);
-			msg->detach();
-		}
-		++nextIndex;
-	}
-	if (nextIndex == MAX_SLOTS) {
-		nextIndex = 0;
-		startTime = curTime;
-	}
-}
-
-PlayerLeaveCode ConnectionManager::disconnectPlayer(Int slot) {
-	// Need to do the deletion of the slot's connection and frame data here.
-	PlayerLeaveCode retval = PLAYERLEAVECODE_CLIENT;
-	DEBUG_LOG(("ConnectionManager::disconnectPlayer - disconnecting slot %d on frame %d\n", slot, TheGameLogic->getFrame()));
-
-	if ((slot < 0) || (slot >= MAX_SLOTS)) {
-		return PLAYERLEAVECODE_UNKNOWN;
-	}
-
-	if (TheGameInfo)
-	{
-		GameSlot *gSlot = TheGameInfo->getSlot( slot );
-		if (gSlot && !gSlot->lastFrameInGame())
-		{
-			DEBUG_LOG(("ConnectionManager::disconnectPlayer(%d) - slot is last in the game on frame %d\n",
-				slot, TheGameLogic->getFrame()));
-			gSlot->setLastFrameInGame(TheGameLogic->getFrame());
-		}
-	}
-
-	UnicodeString unicodeName;
-	unicodeName = getPlayerName(slot);
-	if (unicodeName.getLength() > 0 && m_connections[slot]) {
-		TheInGameUI->message("Network:PlayerLeftGame", unicodeName.str());
-
-		// People are boneheads. Also play a sound
-		static AudioEventRTS leftGameSound("GUIMessageReceived");
-		TheAudio->addAudioEvent(&leftGameSound);
-	}
-
-	if ((m_frameData[slot] != NULL) && (m_frameData[slot]->getIsQuitting() == FALSE)) {
-		DEBUG_LOG(("ConnectionManager::disconnectPlayer - deleting player %d frame data\n", slot));
-		deleteInstance(m_frameData[slot]);
-		m_frameData[slot] = NULL;
-	}
-
-	if (m_connections[slot] != NULL && !m_connections[slot]->isQuitting()) {
-		DEBUG_LOG(("ConnectionManager::disconnectPlayer - deleting player %d connection\n", slot));
-		deleteInstance(m_connections[slot]);
-		m_connections[slot] = NULL;
-	}
-
-//	if (playerID == m_localSlot) {
-//		TheMessageStream->appendMessage(GameMessage::MSG_CLEAR_GAME_DATA);
-//	}
-
-	if (slot == m_packetRouterSlot) {
-		Int index = 0;
-		while ((index < (MAX_SLOTS-1)) && (m_packetRouterFallback[index] != m_packetRouterSlot)) {
-			++index;
-		}
-		++index;
-		m_packetRouterSlot = m_packetRouterFallback[index];
-		DEBUG_LOG(("Packet router left.  New packet router is slot %d\n", m_packetRouterSlot));
-		retval = PLAYERLEAVECODE_PACKETROUTER;
-	}
-	if (m_localSlot == slot) {
-		DEBUG_LOG(("Disconnecting self\n"));
-		retval = PLAYERLEAVECODE_LOCAL;
-	}
-
-	// Take the player out of the fallback plan
-	Int fallbackindex = 0;
-	while ((fallbackindex < MAX_SLOTS) && (m_packetRouterFallback[fallbackindex] != slot)) {
-		++fallbackindex;
-	}
-
-	for (Int i = fallbackindex; i < MAX_SLOTS-1; ++i) {
-		m_packetRouterFallback[i] = m_packetRouterFallback[i+1];
-	}
-	m_packetRouterFallback[MAX_SLOTS-1] = -1;
-
-	return retval;
-}
-
-void ConnectionManager::quitGame() {
-	// Need to do the NetDisconnectPlayerCommandMsg creation and sending here.
-	NetDisconnectPlayerCommandMsg *disconnectMsg = newInstance(NetDisconnectPlayerCommandMsg);
-	disconnectMsg->setDisconnectSlot(m_localSlot);
-	disconnectMsg->setPlayerID(m_localSlot);
-	if (DoesCommandRequireACommandID(disconnectMsg->getNetCommandType())) {
-		disconnectMsg->setID(GenerateNextCommandID());
-	}
-	//DEBUG_LOG(("ConnectionManager::disconnectLocalPlayer - about to send disconnect command\n"));
-	sendLocalCommandDirect(disconnectMsg, 0xff ^ (1 << m_localSlot));
-
-	//DEBUG_LOG(("ConnectionManager::disconnectLocalPlayer - about to flush connections\n"));
-	flushConnections(); // need to do this so our packet actually gets sent before the connections are deleted.
-	//DEBUG_LOG(("ConnectionManager::disconnectLocalPlayer - done flushing connections\n"));
-
-	disconnectMsg->detach();
-
-	disconnectLocalPlayer();
-}
-
-void ConnectionManager::disconnectLocalPlayer() {
-	// kill the frame data and the connections for all the other players.
-	DEBUG_LOG(("ConnectionManager::disconnectLocalPlayer()\n"));
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (i != m_localSlot) {
-			disconnectPlayer(i);
-		}
-	}
-}
-
-/**
- * Takes all the commands that are ready to send and sends them right now.
- */
-void ConnectionManager::flushConnections() {
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_connections[i] != NULL) {
-//			DEBUG_LOG(("ConnectionManager::flushConnections - flushing connection to player %d\n", i));
-			/*
-			if (m_connections[i]->isQueueEmpty()) {
-//				DEBUG_LOG(("ConnectionManager::flushConnections - connection queue empty\n"));
-			}
-			*/
-			m_connections[i]->doSend();
-		}
-	}
-
-	if (m_transport != NULL) {
-		m_transport->doSend();
-	}
-}
-
-void ConnectionManager::resendPendingCommands() {
-	//DEBUG_LOG(("ConnectionManager::resendPendingCommands()\n"));
-	if (m_pendingCommands == NULL) {
-		return;
-	}
-
-	NetCommandRef *ref = m_pendingCommands->getFirstMessage();
-	while (ref != NULL) {
-		//DEBUG_LOG(("ConnectionManager::resendPendingCommands - resending command %d\n", ref->getCommand()->getID()));
-		sendLocalCommand(ref->getCommand(), ref->getRelay());
-		ref = ref->getNext();
-	}
-}
-
-UnsignedInt ConnectionManager::getLocalPlayerID() {
-	return m_localSlot;
-}
-
-UnicodeString ConnectionManager::getPlayerName(Int playerNum) {
-	UnicodeString retval;
-	if( playerNum == m_localSlot ) {
-		retval = m_localUser->GetName();
-	}	else if (((m_connections[playerNum] != NULL) && (m_connections[playerNum]->isQuitting() == FALSE))) {
-		retval = m_connections[playerNum]->getUser()->GetName();
-	}
-	return retval;
-}
-
-/**
- * Take a user list and make connections and frame data manager objects for each of the players.
- * For now, this is also how we'll determine the packet router fallback plan.
- */
-void ConnectionManager::parseUserList(const GameInfo *game)
-{
-	if (!game)
-		return;
-
-	Int i;
-	Int numUsers = 0;
-	m_localSlot = -1;
-	DEBUG_LOG(("Local slot is %d\n", game->getLocalSlotNum()));
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = game->getConstSlot(i);	// badness, but since we cast right back to const, we should be ok
-		if (slot->isHuman())
-		{
-			if (game->getLocalSlotNum() == i)
-			{
-				m_localSlot = i;
-   			m_localUser->setName(slot->getName());
-			}
-
-			if (m_localSlot != i)
-			{
-				m_connections[i] = newInstance(Connection)();
-				m_connections[i]->init();
-				m_connections[i]->attachTransport(m_transport);
-//				UnsignedShort port = (TheNAT)?TheNAT->getSlotPort(i):8088;
-				UnsignedShort port = slot->getPort();
-				m_connections[i]->setUser(newInstance(User)(slot->getName(), slot->getIP(), port));
-				m_frameData[i] = newInstance(FrameDataManager)(FALSE);
-				DEBUG_LOG(("Remote user is at %X:%d\n", slot->getIP(), slot->getPort()));
-			}
-			else
-			{
-				DEBUG_LOG(("Local user is %d (%X:%d)\n", m_localSlot, slot->getIP(), slot->getPort()));
-				m_frameData[i] = newInstance(FrameDataManager)(TRUE);
-			}
-			m_frameData[i]->init();
-			m_frameData[i]->reset();
-
-			m_packetRouterFallback[numUsers] = i;
-
-			++numUsers;
-
-		}
-	}
-#ifdef MEMORYPOOL_DEBUG
-	TheMemoryPoolFactory->debugSetInitFillerIndex(m_localSlot);
-#endif
-
-	/*
-	if ( numUsers < 2 || m_localSlot == -1 )
-	{
-		DEBUG_CRASH(("FAILED parseUserList - network game won't work as expected\n"));
-		return;
-	}
-
-	char * list = strdup(buf);
-	char *listPtr = list;
-	if (!list)
-		return;
-
-	User users[MAX_SLOTS];
-	int localUser = -1;
-	int i;
-
-	for (i=0; i<MAX_SLOTS; i++)
-	{
-		users[i].setName("");
-	}
-
-	char *userStr, *nameStr, *addrStr, *portStr;
-	AsciiString addrAsciiStr;
-
-	char *listPos;
-
-	DEBUG_LOG(("ConnectionManager::parseUserList - looking for local user at %d.%d.%d.%d:%d\n",
-		PRINTF_IP_AS_4_INTS(m_localAddr),
-		m_localPort));
-
-	int numUsers = 0;
-	while ( (userStr=strtok_r(listPtr, ",", &listPos)) != NULL )
-	{
-		listPtr = NULL;
-		char *pos = NULL;
-
-		nameStr = strtok_r(userStr, "@", &pos);
-		addrStr = strtok_r(NULL, "@:", &pos);
-		portStr = strtok_r(NULL, ": ", &pos);
-
-		if (!portStr || numUsers >= MAX_SLOTS)
-		{
-			DEBUG_LOG(("ConnectionManager::parseUserList - (numUsers = %d) FAILED parseUserList with list [%s]\n", numUsers, buf));
-			return;
-		}
-
-		addrAsciiStr = addrStr;
-		UnsignedInt addr = ResolveIP(addrAsciiStr);
-		UnsignedInt port = atoi(portStr);
-
-//		if ((m_localAddr != addr) || (m_localPort != port)) {
-		if (loginName.compare(nameStr) != 0) {
-			m_connections[numUsers] = newInstance(Connection)();
-			m_connections[numUsers]->init();
-			m_connections[numUsers]->attachTransport(m_transport);
-			m_connections[numUsers]->setUser(newInstance(User)(nameStr, addr, port));
-
-			m_frameData[numUsers] = newInstance(FrameDataManager)(FALSE);
-
-			DEBUG_LOG(("ConnectionManager::parseUserList - User %d is %s\n", numUsers, nameStr));
-		} else {
-			m_localSlot = numUsers;
-			m_localUser.setName(nameStr);
-
-			DEBUG_LOG(("ConnectionManager::parseUserList - User %d is %s\n", numUsers, nameStr));
-			DEBUG_LOG(("Local user is %d\n", m_localSlot));
-
-			m_frameData[numUsers] = newInstance(FrameDataManager)(TRUE);
-		}
-		m_frameData[numUsers]->init();
-		m_frameData[numUsers]->reset();
-
-		m_packetRouterFallback[numUsers] = numUsers;
-
-		numUsers++;
-	}
-
-	if (numUsers < 2 || m_localSlot == -1)
-	{
-		DEBUG_LOG(("ConnectionManager::parseUserList - FAILED (local user = %d, num players = %d) with list [%s]\n", m_localSlot, numUsers, buf));
-		return;
-	}
-
-	if (list != NULL) {
-		free(list); // from the strdup above.
-		list = NULL;
-	}
-	*/
-}
-
-/**
- * Return the number of incoming bytes per second averaged over 30 sec.
- */
-Real ConnectionManager::getIncomingBytesPerSecond( void )
-{
-	if (m_transport)
-		return m_transport->getIncomingBytesPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * Return the number of incoming packets per second averaged over the last 30 sec.
- */
-Real ConnectionManager::getIncomingPacketsPerSecond( void )
-{
-	if (m_transport)
-		return m_transport->getIncomingPacketsPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * Return the number of outgoing bytes per second averaged over the last 30 sec.
- */
-Real ConnectionManager::getOutgoingBytesPerSecond( void )
-{
-	if (m_transport)
-		return m_transport->getOutgoingBytesPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * Return the number of outgoing packets per second averaged over the last 30 sec.
- */
-Real ConnectionManager::getOutgoingPacketsPerSecond( void )
-{
-	if (m_transport) {
-		return m_transport->getOutgoingPacketsPerSecond();
-	} else {
-	  return 0.0;
-	}
-}
-
-/**
- * Return the number of bytes not from generals clients received per second averaged over the last 30 sec.
- */
-Real ConnectionManager::getUnknownBytesPerSecond( void )
-{
-	if (m_transport)
-		return m_transport->getUnknownBytesPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * Return the number ov packets not from generals clients received per second averaged over the last 30 sec.
- */
-Real ConnectionManager::getUnknownPacketsPerSecond( void )
-{
-	if (m_transport)
-		return m_transport->getUnknownPacketsPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * Return the smallest packet arrival cushion since this was last called.
- */
-UnsignedInt ConnectionManager::getPacketArrivalCushion() {
-	UnsignedInt retval = m_smallestPacketArrivalCushion;
-	m_smallestPacketArrivalCushion = -1;
-	return retval;
-}
-
-void ConnectionManager::sendChat(UnicodeString text, Int playerMask, UnsignedInt executionFrame)
-{
-	NetChatCommandMsg *msg = newInstance(NetChatCommandMsg);
-	msg->setText(text);
-	msg->setPlayerMask(playerMask);
-	msg->setPlayerID(m_localSlot);
-	msg->setID(0);
-	msg->setExecutionFrame(executionFrame);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType()))
-	{
-		msg->setID(GenerateNextCommandID());
-	}
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Chat message has ID of %d, mask of %8.8X, text of %ls\n", msg->getID(), msg->getPlayerMask(), msg->getText().str()));
-
-	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
-	processChat(msg);
-
-	msg->detach();
-}
-
-void ConnectionManager::sendDisconnectChat(UnicodeString text) {
-	NetDisconnectChatCommandMsg *msg = newInstance(NetDisconnectChatCommandMsg);
-	msg->setPlayerID(m_localSlot);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-	msg->setText(text);
-
-	sendLocalCommandDirect(msg, 0xff ^ (1 << m_localSlot));
-	processDisconnectChat(msg);
-}
-
-UnsignedShort ConnectionManager::sendFileAnnounce(AsciiString path, UnsignedByte playerMask)
-{
-	File *theFile = TheLocalFileSystem->openFile(path.str());
-	if (!theFile || !theFile->size())
-	{
-		UnicodeString log;
-		log.format(L"Not sending file '%hs' to %X\n", path.str(), playerMask);
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("%ls\n", log.str()));
-		if (TheLAN)
-			TheLAN->OnChat(UnicodeString(L"sendFile"), 0, log, LANAPI::LANCHAT_SYSTEM);
-		return 0;
-	}
-
-	theFile->close();
-
-	Int announceMask = 0xff ^ (1 << m_localSlot);
-	NetFileAnnounceCommandMsg *announceMsg = newInstance(NetFileAnnounceCommandMsg);
-	announceMsg->setPlayerID(m_localSlot);
-	if (DoesCommandRequireACommandID(announceMsg->getNetCommandType()) == TRUE) {
-		announceMsg->setID(GenerateNextCommandID());
-	}
-	announceMsg->setRealFilename(path);
-	announceMsg->setPlayerMask(playerMask);
-	UnsignedShort fileID = GenerateNextCommandID();
-	announceMsg->setFileID(fileID);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFileAnnounce() - creating announce message with ID of %d from %d to mask %X for '%s' going to %X as command %d\n",
-		announceMsg->getID(), announceMsg->getPlayerID(), announceMask, announceMsg->getRealFilename().str(),
-		announceMsg->getPlayerMask(), announceMsg->getFileID()));
-
-	processFileAnnounce(announceMsg); // set up things for the host
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Sending file announce to %X\n", announceMask));
-	sendLocalCommand(announceMsg, announceMask);
-	announceMsg->detach();
-
-	return fileID;
-}
-
-void ConnectionManager::sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID)
-{
-	File *theFile = TheLocalFileSystem->openFile(path.str());
-	if (!theFile || !theFile->size())
-	{
-		UnicodeString log;
-		log.format(L"Not sending file '%hs' to %X\n", path.str(), playerMask);
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("%ls\n", log.str()));
-		if (TheLAN)
-			TheLAN->OnChat(UnicodeString(L"sendFile"), 0, log, LANAPI::LANCHAT_SYSTEM);
-		return;
-	}
-
-	Int len = theFile->size();
-	char *buf = theFile->readEntireAndClose();
-
-	// compress Targas
-#ifdef COMPRESS_TARGAS
-	char *compressedBuf = NULL;
-	Int compressedLen = path.endsWith(".tga")?CompressionManager::getMaxCompressedSize(len, CompressionManager::getPreferredCompression()):0;
-	Int compressedSize = 0;
-	if (compressedLen)
-		compressedSize = CompressionManager::compressData(CompressionManager::getPreferredCompression(),
-		buf, len, compressedBuf, compressedLen);
-
-	if (compressedBuf && !compressedSize)
-	{
-		delete[] compressedBuf;
-		compressedBuf = NULL;
-	}
-#endif // COMPRESS_TARGAS
-
-	NetFileCommandMsg *fileMsg = newInstance(NetFileCommandMsg);
-	fileMsg->setPlayerID(m_localSlot);
-	fileMsg->setID(commandID);
-	fileMsg->setRealFilename(path);
-#ifdef COMPRESS_TARGAS
-	if (compressedBuf)
-	{
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Compressed '%s' from %d to %d (%g%%) before transfer\n", path.str(), len, compressedSize,
-			(Real)compressedSize/(Real)len*100.0f));
-		fileMsg->setFileData((unsigned char *)compressedBuf, compressedSize);
-	}
-	else
-#endif // COMPRESS_TARGAS
-	{
-		fileMsg->setFileData((unsigned char *)buf, len);
-	}
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFile() - creating file message with ID of %d for '%s' going to %X from %d, size of %d\n",
-		fileMsg->getID(), fileMsg->getRealFilename().str(), playerMask, fileMsg->getPlayerID(), fileMsg->getFileLength()));
-
-	delete[] buf;
-	buf = NULL;
-#ifdef COMPRESS_TARGAS
-	if (compressedBuf)
-	{
-		delete[] compressedBuf;
-		compressedBuf = NULL;
-	}
-#endif // COMPRESS_TARGAS
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Sending file: '%s', len %d, to %X\n", path.str(), len, playerMask));
-
-	sendLocalCommand(fileMsg, playerMask);
-
-	fileMsg->detach();
-}
-
-Int ConnectionManager::getFileTransferProgress(Int playerID, AsciiString path)
-{
-	FileCommandMap::iterator commandIt = s_fileCommandMap.begin();
-	while (commandIt != s_fileCommandMap.end())
-	{
-		//DEBUG_LOG(("ConnectionManager::getFileTransferProgress(%s): looking at existing transfer of '%s'\n",
-		//	path.str(), commandIt->second.str()));
-		if (commandIt->second == path)
-		{
-			return s_fileProgressMap[playerID][commandIt->first];
-		}
-		++commandIt;
-	}
-	//DEBUG_LOG(("Falling back to 0, since we couldn't find the map\n"));
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::getFileTransferProgress: path %s not found\n",path.str()));
-	return 0;
-}
-
-
-void ConnectionManager::voteForPlayerDisconnect(Int slot) {
-	if (m_disconnectManager != NULL) {
-		m_disconnectManager->voteForPlayerDisconnect(slot, this);
-	}
-}
-
-Int ConnectionManager::getNumPlayers()
-{
-	Int retval = 0;
-	for (Int i = 0; i < MAX_SLOTS; ++i)
-	{
-		if (isPlayerConnected(i)) {
-			++retval;
-		}
-	}
-
-	return retval;
-}
-
-void ConnectionManager::updateLoadProgress( Int progress )
-{
-	NetProgressCommandMsg *msg = newInstance(NetProgressCommandMsg);
-	msg->setPercentage( progress );
-	msg->setPlayerID( m_localSlot );
-	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
-		msg->setID(GenerateNextCommandID());
-	}
-	processProgress(msg);
-	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
-
-	msg->detach();
-}
-
-void ConnectionManager::loadProgressComplete()
-{
-	NetCommandMsg *msg = newInstance(NetCommandMsg);
-	msg->setPlayerID( m_localSlot );
-	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
-		msg->setID(GenerateNextCommandID());
-	}
-	msg->setNetCommandType(NETCOMMANDTYPE_LOADCOMPLETE);
-	processLoadComplete(msg);
-	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
-
-	msg->detach();
-}
-
-void ConnectionManager::sendTimeOutGameStart()
-{
-	NetCommandMsg *msg = newInstance(NetCommandMsg);
-	msg->setPlayerID( m_localSlot );
-	msg->setNetCommandType(NETCOMMANDTYPE_TIMEOUTSTART);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
-		msg->setID(GenerateNextCommandID());
-	}
-	processTimeOutGameStart(msg);
-	sendLocalCommand(msg, 0xff ^ (1 << m_localSlot));
-
-	msg->detach();
-}
-
-Bool ConnectionManager::isPacketRouter( void )
-{
-	return m_localSlot == m_packetRouterSlot;
-}
-
-Int ConnectionManager::getAverageFPS( void )
-{
-	return m_frameMetrics.getAverageFPS();
-}
-
-Int ConnectionManager::getSlotAverageFPS(Int slot) {
-	if ((slot < 0) || (slot >= MAX_SLOTS)) {
-		return -1;
-	}
-	if ((m_packetRouterSlot != m_localSlot) && (slot == m_localSlot)) {
-		// our framerate data isn't valid for other players unless we are the
-		// packet router, so don't fake someone out.
-		return -1;
-	}
-	return m_fpsAverages[slot];
-}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-void ConnectionManager::debugPrintConnectionCommands() {
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::debugPrintConnectionCommands - begin commands\n"));
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_connections[i] != NULL) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::debugPrintConnectionCommands - commands for connection %d\n", i));
-			m_connections[i]->debugPrintCommands();
-		}
-	}
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::debugPrintConnectionCommands - end commands\n"));
-}
-#endif
-
-void ConnectionManager::notifyOthersOfCurrentFrame(Int frame) {
-	NetDisconnectFrameCommandMsg *msg = newInstance(NetDisconnectFrameCommandMsg);
-
-	msg->setPlayerID(m_localSlot);
-	msg->setDisconnectFrame(frame);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::notifyOthersOfCurrentFrame - sending disconnect frame of %d, command ID = %d\n", frame, msg->getID()));
-	sendLocalCommandDirect(msg, 0xff ^ (1 << m_localSlot));
-	NetCommandRef *ref = NEW_NETCOMMANDREF(msg);
-	ref->setRelay(1 << m_localSlot);
-	m_disconnectManager->processDisconnectCommand(ref, this);
-	deleteInstance(ref);
-
-	msg->detach();
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::notifyOthersOfCurrentFrame - start screen on debug stuff\n"));
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	debugPrintConnectionCommands();
-#endif
-}
-
-void ConnectionManager::notifyOthersOfNewFrame(UnsignedInt frame) {
-	NetDisconnectScreenOffCommandMsg *msg = newInstance(NetDisconnectScreenOffCommandMsg);
-
-	msg->setPlayerID(m_localSlot);
-	msg->setNewFrame(frame);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-
-	sendLocalCommandDirect(msg, 0xff ^ (1 << m_localSlot));
-	NetCommandRef *ref = NEW_NETCOMMANDREF(msg);
-	ref->setRelay(1 << m_localSlot);
-	m_disconnectManager->processDisconnectCommand(ref, this);
-	deleteInstance(ref);
-
-	msg->detach();
-}
-
-void ConnectionManager::sendFrameDataToPlayer(UnsignedInt playerID, UnsignedInt startingFrame) {
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - sending frame data to player %d starting with frame %d\n", playerID, startingFrame));
-	for (UnsignedInt frame = startingFrame; frame < TheGameLogic->getFrame(); ++frame) {
-		sendSingleFrameToPlayer(playerID, frame);
-	}
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - done sending commands to player %d\n", playerID));
-}
-
-void ConnectionManager::sendSingleFrameToPlayer(UnsignedInt playerID, UnsignedInt frame) {
-	if ((TheGameLogic->getFrame() - FRAMES_TO_KEEP) > frame) {
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendSingleFrameToPlayer - player %d requested frame %d when we are on frame %d, this is too far in the past.\n", playerID, frame, TheGameLogic->getFrame()));
-		return;
-	}
-
-	UnsignedByte relay = 1 << playerID;
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - sending data for frame %d\n", frame));
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if ((m_frameData[i] != NULL) && (i != playerID)) { // no need to send his own commands to him.
-			NetCommandList *list = m_frameData[i]->getFrameCommandList(frame);
-			if (list != NULL) {
-				NetCommandRef *ref = list->getFirstMessage();
-				while (ref != NULL) {
-					DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - sending command %d from player %d to player %d using relay 0x%x\n", ref->getCommand()->getID(), i, playerID, relay));
-					sendLocalCommandDirect(ref->getCommand(), relay);
-					ref = ref->getNext();
-				}
-			}
-			UnsignedInt frameCommandCount = m_frameData[i]->getFrameCommandCount(frame);
-			NetFrameCommandMsg *msg = newInstance(NetFrameCommandMsg);
-			msg->setExecutionFrame(frame);
-			msg->setCommandCount(frameCommandCount);
-			if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-				msg->setID(GenerateNextCommandID());
-			}
-			msg->setPlayerID(i);
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("ConnectionManager::sendFrameDataToPlayer - sending frame info from player %d to player %d for frame %d with command count %d and ID %d and relay %d\n", i, playerID, msg->getExecutionFrame(), msg->getCommandCount(), msg->getID(), relay));
-			sendLocalCommandDirect(msg, relay);
-			msg->detach();
-		}
-	}
-}
-
-UnsignedInt ConnectionManager::getNextPacketRouterSlot(UnsignedInt playerID) {
-	Int index = 0;
-	while ((index < (MAX_SLOTS-1)) && (m_packetRouterFallback[index] != playerID)) {
-		++index;
-	}
-	++index;
-	return m_packetRouterFallback[index];
-}
-
-void ConnectionManager::requestFrameDataResend(Int playerID, UnsignedInt frame) {
-	NetFrameResendRequestCommandMsg *msg = newInstance(NetFrameResendRequestCommandMsg);
-	msg->setPlayerID(m_localSlot);
-	msg->setFrameToResend(frame);
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-
-	if (isPlayerConnected(playerID) == FALSE) {
-		playerID = 0;
-		while ((playerID < MAX_SLOTS) && (isPlayerConnected(playerID) == FALSE)) {
-			++playerID;
-		}
-	}
-
-	if (playerID < MAX_SLOTS) {
-		sendLocalCommandDirect(msg, 1 << playerID);
-	}
-
-	msg->detach();
-}
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/DisconnectManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/DisconnectManager.cpp
deleted file mode 100644
index bbecd950156..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/DisconnectManager.cpp
+++ /dev/null
@@ -1,810 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/Recorder.h"
-#include "GameClient/DisconnectMenu.h"
-#include "GameClient/InGameUI.h"
-#include "GameLogic/GameLogic.h"
-#include "GameNetwork/DisconnectManager.h"
-#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/networkutil.h"
-#include "GameNetwork/GameSpy/PingThread.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-DisconnectManager::DisconnectManager() 
-{
-	// Added By Sadullah Nader	
-	// Initializations missing and needed
-	Int i;
-	m_currentPacketRouterIndex = 0;
-	m_lastFrame = 0;
-	m_lastFrameTime = 0;
-	m_lastKeepAliveSendTime = 0;
-	m_haveNotifiedOtherPlayersOfCurrentFrame = FALSE;
-	m_timeOfDisconnectScreenOn = 0;
-
-	for( i = 0; i < MAX_SLOTS; ++i) {
-		m_packetRouterFallback[i] = 0;
-	}
-	
-	m_packetRouterTimeout = 0;
-	for( i = 0; i < MAX_SLOTS -1; ++i) {
-		m_playerTimeouts[i] = 0;
-	}
-
-	for( i = 0; i < MAX_SLOTS; ++i) {
-		for (Int j = 0; j < MAX_SLOTS; ++j) {
-			m_playerVotes[i][j].vote = FALSE;
-			m_playerVotes[i][j].frame = 0;
-		}
-	}
-}
-
-DisconnectManager::~DisconnectManager() {
-}
-
-void DisconnectManager::init() {
-	TheDisconnectMenu->hideScreen(); // make sure the screen starts out hidden.
-	m_lastFrame = 0;
-	m_lastFrameTime = -1;
-	m_lastKeepAliveSendTime = -1;
-	m_disconnectState = DISCONNECTSTATETYPE_SCREENOFF;
-	m_currentPacketRouterIndex = 0;
-	m_timeOfDisconnectScreenOn = 0;
-
-	Int i = 0;
-	for (; i < MAX_SLOTS; ++i) {
-		for (Int j = 0; j < MAX_SLOTS; ++j) {
-			m_playerVotes[i][j].vote = FALSE;
-			m_playerVotes[i][j].frame = 0;
-		}
-	}
-
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		m_disconnectFrames[i] = 0;
-		m_disconnectFramesReceived[i] = FALSE;
-	}
-	
-	m_pingFrame = 0;
-	m_pingsSent = 0;
-	m_pingsRecieved = 0;
-}
-
-void DisconnectManager::update(ConnectionManager *conMgr) {
-	if (m_lastFrameTime == -1) {
-		m_lastFrameTime = timeGetTime();
-	}
-
-	// The game logic stalls on the frame we are currently waiting for commands on,
-	// so we have to check for the current logic frame being one higher than
-	// the last one we had the commands ready for.
-	if (TheGameLogic->getFrame() == m_lastFrame) {
-		time_t curTime = timeGetTime();
-		if ((curTime - m_lastFrameTime) > TheGlobalData->m_networkDisconnectTime) {
-			if (m_disconnectState == DISCONNECTSTATETYPE_SCREENOFF) {
-				turnOnScreen(conMgr);
-			}
-			sendKeepAlive(conMgr);
-		}
-	} else {
-		nextFrame(TheGameLogic->getFrame(), conMgr);
-	}
-
-	if (m_disconnectState != DISCONNECTSTATETYPE_SCREENOFF) {
-		updateDisconnectStatus(conMgr);
-
-		// check to see if we need to send pings
-		if (m_pingFrame < TheGameLogic->getFrame())
-		{
-			time_t curTime = timeGetTime();
-			if ((curTime - m_lastFrameTime) > 10000) /// @todo: plug in some better measure here
-			{
-				m_pingFrame = TheGameLogic->getFrame();
-				m_pingsSent = 0;
-				m_pingsRecieved = 0;
-
-				// Send the pings
-				if (ThePinger)
-				{
-					//use next ping server
-					static size_t serverIndex = 0;
-					serverIndex++;
-					if( serverIndex >= TheGameSpyConfig->getPingServers().size() )
-						serverIndex = 0;  //wrap back to first ping server
-
-					std::list<AsciiString>::iterator it = TheGameSpyConfig->getPingServers().begin();
-					for( size_t i = 0;  i < serverIndex;  i++ )
-						it++;
-
-					PingRequest req;
-					req.hostname = it->str();
-					req.repetitions = 5;
-					req.timeout = 2000;
-					m_pingsSent = req.repetitions;
-					ThePinger->addRequest(req);
-					DEBUG_LOG(("DisconnectManager::update() - requesting %d pings of %d from %s\n",
-						req.repetitions, req.timeout, req.hostname.c_str()));
-				}
-			}
-		}
-
-		// update the ping thread, tracking pings if we are on the same frame
-		if (ThePinger)
-		{
-			PingResponse resp;
-			while (ThePinger->getResponse(resp))
-			{
-				if (m_pingFrame != TheGameLogic->getFrame())
-				{
-					// wrong frame - we're not pinging yet
-					DEBUG_LOG(("DisconnectManager::update() - discarding ping of %d from %s (%d reps)\n",
-						resp.avgPing, resp.hostname.c_str(), resp.repetitions));
-				}
-				else
-				{
-					// right frame
-					DEBUG_LOG(("DisconnectManager::update() - keeping ping of %d from %s (%d reps)\n",
-						resp.avgPing, resp.hostname.c_str(), resp.repetitions));
-					if (resp.avgPing < 2000)
-					{
-						m_pingsRecieved += resp.repetitions;
-					}
-				}
-			}
-		}
-	}
-}
-
-UnsignedInt DisconnectManager::getPingFrame()
-{
-	return m_pingFrame;
-}
-
-Int DisconnectManager::getPingsSent()
-{
-	return m_pingsSent;
-}
-
-Int DisconnectManager::getPingsRecieved()
-{
-	return m_pingsRecieved;
-}
-
-
-void DisconnectManager::updateDisconnectStatus(ConnectionManager *conMgr) {
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (conMgr->isPlayerConnected(i)) {
-			Int slot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
-			if (slot != -1) {
-				time_t curTime = timeGetTime();
-				time_t newTime = TheGlobalData->m_networkPlayerTimeoutTime - (curTime - m_playerTimeouts[slot]);
-
-// if someone is more than 2/3 timed out, lets get our frame numbers sync'd up.  Also if someone is voted out
-// lets do the same thing.
-
-				if (m_haveNotifiedOtherPlayersOfCurrentFrame == FALSE) {
-					if ((newTime < TheGlobalData->m_networkPlayerTimeoutTime / 3) || (isPlayerVotedOut(slot, conMgr) == TRUE)) {
-						TheNetwork->notifyOthersOfCurrentFrame();
-						m_haveNotifiedOtherPlayersOfCurrentFrame = TRUE;
-					}
-
-					DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - curTime = %d, m_timeOfDisconnectScreenOn = %d, curTime - m_timeOfDisconnectScreenOn = %d\n", curTime, m_timeOfDisconnectScreenOn, curTime - m_timeOfDisconnectScreenOn));
-
-					if (m_timeOfDisconnectScreenOn != 0) {
-						if ((curTime - m_timeOfDisconnectScreenOn) > TheGlobalData->m_networkDisconnectScreenNotifyTime) {
-							TheNetwork->notifyOthersOfCurrentFrame();
-							m_haveNotifiedOtherPlayersOfCurrentFrame = TRUE;
-						}
-					}
-				}
-
-				if ((newTime < 0) || (isPlayerVotedOut(slot, conMgr) == TRUE)) {
-					newTime = 0;
-					DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - player %d(translated slot %d) has been voted out or timed out\n", i, slot));
-					if (allOnSameFrame(conMgr) == TRUE) {
-						DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - all on same frame\n"));
-						if (isLocalPlayerNextPacketRouter(conMgr) == TRUE) {
-							DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - local player is next packet router\n"));
-							DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - about to do the disconnect procedure for player %d\n", i));
-							sendDisconnectCommand(i, conMgr);
-							disconnectPlayer(i, conMgr);
-							sendPlayerDestruct(i, conMgr);
-						} else {
-							DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - local player is not the next packet router\n"));
-						}
-					} else {
-						DEBUG_LOG(("DisconnectManager::updateDisconnectStatus - not all on same frame\n"));
-					}
-				}
-				TheDisconnectMenu->setPlayerTimeoutTime(slot, newTime);
-			}
-		}
-	}
-}
-
-void DisconnectManager::updateWaitForPacketRouter(ConnectionManager *conMgr) {
-/*
-	time_t curTime = timeGetTime();
-	time_t newTime = TheGlobalData->m_networkPlayerTimeoutTime - (curTime - m_packetRouterTimeout);
-	if (newTime < 0) {
-		newTime = 0;
-
-		// The guy that we were hoping would be the new packet router isn't.  We're screwed, get out of the game.
-
-		DEBUG_LOG(("DisconnectManager::updateWaitForPacketRouter - timed out waiting for new packet router, quitting game\n"));
-		TheNetwork->quitGame();
-	}
-	TheDisconnectMenu->setPacketRouterTimeoutTime(newTime);
-*/
-}
-
-void DisconnectManager::processDisconnectCommand(NetCommandRef *ref, ConnectionManager *conMgr) {
-	NetCommandMsg *msg = ref->getCommand();
-	if (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTKEEPALIVE) {
-		processDisconnectKeepAlive(msg, conMgr);
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) {
-		processDisconnectPlayer(msg, conMgr);
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_PACKETROUTERQUERY) {
-		processPacketRouterQuery(msg, conMgr);
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_PACKETROUTERACK) {
-		processPacketRouterAck(msg, conMgr);
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTVOTE) {
-		processDisconnectVote(msg, conMgr);
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) {
-		processDisconnectFrame(msg, conMgr);
-	} else if (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTSCREENOFF) {
-		processDisconnectScreenOff(msg, conMgr);
-	}
-}
-
-void DisconnectManager::processDisconnectKeepAlive(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetDisconnectKeepAliveCommandMsg *cmdMsg = (NetDisconnectKeepAliveCommandMsg *)msg;
-	Int slot = translatedSlotPosition(cmdMsg->getPlayerID(), conMgr->getLocalPlayerID());
-	if (slot != -1) {
-		resetPlayerTimeout(slot);
-	}
-}
-
-void DisconnectManager::processDisconnectPlayer(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetDisconnectPlayerCommandMsg *cmdMsg = (NetDisconnectPlayerCommandMsg *)msg;
-	DEBUG_LOG(("DisconnectManager::processDisconnectPlayer - Got disconnect player command from player %d.  Disconnecting player %d on frame %d\n", msg->getPlayerID(), cmdMsg->getDisconnectSlot(), cmdMsg->getDisconnectFrame()));
-	DEBUG_ASSERTCRASH(TheGameLogic->getFrame() == cmdMsg->getDisconnectFrame(), ("disconnecting player on the wrong frame!!!"));
-	disconnectPlayer(cmdMsg->getDisconnectSlot(), conMgr);
-}
-
-void DisconnectManager::processPacketRouterQuery(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetPacketRouterQueryCommandMsg *cmdMsg = (NetPacketRouterQueryCommandMsg *)msg;
-	DEBUG_LOG(("DisconnectManager::processPacketRouterQuery - got a packet router query command from player %d\n", msg->getPlayerID()));
-
-	if (conMgr->getPacketRouterSlot() == conMgr->getLocalPlayerID()) {
-		NetPacketRouterAckCommandMsg *ackmsg = newInstance(NetPacketRouterAckCommandMsg);
-		ackmsg->setPlayerID(conMgr->getLocalPlayerID());
-		if (DoesCommandRequireACommandID(ackmsg->getNetCommandType()) == TRUE) {
-			ackmsg->setID(GenerateNextCommandID());
-		}
-		DEBUG_LOG(("DisconnectManager::processPacketRouterQuery - We are the new packet router, responding with an packet router ack. Local player is %d\n", ackmsg->getPlayerID()));
-		conMgr->sendLocalCommandDirect(ackmsg, 1 << cmdMsg->getPlayerID());
-		ackmsg->detach();
-	} else {
-		DEBUG_LOG(("DisconnectManager::processPacketRouterQuery - We are NOT the new packet router, these are not the droids you're looking for.\n"));
-	}
-}
-
-void DisconnectManager::processPacketRouterAck(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)msg;
-	DEBUG_LOG(("DisconnectManager::processPacketRouterAck - got packet router ack command from player %d\n", msg->getPlayerID()));
-
-	if (conMgr->getPacketRouterSlot() == cmdMsg->getPlayerID()) {
-		DEBUG_LOG(("DisconnectManager::processPacketRouterAck - packet router command is from who it should be.\n"));
-		resetPacketRouterTimeout();
-		Int currentPacketRouterSlot = conMgr->getPacketRouterSlot();
-		Int currentPacketRouterIndex = 0;
-		while ((currentPacketRouterSlot != conMgr->getPacketRouterFallbackSlot(currentPacketRouterIndex)) && (currentPacketRouterIndex < MAX_SLOTS)) {
-			++currentPacketRouterIndex;
-		}
-		DEBUG_ASSERTCRASH((currentPacketRouterIndex < MAX_SLOTS), ("Invalid packet router index"));
-
-		DEBUG_LOG(("DisconnectManager::processPacketRouterAck - New packet router confirmed, resending pending commands\n"));
-		conMgr->resendPendingCommands();
-		m_currentPacketRouterIndex = currentPacketRouterIndex;
-		DEBUG_LOG(("DisconnectManager::processPacketRouterAck - Setting disconnect state to screen on.\n"));
-		m_disconnectState = DISCONNECTSTATETYPE_SCREENON; ///< set it to screen on so that the next call to AllCommandsReady can set up everything for the next frame properly.
-	}
-}
-
-void DisconnectManager::processDisconnectVote(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)msg;
-	DEBUG_LOG(("DisconnectManager::processDisconnectVote - Got a disconnect vote for player %d command from player %d\n", cmdMsg->getSlot(), cmdMsg->getPlayerID()));
-	Int transSlot = translatedSlotPosition(msg->getPlayerID(), conMgr->getLocalPlayerID());
-
-	if (isPlayerInGame(transSlot, conMgr) == FALSE) {
-		// if they've been timed out, voted out, disconnected, don't count their vote.
-		return;
-	}
-
-	applyDisconnectVote(cmdMsg->getSlot(), cmdMsg->getVoteFrame(), cmdMsg->getPlayerID(), conMgr);
-}
-
-void DisconnectManager::processDisconnectFrame(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)msg;
-	UnsignedInt playerID = cmdMsg->getPlayerID();
-	if (m_disconnectFrames[playerID] >= cmdMsg->getDisconnectFrame()) {
-		// this message isn't valid, we have a disconnect frame that is later than this already.
-		return;
-	}
-
-	if (m_disconnectFramesReceived[playerID] == TRUE) {
-		DEBUG_LOG(("DisconnectManager::processDisconnectFrame - Got two disconnect frames without an intervening disconnect screen off command from player %d. Frames are %d and %d\n", playerID, m_disconnectFrames[playerID], cmdMsg->getDisconnectFrame()));
-	}
-
-	DEBUG_LOG(("DisconnectManager::processDisconnectFrame - about to call resetPlayersVotes for player %d\n", playerID));
-	resetPlayersVotes(playerID, cmdMsg->getDisconnectFrame()-1, conMgr);
-
-	m_disconnectFrames[playerID] = cmdMsg->getDisconnectFrame();
-	m_disconnectFramesReceived[playerID] = TRUE;
-	DEBUG_LOG(("DisconnectManager::processDisconnectFrame - Got a disconnect frame for player %d, frame = %d, local player is %d, local disconnect frame = %d, command id = %d\n", cmdMsg->getPlayerID(), cmdMsg->getDisconnectFrame(), conMgr->getLocalPlayerID(), m_disconnectFrames[conMgr->getLocalPlayerID()], cmdMsg->getID()));
-
-	if (playerID == conMgr->getLocalPlayerID()) {
-		DEBUG_LOG(("DisconnectManager::processDisconnectFrame - player %d is the local player\n", playerID));
-		// we just got the message from the local player, check to see if we need to send
-		// commands to anyone we already have heard from.
-		for (Int i = 0; i < MAX_SLOTS; ++i) {
-			if (i != playerID) {
-				Int transSlot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
-				if (isPlayerInGame(transSlot, conMgr) == TRUE) {
-					if ((m_disconnectFrames[i] < m_disconnectFrames[playerID]) && (m_disconnectFramesReceived[i] == TRUE)) {
-						DEBUG_LOG(("DisconnectManager::processDisconnectFrame - I have more frames than player %d, my frame = %d, their frame = %d\n", i, m_disconnectFrames[conMgr->getLocalPlayerID()], m_disconnectFrames[i]));
-						conMgr->sendFrameDataToPlayer(i, m_disconnectFrames[i]);
-					}
-				}
-			}
-		}
-	} else if ((m_disconnectFrames[playerID] < m_disconnectFrames[conMgr->getLocalPlayerID()]) && (m_disconnectFramesReceived[playerID] == TRUE)) {
-		DEBUG_LOG(("DisconnectManager::processDisconnectFrame - I have more frames than player %d, my frame = %d, their frame = %d\n", playerID, m_disconnectFrames[conMgr->getLocalPlayerID()], m_disconnectFrames[playerID]));
-		conMgr->sendFrameDataToPlayer(playerID, m_disconnectFrames[playerID]);
-	}
-}
-
-void DisconnectManager::processDisconnectScreenOff(NetCommandMsg *msg, ConnectionManager *conMgr) {
-	NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)msg;
-	UnsignedInt playerID = cmdMsg->getPlayerID();
-
-	DEBUG_LOG(("DisconnectManager::processDisconnectScreenOff - got a screen off command from player %d for frame %d\n", cmdMsg->getPlayerID(), cmdMsg->getNewFrame()));
-
-	if ((playerID < 0) || (playerID >= MAX_SLOTS)) {
-		return;
-	}
-
-	UnsignedInt newFrame = cmdMsg->getNewFrame();
-	if (newFrame >= m_disconnectFrames[playerID]) {
-		DEBUG_LOG(("DisconnectManager::processDisconnectScreenOff - resetting the disconnect screen status for player %d\n", playerID));
-		m_disconnectFramesReceived[playerID] = FALSE;
-		m_disconnectFrames[playerID] = newFrame; // just in case we get packets out of order and the disconnect screen off message gets here before the disconnect frame message.
-
-		DEBUG_LOG(("DisconnectManager::processDisconnectScreenOff - about to call resetPlayersVotes for player %d\n", playerID));
-		resetPlayersVotes(playerID, cmdMsg->getNewFrame(), conMgr);
-	}
-}
-
-void DisconnectManager::applyDisconnectVote(Int slot, UnsignedInt frame, Int fromSlot, ConnectionManager *conMgr) {
-	m_playerVotes[slot][fromSlot].vote = TRUE;
-	m_playerVotes[slot][fromSlot].frame = frame;
-	Int numVotes = countVotesForPlayer(slot);
-	DEBUG_LOG(("DisconnectManager::applyDisconnectVote - added a vote to disconnect slot %d, from slot %d, for frame %d, current votes are %d\n", slot, fromSlot, frame, numVotes));
-	Int transSlot = translatedSlotPosition(slot, conMgr->getLocalPlayerID());
-	if (transSlot != -1) {
-		TheDisconnectMenu->updateVotes(transSlot, numVotes);
-	}
-}
-
-void DisconnectManager::nextFrame(UnsignedInt frame, ConnectionManager *conMgr) {
-	m_lastFrame = frame;
-	m_lastFrameTime = timeGetTime();
-	resetPlayerTimeouts(conMgr);
-}
-
-void DisconnectManager::allCommandsReady(UnsignedInt frame, ConnectionManager *conMgr, Bool waitForPacketRouter) {
-		if (m_disconnectState != DISCONNECTSTATETYPE_SCREENOFF) {
-			DEBUG_LOG(("DisconnectManager::allCommandsReady - setting screen state to off.\n"));
-
-			TheDisconnectMenu->hideScreen();
-			m_disconnectState = DISCONNECTSTATETYPE_SCREENOFF;
-			TheNetwork->notifyOthersOfNewFrame(frame);
-
-			// reset the votes since we're moving to a new frame.
-			for (Int i = 0; i < MAX_SLOTS; ++i) {
-				m_playerVotes[i][conMgr->getLocalPlayerID()].vote = FALSE;
-			}
-
-			DEBUG_LOG(("DisconnectManager::allCommandsReady - resetting m_timeOfDisconnectScreenOn\n"));
-			m_timeOfDisconnectScreenOn = 0;
-		}
-}
-
-Bool DisconnectManager::allowedToContinue() {
-	if (m_disconnectState != DISCONNECTSTATETYPE_SCREENOFF) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-void DisconnectManager::sendKeepAlive(ConnectionManager *conMgr) {
-	time_t curTime = timeGetTime();
-
-	if (((curTime - m_lastKeepAliveSendTime) > 500) || (m_lastKeepAliveSendTime == -1)) {
-		NetDisconnectKeepAliveCommandMsg *msg = newInstance(NetDisconnectKeepAliveCommandMsg);
-		msg->setPlayerID(conMgr->getLocalPlayerID());
-		if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
-			msg->setID(GenerateNextCommandID());
-		}
-		conMgr->sendLocalCommandDirect(msg, 0xff ^ (1 << msg->getPlayerID()));
-		msg->detach();
-
-		m_lastKeepAliveSendTime = curTime;
-	}
-}
-
-void DisconnectManager::populateDisconnectScreen(ConnectionManager *conMgr) {
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		UnicodeString name = conMgr->getPlayerName(i);
-		Int slot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
-		if (slot != -1) {
-			TheDisconnectMenu->setPlayerName(slot, name);
-
-			Int numVotes = countVotesForPlayer(i);
-			TheDisconnectMenu->updateVotes(slot, numVotes);
-		}
-	}
-}
-
-Int DisconnectManager::translatedSlotPosition(Int slot, Int localSlot) {
-	if (slot < localSlot) {
-		return slot;
-	}
-
-	if (slot == localSlot) {
-		return -1;
-	}
-
-	return (slot - 1);
-}
-
-Int DisconnectManager::untranslatedSlotPosition(Int slot, Int localSlot) {
-	if (slot == -1) {
-		return localSlot;
-	}
-
-	if (slot < localSlot) {
-		return slot;
-	}
-
-	return (slot + 1);
-}
-
-void DisconnectManager::resetPlayerTimeouts(ConnectionManager *conMgr) {
-	// reset the player timeouts.
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		Int slot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
-		if (slot != -1) {
-			resetPlayerTimeout(slot);
-		}
-	}
-}
-
-void DisconnectManager::resetPlayerTimeout(Int slot) {
-	m_playerTimeouts[slot] = timeGetTime();
-}
-
-void DisconnectManager::resetPacketRouterTimeout() {
-	m_packetRouterTimeout = timeGetTime();
-}
-
-void DisconnectManager::turnOnScreen(ConnectionManager *conMgr) {
-	TheDisconnectMenu->showScreen();
-	DEBUG_LOG(("DisconnectManager::turnOnScreen - turning on screen on frame %d\n", TheGameLogic->getFrame()));
-	m_disconnectState = DISCONNECTSTATETYPE_SCREENON;
-	m_lastKeepAliveSendTime = -1;
-	populateDisconnectScreen(conMgr);
-	resetPlayerTimeouts(conMgr);
-	TheDisconnectMenu->hidePacketRouterTimeout();
-
-	m_haveNotifiedOtherPlayersOfCurrentFrame = FALSE;
-
-	m_timeOfDisconnectScreenOn = timeGetTime();
-	DEBUG_LOG(("DisconnectManager::turnOnScreen - turned on screen at time %d\n", m_timeOfDisconnectScreenOn));
-}
-
-void DisconnectManager::disconnectPlayer(Int slot, ConnectionManager *conMgr) {
-	DEBUG_LOG(("DisconnectManager::disconnectPlayer - Disconnecting slot number %d on frame %d\n", slot, TheGameLogic->getFrame()));
-	DEBUG_ASSERTCRASH((slot >= 0) && (slot < MAX_SLOTS), ("Attempting to disconnect an invalid slot number"));
-	if ((slot < 0) || (slot >= (MAX_SLOTS))) {
-		return;
-	}
-
-	if (TheGameInfo)
-	{
-		GameSlot *gSlot = TheGameInfo->getSlot( slot );
-		if (gSlot)
-		{
-			gSlot->markAsDisconnected();
-		}
-	}
-
-	Int transSlot = translatedSlotPosition(slot, conMgr->getLocalPlayerID());
-
-	if (transSlot != -1) {
-		// Ignore any disconnect commands that tell us to disconnect ourselves.
-
-		// Get the disconnecting player off the disconnect window.
-		UnicodeString uname = conMgr->getPlayerName(slot);
-		TheRecorder->logPlayerDisconnect(uname, slot);
-		TheDisconnectMenu->removePlayer(transSlot, uname);
-
-		PlayerLeaveCode retcode = conMgr->disconnectPlayer(slot);
-		DEBUG_ASSERTCRASH((retcode != PLAYERLEAVECODE_UNKNOWN), ("Invalid player leave code"));
-
-		if (retcode == PLAYERLEAVECODE_PACKETROUTER) {
-			DEBUG_LOG(("DisconnectManager::disconnectPlayer - disconnecting player was packet router.\n"));
-
-			conMgr->resendPendingCommands();
-		}
-	}
-}
-
-void DisconnectManager::sendDisconnectCommand(Int slot, ConnectionManager *conMgr) {
-	DEBUG_LOG(("DisconnectManager::sendDisconnectCommand - Sending disconnect command for slot number %d\n", slot));
-	DEBUG_ASSERTCRASH((slot >= 0) && (slot < MAX_SLOTS), ("Attempting to send a disconnect command for an invalid slot number"));
-	if ((slot < 0) || (slot >= (MAX_SLOTS))) {
-		return;
-	}
-
-	UnsignedInt disconnectFrame = getMaxDisconnectFrame();
-
-	// Need to do the NetDisconnectPlayerCommandMsg creation and sending here.
-	NetDisconnectPlayerCommandMsg *msg = newInstance(NetDisconnectPlayerCommandMsg);
-	msg->setDisconnectSlot(slot);
-	msg->setDisconnectFrame(disconnectFrame);
-	msg->setPlayerID(conMgr->getLocalPlayerID());
-	if (DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		msg->setID(GenerateNextCommandID());
-	}
-
-	conMgr->sendLocalCommand(msg);
-
-	DEBUG_LOG(("DisconnectManager::sendDisconnectCommand - Sending disconnect command for slot number %d for frame %d\n", slot, disconnectFrame));
-
-	msg->detach();
-}
-
-void DisconnectManager::sendVoteCommand(Int slot, ConnectionManager *conMgr) {
-	NetDisconnectVoteCommandMsg *msg = newInstance(NetDisconnectVoteCommandMsg);
-
-	msg->setPlayerID(conMgr->getLocalPlayerID());
-	msg->setSlot(slot);
-	msg->setVoteFrame(TheGameLogic->getFrame());
-	if (DoesCommandRequireACommandID(msg->getNetCommandType()) == TRUE) {
-		msg->setID(GenerateNextCommandID());
-	}
-
-	conMgr->sendLocalCommandDirect(msg, 0xff & ~(1 << conMgr->getLocalPlayerID()));
-
-	msg->detach();
-}
-
-void DisconnectManager::voteForPlayerDisconnect(Int slot, ConnectionManager *conMgr) {
-	Int transSlot = untranslatedSlotPosition(slot, conMgr->getLocalPlayerID());
-
-	if (m_playerVotes[transSlot][conMgr->getLocalPlayerID()].vote == FALSE) {
-		m_playerVotes[transSlot][conMgr->getLocalPlayerID()].vote = TRUE;
-
-		sendVoteCommand(transSlot, conMgr);
-
-		// we use the game logic frame cause we might not have sent out our own disconnect frame yet.
-		applyDisconnectVote(transSlot, TheGameLogic->getFrame(), conMgr->getLocalPlayerID(), conMgr);
-	}
-}
-
-void DisconnectManager::recalculatePacketRouterIndex(ConnectionManager *conMgr) {
-	Int currentPacketRouterSlot = conMgr->getPacketRouterSlot();
-	m_currentPacketRouterIndex = 0;
-	while ((currentPacketRouterSlot != conMgr->getPacketRouterFallbackSlot(m_currentPacketRouterIndex)) && (m_currentPacketRouterIndex < MAX_SLOTS)) {
-		++m_currentPacketRouterIndex;
-	}
-	DEBUG_ASSERTCRASH((m_currentPacketRouterIndex < MAX_SLOTS), ("Invalid packet router index"));
-}
-
-Bool DisconnectManager::allOnSameFrame(ConnectionManager *conMgr) {
-	Bool retval = TRUE;
-	for (Int i = 0; (i < MAX_SLOTS) && (retval == TRUE); ++i) {
-		Int transSlot = translatedSlotPosition(i, conMgr->getLocalPlayerID());
-		if (transSlot == -1) {
-			continue;
-		}
-		if ((conMgr->isPlayerConnected(i) == TRUE) && (isPlayerInGame(transSlot, conMgr) == TRUE)) {
-			// ok, i is someone who is in the game and hasn't timed out yet or been voted out.
-			if (m_disconnectFramesReceived[i] == FALSE) {
-				// we don't know what frame they are on yet.
-				retval = FALSE;
-			}
-			if ((m_disconnectFramesReceived[i] == TRUE) && (m_disconnectFrames[conMgr->getLocalPlayerID()] != m_disconnectFrames[i])) {
-				// We know their frame, but they aren't on the same frame as us.
-				retval = FALSE;
-			}
-		}
-	}
-	return retval;
-}
-
-Bool DisconnectManager::isLocalPlayerNextPacketRouter(ConnectionManager *conMgr) {
-	UnsignedInt localSlot = conMgr->getLocalPlayerID();
-	UnsignedInt packetRouterSlot = conMgr->getPacketRouterSlot();
-	Int transSlot = translatedSlotPosition(packetRouterSlot, localSlot);
-
-	// stop when we have found a packet router that is connected
-	while ((transSlot != -1) && (isPlayerInGame(transSlot, conMgr) == FALSE)) {
-		packetRouterSlot = conMgr->getNextPacketRouterSlot(packetRouterSlot);
-		if ((packetRouterSlot >= MAX_SLOTS) || (packetRouterSlot < 0)) {
-			// don't know who the next packet router is going to be,
-			// so this game is not going to go anywhere anymore.
-			DEBUG_CRASH(("no more players left to be the packet router, this shouldn't happen."));
-			return FALSE;
-		}
-		transSlot = translatedSlotPosition(packetRouterSlot, localSlot);
-	}
-
-	if (packetRouterSlot == localSlot) {
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-Bool DisconnectManager::hasPlayerTimedOut(Int slot) {
-	if (slot == -1) {
-		return FALSE;
-	}
-
-	time_t newTime = TheGlobalData->m_networkPlayerTimeoutTime - (timeGetTime() - m_playerTimeouts[slot]);
-	if (newTime <= 0) {
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-// this function assumes that we are the packet router. (or at least that 
-// we will be after everyone is getting disconnected)
-void DisconnectManager::sendPlayerDestruct(Int slot, ConnectionManager *conMgr) {
-	UnsignedShort currentID = 0;
-	if (DoesCommandRequireACommandID(NETCOMMANDTYPE_DESTROYPLAYER))
-	{
-		currentID = GenerateNextCommandID();
-	}
-
-	DEBUG_LOG(("Queueing DestroyPlayer %d for frame %d on frame %d as command %d\n",
-		slot, TheNetwork->getExecutionFrame()+1, TheGameLogic->getFrame(), currentID));
-
-	NetDestroyPlayerCommandMsg *netmsg = newInstance(NetDestroyPlayerCommandMsg);	
-	netmsg->setExecutionFrame(TheNetwork->getExecutionFrame()+1);
-	netmsg->setPlayerID(conMgr->getLocalPlayerID());
-	netmsg->setID(currentID);
-	netmsg->setPlayerIndex(slot);
-	conMgr->sendLocalCommand(netmsg);
-	netmsg->detach();
-}
-
-// the 'slot' variable is supposed to be a translated slot position. (translated slot meaning
-// that it is the player's position in the disconnect menu)
-Bool DisconnectManager::isPlayerVotedOut(Int slot, ConnectionManager *conMgr) {
-	if (slot == -1) {
-		// we can't vote out ourselves.
-		return FALSE;
-	}
-	Int transSlot = untranslatedSlotPosition(slot, conMgr->getLocalPlayerID());
-	Int numVotes = countVotesForPlayer(transSlot);
-	if (numVotes >= (conMgr->getNumPlayers() - 1)) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-UnsignedInt DisconnectManager::getMaxDisconnectFrame() {
-	UnsignedInt retval = 0;
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_disconnectFrames[i] > retval) {
-			retval = m_disconnectFrames[i];
-		}
-	}
-	return retval;
-}
-
-Bool DisconnectManager::isPlayerInGame(Int slot, ConnectionManager *conMgr) {
-	Int transSlot = untranslatedSlotPosition(slot, conMgr->getLocalPlayerID());
-	DEBUG_ASSERTCRASH((transSlot >= 0) && (transSlot < MAX_SLOTS), ("invalid slot number"));
-	if (((transSlot < 0) || (transSlot >= MAX_SLOTS)) || conMgr->isPlayerConnected(transSlot) == FALSE) {
-		return FALSE;
-	}
-	
-	if (isPlayerVotedOut(slot, conMgr) == TRUE) {
-		return FALSE;
-	}
-	
-	if (hasPlayerTimedOut(slot) == TRUE) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-void DisconnectManager::playerHasAdvancedAFrame(Int slot, UnsignedInt frame) {
-	// if they have advanced beyond the frame they had been previously disconnecting on.
-	if (frame >= m_disconnectFrames[slot]) {
-		m_disconnectFrames[slot] = frame; // just in case we get a disconnect frame command after this is called.
-		m_disconnectFramesReceived[slot] = FALSE;
-	}
-}
-
-Int DisconnectManager::countVotesForPlayer(Int slot) {
-	if ((slot < 0) || (slot >= MAX_SLOTS)) {
-		return 0;
-	}
-
-	Int retval = 0;
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
-		// using TheGameLogic->getFrame() cause we might not have sent our disconnect frame yet.
-		if ((m_playerVotes[slot][i].vote == TRUE) && (m_playerVotes[slot][i].frame == TheGameLogic->getFrame())) {
-			++retval;
-		}
-	}
-
-	return retval;
-}
-
-void DisconnectManager::resetPlayersVotes(Int playerID, UnsignedInt frame, ConnectionManager *conMgr) {
-	DEBUG_LOG(("DisconnectManager::resetPlayersVotes - resetting player %d's votes on frame %d\n", playerID, frame));
-
-	// we need to reset this player's votes that happened before or on the given frame.
-	for(Int i = 0; i < MAX_SLOTS; ++i) {
-		if (m_playerVotes[i][playerID].frame <= frame) {
-			DEBUG_LOG(("DisconnectManager::resetPlayersVotes - resetting player %d's vote for player %d from frame %d on frame %d\n", playerID, i, m_playerVotes[i][playerID].frame, frame));
-			m_playerVotes[i][playerID].vote = FALSE;
-		}
-	}
-
-	Int numVotes = countVotesForPlayer(playerID);
-	DEBUG_LOG(("DisconnectManager::resetPlayersVotes - after adjusting votes, player %d has %d votes\n", playerID, numVotes));
-	Int transSlot = translatedSlotPosition(playerID, conMgr->getLocalPlayerID());
-	if (transSlot != -1) {
-		TheDisconnectMenu->updateVotes(transSlot, numVotes);
-	}
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/DownloadManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/DownloadManager.cpp
deleted file mode 100644
index a04c80475e6..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/DownloadManager.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: DownloadManager.cpp //////////////////////////////////////////////////////
-// Generals download manager code
-// Author: Matthew D. Campbell, July 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/GameText.h"
-#include "GameNetwork/DownloadManager.h"
-
-DownloadManager *TheDownloadManager;
-
-DownloadManager::DownloadManager()
-{
-	m_download = NEW CDownload(this);
-	m_wasError = m_sawEnd = false;
-	
-	//Added By Sadullah Nader
-	//Initializations missing and needed
-	
-	m_queuedDownloads.clear();
-	
-	//
-
-	m_statusString = TheGameText->fetch("FTP:StatusIdle");
-
-	// ----- Initialize Winsock -----
-	m_winsockInit = true;
-	WORD verReq = MAKEWORD(2, 2);
-	WSADATA wsadata;
-
-	int err = WSAStartup(verReq, &wsadata);
-	if (err != 0)
-	{
-		m_winsockInit = false;
-	}
-	else
-	{
-		if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2))
-		{
-			WSACleanup();
-			m_winsockInit = false;
-		}
-	}
-
-}
-
-DownloadManager::~DownloadManager()
-{
-	delete m_download;
-	if (m_winsockInit)
-	{
-		WSACleanup();
-		m_winsockInit = false;
-	}
-}
-
-void DownloadManager::init( void )
-{
-}
-
-void DownloadManager::reset( void )
-{
-}
-
-HRESULT DownloadManager::update( void )
-{
-	return m_download->PumpMessages();
-}
-
-HRESULT DownloadManager::downloadFile( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume )
-{
-	return m_download->DownloadFile( server.str(), username.str(), password.str(), file.str(), localfile.str(), regkey.str(), tryResume );
-}
-
-void DownloadManager::queueFileForDownload( AsciiString server, AsciiString username, AsciiString password, AsciiString file, AsciiString localfile, AsciiString regkey, Bool tryResume )
-{
-	QueuedDownload q;
-	q.file = file;
-	q.localFile = localfile;
-	q.password = password;
-	q.regKey = regkey;
-	q.server = server;
-	q.tryResume = tryResume;
-	q.userName = username;
-
-	m_queuedDownloads.push_back(q);
-}
-
-HRESULT DownloadManager::downloadNextQueuedFile( void )
-{
-	QueuedDownload q;
-	std::list<QueuedDownload>::iterator it = m_queuedDownloads.begin();
-	if (it != m_queuedDownloads.end())
-	{
-		q = *it;
-		m_queuedDownloads.pop_front();
-		m_wasError = m_sawEnd = false;
-		return downloadFile( q.server, q.userName, q.password, q.file, q.localFile, q.regKey, q.tryResume );
-	}
-	else
-	{
-		DEBUG_CRASH(("Starting non-existent download!"));
-		return S_OK;
-	}
-}
-
-AsciiString DownloadManager::getLastLocalFile( void )
-{
-	char buf[256] = "";
-	m_download->GetLastLocalFile(buf, 256);
-	return buf;
-}
-
-HRESULT DownloadManager::OnError( Int error )
-{
-	m_wasError = true;
-	AsciiString s = "FTP:UnknownError";
-	switch (error)
-	{
-		case DOWNLOADEVENT_NOSUCHSERVER:
-			s = "FTP:NoSuchServer";
-			break;
-		case DOWNLOADEVENT_COULDNOTCONNECT:
-			s = "FTP:CouldNotConnect";
-			break;
-		case DOWNLOADEVENT_LOGINFAILED:
-			s = "FTP:LoginFailed";
-			break;
-		case DOWNLOADEVENT_NOSUCHFILE:
-			s = "FTP:NoSuchFile";
-			break;
-		case DOWNLOADEVENT_LOCALFILEOPENFAILED:
-			s = "FTP:LocalFileOpenFailed";
-			break;
-		case DOWNLOADEVENT_TCPERROR:
-			s = "FTP:TCPError";
-			break;
-		case DOWNLOADEVENT_DISCONNECTERROR:
-			s = "FTP:DisconnectError";
-			break;
-	}
-	m_errorString = TheGameText->fetch(s);
-	DEBUG_LOG(("DownloadManager::OnError(): %s(%d)\n", s.str(), error));
-	return S_OK;
-}
-
-HRESULT DownloadManager::OnEnd()
-{
-	m_sawEnd = true;
-	DEBUG_LOG(("DownloadManager::OnEnd()\n"));
-	return S_OK;
-}
-
-HRESULT DownloadManager::OnQueryResume()
-{
-	DEBUG_LOG(("DownloadManager::OnQueryResume()\n"));
-	//return DOWNLOADEVENT_DONOTRESUME;
-	return DOWNLOADEVENT_RESUME;
-}
-
-HRESULT DownloadManager::OnProgressUpdate( Int bytesread, Int totalsize, Int timetaken, Int timeleft )
-{
-	DEBUG_LOG(("DownloadManager::OnProgressUpdate(): %d/%d %d/%d\n", bytesread, totalsize, timetaken, timeleft));
-	return S_OK;
-}
-
-HRESULT DownloadManager::OnStatusUpdate( Int status )
-{
-	AsciiString s = "FTP:StatusNone";
-	switch (status)
-	{
-		case DOWNLOADSTATUS_CONNECTING:
-			s = "FTP:StatusConnecting";
-			break;
-		case DOWNLOADSTATUS_LOGGINGIN:
-			s = "FTP:StatusLoggingIn";
-			break;
-		case DOWNLOADSTATUS_FINDINGFILE:
-			s = "FTP:StatusFindingFile";
-			break;
-		case DOWNLOADSTATUS_QUERYINGRESUME:
-			s = "FTP:StatusQueryingResume";
-			break;
-		case DOWNLOADSTATUS_DOWNLOADING:
-			s = "FTP:StatusDownloading";
-			break;
-		case DOWNLOADSTATUS_DISCONNECTING:
-			s = "FTP:StatusDisconnecting";
-			break;
-		case DOWNLOADSTATUS_FINISHING:
-			s = "FTP:StatusFinishing";
-			break;
-		case DOWNLOADSTATUS_DONE:
-			s = "FTP:StatusDone";
-			break;
-	}
-	m_statusString = TheGameText->fetch(s);
-	DEBUG_LOG(("DownloadManager::OnStatusUpdate(): %s(%d)\n", s.str(), status));
-	return S_OK;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/FileTransfer.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/FileTransfer.cpp
deleted file mode 100644
index 025f3a7e379..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/FileTransfer.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: FileTransfer.cpp
-// Author: Matthew D. Campbell, December 2002
-// Description: File Transfer wrapper using TheNetwork
-///////////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/LoadScreen.h"
-#include "GameClient/Shell.h"
-#include "GameNetwork/FileTransfer.h"
-#include "GameNetwork/networkutil.h"
-
-//-------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------
-
-static Bool doFileTransfer( AsciiString filename, MapTransferLoadScreen *ls, Int mask )
-{
-	Bool fileTransferDone = FALSE;
-	Int fileTransferPercent = 0;
-	Int i;
-
-	if (mask)
-	{
-		ls->setCurrentFilename(filename);
-		UnsignedInt startTime = timeGetTime();
-		const Int timeoutPeriod = 2*60*1000;
-		ls->processTimeout(timeoutPeriod/1000);
-
-		ls->update(0);
-		fileTransferDone = FALSE;
-		fileTransferPercent = 0;
-
-		UnsignedShort fileCommandID = 0;
-		Bool sentFile = FALSE;
-		if (TheGameInfo->amIHost())
-		{
-			Sleep(500);
-			fileCommandID = TheNetwork->sendFileAnnounce(filename, mask);
-		}
-		else
-		{
-			sentFile = TRUE;
-		}
-
-		DEBUG_LOG(("Starting file transfer loop\n"));
-
-		while (!fileTransferDone)
-		{
-			if (!sentFile && TheNetwork->areAllQueuesEmpty())
-			{
-				TheNetwork->sendFile(filename, mask, fileCommandID);
-				sentFile = TRUE;
-			}
-
-			// get the progress for each player, and take the min for our overall progress
-			fileTransferDone = TRUE;
-			fileTransferPercent = 100;
-			for (i=1; i<MAX_SLOTS; ++i)
-			{
-				if (TheGameInfo->getConstSlot(i)->isHuman() && !TheGameInfo->getConstSlot(i)->hasMap())
-				{
-					Int slotTransferPercent = TheNetwork->getFileTransferProgress(i, filename);
-					fileTransferPercent = min(fileTransferPercent, slotTransferPercent);
-
-					if (slotTransferPercent == 0)
-						ls->processProgress(i, slotTransferPercent, "MapTransfer:Preparing");
-					else if (slotTransferPercent < 100)
-						ls->processProgress(i, slotTransferPercent, "MapTransfer:Recieving");
-					else
-						ls->processProgress(i, slotTransferPercent, "MapTransfer:Done");
-				}
-			}
-			if (fileTransferPercent < 100)
-			{
-				fileTransferDone = FALSE;
-				if (fileTransferPercent == 0)
-					ls->processProgress(0, fileTransferPercent, "MapTransfer:Preparing");
-				else
-					ls->processProgress(0, fileTransferPercent, "MapTransfer:Sending");
-			}
-			else
-			{
-				DEBUG_LOG(("File transfer is 100%%!\n"));
-				ls->processProgress(0, fileTransferPercent, "MapTransfer:Done");
-			}
-
-			Int now = timeGetTime();
-			if (now > startTime + timeoutPeriod) // bail if we don't finish in a reasonable amount of time
-			{
-				DEBUG_LOG(("Timing out file transfer\n"));
-				break;
-			}
-			else
-			{
-				ls->processTimeout((startTime + timeoutPeriod - now)/1000);
-			}
-
-			ls->update(fileTransferPercent);
-		}
-
-		if (!fileTransferDone)
-		{
-			return FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-//-------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------
-
-AsciiString GetBasePathFromPath( AsciiString path )
-{
-	const char *s = path.reverseFind('\\');
-	if (s)
-	{
-		Int len = s - path.str();
-
-		AsciiString base;
-		char *buf = base.getBufferForRead(len + 1);
-		memcpy(buf, path.str(), len);
-		buf[len] = 0;
-		return buf;
-	}
-	return AsciiString::TheEmptyString;
-}
-
-AsciiString GetFileFromPath( AsciiString path )
-{
-	const char *s = path.reverseFind('\\');
-	if (s)
-		return s+1;
-	return path;
-}
-
-AsciiString GetExtensionFromFile( AsciiString fname )
-{
-	const char *s = fname.reverseFind('.');
-	if (s)
-		return s+1;
-	return fname;
-}
-
-AsciiString GetBaseFileFromFile( AsciiString fname )
-{
-	const char *s = fname.reverseFind('.');
-	if (s)
-	{
-		Int len = s - fname.str();
-
-		AsciiString base;
-		char *buf = base.getBufferForRead(len + 1);
-		memcpy(buf, fname.str(), len);
-		buf[len] = 0;
-		return buf;
-	}
-	return AsciiString::TheEmptyString;
-}
-
-AsciiString GetPreviewFromMap( AsciiString path )
-{
-	AsciiString fname = GetBaseFileFromFile(GetFileFromPath(path));
-	AsciiString base = GetBasePathFromPath(path);
-	
-	AsciiString out;
-	out.format("%s\\%s.tga", base.str(), fname.str());
-	return out;
-}
-
-AsciiString GetINIFromMap( AsciiString path )
-{
-	AsciiString base = GetBasePathFromPath(path);
-
-	AsciiString out;
-	out.format("%s\\map.ini", base.str());
-	return out;
-}
-
-AsciiString GetStrFileFromMap( AsciiString path )
-{
-	AsciiString base = GetBasePathFromPath(path);
-
-	AsciiString out;
-	out.format("%s\\map.str", base.str());
-	return out;
-}
-
-AsciiString GetSoloINIFromMap( AsciiString path )
-{
-	AsciiString base = GetBasePathFromPath(path);
-
-	AsciiString out;
-	out.format("%s\\solo.ini", base.str());
-	return out;
-}
-
-AsciiString GetAssetUsageFromMap( AsciiString path )
-{
-	AsciiString base = GetBasePathFromPath(path);
-
-	AsciiString out;
-	out.format("%s\\assetusage.txt", base.str());
-	return out;
-}
-
-AsciiString GetReadmeFromMap( AsciiString path )
-{
-	AsciiString base = GetBasePathFromPath(path);
-
-	AsciiString out;
-	out.format("%s\\readme.txt", base.str());
-	return out;
-}
-
-//-------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------
-
-Bool DoAnyMapTransfers(GameInfo *game)
-{
-	TheGameInfo = game;
-	Int mask = 0;
-	Int i=0;
-	for (i=1; i<MAX_SLOTS; ++i)
-	{
-		if (TheGameInfo->getConstSlot(i)->isHuman() && !TheGameInfo->getConstSlot(i)->hasMap())
-		{
-			DEBUG_LOG(("Adding player %d to transfer mask\n", i));
-			mask |= (1<<i);
-		}
-	}
-	if (!mask)
-		return TRUE;
-
-	TheShell->hideShell();
-	MapTransferLoadScreen *ls = NEW MapTransferLoadScreen;
-	ls->init(TheGameInfo);
-	Bool ok = TRUE;
-	if (TheGameInfo->getMapContentsMask() & 2)
-		ok = doFileTransfer(GetPreviewFromMap(game->getMap()), ls, mask);
-	if (ok && TheGameInfo->getMapContentsMask() & 4)
-		ok = doFileTransfer(GetINIFromMap(game->getMap()), ls, mask);
-	if (ok && TheGameInfo->getMapContentsMask() & 8)
-		ok = doFileTransfer(GetStrFileFromMap(game->getMap()), ls, mask);
-	if (ok && TheGameInfo->getMapContentsMask() & 16)
-		ok = doFileTransfer(GetSoloINIFromMap(game->getMap()), ls, mask);
-	if (ok && TheGameInfo->getMapContentsMask() & 32)
-		ok = doFileTransfer(GetAssetUsageFromMap(game->getMap()), ls, mask);
-	if (ok && TheGameInfo->getMapContentsMask() & 64)
-		ok = doFileTransfer(GetReadmeFromMap(game->getMap()), ls, mask);
-	if (ok)
-		ok = doFileTransfer(game->getMap(), ls, mask);
-	delete ls;
-	ls = NULL;
-	if (!ok)
-		TheShell->showShell();
-	return ok;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp
deleted file mode 100644
index 52c7356b561..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/FirewallHelper.cpp
+++ /dev/null
@@ -1,1587 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : Command & Conquer                                            *
- *                                                                                             *
- *                     $Archive:: /RedAlert2/NAT.CPP                                          $*
- *                                                                                             *
- *                      $Author:: Steve_t                                                     $*
- *                                                                                             *
- *                     $Modtime:: 3/15/01 12:00PM                                             $*
- *                                                                                             *
- *                    $Revision:: 1                                                           $*
- *                                                                                             *
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- *                                                                                             *
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- *                                                                                             *
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/crc.h"
-#include "Common/UserPreferences.h"
-#include "GameNetwork/FirewallHelper.h"
-#include "GameNetwork/NAT.h"
-#include "GameNetwork/udp.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-FirewallHelperClass *TheFirewallHelper = NULL;
-
-FirewallHelperClass * createFirewallHelper() 
-{
-	return NEW FirewallHelperClass();
-}
-
-
-/***********************************************************************************************
- * FirewallHelperClass::FirewallHelperClass -- Constructor                                     *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 5:03PM ST : Created                                                               *
- *=============================================================================================*/
-/* static */ Int FirewallHelperClass::m_sourcePortPool = 4096;
-
-FirewallHelperClass::FirewallHelperClass(void)
-{
-	//Added Sadullah Nader
-	//Initializations missing and needed
-	m_currentTry = 0;
-	m_numManglers = 0;
-	m_numResponses = 0;
-	m_packetID = 0;
-	m_timeoutLength = 0;
-	m_timeoutStart = 0;
-	//
-
-	m_behavior = FIREWALL_TYPE_UNKNOWN;
-	m_lastBehavior = FIREWALL_TYPE_UNKNOWN;
-	m_sourcePortAllocationDelta = 0;
-	m_lastSourcePortAllocationDelta = 0;
-	Int i = 0;
-	for (; i < MAX_SPARE_SOCKETS; ++i) {
-		m_spareSockets[i].port = 0;
-		m_messages[i].length = 0;
-		m_mangledPorts[i] = 0;
-		m_sparePorts[i] = 0;
-	}
-
-	for (i = 0; i < MAX_NUM_MANGLERS; i++)
-	{
-		m_manglers[i] = 0;
-	}
-	
-	m_currentState = DETECTIONSTATE_IDLE;
-
-	m_sourcePortPool = 4096 + ((timeGetTime() / 1000) % 1000); // do this to make sure we don't use the same source
-																										// port before a previous connection has had a chance
-																										// to time out.
-}
-
-
-
-/***********************************************************************************************
- * FirewallHelperClass::~FirewallHelperClass -- Destructor                                     *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/16/02 BGC : Created                                                                     *
- *=============================================================================================*/
-FirewallHelperClass::~FirewallHelperClass()
-{
-	reset();
-}
-
-/***********************************************************************************************
- * FirewallHelperClass::Reset -- Cleans out the object                                         *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/29/01 1:04AM ST : Created                                                               *
- *=============================================================================================*/
-void FirewallHelperClass::reset(void)
-{
-	closeAllSpareSockets();
-	m_currentState = DETECTIONSTATE_IDLE;
-	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
-		m_messages[i].length = 0;
-	}
-}
-
-
-
-
-/***********************************************************************************************
- * FirewallHelperClass::Detect_Firewall -- See what our firewall is up to                      *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 6:47PM ST : Created                                                               *
- *=============================================================================================*/
-Bool FirewallHelperClass::detectFirewall(void)
-{
-	OptionPreferences pref;
-
-	OptionPreferences::const_iterator it = pref.find("FirewallNeedToRefresh");
-	if (it != pref.end()) {
-		AsciiString str = it->second;
-		if (str.compareNoCase("TRUE") == 0) {
-			TheWritableGlobalData->m_firewallBehavior = FIREWALL_TYPE_UNKNOWN;
-		}
-	}
-
-	if (TheWritableGlobalData->m_firewallBehavior == FIREWALL_TYPE_UNKNOWN) {
-		detectFirewallBehavior();
-
-		return FALSE;
-	} else {
-		DEBUG_LOG(("FirewallHelperClass::detectFirewall - firewall behavior already specified as %d, port allocation delta is %d, skipping detection.\n", TheWritableGlobalData->m_firewallBehavior, TheWritableGlobalData->m_firewallPortAllocationDelta));
-	}
-
-	return TRUE;
-}
-
-
-Bool FirewallHelperClass::behaviorDetectionUpdate()
-{
-	if (m_currentState == DETECTIONSTATE_IDLE) {
-		return FALSE;
-	}
-
-	if (m_currentState == DETECTIONSTATE_DONE) {
-		return TRUE;
-	}
-
-	if (m_currentState == DETECTIONSTATE_BEGIN) {
-		return detectionBeginUpdate();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST1) {
-		return detectionTest1Update();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST2) {
-		return detectionTest2Update();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST3) {
-		return detectionTest3Update();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST3_WAITFORRESPONSES) {
-		return detectionTest3WaitForResponsesUpdate();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST4_1) {
-		return detectionTest4Stage1Update();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST4_2) {
-		return detectionTest4Stage2Update();
-	}
-
-	if (m_currentState == DETECTIONSTATE_TEST5) {
-		return detectionTest5Update();
-	}
-
-	return TRUE;
-}
-
-/***********************************************************************************************
- * FHC::getNextTemporarySourcePort -- Get a throwaway source port for temporary use        *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    number of ports in sequence to skip                                               *
- *                                                                                             *
- * OUTPUT:   port number                                                                       *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 12:06PM ST : Created                                                              *
- *=============================================================================================*/
-UnsignedShort FirewallHelperClass::getNextTemporarySourcePort(Int skip)
-{
-	UnsignedShort return_port = (UnsignedShort) m_sourcePortPool;
-
-	/*
-	** Try max 256 ports until we find one we can bind to a socket.
-	*/
-	Int tries = 256;
-	if (skip == 0) {
-		skip = 1;
-	}
-
-	while (tries--) {
-
-		m_sourcePortPool += skip;
-		return_port = (UnsignedShort) m_sourcePortPool;
-
-		if (m_sourcePortPool > 65535) {
-			m_sourcePortPool = 2048;
-		}
-
-		/*
-		** Validate the port by trying to bind it to a socket.
-		*/
-		Bool result = openSpareSocket(return_port);
-
-		if (result) {
-			closeSpareSocket(return_port);
-			return(return_port);
-		} else {
-			DEBUG_LOG(("FirewallHelperClass::getNextTemporarySourcePort - failed to open socket on port %d\n"));
-		}
-	}
-
-	return(return_port);
-
-}
-
-
-
-
-
-/***********************************************************************************************
- * FHC::sendToManglerFromPort -- Send to the mangler from the specified port               *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Address of mangler server                                                         *
- *           Source port to send *from*                                                        *
- *                                                                                             *
- * OUTPUT:   True if sent OK                                                                   *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 12:47PM ST : Created                                                              *
- *=============================================================================================*/
-Bool FirewallHelperClass::sendToManglerFromPort(UnsignedInt address, UnsignedShort port, UnsignedShort packetID, Bool blitzme)
-{
-	DEBUG_LOG(("sizeof(ManglerMessage) == %d, sizeof(ManglerData) == %d\n",
-		sizeof(ManglerMessage), sizeof(ManglerData)));
-
-	/*
-	** Build the packet to send out.
-	*/
-	ManglerMessage packet;
-	memset(&(packet.data),0x44, sizeof(ManglerData));
-	packet.data.NetCommandType = 12; // mangler request.
-	packet.data.PacketID = packetID;
-	if (blitzme) {
-		packet.data.BlitzMe = 1;
-	} else {
-		packet.data.BlitzMe = 0;
-	}
-	packet.data.magic = GENERALS_MAGIC_NUMBER;
-	packet.data.OriginalPortNumber = port;
-/*
-	DEBUG_LOG(("Pre-Adjust Buffer = "));
-	for (Int i = 0; i < sizeof(ManglerData); ++i) {
-		DEBUG_LOG(("%02x", *(((unsigned char *)(&(packet.data))) + i)));
-	}
-	DEBUG_LOG(("\n"));
-*/
-	byteAdjust(&(packet.data));
-/*
-	DEBUG_LOG(("Pre-CRC Buffer = "));
-	for (i = 0; i < sizeof(ManglerData); ++i) {
-		DEBUG_LOG(("%02x", *(((unsigned char *)(&(packet.data))) + i)));
-	}
-	DEBUG_LOG(("\n"));
-*/
-	CRC crc;
-	crc.computeCRC((unsigned char *)(&(packet.data.magic)), sizeof(ManglerData) - sizeof(unsigned int));
-	packet.data.CRC = htonl(crc.get());
-
-	packet.length = sizeof(ManglerData);
-
-	DEBUG_LOG(("FirewallHelperClass::sendToManglerFromPort - Sending from port %d to %d.%d.%d.%d:%d\n", (UnsignedInt)port,
-		PRINTF_IP_AS_4_INTS(address), MANGLER_PORT));
-/*
-	DEBUG_LOG(("Buffer = "));
-	for (i = 0; i < sizeof(ManglerData); ++i) {
-		DEBUG_LOG(("%02x", *(((unsigned char *)(&(packet.data))) + i)));
-	}
-	DEBUG_LOG(("\n"));
-*/
-	SpareSocketStruct *spareSocket = findSpareSocketByPort(port);
-//	DEBUG_LOG(("PacketID = %u\n", packetID));
-//	DEBUG_LOG(("OriginalPortNumber = %u\n", port));
-
-	if (spareSocket == NULL) {
-		DEBUG_ASSERTCRASH(spareSocket != NULL, ("Could not find spare socket for send."));
-		DEBUG_LOG(("FirewallHelperClass::sendToManglerFromPort - failed to find the spare socket for port %d\n", port));
-		return FALSE;
-	}
-
-	spareSocket->udp->Write((UnsignedByte *) &packet, sizeof(ManglerData), address, MANGLER_PORT);
-
-	return(TRUE);
-}
-
-
-SpareSocketStruct * FirewallHelperClass::findSpareSocketByPort(UnsignedShort port) {
-	DEBUG_LOG(("FirewallHelperClass::findSpareSocketByPort - trying to find spare socket with port %d\n", port));
-	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
-		if (m_spareSockets[i].port == port) {
-			DEBUG_LOG(("FirewallHelperClass::findSpareSocketByPort - found it!\n"));
-			return &(m_spareSockets[i]);
-		}
-	}
-
-	DEBUG_LOG(("FirewallHelperClass::findSpareSocketByPort - didn't find it\n"));
-	return NULL;
-}
-
-ManglerMessage * FirewallHelperClass::findEmptyMessage() {
-	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
-		if (m_messages[i].length == 0) {
-			return &(m_messages[i]);
-		}
-	}
-	return NULL;
-}
-
-void FirewallHelperClass::byteAdjust(ManglerData *data) {
-//	for (Int i = 0; i < len/4; ++i) {
-//		*buf = htonl(*buf);
-//		++buf;
-//	}
-	data->CRC = htonl(data->CRC);
-	data->magic = htons(data->magic);
-	data->MyMangledPortNumber = htons(data->MyMangledPortNumber);
-	data->OriginalPortNumber = htons(data->OriginalPortNumber);
-	data->PacketID = htons(data->PacketID);
-}
-
-/***********************************************************************************************
- * FHC::Get_Mangler_Response_On_Port -- Get the manglers response to a specific query           *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Packet id of packet we are looking for                                            *
- *                                                                                             *
- * OUTPUT:   Port the mangler saw this packet come from.                                       *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 12:51PM ST : Created                                                              *
- *=============================================================================================*/
-UnsignedShort FirewallHelperClass::getManglerResponse(UnsignedShort packetID, Int time)
-{
-	ManglerMessage *msg = NULL;
-
-//	SpareSocketStruct *spareSocket = NULL;
-
-	sockaddr_in addr;
-
-	Int i = 0;
-	for (; i < MAX_SPARE_SOCKETS; ++i) {
-		if (m_spareSockets[i].udp != NULL) {
-			ManglerMessage *message = findEmptyMessage();
-			if (message == NULL) {
-				break;
-			}
-			Int retval = m_spareSockets[i].udp->Read((unsigned char *)message, sizeof(ManglerData), &addr);
-			if (retval > 0) {
-				CRC crc;
-				crc.computeCRC((unsigned char *)(&(message->data.magic)), sizeof(ManglerData) - sizeof(unsigned int));
-				if (crc.get() != htonl(message->data.CRC)) {
-					DEBUG_LOG(("FirewallHelperClass::getManglerResponse - Saw message, CRC mismatch.  Expected CRC %u, computed CRC %u\n", message->data.CRC, crc.get()));
-					continue;
-				}
-				byteAdjust(&(message->data));
-				message->length = retval;
-				DEBUG_LOG(("FirewallHelperClass::getManglerResponse - Saw message of %d bytes from mangler %d on port %u\n", retval, i, m_spareSockets[i].port));
-				DEBUG_LOG(("FirewallHelperClass::getManglerResponse - Message has packet ID %d 0x%08X, looking for packet id %d 0x%08X\n", message->data.PacketID, message->data.PacketID, packetID, packetID));
-				if (message->data.PacketID == packetID) {
-					DEBUG_LOG(("FirewallHelperClass::getManglerResponse - packet ID's match, returning message\n"));
-					msg = message;
-					message->length = 0;
-				}
-				if (ntohs(message->data.PacketID) == packetID) {
-					DEBUG_LOG(("FirewallHelperClass::getManglerResponse - NETWORK BYTE ORDER packet ID's match, returning message\n"));
-					msg = message;
-					message->length = 0;
-				}
-			}
-		}
-	}
-
-	// See if we have already received it and saved it.
-	if (msg == NULL) {
-		for (i = 0; i < MAX_SPARE_SOCKETS; ++i) {
-			if ((m_messages[i].length != 0) && (m_messages[i].data.PacketID == packetID)) {
-				msg = &(m_messages[i]);
-				msg->length = 0;
-			}
-		}
-	}
-
-	if (msg == NULL) {
-		return 0;
-	}
-
-	UnsignedShort mangled_port = msg->data.MyMangledPortNumber;
-	DEBUG_LOG(("Mangler is seeing packets from port %d as coming from port %d\n", (UnsignedInt)msg->data.OriginalPortNumber, (UnsignedInt)mangled_port));
-	return mangled_port;
-}
-
-
-
-
-/***********************************************************************************************
- * FirewallHelperClass::Write_Firewall_Settings -- Save out firewall settings.                 *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/22/01 10:23PM ST : Created                                                              *
- *=============================================================================================*/
-void FirewallHelperClass::writeFirewallBehavior(void)
-{
-	OptionPreferences pref;
-
-	char num[16];
-	num[0] = 0;
-	itoa(TheGlobalData->m_firewallBehavior, num, 10);
-	AsciiString numstr;
-	numstr = num;
-	(pref)["FirewallBehavior"] = numstr;
-
-	TheWritableGlobalData->m_firewallPortAllocationDelta = TheFirewallHelper->getSourcePortAllocationDelta();
-	num[0] = 0;
-	itoa(TheGlobalData->m_firewallPortAllocationDelta, num, 10);
-	numstr = num;
-	(pref)["FirewallPortAllocationDelta"] = numstr;
-
-	pref.write();
-}
-
-
-/***********************************************************************************************
- * FirewallHelperClass::flagNeedToRefresh -- Flag that the next time we log in we need to      *
- *    refresh our firewall settings.                                                           *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    flag - whether or not to refresh...munkee                                         *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/19/03 4:30PM BGC : Created                                                              *
- *=============================================================================================*/
-void FirewallHelperClass::flagNeedToRefresh(Bool flag)
-{
-	OptionPreferences pref;
-
-	(pref)["FirewallNeedToRefresh"] = flag ? AsciiString("TRUE") : AsciiString("FALSE");
-
-	pref.write();
-}
-
-
-/***********************************************************************************************
- * FirewallHelperClass::Read_Firewall_Behavior -- Read in old firewall settings                *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Nothing                                                                           *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/22/01 10:25PM ST : Created                                                              *
- *=============================================================================================*/
-void FirewallHelperClass::readFirewallBehavior(void)
-{
-#if (0)
-	m_lastBehavior = (FirewallBehaviorType) ConfigINI.Get_Int("MultiPlayer", "FirewallSettings", FIREWALL_UNKNOWN);
-	m_lastSourcePortAllocationDelta = ConfigINI.Get_Int("MultiPlayer", "FirewallDelta", 1);
-#endif //(0)
-}
-
-
-
-/***********************************************************************************************
- * FHC::detectFirewallBehavior -- What is that wacky firewall doing to our packet headers?   *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Nothing                                                                           *
- *                                                                                             *
- * OUTPUT:   Firewall behavior                                                                 *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 12:30PM ST : Created                                                              *
- *=============================================================================================*/
-void FirewallHelperClass::detectFirewallBehavior(/*Bool &canRecord*/)
-{
-	m_behavior = FIREWALL_TYPE_SIMPLE;
-
-	m_currentState = DETECTIONSTATE_BEGIN;
-}
-
-FirewallHelperClass::FirewallBehaviorType FirewallHelperClass::getFirewallBehavior() {
-	m_currentState = DETECTIONSTATE_IDLE;
-	return m_behavior;
-}
-
-Short FirewallHelperClass::getSourcePortAllocationDelta() {
-	return m_sourcePortAllocationDelta;
-}
-
-/* static */ void FirewallHelperClass::getManglerName(Int manglerIndex, Char *nameBuf)
-{
-	AsciiString host;
-	UnsignedShort port;
-	TheGameSpyConfig->getManglerLocation(manglerIndex, host, port);
-	strcpy(nameBuf, host.str());
-}
-
-Bool FirewallHelperClass::detectionBeginUpdate() {
-//	UnsignedShort mangler_port = MANGLER_PORT;
-	 m_packetID = 0x7f00;
-	//int current_mangler = 0;
-
-	/*
-	** Well, we are going to need some manglers.
-	*/
-
-	UnsignedByte mangler_addresses[4][4];
-
-//	Int delta = 0;
-
-
-	/*
-	** If the user specified a particular port to use then we act as if there is no firewall.
-	*/
-	if (TheWritableGlobalData->m_firewallPortOverride != 0) {
-		m_behavior = FIREWALL_TYPE_SIMPLE;
-		DEBUG_LOG(("Source port %d specified by user\n", TheGlobalData->m_firewallPortOverride));
-
-		if (TheGlobalData->m_firewallSendDelay) {
-			UnsignedInt addbehavior = FIREWALL_TYPE_NETGEAR_BUG;
-			addbehavior |= (UnsignedInt)m_behavior;
-			m_behavior = (FirewallBehaviorType) addbehavior;
-			DEBUG_LOG(("Netgear bug specified by command line or SendDelay flag\n"));
-		}
-		m_currentState = DETECTIONSTATE_DONE;
-		return TRUE;
-	}
-
-
-
-	m_timeoutStart = timeGetTime();
-	m_timeoutLength = 5000;
-	DEBUG_LOG(("About to call gethostbyname for the mangler address\n"));
-	int namenum = 0;
-
-	do {
-		AsciiString host;
-		UnsignedShort port;
-		TheGameSpyConfig->getManglerLocation(namenum, host, port);
-		const char *mangler_name_ptr = host.str();
-		DEBUG_LOG(("Looking at %s:%d", host.str(), port));
-
-		/*
-		** Use the wolapi supplied mangler info if available.
-		*/
-//		if (NumManglerServers > namenum) {
-//			mangler_name_ptr = &ManglerServerAddress[namenum][0];
-//			mangler_port = ManglerServerPort[namenum];
-			//current_mangler = CurrentManglerServer;
-//			DEBUG_LOG(("Using mangler from servserv\n"));
-//		}
-		namenum++;
-
-		if (strlen(mangler_name_ptr) == 0) {
-			break;
-		}
-
-		/*
-		** Do the lookup.
-		*/
-		char temp_name[256];
-		strcpy(temp_name, mangler_name_ptr);
-		struct hostent *host_info = gethostbyname(temp_name);
-
-		if (!host_info) {
-			DEBUG_LOG(("gethostbyname failed! Error code %d\n", WSAGetLastError()));
-			break;
-		}
-
-		/*
-		** See if we already have that address in the list.
-		*/
-		Bool found = FALSE;
-		for (Int i=0 ; i<m_numManglers; i++) {
-			if (memcmp(mangler_addresses[i], &host_info->h_addr_list[0][0], 4) == 0) {
-				found = TRUE;
-				break;
-			}
-		}
-		/*
-		** Add the address in if we didn't find it.
-		*/
-		if (!found) {
-			Int m = m_numManglers++;
-			memcpy(&mangler_addresses[m][0], &host_info->h_addr_list[0][0], 4);
-			ntohl((UnsignedInt)mangler_addresses[m]);
-			DEBUG_LOG(("Found mangler address at %d.%d.%d.%d\n", mangler_addresses[m][0], mangler_addresses[m][1], mangler_addresses[m][2], mangler_addresses[m][3]));
-		}
-
-	} while ((m_numManglers < MAX_NUM_MANGLERS) && ((timeGetTime() - m_timeoutStart) < m_timeoutLength));
-
-
-	DEBUG_ASSERTCRASH(m_numManglers > 2, ("not enough mangler addresses found."));
-	if (m_numManglers < 3) {
-		m_currentState = DETECTIONSTATE_DONE;
-		return TRUE;
-	}
-
-	for (Int i=0 ; i<m_numManglers ; i++) {
-		UnsignedInt temp = 0;
-		temp = mangler_addresses[i][3];
-		temp += mangler_addresses[i][2] << 8;
-		temp += mangler_addresses[i][1] << 16;
-		temp += mangler_addresses[i][0] << 24;
-		m_manglers[i] = temp;
-//		memcpy(&(m_manglers[i]), &mangler_addresses[i][0], 4);
-	}
-
-	DEBUG_LOG(("FirewallHelperClass::detectionBeginUpdate - Testing for Netgear bug\n"));
-
-	/*
-	** See if the user specified a netgear firewall - that will save us the trouble.
-	*/
-	if (TheGlobalData->m_firewallSendDelay) {
-		UnsignedInt addbehavior = FIREWALL_TYPE_NETGEAR_BUG;
-		addbehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType) addbehavior;
-		DEBUG_LOG(("FirewallHelperClass::detectionBeginUpdate - Netgear bug specified by command line or SendDelay flag\n"));
-	} else {
-		DEBUG_LOG(("FirewallHelperClass::detectionBeginUpdate - Netgear bug not specified\n"));
-	}
-
-	/*
-	** OK, we have our manglers.
-	**
-	** First test, see if there is any port mangling at all.
-	**
-	**
-	**
-	*/
-
-	DEBUG_LOG(("About to start mangler test 1\n"));
-	/*
-	** Get a spare port number and create a new socket to bind it to.
-	*/
-	m_sparePorts[0] = getNextTemporarySourcePort(0);
-	if (!openSpareSocket(m_sparePorts[0])) {
-		m_currentState = DETECTIONSTATE_DONE;
-		return TRUE;
-	}
-
-	/*
-	** Send to the mangler from this port until we get a response.
-	*/
-	m_timeoutStart = timeGetTime();
-	m_timeoutLength = 6000;
-
-	sendToManglerFromPort(m_manglers[0], m_sparePorts[0], m_packetID);
-	m_currentState = DETECTIONSTATE_TEST1;
-	return FALSE;
-}
-
-
-Bool FirewallHelperClass::detectionTest1Update() {
-
-	m_mangledPorts[0] = getManglerResponse(m_packetID);
-
-	/*
-	** See if we got no response or a non-mangled response.
-	*/
-	if (m_mangledPorts[0] == 0 || m_mangledPorts[0] == m_sparePorts[0]) {
-		if (m_mangledPorts[0] == m_sparePorts[0]) {
-			m_sourcePortAllocationDelta = 0;
-			DEBUG_LOG(("FirewallHelperClass::detectionTest1Update - Non-mangled response from mangler, quitting test.\n"));
-		}
-		if ((m_mangledPorts[0] == 0) && ((timeGetTime() - m_timeoutStart) < m_timeoutLength)) {
-			// we are still waiting for a response and haven't timed out yet.
-			DEBUG_LOG(("FirewallHelperClass::detectionTest1Update - waiting for response from mangler.\n"));
-			return FALSE;
-		}
-		if ((m_mangledPorts[0] == 0) && ((timeGetTime() - m_timeoutStart) >= m_timeoutLength)) {
-			// we are still waiting for a response and we timed out.
-			DEBUG_LOG(("FirewallHelperClass::detectionTest1Update - timed out waiting for response from mangler.\n"));
-		}
-		// either we have received a non-mangled response or we timed out waiting for a response.
-		closeSpareSocket(m_sparePorts[0]);
-
-		m_currentState = DETECTIONSTATE_DONE;
-		return TRUE;
-	}
-
-	DEBUG_LOG(("FirewallHelperClass::detectionTest1Update - test 1 complete\n"));
-	/*
-	** Test one completed, time to start up the second test.
-	**
-	** Second test. See if the ports are mangled differently for different destination IPs.
-	**
-	** We can use the spare socket from the last test and send to a different mangler.
-	**
-	*/
-
-	/*
-	** Send to the mangler from this port until we get a response.
-	*/
-	m_timeoutStart = timeGetTime();
-	m_timeoutLength = 6000;
-	m_mangledPorts[1] = 0;
-	sendToManglerFromPort(m_manglers[1], m_sparePorts[0], m_packetID+1);
-
-	m_currentState = DETECTIONSTATE_TEST2;
-	return FALSE;
-}
-
-Bool FirewallHelperClass::detectionTest2Update() {
-
-	m_mangledPorts[1] = getManglerResponse(m_packetID+1);
-
-	if (m_mangledPorts[1] == 0) {
-		if ((timeGetTime() - m_timeoutStart) <= m_timeoutLength) {
-			return FALSE;
-		}
-		DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - timed out waiting for mangler response\n"));
-		m_currentState = DETECTIONSTATE_DONE;
-		return TRUE;
-	}
-
-	/*
-	** We are done with this socket/port
-	*/
-	closeSpareSocket(m_sparePorts[0]);
-
-	/*
-	** See if we got no response or a non-mangled response.
-	*/
-	if (m_mangledPorts[1] == 0 || m_mangledPorts[1] == m_sparePorts[0]) {
-		m_currentState = DETECTIONSTATE_DONE;
-		UnsignedInt addBehavior = (UnsignedInt)FIREWALL_TYPE_SIMPLE;
-		addBehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType)addBehavior;
-
-		if (m_mangledPorts[1] == 0) {
-			DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - got no response from mangler\n"));
-		} else {
-			DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - got a mangler response, no port mangling\n"));
-		}
-		DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - Setting behavior to SIMPLE, done testing\n"));
-		return TRUE;
-	}
-
-	if (m_mangledPorts[0] == m_mangledPorts[1]) {
-		DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - port mangling doesn't depend on destination IP, setting to DUMB_MANGLING\n"));
-		UnsignedInt addBehavior = (UnsignedInt)FIREWALL_TYPE_DUMB_MANGLING;
-		addBehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType)addBehavior;
-	} else {
-		DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - port mangling depends on destination IP, setting to SMART_MANGLING\n"));
-		UnsignedInt addBehavior = (UnsignedInt)FIREWALL_TYPE_SMART_MANGLING;
-		addBehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType)addBehavior;
-	}
-
-
-
-
-	/*
-	** Third test.
-	**
-	** This test tries to detect a pattern in the ports allocated by the NAT.
-	** We use several source ports for this one.
-	**
-	*/
-
-	m_currentTry = 0;
-	m_packetID = m_packetID + 10;
-
-	DEBUG_LOG(("FirewallHelperClass::detectionTest2Update - moving on to 3rd test\n"));
-
-	m_currentState = DETECTIONSTATE_TEST3;
-	return FALSE;
-}
-
-Bool FirewallHelperClass::detectionTest3Update() {
-	/*
-	** Try this whole thing a max of 3 times.
-	*/
-	if (m_currentTry < 3) {
-		memset(m_sparePorts, 0, sizeof(m_sparePorts));
-		memset(m_mangledPorts, 0, sizeof(m_mangledPorts));
-
-		/*
-		** Open a socket for each source port.
-		** We should use a non-linear set of source ports so we can detect the NAT32 relative offset
-		** case.
-		*/
-		Int i=0;
-		for (; i<NUM_TEST_PORTS ; i++) {
-			m_sparePorts[i] = getNextTemporarySourcePort(i);
-			if (!openSpareSocket(m_sparePorts[i])) {
-
-				/*
-				** Close any spare ports we allocated already before we bail.
-				*/
-				for (Int j=0 ; j<i ; j++) {
-					if (m_sparePorts[j]) {
-						closeSpareSocket(m_sparePorts[j]);
-					}
-				}
-				DEBUG_LOG(("FirewallHelperClass::detectionTest3Update - Failed to open all the spare sockets, bailing test\n"));
-				m_currentState = DETECTIONSTATE_DONE;
-				return TRUE;
-			}
-		}
-
-		/*
-		** OK, lets get some numbers from the mangler.
-		**
-		** Keep sending from each port until we get a response to all the sends. There's a implied
-		** delay between initial sends due to the timeout in Get_Mangler_Response.
-		*/
-		m_timeoutStart = timeGetTime();
-		m_timeoutLength = 12000;
-
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3Update - Sending to %d manglers\n", NUM_TEST_PORTS));
-		for (i=0 ; i<NUM_TEST_PORTS ; i++) {
-			if (m_mangledPorts[i] == 0) {
-				sendToManglerFromPort(m_manglers[0], m_sparePorts[i], m_packetID+i);
-			}
-		}
-
-		m_numResponses = 0;
-
-		m_currentState = DETECTIONSTATE_TEST3_WAITFORRESPONSES;
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3Update - Waiting for mangler responses\n"));
-		return FALSE;
-	}
-
-	DEBUG_LOG(("FirewallHelperClass::detectionTest3Update - Failed to complete test, quitting\n"));
-	m_currentState = DETECTIONSTATE_DONE;
-	return TRUE;
-}
-
-Bool FirewallHelperClass::detectionTest3WaitForResponsesUpdate() {
-	Int i = 0;
-	for (; i < NUM_TEST_PORTS; ++i) {
-		if (m_mangledPorts[i] == 0) {
-			m_mangledPorts[i] = getManglerResponse(m_packetID + i);
-			if (m_mangledPorts[i] != 0) {
-				++m_numResponses;
-			}
-		}
-	}
-
-	if (m_numResponses < NUM_TEST_PORTS) {
-		if ((timeGetTime() - m_timeoutStart) > m_timeoutLength) {
-			/*
-			** Close down those sockets - we are finished with them.
-			*/
-			for (Int j=0 ; j<i ; j++) {
-				if (m_spareSockets[j].port != 0) {
-					closeSpareSocket(m_spareSockets[j].port);
-				}
-			}
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - timed out waiting, bailing test\n"));
-			m_currentState = DETECTIONSTATE_DONE;
-			return TRUE;
-		}
-		return FALSE;
-	}
-
-	/*
-	** Close down those sockets - we are finished with them.
-	*/
-	for (Int j=0 ; j<i ; j++) {
-		if (m_spareSockets[j].port != 0) {
-			closeSpareSocket(m_spareSockets[j].port);
-		}
-	}
-
-	/*
-	** We need at least 4 responses to be sure of the port allocation scheme.
-	*/
-	if (m_numResponses < 4) {
-		if (m_lastSourcePortAllocationDelta != 0 && (int)m_lastBehavior > (int)FIREWALL_TYPE_SIMPLE) {
-			/*
-			** If the delta we got last time we played looks good then use that.
-			*/
-			m_sourcePortAllocationDelta = m_lastSourcePortAllocationDelta;
-		}
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - didn't get enough responses, using %d as the source port allocation delta, finished test\n"));
-		m_currentState = DETECTIONSTATE_DONE;
-		return TRUE;
-	}
-
-
-	Bool relative_delta = FALSE;
-	Bool looks_good = FALSE;
-	Int delta = getNATPortAllocationScheme(m_numResponses, m_sparePorts, m_mangledPorts, relative_delta, looks_good);
-	DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - getNATPortAllocationScheme returned %d\n", delta));
-
-	if (delta) {
-
-		/*
-		** Hey, we got it!
-		*/
-		UnsignedInt addbehavior = 0;
-		if (relative_delta) {
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - detected RELATIVE PORT ALLOCATION\n"));
-			addbehavior = (UnsignedInt)FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION;
-		} else {
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - detected SIMPLE PORT ALLOCATION\n"));
-			addbehavior = (UnsignedInt)FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION;
-		}
-		addbehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType) addbehavior;
-
-		m_sourcePortAllocationDelta = delta;
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - setting source port delta to %d\n", delta));
-	} else {
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - didn't get a delta value\n"));
-		if (m_lastSourcePortAllocationDelta != 0 && (Int)m_lastBehavior > (Int)FIREWALL_TYPE_SIMPLE) {
-			/*
-			** If the delta we got last time we played looks good then use that.
-			*/
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - using the port allocation delta we have from before which is %d\n", m_lastSourcePortAllocationDelta));
-			m_sourcePortAllocationDelta = m_lastSourcePortAllocationDelta;
-		}
-		++m_currentTry;
-		m_currentState = DETECTIONSTATE_TEST3;
-		return FALSE;
-	}
-
-	DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - starting 4th test\n"));
-	/*
-	** Fourth test.
-	**
-	** Test to see if the NAT mangles differently per destination port at the same IP.
-	*/
-	if ((m_behavior & FIREWALL_TYPE_SMART_MANGLING) != 0) {
-
-		if ((m_behavior & FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION) != 0) {
-
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - simple port allocation, Testing to see if the NAT mangles differently per destination port at the same IP\n"));
-
-			/*
-			** We need 2 source ports for this.
-			*/
-			m_sparePorts[0] = getNextTemporarySourcePort(0);
-			if (!openSpareSocket(m_sparePorts[0])) {
-				m_currentState = DETECTIONSTATE_DONE;
-				DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - Failed to open first spare port, bailing\n"));
-				return TRUE;
-			}
-
-			m_sparePorts[1] = getNextTemporarySourcePort(0);
-			if (!openSpareSocket(m_sparePorts[1])) {
-				closeSpareSocket(m_sparePorts[0]);
-				m_currentState = DETECTIONSTATE_DONE;
-				DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - Failed to open second spare port, bailing\n"));
-				return TRUE;
-			}
-
-			/*
-			** Get a reference port.
-			*/
-			m_timeoutStart = timeGetTime();
-			m_timeoutLength = 4000;
-			m_mangledPorts[0] = 0;
-			m_packetID += 10;
-
-			/*
-			** Wait for a response.
-			*/
-			sendToManglerFromPort(m_manglers[0], m_sparePorts[0], m_packetID);
-
-			m_currentState = DETECTIONSTATE_TEST4_1;
-			return FALSE;
-		} else {
-			/*
-			** NAT32 uses different mangled source ports for different destination ports.
-			*/
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - relative port allocation, NAT32 right?\n"));
-			UnsignedInt addbehavior = 0;
-			addbehavior = (UnsignedInt)FIREWALL_TYPE_DESTINATION_PORT_DELTA;
-			DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - adding DESTINATION PORT DELTA to behavior\n"));
-			addbehavior |= (UnsignedInt)m_behavior;
-			m_behavior = (FirewallBehaviorType) addbehavior;
-		}
-	} else {
-		DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForResponsesUpdate - We don't have smart mangling, skipping test 4, entering test 5\n"));
-	}
-
-	DEBUG_LOG(("FirewallHelperClass::detectionTest3WaitForRepsonsesUpdate - entering test 5\n"));
-
-	m_currentState = DETECTIONSTATE_TEST5;
-	return FALSE;
-}
-
-
-
-Bool FirewallHelperClass::detectionTest4Stage1Update() {
-	m_mangledPorts[0] = getManglerResponse(m_packetID);
-
-	if (m_mangledPorts[0] == 0) {
-		if ((timeGetTime() - m_timeoutStart) > m_timeoutLength) {
-			closeSpareSocket(m_sparePorts[0]);
-			closeSpareSocket(m_sparePorts[1]);
-			m_currentState = DETECTIONSTATE_DONE;
-			DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage1Update - timed out waiting for mangler response, quitting\n"));
-			return TRUE;
-		}
-		return FALSE;
-	}
-
-	/*
-	** Send out to a different port at that IP.
-	** We won't get a response for this.
-	*/
-	UnsignedInt addr = m_manglers[0];
-	UnsignedShort port1 = m_sparePorts[0] + 1;
-	sendToManglerFromPort(addr, port1, m_packetID);
-	sendToManglerFromPort(addr, port1, m_packetID);
-	sendToManglerFromPort(addr, port1, m_packetID);
-
-	/*
-	** We can't get a response from a different destination port so the only way to detect
-	** this behavior is to check the next mangled port allocation to see if it's double
-	** what we would normally expect.
-	*/
-	m_packetID++;
-	m_timeoutStart = timeGetTime();
-	m_timeoutLength = 4000;
-
-	sendToManglerFromPort(m_manglers[0], m_sparePorts[1], m_packetID);
-
-	m_currentState = DETECTIONSTATE_TEST4_2;
-	return FALSE;
-}
-
-Bool FirewallHelperClass::detectionTest4Stage2Update() {
-	m_mangledPorts[1] = getManglerResponse(m_packetID);
-
-	if (m_mangledPorts[1] == 0) {
-		if ((timeGetTime() - m_timeoutStart) > m_timeoutLength) {
-			closeSpareSocket(m_sparePorts[0]);
-			closeSpareSocket(m_sparePorts[1]);
-			m_currentState = DETECTIONSTATE_DONE;
-			DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage2Update - timed out waiting for the second mangler response, quitting\n"));
-			return TRUE;
-		}
-		return FALSE;
-	}
-
-	if (m_mangledPorts[1] != m_mangledPorts[0] + m_sourcePortAllocationDelta) {
-		DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage2Update - NAT uses different source ports for different destination ports\n"));
-
-		UnsignedInt addbehavior = 0;
-		addbehavior = (UnsignedInt)FIREWALL_TYPE_DESTINATION_PORT_DELTA;
-		addbehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType) addbehavior;
-	} else {
-		DEBUG_ASSERTCRASH(m_mangledPorts[1] == m_mangledPorts[0] + m_sourcePortAllocationDelta, ("Problem getting the source port deltas."));
-		if (m_mangledPorts[1] == m_mangledPorts[0] + m_sourcePortAllocationDelta) {
-			DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage2Update - NAT uses the same source port for different destination ports\n"));
-		} else {
-			DEBUG_LOG(("FirewallHelperClass::detectionTest4Stage2Update - Unable to complete destination port mangling test\n"));
-			DEBUG_CRASH(("Unable to complete destination port mangling test\n"));
-		}
-	}
-
-	m_currentState = DETECTIONSTATE_TEST5;
-	
-	return detectionTest5Update();
-}
-
-Bool FirewallHelperClass::detectionTest5Update() {
-	/*
-	** We have done all the tests we *have* to. There's other info that it would be nice to know though.
-	**
-	** Test for the netgear bug behavior.
-	*/
-#if (0)
-// moved to before test 1.  Moved because this flag could be specified for another firewall
-// for testing purposes and never get this far because it has behavior that doesn't require
-// all the tests to be performed.
-// BGC 10/1/02
-	DEBUG_LOG(("FirewallHelperClass::detectionTest5Update - Testing for Netgear bug\n"));
-
-	/*
-	** See if the user specified a netgear firewall - that will save us the trouble.
-	*/
-	if (TheGlobalData->m_firewallSendDelay) {
-		UnsignedInt addbehavior = FIREWALL_TYPE_NETGEAR_BUG;
-		addbehavior |= (UnsignedInt)m_behavior;
-		m_behavior = (FirewallBehaviorType) addbehavior;
-		DEBUG_LOG(("FirewallHelperClass::detectionTest5Update - Netgear bug specified by command line or SendDelay flag\n"));
-	} else {
-		DEBUG_LOG(("FirewallHelperClass::detectionTest5Update - Netgear bug not specified\n"));
-	}
-#endif // #if (0)
-
-	DEBUG_LOG(("FirewallHelperClass::detectionTest5Update - All done, behavior is: "));
-
-	if ((m_behavior & FIREWALL_TYPE_SIMPLE) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_SIMPLE "));
-	}
-	if ((m_behavior & FIREWALL_TYPE_DUMB_MANGLING) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_DUMB_MANGLING "));
-	}
-	if ((m_behavior & FIREWALL_TYPE_SMART_MANGLING) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_SMART_MANGLING "));
-	}
-	if ((m_behavior & FIREWALL_TYPE_NETGEAR_BUG) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_NETGEAR_BUG "));
-	}
-	if ((m_behavior & FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION "));
-	}
-	if ((m_behavior & FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION "));
-	}
-	if ((m_behavior & FIREWALL_TYPE_DESTINATION_PORT_DELTA) != 0) {
-		DEBUG_LOG((" FIREWALL_TYPE_DESTINATION_PORT_DELTA "));
-	}
-
-	DEBUG_LOG(("\n"));
-
-	m_currentState = DETECTIONSTATE_DONE;
-	return TRUE;
-}
-
-
-/***********************************************************************************************
- * FHC::Get_NAT_Port_Allocation_Scheme -- Find out how a NAT is allocating ports               *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Number of ports we should analyze                                                 *
- *           List of original port numbers                                                     *
- *           List of mangled port numbers                                                      *
- *           relative_delta (out) Is the delta relative to the original port number?           *
- *           looks_good (out) Do all the values point to the same delta?                       *
- *                                                                                             *
- * OUTPUT:   Port allocation delta                                                             *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/15/01 4:45PM ST : Created                                                               *
- *=============================================================================================*/
-Int FirewallHelperClass::getNATPortAllocationScheme(Int numPorts, UnsignedShort *originalPorts, UnsignedShort *mangledPorts, Bool &relativeDelta, Bool &looksGood)
-{
-	DEBUG_ASSERTCRASH(numPorts > 3, ("numPorts too small"));
-
-	DEBUG_LOG(("Looking for port allocation pattern in originalPorts %d, %d, %d, %d\n", originalPorts[0], originalPorts[1], originalPorts[2], originalPorts[3]));
-
-	/*
-	** Sort the mangled ports into order - should be easier to detect patterns.
-	** Stupid bubble sort will do. original_ports may be out of oder after the sort.
-	*/
-	for (Int x=0 ; x<numPorts ; x++) {
-		for (Int y=0 ; y<numPorts-1 ; y++) {
-			if (mangledPorts[y] > mangledPorts[y+1]) {
-				Int temp = mangledPorts[y];
-				mangledPorts[y] = mangledPorts[y+1];
-				mangledPorts[y+1] = temp;
-				temp = originalPorts[y];
-				originalPorts[y] = originalPorts[y+1];
-				originalPorts[y+1] = temp;
-			}
-		}
-	}
-
-	/*
-	** Now start looking for patterns in the port numbers. Possible patterns include.
-	**
-	** Incremental. Port numbers are allocated incrementally.
-	** Every 'n' ports. NAT adds 'n' port numbers when allocating ports.
-	**
-	** Also, schemes may be absolute or relative to the original port number.
-	*/
-
-	/*
-	** 1. Check for absolute sequential allocation.
-	*/
-	if (mangledPorts[1] - mangledPorts[0] == 1) {
-		if (mangledPorts[2] - mangledPorts[1] == 1) {
-			if (mangledPorts[3] - mangledPorts[2] == 1) {
-				DEBUG_LOG(("Incremental port allocation detected\n"));
-				relativeDelta = FALSE;
-				looksGood = TRUE;
-				return(1);
-			}
-		}
-	}
-
-	/*
-	** 2. Check for semi sequential.
-	*/
-	if (mangledPorts[1] - mangledPorts[0] == 2) {
-		if (mangledPorts[2] - mangledPorts[1] == 2) {
-			if (mangledPorts[3] - mangledPorts[2] == 2) {
-				DEBUG_LOG(("Semi-incremental port allocation detected\n"));
-				relativeDelta = FALSE;
-				looksGood = TRUE;
-				return(2);
-			}
-		}
-	}
-
-	Int diff1 = mangledPorts[1] - mangledPorts[0];
-	Int diff2 = mangledPorts[2] - mangledPorts[1];
-	Int diff3 = mangledPorts[3] - mangledPorts[2];
-
-
-	/*
-	** 3. Check for absolute scheme skipping 'n' ports.
-	*/
-	if (diff1 == diff2 && diff2 == diff3) {
-		DEBUG_LOG(("Looks good for absolute allocation sequence delta of %d\n", diff1));
-		relativeDelta = FALSE;
-		looksGood = TRUE;
-		return(diff1);
-	}
-
-	if (diff1 == diff2) {
-		DEBUG_LOG(("Probable absolute allocation sequence delta of %d\n", diff1));
-		relativeDelta = FALSE;
-		looksGood = FALSE;
-		return(diff1);
-	}
-
-	if (diff2 == diff3) {
-		DEBUG_LOG(("Probable absolute allocation sequence delta of %d\n", diff2));
-		relativeDelta = FALSE;
-		looksGood = FALSE;
-		return(diff2);
-	}
-
-
-
-
-	/*
-	** Insert more tests here if we can think of any!!!!!
-	*/
-
-
-
-	/*
-	** 4. Check for relative scheme skipping 'n' ports. NAT32 behaves this way, it skips 100 ports
-	** each time.
-	*/
-	for (Int i=0 ; i<numPorts ; i++) {
-		mangledPorts[i] -= originalPorts[i];
-	}
-
-	diff1 = mangledPorts[1] - mangledPorts[0];
-	diff2 = mangledPorts[2] - mangledPorts[1];
-	diff3 = mangledPorts[3] - mangledPorts[2];
-
-	/*
-	** Look for a linear pattern.
-	*/
-	if (diff1 == diff2 && diff2 == diff3) {
-		/*
-		** Return a -ve result to indicate that port mangling is relative.
-		*/
-		DEBUG_LOG(("Looks good for a relative port range delta of %d\n", diff1));
-		relativeDelta = TRUE;
-		looksGood = TRUE;
-		return(diff1);
-	}
-
-	/*
-	** Look for a broken pattern. Maybe the NAT skipped a whole range.
-	*/
-	if (diff1 == diff2 || diff1 == diff3) {
-		DEBUG_LOG(("Detected probable broken relative port range delta of %d\n", diff1));
-		relativeDelta = TRUE;
-		looksGood = FALSE;
-		return(diff1);
-	}
-
-	if (diff2 == diff3) {
-		DEBUG_LOG(("Detected probable broken relative port range delta of %d\n", diff2));
-		relativeDelta = TRUE;
-		looksGood = FALSE;
-		return(diff2);
-	}
-
-
-	/*
-	** Aw hell, I don't know what it is.
-	*/
-	looksGood = FALSE;
-	relativeDelta = FALSE;
-	return(0);
-}
-
-
-
-
-
-
-/***********************************************************************************************
- * FHC::Get_Firewall_Hardness -- How hard is it to connect to this firewall                    *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Firewall behavior                                                                 *
- *                                                                                             *
- * OUTPUT:   Hardness                                                                          *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/16/01 11:43AM ST : Created                                                              *
- *=============================================================================================*/
-Int FirewallHelperClass::getFirewallHardness(FirewallBehaviorType behavior)
-{
-
-	Int hardness = 0;
-
-
-	UnsignedInt fw = (UnsignedInt) behavior;
-
-	if (((UnsignedInt)FIREWALL_TYPE_SIMPLE & fw) != 0) {
-		hardness++;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_DUMB_MANGLING & fw) != 0) {
-		hardness += 2;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_SMART_MANGLING & fw) != 0) {
-		hardness += 3;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_NETGEAR_BUG & fw) != 0) {
-		hardness += 10;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION & fw) != 0) {
-		hardness += 1;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION & fw) != 0) {
-		hardness += 2;
-	}
-
-	return(hardness);
-}
-
-
-
-
-
-/***********************************************************************************************
- * FHC::Get_Firewall_Retries -- How many retries is it likely to take before we connect?       *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Firewall behavior                                                                 *
- *                                                                                             *
- * OUTPUT:   Hardness                                                                          *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   3/16/01 11:43AM ST : Created                                                              *
- *=============================================================================================*/
-Int FirewallHelperClass::getFirewallRetries(FirewallBehaviorType behavior)
-{
-
-	Int retries = 2;
-
-
-	UnsignedInt fw = (UnsignedInt) behavior;
-
-	if (((UnsignedInt)FIREWALL_TYPE_SIMPLE & fw) != 0) {
-		retries++;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_DUMB_MANGLING & fw) != 0) {
-		retries += 1;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_SMART_MANGLING & fw) != 0) {
-		retries += 1;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_NETGEAR_BUG & fw) != 0) {
-		//retries += 10;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION & fw) != 0) {
-		//retries += 1;
-	}
-
-	if (((UnsignedInt)FIREWALL_TYPE_RELATIVE_PORT_ALLOCATION & fw) != 0) {
-		retries += 5;
-	}
-
-	return(retries);
-}
-
-
-
-/*
- *  openSpareSocket - opens a socket for communication on a specified port.
- *  returns TRUE if successful, FALSE otherwise.
- */
-Bool FirewallHelperClass::openSpareSocket(UnsignedShort port) {
-	Int i = 0;
-	for (; i < MAX_SPARE_SOCKETS; ++i) {
-		if (m_spareSockets[i].port == 0) {
-			break;
-		}
-	}
-
-	// don't have room for any more spare sockets.  Fail.
-	if (i == MAX_SPARE_SOCKETS) {
-		DEBUG_ASSERTCRASH(i < MAX_SPARE_SOCKETS, ("Ran out of spare sockets."));
-		return FALSE;
-	}
-
-	m_spareSockets[i].udp = NEW UDP();
-	if (m_spareSockets[i].udp == NULL) {
-		DEBUG_LOG(("FirewallHelperClass::openSpareSocket - failed to create UDP object\n"));
-		return FALSE;
-	}
-
-	if (m_spareSockets[i].udp->Bind((UnsignedInt)0, port) != 0) {
-		DEBUG_CRASH(("FirewallHelperClass::openSpareSocket - Failed to init spare socket"));
-		return FALSE;
-	}
-
-	m_spareSockets[i].port = port;
-	DEBUG_LOG(("FirewallHelperClass::openSpareSocket - port %d is open for send\n", port));
-	return TRUE;
-}
-
-/*
- *  closeSpareSocket - closes a socket at a specific port.
- */
-void FirewallHelperClass::closeSpareSocket(UnsignedShort port) {
-	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
-		if (m_spareSockets[i].port == port) {
-			if (m_spareSockets[i].udp != NULL) {
-				delete m_spareSockets[i].udp;
-				m_spareSockets[i].udp = NULL;
-			}
-			m_spareSockets[i].port = 0;
-			break;
-		}
-	}
-}
-
-/*
- *  closeAllSpareSockets - closes all spare sockets, duh.
- */
-void FirewallHelperClass::closeAllSpareSockets() {
-	for (Int i = 0; i < MAX_SPARE_SOCKETS; ++i) {
-		if (m_spareSockets[i].port != 0) {
-			m_spareSockets[i].port = 0;
-		}
-		if (m_spareSockets[i].udp != NULL) {
-			delete (m_spareSockets[i].udp);
-			m_spareSockets[i].udp = NULL;
-		}
-	}
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/FrameData.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/FrameData.cpp
deleted file mode 100644
index 3df2510facf..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/FrameData.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/FrameData.h"
-#include "GameNetwork/networkutil.h"
-
-/**
- * Constructor
- */
-FrameData::FrameData() 
-{
-	m_frame = 0;
-	m_commandList = NULL;
-	m_commandCount = 0;
-	m_frameCommandCount = -1;
-	//Added By Sadullah Nader
-	//Initializations missing and needed
-	m_lastFailedCC = 0;
-	m_lastFailedFrameCC = 0;
-	//
-}
-
-/**
- * Destructor
- */
-FrameData::~FrameData() 
-{
-	if (m_commandList != NULL) {
-		deleteInstance(m_commandList);
-		m_commandList = NULL;
-	}
-}
-
-/**
- * Initialize this thing.
- */
-void FrameData::init() 
-{
-	m_frame = 0;
-	if (m_commandList == NULL) {
-		m_commandList = newInstance(NetCommandList);
-		m_commandList->init();
-	}
-	m_commandList->reset();
-
-	m_frameCommandCount = -1;
-	//DEBUG_LOG(("FrameData::init\n"));
-	m_commandCount = 0;
-	m_lastFailedCC = -2;
-	m_lastFailedFrameCC = -2;
-}
-
-/**
- * Reset this thing.
- */
-void FrameData::reset() {
-	init();
-}
-
-/**
- * update the thing, doesn't do anything at the moment.
- */
-void FrameData::update() {
-}
-
-/**
- * return the frame number this frame data is associated with.
- */
-UnsignedInt FrameData::getFrame() {
-	return m_frame;
-}
-
-/**
- * Assign the frame number this frame data is associated with.
- */
-void FrameData::setFrame(UnsignedInt frame) {
-	m_frame = frame;
-}
-
-/**
- * Returns true if all the frame command count is equal to the number of commands that have been received.
- */
-FrameDataReturnType FrameData::allCommandsReady(Bool debugSpewage) {
-	if (m_frameCommandCount == m_commandCount) {
-		m_lastFailedFrameCC = -2;
-		m_lastFailedCC = -2;
-		return FRAMEDATA_READY;
-	}
-
-	if (debugSpewage) {
-		if ((m_lastFailedFrameCC != m_frameCommandCount) || (m_lastFailedCC != m_commandCount)) {
-			DEBUG_LOG(("FrameData::allCommandsReady - failed, frame command count = %d, command count = %d\n", m_frameCommandCount, m_commandCount));
-			m_lastFailedFrameCC = m_frameCommandCount;
-			m_lastFailedCC = m_commandCount;
-		}
-	}
-
-	if (m_commandCount > m_frameCommandCount) {
-		DEBUG_LOG(("FrameData::allCommandsReady - There are more commands than there should be (%d, should be %d).  Commands in command list are...\n", m_commandCount, m_frameCommandCount));
-		NetCommandRef *ref = m_commandList->getFirstMessage();
-		while (ref != NULL) {
-			DEBUG_LOG(("%s, frame = %d, id = %d\n", GetAsciiNetCommandType(ref->getCommand()->getNetCommandType()).str(), ref->getCommand()->getExecutionFrame(), ref->getCommand()->getID()));
-			ref = ref->getNext();
-		}
-		DEBUG_LOG(("FrameData::allCommandsReady - End of command list.\n"));
-		DEBUG_LOG(("FrameData::allCommandsReady - about to clear the command list\n"));
-		reset();
-		DEBUG_LOG(("FrameData::allCommandsReady - command list cleared. command list length = %d, command count = %d, frame command count = %d\n", m_commandList->length(), m_commandCount, m_frameCommandCount));
-		return FRAMEDATA_RESEND;
-	}
-	return FRAMEDATA_NOTREADY;
-}
-
-/**
- * Set the command count for this frame
- */
-void FrameData::setFrameCommandCount(UnsignedInt frameCommandCount) {
-	//DEBUG_LOG(("setFrameCommandCount to %d for frame %d\n", frameCommandCount, m_frame));
-	m_frameCommandCount = frameCommandCount;
-}
-
-/**
- * Get the command count for this frame.
- */
-UnsignedInt FrameData::getFrameCommandCount() {
-	return m_frameCommandCount;
-}
-
-/**
- * return the number of commands received so far.
- */
-UnsignedInt FrameData::getCommandCount() {
-	return m_commandCount;
-}
-
-/**
- * Add a command to this frame
- */
-void FrameData::addCommand(NetCommandMsg *msg) {
-	// need to add the message in order of command ID
-	if (m_commandList == NULL) {
-		init();
-	}
-
-	// We don't need to worry about setting the relay since its not getting sent anywhere.
-	if (m_commandList->findMessage(msg) != NULL) {
-		// We don't want to add the same command twice.
-		return;
-	}
-	m_commandList->addMessage(msg);
-
-	++m_commandCount;
-	//DEBUG_LOG(("added command %d, type = %d(%s), command count = %d, frame command count = %d\n", msg->getID(), msg->getNetCommandType(), GetAsciiNetCommandType(msg->getNetCommandType()).str(), m_commandCount, m_frameCommandCount));
-}
-
-/**
- * Return the list of commands for this frame
- */
-NetCommandList * FrameData::getCommandList() {
-	return m_commandList;
-}
-
-/**
- * Set both the command count and the frame command count to 0.
- */
-void FrameData::zeroFrame() {
-	m_commandCount = 0;
-	m_frameCommandCount = 0;
-}
-
-/**
- * destroy all the commands in this frame.
- */
-void FrameData::destroyGameMessages() {
-	if (m_commandList == NULL) {
-		return;
-	}
-
-	m_commandList->reset();
-	m_commandCount = 0;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/FrameDataManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/FrameDataManager.cpp
deleted file mode 100644
index ed0831ef062..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/FrameDataManager.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/FrameDataManager.h"
-#include "GameNetwork/networkutil.h"
-
-/**
- * Constructor.  isLocal tells it whether its the frame data manager for the local player or not.
- */
-FrameDataManager::FrameDataManager(Bool isLocal) {
-	m_isLocal = isLocal;
-	
-	m_frameData = NEW FrameData[FRAME_DATA_LENGTH];
-
-	m_isQuitting = FALSE;
-	m_quitFrame = 0;
-}
-
-/**
- * destructor.
- */
-FrameDataManager::~FrameDataManager() {
-	for (Int i = 0; i < FRAME_DATA_LENGTH; ++i) {
-		m_frameData[i].reset();
-	}
-
-	if (m_frameData)
-	{
-		delete[] m_frameData;
-		m_frameData = NULL;
-	}
-}
-
-/**
- * Initialize all of the frame datas associated with this manager.
- */
-void FrameDataManager::init() {
-	for (Int i = 0; i < FRAME_DATA_LENGTH; ++i) {
-		m_frameData[i].init();
-		if (m_isLocal) {
-			// If this is the local connection, adjust the frame command count.
-			m_frameData[i].setFrameCommandCount(m_frameData[i].getCommandCount());
-		}
-	}
-
-	m_isQuitting = FALSE;
-	m_quitFrame = 0;
-}
-
-/**
- * Reset the state of all the frames.
- */
-void FrameDataManager::reset() {
-	init();
-}
-
-/**
- * update function. Does nothing at this time.
- */
-void FrameDataManager::update() {
-}
-
-/**
- * Add a network command to the appropriate frame.
- */
-void FrameDataManager::addNetCommandMsg(NetCommandMsg *msg) {
-	UnsignedInt frame = msg->getExecutionFrame();
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("FrameDataManager::addNetCommandMsg - about to add a command of type %s for frame %d, frame index %d\n", GetAsciiNetCommandType(msg->getNetCommandType()).str(), frame, frameindex));
-	m_frameData[frameindex].addCommand(msg);
-
-	if (m_isLocal) {
-		// If this is the local connection, adjust the frame command count.
-		m_frameData[frameindex].setFrameCommandCount(m_frameData[frameindex].getCommandCount());
-	}
-}
-
-/**
- * Returns true if all the commands for the given frame are ready.
- */
-FrameDataReturnType FrameDataManager::allCommandsReady(UnsignedInt frame, Bool debugSpewage) {
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-	//DEBUG_ASSERTCRASH(m_frameData[frameindex].getFrame() == frame || frame == 256, ("Looking at old commands!"));
-	return m_frameData[frameindex].allCommandsReady(debugSpewage);
-}
-
-/**
- * Returns the command list for the given frame.
- */
-NetCommandList * FrameDataManager::getFrameCommandList(UnsignedInt frame) {
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-	return m_frameData[frameindex].getCommandList();
-}
-
-/**
- * Reset the contents of the given frame.
- */
-void FrameDataManager::resetFrame(UnsignedInt frame, Bool isAdvancing) {
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-
-	m_frameData[frameindex].reset();
-
-	if (isAdvancing) {
-		m_frameData[frameindex].setFrame(frame + MAX_FRAMES_AHEAD);
-	}
-
-	if (m_isLocal) {
-		m_frameData[frameindex].setFrameCommandCount(m_frameData[frameindex].getCommandCount());
-	}
-
-	DEBUG_ASSERTCRASH(m_frameData[frameindex].getCommandCount() == 0, ("we just reset the frame data and the command count is not zero, huh?"));
-}
-
-/**
- * Returns the command count for the given frame.
- */
-UnsignedInt FrameDataManager::getCommandCount(UnsignedInt frame) {
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-
-	return m_frameData[frameindex].getCommandCount();
-}
-
-/**
- * Set the frame command count for the given frame.
- */
-void FrameDataManager::setFrameCommandCount(UnsignedInt frame, UnsignedInt commandCount) {
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-
-	m_frameData[frameindex].setFrameCommandCount(commandCount);
-}
-
-/**
- *
- */
-UnsignedInt FrameDataManager::getFrameCommandCount(UnsignedInt frame) {
-	UnsignedInt frameindex = frame % FRAME_DATA_LENGTH;
-
-	return m_frameData[frameindex].getFrameCommandCount();
-}
-
-/**
- * Set both the command count and the frame command count to 0 for the given frames.
- */
-void FrameDataManager::zeroFrames(UnsignedInt startingFrame, UnsignedInt numFrames) {
-	UnsignedInt frameIndex = startingFrame % FRAME_DATA_LENGTH;
-	for (UnsignedInt i = 0; i < numFrames; ++i) {
-		//DEBUG_LOG(("Calling zeroFrame for frame index %d\n", frameIndex));
-		m_frameData[frameIndex].zeroFrame();
-		++frameIndex;
-		frameIndex = frameIndex % FRAME_DATA_LENGTH;
-	}
-}
-
-/**
- * Destroy all the commands held by this object.
- */
-void FrameDataManager::destroyGameMessages() {
-	for (Int i = 0; i < FRAME_DATA_LENGTH; ++i) {
-		m_frameData[i].destroyGameMessages();
-	}
-}
-
-/**
- * Sets the quit frame, also sets the isQuitting flag.
- */
-void FrameDataManager::setQuitFrame(UnsignedInt frame) {
-	m_isQuitting = TRUE;
-	m_quitFrame = frame;
-}
-
-/**
- * returns the quit frame.
- */
-UnsignedInt FrameDataManager::getQuitFrame() {
-	return m_quitFrame;
-}
-
-/**
- * returns true if this frame data manager is quitting.
- */
-Bool FrameDataManager::getIsQuitting() {
-	return m_isQuitting;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/FrameMetrics.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/FrameMetrics.cpp
deleted file mode 100644
index 69749e50036..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/FrameMetrics.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/** FrameMetrics.cpp */
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/FrameMetrics.h"
-#include "GameClient/Display.h"
-#include "GameNetwork/networkutil.h"
-
-FrameMetrics::FrameMetrics() 
-{
-	//Added By Sadullah Nader
-	//Initializations missing and needed
-	m_averageFps = 0.0f;
-	m_averageLatency = 0.0f;
-	m_cushionIndex = 0;
-	m_fpsListIndex = 0;
-	m_lastFpsTimeThing = 0;
-	m_minimumCushion = 0;
-
-	m_pendingLatencies = NEW time_t[MAX_FRAMES_AHEAD];
-	for(Int i = 0; i < MAX_FRAMES_AHEAD; i++)
-		m_pendingLatencies[i] = 0;
-	//
-	m_fpsList = NEW Real[TheGlobalData->m_networkFPSHistoryLength];
-	m_latencyList = NEW Real[TheGlobalData->m_networkLatencyHistoryLength];
-}
-
-FrameMetrics::~FrameMetrics() {
-	if (m_fpsList != NULL) {
-		delete m_fpsList;
-		m_fpsList = NULL;
-	}
-
-	if (m_latencyList != NULL) {
-		delete m_latencyList;
-		m_latencyList = NULL;
-	}
-
-	if (m_pendingLatencies)
-	{
-		delete[] m_pendingLatencies;
-		m_pendingLatencies = NULL;
-	}
-}
-
-void FrameMetrics::init() {
-	m_averageFps = 30;
-	m_averageLatency = (Real)0.2;
-	m_minimumCushion = -1;
-
-	UnsignedInt i = 0;
-	for (; i < TheGlobalData->m_networkFPSHistoryLength; ++i) {
-		m_fpsList[i] = 30.0;
-	}
-	m_fpsListIndex = 0;
-	for (i = 0; i < TheGlobalData->m_networkLatencyHistoryLength; ++i) {
-		m_latencyList[i] = (Real)0.2;
-	}
-	m_cushionIndex = 0;
-}
-
-void FrameMetrics::reset() {
-	init();
-}
-
-void FrameMetrics::doPerFrameMetrics(UnsignedInt frame) {
-	// Do the measurement of the fps.
-	time_t curTime = timeGetTime();
-	if ((curTime - m_lastFpsTimeThing) >= 1000) {
-//		if ((m_fpsListIndex % 16) == 0) {
-//			DEBUG_LOG(("FrameMetrics::doPerFrameMetrics - adding %f to fps history. average before: %f ", m_fpsList[m_fpsListIndex], m_averageFps));
-//		}
-		m_averageFps -= ((m_fpsList[m_fpsListIndex])) / TheGlobalData->m_networkFPSHistoryLength; // subtract out the old value from the average.
-		m_fpsList[m_fpsListIndex] = TheDisplay->getAverageFPS();
-//		m_fpsList[m_fpsListIndex] = TheGameClient->getFrame() - m_fpsStartingFrame;
-		m_averageFps += ((Real)(m_fpsList[m_fpsListIndex])) / TheGlobalData->m_networkFPSHistoryLength; // add the new value to the average.
-//		DEBUG_LOG(("average after: %f\n", m_averageFps));
-		++m_fpsListIndex;
-		m_fpsListIndex %= TheGlobalData->m_networkFPSHistoryLength;
-		m_lastFpsTimeThing = curTime;
-	}
-
-	Int pendingLatenciesIndex = frame % MAX_FRAMES_AHEAD;
-	m_pendingLatencies[pendingLatenciesIndex] = curTime;
-
-}
-
-void FrameMetrics::processLatencyResponse(UnsignedInt frame) {
-	time_t curTime = timeGetTime();
-	Int pendingIndex = frame % MAX_FRAMES_AHEAD;
-	time_t timeDiff = curTime - m_pendingLatencies[pendingIndex];
-
-	Int latencyListIndex = frame % TheGlobalData->m_networkLatencyHistoryLength;
-	m_averageLatency -= m_latencyList[latencyListIndex] / TheGlobalData->m_networkLatencyHistoryLength;
-	m_latencyList[latencyListIndex] = (Real)timeDiff / (Real)1000; // convert to seconds from milliseconds.
-	m_averageLatency += m_latencyList[latencyListIndex] / TheGlobalData->m_networkLatencyHistoryLength;
-
-	if (frame % 16 == 0) {
-//		DEBUG_LOG(("ConnectionManager::processFrameInfoAck - average latency = %f\n", m_averageLatency));
-	}
-}
-
-void FrameMetrics::addCushion(Int cushion) {
-	++m_cushionIndex;
-	m_cushionIndex %= TheGlobalData->m_networkCushionHistoryLength;
-	if (m_cushionIndex == 0) {
-		m_minimumCushion = -1;
-	}
-	if ((cushion < m_minimumCushion) || (m_minimumCushion == -1)) {
-		m_minimumCushion = cushion;
-	}
-}
-
-Int FrameMetrics::getAverageFPS() {
-	return (Int)m_averageFps;
-}
-
-Real FrameMetrics::getAverageLatency() {
-	return m_averageLatency;
-}
-
-Int FrameMetrics::getMinimumCushion() {
-	return m_minimumCushion;
-}
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp
index 6ecd086d4f2..40eab1badfe 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp
@@ -25,7 +25,7 @@
 // FILE: GUIUtil.cpp //////////////////////////////////////////////////////
 // Author: Matthew D. Campbell, Sept 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameNetwork/GUIUtil.h"
 #include "GameNetwork/NetworkDefs.h"
@@ -46,11 +46,6 @@
 #include "GameNetwork/LANAPICallbacks.h" // for acceptTrueColor, etc
 #include "GameClient/ChallengeGenerals.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // -----------------------------------------------------------------------------
 
@@ -142,7 +137,7 @@ void ShowUnderlyingGUIElements( Bool show, const char *layoutFilename, const cha
 	GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
 	if (!parent)
 	{
-		DEBUG_CRASH(("Window %s not found\n", parentNameStr.str()));
+		DEBUG_CRASH(("Window %s not found", parentNameStr.str()));
 		return;
 	}
 
@@ -198,7 +193,7 @@ void PopulateColorComboBox(Int comboBox, GameWindow *comboArray[], GameInfo *myG
 
 	for (i = 0; i < MAX_SLOTS; i++)
 	{
-		GameSlot *slot = myGame->getSlot(i);	
+		GameSlot *slot = myGame->getSlot(i);
 		if( slot && (i != comboBox) && (slot->getColor() >= 0 )&& (slot->getColor() < numColors))
 		{
 			DEBUG_ASSERTCRASH(slot->getColor() >= 0,("We've tried to access array %d and that ain't good",slot->getColor()));
@@ -336,13 +331,13 @@ void PopulateStartingCashComboBox(GameWindow *comboBox, GameInfo *myGame)
 {
   GadgetComboBoxReset(comboBox);
 
-  const MultiplayerStartingMoneyList & startingCashMap = TheMultiplayerSettings->getStartingMoneyList(); 
+  const MultiplayerStartingMoneyList & startingCashMap = TheMultiplayerSettings->getStartingMoneyList();
   Int currentSelectionIndex = -1;
 
   MultiplayerStartingMoneyList::const_iterator it = startingCashMap.begin();
   for ( ; it != startingCashMap.end(); it++ )
   {
-    Int newIndex = GadgetComboBoxAddEntry(comboBox, formatMoneyForStartingCashComboBox( *it ), 
+    Int newIndex = GadgetComboBoxAddEntry(comboBox, formatMoneyForStartingCashComboBox( *it ),
                                           comboBox->winGetEnabled() ? comboBox->winGetEnabledTextColor() : comboBox->winGetDisabledTextColor());
     GadgetComboBoxSetItemData(comboBox, newIndex, (void *)it->countMoney());
 
@@ -355,7 +350,7 @@ void PopulateStartingCashComboBox(GameWindow *comboBox, GameInfo *myGame)
   if ( currentSelectionIndex == -1 )
   {
     DEBUG_CRASH( ("Current selection for starting cash not found in list") );
-    currentSelectionIndex = GadgetComboBoxAddEntry(comboBox, formatMoneyForStartingCashComboBox( myGame->getStartingCash() ), 
+    currentSelectionIndex = GadgetComboBoxAddEntry(comboBox, formatMoneyForStartingCashComboBox( myGame->getStartingCash() ),
                                           comboBox->winGetEnabled() ? comboBox->winGetEnabledTextColor() : comboBox->winGetDisabledTextColor());
     GadgetComboBoxSetItemData(comboBox, currentSelectionIndex, (void *)it->countMoney() );
   }
@@ -370,7 +365,7 @@ void PopulateStartingCashComboBox(GameWindow *comboBox, GameInfo *myGame)
 //-------------------------------------------------------------------------------------------------
 void UpdateSlotList( GameInfo *myGame, GameWindow *comboPlayer[],
 										GameWindow *comboColor[], GameWindow *comboPlayerTemplate[],
-										GameWindow *comboTeam[], GameWindow *buttonAccept[], 
+										GameWindow *comboTeam[], GameWindow *buttonAccept[],
 										GameWindow *buttonStart, GameWindow *buttonMapStartPosition[] )
 {
 	if(!AreSlotListUpdatesEnabled())
@@ -393,13 +388,14 @@ void UpdateSlotList( GameInfo *myGame, GameWindow *comboPlayer[],
 		for( int i =0; i < MAX_SLOTS; i++ )
 		{
 			GameSlot * slot = myGame->getSlot(i);
+
 			// if i'm host, enable the controls for AI
-			if(myGame->amIHost() && slot && slot->isAI())
+			if(myGame->amIHost() && slot->isAI())
 			{
 				EnableAcceptControls(TRUE, myGame, comboPlayer, comboColor, comboPlayerTemplate,
 					comboTeam, buttonAccept, buttonStart, buttonMapStartPosition, i);
 			}
-			else if (slot && myGame->getLocalSlotNum() == i)
+			else if (myGame->getLocalSlotNum() == i)
 			{
 				if(slot->isAccepted() && !myGame->amIHost())
 				{
@@ -418,14 +414,14 @@ void UpdateSlotList( GameInfo *myGame, GameWindow *comboPlayer[],
 							comboTeam, buttonAccept, buttonStart, buttonMapStartPosition);
 					}
 				}
-				
+
 			}
 			else if(myGame->amIHost())
 			{
 				EnableAcceptControls(FALSE, myGame, comboPlayer, comboColor, comboPlayerTemplate,
 					comboTeam, buttonAccept, buttonStart, buttonMapStartPosition, i);
 			}
-			if(slot && slot->isHuman())
+			if(slot->isHuman())
 			{
 				UnicodeString newName = slot->getName();
 				UnicodeString oldName = GadgetComboBoxGetText(comboPlayer[i]);
@@ -454,7 +450,7 @@ void UpdateSlotList( GameInfo *myGame, GameWindow *comboPlayer[],
 				}
 			}
 			else
-			{				
+			{
 				GadgetComboBoxSetSelectedPos(comboPlayer[i], slot->getState(), TRUE);
         if( buttonAccept &&  buttonAccept[i] )
 				  buttonAccept[i]->winHide(TRUE);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameInfo.cpp
deleted file mode 100644
index ddc322f2518..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameInfo.cpp
+++ /dev/null
@@ -1,1622 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GameInfo.cpp //////////////////////////////////////////////////////
-// game setup state info
-// Author: Matthew D. Campbell, December 2001
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/CRCDebug.h"
-#include "Common/file.h"
-#include "Common/FileSystem.h"
-#include "Common/GameState.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MapUtil.h"
-#include "Common/MultiplayerSettings.h"
-#include "Common/PlayerTemplate.h"
-#include "Common/Xfer.h"
-#include "GameNetwork/FileTransfer.h"
-#include "GameNetwork/GameInfo.h"
-#include "GameNetwork/GameSpy/ThreadUtils.h"
-#include "GameNetwork/GameSpy/StagingRoomGameInfo.h"
-#include "GameNetwork/LANAPI.h"						// for testing packet size
-#include "GameNetwork/LANAPICallbacks.h"	// for testing packet size
-#include "strtok_r.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-
-GameInfo *TheGameInfo = NULL;
-
-// GameSlot ----------------------------------------
-
-GameSlot::GameSlot()
-{
-	reset();
-}
-
-void GameSlot::reset()
-{
-	m_state = SLOT_CLOSED; // decent default
-	m_isAccepted = false;
-	m_hasMap = true;
-	m_color = -1;
-	m_startPos = -1;
-	m_playerTemplate = -1;
-	m_teamNumber = -1;
-	m_NATBehavior = FirewallHelperClass::FIREWALL_TYPE_SIMPLE;
-	m_lastFrameInGame = 0;
-	m_disconnected = FALSE;
-	m_port = 0;
-	m_isMuted = FALSE;
-	m_origPlayerTemplate = -1;
-	m_origStartPos = -1;
-	m_origColor = -1;
-}
-
-void GameSlot::saveOffOriginalInfo( void )
-{
-	DEBUG_LOG(("GameSlot::saveOffOriginalInfo() - orig was color=%d, pos=%d, house=%d\n",
-		m_origColor, m_origStartPos, m_origPlayerTemplate));
-	m_origPlayerTemplate = m_playerTemplate;
-	m_origStartPos = m_startPos;
-	m_origColor = m_color;
-	DEBUG_LOG(("GameSlot::saveOffOriginalInfo() - color=%d, pos=%d, house=%d\n",
-		m_color, m_startPos, m_playerTemplate));
-}
-
-static Int getSlotIndex(const GameSlot *slot)
-{
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (TheGameInfo->getConstSlot(i) == slot)
-			return i;
-	}
-	return -1;
-}
-
-static Bool isSlotLocalAlly(const GameSlot *slot)
-{
-	Int slotIndex = getSlotIndex(slot);
-	Int localIndex = TheGameInfo->getLocalSlotNum();
-	const GameSlot *localSlot = TheGameInfo->getConstSlot(localIndex);
-
-	// if either doesn't exist, not an ally
-	if (slotIndex < 0 || localIndex < 0)
-		return FALSE;
-
-	// if slot is us, ally
-	if (slotIndex == localIndex)
-		return TRUE;
-
-	// if slot is same team as us, ally
-	if (slot->getTeamNumber() == localSlot->getTeamNumber() && slot->getTeamNumber() >= 0)
-		return TRUE;
-
-	// if we're an observer, we see all
-	if (localSlot->getOriginalPlayerTemplate() == PLAYERTEMPLATE_OBSERVER)
-		return TRUE;
-
-	// nope
-	return FALSE;
-}
-
-UnicodeString GameSlot::getApparentPlayerTemplateDisplayName( void ) const
-{
-	if (TheMultiplayerSettings && TheMultiplayerSettings->showRandomPlayerTemplate() &&
-		m_origPlayerTemplate == PLAYERTEMPLATE_RANDOM && !isSlotLocalAlly(this))
-	{
-		return TheGameText->fetch("GUI:Random");
-	}
-	else if (m_origPlayerTemplate == PLAYERTEMPLATE_OBSERVER)
-	{
-		return TheGameText->fetch("GUI:Observer");
-	}
-	DEBUG_LOG(("Fetching player template display name for player template %d (orig is %d)\n",
-		m_playerTemplate, m_origPlayerTemplate));
-	if (m_playerTemplate < 0)
-	{
-		return TheGameText->fetch("GUI:Random");
-	}
-	return ThePlayerTemplateStore->getNthPlayerTemplate(m_playerTemplate)->getDisplayName();
-}
-
-Int GameSlot::getApparentPlayerTemplate( void ) const
-{
-	if (TheMultiplayerSettings && TheMultiplayerSettings->showRandomPlayerTemplate() &&
-		!isSlotLocalAlly(this))
-	{
-		return m_origPlayerTemplate;
-	}
-	return m_playerTemplate;
-}
-
-Int GameSlot::getApparentColor( void ) const
-{
-	if (TheMultiplayerSettings && m_origPlayerTemplate == PLAYERTEMPLATE_OBSERVER)
-		return TheMultiplayerSettings->getColor(PLAYERTEMPLATE_OBSERVER)->getColor();
-
-	if (TheMultiplayerSettings && TheMultiplayerSettings->showRandomColor() &&
-		!isSlotLocalAlly(this))
-	{
-		return m_origColor;
-	}
-	return m_color;
-}
-
-Int GameSlot::getApparentStartPos( void ) const
-{
-	if (TheMultiplayerSettings && TheMultiplayerSettings->showRandomStartPos() &&
-		!isSlotLocalAlly(this))
-	{
-		return m_origStartPos;
-	}
-	return m_startPos;
-}
-
-
-void GameSlot::unAccept( void )
-{
-	if (isHuman())
-	{
-		m_isAccepted = false;
-	}
-}
-
-void GameSlot::setMapAvailability( Bool hasMap )
-{
-	if (isHuman())
-	{
-		m_hasMap = hasMap;
-	}
-}
-
-void GameSlot::setState( SlotState state, UnicodeString name, UnsignedInt IP )
-{
-	if (!(isAI() &&  (state == SLOT_EASY_AI || state == SLOT_MED_AI || state == SLOT_BRUTAL_AI)))
-	{
-		m_color = -1;
-		m_startPos = -1;
-		m_playerTemplate = -1;
-		m_teamNumber = -1;
-
-		if (state == SLOT_OPEN && TheGameSpyGame && TheGameSpyGame->getConstSlot(0) == this)
-		{
-			DEBUG_CRASH(("Game Is Hosed!\n"));
-		}
-	}
-	if (state == SLOT_PLAYER)
-	{
-		reset();
-		m_state = state;
-		m_name = name;
-	}// state == SLOT_PLAYER
-	else
-	{
-		m_state = state;
-		m_isAccepted = true;
-		m_hasMap = true;
-		switch(state)
-		{
-		case SLOT_OPEN:
-			m_name = TheGameText->fetch("GUI:Open");
-			break;
-		case SLOT_EASY_AI:
-			m_name = TheGameText->fetch("GUI:EasyAI");
-			break;
-		case SLOT_MED_AI:
-			m_name = TheGameText->fetch("GUI:MediumAI");
-			break;
-		case SLOT_BRUTAL_AI:
-			m_name = TheGameText->fetch("GUI:HardAI");
-			break;
-		case SLOT_CLOSED:
-		default:
-			m_name = TheGameText->fetch("GUI:Closed");
-			break;
-		}
-	}
-
-	m_IP = IP;
-}
-
-// Various tests
-Bool GameSlot::isHuman( void ) const
-{
-	return m_state == SLOT_PLAYER;
-}
-
-Bool GameSlot::isOccupied( void ) const
-{
-	return m_state == SLOT_PLAYER || m_state == SLOT_EASY_AI || m_state == SLOT_MED_AI || m_state == SLOT_BRUTAL_AI;
-}
-
-Bool GameSlot::isAI( void ) const
-{
-	return m_state == SLOT_EASY_AI || m_state == SLOT_MED_AI || m_state == SLOT_BRUTAL_AI;
-}
-
-Bool GameSlot::isPlayer( AsciiString userName ) const
-{
-	UnicodeString uName;
-	uName.translate(userName);
-	return (m_state == SLOT_PLAYER && !m_name.compareNoCase(uName));
-}
-
-Bool GameSlot::isPlayer( UnicodeString userName ) const
-{
-	return (m_state == SLOT_PLAYER && !m_name.compareNoCase(userName));
-}
-
-Bool GameSlot::isPlayer( UnsignedInt ip ) const
-{
-	return (m_state == SLOT_PLAYER && m_IP == ip);
-}
-
-Bool GameSlot::isOpen( void ) const
-{
-	return m_state == SLOT_OPEN;
-}
-
-// GameInfo ----------------------------------------
-
-GameInfo::GameInfo()
-{
-	for (int i=0; i<MAX_SLOTS; ++i)
-	{
-		m_slot[i] = NULL;
-	}
-	reset();
-}
-
-void GameInfo::init( void )
-{
-	reset();
-}
-
-void GameInfo::reset( void )
-{
-	m_crcInterval = NET_CRC_INTERVAL;
-	m_inGame = false;
-	m_inProgress = false;
-	m_gameID = 0;
-	m_mapName = AsciiString("NOMAP");
-	m_mapMask = 0;
-	m_seed = GetTickCount(); //GameClientRandomValue(0, INT_MAX - 1);
-	m_useStats = TRUE;
-	m_surrendered = FALSE;
-  m_oldFactionsOnly = FALSE;
-	// Added By Sadullah Nader
-	// Initializations missing and needed
-//	m_localIP = 0; // BGC - actually we don't want this to be reset since the m_localIP is 
-										// set properly in the constructor of LANGameInfo which uses this as a base class.
-	m_mapCRC = 0;
-	m_mapSize = 0;
-  m_superweaponRestriction = 0; 
-  m_startingCash = TheGlobalData->m_defaultStartingCash;
-  
-	//
-
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_slot[i])
-			m_slot[i]->reset();
-	}
-
-	m_preorderMask = 0;
-}
-
-Bool GameInfo::isPlayerPreorder(Int index)
-{
-	if (index >= 0 && index < MAX_SLOTS)
-		return ((m_preorderMask & (1 << index)) != 0);
-	return FALSE;
-}
-
-void GameInfo::markPlayerAsPreorder(Int index)
-{
-	if (index >= 0 && index < MAX_SLOTS)
-		m_preorderMask |= 1 << index;
-}
-
-
-void GameInfo::clearSlotList( void )
-{
-	for (int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_slot[i])
-			m_slot[i]->setState(SLOT_CLOSED);
-	}
-}
-
-Int GameInfo::getNumPlayers( void ) const
-{
-	Int numPlayers = 0;
-	for (int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_slot[i] && m_slot[i]->isOccupied())
-			numPlayers++;
-	}
-	return numPlayers;
-}
-
-Int GameInfo::getNumNonObserverPlayers( void ) const
-{
-	Int numPlayers = 0;
-	for (int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_slot[i] && m_slot[i]->isOccupied() && m_slot[i]->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
-			numPlayers++;
-	}
-	return numPlayers;
-}
-
-Int GameInfo::getMaxPlayers( void ) const
-{
-	if (!TheMapCache)
-		return -1;
-
-	AsciiString lowerMap = m_mapName;
-	lowerMap.toLower();
-	MapCache::iterator it = TheMapCache->find(lowerMap);
-	if (it == TheMapCache->end())
-		return -1;
-	MapMetaData data = it->second;
-	return data.m_numPlayers;
-}
-
-void GameInfo::enterGame( void )
-{
-	DEBUG_ASSERTCRASH(!m_inGame && !m_inProgress, ("Entering game at a bad time!"));
-	reset();
-	m_inGame = true;
-	m_inProgress = false;
-}
-
-void GameInfo::leaveGame( void )
-{
-	DEBUG_ASSERTCRASH(m_inGame && !m_inProgress, ("Leaving game at a bad time!"));
-	reset();
-}
-
-void GameInfo::startGame( Int gameID )
-{
-	DEBUG_ASSERTCRASH(m_inGame && !m_inProgress, ("Starting game at a bad time!"));
-	m_gameID = gameID;
-	closeOpenSlots();
-	m_inProgress = true;
-}
-
-void GameInfo::endGame( void )
-{
-	DEBUG_ASSERTCRASH(m_inGame && m_inProgress, ("Ending game without playing one!"));
-	m_inGame = false;
-	m_inProgress = false;
-}
-
-void GameInfo::setSlot( Int slotNum, GameSlot slotInfo )
-{
-	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("GameInfo::setSlot - Invalid slot number"));
-	if (slotNum < 0 || slotNum >= MAX_SLOTS)
-		return;
-
-	DEBUG_ASSERTCRASH( m_slot[slotNum], ("NULL slot pointer"));
-	if (!m_slot[slotNum])
-		return;
-
-//	Bool isHuman = slotInfo.isHuman();
-//	Bool wasHuman = m_slot[slotNum]->isHuman();
-
-	if (slotNum == 0)
-	{
-		slotInfo.setAccept();
-		slotInfo.setMapAvailability(true);
-	}
-	*m_slot[slotNum] = slotInfo;
-
-#ifdef DEBUG_LOGGING
-	UnsignedInt ip = slotInfo.getIP();
-#endif
-
-	DEBUG_LOG(("GameInfo::setSlot - setting slot %d to be player %ls with IP %d.%d.%d.%d\n", slotNum, slotInfo.getName().str(),
-							PRINTF_IP_AS_4_INTS(ip)));
-}
-
-GameSlot* GameInfo::getSlot( Int slotNum )
-{
-	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("GameInfo::getSlot - Invalid slot number"));
-	if (slotNum < 0 || slotNum >= MAX_SLOTS)
-		return NULL;
-
-	return m_slot[slotNum];
-}
-
-const GameSlot* GameInfo::getConstSlot( Int slotNum ) const
-{
-	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("GameInfo::getSlot - Invalid slot number"));
-	if (slotNum < 0 || slotNum >= MAX_SLOTS)
-		return NULL;
-
-	return m_slot[slotNum];
-}
-
-Int GameInfo::getLocalSlotNum( void ) const
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for local game slot while not in game"));
-	if (!m_inGame)
-		return -1;
-
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = getConstSlot(i);
-		if (slot == NULL) {
-			continue;
-		}
-		if (slot->isPlayer(m_localIP))
-			return i;
-	}
-	return -1;
-}
-
-Int GameInfo::getSlotNum( AsciiString userName ) const
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
-	if (!m_inGame)
-		return -1;
-
-	UnicodeString uName;
-	uName.translate(userName);
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = getConstSlot(i);
-		if (slot->isPlayer( uName ))
-			return i;
-	}
-	return -1;
-}
-
-Bool GameInfo::amIHost( void ) const
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
-	if (!m_inGame)
-		return false;
-
-	return getConstSlot(0)->isPlayer(m_localIP);
-}
-
-void GameInfo::setMap( AsciiString mapName )
-{
-	m_mapName = mapName;
-	if (m_inGame && amIHost())
-	{
-		const MapMetaData *mapData = TheMapCache->findMap( mapName );
-		if (mapData)
-		{
-			m_mapMask = 1;
-			AsciiString path = mapName;
-			path.removeLastChar();
-			path.removeLastChar();
-			path.removeLastChar();
-			path.concat("tga");
-			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", path.str()));
-			File *fp = TheFileSystem->openFile(path.str());
-			if (fp)
-			{
-				m_mapMask |= 2;
-				fp->close();
-				fp = NULL;
-			}
-
-			AsciiString newMapName;
-			if (mapName.getLength() > 0)
-			{
-				AsciiString token;
-				mapName.nextToken(&token, "\\/");
-				// add all the tokens except the last one.
-				// that way we don't add the filename, just the
-				// directory name, we can do this since the filename
-				// is just the directory name with the file extention
-				// added onto it.
-				while (mapName.find('\\') != NULL)
-				{
-					if (newMapName.getLength() > 0)
-					{
-						newMapName.concat('/');
-					}
-					newMapName.concat(token);
-					mapName.nextToken(&token, "\\/");
-				}
-			}
-			newMapName.concat("/map.ini");
-			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", newMapName.str()));
-			fp = TheFileSystem->openFile(newMapName.str());
-			if (fp)
-			{
-				m_mapMask |= 4;
-				fp->close();
-				fp = NULL;
-			}
-
-			path = GetStrFileFromMap(m_mapName);
-			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", path.str()));
-			fp = TheFileSystem->openFile(path.str());
-			if (fp)
-			{
-				m_mapMask |= 8;
-				fp->close();
-				fp = NULL;
-			}
-
-			path = GetSoloINIFromMap(m_mapName);
-			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", path.str()));
-			fp = TheFileSystem->openFile(path.str());
-			if (fp)
-			{
-				m_mapMask |= 16;
-				fp->close();
-				fp = NULL;
-			}
-
-			path = GetAssetUsageFromMap(m_mapName);
-			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", path.str()));
-			fp = TheFileSystem->openFile(path.str());
-			if (fp)
-			{
-				m_mapMask |= 32;
-				fp->close();
-				fp = NULL;
-			}
-
-			path = GetReadmeFromMap(m_mapName);
-			DEBUG_LOG(("GameInfo::setMap() - Looking for '%s'\n", path.str()));
-			fp = TheFileSystem->openFile(path.str());
-			if (fp)
-			{
-				m_mapMask |= 64;
-				fp->close();
-				fp = NULL;
-			}
-		}
-		else
-		{
-			m_mapMask = 0;
-		}
-	}
-}
-
-void GameInfo::setMapContentsMask( Int mask )
-{
-	m_mapMask = mask;
-}
-
-void GameInfo::setMapCRC( UnsignedInt mapCRC )
-{
-	m_mapCRC = mapCRC;
-	if (!TheMapCache)
-		return;
-
-	// check the map cache
-	if (m_inGame && getLocalSlotNum() >= 0)
-	{
-		//TheMapCache->updateCache();
-		AsciiString lowerMap = m_mapName;
-		lowerMap.toLower();
-		//DEBUG_LOG(("GameInfo::setMapCRC - looking for map file \"%s\" in the map cache\n", lowerMap.str()));
-		std::map<AsciiString, MapMetaData>::iterator it = TheMapCache->find(lowerMap);
-		if (it == TheMapCache->end())
-		{
-			/*
-			DEBUG_LOG(("GameInfo::setMapCRC - could not find map file.\n"));
-			it = TheMapCache->begin();
-			while (it != TheMapCache->end())
-			{
-				DEBUG_LOG(("\t\"%s\"\n", it->first.str()));
-				++it;
-			}
-			*/
-			getSlot(getLocalSlotNum())->setMapAvailability(false);
-		}
-		else if (m_mapCRC != it->second.m_CRC)
-		{
-			DEBUG_LOG(("GameInfo::setMapCRC - map CRC's do not match (%X/%X).\n", m_mapCRC, it->second.m_CRC));
-			getSlot(getLocalSlotNum())->setMapAvailability(false);
-		}
-		else
-		{
-			//DEBUG_LOG(("GameInfo::setMapCRC - map CRC's match.\n"));
-			getSlot(getLocalSlotNum())->setMapAvailability(true);
-		}
-	}
-}
-
-void GameInfo::setMapSize( UnsignedInt mapSize )
-{
-	m_mapSize = mapSize;
-	if (!TheMapCache)
-		return;
-
-	// check the map cache
-	if (m_inGame && getLocalSlotNum() >= 0)
-	{
-		//TheMapCache->updateCache();
-		AsciiString lowerMap = m_mapName;
-		lowerMap.toLower();
-		std::map<AsciiString, MapMetaData>::iterator it = TheMapCache->find(lowerMap);
-		if (it == TheMapCache->end())
-		{
-			DEBUG_LOG(("GameInfo::setMapSize - could not find map file.\n"));
-			getSlot(getLocalSlotNum())->setMapAvailability(false);
-		}
-		else if (m_mapCRC != it->second.m_CRC)
-		{
-			DEBUG_LOG(("GameInfo::setMapSize - map CRC's do not match.\n"));
-			getSlot(getLocalSlotNum())->setMapAvailability(false);
-		}
-		else
-		{
-			//DEBUG_LOG(("GameInfo::setMapSize - map CRC's match.\n"));
-			getSlot(getLocalSlotNum())->setMapAvailability(true);
-		}
-	}
-}
-
-void GameInfo::setSeed( Int seed )
-{
-	m_seed = seed;
-}
-
-void GameInfo::setSlotPointer( Int index, GameSlot *slot )
-{
-	if (index < 0 || index >= MAX_SLOTS)
-		return;
-
-	m_slot[index] = slot;
-}
-
-void GameInfo::setSuperweaponRestriction( UnsignedShort restriction )
-{
-  m_superweaponRestriction = restriction;
-}
-
-void GameInfo::setStartingCash( const Money & startingCash )
-{
-  m_startingCash = startingCash;
-}
-
-Bool GameInfo::isColorTaken(Int colorIdx, Int slotToIgnore ) const
-{
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = getConstSlot(i);
-		if (slot && slot->getColor() == colorIdx && i != slotToIgnore)
-			return true;
-	}
-	return false;
-}
-
-Bool GameInfo::isStartPositionTaken(Int positionIdx, Int slotToIgnore ) const
-{
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = getConstSlot(i);
-		if (slot && slot->getStartPos() == positionIdx && i != slotToIgnore)
-			return true;
-	}
-	return false;
-}
-
-void GameInfo::resetAccepted( void )
-{
-	GameSlot *slot = getSlot(0);
-	if (slot)
-		slot->setAccept();
-	for(int i = 1; i< MAX_SLOTS; i++)
-	{
-		slot = getSlot(i);
-		if (slot)
-			slot->unAccept();
-	}
-}
-
-void GameInfo::resetStartSpots()
-{
-	GameSlot *slot = NULL;
-	for (Int i = 0; i < MAX_SLOTS; ++i)
-	{
-		slot = getSlot(i);
-		if (slot != NULL)
-		{
-			slot->setStartPos(-1);
-		}
-	}
-}
-
-// adjust the slots in the game to open or closed
-// depending on the players in there now and the number of
-// players the map can hold.
-void GameInfo::adjustSlotsForMap()
-{
-	const MapMetaData *md = TheMapCache->findMap(m_mapName);
-	if (md != NULL)
-	{
-		// get the number of players allowed from the map.
-		Int numPlayers = md->m_numPlayers;
-		Int numPlayerSlots = 0;
-
-		// first get the number of occupied slots.
-		Int i = 0;
-		for (; i < MAX_SLOTS; ++i)
-		{
-			GameSlot *tempSlot = getSlot(i);
-			if (tempSlot->isOccupied())
-			{
-				++numPlayerSlots;
-			}
-		}
-
-		// now go through and close the appropriate number of slots.
-		// note that no players are kicked in this process, we leave
-		// that up to the user.
-		for (i = 0; i < MAX_SLOTS; ++i)
-		{
-			// we have room for more players, if this slot is unoccupied, set it to open.
-			GameSlot *slot = getSlot(i);
-			if (numPlayers > numPlayerSlots)
-			{
-				if (!(slot->isOccupied()))
-				{
-					GameSlot newSlot;
-					newSlot.setState(SLOT_OPEN);
-					setSlot(i, newSlot);
-					++numPlayerSlots;
-				}
-			}
-			else
-			{
-				if (!(slot->isOccupied()))
-				{
-					// we don't have any more room, set this slot to closed.
-					GameSlot newSlot;
-					newSlot.setState(SLOT_CLOSED);
-					setSlot(i, newSlot);
-				}
-			}
-		}
-	}
-}
-
-void GameInfo::closeOpenSlots()
-{
-	for (Int i = 0; i < MAX_SLOTS; ++i)
-	{
-		GameSlot *slot = getSlot(i);
-		if (!(slot->isOccupied()))
-		{
-			GameSlot newSlot;
-			newSlot.setState(SLOT_CLOSED);
-			setSlot(i, newSlot);
-		}
-	}
-}
-
-static Bool isSlotLocalAlly(GameInfo *game, const GameSlot *slot)
-{
-	const GameSlot *localSlot = game->getConstSlot(game->getLocalSlotNum());
-	if (!localSlot)
-		return TRUE;
-
-	if (slot == localSlot)
-		return TRUE;
-
-	if (slot->getTeamNumber() < 0)
-		return FALSE;
-
-	return slot->getTeamNumber() == localSlot->getTeamNumber();
-}
-
-Bool GameInfo::isSkirmish(void)
-{
-	Bool sawAI = FALSE;
-
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (i == getLocalSlotNum())
-			continue;
-
-		if (getConstSlot(i)->isHuman())
-			return FALSE;
-
-		if (getConstSlot(i)->isAI())
-		{
-			if (isSlotLocalAlly(getConstSlot(i)))
-				return FALSE;
-			sawAI = TRUE;
-		}
-	}
-	return sawAI;
-}
-
-Bool GameInfo::isMultiPlayer(void)
-{
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (i == getLocalSlotNum())
-			continue;
-
-		if (getConstSlot(i)->isHuman())
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-Bool GameInfo::isSandbox(void)
-{
-	Int localSlotNum = getLocalSlotNum();
-	Int localTeam = getConstSlot(localSlotNum)->getTeamNumber();
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (i == localSlotNum)
-			continue;
-
-		const GameSlot *slot = getConstSlot(i);
-		if (slot->isOccupied() && (slot->getTeamNumber() < 0 || slot->getTeamNumber() != localTeam))
-			return FALSE;
-	}
-	return TRUE;
-}
-
-
-// Convenience Functions ----------------------------------------
-
-static const char slotListID		= 'S';
-
-AsciiString GameInfoToAsciiString( const GameInfo *game )
-{
-	if (!game)
-		return AsciiString::TheEmptyString;
-
-	AsciiString mapName = game->getMap();
-	mapName = TheGameState->realMapPathToPortableMapPath(mapName);
-	AsciiString newMapName;
-	if (mapName.getLength() > 0)
-	{
-		AsciiString token;
-		mapName.nextToken(&token, "\\/");
-		// add all the tokens except the last one.
-		// that way we don't add the filename, just the
-		// directory name, we can do this since the filename
-		// is just the directory name with the file extention
-		// added onto it.
-		while (mapName.find('\\') != NULL)
-		{
-			if (newMapName.getLength() > 0)
-			{
-				newMapName.concat('/');
-			}
-			newMapName.concat(token);
-			mapName.nextToken(&token, "\\/");
-		}
-		DEBUG_LOG(("Map name is %s\n", mapName.str()));
-	}
-
-	AsciiString optionsString;
-	optionsString.format("US=%d;M=%2.2x%s;MC=%X;MS=%d;SD=%d;C=%d;SR=%u;SC=%u;O=%c;", game->getUseStats(), game->getMapContentsMask(), newMapName.str(),
-		game->getMapCRC(), game->getMapSize(), game->getSeed(), game->getCRCInterval(), game->getSuperweaponRestriction(),
-		game->getStartingCash().countMoney(), game->oldFactionsOnly() ? 'Y' : 'N' );
-
-	//add player info for each slot
-	optionsString.concat(slotListID);
-	optionsString.concat('=');
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = game->getConstSlot(i);
-
-		AsciiString str;
-		if (slot && slot->isHuman())
-		{
-			AsciiString tmp;  //all this data goes after name
-			tmp.format( ",%X,%d,%c%c,%d,%d,%d,%d,%d:",
-				slot->getIP(), slot->getPort(),
-				(slot->isAccepted()?'T':'F'),
-				(slot->hasMap()?'T':'F'),
-				slot->getColor(), slot->getPlayerTemplate(),
-				slot->getStartPos(), slot->getTeamNumber(),
-				slot->getNATBehavior() );
-			//make sure name doesn't cause overflow of m_lanMaxOptionsLength
-			int lenCur = tmp.getLength() + optionsString.getLength() + 2;  //+2 for H and trailing ;
-			int lenRem = m_lanMaxOptionsLength - lenCur;  //length remaining before overflowing
-			int lenMax = lenRem / (MAX_SLOTS-i);  //share lenRem with all remaining slots
-			AsciiString name = WideCharStringToMultiByte(slot->getName().str()).c_str();
-			while( name.getLength() > lenMax )
-				name.removeLastChar();  //what a horrible way to truncate.  I hate AsciiString.
-			
-			str.format( "H%s%s", name.str(), tmp.str() );
-		}
-		else if (slot && slot->isAI())
-		{
-			Char c;
-			if (slot->getState() == SLOT_EASY_AI)
-				c = 'E';
-			else if (slot->getState() == SLOT_MED_AI)
-				c = 'M';
-			else
-				c = 'H';
-			str.format("C%c,%d,%d,%d,%d:", c,
-				slot->getColor(), slot->getPlayerTemplate(),
-				slot->getStartPos(), slot->getTeamNumber());
-		}
-		else if (slot && slot->getState() == SLOT_OPEN)
-		{
-			str = "O:";
-		}
-		else if (slot && slot->getState() == SLOT_CLOSED)
-		{
-			str = "X:";
-		}
-		else
-		{
-			DEBUG_ASSERTCRASH(false, ("Bad slot type"));
-			str = "X:";
-		}
-		optionsString.concat(str);
-	}
-	optionsString.concat(';');
-
-	DEBUG_ASSERTCRASH(!TheLAN || (optionsString.getLength() < m_lanMaxOptionsLength),
-		("WARNING: options string is longer than expected!  Length is %d, but max is %d!\n",
-		optionsString.getLength(), m_lanMaxOptionsLength));
-	
-	return optionsString;
-}
-
-static Int grabHexInt(const char *s)
-{
-	char tmp[5] = "0xff";
-	tmp[2] = s[0];
-	tmp[3] = s[1];
-	Int b = strtol(tmp, NULL, 16);
-	return b;
-}
-Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
-{
-	// Parse game options
-	char *buf = strdup(options.str());
-	char *bufPtr = buf;
-	char *strPos, *keyValPair;
-	GameSlot newSlot[MAX_SLOTS];
-	Bool optionsOk = true;
-	AsciiString mapName;
-	Int mapContentsMask;
-	UnsignedInt mapCRC, mapSize;
-	Int seed = 0;
-	Int crc = 100;
-	Bool sawCRC = FALSE;
-  Bool oldFactionsOnly = FALSE;
-	Int useStats = TRUE;
-  Money startingCash = TheGlobalData->m_defaultStartingCash;
-  UnsignedShort restriction = 0; // Always the default
-  
-	Bool sawMap, sawMapCRC, sawMapSize, sawSeed, sawSlotlist, sawUseStats, sawSuperweaponRestriction, sawStartingCash, sawOldFactions;
-	sawMap = sawMapCRC = sawMapSize = sawSeed = sawSlotlist = sawUseStats = sawSuperweaponRestriction = sawStartingCash = sawOldFactions = FALSE;
-
-	//DEBUG_LOG(("Saw options of %s\n", options.str()));
-	DEBUG_LOG(("ParseAsciiStringToGameInfo - parsing [%s]\n", options.str()));
-
-
-	while ( (keyValPair = strtok_r(bufPtr, ";", &strPos)) != NULL )
-	{
-		bufPtr = NULL; // strtok within the same string
-
-		AsciiString key, val;
-		char *pos = NULL;
-		char *keyPtr, *valPtr;
-		keyPtr = (strtok_r(keyValPair, "=", &pos));
-		valPtr = (strtok_r(NULL, "\n", &pos));
-		if (keyPtr)
-			key = keyPtr;
-		if (valPtr)
-			val = valPtr;
-
-		if (val.isEmpty())
-		{
-			optionsOk = false;
-			DEBUG_LOG(("ParseAsciiStringToGameInfo - saw empty value, quitting\n"));
-			break;
-		}
-
-		if (key.compare("US") == 0)
-		{
-			useStats = atoi(val.str());
-			sawUseStats = true;
-		}
-		else
-		if (key.compare("M") == 0)
-		{
-			if (val.getLength() < 3)
-			{
-				optionsOk = FALSE;
-				DEBUG_LOG(("ParseAsciiStringToGameInfo - saw bogus map; quitting\n"));
-				break;
-			}
-			mapContentsMask = grabHexInt(val.str());
-			AsciiString tempstr;
-			AsciiString token;
-			tempstr = val.str()+2;
-			tempstr.nextToken(&token, "\\/");
-			while (tempstr.getLength() > 0)
-			{
-				mapName.concat(token);
-				mapName.concat('\\');
-				tempstr.nextToken(&token, "\\/");
-			}
-			mapName.concat(token);
-			mapName.concat('\\');
-			mapName.concat(token);
-			mapName.concat('.');
-			mapName.concat(TheMapCache->getMapExtension());
-			mapName = TheGameState->portableMapPathToRealMapPath(mapName);
-			sawMap = true;
-			DEBUG_LOG(("ParseAsciiStringToGameInfo - map name is %s\n", mapName.str()));
-		}
-		else if (key.compare("MC") == 0)
-		{
-			mapCRC = 0;
-			sscanf(val.str(), "%X", &mapCRC);
-			sawMapCRC = true;
-		}
-		else if (key.compare("MS") == 0)
-		{
-			mapSize = atoi(val.str());
-			sawMapSize = true;
-		}
-		else if (key.compare("SD") == 0)
-		{
-			seed = atoi(val.str());
-			sawSeed = true;
-//			DEBUG_LOG(("ParseAsciiStringToGameInfo - random seed is %d\n", seed));
-		}
-		else if (key.compare("C") == 0)
-		{
-			crc = atoi(val.str());
-			sawCRC = TRUE;
-		}
-    else if (key.compare("SR") == 0 )
-    {
-      restriction = (UnsignedShort)atoi(val.str());
-      sawSuperweaponRestriction = TRUE;
-    }
-    else if (key.compare("SC") == 0 )
-    {
-      UnsignedInt startingCashAmount = strtoul( val.str(), NULL, 10 );
-      startingCash.init();
-      startingCash.deposit( startingCashAmount, FALSE );
-      sawStartingCash = TRUE;
-    }
-    else if (key.compare("O") == 0 )
-    {
-      oldFactionsOnly = ( val.compareNoCase( "Y" ) == 0 );
-      sawOldFactions = TRUE;
-    }
-		else if (key.getLength() == 1 && *key.str() == slotListID)
-		{
-			sawSlotlist = true;
-			/// @TODO: Need to read in all the slot info... big mess right now.
-			char *rawSlotBuf = strdup(val.str());
-			char *freeMe = NULL;
-			AsciiString rawSlot;
-//			Bool slotsOk = true;	//flag that lets us know whether or not the slot list is good.
-
-//			DEBUG_LOG(("ParseAsciiStringToGameInfo - Parsing slot list\n"));
-			for (int i=0; i<MAX_SLOTS; ++i)
-				{
-					rawSlot = strtok_r(rawSlotBuf,":",&pos);
-					if( rawSlotBuf )
-						freeMe = rawSlotBuf;
-					rawSlotBuf = NULL;
-					switch (*rawSlot.str())
-					{
-						case 'H':
-						{
-//							DEBUG_LOG(("ParseAsciiStringToGameInfo - Human player\n"));
-							char *slotPos = NULL;
-							//Parse out the Name																
-							AsciiString slotValue(strtok_r((char *)rawSlot.str(),",",&slotPos));
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue name is empty, quitting\n"));
-								break;
-							}
-							UnicodeString name;
-              				name.set(MultiByteToWideCharSingleLine(slotValue.str() +1).c_str());
-
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - name is %s\n", slotValue.str()+1));
-							
-							//Parse out the IP
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue IP address is empty, quitting\n"));
-								break;
-							}
-							UnsignedInt playerIP = 0;
-							sscanf(slotValue.str(),"%x", &playerIP);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - IP address is %x\n", playerIP));
-							
-							//set the state of the slot
-							newSlot[i].setState(SLOT_PLAYER, name, playerIP);
-
-							// parse out the port
-							slotValue = strtok_r(NULL, ",", &slotPos);
-							if (slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue port is empty, quitting\n"));
-								break;
-							}
-							UnsignedInt playerPort = 0;
-							sscanf(slotValue.str(), "%d", &playerPort);
-							newSlot[i].setPort(playerPort);
-							DEBUG_LOG(("ParseAsciiStringToGameInfo - port is %d\n", playerPort));
-
-							//Read if it's accepted or not
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.getLength() != 2)
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue accepted is mis-sized, quitting\n"));
-								break;
-							}
-							const char *svs = slotValue.str();
-							if(*svs == 'T') {
-								newSlot[i].setAccept();
-								//DEBUG_LOG(("ParseAsciiStringToGameInfo - player has accepted\n"));
-							} else if (*svs == 'F') {
-								newSlot[i].unAccept();
-								//DEBUG_LOG(("ParseAsciiStringToGameInfo - player has not accepted\n"));
-							}
-							++svs;
-							if(*svs == 'T') {
-								newSlot[i].setMapAvailability(TRUE);
-								//DEBUG_LOG(("ParseAsciiStringToGameInfo - player has map\n"));
-							} else {
-								newSlot[i].setMapAvailability(FALSE);
-								//DEBUG_LOG(("ParseAsciiStringToGameInfo - player does not have map\n"));
-							}
-
-							//Read color index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue color is empty, quitting\n"));
-								break;
-							}
-							Int color = atoi(slotValue.str());
-							if (color < -1 || color >= TheMultiplayerSettings->getNumColors())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - player color was invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setColor(color);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player color set to %d\n", color));
-
-							//Read playerTemplate index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue player template is empty, quitting\n"));
-								break;
-							}
-							Int playerTemplate = atoi(slotValue.str());
-							if (playerTemplate < PLAYERTEMPLATE_MIN || playerTemplate >= ThePlayerTemplateStore->getPlayerTemplateCount())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - player template value is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setPlayerTemplate(playerTemplate);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player template is %d\n", playerTemplate));
-
-							//Read start position index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue start position is empty, quitting\n"));
-								break;
-							}
-							Int startPos = atoi(slotValue.str());
-							if (startPos < -1 || startPos >= MAX_SLOTS)
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - player start position is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setStartPos(startPos);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player start position is %d\n", startPos));
-
-							//Read team index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue team number is empty, quitting\n"));
-								break;
-							}
-							Int team = atoi(slotValue.str());
-							if (team < -1 || team >= MAX_SLOTS/2)
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - team number is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setTeamNumber(team);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - team number is %d\n", team));
-
-							// Read the NAT behavior
-							slotValue = strtok_r(NULL, ",",&slotPos);
-							if (slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - NAT behavior is empty, quitting\n"));
-								break;
-							}
-							FirewallHelperClass::FirewallBehaviorType NATType = (FirewallHelperClass::FirewallBehaviorType)atoi(slotValue.str());
-							if ((NATType < FirewallHelperClass::FIREWALL_MIN) ||
-									(NATType > FirewallHelperClass::FIREWALL_MAX)) {
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - NAT behavior is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setNATBehavior(NATType);
-							DEBUG_LOG(("ParseAsciiStringToGameInfo - NAT behavior is %X\n", NATType));
-						}// case 'H':
-						break;
-						case 'C':
-						{
-            	DEBUG_LOG(("ParseAsciiStringToGameInfo - AI player\n"));
-							char *slotPos = NULL;
-							//Parse out the Name																
-							AsciiString slotValue(strtok_r((char *)rawSlot.str(),",",&slotPos));
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue AI Type is empty, quitting\n"));
-								break;
-							}
-              
-							switch(*(slotValue.str() + 1))
-							{
-								case 'E':
-								{
-									newSlot[i].setState(SLOT_EASY_AI);
-									//DEBUG_LOG(("ParseAsciiStringToGameInfo - Easy AI\n"));
-								}
-								break;
-								case 'M':
-								{
-									newSlot[i].setState(SLOT_MED_AI);
-									//DEBUG_LOG(("ParseAsciiStringToGameInfo - Medium AI\n"));
-								}
-								break;
-								case 'H':
-								{
-									newSlot[i].setState(SLOT_BRUTAL_AI);
-									//DEBUG_LOG(("ParseAsciiStringToGameInfo - Brutal AI\n"));
-								}
-								break;
-								default:
-								{
-									optionsOk = false;
-									DEBUG_LOG(("ParseAsciiStringToGameInfo - Unknown AI, quitting\n"));
-								}
-								break;
-							}//switch(*rawSlot.str()+1)
-              
-							//Read color index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue color is empty, quitting\n"));
-								break;
-							}
-							Int color = atoi(slotValue.str());
-							if (color < -1 || color >= TheMultiplayerSettings->getNumColors())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - player color was invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setColor(color);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player color set to %d\n", color));
-
-							//Read playerTemplate index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue player template is empty, quitting\n"));
-								break;
-							}
-							Int playerTemplate = atoi(slotValue.str());
-							if (playerTemplate < PLAYERTEMPLATE_MIN || playerTemplate >= ThePlayerTemplateStore->getPlayerTemplateCount())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - player template value is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setPlayerTemplate(playerTemplate);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - player template is %d\n", playerTemplate));
-
-							//Read start pos
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue start pos is empty, quitting\n"));
-								break;
-							}
-							Int startPos = atoi(slotValue.str());
-							Bool isStartPosBad = FALSE;
-							if (startPos < -1 || startPos >= MAX_SLOTS)
-							{
-								isStartPosBad = TRUE;
-							}
-							for (Int j=0; j<i; ++j)
-							{
-								if (startPos >= 0 && startPos == newSlot[i].getStartPos())
-								{
-									isStartPosBad = TRUE; // can't have multiple people using the same start pos
-								}
-							}
-							if (isStartPosBad)
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - start pos is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setStartPos(startPos);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - start spot is %d\n", startPos));
-
-							//Read team index
-							slotValue = strtok_r(NULL,",",&slotPos);
-							if(slotValue.isEmpty())
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - slotValue team number is empty, quitting\n"));
-								break;
-							}
-							Int team = atoi(slotValue.str());
-							if (team < -1 || team >= MAX_SLOTS/2)
-							{
-								optionsOk = false;
-								DEBUG_LOG(("ParseAsciiStringToGameInfo - team number is invalid, quitting\n"));
-								break;
-							}
-							newSlot[i].setTeamNumber(team);
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - team number is %d\n", team));
-
-						}//case 'C':
-						break;
-						case 'O':
-						{
-							newSlot[i].setState( SLOT_OPEN );
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - Slot is open\n"));
-						}// case 'O':
-						break;
-						case 'X':
-						{
-							newSlot[i].setState( SLOT_CLOSED );
-							//DEBUG_LOG(("ParseAsciiStringToGameInfo - Slot is closed\n"));
-						}// case 'X':
-						break;
-						default:
-						{								
-							optionsOk = false;
-							DEBUG_LOG(("ParseAsciiStringToGameInfo - unrecognized slot entry, quitting\n"));
-						}
-						break;
-					}
-				}
-		if(freeMe)
-			free(freeMe);
-		}
-		else
-		{
-			optionsOk = false;
-			break;
-		}
-	}
-	if( buf )
-		free(buf);
-
-	//DEBUG_LOG(("Options were ok == %d\n", optionsOk));
-	if (optionsOk && sawMap && sawMapCRC && sawMapSize && sawSeed && sawSlotlist && sawCRC && sawUseStats && sawSuperweaponRestriction && sawStartingCash && sawOldFactions )
-	{
-		// We were setting the Global Data directly here, but Instead, I'm now 
-		// first setting the data in game.  We'll set the global data when
-		// we start a game.
-		if (!game)
-			return true;
-
-		//DEBUG_LOG(("ParseAsciiStringToGameInfo - game options all good, setting info\n"));
-
-		for(Int i = 0; i<MAX_SLOTS; i++)
-			game->setSlot(i,newSlot[i]);
-
-		game->setMap(mapName);
-		game->setMapCRC(mapCRC);
-		game->setMapSize(mapSize);
-		game->setMapContentsMask(mapContentsMask);
-		game->setSeed(seed);
-		game->setCRCInterval(crc);
-		game->setUseStats(useStats);
-    game->setSuperweaponRestriction(restriction);
-    game->setStartingCash( startingCash );
-    game->setOldFactionsOnly( oldFactionsOnly );
-
-		return true;
-	}
-
-	DEBUG_LOG(("ParseAsciiStringToGameInfo - game options messed up\n"));
-	return false;
-}
-
-
-//----------------------------------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------------------------------
-
-//------------------------- SkirmishGameInfo ---------------------------------------------------------------
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void SkirmishGameInfo::crc( Xfer *xfer )
-{
-}  // end crc
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer Method */
-// ------------------------------------------------------------------------------------------------
-void SkirmishGameInfo::xfer( Xfer *xfer )
-{
-	const XferVersion currentVersion = 4;	
-	XferVersion version = currentVersion; 
-	xfer->xferVersion( &version, currentVersion );
-
-
-	xfer->xferInt(&m_preorderMask);
-	xfer->xferInt(&m_crcInterval);
-	xfer->xferBool(&m_inGame);
-	xfer->xferBool(&m_inProgress);
-	xfer->xferBool(&m_surrendered);
-	xfer->xferInt(&m_gameID);
-
-	Int slot = MAX_SLOTS;
-	xfer->xferInt(&slot);
-	DEBUG_ASSERTCRASH(slot==MAX_SLOTS, ("MAX_SLOTS changed, need to change version. jba."));
-
-	for (slot = 0; slot < MAX_SLOTS; slot++) 
-	{
-		Int state = m_slot[slot]->getState();
-		xfer->xferInt(&state);
-
-		UnicodeString name=m_slot[slot]->getName();	
-		if (version >= 2)
-		{
-			xfer->xferUnicodeString(&name);
-		}
-
-		Bool isAccepted=m_slot[slot]->isAccepted();
-		xfer->xferBool(&isAccepted);
-
-		Bool isMuted=m_slot[slot]->isMuted();
-		xfer->xferBool(&isMuted);
-		m_slot[slot]->mute(isMuted);
-
-		Int color=m_slot[slot]->getColor();
-		xfer->xferInt(&color);
-
-		Int startPos=m_slot[slot]->getStartPos();
-		xfer->xferInt(&startPos);
-
-		Int playerTemplate=m_slot[slot]->getPlayerTemplate();
-		xfer->xferInt(&playerTemplate);
-
-		Int teamNumber=m_slot[slot]->getTeamNumber();
-		xfer->xferInt(&teamNumber);
-
-		Int origColor=m_slot[slot]->getOriginalColor();
-		xfer->xferInt(&origColor);
-
-		Int origStartPos=m_slot[slot]->getOriginalStartPos();
-		xfer->xferInt(&origStartPos);
-
- 		Int origPlayerTemplate=m_slot[slot]->getOriginalPlayerTemplate();
-		xfer->xferInt(&origPlayerTemplate);
-
-		if( xfer->getXferMode() == XFER_LOAD ) {
-			m_slot[slot]->setState((SlotState)state, name);
-			if (isAccepted) m_slot[slot]->setAccept();
-
-			m_slot[slot]->setPlayerTemplate(origPlayerTemplate);
-			m_slot[slot]->setStartPos(origStartPos);
-			m_slot[slot]->setColor(origColor);
-			m_slot[slot]->saveOffOriginalInfo();
-
-			m_slot[slot]->setTeamNumber(teamNumber);
-			m_slot[slot]->setColor(color);
-			m_slot[slot]->setStartPos(startPos);
-			m_slot[slot]->setPlayerTemplate(playerTemplate);
-		}
-	}
-
-	xfer->xferUnsignedInt(&m_localIP);
-
-	xfer->xferMapName(&m_mapName);
-	xfer->xferUnsignedInt(&m_mapCRC);
-	xfer->xferUnsignedInt(&m_mapSize);
-	xfer->xferInt(&m_mapMask);
-	xfer->xferInt(&m_seed);
-
-  if ( version >= 3 )
-  {
-    xfer->xferUnsignedShort( &m_superweaponRestriction );
-    
-    if ( version == 3 )
-    {
-      // Version 3 had a bool which is now gone
-      Bool obsoleteBool;
-      xfer->xferBool( &obsoleteBool );
-    }
-
-    xfer->xferSnapshot( &m_startingCash );
-  }
-  else if ( xfer->getXferMode() == XFER_LOAD )
-  {
-    m_superweaponRestriction = 0;
-    m_startingCash = TheGlobalData->m_defaultStartingCash;
-  }
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void SkirmishGameInfo::loadPostProcess( void )
-{
-}  // end loadPostProcess
-
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameMessageParser.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameMessageParser.cpp
deleted file mode 100644
index c200146116e..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameMessageParser.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/GameMessageParser.h"
-
-//----------------------------------------------------------------------------
-GameMessageParser::GameMessageParser() 
-{
-	m_first = NULL;
-	m_argTypeCount = 0;
-}
-
-//----------------------------------------------------------------------------
-GameMessageParser::GameMessageParser(GameMessage *msg) 
-{
-	m_first = NULL;
-	m_argTypeCount = 0;
-
-	UnsignedByte argCount = msg->getArgumentCount();
-	GameMessageArgumentDataType lasttype = ARGUMENTDATATYPE_UNKNOWN;
-	Int thisTypeCount = 0;
-
-	for (UnsignedByte i = 0; i < argCount; ++i) {
-		GameMessageArgumentDataType type = msg->getArgumentDataType(i);
-		if (type != lasttype) {
-			if (thisTypeCount > 0) {
-				addArgType(lasttype, thisTypeCount);
-				++m_argTypeCount;
-			}
-			lasttype = type;
-			thisTypeCount = 0;
-		}
-		++thisTypeCount;
-	}
-	if (thisTypeCount > 0) {
-		addArgType(lasttype, thisTypeCount);
-		++m_argTypeCount;
-	}
-}
-
-//----------------------------------------------------------------------------
-GameMessageParser::~GameMessageParser() 
-{
-	GameMessageParserArgumentType *temp = NULL;
-	while (m_first != NULL) {
-		temp = m_first->getNext();
-		deleteInstance(m_first);
-		m_first = temp;
-	}
-}
-
-//----------------------------------------------------------------------------
-void GameMessageParser::addArgType(GameMessageArgumentDataType type, Int argCount) 
-{
-	if (m_first == NULL) {
-		m_first = newInstance(GameMessageParserArgumentType)(type, argCount);
-		m_last = m_first;
-		return;
-	}
-
-	m_last->setNext(newInstance(GameMessageParserArgumentType)(type, argCount));
-	m_last = m_last->getNext();
-}
-
-//----------------------------------------------------------------------------
-GameMessageParserArgumentType::GameMessageParserArgumentType(GameMessageArgumentDataType type, Int argCount) 
-{
-	m_next = NULL;
-	m_type = type;
-	m_argCount = argCount;
-}
-
-//----------------------------------------------------------------------------
-GameMessageParserArgumentType::~GameMessageParserArgumentType() 
-{
-}
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp
deleted file mode 100644
index 2d3523931ee..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Chat.cpp //////////////////////////////////////////////////////
-// Generals GameSpy chat-related code
-// Author: Matthew D. Campbell, July 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/AudioEventRTS.h"
-#include "Common/INI.h"
-#include "GameClient/GameText.h"
-#include "GameClient/GadgetListBox.h"
-#include "GameClient/LanguageFilter.h"
-#include "GameClient/GameWindowManager.h"
-#include "GameNetwork/GameSpy/PeerDefsImplementation.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-#include "GameClient/InGameUI.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#define OFFSET(x) (sizeof(Int) * (x))
-static const FieldParse GameSpyColorFieldParse[] = 
-{
-
-	{ "Default",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_DEFAULT) },
-	{ "CurrentRoom",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CURRENTROOM) },
-	{ "ChatRoom",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_ROOM) },
-	{ "Game",								INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_GAME) },
-	{ "GameFull",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_GAME_FULL) },
-	{ "GameCRCMismatch",		INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_GAME_CRCMISMATCH) },
-	{ "PlayerNormal",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_NORMAL) },
-	{ "PlayerOwner",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_OWNER) },
-	{ "PlayerBuddy",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_BUDDY) },
-	{ "PlayerSelf",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_SELF) },
-	{ "PlayerIgnored",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_PLAYER_IGNORED) },
-	{ "ChatNormal",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_NORMAL) },
-	{ "ChatEmote",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_EMOTE) },
-	{ "ChatOwner",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_OWNER) },
-	{ "ChatOwnerEmote",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_OWNER_EMOTE) },
-	{ "ChatPriv",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_PRIVATE) },
-	{ "ChatPrivEmote",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_PRIVATE_EMOTE) },
-	{ "ChatPrivOwner",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_PRIVATE_OWNER) },
-	{ "ChatPrivOwnerEmote",	INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_PRIVATE_OWNER_EMOTE) },
-	{ "ChatBuddy",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_BUDDY) },
-	{ "ChatSelf",						INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_CHAT_SELF) },
-	{ "AcceptTrue",					INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_ACCEPT_TRUE) },
-	{ "AcceptFalse",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_ACCEPT_FALSE) },
-	{ "MapSelected",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_MAP_SELECTED) },
-	{ "MapUnselected",			INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_MAP_UNSELECTED) },
-	{ "MOTD",								INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_MOTD) },
-	{ "MOTDHeading",				INI::parseColorInt,	NULL,	OFFSET(GSCOLOR_MOTD_HEADING) },
-
-	{ NULL,					NULL,						NULL,						0 }  // keep this last
-
-};
-
-void INI::parseOnlineChatColorDefinition( INI* ini )
-{
-	// parse the ini definition
-	ini->initFromINI( GameSpyColor, GameSpyColorFieldParse );
-}
-
-
-Color GameSpyColor[GSCOLOR_MAX] =
-{
-	GameMakeColor(255,255,255,255),	// GSCOLOR_DEFAULT
-	GameMakeColor(255,255,  0,255),	// GSCOLOR_CURRENTROOM
-	GameMakeColor(255,255,255,255),	// GSCOLOR_ROOM
-	GameMakeColor(128,128,0,255),		// GSCOLOR_GAME
-	GameMakeColor(128,128,128,255),	// GSCOLOR_GAME_FULL
-	GameMakeColor(128,128,128,255),	// GSCOLOR_GAME_CRCMISMATCH
-	GameMakeColor(255,255,255,255),	// GSCOLOR_PLAYER_NORMAL
-	GameMakeColor(255,  0,255,255),	// GSCOLOR_PLAYER_OWNER
-	GameMakeColor(255,  0,128,255),	// GSCOLOR_PLAYER_BUDDY
-	GameMakeColor(255,  0,  0,255),	// GSCOLOR_PLAYER_SELF
-	GameMakeColor(128,128,128,255),	// GSCOLOR_PLAYER_IGNORED
-	GameMakeColor(255,255,255,255),		// GSCOLOR_CHAT_NORMAL
-	GameMakeColor(255,128,0,255),		// GSCOLOR_CHAT_EMOTE,
-	GameMakeColor(255,255,0,255),		// GSCOLOR_CHAT_OWNER,
-	GameMakeColor(128,255,0,255),		// GSCOLOR_CHAT_OWNER_EMOTE,
-	GameMakeColor(0,0,255,255),			// GSCOLOR_CHAT_PRIVATE,
-	GameMakeColor(0,255,255,255),		// GSCOLOR_CHAT_PRIVATE_EMOTE,
-	GameMakeColor(255,0,255,255),		// GSCOLOR_CHAT_PRIVATE_OWNER,
-	GameMakeColor(255,128,255,255),	// GSCOLOR_CHAT_PRIVATE_OWNER_EMOTE,
-	GameMakeColor(255,  0,255,255),	// GSCOLOR_CHAT_BUDDY,
-	GameMakeColor(255,  0,128,255),	// GSCOLOR_CHAT_SELF,
-	GameMakeColor(  0,255,  0,255),	// GSCOLOR_ACCEPT_TRUE,
-	GameMakeColor(255,  0,  0,255),	// GSCOLOR_ACCEPT_FALSE,
-	GameMakeColor(255,255,  0,255),	// GSCOLOR_MAP_SELECTED,
-	GameMakeColor(255,255,255,255),	// GSCOLOR_MAP_UNSELECTED,
-	GameMakeColor(255,255,255,255),	// GSCOLOR_MOTD,
-	GameMakeColor(255,255,  0,255),	// GSCOLOR_MOTD_HEADING,
-};
-
-Bool GameSpyInfo::sendChat( UnicodeString message, Bool isAction, GameWindow *playerListbox )
-{
-	static UnicodeString s_prevMsg = UnicodeString::TheEmptyString;  //stop spam before it happens
-
-	RoomType roomType = StagingRoom;
-	if (getCurrentGroupRoom())
-		roomType = GroupRoom;
-
-	PeerRequest req;
-	req.text = message.str();
-
-	message.trim();
-	// Echo the user's input to the chat window
-	if (!message.isEmpty())
-	{
-		if (!playerListbox)
-		{	// Public message
-			if( isAction  ||  message.compare(s_prevMsg) != 0 )  //don't send duplicate messages
-			{
-				req.message.isAction = isAction;
-				req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEROOM;
-				TheGameSpyPeerMessageQueue->addRequest(req);
-				s_prevMsg = message;
-			}
-			return false;
-		}
-
-		// Get the selections (is this a private message?)
-		Int maxSel = GadgetListBoxGetListLength(playerListbox);
-		Int *selections;
-		GadgetListBoxGetSelected(playerListbox, (Int *)&selections);
-
-		if (selections[0] == -1)
-		{	// Public message
-			if( isAction  ||  message.compare(s_prevMsg) != 0 )  //don't send duplicate messages
-			{
-				req.message.isAction = isAction;
-				req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEROOM;
-				TheGameSpyPeerMessageQueue->addRequest(req);
-				s_prevMsg = message;
-			}
-			return false;
-		}
-		else
-		{
-			// Private message
-
-			// Construct a list
-			AsciiString names = AsciiString::TheEmptyString;
-			AsciiString tmp = AsciiString::TheEmptyString;
-			AsciiString aStr; // AsciiString buf for translating Unicode entries
-			names.format("%s", TheGameSpyInfo->getLocalName().str());
-			for (int i=0; i<maxSel; i++)
-			{
-				if (selections[i] != -1)
-				{
-					aStr.translate(GadgetListBoxGetText(playerListbox, selections[i], GadgetListBoxGetNumColumns(playerListbox)-1));
-					if (aStr.compareNoCase(TheGameSpyInfo->getLocalName()))
-					{
-						tmp.format(",%s", aStr.str());
-						names.concat(tmp);
-					}
-				}
-				else
-				{
-					break;
-				}
-			}
-
-			if (!names.isEmpty())
-			{
-				req.nick = names.str();
-				req.message.isAction = isAction;
-				req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEPLAYER;
-				TheGameSpyPeerMessageQueue->addRequest(req);
-			}
-			s_prevMsg = message;
-			return true;
-		}
-	}
-	s_prevMsg = message;
-	return false;
-}
-
-void GameSpyInfo::addChat( AsciiString nick, Int profileID, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win )
-{
-	PlayerInfoMap::iterator it = getPlayerInfoMap()->find(nick);
-	if (it != getPlayerInfoMap()->end())
-	{
-		addChat( it->second, msg, isPublic, isAction, win );
-	}
-	else
-	{
-	}
-}
-
-void GameSpyInfo::addChat( PlayerInfo p, UnicodeString msg, Bool isPublic, Bool isAction, GameWindow *win )
-{
-	Int style;
-	if(isSavedIgnored(p.m_profileID) || isIgnored(p.m_name))
-		return;
-	
-	Bool isOwner = p.m_flags & PEER_FLAG_OP;
-	Bool isBuddy = getBuddyMap()->find(p.m_profileID) != getBuddyMap()->end();
-
-	Bool isMe = p.m_name.compare(TheGameSpyInfo->getLocalName()) == 0;
-
-	if(!isMe)
-	{
-		if(m_disallowAsainText)
-		{
-			const WideChar *buff = msg.str();
-			Int length =  msg.getLength();	
-			for(Int i = 0; i < length; ++i)
-			{
-				if(buff[i] >= 256)
-					return;
-			}
-		}
-		else if(m_disallowNonAsianText)
-		{
-			const WideChar *buff = msg.str();
-			Int length =  msg.getLength();	
-			Bool hasUnicode = FALSE;
-			for(Int i = 0; i < length; ++i)
-			{
-				if(buff[i] >= 256)
-				{
-					hasUnicode = TRUE;
-					break;
-				}
-			}
-			if(!hasUnicode)
-				return;
-		}
-
-		if (!isPublic)
-		{
-			AudioEventRTS privMsgAudio("GUIMessageReceived");
-
-			if( TheAudio )
-			{
-				TheAudio->addAudioEvent( &privMsgAudio );
-			}  // end if
-		}
-	}
-
-
-	if (isBuddy)
-	{
-		style = GSCOLOR_CHAT_BUDDY;
-	}
-	else if (isPublic && isAction)
-	{
-		style = (isOwner)?GSCOLOR_CHAT_OWNER_EMOTE:GSCOLOR_CHAT_EMOTE;
-	}
-	else if (isPublic)
-	{
-		style = (isOwner)?GSCOLOR_CHAT_OWNER:GSCOLOR_CHAT_NORMAL;
-	}
-	else if (isAction)
-	{
-		style = (isOwner)?GSCOLOR_CHAT_PRIVATE_OWNER_EMOTE:GSCOLOR_CHAT_PRIVATE_EMOTE;
-	}
-	else
-	{
-		style = (isOwner)?GSCOLOR_CHAT_PRIVATE_OWNER:GSCOLOR_CHAT_PRIVATE;
-	}
-
-	UnicodeString name;
-	name.translate(p.m_name);
-
-	// filters language
-//  if( TheGlobalData->m_languageFilterPref )
-//  {
-    TheLanguageFilter->filterLine(msg);
-//  }
-
-	UnicodeString fullMsg;
-	if (isAction)
-	{
-		fullMsg.format( L"%ls %ls", name.str(), msg.str() );
-	}
-	else
-	{
-		fullMsg.format( L"[%ls] %ls", name.str(), msg.str() );
-	}
-
-	Int index = addText(fullMsg, GameSpyColor[style], win);
-	if (index >= 0)
-	{
-		GadgetListBoxSetItemData(win, (void *)p.m_profileID, index);
-	}
-}
-
-Int GameSpyInfo::addText( UnicodeString message, Color c, GameWindow *win )
-{
-	if (TheGameSpyGame && TheGameSpyGame->isInGame() && TheGameSpyGame->isGameInProgress())
-	{
-		static AudioEventRTS messageFromChatSound("GUIMessageReceived");
-		TheAudio->addAudioEvent(&messageFromChatSound);
-
-		TheInGameUI->message(message);
-	}
-
-	if (!win)
-	{
-		// try to pick up a registered text window
-		if (m_textWindows.empty())
-			return -1;
-
-		win = *(m_textWindows.begin());
-	}
-	Int index = GadgetListBoxAddEntryText(win, message, c, -1, -1);
-	GadgetListBoxSetItemData(win, (void *)-1, index);
-
-	return index;
-}
-
-void GameSpyInfo::registerTextWindow( GameWindow *win )
-{
-	m_textWindows.insert(win);
-}
-
-void GameSpyInfo::unregisterTextWindow( GameWindow *win )
-{
-	m_textWindows.erase(win);
-}
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp
deleted file mode 100644
index 1fed5139ca7..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: GSConfig.cpp
-// Author: Matthew D. Campbell, Sept 2002
-// Description: GameSpy online config
-///////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameState.h"
-#include "GameClient/MapUtil.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-#include "GameNetwork/RankPointValue.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-GameSpyConfigInterface *TheGameSpyConfig = NULL;
-
-class GameSpyConfig : public GameSpyConfigInterface
-{
-public:
-	GameSpyConfig( AsciiString config );
-	~GameSpyConfig() {}
-
-	// Pings
-	std::list<AsciiString> getPingServers(void)	{ return m_pingServers; }
-	Int getNumPingRepetitions(void)							{ return m_pingReps; }
-	Int getPingTimeoutInMs(void)								{ return m_pingTimeout; }
-	virtual Int getPingCutoffGood( void )				{	return m_pingCutoffGood; }
-	virtual Int getPingCutoffBad( void )				{ return m_pingCutoffBad;	}
-
-	// QM
-	std::list<AsciiString> getQMMaps(void)			{ return m_qmMaps; }
-	Int getQMBotID(void)												{ return m_qmBotID; }
-	Int getQMChannel(void)											{ return m_qmChannel; }
-	void setQMChannel(Int channel)							{ m_qmChannel = channel; }
-
-	// Player Info
-	Int getPointsForRank(Int rank);
-	virtual Bool isPlayerVIP(Int id);
-	
-	virtual Bool getManglerLocation(Int index, AsciiString& host, UnsignedShort& port);
-
-	// Ladder / Any other external parsing
-	AsciiString getLeftoverConfig(void)					{ return m_leftoverConfig; }
-	
-	// NAT Timeouts
-	virtual Int getTimeBetweenRetries() { return m_natRetryInterval; }
-	virtual Int getMaxManglerRetries() { return m_natMaxManglerRetries; }
-	virtual time_t getRetryInterval() { return m_natManglerRetryInterval; }
-	virtual time_t getKeepaliveInterval() { return m_natKeepaliveInterval; }
-	virtual time_t getPortTimeout() { return m_natPortTimeout; }
-	virtual time_t getRoundTimeout() { return m_natRoundTimeout; }
-
-	// Custom match
-	virtual Bool restrictGamesToLobby() { return m_restrictGamesToLobby; }
-
-protected:
-	std::list<AsciiString> m_pingServers;
-	Int m_pingReps;
-	Int m_pingTimeout;
-	Int m_pingCutoffGood;
-	Int m_pingCutoffBad;
-
-	Int m_natRetryInterval;
-	Int m_natMaxManglerRetries;
-	time_t m_natManglerRetryInterval;
-	time_t m_natKeepaliveInterval;
-	time_t m_natPortTimeout;
-	time_t m_natRoundTimeout;
-
-	std::vector<AsciiString> m_manglerHosts;
-	std::vector<UnsignedShort> m_manglerPorts;
-
-	std::list<AsciiString> m_qmMaps;
-	Int m_qmBotID;
-	Int m_qmChannel;
-
-	Bool m_restrictGamesToLobby;
-
-	std::set<Int> m_vip; // VIP people
-
-	Int m_rankPoints[MAX_RANKS];
-
-	AsciiString m_leftoverConfig;
-};
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-GameSpyConfigInterface* GameSpyConfigInterface::create(AsciiString config)
-{
-	return NEW GameSpyConfig(config);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-class SectionChecker
-{
-public:
-	typedef std::list<const Bool *> SectionList;
-	void addVar(const Bool *var) { m_bools.push_back(var); }
-	Bool isInSection();
-protected:
-	 SectionList m_bools;
-};
-Bool SectionChecker::isInSection() {
-	Bool ret = FALSE;
-	for (SectionList::const_iterator it = m_bools.begin(); it != m_bools.end(); ++it)
-	{
-		ret = ret || **it;
-	}
-	return ret;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-GameSpyConfig::GameSpyConfig( AsciiString config ) :
-m_natRetryInterval(1000),
-m_natMaxManglerRetries(25),
-m_natManglerRetryInterval(300),
-m_natKeepaliveInterval(15000),
-m_natPortTimeout(10000),
-m_natRoundTimeout(10000),
-m_pingReps(1),
-m_pingTimeout(1000),
-m_pingCutoffGood(300),
-m_pingCutoffBad(600),
-m_restrictGamesToLobby(FALSE),
-m_qmBotID(0),
-m_qmChannel(0)
-{
-	m_rankPoints[0] = 0;
-	m_rankPoints[1] = 5;
-	m_rankPoints[2] = 10;
-	m_rankPoints[3] = 20;
-	m_rankPoints[4] = 50;
-	m_rankPoints[5] = 100;
-	m_rankPoints[6] = 200;
-	m_rankPoints[7] = 500;
-	m_rankPoints[8] = 1000;
-	m_rankPoints[9] = 2000;
-
-	AsciiString line;
-	Bool inPingServers = FALSE;
-	Bool inPingDuration = FALSE;
-	Bool inQMMaps = FALSE;
-	Bool inQMBot = FALSE;
-	Bool inManglers = FALSE;
-	Bool inVIP = FALSE;
-	Bool inNAT = FALSE;
-	Bool inCustom = FALSE;
-
-	SectionChecker sections;
-	sections.addVar(&inPingServers);
-	sections.addVar(&inPingDuration);
-	sections.addVar(&inQMMaps);
-	sections.addVar(&inQMBot);
-	sections.addVar(&inManglers);
-	sections.addVar(&inVIP);
-	sections.addVar(&inNAT);
-	sections.addVar(&inCustom);
-
-	while (config.nextToken(&line, "\n"))
-	{
-		if (line.getCharAt(line.getLength()-1) == '\r')
-			line.removeLastChar();	// there is a trailing '\r'
-
-		line.trim();
-
-		if (line.isEmpty())
-			continue;
-
-		if (!sections.isInSection() && line.compare("<PingServers>") == 0)
-		{
-			inPingServers = TRUE;
-		}
-		else if (inPingServers && line.compare("</PingServers>") == 0)
-		{
-			inPingServers = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<PingDuration>") == 0)
-		{
-			inPingDuration = TRUE;
-		}
-		else if (inPingDuration && line.compare("</PingDuration>") == 0)
-		{
-			inPingDuration = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<QMMaps>") == 0)
-		{
-			inQMMaps = TRUE;
-		}
-		else if (inQMMaps && line.compare("</QMMaps>") == 0)
-		{
-			inQMMaps = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<Manglers>") == 0)
-		{
-			inManglers = TRUE;
-		}
-		else if (inManglers && line.compare("</Manglers>") == 0)
-		{
-			inManglers = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<QMBot>") == 0)
-		{
-			inQMBot = TRUE;
-		}
-		else if (inQMBot && line.compare("</QMBot>") == 0)
-		{
-			inQMBot = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<VIP>") == 0)
-		{
-			inVIP = TRUE;
-		}
-		else if (inVIP && line.compare("</VIP>") == 0)
-		{
-			inVIP = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<NAT>") == 0)
-		{
-			inNAT = TRUE;
-		}
-		else if (inNAT && line.compare("</NAT>") == 0)
-		{
-			inNAT = FALSE;
-		}
-		else if (!sections.isInSection() && line.compare("<Custom>") == 0)
-		{
-			inCustom = TRUE;
-		}
-		else if (inCustom && line.compare("</Custom>") == 0)
-		{
-			inCustom = FALSE;
-		}
-		else if (inVIP)
-		{
-			line.toLower();
-			if (line.getLength())
-			{
-				Int val = atoi(line.str());
-				if (val > 0)
-					m_vip.insert(val);
-			}
-		}
-		else if (inPingServers)
-		{
-			line.toLower();
-			m_pingServers.push_back(line);
-		}
-		else if (inPingDuration)
-		{
-			line.toLower();
-			AsciiString key, val;
-			if (line.nextToken(&key, " ="))
-			{
-				if (key == "reps")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_pingReps = atoi(val.str());
-					}
-				}
-				else if (key == "timeout")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_pingTimeout = atoi(val.str());
-					}
-				}
-				else if (key == "low")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_pingCutoffGood = atoi(val.str());
-					}
-				}
-				else if (key == "med")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_pingCutoffBad = atoi(val.str());
-					}
-				}
-			}
-		}
-		else if (inManglers)
-		{
-			line.trim();
-			line.toLower();
-			AsciiString hostStr;
-			AsciiString portStr;
-			line.nextToken(&hostStr, ":");
-			line.nextToken(&portStr, ":\n\r");
-			if (hostStr.isNotEmpty() && portStr.isNotEmpty())
-			{
-				m_manglerHosts.push_back(hostStr);
-				m_manglerPorts.push_back(atoi(portStr.str()));
-			}
-		}
-		else if (inQMMaps)
-		{
-			line.toLower();
-			AsciiString mapName;
-			mapName.format("%s\\%s\\%s.map", TheMapCache->getMapDir().str(), line.str(), line.str());
-			mapName = TheGameState->portableMapPathToRealMapPath(TheGameState->realMapPathToPortableMapPath(mapName));
-			mapName.toLower();
-
-			const MapMetaData *md = TheMapCache->findMap(mapName);
-			if (md)
-			{
-				m_qmMaps.push_back(mapName);
-			}
-		}
-		else if (inQMBot)
-		{
-			line.toLower();
-			AsciiString key, val;
-			if (line.nextToken(&key, " ="))
-			{
-				if (key == "id")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_qmBotID = atoi(val.str());
-					}
-				}
-			}
-		}
-		else if (inNAT)
-		{
-			line.toLower();
-			AsciiString key, val;
-			if (line.nextToken(&key, " ="))
-			{
-				if (key == "retryinterval")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_natRetryInterval = atoi(val.str());
-					}
-				}
-				else if (key == "manglerretries")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_natMaxManglerRetries = atoi(val.str());
-					}
-				}
-				else if (key == "manglerinterval")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_natManglerRetryInterval = atoi(val.str());
-					}
-				}
-				else if (key == "keepaliveinterval")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_natKeepaliveInterval = atoi(val.str());
-					}
-				}
-				else if (key == "porttimeout")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_natPortTimeout = atoi(val.str());
-					}
-				}
-				else if (key == "roundtimeout")
-				{
-					if (line.nextToken(&val, " ="))
-					{
-						m_natRoundTimeout = atoi(val.str());
-					}
-				}
-				else
-				{
-					DEBUG_LOG(("Unknown key '%s' = '%s' in NAT block of GameSpy Config\n", key.str(), val.str()));
-				}
-			}
-			else
-			{
-				DEBUG_LOG(("Key '%s' missing val in NAT block of GameSpy Config\n", key.str()));
-			}
-		}
-		else if (inCustom)
-		{
-			line.toLower();
-			AsciiString key, val;
-			if (line.nextToken(&key, " =") && line.nextToken(&val, " ="))
-			{
-				if (key == "restricted")
-				{
-					m_restrictGamesToLobby = atoi(val.str());
-				}
-				else
-				{
-					DEBUG_LOG(("Unknown key '%s' = '%s' in Custom block of GameSpy Config\n", key.str(), val.str()));
-				}
-			}
-			else
-			{
-				DEBUG_LOG(("Key '%s' missing val in Custom block of GameSpy Config\n", key.str()));
-			}
-		}
-		else
-		{
-			m_leftoverConfig.concat(line);
-			m_leftoverConfig.concat('\n');
-		}
-	}
-
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-Int GameSpyConfig::getPointsForRank(Int rank)
-{
-	if (rank >= MAX_RANKS) rank = MAX_RANKS-1;
-	if (rank < 0) rank = 0;
-	return m_rankPoints[rank];
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-Bool GameSpyConfig::getManglerLocation(Int index, AsciiString& host, UnsignedShort& port)
-{
-	if (index < 0 || index >= m_manglerHosts.size())
-	{
-		return FALSE;
-	}
-
-	host = m_manglerHosts[index];
-	port = m_manglerPorts[index];
-	return TRUE;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-Bool GameSpyConfig::isPlayerVIP(Int id)
-{
-	std::set<Int>::const_iterator it = std::find(m_vip.begin(), m_vip.end(), id);
-	return it != m_vip.end();
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp
deleted file mode 100644
index eea0e803138..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: LadderDefs.cpp //////////////////////////////////////////////////////
-// Generals ladder code
-// Author: Matthew D. Campbell, August 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/GameSpy/ThreadUtils.h"
-#include "GameNetwork/GameSpy/LadderDefs.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-#include "Common/GameState.h"
-#include "Common/file.h"
-#include "Common/FileSystem.h"
-#include "Common/PlayerTemplate.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MapUtil.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-LadderList *TheLadderList = NULL;
-
-LadderInfo::LadderInfo()
-{
-	playersPerTeam = 1;
-	minWins = 0;
-	maxWins = 0;
-	randomMaps = TRUE;
-	randomFactions = TRUE;
-	validQM = TRUE;
-	validCustom = FALSE;
-	port = 0;
-	submitReplay = FALSE;
-	index = -1;
-}
-
-static LadderInfo *parseLadder(AsciiString raw)
-{
-	DEBUG_LOG(("Looking at ladder:\n%s\n", raw.str()));
-	LadderInfo *lad = NULL;
-	AsciiString line;
-	while (raw.nextToken(&line, "\n"))
-	{
-		if (line.getCharAt(line.getLength()-1) == '\r')
-			line.removeLastChar();	// there is a trailing '\r'
-
-		line.trim();
-
-		if (line.isEmpty())
-			continue;
-
-		// woohoo!  got a line!
-		line.trim();
-		if ( !lad && line.startsWith("<Ladder ") )
-		{
-			// start of a ladder def
-			lad = NEW LadderInfo;
-
-			// fill in some info
-			AsciiString tokenName, tokenAddr, tokenPort, tokenHomepage;
-			line.removeLastChar(); // the '>'
-			line = line.str() + 7; // the "<Ladder "
-			line.nextToken(&tokenAddr, "\" ");
-			line.nextToken(&tokenPort, " ");
-			line.nextToken(&tokenHomepage, " ");
-
-			lad->name = MultiByteToWideCharSingleLine(tokenName.str()).c_str();
-			while (lad->name.getLength() > 20)
-				lad->name.removeLastChar(); // Per Harvard's request, ladder names are limited to 20 chars
-			lad->address = tokenAddr;
-			lad->port = atoi(tokenPort.str());
-			lad->homepageURL = tokenHomepage;
-		}
-		else if ( lad && line.startsWith("Name ") )
-		{
-			lad->name = MultiByteToWideCharSingleLine(line.str() + 5).c_str();
-		}
-		else if ( lad && line.startsWith("Desc ") )
-		{
-			lad->description = MultiByteToWideCharSingleLine(line.str() + 5).c_str();
-		}
-		else if ( lad && line.startsWith("Loc ") )
-		{
-			lad->location = MultiByteToWideCharSingleLine(line.str() + 4).c_str();
-		}
-		else if ( lad && line.startsWith("TeamSize ") )
-		{
-			lad->playersPerTeam = atoi(line.str() + 9);
-		}
-		else if ( lad && line.startsWith("RandomMaps ") )
-		{
-			lad->randomMaps = atoi(line.str() + 11);
-		}
-		else if ( lad && line.startsWith("RandomFactions ") )
-		{
-			lad->randomFactions = atoi(line.str() + 15);
-		}
-		else if ( lad && line.startsWith("Faction ") )
-		{
-			AsciiString faction = line.str() + 8;
-			AsciiStringList outStringList;
-			ThePlayerTemplateStore->getAllSideStrings(&outStringList);
-
-			AsciiStringList::iterator aIt = std::find(outStringList.begin(), outStringList.end(), faction);
-			if (aIt != outStringList.end())
-			{
-				// valid faction - now check for dupes
-				aIt = std::find(lad->validFactions.begin(), lad->validFactions.end(), faction);
-				if (aIt == lad->validFactions.end())
-				{
-					lad->validFactions.push_back(faction);
-				}
-			}
-		}
-		/*
-		else if ( lad && line.startsWith("QM ") )
-		{
-			lad->validQM = atoi(line.str() + 3);
-		}
-		else if ( lad && line.startsWith("Custom ") )
-		{
-			lad->validCustom = atoi(line.str() + 7);
-		}
-		*/
-		else if ( lad && line.startsWith("MinWins ") )
-		{
-			lad->minWins = atoi(line.str() + 8);
-		}
-		else if ( lad && line.startsWith("MaxWins ") )
-		{
-			lad->maxWins = atoi(line.str() + 8);
-		}
-		else if ( lad && line.startsWith("CryptedPass ") )
-		{
-			lad->cryptedPassword = line.str() + 12;
-		}
-		else if ( lad && line.compare("</Ladder>") == 0 )
-		{
-			DEBUG_LOG(("Saw a ladder: name=%ls, addr=%s:%d, players=%dv%d, pass=%s, replay=%d, homepage=%s\n",
-				lad->name.str(), lad->address.str(), lad->port, lad->playersPerTeam, lad->playersPerTeam, lad->cryptedPassword.str(),
-				lad->submitReplay, lad->homepageURL.str()));
-			// end of a ladder
-			if (lad->playersPerTeam >= 1 && lad->playersPerTeam <= MAX_SLOTS/2)
-			{
-				if (lad->validFactions.size() == 0)
-				{
-					DEBUG_LOG(("No factions specified.  Using all.\n"));
-					lad->validFactions.clear();
-					Int numTemplates = ThePlayerTemplateStore->getPlayerTemplateCount();
-					for ( Int i = 0; i < numTemplates; ++i ) 
-					{
-						const PlayerTemplate *pt = ThePlayerTemplateStore->getNthPlayerTemplate(i);
-						if (!pt)			
-							continue; 
-
-						if (pt->isPlayableSide()  &&  pt->getSide().compare("Boss") != 0 )
-							lad->validFactions.push_back(pt->getSide());
-					}
-				}
-				else
-				{
-					AsciiStringList validFactions = lad->validFactions;
-					for (AsciiStringListIterator it = validFactions.begin(); it != validFactions.end(); ++it)
-					{
-						AsciiString faction = *it;
-						AsciiString marker;
-						marker.format("INI:Faction%s", faction.str());
-						DEBUG_LOG(("Faction %s has marker %s corresponding to str %ls\n", faction.str(), marker.str(), TheGameText->fetch(marker).str()));
-					}
-				}
-
-				if (lad->validMaps.size() == 0)
-				{
-					DEBUG_LOG(("No maps specified.  Using all.\n"));
-					std::list<AsciiString> qmMaps = TheGameSpyConfig->getQMMaps();
-					for (std::list<AsciiString>::const_iterator it = qmMaps.begin(); it != qmMaps.end(); ++it)
-					{
-						AsciiString mapName = *it;
-
-						// check sizes on the maps before allowing them
-						const MapMetaData *md = TheMapCache->findMap(mapName);
-						if (md && md->m_numPlayers >= lad->playersPerTeam*2)
-						{
-							lad->validMaps.push_back(mapName);
-						}
-					}
-				}
-				return lad;
-			}
-			else
-			{
-				// no maps?  don't play on it!
-				delete lad;
-				lad = NULL;
-				return NULL;
-			}
-		}
-		else if ( lad && line.startsWith("Map ") )
-		{
-			// valid map
-			AsciiString mapName = line.str() + 4;
-			mapName.trim();
-			if (mapName.isNotEmpty())
-			{
-				mapName.format("%s\\%s\\%s.map", TheMapCache->getMapDir().str(), mapName.str(), mapName.str());
-				mapName = TheGameState->portableMapPathToRealMapPath(TheGameState->realMapPathToPortableMapPath(mapName));
-				mapName.toLower();
-				std::list<AsciiString> qmMaps = TheGameSpyConfig->getQMMaps();
-				if (std::find(qmMaps.begin(), qmMaps.end(), mapName) != qmMaps.end())
-				{
-					// check sizes on the maps before allowing them
-					const MapMetaData *md = TheMapCache->findMap(mapName);
-					if (md && md->m_numPlayers >= lad->playersPerTeam*2)
-						lad->validMaps.push_back(mapName);
-				}
-			}
-		}
-		else
-		{
-			// bad ladder - kill it
-			delete lad;
-			lad = NULL;
-		}
-	}
-
-	if (lad)
-	{
-		delete lad;
-		lad = NULL;
-	}
-	return NULL;
-}
-
-LadderList::LadderList()
-{
-	//Int profile = TheGameSpyInfo->getLocalProfileID();
-
-	AsciiString rawMotd = TheGameSpyConfig->getLeftoverConfig();
-	AsciiString line;
-	Bool inLadders = FALSE;
-	Bool inSpecialLadders = FALSE;
-	Bool inLadder = FALSE;
-	LadderInfo *lad = NULL;
-	Int index = 1;
-	AsciiString rawLadder;
-
-	while (rawMotd.nextToken(&line, "\n"))
-	{
-		if (line.getCharAt(line.getLength()-1) == '\r')
-			line.removeLastChar();	// there is a trailing '\r'
-
-		line.trim();
-
-		if (line.isEmpty())
-			continue;
-
-		if (!inLadders && line.compare("<Ladders>") == 0)
-		{
-			inLadders = TRUE;
-			rawLadder.clear();
-		}
-		else if (inLadders && line.compare("</Ladders>") == 0)
-		{
-			inLadders = FALSE;
-		}
-		else if (!inSpecialLadders && line.compare("<SpecialLadders>") == 0)
-		{
-			inSpecialLadders = TRUE;
-			rawLadder.clear();
-		}
-		else if (inSpecialLadders && line.compare("</SpecialLadders>") == 0)
-		{
-			inSpecialLadders = FALSE;
-		}
-		else if (inLadders || inSpecialLadders)
-		{
-			if (line.startsWith("<Ladder ") && !inLadder)
-			{
-				inLadder = TRUE;
-				rawLadder.clear();
-				rawLadder.concat(line);
-				rawLadder.concat('\n');
-			}
-			else if (line.compare("</Ladder>") == 0 && inLadder)
-			{
-				inLadder = FALSE;
-				rawLadder.concat(line);
-				rawLadder.concat('\n');
-				if ((lad = parseLadder(rawLadder)) != NULL)
-				{
-					lad->index = index++;
-					if (inLadders)
-					{
-						DEBUG_LOG(("Adding to standard ladders\n"));
-						m_standardLadders.push_back(lad);
-					}
-					else
-					{
-						DEBUG_LOG(("Adding to special ladders\n"));
-						m_specialLadders.push_back(lad);
-					}
-				}
-				rawLadder.clear();
-			}
-			else if (inLadder)
-			{
-				rawLadder.concat(line);
-				rawLadder.concat('\n');
-			}
-		}
-	}
-
-	// look for local ladders
-	loadLocalLadders();
-
-	DEBUG_LOG(("After looking for ladders, we have %d local, %d special && %d normal\n", m_localLadders.size(), m_specialLadders.size(), m_standardLadders.size()));
-}
-
-LadderList::~LadderList()
-{
-	LadderInfoList::iterator it;
-	for (it = m_specialLadders.begin(); it != m_specialLadders.end(); it = m_specialLadders.begin())
-	{
-		delete *it;
-		m_specialLadders.pop_front();
-	}
-	for (it = m_standardLadders.begin(); it != m_standardLadders.end(); it = m_standardLadders.begin())
-	{
-		delete *it;
-		m_standardLadders.pop_front();
-	}
-	for (it = m_localLadders.begin(); it != m_localLadders.end(); it = m_localLadders.begin())
-	{
-		delete *it;
-		m_localLadders.pop_front();
-	}
-}
-
-const LadderInfo* LadderList::findLadder( const AsciiString& addr, UnsignedShort port )
-{
-	LadderInfoList::const_iterator cit;
-
-	for (cit = m_specialLadders.begin(); cit != m_specialLadders.end(); ++cit)
-	{
-		const LadderInfo *li = *cit;
-		if (li->address == addr && li->port == port)
-		{
-			return li;
-		}
-	}
-
-	for (cit = m_standardLadders.begin(); cit != m_standardLadders.end(); ++cit)
-	{
-		const LadderInfo *li = *cit;
-		if (li->address == addr && li->port == port)
-		{
-			return li;
-		}
-	}
-
-	for (cit = m_localLadders.begin(); cit != m_localLadders.end(); ++cit)
-	{
-		const LadderInfo *li = *cit;
-		if (li->address == addr && li->port == port)
-		{
-			return li;
-		}
-	}
-
-	return NULL;
-}
-
-const LadderInfo* LadderList::findLadderByIndex( Int index )
-{
-	if (index == 0)
-		return NULL;
-
-	LadderInfoList::const_iterator cit;
-
-	for (cit = m_specialLadders.begin(); cit != m_specialLadders.end(); ++cit)
-	{
-		const LadderInfo *li = *cit;
-		if (li->index == index)
-		{
-			return li;
-		}
-	}
-
-	for (cit = m_standardLadders.begin(); cit != m_standardLadders.end(); ++cit)
-	{
-		const LadderInfo *li = *cit;
-		if (li->index == index)
-		{
-			return li;
-		}
-	}
-
-	for (cit = m_localLadders.begin(); cit != m_localLadders.end(); ++cit)
-	{
-		const LadderInfo *li = *cit;
-		if (li->index == index)
-		{
-			return li;
-		}
-	}
-
-	return NULL;
-}
-
-const LadderInfoList* LadderList::getSpecialLadders( void )
-{
-	return &m_specialLadders;
-}
-
-const LadderInfoList* LadderList::getStandardLadders( void )
-{
-	return &m_standardLadders;
-}
-
-const LadderInfoList* LadderList::getLocalLadders( void )
-{
-	return &m_localLadders;
-}
-
-void LadderList::loadLocalLadders( void )
-{
-	AsciiString dirname;
-	dirname.format("%sGeneralsOnline\\Ladders\\", TheGlobalData->getPath_UserData().str());
-	FilenameList filenameList;
-	TheFileSystem->getFileListInDirectory(dirname, AsciiString("*.ini"), filenameList, TRUE);
-
-	Int index = -1;
-
-	FilenameList::iterator it = filenameList.begin();
-	while (it != filenameList.end())
-	{
-		AsciiString filename = *it;
-		DEBUG_LOG(("Looking at possible ladder info file '%s'\n", filename.str()));
-		filename.toLower();
-		checkLadder( filename, index-- );
-		++it;
-	}
-}
-
-void LadderList::checkLadder( AsciiString fname, Int index )
-{
-	File *fp = TheFileSystem->openFile(fname.str(), File::READ | File::TEXT);
-	char buf[1024];
-	AsciiString rawData;
-	if (fp)
-	{
-		Int len;
-		while (!fp->eof())
-		{
-			len = fp->read(buf, 1023);
-			buf[len] = 0;
-			buf[1023] = 0;
-			rawData.concat(buf);
-		}
-		fp->close();
-		fp = NULL;
-	}
-
-	DEBUG_LOG(("Read %d bytes from '%s'\n", rawData.getLength(), fname.str()));
-	if (rawData.isEmpty())
-		return;
-
-	LadderInfo *li = parseLadder(rawData);
-	if (!li)
-	{
-		return;
-	}
-
-	// sanity check
-	if (li->address.isEmpty())
-	{
-		DEBUG_LOG(("Bailing because of li->address.isEmpty()\n"));
-		delete li;
-		return;
-	}
-
-	if (!li->port)
-	{
-		DEBUG_LOG(("Bailing because of !li->port\n"));
-		delete li;
-		return;
-	}
-
-	if (li->validMaps.size() == 0)
-	{
-		DEBUG_LOG(("Bailing because of li->validMaps.size() == 0\n"));
-		delete li;
-		return;
-	}
-
-	li->index = index;
-
-	// ladders are QM-only at this point, which kinda invalidates the whole concept of local ladders.  Oh well.
-	li->validQM = FALSE; // no local ladders in QM
-	li->validCustom = FALSE;
-
-	//for (Int i=0; i<4; ++i)
-	//	fname.removeLastChar(); // remove .lad
-	//li->name = UnicodeString(MultiByteToWideCharSingleLine(fname.reverseFind('\\')+1).c_str());
-
-	DEBUG_LOG(("Adding local ladder %ls\n", li->name.str()));
-	m_localLadders.push_back(li);
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp
deleted file mode 100644
index 10b11d0d8d3..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp
+++ /dev/null
@@ -1,938 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: LobbyUtils.cpp
-// Author: Matthew D. Campbell, Sept 2002
-// Description: GameSpy lobby utils
-///////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameEngine.h"
-#include "Common/MultiplayerSettings.h"
-#include "Common/PlayerTemplate.h"
-#include "Common/version.h"
-#include "GameClient/AnimateWindowManager.h"
-#include "GameClient/WindowLayout.h"
-#include "GameClient/Gadget.h"
-#include "GameClient/Image.h"
-#include "GameClient/Shell.h"
-#include "GameClient/KeyDefs.h"
-#include "GameClient/GameWindowManager.h"
-#include "GameClient/GadgetComboBox.h"
-#include "GameClient/GadgetListBox.h"
-#include "GameClient/GadgetTextEntry.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MapUtil.h"
-#include "GameClient/MessageBox.h"
-#include "GameClient/Mouse.h"
-#include "GameNetwork/GameSpyOverlay.h"
-
-#include "GameClient/LanguageFilter.h"
-#include "GameNetwork/GameSpy/BuddyDefs.h"
-#include "GameNetwork/GameSpy/LadderDefs.h"
-#include "GameNetwork/GameSpy/LobbyUtils.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-#include "GameNetwork/GameSpy/PersistentStorageDefs.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-
-#include "Common/STLTypedefs.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-// Note: if you add more columns, you must modify the .wnd files and change the listbox properties (yuck!)
-static enum {
-	COLUMN_NAME = 0,
-	COLUMN_MAP,
-	COLUMN_LADDER,
-	COLUMN_NUMPLAYERS,
-	COLUMN_PASSWORD,
-	COLUMN_OBSERVER,
-  COLUMN_USE_STATS,
-	COLUMN_PING,
-};
-
-static NameKeyType buttonSortAlphaID = NAMEKEY_INVALID;
-static NameKeyType buttonSortPingID = NAMEKEY_INVALID;
-static NameKeyType buttonSortBuddiesID = NAMEKEY_INVALID;
-static NameKeyType windowSortAlphaID = NAMEKEY_INVALID;
-static NameKeyType windowSortPingID = NAMEKEY_INVALID;
-static NameKeyType windowSortBuddiesID = NAMEKEY_INVALID;
-
-static GameWindow *buttonSortAlpha = NULL;
-static GameWindow *buttonSortPing = NULL;
-static GameWindow *buttonSortBuddies = NULL;
-static GameWindow *windowSortAlpha = NULL;
-static GameWindow *windowSortPing = NULL;
-static GameWindow *windowSortBuddies = NULL;
-
-static GameSortType theGameSortType = GAMESORT_ALPHA_ASCENDING;
-static Bool sortBuddies = TRUE;
-static void showSortIcons(void)
-{
-	if (windowSortAlpha && windowSortPing)
-	{
-		switch(theGameSortType)
-		{
-			case GAMESORT_ALPHA_ASCENDING:
-				windowSortAlpha->winHide(FALSE);
-				windowSortAlpha->winEnable(TRUE);
-				windowSortPing->winHide(TRUE);
-				break;
-			case GAMESORT_ALPHA_DESCENDING:
-				windowSortAlpha->winHide(FALSE);
-				windowSortAlpha->winEnable(FALSE);
-				windowSortPing->winHide(TRUE);
-				break;
-			case GAMESORT_PING_ASCENDING:
-				windowSortPing->winHide(FALSE);
-				windowSortPing->winEnable(TRUE);
-				windowSortAlpha->winHide(TRUE);
-				break;
-			case GAMESORT_PING_DESCENDING:
-				windowSortPing->winHide(FALSE);
-				windowSortPing->winEnable(FALSE);
-				windowSortAlpha->winHide(TRUE);
-				break;
-		}
-	}
-
-	if (sortBuddies)
-	{
-		if (windowSortBuddies)
-		{
-			windowSortBuddies->winHide(FALSE);
-		}
-	}
-	else
-	{
-		if (windowSortBuddies)
-		{
-			windowSortBuddies->winHide(TRUE);
-		}
-	}
-}
-void setSortMode( GameSortType sortType ) { theGameSortType = sortType; showSortIcons(); RefreshGameListBoxes(); }
-void sortByBuddies( Bool doSort ) { sortBuddies = doSort; showSortIcons(); RefreshGameListBoxes(); }
-
-Bool HandleSortButton( NameKeyType sortButton )
-{
-	if (sortButton == buttonSortBuddiesID)
-	{
-		sortByBuddies( !sortBuddies );
-		return TRUE;
-	}
-	else if (sortButton == buttonSortAlphaID)
-	{
-		if (theGameSortType == GAMESORT_ALPHA_ASCENDING)
-		{
-			setSortMode(GAMESORT_ALPHA_DESCENDING);
-		}
-		else
-		{
-			setSortMode(GAMESORT_ALPHA_ASCENDING);
-		}
-		return TRUE;
-	}
-	else if (sortButton == buttonSortPingID)
-	{
-		if (theGameSortType == GAMESORT_PING_ASCENDING)
-		{
-			setSortMode(GAMESORT_PING_DESCENDING);
-		}
-		else
-		{
-			setSortMode(GAMESORT_PING_ASCENDING);
-		}
-		return TRUE;
-	}
-	return FALSE;
-}
-
-// window ids ------------------------------------------------------------------------------
-static NameKeyType parentID = NAMEKEY_INVALID;
-//static NameKeyType parentGameListSmallID = NAMEKEY_INVALID;
-static NameKeyType parentGameListLargeID = NAMEKEY_INVALID;
-static NameKeyType listboxLobbyGamesSmallID = NAMEKEY_INVALID;
-static NameKeyType listboxLobbyGamesLargeID = NAMEKEY_INVALID;
-//static NameKeyType listboxLobbyGameInfoID = NAMEKEY_INVALID;
-
-// Window Pointers ------------------------------------------------------------------------
-static GameWindow *parent = NULL;
-//static GameWindow *parentGameListSmall = NULL;
-static GameWindow *parentGameListLarge = NULL;
-       //GameWindow *listboxLobbyGamesSmall = NULL;
-       GameWindow *listboxLobbyGamesLarge = NULL;
-       //GameWindow *listboxLobbyGameInfo = NULL;
-
-static const Image *pingImages[3] = { NULL, NULL, NULL };
-
-static void gameTooltip(GameWindow *window,
-													WinInstanceData *instData,
-													UnsignedInt mouse)
-{
-	Int x, y, row, col;
-	x = LOLONGTOSHORT(mouse);
-	y = HILONGTOSHORT(mouse);
-
-	GadgetListBoxGetEntryBasedOnXY(window, x, y, row, col);
-
-	if (row == -1 || col == -1)
-	{
-		TheMouse->setCursorTooltip( UnicodeString::TheEmptyString);//TheGameText->fetch("TOOLTIP:GamesBeingFormed") );
-		return;
-	}
-
-	Int gameID = (Int)GadgetListBoxGetItemData(window, row, 0);
-	GameSpyStagingRoom *room = TheGameSpyInfo->findStagingRoomByID(gameID);
-	if (!room)
-	{
-		TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:UnknownGame") );
-		return;
-	}
-
-	if (col == COLUMN_PING)
-	{
-#if 0 //def DEBUG_LOGGING
-		UnicodeString s;
-		s.format(L"Ping is %d ms (cutoffs are %d ms and %d ms\n%hs local pings\n%hs remote pings",
-			room->getPingAsInt(), TheGameSpyConfig->getPingCutoffGood(), TheGameSpyConfig->getPingCutoffBad(),
-			TheGameSpyInfo->getPingString().str(), room->getPingString().str()
-		);
-		TheMouse->setCursorTooltip( s, 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
-#else
-		TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:PingInfo"), 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
-#endif
-		return;
-	}
-	if (col == COLUMN_NUMPLAYERS)
-	{
-		TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:NumberOfPlayers"), 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
-		return;
-	}
-	if (col == COLUMN_PASSWORD)
-	{
-		if (room->getHasPassword())
-		{
-			UnicodeString checkTooltip =TheGameText->fetch("TOOTIP:Password");
-			if(!checkTooltip.compare(L"Password required to joing game"))
-				checkTooltip.set(L"Password required to join game");
-			TheMouse->setCursorTooltip( checkTooltip, 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
-		}
-		else
-			TheMouse->setCursorTooltip( UnicodeString::TheEmptyString );
-		return;
-	}
-  if (col == COLUMN_USE_STATS)
-  {
-    if ( room->getUseStats() )
-    {
-      TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:UseStatsOn") );
-    }
-    else
-    {
-      TheMouse->setCursorTooltip( TheGameText->fetch("TOOLTIP:UseStatsOff") );
-    }
-    return;
-  }
-
-	UnicodeString tooltip;
-
-	UnicodeString mapName;
-	const MapMetaData *md = TheMapCache->findMap(room->getMap());
-	if (md)
-	{
-		mapName = md->m_displayName;
-	}
-	else
-	{
-		const char *start = room->getMap().reverseFind('\\');
-		if (start)
-		{
-			++start;
-		}
-		else
-		{
-			start = room->getMap().str();
-		}
-		mapName.translate( start );
-	}
-	UnicodeString tmp;
-	tooltip.format(TheGameText->fetch("TOOLTIP:GameInfoGameName"), room->getGameName().str());
-	if (room->getLadderPort() != 0)
-	{
-		const LadderInfo *linfo = TheLadderList->findLadder(room->getLadderIP(), room->getLadderPort());
-		if (linfo)
-		{
-			tmp.format(TheGameText->fetch("TOOLTIP:GameInfoLadderName"), linfo->name.str());
-			tooltip.concat(tmp);
-		}
-	}
-	if (room->getExeCRC() != TheGlobalData->m_exeCRC || room->getIniCRC() != TheGlobalData->m_iniCRC)
-	{
-		tmp.format(TheGameText->fetch("TOOLTIP:InvalidGameVersion"), mapName.str());
-		tooltip.concat(tmp);
-	}
-	tmp.format(TheGameText->fetch("TOOLTIP:GameInfoMap"), mapName.str());
-	tooltip.concat(tmp);
-
-	AsciiString aPlayer;
-	UnicodeString player;
-	Int numPlayers = 0;
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		GameSpyGameSlot *slot = room->getGameSpySlot(i);
-		if (i == 0 && (!slot || !slot->isHuman()))
-		{
-			DEBUG_CRASH(("About to tooltip a non-hosted game!\n"));
-		}
-		if (slot && slot->isHuman())
-		{
-			tmp.format(TheGameText->fetch("TOOLTIP:GameInfoPlayer"), slot->getName().str(), slot->getWins(), slot->getLosses());
-			tooltip.concat(tmp);
-			++numPlayers;
-		}
-		else if (slot && slot->isAI())
-		{
-			++numPlayers;
-			switch(slot->getState())
-			{
-			case SLOT_EASY_AI:
-				tooltip.concat(L'\n');
-				tooltip.concat(TheGameText->fetch("GUI:EasyAI"));
-				break;
-			case SLOT_MED_AI:
-				tooltip.concat(L'\n');
-				tooltip.concat(TheGameText->fetch("GUI:MediumAI"));
-				break;
-			case SLOT_BRUTAL_AI:
-				tooltip.concat(L'\n');
-				tooltip.concat(TheGameText->fetch("GUI:HardAI"));
-				break;
-			}
-		}
-	}
-	DEBUG_ASSERTCRASH(numPlayers, ("Tooltipping a 0-player game!\n"));
-
-	TheMouse->setCursorTooltip( tooltip, 10, NULL, 2.0f ); // the text and width are the only params used.  the others are the default values.
-}
-
-static Bool isSmall = TRUE;
-
-GameWindow *GetGameListBox( void )
-{
-	return listboxLobbyGamesLarge;
-}
-
-GameWindow *GetGameInfoListBox( void )
-{
-	return NULL;
-}
-
-NameKeyType GetGameListBoxID( void )
-{
-	return listboxLobbyGamesLargeID;
-}
-
-NameKeyType GetGameInfoListBoxID( void )
-{
-	return NAMEKEY_INVALID;
-}
-
-void GrabWindowInfo( void )
-{
-	isSmall = TRUE;
-	parentID = NAMEKEY( "WOLCustomLobby.wnd:WOLLobbyMenuParent" );
-	parent = TheWindowManager->winGetWindowFromId(NULL, parentID);
-
-	pingImages[0] = TheMappedImageCollection->findImageByName("Ping03");
-	pingImages[1] = TheMappedImageCollection->findImageByName("Ping02");
-	pingImages[2] = TheMappedImageCollection->findImageByName("Ping01");
-	DEBUG_ASSERTCRASH(pingImages[0], ("Can't find ping image!"));
-	DEBUG_ASSERTCRASH(pingImages[1], ("Can't find ping image!"));
-	DEBUG_ASSERTCRASH(pingImages[2], ("Can't find ping image!"));
-
-//	parentGameListSmallID = NAMEKEY( "WOLCustomLobby.wnd:ParentGameListSmall" );
-//	parentGameListSmall = TheWindowManager->winGetWindowFromId(NULL, parentGameListSmallID);
-
-	parentGameListLargeID = NAMEKEY( "WOLCustomLobby.wnd:ParentGameListLarge" );
-	parentGameListLarge = TheWindowManager->winGetWindowFromId(NULL, parentGameListLargeID);
-
-	listboxLobbyGamesSmallID = NAMEKEY( "WOLCustomLobby.wnd:ListboxGames" );
-//	listboxLobbyGamesSmall = TheWindowManager->winGetWindowFromId(NULL, listboxLobbyGamesSmallID);
-//	listboxLobbyGamesSmall->winSetTooltipFunc(gameTooltip);
-
-	listboxLobbyGamesLargeID = NAMEKEY( "WOLCustomLobby.wnd:ListboxGamesLarge" );
-	listboxLobbyGamesLarge = TheWindowManager->winGetWindowFromId(NULL, listboxLobbyGamesLargeID);
-	listboxLobbyGamesLarge->winSetTooltipFunc(gameTooltip);
-//
-//	listboxLobbyGameInfoID = NAMEKEY( "WOLCustomLobby.wnd:ListboxGameInfo" );
-//	listboxLobbyGameInfo = TheWindowManager->winGetWindowFromId(NULL, listboxLobbyGameInfoID);
-
-	buttonSortAlphaID = NAMEKEY("WOLCustomLobby.wnd:ButtonSortAlpha");
-	buttonSortPingID = NAMEKEY("WOLCustomLobby.wnd:ButtonSortPing");
-	buttonSortBuddiesID = NAMEKEY("WOLCustomLobby.wnd:ButtonSortBuddies");
-	windowSortAlphaID = NAMEKEY("WOLCustomLobby.wnd:WindowSortAlpha");
-	windowSortPingID = NAMEKEY("WOLCustomLobby.wnd:WindowSortPing");
-	windowSortBuddiesID = NAMEKEY("WOLCustomLobby.wnd:WindowSortBuddies");
-
-	buttonSortAlpha = TheWindowManager->winGetWindowFromId(parent, buttonSortAlphaID);
-	buttonSortPing = TheWindowManager->winGetWindowFromId(parent, buttonSortPingID);
-	buttonSortBuddies = TheWindowManager->winGetWindowFromId(parent, buttonSortBuddiesID);
-	windowSortAlpha = TheWindowManager->winGetWindowFromId(parent, windowSortAlphaID);
-	windowSortPing = TheWindowManager->winGetWindowFromId(parent, windowSortPingID);
-	windowSortBuddies = TheWindowManager->winGetWindowFromId(parent, windowSortBuddiesID);
-
-	showSortIcons();
-}
-
-void ReleaseWindowInfo( void )
-{
-	isSmall = TRUE;
-	parent = NULL;
-//	parentGameListSmall = NULL;
-	parentGameListLarge = NULL;
-//	listboxLobbyGamesSmall = NULL;
-	listboxLobbyGamesLarge = NULL;
-//	listboxLobbyGameInfo = NULL;
-
-	buttonSortAlpha = NULL;
-	buttonSortPing = NULL;
-	buttonSortBuddies = NULL;
-	windowSortAlpha = NULL;
-	windowSortPing = NULL;
-	windowSortBuddies = NULL;
-}
-
-typedef std::set<GameSpyStagingRoom *> BuddyGameSet;
-static BuddyGameSet *theBuddyGames = NULL;
-static void populateBuddyGames(void)
-{
-	BuddyInfoMap *m = TheGameSpyInfo->getBuddyMap();
-	theBuddyGames = NEW BuddyGameSet;
-	if (!m)
-	{
-		return;
-	}
-	for (BuddyInfoMap::const_iterator bit = m->begin(); bit != m->end(); ++bit)
-	{
-		BuddyInfo info = bit->second;
-		if (info.m_status == GP_STAGING)
-		{
-			StagingRoomMap *srm = TheGameSpyInfo->getStagingRoomList();
-			for (StagingRoomMap::iterator srmIt = srm->begin(); srmIt != srm->end(); ++srmIt)
-			{
-				GameSpyStagingRoom *game = srmIt->second;
-				game->cleanUpSlotPointers();
-				const GameSpyGameSlot *slot = game->getGameSpySlot(0);
-				if (slot && slot->getName() == info.m_locationString)
-				{
-					theBuddyGames->insert(game);
-					break;
-				}
-			}
-		}
-	}
-}
-
-static void clearBuddyGames(void)
-{
-	if (theBuddyGames)
-		delete theBuddyGames;
-	theBuddyGames = NULL;
-}
-
-struct GameSortStruct
-{
-	bool operator()(GameSpyStagingRoom *g1, GameSpyStagingRoom *g2) const
-	{
-		// sort CRC mismatches to the bottom
-		Bool g1Good = (g1->getExeCRC() != TheGlobalData->m_exeCRC || g1->getIniCRC() != TheGlobalData->m_iniCRC);
-		Bool g2Good = (g1->getExeCRC() != TheGlobalData->m_exeCRC || g1->getIniCRC() != TheGlobalData->m_iniCRC);
-		if ( g1Good ^ g2Good )
-		{
-			return g1Good;
-		}
-
-		// sort games with private ladders to the bottom
-		Bool g1UnknownLadder = (g1->getLadderPort() && TheLadderList->findLadder(g1->getLadderIP(), g1->getLadderPort()) == NULL);
-		Bool g2UnknownLadder = (g2->getLadderPort() && TheLadderList->findLadder(g2->getLadderIP(), g2->getLadderPort()) == NULL);
-		if ( g1UnknownLadder ^ g2UnknownLadder )
-		{
-			return g2UnknownLadder;
-		}
-
-		// sort full games to the bottom
-		Bool g1Full = (g1->getNumNonObserverPlayers() == g1->getMaxPlayers() || g1->getNumPlayers() == MAX_SLOTS);
-		Bool g2Full = (g2->getNumNonObserverPlayers() == g2->getMaxPlayers() || g2->getNumPlayers() == MAX_SLOTS);
-		if ( g1Full ^ g2Full )
-		{
-			return g2Full;
-		}
-
-		if (sortBuddies)
-		{
-			Bool g1HasBuddies = (theBuddyGames->find(g1) != theBuddyGames->end());
-			Bool g2HasBuddies = (theBuddyGames->find(g2) != theBuddyGames->end());
-			if ( g1HasBuddies ^ g2HasBuddies )
-			{
-				return g1HasBuddies;
-			}
-		}
-
-		switch(theGameSortType)
-		{
-		case GAMESORT_ALPHA_ASCENDING:
-			return wcsicmp(g1->getGameName().str(), g2->getGameName().str()) < 0;
-			break;
-		case GAMESORT_ALPHA_DESCENDING:
-			return wcsicmp(g1->getGameName().str(),g2->getGameName().str()) > 0;
-			break;
-		case GAMESORT_PING_ASCENDING:
-			return g1->getPingAsInt() < g2->getPingAsInt();
-			break;
-		case GAMESORT_PING_DESCENDING:
-			return g1->getPingAsInt() > g2->getPingAsInt();
-			break;
-		}
-		return false;
-	}
-};
-
-static Int insertGame( GameWindow *win, GameSpyStagingRoom *game, Bool showMap )
-{
-	game->cleanUpSlotPointers();
-	Color gameColor = GameSpyColor[GSCOLOR_GAME];
-	if (game->getNumNonObserverPlayers() == game->getMaxPlayers() || game->getNumPlayers() == MAX_SLOTS)
-	{
-		gameColor = GameSpyColor[GSCOLOR_GAME_FULL];
-	}
-	if (game->getExeCRC() != TheGlobalData->m_exeCRC || game->getIniCRC() != TheGlobalData->m_iniCRC)
-	{
-		gameColor = GameSpyColor[GSCOLOR_GAME_CRCMISMATCH];
-	}
-	UnicodeString gameName = game->getGameName();
-	
-	if(TheGameSpyInfo->getDisallowAsianText())
-	{
-		const WideChar *buff = gameName.str();
-		Int length =  gameName.getLength();	
-		for(Int i = 0; i < length; ++i)
-		{
-			if(buff[i] >= 256)
-				return -1;
-		}
-	}
-	else if(TheGameSpyInfo->getDisallowNonAsianText())
-	{
-		const WideChar *buff = gameName.str();
-		Int length =  gameName.getLength();	
-		Bool hasUnicode = FALSE;
-		for(Int i = 0; i < length; ++i)
-		{
-			if(buff[i] >= 256)
-			{
-				hasUnicode = TRUE;
-				break;
-			}
-		}
-		if(!hasUnicode)
-			return -1;
-	}
-
-
-
-	Int index = GadgetListBoxAddEntryText(win, game->getGameName(), gameColor, -1, COLUMN_NAME);
-	GadgetListBoxSetItemData(win, (void *)game->getID(), index);
-
-	UnicodeString s;
-
-	if (showMap)
-	{
-		UnicodeString mapName;
-		const MapMetaData *md = TheMapCache->findMap(game->getMap());
-		if (md)
-		{
-			mapName = md->m_displayName;
-		}
-		else
-		{
-			const char *start = game->getMap().reverseFind('\\');
-			if (start)
-			{
-				++start;
-			}
-			else
-			{
-				start = game->getMap().str();
-			}
-			mapName.translate( start );
-		}
-		GadgetListBoxAddEntryText(win, mapName, gameColor, index, COLUMN_MAP);
-
-		const LadderInfo * li = TheLadderList->findLadder(game->getLadderIP(), game->getLadderPort());
-		if (li)
-		{
-			GadgetListBoxAddEntryText(win, li->name, gameColor, index, COLUMN_LADDER);
-		}
-		else if (game->getLadderPort())
-		{
-			GadgetListBoxAddEntryText(win, TheGameText->fetch("GUI:UnknownLadder"), gameColor, index, COLUMN_LADDER);
-		}
-		else
-		{
-			GadgetListBoxAddEntryText(win, TheGameText->fetch("GUI:NoLadder"), gameColor, index, COLUMN_LADDER);
-		}
-	}
-	else
-	{
-		GadgetListBoxAddEntryText(win, UnicodeString(L" "), gameColor, index, COLUMN_MAP);
-		GadgetListBoxAddEntryText(win, UnicodeString(L" "), gameColor, index, COLUMN_LADDER);
-	}
-
-	s.format(L"%d/%d", game->getReportedNumPlayers(), game->getReportedMaxPlayers());
-	GadgetListBoxAddEntryText(win, s, gameColor, index, COLUMN_NUMPLAYERS);
-
-	if (game->getHasPassword())
-	{
-		const Image *img = TheMappedImageCollection->findImageByName("Password");
-		Int width = 10, height = 10;
-		if (img)
-		{
-			width = img->getImageWidth();
-			height = img->getImageHeight();
-		}
-		GadgetListBoxAddEntryImage(win, img, index, COLUMN_PASSWORD, width, height);
-	}
-	else
-	{
-		GadgetListBoxAddEntryText(win, UnicodeString(L" "), gameColor, index, COLUMN_PASSWORD);
-	}
-
-	if (game->getAllowObservers())
-	{
-		const Image *img = TheMappedImageCollection->findImageByName("Observer");
-		GadgetListBoxAddEntryImage(win, img, index, COLUMN_OBSERVER);
-	}
-	else
-	{
-		GadgetListBoxAddEntryText(win, UnicodeString(L" "), gameColor, index, COLUMN_OBSERVER);
-	}
-
-  {
-    if (game->getUseStats())
-    {
-      const Image *img = TheMappedImageCollection->findImageByName("GoodStatsIcon");
-      GadgetListBoxAddEntryImage(win, img, index, COLUMN_USE_STATS, img->getImageHeight(), img->getImageWidth());
-	}
-    
-  }
-  
-	s.format(L"%d", game->getPingAsInt());
-	GadgetListBoxAddEntryText(win, s, gameColor, index, COLUMN_PING);
-	Int ping = game->getPingAsInt();
-	Int width = 10, height = 10;
-	if (pingImages[0])
-	{
-		width = pingImages[0]->getImageWidth();
-		height = pingImages[0]->getImageHeight();
-	}
-	// CLH picking an arbitrary number for our ping display
-	if (ping < TheGameSpyConfig->getPingCutoffGood())
-	{
-		GadgetListBoxAddEntryImage(win, pingImages[0], index, COLUMN_PING, width, height);
-	}
-	else if (ping < TheGameSpyConfig->getPingCutoffBad())
-	{
-		GadgetListBoxAddEntryImage(win, pingImages[1], index, COLUMN_PING, width, height);
-	}
-	else
-	{
-		GadgetListBoxAddEntryImage(win, pingImages[2], index, COLUMN_PING, width, height);
-	}
-
-	return index;
-}
-
-void RefreshGameListBox( GameWindow *win, Bool showMap )
-{
-	if (!win)
-		return;
-
-	// save off selection
-	Int selectedIndex = -1;
-	Int indexToSelect = -1;
-	Int selectedID = 0;
-	GadgetListBoxGetSelected(win, &selectedIndex);
-	if (selectedIndex != -1 )
-	{
-		selectedID = (Int)GadgetListBoxGetItemData(win, selectedIndex);
-	}
-	int prevPos = GadgetListBoxGetTopVisibleEntry( win );
-
-	// empty listbox
-	GadgetListBoxReset(win);
-
-	// sort our games
-	typedef std::multiset<GameSpyStagingRoom *, GameSortStruct> SortedGameList;
-	SortedGameList sgl;
-	StagingRoomMap *srm = TheGameSpyInfo->getStagingRoomList();
-	populateBuddyGames();
-	for (StagingRoomMap::iterator srmIt = srm->begin(); srmIt != srm->end(); ++srmIt)
-	{
-		sgl.insert(srmIt->second);
-	}
-
-	// populate listbox
-	for (SortedGameList::iterator sglIt = sgl.begin(); sglIt != sgl.end(); ++sglIt)
-	{
-		GameSpyStagingRoom *game = *sglIt;
-		if (game)
-		{
-			Int index = insertGame(win, game, showMap);
-			if (game->getID() == selectedID)
-			{
-				indexToSelect = index;
-			}
-		}
-	}
-
-	clearBuddyGames();
-
-	// restore selection
-	GadgetListBoxSetSelected(win, indexToSelect); // even for -1, so we can disable the 'Join Game' button
-//	if(prevPos > 10)
-		GadgetListBoxSetTopVisibleEntry( win, prevPos  );//+ 1
-
-	if (indexToSelect < 0 && selectedID)
-	{
-		TheWindowManager->winSetLoneWindow(NULL);
-	}
-}
-
-void RefreshGameInfoListBox( GameWindow *mainWin, GameWindow *win )
-{
-//	if (!mainWin || !win)
-//		return;
-//
-//	GadgetListBoxReset(win);
-//
-//	Int selected = -1;
-//	GadgetListBoxGetSelected(mainWin, &selected);
-//	if (selected < 0)
-//	{
-//		return;
-//	}
-//
-//	Int selectedID = (Int)GadgetListBoxGetItemData(mainWin, selected);
-//	if (selectedID < 0)
-//	{
-//		return;
-//	}
-//
-//	StagingRoomMap *srm = TheGameSpyInfo->getStagingRoomList();
-//	StagingRoomMap::iterator srmIt = srm->find(selectedID);
-//	if (srmIt != srm->end())
-//	{
-//		GameSpyStagingRoom *theRoom = srmIt->second;
-//		theRoom->cleanUpSlotPointers();
-//
-//		// game name
-////		GadgetListBoxAddEntryText(listboxLobbyGameInfo, theRoom->getGameName(), GameSpyColor[GSCOLOR_DEFAULT], -1);
-//
-//		const LadderInfo * li = TheLadderList->findLadder(theRoom->getLadderIP(), theRoom->getLadderPort());
-//		if (li)
-//		{
-//			UnicodeString tmp;
-//			tmp.format(TheGameText->fetch("TOOLTIP:LadderName"), li->name.str());
-//			GadgetListBoxAddEntryText(listboxLobbyGameInfo, tmp, GameSpyColor[GSCOLOR_DEFAULT], -1);
-//		}
-//		else if (theRoom->getLadderPort())
-//		{
-//			GadgetListBoxAddEntryText(listboxLobbyGameInfo, TheGameText->fetch("TOOLTIP:UnknownLadder"), GameSpyColor[GSCOLOR_DEFAULT], -1);
-//		}
-//		else
-//		{
-//			GadgetListBoxAddEntryText(listboxLobbyGameInfo, TheGameText->fetch("TOOLTIP:NoLadder"), GameSpyColor[GSCOLOR_DEFAULT], -1);
-//		}
-//
-//		if (theRoom->getExeCRC() != TheGlobalData->m_exeCRC || theRoom->getIniCRC() != TheGlobalData->m_iniCRC)
-//		{
-//			GadgetListBoxAddEntryText(listboxLobbyGameInfo, TheGameText->fetch("TOOLTIP:InvalidGameVersionSingleLine"), GameSpyColor[GSCOLOR_DEFAULT], -1);
-//		}
-//
-//		// map name
-//		UnicodeString mapName;
-//		const MapMetaData *md = TheMapCache->findMap(theRoom->getMap());
-//		if (md)
-//		{
-//			mapName = md->m_displayName;
-//		}
-//		else
-//		{
-//			const char *start = theRoom->getMap().reverseFind('\\');
-//			if (start)
-//			{
-//				++start;
-//			}
-//			else
-//			{
-//				start = theRoom->getMap().str();
-//			}
-//			mapName.translate( start );
-//		}
-//
-//		GadgetListBoxAddEntryText(listboxLobbyGameInfo, mapName, GameSpyColor[GSCOLOR_DEFAULT], -1);
-//
-//		// player list (rank, win/loss, side)
-//		for (Int i=0; i<MAX_SLOTS; ++i)
-//		{
-//			const GameSpyGameSlot *slot = theRoom->getGameSpySlot(i);
-//			if (slot && slot->isHuman())
-//			{
-//				UnicodeString theName, theRating, thePlayerTemplate;
-//				Int colorIdx = slot->getColor();
-//				theName = slot->getName();
-//				theRating.format(L" (%d-%d)", slot->getWins(), slot->getLosses());
-//				const PlayerTemplate * pt = ThePlayerTemplateStore->getNthPlayerTemplate(slot->getPlayerTemplate());
-//				if (pt)
-//				{
-//					thePlayerTemplate = pt->getDisplayName();
-//				}
-//				else
-//				{
-//					thePlayerTemplate = TheGameText->fetch("GUI:Random");
-//				}
-//
-//				UnicodeString theText;
-//				theText.format(L"%ls - %ls - %ls", theName.str(), thePlayerTemplate.str(), theRating.str());
-//
-//				Int theColor = GameSpyColor[GSCOLOR_DEFAULT];
-//				const MultiplayerColorDefinition *mcd = TheMultiplayerSettings->getColor(colorIdx);
-//				if (mcd)
-//				{
-//					theColor = mcd->getColor();
-//				}
-//
-//				GadgetListBoxAddEntryText(listboxLobbyGameInfo, theText, theColor, -1);
-//			}
-//		}
-//	}
-
-}
-
-void RefreshGameListBoxes( void )
-{
-	GameWindow *main = GetGameListBox();
-	GameWindow *info = GetGameInfoListBox();
-
-	RefreshGameListBox( main, (info == NULL) );
-
-	if (info)
-	{
-		RefreshGameInfoListBox( main, info );
-	}
-}
-
-void ToggleGameListType( void )
-{
-	isSmall = !isSmall;
-	if(isSmall)
-	{
-		parentGameListLarge->winHide(TRUE);
-//		parentGameListSmall->winHide(FALSE);
-	}
-	else
-	{
-		parentGameListLarge->winHide(FALSE);
-//		parentGameListSmall->winHide(TRUE);
-	}
-
-	RefreshGameListBoxes();
-}
-
-// for use by GameWindow::winSetTooltipFunc
-// displays the Army Tooltip for the player templates
-void playerTemplateComboBoxTooltip(GameWindow *wndComboBox, WinInstanceData *instData, UnsignedInt mouse)
-{
-	Int index = 0;
-	GadgetComboBoxGetSelectedPos(wndComboBox, &index);
-	Int templateNum = (Int)GadgetComboBoxGetItemData(wndComboBox, index);
-	UnicodeString ustringTooltip;
-	if (templateNum == -1)
-	{
-			// the "Random" template is always first
-			ustringTooltip = TheGameText->fetch("TOOLTIP:BioStrategyLong_Random");
-	}
-	else
-	{
-		const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
-		if (playerTemplate)
-		{
-			ustringTooltip = TheGameText->fetch(playerTemplate->getTooltip());
-		}
-	}
-	TheMouse->setCursorTooltip(ustringTooltip);
-}
-
-// -----------------------------------------------------------------------------
-
-// for use by GameWindow::winSetTooltipFunc
-// displays the Army Tooltip for the player templates
-void playerTemplateListBoxTooltip(GameWindow *wndListBox, WinInstanceData *instData, UnsignedInt mouse)
-{
-	Int x, y, row, col;
-	x = LOLONGTOSHORT(mouse);
-	y = HILONGTOSHORT(mouse);
-	GadgetListBoxGetEntryBasedOnXY(wndListBox, x, y, row, col);
-	if (row == -1 || col == -1)
-		return;
-
-	Int templateNum = (Int)GadgetListBoxGetItemData(wndListBox, row, col);
-	UnicodeString ustringTooltip;
-	if (templateNum == -1)
-	{
-			// the "Random" template is always first
-			ustringTooltip = TheGameText->fetch("TOOLTIP:BioStrategyLong_Random");
-	}
-	else
-	{
-		const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
-		if (playerTemplate)
-		{
-			ustringTooltip = TheGameText->fetch(playerTemplate->getTooltip());
-		}
-	}
-
-	// use no tooltip delay here
-	TheMouse->setCursorTooltip(ustringTooltip, 0);
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp
deleted file mode 100644
index 2fbbf1803c4..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp
+++ /dev/null
@@ -1,829 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: MainMenuUtils.cpp
-// Author: Matthew D. Campbell, Sept 2002
-// Description: GameSpy version check, patch download, etc utils
-///////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include <fcntl.h>
-
-//#include "Common/Registry.h"
-#include "Common/UserPreferences.h"
-#include "Common/version.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MessageBox.h"
-#include "GameClient/Shell.h"
-#include "GameLogic/ScriptEngine.h"
-
-#include "GameClient/ShellHooks.h"
-
-#include "gamespy/ghttp/ghttp.h"
-
-#include "GameNetwork/DownloadManager.h"
-#include "GameNetwork/GameSpy/BuddyThread.h"
-#include "GameNetwork/GameSpy/MainMenuUtils.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-
-#include "WWDownload/Registry.h"
-#include "WWDownload/urlBuilder.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static Bool checkingForPatchBeforeGameSpy = FALSE;
-static Int checksLeftBeforeOnline = 0;
-static Int timeThroughOnline = 0; // used to avoid having old callbacks cause problems
-static Bool mustDownloadPatch = FALSE;
-static Bool cantConnectBeforeOnline = FALSE;
-static std::list<QueuedDownload> queuedDownloads;
-
-static char *MOTDBuffer = NULL;
-static char *configBuffer = NULL;
-GameWindow *onlineCancelWindow = NULL;
-
-static Bool s_asyncDNSThreadDone = TRUE;
-static Bool s_asyncDNSThreadSucceeded = FALSE;
-static Bool s_asyncDNSLookupInProgress = FALSE;
-static HANDLE s_asyncDNSThreadHandle = NULL;
-enum {
-	LOOKUP_INPROGRESS,
-	LOOKUP_FAILED,
-	LOOKUP_SUCCEEDED,
-};
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static void startOnline( void );
-static void reallyStartPatchCheck( void );
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-// someone has hit a button allowing downloads to start
-void StartDownloadingPatches( void )
-{
-	if (queuedDownloads.empty())
-	{
-		HandleCanceledDownload();
-		return;
-	}
-
-	WindowLayout *layout;
-	layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DownloadMenu.wnd" ) );
-	layout->runInit();
-	layout->hide( FALSE );
-	layout->bringForward();
-	HandleCanceledDownload(FALSE);
-	DEBUG_ASSERTCRASH(TheDownloadManager, ("No download manager!"));
-	if (TheDownloadManager)
-	{
-		std::list<QueuedDownload>::iterator it = queuedDownloads.begin();
-		while (it != queuedDownloads.end())
-		{
-			QueuedDownload q = *it;
-			TheDownloadManager->queueFileForDownload(q.server, q.userName, q.password,
-				q.file, q.localFile, q.regKey, q.tryResume);
-			queuedDownloads.pop_front();
-			it = queuedDownloads.begin();
-		}
-		TheDownloadManager->downloadNextQueuedFile();
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-// user agrees to patch before going online
-static void patchBeforeOnlineCallback( void )
-{
-	StartDownloadingPatches();
-}
-
-// user doesn't want to patch before going online
-static void noPatchBeforeOnlineCallback( void )
-{
-	queuedDownloads.clear();
-	if (mustDownloadPatch || cantConnectBeforeOnline)
-	{
-		// go back to normal
-		HandleCanceledDownload();
-	}
-	else
-	{
-		// clear out unneeded downloads and go on
-		startOnline();
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static Bool hasWriteAccess()
-{
-	const char* filename = "PatchAccessTest.txt";	
-
-	remove(filename);
-
-	int handle = _open( filename, _O_CREAT | _O_RDWR, _S_IREAD | _S_IWRITE);
-	if (handle == -1)
-	{
-		return false;
-	}
-
-	_close(handle);
-	remove(filename);
-	
-	unsigned int val;
-	if (!GetUnsignedIntFromRegistry("", "Version", val))
-	{
-		return false;
-	}
-
-	if (!SetUnsignedIntInRegistry("", "Version", val))
-	{
-		return false;
-	}
-
-	return true;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static void startOnline( void )
-{
-	checkingForPatchBeforeGameSpy = FALSE;
-
-	DEBUG_ASSERTCRASH(checksLeftBeforeOnline==0, ("starting online with pending callbacks"));
-	if (onlineCancelWindow)
-	{
-		TheWindowManager->winDestroy(onlineCancelWindow);
-		onlineCancelWindow = NULL;
-	}
-
-	if (cantConnectBeforeOnline)
-	{
-		MessageBoxOk(TheGameText->fetch("GUI:CannotConnectToServservTitle"),
-			TheGameText->fetch("GUI:CannotConnectToServserv"),
-			noPatchBeforeOnlineCallback);
-		return;
-	}
-	if (queuedDownloads.size())
-	{
-		if (!hasWriteAccess())
-		{
-			MessageBoxOk(TheGameText->fetch("GUI:Error"),
-				TheGameText->fetch("GUI:MustHaveAdminRights"),
-				noPatchBeforeOnlineCallback);
-		}
-		else if (mustDownloadPatch)
-		{
-			MessageBoxOkCancel(TheGameText->fetch("GUI:PatchAvailable"),
-				TheGameText->fetch("GUI:MustPatchForOnline"),
-				patchBeforeOnlineCallback, noPatchBeforeOnlineCallback);
-		}
-		else
-		{
-			MessageBoxYesNo(TheGameText->fetch("GUI:PatchAvailable"),
-				TheGameText->fetch("GUI:CanPatchForOnline"),
-				patchBeforeOnlineCallback, noPatchBeforeOnlineCallback);
-		}
-		return;
-	}
-
-	TheScriptEngine->signalUIInteract(TheShellHookNames[SHELL_SCRIPT_HOOK_MAIN_MENU_ONLINE_SELECTED]);
-
-	DEBUG_ASSERTCRASH( !TheGameSpyBuddyMessageQueue, ("TheGameSpyBuddyMessageQueue exists!") );
-	DEBUG_ASSERTCRASH( !TheGameSpyPeerMessageQueue, ("TheGameSpyPeerMessageQueue exists!") );
-	DEBUG_ASSERTCRASH( !TheGameSpyInfo, ("TheGameSpyInfo exists!") );
-	SetUpGameSpy(MOTDBuffer, configBuffer);
-	if (MOTDBuffer)
-	{
-		delete[] MOTDBuffer;
-		MOTDBuffer = NULL;
-	}
-	if (configBuffer)
-	{
-		delete[] configBuffer;
-		configBuffer = NULL;
-	}
-
-#ifdef ALLOW_NON_PROFILED_LOGIN
-	UserPreferences pref;
-	pref.load("GameSpyLogin.ini");
-	UserPreferences::const_iterator it = pref.find("useProfiles");
-	if (it != pref.end() && it->second.compareNoCase("yes") == 0)
-#endif // ALLOW_NON_PROFILED_LOGIN
-		TheShell->push( AsciiString("Menus/GameSpyLoginProfile.wnd") );
-#ifdef ALLOW_NON_PROFILED_LOGIN
-	else
-		TheShell->push( AsciiString("Menus/GameSpyLoginQuick.wnd") );
-#endif // ALLOW_NON_PROFILED_LOGIN
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static void queuePatch(Bool mandatory, AsciiString downloadURL)
-{
-	QueuedDownload q;
-	Bool success = TRUE;
-
-	AsciiString connectionType;
-	success &= downloadURL.nextToken(&connectionType, ":");
-
-	AsciiString server;
-	success &= downloadURL.nextToken(&server, ":/");
-
-	AsciiString user;
-	success &= downloadURL.nextToken(&user, ":@");
-
-	AsciiString pass;
-	success &= downloadURL.nextToken(&pass, "@/");
-
-	AsciiString filePath;
-	success &= downloadURL.nextToken(&filePath, "");
-
-	if (!success && user.isNotEmpty())
-	{
-		// no user/pass combo - move the file into it's proper place
-		filePath = user;
-		user = ""; // LFeenanEA - Credentials removed as per Security requirements
-		pass = "";
-		success = TRUE;
-	}
-
-	AsciiString fileStr = filePath;
-	const char *s = filePath.reverseFind('/');
-	if (s)
-		fileStr = s+1;
-	AsciiString fileName = "patches\\";
-	fileName.concat(fileStr);
-
-	DEBUG_LOG(("download URL split: %d [%s] [%s] [%s] [%s] [%s] [%s]\n",
-		success, connectionType.str(), server.str(), user.str(), pass.str(),
-		filePath.str(), fileName.str()));
-
-	if (!success)
-		return;
-
-	q.file = filePath;
-	q.localFile = fileName;
-	q.password = pass;
-	q.regKey = "";
-	q.server = server;
-	q.tryResume = TRUE;
-	q.userName = user;
-
-	std::list<QueuedDownload>::iterator it = queuedDownloads.begin();
-	while (it != queuedDownloads.end())
-	{
-		if (it->localFile == q.localFile)
-			return; // don't add it if it exists already (because we can check multiple times)
-		++it;
-	}
-
-	queuedDownloads.push_back(q);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool motdCallback( GHTTPRequest request, GHTTPResult result,
-															char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	Int run = (Int)param;
-	if (run != timeThroughOnline)
-	{
-		DEBUG_CRASH(("Old callback being called!"));
-		return GHTTPTrue;
-	}
-
-	if (MOTDBuffer)
-	{
-		delete[] MOTDBuffer;
-		MOTDBuffer = NULL;
-	}
-
-	MOTDBuffer = NEW char[bufferLen];
-	memcpy(MOTDBuffer, buffer, bufferLen);
-	MOTDBuffer[bufferLen-1] = 0;
-
-	--checksLeftBeforeOnline;
-	DEBUG_ASSERTCRASH(checksLeftBeforeOnline>=0, ("Too many callbacks"));
-	if (onlineCancelWindow && !checksLeftBeforeOnline)
-	{
-		TheWindowManager->winDestroy(onlineCancelWindow);
-		onlineCancelWindow = NULL;
-	}
-
-	DEBUG_LOG(("------- Got MOTD before going online -------\n"));
-	DEBUG_LOG(("%s\n", (MOTDBuffer)?MOTDBuffer:""));
-	DEBUG_LOG(("--------------------------------------------\n"));
-
-	if (!checksLeftBeforeOnline)
-		startOnline();
-
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool configCallback( GHTTPRequest request, GHTTPResult result,
-																char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	Int run = (Int)param;
-	if (run != timeThroughOnline)
-	{
-		DEBUG_CRASH(("Old callback being called!"));
-		return GHTTPTrue;
-	}
-
-	if (configBuffer)
-	{
-		delete[] configBuffer;
-		configBuffer = NULL;
-	}
-
-	if (result != GHTTPSuccess || bufferLen < 100)
-	{
-		if (!checkingForPatchBeforeGameSpy)
-			return GHTTPTrue;
-		--checksLeftBeforeOnline;
-		if (onlineCancelWindow && !checksLeftBeforeOnline)
-		{
-			TheWindowManager->winDestroy(onlineCancelWindow);
-			onlineCancelWindow = NULL;
-		}
-		cantConnectBeforeOnline = TRUE;
-		if (!checksLeftBeforeOnline)
-		{
-			startOnline();
-		}
-		return GHTTPTrue;
-	}
-
-	configBuffer = NEW char[bufferLen];
-	memcpy(configBuffer, buffer, bufferLen);
-	configBuffer[bufferLen-1] = 0;
-
-	AsciiString fname;
-	fname.format("%sGeneralsOnline\\Config.txt", TheGlobalData->getPath_UserData().str());
-	FILE *fp = fopen(fname.str(), "wb");
-	if (fp)
-	{
-		fwrite(configBuffer, bufferLen, 1, fp);
-		fclose(fp);
-	}
-
-	--checksLeftBeforeOnline;
-	DEBUG_ASSERTCRASH(checksLeftBeforeOnline>=0, ("Too many callbacks"));
-	if (onlineCancelWindow && !checksLeftBeforeOnline)
-	{
-		TheWindowManager->winDestroy(onlineCancelWindow);
-		onlineCancelWindow = NULL;
-	}
-
-	DEBUG_LOG(("Got Config before going online\n"));
-
-	if (!checksLeftBeforeOnline)
-		startOnline();
-
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool configHeadCallback( GHTTPRequest request, GHTTPResult result,
-																		char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	Int run = (Int)param;
-	if (run != timeThroughOnline)
-	{
-		DEBUG_CRASH(("Old callback being called!"));
-		return GHTTPTrue;
-	}
-
-	DEBUG_LOG(("HTTP head resp: res=%d, len=%d, buf=[%s]\n", result, bufferLen, buffer));
-
-	if (result == GHTTPSuccess)
-	{
-		DEBUG_LOG(("Headers are [%s]\n", ghttpGetHeaders( request )));
-
-		AsciiString headers(ghttpGetHeaders( request ));
-		AsciiString line;
-		while (headers.nextToken(&line, "\n\r"))
-		{
-			AsciiString key, val;
-			line.nextToken(&key, ": ");
-			line.nextToken(&val, ": \r\n");
-
-			if (key.compare("Content-Length") == 0 && val.isNotEmpty())
-			{
-				Int serverLen = atoi(val.str());
-				Int fileLen = 0;
-				AsciiString fname;
-				fname.format("%sGeneralsOnline\\Config.txt", TheGlobalData->getPath_UserData().str());
-				FILE *fp = fopen(fname.str(), "rb");
-				if (fp)
-				{
-					fseek(fp, 0, SEEK_END);
-					fileLen = ftell(fp);
-					fclose(fp);
-				}
-
-				if (serverLen == fileLen)
-				{
-					// we don't need to download the MOTD again
-					--checksLeftBeforeOnline;
-					DEBUG_ASSERTCRASH(checksLeftBeforeOnline>=0, ("Too many callbacks"));
-					if (onlineCancelWindow && !checksLeftBeforeOnline)
-					{
-						TheWindowManager->winDestroy(onlineCancelWindow);
-						onlineCancelWindow = NULL;
-					}
-
-					if (configBuffer)
-					{
-						delete[] configBuffer;
-						configBuffer = NULL;
-					}
-
-					AsciiString fname;
-					fname.format("%sGeneralsOnline\\Config.txt", TheGlobalData->getPath_UserData().str());
-					FILE *fp = fopen(fname.str(), "rb");
-					if (fp)
-					{
-						configBuffer = NEW char[fileLen];
-						fread(configBuffer, fileLen, 1, fp);
-						configBuffer[fileLen-1] = 0;
-						fclose(fp);
-
-						DEBUG_LOG(("Got Config before going online\n"));
-
-						if (!checksLeftBeforeOnline)
-							startOnline();
-
-						return GHTTPTrue;
-					}
-				}
-			}
-		}
-	}
-
-	// we need to download the MOTD again
-	std::string gameURL, mapURL;
-	std::string configURL, motdURL;
-	FormatURLFromRegistry(gameURL, mapURL, configURL, motdURL);
-	ghttpGet( configURL.c_str(), GHTTPFalse, configCallback, param );
-
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool gamePatchCheckCallback( GHTTPRequest request, GHTTPResult result, char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	Int run = (Int)param;
-	if (run != timeThroughOnline)
-	{
-		DEBUG_CRASH(("Old callback being called!"));
-		return GHTTPTrue;
-	}
-
-	--checksLeftBeforeOnline;
-	DEBUG_ASSERTCRASH(checksLeftBeforeOnline>=0, ("Too many callbacks"));
-
-	DEBUG_LOG(("Result=%d, buffer=[%s], len=%d\n", result, buffer, bufferLen));
-	if (result != GHTTPSuccess)
-	{
-		if (!checkingForPatchBeforeGameSpy)
-			return GHTTPTrue;
-		cantConnectBeforeOnline = TRUE;
-		if (!checksLeftBeforeOnline)
-		{
-			startOnline();
-		}
-		return GHTTPTrue;
-	}
-
-	AsciiString message = buffer;
-	AsciiString line;
-	while (message.nextToken(&line, "\r\n"))
-	{
-		AsciiString type, req, url;
-		Bool ok = TRUE;
-		ok &= line.nextToken(&type, " ");
-		ok &= line.nextToken(&req, " ");
-		ok &= line.nextToken(&url, " ");
-		if (ok && type == "patch")
-		{
-			DEBUG_LOG(("Saw a patch: %d/[%s]\n", atoi(req.str()), url.str()));
-			queuePatch( atoi(req.str()), url );
-			if (atoi(req.str()))
-			{
-				mustDownloadPatch = TRUE;
-			}
-		}
-		else if (ok && type == "server")
-		{
-		}
-	}
-
-	if (!checksLeftBeforeOnline)
-	{
-		startOnline();
-	}
-
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-void CancelPatchCheckCallbackAndReopenDropdown( void )
-{
-	HandleCanceledDownload();
-	CancelPatchCheckCallback();
-}
-
-void CancelPatchCheckCallback( void )
-{
-	s_asyncDNSLookupInProgress = FALSE;
-	HandleCanceledDownload(FALSE); // don't dropdown
-	checkingForPatchBeforeGameSpy = FALSE;
-	checksLeftBeforeOnline = 0;
-	if (onlineCancelWindow)
-	{
-		TheWindowManager->winDestroy(onlineCancelWindow);
-		onlineCancelWindow = NULL;
-	}
-	queuedDownloads.clear();
-	if (MOTDBuffer)
-	{
-		delete[] MOTDBuffer;
-		MOTDBuffer = NULL;
-	}
-	if (configBuffer)
-	{
-		delete[] configBuffer;
-		configBuffer = NULL;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool overallStatsCallback( GHTTPRequest request, GHTTPResult result, char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	DEBUG_LOG(("overallStatsCallback() - Result=%d, len=%d\n", result, bufferLen));
-	if (result != GHTTPSuccess)
-	{
-		return GHTTPTrue;
-	}
-
-	HandleOverallStats( buffer, bufferLen );
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static GHTTPBool numPlayersOnlineCallback( GHTTPRequest request, GHTTPResult result, char * buffer, GHTTPByteCount bufferLen, void * param )
-{
-	DEBUG_LOG(("numPlayersOnlineCallback() - Result=%d, buffer=[%s], len=%d\n", result, buffer, bufferLen));
-	if (result != GHTTPSuccess)
-	{
-		return GHTTPTrue;
-	}
-
-	AsciiString message = buffer;
-	message.trim();
-	const char *s = message.reverseFind('\\');
-	if (!s)
-	{
-		return GHTTPTrue;
-	}
-
-	if (*s == '\\')
-		++s;
-
-	DEBUG_LOG(("Message was '%s', trimmed to '%s'=%d\n", buffer, s, atoi(s)));
-	HandleNumPlayersOnline(atoi(s));
-
-	return GHTTPTrue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-void CheckOverallStats( void )
-{
-	ghttpGet("http://gamestats.gamespy.com/ccgenzh/display.html",
-		GHTTPFalse, overallStatsCallback, NULL);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-void CheckNumPlayersOnline( void )
-{
-	ghttpGet("http://launch.gamespyarcade.com/software/launch/arcadecount2.dll?svcname=ccgenzh",
-		GHTTPFalse, numPlayersOnlineCallback, NULL);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-DWORD WINAPI asyncGethostbynameThreadFunc( void * szName )
-{
-	HOSTENT *he = gethostbyname( (const char *)szName );
-
-	if (he)
-	{
-		s_asyncDNSThreadSucceeded = TRUE;
-	}
-	else
-	{
-		s_asyncDNSThreadSucceeded = FALSE;
-	}
-
-	s_asyncDNSThreadDone = TRUE;
-	return 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-int asyncGethostbyname(char * szName)
-{
-	static int            stat = 0;
-	static unsigned long  threadid;
-
-	if( stat == 0 )
-	{
-		/* Kick off gethostname thread */
-		s_asyncDNSThreadDone = FALSE;
-		s_asyncDNSThreadHandle = CreateThread( NULL, 0, asyncGethostbynameThreadFunc, szName, 0, &threadid );
-
-		if( s_asyncDNSThreadHandle == NULL )
-		{
-			return( LOOKUP_FAILED );
-		}
-		stat = 1;
-	}
-	if( stat == 1 )
-	{
-		if( s_asyncDNSThreadDone )
-		{
-			/* Thread finished */
-			stat = 0;
-			s_asyncDNSLookupInProgress = FALSE;
-			s_asyncDNSThreadHandle = NULL;
-			return( (s_asyncDNSThreadSucceeded)?LOOKUP_SUCCEEDED:LOOKUP_FAILED );
-		}
-	}
-
-	return( LOOKUP_INPROGRESS );
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-// GameSpy's HTTP SDK has had at least 1 crash bug, so we're going to just bail and
-// never try again if they crash us.  We won't be able to get back online again (we'll
-// time out) but at least we'll live.
-static Bool isHttpOk = TRUE;
-
-void HTTPThinkWrapper( void )
-{
-	if (s_asyncDNSLookupInProgress)
-	{
-		Char hostname[] = "servserv.generals.ea.com";
-		Int ret = asyncGethostbyname(hostname);
-		switch(ret)
-		{
-		case LOOKUP_FAILED:
-			cantConnectBeforeOnline = TRUE;
-			startOnline();
-			break;
-		case LOOKUP_SUCCEEDED:
-			reallyStartPatchCheck();
-			break;
-		}
-	}
-
-	if (isHttpOk)
-	{
-		try
-		{
-			ghttpThink();
-		}
-		catch (...)
-		{
-			isHttpOk = FALSE; // we can't abort the login, since we might be done with the
-												// required checks and are fetching extras.  If it is a required
-												// check, we'll time out normally.
-		}
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-void StopAsyncDNSCheck( void )
-{
-	if (s_asyncDNSThreadHandle)
-	{
-#ifdef DEBUG_CRASHING
-		Int res =
-#endif
-			TerminateThread(s_asyncDNSThreadHandle,0);
-		DEBUG_ASSERTCRASH(res, ("Could not terminate the Async DNS Lookup thread!"));	// Thread still not killed!
-	}
-	s_asyncDNSThreadHandle = NULL;
-	s_asyncDNSLookupInProgress = FALSE;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-void StartPatchCheck( void )
-{
-	checkingForPatchBeforeGameSpy = TRUE;
-	cantConnectBeforeOnline = FALSE;
-	timeThroughOnline++;
-	checksLeftBeforeOnline = 0;
-
-	onlineCancelWindow = MessageBoxCancel(TheGameText->fetch("GUI:CheckingForPatches"),
-		TheGameText->fetch("GUI:CheckingForPatches"), CancelPatchCheckCallbackAndReopenDropdown);
-
-	s_asyncDNSLookupInProgress = TRUE;
-	Char hostname[] = "servserv.generals.ea.com";
-	Int ret = asyncGethostbyname(hostname);
-	switch(ret)
-	{
-	case LOOKUP_FAILED:
-		cantConnectBeforeOnline = TRUE;
-		startOnline();
-		break;
-	case LOOKUP_SUCCEEDED:
-		reallyStartPatchCheck();
-		break;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-static void reallyStartPatchCheck( void )
-{
-	checksLeftBeforeOnline = 4;
-
-	std::string gameURL, mapURL;
-	std::string configURL, motdURL;
-
-	FormatURLFromRegistry(gameURL, mapURL, configURL, motdURL);
-
-	std::string proxy;
-	if (GetStringFromRegistry("", "Proxy", proxy))
-	{
-		if (!proxy.empty())
-		{
-			ghttpSetProxy(proxy.c_str());
-		}
-	}
-
-	// check for a patch first
-	DEBUG_LOG(("Game patch check: [%s]\n", gameURL.c_str()));
-	DEBUG_LOG(("Map patch check: [%s]\n", mapURL.c_str()));
-	DEBUG_LOG(("Config: [%s]\n", configURL.c_str()));
-	DEBUG_LOG(("MOTD: [%s]\n", motdURL.c_str()));
-	ghttpGet(gameURL.c_str(), GHTTPFalse, gamePatchCheckCallback, (void *)timeThroughOnline);
-	ghttpGet(mapURL.c_str(), GHTTPFalse, gamePatchCheckCallback, (void *)timeThroughOnline);
-	ghttpHead(configURL.c_str(), GHTTPFalse, configHeadCallback, (void *)timeThroughOnline);
-	ghttpGet(motdURL.c_str(), GHTTPFalse, motdCallback, (void *)timeThroughOnline);
-	
-	// check total game stats
-	CheckOverallStats();
-
-	// check the users online
-	CheckNumPlayersOnline();
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp
deleted file mode 100644
index f7802eae711..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp
+++ /dev/null
@@ -1,945 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// FILE: PeerDefs.cpp //////////////////////////////////////////////////////
-// Generals GameSpy Peer (chat) definitions
-// Author: Matthew D. Campbell, June 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#include <set>
-
-#include "Common/GameState.h"
-#include "Common/RandomValue.h"
-#include "Common/IgnorePreferences.h"
-#include "Common/CustomMatchPreferences.h"
-#include "Common/GameSpyMiscPreferences.h"
-#include "Common/Recorder.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "Common/PlayerTemplate.h"
-#include "GameClient/MapUtil.h"
-#include "GameClient/ShellHooks.h"
-#include "GameClient/GameText.h"
-#include "GameNetwork/GameSpy/LadderDefs.h"
-#include "GameNetwork/GameSpy/PeerDefsImplementation.h"
-#include "GameNetwork/GameSpy/BuddyThread.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-#include "GameNetwork/GameSpy/PingThread.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-#include "GameNetwork/GameSpyOverlay.h"
-#include "GameNetwork/RankPointValue.h"
-#include "GameLogic/GameLogic.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-GameSpyInfoInterface *TheGameSpyInfo = NULL;
-extern GameSpyStagingRoom *TheGameSpyGame = NULL;
-void deleteNotificationBox( void );
-
-bool AsciiComparator::operator()(AsciiString s1, AsciiString s2) const
-{
-	return stricmp(s1.str(), s2.str()) < 0;
-}
-
-GameSpyInfo::GameSpyInfo()
-{
-	reset();
-	TheGameSpyGame = &m_localStagingRoom;
-	m_isDisconAfterGameStart = FALSE;
-}
-
-GameSpyInfo::~GameSpyInfo()
-{
-	TheGameSpyGame = NULL;
-	reset();
-}
-
-void GameSpyInfo::reset( void )
-{
-	m_sawFullGameList = FALSE;
-	m_isDisconAfterGameStart = FALSE;
-	m_currentGroupRoomID = 0;
-	clearGroupRoomList();
-	clearStagingRoomList();
-	m_localStagingRoomID = 0;
-	m_buddyRequestMap.clear();
-	m_buddyMap.clear();
-	m_buddyMessages.clear();
-	m_joinedStagingRoom = 0;
-	m_isHosting = false;
-	m_localStagingRoomID = 0;
-	m_localStagingRoom.reset();
-	m_gotGroupRoomList = false;
-	m_localName = "";
-	m_localProfileID = 0;
-	m_maxMessagesPerUpdate = 100;
-	
-	// Added By Sadullah Nader
-	// Initialization missing and needed
-	m_disallowAsainText = FALSE;
-	m_disallowNonAsianText = FALSE;
-	m_disconReason = 0;
-	m_localBaseName.clear();
-	m_localEmail.clear();
-	m_localPasswd.clear();
-	m_pingString.clear();
-	m_rawConfig.clear();
-	m_rawMotd.clear();
-	//
-
-	m_internalIP = m_externalIP = 0;
-
-	m_savedIgnoreMap.clear();
-	m_preorderPlayers.clear();
-
-	m_cachedLocalPlayerStats.reset();
-	
-	m_additionalDisconnects = -1;
-}
-
-Bool GameSpyInfo::didPlayerPreorder( Int profileID ) const
-{
-	std::set<Int>::const_iterator it = m_preorderPlayers.find(profileID);
-	return (it != m_preorderPlayers.end());
-}
-
-void GameSpyInfo::markPlayerAsPreorder( Int profileID )
-{
-	m_preorderPlayers.insert(profileID);
-}
-
-void GameSpyInfo::setLocalIPs(UnsignedInt internalIP, UnsignedInt externalIP)
-{
-	m_internalIP = internalIP;
-	m_externalIP = externalIP;
-}
-
-void GameSpyInfo::readAdditionalDisconnects( void )
-{
-	m_additionalDisconnects = GetAdditionalDisconnectsFromUserFile(m_localProfileID);
-	DEBUG_LOG(("GameSpyInfo::readAdditionalDisconnects() found %d disconnects.\n", m_additionalDisconnects));
-}
-
-Int GameSpyInfo::getAdditionalDisconnects( void )
-{
-	DEBUG_LOG(("GameSpyInfo::getAdditionalDisconnects() would have returned %d.  Returning 0 instead.\n", m_additionalDisconnects));
-	return 0;
-}
-
-void GameSpyInfo::clearAdditionalDisconnects( void )
-{
-	m_additionalDisconnects = 0;
-}
-
-GameSpyInfoInterface* GameSpyInfoInterface::createNewGameSpyInfoInterface( void )
-{
-	return NEW GameSpyInfo;
-}
-
-Bool GameSpyInfo::amIHost( void )
-{
-	return m_isHosting;
-}
-
-GameSpyStagingRoom* GameSpyInfo::getCurrentStagingRoom( void )
-{
-	if (m_isHosting || m_joinedStagingRoom)
-		return &m_localStagingRoom;
-
-	StagingRoomMap::iterator it = m_stagingRooms.find(m_joinedStagingRoom);
-	if (it != m_stagingRooms.end())
-		return it->second;
-
-	return NULL;
-}
-
-void GameSpyInfo::setGameOptions( void )
-{
-	if (!m_isHosting)
-		return;
-
-	// set options for game lists, and UTM players in-game
-	PeerRequest req;
-	req.peerRequestType = PeerRequest::PEERREQUEST_SETGAMEOPTIONS;
-	req.options = GameInfoToAsciiString(&m_localStagingRoom).str();
-
-	Int i;
-	AsciiString mapName = TheGameState->realMapPathToPortableMapPath(m_localStagingRoom.getMap());
-	AsciiString newMapName;
-	for (i=0; i<mapName.getLength(); ++i)
-	{
-		char c = mapName.getCharAt(i);
-		if (c != '\\')
-			newMapName.concat(c);
-		else
-			newMapName.concat('/');
-	}
-	req.gameOptsMapName = newMapName.str();
-
-	req.gameOptions.numPlayers = 0;
-	req.gameOptions.numObservers = 0;
-	Int numOpenSlots = 0;
-	AsciiString playerInfo = "";
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		Int wins = 0, losses = 0, profileID = 0;
-		GameSpyGameSlot *slot = TheGameSpyGame->getGameSpySlot(i);
-		req.gameOptsPlayerNames[i] = "";
-		if (!slot->isOccupied())
-		{
-			if (slot->isOpen())
-				++numOpenSlots;
-		}
-		else
-		{
-			AsciiString playerName;
-			if (slot->isHuman())
-			{
-				playerName.translate(slot->getName());
-				req.gameOptsPlayerNames[i] = playerName.str();
-				PlayerInfoMap::iterator it = m_playerInfoMap.find(playerName);
-				if (it != m_playerInfoMap.end())
-				{
-					wins = it->second.m_wins;
-					losses = it->second.m_losses;
-					profileID = it->second.m_profileID;
-				}
-				req.gameOptions.wins[req.gameOptions.numObservers+req.gameOptions.numPlayers] = wins;
-				req.gameOptions.losses[req.gameOptions.numObservers+req.gameOptions.numPlayers] = losses;
-				req.gameOptions.profileID[req.gameOptions.numObservers+req.gameOptions.numPlayers] = profileID;
-				req.gameOptions.faction[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getPlayerTemplate();
-				req.gameOptions.color[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getColor();
-				if (slot->getPlayerTemplate() == PLAYERTEMPLATE_OBSERVER)
-				{
-					++req.gameOptions.numObservers;
-				}
-				else
-				{
-					++req.gameOptions.numPlayers;
-				}
-			}
-			else if (slot->isAI())
-			{
-				// add in AI players
-				switch (slot->getState())
-				{
-				case SLOT_EASY_AI:
-					playerName = "CE";
-					break;
-				case SLOT_MED_AI:
-					playerName = "CM";
-					break;
-				case SLOT_BRUTAL_AI:
-					playerName = "CH";
-					break;
-				}
-				req.gameOptsPlayerNames[i] = playerName.str(); // name is unused - we go off of the profileID
-				req.gameOptions.wins[req.gameOptions.numObservers+req.gameOptions.numPlayers] = 0;
-				req.gameOptions.losses[req.gameOptions.numObservers+req.gameOptions.numPlayers] = 0;
-				req.gameOptions.profileID[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getState();
-				req.gameOptions.faction[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getPlayerTemplate();
-				req.gameOptions.color[req.gameOptions.numObservers+req.gameOptions.numPlayers] = slot->getColor();
-				++req.gameOptions.numPlayers;
-			}
-		}
-	}
-	req.gameOptions.maxPlayers = numOpenSlots + req.gameOptions.numPlayers + req.gameOptions.numObservers;
-	TheGameSpyPeerMessageQueue->addRequest(req);
-
-	req.peerRequestType = PeerRequest::PEERREQUEST_UTMROOM;
-	req.UTM.isStagingRoom = TRUE;
-	req.id = "Pings/";
-	AsciiString pings;
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		if (i!=0)
-			pings.concat(",");
-
-		GameSpyGameSlot *slot = TheGameSpyGame->getGameSpySlot(i);
-		if (slot && slot->isHuman())
-		{
-			pings.concat(slot->getPingString());
-		}
-		else
-		{
-			pings.concat("0");
-		}
-	}
-	req.options = pings.str();
-	TheGameSpyPeerMessageQueue->addRequest(req);
-}
-
-Bool GameSpyInfo::isBuddy( Int id )
-{
-	return m_buddyMap.find(id) != m_buddyMap.end();
-}
-
-void GameSpyInfo::addGroupRoom( GameSpyGroupRoom room )
-{
-	if (room.m_groupID == 0)
-	{
-		m_gotGroupRoomList = TRUE;
-
-		GroupRoomMap::iterator iter;
-
-		// figure out how many good strings we've got
-		std::vector<UnicodeString> names;
-		Int numRooms = 0;
-		for (iter = getGroupRoomList()->begin(); iter != getGroupRoomList()->end(); ++iter)
-		{
-			GameSpyGroupRoom room = iter->second;
-			if (room.m_groupID != TheGameSpyConfig->getQMChannel())
-			{
-				++numRooms;
-
-				AsciiString groupLabel;
-				groupLabel.format("GUI:%s", room.m_name.str());
-
-				Bool exists = FALSE;
-				UnicodeString groupName = TheGameText->fetch(groupLabel, &exists);
-				if (exists)
-				{
-					names.push_back(groupName);
-				}
-			}
-		}
-
-		if (!names.empty() && names.size() != numRooms)
-		{
-			// didn't get all names.  fix up
-			Int nameIndex = 0;
-			Int timesThrough = 1; // start with USA Lobby 1
-			for (iter = TheGameSpyInfo->getGroupRoomList()->begin(); iter != TheGameSpyInfo->getGroupRoomList()->end(); ++iter)
-			{
-				GameSpyGroupRoom room = iter->second;
-				if (room.m_groupID != TheGameSpyConfig->getQMChannel())
-				{
-					room.m_translatedName.format(L"%ls %d", names[nameIndex].str(), timesThrough);
-					nameIndex = (nameIndex+1)%names.size();
-					m_groupRooms[room.m_groupID] = room;
-					if (!nameIndex)
-					{
-						// we've looped through the name list already.  increment the timesThrough counter
-						++timesThrough;
-					}
-				}
-			}
-		}
-	}
-	else
-	{
-		DEBUG_LOG(("Adding group room %d (%s)\n", room.m_groupID, room.m_name.str()));
-		AsciiString groupLabel;
-		groupLabel.format("GUI:%s", room.m_name.str());
-		room.m_translatedName = TheGameText->fetch(groupLabel);
-		m_groupRooms[room.m_groupID] = room;
-		if ( !stricmp("quickmatch", room.m_name.str()) )
-		{
-			DEBUG_LOG(("Group room %d (%s) is the QuickMatch room\n", room.m_groupID, room.m_name.str()));
-			TheGameSpyConfig->setQMChannel(room.m_groupID);
-		}
-	}
-}
-
-void GameSpyInfo::joinGroupRoom( Int groupID )
-{
-	if (groupID > 0)
-	{
-		PeerRequest req;
-		req.peerRequestType = PeerRequest::PEERREQUEST_JOINGROUPROOM;
-		req.groupRoom.id = groupID;
-		TheGameSpyPeerMessageQueue->addRequest(req);
-		m_playerInfoMap.clear();
-	}
-}
-
-void GameSpyInfo::leaveGroupRoom( void )
-{
-	PeerRequest req;
-	req.peerRequestType = PeerRequest::PEERREQUEST_LEAVEGROUPROOM;
-	TheGameSpyPeerMessageQueue->addRequest(req);
-	setCurrentGroupRoom(0);
-	m_playerInfoMap.clear();
-}
-
-void GameSpyInfo::joinBestGroupRoom( void )
-{
-	if (m_currentGroupRoomID)
-	{
-		DEBUG_LOG(("Bailing from GameSpyInfo::joinBestGroupRoom() - we were already in a room\n"));
-		m_currentGroupRoomID = 0;
-		return;
-	}
-
-	if (m_groupRooms.size())
-	{
-		int minID = -1;
-		int minPlayers = 1000;
-		GroupRoomMap::iterator iter = m_groupRooms.begin();
-		while (iter != m_groupRooms.end())
-		{
-			GameSpyGroupRoom room = iter->second;
-			DEBUG_LOG(("Group room %d: %s (%d, %d, %d, %d)\n", room.m_groupID, room.m_name.str(), room.m_numWaiting, room.m_maxWaiting,
-				room.m_numGames, room.m_numPlaying));
-
-			if (TheGameSpyConfig->getQMChannel() != room.m_groupID && minPlayers > 25 && room.m_numWaiting < minPlayers)
-			{
-				minID = room.m_groupID;
-				minPlayers = room.m_numWaiting;
-			}
-
-			++iter;
-		}
-
-		if (minID > 0)
-		{
-			PeerRequest req;
-			req.peerRequestType = PeerRequest::PEERREQUEST_JOINGROUPROOM;
-			req.groupRoom.id = minID;
-			TheGameSpyPeerMessageQueue->addRequest(req);
-			m_playerInfoMap.clear();
-		}
-		else
-		{
-			GSMessageBoxOk(TheGameText->fetch("GUI:Error"), TheGameText->fetch("GUI:GSGroupRoomJoinFail"), NULL);
-		}
-	}
-	else
-	{
-		GSMessageBoxOk(TheGameText->fetch("GUI:Error"), TheGameText->fetch("GUI:GSGroupRoomJoinFail"), NULL);
-	}
-}
-
-void GameSpyInfo::updatePlayerInfo( PlayerInfo pi, AsciiString oldNick )
-{
-	if (!oldNick.isEmpty())
-		playerLeftGroupRoom(oldNick);
-
-	m_playerInfoMap[pi.m_name] = pi;
-
-	if (pi.m_preorder != 0)
-		markPlayerAsPreorder(pi.m_profileID);
-}
-
-void GameSpyInfo::playerLeftGroupRoom( AsciiString nick )
-{
-	PlayerInfoMap::iterator it = m_playerInfoMap.find(nick);
-	if (it != m_playerInfoMap.end())
-	{
-		m_playerInfoMap.erase(it);
-	}
-}
-
-void GameSpyInfo::clearStagingRoomList( void )
-{
-	Int numRoomsRemoved = 0;
-	m_sawFullGameList = FALSE;
-	m_stagingRoomsDirty = FALSE;
-	
-	StagingRoomMap::iterator it = m_stagingRooms.begin();
-	while (it != m_stagingRooms.end())
-	{
-		++numRoomsRemoved;
-
-		delete it->second;
-		m_stagingRooms.erase(it);
-		it = m_stagingRooms.begin();
-	}
-	if (numRoomsRemoved > 0)
-	{
-		//m_stagingRoomsDirty = true; // only consider ourselves dirty if we actually removed some games.
-	}
-}
-
-void GameSpyInfo::addStagingRoom( GameSpyStagingRoom room )
-{
-	removeStagingRoom(room);
-	GameSpyStagingRoom *newRoom = NEW GameSpyStagingRoom;
-	*newRoom = room;
-	newRoom->cleanUpSlotPointers();
-	m_stagingRooms[room.getID()] = newRoom;
-	m_stagingRoomsDirty = m_sawFullGameList;
-}
-
-void GameSpyInfo::updateStagingRoom( GameSpyStagingRoom room )
-{
-	addStagingRoom(room);
-}
-
-void GameSpyInfo::removeStagingRoom( GameSpyStagingRoom room )
-{
-	StagingRoomMap::iterator it = m_stagingRooms.find(room.getID());
-	if (it != m_stagingRooms.end())
-	{
-		delete it->second;
-		m_stagingRooms.erase(it);
-
-		m_stagingRoomsDirty = m_sawFullGameList;
-	}
-}
-
-Bool GameSpyInfo::hasStagingRoomListChanged( void )
-{
-	Bool val = m_stagingRoomsDirty;
-	m_stagingRoomsDirty = false;
-	return val;
-}
-
-GameSpyStagingRoom* GameSpyInfo::findStagingRoomByID( Int id )
-{
-	StagingRoomMap::iterator it = m_stagingRooms.find(id);
-	if (it != m_stagingRooms.end())
-		return it->second;
-
-	return NULL;
-}
-
-void GameSpyInfo::leaveStagingRoom( void )
-{
-	m_localStagingRoomID = 0;
-	PeerRequest req;
-	req.peerRequestType = PeerRequest::PEERREQUEST_LEAVESTAGINGROOM;
-	TheGameSpyPeerMessageQueue->addRequest(req);
-	m_playerInfoMap.clear();
-	m_joinedStagingRoom = FALSE;
-	m_isHosting = FALSE;
-}
-
-void GameSpyInfo::markAsStagingRoomHost( void )
-{
-	m_localStagingRoomID = 0;
-	m_joinedStagingRoom = FALSE; m_isHosting = TRUE;
-  
-  // There are a few options we don't want to reset when we are hosting (they carry over
-  // from the the create game dialog).
-  // Interesting fact: oldFactionsOnly will be carried over correctly if I remove these
-  // lines. UseStats won't be. I have no idea why.
-  Int useStats = m_localStagingRoom.getUseStats();
-  Bool oldFactionsOnly = m_localStagingRoom.oldFactionsOnly();
-
-  m_localStagingRoom.reset();
-	m_localStagingRoom.enterGame();
-	m_localStagingRoom.setSeed(GetTickCount());
-  
-  m_localStagingRoom.setUseStats( useStats );
-  m_localStagingRoom.setOldFactionsOnly( oldFactionsOnly );
-
-	GameSlot newSlot;
-	UnicodeString uName;
-	uName.translate(m_localName);
-	newSlot.setState(SLOT_PLAYER, uName);
-
-	m_localStagingRoom.setLocalIP(m_externalIP);
-	newSlot.setIP(m_externalIP);
-
-	m_localStagingRoom.setSlot(0,newSlot);
-	m_localStagingRoom.setLocalName(m_localName);
-
-	TheMapCache->updateCache();
-	m_localStagingRoom.setMap(getDefaultMap(TRUE));
-	m_localStagingRoom.adjustSlotsForMap(); // close slots that the map can't hold. BGC
-}
-
-void GameSpyInfo::markAsStagingRoomJoiner( Int game )
-{
-	m_localStagingRoomID = game;
-	m_joinedStagingRoom = TRUE; m_isHosting = FALSE;
-	m_localStagingRoom.reset();
-	m_localStagingRoom.enterGame();
-	StagingRoomMap::iterator it = m_stagingRooms.find(game);
-	if (it != m_stagingRooms.end())
-	{
-		GameSpyStagingRoom *info = it->second;
-		info->cleanUpSlotPointers();
-		AsciiString options = GameInfoToAsciiString(info);
-#ifdef DEBUG_CRASHING
-		Bool res =
-#endif
-		ParseAsciiStringToGameInfo(&m_localStagingRoom, options);
-		DEBUG_ASSERTCRASH(res, ("Could not parse game info \"%s\"", options.str()));
-		m_localStagingRoom.setInGame();
-		m_localStagingRoom.setLocalName(m_localName);
-		m_localStagingRoom.setExeCRC(info->getExeCRC());
-		m_localStagingRoom.setIniCRC(info->getIniCRC());
-		m_localStagingRoom.setAllowObservers(info->getAllowObservers());
-		m_localStagingRoom.setHasPassword(info->getHasPassword());
-		m_localStagingRoom.setGameName(info->getGameName());
-		DEBUG_LOG(("Joining game: host is %ls\n", m_localStagingRoom.getConstSlot(0)->getName().str()));
-	}
-}
-
-void GameSpyInfo::setMOTD( const AsciiString& motd )
-{
-	m_rawMotd = motd;
-}
-
-const AsciiString& GameSpyInfo::getMOTD( void )
-{
-	return m_rawMotd;
-}
-
-void GameSpyInfo::setConfig( const AsciiString& config )
-{
-	m_rawConfig = config;
-}
-
-const AsciiString& GameSpyInfo::getConfig( void )
-{
-	return m_rawConfig;
-}
-
-// --------------------------------------------------------------
-void SetUpGameSpy( const char *motdBuffer, const char *configBuffer )
-{
-	if (!motdBuffer)
-		motdBuffer = "";
-	if (!configBuffer)
-		configBuffer = "";
-	TearDownGameSpy();
-
-	AsciiString dir = TheGlobalData->getPath_UserData();
-	CreateDirectory(dir.str(), NULL);
-	dir.format("%sGeneralsOnline", TheGlobalData->getPath_UserData().str());
-	CreateDirectory(dir.str(), NULL);
-	dir.format("%sGeneralsOnline\\Ladders", TheGlobalData->getPath_UserData().str());
-	CreateDirectory(dir.str(), NULL);
-
-	TheGameSpyBuddyMessageQueue = GameSpyBuddyMessageQueueInterface::createNewMessageQueue();
-	TheGameSpyBuddyMessageQueue->startThread();
-
-	TheGameSpyPeerMessageQueue = GameSpyPeerMessageQueueInterface::createNewMessageQueue();
-	TheGameSpyPeerMessageQueue->startThread();
-	
-	TheGameSpyPSMessageQueue = GameSpyPSMessageQueueInterface::createNewMessageQueue();
-	TheGameSpyPSMessageQueue->startThread();
-
-	/*
-	TheGameSpyGame = NEW GameSpyStagingRoom;
-	*/
-
-	TheGameSpyInfo = GameSpyInfoInterface::createNewGameSpyInfoInterface();
-	TheGameSpyInfo->setMOTD(motdBuffer);
-	TheGameSpyInfo->setConfig(configBuffer);
-
-	CustomMatchPreferences pref;
-	TheGameSpyInfo->setDisallowAsianText(pref.getDisallowAsianText());
-	TheGameSpyInfo->setDisallowNonAsianText( pref.getDisallowNonAsianText());
-	
-
-	TheGameSpyConfig = GameSpyConfigInterface::create(configBuffer);
-
-	TheLadderList = NEW LadderList;
-
-	ThePinger = PingerInterface::createNewPingerInterface();
-	ThePinger->startThreads();
-
-	TheRankPointValues = NEW RankPoints;
-}
-
-void TearDownGameSpy( void )
-{
-	// save off cached stats
-	if (TheGameSpyInfo && TheGameSpyInfo->getLocalProfileID())
-	{
-//		/* This was done on the score screen, so there is no need to do it now.
-//		 *
-		PSPlayerStats localPSStats = TheGameSpyPSMessageQueue->findPlayerStatsByID(TheGameSpyInfo->getLocalProfileID());
-		if (localPSStats.id != 0)
-		{
-			GameSpyMiscPreferences mPref;
-			mPref.setCachedStats(GameSpyPSMessageQueueInterface::formatPlayerKVPairs(localPSStats).c_str());
-			mPref.write();
-		}
-//		*/
-	}
-
-	// End our threads before we kill off the singletons they reference.  No crashy-crash for you!
-	if (TheGameSpyPSMessageQueue)
-		TheGameSpyPSMessageQueue->endThread();
-	if (TheGameSpyBuddyMessageQueue)
-		TheGameSpyBuddyMessageQueue->endThread();
-	if (TheGameSpyPeerMessageQueue)
-		TheGameSpyPeerMessageQueue->endThread();
-	if (ThePinger)
-		ThePinger->endThreads();
-
-	if(TheRankPointValues)
-	{
-		delete TheRankPointValues;
-		TheRankPointValues = NULL;
-	}
-	if (TheGameSpyPSMessageQueue)
-	{
-		delete TheGameSpyPSMessageQueue;
-		TheGameSpyPSMessageQueue = NULL;
-	}
-
-	if (TheGameSpyBuddyMessageQueue)
-	{
-		delete TheGameSpyBuddyMessageQueue;
-		TheGameSpyBuddyMessageQueue = NULL;
-	}
-
-	if (TheGameSpyPeerMessageQueue)
-	{
-		delete TheGameSpyPeerMessageQueue;
-		TheGameSpyPeerMessageQueue = NULL;
-	}
-
-	if (TheGameSpyInfo)
-	{
-		if (TheGameSpyInfo->getInternalIP())
-		{
-			// we've logged in before.  mark us as logging out.
-			SignalUIInteraction(SHELL_SCRIPT_HOOK_GENERALS_ONLINE_LOGOUT);
-		}
-		delete TheGameSpyInfo;
-		TheGameSpyInfo = NULL;
-	}
-
-	if (ThePinger)
-	{
-		delete ThePinger;
-		ThePinger = NULL;
-	}
-
-	if (TheLadderList)
-	{
-		delete TheLadderList;
-		TheLadderList = NULL;
-	}
-
-	if (TheGameSpyConfig)
-	{
-		delete TheGameSpyConfig;
-		TheGameSpyConfig = NULL;
-	}
-
-	// make sure the notification box doesn't exist
-	deleteNotificationBox();
-}
-
-
-void GameSpyInfo::addToIgnoreList( AsciiString nick )
-{
-	m_ignoreList.insert(nick);
-}
-
-void GameSpyInfo::removeFromIgnoreList( AsciiString nick )
-{
-	m_ignoreList.erase(nick);
-}
-
-Bool GameSpyInfo::isIgnored( AsciiString nick )
-{
-	return m_ignoreList.find(nick) != m_ignoreList.end();
-}
-
-IgnoreList GameSpyInfo::returnIgnoreList( void )
-{
- return m_ignoreList;
-}
-
-void GameSpyInfo::addToSavedIgnoreList( Int profileID, AsciiString nick)
-{
-	m_savedIgnoreMap[profileID] = nick;
-	IgnorePreferences pref;
-	pref.setIgnore(nick, profileID, true);
-	pref.write();
-}
-
-void GameSpyInfo::removeFromSavedIgnoreList( Int profileID )
-{
-	m_savedIgnoreMap.erase(profileID);
-	IgnorePreferences pref;
-	pref.setIgnore(AsciiString::TheEmptyString, profileID, false);
-	pref.write();
-}
-
-Bool GameSpyInfo::isSavedIgnored( Int profileID )
-{
-	return m_savedIgnoreMap.find(profileID) != m_savedIgnoreMap.end();
-}
-
-SavedIgnoreMap	GameSpyInfo::returnSavedIgnoreList( void )
-{
-	return m_savedIgnoreMap;
-}
-
-static Int grabHexInt(const char *s)
-{
-	char tmp[5] = "0xff";
-	tmp[2] = s[0];
-	tmp[3] = s[1];
-	Int b = strtol(tmp, NULL, 16);
-	return b;
-}
-
-Int GameSpyInfo::getPingValue( const AsciiString& otherPing )
-{
-	if (m_pingString.getLength() != otherPing.getLength())
-	{
-		return TheGameSpyConfig->getPingTimeoutInMs();
-	}
-
-	if (m_pingString.getLength() % 2 != 0)
-	{
-		return TheGameSpyConfig->getPingTimeoutInMs();
-	}
-
-	Int best = 255+255;
-	const char *myStr = m_pingString.str();
-	const char *otherStr = otherPing.str();
-
-	while (*myStr)
-	{
-		Int myVal = grabHexInt(myStr);
-		Int otherVal = grabHexInt(otherStr);
-		Int val = myVal + otherVal;
-		best = (val < best) ? val : best;
-		myStr += 2;
-		otherStr += 2;
-	}
-
-	return best * TheGameSpyConfig->getPingTimeoutInMs() / (255+255);
-}
-
-Bool PlayerInfo::isIgnored( void )
-{
-	return (m_profileID)?TheGameSpyInfo->isSavedIgnored(m_profileID):TheGameSpyInfo->isIgnored(m_name);
-}
-
-void GameSpyInfo::loadSavedIgnoreList( void )
-{
-	m_savedIgnoreMap.clear();
-	IgnorePreferences prefs;
-	m_savedIgnoreMap = prefs.getIgnores();	
-}
-
-void GameSpyInfo::setDisallowAsianText( Bool val )
-{
-	m_disallowAsainText = val;
-}
-
-void GameSpyInfo::setDisallowNonAsianText( Bool val )
-{
-	m_disallowNonAsianText = val;
-}
-
-Bool GameSpyInfo::getDisallowAsianText( void )
-{
-	return m_disallowAsainText;
-}
-Bool GameSpyInfo::getDisallowNonAsianText(void )
-{
-	return m_disallowNonAsianText;
-}
-
-void GameSpyInfo::setMaxMessagesPerUpdate( Int num )
-{
-	m_maxMessagesPerUpdate = num;
-}
-
-Int GameSpyInfo::getMaxMessagesPerUpdate( void )
-{
-	return m_maxMessagesPerUpdate;
-}
-
-/**This function is used to force an update of player's gamespy stats with an additional
-disconnection.  This is used upon starting a new game so that if user disconnects prior
-to finishing game, the disconnection stays on the server.  If he completes the game, we
-remove this extra disconnection inside of populatePlayerInfo() on the ScoreScreen.  This
-seems like the only secure way to handle this issue since users can abort the process
-before we can detect/log disconnections.*/
-void GameSpyInfo::updateAdditionalGameSpyDisconnections(Int count)
-{
-	if (TheRecorder->isMultiplayer() && TheGameLogic->isInInternetGame() && TheGameSpyGame && TheGameSpyGame->getUseStats())
-	{	
-		Int localID = TheGameSpyInfo->getLocalProfileID();
-		PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(localID);
-		
-		Player *player=ThePlayerList->getLocalPlayer();
-
-		Int ptIdx;
-		const PlayerTemplate *myTemplate = player->getPlayerTemplate();
-		DEBUG_LOG(("myTemplate = %X(%s)\n", myTemplate, myTemplate->getName().str()));
-		for (ptIdx = 0; ptIdx < ThePlayerTemplateStore->getPlayerTemplateCount(); ++ptIdx)
-		{
-			const PlayerTemplate *nthTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(ptIdx);
-			DEBUG_LOG(("nthTemplate = %X(%s)\n", nthTemplate, nthTemplate->getName().str()));
-			if (nthTemplate == myTemplate)
-			{
-					break;
-			}
-		}
-
-		Bool anyAI = FALSE;
-		for (Int i=0; i<MAX_SLOTS; ++i)
-		{
-			const GameSlot *slot = TheGameInfo->getConstSlot(i);
-
-			if (slot->isAI())
-			{
-				anyAI = TRUE;
-			}
-		}
-
-		//Check for cases where we're not tracking stats.
-		if (anyAI || stats.id == 0 || myTemplate->isObserver() || player->getPlayerType() != PLAYER_HUMAN || player->isPlayerObserver())
-			return;
-
-		Int disCons=stats.discons[ptIdx];
-		disCons += count;
-		if (disCons < 0)
-		{	DEBUG_LOG(("updateAdditionalGameSpyDisconnections() - disconnection count below zero\n"));
-			return;	//something is wrong here
-		}
-		stats.discons[ptIdx] = disCons;	//add an additional disconnection to their stats.
-
-		//Add an additional disconnection to player stats.
-		PSRequest req;
-
-		req.requestType = PSRequest::PSREQUEST_UPDATEPLAYERSTATS;
-		req.email = TheGameSpyInfo->getLocalEmail().str();
-		req.nick = TheGameSpyInfo->getLocalBaseName().str();
-		req.password = TheGameSpyInfo->getLocalPassword().str();
-		req.player = stats;
-		req.addDesync = FALSE;
-		req.addDiscon = FALSE;
-		req.lastHouse = ptIdx;
-
-		TheGameSpyPSMessageQueue->addRequest(req);
-		TheGameSpyPSMessageQueue->trackPlayerStats(stats);
-
-		// force an update of our shtuff
-		PSResponse newResp;
-		newResp.responseType = PSResponse::PSRESPONSE_PLAYERSTATS;
-		newResp.player = stats;
-		TheGameSpyPSMessageQueue->addResponse(newResp);
-
-		// cache our stuff for easy reading next time
-   		GameSpyMiscPreferences mPref;
-   		mPref.setCachedStats(GameSpyPSMessageQueueInterface::formatPlayerKVPairs(stats).c_str());
-   		mPref.write();
-	}
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
deleted file mode 100644
index e5ebb0549aa..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
+++ /dev/null
@@ -1,896 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: StagingRoomGameInfo.cpp //////////////////////////////////////////////////////
-// Generals GameSpy GameInfo-related code
-// Author: Matthew D. Campbell, July 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameState.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "Common/PlayerTemplate.h"
-#include "Common/RandomValue.h"
-#include "Common/ScoreKeeper.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MapUtil.h"
-#include "GameClient/Shell.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/VictoryConditions.h"
-#include "GameNetwork/FileTransfer.h"
-#include "GameNetwork/GameSpy/BuddyThread.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/ThreadUtils.h"
-#include "GameNetwork/GameSpyOverlay.h"
-#include "GameNetwork/NAT.h"
-#include "GameNetwork/NetworkInterface.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// GameSpyGameSlot -------------------------------------------
-
-GameSpyGameSlot::GameSpyGameSlot()
-{
-	GameSlot();
-	m_gameSpyLogin.clear();
-	m_gameSpyLocale.clear();
-	m_profileID = 0;
-	m_wins = 0;
-	m_losses = 0;
-	m_rankPoints = 0;
-	m_favoriteSide = 0;
-	m_pingInt = 0;
-	// Added By Sadullah Nader
-	// Initializations missing and needed
-	m_profileID = 0;
-	m_pingStr.clear();
-}
-
-// Helper Functions ----------------------------------------
-/*
-** Function definitions for the MIB-II entry points.
-*/
-
-BOOL (__stdcall *SnmpExtensionInitPtr)(IN DWORD dwUpTimeReference, OUT HANDLE *phSubagentTrapEvent, OUT AsnObjectIdentifier *pFirstSupportedRegion);
-BOOL (__stdcall *SnmpExtensionQueryPtr)(IN BYTE bPduType, IN OUT RFC1157VarBindList *pVarBindList, OUT AsnInteger32 *pErrorStatus, OUT AsnInteger32 *pErrorIndex);
-LPVOID (__stdcall *SnmpUtilMemAllocPtr)(IN DWORD bytes);
-VOID (__stdcall *SnmpUtilMemFreePtr)(IN LPVOID pMem);
-
-typedef struct tConnInfoStruct {
-	unsigned int State;
-	unsigned long LocalIP;
-	unsigned short LocalPort;
-	unsigned long RemoteIP;
-	unsigned short RemotePort;
-} ConnInfoStruct;
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
-#endif
-
-/***********************************************************************************************
- * Get_Local_Chat_Connection_Address -- Which address are we using to talk to the chat server? *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:    Ptr to address to return local address                                            *                                                                                             *
- *                                                                                             *
- * OUTPUT:   True if success                                                                   *
- *                                                                                             *
- * WARNINGS: None                                                                              *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   10/27/00 3:24PM ST : Created                                                              *
- *=============================================================================================*/
-Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverPort, UnsignedInt& localIP)
-{
-	//return false;
-	/*
-	** Local defines.
-	*/
-	enum {
-		CLOSED = 1,
-		LISTENING,
-		SYN_SENT,
-		SEN_RECEIVED,
-		ESTABLISHED,
-		FIN_WAIT,
-		FIN_WAIT2,
-		CLOSE_WAIT,
-		LAST_ACK,
-		CLOSING,
-		TIME_WAIT,
-		DELETE_TCB
-	};
-
-	enum {
-		tcpConnState = 1,
-		tcpConnLocalAddress,
-		tcpConnLocalPort,
-		tcpConnRemAddress,
-		tcpConnRemPort
-	};
-
-
-	/*
-	** Locals.
-	*/
-	unsigned char serverAddress[4];
-	unsigned char remoteAddress[4];
-	HANDLE trap_handle;
-	AsnObjectIdentifier first_supported_region;
-	std::vector<ConnInfoStruct> connectionVector;
-	int last_field;
-	int index;
-	AsnInteger error_status;
-	AsnInteger error_index;
-	int conn_entry_type_index;
-	int conn_entry_type;
-	Bool found;
-
-	/*
-	** Statics.
-	*/
-	static char _conn_state[][32] = {
-		"?",
-		"CLOSED",
-		"LISTENING",
-		"SYN_SENT",
-		"SEN_RECEIVED",
-		"ESTABLISHED",
-		"FIN_WAIT",
-		"FIN_WAIT2",
-		"CLOSE_WAIT",
-		"LAST_ACK",
-		"CLOSING",
-		"TIME_WAIT",
-		"DELETE_TCB"
-	};
-
-	DEBUG_LOG(("Finding local address used to talk to the chat server\n"));
-	DEBUG_LOG(("Current chat server name is %s\n", serverName.str()));
-	DEBUG_LOG(("Chat server port is %d\n", serverPort));
-
-	/*
-	** Get the address of the chat server.
-	*/
-	DEBUG_LOG( ("About to call gethostbyname\n"));
-	struct hostent *host_info = gethostbyname(serverName.str());
-
-	if (!host_info) {
-		DEBUG_LOG( ("gethostbyname failed! Error code %d\n", WSAGetLastError()));
-		return(false);
-	}
-
-	memcpy(serverAddress, &host_info->h_addr_list[0][0], 4);
-	unsigned long temp = *((unsigned long*)(&serverAddress[0]));
-	temp = ntohl(temp);
-	*((unsigned long*)(&serverAddress[0])) = temp;
-
-	DEBUG_LOG(("Host address is %d.%d.%d.%d\n", serverAddress[3], serverAddress[2], serverAddress[1], serverAddress[0]));
-
-	/*
-	** Load the MIB-II SNMP DLL.
-	*/
-	DEBUG_LOG(("About to load INETMIB1.DLL\n"));
-
-	HINSTANCE mib_ii_dll = LoadLibrary("inetmib1.dll");
-	if (mib_ii_dll == NULL) {
-		DEBUG_LOG(("Failed to load INETMIB1.DLL\n"));
-		return(false);
-	}
-
-	DEBUG_LOG(("About to load SNMPAPI.DLL\n"));
-
-	HINSTANCE snmpapi_dll = LoadLibrary("snmpapi.dll");
-	if (snmpapi_dll == NULL) {
-		DEBUG_LOG(("Failed to load SNMPAPI.DLL\n"));
-		FreeLibrary(mib_ii_dll);
-		return(false);
-	}
-
-	/*
-	** Get the function pointers into the .dll
-	*/
-	SnmpExtensionInitPtr = (int (__stdcall *)(unsigned long,void ** ,AsnObjectIdentifier *)) GetProcAddress(mib_ii_dll, "SnmpExtensionInit");
-	SnmpExtensionQueryPtr = (int (__stdcall *)(unsigned char,SnmpVarBindList *,long *,long *)) GetProcAddress(mib_ii_dll, "SnmpExtensionQuery");
-	SnmpUtilMemAllocPtr = (void *(__stdcall *)(unsigned long)) GetProcAddress(snmpapi_dll, "SnmpUtilMemAlloc");
-	SnmpUtilMemFreePtr = (void (__stdcall *)(void *)) GetProcAddress(snmpapi_dll, "SnmpUtilMemFree");
-	if (SnmpExtensionInitPtr == NULL || SnmpExtensionQueryPtr == NULL || SnmpUtilMemAllocPtr == NULL || SnmpUtilMemFreePtr == NULL) {
-		DEBUG_LOG(("Failed to get proc addresses for linked functions\n"));
-		FreeLibrary(snmpapi_dll);
-		FreeLibrary(mib_ii_dll);
-		return(false);
-	}
-
-
-	RFC1157VarBindList *bind_list_ptr = (RFC1157VarBindList *) SnmpUtilMemAllocPtr(sizeof(RFC1157VarBindList));
-	RFC1157VarBind *bind_ptr = (RFC1157VarBind *) SnmpUtilMemAllocPtr(sizeof(RFC1157VarBind));
-
-	/*
-	** OK, here we go. Try to initialise the .dll
-	*/
-	DEBUG_LOG(("About to init INETMIB1.DLL\n"));
-	int ok = SnmpExtensionInitPtr(GetCurrentTime(), &trap_handle, &first_supported_region);
-
-	if (!ok) {
-		/*
-		** Aw crap.
-		*/
-		DEBUG_LOG(("Failed to init the .dll\n"));
-		SnmpUtilMemFreePtr(bind_list_ptr);
-		SnmpUtilMemFreePtr(bind_ptr);
-		FreeLibrary(snmpapi_dll);
-		FreeLibrary(mib_ii_dll);
-		return(false);
-	}
-
-	/*
-	** Name of mib_ii object we want to query. See RFC 1213.
-	**
-	** iso.org.dod.internet.mgmt.mib-2.tcp.tcpConnTable.TcpConnEntry.tcpConnState
-	**  1   3   6      1      2     1   6        13          1             1
-	*/
-	unsigned int mib_ii_name[] = {1,3,6,1,2,1,6,13,1,1};
-	unsigned int *mib_ii_name_ptr = (unsigned int *) SnmpUtilMemAllocPtr(sizeof(mib_ii_name));
-	memcpy(mib_ii_name_ptr, mib_ii_name, sizeof(mib_ii_name));
-
-	/*
-	** Get the index of the conn entry data.
-	*/
-	conn_entry_type_index = ARRAY_SIZE(mib_ii_name) - 1;
-
-	/*
-	** Set up the bind list.
-	*/
-	bind_ptr->name.idLength = ARRAY_SIZE(mib_ii_name);
-	bind_ptr->name.ids = mib_ii_name;
-	bind_list_ptr->list = bind_ptr;
-	bind_list_ptr->len = 1;
-
-
-	/*
-	** We start with the tcpConnLocalAddress field.
-	*/
-	last_field = 1;
-
-	/*
-	** First connection.
-	*/
-	index = 0;
-
-	/*
-	** Suck out that tcp connection info....
-	*/
-	while (true) {
-
-		if (!SnmpExtensionQueryPtr(SNMP_PDU_GETNEXT, bind_list_ptr, &error_status, &error_index)) {
-		//if (!SnmpExtensionQueryPtr(ASN_RFC1157_GETNEXTREQUEST, bind_list_ptr, &error_status, &error_index)) {
-			DEBUG_LOG(("SnmpExtensionQuery returned false\n"));
-			SnmpUtilMemFreePtr(bind_list_ptr);
-			SnmpUtilMemFreePtr(bind_ptr);
-			FreeLibrary(snmpapi_dll);
-			FreeLibrary(mib_ii_dll);
-			return(false);
-		}
-
-		/*
-		** If this is something new we aren't looking for then we are done.
-		*/
-		if (bind_ptr->name.idLength < ARRAY_SIZE(mib_ii_name)) {
-			break;
-		}
-
-		/*
-		** Get the type of info we are looking at. See RFC1213.
-		**
-		** 1 = tcpConnState
-		** 2 = tcpConnLocalAddress
-		** 3 = tcpConnLocalPort
-		** 4 = tcpConnRemAddress
-		** 5 = tcpConnRemPort
-		**
-		** tcpConnState is one of the following...
-		**
-		**   1  closed
-		**   2  listen
-		**   3  synSent
-		**   4  synReceived
-		**   5  established
-		**   6  finWait1
-		**   7  finWait2
-		**   8  closeWait
-		**   9  lastAck
-		**   10 closing
-		**   11 timeWait
-		**   12 deleteTCB
-		*/
-		conn_entry_type = bind_ptr->name.ids[conn_entry_type_index];
-
-		if (last_field != conn_entry_type) {
-			index = 0;
-			last_field = conn_entry_type;
-		}
-
-		switch (conn_entry_type) {
-
-			/*
-			** 1. First field in the entry. Need to create a new connection info struct
-			** here to store this connection in.
-			*/
-			case tcpConnState:
-			{
-				ConnInfoStruct new_conn;
-				new_conn.State = bind_ptr->value.asnValue.number;
-				connectionVector.push_back(new_conn);
-				break;
-			}
-
-			/*
-			** 2. Local address field.
-			*/
-			case tcpConnLocalAddress:
-				DEBUG_ASSERTCRASH(index < connectionVector.size(), ("Bad connection index"));
-				connectionVector[index].LocalIP = *((unsigned long*)bind_ptr->value.asnValue.address.stream);
-				index++;
-				break;
-
-			/*
-			** 3. Local port field.
-			*/
-			case tcpConnLocalPort:
-				DEBUG_ASSERTCRASH(index < connectionVector.size(), ("Bad connection index"));
-				connectionVector[index].LocalPort = bind_ptr->value.asnValue.number;
-				//connectionVector[index]->LocalPort = ntohs(connectionVector[index]->LocalPort);
-				index++;
-				break;
-
-			/*
-			** 4. Remote address field.
-			*/
-			case tcpConnRemAddress:
-				DEBUG_ASSERTCRASH(index < connectionVector.size(), ("Bad connection index"));
-				connectionVector[index].RemoteIP = *((unsigned long*)bind_ptr->value.asnValue.address.stream);
-				index++;
-				break;
-
-			/*
-			** 5. Remote port field.
-			*/
-			case tcpConnRemPort:
-				DEBUG_ASSERTCRASH(index < connectionVector.size(), ("Bad connection index"));
-				connectionVector[index].RemotePort = bind_ptr->value.asnValue.number;
-				//connectionVector[index]->RemotePort = ntohs(connectionVector[index]->RemotePort);
-				index++;
-				break;
-		}
-	}
-
-	SnmpUtilMemFreePtr(bind_list_ptr);
-	SnmpUtilMemFreePtr(bind_ptr);
-	SnmpUtilMemFreePtr(mib_ii_name_ptr);
-
-	DEBUG_LOG(("Got %d connections in list, parsing...\n", connectionVector.size()));
-
-	/*
-	** Right, we got the lot. Lets see if any of them have the same address as the chat
-	** server we think we are talking to.
-	*/
-	found = false;
-	for (size_t i=0; i<connectionVector.size(); ++i) {
-		ConnInfoStruct connection = connectionVector[i];
-
-		temp = ntohl(connection.RemoteIP);
-		memcpy(remoteAddress, (unsigned char*)&temp, 4);
-
-		/*
-		** See if this connection has the same address as our server.
-		*/
-		if (!found && memcmp(remoteAddress, serverAddress, 4) == 0) {
-			DEBUG_LOG(("Found connection with same remote address as server\n"));
-
-			if (serverPort == 0 || serverPort == (unsigned int)connection.RemotePort) {
-
-				DEBUG_LOG(("Connection has same port\n"));
-				/*
-				** Make sure the connection is current.
-				*/
-				if (connection.State == ESTABLISHED) {
-					DEBUG_LOG(("Connection is ESTABLISHED\n"));
-					localIP = connection.LocalIP;
-					found = true;
-				} else {
-					DEBUG_LOG(("Connection is not ESTABLISHED - skipping\n"));
-				}
-			} else {
-				DEBUG_LOG(("Connection has different port. Port is %d, looking for %d\n", connection.RemotePort, serverPort));
-			}
-		}
-	}
-
-	if (found) {
-		DEBUG_LOG(("Using address 0x%8.8X to talk to chat server\n", localIP));
-	}
-
-	FreeLibrary(snmpapi_dll);
-	FreeLibrary(mib_ii_dll);
-	return(found);
-}
-
-// GameSpyGameSlot ----------------------------------------
-
-void GameSpyGameSlot::setPingString( AsciiString pingStr )
-{
-	m_pingStr = pingStr;
-	m_pingInt = TheGameSpyInfo->getPingValue(pingStr);
-}
-
-// GameSpyStagingRoom ----------------------------------------
-
-GameSpyStagingRoom::GameSpyStagingRoom()
-{
-	cleanUpSlotPointers();
-
-	setLocalIP(0);
-	m_transport = NULL;
-
-	m_localName = "localhost";
-
-	m_ladderIP.clear();
-	m_ladderPort = 0;
-}
-
-void GameSpyStagingRoom::cleanUpSlotPointers( void )
-{
-	for (Int i = 0; i< MAX_SLOTS; ++i)
-		setSlotPointer(i, &m_GameSpySlot[i]);
-}
-
-GameSpyGameSlot * GameSpyStagingRoom::getGameSpySlot( Int index )
-{
-	GameSlot *slot = getSlot(index);
-	DEBUG_ASSERTCRASH(slot && (slot == &(m_GameSpySlot[index])), ("Bad game slot pointer\n"));
-	return (GameSpyGameSlot *)slot;
-}
-
-void GameSpyStagingRoom::init( void )
-{
-	GameInfo::init();
-}
-
-void GameSpyStagingRoom::setPingString( AsciiString pingStr )
-{
-	m_pingStr = pingStr;
-	m_pingInt = TheGameSpyInfo->getPingValue(pingStr);
-}
-
-Bool GameSpyStagingRoom::amIHost( void ) const
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
-	if (!m_inGame)
-		return false;
-
-	return getConstSlot(0)->isPlayer(m_localName);
-}
-
-void GameSpyStagingRoom::resetAccepted( void )
-{
-	GameInfo::resetAccepted();
-
-	if (amIHost())
-	{
-		/*
-		peerStateChanged(TheGameSpyChat->getPeer());
-		m_hasBeenQueried = false;
-		DEBUG_LOG(("resetAccepted() called peerStateChange()\n"));
-		*/
-	}
-}
-
-Int GameSpyStagingRoom::getLocalSlotNum( void ) const
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for local game slot while not in game"));
-	if (!m_inGame)
-		return -1;
-
-	AsciiString localName = TheGameSpyInfo->getLocalName();
-
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSlot *slot = getConstSlot(i);
-		if (slot == NULL) {
-			continue;
-		}
-		if (slot->isPlayer(localName))
-			return i;
-	}
-	return -1;
-}
-
-void GameSpyStagingRoom::startGame(Int gameID)
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Starting a game while not in game"));
-	DEBUG_LOG(("GameSpyStagingRoom::startGame - game id = %d\n", gameID));
-	DEBUG_ASSERTCRASH(m_transport == NULL, ("m_transport is not NULL when it should be"));
-	DEBUG_ASSERTCRASH(TheNAT == NULL, ("TheNAT is not NULL when it should be"));
-
-	UnsignedInt localIP = TheGameSpyInfo->getInternalIP();
-	setLocalIP(localIP);
-
-	if (TheNAT != NULL) {
-		delete TheNAT;
-		TheNAT = NULL;
-	}
-
-	// fill in GS-specific info
-	Int numHumans = 0;
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_GameSpySlot[i].isHuman())
-		{
-			++numHumans;
-			AsciiString gsName;
-			gsName.translate( m_GameSpySlot[i].getName() );
-			m_GameSpySlot[i].setLoginName( gsName );
-
-			if (m_isQM)
-			{
-				if (getLocalSlotNum() == i)
-					m_GameSpySlot[i].setProfileID(TheGameSpyInfo->getLocalProfileID());  // hehe - we know our own.  the rest, they'll tell us.
-			}
-			else
-			{
-				PlayerInfoMap *pInfoMap = TheGameSpyInfo->getPlayerInfoMap();
-				PlayerInfoMap::iterator it = pInfoMap->find(gsName);
-				if (it != pInfoMap->end())
-				{
-					m_GameSpySlot[i].setProfileID(it->second.m_profileID);
-					m_GameSpySlot[i].setLocale(it->second.m_locale);
-					m_GameSpySlot[i].setSlotRankPoints(it->second.m_rankPoints);
-					m_GameSpySlot[i].setFavoriteSide(it->second.m_side);
-				}
-				else
-				{
-					DEBUG_CRASH(("No player info for %s", gsName.str()));
-				}
-			}
-		}
-	}
-
-//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (numHumans < 2)
-	{
-		launchGame();
-		if (TheGameSpyInfo)
-			TheGameSpyInfo->leaveStagingRoom();
-	}
-	else
-//#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	{
-		TheNAT = NEW NAT();
-		TheNAT->attachSlotList(m_slot, getLocalSlotNum(), m_localIP);
-		TheNAT->establishConnectionPaths();
-	}
-}
-
-AsciiString GameSpyStagingRoom::generateGameSpyGameResultsPacket( void )
-{
-	Int i;
-	Int endFrame = TheVictoryConditions->getEndFrame();
-	Int localSlotNum = getLocalSlotNum();
-	Int winningTeam = -1;
-	Int numHumans = 0;
-	Int numPlayers = 0;
-	Int numAIs = 0;
-	Int numTeamsAtGameEnd = 0;
-	Int lastTeamAtGameEnd = -1;
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		AsciiString playerName;
-		playerName.format("player%d", i);
-		Player *p = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
-		if (p)
-		{
-			++numHumans;
-			if (TheVictoryConditions->hasAchievedVictory(p))
-			{
-				winningTeam = getSlot(i)->getTeamNumber();
-			}
-
-			// check if he lasted
-			GameSlot *slot = getSlot(i);
-			if (!slot->disconnected())
-			{
-				if (slot->getTeamNumber() != lastTeamAtGameEnd || numTeamsAtGameEnd == 0)
-				{
-					lastTeamAtGameEnd = slot->getTeamNumber();
-					++numTeamsAtGameEnd;
-				}
-			}
-		}
-		else
-		{
-			if (m_GameSpySlot[i].isAI())
-				++numAIs;
-		}
-	}
-	numPlayers = numHumans + numAIs;
-
-	AsciiString mapName;
-	for (i=0; i<getMap().getLength(); ++i)
-	{
-		char c = getMap().getCharAt(i);
-		if (c == '\\')
-			c = '/';
-		mapName.concat(c);
-	}
-
-	AsciiString results;
-	results.format("\\seed\\%d\\hostname\\%s\\mapname\\%s\\numplayers\\%d\\duration\\%d\\gamemode\\exiting\\localplayer\\%d",
-		getSeed(), m_GameSpySlot[0].getLoginName().str(), mapName.str(), numPlayers, endFrame, localSlotNum);
-
-	Int playerID = 0;
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		AsciiString playerName;
-		playerName.format("player%d", i);
-		Player *p = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
-		if (p)
-		{
-			GameSpyGameSlot *slot = &(m_GameSpySlot[i]);
-			AsciiString playerName = (slot->isHuman())?slot->getLoginName():"AIPlayer";
-			Int gsPlayerID = slot->getProfileID();
-			Bool disconnected = slot->disconnected();
-
-			AsciiString result = "loss";
-			if (disconnected)
-				result = "discon";
-			else if (TheNetwork->sawCRCMismatch())
-				result = "desync";
-			else if (TheVictoryConditions->hasAchievedVictory(p))
-				result = "win";
-
-			AsciiString side = p->getPlayerTemplate()->getSide();
-			if (side == "America")
-				side = "USA";  //conform to GameSpy
-
-			AsciiString playerStr;
-			playerStr.format("\\player_%d\\%s\\pid_%d\\%d\\team_%d\\%d\\result_%d\\%s\\side_%d\\%s",
-				playerID, playerName.str(), playerID, gsPlayerID, playerID, slot->getTeamNumber(),
-				playerID, result.str(), playerID, side.str());
-			results.concat(playerStr);
-
-			++playerID;
-		}
-	}
-
-	return results;
-}
-
-AsciiString GameSpyStagingRoom::generateLadderGameResultsPacket( void )
-{
-	Int i;
-	Int endFrame = TheVictoryConditions->getEndFrame();
-	Int localSlotNum = getLocalSlotNum();
-	Bool sawGameEnd = (endFrame > 0);
-	Int winningTeam = -1;
-	Int numPlayers = 0;
-	Int numTeamsAtGameEnd = 0;
-	Int lastTeamAtGameEnd = -1;
-	Player* p[MAX_SLOTS];
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		AsciiString playerName;
-		playerName.format("player%d", i);
-		p[i] = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
-		if (p[i])
-		{
-			++numPlayers;
-			if (TheVictoryConditions->hasAchievedVictory(p[i]))
-			{
-				winningTeam = getSlot(i)->getTeamNumber();
-			}
-
-			// check if he lasted
-			GameSlot *slot = getSlot(i);
-			if (!slot->disconnected())
-			{
-				if (slot->getTeamNumber() != lastTeamAtGameEnd || numTeamsAtGameEnd == 0)
-				{
-					lastTeamAtGameEnd = slot->getTeamNumber();
-					++numTeamsAtGameEnd;
-				}
-			}
-		}
-	}
-
-	AsciiString results;
-	results.format("seed=%d,slotNum=%d,sawDesync=%d,sawGameEnd=%d,winningTeam=%d,disconEnd=%d,duration=%d,numPlayers=%d,isQM=%d,map=%s",
-		getSeed(), localSlotNum, TheNetwork->sawCRCMismatch(), sawGameEnd, winningTeam, (numTeamsAtGameEnd < 2),
-		endFrame, numPlayers, m_isQM, TheGameState->realMapPathToPortableMapPath(getMap()).str());
-
-	AsciiString tempStr;
-	tempStr.format("ladderIP=%s,ladderPort=%d", getLadderIP().str(), getLadderPort());
-	results.concat(tempStr);
-
-	Int playerID = 0;
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		AsciiString playerName;
-		playerName.format("player%d", i);
-		if (p[i])
-		{
-			GameSpyGameSlot *slot = &(m_GameSpySlot[i]);
-			ScoreKeeper *keeper = p[i]->getScoreKeeper();
-			AsciiString playerName = slot->getLoginName();
-			Int gsPlayerID = slot->getProfileID();
-			PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(gsPlayerID);
-			Int fps = TheNetwork->getAverageFPS();
-			Int unitsKilled = keeper->getTotalUnitsDestroyed();
-			Int unitsLost = keeper->getTotalUnitsLost();
-			Int unitsBuilt = keeper->getTotalUnitsBuilt();
-			Int buildingsKilled = keeper->getTotalBuildingsDestroyed();
-			Int buildingsLost = keeper->getTotalBuildingsLost();
-			Int buildingsBuilt = keeper->getTotalBuildingsBuilt();
-			Int earnings = keeper->getTotalMoneyEarned();
-			Int techCaptured = keeper->getTotalTechBuildingsCaptured();
-			Bool disconnected = slot->disconnected();
-
-			AsciiString playerStr;
-			playerStr.format(",player%d=%s,playerID%d=%d,locale%d=%d",
-				playerID, playerName.str(), playerID, gsPlayerID, playerID, stats.locale);
-			results.concat(playerStr);
-			playerStr.format(",unitsKilled%d=%d,unitsLost%d=%d,unitsBuilt%d=%d",
-				playerID, unitsKilled, playerID, unitsLost, playerID, unitsBuilt);
-			results.concat(playerStr);
-			playerStr.format(",buildingsKilled%d=%d,buildingsLost%d=%d,buildingsBuilt%d=%d",
-				playerID, buildingsKilled, playerID, buildingsLost, playerID, buildingsBuilt);
-			results.concat(playerStr);
-			playerStr.format(",fps%d=%d,cash%d=%d,capturedTech%d=%d,discon%d=%d,side%d=%s",
-				playerID, fps, playerID, earnings, playerID, techCaptured, playerID, disconnected, playerID, p[i]->getPlayerTemplate()->getSide().str());
-			results.concat(playerStr);
-
-			++playerID;
-		}
-	}
-
-	// Add a trailing size value (so the server can ensure it got the entire packet)
-	results.concat(",size=");
-	int resultsLen = results.getLength()+10;
-	AsciiString tail;
-	tail.format("%10.10d", resultsLen);
-	results.concat(tail);
-
-	return results;
-}
-
-void GameSpyStagingRoom::launchGame( void )
-{
-	setGameInProgress(TRUE);
-	
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const GameSpyGameSlot *slot = getGameSpySlot(i);
-		if (slot->isHuman())
-		{
-			if (TheGameSpyInfo->didPlayerPreorder(slot->getProfileID()))
-				markPlayerAsPreorder(i);
-		}
-	}
-
-	// Set up the game network
-	AsciiString user;
-	AsciiString userList;
-	DEBUG_ASSERTCRASH(TheNetwork == NULL, ("For some reason TheNetwork isn't NULL at the start of this game.  Better look into that."));
-
-	if (TheNetwork != NULL) {
-		delete TheNetwork;
-		TheNetwork = NULL;
-	}
-
-	// Time to initialize TheNetwork for this game.
-	TheNetwork = NetworkInterface::createNetwork();
-	TheNetwork->init();
-	
-	TheNetwork->setLocalAddress(getLocalIP(), (TheNAT)?TheNAT->getSlotPort(getLocalSlotNum()):8888);
-	if (TheNAT)
-		TheNetwork->attachTransport(TheNAT->getTransport());
-	else
-		TheNetwork->initTransport();
-
-	TheNetwork->parseUserList(this);
-
-
-	if (TheGameLogic->isInGame()) {
-		TheGameLogic->clearGameData();
-	}
-
-	Bool filesOk = DoAnyMapTransfers(this);
-
-	// see if we really have the map.  if not, back out.
-	TheMapCache->updateCache();
-	if (!filesOk || TheMapCache->findMap(getMap()) == NULL)
-	{
-		DEBUG_LOG(("After transfer, we didn't really have the map.  Bailing...\n"));
-		if (TheNetwork != NULL) {
-			delete TheNetwork;
-			TheNetwork = NULL;
-		}
-		GSMessageBoxOk(TheGameText->fetch("GUI:Error"), TheGameText->fetch("GUI:CouldNotTransferMap"));
-
-		void PopBackToLobby( void );
-		PopBackToLobby();
-		return;
-	}
-
-
-	// shutdown the top, but do not pop it off the stack
-//		TheShell->hideShell();
-	// setup the Global Data with the Map and Seed
-	TheWritableGlobalData->m_pendingFile = TheGameSpyGame->getMap();
-
-	// send a message to the logic for a new game
-	GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
-	msg->appendIntegerArgument(GAME_INTERNET);
-
-	TheWritableGlobalData->m_useFpsLimit = false;
-
-	// Set the random seed
-	InitGameLogicRandom( getSeed() );
-	DEBUG_LOG(("InitGameLogicRandom( %d )\n", getSeed()));
-
-	// mark us as "Loading" in the buddy list
-	BuddyRequest req;
-	req.buddyRequestType = BuddyRequest::BUDDYREQUEST_SETSTATUS;
-	req.arg.status.status = GP_PLAYING;
-	strcpy(req.arg.status.statusString, "Loading");
-	sprintf(req.arg.status.locationString, "%s", WideCharStringToMultiByte(TheGameSpyGame->getGameName().str()).c_str());
-	TheGameSpyBuddyMessageQueue->addRequest(req);
-
-	if (TheNAT != NULL) {
-		delete TheNAT;
-		TheNAT = NULL;
-	}
-}
-
-void GameSpyStagingRoom::reset(void)
-{
-#ifdef DEBUG_LOGGING
-	if (this == TheGameSpyGame)
-	{
-		WindowLayout *theLayout = TheShell->findScreenByFilename("Menus/GameSpyGameOptionsMenu.wnd");
-		if (theLayout)
-		{
-			DEBUG_LOG(("Resetting TheGameSpyGame on the game options menu!\n"));
-		}
-	}
-#endif
-	GameInfo::reset();
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
deleted file mode 100644
index 669d7b1388d..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
+++ /dev/null
@@ -1,681 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: BuddyThread.cpp //////////////////////////////////////////////////////
-// GameSpy Presence & Messaging (Buddy) thread
-// This thread communicates with GameSpy's buddy server
-// and talks through a message queue with the rest of
-// the game.
-// Author: Matthew D. Campbell, June 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/GameSpy/BuddyThread.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/ThreadUtils.h"
-
-#include "Common/StackDump.h"
-
-#include "mutex.h"
-#include "thread.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-------------------------------------------------------------------------
-
-typedef std::queue<BuddyRequest> RequestQueue;
-typedef std::queue<BuddyResponse> ResponseQueue;
-class BuddyThreadClass;
-
-class GameSpyBuddyMessageQueue : public GameSpyBuddyMessageQueueInterface
-{
-public:
-	virtual ~GameSpyBuddyMessageQueue();
-	GameSpyBuddyMessageQueue();
-	virtual void startThread( void );
-	virtual void endThread( void );
-	virtual Bool isThreadRunning( void );
-	virtual Bool isConnected( void );
-	virtual Bool isConnecting( void );
-
-	virtual void addRequest( const BuddyRequest& req );
-	virtual Bool getRequest( BuddyRequest& req );
-
-	virtual void addResponse( const BuddyResponse& resp );
-	virtual Bool getResponse( BuddyResponse& resp );
-
-	virtual GPProfile getLocalProfileID( void );
-
-	BuddyThreadClass* getThread( void );
-
-private:
-	MutexClass m_requestMutex;
-	MutexClass m_responseMutex;
-	RequestQueue m_requests;
-	ResponseQueue m_responses;
-	BuddyThreadClass *m_thread;
-};
-
-GameSpyBuddyMessageQueueInterface* GameSpyBuddyMessageQueueInterface::createNewMessageQueue( void )
-{
-	return NEW GameSpyBuddyMessageQueue;
-}
-
-GameSpyBuddyMessageQueueInterface *TheGameSpyBuddyMessageQueue;
-#define MESSAGE_QUEUE ((GameSpyBuddyMessageQueue *)TheGameSpyBuddyMessageQueue)
-
-//-------------------------------------------------------------------------
-
-class BuddyThreadClass : public ThreadClass
-{
-
-public:
-	BuddyThreadClass() : ThreadClass() { m_isNewAccount = m_isdeleting = m_isConnecting = m_isConnected = false; m_profileID = 0; m_lastErrorCode = 0; }
-
-	void Thread_Function();
-
-	void errorCallback( GPConnection *con, GPErrorArg *arg );
-	void messageCallback( GPConnection *con, GPRecvBuddyMessageArg *arg );
-	void connectCallback( GPConnection *con, GPConnectResponseArg *arg );
-	void requestCallback( GPConnection *con, GPRecvBuddyRequestArg *arg );
-	void statusCallback( GPConnection *con, GPRecvBuddyStatusArg *arg );
-
-	Bool isConnecting( void ) { return m_isConnecting; }
-	Bool isConnected( void ) { return m_isConnected; }
-
-	GPProfile getLocalProfileID( void ) { return m_profileID; }
-
-private:
-	Bool m_isNewAccount;
-	Bool m_isConnecting;
-	Bool m_isConnected;
-	GPProfile m_profileID;
-	Int m_lastErrorCode;
-	Bool m_isdeleting;
-	std::string m_nick, m_email, m_pass;
-};
-
-static enum CallbackType
-{
-	CALLBACK_CONNECT,
-	CALLBACK_ERROR,
-	CALLBACK_RECVMESSAGE,
-	CALLBACK_RECVREQUEST,
-	CALLBACK_RECVSTATUS,
-	CALLBACK_MAX
-};
-
-void callbackWrapper( GPConnection *con, void *arg, void *param )
-{
-	CallbackType info = (CallbackType)(Int)param;
-	BuddyThreadClass *thread = MESSAGE_QUEUE->getThread() ? MESSAGE_QUEUE->getThread() : NULL /*(TheGameSpyBuddyMessageQueue)?TheGameSpyBuddyMessageQueue->getThread():NULL*/;
-	if (!thread)
-		return;
-
-	switch (info)
-	{
-		case CALLBACK_CONNECT:
-			thread->connectCallback( con, (GPConnectResponseArg *)arg );
-			break;
-		case CALLBACK_ERROR:
-			thread->errorCallback( con, (GPErrorArg *)arg );
-			break;
-		case CALLBACK_RECVMESSAGE:
-			thread->messageCallback( con, (GPRecvBuddyMessageArg *)arg );
-			break;
-		case CALLBACK_RECVREQUEST:
-			thread->requestCallback( con, (GPRecvBuddyRequestArg *)arg );
-			break;
-		case CALLBACK_RECVSTATUS:
-			thread->statusCallback( con, (GPRecvBuddyStatusArg *)arg );
-			break;
-	}
-}
-
-//-------------------------------------------------------------------------
-
-GameSpyBuddyMessageQueue::GameSpyBuddyMessageQueue()
-{
-	m_thread = NULL;
-}
-
-GameSpyBuddyMessageQueue::~GameSpyBuddyMessageQueue()
-{
-	endThread();
-}
-
-void GameSpyBuddyMessageQueue::startThread( void )
-{
-	if (!m_thread)
-	{
-		m_thread = NEW BuddyThreadClass;
-		m_thread->Execute();
-	}
-	else
-	{
-		if (!m_thread->Is_Running())
-		{
-			m_thread->Execute();
-		}
-	}
-}
-
-void GameSpyBuddyMessageQueue::endThread( void )
-{
-	if (m_thread)
-		delete m_thread;
-	m_thread = NULL;
-}
-
-Bool GameSpyBuddyMessageQueue::isThreadRunning( void )
-{
-	return (m_thread) ? m_thread->Is_Running() : false;
-}
-
-Bool GameSpyBuddyMessageQueue::isConnected( void )
-{
-	return (m_thread) ? m_thread->isConnected() : false;
-}
-
-Bool GameSpyBuddyMessageQueue::isConnecting( void )
-{
-	return (m_thread) ? m_thread->isConnecting() : false;
-}
-
-void GameSpyBuddyMessageQueue::addRequest( const BuddyRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex);
-	if (m.Failed())
-		return;
-
-	m_requests.push(req);
-}
-
-Bool GameSpyBuddyMessageQueue::getRequest( BuddyRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_requests.empty())
-		return false;
-	req = m_requests.front();
-	m_requests.pop();
-	return true;
-}
-
-void GameSpyBuddyMessageQueue::addResponse( const BuddyResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex);
-	if (m.Failed())
-		return;
-
-	m_responses.push(resp);
-}
-
-Bool GameSpyBuddyMessageQueue::getResponse( BuddyResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_responses.empty())
-		return false;
-	resp = m_responses.front();
-	m_responses.pop();
-	return true;
-}
-
-BuddyThreadClass* GameSpyBuddyMessageQueue::getThread( void )
-{
-	return m_thread;
-}
-
-GPProfile GameSpyBuddyMessageQueue::getLocalProfileID( void )
-{
-	return (m_thread) ? m_thread->getLocalProfileID() : 0;
-}
-
-//-------------------------------------------------------------------------
-
-void BuddyThreadClass::Thread_Function()
-{
-	try {
-	_set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
-	GPConnection gpCon;
-	GPConnection *con = &gpCon;
-	gpInitialize( con, 823, 0, GP_PARTNERID_GAMESPY );
-	m_isConnected = m_isConnecting = false;
-
-	gpSetCallback( con, GP_ERROR,								callbackWrapper,	(void *)CALLBACK_ERROR );
-	gpSetCallback( con, GP_RECV_BUDDY_MESSAGE,	callbackWrapper,	(void *)CALLBACK_RECVMESSAGE );
-	gpSetCallback( con, GP_RECV_BUDDY_REQUEST,	callbackWrapper,	(void *)CALLBACK_RECVREQUEST );
-	gpSetCallback( con, GP_RECV_BUDDY_STATUS,		callbackWrapper,	(void *)CALLBACK_RECVSTATUS );
-
-	GPEnum lastStatus = GP_OFFLINE;
-	std::string lastStatusString;
-
-	BuddyRequest incomingRequest;
-	while ( running )
-	{
-		// deal with requests
-		if (TheGameSpyBuddyMessageQueue->getRequest(incomingRequest))
-		{
-			switch (incomingRequest.buddyRequestType)
-			{
-			case BuddyRequest::BUDDYREQUEST_LOGIN:
-				m_isConnecting = true;
-				m_nick = incomingRequest.arg.login.nick;
-				m_email = incomingRequest.arg.login.email;
-				m_pass = incomingRequest.arg.login.password;
-				m_isConnected = (gpConnect( con, incomingRequest.arg.login.nick, incomingRequest.arg.login.email,
-					incomingRequest.arg.login.password, (incomingRequest.arg.login.hasFirewall)?GP_FIREWALL:GP_NO_FIREWALL,
-					GP_BLOCKING, callbackWrapper, (void *)CALLBACK_CONNECT ) == GP_NO_ERROR);
-				m_isConnecting = false;
-				break;
-
-			case BuddyRequest::BUDDYREQUEST_RELOGIN:
-				m_isConnecting = true;
-				m_isConnected = (gpConnect( con, m_nick.c_str(), m_email.c_str(), m_pass.c_str(), GP_FIREWALL,
-					GP_BLOCKING, callbackWrapper, (void *)CALLBACK_CONNECT ) == GP_NO_ERROR);
-				m_isConnecting = false;
-				break;
-			case BuddyRequest::BUDDYREQUEST_DELETEACCT:
-				m_isdeleting =  true;
-				// TheSuperHackers @tweak OmniBlade API was updated since Generals released to require a callback. Passing -1 will make our wrapper ignore this.
-				gpDeleteProfile( con, callbackWrapper, (void *)(-1) );
-				break;
-			case BuddyRequest::BUDDYREQUEST_LOGOUT:
-				m_isConnecting = m_isConnected = false;
-				gpDisconnect( con );
-				break;
-			case BuddyRequest::BUDDYREQUEST_MESSAGE:
-				{
-					std::string s = WideCharStringToMultiByte( incomingRequest.arg.message.text );
-					DEBUG_LOG(("Sending a buddy message to %d [%s]\n", incomingRequest.arg.message.recipient, s.c_str()));
-					gpSendBuddyMessage( con, incomingRequest.arg.message.recipient, s.c_str() );
-				}
-				break;
-			case BuddyRequest::BUDDYREQUEST_LOGINNEW:
-				{
-					m_isConnecting = true;
-					m_nick = incomingRequest.arg.login.nick;
-					m_email = incomingRequest.arg.login.email;
-					m_pass = incomingRequest.arg.login.password;
-					m_isNewAccount = TRUE;
-					// TheSuperHackers @tweak OmniBlade API was updated since Generals release to require uniquenick which is the same as nick and cdkey is an empty string here.
-					m_isConnected = (gpConnectNewUser( con, incomingRequest.arg.login.nick, incomingRequest.arg.login.nick, incomingRequest.arg.login.email,
-						incomingRequest.arg.login.password, "", (incomingRequest.arg.login.hasFirewall)?GP_FIREWALL:GP_NO_FIREWALL,
-						GP_BLOCKING, callbackWrapper, (void *)CALLBACK_CONNECT ) == GP_NO_ERROR);
-					if (m_isNewAccount) // if we didn't re-login
-					{
-						gpSetInfoMask( con, GP_MASK_NONE ); // don't share info
-					}
-					m_isConnecting = false;
-				}
-				break;
-			case BuddyRequest::BUDDYREQUEST_ADDBUDDY:
-				{
-					std::string s = WideCharStringToMultiByte( incomingRequest.arg.addbuddy.text );
-					gpSendBuddyRequest( con, incomingRequest.arg.addbuddy.id, s.c_str() );
-				}
-				break;
-			case BuddyRequest::BUDDYREQUEST_DELBUDDY:
-				{
-					gpDeleteBuddy( con, incomingRequest.arg.profile.id );
-				}
-				break;
-			case BuddyRequest::BUDDYREQUEST_OKADD:
-				{
-					gpAuthBuddyRequest( con, incomingRequest.arg.profile.id );
-				}
-				break;
-			case BuddyRequest::BUDDYREQUEST_DENYADD:
-				{
-					gpDenyBuddyRequest( con, incomingRequest.arg.profile.id );
-				}
-			case BuddyRequest::BUDDYREQUEST_SETSTATUS:
-				{
-					//don't blast our 'Loading' status with 'Online'.
-					if (lastStatus == GP_PLAYING && lastStatusString == "Loading" && incomingRequest.arg.status.status == GP_ONLINE)
-						break;
-
-					DEBUG_LOG(("BUDDYREQUEST_SETSTATUS: status is now %d:%s/%s\n",
-						incomingRequest.arg.status.status, incomingRequest.arg.status.statusString, incomingRequest.arg.status.locationString));
-					gpSetStatus( con, incomingRequest.arg.status.status, incomingRequest.arg.status.statusString,
-						incomingRequest.arg.status.locationString );
-					lastStatus = incomingRequest.arg.status.status;
-					lastStatusString = incomingRequest.arg.status.statusString;
-				}
-				break;
-			}
-		}
-
-		// update the network
-		GPEnum isConnected = GP_CONNECTED;
-		GPResult res = GP_NO_ERROR;
-		res = gpIsConnected( con, &isConnected );
-		if ( isConnected == GP_CONNECTED && res == GP_NO_ERROR )
-			gpProcess( con );
-
-		// end our timeslice
-		Switch_Thread();
-	}
-
-	gpDestroy( con );
-	} catch ( ... ) {
-		DEBUG_CRASH(("Exception in buddy thread!"));
-	}
-}
-
-void BuddyThreadClass::errorCallback( GPConnection *con, GPErrorArg *arg )
-{
-	// log the error
-	DEBUG_LOG(("GPErrorCallback\n"));
-	m_lastErrorCode = arg->errorCode;
-
-	char errorCodeString[256];
-	char resultString[256];
-
-	#define RESULT(x) case x: strcpy(resultString, #x); break;
-	switch(arg->result)
-	{
-		RESULT(GP_NO_ERROR)
-		RESULT(GP_MEMORY_ERROR)
-		RESULT(GP_PARAMETER_ERROR)
-		RESULT(GP_NETWORK_ERROR)
-		RESULT(GP_SERVER_ERROR)
-	default:
-		strcpy(resultString, "Unknown result!");
-	}
-	#undef RESULT
-
-	#define ERRORCODE(x) case x: strcpy(errorCodeString, #x); break;
-	switch(arg->errorCode)
-	{
-		ERRORCODE(GP_GENERAL)
-		ERRORCODE(GP_PARSE)
-		ERRORCODE(GP_NOT_LOGGED_IN)
-		ERRORCODE(GP_BAD_SESSKEY)
-		ERRORCODE(GP_DATABASE)
-		ERRORCODE(GP_NETWORK)
-		ERRORCODE(GP_FORCED_DISCONNECT)
-		ERRORCODE(GP_CONNECTION_CLOSED)
-		ERRORCODE(GP_LOGIN)
-		ERRORCODE(GP_LOGIN_TIMEOUT)
-		ERRORCODE(GP_LOGIN_BAD_NICK)
-		ERRORCODE(GP_LOGIN_BAD_EMAIL)
-		ERRORCODE(GP_LOGIN_BAD_PASSWORD)
-		ERRORCODE(GP_LOGIN_BAD_PROFILE)
-		ERRORCODE(GP_LOGIN_PROFILE_DELETED)
-		ERRORCODE(GP_LOGIN_CONNECTION_FAILED)
-		ERRORCODE(GP_LOGIN_SERVER_AUTH_FAILED)
-		ERRORCODE(GP_NEWUSER)
-		ERRORCODE(GP_NEWUSER_BAD_NICK)
-		ERRORCODE(GP_NEWUSER_BAD_PASSWORD)
-		ERRORCODE(GP_UPDATEUI)
-		ERRORCODE(GP_UPDATEUI_BAD_EMAIL)
-		ERRORCODE(GP_NEWPROFILE)
-		ERRORCODE(GP_NEWPROFILE_BAD_NICK)
-		ERRORCODE(GP_NEWPROFILE_BAD_OLD_NICK)
-		ERRORCODE(GP_UPDATEPRO)
-		ERRORCODE(GP_UPDATEPRO_BAD_NICK)
-		ERRORCODE(GP_ADDBUDDY)
-		ERRORCODE(GP_ADDBUDDY_BAD_FROM)
-		ERRORCODE(GP_ADDBUDDY_BAD_NEW)
-		ERRORCODE(GP_ADDBUDDY_ALREADY_BUDDY)
-		ERRORCODE(GP_AUTHADD)
-		ERRORCODE(GP_AUTHADD_BAD_FROM)
-		ERRORCODE(GP_AUTHADD_BAD_SIG)
-		ERRORCODE(GP_STATUS)
-		ERRORCODE(GP_BM)
-		ERRORCODE(GP_BM_NOT_BUDDY)
-		ERRORCODE(GP_GETPROFILE)
-		ERRORCODE(GP_GETPROFILE_BAD_PROFILE)
-		ERRORCODE(GP_DELBUDDY)
-		ERRORCODE(GP_DELBUDDY_NOT_BUDDY)
-		ERRORCODE(GP_DELPROFILE)
-		ERRORCODE(GP_DELPROFILE_LAST_PROFILE)
-		ERRORCODE(GP_SEARCH)
-		ERRORCODE(GP_SEARCH_CONNECTION_FAILED)
-	default:
-		strcpy(errorCodeString, "Unknown error code!");
-	}
-	#undef ERRORCODE
-
-	if(arg->fatal)
-	{
-		DEBUG_LOG(( "-----------\n"));
-		DEBUG_LOG(( "GP FATAL ERROR\n"));
-		DEBUG_LOG(( "-----------\n"));
-	}
-	else
-	{
-		DEBUG_LOG(( "-----\n"));
-		DEBUG_LOG(( "GP ERROR\n"));
-		DEBUG_LOG(( "-----\n"));
-	}
-	DEBUG_LOG(( "RESULT: %s (%d)\n", resultString, arg->result));
-	DEBUG_LOG(( "ERROR CODE: %s (0x%X)\n", errorCodeString, arg->errorCode));
-	DEBUG_LOG(( "ERROR STRING: %s\n", arg->errorString));
-
-	if (arg->fatal == GP_FATAL)
-	{
-		BuddyResponse errorResponse;
-		errorResponse.buddyResponseType = BuddyResponse::BUDDYRESPONSE_DISCONNECT;
-		errorResponse.result = arg->result;
-		errorResponse.arg.error.errorCode = arg->errorCode;
-		errorResponse.arg.error.fatal = arg->fatal;
-		strncpy(errorResponse.arg.error.errorString, arg->errorString, MAX_BUDDY_CHAT_LEN);
-		errorResponse.arg.error.errorString[MAX_BUDDY_CHAT_LEN-1] = 0;
-		m_isConnecting = m_isConnected = false;
-		TheGameSpyBuddyMessageQueue->addResponse( errorResponse );
-		if (m_isdeleting)
-		{
-			PeerRequest req;
-			req.peerRequestType = PeerRequest::PEERREQUEST_LOGOUT;
-			TheGameSpyPeerMessageQueue->addRequest( req );
-			m_isdeleting = false;
-		}
-	}
-}
-
-static void getNickForMessage( GPConnection *con, GPGetInfoResponseArg *arg, void *param )
-{
-	BuddyResponse *resp = (BuddyResponse *)param;
-	strcpy(resp->arg.message.nick, arg->nick);
-}
-
-void BuddyThreadClass::messageCallback( GPConnection *con, GPRecvBuddyMessageArg *arg )
-{
-	BuddyResponse messageResponse;
-	messageResponse.buddyResponseType = BuddyResponse::BUDDYRESPONSE_MESSAGE;
-	messageResponse.profile = arg->profile;
-
-	// get info about the person asking to be our buddy
-	gpGetInfo( con, arg->profile, GP_CHECK_CACHE, GP_BLOCKING, (GPCallback)getNickForMessage, &messageResponse);
-
-	std::wstring s = MultiByteToWideCharSingleLine( arg->message );
-	wcsncpy(messageResponse.arg.message.text, s.c_str(), MAX_BUDDY_CHAT_LEN);
-	messageResponse.arg.message.text[MAX_BUDDY_CHAT_LEN-1] = 0;
-	messageResponse.arg.message.date = arg->date;
-	DEBUG_LOG(("Got a buddy message from %d [%ls]\n", arg->profile, s.c_str()));
-	TheGameSpyBuddyMessageQueue->addResponse( messageResponse );
-}
-
-void BuddyThreadClass::connectCallback( GPConnection *con, GPConnectResponseArg *arg )
-{
-	BuddyResponse loginResponse;
-	if (arg->result == GP_NO_ERROR)
-	{
-		loginResponse.buddyResponseType = BuddyResponse::BUDDYRESPONSE_LOGIN;
-		loginResponse.result = arg->result;
-		loginResponse.profile = arg->profile;
-		TheGameSpyBuddyMessageQueue->addResponse( loginResponse );
-		m_profileID = arg->profile;
-
-		if (!TheGameSpyPeerMessageQueue->isConnected() && !TheGameSpyPeerMessageQueue->isConnecting())
-		{
-			DEBUG_LOG(("Buddy connect: trying chat connect\n"));
-			PeerRequest req;
-			req.peerRequestType = PeerRequest::PEERREQUEST_LOGIN;
-			req.nick = m_nick;
-			req.password = m_pass;
-			req.email = m_email;
-			req.login.profileID = arg->profile;
-			TheGameSpyPeerMessageQueue->addRequest(req);
-		}
-	}
-	else
-	{
-		if (!TheGameSpyPeerMessageQueue->isConnected() && !TheGameSpyPeerMessageQueue->isConnecting())
-		{
-			if (m_lastErrorCode == GP_NEWUSER_BAD_NICK)
-			{
-				m_isNewAccount = FALSE;
-				// they just hit 'create account' instead of 'log in'.  Fix them.
-				DEBUG_LOG(("User Error: Create Account instead of Login.  Fixing them...\n"));
-				BuddyRequest req;
-				req.buddyRequestType = BuddyRequest::BUDDYREQUEST_LOGIN;
-				strcpy(req.arg.login.nick, m_nick.c_str());
-				strcpy(req.arg.login.email, m_email.c_str());
-				strcpy(req.arg.login.password, m_pass.c_str());
-				req.arg.login.hasFirewall = true;
-				TheGameSpyBuddyMessageQueue->addRequest( req );
-				return;
-			}
-			DEBUG_LOG(("Buddy connect failed (%d/%d): posting a failed chat connect\n", arg->result, m_lastErrorCode));
-			PeerResponse resp;
-			resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
-			resp.discon.reason = DISCONNECT_COULDNOTCONNECT;
-			switch (m_lastErrorCode)
-			{
-			case GP_LOGIN_TIMEOUT:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_TIMEOUT;
-				break;
-			case GP_LOGIN_BAD_NICK:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_BAD_NICK;
-				break;
-			case GP_LOGIN_BAD_EMAIL:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_BAD_EMAIL;
-				break;
-			case GP_LOGIN_BAD_PASSWORD:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_BAD_PASSWORD;
-				break;
-			case GP_LOGIN_BAD_PROFILE:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_BAD_PROFILE;
-				break;
-			case GP_LOGIN_PROFILE_DELETED:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_PROFILE_DELETED;
-				break;
-			case GP_LOGIN_CONNECTION_FAILED:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_CONNECTION_FAILED;
-				break;
-			case GP_LOGIN_SERVER_AUTH_FAILED:
-				resp.discon.reason = DISCONNECT_GP_LOGIN_SERVER_AUTH_FAILED;
-				break;
-			case GP_NEWUSER_BAD_NICK:
-				resp.discon.reason = DISCONNECT_GP_NEWUSER_BAD_NICK;
-				break;
-			case GP_NEWUSER_BAD_PASSWORD:
-				resp.discon.reason = DISCONNECT_GP_NEWUSER_BAD_PASSWORD;
-				break;
-			case GP_NEWPROFILE_BAD_NICK:
-				resp.discon.reason = DISCONNECT_GP_NEWPROFILE_BAD_NICK;
-				break;
-			case GP_NEWPROFILE_BAD_OLD_NICK:
-				resp.discon.reason = DISCONNECT_GP_NEWPROFILE_BAD_OLD_NICK;
-				break;
-			}
-			TheGameSpyPeerMessageQueue->addResponse(resp);
-		}
-	}
-}
-
-// -----------------------
-
-static void getInfoResponseForRequest( GPConnection *con, GPGetInfoResponseArg *arg, void *param )
-{
-	BuddyResponse *resp = (BuddyResponse *)param;
-	resp->profile = arg->profile;
-	strcpy(resp->arg.request.nick, arg->nick);
-	strcpy(resp->arg.request.email, arg->email);
-	strcpy(resp->arg.request.countrycode, arg->countrycode);
-}
-
-void BuddyThreadClass::requestCallback( GPConnection *con, GPRecvBuddyRequestArg *arg )
-{
-	BuddyResponse response;
-	response.buddyResponseType = BuddyResponse::BUDDYRESPONSE_REQUEST;
-	response.profile = arg->profile;
-
-	// get info about the person asking to be our buddy
-	gpGetInfo( con, arg->profile, GP_CHECK_CACHE, GP_BLOCKING, (GPCallback)getInfoResponseForRequest, &response);
-
-	std::wstring s = MultiByteToWideCharSingleLine( arg->reason );
-	wcsncpy(response.arg.request.text, s.c_str(), GP_REASON_LEN);
-	response.arg.request.text[GP_REASON_LEN-1] = 0;
-
-	TheGameSpyBuddyMessageQueue->addResponse( response );
-}
-
-// -----------------------
-
-static void getInfoResponseForStatus(GPConnection * connection, GPGetInfoResponseArg * arg, void * param)
-{
-	BuddyResponse *resp = (BuddyResponse *)param;
-	resp->profile = arg->profile;
-	strcpy(resp->arg.status.nick, arg->nick);
-	strcpy(resp->arg.status.email, arg->email);
-	strcpy(resp->arg.status.countrycode, arg->countrycode);
-}
-
-void BuddyThreadClass::statusCallback( GPConnection *con, GPRecvBuddyStatusArg *arg )
-{
-	BuddyResponse response;
-
-	// get user's name
-	response.buddyResponseType = BuddyResponse::BUDDYRESPONSE_STATUS;
-	gpGetInfo( con, arg->profile, GP_CHECK_CACHE, GP_BLOCKING, (GPCallback)getInfoResponseForStatus, &response);
-
-	// get user's status
-	GPBuddyStatus status;
-	gpGetBuddyStatus( con, arg->index, &status );
-	strcpy(response.arg.status.location, status.locationString);
-	strcpy(response.arg.status.statusString, status.statusString);
-	response.arg.status.status = status.status;
-	DEBUG_LOG(("Got buddy status for %d(%s) - status %d\n", status.profile, response.arg.status.nick, status.status));
-
-	// relay to UI
-	TheGameSpyBuddyMessageQueue->addResponse( response );
-}
-
-
-//-------------------------------------------------------------------------
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
deleted file mode 100644
index a08f9535ff5..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PingThread.cpp //////////////////////////////////////////////////////
-// Ping thread
-// Author: Matthew D. Campbell, August 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include <winsock.h>	// This one has to be here. Prevents collisions with winsock2.h
-
-#include "GameNetwork/GameSpy/GameResultsThread.h"
-#include "mutex.h"
-#include "thread.h"
-
-#include "Common/StackDump.h"
-#include "Common/SubsystemInterface.h"
-
-//-------------------------------------------------------------------------
-
-static const Int NumWorkerThreads = 1;
-
-typedef std::queue<GameResultsRequest> RequestQueue;
-typedef std::queue<GameResultsResponse> ResponseQueue;
-class GameResultsThreadClass;
-
-class GameResultsQueue : public GameResultsInterface
-{
-public:
-	virtual ~GameResultsQueue();
-	GameResultsQueue();
-
-	virtual void init() {}
-	virtual void reset() {}
-	virtual void update() {}
-
-	virtual void startThreads( void );
-	virtual void endThreads( void );
-	virtual Bool areThreadsRunning( void );
-
-	virtual void addRequest( const GameResultsRequest& req );
-	virtual Bool getRequest( GameResultsRequest& resp );
-
-	virtual void addResponse( const GameResultsResponse& resp );
-	virtual Bool getResponse( GameResultsResponse& resp );
-
-	virtual Bool areGameResultsBeingSent( void );
-
-private:
-	MutexClass m_requestMutex;
-	MutexClass m_responseMutex;
-	RequestQueue m_requests;
-	ResponseQueue m_responses;
-	Int m_requestCount;
-	Int m_responseCount;
-
-	GameResultsThreadClass *m_workerThreads[NumWorkerThreads];
-};
-
-GameResultsInterface* GameResultsInterface::createNewGameResultsInterface( void )
-{
-	return NEW GameResultsQueue;
-}
-
-GameResultsInterface *TheGameResultsQueue;
-
-//-------------------------------------------------------------------------
-
-class GameResultsThreadClass : public ThreadClass
-{
-
-public:
-	GameResultsThreadClass() : ThreadClass() {}
-
-	void Thread_Function();
-
-private:
-	Int sendGameResults( UnsignedInt IP, UnsignedShort port, const std::string& results );
-};
-
-
-//-------------------------------------------------------------------------
-
-GameResultsQueue::GameResultsQueue() : m_requestCount(0), m_responseCount(0)
-{
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		m_workerThreads[i] = NULL;
-	}
-
-	startThreads();
-}
-
-GameResultsQueue::~GameResultsQueue()
-{
-	endThreads();
-}
-
-void GameResultsQueue::startThreads( void )
-{
-	endThreads();
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		m_workerThreads[i] = NEW GameResultsThreadClass;
-		m_workerThreads[i]->Execute();
-	}
-}
-
-void GameResultsQueue::endThreads( void )
-{
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		if (m_workerThreads[i])
-		{
-			delete m_workerThreads[i];
-			m_workerThreads[i] = NULL;
-		}
-	}
-}
-
-Bool GameResultsQueue::areThreadsRunning( void )
-{
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		if (m_workerThreads[i])
-		{
-			if (m_workerThreads[i]->Is_Running())
-				return true;
-		}
-	}
-	return false;
-}
-
-void GameResultsQueue::addRequest( const GameResultsRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex);
-
-	++m_requestCount;
-	m_requests.push(req);
-}
-
-Bool GameResultsQueue::getRequest( GameResultsRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_requests.empty())
-		return false;
-	req = m_requests.front();
-	m_requests.pop();
-	return true;
-}
-
-void GameResultsQueue::addResponse( const GameResultsResponse& resp )
-{
-	{
-		MutexClass::LockClass m(m_responseMutex);
-
-		++m_responseCount;
-		m_responses.push(resp);
-	}
-}
-
-Bool GameResultsQueue::getResponse( GameResultsResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_responses.empty())
-		return false;
-	resp = m_responses.front();
-	m_responses.pop();
-	return true;
-}
-
-Bool GameResultsQueue::areGameResultsBeingSent( void )
-{
-	MutexClass::LockClass m(m_requestMutex, 0);
-	if (m.Failed())
-		return true;
-
-	return m_requestCount > 0;
-}
-
-//-------------------------------------------------------------------------
-
-void GameResultsThreadClass::Thread_Function()
-{
-	try {
-	_set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
-	GameResultsRequest req;
-
-	WSADATA wsaData;
-
-	// Fire up winsock (prob already done, but doesn't matter)
-	WORD wVersionRequested = MAKEWORD(1, 1);
-	WSAStartup( wVersionRequested, &wsaData );
-
-	while ( running )
-	{
-		// deal with requests
-		if (TheGameResultsQueue && TheGameResultsQueue->getRequest(req))
-		{
-			// resolve the hostname
-			const char *hostnameBuffer = req.hostname.c_str();
-			UnsignedInt IP = 0xFFFFFFFF;
-			if (isdigit(hostnameBuffer[0]))
-			{
-				IP = inet_addr(hostnameBuffer);
-				in_addr hostNode;
-				hostNode.s_addr = IP;
-				DEBUG_LOG(("sending game results to %s - IP = %s\n", hostnameBuffer, inet_ntoa(hostNode) ));
-			}
-			else
-			{
-				HOSTENT *hostStruct;
-				in_addr *hostNode;
-				hostStruct = gethostbyname(hostnameBuffer);
-				if (hostStruct == NULL)
-				{
-					DEBUG_LOG(("sending game results to %s - host lookup failed\n", hostnameBuffer));
-					
-					// Even though this failed to resolve IP, still need to send a
-					//   callback.
-					IP = 0xFFFFFFFF;   // flag for IP resolve failed
-				}
-				hostNode = (in_addr *) hostStruct->h_addr;
-				IP = hostNode->s_addr;
-				DEBUG_LOG(("sending game results to %s IP = %s\n", hostnameBuffer, inet_ntoa(*hostNode) ));
-			}
-
-			int result = sendGameResults( IP, req.port, req.results );
-			GameResultsResponse resp;
-			resp.hostname = req.hostname;
-			resp.port = req.port;
-			resp.sentOk = (result == req.results.length());
-
-		}
-
-		// end our timeslice
-		Switch_Thread();
-	}
-
-	WSACleanup();
-	} catch ( ... ) {
-		DEBUG_CRASH(("Exception in results thread!"));
-	}
-}
-
-//-------------------------------------------------------------------------
-
-#ifdef DEBUG_LOGGING
-#define CASE(x) case (x): return #x;
-
-static const char *getWSAErrorString( Int error )
-{
-	switch (error)
-	{
-		CASE(WSABASEERR)
-		CASE(WSAEINTR)
-		CASE(WSAEBADF)
-		CASE(WSAEACCES)
-		CASE(WSAEFAULT)
-		CASE(WSAEINVAL)
-		CASE(WSAEMFILE)
-		CASE(WSAEWOULDBLOCK)
-		CASE(WSAEINPROGRESS)
-		CASE(WSAEALREADY)
-		CASE(WSAENOTSOCK)
-		CASE(WSAEDESTADDRREQ)
-		CASE(WSAEMSGSIZE)
-		CASE(WSAEPROTOTYPE)
-		CASE(WSAENOPROTOOPT)
-		CASE(WSAEPROTONOSUPPORT)
-		CASE(WSAESOCKTNOSUPPORT)
-		CASE(WSAEOPNOTSUPP)
-		CASE(WSAEPFNOSUPPORT)
-		CASE(WSAEAFNOSUPPORT)
-		CASE(WSAEADDRINUSE)
-		CASE(WSAEADDRNOTAVAIL)
-		CASE(WSAENETDOWN)
-		CASE(WSAENETUNREACH)
-		CASE(WSAENETRESET)
-		CASE(WSAECONNABORTED)
-		CASE(WSAECONNRESET)
-		CASE(WSAENOBUFS)
-		CASE(WSAEISCONN)
-		CASE(WSAENOTCONN)
-		CASE(WSAESHUTDOWN)
-		CASE(WSAETOOMANYREFS)
-		CASE(WSAETIMEDOUT)
-		CASE(WSAECONNREFUSED)
-		CASE(WSAELOOP)
-		CASE(WSAENAMETOOLONG)
-		CASE(WSAEHOSTDOWN)
-		CASE(WSAEHOSTUNREACH)
-		CASE(WSAENOTEMPTY)
-		CASE(WSAEPROCLIM)
-		CASE(WSAEUSERS)
-		CASE(WSAEDQUOT)
-		CASE(WSAESTALE)
-		CASE(WSAEREMOTE)
-		CASE(WSAEDISCON)
-		CASE(WSASYSNOTREADY)
-		CASE(WSAVERNOTSUPPORTED)
-		CASE(WSANOTINITIALISED)
-		CASE(WSAHOST_NOT_FOUND)
-		CASE(WSATRY_AGAIN)
-		CASE(WSANO_RECOVERY)
-		CASE(WSANO_DATA)
-		default:
-			return "Not a Winsock error";
-	}
-}
-
-#undef CASE
-
-#endif
-//-------------------------------------------------------------------------
-
-Int GameResultsThreadClass::sendGameResults( UnsignedInt IP, UnsignedShort port, const std::string& results )
-{
-	int error = 0;
-
-	// create the socket
-	Int sock = socket( AF_INET, SOCK_STREAM, 0 );
-	if (sock < 0)
-	{
-		DEBUG_LOG(("GameResultsThreadClass::sendGameResults() - socket() returned %d(%s)\n", sock, getWSAErrorString(sock)));
-		return sock;
-	}
-
-	// fill in address info
-	struct sockaddr_in sockAddr;
-	memset( &sockAddr, 0, sizeof( sockAddr ) );
-	sockAddr.sin_family = AF_INET;
-	sockAddr.sin_addr.s_addr = IP;
-	sockAddr.sin_port = htons(port);
-
-	// Start the connection process....
-	if( connect( sock, (struct sockaddr *)&sockAddr, sizeof( sockAddr ) ) == -1 )
-	{
-		error = WSAGetLastError();
-		DEBUG_LOG(("GameResultsThreadClass::sendGameResults() - connect() returned %d(%s)\n", error, getWSAErrorString(error)));
-		if( ( error == WSAEWOULDBLOCK ) || ( error == WSAEINVAL ) || ( error == WSAEALREADY ) )
-		{
-			return( -1 );
-		}
-
-		if( error != WSAEISCONN )
-		{
-			closesocket( sock );
-			return( -1 );
-		}
-	}
-
-	if (send( sock, results.c_str(), results.length(), 0 ) == SOCKET_ERROR)
-	{
-		error = WSAGetLastError();
-		DEBUG_LOG(("GameResultsThreadClass::sendGameResults() - send() returned %d(%s)\n", error, getWSAErrorString(error)));
-		closesocket(sock);
-		return WSAGetLastError();
-	}
-
-	closesocket(sock);
-
-	return results.length();
-}
-
-
-//-------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
deleted file mode 100644
index cc840dfc7b4..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
+++ /dev/null
@@ -1,2981 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PeerThread.cpp //////////////////////////////////////////////////////
-// GameSpy Peer (chat) thread
-// This thread communicates with GameSpy's chat server
-// and talks through a message queue with the rest of
-// the game.
-// Author: Matthew D. Campbell, June 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/Registry.h"
-#include "Common/StackDump.h"
-#include "Common/UserPreferences.h"
-#include "Common/version.h"
-#include "GameNetwork/IPEnumeration.h"
-#include "GameNetwork/GameSpy/BuddyThread.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/ThreadUtils.h"
-
-#include "strtok_r.h"
-#include "mutex.h"
-#include "thread.h"
-
-#include "Common/MiniLog.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// enable this for trying to track down why SBServers are losing their keyvals  -MDC 2/20/2003
-#undef SERVER_DEBUGGING
-#ifdef SERVER_DEBUGGING
-void CheckServers(PEER peer);
-#endif // SERVER_DEBUGGING
-
-#ifdef DEBUG_LOGGING
-//#define PING_TEST
-static LogClass s_pingLog("Ping.txt");
-#define PING_LOG(x) s_pingLog.log x
-#else // DEBUG_LOGGING
-#define PING_LOG(x) {}
-#endif // DEBUG_LOGGING
-
-#ifdef DEBUG_LOGGING
-static LogClass s_stateChangedLog("StateChanged.txt");
-
-#define STATECHANGED_LOG(x) s_stateChangedLog.log x
-
-#else // DEBUG_LOGGING
-
-#define STATECHANGED_LOG(x) {}
-
-#endif // DEBUG_LOGGING
-
-// we should always be using broadcast keys from now on.  Remove the old code sometime when
-// we're not in a rush, ok?
-// -MDC 2/14/2003
-#define USE_BROADCAST_KEYS
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-int isThreadHosting = 0;
-static UnsignedInt s_lastStateChangedHeartbeat = 0;
-static Bool s_wantStateChangedHeartbeat = FALSE;
-static UnsignedInt s_heartbeatInterval = 10000;
-
-static SOCKET qr2Sock = INVALID_SOCKET;
-
-enum
-{
-	EXECRC_KEY = NUM_RESERVED_KEYS + 1,
-	INICRC_KEY,
-	PW_KEY,
-	OBS_KEY,
-  USE_STATS_KEY,
-	LADIP_KEY,
-	LADPORT_KEY,
-	PINGSTR_KEY,
-	NUMPLAYER_KEY,
-	MAXPLAYER_KEY,
-	NUMOBS_KEY,
-	NAME__KEY,
-	FACTION__KEY,
-	COLOR__KEY,
-	WINS__KEY,
-	LOSSES__KEY
-};
-
-#define EXECRC_STR		"exeCRC"
-#define INICRC_STR		"iniCRC"
-#define PW_STR				"pw"
-#define OBS_STR				"obs"
-#define USE_STATS_STR "stat"
-#define LADIP_STR			"ladIP"
-#define LADPORT_STR		"ladPort"
-#define PINGSTR_STR		"pings"
-#define NUMPLAYER_STR	"numRealPlayers"
-#define MAXPLAYER_STR	"maxRealPlayers"
-#define NUMOBS_STR		"numObservers"
-#define NAME__STR			"name"
-#define FACTION__STR	"faction"
-#define COLOR__STR		"color"
-#define WINS__STR			"wins"
-#define LOSSES__STR		"losses"
-
-//-------------------------------------------------------------------------
-
-typedef std::queue<PeerRequest> RequestQueue;
-typedef std::queue<PeerResponse> ResponseQueue;
-class PeerThreadClass;
-
-class GameSpyPeerMessageQueue : public GameSpyPeerMessageQueueInterface
-{
-public:
-	virtual ~GameSpyPeerMessageQueue();
-	GameSpyPeerMessageQueue();
-	virtual void startThread( void );
-	virtual void endThread( void );
-	virtual Bool isThreadRunning( void );
-	virtual Bool isConnected( void );
-	virtual Bool isConnecting( void );
-
-	virtual void addRequest( const PeerRequest& req );
-	virtual Bool getRequest( PeerRequest& req );
-
-	virtual void addResponse( const PeerResponse& resp );
-	virtual Bool getResponse( PeerResponse& resp );
-
-	virtual SerialAuthResult getSerialAuthResult( void ) { return m_serialAuth; }
-	void setSerialAuthResult( SerialAuthResult result ) { m_serialAuth = result; }
-
-	PeerThreadClass* getThread( void );
-
-private:
-	MutexClass m_requestMutex;
-	MutexClass m_responseMutex;
-	RequestQueue m_requests;
-	ResponseQueue m_responses;
-	PeerThreadClass *m_thread;
-
-	SerialAuthResult m_serialAuth;
-};
-
-GameSpyPeerMessageQueueInterface* GameSpyPeerMessageQueueInterface::createNewMessageQueue( void )
-{
-	return NEW GameSpyPeerMessageQueue;
-}
-
-GameSpyPeerMessageQueueInterface *TheGameSpyPeerMessageQueue;
-#define MESSAGE_QUEUE ((GameSpyPeerMessageQueue *)TheGameSpyPeerMessageQueue)
-
-//-------------------------------------------------------------------------
-
-class PeerThreadClass : public ThreadClass
-{
-
-public:
-	PeerThreadClass() : ThreadClass()
-	{
-		//Added By Sadullah Nader
-		//Initializations inserted
-		m_roomJoined = m_allowObservers = m_hasPassword = FALSE;
-    m_useStats = TRUE;
-		m_exeCRC = m_iniCRC = 0;
-		m_gameVersion = 0;
-		m_ladderPort = 0;
-		m_localRoomID = 0;
-		m_maxPlayers = 0;
-		m_numObservers = 0;
-		m_maxPlayers = 0;
-		m_qmGroupRoom = 0;
-		m_sawEndOfEnumPlayers = m_sawMatchbot = FALSE;
-		m_sawCompleteGameList = FALSE;
-		//
-		m_isConnecting = m_isConnected = false; 
-		m_groupRoomID = m_profileID = 0;
-		m_nextStagingServer = 1; m_stagingServers.clear();
-		m_pingStr = ""; m_mapName = ""; m_ladderIP = ""; m_isHosting = false;
-		for (Int i=0; i<MAX_SLOTS; ++i)
-		{
-			m_playerNames[i] = "";
-			
-			//Added by Sadullah Nader
-			//Initializations 
-			m_playerColors[i] = 0;
-			m_playerFactions[i] = 0;
-			m_playerLosses[i] = 0;
-			m_playerProfileID[i] = 0;
-			m_playerWins[i] = 0;
-
-			//
-		}
-	}
-
-	void Thread_Function();
-
-	void markAsDisconnected( void ) { m_isConnecting = m_isConnected = false; }
-
-	void connectCallback( PEER peer, PEERBool success );
-	void nickErrorCallback( PEER peer, Int type, const char *nick );
-
-	Bool isConnecting( void ) { return m_isConnecting; }
-	Bool isConnected( void ) { return m_isConnected; }
-
-	Int addServerToMap( SBServer server );
-	Int removeServerFromMap( SBServer server );
-	void clearServers( void );
-	SBServer findServerByID( Int id );
-	Int findServer( SBServer server );
-
-	// get info about the game we are hosting
-	Bool isHosting( void ) { return m_isHosting; }
-	void stopHostingAlready(PEER peer);
-	Bool hasPassword( void ) { return m_hasPassword; }
-	Bool allowObservers( void ) { return m_allowObservers; }
-  Bool useStats(void) const { return m_useStats; }
-	std::string getMapName( void ) { return m_mapName; }
-	UnsignedInt exeCRC( void ) { return m_exeCRC; }
-	UnsignedInt iniCRC( void ) { return m_iniCRC; }
-	UnsignedInt gameVersion( void ) { return m_gameVersion; }
-	std::wstring getLocalStagingServerName( void ) { return m_localStagingServerName; }
-	Int getLocalRoomID( void ) { return m_localRoomID; }
-	std::string ladderIP( void ) { return m_ladderIP; }
-	UnsignedShort ladderPort( void ) { return m_ladderPort; }
-	std::string pingStr( void ) { return m_pingStr; }
-	std::string getPlayerName(Int idx) { return m_playerNames[idx]; }
-	Int getPlayerWins(Int idx) { return m_playerWins[idx]; }
-	Int getPlayerLosses(Int idx) { return m_playerLosses[idx]; }
-	Int getPlayerProfileID(Int idx) { return m_playerProfileID[idx]; }
-	Int getPlayerFaction(Int idx) { return m_playerFactions[idx]; }
-	Int getPlayerColor(Int idx) { return m_playerColors[idx]; }
-	Int getNumPlayers(void) { return m_numPlayers; }
-	Int getMaxPlayers(void) { return m_maxPlayers; }
-	Int getNumObservers(void) { return m_numObservers; }
-
-	void roomJoined( Bool val ) { m_roomJoined = val; }
-	void setQMGroupRoom( Int groupID ) { m_qmGroupRoom = groupID; }
-	void sawEndOfEnumPlayers( void ) { m_sawEndOfEnumPlayers = true; }
-	void sawMatchbot( std::string bot ) { m_sawMatchbot = true; m_matchbotName = bot; }
-	QMStatus getQMStatus( void ) { return m_qmStatus; }
-	void handleQMMatch(PEER peer, Int mapIndex, Int seed, char *playerName[MAX_SLOTS], char *playerIP[MAX_SLOTS], char *playerSide[MAX_SLOTS], char *playerColor[MAX_SLOTS], char *playerNAT[MAX_SLOTS]);
-	std::string getQMBotName( void ) { return m_matchbotName; }
-	Int getQMGroupRoom( void ) { return m_qmGroupRoom; }
-	Int getQMLadder( void ) { return m_qmInfo.QM.ladderID; }
-
-	Int getCurrentGroupRoom(void) { return m_groupRoomID; }
-
-#ifdef USE_BROADCAST_KEYS
-	void pushStatsToRoom(PEER peer);
-	void getStatsFromRoom(PEER peer, RoomType roomType);
-	void trackStatsForPlayer(RoomType roomType, const char *nick, const char *key, const char *val);
-	int lookupStatForPlayer(RoomType roomType, const char *nick, const char *key);
-	void clearPlayerStats(RoomType roomType);
-#endif // USE_BROADCAST_KEYS
-
-	void setSawCompleteGameList(Bool val) { m_sawCompleteGameList = val; }
-	Bool getSawCompleteGameList() { return m_sawCompleteGameList; }
-
-private:
-	Bool m_isConnecting;
-	Bool m_isConnected;
-	std::string m_loginName, m_originalName, m_password, m_email;
-	Int m_profileID;
-	Int m_groupRoomID;
-	Bool m_sawCompleteGameList;
-
-#ifdef USE_BROADCAST_KEYS
-	enum { NumKeys = 6, ValBufSize = 20 };
-	static const char *s_keys[NumKeys];
-	static char s_valueBuffers[NumKeys][ValBufSize];
-	static const char *s_values[NumKeys];
-
-	typedef std::map<std::string, int> PlayerStatMap;
-	PlayerStatMap m_groupRoomStats;
-	PlayerStatMap m_stagingRoomStats;
-	std::string packStatKey(const char *nick, const char *key);
-#endif // USE_BROADCAST_KEYS
-
-	// game-hosting info for GOA callbacks
-	Bool m_isHosting;
-	Bool m_hasPassword;
-	std::string m_mapName;
-	std::string m_playerNames[MAX_SLOTS];
-	UnsignedInt m_exeCRC;
-	UnsignedInt m_iniCRC;
-	UnsignedInt m_gameVersion;
-	Bool m_allowObservers;
-  Bool m_useStats;
-	std::string m_pingStr;
-	std::string m_ladderIP;
-	UnsignedShort m_ladderPort;
-	Int m_playerWins[MAX_SLOTS];
-	Int m_playerLosses[MAX_SLOTS];
-	Int m_playerProfileID[MAX_SLOTS];
-	Int m_playerColors[MAX_SLOTS];
-	Int m_playerFactions[MAX_SLOTS];
-	Int m_numPlayers;
-	Int m_maxPlayers;
-	Int m_numObservers;
-
-	Int m_nextStagingServer;
-	std::map<Int, SBServer> m_stagingServers;
-	std::wstring m_localStagingServerName;
-	Int m_localRoomID;
-
-	void doQuickMatch( PEER peer );
-	QMStatus m_qmStatus;
-	PeerRequest m_qmInfo;
-	Bool m_roomJoined;
-	Int m_qmGroupRoom;
-	Bool m_sawEndOfEnumPlayers;
-	Bool m_sawMatchbot;
-	std::string m_matchbotName;
-};
-
-#ifdef USE_BROADCAST_KEYS
-const char* PeerThreadClass::s_keys[6] = { "b_locale", "b_wins", "b_losses", "b_points", "b_side", "b_pre" };
-char PeerThreadClass::s_valueBuffers[6][20] = { "", "", "", "", "", "" };
-const char* PeerThreadClass::s_values[6] = { s_valueBuffers[0], s_valueBuffers[1], s_valueBuffers[2],
-	s_valueBuffers[3], s_valueBuffers[4], s_valueBuffers[5]};
-
-void PeerThreadClass::trackStatsForPlayer(RoomType roomType, const char *nick, const char *key, const char *val)
-{
-	switch (roomType)
-	{
-		case GroupRoom:
-			m_groupRoomStats[packStatKey(nick, key)] = atoi(val);
-			break;
-		case StagingRoom:
-			m_stagingRoomStats[packStatKey(nick, key)] = atoi(val);
-			break;
-	}
-}
-
-std::string PeerThreadClass::packStatKey(const char *nick, const char *key)
-{
-	std::string s = nick;
-	s.append(key);
-	return s;
-}
-
-int PeerThreadClass::lookupStatForPlayer(RoomType roomType, const char *nick, const char *key)
-{
-	std::string fullKey = packStatKey(nick, key);
-	PlayerStatMap::const_iterator it;
-	switch (roomType)
-	{
-		case GroupRoom:
-			it = m_groupRoomStats.find(fullKey);
-			if (it != m_groupRoomStats.end())
-				return it->second;
-			break;
-		case StagingRoom:
-			it = m_stagingRoomStats.find(fullKey);
-			if (it != m_stagingRoomStats.end())
-				return it->second;
-			break;
-	}
-	return 0;
-}
-
-void PeerThreadClass::clearPlayerStats(RoomType roomType)
-{
-	switch (roomType)
-	{
-		case GroupRoom:
-			m_groupRoomStats.clear();
-			break;
-		case StagingRoom:
-			m_stagingRoomStats.clear();
-			break;
-	}
-}
-
-void PeerThreadClass::pushStatsToRoom(PEER peer)
-{
-	DEBUG_LOG(("PeerThreadClass::pushStatsToRoom(): stats are %s=%s,%s=%s,%s=%s,%s=%s,%s=%s,%s=%s\n",
-		s_keys[0], s_values[0],
-		s_keys[1], s_values[1],
-		s_keys[2], s_values[2],
-		s_keys[3], s_values[3],
-		s_keys[4], s_values[4],
-		s_keys[5], s_values[5]));
-	peerSetRoomKeys(peer, GroupRoom, m_loginName.c_str(), 6, s_keys, s_values);
-	peerSetRoomKeys(peer, StagingRoom, m_loginName.c_str(), 6, s_keys, s_values);
-}
-
-void getRoomKeysCallback(PEER peer, PEERBool success, RoomType roomType, const char *nick, int num, char **keys, char **values, void *param);
-void PeerThreadClass::getStatsFromRoom(PEER peer, RoomType roomType)
-{
-	peerGetRoomKeys(peer, GroupRoom, "*", NumKeys, s_keys, getRoomKeysCallback, this, PEERFalse);
-}
-#endif // USE_BROADCAST_KEYS
-
-Int PeerThreadClass::addServerToMap( SBServer server )
-{
-	Int val = m_nextStagingServer++;
-	m_stagingServers[val] = server;
-	return val;
-}
-
-Int PeerThreadClass::removeServerFromMap( SBServer server )
-{
-	for (std::map<Int, SBServer>::iterator it = m_stagingServers.begin(); it != m_stagingServers.end(); ++it)
-	{
-		if (it->second == server)
-		{
-			Int val = it->first;
-			m_stagingServers.erase(it);
-			return val;
-		}
-	}
-
-	return 0;
-}
-
-void PeerThreadClass::clearServers( void )
-{
-	m_stagingServers.clear();
-}
-
-SBServer PeerThreadClass::findServerByID( Int id )
-{
-	std::map<Int, SBServer>::iterator it = m_stagingServers.find(id);
-	if (it != m_stagingServers.end())
-	{
-		SBServer server = it->second;
-		if (server && !server->keyvals)
-		{
-			DEBUG_CRASH(("Referencing a missing server!"));
-			return 0;
-		}
-		return it->second;
-	}
-	return 0;
-}
-
-Int PeerThreadClass::findServer( SBServer server )
-{
-	char tmp[10] = "";
-	const char *newName = SBServerGetStringValue(server, "gamename", tmp);
-	UnsignedInt newPrivateIP = SBServerGetPrivateInetAddress(server);
-	UnsignedShort newPrivatePort = SBServerGetPrivateQueryPort(server);
-	UnsignedInt newPublicIP = SBServerGetPublicInetAddress(server);
-
-	SBServer serverToRemove = NULL;
-
-	for (std::map<Int, SBServer>::iterator it = m_stagingServers.begin(); it != m_stagingServers.end(); ++it)
-	{
-		if (it->second == server)
-		{
-			return it->first;
-		}
-		else
-		{
-			const char *oldName = SBServerGetStringValue(it->second, "gamename", tmp);
-			UnsignedInt oldPrivateIP = SBServerGetPrivateInetAddress(it->second);
-			UnsignedShort oldPrivatePort = SBServerGetPrivateQueryPort(it->second);
-			UnsignedInt oldPublicIP = SBServerGetPublicInetAddress(it->second);
-			if (!strcmp(oldName, newName) &&
-				oldPrivateIP == newPrivateIP &&
-				oldPublicIP == newPublicIP &&
-				oldPrivatePort == newPrivatePort)
-			{
-				serverToRemove = it->second;
-			}
-		}
-	}
-
-	if (serverToRemove)
-	{
-		// this is the same as another game - it has just migrated to another port.  Remove the old and replace it.
-		PeerResponse resp;
-		resp.peerResponseType = PeerResponse::PEERRESPONSE_STAGINGROOM;
-		resp.stagingRoom.id = removeServerFromMap( serverToRemove );
-		resp.stagingRoom.action = PEER_REMOVE;
-		resp.stagingRoom.isStaging = TRUE;
-		resp.stagingRoom.percentComplete = -1;
-		TheGameSpyPeerMessageQueue->addResponse(resp);
-	}
-
-	return addServerToMap(server);
-}
-
-static enum CallbackType
-{
-	CALLBACK_CONNECT,
-	CALLBACK_ERROR,
-	CALLBACK_RECVMESSAGE,
-	CALLBACK_RECVREQUEST,
-	CALLBACK_RECVSTATUS,
-	CALLBACK_MAX
-};
-
-void connectCallbackWrapper( PEER peer, PEERBool success, int failureReason, void *param )
-{
-#ifdef SERVER_DEBUGGING
-	DEBUG_LOG(("In connectCallbackWrapper()\n"));
-	CheckServers(peer);
-#endif // SERVER_DEBUGGING
-	if (param != NULL)
-	{
-		((PeerThreadClass *)param)->connectCallback( peer, success );
-	}
-}
-
-void nickErrorCallbackWrapper( PEER peer, Int type, const char *nick, int numSuggestedNicks, const gsi_char** suggestedNicks, void *param )
-{
-	if (param != NULL)
-	{
-		((PeerThreadClass *)param)->nickErrorCallback( peer, type, nick );
-	}
-}
-
-static void joinRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomType roomType, void *param);
-
-//-------------------------------------------------------------------------
-
-GameSpyPeerMessageQueue::GameSpyPeerMessageQueue()
-{
-	m_thread = NULL;
-	m_serialAuth = SERIAL_OK;
-}
-
-GameSpyPeerMessageQueue::~GameSpyPeerMessageQueue()
-{
-	endThread();
-}
-
-void GameSpyPeerMessageQueue::startThread( void )
-{
-	if (!m_thread)
-	{
-		m_thread = NEW PeerThreadClass;
-		m_thread->Execute();
-	}
-	else
-	{
-		if (!m_thread->Is_Running())
-		{
-			m_thread->Execute();
-		}
-	}
-}
-
-void GameSpyPeerMessageQueue::endThread( void )
-{
-	if (m_thread)
-		delete m_thread;
-	m_thread = NULL;
-}
-
-Bool GameSpyPeerMessageQueue::isThreadRunning( void )
-{
-	return (m_thread) ? m_thread->Is_Running() : false;
-}
-
-Bool GameSpyPeerMessageQueue::isConnected( void )
-{
-	return (m_thread) ? m_thread->isConnected() : false;
-}
-
-Bool GameSpyPeerMessageQueue::isConnecting( void )
-{
-	return (m_thread) ? m_thread->isConnecting() : false;
-}
-
-void GameSpyPeerMessageQueue::addRequest( const PeerRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex);
-	if (m.Failed())
-		return;
-
-	m_requests.push(req);
-}
-
-//PeerRequest GameSpyPeerMessageQueue::getRequest( void )
-Bool GameSpyPeerMessageQueue::getRequest( PeerRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_requests.empty())
-		return false;
-	req = m_requests.front();
-	m_requests.pop();
-	return true;
-}
-
-void GameSpyPeerMessageQueue::addResponse( const PeerResponse& resp )
-{
-	if (resp.nick == "(END)")
-		return;
-
-	MutexClass::LockClass m(m_responseMutex);
-	if (m.Failed())
-		return;
-
-	m_responses.push(resp);
-}
-
-//PeerResponse GameSpyPeerMessageQueue::getResponse( void )
-Bool GameSpyPeerMessageQueue::getResponse( PeerResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_responses.empty())
-		return false;
-	resp = m_responses.front();
-	m_responses.pop();
-	return true;
-}
-
-PeerThreadClass* GameSpyPeerMessageQueue::getThread( void )
-{
-	return m_thread;
-}
-
-//-------------------------------------------------------------------------
-static void disconnectedCallback(PEER peer, const char * reason, void * param);
-static void roomMessageCallback(PEER peer, RoomType roomType, const char * nick, const char * message, MessageType messageType, void * param);
-static void playerMessageCallback(PEER peer, const char * nick, const char * message, MessageType messageType, void * param);
-static void playerJoinedCallback(PEER peer, RoomType roomType, const char * nick, void * param);
-static void playerLeftCallback(PEER peer, RoomType roomType, const char * nick, const char * reason, void * param);
-static void playerChangedNickCallback(PEER peer, RoomType roomType, const char * oldNick, const char * newNick, void * param);
-static void playerInfoCallback(PEER peer, RoomType roomType, const char * nick, unsigned int IP, int profileID, void * param);
-static void playerFlagsChangedCallback(PEER peer, RoomType roomType, const char * nick, int oldFlags, int newFlags, void * param);
-static void listingGamesCallback(PEER peer, PEERBool success, const char * name, SBServer server, PEERBool staging, int msg, Int percentListed, void * param);
-static void roomUTMCallback(PEER peer, RoomType roomType, const char * nick, const char * command, const char * parameters, PEERBool authenticated, void * param);
-static void playerUTMCallback(PEER peer, const char * nick, const char * command, const char * parameters, PEERBool authenticated, void * param);
-static void gameStartedCallback(PEER peer, SBServer server, const char *message, void *param);
-static void globalKeyChangedCallback(PEER peer, const char *nick, const char *key, const char *val, void *param);
-static void roomKeyChangedCallback(PEER peer, RoomType roomType, const char *nick, const char *key, const char *val, void *param);
-
-// convenience function to set buddy status
-static void updateBuddyStatus( GameSpyBuddyStatus status, Int groupRoom = 0, std::string gameName = "" )
-{
-	if (!TheGameSpyBuddyMessageQueue)
-		return;
-
-	BuddyRequest req;
-	req.buddyRequestType = BuddyRequest::BUDDYREQUEST_SETSTATUS;
-	switch(status)
-	{
-		case BUDDY_OFFLINE:
-			req.arg.status.status = GP_OFFLINE;
-			strcpy(req.arg.status.statusString, "Offline");
-			strcpy(req.arg.status.locationString, "");
-			break;
-		case BUDDY_ONLINE:
-			req.arg.status.status = GP_ONLINE;
-			strcpy(req.arg.status.statusString, "Online");
-			strcpy(req.arg.status.locationString, "");
-			break;
-		case BUDDY_LOBBY:
-			req.arg.status.status = GP_CHATTING;
-			strcpy(req.arg.status.statusString, "Chatting");
-			sprintf(req.arg.status.locationString, "%d", groupRoom);
-			break;
-		case BUDDY_STAGING:
-			req.arg.status.status = GP_STAGING;
-			strcpy(req.arg.status.statusString, "Staging");
-			sprintf(req.arg.status.locationString, "%s", gameName.c_str());
-			break;
-		case BUDDY_LOADING:
-			req.arg.status.status = GP_PLAYING;
-			strcpy(req.arg.status.statusString, "Loading");
-			sprintf(req.arg.status.locationString, "%s", gameName.c_str());
-			break;
-		case BUDDY_PLAYING:
-			req.arg.status.status = GP_PLAYING;
-			strcpy(req.arg.status.statusString, "Playing");
-			sprintf(req.arg.status.locationString, "%s", gameName.c_str());
-			break;
-		case BUDDY_MATCHING:
-			req.arg.status.status = GP_ONLINE;
-			strcpy(req.arg.status.statusString, "Matching");
-			strcpy(req.arg.status.locationString, "");
-			break;
-	}
-	DEBUG_LOG(("updateBuddyStatus %d:%s\n", req.arg.status.status, req.arg.status.statusString));
-	TheGameSpyBuddyMessageQueue->addRequest(req);
-}
-
-static void createRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomType roomType, void *param)
-{
-	Int *s = (Int *)param;
-	if (s)
-		*s = result;
-}
-
-static const char * KeyTypeToString(qr2_key_type type)
-{
-	switch(type)
-	{
-	case key_server:
-		return "server";
-	case key_player:
-		return "player";
-	case key_team:
-		return "team";
-	}
-
-	return "Unkown key type";
-}
-
-static const char * ErrorTypeToString(qr2_error_t error)
-{
-	switch(error)
-	{
-	case e_qrnoerror:
-		return "noerror";
-	case e_qrwsockerror:
-		return "wsockerror";
-	case e_qrbinderror:
-		return "rbinderror";
-	case e_qrdnserror:
-		return "dnserror";
-	case e_qrconnerror:
-		return "connerror";
-	}
-
-	return "Unknown error type";
-}
-
-static void QRServerKeyCallback
-(
-	PEER peer,
-	int key,
-	qr2_buffer_t buffer,
-	void * param
-)
-{
-	//DEBUG_LOG(("QR_SERVER_KEY | %d (%s)\n", key, qr2_registered_key_list[key]));
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-	{
-		DEBUG_LOG(("QRServerKeyCallback: bailing because of no thread info\n"));
-		return;
-	}
-
-	if (!t->isHosting())
-		t->stopHostingAlready(peer);
-
-#ifdef DEBUG_LOGGING
-	AsciiString val = "";
-#define ADD(x) { qr2_buffer_add(buffer, x); val = x; }
-#define ADDINT(x) { qr2_buffer_add_int(buffer, x); val.format("%d",x); }
-#else
-#define ADD(x) { qr2_buffer_add(buffer, x); }
-#define ADDINT(x) { qr2_buffer_add_int(buffer, x); }
-#endif
-
-	switch(key)
-	{
-	case HOSTNAME_KEY:
-		ADD(t->getPlayerName(0).c_str());
-		break;
-	case GAMEVER_KEY:
-		ADDINT(t->gameVersion());
-		break;
-	case EXECRC_KEY:
-		ADDINT(t->exeCRC());
-		break;
-	case INICRC_KEY:
-		ADDINT(t->iniCRC());
-		break;
-	case GAMENAME_KEY:
-		{
-			std::string tmp = t->getPlayerName(0);
-			tmp.append(" ");
-			tmp.append(WideCharStringToMultiByte(t->getLocalStagingServerName().c_str()));
-			ADD(tmp.c_str());
-		}
-		break;
-	case MAPNAME_KEY:
-		ADD(t->getMapName().c_str());
-		break;
-	case PW_KEY:
-		ADDINT(t->hasPassword());
-		break;
-	case OBS_KEY:
-		ADDINT(t->allowObservers());
-		break;
-  case USE_STATS_KEY:
-    ADDINT(t->useStats());
-    break;
-	case LADIP_KEY:
-		ADD(t->ladderIP().c_str());
-		break;
-	case LADPORT_KEY:
-		ADDINT(t->ladderPort());
-		break;
-	case PINGSTR_KEY:
-		ADD(t->pingStr().c_str());
-		break;
-	case NUMPLAYER_KEY:
-		ADDINT(t->getNumPlayers());
-		break;
-	case MAXPLAYER_KEY:
-		ADDINT(t->getMaxPlayers());
-		break;
-	case NUMOBS_KEY:
-		ADDINT(t->getNumObservers());
-		break;
-	default:
-		ADD("");
-		//DEBUG_LOG(("QR_SERVER_KEY | %d (%s)\n", key, qr2_registered_key_list[key]));
-		break;
-	}
-
-	DEBUG_LOG(("QR_SERVER_KEY | %d (%s) = [%s]\n", key, qr2_registered_key_list[key], val.str()));
-}
-
-static void QRPlayerKeyCallback
-(
-	PEER peer,
-	int key,
-	int index,
-	qr2_buffer_t buffer,
-	void * param
-)
-{
-	//DEBUG_LOG(("QR_PLAYER_KEY | %d | %d (%s)\n", key, index, qr2_registered_key_list[key]));
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-	{
-		DEBUG_LOG(("QRPlayerKeyCallback: bailing because of no thread info\n"));
-		return;
-	}
-
-	if (!t->isHosting())
-		t->stopHostingAlready(peer);
-
-#undef ADD
-#undef ADDINT
-#ifdef DEBUG_LOGGING
-	AsciiString val = "";
-#define ADD(x) { qr2_buffer_add(buffer, x); val = x; }
-#define ADDINT(x) { qr2_buffer_add_int(buffer, x); val.format("%d",x); }
-#else
-#define ADD(x) { qr2_buffer_add(buffer, x); }
-#define ADDINT(x) { qr2_buffer_add_int(buffer, x); }
-#endif
-
-	switch(key)
-	{
-	case NAME__KEY:
-		ADD(t->getPlayerName(index).c_str());
-		break;
-	case WINS__KEY:
-		ADDINT(t->getPlayerWins(index));
-		break;
-	case LOSSES__KEY:
-		ADDINT(t->getPlayerLosses(index));
-		break;
-	case PID__KEY:
-		ADDINT(t->getPlayerProfileID(index));
-		break;
-	case FACTION__KEY:
-		ADDINT(t->getPlayerLosses(index));
-		break;
-	case COLOR__KEY:
-		ADDINT(t->getPlayerLosses(index));
-		break;
-	default:
-		ADD("");
-		//DEBUG_LOG(("QR_PLAYER_KEY | %d | %d (%s)\n", key, index, qr2_registered_key_list[key]));
-		break;
-	}
-
-	DEBUG_LOG(("QR_PLAYER_KEY | %d | %d (%s) = [%s]\n", key, index, qr2_registered_key_list[key], val.str()));
-}
-
-static void QRTeamKeyCallback
-(
-	PEER peer,
-	int key,
-	int index,
-	qr2_buffer_t buffer,
-	void * param
-)
-{
-	//DEBUG_LOG(("QR_TEAM_KEY | %d | %d\n", key, index));
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-	{
-		DEBUG_LOG(("QRTeamKeyCallback: bailing because of no thread info\n"));
-		return;
-	}
-	if (!t->isHosting())
-		t->stopHostingAlready(peer);
-
-	// we don't report teams, so this shouldn't get called
-	qr2_buffer_add(buffer, "");
-}
-
-static void QRKeyListCallback
-(
-	PEER peer,
-	qr2_key_type type,
-	qr2_keybuffer_t keyBuffer,
-	void * param
-)
-{
-	DEBUG_LOG(("QR_KEY_LIST | %s\n", KeyTypeToString(type)));
-
-	/*
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-	{
-		DEBUG_LOG(("QRKeyListCallback: bailing because of no thread info\n"));
-		return;
-	}
-	if (!t->isHosting())
-		t->stopHostingAlready(peer);
-		*/
-
-	// register the keys we use
-	switch(type)
-	{
-	case key_server:
-		qr2_keybuffer_add(keyBuffer, HOSTNAME_KEY);
-		qr2_keybuffer_add(keyBuffer, GAMEVER_KEY);
-		//qr2_keybuffer_add(keyBuffer, GAMENAME_KEY);
-		qr2_keybuffer_add(keyBuffer, MAPNAME_KEY);
-		qr2_keybuffer_add(keyBuffer, EXECRC_KEY);
-		qr2_keybuffer_add(keyBuffer, INICRC_KEY);
-		qr2_keybuffer_add(keyBuffer, PW_KEY);
-		qr2_keybuffer_add(keyBuffer, OBS_KEY);
-    qr2_keybuffer_add(keyBuffer, USE_STATS_KEY);
-		qr2_keybuffer_add(keyBuffer, LADIP_KEY);
-		qr2_keybuffer_add(keyBuffer, LADPORT_KEY);
-		qr2_keybuffer_add(keyBuffer, PINGSTR_KEY);
-		qr2_keybuffer_add(keyBuffer, NUMPLAYER_KEY);
-		qr2_keybuffer_add(keyBuffer, MAXPLAYER_KEY);
-		qr2_keybuffer_add(keyBuffer, NUMOBS_KEY);
-		break;
-	case key_player:
-		qr2_keybuffer_add(keyBuffer, NAME__KEY);
-		qr2_keybuffer_add(keyBuffer, WINS__KEY);
-		qr2_keybuffer_add(keyBuffer, LOSSES__KEY);
-		qr2_keybuffer_add(keyBuffer, PID__KEY);
-		qr2_keybuffer_add(keyBuffer, FACTION__KEY);
-		qr2_keybuffer_add(keyBuffer, COLOR__KEY);
-		break;
-	case key_team:
-		// no custom team keys
-		break;
-	}
-}
-
-static int QRCountCallback
-(
-	PEER peer,
-	qr2_key_type type,
-	void * param
-)
-{
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-	{
-		DEBUG_LOG(("QRCountCallback: bailing because of no thread info\n"));
-		return 0;
-	}
-	if (!t->isHosting())
-		t->stopHostingAlready(peer);
-
-	if(type == key_player)
-	{
-		DEBUG_LOG(("QR_COUNT | %s = %d\n", KeyTypeToString(type), t->getNumPlayers() + t->getNumObservers()));
-		return t->getNumPlayers() + t->getNumObservers();
-	}
-	else if(type == key_team)
-	{
-		DEBUG_LOG(("QR_COUNT | %s = %d\n", KeyTypeToString(type), 0));
-		return 0;
-	}
-
-	DEBUG_LOG(("QR_COUNT | %s = %d\n", KeyTypeToString(type), 0));
-	return 0;
-}
-
-void PeerThreadClass::stopHostingAlready(PEER peer)
-{
-	isThreadHosting = 0; // debugging
-	s_lastStateChangedHeartbeat = 0;
-	s_wantStateChangedHeartbeat = FALSE;
-	peerStopGame(peer);
-	if (qr2Sock != INVALID_SOCKET)
-	{
-		closesocket(qr2Sock);
-		qr2Sock = INVALID_SOCKET;
-	}
-}
-
-static void QRAddErrorCallback
-(
-	PEER peer,
-	qr2_error_t error,
-	char * errorString,
-	void * param
-)
-{
-	DEBUG_LOG(("QR_ADD_ERROR | %s | %s\n", ErrorTypeToString(error), errorString));
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_FAILEDTOHOST;
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-static void QRNatNegotiateCallback
-(
-	PEER peer,
-	int cookie,
-	void * param
-)
-{
-	DEBUG_LOG(("QR_NAT_NEGOTIATE | 0x%08X\n", cookie));
-}
-
-static void KickedCallback
-(
-	PEER peer,
-	RoomType roomType,
-	const char * nick,
-	const char * reason,
-	void * param
-)
-{
-	DEBUG_LOG(("Kicked from %d by %s: \"%s\"\n", roomType, nick, reason));
-}
-
-static void NewPlayerListCallback
-(
-	PEER peer,
-	RoomType roomType,
-	void * param
-)
-{
-	DEBUG_LOG(("NewPlayerListCallback\n"));
-}
-
-static void AuthenticateCDKeyCallback
-(
-	PEER peer,
-	int result,
-	const char * message,
-	void * param
-)
-{
-	DEBUG_LOG(("CD Key Result: %s (%d) %X\n", message, result, param));
-#ifdef SERVER_DEBUGGING
-	CheckServers(peer);
-#endif // SERVER_DEBUGGING
-	SerialAuthResult *val = (SerialAuthResult *)param;
-	if (val)
-	{
-		if (result >= 1)
-		{
-			*val = SERIAL_OK;
-		}
-		else
-		{
-			*val = SERIAL_AUTHFAILED;
-		}
-	}
-#ifdef SERVER_DEBUGGING
-	CheckServers(peer);
-#endif // SERVER_DEBUGGING
-}
-
-static SerialAuthResult doCDKeyAuthentication( PEER peer )
-{
-	SerialAuthResult retval = SERIAL_NONEXISTENT;
-	if (!peer)
-		return retval;
-
-	AsciiString s = "";
-	if (GetStringFromRegistry("\\ergc", "", s) && s.isNotEmpty())
-	{
-#ifdef SERVER_DEBUGGING
-		DEBUG_LOG(("Before peerAuthenticateCDKey()\n"));
-		CheckServers(peer);
-#endif // SERVER_DEBUGGING
-		peerAuthenticateCDKey(peer, s.str(), AuthenticateCDKeyCallback, &retval, PEERTrue);
-#ifdef SERVER_DEBUGGING
-		DEBUG_LOG(("After peerAuthenticateCDKey()\n"));
-		CheckServers(peer);
-#endif // SERVER_DEBUGGING
-	}
-	
-	if (retval == SERIAL_OK)
-	{
-		PSRequest req;
-		req.requestType = PSRequest::PSREQUEST_READCDKEYSTATS;
-		req.cdkey = s.str();
-		TheGameSpyPSMessageQueue->addRequest(req);
-	}
-
-	return retval;
-}
-
-#define INBUF_LEN 256
-void checkQR2Queries( PEER peer, SOCKET sock )
-{
-	static char indata[INBUF_LEN];
-	struct sockaddr_in saddr;
-	int saddrlen = sizeof(struct sockaddr_in);
-	fd_set set;
-	struct timeval timeout = {0,0};
-	int error;
-
-	FD_ZERO ( &set );
-	FD_SET ( sock, &set );
-
-	while (1)
-	{
-		error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
-		if (SOCKET_ERROR == error || 0 == error)
-			return;
-		//else we have data
-		error = recvfrom(sock, indata, INBUF_LEN - 1, 0, (struct sockaddr *)&saddr, &saddrlen);
-		if (error != SOCKET_ERROR)
-		{
-			indata[error] = '\0';
-			peerParseQuery( peer, indata, error, (sockaddr *)&saddr );
-		}
-	}
-}
-
-static UnsignedInt localIP = 0;
-
-void PeerThreadClass::Thread_Function()
-{
-	try {
-	_set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
-
-	PEER peer;
-
-	// Setup the callbacks.
-	///////////////////////
-	PEERCallbacks callbacks;
-	memset(&callbacks, 0, sizeof(PEERCallbacks));
-	callbacks.disconnected = disconnectedCallback;
-	//callbacks.readyChanged = readyChangedCallback;
-	callbacks.roomMessage = roomMessageCallback;
-	callbacks.playerMessage = playerMessageCallback;
-	callbacks.gameStarted = gameStartedCallback;
-	callbacks.playerJoined = playerJoinedCallback;
-	callbacks.playerLeft = playerLeftCallback;
-	callbacks.playerChangedNick = playerChangedNickCallback;
-	callbacks.playerFlagsChanged = playerFlagsChangedCallback;
-	callbacks.playerInfo = playerInfoCallback;
-	callbacks.roomUTM = roomUTMCallback;
-	callbacks.playerUTM = playerUTMCallback;
-	callbacks.globalKeyChanged = globalKeyChangedCallback;
-	callbacks.roomKeyChanged = roomKeyChangedCallback;
-
-	callbacks.qrServerKey = QRServerKeyCallback;
-	callbacks.qrPlayerKey = QRPlayerKeyCallback;
-	callbacks.qrTeamKey = QRTeamKeyCallback;
-	callbacks.qrKeyList = QRKeyListCallback;
-	callbacks.qrCount = QRCountCallback;
-	callbacks.qrAddError = QRAddErrorCallback;
-	callbacks.qrNatNegotiateCallback = QRNatNegotiateCallback;
-
-	callbacks.kicked = KickedCallback;
-	callbacks.newPlayerList = NewPlayerListCallback;
-
-	callbacks.param = this;
-
-	m_qmGroupRoom = 0;
-
-	peer = peerInitialize( &callbacks );
-	DEBUG_ASSERTCRASH( peer != NULL, ("NULL peer!") );
-	m_isConnected = m_isConnecting = false;
-
-	qr2_register_key(EXECRC_KEY, EXECRC_STR);
-	qr2_register_key(INICRC_KEY, INICRC_STR);
-	qr2_register_key(PW_KEY, PW_STR);
-	qr2_register_key(OBS_KEY, OBS_STR);
-  qr2_register_key(USE_STATS_KEY, USE_STATS_STR);
-	qr2_register_key(LADIP_KEY, LADIP_STR);
-	qr2_register_key(LADPORT_KEY, LADPORT_STR);
-	qr2_register_key(PINGSTR_KEY, PINGSTR_STR);
-	qr2_register_key(NUMOBS_KEY, NUMOBS_STR);
-	qr2_register_key(NUMPLAYER_KEY, NUMPLAYER_STR);
-	qr2_register_key(MAXPLAYER_KEY, MAXPLAYER_STR);
-	qr2_register_key(NAME__KEY, NAME__STR "_");
-	qr2_register_key(WINS__KEY, WINS__STR "_");
-	qr2_register_key(LOSSES__KEY, LOSSES__STR "_");
-	qr2_register_key(FACTION__KEY, FACTION__STR "_");
-	qr2_register_key(COLOR__KEY, COLOR__STR "_");
-
-	const Int NumKeys = 15;
-	unsigned char allKeysArray[NumKeys] = {
-		/*
-		PID__KEY,
-		NAME__KEY,
-		WINS__KEY,
-		LOSSES__KEY,
-		FACTION__KEY,
-		COLOR__KEY,
-		*/
-		MAPNAME_KEY,
-		GAMEVER_KEY,
-		GAMENAME_KEY,
-		EXECRC_KEY,
-		INICRC_KEY,
-		PW_KEY,
-		OBS_KEY,
-    USE_STATS_KEY,
-		LADIP_KEY,
-		LADPORT_KEY,
-		PINGSTR_KEY,
-		NUMOBS_KEY,
-		NUMPLAYER_KEY,
-		MAXPLAYER_KEY,
-		HOSTNAME_KEY
-  };
-
-	/*
-	const char *allKeys = "\\pid_\\mapname\\gamever\\gamename" \
-		"\\" EXECRC_STR "\\" INICRC_STR \
-		"\\" PW_STR "\\" OBS_STR "\\" USE_STATS_STR "\\" LADIP_STR "\\" LADPORT_STR \
-		"\\" PINGSTR_STR "\\" NUMOBS_STR \
-		"\\" NUMPLAYER_STR "\\" MAXPLAYER_STR \
-		"\\" NAME__STR "_" "\\" WINS__STR "_" "\\" LOSSES__STR "_" "\\" FACTION__STR "_" "\\" COLOR__STR "_";
-	*/
-
-	const char * key = "username";
-	peerSetRoomWatchKeys(peer, StagingRoom, 1, &key, PEERTrue);
-	peerSetRoomWatchKeys(peer, GroupRoom, 1, &key, PEERTrue);
-
-	m_localRoomID = 0;
-	m_localStagingServerName = L"";
-
-	m_qmStatus = QM_IDLE;
-
-	// Setup which rooms to do pings and cross-pings in.
-	////////////////////////////////////////////////////
-	PEERBool pingRooms[NumRooms];
-	PEERBool crossPingRooms[NumRooms];
-	pingRooms[TitleRoom] = PEERFalse;
-	pingRooms[GroupRoom] = PEERFalse;
-	pingRooms[StagingRoom] = PEERFalse;
-	crossPingRooms[TitleRoom] = PEERFalse;
-	crossPingRooms[GroupRoom] = PEERFalse;
-	crossPingRooms[StagingRoom] = PEERFalse;
-	
-	/*********
-	First step, set our game authentication info
-	We could do:
-		strcpy(gcd_gamename,"ccgenzh");
-		strcpy(gcd_secret_key,"D6s9k3");
-	or
-		strcpy(gcd_gamename,"ccgeneralsb");
-		strcpy(gcd_secret_key,"whatever the key is");
-	...but this is more secure:
-	**********/
-	char gameName[12] = {0};
-	char secretKey[7] = {0};
-	/**
-	gameName[0]='c';gameName[1]='c';gameName[2]='g';gameName[3]='e';
-	gameName[4]='n';gameName[5]='e';gameName[6]='r';gameName[7]='a';
-	gameName[8]='l';gameName[9]='s';gameName[10]='b';gameName[11]='\0';
-	secretKey[0]='g';secretKey[1]='3';secretKey[2]='T';secretKey[3]='9';
-	secretKey[4]='s';secretKey[5]='2';secretKey[6]='\0';
-	/**/
-	gameName[0]='c';gameName[1]='c';gameName[2]='g';gameName[3]='e';
-	gameName[4]='n';gameName[5]='z';gameName[6]='h';gameName[7]='\0';
-	secretKey[0]='D';secretKey[1]='6';secretKey[2]='s';secretKey[3]='9';
-	secretKey[4]='k';secretKey[5]='3';secretKey[6]='\0';
-	/**/
-
-	// Set the title.
-	/////////////////
-	if(!peerSetTitle( peer , gameName, secretKey, gameName, secretKey, GetRegistryVersion(), 30, PEERTrue, pingRooms, crossPingRooms))
-	{
-		DEBUG_CRASH(("Error setting title"));
-		peerShutdown( peer );
-		peer = NULL;
-		return;
-	}
-
-	OptionPreferences pref;
-	UnsignedInt preferredIP = INADDR_ANY;
-	UnsignedInt selectedIP = pref.getOnlineIPAddress();
-	DEBUG_LOG(("Looking for IP %X\n", selectedIP));
-	IPEnumeration IPs;
-	EnumeratedIP *IPlist = IPs.getAddresses();
-	while (IPlist)
-	{
-		DEBUG_LOG(("Looking at IP %s\n", IPlist->getIPstring().str()));
-		if (selectedIP == IPlist->getIP())
-		{
-			preferredIP = IPlist->getIP();
-			DEBUG_LOG(("Connecting to GameSpy chat server via IP address %8.8X\n", preferredIP));
-			break;
-		}
-		IPlist = IPlist->getNext();
-	}
-	chatSetLocalIP(preferredIP);
-
-	UnsignedInt preferredQRPort = 0;
-	AsciiString selectedQRPort = pref["GameSpyQRPort"];
-	if (selectedQRPort.isNotEmpty())
-	{
-		preferredQRPort = atoi(selectedQRPort.str());
-	}
-
-	PeerRequest incomingRequest;
-	while ( running )
-	{
-		// deal with requests
-		if (TheGameSpyPeerMessageQueue->getRequest(incomingRequest))
-		{
-			DEBUG_LOG(("TheGameSpyPeerMessageQueue->getRequest() got request of type %d\n", incomingRequest.peerRequestType));
-			switch (incomingRequest.peerRequestType)
-			{
-			case PeerRequest::PEERREQUEST_LOGIN:
-				{
-				m_isConnecting = true;
-				m_originalName = incomingRequest.nick;
-				m_loginName = incomingRequest.nick;
-				m_profileID = incomingRequest.login.profileID;
-				m_password = incomingRequest.password;
-				m_email = incomingRequest.email;
-				peerConnect( peer, incomingRequest.nick.c_str(), incomingRequest.login.profileID, nickErrorCallbackWrapper, connectCallbackWrapper, this, PEERTrue );
-#ifdef SERVER_DEBUGGING
-				DEBUG_LOG(("After peerConnect()\n"));
-				CheckServers(peer);
-#endif // SERVER_DEBUGGING
-				if (m_isConnected)
-				{
-					SerialAuthResult ret = doCDKeyAuthentication( peer );
-					if (ret != SERIAL_OK)
-					{
-						m_isConnecting = m_isConnected = false;
-						MESSAGE_QUEUE->setSerialAuthResult( ret );
-						peerDisconnect( peer );
-					}
-				}
-				m_isConnecting = false;
-
-				// check our connection
-				//if (m_isConnected)
-				//{
-				//	GetLocalChatConnectionAddress("peerchat.gamespy.com", 6667, localIP);
-				//}
-				}
-
-				break;
-
-			case PeerRequest::PEERREQUEST_LOGOUT:
-				m_isConnecting = m_isConnected = false;
-				peerDisconnect( peer );
-				break;
-
-			case PeerRequest::PEERREQUEST_JOINGROUPROOM:
-				m_groupRoomID = incomingRequest.groupRoom.id;
-				isThreadHosting = 0; // debugging
-				s_lastStateChangedHeartbeat = 0;
-				s_wantStateChangedHeartbeat = FALSE;
-				peerStopGame( peer );
-				peerLeaveRoom( peer, GroupRoom, NULL );
-				peerLeaveRoom( peer, StagingRoom, NULL );
-				if (qr2Sock != INVALID_SOCKET)
-				{
-					closesocket(qr2Sock);
-					qr2Sock = INVALID_SOCKET;
-				}
-				m_isHosting = false;
-				m_localRoomID = m_groupRoomID;
-				DEBUG_LOG(("Requesting to join room %d in thread %X\n", m_localRoomID, this));
-				peerJoinGroupRoom( peer, incomingRequest.groupRoom.id, joinRoomCallback, (void *)this, PEERTrue );
-				break;
-
-			case PeerRequest::PEERREQUEST_LEAVEGROUPROOM:
-				m_groupRoomID = 0;
-				updateBuddyStatus( BUDDY_ONLINE );
-				peerLeaveRoom( peer, GroupRoom, NULL );
-				peerLeaveRoom( peer, StagingRoom, NULL ); m_isHosting = false;
-				break;
-
-			case PeerRequest::PEERREQUEST_JOINSTAGINGROOM:
-				{
-					m_groupRoomID = 0;
-					updateBuddyStatus( BUDDY_ONLINE );
-					peerLeaveRoom( peer, GroupRoom, NULL );
-					peerLeaveRoom( peer, StagingRoom, NULL ); m_isHosting = false;
-					SBServer server = findServerByID(incomingRequest.stagingRoom.id);
-					m_localStagingServerName = incomingRequest.text;
-					DEBUG_LOG(("Setting m_localStagingServerName to [%ls]\n", m_localStagingServerName.c_str()));
-					m_localRoomID = incomingRequest.stagingRoom.id;
-					DEBUG_LOG(("Requesting to join room %d\n", m_localRoomID));
-					if (server)
-					{
-						peerJoinStagingRoom( peer, server, incomingRequest.password.c_str(), joinRoomCallback, (void *)this, PEERTrue );
-					}
-					else
-					{
-						PeerResponse resp;
-						resp.peerResponseType = PeerResponse::PEERRESPONSE_JOINSTAGINGROOM;
-						resp.joinStagingRoom.id = incomingRequest.stagingRoom.id;
-						resp.joinStagingRoom.ok = FALSE;
-						resp.joinStagingRoom.result = PEERJoinFailed;
-						TheGameSpyPeerMessageQueue->addResponse(resp);
-					}
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_LEAVESTAGINGROOM:
-				m_groupRoomID = 0;
-				updateBuddyStatus( BUDDY_ONLINE );
-				peerLeaveRoom( peer, GroupRoom, NULL );
-				peerLeaveRoom( peer, StagingRoom, NULL );
-				isThreadHosting = 0; // debugging
-				s_lastStateChangedHeartbeat = 0;
-				s_wantStateChangedHeartbeat = FALSE;
-				if (m_isHosting)
-				{
-					peerStopGame( peer );
-					if (qr2Sock != INVALID_SOCKET)
-					{
-						closesocket(qr2Sock);
-						qr2Sock = INVALID_SOCKET;
-					}
-					m_isHosting = false;
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_MESSAGEPLAYER:
-				{
-					std::string s = WideCharStringToMultiByte(incomingRequest.text.c_str());
-					peerMessagePlayer( peer, incomingRequest.nick.c_str(), s.c_str(), (incomingRequest.message.isAction)?ActionMessage:NormalMessage );
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_MESSAGEROOM:
-				{
-					std::string s = WideCharStringToMultiByte(incomingRequest.text.c_str());
-					peerMessageRoom( peer, (m_groupRoomID)?GroupRoom:StagingRoom, s.c_str(), (incomingRequest.message.isAction)?ActionMessage:NormalMessage );
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_PUSHSTATS:
-				{
-					DEBUG_LOG(("PEERREQUEST_PUSHSTATS: stats are %d,%d,%d,%d,%d,%d\n",
-						incomingRequest.statsToPush.locale, incomingRequest.statsToPush.wins, incomingRequest.statsToPush.losses, incomingRequest.statsToPush.rankPoints, incomingRequest.statsToPush.side, incomingRequest.statsToPush.preorder));
-
-					// Testing alternate way to push stats
-#ifdef USE_BROADCAST_KEYS
-					snprintf(s_valueBuffers[0], 20, "%d", incomingRequest.statsToPush.locale);
-					snprintf(s_valueBuffers[1], 20, "%d", incomingRequest.statsToPush.wins);
-					snprintf(s_valueBuffers[2], 20, "%d", incomingRequest.statsToPush.losses);
-					snprintf(s_valueBuffers[3], 20, "%d", incomingRequest.statsToPush.rankPoints);
-					snprintf(s_valueBuffers[4], 20, "%d", incomingRequest.statsToPush.side);
-					snprintf(s_valueBuffers[5], 20, "%d", incomingRequest.statsToPush.preorder);
-					pushStatsToRoom(peer);
-#else
-					const char *keys[6] = { "locale", "wins", "losses", "points", "side", "pre" };
-					char valueStrings[6][20];
-					char *values[6] = { valueStrings[0], valueStrings[1], valueStrings[2],
-						valueStrings[3], valueStrings[4], valueStrings[5]};
-					snprintf(values[0], 20, "%d", incomingRequest.statsToPush.locale);
-					snprintf(values[1], 20, "%d", incomingRequest.statsToPush.wins);
-					snprintf(values[2], 20, "%d", incomingRequest.statsToPush.losses);
-					snprintf(values[3], 20, "%d", incomingRequest.statsToPush.rankPoints);
-					snprintf(values[4], 20, "%d", incomingRequest.statsToPush.side);
-					snprintf(values[5], 20, "%d", incomingRequest.statsToPush.preorder);
-					peerSetGlobalKeys(peer, 6, (const char **)keys, (const char **)values);
-					peerSetGlobalWatchKeys(peer, GroupRoom,   0, NULL, PEERFalse);
-					peerSetGlobalWatchKeys(peer, StagingRoom, 0, NULL, PEERFalse);
-					peerSetGlobalWatchKeys(peer, GroupRoom,   6, keys, PEERTrue);
-					peerSetGlobalWatchKeys(peer, StagingRoom, 6, keys, PEERTrue);
-#endif
-				}
-				break;
-				
-			case PeerRequest::PEERREQUEST_SETGAMEOPTIONS:
-				{
-					m_mapName = incomingRequest.gameOptsMapName;
-					m_numPlayers = incomingRequest.gameOptions.numPlayers;
-					m_numObservers = incomingRequest.gameOptions.numObservers;
-					m_maxPlayers = incomingRequest.gameOptions.maxPlayers;
-					DEBUG_LOG(("peerStateChanged(): Marking game options state as changed - %d players, %d observers\n", m_numPlayers, m_numObservers));
-					for (Int i=0; i<MAX_SLOTS; ++i)
-					{
-						m_playerNames[i] = incomingRequest.gameOptsPlayerNames[i];
-						m_playerWins[i] = incomingRequest.gameOptions.wins[i];
-						m_playerLosses[i] = incomingRequest.gameOptions.losses[i];
-						m_playerProfileID[i] = incomingRequest.gameOptions.profileID[i];
-						m_playerFactions[i] = incomingRequest.gameOptions.faction[i];
-						m_playerColors[i] = incomingRequest.gameOptions.color[i];
-					}
-
-					s_wantStateChangedHeartbeat = TRUE;
-
-					/*
-					peerStateChanged( peer );
-
-#ifdef DEBUG_LOGGING
-					static UnsignedInt prev = 0;
-					UnsignedInt now = timeGetTime();
-					UnsignedInt diff = now - prev;
-					prev = now;
-#endif
-					STATECHANGED_LOG(("peerStateChanged() at time %d (difference of %d ms)\n", now, diff));
-					*/
-
-					peerUTMRoom( peer, StagingRoom, "SL/", incomingRequest.options.c_str(), PEERFalse ); // send the full string to people in the room
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_GETEXTENDEDSTAGINGROOMINFO:
-				{
-					SBServer server = findServerByID( incomingRequest.stagingRoom.id );
-					if (server)
-					{
-						DEBUG_LOG(("Requesting full update on a game\n"));
-						peerUpdateGame( peer, server, PEERTrue );
-					}
-					else
-					{
-						DEBUG_LOG(("Tried to update non-existent server!\n"));
-					}
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_CREATESTAGINGROOM:
-				{
-					Int oldGroupID = m_groupRoomID;
-					m_groupRoomID = 0;
-					updateBuddyStatus( BUDDY_ONLINE );
-					if (!incomingRequest.stagingRoomCreation.restrictGameList)
-					{
-						peerLeaveRoom( peer, GroupRoom, NULL );
-						peerLeaveRoom( peer, StagingRoom, NULL );
-					}
-					m_isHosting = TRUE;
-
-					Int res = PEERJoinFailed;
-					if (qr2Sock == INVALID_SOCKET)
-					{
-						// allocate a port
-						if (preferredQRPort < 1024)
-						{
-							preferredQRPort = 6500 + (ntohl(localIP) & 0xff);
-						}
-						DEBUG_LOG(("Using %8.8X:%d for QR2\n", ntohl(localIP), preferredQRPort));
-					}
-					else
-					{
-						closesocket(qr2Sock);
-						qr2Sock = INVALID_SOCKET;
-					}
-					qr2Sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-					struct sockaddr_in saddr;
-					saddr.sin_port=htons(preferredQRPort);
-					saddr.sin_addr.s_addr=localIP;
-					saddr.sin_family=AF_INET;
-					if (bind(qr2Sock, (sockaddr *)&saddr, sizeof(saddr)) != 0)
-					{
-						DEBUG_LOG(("Could not bind to %d!  Falling back to GameSpy's default port\n", preferredQRPort));
-						closesocket(qr2Sock);
-						qr2Sock = INVALID_SOCKET;
-						preferredQRPort = 0;
-					}
-					std::string compositeGame = m_loginName;
-					compositeGame.append(" ");
-					compositeGame.append(WideCharStringToMultiByte(incomingRequest.text.c_str()));
-					m_localStagingServerName = incomingRequest.text;
-					m_playerNames[0] = m_loginName;
-					peerCreateStagingRoomWithSocket(peer, compositeGame.c_str(), MAX_SLOTS, incomingRequest.password.c_str(), qr2Sock, preferredQRPort, createRoomCallback, (void *)&res, PEERTrue);
-					//peerCreateStagingRoomWithSocket(peer, WideCharStringToMultiByte(incomingRequest.text.c_str()).c_str(), MAX_SLOTS, incomingRequest.password.c_str(), qr2Sock, preferredQRPort, createRoomCallback, (void *)&res, PEERTrue);
-					DEBUG_LOG(("PEERREQUEST_CREATESTAGINGROOM - creating staging room, name is %ls, passwd is %s, result = %d\n",
-						incomingRequest.text.c_str(), incomingRequest.password.c_str(), res));
-
-					PeerResponse resp;
-					resp.peerResponseType = PeerResponse::PEERRESPONSE_CREATESTAGINGROOM;
-					resp.createStagingRoom.result = res;
-					TheGameSpyPeerMessageQueue->addResponse(resp);
-
-					if (res != PEERJoinSuccess && res != PEERAlreadyInRoom)
-					{
-						m_localRoomID = oldGroupID;
-						DEBUG_LOG(("Requesting to join room %d\n", m_localRoomID));
-						if (incomingRequest.stagingRoomCreation.restrictGameList)
-						{
-							peerLeaveRoom( peer, StagingRoom, NULL );
-						}
-						else
-						{
-							peerJoinGroupRoom( peer, oldGroupID, joinRoomCallback, (void *)this, PEERTrue );
-						}
-						m_isHosting = FALSE;
-						m_localStagingServerName = L"";
-						m_playerNames[0] = "";
-					}
-					else
-					{
-						if (incomingRequest.stagingRoomCreation.restrictGameList)
-						{
-							peerLeaveRoom( peer, GroupRoom, NULL );
-						}
-						isThreadHosting = 1; // debugging
-						s_lastStateChangedHeartbeat = timeGetTime(); // wait the full interval before updating state
-						s_wantStateChangedHeartbeat = FALSE;
-						m_isHosting = TRUE;
-						m_allowObservers = incomingRequest.stagingRoomCreation.allowObservers;
-            m_useStats = incomingRequest.stagingRoomCreation.useStats;
-						m_mapName = "";
-						for (Int i=0; i<MAX_SLOTS; ++i)
-						{
-							m_playerNames[i] = "";
-							m_playerWins[i] = 0;
-							m_playerLosses[i] = 0;
-							m_playerProfileID[i] = 0;
-							m_playerFactions[i] = 0;
-							m_playerColors[i] = 0;
-						}
-						if (incomingRequest.password.length() > 0)
-							m_hasPassword = true;
-						else
-							m_hasPassword = false;
-						m_playerNames[0] = m_loginName;
-						m_exeCRC = incomingRequest.stagingRoomCreation.exeCRC;
-						m_iniCRC = incomingRequest.stagingRoomCreation.iniCRC;
-						m_gameVersion = incomingRequest.stagingRoomCreation.gameVersion;
-						m_localStagingServerName = incomingRequest.text;
-						m_ladderIP = incomingRequest.ladderIP;
-						m_pingStr = incomingRequest.hostPingStr;
-						m_ladderPort = incomingRequest.stagingRoomCreation.ladPort;
-
-#ifdef USE_BROADCAST_KEYS
-						pushStatsToRoom(peer);
-#endif // USE_BROADCAST_KEYS
-
-						DEBUG_LOG(("Setting m_localStagingServerName to [%ls]\n", m_localStagingServerName.c_str()));
-						updateBuddyStatus( BUDDY_STAGING, 0, WideCharStringToMultiByte(m_localStagingServerName.c_str()) );
-					}
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_STARTGAMELIST:
-				{
-					m_sawCompleteGameList = FALSE;
-					PeerResponse resp;
-					resp.peerResponseType = PeerResponse::PEERRESPONSE_STAGINGROOM;
-					resp.stagingRoom.action = PEER_CLEAR;
-					resp.stagingRoom.isStaging = TRUE;
-					resp.stagingRoom.percentComplete = 0;
-					clearServers();
-					TheGameSpyPeerMessageQueue->addResponse(resp);
-					peerStartListingGames( peer, allKeysArray, NumKeys, (incomingRequest.gameList.restrictGameList?"~":NULL), listingGamesCallback, this );
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_STOPGAMELIST:
-				{
-					peerStopListingGames( peer );
-				}
-				break;
-				
-			case PeerRequest::PEERREQUEST_STARTGAME:
-				{
-					peerStartGame( peer, NULL, PEER_STOP_REPORTING);
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_UTMPLAYER:
-				{
-					if (incomingRequest.nick.length() > 0)
-					{
-						peerUTMPlayer( peer, incomingRequest.nick.c_str(), incomingRequest.id.c_str(), incomingRequest.options.c_str(), PEERFalse );
-					}
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_UTMROOM:
-				{
-					peerUTMRoom( peer, (incomingRequest.UTM.isStagingRoom)?StagingRoom:GroupRoom, incomingRequest.id.c_str(), incomingRequest.options.c_str(), PEERFalse );
-				}
-				break;
-
-			case PeerRequest::PEERREQUEST_STARTQUICKMATCH:
-				{
-					m_qmInfo = incomingRequest;
-					doQuickMatch( peer );
-				}
-				break;
-
-			}
-		}
-
-		if (isThreadHosting && s_wantStateChangedHeartbeat)
-		{
-			UnsignedInt now = timeGetTime();
-			if (now > s_lastStateChangedHeartbeat + s_heartbeatInterval)
-			{
-				s_lastStateChangedHeartbeat = now;
-				s_wantStateChangedHeartbeat = FALSE;
-				peerStateChanged( peer );
-
-#ifdef DEBUG_LOGGING
-				static UnsignedInt prev = 0;
-				UnsignedInt now = timeGetTime();
-				UnsignedInt diff = now - prev;
-				prev = now;
-#endif
-				STATECHANGED_LOG(("peerStateChanged() at time %d (difference of %d ms)\n", now, diff));
-			}
-		}
-
-		// update the network
-		PEERBool isConnected = PEERTrue;
-		isConnected = peerIsConnected( peer );
-		if ( isConnected == PEERTrue )
-		{
-			if (qr2Sock != INVALID_SOCKET)
-			{
-				// check hosting activity
-				checkQR2Queries( peer, qr2Sock );
-			}
-			peerThink( peer );
-		}
-
-		// end our timeslice
-		Switch_Thread();
-	}
-
-	DEBUG_LOG(("voluntarily ending peer thread %d\n", running));
-	peerShutdown( peer );
-
-	} catch ( ... ) {
-		DEBUG_CRASH(("Exception in peer thread!"));
-
-		try {
-			PeerResponse resp;
-			resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
-			resp.discon.reason = DISCONNECT_LOSTCON;
-			TheGameSpyPeerMessageQueue->addResponse(resp);
-		}
-		catch (...)
-		{
-		}
-	}
-}
-
-static void qmProfileIDCallback( PEER peer, PEERBool success, const char *nick, int profileID, void *param )
-{
-	Int *i = (Int *)param;
-	if (!i || !success || !nick)
-		return;
-
-	*i = profileID;
-}
-
-static Int matchbotProfileID = 0;
-void quickmatchEnumPlayersCallback( PEER peer, PEERBool success, RoomType roomType, int index, const char * nick, int flags, void * param )
-{
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t || !success || nick == NULL || nick[0] == '\0')
-	{
-		t->sawEndOfEnumPlayers();
-		return;
-	}
-
-	Int id = 0;
-	peerGetPlayerProfileID(peer, nick, qmProfileIDCallback, &id, PEERTrue);
-	DEBUG_LOG(("Saw player %s with id %d (looking for %d)\n", nick, id, matchbotProfileID));
-	if (id == matchbotProfileID)
-	{
-		t->sawMatchbot(nick);
-	}
-
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERJOIN;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-	resp.player.IP = 0;
-
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-void PeerThreadClass::handleQMMatch(PEER peer, Int mapIndex, Int seed,
-																		char *playerName[MAX_SLOTS],
-																		char *playerIP[MAX_SLOTS],
-																		char *playerSide[MAX_SLOTS],
-																		char *playerColor[MAX_SLOTS],
-																		char *playerNAT[MAX_SLOTS])
-{
-	if (m_qmStatus == QM_WORKING)
-	{
-		m_qmStatus = QM_MATCHED;
-		peerLeaveRoom(peer, GroupRoom, "");
-
-		Int i=0;
-		for (; i<MAX_SLOTS; ++i)
-		{
-			if (playerName[i] && stricmp(playerName[i], m_loginName.c_str()))
-			{
-				peerMessagePlayer( peer, playerName[i], "We're matched!", NormalMessage );
-			}
-		}
-
-		PeerResponse resp;
-		resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-		resp.qmStatus.status = QM_MATCHED;
-		for (i=0; i<MAX_SLOTS; ++i)
-		{
-			if (playerName[i])
-			{
-				resp.stagingRoomPlayerNames[i] = playerName[i];
-				resp.qmStatus.IP[i] = atoi(playerIP[i]);
-				resp.qmStatus.side[i] = atoi(playerSide[i]);
-				resp.qmStatus.color[i] = atoi(playerColor[i]);
-				resp.qmStatus.nat[i] = atoi(playerNAT[i]);
-			}
-			else
-			{
-				resp.stagingRoomPlayerNames[i] = "";
-				resp.qmStatus.IP[i] = 0;
-				resp.qmStatus.side[i] = 0;
-				resp.qmStatus.color[i] = 0;
-				resp.qmStatus.nat[i] = 0;
-			}
-		}
-		resp.qmStatus.seed = seed;
-		resp.qmStatus.mapIdx = mapIndex;
-		TheGameSpyPeerMessageQueue->addResponse(resp);
-	}
-}
-
-void PeerThreadClass::doQuickMatch( PEER peer )
-{
-	m_qmStatus = QM_JOININGQMCHANNEL;
-	Bool done = false;
-	matchbotProfileID = m_qmInfo.QM.botID;
-	setQMGroupRoom( m_qmInfo.QM.roomID );
-	m_sawMatchbot = false;
-	updateBuddyStatus( BUDDY_MATCHING );
-	while (!done && running)
-	{
-		if (!peerIsConnected( peer ))
-		{
-			done = true;
-		}
-		else
-		{
-			// update the network
-			peerThink( peer );
-
-			// end our timeslice
-			Switch_Thread();
-
-			PeerRequest incomingRequest;
-			if (TheGameSpyPeerMessageQueue->getRequest(incomingRequest))
-			{
-				switch (incomingRequest.peerRequestType)
-				{
-				case PeerRequest::PEERREQUEST_WIDENQUICKMATCHSEARCH:
-					{
-						if (m_qmStatus != QM_IDLE && m_qmStatus != QM_STOPPED && m_sawMatchbot)
-						{
-							peerMessagePlayer( peer, m_matchbotName.c_str(), "\\WIDEN", NormalMessage );
-						}
-					}
-					break;
-				case PeerRequest::PEERREQUEST_STOPQUICKMATCH:
-					{
-						m_qmStatus = QM_STOPPED;
-						peerLeaveRoom(peer, GroupRoom, "");
-						done = true;
-					}
-					break;
-				case PeerRequest::PEERREQUEST_LOGOUT:
-					{
-						m_qmStatus = QM_STOPPED;
-						peerLeaveRoom(peer, GroupRoom, "");
-						done = true;
-					}
-					break;
-				case PeerRequest::PEERREQUEST_LEAVEGROUPROOM:
-					{
-						m_qmStatus = QM_STOPPED;
-						peerLeaveRoom(peer, GroupRoom, "");
-						done = true;
-					}
-					break;
-				case PeerRequest::PEERREQUEST_UTMPLAYER:
-					{
-						peerUTMPlayer( peer, incomingRequest.nick.c_str(), incomingRequest.id.c_str(), incomingRequest.options.c_str(), PEERFalse );
-					}
-					break;
-				default:
-					{
-						DEBUG_CRASH(("Unanticipated request %d to peer thread!", incomingRequest.peerRequestType));
-					}
-					break;
-				}
-			}
-
-			if (!done)
-			{
-				// do the next bit of QM
-				switch (m_qmStatus)
-				{
-				case QM_JOININGQMCHANNEL:
-					{
-						PeerResponse resp;
-						resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-						resp.qmStatus.status = QM_JOININGQMCHANNEL;
-						TheGameSpyPeerMessageQueue->addResponse(resp);
-
-						m_groupRoomID = m_qmGroupRoom;
-						peerLeaveRoom( peer, GroupRoom, NULL );
-						peerLeaveRoom( peer, StagingRoom, NULL ); m_isHosting = false;
-						m_localRoomID = m_groupRoomID;
-						m_roomJoined = false;
-						DEBUG_LOG(("Requesting to join room %d in thread %X\n", m_localRoomID, this));
-						peerJoinGroupRoom( peer, m_localRoomID, joinRoomCallback, (void *)this, PEERTrue );
-						if (m_roomJoined)
-						{
-							resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-							resp.qmStatus.status = QM_LOOKINGFORBOT;
-							TheGameSpyPeerMessageQueue->addResponse(resp);
-
-							m_qmStatus = QM_LOOKINGFORBOT;
-							m_sawMatchbot = false;
-							m_sawEndOfEnumPlayers = false;
-							peerEnumPlayers( peer, GroupRoom, quickmatchEnumPlayersCallback, this );
-						}
-						else
-						{
-							resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-							resp.qmStatus.status = QM_COULDNOTFINDBOT;
-							TheGameSpyPeerMessageQueue->addResponse(resp);
-							done = true;
-							m_qmStatus = QM_STOPPED;
-						}
-					}
-					break;
-				case QM_LOOKINGFORBOT:
-					{
-						if (m_sawEndOfEnumPlayers)
-						{
-							if (m_sawMatchbot)
-							{
-								char buf[64];
-								std::string msg = "\\CINFO";
-								snprintf(buf, 64, "\\Widen\\%d", m_qmInfo.QM.widenTime);
-								msg.append(buf);
-								snprintf(buf, 64, "\\LadID\\%d", m_qmInfo.QM.ladderID);
-								msg.append(buf);
-								snprintf(buf, 64, "\\LadPass\\%d", m_qmInfo.QM.ladderPassCRC);
-								msg.append(buf);
-								snprintf(buf, 64, "\\PointsMin\\%d", m_qmInfo.QM.minPointPercentage);
-								msg.append(buf);
-								snprintf(buf, 64, "\\PointsMax\\%d", m_qmInfo.QM.maxPointPercentage);
-								msg.append(buf);
-								snprintf(buf, 64, "\\Points\\%d", m_qmInfo.QM.points);
-								msg.append(buf);
-								snprintf(buf, 64, "\\Discons\\%d", m_qmInfo.QM.discons);
-								msg.append(buf);
-								snprintf(buf, 64, "\\DisconMax\\%d", m_qmInfo.QM.maxDiscons);
-								msg.append(buf);
-								snprintf(buf, 64, "\\NumPlayers\\%d", m_qmInfo.QM.numPlayers);
-								msg.append(buf);
-								snprintf(buf, 64, "\\Pings\\%s", m_qmInfo.QM.pings);
-								msg.append(buf);
-								snprintf(buf, 64, "\\IP\\%d", ntohl(peerGetLocalIP(peer)));// not ntohl(localIP), as we need EXTERNAL address for proper NAT negotiation!
-								msg.append(buf);
-								snprintf(buf, 64, "\\Side\\%d", m_qmInfo.QM.side);
-								msg.append(buf);
-								snprintf(buf, 64, "\\Color\\%d", m_qmInfo.QM.color);
-								msg.append(buf);
-								snprintf(buf, 64, "\\NAT\\%d", m_qmInfo.QM.NAT);
-								msg.append(buf);
-								snprintf(buf, 64, "\\EXE\\%d", m_qmInfo.QM.exeCRC);
-								msg.append(buf);
-								snprintf(buf, 64, "\\INI\\%d", m_qmInfo.QM.iniCRC);
-								msg.append(buf);
-								buf[0] = 0;
-								msg.append("\\Maps\\");
-								for (size_t i=0; i<m_qmInfo.qmMaps.size(); ++i)
-								{
-									if (m_qmInfo.qmMaps[i])
-										msg.append("1");
-									else
-										msg.append("0");
-								}
-								DEBUG_LOG(("Sending QM options of [%s] to %s\n", msg.c_str(), m_matchbotName.c_str()));
-								peerMessagePlayer( peer, m_matchbotName.c_str(), msg.c_str(), NormalMessage );
-								m_qmStatus = QM_WORKING;
-								PeerResponse resp;
-								resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-								resp.qmStatus.status = QM_SENTINFO;
-								TheGameSpyPeerMessageQueue->addResponse(resp);
-							}
-							else
-							{
-								// no QM bot.  Bail.
-								PeerResponse resp;
-								resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-								resp.qmStatus.status = QM_COULDNOTFINDBOT;
-								TheGameSpyPeerMessageQueue->addResponse(resp);
-
-								m_qmStatus = QM_STOPPED;
-								peerLeaveRoom(peer, GroupRoom, "");
-								done = true;
-							}
-						}
-					}
-					break;
-				case QM_WORKING:
-					{
-					}
-					break;
-				case QM_MATCHED:
-					{
-						// leave QM channel, and clean up.  Our work here is done.
-						peerLeaveRoom( peer, GroupRoom, NULL );
-						peerLeaveRoom( peer, StagingRoom, NULL ); m_isHosting = false;
-
-						m_qmStatus = QM_STOPPED;
-						peerLeaveRoom(peer, GroupRoom, "");
-						done = true;
-					}
-					break;
-				case QM_INCHANNEL:
-					{
-					}
-					break;
-				case QM_NEGOTIATINGFIREWALLS:
-					{
-					}
-					break;
-				case QM_STARTINGGAME:
-					{
-					}
-					break;
-				case QM_COULDNOTFINDCHANNEL:
-					{
-					}
-					break;
-				case QM_COULDNOTNEGOTIATEFIREWALLS:
-					{
-					}
-					break;
-				}
-			}
-		}
-	}
-	updateBuddyStatus( BUDDY_ONLINE );
-}
-
-static void getPlayerProfileIDCallback(PEER peer,  PEERBool success,  const char * nick,  int profileID,  void * param)
-{
-	if (success && param != NULL)
-	{
-		*((Int *)param) = profileID;
-	}
-}
-
-static void stagingRoomPlayerEnum( PEER peer, PEERBool success, RoomType roomType, int index, const char * nick, int flags, void * param )
-{
-	DEBUG_LOG(("Enum: success=%d, index=%d, nick=%s, flags=%d\n", success, index, nick, flags));
-	if (!nick || !success)
-		return;
-
-	Int id = 0;
-	peerGetPlayerProfileID(peer, nick, getPlayerProfileIDCallback, &id, PEERTrue);
-	DEBUG_ASSERTCRASH(id != 0, ("Failed to fetch player ID!"));
-
-	PeerResponse *resp = (PeerResponse *)param;
-	if (flags & PEER_FLAG_OP)
-	{
-		resp->joinStagingRoom.isHostPresent = TRUE;
-	}
-	if (index < MAX_SLOTS)
-	{
-		resp->stagingRoomPlayerNames[index] = nick;
-	}
-
-	if (id)
-	{
-		PSRequest req;
-		req.requestType = PSRequest::PSREQUEST_READPLAYERSTATS;
-		req.player.id = id;
-		TheGameSpyPSMessageQueue->addRequest(req);
-	}
-}
-
-static void joinRoomCallback(PEER peer, PEERBool success, PEERJoinResult result, RoomType roomType, void *param)
-{
-	DEBUG_LOG(("JoinRoomCallback: success==%d, result==%d\n", success, result));
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-		return;
-	DEBUG_LOG(("Room id was %d from thread %X\n", t->getLocalRoomID(), t));
-	DEBUG_LOG(("Current staging server name is [%ls]\n", t->getLocalStagingServerName().c_str()));
-	DEBUG_LOG(("Room type is %d (GroupRoom=%d, StagingRoom=%d, TitleRoom=%d)\n", roomType, GroupRoom, StagingRoom, TitleRoom));
-
-#ifdef USE_BROADCAST_KEYS
-	if (success)
-	{
-		t->pushStatsToRoom(peer);
-		t->getStatsFromRoom(peer, roomType);
-	}
-#endif // USE_BROADCAST_KEYS
-
-	switch (roomType)
-	{
-		case GroupRoom:
-			{
-#ifdef USE_BROADCAST_KEYS
-				t->clearPlayerStats(GroupRoom);
-#endif // USE_BROADCAST_KEYS
-				PeerResponse resp;
-				resp.peerResponseType = PeerResponse::PEERRESPONSE_JOINGROUPROOM;
-				resp.joinGroupRoom.id = t->getLocalRoomID();
-				resp.joinGroupRoom.ok = success;
-				TheGameSpyPeerMessageQueue->addResponse(resp);
-				t->roomJoined(success == PEERTrue);
-				DEBUG_LOG(("Entered group room %d, qm is %d\n", t->getLocalRoomID(), t->getQMGroupRoom()));
-				if ((!t->getQMGroupRoom()) || (t->getQMGroupRoom() != t->getLocalRoomID()))
-				{
-					DEBUG_LOG(("Updating buddy status\n"));
-					updateBuddyStatus( BUDDY_LOBBY, t->getLocalRoomID() );
-				}
-			}
-			break;
-		case StagingRoom:
-			{
-#ifdef USE_BROADCAST_KEYS
-				t->clearPlayerStats(StagingRoom);
-#endif // USE_BROADCAST_KEYS
-				PeerResponse resp;
-				resp.peerResponseType = PeerResponse::PEERRESPONSE_JOINSTAGINGROOM;
-				resp.joinStagingRoom.id = t->getLocalRoomID();
-				resp.joinStagingRoom.ok = success;
-				resp.joinStagingRoom.result = result;
-				if (success)
-				{
-					DEBUG_LOG(("joinRoomCallback() - game name is now '%ls'\n", t->getLocalStagingServerName().c_str()));
-					updateBuddyStatus( BUDDY_STAGING, 0, WideCharStringToMultiByte(t->getLocalStagingServerName().c_str()) );
-				}
-
-				resp.joinStagingRoom.isHostPresent = FALSE;
-				DEBUG_LOG(("Enum of staging room players\n"));
-				peerEnumPlayers(peer, StagingRoom, stagingRoomPlayerEnum, &resp);
-				DEBUG_LOG(("Host %s present\n", (resp.joinStagingRoom.isHostPresent)?"is":"is not"));
-
-				TheGameSpyPeerMessageQueue->addResponse(resp);
-			}
-			break;
-	}
-}
-
-// Gets called once for each group room when listing group rooms.
-// After this has been called for each group room, it will be
-// called one more time with groupID==0 and name==NULL.
-/////////////////////////////////////////////////////////////////
-static void listGroupRoomsCallback(PEER peer, PEERBool success,
-														int groupID, SBServer server,
-														const char * name, int numWaiting,
-														int maxWaiting, int numGames,
-														int numPlaying, void * param)
-{
-	DEBUG_LOG(("listGroupRoomsCallback, success=%d, server=%X, groupID=%d\n", success, server, groupID));
-#ifdef SERVER_DEBUGGING
-	CheckServers(peer);
-#endif // SERVER_DEBUGGING
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t)
-	{
-		DEBUG_LOG(("No thread!  Bailing!\n"));
-		return;
-	}
-
-	if (success)
-	{
-		DEBUG_LOG(("Saw group room of %d (%s) at address %X %X\n", groupID, name, server, (server)?server->keyvals:0));
-		PeerResponse resp;
-		resp.peerResponseType = PeerResponse::PEERRESPONSE_GROUPROOM;
-		resp.groupRoom.id = groupID;
-		resp.groupRoom.numWaiting = numWaiting;
-		resp.groupRoom.maxWaiting = maxWaiting;
-		resp.groupRoom.numGames = numGames;
-		resp.groupRoom.numPlaying = numPlaying;
-		if (name)
-		{
-			resp.groupRoomName = name;
-			//t->setQMGroupRoom(groupID);
-		}
-		TheGameSpyPeerMessageQueue->addResponse(resp);
-#ifdef SERVER_DEBUGGING
-		CheckServers(peer);
-		DEBUG_LOG(("\n"));
-#endif // SERVER_DEBUGGING
-	}
-	else
-	{
-		DEBUG_LOG(("Failure!\n"));
-	}
-}
-
-void PeerThreadClass::connectCallback( PEER peer, PEERBool success )
-{
-	PeerResponse resp;
-	if(!success)
-	{
-		//updateBuddyStatus( BUDDY_OFFLINE );
-		resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
-		resp.discon.reason = DISCONNECT_COULDNOTCONNECT;
-		TheGameSpyPeerMessageQueue->addResponse(resp);
-		return;
-	}
-
-	updateBuddyStatus( BUDDY_ONLINE );
-
-	m_isConnected = true;
-	DEBUG_LOG(("Connected as profile %d (%s)\n", m_profileID, m_loginName.c_str()));
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_LOGIN;
-	resp.player.profileID = m_profileID;
-	resp.nick = m_loginName;
-	GetLocalChatConnectionAddress("peerchat.gamespy.com", 6667, localIP);
-	chatSetLocalIP(localIP);
-	resp.player.internalIP = ntohl(localIP);
-	resp.player.externalIP = ntohl(peerGetLocalIP(peer));
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-
-	PSRequest psReq;
-	psReq.requestType = PSRequest::PSREQUEST_READPLAYERSTATS;
-	psReq.player.id = m_profileID;
-	psReq.nick = m_originalName;
-	psReq.email = m_email;
-	psReq.password = m_password;
-	TheGameSpyPSMessageQueue->addRequest(psReq);
-
-#ifdef SERVER_DEBUGGING
-	DEBUG_LOG(("Before peerListGroupRooms()\n"));
-	CheckServers(peer);
-#endif // SERVER_DEBUGGING
-	peerListGroupRooms( peer, NULL, listGroupRoomsCallback, this, PEERTrue );
-#ifdef SERVER_DEBUGGING
-	DEBUG_LOG(("After peerListGroupRooms()\n"));
-	CheckServers(peer);
-#endif // SERVER_DEBUGGING
-}
-
-void PeerThreadClass::nickErrorCallback( PEER peer, Int type, const char *nick )
-{
-	if(type == PEER_IN_USE)
-	{
-		Int len = strlen(nick);
-		std::string nickStr = nick;
-		Int newVal = 0;
-		if (nick[len-1] == '}' && nick[len-3] == '{' && isdigit(nick[len-2]))
-		{
-			newVal = nick[len-2] - '0' + 1;
-			nickStr.erase(len-3, 3);
-		}
-
-		DEBUG_LOG(("Nickname taken: was %s, new val = %d, new nick = %s\n", nick, newVal, nickStr.c_str()));
-
-		if (newVal < 10)
-		{
-			nickStr.append("{");
-			char tmp[2];
-			tmp[0] = '0'+newVal;
-			tmp[1] = '\0';
-			nickStr.append(tmp);
-			nickStr.append("}");
-			// Retry the connect with a similar nick.
-			m_loginName = nickStr;
-			peerRetryWithNick(peer, nickStr.c_str());
-		}
-		else
-		{
-			PeerResponse resp;
-			resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
-			resp.discon.reason = DISCONNECT_NICKTAKEN;
-			TheGameSpyPeerMessageQueue->addResponse(resp);
-
-			// Cancel the connect.
-			peerRetryWithNick(peer, NULL);
-		}
-	}
-	else
-	{
-		PeerResponse resp;
-		resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
-		resp.discon.reason = DISCONNECT_BADNICK;
-		TheGameSpyPeerMessageQueue->addResponse(resp);
-
-		// Cancel the connect.
-		peerRetryWithNick(peer, NULL);
-	}
-}
-
-void disconnectedCallback(PEER peer, const char * reason, void * param)
-{
-	DEBUG_LOG(("disconnectedCallback(): reason was '%s'\n", reason));
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (t)
-		t->markAsDisconnected();
-	//updateBuddyStatus( BUDDY_OFFLINE );
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_DISCONNECT;
-	resp.discon.reason = DISCONNECT_LOSTCON;
-	SerialAuthResult res = TheGameSpyPeerMessageQueue->getSerialAuthResult();
-	switch (res)
-	{
-		case SERIAL_NONEXISTENT:
-			resp.discon.reason = DISCONNECT_SERIAL_NOT_PRESENT;
-			break;
-		case SERIAL_AUTHFAILED:
-			resp.discon.reason = DISCONNECT_SERIAL_INVALID;
-			break;
-		case SERIAL_BANNED:
-			resp.discon.reason = DISCONNECT_SERIAL_BANNED;
-			break;
-	}
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-void roomMessageCallback(PEER peer, RoomType roomType, const char * nick, const char * message, MessageType messageType, void * param)
-{
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_MESSAGE;
-	resp.nick = nick;
-	resp.text = MultiByteToWideCharSingleLine(message);
-	resp.message.isPrivate = FALSE;
-	resp.message.isAction = (messageType == ActionMessage);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-	DEBUG_LOG(("Saw text [%hs] (%ls) %d chars Orig was %s (%d chars)\n", nick, resp.text.c_str(), resp.text.length(), message, strlen(message)));
-
-	UnsignedInt IP;
-	peerGetPlayerInfoNoWait(peer, nick, &IP, &resp.message.profileID);
-	
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (t && (t->getQMStatus() != QM_IDLE && t->getQMStatus() != QM_STOPPED))
-	{
-		if (resp.message.profileID == matchbotProfileID)
-		{
-			char *lastStr = NULL;
-			char *cmd = strtok_r((char *)message, " ", &lastStr);
-			if ( cmd && strcmp(cmd, "MBOT:POOLSIZE") == 0 )
-			{
-				Int poolSize = 0;
-
-				while (1)
-				{
-					char *poolStr = strtok_r(NULL, " ", &lastStr);
-					char *sizeStr = strtok_r(NULL, " ", &lastStr);
-					if (poolStr && sizeStr)
-					{
-						Int pool = atoi(poolStr);
-						Int size = atoi(sizeStr);
-						if (pool == t->getQMLadder())
-						{
-							poolSize = size;
-							break;
-						}
-					}
-					else
-						break;
-				}
-
-				PeerResponse resp;
-				resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-				resp.qmStatus.status = QM_POOLSIZE;
-				resp.qmStatus.poolSize = poolSize;
-				TheGameSpyPeerMessageQueue->addResponse(resp);
-			}
-		}
-	}
-}
-
-void gameStartedCallback( PEER peer, SBServer server, const char *message, void *param )
-{
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_GAMESTART;
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-void playerMessageCallback(PEER peer, const char * nick, const char * message, MessageType messageType, void * param)
-{
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_MESSAGE;
-	resp.nick = nick;
-	resp.text = MultiByteToWideCharSingleLine(message);
-	resp.message.isPrivate = TRUE;
-	resp.message.isAction = (messageType == ActionMessage);
-	UnsignedInt IP;
-	peerGetPlayerInfoNoWait(peer, nick, &IP, &resp.message.profileID);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (t && (t->getQMStatus() != QM_IDLE && t->getQMStatus() != QM_STOPPED))
-	{
-		if (resp.message.isPrivate && resp.message.profileID == matchbotProfileID)
-		{
-			char *lastStr = NULL;
-			char *cmd = strtok_r((char *)message, " ", &lastStr);
-			if ( cmd && strcmp(cmd, "MBOT:MATCHED") == 0 )
-			{
-				char *mapNumStr = strtok_r(NULL, " ", &lastStr);
-				char *seedStr = strtok_r(NULL, " ", &lastStr);
-				char *playerStr[MAX_SLOTS];
-				char *playerIPStr[MAX_SLOTS];
-				char *playerSideStr[MAX_SLOTS];
-				char *playerColorStr[MAX_SLOTS];
-				char *playerNATStr[MAX_SLOTS];
-				Int numPlayers = 0;
-				for (Int i=0; i<MAX_SLOTS; ++i)
-				{
-					playerStr[i] = strtok_r(NULL, " ", &lastStr);
-					playerIPStr[i] = strtok_r(NULL, " ", &lastStr);
-					playerSideStr[i] = strtok_r(NULL, " ", &lastStr);
-					playerColorStr[i] = strtok_r(NULL, " ", &lastStr);
-					playerNATStr[i] = strtok_r(NULL, " ", &lastStr);
-					if (playerNATStr[i])
-					{
-						++numPlayers;
-					}
-					else
-					{
-						playerStr[i] = NULL;
-						playerIPStr[i] = NULL;
-						playerSideStr[i] = NULL;
-						playerColorStr[i] = NULL;
-						playerNATStr[i] = NULL;
-					}
-				}
-
-				if (numPlayers > 1)
-				{
-					// woohoo!  got everything needed for a match!
-					DEBUG_LOG(("Saw %d-player QM match: map index = %s, seed = %s\n", numPlayers, mapNumStr, seedStr));
-					t->handleQMMatch(peer, atoi(mapNumStr), atoi(seedStr), playerStr, playerIPStr, playerSideStr, playerColorStr, playerNATStr);
-				}
-			}
-			else if ( cmd && strcmp(cmd, "MBOT:WORKING") == 0 )
-			{
-				Int poolSize = 0;
-				char *poolStr = strtok_r(NULL, " ", &lastStr);
-				if (poolStr)
-					poolSize = atoi(poolStr);
-				PeerResponse resp;
-				resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-				resp.qmStatus.status = QM_WORKING;
-				resp.qmStatus.poolSize = poolSize;
-				TheGameSpyPeerMessageQueue->addResponse(resp);
-			}
-			else if ( cmd && strcmp(cmd, "MBOT:WIDENINGSEARCH") == 0 )
-			{
-				PeerResponse resp;
-				resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-				resp.qmStatus.status = QM_WIDENINGSEARCH;
-				TheGameSpyPeerMessageQueue->addResponse(resp);
-			}
-		}
-	}
-}
-
-void roomUTMCallback(PEER peer, RoomType roomType, const char * nick, const char * command, const char * parameters, PEERBool authenticated, void * param)
-{
-	DEBUG_LOG(("roomUTMCallback: %s says %s = [%s]\n", nick, command, parameters));
-	if (roomType != StagingRoom)
-		return;
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_ROOMUTM;
-	resp.nick = nick;
-	resp.command = command;
-	resp.commandOptions = parameters;
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-void playerUTMCallback(PEER peer, const char * nick, const char * command, const char * parameters, PEERBool authenticated, void * param)
-{
-	DEBUG_LOG(("playerUTMCallback: %s says %s = [%s]\n", nick, command, parameters));
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERUTM;
-	resp.nick = nick;
-	resp.command = command;
-	resp.commandOptions = parameters;
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-static void getPlayerInfo(PeerThreadClass *t, PEER peer, const char *nick, Int& id, UnsignedInt& IP,
-													std::string& locale, Int& wins, Int& losses, Int& rankPoints, Int& side, Int& preorder,
-													RoomType roomType, Int& flags)
-{
-	if (!t || !nick)
-		return;
-	peerGetPlayerInfoNoWait(peer, nick, &IP, &id);
-#ifdef USE_BROADCAST_KEYS
-	//locale.printf
-	Int localeIndex = t->lookupStatForPlayer(roomType, nick, "b_locale");
-	AsciiString tmp;
-	tmp.format("%d", localeIndex);
-	locale = tmp.str();
-
-	wins = t->lookupStatForPlayer(roomType, nick, "b_wins");
-	losses = t->lookupStatForPlayer(roomType, nick, "b_losses");
-	rankPoints = t->lookupStatForPlayer(roomType, nick, "b_points");
-	side = t->lookupStatForPlayer(roomType, nick, "b_side");
-	preorder = t->lookupStatForPlayer(roomType, nick, "b_pre");
-#else // USE_BROADCAST_KEYS
-	const char *s;
-	s = peerGetGlobalWatchKey(peer, nick, "locale");
-	locale = (s)?s:"";
-	s = peerGetGlobalWatchKey(peer, nick, "wins");
-	wins = atoi((s)?s:"");
-	s = peerGetGlobalWatchKey(peer, nick, "losses");
-	losses = atoi((s)?s:"");
-	s = peerGetGlobalWatchKey(peer, nick, "points");
-	rankPoints = atoi((s)?s:"");
-	s = peerGetGlobalWatchKey(peer, nick, "side");
-	side = atoi((s)?s:"");
-	s = peerGetGlobalWatchKey(peer, nick, "pre");
-	preorder = atoi((s)?s:"");
-#endif // USE_BROADCAST_KEYS
-	flags = 0;
-	peerGetPlayerFlags(peer, nick, roomType, &flags);
-	DEBUG_LOG(("getPlayerInfo(%d) - %s has locale %s, wins:%d, losses:%d, rankPoints:%d, side:%d, preorder:%d\n",
-		id, nick, locale.c_str(), wins, losses, rankPoints, side, preorder));
-}
-
-static void roomKeyChangedCallback(PEER peer, RoomType roomType, const char *nick, const char *key, const char *val, void *param)
-{
-#ifdef USE_BROADCAST_KEYS
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t || !nick || !key || !val)
-	{
-		DEBUG_ASSERTCRASH(nick && strcmp(nick,"(END)")==0, ("roomKeyChangedCallback bad values = nick:%X:%s, key:%X:%s, val:%X:%s\n", nick, nick, key, key, val, val));
-		return;
-	}
-
-#ifdef DEBUG_LOGGING
-	if (strcmp(key, "username") && strcmp(key, "b_flags"))
-	{
-		DEBUG_LOG(("roomKeyChangedCallback() - %s set %s=%s\n", nick, key, val));
-	}
-#endif
-
-	t->trackStatsForPlayer(roomType, nick, key, val);
-
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERINFO;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		resp.player.roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-#endif // USE_BROADCAST_KEYS
-}
-
-#ifdef USE_BROADCAST_KEYS
-void getRoomKeysCallback(PEER peer, PEERBool success, RoomType roomType, const char *nick, int num, char **keys, char **values, void *param)
-{
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t || !nick || !num || !success || !keys || !values)
-	{
-		DEBUG_ASSERTCRASH(!nick || strcmp(nick,"(END)")==0, ("getRoomKeysCallback bad key/value %X/%X, nick=%s", keys, values, nick));
-		return;
-	}
-
-	for (Int i=0; i<num; ++i)
-	{
-		t->trackStatsForPlayer(roomType, nick, keys[i], values[i]);
-	}
-
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERINFO;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		resp.player.roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-#endif // USE_BROADCAST_KEYS
-
-static void globalKeyChangedCallback(PEER peer, const char *nick, const char *key, const char *val, void *param)
-{
-	if (!nick)
-		return;
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t)
-		return;
-
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERINFO;
-	resp.nick = nick;
-	resp.player.roomType = t->getCurrentGroupRoom()?GroupRoom:StagingRoom;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		resp.player.roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-void playerJoinedCallback(PEER peer, RoomType roomType, const char * nick, void * param)
-{
-	if (!nick)
-		return;
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t)
-		return;
-
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERJOIN;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-void playerLeftCallback(PEER peer, RoomType roomType, const char * nick, const char * reason, void * param)
-{
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERLEFT;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-	resp.player.profileID = 0;
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t)
-		return;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-
-//	PeerThreadClass *t = (PeerThreadClass *)param;
-//	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (t->getQMStatus() != QM_IDLE && t->getQMStatus() != QM_STOPPED)
-	{
-		if (!stricmp(t->getQMBotName().c_str(), nick))
-		{
-			// matchbot left - bail
-			PeerResponse resp;
-			resp.peerResponseType = PeerResponse::PEERRESPONSE_QUICKMATCHSTATUS;
-			resp.qmStatus.status = QM_COULDNOTFINDBOT;
-			TheGameSpyPeerMessageQueue->addResponse(resp);
-
-			PeerRequest req;
-			req.peerRequestType = PeerRequest::PEERREQUEST_STOPQUICKMATCH;
-			TheGameSpyPeerMessageQueue->addRequest(req);
-		}
-	}
-}
-
-void playerChangedNickCallback(PEER peer, RoomType roomType, const char * oldNick, const char * newNick, void * param)
-{
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERCHANGEDNICK;
-	resp.nick = newNick;
-	resp.oldNick = oldNick;
-	resp.player.roomType = roomType;
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t)
-		return;
-
-	getPlayerInfo(t, peer, newNick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-static void playerInfoCallback(PEER peer, RoomType roomType, const char * nick, unsigned int IP, int profileID, void * param)
-{
-	if (!nick)
-		return;
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERINFO;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t)
-		return;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		roomType, resp.player.flags);
-DEBUG_LOG(("**GS playerInfoCallback name=%s, local=%s\n", nick, resp.locale.c_str() ));
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-static void playerFlagsChangedCallback(PEER peer, RoomType roomType, const char * nick, int oldFlags, int newFlags, void * param)
-{
-	if (!nick)
-		return;
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_PLAYERCHANGEDFLAGS;
-	resp.nick = nick;
-	resp.player.roomType = roomType;
-
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(t, ("No Peer thread!"));
-	if (!t)
-		return;
-
-	getPlayerInfo(t, peer, nick, resp.player.profileID, resp.player.IP,
-		resp.locale, resp.player.wins, resp.player.losses,
-		resp.player.rankPoints, resp.player.side, resp.player.preorder,
-		roomType, resp.player.flags);
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-#ifdef DEBUG_LOGGING
-/*
-static void enumFunc(char *key, char *val, void *param)
-{
-	DEBUG_LOG(("  [%s] = [%s]\n", key, val));
-}
-*/
-#endif
-
-static void listingGamesCallback(PEER peer, PEERBool success, const char * name, SBServer server, PEERBool staging, int msg, Int percentListed, void * param)
-{
-	PeerThreadClass *t = (PeerThreadClass *)param;
-	if (!t || !success)
-		return;
-
-#ifdef DEBUG_LOGGING
-	AsciiString cmdStr = "<Unknown>";
-	switch(msg)
-	{
-		case PEER_ADD:
-			cmdStr = "PEER_ADD";
-			break;
-		case PEER_UPDATE:
-			cmdStr = "PEER_UPDATE";
-			break;
-		case PEER_REMOVE:
-			cmdStr = "PEER_REMOVE";
-			break;
-		case PEER_CLEAR:
-			cmdStr = "PEER_CLEAR";
-			break;
-		case PEER_COMPLETE:
-			cmdStr = "PEER_COMPLETE";
-			break;
-	}
-	DEBUG_LOG(("listingGamesCallback() - doing command %s on server %X\n", cmdStr.str(), server));
-#endif // DEBUG_LOGGING
-
-//	PeerThreadClass *t = (PeerThreadClass *)param;
-	DEBUG_ASSERTCRASH(name || msg==PEER_CLEAR || msg==PEER_COMPLETE, ("Game has no name!\n"));
-	if (!t || !success || (!name && (msg == PEER_ADD || msg == PEER_UPDATE)))
-	{
-		DEBUG_LOG(("Bailing from listingGamesCallback() - success=%d, name=%X, server=%X, msg=%X\n", success, name, server, msg));
-		return;
-	}
-	if (!name)
-		name = "bogus";
-
-	if (server && (msg == PEER_ADD || msg == PEER_UPDATE))
-	{
-		DEBUG_ASSERTCRASH(server->keyvals, ("Looking at an already-freed server for msg type %d!", msg));
-		if (!server->keyvals)
-		{
-			msg = PEER_REMOVE;
-		}
-	}
-
-	if (server && success && (msg == PEER_ADD || msg == PEER_UPDATE))
-	{
-		DEBUG_LOG(("Game name is '%s'\n", name));
-		const char *newname = SBServerGetStringValue(server, "gamename", (char *)name);
-		if (strcmp(newname, "ccgenzh"))
-			name = newname;
-		DEBUG_LOG(("Game name is now '%s'\n", name));
-	}
-
-	DEBUG_LOG(("listingGamesCallback - got percent complete %d\n", percentListed));
-	if (percentListed == 100)
-	{
-		if (!t->getSawCompleteGameList())
-		{
-			t->setSawCompleteGameList(TRUE);
-			PeerResponse completeResp;
-			completeResp.peerResponseType = PeerResponse::PEERRESPONSE_STAGINGROOMLISTCOMPLETE;
-			TheGameSpyPeerMessageQueue->addResponse(completeResp);
-		}
-	}
-
-	AsciiString gameName = name;
-	AsciiString tmp = gameName;
-	AsciiString hostName;
-	tmp.nextToken(&hostName, " ");
-	const char *firstSpace = gameName.find(' ');
-	if(firstSpace)
-	{
-		gameName.set(firstSpace + 1);
-		//gameName.trim();
-		DEBUG_LOG(("Hostname/Gamename split leaves '%s' hosting '%s'\n", hostName.str(), gameName.str()));
-	}
-	PeerResponse resp;
-	resp.peerResponseType = PeerResponse::PEERRESPONSE_STAGINGROOM;
-	resp.stagingRoom.action = msg;
-	resp.stagingRoom.isStaging = staging;
-	resp.stagingRoom.percentComplete = percentListed;
-
-	if (server && (msg == PEER_ADD || msg == PEER_UPDATE))
-	{
-		Bool hasPassword = (Bool)SBServerGetIntValue(server, PW_STR, FALSE);
-		Bool allowObservers = (Bool)SBServerGetIntValue(server, OBS_STR, FALSE);
-    Bool usesStats = (Bool)SBServerGetIntValue(server, USE_STATS_STR, TRUE);
-		const char *verStr = SBServerGetStringValue(server, "gamever", "000000");
-		const char *exeStr = SBServerGetStringValue(server, EXECRC_STR, "000000");
-		const char *iniStr = SBServerGetStringValue(server, INICRC_STR, "000000");
-		const char *ladIPStr = SBServerGetStringValue(server, LADIP_STR, "000000");
-		const char *pingStr = SBServerGetStringValue(server, PINGSTR_STR, "FFFFFFFFFFFFFFFF");
-		UnsignedShort ladPort = (UnsignedShort)SBServerGetIntValue(server, LADPORT_STR, 0);
-		UnsignedInt verVal = strtoul(verStr, NULL, 10);
-		UnsignedInt exeVal = strtoul(exeStr, NULL, 10);
-		UnsignedInt iniVal = strtoul(iniStr, NULL, 10);
-		resp.stagingRoom.requiresPassword = hasPassword;
-		resp.stagingRoom.allowObservers = allowObservers;
-    resp.stagingRoom.useStats = usesStats;
-		resp.stagingRoom.version = verVal;
-		resp.stagingRoom.exeCRC = exeVal;
-		resp.stagingRoom.iniCRC = iniVal;
-		resp.stagingServerLadderIP = ladIPStr;
-		resp.stagingServerPingString = pingStr;
-		resp.stagingRoom.ladderPort = ladPort;
-		resp.stagingRoom.numPlayers = SBServerGetIntValue(server, NUMPLAYER_STR, 0);
-		resp.stagingRoom.numObservers = SBServerGetIntValue(server, NUMOBS_STR, 0);
-		resp.stagingRoom.maxPlayers = SBServerGetIntValue(server, MAXPLAYER_STR, 8);
-		resp.stagingRoomMapName = SBServerGetStringValue(server, "mapname", "");
-		for (Int i=0; i<MAX_SLOTS; ++i)
-		{
-			resp.stagingRoomPlayerNames[i] = SBServerGetPlayerStringValue(server, i, NAME__STR, "");
-			resp.stagingRoom.wins[i] = SBServerGetPlayerIntValue(server, i, WINS__STR, 0);
-			resp.stagingRoom.losses[i] = SBServerGetPlayerIntValue(server, i, LOSSES__STR, 0);
-			resp.stagingRoom.profileID[i] = SBServerGetPlayerIntValue(server, i, "pid", 0);
-			resp.stagingRoom.color[i] = SBServerGetPlayerIntValue(server, i, COLOR__STR, 0);
-			resp.stagingRoom.faction[i] = SBServerGetPlayerIntValue(server, i, FACTION__STR, 0);
-#ifdef DEBUG_LOGGING
-			if (resp.stagingRoomPlayerNames[i].length())
-			{
-				DEBUG_LOG(("Player %d raw stuff: [%s] [%d] [%d] [%d]\n", i, resp.stagingRoomPlayerNames[i].c_str(), resp.stagingRoom.wins[i], resp.stagingRoom.losses[i], resp.stagingRoom.profileID[i]));
-			}
-#endif
-		}
-		if (resp.stagingRoomPlayerNames[0].empty())
-		{
-			resp.stagingRoomPlayerNames[0] = hostName.str();
-		}
-		DEBUG_ASSERTCRASH(resp.stagingRoomPlayerNames[0].empty() == false, ("No host!"));
-		DEBUG_LOG(("Raw stuff: [%s] [%s] [%s] [%d] [%d] [%d]\n", verStr, exeStr, iniStr, hasPassword, allowObservers, usesStats));
-		DEBUG_LOG(("Raw stuff: [%s] [%s] [%d]\n", pingStr, ladIPStr, ladPort));
-		DEBUG_LOG(("Saw game with stuff %s %d %X %X %X %s\n", resp.stagingRoomMapName.c_str(), hasPassword, verVal, exeVal, iniVal, SBServerGetStringValue(server, "password", "missing")));
-#ifdef PING_TEST
-	PING_LOG(("%s\n", pingStr));
-#endif
-	}
-
-	if (msg == PEER_ADD || msg == PEER_UPDATE)
-	{
-		if (!resp.stagingRoom.exeCRC || !resp.stagingRoom.iniCRC)
-		{
-			if (SBServerHasBasicKeys(server))
-			{
-				DEBUG_LOG(("Server %x does not have basic keys\n", server));
-				return;
-			}
-			else
-			{
-				DEBUG_LOG(("Server %x has basic keys, yet has no info\n", server));
-			}
-			if (msg == PEER_UPDATE)
-			{
-				PeerRequest req;
-				req.peerRequestType = PeerRequest::PEERREQUEST_GETEXTENDEDSTAGINGROOMINFO;
-				req.stagingRoom.id = t->findServer( server );
-				DEBUG_LOG(("Add/update a 0/0 server %X (%d, %s) - requesting full update to see if that helps.\n",
-					server, resp.stagingRoom.id, gameName.str()));
-				TheGameSpyPeerMessageQueue->addRequest(req);
-			}
-			return; // don't actually try to list it.
-		}
-	}
-
-	switch (msg)
-	{
-		case PEER_CLEAR:
-			t->clearServers();
-			break;
-		case PEER_ADD:
-		case PEER_UPDATE:
-			resp.stagingRoom.id = t->findServer( server );
-			DEBUG_LOG(("Add/update on server %X (%d, %s)\n", server, resp.stagingRoom.id, gameName.str()));
-			resp.stagingServerName = MultiByteToWideCharSingleLine( gameName.str() );
-			DEBUG_LOG(("Server had basic=%d, full=%d\n", SBServerHasBasicKeys(server), SBServerHasFullKeys(server)));
-#ifdef DEBUG_LOGGING
-			//SBServerEnumKeys(server, enumFunc, NULL);
-#endif
-			break;
-		case PEER_REMOVE:
-			DEBUG_LOG(("Removing server %X (%d)\n", server, resp.stagingRoom.id));
-			resp.stagingRoom.id = t->removeServerFromMap( server );
-			break;
-	}
-
-	TheGameSpyPeerMessageQueue->addResponse(resp);
-}
-
-//-------------------------------------------------------------------------
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
deleted file mode 100644
index 81f48a598dc..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
+++ /dev/null
@@ -1,1480 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PersistentStorageThread.cpp //////////////////////////////////////////////////////
-// GameSpy Persistent Storage thread
-// This thread communicates with GameSpy's persistent storage server
-// and talks through a message queue with the rest of
-// the game.
-// Author: Matthew D. Campbell, July 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/UserPreferences.h"
-#include "Common/PlayerTemplate.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-
-#include "mutex.h"
-#include "thread.h"
-
-#include "Common/StackDump.h"
-#include "Common/SubsystemInterface.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-------------------------------------------------------------------------
-
-PSRequest::PSRequest()
-{
-	player.reset();
-	requestType = PSREQUEST_READPLAYERSTATS;
-	addDiscon = addDesync = FALSE;
-	lastHouse = -1;
-}
-
-//-------------------------------------------------------------------------
-
-#define DEBUG_MAP(x) for (it = stats.x.begin(); it != stats.x.end(); ++it) \
-{ \
-	if (it->second > 0) \
-	{ \
-		DEBUG_LOG(("%s(%d): %d\n", #x, it->first, it->second)); \
-	} \
-}
-
-static void debugDumpPlayerStats( const PSPlayerStats& stats )
-{
-	DEBUG_LOG(("-----------------------------------------\n"));
-	DEBUG_LOG(("Tracking player stats for player %d:\n", stats.id));
-	PerGeneralMap::const_iterator it;
-	DEBUG_MAP(wins);
-	DEBUG_MAP(losses);
-	DEBUG_MAP(games);
-	DEBUG_MAP(duration);
-	DEBUG_MAP(unitsKilled);
-	DEBUG_MAP(unitsLost);
-	DEBUG_MAP(unitsBuilt);
-	DEBUG_MAP(buildingsKilled);
-	DEBUG_MAP(buildingsLost);
-	DEBUG_MAP(buildingsBuilt);
-	DEBUG_MAP(earnings);
-	DEBUG_MAP(techCaptured);
-	DEBUG_MAP(discons);
-	DEBUG_MAP(desyncs);
-	DEBUG_MAP(surrenders);
-	DEBUG_MAP(gamesOf2p);
-	DEBUG_MAP(gamesOf3p);
-	DEBUG_MAP(gamesOf4p);
-	DEBUG_MAP(gamesOf5p);
-	DEBUG_MAP(gamesOf6p);
-	DEBUG_MAP(gamesOf7p);
-	DEBUG_MAP(gamesOf8p);
-	DEBUG_MAP(customGames);
-	DEBUG_MAP(QMGames);
-	
-	if (stats.locale > 0)
-	{
-		DEBUG_LOG(("Locale: %d\n", stats.locale));
-	}
-	
-	if (stats.gamesAsRandom > 0)
-	{
-		DEBUG_LOG(("gamesAsRandom: %d\n", stats.gamesAsRandom));
-	}
-
-	if (stats.options.length())
-	{
-		DEBUG_LOG(("Options: %s\n", stats.options.c_str()));
-	}
-
-	if (stats.systemSpec.length())
-	{
-		DEBUG_LOG(("systemSpec: %s\n", stats.systemSpec.c_str()));
-	}
-
-	if (stats.lastFPS > 0.0f)
-	{
-		DEBUG_LOG(("lastFPS: %g\n", stats.lastFPS));
-	}
-
-	if (stats.battleHonors > 0)
-	{
-		DEBUG_LOG(("battleHonors: %x\n", stats.battleHonors));
-	}
-	if (stats.challengeMedals > 0)
-	{
-		DEBUG_LOG(("challengeMedals: %x\n", stats.challengeMedals));
-	}
-	if (stats.lastGeneral >= 0)
-	{
-		DEBUG_LOG(("lastGeneral: %d\n", stats.lastGeneral));
-	}
-	if (stats.gamesInRowWithLastGeneral >= 0)
-	{
-		DEBUG_LOG(("gamesInRowWithLastGeneral: %d\n", stats.gamesInRowWithLastGeneral));
-	}
-	if (stats.builtSCUD >= 0)
-	{
-		DEBUG_LOG(("builtSCUD: %d\n", stats.builtSCUD));
-	}
-	if (stats.builtNuke >= 0)
-	{
-		DEBUG_LOG(("builtNuke: %d\n", stats.builtNuke));
-	}
-	if (stats.builtParticleCannon >= 0)
-	{
-		DEBUG_LOG(("builtParticleCannon: %d\n", stats.builtParticleCannon));
-	}
-
-	if (stats.winsInARow >= 0)
-	{
-		DEBUG_LOG(("winsInARow: %d\n", stats.winsInARow));
-	}
-	if (stats.maxWinsInARow >= 0)
-	{
-		DEBUG_LOG(("maxWinsInARow: %d\n", stats.maxWinsInARow));
-	}
-	if (stats.disconsInARow >= 0)
-	{
-		DEBUG_LOG(("disconsInARow: %d\n", stats.disconsInARow));
-	}
-	if (stats.maxDisconsInARow >= 0)
-	{
-		DEBUG_LOG(("maxDisconsInARow: %d\n", stats.maxDisconsInARow));
-	}
-	if (stats.lossesInARow >= 0)
-	{
-		DEBUG_LOG(("lossesInARow: %d\n", stats.lossesInARow));
-	}
-	if (stats.maxLossesInARow >= 0)
-	{
-		DEBUG_LOG(("maxLossesInARow: %d\n", stats.maxLossesInARow));
-	}
-	if (stats.desyncsInARow >= 0)
-	{
-		DEBUG_LOG(("desyncsInARow: %d\n", stats.desyncsInARow));
-	}
-	if (stats.maxDesyncsInARow >= 0)
-	{
-		DEBUG_LOG(("maxDesyncsInARow: %d\n", stats.maxDesyncsInARow));
-	}
-
-	if (stats.lastLadderPort >= 0)
-	{
-		DEBUG_LOG(("lastLadderPort: %d\n", stats.lastLadderPort));
-	}
-
-	if (stats.lastLadderHost.length())
-	{
-		DEBUG_LOG(("lastLadderHost: %s\n", stats.lastLadderHost.c_str()));
-	}
-
-
-
-}
-
-//-------------------------------------------------------------------------
-
-#define INCORPORATE_MAP(x) for (it = other.x.begin(); it != other.x.end(); ++it) \
-{ \
-	if (it->second > 0) \
-	{ \
-		x[it->first] = it->second; \
-	} \
-}
-
-void PSPlayerStats::incorporate( const PSPlayerStats& other )
-{
-	PerGeneralMap::const_iterator it;
-	INCORPORATE_MAP(wins);
-	INCORPORATE_MAP(losses);
-	INCORPORATE_MAP(games);
-	INCORPORATE_MAP(duration);
-	INCORPORATE_MAP(unitsKilled);
-	INCORPORATE_MAP(unitsLost);
-	INCORPORATE_MAP(unitsBuilt);
-	INCORPORATE_MAP(buildingsKilled);
-	INCORPORATE_MAP(buildingsLost);
-	INCORPORATE_MAP(buildingsBuilt);
-	INCORPORATE_MAP(earnings);
-	INCORPORATE_MAP(techCaptured);
-
-	//GS  Clear all disconnects so that we don't retain any that were
-	//previously reported as 1 by updateAdditionalGameSpyDisconnections
-	discons.clear();
-	INCORPORATE_MAP(discons);
-
-	INCORPORATE_MAP(desyncs);
-	INCORPORATE_MAP(surrenders);
-	INCORPORATE_MAP(gamesOf2p);
-	INCORPORATE_MAP(gamesOf3p);
-	INCORPORATE_MAP(gamesOf4p);
-	INCORPORATE_MAP(gamesOf5p);
-	INCORPORATE_MAP(gamesOf6p);
-	INCORPORATE_MAP(gamesOf7p);
-	INCORPORATE_MAP(gamesOf8p);
-	INCORPORATE_MAP(customGames);
-	INCORPORATE_MAP(QMGames);
-	
-	if (other.locale > 0)
-	{
-		locale = other.locale;
-	}
-	
-	if (other.gamesAsRandom > 0)
-	{
-		gamesAsRandom = other.gamesAsRandom;
-	}
-
-	if (other.options.length())
-	{
-		options = other.options;
-	}
-
-	if (other.systemSpec.length())
-	{
-		systemSpec = other.systemSpec;
-	}
-
-	if (other.lastFPS > 0.0f)
-	{
-		lastFPS = other.lastFPS;
-	}
-
-	if (other.battleHonors > 0)
-	{
-		battleHonors |= other.battleHonors;
-	}
-	if (other.challengeMedals > 0)
-	{
-		challengeMedals |= other.challengeMedals;
-	}
-	if (other.lastGeneral >= 0)
-	{
-		lastGeneral = other.lastGeneral;
-	}
-	if (other.gamesInRowWithLastGeneral >= 0)
-	{
-		gamesInRowWithLastGeneral = other.gamesInRowWithLastGeneral;
-	}
-	if (other.builtParticleCannon >= 0)
-	{
-		builtParticleCannon = other.builtParticleCannon;
-	}
-	if (other.builtNuke >= 0)
-	{
-		builtNuke = other.builtNuke;
-	}
-	if (other.builtSCUD >= 0)
-	{
-		builtSCUD = other.builtSCUD;
-	}
-	if (other.winsInARow >= 0)
-	{
-		winsInARow = other.winsInARow;
-	}
-	if (other.maxWinsInARow >= 0)
-	{
-		maxWinsInARow = other.maxWinsInARow;
-	}
-	if (other.lossesInARow >= 0)
-	{
-		lossesInARow = other.lossesInARow;
-	}
-	if (other.maxLossesInARow >= 0)
-	{
-		maxLossesInARow = other.maxLossesInARow;
-	}
-	if (other.disconsInARow >= 0)
-	{
-		disconsInARow = other.disconsInARow;
-	}
-	if (other.maxDisconsInARow >= 0)
-	{
-		maxDisconsInARow = other.maxDisconsInARow;
-	}
-	if (other.desyncsInARow >= 0)
-	{
-		desyncsInARow = other.desyncsInARow;
-	}
-	if (other.maxDesyncsInARow >= 0)
-	{
-		maxDesyncsInARow = other.maxDesyncsInARow;
-	}
-	if (other.lastLadderPort >= 0)
-	{
-		lastLadderPort = other.lastLadderPort;
-	}
-	if (other.lastLadderHost.length())
-	{
-		lastLadderHost = other.lastLadderHost;
-	}
-}
-
-PSPlayerStats::PSPlayerStats( const PSPlayerStats& other )
-{
-	incorporate(other);
-	id = other.id;
-	locale = other.locale;
-	gamesAsRandom = other.gamesAsRandom;
-	options = other.options;
-	systemSpec = other.systemSpec;
-	lastFPS = other.lastFPS;
-	lastGeneral = other.lastGeneral;
-	gamesInRowWithLastGeneral = other.gamesInRowWithLastGeneral;
-	builtParticleCannon = other.builtParticleCannon;
-	builtNuke = other.builtNuke;
-	builtSCUD = other.builtSCUD;
-	challengeMedals = other.challengeMedals;
-	battleHonors = other.battleHonors;
-	winsInARow = other.winsInARow;
-	maxWinsInARow = other.maxWinsInARow;
-	lossesInARow = other.lossesInARow;
-	maxLossesInARow = other.maxLossesInARow;
-	disconsInARow = other.disconsInARow;
-	maxDisconsInARow = other.maxDisconsInARow;
-	desyncsInARow = other.desyncsInARow;
-	maxDesyncsInARow = other.maxDesyncsInARow;
-	lastLadderHost = other.lastLadderHost;
-	lastLadderPort = other.lastLadderPort;
-}
-
-//-------------------------------------------------------------------------
-
-typedef std::queue<PSRequest> RequestQueue;
-typedef std::queue<PSResponse> ResponseQueue;
-class PSThreadClass;
-
-class GameSpyPSMessageQueue : public GameSpyPSMessageQueueInterface
-{
-public:
-	virtual ~GameSpyPSMessageQueue();
-	GameSpyPSMessageQueue();
-	virtual void startThread( void );
-	virtual void endThread( void );
-	virtual Bool isThreadRunning( void );
-
-	virtual void addRequest( const PSRequest& req );
-	virtual Bool getRequest( PSRequest& req );
-
-	virtual void addResponse( const PSResponse& resp );
-	virtual Bool getResponse( PSResponse& resp );
-
-	virtual void trackPlayerStats( PSPlayerStats stats );
-	virtual PSPlayerStats findPlayerStatsByID( Int id );
-
-	PSThreadClass* getThread( void );
-
-	Int getLocalPlayerID(void) { return m_localPlayerID; }
-	void setLocalPlayerID(Int localPlayerID) { m_localPlayerID = localPlayerID; }
-
-	std::string getEmail() { return m_email; }
-	std::string getNick() { return m_nick; }
-	std::string getPassword() { return m_password; }
-
-	void setEmail(std::string email) { m_email = email; }
-	void setNick(std::string nick) { m_nick = nick; }
-	void setPassword(std::string password) { m_password = password; }
-
-private:
-	MutexClass m_requestMutex;
-	MutexClass m_responseMutex;
-	RequestQueue m_requests;
-	ResponseQueue m_responses;
-	PSThreadClass *m_thread;
-	Int m_localPlayerID;
-
-	std::string m_email;
-	std::string m_nick;
-	std::string m_password;
-
-	std::map<Int, PSPlayerStats> m_playerStats;
-};
-
-GameSpyPSMessageQueueInterface* GameSpyPSMessageQueueInterface::createNewMessageQueue( void )
-{
-	return NEW GameSpyPSMessageQueue;
-}
-
-GameSpyPSMessageQueueInterface *TheGameSpyPSMessageQueue = NULL;
-#define MESSAGE_QUEUE ((GameSpyPSMessageQueue *)TheGameSpyPSMessageQueue)
-
-//-------------------------------------------------------------------------
-
-class PSThreadClass : public ThreadClass
-{
-
-public:
-	PSThreadClass() : ThreadClass() 
-	{ 
-		m_loginOK = m_sawLocalData = m_doneTryingToLogin = false; 
-		m_opCount = 0; 
-	}
-
-	void Thread_Function();
-
-	void persAuthCallback( Bool val ) { m_loginOK = val; m_doneTryingToLogin = true; }
-	void decrOpCount( void ) { --m_opCount; }
-	void incrOpCount( void ) { ++m_opCount; }
-	Int getOpCount( void ) { return m_opCount; }
-	Bool sawLocalPlayerData( void ) { return m_sawLocalData; }
-	void gotLocalPlayerData( void ) { m_sawLocalData = TRUE; }
-
-private:
-	Bool tryConnect( void );
-	Bool tryLogin( Int id, std::string nick, std::string password, std::string email );
-	Bool m_loginOK;
-	Bool m_doneTryingToLogin;
-	Int m_opCount;
-	Bool m_sawLocalData;
-};
-
-
-//-------------------------------------------------------------------------
-
-GameSpyPSMessageQueue::GameSpyPSMessageQueue()
-{
-	m_thread = NULL;
-	m_localPlayerID = 0;
-}
-
-GameSpyPSMessageQueue::~GameSpyPSMessageQueue()
-{
-	endThread();
-}
-
-void GameSpyPSMessageQueue::startThread( void )
-{
-	if (!m_thread)
-	{
-		m_thread = NEW PSThreadClass;
-		m_thread->Execute();
-	}
-	else
-	{
-		if (!m_thread->Is_Running())
-		{
-			m_thread->Execute();
-		}
-	}
-}
-
-void GameSpyPSMessageQueue::endThread( void )
-{
-	if (m_thread)
-		delete m_thread;
-	m_thread = NULL;
-}
-
-Bool GameSpyPSMessageQueue::isThreadRunning( void )
-{
-	return (m_thread) ? m_thread->Is_Running() : false;
-}
-
-void GameSpyPSMessageQueue::addRequest( const PSRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex);
-	if (m.Failed())
-		return;
-
-	m_requests.push(req);
-}
-
-Bool GameSpyPSMessageQueue::getRequest( PSRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_requests.empty())
-		return false;
-	req = m_requests.front();
-	m_requests.pop();
-	return true;
-}
-
-void GameSpyPSMessageQueue::addResponse( const PSResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex);
-	if (m.Failed())
-		return;
-
-	m_responses.push(resp);
-}
-
-Bool GameSpyPSMessageQueue::getResponse( PSResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_responses.empty())
-		return false;
-	resp = m_responses.front();
-	m_responses.pop();
-	return true;
-}
-
-PSThreadClass* GameSpyPSMessageQueue::getThread( void )
-{
-	return m_thread;
-}
-
-void GameSpyPSMessageQueue::trackPlayerStats( PSPlayerStats stats )
-{
-#ifdef DEBUG_LOGGING
-	debugDumpPlayerStats( stats );
-	DEBUG_ASSERTCRASH(stats.id != 0, ("Tracking stats with ID of 0\n"));
-#endif
-	PSPlayerStats newStats;
-	std::map<Int, PSPlayerStats>::iterator it = m_playerStats.find(stats.id);
-	if (it != m_playerStats.end())
-	{
-		newStats = it->second;
-		newStats.incorporate(stats);
-		m_playerStats[stats.id] = newStats;
-	}
-	else
-	{
-		m_playerStats[stats.id] = stats;
-	}
-}
-
-PSPlayerStats GameSpyPSMessageQueue::findPlayerStatsByID( Int id )
-{
-	std::map<Int, PSPlayerStats>::iterator it = m_playerStats.find(id);
-	if (it != m_playerStats.end())
-	{
-		return it->second;
-	}
-
-	PSPlayerStats empty;
-	empty.id = 0;
-	return empty;
-}
-
-//-------------------------------------------------------------------------
-
-Bool PSThreadClass::tryConnect( void )
-{
-	Int result;
-
-	DEBUG_LOG(("m_opCount = %d - opening connection\n", m_opCount));
-
-	if (IsStatsConnected())
-	{
-		DEBUG_LOG(("connection already open!\n"));
-		return true;
-	}
-
-	// this may block for 1-2 seconds (according to GS) so it's nice we're not in the UI thread :)
-	result = InitStatsConnection(0);
-
-	if (result != GE_NOERROR)
-	{
-		DEBUG_LOG(("InitStatsConnection() returned %d\n", result));
-		return false;
-	}
-
-	return true;
-}
-
-static void persAuthCallback(int localid, int profileid, int authenticated, char *errmsg, void *instance)
-{
-	PSThreadClass *t = (PSThreadClass *)instance;
-	DEBUG_LOG(("Auth callback: localid: %d profileid: %d auth: %d err: %s\n",localid, profileid, authenticated, errmsg));
-	if (t)
-		t->persAuthCallback(authenticated != 0);
-}
-
-Bool PSThreadClass::tryLogin( Int id, std::string nick, std::string password, std::string email )
-{
-	char validate[33];
-	DEBUG_LOG(("PSThreadClass::tryLogin id = %d, nick = %s, password = %s, email = %s\n", id, nick.c_str(), password.c_str(), email.c_str()));
-	/***********
-	We'll go ahead and start the authentication, using a Presence & Messaging SDK
-	profileid / password.  To generate the new validation token, we'll need to pass
-	in the password for the profile we are authenticating.
-	Again, if this is done in a client/server setting, with the Persistent Storage
-	access being done on the server, and the P&M SDK is used on the client, the
-	server will need to send the challenge (GetChallenge(NULL)) to the client, the
-	client will create the validation token using GenerateAuth, and send it
-	back to the server for use in PreAuthenticatePlayerPM
-	***********/
-	char *munkeeHack = strdup(password.c_str()); // GenerateAuth takes a char*, not a const char* :P
-	GenerateAuth(GetChallenge(NULL), munkeeHack, validate);
-	free (munkeeHack);
-
-	/************
-	After we get the validation token, we pass it and the profileid of the user
-	we are authenticating into PreAuthenticatePlayerPM.
-	We pass the same authentication callback as for the first user, but a different
-	localid this time.
-	************/
-	m_loginOK = false;
-	m_doneTryingToLogin = false;
-	PreAuthenticatePlayerPM(id, id, validate, ::persAuthCallback, this);
-	while (!m_doneTryingToLogin && IsStatsConnected())
-		PersistThink();
-	DEBUG_LOG(("Persistant Storage Login success %d\n", m_loginOK));
-	return m_loginOK;
-}
-
-static void getPersistentDataCallback(int localid, int profileid, persisttype_t type, int index, int success, time_t modified, char *data, int len, void *instance)
-{
-	DEBUG_LOG(("Data get callback: localid: %d profileid: %d success: %d len: %d data: %s\n",localid, profileid, success, len, data));
-	PSThreadClass *t = (PSThreadClass *)instance;
-	if (!t)
-		return;
-
-	t->decrOpCount();
-
-	PSResponse resp;
-
-	if (!success)
-	{
-		resp.responseType = PSResponse::PSRESPONSE_COULDNOTCONNECT;
-		resp.player.id = profileid;
-		TheGameSpyPSMessageQueue->addResponse(resp);
-		if (!t->getOpCount() && !t->sawLocalPlayerData())
-		{
-			// we haven't gotten stats for ourselves - try again
-			PSRequest req;
-			req.requestType = PSRequest::PSREQUEST_READPLAYERSTATS;
-			req.player.id = MESSAGE_QUEUE->getLocalPlayerID();
-			TheGameSpyPSMessageQueue->addRequest(req);
-		}
-		return;
-	}
-
-	if (profileid == MESSAGE_QUEUE->getLocalPlayerID() && TheGameSpyGame && TheGameSpyGame->getUseStats())
-	{
-		t->gotLocalPlayerData();
-		DEBUG_LOG(("getPersistentDataCallback() - got local player info\n"));
-
-		// check if we have discons we should update on the server
-		UserPreferences pref;
-		AsciiString userPrefFilename;
-		userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", MESSAGE_QUEUE->getLocalPlayerID());
-		DEBUG_LOG(("using the file %s\n", userPrefFilename.str()));
-		pref.load(userPrefFilename);
-		Int addedInDesyncs2 = pref.getInt("0", 0);
-		DEBUG_LOG(("addedInDesyncs2 = %d\n", addedInDesyncs2));
-		if (addedInDesyncs2 < 0)
-			addedInDesyncs2 = 10;
-		Int addedInDesyncs3 = pref.getInt("1", 0);
-		DEBUG_LOG(("addedInDesyncs3 = %d\n", addedInDesyncs3));
-		if (addedInDesyncs3 < 0)
-			addedInDesyncs3 = 10;
-		Int addedInDesyncs4 = pref.getInt("2", 0);
-		DEBUG_LOG(("addedInDesyncs4 = %d\n", addedInDesyncs4));
-		if (addedInDesyncs4 < 0)
-			addedInDesyncs4 = 10;
-		Int addedInDiscons2 = pref.getInt("3", 0);
-		DEBUG_LOG(("addedInDiscons2 = %d\n", addedInDiscons2));
-		if (addedInDiscons2 < 0)
-			addedInDiscons2 = 10;
-		Int addedInDiscons3 = pref.getInt("4", 0);
-		DEBUG_LOG(("addedInDiscons3 = %d\n", addedInDiscons3));
-		if (addedInDiscons3 < 0)
-			addedInDiscons3 = 10;
-		Int addedInDiscons4 = pref.getInt("5", 0);
-		DEBUG_LOG(("addedInDiscons4 = %d\n", addedInDiscons4));
-		if (addedInDiscons4 < 0)
-			addedInDiscons4 = 10;
-
-		DEBUG_LOG(("addedInDesync=%d,%d,%d, addedInDiscon=%d,%d,%d\n",
-			addedInDesyncs2, addedInDesyncs3, addedInDesyncs4,
-			addedInDiscons2, addedInDiscons3, addedInDiscons4));
-
-		if (addedInDesyncs2 || addedInDesyncs3 || addedInDesyncs4 || addedInDiscons2 || addedInDiscons3 || addedInDiscons4)
-		{
-			DEBUG_LOG(("We have a previous discon we can attempt to update!  Bummer...\n"));
-
-			PSRequest req;
-			req.requestType = PSRequest::PSREQUEST_UPDATEPLAYERSTATS;
-			req.email = MESSAGE_QUEUE->getEmail();
-			req.nick = MESSAGE_QUEUE->getNick();
-			req.password = MESSAGE_QUEUE->getPassword();
-			req.player = GameSpyPSMessageQueueInterface::parsePlayerKVPairs((len)?data:"");
-			req.player.id = profileid;
-			req.addDesync = FALSE;
-			req.addDiscon = FALSE;
-			req.lastHouse = 0;
-			TheGameSpyPSMessageQueue->addRequest(req);
-		}
-	}
-
-	resp.responseType = PSResponse::PSRESPONSE_PLAYERSTATS;
-	resp.player = GameSpyPSMessageQueueInterface::parsePlayerKVPairs((len)?data:"");
-	resp.player.id = profileid;
-
-	TheGameSpyPSMessageQueue->addResponse(resp);
-}
-
-static void setPersistentDataLocaleCallback(int localid, int profileid, persisttype_t type, int index, int success, time_t modified, void *instance)
-{
-	DEBUG_LOG(("Data save callback: localid: %d profileid: %d success: %d\n", localid, profileid, success));
-
-	PSThreadClass *t = (PSThreadClass *)instance;
-	if (!t)
-		return;
-
-	t->decrOpCount();
-}
-
-static void setPersistentDataCallback(int localid, int profileid, persisttype_t type, int index, int success, time_t modified, void *instance)
-{
-	DEBUG_LOG(("Data save callback: localid: %d profileid: %d success: %d\n", localid, profileid, success));
-
-	PSThreadClass *t = (PSThreadClass *)instance;
-	if (!t)
-		return;
-
-	if (success)
-	{
-		UserPreferences pref;
-		AsciiString userPrefFilename;
-		userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", profileid);
-		DEBUG_LOG(("setPersistentDataCallback - writing stats to file %s\n", userPrefFilename.str()));
-		pref.load(userPrefFilename);
-		pref.clear();
-		pref.write();
-	}
-	t->decrOpCount();
-}
-
-struct CDAuthInfo
-{
-	Bool success;
-	Bool done;
-	Int id;
-};
-
-void preAuthCDCallback(int localid, int profileid, int authenticated, char *errmsg, void *instance)
-{
-	DEBUG_LOG(("preAuthCDCallback(): profileid: %d auth: %d err: %s\n", profileid, authenticated, errmsg));
-
-	CDAuthInfo *authInfo = (CDAuthInfo *)instance;
-	authInfo->success = authenticated;
-	authInfo->done = TRUE;
-	authInfo->id = profileid;
-}
-
-static void getPreorderCallback(int localid, int profileid, persisttype_t type, int index, int success, time_t modified, char *data, int len, void *instance)
-{
-	PSThreadClass *t = (PSThreadClass *)instance;
-	if (!t)
-		return;
-
-	t->decrOpCount();
-
-	PSResponse resp;
-
-	if (!success)
-	{
-		DEBUG_LOG(("Failed getPreorderCallback()\n"));
-		return;
-	}
-
-	resp.responseType = PSResponse::PSRESPONSE_PREORDER;
-	resp.preorder = (data && strcmp(data, "\\preorder\\1") == 0);
-	DEBUG_LOG(("getPreorderCallback() - data was '%s'\n", data));
-
-	TheGameSpyPSMessageQueue->addResponse(resp);
-}
-
-void PSThreadClass::Thread_Function()
-{
-	try {
-	_set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
-	/*********
-	First step, set our game authentication info
-	We could do:
-		strcpy(gcd_gamename,"ccgenzh");
-		strcpy(gcd_secret_key,"D6s9k3");
-	or
-		strcpy(gcd_gamename,"ccgeneralsb");
-		strcpy(gcd_secret_key,"whatever the key is");
-	...but this is more secure:
-	**********/
-	/**
-	gcd_gamename[0]='c';gcd_gamename[1]='c';gcd_gamename[2]='g';gcd_gamename[3]='e';
-	gcd_gamename[4]='n';gcd_gamename[5]='e';gcd_gamename[6]='r';gcd_gamename[7]='a';
-	gcd_gamename[8]='l';gcd_gamename[9]='s';gcd_gamename[10]='b';gcd_gamename[11]='\0';
-	gcd_secret_key[0]='g';gcd_secret_key[1]='3';gcd_secret_key[2]='T';gcd_secret_key[3]='9';
-	gcd_secret_key[4]='s';gcd_secret_key[5]='2';gcd_secret_key[6]='\0';
-	/**/
-	gcd_gamename[0]='c';gcd_gamename[1]='c';gcd_gamename[2]='g';gcd_gamename[3]='e';
-	gcd_gamename[4]='n';gcd_gamename[5]='z';gcd_gamename[6]='h';gcd_gamename[7]='\0';
-	gcd_secret_key[0]='D';gcd_secret_key[1]='6';gcd_secret_key[2]='s';gcd_secret_key[3]='9';
-	gcd_secret_key[4]='k';gcd_secret_key[5]='3';gcd_secret_key[6]='\0';
-	/**/
-	
-	//strcpy(StatsServerHostname, "sdkdev.gamespy.com");
-
-	PSRequest req;
-	while ( running )
-	{
-		// deal with requests
-		if (TheGameSpyPSMessageQueue->getRequest(req))
-		{
-			switch (req.requestType)
-			{
-			case PSRequest::PSREQUEST_SENDGAMERESTOGAMESPY:
-				{
-					if (tryConnect())
-					{
-						NewGame(0);
-#ifdef DEBUG_LOGGING
-						Int res = 
-#endif // DEBUG_LOGGING
-							SendGameSnapShot(NULL, req.results.c_str(), SNAP_FINAL);
-						DEBUG_LOG(("Just sent game results - res was %d\n", res));
-						FreeGame(NULL);
-					}
-				}
-				break;
-			case PSRequest::PSREQUEST_READPLAYERSTATS:
-				{
-					if (!MESSAGE_QUEUE->getLocalPlayerID())
-					{
-						MESSAGE_QUEUE->setLocalPlayerID(req.player.id); // first request is for ourselves
-						MESSAGE_QUEUE->setEmail(req.email);
-						MESSAGE_QUEUE->setNick(req.nick);
-						MESSAGE_QUEUE->setPassword(req.password);
-						DEBUG_LOG(("Setting email/nick/password = %s/%s/%s\n", req.email.c_str(), req.nick.c_str(), req.password.c_str()));
-					}
-					DEBUG_LOG(("Processing PSRequest::PSREQUEST_READPLAYERSTATS\n"));
-					if (tryConnect())
-					{
-						incrOpCount();
-						gsi_char keys[] = "";
-						GetPersistDataValues(0, req.player.id, pd_public_rw, 0, keys, getPersistentDataCallback, this);
-					}
-				}
-				break;
-			case PSRequest::PSREQUEST_UPDATEPLAYERLOCALE:
-				{
-					DEBUG_LOG(("Processing PSRequest::PSREQUEST_UPDATEPLAYERLOCALE\n"));
-					if (tryConnect() && tryLogin(req.player.id, req.nick, req.password, req.email))
-					{
-						char kvbuf[256];
-						sprintf(kvbuf, "\\locale\\%d", req.player.locale);
-						incrOpCount();
-						SetPersistDataValues(0, req.player.id, pd_public_rw, 0, kvbuf, setPersistentDataLocaleCallback, this);
-					}
-				}
-				break;
-			case PSRequest::PSREQUEST_UPDATEPLAYERSTATS:
-				{
-					/*
-					** NOTE THAT THIS IS HIGHLY DEPENDENT ON INI ORDERING FOR THE PLAYERTEMPLATES!!!
-					*/
-					DEBUG_LOG(("Processing PSRequest::PSREQUEST_UPDATEPLAYERSTATS\n"));
-					UserPreferences pref;
-					AsciiString userPrefFilename;
-					userPrefFilename.format("GeneralsOnline\\MiscPref%d.ini", MESSAGE_QUEUE->getLocalPlayerID());
-					DEBUG_LOG(("using the file %s\n", userPrefFilename.str()));
-					pref.load(userPrefFilename);
-					Int addedInDesyncs2 = pref.getInt("0", 0);
-					DEBUG_LOG(("addedInDesyncs2 = %d\n", addedInDesyncs2));
-					if (addedInDesyncs2 < 0)
-						addedInDesyncs2 = 10;
-					Int addedInDesyncs3 = pref.getInt("1", 0);
-					DEBUG_LOG(("addedInDesyncs3 = %d\n", addedInDesyncs3));
-					if (addedInDesyncs3 < 0)
-						addedInDesyncs3 = 10;
-					Int addedInDesyncs4 = pref.getInt("2", 0);
-					DEBUG_LOG(("addedInDesyncs4 = %d\n", addedInDesyncs4));
-					if (addedInDesyncs4 < 0)
-						addedInDesyncs4 = 10;
-					Int addedInDiscons2 = pref.getInt("3", 0);
-					DEBUG_LOG(("addedInDiscons2 = %d\n", addedInDiscons2));
-					if (addedInDiscons2 < 0)
-						addedInDiscons2 = 10;
-					Int addedInDiscons3 = pref.getInt("4", 0);
-					DEBUG_LOG(("addedInDiscons3 = %d\n", addedInDiscons3));
-					if (addedInDiscons3 < 0)
-						addedInDiscons3 = 10;
-					Int addedInDiscons4 = pref.getInt("5", 0);
-					DEBUG_LOG(("addedInDiscons4 = %d\n", addedInDiscons4));
-					if (addedInDiscons4 < 0)
-						addedInDiscons4 = 10;
-
-					DEBUG_LOG(("req.addDesync=%d, req.addDiscon=%d, addedInDesync=%d,%d,%d, addedInDiscon=%d,%d,%d\n",
-						req.addDesync, req.addDiscon, addedInDesyncs2, addedInDesyncs3, addedInDesyncs4,
-						addedInDiscons2, addedInDiscons3, addedInDiscons4));
-
-					if (req.addDesync || req.addDiscon)
-					{
-						AsciiString val;
-						if (req.lastHouse == 2)
-						{
-							val.format("%d", addedInDesyncs2 + req.addDesync);
-							pref["0"] = val;
-							val.format("%d", addedInDiscons2 + req.addDiscon);
-							pref["3"] = val;
-							DEBUG_LOG(("house 2 req.addDesync || req.addDiscon: %d %d\n",
-								addedInDesyncs2 + req.addDesync, addedInDiscons2 + req.addDiscon));
-						}
-						else if (req.lastHouse == 3)
-						{
-							val.format("%d", addedInDesyncs3 + req.addDesync);
-							pref["1"] = val;
-							val.format("%d", addedInDiscons3 + req.addDiscon);
-							pref["4"] = val;
-							DEBUG_LOG(("house 3 req.addDesync || req.addDiscon: %d %d\n",
-								addedInDesyncs3 + req.addDesync, addedInDiscons3 + req.addDiscon));
-						}
-						else
-						{
-							val.format("%d", addedInDesyncs4 + req.addDesync);
-							pref["2"] = val;
-							val.format("%d", addedInDiscons4 + req.addDiscon);
-							pref["5"] = val;
-							DEBUG_LOG(("house 4 req.addDesync || req.addDiscon: %d %d\n",
-								addedInDesyncs4 + req.addDesync, addedInDiscons4 + req.addDiscon));
-						}
-						pref.write();
-						if (req.password.size() == 0)
-							return;
-					}
-					if (!req.player.id)
-					{
-						DEBUG_LOG(("Bailing because ID is NULL!\n"));
-						return;
-					}
-					req.player.desyncs[2] += addedInDesyncs2;
-					req.player.games[2] += addedInDesyncs2;
-					req.player.discons[2] += addedInDiscons2;
-					req.player.games[2] += addedInDiscons2;
-					req.player.desyncs[3] += addedInDesyncs3;
-					req.player.games[3] += addedInDesyncs3;
-					req.player.discons[3] += addedInDiscons3;
-					req.player.games[3] += addedInDiscons3;
-					req.player.desyncs[4] += addedInDesyncs4;
-					req.player.games[4] += addedInDesyncs4;
-					req.player.discons[4] += addedInDiscons4;
-					req.player.games[4] += addedInDiscons4;
-					DEBUG_LOG(("House2: %d/%d/%d, House3: %d/%d/%d, House4: %d/%d/%d\n",
-						req.player.desyncs[2], req.player.discons[2], req.player.games[2],
-						req.player.desyncs[3], req.player.discons[3], req.player.games[3],
-						req.player.desyncs[4], req.player.discons[4], req.player.games[4]
-						));
-					if (tryConnect() && tryLogin(req.player.id, req.nick, req.password, req.email))
-					{
-						DEBUG_LOG(("Logged in!\n"));
-						if (TheGameSpyPSMessageQueue)
-							TheGameSpyPSMessageQueue->trackPlayerStats(req.player);
-
-						char *munkeeHack = strdup(GameSpyPSMessageQueueInterface::formatPlayerKVPairs(req.player).c_str()); // GS takes a char* for some reason
-						incrOpCount();
-						DEBUG_LOG(("Setting values %s\n", munkeeHack));
-						SetPersistDataValues(0, req.player.id, pd_public_rw, 0, munkeeHack, setPersistentDataCallback, this);
-						free(munkeeHack);
-					}
-					else
-					{
-						DEBUG_LOG(("Cannot connect!\n"));
-						//if (IsStatsConnected())
-							//CloseStatsConnection();
-					}
-				}
-				break;
-			case PSRequest::PSREQUEST_READCDKEYSTATS:
-				{
-					DEBUG_LOG(("Processing PSRequest::PSREQUEST_READCDKEYSTATS\n"));
-					if (tryConnect())
-					{
-						incrOpCount();
-						CDAuthInfo cdAuthInfo;
-						cdAuthInfo.done = FALSE;
-						cdAuthInfo.success = FALSE;
-						cdAuthInfo.id = 0;
-						char cdkeyHash[33] = "";
-						char validationToken[33] = "";
-						char *munkeeHack = strdup(req.cdkey.c_str()); // GenerateAuth takes a char*, not a const char* :P
-
-						GenerateAuth(GetChallenge(NULL), munkeeHack, validationToken); // validation token
-						GenerateAuth("", munkeeHack, cdkeyHash); // cdkey hash
-
-						free (munkeeHack);
-
-						PreAuthenticatePlayerCD( 0, "preorder", cdkeyHash, validationToken, preAuthCDCallback , &cdAuthInfo);
-
-						while (running && IsStatsConnected() && !cdAuthInfo.done)
-							PersistThink();
-
-						DEBUG_LOG(("Looking for preorder status for %d (success=%d, done=%d) from CDKey %s with hash %s\n",
-							cdAuthInfo.id, cdAuthInfo.success, cdAuthInfo.done, req.cdkey.c_str(), cdkeyHash));
-						if (cdAuthInfo.done && cdAuthInfo.success)
-						{
-							gsi_char keys[] = "\\preorder";
-							GetPersistDataValues(0, cdAuthInfo.id, pd_public_ro, 0, keys, getPreorderCallback, this);
-						}
-						else
-							decrOpCount();
-					}
-				}
-				break;
-			}
-		}
-
-		// update the network
-		if (IsStatsConnected())
-		{
-			PersistThink();
-			if (m_opCount <= 0)
-			{
-				DEBUG_ASSERTCRASH(m_opCount == 0, ("Negative operations pending!!!"));
-				DEBUG_LOG(("m_opCount = %d - closing connection\n", m_opCount));
-				CloseStatsConnection();
-				m_opCount = 0;
-			}
-		}
-
-		// end our timeslice
-		Switch_Thread();
-	}
-
-	if (IsStatsConnected())
-		CloseStatsConnection();
-	} catch ( ... ) {
-		DEBUG_CRASH(("Exception in storage thread!"));
-	}
-}
-
-//-------------------------------------------------------------------------
-PSPlayerStats::PSPlayerStats( void )
-{
-	reset();
-}
-
-void PSPlayerStats::reset( void )
-{
-	id = 0;
-	locale = 0;
-	gamesAsRandom = 0;
-	lastFPS = 0;
-	lastGeneral = 0;
-	gamesInRowWithLastGeneral = 0;
-	builtNuke = 0;
-	builtSCUD = 0;
-	builtParticleCannon = 0;
-	challengeMedals = 0;
-	battleHonors = 0;
-	winsInARow = 0;
-	maxWinsInARow = 0;
-	lossesInARow = 0;
-	maxLossesInARow = 0;
-	disconsInARow = 0;
-	maxDisconsInARow = 0;
-	desyncsInARow = 0;
-	maxDesyncsInARow = 0;
-	lastLadderPort = 0;
-
-	//Added By Sadullah Nader
-	maxQMwinsInARow = 0;
-	QMwinsInARow = 0;
-	//
-}
-
-//-------------------------------------------------------------------------
-#define CHECK(x) if (k == #x && generalMarker >= 0) { s.x[generalMarker] = atoi(v.c_str()); continue; }
-
-PSPlayerStats GameSpyPSMessageQueueInterface::parsePlayerKVPairs( std::string kvPairs )
-{
-	PSPlayerStats s;
-	kvPairs.append("\\");
-
-	Int offset = 0;
-	while (1)
-	{
-		Int firstMarker = kvPairs.find_first_of('\\', offset);
-		if (firstMarker < 0)
-			break;
-		Int secondMarker = kvPairs.find_first_of('\\', firstMarker + 1);
-		if (secondMarker < 0)
-			break;
-		Int thirdMarker = kvPairs.find_first_of('\\', secondMarker + 1);
-		if (thirdMarker < 0)
-			break;
-		Int generalMarker = kvPairs.find_last_not_of("0123456789", secondMarker - 1);
-		std::string k, v, g;
-		if (generalMarker == secondMarker - 1)
-		{
-			k = kvPairs.substr(firstMarker + 1, secondMarker - firstMarker - 1);
-			generalMarker = -1;
-		}
-		else
-		{
-			k = kvPairs.substr(firstMarker + 1, generalMarker - firstMarker);
-			g = kvPairs.substr(generalMarker + 1, secondMarker - generalMarker - 1);
-			generalMarker = atoi(g.c_str());
-		}
-		v = kvPairs.substr(secondMarker + 1, thirdMarker - secondMarker - 1);
-		//DEBUG_LOG(("%d [%s] [%s]\n", generalMarker, k.c_str(), v.c_str()));
-		offset = thirdMarker - 1;
-
-		CHECK(wins);
-		CHECK(losses);
-		CHECK(games);
-		CHECK(duration);
-		CHECK(unitsKilled);
-		CHECK(unitsLost);
-		CHECK(unitsBuilt);
-		CHECK(buildingsKilled);
-		CHECK(buildingsLost);
-		CHECK(buildingsBuilt);
-		CHECK(earnings);
-		CHECK(techCaptured);
-		CHECK(discons);
-		CHECK(desyncs);
-		CHECK(surrenders);
-		CHECK(gamesOf2p);
-		CHECK(gamesOf3p);
-		CHECK(gamesOf4p);
-		CHECK(gamesOf5p);
-		CHECK(gamesOf6p);
-		CHECK(gamesOf7p);
-		CHECK(gamesOf8p);
-		CHECK(customGames);
-		CHECK(QMGames);
-		
-		if (k == "locale" && generalMarker < 0)
-		{
-			s.locale = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "random" && generalMarker < 0)
-		{
-			s.gamesAsRandom = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "options" && generalMarker < 0)
-		{
-			s.options = v;
-			continue;
-		}
-
-		if (k == "systemSpec" && generalMarker < 0)
-		{
-			s.systemSpec = v;
-			continue;
-		}
-
-		if (k == "fps" && generalMarker < 0)
-		{
-			s.lastFPS = atof(v.c_str());
-			continue;
-		}
-		
-		if (k == "lastGeneral" && generalMarker < 0)
-		{
-			s.lastGeneral = atoi(v.c_str());
-			continue;
-		}
-		if (k == "genInRow" && generalMarker < 0)
-		{
-			s.gamesInRowWithLastGeneral = atoi(v.c_str());
-			continue;
-		}
-		if (k == "builtNuke" && generalMarker < 0)
-		{
-			s.builtNuke = atoi(v.c_str());
-			continue;
-		}
-		if (k == "builtSCUD" && generalMarker < 0)
-		{
-			s.builtSCUD = atoi(v.c_str());
-			continue;
-		}
-		if (k == "builtCannon" && generalMarker < 0)
-		{
-			s.builtParticleCannon = atoi(v.c_str());
-			continue;
-		}
-		if (k == "challenge" && generalMarker < 0)
-		{
-			s.challengeMedals = atoi(v.c_str());
-			continue;
-		}
-		if (k == "battle" && generalMarker < 0)
-		{
-			s.battleHonors = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "WinRow" && generalMarker < 0)
-		{
-			s.winsInARow = atoi(v.c_str());
-			continue;
-		}
-		if (k == "WinRowMax" && generalMarker < 0)
-		{
-			s.maxWinsInARow = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "LossRow" && generalMarker < 0)
-		{
-			s.lossesInARow = atoi(v.c_str());
-			continue;
-		}
-		if (k == "LossRowMax" && generalMarker < 0)
-		{
-			s.maxLossesInARow = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "DSRow" && generalMarker < 0)
-		{
-			s.desyncsInARow = atoi(v.c_str());
-			continue;
-		}
-		if (k == "DSRowMax" && generalMarker < 0)
-		{
-			s.maxDesyncsInARow = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "DCRow" && generalMarker < 0)
-		{
-			s.disconsInARow = atoi(v.c_str());
-			continue;
-		}
-		if (k == "DCRowMax" && generalMarker < 0)
-		{
-			s.maxDisconsInARow = atoi(v.c_str());
-			continue;
-		}
-
-		if (k == "ladderPort" && generalMarker < 0)
-		{
-			s.lastLadderPort = atoi(v.c_str());
-			continue;
-		}
-		if (k == "ladderHost" && generalMarker < 0)
-		{
-			s.lastLadderHost = v;
-			continue;
-		}
-
-		//DEBUG_ASSERTCRASH(generalMarker >= 0, ("Unknown KV Pair in persistent storage: [%s] = [%s]\n", k.c_str(), v.c_str()));
-		//DEBUG_ASSERTCRASH(generalMarker  < 0, ("Unknown KV Pair in persistent storage for PlayerTemplate %d: [%s] = [%s]\n", generalMarker, k.c_str(), v.c_str()));
-	}
-
-	return s;
-}
-
-#define ITERATE_OVER(x) for (it = stats.x.begin(); it != stats.x.end(); ++it) \
-{ \
-	if (it->second > 0) \
-	{ \
-		sprintf(kvbuf, "\\" #x "%d\\%d", it->first, it->second); \
-		s.append(kvbuf); \
-	} \
-}
-
-#include "Common/PlayerTemplate.h"
-
-std::string GameSpyPSMessageQueueInterface::formatPlayerKVPairs( PSPlayerStats stats )
-{
-	char kvbuf[256];
-	std::string s = "";
-	PerGeneralMap::iterator it;
-
-	ITERATE_OVER(wins);
-	ITERATE_OVER(losses);
-	ITERATE_OVER(games);
-	ITERATE_OVER(duration);
-	ITERATE_OVER(unitsKilled);
-	ITERATE_OVER(unitsLost);
-	ITERATE_OVER(unitsBuilt);
-	ITERATE_OVER(buildingsKilled);
-	ITERATE_OVER(buildingsLost);
-	ITERATE_OVER(buildingsBuilt);
-	ITERATE_OVER(earnings);
-	ITERATE_OVER(techCaptured);
-
-	//GS  Report all disconnects, even if zero, because might have been 
-	//previously reported as 1 by updateAdditionalGameSpyDisconnections
-//	ITERATE_OVER(discons);
-	for (Int ptIdx = 0; ptIdx < ThePlayerTemplateStore->getPlayerTemplateCount(); ++ptIdx)
-	{
-//		const PlayerTemplate* pTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(ptIdx);
-//		const GeneralPersona* pGeneral = TheChallengeGenerals->getGeneralByTemplateName(pTemplate->getName());
-//		BOOL isReported = pGeneral ? pGeneral->isStartingEnabled() : FALSE;
-//		if( !isReported )
-//			continue;  //don't report unplayable templates (observer, boss, etc.)
-
-		sprintf(kvbuf, "\\discons%d\\%d", ptIdx, stats.discons[ptIdx]);
-		s.append(kvbuf);
-	}
-
-	ITERATE_OVER(desyncs);
-	ITERATE_OVER(surrenders);
-	ITERATE_OVER(gamesOf2p);
-	ITERATE_OVER(gamesOf3p);
-	ITERATE_OVER(gamesOf4p);
-	ITERATE_OVER(gamesOf5p);
-	ITERATE_OVER(gamesOf6p);
-	ITERATE_OVER(gamesOf7p);
-	ITERATE_OVER(gamesOf8p);
-	ITERATE_OVER(customGames);
-	ITERATE_OVER(QMGames);
-	
-	if (stats.locale > 0)
-	{
-		sprintf(kvbuf, "\\locale\\%d", stats.locale);
-		s.append(kvbuf);
-	}
-
-	if (stats.gamesAsRandom > 0)
-	{
-		sprintf(kvbuf, "\\random\\%d", stats.gamesAsRandom);
-		s.append(kvbuf);
-	}
-
-	if (stats.options.length())
-	{
-		snprintf(kvbuf, 256, "\\options\\%s", stats.options.c_str());
-		s.append(kvbuf);
-	}
-
-	if (stats.systemSpec.length())
-	{
-		snprintf(kvbuf, 256, "\\systemSpec\\%s", stats.systemSpec.c_str());
-		s.append(kvbuf);
-	}
-
-	if (stats.lastFPS > 0.0f)
-	{
-		sprintf(kvbuf, "\\fps\\%g", stats.lastFPS);
-		s.append(kvbuf);
-	}
-	if (stats.lastGeneral >= 0)
-	{
-		sprintf(kvbuf, "\\lastGeneral\\%d", stats.lastGeneral);
-		s.append(kvbuf);
-	}
-	if (stats.gamesInRowWithLastGeneral >= 0)
-	{
-		sprintf(kvbuf, "\\genInRow\\%d", stats.gamesInRowWithLastGeneral);
-		s.append(kvbuf);
-	}
-	if (stats.builtParticleCannon >= 0)
-	{
-		sprintf(kvbuf, "\\builtCannon\\%d", stats.builtParticleCannon);
-		s.append(kvbuf);
-	}
-	if (stats.builtNuke >= 0)
-	{
-		sprintf(kvbuf, "\\builtNuke\\%d", stats.builtNuke);
-		s.append(kvbuf);
-	}
-	if (stats.builtSCUD >= 0)
-	{
-		sprintf(kvbuf, "\\builtSCUD\\%d", stats.builtSCUD);
-		s.append(kvbuf);
-	}
-	if (stats.challengeMedals > 0)
-	{
-		sprintf(kvbuf, "\\challenge\\%d", stats.challengeMedals);
-		s.append(kvbuf);
-	}
-	if (stats.battleHonors > 0)
-	{
-		sprintf(kvbuf, "\\battle\\%d", stats.battleHonors);
-		s.append(kvbuf);
-	}
-
-	//if (stats.winsInARow > 0)
-	{
-		sprintf(kvbuf, "\\WinRow\\%d", stats.winsInARow);
-		s.append(kvbuf);
-	}
-	if (stats.maxWinsInARow > 0)
-	{
-		sprintf(kvbuf, "\\WinRowMax\\%d", stats.maxWinsInARow);
-		s.append(kvbuf);
-	}
-
-	//if (stats.lossesInARow > 0)
-	{
-		sprintf(kvbuf, "\\LossRow\\%d", stats.lossesInARow);
-		s.append(kvbuf);
-	}
-	if (stats.maxLossesInARow > 0)
-	{
-		sprintf(kvbuf, "\\LossRowMax\\%d", stats.maxLossesInARow);
-		s.append(kvbuf);
-	}
-
-	//if (stats.disconsInARow > 0)
-	{
-		sprintf(kvbuf, "\\DCRow\\%d", stats.disconsInARow);
-		s.append(kvbuf);
-	}
-	if (stats.maxDisconsInARow > 0)
-	{
-		sprintf(kvbuf, "\\DCRowMax\\%d", stats.maxDisconsInARow);
-		s.append(kvbuf);
-	}
-
-	//if (stats.desyncsInARow > 0)
-	{
-		sprintf(kvbuf, "\\DSRow\\%d", stats.desyncsInARow);
-		s.append(kvbuf);
-	}
-	if (stats.maxDesyncsInARow > 0)
-	{
-		sprintf(kvbuf, "\\DSRowMax\\%d", stats.maxDesyncsInARow);
-		s.append(kvbuf);
-	}
-
-	if (stats.lastLadderPort > 0)
-	{
-		sprintf(kvbuf, "\\ladderPort\\%d", stats.lastLadderPort);
-		s.append(kvbuf);
-	}
-	if (stats.lastLadderHost.length())
-	{
-		snprintf(kvbuf, 256, "\\ladderHost\\%s", stats.lastLadderHost.c_str());
-		s.append(kvbuf);
-	}
-
-	DEBUG_LOG(("Formatted persistent values as '%s'\n", s.c_str()));
-	return s;
-}
-
-//-------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp
deleted file mode 100644
index 75ea0c1058b..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp
+++ /dev/null
@@ -1,575 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: PingThread.cpp //////////////////////////////////////////////////////
-// Ping thread
-// Author: Matthew D. Campbell, August 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include <winsock.h>	// This one has to be here. Prevents collisions with windsock2.h
-
-#include "GameNetwork/GameSpy/PingThread.h"
-#include "mutex.h"
-#include "thread.h"
-
-#include "Common/StackDump.h"
-#include "Common/SubsystemInterface.h"
-
-//-------------------------------------------------------------------------
-
-static const Int NumWorkerThreads = 10;
-
-typedef std::queue<PingRequest> RequestQueue;
-typedef std::queue<PingResponse> ResponseQueue;
-class PingThreadClass;
-
-class Pinger : public PingerInterface
-{
-public:
-	virtual ~Pinger();
-	Pinger();
-	virtual void startThreads( void );
-	virtual void endThreads( void );
-	virtual Bool areThreadsRunning( void );
-
-	virtual void addRequest( const PingRequest& req );
-	virtual Bool getRequest( PingRequest& resp );
-
-	virtual void addResponse( const PingResponse& resp );
-	virtual Bool getResponse( PingResponse& resp );
-
-	virtual Bool arePingsInProgress( void );
-	virtual Int getPing( AsciiString hostname );
-
-	virtual void clearPingMap( void );
-	virtual AsciiString getPingString( Int timeout );
-
-private:
-	MutexClass m_requestMutex;
-	MutexClass m_responseMutex;
-	MutexClass m_pingMapMutex;
-	RequestQueue m_requests;
-	ResponseQueue m_responses;
-	Int m_requestCount;
-	Int m_responseCount;
-
-	std::map<std::string, Int> m_pingMap;
-
-	PingThreadClass *m_workerThreads[NumWorkerThreads];
-};
-
-PingerInterface* PingerInterface::createNewPingerInterface( void )
-{
-	return NEW Pinger;
-}
-
-PingerInterface *ThePinger;
-
-//-------------------------------------------------------------------------
-
-class PingThreadClass : public ThreadClass
-{
-
-public:
-	PingThreadClass() : ThreadClass() {}
-
-	void Thread_Function();
-
-private:
-	Int doPing( UnsignedInt IP, Int timeout );
-};
-
-
-//-------------------------------------------------------------------------
-
-Pinger::Pinger() : m_requestCount(0), m_responseCount(0)
-{
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		m_workerThreads[i] = NULL;
-	}
-}
-
-Pinger::~Pinger()
-{
-	endThreads();
-}
-
-void Pinger::startThreads( void )
-{
-	endThreads();
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		m_workerThreads[i] = NEW PingThreadClass;
-		m_workerThreads[i]->Execute();
-	}
-}
-
-void Pinger::endThreads( void )
-{
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		if (m_workerThreads[i])
-		{
-			delete m_workerThreads[i];
-			m_workerThreads[i] = NULL;
-		}
-	}
-}
-
-Bool Pinger::areThreadsRunning( void )
-{
-	for (Int i=0; i<NumWorkerThreads; ++i)
-	{
-		if (m_workerThreads[i])
-		{
-			if (m_workerThreads[i]->Is_Running())
-				return true;
-		}
-	}
-	return false;
-}
-
-void Pinger::addRequest( const PingRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex);
-
-	++m_requestCount;
-	m_requests.push(req);
-}
-
-Bool Pinger::getRequest( PingRequest& req )
-{
-	MutexClass::LockClass m(m_requestMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_requests.empty())
-		return false;
-	req = m_requests.front();
-	m_requests.pop();
-	return true;
-}
-
-void Pinger::addResponse( const PingResponse& resp )
-{
-	{
-		MutexClass::LockClass m(m_pingMapMutex);
-
-		m_pingMap[resp.hostname] = resp.avgPing;
-	}
-	{
-		MutexClass::LockClass m(m_responseMutex);
-
-		++m_responseCount;
-		m_responses.push(resp);
-	}
-}
-
-Bool Pinger::getResponse( PingResponse& resp )
-{
-	MutexClass::LockClass m(m_responseMutex, 0);
-	if (m.Failed())
-		return false;
-
-	if (m_responses.empty())
-		return false;
-	resp = m_responses.front();
-	m_responses.pop();
-	return true;
-}
-
-Bool Pinger::arePingsInProgress( void )
-{
-	return (m_requestCount != m_responseCount);
-}
-
-Int Pinger::getPing( AsciiString hostname )
-{
-	MutexClass::LockClass m(m_pingMapMutex, 0);
-	if (m.Failed())
-		return false;
-
-	std::map<std::string, Int>::const_iterator it = m_pingMap.find(hostname.str());
-	if (it != m_pingMap.end())
-		return it->second;
-
-	return -1;
-}
-
-void Pinger::clearPingMap( void )
-{
-	MutexClass::LockClass m(m_pingMapMutex);
-	m_pingMap.clear();
-}
-
-AsciiString Pinger::getPingString( Int timeout )
-{
-	MutexClass::LockClass m(m_pingMapMutex);
-
-	AsciiString pingString;
-	AsciiString tmp;
-	for (std::map<std::string, Int>::const_iterator it = m_pingMap.begin(); it != m_pingMap.end(); ++it)
-	{
-		Int ping = it->second;
-		if (ping < 0 || ping > timeout)
-			ping = timeout;
-		ping = ping * 255 / timeout;
-		tmp.format("%2.2X", ping);
-		pingString.concat(tmp);
-	}
-	return pingString;
-}
-
-//-------------------------------------------------------------------------
-
-void PingThreadClass::Thread_Function()
-{
-	try {
-	_set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
-	PingRequest req;
-
-	WSADATA wsaData;
-
-	// Fire up winsock (prob already done, but doesn't matter)
-	WORD wVersionRequested = MAKEWORD(1, 1);
-	WSAStartup( wVersionRequested, &wsaData );
-
-	while ( running )
-	{
-		// deal with requests
-		if (ThePinger->getRequest(req))
-		{
-			// resolve the hostname
-			const char *hostnameBuffer = req.hostname.c_str();
-			UnsignedInt IP = 0xFFFFFFFF;
-			if (isdigit(hostnameBuffer[0]))
-			{
-				IP = inet_addr(hostnameBuffer);
-				in_addr hostNode;
-				hostNode.s_addr = IP;
-				DEBUG_LOG(("pinging %s - IP = %s\n", hostnameBuffer, inet_ntoa(hostNode) ));
-			}
-			else
-			{
-				HOSTENT *hostStruct;
-				in_addr *hostNode;
-				hostStruct = gethostbyname(hostnameBuffer);
-				if (hostStruct == NULL)
-				{
-					DEBUG_LOG(("pinging %s - host lookup failed\n", hostnameBuffer));
-					
-					// Even though this failed to resolve IP, still need to send a
-					//   callback.
-					IP = 0xFFFFFFFF;   // flag for IP resolve failed
-				}
-				hostNode = (in_addr *) hostStruct->h_addr;
-				IP = hostNode->s_addr;
-				DEBUG_LOG(("pinging %s IP = %s\n", hostnameBuffer, inet_ntoa(*hostNode) ));
-			}
-
-			// do ping
-			Int totalPing = 0;
-			Int goodReps = 0;
-			Int reps = req.repetitions;
-			while (reps-- && running && IP != 0xFFFFFFFF)
-			{
-				Int ping = doPing(IP, req.timeout);
-				if (ping >= 0)
-				{
-					totalPing += ping;
-					++goodReps;
-				}
-
-				// end our timeslice
-				Switch_Thread();
-			}
-			if (!goodReps)
-				totalPing = -1;
-			else
-				totalPing = totalPing / goodReps;
-
-			PingResponse resp;
-			resp.hostname = req.hostname;
-			resp.avgPing = totalPing;
-			resp.repetitions = goodReps;
-			ThePinger->addResponse(resp);
-		}
-
-		// end our timeslice
-		Switch_Thread();
-	}
-
-	WSACleanup();
-	} catch ( ... ) {
-		DEBUG_CRASH(("Exception in ping thread!"));
-	}
-}
-
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-
-HANDLE WINAPI IcmpCreateFile(VOID); /* INVALID_HANDLE_VALUE on error */
-BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle); /* FALSE on error */
-
-/* Note 2: For the most part, you can refer to RFC 791 for detials
- * on how to fill in values for the IP option information structure. 
- */
-typedef struct ip_option_information
-{
-   UnsignedByte Ttl;         /* Time To Live (used for traceroute) */
-   UnsignedByte Tos;         /* Type Of Service (usually 0) */
-   UnsignedByte Flags;       /* IP header flags (usually 0) */
-   UnsignedByte OptionsSize; /* Size of options data (usually 0, max 40) */
-   UnsignedByte FAR *OptionsData;   /* Options data buffer */
-}
-IPINFO, *PIPINFO, FAR *LPIPINFO;
-
-
-/* Note 1: The Reply Buffer will have an array of ICMP_ECHO_REPLY
- * structures, followed by options and the data in ICMP echo reply
- * datagram received. You must have room for at least one ICMP
- * echo reply structure, plus 8 bytes for an ICMP header. 
- */
-typedef struct icmp_echo_reply
-{
-   UnsignedInt Address;     /* source address */
-   ////////UnsignedInt Status;      /* IP status value (see below) */
-   UnsignedInt RTTime;      /* Round Trip Time in milliseconds */
-   UnsignedShort DataSize;   /* reply data size */
-   UnsignedShort Reserved;   /* */
-   void FAR *Data;     /* reply data buffer */
-   struct ip_option_information Options; /* reply options */
-}
-ICMPECHO, *PICMPECHO, FAR *LPICMPECHO;
-
-
-DWORD WINAPI IcmpSendEcho(
-   HANDLE IcmpHandle,   /* handle returned from IcmpCreateFile() */
-   UnsignedInt DestAddress,  /* destination IP address (in network order) */
-   LPVOID RequestData,  /* pointer to buffer to send */
-   WORD RequestSize,    /* length of data in buffer */
-   LPIPINFO RequestOptns,   /* see Note 2 */
-   LPVOID ReplyBuffer,  /* see Note 1 */
-   DWORD ReplySize,     /* length of reply (must allow at least 1 reply) */
-   DWORD Timeout       /* time in milliseconds to wait for reply */
-);
-
-
-#define IP_STATUS_BASE 11000
-#define IP_SUCCESS 0
-#define IP_BUF_TOO_SMALL (IP_STATUS_BASE + 1)
-#define IP_DEST_NET_UNREACHABLE (IP_STATUS_BASE + 2)
-#define IP_DEST_HOST_UNREACHABLE (IP_STATUS_BASE + 3)
-#define IP_DEST_PROT_UNREACHABLE (IP_STATUS_BASE + 4)
-#define IP_DEST_PORT_UNREACHABLE (IP_STATUS_BASE + 5)
-#define IP_NO_RESOURCES (IP_STATUS_BASE + 6)
-#define IP_BAD_OPTION (IP_STATUS_BASE + 7)
-#define IP_HW_ERROR (IP_STATUS_BASE + 8)
-#define IP_PACKET_TOO_BIG (IP_STATUS_BASE + 9)
-#define IP_REQ_TIMED_OUT (IP_STATUS_BASE + 10)
-#define IP_BAD_REQ (IP_STATUS_BASE + 11)
-#define IP_BAD_ROUTE (IP_STATUS_BASE + 12)
-#define IP_TTL_EXPIRED_TRANSIT (IP_STATUS_BASE + 13)
-#define IP_TTL_EXPIRED_REASSEM (IP_STATUS_BASE + 14)
-#define IP_PARAM_PROBLEM (IP_STATUS_BASE + 15)
-#define IP_SOURCE_QUENCH (IP_STATUS_BASE + 16)
-#define IP_OPTION_TOO_BIG (IP_STATUS_BASE + 17)
-#define IP_BAD_DESTINATION (IP_STATUS_BASE + 18)
-#define IP_ADDR_DELETED (IP_STATUS_BASE + 19)
-#define IP_SPEC_MTU_CHANGE (IP_STATUS_BASE + 20)
-#define IP_MTU_CHANGE (IP_STATUS_BASE + 21)
-#define IP_UNLOAD (IP_STATUS_BASE + 22)
-#define IP_GENERAL_FAILURE (IP_STATUS_BASE + 50)
-#define MAX_IP_STATUS IP_GENERAL_FAILURE
-#define IP_PENDING (IP_STATUS_BASE + 255)
-
-
-#define BUFSIZE     8192
-#define DEFAULT_LEN 32
-#define LOOPLIMIT   4
-#define DEFAULT_TTL 64
-
-Int PingThreadClass::doPing(UnsignedInt IP, Int timeout)
-{
-   /*
-    * Initialize default settings 
-    */
-
-   IPINFO stIPInfo, *lpstIPInfo;
-   HANDLE hICMP, hICMP_DLL;
-   int i, j, nDataLen, nLoopLimit, nTimeOut, nTTL, nTOS;
-   DWORD dwReplyCount;
-   ///////IN_ADDR stDestAddr;
-   BOOL fRet, fDontStop;
-   ///BOOL fTraceRoute;
-
-   nDataLen = DEFAULT_LEN;
-   nLoopLimit = LOOPLIMIT;
-   nTimeOut = timeout;
-   fDontStop = FALSE;
-   lpstIPInfo = NULL;
-   nTTL = DEFAULT_TTL;
-   nTOS = 0;
-
-   Int pingTime = -1;  // in case of error
-
-   char achReqData[BUFSIZE];
-   char achRepData[sizeof(ICMPECHO) + BUFSIZE];
-
-
-   HANDLE ( WINAPI *lpfnIcmpCreateFile )( VOID ) = NULL;
-   BOOL ( WINAPI *lpfnIcmpCloseHandle )( HANDLE ) = NULL;
-   DWORD (WINAPI *lpfnIcmpSendEcho)(HANDLE, DWORD, LPVOID, WORD, LPVOID,
-                                    LPVOID, DWORD, DWORD) = NULL;
-
-
-   /*
-    *  Load the ICMP.DLL
-    */
-   hICMP_DLL = LoadLibrary("ICMP.DLL");
-   if (hICMP_DLL == 0)
-   {
-      DEBUG_LOG(("LoadLibrary() failed: Unable to locate ICMP.DLL!\n"));
-      goto cleanup;
-   }
-
-   /*
-    * Get pointers to ICMP.DLL functions
-    */
-   lpfnIcmpCreateFile = (void * (__stdcall *)(void))GetProcAddress( (HINSTANCE)hICMP_DLL, "IcmpCreateFile");
-   lpfnIcmpCloseHandle = (int (__stdcall *)(void *))GetProcAddress( (HINSTANCE)hICMP_DLL, "IcmpCloseHandle");
-   lpfnIcmpSendEcho = (unsigned long (__stdcall *)(void *, unsigned long, void *, unsigned short,
-                       void *, void *, unsigned long, unsigned long))GetProcAddress( (HINSTANCE)hICMP_DLL, "IcmpSendEcho" );
-
-   if ((!lpfnIcmpCreateFile) ||
-         (!lpfnIcmpCloseHandle) ||
-         (!lpfnIcmpSendEcho))
-   {
-      DEBUG_LOG(("GetProcAddr() failed for at least one function.\n"));
-      goto cleanup;
-   }
-
-
-   /*
-    * IcmpCreateFile() - Open the ping service
-    */
-   hICMP = (HANDLE) lpfnIcmpCreateFile();
-   if (hICMP == INVALID_HANDLE_VALUE)
-   {
-      DEBUG_LOG(("IcmpCreateFile() failed"));
-      goto cleanup;
-   }
-
-   /*
-    * Init data buffer printable ASCII 
-    *  32 (space) through 126 (tilde)
-    */
-   for (j = 0, i = 32; j < nDataLen; j++, i++)
-   {
-      if (i >= 126)
-         i = 32;
-      achReqData[j] = i;
-   }
-
-   /*
-   * Init IPInfo structure
-   */
-   lpstIPInfo = &stIPInfo;
-   stIPInfo.Ttl = nTTL;
-   stIPInfo.Tos = nTOS;
-   stIPInfo.Flags = 0;
-   stIPInfo.OptionsSize = 0;
-   stIPInfo.OptionsData = NULL;
-
-
-
-   /*
-    * IcmpSendEcho() - Send the ICMP Echo Request
-    *                   and read the Reply
-    */
-   dwReplyCount = lpfnIcmpSendEcho(
-                     hICMP,
-                     IP,
-                     achReqData,
-                     nDataLen,
-                     lpstIPInfo,
-                     achRepData,
-                     sizeof(achRepData),
-                     nTimeOut);
-   if (dwReplyCount != 0)
-   {
-      //////////IN_ADDR stDestAddr;
-      DWORD dwStatus;
-
-      pingTime = (*(UnsignedInt *) & (achRepData[8]));
-
-      // I've seen the ping time bigger than the timeout by a little
-      //   bit.  How lame.
-      if (pingTime > timeout)
-         pingTime = timeout;
-
-      dwStatus = *(DWORD *) & (achRepData[4]);
-      if (dwStatus != IP_SUCCESS)
-      {
-         DEBUG_LOG(("ICMPERR: %d\n", dwStatus));
-      }
-
-   }
-   else
-   {
-      DEBUG_LOG(("IcmpSendEcho() failed: %d\n", dwReplyCount));
-      // Ok we didn't get a packet, just say everything's OK
-      //  and the time was -1
-      pingTime = -1;
-      goto cleanup;
-   }
-
-
-   /*
-    * IcmpCloseHandle - Close the ICMP handle
-    */
-   fRet = lpfnIcmpCloseHandle(hICMP);
-   if (fRet == FALSE)
-   {
-      DEBUG_LOG(("Error closing ICMP handle\n"));
-   }
-
-   // Say what you will about goto's but it's handy for stuff like this
-cleanup:
-
-   // Shut down...
-   if (hICMP_DLL)
-      FreeLibrary((HINSTANCE)hICMP_DLL);
-
-   return pingTime;
-}
-
-
-//-------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
deleted file mode 100644
index 5d611dbf99c..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: ThreadUtils.cpp //////////////////////////////////////////////////////
-// GameSpy thread utils
-// Author: Matthew D. Campbell, July 2002
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-//-------------------------------------------------------------------------
-
-std::wstring MultiByteToWideCharSingleLine( const char *orig )
-{
-	Int len = strlen(orig);
-	WideChar *dest = NEW WideChar[len+1];
-
-	MultiByteToWideChar(CP_UTF8, 0, orig, -1, dest, len);
-	WideChar *c = NULL;
-	do
-	{
-		c = wcschr(dest, L'\n');
-		if (c)
-		{
-			*c = L' ';
-		}
-	}
-	while ( c != NULL );
-	do
-	{
-		c = wcschr(dest, L'\r');
-		if (c)
-		{
-			*c = L' ';
-		}
-	}
-	while ( c != NULL );
-
-	dest[len] = 0;
-	std::wstring ret = dest;
-	delete[] dest;
-	return ret;
-}
-
-std::string WideCharStringToMultiByte( const WideChar *orig )
-{
-	std::string ret;
-	Int len = WideCharToMultiByte( CP_UTF8, 0, orig, wcslen(orig), NULL, 0, NULL, NULL ) + 1;
-	if (len > 0)
-	{
-		char *dest = NEW char[len];
-		WideCharToMultiByte( CP_UTF8, 0, orig, -1, dest, len, NULL, NULL );
-		dest[len-1] = 0;
-		ret = dest;
-		delete[] dest;
-	}
-	return ret;
-}
-
-//-------------------------------------------------------------------------
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp
index 1aeda9e8913..a34441f6a4d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp
@@ -26,7 +26,7 @@
 // GameSpy chat handlers
 // Author: Matthew D. Campbell, February 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameText.h"
 #include "GameClient/GadgetListBox.h"
@@ -135,7 +135,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo
 		case L'r':
 		case L'R':
 			remainder.nextToken(&token);
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 			if (token.compareNoCase(L"raw") == 0)
 			{
 				// Send raw IRC commands (Ascii only)
@@ -149,7 +149,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo
 			}
 #endif
 			break;
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 		case L'k':
 		case L'K':
 			remainder.nextToken(&token);
@@ -194,7 +194,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo
 				}
 				return true; // show it anyway
 			}
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 			else if (token.compareNoCase(L"oper") == 0)
 			{
 				// Send raw IRC oper command
@@ -245,7 +245,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo
 				return true; // show it anyway
 			}
 			break;
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 		case L'c':
 		case L'C':
 			remainder.nextToken(&token);
@@ -262,7 +262,7 @@ static Bool handleSlashCommands( UnicodeString message, Bool isAction, GameWindo
 				return true; // show it anyway
 			}
 			break;
-#endif // RTS_DEBUG || defined RTS_INTERNAL
+#endif // RTS_DEBUG
 		}
 	}
 	*/
@@ -375,7 +375,7 @@ void RoomMessageCallback(PEER peer, RoomType roomType,
 												 const char * nick, const char * message,
 												 MessageType messageType, void * param)
 {
-	DEBUG_LOG(("RoomMessageCallback\n"));
+	DEBUG_LOG(("RoomMessageCallback"));
 	handleUnicodeMessage(nick, QuotedPrintableToUnicodeString(message), true, (messageType == ActionMessage));
 }
 
@@ -383,7 +383,7 @@ void PlayerMessageCallback(PEER peer,
 												 const char * nick, const char * message,
 												 MessageType messageType, void * param)
 {
-	DEBUG_LOG(("PlayerMessageCallback\n"));
+	DEBUG_LOG(("PlayerMessageCallback"));
 	handleUnicodeMessage(nick, QuotedPrintableToUnicodeString(message), false, (messageType == ActionMessage));
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyGP.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyGP.cpp
index a81eef1ac30..602d1f2d080 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyGP.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyGP.cpp
@@ -26,7 +26,7 @@
 // GameSpy GP callbacks, utils, etc
 // Author: Matthew D. Campbell, February 2002
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "GameClient/GameText.h"
 #include "GameNetwork/GameSpy.h"
@@ -40,7 +40,7 @@ char GameSpyProfilePassword[64];
 
 void GPRecvBuddyMessageCallback(GPConnection * pconnection, GPRecvBuddyMessageArg * arg, void * param)
 {
-	DEBUG_LOG(("GPRecvBuddyMessageCallback: message from %d is %s\n", arg->profile, arg->message));
+	DEBUG_LOG(("GPRecvBuddyMessageCallback: message from %d is %s", arg->profile, arg->message));
 
 	//gpGetInfo(pconn, arg->profile, GP_DONT_CHECK_CACHE, GP_BLOCKING, (GPCallback)Whois, NULL);
 	//printf("MESSAGE (%d): %s: %s\n", msgCount,whois, arg->message);
@@ -53,7 +53,7 @@ static void buddyTryReconnect( void )
 
 void GPErrorCallback(GPConnection * pconnection, GPErrorArg * arg, void * param)
 {
-	DEBUG_LOG(("GPErrorCallback\n"));
+	DEBUG_LOG(("GPErrorCallback"));
 
 	AsciiString errorCodeString;
 	AsciiString resultString;
@@ -126,9 +126,9 @@ void GPErrorCallback(GPConnection * pconnection, GPErrorArg * arg, void * param)
 
 	if(arg->fatal)
 	{
-		DEBUG_LOG(( "-----------\n"));
-		DEBUG_LOG(( "GP FATAL ERROR\n"));
-		DEBUG_LOG(( "-----------\n"));
+		DEBUG_LOG(( "-----------"));
+		DEBUG_LOG(( "GP FATAL ERROR"));
+		DEBUG_LOG(( "-----------"));
 
 		// if we're still connected to the chat server, tell the user.  He can always hit the buddy
 		// button to try reconnecting.  Oh yes, also hide the buddy popup.
@@ -140,23 +140,23 @@ void GPErrorCallback(GPConnection * pconnection, GPErrorArg * arg, void * param)
 	}
 	else
 	{
-		DEBUG_LOG(( "-----\n"));
-		DEBUG_LOG(( "GP ERROR\n"));
-		DEBUG_LOG(( "-----\n"));
+		DEBUG_LOG(( "-----"));
+		DEBUG_LOG(( "GP ERROR"));
+		DEBUG_LOG(( "-----"));
 	}
-	DEBUG_LOG(( "RESULT: %s (%d)\n", resultString.str(), arg->result));
-	DEBUG_LOG(( "ERROR CODE: %s (0x%X)\n", errorCodeString.str(), arg->errorCode));
-	DEBUG_LOG(( "ERROR STRING: %s\n", arg->errorString));
+	DEBUG_LOG(( "RESULT: %s (%d)", resultString.str(), arg->result));
+	DEBUG_LOG(( "ERROR CODE: %s (0x%X)", errorCodeString.str(), arg->errorCode));
+	DEBUG_LOG(( "ERROR STRING: %s", arg->errorString));
 }
 
 void GPRecvBuddyStatusCallback(GPConnection * connection, GPRecvBuddyStatusArg * arg, void * param)
 {
-	DEBUG_LOG(("GPRecvBuddyStatusCallback: info on %d is in %d\n", arg->profile, arg->index));
+	DEBUG_LOG(("GPRecvBuddyStatusCallback: info on %d is in %d", arg->profile, arg->index));
 
 	//GameSpyUpdateBuddyOverlay();
 }
 
 void GPRecvBuddyRequestCallback(GPConnection * connection, GPRecvBuddyRequestArg * arg, void * param)
 {
-	DEBUG_LOG(("GPRecvBuddyRequestCallback: %d wants to be our buddy because '%s'\n", arg->profile, arg->reason));
+	DEBUG_LOG(("GPRecvBuddyRequestCallback: %d wants to be our buddy because '%s'", arg->profile, arg->reason));
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyGameInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyGameInfo.cpp
index ad2257f9eb3..5cfe1211d04 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyGameInfo.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyGameInfo.cpp
@@ -26,7 +26,7 @@
 // GameSpy game setup state info
 // Author: Matthew D. Campbell, December 2001
 
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "Common/GameEngine.h"
 #include "Common/Player.h"
@@ -159,18 +159,18 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 		"DELETE_TCB"
 	};
 
-	DEBUG_LOG(("Finding local address used to talk to the chat server\n"));
-	DEBUG_LOG(("Current chat server name is %s\n", serverName.str()));
-	DEBUG_LOG(("Chat server port is %d\n", serverPort));
+	DEBUG_LOG(("Finding local address used to talk to the chat server"));
+	DEBUG_LOG(("Current chat server name is %s", serverName.str()));
+	DEBUG_LOG(("Chat server port is %d", serverPort));
 
 	/*
 	** Get the address of the chat server.
 	*/
-	DEBUG_LOG( ("About to call gethostbyname\n"));
+	DEBUG_LOG( ("About to call gethostbyname"));
 	struct hostent *host_info = gethostbyname(serverName.str());
 
 	if (!host_info) {
-		DEBUG_LOG( ("gethostbyname failed! Error code %d\n", WSAGetLastError()));
+		DEBUG_LOG( ("gethostbyname failed! Error code %d", WSAGetLastError()));
 		return(false);
 	}
 
@@ -179,24 +179,24 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 	temp = ntohl(temp);
 	*((unsigned long*)(&serverAddress[0])) = temp;
 
-	DEBUG_LOG(("Host address is %d.%d.%d.%d\n", serverAddress[3], serverAddress[2], serverAddress[1], serverAddress[0]));
+	DEBUG_LOG(("Host address is %d.%d.%d.%d", serverAddress[3], serverAddress[2], serverAddress[1], serverAddress[0]));
 
 	/*
 	** Load the MIB-II SNMP DLL.
 	*/
-	DEBUG_LOG(("About to load INETMIB1.DLL\n"));
+	DEBUG_LOG(("About to load INETMIB1.DLL"));
 
 	HINSTANCE mib_ii_dll = LoadLibrary("inetmib1.dll");
 	if (mib_ii_dll == NULL) {
-		DEBUG_LOG(("Failed to load INETMIB1.DLL\n"));
+		DEBUG_LOG(("Failed to load INETMIB1.DLL"));
 		return(false);
 	}
 
-	DEBUG_LOG(("About to load SNMPAPI.DLL\n"));
+	DEBUG_LOG(("About to load SNMPAPI.DLL"));
 
 	HINSTANCE snmpapi_dll = LoadLibrary("snmpapi.dll");
 	if (snmpapi_dll == NULL) {
-		DEBUG_LOG(("Failed to load SNMPAPI.DLL\n"));
+		DEBUG_LOG(("Failed to load SNMPAPI.DLL"));
 		FreeLibrary(mib_ii_dll);
 		return(false);
 	}
@@ -209,7 +209,7 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 	SnmpUtilMemAllocPtr = (void *(__stdcall *)(unsigned long)) GetProcAddress(snmpapi_dll, "SnmpUtilMemAlloc");
 	SnmpUtilMemFreePtr = (void (__stdcall *)(void *)) GetProcAddress(snmpapi_dll, "SnmpUtilMemFree");
 	if (SnmpExtensionInitPtr == NULL || SnmpExtensionQueryPtr == NULL || SnmpUtilMemAllocPtr == NULL || SnmpUtilMemFreePtr == NULL) {
-		DEBUG_LOG(("Failed to get proc addresses for linked functions\n"));
+		DEBUG_LOG(("Failed to get proc addresses for linked functions"));
 		FreeLibrary(snmpapi_dll);
 		FreeLibrary(mib_ii_dll);
 		return(false);
@@ -222,14 +222,14 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 	/*
 	** OK, here we go. Try to initialise the .dll
 	*/
-	DEBUG_LOG(("About to init INETMIB1.DLL\n"));
+	DEBUG_LOG(("About to init INETMIB1.DLL"));
 	int ok = SnmpExtensionInitPtr(GetCurrentTime(), &trap_handle, &first_supported_region);
 
 	if (!ok) {
 		/*
 		** Aw crap.
 		*/
-		DEBUG_LOG(("Failed to init the .dll\n"));
+		DEBUG_LOG(("Failed to init the .dll"));
 		SnmpUtilMemFreePtr(bind_list_ptr);
 		SnmpUtilMemFreePtr(bind_ptr);
 		FreeLibrary(snmpapi_dll);
@@ -278,7 +278,7 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 
 		if (!SnmpExtensionQueryPtr(SNMP_PDU_GETNEXT, bind_list_ptr, &error_status, &error_index)) {
 		//if (!SnmpExtensionQueryPtr(ASN_RFC1157_GETNEXTREQUEST, bind_list_ptr, &error_status, &error_index)) {
-			DEBUG_LOG(("SnmpExtensionQuery returned false\n"));
+			DEBUG_LOG(("SnmpExtensionQuery returned false"));
 			SnmpUtilMemFreePtr(bind_list_ptr);
 			SnmpUtilMemFreePtr(bind_ptr);
 			FreeLibrary(snmpapi_dll);
@@ -382,7 +382,7 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 	SnmpUtilMemFreePtr(bind_ptr);
 	SnmpUtilMemFreePtr(mib_ii_name_ptr);
 
-	DEBUG_LOG(("Got %d connections in list, parsing...\n", connectionVector.size()));
+	DEBUG_LOG(("Got %d connections in list, parsing...", connectionVector.size()));
 
 	/*
 	** Right, we got the lot. Lets see if any of them have the same address as the chat
@@ -399,29 +399,29 @@ Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverP
 		** See if this connection has the same address as our server.
 		*/
 		if (!found && memcmp(remoteAddress, serverAddress, 4) == 0) {
-			DEBUG_LOG(("Found connection with same remote address as server\n"));
+			DEBUG_LOG(("Found connection with same remote address as server"));
 
 			if (serverPort == 0 || serverPort == (unsigned int)connection.RemotePort) {
 
-				DEBUG_LOG(("Connection has same port\n"));
+				DEBUG_LOG(("Connection has same port"));
 				/*
 				** Make sure the connection is current.
 				*/
 				if (connection.State == ESTABLISHED) {
-					DEBUG_LOG(("Connection is ESTABLISHED\n"));
+					DEBUG_LOG(("Connection is ESTABLISHED"));
 					localIP = connection.LocalIP;
 					found = true;
 				} else {
-					DEBUG_LOG(("Connection is not ESTABLISHED - skipping\n"));
+					DEBUG_LOG(("Connection is not ESTABLISHED - skipping"));
 				}
 			} else {
-				DEBUG_LOG(("Connection has different port. Port is %d, looking for %d\n", connection.RemotePort, serverPort));
+				DEBUG_LOG(("Connection has different port. Port is %d, looking for %d", connection.RemotePort, serverPort));
 			}
 		}
 	}
 
 	if (found) {
-		DEBUG_LOG(("Using address 0x%8.8X to talk to chat server\n", localIP));
+		DEBUG_LOG(("Using address 0x%8.8X to talk to chat server", localIP));
 	}
 
 	FreeLibrary(snmpapi_dll);
@@ -564,7 +564,7 @@ void GameSpyLaunchGame( void )
 
 		// Set the random seed
 		InitGameLogicRandom( TheGameSpyGame->getSeed() );
-		DEBUG_LOG(("InitGameLogicRandom( %d )\n", TheGameSpyGame->getSeed()));
+		DEBUG_LOG(("InitGameLogicRandom( %d )", TheGameSpyGame->getSeed()));
 
 		if (TheNAT != NULL) {
 			delete TheNAT;
@@ -588,7 +588,7 @@ void GameSpyGameInfo::resetAccepted( void )
 	{
 		// ANCIENTMUNKEE peerStateChanged(TheGameSpyChat->getPeer());
 		m_hasBeenQueried = false;
-		DEBUG_LOG(("resetAccepted() called peerStateChange()\n"));
+		DEBUG_LOG(("resetAccepted() called peerStateChange()"));
 	}
 }
 
@@ -614,13 +614,13 @@ Int GameSpyGameInfo::getLocalSlotNum( void ) const
 
 void GameSpyGameInfo::gotGOACall( void )
 {
-	DEBUG_LOG(("gotGOACall()\n"));
+	DEBUG_LOG(("gotGOACall()"));
 	m_hasBeenQueried = true;
 }
 
 void GameSpyGameInfo::startGame(Int gameID)
 {
-	DEBUG_LOG(("GameSpyGameInfo::startGame - game id = %d\n", gameID));
+	DEBUG_LOG(("GameSpyGameInfo::startGame - game id = %d", gameID));
 	DEBUG_ASSERTCRASH(m_transport == NULL, ("m_transport is not NULL when it should be"));
 	DEBUG_ASSERTCRASH(TheNAT == NULL, ("TheNAT is not NULL when it should be"));
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyOverlay.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyOverlay.cpp
deleted file mode 100644
index 8541395ca8c..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpyOverlay.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: wolscreens.cpp //////////////////////////////////////////////////////
-// Westwood Online screen setup/teardown
-// Author: Matthew D. Campbell, November 2001
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-#include "Common/AudioEventRTS.h"
-
-#include "GameClient/GadgetListBox.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MessageBox.h"
-#include "GameClient/ShellHooks.h"
-//#include "GameNetwork/GameSpy.h"
-//#include "GameNetwork/GameSpyGP.h"
-
-#include "GameNetwork/GameSpyOverlay.h"
-//#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/BuddyThread.h"
-
-void deleteNotificationBox( void );
-static void raiseOverlays( void );
-
-// Message boxes -------------------------------------
-static GameWindow *messageBoxWindow = NULL;
-static GameWinMsgBoxFunc okFunc = NULL;
-static GameWinMsgBoxFunc cancelFunc = NULL;
-static Bool reOpenPlayerInfoFlag = FALSE;
-/**
-	* messageBoxOK is called when a message box is destroyed
-	* by way of an OK button, so we can clear our pointers to it.
-	*/
-static void messageBoxOK( void )
-{
-	DEBUG_ASSERTCRASH(messageBoxWindow, ("Message box window went away without being there in the first place!"));
-	messageBoxWindow = NULL;
-	if (okFunc)
-	{
-		okFunc();
-		okFunc = NULL;
-	}
-}
-
-/**
-	* messageBoxCancel is called when a message box is destroyed
-	* by way of a Cancel button, so we can clear our pointers to it.
-	*/
-static void messageBoxCancel( void )
-{
-	DEBUG_ASSERTCRASH(messageBoxWindow, ("Message box window went away without being there in the first place!"));
-	messageBoxWindow = NULL;
-	if (cancelFunc)
-	{
-		cancelFunc();
-		cancelFunc = NULL;
-	}
-}
-
-/**
-	* clearGSMessageBoxes removes the current message box if
-	* one is present.  This is usually done when putting up a
-	* second messageBox.
-	*/
-void ClearGSMessageBoxes( void )
-{
-	if (messageBoxWindow)
-	{
-		TheWindowManager->winDestroy(messageBoxWindow);
-		messageBoxWindow = NULL;
-	}
-
-	if (okFunc)
-	{
-		okFunc = NULL;
-	}
-
-	if (cancelFunc)
-	{
-		cancelFunc = NULL;
-	}
-}
-
-/**
-	* GSMessageBoxOk puts up an OK dialog box and saves the
-	* pointers to it and its callbacks.
-	*/
-void GSMessageBoxOk(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc newOkFunc)
-{
-	ClearGSMessageBoxes();
-	messageBoxWindow = MessageBoxOk(title, message, messageBoxOK);
-	okFunc = newOkFunc;
-}
-
-/**
-	* GSMessageBoxOkCancel puts up an OK/Cancel dialog box and saves the
-	* pointers to it and its callbacks.
-	*/
-void GSMessageBoxOkCancel(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc newOkFunc, GameWinMsgBoxFunc newCancelFunc)
-{
-	ClearGSMessageBoxes();
-	messageBoxWindow = MessageBoxOkCancel(title, message, messageBoxOK, messageBoxCancel);
-	okFunc = newOkFunc;
-	cancelFunc = newCancelFunc;
-}
-
-/**
-	* GSMessageBoxYesNo puts up a Yes/No dialog box and saves the
-	* pointers to it and its callbacks.
-	*/
-void GSMessageBoxYesNo(UnicodeString title, UnicodeString message, GameWinMsgBoxFunc newYesFunc, GameWinMsgBoxFunc newNoFunc)
-{
-	ClearGSMessageBoxes();
-	messageBoxWindow = MessageBoxYesNo(title, message, messageBoxOK, messageBoxCancel);
-	okFunc = newYesFunc;
-	cancelFunc = newNoFunc;
-}
-
-/**
-	* If the screen transitions underneath the dialog box, we
-	* need to raise it to keep it visible.
-	*/
-void RaiseGSMessageBox( void )
-{
-	raiseOverlays();
-
-	if (!messageBoxWindow)
-		return;
-
-	messageBoxWindow->winBringToTop();
-}
-
-// Overlay screens -------------------------------------
-
-/**
-	* gsOverlays holds a list of the .wnd files used in GS overlays.
-	* The entries *MUST* be in the same order as the GSOverlayType enum.
-	*/
-static const char * gsOverlays[GSOVERLAY_MAX] =
-{
-	"Menus/PopupPlayerInfo.wnd",	// Player info (right-click)
-	"Menus/WOLMapSelectMenu.wnd",	// Map select
-	"Menus/WOLBuddyOverlay.wnd",	// Buddy list
-	"Menus/WOLPageOverlay.wnd",		// Find/page
-	"Menus/PopupHostGame.wnd",		// Hosting options (game name, password, etc)
-	"Menus/PopupJoinGame.wnd",		// Joining options (password, etc)
-	"Menus/PopupLadderSelect.wnd",// LadderSelect
-	"Menus/PopupLocaleSelect.wnd",// Prompt for user's locale
-	"Menus/OptionsMenu.wnd",			// popup options
-};
-
-static WindowLayout *overlayLayouts[GSOVERLAY_MAX] =
-{
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-};
-
-static void buddyTryReconnect( void )
-{
-	BuddyRequest req;
-	req.buddyRequestType = BuddyRequest::BUDDYREQUEST_RELOGIN;
-	TheGameSpyBuddyMessageQueue->addRequest( req );
-}
-
-void GameSpyOpenOverlay( GSOverlayType overlay )
-{
-	if (overlay == GSOVERLAY_BUDDY)
-	{
-		if (!TheGameSpyBuddyMessageQueue->isConnected())
-		{
-			// not connected - is it because we were disconnected?
-			if (TheGameSpyBuddyMessageQueue->getLocalProfileID())
-			{
-				// used to be connected
-				GSMessageBoxYesNo(TheGameText->fetch("GUI:GPErrorTitle"), TheGameText->fetch("GUI:GPDisconnected"), buddyTryReconnect, NULL);
-			}
-			else
-			{
-				// no profile
-				GSMessageBoxOk(TheGameText->fetch("GUI:GPErrorTitle"), TheGameText->fetch("GUI:GPNoProfile"), NULL);
-			}
-			return;
-		}
-		AudioEventRTS buttonClick("GUICommunicatorOpen");
-
-		if( TheAudio )
-		{
-			TheAudio->addAudioEvent( &buttonClick );
-		}  // end if
-	}
-	if (overlayLayouts[overlay])
-	{
-		overlayLayouts[overlay]->hide( FALSE );
-		overlayLayouts[overlay]->bringForward();
-	}
-	else
-	{
-		overlayLayouts[overlay] = TheWindowManager->winCreateLayout( AsciiString( gsOverlays[overlay] ) );
-		overlayLayouts[overlay]->runInit();
-		overlayLayouts[overlay]->hide( FALSE );
-		overlayLayouts[overlay]->bringForward();
-	}
-}
-
-void GameSpyCloseOverlay( GSOverlayType overlay )
-{
-	switch(overlay)
-	{
-		case GSOVERLAY_PLAYERINFO:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_PLAYERINFO\n"));
-			break;
-		case GSOVERLAY_MAPSELECT:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_MAPSELECT\n"));
-			break;
-		case GSOVERLAY_BUDDY:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_BUDDY\n"));
-			break;
-		case GSOVERLAY_PAGE:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_PAGE\n"));
-			break;
-		case GSOVERLAY_GAMEOPTIONS:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_GAMEOPTIONS\n"));
-			break;
-		case GSOVERLAY_GAMEPASSWORD:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_GAMEPASSWORD\n"));
-			break;
-		case GSOVERLAY_LADDERSELECT:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_LADDERSELECT\n"));
-			break;
-		case GSOVERLAY_OPTIONS:
-			DEBUG_LOG(("Closing overlay GSOVERLAY_OPTIONS\n"));
-			if( overlayLayouts[overlay] )
-			{
-				SignalUIInteraction(SHELL_SCRIPT_HOOK_OPTIONS_CLOSED);
-			}
-			break;
-	}
-	if( overlayLayouts[overlay] )
-	{
-		overlayLayouts[overlay]->runShutdown();
-		overlayLayouts[overlay]->destroyWindows();
-		deleteInstance(overlayLayouts[overlay]);
-		overlayLayouts[overlay] = NULL;
-	}
-}
-
-Bool GameSpyIsOverlayOpen( GSOverlayType overlay )
-{
-	return (overlayLayouts[overlay] != NULL);
-}
-
-void GameSpyToggleOverlay( GSOverlayType overlay )
-{
-	if (GameSpyIsOverlayOpen(overlay))
-		GameSpyCloseOverlay(overlay);
-	else
-		GameSpyOpenOverlay(overlay);
-}
-
-void raiseOverlays( void )
-{
-	for (int i=0; i<GSOVERLAY_MAX; ++i)
-	{
-		if (overlayLayouts[(GSOverlayType)i])
-		{
-			overlayLayouts[(GSOverlayType)i]->bringForward();
-		}
-	}
-}
-
-void GameSpyCloseAllOverlays( void )
-{
-	for (int i=0; i<GSOVERLAY_MAX; ++i)
-	{
-		GameSpyCloseOverlay((GSOverlayType)i);
-	}
-
-	// if we're shutting down the rest, chances are we don't want this popping up.
-	deleteNotificationBox();
-}
-
-void GameSpyUpdateOverlays( void )
-{
-	for (int i=0; i<GSOVERLAY_MAX; ++i)
-	{
-		if (overlayLayouts[(GSOverlayType)i])
-		{
-			overlayLayouts[(GSOverlayType)i]->runUpdate();
-		}
-	}
-}
-
-void ReOpenPlayerInfo( void )
-{
-	reOpenPlayerInfoFlag = TRUE;
-}
-void CheckReOpenPlayerInfo(void )
-{
-	if(!reOpenPlayerInfoFlag)
-		return;
-
-	GameSpyOpenOverlay(GSOVERLAY_PLAYERINFO);
-	reOpenPlayerInfoFlag = FALSE;
-		
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/IPEnumeration.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/IPEnumeration.cpp
deleted file mode 100644
index f485c603417..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/IPEnumeration.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/IPEnumeration.h"
-#include "GameNetwork/networkutil.h"
-#include "GameClient/ClientInstance.h"
-
-IPEnumeration::IPEnumeration( void )
-{
-	m_IPlist = NULL;
-	m_isWinsockInitialized = false;
-}
-
-IPEnumeration::~IPEnumeration( void )
-{
-	if (m_isWinsockInitialized)
-	{
-		WSACleanup();
-		m_isWinsockInitialized = false;
-	}
-
-	EnumeratedIP *ip = m_IPlist;
-	while (ip)
-	{
-		ip = ip->getNext();
-		deleteInstance(m_IPlist);
-		m_IPlist = ip;
-	}
-}
-
-EnumeratedIP * IPEnumeration::getAddresses( void )
-{
-	if (m_IPlist)
-		return m_IPlist;
-
-	if (!m_isWinsockInitialized)
-	{
-		WORD verReq = MAKEWORD(2, 2);
-		WSADATA wsadata;
-
-		int err = WSAStartup(verReq, &wsadata);
-		if (err != 0) {
-			return NULL;
-		}
-
-		if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2)) {
-			WSACleanup();
-			return NULL;
-		}
-		m_isWinsockInitialized = true;
-	}
-
-	// get the local machine's host name
-	char hostname[256];
-	if (gethostname(hostname, sizeof(hostname)))
-	{
-		DEBUG_LOG(("Failed call to gethostname; WSAGetLastError returned %d\n", WSAGetLastError()));
-		return NULL;
-	}
-	DEBUG_LOG(("Hostname is '%s'\n", hostname));
-	
-	// get host information from the host name
-	HOSTENT* hostEnt = gethostbyname(hostname);
-	if (hostEnt == NULL)
-	{
-		DEBUG_LOG(("Failed call to gethostbyname; WSAGetLastError returned %d\n", WSAGetLastError()));
-		return NULL;
-	}
-	
-	// sanity-check the length of the IP adress
-	if (hostEnt->h_length != 4)
-	{
-		DEBUG_LOG(("gethostbyname returns oddly-sized IP addresses!\n"));
-		return NULL;
-	}
-
-#if defined(RTS_MULTI_INSTANCE)
-	// TheSuperHackers @feature Add one unique local host IP address for each multi client instance.
-	const UnsignedInt id = rts::ClientInstance::getInstanceId();
-	addNewIP(
-		127,
-		(UnsignedByte)(id >> 16),
-		(UnsignedByte)(id >> 8),
-		(UnsignedByte)(id));
-#endif
-
-	// construct a list of addresses
-	int numAddresses = 0;
-	char *entry;
-	while ( (entry = hostEnt->h_addr_list[numAddresses++]) != 0 )
-	{
-		addNewIP(
-			(UnsignedByte)entry[0],
-			(UnsignedByte)entry[1],
-			(UnsignedByte)entry[2],
-			(UnsignedByte)entry[3]);
-	}
-
-	return m_IPlist;
-}
-
-void IPEnumeration::addNewIP( UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedByte d )
-{
-	EnumeratedIP *newIP = newInstance(EnumeratedIP);
-
-	AsciiString str;
-	str.format("%d.%d.%d.%d", (int)a, (int)b, (int)c, (int)d);
-
-	UnsignedInt ip = AssembleIp(a, b, c, d);
-
-	newIP->setIPstring(str);
-	newIP->setIP(ip);
-
-	DEBUG_LOG(("IP: 0x%8.8X (%s)\n", ip, str.str()));
-
-	// Add the IP to the list in ascending order
-	if (!m_IPlist)
-	{
-		m_IPlist = newIP;
-		newIP->setNext(NULL);
-	}
-	else
-	{
-		if (newIP->getIP() < m_IPlist->getIP())
-		{
-			newIP->setNext(m_IPlist);
-			m_IPlist = newIP;
-		}
-		else
-		{
-			EnumeratedIP *p = m_IPlist;
-			while (p->getNext() && p->getNext()->getIP() < newIP->getIP())
-			{
-				p = p->getNext();
-			}
-			newIP->setNext(p->getNext());
-			p->setNext(newIP);
-		}
-	}
-}
-
-AsciiString IPEnumeration::getMachineName( void )
-{
-	if (!m_isWinsockInitialized)
-	{
-		WORD verReq = MAKEWORD(2, 2);
-		WSADATA wsadata;
-
-		int err = WSAStartup(verReq, &wsadata);
-		if (err != 0) {
-			return NULL;
-		}
-
-		if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2)) {
-			WSACleanup();
-			return NULL;
-		}
-		m_isWinsockInitialized = true;
-	}
-
-	// get the local machine's host name
-	char hostname[256];
-	if (gethostname(hostname, sizeof(hostname)))
-	{
-		DEBUG_LOG(("Failed call to gethostname; WSAGetLastError returned %d\n", WSAGetLastError()));
-		return NULL;
-	}
-
-	return AsciiString(hostname);
-}
-
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPI.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPI.cpp
deleted file mode 100644
index 79ba8dc6254..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPI.cpp
+++ /dev/null
@@ -1,1298 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#define WIN32_LEAN_AND_MEAN  // only bare bones windows stuff wanted
-
-#include "Common/crc.h"
-#include "Common/GameState.h"
-#include "Common/Registry.h"
-#include "GameNetwork/LANAPI.h"
-#include "GameNetwork/networkutil.h"
-#include "Common/GlobalData.h"
-#include "Common/RandomValue.h"
-#include "GameClient/GameText.h"
-#include "GameClient/MapUtil.h"
-#include "Common/UserPreferences.h"
-#include "GameLogic/GameLogic.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-static const UnsignedShort lobbyPort = 8086; ///< This is the UDP port used by all LANAPI communication
-
-AsciiString GetMessageTypeString(UnsignedInt type);
-
-const UnsignedInt LANAPI::s_resendDelta = 10 * 1000;	///< This is how often we announce ourselves to the world
-/*
-LANGame::LANGame( void )
-{
-	m_gameName = L"";
-
-	int player;
-	for (player = 0; player < MAX_SLOTS; ++player)
-	{
-		m_playerName[player] = L"";
-		m_playerIP[player]= 0;
-		m_playerAccepted[player] = false;
-	}
-	m_lastHeard = 0;
-	m_inProgress = false;
-	m_next = NULL;
-}
-*/
-
-
-
-
-LANAPI::LANAPI( void ) : m_transport(NULL)
-{
-	DEBUG_LOG(("LANAPI::LANAPI() - max game option size is %d, sizeof(LANMessage)=%d, MAX_PACKET_SIZE=%d\n",
-		m_lanMaxOptionsLength, sizeof(LANMessage), MAX_PACKET_SIZE));
-
-	m_lastResendTime = 0;
-	//
-	m_lobbyPlayers = NULL;
-	m_games = NULL;
-	m_name = L""; // safe default?
-	m_pendingAction = ACT_NONE;
-	m_expiration = 0;
-	m_localIP = 0;
-	m_inLobby = true;
-	m_isInLANMenu = TRUE;
-	m_currentGame = NULL;
-	m_broadcastAddr = INADDR_BROADCAST;
-	m_directConnectRemoteIP = 0;
-	m_actionTimeout = 5000; // ms
-	m_lastUpdate = 0;
-	m_transport = new Transport;
-	m_isActive = TRUE;
-}
-
-LANAPI::~LANAPI( void )
-{
-	reset();
-	if (m_transport)
-		delete m_transport;
-}
-
-void LANAPI::init( void )
-{
-	m_gameStartTime = 0;
-	m_gameStartSeconds = 0;
-	m_transport->reset();
-	m_transport->init(m_localIP, lobbyPort);
-	m_transport->allowBroadcasts(true);
-
-	m_pendingAction = ACT_NONE;
-	m_expiration = 0;
-	m_inLobby = true;
-	m_isInLANMenu = TRUE;
-	m_currentGame = NULL;
-	m_directConnectRemoteIP = 0;
-	
-	m_lastGameopt = "";
-
-	unsigned long bufSize = UNLEN + 1;
-	char userName[UNLEN + 1];
-	if (!GetUserName(userName, &bufSize))
-	{
-		strcpy(userName, "unknown");
-	}
-	m_userName = userName;
-
-	bufSize = MAX_COMPUTERNAME_LENGTH + 1;
-	char computerName[MAX_COMPUTERNAME_LENGTH + 1];
-	if (!GetComputerName(computerName, &bufSize))
-	{
-		strcpy(computerName, "unknown");
-	}
-	m_hostName = computerName;
-}
-
-void LANAPI::reset( void )
-{
-	if (m_inLobby)
-	{
-		LANMessage msg;
-		fillInLANMessage( &msg );
-		msg.LANMessageType = LANMessage::MSG_REQUEST_LOBBY_LEAVE;
-		sendMessage(&msg);
-	}
-	m_transport->update();
-
-	LANGameInfo *theGame = m_games;
-	LANGameInfo *deletableGame = NULL;
-
-	while (theGame)
-	{
-		deletableGame = theGame;
-		theGame = theGame->getNext();
-		delete deletableGame;
-	}
-
-	LANPlayer *thePlayer = m_lobbyPlayers;
-	LANPlayer *deletablePlayer = NULL;
-
-	while (thePlayer)
-	{
-		deletablePlayer = thePlayer;
-		thePlayer = thePlayer->getNext();
-		delete deletablePlayer;
-	}
-
-	m_games = NULL;
-	m_lobbyPlayers = NULL;
-	m_directConnectRemoteIP = 0;
-	m_pendingAction = ACT_NONE;
-	m_expiration = 0;
-	m_inLobby = true;
-	m_isInLANMenu = TRUE;
-	m_currentGame = NULL;
-	
-}
-
-void LANAPI::sendMessage(LANMessage *msg, UnsignedInt ip /* = 0 */)
-{
-	if (ip != 0)
-	{
-		m_transport->queueSend(ip, lobbyPort, (unsigned char *)msg, sizeof(LANMessage) /*, 0, 0 */);
-	}
-	else if ((m_currentGame != NULL) && (m_currentGame->getIsDirectConnect()))
-	{
-		Int localSlot = m_currentGame->getLocalSlotNum();
-		for (Int i = 0; i < MAX_SLOTS; ++i)
-		{
-			if (i != localSlot) {
-				GameSlot *slot = m_currentGame->getSlot(i);
-				if ((slot != NULL) && (slot->isHuman())) {
-					m_transport->queueSend(slot->getIP(), lobbyPort, (unsigned char *)msg, sizeof(LANMessage) /*, 0, 0 */);
-				}
-			}
-		}
-	}
-	else
-	{
-		m_transport->queueSend(m_broadcastAddr, lobbyPort, (unsigned char *)msg, sizeof(LANMessage) /*, 0, 0 */);
-	}
-}
-
-
-AsciiString GetMessageTypeString(UnsignedInt type)
-{
-	AsciiString returnString;
-
-	switch (type)
-	{
-		case LANMessage::MSG_REQUEST_LOCATIONS:
-			returnString.format( "Request Locations (%d)",type);
-			break;
-		case LANMessage::MSG_GAME_ANNOUNCE:
-			returnString.format("Game Announce (%d)",type);
-			break;
-		case LANMessage::MSG_LOBBY_ANNOUNCE:
-			returnString.format("Lobby Announce (%d)",type);
-			break;
-		case LANMessage::MSG_REQUEST_JOIN:
-			returnString.format("Request Join (%d)",type);
-			break;
-		case LANMessage::MSG_JOIN_ACCEPT:				
-			returnString.format("Join Accept (%d)",type);
-			break;
-		case LANMessage::MSG_JOIN_DENY:
-			returnString.format("Join Deny (%d)",type);
-			break;
-		case LANMessage::MSG_REQUEST_GAME_LEAVE:
-			returnString.format("Request Game Leave (%d)",type);
-			break;
-		case LANMessage::MSG_REQUEST_LOBBY_LEAVE:
-			returnString.format("Request Lobby Leave (%d)",type);
-			break;
-		case LANMessage::MSG_SET_ACCEPT:
-			returnString.format("Set Accept(%d)",type);
-			break;
-		case LANMessage::MSG_CHAT:
-			returnString.format("Chat (%d)",type);
-			break;
-		case LANMessage::MSG_GAME_START:
-			returnString.format("Game Start (%d)",type);
-			break;
-		case LANMessage::MSG_GAME_START_TIMER:
-			returnString.format("Game Start Timer (%d)",type);
-			break;
-		case LANMessage::MSG_GAME_OPTIONS:
-			returnString.format("Game Options (%d)",type);
-			break;
-		case LANMessage::MSG_REQUEST_GAME_INFO:
-			returnString.format("Request GameInfo (%d)", type);
-			break;
-		case LANMessage::MSG_INACTIVE:
-			returnString.format("Inactive (%d)", type);
-			break;
-		default:
-			returnString.format("Unknown Message (%d)",type);
-	}
-	return returnString;
-}
-
-
-void LANAPI::checkMOTD( void )
-{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_useLocalMOTD)
-	{
-		// for a playtest, let's log some play statistics, eh?
-		if (TheGlobalData->m_playStats <= 0)
-			TheWritableGlobalData->m_playStats = 30;
-
-		static UnsignedInt oldMOTDCRC = 0;
-		UnsignedInt newMOTDCRC = 0;
-		AsciiString asciiMOTD;
-		char buf[4096];
-		FILE *fp = fopen(TheGlobalData->m_MOTDPath.str(), "r");
-		Int len;
-		if (fp)
-		{
-			while( (len = fread(buf, 1, 4096, fp)) > 0 )
-			{
-				buf[len] = 0;
-				asciiMOTD.concat(buf);
-			}
-			fclose(fp);
-			CRC crcObj;
-			crcObj.computeCRC(asciiMOTD.str(), asciiMOTD.getLength());
-			newMOTDCRC = crcObj.get();
-		}
-
-		if (oldMOTDCRC != newMOTDCRC)
-		{
-			// different MOTD... display it
-			oldMOTDCRC = newMOTDCRC;
-			AsciiString line;
-			while (asciiMOTD.nextToken(&line, "\n"))
-			{
-				if (line.getCharAt(line.getLength()-1) == '\r')
-					line.removeLastChar();	// there is a trailing '\r'
-
-				if (line.isEmpty())
-				{
-					line = " ";
-				}
-
-				UnicodeString uniLine;
-				uniLine.translate(line);
-				OnChat( UnicodeString(L"MOTD"), 0, uniLine, LANCHAT_SYSTEM );
-			}
-		}
-	}
-#endif
-}
-
-extern Bool LANbuttonPushed;
-extern Bool LANSocketErrorDetected;
-void LANAPI::update( void )
-{
-	if(LANbuttonPushed)
-		return;
-	static const UnsignedInt LANAPIUpdateDelay = 200;
-	UnsignedInt now = timeGetTime();
-	
-	if( now > m_lastUpdate + LANAPIUpdateDelay)
-	{
-		m_lastUpdate = now;
-	} 
-	else
-	{
-		return;
-	}
-
-	// Let the UDP socket breathe
-	if ((m_transport->update() == FALSE) && (LANSocketErrorDetected == FALSE)) {
-		if (m_isInLANMenu == TRUE) {
-			LANSocketErrorDetected = TRUE;
-		}
-	}
-
-	// Handle any new messages
-	int i;
-	for (i=0; i<MAX_MESSAGES && !LANbuttonPushed; ++i)
-	{
-		if (m_transport->m_inBuffer[i].length > 0)
-		{
-			// Process the new message
-			UnsignedInt senderIP = m_transport->m_inBuffer[i].addr;
-			if (senderIP == m_localIP)
-			{
-				m_transport->m_inBuffer[i].length = 0;
-				continue;
-			}
-
-			LANMessage *msg = (LANMessage *)(m_transport->m_inBuffer[i].data);
-			//DEBUG_LOG(("LAN message type %s from %ls (%s@%s)\n", GetMessageTypeString(msg->LANMessageType).str(),
-			//	msg->name, msg->userName, msg->hostName));
-			switch (msg->LANMessageType)
-			{
-				// Location specification
-			case LANMessage::MSG_REQUEST_LOCATIONS:		// Hey, where is everybody?
-				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_LOCATIONS from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleRequestLocations( msg, senderIP );
-				break;
-			case LANMessage::MSG_GAME_ANNOUNCE:				// Here someone is, and here's his game info!
-				DEBUG_LOG(("LANAPI::update - got a MSG_GAME_ANNOUNCE from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleGameAnnounce( msg, senderIP );
-				break;
-			case LANMessage::MSG_LOBBY_ANNOUNCE:			// Hey, I'm in the lobby!
-				DEBUG_LOG(("LANAPI::update - got a MSG_LOBBY_ANNOUNCE from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleLobbyAnnounce( msg, senderIP );
-				break;
-			case LANMessage::MSG_REQUEST_GAME_INFO:
-				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_GAME_INFO from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleRequestGameInfo( msg, senderIP );
-				break;
-
-				// Joining games
-			case LANMessage::MSG_REQUEST_JOIN:				// Let me in!  Let me in!
-				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_JOIN from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleRequestJoin( msg, senderIP );
-				break;
-			case LANMessage::MSG_JOIN_ACCEPT:					// Okay, you can join.
-				DEBUG_LOG(("LANAPI::update - got a MSG_JOIN_ACCEPT from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleJoinAccept( msg, senderIP );
-				break;
-			case LANMessage::MSG_JOIN_DENY:						// Go away!  We don't want any!
-				DEBUG_LOG(("LANAPI::update - got a MSG_JOIN_DENY from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleJoinDeny( msg, senderIP );
-				break;
-
-				// Leaving games, lobby
-			case LANMessage::MSG_REQUEST_GAME_LEAVE:				// I'm outa here!
-				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_GAME_LEAVE from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleRequestGameLeave( msg, senderIP );
-				break;
-			case LANMessage::MSG_REQUEST_LOBBY_LEAVE:				// I'm outa here!
-				DEBUG_LOG(("LANAPI::update - got a MSG_REQUEST_LOBBY_LEAVE from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleRequestLobbyLeave( msg, senderIP );
-				break;
-
-				// Game options, chat, etc
-			case LANMessage::MSG_SET_ACCEPT:					// I'm cool with everything as is.
-				handleSetAccept( msg, senderIP );
-				break;
-			case LANMessage::MSG_MAP_AVAILABILITY:		// Map status
-				handleHasMap( msg, senderIP );
-				break;
-			case LANMessage::MSG_CHAT:								// Just spouting my mouth off.
-				handleChat( msg, senderIP );
-				break;
-			case LANMessage::MSG_GAME_START:					// Hold on; we're starting!
-				handleGameStart( msg, senderIP );
-				break;
-			case LANMessage::MSG_GAME_START_TIMER:
-				handleGameStartTimer( msg, senderIP );
-				break;
-			case LANMessage::MSG_GAME_OPTIONS:				// Here's some info about the game.
-				DEBUG_LOG(("LANAPI::update - got a MSG_GAME_OPTIONS from %d.%d.%d.%d\n", PRINTF_IP_AS_4_INTS(senderIP)));
-				handleGameOptions( msg, senderIP );
-				break;
-			case LANMessage::MSG_INACTIVE:		// someone is telling us that we're inactive.
-				handleInActive( msg, senderIP );
-				break;
-
-			default:
-				DEBUG_LOG(("Unknown LAN message type %d\n", msg->LANMessageType));
-			}
-
-			// Mark it as read
-			m_transport->m_inBuffer[i].length = 0;
-		}
-	} // End message handling
-	if(LANbuttonPushed)
-		return;
-	// Send out periodic I'm Here messages
-	if (now > s_resendDelta + m_lastResendTime)
-	{
-		m_lastResendTime = now;
-
-		if (m_inLobby)
-		{
-			RequestSetName(m_name);
-		}
-		else if (m_currentGame && !m_currentGame->isGameInProgress())
-		{
-			if (AmIHost())
-			{				
-				RequestGameOptions( GenerateGameOptionsString(), true );
-				RequestGameAnnounce( );
-			}
-			else
-			{
-				AsciiString text;
-				text.format("User=%s", m_userName.str());
-				RequestGameOptions( text, true );
-				text.format("Host=%s", m_hostName.str());
-				RequestGameOptions( text, true );
-				RequestGameOptions( "HELLO", false );
-			}
-		}
-		else if (m_currentGame)
-		{
-			// game is in progress - RequestGameAnnounce will check if we should send it
-			RequestGameAnnounce();
-		}
-	}
-
-	Bool playerListChanged = false;
-	Bool gameListChanged = false;
-
-	// Weed out people we haven't heard from in a while
-	LANPlayer *player = m_lobbyPlayers;
-	while (player)
-	{
-		if (player->getLastHeard() + s_resendDelta*2 < now)
-		{
-			// He's gone!
-			removePlayer(player);
-			LANPlayer *nextPlayer = player->getNext();
-			delete player;
-			player = nextPlayer;
-			playerListChanged = true;
-		}
-		else
-		{
-			player = player->getNext();
-		}
-	}
-
-	// Weed out people we haven't heard from in a while
-	LANGameInfo *game = m_games;
-	while (game)
-	{
-		if (game != m_currentGame && game->getLastHeard() + s_resendDelta*2 < now)
-		{
-			// He's gone!
-			removeGame(game);
-			LANGameInfo *nextGame = game->getNext();
-			delete game;
-			game = nextGame;
-			gameListChanged = true;
-		}
-		else
-		{
-			game = game->getNext();
-		}
-	}
-	if ( m_currentGame && !m_currentGame->isGameInProgress() )
-	{
-		if ( !AmIHost() && (m_currentGame->getLastHeard() + s_resendDelta*16 < now) )
-		{
-			// We haven't heard from the host in a while.  Bail.
-			// Actually, fake a host leaving message. :)
-			LANMessage msg;
-			fillInLANMessage( &msg );
-			msg.LANMessageType = LANMessage::MSG_REQUEST_GAME_LEAVE;
-			wcsncpy(msg.name, m_currentGame->getPlayerName(0).str(), g_lanPlayerNameLength);
-			msg.name[g_lanPlayerNameLength] = 0;
-			handleRequestGameLeave(&msg, m_currentGame->getIP(0));
-			UnicodeString text;
-			text = TheGameText->fetch("LAN:HostNotResponding");
-			OnChat(UnicodeString::TheEmptyString, m_localIP, text, LANCHAT_SYSTEM);
-		}
-		else if ( AmIHost() )
-		{
-			// Check each player for timeouts
-			for (int p=1; p<MAX_SLOTS; ++p)
-			{
-				if (m_currentGame->getIP(p) && m_currentGame->getPlayerLastHeard(p) + s_resendDelta*8 < now)
-				{
-					LANMessage msg;
-					fillInLANMessage( &msg );
-					UnicodeString theStr;
-					theStr.format(TheGameText->fetch("LAN:PlayerDropped"), m_currentGame->getPlayerName(p).str());
-					msg.LANMessageType = LANMessage::MSG_REQUEST_GAME_LEAVE;
-					wcsncpy(msg.name, m_currentGame->getPlayerName(p).str(), g_lanPlayerNameLength);
-					msg.name[g_lanPlayerNameLength] = 0;
-					handleRequestGameLeave(&msg, m_currentGame->getIP(p));
-					OnChat(UnicodeString::TheEmptyString, m_localIP, theStr, LANCHAT_SYSTEM);
-				}
-			}
-		}
-	}
-
-	if (playerListChanged)
-	{
-		OnPlayerList(m_lobbyPlayers);
-	}
-
-	if (gameListChanged)
-	{
-		OnGameList(m_games);
-	}
-
-	// Time out old actions
-	if (m_pendingAction != ACT_NONE && now > m_expiration)
-	{
-		switch (m_pendingAction)
-		{
-		case ACT_JOIN:
-			OnGameJoin(RET_TIMEOUT, NULL);
-			m_pendingAction = ACT_NONE;
-			m_currentGame = NULL;
-			m_inLobby = true;
-			break;
-		case ACT_LEAVE:
-			OnPlayerLeave(m_name);
-			m_pendingAction = ACT_NONE;
-			m_currentGame = NULL;
-			m_inLobby = true;
-			break;
-		case ACT_JOINDIRECTCONNECT:
-			OnGameJoin(RET_TIMEOUT, NULL);
-			m_pendingAction = ACT_NONE;
-			m_currentGame = NULL;
-			m_inLobby = true;
-			break;
-		default:
-			m_pendingAction = ACT_NONE;
-		}
-	}
-
-	// send out "game starting" messages
-	if ( m_gameStartTime && m_gameStartSeconds && m_gameStartTime <= now )
-	{
-		// m_gameStartTime is when the next message goes out
-		// m_gameStartSeconds is how many seconds remain in the message
-
-		RequestGameStartTimer( m_gameStartSeconds );
-	}
-	else if (m_gameStartTime && m_gameStartTime <= now)
-	{
-//		DEBUG_LOG(("m_gameStartTime=%d, now=%d, m_gameStartSeconds=%d\n", m_gameStartTime, now, m_gameStartSeconds));
-		ResetGameStartTimer();
-		RequestGameStart();
-	}
-
-	// Check for an MOTD every few seconds
-	static UnsignedInt lastMOTDCheck = 0;
-	static const UnsignedInt motdInterval = 30000;
-	if (now > lastMOTDCheck + motdInterval)
-	{
-		checkMOTD();
-		lastMOTDCheck = now;
-	}
-}
-
-// Request functions generate network traffic
-void LANAPI::RequestLocations( void )
-{
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_REQUEST_LOCATIONS;
-	fillInLANMessage( &msg );
-	sendMessage(&msg);
-}
-
-void LANAPI::RequestGameJoin( LANGameInfo *game, UnsignedInt ip /* = 0 */ )
-{
-	if ((m_pendingAction != ACT_NONE) && (m_pendingAction != ACT_JOINDIRECTCONNECT))
-	{
-		OnGameJoin( RET_BUSY, NULL );
-		return;
-	}
-
-	if (!game)
-	{
-		OnGameJoin( RET_GAME_GONE, NULL );
-		return;
-	}
-
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_REQUEST_JOIN;
-	fillInLANMessage( &msg );
-	msg.GameToJoin.gameIP = game->getSlot(0)->getIP();
-	msg.GameToJoin.exeCRC = TheGlobalData->m_exeCRC;
-	msg.GameToJoin.iniCRC = TheGlobalData->m_iniCRC;
-
-	AsciiString s = "";
-	GetStringFromRegistry("\\ergc", "", s);
-	strncpy(msg.GameToJoin.serial, s.str(), g_maxSerialLength);
-	msg.GameToJoin.serial[g_maxSerialLength-1] = '\0';
-
-	sendMessage(&msg, ip);
-
-	m_pendingAction = ACT_JOIN;
-	m_expiration = timeGetTime() + m_actionTimeout;
-}
-
-void LANAPI::RequestGameJoinDirectConnect(UnsignedInt ipaddress)
-{
-	if (m_pendingAction != ACT_NONE)
-	{
-		OnGameJoin( RET_BUSY, NULL );
-		return;
-	}
-
-	if (ipaddress == 0)
-	{
-		OnGameJoin( RET_GAME_GONE, NULL );
-		return;
-	}
-
-	m_directConnectRemoteIP = ipaddress;
-
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_REQUEST_GAME_INFO;
-	fillInLANMessage(&msg);
-	msg.PlayerInfo.ip = GetLocalIP();
-	wcsncpy(msg.PlayerInfo.playerName, m_name.str(), m_name.getLength());
-	msg.PlayerInfo.playerName[m_name.getLength()] = 0;
-
-	sendMessage(&msg, ipaddress);
-
-	m_pendingAction = ACT_JOINDIRECTCONNECT;
-	m_expiration = timeGetTime() + m_actionTimeout;
-}
-
-void LANAPI::RequestGameLeave( void )
-{
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_REQUEST_GAME_LEAVE;
-	fillInLANMessage( &msg );
-	wcsncpy(msg.GameToLeave.gameName, (m_currentGame)?m_currentGame->getName().str():L"", g_lanGameNameLength);
-	msg.GameToLeave.gameName[g_lanGameNameLength] = 0;
-	sendMessage(&msg);
-	m_transport->update();  // Send immediately, before OnPlayerLeave below resets everything.
-
-	if (m_currentGame && m_currentGame->getIP(0) == m_localIP)
-	{
-		// Exit out immediately if we're hosting
-		OnPlayerLeave(m_name);
-		removeGame(m_currentGame);
-		m_currentGame = NULL;
-		m_inLobby = true;
-	}
-	else
-	{
-		m_pendingAction = ACT_LEAVE;
-		m_expiration = timeGetTime() + m_actionTimeout;
-	}
-}
-
-void LANAPI::RequestGameAnnounce( void )
-{
-	// In game - are we a game host?
-	if (m_currentGame && !(m_currentGame->getIsDirectConnect()))
-	{
-		if (m_currentGame->getIP(0) == m_localIP || (m_currentGame->isGameInProgress() && TheNetwork && TheNetwork->isPacketRouter())) // if we're in game we should reply if we're the packet router
-		{
-			LANMessage reply;
-			fillInLANMessage( &reply );
-			reply.LANMessageType = LANMessage::MSG_GAME_ANNOUNCE;
-
-			AsciiString gameOpts = GameInfoToAsciiString(m_currentGame);
-			strncpy(reply.GameInfo.options,gameOpts.str(),m_lanMaxOptionsLength);
-			wcsncpy(reply.GameInfo.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-			reply.GameInfo.gameName[g_lanGameNameLength] = 0;
-			reply.GameInfo.inProgress = m_currentGame->isGameInProgress();
-			reply.GameInfo.isDirectConnect = m_currentGame->getIsDirectConnect();
-
-			sendMessage(&reply);
-		}
-	}
-}
-
-void LANAPI::RequestAccept( void )
-{
-	if (m_inLobby || !m_currentGame)
-		return;
-
-	LANMessage msg;
-	fillInLANMessage( &msg );
-	msg.LANMessageType = LANMessage::MSG_SET_ACCEPT;
-	msg.Accept.isAccepted = true;
-	wcsncpy(msg.Accept.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-	msg.Accept.gameName[g_lanGameNameLength] = 0;
-	sendMessage(&msg);
-}
-
-void LANAPI::RequestHasMap( void )
-{
-	if (m_inLobby || !m_currentGame)
-		return;
-
-	LANMessage msg;
-	fillInLANMessage( &msg );
-	msg.LANMessageType = LANMessage::MSG_MAP_AVAILABILITY;
-	msg.MapStatus.hasMap = m_currentGame->getSlot(m_currentGame->getLocalSlotNum())->hasMap();
-	wcsncpy(msg.MapStatus.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-	msg.MapStatus.gameName[g_lanGameNameLength] = 0;
-	CRC mapNameCRC;
-//mapNameCRC.computeCRC(m_currentGame->getMap().str(), m_currentGame->getMap().getLength());
-	AsciiString portableMapName = TheGameState->realMapPathToPortableMapPath(m_currentGame->getMap());
-	mapNameCRC.computeCRC(portableMapName.str(), portableMapName.getLength());
-	msg.MapStatus.mapCRC = mapNameCRC.get();
-	sendMessage(&msg);
-
-	if (!msg.MapStatus.hasMap)
-	{
-		UnicodeString text;
-		UnicodeString mapDisplayName;
-		const MapMetaData *mapData = TheMapCache->findMap( m_currentGame->getMap() );
-		Bool willTransfer = TRUE;
-		if (mapData)
-		{
-			mapDisplayName.format(L"%ls", mapData->m_displayName.str());
-			if (mapData->m_isOfficial)
-				willTransfer = FALSE;
-		}
-		else
-		{
-			mapDisplayName.format(L"%hs", TheGameState->getMapLeafName(m_currentGame->getMap()).str());
-			willTransfer = WouldMapTransfer(m_currentGame->getMap());
-		}
-		if (willTransfer)
-			text.format(TheGameText->fetch("GUI:LocalPlayerNoMapWillTransfer"), mapDisplayName.str());
-		else
-			text.format(TheGameText->fetch("GUI:LocalPlayerNoMap"), mapDisplayName.str());
-		OnChat(UnicodeString(L"SYSTEM"), m_localIP, text, LANCHAT_SYSTEM);
-	}
-}
-
-void LANAPI::RequestChat( UnicodeString message, ChatType format )
-{
-	LANMessage msg;
-	fillInLANMessage( &msg );
-	wcsncpy(msg.Chat.gameName, (m_currentGame)?m_currentGame->getName().str():L"", g_lanGameNameLength);
-	msg.Chat.gameName[g_lanGameNameLength] = 0;
-	msg.LANMessageType = LANMessage::MSG_CHAT;
-	msg.Chat.chatType = format;
-	wcsncpy(msg.Chat.message, message.str(), g_lanMaxChatLength);
-	msg.Chat.message[g_lanMaxChatLength] = 0;
-	sendMessage(&msg);
-
-	OnChat(m_name, m_localIP, message, format);
-}
-
-void LANAPI::RequestGameStart( void )
-{
-	if (m_inLobby || !m_currentGame || m_currentGame->getIP(0) != m_localIP)
-		return;
-
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_GAME_START;
-	fillInLANMessage( &msg );
-	sendMessage(&msg);
-	m_transport->update(); // force a send
-
-	OnGameStart();
-}
-
-void LANAPI::ResetGameStartTimer( void )
-{
-	m_gameStartTime = 0;
-	m_gameStartSeconds = 0;
-}
-
-void LANAPI::RequestGameStartTimer( Int seconds )
-{
-	if (m_inLobby || !m_currentGame || m_currentGame->getIP(0) != m_localIP)
-		return;
-
-	UnsignedInt now = timeGetTime();
-	m_gameStartTime = now + 1000;
-	m_gameStartSeconds = (seconds) ? seconds - 1 : 0;
-
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_GAME_START_TIMER;
-	msg.StartTimer.seconds = seconds;
-	fillInLANMessage( &msg );
-	sendMessage(&msg);
-	m_transport->update(); // force a send
-
-	OnGameStartTimer(seconds);
-}
-
-void LANAPI::RequestGameOptions( AsciiString gameOptions, Bool isPublic, UnsignedInt ip /* = 0 */ )
-{
-	DEBUG_ASSERTCRASH(gameOptions.getLength() < m_lanMaxOptionsLength, ("Game options string is too long!"));
-
-	if (!m_currentGame)
-		return;
-
-	LANMessage msg;
-	fillInLANMessage( &msg );
-	msg.LANMessageType = LANMessage::MSG_GAME_OPTIONS;
-	strncpy(msg.GameOptions.options, gameOptions.str(), m_lanMaxOptionsLength);
-	msg.GameOptions.options[m_lanMaxOptionsLength] = 0;
-	sendMessage(&msg, ip);
-
-	m_lastGameopt = gameOptions;
-
-	int player;
-	for (player = 0; player<MAX_SLOTS; ++player)
-	{
-		if (m_currentGame->getIP(player) == m_localIP)
-		{
-			OnGameOptions(m_localIP, player, AsciiString(msg.GameOptions.options));
-			break;
-		}
-	}
-
-	// We can request game options (side, color, etc) while we don't have a slot yet.  Of course, we don't need to
-	// call OnGameOptions for those, so it's okay to silently fail.
-	//DEBUG_ASSERTCRASH(player != MAX_SLOTS, ("Requested game options, but we're not in slot list!");
-}
-
-void LANAPI::RequestGameCreate( UnicodeString gameName, Bool isDirectConnect )
-{
-	// No games of the same name should exist...  Ignore that for now.
-	/// @todo: make sure LAN games with identical names don't crash things like in RA2.
-
-	if ((!m_inLobby || m_currentGame) && !isDirectConnect)
-	{
-		DEBUG_ASSERTCRASH(m_inLobby && m_currentGame, ("Can't create a game while in one!"));
-		OnGameCreate(LANAPIInterface::RET_BUSY);
-		return;
-	}
-
-	if (m_pendingAction != ACT_NONE)
-	{
-		OnGameCreate(LANAPIInterface::RET_BUSY);
-		return;
-	}
-
-	// Create the local game object
-	m_inLobby = false;
-	LANGameInfo *myGame = NEW LANGameInfo;
-	
-	myGame->setSeed(GetTickCount());
-	
-//	myGame->setInProgress(false);
-	myGame->enterGame();
-	UnicodeString s;
-	s.format(L"%8.8X%8.8X", m_localIP, myGame->getSeed());
-	if (gameName.isEmpty())
-		s.concat(m_name);
-	else
-		s.concat(gameName);
-
-	while (s.getLength() > g_lanGameNameLength)
-		s.removeLastChar();
-
-	DEBUG_LOG(("Setting local game name to '%ls'\n", s.str()));
-
-	myGame->setName(s);
-
-	LANGameSlot newSlot;
-	newSlot.setState(SLOT_PLAYER, m_name);
-	newSlot.setIP(m_localIP);
-	newSlot.setPort(NETWORK_BASE_PORT_NUMBER); // LAN game, everyone has a unique IP, so it's ok to use the same port.
-	newSlot.setLastHeard(0);
-	newSlot.setLogin(m_userName);
-	newSlot.setHost(m_hostName);
-
-	myGame->setSlot(0,newSlot);
-	myGame->setNext(NULL);
-	LANPreferences pref;	
-
-	AsciiString mapName = pref.getPreferredMap();
-
-	myGame->setMap(mapName);
-	myGame->setIsDirectConnect(isDirectConnect);
-	
-	myGame->setLastHeard(timeGetTime());
-	m_currentGame = myGame;
-
-/// @todo: Need to initialize the players elsewere.
-/*	for (int player = 1; player < MAX_SLOTS; ++player)
-	{
-		myGame->setPlayerName(player, UnicodeString(L""));
-		myGame->setIP(player, 0);
-		myGame->setAccepted(player, false);
-	}*/
-
-	// Add the game to the local game list
-	addGame(myGame);
-
-	// Send an announcement
-	//RequestSlotList();
-/*
-	LANMessage msg;
-	wcsncpy(msg.name, m_name.str(), g_lanPlayerNameLength);
-	msg.name[g_lanPlayerNameLength] = 0;
-	wcscpy(msg.GameInfo.gameName, myGame->getName().str());
-	for (player=0; player<MAX_SLOTS; ++player)
-	{
-		wcscpy(msg.GameInfo.name[player], myGame->getPlayerName(player).str());
-		msg.GameInfo.ip[player] = myGame->getIP(player);
-		msg.GameInfo.playerAccepted[player] = myGame->getAccepted(player);
-	}
-	msg.LANMessageType = LANMessage::MSG_GAME_ANNOUNCE;
-*/
-	OnGameCreate(LANAPIInterface::RET_OK);
-}
-
-
-/*static const char slotListID		= 'S';
-static const char gameOptionsID	= 'G';
-static const char acceptID			= 'A';
-static const char wannaStartID	= 'W';
-
-AsciiString LANAPI::createSlotString( void )
-{
-	AsciiString slotList;
-	slotList.concat(slotListID);
-	for (int i=0; i<MAX_SLOTS; ++i)
-	{
-		LANGameSlot *slot = GetMyGame()->getLANSlot(i);
-		AsciiString str;
-		if (slot->isHuman())
-		{
-			str = "H";
-			LANPlayer *user = slot->getUser();
-			DEBUG_ASSERTCRASH(user, ("Human player has no User*!"));
-			AsciiString name;
-			name.translate(user->getName());
-			str.concat(name);
-			str.concat(',');
-		}
-		else if (slot->isAI())
-		{
-			if (slot->getState() == SLOT_EASY_AI)
-				str = "CE,";
-			if (slot->getState() == SLOT_MED_AI)
-				str = "CM,";
-			else
-				str = "CB,";
-		}
-		else if (slot->getState() == SLOT_OPEN)
-		{
-			str = "O,";
-		}
-		else if (slot->getState() == SLOT_CLOSED)
-		{
-			str = "X,";
-		}
-		else
-		{
-			DEBUG_ASSERTCRASH(false, ("Bad slot type"));
-			str = "X,";
-		}
-
-		slotList.concat(str);
-	}
-	return slotList;
-}
-*/
-/*
-void LANAPI::RequestSlotList( void )
-{
-
-	LANMessage reply;
-	reply.LANMessageType = LANMessage::MSG_GAME_ANNOUNCE;
-	wcsncpy(reply.name, m_name.str(), g_lanPlayerNameLength);
-	reply.name[g_lanPlayerNameLength] = 0;
-	int player;
-	for (player = 0; player < MAX_SLOTS; ++player)
-	{
-		wcsncpy(reply.GameInfo.name[player], m_currentGame->getPlayerName(player).str(), g_lanPlayerNameLength);
-		reply.GameInfo.name[player][g_lanPlayerNameLength] = 0;
-		reply.GameInfo.ip[player] = m_currentGame->getIP(player);
-		reply.GameInfo.playerAccepted[player] = m_currentGame->getSlot(player)->isAccepted();
-	}
-	wcsncpy(reply.GameInfo.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-	reply.GameInfo.gameName[g_lanGameNameLength] = 0;
-	reply.GameInfo.inProgress = m_currentGame->isGameInProgress();
-
-	sendMessage(&reply);
-
-	OnSlotList(LANAPIInterface::RET_OK, m_currentGame);
-} // void LANAPI::RequestSlotList( void )
-*/
-void LANAPI::RequestSetName( UnicodeString newName )
-{
-	newName.trim();
-	if (m_pendingAction != ACT_NONE)
-	{
-		// Can't change name while joining games
-		OnNameChange(m_localIP, newName);
-		return;
-	}
-
-	// Set up timer
-	m_lastResendTime = timeGetTime();
-
-	if (m_inLobby && m_pendingAction == ACT_NONE)
-	{
-		m_name = newName;
-		LANMessage msg;
-		fillInLANMessage( &msg );
-		msg.LANMessageType = LANMessage::MSG_LOBBY_ANNOUNCE;
-		sendMessage(&msg);
-
-		// Update the interface
-		LANPlayer *player = LookupPlayer(m_localIP);
-		if (!player)
-		{
-			player = NEW LANPlayer;
-			player->setIP(m_localIP);
-		}
-		else
-		{
-			removePlayer(player);
-		}
-		player->setName(m_name);
-		player->setHost(m_hostName);
-		player->setLogin(m_userName);
-		player->setLastHeard(timeGetTime());
-
-		addPlayer(player);
-
-		OnNameChange(player->getIP(), player->getName());
-	}
-}
-
-void LANAPI::fillInLANMessage( LANMessage *msg )
-{
-	if (!msg)
-		return;
-
-	wcsncpy(msg->name, m_name.str(), g_lanPlayerNameLength);
-	msg->name[g_lanPlayerNameLength] = 0;
-	strncpy(msg->userName, m_userName.str(), g_lanLoginNameLength);
-	msg->userName[g_lanLoginNameLength] = 0;
-	strncpy(msg->hostName, m_hostName.str(), g_lanHostNameLength);
-	msg->hostName[g_lanHostNameLength] = 0;
-}
-
-void LANAPI::RequestLobbyLeave( Bool forced )
-{
-	LANMessage msg;
-	msg.LANMessageType = LANMessage::MSG_REQUEST_LOBBY_LEAVE;
-	fillInLANMessage( &msg );
-	sendMessage(&msg);
-
-	if (forced)
-		m_transport->update();
-}
-
-// Misc utility functions
-LANGameInfo * LANAPI::LookupGame( UnicodeString gameName )
-{
-	LANGameInfo *theGame = m_games;
-
-	while (theGame && theGame->getName() != gameName)
-	{
-		theGame = theGame->getNext();
-	}
-
-	return theGame; // NULL means we didn't find anything.
-}
-
-LANGameInfo * LANAPI::LookupGameByListOffset( Int offset )
-{
-	LANGameInfo *theGame = m_games;
-
-	if (offset < 0)
-		return NULL;
-
-	while (offset-- && theGame)
-	{
-		theGame = theGame->getNext();
-	}
-
-	return theGame; // NULL means we didn't find anything.
-}
-
-void LANAPI::removeGame( LANGameInfo *game )
-{
-	LANGameInfo *g = m_games;
-	if (!game)
-	{
-		return;
-	}
-	else if (m_games == game)
-	{
-		m_games = m_games->getNext();
-	}
-	else
-	{
-		while (g->getNext() && g->getNext() != game)
-		{
-			g = g->getNext();
-		}
-		if (g->getNext() == game)
-		{
-			g->setNext(game->getNext());
-		}
-		else
-		{
-			// Odd.  We went the whole way without finding it in the list.
-			DEBUG_ASSERTCRASH(false, ("LANGameInfo wasn't in the list"));
-		}
-	}
-}
-
-LANPlayer * LANAPI::LookupPlayer( UnsignedInt playerIP )
-{
-	LANPlayer *thePlayer = m_lobbyPlayers;
-
-	while (thePlayer && thePlayer->getIP() != playerIP)
-	{
-		thePlayer = thePlayer->getNext();
-	}
-
-	return thePlayer; // NULL means we didn't find anything.
-}
-
-void LANAPI::removePlayer( LANPlayer *player )
-{
-	LANPlayer *p = m_lobbyPlayers;
-	if (!player)
-	{
-		return;
-	}
-	else if (m_lobbyPlayers == player)
-	{
-		m_lobbyPlayers = m_lobbyPlayers->getNext();
-	}
-	else
-	{
-		while (p->getNext() && p->getNext() != player)
-		{
-			p = p->getNext();
-		}
-		if (p->getNext() == player)
-		{
-			p->setNext(player->getNext());
-		}
-		else
-		{
-			// Odd.  We went the whole way without finding it in the list.
-			DEBUG_ASSERTCRASH(false, ("LANPlayer wasn't in the list"));
-		}
-	}
-}
-
-void LANAPI::addGame( LANGameInfo *game )
-{
-	if (!m_games)
-	{
-		m_games = game;
-		game->setNext(NULL);
-		return;
-	}
-	else
-	{
-		if (game->getName().compareNoCase(m_games->getName()) < 0)
-		{
-			game->setNext(m_games);
-			m_games = game;
-			return;
-		}
-		else
-		{
-			LANGameInfo *g = m_games;
-			while (g->getNext() && g->getNext()->getName().compareNoCase(game->getName()) > 0)
-			{
-				g = g->getNext();
-			}
-			game->setNext(g->getNext());
-			g->setNext(game);
-			return;
-		}
-	}
-}
-
-void LANAPI::addPlayer( LANPlayer *player )
-{
-	if (!m_lobbyPlayers)
-	{
-		m_lobbyPlayers = player;
-		player->setNext(NULL);
-		return;
-	}
-	else
-	{
-		if (player->getName().compareNoCase(m_lobbyPlayers->getName()) < 0)
-		{
-			player->setNext(m_lobbyPlayers);
-			m_lobbyPlayers = player;
-			return;
-		}
-		else
-		{
-			LANPlayer *p = m_lobbyPlayers;
-			while (p->getNext() && p->getNext()->getName().compareNoCase(player->getName()) > 0)
-			{
-				p = p->getNext();
-			}
-			player->setNext(p->getNext());
-			p->setNext(player);
-			return;
-		}
-	}
-}
-
-Bool LANAPI::SetLocalIP( UnsignedInt localIP )
-{
-	Bool retval = TRUE;
-	m_localIP = localIP;
-
-	m_transport->reset();
-	retval = m_transport->init(m_localIP, lobbyPort);
-	m_transport->allowBroadcasts(true);
-
-	return retval;
-}
-
-void LANAPI::SetLocalIP( AsciiString localIP )
-{
-	UnsignedInt resolvedIP = ResolveIP(localIP);
-	SetLocalIP(resolvedIP);
-}
-
-Bool LANAPI::AmIHost( void )
-{
-	return m_currentGame && m_currentGame->getIP(0) == m_localIP;
-}
-
-void LANAPI::setIsActive(Bool isActive) {
-	DEBUG_LOG(("LANAPI::setIsActive - entering\n"));
-	if (isActive != m_isActive) {
-		DEBUG_LOG(("LANAPI::setIsActive - m_isActive changed to %s\n", isActive ? "TRUE" : "FALSE"));
-		if (isActive == FALSE) {
-			if ((m_inLobby == FALSE) && (m_currentGame != NULL)) {
-				LANMessage msg;
-				fillInLANMessage( &msg );
-				msg.LANMessageType = LANMessage::MSG_INACTIVE;
-				sendMessage(&msg);
-				DEBUG_LOG(("LANAPI::setIsActive - sent an IsActive message\n"));
-			}
-		}
-	}
-	m_isActive = isActive;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp
deleted file mode 100644
index bc575d36d0b..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp
+++ /dev/null
@@ -1,744 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: LANAPICallbacks.cpp
-// Author: Chris Huybregts, October 2001
-// Description: LAN API Callbacks
-///////////////////////////////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "strtok_r.h"
-#include "Common/GameEngine.h"
-#include "Common/GlobalData.h"
-#include "Common/MessageStream.h"
-#include "Common/MultiplayerSettings.h"
-#include "Common/PlayerTemplate.h"
-#include "Common/QuotedPrintable.h"
-#include "Common/RandomValue.h"
-#include "Common/UserPreferences.h"
-#include "GameClient/GameText.h"
-#include "GameClient/LanguageFilter.h"
-#include "GameClient/MapUtil.h"
-#include "GameClient/MessageBox.h"
-#include "GameLogic/GameLogic.h"
-#include "GameNetwork/FileTransfer.h"
-#include "GameNetwork/LANAPICallbacks.h"
-#include "GameNetwork/networkutil.h"
-
-LANAPI *TheLAN = NULL;
-extern Bool LANbuttonPushed;
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//Colors used for the chat dialogs
-const Color playerColor =  GameMakeColor(255,255,255,255);
-const Color gameColor =  GameMakeColor(255,255,255,255);
-const Color gameInProgressColor =  GameMakeColor(128,128,128,255);
-const Color chatNormalColor =  GameMakeColor(50,215,230,255);
-const Color chatActionColor =  GameMakeColor(255,0,255,255);
-const Color chatLocalNormalColor =  GameMakeColor(255,128,0,255);
-const Color chatLocalActionColor =  GameMakeColor(128,255,255,255);
-const Color chatSystemColor =  GameMakeColor(255,255,255,255);
-const Color acceptTrueColor =  GameMakeColor(0,255,0,255);
-const Color acceptFalseColor =  GameMakeColor(255,0,0,255);
-
-
-UnicodeString LANAPIInterface::getErrorStringFromReturnType( ReturnType ret )
-{
-	switch (ret)
-	{
-		case RET_OK:
-			return TheGameText->fetch("LAN:OK");
-		case RET_TIMEOUT:
-			return TheGameText->fetch("LAN:ErrorTimeout");
-		case RET_GAME_FULL:
-			return TheGameText->fetch("LAN:ErrorGameFull");
-		case RET_DUPLICATE_NAME:
-			return TheGameText->fetch("LAN:ErrorDuplicateName");
-		case RET_CRC_MISMATCH:
-			return TheGameText->fetch("LAN:ErrorCRCMismatch");
-		case RET_GAME_STARTED:
-			return TheGameText->fetch("LAN:ErrorGameStarted");
-		case RET_GAME_EXISTS:
-			return TheGameText->fetch("LAN:ErrorGameExists");
-		case RET_GAME_GONE:
-			return TheGameText->fetch("LAN:ErrorGameGone");
-		case RET_BUSY:
-			return TheGameText->fetch("LAN:ErrorBusy");
-		case RET_SERIAL_DUPE:
-			return TheGameText->fetch("WOL:ChatErrorSerialDup");
-		default:
-			return TheGameText->fetch("LAN:ErrorUnknown");
-	}
-}
-
-// On functions are (generally) the result of network traffic
-
-void LANAPI::OnAccept( UnsignedInt playerIP, Bool status ) 
-{ 
-	if( AmIHost() )
-	{
-		Int i = 0;
-		for (; i < MAX_SLOTS; i++)
-		{
-			if (m_currentGame->getIP(i) == playerIP)
-			{
-				if(status)
-					m_currentGame->getLANSlot(i)->setAccept();
-				else
-					m_currentGame->getLANSlot(i)->unAccept();
-				break;
-			}// if
-		}// for
-		if (i != MAX_SLOTS ) 
-		{
-			RequestGameOptions( GenerateGameOptionsString(), false );
-			lanUpdateSlotList();
-		}
-	}//if
-	else 
-	{
-		//i'm not the host but if the accept came from the host...
-		if( m_currentGame->getIP(0) == playerIP )
-		{
-			UnicodeString text;
-			text = TheGameText->fetch("GUI:HostWantsToStart");
-			OnChat(UnicodeString(L"SYSTEM"), m_localIP, text, LANCHAT_SYSTEM);				
-		}
-	}
-}// void LANAPI::OnAccept( UnicodeString player, Bool status ) 
-
-void LANAPI::OnHasMap( UnsignedInt playerIP, Bool status ) 
-{ 
-	if( AmIHost() )
-	{
-		Int i = 0;
-		for (; i < MAX_SLOTS; i++)
-		{
-			if (m_currentGame->getIP(i) == playerIP)
-			{
-				m_currentGame->getLANSlot(i)->setMapAvailability( status );
-				break;
-			}// if
-		}// for
-		if (i != MAX_SLOTS ) 
-		{
-			UnicodeString mapDisplayName;
-			const MapMetaData *mapData = TheMapCache->findMap( m_currentGame->getMap() );
-			Bool willTransfer = TRUE;
-			if (mapData)
-			{
-				mapDisplayName.format(L"%ls", mapData->m_displayName.str());
-				if (mapData->m_isOfficial)
-					willTransfer = FALSE;
-			}
-			else
-			{
-				mapDisplayName.format(L"%hs", m_currentGame->getMap().str());
-				willTransfer = WouldMapTransfer(m_currentGame->getMap());
-			}
-			if (!status)
-			{
-				UnicodeString text;
-				if (willTransfer)
-					text.format(TheGameText->fetch("GUI:PlayerNoMapWillTransfer"), m_currentGame->getLANSlot(i)->getName().str(), mapDisplayName.str());
-				else
-					text.format(TheGameText->fetch("GUI:PlayerNoMap"), m_currentGame->getLANSlot(i)->getName().str(), mapDisplayName.str());
-				OnChat(UnicodeString(L"SYSTEM"), m_localIP, text, LANCHAT_SYSTEM);
-			}
-			lanUpdateSlotList();
-		}
-	}//if
-}// void LANAPI::OnHasMap( UnicodeString player, Bool status ) 
-
-void LANAPI::OnGameStartTimer( Int seconds )
-{
-	UnicodeString text;
-	if (seconds == 1)
-		text.format(TheGameText->fetch("LAN:GameStartTimerSingular"), seconds);
-	else
-		text.format(TheGameText->fetch("LAN:GameStartTimerPlural"), seconds);
-	OnChat(UnicodeString(L"SYSTEM"), m_localIP, text, LANCHAT_SYSTEM);
-}
-
-void LANAPI::OnGameStart( void )
-{
-	//DEBUG_LOG(("Map is '%s', preview is '%s'\n", m_currentGame->getMap().str(), GetPreviewFromMap(m_currentGame->getMap()).str()));
-	//DEBUG_LOG(("Map is '%s', INI is '%s'\n", m_currentGame->getMap().str(), GetINIFromMap(m_currentGame->getMap()).str()));
-
-	if (m_currentGame)
-	{
-		LANPreferences pref;
-		AsciiString option;
-		option.format("%d", m_currentGame->getLANSlot( m_currentGame->getLocalSlotNum() )->getPlayerTemplate());
-		pref["PlayerTemplate"] = option;
-		option.format("%d", m_currentGame->getLANSlot( m_currentGame->getLocalSlotNum() )->getColor());
-		pref["Color"] = option;
-		if (m_currentGame->amIHost())
-    {
-    	pref["Map"] = AsciiStringToQuotedPrintable(m_currentGame->getMap());
-      pref.setSuperweaponRestricted( m_currentGame->getSuperweaponRestriction() > 0 );
-      pref.setStartingCash( m_currentGame->getStartingCash() );
-    }
-		pref.write();
-
-		m_isInLANMenu = FALSE;
-
-		//m_currentGame->startGame(0);
-
-		// Set up the game network
-		DEBUG_ASSERTCRASH(TheNetwork == NULL, ("For some reason TheNetwork isn't NULL at the start of this game.  Better look into that."));
-
-		if (TheNetwork != NULL) {
-			delete TheNetwork;
-			TheNetwork = NULL;
-		}
-
-		// Time to initialize TheNetwork for this game.
-		TheNetwork = NetworkInterface::createNetwork();
-		TheNetwork->init();
-		TheNetwork->setLocalAddress(m_localIP, 8088);
-		TheNetwork->initTransport();
-
-		TheNetwork->parseUserList(m_currentGame);
-
-		if (TheGameLogic->isInGame())
-			TheGameLogic->clearGameData();
-
-		Bool filesOk = DoAnyMapTransfers(m_currentGame);
-
-		// see if we really have the map.  if not, back out.
-		TheMapCache->updateCache();
-		if (!filesOk || TheMapCache->findMap(m_currentGame->getMap()) == NULL)
-		{
-			DEBUG_LOG(("After transfer, we didn't really have the map.  Bailing...\n"));
-			OnPlayerLeave(m_name);
-			removeGame(m_currentGame);
-			m_currentGame = NULL;
-			m_inLobby = TRUE;
-			if (TheNetwork != NULL) {
-				delete TheNetwork;
-				TheNetwork = NULL;
-			}
-			OnChat(UnicodeString::TheEmptyString, 0, TheGameText->fetch("GUI:CouldNotTransferMap"), LANCHAT_SYSTEM);
-			return;
-		}
-
-		m_currentGame->startGame(0);
-
-		// shutdown the top, but do not pop it off the stack
-		//TheShell->hideShell();
-		// setup the Global Data with the Map and Seed
-		TheWritableGlobalData->m_pendingFile = m_currentGame->getMap();
-
-		// send a message to the logic for a new game
-		GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
-		msg->appendIntegerArgument(GAME_LAN);
-
-		TheWritableGlobalData->m_useFpsLimit = false;
-
-		// Set the random seed
-		InitGameLogicRandom( m_currentGame->getSeed() );
-		DEBUG_LOG(("InitGameLogicRandom( %d )\n", m_currentGame->getSeed()));
-	}
-}
-
-void LANAPI::OnGameOptions( UnsignedInt playerIP, Int playerSlot, AsciiString options )
-{
-	if (!m_currentGame)
-		return;
-
-	if (m_currentGame->getIP(playerSlot) != playerIP)
-		return; // He's not in our game?!?
-	
-	
-	if (m_currentGame->isGameInProgress())
-		return; // we don't want to process any game options while in game.
-
-	if (playerSlot == 0 && !m_currentGame->amIHost())
-	{
-		m_currentGame->setLastHeard(timeGetTime());
-		AsciiString oldOptions = GameInfoToAsciiString(m_currentGame); // save these off for if we get booted
-		if(ParseGameOptionsString(m_currentGame,options))
-		{
-			lanUpdateSlotList();
-			updateGameOptions();
-		}
-		Bool booted = true;
-		for(Int player = 1; player< MAX_SLOTS; player++)
-		{
-			if(m_currentGame->getIP(player) == m_localIP)
-			{
-				booted = false;
-				break;
-			}				
-		}
-		if(booted)
-		{
-			// restore the options with us in so we can save prefs
-			ParseGameOptionsString(m_currentGame, oldOptions);
-			OnPlayerLeave(m_name);
-		}
-
-	}
-	else
-	{
-		// Check for user/host updates
-		{
-			AsciiString key;
-			AsciiString munkee = options;
-			munkee.nextToken(&key, "=");
-			//DEBUG_LOG(("GameOpt request: key=%s, val=%s from player %d\n", key.str(), munkee.str(), playerSlot));
-
-			LANGameSlot *slot = m_currentGame->getLANSlot(playerSlot);
-			if (!slot)
-				return;
-
-			if (key == "User")
-			{
-				slot->setLogin(munkee.str()+1);
-				return;
-			}
-			else if (key == "Host")
-			{
-				slot->setHost(munkee.str()+1);
-				return;
-			}
-		}
-
-		// Parse player requests (side, color, etc)
-		if( AmIHost() && m_localIP != playerIP)
-		{
-			if (options.compare("HELLO") == 0)
-			{
-				m_currentGame->setPlayerLastHeard(playerSlot, timeGetTime());
-			}
-			else
-			{
-				m_currentGame->setPlayerLastHeard(playerSlot, timeGetTime());
-				Bool change = false;
-				Bool shouldUnaccept = false;
-				AsciiString key;
-				options.nextToken(&key, "=");
-				Int val = atoi(options.str()+1);
-				DEBUG_LOG(("GameOpt request: key=%s, val=%s from player %d\n", key.str(), options.str(), playerSlot));
-
-				LANGameSlot *slot = m_currentGame->getLANSlot(playerSlot);
-				if (!slot)
-					return;
-
-				if (key == "Color")
-				{
-					if (val >= -1 && val < TheMultiplayerSettings->getNumColors() && val != slot->getColor() && slot->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
-					{
-						Bool colorAvailable = TRUE;
-						if(val != -1 )
-						{
-							for(Int i=0; i <MAX_SLOTS; i++)
-							{
-								LANGameSlot *checkSlot = m_currentGame->getLANSlot(i);
-								if(val == checkSlot->getColor() && slot != checkSlot)
-								{
-									colorAvailable = FALSE;
-									break;
-								}
-							}
-						}
-						if(colorAvailable)
-							slot->setColor(val);
-						change = true;
-					}
-					else
-					{
-						DEBUG_LOG(("Rejecting invalid color %d\n", val));
-					}
-				}
-				else if (key == "PlayerTemplate")
-				{
-					if (val >= PLAYERTEMPLATE_MIN && val < ThePlayerTemplateStore->getPlayerTemplateCount() && val != slot->getPlayerTemplate())
-					{
-						slot->setPlayerTemplate(val);
-						if (val == PLAYERTEMPLATE_OBSERVER)
-						{
-							slot->setColor(-1);
-							slot->setStartPos(-1);
-							slot->setTeamNumber(-1);
-						}
-						change = true;
-						shouldUnaccept = true;
-					}
-					else
-					{
-						DEBUG_LOG(("Rejecting invalid PlayerTemplate %d\n", val));
-					}
-				}
-				else if (key == "StartPos" && slot->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
-				{
-						
-					if (val >= -1 && val < MAX_SLOTS && val != slot->getStartPos())
-					{
-						Bool startPosAvailable = TRUE;
-						if(val != -1)
-							for(Int i=0; i <MAX_SLOTS; i++)
-							{
-								LANGameSlot *checkSlot = m_currentGame->getLANSlot(i);
-								if(val == checkSlot->getStartPos() && slot != checkSlot)
-								{
-									startPosAvailable = FALSE;
-									break;
-								}
-							}
-						if(startPosAvailable)
-							slot->setStartPos(val);
-						change = true;
-						shouldUnaccept = true;
-					}
-					else
-					{
-						DEBUG_LOG(("Rejecting invalid startPos %d\n", val));
-					}
-				}
-				else if (key == "Team")
-				{
-					if (val >= -1 && val < MAX_SLOTS/2 && val != slot->getTeamNumber() && slot->getPlayerTemplate() != PLAYERTEMPLATE_OBSERVER)
-					{
-						slot->setTeamNumber(val);
-						change = true;
-						shouldUnaccept = true;
-					}
-					else
-					{
-						DEBUG_LOG(("Rejecting invalid team %d\n", val));
-					}
-				}
-				else if (key == "NAT")
-				{
-					if ((val >= FirewallHelperClass::FIREWALL_TYPE_SIMPLE) &&
-							(val <= FirewallHelperClass::FIREWALL_TYPE_DESTINATION_PORT_DELTA))
-					{
-						slot->setNATBehavior((FirewallHelperClass::FirewallBehaviorType)val);
-						DEBUG_LOG(("NAT behavior set to %d for player %d\n", val, playerSlot));
-						change = true;
-					}
-					else
-					{
-						DEBUG_LOG(("Rejecting invalid NAT behavior %d\n", (Int)val));
-					}
-				}
-
-				if (change)
-				{
-					if (shouldUnaccept)
-						m_currentGame->resetAccepted();
-					RequestGameOptions(GenerateGameOptionsString(), true);
-					lanUpdateSlotList();
-					DEBUG_LOG(("Slot value is color=%d, PlayerTemplate=%d, startPos=%d, team=%d\n",
-						slot->getColor(), slot->getPlayerTemplate(), slot->getStartPos(), slot->getTeamNumber()));
-					DEBUG_LOG(("Slot list updated to %s\n", GenerateGameOptionsString().str()));
-				}
-			}
-		}
-	}
-}
-
-
-/*
-void LANAPI::OnSlotList( ReturnType ret, LANGameInfo *theGame )
-{
-	if (!theGame || theGame != m_currentGame)
-		return;
-
-	Bool foundMe = false;
-	for (int player = 0; player < MAX_SLOTS; ++player)
-	{
-		if (m_currentGame->getIP(player) == m_localIP)
-		{
-			foundMe = true;
-			break;
-		}
-	}
-	if (!foundMe)
-	{
-		// I've been kicked - back to the lobby for me!
-		// We're counting on the fact that OnPlayerLeave winds up calling reset on TheLAN.
-		OnPlayerLeave(m_name);
-		return;
-	}
-
-	lanUpdateSlotList();
-}
-*/
-void LANAPI::OnPlayerJoin( Int slot, UnicodeString playerName )
-{
-	if (m_currentGame && m_currentGame->getIP(0) == m_localIP)
-	{
-		// Someone New Joined.. lets reset the accepts
-		m_currentGame->resetAccepted();
-
-		// Send out the game options
-		RequestGameOptions(GenerateGameOptionsString(), true);
-	}
-
-	lanUpdateSlotList();
-}
-
-void LANAPI::OnGameJoin( ReturnType ret, LANGameInfo *theGame )
-{
-	if (ret == RET_OK)
-	{
-		LANbuttonPushed = true;
-		TheShell->push( AsciiString("Menus/LanGameOptionsMenu.wnd") );
-		//lanUpdateSlotList();
-
-		LANPreferences pref;
-		AsciiString options;
-		options.format("PlayerTemplate=%d", pref.getPreferredFaction());
-		RequestGameOptions(options, true);
-		options.format("Color=%d", pref.getPreferredColor());
-		RequestGameOptions(options, true);
-		options.format("User=%s", m_userName.str());
-		RequestGameOptions( options, true );
-		options.format("Host=%s", m_hostName.str());
-		RequestGameOptions( options, true );
-		options.format("NAT=%d", FirewallHelperClass::FIREWALL_TYPE_SIMPLE); // BGC: This is a LAN game, so there is no firewall.
-		RequestGameOptions( options, true );
-	}
-	else if (ret != RET_BUSY)
-	{
-		/// @todo: re-enable lobby controls?  Error msgs?
-		UnicodeString title, body;
-		title = TheGameText->fetch("LAN:JoinFailed");
-		body = getErrorStringFromReturnType(ret);
-		MessageBoxOk(title, body, NULL);
-	}
-}
-
-void LANAPI::OnHostLeave( void )
-{
-	DEBUG_ASSERTCRASH(!m_inLobby && m_currentGame, ("Game info is gone!"));
-	if (m_inLobby || !m_currentGame)
-		return;
-	LANbuttonPushed = true;
-	DEBUG_LOG(("Host left - popping to lobby\n"));
-	TheShell->pop();
-}
-
-void LANAPI::OnPlayerLeave( UnicodeString player )
-{
-	DEBUG_ASSERTCRASH(!m_inLobby && m_currentGame, ("Game info is gone!"));
-	if (m_inLobby || !m_currentGame || m_currentGame->isGameInProgress())
-		return;
-
-	if (m_name.compare(player) == 0)
-	{
-		// We're leaving.  Save options and Pop the shell up a screen.
-		//DEBUG_ASSERTCRASH(false, ("Slot is %d\n", m_currentGame->getLocalSlotNum()));
-		if (m_currentGame && m_currentGame->isInGame() && m_currentGame->getLocalSlotNum() >= 0)
-		{
-			LANPreferences pref;
-			AsciiString option;
-			option.format("%d", m_currentGame->getLANSlot( m_currentGame->getLocalSlotNum() )->getPlayerTemplate());
-			pref["PlayerTemplate"] = option;
-			option.format("%d", m_currentGame->getLANSlot( m_currentGame->getLocalSlotNum() )->getColor());
-			pref["Color"] = option;
-			if (m_currentGame->amIHost())
-				pref["Map"] = AsciiStringToQuotedPrintable(m_currentGame->getMap());
-			pref.write();
-		}
-		LANbuttonPushed = true;
-		DEBUG_LOG(("OnPlayerLeave says we're leaving!  pop away!\n"));
-		TheShell->pop();
-	}
-	else
-	{
-		if (m_currentGame && m_currentGame->getIP(0) == m_localIP)
-		{
-			// Force a new slotlist send
-			m_lastResendTime = 0;
-			
-			lanUpdateSlotList();
-			RequestGameOptions( GenerateGameOptionsString(), true );
-
-		}
-	}
-}
-
-void LANAPI::OnGameList( LANGameInfo *gameList )
-{
-		
-	if (m_inLobby)
-	{
-		LANDisplayGameList(listboxGames, gameList);
-	}
-}//void LANAPI::OnGameList( LANGameInfo *gameList ) 
-
-void LANAPI::OnGameCreate( ReturnType ret )
-{
-	if (ret == RET_OK)
-	{
-
-		LANbuttonPushed = true;
-		TheShell->push( AsciiString("Menus/LanGameOptionsMenu.wnd") );
-
-		RequestLobbyLeave( false );
-		//RequestGameAnnounce( ); // can't do this here, since we don't have a map set
-	}
-	else
-	{
-		if(m_inLobby)
-		{
-			switch( ret )
-			{
-			case RET_GAME_EXISTS:
-				GadgetListBoxAddEntryText(listboxChatWindow, TheGameText->fetch("LAN:ErrorGameExists"), chatSystemColor, -1, -1);
-				break;
-			case RET_BUSY:
-				GadgetListBoxAddEntryText(listboxChatWindow, TheGameText->fetch("LAN:ErrorBusy"), chatSystemColor, -1, -1);
-				break;
-			default:
-				GadgetListBoxAddEntryText(listboxChatWindow, TheGameText->fetch("LAN:ErrorUnknown"), chatSystemColor, -1, -1);
-			}
-		}
-	}
-
-}//void OnGameCreate( ReturnType ret )
-
-void LANAPI::OnPlayerList( LANPlayer *playerList )
-{
-	if (m_inLobby)
-	{
-		
-		UnsignedInt selectedIP = 0;
-		Int selectedIndex = -1;
-		Int indexToSelect = -1;
-		GadgetListBoxGetSelected(listboxPlayers, &selectedIndex);
-		
-		if (selectedIndex != -1 )
-			selectedIP = (UnsignedInt) GadgetListBoxGetItemData(listboxPlayers, selectedIndex, 0);
-
-		GadgetListBoxReset(listboxPlayers);
-
-		LANPlayer *player = m_lobbyPlayers;
-		while (player)
-		{
-			Int addedIndex = GadgetListBoxAddEntryText(listboxPlayers, player->getName(), playerColor, -1, -1);
-			GadgetListBoxSetItemData(listboxPlayers, (void *)player->getIP(),addedIndex, 0 );
-
-			if (selectedIP == player->getIP())
-				indexToSelect = addedIndex;
-
-			player = player->getNext();
-		}
-
-		if (indexToSelect >= 0)
-			GadgetListBoxSetSelected(listboxPlayers, indexToSelect);
-	}
-}
-
-void LANAPI::OnNameChange( UnsignedInt IP, UnicodeString newName )
-{
-	OnPlayerList(m_lobbyPlayers);
-}
-
-void LANAPI::OnInActive(UnsignedInt IP) {
-	
-}
-
-void LANAPI::OnChat( UnicodeString player, UnsignedInt ip, UnicodeString message, ChatType format )
-{
-	GameWindow *chatWindow = NULL;
-
-	if (m_inLobby)
-	{
-		chatWindow = listboxChatWindow;
-	}
-	else if( m_currentGame && m_currentGame->isGameInProgress() && TheShell->isShellActive())
-	{
-		chatWindow = listboxChatWindowScoreScreen;
-	}
-	else if( m_currentGame && !m_currentGame->isGameInProgress())
-	{
-		chatWindow = listboxChatWindowLanGame;	
-	}
-	if (chatWindow == NULL)
-		return;
-	Int index = -1;
-	UnicodeString unicodeChat;
-	switch (format)
-	{
-		case LANAPIInterface::LANCHAT_SYSTEM:
-			unicodeChat = L"";
-			unicodeChat.concat(message);
-			unicodeChat.concat(L"");
-			index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatSystemColor, -1, -1);
-			break;
-		case LANAPIInterface::LANCHAT_EMOTE:
-			unicodeChat = player;
-			unicodeChat.concat(L' ');
-			unicodeChat.concat(message);
-			if (ip == m_localIP)
-				index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatLocalActionColor, -1, -1);
-			else
-				index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatActionColor, -1, -1);
-			break;
-		case LANAPIInterface::LANCHAT_NORMAL:
-		default:
-		{
-			// Do the language filtering.
-			TheLanguageFilter->filterLine(message);
-
-			Color chatColor = GameMakeColor(255, 255, 255, 255);
-			if (m_currentGame)
-			{
-				Int slotNum = m_currentGame->getSlotNum(player);
-				// it'll be -1 if its invalid.
-				if (slotNum >= 0) {
-					GameSlot *gs = m_currentGame->getSlot(slotNum);
-					if (gs) {
-						Int colorIndex = gs->getColor();
-						MultiplayerColorDefinition *def = TheMultiplayerSettings->getColor(colorIndex);
-						if (def)
-							chatColor = def->getColor();
-					}
-				}
-			}
-			
-			unicodeChat = L"[";
-			unicodeChat.concat(player);
-			unicodeChat.concat(L"] ");
-			unicodeChat.concat(message);
-			if (ip == m_localIP)
-				index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatColor, -1, -1);
-			else
-				index =GadgetListBoxAddEntryText(chatWindow, unicodeChat, chatColor, -1, -1);
-			break;
-		}
-	}
-	GadgetListBoxSetItemData(chatWindow, (void *)-1, index);
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp
deleted file mode 100644
index 05fd55fde58..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp
+++ /dev/null
@@ -1,684 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-// FILE: LANAPIHandlers.cpp
-// Author: Matthew D. Campbell, October 2001
-// Description: LAN callback handlers
-///////////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/crc.h"
-#include "Common/GameState.h"
-#include "Common/Registry.h"
-#include "Common/GlobalData.h"
-#include "Common/QuotedPrintable.h"
-#include "Common/UserPreferences.h"
-#include "GameNetwork/LANAPI.h"
-#include "GameNetwork/LANAPICallbacks.h"
-#include "GameClient/MapUtil.h"
-
-void LANAPI::handleRequestLocations( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (m_inLobby)
-	{
-		LANMessage reply;
-		fillInLANMessage( &reply );
-		reply.LANMessageType = LANMessage::MSG_LOBBY_ANNOUNCE;
-
-		sendMessage(&reply);
-		m_lastResendTime = timeGetTime();
-	}
-	else
-	{
-		// In game - are we a game host?
-		if (m_currentGame)
-		{
-			if (m_currentGame->getIP(0) == m_localIP)
-			{
-				LANMessage reply;
-				fillInLANMessage( &reply );
-				reply.LANMessageType = LANMessage::MSG_GAME_ANNOUNCE;
-				AsciiString gameOpts = GenerateGameOptionsString();
-				strncpy(reply.GameInfo.options,gameOpts.str(),m_lanMaxOptionsLength);
-				wcsncpy(reply.GameInfo.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-				reply.GameInfo.gameName[g_lanGameNameLength] = 0;
-				reply.GameInfo.inProgress = m_currentGame->isGameInProgress();
-
-				sendMessage(&reply);
-			}
-			else
-			{
-				// We're a joiner
-			}
-		}
-	}
-	// Add the player to the lobby player list
-	LANPlayer *player = LookupPlayer(senderIP);
-	if (!player)
-	{
-		player = NEW LANPlayer;
-		player->setIP(senderIP);
-	}
-	else
-	{
-		removePlayer(player);
-	}
-	player->setName(UnicodeString(msg->name));
-	player->setHost(msg->hostName);
-	player->setLogin(msg->userName);
-	player->setLastHeard(timeGetTime());
-
-	addPlayer(player);
-
-	OnNameChange(player->getIP(), player->getName());
-}
-
-void LANAPI::handleGameAnnounce( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (senderIP == m_localIP)
-	{
-		return; // Don't try to update own info
-	}
-	else if (m_currentGame && m_currentGame->isGameInProgress())
-	{
-		return; // Don't care about games if we're playing
-	}
-	else if (senderIP == m_directConnectRemoteIP)
-	{
-
-		if (m_currentGame == NULL)
-		{
-			LANGameInfo *game = LookupGame(UnicodeString(msg->GameInfo.gameName));
-			if (!game)
-			{
-				game = NEW LANGameInfo;
-				game->setName(UnicodeString(msg->GameInfo.gameName));
-				addGame(game);
-			}
-			Bool success = ParseGameOptionsString(game,AsciiString(msg->GameInfo.options));
-			game->setGameInProgress(msg->GameInfo.inProgress);
-			game->setIsDirectConnect(msg->GameInfo.isDirectConnect);
-			game->setLastHeard(timeGetTime());
-			if (!success)
-			{
-				// remove from list
-				removeGame(game);
-				delete game;
-				game = NULL;
-				return;
-			}
-			RequestGameJoin(game, m_directConnectRemoteIP);
-		}
-	}
-	else
-	{
-		LANGameInfo *game = LookupGame(UnicodeString(msg->GameInfo.gameName));
-		if (!game)
-		{
-			game = NEW LANGameInfo;
-			game->setName(UnicodeString(msg->GameInfo.gameName));
-			addGame(game);
-		}
-		Bool success = ParseGameOptionsString(game,AsciiString(msg->GameInfo.options));
-		game->setGameInProgress(msg->GameInfo.inProgress);
-		game->setIsDirectConnect(msg->GameInfo.isDirectConnect);
-		game->setLastHeard(timeGetTime());
-		if (!success)
-		{
-			// remove from list
-			removeGame(game);
-			delete game;
-			game = NULL;
-		}
-
-		OnGameList( m_games );
-	//	if (game == m_currentGame && !m_inLobby)
-	//		OnSlotList(RET_OK, game);
-	}
-}
-
-void LANAPI::handleLobbyAnnounce( LANMessage *msg, UnsignedInt senderIP )
-{
-	LANPlayer *player = LookupPlayer(senderIP);
-	if (!player)
-	{
-		player = NEW LANPlayer;
-		player->setIP(senderIP);
-	}
-	else
-	{
-		removePlayer(player);
-	}
-	player->setName(UnicodeString(msg->name));
-	player->setHost(msg->hostName);
-	player->setLogin(msg->userName);
-	player->setLastHeard(timeGetTime());
-
-	addPlayer(player);
-
-	OnNameChange(player->getIP(), player->getName());
-}
-
-void LANAPI::handleRequestGameInfo( LANMessage *msg, UnsignedInt senderIP )
-{
-	// In game - are we a game host?
-	if (m_currentGame)
-	{
-		if (m_currentGame->getIP(0) == m_localIP || (m_currentGame->isGameInProgress() && TheNetwork && TheNetwork->isPacketRouter())) // if we're in game we should reply if we're the packet router
-		{
-			LANMessage reply;
-			fillInLANMessage( &reply );
-			reply.LANMessageType = LANMessage::MSG_GAME_ANNOUNCE;
-			
-			AsciiString gameOpts = GameInfoToAsciiString(m_currentGame);
-			strncpy(reply.GameInfo.options,gameOpts.str(),m_lanMaxOptionsLength);
-			wcsncpy(reply.GameInfo.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-			reply.GameInfo.gameName[g_lanGameNameLength] = 0;
-			reply.GameInfo.inProgress = m_currentGame->isGameInProgress();
-			reply.GameInfo.isDirectConnect = m_currentGame->getIsDirectConnect();
-
-			sendMessage(&reply, senderIP);
-		}
-	}
-}
-
-void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP )
-{
-	UnsignedInt responseIP = senderIP;	// need this cause the player may or may not be
-																			// in the player list at the sendMessage.
-
-	if (msg->GameToJoin.gameIP != m_localIP)
-	{
-		return; // Not us.  Ignore it.
-	}
-	LANMessage reply;
-	fillInLANMessage( &reply );
-	if (!m_inLobby && m_currentGame && m_currentGame->getIP(0) == m_localIP)
-	{
-		if (m_currentGame->isGameInProgress())
-		{
-			reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-			reply.GameNotJoined.reason = LANAPIInterface::RET_GAME_STARTED;
-			reply.GameNotJoined.gameIP = m_localIP;
-			reply.GameNotJoined.playerIP = senderIP;
-			DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because game already started.\n"));
-		}
-		else
-		{
-			int player;
-			Bool canJoin = true;
-
-			// see if the CRCs match
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-			if (TheGlobalData->m_netMinPlayers > 0) {
-#endif
-/*			if (msg->GameToJoin.iniCRC != TheGlobalData->m_iniCRC ||
-					msg->GameToJoin.exeCRC != TheGlobalData->m_exeCRC)
-			{
-				DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of CRC mismatch. CRCs are them/us INI:%X/%X exe:%X/%X\n",
-					msg->GameToJoin.iniCRC, TheGlobalData->m_iniCRC,
-					msg->GameToJoin.exeCRC, TheGlobalData->m_exeCRC));
-				reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-				reply.GameNotJoined.reason = LANAPIInterface::RET_CRC_MISMATCH;
-				reply.GameNotJoined.gameIP = m_localIP;
-				reply.GameNotJoined.playerIP = senderIP;
-				canJoin = false;
-			}
-*/
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-			}
-#endif
-			
-// TheSuperHackers @tweak Disables the duplicate serial check
-#if 0
-			// check for a duplicate serial
-			AsciiString s;
-			for (player = 0; canJoin && player<MAX_SLOTS; ++player)
-			{
-				LANGameSlot *slot = m_currentGame->getLANSlot(player);
-				s.clear();
-				if (player == 0)
-				{
-					GetStringFromRegistry("\\ergc", "", s);
-				}
-				else if (slot->isHuman())
-				{
-					s = slot->getSerial();
-					if (s.isEmpty())
-						s = "<Munkee>";
-				}
-
-				if (s.isNotEmpty())
-				{
-					DEBUG_LOG(("Checking serial '%s' in slot %d\n", s.str(), player));
-
-					if (!strncmp(s.str(), msg->GameToJoin.serial, g_maxSerialLength))
-					{
-						// serials match!  kick the punk!
-						reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-						reply.GameNotJoined.reason = LANAPIInterface::RET_SERIAL_DUPE;
-						reply.GameNotJoined.gameIP = m_localIP;
-						reply.GameNotJoined.playerIP = senderIP;
-						canJoin = false;
-
-						DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of duplicate serial # (%s).\n", s.str()));
-						break;
-					}
-				}
-			}
-#endif
-
-			// We're the host, so see if he has a duplicate name
-			for (player = 0; canJoin && player<MAX_SLOTS; ++player)
-			{
-				LANGameSlot *slot = m_currentGame->getLANSlot(player);
-				if (slot->isHuman() && slot->getName().compare(msg->name) == 0)
-				{
-					// just deny duplicates
-					reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-					reply.GameNotJoined.reason = LANAPIInterface::RET_DUPLICATE_NAME;
-					reply.GameNotJoined.gameIP = m_localIP;
-					reply.GameNotJoined.playerIP = senderIP;
-					canJoin = false;
-
-					DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of duplicate names.\n"));
-					break;
-				}
-			}
-
-			// See if there's room
-			// First get the number of players currently in the room.
-			Int numPlayers = 0;
-			for (player = 0; player < MAX_SLOTS; ++player)
-			{
-				if (m_currentGame->getLANSlot(player)->isOccupied()
-					&& !(m_currentGame->getLANSlot(player)->getPlayerTemplate() == PLAYERTEMPLATE_OBSERVER))
-				{
-					++numPlayers;
-				}
-			}
-			
-			// now get the number of starting spots on the map.
-			Int numStartingSpots = MAX_SLOTS;
-			const MapMetaData *md = TheMapCache->findMap(m_currentGame->getMap());
-			if (md != NULL)
-			{
-				numStartingSpots = md->m_numPlayers;
-			}
-
-			if (numPlayers < numStartingSpots) {
-				for (player = 0; canJoin && player<MAX_SLOTS; ++player)
-				{
-					if (m_currentGame->getLANSlot(player)->isOpen())
-					{
-						// OK, add him in.
-						reply.LANMessageType = LANMessage::MSG_JOIN_ACCEPT;
-						wcsncpy(reply.GameJoined.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-						reply.GameJoined.gameName[g_lanGameNameLength] = 0;
-						reply.GameJoined.slotPosition = player;
-						reply.GameJoined.gameIP = m_localIP;
-						reply.GameJoined.playerIP = senderIP;
-
-						LANGameSlot newSlot;
-						newSlot.setState(SLOT_PLAYER, UnicodeString(msg->name));
-						newSlot.setIP(senderIP);
-						newSlot.setPort(NETWORK_BASE_PORT_NUMBER);
-						newSlot.setLastHeard(timeGetTime());
-						newSlot.setSerial(msg->GameToJoin.serial);
-						m_currentGame->setSlot(player,newSlot);
-						DEBUG_LOG(("LANAPI::handleRequestJoin - added player %ls at ip 0x%08x to the game\n", msg->name, senderIP));
-
-						OnPlayerJoin(player, UnicodeString(msg->name));
-						responseIP = 0;
-
-						break;
-					}
-				}
-			}
-			if (canJoin && player == MAX_SLOTS)
-			{
-				reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-				wcsncpy(reply.GameNotJoined.gameName, m_currentGame->getName().str(), g_lanGameNameLength);
-				reply.GameNotJoined.gameName[g_lanGameNameLength] = 0;
-				reply.GameNotJoined.reason = LANAPIInterface::RET_GAME_FULL;
-				reply.GameNotJoined.gameIP = m_localIP;
-				reply.GameNotJoined.playerIP = senderIP;
-				DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because game is full.\n"));
-			}
-		}
-	}
-	else
-	{
-		reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-		reply.GameNotJoined.reason = LANAPIInterface::RET_GAME_GONE;
-		reply.GameNotJoined.gameIP = m_localIP;
-		reply.GameNotJoined.playerIP = senderIP;
-	}
-	sendMessage(&reply, responseIP);
-	RequestGameOptions(GenerateGameOptionsString(), true);
-}
-
-void LANAPI::handleJoinAccept( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (msg->GameJoined.playerIP == m_localIP) // Is it for us?
-	{
-		if (m_pendingAction == ACT_JOIN) // Are we trying to join?
-		{
-			m_currentGame = LookupGame(UnicodeString(msg->GameJoined.gameName));
-		
-			if (!m_currentGame)
-			{
-				DEBUG_ASSERTCRASH(false, ("Could not find game to join!"));
-				OnGameJoin(RET_UNKNOWN, NULL);
-			}
-			else
-			{
-				m_inLobby = false;
-				AsciiString options = GameInfoToAsciiString(m_currentGame);
-				m_currentGame->enterGame();
-				ParseAsciiStringToGameInfo(m_currentGame, options);
-
-				Int pos = msg->GameJoined.slotPosition;
-
-				LANGameSlot slot;
-				slot.setState(SLOT_PLAYER, m_name);
-				slot.setIP(m_localIP);
-				slot.setPort(NETWORK_BASE_PORT_NUMBER);
-				slot.setLastHeard(0);
-				slot.setLogin(m_userName);
-				slot.setHost(m_hostName);
-				m_currentGame->setSlot(pos, slot);
-
-				m_currentGame->getLANSlot(0)->setHost(msg->hostName);
-				m_currentGame->getLANSlot(0)->setLogin(msg->userName);
-
-				LANPreferences prefs;
-				AsciiString entry;
-				entry.format("%d.%d.%d.%d:%s", PRINTF_IP_AS_4_INTS(senderIP), UnicodeStringToQuotedPrintable(m_currentGame->getSlot(0)->getName()).str());
-				prefs["RemoteIP0"] = entry;
-				prefs.write();
-
-				OnGameJoin(RET_OK, m_currentGame);
-				//DEBUG_ASSERTCRASH(false, ("setting host to %ls@%ls\n", m_currentGame->getLANSlot(0)->getUser()->getLogin().str(),
-				//	m_currentGame->getLANSlot(0)->getUser()->getHost().str()));
-			}
-			m_pendingAction = ACT_NONE;
-			m_expiration = 0;
-		}
-	}
-}
-
-void LANAPI::handleJoinDeny( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (msg->GameJoined.playerIP == m_localIP) // Is it for us?
-	{
-		if (m_pendingAction == ACT_JOIN) // Are we trying to join?
-		{
-			OnGameJoin(msg->GameNotJoined.reason, LookupGame(UnicodeString(msg->GameNotJoined.gameName)));
-			m_pendingAction = ACT_NONE;
-			m_expiration = 0;
-		}
-	}
-}
-
-void LANAPI::handleRequestGameLeave( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (!m_inLobby && m_currentGame && !m_currentGame->isGameInProgress())
-	{
-		int player;
-		for (player = 0; player < MAX_SLOTS; ++player)
-		{
-			if (m_currentGame->getIP(player) == senderIP)
-			{
-				if (player == 0)
-				{
-					OnHostLeave();
-					removeGame(m_currentGame);
-					delete m_currentGame;
-					m_currentGame = NULL;
-
-					/// @todo re-add myself to lobby?  Or just keep me there all the time?  If we send a LOBBY_ANNOUNCE things'll work out...
-					LANPlayer *lanPlayer = LookupPlayer(m_localIP);
-					if (!lanPlayer)
-					{
-						lanPlayer = NEW LANPlayer;
-						lanPlayer->setIP(m_localIP);
-					}
-					else
-					{
-						removePlayer(lanPlayer);
-					}
-					lanPlayer->setName(UnicodeString(m_name));
-					lanPlayer->setHost(m_hostName);
-					lanPlayer->setLogin(m_userName);
-					lanPlayer->setLastHeard(timeGetTime());
-					addPlayer(lanPlayer);
-
-				}
-				else
-				{
-					if (AmIHost())
-					{
-						// remove the deadbeat
-						LANGameSlot slot;
-						slot.setState(SLOT_OPEN);
-						m_currentGame->setSlot( player, slot );
-					}
-					OnPlayerLeave(UnicodeString(msg->name));
-					m_currentGame->getLANSlot(player)->setState(SLOT_OPEN);
-					m_currentGame->resetAccepted();
-					RequestGameOptions(GenerateGameOptionsString(), false, senderIP);
-					//m_currentGame->endGame();
-				}
-				break;
-			}
-			DEBUG_ASSERTCRASH(player < MAX_SLOTS, ("Didn't find player!"));
-		}
-	}
-	else if (m_inLobby)
-	{
-		// Look for dissappearing games
-		LANGameInfo *game = m_games;
-		while (game)
-		{
-			if (game->getName().compare(msg->GameToLeave.gameName) == 0)
-			{
-				removeGame(game);
-				delete game;
-				OnGameList(m_games);
-				break;
-			}
-			game = game->getNext();
-		}
-	}
-}
-
-void LANAPI::handleRequestLobbyLeave( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (m_inLobby)
-	{
-		LANPlayer *player = m_lobbyPlayers;
-		while (player)
-		{
-			if (player->getIP() == senderIP)
-			{
-				removePlayer(player);
-				OnPlayerList(m_lobbyPlayers);
-				break;
-			}
-			player = player->getNext();
-		}
-	}
-}
-
-void LANAPI::handleSetAccept( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (!m_inLobby && m_currentGame && !m_currentGame->isGameInProgress())
-	{
-		int player;
-		for (player = 0; player < MAX_SLOTS; ++player)
-		{
-			if (m_currentGame->getIP(player) == senderIP)
-			{
-				OnAccept(senderIP, msg->Accept.isAccepted);
-				break;
-			}
-		}
-	}
-}
-
-void LANAPI::handleHasMap( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (!m_inLobby && m_currentGame)
-	{
-		CRC mapNameCRC;
-//	mapNameCRC.computeCRC(m_currentGame->getMap().str(), m_currentGame->getMap().getLength());
-		AsciiString portableMapName = TheGameState->realMapPathToPortableMapPath(m_currentGame->getMap());
-		mapNameCRC.computeCRC(portableMapName.str(), portableMapName.getLength());
-		if (mapNameCRC.get() != msg->MapStatus.mapCRC)
-		{
-			return;
-		}
-
-		int player;
-		for (player = 0; player < MAX_SLOTS; ++player)
-		{
-			if (m_currentGame->getIP(player) == senderIP)
-			{
-				OnHasMap(senderIP, msg->MapStatus.hasMap);
-				break;
-			}
-		}
-	}
-}
-
-void LANAPI::handleChat( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (m_inLobby)
-	{
-		LANPlayer *player;
-		if((player=LookupPlayer(senderIP)) != 0)
-		{
-			OnChat(UnicodeString(player->getName()), player->getIP(), UnicodeString(msg->Chat.message), msg->Chat.chatType);
-			player->setLastHeard(timeGetTime());
-		}
-	}
-	else
-	{
-		if (LookupGame(UnicodeString(msg->Chat.gameName)) != m_currentGame)
-		{
-			DEBUG_LOG(("Game '%ls' is not my game\n", msg->Chat.gameName));
-			if (m_currentGame)
-			{
-				DEBUG_LOG(("Current game is '%ls'\n", m_currentGame->getName().str()));
-			}
-			return;
-		}
-
-		int player;
-		for (player = 0; player < MAX_SLOTS; ++player)
-		{
-			if (m_currentGame && m_currentGame->getIP(player) == senderIP)
-			{
-				OnChat(UnicodeString(msg->name), m_currentGame->getIP(player), UnicodeString(msg->Chat.message), msg->Chat.chatType);
-				break;
-			}
-		}
-	}
-}
-
-void LANAPI::handleGameStart( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (!m_inLobby && m_currentGame && m_currentGame->getIP(0) == senderIP && !m_currentGame->isGameInProgress())
-	{
-		OnGameStart();
-	}
-}
-
-void LANAPI::handleGameStartTimer( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (!m_inLobby && m_currentGame && m_currentGame->getIP(0) == senderIP && !m_currentGame->isGameInProgress())
-	{
-		OnGameStartTimer(msg->StartTimer.seconds);
-	}
-}
-
-void LANAPI::handleGameOptions( LANMessage *msg, UnsignedInt senderIP )
-{
-	if (!m_inLobby && m_currentGame && !m_currentGame->isGameInProgress())
-	{
-		int player;
-		for (player = 0; player < MAX_SLOTS; ++player)
-		{
-			if (m_currentGame->getIP(player) == senderIP)
-			{
-				OnGameOptions(senderIP, player, AsciiString(msg->GameOptions.options));
-				break;
-			}
-		}
-	}
-}
-
-void LANAPI::handleInActive(LANMessage *msg, UnsignedInt senderIP) {
-	if (m_inLobby || (m_currentGame == NULL) || (m_currentGame->isGameInProgress())) {
-		return;
-	}
-
-	// check to see if we are the host of this game.
-	if (m_currentGame->amIHost() == FALSE) {
-		return;
-	}
-
-	UnicodeString playerName;
-	playerName = msg->name;
-
-	Int slotNum = m_currentGame->getSlotNum(playerName);
-	if (slotNum < 0)
-		return;
-	GameSlot *slot = m_currentGame->getSlot(slotNum);
-	if (slot == NULL) {
-		return;
-	}
-
-	if (senderIP != slot->getIP()) {
-		return;
-	}
-
-	// don't want to unaccept the host, that's silly.  They can't hit start alt-tabbed anyways.
-	if (senderIP == TheLAN->GetLocalIP()) {
-		return;
-	}
-
-	// only unaccept if the timer hasn't started yet.
-	if (m_gameStartTime != 0) {
-		return;
-	}
-
-	slot->unAccept();
-	AsciiString options = GenerateGameOptionsString();
-	RequestGameOptions(options, FALSE);
-	lanUpdateSlotList();
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANGameInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANGameInfo.cpp
deleted file mode 100644
index e29851a459f..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANGameInfo.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: LANGameInfo.cpp //////////////////////////////////////////////////////
-// LAN game setup state info
-// Author: Matthew D. Campbell, December 2001
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameClient/GameInfoWindow.h"
-#include "GameClient/GameText.h"
-#include "GameClient/GadgetListBox.h"
-#include "GameNetwork/LANGameInfo.h"
-#include "GameNetwork/LANAPICallbacks.h"
-#include "Common/MultiplayerSettings.h"
-#include "strtok_r.h"
-/*
-#include "GameNetwork/LAN.h"
-#include "GameNetwork/LANGame.h"
-#include "GameNetwork/LANPing.h"
-#include "GameNetwork/LANusers.h"
-#include "GameNetwork/LANmenus.h"
-*/
-
-// Singleton ------------------------------------------
-
-LANGameInfo *TheLANGameInfo = NULL;
-
-// LANGameSlot ----------------------------------------
-
-LANGameSlot::LANGameSlot()
-{
-	m_lastHeard = 0;
-}
-
-
-LANPlayer * LANGameSlot::getUser( void )
-{
-	if (isHuman())
-	{
-		m_user.setIP(getIP());
-		m_user.setLastHeard(getLastHeard());
-		m_user.setName(getName());
-		m_user.setNext(NULL);
-		return &m_user;
-	}
-	return NULL;
-}
-
-// Various tests
-Bool LANGameSlot::isUser( LANPlayer *user )
-{
-	return (user && m_state == SLOT_PLAYER && user->getIP() == getIP());
-}
-
-Bool LANGameSlot::isUser( UnicodeString userName )
-{
-	return (m_state == SLOT_PLAYER && !userName.compareNoCase(getName()));
-}
-
-Bool LANGameSlot::isLocalPlayer( void ) const
-{
-	return isHuman() && TheLAN && TheLAN->GetLocalIP() == getIP();
-}
-
-// LANGameInfo ----------------------------------------
-
-LANGameInfo::LANGameInfo()
-{
-	//Added By Sadullah Nader
-	//Initializtions missing and needed
-	m_lastHeard = 0;
-	m_next = NULL;
-	//
-	for (Int i = 0; i< MAX_SLOTS; ++i)
-		setSlotPointer(i, &m_LANSlot[i]);
-
-	setLocalIP(TheLAN->GetLocalIP());
-}
-
-void LANGameInfo::setSlot( Int slotNum, LANGameSlot slotInfo )
-{
-	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("LANGameInfo::setSlot - Invalid slot number"));
-	if (slotNum < 0 || slotNum >= MAX_SLOTS)
-		return;
-
-	m_LANSlot[slotNum] = slotInfo;
-	
-	if (slotNum == 0)
-	{
-		m_LANSlot[slotNum].setAccept();
-		m_LANSlot[slotNum].setMapAvailability(true);
-	}
-}
-
-LANGameSlot* LANGameInfo::getLANSlot( Int slotNum )
-{
-	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("LANGameInfo::getLANSlot - Invalid slot number"));
-	if (slotNum < 0 || slotNum >= MAX_SLOTS)
-		return NULL;
-
-	return &m_LANSlot[slotNum];
-}
-
-const LANGameSlot* LANGameInfo::getConstLANSlot( Int slotNum ) const
-{
-	DEBUG_ASSERTCRASH( slotNum >= 0 && slotNum < MAX_SLOTS, ("LANGameInfo::getConstLANSlot - Invalid slot number"));
-	if (slotNum < 0 || slotNum >= MAX_SLOTS)
-		return NULL;
-
-	return &m_LANSlot[slotNum];
-}
-
-Int LANGameInfo::getLocalSlotNum( void ) const
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for local game slot while not in game"));
-	if (!m_inGame)
-		return -1;
-
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		const LANGameSlot *slot = getConstLANSlot(i);
-		if (slot->isLocalPlayer())
-			return i;
-	}
-	return -1;
-}
-
-Int LANGameInfo::getSlotNum( UnicodeString userName )
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
-	if (!m_inGame)
-		return -1;
-
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		LANGameSlot *slot = getLANSlot(i);
-		if (slot->isUser( userName ))
-			return i;
-	}
-	return -1;
-}
-
-Bool LANGameInfo::amIHost( void )
-{
-	DEBUG_ASSERTCRASH(m_inGame, ("Looking for game slot while not in game"));
-	if (!m_inGame)
-		return false;
-
-	return getLANSlot(0)->isLocalPlayer();
-}
-
-void LANGameInfo::setMap( AsciiString mapName )
-{
-	GameInfo::setMap(mapName);
-}
-
-void LANGameInfo::setSeed( Int seed )
-{
-	GameInfo::setSeed(seed);
-}
-
-void LANGameInfo::resetAccepted( void )
-{
-	if (TheLAN)
-	{
-		TheLAN->ResetGameStartTimer();
-		if (TheLAN->GetMyGame() == this && TheLAN->AmIHost())
-			LANEnableStartButton(true);
-	}
-	for(int i = 0; i< MAX_SLOTS; i++)
-	{
-		m_LANSlot[i].unAccept();
-	}
-}
-// Misc game-related functionality --------------------
-
-
-void LANDisplayGameList( GameWindow *gameListbox, LANGameInfo *gameList )
-{
-	LANGameInfo *selectedPtr = NULL;
-	Int selectedIndex = -1;
-	Int indexToSelect = -1;
-	if (gameListbox)
-	{
-		GadgetListBoxGetSelected(gameListbox, &selectedIndex);
-		
-		if (selectedIndex != -1 )
-		{
-			selectedPtr = (LANGameInfo *)GadgetListBoxGetItemData(gameListbox, selectedIndex, 0);
-		}
-
-		GadgetListBoxReset(gameListbox);
-		
-		while (gameList)
-		{
-			UnicodeString txtGName;
-			txtGName = L"";
-			if( gameList->isGameInProgress() )
-			{
-				txtGName.concat(L"[");
-			}
-			txtGName.concat(gameList->getPlayerName(0));
-			if( gameList->isGameInProgress() )
-			{
-				txtGName.concat(L"]");
-			}
-			Int addedIndex = GadgetListBoxAddEntryText(gameListbox, txtGName, (gameList->isGameInProgress())?gameInProgressColor:gameColor, -1, -1);
-			GadgetListBoxSetItemData(gameListbox, (void *)gameList, addedIndex, 0 );
-
-			if (selectedPtr == gameList)
-				indexToSelect = addedIndex;
-
-			gameList = gameList->getNext();
-		}
-
-		if (indexToSelect >= 0)
-			GadgetListBoxSetSelected(gameListbox, indexToSelect);
-		else
-			HideGameInfoWindow(TRUE);
-	}
-}
-
-AsciiString GenerateGameOptionsString( void )
-{
-	if(!TheLAN->GetMyGame() || !TheLAN->GetMyGame()->amIHost())
-		return AsciiString::TheEmptyString;
-
-	return GameInfoToAsciiString(TheLAN->GetMyGame());
-}
-
-Bool ParseGameOptionsString(LANGameInfo *game, AsciiString options)
-{
-	if (!TheLAN || !game)
-		return false;
-
-	Int oldLocalSlotNum = (game->isInGame()) ? game->getLocalSlotNum() : -1;
-	Bool wasInGame = oldLocalSlotNum >= 0;
-//	Int hadMap = wasInGame && game->getSlot(oldLocalSlotNum)->hasMap();
-	AsciiString oldMap = game->getMap();
-	UnsignedInt oldMapCRC, newMapCRC;
-	oldMapCRC = game->getMapCRC();
-
-	std::map<UnicodeString, UnicodeString> oldLogins, oldMachines;
-	std::map<UnicodeString, UnicodeString>::iterator mapIt;
-	Int i;
-	for (i=0; i<MAX_SLOTS; ++i)
-	{
-		LANGameSlot *slot = game->getLANSlot(i);
-		if (slot && slot->isHuman())
-		{
-			//DEBUG_LOG(("Saving off %ls@%ls for %ls\n", slot->getUser()->getLogin().str(), slot->getUser()->getHost().str(), slot->getName().str()));
-			oldLogins[slot->getName()] = slot->getUser()->getLogin();
-			oldMachines[slot->getName()] = slot->getUser()->getHost();
-		}
-	}
-
-	if (ParseAsciiStringToGameInfo(game, options))
-	{
-		Int newLocalSlotNum = (game->isInGame()) ? game->getLocalSlotNum() : -1;
-		Bool isInGame = newLocalSlotNum >= 0;
-		if (!TheLAN->AmIHost() && isInGame)
-		{
-//			Int hasMap = game->getSlot(newLocalSlotNum)->hasMap();
-			newMapCRC = game->getMapCRC();
-			//DEBUG_LOG(("wasInGame:%d isInGame:%d hadMap:%d hasMap:%d oldMap:%s newMap:%s\n", wasInGame, isInGame, hadMap, hasMap, oldMap.str(), game->getMap().str()));
-			if ( (oldMapCRC ^ newMapCRC)/*(hasMap ^ hadMap)*/ || (!wasInGame && isInGame) )
-			{
-				// it changed.  send it
-				TheLAN->RequestHasMap();
-				lanUpdateSlotList();
-				updateGameOptions();
-			}
-		}
-		// clean up LAN users, etc.
-		UnsignedInt now = timeGetTime();
-		for (i=0; i<MAX_SLOTS; ++i)
-		{
-			LANGameSlot *slot = game->getLANSlot(i);
-
-			if (slot->isHuman())
-			{
-				slot->setLastHeard(now);
-				mapIt = oldLogins.find(slot->getName());
-				if (mapIt != oldLogins.end())
-					slot->setLogin(mapIt->second);
-				mapIt = oldMachines.find(slot->getName());
-				if (mapIt != oldMachines.end())
-					slot->setHost(mapIt->second);
-				//DEBUG_LOG(("Restored %ls@%ls for %ls\n", slot->getUser()->getLogin().str(), slot->getUser()->getHost().str(), slot->getName().str()));
-			}
-		}
-
-		return true;
-	}
-
-	return false;
-}
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NAT.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NAT.cpp
deleted file mode 100644
index 1fb6ae2abc9..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NAT.cpp
+++ /dev/null
@@ -1,1328 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: NAT.cpp /////////////////////////////////////////////////////////////////////////////////
-// Author: Bryan Cleveland April 2002
-// Props to Steve Tall for figuring all the NAT and Firewall behavior patterns out, making my job
-// a LOT easier.
-// Desc:   Resolves NAT'd IPs and port numbers for the other players in a game.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/NAT.h"
-#include "GameNetwork/Transport.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "GameClient/EstablishConnectionsMenu.h"
-#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/GameInfo.h"
-#include "GameNetwork/GameSpy/PeerThread.h"
-#include "GameNetwork/GameSpy/PeerDefs.h"
-#include "GameNetwork/GameSpy/PersistentStorageThread.h"
-#include "GameNetwork/GameSpy/GSConfig.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-/*
- * In case you're wondering, we do this weird connection pairing scheme
- * to speed up the negotiation process, especially in cases where there
- * are 4 or more players (nodes).  Take for example an 8 player game...
- * In an 8 player game there are 28 connections that need to be negotiated,
- * doing this pairing scheme thing, we can make those 28 connections in the
- * time it would normally take to make 7 connections.  Since each connection
- * could potentially take several seconds, this can be a HUGE time savings.
-
- * Right now you're probably wondering who this Bryan Cleveland guy is.
- * He's the network coder that got fired when this didn't work.
-
- * In case you're wondering, this did end up working and Bryan left by
- * his own choice.
- */
-//										m_connectionPairs[num nodes]	[round]			 [node index]
-/* static */ Int NAT::m_connectionPairs[MAX_SLOTS-1][MAX_SLOTS-1][MAX_SLOTS] = 
-{
-	{	// 2 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			1,			0,			-1,			-1,			-1,			-1,			-1,			-1},	// round 0
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 1
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 2
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 3
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 4
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
-	},
-	{	// 3 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			1,			0,			-1,			-1,			-1,			-1,			-1,			-1},	// round 0
-		{			2,			-1,			0,			-1,			-1,			-1,			-1,			-1},	// round 1
-		{			-1,			2,			1,			-1,			-1,			-1,			-1,			-1},	// round 2
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 3
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 4
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
-	},
-	{	// 4 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			1,			0,			3,			2,			-1,			-1,			-1,			-1},	// round 0
-		{			2,			3,			0,			1,			-1,			-1,			-1,			-1},	// round 1
-		{			3,			2,			1,			0,			-1,			-1,			-1,			-1},	// round 2
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 3
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 4
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
-	},
-	{	// 5 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			2,			4,			0,			-1,			1,			-1,			-1,			-1},	// round 0
-		{			-1,			3,			4,			1,			2,			-1,			-1,			-1},	// round 1
-		{			3,			2,			1,			0,			-1,			-1,			-1,			-1},	// round 2
-		{			4,			-1,			3,			2,			0,			-1,			-1,			-1},	// round 3
-		{			1,			0,			-1,			4,			3,			-1,			-1,			-1},	// round 4
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
-	},
-	{	// 6 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			3,			5,			4,			0,			2,			1,			-1,			-1},	// round 0
-		{			2,			4,			0,			5,			1,			3,			-1,			-1},	// round 1
-		{			4,			3,			5,			1,			0,			2,			-1,			-1},	// round 2
-		{			1,			0,			3,			2,			5,			4,			-1,			-1},	// round 3
-		{			5,			2,			1,			4,			3,			0,			-1,			-1},	// round 4
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1},	// round 5
-		{			-1,			-1,			-1,			-1,			-1,			-1,			-1,			-1}		// round 6
-	},
-	{	// 7 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			-1,			6,			5,			4,			3,			2,			1,			-1},	// round 0
-		{			2,			-1,			0,			6,			5,			4,			3,			-1},	// round 1
-		{			4,			3,			-1,			1,			0,			6,			5,			-1},	// round 2
-		{			6,			5,			4,			-1,			2,			1,			0,			-1},	// round 3
-		{			1,			0,			6,			5,			-1,			3,			2,			-1},	// round 4
-		{			3,			2,			1,			0,			6,			-1,			4,			-1},	// round 5
-		{			5,			4,			3,			2,			1,			0,			-1,			-1}		// round 6
-	},
-	{	// 8 nodes
-		//	node 0	node 1	node 2	node 3	node 4	node 5	node 6	node 7
-		{			4,			5,			6,			7,			0,			1,			2,			3},		// round 0
-		{			5,			4,			7,			6,			1,			0,			3,			2},		// round 1
-		{			3,			6,			5,			0,			7,			2,			1,			4},		// round 2
-		{			2,			7,			0,			5,			6,			3,			4,			1},		// round 3
-		{			6,			3,			4,			1,			2,			7,			0,			5},		// round 4
-		{			1,			0,			3,			2,			5,			4,			7,			6},		// round 5
-		{			7,			2,			1,			4,			3,			6,			5,			0}		// round 6
-	}
-};
-
-/* static */ Int NAT::m_timeBetweenRetries = 500; // .5 seconds between retries sounds good to me.
-/* static */ time_t NAT::m_manglerRetryTimeInterval = 300; // sounds good to me.
-/* static */ Int NAT::m_maxAllowedManglerRetries = 25; // works for me.
-/* static */ time_t NAT::m_keepaliveInterval = 15000; // 15 seconds between keepalive packets seems good.
-/* static */ time_t NAT::m_timeToWaitForPort = 15000; // wait for 15 seconds for the other player's port number.
-/* static */ time_t NAT::m_timeForRoundTimeout = 15000; // wait for at most 15 seconds for each connection round to finish.
-
-NAT *TheNAT = NULL;
-
-NAT::NAT() 
-{
-	//Added By Sadullah Nader
-	//Initializations inserted
-	m_beenProbed = FALSE;
-	m_connectionPairIndex = 0;
-	m_connectionRound = 0;
-	m_localIP = 0;
-	m_localNodeNumber = 0;
-	m_manglerAddress = 0;
-	m_manglerRetries = 0;
-	m_numNodes = 0;
-	m_numRetries = 0;
-	m_previousSourcePort = 0;
-	for(Int i = 0; i < MAX_SLOTS; i++)
-		m_sourcePorts[i] = 0;
-	m_spareSocketPort = 0;
-	m_startingPortNumber = 0;
-	m_targetNodeNumber = 0;
-	//
-	m_transport = NULL;
-	m_slotList = NULL;
-	m_roundTimeout = 0;
-
-	m_maxNumRetriesAllowed = 10;
-	m_packetID = 0x7f00;
-}
-
-NAT::~NAT() {
-}
-
-// if we're already finished, change to being idle
-// if we are negotiating now, check to see if this round is done
-// if it is, check to see if we're completely done with all rounds.
-// if we are, set state to be done.
-// if not go on to the next connection round.
-// if we are negotiating still, call the connection update
-// check to see if this connection is done for us, or if it has failed.
-enum { MS_TO_WAIT_FOR_STATS = 5000 };
-NATStateType NAT::update() {
-	static UnsignedInt s_startStatWaitTime = 0;
-	if (m_NATState == NATSTATE_DONE) {
-		m_NATState = NATSTATE_IDLE;
-	} else if (m_NATState == NATSTATE_WAITFORSTATS) {
-		// check for all stats
-		Bool gotAllStats = TRUE;
-		Bool timedOut = FALSE;
-		for (Int i=0; i<MAX_SLOTS; ++i)
-		{
-			const GameSpyGameSlot *slot = TheGameSpyGame->getGameSpySlot(i);
-			if (slot && slot->isHuman())
-			{
-				PSPlayerStats stats = TheGameSpyPSMessageQueue->findPlayerStatsByID(slot->getProfileID());
-				if (stats.id == 0)
-				{
-					gotAllStats = FALSE;
-					//DEBUG_LOG(("Failed to find stats for %ls(%d)\n", slot->getName().str(), slot->getProfileID()));
-				}
-			}
-		}
-		// check for timeout.  Timing out is not a fatal error - it just means we didn't get the other
-		// player's stats.  We'll see 0/0 as his record, but we can still play him just fine.
-		UnsignedInt now = timeGetTime();
-		if (now > s_startStatWaitTime + MS_TO_WAIT_FOR_STATS)
-		{
-			DEBUG_LOG(("Timed out waiting for stats.  Let's just start the dang game.\n"));
-			timedOut = TRUE;
-		}
-		if (gotAllStats || timedOut)
-		{
-			m_NATState = NATSTATE_DONE;
-			TheEstablishConnectionsMenu->endMenu();
-			if (TheFirewallHelper != NULL) {
-				delete TheFirewallHelper;
-				TheFirewallHelper = NULL;
-			}
-		}
-	} else if (m_NATState == NATSTATE_DOCONNECTIONPATHS) {
-		if (allConnectionsDoneThisRound() == TRUE) {
-			// we finished this round, move on to the next one.
-			++m_connectionRound;
-//			m_roundTimeout = timeGetTime() + TheGameSpyConfig->getRoundTimeout();
-			m_roundTimeout = timeGetTime() + m_timeForRoundTimeout;
-			DEBUG_LOG(("NAT::update - done with connection round, moving on to round %d\n", m_connectionRound));
-
-			// we finished that round, now check to see if we're done, or if there are more rounds to go.
-			if (allConnectionsDone() == TRUE) {
-				// we're all done, time to go back home.
-				m_NATState = NATSTATE_WAITFORSTATS;
-
-				// 2/19/03 BGC - we have successfully negotaited a NAT thingy, so our behavior must be correct
-				// so therefore we don't need to refresh our NAT even if we previously thought we had to.
-				TheFirewallHelper->flagNeedToRefresh(FALSE);
-
-				s_startStatWaitTime = timeGetTime();
-				DEBUG_LOG(("NAT::update - done with all connections, woohoo!!\n"));
-				/*
-				m_NATState = NATSTATE_DONE;
-				TheEstablishConnectionsMenu->endMenu();
-				if (TheFirewallHelper != NULL) {
-					delete TheFirewallHelper;
-					TheFirewallHelper = NULL;
-				}
-				*/
-			} else {
-				doThisConnectionRound();
-			}
-		}
-		NATConnectionState state = connectionUpdate();
-
-		if (timeGetTime() > m_roundTimeout) {
-			DEBUG_LOG(("NAT::update - round timeout expired\n"));
-			setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-			notifyUsersOfConnectionFailed(m_localNodeNumber);
-		}
-
-		if (state == NATCONNECTIONSTATE_FAILED) {
-			// if we fail
-			m_NATState = NATSTATE_FAILED;
-			TheEstablishConnectionsMenu->endMenu();
-			if (TheFirewallHelper != NULL) {
-				// we failed NAT negotiation, perhaps we need to redetect our firewall settings.
-				// We don't trust the user to do it for themselves so we force them to do it next time
-				// the log in.
-				// 2/19/03 - ok, we don't want to do this right away, if the user tries to play in another game
-				// before they log out and log back in the game won't have a chance at working.
-				// so we need to simply flag it so that when they log out the firewall behavior gets blown away.
-				TheFirewallHelper->flagNeedToRefresh(TRUE);
-//				TheWritableGlobalData->m_firewallBehavior = FirewallHelperClass::FIREWALL_TYPE_UNKNOWN;
-//				TheFirewallHelper->writeFirewallBehavior();
-
-				delete TheFirewallHelper;
-				TheFirewallHelper = NULL;
-			}
-			// we failed to connect, so we don't have to pass on the transport to the network.
-			if (m_transport != NULL) {
-				delete m_transport;
-				m_transport = NULL;
-			}
-		}
-	}
-	return m_NATState;
-}
-
-
-// update transport, check for PROBE packets from our target.
-// check to see if its time to PROBE our target
-// MANGLER:
-// if we are talking to the mangler, check to see if we got a response
-// if we didn't get a response, check to see if its time to send another packet to it
-NATConnectionState NAT::connectionUpdate() {
-
-	GameSlot *targetSlot = NULL;
-	if (m_targetNodeNumber >= 0) {
-		targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
-	} else {
-		return m_connectionStates[m_localNodeNumber];
-	}
-
-	if (m_beenProbed == FALSE) {
-		if (timeGetTime() >= m_nextPortSendTime) {
-//			sendMangledPortNumberToTarget(m_previousSourcePort, targetSlot);
-			sendMangledPortNumberToTarget(m_sourcePorts[m_targetNodeNumber], targetSlot);
-//			m_nextPortSendTime = timeGetTime() + TheGameSpyConfig->getRetryInterval();
-			m_nextPortSendTime = timeGetTime() + m_timeBetweenRetries;
-		}
-	}
-
-	// check to see if its time to send out our keepalives.
-	if (timeGetTime() >= m_nextKeepaliveTime) {
-		for (UnsignedInt node = 0; node < m_numNodes; ++node) {
-			if (m_myConnections[node] == TRUE) {
-				// we've made this connection, send a keepalive.
-				Int slotIndex = m_connectionNodes[node].m_slotIndex;
-				GameSlot *slot = m_slotList[slotIndex];
-				DEBUG_ASSERTCRASH(slot != NULL, ("Trying to send keepalive to a NULL slot"));
-				if (slot != NULL) {
-					UnsignedInt ip = slot->getIP();
-					DEBUG_LOG(("NAT::connectionUpdate - sending keep alive to node %d at %d.%d.%d.%d:%d\n", node,
-											PRINTF_IP_AS_4_INTS(ip), slot->getPort()));
-					m_transport->queueSend(ip, slot->getPort(), (const unsigned char *)"KEEPALIVE", strlen("KEEPALIVE") + 1);
-				}
-			}
-		}
-//		m_nextKeepaliveTime = timeGetTime() + TheGameSpyConfig->getKeepaliveInterval();
-		m_nextKeepaliveTime = timeGetTime() + m_keepaliveInterval;
-	}
-
-	m_transport->update();
-
-	// check to see if we've been probed.
-	for (Int i = 0; i < MAX_MESSAGES; ++i) {
-		if (m_transport->m_inBuffer[i].length > 0) {
-#ifdef DEBUG_LOGGING
-			UnsignedInt ip = m_transport->m_inBuffer[i].addr;
-#endif
-			DEBUG_LOG(("NAT::connectionUpdate - got a packet from %d.%d.%d.%d:%d, length = %d\n",
-									PRINTF_IP_AS_4_INTS(ip), m_transport->m_inBuffer[i].port, m_transport->m_inBuffer[i].length));
-			UnsignedByte *data = m_transport->m_inBuffer[i].data;
-			if (memcmp(data, "PROBE", strlen("PROBE")) == 0) {
-				Int fromNode = atoi((char *)data + strlen("PROBE"));
-				DEBUG_LOG(("NAT::connectionUpdate - we've been probed by node %d.\n", fromNode));
-
-				if (fromNode == m_targetNodeNumber) {
-					DEBUG_LOG(("NAT::connectionUpdate - probe was sent by our target, setting connection state %d to done.\n", m_targetNodeNumber));
-					setConnectionState(m_targetNodeNumber, NATCONNECTIONSTATE_DONE);
-
-					if (m_transport->m_inBuffer[i].addr != targetSlot->getIP()) {
-						UnsignedInt fromIP = m_transport->m_inBuffer[i].addr;
-#ifdef DEBUG_LOGGING
-						UnsignedInt slotIP = targetSlot->getIP();
-#endif
-						DEBUG_LOG(("NAT::connectionUpdate - incomming packet has different from address than we expected, incoming: %d.%d.%d.%d expected: %d.%d.%d.%d\n",
-												PRINTF_IP_AS_4_INTS(fromIP),
-												PRINTF_IP_AS_4_INTS(slotIP)));
-						targetSlot->setIP(fromIP);
-					}
-					if (m_transport->m_inBuffer[i].port != targetSlot->getPort()) {
-						DEBUG_LOG(("NAT::connectionUpdate - incoming packet came from a different port than we expected, incoming: %d expected: %d\n",
-												m_transport->m_inBuffer[i].port, targetSlot->getPort()));
-						targetSlot->setPort(m_transport->m_inBuffer[i].port);
-						m_sourcePorts[m_targetNodeNumber] = m_transport->m_inBuffer[i].port;
-					}
-					notifyUsersOfConnectionDone(m_targetNodeNumber);
-				}
-
-				m_transport->m_inBuffer[i].length = 0;
-			}
-			if (memcmp(data, "KEEPALIVE", strlen("KEEPALIVE")) == 0) {
-				// keep alive packet, just toss it.
-				DEBUG_LOG(("NAT::connectionUpdate - got keepalive from %d.%d.%d.%d:%d\n",
-										PRINTF_IP_AS_4_INTS(ip), m_transport->m_inBuffer[i].port));
-				m_transport->m_inBuffer[i].length = 0;
-			}
-		}
-	}
-
-	// we are waiting for our target to tell us that they have received our probe.
-	if (m_connectionStates[m_localNodeNumber] == NATCONNECTIONSTATE_WAITINGFORRESPONSE) {
-		// check to see if it's time to probe our target.
-		if ((m_timeTillNextSend != -1) && (m_timeTillNextSend <= timeGetTime())) {
-			if (m_numRetries > m_maxNumRetriesAllowed) {
-				DEBUG_LOG(("NAT::connectionUpdate - too many retries, connection failed.\n"));
-				setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-
-				notifyUsersOfConnectionFailed(m_localNodeNumber);
-			} else {
-				DEBUG_LOG(("NAT::connectionUpdate - trying to send another probe (#%d) to our target\n", m_numRetries+1));
-				// Send a probe.
-				sendAProbe(targetSlot->getIP(), targetSlot->getPort(), m_localNodeNumber);
-//				m_timeTillNextSend = timeGetTime() + TheGameSpyConfig->getRetryInterval();
-				m_timeTillNextSend = timeGetTime() + m_timeBetweenRetries;
-
-				// tell the target they've been probed. In other words, our port is open.
-				notifyTargetOfProbe(targetSlot);
-
-				++m_numRetries;
-			}
-		}
-	}
-
-	// we are waiting for a response from the mangler to tell us what port we're using.
-	if (m_connectionStates[m_localNodeNumber] == NATCONNECTIONSTATE_WAITINGFORMANGLERRESPONSE) {
-		UnsignedShort mangledPort = 0;
-		if (TheFirewallHelper != NULL) {
-			mangledPort = TheFirewallHelper->getManglerResponse(m_packetID);
-		}
-		if (mangledPort != 0) {
-			// we got a response.  now we need to start probing (unless of course we have a netgear)
-			processManglerResponse(mangledPort);
-
-			// we know there is a firewall helper if we got here.
-			TheFirewallHelper->closeSpareSocket(m_spareSocketPort);
-			m_spareSocketPort = 0;
-		} else {
-			if (timeGetTime() >= m_manglerRetryTime) {
-				++m_manglerRetries;
-//				if (m_manglerRetries > TheGameSpyConfig->getMaxManglerRetries()) {
-				if (m_manglerRetries > m_maxAllowedManglerRetries) {
-					// we couldn't communicate with the mangler, just use our non-mangled
-					// port number and hope that works.
-					DEBUG_LOG(("NAT::connectionUpdate - couldn't talk with the mangler using default port number\n"));
-					sendMangledPortNumberToTarget(getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex), targetSlot);
-					m_sourcePorts[m_targetNodeNumber] = getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex);
-					setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
-				} else {
-					if (TheFirewallHelper != NULL) {
-						DEBUG_LOG(("NAT::connectionUpdate - trying to send to the mangler again. mangler address: %d.%d.%d.%d, from port: %d, packet ID:%d\n",
-							PRINTF_IP_AS_4_INTS(m_manglerAddress), m_spareSocketPort, m_packetID));
-						TheFirewallHelper->sendToManglerFromPort(m_manglerAddress, m_spareSocketPort, m_packetID);
-					}
-//					m_manglerRetryTime = TheGameSpyConfig->getRetryInterval() + timeGetTime();
-					m_manglerRetryTime = m_manglerRetryTimeInterval + timeGetTime();
-				}
-			}
-		}
-	}
-
-	if (m_connectionStates[m_localNodeNumber] == NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT) {
-		if (timeGetTime() > m_timeoutTime) {
-			DEBUG_LOG(("NAT::connectionUpdate - waiting too long to get the other player's port number, failed.\n"));
-			setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-
-			notifyUsersOfConnectionFailed(m_localNodeNumber);
-		}
-	}
-
-	return m_connectionStates[m_localNodeNumber];
-}
-
-// this is the function that starts the NAT/firewall negotiation process.
-// after calling this, you should call the update function untill it returns
-// NATSTATE_DONE.
-void NAT::establishConnectionPaths() {
-	DEBUG_LOG(("NAT::establishConnectionPaths - entering\n"));
-	m_NATState = NATSTATE_DOCONNECTIONPATHS;
-	DEBUG_LOG(("NAT::establishConnectionPaths - using %d as our starting port number\n", m_startingPortNumber));
-	if (TheEstablishConnectionsMenu == NULL) {
-		TheEstablishConnectionsMenu = NEW EstablishConnectionsMenu;
-	}
-	TheEstablishConnectionsMenu->initMenu();
-
-	if (TheFirewallHelper == NULL) {
-		TheFirewallHelper = createFirewallHelper();
-	}
-
-	DEBUG_ASSERTCRASH(m_slotList != NULL, ("NAT::establishConnectionPaths - don't have a slot list"));
-	if (m_slotList == NULL) {
-		return;
-	}
-
-	// determine how many nodes we have.
-	m_numNodes = 0;
-	Int i = 0;
-	for (; i < MAX_SLOTS; ++i) {
-		if (m_slotList[i] != NULL) {
-			if (m_slotList[i]->isHuman()) {
-				DEBUG_LOG(("NAT::establishConnectionPaths - slot %d is %ls\n", i, m_slotList[i]->getName().str()));
-				++m_numNodes;
-			}
-		}
-	}
-	DEBUG_LOG(("NAT::establishConnectionPaths - number of nodes: %d\n", m_numNodes));
-
-	if (m_numNodes < 2)
-	{
-		// just start the game - there isn't anybody to which to connect. :P
-		m_NATState = NATSTATE_DONE;
-		return;
-	}
-	
-	m_connectionRound = 0;
-	m_connectionPairIndex = m_numNodes - 2;
-	Bool connectionAssigned[MAX_SLOTS];
-
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		m_connectionNodes[i].m_slotIndex = -1;
-		connectionAssigned[i] = FALSE;
-		m_sourcePorts[i] = 0;
-	}
-
-	m_previousSourcePort = 0;
-
-// check for netgear bug behavior.
-// as an aside, if there are more than 2 netgear bug firewall's in the game,
-// it probably isn't going to work so well.  stupid netgear.
-
-// nodes with a netgear bug behavior need to be matched up first. This prevents
-// the NAT table from being reset for connections to other nodes.  This also happens
-// to be the reason why I call them "nodes" rather than "slots" or "players" as the
-// ordering has to be messed with to get the netgears to make love, not war.
-	DEBUG_LOG(("NAT::establishConnectionPaths - about to set up the node list\n"));
-	DEBUG_LOG(("NAT::establishConnectionPaths - doing the netgear stuff\n"));
-	UnsignedInt otherNetgearNum = -1;
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		if ((m_slotList != NULL) && (m_slotList[i] != NULL)) {
-			if ((m_slotList[i]->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0) {
-				if (otherNetgearNum == -1) {
-					// this is the start of a new pair, put it in as the first non -1 node connection pair thing.
-					Int nodeindex = 0;
-					while ((m_connectionPairs[m_connectionPairIndex][0][nodeindex] == -1) || (m_connectionNodes[nodeindex].m_slotIndex != -1)) {
-						++nodeindex;
-					}
-					m_connectionNodes[nodeindex].m_slotIndex = i;
-					m_connectionNodes[nodeindex].m_behavior = m_slotList[i]->getNATBehavior();
-					connectionAssigned[i] = TRUE;
-					otherNetgearNum = nodeindex;
-					DEBUG_LOG(("NAT::establishConnectionPaths - first netgear in pair. assigning node %d to slot %d (%ls)\n", nodeindex, i, m_slotList[i]->getName().str()));
-				} else {
-					// this is the second in the pair of netgears, pair this up with the other one
-					// for the first round.
-					Int nodeindex = 0;
-					while (m_connectionPairs[m_connectionPairIndex][0][nodeindex] != otherNetgearNum) {
-						++nodeindex;
-					}
-					m_connectionNodes[nodeindex].m_slotIndex = i;
-					m_connectionNodes[nodeindex].m_behavior = m_slotList[i]->getNATBehavior();
-					connectionAssigned[i] = TRUE;
-					otherNetgearNum = -1;
-					DEBUG_LOG(("NAT::establishConnectionPaths - second netgear in pair. assigning node %d to slot %d (%ls)\n", nodeindex, i, m_slotList[i]->getName().str()));
-				}
-			}
-		}
-	}
-
-	// fill in the rest of the nodes with the remaining slots.
-	DEBUG_LOG(("NAT::establishConnectionPaths - doing the non-Netgear nodes\n"));
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		if (connectionAssigned[i] == TRUE) {
-			continue;
-		}
-		if (m_slotList[i] == NULL) {
-			continue;
-		}
-		if (!(m_slotList[i]->isHuman())) {
-			continue;
-		}
-		// find the first available connection node for this slot.
-		Int nodeindex = 0;
-		while (m_connectionNodes[nodeindex].m_slotIndex != -1) {
-			++nodeindex;
-		}
-		DEBUG_LOG(("NAT::establishConnectionPaths - assigning node %d to slot %d (%ls)\n", nodeindex, i, m_slotList[i]->getName().str()));
-		m_connectionNodes[nodeindex].m_slotIndex = i;
-		m_connectionNodes[nodeindex].m_behavior = m_slotList[i]->getNATBehavior();
-		connectionAssigned[i] = TRUE;
-	}
-
-// sanity check
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	for (i = 0; i < m_numNodes; ++i) {
-		DEBUG_ASSERTCRASH(connectionAssigned[i] == TRUE, ("connection number %d not assigned", i));
-	}
-#endif
-
-	// find the local node number.
-	for (i = 0; i < m_numNodes; ++i) {
-		if (m_connectionNodes[i].m_slotIndex == TheGameSpyGame->getLocalSlotNum()) {
-			m_localNodeNumber = i;
-			DEBUG_LOG(("NAT::establishConnectionPaths - local node is %d\n", m_localNodeNumber));
-			break;
-		}
-	}
-
-	// set up the names in the connection window.
-	Int playerNum = 0;
-	for (i = 0; i < MAX_SLOTS; ++i) {
-		while ((i < MAX_SLOTS) && (m_slotList[i] != NULL) && !(m_slotList[i]->isHuman())) {
-			++i;
-		}
-		if (i >= MAX_SLOTS) {
-			break;
-		}
-		if (i != TheGameSpyGame->getLocalSlotNum()) {
-			TheEstablishConnectionsMenu->setPlayerName(playerNum, m_slotList[i]->getName());
-			TheEstablishConnectionsMenu->setPlayerStatus(playerNum, NATCONNECTIONSTATE_WAITINGTOBEGIN);
-			++playerNum;
-		}	
-	}
-
-//	m_roundTimeout = timeGetTime() + TheGameSpyConfig->getRoundTimeout();
-	m_roundTimeout = timeGetTime() + m_timeForRoundTimeout;
-
-	// make the connections for this round.
-	// this song is cool.
-	doThisConnectionRound();
-}
-
-void NAT::attachSlotList(GameSlot *slotList[], Int localSlot, UnsignedInt localIP) {
-	m_slotList = slotList;
-	m_localIP = localIP;
-	m_transport = new Transport;
-	DEBUG_LOG(("NAT::attachSlotList - initting the transport socket with address %d.%d.%d.%d:%d\n",
-							PRINTF_IP_AS_4_INTS(m_localIP), getSlotPort(localSlot)));
-
-	m_startingPortNumber = NETWORK_BASE_PORT_NUMBER + ((timeGetTime() / 1000) % 20000);
-	DEBUG_LOG(("NAT::attachSlotList - using %d as the starting port number\n", m_startingPortNumber));
-	generatePortNumbers(slotList, localSlot);
-	m_transport->init(m_localIP, getSlotPort(localSlot));
-}
-
-Int NAT::getSlotPort(Int slot) {
-//	return (slot + m_startingPortNumber);
-	if (m_slotList[slot] != NULL) {
-		return m_slotList[slot]->getPort();
-	}
-	return 0;
-}
-
-void NAT::generatePortNumbers(GameSlot *slotList[], Int localSlot) {
-	for (UnsignedInt i = 0; i < (UnsignedInt)MAX_SLOTS; ++i) {
-		if (slotList[i] != NULL) {
-			if ((i == localSlot) && (TheWritableGlobalData->m_firewallPortOverride != 0)) {
-				slotList[i]->setPort(TheWritableGlobalData->m_firewallPortOverride);
-			} else {
-				slotList[i]->setPort(i + m_startingPortNumber);
-			}
-		}
-	}
-}
-
-Transport * NAT::getTransport() {
-	return m_transport;
-}
-
-// figure out which port I'll be using.
-// send the port number to our target for this round.
-// init the m_connectionStates for all players.
-void NAT::doThisConnectionRound() {
-	DEBUG_LOG(("NAT::doThisConnectionRound - starting process for connection round %d\n", m_connectionRound));
-	// clear out the states from the last round.
-	m_targetNodeNumber = -1;
-
-	Int i = 0;
-	for (; i < MAX_SLOTS; ++i) {
-		setConnectionState(i, NATCONNECTIONSTATE_NOSTATE);
-	}
-
-	m_beenProbed = FALSE;
-	m_numRetries = 0;
-
-	for (i = 0; i < m_numNodes; ++i) {
-		Int targetNodeNumber = m_connectionPairs[m_connectionPairIndex][m_connectionRound][i];
-		DEBUG_LOG(("NAT::doThisConnectionRound - node %d needs to connect to node %d\n", i, targetNodeNumber));
-		if (targetNodeNumber != -1) {
-			if (i == m_localNodeNumber) {
-				m_targetNodeNumber = targetNodeNumber;
-				DEBUG_LOG(("NAT::doThisConnectionRound - Local node is connecting to node %d\n", m_targetNodeNumber));
-				UnsignedInt targetSlotIndex = m_connectionNodes[(m_connectionPairs[m_connectionPairIndex][m_connectionRound][i])].m_slotIndex;
-				GameSlot *targetSlot = m_slotList[targetSlotIndex];
-				GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-
-				DEBUG_ASSERTCRASH(localSlot != NULL, ("local slot is NULL"));
-				DEBUG_ASSERTCRASH(targetSlot != NULL, ("trying to negotiate with a NULL target slot, slot is %d", m_connectionPairs[m_connectionPairIndex][m_connectionRound][i]));
-				DEBUG_LOG(("NAT::doThisConnectionRound - Target slot index = %d (%ls)\n", targetSlotIndex, m_slotList[targetSlotIndex]->getName().str()));
-				DEBUG_LOG(("NAT::doThisConnectionRound - Target slot has NAT behavior 0x%8X, local slot has NAT behavior 0x%8X\n", targetSlot->getNATBehavior(), localSlot->getNATBehavior()));
-				
-#if defined(DEBUG_LOGGING)
-				UnsignedInt targetIP = targetSlot->getIP();
-				UnsignedInt localIP = localSlot->getIP();
-#endif
-				
-				DEBUG_LOG(("NAT::doThisConnectionRound - Target slot has IP %d.%d.%d.%d  Local slot has IP %d.%d.%d.%d\n",
-							PRINTF_IP_AS_4_INTS(targetIP),
-							PRINTF_IP_AS_4_INTS(localIP)));
-
-				if (((targetSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) == 0) &&
-						((localSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0)) {
-
-					// we have a netgear bug type behavior and the target does not, so we need them to send to us
-					// first to avoid having our NAT table reset.
-
-					DEBUG_LOG(("NAT::doThisConnectionRound - Local node has a netgear and the target node does not, need to delay our probe.\n"));
-					m_timeTillNextSend = -1;
-				}
-
-				// figure out which port number I'm using for this connection
-				// this merely starts to talk to the mangler server, we have to keep calling
-				// the update function till we get a response.
-				DEBUG_LOG(("NAT::doThisConnectionRound - About to attempt to get the next mangled source port\n"));
-				sendMangledSourcePort();
-//				m_nextPortSendTime = timeGetTime() + TheGameSpyConfig->getRetryInterval();
-				m_nextPortSendTime = timeGetTime() + m_timeBetweenRetries;
-//				m_timeoutTime = timeGetTime() + TheGameSpyConfig->getPortTimeout();
-				m_timeoutTime = timeGetTime() + m_timeToWaitForPort;
-			} else {
-				// this is someone else that needs to connect to someone, so wait till they tell us
-				// that they're done.
-				setConnectionState(i, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
-			}
-		} else {
-			// no one to connect to, so this one is done.
-			DEBUG_LOG(("NAT::doThisConnectionRound - node %d has no one to connect to, so they're done\n", i));
-			setConnectionState(i, NATCONNECTIONSTATE_DONE);
-		}
-	}
-}
-
-void NAT::sendAProbe(UnsignedInt ip, UnsignedShort port, Int fromNode) {
-	DEBUG_LOG(("NAT::sendAProbe - sending a probe from port %d to %d.%d.%d.%d:%d\n", getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex),
-							PRINTF_IP_AS_4_INTS(ip), port));
-	AsciiString str;
-	str.format("PROBE%d", fromNode);
-	m_transport->queueSend(ip, port, (unsigned char *)str.str(), str.getLength() + 1);
-	m_transport->doSend();
-}
-
-// find the next mangled source port, and then send it to the other player.
-// if this requires talking to the mangler, we'll have to wait till a later update
-// to send our port out.
-void NAT::sendMangledSourcePort() {
-	UnsignedShort sourcePort = getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex);
-
-	FirewallHelperClass::tFirewallBehaviorType fwType = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex]->getNATBehavior();
-	GameSlot *targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::sendMangledSourcePort - targetSlot is NULL"));
-	if (targetSlot == NULL) {
-		DEBUG_LOG(("NAT::sendMangledSourcePort - targetSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::sendMangledSourcePort - localSlot is NULL, WTF?"));
-	if (localSlot == NULL) {
-		DEBUG_LOG(("NAT::sendMangledSourcePort - localSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	// check to see if the target and I are behind the same NAT
-	if (targetSlot->getIP() == localSlot->getIP()) {
-#if defined(DEBUG_LOGGING)
-		UnsignedInt localip = localSlot->getIP();
-		UnsignedInt targetip = targetSlot->getIP();
-#endif
-		DEBUG_LOG(("NAT::sendMangledSourcePort - target and I are behind the same NAT, no mangling\n"));
-		DEBUG_LOG(("NAT::sendMangledSourcePort - I am %ls, target is %ls, my IP is %d.%d.%d.%d, target IP is %d.%d.%d.%d\n", localSlot->getName().str(), targetSlot->getName().str(),
-								PRINTF_IP_AS_4_INTS(localip),
-								PRINTF_IP_AS_4_INTS(targetip)));
-
-		sendMangledPortNumberToTarget(sourcePort, targetSlot);
-		m_sourcePorts[m_targetNodeNumber] = sourcePort;
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
-		// In case you're wondering, we don't set the m_previousSourcePort here because this will be a different source
-		// address than what other nodes will likely see (unless of course there are more than
-		// two of us behind the same NAT, but we won't worry about that cause theres no mangling
-		// in that case anyways)
-		return;
-	}
-
-	// check to see if we are NAT'd at all.
-	if ((fwType == 0) || (fwType == FirewallHelperClass::FIREWALL_TYPE_SIMPLE)) {
-		// no mangling, just return the source port
-		DEBUG_LOG(("NAT::sendMangledSourcePort - no mangling, just using the source port\n"));
-		sendMangledPortNumberToTarget(sourcePort, targetSlot);
-		m_previousSourcePort = sourcePort;
-		m_sourcePorts[m_targetNodeNumber] = sourcePort;
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
-		return;
-	}
-
-	// check to see if our NAT keeps the same source port for different destinations.
-	// if this is the case, and we've already worked out what our mangled port number is
-	// then we don't have to figure it out again.
-	if (((fwType & FirewallHelperClass::FIREWALL_TYPE_DESTINATION_PORT_DELTA) == 0) &&
-			((fwType & FirewallHelperClass::FIREWALL_TYPE_SMART_MANGLING) == 0)) {
-		DEBUG_LOG(("NAT::sendMangledSourcePort - our firewall doesn't NAT based on destination address, checking for old connections from this address\n"));
-		if (m_previousSourcePort != 0) {
-			DEBUG_LOG(("NAT::sendMangledSourcePort - Previous source port was %d, using that one\n", m_previousSourcePort));
-			sendMangledPortNumberToTarget(m_previousSourcePort, targetSlot);
-			m_sourcePorts[m_targetNodeNumber] = m_previousSourcePort;
-			setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
-			return;
-		} else {
-			DEBUG_LOG(("NAT::sendMangledSourcePort - Previous source port not found\n"));
-		}
-	}
-
-	// At this point we know that our NAT uses some kind of relative port mapping scheme, so we
-	// need to talk to the mangler to find out where we are now so we can find out where we'll be on the
-	// next port allocation.
-
-	// get the address of the mangler we need to talk to.
-	Char manglerName[256];
-	FirewallHelperClass::getManglerName(1, manglerName);
-	DEBUG_LOG(("NAT::sendMangledSourcePort - about to call gethostbyname for mangler at %s\n", manglerName));
-	struct hostent *hostInfo = gethostbyname(manglerName);
-
-	if (hostInfo == NULL) {
-		DEBUG_LOG(("NAT::sendMangledSourcePort - gethostbyname failed for mangler address %s\n", manglerName));
-		// can't find the mangler, we're screwed so just send the source port.
-		sendMangledPortNumberToTarget(sourcePort, targetSlot);
-		m_sourcePorts[m_targetNodeNumber] = sourcePort;
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
-		return;
-	}
-
-	memcpy(&m_manglerAddress, &(hostInfo->h_addr_list[0][0]), 4);
-	m_manglerAddress = ntohl(m_manglerAddress);
-	DEBUG_LOG(("NAT::sendMangledSourcePort - mangler %s address is %d.%d.%d.%d\n", manglerName, 
-							PRINTF_IP_AS_4_INTS(m_manglerAddress)));
-
-	DEBUG_LOG(("NAT::sendMangledSourcePort - NAT behavior = 0x%08x\n", fwType));
-
-//	m_manglerRetryTime = TheGameSpyConfig->getRetryInterval() + timeGetTime();
-	m_manglerRetryTime = m_manglerRetryTimeInterval + timeGetTime();
-	m_manglerRetries = 0;
-
-	if (TheFirewallHelper != NULL) {
-		m_spareSocketPort = TheFirewallHelper->getNextTemporarySourcePort(0);
-		TheFirewallHelper->openSpareSocket(m_spareSocketPort);
-		TheFirewallHelper->sendToManglerFromPort(m_manglerAddress, m_spareSocketPort, m_packetID);
-//		m_manglerRetryTime = TheGameSpyConfig->getRetryInterval() + timeGetTime();
-		m_manglerRetryTime = m_manglerRetryTimeInterval + timeGetTime();
-	}
-
-	setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLERRESPONSE);
-}
-
-void NAT::processManglerResponse(UnsignedShort mangledPort) {
-	DEBUG_LOG(("NAT::processManglerResponse - Work out what my NAT'd port will be\n"));
-
-	GameSlot *targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::processManglerResponse - targetSlot is NULL"));
-	if (targetSlot == NULL) {
-		DEBUG_LOG(("NAT::processManglerResponse - targetSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	Short delta = TheGlobalData->m_firewallPortAllocationDelta;
-	UnsignedShort sourcePort = getSlotPort(m_connectionNodes[m_localNodeNumber].m_slotIndex);
-	UnsignedShort returnPort = 0;
-
-	FirewallHelperClass::tFirewallBehaviorType fwType = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex]->getNATBehavior();
-
-	if ((fwType & FirewallHelperClass::FIREWALL_TYPE_SIMPLE_PORT_ALLOCATION) != 0) {
-		returnPort = mangledPort + delta;
-	} else {
-		// to steal a line from Steve Tall...
-		// Rats. It's a relative mangler. This is much harder. Damn NAT32 guy.
-		if (delta == 100) {
-			// Special NAT32 section.
-			// NAT32 mangles source UDP port by ading 1700 + 100*NAT table index.
-			returnPort = mangledPort - m_spareSocketPort;
-			returnPort -= 1700;
-
-			returnPort += delta;
-			returnPort += sourcePort;
-			returnPort += 1700;
-
-		} else if (delta == 0) {
-			returnPort = sourcePort;
-		} else {
-			returnPort = mangledPort / delta;
-			returnPort = returnPort * delta;
-
-			returnPort += (sourcePort % delta);
-			returnPort += delta;
-		}
-	}
-
-	// This bit is probably doomed.
-	if (returnPort > 65535) {
-		returnPort -= 65535;
-	}
-	if (returnPort < 1024) {
-		returnPort += 1024;
-	}
-
-	DEBUG_LOG(("NAT::processManglerResponse - mangled port is %d\n", returnPort));
-	m_previousSourcePort = returnPort;
-
-	sendMangledPortNumberToTarget(returnPort, targetSlot);
-	m_sourcePorts[m_targetNodeNumber] = returnPort;
-	if (targetSlot->getPort() == 0) {
-		// we haven't got the target's mangled port number yet, wait for it.
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
-	} else {
-		// in this case we should have already sent a PROBE, so we'll just change the state
-		// and leave it at that.
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
-	}
-}
-
-// check to see if we've completed all the rounds
-// this is kind of a cheesy way to check, but it works.
-Bool NAT::allConnectionsDone() {
-	if (m_numNodes == 2) {
-		if (m_connectionRound >= 1) {
-			return TRUE;
-		}
-	} else if (m_numNodes == 3) {
-		if (m_connectionRound >= 3) {
-			return TRUE;
-		}
-	} else if (m_numNodes == 4) {
-		if (m_connectionRound >= 3) {
-			return TRUE;
-		}
-	} else if (m_numNodes == 5) {
-		if (m_connectionRound >= 5) {
-			return TRUE;
-		}
-	} else if (m_numNodes == 6) {
-		if (m_connectionRound >= 5) {
-			return TRUE;
-		}
-	} else if (m_numNodes == 7) {
-		if (m_connectionRound >= 7) {
-			return TRUE;
-		}
-	} else if (m_numNodes == 8) {
-		if (m_connectionRound >= 7) {
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-Bool NAT::allConnectionsDoneThisRound() {
-	Bool retval = TRUE;
-	for (UnsignedInt i = 0; (i < m_numNodes) && (retval == TRUE); ++i) {
-		if ((m_connectionStates[i] != NATCONNECTIONSTATE_DONE) && (m_connectionStates[i] != NATCONNECTIONSTATE_FAILED)) {
-			retval = FALSE;
-		}
-	}
-	return retval;
-}
-
-// this node's connection for this round has been completed.
-void NAT::connectionComplete(Int slotIndex) {
-}
-
-// this node's connection for this round has failed.
-void NAT::connectionFailed(Int slotIndex) {
-}
-
-// I have been probed by the target.
-void NAT::probed(Int nodeNumber) {
-	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::probed - localSlot is NULL, WTF?"));
-	if (localSlot == NULL) {
-		DEBUG_LOG(("NAT::probed - localSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	if (m_beenProbed == FALSE) {
-		m_beenProbed = TRUE;
-		DEBUG_LOG(("NAT::probed - just got probed for the first time.\n"));
-		if ((localSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0) {
-			DEBUG_LOG(("NAT::probed - we have a NETGEAR and we were just probed for the first time\n"));
-			GameSlot *targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
-			DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::probed - targetSlot is NULL"));
-			if (targetSlot == NULL) {
-				DEBUG_LOG(("NAT::probed - targetSlot is NULL, failed this connection\n"));
-				setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-				return;
-			}
-
-			if (targetSlot->getPort() == 0) {
-				setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORMANGLEDPORT);
-				DEBUG_LOG(("NAT::probed - still waiting for mangled port\n"));
-			} else {
-				DEBUG_LOG(("NAT::probed - sending a probe to %ls\n", targetSlot->getName().str()));
-				sendAProbe(targetSlot->getIP(), targetSlot->getPort(), m_localNodeNumber);
-				notifyTargetOfProbe(targetSlot);
-				setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
-			}
-		}
-	}
-}
-
-// got the mangled port for our target for this round.
-void NAT::gotMangledPort(Int nodeNumber, UnsignedShort mangledPort) {
-
-	// if we've already finished the connection, then we don't need to process this.
-	if (m_connectionStates[m_localNodeNumber] == NATCONNECTIONSTATE_DONE) {
-		DEBUG_LOG(("NAT::gotMangledPort - got a mangled port, but we've already finished this connection, ignoring.\n"));
-		return;
-	}
-
-	GameSlot *targetSlot = m_slotList[m_connectionNodes[m_targetNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::gotMangledPort - targetSlot is NULL"));
-	if (targetSlot == NULL) {
-		DEBUG_LOG(("NAT::gotMangledPort - targetSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::gotMangledPort - localSlot is NULL, WTF?"));
-	if (localSlot == NULL) {
-		DEBUG_LOG(("NAT::gotMangledPort - localSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	if (nodeNumber != m_targetNodeNumber) {
-		DEBUG_LOG(("NAT::gotMangledPort - got a mangled port number for someone that isn't my target. node = %d, target node = %d\n", nodeNumber, m_targetNodeNumber));
-		return;
-	}
-
-	targetSlot->setPort(mangledPort);
-	DEBUG_LOG(("NAT::gotMangledPort - got mangled port number %d from our target node (%ls)\n", mangledPort, targetSlot->getName().str()));
-	if (((localSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) == 0) || (m_beenProbed == TRUE) ||
-			(((localSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0) && ((targetSlot->getNATBehavior() & FirewallHelperClass::FIREWALL_TYPE_NETGEAR_BUG) != 0))) {
-#ifdef DEBUG_LOGGING
-		UnsignedInt ip = targetSlot->getIP();
-#endif
-		DEBUG_LOG(("NAT::gotMangledPort - don't have a netgear or we have already been probed, or both my target and I have a netgear, send a PROBE. Sending to %d.%d.%d.%d:%d\n",
-								PRINTF_IP_AS_4_INTS(ip), targetSlot->getPort()));
-
-		sendAProbe(targetSlot->getIP(), targetSlot->getPort(), m_localNodeNumber);
-		notifyTargetOfProbe(targetSlot);
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_WAITINGFORRESPONSE);
-	} else {
-		DEBUG_LOG(("NAT::gotMangledPort - we are a netgear, not sending a PROBE yet.\n"));
-	}
-}
-
-void NAT::gotInternalAddress(Int nodeNumber, UnsignedInt address) {
-	GameSlot *targetSlot = m_slotList[m_connectionNodes[nodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(targetSlot != NULL, ("NAT::gotInternalAddress - targetSlot is NULL"));
-	if (targetSlot == NULL) {
-		return;
-	}
-
-	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::gotInternalAddress - localSlot is NULL, WTF?"));
-	if (localSlot == NULL) {
-		return;
-	}
-
-	if (nodeNumber != m_targetNodeNumber) {
-		DEBUG_LOG(("NAT::gotInternalAddress - got a internal address for someone that isn't my target. node = %d, target node = %d\n", nodeNumber, m_targetNodeNumber));
-		return;
-	}
-
-	if (localSlot->getIP() == targetSlot->getIP()) {
-		// we have the same IP address, i.e. we are behind the same NAT.
-		// I need to talk directly to his internal address.
-		DEBUG_LOG(("NAT::gotInternalAddress - target and local players have same external address, using internal address.\n"));
-		targetSlot->setIP(address); // use the slot's internal address from now on
-	}
-}
-
-void NAT::notifyTargetOfProbe(GameSlot *targetSlot) {
-	PeerRequest req;
-	AsciiString options;
-	options.format("PROBED%d", m_localNodeNumber);
-	req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
-	req.UTM.isStagingRoom = TRUE;
-	req.id = "NAT/";
-	AsciiString hostName;
-	hostName.translate(targetSlot->getName());
-	req.nick = hostName.str();
-	req.options = options.str();
-	TheGameSpyPeerMessageQueue->addRequest(req);
-	DEBUG_LOG(("NAT::notifyTargetOfProbe - notifying %ls that we have probed them.\n", targetSlot->getName().str()));
-}
-
-void NAT::notifyUsersOfConnectionDone(Int nodeIndex) {
-	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::notifyUsersOfConnectionDone - localSlot is NULL, WTF?"));
-	if (localSlot == NULL) {
-		DEBUG_LOG(("NAT::notifyUsersOfConnectionDone - localSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	PeerRequest req;
-	AsciiString options;
-	options.format("CONNDONE%d %d", nodeIndex, m_localNodeNumber);
-
-	req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
-	req.UTM.isStagingRoom = TRUE;
-	req.id = "NAT";
-	AsciiString names;
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_connectionNodes[m_localNodeNumber].m_slotIndex == i) {
-			continue;
-		}
-
-		if ((m_slotList[i] == NULL) || (m_slotList[i]->isHuman() == FALSE)) {
-			continue;
-		}
-
-		AsciiString name;
-		name.translate(m_slotList[i]->getName());
-		if (names.isNotEmpty())
-		{
-			names.concat(',');
-		}
-		names.concat(name);
-	}
-	req.nick = names.str();
-	req.options = options.str();
-
-	DEBUG_LOG(("NAT::notifyUsersOfConnectionDone - sending %s to %s\n", options.str(), names.str()));
-	TheGameSpyPeerMessageQueue->addRequest(req);
-}
-
-void NAT::notifyUsersOfConnectionFailed(Int nodeIndex) {
-	GameSlot *localSlot = m_slotList[m_connectionNodes[m_localNodeNumber].m_slotIndex];
-	DEBUG_ASSERTCRASH(localSlot != NULL, ("NAT::notifyUsersOfConnectionFailed - localSlot is NULL, WTF?"));
-	if (localSlot == NULL) {
-		DEBUG_LOG(("NAT::notifyUsersOfConnectionFailed - localSlot is NULL, failed this connection\n"));
-		setConnectionState(m_localNodeNumber, NATCONNECTIONSTATE_FAILED);
-		return;
-	}
-
-	PeerRequest req;
-	AsciiString options;
-	options.format("CONNFAILED%d", nodeIndex);
-/*
-	req.peerRequestType = PeerRequest::PEERREQUEST_UTMROOM;
-	req.UTM.isStagingRoom = TRUE;
-	req.id = "NAT/";
-	req.options = options.str();
-
-	DEBUG_LOG(("NAT::notifyUsersOfConnectionFailed - sending %s to room\n", options.str()));
-*/
-
-	req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
-	req.UTM.isStagingRoom = TRUE;
-	req.id = "NAT";
-	AsciiString names;
-	for (Int i=0; i<MAX_SLOTS; ++i)
-	{
-		if (m_connectionNodes[m_localNodeNumber].m_slotIndex == i) {
-			continue;
-		}
-
-		if ((m_slotList[i] == NULL) || (m_slotList[i]->isHuman() == FALSE)) {
-			continue;
-		}
-
-		AsciiString name;
-		name.translate(m_slotList[i]->getName());
-		if (names.isNotEmpty())
-		{
-			names.concat(',');
-		}
-		names.concat(name);
-	}
-	req.nick = names.str();
-	req.options = options.str();
-
-	DEBUG_LOG(("NAT::notifyUsersOfConnectionFailed - sending %s to %s\n", options.str(), names.str()));
-
-	TheGameSpyPeerMessageQueue->addRequest(req);
-}
-
-void NAT::sendMangledPortNumberToTarget(UnsignedShort mangledPort, GameSlot *targetSlot) {
-	PeerRequest req;
-	AsciiString options;
-	options.format("PORT%d %d %08X", m_localNodeNumber, mangledPort, m_localIP);
-
-	req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
-	req.UTM.isStagingRoom = TRUE;
-	req.id = "NAT/";
-	AsciiString hostName;
-	hostName.translate(targetSlot->getName());
-	req.nick = hostName.str();
-	req.options = options.str();
-	DEBUG_LOG(("NAT::sendMangledPortNumberToTarget - sending \"%s\" to %s\n", options.str(), hostName.str()));
-	TheGameSpyPeerMessageQueue->addRequest(req);
-}
-
-void NAT::processGlobalMessage(Int slotNum, const char *options) {
-	const char *ptr = options;
-	// skip preceding whitespace.
-	while (isspace(*ptr)) {
-		++ptr;
-	}
-	DEBUG_LOG(("NAT::processGlobalMessage - got message from slot %d, message is \"%s\"\n", slotNum, ptr));
-	if (!strncmp(ptr, "PROBED", strlen("PROBED"))) {
-		// format: PROBED<node number>
-		// a probe has been sent at us, if we are waiting because of a netgear or something, we
-		// should start sending our own probes.
-		Int node = atoi(ptr + strlen("PROBED"));
-		if (node == m_targetNodeNumber) {
-			// make sure we're being probed by who we're supposed to be probed by.
-			probed(node);
-		} else {
-			DEBUG_LOG(("NAT::processGlobalMessage - probed by node %d, not our target\n", node));
-		}
-	} else if (!strncmp(ptr, "CONNDONE", strlen("CONNDONE"))) {
-		// format: CONNDONE<node number>
-		// we should get the node number of the player who's connection is done from the options
-		// and mark that down as part of the connectionStates.
-		const char *c = ptr + strlen("CONNDONE");
-/*		while (*c != ' ') {
-			++c;
-		}
-		while (*c == ' ') {
-			++c;
-		}
-*/		Int node;
-		Int sendingNode;
-		sscanf(c, "%d %d\n", &node, &sendingNode);
-
-		if (m_connectionPairs[m_connectionPairIndex][m_connectionRound][node] == sendingNode) {
-//			Int node = atoi(ptr + strlen("CONNDONE"));
-			DEBUG_LOG(("NAT::processGlobalMessage - got a CONNDONE message for node %d\n", node));
-			if ((node >= 0) && (node <= m_numNodes)) {
-				DEBUG_LOG(("NAT::processGlobalMessage - node %d's connection is complete, setting connection state to done\n", node));
-				setConnectionState(node, NATCONNECTIONSTATE_DONE);
-			}
-		} else {
-			DEBUG_LOG(("NAT::processGlobalMessage - got a connection done message that isn't from this round. node: %d sending node: %d\n", node, sendingNode));
-		}
-	} else if (!strncmp(ptr, "CONNFAILED", strlen("CONNFAILED"))) {
-		// format: CONNFAILED<node number>
-		// we should get the node number of the player who's connection failed from the options
-		// and mark that down as part of the connectionStates.
-		Int node = atoi(ptr + strlen("CONNFAILED"));
-		if ((node >= 0) && (node < m_numNodes)) {
-			DEBUG_LOG(("NAT::processGlobalMessage - node %d's connection failed, setting connection state to failed\n", node));
-			setConnectionState(node, NATCONNECTIONSTATE_FAILED);
-		}
-	} else if (!strncmp(ptr, "PORT", strlen("PORT"))) {
-		// format: PORT<node number> <port number> <internal IP>
-		// we should get the node number and the mangled port number of the client we
-		// are supposed to be communicating with and start probing them. No, that was not
-		// meant to be a phallic reference, you sicko.
-		const char *c = ptr + strlen("PORT");
-		Int node = atoi(c);
-		while (*c != ' ') {
-			++c;
-		}
-		while (*c == ' ') {
-			++c;
-		}
-		UnsignedInt intport = 0;
-		UnsignedInt addr = 0;
-		sscanf(c, "%d %X", &intport, &addr);
-		UnsignedShort port = (UnsignedShort)intport;
-
-		DEBUG_LOG(("NAT::processGlobalMessage - got port message from node %d, port: %d, internal address: %d.%d.%d.%d\n", node, port,
-								PRINTF_IP_AS_4_INTS(addr)));
-
-		if ((node >= 0) && (node < m_numNodes)) {
-			if (port < 1024) {
-				// it has to be less than 65535 cause its a short duh.
-				DEBUG_ASSERTCRASH(port >= 1024, ("Was passed an invalid port number"));
-				port += 1024;
-			}
-			gotInternalAddress(node, addr);
-			gotMangledPort(node, port);
-		}
-	}
-}
-
-void NAT::setConnectionState(Int nodeNumber, NATConnectionState state) {
-	m_connectionStates[nodeNumber] = state;
-
-	if (nodeNumber != m_localNodeNumber) {
-		return;
-	}
-
-	// if this is the case we are starting a new round and we don't know
-	// who we're connecting to yet.
-	if (m_localNodeNumber == m_targetNodeNumber) {
-		return;
-	}
-
-	// if this is the start of a new connection round we don't have a
-	// target yet.
-	if (m_targetNodeNumber == -1) {
-		return;
-	}
-
-	// find the menu slot of the target node.
-	Int slotIndex = m_connectionNodes[m_targetNodeNumber].m_slotIndex;
-	Int slot = 0;
-	Int i = 0;
-	for (; i < MAX_SLOTS; ++i) {
-		if (m_slotList[i] != NULL) {
-			if (m_slotList[i]->isHuman()) {
-				if (i != m_connectionNodes[m_localNodeNumber].m_slotIndex) {
-					if (i == slotIndex) {
-					 break;
-					}
-					++slot;
-				}
-			}
-		}
-	}
-	if (i == MAX_SLOTS) {
-		DEBUG_ASSERTCRASH(i < MAX_SLOTS, ("Didn't find the node number in the slot list"));
-		return;
-	}
-	TheEstablishConnectionsMenu->setPlayerStatus(slot, state);
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandList.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandList.cpp
deleted file mode 100644
index 46498dc9b74..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandList.cpp
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/NetCommandList.h"
-#include "GameNetwork/networkutil.h"
-
-/**
- * Constructor.
- */
-NetCommandList::NetCommandList() {
-	m_first = NULL;
-	m_last = NULL;
-	m_lastMessageInserted = NULL;
-}
-
-/**
- * Destructor.
- */
-NetCommandList::~NetCommandList() {
-	reset();
-}
-
-/**
- * Append the given list of commands to this list.
- */
-void NetCommandList::appendList(NetCommandList *list) {
-	if (list == NULL) {
-		return;
-	}
-
-	// Need to do it this way because of the reference counting that needs to happen in appendMessage.
-	NetCommandRef *msg = list->getFirstMessage();
-	NetCommandRef *next = NULL;
-	while (msg != NULL) {
-		next = msg->getNext();
-		NetCommandRef *temp = addMessage(msg->getCommand());
-		if (temp != NULL) {
-			temp->setRelay(msg->getRelay());
-		}
-
-		msg = next;
-	}
-}
-
-/**
- * Return the first message in this list.
- */
-NetCommandRef *NetCommandList::getFirstMessage() {
-	return m_first;
-}
-
-/**
- * Remove the given message from this list.
- */
-void NetCommandList::removeMessage(NetCommandRef *msg) {
-	if (m_lastMessageInserted == msg) {
-		m_lastMessageInserted = msg->getNext();
-	}
-
-	if (msg->getPrev() != NULL) {
-		msg->getPrev()->setNext(msg->getNext());
-	}
-	if (msg->getNext() != NULL) {
-		msg->getNext()->setPrev(msg->getPrev());
-	}
-
-	if (msg == m_first) {
-		m_first = msg->getNext();
-	}
-	if (msg == m_last) {
-		m_last = msg->getPrev();
-	}
-
-	msg->setNext(NULL);
-	msg->setPrev(NULL);
-}
-
-/**
- * Initialize the list.
- */
-void NetCommandList::init() {
-	reset();
-}
-
-/**
- * Reset the contents of this list.
- */
-void NetCommandList::reset() {
-	NetCommandRef *temp = m_first;
-	while (m_first != NULL) {
-		temp = m_first->getNext();
-		m_first->setNext(NULL);
-		m_first->setPrev(NULL);
-		deleteInstance(m_first);
-		m_first = temp;
-	}
-	m_last = NULL;
-	m_lastMessageInserted = NULL;
-}
-
-/**
- * Insert sorts msg.  Assumes that all the previous message inserts were done using this function.
- * The message is sorted in based first on command type, then player id, and then command id.
- */
-NetCommandRef * NetCommandList::addMessage(NetCommandMsg *cmdMsg) {
-	if (cmdMsg == NULL) {
-		DEBUG_ASSERTCRASH(cmdMsg != NULL, ("NetCommandList::addMessage - command message was NULL"));
-		return NULL;
-	}
-
-//	UnsignedInt id = cmdMsg->getID();
-
-	NetCommandRef *msg = NEW_NETCOMMANDREF(cmdMsg);
-
-	if (m_first == NULL) {
-		// this is the first node, so we don't have to worry about ordering it.
-		m_first = msg;
-		m_last = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-
-	if (m_lastMessageInserted != NULL) {
-		// Messages that are inserted in order should just be put in one right after the other.
-		// So saving the placement of the last message inserted can give us a huge boost in
-		// efficiency.
-		NetCommandRef *theNext = m_lastMessageInserted->getNext();
-		if ((m_lastMessageInserted->getCommand()->getNetCommandType() == msg->getCommand()->getNetCommandType()) &&
-			(m_lastMessageInserted->getCommand()->getPlayerID() == msg->getCommand()->getPlayerID()) &&
-			(m_lastMessageInserted->getCommand()->getID() < msg->getCommand()->getID()) &&
-			((theNext == NULL) || ((theNext->getCommand()->getNetCommandType() > msg->getCommand()->getNetCommandType()) ||
-			 (theNext->getCommand()->getPlayerID() > msg->getCommand()->getPlayerID()) ||
-			 (theNext->getCommand()->getID() > msg->getCommand()->getID())))) {
-
-			// Make sure this command isn't already in the list.
-			if (isEqualCommandMsg(m_lastMessageInserted->getCommand(), msg->getCommand())) {
-
-				// This command is already in the list, don't duplicate it.
-				deleteInstance(msg);
-				msg = NULL;
-				return NULL;
-			}
-
-			if (theNext == NULL) {
-				// this means that m_lastMessageInserted == m_last, so m_last should point to the msg that is being inserted.
-				msg->setNext(m_lastMessageInserted->getNext());
-				msg->setPrev(m_lastMessageInserted);
-				m_lastMessageInserted->setNext(msg);
-				m_lastMessageInserted = msg;
-				m_last = msg;
-			} else {
-				msg->setNext(m_lastMessageInserted->getNext());
-				msg->setPrev(m_lastMessageInserted);
-				m_lastMessageInserted->setNext(msg);
-				msg->getNext()->setPrev(msg);
-				m_lastMessageInserted = msg;
-			}
-			return msg;
-		}
-	}
-	
-	if (msg->getCommand()->getNetCommandType() > m_last->getCommand()->getNetCommandType()) {
-		// easy optimization for a command that goes at the end of the list
-		// since they are likely to be added in order.
-
-		// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(m_last->getCommand(), msg->getCommand())) {
-
-			// This command is already in the list, don't duplicate it.
-			deleteInstance(msg);
-			msg = NULL;
-			return NULL;
-		}
-
-		msg->setPrev(m_last);
-		msg->setNext(NULL);
-		m_last->setNext(msg);
-		m_last = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-	
-	if (msg->getCommand()->getNetCommandType() < m_first->getCommand()->getNetCommandType()) {
-		// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(m_first->getCommand(), msg->getCommand())) {
-
-			// This command is already in the list, don't duplicate it.
-			deleteInstance(msg);
-			msg = NULL;
-			return NULL;
-		}
-
-		// The command goes at the head of the list.
-		msg->setNext(m_first);
-		msg->setPrev(NULL);
-		m_first->setPrev(msg);
-		m_first = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-	
-	
-	// Find the start of the command type we're looking for.
-	NetCommandRef *tempmsg = m_first;
-	while ((tempmsg != NULL) && (msg->getCommand()->getNetCommandType() > tempmsg->getCommand()->getNetCommandType())) {
-		tempmsg = tempmsg->getNext();
-	}
-
-	if (tempmsg == NULL) {
-		// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(m_last->getCommand(), msg->getCommand())) {
-
-			// This command is already in the list, don't duplicate it.
-			deleteInstance(msg);
-			msg = NULL;
-			return NULL;
-		}
-
-		// message goes at the end of the list.
-		msg->setPrev(m_last);
-		msg->setNext(NULL);
-		m_last->setNext(msg);
-		m_last = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-
-	// Now find the player position.  munkee.
-	while ((tempmsg != NULL) && (msg->getCommand()->getNetCommandType() == tempmsg->getCommand()->getNetCommandType()) && (msg->getCommand()->getPlayerID() > tempmsg->getCommand()->getPlayerID())) {
-		tempmsg = tempmsg->getNext();
-	}
-
-	if (tempmsg == NULL) {
-		// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(m_last->getCommand(), msg->getCommand())) {
-
-			// This command is already in the list, don't duplicate it.
-			deleteInstance(msg);
-			msg = NULL;
-			return NULL;
-		}
-
-		// message goes at the end of the list.
-		msg->setPrev(m_last);
-		msg->setNext(NULL);
-		m_last->setNext(msg);
-		m_last = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-
-	// Find the position within the player's section based on the command ID.
-	// If the command type doesn't require a command ID, sort by whatever it should be sorted by.
-	while ((tempmsg != NULL) && (msg->getCommand()->getNetCommandType() == tempmsg->getCommand()->getNetCommandType()) && (msg->getCommand()->getPlayerID() == tempmsg->getCommand()->getPlayerID()) && (msg->getCommand()->getSortNumber() > tempmsg->getCommand()->getSortNumber())) {
-		tempmsg = tempmsg->getNext();
-	}
-
-	if (tempmsg == NULL) {
-		// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(m_last->getCommand(), msg->getCommand())) {
-
-			// This command is already in the list, don't duplicate it.
-			deleteInstance(msg);
-			msg = NULL;
-			return NULL;
-		}
-
-		// This message goes at the end of the list.
-		msg->setPrev(m_last);
-		msg->setNext(NULL);
-		m_last->setNext(msg);
-		m_last = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-
-	if (tempmsg == m_first) {
-		// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(m_first->getCommand(), msg->getCommand())) {
-
-			// This command is already in the list, don't duplicate it.
-			deleteInstance(msg);
-			return NULL;
-		}
-
-		// This message goes at the head of the list.
-		msg->setNext(m_first);
-		msg->setPrev(NULL);
-		m_first->setPrev(msg);
-		m_first = msg;
-		m_lastMessageInserted = msg;
-		return msg;
-	}
-
-	// Make sure this command isn't already in the list.
-		if (isEqualCommandMsg(tempmsg->getCommand(), msg->getCommand())) {
-
-		// This command is already in the list, don't duplicate it.
-		deleteInstance(msg);
-		msg = NULL;
-		return NULL;
-	}
-
-	// Insert message before tempmsg.
-	msg->setNext(tempmsg);
-	msg->setPrev(tempmsg->getPrev());
-	msg->getPrev()->setNext(msg);
-	tempmsg->setPrev(msg);
-	m_lastMessageInserted = msg;
-
-	return msg;
-}
-
-Int NetCommandList::length() {
-	Int retval = 0;
-	NetCommandRef *temp = m_first;
-	while (temp != NULL) {
-		++retval;
-		temp = temp->getNext();
-	}
-	return retval;
-}
-
-/**
- * This is really inefficient, but we can probably get away with it because
- * there shouldn't be too many messages for any given frame.
- */
-NetCommandRef * NetCommandList::findMessage(NetCommandMsg *msg) {
-	NetCommandRef *retval = m_first;
-	while ((retval != NULL) && (isEqualCommandMsg(retval->getCommand(), msg) == FALSE)) {
-		retval = retval->getNext();
-	}
-	return retval;
-}
-
-NetCommandRef * NetCommandList::findMessage(UnsignedShort commandID, UnsignedByte playerID) {
-	NetCommandRef *retval = m_first;
-	while (retval != NULL) {
-		if (DoesCommandRequireACommandID(retval->getCommand()->getNetCommandType())) {
-			if ((retval->getCommand()->getID() == commandID) && (retval->getCommand()->getPlayerID() == playerID)) {
-				return retval;
-			}
-		}
-		retval = retval->getNext();
-	}
-	return retval;
-}
-
-Bool NetCommandList::isEqualCommandMsg(NetCommandMsg *msg1, NetCommandMsg *msg2) {
-	if (DoesCommandRequireACommandID(msg1->getNetCommandType()) != DoesCommandRequireACommandID(msg2->getNetCommandType())) {
-		return FALSE;
-	}
-
-	// At this point we know that the commands both do or do not require a command id.
-	// Do or do not, there is no try.
-	if (DoesCommandRequireACommandID(msg1->getNetCommandType())) {
-		// Are the commands from the same player?
-		if (msg1->getPlayerID() != msg2->getPlayerID()) {
-			return FALSE;
-		}
-
-		// Do they have the same command ID?
-		if (msg1->getID() != msg2->getID()) {
-			return FALSE;
-		}
-		return TRUE;
-	}
-
-	// If we've gotten this far, we know that the commands do not require a command id.
-	// So now our equality checking becomes type-specific.
-
-	// Are they the same type?
-	if (msg1->getNetCommandType() != msg2->getNetCommandType()) {
-		return FALSE;
-	}
-
-	// Are they from the same player?
-	if (msg1->getPlayerID() != msg2->getPlayerID()) {
-		return FALSE;
-	}
-
-	// They are the same type and from the same player.
-	// Time for the type specific stuff.
-	if (msg1->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) {
-		NetAckStage1CommandMsg *ack1 = (NetAckStage1CommandMsg *)msg1;
-		NetAckStage1CommandMsg *ack2 = (NetAckStage1CommandMsg *)msg2;
-		
-		if (ack1->getOriginalPlayerID() != ack2->getOriginalPlayerID()) {
-			return FALSE;
-		}
-
-		if (ack1->getCommandID() != ack2->getCommandID()) {
-			return FALSE;
-		}
-		return TRUE;
-	}
-
-	// They are the same type and from the same player.
-	// Time for the type specific stuff.
-	if (msg1->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) {
-		NetAckStage2CommandMsg *ack1 = (NetAckStage2CommandMsg *)msg1;
-		NetAckStage2CommandMsg *ack2 = (NetAckStage2CommandMsg *)msg2;
-		
-		if (ack1->getOriginalPlayerID() != ack2->getOriginalPlayerID()) {
-			return FALSE;
-		}
-
-		if (ack1->getCommandID() != ack2->getCommandID()) {
-			return FALSE;
-		}
-		return TRUE;
-	}
-
-	// They are the same type and from the same player.
-	// Time for the type specific stuff.
-	if (msg1->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
-		NetAckBothCommandMsg *ack1 = (NetAckBothCommandMsg *)msg1;
-		NetAckBothCommandMsg *ack2 = (NetAckBothCommandMsg *)msg2;
-		
-		if (ack1->getOriginalPlayerID() != ack2->getOriginalPlayerID()) {
-			return FALSE;
-		}
-
-		if (ack1->getCommandID() != ack2->getCommandID()) {
-			return FALSE;
-		}
-		return TRUE;
-	}
-
-	return FALSE;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp
deleted file mode 100644
index 00203ef992d..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp
+++ /dev/null
@@ -1,1069 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/NetCommandMsg.h"
-#include "Common/GameState.h"
-#include "Common/PlayerList.h"
-#include "Common/Player.h"
-
-/**
- * Base constructor
- */
-NetCommandMsg::NetCommandMsg() 
-{
-	//Added By Sadullah Nader
-	//Initializations inserted
-	m_executionFrame = 0;
-	m_id = 0;
-	m_playerID = 0;
-
-	//
-	m_timestamp = 0;
-	m_referenceCount = 1; // start this off as 1.  This means that an "attach" is implied by creating a NetCommandMsg object.
-	m_commandType = NETCOMMANDTYPE_UNKNOWN;
-}
-
-/**
- * Destructor
- */
-NetCommandMsg::~NetCommandMsg() {
-}
-
-/**
- * Adds one to the reference count.
- */
-void NetCommandMsg::attach() {
-	++m_referenceCount;
-}
-
-/**
- * Subtracts one from the reference count. If the reference count is 0, the this object is destroyed.
- */
-void NetCommandMsg::detach() {
-	--m_referenceCount;
-	if (m_referenceCount == 0) {
-		deleteInstance(this);
-		return;
-	}
-	DEBUG_ASSERTCRASH(m_referenceCount > 0, ("Invalid reference count for NetCommandMsg")); // Just to make sure...
-	if (m_referenceCount < 0) {
-		deleteInstance(this);
-	}
-}
-
-/**
- * Returns the value by which this type of message should be sorted.
- */
-Int NetCommandMsg::getSortNumber() {
-	return m_id;
-}
-
-//-------------------------------
-// NetGameCommandMsg
-//-------------------------------
-
-/**
- * Constructor with no argument, sets everything to default values.
- */
-NetGameCommandMsg::NetGameCommandMsg() : NetCommandMsg() {
-	//Added By Sadullah Nader
-	//Initializations inserted
-	m_argSize = 0;
-	m_numArgs = 0;
-	//
-
-	m_type = (GameMessage::Type)0;
-	m_commandType = NETCOMMANDTYPE_GAMECOMMAND;
-	m_argList = NULL;
-	m_argTail = NULL;
-}
-
-/**
- * Constructor with a GameMessage argument. Sets member variables appropriately for this GameMessage.
- * Also copies all the arguments.
- */
-NetGameCommandMsg::NetGameCommandMsg(GameMessage *msg) : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_GAMECOMMAND;
-
-	m_type = msg->getType();
-	Int count = msg->getArgumentCount();
-	for (Int i = 0; i < count; ++i) {
-		addArgument(msg->getArgumentDataType(i), *(msg->getArgument(i)));
-	}
-}
-
-/**
- * Destructor
- */
-NetGameCommandMsg::~NetGameCommandMsg() {
-	GameMessageArgument *arg = m_argList;
-	while (arg != NULL) {
-		m_argList = m_argList->m_next;
-		deleteInstance(arg);
-		arg = m_argList;
-	}
-}
-
-/**
- * Add an argument to this command.
- */
-void NetGameCommandMsg::addArgument(const GameMessageArgumentDataType type, GameMessageArgumentType arg) 
-{
-	if (m_argTail == NULL) {
-		m_argList = newInstance(GameMessageArgument);	
-		m_argTail = m_argList;
-		m_argList->m_data = arg;
-		m_argList->m_type = type;
-		m_argList->m_next = NULL;
-		return;
-	}
-
-	GameMessageArgument *newArg = newInstance(GameMessageArgument);
-	newArg->m_data = arg;
-	newArg->m_type = type;
-	newArg->m_next = NULL;
-	m_argTail->m_next = newArg;
-	m_argTail = newArg;
-}
-
-// here's where we figure out which slot corresponds to which player
-static Int indexFromMask(UnsignedInt mask)
-{
-	Player *player = NULL;
-	Int i;
-
-	for( i = 0; i < MAX_PLAYER_COUNT; i++ )
-	{
-		player = ThePlayerList->getNthPlayer( i );
-		if( player && player->getPlayerMask() == mask )
-			return i;
-	}  // end for i
-
-	return -1;
-}
-
-/**
- * Construct a new GameMessage object from the data in this object.
- */
-GameMessage *NetGameCommandMsg::constructGameMessage() 
-{
-	GameMessage *retval = newInstance(GameMessage)(m_type);
-
-	AsciiString name;
-	name.format("player%d", getPlayerID());
-	retval->friend_setPlayerIndex( ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(name))->getPlayerIndex());
-//	retval->friend_setPlayerIndex(indexFromMask(ThePlayerList->findPlayerWithNameKey(TheNameKeyGenerator->nameToKey(name))->getPlayerMask()));
-
-	GameMessageArgument *arg = m_argList;
-	while (arg != NULL) {
-//		retval->appendGenericArgument(arg->m_data);
-		if (arg->m_type == ARGUMENTDATATYPE_INTEGER) {
-			retval->appendIntegerArgument(arg->m_data.integer);
-		} else if (arg->m_type == ARGUMENTDATATYPE_REAL) {
-			retval->appendRealArgument(arg->m_data.real);
-		} else if (arg->m_type == ARGUMENTDATATYPE_BOOLEAN) {
-			retval->appendBooleanArgument(arg->m_data.boolean);
-		} else if (arg->m_type == ARGUMENTDATATYPE_OBJECTID) {
-			retval->appendObjectIDArgument(arg->m_data.objectID);
-		} else if (arg->m_type == ARGUMENTDATATYPE_DRAWABLEID) {
-			retval->appendDrawableIDArgument(arg->m_data.drawableID);
-		} else if (arg->m_type == ARGUMENTDATATYPE_TEAMID) {
-			retval->appendTeamIDArgument(arg->m_data.teamID);
-		} else if (arg->m_type == ARGUMENTDATATYPE_LOCATION) {
-			retval->appendLocationArgument(arg->m_data.location);
-		} else if (arg->m_type == ARGUMENTDATATYPE_PIXEL) {
-			retval->appendPixelArgument(arg->m_data.pixel);
-		} else if (arg->m_type == ARGUMENTDATATYPE_PIXELREGION) {
-			retval->appendPixelRegionArgument(arg->m_data.pixelRegion);
-		} else if (arg->m_type == ARGUMENTDATATYPE_TIMESTAMP) {
-			retval->appendTimestampArgument(arg->m_data.timestamp);
-		} else if (arg->m_type == ARGUMENTDATATYPE_WIDECHAR) {
-			retval->appendWideCharArgument(arg->m_data.wChar);
-		}
-		arg = arg->m_next;
-	}
-	return retval;
-}
-
-/**
- * Sets the type of game message
- */
-void NetGameCommandMsg::setGameMessageType(GameMessage::Type type) {
-	m_type = type;
-}
-
-AsciiString NetGameCommandMsg::getContentsAsAsciiString(void)
-{
-	AsciiString ret;
-	//AsciiString tmp;
-	ret.format("Type:%s", GameMessage::getCommandTypeAsAsciiString((GameMessage::Type)m_type).str());
-
-	return ret;
-}
-
-//-------------------------
-// NetAckBothCommandMsg
-//-------------------------
-/**
- * Constructor.  Sets the member variables according to the given message.
- */
-NetAckBothCommandMsg::NetAckBothCommandMsg(NetCommandMsg *msg) : NetCommandMsg() {
-	m_commandID = msg->getID();
-	m_commandType = NETCOMMANDTYPE_ACKBOTH;
-	m_originalPlayerID = msg->getPlayerID();
-}
-
-/**
- * Constructor.  Sets the member variables to default values.
- */
-NetAckBothCommandMsg::NetAckBothCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_ACKBOTH;
-}
-
-/**
- * Destructor.
- */
-NetAckBothCommandMsg::~NetAckBothCommandMsg() {
-}
-
-/**
- * Returns the command ID of the command being ack'd.
- */
-UnsignedShort NetAckBothCommandMsg::getCommandID() {
-	return m_commandID;
-}
-
-/**
- * Set the command ID of the command being ack'd.
- */
-void NetAckBothCommandMsg::setCommandID(UnsignedShort commandID) {
-	m_commandID = commandID;
-}
-
-/**
- * Get the player id of the player who originally sent the command.
- */
-UnsignedByte NetAckBothCommandMsg::getOriginalPlayerID() {
-	return m_originalPlayerID;
-}
-
-/**
- * Set the player id of the player who originally sent the command.
- */
-void NetAckBothCommandMsg::setOriginalPlayerID(UnsignedByte originalPlayerID) {
-	m_originalPlayerID = originalPlayerID;
-}
-
-Int NetAckBothCommandMsg::getSortNumber() {
-	return m_commandID;
-}
-
-//-------------------------
-// NetAckStage1CommandMsg
-//-------------------------
-/**
- * Constructor.  Sets the member variables according to the given message.
- */
-NetAckStage1CommandMsg::NetAckStage1CommandMsg(NetCommandMsg *msg) : NetCommandMsg() {
-	m_commandID = msg->getID();
-	m_commandType = NETCOMMANDTYPE_ACKSTAGE1;
-	m_originalPlayerID = msg->getPlayerID();
-}
-
-/**
- * Constructor.  Sets the member variables to default values.
- */
-NetAckStage1CommandMsg::NetAckStage1CommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_ACKSTAGE1;
-}
-
-/**
- * Destructor.
- */
-NetAckStage1CommandMsg::~NetAckStage1CommandMsg() {
-}
-
-/**
- * Returns the command ID of the command being ack'd.
- */
-UnsignedShort NetAckStage1CommandMsg::getCommandID() {
-	return m_commandID;
-}
-
-/**
- * Set the command ID of the command being ack'd.
- */
-void NetAckStage1CommandMsg::setCommandID(UnsignedShort commandID) {
-	m_commandID = commandID;
-}
-
-/**
- * Get the player id of the player who originally sent the command.
- */
-UnsignedByte NetAckStage1CommandMsg::getOriginalPlayerID() {
-	return m_originalPlayerID;
-}
-
-/**
- * Set the player id of the player who originally sent the command.
- */
-void NetAckStage1CommandMsg::setOriginalPlayerID(UnsignedByte originalPlayerID) {
-	m_originalPlayerID = originalPlayerID;
-}
-
-Int NetAckStage1CommandMsg::getSortNumber() {
-	return m_commandID;
-}
-
-//-------------------------
-// NetAckStage2CommandMsg
-//-------------------------
-/**
- * Constructor.  Sets the member variables according to the given message.
- */
-NetAckStage2CommandMsg::NetAckStage2CommandMsg(NetCommandMsg *msg) : NetCommandMsg() {
-	m_commandID = msg->getID();
-	m_commandType = NETCOMMANDTYPE_ACKSTAGE2;
-	m_originalPlayerID = msg->getPlayerID();
-}
-
-/**
- * Constructor.  Sets the member variables to default values.
- */
-NetAckStage2CommandMsg::NetAckStage2CommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_ACKSTAGE2;
-}
-
-/**
- * Destructor.
- */
-NetAckStage2CommandMsg::~NetAckStage2CommandMsg() {
-}
-
-/**
- * Returns the command ID of the command being ack'd.
- */
-UnsignedShort NetAckStage2CommandMsg::getCommandID() {
-	return m_commandID;
-}
-
-/**
- * Set the command ID of the command being ack'd.
- */
-void NetAckStage2CommandMsg::setCommandID(UnsignedShort commandID) {
-	m_commandID = commandID;
-}
-
-/**
- * Get the player id of the player who originally sent the command.
- */
-UnsignedByte NetAckStage2CommandMsg::getOriginalPlayerID() {
-	return m_originalPlayerID;
-}
-
-/**
- * Set the player id of the player who originally sent the command.
- */
-void NetAckStage2CommandMsg::setOriginalPlayerID(UnsignedByte originalPlayerID) {
-	m_originalPlayerID = originalPlayerID;
-}
-
-Int NetAckStage2CommandMsg::getSortNumber() {
-	return m_commandID;
-}
-
-//-------------------------
-// NetFrameCommandMsg
-//-------------------------
-/**
- * Constructor.
- */
-NetFrameCommandMsg::NetFrameCommandMsg() : NetCommandMsg() {
-	m_commandCount = 0;
-	m_commandType = NETCOMMANDTYPE_FRAMEINFO;
-}
-
-/**
- * Destructor
- */
-NetFrameCommandMsg::~NetFrameCommandMsg() {
-}
-
-/**
- * Set the command count of this frame.
- */
-void NetFrameCommandMsg::setCommandCount(UnsignedShort commandCount) {
-	m_commandCount = commandCount;
-}
-
-/**
- * Return the command count of this frame.
- */
-UnsignedShort NetFrameCommandMsg::getCommandCount() {
-	return m_commandCount;
-}
-
-//-------------------------
-// NetPlayerLeaveCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetPlayerLeaveCommandMsg::NetPlayerLeaveCommandMsg() : NetCommandMsg() {
-	m_leavingPlayerID = 0;
-	m_commandType = NETCOMMANDTYPE_PLAYERLEAVE;
-}
-
-/**
- * Destructor
- */
-NetPlayerLeaveCommandMsg::~NetPlayerLeaveCommandMsg() {
-}
-
-/**
- * Get the id of the player leaving the game.
- */
-UnsignedByte NetPlayerLeaveCommandMsg::getLeavingPlayerID() {
-	return m_leavingPlayerID;
-}
-
-/**
- * Set the id of the player leaving the game.
- */
-void NetPlayerLeaveCommandMsg::setLeavingPlayerID(UnsignedByte id) {
-	m_leavingPlayerID = id;
-}
-
-//-------------------------
-// NetRunAheadMetricsCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetRunAheadMetricsCommandMsg::NetRunAheadMetricsCommandMsg() : NetCommandMsg() {
-	m_averageLatency = 0.0;
-	m_averageFps = 0;
-	m_commandType = NETCOMMANDTYPE_RUNAHEADMETRICS;
-}
-
-/**
- * Destructor
- */
-NetRunAheadMetricsCommandMsg::~NetRunAheadMetricsCommandMsg() {
-}
-
-/**
- * set the average latency
- */
-void NetRunAheadMetricsCommandMsg::setAverageLatency(Real avgLat) {
-	m_averageLatency = avgLat;
-}
-
-/**
- * get the average latency
- */
-Real NetRunAheadMetricsCommandMsg::getAverageLatency() {
-	return m_averageLatency;
-}
-
-/**
- * set the average fps
- */
-void NetRunAheadMetricsCommandMsg::setAverageFps(Int fps) {
-	m_averageFps = fps;
-}
-
-/**
- * get the average fps
- */
-Int NetRunAheadMetricsCommandMsg::getAverageFps() {
-	return m_averageFps;
-}
-
-//-------------------------
-// NetRunAheadCommandMsg
-//-------------------------
-NetRunAheadCommandMsg::NetRunAheadCommandMsg() : NetCommandMsg() {
-	m_runAhead = min(max(20, MIN_RUNAHEAD), MAX_FRAMES_AHEAD/2);
-	m_frameRate = 30;
-	m_commandType = NETCOMMANDTYPE_RUNAHEAD;
-}
-
-NetRunAheadCommandMsg::~NetRunAheadCommandMsg() {
-}
-
-UnsignedShort NetRunAheadCommandMsg::getRunAhead() {
-	return m_runAhead;
-}
-
-void NetRunAheadCommandMsg::setRunAhead(UnsignedShort runAhead) {
-	m_runAhead = runAhead;
-}
-
-UnsignedByte NetRunAheadCommandMsg::getFrameRate() {
-	return m_frameRate;
-}
-
-void NetRunAheadCommandMsg::setFrameRate(UnsignedByte frameRate) {
-	m_frameRate = frameRate;
-}
-
-//-------------------------
-// NetDestroyPlayerCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetDestroyPlayerCommandMsg::NetDestroyPlayerCommandMsg() : NetCommandMsg()
-{
-	m_playerIndex = 0;
-	m_commandType = NETCOMMANDTYPE_DESTROYPLAYER;
-}
-
-/**
- * Destructor
- */
-NetDestroyPlayerCommandMsg::~NetDestroyPlayerCommandMsg()
-{
-}
-
-/**
- * set the CRC
- */
-void NetDestroyPlayerCommandMsg::setPlayerIndex( UnsignedInt playerIndex )
-{
-	m_playerIndex = playerIndex;
-}
-
-/**
- * get the average CRC
- */
-UnsignedInt NetDestroyPlayerCommandMsg::getPlayerIndex( void )
-{
-	return m_playerIndex;
-}
-
-//-------------------------
-// NetKeepAliveCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetKeepAliveCommandMsg::NetKeepAliveCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_KEEPALIVE;
-}
-
-NetKeepAliveCommandMsg::~NetKeepAliveCommandMsg() {
-}
-
-//-------------------------
-// NetDisconnectKeepAliveCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetDisconnectKeepAliveCommandMsg::NetDisconnectKeepAliveCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_DISCONNECTKEEPALIVE;
-}
-
-NetDisconnectKeepAliveCommandMsg::~NetDisconnectKeepAliveCommandMsg() {
-}
-
-//-------------------------
-// NetDisconnectPlayerCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetDisconnectPlayerCommandMsg::NetDisconnectPlayerCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_DISCONNECTPLAYER;
-	m_disconnectSlot = 0;
-}
-
-/**
- * Destructor
- */
-NetDisconnectPlayerCommandMsg::~NetDisconnectPlayerCommandMsg() {
-}
-
-/**
- * Returns the disconnecting slot number
- */
-UnsignedByte NetDisconnectPlayerCommandMsg::getDisconnectSlot() {
-	return m_disconnectSlot;
-}
-
-/**
- * Sets the disconnecting slot number
- */
-void NetDisconnectPlayerCommandMsg::setDisconnectSlot(UnsignedByte slot) {
-	m_disconnectSlot = slot;
-}
-
-/**
- * Sets the disconnect frame
- */
-void NetDisconnectPlayerCommandMsg::setDisconnectFrame(UnsignedInt frame) {
-	m_disconnectFrame = frame;
-}
-
-/**
- * returns the disconnect frame
- */
-UnsignedInt NetDisconnectPlayerCommandMsg::getDisconnectFrame() {
-	return m_disconnectFrame;
-}
-
-//-------------------------
-// NetPacketRouterQueryCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetPacketRouterQueryCommandMsg::NetPacketRouterQueryCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_PACKETROUTERQUERY;
-}
-
-/**
- * Destructor
- */
-NetPacketRouterQueryCommandMsg::~NetPacketRouterQueryCommandMsg() {
-}
-
-//-------------------------
-// NetPacketRouterAckCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetPacketRouterAckCommandMsg::NetPacketRouterAckCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_PACKETROUTERACK;
-}
-
-/**
- * Destructor
- */
-NetPacketRouterAckCommandMsg::~NetPacketRouterAckCommandMsg() {
-}
-
-//-------------------------
-// NetDisconnectChatCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetDisconnectChatCommandMsg::NetDisconnectChatCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_DISCONNECTCHAT;
-}
-
-/**
- * Destructor
- */
-NetDisconnectChatCommandMsg::~NetDisconnectChatCommandMsg() {
-}
-
-/**
- * Set the chat text for this message.
- */
-void NetDisconnectChatCommandMsg::setText(UnicodeString text) {
-	m_text = text;
-}
-
-/**
- * Get the chat text for this message.
- */
-UnicodeString NetDisconnectChatCommandMsg::getText() {
-	return m_text;
-}
-
-//-------------------------
-// NetChatCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetChatCommandMsg::NetChatCommandMsg() : NetCommandMsg()
-{
-	m_commandType = NETCOMMANDTYPE_CHAT;
-	//added by Sadullah Nader
-	//Initializations inserted
-	m_playerMask = 0;
-	//
-}
-
-/**
- * Destructor
- */
-NetChatCommandMsg::~NetChatCommandMsg()
-{
-}
-
-/**
- * Set the chat text for this message.
- */
-void NetChatCommandMsg::setText(UnicodeString text)
-{
-	m_text = text;
-}
-
-/**
- * Get the chat text for this message.
- */
-UnicodeString NetChatCommandMsg::getText()
-{
-	return m_text;
-}
-
-/**
- * Get the bitmask of chat recipients from this message.
- */
-Int NetChatCommandMsg::getPlayerMask()
-{
-	return m_playerMask;
-}
-
-/**
- * Set a bitmask of chat recipients in this message.
- */
-void NetChatCommandMsg::setPlayerMask( Int playerMask )
-{
-	m_playerMask = playerMask;
-}
-
-//-------------------------
-// NetDisconnectVoteCommandMsg
-//-------------------------
-/**
- * Constructor
- */
-NetDisconnectVoteCommandMsg::NetDisconnectVoteCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_DISCONNECTVOTE;
-	m_slot = 0;
-}
-
-/**
- * Destructor
- */
-NetDisconnectVoteCommandMsg::~NetDisconnectVoteCommandMsg() {
-}
-
-/**
- * Set the slot that is being voted for.
- */
-void NetDisconnectVoteCommandMsg::setSlot(UnsignedByte slot) {
-	m_slot = slot;
-}
-
-/**
- * Get the slot that is being voted for.
- */
-UnsignedByte NetDisconnectVoteCommandMsg::getSlot() {
-	return m_slot;
-}
-
-/**
- * Get the vote frame.
- */
-UnsignedInt NetDisconnectVoteCommandMsg::getVoteFrame() {
-	return m_voteFrame;
-}
-
-/**
- * Set the vote frame.
- */
-void NetDisconnectVoteCommandMsg::setVoteFrame(UnsignedInt voteFrame) {
-	m_voteFrame = voteFrame;
-}
-
-//-------------------------
-// NetProgressCommandMsg
-//-------------------------
-NetProgressCommandMsg::NetProgressCommandMsg( void ) : NetCommandMsg()
-{
-	m_commandType = NETCOMMANDTYPE_PROGRESS;
-	m_percent = 0;
-}
-
-NetProgressCommandMsg::~NetProgressCommandMsg( void ) {}
-		
-UnsignedByte NetProgressCommandMsg::getPercentage()
-{
-	return m_percent;
-}
-
-void NetProgressCommandMsg::setPercentage( UnsignedByte percent )
-{
-	m_percent = percent;
-}
-
-//-------------------------
-// NetWrapperCommandMsg
-//-------------------------
-NetWrapperCommandMsg::NetWrapperCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_WRAPPER;
-	m_numChunks = 0;
-	m_data = NULL;
-	m_totalDataLength = 0;
-	m_chunkNumber = 0;
-	m_dataLength = 0;
-	m_dataOffset = 0;
-	m_wrappedCommandID = 0;
-}
-
-NetWrapperCommandMsg::~NetWrapperCommandMsg() {
-	if (m_data != NULL) {
-		delete m_data;
-		m_data = NULL;
-	}
-}
-
-UnsignedByte * NetWrapperCommandMsg::getData() {
-	return m_data;
-}
-
-void NetWrapperCommandMsg::setData(UnsignedByte *data, UnsignedInt dataLength) 
-{
-	if (m_data != NULL) {
-		delete m_data;
-		m_data = NULL;
-	}
-
-	m_data = NEW UnsignedByte[dataLength];	// pool[]ify
-	memcpy(m_data, data, dataLength);
-	m_dataLength = dataLength;
-}
-
-UnsignedInt NetWrapperCommandMsg::getDataLength() {
-	return m_dataLength;
-}
-
-UnsignedInt NetWrapperCommandMsg::getDataOffset() {
-	return m_dataOffset;
-}
-
-void NetWrapperCommandMsg::setDataOffset(UnsignedInt offset) {
-	m_dataOffset = offset;
-}
-
-UnsignedInt NetWrapperCommandMsg::getChunkNumber() {
-	return m_chunkNumber;
-}
-
-void NetWrapperCommandMsg::setChunkNumber(UnsignedInt chunkNumber) {
-	m_chunkNumber = chunkNumber;
-}
-
-UnsignedInt NetWrapperCommandMsg::getNumChunks() {
-	return m_numChunks;
-}
-
-void NetWrapperCommandMsg::setNumChunks(UnsignedInt numChunks) {
-	m_numChunks = numChunks;
-}
-
-UnsignedInt NetWrapperCommandMsg::getTotalDataLength() {
-	return m_totalDataLength;
-}
-
-void NetWrapperCommandMsg::setTotalDataLength(UnsignedInt totalDataLength) {
-	m_totalDataLength = totalDataLength;
-}
-
-UnsignedShort NetWrapperCommandMsg::getWrappedCommandID() {
-	return m_wrappedCommandID;
-}
-
-void NetWrapperCommandMsg::setWrappedCommandID(UnsignedShort wrappedCommandID) {
-	m_wrappedCommandID = wrappedCommandID;
-}
-
-//-------------------------
-// NetFileCommandMsg
-//-------------------------
-NetFileCommandMsg::NetFileCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_FILE;
-	m_data = NULL;
-	m_portableFilename.clear();
-	m_dataLength = 0;
-}
-
-NetFileCommandMsg::~NetFileCommandMsg() {
-	if (m_data != NULL) {
-		delete[] m_data;
-		m_data = NULL;
-	}
-}
-
-AsciiString NetFileCommandMsg::getRealFilename() 
-{
-	return TheGameState->portableMapPathToRealMapPath(m_portableFilename);
-}
-
-void NetFileCommandMsg::setRealFilename(AsciiString filename) 
-{
-	m_portableFilename = TheGameState->realMapPathToPortableMapPath(filename);
-}
-
-UnsignedInt NetFileCommandMsg::getFileLength() {
-	return m_dataLength;
-}
-
-UnsignedByte * NetFileCommandMsg::getFileData() {
-	return m_data;
-}
-
-void NetFileCommandMsg::setFileData(UnsignedByte *data, UnsignedInt dataLength) 
-{
-	m_dataLength = dataLength;
-	m_data = NEW UnsignedByte[dataLength];	// pool[]ify
-	memcpy(m_data, data, dataLength);
-}
-
-//-------------------------
-// NetFileAnnounceCommandMsg
-//-------------------------
-NetFileAnnounceCommandMsg::NetFileAnnounceCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_FILEANNOUNCE;
-	m_portableFilename.clear();
-	m_fileID = 0;
-	m_playerMask = 0;
-}
-
-NetFileAnnounceCommandMsg::~NetFileAnnounceCommandMsg() {
-}
-
-AsciiString NetFileAnnounceCommandMsg::getRealFilename() 
-{
-	return TheGameState->portableMapPathToRealMapPath(m_portableFilename);
-}
-
-void NetFileAnnounceCommandMsg::setRealFilename(AsciiString filename) 
-{
-	m_portableFilename = TheGameState->realMapPathToPortableMapPath(filename);
-}
-
-UnsignedShort NetFileAnnounceCommandMsg::getFileID() {
-	return m_fileID;
-}
-
-void NetFileAnnounceCommandMsg::setFileID(UnsignedShort fileID) {
-	m_fileID = fileID;
-}
-
-UnsignedByte NetFileAnnounceCommandMsg::getPlayerMask(void) {
-	return m_playerMask;
-}
-
-void NetFileAnnounceCommandMsg::setPlayerMask(UnsignedByte playerMask) {
-	m_playerMask = playerMask;
-}
-
-
-//-------------------------
-// NetFileProgressCommandMsg
-//-------------------------
-NetFileProgressCommandMsg::NetFileProgressCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_FILEPROGRESS;
-	m_fileID = 0;
-	m_progress = 0;
-}
-
-NetFileProgressCommandMsg::~NetFileProgressCommandMsg() {
-}
-
-UnsignedShort NetFileProgressCommandMsg::getFileID() {
-	return m_fileID;
-}
-
-void NetFileProgressCommandMsg::setFileID(UnsignedShort val) {
-	m_fileID = val;
-}
-
-Int NetFileProgressCommandMsg::getProgress() {
-	return m_progress;
-}
-
-void NetFileProgressCommandMsg::setProgress(Int val) {
-	m_progress = val;
-}
-
-//-------------------------
-// NetDisconnectFrameCommandMsg
-//-------------------------
-NetDisconnectFrameCommandMsg::NetDisconnectFrameCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_DISCONNECTFRAME;
-	m_disconnectFrame = 0;
-}
-
-NetDisconnectFrameCommandMsg::~NetDisconnectFrameCommandMsg() {
-}
-
-UnsignedInt NetDisconnectFrameCommandMsg::getDisconnectFrame() {
-	return m_disconnectFrame;
-}
-
-void NetDisconnectFrameCommandMsg::setDisconnectFrame(UnsignedInt disconnectFrame) {
-	m_disconnectFrame = disconnectFrame;
-}
-
-//-------------------------
-// NetDisconnectScreenOffCommandMsg
-//-------------------------
-NetDisconnectScreenOffCommandMsg::NetDisconnectScreenOffCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_DISCONNECTSCREENOFF;
-	m_newFrame = 0;
-}
-
-NetDisconnectScreenOffCommandMsg::~NetDisconnectScreenOffCommandMsg() {
-}
-
-UnsignedInt NetDisconnectScreenOffCommandMsg::getNewFrame() {
-	return m_newFrame;
-}
-
-void NetDisconnectScreenOffCommandMsg::setNewFrame(UnsignedInt newFrame) {
-	m_newFrame = newFrame;
-}
-
-//-------------------------
-// NetFrameResendRequestCommandMsg
-//-------------------------
-NetFrameResendRequestCommandMsg::NetFrameResendRequestCommandMsg() : NetCommandMsg() {
-	m_commandType = NETCOMMANDTYPE_FRAMERESENDREQUEST;
-	m_frameToResend = 0;
-}
-
-NetFrameResendRequestCommandMsg::~NetFrameResendRequestCommandMsg() {
-}
-
-UnsignedInt NetFrameResendRequestCommandMsg::getFrameToResend() {
-	return m_frameToResend;
-}
-
-void NetFrameResendRequestCommandMsg::setFrameToResend(UnsignedInt frame) {
-	m_frameToResend = frame;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandRef.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandRef.cpp
deleted file mode 100644
index 0044d0d4421..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandRef.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/NetCommandRef.h"
-
-#ifdef DEBUG_NETCOMMANDREF
-static UnsignedInt refNum = 0;
-#endif
-
-/**
- * Constructor.  Attach to the given network command.
- */
-#ifdef DEBUG_NETCOMMANDREF
-NetCommandRef::NetCommandRef(NetCommandMsg *msg, char *filename, int line)
-#else
-NetCommandRef::NetCommandRef(NetCommandMsg *msg)
-#endif
-{
-	m_msg = msg;
-	m_next = NULL;
-	m_prev = NULL;
-	m_msg->attach();
-	m_timeLastSent = -1;
-
-#ifdef DEBUG_NETCOMMANDREF
-	m_id = ++refNum;
-	DEBUG_LOG(("NetCommandRef %d allocated in file %s line %d\n", m_id, filename, line));
-#endif
-}
-
-/**
- * Destructor. Detach from the network command.
- */
-NetCommandRef::~NetCommandRef() 
-{
-	if (m_msg != NULL) 
-	{
-		m_msg->detach();
-	}
- 	DEBUG_ASSERTCRASH(m_next == NULL, ("NetCommandRef::~NetCommandRef - m_next != NULL"));
-	DEBUG_ASSERTCRASH(m_prev == NULL, ("NetCommandRef::~NetCommandRef - m_prev != NULL"));
-
-#ifdef DEBUG_NETCOMMANDREF
-	DEBUG_LOG(("NetCommandRef %d deleted\n", m_id));
-#endif
-}
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp
deleted file mode 100644
index 7557337e807..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-////// NetCommandWrapperList.cpp ////////////////////////////////
-// Bryan Cleveland
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/NetCommandWrapperList.h"
-#include "GameNetwork/NetPacket.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////// NetCommandWrapperListNode ///////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-NetCommandWrapperListNode::NetCommandWrapperListNode(NetWrapperCommandMsg *msg) 
-{
-	//Added By Sadullah Nader
-	//Initializations inserted
-	m_next = NULL;
-
-	//
-
-	m_numChunks = msg->getNumChunks();
-	m_chunksPresent = NEW Bool[m_numChunks];	// pool[]ify
-	m_numChunksPresent = 0;
-
-	for (UnsignedInt i = 0; i < m_numChunks; ++i) {
-		m_chunksPresent[i] = FALSE;
-	}
-
-	m_dataLength = msg->getTotalDataLength();
-	m_data = NEW UnsignedByte[m_dataLength];	// pool[]ify
-
-	m_commandID = msg->getWrappedCommandID();
-}
-
-NetCommandWrapperListNode::~NetCommandWrapperListNode() {
-	if (m_chunksPresent != NULL) {
-		delete[] m_chunksPresent;
-		m_chunksPresent = NULL;
-	}
-
-	if (m_data != NULL) {
-		delete[] m_data;
-		m_data = NULL;
-	}
-}
-
-Bool NetCommandWrapperListNode::isComplete() {
-	return m_numChunksPresent == m_numChunks;
-}
-
-Int NetCommandWrapperListNode::getPercentComplete(void) {
-	if (isComplete())
-		return 100;
-	else
-		return min(99, REAL_TO_INT( ((Real)m_numChunksPresent)/((Real)m_numChunks)*100.0f ));
-}
-
-UnsignedShort NetCommandWrapperListNode::getCommandID() {
-	return m_commandID;
-}
-
-UnsignedInt NetCommandWrapperListNode::getRawDataLength() {
-	return m_dataLength;
-}
-
-void NetCommandWrapperListNode::copyChunkData(NetWrapperCommandMsg *msg) {
-	if (msg == NULL) {
-		DEBUG_CRASH(("Trying to copy data from a non-existent wrapper command message"));
-		return;
-	}
-
-	DEBUG_ASSERTCRASH(msg->getChunkNumber() < m_numChunks, ("MunkeeChunk %d of %d\n",
-		msg->getChunkNumber(), m_numChunks));
-	if (msg->getChunkNumber() >= m_numChunks)
-		return;
-
-	DEBUG_LOG(("NetCommandWrapperListNode::copyChunkData() - copying chunk %d\n",
-		msg->getChunkNumber()));
-
-	if (m_chunksPresent[msg->getChunkNumber()] == TRUE) {
-		// we already received this chunk, no need to recopy it.
-		return;
-	}
-
-	m_chunksPresent[msg->getChunkNumber()] = TRUE;
-	UnsignedInt offset = msg->getDataOffset();
-	memcpy(m_data + offset, msg->getData(), msg->getDataLength());
-	++m_numChunksPresent;
-}
-
-UnsignedByte * NetCommandWrapperListNode::getRawData() {
-	return m_data;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////// NetCommandWrapperList ///////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-NetCommandWrapperList::NetCommandWrapperList() {
-	m_list = NULL;
-}
-
-NetCommandWrapperList::~NetCommandWrapperList() {
-	NetCommandWrapperListNode *temp;
-	while (m_list != NULL) {
-		temp = m_list->m_next;
-		deleteInstance(m_list);
-		m_list = temp;
-	}
-}
-
-void NetCommandWrapperList::init() {
-	m_list = NULL;
-}
-
-void NetCommandWrapperList::reset() {
-	NetCommandWrapperListNode *temp;
-	while (m_list != NULL) {
-		temp = m_list->m_next;
-		deleteInstance(m_list);
-		m_list = temp;
-	}
-}
-
-Int NetCommandWrapperList::getPercentComplete(UnsignedShort wrappedCommandID)
-{
-	NetCommandWrapperListNode *temp = m_list;
-
-	while ((temp != NULL) && (temp->getCommandID() != wrappedCommandID)) {
-		temp = temp->m_next;
-	}
-
-	if (!temp)
-		return 0;
-
-	return temp->getPercentComplete();
-}
-
-void NetCommandWrapperList::processWrapper(NetCommandRef *ref) {
-	NetCommandWrapperListNode *temp = m_list;
-	NetWrapperCommandMsg *msg = (NetWrapperCommandMsg *)(ref->getCommand());
-
-	while ((temp != NULL) && (temp->getCommandID() != msg->getWrappedCommandID())) {
-		temp = temp->m_next;
-	}
-
-	if (temp == NULL) {
-		temp = newInstance(NetCommandWrapperListNode)(msg);
-		temp->m_next = m_list;
-		m_list = temp;
-	}
-
-	temp->copyChunkData(msg);
-}
-
-NetCommandList * NetCommandWrapperList::getReadyCommands() 
-{
-	NetCommandList *retlist = newInstance(NetCommandList);
-	retlist->init();
-
-	NetCommandWrapperListNode *temp = m_list;
-	NetCommandWrapperListNode *next = NULL;
-
-	while (temp != NULL) {
-		next = temp->m_next;
-		if (temp->isComplete()) {
-			NetCommandRef *msg = NetPacket::ConstructNetCommandMsgFromRawData(temp->getRawData(), temp->getRawDataLength());
-			NetCommandRef *ret = retlist->addMessage(msg->getCommand());
-			ret->setRelay(msg->getRelay());
-
-			deleteInstance(msg);
-			msg = NULL;
-
-			removeFromList(temp);
-			temp = NULL;
-		}
-		temp = next;
-	}
-
-	return retlist;
-}
-
-void NetCommandWrapperList::removeFromList(NetCommandWrapperListNode *node) {
-	if (node == NULL) {
-		return;
-	}
-
-	NetCommandWrapperListNode *temp = m_list;
-	NetCommandWrapperListNode *prev = NULL;
-
-	while ((temp != NULL) && (temp->getCommandID() != node->getCommandID())) {
-		prev = temp;
-		temp = temp->m_next;
-	}
-
-	if (temp == NULL) {
-		return;
-	}
-
-	if (prev == NULL) {
-		m_list = temp->m_next;
-		deleteInstance(temp);
-		temp = NULL;
-	} else {
-		prev->m_next = temp->m_next;
-		deleteInstance(temp);
-		temp = NULL;
-	}
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetMessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetMessageStream.cpp
deleted file mode 100644
index 63745860de7..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetMessageStream.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-
-// NetMessageStream.cpp
-// Holds misc functions to encapsulate GameMessages into Command Packets to send
-// over the network.
-// Author: Matthew D. Campbell, July 2001
-/*
-#include "stdlib.h"				// VC++ wants this here, or gives compile error...
-
-#include "Common/GameType.h"
-#include "Common/MessageStream.h"
-#include "Common/GameEngine.h"
-#include "GameLogic/GameLogic.h"
-#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/NetworkDefs.h"
-
-
-
-// The per-player pointers for the list of commands
-static CommandMsg *CommandHead[MAX_SLOTS] = {  /// @todo: remove static initialization
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-static CommandMsg *CommandTail[MAX_SLOTS] = {
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
-/**
- * AddToNetCommandList adds a CommandMsg to a list of commands.
- *
-static Bool AddToNetCommandList(GameMessage *msg, UnsignedInt timestamp, CommandMsg *& CommandHead, CommandMsg *& CommandTail)
-{
-	CommandMsg *cmdMsg = NEW CommandMsg(timestamp, msg);
-	if (!cmdMsg)
-	{
-		DEBUG_LOG(("Alloc failed!\n"));
-		return false;
-	}
-
-	if (CommandTail == NULL)
-	{
-		CommandHead = cmdMsg;
-		CommandTail = cmdMsg;
-	}
-	else
-	{
-		cmdMsg->SetPrevCommandMsg(CommandTail);
-		CommandTail->SetNextCommandMsg(cmdMsg);
-		CommandTail = cmdMsg;
-	}
-
-	return true;
-}
-
-/**
- * AddToRemoteNetCommandList is used by TheNetwork to queue up commands recieved from other players.
- *
-Bool AddToNetCommandList(Int playerNum, GameMessage *msg, UnsignedInt timestamp)
-{
-	if (playerNum < 0 || playerNum >= MAX_SLOTS)
-		return false;
-
-	DEBUG_LOG(("Adding msg to NetCommandList %d\n", playerNum));
-	return AddToNetCommandList(msg, timestamp, CommandHead[playerNum], CommandTail[playerNum]);
-}
-
-/**
- * GetCommandMsg returns a GameMessage (deleting its CommandMsg wrapper) that is valid
- * for the current frame, or NULL.
- *
-static GameMessage * GetCommandMsg(UnsignedInt timestamp, CommandMsg *& CommandHead, CommandMsg *& CommandTail)
-{
-	if (!CommandHead)
-		return NULL;
-
-	if (CommandHead->GetTimestamp() < timestamp)
-	{
-		DEBUG_LOG(("Time is %d, yet message timestamp is %d!\n", timestamp, CommandHead->GetTimestamp()));
-		return NULL;
-	}
-
-	if (CommandHead->GetTimestamp() != timestamp)
-		return NULL;
-
-	CommandMsg *theMsg = CommandHead;
-
-	if (CommandHead->GetNextCommandMsg())
-	{
-		CommandHead->GetNextCommandMsg()->SetPrevCommandMsg(NULL);
-		CommandHead = CommandHead->GetNextCommandMsg();
-	}
-	else
-	{
-		CommandHead = CommandTail = NULL;
-	}
-
-	GameMessage *msg = theMsg->GetGameMessage();
-	delete theMsg;
-	return msg;
-}
-
-/**
- * GetCommandMsg returns a message from the command list.
- *
-GameMessage * GetCommandMsg(UnsignedInt timestamp, Int playerNum)
-{
-	if (playerNum < 0 || playerNum >= MAX_SLOTS)
-		return NULL;
-
-	//DEBUG_LOG(("Adding msg to NetCommandList %d\n", playerNum));
-	return GetCommandMsg(timestamp, CommandHead[playerNum], CommandTail[playerNum]);
-}
-
-
-
-
-//====================================================================================
-
-// The commandBuf & commandPacket hold the commands we're building up for the frame.
-static unsigned char commandBuf[sizeof(CommandPacket)+1];
-static CommandPacket *commandPacket = (CommandPacket *)(commandBuf+1);
-
-/**
- * ClearCommandPacket clears the command packet at the start of the frame.
- *
-void ClearCommandPacket(UnsignedInt frame)
-{
-	commandPacket->m_frame = frame;
-	commandPacket->m_numCommands = 0;
-}
-
-/**
- * AddCommandToPacket creates a packet containing all move/attack/etc commands
- * for the current frame.
- *
-Bool AddCommandToPacket(const GameMessage *msg)
-{
-	int messageSize = sizeofMessageHeader + sizeofMessageArg * msg->getArgumentCount();
-
-	// If we have too much, send what we have
-	if (bytesUsed && (bytesUsed + sizeof(CommandPacketHeader) + messageSize >= MAX_MESSAGE_LEN))
-	{
-		commandBuf[0] = MSGTYPE_PARTIALCOMMAND;
-		if (!TheNetwork->queueSend(BROADCAST_CON, commandBuf, bytesUsed + sizeof(CommandPacketHeader) + 1, MSG_NEEDACK | MSG_SEQUENCED))
-		{
-			//DEBUG_ASSERTCRASH(false, ("Too many commands in one frame!  Some will be dropped."));
-			DEBUG_LOG(("Too many commands in one frame!  Some will be dropped."));
-			return false;
-		}
-		commandBuf[0] = MSGTYPE_COMMANDCOUNT;
-		commandPacket->header.m_numCommands = 0;
-		bytesUsed = 0;
-	}
-
-	if (bytesUsed + sizeof(CommandPacketHeader) + messageSize >= MAX_MESSAGE_LEN)
-	{
-		//DEBUG_ASSERTCRASH(false, ("Too many commands in one frame!  Some will be dropped."));
-		DEBUG_LOG(("Too many commands in one frame!  Some will be dropped."));
-		return false;
-	}
-
-	// We have room, so add the message
-	commandPacket->header.m_numCommands++;
-	commandPacket->m_commands[bytesUsed++] = (unsigned char)msg->getType();
-	commandPacket->m_commands[bytesUsed++] = msg->getArgumentCount();
-
-	for (int i=0; i<msg->getArgumentCount(); ++i)
-	{
-		memcpy((unsigned char *)(commandPacket->m_commands + bytesUsed), (unsigned char *)msg->getArgument(i), sizeofMessageArg);
-		bytesUsed += sizeofMessageArg;
-	}
-
-	//DEBUG_ASSERTCRASH(bytesUsed + sizeof(CommandPacketHeader) < MAX_MESSAGE_LEN, ("Memory overwrite constructing command packet!"));
-	//DEBUG_LOG(("Memory overwrite constructing command packet!"));
-	return true;
-}
-
-/**
- * TheNetwork calls GetCommandPacket to get commands to send.
- *
-CommandPacket *GetCommandPacket(void)
-{
-	commandBuf[0] = MSGTYPE_COMMANDCOUNT;
-	return commandPacket;
-}
-
-//====================================================================================
-
-*/
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetPacket.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetPacket.cpp
deleted file mode 100644
index 760a00b9059..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetPacket.cpp
+++ /dev/null
@@ -1,5858 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-////////// NetPacket.cpp ///////////////////////////
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/NetPacket.h"
-#include "GameNetwork/NetCommandMsg.h"
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/networkutil.h"
-#include "GameNetwork/GameMessageParser.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// This function assumes that all of the fields are either of default value or are
-// present in the raw data.
-NetCommandRef * NetPacket::ConstructNetCommandMsgFromRawData(UnsignedByte *data, UnsignedShort dataLength) {
-	NetCommandType commandType = NETCOMMANDTYPE_GAMECOMMAND;
-	UnsignedShort commandID = 0;
-	UnsignedInt frame = 0;
-	UnsignedByte playerID = 0;
-	UnsignedByte relay = 0;
-
-	Int offset = 0;
-	Bool notDone = TRUE;
-	NetCommandRef *ref = NULL;
-	NetCommandMsg *msg = NULL;
-
-	while ((offset < (Int)dataLength) && notDone) {
-		if (data[offset] == 'T') {
-			++offset;
-			memcpy(&commandType, data + offset, sizeof(UnsignedByte));
-			offset += sizeof(UnsignedByte);
-		} else if (data[offset] == 'R') {
-			++offset;
-			memcpy(&relay, data + offset, sizeof(UnsignedByte));
-			offset += sizeof(UnsignedByte);
-		} else if (data[offset] == 'P') {
-			++offset;
-			memcpy(&playerID, data + offset, sizeof(UnsignedByte));
-			offset += sizeof(UnsignedByte);
-		} else if (data[offset] == 'C') {
-			++offset;
-			memcpy(&commandID, data + offset, sizeof(UnsignedShort));
-			offset += sizeof(UnsignedShort);
-		} else if (data[offset] == 'F') {
-			++offset;
-			memcpy(&frame, data + offset, sizeof(UnsignedInt));
-			offset += sizeof(UnsignedInt);
-		} else if (data[offset] == 'D') {
-			++offset;
-			if (commandType == NETCOMMANDTYPE_GAMECOMMAND) {
-				msg = readGameMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_ACKBOTH) {
-				msg = readAckBothMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_ACKSTAGE1) {
-				msg = readAckStage1Message(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_ACKSTAGE2) {
-				msg = readAckStage2Message(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_FRAMEINFO) {
-				msg = readFrameMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_PLAYERLEAVE) {
-				msg = readPlayerLeaveMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_RUNAHEADMETRICS) {
-				msg = readRunAheadMetricsMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_RUNAHEAD) {
-				msg = readRunAheadMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DESTROYPLAYER) {
-				msg = readDestroyPlayerMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_KEEPALIVE) {
-				msg = readKeepAliveMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DISCONNECTKEEPALIVE) {
-				msg = readDisconnectKeepAliveMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DISCONNECTPLAYER) {
-				msg = readDisconnectPlayerMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_PACKETROUTERQUERY) {
-				msg = readPacketRouterQueryMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_PACKETROUTERACK) {
-				msg = readPacketRouterAckMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DISCONNECTCHAT) {
-				msg = readDisconnectChatMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DISCONNECTVOTE) {
-				msg = readDisconnectVoteMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_CHAT) {
-				msg = readChatMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_PROGRESS) {
-				msg = readProgressMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_LOADCOMPLETE) {
-				msg = readLoadCompleteMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_TIMEOUTSTART) {
-				msg = readTimeOutGameStartMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_WRAPPER) {
-				msg = readWrapperMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_FILE) {
-				msg = readFileMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_FILEANNOUNCE) {
-				msg = readFileAnnounceMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_FILEPROGRESS) {
-				msg = readFileProgressMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DISCONNECTFRAME) {
-				msg = readDisconnectFrameMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_DISCONNECTSCREENOFF) {
-				msg = readDisconnectScreenOffMessage(data, offset);
-			} else if (commandType == NETCOMMANDTYPE_FRAMERESENDREQUEST) {
-				msg = readFrameResendRequestMessage(data, offset);
-			}
-
-			msg->setExecutionFrame(frame);
-			msg->setID(commandID);
-			msg->setPlayerID(playerID);
-			msg->setNetCommandType(commandType);
-
-			ref = NEW_NETCOMMANDREF(msg);
-
-			ref->setRelay(relay);
-
-			msg->detach();
-			msg = NULL;
-
-			notDone = FALSE;
-		}
-	}
-
-	return ref;
-}
-
-NetPacketList NetPacket::ConstructBigCommandPacketList(NetCommandRef *ref) {
-	// if we don't have a unique command ID, then the wrapped command cannot
-	// be identified.  Therefore don't allow commands without a unique ID to
-	// be wrapped.
-	NetCommandMsg *msg = ref->getCommand();
-
-	if (!DoesCommandRequireACommandID(msg->getNetCommandType())) {
-		DEBUG_CRASH(("Trying to wrap a command that doesn't have a unique command ID"));
-		return NetPacketList();
-	}
-
-	UnsignedInt bufferSize = GetBufferSizeNeededForCommand(msg);  // need to implement.  I have a drinking problem.
-	UnsignedByte *bigPacketData = NULL;
-
-	NetPacketList packetList;
-
-	// create the buffer for the huge message and fill the buffer with that message.
-	UnsignedInt bigPacketCurrentOffset = 0;
-	bigPacketData = NEW UnsignedByte[bufferSize];
-	FillBufferWithCommand(bigPacketData, ref);
-
-	// create the wrapper command message we'll be using.
-	NetWrapperCommandMsg *wrapperMsg = newInstance(NetWrapperCommandMsg);
-	// get the amount of space needed for the wrapper message, not including the wrapped command data.
-	UnsignedInt wrapperSize = GetBufferSizeNeededForCommand(wrapperMsg);
-	UnsignedInt commandSizePerPacket = MAX_PACKET_SIZE - wrapperSize;
-
-	UnsignedInt numChunks = bufferSize / commandSizePerPacket;
-	if ((bufferSize % commandSizePerPacket) > 0) {
-		++numChunks;
-	}
-	UnsignedInt currentChunk = 0;
-
-	// create the packets and the wrapper messages.
-	while (currentChunk < numChunks) {
-		NetPacket *packet = newInstance(NetPacket);
-
-		UnsignedShort dataSizeThisPacket = commandSizePerPacket;
-		if ((bufferSize - bigPacketCurrentOffset) < dataSizeThisPacket) {
-			dataSizeThisPacket = bufferSize - bigPacketCurrentOffset;
-		}
-
-		if (DoesCommandRequireACommandID(wrapperMsg->getNetCommandType())) {
-			wrapperMsg->setID(GenerateNextCommandID());
-		}
-		wrapperMsg->setPlayerID(msg->getPlayerID());
-		wrapperMsg->setExecutionFrame(msg->getExecutionFrame());
-
-		wrapperMsg->setChunkNumber(currentChunk);
-		wrapperMsg->setNumChunks(numChunks);
-		wrapperMsg->setDataOffset(bigPacketCurrentOffset);
-		wrapperMsg->setData(bigPacketData + bigPacketCurrentOffset, dataSizeThisPacket);
-		wrapperMsg->setTotalDataLength(bufferSize);
-		wrapperMsg->setWrappedCommandID(msg->getID());
-
-		bigPacketCurrentOffset += dataSizeThisPacket;
-
-		NetCommandRef * ref = NEW_NETCOMMANDREF(wrapperMsg);
-		ref->setRelay(ref->getRelay());
-
-		if (packet->addCommand(ref) == FALSE) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::BeginBigCommandPacketList - failed to add a wrapper command to the packet\n")); // I still have a drinking problem.
-		}
-
-		packetList.push_back(packet);
-
-		deleteInstance(ref);
-		ref = NULL;
-
-		++currentChunk;
-	}
-	wrapperMsg->detach();
-	wrapperMsg = NULL;
-
-	delete[] bigPacketData;
-	bigPacketData = NULL;
-
-	return packetList;
-}
-
-UnsignedInt NetPacket::GetBufferSizeNeededForCommand(NetCommandMsg *msg) {
-	// This is where the fun begins...
-
-	if (msg == NULL) {
-		return TRUE; // There was nothing to add, so it was successful.
-	}
-
-	switch(msg->getNetCommandType())
-	{
-		case NETCOMMANDTYPE_GAMECOMMAND:
-			return GetGameCommandSize(msg);
-		case NETCOMMANDTYPE_ACKSTAGE1:
-		case NETCOMMANDTYPE_ACKSTAGE2:
-		case NETCOMMANDTYPE_ACKBOTH:
-			return GetAckCommandSize(msg);
-		case NETCOMMANDTYPE_FRAMEINFO:
-			return GetFrameCommandSize(msg);
-		case NETCOMMANDTYPE_PLAYERLEAVE:
-			return GetPlayerLeaveCommandSize(msg);
-		case NETCOMMANDTYPE_RUNAHEADMETRICS:
-			return GetRunAheadMetricsCommandSize(msg);
-		case NETCOMMANDTYPE_RUNAHEAD:
-			return GetRunAheadCommandSize(msg);
-		case NETCOMMANDTYPE_DESTROYPLAYER:
-			return GetDestroyPlayerCommandSize(msg);
-		case NETCOMMANDTYPE_KEEPALIVE:
-			return GetKeepAliveCommandSize(msg);
-		case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
-			return GetDisconnectKeepAliveCommandSize(msg);
-		case NETCOMMANDTYPE_DISCONNECTPLAYER:
-			return GetDisconnectPlayerCommandSize(msg);
-		case NETCOMMANDTYPE_PACKETROUTERQUERY:
-			return GetPacketRouterQueryCommandSize(msg);
-		case NETCOMMANDTYPE_PACKETROUTERACK:
-			return GetPacketRouterAckCommandSize(msg);
-		case NETCOMMANDTYPE_DISCONNECTCHAT:
-			return GetDisconnectChatCommandSize(msg);
-		case NETCOMMANDTYPE_DISCONNECTVOTE:
-			return GetDisconnectVoteCommandSize(msg);
-		case NETCOMMANDTYPE_CHAT:
-			return GetChatCommandSize(msg);
-		case NETCOMMANDTYPE_PROGRESS:
-			return GetProgressMessageSize(msg);
-		case NETCOMMANDTYPE_LOADCOMPLETE:
-			return GetLoadCompleteMessageSize(msg);
-		case NETCOMMANDTYPE_TIMEOUTSTART:
-			return GetTimeOutGameStartMessageSize(msg);
-		case NETCOMMANDTYPE_WRAPPER:
-			return GetWrapperCommandSize(msg);
-		case NETCOMMANDTYPE_FILE:
-			return GetFileCommandSize(msg);
-		case NETCOMMANDTYPE_FILEANNOUNCE:
-			return GetFileAnnounceCommandSize(msg);
-		case NETCOMMANDTYPE_FILEPROGRESS:
-			return GetFileProgressCommandSize(msg);
-		case NETCOMMANDTYPE_DISCONNECTFRAME:
-			return GetDisconnectFrameCommandSize(msg);
-		case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
-			return GetDisconnectScreenOffCommandSize(msg);
-		case NETCOMMANDTYPE_FRAMERESENDREQUEST:
-			return GetFrameResendRequestCommandSize(msg);
-		default:
-			DEBUG_CRASH(("Unknown NETCOMMANDTYPE %d", msg->getNetCommandType()));
-			break;
-	}
-
-	return 0;
-}
-
-UnsignedInt NetPacket::GetGameCommandSize(NetCommandMsg *msg) {
-	NetGameCommandMsg *cmdMsg = (NetGameCommandMsg *)msg;
-
-	UnsignedShort msglen = 0;
-	msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte); // frame number
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // relay
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // command type
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte); // command ID
-	msglen += sizeof(UnsignedByte); // the 'D' for the data section.
-
-	GameMessage *gmsg = cmdMsg->constructGameMessage();
-	GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
-
-	msglen += sizeof(GameMessage::Type);
-	msglen += sizeof(UnsignedByte);
-//	Int numTypes = parser->getNumTypes();
-	GameMessageParserArgumentType *arg = parser->getFirstArgumentType();
-	while (arg != NULL) {
-		msglen += 2 * sizeof(UnsignedByte); // for the type and number of args of that type declaration.
-		GameMessageArgumentDataType type = arg->getType();
-		if (type == ARGUMENTDATATYPE_INTEGER) {
-			msglen += arg->getArgCount() * sizeof(Int);
-		} else if (type == ARGUMENTDATATYPE_REAL) {
-			msglen += arg->getArgCount() * sizeof(Real);
-		} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-			msglen += arg->getArgCount() * sizeof(Bool);
-		} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-			msglen += arg->getArgCount() * sizeof(ObjectID);
-		} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-			msglen += arg->getArgCount() * sizeof(DrawableID);
-		} else if (type == ARGUMENTDATATYPE_TEAMID) {
-			msglen += arg->getArgCount() * sizeof(UnsignedInt);
-		} else if (type == ARGUMENTDATATYPE_LOCATION) {
-			msglen += arg->getArgCount() * sizeof(Coord3D);
-		} else if (type == ARGUMENTDATATYPE_PIXEL) {
-			msglen += arg->getArgCount() * sizeof(ICoord2D);
-		} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-			msglen += arg->getArgCount() * sizeof(IRegion2D);
-		} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {
-			msglen += arg->getArgCount() * sizeof(UnsignedInt);
-		} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-			msglen += arg->getArgCount() * sizeof(WideChar);
-		}
-		arg = arg->getNext();
-	}
-
-	deleteInstance(parser);
-	parser = NULL;
-
-	deleteInstance(gmsg);
-	gmsg = NULL;
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetAckCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen;
-	msglen += sizeof(UnsignedShort);
-	msglen += sizeof(UnsignedByte);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetFrameCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen;
-	msglen += sizeof(UnsignedShort);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetPlayerLeaveCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetRunAheadMetricsCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(Real);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetRunAheadCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen;
-	msglen += sizeof(UnsignedShort);
-	msglen += sizeof(UnsignedByte);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDestroyPlayerCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen;
-	msglen += sizeof(UnsignedInt);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetKeepAliveCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // For the 'D'
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDisconnectKeepAliveCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // For the 'D'
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDisconnectPlayerCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen; // the 'D'
-	msglen += sizeof(UnsignedByte); // slot number
-	msglen += sizeof(UnsignedInt);	// disconnect frame
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetPacketRouterQueryCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // the 'D'
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetPacketRouterAckCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // the 'D'
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDisconnectChatCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-	NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg);
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // the 'D'
-	msglen += sizeof(UnsignedByte); // string msglength
-	UnsignedByte textmsglen = cmdMsg->getText().getLength();
-	msglen += textmsglen * sizeof(UnsignedShort);
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDisconnectVoteCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen; // the 'D'
-	msglen += sizeof(UnsignedByte); // slot number
-	msglen += sizeof(UnsignedInt); // vote frame.
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetChatCommandSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-	NetChatCommandMsg *cmdMsg = (NetChatCommandMsg *)(msg);
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-
-	++msglen; // the 'D'
-	msglen += sizeof(UnsignedByte); // string msglength
-	UnsignedByte textmsglen = cmdMsg->getText().getLength();
-	msglen += textmsglen * sizeof(UnsignedShort);
-	msglen += sizeof(Int); // playerMask
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetProgressMessageSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // For the 'D'
-	++msglen; // percentage
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetLoadCompleteMessageSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // For the 'D'
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetTimeOutGameStartMessageSize(NetCommandMsg *msg) {
-	Int msglen = 0;
-
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	++msglen;
-	msglen += sizeof(UnsignedByte);
-
-	++msglen; // For the 'D'
-
-	return msglen;
-}
-
-// type, player, ID, relay, Data
-UnsignedInt NetPacket::GetWrapperCommandSize(NetCommandMsg *msg) {
-	UnsignedInt msglen = 0;
-
-	++msglen; // 'T'
-	msglen += sizeof(UnsignedByte); // command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay
-	++msglen; // 'D'
-
-	msglen += sizeof(UnsignedShort); // m_wrappedCommandID
-	msglen += sizeof(UnsignedInt); // m_chunkNumber
-	msglen += sizeof(UnsignedInt); // m_numChunks
-	msglen += sizeof(UnsignedInt); // m_totalDataLength
-	msglen += sizeof(UnsignedInt); // m_dataLength
-	msglen += sizeof(UnsignedInt); // m_dataOffset
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetFileCommandSize(NetCommandMsg *msg) {
-	NetFileCommandMsg *filemsg = (NetFileCommandMsg *)msg;
-	UnsignedInt msglen = 0;
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay
-
-	++msglen; // 'D'
-
-	msglen += filemsg->getPortableFilename().getLength() + 1; // PORTABLE filename and the terminating 0
-	msglen += sizeof(UnsignedInt); // file data length
-	msglen += filemsg->getFileLength(); // the file data
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetFileAnnounceCommandSize(NetCommandMsg *msg) {
-	NetFileAnnounceCommandMsg *filemsg = (NetFileAnnounceCommandMsg *)msg;
-	UnsignedInt msglen = 0;
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay
-
-	++msglen; // 'D'
-
-	msglen += filemsg->getPortableFilename().getLength() + 1; // PORTABLE filename and the terminating 0
-	msglen += sizeof(UnsignedShort); // m_fileID
-	msglen += sizeof(UnsignedByte); // m_playerMask
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetFileProgressCommandSize(NetCommandMsg *msg) {
-	UnsignedInt msglen = 0;
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'T' and command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte); // 'R' and relay
-
-	++msglen; // 'D'
-
-	msglen += sizeof(UnsignedShort); // m_fileID
-	msglen += sizeof(Int); // m_progress
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDisconnectFrameCommandSize(NetCommandMsg *msg) {
-	UnsignedInt msglen = 0;
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'T' and command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'R' and relay
-
-	++msglen; // 'D'
-	msglen += sizeof(UnsignedInt); // disconnect frame
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetDisconnectScreenOffCommandSize(NetCommandMsg *msg) {
-	UnsignedInt msglen = 0;
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'T' and command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'R' and relay
-
-	++msglen; // 'D'
-	msglen += sizeof(UnsignedInt); // new frame
-
-	return msglen;
-}
-
-UnsignedInt NetPacket::GetFrameResendRequestCommandSize(NetCommandMsg *msg) {
-	UnsignedInt msglen = 0;
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'T' and command type
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'P' and player ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // 'C' and command ID
-	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// 'R' and relay
-
-	++msglen; // 'D'
-	msglen += sizeof(UnsignedInt); // frame to resend
-
-	return msglen;
-}
-
-// this function assumes that buffer is already the correct size.
-void NetPacket::FillBufferWithCommand(UnsignedByte *buffer, NetCommandRef *ref) {
-	NetCommandMsg *msg = ref->getCommand();
-
-	switch(msg->getNetCommandType())
-	{
-		case NETCOMMANDTYPE_GAMECOMMAND:
-			FillBufferWithGameCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_ACKSTAGE1:
-		case NETCOMMANDTYPE_ACKSTAGE2:
-		case NETCOMMANDTYPE_ACKBOTH:
-			FillBufferWithAckCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_FRAMEINFO:
-			FillBufferWithFrameCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_PLAYERLEAVE:
-			FillBufferWithPlayerLeaveCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_RUNAHEADMETRICS:
-			FillBufferWithRunAheadMetricsCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_RUNAHEAD:
-			FillBufferWithRunAheadCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DESTROYPLAYER:
-			FillBufferWithDestroyPlayerCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_KEEPALIVE:
-			FillBufferWithKeepAliveCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
-			FillBufferWithDisconnectKeepAliveCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DISCONNECTPLAYER:
-			FillBufferWithDisconnectPlayerCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_PACKETROUTERQUERY:
-			FillBufferWithPacketRouterQueryCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_PACKETROUTERACK:
-			FillBufferWithPacketRouterAckCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DISCONNECTCHAT:
-			FillBufferWithDisconnectChatCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DISCONNECTVOTE:
-			FillBufferWithDisconnectVoteCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_CHAT:
-			FillBufferWithChatCommand(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_PROGRESS:
-			FillBufferWithProgressMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_LOADCOMPLETE:
-			FillBufferWithLoadCompleteMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_TIMEOUTSTART:
-			FillBufferWithTimeOutGameStartMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_FILE:
-			FillBufferWithFileMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_FILEANNOUNCE:
-			FillBufferWithFileAnnounceMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_FILEPROGRESS:
-			FillBufferWithFileProgressMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DISCONNECTFRAME:
-			FillBufferWithDisconnectFrameMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
-			FillBufferWithDisconnectScreenOffMessage(buffer, ref);
-			break;
-		case NETCOMMANDTYPE_FRAMERESENDREQUEST:
-			FillBufferWithFrameResendRequestMessage(buffer, ref);
-			break;
-		default:
-			DEBUG_CRASH(("Unknown NETCOMMANDTYPE %d", msg->getNetCommandType()));
-			break;
-	}
-}
-
-void NetPacket::FillBufferWithGameCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetGameCommandMsg *cmdMsg = (NetGameCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-	// get the game message from the NetCommandMsg
-	GameMessage *gmsg = cmdMsg->constructGameMessage();
-
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithGameCommand for command ID %d\n", cmdMsg->getID()));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, put the execution frame into the packet.
-	buffer[offset] = 'F';
-	++offset;
-	UnsignedInt newframe = cmdMsg->getExecutionFrame();
-	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-
-	// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, put the playerID into the packet.
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-	buffer[offset] = 'D';
-	++offset;
-
-	// Now copy the GameMessage type into the packet.
-	GameMessage::Type newType = gmsg->getType();
-	memcpy(buffer + offset, &newType, sizeof(GameMessage::Type));
-	offset += sizeof(GameMessage::Type);
-
-
-	GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
-	UnsignedByte numTypes = parser->getNumTypes();
-	memcpy(buffer + offset, &numTypes, sizeof(numTypes));
-	offset += sizeof(numTypes);
-
-	GameMessageParserArgumentType *argType = parser->getFirstArgumentType();
-	while (argType != NULL) {
-		UnsignedByte type = (UnsignedByte)(argType->getType());
-		memcpy(buffer + offset, &type, sizeof(type));
-		offset += sizeof(type);
-
-		UnsignedByte argTypeCount = argType->getArgCount();
-		memcpy(buffer + offset, &argTypeCount, sizeof(argTypeCount));
-		offset += sizeof(argTypeCount);
-
-		argType = argType->getNext();
-	}
-
-	Int numArgs = gmsg->getArgumentCount();
-	for (Int i = 0; i < numArgs; ++i) {
-		GameMessageArgumentDataType type = gmsg->getArgumentDataType(i);
-		GameMessageArgumentType arg = *(gmsg->getArgument(i));
-//		writeGameMessageArgumentToPacket(type, arg);
-
-		if (type == ARGUMENTDATATYPE_INTEGER) {
-			memcpy(buffer + offset, &(arg.integer), sizeof(arg.integer));
-			offset += sizeof(arg.integer);
-		} else if (type == ARGUMENTDATATYPE_REAL) {
-			memcpy(buffer + offset, &(arg.real), sizeof(arg.real));
-			offset += sizeof(arg.real);
-		} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-			memcpy(buffer + offset, &(arg.boolean), sizeof(arg.boolean));
-			offset += sizeof(arg.boolean);
-		} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-			memcpy(buffer + offset, &(arg.objectID), sizeof(arg.objectID));
-			offset += sizeof(arg.objectID);
-		} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-			memcpy(buffer + offset, &(arg.drawableID), sizeof(arg.drawableID));
-			offset += sizeof(arg.drawableID);
-		} else if (type == ARGUMENTDATATYPE_TEAMID) {
-			memcpy(buffer + offset, &(arg.teamID), sizeof(arg.teamID));
-			offset += sizeof(arg.teamID);
-		} else if (type == ARGUMENTDATATYPE_LOCATION) {
-			memcpy(buffer + offset, &(arg.location), sizeof(arg.location));
-			offset += sizeof(arg.location);
-		} else if (type == ARGUMENTDATATYPE_PIXEL) {
-			memcpy(buffer + offset, &(arg.pixel), sizeof(arg.pixel));
-			offset += sizeof(arg.pixel);
-		} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-			memcpy(buffer + offset, &(arg.pixelRegion), sizeof(arg.pixelRegion));
-			offset += sizeof(arg.pixelRegion);
-		} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {
-			memcpy(buffer + offset, &(arg.timestamp), sizeof(arg.timestamp));
-			offset += sizeof(arg.timestamp);
-		} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-			memcpy(buffer + offset, &(arg.wChar), sizeof(arg.wChar));
-			offset += sizeof(arg.wChar);
-		}
-	}
-
-	deleteInstance(parser);
-	parser = NULL;
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addGameMessage - added game message, frame %d, player %d, command ID %d\n", m_lastFrame, m_lastPlayerID, m_lastCommandID));
-
-	if (gmsg)
-		deleteInstance(gmsg);
-	gmsg = NULL;
-}
-
-void NetPacket::FillBufferWithAckCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithAckCommand - adding ack for command %d for player %d\n", cmdMsg->getCommandID(), msg->getCommand()->getPlayerID()));
-
-	NetCommandMsg *cmdMsg = msg->getCommand();
-	UnsignedShort offset = 0;
-
-	UnsignedShort commandID = 0;
-	UnsignedByte originalPlayerID = 0;
-
-	if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
-		NetAckBothCommandMsg *ackmsg = (NetAckBothCommandMsg *)msg;
-		commandID = ackmsg->getCommandID();
-		originalPlayerID = ackmsg->getOriginalPlayerID();
-	} else if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) {
-		NetAckStage1CommandMsg *ackmsg = (NetAckStage1CommandMsg *)msg;
-		commandID = ackmsg->getCommandID();
-		originalPlayerID = ackmsg->getOriginalPlayerID();
-	} else if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) {
-		NetAckStage2CommandMsg *ackmsg = (NetAckStage2CommandMsg *)msg;
-		commandID = ackmsg->getCommandID();
-		originalPlayerID = ackmsg->getOriginalPlayerID();
-	}
-
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// Put in the command id of the command we are acking.
-	buffer[offset] = 'D';
-	++offset;
-	memcpy(buffer + offset, &commandID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-	memcpy(buffer + offset, &originalPlayerID, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added ACK, original player %d, command id %d\n", origPlayerID, cmdID));
-}
-
-void NetPacket::FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetFrameCommandMsg *cmdMsg = (NetFrameCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-	//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addFrameCommand - adding frame command for frame %d, command count = %d, command id = %d\n", cmdMsg->getExecutionFrame(), cmdMsg->getCommandCount(), cmdMsg->getID()));
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the execution frame into the packet.
-	buffer[offset] = 'F';
-	++offset;
-	UnsignedInt newframe = cmdMsg->getExecutionFrame();
-	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnsignedShort cmdCount = cmdMsg->getCommandCount();
-	memcpy(buffer + offset, &cmdCount, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-	// frameinfodebug
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added frame %d, player %d, command count = %d, command id = %d\n", cmdMsg->getExecutionFrame(), cmdMsg->getPlayerID(), cmdMsg->getCommandCount(), cmdMsg->getID()));
-}
-
-void NetPacket::FillBufferWithPlayerLeaveCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetPlayerLeaveCommandMsg *cmdMsg = (NetPlayerLeaveCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPlayerLeaveCommand - adding player leave command for player %d\n", cmdMsg->getLeavingPlayerID()));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the execution frame into the packet.
-	buffer[offset] = 'F';
-	++offset;
-	UnsignedInt newframe = cmdMsg->getExecutionFrame();
-	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnsignedByte leavingPlayerID = cmdMsg->getLeavingPlayerID();
-	memcpy(buffer + offset, &leavingPlayerID, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-}
-
-void NetPacket::FillBufferWithRunAheadMetricsCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetRunAheadMetricsCommandMsg *cmdMsg = (NetRunAheadMetricsCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadMetricsCommand - adding run ahead metrics for player %d, fps = %d, latency = %f\n", cmdMsg->getPlayerID(), cmdMsg->getAverageFps(), cmdMsg->getAverageLatency()));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	// write the average latency
-	Real averageLatency = cmdMsg->getAverageLatency();
-	memcpy(buffer + offset, &averageLatency, sizeof(averageLatency));
-	offset += sizeof(averageLatency);
-	// write the average fps
-	UnsignedShort averageFps = (UnsignedShort)(cmdMsg->getAverageFps());
-	memcpy(buffer + offset, &averageFps, sizeof(averageFps));
-	offset += sizeof(averageFps);
-}
-
-void NetPacket::FillBufferWithRunAheadCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetRunAheadCommandMsg *cmdMsg = (NetRunAheadCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::FillBufferWithRunAheadCommand - adding run ahead command\n"));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, put the execution frame into the packet.
-	buffer[offset] = 'F';
-	++offset;
-	UnsignedInt newframe = cmdMsg->getExecutionFrame();
-	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-	// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnsignedShort newRunAhead = cmdMsg->getRunAhead();
-	memcpy(buffer + offset, &newRunAhead, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-	UnsignedByte newFrameRate = cmdMsg->getFrameRate();
-	memcpy(buffer + offset, &newFrameRate, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added run ahead command, frame %d, player id %d command id %d\n", m_lastFrame, m_lastPlayerID, m_lastCommandID));
-}
-
-void NetPacket::FillBufferWithDestroyPlayerCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDestroyPlayerCommandMsg *cmdMsg = (NetDestroyPlayerCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadCommand - adding run ahead command\n"));
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the execution frame into the packet.
-	buffer[offset] = 'F';
-	++offset;
-	UnsignedInt newframe = cmdMsg->getExecutionFrame();
-	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnsignedInt newVal = cmdMsg->getPlayerIndex();
-	memcpy(buffer + offset, &newVal, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-}
-
-void NetPacket::FillBufferWithKeepAliveCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetKeepAliveCommandMsg *cmdMsg = (NetKeepAliveCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	buffer[offset] = 'D';
-	++offset;
-}
-
-void NetPacket::FillBufferWithDisconnectKeepAliveCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDisconnectKeepAliveCommandMsg *cmdMsg = (NetDisconnectKeepAliveCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-
-	// Put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// Put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-	
-	// Put the player ID into the packet.
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	buffer[offset] = 'D';
-	++offset;
-}
-
-void NetPacket::FillBufferWithDisconnectPlayerCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDisconnectPlayerCommandMsg *cmdMsg = (NetDisconnectPlayerCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - adding run ahead command\n"));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-	//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnsignedByte slot = cmdMsg->getDisconnectSlot();
-	memcpy(buffer + offset, &slot, sizeof(slot));
-	offset += sizeof(slot);
-
-	UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame();
-	memcpy(buffer + offset, &disconnectFrame, sizeof(disconnectFrame));
-	offset += sizeof(disconnectFrame);
-}
-
-void NetPacket::FillBufferWithPacketRouterQueryCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetPacketRouterQueryCommandMsg *cmdMsg = (NetPacketRouterQueryCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterQueryCommand - adding packet router query command\n"));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-	buffer[offset] = 'D';
-	++offset;
-}
-
-void NetPacket::FillBufferWithPacketRouterAckCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterAckCommand - adding packet router query command\n"));
-
-	// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-	buffer[offset] = 'D';
-	++offset;
-}
-
-void NetPacket::FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command\n"));
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnicodeString unitext = cmdMsg->getText();
-	UnsignedByte length = unitext.getLength();
-	memcpy(buffer + offset, &length, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	memcpy(buffer + offset, unitext.str(), length * sizeof(UnsignedShort));
-	offset += length * sizeof(UnsignedShort);
-}
-
-void NetPacket::FillBufferWithDisconnectVoteCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - adding run ahead command\n"));
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnsignedByte slot = cmdMsg->getSlot();
-	memcpy(buffer + offset, &slot, sizeof(slot));
-	offset += sizeof(slot);
-
-	UnsignedInt voteFrame = cmdMsg->getVoteFrame();
-	memcpy(buffer + offset, &voteFrame, sizeof(voteFrame));
-	offset += sizeof(voteFrame);
-}
-
-void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetChatCommandMsg *cmdMsg = (NetChatCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command\n"));
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the execution frame into the packet.
-	buffer[offset] = 'F';
-	++offset;
-	UnsignedInt newframe = cmdMsg->getExecutionFrame();
-	memcpy(buffer+offset, &newframe, sizeof(UnsignedInt));
-	offset += sizeof(UnsignedInt);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-	buffer[offset] = 'D';
-	++offset;
-	UnicodeString unitext = cmdMsg->getText();
-	UnsignedByte length = unitext.getLength();
-	Int playerMask = cmdMsg->getPlayerMask();
-	memcpy(buffer + offset, &length, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	memcpy(buffer + offset, unitext.str(), length * sizeof(UnsignedShort));
-	offset += length * sizeof(UnsignedShort);
-
-	memcpy(buffer + offset, &playerMask, sizeof(Int));
-	offset += sizeof(Int);
-}
-
-void NetPacket::FillBufferWithProgressMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetProgressCommandMsg *cmdMsg = (NetProgressCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-// Put the player ID into the packet.
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	buffer[offset] = 'D';
-	++offset;
-
-	buffer[offset] = cmdMsg->getPercentage();
-	++offset;
-}
-
-void NetPacket::FillBufferWithLoadCompleteMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetCommandMsg *cmdMsg = (NetCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-	buffer[offset] = 'D';
-	++offset;
-}
-
-void NetPacket::FillBufferWithTimeOutGameStartMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetCommandMsg *cmdMsg = (NetCommandMsg *)(msg->getCommand());
-	UnsignedShort offset = 0;
-
-// If necessary, put the NetCommandType into the packet.
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, put the relay into the packet.
-	buffer[offset] = 'R';
-	++offset;
-	UnsignedByte newRelay = msg->getRelay();
-	memcpy(buffer+offset, &newRelay, sizeof(UnsignedByte));
-	offset += sizeof(UnsignedByte);
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-// If necessary, specify the command ID of this command.
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(UnsignedShort));
-	offset += sizeof(UnsignedShort);
-
-	buffer[offset] = 'D';
-	++offset;
-}
-
-void NetPacket::FillBufferWithFileMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetFileCommandMsg *cmdMsg = (NetFileCommandMsg *)(msg->getCommand());
-	UnsignedInt offset = 0;
-
-	// command type
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// relay
-	buffer[offset] = 'R';
-	++offset;
-	buffer[offset] = msg->getRelay();
-	offset += sizeof(UnsignedByte);
-
-	// player ID
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// command ID
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(newID));
-	offset += sizeof(newID);
-
-	// data
-	buffer[offset] = 'D';
-	++offset;
-
-	AsciiString filename = cmdMsg->getPortableFilename();	// PORTABLE
-	for (Int i = 0; i < filename.getLength(); ++i) {
-		buffer[offset] = filename.getCharAt(i);
-		++offset;
-	}
-	buffer[offset] = 0;
-	++offset;
-
-	UnsignedInt newInt = cmdMsg->getFileLength();
-	memcpy(buffer + offset, &newInt, sizeof(newInt));
-	offset += sizeof(newInt);
-
-	memcpy(buffer + offset, cmdMsg->getFileData(), cmdMsg->getFileLength());
-	offset += cmdMsg->getFileLength();
-}
-
-void NetPacket::FillBufferWithFileAnnounceMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetFileAnnounceCommandMsg *cmdMsg = (NetFileAnnounceCommandMsg *)(msg->getCommand());
-	UnsignedInt offset = 0;
-
-	// command type
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// relay
-	buffer[offset] = 'R';
-	++offset;
-	buffer[offset] = msg->getRelay();
-	offset += sizeof(UnsignedByte);
-
-	// player ID
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// command ID
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(newID));
-	offset += sizeof(newID);
-
-	// data
-	buffer[offset] = 'D';
-	++offset;
-
-	AsciiString filename = cmdMsg->getPortableFilename();	// PORTABLE
-	for (Int i = 0; i < filename.getLength(); ++i) {
-		buffer[offset] = filename.getCharAt(i);
-		++offset;
-	}
-	buffer[offset] = 0;
-	++offset;
-
-	UnsignedShort fileID = cmdMsg->getFileID();
-	memcpy(buffer + offset, &fileID, sizeof(fileID));
-	offset += sizeof(fileID);
-
-	UnsignedByte playerMask = cmdMsg->getPlayerMask();
-	memcpy(buffer + offset, &playerMask, sizeof(playerMask));
-	offset += sizeof(playerMask);
-}
-
-void NetPacket::FillBufferWithFileProgressMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetFileProgressCommandMsg *cmdMsg = (NetFileProgressCommandMsg *)(msg->getCommand());
-	UnsignedInt offset = 0;
-
-	// command type
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// relay
-	buffer[offset] = 'R';
-	++offset;
-	buffer[offset] = msg->getRelay();
-	offset += sizeof(UnsignedByte);
-
-	// player ID
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// command ID
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(newID));
-	offset += sizeof(newID);
-
-	// data
-	buffer[offset] = 'D';
-	++offset;
-
-	UnsignedShort fileID = cmdMsg->getFileID();
-	memcpy(buffer + offset, &fileID, sizeof(fileID));
-	offset += sizeof(fileID);
-
-	Int progress = cmdMsg->getProgress();
-	memcpy(buffer + offset, &progress, sizeof(progress));
-	offset += sizeof(progress);
-}
-
-void NetPacket::FillBufferWithDisconnectFrameMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)(msg->getCommand());
-	UnsignedInt offset = 0;
-
-	// command type
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// relay
-	buffer[offset] = 'R';
-	++offset;
-	buffer[offset] = msg->getRelay();
-	offset += sizeof(UnsignedByte);
-
-	// player ID
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// command ID
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(newID));
-	offset += sizeof(newID);
-
-	// data
-	buffer[offset] = 'D';
-	++offset;
-
-	UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame();
-	memcpy(buffer + offset, &disconnectFrame, sizeof(disconnectFrame));
-	offset += sizeof(disconnectFrame);
-}
-
-void NetPacket::FillBufferWithDisconnectScreenOffMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)(msg->getCommand());
-	UnsignedInt offset = 0;
-
-	// command type
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// relay
-	buffer[offset] = 'R';
-	++offset;
-	buffer[offset] = msg->getRelay();
-	offset += sizeof(UnsignedByte);
-
-	// player ID
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// command ID
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(newID));
-	offset += sizeof(newID);
-
-	// data
-	buffer[offset] = 'D';
-	++offset;
-
-	UnsignedInt newFrame = cmdMsg->getNewFrame();
-	memcpy(buffer + offset, &newFrame, sizeof(newFrame));
-	offset += sizeof(newFrame);
-}
-
-void NetPacket::FillBufferWithFrameResendRequestMessage(UnsignedByte *buffer, NetCommandRef *msg) {
-	NetFrameResendRequestCommandMsg *cmdMsg = (NetFrameResendRequestCommandMsg *)(msg->getCommand());
-	UnsignedInt offset = 0;
-
-	// command type
-	buffer[offset] = 'T';
-	++offset;
-	buffer[offset] = cmdMsg->getNetCommandType();
-	offset += sizeof(UnsignedByte);
-
-	// relay
-	buffer[offset] = 'R';
-	++offset;
-	buffer[offset] = msg->getRelay();
-	offset += sizeof(UnsignedByte);
-
-	// player ID
-	buffer[offset] = 'P';
-	++offset;
-	buffer[offset] = cmdMsg->getPlayerID();
-	offset += sizeof(UnsignedByte);
-
-	// command ID
-	buffer[offset] = 'C';
-	++offset;
-	UnsignedShort newID = cmdMsg->getID();
-	memcpy(buffer + offset, &newID, sizeof(newID));
-	offset += sizeof(newID);
-
-	// data
-	buffer[offset] = 'D';
-	++offset;
-
-	UnsignedInt frameToResend = cmdMsg->getFrameToResend();
-	memcpy(buffer + offset, &frameToResend, sizeof(frameToResend));
-	offset += sizeof(frameToResend);
-}
-
-
-/**
- * Constructor
- */
-NetPacket::NetPacket() {
-	init();
-}
-
-/**
- * Constructor given raw transport data.
- */
-NetPacket::NetPacket(TransportMessage *msg) {
-	init();
-	m_packetLen = msg->length;
-	memcpy(m_packet, msg->data, MAX_PACKET_SIZE);
-	m_numCommands = -1;
-	m_addr = msg->addr;
-	m_port = msg->port;
-}
-
-/**
- * Destructor
- */
-NetPacket::~NetPacket() {
-	if (m_lastCommand != NULL) {
-		deleteInstance(m_lastCommand);
-		m_lastCommand = NULL;
-	}
-}
-
-/**
- * Initialize all the member variable values.
- */
-void NetPacket::init() {
-	m_addr = 0;
-	m_port = 0;
-	m_numCommands = 0;
-	m_packetLen = 0;
-	m_packet[0] = 0;
-
-	m_lastPlayerID = 0;
-	m_lastFrame = 0;
-	m_lastCommandID = 0;
-	m_lastCommandType = 0;
-	m_lastRelay = 0;
-
-	m_lastCommand = NULL;
-}
-
-void NetPacket::reset() {
-	if (m_lastCommand != NULL) {
-		deleteInstance(m_lastCommand);
-		m_lastCommand = NULL;
-	}
-	init();
-}
-
-/**
- * Set the address to which this packet is to be sent.
- */
-void NetPacket::setAddress(Int addr, Int port) {
-	m_addr = addr;
-	m_port = port;
-}
-
-/**
- * Adds this command to the packet.  Returns false if there wasn't enough room
- * in the packet for this message, true otherwise.
- */
-Bool NetPacket::addCommand(NetCommandRef *msg) {
-	// This is where the fun begins...
-
-	NetCommandMsg *cmdMsg = msg->getCommand();
-
-	if (msg == NULL) {
-		return TRUE; // There was nothing to add, so it was successful.
-	}
-
-	switch(cmdMsg->getNetCommandType())
-	{
-		case NETCOMMANDTYPE_GAMECOMMAND:
-			return addGameCommand(msg);
-		case NETCOMMANDTYPE_ACKSTAGE1:
-			return addAckStage1Command(msg);
-		case NETCOMMANDTYPE_ACKSTAGE2:
-			return addAckStage2Command(msg);
-		case NETCOMMANDTYPE_ACKBOTH:
-			return addAckBothCommand(msg);
-		case NETCOMMANDTYPE_FRAMEINFO:
-			return addFrameCommand(msg);
-		case NETCOMMANDTYPE_PLAYERLEAVE:
-			return addPlayerLeaveCommand(msg);
-		case NETCOMMANDTYPE_RUNAHEADMETRICS:
-			return addRunAheadMetricsCommand(msg);
-		case NETCOMMANDTYPE_RUNAHEAD:
-			return addRunAheadCommand(msg);
-		case NETCOMMANDTYPE_DESTROYPLAYER:
-			return addDestroyPlayerCommand(msg);
-		case NETCOMMANDTYPE_KEEPALIVE:
-			return addKeepAliveCommand(msg);
-		case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
-			return addDisconnectKeepAliveCommand(msg);
-		case NETCOMMANDTYPE_DISCONNECTPLAYER:
-			return addDisconnectPlayerCommand(msg);
-		case NETCOMMANDTYPE_PACKETROUTERQUERY:
-			return addPacketRouterQueryCommand(msg);
-		case NETCOMMANDTYPE_PACKETROUTERACK:
-			return addPacketRouterAckCommand(msg);
-		case NETCOMMANDTYPE_DISCONNECTCHAT:
-			return addDisconnectChatCommand(msg);
-		case NETCOMMANDTYPE_DISCONNECTVOTE:
-			return addDisconnectVoteCommand(msg);
-		case NETCOMMANDTYPE_CHAT:
-			return addChatCommand(msg);
-		case NETCOMMANDTYPE_PROGRESS:
-			return addProgressMessage(msg);
-		case NETCOMMANDTYPE_LOADCOMPLETE:
-			return addLoadCompleteMessage(msg);
-		case NETCOMMANDTYPE_TIMEOUTSTART:
-			return addTimeOutGameStartMessage(msg);
-		case NETCOMMANDTYPE_WRAPPER:
-			return addWrapperCommand(msg);
-		case NETCOMMANDTYPE_FILE:
-			return addFileCommand(msg);
-		case NETCOMMANDTYPE_FILEANNOUNCE:
-			return addFileAnnounceCommand(msg);
-		case NETCOMMANDTYPE_FILEPROGRESS:
-			return addFileProgressCommand(msg);
-		case NETCOMMANDTYPE_DISCONNECTFRAME:
-			return addDisconnectFrameCommand(msg);
-		case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
-			return addDisconnectScreenOffCommand(msg);
-		case NETCOMMANDTYPE_FRAMERESENDREQUEST:
-			return addFrameResendRequestCommand(msg);
-		default:
-			DEBUG_CRASH(("Unknown NETCOMMANDTYPE %d", cmdMsg->getNetCommandType()));
-			break;
-	}
-
-	return TRUE;
-}
-
-/*
-T = Net command type
-F = Execution frame
-P = Player ID
-C = Command ID
-R = Relay
-D = Command Data
-Z = Repeat last command
-*/
-Bool NetPacket::addFrameResendRequestCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForFrameResendRequestMessage(msg)) {
-		NetFrameResendRequestCommandMsg *cmdMsg = (NetFrameResendRequestCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		UnsignedInt frameToResend = cmdMsg->getFrameToResend();
-		memcpy(m_packet + m_packetLen, &frameToResend, sizeof(frameToResend));
-		m_packetLen += sizeof(frameToResend);
-
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addFrameResendRequest - added frame resend request command from player %d for frame %d, command id = %d\n", m_lastPlayerID, frameToResend, m_lastCommandID));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForFrameResendRequestMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetFrameResendRequestCommandMsg *cmdMsg = (NetFrameResendRequestCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedInt); // for the frame to be resent
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addDisconnectScreenOffCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForDisconnectScreenOffMessage(msg)) {
-		NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		UnsignedInt newFrame = cmdMsg->getNewFrame();
-		memcpy(m_packet + m_packetLen, &newFrame, sizeof(newFrame));
-		m_packetLen += sizeof(newFrame);
-
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectScreenOff - added disconnect screen off command from player %d for frame %d, command id = %d\n", m_lastPlayerID, newFrame, m_lastCommandID));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForDisconnectScreenOffMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetDisconnectScreenOffCommandMsg *cmdMsg = (NetDisconnectScreenOffCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedInt); // for the disconnect frame
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addDisconnectFrameCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForDisconnectFrameMessage(msg)) {
-		NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame();
-		memcpy(m_packet + m_packetLen, &disconnectFrame, sizeof(disconnectFrame));
-		m_packetLen += sizeof(disconnectFrame);
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectFrame - added disconnect frame command from player %d for frame %d, command id = %d\n", m_lastPlayerID, disconnectFrame, m_lastCommandID));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForDisconnectFrameMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetDisconnectFrameCommandMsg *cmdMsg = (NetDisconnectFrameCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedInt); // for the disconnect frame
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addFileCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForFileMessage(msg)) {
-		NetFileCommandMsg *cmdMsg = (NetFileCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		AsciiString filename = cmdMsg->getPortableFilename();		// PORTABLE
-		strcpy((char *)(m_packet + m_packetLen), filename.str());
-		m_packetLen += filename.getLength() + 1;
-
-		UnsignedInt fileLength = cmdMsg->getFileLength();
-		memcpy(m_packet + m_packetLen, &fileLength, sizeof(fileLength));
-		m_packetLen += sizeof(fileLength);
-
-		memcpy(m_packet + m_packetLen, cmdMsg->getFileData(), fileLength);
-		m_packetLen += fileLength;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForFileMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetFileCommandMsg *cmdMsg = (NetFileCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedShort);
-	}
-
-	++len; // 'D'
-	len += cmdMsg->getPortableFilename().getLength() + 1; // PORTABLE filename + the terminating 0
-	len += sizeof(UnsignedInt); // filedata length
-	len += cmdMsg->getFileLength();
-
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-Bool NetPacket::addFileAnnounceCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForFileAnnounceMessage(msg)) {
-		NetFileAnnounceCommandMsg *cmdMsg = (NetFileAnnounceCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		AsciiString filename = cmdMsg->getPortableFilename();	// PORTABLE
-		strcpy((char *)(m_packet + m_packetLen), filename.str());
-		m_packetLen += filename.getLength() + 1;
-
-		UnsignedShort fileID = cmdMsg->getFileID();
-		memcpy(m_packet + m_packetLen, &fileID, sizeof(fileID));
-		m_packetLen += sizeof(fileID);
-
-		UnsignedByte playerMask = cmdMsg->getPlayerMask();
-		memcpy(m_packet + m_packetLen, &playerMask, sizeof(playerMask));
-		m_packetLen += sizeof(playerMask);
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Adding file announce message for fileID %d, ID %d to packet\n",
-			cmdMsg->getFileID(), cmdMsg->getID()));
-		return TRUE;
-	}
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("No room to add file announce message to packet\n"));
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForFileAnnounceMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetFileAnnounceCommandMsg *cmdMsg = (NetFileAnnounceCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedShort);
-	}
-
-	++len; // 'D'
-	len += cmdMsg->getPortableFilename().getLength() + 1; // PORTABLE filename + the terminating 0
-	len += sizeof(UnsignedShort); // m_fileID
-	len += sizeof(UnsignedByte); // m_playerMask
-
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-Bool NetPacket::addFileProgressCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForFileProgressMessage(msg)) {
-		NetFileProgressCommandMsg *cmdMsg = (NetFileProgressCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		UnsignedShort fileID = cmdMsg->getFileID();
-		memcpy(m_packet + m_packetLen, &fileID, sizeof(fileID));
-		m_packetLen += sizeof(fileID);
-
-		Int progress = cmdMsg->getProgress();
-		memcpy(m_packet + m_packetLen, &progress, sizeof(progress));
-		m_packetLen += sizeof(progress);
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForFileProgressMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetFileProgressCommandMsg *cmdMsg = (NetFileProgressCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedShort);
-	}
-
-	++len; // 'D'
-	len += sizeof(UnsignedShort); // m_fileID
-	len += sizeof(Int); // m_progress
-
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-Bool NetPacket::addWrapperCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForWrapperMessage(msg)) {
-		NetWrapperCommandMsg *cmdMsg = (NetWrapperCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet + m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary put the player ID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		// wrapped command ID
-		UnsignedShort wrappedCommandID = cmdMsg->getWrappedCommandID();
-		memcpy(m_packet + m_packetLen, &wrappedCommandID, sizeof(wrappedCommandID));
-		m_packetLen += sizeof(wrappedCommandID);
-
-		// chunk number
-//		m_packet[m_packetLen] = cmdMsg->getChunkNumber();
-//		++m_packetLen;
-		UnsignedInt chunkNumber = cmdMsg->getChunkNumber();
-		memcpy(m_packet + m_packetLen, &chunkNumber, sizeof(chunkNumber));
-		m_packetLen += sizeof(chunkNumber);
-
-		// number of chunks
-//		m_packet[m_packetLen] = cmdMsg->getNumChunks();
-//		++m_packetLen;
-		UnsignedInt numChunks = cmdMsg->getNumChunks();
-		memcpy(m_packet + m_packetLen, &numChunks, sizeof(numChunks));
-		m_packetLen += sizeof(numChunks);
-
-		// total length of data for all chunks
-		UnsignedInt totalDataLength = cmdMsg->getTotalDataLength();
-		memcpy(m_packet + m_packetLen, &totalDataLength, sizeof(totalDataLength));
-		m_packetLen += sizeof(totalDataLength);
-
-		// data length for this chunk
-		UnsignedInt dataLength = cmdMsg->getDataLength();
-		memcpy(m_packet + m_packetLen, &dataLength, sizeof(dataLength));
-		m_packetLen += sizeof(dataLength);
-
-		// the offset into the data of this chunk
-		UnsignedInt dataOffset = cmdMsg->getDataOffset();
-		memcpy(m_packet + m_packetLen, &dataOffset, sizeof(dataOffset));
-		m_packetLen += sizeof(dataOffset);
-
-		// the data for this chunk
-		UnsignedByte *data = cmdMsg->getData();
-		memcpy(m_packet + m_packetLen, data, dataLength);
-		m_packetLen += dataLength;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForWrapperMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetWrapperCommandMsg *cmdMsg = (NetWrapperCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedShort);
-	}
-
-	++len; // 'D'
-	len += sizeof(UnsignedShort); // wrapped command ID
-	len += sizeof(UnsignedInt); // chunk number
-	len += sizeof(UnsignedInt); // number of chunks
-	len += sizeof(UnsignedInt); // total data length
-	len += sizeof(UnsignedInt); // data length of this chunk
-	len += sizeof(UnsignedInt); // offset of this chunk
-	len += cmdMsg->getDataLength(); // for the data of this chunk
-
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * Add a TimeOutGameStart  to the packet. Returns true if successful.
- */
-Bool NetPacket::addTimeOutGameStartMessage(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForLoadCompleteMessage(msg)) {
-		NetCommandMsg *cmdMsg = (NetCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet.\n"));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room in the packet for this command.
- */
-Bool NetPacket::isRoomForTimeOutGameStartMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetCommandMsg *cmdMsg = (NetCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // For the 'D'
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-
-
-/**
- * Add a Progress command to the packet. Returns true if successful.
- */
-Bool NetPacket::addLoadCompleteMessage(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForLoadCompleteMessage(msg)) {
-		NetCommandMsg *cmdMsg = (NetCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet.\n"));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room in the packet for this command.
- */
-Bool NetPacket::isRoomForLoadCompleteMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetCommandMsg *cmdMsg = (NetCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // For the 'D'
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-
-
-
-/**
- * Add a Progress command to the packet. Returns true if successful.
- */
-Bool NetPacket::addProgressMessage(NetCommandRef *msg) {
-	if (isRoomForProgressMessage(msg)) {
-		NetProgressCommandMsg *cmdMsg = (NetProgressCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		m_packet[m_packetLen] = cmdMsg->getPercentage();
-		++m_packetLen;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet.\n"));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room in the packet for this command.
- */
-Bool NetPacket::isRoomForProgressMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetProgressCommandMsg *cmdMsg = (NetProgressCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // For the 'D'
-	++len; // percentage
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-
-
-Bool NetPacket::addDisconnectVoteCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - entering...\n"));
-	//  need type, player id, relay, command id, slot number
-	if (isRoomForDisconnectVoteMessage(msg)) {
-		NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - adding run ahead command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnsignedByte slot = cmdMsg->getSlot();
-		memcpy(m_packet + m_packetLen, &slot, sizeof(slot));
-		m_packetLen += sizeof(slot);
-
-		UnsignedInt voteFrame = cmdMsg->getVoteFrame();
-		memcpy(m_packet + m_packetLen, &voteFrame, sizeof(voteFrame));
-		m_packetLen += sizeof(voteFrame);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectVoteCommand - added disconnect vote command, player id %d command id %d, voted slot %d\n", m_lastPlayerID, m_lastCommandID, slot));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room for this player disconnect command in this packet.
- */
-Bool NetPacket::isRoomForDisconnectVoteMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetDisconnectVoteCommandMsg *cmdMsg = (NetDisconnectVoteCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // the 'D'
-	len += sizeof(UnsignedByte); // slot number
-	len += sizeof(UnsignedInt); // vote frame
-
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) {
-	// type, player, id, relay, data
-	// data format: 1 byte string length, string (two bytes per character)
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - Entering...\n"));
-	if (isRoomForDisconnectChatMessage(msg)) {
-		NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnicodeString unitext = cmdMsg->getText();
-		UnsignedByte length = unitext.getLength();
-		memcpy(m_packet + m_packetLen, &length, sizeof(UnsignedByte));
-		m_packetLen += sizeof(UnsignedByte);
-
-		memcpy(m_packet + m_packetLen, unitext.str(), length * sizeof(UnsignedShort));
-		m_packetLen += length * sizeof(UnsignedShort);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added disconnect chat command\n"));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForDisconnectChatMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetDisconnectChatCommandMsg *cmdMsg = (NetDisconnectChatCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // the 'D'
-	len += sizeof(UnsignedByte); // string length
-	UnsignedByte textLen = cmdMsg->getText().getLength();
-	len += textLen * sizeof(UnsignedShort);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addChatCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForChatMessage(msg)) {
-		NetChatCommandMsg *cmdMsg = (NetChatCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectChatCommand - adding run ahead command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnicodeString unitext = cmdMsg->getText();
-		UnsignedByte length = unitext.getLength();
-		Int playerMask = cmdMsg->getPlayerMask();
-		memcpy(m_packet + m_packetLen, &length, sizeof(UnsignedByte));
-		m_packetLen += sizeof(UnsignedByte);
-
-		memcpy(m_packet + m_packetLen, unitext.str(), length * sizeof(UnsignedShort));
-		m_packetLen += length * sizeof(UnsignedShort);
-
-		memcpy(m_packet + m_packetLen, &playerMask, sizeof(Int));
-		m_packetLen += sizeof(Int);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added chat command\n"));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isRoomForChatMessage(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	Int len = 0;
-	NetChatCommandMsg *cmdMsg = (NetChatCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // the 'D'
-	len += sizeof(UnsignedByte); // string length
-	UnsignedByte textLen = cmdMsg->getText().getLength();
-	len += textLen * sizeof(UnsignedShort);
-	len += sizeof(Int); // playerMask
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addPacketRouterAckCommand(NetCommandRef *msg) {
-	//  need type, player id, relay, command id, slot number
-	if (isRoomForPacketRouterAckMessage(msg)) {
-		NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterAckCommand - adding packet router query command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added packet router ack command, player id %d\n", m_lastPlayerID));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room for this packet router ack command in this packet.
- */
-Bool NetPacket::isRoomForPacketRouterAckMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetPacketRouterAckCommandMsg *cmdMsg = (NetPacketRouterAckCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // the 'D'
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addPacketRouterQueryCommand(NetCommandRef *msg) {
-	//  need type, player id, relay, command id, slot number
-	if (isRoomForPacketRouterQueryMessage(msg)) {
-		NetPacketRouterQueryCommandMsg *cmdMsg = (NetPacketRouterQueryCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPacketRouterQueryCommand - adding packet router query command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added packet router query command, player id %d\n", m_lastPlayerID));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());	
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room for this packet router query command in this packet.
- */
-Bool NetPacket::isRoomForPacketRouterQueryMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetPacketRouterQueryCommandMsg *cmdMsg = (NetPacketRouterQueryCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // the 'D'
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::addDisconnectPlayerCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - entering...\n"));
-	//  need type, player id, relay, command id, slot number
-	if (isRoomForDisconnectPlayerMessage(msg)) {
-		NetDisconnectPlayerCommandMsg *cmdMsg = (NetDisconnectPlayerCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - adding run ahead command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnsignedByte slot = cmdMsg->getDisconnectSlot();
-		memcpy(m_packet + m_packetLen, &slot, sizeof(slot));
-		m_packetLen += sizeof(slot);
-
-		UnsignedInt disconnectFrame = cmdMsg->getDisconnectFrame();
-		memcpy(m_packet + m_packetLen, &disconnectFrame, sizeof(disconnectFrame));
-		m_packetLen += sizeof(disconnectFrame);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addDisconnectPlayerCommand - added disconnect player command, player id %d command id %d, disconnecting slot %d\n", m_lastPlayerID, m_lastCommandID, slot));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room for this player disconnect command in this packet.
- */
-Bool NetPacket::isRoomForDisconnectPlayerMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetDisconnectPlayerCommandMsg *cmdMsg = (NetDisconnectPlayerCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // the 'D'
-	len += sizeof(UnsignedByte); // slot number
-	len += sizeof(UnsignedInt);	// disconnectFrame
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-
-/**
- * Add a keep alive command to the packet. Returns true if successful.
- */
-Bool NetPacket::addDisconnectKeepAliveCommand(NetCommandRef *msg) {
-	if (isRoomForDisconnectKeepAliveMessage(msg)) {
-		NetDisconnectKeepAliveCommandMsg *cmdMsg = (NetDisconnectKeepAliveCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet.\n"));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room in the packet for this command.
- */
-Bool NetPacket::isRoomForDisconnectKeepAliveMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetDisconnectKeepAliveCommandMsg *cmdMsg = (NetDisconnectKeepAliveCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // For the 'D'
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Add a keep alive command to the packet. Returns true if successful.
- */
-Bool NetPacket::addKeepAliveCommand(NetCommandRef *msg) {
-	if (isRoomForKeepAliveMessage(msg)) {
-		NetKeepAliveCommandMsg *cmdMsg = (NetKeepAliveCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Added keep alive command to packet.\n"));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room in the packet for this command.
- */
-Bool NetPacket::isRoomForKeepAliveMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetKeepAliveCommandMsg *cmdMsg = (NetKeepAliveCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // For the 'D'
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Add a run ahead command to the packet. Returns true if successful.
- */
-Bool NetPacket::addRunAheadCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForRunAheadMessage(msg)) {
-		NetRunAheadCommandMsg *cmdMsg = (NetRunAheadCommandMsg *)(msg->getCommand());
-		//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadCommand - adding run ahead command\n"));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnsignedShort newRunAhead = cmdMsg->getRunAhead();
-		memcpy(m_packet + m_packetLen, &newRunAhead, sizeof(UnsignedShort));
-		m_packetLen += sizeof(UnsignedShort);
-
-		UnsignedByte newFrameRate = cmdMsg->getFrameRate();
-		memcpy(m_packet + m_packetLen, &newFrameRate, sizeof(UnsignedByte));
-		m_packetLen += sizeof(UnsignedByte);
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added run ahead command, frame %d, player id %d command id %d\n", m_lastFrame, m_lastPlayerID, m_lastCommandID));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room for this run ahead command in this packet.
- */
-Bool NetPacket::isRoomForRunAheadMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetRunAheadCommandMsg *cmdMsg = (NetRunAheadCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedShort);
-	len += sizeof(UnsignedByte);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Add a DestroyPlayer command to the packet. Returns true if successful.
- */
-Bool NetPacket::addDestroyPlayerCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForDestroyPlayerMessage(msg)) {
-		NetDestroyPlayerCommandMsg *cmdMsg = (NetDestroyPlayerCommandMsg *)(msg->getCommand());
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnsignedInt newVal = cmdMsg->getPlayerIndex();
-		memcpy(m_packet + m_packetLen, &newVal, sizeof(UnsignedInt));
-		m_packetLen += sizeof(UnsignedInt);
-
-		//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added CRC:0x%8.8X info command, frame %d, player id %d command id %d\n", newCRC, m_lastFrame, m_lastPlayerID, m_lastCommandID));
-
-		++m_numCommands;
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is room for this DestroyPlayer command in this packet.
- */
-Bool NetPacket::isRoomForDestroyPlayerMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetDestroyPlayerCommandMsg *cmdMsg = (NetDestroyPlayerCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedInt);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Add a run ahead metrics command to the packet. Returns true if successful.
- */
-Bool NetPacket::addRunAheadMetricsCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForRunAheadMetricsMessage(msg)) {
-		NetRunAheadMetricsCommandMsg *cmdMsg = (NetRunAheadMetricsCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addRunAheadMetricsCommand - adding run ahead metrics for player %d, fps = %d, latency = %f\n", cmdMsg->getPlayerID(), cmdMsg->getAverageFps(), cmdMsg->getAverageLatency()));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		// write the average latency
-		Real averageLatency = cmdMsg->getAverageLatency();
-		memcpy(m_packet + m_packetLen, &averageLatency, sizeof(averageLatency));
-		m_packetLen += sizeof(averageLatency);
-		// write the average fps
-		UnsignedShort averageFps = (UnsignedShort)(cmdMsg->getAverageFps());
-		memcpy(m_packet + m_packetLen, &averageFps, sizeof(averageFps));
-		m_packetLen += sizeof(averageFps);
-
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		++m_numCommands;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is enough room in the packet to fit this message.
- */
-Bool NetPacket::isRoomForRunAheadMetricsMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetRunAheadMetricsCommandMsg *cmdMsg = (NetRunAheadMetricsCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // 'D'
-	len += sizeof(UnsignedShort);
-	len += sizeof(Real);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-
-/**
- * Add a player leave command to the packet. Returns true if successful.
- */
-Bool NetPacket::addPlayerLeaveCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isRoomForPlayerLeaveMessage(msg)) {
-		NetPlayerLeaveCommandMsg *cmdMsg = (NetPlayerLeaveCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addPlayerLeaveCommand - adding player leave command for player %d\n", cmdMsg->getLeavingPlayerID()));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnsignedByte leavingPlayerID = cmdMsg->getLeavingPlayerID();
-		memcpy(m_packet + m_packetLen, &leavingPlayerID, sizeof(UnsignedByte));
-		m_packetLen += sizeof(UnsignedByte);
-
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		++m_numCommands;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is enough room in the packet to fit this message.
- */
-Bool NetPacket::isRoomForPlayerLeaveMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetPlayerLeaveCommandMsg *cmdMsg = (NetPlayerLeaveCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedByte);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Add this frame command message. Returns true if successful.
- */
-Bool NetPacket::addFrameCommand(NetCommandRef *msg) {
-	Bool needNewCommandID = FALSE;
-	if (isFrameRepeat(msg)) {
-		if (m_packetLen >= MAX_PACKET_SIZE) {
-			return FALSE;
-		}
-		m_packet[m_packetLen] = 'Z';
-		++m_packetLen;
-		m_lastCommandID = msg->getCommand()->getID();
-		deleteInstance(m_lastCommand);
-		m_lastCommand = newInstance(NetCommandRef)(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		++m_lastFrame;		// need this cause we're actually advancing to the next frame by adding this command.
-		++m_numCommands;
-		// frameinfodebug
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added frame %d, player %d, command count = %d, command id = %d, repeat\n", m_lastFrame, m_lastPlayerID, 0, m_lastCommandID));
-		return TRUE;
-	}
-	if (isRoomForFrameMessage(msg)) {
-		NetFrameCommandMsg *cmdMsg = (NetFrameCommandMsg *)(msg->getCommand());
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addFrameCommand - adding frame command for frame %d, command count = %d, command id = %d\n", cmdMsg->getExecutionFrame(), cmdMsg->getCommandCount(), cmdMsg->getID()));
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("relay = %d, ", m_lastRelay));
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-			needNewCommandID = TRUE;
-		}
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("player = %d", m_lastPlayerID));
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command id = %d\n", m_lastCommandID));
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		UnsignedShort cmdCount = cmdMsg->getCommandCount();
-		memcpy(m_packet + m_packetLen, &cmdCount, sizeof(UnsignedShort));
-		m_packetLen += sizeof(UnsignedShort);
-
-		// frameinfodebug
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added frame %d, player %d, command count = %d, command id = %d\n", cmdMsg->getExecutionFrame(), cmdMsg->getPlayerID(), cmdMsg->getCommandCount(), cmdMsg->getID()));
-
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		++m_numCommands;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is enough room in this packet for this frame message.
- */
-Bool NetPacket::isRoomForFrameMessage(NetCommandRef *msg) {
-	Int len = 0;
-	Bool needNewCommandID = FALSE;
-	NetFrameCommandMsg *cmdMsg = (NetFrameCommandMsg *)(msg->getCommand());
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		len += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		len += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		len += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedShort);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::isFrameRepeat(NetCommandRef *msg) {
-	if (m_lastCommand == NULL) {
-		return FALSE;
-	}
-	if (m_lastCommand->getCommand()->getNetCommandType() != NETCOMMANDTYPE_FRAMEINFO) {
-		return FALSE;
-	}
-	NetFrameCommandMsg *framemsg = (NetFrameCommandMsg *)(msg->getCommand());
-	NetFrameCommandMsg *lastmsg = (NetFrameCommandMsg *)(m_lastCommand->getCommand());
-	if (framemsg->getCommandCount() != 0) {
-		return FALSE;
-	}
-	if (framemsg->getExecutionFrame() != (lastmsg->getExecutionFrame() + 1)) {
-		return FALSE;
-	}
-	if (msg->getRelay() != m_lastCommand->getRelay()) {
-		return FALSE;
-	}
-	if (framemsg->getID() != (lastmsg->getID() + 1)) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Add an ack "both" command.
- */
-Bool NetPacket::addAckBothCommand(NetCommandRef *msg) {
-	NetAckBothCommandMsg *ackmsg = (NetAckBothCommandMsg *)(msg->getCommand());
-	return addAckCommand(msg, ackmsg->getCommandID(), ackmsg->getOriginalPlayerID());
-}
-
-/**
- * Add an ack stage 1 command.
- */
-Bool NetPacket::addAckStage1Command(NetCommandRef *msg) {
-	NetAckStage1CommandMsg *ackmsg = (NetAckStage1CommandMsg *)(msg->getCommand());
-	return addAckCommand(msg, ackmsg->getCommandID(), ackmsg->getOriginalPlayerID());
-}
-
-/**
- * Add an ack stage 2 command.
- */
-Bool NetPacket::addAckStage2Command(NetCommandRef *msg) {
-	NetAckStage2CommandMsg *ackmsg = (NetAckStage2CommandMsg *)(msg->getCommand());
-	return addAckCommand(msg, ackmsg->getCommandID(), ackmsg->getOriginalPlayerID());
-}
-
-/**
- * Add this ack command to the packet.  Returns true if successful.
- */
-Bool NetPacket::addAckCommand(NetCommandRef *msg, UnsignedShort commandID, UnsignedByte originalPlayerID) {
-	if (isAckRepeat(msg)) {
-		if (m_packetLen >= MAX_PACKET_SIZE) {
-			return FALSE;
-		}
-		m_packet[m_packetLen] = 'Z';
-		++m_packetLen;
-		++m_numCommands;
-		deleteInstance(m_lastCommand);
-		m_lastCommand = NULL;
-
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-		return TRUE;
-	}
-	if (isRoomForAckMessage(msg)) {
-		NetCommandMsg *cmdMsg = msg->getCommand();
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addAckCommand - adding ack for command %d for player %d\n", cmdMsg->getCommandID(), msg->getCommand()->getPlayerID()));
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-		// Put in the command id of the command we are acking.
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-		memcpy(m_packet + m_packetLen, &commandID, sizeof(UnsignedShort));
-		m_packetLen += sizeof(UnsignedShort);
-		memcpy(m_packet + m_packetLen, &originalPlayerID, sizeof(UnsignedByte));
-		m_packetLen += sizeof(UnsignedByte);
-
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("outgoing - added ACK, original player %d, command id %d\n", origPlayerID, cmdID));
-		++m_numCommands;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if there is enough room in the packet for this ack message.
- */
-Bool NetPacket::isRoomForAckMessage(NetCommandRef *msg) {
-	Int len = 0;
-	NetCommandMsg *cmdMsg = msg->getCommand();
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		++len;
-		len += sizeof(UnsignedByte);
-	}
-
-	++len; // for 'D'
-	len += sizeof(UnsignedShort);
-	len += sizeof(UnsignedByte);
-	if ((len + m_packetLen) > MAX_PACKET_SIZE) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::isAckRepeat(NetCommandRef *msg) {
-	if (m_lastCommand == NULL) {
-		return FALSE;
-	}
-	if (m_lastCommand->getCommand()->getNetCommandType() != msg->getCommand()->getNetCommandType()) {
-		return FALSE;
-	}
-	if (msg->getCommand()->getNetCommandType() == NETCOMMANDTYPE_ACKBOTH) {
-		return isAckBothRepeat(msg);
-	}
-	if (msg->getCommand()->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE1) {
-		return isAckStage1Repeat(msg);
-	}
-	if (msg->getCommand()->getNetCommandType() == NETCOMMANDTYPE_ACKSTAGE2) {
-		return isAckStage2Repeat(msg);
-	}
-	return FALSE;
-}
-
-Bool NetPacket::isAckBothRepeat(NetCommandRef *msg) {
-	NetAckBothCommandMsg *ack = (NetAckBothCommandMsg *)(msg->getCommand());
-	NetAckBothCommandMsg *lastAck = (NetAckBothCommandMsg *)(m_lastCommand->getCommand());
-	if (lastAck->getCommandID() != (ack->getCommandID() - 1)) {
-		return FALSE;
-	}
-	if (lastAck->getOriginalPlayerID() != ack->getOriginalPlayerID()) {
-		return FALSE;
-	}
-	if (msg->getRelay() != m_lastCommand->getRelay()) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::isAckStage1Repeat(NetCommandRef *msg) {
-	NetAckStage2CommandMsg *ack = (NetAckStage2CommandMsg *)(msg->getCommand());
-	NetAckStage2CommandMsg *lastAck = (NetAckStage2CommandMsg *)(m_lastCommand->getCommand());
-	if (lastAck->getCommandID() != (ack->getCommandID() - 1)) {
-		return FALSE;
-	}
-	if (lastAck->getOriginalPlayerID() != ack->getOriginalPlayerID()) {
-		return FALSE;
-	}
-	if (msg->getRelay() != m_lastCommand->getRelay()) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-Bool NetPacket::isAckStage2Repeat(NetCommandRef *msg) {
-	NetAckStage2CommandMsg *ack = (NetAckStage2CommandMsg *)(msg->getCommand());
-	NetAckStage2CommandMsg *lastAck = (NetAckStage2CommandMsg *)(m_lastCommand->getCommand());
-	if (lastAck->getCommandID() != (ack->getCommandID() - 1)) {
-		return FALSE;
-	}
-	if (lastAck->getOriginalPlayerID() != ack->getOriginalPlayerID()) {
-		return FALSE;
-	}
-	if (msg->getRelay() != m_lastCommand->getRelay()) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Adds this game command to the packet.  Returns true if successful.
- */
-Bool NetPacket::addGameCommand(NetCommandRef *msg) {
-	Bool retval = FALSE;
-	NetGameCommandMsg *cmdMsg = (NetGameCommandMsg *)(msg->getCommand());
-	// get the game message from the NetCommandMsg
-	GameMessage *gmsg = cmdMsg->constructGameMessage();
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addGameCommand for command ID %d\n", cmdMsg->getID()));
-
-	if (isRoomForGameMessage(msg, gmsg)) {
-		// Now we know there is enough room, put the new game message into the packet.
-
-		Bool needNewCommandID = FALSE; // this is to allow us to force the starting command ID to be respecified with this command.
-
-		// If necessary, put the NetCommandType into the packet.
-		if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-			m_packet[m_packetLen] = 'T';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getNetCommandType();
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastCommandType = cmdMsg->getNetCommandType();
-		}
-
-		// If necessary, put the execution frame into the packet.
-		if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-			m_packet[m_packetLen] = 'F';
-			++m_packetLen;
-			UnsignedInt newframe = cmdMsg->getExecutionFrame();
-			memcpy(m_packet+m_packetLen, &newframe, sizeof(UnsignedInt));
-			m_packetLen += sizeof(UnsignedInt);
-
-			m_lastFrame = newframe;
-		}
-
-		// If necessary, put the relay into the packet.
-		if (m_lastRelay != msg->getRelay()) {
-			m_packet[m_packetLen] = 'R';
-			++m_packetLen;
-			UnsignedByte newRelay = msg->getRelay();
-			memcpy(m_packet+m_packetLen, &newRelay, sizeof(UnsignedByte));
-			m_packetLen += sizeof(UnsignedByte);
-
-			m_lastRelay = newRelay;
-		}
-
-		// If necessary, put the playerID into the packet.
-		if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-			m_packet[m_packetLen] = 'P';
-			++m_packetLen;
-			m_packet[m_packetLen] = cmdMsg->getPlayerID();
-			m_packetLen += sizeof(UnsignedByte);
-			//since if we have a new player we need to respecify the starting command ID, lets force the command id to be different.
-			needNewCommandID = TRUE;
-
-			m_lastPlayerID = cmdMsg->getPlayerID();
-		}
-
-		// If necessary, specify the command ID of this command.
-		if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-			m_packet[m_packetLen] = 'C';
-			++m_packetLen;
-			UnsignedShort newID = cmdMsg->getID();
-			memcpy(m_packet + m_packetLen, &newID, sizeof(UnsignedShort));
-			m_packetLen += sizeof(UnsignedShort);
-		}
-		m_lastCommandID = cmdMsg->getID();
-
-		m_packet[m_packetLen] = 'D';
-		++m_packetLen;
-
-		// Now copy the GameMessage type into the packet.
-		GameMessage::Type newType = gmsg->getType();
-		memcpy(m_packet + m_packetLen, &newType, sizeof(GameMessage::Type));
-		m_packetLen += sizeof(GameMessage::Type);
-
-
-		GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
-		UnsignedByte numTypes = parser->getNumTypes();
-		memcpy(m_packet + m_packetLen, &numTypes, sizeof(numTypes));
-		m_packetLen += sizeof(numTypes);
-
-		GameMessageParserArgumentType *argType = parser->getFirstArgumentType();
-		while (argType != NULL) {
-			UnsignedByte type = (UnsignedByte)(argType->getType());
-			memcpy(m_packet + m_packetLen, &type, sizeof(type));
-			m_packetLen += sizeof(type);
-
-			UnsignedByte argTypeCount = argType->getArgCount();
-			memcpy(m_packet + m_packetLen, &argTypeCount, sizeof(argTypeCount));
-			m_packetLen += sizeof(argTypeCount);
-
-			argType = argType->getNext();
-		}
-
-		Int numArgs = gmsg->getArgumentCount();
-		for (Int i = 0; i < numArgs; ++i) {
-			GameMessageArgumentDataType type = gmsg->getArgumentDataType(i);
-			GameMessageArgumentType arg = *(gmsg->getArgument(i));
-			writeGameMessageArgumentToPacket(type, arg);
-		}
-
-		deleteInstance(parser);
-		parser = NULL;
-
-//		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::addGameMessage - added game message, frame %d, player %d, command ID %d\n", m_lastFrame, m_lastPlayerID, m_lastCommandID));
-
-		++m_numCommands;
-
-		if (m_lastCommand != NULL) {
-			deleteInstance(m_lastCommand);
-			m_lastCommand = NULL;
-		}
-		m_lastCommand = NEW_NETCOMMANDREF(msg->getCommand());
-		m_lastCommand->setRelay(msg->getRelay());
-
-		retval = TRUE;
-	}
-
-	if (gmsg) {
-		deleteInstance(gmsg);
-		gmsg = NULL;
-	}
-
-	return retval;
-}
-
-void NetPacket::writeGameMessageArgumentToPacket(GameMessageArgumentDataType type, GameMessageArgumentType arg) {
-	if (type == ARGUMENTDATATYPE_INTEGER) {
-		memcpy(m_packet + m_packetLen, &(arg.integer), sizeof(arg.integer));
-		m_packetLen += sizeof(arg.integer);
-	} else if (type == ARGUMENTDATATYPE_REAL) {
-		memcpy(m_packet + m_packetLen, &(arg.real), sizeof(arg.real));
-		m_packetLen += sizeof(arg.real);
-	} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-		memcpy(m_packet + m_packetLen, &(arg.boolean), sizeof(arg.boolean));
-		m_packetLen += sizeof(arg.boolean);
-	} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-		memcpy(m_packet + m_packetLen, &(arg.objectID), sizeof(arg.objectID));
-		m_packetLen += sizeof(arg.objectID);
-	} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-		memcpy(m_packet + m_packetLen, &(arg.drawableID), sizeof(arg.drawableID));
-		m_packetLen += sizeof(arg.drawableID);
-	} else if (type == ARGUMENTDATATYPE_TEAMID) {
-		memcpy(m_packet + m_packetLen, &(arg.teamID), sizeof(arg.teamID));
-		m_packetLen += sizeof(arg.teamID);
-	} else if (type == ARGUMENTDATATYPE_LOCATION) {
-		memcpy(m_packet + m_packetLen, &(arg.location), sizeof(arg.location));
-		m_packetLen += sizeof(arg.location);
-	} else if (type == ARGUMENTDATATYPE_PIXEL) {
-		memcpy(m_packet + m_packetLen, &(arg.pixel), sizeof(arg.pixel));
-		m_packetLen += sizeof(arg.pixel);
-	} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-		memcpy(m_packet + m_packetLen, &(arg.pixelRegion), sizeof(arg.pixelRegion));
-		m_packetLen += sizeof(arg.pixelRegion);
-	} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {
-		memcpy(m_packet + m_packetLen, &(arg.timestamp), sizeof(arg.timestamp));
-		m_packetLen += sizeof(arg.timestamp);
-	} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-		memcpy(m_packet + m_packetLen, &(arg.wChar), sizeof(arg.wChar));
-		m_packetLen += sizeof(arg.wChar);
-	}
-}
-
-/**
- * Returns true if there is enough room in this packet for this message.
- */
-Bool NetPacket::isRoomForGameMessage(NetCommandRef *msg, GameMessage *gmsg) {
-	// Calculate how much space the NetCommandMsg will take in this packet.
-	Int msglen = 0;
-
-	NetGameCommandMsg *cmdMsg = (NetGameCommandMsg *)(msg->getCommand());
-
-	Bool needNewCommandID = FALSE;
-
-	if (m_lastFrame != cmdMsg->getExecutionFrame()) {
-		msglen += sizeof(UnsignedInt) + sizeof(UnsignedByte);
-	}
-	if (m_lastPlayerID != cmdMsg->getPlayerID()) {
-		msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-		needNewCommandID = TRUE;
-	}
-	if (m_lastRelay != msg->getRelay()) {
-		msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (m_lastCommandType != cmdMsg->getNetCommandType()) {
-		msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);
-	}
-	if (((m_lastCommandID + 1) != (UnsignedShort)(cmdMsg->getID())) || (needNewCommandID == TRUE)) {
-		msglen += sizeof(UnsignedShort) + sizeof(UnsignedByte);
-	}
-
-	GameMessageParser *parser = newInstance(GameMessageParser)(gmsg);
-
-	++msglen; // for 'D'
-	msglen += sizeof(GameMessage::Type);
-	msglen += sizeof(UnsignedByte);
-//	Int numTypes = parser->getNumTypes();
-	GameMessageParserArgumentType *arg = parser->getFirstArgumentType();
-	while (arg != NULL) {
-		msglen += 2 * sizeof(UnsignedByte); // for the type and number of args of that type declaration.
-		GameMessageArgumentDataType type = arg->getType();
-		if (type == ARGUMENTDATATYPE_INTEGER) {
-			msglen += arg->getArgCount() * sizeof(Int);
-		} else if (type == ARGUMENTDATATYPE_REAL) {
-			msglen += arg->getArgCount() * sizeof(Real);
-		} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-			msglen += arg->getArgCount() * sizeof(Bool);
-		} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-			msglen += arg->getArgCount() * sizeof(ObjectID);
-		} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-			msglen += arg->getArgCount() * sizeof(DrawableID);
-		} else if (type == ARGUMENTDATATYPE_TEAMID) {
-			msglen += arg->getArgCount() * sizeof(UnsignedInt);
-		} else if (type == ARGUMENTDATATYPE_LOCATION) {
-			msglen += arg->getArgCount() * sizeof(Coord3D);
-		} else if (type == ARGUMENTDATATYPE_PIXEL) {
-			msglen += arg->getArgCount() * sizeof(ICoord2D);
-		} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-			msglen += arg->getArgCount() * sizeof(IRegion2D);
-		} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {
-			msglen += arg->getArgCount() * sizeof(UnsignedInt);
-		} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-			msglen += arg->getArgCount() * sizeof(WideChar);
-		}
-		arg = arg->getNext();
-	}
-
-	deleteInstance(parser);
-	parser = NULL;
-
-	// Is there enough room in the packet for this message?
-	if (msglen > (MAX_PACKET_SIZE - m_packetLen)) {
-		return FALSE; // there isn't enough room in this packet for this new message.
-	}
-	return TRUE;
-}
-
-/**
- * Returns the list of commands that are in this packet.
- */
-NetCommandList * NetPacket::getCommandList() {
-	NetCommandList *retval = newInstance(NetCommandList);
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList, packet length = %d\n", m_packetLen));
-	retval->init();
-
-	// These need to be the same as the default values for m_lastPlayerID, m_lastFrame, etc.
-	UnsignedByte playerID = 0;
-	UnsignedInt frame = 0;
-	UnsignedShort commandID = 1; // The first command is going to be
-	UnsignedByte commandType = 0;
-	UnsignedByte relay = 0;
-	NetCommandRef *lastCommand = NULL;
-
-	Int i = 0;
-	while (i < m_packetLen) {
-		if (m_packet[i] == 'T') {
-			++i;
-			memcpy(&commandType, m_packet + i, sizeof(UnsignedByte));
-			i += sizeof(UnsignedByte);
-		} else if (m_packet[i] == 'F') {
-			++i;
-			memcpy(&frame, m_packet + i, sizeof(UnsignedInt));
-			i += sizeof(UnsignedInt);
-		} else if (m_packet[i] == 'P') {
-			++i;
-			memcpy(&playerID, m_packet + i, sizeof(UnsignedByte));
-			i += sizeof(UnsignedByte);
-		} else if (m_packet[i] == 'R') {
-			++i;
-			memcpy(&relay, m_packet + i, sizeof(UnsignedByte));
-			i += sizeof(UnsignedByte);
-		} else if (m_packet[i] == 'C') {
-			++i;
-			memcpy(&commandID, m_packet + i, sizeof(UnsignedShort));
-			i += sizeof(UnsignedShort);
-		} else if (m_packet[i] == 'D') {
-			++i;
-
-			NetCommandMsg *msg = NULL;
-
-			//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList() - command of type %d(%s)\n", commandType, GetAsciiNetCommandType((NetCommandType)commandType).str()));
-
-			switch((NetCommandType)commandType)
-			{
-			case NETCOMMANDTYPE_GAMECOMMAND:
-				msg = readGameMessage(m_packet, i);
-				//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read game command from player %d for frame %d\n", playerID, frame));
-				break;
-			case NETCOMMANDTYPE_ACKBOTH:
-				msg = readAckBothMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_ACKSTAGE1:
-				msg = readAckStage1Message(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_ACKSTAGE2:
-				msg = readAckStage2Message(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_FRAMEINFO:
-				msg = readFrameMessage(m_packet, i);
-				// frameinfodebug
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read frame %d from player %d, command count = %d, relay = 0x%X\n", frame, playerID, ((NetFrameCommandMsg *)msg)->getCommandCount(), relay));
-				break;
-			case NETCOMMANDTYPE_PLAYERLEAVE:
-				msg = readPlayerLeaveMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read player leave message from player %d for execution on frame %d\n", playerID, frame));
-				break;
-			case NETCOMMANDTYPE_RUNAHEADMETRICS:
-				msg = readRunAheadMetricsMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_RUNAHEAD:
-				msg = readRunAheadMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read run ahead message from player %d for execution on frame %d\n", playerID, frame));
-				break;
-			case NETCOMMANDTYPE_DESTROYPLAYER:
-				msg = readDestroyPlayerMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read CRC info message from player %d for execution on frame %d\n", playerID, frame));
-				break;
-			case NETCOMMANDTYPE_KEEPALIVE:
-				msg = readKeepAliveMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read keep alive message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_DISCONNECTKEEPALIVE:
-				msg = readDisconnectKeepAliveMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read keep alive message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_DISCONNECTPLAYER:
-				msg = readDisconnectPlayerMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect player message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_PACKETROUTERQUERY:
-				msg = readPacketRouterQueryMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read packet router query message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_PACKETROUTERACK:
-				msg = readPacketRouterAckMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read packet router ack message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_DISCONNECTCHAT:
-				msg = readDisconnectChatMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect chat message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_DISCONNECTVOTE:
-				msg = readDisconnectVoteMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect vote message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_CHAT:
-				msg = readChatMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read chat message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_PROGRESS:
-				msg = readProgressMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read Progress message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_LOADCOMPLETE:
-				msg = readLoadCompleteMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read LoadComplete message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_TIMEOUTSTART:
-				msg = readTimeOutGameStartMessage(m_packet, i);
-//				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read TimeOutGameStart message from player %d\n", playerID));
-				break;
-			case NETCOMMANDTYPE_WRAPPER:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read Wrapper message from player %d\n", playerID));
-				msg = readWrapperMessage(m_packet, i);
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Done reading Wrapper message from player %d - wrapped command was %d\n", playerID,
-					((NetWrapperCommandMsg *)msg)->getWrappedCommandID()));
-				break;
-			case NETCOMMANDTYPE_FILE:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read file message from player %d\n", playerID));
-				msg = readFileMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_FILEANNOUNCE:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read file announce message from player %d\n", playerID));
-				msg = readFileAnnounceMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_FILEPROGRESS:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read file progress message from player %d\n", playerID));
-				msg = readFileProgressMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_DISCONNECTFRAME:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect frame message from player %d\n", playerID));
-				msg = readDisconnectFrameMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_DISCONNECTSCREENOFF:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read disconnect screen off message from player %d\n", playerID));
-				msg = readDisconnectScreenOffMessage(m_packet, i);
-				break;
-			case NETCOMMANDTYPE_FRAMERESENDREQUEST:
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("read frame resend request message from player %d\n", playerID));
-				msg = readFrameResendRequestMessage(m_packet, i);
-				break;
-			}
-
-			if (msg == NULL) {
-				DEBUG_CRASH(("Didn't read a message from the packet. Things are about to go wrong."));
-				continue;
-			}
-
-			// set the info
-			msg->setExecutionFrame(frame);
-			msg->setPlayerID(playerID);
-			msg->setNetCommandType((NetCommandType)commandType);
-			msg->setID(commandID);
-
-//			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("frame = %d, player = %d, command type = %d, id = %d\n", frame, playerID, commandType, commandID));
-
-			// increment to the next command ID.
-			if (DoesCommandRequireACommandID((NetCommandType)commandType)) {
-				++commandID;
-			}
-
-			// add the message to the list.
-			NetCommandRef *ref = retval->addMessage(msg);
-			if (ref != NULL) {
-				ref->setRelay(relay);
-			} else {
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList - failed to set relay for message %d\n", msg->getID()));
-			}
-
-			if (lastCommand != NULL) {
-				deleteInstance(lastCommand);
-				lastCommand = NULL;
-			}
-			lastCommand = newInstance(NetCommandRef)(msg);
-
-			msg->detach();  // Need to detach from new NetCommandMsg created by the "readXMessage" above.
-
-			// since the message is part of the list now, we don't have to keep track of it.  So we'll just set it to NULL.
-			msg = NULL;
-		} else if (m_packet[i] == 'Z') {
-			++i;
-			// Repeat the last command, doing some funky cool byte-saving stuff
-			if (lastCommand == NULL) {
-				DEBUG_CRASH(("Got a repeat command with no command to repeat."));
-			}
-			NetCommandMsg *msg = NULL;
-			if (commandType == NETCOMMANDTYPE_ACKSTAGE1) {
-				msg = newInstance(NetAckStage1CommandMsg)();
-				NetAckStage1CommandMsg *last = (NetAckStage1CommandMsg *)(lastCommand->getCommand());
-				((NetAckStage1CommandMsg *)msg)->setCommandID(last->getCommandID() + 1);
-				((NetAckStage1CommandMsg *)msg)->setOriginalPlayerID(last->getOriginalPlayerID());
-			} else if (commandType == NETCOMMANDTYPE_ACKSTAGE2) {
-				msg = newInstance(NetAckStage2CommandMsg)();
-				NetAckStage2CommandMsg *last = (NetAckStage2CommandMsg *)(lastCommand->getCommand());
-				((NetAckStage2CommandMsg *)msg)->setCommandID(last->getCommandID() + 1);
-				((NetAckStage2CommandMsg *)msg)->setOriginalPlayerID(last->getOriginalPlayerID());
-			} else if (commandType == NETCOMMANDTYPE_ACKBOTH) {
-				msg = newInstance(NetAckBothCommandMsg)();
-				NetAckBothCommandMsg *last = (NetAckBothCommandMsg *)(lastCommand->getCommand());
-				((NetAckBothCommandMsg *)msg)->setCommandID(last->getCommandID() + 1);
-				((NetAckBothCommandMsg *)msg)->setOriginalPlayerID(last->getOriginalPlayerID());
-			} else if (commandType == NETCOMMANDTYPE_FRAMEINFO) {
-				msg = newInstance(NetFrameCommandMsg)();
-				++frame; // this is set below.
-				((NetFrameCommandMsg *)msg)->setCommandCount(0);
-				DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Read a repeated frame command, frame = %d, player = %d, commandID = %d\n", frame, playerID, commandID));
-			} else {
-				DEBUG_CRASH(("Trying to repeat a command that shouldn't be repeated."));
-				continue;
-			}
-
-			msg->setExecutionFrame(frame);
-			msg->setPlayerID(playerID);
-			msg->setNetCommandType((NetCommandType)commandType);
-			msg->setID(commandID);
-
-//			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("frame = %d, player = %d, command type = %d, id = %d\n", frame, playerID, commandType, commandID));
-
-			// increment to the next command ID.
-			if (DoesCommandRequireACommandID((NetCommandType)commandType)) {
-				++commandID;
-			}
-
-			// add the message to the list.
-			NetCommandRef *ref = retval->addMessage(msg);
-			if (ref != NULL) {
-				ref->setRelay(relay);
-			}
-
-			deleteInstance(lastCommand);
-			lastCommand = NULL;
-//			lastCommand = newInstance(NetCommandRef)(msg);
-			lastCommand = NEW_NETCOMMANDREF(msg);
-
-			msg->detach();  // Need to detach from new NetCommandMsg created by the "readXMessage" above.
-
-			// since the message is part of the list now, we don't have to keep track of it.  So we'll just set it to NULL.
-			msg = NULL;
-		} else {
-			// we don't recognize this command, but we have to increment i so we don't fall into an infinite loop.
-			DEBUG_CRASH(("Unrecognized packet entry, ignoring."));
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::getCommandList - Unrecognized packet entry at index %d\n", i));
-			dumpPacketToLog();
-			++i;
-		}
-	}
-
-	if (lastCommand != NULL) {
-		deleteInstance(lastCommand);
-		lastCommand = NULL;
-	}
-	return retval;
-}
-
-/**
- * Reads the data portion of a game message from the given position in the packet.
- */
-NetCommandMsg * NetPacket::readGameMessage(UnsignedByte *data, Int &i) 
-{
-	NetGameCommandMsg *msg = newInstance(NetGameCommandMsg);
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readGameMessage\n"));
-
-	// Get the GameMessage command type.
-	GameMessage::Type newType;
-	memcpy(&newType, data + i, sizeof(GameMessage::Type));
-	i += sizeof(GameMessage::Type);
-	msg->setGameMessageType(newType);
-
-	// Get the number of argument types
-	UnsignedByte numArgTypes = 0;
-	memcpy(&numArgTypes, data + i, sizeof(numArgTypes));
-	i += sizeof(numArgTypes);
-
-	// Get the types and the number of arguments of those types.
-	Int totalArgCount = 0;
-	GameMessageParser *parser = newInstance(GameMessageParser)();
-	Int j = 0;
-	for (; j < numArgTypes; ++j) {
-		UnsignedByte type = (UnsignedByte)ARGUMENTDATATYPE_UNKNOWN;
-		memcpy(&type, data + i, sizeof(type));
-		i += sizeof(type);
-
-		UnsignedByte argCount = 0;
-		memcpy(&argCount, data + i, sizeof(argCount));
-		i += sizeof(argCount);
-
-		parser->addArgType((GameMessageArgumentDataType)type, argCount);
-		totalArgCount += argCount;
-	}
-
-	GameMessageParserArgumentType *parserArgType = parser->getFirstArgumentType();
-	GameMessageArgumentDataType lasttype = ARGUMENTDATATYPE_UNKNOWN;
-	Int argsLeftForType = 0;
-	if (parserArgType != NULL) {
-		lasttype = parserArgType->getType();
-		argsLeftForType = parserArgType->getArgCount();
-	}
-	for (j = 0; j < totalArgCount; ++j) {
-		readGameMessageArgumentFromPacket(lasttype, msg, data, i);
-
-		--argsLeftForType;
-		if (argsLeftForType == 0) {
-			DEBUG_ASSERTCRASH(parserArgType != NULL, ("parserArgType was NULL when it shouldn't have been."));
-			if (parserArgType == NULL) {
-				return NULL;
-			}
-
-			parserArgType = parserArgType->getNext();
-			// parserArgType is allowed to be NULL here
-			if (parserArgType != NULL) {
-				argsLeftForType = parserArgType->getArgCount();
-				lasttype = parserArgType->getType();
-			}
-		}
-	}
-
-	deleteInstance(parser);
-	parser = NULL;
-
-	return (NetCommandMsg *)msg;
-}
-
-void NetPacket::readGameMessageArgumentFromPacket(GameMessageArgumentDataType type, NetGameCommandMsg *msg, UnsignedByte *data, Int &i) {
-	if (type == ARGUMENTDATATYPE_INTEGER) {
-		GameMessageArgumentType arg;
-		Int theint;
-		memcpy(&theint, data + i, sizeof(theint));
-		i += sizeof(theint);
-		arg.integer = theint;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_REAL) {
-		GameMessageArgumentType arg;
-		Real thereal;
-		memcpy(&thereal, data + i, sizeof(thereal));
-		i += sizeof(thereal);
-		arg.real = thereal;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_BOOLEAN) {
-		GameMessageArgumentType arg;
-		Bool thebool;
-		memcpy(&thebool, data + i, sizeof(thebool));
-		i += sizeof(thebool);
-		arg.boolean = thebool;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_OBJECTID) {
-		GameMessageArgumentType arg;
-		ObjectID theint;
-		memcpy(&theint, data + i, sizeof(theint));
-		i += sizeof(theint);
-		arg.objectID = theint;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_DRAWABLEID) {
-		GameMessageArgumentType arg;
-		DrawableID theint;
-		memcpy(&theint, data + i, sizeof(theint));
-		i += sizeof(theint);
-		arg.drawableID = theint;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_TEAMID) {
-		GameMessageArgumentType arg;
-		UnsignedInt theint;
-		memcpy(&theint, data + i, sizeof(theint));
-		i += sizeof(theint);
-		arg.teamID = theint;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_LOCATION) {
-		GameMessageArgumentType arg;
-		Coord3D coord;
-		memcpy(&coord, data + i, sizeof(coord));
-		i += sizeof(coord);
-		arg.location = coord;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_PIXEL) {
-		GameMessageArgumentType arg;
-		ICoord2D pixel;
-		memcpy(&pixel, data + i, sizeof(pixel));
-		i += sizeof(pixel);
-		arg.pixel = pixel;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_PIXELREGION) {
-		GameMessageArgumentType arg;
-		IRegion2D reg;
-		memcpy(&reg, data + i, sizeof(reg));
-		i += sizeof(reg);
-		arg.pixelRegion = reg;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_TIMESTAMP) {
-		GameMessageArgumentType arg;
-		UnsignedInt stamp;
-		memcpy(&stamp, data + i, sizeof(stamp));
-		i += sizeof(stamp);
-		arg.timestamp = stamp;
-		msg->addArgument(type, arg);
-	} else if (type == ARGUMENTDATATYPE_WIDECHAR) {
-		GameMessageArgumentType arg;
-		WideChar c;
-		memcpy(&c, data + i, sizeof(c));
-		i += sizeof(c);
-		arg.wChar = c;
-		msg->addArgument(type, arg);
-	}
-}
-
-/**
- * Reads the data portion of the ack message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readAckBothMessage(UnsignedByte *data, Int &i) {
-	NetAckBothCommandMsg *msg = newInstance(NetAckBothCommandMsg);
-
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readAckMessage, "));
-	UnsignedShort cmdID = 0;
-
-	memcpy(&cmdID, data + i, sizeof(UnsignedShort));
-	i += sizeof(UnsignedShort);
-	msg->setCommandID(cmdID);
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("commandID = %d, ", cmdID));
-
-	UnsignedByte origPlayerID = 0;
-	memcpy(&origPlayerID, data + i, sizeof(UnsignedByte));
-	i += sizeof(UnsignedByte);
-	msg->setOriginalPlayerID(origPlayerID);
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("original player id = %d\n", origPlayerID));
-
-	return msg;
-}
-
-/**
- * Reads the data portion of the ack message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readAckStage1Message(UnsignedByte *data, Int &i) {
-	NetAckStage1CommandMsg *msg = newInstance(NetAckStage1CommandMsg);
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readAckMessage, "));
-	UnsignedShort cmdID = 0;
-
-	memcpy(&cmdID, data + i, sizeof(UnsignedShort));
-	i += sizeof(UnsignedShort);
-	msg->setCommandID(cmdID);
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("commandID = %d, ", cmdID));
-
-	UnsignedByte origPlayerID = 0;
-	memcpy(&origPlayerID, data + i, sizeof(UnsignedByte));
-	i += sizeof(UnsignedByte);
-	msg->setOriginalPlayerID(origPlayerID);
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("original player id = %d\n", origPlayerID));
-
-	return msg;
-}
-
-/**
- * Reads the data portion of the ack message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readAckStage2Message(UnsignedByte *data, Int &i) {
-	NetAckStage2CommandMsg *msg = newInstance(NetAckStage2CommandMsg);
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readAckMessage, "));
-	UnsignedShort cmdID = 0;
-
-	memcpy(&cmdID, data + i, sizeof(UnsignedShort));
-	i += sizeof(UnsignedShort);
-	msg->setCommandID(cmdID);
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("commandID = %d, ", cmdID));
-
-	UnsignedByte origPlayerID = 0;
-	memcpy(&origPlayerID, data + i, sizeof(UnsignedByte));
-	i += sizeof(UnsignedByte);
-	msg->setOriginalPlayerID(origPlayerID);
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("original player id = %d\n", origPlayerID));
-
-	return msg;
-}
-
-/**
- * Reads the data portion of the frame message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readFrameMessage(UnsignedByte *data, Int &i) {
-	NetFrameCommandMsg *msg = newInstance(NetFrameCommandMsg);
-
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readFrameMessage, "));
-	UnsignedShort cmdCount = 0;
-
-	memcpy(&cmdCount, data + i, sizeof(UnsignedShort));
-	i += sizeof(UnsignedShort);
-	msg->setCommandCount(cmdCount);
-//	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command count = %d, ", cmdCount));
-
-	return msg;
-}
-
-/**
- * Reads the player leave message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readPlayerLeaveMessage(UnsignedByte *data, Int &i) {
-	NetPlayerLeaveCommandMsg *msg = newInstance(NetPlayerLeaveCommandMsg);
-
-	UnsignedByte leavingPlayerID = 0;
-
-	memcpy(&leavingPlayerID, data + i, sizeof(UnsignedByte));
-	i += sizeof(UnsignedByte);
-	msg->setLeavingPlayerID(leavingPlayerID);
-
-	return msg;
-}
-
-/**
- * Reads the run ahead metrics message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readRunAheadMetricsMessage(UnsignedByte *data, Int &i) {
-	NetRunAheadMetricsCommandMsg *msg = newInstance(NetRunAheadMetricsCommandMsg);
-
-	Real averageLatency = (Real)0.2;
-	UnsignedShort averageFps = 30;
-
-	memcpy(&averageLatency, data + i, sizeof(Real));
-	i += sizeof(Real);
-	msg->setAverageLatency(averageLatency);
-
-	memcpy(&averageFps, data + i, sizeof(UnsignedShort));
-	i += sizeof(UnsignedShort);
-	msg->setAverageFps((Int)averageFps);
-	return msg;
-}
-
-/**
- * Reads the run ahead message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readRunAheadMessage(UnsignedByte *data, Int &i) {
-	NetRunAheadCommandMsg *msg = newInstance(NetRunAheadCommandMsg);
-
-	UnsignedShort newRunAhead = 20;
-	memcpy(&newRunAhead, data + i, sizeof(UnsignedShort));
-	i += sizeof(UnsignedShort);
-	msg->setRunAhead(newRunAhead);
-
-	UnsignedByte newFrameRate = 30;
-	memcpy(&newFrameRate, data + i, sizeof(UnsignedByte));
-	i += sizeof(UnsignedByte);
-	msg->setFrameRate(newFrameRate);
-
-	return msg;
-}
-
-/**
- * Reads the CRC info message at this position in the packet.
- */
-NetCommandMsg * NetPacket::readDestroyPlayerMessage(UnsignedByte *data, Int &i) {
-	NetDestroyPlayerCommandMsg *msg = newInstance(NetDestroyPlayerCommandMsg);
-
-	UnsignedInt newVal = 0;
-	memcpy(&newVal, data + i, sizeof(UnsignedInt));
-	i += sizeof(UnsignedInt);
-	msg->setPlayerIndex(newVal);
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("Saw CRC of 0x%8.8X\n", newCRC));
-
-	return msg;
-}
-
-/**
- * Reads the keep alive data, of which there is none.
- */
-NetCommandMsg * NetPacket::readKeepAliveMessage(UnsignedByte *data, Int &i) {
-	NetKeepAliveCommandMsg *msg = newInstance(NetKeepAliveCommandMsg);
-
-	return msg;
-}
-
-/**
- * Reads the disconnect keep alive data, of which there is none.
- */
-NetCommandMsg * NetPacket::readDisconnectKeepAliveMessage(UnsignedByte *data, Int &i) {
-	NetDisconnectKeepAliveCommandMsg *msg = newInstance(NetDisconnectKeepAliveCommandMsg);
-
-	return msg;
-}
-
-/**
- * Reads the disconnect player data.  Which is the slot number of the player being disconnected.
- */
-NetCommandMsg * NetPacket::readDisconnectPlayerMessage(UnsignedByte *data, Int &i) {
-	NetDisconnectPlayerCommandMsg *msg = newInstance(NetDisconnectPlayerCommandMsg);
-
-	UnsignedByte slot = 0;
-	memcpy(&slot, data + i, sizeof(slot));
-	i += sizeof(slot);
-	msg->setDisconnectSlot(slot);
-
-	UnsignedInt disconnectFrame = 0;
-	memcpy(&disconnectFrame, data + i, sizeof(disconnectFrame));
-	i += sizeof(disconnectFrame);
-	msg->setDisconnectFrame(disconnectFrame);
-
-	return msg;
-}
-
-/**
- * Reads the packet router query data, of which there is none.
- */
-NetCommandMsg * NetPacket::readPacketRouterQueryMessage(UnsignedByte *data, Int &i) {
-	NetPacketRouterQueryCommandMsg *msg = newInstance(NetPacketRouterQueryCommandMsg);
-
-	return msg;
-}
-
-/**
- * Reads the packet router ack data, of which there is none.
- */
-NetCommandMsg * NetPacket::readPacketRouterAckMessage(UnsignedByte *data, Int &i) {
-	NetPacketRouterAckCommandMsg *msg = newInstance(NetPacketRouterAckCommandMsg);
-
-	return msg;
-}
-
-/**
- * Reads the disconnect chat data, which is just the string.
- */
-NetCommandMsg * NetPacket::readDisconnectChatMessage(UnsignedByte *data, Int &i) {
-	NetDisconnectChatCommandMsg *msg = newInstance(NetDisconnectChatCommandMsg);
-
-	WideChar text[256];
-	UnsignedByte length;
-	memcpy(&length, data + i, sizeof(UnsignedByte));
-	++i;
-	memcpy(text, data + i, length * sizeof(WideChar));
-	i += length * sizeof(WideChar);
-	text[length] = 0;
-
-	UnicodeString unitext;
-	unitext.set(text);
-
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readDisconnectChatMessage - read message, message is %ls\n", unitext.str()));
-
-	msg->setText(unitext);
-	return msg;
-}
-
-/**
- * Reads the chat data, which is just the string.
- */
-NetCommandMsg * NetPacket::readChatMessage(UnsignedByte *data, Int &i) {
-	NetChatCommandMsg *msg = newInstance(NetChatCommandMsg);
-
-	WideChar text[256];
-	UnsignedByte length;
-	Int playerMask;
-	memcpy(&length, data + i, sizeof(UnsignedByte));
-	++i;
-	memcpy(text, data + i, length * sizeof(WideChar));
-	i += length * sizeof(WideChar);
-	text[length] = 0;
-	memcpy(&playerMask, data + i, sizeof(Int));
-	i += sizeof(Int);
-
-
-	UnicodeString unitext;
-	unitext.set(text);
-
-	//DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readChatMessage - read message, message is %ls\n", unitext.str()));
-
-	msg->setText(unitext);
-	msg->setPlayerMask(playerMask);
-	return msg;
-}
-
-/**
- * Reads the disconnect vote data.  Which is the slot number of the player being disconnected.
- */
-NetCommandMsg * NetPacket::readDisconnectVoteMessage(UnsignedByte *data, Int &i) {
-	NetDisconnectVoteCommandMsg *msg = newInstance(NetDisconnectVoteCommandMsg);
-
-	UnsignedByte slot = 0;
-	memcpy(&slot, data + i, sizeof(slot));
-	i += sizeof(slot);
-	msg->setSlot(slot);
-
-	UnsignedInt voteFrame = 0;
-	memcpy(&voteFrame, data + i, sizeof(voteFrame));
-	i += sizeof(voteFrame);
-	msg->setVoteFrame(voteFrame);
-
-	return msg;
-}
-
-/**
- * Reads the Progress data.  Which is the slot number of the player being disconnected.
- */
-NetCommandMsg * NetPacket::readProgressMessage(UnsignedByte *data, Int &i) {
-	NetProgressCommandMsg *msg = newInstance(NetProgressCommandMsg);
-
-	UnsignedByte percentage = 0;
-	memcpy(&percentage, data + i, sizeof(UnsignedByte));
-	i += sizeof(UnsignedByte);
-	msg->setPercentage(percentage);
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readLoadCompleteMessage(UnsignedByte *data, Int &i) {
-	NetCommandMsg *msg = newInstance(NetCommandMsg);
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readTimeOutGameStartMessage(UnsignedByte *data, Int &i) {
-	NetCommandMsg *msg = newInstance(NetCommandMsg);
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readWrapperMessage(UnsignedByte *data, Int &i) {
-	NetWrapperCommandMsg *msg = newInstance(NetWrapperCommandMsg);
-
-	// get the wrapped command ID
-	UnsignedShort wrappedCommandID = 0;
-	memcpy(&wrappedCommandID, data + i, sizeof(wrappedCommandID));
-	msg->setWrappedCommandID(wrappedCommandID);
-	i += sizeof(wrappedCommandID);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - wrapped command ID == %d\n", wrappedCommandID));
-
-	// get the chunk number.
-	UnsignedInt chunkNumber = 0;
-	memcpy(&chunkNumber, data + i, sizeof(chunkNumber));
-	msg->setChunkNumber(chunkNumber);
-	i += sizeof(chunkNumber);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - chunk number = %d\n", chunkNumber));
-
-	// get the number of chunks
-	UnsignedInt numChunks = 0;
-	memcpy(&numChunks, data + i, sizeof(numChunks));
-	msg->setNumChunks(numChunks);
-	i += sizeof(numChunks);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - number of chunks = %d\n", numChunks));
-
-	// get the total data length
-	UnsignedInt totalDataLength = 0;
-	memcpy(&totalDataLength, data + i, sizeof(totalDataLength));
-	msg->setTotalDataLength(totalDataLength);
-	i += sizeof(totalDataLength);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - total data length = %d\n", totalDataLength));
-
-	// get the data length for this chunk
-	UnsignedInt dataLength = 0;
-	memcpy(&dataLength, data + i, sizeof(dataLength));
-	i += sizeof(dataLength);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - data length = %d\n", dataLength));
-
-	UnsignedInt dataOffset = 0;
-	memcpy(&dataOffset, data + i, sizeof(dataOffset));
-	msg->setDataOffset(dataOffset);
-	i += sizeof(dataOffset);
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readWrapperMessage - data offset = %d\n", dataOffset));
-
-	msg->setData(data + i, dataLength);
-	i += dataLength;
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readFileMessage(UnsignedByte *data, Int &i) {
-	NetFileCommandMsg *msg = newInstance(NetFileCommandMsg);
-	char filename[_MAX_PATH];
-	char *c = filename;
-
-	while (data[i] != 0) {
-		*c = data[i];
-		++c;
-		++i;
-	}
-	*c = 0;
-	++i;
-	msg->setPortableFilename(AsciiString(filename));	// it's transferred as a portable filename
-
-	UnsignedInt dataLength = 0;
-	memcpy(&dataLength, data + i, sizeof(dataLength));
-	i += sizeof(dataLength);
-
-	UnsignedByte *buf = NEW UnsignedByte[dataLength];
-	memcpy(buf, data + i, dataLength);
-	i += dataLength;
-
-	msg->setFileData(buf, dataLength);
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readFileAnnounceMessage(UnsignedByte *data, Int &i) {
-	NetFileAnnounceCommandMsg *msg = newInstance(NetFileAnnounceCommandMsg);
-	char filename[_MAX_PATH];
-	char *c = filename;
-
-	while (data[i] != 0) {
-		*c = data[i];
-		++c;
-		++i;
-	}
-	*c = 0;
-	++i;
-	msg->setPortableFilename(AsciiString(filename));	// it's transferred as a portable filename
-
-	UnsignedShort fileID = 0;
-	memcpy(&fileID, data + i, sizeof(fileID));
-	i += sizeof(fileID);
-	msg->setFileID(fileID);
-
-	UnsignedByte playerMask = 0;
-	memcpy(&playerMask, data + i, sizeof(playerMask));
-	i += sizeof(playerMask);
-	msg->setPlayerMask(playerMask);
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readFileProgressMessage(UnsignedByte *data, Int &i) {
-	NetFileProgressCommandMsg *msg = newInstance(NetFileProgressCommandMsg);
-
-	UnsignedShort fileID = 0;
-	memcpy(&fileID, data + i, sizeof(fileID));
-	i += sizeof(fileID);
-	msg->setFileID(fileID);
-
-	Int progress = 0;
-	memcpy(&progress, data + i, sizeof(progress));
-	i += sizeof(progress);
-	msg->setProgress(progress);
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readDisconnectFrameMessage(UnsignedByte *data, Int &i) {
-	NetDisconnectFrameCommandMsg *msg = newInstance(NetDisconnectFrameCommandMsg);
-
-	UnsignedInt disconnectFrame = 0;
-	memcpy(&disconnectFrame, data + i, sizeof(disconnectFrame));
-	i += sizeof(disconnectFrame);
-	msg->setDisconnectFrame(disconnectFrame);
-
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::readDisconnectFrameMessage - read disconnect frame for frame %d\n", disconnectFrame));
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readDisconnectScreenOffMessage(UnsignedByte *data, Int &i) {
-	NetDisconnectScreenOffCommandMsg *msg = newInstance(NetDisconnectScreenOffCommandMsg);
-
-	UnsignedInt newFrame = 0;
-	memcpy(&newFrame, data + i, sizeof(newFrame));
-	i += sizeof(newFrame);
-	msg->setNewFrame(newFrame);
-
-	return msg;
-}
-
-NetCommandMsg * NetPacket::readFrameResendRequestMessage(UnsignedByte *data, Int &i) {
-	NetFrameResendRequestCommandMsg *msg = newInstance(NetFrameResendRequestCommandMsg);
-
-	UnsignedInt frameToResend = 0;
-	memcpy(&frameToResend, data + i, sizeof(frameToResend));
-	i += sizeof(frameToResend);
-	msg->setFrameToResend(frameToResend);
-
-	return msg;
-}
-
-/**
- * Returns the number of commands in this packet.  Only valid if the packet is locally constructed.
- */
-Int NetPacket::getNumCommands() {
-	return m_numCommands;
-}
-
-/**
- * Returns the address that this packet is to be sent to.  Only valid if the packet is locally constructed.
- */
-UnsignedInt NetPacket::getAddr() {
-	return m_addr;
-}
-
-/**
- * Returns the port that this packet is to be sent to.  Only valid if the packet is locally constructed.
- */
-UnsignedShort NetPacket::getPort() {
-	return m_port;
-}
-
-/**
- * Returns the data of this packet.
- */
-UnsignedByte * NetPacket::getData() {
-	return m_packet;
-}
-
-/**
- * Returns the length of the packet.
- */
-Int NetPacket::getLength() {
-	return m_packetLen;
-}
-
-/**
- * Dumps the packet to the debug log file
- */
-void NetPacket::dumpPacketToLog() {
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket::dumpPacketToLog() - packet is %d bytes\n", m_packetLen));
-	Int numLines = m_packetLen / 8;
-	if ((m_packetLen % 8) != 0) {
-		++numLines;
-	}
-	for (Int dumpindex = 0; dumpindex < numLines; ++dumpindex) {
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("\t%d\t", dumpindex*8));
-		for (Int dumpindex2 = 0; (dumpindex2 < 8) && ((dumpindex*8 + dumpindex2) < m_packetLen); ++dumpindex2) {
-			DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("%02x '%c' ", m_packet[dumpindex*8 + dumpindex2], m_packet[dumpindex*8 + dumpindex2]));
-		}
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("\n"));
-	}
-	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("End of packet dump\n"));
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp
deleted file mode 100644
index d2a42367715..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp
+++ /dev/null
@@ -1,1039 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Network.cpp ////////////////////////////////////////////////////
-// Implementation of Network singleton
-// Author: Matthew D. Campbell, July 2001
-///////////////////////////////////////////////////////////////////////////////
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/GameEngine.h"
-#include "Common/MessageStream.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/udp.h"
-#include "GameNetwork/Transport.h"
-#include "strtok_r.h"
-#include "GameClient/Shell.h"
-#include "Common/CRCDebug.h"
-#include "GameLogic/GameLogic.h"
-
-#include "Common/RandomValue.h"
-
-
-#include "GameLogic/ScriptActions.h"
-#include "GameLogic/ScriptEngine.h"
-#include "Common/Recorder.h"
-#include "GameClient/MessageBox.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#if defined(DEBUG_CRC)
-Int NET_CRC_INTERVAL = 1;
-#else
-Int NET_CRC_INTERVAL = 100;
-#endif
-
-// DEFINES ////////////////////////////////////////////////////////////////////
-
-#define RESEND_INTERVAL 1
-
-// PRIVATE TYPES //////////////////////////////////////////////////////////////
-
-/**
- * Connection message - encapsulating info kept by the connection layer about each
- * packet.  These structs make up the in/out buffers at the connection layer.
- */
-#pragma pack(push, 1)
-struct ConnectionMessage
-{
-	Int id;
-	NetMessageFlags flags;
-	UnsignedByte data[MAX_MESSAGE_LEN];
-	time_t lastSendTime;
-	Int retries;
-	Int length;
-};
-#pragma pack(pop)
-
-static const int CmdMsgLen = 6; //< Minimum size of a command packet (Int + Unsigned Short)
-
-// PRIVATE DATA ///////////////////////////////////////////////////////////////
-
-
-
-// PUBLIC DATA ////////////////////////////////////////////////////////////////
-
-/// The Network singleton instance
-NetworkInterface *TheNetwork = NULL;
-
-// PRIVATE PROTOTYPES /////////////////////////////////////////////////////////
-
-/**
- * The Network class is used to instantiate a singleton which 
- * implements the interface to all Network operations such as message stream processing and network communications.
- */
-class Network : public NetworkInterface
-{
-public:
-	//---------------------------------------------------------------------------------------
-	// Setup / Teardown functions
-	Network();
-	~Network();
-	void init( void );																				///< Initialize or re-initialize the instance
-	void reset( void );																				///< Reinitialize the network
-	void update( void );																			///< Process command list
-	void liteupdate( void );																	///< Do a lightweight update to send packets and pass messages.
-	Bool deinit( void );																			///< Shutdown connections, release memory
-
-	void setLocalAddress(UnsignedInt ip, UnsignedInt port);
-	inline UnsignedInt getRunAhead(void) { return m_runAhead; }
-	inline UnsignedInt getFrameRate(void) { return m_frameRate; }
-	UnsignedInt getPacketArrivalCushion(void);								///< Returns the smallest packet arrival cushion since this was last called.
-	Bool isFrameDataReady( void );
-	void parseUserList( const GameInfo *game );
-	void startGame(void);																			///< Sets the network game frame counter to -1
-
-	void sendChat(UnicodeString text, Int playerMask);
-	void sendDisconnectChat(UnicodeString text);
-
-	void sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID);
-	UnsignedShort sendFileAnnounce(AsciiString path, UnsignedByte playerMask);
-	Int getFileTransferProgress(Int playerID, AsciiString path);
-	Bool areAllQueuesEmpty(void);
-
-	void quitGame();
-	virtual void selfDestructPlayer(Int index);
-
-
-	void voteForPlayerDisconnect(Int slot);
-	virtual Bool isPacketRouter( void );
-
-	// Bandwidth metrics
-	Real getIncomingBytesPerSecond( void );
-	Real getIncomingPacketsPerSecond( void );
-	Real getOutgoingBytesPerSecond( void );
-	Real getOutgoingPacketsPerSecond( void );
-	Real getUnknownBytesPerSecond( void );
-	Real getUnknownPacketsPerSecond( void );
-
-	// Multiplayer Load Progress Functions
-	void updateLoadProgress( Int percent );
-	void loadProgressComplete( void );
-	void sendTimeOutGameStart( void );
-
-#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
-	// Disconnect screen testing
-	virtual void toggleNetworkOn();
-#endif
-
-	// Exposing some info contained in the Connection Manager
-	UnsignedInt getLocalPlayerID( void );
-	UnicodeString getPlayerName(Int playerNum);
-	Int getNumPlayers(void );
-
-	Int getAverageFPS() { return m_conMgr->getAverageFPS(); }
-	Int getSlotAverageFPS(Int slot);
-
-	void attachTransport(Transport *transport);
-	void initTransport();
-
-	void setSawCRCMismatch( void );
-	Bool sawCRCMismatch( void ) { return m_sawCRCMismatch; }
-	Bool isPlayerConnected( Int playerID );
-
-	void notifyOthersOfCurrentFrame();														///< Tells all the other players what frame we are on.
-	void notifyOthersOfNewFrame(UnsignedInt frame);								///< Tells all the other players that we are on a new frame.
-
-	Int  getExecutionFrame();																			///< Returns the next valid frame for simultaneous command execution.
-
-	// For disconnect blame assignment
-	UnsignedInt getPingFrame();
-	Int getPingsSent();
-	Int getPingsRecieved();
-
-protected:
-	void GetCommandsFromCommandList();														///< Remove commands from TheCommandList and put them on the Network command list.
-	void SendCommandsToConnectionManager();												///< Send the new commands to the ConnectionManager
-	Bool AllCommandsReady(UnsignedInt frame);											///< Do we have all the commands for the given frame?
-	void RelayCommandsToCommandList(UnsignedInt frame);						///< Put the commands for the given frame onto TheCommandList.
-	Bool isTransferCommand(GameMessage *msg);											///< Is this a command that needs to be transfered to the other clients?
-	Bool processCommand(GameMessage *msg);												///< Whatever needs to be done as a result of this command, do it now.
-	void processFrameSynchronizedNetCommand(NetCommandRef *msg);	///< If there is a network command that needs to be executed at the same frame number on all clients, it happens here.
-	void processRunAheadCommand(NetRunAheadCommandMsg *msg);			///< Do what needs to be done when we get a new run ahead command.
-	void processDestroyPlayerCommand(NetDestroyPlayerCommandMsg *msg);	///< Do what needs to be done when we need to destroy a player.
-	void endOfGameCheck();																				///< Checks to see if its ok to leave this game.  If it is, send the apropriate command to the game logic.
-	Bool timeForNewFrame();
-
-	ConnectionManager *m_conMgr;																	///< The connection manager object
-
-	UnsignedInt m_lastFrame;																			///< The last game logic frame that was processed.
-
-	NetLocalStatus m_localStatus;															///< My local status as a player in this game.
-
-	Int m_runAhead;																						///< The current run ahead of the game.
-	Int m_frameRate;
-	Int m_lastExecutionFrame;																	///< The highest frame number that a command could have been executed on.
-	Int m_lastFrameCompleted;
-	Bool m_didSelfSlug;
-	__int64 m_perfCountFreq;														///< The frequency of the performance counter.
-
-	__int64 m_nextFrameTime;														///< When did we execute the last frame?  For slugging the GameLogic...
-
-	Bool m_frameDataReady;																		///< Is the frame data for the next frame ready to be executed by TheGameLogic?
-
-	// CRC info
-	Bool m_checkCRCsThisFrame;
-	Bool m_sawCRCMismatch;
-	std::vector<UnsignedInt> m_CRC[MAX_SLOTS];
-	std::list<Int> m_playersToDisconnect;
-	GameWindow *m_messageWindow;
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	Bool m_networkOn;
-#endif
-};
-
-UnsignedInt Network::getPingFrame()
-{
-	return (m_conMgr)?m_conMgr->getPingFrame():0;
-}
-
-Int Network::getPingsSent()
-{
-	return (m_conMgr)?m_conMgr->getPingsSent():0;
-}
-
-Int Network::getPingsRecieved()
-{
-	return (m_conMgr)?m_conMgr->getPingsRecieved():0;
-}
-
-Bool Network::isPlayerConnected( Int playerID ) {
-	if (playerID == getLocalPlayerID()) {
-		return m_localStatus == NETLOCALSTATUS_INGAME || m_localStatus == NETLOCALSTATUS_LEAVING;
-	}
-	return m_conMgr->isPlayerConnected(playerID);
-}
-
-
-// PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-// PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-/**
- * This creates a network object and returns it.
- */
-NetworkInterface *NetworkInterface::createNetwork() 
-{
-	return NEW Network;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * The constructor.
- */
-Network::Network()
-{
-	//Added By Sadullah Nader
-	//Initializations inserted
-	m_checkCRCsThisFrame = FALSE;
-	m_didSelfSlug = FALSE;
-	m_frameDataReady = FALSE;
-	m_sawCRCMismatch = FALSE;
-	//
-	
-	m_conMgr = NULL;
-	m_messageWindow = NULL;
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	m_networkOn = TRUE;
-#endif
-}
-
-/**
- * The destructor.
- */
-Network::~Network()
-{
-	deinit();
-}
-
-/**
- * This basically releases all the memory.
- */
-Bool Network::deinit( void )
-{
-	if (m_conMgr)
-	{
-		m_conMgr->destroyGameMessages();
-		delete m_conMgr;
-		m_conMgr = NULL;
-	}
-	if (m_messageWindow) {
-		TheWindowManager->winDestroy(m_messageWindow);
-		m_messageWindow = NULL;
-	}
-
-	return true;
-}
-
-/**
- * Takes the network back to the initial state.
- */
-void Network::reset() {
-	init();
-}
-
-/**
- * Initializes all the network subsystems.
- */
-void Network::init()
-{
-	if (!deinit())
-	{
-		DEBUG_LOG(("Could not deinit network prior to init!\n"));
-		return;
-	}
-
-	m_conMgr = NEW ConnectionManager;
-	m_conMgr->init();
-
-	m_lastFrame = 0;
-	m_runAhead = min(max(30, MIN_RUNAHEAD), MAX_FRAMES_AHEAD/2); ///< @todo: don't hard-code the run-ahead.
-	m_frameRate = 30;
-	m_lastExecutionFrame = m_runAhead - 1; // subtract 1 since we're starting on frame 0
-	m_lastFrameCompleted = m_runAhead - 1; // subtract 1 since we're starting on frame 0
-	m_frameDataReady = FALSE;
-	m_didSelfSlug = FALSE;
-
-	m_localStatus = NETLOCALSTATUS_PREGAME;
-
-	QueryPerformanceFrequency((LARGE_INTEGER *)&m_perfCountFreq);
-	m_nextFrameTime = 0;
-	m_sawCRCMismatch = FALSE;
-	m_checkCRCsThisFrame = FALSE;
-
-	DEBUG_LOG(("Network timing values:\n"));
-	DEBUG_LOG(("NetworkFPSHistoryLength: %d\n", TheGlobalData->m_networkFPSHistoryLength));
-	DEBUG_LOG(("NetworkLatencyHistoryLength: %d\n", TheGlobalData->m_networkLatencyHistoryLength));
-	DEBUG_LOG(("NetworkRunAheadMetricsTime: %d\n", TheGlobalData->m_networkRunAheadMetricsTime));
-	DEBUG_LOG(("NetworkCushionHistoryLength: %d\n", TheGlobalData->m_networkCushionHistoryLength));
-	DEBUG_LOG(("NetworkRunAheadSlack: %d\n", TheGlobalData->m_networkRunAheadSlack));
-	DEBUG_LOG(("NetworkKeepAliveDelay: %d\n", TheGlobalData->m_networkKeepAliveDelay));
-	DEBUG_LOG(("NetworkDisconnectTime: %d\n", TheGlobalData->m_networkDisconnectTime));
-	DEBUG_LOG(("NetworkPlayerTimeoutTime: %d\n", TheGlobalData->m_networkPlayerTimeoutTime));
-	DEBUG_LOG(("NetworkDisconnectScreenNotifyTime: %d\n", TheGlobalData->m_networkDisconnectScreenNotifyTime));
-	DEBUG_LOG(("Other network stuff:\n"));
-	DEBUG_LOG(("FRAME_DATA_LENGTH = %d\n", FRAME_DATA_LENGTH));
-	DEBUG_LOG(("FRAMES_TO_KEEP = %d\n", FRAMES_TO_KEEP));
-
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	m_networkOn = TRUE;
-#endif
-
-	return;
-}
-
-void Network::setSawCRCMismatch( void )
-{
-	m_sawCRCMismatch = TRUE;
-
-	TheScriptActions->closeWindows( TRUE );
-	m_messageWindow = TheWindowManager->winCreateFromScript("Menus/CRCMismatch.wnd");
-	TheScriptEngine->startEndGameTimer();
-
-	TheRecorder->logCRCMismatch();
-
-	// dump GameLogic random seed
-	DEBUG_LOG(("Latest frame for mismatch = %d GameLogic frame = %d\n",
-		TheGameLogic->getFrame()-m_runAhead-1, TheGameLogic->getFrame()));
-	DEBUG_LOG(("GetGameLogicRandomSeedCRC() = %d\n", GetGameLogicRandomSeedCRC()));
-
-	// dump CRCs
-	{
-		DEBUG_LOG(("--- GameState Dump ---\n"));
-#ifdef DEBUG_CRC
-		outputCRCDumpLines();
-#endif
-		DEBUG_LOG(("------ End Dump ------\n"));
-	}
-	{
-		DEBUG_LOG(("--- DebugInfo Dump ---\n"));
-#ifdef DEBUG_CRC
-		outputCRCDebugLines();
-#endif
-		DEBUG_LOG(("------ End Dump ------\n"));
-	}
-}
-
-/**
- * Take a user list and build the connection queues and player lists and stuff like that.
- */
-void Network::parseUserList( const GameInfo *game )
-{
-	if (!game)
-	{
-		DEBUG_LOG(("FAILED parseUserList with a NULL game\n"));
-		return;
-	}
-
-	m_conMgr->parseUserList(game);
-
-	// Now that we have the players in this game, we need to reset the FrameData stuff.
-	m_conMgr->destroyGameMessages();
-	m_conMgr->zeroFrames(1, m_runAhead-1); ///< we zero out m_runAhead frames +1 because the game actually starts at frame 1.
-}
-
-/**
- * Guess what, we're starting a game!
- */
-void Network::startGame() {
-}
-
-/**
- * Tell the network which ip address the user has chosen to use.  Well ok, they probably didn't choose
- * it explicitly, but regardless, this is the one we're going to use.
- */
-void Network::setLocalAddress(UnsignedInt ip, UnsignedInt port) {
-	DEBUG_ASSERTCRASH(m_conMgr != NULL, ("Connection manager does not exist."));
-	if (m_conMgr != NULL) {
-		m_conMgr->setLocalAddress(ip, port);
-	}
-}
-
-/**
- * Tell the network to initialize the transport object
- */
-void Network::initTransport() {
-	DEBUG_ASSERTCRASH(m_conMgr != NULL, ("Connection manager does not exist."));
-	if (m_conMgr != NULL) {
-		m_conMgr->initTransport();
-	}
-}
-
-void Network::attachTransport(Transport *transport) {
-	DEBUG_ASSERTCRASH(m_conMgr != NULL, ("Connection manager does not exist."));
-	if (m_conMgr != NULL) {
-		m_conMgr->attachTransport(transport);
-	}
-}
-
-/**
- * Does this command need to be transfered to the other game clients?
- */
-Bool Network::isTransferCommand(GameMessage *msg) {
-	if ((msg != NULL) && ((msg->getType() > GameMessage::MSG_BEGIN_NETWORK_MESSAGES) && (msg->getType() < GameMessage::MSG_END_NETWORK_MESSAGES))) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Take commands from TheCommandList and give them to the connection manager for transport.
- */
-void Network::GetCommandsFromCommandList() {
-	GameMessage *msg = TheCommandList->getFirstMessage();
-	GameMessage *next = NULL;
-	while (msg != NULL) {
-		next = msg->next();
-		if (isTransferCommand(msg)) { // Is this something we should be sending to the other players?
-			if (m_localStatus == NETLOCALSTATUS_INGAME) {
-				m_conMgr->sendLocalGameMessage(msg, getExecutionFrame());
-			}
-			TheCommandList->removeMessage(msg); // This does not destroy msg's prev and next pointers, so they should still be valid.
-			deleteInstance(msg);
-		} else {
-			if (processCommand(msg)) {
-				TheCommandList->removeMessage(msg);
-				deleteInstance(msg);
-			}
-		}
-		msg = next;
-	}
-}
-
-Int Network::getExecutionFrame() {
-	Int logicFrame = TheGameLogic->getFrame() + m_runAhead;
-	if (logicFrame > m_lastExecutionFrame) {
-		m_lastExecutionFrame = logicFrame;
-		return (logicFrame);
-	}
-	return m_lastExecutionFrame;
-}
-
-/**
- * This is where any processing that needs to be done for specific game messages.
- * Also check here to see if the logic frame number has changed to see if we need to
- * send our info for the last frame to the other players.
- * Return true if the message should be "eaten" by the network.
- */
-Bool Network::processCommand(GameMessage *msg) 
-{
-	if ((m_lastFrame != TheGameLogic->getFrame()) || (m_localStatus == NETLOCALSTATUS_PREGAME)) {
-		// If this is the start of a new game logic frame, then tell the connection manager that the last
-		// frame is over and that it should now produce a frame info packet for the other players.
-
-		if (m_localStatus == NETLOCALSTATUS_PREGAME) {
-			// a sort-of-hack that prevents extraneous frames from being executed before the game actually starts.
-			// Idealy this shouldn't be necessary, but I don't think its hurting anything by being here.
-			if (TheGameLogic->getFrame() == 1) {
-				m_localStatus = NETLOCALSTATUS_INGAME;
-				NetCommandList *netcmdlist = m_conMgr->getFrameCommandList(0); // clear out frame 0 since we skipped it
-				deleteInstance(netcmdlist);
-			} else {
-				return FALSE;
-			}
-		}
-
-		// Only send frame info packets for frames where we are actually going to be in the game.
-		// The reason is so we don't have to wait for frame info packets to be sent that aren't going to
-		// matter anyways when we actually try to leave the game ourselves.
-		if (m_localStatus == NETLOCALSTATUS_INGAME) {
-			Int executionFrame = getExecutionFrame();
-
-			// Send command counts for all the frames we can.
-			for (Int i = m_lastFrameCompleted + 1; i < executionFrame; ++i) {
-				m_conMgr->processFrameTick(i);
-				//DEBUG_LOG(("Network::processCommand - calling processFrameTick for frame %d\n", i));
-				m_lastFrameCompleted = i;
-			}
-		}
-
-		//DEBUG_LOG(("Next Execution Frame - %d, last frame completed - %d\n", getExecutionFrame(), m_lastFrameCompleted));
-		m_lastFrame = TheGameLogic->getFrame();
-	}
-
-	// Are we leaving the game?
-	// This has to happen after the check to see if this is the start of a new logic frame.
-	// The reason is that we have to send all the frame info packets necessary to get to the
-	// frame where everyone else is going to see that we left.
-	if ((msg->getType() == GameMessage::MSG_CLEAR_GAME_DATA) && (m_localStatus == NETLOCALSTATUS_INGAME)) {
-		Int executionFrame = getExecutionFrame();
-		DEBUG_LOG(("Network::processCommand - local player leaving, executionFrame = %d, player leaving on frame %d\n", executionFrame, executionFrame+1));
-
-		m_conMgr->handleLocalPlayerLeaving(executionFrame+1);
-		m_conMgr->processFrameTick(executionFrame); // This is the last command we will execute, so send the command count.
-																								// Also, we are guaranteed not to send any more commands for this frame
-																								// since the local status will change to "Leaving" so we don't have to
-																								// worry about messing up the other players.
-		m_conMgr->processFrameTick(executionFrame+1); // since we send it for executionFrame+1, we need to process both ticks
-		m_lastFrameCompleted = executionFrame;
-		DEBUG_LOG(("Network::processCommand - player leaving on frame %d\n", executionFrame));
-		m_localStatus = NETLOCALSTATUS_LEAVING;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * returns true if all the commands are ready for the given frame.
- */
-Bool Network::AllCommandsReady(UnsignedInt frame) {
-	if (m_conMgr == NULL) {
-		return TRUE;
-	}
-
-	if (m_localStatus == NETLOCALSTATUS_PREGAME) {
-		return TRUE;
-	}
-
-	if (m_localStatus == NETLOCALSTATUS_POSTGAME) {
-		return TRUE;
-	}
-
-	return m_conMgr->allCommandsReady(frame);// && m_conMgr->allCRCsReady(frame);
-}
-
-/**
- * Take commands from the connection manager and put them on TheCommandList.
- * The commands need to be put on in the same order across all clients.
- */
-void Network::RelayCommandsToCommandList(UnsignedInt frame) {
-	if ((m_conMgr == NULL) || (m_localStatus == NETLOCALSTATUS_PREGAME)) {
-		return;
-	}
-	m_checkCRCsThisFrame = FALSE;
-	NetCommandList *netcmdlist = m_conMgr->getFrameCommandList(frame);
-	NetCommandRef *msg = netcmdlist->getFirstMessage();
-	while (msg != NULL) {
-		NetCommandType cmdType = msg->getCommand()->getNetCommandType();
-		if (cmdType == NETCOMMANDTYPE_GAMECOMMAND) {
-			//DEBUG_LOG(("Network::RelayCommandsToCommandList - appending command %d of type %s to command list on frame %d\n", msg->getCommand()->getID(), ((NetGameCommandMsg *)msg->getCommand())->constructGameMessage()->getCommandAsAsciiString().str(), TheGameLogic->getFrame()));
-			TheCommandList->appendMessage(((NetGameCommandMsg *)msg->getCommand())->constructGameMessage());
-		} else {
-			processFrameSynchronizedNetCommand(msg);
-		}
-		msg = msg->getNext();
-	}
-
-	for (std::list<Int>::iterator selfDestructIt = m_playersToDisconnect.begin(); selfDestructIt != m_playersToDisconnect.end(); ++selfDestructIt)
-	{
-		//Int playerToDisconnect = *selfDestructIt;
-		//GameMessage *msg = newInstance(GameMessage)( GameMessage::MSG_SELF_DESTRUCT );
-		//msg->friend_setPlayerIndex(playerToDisconnect);
-		//msg->appendBooleanArgument(TRUE);
-		//TheCommandList->appendMessage(msg);
-	}
-	m_playersToDisconnect.clear();
-
-	deleteInstance(netcmdlist);
-}
-
-/**
- * This is where network commands that need to be executed on the same frame should be executed.
- */
-void Network::processFrameSynchronizedNetCommand(NetCommandRef *msg) {
-	NetCommandMsg *cmdMsg = msg->getCommand();
-	if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_PLAYERLEAVE) {
-		PlayerLeaveCode retval = m_conMgr->processPlayerLeave((NetPlayerLeaveCommandMsg *)cmdMsg);
-		if (retval == PLAYERLEAVECODE_LOCAL) {
-			DEBUG_LOG(("Network::processFrameSynchronizedNetCommand - Local player left the game on frame %d.\n", TheGameLogic->getFrame()));
-			m_localStatus = NETLOCALSTATUS_LEFT;
-		} else if (retval == PLAYERLEAVECODE_PACKETROUTER) {
-			DEBUG_LOG(("Network::processFrameSynchronizedNetCommand - Packet router left the game on frame %d\n", TheGameLogic->getFrame()));
-		} else {
-			DEBUG_LOG(("Network::processFrameSynchronizedNetCommand - Client left the game on frame %d\n", TheGameLogic->getFrame()));
-		}
-	}
-	else if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEAD) {
-		NetRunAheadCommandMsg *netmsg = (NetRunAheadCommandMsg *)cmdMsg;
-		processRunAheadCommand(netmsg);
-		DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("command to set run ahead to %d and frame rate to %d on frame %d actually executed on frame %d\n", netmsg->getRunAhead(), netmsg->getFrameRate(), netmsg->getExecutionFrame(), TheGameLogic->getFrame()));
-	}
-	else if (cmdMsg->getNetCommandType() == NETCOMMANDTYPE_DESTROYPLAYER) {
-		NetDestroyPlayerCommandMsg *netmsg = (NetDestroyPlayerCommandMsg *)cmdMsg;
-		processDestroyPlayerCommand(netmsg);
-		//DEBUG_LOG(("CRC command (%8.8X) on frame %d actually executed on frame %d\n", netmsg->getCRC(), netmsg->getExecutionFrame(), TheGameLogic->getFrame()));
-	}
-}
-
-void Network::processRunAheadCommand(NetRunAheadCommandMsg *msg) {
-	m_runAhead = msg->getRunAhead();
-	m_frameRate = msg->getFrameRate();
-	time_t frameGrouping = (1000 * m_runAhead) / m_frameRate; // number of miliseconds between packet sends
-	frameGrouping = frameGrouping / 2; // since we only want the latency for one way to be a factor.
-//	DEBUG_LOG(("Network::processRunAheadCommand - trying to set frame grouping to %d.  run ahead = %d, m_frameRate = %d\n", frameGrouping, m_runAhead, m_frameRate));
-	if (frameGrouping < 1) {
-		frameGrouping = 1; // Having a value less than 1 doesn't make sense.
-	}
-	if (frameGrouping > 500) {
-		frameGrouping = 500; // Max of a half a second.
-	}
-	m_conMgr->setFrameGrouping(frameGrouping);
-}
-
-void Network::processDestroyPlayerCommand(NetDestroyPlayerCommandMsg *msg)
-{
-	UnsignedInt playerIndex = msg->getPlayerIndex();
-	DEBUG_ASSERTCRASH(playerIndex < MAX_SLOTS, ("Bad player index"));
-	if (playerIndex >= MAX_SLOTS)
-		return;
-
-	AsciiString playerName;
-	playerName.format("player%d", playerIndex);
-	Player *pPlayer = ThePlayerList->findPlayerWithNameKey(NAMEKEY(playerName));
-	if (pPlayer)
-	{
-		GameMessage *msg = newInstance(GameMessage)(GameMessage::MSG_SELF_DESTRUCT);
-		msg->appendBooleanArgument(FALSE);
-		msg->friend_setPlayerIndex(pPlayer->getPlayerIndex());
-		TheCommandList->appendMessage(msg);
-	}
-
-	DEBUG_LOG(("Saw DestroyPlayer from %d about %d for frame %d on frame %d\n", msg->getPlayerID(), msg->getPlayerIndex(),
-		msg->getExecutionFrame(), TheGameLogic->getFrame()));
-}
-
-/**
- * Service queues, process message stream, etc
- */
-void Network::update( void )
-{
-//
-// 1. Take Commands off TheCommandList, hand them off to the ConnectionManager.
-// 2. Call ConnectionManager->update;
-// 3. Check to see if all the commands for the next frame are there.
-// 4. If all commands are there, put that frame's commands on TheCommandList.
-//
-	m_frameDataReady = FALSE;
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (m_networkOn == FALSE) {
-		return;
-	}
-#endif
-
-	GetCommandsFromCommandList(); // Remove commands from TheCommandList and send them to the connection manager.
-	if (m_conMgr != NULL) {
-		if (m_localStatus == NETLOCALSTATUS_INGAME) {
-			m_conMgr->updateRunAhead(m_runAhead, m_frameRate, m_didSelfSlug, getExecutionFrame());
-			m_didSelfSlug = FALSE;
-		}
-		//m_conMgr->update(); // Do the priority thing, packetize thing. This also calls the Transport::update function.
-									 // depacketizes the incoming packets and puts them on the Network command list.
-	}
-
-	liteupdate();
-
-	if (m_localStatus == NETLOCALSTATUS_LEFT) {// || (m_localStatus == NETLOCALSTATUS_LEAVING)) {
-		endOfGameCheck();
-	}
-
-	if (AllCommandsReady(TheGameLogic->getFrame())) { // If all the commands are ready for the next frame...
-		m_conMgr->handleAllCommandsReady();
-//		DEBUG_LOG(("Network::update - frame %d is ready\n", TheGameLogic->getFrame()));
-		if (timeForNewFrame()) { // This needs to come after any other pre-frame execution checks as this changes the timing variables.
-			RelayCommandsToCommandList(TheGameLogic->getFrame());	// Put the commands for the next frame on TheCommandList.
-			m_frameDataReady = TRUE; // Tell the GameEngine to run the commands for the new frame.
-		}
-	}
-}
-
-void Network::liteupdate() {
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (m_networkOn == FALSE) {
-		return;
-	}
-#endif
-
-	if (m_conMgr != NULL) {
-		if (m_localStatus == NETLOCALSTATUS_PREGAME) {
-			m_conMgr->update(FALSE);
-		} else {
-			m_conMgr->update(TRUE);
-		}
-	}
-}
-
-void Network::endOfGameCheck() {
-	if (m_conMgr != NULL) {
-		if (m_conMgr->canILeave()) {
-			m_conMgr->disconnectLocalPlayer();
-			TheMessageStream->appendMessage(GameMessage::MSG_CLEAR_GAME_DATA);
-			m_localStatus = NETLOCALSTATUS_POSTGAME;
-
-			DEBUG_LOG(("Network::endOfGameCheck - about to show the shell\n"));
-		}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		else {
-			m_conMgr->debugPrintConnectionCommands();
-		}
-#endif
-	}
-}
-
-Bool Network::timeForNewFrame() {
-	__int64 curTime;
-	QueryPerformanceCounter((LARGE_INTEGER *)&curTime);
-	__int64 frameDelay = m_perfCountFreq / m_frameRate;
-
-	/*
-	 * If we're pushing up against the edge of our run ahead, we should slow the framerate down a bit
-	 * to avoid being frozen by spikes in network lag.  This will happen if another user's computer is
-	 * running too far behind us, so we need to slow down to let them catch up.
-	 */
-	if (m_conMgr != NULL) {
-		Real cushion = m_conMgr->getMinimumCushion();
-		Real runAheadPercentage = m_runAhead * (TheGlobalData->m_networkRunAheadSlack / (Real)100.0); // If we are at least 50% into our slack, we need to slow down.
-		if (cushion < runAheadPercentage) {
-//			DEBUG_LOG(("Average cushion = %f, run ahead percentage = %f.  Adjusting frameDelay from %I64d to ", cushion, runAheadPercentage, frameDelay));
-			frameDelay += frameDelay / 10; // temporarily decrease the frame rate by 20%.
-//			DEBUG_LOG(("%I64d\n", frameDelay));
-			m_didSelfSlug = TRUE;
-//		} else {
-//			DEBUG_LOG(("Average cushion = %f, run ahead percentage = %f\n", cushion, runAheadPercentage));
-		}
-	}
-
-	// Check to see if we can run another frame.
-	if (curTime >= m_nextFrameTime) {
-//		DEBUG_LOG(("Allowing a new frame, frameDelay = %I64d, curTime - m_nextFrameTime = %I64d\n", frameDelay, curTime - m_nextFrameTime));
-
-//		if (m_nextFrameTime + frameDelay < curTime) {
-		if ((m_nextFrameTime + (2 * frameDelay)) < curTime) {
-			// If we get too far behind on our framerate we need to reset the nextFrameTime thing.
-			m_nextFrameTime = curTime;
-//			DEBUG_LOG(("Initializing m_nextFrameTime to %I64d\n", m_nextFrameTime));
-		} else {
-			// Set the soonest possible starting time for the next frame.
-			m_nextFrameTime += frameDelay;
-//			DEBUG_LOG(("m_nextFrameTime = %I64d\n", m_nextFrameTime));
-		}
-
-		return TRUE;
-	}
-//	DEBUG_LOG(("Slowing down frame rate. frame rate = %d, frame delay = %I64d, curTime - m_nextFrameTime = %I64d\n", m_frameRate, frameDelay, curTime - m_nextFrameTime));
-	return FALSE;
-}
-
-/**
- * Returns true if the game commands for the next frame have been put on the command list.
- */
-Bool Network::isFrameDataReady() {
-	return (m_frameDataReady || (m_localStatus == NETLOCALSTATUS_LEFT));
-}
-
-/**
- * returns the number of incoming bytes per second averaged over the last 30 sec.
- */
-Real Network::getIncomingBytesPerSecond( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getIncomingBytesPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * returns the number of incoming packets per second averaged over the last 30 sec.
- */
-Real Network::getIncomingPacketsPerSecond( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getIncomingPacketsPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * returns the number of outgoing bytes per second averaged over the last 30 sec.
- */
-Real Network::getOutgoingBytesPerSecond( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getOutgoingBytesPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * returns the number of outgoing packets per second averaged over the last 30 sec.
- */
-Real Network::getOutgoingPacketsPerSecond( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getOutgoingPacketsPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * returns the number of bytes received per second that are not from a generals client averaged over 30 sec.
- */
-Real Network::getUnknownBytesPerSecond( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getUnknownBytesPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * returns the number of packets received per second that are not from a generals client averaged over 30 sec.
- */
-Real Network::getUnknownPacketsPerSecond( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getUnknownPacketsPerSecond();
-	else
-	  return 0.0;
-}
-
-/**
- * returns the smallest packet arrival cushion since this was last called.
- */
-UnsignedInt Network::getPacketArrivalCushion( void )
-{
-	if (m_conMgr)
-		return m_conMgr->getPacketArrivalCushion();
-	else
-		return 0;
-}
-
-/**
- * Sends a line of chat to the other players
- */
-void Network::sendChat(UnicodeString text, Int playerMask) {
-	Int executionFrame = getExecutionFrame();
-	m_conMgr->sendChat(text, playerMask, executionFrame);
-}
-
-/**
- * Sends a line of chat to the other players using the disconnect manager.
- */
-void Network::sendDisconnectChat(UnicodeString text) {
-	m_conMgr->sendDisconnectChat(text);
-}
-
-// send a file.  woohoo.
-void Network::sendFile(AsciiString path, UnsignedByte playerMask, UnsignedShort commandID)
-{
-	m_conMgr->sendFile(path, playerMask, commandID);
-}
-
-// send a file.  woohoo.
-UnsignedShort Network::sendFileAnnounce(AsciiString path, UnsignedByte playerMask)
-{
-	return m_conMgr->sendFileAnnounce(path, playerMask);
-}
-
-Int Network::getFileTransferProgress(Int playerID, AsciiString path)
-{
-	return m_conMgr->getFileTransferProgress(playerID, path);
-}
-
-Bool Network::areAllQueuesEmpty(void)
-{
-	return m_conMgr->canILeave();
-}
-
-/**
- * Quit the game now.  This should only be called from the disconnect screen.
- */
-void Network::quitGame() {
-	if (m_conMgr != NULL) {
-		m_conMgr->quitGame();
-	}
-
-	// Blow up / Transfer your units when you quit.  Like a normal quit menu quit.
-	GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);
-	msg->appendBooleanArgument(TRUE);
-
-	TheMessageStream->appendMessage(GameMessage::MSG_CLEAR_GAME_DATA);
-	m_localStatus = NETLOCALSTATUS_POSTGAME;
-	DEBUG_LOG(("Network::quitGame - quitting game..."));
-}
-
-void Network::selfDestructPlayer(Int index)
-{
-	m_playersToDisconnect.push_back(index);
-}
-
-
-Bool Network::isPacketRouter( void )
-{
-	return m_conMgr && m_conMgr->isPacketRouter();
-}
-
-/**
- * Register a vote towards a player being disconnected.
- */
-void Network::voteForPlayerDisconnect(Int slot) {
-	if (m_conMgr != NULL) {
-		m_conMgr->voteForPlayerDisconnect(slot);
-	}
-}
-
-void Network::updateLoadProgress( Int percent )
-{
-	if (m_conMgr != NULL) {
-		m_conMgr->updateLoadProgress( percent );
-	}
-}
-
-void Network::loadProgressComplete( void )
-{
-	if (m_conMgr != NULL) {
-		m_conMgr->loadProgressComplete();
-	}
-}
-
-void Network::sendTimeOutGameStart( void )
-{
-	if (m_conMgr != NULL) {
-		m_conMgr->sendTimeOutGameStart();
-	}
-}
-
-
-UnsignedInt Network::getLocalPlayerID()
-{
-if (m_conMgr != NULL) {
-		return m_conMgr->getLocalPlayerID();
-	}
-	return 49;
-}
-UnicodeString Network::getPlayerName(Int playerNum)
-{
-	if (playerNum == m_conMgr->getLocalPlayerID()) {
-		if (m_localStatus != NETLOCALSTATUS_INGAME) {
-			return UnicodeString::TheEmptyString;
-		}
-	}
-	if (m_conMgr != NULL) {
-		return m_conMgr->getPlayerName( playerNum );
-	}
-	return UnicodeString::TheEmptyString;
-}
-Int Network::getNumPlayers()
-{
-	if (m_conMgr != NULL) {
-		return m_conMgr->getNumPlayers();
-	}
-	return -1;
-}
-
-Int Network::getSlotAverageFPS(Int slot) {
-	if (m_conMgr != NULL) {
-		return m_conMgr->getSlotAverageFPS(slot);
-	}
-	return -1;
-}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-void Network::toggleNetworkOn() {
-	if (m_networkOn == TRUE) {
-		m_networkOn = FALSE;
-	} else {
-		m_networkOn = TRUE;
-	}
-}
-#endif
-
-void Network::notifyOthersOfCurrentFrame() {
-	if (m_conMgr != NULL) {
-		m_conMgr->notifyOthersOfCurrentFrame(TheGameLogic->getFrame());
-	}
-}
-
-void Network::notifyOthersOfNewFrame(UnsignedInt frame) {
-	if (m_conMgr != NULL) {
-		m_conMgr->notifyOthersOfNewFrame(frame);
-	}
-}
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetworkUtil.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetworkUtil.cpp
deleted file mode 100644
index a856f349632..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetworkUtil.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/networkutil.h"
-
-Int MAX_FRAMES_AHEAD = 128;
-Int MIN_RUNAHEAD = 10;
-Int FRAME_DATA_LENGTH = (MAX_FRAMES_AHEAD+1)*2;
-Int FRAMES_TO_KEEP = (MAX_FRAMES_AHEAD/2) + 1;
-
-#ifdef DEBUG_LOGGING
-
-void dumpBufferToLog(const void *vBuf, Int len, const char *fname, Int line)
-{
-	DEBUG_LOG(("======= dumpBufferToLog() %d bytes =======\n", len));
-	DEBUG_LOG(("Source: %s:%d\n", fname, line));
-	const char *buf = (const char *)vBuf;
-	Int numLines = len / 8;
-	if ((len % 8) != 0)
-	{
-		++numLines;
-	}
-	for (Int dumpindex = 0; dumpindex < numLines; ++dumpindex)
-	{
-		Int offset = dumpindex*8;
-		DEBUG_LOG(("\t%5.5d\t", offset));
-		Int dumpindex2;
-		Int numBytesThisLine = min(8, len - offset);
-		for (dumpindex2 = 0; dumpindex2 < numBytesThisLine; ++dumpindex2)
-		{
-			Int c = (buf[offset + dumpindex2] & 0xff);
-			DEBUG_LOG(("%02X ", c));
-		}
-		for (; dumpindex2 < 8; ++dumpindex2)
-		{
-			DEBUG_LOG(("   "));
-		}
-		DEBUG_LOG((" | "));
-		for (dumpindex2 = 0; dumpindex2 < numBytesThisLine; ++dumpindex2)
-		{
-			char c = buf[offset + dumpindex2];
-			DEBUG_LOG(("%c", (isprint(c)?c:'.')));
-		}
-		DEBUG_LOG(("\n"));
-	}
-	DEBUG_LOG(("End of packet dump\n"));
-}
-
-#endif // DEBUG_LOGGING
-
-/**
- * ResolveIP turns a string ("games2.westwood.com", or "192.168.0.1") into
- * a 32-bit unsigned integer.
- */
-UnsignedInt ResolveIP(AsciiString host)
-{
-  struct hostent *hostStruct;
-  struct in_addr *hostNode;
-
-  if (host.getLength() == 0)
-  {
-	  DEBUG_LOG(("ResolveIP(): Can't resolve NULL\n"));
-	  return 0;
-  }
-
-  // String such as "127.0.0.1"
-  if (isdigit(host.getCharAt(0)))
-  {
-    return ( ntohl(inet_addr(host.str())) );
-  }
-
-  // String such as "localhost"
-  hostStruct = gethostbyname(host.str());
-  if (hostStruct == NULL)
-  {
-	  DEBUG_LOG(("ResolveIP(): Can't resolve %s\n", host.str()));
-	  return 0;
-  }
-  hostNode = (struct in_addr *) hostStruct->h_addr;
-  return ( ntohl(hostNode->s_addr) );
-}
-
-/**
- * Returns the next network command ID.
- */
-UnsignedShort GenerateNextCommandID() {
-	static UnsignedShort commandID = 64000;
-	++commandID;
-	return commandID;
-}
-
-/**
- * Returns true if this type of command requires a unique command ID.
- */
-Bool DoesCommandRequireACommandID(NetCommandType type) {
-	if ((type == NETCOMMANDTYPE_GAMECOMMAND) ||
-			(type == NETCOMMANDTYPE_FRAMEINFO) ||
-			(type == NETCOMMANDTYPE_PLAYERLEAVE) ||
-			(type == NETCOMMANDTYPE_DESTROYPLAYER) ||
-			(type == NETCOMMANDTYPE_RUNAHEADMETRICS) ||
-			(type == NETCOMMANDTYPE_RUNAHEAD) ||
-			(type == NETCOMMANDTYPE_CHAT) ||
-			(type == NETCOMMANDTYPE_DISCONNECTVOTE) ||
-			(type == NETCOMMANDTYPE_LOADCOMPLETE) ||
-			(type == NETCOMMANDTYPE_TIMEOUTSTART) ||
-			(type == NETCOMMANDTYPE_WRAPPER) ||
-			(type == NETCOMMANDTYPE_FILE) ||
-			(type == NETCOMMANDTYPE_FILEANNOUNCE) ||
-			(type == NETCOMMANDTYPE_FILEPROGRESS) ||
-			(type == NETCOMMANDTYPE_DISCONNECTPLAYER) ||
-			(type == NETCOMMANDTYPE_DISCONNECTFRAME) ||
-			(type == NETCOMMANDTYPE_DISCONNECTSCREENOFF) ||
-			(type == NETCOMMANDTYPE_FRAMERESENDREQUEST))
-	{
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if this type of network command requires an ack.
- */
-Bool CommandRequiresAck(NetCommandMsg *msg) {
-	if ((msg->getNetCommandType() == NETCOMMANDTYPE_GAMECOMMAND) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_PLAYERLEAVE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DESTROYPLAYER) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEADMETRICS) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEAD) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_CHAT) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTVOTE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_LOADCOMPLETE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_TIMEOUTSTART) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_WRAPPER) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FILE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FILEANNOUNCE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FILEPROGRESS) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTSCREENOFF) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FRAMERESENDREQUEST))
-	{
-		return TRUE;
-	}
-	return FALSE;
-}
-
-Bool IsCommandSynchronized(NetCommandType type) {
-	if ((type == NETCOMMANDTYPE_GAMECOMMAND) ||
-			(type == NETCOMMANDTYPE_FRAMEINFO) ||
-			(type == NETCOMMANDTYPE_PLAYERLEAVE) ||
-			(type == NETCOMMANDTYPE_DESTROYPLAYER) ||
-			(type == NETCOMMANDTYPE_RUNAHEAD))
-	{
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * Returns true if this type of network command requires the ack to be sent directly to the player
- * rather than going through the packet router.  This should really only be used by commands
- * used on the disconnect screen.
- */
-Bool CommandRequiresDirectSend(NetCommandMsg *msg) {
-	if ((msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTVOTE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_LOADCOMPLETE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_TIMEOUTSTART) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FILE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FILEANNOUNCE) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FILEPROGRESS) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTSCREENOFF) ||
-			(msg->getNetCommandType() == NETCOMMANDTYPE_FRAMERESENDREQUEST)) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-AsciiString GetAsciiNetCommandType(NetCommandType type) {
-	AsciiString s;
-	if (type == NETCOMMANDTYPE_FRAMEINFO) {
-		s.set("NETCOMMANDTYPE_FRAMEINFO");
-	} else if (type == NETCOMMANDTYPE_GAMECOMMAND) {
-		s.set("NETCOMMANDTYPE_GAMECOMMAND");
-	} else if (type == NETCOMMANDTYPE_PLAYERLEAVE) {
-		s.set("NETCOMMANDTYPE_PLAYERLEAVE");
-	} else if (type == NETCOMMANDTYPE_RUNAHEADMETRICS) {
-		s.set("NETCOMMANDTYPE_RUNAHEADMETRICS");
-	} else if (type == NETCOMMANDTYPE_RUNAHEAD) {
-		s.set("NETCOMMANDTYPE_RUNAHEAD");
-	} else if (type == NETCOMMANDTYPE_DESTROYPLAYER) {
-		s.set("NETCOMMANDTYPE_DESTROYPLAYER");
-	} else if (type == NETCOMMANDTYPE_ACKBOTH) {
-		s.set("NETCOMMANDTYPE_ACKBOTH");
-	} else if (type == NETCOMMANDTYPE_ACKSTAGE1) {
-		s.set("NETCOMMANDTYPE_ACKSTAGE1");
-	} else if (type == NETCOMMANDTYPE_ACKSTAGE2) {
-		s.set("NETCOMMANDTYPE_ACKSTAGE2");
-	} else if (type == NETCOMMANDTYPE_FRAMEINFO) {
-		s.set("NETCOMMANDTYPE_FRAMEINFO");
-	} else if (type == NETCOMMANDTYPE_KEEPALIVE) {
-		s.set("NETCOMMANDTYPE_KEEPALIVE");
-	} else if (type == NETCOMMANDTYPE_DISCONNECTCHAT) {
-		s.set("NETCOMMANDTYPE_DISCONNECTCHAT");
-	} else if (type == NETCOMMANDTYPE_CHAT) {
-		s.set("NETCOMMANDTYPE_CHAT");
-	} else if (type == NETCOMMANDTYPE_MANGLERQUERY) {
-		s.set("NETCOMMANDTYPE_MANGLERQUERY");
-	} else if (type == NETCOMMANDTYPE_MANGLERRESPONSE) {
-		s.set("NETCOMMANDTYPE_MANGLERRESPONSE");
-	} else if (type == NETCOMMANDTYPE_DISCONNECTKEEPALIVE) {
-		s.set("NETCOMMANDTYPE_DISCONNECTKEEPALIVE");
-	} else if (type == NETCOMMANDTYPE_DISCONNECTPLAYER) {
-		s.set("NETCOMMANDTYPE_DISCONNECTPLAYER");
-	} else if (type == NETCOMMANDTYPE_PACKETROUTERQUERY) {
-		s.set("NETCOMMANDTYPE_PACKETROUTERQUERY");
-	} else if (type == NETCOMMANDTYPE_PACKETROUTERACK) {
-		s.set("NETCOMMANDTYPE_PACKETROUTERACK");
-	} else if (type == NETCOMMANDTYPE_DISCONNECTVOTE) {
-		s.set("NETCOMMANDTYPE_DISCONNECTVOTE");
-	} else if (type == NETCOMMANDTYPE_PROGRESS) {
-		s.set("NETCOMMANDTYPE_PROGRESS");
-	} else if (type == NETCOMMANDTYPE_LOADCOMPLETE) {
-		s.set("NETCOMMANDTYPE_LOADCOMPLETE");
-	} else if (type == NETCOMMANDTYPE_TIMEOUTSTART) {
-		s.set("NETCOMMANDTYPE_TIMEOUTSTART");
-	} else if (type == NETCOMMANDTYPE_WRAPPER) {
-		s.set("NETCOMMANDTYPE_WRAPPER");
-	} else if (type == NETCOMMANDTYPE_FILE) {
-		s.set("NETCOMMANDTYPE_FILE");
-	} else if (type == NETCOMMANDTYPE_FILEANNOUNCE) {
-		s.set("NETCOMMANDTYPE_FILEANNOUNCE");
-	} else if (type == NETCOMMANDTYPE_FILEPROGRESS) {
-		s.set("NETCOMMANDTYPE_FILEPROGRESS");
-	} else if (type == NETCOMMANDTYPE_DISCONNECTFRAME) {
-		s.set("NETCOMMANDTYPE_DISCONNECTFRAME");
-	} else if (type == NETCOMMANDTYPE_DISCONNECTSCREENOFF) {
-		s.set("NETCOMMANDTYPE_DISCONNECTSCREENOFF");
-	} else if (type == NETCOMMANDTYPE_FRAMERESENDREQUEST) {
-		s.set("NETCOMMANDTYPE_FRAMERESENDREQUEST");
-	} else {
-		s.set("UNKNOWN");
-	}
-	return s;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Transport.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Transport.cpp
deleted file mode 100644
index abae529a305..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Transport.cpp
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "Common/crc.h"
-#include "GameNetwork/Transport.h"
-#include "GameNetwork/NetworkInterface.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//--------------------------------------------------------------------------
-// Packet-level encryption is an XOR operation, for speed reasons.  To get
-// the max throughput, we only XOR whole 4-byte words, so the last bytes
-// can be non-XOR'd.
-
-// This assumes the buf is a multiple of 4 bytes.  Extra is not encrypted.
-static inline void encryptBuf( unsigned char *buf, Int len )
-{
-	UnsignedInt mask = 0x0000Fade;
-
-	UnsignedInt *uintPtr = (UnsignedInt *) (buf);
-
-	for (int i=0 ; i<len/4 ; i++) {
-		*uintPtr = (*uintPtr) ^ mask;
-		*uintPtr = htonl(*uintPtr);
-		uintPtr++;
-		mask += 0x00000321; // just for fun
-	}
-}
-
-// This assumes the buf is a multiple of 4 bytes.  Extra is not encrypted.
-static inline void decryptBuf( unsigned char *buf, Int len )
-{
-	UnsignedInt mask = 0x0000Fade;
-
-	UnsignedInt *uintPtr = (UnsignedInt *) (buf);
-
-	for (int i=0 ; i<len/4 ; i++) {
-		*uintPtr = htonl(*uintPtr);
-		*uintPtr = (*uintPtr) ^ mask;
-		uintPtr++;
-		mask += 0x00000321; // just for fun
-	}
-}
-
-//--------------------------------------------------------------------------
-
-Transport::Transport(void)
-{
-	m_winsockInit = false;
-	m_udpsock = NULL;
-}
-
-Transport::~Transport(void)
-{
-	reset();
-}
-
-Bool Transport::init( AsciiString ip, UnsignedShort port )
-{
-	return init(ResolveIP(ip), port);
-}
-
-Bool Transport::init( UnsignedInt ip, UnsignedShort port )
-{
-	// ----- Initialize Winsock -----
-	if (!m_winsockInit)
-	{
-		WORD verReq = MAKEWORD(2, 2);
-		WSADATA wsadata;
-
-		int err = WSAStartup(verReq, &wsadata);
-		if (err != 0) {
-			return false;
-		}
-
-		if ((LOBYTE(wsadata.wVersion) != 2) || (HIBYTE(wsadata.wVersion) !=2)) {
-			WSACleanup();
-			return false;
-		}
-		m_winsockInit = true;
-	}
-
-	// ------- Bind our port --------
-	if (m_udpsock)
-		delete m_udpsock;
-	m_udpsock = NEW UDP();
-	
-	if (!m_udpsock)
-		return false;
-	
-	int retval = -1;
-	time_t now = timeGetTime();
-	while ((retval != 0) && ((timeGetTime() - now) < 1000)) {
-		retval = m_udpsock->Bind(ip, port);
-	}
-
-	if (retval != 0) {
-		DEBUG_CRASH(("Could not bind to 0x%8.8X:%d\n", ip, port));
-		DEBUG_LOG(("Transport::init - Failure to bind socket with error code %x\n", retval));
-		delete m_udpsock;
-		m_udpsock = NULL;
-		return false;
-	}
-
-	// ------- Clear buffers --------
-	int i=0;
-	for (; i<MAX_MESSAGES; ++i)
-	{
-		m_outBuffer[i].length = 0;
-		m_inBuffer[i].length = 0;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		m_delayedInBuffer[i].message.length = 0;
-#endif
-	}
-	for (i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		m_incomingBytes[i] = 0;
-		m_outgoingBytes[i] = 0;
-		m_unknownBytes[i] = 0;
-		m_incomingPackets[i] = 0;
-		m_outgoingPackets[i] = 0;
-		m_unknownPackets[i] = 0;
-	}
-	m_statisticsSlot = 0;
-	m_lastSecond = timeGetTime();
-
-	m_port = port;
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_latencyAverage > 0 || TheGlobalData->m_latencyNoise)
-		m_useLatency = true;
-
-	if (TheGlobalData->m_packetLoss)
-		m_usePacketLoss = true;
-#endif
-
-	return true;
-}
-
-void Transport::reset( void )
-{
-	if (m_udpsock)
-	{
-		delete m_udpsock;
-		m_udpsock = NULL;
-	}
-
-	if (m_winsockInit)
-	{
-		WSACleanup();
-		m_winsockInit = false;
-	}
-}
-
-Bool Transport::update( void )
-{
-	Bool retval = TRUE;
-	if (doRecv() == FALSE && m_udpsock && m_udpsock->GetStatus() == UDP::ADDRNOTAVAIL)
-	{
-		retval = FALSE;
-	}
-	DEBUG_ASSERTLOG(retval, ("WSA error is %s\n", GetWSAErrorString(WSAGetLastError()).str()));
-	if (doSend() == FALSE && m_udpsock && m_udpsock->GetStatus() == UDP::ADDRNOTAVAIL)
-	{
-		retval = FALSE;
-	}
-	DEBUG_ASSERTLOG(retval, ("WSA error is %s\n", GetWSAErrorString(WSAGetLastError()).str()));
-	return retval;
-}
-
-Bool Transport::doSend() {
-	if (!m_udpsock)
-	{
-		DEBUG_LOG(("Transport::doSend() - m_udpSock is NULL!\n"));
-		return FALSE;
-	}
-
-	Bool retval = TRUE;
-
-	// Statistics gathering
-	UnsignedInt now = timeGetTime();
-	if (m_lastSecond + 1000 < now)
-	{
-		m_lastSecond = now;
-		m_statisticsSlot = (m_statisticsSlot + 1) % MAX_TRANSPORT_STATISTICS_SECONDS;
-		m_outgoingPackets[m_statisticsSlot] = 0;
-		m_outgoingBytes[m_statisticsSlot] = 0;
-		m_incomingPackets[m_statisticsSlot] = 0;
-		m_incomingBytes[m_statisticsSlot] = 0;
-		m_unknownPackets[m_statisticsSlot] = 0;
-		m_unknownBytes[m_statisticsSlot] = 0;
-	}
-
-	// Send all messages
-	int i;
-	for (i=0; i<MAX_MESSAGES; ++i)
-	{
-		if (m_outBuffer[i].length != 0)
-		{
-			int bytesSent = 0;
-			int bytesToSend = m_outBuffer[i].length + sizeof(TransportMessageHeader);
-			// Send this message
-			if ((bytesSent = m_udpsock->Write((unsigned char *)(&m_outBuffer[i]), bytesToSend, m_outBuffer[i].addr, m_outBuffer[i].port)) > 0)
-			{
-				//DEBUG_LOG(("Sending %d bytes to %d.%d.%d.%d:%d\n", bytesToSend, PRINTF_IP_AS_4_INTS(m_outBuffer[i].addr), m_outBuffer[i].port));
-				m_outgoingPackets[m_statisticsSlot]++;
-				m_outgoingBytes[m_statisticsSlot] += m_outBuffer[i].length + sizeof(TransportMessageHeader);
-				m_outBuffer[i].length = 0;  // Remove from queue
-				if (bytesSent != bytesToSend)
-				{
-					DEBUG_LOG(("Transport::doSend - wanted to send %d bytes, only sent %d bytes to %d.%d.%d.%d:%d\n",
-						bytesToSend, bytesSent,
-						PRINTF_IP_AS_4_INTS(m_outBuffer[i].addr), m_outBuffer[i].port));
-				}
-			}
-			else
-			{
-				//DEBUG_LOG(("Could not write to socket!!!  Not discarding message!\n"));
-				retval = FALSE;
-				//DEBUG_LOG(("Transport::doSend returning FALSE\n"));
-			}
-		}
-	} // for (i=0; i<MAX_MESSAGES; ++i)
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	// Latency simulation - deliver anything we're holding on to that is ready
-	if (m_useLatency)
-	{
-		for (i=0; i<MAX_MESSAGES; ++i)
-		{
-			if (m_delayedInBuffer[i].message.length != 0 && m_delayedInBuffer[i].deliveryTime <= now)
-			{
-				for (int j=0; j<MAX_MESSAGES; ++j)
-				{
-					if (m_inBuffer[j].length == 0)
-					{
-						// Empty slot; use it
-						memcpy(&m_inBuffer[j], &m_delayedInBuffer[i].message, sizeof(TransportMessage));
-						m_delayedInBuffer[i].message.length = 0;
-						break;
-					}
-				}
-			}
-		}
-	}
-#endif
-	return retval;
-}
-
-Bool Transport::doRecv() 
-{
-	if (!m_udpsock)
-	{
-		DEBUG_LOG(("Transport::doRecv() - m_udpSock is NULL!\n"));
-		return FALSE;
-	}
-
-	Bool retval = TRUE;
-
-	// Read in anything on our socket
-	sockaddr_in from;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	UnsignedInt now = timeGetTime();
-#endif
-
-	TransportMessage incomingMessage;
-	unsigned char *buf = (unsigned char *)&incomingMessage;
-	int len = MAX_MESSAGE_LEN;
-//	DEBUG_LOG(("Transport::doRecv - checking\n"));
-	while ( (len=m_udpsock->Read(buf, MAX_MESSAGE_LEN, &from)) > 0 )
-	{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		// Packet loss simulation
-		if (m_usePacketLoss)
-		{
-			if ( TheGlobalData->m_packetLoss >= GameClientRandomValue(0, 100) )
-			{
-				continue;
-			}
-		}
-#endif
-
-//		DEBUG_LOG(("Transport::doRecv - Got something! len = %d\n", len));
-		// Decrypt the packet
-//		DEBUG_LOG(("buffer = "));
-//		for (Int munkee = 0; munkee < len; ++munkee) {
-//			DEBUG_LOG(("%02x", *(buf + munkee)));
-//		}
-//		DEBUG_LOG(("\n"));
-		decryptBuf(buf, len);
-
-		incomingMessage.length = len - sizeof(TransportMessageHeader);
-
-		if (len <= sizeof(TransportMessageHeader) || !isGeneralsPacket( &incomingMessage ))
-		{
-			DEBUG_LOG(("Transport::doRecv - unknownPacket! len = %d\n", len));
-			m_unknownPackets[m_statisticsSlot]++;
-			m_unknownBytes[m_statisticsSlot] += len;
-			continue;
-		}
-
-		// Something there; stick it somewhere
-//		DEBUG_LOG(("Saw %d bytes from %d:%d\n", len, ntohl(from.sin_addr.S_un.S_addr), ntohs(from.sin_port)));
-		m_incomingPackets[m_statisticsSlot]++;
-		m_incomingBytes[m_statisticsSlot] += len;
-
-		for (int i=0; i<MAX_MESSAGES; ++i)
-		{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-			// Latency simulation
-			if (m_useLatency)
-			{
-				if (m_delayedInBuffer[i].message.length == 0)
-				{
-					// Empty slot; use it
-					m_delayedInBuffer[i].deliveryTime =
-						now + TheGlobalData->m_latencyAverage +
-						(Int)(TheGlobalData->m_latencyAmplitude * sin(now * TheGlobalData->m_latencyPeriod)) +
-						GameClientRandomValue(-TheGlobalData->m_latencyNoise, TheGlobalData->m_latencyNoise);
-					m_delayedInBuffer[i].message.length = incomingMessage.length;
-					m_delayedInBuffer[i].message.addr = ntohl(from.sin_addr.S_un.S_addr);
-					m_delayedInBuffer[i].message.port = ntohs(from.sin_port);
-					memcpy(&m_delayedInBuffer[i].message, buf, len);
-					break;
-				}
-			}
-			else
-			{
-#endif
-				if (m_inBuffer[i].length == 0)
-				{
-					// Empty slot; use it
-					m_inBuffer[i].length = incomingMessage.length;
-					m_inBuffer[i].addr = ntohl(from.sin_addr.S_un.S_addr);
-					m_inBuffer[i].port = ntohs(from.sin_port);
-					memcpy(&m_inBuffer[i], buf, len);
-					break;
-				}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-			}
-#endif
-		}
-		//DEBUG_ASSERTCRASH(i<MAX_MESSAGES, ("Message lost!"));
-	}
-
-	if (len == -1) {
-		// there was a socket error trying to perform a read.
-		//DEBUG_LOG(("Transport::doRecv returning FALSE\n"));
-		retval = FALSE;
-	}
-
-	return retval;
-}
-
-Bool Transport::queueSend(UnsignedInt addr, UnsignedShort port, const UnsignedByte *buf, Int len /*,
-						  NetMessageFlags flags, Int id */)
-{
-	int i;
-
-	if (len < 1 || len > MAX_PACKET_SIZE)
-	{
-		DEBUG_LOG(("Transport::queueSend - Invalid Packet size\n"));
-		return false;
-	}
-
-	for (i=0; i<MAX_MESSAGES; ++i)
-	{
-		if (m_outBuffer[i].length == 0)
-		{
-			// Insert data here
-			m_outBuffer[i].length = len;
-			memcpy(m_outBuffer[i].data, buf, len);
-			m_outBuffer[i].addr = addr;
-			m_outBuffer[i].port = port;
-//			m_outBuffer[i].header.flags = flags;
-//			m_outBuffer[i].header.id = id;
-			m_outBuffer[i].header.magic = GENERALS_MAGIC_NUMBER;
-
-			CRC crc;
-			crc.computeCRC( (unsigned char *)(&(m_outBuffer[i].header.magic)), m_outBuffer[i].length + sizeof(TransportMessageHeader) - sizeof(UnsignedInt) );
-//			DEBUG_LOG(("About to assign the CRC for the packet\n"));
-			m_outBuffer[i].header.crc = crc.get();
-
-			// Encrypt packet
-//			DEBUG_LOG(("buffer: "));
-			encryptBuf((unsigned char *)&m_outBuffer[i], len + sizeof(TransportMessageHeader));
-//			DEBUG_LOG(("\n"));
-
-			return true;
-		}
-	}
-	DEBUG_LOG(("Send Queue is getting full, dropping packets\n"));
-	return false;
-}
-
-Bool Transport::isGeneralsPacket( TransportMessage *msg )
-{
-	if (!msg)
-		return false;
-
-	if (msg->length < 0 || msg->length > MAX_MESSAGE_LEN)
-		return false;
-
-	CRC crc;
-//	crc.computeCRC( (unsigned char *)msg->data, msg->length );
-	crc.computeCRC( (unsigned char *)(&(msg->header.magic)), msg->length + sizeof(TransportMessageHeader) - sizeof(UnsignedInt) );
-
-	if (crc.get() != msg->header.crc)
-		return false;
-
-	if (msg->header.magic != GENERALS_MAGIC_NUMBER)
-		return false;
-
-	return true;
-}
-
-// Statistics ---------------------------------------------------
-Real Transport::getIncomingBytesPerSecond( void )
-{
-	Real val = 0.0;
-	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		if (i != m_statisticsSlot)
-			val += m_incomingBytes[i];
-	}
-	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
-}
-
-Real Transport::getIncomingPacketsPerSecond( void )
-{
-	Real val = 0.0;
-	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		if (i != m_statisticsSlot)
-			val += m_incomingPackets[i];
-	}
-	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
-}
-
-Real Transport::getOutgoingBytesPerSecond( void )
-{
-	Real val = 0.0;
-	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		if (i != m_statisticsSlot)
-			val += m_outgoingBytes[i];
-	}
-	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
-}
-
-Real Transport::getOutgoingPacketsPerSecond( void )
-{
-	Real val = 0.0;
-	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		if (i != m_statisticsSlot)
-			val += m_outgoingPackets[i];
-	}
-	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
-}
-
-Real Transport::getUnknownBytesPerSecond( void )
-{
-	Real val = 0.0;
-	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		if (i != m_statisticsSlot)
-			val += m_unknownBytes[i];
-	}
-	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
-}
-
-Real Transport::getUnknownPacketsPerSecond( void )
-{
-	Real val = 0.0;
-	for (int i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
-	{
-		if (i != m_statisticsSlot)
-			val += m_unknownPackets[i];
-	}
-	return val / (MAX_TRANSPORT_STATISTICS_SECONDS-1);
-}
-
-
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/User.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/User.cpp
deleted file mode 100644
index 3f7bf33e72d..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/User.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-// User class copy and comparisons
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-#include "GameNetwork/User.h"
-
-/**
- * Constructor.  Sets up the member variables with the appropriate values.
- */
-User::User(UnicodeString name, UnsignedInt addr, UnsignedInt port) {
-	m_name.set(name);
-	m_ipaddr = addr;
-	m_port = port;
-}
-
-/**
- * The assignment operator.
- */
-User & User::operator= (const User *other)
-{
-	m_name = other->m_name;
-	m_ipaddr = other->m_ipaddr;
-	m_port = other->m_port;
-
-	return *this;
-}
-
-/**
- * The equality operator.
- */
-Bool User::operator== (const User *other)
-{
-	return (m_name.compare(other->m_name) == 0);
-}
-
-/**
- * The inequality operator.
- */
-Bool User::operator!= (const User *other)
-{
-	return (m_name.compare(other->m_name) != 0);
-}
-
-/**
- * Set the name of this user.
- */
-void User::setName(UnicodeString name) {
-	m_name.set(name);
-}
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp
deleted file mode 100644
index b3628660217..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/******************************************************************************
-*
-* NAME
-*     $Archive:  $
-*
-* DESCRIPTION
-*
-* PROGRAMMER
-*     Bryan Cleveland
-*     $Author:  $
-*
-* VERSION INFO
-*     $Revision:  $
-*     $Modtime:  $
-*
-******************************************************************************/
-
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-//#include "WinMain.h"
-#include "GameNetwork/WOLBrowser/WebBrowser.h"
-#include "GameClient/GameWindow.h"
-#include "GameClient/Display.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-/**
-	* OLEInitializer class - Init and shutdown OLE & COM as a global
-	* object.  Scary, nasty stuff, COM.  /me shivers.
-	*/
-class OLEInitializer
-{
-public:
-	OLEInitializer()
-	{
-		// Initialize this instance
-		OleInitialize(NULL);
-	 }
-	~OLEInitializer()
-	{
-		OleUninitialize(); 
-	}
-};
-OLEInitializer g_OLEInitializer;
-CComModule _Module;
-
-CComObject<WebBrowser> * TheWebBrowser = NULL;
-
-
-/******************************************************************************
-*
-* NAME
-*     WebBrowser::WebBrowser
-*
-* DESCRIPTION
-*     Default constructor
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-******************************************************************************/
-
-WebBrowser::WebBrowser() :
-		mRefCount(1)
-{
-	DEBUG_LOG(("Instantiating embedded WebBrowser\n"));
-	m_urlList = NULL;
-}
-
-
-/******************************************************************************
-*
-* NAME
-*     WebBrowser::~WebBrowser
-*
-* DESCRIPTION
-*     Destructor
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-******************************************************************************/
-
-WebBrowser::~WebBrowser()
-{
-	DEBUG_LOG(("Destructing embedded WebBrowser\n"));
-	if (this == TheWebBrowser) {
-		DEBUG_LOG(("WebBrowser::~WebBrowser - setting TheWebBrowser to NULL\n"));
-		TheWebBrowser = NULL;
-	}
-	WebBrowserURL *url = m_urlList;
-	while (url != NULL) {
-		WebBrowserURL *temp = url;
-		url = url->m_next;
-		deleteInstance(temp);
-		temp = NULL;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-/** The INI data fields for Webpage URL's */
-//-------------------------------------------------------------------------------------------------
-const FieldParse WebBrowserURL::m_URLFieldParseTable[] = 
-{
-
-	{ "URL",										INI::parseAsciiString,							NULL, offsetof( WebBrowserURL, m_url ) },
-	{ NULL,											NULL,																NULL, 0 },
-
-};
-
-WebBrowserURL::WebBrowserURL() 
-{
-	m_next = NULL;
-	m_tag.clear();
-	m_url.clear();
-}
-
-WebBrowserURL::~WebBrowserURL() 
-{
-}
-/******************************************************************************
-*
-* NAME
-*     WebBrowser::init
-*
-* DESCRIPTION
-*     Perform post creation initialization.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-******************************************************************************/
-
-void WebBrowser::init() 
-{
-	m_urlList = NULL;
-	INI ini;
-	ini.load( AsciiString( "Data\\INI\\Webpages.ini" ), INI_LOAD_OVERWRITE, NULL );
-}
-
-/******************************************************************************
-*
-* NAME
-*     WebBrowser::reset
-*
-* DESCRIPTION
-*     Perform post creation initialization.
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*     NONE
-*
-******************************************************************************/
-
-void WebBrowser::reset() 
-{
-}
-
-void WebBrowser::update( void ) 
-{
-}
-
-WebBrowserURL * WebBrowser::findURL(AsciiString tag) 
-{
-	WebBrowserURL *retval = m_urlList;
-
-	while ((retval != NULL) && tag.compareNoCase(retval->m_tag.str())) 
-	{
-		retval = retval->m_next;
-	}
-
-	return retval;
-}
-
-WebBrowserURL * WebBrowser::makeNewURL(AsciiString tag) 
-{
-	WebBrowserURL *newURL = newInstance(WebBrowserURL);
-
-	newURL->m_tag = tag;
-
-	newURL->m_next = m_urlList;
-	m_urlList = newURL;
-
-	return newURL;
-}
-
-/******************************************************************************
-*
-* NAME
-*     IUnknown::QueryInterface
-*
-* DESCRIPTION
-*
-* INPUTS
-*     IID - Interface ID
-*
-* RESULT
-*
-******************************************************************************/
-
-STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) IUNKNOWN_NOEXCEPT
-{
-	*ppv = NULL;
-
-	if ((iid == IID_IUnknown) || (iid == IID_IBrowserDispatch))
-	{
-		*ppv = static_cast<IBrowserDispatch*>(this);
-	}
-	else
-	{
-		return E_NOINTERFACE;
-	}
-
-	static_cast<IUnknown*>(*ppv)->AddRef();
-
-	return S_OK;
-}
-
-
-/******************************************************************************
-*
-* NAME
-*     IUnknown::AddRef
-*
-* DESCRIPTION
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*
-******************************************************************************/
-
-ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) IUNKNOWN_NOEXCEPT
-{
-	return ++mRefCount;
-}
-
-
-/******************************************************************************
-*
-* NAME
-*     IUnknown::Release
-*
-* DESCRIPTION
-*
-* INPUTS
-*     NONE
-*
-* RESULT
-*
-******************************************************************************/
-
-ULONG STDMETHODCALLTYPE WebBrowser::Release(void) IUNKNOWN_NOEXCEPT
-{
-	DEBUG_ASSERTCRASH(mRefCount > 0, ("Negative reference count"));
-	--mRefCount;
-
-	if (mRefCount == 0)
-	{
-		DEBUG_LOG(("WebBrowser::Release - all references released, deleting the object.\n"));
-		if (this == TheWebBrowser) {
-			TheWebBrowser = NULL;
-		}
-		delete this;
-		return 0;
-	}
-
-	return mRefCount;
-}
-
-STDMETHODIMP WebBrowser::TestMethod(Int num1) 
-{
-	DEBUG_LOG(("WebBrowser::TestMethod - num1 = %d\n", num1));
-	return S_OK;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/udp.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/udp.cpp
deleted file mode 100644
index 8d94383ac3f..00000000000
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/udp.cpp
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Udp.cpp //////////////////////////////////////////////////////////////
-// Implementation of UDP socket wrapper class (taken from wnet lib)
-// Author: Matthew D. Campbell, July 2001
-///////////////////////////////////////////////////////////////////////////////
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "Common/GameEngine.h"
-//#include "GameNetwork/NetworkInterface.h"
-#include "GameNetwork/udp.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-//-------------------------------------------------------------------------
-
-#ifdef DEBUG_LOGGING
-
-#define CASE(x) case (x): return #x;
-
-AsciiString GetWSAErrorString( Int error )
-{
-	switch (error)
-	{
-		CASE(WSABASEERR)
-		CASE(WSAEINTR)
-		CASE(WSAEBADF)
-		CASE(WSAEACCES)
-		CASE(WSAEFAULT)
-		CASE(WSAEINVAL)
-		CASE(WSAEMFILE)
-		CASE(WSAEWOULDBLOCK)
-		CASE(WSAEINPROGRESS)
-		CASE(WSAEALREADY)
-		CASE(WSAENOTSOCK)
-		CASE(WSAEDESTADDRREQ)
-		CASE(WSAEMSGSIZE)
-		CASE(WSAEPROTOTYPE)
-		CASE(WSAENOPROTOOPT)
-		CASE(WSAEPROTONOSUPPORT)
-		CASE(WSAESOCKTNOSUPPORT)
-		CASE(WSAEOPNOTSUPP)
-		CASE(WSAEPFNOSUPPORT)
-		CASE(WSAEAFNOSUPPORT)
-		CASE(WSAEADDRINUSE)
-		CASE(WSAEADDRNOTAVAIL)
-		CASE(WSAENETDOWN)
-		CASE(WSAENETUNREACH)
-		CASE(WSAENETRESET)
-		CASE(WSAECONNABORTED)
-		CASE(WSAECONNRESET)
-		CASE(WSAENOBUFS)
-		CASE(WSAEISCONN)
-		CASE(WSAENOTCONN)
-		CASE(WSAESHUTDOWN)
-		CASE(WSAETOOMANYREFS)
-		CASE(WSAETIMEDOUT)
-		CASE(WSAECONNREFUSED)
-		CASE(WSAELOOP)
-		CASE(WSAENAMETOOLONG)
-		CASE(WSAEHOSTDOWN)
-		CASE(WSAEHOSTUNREACH)
-		CASE(WSAENOTEMPTY)
-		CASE(WSAEPROCLIM)
-		CASE(WSAEUSERS)
-		CASE(WSAEDQUOT)
-		CASE(WSAESTALE)
-		CASE(WSAEREMOTE)
-		CASE(WSAEDISCON)
-		CASE(WSASYSNOTREADY)
-		CASE(WSAVERNOTSUPPORTED)
-		CASE(WSANOTINITIALISED)
-		CASE(WSAHOST_NOT_FOUND)
-		CASE(WSATRY_AGAIN)
-		CASE(WSANO_RECOVERY)
-		CASE(WSANO_DATA)
-		default:
-		{
-			AsciiString ret;
-			ret.format("Not a Winsock error (%d)", error);
-			return ret;
-		}
-	}
-	return AsciiString::TheEmptyString; // will not be hit, ever.
-}
-
-#undef CASE
-
-#endif // defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-
-//-------------------------------------------------------------------------
-
-UDP::UDP()
-{
-  fd=0;
-}
-
-UDP::~UDP()
-{
-	if (fd)
-		closesocket(fd);
-}
-
-Int UDP::Bind(const char *Host,UnsignedShort port)
-{
-  char hostName[100];
-  struct hostent *hostStruct;
-  struct in_addr *hostNode;
-
-  if (isdigit(Host[0]))
-    return ( Bind( ntohl(inet_addr(Host)), port) );
-
-  strcpy(hostName, Host);
-
-  hostStruct = gethostbyname(Host);
-  if (hostStruct == NULL)
-    return (0);
-  hostNode = (struct in_addr *) hostStruct->h_addr;
-  return ( Bind(ntohl(hostNode->s_addr),port) );
-}
-
-// You must call bind, implicit binding is for sissies
-//   Well... you can get implicit binding if you pass 0 for either arg
-Int UDP::Bind(UnsignedInt IP,UnsignedShort Port)
-{
-  int retval;
-  int status;
-
-  IP=htonl(IP);
-  Port=htons(Port);
-
-  addr.sin_family=AF_INET;
-  addr.sin_port=Port;
-  addr.sin_addr.s_addr=IP;
-  fd=socket(AF_INET,SOCK_DGRAM,DEFAULT_PROTOCOL);
-  #ifdef _WINDOWS
-  if (fd==SOCKET_ERROR)
-    fd=-1;
-  #endif
-  if (fd==-1)
-    return(UNKNOWN);
-
-  retval=bind(fd,(struct sockaddr *)&addr,sizeof(addr));
-
-  #ifdef _WINDOWS
-  if (retval==SOCKET_ERROR)
-	{
-    retval=-1;
-		m_lastError = WSAGetLastError();
-	}
-  #endif
-  if (retval==-1)
-  {
-    status=GetStatus();
-    //CERR("Bind failure (" << status << ") IP " << IP << " PORT " << Port )
-    return(status);
-  }
-
-  int namelen=sizeof(addr);
-  getsockname(fd, (struct sockaddr *)&addr, &namelen); 
-
-  myIP=ntohl(addr.sin_addr.s_addr);
-  myPort=ntohs(addr.sin_port);
-
-  retval=SetBlocking(FALSE);
-  if (retval==-1)
-    fprintf(stderr,"Couldn't set nonblocking mode!\n");
-
-  return(OK);
-}
-
-Int UDP::getLocalAddr(UnsignedInt &ip, UnsignedShort &port)
-{
-  ip=myIP;
-  port=myPort;
-  return(OK);
-}
-
-
-// private function
-Int UDP::SetBlocking(Int block)
-{
-  #ifdef _WINDOWS
-   unsigned long flag=1;
-   if (block)
-     flag=0;
-   int retval;
-   retval=ioctlsocket(fd,FIONBIO,&flag);
-   if (retval==SOCKET_ERROR)
-     return(UNKNOWN);
-   else
-     return(OK);
-  #else  // UNIX
-   int flags = fcntl(fd, F_GETFL, 0);
-   if (block==FALSE)          // set nonblocking
-     flags |= O_NONBLOCK;
-   else                       // set blocking
-     flags &= ~(O_NONBLOCK);
-
-   if (fcntl(fd, F_SETFL, flags) < 0)
-   {
-     return(UNKNOWN);
-   }
-   return(OK);
-  #endif
-}
-
-
-Int UDP::Write(const unsigned char *msg,UnsignedInt len,UnsignedInt IP,UnsignedShort port)
-{
-  Int retval;
-  struct sockaddr_in to;
-
-  // This happens frequently
-  if ((IP==0)||(port==0)) return(ADDRNOTAVAIL);
-
-#ifdef _UNIX
-  errno=0;
-#endif
-  to.sin_port=htons(port);
-  to.sin_addr.s_addr=htonl(IP);
-  to.sin_family=AF_INET;
-
-  ClearStatus();
-  retval=sendto(fd,(const char *)msg,len,0,(struct sockaddr *)&to,sizeof(to));
-  #ifdef _WINDOWS
-  if (retval==SOCKET_ERROR)
-	{
-    retval=-1;
-		m_lastError = WSAGetLastError();
-#ifdef DEBUG_LOGGING
-		static Int errCount = 0;
-#endif
-		DEBUG_ASSERTLOG(errCount++ > 100, ("UDP::Write() - WSA error is %s\n", GetWSAErrorString(WSAGetLastError()).str()));
-	}
-  #endif
-  
-  return(retval);
-}
-
-Int UDP::Read(unsigned char *msg,UnsignedInt len,sockaddr_in *from)
-{
-  Int retval;
-  int    alen=sizeof(sockaddr_in);
-
-  if (from!=NULL)
-  {
-    retval=recvfrom(fd,(char *)msg,len,0,(struct sockaddr *)from,&alen);
-    #ifdef _WINDOWS
-    if (retval == SOCKET_ERROR)
-		{
-			if (WSAGetLastError() != WSAEWOULDBLOCK)
-			{
-				// failing because of a blocking error isn't really such a bad thing.
-				m_lastError = WSAGetLastError();
-#ifdef DEBUG_LOGGING
-				static Int errCount = 0;
-#endif
-				DEBUG_ASSERTLOG(errCount++ > 100, ("UDP::Read() - WSA error is %s\n", GetWSAErrorString(WSAGetLastError()).str()));
-				retval = -1;
-			} else {
-				retval = 0;
-			}
-		}
-    #endif
-  }
-  else
-  {
-    retval=recvfrom(fd,(char *)msg,len,0,NULL,NULL);
-    #ifdef _WINDOWS
-    if (retval==SOCKET_ERROR)
-		{
-			if (WSAGetLastError() != WSAEWOULDBLOCK)
-			{
-				// failing because of a blocking error isn't really such a bad thing.
-				m_lastError = WSAGetLastError();
-#ifdef DEBUG_LOGGING
-				static Int errCount = 0;
-#endif
-				DEBUG_ASSERTLOG(errCount++ > 100, ("UDP::Read() - WSA error is %s\n", GetWSAErrorString(WSAGetLastError()).str()));
-				retval = -1;
-			} else {
-				retval = 0;
-			}
-		}
-    #endif
-  }
-  return(retval);
-}
-
-
-void UDP::ClearStatus(void)
-{
-  #ifndef _WINDOWS
-  errno=0;
-  #endif
-
-	m_lastError = 0;
-}
-
-UDP::sockStat UDP::GetStatus(void)
-{
-	Int status = m_lastError;
- #ifdef _WINDOWS
-  //int status=WSAGetLastError();
-  if (status==0) return(OK);
-  else if (status==WSAEINTR) return(INTR);
-  else if (status==WSAEINPROGRESS) return(INPROGRESS);
-  else if (status==WSAECONNREFUSED) return(CONNREFUSED);
-  else if (status==WSAEINVAL) return(INVAL);
-  else if (status==WSAEISCONN) return(ISCONN);
-  else if (status==WSAENOTSOCK) return(NOTSOCK);
-  else if (status==WSAETIMEDOUT) return(TIMEDOUT);
-  else if (status==WSAEALREADY) return(ALREADY);
-  else if (status==WSAEWOULDBLOCK) return(WOULDBLOCK);
-  else if (status==WSAEBADF) return(BADF);
-  else     return((UDP::sockStat)status);
- #else
-  //int status=errno;
-  if (status==0) return(OK);
-  else if (status==EINTR) return(INTR);
-  else if (status==EINPROGRESS) return(INPROGRESS);
-  else if (status==ECONNREFUSED) return(CONNREFUSED);
-  else if (status==EINVAL) return(INVAL);
-  else if (status==EISCONN) return(ISCONN);
-  else if (status==ENOTSOCK) return(NOTSOCK);
-  else if (status==ETIMEDOUT) return(TIMEDOUT);
-  else if (status==EALREADY) return(ALREADY);
-  else if (status==EAGAIN) return(AGAIN);
-  else if (status==EWOULDBLOCK) return(WOULDBLOCK);
-  else if (status==EBADF) return(BADF);
-  else     return(UNKNOWN);
- #endif
-}
-
-
-
-/*
-//
-// Wait for net activity on this socket
-//
-int UDP::Wait(Int sec,Int usec,fd_set &returnSet)
-{
-  fd_set inputSet;
- 
-  FD_ZERO(&inputSet);
-  FD_SET(fd,&inputSet);
- 
-  return(Wait(sec,usec,inputSet,returnSet));
-}
-*/
-
-/*
-//
-// Wait for net activity on a list of sockets
-//
-int UDP::Wait(Int sec,Int usec,fd_set &givenSet,fd_set &returnSet)
-{
-  Wtime        timeout,timenow,timethen;
-  fd_set       backupSet;
-  int          retval=0,done,givenMax;
-  Bool         noTimeout=FALSE;
-  timeval      tv;
- 
-  returnSet=givenSet;
-  backupSet=returnSet;
- 
-  if ((sec==-1)&&(usec==-1))
-    noTimeout=TRUE;
- 
-  timeout.SetSec(sec);
-  timeout.SetUsec(usec);
-  timethen+=timeout;
- 
-  givenMax=fd;
-  for (UnsignedInt i=0; i<(sizeof(fd_set)*8); i++)   // i=maxFD+1
-  {
-    if (FD_ISSET(i,&givenSet))
-      givenMax=i;
-  }
-  ///DBGMSG("WAIT  fd="<<fd<<"  givenMax="<<givenMax);
- 
-  done=0;
-  while( ! done)
-  {
-    if (noTimeout)
-      retval=select(givenMax+1,&returnSet,0,0,NULL);
-    else
-    {
-      timeout.GetTimevalMT(tv);
-      retval=select(givenMax+1,&returnSet,0,0,&tv);
-    }
- 
-    if (retval>=0)
-      done=1;
-
-    else if ((retval==-1)&&(errno==EINTR))  // in case of signal
-    {
-      if (noTimeout==FALSE)
-      {
-        timenow.Update();
-        timeout=timethen-timenow;
-      }
-      if ((noTimeout==FALSE)&&(timenow.GetSec()==0)&&(timenow.GetUsec()==0))
-        done=1;
-      else
-        returnSet=backupSet;
-    }
-    else  // maybe out of memory?
-    {
-      done=1;
-    }
-  }
-  ///DBGMSG("Wait retval: "<<retval);
-  return(retval);
-}
-*/
-
-
-
-
-// Set the kernel buffer sizes for incoming, and outgoing packets
-//
-// Linux seems to have a buffer max of 32767 bytes for this,
-//  (which is the default). If you try and set the size to
-//  greater than the default it just sets it to 32767.
-
-Int UDP::SetInputBuffer(UnsignedInt bytes)
-{
-   int retval,arg=bytes;
-
-   retval=setsockopt(fd,SOL_SOCKET,SO_RCVBUF,
-     (char *)&arg,sizeof(int));
-   if (retval==0)
-     return(TRUE);
-   else
-     return(FALSE);
-}
-
-// Same note goes for the output buffer
-
-Int UDP::SetOutputBuffer(UnsignedInt bytes)
-{
-   int retval,arg=bytes;
-
-   retval=setsockopt(fd,SOL_SOCKET,SO_SNDBUF,
-     (char *)&arg,sizeof(int));
-   if (retval==0)
-     return(TRUE);
-   else
-     return(FALSE);
-}
-
-// Get the system buffer sizes 
-
-int UDP::GetInputBuffer(void)
-{
-   int retval,arg=0,len=sizeof(int);
-
-   retval=getsockopt(fd,SOL_SOCKET,SO_RCVBUF,
-     (char *)&arg,&len);
-   return(arg);
-}
-
-
-int UDP::GetOutputBuffer(void)
-{
-   int retval,arg=0,len=sizeof(int);
-
-   retval=getsockopt(fd,SOL_SOCKET,SO_SNDBUF,
-     (char *)&arg,&len);
-   return(arg);
-}
-
-Int UDP::AllowBroadcasts(Bool status)
-{
-	int retval;
-	BOOL val = status;
-	retval = setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char *)&val, sizeof(BOOL));
-	if (retval == 0)
-		return TRUE;
-	else
-		return FALSE;
-}
diff --git a/GeneralsMD/Code/GameEngine/Source/Precompiled/PreRTS.cpp b/GeneralsMD/Code/GameEngine/Source/Precompiled/PreRTS.cpp
index c2d3dcb2c1a..6678b42cfd4 100644
--- a/GeneralsMD/Code/GameEngine/Source/Precompiled/PreRTS.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Precompiled/PreRTS.cpp
@@ -25,4 +25,4 @@
 // PreRTS.cpp /////////////////////////////////////////////////////////////////////////////////////
 // Generates PreRTS.obj, which contains all precompiled header info.
 
-#include "PreRTS.h"
\ No newline at end of file
+#include "PreRTS.h"
diff --git a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
index c6049744710..7b66d902b10 100644
--- a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
+++ b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
@@ -1,36 +1,36 @@
 set(GAMEENGINEDEVICE_SRC
-    Include/MilesAudioDevice/MilesAudioManager.h
-    Include/VideoDevice/Bink/BinkVideoPlayer.h
+#    Include/MilesAudioDevice/MilesAudioManager.h
+#    Include/VideoDevice/Bink/BinkVideoPlayer.h
     Include/W3DDevice/Common/W3DConvert.h
     Include/W3DDevice/Common/W3DFunctionLexicon.h
     Include/W3DDevice/Common/W3DModuleFactory.h
-    Include/W3DDevice/Common/W3DRadar.h
+#    Include/W3DDevice/Common/W3DRadar.h
     Include/W3DDevice/Common/W3DThingFactory.h
-    Include/W3DDevice/GameClient/BaseHeightMap.h
-    Include/W3DDevice/GameClient/camerashakesystem.h
-    Include/W3DDevice/GameClient/FlatHeightMap.h
-    Include/W3DDevice/GameClient/HeightMap.h
+#    Include/W3DDevice/GameClient/BaseHeightMap.h
+#    Include/W3DDevice/GameClient/camerashakesystem.h
+#    Include/W3DDevice/GameClient/FlatHeightMap.h
+#    Include/W3DDevice/GameClient/HeightMap.h
     Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
     Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
     Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
-    Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
     Include/W3DDevice/GameClient/Module/W3DModelDraw.h
     Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h
     Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h
     Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h
     Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h
     Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h
-    Include/W3DDevice/GameClient/Module/W3DPropDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DPropDraw.h
     Include/W3DDevice/GameClient/Module/W3DRopeDraw.h
     Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
     Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h
     Include/W3DDevice/GameClient/Module/W3DTankDraw.h
     Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h
     Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
-    Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
+#    Include/W3DDevice/GameClient/Module/W3DTreeDraw.h
     Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
-    Include/W3DDevice/GameClient/TerrainTex.h
-    Include/W3DDevice/GameClient/TileData.h
+#    Include/W3DDevice/GameClient/TerrainTex.h
+#    Include/W3DDevice/GameClient/TileData.h
     Include/W3DDevice/GameClient/W3DAssetManager.h
     Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
     Include/W3DDevice/GameClient/W3DBibBuffer.h
@@ -57,68 +57,68 @@ set(GAMEENGINEDEVICE_SRC
     Include/W3DDevice/GameClient/W3DParticleSys.h
     Include/W3DDevice/GameClient/W3DPoly.h
     Include/W3DDevice/GameClient/W3DProjectedShadow.h
-    Include/W3DDevice/GameClient/W3DPropBuffer.h
+#    Include/W3DDevice/GameClient/W3DPropBuffer.h
     Include/W3DDevice/GameClient/W3DRoadBuffer.h
     Include/W3DDevice/GameClient/W3DScene.h
-    Include/W3DDevice/GameClient/W3DShaderManager.h
+#    Include/W3DDevice/GameClient/W3DShaderManager.h
     Include/W3DDevice/GameClient/W3DShadow.h
     Include/W3DDevice/GameClient/W3DShroud.h
-    Include/W3DDevice/GameClient/W3DSmudge.h
-    Include/W3DDevice/GameClient/W3DSnow.h
+#    Include/W3DDevice/GameClient/W3DSmudge.h
+#    Include/W3DDevice/GameClient/W3DSnow.h
     Include/W3DDevice/GameClient/W3DStatusCircle.h
-    Include/W3DDevice/GameClient/W3DTerrainBackground.h
-    Include/W3DDevice/GameClient/W3DTerrainTracks.h
-    Include/W3DDevice/GameClient/W3DTerrainVisual.h
-    Include/W3DDevice/GameClient/W3DTreeBuffer.h
-    Include/W3DDevice/GameClient/W3DVideobuffer.h
-    Include/W3DDevice/GameClient/W3DView.h
+#    Include/W3DDevice/GameClient/W3DTerrainBackground.h
+#    Include/W3DDevice/GameClient/W3DTerrainTracks.h
+#    Include/W3DDevice/GameClient/W3DTerrainVisual.h
+#    Include/W3DDevice/GameClient/W3DTreeBuffer.h
+#    Include/W3DDevice/GameClient/W3DVideoBuffer.h
+#    Include/W3DDevice/GameClient/W3DView.h
     Include/W3DDevice/GameClient/W3DVolumetricShadow.h
-    Include/W3DDevice/GameClient/W3DWater.h
-    Include/W3DDevice/GameClient/W3DWaterTracks.h
+#    Include/W3DDevice/GameClient/W3DWater.h
+#    Include/W3DDevice/GameClient/W3DWaterTracks.h
     Include/W3DDevice/GameClient/W3DWaypointBuffer.h
     Include/W3DDevice/GameClient/W3DWebBrowser.h
-    Include/W3DDevice/GameClient/WorldHeightMap.h
+#    Include/W3DDevice/GameClient/WorldHeightMap.h
     Include/W3DDevice/GameLogic/W3DGameLogic.h
     Include/W3DDevice/GameLogic/W3DGhostObject.h
     Include/W3DDevice/GameLogic/W3DTerrainLogic.h
-    Include/Win32Device/Common/Win32BIGFile.h
-    Include/Win32Device/Common/Win32BIGFileSystem.h
+#    Include/Win32Device/Common/Win32BIGFile.h
+#    Include/Win32Device/Common/Win32BIGFileSystem.h
     Include/Win32Device/Common/Win32CDManager.h
     Include/Win32Device/Common/Win32GameEngine.h
-    Include/Win32Device/Common/Win32LocalFile.h
-    Include/Win32Device/Common/Win32LocalFileSystem.h
+#    Include/Win32Device/Common/Win32LocalFile.h
+#    Include/Win32Device/Common/Win32LocalFileSystem.h
     Include/Win32Device/GameClient/Win32DIKeyboard.h
     Include/Win32Device/GameClient/Win32DIMouse.h
     Include/Win32Device/GameClient/Win32Mouse.h
-    Source/MilesAudioDevice/MilesAudioManager.cpp
-    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
+#    Source/MilesAudioDevice/MilesAudioManager.cpp
+#    Source/VideoDevice/Bink/BinkVideoPlayer.cpp
     Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
-    Source/W3DDevice/Common/System/W3DRadar.cpp
+#    Source/W3DDevice/Common/System/W3DRadar.cpp
     Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
     Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
     Source/W3DDevice/Common/W3DConvert.cpp
-    Source/W3DDevice/GameClient/BaseHeightMap.cpp
-    Source/W3DDevice/GameClient/camerashakesystem.cpp
+#    Source/W3DDevice/GameClient/BaseHeightMap.cpp
+#    Source/W3DDevice/GameClient/camerashakesystem.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp
-    Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordAircraftDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTruckDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp
-    Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp
-    Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
+#    Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
-    Source/W3DDevice/GameClient/FlatHeightMap.cpp
+#    Source/W3DDevice/GameClient/FlatHeightMap.cpp
     Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp
     Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp
     Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp
@@ -136,13 +136,13 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
     Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
     Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
-    Source/W3DDevice/GameClient/HeightMap.cpp
+#    Source/W3DDevice/GameClient/HeightMap.cpp
     Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp
     Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
     Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp
     Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
-    Source/W3DDevice/GameClient/TerrainTex.cpp
-    Source/W3DDevice/GameClient/TileData.cpp
+#    Source/W3DDevice/GameClient/TerrainTex.cpp
+#    Source/W3DDevice/GameClient/TileData.cpp
     Source/W3DDevice/GameClient/W3DAssetManager.cpp
     Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
     Source/W3DDevice/GameClient/W3DBibBuffer.cpp
@@ -160,54 +160,40 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameClient/W3DMouse.cpp
     Source/W3DDevice/GameClient/W3DParticleSys.cpp
     Source/W3DDevice/GameClient/W3DPoly.cpp
-    Source/W3DDevice/GameClient/W3DPropBuffer.cpp
+#    Source/W3DDevice/GameClient/W3DPropBuffer.cpp
     Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
     Source/W3DDevice/GameClient/W3DScene.cpp
-    Source/W3DDevice/GameClient/W3DShaderManager.cpp
+#    Source/W3DDevice/GameClient/W3DShaderManager.cpp
     Source/W3DDevice/GameClient/W3DShroud.cpp
-    Source/W3DDevice/GameClient/W3DSmudge.cpp
-    Source/W3DDevice/GameClient/W3DSnow.cpp
+#    Source/W3DDevice/GameClient/W3DSmudge.cpp
+#    Source/W3DDevice/GameClient/W3DSnow.cpp
     Source/W3DDevice/GameClient/W3DStatusCircle.cpp
-    Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
-    Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
-    Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
-    Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
-    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
-    Source/W3DDevice/GameClient/W3DView.cpp
+#    Source/W3DDevice/GameClient/W3DTerrainBackground.cpp
+#    Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
+#    Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
+#    Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
+#    Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
+#    Source/W3DDevice/GameClient/W3DView.cpp
     Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
     Source/W3DDevice/GameClient/W3DWebBrowser.cpp
-    Source/W3DDevice/GameClient/Water/W3DWater.cpp
-    Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
-    Source/W3DDevice/GameClient/WorldHeightMap.cpp
+#    Source/W3DDevice/GameClient/Water/W3DWater.cpp
+#    Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
+#    Source/W3DDevice/GameClient/WorldHeightMap.cpp
     Source/W3DDevice/GameLogic/W3DGameLogic.cpp
     Source/W3DDevice/GameLogic/W3DGhostObject.cpp
     Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
-    Source/Win32Device/Common/Win32BIGFile.cpp
-    Source/Win32Device/Common/Win32BIGFileSystem.cpp
+#    Source/Win32Device/Common/Win32BIGFile.cpp
+#    Source/Win32Device/Common/Win32BIGFileSystem.cpp
     Source/Win32Device/Common/Win32CDManager.cpp
     Source/Win32Device/Common/Win32GameEngine.cpp
-    Source/Win32Device/Common/Win32LocalFile.cpp
-    Source/Win32Device/Common/Win32LocalFileSystem.cpp
+#    Source/Win32Device/Common/Win32LocalFile.cpp
+#    Source/Win32Device/Common/Win32LocalFileSystem.cpp
     Source/Win32Device/Common/Win32OSDisplay.cpp
     Source/Win32Device/GameClient/Win32DIKeyboard.cpp
     #Source/Win32Device/GameClient/Win32DIMouse.cpp
     Source/Win32Device/GameClient/Win32Mouse.cpp
 )
 
-# Add C++ 17 FileSystem implementation for non-VS6 builds
-if(NOT IS_VS6_BUILD)
-    list(APPEND GAMEENGINEDEVICE_SRC
-        Include/StdDevice/Common/StdBIGFile.h
-        Include/StdDevice/Common/StdBIGFileSystem.h
-        Include/StdDevice/Common/StdLocalFile.h
-        Include/StdDevice/Common/StdLocalFileSystem.h
-        Source/StdDevice/Common/StdBIGFile.cpp
-        Source/StdDevice/Common/StdBIGFileSystem.cpp
-        Source/StdDevice/Common/StdLocalFile.cpp
-        Source/StdDevice/Common/StdLocalFileSystem.cpp
-    )
-endif()
-
 add_library(z_gameenginedevice STATIC)
 
 target_sources(z_gameenginedevice PRIVATE ${GAMEENGINEDEVICE_SRC})
@@ -216,33 +202,21 @@ target_include_directories(z_gameenginedevice PUBLIC
     Include
 )
 
+target_precompile_headers(z_gameenginedevice PRIVATE
+    [["Common/STLTypedefs.h"]]
+    [["Common/SubsystemInterface.h"]]
+    [["INI.h"]]
+    [["WWCommon.h"]]
+    <windows.h>
+)
+
 target_link_libraries(z_gameenginedevice PRIVATE
+    corei_gameenginedevice_private
     zi_always
     zi_main
 )
 
 target_link_libraries(z_gameenginedevice PUBLIC
-    benchmark
-    binkstub
-    d3d8lib
-    milesstub
+    corei_gameenginedevice_public
     z_gameengine
 )
-
-if(RTS_BUILD_OPTION_FFMPEG)
-    find_package(FFMPEG REQUIRED)
-
-    if(FFMPEG_FOUND)
-        target_sources(z_gameenginedevice PRIVATE
-            Include/VideoDevice/FFmpeg/FFmpegFile.h
-            Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
-            Source/VideoDevice/FFmpeg/FFmpegFile.cpp
-            Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
-        )
-
-        target_include_directories(z_gameenginedevice PRIVATE ${FFMPEG_INCLUDE_DIRS})
-        target_link_directories(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARY_DIRS})
-        target_link_libraries(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARIES})
-        target_compile_definitions(z_gameenginedevice PUBLIC RTS_HAS_FFMPEG)
-    endif()
-endif()
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h b/GeneralsMD/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
deleted file mode 100644
index c483abf0856..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/MilesAudioDevice/MilesAudioManager.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// FILE: MilesAudioManager.h //////////////////////////////////////////////////////////////////////////
-// MilesAudioManager implementation
-// Author: John K. McDonald, July 2002
-
-#include "Common/AsciiString.h"
-#include "Common/GameAudio.h"
-#include "mss/mss.h"
-
-class AudioEventRTS;
-
-enum { MAXPROVIDERS = 64 };
-
-enum PlayingAudioType CPP_11(: Int)
-{
-	PAT_Sample,
-	PAT_3DSample,
-	PAT_Stream,
-	PAT_INVALID
-};
-
-enum PlayingStatus CPP_11(: Int)
-{
-	PS_Playing,
-	PS_Stopped,
-	PS_Paused
-};
-
-enum PlayingWhich CPP_11(: Int)
-{
-	PW_Attack,
-	PW_Sound,
-	PW_Decay,
-	PW_INVALID
-};
-
-struct PlayingAudio
-{
-	union
-	{
-		HSAMPLE m_sample;
-		H3DSAMPLE m_3DSample;
-		HSTREAM m_stream;
-	};
-
-	PlayingAudioType m_type;
-	volatile PlayingStatus m_status;	// This member is adjusted by another running thread.
-	AudioEventRTS *m_audioEventRTS;
-	void *m_file;		// The file that was opened to play this
-	Bool m_requestStop;
-	Bool m_cleanupAudioEventRTS;
-	Int m_framesFaded;
-	
-	PlayingAudio() : 
-		m_type(PAT_INVALID), 
-		m_audioEventRTS(NULL), 
-		m_requestStop(false), 
-		m_cleanupAudioEventRTS(true),
-		m_sample(NULL), 
-		m_framesFaded(0)
-	{ }
-};
-
-struct ProviderInfo
-{
-  AsciiString name;
-  HPROVIDER id;
-	Bool m_isValid;
-};
-
-struct OpenAudioFile
-{
-	AILSOUNDINFO m_soundInfo;
-	void *m_file;
-	UnsignedInt m_openCount;
-	UnsignedInt m_fileSize;
-
-	Bool m_compressed;	// if the file was compressed, then we need to free it with a miles function.
-	
-	// Note: OpenAudioFile does not own this m_eventInfo, and should not delete it.
-	const AudioEventInfo *m_eventInfo;	// Not mutable, unlike the one on AudioEventRTS.
-};
-
-typedef std::hash_map< AsciiString, OpenAudioFile, rts::hash<AsciiString>, rts::equal_to<AsciiString> > OpenFilesHash;
-typedef OpenFilesHash::iterator OpenFilesHashIt;
-
-class AudioFileCache
-{
-	public:
-		AudioFileCache();
-		
-		// Protected by mutex
-		virtual ~AudioFileCache();
-		void *openFile( AudioEventRTS *eventToOpenFrom );
-		void closeFile( void *fileToClose );
-		void setMaxSize( UnsignedInt size );
-		// End Protected by mutex
-
-		// Note: These functions should be used for informational purposes only. For speed reasons,
-		// they are not protected by the mutex, so they are not guarenteed to be valid if called from
-		// outside the audio cache. They should be used as a rough estimate only.
-		UnsignedInt getCurrentlyUsedSize() const { return m_currentlyUsedSize; }
-		UnsignedInt getMaxSize() const { return m_maxSize; }
-
-	protected:
-		void releaseOpenAudioFile( OpenAudioFile *fileToRelease );
-
-		// This function will return TRUE if it was able to free enough space, and FALSE otherwise.
-		Bool freeEnoughSpaceForSample(const OpenAudioFile& sampleThatNeedsSpace);
-		
-		OpenFilesHash m_openFiles;
-		UnsignedInt m_currentlyUsedSize;
-		UnsignedInt m_maxSize;
-		HANDLE m_mutex;
-		const char *m_mutexName;
-};
-
-class MilesAudioManager : public AudioManager
-{
-
-	public:
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		virtual void audioDebugDisplay(DebugDisplayInterface *dd, void *, FILE *fp = NULL );
-		virtual AudioHandle addAudioEvent( const AudioEventRTS *eventToAdd );	///< Add an audio event (event must be declared in an INI file)
-#endif
-
-		// from AudioDevice
-		virtual void init();
-		virtual void postProcessLoad();
-		virtual void reset();
-		virtual void update();
-
-		MilesAudioManager();
-		virtual ~MilesAudioManager();
-
-
-		virtual void nextMusicTrack( void );
-		virtual void prevMusicTrack( void );
-		virtual Bool isMusicPlaying( void ) const;
-		virtual Bool hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const;
-		virtual AsciiString getMusicTrackName( void ) const;
-
-		virtual void openDevice( void );
-		virtual void closeDevice( void );
-		virtual void *getDevice( void ) { return m_digitalHandle; }
-
-		virtual void stopAudio( AudioAffect which );
-		virtual void pauseAudio( AudioAffect which );
-		virtual void resumeAudio( AudioAffect which );
-		virtual void pauseAmbient( Bool shouldPause );
-
-		virtual void killAudioEventImmediately( AudioHandle audioEvent );
-
-		///< Return whether the current audio is playing or not. 
-		///< NOTE NOTE NOTE !!DO NOT USE THIS IN FOR GAMELOGIC PURPOSES!! NOTE NOTE NOTE
-		virtual Bool isCurrentlyPlaying( AudioHandle handle );
-
-		virtual void notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags );
-		virtual PlayingAudio *findPlayingAudioFrom( UnsignedInt audioCompleted, UnsignedInt flags );
-
-		virtual UnsignedInt getProviderCount( void ) const;
-		virtual AsciiString getProviderName( UnsignedInt providerNum ) const;
-		virtual UnsignedInt getProviderIndex( AsciiString providerName ) const;
-		virtual void selectProvider( UnsignedInt providerNdx );
-		virtual void unselectProvider( void );
-		virtual UnsignedInt getSelectedProvider( void ) const;
-		virtual void setSpeakerType( UnsignedInt speakerType );
-		virtual UnsignedInt getSpeakerType( void );
-
- 		virtual void *getHandleForBink( void );
- 		virtual void releaseHandleForBink( void );
-
-		virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay);
-
-		virtual UnsignedInt getNum2DSamples( void ) const;
-		virtual UnsignedInt getNum3DSamples( void ) const;
-		virtual UnsignedInt getNumStreams( void ) const;
-
-		virtual Bool doesViolateLimit( AudioEventRTS *event ) const;
-		virtual Bool isPlayingLowerPriority( AudioEventRTS *event ) const;
-		virtual Bool isPlayingAlready( AudioEventRTS *event ) const;
-		virtual Bool isObjectPlayingVoice( UnsignedInt objID ) const;
-		Bool killLowestPrioritySoundImmediately( AudioEventRTS *event );
-		AudioEventRTS* findLowestPrioritySound( AudioEventRTS *event );
-
-		virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume);
-
-		virtual void removePlayingAudio( AsciiString eventName );
-		virtual void removeAllDisabledAudio();
-
-		virtual void processRequestList( void );
-		virtual void processPlayingList( void );
-		virtual void processFadingList( void );
-		virtual void processStoppedList( void );
-
-		Bool shouldProcessRequestThisFrame( AudioRequest *req ) const;
-		void adjustRequest( AudioRequest *req );
-		Bool checkForSample( AudioRequest *req );
-
-		virtual void setHardwareAccelerated(Bool accel);
-		virtual void setSpeakerSurround(Bool surround);
-		
-		virtual void setPreferredProvider(AsciiString provider) { m_pref3DProvider = provider; }
-		virtual void setPreferredSpeaker(AsciiString speakerType) { m_prefSpeaker = speakerType; }
-
-		virtual Real getFileLengthMS( AsciiString strToLoad ) const;
-
-		virtual void closeAnySamplesUsingFile( const void *fileToClose );
-
-    
-    virtual Bool has3DSensitiveStreamsPlaying( void ) const; 
-
-
-	protected:	
-		// 3-D functions
-		virtual void setDeviceListenerPosition( void );
-		const Coord3D *getCurrentPositionFromEvent( AudioEventRTS *event );
-		Bool isOnScreen( const Coord3D *pos ) const;
-		Real getEffectiveVolume(AudioEventRTS *event) const;
-
-		// Looping functions
-		Bool startNextLoop( PlayingAudio *looping );
-
-		void playStream( AudioEventRTS *event, HSTREAM stream );
-		// Returns the file handle for attachment to the PlayingAudio structure
-		void *playSample( AudioEventRTS *event, HSAMPLE sample );
-		void *playSample3D( AudioEventRTS *event, H3DSAMPLE sample3D );
-
-	protected:
-		void buildProviderList( void );
-		void createListener( void );
-		void initDelayFilter( void );
-		Bool isValidProvider( void );
-		void initSamplePools( void );
-		void processRequest( AudioRequest *req );
-
-		void playAudioEvent( AudioEventRTS *event );
-		void stopAudioEvent( AudioHandle handle );
-		void pauseAudioEvent( AudioHandle handle );
-
-		void *loadFileForRead( AudioEventRTS *eventToLoadFrom );
-		void closeFile( void *fileRead );
-
-		PlayingAudio *allocatePlayingAudio( void );
-		void releaseMilesHandles( PlayingAudio *release );
-		void releasePlayingAudio( PlayingAudio *release );
-		
-		void stopAllAudioImmediately( void );
-		void freeAllMilesHandles( void );
-
-		HSAMPLE getFirst2DSample( AudioEventRTS *event );
-		H3DSAMPLE getFirst3DSample( AudioEventRTS *event );
-
-		void adjustPlayingVolume( PlayingAudio *audio );
-		
-		void stopAllSpeech( void );
-		
-	protected:
-		void initFilters( HSAMPLE sample, const AudioEventRTS *eventInfo );
-		void initFilters3D( H3DSAMPLE sample, const AudioEventRTS *eventInfo, const Coord3D *pos );
-
-	protected:
-		ProviderInfo m_provider3D[MAXPROVIDERS];
-		UnsignedInt m_providerCount;
-		UnsignedInt m_selectedProvider;
-		UnsignedInt m_lastProvider;
-		UnsignedInt m_selectedSpeakerType;
-
-		AsciiString m_pref3DProvider;
-		AsciiString m_prefSpeaker;
-
-		HDIGDRIVER m_digitalHandle;
-		H3DPOBJECT m_listener;
-		HPROVIDER m_delayFilter;
-
-		// This is a list of all handles that are forcibly played. They always play as UI sounds.
-		std::list<HAUDIO> m_audioForcePlayed;
-
-		// Available handles for play. Note that there aren't handles open in advance for 
-		// streaming things, only 2-D and 3-D sounds.
-		std::list<HSAMPLE> m_availableSamples;
-		std::list<H3DSAMPLE> m_available3DSamples;
-
-		// Currently Playing stuff. Useful if we have to preempt it. 
-		// This should rarely if ever happen, as we mirror this in Sounds, and attempt to 
-		// keep preemption from taking place here.
-		std::list<PlayingAudio *> m_playingSounds;
-		std::list<PlayingAudio *> m_playing3DSounds;
-		std::list<PlayingAudio *> m_playingStreams;
-
-		// Currently fading stuff. At this point, we just want to let it finish fading, when it is
-		// done it should be added to the completed list, then "freed" and the counts should be updated
-		// on the next update
-		std::list<PlayingAudio *> m_fadingAudio;
-
-		// Stuff that is done playing (either because it has finished or because it was killed)
-		// This stuff should be cleaned up during the next update cycle. This includes updating counts
-		// in the sound engine
-		std::list<PlayingAudio *> m_stoppedAudio;
-
-		AudioFileCache *m_audioCache;
-		PlayingAudio *m_binkHandle;
-		UnsignedInt m_num2DSamples;
-		UnsignedInt m_num3DSamples;
-		UnsignedInt m_numStreams;
-		
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-		typedef std::set<AsciiString> SetAsciiString;
-		typedef SetAsciiString::iterator SetAsciiStringIt;
-		SetAsciiString m_allEventsLoaded;
-		void dumpAllAssetsUsed();
-#endif
-
-};
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h b/GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
deleted file mode 100644
index 351ad3f038f..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    Generals
-//
-// File name:  GameClient/VideoPlayer.h
-//
-// Created:    10/22/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __VIDEODEVICE_BINKDEVICE_H_
-#define __VIDEODEVICE_BINKDEVICE_H_
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "GameClient/VideoPlayer.h"
-#include "bink.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-class BinkVideoPlayer;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// BinkVideoStream
-//===============================
-
-class BinkVideoStream : public VideoStream
-{
-	friend class BinkVideoPlayer;
-
-	protected:
-
-		HBINK					m_handle;														///< Bink streaming handle;
-		Char					*m_memFile;													///< Pointer to memory resident file
-																											
-		BinkVideoStream();																///< only BinkVideoPlayer can create these
-		virtual ~BinkVideoStream();												
-																											
-	public:																							
-																											
-		virtual void update( void );											///< Update bink stream
-
-		virtual Bool	isFrameReady( void );								///< Is the frame ready to be displayed
-		virtual void	frameDecompress( void );						///< Render current frame in to buffer
-		virtual void	frameRender( VideoBuffer *buffer ); ///< Render current frame in to buffer
-		virtual void	frameNext( void );									///< Advance to next frame
-		virtual Int		frameIndex( void );									///< Returns zero based index of current frame
-		virtual Int		frameCount( void );									///< Returns the total number of frames in the stream
-		virtual void	frameGoto( Int index );							///< Go to the spcified frame index
-		virtual Int		height( void );											///< Return the height of the video
-		virtual Int		width( void );											///< Return the width of the video
-
-
-};
-
-//===============================
-// BinkVideoPlayer
-//===============================
-/**
-  *	Bink video playback code.
-	*/
-//===============================
-
-class BinkVideoPlayer : public VideoPlayer
-{
-
-	protected:
-
-		VideoStreamInterface* createStream( HBINK handle );
-
-	public:
-
-		// subsytem requirements
-		virtual void	init( void );														///< Initialize video playback code
-		virtual void	reset( void );													///< Reset video playback
-		virtual void	update( void );													///< Services all audio tasks. Should be called frequently
-																													
-		virtual void	deinit( void );													///< Close down player
-																														
-																													
-		BinkVideoPlayer();																				
-		~BinkVideoPlayer();																				
-																													
-		// service																						
-		virtual void	loseFocus( void );											///< Should be called when application loses focus
-		virtual void	regainFocus( void );										///< Should be called when application regains focus
-																												
-		virtual VideoStreamInterface*	open( AsciiString movieTitle );	///< Open video file for playback
-		virtual VideoStreamInterface*	load( AsciiString movieTitle );	///< Load video file in to memory for playback
-
-		virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid );
-		virtual void initializeBinkWithMiles( void );
-};
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-
-#endif // __VIDEODEVICE_BINKDEVICE_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h
index 083627832b2..6ad2a55fbb2 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //==============================================================================
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //=============================================================================
 //
 // Project:    RTS3
@@ -41,11 +41,8 @@
 
 #pragma once
 
-#ifndef __W3DCONVERT_H_
-#define __W3DCONVERT_H_
-
 //=============================================================================
-//           Includes                                                      
+//           Includes
 //=============================================================================
 #include "Lib/BaseType.h"
 
@@ -62,7 +59,3 @@ extern void PixelScreenToW3DLogicalScreen( Int screenX, Int screenY,
 //=============================================================================
 //           Type Defines
 //=============================================================================
-
-
-#endif // _W3DCONVERT_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h
index d721eccd469..71e3dd5c472 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __W3DFUNCTIONLEXICON_H_
-#define __W3DFUNCTIONLEXICON_H_
-
 #include "Common/FunctionLexicon.h"
 
 //-------------------------------------------------------------------------------------------------
@@ -48,10 +45,7 @@ class W3DFunctionLexicon : public FunctionLexicon
 	virtual void init( void );
 	virtual void reset( void );
 	virtual void update( void );
-	
+
 protected:
 
 };
-
-#endif // __W3DFUNCTIONLEXICON_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h
index b1793d47aaa..141457eafe4 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h
@@ -26,15 +26,12 @@
 // Author: Steven Johnson, September 2001
 //				 Colin Day, November 2001
 // Desc:   W3D game logic class, there shouldn't be a lot of new functionality
-//				 in this class, but there are certain things that need to have close 
+//				 in this class, but there are certain things that need to have close
 //				 knowledge of each other like ther logical and visual terrain
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __W3DMODULEFACTORY_H_
-#define __W3DMODULEFACTORY_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ModuleFactory.h"
 
@@ -46,8 +43,6 @@ class W3DModuleFactory : public ModuleFactory
 
 public:
 
-	virtual void init( void );  
-	
-};
+	virtual void init( void );
 
-#endif // __W3DMODULEFACTORY_H_
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h
deleted file mode 100644
index fd1b2ff8e85..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DRadar.h ///////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, January 2002
-// Desc:   W3D radar implementation, this has the necessary device dependent drawing
-//				 necessary for the radar
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DRADAR_H_
-#define __W3DRADAR_H_
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/Radar.h"
-#include "WW3D2/ww3dformat.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-class TextureClass;
-class TerrainLogic;
-
-// PROTOTYPES /////////////////////////////////////////////////////////////////////////////////////
-//-------------------------------------------------------------------------------------------------
-/** W3D radar class.  This has the device specific implementation of the radar such as
-	* the drawing routines */
-//-------------------------------------------------------------------------------------------------
-class W3DRadar : public Radar
-{
-
-public:
-
-	W3DRadar( void );
-	~W3DRadar( void );
-
-	virtual void init( void );																		///< subsystem init
-	virtual void update( void );																	///< subsystem update
-	virtual void reset( void );																		///< subsystem reset
-
-	virtual void newMap( TerrainLogic *terrain );				///< reset radar for new map
-
-	void draw( Int pixelX, Int pixelY, Int width, Int height );		///< draw the radar
-
-	virtual void clearShroud();
-	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting);
-
-	virtual void refreshTerrain( TerrainLogic *terrain );
-
-protected:
-
-	void drawSingleBeaconEvent( Int pixelX, Int pixelY, Int width, Int height, Int index );
-	void drawSingleGenericEvent( Int pixelX, Int pixelY, Int width, Int height, Int index );
-
-	void initializeTextureFormats( void );				///< find format to use for the radar texture
-	void deleteResources( void );									///< delete resources used
-	void drawEvents( Int pixelX, Int pixelY, Int width, Int height);		///< draw all of the radar events
-	void drawHeroIcon( Int pixelX, Int pixelY, Int width, Int height, const Coord3D *pos );	//< draw a hero icon
-	void drawViewBox( Int pixelX, Int pixelY, Int width, Int height );  ///< draw view box
-	void buildTerrainTexture( TerrainLogic *terrain );	 ///< create the terrain texture of the radar
-	void drawIcons( Int pixelX, Int pixelY, Int width, Int height );	///< draw all of the radar icons
-	void renderObjectList( const RadarObject *listHead, TextureClass *texture, Bool calcHero = FALSE );			 ///< render an object list to the texture
-	void interpolateColorForHeight( RGBColor *color, 
-																	Real height, 
-																	Real hiZ, 
-																	Real midZ, 
-																	Real loZ );		///< "shade" color according to height value
-	void reconstructViewBox( void );							///< remake the view box
-	void radarToPixel( const ICoord2D *radar, ICoord2D *pixel,
-										 Int radarUpperLeftX, Int radarUpperLeftY,
-										 Int radarWidth, Int radarHeight );  ///< convert radar coord to pixel location
-
-	WW3DFormat m_terrainTextureFormat;						///< format to use for terrain texture
-	Image *m_terrainImage;												///< terrain image abstraction for drawing
-	TextureClass *m_terrainTexture;								///< terrain background texture	
-
-	WW3DFormat m_overlayTextureFormat;						///< format to use for overlay texture
-	Image *m_overlayImage;												///< overlay image abstraction for drawing
-	TextureClass *m_overlayTexture;								///< overlay texture
-
-	WW3DFormat m_shroudTextureFormat;							///< format to use for shroud texture
-	Image *m_shroudImage;													///< shroud image abstraction for drawing
-	TextureClass *m_shroudTexture;								///< shroud texture
-
-	Int m_textureWidth;														///< width for all radar textures
-	Int m_textureHeight;													///< height for all radar textures
-
-	//
-	// we want to keep a flag that tells us when to reconstruct the view box, we want
-	// to reconstruct the box on map change, and when the camera changes height
-	// or orientation.  We want to avoid making the view box every frame because 
-	// the 4 points visible on the edge of the screen will "jitter" unevenly as we
-	// translate real world coords to integer radar spots
-	//
-	Bool m_reconstructViewBox;										///< true when we need to reconstruct the box
-	Real m_viewAngle;															///< camera angle used for the view box we have
-	Real m_viewZoom;															///< camera zoom used for the view box we have	
-	ICoord2D m_viewBox[ 4 ];											///< radar cell points for the 4 corners of view box
-
-	std::list<const Coord3D *> m_cachedHeroPosList;					//< cache of hero positions for drawing icons in radar overlay
-};
-
-
-#endif // __W3DRADAR_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h
index 4720a17ec49..b248a03fa92 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h
@@ -31,9 +31,6 @@
 
 #pragma once
 
-#ifndef __W3DTHINGFACTORY_H_
-#define __W3DTHINGFACTORY_H_
-
 // USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
 #include "Common/ThingFactory.h"
 
@@ -46,7 +43,4 @@ class W3DThingFactory : public ThingFactory
 
 	W3DThingFactory( void );
 	virtual ~W3DThingFactory( void );
-};  // end W3DThingFactory
-
-#endif // __W3DTHINGFACTORY_H_
-
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h
deleted file mode 100644
index a0d9aae522b..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-
-#ifndef __HEIGHTMAP_H_
-#define __HEIGHTMAP_H_
-
-#include "always.h"
-#include "rendobj.h"
-#include "w3d_file.h"
-#include "dx8vertexbuffer.h"
-#include "dx8indexbuffer.h"
-#include "dx8wrapper.h"
-#include "shader.h"
-#include "vertmaterial.h"
-#include "Lib/BaseType.h"
-#include "Common/GameType.h"
-#include "WorldHeightMap.h"
-#include "BaseHeightMap.h"
-
-#define VERTEX_BUFFER_TILE_LENGTH	32		//tiles of side length 32 (grid of 33x33 vertices).
-
-// Adjust the triangles to make cliff sides most attractive.  jba.
-#define FLIP_TRIANGLES 1
-
-
-/// Custom render object that draws the heightmap and handles intersection tests.
-/**
-Custom W3D render object that's used to process the terrain.  It handles
-virtually everything to do with the terrain, including: drawing, lighting,
-scorchmarks and intersection tests.
-*/
-
-
-
-class HeightMapRenderObjClass : public BaseHeightMapRenderObjClass
-{	
-
-public:
-
-	HeightMapRenderObjClass(void);
-	virtual ~HeightMapRenderObjClass(void);
-
-	// DX8_CleanupHook methods
-	virtual void ReleaseResources(void);	///< Release all dx8 resources so the device can be reset.
-	virtual void ReAcquireResources(void);  ///< Reacquire all resources after device reset.
-
-
-	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface (W3D methods)
-	/////////////////////////////////////////////////////////////////////////////
-	virtual void					Render(RenderInfoClass & rinfo);
-	virtual void					On_Frame_Update(void); 
-
-	///allocate resources needed to render heightmap
-	virtual int initHeightData(Int width, Int height, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator, Bool updateExtraPassTiles=TRUE);
-	virtual Int freeMapResources(void);	///< free resources used to render heightmap
-	virtual void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator);
-
-	void renderExtraBlendTiles(void);			///< render 3-way blend tiles that have blend of 3 textures.
-
-
-	virtual void staticLightingChanged(void);
-	virtual	void adjustTerrainLOD(Int adj);
-	virtual void reset(void);
-	virtual void doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator);
-
-	virtual void oversizeTerrain(Int tilesToOversize);
-  
-	virtual int updateBlock(Int x0, Int y0, Int x1, Int y1, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator);
-
-protected:
-	Int *m_extraBlendTilePositions;	///<array holding x,y tile positions of all extra blend tiles. (used for 3 textures per tile).
-	Int m_numExtraBlendTiles;		///<number of blend tiles in m_extraBlendTilePositions.
-	Int	m_numVisibleExtraBlendTiles; ///<number rendered last frame.	
-	Int m_extraBlendTilePositionsSize;	//<total size of array including unused memory.
-	DX8VertexBufferClass	**m_vertexBufferTiles;	///<collection of smaller vertex buffers that make up 1 heightmap
-	char	**m_vertexBufferBackup;	///< In memory copy of the vertex buffer data for quick update of dynamic lighting.
-	Int m_originX; ///<  Origin point in the grid.  Slides around.
-	Int m_originY; ///< Origin point in the grid.  Slides around.
-	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining triangles in a VB tile.
-	Int	m_numVBTilesX;	///<dimensions of array containing all the vertex buffers 
-	Int	m_numVBTilesY;	///<dimensions of array containing all the vertex buffers
-	Int m_numVertexBufferTiles;	///<number of vertex buffers needed to store this heightmap
-	Int	m_numBlockColumnsInLastVB;///<a VB tile may be partially filled, this indicates how many 2x2 vertex blocks are filled.
-	Int	m_numBlockRowsInLastVB;///<a VB tile may be partially filled, this indicates how many 2x2 vertex blocks are filled.
-
-
-	UnsignedInt doTheDynamicLight(VERTEX_FORMAT *vb, VERTEX_FORMAT *vbMirror, Vector3*light, Vector3*normal, W3DDynamicLight *pLights[], Int numLights);
-	Int getXWithOrigin(Int x);
-	Int getYWithOrigin(Int x);
-	///update vertex diffuse color for dynamic lights inside given rectangle
-	Int updateVBForLight(DX8VertexBufferClass *pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights);
-	Int updateVBForLightOptimized(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights);
-	///update vertex buffer vertices inside given rectangle
-	Int updateVB(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator);
-	///upate vertex buffers associated with the given rectangle
-	void initDestAlphaLUT(void);	///<initialize water depth LUT stored in m_destAlphaTexture
-	void renderTerrainPass(CameraClass *pCamera);	///< renders additional terrain pass.
-	Int	getNumExtraBlendTiles(Bool visible) { return visible?m_numVisibleExtraBlendTiles:m_numExtraBlendTiles;}
-	void freeIndexVertexBuffers(void);
-
-
-  
-};
-
-#endif  // end __HEIGHTMAP_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
index d7a772ad96a..4c79a246775 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __W3D_DEBRIS_DRAW_H_
-#define __W3D_DEBRIS_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameType.h"
 #include "Common/DrawModule.h"
@@ -60,7 +57,7 @@ class W3DDebrisDraw : public DrawModule, public DebrisDrawInterface
 	virtual void doDrawModule(const Matrix3D* transformMtx);
 
 	virtual void setShadowsEnabled(Bool enable);
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
+	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
 
 	virtual void setFullyObscuredByShroud(Bool fullyObscured);
@@ -98,6 +95,3 @@ class W3DDebrisDraw : public DrawModule, public DebrisDrawInterface
 	Shadow*										m_shadow;													///< Updates/Renders shadows of this object
 
 };
-
-#endif // __W3D_DEBRIS_DRAW_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
index e3933485d0a..647d7379bfb 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __W3DDEFAULTDRAW_H_
-#define __W3DDEFAULTDRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/GameType.h"
 #include "Common/DrawModule.h"
@@ -62,7 +59,7 @@ class W3DDefaultDraw : public DrawModule
 	virtual void doDrawModule(const Matrix3D* transformMtx);
 
 	virtual void setShadowsEnabled(Bool enable);
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
+	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void setFullyObscuredByShroud(Bool fullyObscured);
 	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle);
@@ -75,6 +72,3 @@ class W3DDefaultDraw : public DrawModule
 	Shadow*				m_shadow;													///< Updates/Renders shadows of this object
 #endif
 };
-
-#endif // __W3DDEFAULTDRAW_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
index 62eacd720b2..c6048a8ca73 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h
@@ -34,9 +34,6 @@
 
 #pragma once
 
-#ifndef _W3D_DEPENDENCY_MODEL_DRAW_H_
-#define _W3D_DEPENDENCY_MODEL_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 
@@ -57,7 +54,7 @@ class W3DDependencyModelDraw : public W3DModelDraw
 
  	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DDependencyModelDraw, "W3DDependencyModelDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DDependencyModelDraw, W3DDependencyModelDrawModuleData )
-		
+
 public:
 
 	W3DDependencyModelDraw( Thing *thing, const ModuleData* moduleData );
@@ -69,6 +66,3 @@ class W3DDependencyModelDraw : public W3DModelDraw
 protected:
 	Bool m_dependencyCleared; // The thing we depend on will clear this, and we will relatch it after we draw.
 };
-
-#endif // _W3D_DEPENDENCY_MODEL_DRAW_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
deleted file mode 100644
index 2dbc25047d3..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DLaserDraw.h ///////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:   
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DLASERDRAW_H_
-#define __W3DLASERDRAW_H_
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/DrawModule.h"
-//#include "WW3D2/Line3D.h"
-#include "GameClient/Color.h"
-
-class SegmentedLineClass;
-class TextureClass;
-
-class W3DLaserDrawModuleData : public ModuleData
-{
-public:
-
-  Color m_innerColor;
-  Color m_outerColor;
-	Real m_innerBeamWidth;
-	Real m_outerBeamWidth;
-	Real m_scrollRate;
-	Bool m_tile;
-  UnsignedInt m_numBeams;
-  UnsignedInt m_maxIntensityFrames;
-  UnsignedInt m_fadeFrames;
-	AsciiString m_textureName;
-	UnsignedInt m_segments;
-	Real m_arcHeight;
-	Real m_segmentOverlapRatio;
-	Real m_tilingScalar;
-
-	W3DLaserDrawModuleData();
-	~W3DLaserDrawModuleData();
-	static void buildFieldParse(MultiIniFieldParse& p);
-};
-
-//-------------------------------------------------------------------------------------------------
-/** W3D laser draw */
-//-------------------------------------------------------------------------------------------------
-class W3DLaserDraw : public DrawModule, public LaserDrawInterface
-{
-
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DLaserDraw, "W3DLaserDraw" )
-	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DLaserDraw, W3DLaserDrawModuleData )
-		
-public:
-
-	W3DLaserDraw( Thing *thing, const ModuleData* moduleData );
-	// virtual destructor prototype provided by memory pool declaration
-
-	virtual void doDrawModule(const Matrix3D* transformMtx);
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
-	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
-	virtual void setShadowsEnabled(Bool enable) { }
-	virtual void setFullyObscuredByShroud(Bool fullyObscured) { };
-	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle) { }
-	virtual void reactToGeometryChange() { }
-	virtual Bool isLaser() const { return true; }
-	Real getLaserTemplateWidth() const;
-	
-	virtual LaserDrawInterface* getLaserDrawInterface() { return this; }
-	virtual const LaserDrawInterface* getLaserDrawInterface() const { return this; }
-
-protected:
-
-	SegmentedLineClass **m_line3D;  ///< line 3D for effect
-	TextureClass *m_texture;
-	Real m_textureAspectRatio;			///< aspect ratio of texture
-	Bool m_selfDirty;								// not saved
-
-};
-
-#endif // __W3DLASERDRAW_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
index 741f9265193..1d33cb947ee 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h
@@ -29,16 +29,13 @@
 
 #pragma once
 
-#ifndef __W3DModelDraw_H_
-#define __W3DModelDraw_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/ModelState.h"
-#include "Common/DrawModule.h" 
+#include "Common/DrawModule.h"
 #ifdef BRUTAL_TIMING_HACK // hack for collecting model timing info.  jba.
 class RenderObjClass {
 public:
-	enum AnimMode 
+	enum AnimMode
 	{
 		ANIM_MODE_MANUAL		= 0,
 		ANIM_MODE_LOOP,
@@ -46,6 +43,8 @@ class RenderObjClass {
 		ANIM_MODE_LOOP_PINGPONG,
 		ANIM_MODE_LOOP_BACKWARDS,	//make sure only backwards playing animations after this one
 		ANIM_MODE_ONCE_BACKWARDS,
+
+		ANIM_MODE_COUNT
 	};
 };
 
@@ -110,7 +109,7 @@ class W3DAnimationInfo
 	W3DAnimationInfo &operator=(const W3DAnimationInfo& r);
 
 	~W3DAnimationInfo();
-	
+
 	HAnimClass* getAnimHandle() const;
 	const AsciiString& getName() const { return m_name; }
 	Bool isIdleAnim() const { return m_isIdleAnim; }
@@ -121,7 +120,7 @@ class W3DAnimationInfo
 typedef std::vector<W3DAnimationInfo>	W3DAnimationVector;
 
 //-------------------------------------------------------------------------------------------------
-struct ParticleSysBoneInfo 
+struct ParticleSysBoneInfo
 {
 	AsciiString boneName;
 	const ParticleSystemTemplate* particleSystemTemplate;
@@ -176,7 +175,7 @@ struct ModelConditionInfo
 		Int							m_fxBone;											///< the FX bone for this barrel (zero == no bone)
 		Int							m_muzzleFlashBone;						///< the muzzle-flash subobj bone for this barrel (zero == none)
 		Matrix3D				m_projectileOffsetMtx;				///< where the projectile fires from
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 		AsciiString			m_muzzleFlashBoneName;
 #endif
 
@@ -191,16 +190,16 @@ struct ModelConditionInfo
 			m_fxBone = 0;
 			m_muzzleFlashBone = 0;
 			m_projectileOffsetMtx.Make_Identity();
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 			m_muzzleFlashBoneName.clear();
 #endif
 		}
 
 		void setMuzzleFlashHidden(RenderObjClass *fullObject, Bool hide) const;
-	}; 
+	};
 	typedef std::vector<WeaponBarrelInfo>	WeaponBarrelInfoVec;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 	AsciiString												m_description;
 #endif
 	std::vector<ModelConditionFlags>	m_conditionsYesVec;
@@ -216,7 +215,7 @@ struct ModelConditionInfo
 	NameKeyType												m_transitionKey;
 	NameKeyType												m_allowToFinishKey;
 	Int																m_flags;
-	Int																m_iniReadFlags;	// not read from ini, but used for helping with default states														
+	Int																m_iniReadFlags;	// not read from ini, but used for helping with default states
 	RenderObjClass::AnimMode					m_mode;
 	ParticleSysBoneInfoVector					m_particleSysBones;			///< Bone names and attached particle systems.
 	TransitionSig											m_transitionSig;
@@ -238,8 +237,8 @@ struct ModelConditionInfo
 		PUBLIC_BONES_VALID			= 0x0010
 	};
 
-	inline ModelConditionInfo()
-	{ 
+	ModelConditionInfo()
+	{
 		clear();
 	}
 
@@ -247,9 +246,9 @@ struct ModelConditionInfo
 	void loadAnimations() const;
 	void preloadAssets( TimeOfDay timeOfDay, Real scale );			///< preload any assets for time of day
 
-	inline Int getConditionsYesCount() const { DEBUG_ASSERTCRASH(m_conditionsYesVec.size() > 0, ("empty m_conditionsYesVec.size(), see srj")); return m_conditionsYesVec.size(); }
-	inline const ModelConditionFlags& getNthConditionsYes(Int i) const { return m_conditionsYesVec[i]; }
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	Int getConditionsYesCount() const { DEBUG_ASSERTCRASH(!m_conditionsYesVec.empty(), ("empty m_conditionsYesVec.size(), see srj")); return m_conditionsYesVec.size(); }
+	const ModelConditionFlags& getNthConditionsYes(Int i) const { return m_conditionsYesVec[i]; }
+#if defined(RTS_DEBUG)
 	inline AsciiString getDescription() const { return m_description; }
 #endif
 
@@ -283,7 +282,7 @@ class W3DModelDrawModuleData : public ModuleData
 public:
 
 	mutable ModelConditionVector			m_conditionStates;
-	mutable SparseMatchFinder< ModelConditionInfo, ModelConditionFlags >	
+	mutable SparseMatchFinder< ModelConditionInfo, ModelConditionFlags >
 																		m_conditionStateMap;
 	mutable TransitionMap							m_transitionMap;
 	std::vector<AsciiString>					m_extraPublicBones;
@@ -357,9 +356,9 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	virtual void releaseShadows(void);	///< frees all shadow resources used by this module - used by Options screen.
 	virtual void allocateShadows(void); ///< create shadow resources if not already present. Used by Options screen.
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+#if defined(RTS_DEBUG)
 	virtual void getRenderCost(RenderCost & rc) const;  ///< estimates the render cost of this draw module
-	void getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const; 
+	void getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const;
 #endif
 
 	virtual void setFullyObscuredByShroud(Bool fullyObscured);
@@ -389,7 +388,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	virtual void setSelectable(Bool selectable); // Change the selectability of the model.
 
 	/**
-		This call says, "I want the current animation (if any) to take n frames to complete a single cycle". 
+		This call says, "I want the current animation (if any) to take n frames to complete a single cycle".
 		If it's a looping anim, each loop will take n frames. someday, we may want to add the option to insert
 		"pad" frames at the start and/or end, but for now, we always just "stretch" the animation to fit.
 		Note that you must call this AFTER setting the condition codes.
@@ -398,7 +397,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 
 	/**
 		similar to the above, but assumes that the current state is a "ONCE",
-		and is smart about transition states... if there is a transition state 
+		and is smart about transition states... if there is a transition state
 		"inbetween", it is included in the completion time.
 	*/
 	virtual void setAnimationCompletionTime(UnsignedInt numFrames);
@@ -422,8 +421,8 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	virtual ObjectDrawInterface* getObjectDrawInterface() { return this; }
 	virtual const ObjectDrawInterface* getObjectDrawInterface() const { return this; }
 
-	///@todo: I had to make this public because W3DDevice needs access for casting shadows -MW 
-	inline RenderObjClass *getRenderObject() { return m_renderObject; }
+	///@todo: I had to make this public because W3DDevice needs access for casting shadows -MW
+	RenderObjClass *getRenderObject() { return m_renderObject; }
 	virtual Bool updateBonesForClientParticleSystems( void );///< this will reposition particle systems on the fly ML
 
 	virtual void onDrawableBoundToObject();
@@ -434,7 +433,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 
 	virtual void onRenderObjRecreated(void){};
 
-	inline const ModelConditionInfo* getCurState() const { return m_curState; }
+	const ModelConditionInfo* getCurState() const { return m_curState; }
 
 	void setModelState(const ModelConditionInfo* newState);
 	const ModelConditionInfo* findBestInfo(const ModelConditionFlags& c) const;
@@ -449,7 +448,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	Bool setCurAnimDurationInMsec(Real duration);
 
 
-	inline Bool getFullyObscuredByShroud() const { return m_fullyObscuredByShroud; }
+	Bool getFullyObscuredByShroud() const { return m_fullyObscuredByShroud; }
 
 private:
 
@@ -475,7 +474,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 			m_shift = 0.0f;
 			m_recoilRate = 0.0f;
 		}
-	}; 
+	};
 
 
 	struct ParticleSysTrackerType
@@ -489,10 +488,10 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	typedef std::vector<ParticleSysTrackerType>	ParticleSystemIDVec;
 	//typedef std::vector<ParticleSystemID>	ParticleSystemIDVec;
 
-	
+
 	const ModelConditionInfo*			m_curState;
 	const ModelConditionInfo*			m_nextState;
-	UnsignedInt										m_nextStateAnimLoopDuration;			
+	UnsignedInt										m_nextStateAnimLoopDuration;
 	Int														m_hexColor;
 	Int														m_whichAnimInCurState;						///< the index of the currently playing anim in cur state (if any)
 	WeaponRecoilInfoVec						m_weaponRecoilInfoVec[WEAPONSLOT_COUNT];
@@ -520,10 +519,7 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface
 	void adjustAnimSpeedToMovementSpeed();
 	static void hideAllMuzzleFlashes(const ModelConditionInfo* state, RenderObjClass* renderObject);
 	void hideAllHeadlights(Bool hide);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//art wants to see buildings without flags as a test.
+#if defined(RTS_DEBUG)	//art wants to see buildings without flags as a test.
 	void hideGarrisonFlags(Bool hide);
 #endif
 };
-
-#endif // __W3DModelDraw_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h
index d404b60aade..b66926f9600 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h
@@ -24,7 +24,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-//  FILE: W3DOverlordAircraftDraw.h 
+//  FILE: W3DOverlordAircraftDraw.h
 //  Author: Mark Lorenzen, April 2003
 //  Desc: Units that recieve portable structure upgrades (like the Overlord Tank) have a super specific special need.
 //  He needs his rider to draw explicitly after him,
@@ -36,9 +36,6 @@
 
 #pragma once
 
-#ifndef _W3D_OVERLORD_AIRCRAFT_DRAW_H_
-#define _W3D_OVERLORD_AIRCRAFT_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 
@@ -58,7 +55,7 @@ class W3DOverlordAircraftDraw : public W3DModelDraw
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DOverlordAircraftDraw, "W3DOverlordAircraftDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DOverlordAircraftDraw, W3DOverlordAircraftDrawModuleData )
-		
+
 public:
 
 	W3DOverlordAircraftDraw( Thing *thing, const ModuleData* moduleData );
@@ -70,6 +67,3 @@ class W3DOverlordAircraftDraw : public W3DModelDraw
 protected:
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h
index a11e5263f44..72a39809598 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _W3D_OVERLORD_TANK_DRAW_H_
-#define _W3D_OVERLORD_TANK_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "W3DDevice/GameClient/Module/W3DTankDraw.h"
 
@@ -58,7 +55,7 @@ class W3DOverlordTankDraw : public W3DTankDraw
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DOverlordTankDraw, "W3DOverlordTankDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DOverlordTankDraw, W3DOverlordTankDrawModuleData )
-		
+
 public:
 
 	W3DOverlordTankDraw( Thing *thing, const ModuleData* moduleData );
@@ -70,6 +67,3 @@ class W3DOverlordTankDraw : public W3DTankDraw
 protected:
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h
index 112c0a704c3..b20059f8338 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef _W3D_OVERLORD_TRUCK_DRAW_H_
-#define _W3D_OVERLORD_TRUCK_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "W3DDevice/GameClient/Module/W3DTruckDraw.h"
 
@@ -58,7 +55,7 @@ class W3DOverlordTruckDraw : public W3DTruckDraw
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DOverlordTruckDraw, "W3DOverlordTruckDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DOverlordTruckDraw, W3DOverlordTruckDrawModuleData )
-		
+
 public:
 
 	W3DOverlordTruckDraw( Thing *thing, const ModuleData* moduleData );
@@ -70,6 +67,3 @@ class W3DOverlordTruckDraw : public W3DTruckDraw
 protected:
 
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h
index 7df92de3d51..db3c632815e 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: W3DPoliceCarDraw.h ///////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:   
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __W3DPOLICECARDRAW_H_
-#define __W3DPOLICECARDRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "W3DDevice/GameClient/Module/W3DTruckDraw.h"
@@ -63,6 +60,3 @@ class W3DPoliceCarDraw : public W3DTruckDraw
 	Real					m_curFrame;
 
 };
-
-#endif // __W3DPOLICECARDRAW_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h
index 7571ed01870..6d559dd5781 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3D_PROJECTILE_STREAM_DRAW_H_
-#define _W3D_PROJECTILE_STREAM_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "GameLogic/Module/ProjectileStreamUpdate.h" // I am the draw module for this update.  Very tight.
@@ -62,14 +59,14 @@ class W3DProjectileStreamDraw : public DrawModule
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DProjectileStreamDraw, "W3DProjectileStreamDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DProjectileStreamDraw, W3DProjectileStreamDrawModuleData )
-		
+
 public:
 
 	W3DProjectileStreamDraw( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
 	virtual void doDrawModule(const Matrix3D* transformMtx);
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
+	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void setShadowsEnabled(Bool ) { }
 	virtual void setFullyObscuredByShroud(Bool);
@@ -83,6 +80,3 @@ class W3DProjectileStreamDraw : public DrawModule
 	SegmentedLineClass *m_allLines[MAX_PROJECTILE_STREAM];	///< Persist, so I can ensure they live a full cycle, and minimize re-creates by holding on
 	Int m_linesValid;
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h
index fe03b58af29..2756e82c281 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: W3DRopeDraw.h //////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:   
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __W3DRopeDraw_H_
-#define __W3DRopeDraw_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "WW3D2/line3d.h"
@@ -52,7 +49,7 @@ class W3DRopeDraw : public DrawModule, public RopeDrawInterface
 
 	virtual void doDrawModule(const Matrix3D* transformMtx);
 	virtual void setShadowsEnabled(Bool enable) { }
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
+	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void setFullyObscuredByShroud(Bool fullyObscured) { }
 	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle) { }
@@ -80,8 +77,8 @@ class W3DRopeDraw : public DrawModule, public RopeDrawInterface
 	Real m_maxLen;								///< length of rope
 	Real m_width;									///< width of rope
 	RGBColor m_color;							///< color of rope
-	Real m_curSpeed;	
-	Real m_maxSpeed;	
+	Real m_curSpeed;
+	Real m_maxSpeed;
 	Real m_accel;
 	Real m_wobbleLen;
 	Real m_wobbleAmp;
@@ -93,6 +90,3 @@ class W3DRopeDraw : public DrawModule, public RopeDrawInterface
 	void buildSegments();
 
 };
-
-#endif // __W3DRopeDraw_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
index 12c5d5a48a7..fac32b29a60 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3D_SCIENCE_MODEL_DRAW_H_
-#define _W3D_SCIENCE_MODEL_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 
@@ -54,7 +51,7 @@ class W3DScienceModelDraw : public W3DModelDraw
 
  	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DScienceModelDraw, "W3DScienceModelDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DScienceModelDraw, W3DScienceModelDrawModuleData )
-		
+
 public:
 
 	W3DScienceModelDraw( Thing *thing, const ModuleData* moduleData );
@@ -63,6 +60,3 @@ class W3DScienceModelDraw : public W3DModelDraw
 
 protected:
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h
index b8cfe58fe19..46b41a8617d 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3D_SUPPLY_DRAW_H_
-#define _W3D_SUPPLY_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 
@@ -52,7 +49,7 @@ class W3DSupplyDraw : public W3DModelDraw
 
  	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DSupplyDraw, "W3DSupplyDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DSupplyDraw, W3DSupplyDrawModuleData )
-		
+
 public:
 
 	W3DSupplyDraw( Thing *thing, const ModuleData* moduleData );
@@ -65,6 +62,3 @@ class W3DSupplyDraw : public W3DModelDraw
 	Int m_totalBones;
 	Int m_lastNumberShown;
 };
-
-#endif // _W3D_TRUCK_DRAW_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h
index f0dcbe1941b..2c659194a9f 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3D_TANK_DRAW_H_
-#define _W3D_TANK_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "GameClient/ParticleSys.h"
@@ -62,7 +59,7 @@ class W3DTankDraw : public W3DModelDraw
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DTankDraw, "W3DTankDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DTankDraw, W3DTankDrawModuleData )
-		
+
 public:
 
 	W3DTankDraw( Thing *thing, const ModuleData* moduleData );
@@ -105,6 +102,3 @@ class W3DTankDraw : public W3DModelDraw
 	void updateTreadObjects(void);												///< update pointers to sub-objects like treads.
 	void updateTreadPositions(Real uvDelta);									///< update uv coordinates on each tread
 };
-
-#endif // _W3D_TANK_DRAW_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h
index 01b3d48cfba..5bfc523f4af 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3D_TANKTRUCK_DRAW_H_
-#define _W3D_TANKTRUCK_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "Common/AudioEventRTS.h"
@@ -81,7 +78,7 @@ class W3DTankTruckDraw : public W3DModelDraw
 
  	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DTankTruckDraw, "W3DTankTruckDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DTankTruckDraw, W3DTankTruckDrawModuleData )
-		
+
 public:
 
 	W3DTankTruckDraw( Thing *thing, const ModuleData* moduleData );
@@ -152,6 +149,3 @@ class W3DTankTruckDraw : public W3DModelDraw
 	void updateTreadObjects(void);												///< update pointers to sub-objects like treads.
 	void updateTreadPositions(Real uvDelta);									///< update uv coordinates on each tread
 };
-
-#endif // _W3D_TANKTRUCK_DRAW_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
index 4dfa987bd62..cfbb2f81bac 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h
@@ -23,15 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: W3DTracerDraw.h //////////////////////////////////////////////////////////////////////////
-// Author: 
-// Desc:   
+// Author:
+// Desc:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __W3DTRACERDRAW_H_
-#define __W3DTRACERDRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "WW3D2/line3d.h"
@@ -52,7 +49,7 @@ class W3DTracerDraw : public DrawModule, public TracerDrawInterface
 
 	virtual void doDrawModule(const Matrix3D* transformMtx);
 	virtual void setShadowsEnabled(Bool enable) { }
-	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.	
+	virtual void releaseShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void allocateShadows(void) {};	///< we don't care about preserving temporary shadows.
 	virtual void setFullyObscuredByShroud(Bool fullyObscured) { }
 	virtual void reactToTransformChange(const Matrix3D* oldMtx, const Coord3D* oldPos, Real oldAngle);
@@ -73,6 +70,3 @@ class W3DTracerDraw : public DrawModule, public TracerDrawInterface
 	Real m_opacity;								///< opacity of the tracer
 
 };
-
-#endif // __W3DTRACERDRAW_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
index 48b6a29fbfd..72e8d49bee8 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3D_TRUCK_DRAW_H_
-#define _W3D_TRUCK_DRAW_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/DrawModule.h"
 #include "Common/AudioEventRTS.h"
@@ -84,7 +81,7 @@ class W3DTruckDraw : public W3DModelDraw
 
  	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( W3DTruckDraw, "W3DTruckDraw" )
 	MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA( W3DTruckDraw, W3DTruckDrawModuleData )
-		
+
 public:
 
 	W3DTruckDraw( Thing *thing, const ModuleData* moduleData );
@@ -141,6 +138,3 @@ class W3DTruckDraw : public W3DModelDraw
 	void enableEmitters( Bool enable );						///< stop creating debris from the tank treads
 	void updateBones( void );
 };
-
-#endif // _W3D_TRUCK_DRAW_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h
deleted file mode 100644
index b8bf54770ef..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// TerrainTex.h
-// Class to generate texture for terrain.
-// Author: John Ahlquist, April 2001
-
-#pragma once
-
-#ifndef TERRAINTEX_H
-#define TERRAINTEX_H
-
-//#define DO_8STAGE_TERRAIN_PASS		//optimized terrain rendering for Nvidia based cards
-
-#include "WW3D2/texture.h"
-#include "WWMath/matrix3d.h"
-#include "Common/AsciiString.h"
-
-class WorldHeightMap;
-#define TILE_OFFSET 8
-/** ***********************************************************************
-**                             TerrainTextureClass
-***************************************************************************/
-class TerrainTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(TerrainTextureClass)
-protected:
-	virtual void Apply(unsigned int stage);
-
-public:
-		/// Create texture for a height map.
-		TerrainTextureClass(int height);
-
-		/// Create texture for a height map.
-		TerrainTextureClass(int height, int width);
-
-		// just use default destructor. ~TerrainTextureClass(void);
-public:
-	int update(WorldHeightMap *htMap); ///< Sets the pixels, and returns the actual height of the texture.
-	Bool updateFlat(WorldHeightMap *htMap, Int xCell, Int yCell, Int cellWidth, Int pixelsPerCell); ///< Sets the pixels.
-	void setLOD(Int LOD);
-};
-
-
-class AlphaTerrainTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(AlphaTerrainTextureClass)
-protected:
-		virtual void Apply(unsigned int stage);
-public:
-		// Create texture for a height map.
-		AlphaTerrainTextureClass(TextureClass *pBaseTex );
-
-		// just use default destructor. ~TerrainTextureClass(void);
-
-};
-
-/** ***********************************************************************
-**                             AlphaEdgeTextureClass
-***************************************************************************/
-class AlphaEdgeTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(AlphaEdgeTextureClass)
-protected:
-	virtual void Apply(unsigned int stage);
-	int update256(WorldHeightMap *htMap);///< Sets the pixels, and returns the actual height of the texture.
-
-public:
-		/// Create texture for a height map.
-		AlphaEdgeTextureClass(int height, MipCountType mipLevelCount = MIP_LEVELS_3 );
-
-		// just use default destructor. ~TerrainTextureClass(void);
-public:
-	int update(WorldHeightMap *htMap); ///< Sets the pixels, and returns the actual height of the texture.
-
-};
-
-class LightMapTerrainTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(LightMapTerrainTextureClass)
-protected:
-		virtual void Apply(unsigned int stage);
-
-public:
-		// Create texture from a height map.
-		LightMapTerrainTextureClass( AsciiString name, MipCountType mipLevelCount = MIP_LEVELS_ALL );
-
-		// just use default destructor. 
-};
-
-class ScorchTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(ScorchTextureClass)
-protected:
-		virtual void Apply(unsigned int stage);
-
-public:
-		// Create texture.
-		ScorchTextureClass( MipCountType mipLevelCount = MIP_LEVELS_3 );
-
-		// just use default destructor. ~ScorchTextureClass(void);
-};
-
-class CloudMapTerrainTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(CloudMapTerrainTextureClass)
-protected:
-		virtual void Apply(unsigned int stage);
-
-protected:
-		float m_xSlidePerSecond ;	 ///< How far the clouds move per second.
-		float m_ySlidePerSecond ;	 ///< How far the clouds move per second.
-		int	  m_curTick;
-		float m_xOffset;
-		float m_yOffset;
-
-
-public:
-		// Create texture from a height map.
-		CloudMapTerrainTextureClass( MipCountType mipLevelCount = MIP_LEVELS_ALL );
-
-		// just use default destructor. ~TerrainTextureClass(void);
-
-		void restore(void);
-};
-
-
-
-#endif //TEXTURE_H
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h
deleted file mode 100644
index e843c989c7c..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// TileData.h
-// Class to hold 1 tile's data.
-// Author: John Ahlquist, April 2001
-
-#pragma once
-
-#ifndef TileData_H
-#define TileData_H
-
-#include <stdio.h>
-
-#include "Lib/BaseType.h"
-#include "WWLib/refcount.h"
-#include "Common/AsciiString.h"
-
-typedef struct {
-	Int blendNdx;
-	UnsignedByte horiz;
-	UnsignedByte vert;
-	UnsignedByte rightDiagonal;
-	UnsignedByte leftDiagonal;
-	UnsignedByte inverted;
-	UnsignedByte longDiagonal;
-	Int customBlendEdgeClass; // Class of texture for a blend edge.  -1 means use alpha. 
-} TBlendTileInfo;
-
-#define INVERTED_MASK	0x1		//AND this with TBlendTileInfo.inverted to get actual inverted state
-#define FLIPPED_MASK	0x2		//AND this with TBlendTileInfo.inverted to get forced flip state (for horizontal/vertical flips).
-#define TILE_PIXEL_EXTENT 64
-#define TILE_BYTES_PER_PIXEL 4
-#define DATA_LEN_BYTES TILE_PIXEL_EXTENT*TILE_PIXEL_EXTENT*TILE_BYTES_PER_PIXEL
-#define DATA_LEN_PIXELS TILE_PIXEL_EXTENT*TILE_PIXEL_EXTENT
-#define TILE_PIXEL_EXTENT_MIP1 32
-#define TILE_PIXEL_EXTENT_MIP2 16
-#define TILE_PIXEL_EXTENT_MIP3 8
-#define TILE_PIXEL_EXTENT_MIP4 4
-#define TILE_PIXEL_EXTENT_MIP5 2
-#define TILE_PIXEL_EXTENT_MIP6 1
-#define TEXTURE_WIDTH 2048 // was 1024 jba
-
-/** This class holds the bitmap data from the .tga texture files.  It is used to 
-create the D3D texture in the game and 3d windows, and to create DIB data for the 
-2d window. */
-class TileData : public RefCountClass
-{
-protected: 
-
-	// data is bgrabgrabgra to be compatible with windows blt. jba.
-	// Also, first byte is lower left pixel, not upper left pixel.
-	// so 0,0 is lower left, not upper left.
-	UnsignedByte m_tileData[DATA_LEN_BYTES];
-	/// Mipped down copies of the tile data.
-	UnsignedByte m_tileDataMip32[TILE_PIXEL_EXTENT_MIP1*TILE_PIXEL_EXTENT_MIP1*TILE_BYTES_PER_PIXEL];
-	UnsignedByte m_tileDataMip16[TILE_PIXEL_EXTENT_MIP2*TILE_PIXEL_EXTENT_MIP2*TILE_BYTES_PER_PIXEL];
-	UnsignedByte m_tileDataMip8[TILE_PIXEL_EXTENT_MIP3*TILE_PIXEL_EXTENT_MIP3*TILE_BYTES_PER_PIXEL];
-	UnsignedByte m_tileDataMip4[TILE_PIXEL_EXTENT_MIP4*TILE_PIXEL_EXTENT_MIP4*TILE_BYTES_PER_PIXEL];
-	UnsignedByte m_tileDataMip2[TILE_PIXEL_EXTENT_MIP5*TILE_PIXEL_EXTENT_MIP5*TILE_BYTES_PER_PIXEL];
-	UnsignedByte m_tileDataMip1[TILE_PIXEL_EXTENT_MIP6*TILE_PIXEL_EXTENT_MIP6*TILE_BYTES_PER_PIXEL];
-
-public:
-	ICoord2D	m_tileLocationInTexture;
-
-
-protected:
-	/** doMip - generates the next mip level mipping pHiRes down to pLoRes.
-				pLoRes is 1/2 the width of pHiRes, and both are square. */
-	static void doMip(UnsignedByte *pHiRes, Int hiRow, UnsignedByte *pLoRes);
-
-
-
-public:
-	TileData(void);
-
-public:
-	UnsignedByte *getDataPtr(void) {return(m_tileData);};
-	static Int dataLen(void) {return(DATA_LEN_BYTES);};
-	
-	void updateMips(void);
-
-	Bool hasRGBDataForWidth(Int width);
-	UnsignedByte *getRGBDataForWidth(Int width);
-};
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h
index 06e48232761..e987096c35f 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h
@@ -42,12 +42,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef W3DASSETMANAGER_H
-#define W3DASSETMANAGER_H
 
 #include "assetmgr.h"
 #include "Lib/BaseType.h"
@@ -59,7 +54,7 @@ class W3DAssetManager: public WW3DAssetManager
 {
 public:
 	W3DAssetManager(void);
-	virtual ~W3DAssetManager(void);	
+	virtual ~W3DAssetManager(void);
 
 	virtual RenderObjClass * Create_Render_Obj(const char * name);
 	// unique to W3DAssetManager
@@ -68,7 +63,7 @@ class W3DAssetManager: public WW3DAssetManager
 
 	virtual TextureClass *	Get_Texture
 	(
-		const char * filename, 
+		const char * filename,
 		MipCountType mip_level_count=MIP_LEVELS_ALL,
 		WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN,
 		bool allow_compression=true,
@@ -108,10 +103,10 @@ class W3DAssetManager: public WW3DAssetManager
 	int replaceMeshTexture(RenderObjClass *robj, TextureClass *oldTex, TextureClass *newTex);
 
 	//'E&B' customizations
-/*	virtual RenderObjClass * Create_Render_Obj(const char * name, float scale, const Vector3 &hsv_shift);	
+/*	virtual RenderObjClass * Create_Render_Obj(const char * name, float scale, const Vector3 &hsv_shift);
 	TextureClass * Get_Texture_With_HSV_Shift(const char * filename, const Vector3 &hsv_shift, TextureClass::MipCountType mip_level_count = TextureClass::MIP_LEVELS_ALL);
 	void Recolor_Vertex_Material(VertexMaterialClass *vmat, const Vector3 &hsv_shift);
-	void Recolor_Vertices(unsigned int *color, int count, const Vector3 &hsv_shift);	
+	void Recolor_Vertices(unsigned int *color, int count, const Vector3 &hsv_shift);
 	void Recolor_Mesh(RenderObjClass *robj, const Vector3 &hsv_shift);
 	TextureClass * Recolor_Texture(TextureClass *texture, const Vector3 &hsv_shift);
 	TextureClass * Recolor_Texture_One_Time(TextureClass *texture, const Vector3 &hsv_shift);
@@ -120,6 +115,3 @@ class W3DAssetManager: public WW3DAssetManager
 	void Recolor_ParticleEmitter(RenderObjClass *robj, const Vector3 &hsv_shift);
 	void Recolor_Asset(RenderObjClass *robj, const Vector3 &hsv_shift);*/
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
index fe3c52bbba0..d135069d0e3 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: W3DAssetManagerExposed.h 
+// FILE: W3DAssetManagerExposed.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -38,8 +38,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_W3DASSETMANAGEREXPOSED_
-#define _H_W3DASSETMANAGEREXPOSED_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -52,5 +50,3 @@
 // so this function is here. It should only be called by the particle editor,
 // @todo Remove this function when we are no longer editing particles.
 void ReloadAllTextures(void);
-
-#endif /* _H_W3DASSETMANAGEREXPOSED_ */
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h
index f46e1255b6a..0d900feee89 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DBibBuffer.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,11 +44,8 @@
 
 #pragma once
 
-#ifndef __W3DBIB_BUFFER_H_
-#define __W3DBIB_BUFFER_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "always.h"
 #include "rendobj.h"
@@ -64,7 +61,7 @@
 //-----------------------------------------------------------------------------
 //           Forward References
 //-----------------------------------------------------------------------------
-class MeshClass; 
+class MeshClass;
 
 //-----------------------------------------------------------------------------
 //           Type Defines
@@ -84,8 +81,8 @@ typedef struct {
 // W3DBibBuffer: Draw buffer for the bibs.
 //
 //
-class W3DBibBuffer 
-{	
+class W3DBibBuffer
+{
 friend class BaseHeightMapRenderObjClass;
 public:
 
@@ -101,13 +98,13 @@ friend class BaseHeightMapRenderObjClass;
 	void clearAllBibs(void);
 	/// Removes highlighting.
 	void removeHighlighting(void);
-	/// Draws the bibs.  
+	/// Draws the bibs.
 	void renderBibs();
 	/// Called when the view changes, and sort key needs to be recalculated.
 	/// Normally sortKey gets calculated when a bib becomes visible.
 protected:
-	enum { INITIAL_BIB_VERTEX=256, 
-					INITIAL_BIB_INDEX=384, 
+	enum { INITIAL_BIB_VERTEX=256,
+					INITIAL_BIB_INDEX=384,
 					MAX_BIBS=1000};
 	DX8VertexBufferClass	*m_vertexBib;	///<Bib vertex buffer.
 	Int										m_vertexBibSize; ///< Num vertices in bib buffer.
@@ -131,5 +128,3 @@ friend class BaseHeightMapRenderObjClass;
 	void allocateBibBuffers(void);							 ///< Allocates the buffers.
 	void freeBibBuffers(void);									 ///< Frees the index and vertex buffers.
 };
-
-#endif  // end __W3DBIB_BUFFER_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h
index d14ddf76c62..12531a7d123 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DBridgeBuffer.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,11 +44,8 @@
 
 #pragma once
 
-#ifndef __W3DBRIDGE_BUFFER_H_
-#define __W3DBRIDGE_BUFFER_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "always.h"
 #include "rendobj.h"
@@ -65,23 +62,24 @@
 //-----------------------------------------------------------------------------
 //           Forward References
 //-----------------------------------------------------------------------------
-class MeshClass; 
+class MeshClass;
 class W3DTerrainLogic;
 class W3DAssetManager;
 class SimpleSceneClass;
+enum BodyDamageType CPP_11(: Int);
 
 //-----------------------------------------------------------------------------
 //           Type Defines
 //-----------------------------------------------------------------------------
 
 typedef enum {
-	FIXED_BRIDGE = 0, 
-	SECTIONAL_BRIDGE = 1 
+	FIXED_BRIDGE = 0,
+	SECTIONAL_BRIDGE = 1
 } TBridgeType;
 
 class BridgeInfo;
 /// The individual data for a bridge.
-class W3DBridge 
+class W3DBridge
 {
 protected:
 	Vector3 m_start;						///< Drawing location
@@ -111,15 +109,15 @@ class W3DBridge
 	Int				m_numPolygons;		///< Number of polygons to draw.
 	Bool			m_visible;
 	AsciiString m_templateName;					///< Name of the bridge type.
-	enum BodyDamageType m_curDamageState;
+	BodyDamageType m_curDamageState;
 	Bool			m_enabled;
 
 protected:
 	Int getModelVerticesFixed(VertexFormatXYZNDUV1 *destination_vb, Int curVertex, const Matrix3D &mtx, MeshClass *pMesh, RefRenderObjListIterator *pLightsIterator);
 	Int getModelIndices(UnsignedShort *destination_ib, Int curIndex, Int vertexOffset, MeshClass *pMesh);
 	Int getModelVertices(VertexFormatXYZNDUV1 *destination_vb, Int curVertex,  Real xOffset,
-																Vector3 &vec, Vector3 &vecNormal, Vector3 &vecZ, Vector3 &offset, 
-																const Matrix3D &mtx, 
+																Vector3 &vec, Vector3 &vecNormal, Vector3 &vecZ, Vector3 &offset,
+																const Matrix3D &mtx,
 																MeshClass *pMesh, RefRenderObjListIterator *pLightsIterator);
 
 public:
@@ -130,9 +128,9 @@ class W3DBridge
 	AsciiString getTemplateName(void) {return m_templateName;}
 	const Vector3* getStart(void) const {return &m_start;}
 	const Vector3* getEnd(void) const { return &m_end;}
-	Bool load(enum BodyDamageType curDamageState);
-	enum BodyDamageType getDamageState(void) {return m_curDamageState;};
-	void setDamageState(enum BodyDamageType state) { m_curDamageState = state;};
+	Bool load(BodyDamageType curDamageState);
+	BodyDamageType getDamageState(void) {return m_curDamageState;};
+	void setDamageState(BodyDamageType state) { m_curDamageState = state;};
 	void getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatXYZNDUV1 *destination_vb, Int *curIndexP, Int *curVertexP, RefRenderObjListIterator *pLightsIterator);
 	Bool cullBridge(CameraClass * camera);						 ///< Culls the bridges.  Returns true if visibility changed.
 	void clearBridge(void);		///< Frees all objects associated with a bridge.
@@ -147,8 +145,8 @@ class W3DBridge
 // W3DBridgeBuffer: Draw buffer for the bridges.
 //
 //
-class W3DBridgeBuffer 
-{	
+class W3DBridgeBuffer
+{
 friend class BaseHeightMapRenderObjClass;
 public:
 
@@ -165,7 +163,7 @@ friend class BaseHeightMapRenderObjClass;
 	void worldBuilderUpdateBridgeTowers( W3DAssetManager *assetManager, SimpleSceneClass *scene );			///< for the editor and showing visual bridge towers
 	void updateCenter(CameraClass *camera, RefRenderObjListIterator *pLightsIterator);
 	enum { MAX_BRIDGE_VERTEX=12000, //make sure it stays under 65535
-					MAX_BRIDGE_INDEX=2*MAX_BRIDGE_VERTEX,	//make sure it stays under 65535 
+					MAX_BRIDGE_INDEX=2*MAX_BRIDGE_VERTEX,	//make sure it stays under 65535
 					MAX_BRIDGES=200};
 protected:
 	DX8VertexBufferClass	*m_vertexBridge;	///<Bridge vertex buffer.
@@ -186,5 +184,3 @@ friend class BaseHeightMapRenderObjClass;
 	void cull(CameraClass * camera);						 ///< Culls the bridges.
 	void freeBridgeBuffers(void);									 ///< Frees the index and vertex buffers.
 };
-
-#endif  // end __W3DBRIDGE_BUFFER_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h
index fdb0a220421..dbe3f4c491e 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h
@@ -29,23 +29,29 @@
 
 #pragma once
 
-#ifndef _W3D_VERTEX_BUFFER_MANAGER
-#define _W3D_VERTEX_BUFFER_MANAGER
-
 #include "Lib/BaseType.h"
 #include "dx8vertexbuffer.h"
 #include "dx8indexbuffer.h"
 
-#define MAX_VB_SIZES 128	//number of different sized VB slots allowed.
-#define MIN_SLOT_SIZE	32	//minimum number of vertices allocated per slot (power of 2). See also MIN_SLOT_SIZE_SHIFT.
-#define	MIN_SLOT_SIZE_SHIFT	5 //used for division by MIN_SLOT_SIZE
-#define MAX_VERTEX_BUFFERS_CREATED	32	//maximum number of D3D vertex buffers allowed to create per vertex type.
-#define DEFAULT_VERTEX_BUFFER_SIZE	8192	//this size ends up generating VB's of about 256Kbytes
-#define MAX_NUMBER_SLOTS	4096			//maximum number of slots that can be allocated.
-
+// TheSuperHackers @info The max sizes correspond to a number of vertices and indices of a mesh casting shadows
+// in the scene. The more vertices the meshes are supposed to have, the higher these limits need to be.
+// Multiplying these numbers by MIN_SLOT_SIZE gives the max supported amount of vertices and indices.
+#define MAX_VB_SIZES 128 //number of different sized VB slots allowed.
 #define MAX_IB_SIZES 128 //number of different sized IB slots allowed (goes all the way up to 65536)
-#define MAX_INDEX_BUFFERS_CREATED	32
-#define DEFAULT_INDEX_BUFFER_SIZE	32768	
+
+#define MIN_SLOT_SIZE_SHIFT 5 //used for division by MIN_SLOT_SIZE
+#define MIN_SLOT_SIZE (1 << MIN_SLOT_SIZE_SHIFT) //minimum number of vertices allocated per slot (power of 2).
+
+// TheSuperHackers @info The number of slots corresponds to number of meshes casting shadows in the scene.
+// The more meshes there are, the larger the slots needs to be.
+// TheSuperHackers @tweak Double the original sizes to allow for twice as many shadows to be created in the scene.
+#define SLOTS_MULTIPLIER 2
+#define MAX_NUMBER_SLOTS (4096 * SLOTS_MULTIPLIER) //maximum number of slots that can be allocated.
+#define MAX_VERTEX_BUFFERS_CREATED (32 * SLOTS_MULTIPLIER) //maximum number of D3D vertex buffers allowed to create per vertex type.
+#define MAX_INDEX_BUFFERS_CREATED (32 * SLOTS_MULTIPLIER)
+
+#define DEFAULT_VERTEX_BUFFER_SIZE 8192 //this size ends up generating VB's of about 256Kbytes
+#define DEFAULT_INDEX_BUFFER_SIZE 32768
 
 class W3DBufferManager
 {
@@ -176,5 +182,3 @@ class W3DBufferManager
 };
 
 extern W3DBufferManager *TheW3DBufferManager;	//singleton
-
-#endif //_W3D_VERTEX_BUFFER_MANAGER
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h
index 31bc7a2b6a8..0a1037a1c16 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DCustomEdging.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,11 +44,8 @@
 
 #pragma once
 
-#ifndef __W3DCUSTOM_EDGING_H_
-#define __W3DCUSTOM_EDGING_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "always.h"
 #include "rendobj.h"
@@ -74,8 +71,8 @@ class WorldHeightMap;
 // W3DCustomEdging: Draw buffer for the trees.
 //
 //
-class W3DCustomEdging 
-{	
+class W3DCustomEdging
+{
 friend class HeightMapRenderObjClass;
 public:
 
@@ -85,20 +82,20 @@ friend class HeightMapRenderObjClass;
 	/// Empties the tree buffer.
 	void clearAllEdging(void);
 	/// Draws the trees.  Uses camera for culling.
-	void drawEdging( WorldHeightMap *pMap, Int minX, Int maxX, Int minY, Int maxY, 
+	void drawEdging( WorldHeightMap *pMap, Int minX, Int maxX, Int minY, Int maxY,
 		TextureClass * terrainTexture, TextureClass * cloudTexture, TextureClass * noiseTexture );
 	/// Called when the view changes, and sort key needs to be recalculated.
 	/// Normally sortKey gets calculated when a tree becomes visible.
 	void doFullUpdate(void) {clearAllEdging();};
 protected:
 #define MAX_BLENDS 2000
-	enum { MAX_EDGE_VERTEX=4*MAX_BLENDS, 
+	enum { MAX_EDGE_VERTEX=4*MAX_BLENDS,
 					MAX_EDGE_INDEX=6*MAX_BLENDS};
 	DX8VertexBufferClass	*m_vertexEdging;	///<Edging vertex buffer.
 	DX8IndexBufferClass			*m_indexEdging;	///<indices defining a triangles for the tree drawing.
 	Int			m_curNumEdgingVertices; ///<Number of vertices used in m_vertexEdging.
 	Int			m_curNumEdgingIndices;	///<Number of indices used in b_indexEdging;
-	Int			m_curEdgingIndexOffset;	///<First index to draw at.  We draw the trees backwards by filling up the index buffer backwards, 
+	Int			m_curEdgingIndexOffset;	///<First index to draw at.  We draw the trees backwards by filling up the index buffer backwards,
 																// so any trees that don't fit are far away from the camera.
 	Bool		m_anythingChanged;	///< Set to true if visibility or sorting changed.
 	Bool		m_initialized;		///< True if the subsystem initialized.
@@ -107,5 +104,3 @@ friend class HeightMapRenderObjClass;
 	void freeEdgingBuffers(void);									 ///< Frees the index and vertex buffers.
 	void loadEdgingsInVertexAndIndexBuffers(WorldHeightMap *pMap, Int minX, Int maxX, Int minY, Int maxY);
 };
-
-#endif  // end __W3DCUSTOM_EDGING_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h
index f89d348d26a..c92e08077a5 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h
@@ -24,13 +24,8 @@
 
 #pragma once
 
-#ifndef __W3DCUSTOMSCENE_H_
-#define __W3DCUSTOMSCENE_H_
-
 enum CustomScenePassModes CPP_11(: Int)
 {
 	SCENE_PASS_DEFAULT,
 	SCENE_PASS_ALPHA_MASK
 };
-
-#endif //W3DCUSTOMSCENE
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h
index 421a11cf3ae..2cc8e542a8f 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    Generals
@@ -43,12 +43,8 @@
 
 #pragma once
 
-#ifndef __W3DDEVICE_GAMECLIENT_W3DDEBUGDISPLAY_H
-#define __W3DDEVICE_GAMECLIENT_W3DDEBUGDISPLAY_H
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "GameClient/DebugDisplay.h"
@@ -67,7 +63,7 @@ class DisplayString;
 
 
 //===============================
-// W3DDebugDisplay 
+// W3DDebugDisplay
 //===============================
 
 class W3DDebugDisplay : public DebugDisplay
@@ -96,9 +92,5 @@ class W3DDebugDisplay : public DebugDisplay
 
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-
-#endif // __W3DDEVICE_GAMECLIENT_W3DDEBUGDISPLAY_H
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h
index 6bc1242cf69..0bce9582b3d 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h
@@ -22,25 +22,21 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __W3D_DEBUG_ICONS_H_
-#define __W3D_DEBUG_ICONS_H_
-
 #include "always.h"
 #include "rendobj.h"
 #include "vertmaterial.h"
 #include "Lib/BaseType.h"
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 struct DebugIcon;
 //
 /// W3DDebugIcons: Draws huge numbers of debug icons for pathfinding quickly.
 //
 //
 class W3DDebugIcons : public RenderObjClass
-{	
+{
 
 public:
 
@@ -50,7 +46,7 @@ class W3DDebugIcons : public RenderObjClass
 	~W3DDebugIcons(void);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
@@ -64,7 +60,7 @@ class W3DDebugIcons : public RenderObjClass
 protected:
 	VertexMaterialClass	  	*m_vertexMaterialClass;
 
-protected: 
+protected:
 	static DebugIcon				*m_debugIcons;
 	static Int							m_numDebugIcons;
 
@@ -76,6 +72,4 @@ class W3DDebugIcons : public RenderObjClass
 public:
 	static void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color);
 };
-#endif // RTS_DEBUG or RTS_INTERNAL
-
-#endif  // end __W3D_DEBUG_ICONS_H_
+#endif // RTS_DEBUG
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h
index 132596da91d..7f5ad9f1748 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef __W3DDISPLAY_H_
-#define __W3DDISPLAY_H_
-
 #include "GameClient/Display.h"
 #include "WW3D2/lightenvironment.h"
 
@@ -52,7 +49,7 @@ class RTS3DInterfaceScene;
 
 //=============================================================================
 /** W3D implementation of the game display which is responsible for creating
-  * all interaction with the screen and updating the display 
+  * all interaction with the screen and updating the display
 	*/
 class W3DDisplay : public Display
 {
@@ -71,7 +68,7 @@ class W3DDisplay : public Display
 	virtual void getDisplayModeDescription(Int modeIndex, Int *xres, Int *yres, Int *bitDepth);	///<return description of mode
  	virtual void setGamma(Real gamma, Real bright, Real contrast, Bool calibrate);
 	virtual void doSmartAssetPurgeAndPreload(const char* usageFileName);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void dumpAssetUsage(const char* mapname);
 #endif
 
@@ -81,20 +78,21 @@ class W3DDisplay : public Display
 	virtual Bool	isClippingEnabled( void ) 	{ return m_isClippedEnabled; }
 	virtual void	enableClipping( Bool onoff )		{ m_isClippedEnabled = onoff; }
 
+	virtual void step(); ///< Do one fixed time step
 	virtual void draw( void );  ///< redraw the entire display
 
 	/// @todo Replace these light management routines with a LightManager singleton
-	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real outerRadius, 
-																 UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE 
+	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real outerRadius,
+																 UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE
 																 );
 	virtual void setTimeOfDay ( TimeOfDay tod );
 
 	/// draw a line on the display in screen coordinates
-	virtual void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
 												 Real lineWidth, UnsignedInt lineColor );
 
 	/// draw a line on the display in screen coordinates
-	virtual void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
 												 Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 );
 
 	/// draw a rect border on the display in pixel coordinates with the specified color
@@ -102,9 +100,9 @@ class W3DDisplay : public Display
 														 Real lineWidth, UnsignedInt lineColor );
 
 	/// draw a filled rect on the display in pixel coords with the specified color
-	virtual void drawFillRect( Int startX, Int startY, Int width, Int height, 
+	virtual void drawFillRect( Int startX, Int startY, Int width, Int height,
 														 UnsignedInt color );
-	
+
 	/// Draw a percentage of a rectangle, much like a clock (0 to x%)
 	virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color);
 
@@ -112,11 +110,12 @@ class W3DDisplay : public Display
 	virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color);
 
 	/// draw an image fit within the screen coordinates
-	virtual void drawImage( const Image *image, Int startX, Int startY, 
+	virtual void drawImage( const Image *image, Int startX, Int startY,
 													Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA);
 
 	/// draw a video buffer fit within the screen coordinates
-	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY, 
+	virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream );
+	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY,
 													Int endX, Int endY );
 
 	virtual VideoBuffer*	createVideoBuffer( void ) ;							///< Create a video buffer that can be used for this display
@@ -133,7 +132,7 @@ class W3DDisplay : public Display
 	virtual void clearShroud();
 	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting);
 	virtual void setBorderShroudLevel(UnsignedByte level);	///<color that will appear in unused border terrain.
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void dumpModelAssets(const char *path);	///< dump all used models/textures to a file.
 #endif
 	virtual void preloadModelAssets( AsciiString model );			///< preload model asset
@@ -146,7 +145,8 @@ class W3DDisplay : public Display
 	static W3DAssetManager *m_assetManager;		///< W3D asset manager
 
 	void drawFPSStats( void );								///< draw the fps on the screen
-	virtual Real getAverageFPS( void );								///< return the average FPS.
+	virtual Real getAverageFPS( void );						///< return the average FPS.
+	virtual Real getCurrentFPS( void );						///< return the current FPS.
 	virtual Int getLastFrameDrawCalls( void );				///< returns the number of draw calls issued in the previous frame
 
 protected:
@@ -159,7 +159,7 @@ class W3DDisplay : public Display
 	void drawCurrentDebugDisplay( void );			///< draws current debug display
 	void calculateTerrainLOD(void);						///< Calculate terrain LOD.
 	void renderLetterBox(UnsignedInt time);							///< draw letter box border
-	void updateAverageFPS(void);	///< figure out the average fps over the last 30 frames.
+	void updateAverageFPS(void);	///< calculate the average fps over the last 30 frames.
 
 	Byte m_initialized;												///< TRUE when system is initialized
 	LightClass *m_myLight[LightEnvironmentClass::MAX_LIGHTS];										///< light hack for now
@@ -167,7 +167,8 @@ class W3DDisplay : public Display
 	IRegion2D m_clipRegion;									///< the clipping region for images
 	Bool m_isClippedEnabled;	///<used by 2D drawing operations to define clip re
 	Real m_averageFPS;		///<average fps over the last 30 frames.
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	Real m_currentFPS;		///<current fps value.
+#if defined(RTS_DEBUG)
 	Int64 m_timerAtCumuFPSStart;
 #endif
 
@@ -198,6 +199,4 @@ class W3DDisplay : public Display
 
 	W3DDebugDisplay *m_nativeDebugDisplay;		///< W3D specific debug display interface
 
-};  // end W3DDisplay
-
-#endif  // end __W3DDISPLAY_H_
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h
index 1be3c0a6b09..69b4c8acf80 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DDisplayString.h ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -47,9 +47,6 @@
 
 #pragma once
 
-#ifndef __W3DDISPLAYSTRING_H_
-#define __W3DDISPLAYSTRING_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -119,6 +116,3 @@ class W3DDisplayString : public DisplayString
 inline void W3DDisplayString::usingResources( UnsignedInt frame ) { m_lastResourceFrame = frame; }
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __W3DDISPLAYSTRING_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h
index 9f157413fc4..2c1e775d65f 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3DDISPLAYSTRINGMANAGER_H_
-#define _W3DDISPLAYSTRINGMANAGER_H_
-
 #include "GameClient/DisplayStringManager.h"
 #include "W3DDevice/GameClient/W3DDisplayString.h"
 
@@ -65,8 +62,8 @@ class W3DDisplayStringManager : public DisplayStringManager
 
 	/// free a display string
 	virtual void freeDisplayString( DisplayString *string );
-	
-	// This is used to save us a few FPS and storage space. There's no reason to 
+
+	// This is used to save us a few FPS and storage space. There's no reason to
 	// duplicate the DisplayString on every drawable when 1 copy will suffice.
 	virtual DisplayString *getGroupNumeralString( Int numeral );
 	virtual DisplayString *getFormationLetterString( void ) { return m_formationLetterDisplayString; };
@@ -76,6 +73,3 @@ class W3DDisplayStringManager : public DisplayStringManager
 	DisplayString *m_formationLetterDisplayString;
 
 };
-
-#endif // _W3DDISPLAYSTRINGMANAGER_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h
index b9975bafd2b..4039f982810 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h
@@ -28,9 +28,6 @@
 
 #pragma once
 
-#ifndef W3D_DYNAMIC_LIGHT_H
-#define W3D_DYNAMIC_LIGHT_H
-
 #include "WW3D2/light.h"
 #include "Lib/BaseType.h"
 class HeightMapRenderObjClass;
@@ -46,7 +43,7 @@ friend class HeightMapRenderObjClass;
 	/// Values used by HeightMapRenderObjClass to update the height map.
 	Bool		m_priorEnable;
 	Bool		m_processMe;
-	
+
 
 	Int			m_prevMinX, m_prevMinY, m_prevMaxX, m_prevMaxY;
 	Int			m_minX, m_minY, m_maxX, m_maxY;
@@ -69,7 +66,7 @@ friend class HeightMapRenderObjClass;
 	~W3DDynamicLight(void);
 
 public:
-	virtual void					On_Frame_Update(void); 
+	virtual void					On_Frame_Update(void);
 
 	void setEnabled(Bool enabled) { m_enabled = enabled; m_decayRange = false; m_decayFrameCount = 0; m_decayColor = false; m_increaseFrameCount = 0;};
 	Bool isEnabled(void) {return m_enabled;};
@@ -82,7 +79,3 @@ friend class HeightMapRenderObjClass;
 	// Cull returns true if the terrain vertex at x,y is outside of the light's influence.
 	Bool cull(Int x, Int y ) {return (x<m_minX||y<m_minY||x>m_maxX||y>m_maxY);}
 };
-
-
-
-#endif //TEXTURE_H
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h
index 304c78803c0..118b2307f62 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h
@@ -24,22 +24,17 @@
 
 // FILE: W3DFileSystem.h ////////////////////////////////////////////////////////
 //
-// W3D implementation of a file factory.  Uses GDI assets, so that 
+// W3D implementation of a file factory.  Uses GDI assets, so that
 // W3D files and targa files are loaded using the GDI file interface.
 //
 // Author: John Ahlquist, Sept 2001
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef __W3DFILESYSTEM_H_
-#define __W3DFILESYSTEM_H_
 
 #include "WWLib/ffactory.h"
+#include "Common/ArchiveFileSystem.h"
 #include "Common/file.h"
 
 //-------------------------------------------------------------------------------------------------
@@ -93,7 +88,11 @@ class	W3DFileSystem : public FileFactoryClass {
 
 	virtual FileClass * Get_File( char const *filename );
 	virtual void Return_File( FileClass *file );
+
+private:
+
+	static void reprioritizeTexturesBySize();
+	static void reprioritizeTexturesBySize(ArchivedDirectoryInfo& dirInfo);
 };
 
 extern W3DFileSystem *TheW3DFileSystem;
-#endif
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h
index 79f4e6c741d..7a31839f3d3 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h
@@ -30,9 +30,6 @@
 
 #pragma once
 
-#ifndef __W3DGUICALLBACKS_H_
-#define __W3DGUICALLBACKS_H_
-
 class GameWindow;
 class WindowLayout;
 class WinInstanceData;
@@ -67,6 +64,3 @@ extern void W3DNoDraw( GameWindow *window, WinInstanceData *instData );
 extern void W3DDrawMapPreview( GameWindow *window, WinInstanceData *instData );
 
 void W3DMainMenuInit( WindowLayout *layout, void *userData );
-
-#endif // __W3DGUICALLBACKS_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h
index 8bbd396afd5..f64935057fe 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DGadget.h //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __W3DGADGET_H_
-#define __W3DGADGET_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -89,6 +86,3 @@ extern void W3DGadgetStaticTextDraw( GameWindow *window, WinInstanceData *instDa
 extern void W3DGadgetStaticTextImageDraw( GameWindow *window, WinInstanceData *instData );
 extern void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData );
 extern void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData );
-
-#endif // __W3DGADGET_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h
index 5d85ba38aef..8e9060e82b5 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h
@@ -24,7 +24,7 @@
 
 // FILE: W3DGameClient.h ///////////////////////////////////////////////////
 //
-// W3D implementation of the game interface.  The GameClient is 
+// W3D implementation of the game interface.  The GameClient is
 // responsible for maintaining our drawbles, handling our GUI, and creating
 // the display ... basically the Client if this were a Client/Server game.
 //
@@ -34,9 +34,6 @@
 
 #pragma once
 
-#ifndef __W3DGAMEINTERFACE_H_
-#define __W3DGAMEINTERFACE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -78,12 +75,12 @@ class W3DGameClient : public GameClient
 	virtual ~W3DGameClient();
 
 	/// given a type, create a drawable
-	virtual Drawable *friend_createDrawable( const ThingTemplate *thing, DrawableStatus statusBits = DRAWABLE_STATUS_NONE );
+	virtual Drawable *friend_createDrawable( const ThingTemplate *thing, DrawableStatusBits statusBits = DRAWABLE_STATUS_DEFAULT );
 
 	virtual void init( void );		///< initialize resources
 	virtual void update( void );  ///< per frame update
 	virtual void reset( void );   ///< reset system
-		
+
 	virtual void addScorch(const Coord3D *pos, Real radius, Scorches type);
 	virtual void createRayEffectByTemplate( const Coord3D *start, const Coord3D *end, const ThingTemplate* tmpl );  ///< create effect needing start and end location
 	//virtual Bool getBonePos(Drawable *draw, AsciiString boneName, Coord3D* pos, Matrix3D* transform) const;
@@ -92,7 +89,7 @@ class W3DGameClient : public GameClient
 
 	//---------------------------------------------------------------------------
 	virtual void setTeamColor( Int red, Int green, Int blue );  ///< @todo superhack for demo, remove!!!
-	virtual void adjustLOD( Int adj ); ///< @todo hack for evaluation, remove.
+	virtual void setTextureLOD( Int level );
 	virtual void notifyTerrainObjectMoved(Object *obj);
 
 protected:
@@ -104,7 +101,7 @@ class W3DGameClient : public GameClient
 	virtual Display *createGameDisplay( void ) { return NEW W3DDisplay; }
 
 	/// factory for creating TheInGameUI
-	virtual InGameUI *createInGameUI( void ) { return NEW W3DInGameUI; }	
+	virtual InGameUI *createInGameUI( void ) { return NEW W3DInGameUI; }
 
 	/// factory for creating the window manager
 	virtual GameWindowManager *createWindowManager( void ) { return NEW W3DGameWindowManager; }
@@ -127,7 +124,7 @@ class W3DGameClient : public GameClient
 
 	virtual void setFrameRate(Real msecsPerFrame) { TheW3DFrameLengthInMsec = msecsPerFrame; }
 
-};  // end class W3DGameClient
+};
 
 inline Keyboard *W3DGameClient::createKeyboard( void ) { return NEW DirectInputKeyboard; }
 inline Mouse *W3DGameClient::createMouse( void )
@@ -137,5 +134,3 @@ inline Mouse *W3DGameClient::createMouse( void )
 	TheWin32Mouse = mouse;   ///< global cheat for the WndProc()
 	return mouse;
 }
-
-#endif  // end __W3DGAMEINTERFACE_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h
index 471a923934e..275d243bfdd 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DGameFont.h ////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __W3DGAMEFONT_H_
-#define __W3DGAMEFONT_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -75,11 +72,8 @@ class W3DFontLibrary : public FontLibrary
 	/// release the font data pointer
 	void releaseFontData( GameFont *font );
 
-};  // end W3DFontLibrary
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __W3DGAMEFONT_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h
index e2a7c34c7a0..8895e0ecc86 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DGameWindow.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __W3DGAMEWINDOW_H_
-#define __W3DGAMEWINDOW_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -63,7 +60,7 @@
 // ----------------------------------------------------------------------------
 class W3DGameWindow : public GameWindow
 {
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(W3DGameWindow, "W3DGameWindow")		
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(W3DGameWindow, "W3DGameWindow")
 
 public:
 
@@ -75,13 +72,13 @@ class W3DGameWindow : public GameWindow
 	void winDrawBorder( void );
 
 	Int winSetPosition( Int x, Int y );  ///< set window position
-	Int winSetText( UnicodeString newText );  ///< set text string	
+	Int winSetText( UnicodeString newText );  ///< set text string
 	void winSetFont( GameFont *font );  ///< set font for window
 
 	void getTextSize( Int *width, Int *height );  ///< get size of text
 	void setTextLoc( Int x, Int y );  ///< set text screen coord loc
 	void drawText( Color color );  ///< draw text in the text renderer
-		
+
 protected:
 
 	/// helper function to draw borders
@@ -93,13 +90,10 @@ class W3DGameWindow : public GameWindow
 	Bool m_needPolyDraw;  ///< TRUE need to redo the text polys
 	Bool m_newTextPos;  ///< TRUE when our window has moved and we need a new text pos
 
-};  // end class W3DGameWindow
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-extern void W3DGameWinDefaultDraw( GameWindow *window, 
+extern void W3DGameWinDefaultDraw( GameWindow *window,
 																	 WinInstanceData *instData );
-
-#endif // __W3DGAMEWINDOW_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h
index 8e0791f9564..02e98a219f5 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h
@@ -31,9 +31,6 @@
 
 #pragma once
 
-#ifndef __W3DGAMEWINDOWMANAGER_H_
-#define __W3DGAMEWINDOWMANAGER_H_
-
 #include "GameClient/GameWindowManager.h"
 #include "W3DDevice/GameClient/W3DGameWindow.h"
 #include "W3DDevice/GameClient/W3DGadget.h"
@@ -80,7 +77,7 @@ class W3DGameWindowManager : public GameWindowManager
 
 protected:
 
-};  // end class W3DGameWindowManager
+};
 
 // INLINE //////////////////////////////////////////////////////////////////////////////////////////
 inline GameWindow *W3DGameWindowManager::allocateNewWindow( void ) { return newInstance(W3DGameWindow); }
@@ -107,6 +104,3 @@ inline GameWinDrawFunc W3DGameWindowManager::getStaticTextImageDrawFunc( void )
 inline GameWinDrawFunc W3DGameWindowManager::getStaticTextDrawFunc( void ) { return W3DGadgetStaticTextDraw; }
 inline GameWinDrawFunc W3DGameWindowManager::getTextEntryImageDrawFunc( void ) { return W3DGadgetTextEntryImageDraw; }
 inline GameWinDrawFunc W3DGameWindowManager::getTextEntryDrawFunc( void ) { return W3DGadgetTextEntryDraw; }
-
-#endif // __W3DGAMEWINDOWMANAGER_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h
index eb9bbe0793f..d717b028457 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h
@@ -24,8 +24,8 @@
 
 // FILE: W3DInGameUI.h ////////////////////////////////////////////////////////
 //
-// W3D implementation of the in game user interface, the in game ui is 
-// responsible for 
+// W3D implementation of the in game user interface, the in game ui is
+// responsible for
 //
 // Author: Colin Day, April 2001
 //
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef __W3DINGAMEUI_H_
-#define __W3DINGAMEUI_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -49,7 +46,7 @@
 class HAnimClass;
 
 // W3DInGameUI ----------------------------------------------------------------
-/** Implementation for the W3D game user interface.  This singleton is 
+/** Implementation for the W3D game user interface.  This singleton is
   * responsible for all user interaction and feedback with as part of the
 	* user interface */
 //-----------------------------------------------------------------------------
@@ -84,6 +81,4 @@ class W3DInGameUI : public InGameUI
 	RenderObjClass *m_buildingPlacementAnchor;
 	RenderObjClass *m_buildingPlacementArrow;
 
-};  // end class W3DInGameUI
-
-#endif  // end __W3DINGAMEUI_H_
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h
index e779927c2a3..1b3e8b0b019 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __W3DMirror_H_
-#define __W3DMirror_H_
-
 #include "always.h"
 #include "rendobj.h"
 #include "w3d_file.h"
@@ -46,7 +42,7 @@ Since skies are only visible in reflections, this code will also
 render clouds and sky bodies.
 */
 class MirrorRenderObjClass : public RenderObjClass
-{	
+{
 
 public:
 
@@ -54,7 +50,7 @@ class MirrorRenderObjClass : public RenderObjClass
 	~MirrorRenderObjClass(void);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface (W3D methods) 
+	// Render Object Interface (W3D methods)
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
@@ -100,12 +96,12 @@ class MirrorRenderObjClass : public RenderObjClass
 		TextureClass	*waterTexture;
 		Int				waterRepeatCount;
 		Int				skyRepeatCount;
-		DWORD			vertex00Diffuse;		
-		DWORD			vertex10Diffuse;		
-		DWORD			vertex11Diffuse;		
+		DWORD			vertex00Diffuse;
+		DWORD			vertex10Diffuse;
+		DWORD			vertex11Diffuse;
 		DWORD			vertex01Diffuse;
 		DWORD			waterDiffuse;
-		Real			uScrollPerMs;		
+		Real			uScrollPerMs;
 		Real			vScrollPerMs;
 	};
 
@@ -115,5 +111,3 @@ class MirrorRenderObjClass : public RenderObjClass
 	void renderWater(void);
 	void renderWaterMesh(void);
 };
-
-#endif  // end __W3DMirror_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h
index ec3790d361b..e5e3a4c7f12 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DMouse.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __W3DMOUSE_H_
-#define __W3DMOUSE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -98,17 +95,15 @@ class W3DMouse : public Win32Mouse
 	MouseCursor m_currentW3DCursor;
 	void initW3DAssets(void);		///< load models for mouse cursors, etc.
 	void freeW3DAssets(void);		///< unload models used by mouse cursors.
-	
+
 	MouseCursor m_currentPolygonCursor;
 	void initPolygonAssets(void);		///< load images for cursor polygon.
 	void freePolygonAssets(void);		///< free images for cursor polygon.
 
 	void setCursorDirection(MouseCursor cursor);	///figure out direction for oriented 2D cursors.
 
-};  // end Win32Mouse 
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __W3DMOUSE_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h
index 322f62b0d23..ac77c87cc4d 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef __W3DParticleSys_H_
-#define __W3DParticleSys_H_
-
 #include "GameClient/ParticleSys.h"
 #include "WW3D2/pointgr.h"
 #include "WW3D2/streak.h"
@@ -38,7 +35,7 @@
 
 //=============================================================================
 /** W3D implementation of the game display which is responsible for creating
-  * all interaction with the screen and updating the display 
+  * all interaction with the screen and updating the display
 	*/
 class W3DParticleSystemManager : public ParticleSystemManager
 {
@@ -63,5 +60,3 @@ class W3DParticleSystemManager : public ParticleSystemManager
 	ShareBufferClass<uint8> *m_angleBuffer;			///< array of particle orientations
 	Bool m_readyToRender;											///< if true, it is OK to render
 };
-
-#endif  // end __W3DParticleSys_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h
index 25d220a13b0..06ed0a7b943 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DPoly.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __W3DPOLY_H_
-#define __W3DPOLY_H_
-
 #include "vector3.h"
 #include "plane.h"
 #include "simplevec.h"
@@ -66,5 +63,3 @@ class ClipPolyClass
 
 	SimpleDynVecClass<Vector3> Verts;
 };
-
-#endif //__W3DPOLY_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h
index 0fd8e544827..e7b60c82a80 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h
@@ -30,10 +30,8 @@
 //
 //
 ///////////////////////////////////////////////////////////////////////////////
-#pragma once
 
-#ifndef __W3D_PROJECTED_SHADOW_H_
-#define __W3D_PROJECTED_SHADOW_H_
+#pragma once
 
 #include "GameClient/Shadow.h"
 
@@ -57,6 +55,7 @@ class W3DProjectedShadowManager	: public ProjectedShadowManager
 		Bool init(void);					///<allocate one-time shadow assets for length of entire game.
 		void reset(void);					///<free all existing shadows - ready for next map.
 		void shutdown(void);			///<free all assets prior to shutdown of entire game.
+		void prepareShadows();
 		Int	 renderShadows(RenderInfoClass & rinfo);	///<iterate over each object and render its shadow onto affected objects.
 		void ReleaseResources(void);	///<release device dependent D3D resources.
 		Bool ReAcquireResources(void);	///<allocate device dependent D3D resources.
@@ -75,6 +74,10 @@ class W3DProjectedShadowManager	: public ProjectedShadowManager
 		void queueSimpleDecal(W3DProjectedShadow *shadow);	///< add shadow decal to render list - decal floats on terrain.
 		void flushDecals(W3DShadowTexture *texture, ShadowType type);	///<empty queue by rendering all decals with given texture
 
+	private:
+		Int renderProjectedTerrainShadow(W3DProjectedShadow *shadow, AABoxClass &box);	///<render shadow on map terrain.
+		void updateShadowNumbers(ShadowType shadowType, Int addNum);
+
 	private:
 		W3DProjectedShadow *m_shadowList;
 		W3DProjectedShadow *m_decalList;
@@ -86,7 +89,12 @@ class W3DProjectedShadowManager	: public ProjectedShadowManager
 		W3DShadowTextureManager *m_W3DShadowTextureManager;
 		Int m_numDecalShadows;							///< number of decal shadows in the system.
 		Int m_numProjectionShadows;						///< number of projected shadows in the system.
-		Int renderProjectedTerrainShadow(W3DProjectedShadow *shadow, AABoxClass &box);	///<render shadow on map terrain.
+
+		//Bounding rectangle around rendered portion of terrain.
+		Int m_drawEdgeX;
+		Int m_drawEdgeY;
+		Int m_drawStartX;
+		Int m_drawStartY;
 };
 
 extern W3DProjectedShadowManager *TheW3DProjectedShadowManager;
@@ -108,17 +116,17 @@ class W3DProjectedShadow	: public Shadow
 		void updateTexture(Vector3 &lightPos);	///<updates the shadow texture image using render object and given light position.
 		void updateProjectionParameters(const Matrix3D &cameraXform);	///<recompute projection matrix - needed when light or object moves.
 		TexProjectClass *getShadowProjector(void)	{return m_shadowProjector;}
-		#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+		#if defined(RTS_DEBUG)
 		virtual void getRenderCost(RenderCost & rc) const;
 		#endif
 		W3DShadowTexture *getTexture(Int lightIndex) {return m_shadowTexture[lightIndex];}
-		
+
 
 	protected:
 		W3DShadowTexture *m_shadowTexture[MAX_SHADOW_LIGHTS];		///<cached shadow data
 		TexProjectClass	 *m_shadowProjector;										///<object used to generate texture and projection matrix.
 		RenderObjClass	*m_robj;						///<render object used to cast the shadow.
-		Vector3		m_lastObjPosition;	///<position of  object at time of projection matrix update.		
+		Vector3		m_lastObjPosition;	///<position of  object at time of projection matrix update.
 		W3DProjectedShadow *m_next;	/// for the shadow manager list
 		Bool	m_allowWorldAlign;	/// wrap shadow around world geometry - else align perpendicular to local z-axis.
 		Real	m_decalOffsetU;		/// texture coordinate offset so not centered at object origin.
@@ -126,5 +134,3 @@ class W3DProjectedShadow	: public Shadow
 		Int		m_flags;			/// custom rendering flags
 		virtual void release(void)	{TheW3DProjectedShadowManager->removeShadow(this);}	///<release shadow from manager
 };
-
-#endif	//__W3D_PROJECTED_SHADOW_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h
index c8cb2665fd7..fd4d16727fb 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DRoadBuffer.h //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -44,11 +44,8 @@
 
 #pragma once
 
-#ifndef __W3DROAD_BUFFER_H_
-#define __W3DROAD_BUFFER_H_
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "always.h"
 #include "rendobj.h"
@@ -72,7 +69,7 @@
 //-----------------------------------------------------------------------------
 
 
-enum {bottomLeft=0, bottomRight=1, topLeft=2, topRight=3, NUM_CORNERS=4};												 
+enum {bottomLeft=0, bottomRight=1, topLeft=2, topRight=3, NUM_CORNERS=4};
 #define MAX_LINKS 6
 #define DEFAULT_ROAD_SCALE (8.0f)
 #define MIN_ROAD_SEGMENT (0.25f)
@@ -84,13 +81,13 @@ struct TRoadPt
 	Vector2 top;
 	Vector2 bottom;
 	Int			count;
-	Bool		last;	
+	Bool		last;
 	Bool		multi;
 	Bool		isAngled;
 	Bool		isJoin;
 };
 
-struct TRoadSegInfo 
+struct TRoadSegInfo
 {
 	Vector2 loc;
 	Vector2 roadNormal;
@@ -103,20 +100,20 @@ struct TRoadSegInfo
 
 // The individual data for a road segment.
 enum {MAX_SEG_VERTEX=500, MAX_SEG_INDEX=2000};
-enum TCorner CPP_11(: Int) 
+enum TCorner CPP_11(: Int)
 {
-	SEGMENT, 
-	CURVE, 
-	TEE, 
-	FOUR_WAY, 
-	THREE_WAY_Y, 
-	THREE_WAY_H, 
-	THREE_WAY_H_FLIP, 
-	ALPHA_JOIN, 
+	SEGMENT,
+	CURVE,
+	TEE,
+	FOUR_WAY,
+	THREE_WAY_Y,
+	THREE_WAY_H,
+	THREE_WAY_H_FLIP,
+	ALPHA_JOIN,
 	NUM_JOINS
 };
 
-class RoadSegment 
+class RoadSegment
 {
 public:
 	TRoadPt		m_pt1;					///< Drawing location pt1 to pt2.
@@ -192,14 +189,14 @@ class WorldHeightMap;
 // W3DRoadBuffer: Draw buffer for the roads.
 //
 //
-class W3DRoadBuffer 
-{	
+class W3DRoadBuffer
+{
 friend class BaseHeightMapRenderObjClass;
 public:
 
 	W3DRoadBuffer(void);
 	~W3DRoadBuffer(void);
-	/// Loads the roads from the map objects list.  
+	/// Loads the roads from the map objects list.
 	void loadRoads();
 	/// Empties the road buffer.
 	void clearAllRoads(void);
@@ -255,7 +252,7 @@ friend class BaseHeightMapRenderObjClass;
 	void insertTee(Vector2 loc, Int index1, Real scale);
 	Bool insertY(Vector2 loc, Int index1, Real scale);
 	void insert4Way(Vector2 loc, Int index1, Real scale);
-	void offset4Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, TRoadPt *pr3, TRoadPt *pc4, Vector2 loc, Vector2 alignVector, Real widthInTexture); 
+	void offset4Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, TRoadPt *pr3, TRoadPt *pc4, Vector2 loc, Vector2 alignVector, Real widthInTexture);
 	void offset3Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector, Vector2 teeVector, Real widthInTexture);
 	void offsetY(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector, Real widthInTexture);
 	void offsetH(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector, Vector2 teeVector, Bool flip, Bool mirror, Real widthInTexture);
@@ -266,11 +263,11 @@ friend class BaseHeightMapRenderObjClass;
 	void loadY(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Real scale); ///< Fills the index and vertex buffers for drawing 1 Y intersection.
 	void loadAlphaJoin(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Real scale); ///< Fills the index and vertex buffers for drawing 1 alpha blend cap.
 	void loadH(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Bool flip, Real scale); ///< Fills the index and vertex buffers for drawing 1 h tee intersection.
-	void loadFloatSection(RoadSegment *pRoad, Vector2 loc, 
+	void loadFloatSection(RoadSegment *pRoad, Vector2 loc,
 														Vector2 roadVector, Real height, Real left, Real right, Real uOffset, Real vOffset, Real scale);
-	void loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc, 
+	void loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 														Vector2 roadNormal, Vector2 roadVector,
-														Vector2 *cornersP, 
+														Vector2 *cornersP,
 														Real uOffset, Real vOffset, Real uScale, Real vScale);
 	void loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, VertexFormatXYZDUV1 *vb, RefRenderObjListIterator *pDynamicLightsIterator);
 	void loadRoadsInVertexAndIndexBuffers(void); ///< Fills the index and vertex buffers for drawing.
@@ -281,5 +278,3 @@ friend class BaseHeightMapRenderObjClass;
 	Bool visibilityChanged(const IRegion2D &bounds);								///< Returns true if some roads are now visible that weren't, or vice versa.
 	void rotateAbout(Vector2 *ptP, Vector2 center, Real angle);
 };
-
-#endif  // end __W3DROAD_BUFFER_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
index 9ac9f104afb..e3dff3e3d35 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef __W3DSCENE_H_
-#define __W3DSCENE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -43,6 +40,7 @@
 #include "WW3D2/rinfo.h"
 #include "WW3D2/coltest.h"
 #include "WW3D2/lightenvironment.h"
+
 ///////////////////////////////////////////////////////////////////////////////
 // PROTOTYPES /////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -64,7 +62,7 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
 public:
 
 	RTS3DScene();  ///< RTSScene constructor
-	~RTS3DScene();  ///< RTSScene desctructor
+	~RTS3DScene();  ///< RTSScene destructor
 
 	/// ray picking against objects in scene
 	Bool castRay(RayCollisionTestClass & raytest, Bool testAll, Int collisionType);
@@ -85,13 +83,13 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
 	void renderSpecificDrawables(RenderInfoClass &rinfo, Int numDrawables, Drawable **theDrawables) ;
 
 	/// Lighting methods
-	void				addDynamicLight(W3DDynamicLight * obj);
-	void				removeDynamicLight(W3DDynamicLight * obj);
-	RefRenderObjListIterator *		createLightsIterator(void);
-	void					destroyLightsIterator(RefRenderObjListIterator * it);
-	RefRenderObjListClass				*getDynamicLights(void) {return &m_dynamicLightList;};
+	void addDynamicLight(W3DDynamicLight * obj);
+	void removeDynamicLight(W3DDynamicLight * obj);
+	RefRenderObjListIterator *createLightsIterator(void);
+	void destroyLightsIterator(RefRenderObjListIterator * it);
+	RefRenderObjListClass *getDynamicLights(void) {return &m_dynamicLightList;};
 	W3DDynamicLight *getADynamicLight(void);
-	void				setGlobalLight(LightClass *pLight,Int lightIndex=0);
+	void setGlobalLight(LightClass *pLight,Int lightIndex=0);
 	LightEnvironmentClass &getDefaultLightEnv(void) {return m_defaultLightEnv;}
 
 	void init() {}
@@ -101,8 +99,8 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
 	void doRender(CameraClass * cam);
 
 protected:
-	void	renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, Int localPlayerIndex);
-	void	updateFixedLightEnvironments(RenderInfoClass & rinfo);
+	void renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, Int localPlayerIndex);
+	void updateFixedLightEnvironments(RenderInfoClass & rinfo);
 	void flushTranslucentObjects(RenderInfoClass & rinfo);
 	void flushOccludedObjects(RenderInfoClass & rinfo);
 	void flagOccludedObjects(CameraClass * camera);
@@ -136,10 +134,10 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
 	RenderObjClass **m_nonOccludersOrOccludees;	///<objects which are neither bockers or blockees (small rocks, shrubs, etc.).
 	Int m_numPotentialOccluders;
 	Int m_numPotentialOccludees;
-	Int m_numNonOccluderOrOccludee;	
+	Int m_numNonOccluderOrOccludee;
 
 	CameraClass *m_camera;
-};  // end class RTS3DScene
+};
 
 //-----------------------------------------------------------------------------
 // RTS2DScene
@@ -148,7 +146,6 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
 //-----------------------------------------------------------------------------
 class RTS2DScene : public SimpleSceneClass, public SubsystemInterface
 {
-
 public:
 
 	RTS2DScene();
@@ -161,12 +158,12 @@ class RTS2DScene : public SimpleSceneClass, public SubsystemInterface
 	void draw();
 	void reset(){}
 	void doRender(CameraClass * cam);
-	
+
 protected:
+
 	RenderObjClass *m_status;
 	CameraClass *m_camera;
-
-};  // end class RTS2DScene
+};
 
 //-----------------------------------------------------------------------------
 // RTS3DInterfaceScene
@@ -174,9 +171,7 @@ class RTS2DScene : public SimpleSceneClass, public SubsystemInterface
 /** Scene management for 3D interface overlay on top of 3D scene */
 //-----------------------------------------------------------------------------
 class RTS3DInterfaceScene : public SimpleSceneClass
-
 {
-
 public:
 
 	RTS3DInterfaceScene();
@@ -184,9 +179,4 @@ class RTS3DInterfaceScene : public SimpleSceneClass
 
 	/// customizable renderer for the RTS3DInterfaceScene
 	virtual void Customized_Render( RenderInfoClass &rinfo );
-
-protected:
-
-};  // end class RTS3DInterfaceScene
-
-#endif  // end __W3DSCENE_H_
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
deleted file mode 100644
index 422fded9994..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DShaderManager.h /////////////////////////////////////////////////////////
-//
-// Custom shader system that allows more options and easier device validation than
-// possible with W3D2.
-//
-// Author: Mark Wilczynski, August 2001
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DSHADERMANAGER_H_
-#define __W3DSHADERMANAGER_H_
-
-#include "WW3D2/texture.h"
-enum FilterTypes CPP_11(: Int);
-enum CustomScenePassModes CPP_11(: Int);
-enum StaticGameLODLevel CPP_11(: Int);
-enum ChipsetType CPP_11(: Int);
-enum CpuType CPP_11(: Int);
-enum GraphicsVenderID CPP_11(: Int);
-
-class TextureClass;	///forward reference
-/** System for managing complex rendering settings which are either not handled by
-	WW3D2 or need custom paths depending on the video card.  This system will determine
-	the proper shader given video card limitations and also allow the app to query the
-	hardware for specific features.
-*/
-class W3DShaderManager
-{
-public:
-
-	//put any custom shaders (not going through W3D) in here.
-	enum ShaderTypes
-	{	ST_INVALID,			//invalid shader type.
-		ST_TERRAIN_BASE,	//shader to apply base terrain texture only
-		ST_TERRAIN_BASE_NOISE1,	//shader to apply base texture and cloud/noise 1.
-		ST_TERRAIN_BASE_NOISE2,	//shader to apply base texture and cloud/noise 2.
-		ST_TERRAIN_BASE_NOISE12,//shader to apply base texture and both cloud/noise
-		ST_SHROUD_TEXTURE,		//shader to apply shroud texture projection.
-		ST_MASK_TEXTURE,		//shader to apply alpha mask texture projection.
-		ST_ROAD_BASE,	//shader to apply base terrain texture only
-		ST_ROAD_BASE_NOISE1,	//shader to apply base texture and cloud/noise 1.
-		ST_ROAD_BASE_NOISE2,	//shader to apply base texture and cloud/noise 2.
-		ST_ROAD_BASE_NOISE12,//shader to apply base texture and both cloud/noise
-		ST_CLOUD_TEXTURE,			//shader to project clouds.
-		ST_FLAT_TERRAIN_BASE,	//shader to apply base terrain texture only
-		ST_FLAT_TERRAIN_BASE_NOISE1,	//shader to apply base texture and cloud/noise 1.
-		ST_FLAT_TERRAIN_BASE_NOISE2,	//shader to apply base texture and cloud/noise 2.
-		ST_FLAT_TERRAIN_BASE_NOISE12,//shader to apply base texture and both cloud/noise
-		ST_FLAT_SHROUD_TEXTURE,		//shader to apply shroud texture projection.
-		ST_MAX
-	};
-
-
-	W3DShaderManager(void);	///<constructor
-	static void init( void );	///<determine optimal shaders for current device.
-	static void shutdown(void);	///<release resources used by shaders
-	static ChipsetType getChipset(void);	///<return current device chipset.
-	static GraphicsVenderID getCurrentVendor(void) {return m_currentVendor;}	///<return current card vendor.
-	static __int64 getCurrentDriverVersion(void) {return m_driverVersion; }	///<return current driver version.
-	static Int getShaderPasses(ShaderTypes shader);	///<rendering passes required for shader
-	static Int setShader(ShaderTypes shader, Int pass);	///<enable specific shader pass.
-	static Int setShroudTex(Int stage);	///<Set shroud in a texture stage.
-	static void resetShader(ShaderTypes shader);	///<make sure W3D2 gets restored to normal
-	///Specify all textures (up to 8) which can be accessed by the shaders.
-	static void setTexture(Int stage,TextureClass* texture) {m_Textures[stage]=texture;}
-	///Return current texture available to shaders.
-	static inline TextureClass *getShaderTexture(Int stage) { return m_Textures[stage];}	///<returns currently selected texture for given stage
-	///Return last activated shader.
-	static inline ShaderTypes getCurrentShader(void) {return m_currentShader;}
-	/// Loads a .vso file and creates a vertex shader for it
-	static HRESULT LoadAndCreateD3DShader(const char* strFilePath, const DWORD* pDeclaration, DWORD Usage, Bool ShaderType, DWORD* pHandle);
-
-	static Bool testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, Int *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex);
-	static StaticGameLODLevel getGPUPerformanceIndex(void);
-	static Real GetCPUBenchTime(void);
-
-	// Filter methods
-	static Bool filterPreRender(FilterTypes filter, Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
-	static Bool filterPostRender(FilterTypes filter, enum FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
-	static Bool filterSetup(FilterTypes filter, enum FilterModes mode);
-
-	// Support routines for filter methods.
-	static Bool canRenderToTexture(void) { return (m_oldRenderSurface && m_newRenderSurface);}
-	static void startRenderToTexture(void); ///< Sets render target to texture.
-	static IDirect3DTexture8 * endRenderToTexture(void); ///< Ends render to texture, & returns texture.
-	static IDirect3DTexture8 * getRenderTexture(void);	///< returns last used render target texture
-	static Bool isRenderingToTexture(void) {return m_renderingToTexture; }
-	static void drawViewport(Int color);	///<draws 2 triangles covering the current tactical viewport
-
-
-protected:
-	static TextureClass *m_Textures[8];	///textures assigned to each of the possible stages
-	static ChipsetType m_currentChipset;	///<last video card chipset that was detected.
-	static GraphicsVenderID m_currentVendor;	///<last video card vendor
-	static __int64 m_driverVersion;			///<driver version of last chipset.
-	static ShaderTypes m_currentShader;	///<last shader that was set.
-	static Int m_currentShaderPass;		///<pass of last shader that was set.
-
-	static FilterTypes m_currentFilter; ///< Last filter that was set.
-	// Info for a render to texture surface for special effects.
-	static Bool m_renderingToTexture;
-	static IDirect3DSurface8 *m_oldRenderSurface;	///<previous render target
-	static IDirect3DTexture8 *m_renderTexture;		///<texture into which rendering will be redirected.
-	static IDirect3DSurface8 *m_newRenderSurface;	///<new render target inside m_renderTexture
-	static IDirect3DSurface8 *m_oldDepthSurface;	///<previous depth buffer surface
-
-
-};
-
-class W3DFilterInterface
-{
-public:
-	virtual Int init(void) = 0;			///<perform any one time initialization and validation
-	virtual Int shutdown(void) { return TRUE;};			///<release resources used by shader
-	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode) {skipRender=false; return false;} ///< Set up at start of render.  Only applies to screen filter shaders.
-	virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender){return false;} ///< Called after render.  Only applies to screen filter shaders.
-	virtual Bool setup(enum FilterModes mode){return false;} ///< Called when the filter is started, one time before the first prerender.
-protected:
-	virtual Int set(enum FilterModes mode) = 0;		///<setup shader for the specified rendering pass.
-	 ///do any custom resetting necessary to bring W3D in sync.
-	virtual void reset(void) = 0;
-};
-
-
-/*=========  ScreenMotionBlurFilter	=============================================================*/
-///applies motion blur to viewport.
-class ScreenMotionBlurFilter : public W3DFilterInterface
-{
-public:
-	virtual Int set(enum FilterModes mode);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int shutdown(void);		///<release resources used by shader
-	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
-	virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
-	virtual Bool setup(enum FilterModes mode); ///< Called when the filter is started, one time before the first prerender.
-	ScreenMotionBlurFilter();
-
-	static void setZoomToPos(const Coord3D *pos) {m_zoomToPos = *pos; m_zoomToValid = true;}
-
-protected:
-	enum {MAX_COUNT = 60, 
-				MAX_LIMIT = 30,
-				COUNT_STEP = 5,
-				DEFAULT_PAN_FACTOR = 30};
-	Int m_maxCount;
-	Int m_lastFrame;
-	Bool m_decrement;
-	Bool m_skipRender;
-	Bool m_additive;
-	Bool m_doZoomTo;
-	Coord2D m_priorDelta;
-	Int m_panFactor;
-
-
-	static Coord3D m_zoomToPos;
-	static Bool m_zoomToValid;
-} ;
-
-/*=========  ScreenBWFilter	=============================================================*/
-///converts viewport to black & white.
-class ScreenBWFilter : public W3DFilterInterface
-{
-	DWORD	m_dwBWPixelShader;		///<D3D handle to pixel shader which tints texture to black & white.
-public:
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Int shutdown(void);		///<release resources used by shader
-	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
-	virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
-	virtual Bool setup(enum FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
-	static void setFadeParameters(Int fadeFrames, Int direction)
-	{
-		m_curFadeFrame = 0;
-		m_fadeFrames = fadeFrames;
-		m_fadeDirection = direction;
-	}
-protected:
-	virtual Int set(enum FilterModes mode);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	static Int m_fadeFrames;
-	static Int m_fadeDirection;
-	static Int m_curFadeFrame;
-	static Real m_curFadeValue;
-};
-
-class ScreenBWFilterDOT3 : public ScreenBWFilter
-{
-public:
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Int shutdown(void);		///<release resources used by shader
-	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
-	virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
-	virtual Bool setup(enum FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
-protected:
-	virtual Int set(enum FilterModes mode);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-};
-
-/*=========  ScreenCrossFadeFilter	=============================================================*/
-///Fades between 2 different rendered frames.
-class ScreenCrossFadeFilter : public W3DFilterInterface
-{
-public:
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Int shutdown(void);		///<release resources used by shader
-	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
-	virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
-	virtual Bool setup(enum FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
-	static void setFadeParameters(Int fadeFrames, Int direction)
-	{
-		m_curFadeFrame = 0;
-		m_fadeFrames = fadeFrames;
-		m_fadeDirection = direction;
-	}
-	static Real getCurrentFadeValue(void)	{ return m_curFadeValue;}
-	static TextureClass *getCurrentMaskTexture(void) { return m_fadePatternTexture;}
-protected:
-	virtual Int set(enum FilterModes mode);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	Bool updateFadeLevel(void);		///<updated current state of fade and return true if not finished.
-	static Int m_fadeFrames;
-	static Int m_fadeDirection;
-	static Int m_curFadeFrame;
-	static Real m_curFadeValue;
-	static Bool m_skipRender;
-	static TextureClass *m_fadePatternTexture;	///<shape/pattern of the fade
-};
-
-#endif //__W3DSHADERMANAGER_H_
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h
index 0e24029e7fc..64124a64a15 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __W3DSHADOW_H_
-#define __W3DSHADOW_H_
-
 #include "matrix4.h"
 #include "GameClient/Shadow.h"
 
@@ -38,7 +34,7 @@ class W3DShadowManager
 {
 
 public:
-	
+
 	W3DShadowManager( void );
 	~W3DShadowManager( void );
 	Bool init( void );	///<initialize resources used by manager, must have valid D3D device.
@@ -56,8 +52,8 @@ class W3DShadowManager
 	void invalidateCachedLightPositions(void);	///<forces shadow volumes to update regardless of last lightposition
 	Vector3 &getLightPosWorld(Int lightIndex);	///<returns the position of specified light source.
 	Bool	isShadowScene(void)	{return m_isShadowScene;}
-	inline void setStencilShadowMask(int mask) {m_stencilShadowMask=mask;}	///<mask used to mask out stencil bits used for storing occlusion/playerColor
-	inline Int getStencilShadowMask(void)	{return m_stencilShadowMask;}
+	void setStencilShadowMask(int mask) {m_stencilShadowMask=mask;}	///<mask used to mask out stencil bits used for storing occlusion/playerColor
+	Int getStencilShadowMask(void)	{return m_stencilShadowMask;}
 
 	// rendering
 	void RenderShadows( void );
@@ -69,8 +65,6 @@ class W3DShadowManager
 		Bool	m_isShadowScene;	///<flag if current scene needs shadows.  No shadows on pre-pass and 2D.
 		UnsignedInt m_shadowColor;	///<color and alpha for all shadows in scene.
 		Int m_stencilShadowMask;
-};  // end class W3DShadowManager
+};
 
 extern W3DShadowManager *TheW3DShadowManager;
-
-#endif	//__W3DSHADOW_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h
index 06520a4afe5..587f65afa6a 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __W3DSHROUD_H_
-#define __W3DSHROUD_H_
-
 #include "WW3D2/matpass.h"
 #include "WW3D2/dx8wrapper.h"
 
@@ -99,8 +95,8 @@ class W3DShroud
 	void setShroudLevel(Int x, Int y, W3DShroudLevel,Bool textureOnly=FALSE);
 	void setShroudFilter(Bool enable);	///<turns on bilinear filtering of shroud cells.
 	void setBorderShroudLevel(W3DShroudLevel level);	///<color that will appear in unused border terrain.
-	Real	getDrawOriginX(void)	{return m_drawOriginX;}	///<returns ws origin of first pixel in shroud texture.			
-	Real	getDrawOriginY(void)	{return m_drawOriginY;}	///<returns ws origin of first pixel in shroud texture.			
+	Real	getDrawOriginX(void)	{return m_drawOriginX;}	///<returns ws origin of first pixel in shroud texture.
+	Real	getDrawOriginY(void)	{return m_drawOriginY;}	///<returns ws origin of first pixel in shroud texture.
 
 protected:
 	Int m_numCellsX;						///<number of cells covering entire map
@@ -127,5 +123,3 @@ class W3DShroud
 	void interpolateFogLevels(RECT *rect);		///<fade current fog levels to actual logic side levels.
 	void fillBorderShroudData(W3DShroudLevel level, SurfaceClass* pDestSurface);	///<fill the destination texture with a known value
 };
-
-#endif	//__W3DSHROUD_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h
index 0b19701b517..70860e2e58a 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __STATUS_CIRCLE_H_
-#define __STATUS_CIRCLE_H_
-
 #include "always.h"
 #include "rendobj.h"
 #include "w3d_file.h"
@@ -43,7 +39,7 @@
 //
 //
 class W3DStatusCircle : public RenderObjClass
-{	
+{
 
 public:
 
@@ -53,13 +49,13 @@ class W3DStatusCircle : public RenderObjClass
 	~W3DStatusCircle(void);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
 	virtual void					Render(RenderInfoClass & rinfo);
 //	virtual void					Special_Render(SpecialRenderInfoClass & rinfo);
-//	virtual void 					Set_Transform(const Matrix3D &m); 
+//	virtual void 					Set_Transform(const Matrix3D &m);
 //	virtual void 					Set_Position(const Vector3 &v);
 //TODO: MW: do these later - only needed for collision detection
 	virtual bool					Cast_Ray(RayCollisionTestClass & raytest);
@@ -84,7 +80,7 @@ class W3DStatusCircle : public RenderObjClass
 	Int freeMapResources(void);
 	void static setColor(Int r, Int g, Int b) {m_needUpdate = true; m_diffuse = (b) + (g<<8) + (r<<16);};
 protected:
-	Int	m_numTriangles;	//dimensions of list 
+	Int	m_numTriangles;	//dimensions of list
 	static Int m_diffuse;
 	static Bool			 m_needUpdate;
 
@@ -98,5 +94,3 @@ class W3DStatusCircle : public RenderObjClass
 	Int updateCircleVB(void);
 	Int updateScreenVB(Int diffuse);
 };
-
-#endif  // end __DRAW_OBJECT_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h
deleted file mode 100644
index 2e836c5a6d8..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DTERRAINTRACKS_H_
-#define __W3DTERRAINTRACKS_H_
-
-#include "always.h"
-#include "rendobj.h"
-#include "w3d_file.h"
-#include "dx8vertexbuffer.h"
-#include "dx8indexbuffer.h"
-#include "shader.h"
-#include "vertmaterial.h"
-#include "Lib/BaseType.h"
-
-#define MAX_TRACK_EDGE_COUNT	100	//maximum number of edges or divisions in track mark
-#define MAX_TRACK_OPAQUE_EDGE	25	//linear fade of edges will begin at this edge
-#define FADE_TIME_FRAMES 300000	// 300 seconds at 30 fps - time to fade out an edge and remove it from the system.
-
-class TerrainTracksRenderObjClassSystem;
-class Drawable;
-
-/// Custom render object that draws tracks on the terrain.
-/**
-This render object handles drawing tracks left by objects moving on the terrain.
-*/
-class TerrainTracksRenderObjClass : public W3DMPO, public RenderObjClass
-{	
-	W3DMPO_GLUE(TerrainTracksRenderObjClass)
-
-	friend class TerrainTracksRenderObjClassSystem;
-
-public:
-
-	TerrainTracksRenderObjClass(void);
-	~TerrainTracksRenderObjClass(void);
-
-	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface (W3D methods)
-	/////////////////////////////////////////////////////////////////////////////
-	virtual RenderObjClass *	Clone(void) const;
-	virtual int						Class_ID(void) const;
-	virtual void					Render(RenderInfoClass & rinfo);
-	virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;
-    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;
-
-	Int freeTerrainTracksResources(void);	///<free W3D assets used for this track
-	void init( Real width, Real length, const Char *texturename);	///<allocate W3D resources and set size
-	void addEdgeToTrack(Real x, Real y);	///< add a new segment to the track
-	void addCapEdgeToTrack(Real x, Real y);	///< cap the existing segment so we can resume at an unconnected position.
-	void setAirborne(void) {m_airborne = true; }	///< Starts a new section of track, generally after going airborne.
-	void setOwnerDrawable(const Drawable *owner) {m_ownerDrawable = owner;}
-
-protected:
-	TextureClass *m_stageZeroTexture;	///<primary texture
-	SphereClass	m_boundingSphere;		///<bounding sphere of TerrainTracks
-	AABoxClass	m_boundingBox;			///<bounding box of TerrainTracks
-	Int			m_activeEdgeCount;			///<number of active edges in segment list
-	Int			m_totalEdgesAdded;		///<number of edges ever added to this track
-	const Drawable	*m_ownerDrawable;	///<logical object that's laying down tread marks.
-	
-	struct edgeInfo{
-		Vector3	endPointPos[2];			///<the 2 endpoints on the edge
-		Vector2	endPointUV[2];			///< uv coordinates at each end point
-		Int		timeAdded;				///< time when edge was created.
-		Real	alpha;					///< current alpha value for rendering
-	};
-
-	edgeInfo	m_edges[MAX_TRACK_EDGE_COUNT];	///<edges at each segment break
-	Vector3		m_lastAnchor;						///<location of last edge center
-	Int			m_bottomIndex;						///<points at oldest edge on track
-	Int			m_topIndex;						///<points to newest edge on track
-	Bool		m_haveAnchor;					///<set to false until first edge is added
-	Bool		m_bound;						///<object is bound to owner and accepts new edges
-	Real		m_width;						///<track width
-	Real		m_length;						///<length of each track segment
-	Bool		m_airborne;					///< Did the vehicle bounce up into the air?
-	Bool		m_haveCap;					///< is the segment capped so we can stop and resume at new location.
-	TerrainTracksRenderObjClass	*m_nextSystem;			///<next track system
-	TerrainTracksRenderObjClass *m_prevSystem;			///<previous track system
-};
-
-/// System for drawing, updating, and re-using tread mark render objects.
-/**
-This system keeps track of all the active track mark objects and reuses them
-when they expire.  It also renders all the track marks that were submitted in
-this frame.
-*/
-
-class TerrainTracksRenderObjClassSystem
-{
-	friend class TerrainTracksRenderObjClass;
-
-public:
-
-	TerrainTracksRenderObjClassSystem( void );
-	~TerrainTracksRenderObjClassSystem( void );
-
-	void ReleaseResources(void);	///< Release all dx8 resources so the device can be reset.
-	void ReAcquireResources(void);  ///< Reacquire all resources after device reset.
-
-	void setDetail(void);
-
-	void flush (void);	///<draw all tracks that were requested for rendering.
-	void update(void);	///<update the state of all edges (fade alpha, remove old, etc.)
-
-	void init( SceneClass *TerrainTracksScene);	///< pre-allocate track objects
-	void shutdown( void );		///< release all pre-allocated track objects, called by destructor
-	void Reset(void);	///<empties the system, ready for a new scene.
-
-	TerrainTracksRenderObjClass *bindTrack(RenderObjClass *renderObject, Real length, const Char *texturename);	///<track object to be controlled by owner
-	void unbindTrack( TerrainTracksRenderObjClass *mod );	///<releases control of track object
-
-protected:
-	DX8VertexBufferClass		*m_vertexBuffer;	///<vertex buffer used to draw all tracks
-	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining triangles in maximum length track
-	VertexMaterialClass	  	  *m_vertexMaterialClass;	///< vertex lighting material
-	ShaderClass m_shaderClass; ///<shader or rendering state for heightmap
-
-	TerrainTracksRenderObjClass *m_usedModules;	///<active objects being rendered in the scene
-	TerrainTracksRenderObjClass *m_freeModules;	//<unused modules that are free to use again
-	SceneClass	*m_TerrainTracksScene;		///<scene that will contain all the TerrainTracks
-
-	Int	m_edgesToFlush;			///< number of edges to flush on next render.
-
-	void releaseTrack( TerrainTracksRenderObjClass *mod );	///<returns track object to free store.
-	void clearTracks(void);	///<reset the amount of visible track marks of each object.
-
-	Int m_maxTankTrackEdges;	///<maximum length of tank track
-	Int m_maxTankTrackOpaqueEdges;	///<maximum length of tank track before it starts fading.
-	Int m_maxTankTrackFadeDelay;	///<maximum amount of time a tank track segment remains visible.
-
-};  // end class TerrainTracksRenderObjClassSystem
-
-extern TerrainTracksRenderObjClassSystem *TheTerrainTracksRenderObjClassSystem; ///< singleton for track drawing system.
-
-#endif  // end __W3DTERRAINTRACKS_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h
deleted file mode 100644
index 5d75cc4c98e..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DTerrainVisual.h ///////////////////////////////////////////////////////////////////////
-// W3D implementation details for visual aspects of terrain
-// Author: Colin Day, April 2001
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DTERRAINVISUAL_H_
-#define __W3DTERRAINVISUAL_H_
-
-#include "GameClient/TerrainVisual.h"
-#include "W3DDevice/GameClient/W3DWater.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-class Matrix3D;
-class WaterHandle;
-class BaseHeightMapRenderObjClass;
-class WorldHeightMap;
-
-
-
-
-
-
-
-//-------------------------------------------------------------------------------------------------
-/** W3D impelmentation of visual terrain details singleton */
-//-------------------------------------------------------------------------------------------------
-class W3DTerrainVisual : public TerrainVisual
-{
-
-public:
-
-	W3DTerrainVisual();
-	virtual ~W3DTerrainVisual();
-
-	virtual void init( void );
-	virtual void reset( void );
-	virtual void update( void );
-	
-	virtual Bool load( AsciiString filename );
-
-	void getTerrainColorAt( Real x, Real y, RGBColor *pColor );
-
-	/// get the terrain tile type at the world location in the (x,y) plane ignoring Z
-	TerrainType *getTerrainTile( Real x, Real y );
-
-	/** intersect the ray with the terrain, if a hit occurs TRUE is returned
-	and the result point on the terrain is returned in "result" */
-	virtual Bool intersectTerrain( Coord3D *rayStart, Coord3D *rayEnd, Coord3D *result );
-
-	//
-	// water methods
-	//
-	/// enable/disable the water grid
-	virtual void enableWaterGrid( Bool enable );
-	/// set min/max height values allowed in water grid pointed to by waterTable
-	virtual void setWaterGridHeightClamps( const WaterHandle *waterTable, Real minZ, Real maxZ );
-	/// adjust fallof parameters for grid change method
-	virtual void setWaterAttenuationFactors( const WaterHandle *waterTable, 
-																					 Real a, Real b, Real c, Real range );
-	/// set the water table position and orientation in world space
-	virtual void setWaterTransform( const WaterHandle *waterTable, 
-																	Real angle, Real x, Real y, Real z );
-	virtual void setWaterTransform( const Matrix3D *transform );
-	virtual void getWaterTransform( const WaterHandle *waterTable, Matrix3D *transform );
-	/// water grid resolution spacing
-	virtual void setWaterGridResolution( const WaterHandle *waterTable,
-																			 Real gridCellsX, Real gridCellsY, Real cellSize );
-	virtual void getWaterGridResolution( const WaterHandle *waterTable, 
-																			 Real *gridCellsX, Real *gridCellsY, Real *cellSize );
-	/// adjust the water grid in world coords by the delta
-	virtual void changeWaterHeight( Real x, Real y, Real delta );
-	/// adjust the velocity at a water grid point corresponding to the world x,y
-	virtual void addWaterVelocity( Real worldX, Real worldY, 
-																 Real velocity, Real preferredHeight );
-	virtual Bool getWaterGridHeight( Real worldX, Real worldY, Real *height);
-
-	virtual void setTerrainTracksDetail(void);
-	virtual void setShoreLineDetail(void);
-
-	/// Add a bib at location.  
-	void addFactionBib(Object *factionBuilding, Bool highlight, Real extra = 0);
-	/// Remove a bib.  
-	void removeFactionBib(Object *factionBuilding);
-
-	/// Add a bib at location.  
-	void addFactionBibDrawable(Drawable *factionBuilding, Bool highlight, Real extra = 0);
-	/// Remove a bib.  
-	void removeFactionBibDrawable(Drawable *factionBuilding);
-
-	virtual void removeAllBibs(void);
-	virtual void removeBibHighlighting(void);
-
-	virtual void addProp(const ThingTemplate *tt, const Coord3D *pos, Real angle);
-
-	virtual void removeTreesAndPropsForConstruction(
-		const Coord3D* pos, 
-		const GeometryInfo& geom,
-		Real angle
-	);
-
-
-	//
-	// Modify height.
-	//
-	virtual void setRawMapHeight(const ICoord2D *gridPos, Int height);
-	virtual Int getRawMapHeight(const ICoord2D *gridPos);
-
-	/// Replace the skybox texture
-	virtual void replaceSkyboxTextures(const AsciiString *oldTexName[NumSkyboxTextures], const AsciiString *newTexName[NumSkyboxTextures]);
-
-  ////////////////////////////////////////////////////
-  ////////////////////////////////////////////////////
-  ////////////////////////////////////////////////////
-#ifdef DO_SEISMIC_SIMULATIONS
-  virtual void addSeismicSimulation( const SeismicSimulationNode& sim );
-#endif
-  WorldHeightMap* getLogicHeightMap( void ) {return m_logicHeightMap;};
-  WorldHeightMap* getClientHeightMap( void ) 
-  {
-#ifdef DO_SEISMIC_SIMULATIONS
-    return m_clientHeightMap;
-#else
-    return m_logicHeightMap;
-#endif
-  } 
-  ////////////////////////////////////////////////////
-  ////////////////////////////////////////////////////
-  ////////////////////////////////////////////////////
-
-
-
-
-protected:
-
-	// snapshot methods
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-
-
-#ifdef DO_SEISMIC_SIMULATIONS
-  ////////////////////////////////////////////////////
-  ////////////////////////////////////////////////////
-  ////////////////////////////////////////////////////
-  virtual void handleSeismicSimulations( void );
-  SeismicSimulationList m_seismicSimulationList;
-  virtual void updateSeismicSimulations( void ); /// walk the SeismicSimulationList and, well, do it.
-
-  ////////////////////////////////////////////////////
-  ////////////////////////////////////////////////////
-  ////////////////////////////////////////////////////
-#endif
-
-
-
-	BaseHeightMapRenderObjClass *m_terrainRenderObject;  ///< W3D render object for terrain
-	WaterRenderObjClass	*m_waterRenderObject;	///< W3D render object for water plane
-
-  WorldHeightMap *m_logicHeightMap;  ///< height map used for render obj building
-  
-#ifdef DO_SEISMIC_SIMULATIONS
-  WorldHeightMap *m_clientHeightMap; ///< this is a workspace for animating the terrain elevations
-#endif
-  
-	Bool m_isWaterGridRenderingEnabled;
-  
-  AsciiString	m_currentSkyboxTexNames[NumSkyboxTextures];	///<store current texture names applied to skybox.
-	AsciiString m_initialSkyboxTexNames[NumSkyboxTextures];	///<store starting texture/default skybox textures.
-
-
-
-
-};  // end class W3DTerrainVisual
-
-#endif  // end __W3DTERRAINVISUAL_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h
deleted file mode 100644
index 64cd2696be8..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DTreeBuffer.h //////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:    RTS3
-//
-// File name:  W3DTreeBuffer.h
-//
-// Created:    John Ahlquist, May 2001
-//
-// Desc:       Draw buffer to handle all the trees in a scene.
-//
-//-----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __W3DTREE_BUFFER_H_
-#define __W3DTREE_BUFFER_H_
-
-//-----------------------------------------------------------------------------
-//           Includes                                                      
-//-----------------------------------------------------------------------------
-#include "always.h"
-#include "rendobj.h"
-#include "w3d_file.h"
-#include "texture.h"
-#include "dx8vertexbuffer.h"
-#include "dx8indexbuffer.h"
-#include "shader.h"
-#include "vertmaterial.h"
-#include "Lib/BaseType.h"
-#include "Common/GameType.h"
-#include "Common/AsciiString.h"
-#include "Common/GlobalData.h"
-
-//-----------------------------------------------------------------------------
-//           Forward References
-//-----------------------------------------------------------------------------
-class MeshClass;
-class W3DTreeBuffer; 
-class TileData;
-class W3DTreeDrawModuleData;
-struct BreezeInfo;
-class GeometryInfo;
-class W3DProjectedShadow;
-
-//-----------------------------------------------------------------------------
-//           Type Defines
-//-----------------------------------------------------------------------------
-
-enum W3DToppleState CPP_11(: Int)
-{
-	TOPPLE_UPRIGHT = 0,
-	TOPPLE_FALLING,
-	TOPPLE_FOGGED,
-	TOPPPLE_SHROUDED,
-	TOPPLE_DOWN
-};
-/// The individual data for a tree.
-typedef struct {
-	Vector3 location;					///< Drawing location
-	Real		scale;						///< Scale at location.
-	Real		sin;							///< Sine of the rotation angle at location.
-	Real		cos;							///< Cosine of the rotation angle at location.
-	Int			treeType;					///< Type of tree.  
-	Bool		visible;					///< Visible flag, updated each frame.
-	SphereClass bounds;				///< Bounding sphere for culling to set the visible flag.
-	Real		sortKey;					///< Sort key, essentially the distance along the look at vector.
-	DrawableID		drawableID;	///< Drawable this tree corresponds to.
-
-	Real		pushAside;
-	Real		pushAsideDelta;
-	Real		pushAsideSin;			///< Sine of the rotation angle at location.
-	Real		pushAsideCos;			///< Cosine of the rotation angle at location.
-	ObjectID pushAsideSource; ///< Unit that is pushing us aside.
-
-	UnsignedInt lastFrameUpdated; ///< Last frame push aside was updated.
-
-	Int			nextInPartition;
-
-	Int			swayType;					///< Which sway array entry we are using.
-
-	Int			firstIndex;				///< First index in the vertex buffer for this tree.
-	Int     bufferNdx;				///< Which vertex buffer this is in.
-
-	// Topple parameters. [7/7/2003]
-	Real					m_angularVelocity;				///< Velocity in degrees per frame (or is it radians per frame?)
-	Real					m_angularAcceleration;		///< Acceleration angularVelocity is increasing
-	Coord3D				m_toppleDirection;				///< Z-less direction we are toppling
-	W3DToppleState m_toppleState;						///< Stage this module is in.
-	Real					m_angularAccumulation;		///< How much have I rotated so I know when to bounce.
-	UnsignedInt		m_options;								///< topple options
-	Matrix3D			m_mtx;
-	UnsignedInt		m_sinkFramesLeft;					///< Toppled trees sink into the terrain & disappear, how many frames left.
-
-} TTree;
-
-/// The individual data for a tree type.
-typedef struct {
-	MeshClass * m_mesh;			///< Mesh for this kind of tree.
-	SphereClass m_bounds;		///< Bounding boxes for the base tree models.
-	const W3DTreeDrawModuleData *m_data;
-	ICoord2D		m_textureOrigin; ///< Texture origin in the mega texture.
-	Int					m_numTiles;	///< Number of tex tiles.
-	Int					m_firstTile;///< First texture tile.
-	Int					m_tileWidth;///< Width in tiles of texture;
-	Bool				m_halfTile; ///< Tiles are 64x64 pixels, half tile supports a 32x32 bit texture.  Have to adjust the uv values.
-	Vector3			m_offset;
-	Real				m_shadowSize; ///< Shadow radius.
-	Bool				m_doShadow; ///< Draw shadow.
-
-} TTreeType;
-
-//
-// W3DTreeBuffer: Draw buffer for the trees.
-//
-//
-class W3DTreeBuffer : public Snapshot 
-{	
-//friend class BaseHeightMapRenderObjClass;
-
-//-----------------------------------------------------------------------------
-//                             W3DTreeTextureClass
-//-----------------------------------------------------------------------------
-class W3DTreeTextureClass : public TextureClass
-{
-	W3DMPO_GLUE(W3DTreeTextureClass)
-protected:
-	virtual void Apply(unsigned int stage);
-
-public:
-		/// Create texture.
-		W3DTreeTextureClass(unsigned width, unsigned height);
-
-		// just use default destructor. ~TerrainTextureClass(void);
-public:
-	int update(W3DTreeBuffer *buffer); ///< Sets the pixels, and returns the actual height of the texture.
-	void setLOD(Int LOD) const;
-};
-
-public:
- 
-	W3DTreeBuffer(void);
-	~W3DTreeBuffer(void); 
-	/// Add a tree at location.  Name is the w3d model name.
-	void addTree(DrawableID id, Coord3D location, Real scale, Real angle,
-								Real randomScaleAmount, const W3DTreeDrawModuleData *data);
-	/// Notify that an object moved, so check for collisions.
-	void unitMoved(Object *unit);
-	/// Add a type of tree.  Name is the w3d model name.
-	Int addTreeType(const W3DTreeDrawModuleData *data);
-	/// Updates a tree's location.  
-	Bool updateTreePosition(DrawableID id, Coord3D location, Real angle);
-	void pushAsideTree( DrawableID id, const Coord3D *pusherPos, 
-		const Coord3D *pusherDirection, ObjectID pusherID );
-	/// Remove a tree.
-	void removeTree(DrawableID id);
-	/// Remove trees that would be under a building.
-	void removeTreesForConstruction(
-		const Coord3D* pos, 
-		const GeometryInfo& geom,
-		Real angle
-	);
-
-	void setTextureLOD(Int lod);	///<used to adjust maximum mip level sent to hardware.
-	/// Empties the tree buffer. 
-	void clearAllTrees(void);
-	/// Empties the tree buffer.
-	void setBounds(const Region2D &bounds) {m_bounds = bounds;}
-	/// Draws the trees.  Uses camera for culling.
-	void drawTrees(CameraClass * camera, RefRenderObjListIterator *pDynamicLightsIterator);
-	/// Called when the view changes, and sort key needs to be recalculated.
-	/// Normally sortKey gets calculated when a tree becomes visible.
-	void doFullUpdate(void) {m_updateAllKeys = true;};
-	void setIsTerrain(void) {m_isTerrainPass = true;}; ///< Terrain calls this to tell trees to draw.
-	Bool needToDraw(void) {return m_isTerrainPass;};
-
-	Int getNumTiles(void) {return m_numTiles;}
-	TileData *getSourceTile(Int ndx) {return m_sourceTiles[ndx];}
-	void allocateTreeBuffers(void);							 ///< Allocates the buffers.
-	void freeTreeBuffers(void);									 ///< Frees the index and vertex buffers.
-
-private:
-	enum { MAX_TREE_VERTEX=30000, 
-					MAX_TREE_INDEX=60000, 
-					MAX_TREES=4000};
-	enum {MAX_TYPES = 64,
-				MAX_TILES = 512,
-				NUM_SWAY_ENTRIES = 100,
-				MAX_SWAY_TYPES = 10,
-				MAX_BUFFERS = 1,
-				SORT_ITERATIONS_PER_FRAME=10};
-	enum {PARTITION_WIDTH_HEIGHT = 100};
-	DX8VertexBufferClass	*m_vertexTree[MAX_BUFFERS];	///<Tree vertex buffer.
-	DX8IndexBufferClass			*m_indexTree[MAX_BUFFERS];	///<indices defining a triangles for the tree drawing.
-	DWORD					m_dwTreePixelShader;	///<handle to D3D pixel shader
-	DWORD					m_dwTreeVertexShader;	///<handle to D3D vertex shader
-
-	Short		m_areaPartition[PARTITION_WIDTH_HEIGHT*PARTITION_WIDTH_HEIGHT];
-	Region2D m_bounds;
-	
-	TextureClass *m_treeTexture;	///<Trees texture
-	Int			m_textureWidth;				///<Width in pixels m_treeTexture;
-	Int			m_textureHeight;				///<Width in pixels m_treeTexture;
-	Int			m_curNumTreeVertices[MAX_BUFFERS]; ///<Number of vertices used in m_vertexTree.
-	Int			m_curNumTreeIndices[MAX_BUFFERS];	///<Number of indices used in b_indexTree;
-	TTree	m_trees[MAX_TREES];			///< The tree buffer.  All trees are stored here.
-	Int			m_numTrees;						///< Number of trees in m_trees.
-	Bool		m_anythingChanged;	///< Set to true if visibility or sorting changed.
-	Bool		m_anyPushChanged;		///< Set to true if push aside is active.
-	Bool		m_updateAllKeys;  ///< Set to true when the view changes.
-	Bool		m_initialized;		///< True if the subsystem initialized.
-	Bool		m_isTerrainPass;  ///< True if the terrain was drawn in this W3D scene render pass.
-	Bool		m_needToUpdateTexture; ///< True if we need to update the texture.
-	TTreeType m_treeTypes[MAX_TYPES];	///< Info about a kind of tree.
-	Int			m_numTreeTypes;						///< Number of entries in m_treeTypes.
-
-	Int			m_numTiles;
-	TileData			*m_sourceTiles[MAX_TILES];	///< Tiles for m_textureClasses
-	Vector3 m_cameraLookAtVector;
-	Vector3 m_swayOffsets[NUM_SWAY_ENTRIES];
-	Int			m_curSwayVersion;
-
-	Real		m_curSwayOffset[MAX_SWAY_TYPES];
-	Real		m_curSwayStep[MAX_SWAY_TYPES];
-	Real		m_curSwayFactor[MAX_SWAY_TYPES];
-
-	W3DProjectedShadow *m_shadow;
-	
-protected:
-	// snapshot methods
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-protected:
-	/// Updates the sway offsets.
-	void updateSway(const BreezeInfo& info);
-	void loadTreesInVertexAndIndexBuffers(RefRenderObjListIterator *pDynamicLightsIterator); ///< Fills the index and vertex buffers for drawing.
-	void updateVertexBuffer(void); ///< Fills the index and vertex buffers for drawing.
-	void cull(const CameraClass * camera);						 ///< Culls the trees.
-	UnsignedInt  doLighting(const Vector3 *normal,  
-		const GlobalData::TerrainLighting	*objectLighting, 
-		const Vector3 *emissive, UnsignedInt vertexDiffuse, Real scale) const;
-#if 0 // sort is no longer used and messes up the order. jba [6/6/2003]
-	void sort( Int iterations );								 ///< Performs partial bubble sort.
-#endif 
-	void updateTexture(void);
-
-	Int  getPartitionBucket(const Coord3D &pos) const;
-
-	void updateTopplingTree(TTree *tree);
-	void applyTopplingForce( TTree *tree, const Coord3D* toppleDirection, Real toppleSpeed,
-																			 UnsignedInt options );
-
-};
-
-#endif  // end __W3DTREE_BUFFER_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideobuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideobuffer.h
deleted file mode 100644
index d59cbc13d00..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideobuffer.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:    Generals
-//
-// File name:  W3DDevice/GameClient/W3DVideoBuffer.h
-//
-// Created:    10/23/01
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-#ifndef __W3DDEVICE_GAMECLIENT_W3DVIDEOBUFFER_H_
-#define __W3DDEVICE_GAMECLIENT_W3DVIDEOBUFFER_H_
-
-
-//----------------------------------------------------------------------------
-//           Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "GameClient/VideoPlayer.h"
-
-//----------------------------------------------------------------------------
-//           Forward References
-//----------------------------------------------------------------------------
-
-class TextureClass;
-class SurfaceClass;
-
-//----------------------------------------------------------------------------
-//           Type Defines
-//----------------------------------------------------------------------------
-
-//===============================
-// W3DVideoBuffer
-//===============================
-/**
-  * Video buffer interface class to a W3D TextureClass
-	*/
-//===============================
-
-
-class W3DVideoBuffer : public VideoBuffer
-{
-	protected:
-
-		TextureClass	*m_texture;
-		SurfaceClass	*m_surface;
-
-	public:
-
-		W3DVideoBuffer( Type format );
-		virtual ~W3DVideoBuffer();
-
-		virtual	Bool		allocate( UnsignedInt width, UnsignedInt height); ///< Allocates buffer
-		virtual void		free( void);					///< Free buffer
-		virtual	void*		lock( void );					///< Returns memory pointer to start of buffer
-		virtual void		unlock( void );				///< Release buffer
-		virtual Bool		valid( void );				///< Is the buffer valid to use
-
-		TextureClass		*texture( void );			///< Returns texture object
-
-		static WW3DFormat TypeToW3DFormat( VideoBuffer::Type format );
-		static VideoBuffer::Type W3DFormatToType( WW3DFormat w3dFormat );
-};
-
-
-//----------------------------------------------------------------------------
-//           Inlining                                                       
-//----------------------------------------------------------------------------
-
-inline TextureClass* W3DVideoBuffer::texture( void ) { return m_texture; }
-
-#endif // __W3DDEVICE_GAMECLIENT_W3DVIDEOBUFFER_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h
deleted file mode 100644
index a887e7580e8..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DView.h ////////////////////////////////////////////////////////////////////////////////
-//
-// W3D implementation of the game view window.  View windows are literally
-// a window into the game world that have width, height, and camera 
-// controls for what to look at
-//
-// Author: Colin Day, April 2001
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DVIEW_H_
-#define __W3DVIEW_H_
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "Common/STLTypedefs.h"
-#include "GameClient/ParabolicEase.h"
-#include "GameClient/View.h"
-#include "WW3D2/camera.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-class Drawable;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-enum {MAX_WAYPOINTS=25};
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-typedef struct 
-{
-	Int			numWaypoints;
-	Coord3D	waypoints[MAX_WAYPOINTS+2];		// We pad first & last for interpolation.
-	Real		waySegLength[MAX_WAYPOINTS+2];	// Length of each segment;
-	Real		cameraAngle[MAX_WAYPOINTS+2];	// Camera Angle;
-	Int			timeMultiplier[MAX_WAYPOINTS+2];	// Time speedup factor.
-	Real		groundHeight[MAX_WAYPOINTS+1];	// Ground height.
-	Int			totalTimeMilliseconds;					// Num of ms to do this movement.
-	Int			elapsedTimeMilliseconds;				// Time since start.
-	Real		totalDistance;								// Total length of paths.
-	Real		curSegDistance;								// How far we are along the current seg.
-	Int			shutter;
-	Int			curSegment;										// The current segment.
-	Int			curShutter;										// The current shutter.
-	Int			rollingAverageFrames;					// Number of frames to roll.
-	ParabolicEase ease;										// Ease in/out function.
-} TMoveAlongWaypointPathInfo;
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-typedef struct 
-{
-	Int			numFrames;						///< Number of frames to rotate.
-	Int			curFrame;							///< Current frame.
-	Int			startTimeMultiplier;
-	Int			endTimeMultiplier;
-	Int			numHoldFrames;				///< Number of frames to hold the camera before finishing the movement
-	ParabolicEase ease;
-	Bool		trackObject;					///< Are we tracking an object or just rotating?
-	struct Target {
-		ObjectID targetObjectID;			///< Target if we are tracking an object instead of just rotating
-		Coord3D	targetObjectPos;			///< Target's position (so we can stay looking at that spot if he dies)
-	};
-	struct Angle {
-		Real startAngle;
-		Real endAngle;
-	};
-	union {
-		Target target;
-		Angle angle;
-	};
-} TRotateCameraInfo;
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-typedef struct 
-{
-	Int			numFrames;						///< Number of frames to pitch.
-	Int			curFrame;							///< Current frame.
-	Real		angle;
-	Real		startPitch;
-	Real		endPitch;
-	Int			startTimeMultiplier;
-	Int			endTimeMultiplier;
-	ParabolicEase ease;
-} TPitchCameraInfo;
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-typedef struct 
-{
-	Int			numFrames;						///< Number of frames to zoom.
-	Int			curFrame;							///< Current frame.
-	Real		startZoom;
-	Real		endZoom;
-	Int			startTimeMultiplier;
-	Int			endTimeMultiplier;
-	ParabolicEase ease;
-} TZoomCameraInfo;
-
-// ------------------------------------------------------------------------------------------------
-/** W3DView implementation of the game view class.  This allows us to create
-  * a "window" into the game world that can be sized and contains controls
-	* for manipulating the camera */
-// ------------------------------------------------------------------------------------------------
-class W3DView : public View, public SubsystemInterface
-{
-
-public:
-	W3DView();
-	~W3DView();
-
-	virtual void init( void );  ///< init/re-init the W3DView
-	virtual void reset( void );
-	virtual void drawView( void );  ///< draw this view
-	virtual void updateView(void);	///<called once per frame to determine the final camera and object transforms
-
-	virtual void draw( );  ///< draw this view
-	virtual void update( );	///<called once per frame to determine the final camera and object transforms
-
-	virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType );  ///< pick drawable given the screen pixel coords.  If force attack, picks bridges.
-
-	/// all drawables in the 2D screen region will call the 'callback'
-	virtual Int iterateDrawablesInRegion( IRegion2D *screenRegion,
-																Bool (*callback)( Drawable *draw, void *userData ),
-																void *userData );
-
-	virtual void setWidth( Int width );
-	virtual void setHeight( Int height );
-	virtual void setOrigin( Int x, Int y);			///< Sets location of top-left view corner on display 
-
-	virtual void scrollBy( Coord2D *delta );  ///< Shift the view by the given delta
-
-	virtual void forceRedraw();
-
-	virtual void setAngle( Real angle );										///< Rotate the view around the up axis by the given angle
-	virtual void setPitch( Real angle );											///< Rotate the view around the horizontal axis to the given angle
-	virtual void setAngleAndPitchToDefault( void );							///< Set the view angle back to default 
-
-	virtual void lookAt( const Coord3D *o );											///< Center the view on the given coordinate
-	virtual void initHeightForMap( void );												///<  Init the camera height for the map at the current position.
-	virtual void moveCameraTo(const Coord3D *o, Int miliseconds,  Int shutter, Bool orient, Real easeIn, Real easeOut);
-	virtual void moveCameraAlongWaypointPath(Waypoint *pWay, Int frames, Int shutter, Bool orient, Real easeIn, Real easeOut);
-	virtual Bool isCameraMovementFinished(void);
-	virtual Bool isCameraMovementAtWaypointAlongPath(void);
- 	virtual void resetCamera(const Coord3D *location, Int frames, Real easeIn, Real easeOut);	///< Move camera to location, and reset to default angle & zoom.
- 	virtual void rotateCamera(Real rotations, Int frames, Real easeIn, Real easeOut);					///< Rotate camera about current viewpoint.
-	virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut);	///< Rotate camera to face an object, and hold on it
-	virtual void rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds, Real easeIn, Real easeOut, Bool reverseRotation);	///< Rotate camera to face a location.
-	virtual void cameraModFreezeTime(void){ m_freezeTimeForCameraMovement = true;}					///< Freezes time during the next camera movement.
-	virtual void cameraModFreezeAngle(void);												///< Freezes time during the next camera movement.
-	virtual Bool isTimeFrozen(void){ return m_freezeTimeForCameraMovement;}					///< Freezes time during the next camera movement.
-	virtual void cameraModFinalZoom(Real finalZoom, Real easeIn, Real easeOut);	///< Final zoom for current camera movement.
-	virtual void cameraModRollingAverage(Int framesToAverage);			///< Number of frames to average movement for current camera movement.
-	virtual void cameraModFinalTimeMultiplier(Int finalMultiplier); ///< Final time multiplier for current camera movement.
-	virtual void cameraModFinalPitch(Real finalPitch, Real easeIn, Real easeOut);	///< Final pitch for current camera movement.
-	virtual void cameraModLookToward(Coord3D *pLoc);								///< Sets a look at point during camera movement.
-	virtual void cameraModFinalLookToward(Coord3D *pLoc);						///< Sets a look at point during camera movement.
-	virtual void cameraModFinalMoveTo(Coord3D *pLoc);			///< Sets a final move to.
-	// (gth) C&C3 animation controlled camera feature
-	virtual void cameraEnableSlaveMode(const AsciiString & thingtemplateName, const AsciiString & boneName);
-	virtual void cameraDisableSlaveMode(void);
-	virtual void cameraEnableRealZoomMode(void); //WST 10.18.2002
-	virtual void cameraDisableRealZoomMode(void);
-
-	virtual	void Add_Camera_Shake(const Coord3D & position,float radius, float duration, float power); //WST 10.18.2002
-	virtual Int	 getTimeMultiplier(void) {return m_timeMultiplier;};///< Get the time multiplier.
-	virtual void setTimeMultiplier(Int multiple) {m_timeMultiplier = multiple;}; ///< Set the time multiplier.
-	virtual void setDefaultView(Real pitch, Real angle, Real maxHeight);
-	virtual void zoomCamera( Real finalZoom, Int milliseconds, Real easeIn, Real easeOut );
-	virtual void pitchCamera( Real finalPitch, Int milliseconds, Real easeIn, Real easeOut );
-
-	virtual void setHeightAboveGround(Real z);
-	virtual void setZoom(Real z);
-	virtual void setZoomToDefault( void );									///< Set zoom to default value
-
-	virtual void setFieldOfView( Real angle );							///< Set the horizontal field of view angle
-
-  virtual WorldToScreenReturn worldToScreenTriReturn( const Coord3D *w, ICoord2D *s );	///< Transform world coordinate "w" into screen coordinate "s"
-	virtual void screenToWorld( const ICoord2D *s, Coord3D *w );	///< Transform screen coordinate "s" into world coordinate "w"
-	virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world );  ///< transform screen coord to a point on the 3D terrain
-	virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z );  ///< transform screen point to world point at the specified world Z value
-
-	CameraClass *get3DCamera() const { return m_3DCamera; }
-	
-	virtual const Coord3D& get3DCameraPosition() const;
-
-	virtual void setCameraLock(ObjectID id);
-	virtual void setSnapMode( CameraLockType lockType, Real lockDist );
-
-	/// Add an impulse force to shake the camera
-	virtual void shake( const Coord3D *epicenter, CameraShakeType shakeType );
-	
-	virtual Real getFXPitch( void ) const { return m_FXPitch; }					///< returns the FX pitch angle
-
-	virtual Bool setViewFilterMode(enum FilterModes filterMode);			///< Turns on viewport special effect (black & white mode)
-	virtual Bool setViewFilter(enum FilterTypes filter);			///< Turns on viewport special effect (black & white mode)
-	virtual void setViewFilterPos(const Coord3D *pos);			///<  Passes a position to the special effect filter.
-	virtual enum FilterModes getViewFilterMode(void) {return m_viewFilterMode;}			///< Turns on viewport special effect (black & white mode)
-	virtual enum FilterTypes getViewFilterType(void) {return m_viewFilter;}			///< Turns on viewport special effect (black & white mode)
-	virtual void setFadeParameters(Int fadeFrames, Int direction);
-	virtual void set3DWireFrameMode(Bool enable);	///<enables custom wireframe rendering of 3D viewport
-
-	Bool updateCameraMovements(void); 
-	virtual void forceCameraConstraintRecalc(void) { calcCameraConstraints(); }
-
-	virtual void setGuardBandBias( const Coord2D *gb ) { m_guardBandBias.x = gb->x; m_guardBandBias.y = gb->y; }
-
-
-private:
-
-	CameraClass *m_3DCamera;												///< camera representation for 3D scene
-	CameraClass *m_2DCamera;												///< camera for UI overlayed on top of 3D scene
-	enum FilterModes m_viewFilterMode;
-	enum FilterTypes m_viewFilter;
-	Bool m_isWireFrameEnabled;
-	Bool m_nextWireFrameEnabled;											///< used to delay wireframe changes by 1 frame (needed for transitions).
-
-
-	Coord2D m_shakeOffset;													///< the offset to add to the camera position
-	Real m_shakeAngleCos;														///< the cosine of the orientation of the oscillation
-	Real m_shakeAngleSin;														///< the sine of the orientation of the oscillation
-	Real m_shakeIntensity;													///< the intensity of the oscillation
-	Vector3 m_shakerAngles;													//WST 11/12/2002 new multiple instance camera shaker system
-
-	TRotateCameraInfo	m_rcInfo;
-	Bool		m_doingRotateCamera;										///< True if we are doing a camera rotate.
-
-	TPitchCameraInfo m_pcInfo;
-	Bool m_doingPitchCamera;
-	TZoomCameraInfo m_zcInfo;
-	Bool m_doingZoomCamera;
-	
-	Bool m_doingScriptedCameraLock;									///< True if we are following a unit via script
-
-	Real		m_FXPitch;															///< Camera effects pitch.  0 = flat, infinite = look down, 1 = normal.
-
-	TMoveAlongWaypointPathInfo m_mcwpInfo;					///< Move camera along waypoint path info.
-	Bool	m_doingMoveCameraOnWaypointPath;				///< If true, moving camera along waypoint path.
-	Bool	m_CameraArrivedAtWaypointOnPathFlag;
-
-	Bool		m_freezeTimeForCameraMovement;
-	Int			m_timeMultiplier;												///< Time speedup multiplier.
-
-	Bool		m_cameraHasMovedSinceRequest;					///< If true, throw out all saved locations
-	VecPosRequests	m_locationRequests;		///< These are cached. New requests are added here
-
-	Coord3D m_cameraOffset;													///< offset for camera from view center
-	Coord3D m_previousLookAtPosition;													///< offset for camera from view center
-	Coord2D m_scrollAmount;													///< scroll speed
-	Real m_scrollAmountCutoff;											///< scroll speed at which we do not adjust height
-
-	Real m_groundLevel;															///< height of ground.
-	
-	Region2D m_cameraConstraint;										///< m_pos should be constrained to be within this area
-	Bool m_cameraConstraintValid;										///< if f, recalc cam constraints
-
-	void setCameraTransform( void );								///< set the transform matrix of m_3DCamera, based on m_pos & m_angle
-	void buildCameraTransform( Matrix3D *transform ) ;			///< calculate (but do not set) the transform matrix of m_3DCamera, based on m_pos & m_angle
-	void calcCameraConstraints() ;			///< recalc m_cameraConstraint
-	void moveAlongWaypointPath(Int milliseconds); ///< Move camera along path.
-	void getPickRay(const ICoord2D *screen, Vector3 *rayStart, Vector3 *rayEnd);	///<returns a line segment (ray) originating at the given screen position
-	void setupWaypointPath(Bool orient);					///< Calculates distances & angles for moving along a waypoint path.
-	void rotateCameraOneFrame(void);							///< Do one frame of a rotate camera movement.
-	void zoomCameraOneFrame(void);							///< Do one frame of a zoom camera movement.
-	void pitchCameraOneFrame(void);							///< Do one frame of a pitch camera movement.
-	void getAxisAlignedViewRegion(Region3D &axisAlignedRegion);	///< Find 3D Region enclosing all possible drawables.
-	void calcDeltaScroll(Coord2D &screenDelta);
-
-	// (gth) C&C3 animation controlled camera feature
-	Bool				m_isCameraSlaved;
-	Bool				m_useRealZoomCam;
-	AsciiString		m_cameraSlaveObjectName;
-	AsciiString		m_cameraSlaveObjectBoneName;
-};  // end class W3DView
-
-// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
-extern Int TheW3DFrameLengthInMsec;	// default is 33msec/frame == 30fps. but we may change it depending on sys config.
-
-#endif  // end __W3DVIEW_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h
index 4d741330ee7..2208d9e6fb7 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h
@@ -22,12 +22,8 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #pragma once
 
-#ifndef __W3DVOLUMETRICSHADOW_H_
-#define __W3DVOLUMETRICSHADOW_H_
-
 #include "matrix4.h"
 #include "W3DDevice/GameClient/W3DBufferManager.h"
 #include "GameClient/Shadow.h"
@@ -54,7 +50,7 @@ class W3DVolumetricShadowManager
 {
 
 public:
-	
+
 	W3DVolumetricShadowManager( void );
 	~W3DVolumetricShadowManager( void );
 	Bool init( void );	///<initialize resources used by manager, must have valid D3D device.
@@ -85,7 +81,7 @@ class W3DVolumetricShadowManager
 		W3DVolumetricShadow *m_shadowList;
 		W3DVolumetricShadowRenderTask *m_dynamicShadowVolumesToRender;
 		W3DShadowGeometryManager *m_W3DShadowGeometryManager;
-};  // end class W3DVolumetricShadowManager
+};
 
 extern W3DVolumetricShadowManager *TheW3DVolumetricShadowManager;
 
@@ -94,7 +90,7 @@ class W3DVolumetricShadow	: public Shadow
 {
 	friend class W3DVolumetricShadowManager;
 
-	enum														
+	enum
 	{
 		SHADOW_DYNAMIC	=	0x1			//flag indicating a dynamic shadow caster (animated mesh).
 	};
@@ -108,7 +104,7 @@ class W3DVolumetricShadow	: public Shadow
 
 		virtual void release(void)	{TheW3DVolumetricShadowManager->removeShadow(this);}	///<release shadow from manager
 
-		#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+		#if defined(RTS_DEBUG)
 		virtual void getRenderCost(RenderCost & rc) const;
 		#endif
 
@@ -156,7 +152,7 @@ class W3DVolumetricShadow	: public Shadow
 
 		// this is our current geometry we will derive the shadow from
 		W3DShadowGeometry *m_geometry;
-		
+
 		RenderObjClass	*m_robj;	///<render object belonging to model casting shadow
 
 		Real	m_shadowLengthScale;	///<scale factor used to reduce/clamp shadow length
@@ -183,12 +179,10 @@ class W3DVolumetricShadow	: public Shadow
 									 // as disjoint pairs.  The acutal size of this
 									 // piece of memory must accomodate #vertices*2
 		Short m_numSilhouetteIndices[MAX_SHADOW_CASTER_MESHES];  // total number of edge indices in the index
-									   // array, these are pairs and therefore 
+									   // array, these are pairs and therefore
 									   // always a multiple of two
 		Short m_maxSilhouetteEntries[MAX_SHADOW_CASTER_MESHES];  // how big the silhouette index can hold max
 
 		Int	  m_numIndicesPerMesh[MAX_SHADOW_CASTER_MESHES];	///<silhouette indices from each mesh.
 
-};  // end class W3DVolumetricShadow
-
-#endif	//__W3DVOLUMETRICSHADOW_H_
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h
deleted file mode 100644
index b812d9e04e4..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DWater.h ///////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __W3DWater_H_
-#define __W3DWater_H_
-
-#include "always.h"
-#include "rendobj.h"
-#include "w3d_file.h"
-#include "dx8vertexbuffer.h"			 
-#include "dx8indexbuffer.h"
-#include "shader.h"
-#include "vertmaterial.h"
-#include "light.h"
-#include "Lib/BaseType.h"
-#include "Common/GameType.h"
-#include "Common/Snapshot.h"
-
-#define INVALID_WATER_HEIGHT 0.0f	///water height guaranteed to be below all terrain.
-
-#define NUM_BUMP_FRAMES 32	///number of animation frames in bump map
-//Offsets in constant register file to Vertex shader constants
-#define CV_ZERO 0
-#define CV_ONE 1
-#define CV_WORLDVIEWPROJ_0 2
-#define CV_TEXPROJ_0 6
-#define CV_PATCH_SCALE_OFFSET 10
-
-class PolygonTrigger;
-class WaterTracksRenderSystem;
-class Xfer;
-/// Custom render object that draws mirrors, water, and skies.
-/**
-This render object handles drawing reflected W3D scenes.  It will only work
-with rectangular planar surfaces and was tuned with an emphasis on water.
-Since skies are only visible in reflections, this code will also
-render clouds and sky bodies.
-*/
-class WaterRenderObjClass : public Snapshot,
-														public RenderObjClass
-{	
-
-public:
-
-	enum WaterType
-	{
-		WATER_TYPE_0_TRANSLUCENT = 0,	//translucent water, no reflection
-		WATER_TYPE_1_FB_REFLECTION,		//legacy frame buffer reflection (non translucent)
-		WATER_TYPE_2_PVSHADER,		//pixel/vertex shader, texture reflection
-		WATER_TYPE_3_GRIDMESH,		//3D Mesh based water
-		WATER_TYPE_MAX		// end of enumeration
-	};
-
-	WaterRenderObjClass(void);
-	~WaterRenderObjClass(void);
-
-	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface (W3D methods) 
-	/////////////////////////////////////////////////////////////////////////////
-	virtual RenderObjClass *	Clone(void) const;
-	virtual int						Class_ID(void) const;
-	virtual void					Render(RenderInfoClass & rinfo);
-/// @todo: Add methods for collision detection with water surface
-//	virtual Bool					Cast_Ray(RayCollisionTestClass & raytest);
-//	virtual Bool					Cast_AABox(AABoxCollisionTestClass & boxtest);
-//	virtual Bool					Cast_OBBox(OBBoxCollisionTestClass & boxtest);
-//	virtual Bool					Intersect_AABox(AABoxIntersectionTestClass & boxtest);
-//	virtual Bool					Intersect_OBBox(OBBoxIntersectionTestClass & boxtest);
-
-	virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;
-    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;
-	// Get and set static sort level
-	virtual int		Get_Sort_Level(void) const		{ return m_sortLevel; }
-  	virtual void	Set_Sort_Level(int level)		{ m_sortLevel = level;}
-
-	///allocate W3D resources needed to render water
-	void renderWater(void);				///<draw the water surface (flat)
-	Int init(Real waterLevel, Real dx, Real dy, SceneClass *parentScene, WaterType type);
-	void reset( void );  ///< reset any resources we need to
-	void load(void);	///< load/setup any map dependent features
-	void update( void ); ///< update phase of the water
-	void enableWaterGrid(Bool state);	///< used to active custom water for special maps. (i.e DAM).
-	void updateMapOverrides(void);	///< used to update any map specific map overrides for water appearance.
-	void setTimeOfDay(TimeOfDay tod); ///<change sky/water for time of day
-	void toggleCloudLayer(Bool state)	{	m_useCloudLayer=state;}	///<enables/disables the cloud layer
-	void updateRenderTargetTextures(CameraClass *cam);	///< renders into any required textures.	
-	void ReleaseResources(void);	///< Release all dx8 resources so the device can be reset.
-	void ReAcquireResources(void);  ///< Reacquire all resources after device reset.
-	Real getWaterHeight(Real x, Real y);	///<return water height at given point - for use by WB.
-	void setGridHeightClamps(Real minz, Real maxz);	///<set min/max height values alllowed in grid
-	void addVelocity( Real worldX, Real worldY, Real zVelocity, Real preferredHeight );	///< add velocity value
-	void changeGridHeight(Real x, Real y, Real delta);	///<change height of grid at world point including neighbors within falloff.
-	void setGridChangeAttenuationFactors(Real a, Real b, Real c, Real range);	///<adjust falloff parameters for grid change method.
-	void setGridTransform(Real angle, Real x, Real y, Real z);	///<positoin/orientation of grid in space
-	void setGridTransform(const Matrix3D *transform);	///< set transform by matrix
-	void getGridTransform(Matrix3D *transform);	///< get grid transform matrix
-	void setGridResolution(Real gridCellsX, Real gridCellsY, Real cellSize);	///<grid resolution and spacing
-	void getGridResolution(Real *gridCellsX, Real *gridCellsY, Real *cellSize);  ///<get grid resolution params
-	inline void setGridVertexHeight(Int x, Int y, Real value); 
-	inline void getGridVertexHeight(Int x, Int y, Real *value)
-	{	if (m_meshData)	*value=m_meshData[(y+1)*(m_gridCellsX+1+2)+x+1].height+ Get_Position().Z;}
-	inline Bool worldToGridSpace(Real worldX, Real worldY, Real &gridX, Real &gridY);	///<convert from world coordinates to grid's local coordinate system.
-
-	void replaceSkyboxTexture(const AsciiString& oldTexName, const AsciiString& newTextName);
-
-protected:
-	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining quad
-	SceneClass							*m_parentScene;	///<scene to be reflected
-	ShaderClass m_shaderClass; ///<shader or rendering state for heightmap
-	VertexMaterialClass	  		*m_vertexMaterialClass;	///<vertex lighting material
-	VertexMaterialClass			*m_meshVertexMaterialClass; ///<vertex lighting marial for 3D water.
-	LightClass					*m_meshLight;				///<light used for 3D Mesh Water.
-	TextureClass *m_alphaClippingTexture;	///<used for faked clipping using alpha
-	Real	m_dx;	///<x extent of water surface (offset from local center)
-	Real	m_dy;	///<y extent of water surface (offset from local center)
-	Vector3 m_planeNormal;		///<water plane normal
-	Real		m_planeDistance;	///<water plane distance
-	Real		m_level;			///<level of water (hack for water)
-	Real		m_uOffset;			///<current texture offset on u axis
-	Real		m_vOffset;			///<current texture offset on v axis
-	Real		m_uScrollPerMs;		///<texels per/ms scroll rate in u direction
-	Real		m_vScrollPerMs;		///<texels per/ms scroll rate in v direction
-	Int			m_LastUpdateTime;	///<time of last cloud update
-	Bool		m_useCloudLayer;	///<flag if clouds are on/off
-	WaterType	m_waterType;		///<type of water being used
-	Int			m_sortLevel;		///<sort order after main scene is rendered
-
-	//Data used in GeForce3 bump-mapped water (uses direct D3D resources for better
-	//performance and compatibility (most of these featues are not supported by W3D).
-	struct SEA_PATCH_VERTEX	//vertex structure passed to D3D
-	{
-		float x,y,z;
-		unsigned int c;
-		float tu, tv;
-	}; 
-
-	LPDIRECT3DDEVICE8 m_pDev;						///<pointer to D3D Device
-	LPDIRECT3DVERTEXBUFFER8 m_vertexBufferD3D;		///<D3D vertex buffer
-	LPDIRECT3DINDEXBUFFER8	m_indexBufferD3D;	///<D3D index buffer
-	Int						m_vertexBufferD3DOffset;	///<location to start writing vertices
-	DWORD					m_dwWavePixelShader;	///<handle to D3D pixel shader
-	DWORD					m_dwWaveVertexShader;	///<handle to D3D vertex shader
-	Int	m_numVertices;				///<number of vertices in D3D vertex buffer
-	Int m_numIndices;				///<number of indices in D3D index buffer
-	LPDIRECT3DTEXTURE8 m_pBumpTexture[NUM_BUMP_FRAMES]; ///<animation frames
-	LPDIRECT3DTEXTURE8 m_pBumpTexture2[NUM_BUMP_FRAMES]; ///<animation frames
-	Int					m_iBumpFrame;	///<current animation frame
-	Real				m_fBumpScale;	///<scales bump map uv perturbation
-	TextureClass * m_pReflectionTexture;	///<render target for reflection
-	RenderObjClass	*m_skyBox;		///<box around level
-	WaterTracksRenderSystem *m_waterTrackSystem;	///<object responsible for rendering water wakes
-
-	enum WaterMeshStatus
-	{
-		AT_REST = 0x00,
-		IN_MOTION = 0x01
-	};
-	struct WaterMeshData
-	{
-		Real height;										///< height of the 3D mesh at this point
-		Real velocity;									///< velocity in Z that this point is moving up and down
-		UnsignedByte status;						///< status for this grid point
-		UnsignedByte preferredHeight;		///< the hight we prefer to be
-	};
-	WaterMeshData *m_meshData;  ///< heightmap data for 3D Mesh based water.
-	UnsignedInt m_meshDataSize;	///< size of m_meshData 
-	Bool m_meshInMotion;				///< TRUE once we've messed with velocities and are in motion
-	Bool m_doWaterGrid;	///< allows/prevents water grid rendering.
-
-	Vector2	m_gridDirectionX;			///<vector along water grid's x-axis (scaled to world-space)
-	Vector2	m_gridDirectionY;			///<vector along water grid's y-axis (scaled to world-space)
-	Vector2	m_gridOrigin;				///<unit vector along water grid's x-axis
-	Real m_gridWidth;					///<object-space width of water grid
-	Real m_gridHeight;					///<object-space width of water grid
-	Real m_minGridHeight;				///<minimum height value allowed for water mesh
-	Real m_maxGridHeight;				///<maximum height value allowed for water mesh
-	Real m_gridChangeMaxRange;			///<maximum range of changeGridHeight() method
-	Real m_gridChangeAtt0;
-	Real m_gridChangeAtt1;
-	Real m_gridChangeAtt2;
-	Real m_gridCellSize;				///<world-space width/height of each cell.
-	Int  m_gridCellsX;					///<number of cells along width
-	Int  m_gridCellsY;					///<number of cells along height
-
-	Real m_riverVOrigin;
-	TextureClass *m_riverTexture;
-	TextureClass *m_whiteTexture;		///< a texture containing only white used for NULL pixel shader stages.
-	TextureClass *m_waterNoiseTexture;
-	DWORD	m_waterPixelShader;		///<D3D handle to pixel shader.
-	DWORD	m_riverWaterPixelShader;		///<D3D handle to pixel shader.
-	DWORD	m_trapezoidWaterPixelShader;	///<handle to D3D vertex shader
-	TextureClass *m_waterSparklesTexture;
-	Real m_riverXOffset;
-	Real m_riverYOffset;
-	Bool m_drawingRiver;
-	Bool m_disableRiver;
-	TextureClass *m_riverAlphaEdge;
-
-	TimeOfDay m_tod;	///<time of day setting for reflected cloud layer
-
-	struct Setting
-	{
-		TextureClass	*skyTexture;
-		TextureClass	*waterTexture;
-		Int				waterRepeatCount;
-		Real			skyTexelsPerUnit;	//texel density of sky plane (higher value repeats texture more).
-		DWORD			vertex00Diffuse;		
-		DWORD			vertex10Diffuse;		
-		DWORD			vertex11Diffuse;		
-		DWORD			vertex01Diffuse;
-		DWORD			waterDiffuse;
-		DWORD			transparentWaterDiffuse;
-		Real			uScrollPerMs;		
-		Real			vScrollPerMs;
-	};
-
-	Setting m_settings[ TIME_OF_DAY_COUNT ];	///< settings for each time of day
-	void drawRiverWater(PolygonTrigger *pTrig);
-	void drawTrapezoidWater(Vector3 points[4]);
-	void loadSetting ( Setting *skySetting, TimeOfDay timeOfDay );	///<init sky/water settings from GDF
-	void renderSky(void);	///<draw the sky layer (clouds, stars, etc.)
-	void testCurvedWater(void);	///<draw the sky layer (clouds, stars, etc.)
-	void renderSkyBody(Matrix3D *mat);	///<draw the sky body (sun, moon, etc.)
-	void renderWaterMesh(void);			///<draw the water surface mesh (deformed 3d mesh).
-	HRESULT initBumpMap(LPDIRECT3DTEXTURE8 *pTex, TextureClass *pBumpSource);	///<copies data into bump-map format.
-	void renderMirror(CameraClass *cam);	///< Draw reflected scene into texture
-	void drawSea(RenderInfoClass & rinfo);	///< Draw the surface of the water
-	///bounding box of frustum clipped polygon plane
-	Bool getClippedWaterPlane(CameraClass *cam, AABoxClass *box);
-
-	void setupFlatWaterShader(void);
-	void setupJbaWaterShader(void);
-	void cleanupJbaWaterShader(void);
-
-	//Methods used for GeForce3 specific water
-	HRESULT generateIndexBuffer(int sizeX, int sizeY);	///<Generate static index buufer
-	HRESULT generateVertexBuffer( Int sizeX, Int sizeY, Int vertexSize, Bool doFill);///<Generate static vertex buffer
-
-	// snapshot methods for save/load
-	virtual void crc( Xfer *xfer );
-	virtual void xfer( Xfer *xfer );
-	virtual void loadPostProcess( void );
-
-};
-
-//Public inline function declarations
-inline Bool WaterRenderObjClass::worldToGridSpace(Real worldX, Real worldY, Real &gridX, Real &gridY)
-{
-	Real dx,dy;
-	Real ooGridCellSize = 1.0f/m_gridCellSize;
-
-	dx=worldX - m_gridOrigin.X;
-	dy=worldY - m_gridOrigin.Y;
-	gridX = ooGridCellSize * (dx * m_gridDirectionX.X + dy * m_gridDirectionX.Y);
-	gridY = ooGridCellSize * (dx * m_gridDirectionY.X + dy * m_gridDirectionY.Y);
-	
-	if (gridX < 0)
-		return FALSE;
-	if (gridX > m_gridCellsX-1 )
-		return FALSE;
-	if (gridY < 0)
-		return FALSE;
-	if (gridY > m_gridCellsY-1 )
-		return FALSE;
-
-	return TRUE;
-}
-
-extern WaterRenderObjClass *TheWaterRenderObj; ///<global water rendering object
-
-#endif  // end __W3DWater_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h
deleted file mode 100644
index 2f82e9fcc35..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-#pragma once
-
-#ifndef __W3DWaterTracks_H_
-#define __W3DWaterTracks_H_
-
-enum waveType CPP_11(: Int);	//forward reference
-
-/// Custom render object that draws animated tracks/waves on the water.
-/**
-	This is an object which draws a small breaking wave or splash animation.  These objects are
-	to be managed/accessed only by the WaterTracksRenderObjClassSystem
-*/
-class WaterTracksObj
-{	
-	friend class WaterTracksRenderSystem;
-
-public:
-
-	WaterTracksObj(void);
-	~WaterTracksObj(void);
-
-	virtual void					Render(void) {};	///<draw this object
-	virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;	///<bounding sphere of this object
-    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & aabox) const;		///<bounding box of this object
-
-	Int freeWaterTracksResources(void);	///<free W3D assets used for this track
-	void init( Real width, Real length, const Vector2 &start, const Vector2 &end, const Char *texturename, Int waveTimeOffset);	///<allocate W3D resources and set size
-	void init( Real width, const Vector2 &start, const Vector2 &end, const Char *texturename);	///<allocate W3D resources and set size
-	Int	update(Int msElapsed);	///< update animation state
-	Int render(DX8VertexBufferClass	*vertexBuffer, Int batchStart);	///<draw this object
-
-protected:
-	TextureClass *m_stageZeroTexture;	///<primary texture
-	SphereClass	m_boundingSphere;		///<bounding sphere of WaterTracks
-	AABoxClass	m_boundingBox;			///<bounding box of WaterTracks
-
-	waveType	m_type;					///<used for render state sorting (set this to texture pointer for now).
-	Int			m_x;					///<vertex count
-	Int			m_y;					///<vertex count
-	Bool		m_bound;				///<object is bound to owner and accepts new edges
-	Vector2		m_startPos;				///<starting position of wave
-//	Vector2		m_endPos;				///<ending position of wave
-	Vector2		m_waveDir;				///<direction of wave travel
-	Vector2		m_perpDir;				///<direction perpendicular to wave travel
-	Vector2		m_initStartPos;			///<original settings used to create wave
-	Vector2		m_initEndPos;			///<original settings used to create wave
-	Int			m_initTimeOffset;		///<time offset when wave is added into the system
-	Int		m_fadeMs;				///<time for wave to fade out after it stops moving
-	Int		m_totalMs;				///<amount of time to complete full motion
-	Int			m_elapsedMs;			///<amount of time since start of motion
-
-	//New version
-	Real	m_waveInitialWidth;				///<width of wave segment when it first appears
-	Real	m_waveInitialHeight;			///<height of wave segment when it first appears
-	Real	m_waveFinalWidth;				///<width of wave segment at full size
-	Real	m_waveFinalWidthPeakFrac;		///<fraction along path when wave reaches full width
-	Real	m_waveFinalHeight;				///<final height of unstretched wave
-
-	Real m_initialVelocity;	//initial velocity in world units per ms.
-	Real m_waveDistance;		//<total distance traveled by wave front.
-	Real m_timeToReachBeach;
-	Real m_frontSlowDownAcc;
-	Real m_timeToStop;
-	Real m_timeToRetreat;
-	Real m_backSlowDownAcc;
-	Real m_timeToCompress;
-	Real m_flipU;			///<force uv coordinates to flip
-
-	WaterTracksObj	*m_nextSystem;			///<next track in system
-	WaterTracksObj *m_prevSystem;			///<previous track in system
-};
-
-/// System for drawing, updating, and re-using water mark render objects.
-/**
-This system keeps track of all the active track mark objects and reuses them
-when they expire.  It also renders all the track marks that were submitted in
-this frame.
-*/
-
-class WaterTracksRenderSystem
-{
-	friend class WaterTracksObj;
-
-public:
-
-	WaterTracksRenderSystem( void );
-	~WaterTracksRenderSystem( void );
-
-	void ReleaseResources(void);	///< Release all dx8 resources so the device can be reset.
-	void ReAcquireResources(void);  ///< Reacquire all resources after device reset.
-
-	void flush (RenderInfoClass & rinfo);	///<draw all tracks that were requested for rendering.
-	void update(void);	///<update the state of all edges (fade alpha, remove old, etc.)
-
-	void init(void);	///< pre-allocate track objects
-	void shutdown( void );		///< release all pre-allocated track objects, called by destructor
-	void reset(void);			///< free all map dependent items.
-
-	WaterTracksObj *bindTrack(waveType type);	///<track object to be controlled by owner
-	void unbindTrack( WaterTracksObj *mod );	///<releases control of track object
-	void saveTracks(void);									///<save all used tracks to disk
-	void loadTracks(void);									///<load tracks from disk
-	WaterTracksObj *findTrack(Vector2 &start, Vector2 &end, waveType type);
-
-protected:
-	DX8VertexBufferClass		*m_vertexBuffer;	///<vertex buffer used to draw all tracks
-	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining triangles in maximum length track
-	VertexMaterialClass	  	  *m_vertexMaterialClass;	///< vertex lighting material
-	ShaderClass m_shaderClass; ///<shader or rendering state for heightmap
-
-	WaterTracksObj *m_usedModules;	///<active objects being rendered in the scene
-	WaterTracksObj *m_freeModules;	//<unused modules that are free to use again
-
-	Int		m_stripSizeX;			///< resolution (vertex count) of wave strip
-	Int		m_stripSizeY;			///< resolution (vertex count) of wave strip
-	Int		m_batchStart;			///< start of unused vertices in vertex buffer
-	Real	m_level;				///< water level
-	void releaseTrack( WaterTracksObj *mod );	///<returns track object to free store.
-};  // end class WaterTracksRenderObjClassSystem
-
-#endif  //__W3DWaterTracks_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h
index b160e58e6a8..c1ed235461d 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h
@@ -24,12 +24,12 @@
 
 // FILE: W3DWaypointBuffer.h ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   Command & Conquers: Generals
@@ -42,7 +42,7 @@
 //            are rendered after terrain, after roads & bridges, and after
 //            global fog, but before structures, objects, units, trees, etc.
 //            This way if we have two waypoints at the bottom of a hill but
-//            going through the hill, the line won't get cut off. However, 
+//            going through the hill, the line won't get cut off. However,
 //            structures and units on top of paths will render above it. Waypoints
 //            are only shown for selected units while in waypoint plotting mode.
 //
@@ -50,11 +50,8 @@
 
 #pragma once
 
-#ifndef __W3D_WAYPOINT_BUFFER_H
-#define __W3D_WAYPOINT_BUFFER_H
-
 //-----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //-----------------------------------------------------------------------------
 #include "always.h"
 #include "rendobj.h"
@@ -68,8 +65,8 @@
 
 class SegmentedLineClass;
 
-class W3DWaypointBuffer 
-{	
+class W3DWaypointBuffer
+{
 	friend class HeightMapRenderObjClass;
 public:
 
@@ -87,5 +84,3 @@ class W3DWaypointBuffer
 	SegmentedLineClass *m_line;
 	TextureClass *m_texture;
 };
-
-#endif  // end __W3D_WAYPOINT_BUFFER_H
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h
index ee274e4a33d..ec5b7784983 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h
@@ -27,9 +27,6 @@
 
 #pragma once
 
-#ifndef W3DWEBBROWSER_H
-#define W3DWEBBROWSER_H
-
 #include "GameNetwork/WOLBrowser/WebBrowser.h"
 
 class TextureClass;
@@ -45,5 +42,3 @@ class W3DWebBrowser : public WebBrowser
 		virtual void closeBrowserWindow(GameWindow *win);
 
 };
-
-#endif // #ifndef W3DWEBBROWSER_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h
deleted file mode 100644
index 26e6fbd3454..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-
-// WorldHeightMap.h
-// Class to encapsulate height map.
-// Author: John Ahlquist, April 2001
-
-#pragma once
-
-#ifndef WorldHeightMap_H
-#define WorldHeightMap_H
-
-#include "Lib/BaseType.h"
-#include "WWLib/refcount.h"
-#include "WWMath/vector3.h"
-#include "W3DDevice/GameClient/TileData.h"
-#include "../../GameEngine/Include/Common/MapObject.h"
-
-#include "Common/STLTypedefs.h"
-typedef std::vector<ICoord2D> VecICoord2D;
-
-
-/** MapObject class 
-Not ref counted.  Do not store pointers to this class.  */
-
-#define K_MIN_HEIGHT  0
-#define K_MAX_HEIGHT  255
-
-#define NUM_SOURCE_TILES 1024
-#define NUM_BLEND_TILES 16192
-#define NUM_CLIFF_INFO 32384
-#define FLAG_VAL 0x7ADA0000
-
-// For backwards compatiblity.
-#define TEX_PATH_LEN 256
-
-
-/// Struct in memory.
-typedef struct {
-	Int globalTextureClass; 
-	Int firstTile;
-	Int numTiles;
-	Int width;
-	Int isBlendEdgeTile; ///< True if the texture contains blend edges.
-	AsciiString name;
-	ICoord2D positionInTexture;
-} TXTextureClass;
-
-typedef enum {POS_X, POS_Y, NEG_X, NEG_Y} TVDirection;
-/// Struct in memory.
-typedef struct {
-	Real	u0, v0;	 // Upper left uv
-	Real	u1, v1;	 // Lower left uv
-	Real	u2, v2;	 // Lower right uv
-	Real	u3, v3;	 // Upper right uv
-	Bool  flip;
-	Bool	mutant;  // Mutant mapping needed to get this to fit.
-	Short tileIndex; // Tile texture.
-} TCliffInfo;
-
-#define NUM_TEXTURE_CLASSES 256
-
-
-class TextureClass;
-class ChunkInputStream;
-class InputStream;
-class OutputStream;
-class DataChunkInput;
-struct DataChunkInfo;
-class AlphaEdgeTextureClass;
-
-#define NUM_ALPHA_TILES 12
-
-class WorldHeightMap : public RefCountClass,
-                       public WorldHeightMapInterfaceClass
-{
-	friend class TerrainTextureClass;
-	friend class AlphaTerrainTextureClass;
-	friend class W3DCustomEdging;
-	friend class AlphaEdgeTextureClass;
-
-#define NO_EVAL_TILING_MODES
-
-public:
-#ifdef EVAL_TILING_MODES
-	enum {TILE_4x4, TILE_6x6, TILE_8x8} m_tileMode;
-#endif
-	enum {
-		NORMAL_DRAW_WIDTH = 129,
-		NORMAL_DRAW_HEIGHT = 129,
-		STRETCH_DRAW_WIDTH = 65,
-		STRETCH_DRAW_HEIGHT = 65
-	};
-
-protected:
-	Int m_width;				///< Height map width.
-	Int m_height;				///< Height map height (y size of array).
-	Int m_borderSize;		///< Non-playable border area.
-	VecICoord2D m_boundaries;	///< the in-game boundaries
-	Int m_dataSize;			///< size of m_data.
-	UnsignedByte *m_data;	///< array of z(height) values in the height map.
-	
-  UnsignedByte *m_seismicUpdateFlag;  ///< array of bits to prevent ovelapping physics-update regions from doubling effects on shared cells
-  UnsignedInt   m_seismicUpdateWidth; ///< width of the array holding SeismicUpdateFlags
-  Real         *m_seismicZVelocities; ///< how fast is the dirt rising/falling at this location
-
-  UnsignedByte *m_cellFlipState;	///< array of bits to indicate the flip state of each cell.
-	Int m_flipStateWidth;			///< with of the array holding cellFlipState
-	UnsignedByte *m_cellCliffState;	///< array of bits to indicate the cliff state of each cell.
-
-
-	/// Texture indices.
-	Short  *m_tileNdxes;  ///< matches m_Data, indexes into m_SourceTiles.
-	Short  *m_blendTileNdxes;  ///< matches m_Data, indexes into m_blendedTiles.  0 means no blend info.	
-	Short  *m_cliffInfoNdxes;  ///< matches m_Data, indexes into m_cliffInfo.	 0 means no cliff info.
-	Short  *m_extraBlendTileNdxes;  ///< matches m_Data, indexes into m_extraBlendedTiles.  0 means no blend info.	
-
-	
-	Int m_numBitmapTiles;	// Number of tiles initialized from bitmaps in m_SourceTiles.
-	Int m_numEdgeTiles;	// Number of tiles initialized from bitmaps in m_SourceTiles.
-	Int m_numBlendedTiles;	// Number of blended tiles created from bitmap tiles.
-
-	TileData			*m_sourceTiles[NUM_SOURCE_TILES];	///< Tiles for m_textureClasses
-	TileData			*m_edgeTiles[NUM_SOURCE_TILES];	///< Tiles for m_textureClasses
-
-	TBlendTileInfo	m_blendedTiles[NUM_BLEND_TILES];
-	TBlendTileInfo	m_extraBlendedTiles[NUM_BLEND_TILES];
-
-	TCliffInfo	m_cliffInfo[NUM_CLIFF_INFO];
-	Int m_numCliffInfo; ///< Number of cliffInfo's used in m_cliffInfo.
-
-	// Texture classes.  There is one texture class for each bitmap read in.
-	// A class may have more than one tile.  For example, if the grass bitmap is 
-	// 128x128, it creates 4 64x64 tiles, so the grass texture class will have 4 tiles.
-	int m_numTextureClasses;
-	TXTextureClass m_textureClasses[NUM_TEXTURE_CLASSES];
-
-	// Edge Texture classes.  There is one texture class for each bitmap read in.
-	// An edge class will normally have 4 tiles.
-	int m_numEdgeTextureClasses;
-	TXTextureClass m_edgeTextureClasses[NUM_TEXTURE_CLASSES];
-
-	/** The actual texture used to render the 3d mesh.  Note that it is 
-	 basically m_SourceTiles laid out in rows, so by itself it is not useful.
-	 Use GetUVData to get the mapping info for height cells to map into the 
-	 texture. */
-	TerrainTextureClass *m_terrainTex;
-	Int	m_terrainTexHeight; /// Height of m_terrainTex allocated.
-	/** The texture that contains the alpha edge tiles that get blended on 
-			top of the base texture. getAlphaUVData does the mapping. */
-	AlphaTerrainTextureClass *m_alphaTerrainTex;
-	Int	m_alphaTexHeight; /// Height of m_alphaTerrainTex allocated.
-
-	/** The texture that contains custom blend edge tiles. */
-	AlphaEdgeTextureClass *m_alphaEdgeTex;
-	Int	m_alphaEdgeHeight; /// Height of m_alphaEdgeTex allocated.
-
-	/// Drawing info - re the part of the map that is being drawn.
-	Int m_drawOriginX;
-	Int m_drawOriginY;
-	Int m_drawWidthX;
-	Int m_drawHeightY;
-
-	/// Tiles that hold the alpha channel info.
-	static TileData *m_alphaTiles[NUM_ALPHA_TILES];
-
-
-protected:
-	TileData *getSourceTile(UnsignedInt ndx) { if (ndx<NUM_SOURCE_TILES) return(m_sourceTiles[ndx]); return(NULL); };
-	TileData *getEdgeTile(UnsignedInt ndx) { if (ndx<NUM_SOURCE_TILES) return(m_edgeTiles[ndx]); return(NULL); };
-	/// UV mapping data for a cell to map into the terrain texture.
-	void getUVForNdx(Int ndx, float *minU, float *minV, float *maxU, float*maxV, Bool fullTile);
-	Bool getUVForTileIndex(Int ndx, Short tileNdx, float U[4], float V[4], Bool fullTile);
-	Int getTextureClassFromNdx(Int tileNdx);
-	void readTexClass(TXTextureClass *texClass, TileData **tileData); 
-	Int updateTileTexturePositions(Int *edgeHeight); ///< Places each tile in the texture.
-	void initCliffFlagsFromHeights(void);
-	void setCellCliffFlagFromHeights(Int xIndex, Int yIndex);
-
-protected:	 // file reader callbacks.
-	static Bool ParseHeightMapDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	Bool ParseHeightMapData(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	static Bool ParseSizeOnlyInChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	Bool ParseSizeOnly(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	static Bool ParseBlendTileDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	Bool ParseBlendTileData(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	static Bool ParseWorldDictDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	static Bool ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	static Bool ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-	Bool ParseObjectData(DataChunkInput &file, DataChunkInfo *info, void *userData, Bool readDict);
-	static Bool ParseLightingDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
-
-protected:
-	WorldHeightMap(void);			///< Simple constructor for WorldHeightMapEdit class.
-
-public: // constructors/destructors
-	WorldHeightMap(ChunkInputStream *pFile, Bool bHMapOnly=false);	// read from file.
-	~WorldHeightMap(void);			// destroy.
-
-public:  // Boundary info
-	const VecICoord2D& getAllBoundaries(void) const { return m_boundaries; }
-
-public:  // height map info.
-	static Int getMinHeightValue(void) {return K_MIN_HEIGHT;}
-	static Int getMaxHeightValue(void) {return K_MAX_HEIGHT;}
-
-	UnsignedByte *getDataPtr(void) {return m_data;}
-
-	
-	Int getXExtent(void) {return m_width;}	///<number of vertices in x
-	Int getYExtent(void) {return m_height;}	///<number of vertices in y
-
-	inline Int getDrawOrgX(void) {return m_drawOriginX;}
-	inline Int getDrawOrgY(void) {return m_drawOriginY;}
-
-	inline Int getDrawWidth(void) {return m_drawWidthX;}
-	inline Int getDrawHeight(void) {return m_drawHeightY;}
-	inline void setDrawWidth(Int width) {m_drawWidthX = width; if (m_drawWidthX>m_width) m_drawWidthX = m_width;}
-	inline void setDrawHeight(Int height) {m_drawHeightY = height; if (m_drawHeightY>m_height) m_drawHeightY = m_height;}
-	virtual Int getBorderSize(void) {return m_borderSize;}
-  inline Int getBorderSizeInline(void) const { return m_borderSize; }
-	/// Get height with the offset that HeightMapRenderObjClass uses built in.
-	inline UnsignedByte getDisplayHeight(Int x, Int y) { return m_data[x+m_drawOriginX+m_width*(y+m_drawOriginY)];}
-
-	/// Get height in normal coordinates.
-	inline UnsignedByte getHeight(Int xIndex, Int yIndex) 
-	{ 
-		Int ndx = (yIndex*m_width)+xIndex;
-		if ((ndx>=0) && (ndx<m_dataSize) && m_data) 
-			return(m_data[ndx]); 
-		else 
-			return(0);
-	};
-
-	void getUVForBlend(Int edgeClass, Region2D *range);
-
-	Bool setDrawOrg(Int xOrg, Int yOrg);
-
-	static void freeListOfMapObjects(void);
-
-	Int getTextureClassNoBlend(Int xIndex, Int yIndex, Bool baseClass=false);
-	Int getTextureClass(Int xIndex, Int yIndex, Bool baseClass=false);
-	TXTextureClass getTextureFromIndex( Int textureIndex );
-
-public:  // tile and texture info.	
-	void setTextureLOD(Int lod);	///< set maximum lod level sent to the hardware.
-	TextureClass *getTerrainTexture(void);  //< generates if needed and returns the terrain texture
-	TextureClass *getAlphaTerrainTexture(void); //< generates if needed and returns alpha terrain texture
-	TextureClass *getEdgeTerrainTexture(void); //< generates if needed and returns blend edge texture
-	/// UV mapping data for a cell to map into the terrain texture.  Returns true if the textures had to be stretched for cliffs.
-	Bool getUVData(Int xIndex, Int yIndex, float U[4], float V[4], Bool fullTile);
-	Bool getFlipState(Int xIndex, Int yIndex) const;
-	///Faster version of above function without all the safety checks - For people that do checks externally.
-	inline Bool getQuickFlipState(Int xIndex, Int yIndex) const
-	{
-		return m_cellFlipState[yIndex*m_flipStateWidth + (xIndex >> 3)] & (1<<(xIndex&0x7));
-	}
-
-	void setFlipState(Int xIndex, Int yIndex, Bool value);
-	void clearFlipStates(void);
-	Bool getCliffState(Int xIndex, Int yIndex) const;
-	Bool getExtraAlphaUVData(Int xIndex, Int yIndex, float U[4], float V[4], UnsignedByte alpha[4], Bool *flip, Bool *cliff);
-	/// UV mapping data for a cell to map into the alpha terrain texture.
-	void getAlphaUVData(Int xIndex, Int yIndex, float U[4], float V[4], UnsignedByte alpha[4], Bool *flip, Bool fullTile);
-	void getTerrainColorAt(Real x, Real y, RGBColor *pColor);
-	AsciiString getTerrainNameAt(Real x, Real y);
-	Bool isCliffMappedTexture(Int xIndex, Int yIndex);
-
-
-  Bool getSeismicUpdateFlag(Int xIndex, Int yIndex) const;
-  void setSeismicUpdateFlag(Int xIndex, Int yIndex, Bool value); 
-  void clearSeismicUpdateFlags(void) ;
-  virtual Real getSeismicZVelocity(Int xIndex, Int yIndex) const;
-  virtual void setSeismicZVelocity(Int xIndex, Int yIndex, Real value); 
-  void fillSeismicZVelocities( Real value );
-  virtual Real getBilinearSampleSeismicZVelocity( Int x, Int y);
-
-
-
-public:  // Flat tile texture info.	
-	TerrainTextureClass *getFlatTexture(Int xCell, Int yCell, Int cellWidth, Int pixelsPerCell);  //< generates and returns the terrain texture
-
-	static void setupAlphaTiles(void);
-	UnsignedByte *getPointerToTileData(Int xIndex, Int yIndex, Int width);
-	Bool getRawTileData(Short tileNdx, Int width, UnsignedByte *buffer, Int bufLen);
-	UnsignedByte *getRGBAlphaDataForWidth(Int width, TBlendTileInfo *pBlend);
-
-public:  // modify height value
-	void setRawHeight(Int xIndex, Int yIndex, UnsignedByte height) { 
-		Int ndx = (yIndex*m_width)+xIndex;
-		if ((ndx>=0) && (ndx<m_dataSize) && m_data) m_data[ndx]=height;
-	};
-public: // Read tile utilities. jba [7/9/2003]
-	static Bool readTiles(InputStream *pStrm, TileData **tiles, Int numRows);
-	static Int countTiles(InputStream *pStrm, Bool *halfTile=NULL);
-
-protected:
-	void setCliffState(Int xIndex, Int yIndex, Bool state);
-
-};
-
-#endif
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/camerashakesystem.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/camerashakesystem.h
deleted file mode 100644
index b3336646c62..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/camerashakesystem.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WWPhys                                                       *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/wwphys/camerashakesystem.h                   $*
- *                                                                                             *
- *              Original Author:: Greg Hjelstrom                                               *
- *                                                                                             *
- *                      $Author:: Greg_h                                                      $*
- *                                                                                             *
- *                     $Modtime:: 7/13/00 4:06p                                               $*
- *                                                                                             *
- *                    $Revision:: 1                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#ifndef CAMERASHAKESYSTEM_H
-#define CAMERASHAKESYSTEM_H
-
-
-#include "always.h"
-#include "vector3.h"
-#include "multilist.h"
-#include "mempool.h"
-
-class CameraClass;
-
-/**
-** CameraShakeSystemClass
-** This class encapsulates all of the logic and data needed to implement camera "shakes"
-** These are used to simulate explosions, earthquakes, etc.  
-*/
-class CameraShakeSystemClass
-{
-public:
-
-	CameraShakeSystemClass(void);
-	~CameraShakeSystemClass(void);
-
-	enum 
-	{
-		FLAGS_NONE = 0,
-		FLAGS_IGNOREPOSITION,
-	};
-	
-	void		Add_Camera_Shake(		const Vector3 & position,
-											float radius = 50.0f,
-											float duration = 1.5f,
-											float power = 1.0f	);
-	void		Timestep(float dt);
-	bool		IsCameraShaking(void);
-	void		Update_Camera_Shaker(Vector3 camera_position, Vector3 * shaker_angles);
-
-	/**
-	** CameraShakerClass 
-	** This class encapsulates the current state of a camera shaker.  It is a multi-list object
-	** and is allocated in pools.
-	*/
-	class CameraShakerClass : public MultiListObjectClass, public AutoPoolClass<CameraShakerClass,256>
-	{	
-	public:
-		CameraShakerClass(const Vector3 & position,float radius,float duration,float power);
-		~CameraShakerClass(void);
-
-		void					Timestep(float dt)							{ ElapsedTime += dt; }	
-		bool					Is_Expired(void)								{ return (ElapsedTime >= Duration); }
-		void					Compute_Rotations(const Vector3 & pos,Vector3 * set_angles);
-
-	protected:
-
-		Vector3				Position;
-		float					Radius;
-		float					Duration;
-		float					Intensity;
-	
-		float					ElapsedTime;
-		Vector3				Omega;
-		Vector3				Phi;
-	};
-
-protected:
-
-	MultiListClass<CameraShakerClass>	CameraShakerList;
-
-};
-
-extern CameraShakeSystemClass CameraShakerSystem; //WST 11/12/2002 This is the new Camera Shaker system upgrade
-
-
-#endif //CAMERASHAKESYSTEM_H
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h
index 6916de93ca9..c6bb4f4c7f8 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h
@@ -25,7 +25,7 @@
 // FILE: W3DGameLogic.h ///////////////////////////////////////////////////////
 //
 // W3D game logic class, there shouldn't be a lot of new functionality
-// in this class, but there are certain things that need to have close 
+// in this class, but there are certain things that need to have close
 // knowledge of each other like ther logical and visual terrain
 //
 // Author: Colin Day, April 2001
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#ifndef __W3DGAMELOGIC_H_
-#define __W3DGAMELOGIC_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -64,6 +61,4 @@ class W3DGameLogic : public GameLogic
 	virtual TerrainLogic *createTerrainLogic( void ) { return NEW W3DTerrainLogic; };
 	virtual GhostObjectManager *createGhostObjectManager(void) { return NEW W3DGhostObjectManager; }
 
-};  // end class W3DGameLogic
-
-#endif  // end __W3DGAMELOGIC_H_
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h
index 34efb3f3a70..9974f59d491 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef _W3DGHOSTOBJECT_H_
-#define _W3DGHOSTOBJECT_H_
-
 #include "GameLogic/GhostObject.h"
 #include "Lib/BaseType.h"
 #include "Common/GameCommon.h"
@@ -45,23 +42,25 @@ class PartitionData;
 class W3DGhostObject: public GhostObject
 {
 	friend W3DGhostObjectManager;
+
 public:
 	W3DGhostObject();
 	virtual ~W3DGhostObject();
 	virtual void snapShot(int playerIndex);
 	virtual void updateParentObject(Object *object, PartitionData *mod);
 	virtual void freeSnapShot(int playerIndex);
+
 protected:
 	virtual void crc( Xfer *xfer);
 	virtual void xfer( Xfer *xfer );
 	virtual void loadPostProcess( void );
 	void removeParentObject(void);
 	void restoreParentObject(void);	///< restore the original non-ghosted object to scene.
-	void addToScene(int playerIndex);
-	void removeFromScene(int playerIndex);
-	void release(void);			///< used by manager to return object to free store.
-	void getShroudStatus(int playerIndex);	///< used to get the partition manager to update ghost objects without parent objects.
+	Bool addToScene(int playerIndex);
+	Bool removeFromScene(int playerIndex);
+	ObjectShroudStatus getShroudStatus(int playerIndex);	///< used to get the partition manager to update ghost objects without parent objects.
 	void freeAllSnapShots(void);				///< used to free all snapshots from all players.
+
 	W3DRenderObjectSnapshot *m_parentSnapshots[MAX_PLAYER_COUNT];
 	DrawableInfo	m_drawableInfo;
 
@@ -78,8 +77,8 @@ class W3DGhostObjectManager : public GhostObjectManager
 	virtual void reset(void);
 	virtual GhostObject *addGhostObject(Object *object, PartitionData *pd);
 	virtual void removeGhostObject(GhostObject *mod);
-	virtual void setLocalPlayerIndex(int index);
-	virtual void updateOrphanedObjects(int *playerIndexList, int numNonLocalPlayers);
+	virtual void setLocalPlayerIndex(int playerIndex);
+	virtual void updateOrphanedObjects(int *playerIndexList, int playerIndexCount);
 	virtual void releasePartitionData(void);
 	virtual void restorePartitionData(void);
 
@@ -92,5 +91,3 @@ class W3DGhostObjectManager : public GhostObjectManager
 	W3DGhostObject	*m_freeModules;
 	W3DGhostObject	*m_usedModules;
 };
-
-#endif // _W3DGHOSTOBJECT_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h
index 5ad494d853b..3ca892e818f 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h
@@ -29,9 +29,6 @@
 
 #pragma once
 
-#ifndef __W3DTERRAINLOGIC_H_
-#define __W3DTERRAINLOGIC_H_
-
 #include "GameLogic/TerrainLogic.h"
 
 //-------------------------------------------------------------------------------------------------
@@ -80,6 +77,4 @@ class W3DTerrainLogic : public TerrainLogic
 	Real m_mapMinZ;	///< Minimum terrain z value.
 	Real m_mapMaxZ;	///< Maximum terrain z value.
 
-};  // end W3DTerrainLogic
-
-#endif  // end __W3DTERRAINLOGIC_H_
+};
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h
deleted file mode 100644
index 92480d892a7..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-/////// Win32BIGFile.h ////////////////////////////////////
-// Bryan Cleveland, August 2002
-///////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WIN32BIGFILE_H
-#define __WIN32BIGFILE_H
-
-#include "Common/ArchiveFile.h"
-#include "Common/AsciiString.h"
-#include "Common/List.h"
-
-class Win32BIGFile : public ArchiveFile
-{
-	public:
-		Win32BIGFile();
-		virtual ~Win32BIGFile();
-
-		virtual Bool					getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const;	///< fill in the fileInfo struct with info about the requested file.
-		virtual File*					openFile( const Char *filename, Int access = 0 );///< Open the specified file within the BIG file
-		virtual void					closeAllFiles( void );									///< Close all file opened in this BIG file
-		virtual AsciiString		getName( void );												///< Returns the name of the BIG file
-		virtual AsciiString		getPath( void );												///< Returns full path and name of BIG file
-		virtual void					setSearchPriority( Int new_priority );	///< Set this BIG file's search priority
-		virtual void					close( void );													///< Close this BIG file
-
-	protected:
-
-		AsciiString		m_name;		///< BIG file name
-		AsciiString		m_path;		///< BIG file path
-};
-
-#endif // __WIN32BIGFILE_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h
deleted file mode 100644
index 3f408dcf89e..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//////// Win32BIGFileSystem.h ///////////////////////////
-// Bryan Cleveland, August 2002
-/////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WIN32BIGFILESYSTEM_H
-#define __WIN32BIGFILESYSTEM_H
-
-#include "Common/ArchiveFileSystem.h"
-
-class Win32BIGFileSystem : public ArchiveFileSystem
-{
-public:
-	Win32BIGFileSystem();
-	virtual ~Win32BIGFileSystem();
-
-	virtual void init( void );
-	virtual void update( void );
-	virtual void reset( void );
-	virtual void postProcessLoad( void );
-
-	// ArchiveFile operations
-	virtual void closeAllArchiveFiles( void );											///< Close all Archivefiles currently open
-
-	// File operations
-	virtual ArchiveFile * openArchiveFile(const Char *filename);
-	virtual void closeArchiveFile(const Char *filename);
-	virtual void closeAllFiles( void );															///< Close all files associated with ArchiveFiles
-
-	virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE);
-protected:
-
-};
-
-#endif // __WIN32BIGFILESYSTEM_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32CDManager.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32CDManager.h
index 13576ff1f12..beb4401ae20 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32CDManager.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32CDManager.h
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    Generals
@@ -43,12 +43,8 @@
 
 #pragma once
 
-#ifndef _WIN32DEVICE_COMMON_WIN32CDMANAGER_H_
-#define _WIN32DEVICE_COMMON_WIN32CDMANAGER_H_
-
-
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "Common/CDManager.h"
@@ -65,7 +61,7 @@
 //----------------------------------------------------------------------------
 
 //===============================
-// Win32CDDrive 
+// Win32CDDrive
 //===============================
 
 class Win32CDDrive : public CDDrive
@@ -75,7 +71,7 @@ class Win32CDDrive : public CDDrive
 	Win32CDDrive();
 	virtual ~Win32CDDrive();
 
-	virtual void refreshInfo( void );					///< Update drive with least 
+	virtual void refreshInfo( void );					///< Update drive with least
 
 };
 
@@ -102,8 +98,5 @@ class Win32CDManager : public CDManager
 };
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
-
-
-#endif // _WIN32DEVICE_COMMON_WIN32CDMANAGER_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h
index e5cbd2c3446..8eac1dccc1c 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h
@@ -24,17 +24,14 @@
 
 // FILE: Win32GameEngine.h ////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, April 2001
-// Description: 
-//   Device implementation of the game engine ... this is, of course, the 
-//   highest level of the game that creates the necessary interfaces to the 
+// Description:
+//   Device implementation of the game engine ... this is, of course, the
+//   highest level of the game that creates the necessary interfaces to the
 //   devices we need
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __WIN32GAMEENGINE_H_
-#define __WIN32GAMEENGINE_H_
-
 #include "Common/GameEngine.h"
 #include "GameLogic/GameLogic.h"
 #include "GameNetwork/NetworkInterface.h"
@@ -47,7 +44,6 @@
 #include "W3DDevice/GameClient/W3DWebBrowser.h"
 #include "W3DDevice/Common/W3DFunctionLexicon.h"
 #include "W3DDevice/Common/W3DRadar.h"
-#include "W3DDevice/Common/W3DFunctionLexicon.h"
 #include "W3DDevice/Common/W3DThingFactory.h"
 
 
@@ -64,7 +60,7 @@ class Win32GameEngine : public GameEngine
 	Win32GameEngine();
 	virtual ~Win32GameEngine();
 
-	virtual void init( void );															///< initialization 
+	virtual void init( void );															///< initialization
 	virtual void reset( void );															///< reset engine
 	virtual void update( void );														///< update the game engine
 	virtual void serviceWindowsOS( void );									///< allow windows maintenance in background
@@ -87,7 +83,7 @@ class Win32GameEngine : public GameEngine
 
 protected:
 	UINT m_previousErrorMode;
-};  // end Win32GameEngine
+};
 
 // INLINE -----------------------------------------------------------------------------------------
 inline GameLogic *Win32GameEngine::createGameLogic( void ) { return NEW W3DGameLogic; }
@@ -103,5 +99,3 @@ inline NetworkInterface *Win32GameEngine::createNetwork( void ) { return Network
 inline Radar *Win32GameEngine::createRadar( void ) { return NEW W3DRadar; }
 inline WebBrowser *Win32GameEngine::createWebBrowser( void ) { return NEW CComObject<W3DWebBrowser>; }
 inline AudioManager *Win32GameEngine::createAudioManager( void ) { return NEW MilesAudioManager; }
- 
-#endif  // end __WIN32GAMEENGINE_H_
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h
deleted file mode 100644
index 1eec13f98b7..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///// Win32LocalFile.h ///////////////////////////
-// Bryan Cleveland, August 2002
-//////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WIN32LOCALFILE_H
-#define __WIN32LOCALFILE_H
-
-#include "Common/LocalFile.h"
-
-class Win32LocalFile : public LocalFile
-{
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Win32LocalFile, "Win32LocalFile")		
-public:
-	Win32LocalFile();
-	//virtual ~Win32LocalFile();
-
-protected:
-};
-
-#endif // __WIN32LOCALFILE_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h
deleted file mode 100644
index 310a00b9a37..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///// Win32LocalFileSystem.h //////////////////////////////////
-// Bryan Cleveland, August 2002
-///////////////////////////////////////////////////////////////
-
-#pragma once
-
-#ifndef __WIN32LOCALFILESYSTEM_H
-#define __WIN32LOCALFILESYSTEM_H
-#include "Common/LocalFileSystem.h"
-
-class Win32LocalFileSystem : public LocalFileSystem
-{
-public:
-	Win32LocalFileSystem();
-	virtual ~Win32LocalFileSystem();
-
-	virtual void init();
-	virtual void reset();
-	virtual void update();
-
-	virtual File * openFile(const Char *filename, Int access = 0);	///< open the given file.
-	virtual Bool doesFileExist(const Char *filename) const;								///< does the given file exist?
-
-	virtual void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.
-	virtual Bool getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const;
-
-	virtual Bool createDirectory(AsciiString directory);
-
-protected:
-};
-
-#endif // __WIN32LOCALFILESYSTEM_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h
index fd5475bf245..57894924d30 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h
@@ -24,12 +24,12 @@
 
 // FILE: Win32DIKeyboard.h ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __WIN32DIKEYBOARD_H_
-#define __WIN32DIKEYBOARD_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #ifndef DIRECTINPUT_VERSION
 #	define DIRECTINPUT_VERSION	0x800
@@ -95,12 +92,9 @@ class DirectInputKeyboard : public Keyboard
 	// direct input data members
 	LPDIRECTINPUT8 m_pDirectInput;  ///< pointer to direct input interface
 	LPDIRECTINPUTDEVICE8 m_pKeyboardDevice;  ///< pointer to keyboard device
- 
-};  // end class DirectInputKeyboard
+
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __WIN32DIKEYBOARD_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h
index 8db59e7c3c1..25d769ed580 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h
@@ -18,12 +18,12 @@
 
 // FILE: Win32DIMouse.h ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -39,9 +39,6 @@
 
 #pragma once
 
-#ifndef __WIN32DIMOUSE_H_
-#define __WIN32DIMOUSE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #ifndef DIRECTINPUT_VERSION
 #	define DIRECTINPUT_VERSION	0x800
@@ -79,14 +76,14 @@ class DirectInputMouse : public Mouse
 
 	virtual void capture( void );  ///< capture the mouse
 	virtual void releaseCapture( void );  ///< release mouse capture
-		
+
 protected:
 
 	/// device implementation to get mouse event
 	virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush );
 
 	// new internal methods for our direct input implemetation
-	void openMouse( void );  ///< create the direct input mouse 
+	void openMouse( void );  ///< create the direct input mouse
 	void closeMouse( void );  ///< close and release mouse resources
 	/// map direct input mouse data to our own format
 	void mapDirectInputMouse( MouseIO *mouse, DIDEVICEOBJECTDATA *mdat );
@@ -95,11 +92,8 @@ class DirectInputMouse : public Mouse
 	LPDIRECTINPUT8 m_pDirectInput;  ///< pointer to direct input interface
 	LPDIRECTINPUTDEVICE8 m_pMouseDevice;  ///< pointer to mouse device
 
-};  // end class DirectInputMouse
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __WIN32DIMOUSE_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h
index 3e8498d9938..acd55b8d34d 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h
@@ -24,12 +24,12 @@
 
 // FILE: Win32Mouse.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __WIN32MOUSE_H_
-#define __WIN32MOUSE_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -74,17 +71,20 @@ class Win32Mouse : public Mouse
 	virtual void initCursorResources(void);	///< load windows resources needed for 2d cursors.
 
 	virtual void setCursor( MouseCursor cursor );		///< set mouse cursor
-	virtual void capture( void );										///< capture the mouse
-	virtual void releaseCapture( void );						///< release mouse capture
 
 	virtual void setVisibility(Bool visible);
 
+	virtual void loseFocus();
+	virtual void regainFocus();
+
 	/// add an event from a win32 window procedure
 	void addWin32Event( UINT msg, WPARAM wParam, LPARAM lParam, DWORD time );
-	void lostFocus (Bool state) { m_lostFocus = state;}
 
 protected:
 
+	virtual void capture( void ); ///< capture the mouse
+	virtual void releaseCapture( void ); ///< release mouse capture
+
 	/// get the next event available in the buffer
 	virtual UnsignedByte getMouseEvent( MouseIO *result, Bool flush );
 
@@ -105,13 +105,10 @@ class Win32Mouse : public Mouse
 															 will come from this index, then it will be
 															 incremented to the next index */
 	MouseCursor m_currentWin32Cursor;	///< keep track of last cursor image sent to D3D.
-	Int m_directionFrame;	///< current frame of directional cursor (frome 0 points up).
-	Bool m_lostFocus;		///< flag if window has lost focues and mouse should stop being updated.	
-};  // end Win32Mouse 
+	Int m_directionFrame;	///< current frame of directional cursor (from 0 points up).
+	Bool m_lostFocus;		///< flag if window has lost focus and mouse should stop being updated.
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __WIN32MOUSE_H_
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp
deleted file mode 100644
index 02a07ffe2d7..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp
+++ /dev/null
@@ -1,3390 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: MilesAudioManager.cpp 
-/*---------------------------------------------------------------------------*/
-/* EA Pacific                                                                */
-/* Confidential Information	                                                 */
-/* Copyright (C) 2001 - All Rights Reserved                                  */
-/* DO NOT DISTRIBUTE                                                         */
-/*---------------------------------------------------------------------------*/
-/* Project:    RTS3                                                          */
-/* File name:  MilesAudioManager.cpp                                         */
-/* Created:    John K. McDonald, Jr., 3/21/2002                              */
-/* Desc:       This is the implementation for the MilesAudioManager, which   */
-/*						 interfaces with the Miles Sound System.                       */
-/* Revision History:                                                         */
-/*		7/18/2002 : Initial creation                                           */
-/*---------------------------------------------------------------------------*/
-
-#include <dsound.h>
-#include "Lib/BaseType.h"
-#include "MilesAudioDevice/MilesAudioManager.h"
-
-#include "Common/AudioAffect.h"
-#include "Common/AudioHandleSpecialValues.h"
-#include "Common/AudioRequest.h"
-#include "Common/AudioSettings.h"
-#include "Common/AsciiString.h"
-#include "Common/AudioEventInfo.h"
-#include "Common/FileSystem.h"
-#include "Common/GameCommon.h"
-#include "Common/GameSounds.h"
-#include "Common/CRCDebug.h"
-#include "Common/GlobalData.h"
-#include "Common/ScopedMutex.h"
-
-#include "GameClient/DebugDisplay.h"
-#include "GameClient/Drawable.h"
-#include "GameClient/GameClient.h"
-#include "GameClient/VideoPlayer.h"
-#include "GameClient/View.h"
-
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/TerrainLogic.h"
-
-#include "Common/file.h"
-
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-enum { INFINITE_LOOP_COUNT = 1000000 };
-
-// Callback functions useful for Miles ////////////////////////////////////////////////////////////
-static void AILCALLBACK setSampleCompleted( HSAMPLE sampleCompleted );
-static void AILCALLBACK set3DSampleCompleted( H3DSAMPLE sample3DCompleted );
-static void AILCALLBACK setStreamCompleted( HSTREAM streamCompleted );
-
-static U32 AILCALLBACK streamingFileOpen(char const *fileName, U32 *file_handle);
-static void AILCALLBACK streamingFileClose(U32 fileHandle);
-static S32 AILCALLBACK streamingFileSeek(U32 fileHandle, S32 offset, U32 type);
-static U32 AILCALLBACK streamingFileRead(U32 fileHandle, void *buffer, U32 bytes);
-
-//-------------------------------------------------------------------------------------------------
-MilesAudioManager::MilesAudioManager() :
-	m_providerCount(0),
-	m_selectedProvider(PROVIDER_ERROR),
-	m_selectedSpeakerType(0),
-	m_lastProvider(PROVIDER_ERROR),
-	m_digitalHandle(NULL),
-	m_num2DSamples(0),
-	m_num3DSamples(0),
-	m_numStreams(0),
-	m_delayFilter(NULL),
-	m_binkHandle(NULL),
-	m_pref3DProvider(AsciiString::TheEmptyString),
-	m_prefSpeaker(AsciiString::TheEmptyString)
-{
-	m_audioCache = NEW AudioFileCache;
-}
-
-//-------------------------------------------------------------------------------------------------
-MilesAudioManager::~MilesAudioManager()
-{
-	DEBUG_ASSERTCRASH(m_binkHandle == NULL, ("Leaked a Bink handle. Chuybregts"));
-	releaseHandleForBink();
-	closeDevice();
-	delete m_audioCache;
-	
-	DEBUG_ASSERTCRASH(this == TheAudio, ("Umm...\n"));
-	TheAudio = NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-AudioHandle MilesAudioManager::addAudioEvent( const AudioEventRTS *eventToAdd )
-{
-	if (TheGlobalData->m_preloadReport) {
-		if (!eventToAdd->getEventName().isEmpty()) {
-			m_allEventsLoaded.insert(eventToAdd->getEventName());
-		}
-	}
-
-	return AudioManager::addAudioEvent(eventToAdd);
-}
-#endif
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::audioDebugDisplay(DebugDisplayInterface *dd, void *, FILE *fp )
-{
-	std::list<PlayingAudio *>::iterator it;
-
-	static char buffer[128] = { 0 };
-	if (buffer[0] == 0) {
-		AIL_MSS_version(buffer, 128);
-	}
-	
-	Coord3D lookPos;
-	TheTacticalView->getPosition( &lookPos );
-	lookPos.z = TheTerrainLogic->getGroundHeight( lookPos.x, lookPos.y );
-	const Coord3D *mikePos = TheAudio->getListenerPosition();
-	Coord3D distanceVector = TheTacticalView->get3DCameraPosition();
-	distanceVector.sub( mikePos );
-
-	Int now = TheGameLogic->getFrame();
-	static Int lastCheck = now;
-	const Int frames = 60;
-	static Int latency = 0;
-	static Int worstLatency = 0;
-	if( lastCheck + frames <= now )
-	{
-		latency = AIL_get_timer_highest_delay();
-		if( latency > worstLatency )
-		{
-			worstLatency = latency;
-		}
-		lastCheck = now;
-	}
-
-	if( dd )
-	{
-		dd->printf("Miles Sound System version: %s    ", buffer);
-		dd->printf("Memory Usage : %d/%d\n", m_audioCache->getCurrentlyUsedSize(), m_audioCache->getMaxSize());
-		dd->printf("Sound: %s    ", (isOn(AudioAffect_Sound) ? "Yes" : "No"));
-		dd->printf("3DSound: %s    ", (isOn(AudioAffect_Sound3D) ? "Yes" : "No"));
-		dd->printf("Speech: %s    ", (isOn(AudioAffect_Speech) ? "Yes" : "No"));
-		dd->printf("Music: %s\n", (isOn(AudioAffect_Music) ? "Yes" : "No"));
-		dd->printf("Channels Available: ");
-		dd->printf("%d Sounds    ", m_sound->getAvailableSamples());
-
-		dd->printf("%d(%d) 3D Sounds\n", m_sound->getAvailable3DSamples(), m_available3DSamples.size() );
-		dd->printf("Volume: ");
-		dd->printf("Sound: %d    ", REAL_TO_INT(m_soundVolume * 100.0f));
-		dd->printf("3DSound: %d    ", REAL_TO_INT(m_sound3DVolume * 100.0f));
-		dd->printf("Speech: %d    ", REAL_TO_INT(m_speechVolume * 100.0f));
-		dd->printf("Music: %d\n", REAL_TO_INT(m_musicVolume * 100.0f));
-		dd->printf("Current 3D Provider: %s    ", 
-			
-		TheAudio->getProviderName(m_selectedProvider).str());
-		dd->printf("Current Speaker Type: %s\n", TheAudio->translateUnsignedIntToSpeakerType(TheAudio->getSpeakerType()).str());
-
-		dd->printf( "Looking at: (%d,%d,%d) -- Microphone at: (%d,%d,%d)\n", 
-				(Int)lookPos.x, (Int)lookPos.y, (Int)lookPos.z, (Int)mikePos->x, (Int)mikePos->y, (Int)mikePos->z );
-		dd->printf( "Camera distance from microphone: %d -- Zoom Volume: %d%%\n", 
-				(Int)distanceVector.length(), (Int)(TheAudio->getZoomVolume()*100.0f) );
-		dd->printf( "Worst latency: %d -- Current latency: %d\n", worstLatency, latency );
-
-		dd->printf("-----------------------------------------------------------\n");
-		dd->printf("Playing Audio\n");
-	}
-	if( fp )
-	{
-		fprintf( fp, "Miles Sound System version: %s    ", buffer );
-		fprintf( fp, "Memory Usage : %d/%d\n", m_audioCache->getCurrentlyUsedSize(), m_audioCache->getMaxSize() );
-		fprintf( fp, "Sound: %s    ", (isOn(AudioAffect_Sound) ? "Yes" : "No") );
-		fprintf( fp, "3DSound: %s    ", (isOn(AudioAffect_Sound3D) ? "Yes" : "No") );
-		fprintf( fp, "Speech: %s    ", (isOn(AudioAffect_Speech) ? "Yes" : "No") );
-		fprintf( fp, "Music: %s\n", (isOn(AudioAffect_Music) ? "Yes" : "No") );
-		fprintf( fp, "Channels Available: " );
-		fprintf( fp, "%d Sounds    ", m_sound->getAvailableSamples() );
-		fprintf( fp, "%d 3D Sounds\n", m_sound->getAvailable3DSamples() );
-		fprintf( fp, "Volume: ");
-		fprintf( fp, "Sound: %d    ", REAL_TO_INT(m_soundVolume * 100.0f) );
-		fprintf( fp, "3DSound: %d    ", REAL_TO_INT(m_sound3DVolume * 100.0f) );
-		fprintf( fp, "Speech: %d    ", REAL_TO_INT(m_speechVolume * 100.0f) );
-		fprintf( fp, "Music: %d\n", REAL_TO_INT(m_musicVolume * 100.0f) );
-		fprintf( fp, "Current 3D Provider: %s    ", TheAudio->getProviderName(m_selectedProvider).str());
-		fprintf( fp, "Current Speaker Type: %s\n", TheAudio->translateUnsignedIntToSpeakerType(TheAudio->getSpeakerType()).str());
-
-		fprintf( fp, "Looking at: (%d,%d,%d) -- Microphone at: (%d,%d,%d)\n", 
-				(Int)lookPos.x, (Int)lookPos.y, (Int)lookPos.z, (Int)mikePos->x, (Int)mikePos->y, (Int)mikePos->z );
-		fprintf( fp, "Camera distance from microphone: %d -- Zoom Volume: %d%%\n", 
-				(Int)distanceVector.length(), (Int)(TheAudio->getZoomVolume()*100.0f) );
-
-		fprintf( fp, "-----------------------------------------------------------\n" );
-		fprintf( fp, "Playing Audio\n" );
-	}
-
-	PlayingAudio *playing = NULL;
-	Int channel;
-	Int channelCount;
-	Real volume = 0.0f;
-	AsciiString filenameNoSlashes;
-
-	const Int maxChannels = 64;
-	PlayingAudio *playingArray[maxChannels] = { NULL };
-
-	// 2-D Sounds
-	if( dd )
-	{
-		dd->printf("-----------------------------------------------------Sounds\n");
-		channelCount = TheAudio->getNum2DSamples();
-		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-			playing = *it;
-			if (!playing) {
-				continue;
-			}
-
-			playingArray[AIL_sample_user_data(playing->m_sample, 0)] = playing;
-		}
-
-		for (Int i = 1; i <= maxChannels && i <= channelCount; ++i) {
-			playing = playingArray[i];
-			if (!playing) {
-				dd->printf("%d: Silence\n", i);
-				continue;
-			}
-
-			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
-			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
-			
-			// Calculate Sample volume
-			volume = 100.0f;
-			volume *= getEffectiveVolume(playing->m_audioEventRTS);
-
-			dd->printf("%2d: %-20s - (%s) Volume: %d (2D)\n", i, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT(volume));
-			playingArray[i] = NULL;
-		}
-	}
-	if( fp )
-	{
-		fprintf( fp, "-----------------------------------------------------Sounds\n" );
-		channelCount = TheAudio->getNum2DSamples();
-		channel = 1;
-		for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it )
-		{
-			playing = *it;
-			if( !playing ) 
-			{
-				continue;
-			}
-			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
-			filenameNoSlashes = filenameNoSlashes.reverseFind( '\\' ) + 1;
-			
-			// Calculate Sample volume
-			volume = 100.0f;
-			volume *= getEffectiveVolume( playing->m_audioEventRTS );
-
-			fprintf( fp, "%2d: %-20s - (%s) Volume: %d (2D)\n", channel++, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT( volume ) );
-		}
-		for( int i = channel; i <= channelCount; ++i ) 
-		{
-			fprintf( fp, "%d: Silence\n", i );
-		}
-	}
-
-	const Coord3D *microphonePos = TheAudio->getListenerPosition();
-
-	// Now 3D Sounds
-	if( dd )
-	{
-		dd->printf("--------------------------------------------------3D Sounds\n");
-		channelCount = TheAudio->getNum3DSamples();
-		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-			playing = *it;
-			if (!playing) {
-				continue;
-			}
-
-			playingArray[AIL_3D_user_data(playing->m_3DSample, 0)] = playing;
-		}
-
-		for (Int i = 1; i <= maxChannels && i <= channelCount; ++i) 
-		{
-			playing = playingArray[i];
-			if (!playing) 
-			{
-				dd->printf("%d: Silence\n", i);
-				continue;
-			}
-
-			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
-			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
-			
-			// Calculate Sample volume
-			volume = 100.0f;
-			volume *= getEffectiveVolume(playing->m_audioEventRTS);
-			Real dist = -1.0f;
-			const Coord3D *pos = playing->m_audioEventRTS->getPosition();
-			char distStr[32];
-			if( pos )
-			{
-				Coord3D vector = *microphonePos;
-				vector.sub( pos );
-				dist = vector.length();
-				sprintf( distStr, "%d", REAL_TO_INT( dist ) );
-			}
-			else
-			{
-				sprintf( distStr, "???" );
-			}
-			char str[32];
-			switch( playing->m_audioEventRTS->getOwnerType() )
-			{
-				case OT_Positional:
-					sprintf( str, "(3D)" );
-					break;
-				case OT_Object:
-					sprintf( str, "(3DObj)" );
-					break;
-				case OT_Drawable:
-					sprintf( str, "(3DDraw)" );
-					break;
-				case OT_Dead:
-					sprintf( str, "(3DDead)" );
-					break;
-
-			}
-
-			dd->printf("%2d: %-20s - (%s) Volume: %d, Dist: %s, %s\n", 
-				i, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT(volume), distStr, str );
-			playingArray[i] = NULL;
-		}
-	}
-	if( fp )
-	{
-		fprintf( fp, "--------------------------------------------------3D Sounds\n" );
-		channelCount = TheAudio->getNum3DSamples();
-		channel = 1;
-		for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) 
-		{
-			playing = *it;
-			if( !playing ) 
-			{
-				continue;
-			}
-			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
-			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
-			
-			// Calculate Sample volume
-			volume = 100.0f;
-			volume *= getEffectiveVolume( playing->m_audioEventRTS );
-			fprintf( fp, "%2d: %-24s - (%s) Volume: %d \n", channel++, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT( volume ) );
-		}
-
-		for( int i = channel; i <= channelCount; ++i ) 
-		{
-			fprintf( fp, "%2d: Silence\n", i );
-		}
-	}
-
-	// Now Streams
-	if( dd )
-	{
-		dd->printf("----------------------------------------------------Streams\n");
-		channelCount = TheAudio->getNumStreams();
-		channel = 1;
-		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-			playing = *it;
-			if (!playing) {
-				continue;
-			}
-			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
-			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
-
-			
-			// Calculate Sample volume
-			volume = 100.0f;
-			volume *= getEffectiveVolume(playing->m_audioEventRTS);
-
-			dd->printf("%2d: %-24s - (%s)  Volume: %d (Stream)\n", channel++, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT(volume));
-		}
-		
-		for ( int i = channel; i <= channelCount; ++i) {
-			dd->printf("%2d: Silence\n", i);
-		}
-		dd->printf("===========================================================\n");
-	}
-	if( fp )
-	{
-		fprintf( fp, "----------------------------------------------------Streams\n" );
-		channelCount = TheAudio->getNumStreams();
-		channel = 1;
-		for( it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it ) 
-		{
-			playing = *it;
-			if( !playing ) 
-			{
-				continue;
-			}
-			filenameNoSlashes = playing->m_audioEventRTS->getFilename();
-			filenameNoSlashes = filenameNoSlashes.reverseFind('\\') + 1;
-			
-			// Calculate Sample volume
-			volume = 100.0f;
-			volume *= getEffectiveVolume(playing->m_audioEventRTS);
-
-			fprintf( fp, "%2d: %-24s - (%s)  Volume: %d (Stream)\n", channel++, playing->m_audioEventRTS->getEventName().str(), filenameNoSlashes.str(), REAL_TO_INT( volume ) );
-		}
-		
-		for( int i = channel; i <= channelCount; ++i ) 
-		{
-			fprintf( fp, "%2d: Silence\n", i );
-		}
-		fprintf( fp, "===========================================================\n" );
-	}
-}
-#endif
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::init()
-{
-	AudioManager::init();
-#ifdef INTENSE_DEBUG
-	DEBUG_LOG(("Sound has temporarily been disabled in debug builds only. jkmcd\n"));
-	// for now, RTS_DEBUG builds only should have no sound. ask jkmcd or srj about this.
-	return;
-#endif
-
-	// We should now know how many samples we want to load
-	openDevice();
-	m_audioCache->setMaxSize(getAudioSettings()->m_maxCacheSize);
-
-	// Now, set the file callbacks to load the streams from Biggie files
-	AIL_set_file_callbacks(streamingFileOpen, streamingFileClose, streamingFileSeek, streamingFileRead);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::postProcessLoad()
-{
-	AudioManager::postProcessLoad();
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::reset()
-{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	dumpAllAssetsUsed();
-	m_allEventsLoaded.clear();
-#endif
-
-	AudioManager::reset();
-	stopAllAudioImmediately();
-  removeAllAudioRequests();
-  // This must come after stopAllAudioImmediately() and removeAllAudioRequests(), to ensure that
-  // sounds pointing to the temporary AudioEventInfo handles are deleted before their info is deleted
-  removeLevelSpecificAudioEventInfos();
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::update()
-{
-	AudioManager::update();
-	setDeviceListenerPosition();
-	processRequestList();
-	processPlayingList();
-	processFadingList();
-	processStoppedList();	
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::stopAudio( AudioAffect which )
-{
-	// All we really need to do is:
-	// 1) Remove the EOS callback.
-	// 2) Stop the sample, (so that when we later unload it, bad stuff doesn't happen)
-	// 3) Set the status to stopped, so that when we next process the playing list, we will 
-	//		correctly clean up the sample.
-
-
-	std::list<PlayingAudio *>::iterator it;
-
-	PlayingAudio *playing = NULL;
-	if (BitIsSet(which, AudioAffect_Sound)) {
-		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				AIL_register_EOS_callback(playing->m_sample, NULL);
-				AIL_stop_sample(playing->m_sample);
-				playing->m_status = PS_Stopped;
-			}
-		}
-	}
-
-	if (BitIsSet(which, AudioAffect_Sound3D)) {
-		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				AIL_register_3D_EOS_callback(playing->m_3DSample, NULL);
-				AIL_stop_3D_sample(playing->m_3DSample);
-				playing->m_status = PS_Stopped;
-			}
-		}
-	}
-
-	if (BitIsSet(which, AudioAffect_Speech | AudioAffect_Music)) {
-		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-					if (!BitIsSet(which, AudioAffect_Music)) {
-						continue;
-					}
-				} else {
-					if (!BitIsSet(which, AudioAffect_Speech)) {
-						continue;
-					}
-				}
-				AIL_register_stream_callback(playing->m_stream, NULL);
-				AIL_pause_stream(playing->m_stream, 1);
-				playing->m_status = PS_Stopped;
-			}
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::pauseAudio( AudioAffect which )
-{
-	std::list<PlayingAudio *>::iterator it;
-
-	PlayingAudio *playing = NULL;
-	if (BitIsSet(which, AudioAffect_Sound)) {
-		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				AIL_stop_sample(playing->m_sample);
-			}
-		}
-	}
-
-	if (BitIsSet(which, AudioAffect_Sound3D)) {
-		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				AIL_stop_3D_sample(playing->m_3DSample);
-			}
-		}
-	}
-
-	if (BitIsSet(which, AudioAffect_Speech | AudioAffect_Music)) {
-		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-					if (!BitIsSet(which, AudioAffect_Music)) {
-						continue;
-					}
-				} else {
-					if (!BitIsSet(which, AudioAffect_Speech)) {
-						continue;
-					}
-				}
-
-				AIL_pause_stream(playing->m_stream, 1);
-			}
-		}
-	}
-	
-	//Get rid of PLAY audio requests when pausing audio.
-	std::list<AudioRequest*>::iterator ait;
-	for (ait = m_audioRequests.begin(); ait != m_audioRequests.end(); /* empty */) 
-	{
-		AudioRequest *req = (*ait);
-		if( req && req->m_request == AR_Play ) 
-		{
-			deleteInstance(req);
-			ait = m_audioRequests.erase(ait);
-		}
-		else
-		{
-			ait++;
-		}
-	}
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::resumeAudio( AudioAffect which )
-{
-	std::list<PlayingAudio *>::iterator it;
-
-	PlayingAudio *playing = NULL;
-	if (BitIsSet(which, AudioAffect_Sound)) {
-		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				AIL_resume_sample(playing->m_sample);
-			}
-		}
-	}
-
-	if (BitIsSet(which, AudioAffect_Sound3D)) {
-		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				AIL_resume_3D_sample(playing->m_3DSample);
-			}
-		}
-	}
-
-	if (BitIsSet(which, AudioAffect_Speech | AudioAffect_Music)) {
-		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-			playing = *it;
-			if (playing) {
-				if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-					if (!BitIsSet(which, AudioAffect_Music)) {
-						continue;
-					}
-				} else {
-					if (!BitIsSet(which, AudioAffect_Speech)) {
-						continue;
-					}
-				}
-				AIL_pause_stream(playing->m_stream, 0);
-			}
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::pauseAmbient( Bool shouldPause )
-{
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::playAudioEvent( AudioEventRTS *event )
-{
-#ifdef INTENSIVE_AUDIO_DEBUG
-	DEBUG_LOG(("MILES (%d) - Processing play request: %d (%s)", TheGameLogic->getFrame(), event->getPlayingHandle(), event->getEventName().str()));
-#endif
-	const AudioEventInfo *info = event->getAudioEventInfo();
-	if (!info) {
-		return;
-	}
-
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing = NULL;
-
-	AudioHandle handleToKill = event->getHandleToKill();
-
-	AsciiString fileToPlay = event->getFilename();
-	PlayingAudio *audio = allocatePlayingAudio();
-	switch(info->m_soundType)
-	{
-		case AT_Music:
-		case AT_Streaming:
-		{
-		#ifdef INTENSIVE_AUDIO_DEBUG
-			DEBUG_LOG(("- Stream\n"));
-		#endif
-			
-			if ((info->m_soundType == AT_Streaming) && event->getUninterruptable()) {
-				stopAllSpeech();
-			}
-
-			Real curVolume = 1.0;
-			if (info->m_soundType == AT_Music) {
-				curVolume = m_musicVolume;
-			} else {
-				curVolume = m_speechVolume;
-			}
-			curVolume *= event->getVolume();
-
-			Bool foundSoundToReplace = false;
-			if (handleToKill) {
-				for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-					playing = (*it);
-					if (!playing) {
-						continue;
-					}
-
-					if (playing->m_audioEventRTS && playing->m_audioEventRTS->getPlayingHandle() == handleToKill) 
-					{
-						//Release this streaming channel immediately because we are going to play another sound in it's place.
-						releasePlayingAudio(playing);
-						m_playingStreams.erase(it);
-						foundSoundToReplace = true;
-						break;
-					}
-				}
-			}
-
-			HSTREAM stream;
-			if (!handleToKill || foundSoundToReplace) {
-				stream = AIL_open_stream(m_digitalHandle, fileToPlay.str(), 0);
-			} else {
-				stream = NULL;
-			}
-
-			// Put this on here, so that the audio event RTS will be cleaned up regardless.
-			audio->m_audioEventRTS = event; 
-			audio->m_stream = stream;
-			audio->m_type = PAT_Stream;
-
-			if (stream) {
-				if ((info->m_soundType == AT_Streaming) && event->getUninterruptable()) {
-					setDisallowSpeech(TRUE);
-	 			}
-				AIL_set_stream_volume_pan(stream, curVolume, 0.5f);
-				playStream(event, stream);
-				m_playingStreams.push_back(audio);
-				audio = NULL;
-			}
-			break;
-		}
-
-		case AT_SoundEffect:
-		{
-		#ifdef INTENSIVE_AUDIO_DEBUG
-			DEBUG_LOG(("- Sound"));
-		#endif
-
-			
-			if (event->isPositionalAudio()) {
-				// Sounds that are non-global are positional 3-D sounds. Deal with them accordingly
-			#ifdef INTENSIVE_AUDIO_DEBUG
-				DEBUG_LOG((" Positional"));
-			#endif
-				Bool foundSoundToReplace = false;
-				if (handleToKill) 
-				{
-					for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-						playing = (*it);
-						if (!playing) {
-							continue;
-						}
-
-						if( playing->m_audioEventRTS && playing->m_audioEventRTS->getPlayingHandle() == handleToKill ) 
-						{
-							//Release this 3D sound channel immediately because we are going to play another sound in it's place.
-							releasePlayingAudio(playing);
-							m_playing3DSounds.erase(it);
-							foundSoundToReplace = true;
-							break;
-						}
-					}
-				}
-				
-				H3DSAMPLE sample3D;
-				if( !handleToKill || foundSoundToReplace )
-				{
-					sample3D = getFirst3DSample( event );
-					if( !sample3D )
-					{
-						//If we don't have an available sample, kill the lowest priority assuming we have one that is lower
-						//than the sound we are trying to add. One possibility for strangeness is when an interrupt sound
-						//that wants to kill a handle to replace it, it's possible that another request already killed it,
-						//in which case we need to attempt to find another sound to kill.
-						if( killLowestPrioritySoundImmediately( event ) )
-						{
-							sample3D = getFirst3DSample( event );
-						}
-					}
-				} 
-				else 
-				{
-					sample3D = NULL;
-				}
-				// Push it onto the list of playing things
-				audio->m_audioEventRTS = event; 
-				audio->m_3DSample = sample3D;
-				audio->m_file = NULL;
-				audio->m_type = PAT_3DSample;
-				m_playing3DSounds.push_back(audio);
-
-				if (sample3D) {
-					audio->m_file = playSample3D(event, sample3D);
-					m_sound->notifyOf3DSampleStart();
-				}
-
-				if( !audio->m_file ) 
-				{
-					m_playing3DSounds.pop_back();
-					#ifdef INTENSIVE_AUDIO_DEBUG
-						DEBUG_LOG((" Killed (no handles available)\n"));
-					#endif
-				} 
-				else 
-				{
-					audio = NULL;
-					#ifdef INTENSIVE_AUDIO_DEBUG
-						DEBUG_LOG((" Playing.\n"));
-					#endif
-				}
-			} 
-			else 
-			{
-				// UI sounds are always 2-D. All other sounds should be Positional
-				// Unit acknowledgement, etc, falls into the UI category of sound.
-				Bool foundSoundToReplace = false;
-				if (handleToKill) {
-					for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-						playing = (*it);
-						if (!playing) {
-							continue;
-						}
-
-						if (playing->m_audioEventRTS && playing->m_audioEventRTS->getPlayingHandle() == handleToKill) 
-						{
-							//Release this 2D sound channel immediately because we are going to play another sound in it's place.
-							releasePlayingAudio(playing);
-							m_playingSounds.erase(it);
-							foundSoundToReplace = true;
-							break;
-						}
-					}
-				}
-
-				HSAMPLE sample;
-				if( !handleToKill || foundSoundToReplace ) 
-				{
-					sample = getFirst2DSample(event);
-					if( !sample )
-					{
-						//If we don't have an available sample, kill the lowest priority assuming we have one that is lower
-						//than the sound we are trying to add. One possibility for strangeness is when an interrupt sound
-						//that wants to kill a handle to replace it, it's possible that another request already killed it,
-						//in which case we need to attempt to find another sound to kill.
-						if( killLowestPrioritySoundImmediately( event ) )
-						{
-							sample = getFirst2DSample( event );
-						}
-					}
-					} 
-				else 
-				{
-					sample = NULL;
-				}
-
-				// Push it onto the list of playing things
-				audio->m_audioEventRTS = event; 
-				audio->m_sample = sample;
-				audio->m_file = NULL;
-				audio->m_type = PAT_Sample;
-				m_playingSounds.push_back(audio);
-
-				if (sample) {
-					audio->m_file = playSample(event, sample);
-					m_sound->notifyOf2DSampleStart();
-				}
-
-				if (!audio->m_file) {
-					#ifdef INTENSIVE_AUDIO_DEBUG
-						DEBUG_LOG((" Killed (no handles available)\n"));
-					#endif
-					m_playingSounds.pop_back();
-				} else {
-					audio = NULL;
-				}
-
-				#ifdef INTENSIVE_AUDIO_DEBUG
-					DEBUG_LOG((" Playing.\n"));
-				#endif
-			}
-			break;
-		}
-	}
-
-	// If we were able to successfully play audio, then we set it to NULL above. (And it will be freed
-	// later. However, if audio is non-NULL at this point, then it must be freed.
-	if (audio) {
-		releasePlayingAudio(audio);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::stopAudioEvent( AudioHandle handle )
-{
-#ifdef INTENSIVE_AUDIO_DEBUG
-	DEBUG_LOG(("MILES (%d) - Processing stop request: %d\n", TheGameLogic->getFrame(), handle));
-#endif
-
-	std::list<PlayingAudio *>::iterator it;
-	if ( handle == AHSV_StopTheMusic || handle == AHSV_StopTheMusicFade ) {
-		// for music, just find the currently playing music stream and kill it.
-		for ( it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it ) {
-			PlayingAudio *audio = (*it);
-			if (!audio) {
-				continue;
-			}
-
-			if( audio->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music ) 
-			{
-				if( handle == AHSV_StopTheMusicFade ) 
-				{
-					m_fadingAudio.push_back(audio);
-				} 
-				else 
-				{
-					//m_stoppedAudio.push_back(audio);
-					releasePlayingAudio( audio );
-				}
-				m_playingStreams.erase(it);
-				break;
-			}
-		}
-	}
-
-	for ( it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it ) {
-		PlayingAudio *audio = (*it);
-		if (!audio) {
-			continue;
-		}
-
-		if (audio->m_audioEventRTS->getPlayingHandle() == handle) {
-			// found it
-			audio->m_requestStop = true;
-			notifyOfAudioCompletion((UnsignedInt)(audio->m_stream), PAT_Stream);
-			break;
-		}
-	}
-
-	for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
-		PlayingAudio *audio = (*it);
-		if (!audio) {
-			continue;
-		}
-
-		if (audio->m_audioEventRTS->getPlayingHandle() == handle) {
-			audio->m_requestStop = true;
-			break;
-		}
-	}
-
-	for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
-		PlayingAudio *audio = (*it);
-		if (!audio) {
-			continue;
-		}
-
-		if (audio->m_audioEventRTS->getPlayingHandle() == handle) {
-		#ifdef INTENSIVE_AUDIO_DEBUG
-			DEBUG_LOG((" (%s)\n", audio->m_audioEventRTS->getEventName()));
-		#endif
-			audio->m_requestStop = true;
-			break;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::killAudioEventImmediately( AudioHandle audioEvent )
-{
-	//First look for it in the request list.
-	std::list<AudioRequest*>::iterator ait;
-	for( ait = m_audioRequests.begin(); ait != m_audioRequests.end(); ait++ ) 
-	{
-		AudioRequest *req = (*ait);
-		if( req && req->m_request == AR_Play && req->m_handleToInteractOn == audioEvent ) 
-		{
-			deleteInstance(req);
-			ait = m_audioRequests.erase(ait);
-			return;
-		}
-	}
-
-	//Look for matching 3D sound to kill
-	std::list<PlayingAudio *>::iterator it;
-	for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); it++ ) 
-	{
-		PlayingAudio *audio = (*it);
-		if( !audio ) 
-		{
-			continue;
-		}
-
-		if( audio->m_audioEventRTS->getPlayingHandle() == audioEvent ) 
-		{
-			releasePlayingAudio( audio );
-			m_playing3DSounds.erase( it );
-			return;
-		}
-	}
-
-	//Look for matching 2D sound to kill
-	for( it = m_playingSounds.begin(); it != m_playingSounds.end(); it++ ) 
-	{
-		PlayingAudio *audio = (*it);
-		if( !audio )
-		{
-			continue;
-		}
-
-		if( audio->m_audioEventRTS->getPlayingHandle() == audioEvent ) 
-		{
-			releasePlayingAudio( audio );
-			m_playingSounds.erase( it );
-			return;
-		}
-	}
-
-	//Look for matching steaming sound to kill
-	for( it = m_playingStreams.begin(); it != m_playingStreams.end(); it++ ) 
-	{
-		PlayingAudio *audio = (*it);
-		if( !audio )
-		{
-			continue;
-		}
-
-		if( audio->m_audioEventRTS->getPlayingHandle() == audioEvent ) 
-		{
-			releasePlayingAudio( audio );
-			m_playingStreams.erase( it );
-			return;
-		}
-	}
-
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::pauseAudioEvent( AudioHandle handle )
-{
-	// pause audio
-}
-
-//-------------------------------------------------------------------------------------------------
-void *MilesAudioManager::loadFileForRead( AudioEventRTS *eventToLoadFrom )
-{
-	return m_audioCache->openFile(eventToLoadFrom);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::closeFile( void *fileRead )
-{
-	m_audioCache->closeFile(fileRead);
-}
-
-
-//-------------------------------------------------------------------------------------------------
-PlayingAudio *MilesAudioManager::allocatePlayingAudio( void )
-{
-	PlayingAudio *aud = NEW PlayingAudio;	// poolify
-	aud->m_status = PS_Playing;
-	return aud;
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::releaseMilesHandles( PlayingAudio *release )
-{
-	switch (release->m_type)
-	{
-		case PAT_Sample:
-		{
-			if (release->m_sample) {
-				AIL_register_EOS_callback(release->m_sample, NULL);
-				AIL_stop_sample(release->m_sample);
-				m_availableSamples.push_back(release->m_sample);
-			}
-			break;
-		}
-		case PAT_3DSample:
-		{
-			if (release->m_3DSample) {
-				AIL_register_3D_EOS_callback(release->m_3DSample, NULL);
-				AIL_stop_3D_sample(release->m_3DSample);
-				m_available3DSamples.push_back(release->m_3DSample);
-			}
-			break;
-		}
-		case PAT_Stream:
-		{
-			if (release->m_stream) {
-				AIL_register_stream_callback(release->m_stream, NULL);
-				AIL_close_stream(release->m_stream);
-			}
-			break;
-		}
-	}
-	release->m_type = PAT_INVALID;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::releasePlayingAudio( PlayingAudio *release )
-{
-	if (release->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_SoundEffect) {
-		if (release->m_type == PAT_Sample) {
-			if (release->m_sample) {
-				m_sound->notifyOf2DSampleCompletion();
-			}
-		} else {
-			if (release->m_3DSample) {
-				m_sound->notifyOf3DSampleCompletion();
-			}
-		}
-	}
-	releaseMilesHandles(release);	// forces stop of this audio
-	closeFile( release->m_file );
-	if (release->m_cleanupAudioEventRTS) {
-		releaseAudioEventRTS(release->m_audioEventRTS);
-	}
-	delete release;
-	release = NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::stopAllAudioImmediately( void )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-
-	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ) {
-		playing = *it;
-		if (!playing) {
-			continue;
-		}
-
-		releasePlayingAudio(playing);
-		it = m_playingSounds.erase(it);
-	}
-
-	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ) {
-		playing = *it;
-		if (!playing) {
-			continue;
-		}
-
-		releasePlayingAudio(playing);
-		it = m_playing3DSounds.erase(it);
-	}
-
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ) {
-		playing = (*it);
-		if (!playing) {
-			continue;
-		}
-
-		releasePlayingAudio(playing);
-		it = m_playingStreams.erase(it);
-	}
-
-  for (it = m_fadingAudio.begin(); it != m_fadingAudio.end(); ) {
-    playing = (*it);
-    if (!playing) {
-      continue;
-    }
-    
-    releasePlayingAudio(playing);
-    it = m_fadingAudio.erase(it);
-  }
-  
-	std::list<HAUDIO>::iterator hit;
-	for (hit = m_audioForcePlayed.begin(); hit != m_audioForcePlayed.end(); ++hit) {
-		if (*hit) {
-			AIL_quick_unload(*hit);
-		}
-	}
-
-	m_audioForcePlayed.clear();
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::freeAllMilesHandles( void )
-{
-	// First, we need to ensure that we don't have any sample handles open. To that end, we must stop
-	// all of our currently playing audio.
-	stopAllAudioImmediately();
-
-	// Walks through the available 2-D and 3-D handles and releases them
-	std::list<HSAMPLE>::iterator it;
-	for ( it = m_availableSamples.begin(); it != m_availableSamples.end(); /* empty */ ) {
-		HSAMPLE sample = *it;
-		AIL_release_sample_handle(sample);
-		it = m_availableSamples.erase(it);
-	}
-	m_num2DSamples = 0;
-	
-	std::list<H3DSAMPLE>::iterator it3D;
-	for ( it3D = m_available3DSamples.begin(); it3D != m_available3DSamples.end(); /* empty */ ) {
-		H3DSAMPLE sample3D = *it3D;
-		AIL_release_3D_sample_handle(sample3D);
-		it3D = m_available3DSamples.erase(it3D);
-	}
-	m_num3DSamples = 0;
-	m_numStreams = 0;
-}
-
-//-------------------------------------------------------------------------------------------------
-HSAMPLE MilesAudioManager::getFirst2DSample( AudioEventRTS *event )
-{
-	if (m_availableSamples.begin() != m_availableSamples.end()) {
-		HSAMPLE retSample = *m_availableSamples.begin();
-		m_availableSamples.erase(m_availableSamples.begin());
-		return (retSample);
-	}
-
-	// Find the first sample of lower priority than my augmented priority that is interruptable and take its handle
-
-	return NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-H3DSAMPLE MilesAudioManager::getFirst3DSample( AudioEventRTS *event )
-{
-	if (m_available3DSamples.begin() != m_available3DSamples.end()) {
-		H3DSAMPLE retSample = *m_available3DSamples.begin();
-		m_available3DSamples.erase(m_available3DSamples.begin());
-		return (retSample);
-	}
-
-	// Find the first sample of lower priority than my augmented priority that is interruptable and take its handle
-	return NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::adjustPlayingVolume( PlayingAudio *audio )
-{
-	Real desiredVolume = audio->m_audioEventRTS->getVolume() * audio->m_audioEventRTS->getVolumeShift();
-	Real pan;
-	if (audio->m_type == PAT_Sample) {
-		AIL_sample_volume_pan(audio->m_sample, NULL, &pan);
-		AIL_set_sample_volume_pan(audio->m_sample, m_soundVolume * desiredVolume, pan);
-
-	} else if (audio->m_type == PAT_3DSample) { 
-		AIL_set_3D_sample_volume(audio->m_3DSample, m_sound3DVolume * desiredVolume);
-
-	} else if (audio->m_type == PAT_Stream) {
-		AIL_stream_volume_pan(audio->m_stream, NULL, &pan);
-		if (audio->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music ) {
-			AIL_set_stream_volume_pan(audio->m_stream, m_musicVolume * desiredVolume, pan);
-			
-		} else {
-			AIL_set_stream_volume_pan(audio->m_stream, m_speechVolume * desiredVolume, pan);
-			
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::stopAllSpeech( void )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ) {
-		playing = (*it);
-		if (!playing) {
-			continue;
-		}
-
-		if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Streaming) {
-			releasePlayingAudio(playing);
-			it = m_playingStreams.erase(it);
-		} else {
-			++it;
-		}
-	}
-
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::initFilters( HSAMPLE sample, const AudioEventRTS *event )
-{
-	// set the sample volume
-	Real volume = event->getVolume() * event->getVolumeShift() * m_soundVolume;
-	AIL_set_sample_volume_pan(sample, volume, 0.5f);
-
-	// pitch shift
-	Real pitchShift = event->getPitchShift();
-	if (pitchShift == 0.0f) {
-		DEBUG_CRASH(("Invalid Pitch shift in sound: '%s'", event->getEventName().str()) );
-	} else {
-		AIL_set_sample_playback_rate(sample, REAL_TO_INT(AIL_sample_playback_rate(sample) * pitchShift));
-	}
-
-	// set up delay filter, if applicable
-	if (event->getDelay() > 0.0f) {
-		Real value;
-		value = event->getDelay();
-		AIL_set_sample_processor(sample, DP_FILTER, m_delayFilter);
-		AIL_set_filter_sample_preference(sample, "Mono Delay Time", &value);
-
-		value = 0.0;
-		AIL_set_filter_sample_preference(sample, "Mono Delay", &value);
-		AIL_set_filter_sample_preference(sample, "Mono Delay Mix", &value);		
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::initFilters3D( H3DSAMPLE sample, const AudioEventRTS *event, const Coord3D *pos )
-{
-	// set the sample volume
-	Real volume = event->getVolume() * event->getVolumeShift() * m_sound3DVolume;
-	AIL_set_3D_sample_volume(sample, volume);
-
-	// pitch shift
-	Real pitchShift = event->getPitchShift();
-	if (pitchShift == 0.0f) {
-		DEBUG_CRASH(("Invalid Pitch shift in sound: '%s'", event->getEventName().str()) );
-	} else {
-		AIL_set_3D_sample_playback_rate(sample, REAL_TO_INT(AIL_3D_sample_playback_rate(sample) * pitchShift));
-	}
-	
-	// Low pass filter
-	if (event->getAudioEventInfo()->m_lowPassFreq > 0 && !isOnScreen(pos) ) {
-		AIL_set_3D_sample_occlusion(sample, 1.0f - event->getAudioEventInfo()->m_lowPassFreq);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::nextMusicTrack( void )
-{
-	AsciiString trackName;
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-			trackName = playing->m_audioEventRTS->getEventName();
-		}
-	}
-
-	// Stop currently playing music
-	TheAudio->removeAudioEvent(AHSV_StopTheMusic);
-
-	trackName = nextTrackName(trackName);
-	AudioEventRTS newTrack(trackName);
-	TheAudio->addAudioEvent(&newTrack);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::prevMusicTrack( void )
-{
-	AsciiString trackName;
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-			trackName = playing->m_audioEventRTS->getEventName();
-		}
-	}
-
-	// Stop currently playing music 
-	TheAudio->removeAudioEvent(AHSV_StopTheMusic);
-
-	trackName = prevTrackName(trackName);
-	AudioEventRTS newTrack(trackName);
-	TheAudio->addAudioEvent(&newTrack);
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isMusicPlaying( void ) const
-{
-	std::list<PlayingAudio *>::const_iterator it;
-	PlayingAudio *playing;
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::hasMusicTrackCompleted( const AsciiString& trackName, Int numberOfTimes ) const
-{
-	std::list<PlayingAudio *>::const_iterator it;
-	PlayingAudio *playing;
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-			if (playing->m_audioEventRTS->getEventName() == trackName) {
-				if (INFINITE_LOOP_COUNT - AIL_stream_loop_count(playing->m_stream) >= numberOfTimes) {
-					return TRUE;
-				}
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString MilesAudioManager::getMusicTrackName( void ) const
-{
-	// First check the requests. If there's one there, then report that as the currently playing track.
-	std::list<AudioRequest *>::const_iterator ait;
-	for (ait = m_audioRequests.begin(); ait != m_audioRequests.end(); ++ait) {
-		if ((*ait)->m_request != AR_Play) {
-			continue;
-		}
-
-		if (!(*ait)->m_usePendingEvent) {
-			continue;
-		}
-
-		if ((*ait)->m_pendingEvent->getAudioEventInfo()->m_soundType == AT_Music) {
-			return (*ait)->m_pendingEvent->getEventName();
-		}
-	}
-
-	std::list<PlayingAudio *>::const_iterator it;
-	PlayingAudio *playing;
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-			return playing->m_audioEventRTS->getEventName();
-		}
-	}
-
-	return AsciiString::TheEmptyString;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::openDevice( void )
-{
-	if (!TheGlobalData->m_audioOn) {
-		return;
-	}
-	
-	AIL_set_redist_directory("MSS\\");
-	AIL_startup();
-	Int retval = 0;
-
-	// AIL_quick_startup should be replaced later with a call to actually pick which device to use, etc
-	const AudioSettings *audioSettings = getAudioSettings();
-	m_selectedSpeakerType = TheAudio->translateSpeakerTypeToUnsignedInt(m_prefSpeaker);
-
-	retval = AIL_quick_startup(audioSettings->m_useDigital, audioSettings->m_useMidi, audioSettings->m_outputRate, audioSettings->m_outputBits, audioSettings->m_outputChannels);
-	
-	// Quick handles tells us where to store the various devices. For now, we're only interested in the digital handle.
-	AIL_quick_handles(&m_digitalHandle, NULL, NULL);
-	
-	if (retval) {
-		buildProviderList();
-	} else {
-		// if we couldn't initialize any devices, turn sound off (fail silently)
-		setOn( false, AudioAffect_All );
-	}
-
-	selectProvider(TheAudio->getProviderIndex(m_pref3DProvider));
-
-	// Now that we're all done, update the cached variables so that everything is in sync.
-	TheAudio->refreshCachedVariables();
-
-	if (!isValidProvider()) {
-		return;
-	}
-
-	initDelayFilter();
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::closeDevice( void )
-{
-	freeAllMilesHandles();
-	unselectProvider();
-	AIL_shutdown();
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isCurrentlyPlaying( AudioHandle handle )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-
-	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getPlayingHandle() == handle) {
-			return true;
-		}
-	}
-
-	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getPlayingHandle() == handle) {
-			return true;
-		}
-	}
-
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getPlayingHandle() == handle) {
-			return true;
-		}
-	}
-
-	// if something is requested, it is also considered playing
-	std::list<AudioRequest *>::iterator ait;
-	AudioRequest *req = NULL;
-	for (ait = m_audioRequests.begin(); ait != m_audioRequests.end(); ++ait) {
-		req = *ait;
-		if (req && req->m_usePendingEvent && req->m_pendingEvent->getPlayingHandle() == handle) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::notifyOfAudioCompletion( UnsignedInt audioCompleted, UnsignedInt flags )
-{
-	PlayingAudio *playing = findPlayingAudioFrom(audioCompleted, flags);
-	if (!playing) {
-		DEBUG_CRASH(("Audio has completed playing, but we can't seem to find it. - jkmcd"));
-		return;
-	}
-	
-	if (getDisallowSpeech() && playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Streaming) {
-		setDisallowSpeech(FALSE);
-	}
-
-	if (playing->m_audioEventRTS->getAudioEventInfo()->m_control & AC_LOOP) {
-		if (playing->m_audioEventRTS->getNextPlayPortion() == PP_Attack) {
-			playing->m_audioEventRTS->setNextPlayPortion(PP_Sound);
-		}
-		if (playing->m_audioEventRTS->getNextPlayPortion() == PP_Sound) {
-			// First, decrease the loop count.
-			playing->m_audioEventRTS->decreaseLoopCount();
-
-			// Now, try to start the next loop
-			if (startNextLoop(playing)) {
-				return;
-			}
-		}
-	}
-
-	playing->m_audioEventRTS->advanceNextPlayPortion();
-	if (playing->m_audioEventRTS->getNextPlayPortion() != PP_Done) {
-		if (playing->m_type == PAT_Sample) {
-			closeFile(playing->m_file);	// close it so as not to leak it.
-			playing->m_file = playSample(playing->m_audioEventRTS, playing->m_sample);
-			
-			// If we don't have a file now, then we should drop to the stopped status so that 
-			// We correctly close this handle.
-			if (playing->m_file) {
-				return;
-			}
-		} else if (playing->m_type == PAT_3DSample) {
-			closeFile(playing->m_file);	// close it so as not to leak it.
-			playing->m_file = playSample3D(playing->m_audioEventRTS, playing->m_3DSample);
-
-			// If we don't have a file now, then we should drop to the stopped status so that 
-			// We correctly close this handle.
-			if (playing->m_file) {
-				return;
-			}
-		} 
-	}
-
-	if (playing->m_type == PAT_Stream) {
-		if (playing->m_audioEventRTS->getAudioEventInfo()->m_soundType == AT_Music) {
-			playStream(playing->m_audioEventRTS, playing->m_stream);
-			
-			return;
-		}
-	}
-
-	playing->m_status = PS_Stopped;	// it will be cleaned up on the next frame update
-}
-
-//-------------------------------------------------------------------------------------------------
-PlayingAudio *MilesAudioManager::findPlayingAudioFrom( UnsignedInt audioCompleted, UnsignedInt flags )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-
-	if (flags == PAT_Sample) {
-		HSAMPLE sample = (HSAMPLE) audioCompleted;
-		for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-			playing = *it;
-			if (playing && playing->m_sample == sample) {
-				return playing;
-			}
-		}
-	}
-
-	if (flags == PAT_3DSample) {
-		H3DSAMPLE sample3D = (H3DSAMPLE) audioCompleted;
-		for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-			playing = *it;
-			if (playing && playing->m_3DSample == sample3D) {
-				return playing;
-			}
-		}
-	}
-
-	if (flags == PAT_Stream) {
-		HSTREAM stream = (HSTREAM) audioCompleted;
-		for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-			playing = *it;
-			if (playing && playing->m_stream == stream) {
-				return playing;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getProviderCount( void ) const
-{
-	return m_providerCount;
-}
-
-//-------------------------------------------------------------------------------------------------
-AsciiString MilesAudioManager::getProviderName( UnsignedInt providerNum ) const
-{
-	if (isOn(AudioAffect_Sound3D) && providerNum < m_providerCount) {
-		return m_provider3D[providerNum].name;
-	}
-
-	return AsciiString::TheEmptyString;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getProviderIndex( AsciiString providerName ) const
-{
-	for (UnsignedInt i = 0; i < m_providerCount; ++i) {
-		if (providerName == m_provider3D[i].name) {
-			return i;
-		}
-	}
-
-	return PROVIDER_ERROR;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::selectProvider( UnsignedInt providerNdx )
-{
-	if (!isOn(AudioAffect_Sound3D)) 
-	{
-		return;
-	}
-
-	if (providerNdx == m_selectedProvider) 
-	{
-		return;
-	}
-
-	if (isValidProvider()) 
-	{
-		freeAllMilesHandles();
-		unselectProvider();
-	}
-
-	LPDIRECTSOUND lpDirectSoundInfo;
-	AIL_get_DirectSound_info( NULL, (void**)&lpDirectSoundInfo, NULL );
-	Bool useDolby = FALSE;
-	if( lpDirectSoundInfo )
-	{
-		DWORD speakerConfig;
-		lpDirectSoundInfo->GetSpeakerConfig( &speakerConfig );
-		switch( DSSPEAKER_CONFIG( speakerConfig ) )
-		{
-			case DSSPEAKER_DIRECTOUT:
-				m_selectedSpeakerType = AIL_3D_2_SPEAKER;
-				break;
-			case DSSPEAKER_MONO:     
-				m_selectedSpeakerType = AIL_3D_2_SPEAKER;
-				break;
-			case DSSPEAKER_STEREO:   
-				m_selectedSpeakerType = AIL_3D_2_SPEAKER;
-				break;
-			case DSSPEAKER_HEADPHONE:
-				m_selectedSpeakerType = AIL_3D_HEADPHONE;
-				useDolby = TRUE;
-				break;
-			case DSSPEAKER_QUAD:     
-				m_selectedSpeakerType = AIL_3D_4_SPEAKER;
-				useDolby = TRUE;
-				break;
-			case DSSPEAKER_SURROUND:
-				m_selectedSpeakerType = AIL_3D_SURROUND;
-				useDolby = TRUE;
-				break;
-			case DSSPEAKER_5POINT1:  
-				m_selectedSpeakerType = AIL_3D_51_SPEAKER;
-				useDolby = TRUE;
-				break;
-			case DSSPEAKER_7POINT1:  
-				m_selectedSpeakerType = AIL_3D_71_SPEAKER;
-				useDolby = TRUE;
-				break;
-		}
-	}
-
-	Bool success = FALSE;
-	if( useDolby )
-	{
-		providerNdx = getProviderIndex( "Dolby Surround" );
-	}
-	else
-	{
-		providerNdx = getProviderIndex( "Miles Fast 2D Positional Audio" );
-	}
-	success = AIL_open_3D_provider( m_provider3D[providerNdx].id ) == 0;
-
-	//if (providerNdx < m_providerCount) 
-	//{
-	//	failed = AIL_open_3D_provider(m_provider3D[providerNdx].id);
-	//}
-
-
-
-	if( !success ) 
-	{
-		m_selectedProvider = PROVIDER_ERROR;
-		// try to select a failsafe
-		providerNdx = getProviderIndex( "Miles Fast 2D Positional Audio" );
-		success = AIL_open_3D_provider( m_provider3D[providerNdx].id ) == 0;
-	} 
-
-	if ( success )
-	{
-		m_selectedProvider = providerNdx;
-	
-		initSamplePools();
-		
-		createListener();
-		setSpeakerType(m_selectedSpeakerType);
-		if (TheVideoPlayer) 
-		{
-			TheVideoPlayer->notifyVideoPlayerOfNewProvider(TRUE);
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::unselectProvider( void )
-{
-	if (!(isOn(AudioAffect_Sound3D) && isValidProvider())) {
-		return;
-	}
-
-	if (TheVideoPlayer) {
-		TheVideoPlayer->notifyVideoPlayerOfNewProvider(FALSE);
-	}
-	AIL_close_3D_listener(m_listener);
-	m_listener = NULL;
-
-	AIL_close_3D_provider(m_provider3D[m_selectedProvider].id);
-	m_lastProvider = m_selectedProvider;
-
-	m_selectedProvider = PROVIDER_ERROR;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getSelectedProvider( void ) const
-{
-	return m_selectedProvider;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::setSpeakerType( UnsignedInt speakerType )
-{
-	if (!isValidProvider()) {
-		return;
-	}
-	
-	AIL_set_3D_speaker_type( m_provider3D[m_selectedProvider].id, speakerType );
-	m_selectedSpeakerType = speakerType;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getSpeakerType( void )
-{
-	if (!isValidProvider()) {
-		return 0;
-	}
-
-	return m_selectedSpeakerType;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getNum2DSamples( void ) const
-{
-	return m_num2DSamples;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getNum3DSamples( void ) const
-{
-	return m_num3DSamples;
-}
-
-//-------------------------------------------------------------------------------------------------
-UnsignedInt MilesAudioManager::getNumStreams( void ) const
-{
-	return m_numStreams;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::doesViolateLimit( AudioEventRTS *event ) const
-{
-	Int limit = event->getAudioEventInfo()->m_limit;
-	if (limit == 0) {
-		return false;
-	}
-
-	Int totalCount = 0;
-	Int totalRequestCount = 0;
-
-	std::list<PlayingAudio *>::const_iterator it;
-	if (!event->isPositionalAudio()) {
-		// 2-D
-		for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
-			if ((*it)->m_audioEventRTS->getEventName() == event->getEventName()) {
-				if (totalCount == 0) {
-					// This is the oldest audio of this type playing.
-					event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
-				}
-				++totalCount;
-			}
-		}
-	} else {
-		// 3-D
-		for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
-			if ((*it)->m_audioEventRTS->getEventName() == event->getEventName()) {
-				if (totalCount == 0) {
-					// This is the oldest audio of this type playing.
-					event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
-				}
-				++totalCount;
-			}
-		}
-	}
-	
-	// Also check the request list in case we've requested to play this sound.
-	std::list<AudioRequest*>::const_iterator arIt;
-	for (arIt = m_audioRequests.begin(); arIt != m_audioRequests.end(); ++arIt) {
-		AudioRequest *req = (*arIt);
-		if (req == NULL) {
-			continue;
-		}
-		if( req->m_usePendingEvent ) 
-		{
-			if( req->m_pendingEvent->getEventName() == event->getEventName() ) 
-			{
-				totalRequestCount++;
-				totalCount++;
-			}
-		}
-	}
-
-	//If our event is an interrupting type, then normally we would always add it. The exception is when we have requested
-	//multiple sounds in the same frame and those requests violate the limit. Because we don't have any "old" sounds to
-	//remove in the case of an interrupt, we need to catch it early and prevent the sound from being added if we already
-	//reached the limit
-	if( event->getAudioEventInfo()->m_control & AC_INTERRUPT )
-	{
-		if( totalRequestCount < limit )
-		{
-			Int totalPlayingCount = totalCount - totalRequestCount;
-			if( totalRequestCount + totalPlayingCount < limit )
-			{
-				//We aren't exceeding the actual limit, then clear the kill handle.
-				event->setHandleToKill(0);
-				return false;
-			}
-
-			//We are exceeding the limit - the kill handle will kill the
-			//oldest playing sound to enforce the actual limit.
-			return false;
-		}
-	}
-
-	if( totalCount < limit ) 
-	{
-		event->setHandleToKill(0);
-		return false;
-	}
-
-	return true;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isPlayingAlready( AudioEventRTS *event ) const
-{
-	std::list<PlayingAudio *>::const_iterator it;
-	if (!event->isPositionalAudio()) {
-		// 2-D
-		for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
-			if ((*it)->m_audioEventRTS->getEventName() == event->getEventName()) {
-				return true;
-			}
-		}
-	} else {
-		// 3-D
-		for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
-			if ((*it)->m_audioEventRTS->getEventName() == event->getEventName()) {
-				return true;
-			}
-		}
-	}
-
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isObjectPlayingVoice( UnsignedInt objID ) const
-{
-	if (objID == 0) {
-		return false;
-	}
-
-	std::list<PlayingAudio *>::const_iterator it;
-		// 2-D
-	for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
-		if ((*it)->m_audioEventRTS->getObjectID() == objID && (*it)->m_audioEventRTS->getAudioEventInfo()->m_type & ST_VOICE) {
-			return true;
-		}
-	}
-
-	// 3-D
-	for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
-		if ((*it)->m_audioEventRTS->getObjectID() == objID && (*it)->m_audioEventRTS->getAudioEventInfo()->m_type & ST_VOICE) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioEventRTS* MilesAudioManager::findLowestPrioritySound( AudioEventRTS *event )
-{
-	AudioPriority priority = event->getAudioEventInfo()->m_priority;
-	if( priority == AP_LOWEST )
-	{
-		//If the event we pass in is the lowest priority, don't bother checking because
-		//there is nothing lower priority than lowest.
-		return NULL;
-	}
-	AudioEventRTS *lowestPriorityEvent = NULL;
-	AudioPriority lowestPriority;
-
-	std::list<PlayingAudio *>::const_iterator it;
-	if( event->isPositionalAudio() ) 
-	{
-		//3D
-		for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) 
-		{
-			AudioEventRTS *itEvent = (*it)->m_audioEventRTS;
-			AudioPriority itPriority = itEvent->getAudioEventInfo()->m_priority;
-			if( itPriority < priority ) 
-			{
-				if( !lowestPriorityEvent || lowestPriority > itPriority )
-				{
-					lowestPriorityEvent = itEvent;
-					lowestPriority = itPriority;
-					if( lowestPriority == AP_LOWEST )
-					{
-						return lowestPriorityEvent;
-					}
-				}
-			}
-		}
-	} 
-	else 
-	{
-		//2D
-		for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) 
-		{
-			AudioEventRTS *itEvent = (*it)->m_audioEventRTS;
-			AudioPriority itPriority = itEvent->getAudioEventInfo()->m_priority;
-			if( itPriority < priority ) 
-			{
-				if( !lowestPriorityEvent || lowestPriority > itPriority )
-				{
-					lowestPriorityEvent = itEvent;
-					lowestPriority = itPriority;
-					if( lowestPriority == AP_LOWEST )
-					{
-						return lowestPriorityEvent;
-					}
-				}
-			}
-		}
-	}
-	return lowestPriorityEvent;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isPlayingLowerPriority( AudioEventRTS *event ) const
-{
-	//We don't actually want to do anything to this CONST function. Remember, we're
-	//just checking to see if there is a lower priority sound.
-	AudioPriority priority = event->getAudioEventInfo()->m_priority;
-	if( priority == AP_LOWEST )
-	{
-		//If the event we pass in is the lowest priority, don't bother checking because
-		//there is nothing lower priority than lowest.
-		return false;
-	}
-	std::list<PlayingAudio *>::const_iterator it;
-	if (!event->isPositionalAudio()) {
-		// 2-D
-		for ( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) {
-			if ((*it)->m_audioEventRTS->getAudioEventInfo()->m_priority < priority) {
-				//event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
-				return true;
-			}
-		}
-	} else {
-		// 3-D
-		for ( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) {
-			if ((*it)->m_audioEventRTS->getAudioEventInfo()->m_priority < priority) {
-				//event->setHandleToKill((*it)->m_audioEventRTS->getPlayingHandle());
-				return true;
-			}
-		}
-	}
-
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::killLowestPrioritySoundImmediately( AudioEventRTS *event )
-{
-	//Actually, we want to kill the LOWEST PRIORITY SOUND, not the first "lower" priority
-	//sound we find, because it could easily be 
-	AudioEventRTS *lowestPriorityEvent = findLowestPrioritySound( event );
-	if( lowestPriorityEvent )
-	{
-		std::list<PlayingAudio *>::iterator it;
-		if( event->isPositionalAudio() )
-		{
-			for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it ) 
-			{
-				PlayingAudio *playing = (*it);
-				if( !playing ) 
-				{
-					continue;
-				}
-
-				if( playing->m_audioEventRTS && playing->m_audioEventRTS == lowestPriorityEvent ) 
-				{
-					//Release this 3D sound channel immediately because we are going to play another sound in it's place.
-					releasePlayingAudio( playing );
-					m_playing3DSounds.erase( it );
-					return TRUE;
-				}
-			}
-		}
-		else
-		{
-			for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it ) 
-			{
-				PlayingAudio *playing = (*it);
-				if( !playing ) 
-				{
-					continue;
-				}
-
-				if( playing->m_audioEventRTS && playing->m_audioEventRTS == lowestPriorityEvent ) 
-				{
-					//Release this sound channel immediately because we are going to play another sound in it's place.
-					releasePlayingAudio( playing );
-					m_playingSounds.erase( it );
-					return TRUE;
-				}
-			}
-		}
-	}
-	return FALSE;
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume)
-{
-	Real pan;
-	std::list<PlayingAudio *>::iterator it;
-
-	PlayingAudio *playing = NULL;
-	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getEventName() == eventName) {
-			// Adjust it
-			playing->m_audioEventRTS->setVolume(newVolume);
-			Real desiredVolume = playing->m_audioEventRTS->getVolume() * playing->m_audioEventRTS->getVolumeShift();
-			AIL_sample_volume_pan(playing->m_sample, NULL, &pan);
-			AIL_set_sample_volume_pan(playing->m_sample, desiredVolume, pan);
-		}
-	}
-
-	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getEventName() == eventName) {
-			// Adjust it
-			playing->m_audioEventRTS->setVolume(newVolume);
-			Real desiredVolume = playing->m_audioEventRTS->getVolume() * playing->m_audioEventRTS->getVolumeShift();
-			AIL_set_3D_sample_volume(playing->m_3DSample, desiredVolume);
-		}
-	}
-
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it) {
-		playing = *it;
-		if (playing && playing->m_audioEventRTS->getEventName() == eventName) {
-			// Adjust it
-			playing->m_audioEventRTS->setVolume(newVolume);
-			Real desiredVolume = playing->m_audioEventRTS->getVolume() * playing->m_audioEventRTS->getVolumeShift();
-			AIL_stream_volume_pan(playing->m_stream, NULL, &pan);
-			AIL_set_stream_volume_pan(playing->m_stream, desiredVolume, pan);
-		}
-	}
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::removePlayingAudio( AsciiString eventName )
-{
-	std::list<PlayingAudio *>::iterator it;
-
-	PlayingAudio *playing = NULL;
-	for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ) 
-	{
-		playing = *it;
-		if( playing && playing->m_audioEventRTS->getEventName() == eventName ) 
-		{
-			releasePlayingAudio( playing );
-			it = m_playingSounds.erase(it);
-		}
-		else
-		{
-			it++;
-		}
-	}
-
-	for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ) 
-	{
-		playing = *it;
-		if( playing && playing->m_audioEventRTS->getEventName() == eventName ) 
-		{
-			releasePlayingAudio( playing );
-			it = m_playing3DSounds.erase(it);
-		}
-		else
-		{
-			it++;
-		}
-	}
-
-	for( it = m_playingStreams.begin(); it != m_playingStreams.end(); ) 
-	{
-		playing = *it;
-		if( playing && playing->m_audioEventRTS->getEventName() == eventName ) 
-		{
-			releasePlayingAudio( playing );
-			it = m_playingStreams.erase(it);
-		}
-		else
-		{
-			it++;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::removeAllDisabledAudio()
-{
-	std::list<PlayingAudio *>::iterator it;
-
-	PlayingAudio *playing = NULL;
-	for( it = m_playingSounds.begin(); it != m_playingSounds.end(); ) 
-	{
-		playing = *it;
-		if( playing && playing->m_audioEventRTS->getVolume() == 0.0f ) 
-		{
-			releasePlayingAudio( playing );
-			it = m_playingSounds.erase(it);
-		}
-		else
-		{
-			it++;
-		}
-	}
-
-	for( it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ) 
-	{
-		playing = *it;
-		if( playing && playing->m_audioEventRTS->getVolume() == 0.0f ) 
-		{
-			releasePlayingAudio( playing );
-			it = m_playing3DSounds.erase(it);
-		}
-		else
-		{
-			it++;
-		}
-	}
-
-	for( it = m_playingStreams.begin(); it != m_playingStreams.end(); ) 
-	{
-		playing = *it;
-		if( playing && playing->m_audioEventRTS->getVolume() == 0.0f ) 
-		{
-			releasePlayingAudio( playing );
-			it = m_playingStreams.erase(it);
-		}
-		else
-		{
-			it++;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::processRequestList( void )
-{
-	std::list<AudioRequest*>::iterator it;
-	for (it = m_audioRequests.begin(); it != m_audioRequests.end(); /* empty */) {
-		AudioRequest *req = (*it);
-		if (req == NULL) {
-			continue;
-		}
-
-		if (!shouldProcessRequestThisFrame(req)) {
-			adjustRequest(req);
-			++it;
-			continue;
-		}
-
-		if (!req->m_requiresCheckForSample || checkForSample(req)) {
-			processRequest(req);
-		}
-		deleteInstance(req);
-		it = m_audioRequests.erase(it);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::processPlayingList( void )
-{
-	// There are two types of processing we have to do here. 
-	// 1. Move the item to the stopped list if it has become stopped.
-	// 2. Update the position of the audio if it is positional
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-
-	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); /* empty */) {
-		playing = (*it);
-		if (!playing) 
-		{
-			it = m_playingSounds.erase(it);
-			continue;
-		}
-
-		if (playing->m_status == PS_Stopped) 
-		{
-			//m_stoppedAudio.push_back(playing);
-			releasePlayingAudio( playing );
-			it = m_playingSounds.erase(it);
-		} 
-		else 
-		{
-			if (m_volumeHasChanged) 
-			{
-				adjustPlayingVolume(playing);
-			}
-			++it;
-		}
-	}
-
-	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ) 
-	{
-		playing = (*it);
-		if (!playing) 
-		{
-			it = m_playing3DSounds.erase(it);
-			continue;
-		}
-
-		if (playing->m_status == PS_Stopped) 
-		{
-			//m_stoppedAudio.push_back(playing);			
-			releasePlayingAudio( playing );
-			it = m_playing3DSounds.erase(it);
-		} 
-		else 
-		{
-			if (m_volumeHasChanged) 
-			{
-				adjustPlayingVolume(playing);
-			}
-
-			const Coord3D *pos = getCurrentPositionFromEvent(playing->m_audioEventRTS);
-			if (pos) 
-			{
-				if( playing->m_audioEventRTS->isDead() )
-				{
-					stopAudioEvent( playing->m_audioEventRTS->getPlayingHandle() );
-					it++;
-					continue;
-				}
-				else
-				{
-					Real volForConsideration = getEffectiveVolume(playing->m_audioEventRTS);
-					volForConsideration /= (m_sound3DVolume > 0.0f ? m_soundVolume : 1.0f);
-					Bool playAnyways = BitIsSet( playing->m_audioEventRTS->getAudioEventInfo()->m_type, ST_GLOBAL) || playing->m_audioEventRTS->getAudioEventInfo()->m_priority == AP_CRITICAL;
-					if( volForConsideration < m_audioSettings->m_minVolume && !playAnyways ) 
-					{
-						// don't want to get an additional callback for this sample
-						AIL_register_3D_EOS_callback(playing->m_3DSample, NULL);
-						//m_stoppedAudio.push_back(playing);
-						releasePlayingAudio( playing );
-						it = m_playing3DSounds.erase(it);
-						continue;
-					} 
-					else 
-					{
-						Real x = pos->x;
-						Real y = pos->y;
-						Real z = pos->z;
-						AIL_set_3D_position( playing->m_3DSample, x, y, z );
-					}
-				}
-			} 
-			else 
-			{
-				AIL_register_3D_EOS_callback(playing->m_3DSample, NULL);
-				//m_stoppedAudio.push_back(playing);
-				releasePlayingAudio( playing );
-				it = m_playing3DSounds.erase(it);
-				continue;
-			}
-
-			++it;
-		}
-	}
-
-	for (it = m_playingStreams.begin(); it != m_playingStreams.end(); ) {
-		playing = (*it);
-		if (!playing) 
-		{
-			it = m_playingStreams.erase(it);
-			continue;
-		}
-
-		if (playing->m_status == PS_Stopped) 
-		{
-			//m_stoppedAudio.push_back(playing);			
-			releasePlayingAudio( playing );
-			it = m_playingStreams.erase(it);
-		} 
-		else 
-		{
-			if (m_volumeHasChanged) 
-			{
-				adjustPlayingVolume(playing);
-			}
-
-			++it;
-		}
-	}
-
-	if (m_volumeHasChanged) {
-		m_volumeHasChanged = false;
-	}
-}
-
-//Patch for a rare bug (only on about 5% of in-studio machines suffer, and not all the time) .
-//The actual mechanics of this problem are still elusive as of the date of this comment. 8/21/03
-//but the cause is clear. Some cinematics do a radical change in the microphone position, which
-//calls for a radical 3DSoundVolume adjustment. If this happens while a stereo stream is *ENDING*,
-//low-level code gets caught in a tight loop. (Hangs) on some machines.
-//To prevent this condition, we just suppress the updating of 3DSoundVolume while one of these
-//is on the list. Since the music tracks play continuously, they never *END* during these cinematics.
-//so we filter them out as, *NOT SENSITIVE*... we do want to update 3DSoundVolume during music, 
-//which is almost all of the time.
-
-Bool MilesAudioManager::has3DSensitiveStreamsPlaying( void ) const
-{
-  if ( m_playingStreams.empty() )
-    return FALSE;
-
-	for ( std::list< PlayingAudio* >::const_iterator it = m_playingStreams.begin(); it != m_playingStreams.end(); ++it ) 
-  {
-		const PlayingAudio *playing = (*it);
-
-    if ( ! playing )
-      continue;
-
-    if ( playing->m_audioEventRTS->getAudioEventInfo()->m_soundType != AT_Music )
-    {
-      return TRUE;
-    }
-
-    if ( playing->m_audioEventRTS->getEventName().startsWith("Game_") == FALSE ) 
-    {
-      return TRUE;
-    }
-  }	
-  
-  return FALSE; 
-
-}
-
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::processFadingList( void )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-
-	for (it = m_fadingAudio.begin(); it != m_fadingAudio.end(); /* emtpy */) {
-		playing = *it;
-		if (!playing) {
-			continue;
-		}
-		
-		if (playing->m_framesFaded >= getAudioSettings()->m_fadeAudioFrames) {
-			playing->m_status = PS_Stopped;
-			playing->m_requestStop = true;
-			//m_stoppedAudio.push_back(playing);
-			releasePlayingAudio( playing );
-			it = m_fadingAudio.erase(it);
-			continue;
-		}
-
-		++playing->m_framesFaded;
-		Real volume = getEffectiveVolume(playing->m_audioEventRTS);
-		volume *= (1.0f - 1.0f * playing->m_framesFaded / getAudioSettings()->m_fadeAudioFrames);
-
-		switch(playing->m_type)
-		{
-			case PAT_Sample:
-			{
-				AIL_set_sample_volume_pan(playing->m_sample, volume, 0.5f);
-				break;
-			}
-
-			case PAT_3DSample:
-			{
-				AIL_set_3D_sample_volume(playing->m_3DSample, volume);
-				break;
-			}
-			
-			case PAT_Stream:
-			{
-				AIL_set_stream_volume_pan(playing->m_stream, volume, 0.5f);
-				break;
-			}
-			
-		}
-		
-		++it;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::processStoppedList( void )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-
-	for (it = m_stoppedAudio.begin(); it != m_stoppedAudio.end(); /* emtpy */) {
-		playing = *it;
-		if (playing) {
-			releasePlayingAudio(playing);
-		}
-		it = m_stoppedAudio.erase(it);
-	}
-}
-
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::shouldProcessRequestThisFrame( AudioRequest *req ) const
-{
-	if (!req->m_usePendingEvent) {
-		return true;
-	}
-
-	if (req->m_pendingEvent->getDelay() < MSEC_PER_LOGICFRAME_REAL) {
-		return true;
-	}
-
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::adjustRequest( AudioRequest *req )
-{
-	if (!req->m_usePendingEvent) {
-		return;
-	}
-
-	req->m_pendingEvent->decrementDelay(MSEC_PER_LOGICFRAME_REAL);
-	req->m_requiresCheckForSample = true;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::checkForSample( AudioRequest *req )
-{
-	if (!req->m_usePendingEvent) {
-		return true;
-	}
-
-  if ( req->m_pendingEvent->getAudioEventInfo() == NULL )
-  {
-    // Fill in event info
-    getInfoForAudioEvent( req->m_pendingEvent );
-  }
-  
-	if (req->m_pendingEvent->getAudioEventInfo()->m_type != AT_SoundEffect) 
-  {
-		return true;
-	}
-
-	return m_sound->canPlayNow(req->m_pendingEvent);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::setHardwareAccelerated(Bool accel)
-{
-	// Extends
-	Bool retEarly = (accel == m_hardwareAccel);
-	AudioManager::setHardwareAccelerated(accel);
-
-	if (retEarly) {
-		return;
-	}
-	
-	if (m_hardwareAccel) {
-		for (Int i = 0; i < MAX_HW_PROVIDERS; ++i) {
-			UnsignedInt providerNdx = TheAudio->getProviderIndex(TheAudio->getAudioSettings()->m_preferred3DProvider[i]);
-			TheAudio->selectProvider(providerNdx);
-			if (getSelectedProvider() == providerNdx) {
-				return;
-			}
-		}
-	}
-
-	// set it false
-	AudioManager::setHardwareAccelerated(FALSE);
-	UnsignedInt providerNdx = TheAudio->getProviderIndex(TheAudio->getAudioSettings()->m_preferred3DProvider[MAX_HW_PROVIDERS]);
-	TheAudio->selectProvider(providerNdx);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::setSpeakerSurround(Bool surround)
-{
-	// Extends
-	Bool retEarly = (surround == m_surroundSpeakers);
-	AudioManager::setSpeakerSurround(surround);
-
-	if (retEarly) {
-		return;
-	}
-
-	UnsignedInt speakerType;
-	if (m_surroundSpeakers) {
-		speakerType = TheAudio->getAudioSettings()->m_defaultSpeakerType3D;
-	} else {
-		speakerType = TheAudio->getAudioSettings()->m_defaultSpeakerType2D;
-	}
-
-	TheAudio->setSpeakerType(speakerType);
-}
-
-//-------------------------------------------------------------------------------------------------
-Real MilesAudioManager::getFileLengthMS( AsciiString strToLoad ) const
-{
-	if (strToLoad.isEmpty()) {
-		return 0.0f;
-	}
-
-	// Load it as a stream to get the file info without actually opening the file.
-	HSTREAM stream = AIL_open_stream(m_digitalHandle, strToLoad.str(), 0);
-	if (!stream) {
-		return 0.0f;
-	}
-
-	long retVal;
-	AIL_stream_ms_position(stream, &retVal, NULL);
-	// Now close the stream
-	AIL_close_stream(stream);
-
-	return INT_TO_REAL(retVal);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::closeAnySamplesUsingFile( const void *fileToClose )
-{
-	std::list<PlayingAudio *>::iterator it;
-	PlayingAudio *playing;
-	
-	for (it = m_playingSounds.begin(); it != m_playingSounds.end(); ) {
-		playing = *it;
-		if (!playing) {
-			continue;
-		}
-
-		if (playing->m_file == fileToClose) {
-			releasePlayingAudio(playing);
-			it = m_playingSounds.erase(it);
-		} else {
-			++it;
-		}
-	}
-
-	for (it = m_playing3DSounds.begin(); it != m_playing3DSounds.end(); ) {
-		playing = *it;
-		if (!playing) {
-			continue;
-		}
-
-		if (playing->m_file == fileToClose) {
-			releasePlayingAudio(playing);
-			it = m_playing3DSounds.erase(it);
-		} else {
-			++it;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::setDeviceListenerPosition( void )
-{
-	if (m_listener) {
-		AIL_set_3D_orientation(m_listener, m_listenerOrientation.x, m_listenerOrientation.y, m_listenerOrientation.z, 0, 0, -1);
-
-		Real x = m_listenerPosition.x;
-		Real y = m_listenerPosition.y;
-		Real z = m_listenerPosition.z;
-		AIL_set_3D_position( m_listener, x, y, z );
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-const Coord3D *MilesAudioManager::getCurrentPositionFromEvent( AudioEventRTS *event )
-{
-	if (!event->isPositionalAudio()) {
-		return NULL;
-	}
-
-	return event->getCurrentPosition();
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isOnScreen( const Coord3D *pos ) const
-{
-	static ICoord2D dummy;
-	// WorldToScreen will return True if the point is onscreen and false if it is offscreen.
-	return TheTacticalView->worldToScreen(pos, &dummy);
-}
-
-//-------------------------------------------------------------------------------------------------
-Real MilesAudioManager::getEffectiveVolume(AudioEventRTS *event) const
-{
-	Real volume = 1.0f;
-	volume *= (event->getVolume() * event->getVolumeShift());
-	if (event->getAudioEventInfo()->m_soundType == AT_Music) 
-	{
-		volume *= m_musicVolume;
-	} 
-	else if (event->getAudioEventInfo()->m_soundType == AT_Streaming) 
-	{
-		volume *= m_speechVolume;
-	} 
-	else 
-	{
-		if (event->isPositionalAudio()) 
-		{
-			volume *= m_sound3DVolume;
-			Coord3D distance = m_listenerPosition;
-			const Coord3D *pos = event->getCurrentPosition();
-			if (pos) 
-			{
-				distance.sub(pos);
-				Real objMinDistance;
-				Real objMaxDistance;
-
-				if (event->getAudioEventInfo()->m_type & ST_GLOBAL) 
-				{
-					objMinDistance = TheAudio->getAudioSettings()->m_globalMinRange;
-					objMaxDistance = TheAudio->getAudioSettings()->m_globalMaxRange;
-				} 
-				else 
-				{
-					objMinDistance = event->getAudioEventInfo()->m_minDistance;
-					objMaxDistance = event->getAudioEventInfo()->m_maxDistance;
-				}
-
-				Real objDistance = distance.length();
-				if( objDistance > objMinDistance ) 
-				{
-					volume *= 1 / (objDistance / objMinDistance);
-				}
-				if( objDistance >= objMaxDistance ) 
-				{
-					volume = 0.0f;
-				}
-				//else if( objDistance > objMinDistance )
-				//{
-				//	volume *= 1.0f - (objDistance - objMinDistance) / (objMaxDistance - objMinDistance);
-				//}
-			}
-		} 
-		else 
-		{
-			volume *= m_soundVolume;
-		}
-	}
-
-	return volume;
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::startNextLoop( PlayingAudio *looping )
-{
-	closeFile(looping->m_file);
-	looping->m_file = NULL;
-
-	if (looping->m_requestStop) {
-		return false;
-	}
-
-	if (looping->m_audioEventRTS->hasMoreLoops()) {
-		// generate a new filename, and test to see whether we can play with it now
-		looping->m_audioEventRTS->generateFilename();
-		
-		if (looping->m_audioEventRTS->getDelay() > MSEC_PER_LOGICFRAME_REAL) {
-			// fake it out so that this sound appears done, but also so that it will not
-			// delete the sound on completion (which would suck)
-			looping->m_cleanupAudioEventRTS = false;
-			looping->m_requestStop = true;
-			looping->m_status = PS_Stopped;
-			
-			
-			AudioRequest *req = allocateAudioRequest(true);
-			req->m_pendingEvent = looping->m_audioEventRTS;
-			req->m_requiresCheckForSample = true;
-			appendAudioRequest(req);
-			return true;
-		}
-
-		if (looping->m_type == PAT_3DSample) {
-			looping->m_file = playSample3D(looping->m_audioEventRTS, looping->m_3DSample);
-		} else {
-			looping->m_file = playSample(looping->m_audioEventRTS, looping->m_sample);
-		}
-		
-		return looping->m_file != NULL;
-	} 
-	return false;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::playStream( AudioEventRTS *event, HSTREAM stream )
-{
-	// Force it to the beginning
-	if (event->getAudioEventInfo()->m_soundType == AT_Music) {
-		AIL_set_stream_loop_count(stream, INFINITE_LOOP_COUNT);
-	}
-
-	AIL_register_stream_callback(stream, setStreamCompleted);
-	AIL_start_stream(stream);
-	if (event->getAudioEventInfo()->m_soundType == AT_Music) {
-		// Need to stop/fade out the old music here.
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void *MilesAudioManager::playSample( AudioEventRTS *event, HSAMPLE sample )
-{
-	AIL_init_sample(sample);
-
-	// Prep any sort of filtering, etc, here
-	AIL_register_EOS_callback(sample, setSampleCompleted);
-	initFilters(sample, event);
-
-	// Load the file in
-	void *fileBuffer = NULL;
-	fileBuffer = loadFileForRead(event);
-	if (fileBuffer) {
-		AIL_set_sample_file(sample, fileBuffer, 0);
-
-		// Start playback
-		AIL_start_sample(sample);
-	}
-
-	return fileBuffer;
-}
-
-//-------------------------------------------------------------------------------------------------
-void *MilesAudioManager::playSample3D( AudioEventRTS *event, H3DSAMPLE sample3D )
-{
-	const Coord3D *pos = getCurrentPositionFromEvent(event);
-	if (pos) {
-		// Load the file in
-		void *fileBuffer = loadFileForRead(event);
-		if (fileBuffer) {
-			AIL_set_3D_sample_file(sample3D, fileBuffer);
-
-			// Prep any sort of filtering, etc, here
-			AIL_register_3D_EOS_callback(sample3D, set3DSampleCompleted);
-
-			// Set the position values of the sample here
-			if (event->getAudioEventInfo()->m_type & ST_GLOBAL) {
-				AIL_set_3D_sample_distances(sample3D, TheAudio->getAudioSettings()->m_globalMinRange, TheAudio->getAudioSettings()->m_globalMaxRange );
-			} else {
-				AIL_set_3D_sample_distances(sample3D, event->getAudioEventInfo()->m_minDistance, event->getAudioEventInfo()->m_maxDistance );
-			}
-			
-			// Set the position of the sample here
-			Real x = pos->x;
-			Real y = pos->y;
-			Real z = pos->z;
-			AIL_set_3D_position( sample3D, x, y, z );
-			initFilters3D(sample3D, event, pos);
-			
-			// Start playback
-			AIL_start_3D_sample(sample3D);
-		}
-		return fileBuffer;
-	}
-
-	return NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::buildProviderList( void )
-{
-   HPROENUM next = HPROENUM_FIRST;
-
-	 char *name;
-	 UnsignedInt index = 0;
-	 while (index < MAXPROVIDERS && AIL_enumerate_3D_providers(&next, &m_provider3D[index].id, &name)) {
-		 m_provider3D[index].name.set(name);	// set it to the AsciiString
-		 ++index;
-	 }
-	 
-	 m_providerCount = index;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::createListener( void )
-{
-	if (!(isOn(AudioAffect_Sound3D) && isValidProvider())) {
-		return;
-	}
-
-	m_listener = AIL_open_3D_listener(m_provider3D[m_selectedProvider].id);
-	// initial listener position will be (0, 0, 0)
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::initDelayFilter( void )
-{
-	if (m_delayFilter != NULL) {
-		return;
-	}
-
-	char* filterName;
-	HPROENUM enumFLTs = HPROENUM_FIRST;
-	HPROVIDER currentProvider;
-
-	while (AIL_enumerate_filters(&enumFLTs, &currentProvider, &filterName )) {  
-		if (strcmp(filterName,"Mono Delay Filter") == 0) {
-			m_delayFilter = currentProvider;
-			break;  
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool MilesAudioManager::isValidProvider( void )
-{
-	return (m_selectedProvider < m_providerCount);
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::initSamplePools( void )
-{
-	if (!(isOn(AudioAffect_Sound3D) && isValidProvider())) {
-		return;
-	}
-
-	int i = 0;
-	for (i = 0; i < getAudioSettings()->m_sampleCount2D; ++i) {
-		HSAMPLE sample = AIL_allocate_sample_handle(m_digitalHandle);
-		DEBUG_ASSERTCRASH(sample, ("Couldn't get %d 2D samples\n", i + 1));
-		if (sample) {
-			AIL_init_sample(sample);
-			AIL_set_sample_user_data(sample, 0, i + 1);
-			m_availableSamples.push_back(sample);
-			++m_num2DSamples;
-		}
-	}
-
-	for (i = 0; i < getAudioSettings()->m_sampleCount3D; ++i) {
-		H3DSAMPLE sample = AIL_allocate_3D_sample_handle(m_provider3D[m_selectedProvider].id);
-		DEBUG_ASSERTCRASH(sample, ("Couldn't get %d 3D samples\n", i + 1));
-		if (sample) {
-			AIL_set_3D_user_data(sample, 0, i + 1);
-			m_available3DSamples.push_back(sample);
-			++m_num3DSamples;
-		}
-	}
-
-	// Streams are basically free, so we can just allocate the appropriate number
-	m_numStreams = getAudioSettings()->m_streamCount;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::processRequest( AudioRequest *req )
-{
-	switch (req->m_request)
-	{
-		case AR_Play:
-		{
-			playAudioEvent(req->m_pendingEvent);
-			break;
-		}
-		case AR_Pause:
-		{
-			pauseAudioEvent(req->m_handleToInteractOn);
-			break;
-		}
-		case AR_Stop:
-		{
-			stopAudioEvent(req->m_handleToInteractOn);
-			break;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void *MilesAudioManager::getHandleForBink( void )
-{
-	if (m_binkHandle == NULL) {
-		PlayingAudio *aud = allocatePlayingAudio();
-		aud->m_audioEventRTS = NEW AudioEventRTS("BinkHandle");	// poolify
-		getInfoForAudioEvent(aud->m_audioEventRTS);
-		aud->m_sample = getFirst2DSample(aud->m_audioEventRTS);
-		aud->m_type = PAT_Sample;
-
-		if (!aud->m_sample) {
-			releasePlayingAudio(aud);
-			return NULL;
-		}
-
-		m_binkHandle = aud;
-	}
-	
-	AILLPDIRECTSOUND lpDS;
-	AIL_get_DirectSound_info(m_binkHandle->m_sample, &lpDS, NULL);
-	return lpDS;
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::releaseHandleForBink( void )
-{
-	if (m_binkHandle) {
-		releasePlayingAudio(m_binkHandle);
-		m_binkHandle = NULL;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay)
-{
-	if (!eventToPlay->getAudioEventInfo()) {
-		getInfoForAudioEvent(eventToPlay);
-		if (!eventToPlay->getAudioEventInfo()) {
-			DEBUG_CRASH(("No info for forced audio event '%s'\n", eventToPlay->getEventName().str()));
-			return;
-		}
-	}
-
-	switch (eventToPlay->getAudioEventInfo()->m_soundType)
-	{
-		case AT_Music:
-			if (!isOn(AudioAffect_Music)) 
-				return;
-			break;
-		case AT_SoundEffect:
-			if (!isOn(AudioAffect_Sound) || !isOn(AudioAffect_Sound3D)) 
-				return;
-			break;
-		case AT_Streaming:
-			if (!isOn(AudioAffect_Speech)) 
-				return;
-			break;
-	}
-	
-	AudioEventRTS event = *eventToPlay;
-
-	event.generateFilename();
-	event.generatePlayInfo();
-
-	std::list<std::pair<AsciiString, Real> >::iterator it;
-	for (it = m_adjustedVolumes.begin(); it != m_adjustedVolumes.end(); ++it) {
-		if (it->first == event.getEventName()) {
-			event.setVolume(it->second);
-			break;
-		}
-	}
-
-	AsciiString fileToPlay = event.getFilename();
-	HAUDIO haud = AIL_quick_load_and_play(fileToPlay.str(), 1, 0);
-
-	// Even though the event type is not Speech, this is used only for mission briefings, so use the 
-	// speech slider to adjust the volume.
-	// Get the volume from the event, and pass 0.5 to play the audio in the middle. (0.0 is full left, 1.0 is full right)
-	AIL_quick_set_volume(haud, event.getVolume() * getVolume(AudioAffect_Speech), 0.5);
-	m_audioForcePlayed.push_back(haud);
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void AILCALLBACK setSampleCompleted( HSAMPLE sampleCompleted )
-{
-	TheAudio->notifyOfAudioCompletion((UnsignedInt) sampleCompleted, PAT_Sample);
-}
-
-//-------------------------------------------------------------------------------------------------
-void AILCALLBACK set3DSampleCompleted( H3DSAMPLE sample3DCompleted )
-{
-	TheAudio->notifyOfAudioCompletion((UnsignedInt) sample3DCompleted, PAT_3DSample);
-}
-
-//-------------------------------------------------------------------------------------------------
-void AILCALLBACK setStreamCompleted( HSTREAM streamCompleted )
-{
-	TheAudio->notifyOfAudioCompletion((UnsignedInt) streamCompleted, PAT_Stream);
-}
-
-//-------------------------------------------------------------------------------------------------
-U32 AILCALLBACK streamingFileOpen(char const *fileName, U32 *file_handle)
-{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (sizeof(U32) != sizeof(File*)) {
-		RELEASE_CRASH(("streamingFileOpen - This function requires work in order to compile on non 32-bit platforms.\n"));
-	}
-#endif
-
-	(*file_handle) = (U32) TheFileSystem->openFile(fileName, File::READ | File::STREAMING);
-	return ((*file_handle) != 0);
-}
-
-//-------------------------------------------------------------------------------------------------
-void AILCALLBACK streamingFileClose(U32 fileHandle)
-{
-	((File*) fileHandle)->close();
-}
-
-//-------------------------------------------------------------------------------------------------
-S32 AILCALLBACK streamingFileSeek(U32 fileHandle, S32 offset, U32 type)
-{
-	return ((File*) fileHandle)->seek(offset, (File::seekMode) type);
-}
-
-//-------------------------------------------------------------------------------------------------
-U32 AILCALLBACK streamingFileRead(U32 file_handle, void *buffer, U32 bytes)
-{
-	return ((File*) file_handle)->read(buffer, bytes);
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-AudioFileCache::AudioFileCache() : m_maxSize(0), m_currentlyUsedSize(0), m_mutexName("AudioFileCacheMutex")
-{
-	m_mutex = CreateMutex(NULL, FALSE, m_mutexName);
-}
-
-//-------------------------------------------------------------------------------------------------
-AudioFileCache::~AudioFileCache()
-{
-	{
-		ScopedMutex mut(m_mutex);
-
-		// Free all the samples that are open.
-		OpenFilesHashIt it;
-		for ( it = m_openFiles.begin(); it != m_openFiles.end(); ++it ) {
-			if (it->second.m_openCount > 0) {
-				DEBUG_CRASH(("Sample '%s' is still playing, and we're trying to quit.\n", it->second.m_eventInfo->m_audioName.str()));
-			}
-
-			releaseOpenAudioFile(&it->second);
-			// Don't erase it from the map, cause it makes this whole process way more complicated, and 
-			// we're about to go away anyways.
-		}
-	}
-
-	CloseHandle(m_mutex);
-}
-
-//-------------------------------------------------------------------------------------------------
-void *AudioFileCache::openFile( AudioEventRTS *eventToOpenFrom )
-{
-	// Protect the entire openFile function
-	ScopedMutex mut(m_mutex);
-
-	AsciiString strToFind;
-	switch (eventToOpenFrom->getNextPlayPortion())
-	{
-		case PP_Attack:
-			strToFind = eventToOpenFrom->getAttackFilename();
-			break;
-		case PP_Sound:
-			strToFind = eventToOpenFrom->getFilename();
-			break;
-		case PP_Decay:
-			strToFind = eventToOpenFrom->getDecayFilename();
-			break;
-		case PP_Done:
-			return NULL;
-	}
-
-	OpenFilesHash::iterator it;
-	it = m_openFiles.find(strToFind);
-
-	if (it != m_openFiles.end()) {
-		++it->second.m_openCount;
-		return it->second.m_file;
-	}
-
-	// Couldn't find the file, so actually open it.
-	File *file = TheFileSystem->openFile(strToFind.str());
-	if (!file) {
-		DEBUG_ASSERTLOG(strToFind.isEmpty(), ("Missing Audio File: '%s'\n", strToFind.str()));
-		return NULL;
-	}
-
-	UnsignedInt fileSize = file->size();
-	char* buffer = file->readEntireAndClose();
-
-	OpenAudioFile openedAudioFile;
-	openedAudioFile.m_eventInfo = eventToOpenFrom->getAudioEventInfo();
-
-	AILSOUNDINFO soundInfo;
-	AIL_WAV_info(buffer, &soundInfo);
-
-	if (eventToOpenFrom->isPositionalAudio()) {
-		if (soundInfo.channels > 1) {
-			DEBUG_CRASH(("Requested Positional Play of audio '%s', but it is in stereo.", strToFind.str()));
-			delete [] buffer;
-			return NULL;
-		}
-	}
-	
-	if (soundInfo.format == WAVE_FORMAT_IMA_ADPCM) {
-		void *decompressFileBuffer;
-		U32 newFileSize;
-		AIL_decompress_ADPCM(&soundInfo, &decompressFileBuffer, &newFileSize);
-		fileSize = newFileSize;
-		openedAudioFile.m_compressed = TRUE;
-		delete [] buffer;
-		openedAudioFile.m_file = decompressFileBuffer;
-		openedAudioFile.m_soundInfo = soundInfo;
-		openedAudioFile.m_openCount = 1;
-	} else if (soundInfo.format == WAVE_FORMAT_PCM) {
-		openedAudioFile.m_compressed = FALSE;
-		openedAudioFile.m_file = buffer;
-		openedAudioFile.m_soundInfo = soundInfo;
-		openedAudioFile.m_openCount = 1;
-	} else {
-		DEBUG_CRASH(("Unexpected compression type in '%s'\n", strToFind.str()));
-		// prevent leaks
-		delete [] buffer;
-		return NULL;
-	}
-
-	openedAudioFile.m_fileSize = fileSize;
-	m_currentlyUsedSize += openedAudioFile.m_fileSize;
-	if (m_currentlyUsedSize > m_maxSize) {
-		// We need to free some samples, or we're not going to be able to play this sound.
-		if (!freeEnoughSpaceForSample(openedAudioFile)) {
-			m_currentlyUsedSize -= openedAudioFile.m_fileSize;
-			releaseOpenAudioFile(&openedAudioFile);
-			return NULL;
-		}
-	}
-
-	m_openFiles[strToFind] = openedAudioFile;
-	return openedAudioFile.m_file;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioFileCache::closeFile( void *fileToClose )
-{
-	if (!fileToClose) {
-		return;
-	}
-
-	// Protect the entire closeFile function
-	ScopedMutex mut(m_mutex);
-
-	OpenFilesHash::iterator it;
-	for ( it = m_openFiles.begin(); it != m_openFiles.end(); ++it ) {
-		if ( it->second.m_file == fileToClose ) {
-			--it->second.m_openCount;
-			return;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioFileCache::setMaxSize( UnsignedInt size )
-{
-	// Protect the function, in case we're trying to use this value elsewhere.
-	ScopedMutex mut(m_mutex);
-
-	m_maxSize = size;
-}
-
-//-------------------------------------------------------------------------------------------------
-void AudioFileCache::releaseOpenAudioFile( OpenAudioFile *fileToRelease )
-{
-	if (fileToRelease->m_openCount > 0) {
-		// This thing needs to be terminated IMMEDIATELY.
-		TheAudio->closeAnySamplesUsingFile(fileToRelease->m_file);
-	}
-
-	if (fileToRelease->m_file) {
-		if (fileToRelease->m_compressed) {
-			// Files read in via AIL_decompress_ADPCM must be freed with AIL_mem_free_lock. 
-			AIL_mem_free_lock(fileToRelease->m_file);
-		} else { 
-			// Otherwise, we read it, we own it, blow it away.
-			delete [] fileToRelease->m_file;
-		}
-		fileToRelease->m_file = NULL;
-		fileToRelease->m_eventInfo = NULL;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-Bool AudioFileCache::freeEnoughSpaceForSample(const OpenAudioFile& sampleThatNeedsSpace)
-{
-	
-	Int spaceRequired = m_currentlyUsedSize - m_maxSize;
-	Int runningTotal = 0;
-
-	std::list<AsciiString> filesToClose;
-	// First, search for any samples that have ref counts of 0. They are low-hanging fruit, and 
-	// should be considered immediately.
-	OpenFilesHashIt it;
-	for (it = m_openFiles.begin(); it != m_openFiles.end(); ++it) {
-		if (it->second.m_openCount == 0) {
-			// This is said low-hanging fruit.
-			filesToClose.push_back(it->first);
-
-			runningTotal += it->second.m_fileSize;
-
-			if (runningTotal >= spaceRequired) {
-				break;
-			}
-		}
-	}
-
-	// If we don't have enough space yet, then search through the events who have a count of 1 or more
-	// and who are lower priority than this sound.
-	// Mical said that at this point, sounds shouldn't care if other sounds are interruptable or not.
-	// Kill any files of lower priority necessary to clear our the buffer.
-	if (runningTotal < spaceRequired) {
-		for (it = m_openFiles.begin(); it != m_openFiles.end(); ++it) {
-			if (it->second.m_openCount > 0) {
-				if (it->second.m_eventInfo->m_priority < sampleThatNeedsSpace.m_eventInfo->m_priority) {
-					filesToClose.push_back(it->first);
-					runningTotal += it->second.m_fileSize;
-				
-					if (runningTotal >= spaceRequired) {
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	// We weren't able to find enough sounds to truncate. Therefore, this sound is not going to play.
-	if (runningTotal < spaceRequired) {
-		return FALSE;
-	}
-
-	std::list<AsciiString>::iterator ait;
-	for (ait = filesToClose.begin(); ait != filesToClose.end(); ++ait) {
-		OpenFilesHashIt itToErase = m_openFiles.find(*ait);
-		if (itToErase != m_openFiles.end()) {
-			releaseOpenAudioFile(&itToErase->second);
-			m_currentlyUsedSize -= itToErase->second.m_fileSize;
-			m_openFiles.erase(itToErase);
-		}
-	}
-
-	return TRUE;
-}
-
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-//-------------------------------------------------------------------------------------------------
-void MilesAudioManager::dumpAllAssetsUsed()
-{
-	if (!TheGlobalData->m_preloadReport) {
-		return;
-	}
-
-	// Dump all the audio assets we've used.
-	FILE *logfile=fopen("PreloadedAssets.txt","a+");	//append to log
-	if (!logfile)
-		return;
-
-	std::list<AsciiString> missingEvents;
-	std::list<AsciiString> usedFiles;
-
-	std::list<AsciiString>::iterator lit;
-
-	fprintf(logfile, "\nAudio Asset Report - BEGIN\n");
-	{
-		SetAsciiStringIt it;
-		std::vector<AsciiString>::iterator asIt;
-		for (it = m_allEventsLoaded.begin(); it != m_allEventsLoaded.end(); ++it) {
-			AsciiString astr = *it;
-			AudioEventInfo *aei = findAudioEventInfo(astr);
-			if (!aei) {
-				missingEvents.push_back(astr);
-				continue;
-			}
-
-			for (asIt = aei->m_attackSounds.begin(); asIt != aei->m_attackSounds.end(); ++asIt) {
-				usedFiles.push_back(*asIt);
-			}
-
-			for (asIt = aei->m_sounds.begin(); asIt != aei->m_sounds.end(); ++asIt) {
-				usedFiles.push_back(*asIt);
-			}
-
-			for (asIt = aei->m_decaySounds.begin(); asIt != aei->m_decaySounds.end(); ++asIt) {
-				usedFiles.push_back(*asIt);
-			}
-
-			if (!aei->m_filename.isEmpty()) {
-				usedFiles.push_back(aei->m_filename);
-			}
-		}
-
-		fprintf(logfile, "\nEvents Requested that are missing information - BEGIN\n");
-		for (lit = missingEvents.begin(); lit != missingEvents.end(); ++lit) {
-			fprintf(logfile, "%s\n", (*lit).str());
-		}
-		fprintf(logfile, "\nEvents Requested that are missing information - END\n");
-
-		fprintf(logfile, "\nFiles Used - BEGIN\n");
-		for (lit = usedFiles.begin(); lit != usedFiles.end(); ++lit) {
-			fprintf(logfile, "%s\n", (*lit).str());
-		}
-		fprintf(logfile, "\nFiles Used - END\n");
-	}
-	fprintf(logfile, "\nAudio Asset Report - END\n");
-	fclose(logfile);
-	logfile = NULL;
-}
-#endif
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
deleted file mode 100644
index dde27364500..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    VideoDevice
-//
-// File name: BinkDevice.cpp
-//
-// Created:   10/22/01	TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Lib/BaseType.h"
-#include "VideoDevice/Bink/BinkVideoPlayer.h"
-#include "Common/AudioAffect.h"
-#include "Common/GameAudio.h"
-#include "Common/GameMemory.h"
-#include "Common/GlobalData.h"
-#include "Common/Registry.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
- 
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-#define VIDEO_LANG_PATH_FORMAT "Data/%s/Movies/%s.%s"
-#define VIDEO_PATH	"Data\\Movies"
-#define VIDEO_EXT		"bik"
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//============================================================================
-// BinkVideoPlayer::BinkVideoPlayer
-//============================================================================
-
-BinkVideoPlayer::BinkVideoPlayer()
-{
-
-}
-
-//============================================================================
-// BinkVideoPlayer::~BinkVideoPlayer
-//============================================================================
-
-BinkVideoPlayer::~BinkVideoPlayer()
-{
-	deinit();
-}
-
-//============================================================================
-// BinkVideoPlayer::init
-//============================================================================
-
-void	BinkVideoPlayer::init( void )
-{
-	// Need to load the stuff from the ini file.
-	VideoPlayer::init();
-
-	initializeBinkWithMiles();
-}
-
-//============================================================================
-// BinkVideoPlayer::deinit
-//============================================================================
-
-void BinkVideoPlayer::deinit( void )
-{
-	TheAudio->releaseHandleForBink();
-	VideoPlayer::deinit();
-}
-
-//============================================================================
-// BinkVideoPlayer::reset
-//============================================================================
-
-void	BinkVideoPlayer::reset( void )
-{
-	VideoPlayer::reset();
-}
-
-//============================================================================
-// BinkVideoPlayer::update
-//============================================================================
-
-void	BinkVideoPlayer::update( void )
-{
-	VideoPlayer::update();
-
-}
-
-//============================================================================
-// BinkVideoPlayer::loseFocus
-//============================================================================
-
-void	BinkVideoPlayer::loseFocus( void )
-{
-	VideoPlayer::loseFocus();
-}
-
-//============================================================================
-// BinkVideoPlayer::regainFocus
-//============================================================================
-
-void	BinkVideoPlayer::regainFocus( void )
-{
-	VideoPlayer::regainFocus();
-}
-
-//============================================================================
-// BinkVideoPlayer::createStream
-//============================================================================
-
-VideoStreamInterface* BinkVideoPlayer::createStream( HBINK handle )
-{
-
-	if ( handle == NULL )
-	{
-		return NULL;
-	}
-
-	BinkVideoStream *stream = NEW BinkVideoStream;
-
-	if ( stream )
-	{
-
-		stream->m_handle = handle;
-		stream->m_next = m_firstStream;
-		stream->m_player = this;
-		m_firstStream = stream;
-
-		// never let volume go to 0, as Bink will interpret that as "play at full volume".
-		Int mod = (Int) ((TheAudio->getVolume(AudioAffect_Speech) * 0.8f) * 100) + 1;
-		Int volume = (32768*mod)/100;
-		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to set volume (%g -> %d -> %d\n",
-			TheAudio->getVolume(AudioAffect_Speech), mod, volume));
-		BinkSetVolume( stream->m_handle,0, volume);
-		DEBUG_LOG(("BinkVideoPlayer::createStream() - set volume\n"));
-	}
-
-	return stream;
-}
-
-//============================================================================
-// BinkVideoPlayer::open
-//============================================================================
-
-VideoStreamInterface*	BinkVideoPlayer::open( AsciiString movieTitle )
-{
-	VideoStreamInterface*	stream = NULL;
-
-	const Video* pVideo = getVideo(movieTitle);
-	if (pVideo) {
-		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to open bink file\n"));
-		
-		if (TheGlobalData->m_modDir.isNotEmpty())
-		{
-			char filePath[ _MAX_PATH ];
-			sprintf( filePath, "%s%s\\%s.%s", TheGlobalData->m_modDir.str(), VIDEO_PATH, pVideo->m_filename.str(), VIDEO_EXT );
-			HBINK handle = BinkOpen(filePath , BINKPRELOADALL );
-			DEBUG_ASSERTLOG(!handle, ("opened bink file %s\n", filePath));
-			if (handle)
-			{
-				return createStream( handle );
-			}
-		}
-
-		char localizedFilePath[ _MAX_PATH ];
-		sprintf( localizedFilePath, VIDEO_LANG_PATH_FORMAT, GetRegistryLanguage().str(), pVideo->m_filename.str(), VIDEO_EXT );
-		HBINK handle = BinkOpen(localizedFilePath , BINKPRELOADALL );
-		DEBUG_ASSERTLOG(!handle, ("opened localized bink file %s\n", localizedFilePath));
-		if (!handle)
-		{
-			char filePath[ _MAX_PATH ];
-			sprintf( filePath, "%s\\%s.%s", VIDEO_PATH, pVideo->m_filename.str(), VIDEO_EXT );
-			handle = BinkOpen(filePath , BINKPRELOADALL );
-			DEBUG_ASSERTLOG(!handle, ("opened bink file %s\n", localizedFilePath));
-		}
-
-		DEBUG_LOG(("BinkVideoPlayer::createStream() - About to create stream\n"));
-		stream = createStream( handle );
-	}
-
-	return stream;	
-}
-
-//============================================================================
-// BinkVideoPlayer::load
-//============================================================================
-
-VideoStreamInterface*	BinkVideoPlayer::load( AsciiString movieTitle )
-{
-	return open(movieTitle); // load() used to have the same body as open(), so I'm combining them.  Munkee.
-}
-
-//============================================================================
-//============================================================================
-void BinkVideoPlayer::notifyVideoPlayerOfNewProvider( Bool nowHasValid )
-{
-	if (!nowHasValid) {
-		TheAudio->releaseHandleForBink();
-		BinkSetSoundTrack(0, 0);
-	} else {
-		initializeBinkWithMiles();
-	}
-}
-
-//============================================================================
-//============================================================================
-void BinkVideoPlayer::initializeBinkWithMiles()
-{
-	Int retVal = 0;
-	void *driver = TheAudio->getHandleForBink();	
-	
-	if ( driver )
-	{
-		retVal = BinkSoundUseDirectSound(driver);
-	}
-	if( !driver || retVal == 0)
-	{
-		BinkSetSoundTrack ( 0,0 );
-	}
-}
-
-//============================================================================
-// BinkVideoStream::BinkVideoStream
-//============================================================================
-
-BinkVideoStream::BinkVideoStream()
-: m_handle(NULL)
-{
-
-}
-
-//============================================================================
-// BinkVideoStream::~BinkVideoStream
-//============================================================================
-
-BinkVideoStream::~BinkVideoStream()
-{
-	if ( m_handle != NULL )
-	{
-		BinkClose( m_handle );
-		m_handle = NULL;
-	}
-}
-
-//============================================================================
-// BinkVideoStream::update
-//============================================================================
-
-void BinkVideoStream::update( void )
-{
-	BinkWait( m_handle );
-}
-
-//============================================================================
-// BinkVideoStream::isFrameReady
-//============================================================================
-
-Bool BinkVideoStream::isFrameReady( void )
-{
-	return !BinkWait( m_handle );
-}
-
-//============================================================================
-// BinkVideoStream::frameDecompress
-//============================================================================
-
-void BinkVideoStream::frameDecompress( void )
-{
-		BinkDoFrame( m_handle );
-}
-
-//============================================================================
-// BinkVideoStream::frameRender
-//============================================================================
-
-void BinkVideoStream::frameRender( VideoBuffer *buffer )
-{
-	if ( buffer )
-	{
-		void *mem = buffer->lock();
-
-		u32 flags;
-
-		switch ( buffer->format())
-		{
-			case VideoBuffer::TYPE_X8R8G8B8:
-				flags = BINKSURFACE32;
-				break;
-
-			case VideoBuffer::TYPE_R8G8B8:
-				flags = BINKSURFACE24;
-				break;
-
-			case VideoBuffer::TYPE_R5G6B5:
-				flags = BINKSURFACE565;
-				break;
-
-			case VideoBuffer::TYPE_X1R5G5B5:
-				flags = BINKSURFACE555;
-				break;
-
-			default:
-				return;
-		}
-		
-		if ( mem != NULL )
-		{
-
-			BinkCopyToBuffer ( m_handle, mem, buffer->pitch(), buffer->height(),
-													buffer->xPos(), buffer->yPos(), flags );
-			buffer->unlock();
-		}
-	}
-
-}
-
-//============================================================================
-// BinkVideoStream::frameNext
-//============================================================================
-
-void BinkVideoStream::frameNext( void )
-{
-	BinkNextFrame( m_handle );
-}
-
-//============================================================================
-// BinkVideoStream::frameIndex
-//============================================================================
-
-Int BinkVideoStream::frameIndex( void )
-{
-	return m_handle->FrameNum - 1;
-}
-
-//============================================================================
-// BinkVideoStream::totalFrames
-//============================================================================
-
-Int	BinkVideoStream::frameCount( void )
-{
-	return m_handle->Frames;
-}
-
-//============================================================================
-// BinkVideoStream::frameGoto
-//============================================================================
-
-void BinkVideoStream::frameGoto( Int index )
-{
-	BinkGoto(m_handle, index, NULL );
-}
-
-//============================================================================
-// VideoStream::height
-//============================================================================
-
-Int		BinkVideoStream::height( void )
-{
-	return m_handle->Height;
-}
-
-//============================================================================
-// VideoStream::width
-//============================================================================
-
-Int		BinkVideoStream::width( void )
-{
-	return m_handle->Width;
-}
-
-
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
index 73d7f2e1188..a1bee4fbedb 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
@@ -36,11 +36,11 @@
 #include "W3DDevice/GameClient/W3DGadget.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// PRIVATE DATA 
+// PRIVATE DATA
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Game Window draw methods -----------------------------------------------------------------------
-static FunctionLexicon::TableEntry gameWinDrawTable [] = 
+static FunctionLexicon::TableEntry gameWinDrawTable [] =
 {
 
 	{ NAMEKEY_INVALID, "GameWinDefaultDraw",						GameWinDefaultDraw },
@@ -100,7 +100,7 @@ static FunctionLexicon::TableEntry gameWinDrawTable [] =
 };
 
 // Game Window init methods -----------------------------------------------------------------------
-static FunctionLexicon::TableEntry layoutInitTable [] = 
+static FunctionLexicon::TableEntry layoutInitTable [] =
 {
 
 	{ NAMEKEY_INVALID, "W3DMainMenuInit",								W3DMainMenuInit },
@@ -110,7 +110,7 @@ static FunctionLexicon::TableEntry layoutInitTable [] =
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC FUNCTIONS 
+// PUBLIC FUNCTIONS
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
@@ -118,14 +118,14 @@ static FunctionLexicon::TableEntry layoutInitTable [] =
 W3DFunctionLexicon::W3DFunctionLexicon( void )
 {
 
-}  // end W3DFunctionLexicon
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DFunctionLexicon::~W3DFunctionLexicon( void )
 {
 
-}  // end ~W3DFunctionLexicon
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the function table specific for our implementations of
@@ -141,7 +141,7 @@ void W3DFunctionLexicon::init( void )
 	loadTable( gameWinDrawTable, TABLE_GAME_WIN_DEVICEDRAW );
 	loadTable( layoutInitTable, TABLE_WIN_LAYOUT_DEVICEINIT );
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -154,7 +154,7 @@ void W3DFunctionLexicon::reset( void )
 	// extend
 	FunctionLexicon::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -165,6 +165,6 @@ void W3DFunctionLexicon::update( void )
 	// extend?
 	FunctionLexicon::update();
 
-}  // end update
+}
 
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp
deleted file mode 100644
index 83a97510fb3..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp
+++ /dev/null
@@ -1,1606 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DRadar.cpp /////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, January 2002
-// Desc:   W3D radar implementation, this has the necessary device dependent drawing
-//				 necessary for the radar
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/AudioEventRTS.h"
-#include "Common/Debug.h"
-#include "Common/GlobalData.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-
-#include "GameLogic/TerrainLogic.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/Object.h"
-
-#include "GameClient/Color.h"
-#include "GameClient/Display.h"
-#include "GameClient/GameClient.h"
-#include "GameClient/GameWindow.h"
-#include "GameClient/Image.h"
-#include "GameClient/Line2D.h"
-#include "GameClient/TerrainVisual.h"
-#include "GameClient/Water.h"
-#include "W3DDevice/Common/W3DRadar.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/W3DShroud.h"
-#include "WW3D2/texture.h"
-#include "WW3D2/dx8caps.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-
-// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
-enum { OVERLAY_REFRESH_RATE = 6 };  ///< over updates once this many frames
-
-//-------------------------------------------------------------------------------------------------
-/** Is the point legal, that is, inside the resolution of the radar cells */
-//-------------------------------------------------------------------------------------------------
-inline Bool legalRadarPoint( Int px, Int py )
-{
-
-	if( px < 0 || py < 0 || px >= RADAR_CELL_WIDTH || py >= RADAR_CELL_HEIGHT )
-		return FALSE;
-
-	return TRUE;
-
-}
-
-//-------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-static WW3DFormat findFormat(const WW3DFormat formats[])
-{
-	for( Int i = 0; formats[ i ] != WW3D_FORMAT_UNKNOWN; i++ )
-	{
-
-		if( DX8Wrapper::Get_Current_Caps()->Support_Texture_Format( formats[ i ] ) )
-		{
-
-			return formats[ i ];
-
-		}  // end if
-
-	}  // end for i
-	DEBUG_CRASH(("WW3DRadar: No appropriate texture format\n") );
-	return WW3D_FORMAT_UNKNOWN;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Find the texture format we're going to use for the radar.  The texture format must
-	* be supported by the hardware.  The "more preferred" formats appear at the top of
-	* the format tables in order from most preferred to least preferred */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::initializeTextureFormats( void )
-{
-	const WW3DFormat terrainFormats[] = 
-	{
-		WW3D_FORMAT_R8G8B8,
-		WW3D_FORMAT_X8R8G8B8,
-		WW3D_FORMAT_R5G6B5,
-		WW3D_FORMAT_X1R5G5B5,
-		WW3D_FORMAT_UNKNOWN				// keep this one last
-	};
-	const WW3DFormat overlayFormats[] = 
-	{
-		WW3D_FORMAT_A8R8G8B8,
-		WW3D_FORMAT_A4R4G4B4,
-		WW3D_FORMAT_UNKNOWN				// keep this one last
-	};
-	const WW3DFormat shroudFormats[] = 
-	{
-		WW3D_FORMAT_A8R8G8B8,
-		WW3D_FORMAT_A4R4G4B4,
-		WW3D_FORMAT_UNKNOWN				// keep this one last
-	};
-
-	// find a format for the terrain texture
-	m_terrainTextureFormat = findFormat(terrainFormats);
-
-	// find a format for the overlay texture
-	m_overlayTextureFormat = findFormat(overlayFormats);
-
-	// find a format for the shroud texture
-	m_shroudTextureFormat = findFormat(shroudFormats);
-
-}  // end initializeTextureFormats
-
-//-------------------------------------------------------------------------------------------------
-/** Delete resources used specifically in this W3D radar implemetation */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::deleteResources( void )
-{
-
-	//
-	// delete terrain resources used
-	//
-	if( m_terrainTexture )
-		m_terrainTexture->Release_Ref();
-	m_terrainTexture = NULL;
-	if( m_terrainImage )
-		deleteInstance(m_terrainImage);
-	m_terrainImage = NULL;
-
-	//
-	// delete overlay resources used
-	//
-	if( m_overlayTexture )
-		m_overlayTexture->Release_Ref();
-	m_overlayTexture = NULL;
-	if( m_overlayImage )
-		deleteInstance(m_overlayImage);
-	m_overlayImage = NULL;
-
-	//
-	// delete shroud resources used
-	//
-	if( m_shroudTexture )
-		m_shroudTexture->Release_Ref();
-	m_shroudTexture = NULL;
-	if( m_shroudImage )
-		deleteInstance(m_shroudImage);
-	m_shroudImage = NULL;
-
-}  // end deleteResources
-
-//-------------------------------------------------------------------------------------------------
-/** Reconstruct the view box given the current camera settings */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::reconstructViewBox( void )
-{
-	Coord3D world[ 4 ];
-	ICoord2D radar[ 4 ];
-	Int i;
-
-	// get the 4 points of the view corners in the 3D world at the average Z height in the map
-	TheTacticalView->getScreenCornerWorldPointsAtZ( &world[ 0 ],
-																									&world[ 1 ],
-																									&world[ 2 ],
-																									&world[ 3 ],
-																									getTerrainAverageZ() );
-
-	// convert each of the 4 points in the world to radar cell positions
-	for( i = 0; i < 4; i++ )
-	{
-
-		// first convert to radar cells
- 		radar[ i ].x = world[ i ].x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
- 		radar[ i ].y = world[ i ].y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
-
-		//
-		// store these points in the view box array which contains a first position
-		// of (0,0) and then offsets for each additional entry point
-		//
-		if( i == 0 )
-		{
-
-			m_viewBox[ i ].x = 0;
-			m_viewBox[ i ].y = 0;
-
-		}  // end if
-		else
-		{
-
-			m_viewBox[ i ].x = radar[ i ].x - radar[ i - 1 ].x;
-			m_viewBox[ i ].y = radar[ i ].y - radar[ i - 1 ].y;
-
-		}  // end else
-
-	}  // end for i
-
-	//
-	// save the camera settings for this view box, we will need to make it again only
-	// if some of these change
-	//
-	m_viewAngle = TheTacticalView->getAngle();
-	Coord3D pos;
-	TheTacticalView->getPosition( &pos );
-	m_viewZoom = TheTacticalView->getZoom();
-	m_reconstructViewBox = FALSE;
-
-}  // end reconstructViewBox
-
-//-------------------------------------------------------------------------------------------------
-/** Convert radar position to actual pixel coord */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::radarToPixel( const ICoord2D *radar, ICoord2D *pixel,	
-														 Int radarUpperLeftX, Int radarUpperLeftY,
-														 Int radarWidth, Int radarHeight )
-{
-
-	// sanity
-	if( radar == NULL || pixel == NULL )
-		return;
-
-	pixel->x = (radar->x * radarWidth / RADAR_CELL_WIDTH) + radarUpperLeftX;
-	// note the "inverted" y here to orient the way our world looks with +x=right and -y=down
-	pixel->y = ((RADAR_CELL_HEIGHT - 1 - radar->y) * radarHeight / RADAR_CELL_HEIGHT) + radarUpperLeftY;
-
-}  // end radarToPixel
-
-
-//-------------------------------------------------------------------------------------------------
-/** Draw a hero icon at a position, given radar box upper left location and dimensions.  */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::drawHeroIcon( Int pixelX, Int pixelY, Int width, Int height, const Coord3D *pos )
-{
-	// get the hero icon image
-	static const Image *image = (Image *)TheMappedImageCollection->findImageByName("HeroReticle");
-	if (image != NULL)
-	{
-		// convert world to radar coords
-		ICoord2D ulRadar; 
-		ulRadar.x = pos->x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
-		ulRadar.y = pos->y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
-
-		// convert radar to screen coords
-		ICoord2D offsetScreen;
-		radarToPixel( &ulRadar, &offsetScreen, pixelX, pixelY, width, height );
-		
-		// shift from an upper left to a center focus for the icon
-		int iconWidth = image->getImageWidth();
-		int iconHeight = image->getImageHeight();
-		offsetScreen.x -= (iconWidth / 2) - 1;
-		offsetScreen.y -= iconHeight / 2; 
-
-		// draw the icon
-		TheDisplay->drawImage( image, offsetScreen.x , offsetScreen.y, offsetScreen.x + iconWidth, offsetScreen.y + iconHeight );
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Draw a "box" into the texture passed in that represents the viewable area for
-	* the tactical display into the game world */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::drawViewBox( Int pixelX, Int pixelY, Int width, Int height )
-{
-	ICoord2D ulScreen;
-	ICoord2D ulRadar;
-	Coord3D ulWorld;
-	ICoord2D ulStart = { 0, 0 };
-	ICoord2D start, end;
-	ICoord2D clipStart, clipEnd;
-	Real lineWidth = 1.0f;
-	Color topColor = GameMakeColor( 225, 225, 0, 255 );
-	Color bottomColor = GameMakeColor( 158, 158, 0, 255 );
-
-	//
-	// setup the clipping region ... note that this clipping region is not over just the
-	// radar image area ... it's in the WHOLE window available for the radar
-	//
-	IRegion2D clipRegion;
-	ICoord2D radarWindowSize, radarWindowScreenPos;
-	m_radarWindow->winGetSize( &radarWindowSize.x, &radarWindowSize.y );
-	m_radarWindow->winGetScreenPosition( &radarWindowScreenPos.x, &radarWindowScreenPos.y );
-	clipRegion.lo.x = radarWindowScreenPos.x;
-	clipRegion.lo.y = radarWindowScreenPos.y;
-	clipRegion.hi.x = radarWindowScreenPos.x + radarWindowSize.x;
-	clipRegion.hi.y = radarWindowScreenPos.y + radarWindowSize.y;
-
-	// convert top left of screen into world position
-	TheTacticalView->getOrigin( &ulScreen.x, &ulScreen.y );
-	TheTacticalView->screenToWorldAtZ( &ulScreen, &ulWorld, getTerrainAverageZ() );
-
-	// convert world to radar coords
- 	ulRadar.x = ulWorld.x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
- 	ulRadar.y = ulWorld.y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
-
-	//
-	// convert radar point to actual pixel coords on the screen, shifted
-	// into position on the radar for where the radar is drawn and the size of the
-	// area that the radar is drawn in
-	//
-	radarToPixel( &ulRadar, &ulStart, pixelX, pixelY, width, height );
-
-	//
-	// using our view box offset array, convert each of those radar cell offset points
-	// into screen pixels and draw the box.  The view box array is setup with the
-	// first index containing (0,0) (the point we just converted in theory), with cell
-	// offsets to each of the other corners in the following order
-	// (upper left, upper right, lower right, lower left)
-	//
-	ICoord2D radar;
-
-	// top line
-	start = ulStart;
-	radar.x = ulRadar.x + m_viewBox[ 1 ].x;
-	radar.y = ulRadar.y + m_viewBox[ 1 ].y;
-	radarToPixel( &radar, &end, pixelX, pixelY, width, height );
-	if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) )
-		TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y,
-													lineWidth, topColor );
-
-  // right line
-	start = end;
-	radar.x += m_viewBox[ 2 ].x;
-	radar.y += m_viewBox[ 2 ].y;
-	radarToPixel( &radar, &end, pixelX, pixelY, width, height );
-	if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) )
-		TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y,
-													lineWidth, topColor, bottomColor );
-
-  // bottom line
-	start = end;
-	radar.x += m_viewBox[ 3 ].x;
-	radar.y += m_viewBox[ 3 ].y;
-	radarToPixel( &radar, &end, pixelX, pixelY, width, height );
-	if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) )
-		TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y,
-													lineWidth, bottomColor );
-
-  // left line
-	start = end;
-	end = ulStart;
-	if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) )
-		TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y,
-													lineWidth, bottomColor, topColor );
-
-}  // end drawViewBox
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DRadar::drawSingleBeaconEvent( Int pixelX, Int pixelY, Int width, Int height, Int index )
-{
-	RadarEvent *event = &(m_event[index]);
-	ICoord2D tri[ 3 ];
-	ICoord2D start, end;
-	Real angle, addAngle;
-	Color startColor, endColor;
-	Real lineWidth = 1.0f;
-	UnsignedInt currentFrame = TheGameLogic->getFrame();
-	UnsignedInt frameDiff;							// frames the event has been alive for
-	Real maxEventSize = width / 10.0f;   // max size of the event marker
-	Int minEventSize = 6;     // min size of the event marker
-	Int eventSize;									 // current size of a marker to draw
-	const Real TIME_FROM_FULL_SIZE_TO_SMALL_SIZE = LOGICFRAMES_PER_SECOND * 1.5;
-	Real totalAnglesToSpin = 2.0f * PI;  ///< spin around this many angles going from big to small
-	UnsignedByte r, g, b, a;
-
-	// setup screen clipping region
-	IRegion2D clipRegion;
-	clipRegion.lo.x = pixelX;
-	clipRegion.lo.y = pixelY;
-	clipRegion.hi.x = pixelX + width;
-	clipRegion.hi.y = pixelY + height;
-
-	// get the difference in frame from the current frame to the frame we were created on
-	frameDiff = currentFrame - event->createFrame;
-
-	// compute the size of the event marker, it is largest when it starts and smallest at the end
-	eventSize = REAL_TO_INT( maxEventSize * ( 1.0f - frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE) );;
-
-	// we never let the event size get too small
-	if( eventSize < minEventSize )
-		eventSize = minEventSize;
-
-	// compute how much "angle" we will add to each point to make it rotate as it's getting small
-	addAngle = -totalAnglesToSpin * (frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE);
-
-	// create a triangle around the event
-	angle = 0.0f - addAngle;
-	tri[ 0 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
-	tri[ 0 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
-
-	angle = 2.0f * PI / 3.0f - addAngle;
-	tri[ 1 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
-	tri[ 1 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
-
-	angle = -2.0f * PI / 3.0f - addAngle;
-	tri[ 2 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
-	tri[ 2 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
-
-	// translate radar coords to screen coords
-	radarToPixel( &tri[ 0 ], &tri[ 0 ], pixelX, pixelY, width, height );
-	radarToPixel( &tri[ 1 ], &tri[ 1 ], pixelX, pixelY, width, height );
-	radarToPixel( &tri[ 2 ], &tri[ 2 ], pixelX, pixelY, width, height );
-
-	//
-	// make the colors we're going to use, when we're at our smallest size we will start to
-	// fade the alpha away to transparent so that at our lifetime frame we are completely gone
-	//
-
-	// color 1 ------------------
-	r = event->color1.red;
-	g = event->color1.green;
-	b = event->color1.blue;
-	a = event->color1.alpha;
-	if( currentFrame > event->fadeFrame )
-	{
-		
-		a = REAL_TO_UNSIGNEDBYTE( (Real)a * (1.0f - (Real)(currentFrame - event->fadeFrame) / 
-																								(Real)(event->dieFrame - event->fadeFrame) ) );
-
-	}  // end if
-	startColor = GameMakeColor( r, g, b, a );
-
-	// color 2 ------------------
-	r = event->color2.red;
-	g = event->color2.green;
-	b = event->color2.blue;
-	a = event->color2.alpha;
-	if( currentFrame > event->fadeFrame )
-	{
-		
-		a = REAL_TO_UNSIGNEDBYTE( (Real)a * (1.0f - (Real)(currentFrame - event->fadeFrame) / 
-																								(Real)(event->dieFrame - event->fadeFrame) ) );
-
-	}  // end if
-	endColor = GameMakeColor( r, g, b, a );
-
-	// draw the lines
-	if( ClipLine2D( &tri[ 0 ], &tri[ 1 ], &start, &end, &clipRegion ) )
-		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
-	if( ClipLine2D( &tri[ 1 ], &tri[ 2 ], &start, &end, &clipRegion ) )
-		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
-	if( ClipLine2D( &tri[ 2 ], &tri[ 0 ], &start, &end, &clipRegion ) )
-		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DRadar::drawSingleGenericEvent( Int pixelX, Int pixelY, Int width, Int height, Int index )
-{
-	RadarEvent *event = &(m_event[index]);
-	ICoord2D tri[ 3 ];
-	ICoord2D start, end;
-	Real angle, addAngle;
-	Color startColor, endColor;
-	Real lineWidth = 1.0f;
-	UnsignedInt currentFrame = TheGameLogic->getFrame();
-	UnsignedInt frameDiff;							// frames the event has been alive for
-	Real maxEventSize = width / 2.0f;   // max size of the event marker
-	Int minEventSize = 6;     // min size of the event marker
-	Int eventSize;									 // current size of a marker to draw
-	const Real TIME_FROM_FULL_SIZE_TO_SMALL_SIZE = LOGICFRAMES_PER_SECOND * 1.5;
-	Real totalAnglesToSpin = 2.0f * PI;  ///< spin around this many angles going from big to small
-	UnsignedByte r, g, b, a;
-
-	// setup screen clipping region
-	IRegion2D clipRegion;
-	clipRegion.lo.x = pixelX;
-	clipRegion.lo.y = pixelY;
-	clipRegion.hi.x = pixelX + width;
-	clipRegion.hi.y = pixelY + height;
-
-	// get the difference in frame from the current frame to the frame we were created on
-	frameDiff = currentFrame - event->createFrame;
-
-	// compute the size of the event marker, it is largest when it starts and smallest at the end
-	eventSize = REAL_TO_INT( maxEventSize * ( 1.0f - frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE) );;
-
-	// we never let the event size get too small
-	if( eventSize < minEventSize )
-		eventSize = minEventSize;
-
-	// compute how much "angle" we will add to each point to make it rotate as it's getting small
-	addAngle = totalAnglesToSpin * (frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE);
-
-	// create a triangle around the event
-	angle = 0.0f - addAngle;
-	tri[ 0 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
-	tri[ 0 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
-
-	angle = 2.0f * PI / 3.0f - addAngle;
-	tri[ 1 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
-	tri[ 1 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
-
-	angle = -2.0f * PI / 3.0f - addAngle;
-	tri[ 2 ].x = REAL_TO_INT( (DOUBLE_TO_REAL( Cos( angle ) ) * eventSize) + event->radarLoc.x );
-	tri[ 2 ].y = REAL_TO_INT( (DOUBLE_TO_REAL( Sin( angle ) ) * eventSize) + event->radarLoc.y );
-
-	// translate radar coords to screen coords
-	radarToPixel( &tri[ 0 ], &tri[ 0 ], pixelX, pixelY, width, height );
-	radarToPixel( &tri[ 1 ], &tri[ 1 ], pixelX, pixelY, width, height );
-	radarToPixel( &tri[ 2 ], &tri[ 2 ], pixelX, pixelY, width, height );
-
-	//
-	// make the colors we're going to use, when we're at our smallest size we will start to
-	// fade the alpha away to transparent so that at our lifetime frame we are completely gone
-	//
-
-	// color 1 ------------------
-	r = event->color1.red;
-	g = event->color1.green;
-	b = event->color1.blue;
-	a = event->color1.alpha;
-	if( currentFrame > event->fadeFrame )
-	{
-		
-		a = REAL_TO_UNSIGNEDBYTE( (Real)a * (1.0f - (Real)(currentFrame - event->fadeFrame) / 
-																								(Real)(event->dieFrame - event->fadeFrame) ) );
-
-	}  // end if
-	startColor = GameMakeColor( r, g, b, a );
-
-	// color 2 ------------------
-	r = event->color2.red;
-	g = event->color2.green;
-	b = event->color2.blue;
-	a = event->color2.alpha;
-	if( currentFrame > event->fadeFrame )
-	{
-		
-		a = REAL_TO_UNSIGNEDBYTE( (Real)a * (1.0f - (Real)(currentFrame - event->fadeFrame) / 
-																								(Real)(event->dieFrame - event->fadeFrame) ) );
-
-	}  // end if
-	endColor = GameMakeColor( r, g, b, a );
-
-	// draw the lines
-	if( ClipLine2D( &tri[ 0 ], &tri[ 1 ], &start, &end, &clipRegion ) )
-		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
-	if( ClipLine2D( &tri[ 1 ], &tri[ 2 ], &start, &end, &clipRegion ) )
-		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
-	if( ClipLine2D( &tri[ 2 ], &tri[ 0 ], &start, &end, &clipRegion ) )
-		TheDisplay->drawLine( start.x, start.y, end.x, end.y, lineWidth, startColor, endColor );
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Draw all the radar events */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::drawEvents( Int pixelX, Int pixelY, Int width, Int height )
-{
-	Int i;
-
-	for( i = 0;  i < MAX_RADAR_EVENTS; i++ )
-	{
-
-		// only 'active' events actually have something to draw
-		if( m_event[ i ].active == TRUE && m_event[ i ].type != RADAR_EVENT_FAKE )
-		{
-
-			// if we haven't played the sound for this event, do it now that we can see it
-			if( m_event[ i ].soundPlayed == FALSE && m_event[i].type != RADAR_EVENT_BEACON_PULSE )
-			{
-				static AudioEventRTS eventSound("RadarEvent");
-				TheAudio->addAudioEvent( &eventSound );
-
-			}  // end if
-
-			m_event[ i ].soundPlayed = TRUE;
-
-			if ( m_event[ i ].type == RADAR_EVENT_BEACON_PULSE )
-				drawSingleBeaconEvent( pixelX, pixelY, width, height, i );
-			else
-				drawSingleGenericEvent( pixelX, pixelY, width, height, i );
-
-		}  // end if
-
-	}  // end for i
-
-}  // end drawEvents
-
-
-//-------------------------------------------------------------------------------------------------
-/** Draw all the radar icons */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::drawIcons( Int pixelX, Int pixelY, Int width, Int height )
-{
-	// draw the hero icons
-	std::list<const Coord3D *>::const_iterator iter = m_cachedHeroPosList.begin();
-	while (iter != m_cachedHeroPosList.end())
-	{
-		drawHeroIcon( pixelX, pixelY, width, height, (*iter) );
-		++iter;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Render an object list into the texture passed in */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::renderObjectList( const RadarObject *listHead, TextureClass *texture, Bool calcHero )
-{
-
-	// sanity
-	if( listHead == NULL || texture == NULL )
-		return;
-
-	// get surface for texture to render into
-	SurfaceClass *surface = texture->Get_Surface_Level();
-
-	// loop through all objects and draw
-	ICoord2D radarPoint;
-
-	Player *player = ThePlayerList->getLocalPlayer();
-	Int playerIndex=0;
-	if (player)
-		playerIndex=player->getPlayerIndex();
-
-	if( calcHero )
-	{
-		// clear all entries from the cached hero object list
-		m_cachedHeroPosList.clear();
-	}
-
-	for( const RadarObject *rObj = listHead; rObj; rObj = rObj->friend_getNext() )
-	{
-
-		if (rObj->isTemporarilyHidden())
-			continue;
-
-		// get object
-		const Object *obj = rObj->friend_getObject();
-
-		// cache hero object positions for drawing in icon layer
-		if( calcHero && obj->isHero() )
-		{
-			m_cachedHeroPosList.push_back(obj->getPosition());
-		}
-    Bool skip = FALSE;
-
-		// check for shrouded status
-		if (obj->getShroudedStatus(playerIndex) > OBJECTSHROUD_PARTIAL_CLEAR)
-			skip = TRUE;	//object is fogged or shrouded, don't render it.
-
- 		//
- 		// objects with a local only unit priority will only appear on the radar if they
- 		// are controlled by the local player, or if the local player is an observer (cause
-		// they are godlike and can see everything)
- 		//
-
-
- 		if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY &&
- 				obj->getControllingPlayer() != ThePlayerList->getLocalPlayer() &&
-				ThePlayerList->getLocalPlayer()->isPlayerActive() )
- 			skip = TRUE;
-
-		// get object position
-		const Coord3D *pos = obj->getPosition();
-
-		// compute object position as a radar blip
-		radarPoint.x = pos->x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
-		radarPoint.y = pos->y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
-
-
-    if ( skip )
-      continue;
-
-    // get the color we're going to draw in
-		Color c = rObj->getColor();
-
-		
-		
-		// adjust the alpha for stealth units so they "fade/blink" on the radar for the controller
-		// if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY )
-		// ML-- What the heck is this? local-only and neutral-observier-viewed units are stealthy?? Since when?	
-		// Now it twinkles for any stealthed object, whether locally controlled or neutral-observier-viewed
-		if( obj->testStatus( OBJECT_STATUS_STEALTHED ) )
-		{
-      if ( ThePlayerList->getLocalPlayer()->getRelationship(obj->getTeam()) == ENEMIES )
-        if( !obj->testStatus( OBJECT_STATUS_DETECTED ) && !obj->testStatus( OBJECT_STATUS_DISGUISED ) )
-				  skip = TRUE;
-
-			UnsignedByte r, g, b, a;
-			GameGetColorComponents( c, &r, &g, &b, &a );
-
-			const UnsignedInt framesForTransition = LOGICFRAMES_PER_SECOND;
-			const UnsignedByte minAlpha = 32;
-			
-      if (skip)
-        continue;
-
-			Real alphaScale = INT_TO_REAL(TheGameLogic->getFrame() % framesForTransition) / (framesForTransition / 2.0f);
-			if( alphaScale > 0.0f )
-				a = REAL_TO_UNSIGNEDBYTE( ((alphaScale - 1.0f) * (255.0f - minAlpha)) + minAlpha );
-			else
-				a = REAL_TO_UNSIGNEDBYTE( (alphaScale * (255.0f - minAlpha)) + minAlpha );
-			c = GameMakeColor( r, g, b, a );
-
-		}  // end if
-
-
-
-		
-		// draw the blip, but make sure the points are legal
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-		radarPoint.y++;
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-		radarPoint.x++;
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-		radarPoint.y--;
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-	}  // end for
-	REF_PTR_RELEASE(surface);
-
-}  // end renderObjectList
-
-//-------------------------------------------------------------------------------------------------
-/** Shade the color passed in using the height parameter to lighten and darken it.  Colors
-	* will be interpolated using the value "height" across the range from loZ to hiZ.  The
-	* midZ is the "middle" point, height values above it will be lightened, while 
-	* lower ones are darkened. */
-//-------------------------------------------------------------------------------------------------	
-void W3DRadar::interpolateColorForHeight( RGBColor *color,	
-																					Real height, 
-																					Real hiZ,
-																					Real midZ,
-																					Real loZ )
-{
-	const Real howBright = 0.95f;  // bigger is brighter (0.0 to 1.0)
-	const Real howDark   = 0.60f;  // bigger is darker (0.0 to 1.0)
-	
-	// sanity on map height (flat maps bomb)
-	if (hiZ == midZ)
-		hiZ = midZ+0.1f;
-	if (midZ == loZ)
-		loZ = midZ-0.1f;
-	if (hiZ == loZ)
-		hiZ = loZ+0.2f;
-
-	Real t;
-	RGBColor colorTarget;
-
-	// if "over" the middle height, interpolate lighter
-	if( height >= midZ )
-	{
-
-		// how far are we from the middleZ towards the hi Z
-		t = (height - midZ) / (hiZ - midZ);
-
-		// compute what our "lightest" color possible we want to use is
-		colorTarget.red = color->red + (1.0f - color->red) * howBright;
-		colorTarget.green = color->green + (1.0f - color->green) * howBright;
-		colorTarget.blue = color->blue + (1.0f - color->blue) * howBright;
-
-	}  // end if
-	else  // interpolate darker
-	{
-
-		// how far are we from the middleZ towards the low Z
-		t = (midZ - height) / (midZ - loZ);
-
-		// compute what the "darkest" color possible we want to use is
-		colorTarget.red = color->red + (0.0f - color->red) * howDark;
-		colorTarget.green = color->green + (0.0f - color->green) * howDark;
-		colorTarget.blue = color->blue + (0.0f - color->blue) * howDark;
-
-	}  // end else
-
-	// interpolate toward the target color
-	color->red = color->red + (colorTarget.red - color->red) * t;
-	color->green = color->green + (colorTarget.green - color->green) * t;
-	color->blue = color->blue + (colorTarget.blue - color->blue) * t;
-
-	// keep the color real
-	if( color->red < 0.0f )
-		color->red = 0.0f;
-	if( color->red > 1.0f )
-		color->red = 1.0f;
-	if( color->green < 0.0f )
-		color->green = 0.0f;
-	if( color->green > 1.0f )
-		color->green = 1.0f;
-	if( color->blue < 0.0f )
-		color->blue = 0.0f;
-	if( color->blue > 1.0f )
-		color->blue = 1.0f;
-
-}  // end interpolateColorForHeight
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC METHODS /////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DRadar::W3DRadar( void )
-{
-
-	m_terrainTextureFormat = WW3D_FORMAT_UNKNOWN;
-	m_terrainImage = NULL;
-	m_terrainTexture = NULL;
-
-	m_overlayTextureFormat = WW3D_FORMAT_UNKNOWN;
-	m_overlayImage = NULL;
-	m_overlayTexture = NULL;
-
-	m_shroudTextureFormat = WW3D_FORMAT_UNKNOWN;
-	m_shroudImage = NULL;
-	m_shroudTexture = NULL;
-
-	m_textureWidth = RADAR_CELL_WIDTH;
-	m_textureHeight = RADAR_CELL_HEIGHT;
-
-	m_reconstructViewBox = TRUE;
-	m_viewAngle = 0.0f;
-	m_viewZoom = 0.0f;
-	for( Int i = 0; i < 4; i++ )
-	{
-
-		m_viewBox[ i ].x = 0;
-		m_viewBox[ i ].y = 0;
-
-	}  // end for
-
-}  // end W3DRadar
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DRadar::~W3DRadar( void )
-{
-
-	// delete resources used for the W3D radar
-	deleteResources();
-
-}  // end ~W3DRadar
-
-//-------------------------------------------------------------------------------------------------
-/** Radar initialization */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::init( void )
-{
-	ICoord2D size;
-	Region2D uv;
-
-	// extending functionality
-	Radar::init();
-
-	// gather specific texture format information
-	initializeTextureFormats();
-
-	// allocate our terrain texture
-	// poolify
-	m_terrainTexture = MSGNEW("TextureClass") TextureClass( m_textureWidth, m_textureHeight, 
-																			 m_terrainTextureFormat, MIP_LEVELS_1 );
-	DEBUG_ASSERTCRASH( m_terrainTexture, ("W3DRadar: Unable to allocate terrain texture\n") );
-
-	// allocate our overlay texture
-	m_overlayTexture = MSGNEW("TextureClass") TextureClass( m_textureWidth, m_textureHeight,
-																			 m_overlayTextureFormat, MIP_LEVELS_1 );
-	DEBUG_ASSERTCRASH( m_overlayTexture, ("W3DRadar: Unable to allocate overlay texture\n") );
-
-	// set filter type for the overlay texture, try it and see if you like it, I don't ;)
-//	m_overlayTexture->Set_Min_Filter( TextureClass::FILTER_TYPE_NONE );
-//	m_overlayTexture->Set_Mag_Filter( TextureClass::FILTER_TYPE_NONE );
-
-	// allocate our shroud texture
-	m_shroudTexture = MSGNEW("TextureClass") TextureClass( m_textureWidth, m_textureHeight,
-																			 m_shroudTextureFormat, MIP_LEVELS_1 );
-	DEBUG_ASSERTCRASH( m_shroudTexture, ("W3DRadar: Unable to allocate shroud texture\n") );
-	m_shroudTexture->Get_Filter().Set_Min_Filter( TextureFilterClass::FILTER_TYPE_DEFAULT );
-	m_shroudTexture->Get_Filter().Set_Mag_Filter( TextureFilterClass::FILTER_TYPE_DEFAULT );
-
-	//
-	// create images used for rendering and set them up with the textures
-	//
-
-	//
-	// the terrain image, note the UV coords change it from (0,0) in the upper left
-	// to (0,0) in the lower left cause that's how we are initially oriented in the
-	// world (positive X to the right and positive Y up)
-	//
-	m_terrainImage = newInstance(Image);
-	uv.lo.x = 0.0f;
-	uv.lo.y = 1.0f;
-	uv.hi.x = 1.0f;
-	uv.hi.y = 0.0f;
-	m_terrainImage->setStatus( IMAGE_STATUS_RAW_TEXTURE );
-	m_terrainImage->setRawTextureData( m_terrainTexture );
-	m_terrainImage->setUV( &uv );
-	m_terrainImage->setTextureWidth( m_textureWidth );
-	m_terrainImage->setTextureHeight( m_textureHeight );
-	size.x = m_textureWidth;
-	size.y = m_textureHeight;
-	m_terrainImage->setImageSize( &size );
-
-	// the overlay image
-	m_overlayImage = newInstance(Image);
-	uv.lo.x = 0.0f;
-	uv.lo.y = 1.0f;
-	uv.hi.x = 1.0f;
-	uv.hi.y = 0.0f;
-	m_overlayImage->setStatus( IMAGE_STATUS_RAW_TEXTURE );
-	m_overlayImage->setRawTextureData( m_overlayTexture );
-	m_overlayImage->setUV( &uv );
-	m_overlayImage->setTextureWidth( m_textureWidth );
-	m_overlayImage->setTextureHeight( m_textureHeight );
-	size.x = m_textureWidth;
-	size.y = m_textureHeight;
-	m_overlayImage->setImageSize( &size );
-
-	// the shroud image
-	m_shroudImage = newInstance(Image);
-	uv.lo.x = 0.0f;
-	uv.lo.y = 1.0f;
-	uv.hi.x = 1.0f;
-	uv.hi.y = 0.0f;
-	m_shroudImage->setStatus( IMAGE_STATUS_RAW_TEXTURE );
-	m_shroudImage->setRawTextureData( m_shroudTexture );
-	m_shroudImage->setUV( &uv );
-	m_shroudImage->setTextureWidth( m_textureWidth );
-	m_shroudImage->setTextureHeight( m_textureHeight );
-	size.x = m_textureWidth;
-	size.y = m_textureHeight;
-	m_shroudImage->setImageSize( &size );
-
-}  // end init
-
-//-------------------------------------------------------------------------------------------------
-/** Reset the radar to the initial empty state ready for new data */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::reset( void )
-{
-
-	// extending functionality, call base class
-	Radar::reset();
-
-	// clear our texture data, but do not delete the resources
-	SurfaceClass *surface;
-
-	surface = m_terrainTexture->Get_Surface_Level();
-	if( surface )
-	{
-		surface->Clear();
-		REF_PTR_RELEASE(surface);
-	}
-
-	surface = m_overlayTexture->Get_Surface_Level();
-	if( surface )
-	{
-		surface->Clear();
-		REF_PTR_RELEASE(surface);
-	}
-
-	// don't call Clear(); that wips to transparent. do this instead.
-	//gs Dude, it's called CLEARshroud.  It needs to clear the shroud.
-	clearShroud();
-	
-}  // end reset
-
-//-------------------------------------------------------------------------------------------------
-/** Update */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::update( void )
-{
-
-	// extend base class
-	Radar::update();
-
-}  // end update
-
-//-------------------------------------------------------------------------------------------------
-/** Reset the radar for the new map data being given to it */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::newMap( TerrainLogic *terrain )
-{
-
-	//
-	// extending functionality, call the base class ... this will cause a reset of the
-	// system which will clear out our textures but not free them
-	//
-	Radar::newMap( terrain );
-
-	// sanity
-	if( terrain == NULL )
-		return;
-
-	// build terrain texture
-	buildTerrainTexture( terrain );
-
-}  // end newMap
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DRadar::buildTerrainTexture( TerrainLogic *terrain )
-{
-	SurfaceClass *surface;
-	RGBColor waterColor;
-
-	// we will want to reconstruct our new view box now
-	m_reconstructViewBox = TRUE;
-
-	// setup our water color
-	waterColor.red = TheWaterTransparency->m_radarColor.red;
-	waterColor.green = TheWaterTransparency->m_radarColor.green;
-	waterColor.blue = TheWaterTransparency->m_radarColor.blue;
-
-	// get the terrain surface to draw in
-	surface = m_terrainTexture->Get_Surface_Level();
-	DEBUG_ASSERTCRASH( surface, ("W3DRadar: Can't get surface for terrain texture\n") );
-
-	// build the terrain
-	RGBColor sampleColor;
-	RGBColor color;
-	Int i, j, samples;
-	Int x, y;
-	ICoord2D radarPoint;
-	Coord3D worldPoint;
-	Bridge *bridge;
-	for( y = 0; y < m_textureHeight; y++ )
-	{
-
-		for( x = 0; x < m_textureWidth; x++ )
-		{
-
-			// what point are we inspecting
-			radarPoint.x = x;
-			radarPoint.y = y;
-			radarToWorld2D( &radarPoint, &worldPoint );
-
-			// check to see if this point is part of a working bridge
-			Bool workingBridge = FALSE;
-			bridge = TheTerrainLogic->findBridgeAt( &worldPoint );
-			if( bridge != NULL )
-			{
-				Object *obj = TheGameLogic->findObjectByID( bridge->peekBridgeInfo()->bridgeObjectID );
-
-				if( obj )
-				{
-					BodyModuleInterface *body = obj->getBodyModule();
-
-					if( body->getDamageState() != BODY_RUBBLE )
-						workingBridge = TRUE;
-
-				}  // end if
-
-			}  // end if
-
-			// create a color based on the Z height of the map
-			Real waterZ;
-			if( workingBridge == FALSE && terrain->isUnderwater( worldPoint.x, worldPoint.y, &waterZ ) )
-			{
-				const Int waterSamplesAway = 1;		// how many "tiles" from the center tile we will sample away
-																					// to average a color for the tile color
-
-				sampleColor.red = sampleColor.green = sampleColor.blue = 0.0f;
-				samples = 0;
-
-				for( j = y - waterSamplesAway; j <= y + waterSamplesAway; j++ )
-				{
-
-					if( j >= 0 && j < m_textureHeight )
-					{
-
-						for( i = x - waterSamplesAway; i <= x + waterSamplesAway; i++ )
-						{
-
-							if( i >= 0 && i < m_textureWidth )
-							{
-
-								// the the world point we are concerned with
-								radarPoint.x = i;
-								radarPoint.y = j;
-								radarToWorld2D( &radarPoint, &worldPoint );
-								
-								// get color for this Z and add to our sample color
-                Real underwaterZ;
-								if( terrain->isUnderwater( worldPoint.x, worldPoint.y, NULL, &underwaterZ ) )
-								{
-									// this is our "color" for water
-									color = waterColor;									
-
-									// interpolate the water color for height in the water table
-									interpolateColorForHeight( &color, underwaterZ, waterZ,
-																						 waterZ,
-																						 m_mapExtent.lo.z );
-
-									// add color to our samples
-									sampleColor.red += color.red;
-									sampleColor.green += color.green;
-									sampleColor.blue += color.blue;
-									samples++;
-
-								}  // end if
-
-							}  // end if
-
-						}  // end for i
-
-					}  // end if
-
-				}  // end for j
-
-				// prevent divide by zeros
-				if( samples == 0 )
-					samples = 1;
-
-				// set the color to an average of the colors read
-				color.red = sampleColor.red / (Real)samples;
-				color.green = sampleColor.green / (Real)samples;
-				color.blue = sampleColor.blue / (Real)samples;
-
-			}  // end if
-			else  // regular terrain ...
-			{
-				const Int samplesAway = 1;  // how many "tiles" from the center tile we will sample away
-																		// to average a color for the tile color
-
-				sampleColor.red = sampleColor.green = sampleColor.blue = 0.0f;
-				samples = 0;
-
-				for( j = y - samplesAway; j <= y + samplesAway; j++ )
-				{
-
-					if( j >= 0 && j < m_textureHeight )
-					{
-
-						for( i = x - samplesAway; i <= x + samplesAway; i++ )
-						{
-
-							if( i >= 0 && i < m_textureWidth )
-							{
-
-								// the the world point we are concerned with
-								radarPoint.x = i;
-								radarPoint.y = j;
-								radarToWorld( &radarPoint, &worldPoint );
-
-								// get the color we're going to use here																
-								if( workingBridge )
-								{
-									AsciiString bridgeTName = bridge->getBridgeTemplateName();
-									TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( bridgeTName );
-									
-									// sanity
-									DEBUG_ASSERTCRASH( bridgeTemplate, ("W3DRadar::buildTerrainTexture - Can't find bridge template for '%s'\n", bridgeTName.str()) );
-
-									// use bridge color
-									if ( bridgeTemplate )
-										color = bridgeTemplate->getRadarColor();
-									else
-										color.setFromInt(0xffffffff);
-									//
-									// we won't use the height of the terrain at this sample point, we will
-									// instead use the height for the entire bridge
-									//
-									Real bridgeHeight = (bridge->peekBridgeInfo()->fromLeft.z + 
-																			 bridge->peekBridgeInfo()->fromRight.z +
-																			 bridge->peekBridgeInfo()->toLeft.z +
-																			 bridge->peekBridgeInfo()->toRight.z) / 4.0f;
-
-									// interpolate the color, but use the bridge height, not the terrain height
-									interpolateColorForHeight( &color, bridgeHeight,
-																						 getTerrainAverageZ(),
-																						 m_mapExtent.hi.z, m_mapExtent.lo.z );
-
-								}  // end if
-								else
-								{
-
-									// get the color at this point
-									TheTerrainVisual->getTerrainColorAt( worldPoint.x, worldPoint.y, &color );
-
-									// interpolate the color for height
-									interpolateColorForHeight( &color, worldPoint.z, getTerrainAverageZ(), 
-																						 m_mapExtent.hi.z, m_mapExtent.lo.z );
-
-								}  // end else
-
-								// add color to our samples
-								sampleColor.red += color.red;
-								sampleColor.green += color.green;
-								sampleColor.blue += color.blue;
-								samples++;
-
-							}  // end if
-
-						}  // end for i
-
-					}  // end if
-
-				}  // end for j
-
-				// prevent divide by zeros
-				if( samples == 0 )
-					samples = 1;
-
-				// set the color to an average of the colors read
-				color.red = sampleColor.red / (Real)samples;
-				color.green = sampleColor.green / (Real)samples;
-				color.blue = sampleColor.blue / (Real)samples;
-
-			}  // end else
-
-			//
-			// draw the pixel for the terrain at this point, note that because of the orientation
-			// of our world we draw it with positive y in the "up" direction
-			//
-			// FYI: I tried making this faster by pulling out all the code inside DrawPixel
-			// and locking only once ... but it made absolutely *no* performance difference,
-			// the sampling and interpolation algorithm for generating pretty looking terrain
-			// and water for the radar is just, well, expensive.
-			//
-			surface->DrawPixel( x, y, GameMakeColor( color.red * 255, 
-																							 color.green * 255,
-																							 color.blue * 255,
-																							 255 ) );
-
-		}  // end for x
-
-	}  // end for y
-
-	// all done with the surface
-	REF_PTR_RELEASE(surface);
-
-}  // end buildTerrainTexture
-
-// ------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::clearShroud()
-{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (!TheGlobalData->m_shroudOn)
-		return;
-#endif
-
-	SurfaceClass *surface = m_shroudTexture->Get_Surface_Level();
-	
-	// fill to clear, shroud will make black.  Don't want to make something black that logic can't clear
-	unsigned int color = GameMakeColor( 0, 0, 0, 0 );
-	for( Int y = 0; y < m_textureHeight; y++ )
-	{
-		surface->DrawHLine(y, 0, m_textureWidth-1, color);
-	}
-	REF_PTR_RELEASE(surface);
-}
-
-// ------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::setShroudLevel(Int shroudX, Int shroudY, CellShroudStatus setting)
-{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (!TheGlobalData->m_shroudOn)
-		return;
-#endif
-
-	W3DShroud* shroud = TheTerrainRenderObject ? TheTerrainRenderObject->getShroud() : NULL;
-	if (!shroud)
-		return;
-
-	SurfaceClass* surface = m_shroudTexture->Get_Surface_Level();
-	DEBUG_ASSERTCRASH( surface, ("W3DRadar: Can't get surface for Shroud texture\n") );
-
-	Int mapMinX = shroudX * shroud->getCellWidth();
-	Int mapMinY = shroudY * shroud->getCellHeight();
-	Int mapMaxX = (shroudX+1) * shroud->getCellWidth();
-	Int mapMaxY = (shroudY+1) * shroud->getCellHeight();
-
-	ICoord2D radarPoint;
-	Coord3D worldPoint;
-
-	worldPoint.x = mapMinX;
-	worldPoint.y = mapMinY;
-	worldToRadar( &worldPoint, &radarPoint );
-	Int radarMinX = radarPoint.x;
-	Int radarMinY = radarPoint.y;
-
-	worldPoint.x = mapMaxX;
-	worldPoint.y = mapMaxY;
-	worldToRadar( &worldPoint, &radarPoint );
-	Int radarMaxX = radarPoint.x;
-	Int radarMaxY = radarPoint.y;
-
-/*
-	Int radarMinX = REAL_TO_INT_FLOOR(mapMinX / getXSample());
-	Int radarMinY = REAL_TO_INT_FLOOR(mapMinY / getYSample());
-	Int radarMaxX = REAL_TO_INT_CEIL(mapMaxX / getXSample());
-	Int radarMaxY = REAL_TO_INT_CEIL(mapMaxY / getYSample());
-*/
-
-	/// @todo srj -- this really needs to smooth the display!
-
-	//Logic is saying shroud.  We can add alpha levels here in client if needed.  
-	// W3DShroud is a 0-255 alpha byte.  Logic shroud is a double reference count.
-	Int alpha;
-	if( setting == CELLSHROUD_SHROUDED )
-		alpha = 255;
-	else if( setting == CELLSHROUD_FOGGED )
-		alpha = 127;///< @todo placeholder to get feedback on logic work while graphic side being decided
-	else
-		alpha = 0;
-
-	for( Int y = radarMinY; y <= radarMaxY; y++ )
-	{
-		for( Int x = radarMinX; x <= radarMaxX; x++ )
-		{
-			if( legalRadarPoint( x, y ) )
-				surface->DrawPixel( x, y, GameMakeColor( 0, 0, 0, alpha ) );
-		}
-	}
-	REF_PTR_RELEASE(surface);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Actually draw the radar at the screen coordinates provided 
-	* NOTE about how drawing works: The radar images are computed at samples across the
-	* map and are built into a "square" texture area.  At the time of drawing and computing
-	* radar<->world coords we consider the "ratio" of width to height of the map dimensions
-	* so that when we draw we preserve the aspect ratio of the map and don't squish it in
-	* any direction that would cause the map to be distorted.  Extra blank space is drawn
-	* around the radar images to keep the whole radar area covered when the map displayed
-	* is "long" or "tall" */
-//-------------------------------------------------------------------------------------------------
-void W3DRadar::draw( Int pixelX, Int pixelY, Int width, Int height )
-{
-
-	// if the local player does not have a radar then we can't draw anything
-	Player *player = ThePlayerList->getLocalPlayer();
-	if( !player->hasRadar() && !TheRadar->isRadarForced() )
-		return;
-
-	//
-	// given a upper left corner at pixelX|Y and a width and height to draw into, figure out
-	// where we should start and end the image so that the final drawn image has the
-	// same ratio as the map and isn't stretched or distorted
-	//
-	ICoord2D ul, lr;
-	findDrawPositions( pixelX, pixelY, width, height, &ul, &lr );
-
-	Int scaledWidth = lr.x - ul.x;
-	Int scaledHeight = lr.y - ul.y;
-
-	// draw black border areas where we need map
-	Color fillColor = GameMakeColor( 0, 0, 0, 255 );
-	Color lineColor = GameMakeColor( 50, 50, 50, 255 );
-	if( m_mapExtent.width()/width >= m_mapExtent.height()/height )
-	{
-		
-		// draw horizontal bars at top and bottom
-		TheDisplay->drawFillRect( pixelX, pixelY, width, ul.y - pixelY - 1, fillColor );
-		TheDisplay->drawFillRect( pixelX, lr.y + 1, width, pixelY + height - lr.y - 1, fillColor);
-		TheDisplay->drawLine(pixelX, ul.y, pixelX + width, ul.y, 1, lineColor);
-		TheDisplay->drawLine(pixelX, lr.y + 1, pixelX + width, lr.y + 1, 1, lineColor);
-
-	}  // end if
-	else
-	{
-
-		// draw vertical bars to the left and right
-		TheDisplay->drawFillRect( pixelX, pixelY, ul.x - pixelX - 1, height, fillColor );
-		TheDisplay->drawFillRect( lr.x + 1, pixelY, width - (lr.x - pixelX) - 1, height, fillColor );
-		TheDisplay->drawLine(ul.x, pixelY, ul.x, pixelY + height, 1, lineColor);
-		TheDisplay->drawLine(lr.x + 1, pixelY, lr.x + 1, pixelY + height, 1, lineColor);
-
-	}  // end else
-
-	// draw the terrain texture
-	TheDisplay->drawImage( m_terrainImage, ul.x, ul.y, lr.x, lr.y );
-
-	// refresh the overlay texture once every so many frames
-	if( TheGameClient->getFrame() % OVERLAY_REFRESH_RATE == 0 )
-	{
-
-		// reset the overlay texture
-		SurfaceClass *surface = m_overlayTexture->Get_Surface_Level();
-		surface->Clear();
-		REF_PTR_RELEASE(surface);
-
-		// rebuild the object overlay
-		renderObjectList( getObjectList(), m_overlayTexture );
-		renderObjectList( getLocalObjectList(), m_overlayTexture, TRUE );
-		
-	}  // end if
-
-	// draw the overlay image
- 	TheDisplay->drawImage( m_overlayImage, ul.x, ul.y, lr.x, lr.y );
-
-	// draw the shroud image
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if( TheGlobalData->m_shroudOn )
-#else
-	if (true)
-#endif
-	{
-		TheDisplay->drawImage( m_shroudImage, ul.x, ul.y, lr.x, lr.y );
-	}
-
-	// draw any icons
-	drawIcons( ul.x, ul.y, scaledWidth, scaledHeight );
-
-	// draw any radar events
-	drawEvents( ul.x, ul.y, scaledWidth, scaledHeight );
-
-	// see if we need to reconstruct the view box
-	if( TheTacticalView->getZoom() != m_viewZoom )
-		m_reconstructViewBox = TRUE;
-	if( TheTacticalView->getAngle() != m_viewAngle )
-		m_reconstructViewBox = TRUE;
-
-	if( m_reconstructViewBox == TRUE )
-		reconstructViewBox();
-
-	// draw the view region on top of the radar reconstructing if necessary
-	drawViewBox( ul.x, ul.y, scaledWidth, scaledHeight );
-
-}  // end draw
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DRadar::refreshTerrain( TerrainLogic *terrain )
-{
-
-	// extend base class
-	Radar::refreshTerrain( terrain );
-
-	// rebuild the entire terrain texture
-	buildTerrainTexture( terrain );
-
-}  // end refreshTerrain
-
-
-
-
-
-///The following is an "archive" of an attempt to foil the mapshroud hack... saved for later, since it is too close to release to try it
-
-
-/*
- *
-	void W3DRadar::renderObjectList( const RadarObject *listHead, TextureClass *texture, Bool calcHero )
-{
-
-	// sanity
-	if( listHead == NULL || texture == NULL )
-		return;
-
-	// get surface for texture to render into
-	SurfaceClass *surface = texture->Get_Surface_Level();
-
-	// loop through all objects and draw
-	ICoord2D radarPoint;
-
-	Player *player = ThePlayerList->getLocalPlayer();
-	Int playerIndex=0;
-	if (player)
-		playerIndex=player->getPlayerIndex();
-
-	UnsignedByte minAlpha = 8;
-
-	if( calcHero )
-	{
-		// clear all entries from the cached hero object list
-		m_cachedHeroPosList.clear();
-	}
-
-	for( const RadarObject *rObj = listHead; rObj; rObj = rObj->friend_getNext() )
-	{
-    UnsignedByte h = (UnsignedByte)(rObj->isTemporarilyHidden());
-    if ( h )
-			continue;
-
-    UnsignedByte a = 0;
-
-		// get object
-		const Object *obj = rObj->friend_getObject();
-		UnsignedByte r = 1;   // all decoys
-
-		// cache hero object positions for drawing in icon layer
-		if( calcHero && obj->isHero() )
-		{
-			m_cachedHeroPosList.push_back(obj->getPosition());
-		}
-
-		// get the color we're going to draw in
-		UnsignedInt c = 0xfe000000;// this is a decoy
-    c |= (UnsignedInt)( obj->testStatus( OBJECT_STATUS_STEALTHED ) );//so is this
-
-		// check for shrouded status
-		UnsignedByte k =  (UnsignedByte)(obj->getShroudedStatus(playerIndex) > OBJECTSHROUD_PARTIAL_CLEAR);
-    if ( k || a)
-			continue;	//object is fogged or shrouded, don't render it.
-
- 		//
- 		// objects with a local only unit priority will only appear on the radar if they
- 		// are controlled by the local player, or if the local player is an observer (cause
-		// they are godlike and can see everything)
- 		//
- 		if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY &&
- 				obj->getControllingPlayer() != ThePlayerList->getLocalPlayer() &&
-				ThePlayerList->getLocalPlayer()->isPlayerActive() )
- 			continue;
-
-    UnsignedByte g = c|a;
-    UnsignedByte b = h|a;
-		// get object position
-		const Coord3D *pos = obj->getPosition();
-
-		// compute object position as a radar blip
-		radarPoint.x = pos->x / (m_mapExtent.width() / RADAR_CELL_WIDTH);
-		radarPoint.y = pos->y / (m_mapExtent.height() / RADAR_CELL_HEIGHT);
-
-
-		const UnsignedInt framesForTransition = LOGICFRAMES_PER_SECOND;
-		
-
-		
-		// adjust the alpha for stealth units so they "fade/blink" on the radar for the controller
-		// if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY )
-		// ML-- What the heck is this? local-only and neutral-observier-viewed units are stealthy?? Since when?	
-		// Now it twinkles for any stealthed object, whether locally controlled or neutral-observier-viewed
-    c = rObj->getColor();
-
-		if( g & r )
-		{
-		  Real alphaScale = INT_TO_REAL(TheGameLogic->getFrame() % framesForTransition) / (framesForTransition * 0.5f);
-      minAlpha <<= 2; // decoy
-
- 			if ( ( obj->isLocallyControlled() == (Bool)a ) // another decoy, comparing the return of this non-inline with a local
-        && !obj->testStatus( OBJECT_STATUS_DISGUISED ) 
-        && !obj->testStatus( OBJECT_STATUS_DETECTED ) 
-        && ++a != 0 // The trick is that this increment does not occur unless all three above conditions are true
-        && minAlpha == 32  // tricksy hobbit decoy
-        && c != 0 )        // ditto
-      {
-        g = (UnsignedByte)(rObj->getColor());
-        continue;
-      }
-
-      a |= k | b;
-			GameGetColorComponentsWithCheatSpy( c, &r, &g, &b, &a );//this function does not touch the low order bit in 'a' 
-
-			
-			if( alphaScale > 0.0f )
-				a = REAL_TO_UNSIGNEDBYTE( ((alphaScale - 1.0f) * (255.0f - minAlpha)) + minAlpha );
-			else
-				a = REAL_TO_UNSIGNEDBYTE( (alphaScale * (255.0f - minAlpha)) + minAlpha );
-			c = GameMakeColor( r, g, b, a );
-
-		}  // end if
-
-
-
-		
-		// draw the blip, but make sure the points are legal
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-		radarPoint.x++;
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-		radarPoint.y++;
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-		radarPoint.x--;
-		if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
-			surface->DrawPixel( radarPoint.x, radarPoint.y, c );
-
-
-
-
-	}  // end for
-	REF_PTR_RELEASE(surface);
-
-}  // end renderObjectList
-
-
- *
- */
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
index 5f66ef65c2c..0e51ce61537 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
@@ -79,4 +79,4 @@ void W3DModuleFactory::init( void )
 	addModule( W3DTreeDraw );
 	addModule( W3DPropDraw );
 
-}  // end init
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DThingFactory.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
index 484d1d8c1b0..01526472393 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
@@ -37,12 +37,12 @@
 W3DThingFactory::W3DThingFactory( void )
 {
 
-}  // end W3DThingFactory
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DThingFactory::~W3DThingFactory( void )
 {
 
-}  // end ~W3DThingFactory
+}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/W3DConvert.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/W3DConvert.cpp
index f602c342e51..bb98bdc9fa9 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/W3DConvert.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/W3DConvert.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //=============================================================================
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //=============================================================================
 //
 // Project:		RTS3
@@ -40,40 +40,40 @@
 //=============================================================================
 
 //=============================================================================
-//         Includes                                                      
+//         Includes
 //=============================================================================
 #include "W3DDevice/Common/W3DConvert.h"
 
 //=============================================================================
-//         Externals                                                     
+//         Externals
 //=============================================================================
 
 //=============================================================================
-//         Defines                                                         
+//         Defines
 //=============================================================================
 
 //=============================================================================
-//         Private Types                                                     
+//         Private Types
 //=============================================================================
 
 //=============================================================================
-//         Private Data                                                     
+//         Private Data
 //=============================================================================
 
 //=============================================================================
-//         Public Data                                                      
+//         Public Data
 //=============================================================================
 
 //=============================================================================
-//         Private Prototypes                                               
+//         Private Prototypes
 //=============================================================================
 
 //=============================================================================
-//         Private Functions                                               
+//         Private Functions
 //=============================================================================
 
 //=============================================================================
-//         Public Functions                                                
+//         Public Functions
 //=============================================================================
 
 //=============================================================================
@@ -90,7 +90,7 @@ void W3DLogicalScreenToPixelScreen( Real logX, Real logY,
 	*screenX = REAL_TO_INT((screenWidth  * (logX + 1.0f)) / 2.0f);
 	*screenY = REAL_TO_INT((screenHeight * (-logY + 1.0f)) / 2.0f);
 
-}  // end W3DLogicalScreenToPixelScreen
+}
 
 //=============================================================================
 // PixelScreenToW3DLogicalScreen
@@ -107,4 +107,4 @@ void PixelScreenToW3DLogicalScreen( Int screenX, Int screenY,
 	*logX = ((2.0f * screenX) / (Real)screenWidth) - 1.0f;
 	*logY = -(((2.0f * screenY) / (Real)screenHeight) - 1.0f);
 
-}  // end PixelScreenToW3DLogicalScreen
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
index f4fca38dc73..dc32633ad00 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
@@ -67,7 +67,7 @@ W3DDebrisDraw::W3DDebrisDraw(Thing *thing, const ModuleData* moduleData) : DrawM
 W3DDebrisDraw::~W3DDebrisDraw(void)
 {
 	if (TheW3DShadowManager && m_shadow)
-	{	
+	{
 		TheW3DShadowManager->removeShadow(m_shadow);
 		m_shadow = NULL;
 	}
@@ -76,7 +76,7 @@ W3DDebrisDraw::~W3DDebrisDraw(void)
 		if (W3DDisplay::m_3DScene != NULL)
 			W3DDisplay::m_3DScene->Remove_Render_Object(m_renderObject);
   	REF_PTR_RELEASE(m_renderObject);
- 		m_renderObject = NULL; 	
+ 		m_renderObject = NULL;
 	}
 	for (int i = 0; i < STATECOUNT; ++i)
 	{
@@ -109,14 +109,14 @@ void W3DDebrisDraw::setModelName(AsciiString name, Color color, ShadowType t)
 		if (color != 0)
 			hexColor = color | 0xFF000000;
 		m_renderObject = W3DDisplay::m_assetManager->Create_Render_Obj(name.str(), getDrawable()->getScale(), hexColor);
-		DEBUG_ASSERTCRASH(m_renderObject, ("Debris model %s not found!\n",name.str()));
+		DEBUG_ASSERTCRASH(m_renderObject, ("Debris model %s not found!",name.str()));
 		if (m_renderObject)
 		{
 			if (W3DDisplay::m_3DScene != NULL)
 				W3DDisplay::m_3DScene->Add_Render_Object(m_renderObject);
 
 			m_renderObject->Set_User_Data(getDrawable()->getDrawableInfo());
-			
+
 			Matrix3D transform;
 			///@todo: Change back to identity once we figure out why objects show up at 0,0,0
 			/// OBJECT_PILE
@@ -124,7 +124,7 @@ void W3DDebrisDraw::setModelName(AsciiString name, Color color, ShadowType t)
 			transform.Set(Vector3(0,0,0));
 			m_renderObject->Set_Transform(transform);
 		}
-		
+
 		if (t != SHADOW_NONE)
 		{
 			Shadow::ShadowTypeInfo shadowInfo;
@@ -136,7 +136,7 @@ void W3DDebrisDraw::setModelName(AsciiString name, Color color, ShadowType t)
 		else
 		{
 			if (TheW3DShadowManager && m_shadow)
-			{	
+			{
 				TheW3DShadowManager->removeShadow(m_shadow);
 				m_shadow = NULL;
 			}
@@ -201,8 +201,8 @@ static Bool isNearlyZero(const Coord3D* vel)
 }
 
 // ------------------------------------------------------------------------------------------------
-void W3DDebrisDraw::reactToTransformChange( const Matrix3D *oldMtx, 
-																						const Coord3D *oldPos, 
+void W3DDebrisDraw::reactToTransformChange( const Matrix3D *oldMtx,
+																						const Coord3D *oldPos,
 																						Real oldAngle )
 {
 
@@ -227,13 +227,13 @@ void W3DDebrisDraw::doDrawModule(const Matrix3D* transformMtx)
 		}
 		m_renderObject->Set_Transform(*transformMtx);
 
-		static const RenderObjClass::AnimMode TheAnimModes[STATECOUNT] = 
+		static const RenderObjClass::AnimMode TheAnimModes[STATECOUNT] =
 		{
 			RenderObjClass::ANIM_MODE_ONCE,
 			RenderObjClass::ANIM_MODE_LOOP,
 			RenderObjClass::ANIM_MODE_ONCE
 		};
-		
+
 		Int oldState = m_state;
 		Object* obj = getDrawable()->getObject();
 		const Int MIN_FINAL_FRAMES = 3;
@@ -270,7 +270,7 @@ void W3DDebrisDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -290,7 +290,7 @@ void W3DDebrisDraw::xfer( Xfer *xfer )
 
 	// model name
 	xfer->xferAsciiString( &m_modelName );
-	
+
 	// model color
 	xfer->xferColor( &m_modelColor );
 
@@ -320,7 +320,7 @@ void W3DDebrisDraw::xfer( Xfer *xfer )
 	// final stop
 	xfer->xferBool( &m_finalStop );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -331,4 +331,4 @@ void W3DDebrisDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
index 9b09cd32a3b..471494eab85 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
@@ -90,14 +90,14 @@ W3DDefaultDraw::W3DDefaultDraw(Thing *thing, const ModuleData* moduleData) : Dra
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void W3DDefaultDraw::reactToTransformChange( const Matrix3D *oldMtx, 
-																						 const Coord3D *oldPos, 
+void W3DDefaultDraw::reactToTransformChange( const Matrix3D *oldMtx,
+																						 const Coord3D *oldPos,
 																						 Real oldAngle )
 {
-
+#ifdef LOAD_TEST_ASSETS
 	if( m_renderObject )
 		m_renderObject->Set_Transform( *getDrawable()->getTransformMatrix() );
-
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -106,7 +106,7 @@ W3DDefaultDraw::~W3DDefaultDraw(void)
 {
 #ifdef LOAD_TEST_ASSETS
 	if (TheW3DShadowManager && m_shadow)
-	{	
+	{
 		TheW3DShadowManager->removeShadow(m_shadow);
 		m_shadow = NULL;
 	}
@@ -170,7 +170,7 @@ void W3DDefaultDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -188,7 +188,7 @@ void W3DDefaultDraw::xfer( Xfer *xfer )
 	// extend base class
 	DrawModule::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -199,4 +199,4 @@ void W3DDefaultDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp
index 1eb1a59e426..8582b2e5b1b 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp
@@ -40,15 +40,10 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
-W3DDependencyModelDrawModuleData::W3DDependencyModelDrawModuleData() 
+W3DDependencyModelDrawModuleData::W3DDependencyModelDrawModuleData()
 {
 }
 
@@ -58,11 +53,11 @@ W3DDependencyModelDrawModuleData::~W3DDependencyModelDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DDependencyModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DDependencyModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "AttachToBoneInContainer", INI::parseAsciiString, NULL, offsetof(W3DDependencyModelDrawModuleData, m_attachToDrawableBoneInContainer) },
 
@@ -74,7 +69,7 @@ void W3DDependencyModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DDependencyModelDraw::W3DDependencyModelDraw( Thing *thing, const ModuleData* moduleData ) : W3DModelDraw( thing, moduleData )
-{	 
+{
 	m_dependencyCleared = FALSE;
 }
 
@@ -93,21 +88,21 @@ void W3DDependencyModelDraw::doDrawModule(const Matrix3D* transformMtx)
 		W3DModelDraw::doDrawModule( transformMtx );
 		m_dependencyCleared = FALSE;
 
-    
+
     // A handy place to synchronize my drawable with container's
     Drawable *myDrawable = getDrawable();
     if ( ! myDrawable )
       return;
-      
+
     const Object *me = myDrawable->getObject();
     if ( ! me )
       return;
 
 	  Drawable *theirDrawable = NULL;
-    
+
 	  if( me->getContainedBy() && !me->getContainedBy()->getContain()->isEnclosingContainerFor(me) )
 		  theirDrawable = me->getContainedBy()->getDrawable();
-		
+
     if( ! theirDrawable )
 		  return;
 
@@ -130,9 +125,9 @@ void W3DDependencyModelDraw::adjustTransformMtx(Matrix3D& mtx) const
 	// We have an additional adjustment to make, we want to use a bone in our container if there is one
 	const Object *me = getDrawable()->getObject();
 	const W3DDependencyModelDrawModuleData *md = getW3DDependencyModelDrawModuleData();
-	
-	if( md->m_attachToDrawableBoneInContainer.isNotEmpty() 
-		&& me 
+
+	if( md->m_attachToDrawableBoneInContainer.isNotEmpty()
+		&& me
 		&& me->getContainedBy()
 		&& !me->getContainedBy()->getContain()->isEnclosingContainerFor(me)
 		)
@@ -150,7 +145,7 @@ void W3DDependencyModelDraw::adjustTransformMtx(Matrix3D& mtx) const
 			else
 			{
         mtx = *theirDrawable->getTransformMatrix();//TransformMatrix();
-				DEBUG_LOG(("m_attachToDrawableBoneInContainer %s not found\n",getW3DDependencyModelDrawModuleData()->m_attachToDrawableBoneInContainer.str()));
+				DEBUG_LOG(("m_attachToDrawableBoneInContainer %s not found",getW3DDependencyModelDrawModuleData()->m_attachToDrawableBoneInContainer.str()));
 			}
 		}
 	}
@@ -165,7 +160,7 @@ void W3DDependencyModelDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -186,7 +181,7 @@ void W3DDependencyModelDraw::xfer( Xfer *xfer )
 	// Dependency status
 	xfer->xferBool( &m_dependencyCleared );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -197,6 +192,6 @@ void W3DDependencyModelDraw::loadPostProcess( void )
 	// extend base class
 	W3DModelDraw::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
deleted file mode 100644
index 60c52924905..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
+++ /dev/null
@@ -1,473 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DLaserDraw.cpp /////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, May 2001
-// Desc:   W3DLaserDraw 
-// Updated: Kris Morness July 2002 -- made it data driven and added new features to make it flexible.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include <stdlib.h>
-
-#include "Common/Thing.h"
-#include "Common/ThingTemplate.h"
-#include "Common/Xfer.h"
-#include "GameClient/Color.h"
-#include "GameClient/Drawable.h"
-#include "GameClient/GameClient.h"
-#include "GameClient/RayEffect.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/Object.h"
-#include "GameLogic/TerrainLogic.h"
-#include "GameLogic/Module/LaserUpdate.h"
-#include "W3DDevice/GameClient/Module/W3DLaserDraw.h"
-#include "W3DDevice/GameClient/W3DDisplay.h"
-#include "W3DDevice/GameClient/W3DScene.h"
-#include "WW3D2/rinfo.h"
-#include "WW3D2/camera.h"
-#include "WW3D2/segline.h"
-#include "WWMath/vector3.h"
-#include "WW3D2/assetmgr.h"
-
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DLaserDrawModuleData::W3DLaserDrawModuleData()
-{
-	m_innerBeamWidth = 0.0f;         //The total width of beam
-	m_outerBeamWidth = 1.0f;         //The total width of beam
-  m_numBeams = 1;                 //Number of overlapping cylinders that make the beam. 1 beam will just use inner data.
-  m_maxIntensityFrames = 0;				//Laser stays at max intensity for specified time in ms.
-  m_fadeFrames = 0;               //Laser will fade and delete.
-	m_scrollRate = 0.0f;
-	m_tile = false;
-	m_segments = 1;
-	m_arcHeight = 0.0f;
-	m_segmentOverlapRatio = 0.0f;
-	m_tilingScalar = 1.0f;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DLaserDrawModuleData::~W3DLaserDrawModuleData()
-{
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DLaserDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
-{
-  ModuleData::buildFieldParse(p);
-
-	static const FieldParse dataFieldParse[] = 
-	{
-		{ "NumBeams",							INI::parseUnsignedInt,					NULL, offsetof( W3DLaserDrawModuleData, m_numBeams ) },
-		{ "InnerBeamWidth",				INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_innerBeamWidth ) },
-		{ "OuterBeamWidth",				INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_outerBeamWidth ) },
-		{ "InnerColor",						INI::parseColorInt,							NULL, offsetof( W3DLaserDrawModuleData, m_innerColor ) },
-		{ "OuterColor",						INI::parseColorInt,							NULL, offsetof( W3DLaserDrawModuleData, m_outerColor ) },
-		{ "MaxIntensityLifetime",	INI::parseDurationUnsignedInt,	NULL, offsetof( W3DLaserDrawModuleData, m_maxIntensityFrames ) },
-		{ "FadeLifetime",					INI::parseDurationUnsignedInt,	NULL, offsetof( W3DLaserDrawModuleData, m_fadeFrames ) },
-		{ "Texture",							INI::parseAsciiString,					NULL, offsetof( W3DLaserDrawModuleData, m_textureName ) },
-		{ "ScrollRate",						INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_scrollRate ) },
-		{ "Tile",									INI::parseBool,									NULL, offsetof( W3DLaserDrawModuleData, m_tile ) },
-		{ "Segments",							INI::parseUnsignedInt,					NULL, offsetof( W3DLaserDrawModuleData, m_segments ) },
-    { "ArcHeight",						INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_arcHeight ) },
-		{ "SegmentOverlapRatio",	INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_segmentOverlapRatio ) },
-		{ "TilingScalar",					INI::parseReal,									NULL, offsetof( W3DLaserDrawModuleData, m_tilingScalar ) },
-		{ 0, 0, 0, 0 }
-	};
-  p.add(dataFieldParse);
-}
-
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DLaserDraw::W3DLaserDraw( Thing *thing, const ModuleData* moduleData ) : 
-	DrawModule( thing, moduleData ),
-	m_line3D(NULL),
-	m_texture(NULL),
-	m_textureAspectRatio(1.0f),
-	m_selfDirty(TRUE)
-{
-	Vector3 dummyPos1( 0.0f, 0.0f, 0.0f );
-	Vector3 dummyPos2( 1.0f, 1.0f, 1.0f );
-	Int i;
-
-	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
-
-	m_texture = WW3DAssetManager::Get_Instance()->Get_Texture( data->m_textureName.str() );
-	if (m_texture)
-	{
-		if (!m_texture->Is_Initialized())
-			m_texture->Init();	//make sure texture is actually loaded before accessing surface.
-
-		SurfaceClass::SurfaceDescription surfaceDesc; 
-		m_texture->Get_Level_Description(surfaceDesc);
-		m_textureAspectRatio = (Real)surfaceDesc.Width/(Real)surfaceDesc.Height;
-	}
-
-	//Get the color components for calculation purposes.
-	Real innerRed, innerGreen, innerBlue, innerAlpha, outerRed, outerGreen, outerBlue, outerAlpha;
-	GameGetColorComponentsReal( data->m_innerColor, &innerRed, &innerGreen, &innerBlue, &innerAlpha );
-	GameGetColorComponentsReal( data->m_outerColor, &outerRed, &outerGreen, &outerBlue, &outerAlpha );
-
-	//Make sure our beams range between 1 and the maximum cap.
-#ifdef I_WANT_TO_BE_FIRED
-// srj sez: this data is const for a reason. casting away the constness because we don't like the values
-// isn't an acceptable solution. if you need to constrain the values, do so at parsing time, when
-// it's still legal to modify these values. (In point of fact, there's not even really any reason to limit
-// the numBeams or segments anymore.)
-	data->m_numBeams =		 __min( __max( 1, data->m_numBeams ), MAX_LASER_LINES );
-	data->m_segments =		 __min( __max( 1, data->m_segments ), MAX_SEGMENTS );
-	data->m_tilingScalar = __max( 0.01f, data->m_tilingScalar );
-#endif
-
-	//Allocate an array of lines equal to the number of beams * segments
-	m_line3D = NEW SegmentedLineClass *[ data->m_numBeams * data->m_segments ];
-
-	for( UnsignedInt segment = 0; segment < data->m_segments; segment++ )
-	{
-		//We don't care about segment positioning yet until we actually set the position
-		
-		// create all the lines we need at the right transparency level
-		for( i = data->m_numBeams - 1; i >= 0; i-- )
-		{
-			int index = segment * data->m_numBeams + i;
-
-			Real red, green, blue, alpha, width;
-
-			if( data->m_numBeams == 1 )
-			{	
-				width = data->m_innerBeamWidth;
-				alpha = innerAlpha;
-				red = innerRed * innerAlpha;
-				green = innerGreen * innerAlpha;
-				blue = innerBlue * innerAlpha;
-			}
-			else
-			{
-				//Calculate the scale between min and max values
-				//0 means use min value, 1 means use max value
-				//0.2 means min value + 20% of the diff between min and max
-				Real scale = i / ( data->m_numBeams - 1.0f);
-				
-				width		= data->m_innerBeamWidth	+ scale * (data->m_outerBeamWidth - data->m_innerBeamWidth);
-				alpha		= innerAlpha							+ scale * (outerAlpha - innerAlpha);
-				red			= innerRed								+ scale * (outerRed - innerRed) * innerAlpha;
-				green		= innerGreen							+ scale * (outerGreen - innerGreen) * innerAlpha;
-				blue		= innerBlue								+ scale * (outerBlue - innerBlue) * innerAlpha;
-			}
-
-			m_line3D[ index ] = NEW SegmentedLineClass;
-			
-			SegmentedLineClass *line = m_line3D[ index ];
-			if( line )
-			{
-				line->Set_Texture( m_texture );
-				line->Set_Shader( ShaderClass::_PresetAdditiveShader );	//pick the alpha blending mode you want - see shader.h for others.
-				line->Set_Width( width );
-				line->Set_Color( Vector3( red, green, blue ) );
-				line->Set_UV_Offset_Rate( Vector2(0.0f, data->m_scrollRate) );	//amount to scroll texture on each draw
-				if( m_texture )
-				{
-					line->Set_Texture_Mapping_Mode(SegLineRendererClass::TILED_TEXTURE_MAP);	//this tiles the texture across the line
-				}
-
-				// add to scene
-				if (W3DDisplay::m_3DScene != NULL)
-					W3DDisplay::m_3DScene->Add_Render_Object( line );	//add it to our scene so it gets rendered with other objects.
-
-				// hide the render object until the first time we come to draw it and
-				// set the correct position
-				line->Set_Visible( 0 );
-			}
-
-
-		}  // end for i
-
-	} //end segment loop
-
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DLaserDraw::~W3DLaserDraw( void )
-{
-	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
-
-	for( UnsignedInt i = 0; i < data->m_numBeams * data->m_segments; i++ )
-	{
-
-		// remove line from scene
-		if (W3DDisplay::m_3DScene != NULL)
-			W3DDisplay::m_3DScene->Remove_Render_Object( m_line3D[ i ] );
-
-		// delete line
-		REF_PTR_RELEASE( m_line3D[ i ] );
-
-	}  // end for i
-
-	delete [] m_line3D;
-	// TheSuperHackers @fix Mauller 11/03/2025 Free reference counted material
-	REF_PTR_RELEASE(m_texture);
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-Real W3DLaserDraw::getLaserTemplateWidth() const
-{
-	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
-	return data->m_outerBeamWidth * 0.5f;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DLaserDraw::doDrawModule(const Matrix3D* transformMtx)
-{
-	//UnsignedInt currentFrame = TheGameClient->getFrame();
-	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
-
-	//Get the updatemodule that drives it...
-	Drawable *draw = getDrawable();
-	static NameKeyType key_LaserUpdate = NAMEKEY( "LaserUpdate" );
-	LaserUpdate *update = (LaserUpdate*)draw->findClientUpdateModule( key_LaserUpdate );
-	if( !update )
-	{
-		DEBUG_ASSERTCRASH( 0, ("W3DLaserDraw::doDrawModule() expects its owner drawable %s to have a ClientUpdate = LaserUpdate module.", draw->getTemplate()->getName().str() ));
-		return;
-	}
-
-	//If the update has moved the laser, it requires a reset of the laser.
-	if (update->isDirty() || m_selfDirty)
-	{
-		update->setDirty(false);
-		m_selfDirty = false;
-
-		Vector3 laserPoints[ 2 ];
-
-		for( UnsignedInt segment = 0; segment < data->m_segments; segment++ )
-		{
-			if( data->m_arcHeight > 0.0f && data->m_segments > 1 )
-			{
-				//CALCULATE A CURVED LINE BASED ON TOTAL LENGTH AND DESIRED HEIGHT INCREASE
-				//To do this we will use a portion of the cos wave ranging between -0.25PI
-				//and +0.25PI. 0PI is 1.0 and 0.25PI is 0.70 -- resulting in a somewhat
-				//gentle curve depending on the line height and length. We also have to make
-				//the line *level* for this phase of the calculations.
-
-				//Get the desired direct line
-				Coord3D lineStart, lineEnd, lineVector;
-				lineStart.set( update->getStartPos() );
-				lineEnd.set( update->getEndPos() );
-				//This is critical -- in the case we have sloped lines (at the end, we'll fix it)
-//				lineEnd.z = lineStart.z;
-
-				//Get the length of the line
-				lineVector.set( &lineEnd );
-				lineVector.sub( &lineStart );
-				Real lineLength = lineVector.length();
-
-				//Get the middle point (we'll use this to determine how far we are from
-				//that to calculate our height -- middle point is the highest).
-				Coord3D lineMiddle;
-				lineMiddle.set( &lineStart );
-				lineMiddle.add( &lineEnd );
-				lineMiddle.scale( 0.5 );
-
-				//The half length is used to scale with the distance from middle to 
-				//get our cos( 0 to 0.25 PI) cos value
-				Real halfLength = lineLength * 0.5f;
-
-				//Now calculate which segment we will use.
-				Real startSegmentRatio = segment / ((Real)data->m_segments);
-				Real endSegmentRatio = (segment + 1.0f) / ((Real)data->m_segments);
-
-				//Offset the segment ever-so-slightly to minimize overlap -- only apply
-				//to segments that are not the start/end point
-				if( segment > 0 ) 
-				{
-					startSegmentRatio -= data->m_segmentOverlapRatio;
-				}
-				if( segment < data->m_segments - 1 )
-				{
-					endSegmentRatio += data->m_segmentOverlapRatio;
-				}
-
-				//Calculate our start segment position on the *ground*.
-				Coord3D segmentStart, segmentEnd, vector;
-				vector.set( &lineVector );
-				vector.scale( startSegmentRatio );
-				segmentStart.set( &lineStart );
-				segmentStart.add( &vector );
-
-				//Calculate our end segment position on the *ground*.
-				vector.set( &lineVector );
-				vector.scale( endSegmentRatio );
-				segmentEnd.set( &lineStart );
-				segmentEnd.add( &vector );
-
-				//--------------------------------------------------------------------------------
-				//Now at this point, we have our segment line in the level positions that we want.
-				//Calculate the raised height for the start/end segment positions using cosine.
-				//--------------------------------------------------------------------------------
-
-				//Calculate the distance from midpoint for the start positions.
-				vector.set( &lineMiddle );
-				vector.sub( &segmentStart );
-				Real dist = vector.length();
-				Real scaledRadians = dist / halfLength * PI * 0.5f; 
-				Real height = cos( scaledRadians );
-				height *= data->m_arcHeight;
-				segmentStart.z += height;
-
-				//Now do the same thing for the end position.
-				vector.set( &lineMiddle );
-				vector.sub( &segmentEnd );
-				dist = vector.length();
-				scaledRadians = dist / halfLength * PI * 0.5f; 
-				height = cos( scaledRadians );
-				height *= data->m_arcHeight;
-				segmentEnd.z += height;
-				
-				//This makes the laser skim the ground rather than penetrate it!
-				laserPoints[ 0 ].Set( segmentStart.x, segmentStart.y, 
-					MAX( segmentStart.z, 2.0f + TheTerrainLogic->getGroundHeight(segmentStart.x, segmentStart.y) ) );
-				laserPoints[ 1 ].Set( segmentEnd.x, segmentEnd.y, 
-					MAX( segmentEnd.z, 2.0f + TheTerrainLogic->getGroundHeight(segmentEnd.x, segmentEnd.y) ) );
-				
-			}
-			else
-			{
-				//No arc -- way simpler!
-				laserPoints[ 0 ].Set( update->getStartPos()->x, update->getStartPos()->y, update->getStartPos()->z );
-				laserPoints[ 1 ].Set( update->getEndPos()->x, update->getEndPos()->y, update->getEndPos()->z );
-			}
-
-			//Get the color components for calculation purposes.
-			Real innerRed, innerGreen, innerBlue, innerAlpha, outerRed, outerGreen, outerBlue, outerAlpha;
-			GameGetColorComponentsReal( data->m_innerColor, &innerRed, &innerGreen, &innerBlue, &innerAlpha );
-			GameGetColorComponentsReal( data->m_outerColor, &outerRed, &outerGreen, &outerBlue, &outerAlpha );
-
-			for( Int i = data->m_numBeams - 1; i >= 0; i-- )
-			{
-
-				Real alpha, width;
-				int index = segment * data->m_numBeams + i;
-
-				if( data->m_numBeams == 1 )
-				{	
-					width = data->m_innerBeamWidth * update->getWidthScale();
-					alpha = innerAlpha;
-				}
-				else
-				{
-					//Calculate the scale between min and max values
-					//0 means use min value, 1 means use max value
-					//0.2 means min value + 20% of the diff between min and max
-					Real scale = i / ( data->m_numBeams - 1.0f);
-					Real ultimateScale = update->getWidthScale();
-					width		= (data->m_innerBeamWidth	+ scale * (data->m_outerBeamWidth - data->m_innerBeamWidth));
-					width *= ultimateScale;
-					alpha		= innerAlpha							+ scale * (outerAlpha - innerAlpha);
-				}
-
-
-				//Calculate the number of times to tile the line based on the height of the texture used.
-				if( m_texture && data->m_tile )
-				{
-					//Calculate the length of the line.
-					Vector3 lineVector;
-					Vector3::Subtract( laserPoints[1], laserPoints[0], &lineVector );
-					Real length = lineVector.Length();
-
-					//Adjust tile factor so texture is NOT stretched but tiled equally in both width and length.
-					Real tileFactor = length/width*m_textureAspectRatio*data->m_tilingScalar;
-
-					//Set the tile factor
-					m_line3D[ index ]->Set_Texture_Tile_Factor( tileFactor );	//number of times to tile texture across each segment
-				}
-
-				m_line3D[ index ]->Set_Width( width );
-				m_line3D[ index ]->Set_Points( 2, &laserPoints[0] );
-			}
-		}
-	}
-	
-	return;
-}
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void W3DLaserDraw::crc( Xfer *xfer )
-{
-
-	// extend base class
-	DrawModule::crc( xfer );
-
-}  // end crc
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer method
-	* Version Info:
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-void W3DLaserDraw::xfer( Xfer *xfer )
-{
-
-	// version
-	const XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// extend base class
-	DrawModule::xfer( xfer );
-
-	// Kris says there is no data to save for these, go ask him.
-	// m_selfDirty is not saved, is runtime only
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void W3DLaserDraw::loadPostProcess( void )
-{
-
-	// extend base class
-	DrawModule::loadPostProcess();
-
-	m_selfDirty = true;	// so we update the first time after reload
-
-}  // end loadPostProcess
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
index 85537b93889..fccd5c32e02 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
@@ -68,11 +68,6 @@
 #include "WW3D2/meshmdl.h"
 #include "Common/BitFlagsIO.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 static inline Bool isValidTimeToCalcLogicStuff()
@@ -85,7 +80,7 @@ static inline Bool isValidTimeToCalcLogicStuff()
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 
-#if defined(DEBUG_CRC) && (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+#if defined(DEBUG_CRC) && defined(RTS_DEBUG)
 #include <cstdarg>
 class LogClass
 {
@@ -104,19 +99,13 @@ LogClass::LogClass(const char *fname)
 {
 	char buffer[ _MAX_PATH ];
 	GetModuleFileName( NULL, buffer, sizeof( buffer ) );
-	char *pEnd = buffer + strlen( buffer );
-	while( pEnd != buffer )
+	if (char *pEnd = strrchr(buffer, '\\'))
 	{
-		if( *pEnd == '\\' )
-		{
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+		*pEnd = 0;
 	}
-	AsciiString fullPath;
-	fullPath.format("%s\\%s", buffer, fname);
-	m_fp = fopen(fullPath.str(), "wt");
+	// TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.
+	const std::string fullPath = std::string(buffer) + "\\" + fname;
+	m_fp = fopen(fullPath.c_str(), "wt");
 }
 
 LogClass::~LogClass()
@@ -165,10 +154,10 @@ void LogClass::dumpMatrix3D(const Matrix3D *m, AsciiString name, AsciiString fna
 	fname.toLower();
 	fname = fname.reverseFind('\\') + 1;
 	const Real *matrix = (const Real *)m;
-	log("dumpMatrix3D() %s:%d %s\n",
+	log("dumpMatrix3D() %s:%d %s",
 		fname.str(), line, name.str());
 	for (Int i=0; i<3; ++i)
-		log("      0x%08X 0x%08X 0x%08X 0x%08X\n",
+		log("      0x%08X 0x%08X 0x%08X 0x%08X",
 			AS_INT(matrix[(i<<2)+0]), AS_INT(matrix[(i<<2)+1]), AS_INT(matrix[(i<<2)+2]), AS_INT(matrix[(i<<2)+3]));
 }
 
@@ -178,7 +167,7 @@ void LogClass::dumpReal(Real r, AsciiString name, AsciiString fname, Int line)
 		return;
 	fname.toLower();
 	fname = fname.reverseFind('\\') + 1;
-	log("dumpReal() %s:%d %s %8.8X (%f)\n",
+	log("dumpReal() %s:%d %s %8.8X (%f)",
 		fname.str(), line, name.str(), AS_INT(r), r);
 }
 
@@ -204,11 +193,11 @@ LogClass BonePosLog("bonePositions.txt");
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 extern AsciiString TheThingTemplateBeingParsedName;
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 extern Real TheSkateDistOverride;
 #endif
 
@@ -232,9 +221,11 @@ enum ACBits CPP_11(: Int)
 	MAINTAIN_FRAME_ACROSS_STATES2,
 	MAINTAIN_FRAME_ACROSS_STATES3,
 	MAINTAIN_FRAME_ACROSS_STATES4,
+
+	AC_BITS_COUNT
 };
 
-static const char *ACBitsNames[] =
+static const char *const ACBitsNames[] =
 {
 	"RANDOMSTART",
 	"START_FRAME_FIRST",
@@ -246,9 +237,10 @@ static const char *ACBitsNames[] =
 	"MAINTAIN_FRAME_ACROSS_STATES2",
 	"MAINTAIN_FRAME_ACROSS_STATES3",
 	"MAINTAIN_FRAME_ACROSS_STATES4",
-	
+
 	NULL
 };
+static_assert(ARRAY_SIZE(ACBitsNames) == AC_BITS_COUNT + 1, "Incorrect array size");
 
 static const Int ALL_MAINTAIN_FRAME_FLAGS =
 	(1<<MAINTAIN_FRAME_ACROSS_STATES) |
@@ -282,34 +274,40 @@ static const char *TerrainDecalTextureName[TERRAIN_DECAL_MAX]=
 	"TERRAIN_DECAL_DEMORALIZED_OBSOLETE",
 #endif
 	"EXHorde",//enthusiastic
-	"EXHorde_UP", //enthusiastic with nationalism 
+	"EXHorde_UP", //enthusiastic with nationalism
 	"EXHordeB",//enthusiastic vehicle
 	"EXHordeB_UP", //enthusiastic vehicle with nationalism
 	"EXJunkCrate",//Marks a crate as special
-	"EXHordeC_UP", //enthusiastic with fanaticism 
+#if RTS_GENERALS && RETAIL_COMPATIBLE_XFER_SAVE
+	"", //dummy entry for TERRAIN_DECAL_NONE
+	"EXHordeC_UP", //enthusiastic with fanaticism
+	"EXChemSuit", //Marks a unit as having chemical suit on
+#else
+	"EXHordeC_UP", //enthusiastic with fanaticism
 	"EXChemSuit", //Marks a unit as having chemical suit on
-	"",	//dummy entry for TERRAIN_DECAL_NONE
+	"", //dummy entry for TERRAIN_DECAL_NONE
+#endif
 	"" //dummy entry for TERRAIN_DECAL_SHADOW_TEXTURE
 };
 
 const UnsignedInt NO_NEXT_DURATION = 0xffffffff;
 
 //-------------------------------------------------------------------------------------------------
-W3DAnimationInfo::W3DAnimationInfo(const AsciiString& name, Bool isIdle, Real distanceCovered) : 
+W3DAnimationInfo::W3DAnimationInfo(const AsciiString& name, Bool isIdle, Real distanceCovered) :
 #ifdef RETAIN_ANIM_HANDLES
-	m_handle(NULL), 
+	m_handle(NULL),
 	m_naturalDurationInMsec(0),
 #else
 	m_naturalDurationInMsec(-1),
 #endif
 	m_name(name),
-	m_isIdleAnim(isIdle), 
+	m_isIdleAnim(isIdle),
 	m_distanceCovered(distanceCovered)
-{ 
+{
 }
 
 //-------------------------------------------------------------------------------------------------
-W3DAnimationInfo::W3DAnimationInfo( const W3DAnimationInfo &r ) : 
+W3DAnimationInfo::W3DAnimationInfo( const W3DAnimationInfo &r ) :
 	m_name(r.m_name),
 #ifdef RETAIN_ANIM_HANDLES
 	m_handle(r.m_handle),
@@ -346,13 +344,13 @@ W3DAnimationInfo& W3DAnimationInfo::operator=(const W3DAnimationInfo &r)
 //-------------------------------------------------------------------------------------------------
 // note that this now returns an ADDREFED handle, which must be released by the caller!
 HAnimClass* W3DAnimationInfo::getAnimHandle() const
-{ 
+{
 #ifdef RETAIN_ANIM_HANDLES
 	if (m_handle == NULL)
 	{
 		// Get_HAnim addrefs it, so we'll have to release it in our dtor.
 		m_handle = W3DDisplay::m_assetManager->Get_HAnim(m_name.str());
-		DEBUG_ASSERTCRASH(m_handle, ("*** ASSET ERROR: animation %s not found\n",m_name.str()));
+		DEBUG_ASSERTCRASH(m_handle, ("*** ASSET ERROR: animation %s not found",m_name.str()));
 		if (m_handle)
 		{
 			m_naturalDurationInMsec = m_handle->Get_Num_Frames() * 1000.0f / m_handle->Get_Frame_Rate();
@@ -364,7 +362,7 @@ HAnimClass* W3DAnimationInfo::getAnimHandle() const
 	return m_handle;
 #else
 	HAnimClass* handle = W3DDisplay::m_assetManager->Get_HAnim(m_name.str());
-	DEBUG_ASSERTCRASH(handle, ("*** ASSET ERROR: animation %s not found\n",m_name.str()));
+	DEBUG_ASSERTCRASH(handle, ("*** ASSET ERROR: animation %s not found",m_name.str()));
 	if (handle != NULL && m_naturalDurationInMsec < 0)
 	{
 		m_naturalDurationInMsec = handle->Get_Num_Frames() * 1000.0f / handle->Get_Frame_Rate();
@@ -377,11 +375,11 @@ HAnimClass* W3DAnimationInfo::getAnimHandle() const
 }
 
 //-------------------------------------------------------------------------------------------------
-W3DAnimationInfo::~W3DAnimationInfo() 
-{ 
+W3DAnimationInfo::~W3DAnimationInfo()
+{
 #ifdef RETAIN_ANIM_HANDLES
-	REF_PTR_RELEASE(m_handle); 
-	m_handle = NULL; 
+	REF_PTR_RELEASE(m_handle);
+	m_handle = NULL;
 #endif
 }
 
@@ -393,7 +391,7 @@ void ModelConditionInfo::preloadAssets( TimeOfDay timeOfDay, Real scale )
 	{
 		TheDisplay->preloadModelAssets( m_modelName );
 	}
-	
+
 	// this can be called from the client, which is problematic
 //	validateStuff(NULL, getDrawable()->getScale());
 	//validateCachedBones(NULL, scale);
@@ -418,8 +416,8 @@ void ModelConditionInfo::addPublicBone(const AsciiString& boneName) const
 //-------------------------------------------------------------------------------------------------
 Bool ModelConditionInfo::matchesMode(Bool night, Bool snowy) const
 {
-	for (std::vector<ModelConditionFlags>::const_iterator it = m_conditionsYesVec.begin(); 
-				it != m_conditionsYesVec.end(); 
+	for (std::vector<ModelConditionFlags>::const_iterator it = m_conditionsYesVec.begin();
+				it != m_conditionsYesVec.end();
 				++it)
 	{
 		if (it->test(MODELCONDITION_NIGHT) == (night) &&
@@ -470,12 +468,12 @@ static Bool findSingleSubObj(RenderObjClass* robj, const AsciiString& boneName,
 		// boneIndex = childObject->Get_Sub_Object_Bone_Index(childObject);
 
 		for (Int subObj = 0; subObj < robj->Get_Num_Sub_Objects(); subObj++)
-		{	
+		{
 			RenderObjClass* test = robj->Get_Sub_Object(subObj);
 			if (test == childObject)
 			{
 				boneIndex = robj->Get_Sub_Object_Bone_Index(0, subObj);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 				test->Release_Ref();
 				test = robj->Get_Sub_Object_On_Bone(0, boneIndex);
 				DEBUG_ASSERTCRASH(test != NULL && test == childObject, ("*** ASSET ERROR: Hmm, bone problem"));
@@ -510,8 +508,8 @@ static Bool doSingleBoneName(RenderObjClass* robj, const AsciiString& boneName,
 
 	if (findSingleBone(robj, boneNameTmp, info.mtx, info.boneIndex))
 	{
-//DEBUG_LOG(("added bone %s\n",boneNameTmp.str()));
-		BONEPOS_LOG(("Caching bone %s (index %d)\n", boneNameTmp.str(), info.boneIndex));
+//DEBUG_LOG(("added bone %s",boneNameTmp.str()));
+		BONEPOS_LOG(("Caching bone %s (index %d)", boneNameTmp.str(), info.boneIndex));
 		BONEPOS_DUMPMATRIX3D(&(info.mtx));
 
 		map[NAMEKEY(boneNameTmp)] = info;
@@ -523,8 +521,8 @@ static Bool doSingleBoneName(RenderObjClass* robj, const AsciiString& boneName,
 		tmp.format("%s%02d", boneNameTmp.str(), i);
 		if (findSingleBone(robj, tmp, info.mtx, info.boneIndex))
 		{
-//DEBUG_LOG(("added bone %s\n",tmp.str()));
-			BONEPOS_LOG(("Caching bone %s (index %d)\n", tmp.str(), info.boneIndex));
+//DEBUG_LOG(("added bone %s",tmp.str()));
+			BONEPOS_LOG(("Caching bone %s (index %d)", tmp.str(), info.boneIndex));
 			BONEPOS_DUMPMATRIX3D(&(info.mtx));
 			map[NAMEKEY(tmp)] = info;
 			foundAsBone = true;
@@ -539,8 +537,8 @@ static Bool doSingleBoneName(RenderObjClass* robj, const AsciiString& boneName,
 	{
 		if (findSingleSubObj(robj, boneNameTmp, info.mtx, info.boneIndex))
 		{
-//DEBUG_LOG(("added subobj %s\n",boneNameTmp.str()));
-			BONEPOS_LOG(("Caching bone from subobject %s (index %d)\n", boneNameTmp.str(), info.boneIndex));
+//DEBUG_LOG(("added subobj %s",boneNameTmp.str()));
+			BONEPOS_LOG(("Caching bone from subobject %s (index %d)", boneNameTmp.str(), info.boneIndex));
 			BONEPOS_DUMPMATRIX3D(&(info.mtx));
 			map[NAMEKEY(boneNameTmp)] = info;
 			foundAsSubObj = true;
@@ -551,8 +549,8 @@ static Bool doSingleBoneName(RenderObjClass* robj, const AsciiString& boneName,
 			tmp.format("%s%02d", boneNameTmp.str(), i);
 			if (findSingleSubObj(robj, tmp, info.mtx, info.boneIndex))
 			{
-//DEBUG_LOG(("added subobj %s\n",tmp.str()));
-				BONEPOS_LOG(("Caching bone from subobject %s (index %d)\n", tmp.str(), info.boneIndex));
+//DEBUG_LOG(("added subobj %s",tmp.str()));
+				BONEPOS_LOG(("Caching bone from subobject %s (index %d)", tmp.str(), info.boneIndex));
 				BONEPOS_DUMPMATRIX3D(&(info.mtx));
 				map[NAMEKEY(tmp)] = info;
 				foundAsSubObj = true;
@@ -573,7 +571,7 @@ void ModelConditionInfo::validateStuff(RenderObjClass* robj, Real scale, const s
 // srj sez: hm, this doesn't make sense; I think we really do need to validate transition states.
 //	if (m_transition != NO_TRANSITION)
 //		return;
-	
+
 	loadAnimations();
 	if (!(m_validStuff & PUBLIC_BONES_VALID) && isValidTimeToCalcLogicStuff())
 	{
@@ -605,7 +603,7 @@ void ModelConditionInfo::validateCachedBones(RenderObjClass* robj, Real scale) c
 	setFPMode();
 
 	BONEPOS_LOG(("Validating bones for %s: %s", m_modelName.str(), getDescription().str()));
-	//BONEPOS_LOG(("Passing in valid render obj: %d\n", (robj != 0)));
+	//BONEPOS_LOG(("Passing in valid render obj: %d", (robj != 0)));
 	BONEPOS_DUMPREAL(scale);
 
 	m_pristineBones.clear();
@@ -618,15 +616,15 @@ void ModelConditionInfo::validateCachedBones(RenderObjClass* robj, Real scale) c
 	{
 		if (m_modelName.isEmpty())
 		{
-			//BONEPOS_LOG(("Bailing: model name is empty\n"));
+			//BONEPOS_LOG(("Bailing: model name is empty"));
 			return;
 		}
 
 		robj = W3DDisplay::m_assetManager->Create_Render_Obj(m_modelName.str(), scale, 0);
-		DEBUG_ASSERTCRASH(robj, ("*** ASSET ERROR: Model %s not found!\n",m_modelName.str()));
+		DEBUG_ASSERTCRASH(robj, ("*** ASSET ERROR: Model %s not found!",m_modelName.str()));
 		if (!robj)
 		{
-			//BONEPOS_LOG(("Bailing: could not load render object\n"));
+			//BONEPOS_LOG(("Bailing: could not load render object"));
 			return;
 		}
 		tossRobj = true;
@@ -649,7 +647,7 @@ void ModelConditionInfo::validateCachedBones(RenderObjClass* robj, Real scale) c
 	// if we have any animations in this state, always choose the first, since the animations
 	// vary on a per-client basis.
 	HAnimClass* animToUse;
-	if (m_animations.size() > 0)
+	if (!m_animations.empty())
 	{
 		animToUse = m_animations.front().getAnimHandle();	// return an AddRef'ed handle
 	}
@@ -680,11 +678,11 @@ void ModelConditionInfo::validateCachedBones(RenderObjClass* robj, Real scale) c
 			if (!doSingleBoneName(robj, *it, m_pristineBones))
 			{
 				// don't crash here, since these are catch-all global bones and won't be present in most models.
-				//DEBUG_CRASH(("public bone %s (and variations thereof) not found in model %s!\n",it->str(),m_modelName.str()));
+				//DEBUG_CRASH(("public bone %s (and variations thereof) not found in model %s!",it->str(),m_modelName.str()));
 			}
 			//else
 			//{
-			//	DEBUG_LOG(("global bone %s (or variations thereof) found in model %s\n",it->str(),m_modelName.str()));
+			//	DEBUG_LOG(("global bone %s (or variations thereof) found in model %s",it->str(),m_modelName.str()));
 			//}
 		}
 	}
@@ -693,11 +691,11 @@ void ModelConditionInfo::validateCachedBones(RenderObjClass* robj, Real scale) c
 		if (!doSingleBoneName(robj, *it, m_pristineBones))
 		{
 			// DO crash here, since we specifically requested this bone for this model
-			DEBUG_CRASH(("*** ASSET ERROR: public bone '%s' (and variations thereof) not found in model %s!\n",it->str(),m_modelName.str()));
+			DEBUG_CRASH(("*** ASSET ERROR: public bone '%s' (and variations thereof) not found in model %s!",it->str(),m_modelName.str()));
 		}
 		//else
 		//{
-		//	DEBUG_LOG(("extra bone %s (or variations thereof) found in model %s\n",it->str(),m_modelName.str()));
+		//	DEBUG_LOG(("extra bone %s (or variations thereof) found in model %s",it->str(),m_modelName.str()));
 		//}
 	}
 
@@ -737,19 +735,19 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 		const AsciiString& recoilBoneName = m_weaponRecoilBoneName[wslot];
 		const AsciiString& mfName = m_weaponMuzzleFlashName[wslot];
 		const AsciiString& plbName = m_weaponProjectileLaunchBoneName[wslot];
-    
+
 // a useful tool for finding missing INI entries in the weapon-bone block
 // since this class has no idea which object it refers to, it must assume that the projectilelaunchbonename
 // is required if the fxBoneName is specified
 // this is not always true, since some weapons have no launched projectiles, hence the caveat in the assert message
-//#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+//#if defined(RTS_DEBUG)
 //    if (
 //          ( m_modelName.startsWith("UV") || m_modelName.startsWith("NV") || m_modelName.startsWith("AV") ||
 //            m_modelName.startsWith("uv") || m_modelName.startsWith("nv") || m_modelName.startsWith("av")
 //          )
 //
 //          && fxBoneName.isNotEmpty()
-//          
+//
 //      )
 //    DEBUG_ASSERTCRASH( plbName.isNotEmpty(), ("You appear to have a missing projectilelaunchbonename. \n Promptly ignore this assert if this model is used by a non-projectile-weapon-bearing unit\nModel name = %s.", m_modelName.str()) );
 //#endif
@@ -772,7 +770,7 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 				{
 					sprintf(buffer, "%s%02d", mfName.str(), i);
 					findPristineBone(NAMEKEY(buffer), &info.m_muzzleFlashBone);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 					if (info.m_muzzleFlashBone)
 						info.m_muzzleFlashBoneName = buffer;
 #endif
@@ -798,9 +796,9 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 				if (info.m_fxBone == 0 && info.m_recoilBone == 0 && info.m_muzzleFlashBone == 0 && plbBoneIndex == 0)
 					break;
 
-				CRCDEBUG_LOG(("validateWeaponBarrelInfo() - model name %s wslot %d\n", m_modelName.str(), wslot));
+				CRCDEBUG_LOG(("validateWeaponBarrelInfo() - model name %s wslot %d", m_modelName.str(), wslot));
 				DUMPMATRIX3D(&(info.m_projectileOffsetMtx));
-				BONEPOS_LOG(("validateWeaponBarrelInfo() - model name %s wslot %d\n", m_modelName.str(), wslot));
+				BONEPOS_LOG(("validateWeaponBarrelInfo() - model name %s wslot %d", m_modelName.str(), wslot));
 				BONEPOS_DUMPMATRIX3D(&(info.m_projectileOffsetMtx));
 				m_weaponBarrelInfoVec[wslot].push_back(info);
 
@@ -809,7 +807,7 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 
 				prevFxBone = info.m_fxBone;
 			}
-			
+
 			if (m_weaponBarrelInfoVec[wslot].empty())
 			{
 				// try the unadorned names
@@ -820,7 +818,7 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 				if (!mfName.isEmpty())
 					findPristineBone(NAMEKEY(mfName), &info.m_muzzleFlashBone);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 				if (info.m_muzzleFlashBone)
 					info.m_muzzleFlashBoneName = mfName;
 #endif
@@ -833,12 +831,12 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 
 				if (!fxBoneName.isEmpty())
 					findPristineBone(NAMEKEY(fxBoneName), &info.m_fxBone);
-				
+
 				if (info.m_fxBone != 0 || info.m_recoilBone != 0 || info.m_muzzleFlashBone != 0 || plbMtx != NULL)
 				{
-					CRCDEBUG_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) wslot %d\n", m_modelName.str(), wslot));
+					CRCDEBUG_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) wslot %d", m_modelName.str(), wslot));
 					DUMPMATRIX3D(&(info.m_projectileOffsetMtx));
-					BONEPOS_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) wslot %d\n", m_modelName.str(), wslot));
+					BONEPOS_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) wslot %d", m_modelName.str(), wslot));
 					BONEPOS_DUMPMATRIX3D(&(info.m_projectileOffsetMtx));
 					m_weaponBarrelInfoVec[wslot].push_back(info);
 					if (info.m_recoilBone != 0 || info.m_muzzleFlashBone != 0)
@@ -846,16 +844,16 @@ void ModelConditionInfo::validateWeaponBarrelInfo() const
 				}
 				else
 				{
-					CRCDEBUG_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) found nothing\n", m_modelName.str()));
-					BONEPOS_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) found nothing\n", m_modelName.str()));
+					CRCDEBUG_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) found nothing", m_modelName.str()));
+					BONEPOS_LOG(("validateWeaponBarrelInfo() - model name %s (unadorned) found nothing", m_modelName.str()));
 				}
-			}	// if empty
+			}
 
-			DEBUG_ASSERTCRASH(!(m_modelName.isNotEmpty() && m_weaponBarrelInfoVec[wslot].empty()), ("*** ASSET ERROR: No fx bone named '%s' found in model %s!\n",fxBoneName.str(),m_modelName.str()));
+			DEBUG_ASSERTCRASH(!(m_modelName.isNotEmpty() && m_weaponBarrelInfoVec[wslot].empty()), ("*** ASSET ERROR: No fx bone named '%s' found in model %s!",fxBoneName.str(),m_modelName.str()));
 		}
 	}
 	m_validStuff |= BARRELS_VALID;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void ModelConditionInfo::validateTurretInfo() const
@@ -880,34 +878,34 @@ void ModelConditionInfo::validateTurretInfo() const
 		{
 			if (findPristineBone(tur.m_turretAngleNameKey, &tur.m_turretAngleBone) == NULL)
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found! (%s)\n",KEYNAME(tur.m_turretAngleNameKey).str(),m_modelName.str()));
+				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found! (%s)",KEYNAME(tur.m_turretAngleNameKey).str(),m_modelName.str()));
 				tur.m_turretAngleBone = 0;
 			}
 		}
 		else
 		{
 			tur.m_turretAngleBone = 0;
-		}	
+		}
 
 		if (tur.m_turretPitchNameKey != NAMEKEY_INVALID)
 		{
 			if (findPristineBone(tur.m_turretPitchNameKey, &tur.m_turretPitchBone) == NULL)
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found! (%s)\n",KEYNAME(tur.m_turretPitchNameKey).str(),m_modelName.str()));
+				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found! (%s)",KEYNAME(tur.m_turretPitchNameKey).str(),m_modelName.str()));
 				tur.m_turretPitchBone = 0;
 			}
 		}
 		else
 		{
 			tur.m_turretPitchBone = 0;
-		}	
+		}
 	}
 
 	if (isValidTimeToCalcLogicStuff())
 	{
 		m_validStuff |= TURRETS_VALID;
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 const Matrix3D* ModelConditionInfo::findPristineBone(NameKeyType boneName, Int* boneIndex) const
@@ -966,26 +964,26 @@ Bool ModelConditionInfo::findPristineBonePos(NameKeyType boneName, Coord3D& pos)
 
 //-------------------------------------------------------------------------------------------------
 void ModelConditionInfo::loadAnimations() const
-{ 
+{
 #ifdef RETAIN_ANIM_HANDLES
 	for (W3DAnimationVector::const_iterator it2 = m_animations.begin(); it2 != m_animations.end(); ++it2)
 	{
 		HAnimClass* h = it2->getAnimHandle();	// just force it to get loaded
-		REF_PTR_RELEASE(h);	
+		REF_PTR_RELEASE(h);
 		h = NULL;
 	}
 #else
 	// srj sez: I think there is no real reason to preload these all anymore. things that need the anims
-	// (for bones) will force an implicit load anyway, but there's no point in forcibly loading the anims 
+	// (for bones) will force an implicit load anyway, but there's no point in forcibly loading the anims
 	// that don't contain interesting logical bones.
 #endif
 }
 
 //-------------------------------------------------------------------------------------------------
 void ModelConditionInfo::clear()
-{ 
+{
 	int i;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	m_description.clear();
 #endif
 	m_conditionsYesVec.clear();
@@ -1019,7 +1017,7 @@ void ModelConditionInfo::clear()
 }
 
 //-------------------------------------------------------------------------------------------------
-W3DModelDrawModuleData::W3DModelDrawModuleData() : 
+W3DModelDrawModuleData::W3DModelDrawModuleData() :
 	m_validated(0),
 	m_okToChangeModelColor(false),
   m_particlesAttachedToAnimatedBones(false),
@@ -1030,10 +1028,10 @@ W3DModelDrawModuleData::W3DModelDrawModuleData() :
 	m_minLODRequired(STATIC_GAME_LOD_LOW),
 	m_defaultState(-1)
 {
-	const Real MAX_SHIFT = 3.0f;			
-	const Real INITIAL_RECOIL_RATE = 2.0f;	
-	const Real RECOIL_DAMPING = 0.4f;	
-	const Real SETTLE_RATE = 0.065f;		
+	const Real MAX_SHIFT = 3.0f;
+	const Real INITIAL_RECOIL_RATE = 2.0f;
+	const Real RECOIL_DAMPING = 0.4f;
+	const Real SETTLE_RATE = 0.065f;
 
 	m_projectileBoneFeedbackEnabledSlots = 0;
 	m_initialRecoil = INITIAL_RECOIL_RATE;
@@ -1126,8 +1124,8 @@ W3DModelDrawModuleData::~W3DModelDrawModuleData()
 void W3DModelDrawModuleData::preloadAssets( TimeOfDay timeOfDay, Real scale ) const
 {
 
-	for( ModelConditionVector::iterator it = m_conditionStates.begin(); 
-			 it != m_conditionStates.end(); 
+	for( ModelConditionVector::iterator it = m_conditionStates.begin();
+			 it != m_conditionStates.end();
 			 ++it )
 	{
 
@@ -1195,11 +1193,11 @@ static void parseAsciiStringLC( INI* ini, void * /*instance*/, void *store, cons
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "InitialRecoilSpeed",	INI::parseVelocityReal, NULL, offsetof(W3DModelDrawModuleData, m_initialRecoil) },
 		{ "MaxRecoilDistance",	INI::parseReal, NULL, offsetof(W3DModelDrawModuleData, m_maxRecoil) },
@@ -1267,7 +1265,7 @@ static void parseAnimation(INI* ini, void *instance, void * /*store*/, const voi
 		while (timesToRepeat--)
 			self->m_animations.push_back(animInfo);
 	}
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 static void parseShowHideSubObject(INI* ini, void *instance, void *store, const void* userData)
@@ -1294,7 +1292,7 @@ static void parseShowHideSubObject(INI* ini, void *instance, void *store, const
 				found = true;
 			}
 		}
-		
+
 		if (!found)
 		{
 			ModelConditionInfo::HideShowSubObjInfo info;
@@ -1305,7 +1303,7 @@ static void parseShowHideSubObject(INI* ini, void *instance, void *store, const
 		subObjName = ini->getNextAsciiString();
 		subObjName.toLower();
 	}
-}	
+}
 
 //-------------------------------------------------------------------------------------------------
 void W3DModelDraw::showSubObject( const AsciiString& name, Bool show )
@@ -1339,7 +1337,7 @@ static void parseWeaponBoneName(INI* ini, void *instance, void * store, const vo
 {
 	ModelConditionInfo* self = (ModelConditionInfo*)instance;
 	AsciiString* arr = (AsciiString*)store;
-	
+
 	WeaponSlotType wslot = (WeaponSlotType)INI::scanIndexList(ini->getNextToken(), TheWeaponSlotTypeNames);
 	arr[wslot] = ini->getNextAsciiString();
 	arr[wslot].toLower();
@@ -1418,7 +1416,7 @@ static Bool doesStateExist(const ModelConditionVector& v, const ModelConditionFl
 //-------------------------------------------------------------------------------------------------
 void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void * /*store*/, const void* userData)
 {
-	static const FieldParse myFieldParse[] = 
+	static const FieldParse myFieldParse[] =
 	{
 		{ "Model",	parseAsciiStringLC, NULL, offsetof(ModelConditionInfo, m_modelName) },
 		{ "Turret",	parseBoneNameKey, NULL, offsetof(ModelConditionInfo, m_turrets[0].m_turretAngleNameKey) },
@@ -1456,32 +1454,32 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 		{
 			if (self->m_defaultState >= 0)
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: you may have only one default state!\n"));
+				DEBUG_CRASH(("*** ASSET ERROR: you may have only one default state!"));
 				throw INI_INVALID_DATA;
 			}
 			else if (ini->getNextTokenOrNull())
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: unknown keyword\n"));
+				DEBUG_CRASH(("*** ASSET ERROR: unknown keyword"));
 				throw INI_INVALID_DATA;
 			}
 			else
 			{
 				if (!self->m_conditionStates.empty())
 				{
-					DEBUG_CRASH(("*** ASSET ERROR: when using DefaultConditionState, it must be the first state listed (%s)\n",TheThingTemplateBeingParsedName.str()));
+					DEBUG_CRASH(("*** ASSET ERROR: when using DefaultConditionState, it must be the first state listed (%s)",TheThingTemplateBeingParsedName.str()));
 					throw INI_INVALID_DATA;
 				}
 
 				// note, this is size(), not size()-1, since we haven't actually modified the list yet
 				self->m_defaultState = self->m_conditionStates.size();
-				//DEBUG_LOG(("set default state to %d\n",self->m_defaultState));
+				//DEBUG_LOG(("set default state to %d",self->m_defaultState));
 
 				// add an empty conditionstateflag set
 				ModelConditionFlags blankConditions;
 				info.m_conditionsYesVec.clear();
 				info.m_conditionsYesVec.push_back(blankConditions);
 
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	#if defined(RTS_DEBUG)
 				info.m_description.clear();
 				info.m_description.concat(TheThingTemplateBeingParsedName);
 				info.m_description.concat(" DEFAULT");
@@ -1492,14 +1490,16 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 
 		case PARSE_TRANSITION:
 		{
-		  AsciiString firstNm = ini->getNextToken(); firstNm.toLower();
-		  AsciiString secondNm = ini->getNextToken(); secondNm.toLower();
+			AsciiString firstNm = ini->getNextToken();
+			AsciiString secondNm = ini->getNextToken();
+			firstNm.toLower();
+			secondNm.toLower();
 			NameKeyType firstKey = NAMEKEY(firstNm);
 			NameKeyType secondKey = NAMEKEY(secondNm);
 
 			if (firstKey == secondKey)
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: You may not declare a transition between two identical states\n"));
+				DEBUG_CRASH(("*** ASSET ERROR: You may not declare a transition between two identical states"));
 				throw INI_INVALID_DATA;
 			}
 
@@ -1512,7 +1512,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 			}
 
 			info.m_transitionSig = buildTransitionSig(firstKey, secondKey);
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	#if defined(RTS_DEBUG)
 			info.m_description.clear();
 			info.m_description.concat(TheThingTemplateBeingParsedName);
 			info.m_description.concat(" TRANSITION: ");
@@ -1528,15 +1528,15 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 		{
 			if (self->m_conditionStates.empty())
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: AliasConditionState must refer to the previous state!\n"));
+				DEBUG_CRASH(("*** ASSET ERROR: AliasConditionState must refer to the previous state!"));
 				throw INI_INVALID_DATA;
 			}
-			
+
 			ModelConditionInfo& prevState = self->m_conditionStates.at(self->m_conditionStates.size()-1);
-			
+
 			ModelConditionFlags conditionsYes;
 
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	#if defined(RTS_DEBUG)
 			AsciiString description;
 			conditionsYes.parse(ini, &description);
 
@@ -1545,10 +1545,10 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 	#else
 			conditionsYes.parse(ini, NULL);
 	#endif
-			
+
 			if (conditionsYes.anyIntersectionWith(self->m_ignoreConditionStates))
 			{
-				DEBUG_CRASH(("You should not specify bits in a state once they are used in IgnoreConditionStates (%s)\n", TheThingTemplateBeingParsedName.str()));
+				DEBUG_CRASH(("You should not specify bits in a state once they are used in IgnoreConditionStates (%s)", TheThingTemplateBeingParsedName.str()));
 				throw INI_INVALID_DATA;
 			}
 
@@ -1566,7 +1566,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 			}
 
 			prevState.m_conditionsYesVec.push_back(conditionsYes);
-			
+
 			// yes, return, NOT break!
 			return;
 		}
@@ -1583,12 +1583,12 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 	// files too badly. maybe someday.
 	//	else
 	//	{
-	//		DEBUG_CRASH(("*** ASSET ERROR: you must specify a default state\n"));
+	//		DEBUG_CRASH(("*** ASSET ERROR: you must specify a default state"));
 	//		throw INI_INVALID_DATA;
 	//	}
-			
+
 			ModelConditionFlags conditionsYes;
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(DEBUG_CRASHING)
+	#if defined(RTS_DEBUG) || defined(DEBUG_CRASHING)
 			AsciiString description;
 			conditionsYes.parse(ini, &description);
 
@@ -1602,14 +1602,14 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 
 			if (conditionsYes.anyIntersectionWith(self->m_ignoreConditionStates))
 			{
-				DEBUG_CRASH(("You should not specify bits in a state once they are used in IgnoreConditionStates (%s)\n", TheThingTemplateBeingParsedName.str()));
+				DEBUG_CRASH(("You should not specify bits in a state once they are used in IgnoreConditionStates (%s)", TheThingTemplateBeingParsedName.str()));
 				throw INI_INVALID_DATA;
 			}
 
 			if (self->m_defaultState < 0 && self->m_conditionStates.empty() && conditionsYes.any())
 			{
 				// it doesn't actually NEED to be first, but it does need to be present, and this is the simplest way to enforce...
-				DEBUG_CRASH(("*** ASSET ERROR: when not using DefaultConditionState, the first ConditionState must be for NONE (%s)\n",TheThingTemplateBeingParsedName.str()));
+				DEBUG_CRASH(("*** ASSET ERROR: when not using DefaultConditionState, the first ConditionState must be for NONE (%s)",TheThingTemplateBeingParsedName.str()));
 				throw INI_INVALID_DATA;
 			}
 
@@ -1624,8 +1624,8 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 				DEBUG_CRASH(("*** ASSET ERROR: duplicate condition states are not currently allowed (%s)",info.m_description.str()));
 				throw INI_INVALID_DATA;
 			}
-			
-			DEBUG_ASSERTCRASH(info.m_conditionsYesVec.size() == 0, ("*** ASSET ERROR: nonempty m_conditionsYesVec.size(), see srj"));
+
+			DEBUG_ASSERTCRASH(info.m_conditionsYesVec.empty(), ("*** ASSET ERROR: nonempty m_conditionsYesVec.size(), see srj"));
 			info.m_conditionsYesVec.clear();
 			info.m_conditionsYesVec.push_back(conditionsYes);
 		}
@@ -1652,7 +1652,7 @@ void W3DModelDrawModuleData::parseConditionState(INI* ini, void *instance, void
 
 	if ((info.m_iniReadFlags & (1<<GOT_IDLE_ANIMS)) && (info.m_mode != RenderObjClass::ANIM_MODE_ONCE && info.m_mode != RenderObjClass::ANIM_MODE_ONCE_BACKWARDS))
 	{
-		DEBUG_CRASH(("*** ASSET ERROR: Idle Anims should always use ONCE or ONCE_BACKWARDS (%s)\n",TheThingTemplateBeingParsedName.str()));
+		DEBUG_CRASH(("*** ASSET ERROR: Idle Anims should always use ONCE or ONCE_BACKWARDS (%s)",TheThingTemplateBeingParsedName.str()));
 		throw INI_INVALID_DATA;
 	}
 
@@ -1700,7 +1700,7 @@ static Int countOnBits(UnsignedInt val)
 	Int count = 0;
 	for (Int i = 0; i < 32; ++i)
 	{
-		if (val & 1) 
+		if (val & 1)
 			++count;
 		val >>= 1;
 	}
@@ -1744,15 +1744,15 @@ W3DModelDraw::W3DModelDraw(Thing *thing, const ModuleData* moduleData) : DrawMod
 	m_fullyObscuredByShroud = false;
 
 	// only validate the current time-of-day and weather conditions by default.
-	getW3DModelDrawModuleData()->validateStuffForTimeAndWeather(getDrawable(), 
-											TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT, 
+	getW3DModelDrawModuleData()->validateStuffForTimeAndWeather(getDrawable(),
+											TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT,
 											TheGlobalData->m_weather == WEATHER_SNOWY);
 
 	ModelConditionFlags emptyFlags;
 	const ModelConditionInfo* info = findBestInfo(emptyFlags);
 	if (!info)
 	{
-		DEBUG_CRASH(("*** ASSET ERROR: all draw modules must have an IDLE state\n"));
+		DEBUG_CRASH(("*** ASSET ERROR: all draw modules must have an IDLE state"));
 		throw INI_INVALID_DATA;
 	}
 
@@ -1762,7 +1762,7 @@ W3DModelDraw::W3DModelDraw(Thing *thing, const ModuleData* moduleData) : DrawMod
   {
 	  Object* obj = draw->getObject();
 	  if (obj)
-	  {	
+	  {
 		  if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
 			  m_hexColor = obj->getNightIndicatorColor();
 		  else
@@ -1773,7 +1773,7 @@ W3DModelDraw::W3DModelDraw(Thing *thing, const ModuleData* moduleData) : DrawMod
     if ( ! getW3DModelDrawModuleData()->m_receivesDynamicLights)
     {
       draw->setReceivesDynamicLights( FALSE );
-		  DEBUG_LOG(("setReceivesDynamicLights = FALSE: %s\n", draw->getTemplate()->getName().str()));
+		  DEBUG_LOG(("setReceivesDynamicLights = FALSE: %s", draw->getTemplate()->getName().str()));
     }
   }
 
@@ -1784,8 +1784,8 @@ W3DModelDraw::W3DModelDraw(Thing *thing, const ModuleData* moduleData) : DrawMod
 //-------------------------------------------------------------------------------------------------
 void W3DModelDraw::onDrawableBoundToObject(void)
 {
-	getW3DModelDrawModuleData()->validateStuffForTimeAndWeather(getDrawable(), 
-											TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT, 
+	getW3DModelDrawModuleData()->validateStuffForTimeAndWeather(getDrawable(),
+											TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT,
 											TheGlobalData->m_weather == WEATHER_SNOWY);
 }
 
@@ -1794,7 +1794,7 @@ void W3DModelDraw::onDrawableBoundToObject(void)
 W3DModelDraw::~W3DModelDraw(void)
 {
 	if (m_trackRenderObject && TheTerrainTracksRenderObjClassSystem)
-	{	
+	{
 		TheTerrainTracksRenderObjClassSystem->unbindTrack(m_trackRenderObject);
 		m_trackRenderObject = NULL;
 	}
@@ -1835,12 +1835,12 @@ void W3DModelDraw::setHidden(Bool hidden)
 
 	if (m_terrainDecal)
 		m_terrainDecal->enableShadowRender(!hidden);
-	
+
 	if (m_trackRenderObject && hidden)
 	{	const Coord3D* pos = getDrawable()->getPosition();
 		m_trackRenderObject->addCapEdgeToTrack(pos->x,pos->y);
 	}
-	
+
 	doStartOrStopParticleSys();
 }
 
@@ -1859,9 +1859,9 @@ void W3DModelDraw::allocateShadows(void)
 
 	//Check if we don't already have a shadow but need one for this type of model.
 	if (m_shadow == NULL && m_renderObject && TheW3DShadowManager && tmplate->getShadowType() != SHADOW_NONE)
-	{	
+	{
 		Shadow::ShadowTypeInfo shadowInfo;
-		strcpy(shadowInfo.m_ShadowName, tmplate->getShadowTextureName().str());
+		strlcpy(shadowInfo.m_ShadowName, tmplate->getShadowTextureName().str(), ARRAY_SIZE(shadowInfo.m_ShadowName));
 		DEBUG_ASSERTCRASH(shadowInfo.m_ShadowName[0] != '\0', ("this should be validated in ThingTemplate now"));
 		shadowInfo.allowUpdates			= FALSE;		//shadow image will never update
 		shadowInfo.allowWorldAlign	= TRUE;	//shadow image will wrap around world objects
@@ -1888,19 +1888,19 @@ void W3DModelDraw::setShadowsEnabled(Bool enable)
 }
 
 /**collect some stats about the rendering cost of this draw module */
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+#if defined(RTS_DEBUG)
 void W3DModelDraw::getRenderCost(RenderCost & rc) const
 {
 	getRenderCostRecursive(rc,m_renderObject);
 	if (m_shadow)
 		m_shadow->getRenderCost(rc);
 }
-#endif //RTS_DEBUG || RTS_INTERNAL
+#endif //RTS_DEBUG
 
 
 /**recurse through sub-objs to collect stats about the rendering cost of this draw module */
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
-void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const 
+#if defined(RTS_DEBUG)
+void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj) const
 {
 	if (robj == NULL) return;
 
@@ -1914,7 +1914,7 @@ void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj)
 	// Only consider visible sub-objects.  Some vehicles have hidden headlight cones for example
 	// that are not normally rendered.
 	if (robj->Is_Not_Hidden_At_All()) {
-		
+
 		// collect stats from meshes
 		if (robj->Class_ID() == RenderObjClass::CLASSID_MESH) {
 			MeshClass * mesh = (MeshClass*)robj;
@@ -1928,7 +1928,7 @@ void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj)
 
 			rc.addDrawCalls(mesh->Get_Draw_Call_Count());
 		}
-		
+
 		// collect bone stats.
 		const HTreeClass * htree = robj->Get_HTree();
 		if (htree != NULL) {
@@ -1936,7 +1936,7 @@ void W3DModelDraw::getRenderCostRecursive(RenderCost & rc,RenderObjClass * robj)
 		}
 	}
 }
-#endif //RTS_DEBUG || RTS_INTERNAL
+#endif //RTS_DEBUG
 
 //-------------------------------------------------------------------------------------------------
 void W3DModelDraw::setFullyObscuredByShroud(Bool fullyObscured)
@@ -2010,7 +2010,7 @@ void W3DModelDraw::adjustTransformMtx(Matrix3D& mtx) const
 #else
 	if (d->m_attachToDrawableBone.isNotEmpty())
 	{
-		// override the mtx in this case. yes, call drawable, since the bone in question is 
+		// override the mtx in this case. yes, call drawable, since the bone in question is
 		// likely to be in another module!
 		Matrix3D boneMtx;
 		if (getDrawable()->getCurrentWorldspaceClientBonePositions(d->m_attachToDrawableBone.str(), boneMtx))
@@ -2019,7 +2019,7 @@ void W3DModelDraw::adjustTransformMtx(Matrix3D& mtx) const
 		}
 		else
 		{
-			DEBUG_LOG(("m_attachToDrawableBone %s not found\n",getW3DModelDrawModuleData()->m_attachToDrawableBone.str()));
+			DEBUG_LOG(("m_attachToDrawableBone %s not found",getW3DModelDrawModuleData()->m_attachToDrawableBone.str()));
 		}
 	}
 #endif
@@ -2047,7 +2047,7 @@ void W3DModelDraw::doDrawModule(const Matrix3D* transformMtx)
 
 	Matrix3D scaledTransform;
 	if (getDrawable()->getInstanceScale() != 1.0f)
-	{	
+	{
 		// do custom scaling of the W3D model.
 		scaledTransform = *transformMtx;
 		scaledTransform.Scale(getDrawable()->getInstanceScale());
@@ -2060,7 +2060,7 @@ void W3DModelDraw::doDrawModule(const Matrix3D* transformMtx)
 	{
 		if (m_curState != NULL && m_nextState != NULL)
 		{
-			//DEBUG_LOG(("transition %s is complete\n",m_curState->m_description.str()));
+			//DEBUG_LOG(("transition %s is complete",m_curState->m_description.str()));
 			const ModelConditionInfo* nextState = m_nextState;
 			UnsignedInt nextDuration = m_nextStateAnimLoopDuration;
 			m_nextState = NULL;
@@ -2068,18 +2068,18 @@ void W3DModelDraw::doDrawModule(const Matrix3D* transformMtx)
 			setModelState(nextState);
 			if (nextDuration != NO_NEXT_DURATION)
 			{
-				//DEBUG_LOG(("restoring pending duration of %d frames\n",nextDuration));
+				//DEBUG_LOG(("restoring pending duration of %d frames",nextDuration));
 				setAnimationLoopDuration(nextDuration);
 			}
 		}
-		
+
 		if (m_renderObject &&
 					m_curState != NULL &&
 					m_whichAnimInCurState != -1)
 		{
 			if (m_curState->m_animations[m_whichAnimInCurState].isIdleAnim())
 			{
-				//DEBUG_LOG(("randomly switching to new idle state!\n"));
+				//DEBUG_LOG(("randomly switching to new idle state!"));
 
 				// state hasn't changed, if it's been awhile, switch the idle anim
 				// (yes, that's right: pass curState for prevState)
@@ -2104,12 +2104,12 @@ void W3DModelDraw::doDrawModule(const Matrix3D* transformMtx)
 
 	handleClientTurretPositioning();
 	recalcBonesForClientParticleSystems();
-  
+
   const W3DModelDrawModuleData *modData = getW3DModelDrawModuleData();
   if ( modData->m_particlesAttachedToAnimatedBones )
-    updateBonesForClientParticleSystems();// LORENZEN ADDED THIS 
+    updateBonesForClientParticleSystems();// LORENZEN ADDED THIS
                                           // IT REPOSITIONS PARTICLESYSTEMS TO TSTAY IN SYNC WITH ANIMATED BONES
-	
+
   handleClientRecoil();
 
 }
@@ -2177,9 +2177,9 @@ void W3DModelDraw::adjustAnimation(const ModelConditionInfo* prevState, Real pre
 		{
 			m_whichAnimInCurState = GameClientRandomValue(0, numAnims-1);
 		}
-		
+
 		const W3DAnimationInfo& animInfo = m_curState->m_animations[m_whichAnimInCurState];
-		
+
 		HAnimClass* animHandle = animInfo.getAnimHandle();	// note that this now returns an ADDREFED handle, which must be released by the caller!
 		if (m_renderObject && animHandle)
 		{
@@ -2261,7 +2261,7 @@ Real W3DModelDraw::getCurAnimDistanceCovered() const
 	if (m_curState != NULL && m_whichAnimInCurState >= 0)
 	{
 		const W3DAnimationInfo& animInfo = m_curState->m_animations[m_whichAnimInCurState];
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	#if defined(RTS_DEBUG)
 		if (TheSkateDistOverride != 0.0f)
 			return TheSkateDistOverride;
 	#endif
@@ -2278,23 +2278,23 @@ Real W3DModelDraw::getCurAnimDistanceCovered() const
 static void doHideShowBoneSubObjs(Bool state, Int numSubObjects, Int boneIdx, RenderObjClass *fullObject, const HTreeClass *htree)
 {
 #if 1	//(gth) fixed and tested this version
-	for (Int i=0; i < numSubObjects; i++) 
+	for (Int i=0; i < numSubObjects; i++)
 	{
 		bool is_child = false;
 		Int parentBoneIndex = fullObject->Get_Sub_Object_Bone_Index(0, i);
-		
-		while (parentBoneIndex != 0) 
+
+		while (parentBoneIndex != 0)
 		{
 			parentBoneIndex = htree->Get_Parent_Index(parentBoneIndex);
 
-			if (parentBoneIndex == boneIdx) 
+			if (parentBoneIndex == boneIdx)
 			{
 				is_child = true;
 				break;
 			}
 		}
 
-		if (is_child) 
+		if (is_child)
 		{
 			RenderObjClass* childObject = fullObject->Get_Sub_Object(i);
 			childObject->Set_Hidden(state);
@@ -2303,23 +2303,23 @@ static void doHideShowBoneSubObjs(Bool state, Int numSubObjects, Int boneIdx, Re
 	}
 #endif
 #if 0	//old slow version
-	
+
   for (Int i=0; i < numSubObjects; i++)
-  {	
+  {
   	Int childBoneIndex = fullObject->Get_Sub_Object_Bone_Index(0, i);
   	Int parentIndex = htree->Get_Parent_Index(childBoneIndex);
   	if (childBoneIndex == parentIndex)
   		continue;
 
   	if (parentIndex == boneIdx)	// this object has our subobject as parent so copy hide state
-  	{	
+  	{
   		RenderObjClass* childObject = fullObject->Get_Sub_Object(i);
   		// recurse down the hierarchy to hide all sub-children
   		doHideShowBoneSubObjs(state, numSubObjects, childBoneIndex, fullObject, htree);
 		childObject->Set_Hidden(state);
   		childObject->Release_Ref();
   	}
-  } 
+  }
 #endif
 }
 
@@ -2336,7 +2336,7 @@ void ModelConditionInfo::WeaponBarrelInfo::setMuzzleFlashHidden(RenderObjClass *
 		}
 		else
 		{
-			DEBUG_CRASH(("*** ASSET ERROR: childObject %s not found in setMuzzleFlashHidden()\n",m_muzzleFlashBoneName.str()));
+			DEBUG_CRASH(("*** ASSET ERROR: childObject %s not found in setMuzzleFlashHidden()",m_muzzleFlashBoneName.str()));
 		}
 	}
 }
@@ -2360,7 +2360,7 @@ void W3DModelDraw::doHideShowSubObjs(const std::vector<ModelConditionInfo::HideS
 
 				const HTreeClass *htree = m_renderObject->Get_HTree();
 				if (htree)
-				{	
+				{
 					//get the bone of this subobject so we can hide all other child objects that use this bone
 					//as a parent.
 					Int boneIdx = m_renderObject->Get_Sub_Object_Bone_Index(0, objIndex);
@@ -2370,12 +2370,12 @@ void W3DModelDraw::doHideShowSubObjs(const std::vector<ModelConditionInfo::HideS
 			}
 			else
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: SubObject %s not found (%s)!\n",it->subObjName.str(),getDrawable()->getTemplate()->getName().str()));
+				DEBUG_CRASH(("*** ASSET ERROR: SubObject %s not found (%s)!",it->subObjName.str(),getDrawable()->getTemplate()->getName().str()));
 			}
 		}
 	}
 
-	//Kris (added Aug 2002) 
+	//Kris (added Aug 2002)
 	//This is really important as it allows a person to override modelcondition show/hide objects. Used by the A10 strike
 	//September 2002 -- now used by the UpgradeSubObject system.
 	if( !m_subObjectVec.empty() )
@@ -2385,13 +2385,13 @@ void W3DModelDraw::doHideShowSubObjs(const std::vector<ModelConditionInfo::HideS
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DModelDraw::stopClientParticleSystems() 
+void W3DModelDraw::stopClientParticleSystems()
 {
 	for (std::vector<ParticleSysTrackerType>::const_iterator it = m_particleSystemIDs.begin(); it != m_particleSystemIDs.end(); ++it)
 	//for (std::vector<ParticleSystemID>::const_iterator it = m_particleSystemIDs.begin(); it != m_particleSystemIDs.end(); ++it)
 	{
 		ParticleSystem *sys = TheParticleSystemManager->findParticleSystem((*it).id);
-		if (sys != NULL) 
+		if (sys != NULL)
 		{
 			// this can be NULL
 			sys->destroy();
@@ -2445,7 +2445,7 @@ void W3DModelDraw::handleClientTurretPositioning()
 				if (m_renderObject)
 				{
 					m_renderObject->Capture_Bone( tur.m_turretAngleBone );
-					m_renderObject->Control_Bone( tur.m_turretAngleBone, turretXfrm );	
+					m_renderObject->Control_Bone( tur.m_turretAngleBone, turretXfrm );
 				}
 			}
 
@@ -2459,11 +2459,11 @@ void W3DModelDraw::handleClientTurretPositioning()
 				if (m_renderObject)
 				{
 					m_renderObject->Capture_Bone( tur.m_turretPitchBone );
-					m_renderObject->Control_Bone( tur.m_turretPitchBone, turretPitchXfrm );	
+					m_renderObject->Control_Bone( tur.m_turretPitchBone, turretPitchXfrm );
 				}
 			}
 		}
-	} // next tslot
+	}
 }
 
 
@@ -2478,7 +2478,7 @@ void W3DModelDraw::handleClientTurretPositioning()
 //		if (m_renderObject)
 //		{
 //			m_renderObject->Capture_Bone( tur.m_turretAngleBone );
-//			m_renderObject->Control_Bone( tur.m_turretAngleBone, turretXfrm );	
+//			m_renderObject->Control_Bone( tur.m_turretAngleBone, turretXfrm );
 //		}
 //	}
 //}
@@ -2516,7 +2516,7 @@ void W3DModelDraw::handleClientRecoil()
 			if (barrels[i].m_muzzleFlashBone != 0)
 			{
 				Bool hidden = recoils[i].m_state != WeaponRecoilInfo::RECOIL_START;
-				//DEBUG_LOG(("adjust muzzleflash %08lx for Draw %08lx state %s to %d at frame %d\n",subObjToHide,this,m_curState->m_description.str(),hidden?1:0,TheGameLogic->getFrame()));
+				//DEBUG_LOG(("adjust muzzleflash %08lx for Draw %08lx state %s to %d at frame %d",subObjToHide,this,m_curState->m_description.str(),hidden?1:0,TheGameLogic->getFrame()));
 				barrels[i].setMuzzleFlashHidden(m_renderObject, hidden);
 			}
 
@@ -2557,7 +2557,7 @@ void W3DModelDraw::handleClientRecoil()
 				Matrix3D gunXfrm;
 				gunXfrm.Make_Identity();
 				gunXfrm.Translate_X( -recoils[i].m_shift );
-				//DEBUG_ASSERTLOG(recoils[i].m_shift==0.0f,("adjust bone %d by %f\n",recoils[i].m_recoilBone,recoils[i].m_shift));
+				//DEBUG_ASSERTLOG(recoils[i].m_shift==0.0f,("adjust bone %d by %f",recoils[i].m_recoilBone,recoils[i].m_shift));
 
 				if (m_renderObject)
 				{
@@ -2568,7 +2568,7 @@ void W3DModelDraw::handleClientRecoil()
 			else
 			{
 				recoils[i].m_state = WeaponRecoilInfo::IDLE;
-				//DEBUG_LOG(("reset Draw %08lx state %08lx\n",this,m_curState));
+				//DEBUG_LOG(("reset Draw %08lx state %08lx",this,m_curState));
 			}
 		}
 	}
@@ -2596,13 +2596,13 @@ void W3DModelDraw::recalcBonesForClientParticleSystems()
 		const Drawable* drawable = getDrawable();
 		if (drawable != NULL )
 		{
-		
-			if( m_curState != NULL && drawable->testDrawableStatus( DRAWABLE_STATUS_NO_STATE_PARTICLES ) == FALSE ) 
+
+			if( m_curState != NULL && drawable->testDrawableStatus( DRAWABLE_STATUS_NO_STATE_PARTICLES ) == FALSE )
 			{
 				for (std::vector<ParticleSysBoneInfo>::const_iterator it = m_curState->m_particleSysBones.begin(); it != m_curState->m_particleSysBones.end(); ++it)
 				{
 					ParticleSystem *sys = TheParticleSystemManager->createParticleSystem(it->particleSystemTemplate);
-					if (sys != NULL) 
+					if (sys != NULL)
 					{
 						Coord3D pos;
 						pos.zero();
@@ -2640,7 +2640,7 @@ void W3DModelDraw::recalcBonesForClientParticleSystems()
 						// important: mark it as do-not-save, since we'll just re-create it when we reload.
 						sys->setSaveable(FALSE);
 
-						if (drawable->isDrawableEffectivelyHidden() || m_fullyObscuredByShroud) 
+						if (drawable->isDrawableEffectivelyHidden() || m_fullyObscuredByShroud)
 						{
 							sys->stop(); // don't start the systems for drawables that are hidden.
 						}
@@ -2680,7 +2680,7 @@ void W3DModelDraw::recalcBonesForClientParticleSystems()
 Bool W3DModelDraw::updateBonesForClientParticleSystems()
 {
 	const Drawable* drawable = getDrawable();
-	if (drawable != NULL && m_curState != NULL && m_renderObject != NULL ) 
+	if (drawable != NULL && m_curState != NULL && m_renderObject != NULL )
 	{
 
 //		Matrix3D originalTransform = m_renderObject->Get_Transform();
@@ -2688,18 +2688,18 @@ Bool W3DModelDraw::updateBonesForClientParticleSystems()
  //   Vector3 zeroTranslation(0,0,0);
   //  tmp.Set_Translation( zeroTranslation );
 	//	tmp.Scale(drawable->getScale());
-//		m_renderObject->Set_Transform(tmp);					
-				
-    
+//		m_renderObject->Set_Transform(tmp);
+
+
 
 		for (std::vector<ParticleSysTrackerType>::const_iterator it = m_particleSystemIDs.begin(); it != m_particleSystemIDs.end(); ++it)
 		{
 			ParticleSystem *sys = TheParticleSystemManager->findParticleSystem((*it).id);
 			Int boneIndex = (*it).boneIndex;
-			if ( (sys != NULL) && (boneIndex != 0)  ) 
+			if ( (sys != NULL) && (boneIndex != 0)  )
 			{
     		const Matrix3D boneTransform = m_renderObject->Get_Bone_Transform(boneIndex);// just a little worried about state changes
-        
+
         Vector3 vpos = boneTransform.Get_Translation();
 
         Coord3D pos;
@@ -2711,17 +2711,17 @@ Bool W3DModelDraw::updateBonesForClientParticleSystems()
 
         Real orientation = boneTransform.Get_Z_Rotation();
 				sys->rotateLocalTransformZ(orientation);
-        
+
         sys->setLocalTransform(&boneTransform);
         sys->setSkipParentXfrm(true);
 
 			}
-		}// next praticle system
+		}
 
 
-//  	m_renderObject->Set_Transform(originalTransform);	
+//  	m_renderObject->Set_Transform(originalTransform);
 
-	}// end if Drawable
+	}
 
 	return TRUE;
 
@@ -2753,9 +2753,9 @@ void W3DModelDraw::setTerrainDecal(TerrainDecalType type)
 	//decalInfo.m_type = SHADOW_ADDITIVE_DECAL;//temporary kluge to test graphics
 
 	if (type == TERRAIN_DECAL_SHADOW_TEXTURE)
-		strcpy(decalInfo.m_ShadowName,tmplate->getShadowTextureName().str());
+		strlcpy(decalInfo.m_ShadowName, tmplate->getShadowTextureName().str(), ARRAY_SIZE(decalInfo.m_ShadowName));
 	else
-		strcpy(decalInfo.m_ShadowName,TerrainDecalTextureName[type]);
+		strlcpy(decalInfo.m_ShadowName, TerrainDecalTextureName[type], ARRAY_SIZE(decalInfo.m_ShadowName));
 	decalInfo.m_sizeX = tmplate->getShadowSizeX();
 	decalInfo.m_sizeY = tmplate->getShadowSizeY();
 	decalInfo.m_offsetX = tmplate->getShadowOffsetX();
@@ -2815,14 +2815,14 @@ void W3DModelDraw::nukeCurrentRender(Matrix3D* xform)
 	else
 	{
 		if (xform)
-		{	
+		{
 			*xform = *getDrawable()->getTransformMatrix();
 		}
 	}
 }
 
 //-------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//art wants to see buildings without flags as a test.
+#if defined(RTS_DEBUG)	//art wants to see buildings without flags as a test.
 void W3DModelDraw::hideGarrisonFlags(Bool hide)
 {
 	if (!m_renderObject)
@@ -2837,7 +2837,7 @@ void W3DModelDraw::hideGarrisonFlags(Bool hide)
 
 		const HTreeClass *htree = m_renderObject->Get_HTree();
 		if (htree)
-		{	
+		{
 			//get the bone of this subobject so we can hide all other child objects that use this bone
 			//as a parent.
 			Int boneIdx = m_renderObject->Get_Sub_Object_Bone_Index(0, objIndex);
@@ -2855,7 +2855,7 @@ void W3DModelDraw::hideAllHeadlights(Bool hide)
 	if (m_renderObject)
 	{
 		for (Int subObj = 0; subObj < m_renderObject->Get_Num_Sub_Objects(); subObj++)
-		{	
+		{
 			RenderObjClass* test = m_renderObject->Get_Sub_Object(subObj);
 			if (strstr(test->Get_Name(),"HEADLIGHT"))
 			{
@@ -2901,7 +2901,7 @@ static Bool turretNamesDiffer(const ModelConditionInfo* a, const ModelConditionI
 		return true;
 	}
 	for (int i = 0; i < MAX_TURRETS; ++i)
-		if (a->m_turrets[i].m_turretAngleNameKey != b->m_turrets[i].m_turretAngleNameKey || 
+		if (a->m_turrets[i].m_turretAngleNameKey != b->m_turrets[i].m_turretAngleNameKey ||
 				a->m_turrets[i].m_turretPitchNameKey != b->m_turrets[i].m_turretPitchNameKey)
 			return true;
 
@@ -2914,17 +2914,17 @@ static Bool turretNamesDiffer(const ModelConditionInfo* a, const ModelConditionI
 //-------------------------------------------------------------------------------------------------
 void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 {
-	DEBUG_ASSERTCRASH(newState, ("invalid state in W3DModelDraw::setModelState\n")); 
+	DEBUG_ASSERTCRASH(newState, ("invalid state in W3DModelDraw::setModelState"));
 
 #ifdef DEBUG_OBJECT_ID_EXISTS
 	if (getDrawable() && getDrawable()->getObject() && getDrawable()->getObject()->getID() == TheObjectIDToDebug)
 	{
-		DEBUG_LOG(("REQUEST switching to state %s for obj %s %d\n",newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
+		DEBUG_LOG(("REQUEST switching to state %s for obj %s %d",newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
 	}
 #endif
 	const ModelConditionInfo* nextState = NULL;
 	if (m_curState != NULL && newState != NULL)
-	{ 
+	{
 		// if the requested state is the current state (and nothing is pending),
 		// or if the requested state is pending, just punt.
 		//
@@ -2934,13 +2934,13 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 		// leaving us these possibilities:
 		//
 		// -- curState is a transition state
-		//		--in this case, new state should take precedence (unless there's a wait-to-finish marking, 
+		//		--in this case, new state should take precedence (unless there's a wait-to-finish marking,
 		//		which would be handled by the else clause)
 		//
 		// -- curState is a real state, nextState is a real state with a wait-to-finish clause
 		//		-- if curState == newState, presume that we should restart curState, thus punting thepending nextState
 		//		-- if curState != newState, presume we should switch to it, thus punting curState and nextState
-		// 
+		//
 		// -- curState is a real state, nextState is a real state without a wait-to-finish clause
 		//		-- should be impossible!
 
@@ -2950,13 +2950,13 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 #ifdef DEBUG_OBJECT_ID_EXISTS
 			if (getDrawable() && getDrawable()->getObject() && getDrawable()->getObject()->getID() == TheObjectIDToDebug)
 			{
-				DEBUG_LOG(("IGNORE duplicate state %s for obj %s %d\n",newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
+				DEBUG_LOG(("IGNORE duplicate state %s for obj %s %d",newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
 			}
 #endif
 			// I don't think he'll be interested...
 			// he's already got one, you see
 			return;
-		} 
+		}
 		// check for allow-to-finish implicit transitions
 		else if (newState != m_curState &&
 							newState->m_allowToFinishKey != NAMEKEY_INVALID &&
@@ -2967,7 +2967,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 #ifdef DEBUG_OBJECT_ID_EXISTS
 			if (getDrawable() && getDrawable()->getObject() && getDrawable()->getObject()->getID() == TheObjectIDToDebug)
 			{
-				DEBUG_LOG(("ALLOW_TO_FINISH state %s for obj %s %d\n",newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
+				DEBUG_LOG(("ALLOW_TO_FINISH state %s for obj %s %d",newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
 			}
 #endif
 			m_nextState = newState;
@@ -2975,7 +2975,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 			return;
 		}
 		// check for a normal->normal state transition
-		else if (newState != m_curState && 
+		else if (newState != m_curState &&
 					m_curState->m_transitionKey != NAMEKEY_INVALID &&
 					newState->m_transitionKey != NAMEKEY_INVALID)
 		{
@@ -2986,7 +2986,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 #ifdef DEBUG_OBJECT_ID_EXISTS
 				if (getDrawable() && getDrawable()->getObject() && getDrawable()->getObject()->getID() == TheObjectIDToDebug)
 				{
-					DEBUG_LOG(("using TRANSITION state %s before requested state %s for obj %s %d\n",transState->m_description.str(),newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
+					DEBUG_LOG(("using TRANSITION state %s before requested state %s for obj %s %d",transState->m_description.str(),newState->m_description.str(),getDrawable()->getObject()->getTemplate()->getName().str(),getDrawable()->getObject()->getID()));
 				}
 #endif
 				nextState = newState;
@@ -2994,7 +2994,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 			}
 		}
 	}
-	
+
 	// get this here, before we change anything... we'll need it to pass to adjustAnimation (srj)
 	Real prevAnimFraction = getCurrentAnimFraction();
 
@@ -3015,8 +3015,8 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 	// note that different states might use the same model; for these, don't go thru the
 	// expense of creating a new render-object. (exception: if color is changing, or subobjs are changing,
 	// or a few other things...)
-	if (m_curState == NULL || 
-			newState->m_modelName != m_curState->m_modelName || 
+	if (m_curState == NULL ||
+			newState->m_modelName != m_curState->m_modelName ||
 			turretNamesDiffer(newState, m_curState)
 			// srj sez: I'm not sure why we want to do the "hard stuff" if we have projectile bones; I think
 			// it is a holdover from days gone by when bones were handled quite differently, rather than being cached.
@@ -3036,10 +3036,10 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 		else
 		{
 			m_renderObject = W3DDisplay::m_assetManager->Create_Render_Obj(newState->m_modelName.str(), draw->getScale(), m_hexColor);
-			DEBUG_ASSERTCRASH(m_renderObject, ("*** ASSET ERROR: Model %s not found!\n",newState->m_modelName.str()));
+			DEBUG_ASSERTCRASH(m_renderObject, ("*** ASSET ERROR: Model %s not found!",newState->m_modelName.str()));
 		}
 
-		//BONEPOS_LOG(("validateStuff() from within W3DModelDraw::setModelState()\n"));
+		//BONEPOS_LOG(("validateStuff() from within W3DModelDraw::setModelState()"));
 		//BONEPOS_DUMPREAL(draw->getScale());
 
 		newState->validateStuff(m_renderObject, draw->getScale(), getW3DModelDrawModuleData()->m_extraPublicBones);
@@ -3048,7 +3048,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 		rebuildWeaponRecoilInfo(newState);
 		doHideShowSubObjs(&newState->m_hideShowVec);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//art wants to see buildings without flags as a test.
+#if defined(RTS_DEBUG)	//art wants to see buildings without flags as a test.
 		if (TheGlobalData->m_hideGarrisonFlags && draw->isKindOf(KINDOF_STRUCTURE))
 			hideGarrisonFlags(TRUE);
 #endif
@@ -3057,9 +3057,9 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 
 		// set up tracks, if not already set.
 		if (m_renderObject &&
-				TheGlobalData->m_makeTrackMarks &&  
-				!m_trackRenderObject && 
-				TheTerrainTracksRenderObjClassSystem != NULL && 
+				TheGlobalData->m_makeTrackMarks &&
+				!m_trackRenderObject &&
+				TheTerrainTracksRenderObjClassSystem != NULL &&
 				!getW3DModelDrawModuleData()->m_trackFile.isEmpty())
 		{
 			m_trackRenderObject = TheTerrainTracksRenderObjClassSystem->bindTrack(m_renderObject, 1.0f*MAP_XY_FACTOR, getW3DModelDrawModuleData()->m_trackFile.str());
@@ -3069,9 +3069,9 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 
 		// set up shadows
 		if (m_renderObject && TheW3DShadowManager && tmplate->getShadowType() != SHADOW_NONE)
-		{	
+		{
 			Shadow::ShadowTypeInfo shadowInfo;
-			strcpy(shadowInfo.m_ShadowName, tmplate->getShadowTextureName().str());
+			strlcpy(shadowInfo.m_ShadowName, tmplate->getShadowTextureName().str(), ARRAY_SIZE(shadowInfo.m_ShadowName));
 			DEBUG_ASSERTCRASH(shadowInfo.m_ShadowName[0] != '\0', ("this should be validated in ThingTemplate now"));
 			shadowInfo.allowUpdates			= FALSE;		//shadow image will never update
 			shadowInfo.allowWorldAlign	= TRUE;	//shadow image will wrap around world objects
@@ -3080,7 +3080,9 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 			shadowInfo.m_sizeY					= tmplate->getShadowSizeY();
 			shadowInfo.m_offsetX				= tmplate->getShadowOffsetX();
 			shadowInfo.m_offsetY				= tmplate->getShadowOffsetY();
-  			m_shadow = TheW3DShadowManager->addShadow(m_renderObject, &shadowInfo, draw);
+
+			DEBUG_ASSERTCRASH(m_shadow == NULL, ("m_shadow is not NULL"));
+ 			m_shadow = TheW3DShadowManager->addShadow(m_renderObject, &shadowInfo, draw);
 			if (m_shadow)
 			{	m_shadow->enableShadowInvisible(m_fullyObscuredByShroud);
 				m_shadow->enableShadowRender(m_shadowEnabled);
@@ -3090,7 +3092,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 		if( m_renderObject )
 		{
 			// set collision type for render object.  Used by WW3D2 collision code.
-			if (tmplate->isKindOf(KINDOF_SELECTABLE))  
+			if (tmplate->isKindOf(KINDOF_SELECTABLE))
 			{
 				m_renderObject->Set_Collision_Type( PICK_TYPE_SELECTABLE );
 			}
@@ -3111,7 +3113,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 			{
 				m_renderObject->Set_Collision_Type( 0 );
 			}
-			
+
 			Object *obj = draw->getObject();
  			if( obj )
    		{
@@ -3140,8 +3142,6 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 
 			// tie in our drawable as the user data pointer in the render object
 			m_renderObject->Set_User_Data(draw->getDrawableInfo());
-	
-			setTerrainDecal(draw->getTerrainDecalType());
 
 			//We created a new render object so we need to preserve the visibility state
 			//of the previous render object.
@@ -3152,20 +3152,20 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 					m_shadow->enableShadowRender(FALSE);
 				m_shadowEnabled = FALSE;
 			}
-			
+
 			//
 			// set the transform for the new model to that we saved before, we do this so that the
 			// model transition is smooth and will immediately appear at the same orientation and location
 			// as the previous one
 			//
 			m_renderObject->Set_Transform(transform);
-			onRenderObjRecreated(); 
+			onRenderObjRecreated();
 		}
-	} 
-	else 
+	}
+	else
 	{
 
-		//BONEPOS_LOG(("validateStuff() from within W3DModelDraw::setModelState()\n"));
+		//BONEPOS_LOG(("validateStuff() from within W3DModelDraw::setModelState()"));
 		//BONEPOS_DUMPREAL(getDrawable()->getScale());
 
 		newState->validateStuff(m_renderObject, getDrawable()->getScale(), getW3DModelDrawModuleData()->m_extraPublicBones);
@@ -3173,7 +3173,7 @@ void W3DModelDraw::setModelState(const ModelConditionInfo* newState)
 
 		// ensure that any muzzle flashes from the *previous* state, are hidden...
 //		hideAllMuzzleFlashes(m_curState, m_renderObject);// moved to above
-		
+
 		doHideShowSubObjs(&newState->m_hideShowVec);
 	}
 	hideAllHeadlights(m_hideHeadlights);
@@ -3210,7 +3210,7 @@ void W3DModelDraw::setSelectable(Bool selectable)
 			current &= ~PICK_TYPE_SELECTABLE;
 		}
 		m_renderObject->Set_Collision_Type(current);
-	}  // end if
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -3220,7 +3220,7 @@ void W3DModelDraw::replaceIndicatorColor(Color color)
 		return;
 
 	if (getRenderObject())
-	{	
+	{
 		Int newColor = (color == 0) ? 0 : (color | 0xFF000000);
 		if (newColor != m_hexColor)
 		{
@@ -3256,12 +3256,12 @@ Bool W3DModelDraw::clientOnly_getRenderObjInfo(Coord3D* pos, Real* boundingSpher
 
 //-------------------------------------------------------------------------------------------------
 Bool W3DModelDraw::getProjectileLaunchOffset(
-	const ModelConditionFlags& condition, 
-	WeaponSlotType wslot, 
-	Int specificBarrelToUse, 
-	Matrix3D* launchPos, 
-	WhichTurretType tur, 
-	Coord3D* turretRotPos, 
+	const ModelConditionFlags& condition,
+	WeaponSlotType wslot,
+	Int specificBarrelToUse,
+	Matrix3D* launchPos,
+	WhichTurretType tur,
+	Coord3D* turretRotPos,
 	Coord3D* turretPitchPos
 ) const
 {
@@ -3274,12 +3274,12 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 	const ModelConditionInfo* stateToUse = findBestInfo(condition);
 	if (!stateToUse)
 	{
-		CRCDEBUG_LOG(("can't find best info\n"));
-		//BONEPOS_LOG(("can't find best info\n"));
+		CRCDEBUG_LOG(("can't find best info"));
+		//BONEPOS_LOG(("can't find best info"));
 		return false;
 	}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	CRCDEBUG_LOG(("W3DModelDraw::getProjectileLaunchOffset() for %s\n",
+#if defined(RTS_DEBUG)
+	CRCDEBUG_LOG(("W3DModelDraw::getProjectileLaunchOffset() for %s",
 		stateToUse->getDescription().str()));
 #endif
 
@@ -3297,13 +3297,13 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 #endif // INTENSE_DEBUG
 
 	const W3DModelDrawModuleData* d = getW3DModelDrawModuleData();
-	//CRCDEBUG_LOG(("validateStuffs() from within W3DModelDraw::getProjectileLaunchOffset()\n"));
+	//CRCDEBUG_LOG(("validateStuffs() from within W3DModelDraw::getProjectileLaunchOffset()"));
 	//DUMPREAL(getDrawable()->getScale());
-	//BONEPOS_LOG(("validateStuffs() from within W3DModelDraw::getProjectileLaunchOffset()\n"));
+	//BONEPOS_LOG(("validateStuffs() from within W3DModelDraw::getProjectileLaunchOffset()"));
 	//BONEPOS_DUMPREAL(getDrawable()->getScale());
 	stateToUse->validateStuff(NULL, getDrawable()->getScale(), d->m_extraPublicBones);
 
-	DEBUG_ASSERTCRASH(stateToUse->m_transitionSig == NO_TRANSITION, 
+	DEBUG_ASSERTCRASH(stateToUse->m_transitionSig == NO_TRANSITION,
 		("It is never legal to getProjectileLaunchOffset from a Transition state (they vary on a per-client basis)... however, we can fix this (see srj)\n"));
 
 	DEBUG_ASSERTCRASH(specificBarrelToUse >= 0, ("specificBarrelToUse should now always be explicit"));
@@ -3324,13 +3324,13 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 	}
 #endif
 
-	CRCDEBUG_LOG(("wslot = %d\n", wslot));
-	const ModelConditionInfo::WeaponBarrelInfoVec& wbvec = stateToUse->m_weaponBarrelInfoVec[wslot];	
+	CRCDEBUG_LOG(("wslot = %d", wslot));
+	const ModelConditionInfo::WeaponBarrelInfoVec& wbvec = stateToUse->m_weaponBarrelInfoVec[wslot];
 	if( wbvec.empty() )
 	{
 		// Can't find the launch pos, but they might still want the other info they asked for
-		CRCDEBUG_LOG(("empty wbvec\n"));
-		//BONEPOS_LOG(("empty wbvec\n"));
+		CRCDEBUG_LOG(("empty wbvec"));
+		//BONEPOS_LOG(("empty wbvec"));
 		launchPos = NULL;
 	}
 	else
@@ -3340,7 +3340,7 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 
 		if (launchPos)
 		{
-			CRCDEBUG_LOG(("specificBarrelToUse = %d\n", specificBarrelToUse));
+			CRCDEBUG_LOG(("specificBarrelToUse = %d", specificBarrelToUse));
 			*launchPos = wbvec[specificBarrelToUse].m_projectileOffsetMtx;
 
 			if (tur != TURRET_INVALID)
@@ -3357,9 +3357,9 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 		}
 	}
 
-	if (turretRotPos) 
+	if (turretRotPos)
 		turretRotPos->zero();
-	if (turretPitchPos) 
+	if (turretPitchPos)
 		turretPitchPos->zero();
 
 	if (tur != TURRET_INVALID)
@@ -3367,13 +3367,13 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 #ifdef CACHE_ATTACH_BONE
 		const Vector3* offset = d->getAttachToDrawableBoneOffset(getDrawable());
 #endif
-		const ModelConditionInfo::TurretInfo& turInfo = stateToUse->m_turrets[tur]; 
+		const ModelConditionInfo::TurretInfo& turInfo = stateToUse->m_turrets[tur];
 		if (turretRotPos)
 		{
 			if (turInfo.m_turretAngleNameKey != NAMEKEY_INVALID &&
 					!stateToUse->findPristineBonePos(turInfo.m_turretAngleNameKey, *turretRotPos))
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found!\n",KEYNAME(turInfo.m_turretAngleNameKey).str()));
+				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found!",KEYNAME(turInfo.m_turretAngleNameKey).str()));
 			}
 #ifdef CACHE_ATTACH_BONE
 			if (offset)
@@ -3389,7 +3389,7 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 			if (turInfo.m_turretPitchNameKey != NAMEKEY_INVALID &&
 					!stateToUse->findPristineBonePos(turInfo.m_turretPitchNameKey, *turretPitchPos))
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found!\n",KEYNAME(turInfo.m_turretPitchNameKey).str()));
+				DEBUG_CRASH(("*** ASSET ERROR: TurretBone %s not found!",KEYNAME(turInfo.m_turretPitchNameKey).str()));
 			}
 #ifdef CACHE_ATTACH_BONE
 			if (offset)
@@ -3407,10 +3407,10 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 //-------------------------------------------------------------------------------------------------
 Int W3DModelDraw::getPristineBonePositionsForConditionState(
 	const ModelConditionFlags& condition,
-	const char* boneNamePrefix, 
-	Int startIndex, 
-	Coord3D* positions, 
-	Matrix3D* transforms, 
+	const char* boneNamePrefix,
+	Int startIndex,
+	Coord3D* positions,
+	Matrix3D* transforms,
 	Int maxBones
 ) const
 {
@@ -3426,18 +3426,18 @@ Int W3DModelDraw::getPristineBonePositionsForConditionState(
 
 //	if (isValidTimeToCalcLogicStuff())
 //	{
-//		CRCDEBUG_LOG(("W3DModelDraw::getPristineBonePositionsForConditionState() - state = '%s'\n",
+//		CRCDEBUG_LOG(("W3DModelDraw::getPristineBonePositionsForConditionState() - state = '%s'",
 //			stateToUse->getDescription().str()));
-//		//CRCDEBUG_LOG(("renderObject == NULL: %d\n", (stateToUse==m_curState)?(m_renderObject == NULL):1));
+//		//CRCDEBUG_LOG(("renderObject == NULL: %d", (stateToUse==m_curState)?(m_renderObject == NULL):1));
 //	}
 
-	//BONEPOS_LOG(("validateStuff() from within W3DModelDraw::getPristineBonePositionsForConditionState()\n"));
+	//BONEPOS_LOG(("validateStuff() from within W3DModelDraw::getPristineBonePositionsForConditionState()"));
 	//BONEPOS_DUMPREAL(getDrawable()->getScale());
 	// we must call this every time we set m_nextState, to ensure cached bones are happy
 	stateToUse->validateStuff(
 		// if the state is the current state, pass in the current render object
 		// so that we don't have to re-create it!
-		stateToUse == m_curState ? m_renderObject : NULL, 
+		stateToUse == m_curState ? m_renderObject : NULL,
 		getDrawable()->getScale(),
 		getW3DModelDrawModuleData()->m_extraPublicBones);
 
@@ -3451,16 +3451,16 @@ Int W3DModelDraw::getPristineBonePositionsForConditionState(
 		transforms = tmpMtx;
 
 	Int posCount = 0;
-	Int endIndex = (startIndex == 0) ? 0 : 99;	
+	Int endIndex = (startIndex == 0) ? 0 : 99;
 	char buffer[256];
 	Int i = startIndex;
 	for (; i <= endIndex; ++i)
 	{
 		if (i == 0)
-			strcpy(buffer, boneNamePrefix);
+			strlcpy(buffer, boneNamePrefix, ARRAY_SIZE(buffer));
 		else
 			sprintf(buffer, "%s%02d", boneNamePrefix, i);
-		
+
 		for (char *c = buffer; c && *c; ++c)
 		{
 			// convert to all-lowercase since that's how we filled in the map
@@ -3478,7 +3478,7 @@ Int W3DModelDraw::getPristineBonePositionsForConditionState(
 		}
 		else
 		{
-			//DEBUG_CRASH(("*** ASSET ERROR: Bone %s not found!\n",buffer));
+			//DEBUG_CRASH(("*** ASSET ERROR: Bone %s not found!",buffer));
 			const Object *obj = getDrawable()->getObject();
 			if (obj)
 				transforms[posCount] = *obj->getTransformMatrix();
@@ -3491,7 +3491,7 @@ Int W3DModelDraw::getPristineBonePositionsForConditionState(
 		if (posCount >= maxBones)
 			break;
 	}
-	
+
 	if (positions && transforms)
 	{
 		for (i = 0; i < posCount; ++i)
@@ -3509,7 +3509,7 @@ Int W3DModelDraw::getPristineBonePositionsForConditionState(
 
 //	if (isValidTimeToCalcLogicStuff())
 //	{
-//		CRCDEBUG_LOG(("end of W3DModelDraw::getPristineBonePositionsForConditionState()\n"));
+//		CRCDEBUG_LOG(("end of W3DModelDraw::getPristineBonePositionsForConditionState()"));
 //	}
 
 	return posCount;
@@ -3573,10 +3573,10 @@ Bool W3DModelDraw::getCurrentWorldspaceClientBonePositions(const char* boneName,
 
 //-------------------------------------------------------------------------------------------------
 Int W3DModelDraw::getCurrentBonePositions(
-	const char* boneNamePrefix, 
-	Int startIndex, 
-	Coord3D* positions, 
-	Matrix3D* transforms, 
+	const char* boneNamePrefix,
+	Int startIndex,
+	Coord3D* positions,
+	Matrix3D* transforms,
 	Int maxBones
 ) const
 {
@@ -3608,16 +3608,16 @@ Int W3DModelDraw::getCurrentBonePositions(
 #endif
 
 	Int posCount = 0;
-	Int endIndex = (startIndex == 0) ? 0 : 99;	
+	Int endIndex = (startIndex == 0) ? 0 : 99;
 	char buffer[256];
 	Int i = startIndex;
 	for (; i <= endIndex; ++i)
 	{
 		if (i == 0)
-			strcpy(buffer, boneNamePrefix);
+			strlcpy(buffer, boneNamePrefix, ARRAY_SIZE(buffer));
 		else
 			sprintf(buffer, "%s%02d", boneNamePrefix, i);
-		
+
 		Int boneIndex = m_renderObject->Get_Bone_Index(buffer);
 		if (boneIndex == 0)
 			break;
@@ -3632,7 +3632,7 @@ Int W3DModelDraw::getCurrentBonePositions(
 		if (posCount >= maxBones)
 			break;
 	}
-	
+
 	if (positions && transforms)
 	{
 		for (i = 0; i < posCount; ++i)
@@ -3653,8 +3653,8 @@ Int W3DModelDraw::getCurrentBonePositions(
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DModelDraw::reactToTransformChange( const Matrix3D* oldMtx, 
-																					 const Coord3D* oldPos, 
+void W3DModelDraw::reactToTransformChange( const Matrix3D* oldMtx,
+																					 const Coord3D* oldPos,
 																					 Real oldAngle )
 {
 
@@ -3666,7 +3666,7 @@ void W3DModelDraw::reactToTransformChange( const Matrix3D* oldMtx,
 		m_renderObject->Set_Transform(mtx);
 	}
 
-	if (m_trackRenderObject) 
+	if (m_trackRenderObject)
 	{
 		Object *obj = getDrawable()->getObject();
 		const Coord3D* pos = getDrawable()->getPosition();
@@ -3680,11 +3680,11 @@ void W3DModelDraw::reactToTransformChange( const Matrix3D* oldMtx,
 			if (obj && obj->isSignificantlyAboveTerrain())
 			{
 				m_trackRenderObject->setAirborne();
-			} 
+			}
 			m_trackRenderObject->addEdgeToTrack(pos->x, pos->y);
 		}
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 const ModelConditionInfo* W3DModelDraw::findBestInfo(const ModelConditionFlags& c) const
@@ -3715,7 +3715,7 @@ Bool W3DModelDraw::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelTo
 		// FXList::doFXPos(fxl, getDrawable()->getPosition(), getDrawable()->getTransformMatrix(), weaponSpeed, victimPos);
 		return false;
 	}
-	
+
 	Bool handled = false;
 
 	if (specificBarrelToUse < 0 || specificBarrelToUse > wbvec.size())
@@ -3726,7 +3726,7 @@ Bool W3DModelDraw::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelTo
 	if (fxl)
 	{
 		if (info.m_fxBone && m_renderObject)
-		{ 
+		{
 			const Object *logicObject = getDrawable()->getObject();// This is slow, so store it
 			if( ! m_renderObject->Is_Hidden() || (logicObject == NULL) )
 			{
@@ -3748,7 +3748,7 @@ Bool W3DModelDraw::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelTo
 				pos = *(logicObject->getPosition());
 				/** @todo Once Firepoint bones are actually implemented, this matrix will become correct.
 				// Unless of course they decide to not have the tracers come out of the windows, but rather go towards the target.
-				// In that case, tracers will have to be rewritten to be "point towards secondary" instead of 
+				// In that case, tracers will have to be rewritten to be "point towards secondary" instead of
 				// "point straight ahead" which assumes we are facing the target.
 				*/
 				FXList::doFXPos(fxl, &pos, mtx, weaponSpeed, victimPos, damageRadius);
@@ -3758,13 +3758,13 @@ Bool W3DModelDraw::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelTo
 		}
 		else
 		{
-			DEBUG_LOG(("*** no FXBone found for a non-null FXL\n"));
+			DEBUG_LOG(("*** no FXBone found for a non-null FXL"));
 		}
 	}
 
 	if (info.m_recoilBone || info.m_muzzleFlashBone)
 	{
-		//DEBUG_LOG(("START muzzleflash %08lx for Draw %08lx state %s at frame %d\n",info.m_muzzleFlashBone,this,m_curState->m_description.str(),TheGameLogic->getFrame()));
+		//DEBUG_LOG(("START muzzleflash %08lx for Draw %08lx state %s at frame %d",info.m_muzzleFlashBone,this,m_curState->m_description.str(),TheGameLogic->getFrame()));
 		WeaponRecoilInfo& recoil = m_weaponRecoilInfoVec[wslot][specificBarrelToUse];
 		recoil.m_state = WeaponRecoilInfo::RECOIL_START;
 		recoil.m_recoilRate = getW3DModelDrawModuleData()->m_initialRecoil;
@@ -3773,17 +3773,17 @@ Bool W3DModelDraw::handleWeaponFireFX(WeaponSlotType wslot, Int specificBarrelTo
 	}
 
 	return handled;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 void W3DModelDraw::setAnimationLoopDuration(UnsignedInt numFrames)
 {
 // this is never defined -- srj
 #ifdef NO_DURATIONS_ON_TRANSITIONS
-	if (m_curState != NULL && m_curState->m_transition != NO_TRANSITION && 
+	if (m_curState != NULL && m_curState->m_transition != NO_TRANSITION &&
 			m_nextState != NULL && m_nextState->m_transition == NO_TRANSITION)
 	{
-		DEBUG_LOG(("deferring pending duration of %d frames\n",numFrames));
+		DEBUG_LOG(("deferring pending duration of %d frames",numFrames));
 		m_nextStateAnimLoopDuration = numFrames;
 		return;
 	}
@@ -3800,13 +3800,13 @@ void W3DModelDraw::setAnimationLoopDuration(UnsignedInt numFrames)
 //-------------------------------------------------------------------------------------------------
 /**
 	similar to the above, but assumes that the current state is a "ONCE",
-	and is smart about transition states... if there is a transition state 
+	and is smart about transition states... if there is a transition state
 	"inbetween", it is included in the completion time.
 */
 void W3DModelDraw::setAnimationCompletionTime(UnsignedInt numFrames)
 {
-	if (m_curState != NULL && m_curState->m_transitionSig != NO_TRANSITION && m_curState->m_animations.size() > 0 &&
-			m_nextState != NULL && m_nextState->m_transitionSig == NO_TRANSITION && m_nextState->m_animations.size() > 0)
+	if (m_curState != NULL && m_curState->m_transitionSig != NO_TRANSITION && !m_curState->m_animations.empty() &&
+			m_nextState != NULL && m_nextState->m_transitionSig == NO_TRANSITION && !m_nextState->m_animations.empty())
 	{
 		// we have a transition; split up the time suitably.
 		// note that this is just a guess, and assumes that the states
@@ -3839,7 +3839,7 @@ void W3DModelDraw::setAnimationFrame( int frame )
 //-------------------------------------------------------------------------------------------------
 void W3DModelDraw::setPauseAnimation(Bool pauseAnim)
 {
-	if (m_pauseAnimation == pauseAnim) 
+	if (m_pauseAnimation == pauseAnim)
 	{
 		return;
 	}
@@ -3855,12 +3855,12 @@ void W3DModelDraw::setPauseAnimation(Bool pauseAnim)
 		HAnimClass* anim = hlod->Peek_Animation_And_Info(framenum, numFrames, mode, dummy);
 		if (anim)
 		{
-			if (m_pauseAnimation) 
+			if (m_pauseAnimation)
 			{
 				m_animationMode = mode;
 				hlod->Set_Animation(anim, framenum, RenderObjClass::ANIM_MODE_MANUAL);
-			} 
-			else 
+			}
+			else
 			{
 				hlod->Set_Animation(anim, framenum, m_animationMode);
 			}
@@ -3878,7 +3878,7 @@ Real W3DModelDraw::getAnimationScrubScalar( void ) const
 #endif
 
 //-------------------------------------------------------------------------------------------------
-void W3DModelDraw::rebuildWeaponRecoilInfo(const ModelConditionInfo* state) 
+void W3DModelDraw::rebuildWeaponRecoilInfo(const ModelConditionInfo* state)
 {
 	Int wslot;
 
@@ -3906,7 +3906,7 @@ void W3DModelDraw::rebuildWeaponRecoilInfo(const ModelConditionInfo* state)
 			}
 		}
 	}
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Preload any assets for the time of day requested */
@@ -4000,7 +4000,7 @@ void W3DModelDraw::updateSubObjects()
 
 				const HTreeClass *htree = m_renderObject->Get_HTree();
 				if (htree)
-				{	
+				{
 					//get the bone of this subobject so we can hide all other child objects that use this bone
 					//as a parent.
 					Int boneIdx = m_renderObject->Get_Sub_Object_Bone_Index(0, objIndex);
@@ -4010,7 +4010,7 @@ void W3DModelDraw::updateSubObjects()
 			}
 			else
 			{
-				DEBUG_CRASH(("*** ASSET ERROR: SubObject %s not found (%s)!\n",it->subObjName.str(),getDrawable()->getTemplate()->getName().str()));
+				DEBUG_CRASH(("*** ASSET ERROR: SubObject %s not found (%s)!",it->subObjName.str(),getDrawable()->getTemplate()->getName().str()));
 			}
 		}
 	}
@@ -4025,7 +4025,7 @@ void W3DModelDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -4073,9 +4073,9 @@ void W3DModelDraw::xfer( Xfer *xfer )
 				weaponRecoilInfo.m_recoilRate = (*it).m_recoilRate;
 				xfer->xferReal( &weaponRecoilInfo.m_recoilRate );
 
-			}  // end for, it
-			
-		}  // end if, save
+			}
+
+		}
 		else
 		{
 
@@ -4098,11 +4098,11 @@ void W3DModelDraw::xfer( Xfer *xfer )
 				// stuff it in the vector
 				m_weaponRecoilInfoVec[ i ].push_back( weaponRecoilInfo );
 
-			}  // end for, j
+			}
 
-		}  // end else, load
+		}
 
-	}  // end for, i
+	}
 
 	// sub object vector
 	UnsignedByte subObjectCount = m_subObjectVec.size();
@@ -4123,9 +4123,9 @@ void W3DModelDraw::xfer( Xfer *xfer )
 			hideShowSubObjInfo.hide = (*it).hide;
 			xfer->xferBool( &hideShowSubObjInfo.hide );
 
-		}  // end for, it
+		}
 
-	}  // end if, save
+	}
 	else
 	{
 
@@ -4145,24 +4145,24 @@ void W3DModelDraw::xfer( Xfer *xfer )
 			// stuff in vector
 			m_subObjectVec.push_back( hideShowSubObjInfo );
 
-		}  // end for, i
+		}
 
-	}  // end else, load
+	}
 
 	// animation
 	if( version >= 2 )
 	{
-		
+
 		if( xfer->getXferMode() == XFER_SAVE )
 		{
 				// srj sez: don't save info for transition states, since we can't really
 				// restore them effectively.
-			if ( m_renderObject 
+			if ( m_renderObject
 					&& m_renderObject->Class_ID() == RenderObjClass::CLASSID_HLOD
 					&& m_curState
 					&& m_curState->m_transitionSig == NO_TRANSITION )
 			{
-				
+
 				// cast to HLod
 				HLodClass *hlod = (HLodClass*)m_renderObject;
 
@@ -4189,9 +4189,9 @@ void W3DModelDraw::xfer( Xfer *xfer )
 					Real percent = frame / INT_TO_REAL( anim->Get_Num_Frames()-1 );
 					xfer->xferReal( &percent );
 
-				}  // end if, anim
+				}
 
-			}  // end if
+			}
 			else
 			{
 
@@ -4199,9 +4199,9 @@ void W3DModelDraw::xfer( Xfer *xfer )
 				Bool present = FALSE;
 				xfer->xferBool( &present );
 
-			}  // end else
+			}
 
-		}  // end if, save
+		}
 		else
 		{
 
@@ -4211,7 +4211,7 @@ void W3DModelDraw::xfer( Xfer *xfer )
 
 			if( present )
 			{
-				
+
 				{
 					// read mode
 					Int mode;
@@ -4243,28 +4243,28 @@ void W3DModelDraw::xfer( Xfer *xfer )
 						float dummy1, dummy2;
 						int curMode, dummy3;
 						hlod->Peek_Animation_And_Info(dummy1, dummy3, curMode, dummy2);
-						
+
 						// srj sez: do not change the animation mode. it's too risky, since if you change (say) a nonlooping
 						// to a looping, something might break since it could rely on that anim terminating.
 
 						// set animation data
 						hlod->Set_Animation( anim, frame, curMode );
 
-					}  // end if, anim
+					}
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
-		}  // end else, load
+		}
 
-	}  // end if, version with animation info
+	}
 
 	// when loading, update the sub objects if we have any
 	if( xfer->getXferMode() == XFER_LOAD && m_subObjectVec.empty() == FALSE )
 		updateSubObjects();
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -4275,7 +4275,7 @@ void W3DModelDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
@@ -4299,7 +4299,7 @@ void W3DModelDrawModuleData::xfer( Xfer *x )
 	{
 		ModelConditionInfo *info = &(*it);
 		x->xferByte(&(info->m_validStuff));
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		x->xferAsciiString(&(info->m_description));
 #endif
 		if (info->m_validStuff)
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordAircraftDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordAircraftDraw.cpp
index a49e6631eed..fb3d7795d56 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordAircraftDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordAircraftDraw.cpp
@@ -24,7 +24,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-//  FILE: W3DOverlordAircraftDraw.h 
+//  FILE: W3DOverlordAircraftDraw.h
 //  Author: Mark Lorenzen, April 2003
 //  Desc: Units that recieve portable structure upgrades (like the OverlordTnk) have a super specific special need.
 //  He needs his rider to draw explicitly after him,
@@ -42,11 +42,6 @@
 #include "W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //-------------------------------------------------------------------------------------------------
@@ -60,11 +55,11 @@ W3DOverlordAircraftDrawModuleData::~W3DOverlordAircraftDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DOverlordAircraftDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DOverlordAircraftDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ 0, 0, 0, 0 }
 	};
@@ -76,7 +71,7 @@ void W3DOverlordAircraftDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 W3DOverlordAircraftDraw::W3DOverlordAircraftDraw( Thing *thing, const ModuleData* moduleData )
 : W3DModelDraw( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -92,7 +87,7 @@ void W3DOverlordAircraftDraw::doDrawModule(const Matrix3D* transformMtx)
 	// Our big thing is that we get our specific passenger (the turret thing) and then wake it up and make it draw
 	// It depends on us because our renderObject is only made correct in the act of drawing.
 	Object *me = getDrawable()->getObject();
-	if( me 
+	if( me
 		&& me->getContain()
 		&& me->getContain()->friend_getRider()
 		&& me->getContain()->friend_getRider()->getDrawable()
@@ -106,10 +101,10 @@ void W3DOverlordAircraftDraw::doDrawModule(const Matrix3D* transformMtx)
         riderDraw->setColorTintEnvelope( *env );
 
       riderDraw->notifyDrawableDependencyCleared();
-		  riderDraw->draw( NULL );// What the hell?  This param isn't used for anything
+      riderDraw->draw();
     }
     DEBUG_ASSERTCRASH( riderDraw, ("OverlordAircraftDraw finds no rider's drawable") );
-		
+
 	}
 }
 
@@ -120,7 +115,7 @@ void W3DOverlordAircraftDraw::setHidden(Bool h)
 
 	// We need to hide our rider, since he won't realize he's being contained in a contained container
 	Object *me = getDrawable()->getObject();
-	if( me 
+	if( me
 		&& me->getContain()
 		&& me->getContain()->friend_getRider()
 		&& me->getContain()->friend_getRider()->getDrawable()
@@ -129,7 +124,7 @@ void W3DOverlordAircraftDraw::setHidden(Bool h)
 		me->getContain()->friend_getRider()->getDrawable()->setDrawableHidden(h);
 	}
 }
- 
+
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -140,7 +135,7 @@ void W3DOverlordAircraftDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -158,7 +153,7 @@ void W3DOverlordAircraftDraw::xfer( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -169,4 +164,4 @@ void W3DOverlordAircraftDraw::loadPostProcess( void )
 	// extend base class
 	W3DModelDraw::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
index 801e1b37071..0a4c356cc0a 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
@@ -46,11 +46,11 @@ W3DOverlordTankDrawModuleData::~W3DOverlordTankDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DOverlordTankDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DOverlordTankDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DTankDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ 0, 0, 0, 0 }
 	};
@@ -62,7 +62,7 @@ void W3DOverlordTankDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 W3DOverlordTankDraw::W3DOverlordTankDraw( Thing *thing, const ModuleData* moduleData )
 : W3DTankDraw( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -78,7 +78,7 @@ void W3DOverlordTankDraw::doDrawModule(const Matrix3D* transformMtx)
 	// Our big thing is that we get our specific passenger (the turret thing) and then wake it up and make it draw
 	// It depends on us because our renderObject is only made correct in the act of drawing.
 	Object *me = getDrawable()->getObject();
-	if( me 
+	if( me
 		&& me->getContain()
 		&& me->getContain()->friend_getRider()
 		&& me->getContain()->friend_getRider()->getDrawable()
@@ -88,7 +88,7 @@ void W3DOverlordTankDraw::doDrawModule(const Matrix3D* transformMtx)
 		riderDraw->setColorTintEnvelope( *getDrawable()->getColorTintEnvelope() );
 
 		riderDraw->notifyDrawableDependencyCleared();
-		riderDraw->draw( NULL );// What the hell?  This param isn't used for anything
+		riderDraw->draw();
 	}
 }
 
@@ -99,7 +99,7 @@ void W3DOverlordTankDraw::setHidden(Bool h)
 
 	// We need to hide our rider, since he won't realize he's being contained in a contained container
 	Object *me = getDrawable()->getObject();
-	if( me 
+	if( me
 		&& me->getContain()
 		&& me->getContain()->friend_getRider()
 		&& me->getContain()->friend_getRider()->getDrawable()
@@ -108,7 +108,7 @@ void W3DOverlordTankDraw::setHidden(Bool h)
 		me->getContain()->friend_getRider()->getDrawable()->setDrawableHidden(h);
 	}
 }
- 
+
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -119,7 +119,7 @@ void W3DOverlordTankDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DTankDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -137,7 +137,7 @@ void W3DOverlordTankDraw::xfer( Xfer *xfer )
 	// extend base class
 	W3DTankDraw::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -148,4 +148,4 @@ void W3DOverlordTankDraw::loadPostProcess( void )
 	// extend base class
 	W3DTankDraw::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTruckDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTruckDraw.cpp
index c4ec294f550..e748a8e167c 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTruckDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTruckDraw.cpp
@@ -46,11 +46,11 @@ W3DOverlordTruckDrawModuleData::~W3DOverlordTruckDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DOverlordTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DOverlordTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DTruckDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ 0, 0, 0, 0 }
 	};
@@ -62,7 +62,7 @@ void W3DOverlordTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 W3DOverlordTruckDraw::W3DOverlordTruckDraw( Thing *thing, const ModuleData* moduleData )
 : W3DTruckDraw( thing, moduleData )
 {
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -78,7 +78,7 @@ void W3DOverlordTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 	// Our big thing is that we get our specific passenger (the turret thing) and then wake it up and make it draw
 	// It depends on us because our renderObject is only made correct in the act of drawing.
 	Object *me = getDrawable()->getObject();
-	if( me 
+	if( me
 		&& me->getContain()
 		&& me->getContain()->friend_getRider()
 		&& me->getContain()->friend_getRider()->getDrawable()
@@ -88,7 +88,7 @@ void W3DOverlordTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 		riderDraw->setColorTintEnvelope( *getDrawable()->getColorTintEnvelope() );
 
 		riderDraw->notifyDrawableDependencyCleared();
-		riderDraw->draw( NULL );// What the hell?  This param isn't used for anything
+		riderDraw->draw();
 	}
 }
 
@@ -99,7 +99,7 @@ void W3DOverlordTruckDraw::setHidden(Bool h)
 
 	// We need to hide our rider, since he won't realize he's being contained in a contained container
 	Object *me = getDrawable()->getObject();
-	if( me 
+	if( me
 		&& me->getContain()
 		&& me->getContain()->friend_getRider()
 		&& me->getContain()->friend_getRider()->getDrawable()
@@ -108,7 +108,7 @@ void W3DOverlordTruckDraw::setHidden(Bool h)
 		me->getContain()->friend_getRider()->getDrawable()->setDrawableHidden(h);
 	}
 }
- 
+
 //-------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -119,7 +119,7 @@ void W3DOverlordTruckDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DTruckDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -137,7 +137,7 @@ void W3DOverlordTruckDraw::xfer( Xfer *xfer )
 	// extend base class
 	W3DTruckDraw::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -148,4 +148,4 @@ void W3DOverlordTruckDraw::loadPostProcess( void )
 	// extend base class
 	W3DTruckDraw::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp
index 48b05c49c7d..5dd2dcf89e8 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPoliceCarDraw.cpp
@@ -24,7 +24,7 @@
 
 // FILE: W3DPoliceCarDraw.cpp /////////////////////////////////////////////////////////////////////
 // Author: Colin Day, May 2001
-// Desc:   W3DPoliceCarDraw 
+// Desc:   W3DPoliceCarDraw
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
@@ -52,21 +52,21 @@ W3DDynamicLight *W3DPoliceCarDraw::createDynamicLight( void )
 	light = W3DDisplay::m_3DScene->getADynamicLight();
 	if( light )
 	{
-		
+
 		light->setEnabled( TRUE );
 		light->Set_Ambient( Vector3( 0.0f, 0.0f, 0.0f ) );
-		// Use all ambient, and no diffuse.  This produces a circle of light on 
-		// even and uneven ground.  Diffuse lighting shows up ground unevenness, which looks 
+		// Use all ambient, and no diffuse.  This produces a circle of light on
+		// even and uneven ground.  Diffuse lighting shows up ground unevenness, which looks
 		// funny on a searchlight.  So  no diffuse.  jba.
 		light->Set_Diffuse( Vector3( 0.0f, 0.0f, 0.0f ) );
 		light->Set_Position( Vector3( 0.0f, 0.0f, 0.0f ) );
 		light->Set_Far_Attenuation_Range( 5, 15 );
 
-	}  // end if
+	}
 
 	return light;
 
-}  // end createDynamicSearchLight
+}
 
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 
@@ -77,7 +77,7 @@ W3DPoliceCarDraw::W3DPoliceCarDraw( Thing *thing, const ModuleData* moduleData )
 	m_light = NULL;
 	m_curFrame = GameClientRandomValueReal(0, 10 );
 
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -92,7 +92,7 @@ W3DPoliceCarDraw::~W3DPoliceCarDraw( void )
 		m_light->setDecayRange();
 		m_light->setDecayColor();
 		m_light = NULL;
-	}  // end if
+	}
 
 }
 
@@ -109,8 +109,8 @@ void W3DPoliceCarDraw::doDrawModule(const Matrix3D* transformMtx)
 		return;
 
 	HAnimClass *anim = policeCarRenderObj->Peek_Animation();
-	if (anim) 
-	{		
+	if (anim)
+	{
 		Real frames = anim->Get_Num_Frames();
 		m_curFrame += animAmt;
 		if (m_curFrame > frames-1) {
@@ -122,9 +122,9 @@ void W3DPoliceCarDraw::doDrawModule(const Matrix3D* transformMtx)
 	Real green = 0;
 	Real blue = 0;
 	if (m_curFrame < 3) {
-		red = 1; green = 0.5; 
+		red = 1; green = 0.5;
 	} else if (m_curFrame < 6) {
-		red = 1; 
+		red = 1;
 	} else if (m_curFrame < 7) {
 		red = 1; green = 0.5;
 	} else if (m_curFrame < 9) {
@@ -153,7 +153,7 @@ void W3DPoliceCarDraw::doDrawModule(const Matrix3D* transformMtx)
 		m_light->Set_Position( Vector3( pos.x,pos.y,pos.z+floatAmt ) );
 	}
 	W3DTruckDraw::doDrawModule(transformMtx);
-} 
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -165,7 +165,7 @@ void W3DPoliceCarDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DTruckDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -185,7 +185,7 @@ void W3DPoliceCarDraw::xfer( Xfer *xfer )
 
 	// John A says there is no data for these to save
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -196,4 +196,4 @@ void W3DPoliceCarDraw::loadPostProcess( void )
 	// extend base class
 	W3DTruckDraw::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp
index 988d3ec3279..6aa69be1c09 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DProjectileStreamDraw.cpp
@@ -38,7 +38,7 @@
 #include "WWMath/vector3.h"
 
 //-------------------------------------------------------------------------------------------------
-W3DProjectileStreamDrawModuleData::W3DProjectileStreamDrawModuleData() 
+W3DProjectileStreamDrawModuleData::W3DProjectileStreamDrawModuleData()
 {
 	m_textureName = "";
 	m_width = 0.0f;
@@ -53,11 +53,11 @@ W3DProjectileStreamDrawModuleData::~W3DProjectileStreamDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DProjectileStreamDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DProjectileStreamDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   ModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Texture",			INI::parseAsciiString,	NULL, offsetof(W3DProjectileStreamDrawModuleData, m_textureName) },
 		{ "Width",				INI::parseReal,					NULL, offsetof(W3DProjectileStreamDrawModuleData, m_width) },
@@ -230,7 +230,7 @@ void W3DProjectileStreamDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -250,7 +250,7 @@ void W3DProjectileStreamDraw::xfer( Xfer *xfer )
 
 	// Graham says there is no data that needs saving here
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -261,4 +261,4 @@ void W3DProjectileStreamDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp
index 1cb9aebe9a6..8a9bd6ba630 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DRopeDraw.cpp
@@ -44,11 +44,6 @@
 #include "W3DDevice/GameClient/W3DScene.h"
 #include "Common/GameState.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -72,7 +67,7 @@ W3DRopeDraw::W3DRopeDraw( Thing *thing, const ModuleData* moduleData ) : DrawMod
 	m_segments.clear();
 	m_curWobblePhase = 0.0f;
 	m_curZOffset = 0.0f;
-} 
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -143,7 +138,7 @@ void W3DRopeDraw::tossSegments()
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void W3DRopeDraw::initRopeParms(Real length, Real width, const RGBColor& color, Real wobbleLen, Real wobbleAmp, Real wobbleRate)
-{ 
+{
 	m_maxLen = max(1.0f, length);
 	m_curLen = 0.0f;
 	m_width = width;
@@ -160,16 +155,16 @@ void W3DRopeDraw::initRopeParms(Real length, Real width, const RGBColor& color,
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void W3DRopeDraw::setRopeCurLen(Real length)
-{ 
-	m_curLen = length; 
+{
+	m_curLen = length;
 }
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void W3DRopeDraw::setRopeSpeed(Real curSpeed, Real maxSpeed, Real accel)
-{ 
-	m_curSpeed = curSpeed; 
-	m_maxSpeed = maxSpeed; 
+{
+	m_curSpeed = curSpeed;
+	m_maxSpeed = maxSpeed;
 	m_accel = accel;
 }
 
@@ -227,7 +222,7 @@ void W3DRopeDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -287,7 +282,7 @@ void W3DRopeDraw::xfer( Xfer *xfer )
 		tossSegments();
 
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -298,4 +293,4 @@ void W3DRopeDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp
index 45593e3beab..d94d3ced65f 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DScienceModelDraw.cpp
@@ -29,13 +29,14 @@
 
 #include "W3DDevice/GameClient/Module/W3DScienceModelDraw.h"
 
+#include "Common/GameUtility.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
 #include "Common/Science.h"
 #include "Common/Xfer.h"
 
 //-------------------------------------------------------------------------------------------------
-W3DScienceModelDrawModuleData::W3DScienceModelDrawModuleData() 
+W3DScienceModelDrawModuleData::W3DScienceModelDrawModuleData()
 {
 	m_requiredScience = SCIENCE_INVALID;
 }
@@ -46,11 +47,11 @@ W3DScienceModelDrawModuleData::~W3DScienceModelDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DScienceModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DScienceModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "RequiredScience", INI::parseScience, NULL, offsetof(W3DScienceModelDrawModuleData, m_requiredScience) },
 
@@ -62,7 +63,7 @@ void W3DScienceModelDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DScienceModelDraw::W3DScienceModelDraw( Thing *thing, const ModuleData* moduleData ) : W3DModelDraw( thing, moduleData )
-{	 
+{
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -82,9 +83,9 @@ void W3DScienceModelDraw::doDrawModule(const Matrix3D* transformMtx)
 		return;
 	}
 
-	if( !ThePlayerList->getLocalPlayer()->hasScience(science) 
-			&& ThePlayerList->getLocalPlayer()->isPlayerActive()
-		)
+	Player* player = rts::getObservedOrLocalPlayer();
+
+	if( !player->hasScience(science) && player->isPlayerActive() )
 	{
 		// We just don't draw for people without our science except for Observers
 		setHidden( TRUE );
@@ -103,7 +104,7 @@ void W3DScienceModelDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -121,7 +122,7 @@ void W3DScienceModelDraw::xfer( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::xfer( xfer );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -132,6 +133,6 @@ void W3DScienceModelDraw::loadPostProcess( void )
 	// extend base class
 	W3DModelDraw::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp
index c50a3bd63cd..bde8a4caddc 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DSupplyDraw.cpp
@@ -32,7 +32,7 @@
 #include "W3DDevice/GameClient/Module/W3DSupplyDraw.h"
 
 //-------------------------------------------------------------------------------------------------
-W3DSupplyDrawModuleData::W3DSupplyDrawModuleData() 
+W3DSupplyDrawModuleData::W3DSupplyDrawModuleData()
 {
 }
 
@@ -42,11 +42,11 @@ W3DSupplyDrawModuleData::~W3DSupplyDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DSupplyDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DSupplyDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "SupplyBonePrefix", INI::parseAsciiString, NULL, offsetof(W3DSupplyDrawModuleData, m_supplyBonePrefix) },
 
@@ -58,7 +58,7 @@ void W3DSupplyDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DSupplyDraw::W3DSupplyDraw( Thing *thing, const ModuleData* moduleData ) : W3DModelDraw( thing, moduleData )
-{	 
+{
 	m_totalBones = -1;
 	m_lastNumberShown = 0;
 }
@@ -119,7 +119,7 @@ void W3DSupplyDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -139,7 +139,7 @@ void W3DSupplyDraw::xfer( Xfer *xfer )
 
 	// Graham says there's no data to save here
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -150,6 +150,6 @@ void W3DSupplyDraw::loadPostProcess( void )
 	// extend base class
 	W3DModelDraw::loadPostProcess();
 
-}  // end loadPostProcess
+}
 
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp
index 269a56b0336..56af0e77ca1 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankDraw.cpp
@@ -47,11 +47,6 @@
 #include "W3DDevice/GameClient/Module/W3DTankDraw.h"
 #include "WW3D2/matinfo.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 class Matrix3D;
 
@@ -71,11 +66,11 @@ W3DTankDrawModuleData::~W3DTankDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DTankDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DTankDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "TreadDebrisLeft", INI::parseAsciiString, NULL, offsetof(W3DTankDrawModuleData, m_treadDebrisNameLeft) },
 		{ "TreadDebrisRight", INI::parseAsciiString, NULL, offsetof(W3DTankDrawModuleData, m_treadDebrisNameRight) },
@@ -234,7 +229,12 @@ void W3DTankDraw::updateTreadPositions(Real uvDelta)
 		else
 		if (pTread->m_type == TREAD_RIGHT)	//this tread needs to scroll backwards
 			offset_u = pTread->m_materialSettings.customUVOffset.X - uvDelta;
-				
+		else
+		{
+			DEBUG_CRASH(("Unhandled case in W3DTankDraw::updateTreadPositions"));
+			offset_u = 0.0f;
+		}
+
 		// ensure coordinates of offset are in [0, 1] range:
 		offset_u = offset_u - WWMath::Floor(offset_u);
 		pTread->m_materialSettings.customUVOffset.Set(offset_u,0);
@@ -242,7 +242,7 @@ void W3DTankDraw::updateTreadPositions(Real uvDelta)
 	}
 }
 
-/**Grab pointers to the sub-meshes for each tread*/ 
+/**Grab pointers to the sub-meshes for each tread*/
 void W3DTankDraw::updateTreadObjects(void)
 {
 	RenderObjClass *robj=getRenderObject();
@@ -254,7 +254,7 @@ void W3DTankDraw::updateTreadObjects(void)
 
 	//Make sure this object has defined a speed for tread scrolling.
 	if (getW3DTankDrawModuleData() && getW3DTankDrawModuleData()->m_treadAnimationRate && robj)
-	{	
+	{
 		for (Int i=0; i < robj->Get_Num_Sub_Objects() && m_treadCount < MAX_TREADS_PER_TANK; i++)
 		{
 			RenderObjClass *subObj=robj->Get_Sub_Object(i);
@@ -310,12 +310,15 @@ void W3DTankDraw::onRenderObjRecreated(void)
 //-------------------------------------------------------------------------------------------------
 void W3DTankDraw::doDrawModule(const Matrix3D* transformMtx)
 {
-	const Real DEBRIS_THRESHOLD = 0.00001f;
+	W3DModelDraw::doDrawModule(transformMtx);
 
- 	Bool frozen = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
- 	frozen = frozen || TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript();
-	if (frozen)
+	// TheSuperHackers @tweak Update the draw on every WW Sync only.
+	// All calculations are originally catered to a 30 fps logic step.
+	if (WW3D::Get_Sync_Frame_Time() == 0)
 		return;
+
+	const Real DEBRIS_THRESHOLD = 0.00001f;
+
 	if (getRenderObject()==NULL) return;
 	if (getRenderObject() != m_prevRenderObj) {
 		updateTreadObjects();
@@ -378,7 +381,7 @@ void W3DTankDraw::doDrawModule(const Matrix3D* transformMtx)
 				Coord3D dir;
 				obj->getUnitDirectionVector2D(dir);
 				Real angleToGoal = dir.x * m_lastDirection.x + dir.y * m_lastDirection.y;
-				
+
 				if (fabs(1.0f-angleToGoal) > 0.00001f)	//check if difference in angle cosines is greater than some cutoff.
 				{
 					if (turn == TURN_NEGATIVE)	//turning right
@@ -404,8 +407,6 @@ void W3DTankDraw::doDrawModule(const Matrix3D* transformMtx)
 			}
 		}
 	}
-
-	W3DModelDraw::doDrawModule(transformMtx);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -417,7 +418,7 @@ void W3DTankDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -437,7 +438,7 @@ void W3DTankDraw::xfer( Xfer *xfer )
 
 	// John A and Mark W say there is no data to save here
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -452,4 +453,4 @@ void W3DTankDraw::loadPostProcess( void )
 	tossEmitters();
 	createEmitters();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
index 0a2687eb944..83945bf5f38 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: W3DTankTruckDraw.cpp 
+// FILE: W3DTankTruckDraw.cpp
 // Draw TankTrucks.  Actually, this draws quad cannon which has both treads and wheels.
 // Author: Mark Wilczynski, August 2002
 
@@ -64,11 +64,11 @@ W3DTankTruckDrawModuleData::~W3DTankTruckDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DTankTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DTankTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Dust", INI::parseAsciiString, NULL, offsetof(W3DTankTruckDrawModuleData, m_dustEffectName) },
 		{ "DirtSpray", INI::parseAsciiString, NULL, offsetof(W3DTankTruckDrawModuleData, m_dirtEffectName) },
@@ -100,7 +100,7 @@ m_dirtEffect(NULL), m_dustEffect(NULL), m_powerslideEffect(NULL), m_effectsIniti
 m_wasAirborne(false), m_isPowersliding(false), m_frontWheelRotation(0), m_rearWheelRotation(0),
 m_frontRightTireBone(0), m_frontLeftTireBone(0), m_rearLeftTireBone(0),m_rearRightTireBone(0),
 m_prevRenderObj(NULL)
-{	 
+{
 	//Truck Data
 	m_landingSound = *(thing->getTemplate()->getPerUnitSound("TruckLandingSound"));
 	m_powerslideSound = *(thing->getTemplate()->getPerUnitSound("TruckPowerslideSound"));
@@ -244,12 +244,12 @@ void W3DTankTruckDraw::createEmitters( void )
 				m_dustEffect->setSaveable(FALSE);
 			}	else {
 				if (!getW3DTankTruckDrawModuleData()->m_dustEffectName.isEmpty()) {
-					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'\n", 
+					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'",
 						getW3DTankTruckDrawModuleData()->m_dustEffectName.str(), getDrawable()->getObject()->getTemplate()->getName().str()));
 				}
 			}
 
-		}	 
+		}
 		if (!m_dirtEffect) {
 			sysTemplate = TheParticleSystemManager->findTemplate(getW3DTankTruckDrawModuleData()->m_dirtEffectName);
 			if (sysTemplate)
@@ -260,7 +260,7 @@ void W3DTankTruckDraw::createEmitters( void )
 				m_dirtEffect->setSaveable(FALSE);
 			}	else {
 				if (!getW3DTankTruckDrawModuleData()->m_dirtEffectName.isEmpty()) {
-					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'\n", 
+					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'",
 						getW3DTankTruckDrawModuleData()->m_dirtEffectName.str(), getDrawable()->getObject()->getTemplate()->getName().str()));
 				}
 			}
@@ -275,13 +275,13 @@ void W3DTankTruckDraw::createEmitters( void )
 				m_powerslideEffect->setSaveable(FALSE);
 			}	else {
 				if (!getW3DTankTruckDrawModuleData()->m_powerslideEffectName.isEmpty()) {
-					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'\n", 
+					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'",
 						getW3DTankTruckDrawModuleData()->m_powerslideEffectName.str(), getDrawable()->getObject()->getTemplate()->getName().str()));
 				}
 			}
 		}
 	}
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -293,89 +293,89 @@ void W3DTankTruckDraw::enableEmitters( Bool enable  )
 {
 	// don't check... if we are hidden the first time thru, then we'll never create the emitters.
 	// eg, if we are loading a game and the unit is in a tunnel, he'll never get emitteres even when he exits.
-	//if (!m_effectsInitialized) 
+	//if (!m_effectsInitialized)
 	{
 		createEmitters();
 		m_effectsInitialized=true;
 	}
 	if (m_dustEffect)
 	{
-		if (enable) 
+		if (enable)
 			m_dustEffect->start();
 		else
 			m_dustEffect->stop();
 	}
 	if (m_dirtEffect)
 	{
-		if (enable) 
+		if (enable)
 			m_dirtEffect->start();
 		else
 			m_dirtEffect->stop();
 	}
 	if (m_powerslideEffect)
 	{
-		if (!enable) 
+		if (!enable)
 			m_powerslideEffect->stop();
 	}
 }
 //-------------------------------------------------------------------------------------------------
 void W3DTankTruckDraw::updateBones( void ) {
-	if( getW3DTankTruckDrawModuleData() ) 
+	if( getW3DTankTruckDrawModuleData() )
 	{
 		//Front tires
-		if( !getW3DTankTruckDrawModuleData()->m_frontLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTankTruckDrawModuleData()->m_frontLeftTireBoneName.isEmpty() )
 		{
 			m_frontLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_frontLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_frontLeftTireBone, ("Missing front-left tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_frontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
-			
+			DEBUG_ASSERTCRASH(m_frontLeftTireBone, ("Missing front-left tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_frontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+
 			m_frontRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_frontRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_frontRightTireBone, ("Missing front-right tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_frontRightTireBoneName.str(), getRenderObject()->Get_Name()));
-			
-			if (!m_frontRightTireBone ) 
+			DEBUG_ASSERTCRASH(m_frontRightTireBone, ("Missing front-right tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_frontRightTireBoneName.str(), getRenderObject()->Get_Name()));
+
+			if (!m_frontRightTireBone )
 			{
 				m_frontLeftTireBone = 0;
 			}
 		}
 		//Rear tires
-		if( !getW3DTankTruckDrawModuleData()->m_rearLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTankTruckDrawModuleData()->m_rearLeftTireBoneName.isEmpty() )
 		{
 			m_rearLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_rearLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_rearLeftTireBone, ("Missing rear-left tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_rearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_rearLeftTireBone, ("Missing rear-left tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_rearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
 
 			m_rearRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_rearRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_rearRightTireBone, ("Missing rear-left tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_rearRightTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_rearRightTireBone, ("Missing rear-left tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_rearRightTireBoneName.str(), getRenderObject()->Get_Name()));
 
-			if (!m_rearRightTireBone) 
+			if (!m_rearRightTireBone)
 			{
 				m_rearLeftTireBone = 0;
 			}
 		}
 
 		//midFront tires
-		if( !getW3DTankTruckDrawModuleData()->m_midFrontLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTankTruckDrawModuleData()->m_midFrontLeftTireBoneName.isEmpty() )
 		{
 			m_midFrontLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_midFrontLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midFrontLeftTireBone, ("Missing mid-front-left tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_midFrontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
-			
+			DEBUG_ASSERTCRASH(m_midFrontLeftTireBone, ("Missing mid-front-left tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_midFrontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+
 			m_midFrontRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_midFrontRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midFrontRightTireBone, ("Missing mid-front-right tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_midFrontRightTireBoneName.str(), getRenderObject()->Get_Name()));
-			
-			if (!m_midFrontRightTireBone ) 
+			DEBUG_ASSERTCRASH(m_midFrontRightTireBone, ("Missing mid-front-right tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_midFrontRightTireBoneName.str(), getRenderObject()->Get_Name()));
+
+			if (!m_midFrontRightTireBone )
 			{
 				m_midFrontLeftTireBone = 0;
 			}
 		}
 
 		//midRear tires
-		if( !getW3DTankTruckDrawModuleData()->m_midRearLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTankTruckDrawModuleData()->m_midRearLeftTireBoneName.isEmpty() )
 		{
 			m_midRearLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_midRearLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midRearLeftTireBone, ("Missing mid-rear-left tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_midRearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_midRearLeftTireBone, ("Missing mid-rear-left tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_midRearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
 
 			m_midRearRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTankTruckDrawModuleData()->m_midRearRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midRearRightTireBone, ("Missing mid-rear-right tire bone %s in model %s\n", getW3DTankTruckDrawModuleData()->m_midRearRightTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_midRearRightTireBone, ("Missing mid-rear-right tire bone %s in model %s", getW3DTankTruckDrawModuleData()->m_midRearRightTireBoneName.str(), getRenderObject()->Get_Name()));
 
-			if (!m_midRearRightTireBone) 
+			if (!m_midRearRightTireBone)
 			{
 				m_midRearLeftTireBone = 0;
 			}
@@ -414,7 +414,12 @@ void W3DTankTruckDraw::updateTreadPositions(Real uvDelta)
 		else
 		if (pTread->m_type == TREAD_RIGHT)	//this tread needs to scroll backwards
 			offset_u = pTread->m_materialSettings.customUVOffset.X - uvDelta;
-				
+		else
+		{
+			DEBUG_CRASH(("Unhandled case in W3DTankTruckDraw::updateTreadPositions"));
+			offset_u = 0.0f;
+		}
+
 		// ensure coordinates of offset are in [0, 1] range:
 		offset_u = offset_u - WWMath::Floor(offset_u);
 		pTread->m_materialSettings.customUVOffset.Set(offset_u,0);
@@ -422,7 +427,7 @@ void W3DTankTruckDraw::updateTreadPositions(Real uvDelta)
 	}
 }
 
-/**Grab pointers to the sub-meshes for each tread*/ 
+/**Grab pointers to the sub-meshes for each tread*/
 void W3DTankTruckDraw::updateTreadObjects(void)
 {
 	RenderObjClass *robj=getRenderObject();
@@ -434,7 +439,7 @@ void W3DTankTruckDraw::updateTreadObjects(void)
 
 	//Make sure this object has defined a speed for tread scrolling.
 	if (getW3DTankTruckDrawModuleData() && getW3DTankTruckDrawModuleData()->m_treadAnimationRate && robj)
-	{	
+	{
 		for (Int i=0; i < robj->Get_Num_Sub_Objects() && m_treadCount < MAX_TREADS_PER_TANK; i++)
 		{
 			RenderObjClass *subObj=robj->Get_Sub_Object(i);
@@ -483,8 +488,8 @@ void W3DTankTruckDraw::updateTreadObjects(void)
 //-------------------------------------------------------------------------------------------------
 void W3DTankTruckDraw::onRenderObjRecreated(void)
 {
-	//DEBUG_LOG(("Old obj %x, newObj %x, new bones %d, old bones %d\n",
-	//	m_prevRenderObj, getRenderObject(), getRenderObject()->Get_Num_Bones(), 
+	//DEBUG_LOG(("Old obj %x, newObj %x, new bones %d, old bones %d",
+	//	m_prevRenderObj, getRenderObject(), getRenderObject()->Get_Num_Bones(),
 	//	m_prevNumBones));
 	m_prevRenderObj = NULL;
 	m_frontLeftTireBone = 0;
@@ -510,9 +515,9 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 	if (!TheGlobalData->m_showClientPhysics)
 		return;
 
- 	Bool frozen = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
- 	frozen = frozen || TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript();
-	if (frozen)
+	// TheSuperHackers @tweak Update the draw on every WW Sync only.
+	// All calculations are originally catered to a 30 fps logic step.
+	if (WW3D::Get_Sync_Frame_Time() == 0)
 		return;
 
 	const Real ACCEL_THRESHOLD = 0.01f;
@@ -535,25 +540,21 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 	const Coord3D *vel = physics->getVelocity();
 	Real speed = physics->getVelocityMagnitude();
 
-
 	const TWheelInfo *wheelInfo = getDrawable()->getWheelInfo();	// note, can return null!
-	if (wheelInfo && (m_frontLeftTireBone || m_rearLeftTireBone)) 
+	if (wheelInfo && (m_frontLeftTireBone || m_rearLeftTireBone))
 	{
-		static Real rotation = 0;
 		const Real rotationFactor = getW3DTankTruckDrawModuleData()->m_rotationSpeedMultiplier;
+		const Real powerslideRotationAddition = getW3DTankTruckDrawModuleData()->m_powerslideRotationAddition * m_isPowersliding;
+
 		m_frontWheelRotation += rotationFactor*speed;
-		if (m_isPowersliding) 
-		{
-			m_rearWheelRotation += rotationFactor*(speed+getW3DTankTruckDrawModuleData()->m_powerslideRotationAddition);
-		} 
-		else 
-		{
-			m_rearWheelRotation += rotationFactor*speed;
-		}
+		m_rearWheelRotation += rotationFactor*(speed+powerslideRotationAddition);
+		m_frontWheelRotation = WWMath::Normalize_Angle(m_frontWheelRotation);
+		m_rearWheelRotation = WWMath::Normalize_Angle(m_rearWheelRotation);
+
 		Matrix3D wheelXfrm(1);
-		if (m_frontLeftTireBone) 
+		if (m_frontLeftTireBone)
 		{
-			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);		 
+			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_frontWheelRotation);
 			getRenderObject()->Capture_Bone( m_frontLeftTireBone );
@@ -564,25 +565,25 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_frontWheelRotation);
 			getRenderObject()->Capture_Bone( m_frontRightTireBone );
-			getRenderObject()->Control_Bone( m_frontRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_frontRightTireBone, wheelXfrm );
 		}
-		if (m_rearLeftTireBone) 
+		if (m_rearLeftTireBone)
 		{
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_rearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearLeftHeightOffset);
 			getRenderObject()->Capture_Bone( m_rearLeftTireBone );
-			getRenderObject()->Control_Bone( m_rearLeftTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_rearLeftTireBone, wheelXfrm );
 
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_rearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearRightHeightOffset);
 			getRenderObject()->Capture_Bone( m_rearRightTireBone );
-			getRenderObject()->Control_Bone( m_rearRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_rearRightTireBone, wheelXfrm );
 		}
-		if (m_midFrontLeftTireBone) 
+		if (m_midFrontLeftTireBone)
 		{
-			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);		 
+			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_midFrontWheelRotation);
 			getRenderObject()->Capture_Bone( m_midFrontLeftTireBone );
@@ -593,21 +594,21 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_midFrontWheelRotation);
 			getRenderObject()->Capture_Bone( m_midFrontRightTireBone );
-			getRenderObject()->Control_Bone( m_midFrontRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midFrontRightTireBone, wheelXfrm );
 		}
-		if (m_midRearLeftTireBone) 
+		if (m_midRearLeftTireBone)
 		{
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_midRearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearLeftHeightOffset);
 			getRenderObject()->Capture_Bone( m_midRearLeftTireBone );
-			getRenderObject()->Control_Bone( m_midRearLeftTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midRearLeftTireBone, wheelXfrm );
 
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_midRearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearRightHeightOffset);
 			getRenderObject()->Capture_Bone( m_midRearRightTireBone );
-			getRenderObject()->Control_Bone( m_midRearRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midRearRightTireBone, wheelXfrm );
 		}
 	}
 
@@ -618,7 +619,7 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 		Coord3D accel = *physics->getAcceleration();
 		accel.z = 0; // ignore gravitational force.
 		Bool accelerating = accel.length()>ACCEL_THRESHOLD;
-		//DEBUG_LOG(("Accel %f, speed %f\n", accel.length(), speed));
+		//DEBUG_LOG(("Accel %f, speed %f", accel.length(), speed));
 		if (accelerating)	{
 			Real dot = accel.x*vel->x + accel.y*vel->y;
 			if (dot<0) {
@@ -630,7 +631,7 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			if (speed>SIZE_CAP) {
 				speed = SIZE_CAP;
 			}
-			m_dustEffect->setSizeMultiplier(speed);	 
+			m_dustEffect->setSizeMultiplier(speed);
 		}
 		if (m_dirtEffect) {
 			if (wheelInfo && wheelInfo->m_framesAirborne>3) {
@@ -643,7 +644,7 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			} else {
 				if (!accelerating || speed>2.0f) {
 					m_dirtEffect->stop();
-				}	
+				}
 			}
 		}
 		if (m_powerslideEffect) {
@@ -657,7 +658,7 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 		if (m_dirtEffect) {
 			if (!accelerating || speed>2.0f) {
 				m_dirtEffect->stop();
-			}	
+			}
 		}
 	}
 	else
@@ -750,7 +751,7 @@ void W3DTankTruckDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -770,7 +771,7 @@ void W3DTankTruckDraw::xfer( Xfer *xfer )
 
 	// John A and Mark W say there is no data to save here
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -784,4 +785,4 @@ void W3DTankTruckDraw::loadPostProcess( void )
 	// toss any existing ones (no need to re-create; we'll do that on demand)
 	tossEmitters();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp
index f1a6695842b..8398f8c0ece 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTracerDraw.cpp
@@ -41,11 +41,6 @@
 #include "WW3D2/line3d.h"
 #include "W3DDevice/GameClient/W3DScene.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -66,13 +61,13 @@ W3DTracerDraw::W3DTracerDraw( Thing *thing, const ModuleData* moduleData ) : Dra
 	m_speedInDistPerFrame = 1.0f;
 	m_theTracer = NULL;
 
-}  // end W3DTracerDraw
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 void W3DTracerDraw::setTracerParms(Real speed, Real length, Real width, const RGBColor& color, Real initialOpacity)
-{ 
-	m_speedInDistPerFrame = speed; 
+{
+	m_speedInDistPerFrame = speed;
 	m_length = length;
 	m_width = width;
 	m_color = color;
@@ -102,8 +97,8 @@ W3DTracerDraw::~W3DTracerDraw( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DTracerDraw::reactToTransformChange( const Matrix3D *oldMtx, 
-																							 const Coord3D *oldPos, 
+void W3DTracerDraw::reactToTransformChange( const Matrix3D *oldMtx,
+																							 const Coord3D *oldPos,
 																							 Real oldAngle )
 {
 	if( m_theTracer )
@@ -165,7 +160,7 @@ void W3DTracerDraw::crc( Xfer *xfer )
 	// extend base class
 	DrawModule::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -185,7 +180,7 @@ void W3DTracerDraw::xfer( Xfer *xfer )
 
 	// no data to save here, nobody will ever notice
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -196,4 +191,4 @@ void W3DTracerDraw::loadPostProcess( void )
 	// extend base class
 	DrawModule::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
index 225485730ec..49625d66289 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: W3DTruckDraw.cpp 
+// FILE: W3DTruckDraw.cpp
 // Draw Trucks.  Actually, this draws rocket buggies.
 // Author: John Ahlquist, March 2002
 
@@ -49,14 +49,9 @@
 #include "W3DDevice/GameClient/W3DGameClient.h"
 #include "W3DDevice/GameClient/Module/W3DTruckDraw.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
-W3DTruckDrawModuleData::W3DTruckDrawModuleData() 
+W3DTruckDrawModuleData::W3DTruckDrawModuleData()
 {
 }
 
@@ -66,11 +61,11 @@ W3DTruckDrawModuleData::~W3DTruckDrawModuleData()
 }
 
 //-------------------------------------------------------------------------------------------------
-void W3DTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p) 
+void W3DTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 {
   W3DModelDrawModuleData::buildFieldParse(p);
 
-	static const FieldParse dataFieldParse[] = 
+	static const FieldParse dataFieldParse[] =
 	{
 		{ "Dust", INI::parseAsciiString, NULL, offsetof(W3DTruckDrawModuleData, m_dustEffectName) },
 		{ "DirtSpray", INI::parseAsciiString, NULL, offsetof(W3DTruckDrawModuleData, m_dirtEffectName) },
@@ -104,20 +99,20 @@ void W3DTruckDrawModuleData::buildFieldParse(MultiIniFieldParse& p)
 //-------------------------------------------------------------------------------------------------
 W3DTruckDraw::W3DTruckDraw( Thing *thing, const ModuleData* moduleData ) : W3DModelDraw( thing, moduleData ),
 m_dirtEffect(NULL), m_dustEffect(NULL), m_powerslideEffect(NULL), m_effectsInitialized(false),
-m_wasAirborne(false), m_isPowersliding(false), 
+m_wasAirborne(false), m_isPowersliding(false),
 m_frontWheelRotation(0), m_rearWheelRotation(0), m_midFrontWheelRotation(0), m_midRearWheelRotation(0),
 m_frontRightTireBone(0), m_frontLeftTireBone(0), m_rearLeftTireBone(0),m_rearRightTireBone(0),
 m_midFrontRightTireBone(0), m_midFrontLeftTireBone(0), m_midRearLeftTireBone(0),m_midRearRightTireBone(0),
 m_midMidRightTireBone(0), m_midMidLeftTireBone(0), m_prevRenderObj(NULL)
-{	 
+{
 	const AudioEventRTS * event;
 	event = thing->getTemplate()->getPerUnitSound("TruckLandingSound");
 	if (event) {
-		m_landingSound = *event; 
+		m_landingSound = *event;
 	}
 	event = thing->getTemplate()->getPerUnitSound("TruckPowerslideSound");
 	if (event) {
-		m_powerslideSound = *event; 
+		m_powerslideSound = *event;
 	}
 }
 
@@ -190,12 +185,12 @@ void W3DTruckDraw::createEmitters( void )
 				m_dustEffect->setSaveable(FALSE);
 			}	else {
 				if (!getW3DTruckDrawModuleData()->m_dustEffectName.isEmpty()) {
-					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'\n", 
+					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'",
 						getW3DTruckDrawModuleData()->m_dustEffectName.str(), getDrawable()->getObject()->getTemplate()->getName().str()));
 				}
 			}
 
-		}	 
+		}
 		if (!m_dirtEffect) {
 			sysTemplate = TheParticleSystemManager->findTemplate(getW3DTruckDrawModuleData()->m_dirtEffectName);
 			if (sysTemplate)
@@ -206,7 +201,7 @@ void W3DTruckDraw::createEmitters( void )
 				m_dirtEffect->setSaveable(FALSE);
 			}	else {
 				if (!getW3DTruckDrawModuleData()->m_dirtEffectName.isEmpty()) {
-					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'\n", 
+					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'",
 						getW3DTruckDrawModuleData()->m_dirtEffectName.str(), getDrawable()->getObject()->getTemplate()->getName().str()));
 				}
 			}
@@ -221,13 +216,13 @@ void W3DTruckDraw::createEmitters( void )
 				m_powerslideEffect->setSaveable(FALSE);
 			}	else {
 				if (!getW3DTruckDrawModuleData()->m_powerslideEffectName.isEmpty()) {
-					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'\n", 
+					DEBUG_LOG(("*** ERROR - Missing particle system '%s' in thing '%s'",
 						getW3DTruckDrawModuleData()->m_powerslideEffectName.str(), getDrawable()->getObject()->getTemplate()->getName().str()));
 				}
 			}
 		}
 	}
-	
+
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -239,112 +234,112 @@ void W3DTruckDraw::enableEmitters( Bool enable  )
 {
 	// don't check... if we are hidden the first time thru, then we'll never create the emitters.
 	// eg, if we are loading a game and the unit is in a tunnel, he'll never get emitteres even when he exits.
-	//if (!m_effectsInitialized) 
+	//if (!m_effectsInitialized)
 	{
 		createEmitters();
 		m_effectsInitialized=true;
 	}
 	if (m_dustEffect)
 	{
-		if (enable) 
+		if (enable)
 			m_dustEffect->start();
 		else
 			m_dustEffect->stop();
 	}
 	if (m_dirtEffect)
 	{
-		if (enable) 
+		if (enable)
 			m_dirtEffect->start();
 		else
 			m_dirtEffect->stop();
 	}
 	if (m_powerslideEffect)
 	{
-		if (!enable) 
+		if (!enable)
 			m_powerslideEffect->stop();
 	}
 }
 //-------------------------------------------------------------------------------------------------
-void W3DTruckDraw::updateBones( void ) 
+void W3DTruckDraw::updateBones( void )
 {
-	if( getW3DTruckDrawModuleData() ) 
+	if( getW3DTruckDrawModuleData() )
 	{
 		//Front tires
-		if( !getW3DTruckDrawModuleData()->m_frontLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_frontLeftTireBoneName.isEmpty() )
 		{
 			m_frontLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_frontLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_frontLeftTireBone, ("Missing front-left tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_frontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_frontLeftTireBone, ("Missing front-left tire bone %s in model %s", getW3DTruckDrawModuleData()->m_frontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
 		}
 
 		if( !getW3DTruckDrawModuleData()->m_frontRightTireBoneName.isEmpty() )
 		{
 			m_frontRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_frontRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_frontRightTireBone, ("Missing front-right tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_frontRightTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_frontRightTireBone, ("Missing front-right tire bone %s in model %s", getW3DTruckDrawModuleData()->m_frontRightTireBoneName.str(), getRenderObject()->Get_Name()));
 		}
 
 		//Rear tires
-		if( !getW3DTruckDrawModuleData()->m_rearLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_rearLeftTireBoneName.isEmpty() )
 		{
 			m_rearLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_rearLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_rearLeftTireBone, ("Missing rear-left tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_rearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_rearLeftTireBone, ("Missing rear-left tire bone %s in model %s", getW3DTruckDrawModuleData()->m_rearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
 		}
 
-		if( !getW3DTruckDrawModuleData()->m_rearRightTireBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_rearRightTireBoneName.isEmpty() )
 		{
 			m_rearRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_rearRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_rearRightTireBone, ("Missing rear-left tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_rearRightTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_rearRightTireBone, ("Missing rear-left tire bone %s in model %s", getW3DTruckDrawModuleData()->m_rearRightTireBoneName.str(), getRenderObject()->Get_Name()));
 		}
 
 		//midFront tires
-		if( !getW3DTruckDrawModuleData()->m_midFrontLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_midFrontLeftTireBoneName.isEmpty() )
 		{
 			m_midFrontLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_midFrontLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midFrontLeftTireBone, ("Missing mid-front-left tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_midFrontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
-			
+			DEBUG_ASSERTCRASH(m_midFrontLeftTireBone, ("Missing mid-front-left tire bone %s in model %s", getW3DTruckDrawModuleData()->m_midFrontLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+
 			m_midFrontRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_midFrontRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midFrontRightTireBone, ("Missing mid-front-right tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_midFrontRightTireBoneName.str(), getRenderObject()->Get_Name()));
-			
-			if (!m_midFrontRightTireBone ) 
+			DEBUG_ASSERTCRASH(m_midFrontRightTireBone, ("Missing mid-front-right tire bone %s in model %s", getW3DTruckDrawModuleData()->m_midFrontRightTireBoneName.str(), getRenderObject()->Get_Name()));
+
+			if (!m_midFrontRightTireBone )
 			{
 				m_midFrontLeftTireBone = 0;
 			}
 		}
 
 		//midRear tires
-		if( !getW3DTruckDrawModuleData()->m_midRearLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_midRearLeftTireBoneName.isEmpty() )
 		{
 			m_midRearLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_midRearLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midRearLeftTireBone, ("Missing mid-rear-left tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_midRearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_midRearLeftTireBone, ("Missing mid-rear-left tire bone %s in model %s", getW3DTruckDrawModuleData()->m_midRearLeftTireBoneName.str(), getRenderObject()->Get_Name()));
 
 			m_midRearRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_midRearRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midRearRightTireBone, ("Missing mid-rear-right tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_midRearRightTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_midRearRightTireBone, ("Missing mid-rear-right tire bone %s in model %s", getW3DTruckDrawModuleData()->m_midRearRightTireBoneName.str(), getRenderObject()->Get_Name()));
 
-			if (!m_midRearRightTireBone) 
+			if (!m_midRearRightTireBone)
 			{
 				m_midRearLeftTireBone = 0;
 			}
 		}
 
 		//midMid tires
-		if( !getW3DTruckDrawModuleData()->m_midMidLeftTireBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_midMidLeftTireBoneName.isEmpty() )
 		{
 			m_midMidLeftTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_midMidLeftTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midMidLeftTireBone, ("Missing mid-mid-left tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_midMidLeftTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_midMidLeftTireBone, ("Missing mid-mid-left tire bone %s in model %s", getW3DTruckDrawModuleData()->m_midMidLeftTireBoneName.str(), getRenderObject()->Get_Name()));
 
 			m_midMidRightTireBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_midMidRightTireBoneName.str());
-			DEBUG_ASSERTCRASH(m_midMidRightTireBone, ("Missing mid-mid-right tire bone %s in model %s\n", getW3DTruckDrawModuleData()->m_midMidRightTireBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_midMidRightTireBone, ("Missing mid-mid-right tire bone %s in model %s", getW3DTruckDrawModuleData()->m_midMidRightTireBoneName.str(), getRenderObject()->Get_Name()));
 
-			if (!m_midMidRightTireBone) 
+			if (!m_midMidRightTireBone)
 			{
 				m_midMidLeftTireBone = 0;
 			}
 		}
 
 		//Cab
-		if( !getW3DTruckDrawModuleData()->m_cabBoneName.isEmpty() ) 
+		if( !getW3DTruckDrawModuleData()->m_cabBoneName.isEmpty() )
 		{
 			m_cabBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_cabBoneName.str());
-			DEBUG_ASSERTCRASH(m_cabBone, ("Missing cab bone %s in model %s\n", getW3DTruckDrawModuleData()->m_cabBoneName.str(), getRenderObject()->Get_Name()));
+			DEBUG_ASSERTCRASH(m_cabBone, ("Missing cab bone %s in model %s", getW3DTruckDrawModuleData()->m_cabBoneName.str(), getRenderObject()->Get_Name()));
 			m_trailerBone = getRenderObject()->Get_Bone_Index(getW3DTruckDrawModuleData()->m_trailerBoneName.str());
 		}
 	}
@@ -366,8 +361,8 @@ void W3DTruckDraw::setHidden(Bool h)
 //-------------------------------------------------------------------------------------------------
 void W3DTruckDraw::onRenderObjRecreated(void)
 {
-	//DEBUG_LOG(("Old obj %x, newObj %x, new bones %d, old bones %d\n",
-	//	m_prevRenderObj, getRenderObject(), getRenderObject()->Get_Num_Bones(), 
+	//DEBUG_LOG(("Old obj %x, newObj %x, new bones %d, old bones %d",
+	//	m_prevRenderObj, getRenderObject(), getRenderObject()->Get_Num_Bones(),
 	//	m_prevNumBones));
 	m_prevRenderObj = NULL;
 	m_frontLeftTireBone = 0;
@@ -393,12 +388,14 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 
 	if (!TheGlobalData->m_showClientPhysics)
 		return;
+
 	const W3DTruckDrawModuleData *moduleData = getW3DTruckDrawModuleData();
-	if (moduleData==NULL) return; // shouldn't ever happen.
+	if (moduleData==NULL)
+		return; // shouldn't ever happen.
 
- 	Bool frozen = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
- 	frozen = frozen || TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript();
-	if (frozen)
+	// TheSuperHackers @tweak Update the draw on every WW Sync only.
+	// All calculations are originally catered to a 30 fps logic step.
+	if (WW3D::Get_Sync_Frame_Time() == 0)
 		return;
 
 	const Real ACCEL_THRESHOLD = 0.01f;
@@ -410,10 +407,10 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 
 	if (getRenderObject()==NULL) return;
 	if (getRenderObject() != m_prevRenderObj) {
-		DEBUG_LOG(("W3DTruckDraw::doDrawModule - shouldn't update bones. jba\n"));
+		DEBUG_LOG(("W3DTruckDraw::doDrawModule - shouldn't update bones. jba"));
 		updateBones();
 	}
-	
+
 	// get object physics state
 	PhysicsBehavior *physics = obj->getPhysics();
 	if (physics == NULL)
@@ -426,7 +423,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 	AIUpdateInterface *ai = obj->getAI();
 	if (m_cabBone && wheelInfo) {
 		Matrix3D cabXfrm(1);
-		cabXfrm.Make_Identity();		 
+		cabXfrm.Make_Identity();
 		Real desiredAngle = wheelInfo->m_wheelAngle*moduleData->m_cabRotationFactor;
 
 		// Check goal angle.
@@ -444,7 +441,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 				if (desiredAngle<0) desiredAngle = 0;
 			}
 			//DEBUG_LOG(("final desired %f ", 180*desiredAngle/PI));
-		}	
+		}
 
 		Real deltaAngle = desiredAngle - m_curCabRotation;
 		deltaAngle *= moduleData->m_rotationDampingFactor;
@@ -464,9 +461,11 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 		}
 	}
 
-	if (m_frontLeftTireBone || m_rearLeftTireBone) 
+	if (m_frontLeftTireBone || m_rearLeftTireBone)
 	{
-		Real powerslideRotationAddition = moduleData->m_powerslideRotationAddition;
+		const Real rotationFactor = moduleData->m_rotationSpeedMultiplier;
+		Real powerslideRotationAddition = moduleData->m_powerslideRotationAddition * m_isPowersliding;
+
 		if (ai) {
 			Locomotor *loco = ai->getCurLocomotor();
 			if (loco) {
@@ -476,16 +475,11 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 				}
 			}
 		}
-		const Real rotationFactor = moduleData->m_rotationSpeedMultiplier;
+
 		m_frontWheelRotation += rotationFactor*speed;
-		if (m_isPowersliding) 
-		{
-			m_rearWheelRotation += rotationFactor*(speed + powerslideRotationAddition);
-		} 
-		else 
-		{
-			m_rearWheelRotation += rotationFactor*speed;
-		}
+		m_rearWheelRotation += rotationFactor*(speed + powerslideRotationAddition);
+		m_frontWheelRotation = WWMath::Normalize_Angle(m_frontWheelRotation);
+		m_rearWheelRotation = WWMath::Normalize_Angle(m_rearWheelRotation);
 
 		// For now, just use the same values for mid wheels -- may want to do independent calcs later...
 		m_midFrontWheelRotation = m_frontWheelRotation;
@@ -495,10 +489,10 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 
 
 
-		if (m_frontLeftTireBone && wheelInfo) 
+		if (m_frontLeftTireBone && wheelInfo)
 		{
 			wheelXfrm.Make_Identity();
-			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);		 
+			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_frontWheelRotation);
 			getRenderObject()->Capture_Bone( m_frontLeftTireBone );
@@ -510,15 +504,15 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_frontWheelRotation);
 			getRenderObject()->Capture_Bone( m_frontRightTireBone );
-			getRenderObject()->Control_Bone( m_frontRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_frontRightTireBone, wheelXfrm );
 		}
-		if (m_rearLeftTireBone && wheelInfo) 
+		if (m_rearLeftTireBone && wheelInfo)
 		{
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_rearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearLeftHeightOffset);
 			getRenderObject()->Capture_Bone( m_rearLeftTireBone );
-			getRenderObject()->Control_Bone( m_rearLeftTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_rearLeftTireBone, wheelXfrm );
 
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_rearWheelRotation);
@@ -527,12 +521,12 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			//@todo TROUBLE HERE, THE BONE INDICES DO NOT MATCH THE RENDEROBJECTS BONES, SOMETIMES
 
 			getRenderObject()->Capture_Bone( m_rearRightTireBone );
-			getRenderObject()->Control_Bone( m_rearRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_rearRightTireBone, wheelXfrm );
 		}
-		if (m_midFrontLeftTireBone && wheelInfo) 
+		if (m_midFrontLeftTireBone && wheelInfo)
 		{
 			wheelXfrm.Make_Identity();
-			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);		 
+			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_frontLeftHeightOffset);
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_midFrontWheelRotation);
 			getRenderObject()->Capture_Bone( m_midFrontLeftTireBone );
@@ -543,35 +537,35 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			wheelXfrm.Rotate_Z(wheelInfo->m_wheelAngle);
 			wheelXfrm.Rotate_Y(m_midFrontWheelRotation);
 			getRenderObject()->Capture_Bone( m_midFrontRightTireBone );
-			getRenderObject()->Control_Bone( m_midFrontRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midFrontRightTireBone, wheelXfrm );
 		}
-		if (m_midRearLeftTireBone && wheelInfo) 
+		if (m_midRearLeftTireBone && wheelInfo)
 		{
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_midRearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearLeftHeightOffset);
 			getRenderObject()->Capture_Bone( m_midRearLeftTireBone );
-			getRenderObject()->Control_Bone( m_midRearLeftTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midRearLeftTireBone, wheelXfrm );
 
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_midRearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearRightHeightOffset);
 			getRenderObject()->Capture_Bone( m_midRearRightTireBone );
-			getRenderObject()->Control_Bone( m_midRearRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midRearRightTireBone, wheelXfrm );
 		}
-		if (m_midMidLeftTireBone && wheelInfo) 
+		if (m_midMidLeftTireBone && wheelInfo)
 		{
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_midRearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearLeftHeightOffset);
 			getRenderObject()->Capture_Bone( m_midMidLeftTireBone );
-			getRenderObject()->Control_Bone( m_midMidLeftTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midMidLeftTireBone, wheelXfrm );
 
 			wheelXfrm.Make_Identity();
 			wheelXfrm.Rotate_Y(m_midRearWheelRotation);
 			wheelXfrm.Adjust_Z_Translation(wheelInfo->m_rearRightHeightOffset);
 			getRenderObject()->Capture_Bone( m_midMidRightTireBone );
-			getRenderObject()->Control_Bone( m_midMidRightTireBone, wheelXfrm );	
+			getRenderObject()->Control_Bone( m_midMidRightTireBone, wheelXfrm );
 		}
 	}
 
@@ -582,7 +576,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 		Coord3D accel = *physics->getAcceleration();
 		accel.z = 0; // ignore gravitational force.
 		Bool accelerating = accel.length()>ACCEL_THRESHOLD;
-		//DEBUG_LOG(("Accel %f, speed %f\n", accel.length(), speed));
+		//DEBUG_LOG(("Accel %f, speed %f", accel.length(), speed));
 		if (accelerating)	{
 			Real dot = accel.x*vel->x + accel.y*vel->y;
 			if (dot<0) {
@@ -594,7 +588,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			if (speed>SIZE_CAP) {
 				speed = SIZE_CAP;
 			}
-			m_dustEffect->setSizeMultiplier(speed);	 
+			m_dustEffect->setSizeMultiplier(speed);
 		}
 		if (m_dirtEffect) {
 			if (wheelInfo && wheelInfo->m_framesAirborne>3) {
@@ -607,7 +601,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			} else {
 				if (!accelerating || speed>2.0f) {
 					m_dirtEffect->stop();
-				}	
+				}
 			}
 		}
 		if (m_powerslideEffect) {
@@ -621,7 +615,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 		if (m_dirtEffect) {
 			if (!accelerating || speed>2.0f) {
 				m_dirtEffect->stop();
-			}	
+			}
 		}
 	}
 	else
@@ -648,7 +642,7 @@ void W3DTruckDraw::crc( Xfer *xfer )
 	// extend base class
 	W3DModelDraw::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -668,7 +662,7 @@ void W3DTruckDraw::xfer( Xfer *xfer )
 
 	// John A and Mark W say there is no data to save here
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -682,4 +676,4 @@ void W3DTruckDraw::loadPostProcess( void )
 	// toss any existing ones (no need to re-create; we'll do that on demand)
 	tossEmitters();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
index 383df79c0e0..5cf8d3c4f63 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
@@ -26,6 +26,7 @@
 // Author: Colin Day
 // Desc: Control bar callbacks
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/Radar.h"
 #include "Common/Player.h"
@@ -39,11 +40,6 @@
 #include "GameClient/ControlBarScheme.h"
 #include "GameClient/MapUtil.h"
 #include "GameLogic/GameLogic.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 void W3DCameoMovieDraw( GameWindow *window, WinInstanceData *instData )
@@ -58,15 +54,13 @@ void W3DCameoMovieDraw( GameWindow *window, WinInstanceData *instData )
 
 		TheDisplay->drawVideoBuffer( video, pos.x, pos.y, pos.x + size.x, pos.y + size.y );
 	}
-}  // end W3DLeftHUDDraw
+}
 
 
 //-------------------------------------------------------------------------------------------------
 void W3DLeftHUDDraw( GameWindow *window, WinInstanceData *instData )
 {
 	// draw the default stuff
-//
-	Player *player = ThePlayerList->getLocalPlayer();
 	// draw video buffer
 	VideoBuffer *video = TheInGameUI->videoBuffer();
 	if ( video )
@@ -77,7 +71,7 @@ void W3DLeftHUDDraw( GameWindow *window, WinInstanceData *instData )
 
 		TheDisplay->drawVideoBuffer( video, pos.x, pos.y, pos.x + size.x, pos.y + size.y );
 	}
-	else if( TheRadar->isRadarForced() || ( TheRadar->isRadarHidden() == false && player->hasRadar() ) )
+	else if( rts::localPlayerHasRadar() )
 	{
 		ICoord2D pos, size;
 		//W3DGameWinDefaultDraw( window, instData );
@@ -88,10 +82,8 @@ void W3DLeftHUDDraw( GameWindow *window, WinInstanceData *instData )
 		// draw the radar on the screen now
 		TheRadar->draw( pos.x + 1, pos.y + 1, size.x - 2, size.y - 2 );
 
-	}  // end else if
-
-
-}  // end W3DLeftHUDDraw
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -101,8 +93,8 @@ void W3DRightHUDDraw( GameWindow *window, WinInstanceData *instData )
 	// draw the default stuff
 	if( BitIsSet(window->winGetStatus(), WIN_STATUS_IMAGE ))
 		W3DGameWinDefaultDraw( window, instData );
-	
-}  // end W3DRightHUDDraw
+
+}
 
 Real logN(Real value, Real logBase)
 {
@@ -130,15 +122,7 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
 	//const Image *beginBar = NULL;
 	const Image *centerBar = NULL;
 	static const Image *slider = TheMappedImageCollection->findImageByName("PowerBarSlider");
-	Player *player = NULL;
-	if(TheControlBar->isObserverControlBarOn())
-	{
-		player = TheControlBar->getObserverLookAtPlayer();
-	}
-	else
-		player = ThePlayerList->getLocalPlayer();
-	
-
+	Player* player = TheControlBar->getCurrentlyViewedPlayer();
 
 	if(!player || !TheGlobalData)
 		return;
@@ -147,7 +131,7 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
 		return;
 
 	Int consumption = energy->getConsumption();
-	Int production = energy->getProduction();	
+	Int production = energy->getProduction();
 
 	ICoord2D pos, size;
 	window->winGetScreenPosition( &pos.x, &pos.y );
@@ -155,7 +139,7 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
 
 	static Real pixelsPerInterval = size.x / TheGlobalData->m_powerBarIntervals;
 	Int delta = TheGlobalData->m_powerBarYellowRange;
-	
+
 	if((consumption > energy->getProduction() - delta) && (consumption <= energy->getProduction()))
 	{
 		// 6 and 1 is Green, 6 and 2 is yellow, 6 and 6 is yellow
@@ -207,10 +191,10 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
 
 	// get width we have to draw our repeating center in
 	centerWidth = range; //rightStart.x - leftEnd.x;
-	
+
 	if( centerWidth > 0)
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerBar->getImageWidth();
 		ICoord2D start, end;
@@ -222,12 +206,12 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
 		{
 
 			end.x = start.x + centerBar->getImageWidth();
-			TheWindowManager->winDrawImage( centerBar, 
+			TheWindowManager->winDrawImage( centerBar,
 																			start.x, start.y,
 																			end.x, end.y );
 			start.x += centerBar->getImageWidth();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -297,15 +281,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 	const Image *beginBar = NULL;
 	const Image *centerBar = NULL;
 	static const Image *slider = TheMappedImageCollection->findImageByName("PowerBarSlider");
-	Player *player = NULL;
-	if(TheControlBar->isObserverControlBarOn())
-	{
-		player = TheControlBar->getObserverLookAtPlayer();
-	}
-	else
-		player = ThePlayerList->getLocalPlayer();
-	
-
+	Player* player = TheControlBar->getCurrentlyViewedPlayer();
 
 	if(!player || !TheGlobalData)
 		return;
@@ -314,7 +290,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 		return;
 
 	Int consumption = energy->getConsumption();
-	Int production = energy->getProduction();	
+	Int production = energy->getProduction();
 
 	ICoord2D pos, size;
 	window->winGetScreenPosition( &pos.x, &pos.y );
@@ -322,7 +298,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 
 	static Real pixelsPerInterval = size.x / TheGlobalData->m_powerBarIntervals;
 	Int delta = TheGlobalData->m_powerBarYellowRange;
-	
+
 	if((consumption > energy->getProduction() - delta) && (consumption <= energy->getProduction()))
 	{
 		// 6 and 1 is Green, 6 and 2 is yellow, 6 and 6 is yellow
@@ -374,7 +350,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 
 	// get width we have to draw our repeating center in
 	centerWidth = rightStart.x - leftEnd.x;
-	
+
 	if( centerWidth <= 0)
 	{
 		// draw left end
@@ -393,7 +369,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 	}
 	else
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerBar->getImageWidth();
 
@@ -405,12 +381,12 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 		{
 
 			end.x = start.x + centerBar->getImageWidth();
-			TheWindowManager->winDrawImage( centerBar, 
+			TheWindowManager->winDrawImage( centerBar,
 																			start.x, start.y,
 																			end.x, end.y );
 			start.x += centerBar->getImageWidth();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -474,7 +450,7 @@ void W3DCommandBarGridDraw( GameWindow *window, WinInstanceData *instData )
 	ICoord2D pos, size;
 	window->winGetScreenPosition( &pos.x, &pos.y );
 	window->winGetSize( &size.x, &size.y );
-		
+
 	Color color = TheControlBar->getBorderColor();
 	window->winSetEnabledBorderColor(0, color);
 	W3DGameWinDefaultDraw( window, instData );
@@ -484,16 +460,19 @@ void W3DCommandBarGridDraw( GameWindow *window, WinInstanceData *instData )
 	TheDisplay->drawLine(pos.x + size.x * .33, pos.y, pos.x + size.x *.33, pos.y +size.y, 1,color);
 	TheDisplay->drawLine(pos.x + size.x  * .66, pos.y, pos.x + size.x *.66, pos.y + size.y, 1,color);
 
-	
+
 
 
 }
 
 void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
 {
-	Player *player = ThePlayerList->getLocalPlayer();
-	if(!player->isPlayerActive())
+	// TheSuperHackers @bugfix Stubbjax 08/08/2025 Show the experience bar for observers
+	Player* player = TheControlBar->getCurrentlyViewedPlayer();
+
+	if (!player)
 		return;
+
 	static const Image *endBar = TheMappedImageCollection->findImageByName("GenExpBarTop1");
 	static const Image *beginBar = TheMappedImageCollection->findImageByName("GenExpBarBottom1");
 	static const Image *centerBar = TheMappedImageCollection->findImageByName("GenExpBar1");
@@ -505,7 +484,7 @@ void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
 	{
 		progress = ( ((player->getSkillPoints() - player->getSkillPointsLevelDown()) * 100) / skillPointsRequired );
 	}
-	
+
 	if(progress <= 0)
 		return;
 
@@ -547,7 +526,7 @@ void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
 
 	// get width we have to draw our repeating center in
 	centerWidth = bottomEnd.y - topStart.y;
-	
+
 	if( centerWidth <= 0)
 	{
 		// draw left end
@@ -566,7 +545,7 @@ void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
 	}
 	else
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerBar->getImageHeight();
 
@@ -578,12 +557,12 @@ void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
 		{
 
 			end.y = start.y + centerBar->getImageHeight();
-			TheWindowManager->winDrawImage( centerBar, 
+			TheWindowManager->winDrawImage( centerBar,
 																			start.x, start.y,
 																			end.x, end.y );
 			start.y += centerBar->getImageHeight();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -624,7 +603,7 @@ void W3DCommandBarTopDraw( GameWindow *window, WinInstanceData *instData )
 	GameWindow *win = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonGeneral"));
 	if(!win || win->winIsHidden() || !ThePlayerList->getLocalPlayer()->isPlayerActive())
 		return;
-	
+
 //	TheControlBar->drawTransitionHandler();
 
 //	ICoord2D pos, size, imageStart, imageEnd;
@@ -645,13 +624,13 @@ void W3DCommandBarBackgroundDraw( GameWindow *window, WinInstanceData *instData
 	ControlBarSchemeManager *man = TheControlBar->getControlBarSchemeManager();
 	if(!man)
 		return;
-	static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) );
+	static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" );
 	GameWindow *win =  TheWindowManager->winGetWindowFromId(NULL,winNamekey);
 	static ICoord2D basePos;
 	if(!win)
 	{
 		return;
-		//win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ));
+		//win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ));
 	}
 	TheControlBar->getBackgroundMarkerPos(&basePos.x, &basePos.y);
 	ICoord2D pos, offset;
@@ -670,13 +649,13 @@ void W3DCommandBarForegroundDraw( GameWindow *window, WinInstanceData *instData
 	if(!man)
 		return;
 
-	static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) );
+	static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" );
 	GameWindow *win = TheWindowManager->winGetWindowFromId(NULL,winNamekey);
 	static ICoord2D basePos;
 	if(!win)
 	{
 		return;
-		//win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ));
+		//win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ));
 	}
 	TheControlBar->getForegroundMarkerPos(&basePos.x, &basePos.y);
 	ICoord2D pos, offset;
@@ -693,8 +672,8 @@ void W3DNoDraw( GameWindow *window, WinInstanceData *instData )
 
 	// draw the default stuff
 //	W3DGameWinDefaultDraw( window, instData );
-	
-}  // end W3DRightHUDDraw
+
+}
 
 void drawSkinnyBorder( Int x, Int y, Int width, Int height);
 void W3DDrawMapPreview( GameWindow *window, WinInstanceData *instData)
@@ -710,10 +689,10 @@ void W3DDrawMapPreview( GameWindow *window, WinInstanceData *instData)
 		drawSkinnyBorder(pixelX - 1, pixelY - 1, width + 2, height + 2);
 		return;
 	}
-	
-	
-	
-		
+
+
+
+
 	//
 	// given a upper left corner at pixelX|Y and a width and height to draw into, figure out
 	// where we should start and end the image so that the final drawn image has the
@@ -728,17 +707,17 @@ void W3DDrawMapPreview( GameWindow *window, WinInstanceData *instData)
 	// draw black border areas where we need map
 	Color fillColor = GameMakeColor( 0, 0, 0, 255 );
 	Color lineColor = GameMakeColor( 50, 50, 50, 255 );
-	
+
 	if( mmData->m_extent.width()/width >= mmData->m_extent.height()/height )
 	{
-		
+
 		// draw horizontal bars at top and bottom
 		TheDisplay->drawFillRect( pixelX, pixelY, width, ul.y - pixelY - 1, fillColor );
 		TheDisplay->drawFillRect( pixelX, lr.y + 1, width, pixelY + height - lr.y - 1, fillColor);
 		TheDisplay->drawLine(pixelX, ul.y, pixelX + width, ul.y, 1, lineColor);
 		TheDisplay->drawLine(pixelX, lr.y + 1, pixelX + width, lr.y + 1, 1, lineColor);
 
-	}  // end if
+	}
 	else
 	{
 
@@ -748,7 +727,7 @@ void W3DDrawMapPreview( GameWindow *window, WinInstanceData *instData)
 		TheDisplay->drawLine(ul.x, pixelY, ul.x, pixelY + height, 1, lineColor);
 		TheDisplay->drawLine(lr.x + 1, pixelY, lr.x + 1, pixelY + height, 1, lineColor);
 
-	}  // end else
+	}
 
 	if(!BitIsSet(window->winGetStatus(), WIN_STATUS_IMAGE) || !window->winGetEnabledImage(0))
 		TheDisplay->drawFillRect(ul.x, ul.y, lr.x -ul.x, lr.y-ul.y, lineColor);
@@ -817,7 +796,7 @@ void drawSkinnyBorder( Int x, Int y, Int width, Int height)
 	// x == place to draw remainder if any
 	if( (x2 - x) >= (BORDER_LINE_SIZE / 2) )
 	{
-		
+
 		//Blit Half piece
 		TheDisplay->drawImage( image1,
 													 x, y, x + halfSize, y + size );
@@ -922,11 +901,11 @@ void drawSkinnyBorder( Int x, Int y, Int width, Int height)
 
 void W3DCommandBarHelpPopupDraw( GameWindow *window, WinInstanceData *instData )
 {
-	
+
 	static const Image *endBar = TheMappedImageCollection->findImageByName("Helpbox-top");
 	static const Image *beginBar = TheMappedImageCollection->findImageByName("Helpbox-bottom");
 	static const Image *centerBar = TheMappedImageCollection->findImageByName("Helpbox-middle");
-	
+
 	ICoord2D pos, size;
 	window->winGetScreenPosition( &pos.x, &pos.y );
 	window->winGetSize( &size.x, &size.y );
@@ -935,7 +914,7 @@ void W3DCommandBarHelpPopupDraw( GameWindow *window, WinInstanceData *instData )
 
 	if( !endBar || !beginBar || !centerBar)
 		return;
-	
+
 
 //	Int range;
 //	range = size.y;
@@ -960,7 +939,7 @@ void W3DCommandBarHelpPopupDraw( GameWindow *window, WinInstanceData *instData )
 
 	// get width we have to draw our repeating center in
 	centerWidth = size.y - topSize.y - bottomSize.y;
-	
+
 	if( centerWidth <= 0)
 	{
 		// draw left end
@@ -979,7 +958,7 @@ void W3DCommandBarHelpPopupDraw( GameWindow *window, WinInstanceData *instData )
 	}
 	else
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerBar->getImageHeight();
 
@@ -991,12 +970,12 @@ void W3DCommandBarHelpPopupDraw( GameWindow *window, WinInstanceData *instData )
 		{
 
 			end.y = start.y + centerBar->getImageHeight();
-			TheWindowManager->winDrawImage( centerBar, 
+			TheWindowManager->winDrawImage( centerBar,
 																			start.x, start.y,
 																			end.x, end.y );
 			start.y += centerBar->getImageHeight();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -1029,6 +1008,6 @@ void W3DCommandBarHelpPopupDraw( GameWindow *window, WinInstanceData *instData )
 		end.y = pos.y + topSize.y;
 		TheWindowManager->winDrawImage(endBar, start.x, start.y, end.x, end.y);
 	}
-	
+
 
 }
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
index db300c396ae..771c0af2fa6 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DMOTD.cpp //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,7 +45,6 @@
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/NameKeyGenerator.h"
@@ -83,19 +82,19 @@ static NameKeyType closeButtonID = NAMEKEY_INVALID;
 WindowMsgHandledType MOTDSystem( GameWindow *window, UnsignedInt msg,
 								 WindowMsgData mData1, WindowMsgData mData2 )
 {
-	switch( msg ) 
+	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case GWM_CREATE:
 		{
-			
+
 			// load id's needed
 			closeButtonID = TheNameKeyGenerator->nameToKey( "MOTD.wnd:CloseMOTD" );
 
 			break;
 
-		}  // end create
+		}
 
 		// ------------------------------------------------------------------------
 		case GWM_DESTROY:
@@ -103,7 +102,7 @@ WindowMsgHandledType MOTDSystem( GameWindow *window, UnsignedInt msg,
 
 			break;
 
-		}  // end case
+		}
 
 		// ------------------------------------------------------------------------
 		case GBM_SELECTED:
@@ -111,19 +110,19 @@ WindowMsgHandledType MOTDSystem( GameWindow *window, UnsignedInt msg,
 			GameWindow *control = (GameWindow *)mData1;
 			Int controlID = control->winGetWindowId();
 
-			if( controlID == closeButtonID )					
+			if( controlID == closeButtonID )
 				window->winHide( !window->winIsHidden() );
 
 			break;
 
-		}  // end selected
+		}
 
 		default:
 			return MSG_IGNORED;
-	}  // end switch
+	}
 
 	return MSG_HANDLED;
-	
-}  // end MOTDSystem
+
+}
 
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp
index d8961616945..a81ccef2ac4 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DMainMenu.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Apr 2002
@@ -37,7 +37,7 @@
 //	Filename: 	W3DMainMenu.cpp
 //
 //	author:		Chris Huybregts
-//	
+//
 //	purpose:	The Draw Routine for the main menu
 //
 //-----------------------------------------------------------------------------
@@ -92,7 +92,7 @@ static void advancePosition(GameWindow *window, const Image *image, UnsignedInt
 		return;
 
 	static Bool goingForward = TRUE;
-	
+
 	ICoord2D pos, size;
 	if(!window)
 	{
@@ -107,14 +107,14 @@ static void advancePosition(GameWindow *window, const Image *image, UnsignedInt
 		window->winGetSize(&size.x,&size.y);
 	}
 	static Int Width = size.x + image->getImageWidth();
-	
-	static Int x = -800;
+
+	static Int x = -DEFAULT_DISPLAY_WIDTH;
 	static Int y = pos.y - (image->getImageHeight()/2);
 
 	static UnsignedInt m_startTime = timeGetTime();
 	Int time = timeGetTime() - m_startTime;
 	Real percentDone = INT_TO_REAL(time) / 10000;
-	
+
 	if(goingForward)
 	{
 		if(percentDone >= 1)
@@ -158,33 +158,33 @@ void W3DMainMenuDraw( GameWindow *window, WinInstanceData *instData )
 	//W3DGameWinDefaultDraw( window, instData );
 
 	//R:83 G:78 B:52
-	
+
 	static UnsignedInt color = BrownishColor;
 	static UnsignedInt colorDrop = GameMakeColor(38,30,21,255);
 	ICoord2D pos, size;
-	Int height = TheDisplay->getHeight();	
+	Int height = TheDisplay->getHeight();
 
 	window->winGetScreenPosition(&pos.x, &pos.y);
 	window->winGetSize(&size.x,&size.y);
 
-	
+
 
 	IRegion2D	topHorizontal1 ={pos.x, pos.y, pos.x + size.x, pos.y	};
 	IRegion2D	topHorizontal1drop ={pos.x, pos.y+1, pos.x + size.x, pos.y+1	};
 
-	IRegion2D	topHorizontal2 ={pos.x, pos.y + (size.y * .1) , pos.x + size.x, pos.y + (size.y * .1)	};
-	IRegion2D	topHorizontal2drop ={pos.x, pos.y + (size.y * .12) , pos.x + size.x, pos.y + (size.y * .12)	};
+	IRegion2D	topHorizontal2 ={pos.x, pos.y + Int(size.y * .1) , pos.x + size.x, pos.y + Int(size.y * .1)	};
+	IRegion2D	topHorizontal2drop ={pos.x, pos.y + Int(size.y * .12) , pos.x + size.x, pos.y + Int(size.y * .12)	};
 
-	IRegion2D	bottomHorizontal1={pos.x, pos.y + (size.y * .9), pos.x + size.x, pos.y + (size.y * .9)	};
-	IRegion2D	bottomHorizontal1drop={pos.x, pos.y + (size.y * .92), pos.x + size.x, pos.y + (size.y * .92)	};
+	IRegion2D	bottomHorizontal1={pos.x, pos.y + Int(size.y * .9), pos.x + size.x, pos.y + Int(size.y * .9)	};
+	IRegion2D	bottomHorizontal1drop={pos.x, pos.y + Int(size.y * .92), pos.x + size.x, pos.y + Int(size.y * .92)	};
 
 	IRegion2D	bottomHorizontal2= {pos.x, pos.y + size.y, pos.x + size.x, pos.y + size.y 	};
 	IRegion2D	bottomHorizontal2drop= {pos.x, pos.y + size.y + 1, pos.x + size.x, pos.y + size.y + 1	};
 
-	IRegion2D	verticle1 ={pos.x + (size.x * .225), pos.y , pos.x + (size.x * .225), height 	};
-	IRegion2D	verticle2 ={pos.x + (size.x * .445), pos.y, pos.x + (size.x * .445), height 	};
-	IRegion2D	verticle3 ={pos.x + (size.x * .6662), pos.y, pos.x + (size.x * .6662), height 	};
-	IRegion2D	verticle4 ={pos.x + (size.x * .885), pos.y , pos.x + (size.x * .885), height 	};
+	IRegion2D	verticle1 ={pos.x + Int(size.x * .225), pos.y , pos.x + Int(size.x * .225), height 	};
+	IRegion2D	verticle2 ={pos.x + Int(size.x * .445), pos.y, pos.x + Int(size.x * .445), height 	};
+	IRegion2D	verticle3 ={pos.x + Int(size.x * .6662), pos.y, pos.x + Int(size.x * .6662), height 	};
+	IRegion2D	verticle4 ={pos.x + Int(size.x * .885), pos.y , pos.x + Int(size.x * .885), height 	};
 //	static IRegion2D	verticle5 ={pos.x + (size.x * .7250), pos.y + (size.y * .12), pos.x + (size.x * .7250), pos.y + (size.y * .86) 	};
 //	static IRegion2D	verticle6 ={pos.x + (size.x * .9062), pos.y + (size.y * .12), pos.x + (size.x * .9062), pos.y + (size.y * .86) 	};
 
@@ -210,7 +210,7 @@ void W3DMainMenuDraw( GameWindow *window, WinInstanceData *instData )
 
 
 
-	
+
 	advancePosition(NULL, TheMappedImageCollection->findImageByName("MainMenuPulse"),pos.x,pos.y,size.x, size.y);
 
 	//TheDisplay->drawLine();
@@ -222,33 +222,33 @@ void W3DMainMenuFourDraw( GameWindow *window, WinInstanceData *instData )
 	//W3DGameWinDefaultDraw( window, instData );
 
 	//R:83 G:78 B:52
-	
+
 	static UnsignedInt color = BrownishColor;
 	static UnsignedInt colorDrop = GameMakeColor(38,30,21,255);
 	ICoord2D pos, size;
-	Int height = TheDisplay->getHeight();	
+	Int height = TheDisplay->getHeight();
 
 	window->winGetScreenPosition(&pos.x, &pos.y);
 	window->winGetSize(&size.x,&size.y);
 
-	
+
 
 	IRegion2D	topHorizontal1 ={pos.x, pos.y, pos.x + size.x, pos.y	};
 	IRegion2D	topHorizontal1drop ={pos.x, pos.y+1, pos.x + size.x, pos.y+1	};
 
-	IRegion2D	topHorizontal2 ={pos.x, pos.y + (size.y * .1) , pos.x + size.x, pos.y + (size.y * .1)	};
-	IRegion2D	topHorizontal2drop ={pos.x, pos.y + (size.y * .12) , pos.x + size.x, pos.y + (size.y * .12)	};
+	IRegion2D	topHorizontal2 ={pos.x, pos.y + Int(size.y * .1) , pos.x + size.x, pos.y + Int(size.y * .1)	};
+	IRegion2D	topHorizontal2drop ={pos.x, pos.y + Int(size.y * .12) , pos.x + size.x, pos.y + Int(size.y * .12)	};
 
-	IRegion2D	bottomHorizontal1={pos.x, pos.y + (size.y * .9), pos.x + size.x, pos.y + (size.y * .9)	};
-	IRegion2D	bottomHorizontal1drop={pos.x, pos.y + (size.y * .92), pos.x + size.x, pos.y + (size.y * .92)	};
+	IRegion2D	bottomHorizontal1={pos.x, pos.y + Int(size.y * .9), pos.x + size.x, pos.y + Int(size.y * .9)	};
+	IRegion2D	bottomHorizontal1drop={pos.x, pos.y + Int(size.y * .92), pos.x + size.x, pos.y + Int(size.y * .92)	};
 
 	IRegion2D	bottomHorizontal2= {pos.x, pos.y + size.y, pos.x + size.x, pos.y + size.y 	};
 	IRegion2D	bottomHorizontal2drop= {pos.x, pos.y + size.y + 1, pos.x + size.x, pos.y + size.y + 1	};
 
-	IRegion2D	verticle1 ={pos.x + (size.x * .295), pos.y , pos.x + (size.x * .295), height 	};
-	IRegion2D	verticle2 ={pos.x + (size.x * .59), pos.y, pos.x + (size.x * .59), height 	};
+	IRegion2D	verticle1 ={pos.x + Int(size.x * .295), pos.y , pos.x + Int(size.x * .295), height 	};
+	IRegion2D	verticle2 ={pos.x + Int(size.x * .59), pos.y, pos.x + Int(size.x * .59), height 	};
 	//IRegion2D	verticle3 ={pos.x + (size.x * .6662), pos.y, pos.x + (size.x * .6662), height 	};
-	IRegion2D	verticle4 ={pos.x + (size.x * .885), pos.y , pos.x + (size.x * .885), height 	};
+	IRegion2D	verticle4 ={pos.x + Int(size.x * .885), pos.y , pos.x + Int(size.x * .885), height 	};
 //	static IRegion2D	verticle5 ={pos.x + (size.x * .7250), pos.y + (size.y * .12), pos.x + (size.x * .7250), pos.y + (size.y * .86) 	};
 //	static IRegion2D	verticle6 ={pos.x + (size.x * .9062), pos.y + (size.y * .12), pos.x + (size.x * .9062), pos.y + (size.y * .86) 	};
 
@@ -274,7 +274,7 @@ void W3DMainMenuFourDraw( GameWindow *window, WinInstanceData *instData )
 
 
 
-	
+
 	advancePosition(NULL, TheMappedImageCollection->findImageByName("MainMenuPulse"),pos.x,pos.y,size.x, size.y);
 
 	//TheDisplay->drawLine();
@@ -294,32 +294,32 @@ void W3DMetalBarMenuDraw( GameWindow *window, WinInstanceData *instData )
 //	TheDisplay->enableClipping(FALSE);
 }
 
-	
+
 	//W3DGameWinDefaultDraw( window, instData );
 //
 //	//R:83 G:78 B:52
-//	
-//	
+//
+//
 ////	UnsignedInt color = GameMakeColor(113,108,82,212);
 //	ICoord2D pos, size;
-//	
+//
 //	window->winGetScreenPosition(&pos.x, &pos.y);
 //	window->winGetSize(&size.x,&size.y);
 //
 //	const Image *image = TheMappedImageCollection->findImageByName("LogoGlow");
-//	
+//
 //	if(!image)
 //		return;
 //
 //	Int Width = size.x + image->getImageWidth();
-//	
+//
 //	static Int x = pos.x - image->getImageWidth();
 //	static Int y = pos.y - (image->getImageHeight()/2);
 //
 //	static UnsignedInt m_startTime = timeGetTime();
 //	Int time = timeGetTime() - m_startTime;
 //	Real percentDone = INT_TO_REAL(time) / 15624;
-//	
+//
 //	if(percentDone >= 1)
 //	{
 ////			y = pos.y + size.y - (image->getImageHeight()/2) - 2;
@@ -341,7 +341,7 @@ void W3DMetalBarMenuDraw( GameWindow *window, WinInstanceData *instData )
 //		alpha = ((1-percentDone) * 2) * 255;
 //	else
 //		alpha = ( percentDone * 2) * 255;
-//		
+//
 //	TheDisplay->drawImage(image,x, y , x + image->getImageWidth(), y + image->getImageHeight(), GameMakeColor(255,255,255,alpha));
 //	//TheDisplay->drawImage(image,x, y , x + image->getImageWidth(), y + image->getImageHeight(), GameMakeColor(255,200,250,alpha));
 //	TheDisplay->enableClipping(FALSE );
@@ -353,7 +353,7 @@ void W3DClockDraw( GameWindow *window, WinInstanceData *instData )
 {
 	W3DGameWinDefaultDraw( window, instData );
 	ICoord2D pos, size;
-	
+
 	window->winGetScreenPosition(&pos.x, &pos.y);
 	window->winGetSize(&size.x,&size.y);
 
@@ -366,21 +366,21 @@ void W3DClockDraw( GameWindow *window, WinInstanceData *instData )
 	UnicodeString temp;
 	temp.translate(datestr);
 	instData->setText(temp);
-	
+
 	DisplayString *dString;
 	dString = instData->getTextDisplayString();
-	
-	
+
+
 	dString->setFont(TheFontLibrary->getFont("Arial",16,0));
-	
+
 	Int textWidth, textHeight;
 	ICoord2D  textPos;
 	IRegion2D clockClipRegion;
 	// sanity
-		
+
 	// how much space will this text take up
 	dString->getSize( &textWidth, &textHeight );
-		
+
 	//Init the clip region
 	clockClipRegion.lo.x = pos.x + 1;
 	clockClipRegion.lo.y = pos.y + 1;
@@ -404,7 +404,7 @@ void W3DMainMenuMapBorder( GameWindow *window, WinInstanceData *instData )
 		BORDER_LINE_SIZE		= 20,
 	};
 	//( Int x, Int y, Int width, Int height )
-	
+
 // save original x, y
 	Int x, y, width, height;
 	window->winGetScreenPosition(&x, &y);
@@ -418,7 +418,7 @@ void W3DMainMenuMapBorder( GameWindow *window, WinInstanceData *instData )
 	Int x2, y2;			// used for simultaneous drawing of line pairs
 	Int size = 20;
 	Int halfSize = size / 2;
-	
+
 	const Image *image = NULL;
 
 	// Draw Horizontal Lines
@@ -430,24 +430,24 @@ void W3DMainMenuMapBorder( GameWindow *window, WinInstanceData *instData )
 	image = TheMappedImageCollection->findImageByName("FrameCornerHorizontal");
 	if(image)
 	{
-		
+
 		for( x=(originalX + 10); x <= x2; x += BORDER_LINE_SIZE )
 		{
-			
+
 			TheDisplay->drawImage( image,
 														 x, y, x + size, y + size );
 			TheDisplay->drawImage( image,
 														 x, y2, x + size, y2 + size );
 
 		}
-	
+
 
 		x2 = maxX - BORDER_CORNER_SIZE;
 
 		// x == place to draw remainder if any
 		if( (x2 - x) >= (BORDER_LINE_SIZE / 2) )
 		{
-			
+
 			//Blit Half piece
 			TheDisplay->drawImage( image,
 														 x, y, x + halfSize, y + size );
@@ -457,7 +457,7 @@ void W3DMainMenuMapBorder( GameWindow *window, WinInstanceData *instData )
 			x += (BORDER_LINE_SIZE / 2);
 
 		}
-	
+
 
 		// x2 - x ... must now be less than a half piece
 		// check for equals and if not blit an adjusted half piece border pieces have
@@ -545,7 +545,7 @@ void W3DMainMenuMapBorder( GameWindow *window, WinInstanceData *instData )
 	y = maxY - BORDER_CORNER_SIZE;
 	TheDisplay->drawImage(TheMappedImageCollection->findImageByName("FrameCornerLR"),
 												 x, y, x + size, y + size );
- 
+
 	TheDisplay->enableClipping(FALSE);
 
 }
@@ -555,7 +555,7 @@ void W3DMainMenuMapBorder( GameWindow *window, WinInstanceData *instData )
 // W3DMainMenuButtonDropShadowDraw ===============================================
 /** Draw pushbutton with user supplied images */
 //=============================================================================
-void W3DMainMenuButtonDropShadowDraw( GameWindow *window, 
+void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 																	 WinInstanceData *instData )
 {
 	const Image *leftImage, *rightImage, *centerImage;
@@ -594,7 +594,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 
 		}
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -613,7 +613,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 
 		}
 
-	}  // end else if, hilited and enabled
+	}
 	else
 	{
 
@@ -632,10 +632,10 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 
 		}
 
-	}  // end else, enabled only
+	}
 
 	// sanity, we need to have these images to make it look right
-	if( leftImage == NULL || rightImage == NULL || 
+	if( leftImage == NULL || rightImage == NULL ||
 			centerImage == NULL )
 		return;
 
@@ -658,7 +658,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 
 	// get width we have to draw our repeating center in
 	centerWidth = rightStart.x - leftEnd.x;
-	
+
 	if( centerWidth <= 0)
 	{
 //		TheDisplay->setClipRegion(&clipRegion);
@@ -678,7 +678,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 	}
 	else
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerImage->getImageWidth();
 
@@ -691,12 +691,12 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 		{
 
 			end.x = start.x + centerImage->getImageWidth();
-			TheWindowManager->winDrawImage( centerImage, 
+			TheWindowManager->winDrawImage( centerImage,
 																			start.x, start.y,
 																			end.x, end.y );
 			start.x += centerImage->getImageWidth();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -728,7 +728,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 		end.y = start.y + size.y;
 		TheWindowManager->winDrawImage(rightImage, start.x, start.y, end.x, end.y);
 	}
-	
+
 	// draw the button text
 	if( instData->getTextLength() )
 		drawText( window, instData );
@@ -764,7 +764,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 			pData->drawClock = NO_CLOCK;
 			window->winSetUserData(pData);
 		}
-	
+
 		if( pData->drawBorder && pData->colorBorder != GAME_COLOR_UNDEFINED )
 		{
 			TheDisplay->drawOpenRect(start.x - 1, start.y - 1, size.x + 2, size.y + 2, 1, pData->colorBorder);
@@ -772,7 +772,7 @@ void W3DMainMenuButtonDropShadowDraw( GameWindow *window,
 	}
 
 //	TheDisplay->enableClipping(FALSE);
-}  // end W3DGadgetPushButtonImageDraw
+}
 
 
 // drawButtonText =============================================================
@@ -801,17 +801,17 @@ static void drawText( GameWindow *window, WinInstanceData *instData )
 	{
 		textColor = window->winGetDisabledTextColor();
 		dropColor = window->winGetDisabledTextBorderColor();
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		textColor = window->winGetHiliteTextColor();
 		dropColor = window->winGetHiliteTextBorderColor();
-	}  // end else if, hilited
+	}
 	else
 	{
 		textColor = window->winGetEnabledTextColor();
 		dropColor = window->winGetEnabledTextBorderColor();
-	}  // end enabled only
+	}
 
 	// set our font to that of our parent if not the same
 	if( text->getFont() != window->winGetFont() )
@@ -827,7 +827,7 @@ static void drawText( GameWindow *window, WinInstanceData *instData )
 	// draw it
 	text->draw( textPos.x, textPos.y, textColor, dropColor );
 
-}  // end drawButtonText
+}
 
 // W3DMainMenuRandomTextDraw ==================================================
 /** Specialized drawing function for the random text */
@@ -848,29 +848,29 @@ void W3DMainMenuRandomTextDraw( GameWindow *window, WinInstanceData *instData )
 
   if( !(tData->text && (textColor != WIN_COLOR_UNDEFINED)) )
 		return;
-	
+
 	DisplayString *text = tData->text;
 	//Init the clip region
 	textclipRegion.lo.x = origin.x + 1;
 	textclipRegion.lo.y = origin.y + 1;
 	textclipRegion.hi.x = origin.x + size.x - 1;
 	textclipRegion.hi.y = origin.y + size.y - 1;
-	
+
 	// how much space will this text take up
 	text->getSize( &textWidth, &textHeight );
-	
+
 	// draw the text
 	textPos.x = origin.x;
 	textPos.y = origin.y + (size.y / 2) - (textHeight / 2);
 	text->setClipRegion(&textclipRegion);
 	text->draw( textPos.x, textPos.y, textColor, textOutlineColor );
-  
+
 }
 void W3DThinBorderDraw( GameWindow *window, WinInstanceData *instData )
 {
 	ICoord2D start, size;
 	const Image *image;
-	
+
 	//W3DGameWinDefaultDraw( window, instData );
 //	TheDisplay->setClipRegion(&clipRegion);
 	window->winGetScreenPosition( &start.x, &start.y );
@@ -887,7 +887,7 @@ void W3DThinBorderDraw( GameWindow *window, WinInstanceData *instData )
 		end.y = begin.y + size.y;
 		TheWindowManager->winDrawImage( image, begin.x, begin.y, end.x, end.y );
 
-	}  // end if
+	}
 	// get window position
 
 //	TheDisplay->drawOpenRect(start.x - 1, start.y - 1, size.x + 2, size.y + 2, 1, BrownishColor);
@@ -916,10 +916,10 @@ void W3DMainMenuInit( WindowLayout *layout, void *userData )
 	NameKeyType buttonUSAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSA" );
 	NameKeyType buttonGLAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLA" );
 	NameKeyType buttonChinaID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChina" );
-	NameKeyType skirmishID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSkirmish") );
-	NameKeyType onlineID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonOnline") );
-	NameKeyType networkID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonNetwork") );
-	
+	NameKeyType skirmishID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSkirmish" );
+	NameKeyType onlineID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonOnline" );
+	NameKeyType networkID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonNetwork" );
+
 	GameWindow *button = TheWindowManager->winGetWindowFromId( parent, skirmishID );
 	if (button)
 		button->winSetDrawFunc(W3DMainMenuButtonDropShadowDraw);
@@ -933,7 +933,7 @@ void W3DMainMenuInit( WindowLayout *layout, void *userData )
 //GameWindow *getUpdate = TheWindowManager->winGetWindowFromId( parent, getUpdateID );
 		//	if (getUpdate)
 		//		getUpdate->winSetDrawFunc(W3DMainMenuButtonDropShadowDraw);
-		
+
 	GameWindow *buttonUSA = TheWindowManager->winGetWindowFromId( parent, buttonUSAID );
 	if (buttonUSA)
 		buttonUSA->winSetDrawFunc(W3DMainMenuButtonDropShadowDraw);
@@ -984,7 +984,7 @@ void W3DMainMenuInit( WindowLayout *layout, void *userData )
 	if(win)
 		win->winSetDrawFunc(W3DMainMenuButtonDropShadowDraw);
 
-	GameWindow *clipRegionWin = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder") ));
+	GameWindow *clipRegionWin = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder" ));
 	Int x,y,width,height;
 	clipRegionWin->winGetScreenPosition(&x, &y);
 	clipRegionWin->winGetSize(&width, &height);
@@ -999,4 +999,4 @@ void W3DMainMenuInit( WindowLayout *layout, void *userData )
 void W3DCreditsMenuDraw( GameWindow *window, WinInstanceData *instData )
 {
 	TheCredits->draw();
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp
index d5fce06d0d8..eeb266b2087 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DCheckBox.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DCheckBox.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -86,17 +86,17 @@ static void drawCheckBoxText( GameWindow *window, WinInstanceData *instData )
 	{
 		textColor = window->winGetDisabledTextColor();
 		dropColor = window->winGetDisabledTextBorderColor();
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		textColor = window->winGetHiliteTextColor();
 		dropColor = window->winGetHiliteTextBorderColor();
-	}  // end else if, hilited
+	}
 	else
 	{
 		textColor = window->winGetEnabledTextColor();
 		dropColor = window->winGetEnabledTextBorderColor();
-	}  // end enabled only
+	}
 
 	// set our font to that of our parent if not the same
 	if( text->getFont() != window->winGetFont() )
@@ -112,7 +112,7 @@ static void drawCheckBoxText( GameWindow *window, WinInstanceData *instData )
 	// draw it
 	text->draw( textPos.x, textPos.y, textColor, dropColor );
 
-}  // end drawCheckBoxText
+}
 
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
 
@@ -162,11 +162,11 @@ void W3DGadgetCheckBoxDraw( GameWindow *window, WinInstanceData *instData )
 				boxBorder		= GadgetCheckBoxGetDisabledUncheckedBoxBorderColor( window );
 		}
 
-	}  // end if
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
-		// hilited background 
+		// hilited background
 		backColor			= GadgetCheckBoxGetHiliteColor( window );
 		backBorder		= GadgetCheckBoxGetHiliteBorderColor( window );
 
@@ -182,11 +182,11 @@ void W3DGadgetCheckBoxDraw( GameWindow *window, WinInstanceData *instData )
 			boxBorder		= GadgetCheckBoxGetHiliteUncheckedBoxBorderColor( window );
 		}
 
-	}  // end else if
+	}
 	else
 	{
 
-		// enabled background 
+		// enabled background
 		backColor			= GadgetCheckBoxGetEnabledColor( window );
 		backBorder		= GadgetCheckBoxGetEnabledBorderColor( window );
 
@@ -202,14 +202,14 @@ void W3DGadgetCheckBoxDraw( GameWindow *window, WinInstanceData *instData )
 			boxBorder		= GadgetCheckBoxGetEnabledUncheckedBoxBorderColor( window );
 		}
 
-	}  // end else
+	}
 
 	// draw background border
 	start.x = origin.x;
 	start.y = origin.y;
 	end.x = start.x + size.x;
 	end.y = start.y + size.y;
-	TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw the background
@@ -217,7 +217,7 @@ void W3DGadgetCheckBoxDraw( GameWindow *window, WinInstanceData *instData )
 	start.y++;
 	end.x--;
 	end.y--;
-	TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw box border
@@ -225,25 +225,25 @@ void W3DGadgetCheckBoxDraw( GameWindow *window, WinInstanceData *instData )
 	start.y = origin.y + (size.y / 3);
 	end.x = start.x + (size.y / 3);
 	end.y = start.y + (size.y / 3);
-	TheWindowManager->winOpenRect( boxBorder, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winOpenRect( boxBorder, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw "x" for button
 	if( boxColor != WIN_COLOR_UNDEFINED )
 	{
 
-		TheWindowManager->winDrawLine( boxColor, WIN_DRAW_LINE_WIDTH, 
+		TheWindowManager->winDrawLine( boxColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
-		TheWindowManager->winDrawLine( boxColor, WIN_DRAW_LINE_WIDTH, 
+		TheWindowManager->winDrawLine( boxColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, end.y, end.x, start.y );
 
-	}  // end if
+	}
 
 	// draw the button text
 	if( instData->getTextLength() )
 		drawCheckBoxText( window, instData );
 
-}  // end W3DGadgetCheckBoxDraw
+}
 
 // W3DGadgetCheckBoxImageDraw =================================================
 /** Draw check box with user supplied images */
@@ -283,11 +283,11 @@ void W3DGadgetCheckBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		else
 				boxImage		= GadgetCheckBoxGetDisabledUncheckedBoxImage( window );
 
-	}  // end if
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
-		// hilited background 
+		// hilited background
 //		backgroundImage	= GadgetCheckBoxGetHiliteImage( window );
 
 		// check box
@@ -296,11 +296,11 @@ void W3DGadgetCheckBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		else
 			boxImage		= GadgetCheckBoxGetHiliteUncheckedBoxImage( window );
 
-	}  // end else if
+	}
 	else
 	{
 
-		// enabled background 
+		// enabled background
 //		backgroundImage	= GadgetCheckBoxGetEnabledImage( window );
 
 		// check box
@@ -309,11 +309,11 @@ void W3DGadgetCheckBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		else
 			boxImage		= GadgetCheckBoxGetEnabledUncheckedBoxImage( window );
 
-	}  // end else
+	}
 
 	// draw background image
 //	if( backgroundImage )
-//		TheWindowManager->winDrawImage( backgroundImage, start.x, start.y, 
+//		TheWindowManager->winDrawImage( backgroundImage, start.x, start.y,
 //																		end.x, end.y );
 
 	// draw the box image
@@ -324,13 +324,13 @@ void W3DGadgetCheckBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		start.y = origin.y +  3;
 		end.x = start.x + (size.y - 6);
 		end.y = start.y + (size.y - 6);
-		TheWindowManager->winDrawImage( boxImage, start.x, start.y, 
+		TheWindowManager->winDrawImage( boxImage, start.x, start.y,
 																	  end.x, end.y );
 
-	}  // end if
-		
+	}
+
 	// draw the text
 	if( instData->getTextLength() )
 		drawCheckBoxText( window, instData );
 
-}  // end W3DGadgetCheckBoxImageDraw
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp
index d92c56abeb0..cedb743a628 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DComboBox.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DComboBox.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -102,37 +102,37 @@ void W3DGadgetComboBoxDraw( GameWindow *window, WinInstanceData *instData )
 		border				= GadgetComboBoxGetDisabledBorderColor( window );
 		titleColor		= window->winGetDisabledTextColor();
 		titleBorder		= window->winGetDisabledTextBorderColor();
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		background		= GadgetComboBoxGetHiliteColor( window );
 		border				= GadgetComboBoxGetHiliteBorderColor( window );
 		titleColor		= window->winGetHiliteTextColor();
 		titleBorder		= window->winGetHiliteTextBorderColor();
-	}  // end else if, hilited
+	}
 	else
 	{
 		background		= GadgetComboBoxGetEnabledColor( window );
 		border				= GadgetComboBoxGetEnabledBorderColor( window );
 		titleColor		= window->winGetEnabledTextColor();
 		titleBorder		= window->winGetEnabledTextBorderColor();
-	}  // end else, enabled
+	}
 
 	// Draw the title
 	if( title && title->getTextLength() )
 	{
-	
+
 		// set the font of this text to that of the window if not already
 		if( title->getFont() != window->winGetFont() )
 			title->setFont( window->winGetFont() );
-			
+
 		// draw the text
-		title->draw( x + 1, y, titleColor, titleBorder );		
+		title->draw( x + 1, y, titleColor, titleBorder );
 
 		y += fontHeight + 1;
 		height -= fontHeight + 1;
 
-	}  // end if
+	}
 
 	// draw the back border
 	if( border != WIN_COLOR_UNDEFINED )
@@ -142,10 +142,10 @@ void W3DGadgetComboBoxDraw( GameWindow *window, WinInstanceData *instData )
 	// draw background
 	if( background != WIN_COLOR_UNDEFINED )
 		TheWindowManager->winFillRect( background, WIN_DRAW_LINE_WIDTH,
-																	 x + 1, y + 1, 
+																	 x + 1, y + 1,
 																	 x + width - 1, y + height - 1 );
 
-}  // end W3DGadgetComboBoxDraw
+}
 
 // W3DGadgetComboBoxImageDraw ==================================================
 /** Draw combo box with user supplied images */
@@ -196,11 +196,11 @@ void W3DGadgetComboBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		start.y = y + instData->m_imageOffset.y;
 		end.x = start.x + width;
 		end.y = start.y + height;
-		TheWindowManager->winDrawImage( image, 
-																		start.x, start.y, 
+		TheWindowManager->winDrawImage( image,
+																		start.x, start.y,
 																		end.x, end.y );
 
-	}  // end if
+	}
 
 	// Draw the title
 	if( title && title->getTextLength() )
@@ -216,8 +216,8 @@ void W3DGadgetComboBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		y += TheWindowManager->winFontHeight( instData->getFont() );
 		height -= TheWindowManager->winFontHeight( instData->getFont() ) + 1;
 
-	}  // end if
+	}
 
 
-}  // end W3DGadgetComboBoxImageDraw
+}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp
index 4a7b754d587..adc27efe9df 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DHorizontalSlider.cpp
@@ -24,21 +24,21 @@
 
 // FILE: .cpp /////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
-// Project:   
+// Project:
 //
 // File name: .cpp
 //
-// Created:   
+// Created:
 //
-// Desc:      
+// Desc:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -68,11 +68,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // W3DGadgetHorizontalSliderDraw ==============================================
 /** Draw colored horizontal slider using standard graphics */
@@ -93,21 +88,21 @@ void W3DGadgetHorizontalSliderDraw( GameWindow *window, WinInstanceData *instDat
 		backBorder		= GadgetSliderGetDisabledBorderColor( window );
 		backColor			= GadgetSliderGetDisabledColor( window );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
 		backBorder		= GadgetSliderGetHiliteBorderColor( window );
 		backColor			= GadgetSliderGetHiliteColor( window );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
 		backBorder		= GadgetSliderGetEnabledBorderColor( window );
 		backColor			= GadgetSliderGetEnabledColor( window );
 
-	}  // end else, enabled
+	}
 
 	// draw background border and rect over whole control
 	if( backBorder != WIN_COLOR_UNDEFINED )
@@ -120,7 +115,7 @@ void W3DGadgetHorizontalSliderDraw( GameWindow *window, WinInstanceData *instDat
 		TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 	if( backColor != WIN_COLOR_UNDEFINED )
 	{
 
@@ -131,15 +126,15 @@ void W3DGadgetHorizontalSliderDraw( GameWindow *window, WinInstanceData *instDat
 		TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 
-}  // end W3DGadgetHorizontalSliderDraw
+}
 
 // W3DGadgetHorizontalSliderImageDraw =========================================
 /** Draw horizontal slider with user supplied images */
 //=============================================================================
-void W3DGadgetHorizontalSliderImageDraw( GameWindow *window, 
+void W3DGadgetHorizontalSliderImageDraw( GameWindow *window,
 																				 WinInstanceData *instData )
 {
 	const Image *fillSquare, *blankSquare, *highlightSquare;
@@ -154,8 +149,8 @@ void W3DGadgetHorizontalSliderImageDraw( GameWindow *window,
 	fillSquare = GadgetSliderGetDisabledImageLeft( window );
 
 	SliderData *s = (SliderData *)window->winGetUserData();
-	
-	Real xMulti = INT_TO_REAL(TheDisplay->getWidth()) / 800;
+
+	Real xMulti = INT_TO_REAL(TheDisplay->getWidth()) / DEFAULT_DISPLAY_WIDTH;
 
 	// figure out how many boxes we draw for this slider
 	Int numBoxes = 0;
@@ -192,7 +187,7 @@ void W3DGadgetHorizontalSliderImageDraw( GameWindow *window,
 		{
 			backgroundStart.x = origin.x + highlightOffset.x + i*(boxWidth+boxPadding);
 			backgroundEnd.x = backgroundStart.x + boxWidth + boxPadding;
-			TheWindowManager->winDrawImage( highlightSquare, 
+			TheWindowManager->winDrawImage( highlightSquare,
 																		backgroundStart.x, backgroundStart.y,
 																		backgroundEnd.x, backgroundEnd.y );
 		}
@@ -204,7 +199,7 @@ void W3DGadgetHorizontalSliderImageDraw( GameWindow *window,
 	{
 		start.x = origin.x + i*(boxWidth+boxPadding);
 		end.x = start.x + boxWidth;
-		TheWindowManager->winDrawImage( fillSquare, 
+		TheWindowManager->winDrawImage( fillSquare,
 																	start.x, start.y,
 																	end.x, end.y );
 	}
@@ -212,7 +207,7 @@ void W3DGadgetHorizontalSliderImageDraw( GameWindow *window,
 	{
 		start.x = origin.x + i*(boxWidth+boxPadding);
 		end.x = start.x + boxWidth;
-		TheWindowManager->winDrawImage( blankSquare, 
+		TheWindowManager->winDrawImage( blankSquare,
 																	start.x, start.y,
 																	end.x, end.y );
 	}
@@ -221,7 +216,7 @@ void W3DGadgetHorizontalSliderImageDraw( GameWindow *window,
 // W3DGadgetHorizontalSliderImageDraw =========================================
 /** Draw horizontal slider with user supplied images */
 //=============================================================================
-void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window, 
+void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 																				 WinInstanceData *instData )
 {
 	const Image *fillSquare, *blankSquare, *highlightSquare;//, *progressArrow;
@@ -233,9 +228,9 @@ void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 	window->winGetSize( &size.x, &size.y );
 
 	SliderData *s = (SliderData *)window->winGetUserData();
-	
-	Real xMulti = INT_TO_REAL(TheDisplay->getWidth()) / 800;
-	Real yMulti = INT_TO_REAL(TheDisplay->getHeight())/ 600;
+
+	Real xMulti = INT_TO_REAL(TheDisplay->getWidth()) / DEFAULT_DISPLAY_WIDTH;
+	Real yMulti = INT_TO_REAL(TheDisplay->getHeight()) / DEFAULT_DISPLAY_HEIGHT;
 	// get image offset
 	xOffset = instData->m_imageOffset.x;
 	yOffset = instData->m_imageOffset.y;
@@ -265,12 +260,12 @@ void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 
 		while(backgroundStart.x < origin.x + size.x)
 		{
-			TheWindowManager->winDrawImage( highlightSquare, 
+			TheWindowManager->winDrawImage( highlightSquare,
 																		backgroundStart.x, backgroundStart.y,
 																		backgroundEnd.x, backgroundEnd.y );
 			backgroundStart.x = backgroundEnd.x;
 			backgroundEnd.x = backgroundStart.x + highlightSquare->getImageWidth() * xMulti;
-		}		
+		}
 		tmp.format(L"\n  bsX = %d, beX = %d (%d < %d+%d or %d?)", backgroundStart.x, backgroundEnd.x,
 			backgroundStart.x, origin.x, size.x, origin.x + size.x);
 		tooltip.concat(tmp);
@@ -287,7 +282,7 @@ void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 
 	while(start.x <= origin.x + (s->numTicks * (s->position - s->minVal)) && end.x < origin.x + size.x && s->position != s->minVal)
 	{
-		TheWindowManager->winDrawImage( fillSquare, 
+		TheWindowManager->winDrawImage( fillSquare,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x = end.x + 2;
@@ -300,7 +295,7 @@ void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 
 	while(end.x < origin.x + size.x )
 	{
-		TheWindowManager->winDrawImage( blankSquare, 
+		TheWindowManager->winDrawImage( blankSquare,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x = end.x + 2;
@@ -319,7 +314,7 @@ void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 //		start.y = origin.y + fillSquare->getImageHeight()/3*2;
 //		end.y = start.y + progressArrow->getImageHeight();
 //		end.x	= start.x + progressArrow->getImageWidth();
-//		TheWindowManager->winDrawImage( progressArrow, 
+//		TheWindowManager->winDrawImage( progressArrow,
 //																			start.x, start.y,
 //																			end.x, end.y );
 //	}
@@ -329,7 +324,7 @@ void W3DGadgetHorizontalSliderImageDrawB( GameWindow *window,
 // W3DGadgetHorizontalSliderImageDraw =========================================
 /** Draw horizontal slider with user supplied images */
 //=============================================================================
-void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window, 
+void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 																				 WinInstanceData *instData )
 {
 	const Image *leftImageLeft, *rightImageLeft, *centerImageLeft, *smallCenterImageLeft;
@@ -359,7 +354,7 @@ void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 //		centerImageRight = centerImageLeft				= GadgetSliderGetDisabledImageCenter( window );
 //		smallCenterImageRight = smallCenterImageLeft	= GadgetSliderGetDisabledImageSmallCenter( window );
 
-	}  // end if, disabled
+	}
 	else //if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -373,12 +368,12 @@ void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 		centerImageRight				= GadgetSliderGetEnabledImageCenter( window );
 		smallCenterImageRight	= GadgetSliderGetEnabledImageSmallCenter( window );
 
-	}  // end else, enabled
+	}
 
 	// sanity, we need to have these images to make it look right
-	if( leftImageLeft == NULL || rightImageLeft == NULL || 
+	if( leftImageLeft == NULL || rightImageLeft == NULL ||
 			centerImageLeft == NULL || smallCenterImageLeft == NULL ||
-			leftImageRight == NULL || rightImageRight == NULL || 
+			leftImageRight == NULL || rightImageRight == NULL ||
 			centerImageRight == NULL || smallCenterImageRight == NULL )
 		return;
 
@@ -411,7 +406,7 @@ void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 	start.x = leftEnd.x;
 	start.y = origin.y + size.y - leftSize.y + yOffset;
 	end.y =origin.y + size.y + yOffset;
-	
+
 	clipLeft.lo.x = origin.x;
 	clipLeft.lo.y = rightStart.y;
 	clipLeft.hi.y = leftEnd.y;
@@ -427,17 +422,17 @@ void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 
 		end.x = start.x + centerImageLeft->getImageWidth();
 		TheDisplay->setClipRegion(&clipLeft);
-		TheWindowManager->winDrawImage( centerImageLeft, 
+		TheWindowManager->winDrawImage( centerImageLeft,
 																		start.x, start.y,
 																		end.x, end.y );
 		TheDisplay->setClipRegion(&clipRight);
-		TheWindowManager->winDrawImage( centerImageRight, 
+		TheWindowManager->winDrawImage( centerImageRight,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x += centerImageLeft->getImageWidth();
 
-	}  // end for i
-	
+	}
+
 	//
 	// how many small repeating pieces will fit in the gap from where the
 	// center repeating bar stopped and the right image, draw them
@@ -460,8 +455,8 @@ void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 																		end.x, end.y );
 		start.x += smallCenterImageLeft->getImageWidth();
 
-	}  // end for i
-	
+	}
+
 	// draw left end
 	start.x = origin.x + xOffset;
 	start.y = rightStart.y;
@@ -480,5 +475,5 @@ void W3DGadgetHorizontalSliderImageDrawA( GameWindow *window,
 	TheWindowManager->winDrawImage(rightImageRight, start.x, start.y, end.x, end.y);
 
 	TheDisplay->enableClipping(FALSE);
-}  // end W3DGadgetHorizontalSliderImageDraw
+}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DListBox.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DListBox.cpp
index 5406f5c8e90..ff3ee8a701c 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DListBox.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DListBox.cpp
@@ -25,12 +25,12 @@
 
 // FILE: W3DListBox.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -71,8 +71,8 @@
 // drawHiliteBar ==============================================================
 /** Draw image for the hilite bar */
 //=============================================================================
-static void drawHiliteBar( const Image *left, const Image *right, 
-													 const Image *center, const Image *smallCenter, 
+static void drawHiliteBar( const Image *left, const Image *right,
+													 const Image *center, const Image *smallCenter,
 													 Int startX, Int startY,
 													 Int endX, Int endY )
 {
@@ -127,12 +127,12 @@ static void drawHiliteBar( const Image *left, const Image *right,
 	{
 
 		end.x = start.x + center->getImageWidth();
-		TheWindowManager->winDrawImage( center, 
+		TheWindowManager->winDrawImage( center,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x += center->getImageWidth();
 
-	}  // end for i
+	}
 
 	//
 	// how many small repeating pieces will fit in the gap from where the
@@ -160,9 +160,9 @@ static void drawHiliteBar( const Image *left, const Image *right,
 																			end.x, end.y );
 			start.x += smallCenter->getImageWidth();
 
-		}  // end for i
+		}
 
-	}  // end if
+	}
 	TheDisplay->enableClipping(FALSE);
 	// draw left end
 	start.x = startX + xOffset;
@@ -176,7 +176,7 @@ static void drawHiliteBar( const Image *left, const Image *right,
 	end.y = start.y + barWindowSize.y;
 	TheWindowManager->winDrawImage(right, start.x, start.y, end.x, end.y);
 
-}  // end drawHiliteBar
+}
 
 // drawListBoxText ============================================================
 /** Draw the text for a listbox */
@@ -216,7 +216,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 	{
 
 		if( i > 0 )
-			if( list->listData[(i - 1)].listHeight > 
+			if( list->listData[(i - 1)].listHeight >
 					(list->displayPos + list->displayHeight) )
 				break;
 
@@ -257,7 +257,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 		// this item is selected, draw the selection color or image
 		if( selected )
 		{
-			
+
 			if( useImages )
 			{
 				const Image *left, *right, *center, *smallCenter;
@@ -270,7 +270,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 					center			= GadgetListBoxGetDisabledSelectedItemImageCenter( window );
 					smallCenter = GadgetListBoxGetDisabledSelectedItemImageSmallCenter( window );
 
-				}  // end if
+				}
 				else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 				{
 
@@ -278,8 +278,8 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 					right				= GadgetListBoxGetHiliteSelectedItemImageRight( window );
 					center			= GadgetListBoxGetHiliteSelectedItemImageCenter( window );
 					smallCenter = GadgetListBoxGetHiliteSelectedItemImageSmallCenter( window );
-				
-				}  // end else if
+
+				}
 				else
 				{
 
@@ -288,7 +288,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 					center			= GadgetListBoxGetEnabledSelectedItemImageCenter( window );
 					smallCenter = GadgetListBoxGetEnabledSelectedItemImageSmallCenter( window );
 
-				}  // end else
+				}
 
 				// draw select image across area
 
@@ -309,7 +309,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 				if( left && right && center && smallCenter )
 					drawHiliteBar( left, right, center, smallCenter, start.x + 1, start.y, end.x , end.y );
 
-			}  // end if, use images
+			}
 			else
 			{
 				Color selectColor = WIN_COLOR_UNDEFINED,
@@ -319,17 +319,17 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 				{
 					selectColor  = GadgetListBoxGetDisabledSelectedItemColor( window );
 					selectBorder = GadgetListBoxGetDisabledSelectedItemBorderColor( window );
-				}  // end if, disabled
+				}
 				else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 				{
 					selectColor  = GadgetListBoxGetHiliteSelectedItemColor( window );
 					selectBorder = GadgetListBoxGetHiliteSelectedItemBorderColor( window );
-				}  // end else if, hilited
+				}
 				else
 				{
 					selectColor  = GadgetListBoxGetEnabledSelectedItemColor( window );
 					selectBorder = GadgetListBoxGetEnabledSelectedItemBorderColor( window );
-				}  // end else, enabled
+				}
 
 				// draw border
 
@@ -348,7 +348,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 					start.y = clipRegion.lo.y;
 
 				if( selectBorder != WIN_COLOR_UNDEFINED )
-					TheWindowManager->winOpenRect( selectBorder,	
+					TheWindowManager->winOpenRect( selectBorder,
 																				 WIN_DRAW_LINE_WIDTH,
 																				 start.x, start.y,
 																				 end.x, end.y );
@@ -375,13 +375,13 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 																				 start.x, start.y,
 																				 end.x, end.y );
 
-			}  // end else, draw selection with colors
+			}
+
+		}
+
 
-		}  // end if
 
-		
 
-		
 		Color dropColor = TheWindowManager->winMakeColor( 0, 0, 0, 255 );
 		DisplayString *string;
 
@@ -406,7 +406,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 					columnRegion.lo.y = clipRegion.lo.y;
 				if( columnRegion.hi.y > clipRegion.hi.y )
 					columnRegion.hi.y = clipRegion.hi.y;
-				
+
 				// Display the Text Case;
 				if(cells[j].cellType == LISTBOX_TEXT)
 				{
@@ -425,11 +425,11 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 													drawY,
 													textColor,
 													dropColor );
-									
+
 					}
 					else
 					{
-					
+
 						// make sure the font of the text is the same as the windows
 						if( string->getFont() != window->winGetFont() )
 							string->setFont( window->winGetFont() );
@@ -440,8 +440,8 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 													drawY,
 													textColor,
 													dropColor );
-					}//else
-				}// if
+					}
+				}
 				else if(cells[j].cellType == LISTBOX_IMAGE && cells[j].data)
 				{
 					Int width, height;
@@ -468,16 +468,16 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 					offsetY++;
 					if(offsetX <x+1)
 						offsetX = x+1;
-					TheDisplay->setClipRegion( &columnRegion );					
-					TheWindowManager->winDrawImage( (const Image *)cells[j].data, 
+					TheDisplay->setClipRegion( &columnRegion );
+					TheWindowManager->winDrawImage( (const Image *)cells[j].data,
 																offsetX, offsetY,
 																offsetX + width, offsetY + height,cells[j].color );
 
-				}//else
+				}
 				columnX = columnX + list->columnWidth[j];
-			}// for
-		}//if
-		
+			}
+		}
+
 
 		drawY += listLineHeight;
 		TheDisplay->enableClipping(FALSE);
@@ -486,7 +486,7 @@ static void drawListBoxText( GameWindow *window, WinInstanceData *instData,
 //	TheWindowManager->winSetClipRegion( clipRegion.lo.x, clipRegion.lo.y,
 //																			clipRegion.hi.x, clipRegion.hi.y );
 
-}  // end drawListBoxText
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -521,37 +521,37 @@ void W3DGadgetListBoxDraw( GameWindow *window, WinInstanceData *instData )
 		border				= GadgetListBoxGetDisabledBorderColor( window );
 		titleColor		= window->winGetDisabledTextColor();
 		titleBorder		= window->winGetDisabledTextBorderColor();
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		background		= GadgetListBoxGetHiliteColor( window );
 		border				= GadgetListBoxGetHiliteBorderColor( window );
 		titleColor		= window->winGetHiliteTextColor();
 		titleBorder		= window->winGetHiliteTextBorderColor();
-	}  // end else if, hilited
+	}
 	else
 	{
 		background		= GadgetListBoxGetEnabledColor( window );
 		border				= GadgetListBoxGetEnabledBorderColor( window );
 		titleColor		= window->winGetEnabledTextColor();
 		titleBorder		= window->winGetEnabledTextBorderColor();
-	}  // end else, enabled
+	}
 
 	// Draw the title
 	if( title && title->getTextLength() )
 	{
-	
+
 		// set the font of this text to that of the window if not already
 		if( title->getFont() != window->winGetFont() )
 			title->setFont( window->winGetFont() );
-			
+
 		// draw the text
-		title->draw( x + 1, y, titleColor, titleBorder );		
+		title->draw( x + 1, y, titleColor, titleBorder );
 
 		y += fontHeight + 1;
 		height -= fontHeight + 1;
 
-	}  // end if
+	}
 
 	// draw the back border
 	if( border != WIN_COLOR_UNDEFINED )
@@ -561,7 +561,7 @@ void W3DGadgetListBoxDraw( GameWindow *window, WinInstanceData *instData )
 	// draw background
 	if( background != WIN_COLOR_UNDEFINED )
 		TheWindowManager->winFillRect( background, WIN_DRAW_LINE_WIDTH,
-																	 x + 1, y + 1, 
+																	 x + 1, y + 1,
 																	 x + width - 1, y + height - 1 );
 
 	// If ScrollBar was requested ... adjust width.
@@ -572,14 +572,14 @@ void W3DGadgetListBoxDraw( GameWindow *window, WinInstanceData *instData )
 		list->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 		width -= (sliderSize.x +3);
 
-	}  // end if
+	}
 
 	// draw the text
 	drawListBoxText( window, instData, x, y + 4 , width, height-4, TRUE );
 
-	
 
-}  // end W3DGadgetListBoxDraw
+
+}
 
 // W3DGadgetListBoxImageDraw ==================================================
 /** Draw list box with user supplied images */
@@ -609,7 +609,7 @@ void W3DGadgetListBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		list->slider->winGetSize( &sliderSize.x, &sliderSize.y );
 		width -= sliderSize.x;
 
-	}  // end if
+	}
 
 	// get the image
 	if( BitIsSet( window->winGetStatus(), WIN_STATUS_ENABLED ) == FALSE )
@@ -640,11 +640,11 @@ void W3DGadgetListBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		start.y = y + instData->m_imageOffset.y;
 		end.x = start.x + width;
 		end.y = start.y + height;
-		TheWindowManager->winDrawImage( image, 
-																		start.x, start.y, 
+		TheWindowManager->winDrawImage( image,
+																		start.x, start.y,
 																		end.x, end.y );
 
-	}  // end if
+	}
 
 	// Draw the title
 	if( title && title->getTextLength() )
@@ -660,12 +660,12 @@ void W3DGadgetListBoxImageDraw( GameWindow *window, WinInstanceData *instData )
 		y += TheWindowManager->winFontHeight( instData->getFont() );
 		height -= TheWindowManager->winFontHeight( instData->getFont() ) + 1;
 
-	}  // end if
+	}
 
 	// draw the listbox text
 	drawListBoxText( window, instData, x, y+4, width, height-4, TRUE );
 
-	
 
-}  // end W3DGadgetListBoxImageDraw
+
+}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp
index f871e31ed11..23099a7226f 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DProgressBar.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DProgressBar.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -89,21 +89,21 @@ void W3DGadgetProgressBarDraw( GameWindow *window, WinInstanceData *instData )
 		backBorder	= GadgetProgressBarGetDisabledBorderColor( window );
 		barColor		= GadgetProgressBarGetDisabledBarColor( window );
 		barBorder		= GadgetProgressBarGetDisabledBarBorderColor( window );
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		backColor		= GadgetProgressBarGetHiliteColor( window );
 		backBorder	= GadgetProgressBarGetHiliteBorderColor( window );
 		barColor		= GadgetProgressBarGetHiliteBarColor( window );
 		barBorder		= GadgetProgressBarGetHiliteBarBorderColor( window );
-	}  // end else if, hilited
+	}
 	else
 	{
 		backColor		= GadgetProgressBarGetEnabledColor( window );
 		backBorder	= GadgetProgressBarGetEnabledBorderColor( window );
 		barColor		= GadgetProgressBarGetEnabledBarColor( window );
 		barBorder		= GadgetProgressBarGetEnabledBarBorderColor( window );
-	}  // end else, enabled
+	}
 
 	// draw background border
 	if( backBorder != WIN_COLOR_UNDEFINED )
@@ -116,7 +116,7 @@ void W3DGadgetProgressBarDraw( GameWindow *window, WinInstanceData *instData )
 		TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw background fill
 	if( backColor != WIN_COLOR_UNDEFINED )
@@ -129,7 +129,7 @@ void W3DGadgetProgressBarDraw( GameWindow *window, WinInstanceData *instData )
 		TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw the progress so far
 	if( progress )
@@ -149,7 +149,7 @@ void W3DGadgetProgressBarDraw( GameWindow *window, WinInstanceData *instData )
 																		 start.x, start.y, end.x, end.y );
 			}
 
-		}  // end if
+		}
 
 		// draw bar fill
 		if( barColor != WIN_COLOR_UNDEFINED )
@@ -161,23 +161,23 @@ void W3DGadgetProgressBarDraw( GameWindow *window, WinInstanceData *instData )
 			end.y = start.y + size.y - 2;
 //			TheWindowManager->winOpenRect( barColor, WIN_DRAW_LINE_WIDTH,
 //																		 start.x, start.y, end.x, end.y );
-			
+
 			if(end.x- start.x > 1  )
 			{
 				TheWindowManager->winFillRect( barColor,WIN_DRAW_LINE_WIDTH,
 																		 start.x, start.y, end.x, end.y );
-			
+
 				TheWindowManager->winDrawLine(GameMakeColor(255,255,255,255),WIN_DRAW_LINE_WIDTH, start.x, start.y, end.x, start.y);
 				TheWindowManager->winDrawLine(GameMakeColor(200,200,200,255),WIN_DRAW_LINE_WIDTH, start.x, start.y, start.x, end.y);
 			}
 
-		}  // end if
+		}
+
+	}
 
-	}  // end if
 
-  
 
-}  // end W3DGadgetProgressBarDraw
+}
 
 // W3DGadgetProgressBarImageDraw ==============================================
 /** Draw Progress Bar with user supplied images */
@@ -214,7 +214,7 @@ void W3DGadgetProgressBarImageDrawA( GameWindow *window, WinInstanceData *instDa
 	Int x = origin.x;
 	for( i = 0; i < pieces; i ++)
 	{
-				
+
 				TheWindowManager->winDrawImage( barCenter,
 																				x, origin.y,
 																				x + width, origin.y + size.y );
@@ -227,7 +227,7 @@ void W3DGadgetProgressBarImageDrawA( GameWindow *window, WinInstanceData *instDa
 void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instData )
 {
 	ICoord2D origin, size, start, end;
-	const Image *backLeft, *backRight, *backCenter, 
+	const Image *backLeft, *backRight, *backCenter,
 				 *barRight, *barCenter;//*backSmallCenter,*barLeft,, *barSmallCenter;
 	Int progress = (Int)window->winGetUserData();
 	Int xOffset, yOffset;
@@ -254,7 +254,7 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 		//backSmallCenter	= GadgetProgressBarGetDisabledImageSmallCenter( window );
 		//barSmallCenter	= GadgetProgressBarGetDisabledBarImageSmallCenter( window );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -267,7 +267,7 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 		//backSmallCenter	= GadgetProgressBarGetHiliteImageSmallCenter( window );
 		//barSmallCenter	= GadgetProgressBarGetHiliteBarImageSmallCenter( window );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
@@ -280,7 +280,7 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 		//backSmallCenter	= GadgetProgressBarGetEnabledImageSmallCenter( window );
 		//barSmallCenter	= GadgetProgressBarGetEnabledBarImageSmallCenter( window );
 
-	}  // end else, enabled
+	}
 
 	// sanity
 	if( backLeft == NULL || backRight == NULL ||
@@ -320,12 +320,12 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 	{
 
 		end.x = start.x + backCenter->getImageWidth();
-		TheWindowManager->winDrawImage( backCenter, 
+		TheWindowManager->winDrawImage( backCenter,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x += backCenter->getImageWidth();
 
-	}  // end for i
+	}
 
 	//
 	// how many small repeating pieces will fit in the gap from where the
@@ -336,7 +336,7 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 //	pieces = centerWidth / backCenter->getImageWidth() + 1;
 //	end.y = start.y + size.y;
 //	IRegion2D clipRegion;
-//	
+//
 //	TheDisplay->setClipRegion()
 //	for( i = 0; i < pieces; i++ )
 //	{
@@ -378,12 +378,12 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 	end.y = start.y + size.y;
 	TheWindowManager->winDrawImage(backRight, start.x, start.y, end.x, end.y);
 
-	
+
 	ICoord2D barWindowSize;  // end point of bar from window origin
 
 	barWindowSize.x = ((size.x - 20) * progress) / 100;
 	barWindowSize.y = size.y;
-		
+
 	pieces = barWindowSize.x / barCenter->getImageWidth();
  	// draw the pieces
 	start.x = origin.x +10;
@@ -393,25 +393,24 @@ void W3DGadgetProgressBarImageDraw( GameWindow *window, WinInstanceData *instDat
 	{
 
 		end.x = start.x + barCenter->getImageWidth();
-		TheWindowManager->winDrawImage( barCenter, 
+		TheWindowManager->winDrawImage( barCenter,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x += barCenter->getImageWidth();
 
-	}  // end for i
+	}
 	start.x = origin.x + 10 + barCenter->getImageWidth() * pieces;
 	//pieces = (size.x - barWindowSize.x -20) / barRight->getImageWidth();
-	//Changed By Saad for flashing grey piece
 	pieces = ((size.x - 20) / barCenter->getImageWidth()) - pieces;
 	for( i = 0; i < pieces; i++ )
 	{
 
 		end.x = start.x + barRight->getImageWidth();
-		TheWindowManager->winDrawImage( barRight, 
+		TheWindowManager->winDrawImage( barRight,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x += barRight->getImageWidth();
 
-	}  // end for i
+	}
 
-}  // end W3DGadgetProgressBarImageDraw
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp
index 6d7a7a048e5..dbb3c3e54be 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp
@@ -25,12 +25,12 @@
 
 // FILE: W3DPushButton.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -58,11 +58,6 @@
 #include "W3DDevice/GameClient/W3DGadget.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off) 
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -106,17 +101,17 @@ static void drawButtonText( GameWindow *window, WinInstanceData *instData )
 	{
 		textColor = window->winGetDisabledTextColor();
 		dropColor = window->winGetDisabledTextBorderColor();
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		textColor = window->winGetHiliteTextColor();
 		dropColor = window->winGetHiliteTextBorderColor();
-	}  // end else if, hilited
+	}
 	else
 	{
 		textColor = window->winGetEnabledTextColor();
 		dropColor = window->winGetEnabledTextBorderColor();
-	}  // end enabled only
+	}
 
 	// set our font to that of our parent if not the same
 	if( text->getFont() != window->winGetFont() )
@@ -141,7 +136,7 @@ static void drawButtonText( GameWindow *window, WinInstanceData *instData )
 	// draw it
 	text->draw( textPos.x, textPos.y, textColor, dropColor );
 
-}  // end drawButtonText
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -177,7 +172,7 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 			border		= GadgetButtonGetDisabledBorderColor( window );
 		}
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -192,7 +187,7 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 			border		= GadgetButtonGetHiliteBorderColor( window );
 		}
 
-	}  // end else if, hilited and enabled
+	}
 	else
 	{
 
@@ -207,7 +202,7 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 			border		= GadgetButtonGetEnabledBorderColor( window );
 		}
 
-	}  // end else, enabled only
+	}
 
 	// compute draw position
 	start.x = origin.x;
@@ -222,7 +217,7 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 		TheWindowManager->winOpenRect( border, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	if( color != WIN_COLOR_UNDEFINED )
 	{
@@ -235,7 +230,7 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 		TheWindowManager->winFillRect( color, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw the button text
 	if( instData->getTextLength() )
@@ -246,7 +241,7 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 	{
 		TheDisplay->drawVideoBuffer( instData->m_videoBuffer, origin.x, origin.y, origin.x + size.x, origin.y + size.y );
 	}
-	
+
 	PushButtonData *pData = (PushButtonData *)window->winGetUserData();
 	if( pData )
 	{
@@ -269,14 +264,14 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 			pData->drawClock = NO_CLOCK;
 			window->winSetUserData(pData);
 		}
-		
+
 		if( pData->drawBorder && pData->colorBorder != GAME_COLOR_UNDEFINED )
 		{
 			TheDisplay->drawOpenRect(origin.x -1, origin.y - 1, size.x + 2, size.y + 2,1 , pData->colorBorder);
 		}
 	}
 
-}  // end W3DGadgetPushButtonDraw
+}
 
 
 
@@ -284,12 +279,12 @@ void W3DGadgetPushButtonDraw( GameWindow *window, WinInstanceData *instData )
 // W3DGadgetPushButtonImageDraw ===============================================
 /** Draw pushbutton with user supplied images */
 //=============================================================================
-void W3DGadgetPushButtonImageDraw( GameWindow *window, 
+void W3DGadgetPushButtonImageDraw( GameWindow *window,
 																	 WinInstanceData *instData )
 {
 	// if we return NULL then we'll call the one picture drawing code, if we return a value
 	// then we'll call the 3 picture drawing code
-	if( GadgetButtonGetMiddleEnabledImage( window ) ) 
+	if( GadgetButtonGetMiddleEnabledImage( window ) )
 	{
 		if( BitIsSet( instData->getState(), WIN_STATUS_USE_OVERLAY_STATES ) )
 		{
@@ -315,7 +310,7 @@ void W3DGadgetPushButtonImageDraw( GameWindow *window,
 	}
 }
 
-void W3DGadgetPushButtonImageDrawOne( GameWindow *window, 
+void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 																	 WinInstanceData *instData )
 {
 	const Image *image = NULL;
@@ -339,7 +334,7 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 			else
 				image			= GadgetButtonGetDisabledImage( window );
 
-		}  // end if, disabled
+		}
 		else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 		{
 
@@ -348,13 +343,13 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 			else
 				image			= GadgetButtonGetHiliteImage( window );
 
-		}  // end else if, hilited and enabled
+		}
 		else
 		{
 
 			if( BitIsSet( instData->getState(), WIN_STATE_SELECTED ) )
 				image			= GadgetButtonGetHiliteSelectedImage( window );
-		}  // end else, enabled only
+		}
 	}
 
 
@@ -379,7 +374,7 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 		Int colorMultiplier = 0xffffffff;
 
 		if(BitIsSet( window->winGetStatus(), WIN_STATUS_USE_OVERLAY_STATES ) )
-		{	
+		{
 			//we're using a new drawing system which does "grayscale" disabled buttons using original color artwork.
 			if( !BitIsSet( window->winGetStatus(), WIN_STATUS_ENABLED ) )
 			{
@@ -399,7 +394,7 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 			}
 		}
 		TheDisplay->drawImage( image, start.x, start.y, end.x, end.y, colorMultiplier, drawMode );
-	}  // end if
+	}
 
 	// draw the button text
 	if( instData->getTextLength() )
@@ -424,7 +419,7 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 			//Render the overlay image now.
 			TheDisplay->drawImage( pData->overlayImage, start.x, start.y, start.x + size.x, start.y + size.y );
 		}
-		
+
 		if( pData->drawClock )
 		{
 			if( pData->drawClock == NORMAL_CLOCK )
@@ -438,10 +433,10 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 			pData->drawClock = NO_CLOCK;
 			window->winSetUserData(pData);
 		}
-		
+
 		if( pData->drawBorder && pData->colorBorder != GAME_COLOR_UNDEFINED )
 		{
-			
+
 			TheDisplay->drawOpenRect(start.x - 1, start.y - 1, size.x + 2, size.y + 2, 1, pData->colorBorder);
 
 		}
@@ -455,7 +450,7 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 		static const Image *hilitedOverlayIcon = TheMappedImageCollection->findImageByName( "Cameo_push" );
 		TheDisplay->drawImage( hilitedOverlayIcon, start.x, start.y, start.x + size.x, start.y + size.y );
 	}
-	
+
 	if( BitIsSet( window->winGetStatus(), WIN_STATUS_USE_OVERLAY_STATES ) )
 	{
 		image = NULL;
@@ -486,7 +481,7 @@ void W3DGadgetPushButtonImageDrawOne( GameWindow *window,
 			}
 		}
 	}
-}  // end W3DGadgetPushButtonImageDraw
+}
 
 
 void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *instData )
@@ -528,7 +523,7 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 
 		}
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -547,7 +542,7 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 
 		}
 
-	}  // end else if, hilited and enabled
+	}
 	else
 	{
 
@@ -566,10 +561,10 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 
 		}
 
-	}  // end else, enabled only
+	}
 
 	// sanity, we need to have these images to make it look right
-	if( leftImage == NULL || rightImage == NULL || 
+	if( leftImage == NULL || rightImage == NULL ||
 			centerImage == NULL )
 		return;
 
@@ -592,7 +587,7 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 
 	// get width we have to draw our repeating center in
 	centerWidth = rightStart.x - leftEnd.x;
-	
+
 	if( centerWidth <= 0)
 	{
 		// draw left end
@@ -611,7 +606,7 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 	}
 	else
 	{
-		
+
 		// how many whole repeating pieces will fit in that width
 		pieces = centerWidth / centerImage->getImageWidth();
 
@@ -623,12 +618,12 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 		{
 
 			end.x = start.x + centerImage->getImageWidth();
-			TheWindowManager->winDrawImage( centerImage, 
+			TheWindowManager->winDrawImage( centerImage,
 																			start.x, start.y,
 																			end.x, end.y );
 			start.x += centerImage->getImageWidth();
 
-		}  // end for i
+		}
 
 		// we will draw the image but clip the parts we don't want to show
 		IRegion2D reg;
@@ -659,7 +654,7 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 		end.y = start.y + size.y;
 		TheWindowManager->winDrawImage(rightImage, start.x, start.y, end.x, end.y);
 	}
-	
+
 	// draw the button text
 	if( instData->getTextLength() )
 		drawButtonText( window, instData );
@@ -697,7 +692,7 @@ void W3DGadgetPushButtonImageDrawThree(GameWindow *window, WinInstanceData *inst
 			pData->drawClock = NO_CLOCK;
 			window->winSetUserData(pData);
 		}
-		
+
 		if( pData->drawBorder && pData->colorBorder != GAME_COLOR_UNDEFINED )
 		{
 			TheDisplay->drawOpenRect(start.x - 1, start.y - 1, size.x + 2, size.y + 2, 1, pData->colorBorder);
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DRadioButton.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DRadioButton.cpp
index 9c695b86d4a..f3dd9dde95e 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DRadioButton.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DRadioButton.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DRadioButton.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -86,17 +86,17 @@ static void drawRadioButtonText( GameWindow *window, WinInstanceData *instData )
 	{
 		textColor = window->winGetDisabledTextColor();
 		dropColor = window->winGetDisabledTextBorderColor();
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 		textColor = window->winGetHiliteTextColor();
 		dropColor = window->winGetHiliteTextBorderColor();
-	}  // end else if, hilited
+	}
 	else
 	{
 		textColor = window->winGetEnabledTextColor();
 		dropColor = window->winGetEnabledTextBorderColor();
-	}  // end enabled only
+	}
 
 	// set our font to that of our parent if not the same
 	if( text->getFont() != window->winGetFont() )
@@ -112,7 +112,7 @@ static void drawRadioButtonText( GameWindow *window, WinInstanceData *instData )
 	// draw it
 	text->draw( textPos.x, textPos.y, textColor, dropColor );
 
-}  // end drawRadioButtonText
+}
 
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
 
@@ -162,11 +162,11 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 				boxBorder		= GadgetRadioGetDisabledUncheckedBoxBorderColor( window );
 		}
 
-	}  // end if
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
-		// hilited background 
+		// hilited background
 		backColor			= GadgetRadioGetHiliteColor( window );
 		backBorder		= GadgetRadioGetHiliteBorderColor( window );
 
@@ -182,11 +182,11 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 			boxBorder		= GadgetRadioGetHiliteUncheckedBoxBorderColor( window );
 		}
 
-	}  // end else if
+	}
 	else
 	{
 
-		// enabled background 
+		// enabled background
 		backColor			= GadgetRadioGetEnabledColor( window );
 		backBorder		= GadgetRadioGetEnabledBorderColor( window );
 
@@ -202,14 +202,14 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 			boxBorder		= GadgetRadioGetEnabledUncheckedBoxBorderColor( window );
 		}
 
-	}  // end else
+	}
 
 	// draw background border
 	start.x = origin.x;
 	start.y = origin.y;
 	end.x = start.x + size.x;
 	end.y = start.y + size.y;
-	TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw the background
@@ -217,17 +217,17 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 	start.y++;
 	end.x--;
 	end.y--;
-	TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 
-	
+
 	// draw box border
 	start.x = origin.x + size.y;
 	start.y = origin.y;
 	end.x = start.x;
 	end.y = start.y + size.y;
-	TheWindowManager->winDrawLine( backBorder, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winDrawLine( backBorder, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw box for button
@@ -235,7 +235,7 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 	start.y = origin.y + 1;
 	end.x	= origin.x + size.y -1;
 	end.y = origin.y + size.y -1;
-	TheWindowManager->winFillRect( boxColor, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winFillRect( boxColor, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw box border
@@ -243,7 +243,7 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 	start.y = origin.y;
 	end.x = start.x;
 	end.y = start.y + size.y;
-	TheWindowManager->winDrawLine( backBorder, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winDrawLine( backBorder, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 
 	// draw box for button
@@ -251,18 +251,18 @@ void W3DGadgetRadioButtonDraw( GameWindow *window, WinInstanceData *instData )
 	start.y = origin.y + 1;
 	end.x	= origin.x + size.x -1;
 	end.y = origin.y + size.y -1;
-	TheWindowManager->winFillRect( boxColor, WIN_DRAW_LINE_WIDTH, 
+	TheWindowManager->winFillRect( boxColor, WIN_DRAW_LINE_WIDTH,
 																 start.x, start.y, end.x, end.y );
 	// draw the button text
 	if( instData->getTextLength() )
 		drawRadioButtonText( window, instData );
 
-	
 
-}  // end W3DGadgetRadioButtonDraw
+
+}
 
 
-void W3DGadgetRadioButtonImageDraw( GameWindow *window, 
+void W3DGadgetRadioButtonImageDraw( GameWindow *window,
 																	WinInstanceData *instData )
 {
 	const Image *leftImage, *rightImage, *centerImage;
@@ -286,7 +286,7 @@ void W3DGadgetRadioButtonImageDraw( GameWindow *window,
 		leftImage					= GadgetRadioGetSelectedImage( window );
 		centerImage				= GadgetRadioGetSelectedUncheckedBoxImage( window );
 		rightImage				= GadgetRadioGetSelectedCheckedBoxImage( window );
-		
+
 	}
 	else if( BitIsSet( window->winGetStatus(), WIN_STATUS_ENABLED ) == FALSE )
 	{
@@ -294,27 +294,27 @@ void W3DGadgetRadioButtonImageDraw( GameWindow *window,
 		leftImage					= GadgetRadioGetDisabledImage( window );
 		centerImage				= GadgetRadioGetDisabledUncheckedBoxImage( window );
 		rightImage				= GadgetRadioGetDisabledCheckedBoxImage( window );
-		
-	}  // end if
+
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
-		// hilited background 
+		// hilited background
 		leftImage					= GadgetRadioGetHiliteImage( window );
 		centerImage				= GadgetRadioGetHiliteUncheckedBoxImage( window );
 		rightImage				= GadgetRadioGetHiliteCheckedBoxImage( window );
-		
-	}  // end else if
+
+	}
 	else
 	{
-		// enabled background 
+		// enabled background
 		leftImage					= GadgetRadioGetEnabledImage( window );
 		centerImage				= GadgetRadioGetEnabledUncheckedBoxImage( window );
 		rightImage				= GadgetRadioGetEnabledCheckedBoxImage( window );
-		
-	}  // end else
+
+	}
 
 	// sanity, we need to have these images to make it look right
-	if( leftImage == NULL || centerImage == NULL || 
+	if( leftImage == NULL || centerImage == NULL ||
 			rightImage == NULL )
 		return;
 
@@ -347,7 +347,7 @@ void W3DGadgetRadioButtonImageDraw( GameWindow *window,
 	start.x = leftEnd.x;
 	start.y = origin.y + yOffset;
 	end.y =origin.y + size.y + yOffset;
-	
+
 	clipLeft.lo.x = leftEnd.x;
 	clipLeft.lo.y = origin.y;
 	clipLeft.hi.y = leftEnd.y;
@@ -355,17 +355,17 @@ void W3DGadgetRadioButtonImageDraw( GameWindow *window,
 
 
 	TheDisplay->setClipRegion(&clipLeft);
-	
+
 	for( i = 0; i < pieces; i++ )
 	{
 		end.x = start.x + centerImage->getImageWidth();
-		TheWindowManager->winDrawImage( centerImage, 
+		TheWindowManager->winDrawImage( centerImage,
 																		start.x, start.y,
-																		end.x, end.y );	
+																		end.x, end.y );
 		start.x += centerImage->getImageWidth();
-	}  // end for i
-	
-	TheDisplay->enableClipping(FALSE);	
+	}
+
+	TheDisplay->enableClipping(FALSE);
 	// draw left end
 	start.x = origin.x + xOffset;
 	start.y = origin.y + yOffset;
@@ -382,6 +382,6 @@ void W3DGadgetRadioButtonImageDraw( GameWindow *window,
 	if( instData->getTextLength() )
 		drawRadioButtonText( window, instData );
 
-	
-}  // end W3DGadgetHorizontalSliderImageDraw
+
+}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp
index 7f779a841d9..2c837c45747 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DStaticText.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -70,11 +70,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // drawStaticTextText =========================================================
 /** Draw the text for a static text window */
@@ -90,16 +85,16 @@ static void drawStaticTextText( GameWindow *window, WinInstanceData *instData,
 	// sanity
 	if( text == NULL || text->getTextLength() == 0 )
 		return;
-	
+
 	// get window position and size
 	window->winGetScreenPosition( &origin.x, &origin.y );
 	window->winGetSize( &size.x, &size.y );
-	
+
 	// Set the text Wrap width
 	wordWrap = size.x - 10;
 	//if(wordWrap == 89)
 	//	wordWrap = 95;
-	text->setWordWrap(wordWrap);	
+	text->setWordWrap(wordWrap);
 	if( BitIsSet(window->winGetStatus(), WIN_STATUS_WRAP_CENTERED)		)
 		text->setWordWrapCentered(TRUE);
 	else
@@ -112,15 +107,15 @@ static void drawStaticTextText( GameWindow *window, WinInstanceData *instData,
 
 	// how much space will this text take up
 	text->getSize( &textWidth, &textHeight );
-		
+
 	//Init the clip region
 	clipRegion.lo.x = origin.x ;
 	clipRegion.lo.y = origin.y ;
 	clipRegion.hi.x = origin.x + size.x ;
 	clipRegion.hi.y = origin.y + size.y;
-	
+
 	// horizontal centering?
-	if( tData->centered ) 
+	if( tData->centered )
 	{
 		textPos.x = origin.x + (size.x / 2) - (textWidth / 2);
 	}
@@ -130,7 +125,7 @@ static void drawStaticTextText( GameWindow *window, WinInstanceData *instData,
 	}
 
 	// vertical centering?
-	if ( tData->centeredVertically ) 
+	if ( tData->centeredVertically )
 	{
 		textPos.y = origin.y + (size.y / 2) - (textHeight / 2);
 	}
@@ -143,7 +138,7 @@ static void drawStaticTextText( GameWindow *window, WinInstanceData *instData,
 	text->setClipRegion(&clipRegion);
 	text->draw( textPos.x, textPos.y, textColor, textDropColor );
 
-}  // end drawStaticTextText
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -171,7 +166,7 @@ void W3DGadgetStaticTextDraw( GameWindow *window, WinInstanceData *instData )
 		textColor					= window->winGetDisabledTextColor();
 		textOutlineColor	= window->winGetDisabledTextBorderColor();
 
-	}  // end if, disabled
+	}
 	else
 	{
 
@@ -180,7 +175,7 @@ void W3DGadgetStaticTextDraw( GameWindow *window, WinInstanceData *instData )
 		textColor					= window->winGetEnabledTextColor();
 		textOutlineColor	= window->winGetEnabledTextBorderColor();
 
-	}  // end else, enabled
+	}
 
 	// draw the back border
 	if( backBorder != WIN_COLOR_UNDEFINED )
@@ -190,10 +185,10 @@ void W3DGadgetStaticTextDraw( GameWindow *window, WinInstanceData *instData )
 		start.y = origin.y;
 		end.x = start.x + size.x;
 		end.y = start.y + size.y;
-		TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH, 
+		TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw the back fill area
 	if( backColor != WIN_COLOR_UNDEFINED )
@@ -205,15 +200,15 @@ void W3DGadgetStaticTextDraw( GameWindow *window, WinInstanceData *instData )
 		end.y = start.y + size.y - 2;
 		TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
-	}  // end if
+	}
 
 	// draw the text
   if( tData->text && (textColor != WIN_COLOR_UNDEFINED) )
 		drawStaticTextText( window, instData, textColor, textOutlineColor );
 
-  
 
-}  // end W3DGadgetStaticTextDraw
+
+}
 
 // W3DGadgetStaticTextImageDraw ===============================================
 /** Draw colored text field with user supplied images */
@@ -237,7 +232,7 @@ void W3DGadgetStaticTextImageDraw( GameWindow *window, WinInstanceData *instData
 		textColor					= window->winGetDisabledTextColor();
 		textOutlineColor	= window->winGetDisabledTextBorderColor();
 
-	}  // end if, disabled
+	}
 	else
 	{
 
@@ -245,7 +240,7 @@ void W3DGadgetStaticTextImageDraw( GameWindow *window, WinInstanceData *instData
 		textColor					= window->winGetEnabledTextColor();
 		textOutlineColor	= window->winGetEnabledTextBorderColor();
 
-	}  // end else, enabled
+	}
 
 	// draw the back image
 	if( image )
@@ -257,13 +252,13 @@ void W3DGadgetStaticTextImageDraw( GameWindow *window, WinInstanceData *instData
 		end.y = start.y + size.y;
 		TheWindowManager->winDrawImage( image, start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw the text
   if( tData->text && (textColor != WIN_COLOR_UNDEFINED) )
 		drawStaticTextText( window, instData, textColor, textOutlineColor );
 
-  
 
-}  // end W3DGadgetStaticTextImageDraw
+
+}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTabControl.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTabControl.cpp
index 1cfc3928fc6..6ea10bd26a0 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTabControl.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTabControl.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DTabControl.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -115,17 +115,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabZero( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabZero( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 0 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabZero( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabZero( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabZero( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabZero( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -149,17 +149,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabOne( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabOne( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 1 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabOne( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabOne( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabOne( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabOne( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -183,17 +183,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabTwo( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabTwo( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 2 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabTwo( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabTwo( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabTwo( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabTwo( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -217,17 +217,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabThree( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabThree( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 3 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabThree( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabThree( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabThree( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabThree( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -251,17 +251,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabFour( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabFour( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 4 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabFour( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabFour( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabFour( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabFour( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -285,17 +285,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabFive( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabFive( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 5 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabFive( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabFive( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabFive( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabFive( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -319,17 +319,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabSix( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabSix( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 6 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabSix( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabSix( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabSix( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabSix( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -353,17 +353,17 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		{//Disabled
 			color			= GadgetTabControlGetDisabledColorTabSeven( tabControl );
 			border		= GadgetTabControlGetDisabledBorderColorTabSeven( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 7 )
 		{//Hilited/Active
 			color			= GadgetTabControlGetHiliteColorTabSeven( tabControl );
 			border		= GadgetTabControlGetHiliteBorderColorTabSeven( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			color			= GadgetTabControlGetEnabledColorTabSeven( tabControl );
 			border		= GadgetTabControlGetEnabledBorderColorTabSeven( tabControl );
-		} 
+		}
 
 		// box and border
 		if( border != WIN_COLOR_UNDEFINED )
@@ -378,12 +378,12 @@ void W3DGadgetTabControlDraw( GameWindow *tabControl, WinInstanceData *instData
 		}
 	}
 
-}  // end W3DGadgetTabControlDraw
+}
 
 // W3DGadgetRadioButtonImageDraw ==============================================
 /** Draw tabs with user supplied images */
 //=============================================================================
-void W3DGadgetTabControlImageDraw( GameWindow *tabControl, 
+void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																	WinInstanceData *instData )
 {
 	ICoord2D origin, size;
@@ -425,15 +425,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[0] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabZero( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 0 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabZero( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabZero( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -441,7 +441,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -454,15 +454,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[1] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabOne( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 1 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabOne( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabOne( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -470,7 +470,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -483,15 +483,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[2] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabTwo( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 2 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabTwo( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabTwo( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -499,7 +499,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -512,15 +512,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[3] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabThree( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 3 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabThree( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabThree( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -528,7 +528,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -541,15 +541,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[4] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabFour( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 4 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabFour( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabFour( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -557,7 +557,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -570,15 +570,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[5] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabFive( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 5 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabFive( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabFive( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -586,7 +586,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -599,15 +599,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[6] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabSix( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 6 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabSix( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabSix( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -615,7 +615,7 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
@@ -628,15 +628,15 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 		if( tabData->subPaneDisabled[7] )
 		{//Disabled
 			image			= GadgetTabControlGetDisabledImageTabSeven( tabControl );
-		}  
+		}
 		else if( tabData->activeTab == 7 )
 		{//Hilited/Active
 			image			= GadgetTabControlGetHiliteImageTabSeven( tabControl );
-		}  
+		}
 		else
 		{//Just enabled
 			image			= GadgetTabControlGetEnabledImageTabSeven( tabControl );
-		} 
+		}
 
 		if( image != NULL )
 		{
@@ -644,9 +644,9 @@ void W3DGadgetTabControlImageDraw( GameWindow *tabControl,
 																			tabX,
 																			tabY,
 																			tabX + tabWidth,
-																			tabY + tabHeight 
+																			tabY + tabHeight
 																			);
 		}
 	}
 
-}  // end W3DGadgetTabControlImageDraw
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp
index a81880fdd72..9a34a5ee159 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DTextEntry.cpp /////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -53,11 +53,6 @@
 #include "W3DDevice/GameClient/W3DGadget.h"
 #include "W3DDevice/GameClient/W3DDisplay.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // DEFINES ////////////////////////////////////////////////////////////////////
 
@@ -75,7 +70,7 @@
 
 // drawTextEntryText ==========================================================
 //=============================================================================
-static void drawTextEntryText( GameWindow *window, WinInstanceData *instData,	
+static void drawTextEntryText( GameWindow *window, WinInstanceData *instData,
 															 Color textColor, Color textDropColor,
 															 Color compositeColor, Color compositeDropColor,
 															 Int x, Int y, Int width, Int fontHeight )
@@ -162,7 +157,7 @@ static void drawTextEntryText( GameWindow *window, WinInstanceData *instData,
 			cursorPos = textWidth + x;
 		}
 		else
-		{	
+		{
 			Int div = textWidth / (width / 2) - 1;
 			text->draw(x - (div * (width/2)), y, textColor, textDropColor);
 			cursorPos = textWidth - (div * (width/2)) + x;
@@ -204,12 +199,12 @@ static void drawTextEntryText( GameWindow *window, WinInstanceData *instData,
 		parent = NULL;
 
 	if( (window == TheWindowManager->winGetFocus() || (parent && parent == TheWindowManager->winGetFocus())) && ((drawCnt++ >> 3) & 0x1) )
-		TheWindowManager->winFillRect( textColor, WIN_DRAW_LINE_WIDTH, 
-																	 cursorPos, origin.y + 3, 
+		TheWindowManager->winFillRect( textColor, WIN_DRAW_LINE_WIDTH,
+																	 cursorPos, origin.y + 3,
 																	 cursorPos + 2, origin.y + size.y - 3 );
-	window->winSetCursorPosition( cursorPos + 2 - origin.x, 0 ); 
+	window->winSetCursorPosition( cursorPos + 2 - origin.x, 0 );
 
-}  // end drawTextEntryText
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -222,7 +217,7 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 {
 	EntryData *e = (EntryData *)window->winGetUserData();
 	ICoord2D origin, size, start, end;
-	Color backBorder, backColor, textColor, textBorder, 
+	Color backBorder, backColor, textColor, textBorder,
 			compositeColor, compositeBorder;
 
 	// cancel unichar flag
@@ -243,7 +238,7 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 		backColor		= GadgetTextEntryGetDisabledColor( window );
 		backBorder	= GadgetTextEntryGetDisabledBorderColor( window );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -254,7 +249,7 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 		backColor		= GadgetTextEntryGetHiliteColor( window );
 		backBorder	= GadgetTextEntryGetHiliteBorderColor( window );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
@@ -265,7 +260,7 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 		backColor		= GadgetTextEntryGetEnabledColor( window );
 		backBorder	= GadgetTextEntryGetEnabledBorderColor( window );
 
-	}  // end else, just enabled
+	}
 
 	// draw the back border
 	if( backBorder != WIN_COLOR_UNDEFINED )
@@ -278,7 +273,7 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 		TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw the filled back
 	if( backColor != WIN_COLOR_UNDEFINED )
@@ -291,7 +286,7 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 		TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 
 	// draw the text
 	Int fontHeight = TheWindowManager->winFontHeight( instData->getFont() );
@@ -309,9 +304,9 @@ void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData )
 	drawTextEntryText( window, instData, textColor, textBorder, compositeColor, compositeBorder,
 										 start.x, start.y, width, fontHeight );
 
-	
 
-}  // end W3DGadgetTextEntryDraw
+
+}
 
 // W3DGadgetTextEntryImageDraw ================================================
 /** Draw horizontal slider with user supplied images */
@@ -350,7 +345,7 @@ void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData
 		centerImage				= GadgetTextEntryGetDisabledImageCenter( window );
 		smallCenterImage	= GadgetTextEntryGetDisabledImageSmallCenter( window );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -363,7 +358,7 @@ void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData
 		centerImage				= GadgetTextEntryGetHiliteImageCenter( window );
 		smallCenterImage	= GadgetTextEntryGetHiliteImageSmallCenter( window );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
@@ -376,7 +371,7 @@ void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData
 		centerImage				= GadgetTextEntryGetEnabledImageCenter( window );
 		smallCenterImage	= GadgetTextEntryGetEnabledImageSmallCenter( window );
 
-	}  // end else, just enabled
+	}
 
 	// get image sizes for the ends
 	ICoord2D leftSize, rightSize;
@@ -409,12 +404,12 @@ void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData
 	{
 
 		end.x = start.x + centerImage->getImageWidth();
-		TheWindowManager->winDrawImage( centerImage, 
+		TheWindowManager->winDrawImage( centerImage,
 																		start.x, start.y,
 																		end.x, end.y );
 		start.x += centerImage->getImageWidth();
 
-	}  // end for i
+	}
 
 	//
 	// how many small repeating pieces will fit in the gap from where the
@@ -433,7 +428,7 @@ void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData
 																		end.x, end.y );
 		start.x += smallCenterImage->getImageWidth();
 
-	}  // end for i
+	}
 
 	// draw left end
 	start.x = origin.x + xOffset;
@@ -463,6 +458,6 @@ void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData
 	drawTextEntryText( window, instData, textColor, textBorder, compositeColor, compositeBorder,
 										 start.x, start.y, width, fontHeight );
 
-	
 
-}  // end W3DGadgetTextEntryImageDraw
+
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp
index 228d92a2011..56545f26a05 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp
@@ -24,21 +24,21 @@
 
 // FILE: .cpp /////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
-// Project:   
+// Project:
 //
 // File name: .cpp
 //
-// Created:   
+// Created:
 //
-// Desc:      
+// Desc:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -72,7 +72,7 @@
 // W3DGadgetVerticalSliderDraw ================================================
 /** Draw colored vertical slider using standard graphics */
 //=============================================================================
-void W3DGadgetVerticalSliderDraw( GameWindow *window, 
+void W3DGadgetVerticalSliderDraw( GameWindow *window,
 																	WinInstanceData *instData )
 {
 	Color backBorder, backColor;
@@ -89,21 +89,21 @@ void W3DGadgetVerticalSliderDraw( GameWindow *window,
 		backBorder		= GadgetSliderGetDisabledBorderColor( window );
 		backColor			= GadgetSliderGetDisabledColor( window );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
 		backBorder		= GadgetSliderGetHiliteBorderColor( window );
 		backColor			= GadgetSliderGetHiliteColor( window );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
 		backBorder		= GadgetSliderGetEnabledBorderColor( window );
 		backColor			= GadgetSliderGetEnabledColor( window );
 
-	}  // end else, enabled
+	}
 
 	// draw background border and rect over whole control
 	if( backBorder != WIN_COLOR_UNDEFINED )
@@ -116,7 +116,7 @@ void W3DGadgetVerticalSliderDraw( GameWindow *window,
 		TheWindowManager->winOpenRect( backBorder, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
 	if( backColor != WIN_COLOR_UNDEFINED )
 	{
 
@@ -127,16 +127,16 @@ void W3DGadgetVerticalSliderDraw( GameWindow *window,
 		TheWindowManager->winFillRect( backColor, WIN_DRAW_LINE_WIDTH,
 																	 start.x, start.y, end.x, end.y );
 
-	}  // end if
+	}
+
 
-	
 
-}  // end W3DGadgetVerticalSliderDraw
+}
 
 // W3DGadgetVerticalSliderImageDraw ===========================================
 /** Draw vertical slider with user supplied images */
 //=============================================================================
-void W3DGadgetVerticalSliderImageDraw( GameWindow *window, 
+void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 																			 WinInstanceData *instData )
 {
 	const Image *topImage, *bottomImage, *centerImage, *smallCenterImage;
@@ -161,7 +161,7 @@ void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 		centerImage				= GadgetSliderGetDisabledImageCenter( window );
 		smallCenterImage	= GadgetSliderGetDisabledImageSmallCenter( window );
 
-	}  // end if, disabled
+	}
 	else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 	{
 
@@ -170,7 +170,7 @@ void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 		centerImage				= GadgetSliderGetHiliteImageCenter( window );
 		smallCenterImage	= GadgetSliderGetHiliteImageSmallCenter( window );
 
-	}  // end else if, hilited
+	}
 	else
 	{
 
@@ -179,10 +179,10 @@ void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 		centerImage				= GadgetSliderGetEnabledImageCenter( window );
 		smallCenterImage	= GadgetSliderGetEnabledImageSmallCenter( window );
 
-	}  // end else, enabled
+	}
 
 	// sanity, we need to have these images to make it look right
-	if( topImage == NULL || bottomImage == NULL || 
+	if( topImage == NULL || bottomImage == NULL ||
 			centerImage == NULL || smallCenterImage == NULL )
 		return;
 
@@ -241,7 +241,7 @@ void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 			start.y += centerImage->getImageHeight();
 			end.y += centerImage->getImageHeight();
 
-		}  // end for i
+		}
 
 		//
 		// how many small repeating pieces will fit in the gap from where the
@@ -260,7 +260,7 @@ void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 			start.y += smallCenterImage->getImageHeight();
 			end.y += smallCenterImage->getImageHeight();
 
-		}  // end for i
+		}
 
 		// draw top end
 		start.x = origin.x + xOffset;
@@ -274,8 +274,8 @@ void W3DGadgetVerticalSliderImageDraw( GameWindow *window,
 		end.y = start.y + bottomSize.y;
 		TheWindowManager->winDrawImage(bottomImage, start.x, start.y, end.x, end.y);
 	}
-	
 
-}  // end W3DGadgetVerticalSliderImageDraw
+
+}
 
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
index d28f21b2e89..0352b2301a5 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DGameFont.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -73,56 +73,33 @@
 //=============================================================================
 Bool W3DFontLibrary::loadFontData( GameFont *font )
 {
-	FontCharsClass *fontChar;
-
 	// sanity
 	if( font == NULL )
 		return FALSE;
 
-	if ((UnsignedInt)font->pointSize > 100)	//sanity check the size - anything over 100 is probably wrong. -MW
-		fontChar = NULL;
-	else
-	{	// get the font data from the asset manager
-		fontChar = WW3DAssetManager::
-									Get_Instance()->Get_FontChars( font->nameString.str(), font->pointSize,
-																								 font->bold ? true : false );
-	}
+	const char* name = font->nameString.str();
+	const Int size = font->pointSize;
+	const Bool bold = font->bold;
+
+	// get the font data from the asset manager
+	FontCharsClass *fontChar = WW3DAssetManager::Get_Instance()->Get_FontChars( name, size, bold );
 
 	if( fontChar == NULL )
 	{
-
-		DEBUG_LOG(( "W3D load font: unable to find font '%s' from asset manager\n",
-						 font->nameString.str() ));
-		DEBUG_ASSERTCRASH(fontChar, ("Missing or Corrupted Font.  Pleas see log for details"));
+		DEBUG_CRASH(( "Unable to find font '%s' in Asset Manager", name ));
 		return FALSE;
-
-	}  // end if
+	}
 
 	// assign font data
 	font->fontData = fontChar;
 	font->height = fontChar->Get_Char_Height();
 
-	FontCharsClass *unicodeFontChar = NULL;
-
-	// load unicode of same point size
-	if(TheGlobalLanguageData)
-		unicodeFontChar = WW3DAssetManager::
-									Get_Instance()->Get_FontChars( TheGlobalLanguageData->m_unicodeFontName.str(), font->pointSize,
-																								 font->bold ? true : false );
-	else
-		unicodeFontChar = WW3DAssetManager::
-									Get_Instance()->Get_FontChars( "Arial Unicode MS", font->pointSize,
-																								 font->bold ? true : false );
-
-	if ( unicodeFontChar )
-	{
-		fontChar->AlternateUnicodeFont = unicodeFontChar;
-	}
+	// load Unicode of same point size
+	name = TheGlobalLanguageData ? TheGlobalLanguageData->m_unicodeFontName.str() : "Arial Unicode MS";
+	fontChar->AlternateUnicodeFont = WW3DAssetManager::Get_Instance()->Get_FontChars( name, size, bold );
 
-	// all done and loaded
 	return TRUE;
-
-}  // end loadFont
+}
 
 // W3DFontLibrary::releaseFontData ============================================
 /** Release font data */
@@ -137,10 +114,11 @@ void W3DFontLibrary::releaseFontData( GameFont *font )
 		if(((FontCharsClass *)(font->fontData))->AlternateUnicodeFont)
 			((FontCharsClass *)(font->fontData))->AlternateUnicodeFont->Release_Ref();
 		((FontCharsClass *)(font->fontData))->Release_Ref();
+
+		font->fontData = NULL;
 	}
-	font->fontData = NULL;
-	
-}  // end releaseFont
+
+}
 
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
index 410a93e12b0..dbabe8bfe58 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DGameWindow.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -81,41 +81,41 @@ static const Image *borderPieces[NUM_BORDER_PIECES] = { 0 };
 static void initBorders( void )
 {
 
-	borderPieces[ BORDER_CORNER_UL ] = 
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerUL" ) );
+	borderPieces[ BORDER_CORNER_UL ] =
+						TheMappedImageCollection->findImageByName( "BorderCornerUL" );
 
 	borderPieces[ BORDER_CORNER_UR ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerUR" ) );
+						TheMappedImageCollection->findImageByName( "BorderCornerUR" );
 
 	borderPieces[ BORDER_CORNER_LL ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerLL" ) );
+						TheMappedImageCollection->findImageByName( "BorderCornerLL" );
 
 	borderPieces[ BORDER_CORNER_LR ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerLR" ) );
+						TheMappedImageCollection->findImageByName( "BorderCornerLR" );
 
 	borderPieces[ BORDER_VERTICAL_LEFT ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderLeft" ) );
+						TheMappedImageCollection->findImageByName( "BorderLeft" );
 
 	borderPieces[ BORDER_VERTICAL_LEFT_SHORT ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderLeftShort" ) );
+						TheMappedImageCollection->findImageByName( "BorderLeftShort" );
 
 	borderPieces[ BORDER_HORIZONTAL_TOP ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderTop" ) );
+						TheMappedImageCollection->findImageByName( "BorderTop" );
 
 	borderPieces[ BORDER_HORIZONTAL_TOP_SHORT ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderTopShort" ) );
+						TheMappedImageCollection->findImageByName( "BorderTopShort" );
 
 	borderPieces[ BORDER_VERTICAL_RIGHT ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderRight" ) );
+						TheMappedImageCollection->findImageByName( "BorderRight" );
 
 	borderPieces[ BORDER_VERTICAL_RIGHT_SHORT ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderRightShort" ) );
+						TheMappedImageCollection->findImageByName( "BorderRightShort" );
 
 	borderPieces[ BORDER_HORIZONTAL_BOTTOM ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderBottom" ) );
+						TheMappedImageCollection->findImageByName( "BorderBottom" );
 
 	borderPieces[ BORDER_HORIZONTAL_BOTTOM_SHORT ] =
-						TheMappedImageCollection->findImageByName( AsciiString( "BorderBottomShort" ) );
+						TheMappedImageCollection->findImageByName( "BorderBottomShort" );
 
 	bordersInit = TRUE;
 
@@ -128,7 +128,7 @@ void W3DGameWindow::blitBorderRect( Int x, Int y, Int width, Int height )
 	Int Offset = 15;
 	Int OffsetLower = 5;
 	// init image loc if needed
-	if( bordersInit == FALSE )	
+	if( bordersInit == FALSE )
 		initBorders();
 
 	// save original x, y
@@ -161,7 +161,7 @@ void W3DGameWindow::blitBorderRect( Int x, Int y, Int width, Int height )
 	// x == place to draw remainder if any
 	if( (x2 - x) >= (BORDER_LINE_SIZE / 2) )
 	{
-		
+
 		//Blit Half piece
 		TheDisplay->drawImage( borderPieces[ BORDER_HORIZONTAL_TOP_SHORT ],
 													 x, y, x + halfSize, y + size );
@@ -253,7 +253,7 @@ void W3DGameWindow::blitBorderRect( Int x, Int y, Int width, Int height )
 	TheDisplay->drawImage( borderPieces[ BORDER_CORNER_LR ],
 												 x, y, x + size, y + size );
 
-}  // end blitBorderRect
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -272,14 +272,14 @@ W3DGameWindow::W3DGameWindow( void )
 	m_needPolyDraw = FALSE;
 	m_newTextPos = FALSE;
 
-}  // end W3DGameWindow
+}
 
 // W3DGameWindow::~W3DGameWindow ==============================================
 //=============================================================================
 W3DGameWindow::~W3DGameWindow( void )
 {
 
-}  // end ~W3DGameWindow
+}
 
 // W3DGameWinDefaultDraw ======================================================
 /** The default redraw callback.  Draws the background using either
@@ -293,10 +293,10 @@ void W3DGameWinDefaultDraw( GameWindow *window, WinInstanceData *instData )
 	ICoord2D size;
 	W3DGameWindow *w3dWindow = (W3DGameWindow *)window;
 
-	/** @todo NOTE that we're making a W3DGameWindow cast here, it seems 
-	logical because we are in a W3D draw function so it's reasonable to assume 
-	that we have a W3DGameWindow.  However, we may want to revisit this 
-	type of casting in the future, we have the same problems with the 
+	/** @todo NOTE that we're making a W3DGameWindow cast here, it seems
+	logical because we are in a W3D draw function so it's reasonable to assume
+	that we have a W3DGameWindow.  However, we may want to revisit this
+	type of casting in the future, we have the same problems with the
 	ObjectModules where we cast object modules for their individual methods.
 	Also note that the other W3D implementations of GUI controls are making
 	a similar cast for their device implementation functions */
@@ -330,9 +330,9 @@ void W3DGameWinDefaultDraw( GameWindow *window, WinInstanceData *instData )
 			end.y = start.y + size.y;
 			TheWindowManager->winDrawImage( image, start.x, start.y, end.x, end.y );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 		Color color, borderColor;
@@ -344,39 +344,39 @@ void W3DGameWinDefaultDraw( GameWindow *window, WinInstanceData *instData )
 			color				= window->winGetDisabledColor( 0 );
 			borderColor = window->winGetDisabledBorderColor( 0 );
 
-		}  // end if
+		}
 		else if( BitIsSet( instData->getState(), WIN_STATE_HILITED ) )
 		{
 
 			color				= window->winGetHiliteColor( 0 );
 			borderColor = window->winGetHiliteBorderColor( 0 );
 
-		}  // end else if
+		}
 		else
 		{
 
 			color				= window->winGetEnabledColor( 0 );
 			borderColor = window->winGetEnabledBorderColor( 0 );
 
-		}  // end else
+		}
 
 		//
 		// draw the border at the edges
 		//
 		if( borderColor != WIN_COLOR_UNDEFINED )
-			TheWindowManager->winOpenRect( borderColor, borderWidth, 
-																		 origin.x, origin.y, 
+			TheWindowManager->winOpenRect( borderColor, borderWidth,
+																		 origin.x, origin.y,
 																		 origin.x + size.x, origin.y + size.y );
 
 		// draw filled background
 		if( color != WIN_COLOR_UNDEFINED )
-			TheWindowManager->winFillRect( color, borderWidth, 
+			TheWindowManager->winFillRect( color, borderWidth,
 																		 origin.x + borderWidth,
 																		 origin.y + borderWidth,
 																		 origin.x + size.x - borderWidth,
 																		 origin.y + size.y - borderWidth );
 
-	}  // end else
+	}
 
 	// if we have a video buffer, draw the video buffer
 	if ( instData->m_videoBuffer )
@@ -388,7 +388,7 @@ void W3DGameWinDefaultDraw( GameWindow *window, WinInstanceData *instData )
 		TheDisplay->drawVideoBuffer( instData->m_videoBuffer, pos.x, pos.y, pos.x + size.x, pos.y + size.y );
 	}
 
-}  // end W3DGameWinDefaultDraw
+}
 
 // W3DGameWindow::winDrawBorder ===============================================
 //=============================================================================
@@ -436,7 +436,7 @@ void W3DGameWindow::winDrawBorder( void )
 					{
 						Int textWidth = 0;
 
-						TheWindowManager->winGetTextSize( m_instData.getFont(), 
+						TheWindowManager->winGetTextSize( m_instData.getFont(),
 																							m_instData.getText(),
 																							&textWidth, NULL, 0 );
 						width -= textWidth + 6;
@@ -486,7 +486,7 @@ void W3DGameWindow::winDrawBorder( void )
 						child->winGetSize( &size.x, &size.y );
 						sliderAdjustment = size.y;
 
-					}  // end if
+					}
 
 					if( m_instData.getTextLength() )
 						labelAdjustment = 4;
@@ -511,20 +511,23 @@ void W3DGameWindow::winDrawBorder( void )
 					found = TRUE;
 					break;
 
-			}  // end switch
+			}
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end WinDrawBorder
+}
 
 // W3DGameWindow::winSetFont ==================================================
-/** Set the font for a widow */
+/** Set the font for a window */
 //=============================================================================
 void W3DGameWindow::winSetFont( GameFont *font )
 {
 
+	if (font == NULL)
+		return;
+
 	// extending functionality
 	GameWindow::winSetFont( font );
 
@@ -534,7 +537,7 @@ void W3DGameWindow::winSetFont( GameFont *font )
 	// this is a visual change
 	m_needPolyDraw = TRUE;
 
-}  // end WinSetFont
+}
 
 // W3DGameWindow::winSetText ==================================================
 /** Set the text for window */
@@ -552,8 +555,8 @@ Int W3DGameWindow::winSetText( UnicodeString newText )
 	m_needPolyDraw = TRUE;
 
 	return WIN_ERR_OK;
-		
-}  // end WinSetText
+
+}
 
 // W3DGameWindow::winSetPosition ==============================================
 /** Set window position */
@@ -576,7 +579,7 @@ Int W3DGameWindow::winSetPosition( Int x, Int y )
 
 	return WIN_ERR_OK;
 
-}  // end WinSetPosition
+}
 
 // W3DGameWindow::getTextSize =================================================
 /** Get the size of the text in our inst data */
@@ -590,7 +593,7 @@ void W3DGameWindow::getTextSize( Int *width, Int *height )
 	if( height )
 		*height = extents.Y;
 
-}  // end getTextSize
+}
 
 // W3DGameWindow::getTextLoc ==================================================
 // Set our text rendering location */
@@ -611,9 +614,9 @@ void W3DGameWindow::setTextLoc( Int x, Int y )
 		m_textPos.y = y;
 		m_newTextPos = TRUE;
 
-	}  // end if
+	}
 
-}  // end setTextLoc
+}
 
 // W3DGameWindow::drawText ====================================================
 /** Draw the text in our 2d sentence renderer */
@@ -629,7 +632,7 @@ void W3DGameWindow::drawText( Color color )
 		m_newTextPos = FALSE;
 		needDraw = TRUE;
 
-	}  // end if
+	}
 
 	// if color switch, set new color
 	if( m_currTextColor != color )
@@ -638,13 +641,13 @@ void W3DGameWindow::drawText( Color color )
 		m_currTextColor = color;
 		needDraw = TRUE;
 
-	}  // end if
+	}
 
 	// draw the quads if needed
 	if( needDraw || m_needPolyDraw )
 	{
 		UnsignedInt outline = TheWindowManager->winMakeColor( 0, 0, 0, 255 );
-	
+
 		m_textRenderer.Reset_Polys();
 		m_textRenderer.Set_Location( Vector2( m_textPos.x + 1, m_textPos.y + 1 ) );
 		m_textRenderer.Draw_Sentence( outline );
@@ -654,10 +657,10 @@ void W3DGameWindow::drawText( Color color )
 
 		m_needPolyDraw = FALSE;
 
-	}  // end if
+	}
 
 	// do the render
 	m_textRenderer.Render();
 
-}  // end drawText
+}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
index f25c3a12682..dd0bbb4b757 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
@@ -43,14 +43,14 @@
 W3DGameWindowManager::W3DGameWindowManager( void )
 {
 
-}  // end W3DGameWindowManager
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DGameWindowManager::~W3DGameWindowManager( void )
 {
 
-}  // end ~W3DGameWindowManager
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -60,5 +60,5 @@ void W3DGameWindowManager::init( void )
 	// extend
 	GameWindowManager::init();
 
-}  // end init
+}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp
deleted file mode 100644
index 16f5ece863d..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp
+++ /dev/null
@@ -1,2456 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Heightmap.cpp ////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: Heightmap.cpp
-//
-// Created:   Mark W., John Ahlquist, April/May 2001
-//
-// Desc:      Draw the terrain and scorchmarks in a scene.
-//
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-//         Includes                                                      
-//-----------------------------------------------------------------------------
-
-
-#include "W3DDevice/GameClient/HeightMap.h"
-
-#ifndef USE_FLAT_HEIGHT_MAP // Flat height map uses flattened textures. jba. [3/20/2003]
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assetmgr.h>
-#include <texture.h>
-#include <tri.h>
-#include <colmath.h>
-#include <coltest.h>
-#include <rinfo.h>
-#include <camera.h>
-#include <d3dx8core.h>
-#include "Common/GlobalData.h"
-#include "Common/PerfTimer.h"
-
-#include "GameClient/TerrainVisual.h"
-#include "GameClient/View.h"
-#include "GameClient/Water.h"
-
-#include "GameLogic/AIPathfind.h"
-#include "GameLogic/TerrainLogic.h"
-#include "W3DDevice/GameClient/TerrainTex.h"
-#include "W3DDevice/GameClient/W3DDynamicLight.h"
-#include "W3DDevice/GameClient/W3DScene.h"
-#include "W3DDevice/GameClient/W3DTerrainTracks.h"
-#include "W3DDevice/GameClient/W3DBibBuffer.h"
-#include "W3DDevice/GameClient/W3DTreeBuffer.h"
-#include "W3DDevice/GameClient/W3DPropBuffer.h"
-#include "W3DDevice/GameClient/W3DRoadBuffer.h"
-#include "W3DDevice/GameClient/W3DBridgeBuffer.h"
-#include "W3DDevice/GameClient/W3DWaypointBuffer.h"
-#include "W3DDevice/GameClient/W3DCustomEdging.h"
-#include "W3DDevice/GameClient/WorldHeightMap.h"
-#include "W3DDevice/GameClient/W3DShaderManager.h"
-#include "W3DDevice/GameClient/W3DShadow.h"
-#include "W3DDevice/GameClient/W3DWater.h"
-#include "W3DDevice/GameClient/W3DShroud.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/light.h"
-#include "WW3D2/scene.h"
-#include "W3DDevice/GameClient/W3DPoly.h"
-#include "W3DDevice/GameClient/W3DCustomScene.h"
-
-#include "Common/PerfTimer.h"
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.		 
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#define no_OPTIMIZED_HEIGHTMAP_LIGHTING	01
-// Doesn't work well.  jba.
-
-const Bool HALF_RES_MESH = false;
-
-HeightMapRenderObjClass *TheHeightMap = NULL;
-//-----------------------------------------------------------------------------
-//         Private Data                                                     
-//-----------------------------------------------------------------------------
-#define SC_DETAIL_BLEND ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
-	ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_ENABLE, ShaderClass::DETAILCOLOR_SCALE, ShaderClass::DETAILALPHA_DISABLE) )
-
-static ShaderClass detailOpaqueShader(SC_DETAIL_BLEND);
-
-#define DEFAULT_MAX_FRAME_EXTRABLEND_TILES		256	//default number of terrain tiles rendered per call (must fit in one VB)
-#define DEFAULT_MAX_MAP_EXTRABLEND_TILES		2048	//default size of array allocated to hold all map extra blend tiles.
-#define DEFAULT_MAX_BATCH_SHORELINE_TILES		512	//maximum number of terrain tiles rendered per call (must fit in one VB)
-#define DEFAULT_MAX_MAP_SHORELINE_TILES		4096	//default size of array allocated to hold all map shoreline tiles.
-
-#define ADJUST_FROM_INDEX_TO_REAL(k) ((k-m_map->getBorderSizeInline())*MAP_XY_FACTOR)
-inline Int IABS(Int x) {	if (x>=0) return x; return -x;};
-
-//-----------------------------------------------------------------------------
-//         Private Functions                                               
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// HeightMapRenderObjClass::freeIndexVertexBuffers
-//=============================================================================
-/** Frees the w3d resources used to draw the terrain. */
-//=============================================================================
-void HeightMapRenderObjClass::freeIndexVertexBuffers(void)
-{
-	REF_PTR_RELEASE(m_indexBuffer);
-	if (m_vertexBufferTiles) {
-		for (int i=0; i<m_numVertexBufferTiles; i++)
-			REF_PTR_RELEASE(m_vertexBufferTiles[i]);
-		delete[] m_vertexBufferTiles;
-		m_vertexBufferTiles = NULL;
-	}
-	if (m_vertexBufferBackup) {
-		for (int i=0; i<m_numVertexBufferTiles; i++)
-			delete[] m_vertexBufferBackup[i];
-		delete[] m_vertexBufferBackup;
-		m_vertexBufferBackup = NULL;
-	}
-	m_numVertexBufferTiles = 0;
-
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::freeMapResources
-//=============================================================================
-/** Frees the w3d resources used to draw the terrain. */
-//=============================================================================
-Int HeightMapRenderObjClass::freeMapResources(void)
-{
-	BaseHeightMapRenderObjClass::freeMapResources();
-	freeIndexVertexBuffers();
-
-	return 0;
-}
-
-
-//=============================================================================
-// HeightMapRenderObjClass::doTheDynamicLight
-//=============================================================================
-/** Calculates the diffuse lighting as affected by dynamic lighting. */
-//=============================================================================
-UnsignedInt HeightMapRenderObjClass::doTheDynamicLight(VERTEX_FORMAT *vb, VERTEX_FORMAT *vbMirror, Vector3*light, Vector3*normal,  W3DDynamicLight *pLights[], Int numLights)
-{
-#ifdef USE_NORMALS
-	return;
-#else
-	Real shadeR, shadeG, shadeB;
-	Int diffuse = vbMirror->diffuse;
-#ifdef RTS_DEBUG
-	//vbMirror->diffuse += 30;	// Shows which vertexes are geting touched by dynamic light. debug only.
-#endif
-	
-	// (gth) avoiding the extra divides (compiler unfortunately didn't do this automatically...)
-	const float oo255 = (1.0f/255.0f);  
-	shadeR = ((diffuse>>16)&0x00FF) * oo255;
-	shadeG = ((diffuse>>8)&0x00FF) * oo255;
-	shadeB = (diffuse&0x00FF) * oo255;
-
-	Int alpha = (diffuse>>24)&0x00FF;
-	Int k;
-	for (k=0; k<numLights; k++) {
-		W3DDynamicLight *pLight = pLights[k];
-		if (!pLight->isEnabled()) {
-			continue; // he is turned off.
-		}
-		Vector3 lightDirection(vbMirror->x, vbMirror->y, vbMirror->z);
-		Real factor = 1.0f;
-		switch(pLight->Get_Type()) {	  
-		case LightClass::POINT:
-		case LightClass::SPOT: {
-				Vector3 lightLoc = pLight->Get_Position();
-				lightDirection -= lightLoc;
-				double range, midRange;
-				pLight->Get_Far_Attenuation_Range(midRange, range);
-				Real dist = lightDirection.Length();
-				if (dist >= range) continue;
-				if (midRange < 0.1) continue;
-				factor = 1.0f - (dist - midRange) / (range - midRange);
-				factor = WWMath::Clamp(factor,0.0f,1.0f);
-
-				// (gth) normalize here since we have the length
-				lightDirection /= dist;
-			} 
-			break;
-		case LightClass::DIRECTIONAL:
-			pLight->Get_Spot_Direction(lightDirection);
-			factor = 1.0;
-			break;
-		};
-		
-		// (gth) unneeded due to above normalization
-		//lightDirection.Normalize();
-
-		Vector3 lightRay(-lightDirection.X, -lightDirection.Y, -lightDirection.Z);
-		Real shade = Vector3::Dot_Product(lightRay, *normal); 
-		shade *= factor;
-		Vector3 diffuse;
-		pLight->Get_Diffuse(&diffuse);
-		Vector3 ambient;
-		pLight->Get_Ambient(&ambient);
-		if (shade > 1.0) shade = 1.0;
-		if(shade < 0.0f) shade = 0.0f;
-		shadeR += shade*diffuse.X;
-		shadeG += shade*diffuse.Y;
-		shadeB += shade*diffuse.Z;		
-		shadeR += factor*ambient.X;
-		shadeG += factor*ambient.Y;
-		shadeB += factor*ambient.Z;		
-
-	} 
-	if (shadeR > 1.0) shadeR = 1.0;
-	if(shadeR < 0.0f) shadeR = 0.0f;
-	if (shadeG > 1.0) shadeG = 1.0;
-	if(shadeG < 0.0f) shadeG = 0.0f;
-	if (shadeB > 1.0) shadeB = 1.0;
-	if(shadeB < 0.0f) shadeB = 0.0f;
-	shadeR*=255.0f;
-	shadeG*=255.0f;
-	shadeB*=255.0f;
-
-//	(gth) faster float to int conversion, return the result so we can re-use it.
-//	vb->diffuse=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16) | ((int)alpha << 24);
-	UnsignedInt light_val = WWMath::Float_To_Int_Chop(shadeB) | (WWMath::Float_To_Int_Chop(shadeG) << 8) | (WWMath::Float_To_Int_Chop(shadeR) << 16) | ((int)alpha << 24);
-	vb->diffuse = light_val;
-	return light_val;
-
-#endif
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::getXWithOrigin
-//=============================================================================
-/** Gets the x index that corresponds to the data.  For example, if the columns
-are shifted by 3, index 3 is actually the first row of polygons, or 0.  Yes it
-is confusing, but it makes sliding the map 10x faster.  */
-//=============================================================================
-Int HeightMapRenderObjClass::getXWithOrigin(Int x)
-{
-	x -= m_originX;
-	if (x<0) x+= m_x-1;
-	if (x>= m_x-1) x-=m_x-1;
-#ifdef RTS_DEBUG
-	DEBUG_ASSERTCRASH (x>=0, ("X out of range."));
-	DEBUG_ASSERTCRASH (x<m_x-1, ("X out of range."));
-#endif
-	if (x<0) x = 0;
-	if (x>= m_x-1) x=m_x-1;
-	return x;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::getYWithOrigin
-//=============================================================================
-/** Gets the y index that corresponds to the data.  For example, if the rows
-are shifted by 3, index 3 is actually the first row of polygons, or 0.  Yes it
-is confusing, but it makes sliding the map 10x faster.  */
-//=============================================================================
-Int HeightMapRenderObjClass::getYWithOrigin(Int y)
-{
-	y -= m_originY;
-	if (y<0) y+= m_y-1;
-	if (y>= m_y-1) y-=m_y-1;
-#ifdef RTS_DEBUG
-	DEBUG_ASSERTCRASH (y>=0, ("Y out of range."));
-	DEBUG_ASSERTCRASH (y<m_y-1, ("Y out of range."));
-#endif
-	if (y<0) y = 0;
-	if (y>= m_y-1) y=m_y-1;
-	return y;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::updateVB
-//=============================================================================
-/** Update a rectangular block of the given Vertex Buffer. 
-data is expected to be an array same dimensions as current heightmap
-mapped into this VB.
-*/
-//=============================================================================
-Int HeightMapRenderObjClass::updateVB(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator)
-{
-	Int i,j;
-	Vector3 lightRay[MAX_GLOBAL_LIGHTS];
-	const Coord3D *lightPos;
-	Int xCoord, yCoord;
-	Int vn0,un0,vp1,up1;
-	Vector3 l2r,n2f,normalAtTexel;
-	Int	vertsPerRow=(VERTEX_BUFFER_TILE_LENGTH)*4;	//vertices per row of VB
-
-	Int cellOffset = 1;
-	if (HALF_RES_MESH) {
-		cellOffset = 2;
-	}
-
-	REF_PTR_SET(m_map, pMap);	//update our heightmap pointer in case it changed since last call.
-	if (m_vertexBufferTiles && pMap)
-	{
-#ifdef RTS_DEBUG
-		assert(x0 >= originX && y0 >= originY && x1>x0 && y1>y0 && x1<=originX+VERTEX_BUFFER_TILE_LENGTH && y1<=originY+VERTEX_BUFFER_TILE_LENGTH);
-#endif 
-
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
-		VERTEX_FORMAT *vbHardware = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();
-		VERTEX_FORMAT *vBase = (VERTEX_FORMAT*)data;
-		// Note that we are building the vertex buffer data in the memory buffer, data.
-		// At the bottom, we will copy the final vertex data for one cell into the 
-		// hardware vertex buffer. 
-		
-		for (j=y0; j<y1; j++)
-		{
-			VERTEX_FORMAT *vb = vBase;
-			if (HALF_RES_MESH) {
-				if (j&1) continue;
-				vb += ((j-originY)/2)*vertsPerRow/2;	//skip to correct row in vertex buffer
-				vb += ((x0-originX)/2)*4;		//skip to correct vertex in row.
-			} else {
-				vb += (j-originY)*vertsPerRow;	//skip to correct row in vertex buffer
-				vb += (x0-originX)*4;		//skip to correct vertex in row.
-			}
-			vn0 = getYWithOrigin(j)-cellOffset;
-			if (vn0 < -pMap->getDrawOrgY())
-				vn0=-pMap->getDrawOrgY();
-			vp1 = getYWithOrigin(j+cellOffset)+cellOffset;
-			if (vp1 >= pMap->getYExtent()-pMap->getDrawOrgY())
-				vp1=pMap->getYExtent()-pMap->getDrawOrgY()-1;
-
-			yCoord = getYWithOrigin(j)+pMap->getDrawOrgY();
-			for (i=x0; i<x1; i++)
-			{
-				if (HALF_RES_MESH) {
-					if (i&1) continue;
-				}
-				un0 = getXWithOrigin(i)-cellOffset;
-				if (un0 < -pMap->getDrawOrgX())
-					un0=-pMap->getDrawOrgX();
-				up1 = getXWithOrigin(i+cellOffset)+cellOffset;
-				if (up1 >= pMap->getXExtent()-pMap->getDrawOrgX())
-					up1=pMap->getXExtent()-pMap->getDrawOrgX()-1;
-				xCoord = getXWithOrigin(i)+pMap->getDrawOrgX();
-
-				//update the 4 vertices in this block
-				float U[4], V[4];
-				UnsignedByte alpha[4];
-				float UA[4], VA[4];
-				Bool flipForBlend = false;			 // True if the blend needs the triangles flipped.
-
-				if (pMap) {
-					pMap->getUVData(getXWithOrigin(i),getYWithOrigin(j),U, V, HALF_RES_MESH);
-					pMap->getAlphaUVData(getXWithOrigin(i),getYWithOrigin(j), UA, VA, alpha, &flipForBlend, HALF_RES_MESH);
-				} 
-
-
-				for (Int lightIndex=0; lightIndex < TheGlobalData->m_numGlobalLights; lightIndex++)
-				{
-					lightPos=&TheGlobalData->m_terrainLightPos[lightIndex];
-					lightRay[lightIndex].Set(-lightPos->x,-lightPos->y,	-lightPos->z);
-				}
-
-				//top-left sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset, getYWithOrigin(j)) - pMap->getDisplayHeight(un0, getYWithOrigin(j))));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i), (getYWithOrigin(j)+cellOffset)) - pMap->getDisplayHeight(getXWithOrigin(i), vn0)));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				vb->x=xCoord;
-				vb->y=yCoord;
-				vb->z=  ((float)pMap->getDisplayHeight(getXWithOrigin(i), getYWithOrigin(j)))*MAP_HEIGHT_SCALE;
-				vb->x = ADJUST_FROM_INDEX_TO_REAL(vb->x);
-				vb->y = ADJUST_FROM_INDEX_TO_REAL(vb->y);
-				vb->u1=U[0];
-				vb->v1=V[0];
-				vb->u2=UA[0];
-				vb->v2=VA[0];
-				doTheLight(vb, lightRay, &normalAtTexel, pLightsIterator, alpha[0]);
-				vb++;
-
-				//top-right sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(up1 , getYWithOrigin(j) ) - pMap->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , (getYWithOrigin(j)+cellOffset) ) - pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , vn0 )));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				vb->x=xCoord+cellOffset;
-				vb->y=yCoord;
-				vb->z=  ((float)pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset, getYWithOrigin(j)))*MAP_HEIGHT_SCALE;
-				vb->x = ADJUST_FROM_INDEX_TO_REAL(vb->x);
-				vb->y = ADJUST_FROM_INDEX_TO_REAL(vb->y);
-				vb->u1=U[1];
-				vb->v1=V[1];
-				vb->u2=UA[1];
-				vb->v2=VA[1];
-				doTheLight(vb, lightRay, &normalAtTexel, pLightsIterator, alpha[1]);
-				vb++;
-
-				//bottom-right sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(up1 , (getYWithOrigin(j)+cellOffset) ) - pMap->getDisplayHeight(getXWithOrigin(i) , (getYWithOrigin(j)+cellOffset) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , vp1 ) - pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , getYWithOrigin(j) )));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				vb->x=xCoord+cellOffset;
-				if (yCoord + 1 == pMap->getDrawOrgY() + m_y - 1) { 
-					vb->y=yCoord+1;
-				} else {
-					vb->y=yCoord+cellOffset;
-				}
-				vb->z=  ((float)pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset, getYWithOrigin(j)+cellOffset))*MAP_HEIGHT_SCALE;
-				vb->x = ADJUST_FROM_INDEX_TO_REAL(vb->x);
-				vb->y = ADJUST_FROM_INDEX_TO_REAL(vb->y);
-				vb->u1=U[2];
-				vb->v1=V[2];
-				vb->u2=UA[2];
-				vb->v2=VA[2];
-				doTheLight(vb, lightRay, &normalAtTexel, pLightsIterator, alpha[2]);
-				vb++;
-
-				//bottom-left sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i)+cellOffset , (getYWithOrigin(j)+cellOffset) ) - pMap->getDisplayHeight(un0 , (getYWithOrigin(j)+cellOffset) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(pMap->getDisplayHeight(getXWithOrigin(i) , vp1 ) - pMap->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				if (xCoord == pMap->getDrawOrgX()) { 
-					vb->x=xCoord;
-					//if (vb->x < 0) vb->x = 0;
-				} else {
-					vb->x=xCoord;
-				}
-				if (yCoord + 1 == pMap->getDrawOrgY() + m_y - 1) { 
-					vb->y=yCoord+1;
-				} else {
-					vb->y=yCoord+cellOffset;
-				}
-				vb->z=  ((float)pMap->getDisplayHeight(getXWithOrigin(i), getYWithOrigin(j)+cellOffset))*MAP_HEIGHT_SCALE;
-				vb->x = ADJUST_FROM_INDEX_TO_REAL(vb->x);
-				vb->y = ADJUST_FROM_INDEX_TO_REAL(vb->y);
-				vb->u1=U[3];
-				vb->v1=V[3];
-				vb->u2=UA[3];
-				vb->v2=VA[3];
-				doTheLight(vb, lightRay, &normalAtTexel, pLightsIterator, alpha[3]);
-				vb++;
-
-				VERTEX_FORMAT *pCurVertices = vb-4;
-#ifdef FLIP_TRIANGLES // jba - reduces "diamonding" in some cases, not others.  Better cliffs, though.
-				VERTEX_FORMAT tmpVertex;
-				if (flipForBlend) {
-					tmpVertex = pCurVertices[0];
-					pCurVertices[0] = pCurVertices[1];
-					pCurVertices[1] = pCurVertices[2];
-					pCurVertices[2] = pCurVertices[3];
-					pCurVertices[3] = tmpVertex;
-				}
-#endif
-
-				if (m_showImpassableAreas) {
-					// Color impassable cells "red"
-					DEBUG_ASSERTCRASH(PATHFIND_CELL_SIZE_F == MAP_XY_FACTOR, ("Pathfind must be terrain cell size, or this code needs reworking.  John A."));
-					Real borderHiX = (pMap->getXExtent()-2*pMap->getBorderSizeInline())*MAP_XY_FACTOR;
-					Real borderHiY = (pMap->getYExtent()-2*pMap->getBorderSizeInline())*MAP_XY_FACTOR;
-					Bool border = pCurVertices[0].x == -MAP_XY_FACTOR || pCurVertices[0].y == -MAP_XY_FACTOR;
-					Bool cliffMapped = pMap->isCliffMappedTexture(getXWithOrigin(i), getYWithOrigin(j));
-					if (pCurVertices[0].x == borderHiX) {
-						border = true;
-					}
-					if (pCurVertices[0].y == borderHiY) {
-						border = true;
-					}
-					Bool isCliff = pMap->getCliffState(getXWithOrigin(i)+pMap->getDrawOrgX(), getYWithOrigin(j)+pMap->getDrawOrgY())
-												 || showAsVisibleCliff(getXWithOrigin(i) + pMap->getDrawOrgX(), getYWithOrigin(j)+pMap->getDrawOrgY());
-
-					if ( isCliff || border || cliffMapped) {
-						Int cellX, cellY;
-						for (cellX=0; cellX<2; cellX++) {
-							for (cellY=0; cellY<2; cellY++) {
-								Int vertex = cellX+2*cellY;
-								if (border) {
-									Bool doBorder = false;
-									if (pCurVertices[vertex].y >= 0 && pCurVertices[vertex].y <= borderHiY) {
-										if (pCurVertices[vertex].x == 0 || pCurVertices[vertex].x == borderHiX) {
-											doBorder = true;
-										}
-									}
-									if (pCurVertices[vertex].x >= 0 && pCurVertices[vertex].x <= borderHiX) {
-										if (pCurVertices[vertex].y == 0 || pCurVertices[vertex].y == borderHiY) {
-											doBorder = true;
-										}
-									}
-									if (doBorder) {
-										pCurVertices[vertex].diffuse &= 0xFF0000ff; // blue with alpha.
-									}
-								} else if (isCliff) {
-									pCurVertices[vertex].diffuse &= 0xFFFF0000; // red with alpha.
-								}
-								if (cliffMapped && vertex==0) {
-									pCurVertices[vertex].diffuse &= 0xFF000000; // Black.
-									pCurVertices[vertex].diffuse |= 0xff00; // Add green.
-								}
-							}
-						}
-					}
-				}
-
-				// Note - We have been building the vertex buffer in the memory location.
-				// Now copy the set of vertices into the hardware buffer.
-				// We don't copy the whole vertex buffer because we often update only
-				// a couple of rows and its a lot faster to just copy the ones that change.
-				Int offset = pCurVertices - vBase;
-				memcpy(vbHardware+offset, pCurVertices, 4*sizeof(VERTEX_FORMAT));
-			}
-		}
-		return 0; //success.
-	}
-	return -1;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::updateVBForLight
-//=============================================================================
-/** Update the dynamic lighting values only in a rectangular block of the given Vertex Buffer. 
-The vertex locations and texture coords are unchanged.
-*/
-Int HeightMapRenderObjClass::updateVBForLight(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights)
-{
-
-#if (OPTIMIZED_HEIGHTMAP_LIGHTING)	// (gth) if optimizations are enabled, jump over to the "optimized" version of this function.
-	return updateVBForLightOptimized( pVB, data, x0, y0, x1, y1, originX, originY, pLights, numLights );
-#endif	
-	
-	Int i,j,k;
-	Int vn0,un0,vp1,up1;
-	Vector3 l2r,n2f,normalAtTexel;
-	Int	vertsPerRow=(VERTEX_BUFFER_TILE_LENGTH)*4;	//vertices per row of VB
-
-	if (m_vertexBufferTiles && m_map)
-	{
-#ifdef RTS_DEBUG
-		assert(x0 >= originX && y0 >= originY && x1>x0 && y1>y0 && x1<=originX+VERTEX_BUFFER_TILE_LENGTH && y1<=originY+VERTEX_BUFFER_TILE_LENGTH);
-#endif 
-
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
-		VERTEX_FORMAT *vBase = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();
-		VERTEX_FORMAT *vb;
-		
-		for (j=y0; j<y1; j++)
-		{
-			if (HALF_RES_MESH) {
-				if (j&1) continue;
-			}
-			Int yCoord = getYWithOrigin(j)+m_map->getDrawOrgY()-m_map->getBorderSizeInline();
-			Bool intersect = false;
-			for (k=0; k<numLights; k++) {
-				if (pLights[k]->m_minY <= yCoord+1 && 
-					pLights[k]->m_maxY >= yCoord) {
-					intersect = true;
-				}
-				if (pLights[k]->m_prevMinY <= yCoord+1 && 
-					pLights[k]->m_prevMaxY >= yCoord) {
-					intersect = true;
-				}
-			}
-			if (!intersect) {
-				continue;
-			}
-			vn0 = getYWithOrigin(j)-1;
-			if (vn0 < -m_map->getDrawOrgY())
-				vn0=-m_map->getDrawOrgY();
-			vp1 = getYWithOrigin(j+1)+1;
-			if (vp1 >= m_map->getYExtent()-m_map->getDrawOrgY())
-				vp1=m_map->getYExtent()-m_map->getDrawOrgY()-1;
-
-			for (i=x0; i<x1; i++)
-			{
-				if (HALF_RES_MESH) {
-					if (i&1) continue;
-				}
-				Int xCoord = getXWithOrigin(i)+m_map->getDrawOrgX()-m_map->getBorderSizeInline();
-				Bool intersect = false;
-				for (k=0; k<numLights; k++) {
-					if (pLights[k]->m_minX <= xCoord+1 && 
-						pLights[k]->m_maxX >= xCoord &&
-						pLights[k]->m_minY <= yCoord+1 && 
-						pLights[k]->m_maxY >= yCoord) {
-						intersect = true;
-					}
-					if (pLights[k]->m_prevMinX <= xCoord+1 && 
-						pLights[k]->m_prevMaxX >= xCoord &&
-						pLights[k]->m_prevMinY <= yCoord+1 && 
-						pLights[k]->m_prevMaxY >= yCoord) {
-						intersect = true;
-					}
-				}
-				if (!intersect) {
-					continue;
-				}
-				// vb is the pointer to the vertex in the hardware dx8 vertex buffer.
-				Int offset = (j-originY)*vertsPerRow+4*(i-originX);
-				if (HALF_RES_MESH) {
-					offset = (j-originY)*vertsPerRow/4+2*(i-originX);
-				}
-				vb = vBase + offset;	//skip to correct row in vertex buffer
-				// vbMirror is the pointer to the vertex in our memory based copy.
-				// The important point is that we can read out of our copy to get the original
-				// diffuse color, and xyz location.  It is VERY SLOW to read out of the 
-				// hardware vertex buffer, possibly worse... jba.
-				VERTEX_FORMAT *vbMirror = ((VERTEX_FORMAT*)data)  + offset;
-				un0 = getXWithOrigin(i)-1;
-				if (un0 < -m_map->getDrawOrgX())
-					un0=-m_map->getDrawOrgX();
-				up1 = getXWithOrigin(i+1)+1;
-				if (up1 >= m_map->getXExtent()-m_map->getDrawOrgX())
-					up1=m_map->getXExtent()-m_map->getDrawOrgX()-1;
-
-				Vector3 lightRay(0,0,0);
-
-				//top-left sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1, getYWithOrigin(j)) - m_map->getDisplayHeight(un0, getYWithOrigin(j))));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i), (getYWithOrigin(j)+1)) - m_map->getDisplayHeight(getXWithOrigin(i), vn0)));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				vb++;	vbMirror++;
-
-				//top-right sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(up1 , getYWithOrigin(j) ) - m_map->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(getXWithOrigin(i)+1 , vn0 )));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				vb++;	vbMirror++;
-
-				//bottom-right sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(up1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(getXWithOrigin(i) , (getYWithOrigin(j)+1) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , vp1 ) - m_map->getDisplayHeight(getXWithOrigin(i)+1 , getYWithOrigin(j) )));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				vb++;	vbMirror++;
-
-				//bottom-left sample
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(un0 , (getYWithOrigin(j)+1) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i) , vp1 ) - m_map->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
-				
-#ifdef ALLOW_TEMPORARIES
-				normalAtTexel= Normalize(Vector3::Cross_Product(l2r,n2f));
-#else
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-#endif
-
-				doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				vb++;	vbMirror++;
-			}
-		}
-		return 0; //success.
-	}
-	return -1;
-}
-
-
-Int HeightMapRenderObjClass::updateVBForLightOptimized(DX8VertexBufferClass	*pVB, char *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights)
-{
-	Int i,j,k;
-	Int vn0,un0,vp1,up1;
-	Vector3 l2r,n2f,normalAtTexel;
-	Int	vertsPerRow=(VERTEX_BUFFER_TILE_LENGTH)*4;	//vertices per row of VB
-
-	if (m_vertexBufferTiles && m_map)
-	{
-#ifdef RTS_DEBUG
-		assert(x0 >= originX && y0 >= originY && x1>x0 && y1>y0 && x1<=originX+VERTEX_BUFFER_TILE_LENGTH && y1<=originY+VERTEX_BUFFER_TILE_LENGTH);
-#endif 
-
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
-		VERTEX_FORMAT *vBase = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();
-		VERTEX_FORMAT *vb;
-		
-		//
-		// (gth) the optimization in this function is to take advantage of verts in the same
-		// x,y position who have already computed their lighting.  To do this, we need to set up
-		// some offsets in the vertex buffer.  I've computed these offsets to be consistent with
-		// the formula's that Generals is using but in the case of the "half-res-mesh" I'm not
-		// sure things are correct...
-		//
-		Int quad_right_offset;
-		Int quad_below_offset;
-		Int quad_below_right_offset;
-
-		if (HALF_RES_MESH == false) {
-			// offset = (j-originY)*vertsPerRow+4*(i-originX);
-			quad_right_offset = 4;
-			quad_below_offset = vertsPerRow;
-			quad_below_right_offset = vertsPerRow + 4;
-
-		} else {
-			// offset = (j-originY)*vertsPerRow/4+2*(i-originX);
-			quad_right_offset = 2;
-			quad_below_offset = vertsPerRow/4;
-			quad_below_right_offset = vertsPerRow/4 + 2;
-		}
-
-		// 
-		// i,j loop over the quads affected by the light.  Each quad has its *own* 4 vertices.  This
-		// means that for any vertex position on the map, there are actually 4 copies of the vertex. 
-		//
-		for (j=y0; j<y1; j++)
-		{
-			if (HALF_RES_MESH) {
-				if (j&1) continue;
-			}
-			Int yCoord = getYWithOrigin(j)+m_map->getDrawOrgY()-m_map->getBorderSizeInline();
-			Bool intersect = false;
-			for (k=0; k<numLights; k++) {
-				if (pLights[k]->m_minY <= yCoord+1 && 
-					pLights[k]->m_maxY >= yCoord) {
-					intersect = true;
-				}
-				if (pLights[k]->m_prevMinY <= yCoord+1 && 
-					pLights[k]->m_prevMaxY >= yCoord) {
-					intersect = true;
-				}
-			}
-			if (!intersect) {
-				continue;
-			}
-			vn0 = getYWithOrigin(j)-1;
-			if (vn0 < -m_map->getDrawOrgY())
-				vn0=-m_map->getDrawOrgY();
-			vp1 = getYWithOrigin(j+1)+1;
-			if (vp1 >= m_map->getYExtent()-m_map->getDrawOrgY())
-				vp1=m_map->getYExtent()-m_map->getDrawOrgY()-1;
-
-			for (i=x0; i<x1; i++)
-			{
-				if (HALF_RES_MESH) {
-					if (i&1) continue;
-				}
-				Int xCoord = getXWithOrigin(i)+m_map->getDrawOrgX()-m_map->getBorderSizeInline();
-				Bool intersect = false;
-				for (k=0; k<numLights; k++) {
-					if (pLights[k]->m_minX <= xCoord+1 && 
-						pLights[k]->m_maxX >= xCoord &&
-						pLights[k]->m_minY <= yCoord+1 && 
-						pLights[k]->m_maxY >= yCoord) {
-						intersect = true;
-					}
-					if (pLights[k]->m_prevMinX <= xCoord+1 && 
-						pLights[k]->m_prevMaxX >= xCoord &&
-						pLights[k]->m_prevMinY <= yCoord+1 && 
-						pLights[k]->m_prevMaxY >= yCoord) {
-						intersect = true;
-					}
-				}
-				if (!intersect) {
-					continue;
-				}
-				// vb is the pointer to the vertex in the hardware dx8 vertex buffer.
-				Int offset = (j-originY)*vertsPerRow+4*(i-originX);
-				if (HALF_RES_MESH) {
-					offset = (j-originY)*vertsPerRow/4+2*(i-originX);
-				}
-				vb = vBase + offset;	//skip to correct row in vertex buffer
-				// vbMirror is the pointer to the vertex in our memory based copy.
-				// The important point is that we can read out of our copy to get the original
-				// diffuse color, and xyz location.  It is VERY SLOW to read out of the 
-				// hardware vertex buffer, possibly worse... jba.
-				VERTEX_FORMAT *vbMirror = ((VERTEX_FORMAT*)data)  + offset;
-				VERTEX_FORMAT *vbaseMirror = ((VERTEX_FORMAT*)data);
-				un0 = getXWithOrigin(i)-1;
-				if (un0 < -m_map->getDrawOrgX())
-					un0=-m_map->getDrawOrgX();
-				up1 = getXWithOrigin(i+1)+1;
-				if (up1 >= m_map->getXExtent()-m_map->getDrawOrgX())
-					up1=m_map->getXExtent()-m_map->getDrawOrgX()-1;
-
-				Vector3 lightRay(0,0,0);
-
-				//
-				// (gth) Following the set of rules below lets us take advantage of lighting values that have
-				// been previously computed.  The idea is to copy them ahead to future quads that will need them
-				// and then not compute them when we get to those quads.  This also avoids having to read-back
-				// from the vertex buffer but we do jump around in memory... probably bad anyway, maybe we should
-				// compute into a temporary buffer and copy all at once...
-				//
-				unsigned long light_copy;
-
-				// top-left sample -> only compute when i==0 and j==0 
-				if ((i==x0) && (j==y0)) {
-					l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1, getYWithOrigin(j)) - m_map->getDisplayHeight(un0, getYWithOrigin(j))));
-					n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i), (getYWithOrigin(j)+1)) - m_map->getDisplayHeight(getXWithOrigin(i), vn0)));
-					Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-					doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				} 
-				vb++;	vbMirror++;
-
-				//top-right sample -> compute when j==0, then copy to (right,0)
-				if (j==y0) {
-					l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(up1 , getYWithOrigin(j) ) - m_map->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
-					n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(getXWithOrigin(i)+1 , vn0 )));
-					Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-					light_copy = doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				
-					if (i < x1-1) {
-						// copy light to (right,0)
-						(vBase + offset + quad_right_offset)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_right_offset)->diffuse&0xff000000) ;
-					}
-				} 
-				vb++;	vbMirror++;
-
-				//bottom-right sample -> always compute, then copy to (right,3), (down,1), (down+right,0)
-				l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(up1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(getXWithOrigin(i) , (getYWithOrigin(j)+1) )));
-				n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , vp1 ) - m_map->getDisplayHeight(getXWithOrigin(i)+1 , getYWithOrigin(j) )));
-				Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-				light_copy = doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-				
-				if (i < x1-1) {
-					// copy light to (right,3)
-					//(vBase + offset + quad_right_offset + 3)->diffuse = light_copy;
-					(vBase + offset + quad_right_offset + 3)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_right_offset + 3)->diffuse&0xff000000) ;
-				}
-				if (j < y1-1) {
-					// copy light to (down,1)
-					//(vBase + offset + quad_below_offset + 1)->diffuse = light_copy;
-					(vBase + offset + quad_right_offset + 1)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_right_offset + 1)->diffuse&0xff000000) ;
-				}
-				if ((i < x1-1) && (j < y1-1)) {
-					// copy light to (right+down,0)
-					//(vBase + offset + quad_below_right_offset)->diffuse = light_copy;
-					(vBase + offset + quad_right_offset)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_right_offset)->diffuse&0xff000000) ;
-				}
-				vb++;	vbMirror++;
-
-				//bottom-left sample -> compute when i==0, otherwise copy from (left,2)
-				if (i==x0) {
-					l2r.Set(2*MAP_XY_FACTOR,0,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i)+1 , (getYWithOrigin(j)+1) ) - m_map->getDisplayHeight(un0 , (getYWithOrigin(j)+1) )));
-					n2f.Set(0,2*MAP_XY_FACTOR,MAP_HEIGHT_SCALE*(m_map->getDisplayHeight(getXWithOrigin(i) , vp1 ) - m_map->getDisplayHeight(getXWithOrigin(i) , getYWithOrigin(j) )));
-					Vector3::Normalized_Cross_Product(l2r, n2f, &normalAtTexel);
-					light_copy = doTheDynamicLight(vb, vbMirror, &lightRay, &normalAtTexel, pLights, numLights);
-
-					if (j < y1-1) {
-						// copy light to (down,0)
-						//(vBase + offset + quad_below_offset)->diffuse = light_copy;
-						(vBase + offset + quad_below_offset)->diffuse = (light_copy&0x00FFFFFF) | ((vbaseMirror + offset + quad_below_offset)->diffuse&0xff000000) ;
-					}
-				} 
-				vb++;	vbMirror++;
-			}
-		}
-		return 0; //success.
-	}
-	return -1;
-}
-
-
-
-//=============================================================================
-// HeightMapRenderObjClass::doPartialUpdate
-//=============================================================================
-/** Updates a partial block of vertices from [x0,y0 to x1,y1]
-The coordinates in partialRange are map cell coordinates, relative to the entire map.
-The vertex coordinates and texture coordinates, as well as static lighting are updated.
-*/
-void HeightMapRenderObjClass::doPartialUpdate(const IRegion2D &partialRange, WorldHeightMap *htMap, RefRenderObjListIterator *pLightsIterator)
-{	
-	// Adjust range into the current drawn map range.
-	Int minX = partialRange.lo.x - htMap->getDrawOrgX();
-	Int maxX = partialRange.hi.x - htMap->getDrawOrgX();
-	Int minY = partialRange.lo.y - htMap->getDrawOrgY();
-	Int maxY = partialRange.hi.y - htMap->getDrawOrgY();
-	if (minX<0) minX = 0;
-	if (minY<0) minY = 0;
-	if (maxX > m_x-1) maxX = m_x-1;
-	if (maxY > m_y-1) maxY = m_y-1;
-	if (maxX < minX) return;
-	if (maxY < minY) return;
-	if (m_originX == 0 && m_originY == 0) {
-		// simple case.
-		updateBlock(minX, minY, maxX, maxY,
-								htMap, pLightsIterator);
-	}
-	else
-	{
-		minY = minY+m_originY;
-		maxY = maxY+m_originY;
-
-		if (minY> m_y-1) {
-			minY -= m_y-1;
- 			maxY -= m_y-1;
-		}
-		if (maxY > m_y-1) {
-			maxY -= m_y-1;
-			updateBlock(0, minY, m_x-1, m_y-1, htMap, pLightsIterator);
-			updateBlock(0, 0, m_x-1, maxY, htMap, pLightsIterator);
-		} else {
-			updateBlock(0, minY, m_x-1, maxY, htMap, pLightsIterator);
-		}
-	}
-
-	if (!m_extraBlendTilePositions)
-	{	//Need to allocate memory
-		m_extraBlendTilePositions = NEW Int[DEFAULT_MAX_MAP_EXTRABLEND_TILES];
-		m_extraBlendTilePositionsSize = DEFAULT_MAX_MAP_EXTRABLEND_TILES;
-	}
-	
-	//Find list of all extra blend tiles used on map.  These are tiles with 3 materials/textures
-	//over the same tile and require an extra render pass.
-
-	Int i, j;
-	//First remove any existing extra blend tiles within this partial region
-	for (j=0; j<m_numExtraBlendTiles; j++)
-	{	Int x = m_extraBlendTilePositions[j] & 0xffff;
-		Int y = m_extraBlendTilePositions[j] >> 16;
-		if (x >= partialRange.lo.x && x < partialRange.hi.x &&
-			y >= partialRange.lo.y && y < partialRange.hi.y)
-		{	//this tile is inside region being updated so remove it by shifting tile array
-			memcpy(m_extraBlendTilePositions+j,m_extraBlendTilePositions+j+1,(m_numExtraBlendTiles-1-j)*sizeof(Int));
-			m_numExtraBlendTiles--;
-			j--;	//need to look at index j again because this tile was removed
-		}
-	}
-
-	for (j=partialRange.lo.y; j<partialRange.hi.y; j++)
-		for (i=partialRange.lo.x; i<partialRange.hi.x; i++)
-		{
-			if (j<0 || i<0) continue;
-			Real U[4],V[4];
-			UnsignedByte alpha[4];
-			Bool flipState,cliffState;
-			if (htMap->getExtraAlphaUVData(i,j,U,V,alpha,&flipState, &cliffState))
-			{	if (m_numExtraBlendTiles >= m_extraBlendTilePositionsSize)
-				{	//no more room to store extra blend tiles so enlarge the buffer.
-					Int *tempPositions=NEW Int[m_extraBlendTilePositionsSize+512];
-					memcpy(tempPositions, m_extraBlendTilePositions, m_extraBlendTilePositionsSize*sizeof(Int));
-					delete [] m_extraBlendTilePositions;
-					//enlarge by more tiles to reduce memory trashing
-					m_extraBlendTilePositions = tempPositions;
-					m_extraBlendTilePositionsSize += 512;
-				}
-				//Pack x and y position into single integer since maps are limited in size
-				m_extraBlendTilePositions[m_numExtraBlendTiles]=i | (j <<16);
-				m_numExtraBlendTiles++;
-			}
-		}
-	updateShorelineTiles(partialRange.lo.x,partialRange.lo.y,partialRange.hi.x,partialRange.hi.y,htMap);
-
-	updateViewImpassableAreas(TRUE, minX, maxX, minY, maxY);
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::updateBlock
-//=============================================================================
-/** Updates a block of vertices from [x0,y0 to x1,y1]
-The vertex coordinates and texture coordinates, as well as static lighting are updated.
-*/
-Int HeightMapRenderObjClass::updateBlock(Int x0, Int y0, Int x1, Int y1,  WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator)
-{	
-#ifdef RTS_DEBUG
-	DEBUG_ASSERTCRASH(x0>=0,  ("HeightMapRenderObjClass::UpdateBlock parameters extend beyond left edge."));
-	DEBUG_ASSERTCRASH(y0>=0,  ("HeightMapRenderObjClass::UpdateBlock parameters extend beyond bottom edge."));
-	DEBUG_ASSERTCRASH(x1<m_x, ("HeightMapRenderObjClass::UpdateBlock parameters extend beyond right edge."));
-	DEBUG_ASSERTCRASH(y1<m_y, ("HeightMapRenderObjClass::UpdateBlock parameters extend beyond top edge."));
-	DEBUG_ASSERTCRASH(x0<=x1, ("HeightMapRenderObjClass::UpdateBlock parameters have inside-out rectangle (on X)."));
-	DEBUG_ASSERTCRASH(y0<=y1, ("HeightMapRenderObjClass::UpdateBlock parameters have inside-out rectangle (on Y)."));
-#endif
-	Invalidate_Cached_Bounding_Volumes();
-	if (pMap && m_treeBuffer != NULL) {
-		REF_PTR_SET(m_stageZeroTexture, pMap->getTerrainTexture());
-		REF_PTR_SET(m_stageOneTexture, pMap->getAlphaTerrainTexture());
-	}
-
-	Int i,j;
-	DX8VertexBufferClass	**pVB;
-	Int originX,originY;
-	//step through each vertex buffer that needs updating
-	for (j=0; j<m_numVBTilesY; j++)
-	{
-		originY=j*VERTEX_BUFFER_TILE_LENGTH;	//location of this VB on the large full-size heightmap
-		Int yMin, yMax;
-		yMin = originY;
-		if (y0>yMin) yMin = y0;
-		yMax = originY+VERTEX_BUFFER_TILE_LENGTH;
-		if (y1<yMax) yMax = y1;
-		if (yMin >= yMax) {
-			continue;
-		}
-		for (i=0; i<m_numVBTilesX; i++)
-		{	
-			originX=i*VERTEX_BUFFER_TILE_LENGTH;	//location of this VB on the large full-size heightmap
-			Int xMin, xMax;
-			xMin = originX;
-			if (xMin<x0) xMin = x0;
-			xMax = originX+VERTEX_BUFFER_TILE_LENGTH;
-			if (xMax>x1) xMax = x1;
-			if (xMin >= xMax) {
-				continue;
-			}
-			pVB=m_vertexBufferTiles+j*m_numVBTilesX+i;	//point to correct row/column of vertex buffers 
-			char **pData = m_vertexBufferBackup+j*m_numVBTilesX+i;
-			updateVB(*pVB, *pData, xMin, yMin, xMax, yMax, originX, originY, pMap, pLightsIterator);
-		}
-	}
-
-	return 0;
-}
-
-
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// HeightMapRenderObjClass::~HeightMapRenderObjClass
-//=============================================================================
-/** Destructor. Releases w3d assets. */
-//=============================================================================
-HeightMapRenderObjClass::~HeightMapRenderObjClass(void)
-{
-	freeMapResources();
-	if (m_extraBlendTilePositions) {
-		delete [] m_extraBlendTilePositions;
-		m_extraBlendTilePositions = NULL;
-	}
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::HeightMapRenderObjClass
-//=============================================================================
-/** Constructor. Mostly nulls out the member variables. */
-//=============================================================================
-HeightMapRenderObjClass::HeightMapRenderObjClass(void):
-m_extraBlendTilePositions(NULL),
-m_numExtraBlendTiles(0),
-m_numVisibleExtraBlendTiles(0),
-m_extraBlendTilePositionsSize(0),
-m_vertexBufferTiles(NULL),
-m_vertexBufferBackup(NULL),
-m_originX(0),
-m_originY(0),
-m_indexBuffer(NULL),
-m_numVBTilesX(0),
-m_numVBTilesY(0),
-m_numVertexBufferTiles(0),
-m_numBlockColumnsInLastVB(0),
-m_numBlockRowsInLastVB(0)
-{
-	TheHeightMap = this;
-}
-
-
-//=============================================================================
-// HeightMapRenderObjClass::adjustTerrainLOD
-//=============================================================================
-/** Adjust the terrain Level Of Detail.  If adj > 0 , increases LOD 1 step, if 
-adj < 0 decreases it one step, if adj==0, then just sets up for the current LOD */
-//=============================================================================
-void HeightMapRenderObjClass::adjustTerrainLOD(Int adj) 
-{
-	BaseHeightMapRenderObjClass::adjustTerrainLOD(adj);
-
-	return;
-
-#if 0
-	if (adj>0 && TheGlobalData->m_terrainLOD<TERRAIN_LOD_MAX) TheWritableGlobalData->m_terrainLOD=(TerrainLOD)(TheGlobalData->m_terrainLOD+1);
-	if (adj<0 && TheGlobalData->m_terrainLOD>TERRAIN_LOD_MIN) TheWritableGlobalData->m_terrainLOD=(TerrainLOD)(TheGlobalData->m_terrainLOD-1);
-
-	switch (TheGlobalData->m_terrainLOD) {
-		case	TERRAIN_LOD_MIN: TheWritableGlobalData->m_useCloudMap = false;
-									TheWritableGlobalData->m_useLightMap = false ;
-									TheWritableGlobalData->m_useWaterPlane = false;
-									TheWritableGlobalData->m_stretchTerrain = false;
-									TheWritableGlobalData->m_useHalfHeightMap = true;
-									break;
-		case TERRAIN_LOD_HALF_CLOUDS: TheWritableGlobalData->m_useCloudMap = true;
-									TheWritableGlobalData->m_useLightMap = true;
-									TheWritableGlobalData->m_useWaterPlane = false;
-									TheWritableGlobalData->m_stretchTerrain = false;
-									TheWritableGlobalData->m_useHalfHeightMap = true;
-									break;
-		case TERRAIN_LOD_STRETCH_NO_CLOUDS: TheWritableGlobalData->m_useCloudMap = false;
-									TheWritableGlobalData->m_useLightMap = false;
-									TheWritableGlobalData->m_useWaterPlane = false;
-									TheWritableGlobalData->m_stretchTerrain = true;
-									TheWritableGlobalData->m_useHalfHeightMap = false;
-									break;
-		case TERRAIN_LOD_STRETCH_CLOUDS: TheWritableGlobalData->m_useCloudMap = true;
-									TheWritableGlobalData->m_useLightMap = true;
-									TheWritableGlobalData->m_useWaterPlane = false;
-									TheWritableGlobalData->m_stretchTerrain = true;
-									TheWritableGlobalData->m_useHalfHeightMap = false;
-									break;
-		case TERRAIN_LOD_NO_CLOUDS: TheWritableGlobalData->m_useCloudMap = false;
-									TheWritableGlobalData->m_useLightMap = false;
-									TheWritableGlobalData->m_useWaterPlane = false;
-									TheWritableGlobalData->m_stretchTerrain = false;
-									TheWritableGlobalData->m_useHalfHeightMap = false;
-									break;
-		default:
-		case TERRAIN_LOD_NO_WATER: TheWritableGlobalData->m_useCloudMap = true;
-									TheWritableGlobalData->m_useLightMap = true;
-									TheWritableGlobalData->m_useWaterPlane = false;
-									TheWritableGlobalData->m_stretchTerrain = false;
-									TheWritableGlobalData->m_useHalfHeightMap = false;
-									break;
-		case TERRAIN_LOD_MAX: TheWritableGlobalData->m_useCloudMap = true;
-									TheWritableGlobalData->m_useLightMap = true;
-									TheWritableGlobalData->m_useWaterPlane = true;
-									TheWritableGlobalData->m_stretchTerrain = false;
-									TheWritableGlobalData->m_useHalfHeightMap = false;
-									break;
-	}
-	if (m_map==NULL) return;
-	m_map->setDrawOrg(m_map->getDrawOrgX(), m_map->getDrawOrgX());
-	if (m_shroud)
-		m_shroud->reset();	//need reset here since initHeightData will load new shroud.
-	this->initHeightData(m_map->getDrawWidth(), 
-											m_map->getDrawHeight(), m_map, NULL);
-	staticLightingChanged();
-	if (TheTacticalView) {
-		TheTacticalView->setAngle(TheTacticalView->getAngle() + 1);
-		TheTacticalView->setAngle(TheTacticalView->getAngle() - 1);
-	}
-#endif 
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::ReleaseResources
-//=============================================================================
-/** Releases all w3d assets, to prepare for Reset device call. */
-//=============================================================================
-void HeightMapRenderObjClass::ReleaseResources(void)
-{
-	BaseHeightMapRenderObjClass::ReleaseResources();
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::ReAcquireResources
-//=============================================================================
-/** Reallocates all W3D assets after a reset.. */
-//=============================================================================
-void HeightMapRenderObjClass::ReAcquireResources(void)
-{
-	BaseHeightMapRenderObjClass::ReAcquireResources();
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::reset
-//=============================================================================
-/** Updates the macro noise/lightmap texture (pass 3) */
-//=============================================================================
-void HeightMapRenderObjClass::reset(void)
-{
-	BaseHeightMapRenderObjClass::reset();
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::oversizeTerrain
-//=============================================================================
-/** Sets the terrain oversize amount. */
-//=============================================================================
-void HeightMapRenderObjClass::oversizeTerrain(Int tilesToOversize) 
-{
-	Int width = WorldHeightMap::NORMAL_DRAW_WIDTH;
-	Int height = WorldHeightMap::NORMAL_DRAW_HEIGHT;
-	if (tilesToOversize>0 && tilesToOversize<5) 
-	{
-		width += 32*tilesToOversize;
-		height += 32*tilesToOversize;
-		if (width>m_map->getXExtent()) 
-			width = m_map->getXExtent();
-		if (height>m_map->getYExtent()) 
-			height = m_map->getYExtent();
-	}
-	Int dx = width-m_map->getDrawWidth();
-	Int dy = height-m_map->getDrawHeight();
- 	m_map->setDrawWidth(width);
-	m_map->setDrawHeight(height);
-	dx /= 2;
-	dy /= 2;
-	Int newOrgX = m_map->getDrawOrgX()-dx;
-	Int newOrgy = m_map->getDrawOrgY()-dy;
-	if (newOrgX<0) newOrgX=0;
-	if (newOrgy<0) newOrgy=0;
-	m_map->setDrawOrg(newOrgX,newOrgy);
-	m_originX = 0;
-	m_originY = 0;
-	if (m_shroud)
-		m_shroud->reset();
-	//delete m_shroud;
-	//m_shroud = NULL;
-	initHeightData(m_map->getDrawWidth(), m_map->getDrawHeight(), m_map, NULL, FALSE);		 
-	m_needFullUpdate = true;
-}
-
-
-
-
-//=============================================================================
-// HeightMapRenderObjClass::initHeightData
-//=============================================================================
-/** Allocate a heightmap of x by y vertices and fill with initial height values.
-Also allocates all rendering resources such as vertex buffers, index buffers, 
-shaders, and materials.*/
-//=============================================================================
-Int HeightMapRenderObjClass::initHeightData(Int x, Int y, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator, Bool updateExtraPassTiles)
-{	
-	BaseHeightMapRenderObjClass::initHeightData(x, y, pMap, pLightsIterator, updateExtraPassTiles);
-	Int i,j;
-//	Int	vertsPerRow=x*2-2;
-//	Int	vertsPerColumn=y*2-2;
-
-	HeightSampleType *data = NULL;
-	if (pMap) {
-		data = pMap->getDataPtr();
-	}
-
-	if (updateExtraPassTiles)
-	{
-		m_numExtraBlendTiles = 0;
-		//Do some preprocessing on map to extract useful data
-		if (pMap)
-		{
-			Int m_mapDX=pMap->getXExtent();
-			Int m_mapDY=pMap->getYExtent();
-			if (!m_extraBlendTilePositions)
-			{	//Need to allocate memory
-				m_extraBlendTilePositions = NEW Int[DEFAULT_MAX_MAP_EXTRABLEND_TILES];
-				m_extraBlendTilePositionsSize = DEFAULT_MAX_MAP_EXTRABLEND_TILES;
-			}
-			
-			//Find list of all extra blend tiles used on map.  These are tiles with 3 materials/textures
-			//over the same tile and require an extra render pass.
-			for (j=0; j<(m_mapDY-1); j++)
-				for (i=0; i<(m_mapDX-1); i++)
-				{
-					Real U[4],V[4];
-					UnsignedByte alpha[4];
-					Bool flipState,cliffState;
-					if (pMap->getExtraAlphaUVData(i,j,U,V,alpha,&flipState, &cliffState))
-					{	if (m_numExtraBlendTiles >= m_extraBlendTilePositionsSize)
-						{	//no more room to store extra blend tiles so enlarge the buffer.
-							Int *tempPositions=NEW Int[m_extraBlendTilePositionsSize+512];
-							memcpy(tempPositions, m_extraBlendTilePositions, m_extraBlendTilePositionsSize*sizeof(Int));
-							delete [] m_extraBlendTilePositions;
-							//enlarge by more tiles to reduce memory trashing
-							m_extraBlendTilePositions = tempPositions;
-							m_extraBlendTilePositionsSize += 512;
-						}
-						//Pack x and y position into single integer since maps are limited in size
-						m_extraBlendTilePositions[m_numExtraBlendTiles]=i | (j <<16);
-						m_numExtraBlendTiles++;
-					}
-				}
-		}
-	}
-
-	m_originX = 0;
-	m_originY = 0;
-	m_needFullUpdate = true;
-
-	// If the size changed, we need to allocate.
-	Bool needToAllocate = (x != m_x || y != m_y);
-	// If the textures aren't allocated (usually because of a hardware reset) need to allocate.
-	if (m_stageOneTexture == NULL) {
-		needToAllocate = true;
-	}
-	if (data && needToAllocate && m_treeBuffer != NULL)
-	{	//requested heightmap different from old one.
-		freeIndexVertexBuffers();
-		//Create static index buffers.  These will index the vertex buffers holding the map.
-		m_indexBuffer=NEW_REF(DX8IndexBufferClass,(VERTEX_BUFFER_TILE_LENGTH*VERTEX_BUFFER_TILE_LENGTH*2*3));
-
-		// Fill up the IB
-		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
-		UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-			
-		for (j=0; j<(VERTEX_BUFFER_TILE_LENGTH*VERTEX_BUFFER_TILE_LENGTH*4); j+=VERTEX_BUFFER_TILE_LENGTH*4)
-		{
-			for (i=j; i<(j+VERTEX_BUFFER_TILE_LENGTH*4); i+=4)	//4 vertices per 2x2 block
-			{
-				ib[0]=i;
-				ib[1]=i+2;
-				ib[2]=i+3;
-
-				ib[3]=i;
-				ib[4]=i+1;
-				ib[5]=i+2;
-
-				ib+=6;	//skip the 6 indices we just filled
-			}
-		}
-
-		//Get number of vertex buffers needed to hold current map
-		//First round dimensions to next multiple of VERTEX_BUFFER_TILE_LENGTH since that's our
-		//blocksize
-		m_numVBTilesX=1;
-		for (i=VERTEX_BUFFER_TILE_LENGTH+1; i<x;)
-		{	i+=VERTEX_BUFFER_TILE_LENGTH;
-			m_numVBTilesX++;
-		}
-		m_numVBTilesY=1;
-		for (j=VERTEX_BUFFER_TILE_LENGTH+1; j<y;)
-		{	j+=VERTEX_BUFFER_TILE_LENGTH;
-			m_numVBTilesY++;
-		}
-
-		m_numBlockColumnsInLastVB=(x-1)%VERTEX_BUFFER_TILE_LENGTH;	//right border within last VB
-		m_numBlockRowsInLastVB=(y-1)%VERTEX_BUFFER_TILE_LENGTH;	//bottom border within last VB
-
-		m_numVertexBufferTiles=m_numVBTilesX*m_numVBTilesY;
-		m_x=x;
-		m_y=y;
-		m_vertexBufferTiles = NEW DX8VertexBufferClass*[m_numVertexBufferTiles];
-		m_vertexBufferBackup = NEW char *[m_numVertexBufferTiles];
-
-		Int numVertex = VERTEX_BUFFER_TILE_LENGTH*2*VERTEX_BUFFER_TILE_LENGTH*2;
-
-		for (i=0; i<m_numVertexBufferTiles; i++) {
-#ifdef USE_NORMALS	 
-			m_vertexBufferTiles[i]=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZNUV2,numVertex,DX8VertexBufferClass::USAGE_DEFAULT));
-#else
-			m_vertexBufferTiles[i]=NEW_REF(DX8VertexBufferClass,(DX8_VERTEX_FORMAT,numVertex,DX8VertexBufferClass::USAGE_DEFAULT));
-#endif
-			m_vertexBufferBackup[i] = NEW char[numVertex*sizeof(VERTEX_FORMAT)];
-		} 
-
-		//go with a preset material for now.
-	}
-
-	updateBlock(0,0,x-1,y-1,pMap,pLightsIterator);
-
-	return 0;
-}
-
-
-//=============================================================================
-// HeightMapRenderObjClass::On_Frame_Update
-//=============================================================================
-/** Updates the diffuse color values in the vertices as affected by the dynamic lights.*/
-//=============================================================================
-void HeightMapRenderObjClass::On_Frame_Update(void)
-{	
-	BaseHeightMapRenderObjClass::On_Frame_Update();
-	Int i,j,k;
-	DX8VertexBufferClass	**pVB;
-	Int originX,originY;
-	if (Scene==NULL) return;
-	RTS3DScene *pMyScene = (RTS3DScene *)Scene;
-
-
-	RefRenderObjListIterator pDynamicLightsIterator(pMyScene->getDynamicLights());
-	if (m_map == NULL) {
-		return;
-	}
-
-#ifdef DO_UNIT_TIMINGS  		  
-#pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
-	return;
-#endif
-
-#ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_disableTerrain) {
-		return;
-	}
-#endif
-
-	Int numDynaLights=0;
-	W3DDynamicLight *enabledLights[MAX_ENABLED_DYNAMIC_LIGHTS];
-
-	Int yCoordMin = m_map->getDrawOrgY();
-	Int yCoordMax = m_y+m_map->getDrawOrgY();
-	Int xCoordMin = m_map->getDrawOrgX();
-	Int xCoordMax = m_x+m_map->getDrawOrgX();
-
-	for (pDynamicLightsIterator.First(); !pDynamicLightsIterator.Is_Done(); pDynamicLightsIterator.Next())
-	{		
-		W3DDynamicLight *pLight = (W3DDynamicLight*)pDynamicLightsIterator.Peek_Obj();
-		pLight->m_processMe = false;
-		if (pLight->m_enabled || pLight->m_priorEnable) {
-			Real range = pLight->Get_Attenuation_Range();
-			if (pLight->m_priorEnable) {
-				pLight->m_prevMinX = pLight->m_minX;
-				pLight->m_prevMinY = pLight->m_minY;
-				pLight->m_prevMaxX = pLight->m_maxX;
-				pLight->m_prevMaxY = pLight->m_maxY;
-			} 
-			Vector3	pos = pLight->Get_Position();
-			pLight->m_minX = (pos.X-range)/MAP_XY_FACTOR;
-			pLight->m_maxX = (pos.X+range)/MAP_XY_FACTOR+1.0f;
-			pLight->m_minY = (pos.Y-range)/MAP_XY_FACTOR;
-			pLight->m_maxY = (pos.Y+range)/MAP_XY_FACTOR+1.0f;
-			if (!pLight->m_priorEnable) {
-				pLight->m_prevMinX = pLight->m_minX;
-				pLight->m_prevMinY = pLight->m_minY;
-				pLight->m_prevMaxX = pLight->m_maxX;
-				pLight->m_prevMaxY = pLight->m_maxY;
-			} 
-
-			if (pLight->m_minX < xCoordMax && 
-					pLight->m_minY < yCoordMax &&
-					pLight->m_maxX > xCoordMin && 
-					pLight->m_maxY > yCoordMin) {
-				pLight->m_processMe = TRUE;
-			} else if (pLight->m_prevMinX < xCoordMax && 
-					pLight->m_prevMinY < yCoordMax &&
-					pLight->m_prevMaxX > xCoordMin && 
-					pLight->m_prevMaxY > yCoordMin) {
-				pLight->m_processMe = TRUE;
-			} else {
-				pLight->m_processMe = false;
-			}
-			if (pLight->m_processMe) {
-				enabledLights[numDynaLights] = pLight;
-				numDynaLights++;
-				if (numDynaLights == MAX_ENABLED_DYNAMIC_LIGHTS) {
-					break;
-				}
-			}
-		}
-		pLight->m_priorEnable = pLight->m_enabled;
-	}
-	if (numDynaLights > 0) {
-		//step through each vertex buffer that needs updating
-		for (j=0; j<m_numVBTilesY; j++)
-		{
-			originY=j*VERTEX_BUFFER_TILE_LENGTH;	//location of this VB on the large full-size heightmap
-			Int yMin, yMax;
-			yMin = originY;
-			yMax = originY+VERTEX_BUFFER_TILE_LENGTH;
-			Bool intersect = false;
-			Int yCoordMin = getYWithOrigin(yMin)+m_map->getDrawOrgY()-m_map->getBorderSizeInline();
-			Int yCoordMax = getYWithOrigin(yMax-1)+m_map->getDrawOrgY()+1-m_map->getBorderSizeInline();
-			if (yCoordMax>yCoordMin) {
-				// no wrap occurred.
-				for (k=0; k<numDynaLights; k++) {
-					if (enabledLights[k]->m_minY < yCoordMax && 
-						enabledLights[k]->m_maxY > yCoordMin) {
-						intersect = true;
-						break;
-					}
-					if (enabledLights[k]->m_prevMinY < yCoordMax && 
-						enabledLights[k]->m_prevMaxY > yCoordMin) {
-						intersect = true;
-						break;
-					}
-				}
-			} else {
-				// wrap occurred, so we are outside of this range.
-				int tmp=yCoordMin;
-				yCoordMin = yCoordMax;
-				yCoordMax = tmp;
-				for (k=0; k<numDynaLights; k++) {
-					if (enabledLights[k]->m_minY <=  yCoordMin || 
-						enabledLights[k]->m_maxY >= yCoordMax) {
-						intersect = true;
-						break;
-					}
-					if (enabledLights[k]->m_prevMinY <=  yCoordMin || 
-						enabledLights[k]->m_prevMaxY >= yCoordMax) {
-						intersect = true;
-						break;
-					}
-				}
-			}
-			if (!intersect) {
-				continue;
-			}
-
-			for (i=0; i<m_numVBTilesX; i++)
-			{	
-				originX=i*VERTEX_BUFFER_TILE_LENGTH;	//location of this VB on the large full-size heightmap
-				Int xMin, xMax;
-				xMin = originX;
-				xMax = originX+VERTEX_BUFFER_TILE_LENGTH;
-
-				Bool intersect = false;
-				Int xCoordMin = getXWithOrigin(xMin)+m_map->getDrawOrgX()-m_map->getBorderSizeInline();
-				Int xCoordMax = getXWithOrigin(xMax-1)+m_map->getDrawOrgX()+1-m_map->getBorderSizeInline();
-				if (xCoordMax>xCoordMin) {
-					// no wrap occurred.
-					for (k=0; k<numDynaLights; k++) {
-						if (enabledLights[k]->m_minX < xCoordMax && 
-							enabledLights[k]->m_maxX > xCoordMin) {
-							intersect = true;
-							break;
-						}
-						if (enabledLights[k]->m_prevMinX < xCoordMax && 
-							enabledLights[k]->m_prevMaxX > xCoordMin) {
-							intersect = true;
-							break;
-						}
-					}
-				} else {
-					// wrap occurred, so we are outside of this range.
-					int tmp=xCoordMin;
-					xCoordMin = xCoordMax;
-					xCoordMax = tmp;
-					for (k=0; k<numDynaLights; k++) {
-						if (enabledLights[k]->m_minX <=  xCoordMin || 
-							enabledLights[k]->m_maxX >= xCoordMax) {
-							intersect = true;
-							break;
-						}
-						if (enabledLights[k]->m_prevMinX <=  xCoordMin ||
-							enabledLights[k]->m_prevMaxX >= xCoordMax) {
-							intersect = true;
-							break;
-						}
-					}
-				}
-				if (!intersect) {
-					continue;
-				}
-				pVB=m_vertexBufferTiles+j*m_numVBTilesX+i;	//point to correct row/column of vertex buffers 
-				char **pData = m_vertexBufferBackup+j*m_numVBTilesX+i;
-				updateVBForLight(*pVB, *pData, xMin, yMin, xMax, yMax, originX,originY, enabledLights, numDynaLights);
-			}
-		}
-	}
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::staticLightingChanged
-//=============================================================================
-/** Notification that all lighting needs to be recalculated. */
-//=============================================================================
-void HeightMapRenderObjClass::staticLightingChanged( void )
-{
-	BaseHeightMapRenderObjClass::staticLightingChanged();
-}
-
-#define CENTER_LIMIT 2
-#define BIG_JUMP 16
-#define WIDE_STEP 32
-
-static Int visMinX, visMinY, visMaxX, visMaxY;
-static Bool check(const FrustumClass & frustum, WorldHeightMap *pMap, Int x, Int y) 
-{
-	if (x<0 || y<0) return(false);
-	if (x>= pMap->getXExtent() || y>= pMap->getYExtent()) return(false);
-	if (x >= visMinX && y >= visMinY && x <=visMaxX && y <= visMaxY) {
-		return(true);
-	}
-	Int height = pMap->getHeight(x, y);
-	Vector3 loc((x-pMap->getBorderSizeInline())*MAP_XY_FACTOR, (y-pMap->getBorderSizeInline())*MAP_XY_FACTOR, height*MAP_HEIGHT_SCALE);
-	if (CollisionMath::Overlap_Test(frustum,loc) == CollisionMath::INSIDE) {
-		if (x<visMinX) visMinX=x;
-		if (x>visMaxX) visMaxX=x;
-		if (y<visMinY) visMinY=y;
-		if (y>visMaxY) visMaxY=y;
-		return(true);
-	}
-	return(false);
-}
-
-static void calcVis(const FrustumClass & frustum, WorldHeightMap *pMap, Int minX, Int minY, Int maxX, Int maxY, Int limit)
-{
-	if (maxX-minX<2) return;
-	if (maxY-minY<2) return;
-	if (minX >=visMinX && minY >= visMinY && maxX <=visMaxX && maxY <= visMaxY) {
-		return;
-	}
-	Int midX = (minX+maxX)/2;
-	Int midY = (minY+maxY)/2;
-	Bool recurse1 = maxX-minX>=limit;
-	Bool recurse2 = recurse1;
-	Bool recurse3 = recurse1;
-	Bool recurse4 = recurse1;	 
-	/* boxes are:
-
-			1     2
-
-
-			3			4 */
-
-	if (check(frustum, pMap, midX, maxY)) {
-		recurse1=true;
-		recurse2=true;
-	}
-	if (check(frustum, pMap, midX, minY)) {
-		recurse3=true;
-		recurse4=true;
-	}
-	if (check(frustum, pMap, midX, midY)) {
-		recurse1=true;
-		recurse2=true;
-		recurse3=true;
-		recurse4=true;
-	}
-	if (check(frustum, pMap, minX, midY)) {
-		recurse1=true;
-		recurse3=true;
-	}
-	if (check(frustum, pMap, maxX, midY)) {
-		recurse2=true;
-		recurse4=true;
-	}
-	if (recurse1) {
-		calcVis(frustum, pMap, minX, midY, midX, maxY, limit);
-	}
-	if (recurse2) {
-		calcVis(frustum, pMap, midX, midY, maxX, maxY, limit);
-	}
-	if (recurse3) {
-		calcVis(frustum, pMap, minX, minY, midX, midY, limit);
-	}
-	if (recurse4) {
-		calcVis(frustum, pMap, midX, minY, maxX, midY, limit);
-	}
-}
-
-
-
-
-
-//=============================================================================
-// HeightMapRenderObjClass::updateCenter
-//=============================================================================
-/** Updates the positioning of the drawn portion of the height map in the 
-heightmap.  As the view slides around, this determines what is the actually
-rendered portion of the terrain.  Only a 96x96 section is rendered at any time, 
-even though maps can be up to 1024x1024.  This function determines which subset
-is rendered. */
-//=============================================================================
-void HeightMapRenderObjClass::updateCenter(CameraClass *camera , RefRenderObjListIterator *pLightsIterator)
-{
-	if (m_map==NULL) {
-		return;
-	}
-	if (m_updating) {
-		return;
-	}
-	if (m_vertexBufferTiles ==NULL)
-		return;		//did not initialize resources yet.
-
-	BaseHeightMapRenderObjClass::updateCenter(camera, pLightsIterator);
-
-	m_updating = true;
-	if (m_needFullUpdate) 
-  {
-		m_needFullUpdate = false;
-		updateBlock(0, 0, m_x-1, m_y-1, m_map, pLightsIterator);
-		m_updating = false;
-		return;
-	}
-
-	if (m_x >= m_map->getXExtent() && m_y >= m_map->getYExtent()) 
-  {
-		m_updating = false;
-		return; // no need to center. 
-	}
-
-	Int cellOffset = 1;
-	if (HALF_RES_MESH) {
-		cellOffset = 2;
-	}
-	// determine the ray corresponding to the camera and distance to projection plane
-	Matrix3D camera_matrix = camera->Get_Transform();
-	
-	Vector3 camera_location  = camera->Get_Position();
-
-	Vector3 rayLocation;
-	Vector3 rayDirection;
-	Vector3 rayDirectionPt;
-	// the projected ray has the same origin as the camera
-	rayLocation = camera_location; 
-	// determine the location of the screen coordinate in camera-model space
-	const ViewportClass &viewport = camera->Get_Viewport();
-	Int i, j, minHt;
-
-	Real intersectionZ;
-	minHt = m_map->getMaxHeightValue();
-	for (i=0; i<m_x; i++) {
-		for (j=0; j<m_y; j++) {
-			Short cur = m_map->getDisplayHeight(i,j);
-			if (cur<minHt) minHt = cur;
-		}
-	}
-	intersectionZ = (float)minHt;
-//	float aspect = camera->Get_Aspect_Ratio();
-
-	Vector2 min,max;
-	camera->Get_View_Plane(min,max);
-	float xscale = (max.X - min.X);
-	float yscale = (max.Y - min.Y);
-
-	float zmod = -1.0; // Scene->vpd; // Note: view plane distance is now always 1.0 from the camera
-	float minX = 200000;
-	float maxX = -minX;
-	float minY = 200000;
-	float maxY = -minY;
-	for (i=0; i<2; i++) {
-		for (j=0; j<2; j++) {
-			float xmod = (-i + 0.5 + viewport.Min.X) * zmod * xscale;// / aspect;
-			float ymod = (j - 0.5 - viewport.Min.Y) * zmod * yscale;// * aspect;
-
-			// transform the screen coordinates by the camera's matrix into world coordinates.
-			float x = zmod * camera_matrix[0][2] + xmod * camera_matrix[0][0] + ymod * camera_matrix[0][1];
-			float y = zmod * camera_matrix[1][2] + xmod * camera_matrix[1][0] + ymod * camera_matrix[1][1];
-			float z = zmod * camera_matrix[2][2] + xmod * camera_matrix[2][0] + ymod * camera_matrix[2][1];
-
-			rayDirection.Set(x,y,z);
-			rayDirection.Normalize();
-			rayDirectionPt = rayLocation+rayDirection;
-
-			x = Vector3::Find_X_At_Z(intersectionZ, rayLocation, rayDirectionPt);
-			y = Vector3::Find_Y_At_Z(intersectionZ, rayLocation, rayDirectionPt);
-			if (x<minX) minX = x;
-			if (x>maxX) maxX = x;
-			if (y<minY) minY = y;
-			if (y>maxY) maxY = y;
-		}
-	}
-
-	// convert back to cell indexes.
-	minX /= MAP_XY_FACTOR;
-	maxX /= MAP_XY_FACTOR;
-	minY /= MAP_XY_FACTOR;
-	maxY /= MAP_XY_FACTOR;
-
-	minX += m_map->getBorderSizeInline();
-	maxX += m_map->getBorderSizeInline();
-	minY += m_map->getBorderSizeInline();
-	maxY += m_map->getBorderSizeInline();
-
-	visMinX = m_map->getXExtent();
-	visMinY = m_map->getYExtent();
-	visMaxX = 0;
-	visMaxY = 0;
-
-	///< @todo find out why values go out of range
-	if (minX<0) minX=0;
-	if (minY<0) minY=0;
-	if (maxX > visMinX) maxX = visMinX;
-	if (maxY > visMinY) maxY = visMinY;
-
-	const FrustumClass & frustum = camera->Get_Frustum();
-	Int limit = (maxX-minX)/2;
-	if (limit > WIDE_STEP/2) {
-		limit=WIDE_STEP/2;
-	}
-	calcVis(frustum, m_map, minX-WIDE_STEP/2, minY-WIDE_STEP/2, maxX+WIDE_STEP/2, maxY+WIDE_STEP/2, limit);
-
-	if (m_map) {
-		Int newOrgX;
-		if (visMaxX-visMinX > m_x) {
-			newOrgX = (maxX+minX)/2-m_x/2.0;	
-		} else {
-			newOrgX = (visMaxX+visMinX)/2-m_x/2.0;
-		}
-
-		Int newOrgY;
-		if (visMaxY - visMinY > m_y) {
-			newOrgY = visMinY+1;	
-		}	else {
-			newOrgY = (visMaxY+visMinY)/2-m_y/2.0;
-		}																															  
-		if (TheTacticalView->getFieldOfView() != 0) {
-			newOrgX = (visMaxX+visMinX)/2-m_x/2.0;
-			newOrgY = (visMaxY+visMinY)/2-m_y/2.0;
-		}
-		if (HALF_RES_MESH) {
-			newOrgX &= 0xFFFFFFFE;
-			newOrgY &= 0xFFFFFFFE;
-		}
-		Int deltaX = newOrgX - m_map->getDrawOrgX();
-		Int deltaY = newOrgY - m_map->getDrawOrgY();
-		if (IABS(deltaX) > m_x/2 || IABS(deltaY)>m_x/2) {
-			m_map->setDrawOrg(newOrgX, newOrgY);
-			m_originY = 0;
-			m_originX = 0;
-			updateBlock(0, 0, m_x-1, m_y-1, m_map, pLightsIterator); 
-			m_updating = false;
-			return;
-		}
-
-		if (abs(deltaX)>CENTER_LIMIT || abs(deltaY)>CENTER_LIMIT) {
-			if (abs(deltaY) >= CENTER_LIMIT) {
-				if (m_map->setDrawOrg(m_map->getDrawOrgX(), newOrgY)) {
-					Int minY = 0;
-					Int maxY = 0;
-					deltaY -= newOrgY - m_map->getDrawOrgY(); 
-					m_originY += deltaY;
-					if (m_originY >= m_y-1) m_originY -= m_y-1;
-					if (deltaY<0) {
-						minY = m_originY;
-						maxY = m_originY-deltaY;
-					} else {
-						minY = m_originY - deltaY;
-						maxY = m_originY;
-					}
-					minY-=cellOffset;
-					if (m_originY < 0) m_originY += m_y-1;
-					if (minY<0) {
-						minY += m_y-1;
-						if (minY<0) minY = 0;
-						updateBlock(0, minY, m_x-1, m_y-1, m_map, pLightsIterator);
-						updateBlock(0, 0, m_x-1, maxY, m_map, pLightsIterator);
-					} else {
-						updateBlock(0, minY, m_x-1, maxY, m_map, pLightsIterator);
-					}
-				}
-				// It is much more efficient to update a cople of columns one frame, and then
-				// a couple of rows.  So if we aren't "jumping" to a new view, and have done X
-				// recently, return.
-				if (abs(deltaX) < BIG_JUMP && !m_doXNextTime) {
-					m_updating = false;
-					m_doXNextTime = true;
-					return;	// Only do the y this frame.  Do x next frame.  jba.
-				}
-			}
-			if (abs(deltaX) > CENTER_LIMIT) {
-				m_doXNextTime = false;
-				newOrgX = m_map->getDrawOrgX() + deltaX;
-				if (m_map->setDrawOrg(newOrgX, m_map->getDrawOrgY())) {
-					Int minX = 0;
-					Int maxX = 0;
-					deltaX -= newOrgX - m_map->getDrawOrgX(); 
-					m_originX += deltaX;
-					if (m_originX >= m_x-1) m_originX -= m_x-1;
-					if (deltaX<0) {
-						minX = m_originX;
-						maxX = m_originX-deltaX;
-					} else {
-						minX = m_originX - deltaX;
-						maxX = m_originX;
-					}
-					minX-=cellOffset;
-					maxX+=cellOffset;
-					if (m_originX < 0) m_originX += m_x-1;
-					if (minX<0) {
-						minX += m_x-1;
-						if (minX<0) minX = 0;
-						updateBlock(minX,0,m_x-1, m_y-1, m_map, pLightsIterator);
-						updateBlock(0,0,maxX, m_y-1, m_map, pLightsIterator);
-					} else {
-						updateBlock(minX,0,maxX, m_y-1, m_map, pLightsIterator);
-					}
-				}
-			} 
-		}
-	}
-	m_updating = false;
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::Render
-//=============================================================================
-/** Renders (draws) the terrain. */
-//=============================================================================
-//DECLARE_PERF_TIMER(Terrain_Render)
-
-void HeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
-{
-	//USE_PERF_TIMER(Terrain_Render)
-	
-	Int i,j,devicePasses;
-	W3DShaderManager::ShaderTypes st;
-	Bool doCloud = TheGlobalData->m_useCloudMap;
-
-	Matrix3D tm(Transform);
-#if 0 // There is some weirdness sometimes with the dx8 static buffers.
-			// This usually fixes terrain flashing.  jba.
-	static Int delay = 1;
-	delay --;
-	if (delay<1) {
-		delay = 1;
-		static Int ndx = -1;
-		ndx++;
-		if (ndx>=m_numVertexBufferTiles) {
-			ndx = 0;
-		}
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexBufferTiles[ndx]);
-		VERTEX_FORMAT *vb = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();	
-		vb = 0;
-	}
-#endif
-	// If there are trees, tell them to draw at the transparent time to draw.
-	if (m_treeBuffer) {
-		m_treeBuffer->setIsTerrain();
-	}
-
-
-#ifdef DO_UNIT_TIMINGS
-#pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
-	return;
-#endif
-
-#ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_disableTerrain) {
-		return;
-	}
-#endif
-
-	DX8Wrapper::Set_Light_Environment(rinfo.light_environment);
-
-	// Force shaders to update.
-	m_stageTwoTexture->restore();
-	DX8Wrapper::Set_Texture(0,NULL);
-	DX8Wrapper::Set_Texture(1,NULL);
-	ShaderClass::Invalidate();
-
-	//	tm.Scale(ObjSpaceExtent);
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-
-	//Apply the shader and material
-
-	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
-
-	Bool doMultiPassWireFrame=FALSE;
-
-	if (((RTS3DScene *)rinfo.Camera.Get_User_Data())->getCustomPassMode() == SCENE_PASS_ALPHA_MASK ||
-		((SceneClass *)rinfo.Camera.Get_User_Data())->Get_Extra_Pass_Polygon_Mode() == SceneClass::EXTRA_PASS_CLEAR_LINE)
-	{
-			if (WW3D::Is_Texturing_Enabled())
-			{	//first pass where we just fill the z-buffer
-
-				devicePasses=1;	//one pass solid, next in wireframe.
-				doMultiPassWireFrame=TRUE;
-
-				if (rinfo.Additional_Pass_Count())
-				{
-					rinfo.Peek_Additional_Pass(0)->Install_Materials();
-					renderTerrainPass(&rinfo.Camera);
-					rinfo.Peek_Additional_Pass(0)->UnInstall_Materials();
-					return;
-				}
-			}
-			else
-			{	//wireframe pass
-				//Set to vertex diffuse lighting
-				DX8Wrapper::Set_Material(m_vertexMaterialClass);
-				//Set shader to non-textured solid color from vertex
-				DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueSolidShader);
-				devicePasses=1;	//one pass solid, next in wireframe.
-				DX8Wrapper::Apply_Render_State_Changes();
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_TFACTOR );
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_TEXTUREFACTOR,0xff808080);
-				doMultiPassWireFrame=TRUE;
-				renderTerrainPass(&rinfo.Camera);
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_TEXTUREFACTOR,0xff008000);
-				return;
-			}
-	}
-	else
-	{
-		DX8Wrapper::Set_Material(m_vertexMaterialClass);
-		DX8Wrapper::Set_Shader(m_shaderClass);
-
-		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT) {
-			doCloud = false;
-		}
-
- 		st=W3DShaderManager::ST_TERRAIN_BASE; //set default shader
- 		
- 		//set correct shader based on current settings
- 		if (!ShaderClass::Is_Backface_Culling_Inverted())
- 		{	//not reflection pass
- 			if (TheGlobalData->m_useLightMap && doCloud)
- 			{	st=W3DShaderManager::ST_TERRAIN_BASE_NOISE12;
- 			}
- 			else
- 			if (TheGlobalData->m_useLightMap)
- 			{	//lightmap only
- 				st=W3DShaderManager::ST_TERRAIN_BASE_NOISE2;
- 			}
- 			else
- 			if (doCloud)
- 			{	//cloudmap only
- 				st=W3DShaderManager::ST_TERRAIN_BASE_NOISE1;
- 			}
- 		}
- 		else
- 		{	//reflection pass, just do base texture
- 			st=W3DShaderManager::ST_TERRAIN_BASE;
- 		}
- 
- 		//Find number of passes required to render current shader
- 		devicePasses=W3DShaderManager::getShaderPasses(st);
- 
- 		if (m_disableTextures)
- 			devicePasses=1;	//force to 1 lighting-only pass
- 
- 		//Specify all textures that this shader may need.
- 		W3DShaderManager::setTexture(0,m_stageZeroTexture);
- 		W3DShaderManager::setTexture(1,m_stageZeroTexture);
- 		W3DShaderManager::setTexture(2,m_stageTwoTexture);	//cloud
- 		W3DShaderManager::setTexture(3,m_stageThreeTexture);//noise
-		//Disable writes to destination alpha channel (if there is one)
-		if (DX8Wrapper::getBackBufferFormat() == WW3D_FORMAT_A8R8G8B8)
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
-	}
-
-	Int pass;
- 	for (pass=0; pass<devicePasses; pass++) {
-#ifdef TIMING_TESTS
-#endif
-		if (!doMultiPassWireFrame)	//multi-pass wireframe doesn't use regular shaders.
-		{
- 			if (m_disableTextures ) {
- 				DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaque2DShader);
- 				DX8Wrapper::Set_Texture(0,NULL);
-   			} else {
- 				W3DShaderManager::setShader(st, pass);
-			}
-		}
-
-		for (j=0; j<m_numVBTilesY; j++)
-			for (i=0; i<m_numVBTilesX; i++)
-			{
-				static int count = 0;
-				count++;
-				Int numPolys = VERTEX_BUFFER_TILE_LENGTH*VERTEX_BUFFER_TILE_LENGTH*2;
-				Int numVertex = (VERTEX_BUFFER_TILE_LENGTH*2)*(VERTEX_BUFFER_TILE_LENGTH*2);
-				if (HALF_RES_MESH) {
-					numPolys /= 4;
-					numVertex /= 4;
-				}
-				DX8Wrapper::Set_Vertex_Buffer(m_vertexBufferTiles[j*m_numVBTilesX+i]);
-#ifdef PRE_TRANSFORM_VERTEX
-				if (m_xformedVertexBuffer && pass==0) {
-					// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
-					DX8Wrapper::Apply_Render_State_Changes();
-					int code = DX8Wrapper::_Get_D3D_Device8()->ProcessVertices(0, 0, numVertex, m_xformedVertexBuffer[j*m_numVBTilesX+i], 0); 
-					::OutputDebugString("did process vertex\n");
-				}
-				if (m_xformedVertexBuffer) {
-					// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
-					DX8Wrapper::Apply_Render_State_Changes();
-					DX8Wrapper::_Get_D3D_Device8()->SetStreamSource(
-						0,
-						m_xformedVertexBuffer[j*m_numVBTilesX+i],
-						D3DXGetFVFVertexSize(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2));
-					DX8Wrapper::_Get_D3D_Device8()->SetVertexShader(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2);
-				}
-#endif				
-				if (Is_Hidden() == 0) {
-					DX8Wrapper::Draw_Triangles(	0,numPolys, 0,	numVertex);
-				}
-
-			}
-	}		
-
-	if (!doMultiPassWireFrame)
-	{
-		if (pass)	//shader was applied at least once?
- 			W3DShaderManager::resetShader(st);
-
-		//Draw feathered shorelines
-		renderShoreLines(&rinfo.Camera);
-
-		//Do additional pass over any tiles that have 3 textures blended together.
-		if (TheGlobalData->m_use3WayTerrainBlends)
-			renderExtraBlendTiles();
-
-		Int yCoordMin = m_map->getDrawOrgY();
-		Int yCoordMax = m_y+m_map->getDrawOrgY()-1;
-		Int xCoordMin = m_map->getDrawOrgX();
-		Int xCoordMax = m_x+m_map->getDrawOrgX()-1;	
-	#ifdef TEST_CUSTOM_EDGING
-		// Draw edging just before last pass.
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Set_Texture(1,NULL);
-		m_stageTwoTexture->restore();
-		m_customEdging->drawEdging(m_map, xCoordMin, xCoordMax, yCoordMin, yCoordMax, 
-			m_stageZeroTexture, doCloud?m_stageTwoTexture:NULL, TheGlobalData->m_useLightMap?m_stageThreeTexture:NULL);
-	#endif
-	#ifdef DO_ROADS
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Set_Texture(1,NULL);
-		m_stageTwoTexture->restore();
-
-		ShaderClass::Invalidate();
-		if (!ShaderClass::Is_Backface_Culling_Inverted()) {
-			DX8Wrapper::Set_Material(m_vertexMaterialClass);
-			if (Scene) {
-				RTS3DScene *pMyScene = (RTS3DScene *)Scene;
-				RefRenderObjListIterator pDynamicLightsIterator(pMyScene->getDynamicLights());
-				m_roadBuffer->drawRoads(&rinfo.Camera, doCloud?m_stageTwoTexture:NULL, TheGlobalData->m_useLightMap?m_stageThreeTexture:NULL,
-					m_disableTextures,xCoordMin-m_map->getBorderSizeInline(), xCoordMax-m_map->getBorderSizeInline(), yCoordMin-m_map->getBorderSizeInline(), yCoordMax-m_map->getBorderSizeInline(), &pDynamicLightsIterator);
-			}
-		}
-	#endif
-	if (m_propBuffer) {
-		m_propBuffer->drawProps(rinfo);
-	}
-	#ifdef DO_SCORCH
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Set_Texture(1,NULL);
-		m_stageTwoTexture->restore();
-
-		ShaderClass::Invalidate();
-		if (!ShaderClass::Is_Backface_Culling_Inverted()) {
-			drawScorches();
-		}
-	#endif
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Set_Texture(1,NULL);
-		m_stageTwoTexture->restore();
-		ShaderClass::Invalidate();
-		DX8Wrapper::Apply_Render_State_Changes();
-
-		m_bridgeBuffer->drawBridges(&rinfo.Camera, m_disableTextures, doCloud?m_stageTwoTexture:NULL);
-
-		if (TheTerrainTracksRenderObjClassSystem)
-			TheTerrainTracksRenderObjClassSystem->flush();
-
-		if (m_shroud && rinfo.Additional_Pass_Count())
-		{
-			rinfo.Peek_Additional_Pass(0)->Install_Materials();
-			renderTerrainPass(&rinfo.Camera);
-			rinfo.Peek_Additional_Pass(0)->UnInstall_Materials();
-		}
-
-		ShaderClass::Invalidate();
-		DX8Wrapper::Apply_Render_State_Changes();
-	}
-	else
-			m_bridgeBuffer->drawBridges(&rinfo.Camera, m_disableTextures, m_stageTwoTexture);
-
-  if ( m_waypointBuffer ) 
-	  m_waypointBuffer->drawWaypoints(rinfo);
-
-	m_bibBuffer->renderBibs();
-
-	// We do some custom blending, so tell the shader class to reset everything.
-	DX8Wrapper::Set_Texture(0,NULL);
-	DX8Wrapper::Set_Texture(1,NULL);
-	m_stageTwoTexture->restore();
-	ShaderClass::Invalidate();
-	DX8Wrapper::Set_Material(NULL);
-
-}
-
-
-
-///Performs additional terrain rendering pass, blending in the black shroud texture.
-void HeightMapRenderObjClass::renderTerrainPass(CameraClass *pCamera)
-{
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,Matrix3D(1));
-
-	//Apply the shader and material
-	
-	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
-
-	for (Int j=0; j<m_numVBTilesY; j++)
-		for (Int i=0; i<m_numVBTilesX; i++)
-		{
-			static int count = 0;
-			count++;
-			Int numPolys = VERTEX_BUFFER_TILE_LENGTH*VERTEX_BUFFER_TILE_LENGTH*2;
-			Int numVertex = (VERTEX_BUFFER_TILE_LENGTH*2)*(VERTEX_BUFFER_TILE_LENGTH*2);
-			if (HALF_RES_MESH) {
-				numPolys /= 4;
-				numVertex /= 4;
-			}
-			DX8Wrapper::Set_Vertex_Buffer(m_vertexBufferTiles[j*m_numVBTilesX+i]);
-#ifdef PRE_TRANSFORM_VERTEX
-			if (m_xformedVertexBuffer && pass==0) {
-				// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
-				DX8Wrapper::Apply_Render_State_Changes();
-				int code = DX8Wrapper::_Get_D3D_Device8()->ProcessVertices(0, 0, numVertex, m_xformedVertexBuffer[j*m_numVBTilesX+i], 0); 
-				::OutputDebugString("did process vertex\n");
-			}
-			if (m_xformedVertexBuffer) {
-				// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
-				DX8Wrapper::Apply_Render_State_Changes();
-				DX8Wrapper::_Get_D3D_Device8()->SetStreamSource(
-					0,
-					m_xformedVertexBuffer[j*m_numVBTilesX+i],
-					D3DXGetFVFVertexSize(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2));
-				DX8Wrapper::_Get_D3D_Device8()->SetVertexShader(D3DFVF_XYZRHW |D3DFVF_DIFFUSE|D3DFVF_TEX2);
-			}
-#endif				
-			if (Is_Hidden() == 0) {
-				DX8Wrapper::Draw_Triangles(	0,numPolys, 0,	numVertex);
-			}
-		}
-}
-
-//=============================================================================
-// HeightMapRenderObjClass::renderExtraBlendTiles
-//=============================================================================
-/** Renders an additoinal terrain pass including only those tiles which have more than 2 textures
-blended together.  Used primarily for corner cases where 3 different textures meet.*/
-void HeightMapRenderObjClass::renderExtraBlendTiles(void)
-{
-	Int vertexCount = 0;
-	Int indexCount = 0;
-	Int xExtent = m_map->getXExtent();
-	Int border = m_map->getBorderSizeInline();
-	static Int maxBlendTiles = DEFAULT_MAX_FRAME_EXTRABLEND_TILES;
-
-	m_numVisibleExtraBlendTiles = 0;
-
-	if (!m_numExtraBlendTiles)
-		return;	//nothing to draw
-
-	if (maxBlendTiles > 10000)	//we can only fit about 10000 tiles into a single VB.
-		maxBlendTiles = 10000;
-
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,DX8_FVF_XYZNDUV2,maxBlendTiles*4);
-	DynamicIBAccessClass ib_access(BUFFER_TYPE_DYNAMIC_DX8,maxBlendTiles*6);
-	{
-
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* vb= lock.Get_Formatted_Vertex_Array();
-		DynamicIBAccessClass::WriteLockClass lockib(&ib_access);
-		UnsignedShort *ib=lockib.Get_Index_Array();
-
-		if (!vb || !ib) return;
-
-		const UnsignedByte* data = m_map->getDataPtr();
-
-		//Loop over visible terrain and extract all the tiles that need extra blend
-		Int drawEdgeY=m_map->getDrawOrgY()+m_map->getDrawHeight()-1;
-		Int drawEdgeX=m_map->getDrawOrgX()+m_map->getDrawWidth()-1;
-		if (drawEdgeX > (m_map->getXExtent()-1))
-			drawEdgeX = m_map->getXExtent()-1;
-		if (drawEdgeY > (m_map->getYExtent()-1))
-			drawEdgeY = m_map->getYExtent()-1;
-		Int drawStartX=m_map->getDrawOrgX();
-		Int drawStartY=m_map->getDrawOrgY();
-
-		for (Int j=0; j<m_numExtraBlendTiles; j++)
-		{
-			if (vertexCount >= (maxBlendTiles*4))
-				break;	//no room in vertex buffer
-
-			Real U[4],V[4];
-			UnsignedByte alpha[4];
-			Bool flipState,cliffState;
-			Int x = m_extraBlendTilePositions[j] & 0xffff;
-			Int y = m_extraBlendTilePositions[j] >> 16;
-
-			if (x >= drawStartX && x < drawEdgeX &&
-				y >= drawStartY && y < drawEdgeY &&
-				m_map->getExtraAlphaUVData(x,y,U,V,alpha,&flipState, &cliffState))
-			{	//this tile is inside visible region and has 3rd blend layer.
-
-				Int idx = x+y*xExtent;
-
-				Real p0=data[idx]*MAP_HEIGHT_SCALE;
-				Real p1=data[idx+1]*MAP_HEIGHT_SCALE;
-				Real p2=data[idx + 1 + xExtent]*MAP_HEIGHT_SCALE;
-				Real p3=data[idx + xExtent]*MAP_HEIGHT_SCALE;
-				if (cliffState && abs(p0-p2) > abs(p1-p3))	//cliffs sometimes force a flip
-					flipState = TRUE;
-
-				vb->x=(x-border)*MAP_XY_FACTOR;	 
-				vb->y=(y-border)*MAP_XY_FACTOR;
-				vb->z=p0;
-				vb->nx=0;
-				vb->ny=0;
-				vb->nz=0;
-				vb->diffuse=(alpha[0]<<24)|(getStaticDiffuse(x,y) & 0x00ffffff);
-				vb->u1=U[0];
-				vb->v1=V[0];
-				vb->u2=0;
-				vb->v2=0;
-				vb++;
-
-				vb->x=(x+1-border)*MAP_XY_FACTOR;	 
-				vb->y=(y-border)*MAP_XY_FACTOR;
-				vb->z=p1;
-				vb->nx=0;
-				vb->ny=0;
-				vb->nz=0;
-				vb->diffuse=(alpha[1]<<24)|(getStaticDiffuse(x+1,y) & 0x00ffffff);
-				vb->u1=U[1];
-				vb->v1=V[1];
-				vb->u2=0;
-				vb->v2=0;
-				vb++;
-
-				vb->x=(x+1-border)*MAP_XY_FACTOR;	 
-				vb->y=(y+1-border)*MAP_XY_FACTOR;
-				vb->z=p2;
-				vb->nx=0;
-				vb->ny=0;
-				vb->nz=0;
-				vb->diffuse=(alpha[2]<<24)|(getStaticDiffuse(x+1,y+1) & 0x00ffffff);
-				vb->u1=U[2];
-				vb->v1=V[2];
-				vb->u2=0;
-				vb->v2=0;
-				vb++;
-
-				vb->x=(x-border)*MAP_XY_FACTOR;	 
-				vb->y=(y+1-border)*MAP_XY_FACTOR;
-				vb->z=p3;
-				vb->nx=0;
-				vb->ny=0;
-				vb->nz=0;
-				vb->diffuse=(alpha[3]<<24)|(getStaticDiffuse(x,y+1) & 0x00ffffff);
-				vb->u1=U[3];
-				vb->v1=V[3];
-				vb->u2=0;
-				vb->v2=0;
-				vb++;
-				
-				if (flipState)
-				{
-					ib[0]=1+vertexCount;
-					ib[1]=3+vertexCount;
-					ib[2]=0+vertexCount;
-					ib[3]=1+vertexCount;
-					ib[4]=2+vertexCount;
-					ib[5]=3+vertexCount;
-				}
-				else
-				{
-					ib[0]=0+vertexCount;
-					ib[1]=2+vertexCount;
-					ib[2]=3+vertexCount;
-					ib[3]=0+vertexCount;
-					ib[4]=1+vertexCount;
-					ib[5]=2+vertexCount;
-				}
-				ib += 6;
-				vertexCount +=4;
-				indexCount +=6;
-			}//tile has 3rd blend layer and is visible
-		}	//for all extre blend tiles
-	}//unlock vertex buffer
-
-	if (vertexCount)
-	{
-		//Check if we couldn't fit all blend tiles into vertex buffer so we can enlarge it for next frame.
-		if (vertexCount == (maxBlendTiles*4))
-			maxBlendTiles += 16;	//enlarge by 16 to reduce trashing.
-		
-		ShaderClass::Invalidate();	//invalidate to force shader to reset since we directly changed states
-		DX8Wrapper::Set_Index_Buffer(ib_access,0);
-		DX8Wrapper::Set_Vertex_Buffer(vb_access);
-		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-		DX8Wrapper::Set_Material(vmat);
-		REF_PTR_RELEASE(vmat);
-		ShaderClass shader=ShaderClass::_PresetOpaqueShader;
-		shader.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);	//disable writes to z
-		DX8Wrapper::Set_Shader(shader);
-
-		if (TheGlobalData->m_use3WayTerrainBlends == 2)
-		{
-			shader.Set_Primary_Gradient(ShaderClass::GRADIENT_DISABLE);	//disable lighting.
-			shader.Set_Texturing(ShaderClass::TEXTURING_DISABLE);		//disable texturing.
-			DX8Wrapper::Set_Shader(shader);
-			DX8Wrapper::Set_Texture(0,NULL);	//debug mode which draws terrain tiles in white.
-			if (Is_Hidden() == 0) {
-				DX8Wrapper::Draw_Triangles(	0,indexCount/3, 0,	vertexCount);	//draw a quad, 2 triangles, 4 verts
-				m_numVisibleExtraBlendTiles += indexCount/6;
-			}
-		}
-		else
-		{
-			W3DShaderManager::setTexture(0,m_stageOneTexture);
-			W3DShaderManager::setTexture(1,m_stageTwoTexture);	//cloud
-			W3DShaderManager::setTexture(2,m_stageThreeTexture);	//noise/lightmap
-
-			W3DShaderManager::ShaderTypes st = W3DShaderManager::ST_ROAD_BASE;
-
-			Bool doCloud = TheGlobalData->m_useCloudMap;
-			if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT) {
-				doCloud = false;
-			}
-
-			if (TheGlobalData->m_useLightMap && doCloud)
- 			{	
-				st = W3DShaderManager::ST_ROAD_BASE_NOISE12;
- 			}
- 			else if (TheGlobalData->m_useLightMap)
- 			{	//lightmap only
- 				st = W3DShaderManager::ST_ROAD_BASE_NOISE2;
- 			}
- 			else if (doCloud)
- 			{	//cloudmap only
- 				st = W3DShaderManager::ST_ROAD_BASE_NOISE1;
- 			}
-
-			Int devicePasses=W3DShaderManager::getShaderPasses(st);
-
-			for (Int pass=0; pass < devicePasses; pass++)
-			{
-				W3DShaderManager::setShader(st, pass);
-				if (Is_Hidden() == 0) {
-					DX8Wrapper::Draw_Triangles(	0,indexCount/3, 0,	vertexCount);	//draw a quad, 2 triangles, 4 verts
-					m_numVisibleExtraBlendTiles += indexCount/6;
-				}
-			}
-			W3DShaderManager::resetShader(st);
-		}
-  }
-}
-#endif
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp
index 92687e7695c..62eb49594ae 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DBufferManager.cpp
@@ -305,7 +305,7 @@ W3DBufferManager::W3DVertexBufferSlot * W3DBufferManager::allocateSlotStorage(VB
 		m_W3DVertexBuffers[fvfType] = &m_W3DEmptyVertexBuffers[m_numEmptyVertexBuffersAllocated];
 		m_W3DVertexBuffers[fvfType]->m_nextVB=pVB;	//link to list
 		m_numEmptyVertexBuffersAllocated++;
-		
+
 		pVB=m_W3DVertexBuffers[fvfType];	//get new list head
 
 		Int vbSize=__max(DEFAULT_VERTEX_BUFFER_SIZE,size);
@@ -425,7 +425,7 @@ W3DBufferManager::W3DIndexBufferSlot * W3DBufferManager::allocateSlotStorage(Int
 		m_W3DIndexBuffers = &m_W3DEmptyIndexBuffers[m_numEmptyIndexBuffersAllocated];
 		m_W3DIndexBuffers->m_nextIB=pIB;	//link to list
 		m_numEmptyIndexBuffersAllocated++;
-		
+
 		pIB=m_W3DIndexBuffers;	//get new list head
 
 		Int ibSize=__max(DEFAULT_INDEX_BUFFER_SIZE,size);
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
index 84b7380769c..350082ebac2 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp
@@ -56,13 +56,7 @@
 #include "GameClient/Drawable.h"
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 #include "W3DDevice/GameClient/W3DShadow.h"
-#include "W3DDevice/GameClient/HeightMap.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 /** @todo: We're going to have a pool of a couple rendertargets to use
 in rare cases when dynamic shadows need to be generated.  Maybe we can
@@ -93,19 +87,13 @@ extern int nShadowStartBatchIndex;
 extern int SHADOW_VERTEX_SIZE;
 extern int SHADOW_INDEX_SIZE;
 
-//Bounding rectangle around rendered portion of terrain.
-static Int drawEdgeX=0;
-static Int drawEdgeY=0;
-static Int drawStartX=0;
-static Int drawStartY=0;
-
 //Global streaming vertex buffer with x,y,z,u,v type.
 struct SHADOW_DECAL_VERTEX	//vertex structure passed to D3D
 {
 		float x,y,z;
 		DWORD diffuse;
 		float u,v;
-}; 
+};
 
 #define SHADOW_DECAL_FVF	D3DFVF_XYZ|D3DFVF_TEX1|D3DFVF_DIFFUSE
 
@@ -171,8 +159,8 @@ class W3DShadowTexture : public RefCountClass, public	HashableClass
 
 		const char *		Get_Name(void) const	{ return m_namebuf;}
 		void				Set_Name(const char *name)
-		{	memset(m_namebuf,0,sizeof(m_namebuf));	//pad with zero so always ends with null character.
-			strncpy(m_namebuf,name,sizeof(m_namebuf)-1);
+		{
+			strlcpy(m_namebuf,name,sizeof(m_namebuf));
 		}
 		TextureClass	*getTexture(void)	{ return m_texture;}
 		void					 setTexture(TextureClass *texture)	{m_texture = texture;}
@@ -220,6 +208,10 @@ W3DProjectedShadowManager::W3DProjectedShadowManager(void)
 	m_W3DShadowTextureManager = NULL;
 	m_shadowCamera = NULL;
 	m_shadowContext= NULL;
+	m_drawEdgeX = 0;
+	m_drawEdgeY = 0;
+	m_drawStartX = 0;
+	m_drawStartY = 0;
 }
 
 W3DProjectedShadowManager::~W3DProjectedShadowManager(void)
@@ -246,7 +238,7 @@ void W3DProjectedShadowManager::reset( void )
 
 	m_W3DShadowTextureManager->freeAllTextures();
 
-}  // end Reset
+}
 
 Bool W3DProjectedShadowManager::init( void )
 {
@@ -285,10 +277,10 @@ Bool W3DProjectedShadowManager::ReAcquireResources(void)
 
 	if (FAILED(m_pDev->CreateIndexBuffer
 	(
-		SHADOW_DECAL_INDEX_SIZE*sizeof(WORD), 
-		D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC, 
-		D3DFMT_INDEX16, 
-		D3DPOOL_DEFAULT, 
+		SHADOW_DECAL_INDEX_SIZE*sizeof(WORD),
+		D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC,
+		D3DFMT_INDEX16,
+		D3DPOOL_DEFAULT,
 		&shadowDecalIndexBufferD3D
 	)))
 		return FALSE;
@@ -299,9 +291,9 @@ Bool W3DProjectedShadowManager::ReAcquireResources(void)
 		if (FAILED(m_pDev->CreateVertexBuffer
 		(
 			SHADOW_DECAL_VERTEX_SIZE*sizeof(SHADOW_DECAL_VERTEX),
-			D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC, 
+			D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC,
 			0,
-			D3DPOOL_DEFAULT, 
+			D3DPOOL_DEFAULT,
 			&shadowDecalVertexBufferD3D
 		)))
 			return FALSE;
@@ -342,7 +334,7 @@ void W3DProjectedShadowManager::updateRenderTargetTextures(void)
 	for( shadow = m_shadowList; shadow; shadow = shadow->m_next )
 	{	//decals don't need any updates on a per-frame basis since
 		//the image never changes.
-		if (shadow->m_type != SHADOW_DECAL) 
+		if (shadow->m_type != SHADOW_DECAL)
 			shadow->update();
 	}
 }
@@ -354,7 +346,7 @@ Int W3DProjectedShadowManager::renderProjectedTerrainShadow(W3DProjectedShadow *
 	struct SHADOW_VOLUME_VERTEX	//vertex structure passed to D3D
 	{
 		float x,y,z;
-	}; 
+	};
 
 	Int i,j,k;
 	UnsignedByte alpha[4];
@@ -420,7 +412,7 @@ Int W3DProjectedShadowManager::renderProjectedTerrainShadow(W3DProjectedShadow *
 				float ycoord = (float)j * MAP_XY_FACTOR;
 
 				for (i=startX; i <= endX; i++)
-				{	
+				{
 					pvVertices->x=(float)i*MAP_XY_FACTOR;
 					pvVertices->y=ycoord;
 					pvVertices->z=(float)hmap->getHeight(i,j)*MAP_HEIGHT_SCALE;
@@ -492,7 +484,7 @@ Int W3DProjectedShadowManager::renderProjectedTerrainShadow(W3DProjectedShadow *
 		shadowIndexBufferD3D->Unlock();
 
 		m_pDev->SetIndices(shadowIndexBufferD3D,nShadowStartBatchVertex);
-			
+
 		m_pDev->SetTransform(D3DTS_WORLD,(_D3DMATRIX *)&mWorld);
 
 		m_pDev->SetStreamSource(0,shadowVertexBufferD3D,sizeof(SHADOW_VOLUME_VERTEX));
@@ -515,7 +507,7 @@ Int W3DProjectedShadowManager::renderProjectedTerrainShadow(W3DProjectedShadow *
 		m_pDev->SetRenderState( D3DRS_SRCBLEND,  D3DBLEND_DESTCOLOR);
 		m_pDev->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_ZERO );
 
-		
+
 		if (DX8Wrapper::_Is_Triangle_Draw_Enabled())
 		{
 			Debug_Statistics::Record_DX8_Polys_And_Vertices(numPolys,numVerts,ShaderClass::_PresetOpaqueShader);
@@ -556,7 +548,7 @@ enum BlendDirection CPP_11(: Int)
 	B_B,	//visble on bottom
 	B_TL,	//visible on top/left
 	B_BR,	//visible on bottom/right
-	B_TR,	//visible on top/right 
+	B_TR,	//visible on top/right
 	B_BL	//visilbe on bottom/left
 };
 
@@ -587,7 +579,7 @@ static void RenderVBTile(TextureClass *text, Real ox, Real oy, Real ou, Real ov,
 
 	UnsignedShort *ib=lockib.Get_Index_Array();
 
-	vb->x=ox;	 
+	vb->x=ox;
 	vb->y=oy;
 	vb->z=TILE_HEIGHT;
 	vb->diffuse=TILE_DIFFUSE|BDToVA[bd][0];
@@ -595,7 +587,7 @@ static void RenderVBTile(TextureClass *text, Real ox, Real oy, Real ou, Real ov,
 	vb->v1=ov;
 	vb++;
 
-	vb->x=ox;	 
+	vb->x=ox;
 	vb->y=oy-10.0f;
 	vb->z=TILE_HEIGHT;
 	vb->diffuse=TILE_DIFFUSE|BDToVA[bd][1];
@@ -603,7 +595,7 @@ static void RenderVBTile(TextureClass *text, Real ox, Real oy, Real ou, Real ov,
 	vb->v1=ov+0.25f;
 	vb++;
 
-	vb->x=ox+10.0f;	 
+	vb->x=ox+10.0f;
 	vb->y=oy-10.0f;
 	vb->z=TILE_HEIGHT;
 	vb->diffuse=TILE_DIFFUSE|BDToVA[bd][2];
@@ -611,7 +603,7 @@ static void RenderVBTile(TextureClass *text, Real ox, Real oy, Real ou, Real ov,
 	vb->v1=ov+0.25f;
 	vb++;
 
-	vb->x=ox+10.0f;	 
+	vb->x=ox+10.0f;
 	vb->y=oy;
 	vb->z=TILE_HEIGHT;
 	vb->diffuse=TILE_DIFFUSE|BDToVA[bd][3];
@@ -731,7 +723,7 @@ void W3DProjectedShadowManager::flushDecals(W3DShadowTexture *texture, ShadowTyp
 	m_pDev->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
 	m_pDev->SetTextureStageState(0, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
 */
-	 
+
 
 	m_pDev->SetIndices(shadowDecalIndexBufferD3D,nShadowDecalStartBatchVertex);
 	m_pDev->SetTransform(D3DTS_WORLD,(_D3DMATRIX *)&mWorld);
@@ -839,7 +831,7 @@ void W3DProjectedShadowManager::queueDecal(W3DProjectedShadow *shadow)
 				Drawable *draw=((DrawableInfo *)robj->Get_User_Data())->m_drawable;
 				const Object *object=draw->getObject();
 				PathfindLayerEnum objectLayer;
-				if (object && (objectLayer=object->getLayer()) != LAYER_GROUND) 
+				if (object && (objectLayer=object->getLayer()) != LAYER_GROUND)
 				{	//check if object that this decal belongs to is not on the ground (bridge?)
 					layerHeight=BRIDGE_OFFSET_FACTOR+TheTerrainLogic->getLayerHeight(objPos.X,objPos.Y,objectLayer);
 				}
@@ -964,15 +956,15 @@ void W3DProjectedShadowManager::queueDecal(W3DProjectedShadow *shadow)
 		Int	startY=REAL_TO_INT_FLOOR(((objPos.Y+min_y)*mapScaleInv)) + borderSize;
 		Int endY=REAL_TO_INT_CEIL(((objPos.Y+max_y)*mapScaleInv)) + borderSize;
 
-		startX = __max(startX,drawStartX);
-		startX = __min(startX,drawEdgeX);
-		startY = __max(startY,drawStartY);
-		startY = __min(startY,drawEdgeY);
+		startX = __max(startX,m_drawStartX);
+		startX = __min(startX,m_drawEdgeX);
+		startY = __max(startY,m_drawStartY);
+		startY = __min(startY,m_drawEdgeY);
 
-		endX = __max(endX,drawStartX);
-		endX = __min(endX,drawEdgeX);
-		endY = __max(endY,drawStartY);
-		endY = __min(endY,drawEdgeY);
+		endX = __max(endX,m_drawStartX);
+		endX = __min(endX,m_drawEdgeX);
+		endY = __max(endY,m_drawStartY);
+		endY = __min(endY,m_drawEdgeY);
 
 		//Check if decal too large to fit inside 65536 index buffer.
 		//try clipping each direction to < 104 since that's more than
@@ -1044,7 +1036,7 @@ void W3DProjectedShadowManager::queueDecal(W3DProjectedShadow *shadow)
 					hmapVertex.Y=(float)(j-borderSize) * MAP_XY_FACTOR;
 
 					for (i=startX; i <= endX; i++)
-					{	
+					{
 						hmapVertex.X=(float)(i-borderSize)*MAP_XY_FACTOR;
 						hmapVertex.Z=__max((float)hmap->getHeight(i,j)*MAP_HEIGHT_SCALE,layerHeight);
 						pvVertices->x=hmapVertex.X;
@@ -1063,7 +1055,7 @@ void W3DProjectedShadowManager::queueDecal(W3DProjectedShadow *shadow)
 				hmapVertex.Y=(float)(j-borderSize) * MAP_XY_FACTOR;
 
 				for (i=startX; i <= endX; i++)
-				{	
+				{
 					hmapVertex.X=(float)(i-borderSize)*MAP_XY_FACTOR;
 					hmapVertex.Z=(float)hmap->getHeight(i,j)*MAP_HEIGHT_SCALE+0.01f * MAP_XY_FACTOR;
 					pvVertices->x=hmapVertex.X;
@@ -1102,7 +1094,7 @@ void W3DProjectedShadowManager::queueDecal(W3DProjectedShadow *shadow)
 			for (j=startY,rowStart=0; j<endY; j++,rowStart+=vertsPerRow)
 			{
 				for (i=rowStart,k=startX; k<endX; i++,k++)
-				{	
+				{
 					///@todo: fix the winding order in heightmap to be in strip order like above!
 					if (hmap->getFlipState(k,j))
 					{	pvIndices[0]=i+1+nShadowDecalVertsInBatch;
@@ -1281,33 +1273,40 @@ void W3DProjectedShadowManager::queueSimpleDecal(W3DProjectedShadow *shadow)
 
 }
 
+void W3DProjectedShadowManager::prepareShadows()
+{
+	if (!TheTerrainRenderObject)
+		return;
+
+	WorldHeightMap *hmap=TheTerrainRenderObject->getMap();
+
+	if (!hmap)
+		return;
+
+	//Find extents of visible terrain
+	m_drawEdgeY=hmap->getDrawOrgY()+hmap->getDrawHeight()-1;
+	m_drawEdgeX=hmap->getDrawOrgX()+hmap->getDrawWidth()-1;
+	if (m_drawEdgeX > (hmap->getXExtent()-1))
+		m_drawEdgeX = hmap->getXExtent()-1;
+	if (m_drawEdgeY > (hmap->getYExtent()-1))
+		m_drawEdgeY = hmap->getYExtent()-1;
+	m_drawStartX=hmap->getDrawOrgX();
+	m_drawStartY=hmap->getDrawOrgY();
+}
+
 Int W3DProjectedShadowManager::renderShadows(RenderInfoClass & rinfo)
 {
-	///@todo: implement this method.
-	W3DProjectedShadow *shadow;
-	static AABoxClass aaBox;
-	static SphereClass sphere;
 	Int projectionCount=0;
 
+	if (!TheTerrainRenderObject)
+		return projectionCount;
+
 	if (!m_shadowList && !m_decalList)
 		return	projectionCount;	//there are no shadows to render.
 
-	//Find extents of visible terrain
-	if (TheTerrainRenderObject)
-	{
-		WorldHeightMap *hmap=TheTerrainRenderObject->getMap();
-
-		drawEdgeY=hmap->getDrawOrgY()+hmap->getDrawHeight()-1;
-		drawEdgeX=hmap->getDrawOrgX()+hmap->getDrawWidth()-1;
-		if (drawEdgeX > (hmap->getXExtent()-1))
-			drawEdgeX = hmap->getXExtent()-1;
-		if (drawEdgeY > (hmap->getYExtent()-1))
-			drawEdgeY = hmap->getYExtent()-1;
-		drawStartX=hmap->getDrawOrgX();
-		drawStartY=hmap->getDrawOrgY();
-	}
-	else
-		return projectionCount;
+	W3DProjectedShadow *shadow;
+	static AABoxClass aaBox;
+	static SphereClass sphere;
 
 	//According to Nvidia there's a D3D bug that happens if you don't start with a
 	//new dynamic VB each frame - so we force a DISCARD by overflowing the counter.
@@ -1324,7 +1323,7 @@ Int W3DProjectedShadowManager::renderShadows(RenderInfoClass & rinfo)
 		ShadowType lastShadowType = SHADOW_NONE;
 
 		for( shadow = m_shadowList; shadow; shadow = shadow->m_next )
-		{		
+		{
 			if (shadow->m_isEnabled && !shadow->m_isInvisibleEnabled)
 			{
 				if (shadow->m_type & SHADOW_DECAL)
@@ -1420,17 +1419,17 @@ Int W3DProjectedShadowManager::renderShadows(RenderInfoClass & rinfo)
 												rinfo.Pop_Material_Pass();
 												projectionCount++;	//keep track of number of shadow projections
 											}
-									}//robj
-								}//di
-							}	// end for drawmodule 
-					}  // end for obj
+									}
+								}
+							}
+					}
 				}
-			}//shadow is enabled
+			}
 		}
 
 		flushDecals(lastShadowDecalTexture,lastShadowType);	//make sure there are not any unrendered decals left over.
 		TheDX8MeshRenderer.Flush();	//draw all the shadow receiving objects
-	}//rendering shadows
+	}
 	if (m_decalList)
 	{
 		//keep track of active decal texture so we can render all decals at once.
@@ -1438,7 +1437,7 @@ Int W3DProjectedShadowManager::renderShadows(RenderInfoClass & rinfo)
 		ShadowType lastShadowType = SHADOW_NONE;
 
 		for( shadow = m_decalList; shadow; shadow = shadow->m_next )
-		{		
+		{
 			if (shadow->m_isEnabled && !shadow->m_isInvisibleEnabled)
 			{
 				if (lastShadowDecalTexture == NULL)
@@ -1458,7 +1457,7 @@ Int W3DProjectedShadowManager::renderShadows(RenderInfoClass & rinfo)
 					queueDecal(shadow);	//only draw shadow if casting object is visible
 					projectionCount++;
 				}
-			}//shadow is enabled
+			}
 		}
 
 		flushDecals(lastShadowDecalTexture,lastShadowType);	//make sure there are not any unrendered decals left over.
@@ -1477,8 +1476,7 @@ Shadow* W3DProjectedShadowManager::addDecal(Shadow::ShadowTypeInfo *shadowInfo)
 	Real	decalSizeY=0.0f;
 
 	Bool	allowSunDirection=FALSE;
-	Char	texture_name[64];
-	Int nameLen;
+	Char texture_name[ARRAY_SIZE(shadowInfo->m_ShadowName)];
 
 	if (!shadowInfo)
 		return NULL;	//right now we require hardware render-to-texture support
@@ -1486,10 +1484,10 @@ Shadow* W3DProjectedShadowManager::addDecal(Shadow::ShadowTypeInfo *shadowInfo)
 	//simple decal using the premade texture specified.
 	//can be always perpendicular to model's z-axis or projected
 	//onto world geometry.
-	nameLen=strlen(shadowInfo->m_ShadowName);
-	strncpy(texture_name,shadowInfo->m_ShadowName,nameLen);
-	strcpy(texture_name+nameLen,".tga");	//append texture extension
-	
+	static_assert(ARRAY_SIZE(texture_name) >= ARRAY_SIZE(shadowInfo->m_ShadowName), "Incorrect array size");
+	strcpy(texture_name, shadowInfo->m_ShadowName);
+	strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
+
 	//Check if we previously added a decal using this texture
 	st=m_W3DShadowTextureManager->getTexture(texture_name);
 	if (st == NULL)
@@ -1500,7 +1498,7 @@ Shadow* W3DProjectedShadowManager::addDecal(Shadow::ShadowTypeInfo *shadowInfo)
 		w3dTexture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 		w3dTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
 
-		DEBUG_ASSERTCRASH(w3dTexture != NULL, ("Could not load decal texture: %s\n",texture_name));
+		DEBUG_ASSERTCRASH(w3dTexture != NULL, ("Could not load decal texture: %s",texture_name));
 
 		if (!w3dTexture)
 			return NULL;
@@ -1566,19 +1564,7 @@ Shadow* W3DProjectedShadowManager::addDecal(Shadow::ShadowTypeInfo *shadowInfo)
 		m_decalList = shadow;
 	}
 
-	switch (shadow->m_type)
-	{
-		case SHADOW_DECAL:
-		case SHADOW_ALPHA_DECAL:
-		case SHADOW_ADDITIVE_DECAL:
-			m_numDecalShadows++;
-			break;
-		case SHADOW_PROJECTION:
-			m_numProjectionShadows++;
-		default:
-			break;
-	}
-
+	updateShadowNumbers(shadow->m_type, +1);
 	return shadow;
 }
 
@@ -1595,8 +1581,7 @@ Shadow* W3DProjectedShadowManager::addDecal(RenderObjClass *robj, Shadow::Shadow
 	Real	decalOffsetY=0.0f;
 
 	Bool	allowSunDirection=FALSE;
-	Char	texture_name[64];
-	Int nameLen;
+	Char texture_name[ARRAY_SIZE(shadowInfo->m_ShadowName)];
 
 	if (!robj || !shadowInfo)
 		return NULL;	//right now we require hardware render-to-texture support
@@ -1604,10 +1589,10 @@ Shadow* W3DProjectedShadowManager::addDecal(RenderObjClass *robj, Shadow::Shadow
 	//simple decal using the premade texture specified.
 	//can be always perpendicular to model's z-axis or projected
 	//onto world geometry.
-	nameLen=strlen(shadowInfo->m_ShadowName);
-	strncpy(texture_name,shadowInfo->m_ShadowName,nameLen);
-	strcpy(texture_name+nameLen,".tga");	//append texture extension
-	
+	static_assert(ARRAY_SIZE(texture_name) >= ARRAY_SIZE(shadowInfo->m_ShadowName), "Incorrect array size");
+	strcpy(texture_name, shadowInfo->m_ShadowName);
+	strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
+
 	//Check if we previously added a decal using this texture
 	st=m_W3DShadowTextureManager->getTexture(texture_name);
 	if (st == NULL)
@@ -1618,7 +1603,7 @@ Shadow* W3DProjectedShadowManager::addDecal(RenderObjClass *robj, Shadow::Shadow
 		w3dTexture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 		w3dTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
 
-		DEBUG_ASSERTCRASH(w3dTexture != NULL, ("Could not load decal texture: %s\n",texture_name));
+		DEBUG_ASSERTCRASH(w3dTexture != NULL, ("Could not load decal texture: %s",texture_name));
 
 		if (!w3dTexture)
 			return NULL;
@@ -1702,19 +1687,7 @@ Shadow* W3DProjectedShadowManager::addDecal(RenderObjClass *robj, Shadow::Shadow
 		m_decalList = shadow;
 	}
 
-	switch (shadow->m_type)
-	{
-		case SHADOW_DECAL:
-		case SHADOW_ALPHA_DECAL:
-		case SHADOW_ADDITIVE_DECAL:
-			m_numDecalShadows++;
-			break;
-		case SHADOW_PROJECTION:
-			m_numProjectionShadows++;
-		default:
-			break;
-	}
-
+	updateShadowNumbers(shadow->m_type, +1);
 	return shadow;
 }
 
@@ -1730,8 +1703,7 @@ W3DProjectedShadow* W3DProjectedShadowManager::addShadow(RenderObjClass *robj, S
 	Real	decalOffsetY=0.0f;
 
 	Bool	allowSunDirection=FALSE;
-	Char	texture_name[64];
-	Int nameLen;
+	Char texture_name[ARRAY_SIZE(shadowInfo->m_ShadowName)];
 
 
 	if (!m_dynamicRenderTarget || !robj || !TheGlobalData->m_useShadowDecals)
@@ -1745,15 +1717,18 @@ W3DProjectedShadow* W3DProjectedShadowManager::addShadow(RenderObjClass *robj, S
 		{		//simple decal using the premade texture specified.
 				//can be always perpendicular to model's z-axis or projected
 				//onto world geometry.
-				nameLen=strlen(shadowInfo->m_ShadowName);
-				if (nameLen <= 1)	//no texture name given, use same as object
-				{	strcpy(texture_name,defaultDecalName);
+				if (strlen(shadowInfo->m_ShadowName) <= 1)	//no texture name given, use same as object
+				{
+					static_assert(ARRAY_SIZE(texture_name) >= ARRAY_SIZE(defaultDecalName), "Incorrect array size");
+					strcpy(texture_name, defaultDecalName);
 				}
 				else
-				{	strncpy(texture_name,shadowInfo->m_ShadowName,nameLen);
-					strcpy(texture_name+nameLen,".tga");	//append texture extension
+				{
+					static_assert(ARRAY_SIZE(texture_name) >= ARRAY_SIZE(shadowInfo->m_ShadowName), "Incorrect array size");
+					strcpy(texture_name, shadowInfo->m_ShadowName);
+					strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
 				}
-					
+
 				st=m_W3DShadowTextureManager->getTexture(texture_name);
 				if (st == NULL)
 				{
@@ -1791,11 +1766,12 @@ W3DProjectedShadow* W3DProjectedShadowManager::addShadow(RenderObjClass *robj, S
 					//to allow multiple models to share same shadow - for
 					//example, all trees could use same shadow even if slightly
 					//different color, etc.
-					strcpy(texture_name,shadowInfo->m_ShadowName);
+					static_assert(ARRAY_SIZE(texture_name) >= ARRAY_SIZE(shadowInfo->m_ShadowName), "Incorrect array size");
+					strcpy(texture_name, shadowInfo->m_ShadowName);
 				}
 				else
-					strcpy(texture_name,robj->Get_Name());	//not texture name give, assume model name.
-					
+					strlcpy(texture_name, robj->Get_Name(), ARRAY_SIZE(texture_name));	//not texture name give, assume model name.
+
 				st=m_W3DShadowTextureManager->getTexture(texture_name);
 				if (st == NULL)
 				{	//texture doesn't exist, use current render object to create it
@@ -1809,11 +1785,11 @@ W3DProjectedShadow* W3DProjectedShadowManager::addShadow(RenderObjClass *robj, S
 						return NULL;	//could not create the shadow texture
 				}
 				shadowType=SHADOW_PROJECTION;
-		}//SHADOW_PROJECTION
+		}
 	}
 	else
 	{	//no shadow info, assume user wants a projected shadow
-		strcpy(texture_name,robj->Get_Name());
+		strlcpy(texture_name, robj->Get_Name(), ARRAY_SIZE(texture_name));
 
 		st=m_W3DShadowTextureManager->getTexture(texture_name);
 
@@ -1900,17 +1876,7 @@ W3DProjectedShadow* W3DProjectedShadowManager::addShadow(RenderObjClass *robj, S
 		m_shadowList = shadow;
 	}
 
-	switch (shadow->m_type)
-	{
-		case SHADOW_DECAL:
-			m_numDecalShadows++;
-			break;
-		case SHADOW_PROJECTION:
-			m_numProjectionShadows++;
-		default:
-			break;
-	}
-
+	updateShadowNumbers(shadow->m_type, +1);
 	return shadow;
 }
 
@@ -1925,22 +1891,23 @@ W3DProjectedShadow* W3DProjectedShadowManager::createDecalShadow(Shadow::ShadowT
 	Real	decalOffsetX=0.0f;
 	Real	decalOffsetY=0.0f;
 	const Real defaultWidth = 10.0f;
-
-	Char	texture_name[64];
-	Int nameLen;
+	Char texture_name[ARRAY_SIZE(shadowInfo->m_ShadowName)];
 
 	//simple decal using the premade texture specified.
 	//can be always perpendicular to model's z-axis or projected
 	//onto world geometry.
-	nameLen=strlen(shadowInfo->m_ShadowName);
-	if (nameLen <= 1)	//no texture name given, use same as object
-	{	strcpy(texture_name,defaultDecalName);
+	if (strlen(shadowInfo->m_ShadowName) <= 1)	//no texture name given, use same as object
+	{
+		static_assert(ARRAY_SIZE(texture_name) >= ARRAY_SIZE(defaultDecalName), "Incorrect array size");
+		strcpy(texture_name, defaultDecalName);
 	}
 	else
-	{	strncpy(texture_name,shadowInfo->m_ShadowName,nameLen);
-		strcpy(texture_name+nameLen,".tga");	//append texture extension
+	{
+		static_assert(ARRAY_SIZE(texture_name) >= ARRAY_SIZE(shadowInfo->m_ShadowName), "Incorrect array size");
+		strcpy(texture_name, shadowInfo->m_ShadowName);
+		strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
 	}
-		
+
 	st=m_W3DShadowTextureManager->getTexture(texture_name);
 	if (st == NULL)
 	{
@@ -1973,7 +1940,7 @@ W3DProjectedShadow* W3DProjectedShadowManager::createDecalShadow(Shadow::ShadowT
 	if( shadow == NULL )
 		return NULL;
 
-	shadow->setTexture(0,st);	
+	shadow->setTexture(0,st);
 	shadow->m_type = shadowType;		/// type of projection
 	shadow->m_allowWorldAlign=allowWorldAlign;	/// wrap shadow around world geometry - else align perpendicular to local z-axis.
 
@@ -2030,22 +1997,14 @@ void W3DProjectedShadowManager::removeShadow (W3DProjectedShadow *shadow)
 					prev_shadow->m_next=shadow->m_next;
 				else
 					m_decalList=shadow->m_next;
-				switch (shadow->m_type)
-				{
-					case SHADOW_DECAL:
-						m_numDecalShadows--;
-						break;
-					case SHADOW_PROJECTION:
-						m_numProjectionShadows--;
-					default:
-						break;
-				}
+
+				updateShadowNumbers(shadow->m_type, -1);
 				delete shadow;
 				return;
 			}
-		}  // end for
+		}
 	}
-		
+
 	//search for this shadow
 	for( next_shadow = m_shadowList; next_shadow; prev_shadow=next_shadow, next_shadow = next_shadow->m_next )
 	{
@@ -2055,20 +2014,12 @@ void W3DProjectedShadowManager::removeShadow (W3DProjectedShadow *shadow)
 				prev_shadow->m_next=shadow->m_next;
 			else
 				m_shadowList=shadow->m_next;
-			switch (shadow->m_type)
-			{
-				case SHADOW_DECAL:
-					m_numDecalShadows--;
-					break;
-				case SHADOW_PROJECTION:
-					m_numProjectionShadows--;
-				default:
-					break;
-			}
+
+			updateShadowNumbers(shadow->m_type, -1);
 			delete shadow;
 			return;
 		}
-	}  // end for
+	}
 }
 
 void W3DProjectedShadowManager::removeAllShadows(void)
@@ -2086,7 +2037,7 @@ void W3DProjectedShadowManager::removeAllShadows(void)
 		next_shadow = cur_shadow->m_next;
 		cur_shadow->m_next = NULL;
 		delete cur_shadow;
-	}  // end for
+	}
 
 	next_shadow=m_decalList;
 	cur_shadow=NULL;
@@ -2096,10 +2047,27 @@ void W3DProjectedShadowManager::removeAllShadows(void)
 		next_shadow = cur_shadow->m_next;
 		cur_shadow->m_next = NULL;
 		delete cur_shadow;
-	}  // end for
+	}
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+void W3DProjectedShadowManager::updateShadowNumbers(ShadowType shadowType, Int addNum)
+{
+	switch (shadowType)
+	{
+		case SHADOW_DECAL:
+		case SHADOW_ALPHA_DECAL:
+		case SHADOW_ADDITIVE_DECAL:
+			m_numDecalShadows += addNum;
+			break;
+		case SHADOW_PROJECTION:
+			m_numProjectionShadows += addNum;
+			break;
+		default:
+			break;
+	}
+}
+
+#if defined(RTS_DEBUG)
 void W3DProjectedShadow::getRenderCost(RenderCost & rc) const
 {
 	if (TheGlobalData->m_useShadowDecals && m_isEnabled && !m_isInvisibleEnabled)
@@ -2175,7 +2143,7 @@ void W3DProjectedShadow::updateTexture(Vector3 &lightPos)
 		//Need to copy generated texture into permanent texture.
 		SurfaceClass *oldSurface=m_shadowTexture[0]->getTexture()->Get_Surface_Level();
 		SurfaceClass *newSurface=TheW3DProjectedShadowManager->getRenderTarget()->Get_Surface_Level();
-		
+
 		//Copy shadow from temporary video-memory surface into a permanent texture
 		oldSurface->Copy(0,0,0,0,DEFAULT_RENDER_TARGET_WIDTH,DEFAULT_RENDER_TARGET_HEIGHT,newSurface);
 		REF_PTR_RELEASE(newSurface);
@@ -2271,7 +2239,7 @@ void W3DShadowTexture::updateBounds(Vector3 &lightPos, RenderObjClass *robj)
 		Vector3 lightRay;
 		Real floorZ;
 		Real vectorScale,vectorScaleTemp, vectorScaleMax,length;
-		
+
 		//calculate local bounding box of shadow projection
 		objPos=robj->Get_Position();
 		box=robj->Get_Bounding_Box();
@@ -2332,7 +2300,7 @@ void W3DShadowTexture::updateBounds(Vector3 &lightPos, RenderObjClass *robj)
 		box.Translate(-objPos);	//translate box to object space.
 }
 
-W3DShadowTextureManager::W3DShadowTextureManager(void) 
+W3DShadowTextureManager::W3DShadowTextureManager(void)
 {
 	// Create the hash tables
 	texturePtrTable = NEW HashTableClass( 2048 );
@@ -2372,7 +2340,7 @@ W3DShadowTexture * W3DShadowTextureManager::peekTexture(const char * name)
 
 /** Get texture from cache and increment its reference count */
 W3DShadowTexture * W3DShadowTextureManager::getTexture(const char * name)
-{	
+{
 	W3DShadowTexture * text = peekTexture( name );
 	if ( text != NULL ) {
 		text->Add_Ref();
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp
index 0973049b74c..4f2096efa7f 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DShadow.cpp
@@ -63,6 +63,12 @@ Vector3 LightPosWorld[ MAX_SHADOW_LIGHTS ] =
 	Vector3( 94.0161f, 50.499f, 200.0f)
 };
 
+void PrepareShadows()
+{
+	if (TheW3DProjectedShadowManager)
+		TheW3DProjectedShadowManager->prepareShadows();
+}
+
 //DECLARE_PERF_TIMER(shadowsRender)
 void DoShadows(RenderInfoClass & rinfo, Bool stencilPass)
 {
@@ -92,7 +98,7 @@ void DoShadows(RenderInfoClass & rinfo, Bool stencilPass)
 		TheW3DShadowManager->queueShadows(FALSE);
 
 }
-	
+
 W3DShadowManager::W3DShadowManager( void )
 {
 	DEBUG_ASSERTCRASH(TheW3DVolumetricShadowManager == NULL && TheW3DProjectedShadowManager == NULL,
@@ -192,7 +198,7 @@ Shadow *W3DShadowManager::addShadow( RenderObjClass *robj, Shadow::ShadowTypeInf
 		default:
 			return NULL;
 	}
-		
+
 	return NULL;
 }
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
index b2fe5e32929..9bcf74d80ee 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
@@ -62,11 +62,6 @@
 #include "wwshade/shdsubmesh.h"
 #endif
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // Global Variables and Functions /////////////////////////////////////////////
 
@@ -97,7 +92,7 @@ const Real cosAngleToCare = cos ((0.2 * PI) / 180.0);	//1.5 degree difference
 struct SHADOW_STATIC_VOLUME_VERTEX	//vertex structure passed to D3D
 {
 		float x,y,z;
-}; 
+};
 #define SHADOW_STATIC_VOLUME_FVF	D3DFVF_XYZ
 
 #ifdef SV_DEBUG	//in debug mode, dynamic shadows are rendered with random diffuse color
@@ -105,7 +100,7 @@ struct SHADOW_STATIC_VOLUME_VERTEX	//vertex structure passed to D3D
 	{
 			float x,y,z;
 			DWORD diffuse;
-	}; 
+	};
 	#define SHADOW_DYNAMIC_VOLUME_FVF	D3DFVF_XYZ|D3DFVF_DIFFUSE
 #else
 	typedef struct SHADOW_STATIC_VOLUME_VERTEX	SHADOW_DYNAMIC_VOLUME_VERTEX;
@@ -160,14 +155,13 @@ struct Geometry
 		return TRUE;
 	}
 	void Release(void)
-	{	if (m_verts)
-		{	delete [] m_verts;
-			m_verts=NULL;
-		}
-		if (m_indices)
-		{	delete [] m_indices;
-			m_indices=NULL;
-		}
+	{
+		delete [] m_verts;
+		m_verts=NULL;
+
+		delete [] m_indices;
+		m_indices=NULL;
+
 		m_numActivePolygon=m_numPolygon=0;
 		m_numActiveVertex=m_numVertex=0;
 	}
@@ -234,8 +228,8 @@ struct Geometry
 };
 
 // CONST //////////////////////////////////////////////////////////////////////
-const Int MAX_POLYGON_NEIGHBORS = 3;  // we use nothing but triangles for 
-																			// geometry polygons so we have at 
+const Int MAX_POLYGON_NEIGHBORS = 3;  // we use nothing but triangles for
+																			// geometry polygons so we have at
 																			// most 3 neighbors
 const Int NO_NEIGHBOR = -1;  // entry value for neighbor when there isn't one
 
@@ -274,7 +268,7 @@ class W3DShadowGeometryMesh
 	//for the sake of speed, give direct access to classes that need this data.
 	friend class W3DShadowGeometry;
 	friend class W3DVolumetricShadow;
-	
+
 public:
 	W3DShadowGeometryMesh( void );
 #ifdef DO_TERRAIN_SHADOW_VOLUMES
@@ -312,7 +306,7 @@ class W3DShadowGeometryMesh
 //		Vector3 vertexList[3];
 		//get vertex indices for this polygon
 		GetPolygonIndex(dwPolyNormId,indexList);
-		//get the vertices	
+		//get the vertices
 //		GetVertex(indexList[0],&vertexList[0]);
 //		GetVertex(indexList[1],&vertexList[1]);
 //		GetVertex(indexList[2],&vertexList[2]);
@@ -371,7 +365,7 @@ class W3DShadowGeometryMesh
 							 // in our current geometry.
 	W3DShadowGeometry *m_parentGeometry; // mesh hierarchy containing this mesh.
 
-};	//end of meshInfo
+};
 
 #ifdef DO_TERRAIN_SHADOW_VOLUMES
 
@@ -579,7 +573,7 @@ void W3DVolumetricShadowManager::loadTerrainShadows(void)
 /*	W3DShadow *shadow = NEW W3DShadow;
 	// add to our shadow list through the shadow next links
 	shadow->m_next = m_shadowList;
-	m_shadowList = shadow;	
+	m_shadowList = shadow;
 */
 }
 
@@ -605,13 +599,13 @@ class W3DShadowGeometry : public RefCountClass, public	HashableClass
 
 		const char *		Get_Name(void) const	{ return m_namebuf;}
 		void				Set_Name(const char *name)
-		{	memset(m_namebuf,0,sizeof(m_namebuf));	//pad with zero so always ends with null character.
-			strncpy(m_namebuf,name,sizeof(m_namebuf)-1);
+		{
+			strlcpy(m_namebuf,name,sizeof(m_namebuf));
 		}
 		Int					getMeshCount(void)	{ return m_meshCount;}
 		W3DShadowGeometryMesh	*getMesh(Int index)	{ return &m_meshList[index];}
 
-		
+
 		int GetNumTotalVertex (void)	{	return m_numTotalsVerts;}	///<total number of vertices in all meshes of this geometry
 
 	private:
@@ -622,7 +616,7 @@ class W3DShadowGeometry : public RefCountClass, public	HashableClass
 		Int m_meshCount;							///<number of meshes in hierarchy
 		Int m_numTotalsVerts;						///<number of verts in entire hierarchy
 };
-  
+
 #define MAX_SHADOW_VOLUME_VERTS 16384
 
 Int W3DShadowGeometry::initFromHLOD(RenderObjClass *robj)
@@ -654,7 +648,7 @@ Int W3DShadowGeometry::initFromHLOD(RenderObjClass *robj)
 			if ((geomMesh->m_mesh->Is_Alpha() || geomMesh->m_mesh->Is_Translucent()) && !geomMesh->m_mesh->Peek_Model()->Get_Flag(MeshGeometryClass::CAST_SHADOW))
 				continue; //transparent meshes that don't have forced shadows will not cast volumetric shadows
 			// CNC3 (gth) skin meshes should never cast a volumetric shadow
-			if (geomMesh->m_mesh->Peek_Model()->Get_Flag(MeshGeometryClass::SKIN)) 
+			if (geomMesh->m_mesh->Peek_Model()->Get_Flag(MeshGeometryClass::SKIN))
 				continue;
 
 			MeshModelClass *mm = geomMesh->m_mesh->Peek_Model();
@@ -696,12 +690,12 @@ Int W3DShadowGeometry::initFromHLOD(RenderObjClass *robj)
 
 			// build our neighboring polygon information
 //			geomMesh->buildPolygonNeighbors();
-			
+
 			geomMesh++;
 			m_meshCount++;
 		}
 
-		
+
 #ifdef USE_WWSHADE //(cnc3)(gth) Support for ShaderMeshes!
 // I'm coding this as a completely independent block rather than re-factoring the code above
 // because it will probably save us pain in future merges.
@@ -719,16 +713,16 @@ Int W3DShadowGeometry::initFromHLOD(RenderObjClass *robj)
 
 				//transparent meshes that don't have forced shadows will not cast volumetric shadows
 				if (shd_mesh->Is_Translucent() && !sub_mesh->Get_Flag(MeshGeometryClass::CAST_SHADOW))
-					continue; 
+					continue;
 
 				// skin meshes should never cast a volumetric shadow
-				if (sub_mesh->Get_Flag(MeshGeometryClass::SKIN)) 
+				if (sub_mesh->Get_Flag(MeshGeometryClass::SKIN))
 					continue;
 
 				geomMesh->m_mesh = NULL; //hope this doesn't cause problems!
 				geomMesh->m_meshRobjIndex=i;
 
-				// Count the polygons and vertices 
+				// Count the polygons and vertices
 				geomMesh->m_numVerts = sub_mesh->Get_Vertex_Count();
 				geomMesh->m_numPolygons = sub_mesh->Get_Polygon_Count();
 
@@ -768,16 +762,16 @@ Int W3DShadowGeometry::initFromHLOD(RenderObjClass *robj)
 
 				// build our neighboring polygon information
 //				geomMesh->buildPolygonNeighbors();
-				
+
 				geomMesh++;
 				m_meshCount++;
 
 			}
 		}
 #endif //(cnc3)(gth) Support for ShaderMeshes!
-	
+
 	}
-	
+
 //	for (i = 0; i < AdditionalModels.Count(); i++) {
 //		res |= AdditionalModels[i].Model->Cast_Ray(raytest);
 //	}
@@ -859,13 +853,13 @@ Int W3DShadowGeometry::init(RenderObjClass *robj)
 // W3DShadowGeometry =============================================================
 // ============================================================================
 W3DShadowGeometryMesh::W3DShadowGeometryMesh( void )
-{	
+{
 	// init polygon neighbor information
 	m_polyNeighbors = NULL;
 	m_numPolyNeighbors = 0;
 	m_parentVerts = NULL;
 	m_polygonNormals = NULL;
-}  // end W3DShadowGeometry
+}
 
 // ~W3DShadowGeometry ============================================================
 // ============================================================================
@@ -873,13 +867,11 @@ W3DShadowGeometryMesh::~W3DShadowGeometryMesh( void )
 {
 	// remove our neighbor list information allocated
 	deleteNeighbors();
-	if (m_parentVerts) {
-		delete [] m_parentVerts;
-	}
-	if (m_polygonNormals)
-		delete [] m_polygonNormals;
 
-}  // end ~W3DShadowGeometry
+	delete [] m_parentVerts;
+	delete [] m_polygonNormals;
+
+}
 
 // GetPolyNeighbor ============================================================
 // Return the poly neighbor structure at the given index
@@ -898,11 +890,11 @@ if (!m_polyNeighbors) {
 		assert( 0 );
 		return NULL;
 
-	}  // en dif
+	}
 
 	return &m_polyNeighbors[ polyIndex ];
 
-}  // end GetPolyNeighbor
+}
 
 // buildPolygonNeighbors ======================================================
 // Whenever we set a new geometry we want to build some information about
@@ -935,7 +927,7 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 
 		return;  // nothing to see here people, move along
 
-	}  // end if
+	}
 
 	//
 	// in the event that this geometry can deform on the fly or we are
@@ -954,7 +946,7 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 		if( allocateNeighbors( numPolys ) == FALSE )
 			return;
 
-	}  // end if
+	}
 
 	//
 	// initialize all polygon neighbor information to none and assign our
@@ -970,7 +962,7 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 		for( j = 0; j < MAX_POLYGON_NEIGHBORS; j++ )
 			m_polyNeighbors[ i ].neighbor[ j ].neighborIndex = NO_NEIGHBOR;
 
-	}  // end for i
+	}
 
 	// assign polygon data for each of our polygons
 	for( i = 0; i < m_numPolyNeighbors; i++ )
@@ -1025,7 +1017,7 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 							{
 
 								const Vector3& vOtherNorm=GetPolygonNormal(j);
-								
+
 								//Check if the 2 polygons face in exactly opposite directions - don't allow this type of neighbor.
 								if (fabs(Vector3::Dot_Product(vOtherNorm,vNorm) + 1.0f) <= 0.01f)
 									continue;
@@ -1038,9 +1030,9 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 						else
 						{//This is the same poly facing opposite direction.	//assert( 0 );  // should never match 3 vertices!
 							index1=index2=-1;
-							continue; 
+							continue;
 						}
-					}  // end if
+					}
 			if( index1 != -1 && index2 != -1  )
 			{
 				//
@@ -1060,7 +1052,7 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 
 						break;  // exit for a
 
-					}  // end if
+					}
 
 				//
 				// error condition, if our counter a is at the max number
@@ -1080,17 +1072,17 @@ void W3DShadowGeometryMesh::buildPolygonNeighbors( void )
 //					pv[0] /= 3.0f;	//find center of polygon
 
 //					sprintf(errorText,"%s: Shadow Polygon with too many neighbors at %f,%f,%f",m_parentGeometry->Get_Name(),pv[0].X,pv[0].Y,pv[0].Z);
-//					DEBUG_LOG(("****%s Shadow Polygon with too many neighbors at %f,%f,%f\n",m_parentGeometry->Get_Name(),pv[0].X,pv[0].Y,pv[0].Z));
+//					DEBUG_LOG(("****%s Shadow Polygon with too many neighbors at %f,%f,%f",m_parentGeometry->Get_Name(),pv[0].X,pv[0].Y,pv[0].Z));
 //					DEBUG_ASSERTCRASH(a != MAX_POLYGON_NEIGHBORS,(errorText));
 				}
 
-			}  // end if
+			}
 
-		}  // end for j
+		}
 
-	}  // end for i
+	}
 
-}  // end buildPolygonNeighbors
+}
 
 // allocateNeighbors ==========================================================
 // Allocate storage for the polygon neighbors and record its size
@@ -1111,14 +1103,14 @@ Bool W3DShadowGeometryMesh::allocateNeighbors( Int numPolys )
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// list is now acutally allocated
 	m_numPolyNeighbors = numPolys;
 
 	return TRUE;  // success!
 
-}  // end allocateNeighbors
+}
 
 // deleteNeighbors ============================================================
 // Delete all polygon neighbor storage and information
@@ -1127,20 +1119,15 @@ void W3DShadowGeometryMesh::deleteNeighbors( void )
 {
 
 	// delete list
-	if( m_polyNeighbors )
-	{
-
-		delete [] m_polyNeighbors;
-		m_polyNeighbors = NULL;
-		m_numPolyNeighbors = 0;
-
-	}  // end if
+	delete [] m_polyNeighbors;
+	m_polyNeighbors = NULL;
+	m_numPolyNeighbors = 0;
 
 	// sanity error checking
 	assert( m_numPolyNeighbors == 0 );
 	assert( m_polyNeighbors == NULL );
 
-}  // end deleteNeighbors
+}
 
 //#include "Common/ThingTemplate.h"
 
@@ -1234,10 +1221,10 @@ void W3DVolumetricShadow::updateOptimalExtrusionPadding(void)
 				{
 					terrainPoint = Corners[i] + shadowRay*t;
 					terrainPoint.Z=0;	//ignore height
-					
+
 					Real terrainHeight=TheTerrainRenderObject->getHeightMapHeight(terrainPoint.X,terrainPoint.Y,NULL);
 					if (terrainHeight < (objPos.Z - MAX_SHADOW_EXTRUSION_UNDER_OBJECT_BEFORE_CLAMP))	//check if terrain dips more than 10 units under object.
-					{	
+					{
 						if (j == 0)	//this is the initial point so object must be right on the edge of a cliff.
 						{	baseGroundHeight = terrainHeight;	//force extrusion all the way down cliff.
 							Real tanAngle=tan(OVERHANGING_OBJECT_CLAMP_ANGLE);	//clamp to about 89 degrees or close to vertical lightpos.
@@ -1277,7 +1264,7 @@ void W3DVolumetricShadow::updateOptimalExtrusionPadding(void)
 // getRenderCost ============================================================
 // Returns number of draw calls for this shadow.
 // ============================================================================
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+#if defined(RTS_DEBUG)
 void W3DVolumetricShadow::getRenderCost(RenderCost & rc) const
 {
 	Int drawCount = 0;
@@ -1369,7 +1356,7 @@ void W3DVolumetricShadow::RenderMeshVolume(Int meshIndex, Int lightIndex, const
 	///@todo: W3D always does transpose on all of matrix sets.  Slow???  Better to hack view matrix.
 	Matrix4x4 mWorldTransposed = mWorld.Transpose();
 	m_pDev->SetTransform(D3DTS_WORLD,(_D3DMATRIX *)&mWorldTransposed);
-	
+
 	W3DBufferManager::W3DVertexBufferSlot *vbSlot=m_shadowVolumeVB[lightIndex][ meshIndex ];
 	if (!vbSlot)
 		return;
@@ -1480,7 +1467,7 @@ void W3DVolumetricShadow::RenderDynamicMeshVolume(Int meshIndex, Int lightIndex,
 	shadowIndexBufferD3D->Unlock();
 
 	m_pDev->SetIndices(shadowIndexBufferD3D,nShadowStartBatchVertex);
-	
+
 	Matrix4x4 mWorld(*meshXform);
 	Matrix4x4 mWorldTransposed = mWorld.Transpose();
 	m_pDev->SetTransform(D3DTS_WORLD,(_D3DMATRIX *)&mWorldTransposed);
@@ -1511,7 +1498,7 @@ void W3DVolumetricShadow::RenderMeshVolumeBounds(Int meshIndex, Int lightIndex,
 	SHADOW_DYNAMIC_VOLUME_VERTEX* pvVertices;
 	UnsignedShort *pvIndices;
 	// Vertex Positions as a function of the box extents
-	static Vector3						_BoxVerts[8] = 
+	static Vector3						_BoxVerts[8] =
 	{
 		Vector3(  1.0f, 1.0f, 1.0f ),		// +z ring of 4 verts
 		Vector3( -1.0f, 1.0f, 1.0f ),
@@ -1524,10 +1511,10 @@ void W3DVolumetricShadow::RenderMeshVolumeBounds(Int meshIndex, Int lightIndex,
 		Vector3(  1.0f,-1.0f,-1.0f ),
 	};
 	// Face Connectivity
-	static Vector3i					_BoxFaces[12] = 
+	static Vector3i					_BoxFaces[12] =
 	{
 		Vector3i( 0,1,2 ),		// +z faces
-		Vector3i( 0,2,3 ),		
+		Vector3i( 0,2,3 ),
 		Vector3i( 4,7,6 ),		// -z faces
 		Vector3i( 4,6,5 ),
 		Vector3i( 0,3,7 ),		// +x faces
@@ -1610,7 +1597,7 @@ void W3DVolumetricShadow::RenderMeshVolumeBounds(Int meshIndex, Int lightIndex,
 	if (nShadowIndicesInBuf > (SHADOW_INDEX_SIZE-numIndex))	//check if room for model verts
 	{	//flush the buffer by drawing the contents and re-locking again
 		if (shadowIndexBufferD3D->Lock(0,numIndex*sizeof(short),(unsigned char**)&pvIndices,D3DLOCK_DISCARD) != D3D_OK)
-			return;;
+			return;
 		nShadowIndicesInBuf=0;
 		nShadowStartBatchIndex=0;
 	}
@@ -1639,7 +1626,7 @@ void W3DVolumetricShadow::RenderMeshVolumeBounds(Int meshIndex, Int lightIndex,
 	Matrix4x4 mWorld(1);	//identity since boxes are pre-transformed to world space.
 	Matrix4x4 mWorldTransposed = mWorld.Transpose();
 	m_pDev->SetTransform(D3DTS_WORLD,(_D3DMATRIX *)&mWorldTransposed);
-	
+
 	m_pDev->SetStreamSource(0,shadowVertexBufferD3D,sizeof(SHADOW_DYNAMIC_VOLUME_VERTEX));
 	m_pDev->SetVertexShader(SHADOW_DYNAMIC_VOLUME_FVF);
 
@@ -1687,9 +1674,9 @@ W3DVolumetricShadow::W3DVolumetricShadow( void )
 			m_objectXformHistory[ i ][j].Make_Identity();
 			m_lightPosHistory[ i ][j] = Vector3(0,0,0);
 		}
-	}  // end for i
+	}
 
-}  // end W3DVolumetricShadow
+}
 
 // ~W3DVolumetricShadow ====================================================================
 // W3DVolumetricShadow destructor
@@ -1705,8 +1692,8 @@ W3DVolumetricShadow::~W3DVolumetricShadow( void )
 	// free any shadow volume data
 	for( i = 0; i < MAX_SHADOW_LIGHTS; i++ )
 	{	for (j = 0; j < MAX_SHADOW_CASTER_MESHES; j++)
-		{	if( m_shadowVolume[ i ][j] )
-				delete m_shadowVolume[ i ][j];
+		{
+			delete m_shadowVolume[i][j];
 			if( m_shadowVolumeVB[i][j])
 				TheW3DBufferManager->releaseSlot(m_shadowVolumeVB[i][j]);
 			if( m_shadowVolumeIB[i][j])
@@ -1720,7 +1707,7 @@ W3DVolumetricShadow::~W3DVolumetricShadow( void )
 	m_geometry=NULL;
 	m_robj=NULL;
 
-}  // end ~W3DVolumetricShadow
+}
 
 void W3DVolumetricShadow::SetGeometry( W3DShadowGeometry *geometry )
 {
@@ -1757,13 +1744,13 @@ void W3DVolumetricShadow::SetGeometry( W3DShadowGeometry *geometry )
 			if( allocateSilhouette(i, numNewVertices ) == FALSE )
 				return;
 
-		}  // end if
+		}
 	}
 
 	// assign the new geometry, possible over an old geometry
 	m_geometry = geometry;
 
-}  // end SetGeometry
+}
 
 /**Called once per frame for each object, when necessary it will reconstruct
  the shadow volume for this shadow from the silhouette of the geometry
@@ -1801,19 +1788,19 @@ void W3DVolumetricShadow::Update()
 		//buggies from being flagged as "flying".  We minimize the number of flying units because their shadow
 		//volumes are extruded longer to reach the lowest point on the map.  Regular shadows only extend far
 		//enough to reach the base of the model (presumes base is already touching the ground).
-		Real groundHeight; 
+		Real groundHeight;
 		if (TheTerrainLogic)
 			groundHeight=TheTerrainLogic->getGroundHeight(pos.X,pos.Y);	//logic knows about bridges so use if available.
 		else
 			groundHeight=TheTerrainRenderObject->getHeightMapHeight(pos.X,pos.Y, NULL);
    		if (fabs(pos.Z - groundHeight) >= AIRBORNE_UNIT_GROUND_DELTA)
-   		{	
+   		{
  			Real extent = MAX_SHADOW_LENGTH_EXTRA_AIRBORNE_SCALE_FACTOR * m_robjExtent;
  			if (WWMath::Fabs(pos.X - bcX) > (beX + extent) ||
  				WWMath::Fabs(pos.Y - bcY) > (beY + extent) ||
  				WWMath::Fabs(pos.Z - bcZ) > (beZ + extent))
  				return;	//shadow can't be visible so no point in updating.
- 
+
 			//this unit is above ground, extend shadow volume to reach lowest point on the terrain plus extra bit to make
 			//sure shadow goes under ground.
    			updateVolumes(fabs(pos.Z - TheTerrainRenderObject->getMinHeight()) + SHADOW_EXTRUSION_BUFFER);
@@ -1826,7 +1813,7 @@ void W3DVolumetricShadow::Update()
  				WWMath::Fabs(pos.Y - bcY) > (beY + m_robjExtent) ||
  				WWMath::Fabs(pos.Z - bcZ) > (beZ + m_robjExtent))
  				return;	//shadow can't be visible so no point in updating.
- 
+
 				//check if this object has never had it's extrusion length updated.  Will only be true for
 				//immobile objects because finding an optimal extrusion length is expensive.
 				if (!m_extraExtrusionPadding)
@@ -1838,12 +1825,12 @@ void W3DVolumetricShadow::Update()
 
 	//	floorZ = 2.0f;	//lower slightly so shadows go under ground.
 
-	
+
 		// update delay time
 		lastTime = currentTime;
-	}  // end if
+	}
 
-}  // end Update
+}
 
 /** Update shadow volumes belonging to all meshes of this shadow caster.
 *	Use zoffset to extend shadows below object's base by given amount.
@@ -1873,8 +1860,8 @@ void W3DVolumetricShadow::updateVolumes(Real zoffset)
 			else
 				mesh = (MeshClass *)m_robj;
 
-			if (mesh) 
-			{	
+			if (mesh)
+			{
 				if (!mesh->Is_Not_Hidden_At_All())
 					continue;
 
@@ -1926,8 +1913,8 @@ void W3DVolumetricShadow::updateVolumes(Real zoffset)
 					}
 				}
 			}
-		}	// end for j
-	}  // end for, i
+		}
+	}
 }
 
 /*floorZ is the assumed ground height below the model.  The code will try to extrude shadows just long enough to hit this point in order
@@ -1952,7 +1939,7 @@ void W3DVolumetricShadow::updateMeshVolume(Int meshIndex, Int lightIndex, const
 
 	//
 	// build the shadow silhouette and construct shadow volume from
-	// this light location.  The for loop wrapped around this is 
+	// this light location.  The for loop wrapped around this is
 	// theoretical code for future enhancements of multiple lights that
 	// cast shadows
 	//
@@ -1968,8 +1955,8 @@ void W3DVolumetricShadow::updateMeshVolume(Int meshIndex, Int lightIndex, const
 	Real cosAngle = WWMath::Fabs(Vector3::Dot_Product(va,vb));
 
 	if (cosAngle >= cosAngleToCare)
-	{	
-		
+	{
+
 		va = (Vector3 &)(*prevXForm)[1];
 		vb = (Vector3 &)objectToWorld[1];
 		va.Normalize();
@@ -2134,7 +2121,7 @@ void W3DVolumetricShadow::updateMeshVolume(Int meshIndex, Int lightIndex, const
 		CollisionMath::OverlapType result=CollisionMath::Overlap_Test(*shadowCameraFrustum,sphere);
 		if (result == CollisionMath::OVERLAPPED)	//do a more accurate test
 			result=CollisionMath::Overlap_Test(*shadowCameraFrustum, box);
-		
+
 		if (result != CollisionMath::OUTSIDE)
 		{
 			//
@@ -2195,7 +2182,7 @@ void W3DVolumetricShadow::updateMeshVolume(Int meshIndex, Int lightIndex, const
 			sphere.Center -= objectCenter;
 			m_shadowVolume[ lightIndex ][meshIndex]->setBoundingSphere(sphere);
 			m_shadowVolume[ lightIndex ][meshIndex]->setVisibleState(Geometry::STATE_VISIBLE);	//this volume needs rendering.
-		}//end if inside view frustum
+		}
 		else
 		if (m_shadowVolume[ lightIndex ][meshIndex])
 		{	//outside view frustum, shadow wasn't updated.
@@ -2205,7 +2192,7 @@ void W3DVolumetricShadow::updateMeshVolume(Int meshIndex, Int lightIndex, const
 			m_shadowVolume[ lightIndex ][meshIndex]->setBoundingSphere(sphere);
 			m_shadowVolume[ lightIndex ][meshIndex]->setVisibleState(Geometry::STATE_INVISIBLE);
 		}
-	}  // end if
+	}
 	else
 	{	//not reconstructing volume, so don't know if visible or not.
 		if (m_shadowVolume[ lightIndex ][meshIndex])
@@ -2216,7 +2203,7 @@ void W3DVolumetricShadow::updateMeshVolume(Int meshIndex, Int lightIndex, const
 // addSilhouetteEdge ==========================================================
 // It has been determined that the polygon neighbor in the "neighborIndex"
 // of "visible" needs to be added to the silhouette.  We will add those two
-// vertex indices to the silhouette in the order they were specified in 
+// vertex indices to the silhouette in the order they were specified in
 // "visible" to assure that the constructed edge is in counter clockwise order
 // ============================================================================
 void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible, PolyNeighbor *hidden )
@@ -2232,7 +2219,7 @@ void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible
 	assert( visible && hidden );
 
 	//
-	// which index in the neighbor list of "visible" refers to the 
+	// which index in the neighbor list of "visible" refers to the
 	// polygon "hidden"
 	//
 	for( i = 0; i < MAX_POLYGON_NEIGHBORS; i++ )
@@ -2244,16 +2231,16 @@ void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible
 			neighborIndex = i;
 			break;  // exit for
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
 	// get the three vertex indices of "visible"
 	geomMesh->GetPolygonIndex( visible->myIndex, visibleIndexList );
 
 	//
 	// we know that 2 of the 3 vertex indices will be present in the edge.
-	// will construct the edge as follows to ensure we have counter 
+	// will construct the edge as follows to ensure we have counter
 	// clockwise order.  note that this assumes the vertices of the
 	// polygons specified in the geometry are in counter clockwise order,
 	// which they are
@@ -2262,9 +2249,9 @@ void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible
 	// 2) [ v1 Present, v2  Absent, v3 Present ] -> edge = (v3, v1)
 	// 3) [ v1 Present, v2 Present, v3 Absent  ] -> edge = (v1, v2)
 	//
-	if( (visibleIndexList[ 0 ] != 
+	if( (visibleIndexList[ 0 ] !=
 			 visible->neighbor[ neighborIndex ].neighborEdgeIndex[ 0 ]) &&
-			(visibleIndexList[ 0 ] != 
+			(visibleIndexList[ 0 ] !=
 			visible->neighbor[ neighborIndex ].neighborEdgeIndex[ 1 ]) )
 	{
 
@@ -2272,10 +2259,10 @@ void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible
 		edgeStart = visibleIndexList[ 1 ];
 		edgeEnd = visibleIndexList[ 2 ];
 
-	}  // end if
-	else if( (visibleIndexList[ 1 ] != 
+	}
+	else if( (visibleIndexList[ 1 ] !=
 					 visible->neighbor[ neighborIndex ].neighborEdgeIndex[ 0 ]) &&
-					 (visibleIndexList[ 1 ] != 
+					 (visibleIndexList[ 1 ] !=
 					 visible->neighbor[ neighborIndex ].neighborEdgeIndex[ 1 ]) )
 	{
 
@@ -2283,7 +2270,7 @@ void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible
 		edgeStart = visibleIndexList[ 2 ];
 		edgeEnd = visibleIndexList[ 0 ];
 
-	}  // end if
+	}
 	else
 	{
 
@@ -2291,16 +2278,16 @@ void W3DVolumetricShadow::addSilhouetteEdge(Int meshIndex, PolyNeighbor *visible
 		edgeStart = visibleIndexList[ 0 ];
 		edgeEnd = visibleIndexList[ 1 ];
 
-	}  // end if
+	}
 
 	// add to silhouette edge list
 	addSilhouetteIndices(meshIndex, edgeStart, edgeEnd );
 
-}  // end addSilhouetteEdge
+}
 
 // addNeighborlessEdges =======================================================
 // Given a polygon neighbor information, it has been determined that this
-// polygon is visible and has edges which are not connected to other 
+// polygon is visible and has edges which are not connected to other
 // polygons, these edges need to be added to the silhouette.  The edge(s)
 // must be added in such an order that we create silhouette edges in a
 // counter clockwise order.
@@ -2351,11 +2338,11 @@ void W3DVolumetricShadow::addNeighborlessEdges(Int meshIndex, PolyNeighbor *us )
 					addEdge = FALSE;
 					break;  // exit for j, no need to search on
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
-		}  // end for j
+		}
 
 		// add the edge if no neighbors have that edge
 		if( addEdge == TRUE )
@@ -2363,11 +2350,11 @@ void W3DVolumetricShadow::addNeighborlessEdges(Int meshIndex, PolyNeighbor *us )
 
 			addSilhouetteIndices(meshIndex, edgeStart, edgeEnd );
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end addNeighborlessEdges
+}
 
 // addSilhouetteIndices =======================================================
 // Add these two indices to the silhouette data
@@ -2384,7 +2371,7 @@ void W3DVolumetricShadow::addSilhouetteIndices(Int meshIndex, Short edgeStart, S
 	assert( m_numSilhouetteIndices[meshIndex] < m_maxSilhouetteEntries[meshIndex] );
 	m_silhouetteIndex[meshIndex][ m_numSilhouetteIndices[meshIndex]++ ] = edgeEnd;
 
-}  // end if
+}
 
 // buildSilhouette ============================================================
 // Given a light position, and our polygon neighbor information this will
@@ -2447,7 +2434,7 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 		if( Vector3::Dot_Product( lightVector, normal ) < 0.0f )
 			BitSet( polyNeighbor->status, POLY_VISIBLE );
 
-	}  // end for i
+	}
 
 	//
 	// check all our polys using our poly neighbors, where one poly neighbor
@@ -2476,8 +2463,8 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 			{
 
 				// get the jth polygon neighbor ... this is "them"
-				otherNeighbor = 
-					geomMesh->GetPolyNeighbor( 
+				otherNeighbor =
+					geomMesh->GetPolyNeighbor(
 						polyNeighbor->neighbor[ j ].neighborIndex );
 
 				//
@@ -2487,10 +2474,10 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 				if( BitIsSet( otherNeighbor->status, POLY_PROCESSED ) )
 					continue;  // for j
 
-			}  // end if
+			}
 
 			//
-			// finally, if our own visible status is different from our 
+			// finally, if our own visible status is different from our
 			// neighbor visible status then that defines an edge we must
 			// add to the silhouette.  Also, a visible polygon that has
 			// no neighbor automatically makes a silhouette edge.  Note that
@@ -2506,16 +2493,16 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 
 					visibleNeighborless = TRUE;
 
-				}  // end if
+				}
 				else if( BitIsSet( otherNeighbor->status, POLY_VISIBLE ) == FALSE )
 				{
 
 					// "we" are visible and "they" are not
 					addSilhouetteEdge(meshIndex, polyNeighbor, otherNeighbor );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 			else if( otherNeighbor != NULL &&
 							 BitIsSet( otherNeighbor->status, POLY_VISIBLE ) )
 			{
@@ -2523,9 +2510,9 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 				// "they" are visible and "we" are not
 				addSilhouetteEdge(meshIndex, otherNeighbor, polyNeighbor );
 
-			}  // end else
+			}
 
-		}  // end for j
+		}
 
 		//
 		// if this polygon is visible, add any edges that are not
@@ -2536,7 +2523,7 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 
 			addNeighborlessEdges(meshIndex, polyNeighbor );
 
-		}  // end if
+		}
 
 		//
 		// this polyNeighbor is now considered "processed", any other
@@ -2545,20 +2532,20 @@ void W3DVolumetricShadow::buildSilhouette(Int meshIndex, Vector3 *lightPosObject
 		//
 		BitSet( polyNeighbor->status, POLY_PROCESSED );
 
-	}  // end for i
-	
+	}
+
 	//record number of edge indices contrinuted by this mesh
 	m_numIndicesPerMesh[meshIndex]=m_numSilhouetteIndices[meshIndex]-meshEdgeStart;
-	
-}  // end buildSilhouette
+
+}
 
 // constructVolume ============================================================
 // Given a fresh new geometry class called "shadowVolume" to hold the actual
 // shadow volume data, this method will create the shadow volume polygons
 // given the information in the current silhouette of this Shadow and the
-// light source position.  
+// light source position.
 //
-// The light source should be in object space and the shadow volume polygon 
+// The light source should be in object space and the shadow volume polygon
 // data is also constructed in object space.
 //
 // The polygon we will create for a given edge will be that edge extruded
@@ -2581,7 +2568,7 @@ void W3DVolumetricShadow::constructVolume( Vector3 *lightPosObject,Real shadowEx
 	W3DShadowGeometryMesh *geomMesh;
 
 	// sanity
-	if( volumeIndex < 0 || 
+	if( volumeIndex < 0 ||
 			volumeIndex >= MAX_SHADOW_LIGHTS ||
 			lightPosObject == NULL )
 	{
@@ -2589,7 +2576,7 @@ void W3DVolumetricShadow::constructVolume( Vector3 *lightPosObject,Real shadowEx
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// get the geometry struct we're storing the actual shadow volume data in
 	shadowVolume = m_shadowVolume[ volumeIndex ][meshIndex];
@@ -2601,7 +2588,7 @@ void W3DVolumetricShadow::constructVolume( Vector3 *lightPosObject,Real shadowEx
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// step through each of the silhouette pairs
 	vertexCount = 0;
@@ -2718,7 +2705,7 @@ void W3DVolumetricShadow::constructVolume( Vector3 *lightPosObject,Real shadowEx
 #endif
 				break;	//reached end of all edges
 			}
-	
+
 			//Start a new strip by adding first vertex and extrusion.
 			const Vector3& ev=geomMesh->GetVertex( silhouetteIndices[ i+2 ] );
 			// take one edge point and extrude away from the light
@@ -2785,15 +2772,15 @@ void W3DVolumetricShadow::constructVolume( Vector3 *lightPosObject,Real shadowEx
 
 	shadowVolume->SetNumActivePolygon(polygonCount);
 	shadowVolume->SetNumActiveVertex(vertexCount);
-}  // end constructVolume
+}
 
 // constructVolumeVB ==========================================================
 // Given a fresh new geometry class called "shadowVolume" to hold the actual
 // shadow volume data, this method will create the shadow volume polygons
 // given the information in the current silhouette of this Shadow and the
-// light source position.  
+// light source position.
 //
-// The light source should be in object space and the shadow volume polygon 
+// The light source should be in object space and the shadow volume polygon
 // data is also constructed in object space.
 //
 // The polygon we will create for a given edge will be that edge extruded
@@ -2821,7 +2808,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 	W3DBufferManager::W3DIndexBufferSlot *ibSlot;
 
 	// sanity
-	if( volumeIndex < 0 || 
+	if( volumeIndex < 0 ||
 			volumeIndex >= MAX_SHADOW_LIGHTS ||
 			lightPosObject == NULL )
 	{
@@ -2829,7 +2816,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// get the geometry struct we're storing the actual shadow volume data in
 	shadowVolume = m_shadowVolume[ volumeIndex ][meshIndex];
@@ -2841,7 +2828,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	//*****************************************************************************************/
 	//Do an initial pass through silhouette data to determine the actual vertex/polygon counts.
@@ -2913,7 +2900,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 	#endif
 					break;	//reached end of all edges
 				}
-		
+
 				lastEdgeVertex2Index=vertexCount;
 				lastExtrude2Index=vertexCount + 1;
 				//record start of new strip info
@@ -2944,7 +2931,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 			maxStripLength=__max(maxStripLength,stripLength);
 	#endif
 		}
-	}	//initial pass to determine vertex/polygon counts.
+	}
 	//***********************************************************************************************
 
 	DEBUG_ASSERTCRASH(m_shadowVolumeVB[ volumeIndex ][meshIndex] == NULL,("Updating Existing Static Vertex Buffer Shadow"));
@@ -2977,7 +2964,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 
 		m_shadowVolumeIB[ volumeIndex ][meshIndex]=NULL;
 		m_shadowVolumeVB[ volumeIndex ][meshIndex]=NULL;
-		return; 
+		return;
 	}
 
 	geomMesh = m_geometry->getMesh(meshIndex);
@@ -3073,7 +3060,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 				polygonCount += 2;
 				break;	//reached end of all edges
 			}
-	
+
 			//Start a new strip by adding first vertex and extrusion.
 			const Vector3& evb=geomMesh->GetVertex( silhouetteIndices[ i+2 ] );
 			// take one edge point and extrude away from the light
@@ -3116,7 +3103,7 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 
 			// add the one new vertex
 			*vb++ = *(VertexFormatXYZ *)&extrude2;
-			
+
 			lastEdgeVertex2Index=vertexCount;
 			lastExtrude2Index=vertexCount+1;
 
@@ -3125,8 +3112,8 @@ void W3DVolumetricShadow::constructVolumeVB( Vector3 *lightPosObject,Real shadow
 		}
 	}
 
-//	DEBUG_ASSERTLOG(polygonCount == vertexCount, ("WARNING***Shadow volume mesh not optimal: %s\n",m_geometry->Get_Name()));
-}  // end constructVolume
+//	DEBUG_ASSERTLOG(polygonCount == vertexCount, ("WARNING***Shadow volume mesh not optimal: %s",m_geometry->Get_Name()));
+}
 
 // allocateShadowVolume =======================================================
 // Allocate a space for us to construct the shadow volume in
@@ -3144,10 +3131,10 @@ Bool W3DVolumetricShadow::allocateShadowVolume( Int volumeIndex, Int meshIndex )
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	if ((shadowVolume = m_shadowVolume[ volumeIndex ][meshIndex]) == 0)
-	{	
+	{
 		// poolify
 		shadowVolume = NEW Geometry;		// create the new geometry
 		// we now have one more valid geometry volume
@@ -3163,7 +3150,7 @@ Bool W3DVolumetricShadow::allocateShadowVolume( Int volumeIndex, Int meshIndex )
 		m_shadowVolumeCount[meshIndex]--;
 		return FALSE;
 
-	}  // end if
+	}
 
 	// assign to list
 	m_shadowVolume[ volumeIndex ][meshIndex] = shadowVolume;
@@ -3206,12 +3193,12 @@ Bool W3DVolumetricShadow::allocateShadowVolume( Int volumeIndex, Int meshIndex )
 			delete shadowVolume;
 			return FALSE;
 
-		}  // end if
+		}
 	}
 
 	return TRUE;  // success
 
-}  // end allocateShadowVolume
+}
 
 // deleteShadowVolume =========================================================
 // Free all resources allocated to the shadow volume(s)
@@ -3227,7 +3214,7 @@ void W3DVolumetricShadow::deleteShadowVolume( Int volumeIndex )
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// delete it!
 	for (Int meshIndex=0; meshIndex<MAX_SHADOW_CASTER_MESHES; meshIndex++)
@@ -3241,10 +3228,10 @@ void W3DVolumetricShadow::deleteShadowVolume( Int volumeIndex )
 			// we now have one less shadow volume
 			m_shadowVolumeCount[meshIndex]--;
 
-		}  // end if
+		}
 	}
 
-}  // end deleteShadowVolume
+}
 
 // resetShadowVolume ==========================================================
 // Reset the contents of the shadow volume information.  Since we're using
@@ -3264,7 +3251,7 @@ void W3DVolumetricShadow::resetShadowVolume( Int volumeIndex, Int meshIndex )
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	geometry = m_shadowVolume[ volumeIndex ][meshIndex];
 
@@ -3281,7 +3268,7 @@ void W3DVolumetricShadow::resetShadowVolume( Int volumeIndex, Int meshIndex )
 		geometry->Release();
 	}
 
-}  // end resetShadowVolume
+}
 
 // allocateSilhouette =========================================================
 // Allocate space for new silhouette storage, the number of vertices passed
@@ -3294,7 +3281,7 @@ Bool W3DVolumetricShadow::allocateSilhouette(Int meshIndex, Int numVertices )
 	Int numEntries = numVertices * 5;	///@todo: HACK, HACK... Should be 2!
 
 	// sanity
-	assert( m_silhouetteIndex[meshIndex] == NULL && 
+	assert( m_silhouetteIndex[meshIndex] == NULL &&
 					m_numSilhouetteIndices[meshIndex] == 0 &&
 					numEntries > 0 );
 
@@ -3302,22 +3289,22 @@ Bool W3DVolumetricShadow::allocateSilhouette(Int meshIndex, Int numVertices )
 	m_silhouetteIndex[meshIndex] = NEW short[ numEntries ];
 	if( m_silhouetteIndex[meshIndex] == NULL )
 	{
-	
+
 //		DBGPRINTF(( "Unable to allcoate silhouette storage '%d'\n", numEntries ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
-		
+	}
+
 	// set our list to empty just to be clean
 	m_numSilhouetteIndices[meshIndex] = 0;
-	
+
 	// save the size of our silhouette list
 	m_maxSilhouetteEntries[meshIndex] = numEntries;
 
 	return TRUE;  // success
 
-}  // end allocateSilhouette
+}
 
 // deleteSilhouette ===========================================================
 // Delete all silhouette data and memory allocated
@@ -3325,12 +3312,11 @@ Bool W3DVolumetricShadow::allocateSilhouette(Int meshIndex, Int numVertices )
 void W3DVolumetricShadow::deleteSilhouette( Int meshIndex )
 {
 
-	if( m_silhouetteIndex[meshIndex])
-		delete [] m_silhouetteIndex[meshIndex];
+	delete [] m_silhouetteIndex[meshIndex];
 	m_silhouetteIndex[meshIndex] = NULL;
 	m_numSilhouetteIndices[meshIndex] = 0;
 
-}  // end deletesilhouette
+}
 
 // resetSilhouette ============================================================
 // Resets the silhouette to empty, it does NOT free any of the memory
@@ -3341,7 +3327,7 @@ void W3DVolumetricShadow::resetSilhouette( Int meshIndex )
 
 	m_numSilhouetteIndices[meshIndex] = 0;
 
-}  // end resetSilhouette
+}
 
 // renderStencilShadows =======================================================
 // The stencil buffer now has our shadow information in it, take that
@@ -3357,7 +3343,7 @@ void W3DVolumetricShadowManager::renderStencilShadows( void )
 
 	struct _TRANSLITVERTEX {
 	    D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
+		DWORD color;   // diffuse color
 	} v[4];
 
 	Int xpos, ypos, width, height;
@@ -3412,7 +3398,7 @@ void W3DVolumetricShadowManager::renderStencilShadows( void )
 	// turn off the stencil buffer
 	m_pDev->SetRenderState( D3DRS_STENCILENABLE, FALSE );
 
-}  // end renderStencilShadows
+}
 
 void W3DVolumetricShadowManager::renderShadows( Bool forceStencilFill )
 {
@@ -3421,13 +3407,13 @@ void W3DVolumetricShadowManager::renderShadows( Bool forceStencilFill )
 
  	AABoxClass bbox;
 	SphereClass bsphere;
- 
+
  	//Get a bounding box around our visible universe.  Bounded by terrain and the sky
  	//so much tighter fitting volume than what's actually visible.  This will cull
  	//particles falling under the ground.
- 
+
  	TheTerrainRenderObject->getMaximumVisibleBox(*shadowCameraFrustum, &bbox, TRUE);
- 
+
  	bcX = bbox.Center.X;
  	bcY = bbox.Center.Y;
  	bcZ = bbox.Center.Z;
@@ -3518,7 +3504,7 @@ void W3DVolumetricShadowManager::renderShadows( Bool forceStencilFill )
 		m_pDev->SetRenderState( D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP );
 		m_pDev->SetRenderState( D3DRS_STENCILFAIL,  D3DSTENCILOP_KEEP );
 		m_pDev->SetRenderState( D3DRS_STENCILPASS,  D3DSTENCILOP_INCR );
-		
+
 		m_pDev->SetVertexShader(SHADOW_DYNAMIC_VOLUME_FVF);
 
 		m_pDev->SetRenderState(D3DRS_CULLMODE,D3DCULL_CW);
@@ -3530,7 +3516,7 @@ void W3DVolumetricShadowManager::renderShadows( Bool forceStencilFill )
 
 		m_dynamicShadowVolumesToRender=NULL;	//clear list of pending dynamic shadows
 		W3DVolumetricShadowRenderTask *shadowDynamicTasksStart,*shadowDynamicTask;
-		
+
 		// step through each of our shadows and render
 		for( shadow = m_shadowList; shadow; shadow = shadow->m_next )
 		{
@@ -3550,7 +3536,7 @@ void W3DVolumetricShadowManager::renderShadows( Bool forceStencilFill )
 					numRenderedShadows++;
 				}
 			}
-		}  // end for
+		}
 
 		// Set vertex format to that used by static shadow volumes
 		m_pDev->SetVertexShader(W3DBufferManager::getDX8Format(W3DBufferManager::VBM_FVF_XYZ));
@@ -3645,7 +3631,7 @@ void W3DVolumetricShadowManager::renderShadows( Bool forceStencilFill )
 		DX8Wrapper::Invalidate_Cached_Render_States();
 	}
 
-}  // end RenderShadows
+}
 
 /** This class will manage shadow geometry for each render object.  Shadow geometry may
 be the same as render geometry but doesn't need to be.  This allows lower LOD versions of
@@ -3705,7 +3691,7 @@ void W3DVolumetricShadowManager::invalidateCachedLightPositions(void)
 				shadow->setLightPosHistory(i,meshIndex,vec);
 			}
 		}
-	}  // end for
+	}
 }
 
 // W3DVolumetricShadowManager =============================================================
@@ -3719,7 +3705,7 @@ W3DVolumetricShadowManager::W3DVolumetricShadowManager( void )
 
 	TheW3DBufferManager = NEW W3DBufferManager;
 
-}  // end ShadowManager
+}
 
 // ~W3DVolumetricShadowManager ============================================================
 // ============================================================================
@@ -3734,7 +3720,7 @@ W3DVolumetricShadowManager::~W3DVolumetricShadowManager( void )
 	//all shadows should be freed up at this point but check anyway
 	assert(m_shadowList==NULL);
 
-}  // end ~W3DVolumetricShadowManager
+}
 
 /** Releases all W3D/D3D assets before a reset.. */
 void W3DVolumetricShadowManager::ReleaseResources(void)
@@ -3762,10 +3748,10 @@ Bool W3DVolumetricShadowManager::ReAcquireResources(void)
 
 	if (FAILED(m_pDev->CreateIndexBuffer
 	(
-		SHADOW_INDEX_SIZE*sizeof(WORD), 
-		D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC, 
-		D3DFMT_INDEX16, 
-		D3DPOOL_DEFAULT, 
+		SHADOW_INDEX_SIZE*sizeof(WORD),
+		D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC,
+		D3DFMT_INDEX16,
+		D3DPOOL_DEFAULT,
 		&shadowIndexBufferD3D
 	)))
 		return FALSE;
@@ -3776,9 +3762,9 @@ Bool W3DVolumetricShadowManager::ReAcquireResources(void)
 		if (FAILED(m_pDev->CreateVertexBuffer
 		(
 			SHADOW_VERTEX_SIZE*sizeof(SHADOW_DYNAMIC_VOLUME_VERTEX),
-			D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC, 
+			D3DUSAGE_WRITEONLY|D3DUSAGE_DYNAMIC,
 			0,
-			D3DPOOL_DEFAULT, 
+			D3DPOOL_DEFAULT,
 			&shadowVertexBufferD3D
 		)))
 			return FALSE;
@@ -3797,7 +3783,7 @@ Bool W3DVolumetricShadowManager::ReAcquireResources(void)
 Bool W3DVolumetricShadowManager::init( void )
 {
 	return TRUE;
-}  // end Init
+}
 
 // Reset ======================================================================
 // Reset our list of shadows to empty
@@ -3809,7 +3795,7 @@ void W3DVolumetricShadowManager::reset( void )
 	m_W3DShadowGeometryManager->Free_All_Geoms();
 	TheW3DBufferManager->freeAllBuffers();
 
-}  // end Reset
+}
 
 // addShadow ==================================================================
 // Add the shadows for this hierarchy to the shadow management for
@@ -3864,7 +3850,7 @@ W3DVolumetricShadow* W3DVolumetricShadowManager::addShadow(RenderObjClass *robj,
 
 	// add to our shadow list through the shadow next links
 	shadow->m_next = m_shadowList;
-	m_shadowList = shadow;	
+	m_shadowList = shadow;
 	return shadow;
 }
 
@@ -3891,7 +3877,7 @@ void W3DVolumetricShadowManager::removeShadow(W3DVolumetricShadow *shadow)
 			delete shadow;
 			break;
 		}
-	}  // end for
+	}
 }
 
 /** removeAllShadows ===========================================================
@@ -3911,10 +3897,10 @@ void W3DVolumetricShadowManager::removeAllShadows(void)
 		next_shadow = cur_shadow->m_next;
 		cur_shadow->m_next = NULL;
 		delete cur_shadow;
-	}  // end for
+	}
 }
 
-W3DShadowGeometryManager::W3DShadowGeometryManager(void) 
+W3DShadowGeometryManager::W3DShadowGeometryManager(void)
 {
 	// Create the hash tables
 	GeomPtrTable = NEW HashTableClass( 2048 );
@@ -3954,7 +3940,7 @@ W3DShadowGeometry * W3DShadowGeometryManager::Peek_Geom(const char * name)
 
 /** Get animation from cache and increment its reference count */
 W3DShadowGeometry * W3DShadowGeometryManager::Get_Geom(const char * name)
-{	
+{
 	W3DShadowGeometry * geom = Peek_Geom( name );
 	if ( geom != NULL ) {
 		geom->Add_Ref();
@@ -4037,7 +4023,7 @@ int W3DShadowGeometryManager::Load_Geom(RenderObjClass *robj, const char *name)
 	if (res != TRUE)
 	{	// load failed!
 		newgeom->Release_Ref();
-		//DEBUG_LOG(("****Shadow Volume Creation Failed on %s\n",name));
+		//DEBUG_LOG(("****Shadow Volume Creation Failed on %s",name));
 		goto Error;
 	} else if (Peek_Geom(newgeom->Get_Name()) != NULL)
 	{	// duplicate exists!
@@ -4057,7 +4043,7 @@ int W3DShadowGeometryManager::Load_Geom(RenderObjClass *robj, const char *name)
 /*
 ** Iterator converter from HashableClass to W3DShadowGeometry
 */
-W3DShadowGeometry * W3DShadowGeometryManagerIterator::Get_Current_Geom( void )	
-{ 
-	return (W3DShadowGeometry *)Get_Current(); 
+W3DShadowGeometry * W3DShadowGeometryManagerIterator::Get_Current_Geom( void )
+{
+	return (W3DShadowGeometry *)Get_Current();
 }
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp
deleted file mode 100644
index 6e2a4c0b61e..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp
+++ /dev/null
@@ -1,1142 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: TerrainTex.cpp ////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: TerrainTex.cpp
-//
-// Created:   John Ahlquist, April 2001
-//
-// Desc:      TextureClass overrides to perform custom texturing for the terrain.
-//
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-//         Includes                                                      
-//-----------------------------------------------------------------------------
-#include <stdlib.h>
-
-#include "W3DDevice/GameClient/TerrainTex.h"
-#include "W3DDevice/GameClient/WorldHeightMap.h"
-#include "W3DDevice/GameClient/TileData.h"
-#include "Common/GlobalData.h"
-#include "WW3D2/dx8wrapper.h"
-#include "d3dx8tex.h"
-
-/******************************************************************************
-						TerrainTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// TerrainTextureClass::TerrainTextureClass
-//=============================================================================
-/** Constructor. Calls parent constructor to create a 16 bit per pixel D3D 
-texture of the desired height and mip level. */
-//=============================================================================
-TerrainTextureClass::TerrainTextureClass(int height) :
-	TextureClass(TEXTURE_WIDTH, height, 
-		WW3D_FORMAT_A1R5G5B5, MIP_LEVELS_3 )
-{
-}
-
-//=============================================================================
-// TerrainTextureClass::TerrainTextureClass
-//=============================================================================
-/** Constructor. Calls parent constructor to create a 16 bit per pixel D3D 
-texture of the desired height and mip level. */
-//=============================================================================
-TerrainTextureClass::TerrainTextureClass(int height, int width) :
-	TextureClass(width, height, 
-		WW3D_FORMAT_A1R5G5B5, MIP_LEVELS_ALL )
-{
-}
-
-
-//=============================================================================
-// TerrainTextureClass::update
-//=============================================================================
-/** Sets the tile bitmap data into the texture.  The tiles are placed with 4
-	pixel borders around them, so that when the tiles are scaled and bilinearly
-	interpolated, you don't get seams between the tiles.  */
-//=============================================================================
-int TerrainTextureClass::update(WorldHeightMap *htMap)
-{
-	// D3DTexture is our texture;
-
-	IDirect3DSurface8 *surface_level;
-	D3DSURFACE_DESC surface_desc;
-	D3DLOCKED_RECT locked_rect;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0, &surface_level));
-	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
-	if (surface_desc.Width < TEXTURE_WIDTH) {
-		return 0;
-	}
-
-	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
-
-	Int tilePixelExtent = TILE_PIXEL_EXTENT;		 
-	Int tilesPerRow = surface_desc.Width/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
-	tilesPerRow *= 2;
-//	Int numRows = surface_desc.Height/(tilePixelExtent+TILE_OFFSET);
-#ifdef RTS_DEBUG
-	//DEBUG_ASSERTCRASH(tilesPerRow*numRows >= htMap->m_numBitmapTiles, ("Too many tiles."));
-	DEBUG_ASSERTCRASH((Int)surface_desc.Width >= tilePixelExtent*tilesPerRow, ("Bitmap too small."));
-#endif
-	if (surface_desc.Format == D3DFMT_A1R5G5B5) {
-#if 0
-		UnsignedInt cellX, cellY;
-		for (cellX = 0; cellX < surface_desc.Width; cellX++) {
-			for (cellY = 0; cellY < surface_desc.Height; cellY++) {
-				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(cellY*surface_desc.Width+cellX)*2;
-				*((Short*)pBGR) = (((255-2*cellY)>>3)<<10) + ((4*cellX)>>4);
-			}
-		}
-#endif
-		Int tileNdx;
-		Int pixelBytes = 2;
-		for (tileNdx=0; tileNdx < htMap->m_numBitmapTiles; tileNdx++) {
-			TileData *pTile = htMap->getSourceTile(tileNdx);
-			if (!pTile) continue;
-			ICoord2D position = pTile->m_tileLocationInTexture;
-			if (position.x<=0) continue; // all real tile offsets start at 2.  jba.
-
-			Int i,j;
-			for (j=0; j<tilePixelExtent; j++) {
-				UnsignedByte *pBGR = pTile->getRGBDataForWidth(tilePixelExtent);
-				pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
-				Int row = position.y+j;
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*surface_desc.Width*pixelBytes;
-
-				Int column = position.x;
-				pBGRX += column*pixelBytes;
-				for (i=0; i<tilePixelExtent; i++) {
-					*((Short*)pBGRX) = 0x8000 + ((pBGR[2]>>3)<<10) + ((pBGR[1]>>3)<<5) + (pBGR[0]>>3);
-					pBGRX +=pixelBytes;
-					pBGR +=TILE_BYTES_PER_PIXEL;
-				}
-			}
-		}
-		// Now draw the 4 pixel border around each tile class.
-		Int texClass;
-		for (texClass=0; texClass<htMap->m_numTextureClasses; texClass++) {
-			Int width = htMap->m_textureClasses[texClass].width;
-			ICoord2D origin = htMap->m_textureClasses[texClass].positionInTexture;
-			if (origin.x<=0) continue;
-			width *= TILE_PIXEL_EXTENT;
-			// Duplicate 4 columns of pixels before and after.
-			Int j;
-			for (j=0; j<width; j++) {
-				Int row = origin.y+j;
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*surface_desc.Width*pixelBytes;
-
-				Int column = origin.x;
-				pBGRX += column*pixelBytes;
-				// copy before
-				memcpy(pBGRX-(4)*pixelBytes, pBGRX+(width-4)*pixelBytes, 4*pixelBytes);
-				// copy after
-				memcpy(pBGRX+(width*pixelBytes), pBGRX, 4*pixelBytes);
-			}
-
-			// Duplicate 4 rows of pixels before and after.
-			for (j=0; j<4; j++) {
-				// copy before.
-				Int row = origin.y-j-1;
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*surface_desc.Width*pixelBytes;
-				UnsignedByte *target = pBGRX+(origin.x-4)*pixelBytes; 
-				memcpy(target, target+width*surface_desc.Width*pixelBytes, (width+8)*pixelBytes);
-				// copy after.
-				row = origin.y+j;
-				pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*surface_desc.Width*pixelBytes;
-				target = pBGRX+(origin.x-4)*pixelBytes; 
-				memcpy(target+width*surface_desc.Width*pixelBytes, target, (width+8)*pixelBytes);
-			}
-
-		}
-
-	}
-	surface_level->UnlockRect();
-	surface_level->Release();
-	DX8_ErrorCode(D3DXFilterTexture(Peek_D3D_Texture(), NULL, 0, D3DX_FILTER_BOX));	
-	if (TheWritableGlobalData->m_textureReductionFactor) {
-		Peek_D3D_Texture()->SetLOD(TheWritableGlobalData->m_textureReductionFactor);
-	}
-	return(surface_desc.Height);
-}
-
-#if 0 // old version.
-//=============================================================================
-// TerrainTextureClass::update
-//=============================================================================
-/** Sets the tile bitmap data into the texture.  The tiles are placed with 4
-	pixel borders around them, so that when the tiles are scaled and bilinearly
-	interpolated, you don't get seams between the tiles.  */
-//=============================================================================
-int TerrainTextureClass::update(WorldHeightMap *htMap)
-{
-	// D3DTexture is our texture;
-
-	IDirect3DSurface8 *surface_level;
-	D3DSURFACE_DESC surface_desc;
-	D3DLOCKED_RECT locked_rect;
-	DX8_ErrorCode(D3DTexture->GetSurfaceLevel(0, &surface_level));
-	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
-	if (surface_desc.Width < TEXTURE_WIDTH) {
-		surface_level->Release();
-		if (surface_desc.Width == 256) {
-			return update256(htMap);
-		}
-		return false;
-	}
-
-	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
-
-	Int tilePixelExtent = TILE_PIXEL_EXTENT;		 
-	Int tilesPerRow = surface_desc.Width/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
-	tilesPerRow *= 2;
-	Int numRows = surface_desc.Height/(tilePixelExtent+TILE_OFFSET);
-#ifdef RTS_DEBUG
-	assert(tilesPerRow*numRows >= htMap->m_numBitmapTiles);
-	assert((Int)surface_desc.Width >= tilePixelExtent*tilesPerRow);
-#endif
-	if (surface_desc.Format == D3DFMT_A1R5G5B5) {
-		Int cellX, cellY;
-#if 0
-		for (cellX = 0; cellX < surface_desc.Width; cellX++) {
-			for (cellY = 0; cellY < surface_desc.Height; cellY++) {
-				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(cellY*surface_desc.Width+cellX)*2;
-				*((Short*)pBGR) = (((255-2*cellY)>>3)<<10) + ((4*cellX)>>4);
-			}
-		}
-#endif
-		Int pixelBytes = 2;
-		for (cellY = 0; cellY < numRows; cellY++) { 
-			for (cellX = 0; cellX < tilesPerRow; cellX++) {
-				Int tileNdx = cellX/2 + (tilesPerRow/2)*(cellY/2);
-				tileNdx *=4;
-				if (cellX&1) tileNdx++;
-				if (!(cellY&1)) tileNdx += 2;
-#define ADD_EXTRA_TILES 1
-#if ADD_EXTRA_TILES // Fills in an extra 2 columns and 1 row of tiles if there is room.
-				if (!htMap->getSourceTile(tileNdx) && htMap->getSourceTile(tileNdx-4)) {
-					tileNdx -= 4;
-				}
-				if (!htMap->getSourceTile(tileNdx) && htMap->getSourceTile(tileNdx-8)) {
-					tileNdx -= 8;
-				}
-				if (!htMap->getSourceTile(tileNdx) && htMap->getSourceTile(tileNdx-2*tilesPerRow)) {
-					tileNdx -= 2*tilesPerRow;
-				}
-#endif
-				if (htMap->getSourceTile(tileNdx)) {
-					Int i,j;
-					for (j=0; j<tilePixelExtent; j++) {
-						UnsignedByte *pBGR = htMap->getSourceTile(tileNdx)->getRGBDataForWidth(tilePixelExtent);
-						pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
-						Int row = cellY*tilePixelExtent+j;
-						row += TILE_OFFSET/2; 
-						row += TILE_OFFSET*(cellY/2);
-						UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-									(row)*surface_desc.Width*pixelBytes;
-
-						Int column = cellX*tilePixelExtent;
-						column += TILE_OFFSET*(cellX/2);
-						pBGRX += column*pixelBytes;
-						pBGRX += (TILE_OFFSET/2)*pixelBytes;
-						for (i=0; i<tilePixelExtent; i++) {
-							*((Short*)pBGRX) = 0x8000 + ((pBGR[2]>>3)<<10) + ((pBGR[1]>>3)<<5) + (pBGR[0]>>3);
-							pBGRX +=pixelBytes;
-							pBGR +=TILE_BYTES_PER_PIXEL;
-						}
-					}
-
-				}
-			}
-
-		}
-
-
-		for (cellY = 0; cellY < numRows; cellY++) {
-			for (cellX = 0; cellX < tilesPerRow; cellX++) {
-			// Duplicate 4 rows of pixels before and after.
-				Int j;
-				for (j=0; j<tilePixelExtent; j++) {
-					Int row = cellY*tilePixelExtent+j;
-					row += TILE_OFFSET/2; 
-					row += TILE_OFFSET*(cellY/2);
-					UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-								(row)*surface_desc.Width*pixelBytes;
-
-					Int column = cellX*tilePixelExtent;
-					column += TILE_OFFSET*(cellX/2);
-					pBGRX += column*pixelBytes;
-					if (cellX&1) {
-						Int bytesToCopy = 4*pixelBytes;
-						if (cellX == tilesPerRow-1) {
-							// last cell, so fill to the end of the texture.
-							Int usedWidth = tilesPerRow*tilePixelExtent + TILE_OFFSET*(tilesPerRow/2);
-							usedWidth *= pixelBytes;
-							bytesToCopy += surface_desc.Width*pixelBytes - usedWidth;
-						}
-						// Copy after. 
-						pBGRX -= tilePixelExtent*pixelBytes;
-						pBGRX += (TILE_OFFSET/2)*pixelBytes;
-						memcpy(pBGRX+(2*tilePixelExtent*pixelBytes), pBGRX, bytesToCopy);
-					} else {
-						// copy before
-						memcpy(pBGRX, pBGRX+(2*tilePixelExtent)*pixelBytes, 4*pixelBytes);
-					}
-				}
-			}
-		}
- 		for (cellY = 0; cellY < numRows; cellY++) {
-			Int rowBytes = surface_desc.Width*pixelBytes; 
-			Int row = cellY*tilePixelExtent;
-			row += TILE_OFFSET/2; 
-			row += TILE_OFFSET*(cellY/2);
-			if ( (cellY&1) == 0) {
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*rowBytes;
-				row += 2*tilePixelExtent;
-				UnsignedByte *pBase = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*rowBytes;
-				memcpy(pBGRX-4*rowBytes, pBase-4*rowBytes, 4*rowBytes);
-			} else {
-				UnsignedByte *pBase = ((UnsignedByte*)locked_rect.pBits) +
-							(row-tilePixelExtent)*rowBytes;
-				row += tilePixelExtent;
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*rowBytes;
-				memcpy(pBGRX, pBase, 4*rowBytes);
-			}
-		}
-		
-	}
-	surface_level->UnlockRect();
-	surface_level->Release();
-	DX8_ErrorCode(D3DXFilterTexture(D3DTexture, NULL, 0, D3DX_FILTER_BOX));	
-	return(surface_desc.Height);
-}
-#endif
-
-//=============================================================================
-// TerrainTextureClass::setLOD
-//=============================================================================
-/** Sets the lod of the texture to be loaded into the video card.  */
-//=============================================================================
-void TerrainTextureClass::setLOD(Int LOD)
-{
-	if (Peek_D3D_Texture()) Peek_D3D_Texture()->SetLOD(LOD);
-}
-//=============================================================================
-// TerrainTextureClass::update
-//=============================================================================
-/** Sets the tile bitmap data into the texture.  The tiles are placed with 4
-	pixel borders around them, so that when the tiles are scaled and bilinearly
-	interpolated, you don't get seams between the tiles.  */
-//=============================================================================
-Bool TerrainTextureClass::updateFlat(WorldHeightMap *htMap, Int xCell, Int yCell, Int cellWidth, Int pixelsPerCell)
-{
-	// D3DTexture is our texture;
-
-	IDirect3DSurface8 *surface_level;
-	D3DSURFACE_DESC surface_desc;
-	D3DLOCKED_RECT locked_rect;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0, &surface_level));
-	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
-	DEBUG_ASSERTCRASH((Int)surface_desc.Width == cellWidth*pixelsPerCell, ("Bitmap too small."));
-	DEBUG_ASSERTCRASH((Int)surface_desc.Height == cellWidth*pixelsPerCell, ("Bitmap too small."));
-	if (surface_desc.Width != cellWidth*pixelsPerCell) {
-		return false;
-	}
-
-	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
-
-
-	if (surface_desc.Format == D3DFMT_A1R5G5B5) {
-
-		Int pixelBytes = 2;
-		Int cellX, cellY;
-#if 0
-		UnsignedInt X, Y;
-		for (X = 0; X < surface_desc.Width; X++) {
-			for (Y = 0; Y < surface_desc.Height; Y++) {
-				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(Y*surface_desc.Width+X)*pixelBytes;
-				*((Short*)pBGR) = (((255-2*Y)>>3)<<10) + ((2*X)>>4);
-			}
-		}
-#endif
-		for (cellX = 0; cellX < cellWidth; cellX++) {
-			for (cellY = 0; cellY < cellWidth; cellY++) {
-				UnsignedByte *pBGRX_data = ((UnsignedByte*)locked_rect.pBits);
-				UnsignedByte *pBGR = htMap->getPointerToTileData(xCell+cellX, yCell+cellY, pixelsPerCell);
-				if (pBGR == NULL) continue; // past end of defined terrain. [3/24/2003]
-				Int k, l;
-				for (k=pixelsPerCell-1; k>=0; k--) {
-					UnsignedByte *pBGRX = pBGRX_data + (pixelsPerCell*(cellWidth-cellY-1)+k)*surface_desc.Width*pixelBytes +
-						cellX*pixelsPerCell*pixelBytes;
-					for (l=0; l<pixelsPerCell; l++) {
-						*((Short*)pBGRX) = 0x8000 + ((pBGR[2]>>3)<<10) + ((pBGR[1]>>3)<<5) + (pBGR[0]>>3);
-						pBGRX +=pixelBytes;
-						pBGR +=TILE_BYTES_PER_PIXEL;
-					}
-				}
-			}
-		}
-	}
-
-	surface_level->UnlockRect();
-	surface_level->Release();
-	DX8_ErrorCode(D3DXFilterTexture(Peek_D3D_Texture(), NULL, 0, D3DX_FILTER_BOX));	
-	return(surface_desc.Height);
-}
-
-//=============================================================================
-// TerrainTextureClass::Apply
-//=============================================================================
-/** Sets the texture as the current D3D texture, and does some custom setup
-(standard D3D setup, but beyond the scope of W3D).  */
-//=============================================================================
-void TerrainTextureClass::Apply(unsigned int stage)
-{
-	// Do the base apply.
-	TextureClass::Apply(stage);
-#if 0 // obsolete [4/1/2003]
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-	// Now setup the texture pipeline.
-	if (stage==0) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
-
-	}
-#endif
-}
-
-/******************************************************************************
-						AlphaTerrainTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// AlphaTerrainTextureClass::AlphaTerrainTextureClass
-//=============================================================================
-/** Constructor. Calls parent constructor to creat a throw away 8x8 texture, 
-then uses the base texture's D3D texture. This way the base tiles pass, drawn
-using TerrainTextureClass shares the same texture with the blended edges pass,
-saving lots of texture memory, and preventing seams between blended tiles. */
-//=============================================================================
-AlphaTerrainTextureClass::AlphaTerrainTextureClass( TextureClass *pBaseTex ): 
-	TextureClass(8, 8, 
-		WW3D_FORMAT_A1R5G5B5, MIP_LEVELS_1 )
-{ 
-	// Attach the base texture's d3d texture.
-	IDirect3DTexture8 * d3d_tex = pBaseTex->Peek_D3D_Texture();
-	Set_D3D_Base_Texture(d3d_tex);
-}
-
-
-//=============================================================================
-// AlphaTerrainTextureClass::Apply
-//=============================================================================
-/** Sets the texture as the current D3D texture, and does some custom setup.
-This may be applied in either single pass, as the second texture in the pipe, 
-or multipass.  If stage==0, we are doing multipass and we set up the pipe 
-for a single texture.  If stage==1, then we are doing a single pass, and we
-set up the pipe so that we blend onto the base texture in stage 0.
-(standard D3D setup, but beyond the scope of W3D). */
-//=============================================================================
-void AlphaTerrainTextureClass::Apply(unsigned int stage)
-{
-	// Do the base apply.
-	TextureClass::Apply(stage);
-	
-	// Set the bilinear or trilinear filtering.
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-	// Since we are using multiple distinct tiles, the textures doesn't wrap, so clamp it.
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-	// Now setup the texture pipeline.
-	if (stage==0) {
-		// Modulate the diffuse color with the texture as lighting comes from diffuse.
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 1 );
-		// Blend the result using the alpha. (came from diffuse mod texture)
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-		// Disable stage 2.
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	}	else if (stage==1) {
-
-		if (TheGlobalData && !TheGlobalData->m_multiPassTerrain)
-		{
-			///@todo: Remove 8-Stage Nvidia hack after drivers are fixed.
-			//This method is a backdoor specific to Nvidia based cards.  It will fail on
-			//other hardware.  Allows single pass blend of 2 textures and post modulate diffuse.
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP, D3DTOP_ADD);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_DIFFUSE | D3DTA_COMPLEMENT | D3DTA_ALPHAREPLICATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_ADD);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TFACTOR | D3DTA_COMPLEMENT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-			DX8Wrapper::Set_DX8_Texture(2, NULL);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, 2);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLORARG2, D3DTA_TEXTURE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-			DX8Wrapper::Set_DX8_Texture(3, NULL);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, 3);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLORARG1, D3DTA_DIFFUSE | 0 | D3DTA_ALPHAREPLICATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-			DX8Wrapper::Set_DX8_Texture(4, NULL);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLOROP, D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_TEXCOORDINDEX, 4);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLORARG1, D3DTA_CURRENT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAARG1, D3DTA_CURRENT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-
-			DX8Wrapper::Set_DX8_Texture(5, NULL);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLOROP, D3DTOP_ADD);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_TEXCOORDINDEX, 5);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLORARG1, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAOP,   D3DTOP_ADD);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAARG1, D3DTA_TFACTOR | D3DTA_COMPLEMENT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-			DX8Wrapper::Set_DX8_Texture(6, NULL);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLOROP, D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_TEXCOORDINDEX, 6);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLORARG1, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLORARG2, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-			DX8Wrapper::Set_DX8_Texture(7, NULL);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_TEXCOORDINDEX, 7);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLORARG1, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLORARG2, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-		}
-		else
-		{
-  			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-		}
-	}
-}
-
-
-/******************************************************************************
-						LightMapTerrainTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// LightMapTerrainTextureClass::LightMapTerrainTextureClass
-//=============================================================================
-/** Constructor. Calls parent constructor to load the .tga texture. */
-//=============================================================================
-LightMapTerrainTextureClass::LightMapTerrainTextureClass(AsciiString name, MipCountType mipLevelCount) :
-TextureClass(name.isEmpty()?"TSNoiseUrb.tga":name.str(),name.isEmpty()?"TSNoiseUrb.tga":name.str(), mipLevelCount )
-{ 
-	Get_Filter().Set_Min_Filter(TextureFilterClass::FILTER_TYPE_BEST);
-	Get_Filter().Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_BEST);
-	Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_REPEAT);
-	Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_REPEAT);
-}
-
-#define STRETCH_FACTOR ((float)(1/(63.0*MAP_XY_FACTOR/2))) /* covers 63/2 tiles */		
-
-//=============================================================================
-// LightMapTerrainTextureClass::Apply
-//=============================================================================
-/** Sets the texture as the current D3D texture, and does some custom setup.
-The LightMapTerrainTextureClass may be applied by itself, or with the 
-CloudMapTerrainTextureClass.  This may be applied in either single pass, 
-as the second texture in the pipe, 
-or multipass.  If stage==0, we are doing multipass and we set up the pipe 
-for a single texture.  If stage==1, then we are doing a single pass, and we
-set up the pipe so that we blend onto the cloud map texture in stage 0.
-Also, texture is mapped using the x/y coordinates of the map, saving us 
-yet another set of uv coordinates.
-(standard D3D setup, but beyond the scope of W3D). */
-//=============================================================================
-void LightMapTerrainTextureClass::Apply(unsigned int stage)
-{
-	TextureClass::Apply(stage);
-#if 0 // obsolete [4/1/2003]
-	// Do the base apply.
-	/* previous setup */
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-	// Disable 3rd stage just in case.
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-	// Now setup the texture pipeline.
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG2, D3DTA_CURRENT );
-	if (stage == 0) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
-		//Disable second stage
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	}
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	// Two output coordinates are used.
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-	Matrix4x4 curView;
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-
-	D3DXMATRIX inv;
-	float det;
-	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-	D3DXMATRIX scale;
-	D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
-	inv *=scale;
-	if (stage==0) {
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&inv));
-	}	if (stage==1) {
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, *((Matrix4x4*)&inv));
-	}
-		
-		
-	if (stage==0) {
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_DESTCOLOR);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
-	} 
-#endif
-}
-
-
-
-
-
-
-
-
-
-/******************************************************************************
-						AlphaEdgeTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-/**
-* AlphaEdgeTextureClass - Generates the alpha edge blending for terrain.
-*		
-*/
-AlphaEdgeTextureClass::AlphaEdgeTextureClass( int height, MipCountType mipLevelCount) :
-//	TextureClass("EdgingTemplate.tga","EdgingTemplate.tga", mipLevelCount )
-	TextureClass(TEXTURE_WIDTH, height, WW3D_FORMAT_A8R8G8B8, mipLevelCount )
-{ 
-
-}
-
-int AlphaEdgeTextureClass::update256(WorldHeightMap *htMap)
-{
-	return 1;
-}
-
-int AlphaEdgeTextureClass::update(WorldHeightMap *htMap)
-{
-	// D3DTexture is our texture;
-
-	IDirect3DSurface8 *surface_level;
-	D3DSURFACE_DESC surface_desc;
-	D3DLOCKED_RECT locked_rect;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0, &surface_level));
-	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
-	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
-
-	Int tilePixelExtent = TILE_PIXEL_EXTENT; // blend tiles are 1/4 tiles.
-//	Int tilesPerRow = surface_desc.Width / (tilePixelExtent+8);
-
-//	Int numRows = surface_desc.Height/(tilePixelExtent+8);
-
-	if (surface_desc.Format == D3DFMT_A8R8G8B8) {
-#if 1
-#if 1
-		Int cellX, cellY;
-		for (cellX = 0; (UnsignedInt)cellX < surface_desc.Width; cellX++) {
-			for (cellY = 0; cellY < surface_desc.Height; cellY++) {
-				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(cellY*surface_desc.Width+cellX)*4;
-				pBGR[2] = 255-cellY/2;
-				pBGR[0] = cellX/2;
-				pBGR[3] = cellX/2;  // alpha.
-				pBGR[3] = 128;  // alpha.
-			}
-		}
-#endif
-#if 1
-		Int tileNdx;
-		Int pixelBytes = 4;
-		for (tileNdx=0; tileNdx < htMap->m_numEdgeTiles; tileNdx++) {
-			TileData *pTile = htMap->getEdgeTile(tileNdx);
-			if (!pTile) continue;
-			ICoord2D position = pTile->m_tileLocationInTexture;
-			if (position.x<=0) continue; // all real edge offsets start at 4.  jba.
-			Int i,j;
-			Int column = position.x;
-			for (j=0; j<tilePixelExtent; j++) {
-				Int row = position.y+j;
-				UnsignedByte *pBGR = htMap->getEdgeTile(tileNdx)->getRGBDataForWidth(tilePixelExtent);
-				pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
-				UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*surface_desc.Width*pixelBytes;
-				pBGRX += column*pixelBytes;
-
-				for (i=0; i<tilePixelExtent; i++) {
-					pBGRX[0] = pBGR[0];  //r
-					pBGRX[1] = pBGR[1];	//g
-					pBGRX[2] = pBGR[2];	//b
-					if (pBGR[0]==0 && pBGR[1]==0 && pBGR[2]==0) {
-						pBGRX[3] = 0x80;
-					} else if (pBGR[0]==0xff && pBGR[1]==0xff && pBGR[2]==0xff) {
-						pBGRX[3] = 0x00;
-					}	else {
-						pBGRX[3] = 0xff;
-					}
-						
-					pBGRX += pixelBytes;
-					pBGR += TILE_BYTES_PER_PIXEL;
-				}
-			}
-		}
-#endif
-#endif
-	}
-	surface_level->UnlockRect();
-	surface_level->Release();
-	DX8_ErrorCode(D3DXFilterTexture(Peek_D3D_Texture(), NULL, 0, D3DX_FILTER_BOX));
-	return(surface_desc.Height);
-}
-
-void AlphaEdgeTextureClass::Apply(unsigned int stage)
-{
-	// Do the base apply.
-	TextureClass::Apply(stage);
-#if 0 // obsolete [4/1/2003]
-	
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-	// Now setup the texture pipeline.
-	if (stage==0) {
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1,   D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 1 );
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-	} else if (stage==1) {
-		// Drawing texture through the mask.
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1,   D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1,   D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2,   D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG2 );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1 );
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_ONE);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
-
-	}
-#endif
-}
-
-
-/******************************************************************************
-						CloudMapTerrainTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// CloudMapTerrainTextureClass::CloudMapTerrainTextureClass
-//=============================================================================
-/** Constructor. Calls parent constructor to load the .tga texture, and sets
-up the "sliding" parameters for the clouds to slide over the terrain. */
-//=============================================================================
-//@todo - Allow adjustment of the cloud slide rate, and lose the hard coded "cloudmap.tga"
-CloudMapTerrainTextureClass::CloudMapTerrainTextureClass(MipCountType mipLevelCount) :
-	TextureClass("TSCloudMed.tga","TSCloudMed.tga", mipLevelCount )
-{ 
-	Get_Filter().Set_Mip_Mapping( TextureFilterClass::FILTER_TYPE_FAST );
-	m_xSlidePerSecond = -0.02f;	 
-	m_ySlidePerSecond =  1.50f * m_xSlidePerSecond;
-	m_curTick = 0;
-	m_xOffset = 0;
-	m_yOffset = 0;
-
-}
-
-//=============================================================================
-// CloudMapTerrainTextureClass::Apply
-//=============================================================================
-/** Sets the texture as the current D3D texture, and does some custom setup.
-The CloudMapTerrainTextureClass may be applied by itself, or with the 
-LightMapTerrainTexture.  This may be applied in either single pass, 
-as the first texture in the pipe with LightMapTerrainTextureClass as the 
-second stage of the pape, or multipass.  We setup for stage 0, assuming that
-we are the only texture, as LightMapTerrainTexture will adjust for multitexture
-if it is applied to stage 1.
-Also, texture is mapped using the x/y coordinates of the map, saving us 
-yet another set of uv coordinates.
-(standard D3D setup, but beyond the scope of W3D). */
-//=============================================================================
-void CloudMapTerrainTextureClass::Apply(unsigned int stage)
-{
-
-
-	// Do the base apply.
-	TextureClass::Apply(stage);
-	return;
-#if 0   // obsolete
-	/* previous setup */
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-	// Now setup the texture pipeline.
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	// Two output coordinates are used.
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-	Matrix4x4 curView;
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-
-	D3DXMATRIX inv;
-	float det;
-	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-	D3DXMATRIX scale;
-	D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
-	inv *=scale;
-	D3DXMATRIX offset;
-
-	Int delta = m_curTick;
-	m_curTick = ::GetTickCount();
-	delta = m_curTick-delta;
-	m_xOffset += m_xSlidePerSecond*delta/1000;
-	m_yOffset += m_ySlidePerSecond*delta/1000;
-
-	if (m_xOffset > 1) m_xOffset -= 1;
-	if (m_yOffset > 1) m_yOffset -= 1;
-	if (m_xOffset < -1) m_xOffset += 1;
-	if (m_yOffset < -1) m_yOffset += 1;
-
-
-	D3DXMatrixTranslation(&offset, m_xOffset, m_yOffset,0);
-
-	inv *= offset;
-
-	if (stage==0) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&inv));
-		
-		// Disable 3rd stage just in case.
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_DESTCOLOR);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
-	}	else if (stage==1) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, *((Matrix4x4*)&inv));
-	}
-#endif
-}
-
-//=============================================================================
-// CloudMapTerrainTextureClass::restore
-//=============================================================================
-/** Cleans up any custom settings to the texturing pipeline that may not be 
-understood by w3d. */
-//=============================================================================
-void CloudMapTerrainTextureClass::restore(void)
-{
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 0 );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-
-
-	if (TheGlobalData && !TheGlobalData->m_multiPassTerrain)
-	{
-		///@todo: Remove 8-Stage Nvidia hack after drivers are fixed.
-		//This method is a backdoor specific to Nvidia based cards.  It will fail on
-		//other hardware.  Allows single pass blend of 2 textures and post modulate diffuse.
-		Int i;
-		for (i=0; i<8; i++) {
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_COLOROP, D3DTOP_DISABLE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_TEXCOORDINDEX, i);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_ALPHAOP,   D3DTOP_DISABLE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( i, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-
-			DX8Wrapper::Set_DX8_Texture(i, NULL);
-		}
-	}
-}
-
-/******************************************************************************
-						ScorchTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// ScorchTextureClass::ScorchTextureClass
-//=============================================================================
-/** Constructor. Calls parent constructor to load the .tga texture. */
-//=============================================================================
-/// @todo - get "EXScorch01.tga" from not hard coded location.
-ScorchTextureClass::ScorchTextureClass(MipCountType mipLevelCount) :
-	TextureClass("EXScorch01.tga","EXScorch01.tga", mipLevelCount )
-// Hack to disable texture reduction.
-//	TextureClass("EXScorch01.tga","EXScorch01.tga", mipLevelCount,WW3D_FORMAT_UNKNOWN,true,false)
-{ 
-}
-
-//=============================================================================
-// ScorchTextureClass::Apply
-//=============================================================================
-/** Sets the texture as the current D3D texture, and does some custom setup.
-The ScorchTextureClass is applied by iteself, as it's mesh is a subset of the 
-terrain mesh.
-(standard D3D setup, but beyond the scope of W3D). */
-//=============================================================================
-void ScorchTextureClass::Apply(unsigned int stage)
-{
-	// Do the base apply.
-	TextureClass::Apply(stage);
-	// Setup bilinear or trilinear filtering as specified in global data.
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);	
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-	// Now setup the texture pipeline.
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-}
-
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/TileData.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/TileData.cpp
deleted file mode 100644
index d750a4b711d..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/TileData.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// TileData.cpp
-// Class to handle tile data.
-// Author: John Ahlquist, April 2001
-
-#include "W3DDevice/GameClient/TileData.h"
-#include "W3DDevice/GameClient/WorldHeightMap.h"
-
-
-
-//
-// TileData - no destructor.
-//
-
-//
-// TileData - create a new texture tile .
-//
-TileData::TileData()
-{
-
-}
-
-#define TILE_PIXEL_EXTENT_MIP1 32
-#define TILE_PIXEL_EXTENT_MIP2 16
-#define TILE_PIXEL_EXTENT_MIP3 8
-#define TILE_PIXEL_EXTENT_MIP4 4
-#define TILE_PIXEL_EXTENT_MIP5 2
-#define TILE_PIXEL_EXTENT_MIP6 1
-
-Bool TileData::hasRGBDataForWidth(Int width) 
-{
-	if (width == TILE_PIXEL_EXTENT) return(true);
-	if (width == TILE_PIXEL_EXTENT_MIP1) return(true);
-	if (width == TILE_PIXEL_EXTENT_MIP2) return(true);
-	if (width == TILE_PIXEL_EXTENT_MIP3) return(true);
-	if (width == TILE_PIXEL_EXTENT_MIP4) return(true);
-	if (width == TILE_PIXEL_EXTENT_MIP5) return(true);
-	if (width == TILE_PIXEL_EXTENT_MIP6) return(true);
-	return(false);
-}
-
-UnsignedByte * TileData::getRGBDataForWidth(Int width) 
-{
-	// default
-	if (width == TILE_PIXEL_EXTENT_MIP1) return(m_tileDataMip32);
-	if (width == TILE_PIXEL_EXTENT_MIP2) return(m_tileDataMip16);
-	if (width == TILE_PIXEL_EXTENT_MIP3) return(m_tileDataMip8);
-	if (width == TILE_PIXEL_EXTENT_MIP4) return(m_tileDataMip4);
-	if (width == TILE_PIXEL_EXTENT_MIP5) return(m_tileDataMip2);
-	if (width == TILE_PIXEL_EXTENT_MIP6) return(m_tileDataMip1);
-	return(m_tileData);
-}
-
-void TileData::updateMips(void) 
-{
-	doMip(m_tileData, TILE_PIXEL_EXTENT, m_tileDataMip32); 
-	doMip(m_tileDataMip32, TILE_PIXEL_EXTENT_MIP1, m_tileDataMip16); 
-	doMip(m_tileDataMip16, TILE_PIXEL_EXTENT_MIP2, m_tileDataMip8); 
-	doMip(m_tileDataMip8, TILE_PIXEL_EXTENT_MIP3, m_tileDataMip4); 
-	doMip(m_tileDataMip4, TILE_PIXEL_EXTENT_MIP4, m_tileDataMip2); 
-	doMip(m_tileDataMip2, TILE_PIXEL_EXTENT_MIP5, m_tileDataMip1); 
-}
-
-
-void TileData::doMip(UnsignedByte *pHiRes, Int hiRow, UnsignedByte *pLoRes) 
-{
-	Int i, j;
-	for (i=0; i<hiRow; i+=2) {
-		for (j=0; j<hiRow; j+=2) {
-			Int pxl;
-			Int ndx = (j*hiRow+i)*TILE_BYTES_PER_PIXEL;
-			Int loNdx = (j/2)*(hiRow/2) + (i/2);
-			loNdx *= TILE_BYTES_PER_PIXEL;
-			Int p;
-			for (p=0; p<TILE_BYTES_PER_PIXEL; p++,ndx++,loNdx++) {
-				pxl = pHiRes[ndx] + pHiRes[ndx+TILE_BYTES_PER_PIXEL] + pHiRes[ndx+TILE_BYTES_PER_PIXEL*hiRow] + pHiRes[ndx+TILE_BYTES_PER_PIXEL*hiRow+TILE_BYTES_PER_PIXEL] +2;
-				pxl /= 4;
-				pLoRes[loNdx] = pxl;
-			}
-		}
-	}
-
-}
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp
index 252686d4f23..a27412e974f 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManager.cpp
@@ -65,16 +65,10 @@
 #include "ffactory.h"
 #include "font3d.h"
 #include "render2dsentence.h"
-#include <stdio.h>
 #include "Common/PerfTimer.h"
 #include "Common/GlobalData.h"
 #include "Common/GameCommon.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //---------------------------------------------------------------------
 // Constants
@@ -124,26 +118,26 @@ class W3DPrototypeClass : public MemoryPoolObject, public PrototypeClass
 W3DPrototypeClass::W3DPrototypeClass(RenderObjClass * proto, const AsciiString& name) :
 	Proto(proto),
 	Name(name)
-{ 
-	assert(Proto); 
-	Proto->Add_Ref(); 
+{
+	assert(Proto);
+	Proto->Add_Ref();
 }
 
 //---------------------------------------------------------------------
-W3DPrototypeClass::~W3DPrototypeClass(void)						
-{ 
-	if (Proto) { 
-		Proto->Release_Ref(); 
+W3DPrototypeClass::~W3DPrototypeClass(void)
+{
+	if (Proto) {
+		Proto->Release_Ref();
 		Proto = NULL;
 	}
 }
 
 //---------------------------------------------------------------------
-RenderObjClass * W3DPrototypeClass::Create(void)					
-{ 
-	return (RenderObjClass *)( SET_REF_OWNER( Proto->Clone() ) ); 
+RenderObjClass * W3DPrototypeClass::Create(void)
+{
+	return (RenderObjClass *)( SET_REF_OWNER( Proto->Clone() ) );
 }
-	
+
 //---------------------------------------------------------------------
 // W3DAssetManager
 //---------------------------------------------------------------------
@@ -164,7 +158,7 @@ __int64 Total_Get_Texture_Time=0;
 
 TextureClass *	W3DAssetManager::Get_Texture
 	(
-		const char * filename, 
+		const char * filename,
 		MipCountType mip_level_count,
 		WW3DFormat texture_format,
 		bool allow_compression,
@@ -178,7 +172,7 @@ TextureClass *	W3DAssetManager::Get_Texture
 	if (filename && *filename && _strnicmp(filename,"ZHC",3) == 0)
 		allow_reduction = false;	//don't allow reduction on our infantry textures.
 
-	return WW3DAssetManager::Get_Texture(	filename, 
+	return WW3DAssetManager::Get_Texture(	filename,
 		mip_level_count,
 		texture_format,
 		allow_compression,
@@ -206,7 +200,7 @@ TextureClass *W3DAssetManager::Get_Texture(
 	/*
 	** Bail if the user isn't really asking for anything
 	*/
-	if (!filename || !*filename) 
+	if (!filename || !*filename)
 	{
 		#ifdef DUMP_PERF_STATS
 		GetPrecisionTimer(&endTime64);
@@ -222,7 +216,7 @@ TextureClass *W3DAssetManager::Get_Texture(
 	** See if the texture has already been loaded.
 	*/
 	TextureClass* tex = TextureHash.Get(lower_case_name);
-	if (tex && texture_format != WW3D_FORMAT_UNKNOWN) 
+	if (tex && texture_format != WW3D_FORMAT_UNKNOWN)
 	{
 		WWASSERT_PRINT(tex->Get_Texture_Format() == texture_format, ("Texture %s has already been loaded with different format",filename));
 	}
@@ -230,7 +224,7 @@ TextureClass *W3DAssetManager::Get_Texture(
 	/*
 	** Didn't have it so we have to create a new texture
 	*/
-	if (!tex) 
+	if (!tex)
 	{
 		tex = NEW_REF(TextureClass, (lower_case_name, NULL, mip_level_count, texture_format, allow_compression));
 		TextureHash.Insert(tex->Get_Texture_Name(),tex);
@@ -239,13 +233,13 @@ TextureClass *W3DAssetManager::Get_Texture(
 //			extern std::vector<std::string>	preloadTextureNamesGlobalHack;
 //			preloadTextureNamesGlobalHack.push_back(tex->Get_Texture_Name());
 //		}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 		if (TheGlobalData->m_preloadReport)
-		{	
+		{
 			//loading a new asset and app is requesting a log of all loaded assets.
 			FILE *logfile=fopen("PreloadedAssets.txt","a+");	//append to log
 			if (logfile)
-			{	
+			{
 				fprintf(logfile,"TX: %s\n",tex->Get_Texture_Name());
 				fclose(logfile);
 			}
@@ -276,7 +270,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(const char* name)
 static inline void Munge_Render_Obj_Name(char *newname, const char *oldname, float scale, const int color, const char *textureName)
 {
 	char lower_case_name[255];
-	strcpy(lower_case_name, oldname);
+	strlcpy(lower_case_name, oldname, ARRAY_SIZE(lower_case_name));
 	_strlwr(lower_case_name);
 
 	if (!textureName)
@@ -289,7 +283,7 @@ static inline void Munge_Render_Obj_Name(char *newname, const char *oldname, flo
 static inline void Munge_Texture_Name(char *newname, const char *oldname, const int color)
 {
 	char lower_case_name[255];
-	strcpy(lower_case_name, oldname);
+	strlcpy(lower_case_name, oldname, ARRAY_SIZE(lower_case_name));
 	_strlwr(lower_case_name);
 	sprintf(newname,"#%d#%s", color, lower_case_name);
 }
@@ -297,7 +291,7 @@ static inline void Munge_Texture_Name(char *newname, const char *oldname, const
 //---------------------------------------------------------------------
 int W3DAssetManager::replaceAssetTexture(RenderObjClass *robj, TextureClass *oldTex, TextureClass *newTex)
 {
-	switch (robj->Class_ID())	{	
+	switch (robj->Class_ID())	{
 	case RenderObjClass::CLASSID_MESH:
 		return replaceMeshTexture(robj, oldTex, newTex);
 		break;
@@ -328,21 +322,21 @@ Int W3DAssetManager::replaceMeshTexture(RenderObjClass *robj, TextureClass *oldT
 	int i;
 	int didReplace=0;
 
-	MeshClass *mesh=(MeshClass*) robj;	
+	MeshClass *mesh=(MeshClass*) robj;
 	MeshModelClass * model = mesh->Get_Model();
 	MaterialInfoClass	*material = mesh->Get_Material_Info();
 
 	for (i=0; i<material->Texture_Count(); i++)
 	{
 		if (material->Peek_Texture(i) == oldTex)
-		{	
+		{
 			model->Replace_Texture(oldTex,newTex);
 			material->Replace_Texture(i,newTex);
 			didReplace=1;
 		}
 	}
 
-	REF_PTR_RELEASE(material);	
+	REF_PTR_RELEASE(material);
 	REF_PTR_RELEASE(model);
 	return didReplace;
 }
@@ -373,7 +367,7 @@ int W3DAssetManager::replacePrototypeTexture(RenderObjClass *robj, const char *
 */
 TextureClass * W3DAssetManager::Find_Texture(const char * name, const int color)
 {
-	char newname[512];	
+	char newname[512];
 	Munge_Texture_Name(newname, name, color);
 
 	// see if we have a cached copy
@@ -387,7 +381,7 @@ TextureClass * W3DAssetManager::Find_Texture(const char * name, const int color)
 //---------------------------------------------------------------------
 TextureClass * W3DAssetManager::Recolor_Texture(TextureClass *texture, const int color)
 {
-	const char *name=texture->Get_Texture_Name();	
+	const char *name=texture->Get_Texture_Name();
 
 	TextureClass *newtex = Find_Texture(name, color);
 	if (newtex) {
@@ -399,7 +393,7 @@ TextureClass * W3DAssetManager::Recolor_Texture(TextureClass *texture, const int
 
 //---------------------------------------------------------------------
 const Int TEAM_COLOR_PALETTE_SIZE = 16;
-const UnsignedShort houseColorScale[TEAM_COLOR_PALETTE_SIZE] = 
+const UnsignedShort houseColorScale[TEAM_COLOR_PALETTE_SIZE] =
 {
 	255,239,223,211,195,174,167,151,135,123,107,91,79,63,47,35
 };
@@ -412,7 +406,7 @@ static void remapPalette16Bit(SurfaceClass::SurfaceDescription *sd, UnsignedShor
 
 	//Generate a new color gradient palette based on reference color
 	for (Int y=0; y<TEAM_COLOR_PALETTE_SIZE; y++)
-	{	
+	{
 		rgb.X=(Real)houseColorScale[y]*v_color.X;
 		rgb.Y=(Real)houseColorScale[y]*v_color.Y;
 		rgb.Z=(Real)houseColorScale[y]*v_color.Z;
@@ -435,7 +429,7 @@ static void remapTexture16Bit(Int dx, Int dy, Int pitch, SurfaceClass::SurfaceDe
 	//Generate a new color gradient palette based on reference color
 	Int y=0;
 	for (; y<TEAM_COLOR_PALETTE_SIZE; y++)
-	{	
+	{
 		rgb.X=(Real)houseColorScale[y]*v_color.X;
 		rgb.Y=(Real)houseColorScale[y]*v_color.Y;
 		rgb.Z=(Real)houseColorScale[y]*v_color.Z;
@@ -480,7 +474,7 @@ static void remapAlphaTexture16Bit(Int dx, Int dy, Int pitch, SurfaceClass::Surf
 #endif
 
 	for (y=0; y<dy; y++)
-	{	
+	{
 		for (x=0; x<dx; x++)
 		{
 			pixel=data[x];
@@ -516,7 +510,7 @@ static void remapPalette32Bit(SurfaceClass::SurfaceDescription *sd, UnsignedInt
 
 	//Generate a new color gradient palette based on reference color
 	for (Int y=0; y<TEAM_COLOR_PALETTE_SIZE; y++)
-	{	
+	{
 		rgb.X=(Real)houseColorScale[y]*v_color.X;
 		rgb.Y=(Real)houseColorScale[y]*v_color.Y;
 		rgb.Z=(Real)houseColorScale[y]*v_color.Z;
@@ -539,7 +533,7 @@ static void remapTexture32Bit(Int dx, Int dy, Int pitch, SurfaceClass::SurfaceDe
 	//Generate a new color gradient palette based on reference color
 	Int y=0;
 	for (; y<TEAM_COLOR_PALETTE_SIZE; y++)
-	{	
+	{
 		rgb.X=(Real)houseColorScale[y]*v_color.X;
 		rgb.Y=(Real)houseColorScale[y]*v_color.Y;
 		rgb.Z=(Real)houseColorScale[y]*v_color.Z;
@@ -631,7 +625,7 @@ void W3DAssetManager::Remap_Palette(SurfaceClass *surface, const int color, Bool
 			remapPalette32Bit(&sd, (UnsignedInt *)bits,color);
 	}
 	else
-	{	
+	{
 		if (useAlpha)
 		{
 			if (size == 2)
@@ -656,18 +650,18 @@ void W3DAssetManager::Remap_Palette(SurfaceClass *surface, const int color, Bool
 //---------------------------------------------------------------------
 TextureClass * W3DAssetManager::Recolor_Texture_One_Time(TextureClass *texture, const int color)
 {
-	const char *name=texture->Get_Texture_Name();	
+	const char *name=texture->Get_Texture_Name();
 
 	// if texture is procedural return NULL
 	if (name && name[0]=='!') return NULL;
 
 	// make sure texture is loaded
-	if (!texture->Is_Initialized())	
+	if (!texture->Is_Initialized())
 		TextureLoader::Request_Foreground_Loading(texture);
 
 	SurfaceClass::SurfaceDescription desc;
 	SurfaceClass *newsurf, *oldsurf;
-	texture->Get_Level_Description(desc);		
+	texture->Get_Level_Description(desc);
 
 	Int psize;
 	psize=PixelSize(desc);
@@ -691,7 +685,7 @@ TextureClass * W3DAssetManager::Recolor_Texture_One_Time(TextureClass *texture,
 	newtex->Get_Filter().Set_U_Addr_Mode(texture->Get_Filter().Get_U_Addr_Mode());
 	newtex->Get_Filter().Set_V_Addr_Mode(texture->Get_Filter().Get_V_Addr_Mode());
 
-	char newname[512];	
+	char newname[512];
 	Munge_Texture_Name(newname, name, color);
 	newtex->Set_Texture_Name(newname);
 
@@ -713,9 +707,9 @@ __int64 Total_Create_Render_Obj_Time=0;
 */
 RenderObjClass * W3DAssetManager::Create_Render_Obj(
 	const char * name,
-	float scale, 
+	float scale,
 	const int color,
-	const char *oldTexture, 
+	const char *oldTexture,
 	const char *newTexture
 )
 {
@@ -729,7 +723,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 	Bool reallytexture = (oldTexture != NULL && newTexture != NULL);
 
 	// base case, no scale or color
-	if (!reallyscale && !reallycolor && !reallytexture) 
+	if (!reallyscale && !reallycolor && !reallytexture)
 	{
 		RenderObjClass *robj=WW3DAssetManager::Create_Render_Obj(name);
 	#ifdef DUMP_PERF_STATS
@@ -770,12 +764,12 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 	PrototypeClass * proto = Find_Prototype(name);
 
 	Set_WW3D_Load_On_Demand(true); // Auto Load.
-	if (WW3D_Load_On_Demand && proto == NULL) 
-	{	
+	if (WW3D_Load_On_Demand && proto == NULL)
+	{
 		// If we didn't find one, try to load on demand
 		char filename [MAX_PATH];
 		const char *mesh_name = strchr (name, '.');
-		if (mesh_name != NULL) 
+		if (mesh_name != NULL)
 		{
 			lstrcpyn(filename, name, ((int)mesh_name) - ((int)name) + 1);
 			lstrcat(filename, ".w3d");
@@ -784,7 +778,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 		}
 
 		// If we can't find it, try the parent directory
-		if ( Load_3D_Assets( filename ) == false ) 
+		if ( Load_3D_Assets( filename ) == false )
 		{
 			StringClass	new_filename = StringClass("..\\") + filename;
 			Load_3D_Assets(new_filename);
@@ -793,12 +787,12 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 		proto = Find_Prototype(name);		// try again
 	}
 
-	if (proto == NULL) 
+	if (proto == NULL)
 	{
 		static int warning_count = 0;
-		if (++warning_count <= 20) 
+		if (++warning_count <= 20)
 		{
-			WWDEBUG_SAY(("WARNING: Failed to create Render Object: %s\r\n",name));
+			WWDEBUG_SAY(("WARNING: Failed to create Render Object: %s",name));
 		}
 	#ifdef DUMP_PERF_STATS
 		GetPrecisionTimer(&endTime64);
@@ -809,7 +803,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 
 	rendobj = proto->Create();
 
-	if (!rendobj) 
+	if (!rendobj)
 	{
 	#ifdef DUMP_PERF_STATS
 		GetPrecisionTimer(&endTime64);
@@ -824,7 +818,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 	Make_Unique(rendobj,reallyscale,reallycolor);
 
 	if (reallytexture)
-	{	
+	{
 		TextureClass *oldTex = Get_Texture(oldTexture);
 		TextureClass *newTex = Get_Texture(newTexture);
 		replaceAssetTexture(rendobj,oldTex,newTex);
@@ -835,7 +829,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(
 	if (reallycolor)
 		Recolor_Asset(rendobj,color);
 
-	W3DPrototypeClass *w3dproto = newInstance(W3DPrototypeClass)(rendobj, newname);	
+	W3DPrototypeClass *w3dproto = newInstance(W3DPrototypeClass)(rendobj, newname);
 	rendobj->Release_Ref();
 	Add_Prototype(w3dproto);
 
@@ -858,7 +852,7 @@ int W3DAssetManager::Recolor_Asset(RenderObjClass *robj, const int color)
 	if (TheGlobalData->m_headless)
 		return 0;
 
-	switch (robj->Class_ID())	{	
+	switch (robj->Class_ID())	{
 	case RenderObjClass::CLASSID_MESH:
 		return Recolor_Mesh(robj,color);
 		break;
@@ -881,7 +875,7 @@ int W3DAssetManager::Recolor_Mesh(RenderObjClass *robj, const int color)
 	int didRecolor=0;
 	const char *meshName;
 
-	MeshClass *mesh=(MeshClass*) robj;	
+	MeshClass *mesh=(MeshClass*) robj;
 	MeshModelClass * model = mesh->Get_Model();
 	MaterialInfoClass	*material = mesh->Get_Material_Info();
 
@@ -911,7 +905,7 @@ int W3DAssetManager::Recolor_Mesh(RenderObjClass *robj, const int color)
 		}
 	}
 
-	REF_PTR_RELEASE(material);	
+	REF_PTR_RELEASE(material);
 	REF_PTR_RELEASE(model);
 	return didRecolor;
 }
@@ -981,7 +975,7 @@ bool W3DAssetManager::Load_3D_Assets( const char * filename )
 
 	// Try to find an existing prototype
 	char basename[512];
-	strcpy(basename, filename);
+	strlcpy(basename, filename, ARRAY_SIZE(basename));
 	char *pext = strrchr(basename, '.');	//find file extension
 	if (pext)
 		*pext = '\0';	//drop the extension
@@ -1000,13 +994,13 @@ bool W3DAssetManager::Load_3D_Assets( const char * filename )
 
 	bool result = WW3DAssetManager::Load_3D_Assets(filename);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (result && TheGlobalData->m_preloadReport)
-	{	
+	{
 		//loading a new asset and app is requesting a log of all loaded assets.
 		FILE *logfile=fopen("PreloadedAssets.txt","a+");	//append to log
 		if (logfile)
-		{	
+		{
 			StringClass lower_case_name(filename,true);
 			_strlwr(lower_case_name.Peek_Buffer());
 			fprintf(logfile,"3D: %s\n",lower_case_name.str());
@@ -1075,7 +1069,7 @@ void W3DAssetManager::Make_HLOD_Unique(RenderObjClass *robj, Bool geometry, Bool
 */
 void W3DAssetManager::Make_Unique(RenderObjClass *robj, Bool geometry, Bool colors)
 {
-	switch (robj->Class_ID())	{	
+	switch (robj->Class_ID())	{
 	case RenderObjClass::CLASSID_MESH:
 		Make_Mesh_Unique(robj,geometry,colors);
 		break;
@@ -1132,14 +1126,14 @@ void W3DAssetManager::Make_Mesh_Unique(RenderObjClass *robj, Bool geometry, Bool
 		//Create unique data for this mesh
 		if (!geometry)	//scaling geometry automatically makes it unique so not needed here.
 			mesh->Make_Unique();
-		
+
 		MeshModelClass * model = mesh->Get_Model();
 
 		if (colors && isVertexColor)
 		{
 			MaterialInfoClass	*material=mesh->Get_Material_Info();
 			for (i=0; i<material->Vertex_Material_Count(); i++)
-				material->Peek_Vertex_Material(i)->Make_Unique();	
+				material->Peek_Vertex_Material(i)->Make_Unique();
 			REF_PTR_RELEASE(material);
 		}
 
@@ -1158,7 +1152,7 @@ void W3DAssetManager::Report_Used_Prototypes(void)
 		PrototypeClass * proto = Prototypes[count];
 		if (proto->Get_Class_ID() == RenderObjClass::CLASSID_HLOD || proto->Get_Class_ID() == RenderObjClass::CLASSID_MESH)
 		{
-			DEBUG_LOG(("**Unfreed Prototype On Map Reset: %s\n",proto->Get_Name()));
+			DEBUG_LOG(("**Unfreed Prototype On Map Reset: %s",proto->Get_Name()));
 		}
 	}
 }
@@ -1188,7 +1182,7 @@ void W3DAssetManager::Report_Used_FontChars(void)
 	{
 		if (FontCharsList[count]->Num_Refs() >= 1)
 		{
-			DEBUG_LOG(("**Unfreed FontChar On Map Reset: %s\n",FontCharsList[count]->Get_Name()));
+			DEBUG_LOG(("**Unfreed FontChar On Map Reset: %s",FontCharsList[count]->Get_Name()));
 			//FontCharsList[count]->Release_Ref();
 			//FontCharsList.Delete(count);
 		}
@@ -1224,7 +1218,7 @@ void W3DAssetManager::Report_Used_Textures(void)
 		}
 		else
 		{
-			DEBUG_LOG(("**Texture \"%s\" referenced %d times on map reset\n",tex->Get_Texture_Name(),tex->Num_Refs()-1));
+			DEBUG_LOG(("**Texture \"%s\" referenced %d times on map reset",tex->Get_Texture_Name().str(),tex->Num_Refs()-1));
 		}
 	}
 /*	for (unsigned i=0;i<count;++i) {
@@ -1251,7 +1245,7 @@ void W3DAssetManager::Report_Used_Font3DDatas( void )
 		}
 		else
 		{
-			DEBUG_LOG(("**Unfreed Font3DDatas On Map Reset: %s\n",font->Name));
+			DEBUG_LOG(("**Unfreed Font3DDatas On Map Reset: %s",font->Name));
 		}
 	}
 }
@@ -1276,7 +1270,7 @@ void W3DAssetManager::Make_Mesh_Unique(RenderObjClass *robj, Bool geometry, Bool
 		// make all vertex materials unique
 		MaterialInfoClass	*material = mesh->Get_Material_Info();
 		for (i=0; i<material->Vertex_Material_Count(); i++)
-			material->Peek_Vertex_Material(i)->Make_Unique();	
+			material->Peek_Vertex_Material(i)->Make_Unique();
 		REF_PTR_RELEASE(material);
 		// make all color arrays unique
 		model->Make_Color_Array_Unique(0);
@@ -1286,10 +1280,10 @@ void W3DAssetManager::Make_Mesh_Unique(RenderObjClass *robj, Bool geometry, Bool
 		// for the top mip level and then
 		// mip filter instead of converting all mip levels
 	}
-		
+
 	if (geometry)	{
-		// make geometry unique		
-		model->Make_Geometry_Unique();		
+		// make geometry unique
+		model->Make_Geometry_Unique();
 	}
 
 	REF_PTR_RELEASE(model);
@@ -1307,7 +1301,7 @@ void W3DAssetManager::Make_HLOD_Unique(RenderObjClass *robj, Bool geometry, Bool
 
 void W3DAssetManager::Make_Unique(RenderObjClass *robj, Bool geometry, Bool colors)
 {
-	switch (robj->Class_ID())	{	
+	switch (robj->Class_ID())	{
 	case RenderObjClass::CLASSID_MESH:
 		Make_Mesh_Unique(robj,geometry,colors);
 		break;
@@ -1320,7 +1314,7 @@ void W3DAssetManager::Make_Unique(RenderObjClass *robj, Bool geometry, Bool colo
 static inline void Munge_Render_Obj_Name(char *newname, const char *oldname, float scale, const Vector3 &hsv_shift)
 {
 	char lower_case_name[255];
-	strcpy(lower_case_name, oldname);
+	strlcpy(lower_case_name, oldname, ARRAY_SIZE(lower_case_name));
 	_strlwr(lower_case_name);
 	sprintf(newname,"#%s!%gH%gS%gV%g", lower_case_name, scale, hsv_shift.X, hsv_shift.Y, hsv_shift.Z);
 }
@@ -1328,7 +1322,7 @@ static inline void Munge_Render_Obj_Name(char *newname, const char *oldname, flo
 static inline void Munge_Texture_Name(char *newname, const char *oldname, const Vector3 &hsv_shift)
 {
 	char lower_case_name[255];
-	strcpy(lower_case_name, oldname);
+	strlcpy(lower_case_name, oldname, ARRAY_SIZE(lower_case_name));
 	_strlwr(lower_case_name);
 	sprintf(newname,"#%s!H%gS%gV%g", lower_case_name, hsv_shift.X, hsv_shift.Y, hsv_shift.Z);
 }
@@ -1351,7 +1345,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(const char * name,float scal
 
 	if (isGranny)
 	{	//Granny objects share the same prototype since they allow instance scaling.
-		strcpy(newname,name);	//use same name for all granny objects at any scale.
+		strlcpy(newname, name, ARRAY_SIZE(newname));	//use same name for all granny objects at any scale.
 	}
 	Set_WW3D_Load_On_Demand(false); // munged name will never be found in a file.
 	rendobj=WW3DAssetManager::Create_Render_Obj(newname);
@@ -1404,7 +1398,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(const char * name,float scal
 	if (proto == NULL) {
 		static int warning_count = 0;
 		if (++warning_count <= 20) {
-			WWDEBUG_SAY(("WARNING: Failed to create Render Object: %s\r\n",name));
+			WWDEBUG_SAY(("WARNING: Failed to create Render Object: %s",name));
 		}
 		return NULL;		// Failed to find a prototype
 	}
@@ -1412,7 +1406,7 @@ RenderObjClass * W3DAssetManager::Create_Render_Obj(const char * name,float scal
 	rendobj=proto->Create();
 
 	if (!rendobj) return NULL;
-	
+
 	if (!isGranny)
 	{	Make_Unique(rendobj,reallyscale,reallyhsv_shift);
 		if (reallyscale) rendobj->Scale(scale);
@@ -1454,10 +1448,10 @@ TextureClass * W3DAssetManager::Get_Texture_With_HSV_Shift(const char * filename
 		TextureClass *newtex = Find_Texture(filename, hsv_shift);
 
 		if (!newtex) {
-		
+
 			// No cached texture - need to create
 			char lower_case_name[255];
-			strcpy(lower_case_name, filename);
+			strlcpy(lower_case_name, filename, ARRAY_SIZE(lower_case_name));
 			_strlwr(lower_case_name);
 			TextureClass *oldtex = TextureHash.Get(lower_case_name);
 			if (!oldtex) {
@@ -1503,8 +1497,8 @@ void W3DAssetManager::Recolor_Vertex_Material(VertexMaterialClass *vmat, const V
 
 void W3DAssetManager::Recolor_Vertices(unsigned int *color, int count, const Vector3 &hsv_shift)
 {
-	int i;	
-	Vector4 rgba;	
+	int i;
+	Vector4 rgba;
 
 	for (i=0; i<count; i++)
 	{
@@ -1516,7 +1510,7 @@ void W3DAssetManager::Recolor_Vertices(unsigned int *color, int count, const Vec
 
 TextureClass * W3DAssetManager::Recolor_Texture(TextureClass *texture, const Vector3 &hsv_shift)
 {
-	const char *name=texture->Get_Texture_Name();	
+	const char *name=texture->Get_Texture_Name();
 
 	TextureClass *newtex = Find_Texture(name, hsv_shift);
 	if (newtex) {
@@ -1528,21 +1522,21 @@ TextureClass * W3DAssetManager::Recolor_Texture(TextureClass *texture, const Vec
 
 TextureClass * W3DAssetManager::Recolor_Texture_One_Time(TextureClass *texture, const Vector3 &hsv_shift)
 {
-	const char *name=texture->Get_Texture_Name();	
+	const char *name=texture->Get_Texture_Name();
 
 	// if texture is procedural return NULL
 	if (name && name[0]=='!') return NULL;
 
 	// make sure texture is loaded
-	if (!texture->Is_Initialized())	
+	if (!texture->Is_Initialized())
 		TextureLoader::Request_High_Priority_Loading(texture, (TextureClass::MipCountType)texture->Get_Mip_Level_Count());
 
 	SurfaceClass::SurfaceDescription desc;
 	SurfaceClass *newsurf, *oldsurf, *smallsurf;
-	texture->Get_Level_Description(desc);		
+	texture->Get_Level_Description(desc);
 
 	// if texture is monochrome and no value shifting
-	// return NULL	
+	// return NULL
 	smallsurf=texture->Get_Surface_Level((TextureClass::MipCountType)texture->Get_Mip_Level_Count()-1);
 	if (hsv_shift.Z==0.0f && smallsurf->Is_Monochrome())
 	{
@@ -1563,7 +1557,7 @@ TextureClass * W3DAssetManager::Recolor_Texture_One_Time(TextureClass *texture,
 	newtex->Set_U_Addr_Mode(texture->Get_U_Addr_Mode());
 	newtex->Set_V_Addr_Mode(texture->Get_V_Addr_Mode());
 
-	char newname[512];	
+	char newname[512];
 	Munge_Texture_Name(newname, name, hsv_shift);
 	newtex->Set_Texture_Name(newname);
 
@@ -1578,7 +1572,7 @@ TextureClass * W3DAssetManager::Recolor_Texture_One_Time(TextureClass *texture,
 
 TextureClass * W3DAssetManager::Find_Texture(const char * name, const Vector3 &hsv_shift)
 {
-	char newname[512];	
+	char newname[512];
 	Munge_Texture_Name(newname, name, hsv_shift);
 
 	// see if we have a cached copy
@@ -1593,13 +1587,13 @@ void W3DAssetManager::Recolor_Mesh(RenderObjClass *robj, const Vector3 &hsv_shif
 {
 	int i;
 
-	MeshClass *mesh=(MeshClass*) robj;	
+	MeshClass *mesh=(MeshClass*) robj;
 	MeshModelClass * model = mesh->Get_Model();
 	MaterialInfoClass	*material = mesh->Get_Material_Info();
 
 	// recolor vertex material
 	for (i=0; i<material->Vertex_Material_Count(); i++)
-			Recolor_Vertex_Material(material->Peek_Vertex_Material(i),hsv_shift);	
+			Recolor_Vertex_Material(material->Peek_Vertex_Material(i),hsv_shift);
 
 	// recolor color arrays
 	unsigned int * color;
@@ -1623,7 +1617,7 @@ void W3DAssetManager::Recolor_Mesh(RenderObjClass *robj, const Vector3 &hsv_shif
 		}
 	}
 
-	REF_PTR_RELEASE(material);	
+	REF_PTR_RELEASE(material);
 	REF_PTR_RELEASE(model);
 }
 
@@ -1666,7 +1660,7 @@ void W3DAssetManager::Recolor_ParticleEmitter(RenderObjClass *robj, const Vector
 
 void W3DAssetManager::Recolor_Asset(RenderObjClass *robj, const Vector3 &hsv_shift)
 {
-	switch (robj->Class_ID())	{	
+	switch (robj->Class_ID())	{
 	case RenderObjClass::CLASSID_MESH:
 		Recolor_Mesh(robj,hsv_shift);
 		break;
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp
index ea72669b7a9..f9951feac90 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBibBuffer.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DBibBuffer.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,12 +43,10 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/W3DBibBuffer.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include "Common/GlobalData.h"
@@ -63,7 +61,7 @@
 #include "WW3D2/meshmdl.h"
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 // A W3D shader that does alpha, texturing, tests zbuffer, doesn't update zbuffer.
 #define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_ALWAYS, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
@@ -75,7 +73,7 @@ static ShaderClass detailAlphaShader(SC_ALPHA_DETAIL);
 
 
 //-----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //-----------------------------------------------------------------------------
 
 
@@ -99,7 +97,7 @@ void W3DBibBuffer::loadBibsInVertexAndIndexBuffers(void)
 	m_curNumNormalBibVertex = 0;
 
 	if (m_numBibs==0) {
-		return;	
+		return;
 	}
 
 	VertexFormatXYZDUV1 *vb;
@@ -133,9 +131,9 @@ void W3DBibBuffer::loadBibsInVertexAndIndexBuffers(void)
 
 	Int diffuse = (REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16) | (255 << 24));
 	Int doHighlight;
-	for (doHighlight=0; doHighlight<=1; doHighlight++) 
+	for (doHighlight=0; doHighlight<=1; doHighlight++)
 	{
-		if (doHighlight==1) 
+		if (doHighlight==1)
 		{
 			m_curNumNormalBibIndices = m_curNumBibIndices;
 			m_curNumNormalBibVertex = m_curNumBibVertices;
@@ -156,8 +154,8 @@ void W3DBibBuffer::loadBibsInVertexAndIndexBuffers(void)
 
 			for (i=0; i<numVertex; i++) {
 
-				// Update the uv values.  The W3D models each have their own texture, and 
-				// we use one texture with all images in one, so we have to change the uvs to 
+				// Update the uv values.  The W3D models each have their own texture, and
+				// we use one texture with all images in one, so we have to change the uvs to
 				// match.
 				Real U, V;
 				Vector3 vLoc=m_bibs[curBib].m_corners[i];
@@ -180,7 +178,7 @@ void W3DBibBuffer::loadBibsInVertexAndIndexBuffers(void)
 				curVb->v1 = V;
 				curVb->x = vLoc.X;
 				curVb->y = vLoc.Y;
-				curVb->z = vLoc.Z;	 
+				curVb->z = vLoc.Z;
 				curVb->diffuse = diffuse;
 				curVb++;
 				m_curNumBibVertices++;
@@ -193,12 +191,12 @@ void W3DBibBuffer::loadBibsInVertexAndIndexBuffers(void)
 			*curIb++ = startVertex + 2;
 			*curIb++ = startVertex + 3;
 			m_curNumBibIndices+=6;
-		}		
+		}
 	}
 }
 
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -320,7 +318,7 @@ void W3DBibBuffer::addBib(Vector3 corners[4], ObjectID id, Bool highlight)
 	}
 	if (bibIndex==m_numBibs) {
 		if (m_numBibs >= MAX_BIBS) {
-			return;  
+			return;
 		}
 		m_numBibs++;
 	}
@@ -358,7 +356,7 @@ void W3DBibBuffer::addBibDrawable(Vector3 corners[4], DrawableID id, Bool highli
 	}
 	if (bibIndex==m_numBibs) {
 		if (m_numBibs >= MAX_BIBS) {
-			return;  
+			return;
 		}
 		m_numBibs++;
 	}
@@ -434,7 +432,7 @@ void W3DBibBuffer::renderBibs()
 	}
 	if (m_curNumBibIndices>m_curNumNormalBibIndices) {
 		DX8Wrapper::Set_Texture(0,m_highlightBibTexture);
-		DX8Wrapper::Draw_Triangles(	m_curNumNormalBibIndices, (m_curNumBibIndices-m_curNumNormalBibIndices)/3, 
+		DX8Wrapper::Draw_Triangles(	m_curNumNormalBibIndices, (m_curNumBibIndices-m_curNumNormalBibIndices)/3,
 						m_curNumNormalBibVertex,	m_curNumBibVertices-m_curNumNormalBibVertex);
 	}
 }
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
index aaf0378b3dd..655f5e484dd 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DBridgeBuffer.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,12 +43,10 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/W3DBridgeBuffer.h"
 
-#include <stdio.h>
-#include <string.h>
 #include "W3DDevice/GameClient/W3DAssetManager.h"
 #include <texture.h>
 #include "Common/GlobalData.h"
@@ -72,14 +70,9 @@
 #include "WW3D2/meshmdl.h"
 #include "WW3D2/scene.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 // A W3D shader that does alpha, texturing, tests zbuffer, doesn't update zbuffer.
 #define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
@@ -100,7 +93,7 @@ static ShaderClass detailShader(SC_ALPHA_MIRROR);
 #define NO_USE_BRIDGE_NORMALS
 
 //-----------------------------------------------------------------------------
-//         Private Classes                                               
+//         Private Classes
 //-----------------------------------------------------------------------------
 //=============================================================================
 // W3DBridge constructor.
@@ -164,7 +157,7 @@ void W3DBridge::clearBridge(void)
 //=============================================================================
 Bool W3DBridge::cullBridge(CameraClass * camera)
 {
-	///@todo - cull bridges. 
+	///@todo - cull bridges.
 	Bool wasVisible = m_visible;
 
 	m_visible = true;
@@ -191,10 +184,10 @@ void W3DBridge::init(Vector3 fromLoc, Vector3 toLoc, AsciiString bridgeTemplateN
 //=============================================================================
 // W3DBridge::init
 //=============================================================================
-/** Loads a bridge model(if not already loaded) and gets meshes for use at 
+/** Loads a bridge model(if not already loaded) and gets meshes for use at
 specified location.  */
 //=============================================================================
-Bool W3DBridge::load(enum BodyDamageType curDamageState)
+Bool W3DBridge::load(BodyDamageType curDamageState)
 {
 	REF_PTR_RELEASE(m_bridgeTexture);
 	REF_PTR_RELEASE(m_leftMesh);
@@ -219,20 +212,20 @@ Bool W3DBridge::load(enum BodyDamageType curDamageState)
 		default: return false;
 
 		case 	BODY_PRISTINE:
-			strcpy( textureFile, bridge->getTexture().str() );
-			strcpy( modelName, bridge->getBridgeModel().str() );
+			strlcpy(textureFile, bridge->getTexture().str(), ARRAY_SIZE(textureFile));
+			strlcpy(modelName, bridge->getBridgeModel().str(), ARRAY_SIZE(modelName));
 			break;
 		case BODY_DAMAGED:
-			strcpy( textureFile, bridge->getTextureDamaged().str() );
-			strcpy( modelName, bridge->getBridgeModelNameDamaged().str() );
+			strlcpy(textureFile, bridge->getTextureDamaged().str(), ARRAY_SIZE(textureFile));
+			strlcpy(modelName, bridge->getBridgeModelNameDamaged().str(), ARRAY_SIZE(modelName));
 			break;
 		case BODY_REALLYDAMAGED:
-			strcpy( textureFile, bridge->getTextureReallyDamaged().str() );
-			strcpy( modelName, bridge->getBridgeModelNameReallyDamaged().str() );
+			strlcpy(textureFile, bridge->getTextureReallyDamaged().str(), ARRAY_SIZE(textureFile));
+			strlcpy(modelName, bridge->getBridgeModelNameReallyDamaged().str(), ARRAY_SIZE(modelName));
 			break;
 		case BODY_RUBBLE:
-			strcpy( textureFile, bridge->getTextureBroken().str() );
-			strcpy( modelName, bridge->getBridgeModelNameBroken().str() );
+			strlcpy(textureFile, bridge->getTextureBroken().str(), ARRAY_SIZE(textureFile));
+			strlcpy(modelName, bridge->getBridgeModelNameBroken().str(), ARRAY_SIZE(modelName));
 			break;
 	}
 
@@ -241,14 +234,17 @@ Bool W3DBridge::load(enum BodyDamageType curDamageState)
 	char section[_MAX_PATH];
 	char right[_MAX_PATH];
 
+	static_assert(ARRAY_SIZE(left) >= ARRAY_SIZE(modelName), "Incorrect array size");
+	static_assert(ARRAY_SIZE(section) >= ARRAY_SIZE(modelName), "Incorrect array size");
+	static_assert(ARRAY_SIZE(right) >= ARRAY_SIZE(modelName), "Incorrect array size");
 	strcpy(left, modelName);
-	strcat(left, ".BRIDGE_LEFT");
+	strlcat(left, ".BRIDGE_LEFT", ARRAY_SIZE(left));
 	strcpy(section, modelName);
-	strcat(section, ".BRIDGE_SPAN");
+	strlcat(section, ".BRIDGE_SPAN", ARRAY_SIZE(section));
 	strcpy(right, modelName);
-	strcat(right, ".BRIDGE_RIGHT");
+	strlcat(right, ".BRIDGE_RIGHT", ARRAY_SIZE(right));
 
-	m_bridgeTexture = pMgr->Get_Texture(textureFile,  MIP_LEVELS_3); 
+	m_bridgeTexture = pMgr->Get_Texture(textureFile,  MIP_LEVELS_3);
 	m_leftMtx.Make_Identity();
 	m_rightMtx.Make_Identity();
 	m_sectionMtx.Make_Identity();
@@ -261,18 +257,18 @@ Bool W3DBridge::load(enum BodyDamageType curDamageState)
 		Matrix3D mtx = pSub->Get_Transform();
 		if (0==strnicmp(left, pSub->Get_Name(), strlen(left))) {
 			m_leftMtx = mtx;
-			strcpy(left, pSub->Get_Name());
+			strlcpy(left, pSub->Get_Name(), ARRAY_SIZE(left));
 		}
 		if (0==strnicmp(section, pSub->Get_Name(), strlen(section))) {
 			m_sectionMtx = mtx;
-			strcpy(section, pSub->Get_Name());
+			strlcpy(section, pSub->Get_Name(), ARRAY_SIZE(section));
 		}
 		if (0==strnicmp(right, pSub->Get_Name(), strlen(right))) {
 			m_rightMtx = mtx;
-			strcpy(right, pSub->Get_Name());
+			strlcpy(right, pSub->Get_Name(), ARRAY_SIZE(right));
 		}
 		REF_PTR_RELEASE(pSub);
-		//DEBUG_LOG(("Sub obj name %s\n", pSub->Get_Name()));
+		//DEBUG_LOG(("Sub obj name %s", pSub->Get_Name()));
 	}
 
 	REF_PTR_RELEASE(pObj);
@@ -405,11 +401,11 @@ void W3DBridge::getBridgeInfo(BridgeInfo *pInfo)
 /** Gets the vertex values for a section of a bridge.  */
 //=============================================================================
 Int W3DBridge::getModelVertices(VertexFormatXYZNDUV1 *destination_vb, Int curVertex, Real xOffset,
-																Vector3 &vec, Vector3 &vecNormal, Vector3 &vecZ, Vector3 &offset, 
-																const Matrix3D &mtx, 
+																Vector3 &vec, Vector3 &vecNormal, Vector3 &vecZ, Vector3 &offset,
+																const Matrix3D &mtx,
 																MeshClass *pMesh, RefRenderObjListIterator *pLightsIterator)
 {
-	if (pMesh == NULL) 
+	if (pMesh == NULL)
 		return(0);
 
 	Int i;
@@ -445,12 +441,12 @@ Int W3DBridge::getModelVertices(VertexFormatXYZNDUV1 *destination_vb, Int curVer
 
 		vLoc.X += m_start.X;
 		vLoc.Y += m_start.Y;
-		vLoc.Z += m_start.Z; 
+		vLoc.Z += m_start.Z;
 
 		curVb->x = vLoc.X;
 		curVb->y = vLoc.Y;
 		curVb->z = vLoc.Z;
-		
+
 		VERTEX_FORMAT vb;
 		vb.x = vLoc.X;
 		vb.y = vLoc.Y;
@@ -465,7 +461,7 @@ Int W3DBridge::getModelVertices(VertexFormatXYZNDUV1 *destination_vb, Int curVer
 		curVb->diffuse = 0xFF000000;
 #else
 		normal = (normal.X) * vec + normal.Y*vecNormal + normal.Z*vecZ;
-		normal.Normalize();	
+		normal.Normalize();
 		TheTerrainRenderObject->doTheLight(&vb, lightRay, &normal, NULL, 1.0f);
 		curVb->nx = 0;	//will these to keep AGP write buffer happy.
 		curVb->ny = 0;
@@ -484,10 +480,10 @@ Int W3DBridge::getModelVertices(VertexFormatXYZNDUV1 *destination_vb, Int curVer
 //=============================================================================
 /** Gets the vertex values for a section of a fixed bridge.  */
 //=============================================================================
-Int W3DBridge::getModelVerticesFixed(VertexFormatXYZNDUV1 *destination_vb, Int curVertex, 
+Int W3DBridge::getModelVerticesFixed(VertexFormatXYZNDUV1 *destination_vb, Int curVertex,
 																const Matrix3D &mtx, MeshClass *pMesh, RefRenderObjListIterator *pLightsIterator)
 {
-	if (pMesh == NULL) 
+	if (pMesh == NULL)
 		return(0);
 
 	Vector3 vec = m_end - m_start;
@@ -512,7 +508,7 @@ Int W3DBridge::getModelVerticesFixed(VertexFormatXYZNDUV1 *destination_vb, Int c
 //=============================================================================
 /** Gets the index values and vertex values for a bridge.  */
 //=============================================================================
-void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatXYZNDUV1 *destination_vb, 
+void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatXYZNDUV1 *destination_vb,
 																		Int *curIndexP, Int *curVertexP, RefRenderObjListIterator *pLightsIterator)
 {
 	Int numI;
@@ -525,13 +521,13 @@ void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatX
 		numV = getModelVerticesFixed(destination_vb, *curVertexP, m_leftMtx, m_leftMesh, pLightsIterator);
 		if (!numV)
 		{	//not enough room for vertices
-			DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.\n") );
+			DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.") );
 			return;
 		}
 		numI = getModelIndices( destination_ib, *curIndexP, *curVertexP, m_leftMesh);
 		if (!numI)
 		{	//not enough room for indices
-			DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.\n") );
+			DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.") );
 			return;
 		}
 		*curIndexP += numI;
@@ -558,7 +554,7 @@ void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatX
 	Vector3 vecZ(-deltaZ, 0, deltaX);
 	vecZ *= m_scale;
 
-	Real spanLength = m_rightMinX - m_leftMaxX; 
+	Real spanLength = m_rightMinX - m_leftMaxX;
 	Int numSpans = 1;
 	if (m_bridgeType != FIXED_BRIDGE) {
 		Real spannable = desiredLength - (m_length-spanLength);
@@ -568,20 +564,20 @@ void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatX
 
 	Real bridgeLength = m_length + (numSpans-1)*spanLength;
 	Real xOffset = -m_leftMinX;
-	
+
 	// Draw the left end.
 	vec /= bridgeLength;
-	numV = getModelVertices(destination_vb, *curVertexP, xOffset, vec, vecNormal, vecZ, m_start, 
+	numV = getModelVertices(destination_vb, *curVertexP, xOffset, vec, vecNormal, vecZ, m_start,
 		m_leftMtx, m_leftMesh, pLightsIterator);
 	if (!numV)
 	{	//not enough room for vertices
-		DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.\n") );
+		DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.") );
 		return;
 	}
 	numI = getModelIndices( destination_ib, *curIndexP, *curVertexP, m_leftMesh);
 	if (!numI)
 	{	//not enough room for indices
-		DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.\n") );
+		DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.") );
 		return;
 	}
 	*curIndexP += numI;
@@ -592,17 +588,17 @@ void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatX
 	Int i;
 	// draw the spans.
 	for (i=0; i<numSpans; i++) {
-		numV = getModelVertices(destination_vb, *curVertexP, xOffset+i*spanLength, vec, vecNormal, vecZ, m_start, 
+		numV = getModelVertices(destination_vb, *curVertexP, xOffset+i*spanLength, vec, vecNormal, vecZ, m_start,
 			m_sectionMtx, m_sectionMesh, pLightsIterator);
 		if (!numV)
 		{	//not enough room for vertices
-			DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.\n") );
+			DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.") );
 			return;
 		}
 		numI = getModelIndices( destination_ib, *curIndexP, *curVertexP, m_sectionMesh);
 		if (!numI)
 		{	//not enough room for indices
-			DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.\n") );
+			DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.") );
 			return;
 		}
 		*curIndexP += numI;
@@ -610,19 +606,19 @@ void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatX
 		m_numVertex += numV;
 		m_numPolygons += numI/3;
 	}
-		
+
 	// Draw the right end.
 	numV = getModelVertices(destination_vb, *curVertexP, xOffset+(numSpans-1)*spanLength, vec, vecNormal, vecZ, m_start,
 		m_rightMtx, m_rightMesh, pLightsIterator);
 	if (!numV)
 	{	//not enough room for vertices
-		DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.\n") );
+		DEBUG_ASSERTCRASH( numV, ("W3DBridge::GetIndicesNVertices(). Vertex overflow.") );
 		return;
 	}
 	numI = getModelIndices( destination_ib, *curIndexP, *curVertexP, m_rightMesh);
 	if (!numI)
 	{	//not enough room for indices
-		DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.\n") );
+		DEBUG_ASSERTCRASH( numI, ("W3DBridge::GetIndicesNVertices(). Index overflow.") );
 		return;
 	}
 	*curIndexP += numI;
@@ -639,7 +635,7 @@ void W3DBridge::getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatX
 //=============================================================================
 Int W3DBridge::getModelIndices(UnsignedShort *destination_ib, Int curIndex, Int vertexOffset, MeshClass *pMesh)
 {
-	if (pMesh == NULL) 
+	if (pMesh == NULL)
 		return(0);
 	Int numPoly = pMesh->Peek_Model()->Get_Polygon_Count();
 	const TriIndex *pPoly =pMesh->Peek_Model()->Get_Polygon_Array();
@@ -657,7 +653,7 @@ Int W3DBridge::getModelIndices(UnsignedShort *destination_ib, Int curIndex, Int
 }
 
 //-----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //-----------------------------------------------------------------------------
 
 ///@todo - Sort bridges by texture for better performance.
@@ -709,13 +705,13 @@ void W3DBridgeBuffer::loadBridgesInVertexAndIndexBuffers(RefRenderObjListIterato
 	Int curBridge;
 
 	for (curBridge=0; curBridge<m_numBridges; curBridge++) {
-		m_bridges[curBridge].getIndicesNVertices(ib, vb, &m_curNumBridgeIndices, 
+		m_bridges[curBridge].getIndicesNVertices(ib, vb, &m_curNumBridgeIndices,
 			&m_curNumBridgeVertices, pLightsIterator);
 	}
 }
 
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -776,7 +772,7 @@ void W3DBridgeBuffer::allocateBridgeBuffers(void)
 #ifdef USE_BRIDGE_NORMALS
 	m_vertexMaterial= NEW VertexMaterialClass();
 	m_vertexMaterial->Set_Shininess(0.0);
-	m_vertexMaterial->Set_Ambient(1,1,1);		  
+	m_vertexMaterial->Set_Ambient(1,1,1);
 	m_vertexMaterial->Set_Diffuse(1,1,1);
 	m_vertexMaterial->Set_Specular(0,0,0);
 	m_vertexMaterial->Set_Emissive(0,0,0);
@@ -819,7 +815,7 @@ void W3DBridgeBuffer::loadBridges(W3DTerrainLogic *pTerrainLogic, Bool saveGame)
 		if (pMapObj->getFlag(FLAG_BRIDGE_POINT1)) {
 			pMapObj2 = pMapObj->getNext();
 			if ( !pMapObj2 || !pMapObj2->getFlag(FLAG_BRIDGE_POINT2)) {
-				DEBUG_LOG(("Missing second bridge point.  Ignoring first.\n"));
+				DEBUG_LOG(("Missing second bridge point.  Ignoring first."));
 			}
 			if (pMapObj2==NULL) break;
 			if (!pMapObj2->getFlag(FLAG_BRIDGE_POINT2)) continue;
@@ -830,7 +826,7 @@ void W3DBridgeBuffer::loadBridges(W3DTerrainLogic *pTerrainLogic, Bool saveGame)
 			to.Z = TheTerrainRenderObject->getHeightMapHeight(to.X, to.Y, NULL) + BRIDGE_FLOAT_AMT;
 			addBridge(from, to, pMapObj->getName(), pTerrainLogic, pMapObj->getProperties());
 			pMapObj = pMapObj2;
-		} 
+		}
 	}
 	if (pTerrainLogic) {
 		pTerrainLogic->updateBridgeDamageStates();
@@ -841,22 +837,22 @@ void W3DBridgeBuffer::loadBridges(W3DTerrainLogic *pTerrainLogic, Bool saveGame)
 //=============================================================================
 static RenderObjClass* createTower( SimpleSceneClass *scene,
 																		W3DAssetManager *assetManager,
-																		MapObject *mapObject, 
-																	  BridgeTowerType type, 
+																		MapObject *mapObject,
+																	  BridgeTowerType type,
 																	  BridgeInfo *bridgeInfo )
 {
 	RenderObjClass* tower = NULL;
 
 	// sanity
 	if( scene == NULL ||
-			assetManager == NULL || 
-			mapObject == NULL || 
-			bridgeInfo == NULL || 
+			assetManager == NULL ||
+			mapObject == NULL ||
+			bridgeInfo == NULL ||
 			type < 0 || type >= BRIDGE_MAX_TOWERS )
 		return NULL;
 
 	// get template for this bridge
-	DEBUG_ASSERTCRASH( TheTerrainRoads, ("createTower: TheTerrainRoads is NULL\n") );
+	DEBUG_ASSERTCRASH( TheTerrainRoads, ("createTower: TheTerrainRoads is NULL") );
 	TerrainRoadType *bridgeTemplate = TheTerrainRoads->findBridge( mapObject->getName() );
 	if( bridgeTemplate == NULL )
 		return NULL;
@@ -872,19 +868,19 @@ static RenderObjClass* createTower( SimpleSceneClass *scene,
 		case BRIDGE_TOWER_TO_RIGHT:		towerPos = bridgeInfo->toRight;			break;
 		default: return NULL;
 
-	}  // end switch
+	}
 
 	// set the Z position to that of the terrain
 	towerPos.z = TheTerrainRenderObject->getHeightMapHeight( towerPos.x, towerPos.y, NULL);
 
 	// find the thing template for the tower we want to construct
 	AsciiString towerTemplateName = bridgeTemplate->getTowerObjectName( type );
-	DEBUG_ASSERTCRASH( TheThingFactory, ("createTower: TheThingFactory is NULL\n") );
+	DEBUG_ASSERTCRASH( TheThingFactory, ("createTower: TheThingFactory is NULL") );
 	const ThingTemplate *towerTemplate = TheThingFactory->findTemplate( towerTemplateName );
 	if( towerTemplate == NULL )
 		return NULL;
-		
-	// find the name of the render object to show	
+
+	// find the name of the render object to show
 	const ModuleInfo& mi = towerTemplate->getDrawModuleInfo( );
 	if( mi.getCount() <= 0 )
 		return NULL;
@@ -924,8 +920,8 @@ static RenderObjClass* createTower( SimpleSceneClass *scene,
 
 //=============================================================================
 //=============================================================================
-static void updateTowerPos( RenderObjClass* tower, 
-														BridgeTowerType type, 
+static void updateTowerPos( RenderObjClass* tower,
+														BridgeTowerType type,
 														BridgeInfo* bridgeInfo )
 {
 
@@ -957,7 +953,7 @@ static void updateTowerPos( RenderObjClass* tower,
 		case BRIDGE_TOWER_TO_RIGHT:		towerPos = bridgeInfo->toRight;			break;
 		default: return;
 
-	}  // end switch
+	}
 
 	// set the position of the tower render object to the position in the world
 	Matrix3D transform;
@@ -984,19 +980,19 @@ void W3DBridgeBuffer::worldBuilderUpdateBridgeTowers( W3DAssetManager *assetMana
 	MapObject *pMapObj;
 	MapObject *pMapObj2;
 
-	for( pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext() ) 
+	for( pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext() )
 	{
 
-		if( pMapObj->getFlag( FLAG_BRIDGE_POINT1 ) ) 
+		if( pMapObj->getFlag( FLAG_BRIDGE_POINT1 ) )
 		{
 
 			pMapObj2 = pMapObj->getNext();
-			if( !pMapObj2 || !pMapObj2->getFlag( FLAG_BRIDGE_POINT2 ) ) 
-				DEBUG_LOG(("Missing second bridge point.  Ignoring first.\n"));
+			if( !pMapObj2 || !pMapObj2->getFlag( FLAG_BRIDGE_POINT2 ) )
+				DEBUG_LOG(("Missing second bridge point.  Ignoring first."));
 
-			if( pMapObj2 == NULL ) 
+			if( pMapObj2 == NULL )
 				break;
-			if( !pMapObj2->getFlag( FLAG_BRIDGE_POINT2 ) ) 
+			if( !pMapObj2->getFlag( FLAG_BRIDGE_POINT2 ) )
 				continue;
 
 			//
@@ -1010,7 +1006,7 @@ void W3DBridgeBuffer::worldBuilderUpdateBridgeTowers( W3DAssetManager *assetMana
 				// find the bridge with the matching name and position ... note we're just matching
 				// (x,y) here cause name and location (without the additional complication of Z) is
 				// really all we have to match bridges.
-				/// @todo integrate the editor with the game ... will never happen tho ... 
+				/// @todo integrate the editor with the game ... will never happen tho ...
 				//
 				if( m_bridges[ i ].getTemplateName() == pMapObj->getName() &&
 						m_bridges[ i ].getStart()->X == pMapObj->getLocation()->x &&
@@ -1038,12 +1034,12 @@ void W3DBridgeBuffer::worldBuilderUpdateBridgeTowers( W3DAssetManager *assetMana
 							towerRenderObj = createTower( scene, assetManager, pMapObj, (BridgeTowerType)j, &bridgeInfo );
 							created = TRUE;
 
-						}  // end if
+						}
 
 						// sanity
-						DEBUG_ASSERTCRASH( towerRenderObj != NULL, ("worldBuilderUpdateBridgeTowers: unable to create tower for bridge '%s'\n",
+						DEBUG_ASSERTCRASH( towerRenderObj != NULL, ("worldBuilderUpdateBridgeTowers: unable to create tower for bridge '%s'",
 															 m_bridges[ i ].getTemplateName().str()) );
-															  
+
 						// update the position of the towers
 						updateTowerPos( towerRenderObj, (BridgeTowerType)j, &bridgeInfo );
 
@@ -1051,16 +1047,16 @@ void W3DBridgeBuffer::worldBuilderUpdateBridgeTowers( W3DAssetManager *assetMana
 						if( created )
 							REF_PTR_RELEASE( towerRenderObj );
 
-					}  // end for j
+					}
 
-				}  // end if
+				}
 
-			}  // end for i
+			}
 
 			// skip the 2nd map object representing the second half of the bridgef
 			pMapObj = pMapObj2;
 
-		} 
+		}
 
 	}
 
@@ -1074,11 +1070,11 @@ void W3DBridgeBuffer::worldBuilderUpdateBridgeTowers( W3DAssetManager *assetMana
 void W3DBridgeBuffer::addBridge(Vector3 fromLoc, Vector3 toLoc, AsciiString name, W3DTerrainLogic *pTerrainLogic, Dict *props)
 {
 	if (m_numBridges >= MAX_BRIDGES) {
-		return;  
+		return;
 	}
 
 	if (!m_initialized) {
-		return;  
+		return;
 	}
 	m_bridges[m_numBridges].init(fromLoc, toLoc, name);
 	if (m_bridges[m_numBridges].load(BODY_PRISTINE)) {
@@ -1131,7 +1127,7 @@ void W3DBridgeBuffer::drawBridges(CameraClass * camera, Bool wireframe, TextureC
 			m_bridges[info.bridgeIndex].setEnabled(true);
 			if (m_bridges[info.bridgeIndex].getDamageState() != info.curDamageState) {
 				changed = true;
-				enum BodyDamageType curState = m_bridges[info.bridgeIndex].getDamageState();
+				BodyDamageType curState = m_bridges[info.bridgeIndex].getDamageState();
 				m_bridges[info.bridgeIndex].setDamageState(info.curDamageState);
 				if (!m_bridges[info.bridgeIndex].load(info.curDamageState)) {
 					// put the old model back.
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp
index d5d22ec686c..3c259eedf5a 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DCustomEdging.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DCustomEdging.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,12 +43,10 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/W3DCustomEdging.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include "Common/GlobalData.h"
@@ -63,7 +61,7 @@
 #include "WW3D2/meshmdl.h"
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 // A W3D shader that does alpha, texturing, tests zbuffer, doesn't update zbuffer.
 #define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
@@ -95,7 +93,7 @@ static ShaderClass detailOpaqueShader(SC_DETAIL_BLEND);
 
 static ShaderClass mirrorAlphaShader(SC_ALPHA_DETAIL);
 
-// ShaderClass::PASS_ALWAYS, 
+// ShaderClass::PASS_ALWAYS,
 
 #define SC_ALPHA_2D ( SHADE_CNST(PASS_ALWAYS, DEPTH_WRITE_DISABLE, COLOR_WRITE_ENABLE, \
 	SRCBLEND_SRC_ALPHA, DSTBLEND_ONE_MINUS_SRC_ALPHA, FOG_DISABLE, GRADIENT_DISABLE, \
@@ -104,7 +102,7 @@ static ShaderClass mirrorAlphaShader(SC_ALPHA_DETAIL);
 ShaderClass ShaderClass::_PresetAlpha2DShader(SC_ALPHA_2D);
 */
 //-----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -219,9 +217,9 @@ void W3DCustomEdging::loadEdgingsInVertexAndIndexBuffers(WorldHeightMap *pMap, I
 
 					Int diffuse = TheTerrainRenderObject->getStaticDiffuse(column+i, row+j);
 					curVb->diffuse = 0x80000000 + (diffuse&0x00FFFFFF); // set alpha to 5b.
-					Real theZ; 
+					Real theZ;
 					theZ = ((float)pMap->getDataPtr()[cellNdx])*MAP_HEIGHT_SCALE;
-					Real X = (column+i)*MAP_XY_FACTOR; 
+					Real X = (column+i)*MAP_XY_FACTOR;
 					Real Y = (row+j)*MAP_XY_FACTOR;
 					curVb->u2 = uOffset + i*0.25f*range.width();
 					curVb->v2 = vOffset + (1-j)*0.25f*range.height();
@@ -247,8 +245,8 @@ void W3DCustomEdging::loadEdgingsInVertexAndIndexBuffers(WorldHeightMap *pMap, I
  				*curIb++ = startVertex + 1;
  				*curIb++ = startVertex + 1+yOffset;
 				*curIb++ = startVertex + yOffset;
-			}	
-			else 
+			}
+			else
 #endif
 			{
 				*curIb++ = startVertex;
@@ -265,7 +263,7 @@ void W3DCustomEdging::loadEdgingsInVertexAndIndexBuffers(WorldHeightMap *pMap, I
 }
 
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -327,7 +325,7 @@ void W3DCustomEdging::allocateEdgingBuffers(void)
 //=============================================================================
 void W3DCustomEdging::clearAllEdging(void)
 {
-	m_curNumEdgingVertices=0;				  
+	m_curNumEdgingVertices=0;
 	m_curNumEdgingIndices=0;
 	m_anythingChanged = true;
 }
@@ -340,8 +338,8 @@ void W3DCustomEdging::clearAllEdging(void)
 //=============================================================================
 /** Draws the trees.  Uses camera to cull. */
 //=============================================================================
-void W3DCustomEdging::drawEdging(WorldHeightMap *pMap, Int minX, Int maxX, Int minY, Int maxY,  
-		TextureClass * terrainTexture, TextureClass * cloudTexture, TextureClass * noiseTexture) 
+void W3DCustomEdging::drawEdging(WorldHeightMap *pMap, Int minX, Int maxX, Int minY, Int maxY,
+		TextureClass * terrainTexture, TextureClass * cloudTexture, TextureClass * noiseTexture)
 {
 	static Bool foo = false;
 	if (foo) {
@@ -360,8 +358,8 @@ void W3DCustomEdging::drawEdging(WorldHeightMap *pMap, Int minX, Int maxX, Int m
 	DX8Wrapper::Set_Shader(detailAlphaTestShader);
 #ifdef RTS_DEBUG
 	//DX8Wrapper::Set_Shader(detailShader); // shows clipping.
-#endif	
-	
+#endif
+
 	DX8Wrapper::Set_Texture(0,terrainTexture);
 	DX8Wrapper::Set_Texture(1,edgeTex);
 	DX8Wrapper::Apply_Render_State_Changes();
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugDisplay.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
index f40d5c918f5..c3d82523377 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   Generals
@@ -42,7 +42,7 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include "W3DDevice/GameClient/W3DDebugDisplay.h"
@@ -51,49 +51,49 @@
 #include "GameClient/DisplayString.h"
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 //============================================================================
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp
index 5449d1968a5..27cdd3c0ea5 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDebugIcons.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DDebugIcons.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,7 +43,7 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 
 #include "W3DDevice/GameClient/W3DDebugIcons.h"
@@ -53,7 +53,7 @@
 #include "Common/MapObject.h"
 #include "WW3D2/dx8wrapper.h"
 
-#if defined RTS_DEBUG || defined RTS_INTERNAL
+#if defined(RTS_DEBUG)
 
 // Texturing, no zbuffer, disabled zbuffer write, primary gradient, alpha blending
 #define SC_OPAQUE ( SHADE_CNST(ShaderClass::PASS_ALWAYS, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
@@ -99,12 +99,12 @@ Int				 W3DDebugIcons::m_numDebugIcons = 0;
 W3DDebugIcons::~W3DDebugIcons(void)
 {
 	REF_PTR_RELEASE(m_vertexMaterialClass);
-	if (m_debugIcons) delete m_debugIcons;
+	delete m_debugIcons;
 	m_debugIcons = NULL;
 	m_numDebugIcons = 0;
 }
 
-W3DDebugIcons::W3DDebugIcons(void) 
+W3DDebugIcons::W3DDebugIcons(void)
 
 {
 	//go with a preset material for now.
@@ -116,7 +116,7 @@ W3DDebugIcons::W3DDebugIcons(void)
 bool W3DDebugIcons::Cast_Ray(RayCollisionTestClass & raytest)
 {
 
-	return false;	
+	return false;
 
 }
 
@@ -137,7 +137,7 @@ void W3DDebugIcons::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
 {
 	Vector3	ObjSpaceCenter(TheGlobalData->m_waterExtentX,TheGlobalData->m_waterExtentY,50*MAP_XY_FACTOR);
 	float length = ObjSpaceCenter.Length();
-	
+
 	sphere.Init(ObjSpaceCenter, length);
 }
 
@@ -159,14 +159,14 @@ RenderObjClass * W3DDebugIcons::Clone(void) const
 }
 
 
-void W3DDebugIcons::allocateIconsArray(void) 
+void W3DDebugIcons::allocateIconsArray(void)
 {
 	m_debugIcons = NEW DebugIcon[MAX_ICONS];
-	m_numDebugIcons = 0; 
+	m_numDebugIcons = 0;
 }
 
 
-void W3DDebugIcons::compressIconsArray(void) 
+void W3DDebugIcons::compressIconsArray(void)
 {
 	if (m_debugIcons && m_numDebugIcons > 0) {
 		Int newNum = 0;
@@ -187,7 +187,7 @@ void W3DDebugIcons::addIcon(const Coord3D *pos, Real width, Int numFramesDuratio
 {
 	if (pos==NULL) {
 		if (m_numDebugIcons > maxIcons) {
-			DEBUG_LOG(("Max icons %d\n", m_numDebugIcons));
+			DEBUG_LOG(("Max icons %d", m_numDebugIcons));
 			maxIcons = m_numDebugIcons;
 		}
 		m_numDebugIcons = 0;
@@ -228,7 +228,7 @@ void W3DDebugIcons::Render(RenderInfoClass & rinfo)
 	if (numRect > MAX_RECT) numRect = MAX_RECT;
 	offset+= 0.5f;
 	Int k;
-	for (k=0; k<m_numDebugIcons;) {	
+	for (k=0; k<m_numDebugIcons;) {
 		Int curIndex = 0;
 		Int	numVertex = 0;
 		DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,DX8_FVF_XYZNDUV2,numRect*4);
@@ -262,28 +262,28 @@ void W3DDebugIcons::Render(RenderInfoClass & rinfo)
 			Real halfWidth = m_debugIcons[k].width/2;
 			Int diffuse = clr.getAsInt() | ((int)theAlpha << 24);
 			Coord3D pt1 = m_debugIcons[k].position;
-			vb->x=	pt1.x-halfWidth;	 
+			vb->x=	pt1.x-halfWidth;
 			vb->y=	pt1.y-halfWidth;
 			vb->z=  pt1.z;
 			vb->diffuse=diffuse;	 // b g<<8 r<<16 a<<24.
 			vb->u1=0 ;
 			vb->v1=0 ;
 			vb++;
-			vb->x=	pt1.x+halfWidth;	 
+			vb->x=	pt1.x+halfWidth;
 			vb->y=	pt1.y-halfWidth;
 			vb->z=  pt1.z;
 			vb->diffuse=diffuse;	 // b g<<8 r<<16 a<<24.
 			vb->u1=0 ;
 			vb->v1=0 ;
 			vb++;
-			vb->x=	pt1.x+halfWidth;	 
+			vb->x=	pt1.x+halfWidth;
 			vb->y=	pt1.y+halfWidth;
 			vb->z=  pt1.z;
 			vb->diffuse=diffuse;	 // b g<<8 r<<16 a<<24.
 			vb->u1=0 ;
 			vb->v1=0 ;
 			vb++;
-			vb->x=	pt1.x-halfWidth;	 
+			vb->x=	pt1.x-halfWidth;
 			vb->y=	pt1.y+halfWidth;
 			vb->z=  pt1.z;
 			vb->diffuse=diffuse;	 // b g<<8 r<<16 a<<24.
@@ -299,7 +299,7 @@ void W3DDebugIcons::Render(RenderInfoClass & rinfo)
 			curIndex += 6;
 			numVertex += 4;
 		}
-		}	
+		}
 		if (numVertex == 0) break;
 		DX8Wrapper::Set_Shader(ShaderClass(SC_ALPHA));
 		DX8Wrapper::Set_Index_Buffer(ib_access,0);
@@ -312,4 +312,4 @@ void W3DDebugIcons::Render(RenderInfoClass & rinfo)
 	}
 }
 
-#endif // RTS_DEBUG or RTS_INTERNAL
\ No newline at end of file
+#endif // RTS_DEBUG
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
index bf282b3196d..6f3c9ba6eb3 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
@@ -34,14 +34,15 @@
 static void drawFramerateBar(void);
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
+#include <numeric>
 #include <stdlib.h>
 #include <windows.h>
 #include <io.h>
 #include <time.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
+#include "Common/FramePacer.h"
 #include "Common/ThingFactory.h"
-#include "Common/GameEngine.h"
 #include "Common/GlobalData.h"
 #include "Common/PerfTimer.h"
 #include "Common/FileSystem.h"
@@ -75,7 +76,7 @@ static void drawFramerateBar(void);
 #include "W3DDevice/GameClient/W3DScene.h"
 #include "W3DDevice/GameClient/W3DTerrainTracks.h"
 #include "W3DDevice/GameClient/W3DWater.h"
-#include "W3DDevice/GameClient/W3DVideobuffer.h"
+#include "W3DDevice/GameClient/W3DVideoBuffer.h"
 #include "W3DDevice/GameClient/W3DShaderManager.h"
 #include "W3DDevice/GameClient/W3DDebugDisplay.h"
 #include "W3DDevice/GameClient/W3DProjectedShadow.h"
@@ -98,8 +99,7 @@ static void drawFramerateBar(void);
 #include "WW3D2/meshmatdesc.h"
 #include "WW3D2/meshmdl.h"
 #include "WW3D2/rddesc.h"
-#include "TARGA.H"
-#include "Lib/BaseType.h"
+#include "TARGA.h"
 
 #include "GameLogic/ScriptEngine.h"		// For TheScriptEngine - jkmcd
 #include "GameLogic/GameLogic.h"
@@ -109,14 +109,8 @@ static void drawFramerateBar(void);
 
 #include "WinMain.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // DEFINE AND ENUMS ///////////////////////////////////////////////////////////
-#define W3D_DISPLAY_DEFAULT_BIT_DEPTH 32
 
 #define no_SAMPLE_DYNAMIC_LIGHT	1
 #ifdef SAMPLE_DYNAMIC_LIGHT
@@ -153,23 +147,17 @@ StatDumpClass::StatDumpClass( const char *fname )
 {
 	char buffer[ _MAX_PATH ];
 	GetModuleFileName( NULL, buffer, sizeof( buffer ) );
-	char *pEnd = buffer + strlen( buffer );
-	while( pEnd != buffer )
+	if (char *pEnd = strrchr(buffer, '\\'))
 	{
-		if( *pEnd == '\\' )
-		{
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+		*pEnd = 0;
 	}
-	AsciiString fullPath;
-	fullPath.format( "%s\\%s", buffer, fname );
-	m_fp = fopen( fullPath.str(), "wt" );
+	// TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.
+	const std::string fullPath = std::string(buffer) + "\\" + fname;
+	m_fp = fopen(fullPath.c_str(), "wt");
 }
 
 //=============================================================================
-//Close the file at the end of the application 
+//Close the file at the end of the application
 //=============================================================================
 StatDumpClass::~StatDumpClass()
 {
@@ -201,7 +189,7 @@ void StatDumpClass::dumpStats( Bool brief, Bool flagSpikes )
 		return;
 	}
 
-  
+
   Bool beBrief = brief & s_notFirstDump;
   s_notFirstDump = TRUE;
 
@@ -299,7 +287,7 @@ void StatDumpClass::dumpStats( Bool brief, Bool flagSpikes )
   	fprintf( m_fp, "                                                                      ON_SCREEN_PARTICLES OUT OF TOLERANCE(CAP-10)\n" );
 
 
-	// polygons this frame	
+	// polygons this frame
 	Int polyPerFrame = Debug_Statistics::Get_DX8_Polygons();
 	Int polyPerSecond = (Int)(polyPerFrame * fps);
 	fprintf( m_fp, "  Polygons: %d per frame (%d per second)\n", polyPerFrame, polyPerSecond );
@@ -308,7 +296,7 @@ void StatDumpClass::dumpStats( Bool brief, Bool flagSpikes )
 	fprintf( m_fp, "  Vertices: %d\n", Debug_Statistics::Get_DX8_Vertices() );
 
 	//
-	// I'm adjusting the texture memory usage counter by subtracting 
+	// I'm adjusting the texture memory usage counter by subtracting
 	// out the terrain alpha texture (since it's really == terrain texture).
 	//
 	fprintf( m_fp, "  Video RAM: %d\n", Debug_Statistics::Get_Record_Texture_Size() - 1376256 );
@@ -322,14 +310,14 @@ void StatDumpClass::dumpStats( Bool brief, Bool flagSpikes )
 
 	fprintf( m_fp, "\n" );
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
   if ( ! beBrief )
   {
     TheAudio->audioDebugDisplay( NULL, NULL, m_fp );
 	  fprintf( m_fp, "\n" );
   }
 #endif
-	
+
 #ifdef MEMORYPOOL_DEBUG
 	//Report memory usage.
 	TheMemoryPoolFactory->debugMemoryReport( REPORT_FACTORYINFO | REPORT_POOLINFO, 0, 0, m_fp );
@@ -401,7 +389,7 @@ W3DDisplay::W3DDisplay()
 	m_2DScene = NULL;
 	m_3DInterfaceScene = NULL;
 	m_averageFPS = TheGlobalData->m_framesPerSecondLimit;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	m_timerAtCumuFPSStart = 0;
 #endif
 	for (i=0; i<LightEnvironmentClass::MAX_LIGHTS; i++)
@@ -416,7 +404,7 @@ W3DDisplay::W3DDisplay()
 	for (i = 0; i < DisplayStringCount; i++)
 		m_displayStrings[i] = NULL;
 
-}  // end W3DDisplay
+}
 
 // W3DDisplay::~W3DDisplay ====================================================
 /** */
@@ -446,7 +434,7 @@ W3DDisplay::~W3DDisplay()
 		delete m_2DRender;
 		m_2DRender = NULL;
 
-	}  // end if
+	}
 
 	//
 	// delete all our views now since they are W3D views and we need to
@@ -476,22 +464,15 @@ W3DDisplay::~W3DDisplay()
 	delete TheW3DFileSystem;
 	TheW3DFileSystem = NULL;
 
-}  // end ~W3DDisplay
-
-#define MIN_DISPLAY_RESOLUTION_X	800
-#define MIN_DISPLAY_RESOLUTOIN_Y	600
-
+}
 
-Bool IS_FOUR_BY_THREE_ASPECT( Real x, Real y )
+// TheSuperHackers @tweak valeronm 20/03/2025 No longer filters resolutions by a 4:3 aspect ratio.
+inline Bool isResolutionSupported(const ResolutionDescClass &res)
 {
-  if ( y == 0 )
-    return FALSE;
-  
-  Real aspectRatio = fabs( x / y ); 
-  return (( aspectRatio > 1.332f) && ( aspectRatio < 1.334f));
-  
-}
+	static const Int minBitDepth = 24;
 
+	return res.Width >= DEFAULT_DISPLAY_WIDTH && res.BitDepth >= minBitDepth;
+}
 
 /*Return number of screen modes supported by the current device*/
 Int W3DDisplay::getDisplayModeCount(void)
@@ -503,7 +484,7 @@ Int W3DDisplay::getDisplayModeCount(void)
 /*	Bool needStencil=false;
 	Bool needDestinationAlpha=false;
 	Int minBitDepth=16;
-	
+
 	//Walk through all resolutions and determine which ones are compatible with other settings
 	//chosen by user.  For example, 32-bit may be required for shadows, occlusion, soft water edge, etc.
 	if (TheGlobalData->m_useShadowVolumes || (TheGlobalData->m_enableBehindBuildingMarkers && TheGameLogic->getShowBehindBuildingMarkers()))
@@ -516,9 +497,8 @@ Int W3DDisplay::getDisplayModeCount(void)
 	for (int res = 0; res < resolutions.Count ();  res ++)
 	{
 		// Is this the resolution we are looking for?
-		if (resolutions[res].BitDepth >= 24 && resolutions[res].Width >= MIN_DISPLAY_RESOLUTION_X 
-      && IS_FOUR_BY_THREE_ASPECT( (Real)resolutions[res].Width, (Real)resolutions[res].Height ) )	//only accept 4:3 aspect ratio modes.
-		{	
+		if (isResolutionSupported(resolutions[res]))
+		{
 			numResolutions++;
 		}
 	}
@@ -535,9 +515,8 @@ void W3DDisplay::getDisplayModeDescription(Int modeIndex, Int *xres, Int *yres,
 	for (int res = 0; res < resolutions.Count ();  res ++)
 	{
 		// Is this the resolution we are looking for?
-		if ( resolutions[res].BitDepth >= 24 && resolutions[res].Width >= MIN_DISPLAY_RESOLUTION_X 
-      && IS_FOUR_BY_THREE_ASPECT( (Real)resolutions[res].Width, (Real)resolutions[res].Height ) )	//only accept 4:3 aspect ratio modes.
-		{	
+		if (isResolutionSupported(resolutions[res]))
+		{
 			if (numResolutions == modeIndex)
 			{	//found the mode
 				*xres=resolutions[res].Width;
@@ -588,7 +567,7 @@ void W3DDisplay::setWidth( UnsignedInt width )
 	// of the screen with (width,height) at the lower right
 	m_2DRender->Set_Coordinate_Range( RectClass( 0, 0, getWidth(), getHeight() ) );
 
-}  // end set width
+}
 
 // W3DDisplay::setHeight ======================================================
 /** Set height of display */
@@ -603,7 +582,7 @@ void W3DDisplay::setHeight( UnsignedInt height )
 	// of the screen with (width,height) at the lower right
 	m_2DRender->Set_Coordinate_Range( RectClass( 0, 0, getWidth(), getHeight() ) );
 
-}  // end set height
+}
 
 // W3DDisplay::initAssets =====================================================
 /** */
@@ -611,7 +590,7 @@ void W3DDisplay::setHeight( UnsignedInt height )
 void W3DDisplay::initAssets( void )
 {
 
-}  // end initAssets
+}
 
 // W3DDisplay::init3DScene ====================================================
 /** */
@@ -619,7 +598,7 @@ void W3DDisplay::initAssets( void )
 void W3DDisplay::init3DScene( void )
 {
 
-}  // end init3DScene
+}
 
 // W3DDisplay::init2DScene ====================================================
 /** This is the 2D scene, you can use it to draw on a 2D plane over the
@@ -628,7 +607,7 @@ void W3DDisplay::init3DScene( void )
 void W3DDisplay::init2DScene( void )
 {
 
-}  // end init2DScene
+}
 
 // W3DDisplay::init ===========================================================
 /** Initialize or re-initialize the W3D display system.  Here we need to
@@ -650,7 +629,7 @@ void W3DDisplay::init( void )
 		/// @todo W3DDisplay needs RE-init logic!
 		return;
 
-	}  // end if
+	}
 	// Override the W3D File system
 	TheW3DFileSystem = NEW W3DFileSystem;
 
@@ -670,7 +649,7 @@ void W3DDisplay::init( void )
 
 		// create our 3D scene
 		m_3DScene =NEW_REF( RTS3DScene, () );
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	#if defined(RTS_DEBUG)
 		if( TheGlobalData->m_wireframe )
 			m_3DScene->Set_Polygon_Mode( SceneClass::LINE );
 	#endif
@@ -678,13 +657,13 @@ void W3DDisplay::init( void )
 		// m_myLight = NEW_REF
 	//============================================================================
 		Int lindex;
-		for (lindex=0; lindex<TheGlobalData->m_numGlobalLights; lindex++) 
+		for (lindex=0; lindex<TheGlobalData->m_numGlobalLights; lindex++)
 		{	m_myLight[lindex] = NEW_REF( LightClass, (LightClass::DIRECTIONAL) );
 		}
 
 		setTimeOfDay( TheGlobalData->m_timeOfDay );	//set each light to correct values for given time
 
-		for (lindex=0; lindex<TheGlobalData->m_numGlobalLights; lindex++) 
+		for (lindex=0; lindex<TheGlobalData->m_numGlobalLights; lindex++)
 		{	m_3DScene->setGlobalLight( m_myLight[lindex], lindex );
 		}
 
@@ -700,14 +679,14 @@ void W3DDisplay::init( void )
 		theDynamicLight->Set_Diffuse( Vector3( red, green, blue) );
 		theDynamicLight->Set_Position(Vector3(0, 0, 4));
 		theDynamicLight->Set_Far_Attenuation_Range(1, 8);
-		// Note: Don't Add_Render_Object dynamic lights. 
+		// Note: Don't Add_Render_Object dynamic lights.
 		m_3DScene->addDynamicLight( theDynamicLight );
 	#endif
 
 	}
 
 	// create a new asset manager
-	m_assetManager = NEW W3DAssetManager;	
+	m_assetManager = NEW W3DAssetManager;
 	m_assetManager->Register_Prototype_Loader(&_ParticleEmitterLoader );
 	m_assetManager->Register_Prototype_Loader(&_AggregateLoader);
 	m_assetManager->Set_WW3D_Load_On_Demand( true );
@@ -728,58 +707,91 @@ void W3DDisplay::init( void )
 		WW3D::Set_Thumbnail_Enabled(false);
 		WW3D::Set_Screen_UV_Bias( TRUE );  ///< this makes text look good :)
 		WW3D::Set_Texture_Bitdepth(32);
-			
+
 		setWindowed( TheGlobalData->m_windowed );
 
 		// create a 2D renderer helper
 		m_2DRender = NEW Render2DClass;
 		DEBUG_ASSERTCRASH( m_2DRender, ("Cannot create Render2DClass") );
 
-		// set our default width and height and bit depth
-		/// @todo we should set this according to options read from a file
-		setWidth( TheGlobalData->m_xResolution );
-		setHeight( TheGlobalData->m_yResolution );
-		setBitDepth( W3D_DISPLAY_DEFAULT_BIT_DEPTH );
-
-		if( WW3D::Set_Render_Device( 0, 
-																 getWidth(), 
-																 getHeight(), 
-																 getBitDepth(), 
-																 getWindowed(), 
-																 true ) != WW3D_ERROR_OK ) 
+		WW3DErrorType renderDeviceError;
+		Int attempt = 0;
+		do
 		{
-			// Getting the device at the default bit depth (32) didn't work, so try
-			// getting a 16 bit display.  (Voodoo 1-3 only supported 16 bit.) jba.
-			setBitDepth( 16 );
-			if( WW3D::Set_Render_Device( 0, 
-																	 getWidth(), 
-																	 getHeight(), 
-																	 getBitDepth(), 
-																	 getWindowed(), 
-																	 true ) != WW3D_ERROR_OK ) 
+			switch (attempt)
 			{
-
-				WW3D::Shutdown();
-				WWMath::Shutdown();
-				throw ERROR_INVALID_D3D;	//failed to initialize.  User probably doesn't have DX 8.1
-				DEBUG_ASSERTCRASH( 0, ("Unable to set render device\n") );
-				return;
+			case 0:
+			{
+				// set our default width and height and bit depth
+				setWidth( TheGlobalData->m_xResolution );
+				setHeight( TheGlobalData->m_yResolution );
+				setBitDepth( DEFAULT_DISPLAY_BIT_DEPTH );
+				break;
+			}
+			case 1:
+			{
+				// Getting the device at the default bit depth (32) didn't work, so try
+				// getting a 16 bit display.  (Voodoo 1-3 only supported 16 bit.) jba.
+				setBitDepth( MIN_DISPLAY_BIT_DEPTH );
+				break;
+			}
+			case 2:
+			{
+				// TheSuperHackers @bugfix xezon 11/06/2025 Now tries a safe default resolution
+				// if the custom resolution did not succeed. This is unlikely to happen but is possible
+				// if the user writes an unsupported resolution in the Option Preferences or if the
+				// graphics adapter does not support the minimum display resolution to begin with.
+				Int xres = DEFAULT_DISPLAY_WIDTH;
+				Int yres = DEFAULT_DISPLAY_HEIGHT;
+				Int bitDepth = DEFAULT_DISPLAY_BIT_DEPTH;
+				Int displayModeCount = getDisplayModeCount();
+				Int displayModeIndex = 0;
+				for (; displayModeIndex < displayModeCount; ++displayModeIndex)
+				{
+					getDisplayModeDescription(displayModeIndex, &xres, &yres, &bitDepth);
+					if (xres * yres >= DEFAULT_DISPLAY_WIDTH * DEFAULT_DISPLAY_HEIGHT)
+						break; // Is good enough. Use it.
+				}
+				TheWritableGlobalData->m_xResolution = xres;
+				TheWritableGlobalData->m_yResolution = yres;
+				setWidth( xres );
+				setHeight( yres );
+				setBitDepth( bitDepth );
+				break;
+			}
 			}
 
-		}  // end if
+			renderDeviceError = WW3D::Set_Render_Device(
+				0,
+				getWidth(),
+				getHeight(),
+				getBitDepth(),
+				getWindowed(),
+				true );
+
+			++attempt;
+		}
+		while (attempt < 3 && renderDeviceError != WW3D_ERROR_OK);
+
+		if (renderDeviceError != WW3D_ERROR_OK)
+		{
+			WW3D::Shutdown();
+			WWMath::Shutdown();
+			throw ERROR_INVALID_D3D;	//failed to initialize.  User probably doesn't have DX 8.1
+			DEBUG_ASSERTCRASH( 0, ("Unable to set render device") );
+			return;
+		}
 
 		//Check if level was never set and default to setting most suitable for system.
 		if (TheGameLODManager->getStaticLODLevel() == STATIC_GAME_LOD_UNKNOWN)
-			TheGameLODManager->setStaticLODLevel(TheGameLODManager->findStaticLODLevel());
+		{
+			TheGameLODManager->setStaticLODLevel(TheGameLODManager->getRecommendedStaticLODLevel());
+		}
 		else
-		{	//Static LOD level was applied during GameLOD manager init except for texture reduction
+		{
+			//Static LOD level was applied during GameLOD manager init except for texture reduction
 			//which needs to be applied here.
-			Int txtReduction=TheWritableGlobalData->m_textureReductionFactor;
-			if (txtReduction > 0)
-			{		WW3D::Set_Texture_Reduction(txtReduction,32);
-					//Tell LOD manager that texture reduction was applied.
-					TheGameLODManager->setCurrentTextureReduction(txtReduction);
-			}
+			TheGameClient->setTextureLOD(TheWritableGlobalData->m_textureReductionFactor);
 		}
 
 		if (TheGlobalData->m_displayGamma != 1.0f)
@@ -810,7 +822,7 @@ void W3DDisplay::init( void )
 					TheGlobalLanguageData->m_nativeDebugDisplay.bold);
 			}
 			else
-				font=TheFontLibrary->getFont( AsciiString("FixedSys"), 8, FALSE );
+				font=TheFontLibrary->getFont( "FixedSys", 8, FALSE );
 
 			m_nativeDebugDisplay->setFont( font );
 			m_nativeDebugDisplay->setFontHeight( 13 );
@@ -826,7 +838,7 @@ void W3DDisplay::init( void )
 	{
 		m_debugDisplayCallback = StatDebugDisplay;
 	}
-}  // end init
+}
 
 // W3DDisplay::reset ===========================================================
 /** Reset the W3D display system.  Here we need to
@@ -865,65 +877,44 @@ void W3DDisplay::reset( void )
 
 const UnsignedInt START_CUMU_FRAME = LOGICFRAMES_PER_SECOND / 2;	// skip first half-sec
 
-/** Update a moving average of the last 30 fps measurements.  Also try to filter out temporary spikes.
-	This code is designed to be used by the GameLOD sytems to determine the correct dynamic LOD setting.
-*/
 void W3DDisplay::updateAverageFPS(void)
 {
-	const Real MaximumFrameTimeCutoff = 0.5f;	//largest frame interval (seconds) we accept before ignoring it as a momentary "spike"
-	const Int FPS_HISTORY_SIZE = 30;	//keep track of the last 30 frames
+	constexpr const Int FPS_HISTORY_SIZE = 30;
 
 	static Int64 lastUpdateTime64 = 0;
 	static Int historyOffset = 0;
-	static Int numSamples = 0;
-	static double fpsHistory[FPS_HISTORY_SIZE];
+	static Real fpsHistory[FPS_HISTORY_SIZE] = {0};
 
-	Int64 freq64 = getPerformanceCounterFrequency();
-	Int64 time64 = getPerformanceCounter();
+	const Int64 freq64 = getPerformanceCounterFrequency();
+	const Int64 time64 = getPerformanceCounter();
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGameLogic->getFrame() == START_CUMU_FRAME)
 	{
 		m_timerAtCumuFPSStart = time64;
 	}
 #endif
 
-	Int64 timeDiff = time64 - lastUpdateTime64;
+	const Int64 timeDiff = time64 - lastUpdateTime64;
 
 	// convert elapsed time to seconds
-	double elapsedSeconds = (double)timeDiff/(double)(freq64);
+	Real elapsedSeconds = (Real)timeDiff/(Real)freq64;
 
-	if (elapsedSeconds <= MaximumFrameTimeCutoff)	//make sure it's not a spike
-	{
-		// append new sameple to fps history.
-		if (historyOffset >= FPS_HISTORY_SIZE)
-			historyOffset = 0;
+	// append new sample to fps history.
+	if (historyOffset >= FPS_HISTORY_SIZE)
+		historyOffset = 0;
 
-		double currentFPS = 1.0/elapsedSeconds; 
-		fpsHistory[historyOffset++] = currentFPS;
-		numSamples++;
-		if (numSamples > FPS_HISTORY_SIZE)
-			numSamples = FPS_HISTORY_SIZE;
-	}
-
-	if (numSamples)
-	{	
-		// determine average frame rate over our past history.
-		Real average=0;
-		for (Int i=0,j=historyOffset-1; i<numSamples; i++,j--)
-		{
-			if (j < 0)
-				j=FPS_HISTORY_SIZE-1;	// wrap around to front of buffer
-			average += fpsHistory[j];
-		}
+	m_currentFPS = 1.0f/elapsedSeconds;
+	fpsHistory[historyOffset++] = m_currentFPS;
 
-		m_averageFPS = average / (Real)numSamples;
-	}
+	// determine average frame rate over our past history.
+	const Real sum = std::accumulate(fpsHistory, fpsHistory + FPS_HISTORY_SIZE, 0.0f);
+	m_averageFPS = sum / FPS_HISTORY_SIZE;
 
 	lastUpdateTime64 = time64;
 }
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//debug hack to view object under mouse stats
+#if defined(RTS_DEBUG)	//debug hack to view object under mouse stats
 ICoord2D TheMousePos;
 #endif
 
@@ -950,7 +941,7 @@ void W3DDisplay::gatherDebugStats( void )
 				TheGlobalLanguageData->m_nativeDebugDisplay.bold);
 		}
 		else
-			font = TheFontLibrary->getFont( AsciiString("FixedSys"), 8, FALSE );
+			font = TheFontLibrary->getFont( "FixedSys", 8, FALSE );
 
 		for (int i = 0; i < DisplayStringCount; i++)
 		{
@@ -962,11 +953,11 @@ void W3DDisplay::gatherDebugStats( void )
 			}
 		}
 
-	}  // end if
+	}
 
 	if (m_benchmarkDisplayString == NULL)
 	{
-		GameFont *thisFont = TheFontLibrary->getFont( AsciiString("FixedSys"), 8, FALSE );
+		GameFont *thisFont = TheFontLibrary->getFont( "FixedSys", 8, FALSE );
 		m_benchmarkDisplayString = TheDisplayStringManager->newDisplayString();
 		DEBUG_ASSERTCRASH( m_benchmarkDisplayString, ("Failed to create DisplayString") );
 		m_benchmarkDisplayString->setFont( thisFont );
@@ -999,14 +990,14 @@ void W3DDisplay::gatherDebugStats( void )
 	// we update stats on a delay
 	const Real UPDATE_RATE_SECS = 2.0;
 	if( s_timeSinceLastUpdateInSecs >= UPDATE_RATE_SECS || TheGlobalData->m_constantDebugUpdate )
-	{	
+	{
 		UnicodeString unibuffer, unibuffer2;
 		UnicodeString fpsString;
-			
+
 		// setup texture stats
 		Debug_Statistics::Record_Texture_Mode(Debug_Statistics::RECORD_TEXTURE_SIMPLE/*RECORD_TEXTURE_NONE*/);
 
-		// frames per second	
+		// frames per second
 		double fps = (Real)s_framesRenderedSinceLastUpdate / s_timeSinceLastUpdateInSecs;
 		double drawsPerFrame = Debug_Statistics::Get_Draw_Calls(); //(Real)s_drawCallsSinceLastUpdate / (Real)s_framesRenderedSinceLastUpdate;
 		double sortPolysPerFrame = Debug_Statistics::Get_Sorting_Polygons();  //(Real)s_sortedPolysSinceLastUpdate / (Real)s_framesRenderedSinceLastUpdate;
@@ -1017,7 +1008,7 @@ void W3DDisplay::gatherDebugStats( void )
 		double ms = 1000.0f/fps;
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		double cumuTime = ((double)(time64 - m_timerAtCumuFPSStart) / (double)(freq64));
 		if (cumuTime < 0.0) cumuTime = 0.0;
 		Int numFrames = (Int)TheGameLogic->getFrame() - (Int)START_CUMU_FRAME;
@@ -1026,8 +1017,8 @@ void W3DDisplay::gatherDebugStats( void )
 
 		Int LOD = TheGlobalData->m_terrainLOD;
 		//unibuffer.format( L"FPS: %.2f, %.2fms mapLOD=%d [cumu FPS=%.2f] draws: %.2f sort: %.2f", fps, ms, LOD, cumuFPS, drawsPerFrame,sortPolysPerFrame);
-		if (TheGlobalData->m_useFpsLimit) 
-				unibuffer.format( L"%.2f/%d FPS, ", fps, TheGameEngine->getFramesPerSecondLimit());
+		if (TheGlobalData->m_useFpsLimit)
+				unibuffer.format( L"%.2f/%d FPS, ", fps, TheFramePacer->getFramesPerSecondLimit());
 		else
 				unibuffer.format( L"%.2f FPS, ", fps);
 
@@ -1037,7 +1028,7 @@ void W3DDisplay::gatherDebugStats( void )
 		//Int LOD = TheGlobalData->m_terrainLOD;
 		//unibuffer.format( L"FPS: %.2f, %.2fms mapLOD=%d draws: %.2f sort %.2f", fps, ms, LOD, drawsPerFrame,sortPolysPerFrame);
 		unibuffer.format( L"FPS: %.2f, %.2fms draws: %.2f skins: %.2f sort %.2f", fps, ms, drawsPerFrame,skinDrawsPerFrame,sortPolysPerFrame);
-		if (TheGlobalData->m_useFpsLimit) 
+		if (TheGlobalData->m_useFpsLimit)
 		{
 			unibuffer2.format(L", FPSLock %d",TheGlobalData->m_framesPerSecondLimit);
 			unibuffer.concat(unibuffer2);
@@ -1081,7 +1072,7 @@ void W3DDisplay::gatherDebugStats( void )
 			DX8Wrapper::stats.m_disableObjects = true;
 			DX8Wrapper::stats.m_disableConsole = true;
 			DX8Wrapper::stats.m_debugLinesToShow = 1;
-		} else if (statMode == threeDOverhead) {				 
+		} else if (statMode == threeDOverhead) {
 			threeDOverheadMS = ms;
 			statMode = terrain;
 			DX8Wrapper::stats.m_disableTerrain = false;
@@ -1128,7 +1119,7 @@ void W3DDisplay::gatherDebugStats( void )
 			DX8Wrapper::stats.m_disableConsole = false;
 			DX8Wrapper::stats.m_debugLinesToShow = -1;
 		} else if (!DX8Wrapper::stats.m_showingStats) {
-			// start collecting extended info. 
+			// start collecting extended info.
 			DX8Wrapper::stats.m_showingStats = true;
 			DX8Wrapper::stats.m_disableOverhead = false;
 			DX8Wrapper::stats.m_disableTerrain = true;
@@ -1146,35 +1137,35 @@ void W3DDisplay::gatherDebugStats( void )
 			unibuffer.format(L"FPS: %.2f, %.2fms - Collecting extended stats.", fps, ms);
 		} else if (extendedStats>0) {
 			extendedStats--;
-			unibuffer.format( L"FPS: %.2f, %.2fms - OH %.2fms, Console %.2fms, 3D OH %.2fms, Terrain %.2fms, Obs %.2fms, CPU %.2fms", 
+			unibuffer.format( L"FPS: %.2f, %.2fms - OH %.2fms, Console %.2fms, 3D OH %.2fms, Terrain %.2fms, Obs %.2fms, CPU %.2fms",
 				fps, ms, gameOverheadMS, consoleMS, threeDOverheadMS, terrainMS, objectMS, overlapMS);
 			if (extendedStats==SHOW_STATS_TIME-2) {
 				char bufferA[ 256 ];
-				sprintf( bufferA, "FPS: %.2f, %.2fms - OH %.2fms, Console %.2fms, 3D OH %.2fms, Terrain %.2fms, Obs %.2fms, CPU %.2fms\n", 
+				sprintf( bufferA, "FPS: %.2f, %.2fms - OH %.2fms, Console %.2fms, 3D OH %.2fms, Terrain %.2fms, Obs %.2fms, CPU %.2fms\n",
 					fps, ms, gameOverheadMS, consoleMS, threeDOverheadMS, terrainMS, objectMS, overlapMS);
 				::OutputDebugString(bufferA);
 				if (pListFile) {
 					fprintf(pListFile, "\n%s", bufferA);
-				}				
+				}
 				sprintf( bufferA, "Polygons: per frame %d, per second %d\n", polyPerFrame,
 						(Int)(polyPerFrame*fps));
 				::OutputDebugString(bufferA);
 				if (pListFile) {
 					fprintf(pListFile, "%s", bufferA);
 					fflush(pListFile);
-				}				
+				}
 			}
-		} 
+		}
  		if (pListFile) {
 			fprintf(pListFile, "\nFPS: %.2f, %.2fms\n", fps, ms);
 			fflush(pListFile);
-		}				
+		}
 		if (pListFile) {
 			samples = 0;
 			if (statMode != disabled) {
 				fprintf(pListFile, "Stat%d-", statMode);
-			} 
-		}				
+			}
+		}
 
 #endif
 		// check for debug D3D
@@ -1198,17 +1189,17 @@ void W3DDisplay::gatherDebugStats( void )
 		unibuffer.format(L"Frame: %d", TheGameLogic->getFrame());
 		m_displayStrings[Frame]->setText( unibuffer );
 
-		// polygons this frame	
+		// polygons this frame
 		unibuffer.format( L"Polygons: per frame %d, per second %d", polyPerFrame,
 				(Int)(polyPerFrame*fps));
 		m_displayStrings[Polygons]->setText( unibuffer );
 
 		// vertices this frame
 		unibuffer.format( L"Vertices: %d", Debug_Statistics::Get_DX8_Vertices() );
-		m_displayStrings[Vertices]->setText( unibuffer );		
+		m_displayStrings[Vertices]->setText( unibuffer );
 
 		//
-		// I'm adjusting the texture memory usage counter by subtracting 
+		// I'm adjusting the texture memory usage counter by subtracting
 		// out the terrain alpha texture (since it's really == terrain texture).
 		//
 		unibuffer.format( L"Video RAM: %d", Debug_Statistics::Get_Record_Texture_Size() - 1376256 );
@@ -1315,7 +1306,7 @@ void W3DDisplay::gatherDebugStats( void )
 		}
 
 		Object *object = NULL;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	//debug hack to view object under mouse stats
+#if defined(RTS_DEBUG)	//debug hack to view object under mouse stats
 		Drawable *draw = 	TheTacticalView->pickDrawable(&TheMousePos, FALSE, (PickType)0xffffffff );
 #else
 		Drawable *draw = TheGameClient->findDrawableByID( TheInGameUI->getMousedOverDrawableID() );
@@ -1331,7 +1322,7 @@ void W3DDisplay::gatherDebugStats( void )
 		{
 			unibuffer.concat( L"Moused over object: TERRAIN " );
 		}
-		
+
 		m_displayStrings[ KEY_MOUSE_STATES ]->setText( unibuffer );
 
 		//display the x and y mouse coordinates
@@ -1341,7 +1332,7 @@ void W3DDisplay::gatherDebugStats( void )
 		unibuffer.format( L"Mouse position: screen: (%d, %d), world: (%g, %g, %g)", mouseIO->pos.x, mouseIO->pos.y,
 			worldPos.x, worldPos.y, worldPos.z);
 		m_displayStrings[MousePosition]->setText( unibuffer );
-		
+
 		//display the number of particles in the world and being displayed on screen
 		Int totalParticles = TheParticleSystemManager->getParticleCount();
 		Int onScreenParticleCount = TheParticleSystemManager->getOnScreenParticleCount();
@@ -1387,7 +1378,7 @@ void W3DDisplay::gatherDebugStats( void )
 			// Network outgoing bandwidth stats
 //			unibuffer.format(L"OUT: 0.0 bytes/sec, 0.0 packets/sec");
 //			m_displayStrings[NetOutgoing]->setText( unibuffer );
-      unibuffer.format(L"");
+			unibuffer.clear();
 //			unibuffer.format(L"Network not present");
 			m_displayStrings[NetOutgoing]->setText(unibuffer);
 			m_displayStrings[NetIncoming]->setText(unibuffer);
@@ -1397,7 +1388,7 @@ void W3DDisplay::gatherDebugStats( void )
 
 		// selected object info stats
 		unibuffer.format( L"Select Info: '%d' drawables selected", TheInGameUI->getSelectCount() );
-		
+
 
 
 		//Sorry, guys. I need a special kluge here to get constantdebug results for angry mob.
@@ -1439,17 +1430,17 @@ void W3DDisplay::gatherDebugStats( void )
 
 
 
-		
-			
+
+
 
 			// (gth) compute some stats about the rendering cost of this drawable
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)	
+#if defined(RTS_DEBUG)
 			RenderCost rcost;
 			for (DrawModule** dm = draw->getDrawModules(); *dm; ++dm)
 			{
 				(*dm)->getRenderCost(rcost);
 			}
-			if (rcost.getDrawCallCount() > 0) 
+			if (rcost.getDrawCallCount() > 0)
 			{
 				unibuffer2.format( L"\ndraw calls: %d(+%d) sort meshes: %d skins: %d  bones: %d",rcost.getDrawCallCount(),rcost.getShadowDrawCount(),rcost.getSortedMeshCount(),rcost.getSkinMeshCount(),rcost.getBoneCount());
 				unibuffer.concat( unibuffer2 );
@@ -1478,7 +1469,7 @@ void W3DDisplay::gatherDebugStats( void )
 
 			//Render ALL modelcondition statii
 
-		}  // end if
+		}
 		m_displayStrings[ SelectedInfo ]->setText( unibuffer );
 
 	}
@@ -1497,7 +1488,7 @@ void W3DDisplay::drawDebugStats( void )
 
 	int linesOfStrings = DisplayStringCount;
 #ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_debugLinesToShow > -1) 
+	if (DX8Wrapper::stats.m_debugLinesToShow > -1)
 	{
 		linesOfStrings = DX8Wrapper::stats.m_debugLinesToShow;
 	}
@@ -1513,7 +1504,7 @@ void W3DDisplay::drawDebugStats( void )
 		y += h;
 	}
 
-}  // end drawDebugStats
+}
 
 // W3DDisplay::drawFPSStats =================================================
 /** Draw the FPS on the screen */
@@ -1557,7 +1548,7 @@ void W3DDisplay::drawCurrentDebugDisplay( void )
 			m_debugDisplayCallback( m_debugDisplay, m_debugDisplayUserData, NULL );
 		}
 	}
-}  // end drawCurrentDebugDisplay
+}
 
 // W3DDisplay::calculateTerrainLOD =================================================
 /** Calculates an adequately speedy terrain Level Of Detail. */
@@ -1566,7 +1557,7 @@ void W3DDisplay::calculateTerrainLOD( void )
 {
 	const Int NUM_SAMPLES=20;
 	const Int NUM_TO_DISCARD=5;
-	
+
 	Int64 freq64 = getPerformanceCounterFrequency();
 
 	char buf[_MAX_PATH];
@@ -1615,7 +1606,7 @@ void W3DDisplay::calculateTerrainLOD( void )
 			::OutputDebugString(buf);
 			if (i>=NUM_TO_DISCARD) {
 				frameTime += timeForFrame;
-				if (i>NUM_TO_DISCARD+1 && 
+				if (i>NUM_TO_DISCARD+1 &&
 					(timeForFrame / ((i+1)-NUM_TO_DISCARD)) > 2*maxTimeLimit) {
 					i++;
 					break;
@@ -1647,11 +1638,22 @@ Real W3DDisplay::getAverageFPS()
 	return m_averageFPS;
 }
 
+Real W3DDisplay::getCurrentFPS()
+{
+	return m_currentFPS;
+}
+
 Int W3DDisplay::getLastFrameDrawCalls()
 {
 	return Debug_Statistics::Get_Draw_Calls();
 }
 
+//=============================================================================
+void W3DDisplay::step()
+{
+	stepViews();
+}
+
 //DECLARE_PERF_TIMER(BigAssRenderLoop)
 
 // W3DDisplay::draw ===========================================================
@@ -1661,7 +1663,6 @@ Int W3DDisplay::getLastFrameDrawCalls()
 void W3DDisplay::draw( void )
 {
 	//USE_PERF_TIMER(W3DDisplay_draw)
-	static UnsignedInt syncTime = 0;
 
 	extern HWND ApplicationHWnd;
 	if (ApplicationHWnd && ::IsIconic(ApplicationHWnd)) {
@@ -1682,7 +1683,7 @@ void W3DDisplay::draw( void )
 		TheGameLODManager->setDynamicLODLevel(DYNAMIC_GAME_LOD_VERY_HIGH);
 	}
 
-	if (TheGlobalData->m_terrainLOD == TERRAIN_LOD_AUTOMATIC && TheTerrainRenderObject) 
+	if (TheGlobalData->m_terrainLOD == TERRAIN_LOD_AUTOMATIC && TheTerrainRenderObject)
 	{
 		calculateTerrainLOD();
 	}
@@ -1703,18 +1704,14 @@ void W3DDisplay::draw( void )
     if ( TheGameLogic->getFrame() > 0 && (TheGameLogic->getFrame() % interval) == 0 )
     {
   	  TheStatDump.dumpStats( TRUE, TRUE );
-    	TheInGameUI->message( UnicodeString( L"-stats is running, at interval: %d." ), TheGlobalData->m_statsInterval );
+    	TheInGameUI->message( L"-stats is running, at interval: %d.", TheGlobalData->m_statsInterval );
     }
   }
-
-
-
-
 #endif
 
 	// compute debug statistics for display later
-	if ( m_debugDisplayCallback == StatDebugDisplay 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	if ( m_debugDisplayCallback == StatDebugDisplay
+#if defined(RTS_DEBUG)
 				|| TheGlobalData->m_benchmarkTimer > 0
 #endif
 			)
@@ -1722,7 +1719,7 @@ void W3DDisplay::draw( void )
 		gatherDebugStats();
 	}
 #ifdef EXTENDED_STATS
-	else 
+	else
 	{
 		DX8Wrapper::stats.m_showingStats = false;
 	}
@@ -1745,26 +1742,19 @@ void W3DDisplay::draw( void )
 
 	///@todo: Ask Vegas why the LOD optimizer hangs particle system.
  	//
-  	// Predictive LOD optimizer optimizes the mesh LOD levels to match 
+  	// Predictive LOD optimizer optimizes the mesh LOD levels to match
   	// the given polygon budget
   	//
 	//PredictiveLODOptimizerClass::Optimize_LODs( 5000 );
 
-	Bool freezeTime = TheTacticalView->isTimeFrozen() && !TheTacticalView->isCameraMovementFinished();
-	freezeTime = freezeTime || TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript();
-	freezeTime = freezeTime || TheGameLogic->isGamePaused();
-
-	// hack to let client spin fast in network games but still do effects at the same pace. -MDC
-	static UnsignedInt lastFrame = ~0;
-	freezeTime = freezeTime || (lastFrame == TheGameClient->getFrame());
-	lastFrame = TheGameClient->getFrame();
+	Bool freezeTime = TheFramePacer->isTimeFrozen() || TheFramePacer->isGameHalted();
 
 	/// @todo: I'm assuming the first view is our main 3D view.
 	W3DView *primaryW3DView=(W3DView *)getFirstView();
+
 	if (!freezeTime && TheScriptEngine->isTimeFast())
 	{
 		primaryW3DView->updateCameraMovements();  // Update camera motion effects.
-		syncTime += TheW3DFrameLengthInMsec;
 		return;
 	}
 
@@ -1781,7 +1771,7 @@ void W3DDisplay::draw( void )
 
 		//Shroud data is needed to render all other views, so handle this first.
 		if (TheTerrainRenderObject)
-		{	
+		{
 			//update the shroud surface here since it may be needed by reflections
 			if (TheTerrainRenderObject->getMap())	//make sure a valid map is loaded into terrain.
 			{
@@ -1793,51 +1783,25 @@ void W3DDisplay::draw( void )
 		}
 	}
 
-	if (!freezeTime) 
-	{
-		/// @todo Decouple framerate from timestep
-		// for now, use constant time steps to avoid animations running independent of framerate
-		syncTime += TheW3DFrameLengthInMsec;
-		// allow W3D to update its internals
-		//	WW3D::Sync( GetTickCount() );
-	}
-	WW3D::Sync( syncTime );
+	WW3D::Update_Logic_Frame_Time(TheFramePacer->getLogicTimeStepMilliseconds());
 
-	// Fast & Frozen time limits the time to 33 fps.
-	Int minTime = 30;
-	static Int prevTime = timeGetTime(), now;	
+	// TheSuperHackers @info This binds the WW3D update to the logic update.
+	WW3D::Sync(TheGameLogic->hasUpdated());
 
+	static Int now;
 	now=timeGetTime();
-	if (TheTacticalView->getTimeMultiplier()>1) 
+
+	if (TheTacticalView->getTimeMultiplier()>1)
 	{
 		static Int timeMultiplierCounter = 1;
 		timeMultiplierCounter--;
-		if (timeMultiplierCounter>1) 
+		if (timeMultiplierCounter>1)
 			return;
 		timeMultiplierCounter = TheTacticalView->getTimeMultiplier();
 		// limit the framerate, because while fast time is on, the game logic is running as fast as it can.
-	}	
-	else 
-	{
-		now = timeGetTime();
-		prevTime = now - minTime;		 // do the first frame immediately.
-	} 
-
+	}
 
 	do {
-		
-		{
-			if(TheGlobalData->m_loadScreenRender != TRUE)
-			{
-			
-				// limit the framerate
-				while(TheGlobalData->m_useFpsLimit && (now - prevTime) < minTime-1)
-				{
-					now = timeGetTime();
-				}
-				prevTime = now;
-			}
-		}
 
 		// update all views of the world - recomputes data which will affect drawing
 		if (DX8Wrapper::_Get_D3D_Device8() && (DX8Wrapper::_Get_D3D_Device8()->TestCooperativeLevel()) == D3D_OK)
@@ -1879,15 +1843,15 @@ void W3DDisplay::draw( void )
 		{
 			//USE_PERF_TIMER(BigAssRenderLoop)
 			static Bool couldRender = true;
-			if ((TheGlobalData->m_breakTheMovie == FALSE) && (TheGlobalData->m_disableRender == false) && WW3D::Begin_Render( true, true, Vector3( 0.0f, 0.0f, 0.0f ), TheWaterTransparency->m_minWaterOpacity ) == WW3D_ERROR_OK)		
+			if ((TheGlobalData->m_breakTheMovie == FALSE) && (TheGlobalData->m_disableRender == false) && WW3D::Begin_Render( true, true, Vector3( 0.0f, 0.0f, 0.0f ), TheWaterTransparency->m_minWaterOpacity ) == WW3D_ERROR_OK)
 			{
-				
+
 				if(TheGlobalData->m_loadScreenRender == TRUE)
-				{	
+				{
 					TheInGameUI->draw();
 					if( TheMouse )
 						TheMouse->draw();	//keep applying the current cursor style so it remains hidden if needed.
-					WW3D::End_Render();	
+					WW3D::End_Render();
 					continue;
 				}
 				couldRender = true;
@@ -1909,7 +1873,8 @@ void W3DDisplay::draw( void )
 
 				if ( m_videoStream && m_videoBuffer )
 				{
-					drawVideoBuffer( m_videoBuffer, 0, 0, getWidth(), getHeight() );
+					// TheSuperHackers @bugfix Mauller 20/07/2025 scale videos based on screen size so they are shown in their original aspect
+					drawScaledVideoBuffer( m_videoBuffer, m_videoStream );
 				}
 				if( m_copyrightDisplayString )
 				{
@@ -1957,7 +1922,7 @@ void W3DDisplay::draw( void )
 					drawCurrentDebugDisplay();
 				}
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 				if (TheGlobalData->m_benchmarkTimer > 0)
 				{
 					drawFPSStats();
@@ -1965,7 +1930,7 @@ void W3DDisplay::draw( void )
 #endif
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 				if (TheGlobalData->m_debugShowGraphicalFramerate)
 				{
 					drawFramerateBar();
@@ -1977,19 +1942,19 @@ void W3DDisplay::draw( void )
 				TheGraphDraw->clear();
 #endif
 				// render is all done!
-				WW3D::End_Render();	
+				WW3D::End_Render();
 			}
 			else
 			{
 				if (couldRender)
 				{
 					couldRender = false;
-					DEBUG_LOG(("Could not do WW3D::Begin_Render()!  Are we ALT-Tabbed out?\n"));
+					DEBUG_LOG(("Could not do WW3D::Begin_Render()!  Are we ALT-Tabbed out?"));
 				}
 			}
 		}
-					
-		if (TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript() || TheGameLogic->isGamePaused())	
+
+		if (TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript() || TheGameLogic->isGamePaused())
 		{
 			freezeTime = false; // We're frozen for debug or for pause, and need to continue out of the loop.
 		}
@@ -2001,7 +1966,7 @@ void W3DDisplay::draw( void )
 		goto AGAIN;
 	}
 #endif
-}  // end draw
+}
 
 #define LETTER_BOX_FADE_TIME	1000.0f		///1000 ms.
 
@@ -2072,12 +2037,12 @@ Bool W3DDisplay::isLetterBoxed(void)
 }
 
 // W3DDisplay::createLightPulse ===============================================
-/** Create a "light pulse" which is a dynamic light that grows, decays 
+/** Create a "light pulse" which is a dynamic light that grows, decays
 	* and vanishes over several frames */
 //=============================================================================
-void W3DDisplay::createLightPulse( const Coord3D *pos, const RGBColor *color, 
-																	 Real innerRadius, Real attenuationWidth, 
-																	 UnsignedInt increaseFrameTime, 
+void W3DDisplay::createLightPulse( const Coord3D *pos, const RGBColor *color,
+																	 Real innerRadius, Real attenuationWidth,
+																	 UnsignedInt increaseFrameTime,
 																	 UnsignedInt decayFrameTime//, Bool donut
 																	 )
 {
@@ -2111,7 +2076,7 @@ void W3DDisplay::toggleLetterBox(void)
 	if( TheTacticalView )
 	{
 		TheTacticalView->setZoomLimited( !m_letterBoxEnabled );
-	}  
+	}
 }
 
 void W3DDisplay::enableLetterBox(Bool enable)
@@ -2127,7 +2092,7 @@ void W3DDisplay::enableLetterBox(Bool enable)
 			if( TheTacticalView )
 			{
 				TheTacticalView->setZoomLimited( 0 );
-			}  
+			}
 		}
 	}
 	else
@@ -2181,38 +2146,38 @@ void W3DDisplay::setTimeOfDay( TimeOfDay tod )
 // W3DDisplay::drawLine =======================================================
 /** draw a line on the display in pixel coordinates with the specified color */
 //=============================================================================
-void W3DDisplay::drawLine( Int startX, Int startY, 
-													 Int endX, Int endY, 
+void W3DDisplay::drawLine( Int startX, Int startY,
+													 Int endX, Int endY,
 													 Real lineWidth,
 													 UnsignedInt lineColor )
 {
-	
+
 	/// @todo we need to consider the efficiency of the 2D renderer
 	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
-	m_2DRender->Add_Line( Vector2( startX, startY ), Vector2( endX, endY ), 
+	m_2DRender->Add_Line( Vector2( startX, startY ), Vector2( endX, endY ),
 												lineWidth, lineColor );
 	m_2DRender->Render();
 
-}  // end drawLine
+}
 
 // W3DDisplay::drawLine =======================================================
 /** draw a line on the display in pixel coordinates with the specified color */
 //=============================================================================
-void W3DDisplay::drawLine( Int startX, Int startY, 
-													 Int endX, Int endY, 
+void W3DDisplay::drawLine( Int startX, Int startY,
+													 Int endX, Int endY,
 													 Real lineWidth,
 													 UnsignedInt lineColor1,UnsignedInt lineColor2 )
 {
-	
+
 	/// @todo we need to consider the efficiency of the 2D renderer
 	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
-	m_2DRender->Add_Line( Vector2( startX, startY ), Vector2( endX, endY ), 
+	m_2DRender->Add_Line( Vector2( startX, startY ), Vector2( endX, endY ),
 												lineWidth, lineColor1, lineColor2 );
 	m_2DRender->Render();
 
-}  // end drawLine
+}
 
 
 // W3DDisplay::drawOpenRect ===================================================
@@ -2220,7 +2185,7 @@ void W3DDisplay::drawLine( Int startX, Int startY,
 void W3DDisplay::drawOpenRect( Int startX, Int startY, Int width, Int height,
 															 Real lineWidth, UnsignedInt lineColor )
 {
-	
+
 	if (m_isClippedEnabled)
 	{
 		ICoord2D start, end, returnStart, returnEnd;
@@ -2231,7 +2196,7 @@ void W3DDisplay::drawOpenRect( Int startX, Int startY, Int width, Int height,
 		end.y = start.y + height;
 		if(ClipLine2D(&start, &end, &returnStart, &returnEnd, &m_clipRegion ))
 			drawLine( returnStart.x, returnStart.y, returnEnd.x, returnEnd.y, lineWidth, lineColor);
-			
+
 		end.x = start.x + width;
 		end.y = start.y;
 		if(ClipLine2D(&start, &end, &returnStart, &returnEnd, &m_clipRegion ))
@@ -2254,18 +2219,18 @@ void W3DDisplay::drawOpenRect( Int startX, Int startY, Int width, Int height,
 	else
 	{
 		/// @todo we need to consider the efficiency of the 2D renderer
-		m_2DRender->Reset();		
+		m_2DRender->Reset();
 		m_2DRender->Enable_Texturing( FALSE );
-		
-		m_2DRender->Add_Outline( RectClass( startX, startY, 
-																				startX + width, startY + height ), 
+
+		m_2DRender->Add_Outline( RectClass( startX, startY,
+																				startX + width, startY + height ),
 														 lineWidth, lineColor );
 
 		// render it now!
 		m_2DRender->Render();
 	}
 
-}  // end drawOpenRect
+}
 
 // W3DDisplay::drawFillRect ===================================================
 //=============================================================================
@@ -2274,16 +2239,16 @@ void W3DDisplay::drawFillRect( Int startX, Int startY, Int width, Int height,
 {
 
 	/// @todo we need to consider the efficiency of the 2D renderer
-	m_2DRender->Reset();		
+	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
-	m_2DRender->Add_Rect( RectClass( startX, startY, 
-																	 startX + width, startY + height ), 
+	m_2DRender->Add_Rect( RectClass( startX, startY,
+																	 startX + width, startY + height ),
 												0, 0, color );
 
 	// render it now!
 	m_2DRender->Render();
 
-}  // end drawFillRect
+}
 
 void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color)
 {
@@ -2291,7 +2256,7 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 	if(percent < 1 || percent > 100)
 		return;
 
-	m_2DRender->Reset();		
+	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
 
 // The rectanges are numberd as follows
@@ -2300,34 +2265,34 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 //			|----+----|
 //			| 3  | 2  |
 //			|---------| (x + width, y + width)
-//	
+//
 	// we're done, lets just draw one rectangle for it all.
 	if(percent == 100)
 	{
-		m_2DRender->Add_Rect(RectClass( startX, startY, 
+		m_2DRender->Add_Rect(RectClass( startX, startY,
 																		startX + width, startY + height), 0,0, color);
 	}
 	else if( percent> 75)
 	{
 		//rectangle #1 & 2
-		m_2DRender->Add_Rect(RectClass( startX + width/2, startY, 
+		m_2DRender->Add_Rect(RectClass( startX + width/2, startY,
 																		startX + width, startY + height), 0,0, color);
 		// rectangle #3
-		m_2DRender->Add_Rect(RectClass( startX, startY + height/2, 
+		m_2DRender->Add_Rect(RectClass( startX, startY + height/2,
 																		startX + width/2, startY + height), 0,0, color);
 		// draw the part of rectangle 4
 		Real remain = percent - 75;
 		if(remain > 12)
 		{
 			//draw the full triangle
-			m_2DRender->Add_Tri(Vector2(startX, startY), 
+			m_2DRender->Add_Tri(Vector2(startX, startY),
 													Vector2(startX, startY + height/2),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
-			
+
 			// draw the part of triangle
 			Real percentDraw = (Real)(remain - 12)/ 13;
-			m_2DRender->Add_Tri(Vector2(startX, startY), 
+			m_2DRender->Add_Tri(Vector2(startX, startY),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + (width/2 * percentDraw), startY),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2336,7 +2301,7 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 		{
 			// draw the part of triangle
 			Real percentDraw = (Real)(remain)/ 12;
-			m_2DRender->Add_Tri(Vector2(startX, startY + height/2 - (height/2 * percentDraw)), 
+			m_2DRender->Add_Tri(Vector2(startX, startY + height/2 - (height/2 * percentDraw)),
 													Vector2(startX, startY + height/2),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2346,21 +2311,21 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 	else if( percent > 50)
 	{
 		//rectangle #1 & 2
-		m_2DRender->Add_Rect(RectClass( startX + width/2, startY, 
+		m_2DRender->Add_Rect(RectClass( startX + width/2, startY,
 																		startX + width, startY + height), 0,0, color);
 		// draw the part of rectangle 3
 		Real remain = percent - 50;
 		if(remain > 12)
 		{
 			//draw the full triangle
-			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height/2), 
+			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height/2),
 													Vector2(startX, startY + height),
 													Vector2(startX + width/2, startY + height),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
-			
+
 			// draw the part of triangle
 			Real percentDraw = (Real)(remain - 12)/ 13;
-			m_2DRender->Add_Tri(Vector2(startX, startY + height - (height/2 * percentDraw)), 
+			m_2DRender->Add_Tri(Vector2(startX, startY + height - (height/2 * percentDraw)),
 													Vector2(startX, startY + height),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2369,7 +2334,7 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 		{
 			// draw the part of triangle
 			Real percentDraw = (Real)(remain)/ 12;
-			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height),  
+			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width/2 - ( width/2 * percentDraw), startY + height),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2378,21 +2343,21 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 	else if(percent > 25)
 	{
 		// rectangel #1
-		m_2DRender->Add_Rect(RectClass( startX + width/2, startY, 
+		m_2DRender->Add_Rect(RectClass( startX + width/2, startY,
 																		startX + width, startY + height/2), 0,0, color);
 		// draw the part of rectangle 2
 		Real remain = percent - 25;
 		if(remain > 12)
 		{
 			//draw the full triangle
-			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height/2), 
+			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width, startY + height),
 													Vector2(startX + width, startY + height/2),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
-			
+
 			// draw the part of triangle
 			Real percentDraw = (Real)(remain - 12)/ 13;
-			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height/2), 
+			m_2DRender->Add_Tri(Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width - (width/2 * percentDraw), startY + height),
 													Vector2(startX + width, startY + height),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2401,7 +2366,7 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 		{
 			// draw the part of triangle
 			Real percentDraw = (Real)(remain)/ 12;
-			m_2DRender->Add_Tri(Vector2(startX + width, startY + height/2),  
+			m_2DRender->Add_Tri(Vector2(startX + width, startY + height/2),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width, startY + height/2 + ( height/2 * percentDraw)),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2410,19 +2375,19 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 	else
 	{
 				// draw the part of rectangle 1
-		
+
 		if(percent > 12)
 		{
 			//draw the full triangle
-			m_2DRender->Add_Tri(Vector2(startX + width/2, startY), 
+			m_2DRender->Add_Tri(Vector2(startX + width/2, startY),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width, startY),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
-			
+
 			// draw the part of triangle
 			Real percentDraw = (Real)(percent - 12)/ 13;
 			m_2DRender->Add_Tri(Vector2(startX + width, startY),
-													Vector2(startX + width/2, startY + height/2), 
+													Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width, startY + (height/2 * percentDraw)),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
 		}
@@ -2430,7 +2395,7 @@ void W3DDisplay::drawRectClock(Int startX, Int startY, Int width, Int height, In
 		{
 			// draw the part of triangle
 			Real percentDraw = (Real)(percent)/ 12;
-			m_2DRender->Add_Tri(Vector2(startX + width/2, startY),  
+			m_2DRender->Add_Tri(Vector2(startX + width/2, startY),
 													Vector2(startX + width/2, startY + height/2),
 													Vector2(startX + width/2 + (width/2 * percentDraw), startY ),
 													Vector2(0,0),Vector2(0,0),Vector2(0,0),color);
@@ -2455,7 +2420,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 	if( percent < 0 || percent > 99 )
 		return;
 
-	m_2DRender->Reset();		
+	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
 
 // The rectanges are numbered as follows
@@ -2464,7 +2429,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 //			|----+----|
 //			| 3  | 2  |
 //			|---------| (x + width, y + width)
-//	
+//
 
 	Int midX = startX + width/2;
 	Int midY = startY + height/2;
@@ -2486,7 +2451,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 
 		//Rectangle #3 & 4
 		m_2DRender->Add_Rect( RectClass( startX, startY, midX, endY ), 0, 0, color );
-		
+
 		//Rectangle #2
 		m_2DRender->Add_Rect( RectClass( midX, midY, endX, endY ), 0, 0, color );
 
@@ -2497,12 +2462,12 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
   		//-----
 
 			//Draw the 2nd half of rectangle #1
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, midY ), Vector2( endX, startY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, midY ), Vector2( endX, startY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 
 			//Draw the last part of the 1st portion of rectangle #1
 			Real percentDraw = (Real)( 13 - percent ) / 13;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, startY ), Vector2( endX - halfWidth * percentDraw, startY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, startY ), Vector2( endX - halfWidth * percentDraw, startY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 		else
@@ -2512,7 +2477,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 
 			//Draw the last part of the 2nd half of rectangle #1
 			Real percentDraw = (Real)( percent - 13 ) / 12;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, midY ), Vector2( endX, startY + halfHeight * percentDraw ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, midY ), Vector2( endX, startY + halfHeight * percentDraw ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 	}
@@ -2531,12 +2496,12 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
   		//-----
 
 			//Draw the 2nd half of rectangle #2
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, endY ), Vector2( endX, endY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, endY ), Vector2( endX, endY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 
 			//Draw the last part of the 1st portion of rectangle #2
 			Real percentDraw = (Real)( percent - 25 ) / 13;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, endY ), Vector2( endX, midY + halfHeight * percentDraw ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( endX, endY ), Vector2( endX, midY + halfHeight * percentDraw ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 		else
@@ -2546,7 +2511,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 
 			//Draw the last part of the 2nd half of rectangle #1
 			Real percentDraw = (Real)( percent - 38 ) / 12;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, endY ), Vector2( endX - halfWidth * percentDraw, endY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, endY ), Vector2( endX - halfWidth * percentDraw, endY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 	}
@@ -2565,12 +2530,12 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
   		//-----
 
 			//Draw the 2nd half of rectangle #3
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, midY ), Vector2( startX, endY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, midY ), Vector2( startX, endY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 
 			//Draw the last part of the 1st portion of rectangle #3
 			Real percentDraw = (Real)( percent - 50 ) / 13;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, endY ), Vector2( midX - halfWidth * percentDraw, endY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, endY ), Vector2( midX - halfWidth * percentDraw, endY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 		else
@@ -2580,7 +2545,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 
 			//Draw the last part of the 2nd half of rectangle #3
 			Real percentDraw = (Real)( percent - 62 ) / 12;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, midY ), Vector2( startX, endY - halfHeight * percentDraw ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, midY ), Vector2( startX, endY - halfHeight * percentDraw ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 	}
@@ -2588,7 +2553,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 	{
 		//75-99%
 		//------
-		
+
 		//Handle rectangle #4 that needs partial rendering.
 		if( percent < 87 )
 		{
@@ -2596,12 +2561,12 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
   		//-----
 
 			//Draw the 2nd half of rectangle #4
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, startY ), Vector2( startX, startY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, startY ), Vector2( startX, startY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 
 			//Draw the last part of the 1st portion of rectangle #4
 			Real percentDraw = (Real)( percent - 75 ) / 13;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, startY ), Vector2( startX, midY - halfHeight * percentDraw ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( startX, startY ), Vector2( startX, midY - halfHeight * percentDraw ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 		else
@@ -2611,7 +2576,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 
 			//Draw the last part of the 2nd half of rectangle #4
 			Real percentDraw = (Real)( percent - 88 ) / 12;
-			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, startY ), Vector2( startX + halfWidth * percentDraw, startY ), 
+			m_2DRender->Add_Tri( Vector2( midX, midY ), Vector2( midX, startY ), Vector2( startX + halfWidth * percentDraw, startY ),
 													 Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), color );
 		}
 	}
@@ -2625,7 +2590,7 @@ void W3DDisplay::drawRemainingRectClock(Int startX, Int startY, Int width, Int h
 /** Draws an images at the screen coordinates and keeps it within the end
 	* screen coords specified */
 //=============================================================================
-void W3DDisplay::drawImage( const Image *image, Int startX, Int startY, 
+void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 														Int endX, Int endY, Color color, DrawImageMode mode)
 {
 
@@ -2662,6 +2627,7 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 			m_2DRender->Enable_Additive(false);
 			m_2DRender->Enable_Alpha(false);
 			doAlphaReset = TRUE;
+			break;
 		default:
 			break;
 	}
@@ -2692,11 +2658,11 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 			if( BitIsSet( image->getStatus(), IMAGE_STATUS_ROTATED_90_CLOCKWISE ) )
 			{
 
-	
+
 				//
 				//	Clip the polygons to the specified area
 				//
-				
+
 				clipped_rect.Left		= __max (screen_rect.Left, m_clipRegion.lo.x);
 				clipped_rect.Right	= __min (screen_rect.Right, m_clipRegion.hi.x);
 				clipped_rect.Top		= __max (screen_rect.Top, m_clipRegion.lo.y);
@@ -2705,7 +2671,7 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 				//
 				//	Clip the texture to the specified area
 				//
-				
+
 				float percent				= ((clipped_rect.Left - screen_rect.Left) / screen_rect.Width ());
 				clipped_uv_rect.Top		= uv_rect.Top + (uv_rect.Height () * percent);
 
@@ -2721,11 +2687,11 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 			else
 
 			{
-			
+
 				//
 				//	Clip the polygons to the specified area
 				//
-				
+
 				clipped_rect.Left		= __max (screen_rect.Left, m_clipRegion.lo.x);
 				clipped_rect.Right	= __min (screen_rect.Right, m_clipRegion.hi.x);
 				clipped_rect.Top		= __max (screen_rect.Top, m_clipRegion.lo.y);
@@ -2734,7 +2700,7 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 				//
 				//	Clip the texture to the specified area
 				//
-				
+
 				float percent				= ((clipped_rect.Left - screen_rect.Left) / screen_rect.Width ());
 				clipped_uv_rect.Left		= uv_rect.Left + (uv_rect.Width () * percent);
 
@@ -2760,7 +2726,7 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 	if( BitIsSet( image->getStatus(), IMAGE_STATUS_ROTATED_90_CLOCKWISE ) )
 	{
 
-		m_2DRender->Add_Tri( Vector2( screen_rect.Left, screen_rect.Top ), 
+		m_2DRender->Add_Tri( Vector2( screen_rect.Left, screen_rect.Top ),
 												 Vector2( screen_rect.Left, screen_rect.Bottom ),
 												 Vector2( screen_rect.Right, screen_rect.Top ),
 												 Vector2( uv_rect.Right, uv_rect.Top),
@@ -2776,14 +2742,14 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 												 Vector2( uv_rect.Left, uv_rect.Top ),
 												 color );
 
-	}  // end if
+	}
 	else
 	{
 
 		// just draw as normal
 		m_2DRender->Add_Quad( screen_rect, uv_rect, color );
 
-	}  // end else
+	}
 
 	m_2DRender->Render();
 
@@ -2792,7 +2758,7 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
 	if (doAlphaReset)
 		m_2DRender->Enable_Alpha(true);
 
-}  // end drawImage
+}
 
 //============================================================================
 // W3DDisplay::createVideoBuffer
@@ -2846,6 +2812,43 @@ VideoBuffer*	W3DDisplay::createVideoBuffer( void )
 	return buffer;
 }
 
+//============================================================================
+// W3DDisplay::drawScaledVideoBuffer
+//============================================================================
+
+void W3DDisplay::drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream )
+{
+	// TheSuperHackers @bugfix Mauller 20/07/2025 scale videos based on screen size so they are shown in their original aspect
+	Real videoAspect = (Real)stream->width() / (Real)stream->height();
+	Real displayAspect = (Real)getWidth() / (Real)getHeight();
+	Bool wideAspect = displayAspect >= videoAspect;
+
+	Int startX = 0;
+	Int endX = 0;
+	Int startY = 0;
+	Int endY = 0;
+
+	if (wideAspect)
+	{
+		// TheSuperHackers @info if we are in a wide aspect, we scale the videos width and fill the height
+		Real heightScale = (Real)getHeight() / (Real)stream->height();
+		startX = (getWidth() / 2.0f) - (stream->width() * heightScale / 2.0f);
+		endX = (getWidth() / 2.0f) + (stream->width() * heightScale / 2.0f);
+
+		endY = getHeight();
+	}
+	else
+	{
+		// TheSuperHackers @info if we are in a narrow aspect, we scale the videos height and fill the width
+		Real widthScale = (Real)getWidth() / (Real)stream->width();
+		startY = (getHeight() / 2.0f) - (stream->height() * widthScale / 2.0f);
+		endY = (getHeight() / 2.0f) + (stream->height() * widthScale / 2.0f);
+
+		endX = getWidth();
+	}
+
+	drawVideoBuffer( buffer, startX, startY, endX, endY );
+}
 
 //============================================================================
 // W3DDisplay::drawVideoBuffer
@@ -2874,7 +2877,7 @@ void W3DDisplay::setClipRegion( IRegion2D *region )
 		m_clipRegion = *region;
 		m_isClippedEnabled = TRUE;
 
-}  // end setClipRegion
+}
 
 //=============================================================================
 /* we don't really need to override this call, since we will soon be called to
@@ -2908,86 +2911,88 @@ void W3DDisplay::setShroudLevel( Int x, Int y, CellShroudStatus setting )
 			TheTerrainRenderObject->getShroud()->setShroudLevel(x, y, (W3DShroudLevel)TheGlobalData->m_fogAlpha );///< @todo placeholder to get feedback on logic work while graphic side being decided
 		else
 			TheTerrainRenderObject->getShroud()->setShroudLevel(x, y, (W3DShroudLevel)TheGlobalData->m_clearAlpha );
-		//Logic is saying shroud.  We can add alpha levels here in client if needed.  
+		//Logic is saying shroud.  We can add alpha levels here in client if needed.
 		// W3DShroud is a 0-255 alpha byte.  Logic shroud is a double reference count.
 
 		TheTerrainRenderObject->notifyShroudChanged();
-	
+
 	}
 }
 
 //=============================================================================
 ///Utility function to dump data into a .BMP file
 static void CreateBMPFile(LPTSTR pszFile, char *image, Int width, Int height)
-{ 
-     HANDLE hf;                 // file handle 
-    BITMAPFILEHEADER hdr;       // bitmap file-header 
-    PBITMAPINFOHEADER pbih;     // bitmap info-header 
-    LPBYTE lpBits;              // memory pointer 
-    DWORD dwTotal;              // total count of bytes 
-    DWORD cb;                   // incremental count of bytes 
-    BYTE *hp;                   // byte pointer 
-    DWORD dwTmp; 
-
-    PBITMAPINFO pbmi; 
-
-    pbmi = (PBITMAPINFO) LocalAlloc(LPTR,sizeof(BITMAPINFOHEADER));
-    pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); 
-    pbmi->bmiHeader.biWidth = width; 
-    pbmi->bmiHeader.biHeight = height; 
-    pbmi->bmiHeader.biPlanes = 1; 
-    pbmi->bmiHeader.biBitCount = 24;
-    pbmi->bmiHeader.biCompression = BI_RGB;
-    pbmi->bmiHeader.biSizeImage = (pbmi->bmiHeader.biWidth + 7) /8 * pbmi->bmiHeader.biHeight * 24;
-    pbmi->bmiHeader.biClrImportant = 0; 
-
-
-    pbih = (PBITMAPINFOHEADER) pbmi; 
-    lpBits = (LPBYTE) image;
-
-    // Create the .BMP file. 
-    hf = CreateFile(pszFile, 
-                   GENERIC_READ | GENERIC_WRITE, 
-                   (DWORD) 0, 
-                    NULL, 
-                   CREATE_ALWAYS, 
-                   FILE_ATTRIBUTE_NORMAL, 
-                   (HANDLE) NULL); 
-    if (hf == INVALID_HANDLE_VALUE) 
-		return;
-    hdr.bfType = 0x4d42;        // 0x42 = "B" 0x4d = "M" 
-    // Compute the size of the entire file. 
-    hdr.bfSize = (DWORD) (sizeof(BITMAPFILEHEADER) + 
-                 pbih->biSize + pbih->biClrUsed 
-                 * sizeof(RGBQUAD) + pbih->biSizeImage); 
-    hdr.bfReserved1 = 0; 
-    hdr.bfReserved2 = 0; 
-
-    // Compute the offset to the array of color indices. 
-    hdr.bfOffBits = (DWORD) sizeof(BITMAPFILEHEADER) + 
-                    pbih->biSize + pbih->biClrUsed 
-                    * sizeof (RGBQUAD); 
-
-    // Copy the BITMAPFILEHEADER into the .BMP file. 
-    if (!WriteFile(hf, (LPVOID) &hdr, sizeof(BITMAPFILEHEADER), 
-        (LPDWORD) &dwTmp,  NULL)) 
-		return;
-
-    // Copy the BITMAPINFOHEADER and RGBQUAD array into the file. 
-    if (!WriteFile(hf, (LPVOID) pbih, sizeof(BITMAPINFOHEADER) + pbih->biClrUsed * sizeof (RGBQUAD),(LPDWORD) &dwTmp, NULL)) 
+{
+	HANDLE hf;                  // file handle
+	BITMAPFILEHEADER hdr;       // bitmap file-header
+	PBITMAPINFOHEADER pbih;     // bitmap info-header
+	LPBYTE lpBits;              // memory pointer
+	DWORD dwTotal;              // total count of bytes
+	DWORD cb;                   // incremental count of bytes
+	BYTE *hp;                   // byte pointer
+	DWORD dwTmp;
+
+	PBITMAPINFO pbmi;
+
+	pbmi = (PBITMAPINFO) LocalAlloc(LPTR,sizeof(BITMAPINFOHEADER));
+	if (pbmi == NULL)
 		return;
 
-    // Copy the array of color indices into the .BMP file. 
-    dwTotal = cb = pbih->biSizeImage; 
-    hp = lpBits; 
-    if (!WriteFile(hf, (LPSTR) hp, (int) cb, (LPDWORD) &dwTmp,NULL)) 
-		return;
+	pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+	pbmi->bmiHeader.biWidth = width;
+	pbmi->bmiHeader.biHeight = height;
+	pbmi->bmiHeader.biPlanes = 1;
+	pbmi->bmiHeader.biBitCount = 24;
+	pbmi->bmiHeader.biCompression = BI_RGB;
+	pbmi->bmiHeader.biSizeImage = (pbmi->bmiHeader.biWidth + 7) /8 * pbmi->bmiHeader.biHeight * 24;
+	pbmi->bmiHeader.biClrImportant = 0;
+
+	pbih = (PBITMAPINFOHEADER) pbmi;
+	lpBits = (LPBYTE) image;
+
+	// Create the .BMP file.
+	hf = CreateFile(pszFile,
+		GENERIC_READ | GENERIC_WRITE,
+		(DWORD) 0,
+		NULL,
+		CREATE_ALWAYS,
+		FILE_ATTRIBUTE_NORMAL,
+		(HANDLE) NULL);
+
+	if (hf != INVALID_HANDLE_VALUE)
+	{
+		hdr.bfType = 0x4d42;        // 0x42 = "B" 0x4d = "M"
+		// Compute the size of the entire file.
+		hdr.bfSize = (DWORD) (sizeof(BITMAPFILEHEADER) +
+									pbih->biSize + pbih->biClrUsed
+									* sizeof(RGBQUAD) + pbih->biSizeImage);
+		hdr.bfReserved1 = 0;
+		hdr.bfReserved2 = 0;
+
+		// Compute the offset to the array of color indices.
+		hdr.bfOffBits = (DWORD) sizeof(BITMAPFILEHEADER) +
+										pbih->biSize + pbih->biClrUsed
+										* sizeof (RGBQUAD);
+
+		// Copy the BITMAPFILEHEADER into the .BMP file.
+		if (WriteFile(hf, (LPVOID) &hdr, sizeof(BITMAPFILEHEADER),
+				(LPDWORD) &dwTmp,  NULL))
+		{
+			// Copy the BITMAPINFOHEADER and RGBQUAD array into the file.
+			if (WriteFile(hf, (LPVOID) pbih, sizeof(BITMAPINFOHEADER) + pbih->biClrUsed * sizeof (RGBQUAD),(LPDWORD) &dwTmp, NULL))
+			{
+				// Copy the array of color indices into the .BMP file.
+				dwTotal = cb = pbih->biSizeImage;
+				hp = lpBits;
+				WriteFile(hf, (LPSTR) hp, (int) cb, (LPDWORD) &dwTmp, NULL);
+			}
+		}
 
-    // Close the .BMP file. 
-     if (!CloseHandle(hf))
-		 return;
+		// Close the .BMP file.
+		CloseHandle(hf);
+	}
 
-    // Free memory. 
+	// Free memory.
 	LocalFree( (HLOCAL) pbmi);
 }
 
@@ -3006,8 +3011,8 @@ void W3DDisplay::takeScreenShot(void)
 #else
 		sprintf( leafname, "%s%.3d.bmp", "sshot", frame_number++);
 #endif
-		strcpy(pathname, TheGlobalData->getPath_UserData().str());
-		strcat(pathname, leafname);
+		strlcpy(pathname, TheGlobalData->getPath_UserData().str(), ARRAY_SIZE(pathname));
+		strlcat(pathname, leafname, ARRAY_SIZE(pathname));
 		if (_access( pathname, 0 ) == -1)
 			done = true;
 	}
@@ -3136,7 +3141,7 @@ void W3DDisplay::toggleMovieCapture(void)
 }
 
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 
 static FILE *AssetDumpFile=NULL;
 
@@ -3149,7 +3154,7 @@ void dumpMeshAssets(MeshClass *mesh)
 		MeshModelClass *model=mesh->Get_Model();
 		for (int stage=0;stage<MeshMatDescClass::MAX_TEX_STAGES;++stage)
 		{
-			for (int pass=0;pass<model->Get_Pass_Count();++pass) 
+			for (int pass=0;pass<model->Get_Pass_Count();++pass)
 			{
 				if (model->Has_Texture_Array(pass,stage))
 				{
@@ -3157,7 +3162,7 @@ void dumpMeshAssets(MeshClass *mesh)
 					{
 						if ((texture=model->Peek_Texture(i,pass,stage)) != NULL)
 						{
-							fprintf(AssetDumpFile,"\t%s\n",texture->Get_Texture_Name());
+							fprintf(AssetDumpFile,"\t%s\n",texture->Get_Texture_Name().str());
 						}
 					}
 				}
@@ -3165,7 +3170,7 @@ void dumpMeshAssets(MeshClass *mesh)
 				{
 					if ((texture=model->Peek_Single_Texture(pass,stage)) != NULL)
 					{
-						fprintf(AssetDumpFile,"\t%s\n",texture->Get_Texture_Name());
+						fprintf(AssetDumpFile,"\t%s\n",texture->Get_Texture_Name().str());
 					}
 				}
 			}
@@ -3196,7 +3201,7 @@ void dumpHLODAssets(HLodClass *hlod)
 void W3DDisplay::dumpModelAssets(const char *path)
 {
 	if (m_3DScene)
-	{	
+	{
 		AssetDumpFile=fopen(path,"w");
 		if (AssetDumpFile)
 		{
@@ -3236,9 +3241,9 @@ void W3DDisplay::preloadModelAssets( AsciiString model )
 		nameWithExtension.format( "%s.w3d", model.str() );
 		m_assetManager->Load_3D_Assets( nameWithExtension.str() );
 
-	}  // end if
+	}
 
-}  // end preloadModelAssets
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Preload using the W3D asset manager the texture referenced by the string parameter */
@@ -3250,9 +3255,9 @@ void W3DDisplay::preloadTextureAssets( AsciiString texture )
 	{
 		TextureClass *theTexture = m_assetManager->Get_Texture( texture.str() );
 		theTexture->Release_Ref();//release reference
-	}  // end if
+	}
 
-}  // end preloadModelAssets
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -3289,7 +3294,7 @@ void W3DDisplay::doSmartAssetPurgeAndPreload(const char* usageFileName)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 void W3DDisplay::dumpAssetUsage(const char* mapname)
 {
 	if (!m_assetManager || !mapname || !*mapname)
@@ -3313,11 +3318,11 @@ void W3DDisplay::dumpAssetUsage(const char* mapname)
 			break;	// it exists, we're good
 		++idx;
 	}
-	
+
 	FILE *fp = fopen(buf, "w");
 	if (fp)
 	{
-		for (int i=0; i<names.Count(); i++) 
+		for (int i=0; i<names.Count(); i++)
 		{
 			const char* n = names[i];
 			fprintf(fp, "%s\n", n);
@@ -3339,9 +3344,9 @@ static void drawFramerateBar(void)
 	else if (percTime < 0.0f)
 		percTime = 0.0f;
 	Int width = REAL_TO_INT(percTime * TheDisplay->getWidth());
-	UnsignedInt colorToUse = GameMakeColor( REAL_TO_UNSIGNEDBYTE((1.0f - percTime) * 255), 
-																					REAL_TO_UNSIGNEDBYTE(percTime * 255), 
-																					0, 
+	UnsignedInt colorToUse = GameMakeColor( REAL_TO_UNSIGNEDBYTE((1.0f - percTime) * 255),
+																					REAL_TO_UNSIGNEDBYTE(percTime * 255),
+																					0,
 																					0x7F);
 
 	TheDisplay->drawFillRect(1, 1, width, 15, colorToUse);
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp
index 7a10894cc73..1636c46f247 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayString.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DDisplayString.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -56,11 +56,6 @@
 #include "GameClient/GlobalLanguage.h"
 
 // DEFINES ////////////////////////////////////////////////////////////////////
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // PRIVATE TYPES //////////////////////////////////////////////////////////////
 
@@ -81,7 +76,7 @@
 //=============================================================================
 W3DDisplayString::W3DDisplayString( void )
 {
-	
+
 	m_textChanged = FALSE;
 	m_textPos.x = 0;
 	m_textPos.y = 0;
@@ -99,8 +94,8 @@ W3DDisplayString::W3DDisplayString( void )
 	m_hotKeyPos.x = 0;
 	m_hotKeyPos.y = 0;
 	m_hotKeyColor = GameMakeColor(255,255,255,255);
-	
-}  // end W3DDisplayString
+
+}
 
 // W3DDisplayString::~W3DDisplayString ========================================
 /** */
@@ -108,7 +103,7 @@ W3DDisplayString::W3DDisplayString( void )
 W3DDisplayString::~W3DDisplayString( void )
 {
 
-}  // end ~W3DDisplayString
+}
 
 // W3DDisplayString::textChanged ==============================================
 /** This method automatically gets called from some methods in the display
@@ -123,12 +118,12 @@ void W3DDisplayString::notifyTextChanged( void )
 	if(TheGlobalLanguageData)
 	{
 		if(TheGlobalLanguageData->m_useHardWrap == TRUE)
-		{	
+		{
 			m_textRenderer.Set_Use_Hard_Word_Wrap(true);
 			m_textRendererHotKey.Set_Use_Hard_Word_Wrap(true);
 		}
 		else
-		{	
+		{
 			m_textRenderer.Set_Use_Hard_Word_Wrap(false);
 			m_textRendererHotKey.Set_Use_Hard_Word_Wrap(false);
 		}
@@ -147,7 +142,7 @@ void W3DDisplayString::notifyTextChanged( void )
 	m_textRenderer.Reset();
 	m_textRendererHotKey.Reset();
 
-}  // end notifyTextChanged
+}
 
 // W3DDisplayString::Draw =====================================================
 /** Draw the text at the specified location in in the specified colors
@@ -166,9 +161,9 @@ void W3DDisplayString::draw( Int x, Int y, Color color, Color dropColor, Int xDr
 	Bool needNewPolys = FALSE;
 
 	// sanity
-	if( getTextLength() == 0 )	
+	if( getTextLength() == 0 )
 		return;  // nothing to draw
-	
+
 	// if our font or text has changed we need to build a new sentence
 	if( m_fontChanged || m_textChanged )
 	{
@@ -191,16 +186,16 @@ void W3DDisplayString::draw( Int x, Int y, Color color, Color dropColor, Int xDr
 		m_textChanged = FALSE;
 		needNewPolys = TRUE;
 
-	}  // end if
+	}
 
 	//
 	// if our position has changed, or our colors have chagned, or our
 	// text data has changed, we need to redo the texture quads
 	//
 	if( needNewPolys ||
-			x != m_textPos.x || 
-			y != m_textPos.y || 
-			color != m_currTextColor || 
+			x != m_textPos.x ||
+			y != m_textPos.y ||
+			color != m_currTextColor ||
 			dropColor != m_currDropColor )
 	{
 
@@ -212,7 +207,7 @@ void W3DDisplayString::draw( Int x, Int y, Color color, Color dropColor, Int xDr
 
 		// reset the quads
 		m_textRenderer.Reset_Polys();
-					
+
 		// draw the shadow
 		m_textRenderer.Set_Location( Vector2( m_textPos.x + xDrop, m_textPos.y + yDrop) );
 		m_textRenderer.Draw_Sentence( m_currDropColor );
@@ -220,7 +215,7 @@ void W3DDisplayString::draw( Int x, Int y, Color color, Color dropColor, Int xDr
 		// draw the text
 		m_textRenderer.Set_Location( Vector2( m_textPos.x, m_textPos.y ) );
 		m_textRenderer.Draw_Sentence( m_currTextColor );
-		
+
 		if(m_useHotKey)
 		{
 			m_textRendererHotKey.Reset_Polys();
@@ -228,8 +223,8 @@ void W3DDisplayString::draw( Int x, Int y, Color color, Color dropColor, Int xDr
 			m_textRendererHotKey.Draw_Sentence( m_hotKeyColor );
 			m_textRendererHotKey.Render();
 		}
-	
-	}  // end if
+
+	}
 
 	// render the text
 	m_textRenderer.Render();
@@ -238,7 +233,7 @@ void W3DDisplayString::draw( Int x, Int y, Color color, Color dropColor, Int xDr
 	if( TheGameClient )
 		usingResources( TheGameClient->getFrame() );
 
-}  // end draw
+}
 
 // W3DDisplayString::getSize ==================================================
 /** Get the render size width and height of the string in this instance
@@ -251,9 +246,9 @@ void W3DDisplayString::getSize( Int *width, Int *height )
 	if( width )
 		*width = m_size.x;
 	if( height )
-		*height = m_size.y;		
+		*height = m_size.y;
 
-}  // end getSize
+}
 
 // DisplayString::appendChar ==================================================
 /** Get text with up to charPos characters, -1 = all characters */
@@ -272,9 +267,9 @@ Int W3DDisplayString::getWidth( Int charPos )
 		const WideChar *text = m_textString.str();
 		WideChar ch;
 
-		while ( (ch = *text++ ) != 0 && ( charPos == -1 || count < charPos ) ) 
+		while ( (ch = *text++ ) != 0 && ( charPos == -1 || count < charPos ) )
 		{
-			if ( ch != (WideChar)'\n' ) 
+			if ( ch != (WideChar)'\n' )
 			{
 				width += font->Get_Char_Spacing( ch );
 			}
@@ -304,7 +299,7 @@ void W3DDisplayString::setFont( GameFont *font )
 
 	// set the font in our renderer
 	m_textRenderer.Set_Font( static_cast<FontCharsClass *>(m_font->fontData) );
-	
+
 	m_textRendererHotKey.Set_Font( static_cast<FontCharsClass *>(TheFontLibrary->getFont(font->nameString,font->pointSize, TRUE)->fontData) );
 	// recompute extents for text with new font
 	computeExtents();
@@ -312,7 +307,7 @@ void W3DDisplayString::setFont( GameFont *font )
 	// set flag telling us the font has changed since last render
 	m_fontChanged = TRUE;
 
-}  // end setFont
+}
 
 // W3DDisplayString::setClipRegion ============================================
 /** Set the clipping region for the text */
@@ -342,9 +337,9 @@ void W3DDisplayString::setClipRegion( IRegion2D *region )
 																								 m_clipRegion.lo.y,
 																								 m_clipRegion.hi.x,
 																								 m_clipRegion.hi.y ) );
-	}  // end if
+	}
 
-}  // end setClipRegion
+}
 
 // W3DDisplayString::computeExtents ===========================================
 /** Update the width and height of our string */
@@ -360,7 +355,7 @@ void W3DDisplayString::computeExtents( void )
 		m_size.x = 0;
 		m_size.y = 0;
 
-	}  // end if
+	}
 	else
 	{
 
@@ -368,9 +363,9 @@ void W3DDisplayString::computeExtents( void )
 		m_size.x = extents.X;
 		m_size.y = extents.Y;
 
-	}  // end else
+	}
 
-}  // end computeExtents
+}
 
 // W3DDisplayString::setWordWrap ===========================================
 /** Set the wordwrap of the m_textRenderer */
@@ -380,7 +375,7 @@ void W3DDisplayString::setWordWrap( Int wordWrap )
 	// set the Word Wrap
 	if(m_textRenderer.Set_Wrapping_Width(wordWrap))
 		notifyTextChanged();
-}// void setWordWrap( Int wordWrap )
+}
 
 void W3DDisplayString::setUseHotkey( Bool useHotkey, Color hotKeyColor )
 {
@@ -398,4 +393,4 @@ void W3DDisplayString::setWordWrapCentered( Bool isCentered )
 	// set the Word Wrap
 	 if( m_textRenderer.Set_Word_Wrap_Centered(isCentered) )
 		notifyTextChanged();
-}// void setWordWrap( Int wordWrap )
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp
index af7c938293a..fe6294679b2 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp
@@ -38,13 +38,13 @@
 #include "W3DDevice/GameClient/W3DDisplayStringManager.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// PUBLIC FUNCTIONS 
+// PUBLIC FUNCTIONS
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
 W3DDisplayStringManager::W3DDisplayStringManager( void )
 {
-	for (Int i = 0; i < MAX_GROUPS; ++i) 
+	for (Int i = 0; i < MAX_GROUPS; ++i)
 	{
 		m_groupNumeralStrings[i] = NULL;
 	}
@@ -56,7 +56,7 @@ W3DDisplayStringManager::W3DDisplayStringManager( void )
 //-------------------------------------------------------------------------------------------------
 W3DDisplayStringManager::~W3DDisplayStringManager( void )
 {
-	for (Int i = 0; i < MAX_GROUPS; ++i) 
+	for (Int i = 0; i < MAX_GROUPS; ++i)
 	{
 		if (m_groupNumeralStrings[i])
 			freeDisplayString(m_groupNumeralStrings[i]);
@@ -78,8 +78,8 @@ void W3DDisplayStringManager::postProcessLoad( void )
 		TheDrawGroupInfo->m_fontName,
 		TheDrawGroupInfo->m_fontSize,
 		TheDrawGroupInfo->m_fontIsBold );
-	
-	for (Int i = 0; i < MAX_GROUPS; ++i) 
+
+	for (Int i = 0; i < MAX_GROUPS; ++i)
 	{
 		m_groupNumeralStrings[i] = newDisplayString();
 		m_groupNumeralStrings[i]->setFont(font);
@@ -116,11 +116,11 @@ DisplayString *W3DDisplayStringManager::newDisplayString( void )
 	if( newString == NULL )
 	{
 
-		DEBUG_LOG(( "newDisplayString: Could not allcoate new W3D display string\n" ));
+		DEBUG_LOG(( "newDisplayString: Could not allcoate new W3D display string" ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// assign a default font
 	if (TheGlobalLanguageData && TheGlobalLanguageData->m_defaultDisplayStringFont.name.isNotEmpty())
@@ -131,7 +131,7 @@ DisplayString *W3DDisplayStringManager::newDisplayString( void )
 			TheGlobalLanguageData->m_defaultDisplayStringFont.bold) );
 	}
 	else
-		newString->setFont( TheFontLibrary->getFont( AsciiString("Times New Roman"), 12, FALSE ) );
+		newString->setFont( TheFontLibrary->getFont( "Times New Roman", 12, FALSE ) );
 
 	// link string to list
 	link( newString );
@@ -139,7 +139,7 @@ DisplayString *W3DDisplayStringManager::newDisplayString( void )
 	// return our new string
 	return newString;
 
-}  // end newDisplayString
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove a display string from the master list and delete the data */
@@ -150,7 +150,7 @@ void W3DDisplayStringManager::freeDisplayString( DisplayString *string )
 	// sanity
 	if( string == NULL )
 		return;
-			
+
 	// unlink
 	unLink( string );
 
@@ -162,7 +162,7 @@ void W3DDisplayStringManager::freeDisplayString( DisplayString *string )
 	// free data
 	deleteInstance(string);
 
-}  // end freeDisplayString
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update method for our display string Manager ... if it's been too
@@ -177,7 +177,7 @@ void W3DDisplayStringManager::update( void )
 	DisplayStringManager::update();
 
 	W3DDisplayString *string = static_cast<W3DDisplayString *>(m_stringList);
-	
+
 	// if the m_currentCheckpoint is valid, use it for the starting point for the search
 	if (m_currentCheckpoint) {
 		string = static_cast<W3DDisplayString *>(m_currentCheckpoint);
@@ -189,7 +189,7 @@ void W3DDisplayStringManager::update( void )
 																					render resources freed */
 
 	int numStrings = 10;
-	// looping through all the strings eats up a lot of ambient time. Instead, 
+	// looping through all the strings eats up a lot of ambient time. Instead,
 	// loop through 10 (arbitrarily chosen) or till the end is hit.
 	while ( numStrings-- && string)
 	{
@@ -216,24 +216,24 @@ void W3DDisplayStringManager::update( void )
 			// in future cleanup passes of this update routine
 			//
 			string->m_lastResourceFrame = 0;
-			
-		}  // end if
+
+		}
 
 		// move to next string
 		string = static_cast<W3DDisplayString *>(string->next());
 
-	}  // end while
-	
+	}
+
 	// reset the starting point for our next search
 	m_currentCheckpoint = string;
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 DisplayString *W3DDisplayStringManager::getGroupNumeralString( Int numeral )
 {
-	if (numeral < 0 || numeral > MAX_GROUPS - 1 ) 
+	if (numeral < 0 || numeral > MAX_GROUPS - 1 )
 	{
-		DEBUG_CRASH(("Numeral '%d' out of range.\n", numeral));
+		DEBUG_CRASH(("Numeral '%d' out of range.", numeral));
 		return m_groupNumeralStrings[0];
 	}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDynamicLight.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDynamicLight.cpp
index ac672c39f08..8416eda9c87 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDynamicLight.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDynamicLight.cpp
@@ -43,13 +43,13 @@ W3DDynamicLight::~W3DDynamicLight(void)
 }
 
 void W3DDynamicLight::On_Frame_Update(void)
-{	
+{
 	if (!m_enabled) {
 		return;
 	}
 	Real factor = 1.0f;
 	if (m_curIncreaseFrameCount>0 && m_increaseFrameCount>0) {
-		// increasing 
+		// increasing
 		m_curIncreaseFrameCount--;
 		factor = (m_increaseFrameCount-m_curIncreaseFrameCount)/(Real)m_increaseFrameCount;
 
@@ -84,4 +84,4 @@ void W3DDynamicLight::setFrameFade(UnsignedInt frameIncreaseTime, UnsignedInt de
 	m_targetAmbient = Ambient;
 	m_targetDiffuse = Diffuse;
 	m_targetRange = FarAttenEnd;
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
index bab5a2fe37d..054cc27966c 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
@@ -24,8 +24,8 @@
 
 // FILE: W3DFileSystem.cpp ////////////////////////////////////////////////////////////////////////
 //
-// W3D implementation of a file factory.  This replaces the W3D file factory, 
-// and uses GDI assets, so that 
+// W3D implementation of a file factory.  This replaces the W3D file factory,
+// and uses GDI assets, so that
 // W3D files and targa files are loaded using the GDI file interface.
 // Note - this only servers up read only files.
 //
@@ -40,6 +40,7 @@
 // for now we maintain old legacy files
 // #define MAINTAIN_LEGACY_FILES
 
+#include "Common/ArchiveFile.h"
 #include "Common/Debug.h"
 #include "Common/file.h"
 #include "Common/FileSystem.h"
@@ -47,10 +48,11 @@
 #include "Common/MapObject.h"
 #include "Common/Registry.h"
 #include "W3DDevice/GameClient/W3DFileSystem.h"
-// DEFINES ////////////////////////////////////////////////////////////////////////////////////////
 
 #include <io.h>
 
+// DEFINES ////////////////////////////////////////////////////////////////////////////////////////
+
 //-------------------------------------------------------------------------------------------------
 /** Game file access.  At present this allows us to access test assets, assets from
 	* legacy GDI assets, and the current flat directory access for textures, models etc */
@@ -71,12 +73,12 @@ typedef enum
 GameFileClass::GameFileClass( char const *filename )
 {
 
-	m_fileExists = FALSE;
 	m_theFile = NULL;
-	m_filePath[ 0 ] = 0;
+	m_fileExists = FALSE;
+	m_filePath[0] = 0;
 	m_filename[0] = 0;
 
-	if( filename ) 
+	if( filename )
 		Set_Name( filename );
 
 }
@@ -120,87 +122,68 @@ inline static Bool isImageFileType( GameFileType fileType )
 }
 
 //-------------------------------------------------------------------------------------------------
-/** 
-	Sets the file name, and finds the GDI asset if present. 
+//-------------------------------------------------------------------------------------------------
+static GameFileType getFileType( char const *filename )
+{
+	if (char const *extension = strrchr( filename, '.' ))
+	{
+		// test the extension to recognize a few key file types
+		if( stricmp( extension, ".w3d" ) == 0 )
+			return FILE_TYPE_W3D;
+		else if( stricmp( extension, ".tga" ) == 0 )
+			return FILE_TYPE_TGA;
+		else if( stricmp( extension, ".dds" ) == 0 )
+			return FILE_TYPE_DDS;
+	}
+
+	return FILE_TYPE_COMPLETELY_UNKNOWN;  // MBL FILE_TYPE_UNKNOWN change due to compile error
+}
+
+//-------------------------------------------------------------------------------------------------
+/**
+	Sets the file name, and finds the GDI asset if present.
 
 
 	Well, that is the worst comment ever for the most important function there is.
 	Everything comes through this.  This builds the directory and tests for the file
-	in several different places.  
+	in several different places.
 
-	First we look in Language subfolders so that our Perforce	build can handle files that have 
-	been localized but were in Generals.  
+	First we look in Language subfolders so that our Perforce	build can handle files that have
+	been localized but were in Generals.
 
 	Then we do the normal TheFileSystem lookup.  In there it does LocalFile (Art/Textures) then it does
-	big files (which internally are also Art/Textures).  
-	
+	big files (which internally are also Art/Textures).
+
 	Finally we try UserData.
 */
 //-------------------------------------------------------------------------------------------------
 char const * GameFileClass::Set_Name( char const *filename )
 {
 
-	if( Is_Open() ) 
+	if( Is_Open() )
 		Close();
 
 	// save the filename
-	strncpy( m_filename, filename, _MAX_PATH );
-
-	char name[_MAX_PATH];
-	const Int EXT_LEN = 32;
-	char extension[EXT_LEN];
-	extension[0] = 0;
-	strcpy(name, filename);
-	Int i = strlen(name);
-	i--;
-	Int extLen = 1;
-	while(i>0 && extLen < EXT_LEN) {
-		if (name[i] == '.') {
-			strcpy(extension, name+i);
-			name[i] = 0;
-			break;
-		}
-		i--;
-		extLen++;
-	}
-	Int j = 0;
-	// Strip out spaces.
-	for (i=0; name[i]; i++) {
-		if (name[i] != ' ') {
-			name[j] = name[i];
-			j++;
-		}
-	}
-	name[j] = 0;
-
-	// test the extension to recognize a few key file types
-	GameFileType fileType = FILE_TYPE_COMPLETELY_UNKNOWN;  // MBL FILE_TYPE_UNKNOWN change due to compile error
-	if( stricmp( extension, ".w3d" ) == 0 )
-		fileType = FILE_TYPE_W3D;
-	else if( stricmp( extension, ".tga" ) == 0 )
-		fileType = FILE_TYPE_TGA;
-	else if( stricmp( extension, ".dds" ) == 0 )
-		fileType = FILE_TYPE_DDS;
-
+	strlcpy( m_filename, filename, _MAX_PATH );
 
+	GameFileType fileType = getFileType(filename);
 
 	// We need to be able to grab w3d's from a localization dir, since Germany hates exploding people units.
 	if( fileType == FILE_TYPE_W3D )
 	{
 		static const char *localizedPathFormat = "Data/%s/Art/W3D/";
 		sprintf(m_filePath,localizedPathFormat, GetRegistryLanguage().str());
-		strcat( m_filePath, filename );
-
-	}  // end if
+		strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
+	}
 	// We need to be able to grab images from a localization dir, because Art has a fetish for baked-in text.  Munkee.
-	if( isImageFileType(fileType) )
+	else if( isImageFileType(fileType) )
 	{
 		static const char *localizedPathFormat = "Data/%s/Art/Textures/";
 		sprintf(m_filePath,localizedPathFormat, GetRegistryLanguage().str());
-		strcat( m_filePath, filename );
+		strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-	}  // end else if
+	}
 
 	// see if the file exists
 	m_fileExists = TheFileSystem->doesFileExist( m_filePath );
@@ -213,21 +196,23 @@ char const * GameFileClass::Set_Name( char const *filename )
 		// all .w3d files are in W3D_DIR_PATH, all .tga files are in TGA_DIR_PATH
 		if( fileType == FILE_TYPE_W3D )
 		{
-			
+
+			static_assert(ARRAY_SIZE(m_filePath) >= ARRAY_SIZE(W3D_DIR_PATH), "Incorrect array size");
 			strcpy( m_filePath, W3D_DIR_PATH );
-			strcat( m_filePath, filename );
-			
-		}  // end if
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
+
+		}
 		else if( isImageFileType(fileType) )
 		{
-			
+
+			static_assert(ARRAY_SIZE(m_filePath) >= ARRAY_SIZE(TGA_DIR_PATH), "Incorrect array size");
 			strcpy( m_filePath, TGA_DIR_PATH );
-			strcat( m_filePath, filename );
-			
-		}  // end else if
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
+
+		}
 		else
-			strcpy( m_filePath, filename );
-		
+			strlcpy(m_filePath, filename, ARRAY_SIZE(m_filePath));
+
 		// see if the file exists
 		m_fileExists = TheFileSystem->doesFileExist( m_filePath );
 	}
@@ -242,22 +227,24 @@ char const * GameFileClass::Set_Name( char const *filename )
 		if( fileType == FILE_TYPE_W3D )
 		{
 
+			static_assert(ARRAY_SIZE(m_filePath) >= ARRAY_SIZE(LEGACY_W3D_DIR_PATH), "Incorrect array size");
 			strcpy( m_filePath, LEGACY_W3D_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end if
+		}
 		else if( isImageFileType(fileType) )
 		{
 
+			static_assert(ARRAY_SIZE(m_filePath) >= ARRAY_SIZE(LEGACY_TGA_DIR_PATH), "Incorrect array size");
 			strcpy( m_filePath, LEGACY_TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end else if
+		}
 
 		// see if the file exists
 		m_fileExists = TheFileSystem->doesFileExist( m_filePath );
 
-	}  // end if
+	}
 	#endif
 
 
@@ -269,23 +256,25 @@ char const * GameFileClass::Set_Name( char const *filename )
 
 		if( fileType == FILE_TYPE_W3D )
 		{
-			
+
+			static_assert(ARRAY_SIZE(m_filePath) >= ARRAY_SIZE(TEST_W3D_DIR_PATH), "Incorrect array size");
 			strcpy( m_filePath, TEST_W3D_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end if
+		}
 		else if( isImageFileType(fileType) )
 		{
 
+			static_assert(ARRAY_SIZE(m_filePath) >= ARRAY_SIZE(TEST_TGA_DIR_PATH), "Incorrect array size");
 			strcpy( m_filePath, TEST_TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end else if
+		}
 
 		// see if the file exists
 		m_fileExists = TheFileSystem->doesFileExist( m_filePath );
 
-	}  // end if
+	}
 	#endif
 
 	// We allow the user to load their own images for various assets (like the control bar)
@@ -294,39 +283,36 @@ char const * GameFileClass::Set_Name( char const *filename )
 		if( fileType == FILE_TYPE_W3D )
 		{
 			sprintf(m_filePath,USER_W3D_DIR_PATH, TheGlobalData->getPath_UserData().str());
-			//strcpy( m_filePath, USER_W3D_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end if
-		if( isImageFileType(fileType) )
+		}
+		else if( isImageFileType(fileType) )
 		{
 			sprintf(m_filePath,USER_TGA_DIR_PATH, TheGlobalData->getPath_UserData().str());
-			//strcpy( m_filePath, USER_TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end else if
+		}
 
 		// see if the file exists
 		m_fileExists = TheFileSystem->doesFileExist( m_filePath );
 
-	}  // end if
+	}
 
 
-	// We Need to be able to "temporarily copy over the map preview for whichever directory it came from
+	// We need to be able to temporarily copy over the map preview for whichever directory it came from
 	if( m_fileExists == FALSE  && TheGlobalData)
 	{
-		if( fileType == FILE_TYPE_TGA ) // just TGA, since we don't dds previews
+		if( fileType == FILE_TYPE_TGA ) // just TGA, since we don't do dds previews
 		{
 			sprintf(m_filePath,MAP_PREVIEW_DIR_PATH, TheGlobalData->getPath_UserData().str());
-			//strcpy( m_filePath, USER_TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
-		}  // end else if
+		}
 
 		// see if the file exists
 		m_fileExists = TheFileSystem->doesFileExist( m_filePath );
 
-	}  // end if
+	}
 
 	return m_filename;
 
@@ -335,7 +321,7 @@ char const * GameFileClass::Set_Name( char const *filename )
 //-------------------------------------------------------------------------------------------------
 /** If we found a gdi asset, the file is available. */
 //-------------------------------------------------------------------------------------------------
-bool GameFileClass::Is_Available( int forced ) 
+bool GameFileClass::Is_Available( int forced )
 {
 
 	// not maintaining any GDF compatibility, all files should be where the m_filePath says
@@ -354,7 +340,7 @@ bool GameFileClass::Is_Open(void) const
 //-------------------------------------------------------------------------------------------------
 /** Open the named file. */
 //-------------------------------------------------------------------------------------------------
-int  GameFileClass::Open(char const *filename, int rights) 
+int  GameFileClass::Open(char const *filename, int rights)
 {
 	Set_Name(filename);
 	if (Is_Available(false)) {
@@ -366,24 +352,22 @@ int  GameFileClass::Open(char const *filename, int rights)
 //-------------------------------------------------------------------------------------------------
 /** Open the file using the current file name. */
 //-------------------------------------------------------------------------------------------------
-int  GameFileClass::Open(int rights) 
+int  GameFileClass::Open(int rights)
 {
-	if( rights != READ ) 
+	if( rights != READ )
 	{
 		return(false);
 	}
 
-	// just open up the file in m_filePath
 	m_theFile = TheFileSystem->openFile( m_filePath, File::READ | File::BINARY );
 
 	return (m_theFile != NULL);
-
 }
 
 //-------------------------------------------------------------------------------------------------
 /** Read. */
 //-------------------------------------------------------------------------------------------------
-int GameFileClass::Read(void *buffer, int len) 
+int GameFileClass::Read(void *buffer, int len)
 {
 	if (m_theFile) {
 		return m_theFile->read(buffer, len);
@@ -394,7 +378,7 @@ int GameFileClass::Read(void *buffer, int len)
 //-------------------------------------------------------------------------------------------------
 /** Seek. */
 //-------------------------------------------------------------------------------------------------
-int GameFileClass::Seek(int pos, int dir) 
+int GameFileClass::Seek(int pos, int dir)
 {
 	File::seekMode mode = File::CURRENT;
 	switch (dir) {
@@ -412,7 +396,7 @@ int GameFileClass::Seek(int pos, int dir)
 //-------------------------------------------------------------------------------------------------
 /** Size. */
 //-------------------------------------------------------------------------------------------------
-int GameFileClass::Size(void) 
+int GameFileClass::Size(void)
 {
 	if (m_theFile) {
 		return m_theFile->size();
@@ -423,7 +407,7 @@ int GameFileClass::Size(void)
 //-------------------------------------------------------------------------------------------------
 /** Write. */
 //-------------------------------------------------------------------------------------------------
-int GameFileClass::Write(void const *buffer, Int len) 
+int GameFileClass::Write(void const *buffer, Int len)
 {
 #ifdef RTS_DEBUG
 #endif
@@ -433,7 +417,7 @@ int GameFileClass::Write(void const *buffer, Int len)
 //-------------------------------------------------------------------------------------------------
 /** Close. */
 //-------------------------------------------------------------------------------------------------
-void GameFileClass::Close(void) 
+void GameFileClass::Close(void)
 {
 	if (m_theFile) {
 		m_theFile->close();
@@ -448,12 +432,16 @@ void GameFileClass::Close(void)
 extern W3DFileSystem *TheW3DFileSystem = NULL;
 
 //-------------------------------------------------------------------------------------------------
-/** Constructor.  Creating an instance of this class overrices the default 
+/** Constructor.  Creating an instance of this class overrides the default
 W3D file factory.  */
 //-------------------------------------------------------------------------------------------------
 W3DFileSystem::W3DFileSystem(void)
 {
 	_TheFileFactory = this; // override the w3d file factory.
+
+#if RTS_ZEROHOUR && PRIORITIZE_TEXTURES_BY_SIZE
+	reprioritizeTexturesBySize();
+#endif
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -481,3 +469,79 @@ void W3DFileSystem::Return_File( FileClass *file )
 	delete file;
 }
 
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+void W3DFileSystem::reprioritizeTexturesBySize()
+{
+	ArchivedDirectoryInfo* dirInfo = TheArchiveFileSystem->friend_getArchivedDirectoryInfo(TGA_DIR_PATH);
+	if (dirInfo != NULL)
+	{
+		reprioritizeTexturesBySize(*dirInfo);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+// TheSuperHackers @info This function moves the largest texture of its name to the front of the
+// directory info. The algorithm only prioritizes the first item in the multimap, because this is
+// what we currently need:
+// Before: A(256kb) B(128kb) C(512kb)
+// After:  C(512kb) B(128kb) A(256kb)
+// 
+// Catered to specific game archives only. This ensures that user created archives are not included
+// for the re-prioritization of textures.
+//-------------------------------------------------------------------------------------------------
+void W3DFileSystem::reprioritizeTexturesBySize(ArchivedDirectoryInfo& dirInfo)
+{
+	const char* const superiorArchive = "Textures.big";
+	const char* const inferiorArchive = "TexturesZH.big";
+
+	ArchivedFileLocationMap::iterator it0;
+	ArchivedFileLocationMap::iterator it1 = dirInfo.m_files.begin();
+	ArchivedFileLocationMap::iterator end = dirInfo.m_files.end();
+
+	if (it1 != end)
+	{
+		it0 = it1;
+		++it1;
+	}
+
+	for (; it1 != end; ++it1)
+	{
+		const AsciiString& file0 = it0->first;
+		const AsciiString& file1 = it1->first;
+
+		if (file0 == file1)
+		{
+			GameFileType type = getFileType(file0.str());
+			if (isImageFileType(type))
+			{
+				ArchiveFile* archive0 = it0->second;
+				ArchiveFile* archive1 = it1->second;
+				FileInfo info0;
+				FileInfo info1;
+				AsciiString filepath(dirInfo.m_path);
+				filepath.concat(file0);
+
+				if (archive0->getFileInfo(filepath, &info0) && archive1->getFileInfo(filepath, &info1))
+				{
+					if (info0.size() < info1.size()
+						&& archive0->getName().endsWithNoCase(inferiorArchive)
+						&& archive1->getName().endsWithNoCase(superiorArchive))
+					{
+						std::swap(it0->second, it1->second);
+
+#if ENABLE_FILESYSTEM_LOGGING
+						DEBUG_LOG(("W3DFileSystem::reprioritizeTexturesBySize - prioritize %s(%ukb) from %s over %s(%ukb) from %s",
+							file1.str(), UnsignedInt(info1.size() / 1024), archive1->getName().str(),
+							file0.str(), UnsignedInt(info0.size() / 1024), archive0->getName().str()));
+#endif
+					}
+				}
+			}
+		}
+		else
+		{
+			it0 = it1;
+		}
+	}
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DGameClient.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DGameClient.cpp
index 99c4820ff76..4f5dbd6dd62 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DGameClient.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DGameClient.cpp
@@ -64,14 +64,14 @@
 W3DGameClient::W3DGameClient()
 {
 
-}  // end W3DGameClient
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 W3DGameClient::~W3DGameClient()
 {
 
-}  // end ~W3DGameClient
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize resources for the w3d game client */
@@ -82,7 +82,7 @@ void W3DGameClient::init( void )
 	// extending initialization routine
 	GameClient::init();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Per frame udpate, note we are extending functionality */
@@ -93,7 +93,7 @@ void W3DGameClient::update( void )
 	// call base
 	GameClient::update();
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset this device client system.  Note we are extending reset functionality from
@@ -105,7 +105,7 @@ void W3DGameClient::reset( void )
 	// call base class
 	GameClient::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** allocate a new drawable using the thing template for initialization.
@@ -115,14 +115,14 @@ void W3DGameClient::reset( void )
 	* in the GameLogic and GameClient themselves */
 //-------------------------------------------------------------------------------------------------
 Drawable *W3DGameClient::friend_createDrawable( const ThingTemplate *tmplate,
-																								DrawableStatus statusBits )
+																								DrawableStatusBits statusBits )
 {
 	Drawable *draw = NULL;
 
 	// sanity
 	if( tmplate == NULL )
 		return NULL;
-	
+
 	draw = newInstance(Drawable)( tmplate, statusBits );
 
 	return draw;
@@ -133,7 +133,7 @@ Drawable *W3DGameClient::friend_createDrawable( const ThingTemplate *tmplate,
 //-------------------------------------------------------------------------------------------------
 void W3DGameClient::addScorch(const Coord3D *pos, Real radius, Scorches type)
 {
-	if (TheTerrainRenderObject) 
+	if (TheTerrainRenderObject)
 	{
 		Vector3 loc(pos->x, pos->y, pos->z);
 		TheTerrainRenderObject->addScorch(loc, radius, type);
@@ -143,8 +143,8 @@ void W3DGameClient::addScorch(const Coord3D *pos, Real radius, Scorches type)
 //-------------------------------------------------------------------------------------------------
 /** create an effect that requires a start and end location */
 //-------------------------------------------------------------------------------------------------
-void W3DGameClient::createRayEffectByTemplate( const Coord3D *start, 
-																		 const Coord3D *end, 
+void W3DGameClient::createRayEffectByTemplate( const Coord3D *start,
+																		 const Coord3D *end,
 																		 const ThingTemplate* tmpl )
 {
 	Drawable *draw = TheThingFactory->newDrawable(tmpl);
@@ -161,10 +161,10 @@ void W3DGameClient::createRayEffectByTemplate( const Coord3D *start,
 
 		// add this ray effect to the list of ray effects
 		TheRayEffects->addRayEffect( draw, start, end );
-			
-	}  // end if
 
-}  // end createRayEffectByTemplate
+	}
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /**  Tell all the drawables what time of day it is now */
@@ -183,7 +183,7 @@ void W3DGameClient::setTimeOfDay( TimeOfDay tod )
 	//tell the display to update its lighting
 	TheDisplay->setTimeOfDay( tod );
 
-}  // end setTimeOfDay
+}
 
 
 //-------------------------------------------------------------------------------------------------
@@ -193,31 +193,20 @@ void W3DGameClient::setTeamColor(Int red, Int green, Int blue)
 
 	W3DStatusCircle::setColor(red, green, blue);
 
-}  // end setTeamColor
+}
 
 //-------------------------------------------------------------------------------------------------
-/** temporary entry point for adjusting LOD for development testing. */
 //-------------------------------------------------------------------------------------------------
-void W3DGameClient::adjustLOD( Int adj ) 
+void W3DGameClient::setTextureLOD( Int level )
 {
-	if (TheGlobalData == NULL) 
-		return;
-
-	TheWritableGlobalData->m_textureReductionFactor += adj;
-
-	if (TheWritableGlobalData->m_textureReductionFactor > 4)
-		TheWritableGlobalData->m_textureReductionFactor = 4;	//16x less resolution is probably enough.
-	if (TheWritableGlobalData->m_textureReductionFactor < 0)
-		TheWritableGlobalData->m_textureReductionFactor = 0;
+	if (WW3D::Get_Texture_Reduction() != level)
+	{
+		WW3D::Set_Texture_Reduction(level, 32);
 
-	if (WW3D::Get_Texture_Reduction() != TheWritableGlobalData->m_textureReductionFactor)
-	{	WW3D::Set_Texture_Reduction(TheWritableGlobalData->m_textureReductionFactor,32);
-		TheGameLODManager->setCurrentTextureReduction(TheWritableGlobalData->m_textureReductionFactor);
-		if( TheTerrainRenderObject ) 
-  			TheTerrainRenderObject->setTextureLOD( TheWritableGlobalData->m_textureReductionFactor );
+		if( TheTerrainRenderObject )
+			TheTerrainRenderObject->setTextureLOD(level);
 	}
-
-}  // end adjustLOD
+}
 
 //-------------------------------------------------------------------------------------------------
 /**  Tell the terrain that an object moved, so it can knock down trees or crush grass
@@ -229,6 +218,6 @@ void W3DGameClient::notifyTerrainObjectMoved(Object *obj)
 		TheTerrainRenderObject->unitMoved(obj);
 	}
 
-}  // end setTimeOfDay
+}
 
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp
index 0e4f181a4b3..0c72dbf244a 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp
@@ -50,13 +50,8 @@
 #include "WW3D2/ww3d.h"
 #include "WW3D2/hanim.h"
 
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.		 
+#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 #ifdef RTS_DEBUG
@@ -65,7 +60,7 @@
 #include "WW3D2/dx8vertexbuffer.h"
 #include "WW3D2/vertmaterial.h"
 class DebugHintObject : public RenderObjClass
-{	
+{
 
 public:
 
@@ -124,7 +119,7 @@ DebugHintObject::DebugHintObject(void) :
 
 Bool DebugHintObject::Cast_Ray(RayCollisionTestClass & raytest)
 {
-	return false;	
+	return false;
 }
 
 DebugHintObject::DebugHintObject(const DebugHintObject & src)
@@ -174,7 +169,7 @@ void DebugHintObject::freeMapResources(void)
 //Allocate a heightmap of x by y vertices.
 //data must be an array matching this size.
 void DebugHintObject::initData(void)
-{	
+{
 	freeMapResources();	//free old data and ib/vb
 
 	m_indexBuffer = NEW_REF(DX8IndexBufferClass,(3));
@@ -194,7 +189,7 @@ void DebugHintObject::initData(void)
 	m_vertexMaterialClass = VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 
 	//use a multi-texture shader: (text1*diffuse)*text2.
-	m_shaderClass = ShaderClass::ShaderClass(SC_ALPHA);
+	m_shaderClass = ShaderClass(SC_ALPHA);
 }
 
 void DebugHintObject::setLocAndColorAndSize(const Coord3D *loc, Int argb, Int size)
@@ -203,7 +198,7 @@ void DebugHintObject::setLocAndColorAndSize(const Coord3D *loc, Int argb, Int si
 	m_myColor = argb;
 	m_mySize = size;
 
-	if (m_myLoc.z < 0 && TheTerrainRenderObject) 
+	if (m_myLoc.z < 0 && TheTerrainRenderObject)
 	{
 		m_myLoc.z = TheTerrainRenderObject->getHeightMapHeight(m_myLoc.x, m_myLoc.y, NULL);
 	}
@@ -215,7 +210,7 @@ void DebugHintObject::setLocAndColorAndSize(const Coord3D *loc, Int argb, Int si
 
 		Real x1 = m_mySize * 0.866;	// cos(30)
 		Real y1 = m_mySize * 0.5;		// sin(30)
-		
+
 		// note, pts must go in a counterclockwise order!
 		vb[0].x = 0;
 		vb[0].y = m_mySize;
@@ -242,8 +237,8 @@ void DebugHintObject::setLocAndColorAndSize(const Coord3D *loc, Int argb, Int si
 
 void DebugHintObject::Render(RenderInfoClass & rinfo)
 {
-	SphereClass bounds(Vector3(m_myLoc.x, m_myLoc.y, m_myLoc.z), m_mySize); 
-	if (!rinfo.Camera.Cull_Sphere(bounds)) 
+	SphereClass bounds(Vector3(m_myLoc.x, m_myLoc.y, m_myLoc.z), m_mySize);
+	if (!rinfo.Camera.Cull_Sphere(bounds))
 	{
 		DX8Wrapper::Set_Material(m_vertexMaterialClass);
 		DX8Wrapper::Set_Shader(m_shaderClass);
@@ -278,12 +273,12 @@ W3DInGameUI::W3DInGameUI()
 		m_moveHintRenderObj[ i ] = NULL;
 		m_moveHintAnim[ i ] = NULL;
 
-	}  // end for i
+	}
 
 	m_buildingPlacementAnchor = NULL;
 	m_buildingPlacementArrow = NULL;
 
-}  // end W3DInGameUI
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -298,12 +293,12 @@ W3DInGameUI::~W3DInGameUI()
 		REF_PTR_RELEASE( m_moveHintRenderObj[ i ] );
 		REF_PTR_RELEASE( m_moveHintAnim[ i ] );
 
-	}  // end for i
+	}
 
 	REF_PTR_RELEASE( m_buildingPlacementAnchor );
 	REF_PTR_RELEASE( m_buildingPlacementArrow );
 
-}  // end ~W3DInGameUI
+}
 
 // loadText ===================================================================
 /** Load text from the file */
@@ -329,14 +324,14 @@ static void loadText( char *filename, GameWindow *listboxText )
 		line.translate(buffer);
 		line.trim();
 		if (line.isEmpty())
-			line = UnicodeString(L" ");
+			line = L" ";
 		GadgetListBoxAddEntryText(listboxText, line, color, -1, -1);
-	}  // end while
+	}
 
 	// close the file
 	fclose( fp );
 
-}  // end loadText
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -349,21 +344,21 @@ void W3DInGameUI::init( void )
 	// comment because we'll probably want to add this back in.
 /*
 		// create the MOTD
-		GameWindow *motd = TheWindowManager->winCreateFromScript( AsciiString("MOTD.wnd") );
+		GameWindow *motd = TheWindowManager->winCreateFromScript( "MOTD.wnd" );
 		if( motd )
 		{
 			NameKeyType listboxTextID = TheNameKeyGenerator->nameToKey( "MOTD.wnd:ListboxMOTD" );
 			GameWindow *listboxText = TheWindowManager->winGetWindowFromId(motd, listboxTextID);
-	
+
 			loadText( "HelpScreen.txt", listboxText );
-	
+
 			// hide it for now
 			motd->winHide( TRUE );
-	
-		}  // end if*/
-	
-		
-}  // end init
+
+		}
+*/
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update in game UI */
@@ -374,7 +369,7 @@ void W3DInGameUI::update( void )
 	// call base
 	InGameUI::update();
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the in game ui */
@@ -385,7 +380,7 @@ void W3DInGameUI::reset( void )
 	// call base
 	InGameUI::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw member for the W3D implemenation of the game user interface */
@@ -418,9 +413,9 @@ void W3DInGameUI::draw( void )
 			// draw placement angle selection if needed
 			drawPlaceAngle( view );
 
-		}  // end for view
+		}
 
-	}  // end if
+	}
 
 	// repaint all our windows
 
@@ -428,7 +423,7 @@ void W3DInGameUI::draw( void )
 	if (!DX8Wrapper::stats.m_disableConsole) {
 #endif
 
-#ifdef DO_UNIT_TIMINGS	 
+#ifdef DO_UNIT_TIMINGS
 #pragma MESSAGE("*** WARNING *** DOING DO_UNIT_TIMINGS!!!!")
 	extern Bool g_UT_startTiming;
 	if (!g_UT_startTiming)
@@ -437,12 +432,14 @@ void W3DInGameUI::draw( void )
 	postDraw();
 
 	TheWindowManager->winRepaint();
-	
+
+	postWindowDraw();
+
 #ifdef EXTENDED_STATS
 	}
 #endif
 
-}  // end draw
+}
 
 //-------------------------------------------------------------------------------------------------
 /** draw 2d selection region on screen */
@@ -459,7 +456,7 @@ void W3DInGameUI::drawSelectionRegion( void )
 														width,
 														color );
 
-}  // end drawSelectionRegion
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw the visual feedback for clicking in the world and telling units
@@ -496,7 +493,7 @@ void W3DInGameUI::drawMoveHints( View *view )
 				AsciiString animName;
 				animName.format("%s.%s", TheGlobalData->m_moveHintName.str(), TheGlobalData->m_moveHintName.str());
 				anim = W3DDisplay::m_assetManager->Get_HAnim(animName.str());
-	
+
 				// sanity
 				if( hint == NULL )
 				{
@@ -504,17 +501,17 @@ void W3DInGameUI::drawMoveHints( View *view )
 					DEBUG_CRASH(("unable to create hint"));
 					return;
 
-				}  // end if
+				}
 
 				// asign render objects to GUI data
 				m_moveHintRenderObj[ i ] = hint;
-				
+
 				// note that 'anim' is returned from Get_HAnim with an AddRef, so we don't need to addref it again.
 				// however, we do need to release the contents of moveHintAnim (if any)
 				REF_PTR_RELEASE(m_moveHintAnim[i]);
 				m_moveHintAnim[i] = anim;
-								
-			}  // end if, create render objects
+
+			}
 
 			// show the render object if hidden
 			if( m_moveHintRenderObj[ i ]->Is_Hidden() == 1 ) {
@@ -528,9 +525,9 @@ void W3DInGameUI::drawMoveHints( View *view )
 			// move this hint render object to the position and align with terrain
 			Matrix3D transform;
 			PathfindLayerEnum layer = TheTerrainLogic->alignOnTerrain( 0, m_moveHint[ i ].pos, true, transform );
-			
+
 			Real waterZ;
-			if (layer == LAYER_GROUND && TheTerrainLogic->isUnderwater(m_moveHint[ i ].pos.x, m_moveHint[ i ].pos.y, &waterZ)) 
+			if (layer == LAYER_GROUND && TheTerrainLogic->isUnderwater(m_moveHint[ i ].pos.x, m_moveHint[ i ].pos.y, &waterZ))
 			{
 				Coord3D tmp = m_moveHint[ i ].pos;
 				tmp.z = waterZ;
@@ -563,8 +560,8 @@ void W3DInGameUI::drawMoveHints( View *view )
 					// draw the line
 					TheDisplay->drawLine( start.x, start.y, end.x, end.y, width, color );
 
-				}  // end if
-			}  // end if
+				}
+			}
 #endif
 
 		}
@@ -578,11 +575,11 @@ void W3DInGameUI::drawMoveHints( View *view )
 					W3DDisplay::m_3DScene->Remove_Render_Object( m_moveHintRenderObj[ i ] );
 				}
 
-		}  // end else
+		}
 
-	}  // end for i
+	}
 
-}  // end drawMoveHints
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw visual back for clicking to attack a unit in the world */
@@ -590,7 +587,7 @@ void W3DInGameUI::drawMoveHints( View *view )
 void W3DInGameUI::drawAttackHints( View *view )
 {
 
-}  // end drawAttackHints
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Draw the angle selection for placing building if needed */
@@ -697,7 +694,7 @@ void W3DInGameUI::drawPlaceAngle( View *view )
 			m_buildingPlacementArrow->Set_Transform( *m_placeIcon[ 0 ]->getTransformMatrix() );
 	}
 
-	
+
 	//m_buildingPlacementArrow->Set_Transform(
 
 	// draw a little box at the start to show the "anchor" point
@@ -732,5 +729,5 @@ void W3DInGameUI::drawPlaceAngle( View *view )
 	//start.y = o.y * size + p.y * (size/2.0f) + end.y;
 	//TheDisplay->drawLine( start.x, start.y, end.x, end.y, width, color );
 
-}  // end drawPlaceAngle
+}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp
index c50a321fd8b..b9c75e78378 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp
@@ -47,11 +47,6 @@
 #include "mutex.h"
 #include "thread.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //Since there can't be more than 1 mouse, might as well keep these static.
 static CriticalSectionClass mutex;
@@ -77,7 +72,7 @@ void MouseThreadClass::Thread_Function()
 
 	//poll mouse and update position
 
-	while (running) 
+	while (running)
 	{
 		isThread=TRUE;
 		if (TheMouse)
@@ -109,7 +104,7 @@ W3DMouse::W3DMouse( void )
 	m_camera = NULL;
 	m_drawing = FALSE;
 
-}  // end Win32Mouse
+}
 
 W3DMouse::~W3DMouse( void )
 {
@@ -126,7 +121,7 @@ W3DMouse::~W3DMouse( void )
 
 	thread.Stop();
 
-}  // end Win32Mouse
+}
 
 void W3DMouse::initPolygonAssets(void)
 {
@@ -184,7 +179,7 @@ Bool W3DMouse::loadD3DCursorTextures(MouseCursor cursor)
 
 	if (!animFrames)
 		return FALSE;	//no animation frames defined.
-	
+
 	const char *baseName=m_cursorInfo[cursor].textureName.str();
 	char FrameName[64];
 
@@ -231,7 +226,7 @@ void W3DMouse::initD3DAssets(void)
 	if (m_currentRedrawMode == RM_DX8 && cursorTextures[1] == NULL && am)
 	{
 		for (Int i=0; i<NUM_MOUSE_CURSORS; i++)
-		{	
+		{
 			for (Int j=0; j < MAX_2D_CURSOR_ANIM_FRAMES; j++)
 			{
 				cursorTextures[i][j]=NULL;//am->Get_Texture(m_cursorInfo[i].textureName.str());
@@ -308,7 +303,7 @@ void W3DMouse::initW3DAssets(void)
 	m_camera->Set_Position( Vector3( 0, 1, 1 ) );
 	Vector2 min = Vector2( -1, -1 );
 	Vector2 max = Vector2( +1, +1 );
-	m_camera->Set_View_Plane( min, max );		
+	m_camera->Set_View_Plane( min, max );
 	m_camera->Set_Clip_Planes( 0.995f, 20.0f );
 	if (m_orthoCamera)
 		m_camera->Set_Projection_Type( CameraClass::ORTHO );
@@ -347,8 +342,8 @@ void W3DMouse::init( void )
 	if (m_currentRedrawMode == RM_DX8)
 		thread.Execute();
 	thread.Set_Priority(0);
-	
-}  // end int
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -359,7 +354,7 @@ void W3DMouse::reset( void )
 	// extend
 	Win32Mouse::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Super basic simplistic cursor */
@@ -382,7 +377,7 @@ void W3DMouse::setCursor( MouseCursor cursor )
 		return;
 	}
 
-	// extend 
+	// extend
 	Mouse::setCursor( cursor );
 
 	// if we're already on this cursor ignore the rest of code to stop cursor flickering.
@@ -406,7 +401,7 @@ void W3DMouse::setCursor( MouseCursor cursor )
 					//Since this type of cursor is updated from a non-D3D thread, we need
 					//to preallocate all surfaces in main thread.
 					loadD3DCursorTextures(cursor);
-				}	
+				}
 			}
 			if (m_currentD3DSurface[0])
 				doImageChange=TRUE;
@@ -473,7 +468,7 @@ void W3DMouse::setCursor( MouseCursor cursor )
 	// save current cursor
 	m_currentCursor = cursor;
 
-}  // end setCursor
+}
 
 extern HWND ApplicationHWnd;
 
@@ -519,7 +514,7 @@ void W3DMouse::draw(void)
 		}
 	}
 	else if (m_currentRedrawMode == RM_POLYGON)
-	{	
+	{
 		const Image *image=cursorImages[m_currentPolygonCursor];
 		if (image)
 		{
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DParticleSys.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DParticleSys.cpp
index f040861e947..8920c2338d0 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DParticleSys.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DParticleSys.cpp
@@ -36,13 +36,8 @@
 #include "W3DDevice/GameClient/W3DSnow.h"
 #include "WW3D2/camera.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
-//------------------------------------------------------------------------------ Performance Timers 
+//------------------------------------------------------------------------------ Performance Timers
 //#include "Common/PerfMetrics.h"
 //#include "Common/PerfTimer.h"
 
@@ -64,7 +59,7 @@ W3DParticleSystemManager::W3DParticleSystemManager()
 	m_pointGroup = NEW PointGroupClass();
 	//m_streakLine = NULL;
 	m_streakLine = NEW StreakLineClass();
-	
+
 	m_posBuffer = NEW_REF( ShareBufferClass<Vector3>, (MAX_POINTS_PER_GROUP, "W3DParticleSystemManager::m_posBuffer") );
 	m_RGBABuffer = NEW_REF( ShareBufferClass<Vector4>, (MAX_POINTS_PER_GROUP, "W3DParticleSystemManager::m_RGBABuffer") );
 	m_sizeBuffer = NEW_REF( ShareBufferClass<float>, (MAX_POINTS_PER_GROUP, "W3DParticleSystemManager::m_sizeBuffer") );
@@ -226,10 +221,10 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 				continue;
 
 			m_fieldParticleCount += ( sys->getPriority() == AREA_EFFECT && sys->m_isGroundAligned != FALSE );
-			
+
 			//@todo lorenzen sez: use pointer arithmetic for these arrays
 			personalities[count] = p->getPersonality();
-			
+
 			posArray[count].X = pos->x;
 			posArray[count].Y = pos->y;
 			posArray[count].Z = pos->z;
@@ -241,9 +236,9 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 			RGBAArray[count].Y = color->green;
 			RGBAArray[count].Z = color->blue;
 			RGBAArray[count].W = p->getAlpha();
-		
+
 			angleArray[count] = (uint8)(p->getAngle() * 255.0f / (2.0f * PI));
-			
+
 			if (++count == MAX_POINTS_PER_GROUP)
 				break;
 		}
@@ -252,8 +247,8 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 			continue;	//this system has no particles to render
 
 		TextureClass *texture = W3DDisplay::m_assetManager->Get_Texture( sys->getParticleTypeName().str() );
-		
-		if ( m_streakLine && sys->isUsingStreak() && (count >= 2) ) 
+
+		if ( m_streakLine && sys->isUsingStreak() && (count >= 2) )
 		{
 			m_streakLine->Reset_Line();
 
@@ -274,9 +269,9 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 					m_streakLine->Set_Shader( ShaderClass::_PresetMultiplicativeSpriteShader );
 					break;
 			}
-			
+
 			//UPDATE THE STREAK'S ARRAYS
-			m_streakLine->Set_LocsWidthsColors( 
+			m_streakLine->Set_LocsWidthsColors(
 				count,
 				m_posBuffer->Get_Array(),
 				m_sizeBuffer->Get_Array(),
@@ -295,9 +290,9 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 
 			//RENDER STREAK!
 			m_streakLine->Render( rinfo );
-			
+
 		}
-		else 
+		else
 		{
 
 			WWASSERT( m_pointGroup );
@@ -341,7 +336,7 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 				}
 				else
 					m_pointGroup->Render( rinfo );
-		
+
 			}
 		}
 
@@ -368,7 +363,7 @@ void W3DParticleSystemManager::doParticles(RenderInfoClass &rinfo)
 	*/
 
 
-	}// next system
+	}
 
 		/// @todo lorenzen sez: this should be debug only:
 	TheParticleSystemManager->setOnScreenParticleCount(m_onScreenParticleCount);
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPoly.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPoly.cpp
index 23936f2a2e6..8381408227a 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPoly.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPoly.cpp
@@ -61,18 +61,18 @@ void ClipPolyClass::Clip(const PlaneClass & plane,ClipPolyClass & dest) const
 
 	// perform clipping
 	prev_point_in_front = !plane.In_Front(Verts[iprev]);		// Note, plane normal is outward so we invert this test
-	for (Int j=0; j<vcount; j++) { 
-		
+	for (Int j=0; j<vcount; j++) {
+
 		cur_point_in_front = !plane.In_Front(Verts[i]);			// Note, plane nomral is out so we invert this test
 		if (prev_point_in_front) {
 
 			if (cur_point_in_front) {
-			
+
 				// Previous vertex was in front of plane and this vertex is in
 				// front of the plane so we emit this vertex.
 				dest.Add_Vertex(Verts[i]);
 
-			} else { 
+			} else {
 
 				// Previous vert was in front, this vert is behind, compute
 				// the intersection and emit the point.
@@ -93,13 +93,13 @@ void ClipPolyClass::Clip(const PlaneClass & plane,ClipPolyClass & dest) const
 				Vector3::Lerp(Verts[iprev],Verts[i],alpha,&int_point);
 				dest.Add_Vertex(int_point);
 				dest.Add_Vertex(Verts[i]);
-			
-			} 
-		} 
+
+			}
+		}
 
 		prev_point_in_front = cur_point_in_front;
 		iprev = i;
-		
+
 		//i = (i+1)%(Verts.Count());
 		i++;
 		if (i>=vcount) {
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
index b9760e04194..3e3ef84d7f4 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DRoadBuffer.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -43,12 +43,10 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/W3DRoadBuffer.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include "Common/GlobalData.h"
@@ -70,14 +68,9 @@
 
 static const Real TEE_WIDTH_ADJUSTMENT = 1.03f;
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 
 // A W3D shader that does alpha, texturing, tests zbuffer, doesn't update zbuffer.
@@ -105,7 +98,7 @@ static const Real CORNER_RADIUS = 1.5f;
 static const Real TIGHT_CORNER_RADIUS = 0.5f;
 /*
 
-// ShaderClass::PASS_ALWAYS, 
+// ShaderClass::PASS_ALWAYS,
 
 #define SC_ALPHA_2D ( SHADE_CNST(PASS_ALWAYS, DEPTH_WRITE_DISABLE, COLOR_WRITE_ENABLE, \
 	SRCBLEND_SRC_ALPHA, DSTBLEND_ONE_MINUS_SRC_ALPHA, FOG_DISABLE, GRADIENT_DISABLE, \
@@ -115,7 +108,7 @@ ShaderClass ShaderClass::_PresetAlpha2DShader(SC_ALPHA_2D);
 */
 
 /** Calculate the sign of the cross product.  If the tails of the vectors are both placed
-at 0,0, then the cross product can be interpreted as -1 means v2 is to the right of v1, 
+at 0,0, then the cross product can be interpreted as -1 means v2 is to the right of v1,
 1 means v2 is to the left of v1, and 0 means v2 is parallel to v1. */
 
 static Int xpSign(const Vector2 &v1, const Vector2 &v2) {
@@ -128,7 +121,7 @@ static Int xpSign(const Vector2 &v1, const Vector2 &v2) {
 static Bool s_dynamic = false;
 
 //-----------------------------------------------------------------------------
-//         Private Class                                               
+//         Private Class
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -247,14 +240,11 @@ m_bounds(Vector3(0.0f, 0.0f, 0.0f), 1.0f)
 RoadSegment::~RoadSegment(void)
 {
 	m_numVertex = 0;
-	if (m_vb) {
-		delete[] m_vb;
-	}
-	m_vb= NULL;
+	delete[] m_vb;
+	m_vb = NULL;
+
 	m_numIndex = 0;
-	if (m_ib) {
-		delete[] m_ib;
-	}
+	delete[] m_ib;
 	m_ib = NULL;
 }
 
@@ -267,15 +257,18 @@ RoadSegment::~RoadSegment(void)
 //=============================================================================
 void RoadSegment::SetVertexBuffer(VertexFormatXYZDUV1 *vb, Int numVertex)
 {
-	if (m_vb) {
-		delete[] m_vb;
-		m_vb = NULL;
-		m_numVertex = 0;
-	}
+	delete[] m_vb;
+	m_vb = NULL;
+	m_numVertex = 0;
+
 	Vector3 verts[MAX_SEG_VERTEX];
-	if (numVertex<1 || numVertex > MAX_SEG_VERTEX) return;
+	if (numVertex<1 || numVertex > MAX_SEG_VERTEX)
+		return;
+
 	m_vb = NEW VertexFormatXYZDUV1[numVertex];	// pool[]ify
-	if (!m_vb) return;
+	if (!m_vb)
+		return;
+
 	m_numVertex = numVertex;
 	memcpy(m_vb, vb, numVertex*sizeof(VertexFormatXYZDUV1));
 	Int i;
@@ -295,14 +288,17 @@ void RoadSegment::SetVertexBuffer(VertexFormatXYZDUV1 *vb, Int numVertex)
 //=============================================================================
 void RoadSegment::SetIndexBuffer(UnsignedShort *ib, Int numIndex)
 {
-	if (m_ib) {
-		delete[] m_ib;
-		m_ib = NULL;
-		m_numIndex = 0;
-	}
-	if (numIndex < 1 || numIndex > MAX_SEG_INDEX) return;
+	delete[] m_ib;
+	m_ib = NULL;
+	m_numIndex = 0;
+
+	if (numIndex < 1 || numIndex > MAX_SEG_INDEX)
+		return;
+
 	m_ib = NEW UnsignedShort[numIndex];
-	if (!m_ib) return;
+	if (!m_ib)
+		return;
+
 	m_numIndex = numIndex;
 	memcpy(m_ib, ib, numIndex*sizeof(UnsignedShort));
 }
@@ -355,7 +351,7 @@ void RoadSegment::updateSegLighting(void)
 }
 
 //-----------------------------------------------------------------------------
-//         Private Methods                                               
+//         Private Methods
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -363,7 +359,7 @@ void RoadSegment::updateSegLighting(void)
 //=============================================================================
 /** Loads a tee into the vertex buffer for a road join. */
 //=============================================================================
-void W3DRoadBuffer::loadTee(RoadSegment *pRoad, Vector2 loc1, 
+void W3DRoadBuffer::loadTee(RoadSegment *pRoad, Vector2 loc1,
 														Vector2 loc2, Bool is4Way, Real scale)
 {
 	Vector2 roadVector(loc2.X-loc1.X, loc2.Y-loc1.Y);
@@ -387,16 +383,16 @@ void W3DRoadBuffer::loadTee(RoadSegment *pRoad, Vector2 loc1,
 	Real left = pRoad->m_widthInTexture*scale/2.0f;
 	loadFloatSection(pRoad, loc1, loc2-loc1, teeFactor, left, teeFactor, uOffset, vOffset, scale);
 }
-				
+
 //=============================================================================
 // W3DRoadBuffer::loadAlphaJoin
 //=============================================================================
 /** Loads an alpha join into the vertex buffer for a road join. */
 //=============================================================================
-void W3DRoadBuffer::loadAlphaJoin(RoadSegment *pRoad, Vector2 loc1, 
+void W3DRoadBuffer::loadAlphaJoin(RoadSegment *pRoad, Vector2 loc1,
 														Vector2 loc2,Real scale)
 {
-	
+
 	Vector2 roadVector(loc2.X-loc1.X, loc2.Y-loc1.Y);
 	Vector2 roadNormal(-roadVector.Y, roadVector.X);
 //	Real roadLen = scale;
@@ -426,16 +422,16 @@ void W3DRoadBuffer::loadAlphaJoin(RoadSegment *pRoad, Vector2 loc1,
 	corners[topRight] = corners[topLeft] + roadVector;
 	loadFloat4PtSection(pRoad, loc1, roadNormal, roadVector, corners, uOffset, vOffset, scale, uScale);
 }
-				
+
 //=============================================================================
 // W3DRoadBuffer::loadY
 //=============================================================================
 /** Loads a Y into the vertex buffer for a road join. */
 //=============================================================================
-void W3DRoadBuffer::loadY(RoadSegment *pRoad, Vector2 loc1, 
+void W3DRoadBuffer::loadY(RoadSegment *pRoad, Vector2 loc1,
 														Vector2 loc2,Real scale)
 {
-	
+
 	Vector2 roadVector(loc2.X-loc1.X, loc2.Y-loc1.Y);
 	Vector2 roadNormal(-roadVector.Y, roadVector.X);
 //	Real roadLen = scale;
@@ -465,16 +461,16 @@ void W3DRoadBuffer::loadY(RoadSegment *pRoad, Vector2 loc1,
 	corners[topRight] = corners[topLeft] + roadVector;
 	loadFloat4PtSection(pRoad, loc1, roadNormal, roadVector, corners, uOffset, vOffset, scale, scale);
 }
-				
+
 //=============================================================================
 // W3DRoadBuffer::loadH
 //=============================================================================
 /** Loads a h shaped tee into the vertex buffer for a road join. */
 //=============================================================================
-void W3DRoadBuffer::loadH(RoadSegment *pRoad, Vector2 loc1, 
+void W3DRoadBuffer::loadH(RoadSegment *pRoad, Vector2 loc1,
 														Vector2 loc2, Bool flip, Real scale)
 {
-	
+
 	Vector2 roadVector(loc2.X-loc1.X, loc2.Y-loc1.Y);
 	Vector2 roadNormal(-roadVector.Y, roadVector.X);
 //	Real roadLen = scale;
@@ -492,7 +488,7 @@ void W3DRoadBuffer::loadH(RoadSegment *pRoad, Vector2 loc1,
 	Real roadwidth = scale;
 
 	roadVector *= roadwidth;
-	roadNormal *= roadwidth;																												 
+	roadNormal *= roadwidth;
 
 
 	Vector2	corners[NUM_CORNERS];
@@ -511,15 +507,15 @@ void W3DRoadBuffer::loadH(RoadSegment *pRoad, Vector2 loc1,
 	if (flip) roadNormal = -roadNormal;
 	loadFloat4PtSection(pRoad, loc1, roadNormal, roadVector, corners, uOffset, vOffset, scale, scale);
 }
-				
+
 //=============================================================================
 // W3DRoadBuffer::loadFloatSection
 //=============================================================================
-/** Loads a section of road using a mesh that floats a little above the 
+/** Loads a section of road using a mesh that floats a little above the
 terrain. */
 //=============================================================================
-void W3DRoadBuffer::loadFloatSection(RoadSegment *pRoad, Vector2 loc, 
-														Vector2 roadVector, Real halfHeight, Real left, Real right, 
+void W3DRoadBuffer::loadFloatSection(RoadSegment *pRoad, Vector2 loc,
+														Vector2 roadVector, Real halfHeight, Real left, Real right,
 														Real uOffset, Real vOffset, Real scale)
 {
 	if (m_map==NULL) {
@@ -558,25 +554,25 @@ void W3DRoadBuffer::loadFloatSection(RoadSegment *pRoad, Vector2 loc,
 //=============================================================================
 // W3DRoadBuffer::loadFloat4PtSection
 //=============================================================================
-/** Loads a section of road using a mesh that floats a little above the 
+/** Loads a section of road using a mesh that floats a little above the
 terrain.  The road is loaded into the quadrilateral defined by the
-4 corners points.  loc specifies the point where u==uOffset && v==vOffset, and 
+4 corners points.  loc specifies the point where u==uOffset && v==vOffset, and
 the road vector gives the direction of the road, and the road normal is perpendicular
 to the road normal.  */
 //=============================================================================
-void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc, 
+void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 														Vector2 roadNormal, Vector2 roadVector,
-														Vector2 *cornersP, 
+														Vector2 *cornersP,
 														Real uOffset, Real vOffset, Real uScale, Real vScale)
 {
-	
+
 	const Real FLOAT_AMOUNT = MAP_HEIGHT_SCALE/8;
 	const Real MAX_ERROR = MAP_HEIGHT_SCALE*1.1f;
 	UnsignedShort ib[MAX_SEG_INDEX];
 	VertexFormatXYZDUV1 vb[MAX_SEG_VERTEX];
 	Int numRoadVertices = 0;
 	Int numRoadIndices = 0;
-	
+
 	TRoadSegInfo info;
 	info.loc = loc;
 	info.roadNormal = roadNormal;
@@ -617,7 +613,7 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 
 	if (vCount>maxRows) vCount = maxRows;
 	TColumn prevColumn, curColumn, nextColumn;
-				
+
 	prevColumn.deleted = true;
 	curColumn.deleted = true;
 	Int i, j, k;
@@ -625,7 +621,7 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 	Vector3 origin(v2.X, v2.Y, 0);
 	v2 = cornersP[bottomRight] - cornersP[bottomLeft];
 	Vector3 uVector1(v2.X, v2.Y, 0);
-	v2 = cornersP[topRight] - cornersP[topLeft]; 
+	v2 = cornersP[topRight] - cornersP[topLeft];
 	Vector3 uVector2(v2.X, v2.Y, 0);
 	v2 = cornersP[topLeft];
 	Vector3 origin2(v2.X, v2.Y, 0);
@@ -649,8 +645,8 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 				Real jFactor = ((Real)j / (vCount-1));
 				Real jBarFactor = 1.0f-jFactor;
 				nextColumn.vtx[j] = origin +  (uVector1 * jBarFactor * iFactor) + (uVector2 * jFactor * iFactor) +
-													(vVector1 * iBarFactor * jFactor) + (vVector2 * iFactor * jFactor) ;	
-				Real z = TheTerrainRenderObject->getMaxCellHeight(nextColumn.vtx[j].X, nextColumn.vtx[j].Y); 
+													(vVector1 * iBarFactor * jFactor) + (vVector2 * iFactor * jFactor) ;
+				Real z = TheTerrainRenderObject->getMaxCellHeight(nextColumn.vtx[j].X, nextColumn.vtx[j].Y);
 				if (z<minHeight) minHeight = z;
 				if (z>maxHeight) maxHeight = z;
 				nextColumn.vertexIndex[j] = -1;
@@ -682,11 +678,11 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 				if (prevColumn.collapsed && curColumn.collapsed && nextColumn.collapsed) {
 					Bool okToDelete = false;
 
-					Real theZ = prevColumn.vtx[0].Z * (curColumn.uIndex-prevColumn.uIndex) + 
+					Real theZ = prevColumn.vtx[0].Z * (curColumn.uIndex-prevColumn.uIndex) +
 										nextColumn.vtx[0].Z * (nextColumn.uIndex-curColumn.uIndex);
 					theZ /= nextColumn.uIndex-prevColumn.uIndex;
 					if (theZ >= curColumn.vtx[0].Z && theZ < curColumn.vtx[0].Z + MAX_ERROR) {
-						theZ = prevColumn.vtx[1].Z * (curColumn.uIndex-prevColumn.uIndex) + 
+						theZ = prevColumn.vtx[1].Z * (curColumn.uIndex-prevColumn.uIndex) +
 											nextColumn.vtx[1].Z * (nextColumn.uIndex-curColumn.uIndex);
 						theZ /= nextColumn.uIndex-prevColumn.uIndex;
 						if (theZ >= curColumn.vtx[1].Z && theZ < curColumn.vtx[1].Z + MAX_ERROR) {
@@ -695,7 +691,7 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 					}
 					if (okToDelete) {
 						curColumn.deleted = true;
-					}				
+					}
 				}
 			}
 		}
@@ -738,9 +734,9 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 					}
 					UnsignedShort *curIb = ib+numRoadIndices;
 					if (k==0 || !prevColumn.collapsed) {
-						*curIb++ = prevColumn.vertexIndex[j+1];	
-						*curIb++ = prevColumn.vertexIndex[j];		
-						*curIb++ = curColumn.vertexIndex[k];		
+						*curIb++ = prevColumn.vertexIndex[j+1];
+						*curIb++ = prevColumn.vertexIndex[j];
+						*curIb++ = curColumn.vertexIndex[k];
 						numRoadIndices+=3;
 					}
 					if (j==0 || !curColumn.collapsed) {
@@ -748,9 +744,9 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 						if (curColumn.collapsed && !prevColumn.collapsed) {
 							offset = vCount-1;
 						}
-						*curIb++ = prevColumn.vertexIndex[j+offset];	
-						*curIb++ = curColumn.vertexIndex[k];		
-						*curIb++ = curColumn.vertexIndex[k+1];	
+						*curIb++ = prevColumn.vertexIndex[j+offset];
+						*curIb++ = curColumn.vertexIndex[k];
+						*curIb++ = curColumn.vertexIndex[k+1];
 						numRoadIndices+=3;
 					}
 					if (prevColumn.collapsed && curColumn.collapsed) {
@@ -780,19 +776,19 @@ void W3DRoadBuffer::loadFloat4PtSection(RoadSegment *pRoad, Vector2 loc,
 //=============================================================================
 // W3DRoadBuffer::loadLit4PtSection
 //=============================================================================
-/** Loads a section of road using a mesh that floats a little above the 
+/** Loads a section of road using a mesh that floats a little above the
 terrain.  The road is loaded into the quadrilateral defined by the
-4 corners points.  loc specifies the point where u==uOffset && v==vOffset, and 
+4 corners points.  loc specifies the point where u==uOffset && v==vOffset, and
 the road vector gives the direction of the road, and the road normal is perpendicular
 to the road normal.  */
 //=============================================================================
 void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, VertexFormatXYZDUV1 *vb, RefRenderObjListIterator *pDynamicLightsIterator)
 {
-	
+
 	const Real FLOAT_AMOUNT = MAP_HEIGHT_SCALE/8;
 	const Real MAX_ERROR = MAP_HEIGHT_SCALE*1.1f;
 
-	
+
 	if (pRoad->m_uniqueID != m_curUniqueID) {
 		return;
 	}
@@ -803,7 +799,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 	const Int maxLights = 8;
 	LightClass *lights[maxLights];
 
-	for (pDynamicLightsIterator->First(); !pDynamicLightsIterator->Is_Done(); pDynamicLightsIterator->Next()) {		
+	for (pDynamicLightsIterator->First(); !pDynamicLightsIterator->Is_Done(); pDynamicLightsIterator->Next()) {
 			LightClass *pLight = (LightClass*)pDynamicLightsIterator->Peek_Obj();
 			SphereClass bounds = pLight->Get_Bounding_Sphere();
 			if (Spheres_Intersect(pRoad->getBounds(), bounds)) {
@@ -840,7 +836,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 
 	if (vCount>maxRows) vCount = maxRows;
 	TColumn prevColumn, curColumn, nextColumn;
-				
+
 	prevColumn.deleted = true;
 	curColumn.deleted = true;
 	Int i, j, k;
@@ -848,7 +844,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 	Vector3 origin(v2.X, v2.Y, 0);
 	v2 = info.corners[bottomRight] - info.corners[bottomLeft];
 	Vector3 uVector1(v2.X, v2.Y, 0);
-	v2 = info.corners[topRight] - info.corners[topLeft]; 
+	v2 = info.corners[topRight] - info.corners[topLeft];
 	Vector3 uVector2(v2.X, v2.Y, 0);
 	v2 = info.corners[topLeft];
 	Vector3 origin2(v2.X, v2.Y, 0);
@@ -872,8 +868,8 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 				Real jFactor = ((Real)j / (vCount-1));
 				Real jBarFactor = 1.0f-jFactor;
 				nextColumn.vtx[j] = origin +  (uVector1 * jBarFactor * iFactor) + (uVector2 * jFactor * iFactor) +
-													(vVector1 * iBarFactor * jFactor) + (vVector2 * iFactor * jFactor) ;	
-				Real z = TheTerrainRenderObject->getMaxCellHeight(nextColumn.vtx[j].X, nextColumn.vtx[j].Y); 
+													(vVector1 * iBarFactor * jFactor) + (vVector2 * iFactor * jFactor) ;
+				Real z = TheTerrainRenderObject->getMaxCellHeight(nextColumn.vtx[j].X, nextColumn.vtx[j].Y);
 				if (z<minHeight) minHeight = z;
 				if (z>maxHeight) maxHeight = z;
 				nextColumn.vertexIndex[j] = -1;
@@ -905,11 +901,11 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 				if (prevColumn.collapsed && curColumn.collapsed && nextColumn.collapsed) {
 					Bool okToDelete = false;
 
-					Real theZ = prevColumn.vtx[0].Z * (curColumn.uIndex-prevColumn.uIndex) + 
+					Real theZ = prevColumn.vtx[0].Z * (curColumn.uIndex-prevColumn.uIndex) +
 										nextColumn.vtx[0].Z * (nextColumn.uIndex-curColumn.uIndex);
 					theZ /= nextColumn.uIndex-prevColumn.uIndex;
 					if (theZ >= curColumn.vtx[0].Z && theZ < curColumn.vtx[0].Z + MAX_ERROR) {
-						theZ = prevColumn.vtx[1].Z * (curColumn.uIndex-prevColumn.uIndex) + 
+						theZ = prevColumn.vtx[1].Z * (curColumn.uIndex-prevColumn.uIndex) +
 											nextColumn.vtx[1].Z * (nextColumn.uIndex-curColumn.uIndex);
 						theZ /= nextColumn.uIndex-prevColumn.uIndex;
 						if (theZ >= curColumn.vtx[1].Z && theZ < curColumn.vtx[1].Z + MAX_ERROR) {
@@ -918,7 +914,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 					}
 					if (okToDelete) {
 						curColumn.deleted = true;
-					}				
+					}
 				}
 			}
 		}
@@ -965,7 +961,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 						}
 	#endif
 						factor = WWMath::Clamp(factor,0.0f,1.0f);
-						Real shade = 0.5f; 
+						Real shade = 0.5f;
 						shade *= factor;
 						Vector3 diffuse;
 						lights[k]->Get_Diffuse(&diffuse);
@@ -975,10 +971,10 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 						if(shade < 0.0f) shade = 0.0f;
 						shadeR += shade*diffuse.X;
 						shadeG += shade*diffuse.Y;
-						shadeB += shade*diffuse.Z;		
+						shadeB += shade*diffuse.Z;
 						shadeR += factor*ambient.X;
 						shadeG += factor*ambient.Y;
-						shadeB += factor*ambient.Z;		
+						shadeB += factor*ambient.Z;
 					}
 				}
  				if (shadeR > 1.0) shadeR = 1.0;
@@ -1020,9 +1016,9 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 					}
 					UnsignedShort *curIb = ib+m_curNumRoadIndices;
 					if (k==0 || !prevColumn.collapsed) {
-						*curIb++ = prevColumn.vertexIndex[j+1];	
-						*curIb++ = prevColumn.vertexIndex[j];		
-						*curIb++ = curColumn.vertexIndex[k];		
+						*curIb++ = prevColumn.vertexIndex[j+1];
+						*curIb++ = prevColumn.vertexIndex[j];
+						*curIb++ = curColumn.vertexIndex[k];
 						m_curNumRoadIndices+=3;
 					}
 					if (j==0 || !curColumn.collapsed) {
@@ -1030,9 +1026,9 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 						if (curColumn.collapsed && !prevColumn.collapsed) {
 							offset = vCount-1;
 						}
-						*curIb++ = prevColumn.vertexIndex[j+offset];	
-						*curIb++ = curColumn.vertexIndex[k];		
-						*curIb++ = curColumn.vertexIndex[k+1];	
+						*curIb++ = prevColumn.vertexIndex[j+offset];
+						*curIb++ = curColumn.vertexIndex[k];
+						*curIb++ = curColumn.vertexIndex[k+1];
 						m_curNumRoadIndices+=3;
 					}
 					if (prevColumn.collapsed && curColumn.collapsed) {
@@ -1056,7 +1052,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 		curColumn = nextColumn;
 	}
 }
-																 
+
 //=============================================================================
 // W3DRoadBuffer::loadCurve
 //=============================================================================
@@ -1064,7 +1060,7 @@ void W3DRoadBuffer::loadLit4PtSection(RoadSegment *pRoad, UnsignedShort *ib, Ver
 //=============================================================================
 void W3DRoadBuffer::loadCurve(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Real scale)
 {
-	
+
 	Real uOffset = (4.0f/512.0f);
 	Real vOffset = (255.0f/512.0f);	 // CORNER_RADIUS radius 1.5 curve.
 	if (pRoad->m_curveRadius == TIGHT_CORNER_RADIUS) {
@@ -1093,7 +1089,7 @@ void W3DRoadBuffer::loadCurve(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Re
 	corners[topLeft] = corners[bottomLeft];
  	corners[topLeft] += 2*roadNormal;
 
-	// Tweak a little 
+	// Tweak a little
 	if (pRoad->m_curveRadius == TIGHT_CORNER_RADIUS) {
 		corners[bottomLeft] = loc1 - roadNormal;
 		corners[bottomRight] = corners[bottomLeft];
@@ -1103,7 +1099,7 @@ void W3DRoadBuffer::loadCurve(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Re
 		corners[topLeft] = corners[bottomLeft];
  		corners[topLeft] += 2*roadNormal;
 
-		corners[bottomRight] += roadVector*0.1f;	  
+		corners[bottomRight] += roadVector*0.1f;
 		corners[bottomRight] += roadNormal*0.2f;
 		corners[bottomLeft] -= roadNormal*0.1f;
 		corners[bottomLeft] -= roadVector*0.02f;
@@ -1120,7 +1116,7 @@ void W3DRoadBuffer::loadCurve(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Re
 		corners[topLeft] = corners[bottomLeft];
  		corners[topLeft] += 2*roadNormal;
 
-		corners[bottomRight] += roadVector*0.1f;	  
+		corners[bottomRight] += roadVector*0.1f;
 		corners[bottomRight] += roadNormal*0.4f;
 		corners[bottomLeft] -= roadNormal*0.2f;
 		corners[bottomLeft] -= roadVector*0.02f;
@@ -1133,7 +1129,7 @@ void W3DRoadBuffer::loadCurve(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Re
 	loadFloat4PtSection(pRoad, loc1, roadNormal, roadVector, corners, uOffset, vOffset, scale, scale);
 
 }
-																 																 
+
 //=============================================================================
 // W3DRoadBuffer::preloadRoadSegment
 //=============================================================================
@@ -1141,7 +1137,7 @@ void W3DRoadBuffer::loadCurve(RoadSegment *pRoad, Vector2 loc1, Vector2 loc2, Re
 //=============================================================================
 void W3DRoadBuffer::preloadRoadSegment(RoadSegment *pRoad)
 {
-	
+
 	Vector2 roadVector = pRoad->m_pt2.loc-pRoad->m_pt1.loc;
 	Vector2 roadNormal(-roadVector.Y, roadVector.X);
 //	Real roadLen = roadVector.Length();
@@ -1158,7 +1154,7 @@ void W3DRoadBuffer::preloadRoadSegment(RoadSegment *pRoad)
 	corners[topLeft] = pRoad->m_pt1.top;
 	corners[bottomRight] = pRoad->m_pt2.bottom;
 	corners[topRight] = pRoad->m_pt2.top;
-	loadFloat4PtSection(pRoad, pRoad->m_pt1.loc, roadNormal, roadVector, corners, uOffset, vOffset, 
+	loadFloat4PtSection(pRoad, pRoad->m_pt1.loc, roadNormal, roadVector, corners, uOffset, vOffset,
 		pRoad->m_scale, pRoad->m_scale);
 
 }
@@ -1176,43 +1172,43 @@ void W3DRoadBuffer::preloadRoadsInVertexAndIndexBuffers()
 
 	Int curRoad;
 
-	// Do road segments.  
+	// Do road segments.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		if (m_roads[curRoad].m_type == SEGMENT) {
 			preloadRoadSegment(&m_roads[curRoad]);
 		}
-	}		
-	// Do curves.	
+	}
+	// Do curves.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		if (m_roads[curRoad].m_type == CURVE) {
 			loadCurve(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc, m_roads[curRoad].m_scale);
 		}
 	}
-	// Do tees.	
+	// Do tees.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		if (m_roads[curRoad].m_type == THREE_WAY_Y) {
-			loadY(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc, 
+			loadY(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc,
 				m_roads[curRoad].m_scale);
 		}
 	}
-	// Do tees.	
+	// Do tees.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		if (m_roads[curRoad].m_type == THREE_WAY_H || m_roads[curRoad].m_type == THREE_WAY_H_FLIP) {
-			loadH(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc, 
+			loadH(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc,
 				m_roads[curRoad].m_type == THREE_WAY_H_FLIP, m_roads[curRoad].m_scale);
 		}
 	}
-	// Do tees.	
+	// Do tees.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		if (m_roads[curRoad].m_type == TEE || m_roads[curRoad].m_type == FOUR_WAY) {
-			loadTee(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc, 
+			loadTee(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc,
 				(m_roads[curRoad].m_type == FOUR_WAY), m_roads[curRoad].m_scale);
 		}
 	}
 	// Do joins.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		if (m_roads[curRoad].m_type == ALPHA_JOIN) {
-			loadAlphaJoin(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc, 
+			loadAlphaJoin(&m_roads[curRoad], m_roads[curRoad].m_pt1.loc, m_roads[curRoad].m_pt2.loc,
 				 m_roads[curRoad].m_scale);
 		}
 	}
@@ -1254,7 +1250,7 @@ void W3DRoadBuffer::loadRoadsInVertexAndIndexBuffers()
 			if (m_roads[curRoad].m_type == corner) {
 				loadRoadSegment(ib, vb, &m_roads[curRoad]);
 			}
-		}		
+		}
 	}
 	this->m_roadTypes[m_curRoadType].setNumVertices(m_curNumRoadVertices);
 	this->m_roadTypes[m_curRoadType].setNumIndices(m_curNumRoadIndices);
@@ -1299,7 +1295,7 @@ Bool W3DRoadBuffer::visibilityChanged(const IRegion2D &bounds)
 			visChanged = true;
 		}
 		m_roads[curRoad].m_visible = newVis;
-	}		
+	}
 	return visChanged;
 }
 
@@ -1333,7 +1329,7 @@ void W3DRoadBuffer::loadLitRoadsInVertexAndIndexBuffers(RefRenderObjListIterator
 				if (m_roads[curRoad].m_type == corner) {
 					loadLit4PtSection(&m_roads[curRoad], ib, vb, pDynamicLightsIterator);
 				}
-			}		
+			}
 		}
 	}
 	this->m_roadTypes[m_curRoadType].setNumVertices(m_curNumRoadVertices);
@@ -1371,7 +1367,7 @@ void W3DRoadBuffer::moveRoadSegTo(Int fromNdx, Int toNdx)
 {
 	if (fromNdx<0 || fromNdx>=m_numRoads || toNdx<0 || toNdx>=m_numRoads) {
 #ifdef RTS_DEBUG
-		DEBUG_LOG(("bad moveRoadSegTo\n"));
+		DEBUG_LOG(("bad moveRoadSegTo"));
 #endif
 		return;
 	}
@@ -1404,9 +1400,9 @@ void W3DRoadBuffer::checkLinkBefore(Int ndx)
 
 	Vector2 loc2 = m_roads[ndx].m_pt2.loc;
 #ifdef RTS_DEBUG
-	DEBUG_ASSERTLOG(m_roads[ndx].m_pt1.loc == m_roads[ndx+1].m_pt2.loc, ("Bad link\n"));
+	DEBUG_ASSERTLOG(m_roads[ndx].m_pt1.loc == m_roads[ndx+1].m_pt2.loc, ("Bad link"));
 	if (ndx>0) {
-		DEBUG_ASSERTLOG(m_roads[ndx].m_pt2.loc != m_roads[ndx-1].m_pt1.loc, ("Bad Link\n"));
+		DEBUG_ASSERTLOG(m_roads[ndx].m_pt2.loc != m_roads[ndx-1].m_pt1.loc, ("Bad Link"));
 	}
 #endif
 
@@ -1421,7 +1417,7 @@ void W3DRoadBuffer::checkLinkBefore(Int ndx)
 	while (checkNdx < m_numRoads) {
 		if (m_roads[checkNdx].m_pt1.loc == loc2) {
 #ifdef RTS_DEBUG
-			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt1.count==1, ("Bad count\n"));
+			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt1.count==1, ("Bad count"));
 #endif
 			moveRoadSegTo(checkNdx, ndx);
 			loc2 = m_roads[ndx].m_pt2.loc;
@@ -1432,7 +1428,7 @@ void W3DRoadBuffer::checkLinkBefore(Int ndx)
 			if (m_roads[checkNdx].m_pt2.count!=1) {
 				::OutputDebugString("fooey.\n");
 			}
-			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt2.count==1, ("Bad count\n"));
+			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt2.count==1, ("Bad count"));
 #endif
 			flipTheRoad(&m_roads[checkNdx]);
 			moveRoadSegTo(checkNdx, ndx);
@@ -1466,14 +1462,14 @@ void W3DRoadBuffer::checkLinkAfter(Int ndx)
 
 	Vector2 loc1 = m_roads[ndx].m_pt1.loc;
 #ifdef RTS_DEBUG
-	DEBUG_ASSERTLOG(m_roads[ndx].m_pt2.loc == m_roads[ndx-1].m_pt1.loc, ("Bad link\n"));
+	DEBUG_ASSERTLOG(m_roads[ndx].m_pt2.loc == m_roads[ndx-1].m_pt1.loc, ("Bad link"));
 #endif
 
 	Int checkNdx = ndx+1;
 	while (checkNdx < m_numRoads && ndx < m_numRoads-1) {
 		if (m_roads[checkNdx].m_pt2.loc == loc1) {
 #ifdef RTS_DEBUG
-			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt2.count==1, ("Bad count\n"));
+			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt2.count==1, ("Bad count"));
 #endif
 			ndx++;
 			moveRoadSegTo(checkNdx, ndx);
@@ -1481,7 +1477,7 @@ void W3DRoadBuffer::checkLinkAfter(Int ndx)
 			if (m_roads[ndx].m_pt1.count != 1) return;
 		} else if (m_roads[checkNdx].m_pt1.loc == loc1) {
 #ifdef RTS_DEBUG
-			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt1.count==1, ("Wrong m_pt1.count.\n"));
+			DEBUG_ASSERTLOG(m_roads[checkNdx].m_pt1.count==1, ("Wrong m_pt1.count."));
 			if ( m_roads[checkNdx].m_pt1.count!=1) {
 				::OutputDebugString("Wrong m_pt1.count.\n");
 			}
@@ -1499,7 +1495,7 @@ void W3DRoadBuffer::checkLinkAfter(Int ndx)
 }
 
 static Bool warnSegments = true;
-#define CHECK_SEGMENTS {if (m_numRoads >= m_maxRoadSegments) { if (warnSegments) DEBUG_LOG(("****** Too many road segments.  Need to increase ini values.  See john a.\n")); warnSegments = false; return;}}
+#define CHECK_SEGMENTS {if (m_numRoads >= m_maxRoadSegments) { if (warnSegments) DEBUG_LOG(("****** Too many road segments.  Need to increase ini values.  See john a.")); warnSegments = false; return;}}
 
 //=============================================================================
 // W3DRoadBuffer::addMapObject
@@ -1537,7 +1533,7 @@ void W3DRoadBuffer::addMapObject(RoadSegment *pRoad, Bool updateTheCounts)
 		if ( (m_roads[i].m_pt1.loc==loc1 && m_roads[i].m_pt2.loc==loc2) ||
 			(m_roads[i].m_pt1.loc==loc2 && m_roads[i].m_pt2.loc==loc1) ) {
 			bothMatch = true;	// identical segment, so discard.
-			break; 
+			break;
 		}
 		if (cur.m_pt1.count==1) {
 			if ((m_roads[i].m_pt1.loc == loc1)) {
@@ -1579,7 +1575,7 @@ void W3DRoadBuffer::addMapObject(RoadSegment *pRoad, Bool updateTheCounts)
 	m_roads[addIndex] = cur;
 	if (flip) {
 		flipTheRoad(&m_roads[addIndex]);
-	} 
+	}
 	m_numRoads++;
 	if (addBefore) {
 		checkLinkBefore(addIndex);
@@ -1604,7 +1600,7 @@ void W3DRoadBuffer::addMapObjects()
 		if (pMapObj->getFlag(FLAG_ROAD_POINT1)) {
 			pMapObj2 = pMapObj->getNext();
 #ifdef RTS_DEBUG
-			DEBUG_ASSERTLOG(pMapObj2 && pMapObj2->getFlag(FLAG_ROAD_POINT2), ("Bad Flag\n"));
+			DEBUG_ASSERTLOG(pMapObj2 && pMapObj2->getFlag(FLAG_ROAD_POINT2), ("Bad Flag"));
 #endif
 			if (pMapObj2==NULL) break;
 			if (!pMapObj2->getFlag(FLAG_ROAD_POINT2)) continue;
@@ -1615,8 +1611,8 @@ void W3DRoadBuffer::addMapObjects()
 				loc2.X += 0.25;
 			}
 			RoadSegment	curRoad;
-			curRoad.m_scale = DEFAULT_ROAD_SCALE; 
-			curRoad.m_widthInTexture = 1.0f; 
+			curRoad.m_scale = DEFAULT_ROAD_SCALE;
+			curRoad.m_widthInTexture = 1.0f;
 			curRoad.m_uniqueID = 1;
 			Bool found = false;
 			TerrainRoadType *road = TheTerrainRoads->findRoad( pMapObj->getName() );
@@ -1626,14 +1622,14 @@ void W3DRoadBuffer::addMapObjects()
 				curRoad.m_scale = road->getRoadWidth();
 				curRoad.m_uniqueID = road->getID();
 				found = TRUE;
-			}  // end if
+			}
 #ifdef LOAD_TEST_ASSETS
 			const Real DEFAULT_SCALE = 30;
 			if (!found) {
 				Int i;
 				for (i=0; i<m_maxRoadTypes; i++) {
 					if (pMapObj->getName() == m_roadTypes[i].getPath()) {
-						curRoad.m_scale = DEFAULT_SCALE; 
+						curRoad.m_scale = DEFAULT_SCALE;
 						curRoad.m_uniqueID = m_roadTypes[i].getUniqueID();
 						found = true;
 					}
@@ -1641,7 +1637,7 @@ void W3DRoadBuffer::addMapObjects()
 			}
 			if (!found && m_curOpenRoad<m_maxRoadTypes) {
 				m_maxUID++;
-				curRoad.m_scale = DEFAULT_SCALE; 
+				curRoad.m_scale = DEFAULT_SCALE;
 				curRoad.m_uniqueID = m_maxUID;
 				m_roadTypes[m_curOpenRoad].loadTexture(pMapObj->getName(), m_maxUID);
 				m_curOpenRoad++;
@@ -1653,12 +1649,12 @@ void W3DRoadBuffer::addMapObjects()
 			curRoad.m_pt2.loc =loc2;
 			curRoad.m_pt2.isAngled = pMapObj2->getFlag(FLAG_ROAD_CORNER_ANGLED);
 			curRoad.m_pt2.isJoin = pMapObj2->getFlag(FLAG_ROAD_JOIN);
-			curRoad.m_type = SEGMENT; 
+			curRoad.m_type = SEGMENT;
 			curRoad.m_curveRadius = pMapObj->getFlag(FLAG_ROAD_CORNER_TIGHT)?TIGHT_CORNER_RADIUS:CORNER_RADIUS;
 
 			addMapObject(&curRoad, true);
 			pMapObj = pMapObj2;
-		} 
+		}
 	}
 	Int curCount = m_numRoads;
 	Int i;
@@ -1780,7 +1776,7 @@ void W3DRoadBuffer::insertTee(Vector2 loc, Int index1, Real scale)
 	TRoadPt *pr2=NULL;
 	TRoadPt *pr3=NULL;
 
-	// pc1-3 point to the center points of the segments.  These are the 
+	// pc1-3 point to the center points of the segments.  These are the
 	// points that are at loc.
 	TRoadPt *pc1=NULL;
 	TRoadPt *pc2=NULL;
@@ -1915,10 +1911,10 @@ void W3DRoadBuffer::insertTee(Vector2 loc, Int index1, Real scale)
 		m_roads[m_numRoads].m_pt2.loc.Set(loc+teeVector);
 		m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 		m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-		m_roads[m_numRoads].m_scale = m_roads[index1].m_scale; 
+		m_roads[m_numRoads].m_scale = m_roads[index1].m_scale;
 		m_roads[m_numRoads].m_widthInTexture = m_roads[index1].m_widthInTexture;
-		m_roads[m_numRoads].m_pt1.count = -3; 
-		m_roads[m_numRoads].m_type = flip?THREE_WAY_H_FLIP:THREE_WAY_H; 
+		m_roads[m_numRoads].m_pt1.count = -3;
+		m_roads[m_numRoads].m_type = flip?THREE_WAY_H_FLIP:THREE_WAY_H;
 		m_roads[m_numRoads].m_uniqueID = m_roads[index1].m_uniqueID;
 		m_numRoads++;
 	} else {
@@ -1952,10 +1948,10 @@ void W3DRoadBuffer::insertTee(Vector2 loc, Int index1, Real scale)
 		m_roads[m_numRoads].m_pt2.loc.Set(loc+teeVector);
 		m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 		m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-		m_roads[m_numRoads].m_scale = m_roads[index1].m_scale; 
+		m_roads[m_numRoads].m_scale = m_roads[index1].m_scale;
 		m_roads[m_numRoads].m_widthInTexture = m_roads[index1].m_widthInTexture;
-		m_roads[m_numRoads].m_pt1.count = -3; 
-		m_roads[m_numRoads].m_type = TEE; 
+		m_roads[m_numRoads].m_pt1.count = -3;
+		m_roads[m_numRoads].m_type = TEE;
 		m_roads[m_numRoads].m_uniqueID = m_roads[index1].m_uniqueID;
 		m_numRoads++;
 	}
@@ -1974,7 +1970,7 @@ Bool W3DRoadBuffer::insertY(Vector2 loc, Int index1, Real scale)
 	TRoadPt *pr2=NULL;
 	TRoadPt *pr3=NULL;
 
-	// pc1-3 point to the center points of the segments.  These are the 
+	// pc1-3 point to the center points of the segments.  These are the
 	// points that are at loc.
 	TRoadPt *pc1=NULL;
 	TRoadPt *pc2=NULL;
@@ -2017,7 +2013,7 @@ Bool W3DRoadBuffer::insertY(Vector2 loc, Int index1, Real scale)
 		}
 	}
 	if (pr2 == NULL || pr3 == NULL) {
-		return false;												 
+		return false;
 	}
 
 	Vector2 v1 = pr1->loc - loc;
@@ -2037,7 +2033,7 @@ Bool W3DRoadBuffer::insertY(Vector2 loc, Int index1, Real scale)
 	Real score12 = 2.0f;
 	Real score13 = 2.0f;
 	Real score32 = 2.0f;
-	
+
 //	const Real cos60 = 0.5f;
 	const Real cos30 = 0.866f;
 	const Real cos45 = 0.707f;
@@ -2152,10 +2148,10 @@ Bool W3DRoadBuffer::insertY(Vector2 loc, Int index1, Real scale)
 	m_roads[m_numRoads].m_pt2.loc.Set(loc+teeVector);
 	m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 	m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-	m_roads[m_numRoads].m_scale = m_roads[index1].m_scale; 
+	m_roads[m_numRoads].m_scale = m_roads[index1].m_scale;
 	m_roads[m_numRoads].m_widthInTexture = m_roads[index1].m_widthInTexture;
-	m_roads[m_numRoads].m_pt1.count = -3; 
-	m_roads[m_numRoads].m_type = THREE_WAY_Y; 
+	m_roads[m_numRoads].m_pt1.count = -3;
+	m_roads[m_numRoads].m_type = THREE_WAY_Y;
 	m_roads[m_numRoads].m_uniqueID = m_roads[index1].m_uniqueID;
 	m_numRoads++;
 
@@ -2168,11 +2164,11 @@ Bool W3DRoadBuffer::insertY(Vector2 loc, Int index1, Real scale)
 //=============================================================================
 // W3DRoadBuffer::offset3Way
 //=============================================================================
-/** Offsets the points coming into a 3 way intersection so that they move to 
+/** Offsets the points coming into a 3 way intersection so that they move to
 the join points of the 3 way intersection. */
 //=============================================================================
-void W3DRoadBuffer::offset3Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector, 
-															 Vector2 teeVector, Real widthInTexture) 
+void W3DRoadBuffer::offset3Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector,
+															 Vector2 teeVector, Real widthInTexture)
 {
 	pc1->loc = loc - upVector;
 	pc2->loc = loc + upVector;
@@ -2219,12 +2215,12 @@ void W3DRoadBuffer::offset3Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2
 //=============================================================================
 // W3DRoadBuffer::offsetH
 //=============================================================================
-/** Offsets the points coming into a 3 way intersection so that they move to 
+/** Offsets the points coming into a 3 way intersection so that they move to
 the join points of the 3 way intersection. */
 //=============================================================================
-void W3DRoadBuffer::offsetH(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, 
-														Vector2 upVector, Vector2 teeVector, 
-														Bool flip, Bool mirror, Real widthInTexture) 
+void W3DRoadBuffer::offsetH(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc,
+														Vector2 upVector, Vector2 teeVector,
+														Bool flip, Bool mirror, Real widthInTexture)
 {
 
 	if (flip != mirror) {
@@ -2291,11 +2287,11 @@ void W3DRoadBuffer::offsetH(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 lo
 //=============================================================================
 // W3DRoadBuffer::offsetY
 //=============================================================================
-/** Offsets the points coming into a 3 way intersection so that they move to 
+/** Offsets the points coming into a 3 way intersection so that they move to
 the join points of the 3 way intersection. */
 //=============================================================================
-void W3DRoadBuffer::offsetY(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector, 
-															 Real widthInTexture) 
+void W3DRoadBuffer::offsetY(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 loc, Vector2 upVector,
+															 Real widthInTexture)
 {
 	pc3->loc += upVector*0.55f;
 	pc3->top += upVector*0.55f;
@@ -2305,7 +2301,7 @@ void W3DRoadBuffer::offsetY(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 lo
 
 	// Make sure the t vector goes right with respect to the up vector.
 	Vector2 arm = upVector;
-	arm.Rotate(3*PI/4); 
+	arm.Rotate(3*PI/4);
 	Vector2 armNormal(-arm.Y, arm.X);
 	armNormal *= widthInTexture;
 	pc2->loc += arm*1.1f;
@@ -2337,11 +2333,11 @@ void W3DRoadBuffer::offsetY(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, Vector2 lo
 //=============================================================================
 // W3DRoadBuffer::offset4Way
 //=============================================================================
-/** Offsets the points coming into a 4 way intersection so that they move to 
+/** Offsets the points coming into a 4 way intersection so that they move to
 the join points of the 4 way intersection. */
 //=============================================================================
-void W3DRoadBuffer::offset4Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, TRoadPt *pr3, 
-															 TRoadPt *pc4, Vector2 loc, Vector2 alignVector, Real widthInTexture) 
+void W3DRoadBuffer::offset4Way(TRoadPt *pc1, TRoadPt *pc2, TRoadPt *pc3, TRoadPt *pr3,
+															 TRoadPt *pc4, Vector2 loc, Vector2 alignVector, Real widthInTexture)
 {
 	pc1->loc = loc - alignVector;
 	pc2->loc = loc + alignVector;
@@ -2423,7 +2419,7 @@ void W3DRoadBuffer::insert4Way(Vector2 loc, Int index1, Real scale)
 	TRoadPt *pr3=NULL;
 	TRoadPt *pr4=NULL;
 
-	// pc1-4 point to the center points of the segments.  These are the 
+	// pc1-4 point to the center points of the segments.  These are the
 	// points that are at loc.
 	TRoadPt *pc1=NULL;
 	TRoadPt *pc2=NULL;
@@ -2490,23 +2486,23 @@ void W3DRoadBuffer::insert4Way(Vector2 loc, Int index1, Real scale)
 	Int curPair = 12;
 	Real curDot = dot12;
 	if (dot13<curDot) {
-		curPair = 13; 
+		curPair = 13;
 		curDot = dot13;
 	}
 	if (dot14<curDot) {
-		curPair = 14; 
+		curPair = 14;
 		curDot = dot14;
 	}
 	if (dot23<curDot) {
-		curPair = 23; 
+		curPair = 23;
 		curDot = dot23;
 	}
 	if (dot24<curDot) {
-		curPair = 24; 
+		curPair = 24;
 		curDot = dot24;
 	}
 	if (dot34<curDot) {
-		curPair = 34; 
+		curPair = 34;
 		curDot = dot34;
 	}
 	Bool do12 = (curPair==12);	 // Do segment 1 to 2
@@ -2567,10 +2563,10 @@ void W3DRoadBuffer::insert4Way(Vector2 loc, Int index1, Real scale)
 	m_roads[m_numRoads].m_pt2.loc.Set(loc+alignVector);
 	m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 	m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-	m_roads[m_numRoads].m_scale = m_roads[index1].m_scale; 
-	m_roads[m_numRoads].m_widthInTexture = TEE_WIDTH_ADJUSTMENT; // It is symmetrical. 
-	m_roads[m_numRoads].m_pt1.count = -4; 
-	m_roads[m_numRoads].m_type = FOUR_WAY; 
+	m_roads[m_numRoads].m_scale = m_roads[index1].m_scale;
+	m_roads[m_numRoads].m_widthInTexture = TEE_WIDTH_ADJUSTMENT; // It is symmetrical.
+	m_roads[m_numRoads].m_pt1.count = -4;
+	m_roads[m_numRoads].m_type = FOUR_WAY;
 	m_roads[m_numRoads].m_uniqueID = m_roads[index1].m_uniqueID;
 	m_numRoads++;
 
@@ -2586,7 +2582,7 @@ void W3DRoadBuffer::insert4Way(Vector2 loc, Int index1, Real scale)
 //=============================================================================
 void W3DRoadBuffer::insertTeeIntersections(void)
 {
-	// Insert the tees. 
+	// Insert the tees.
 	Int numRoadSegments = m_numRoads;
 	Int i;
 //	Int segmentStartIndex = -1;
@@ -2596,16 +2592,16 @@ void W3DRoadBuffer::insertTeeIntersections(void)
 		}
 		if (m_roads[i].m_pt1.count==2) {
 			insertTee(m_roads[i].m_pt1.loc, i, m_roads[i].m_scale);
-		}	
+		}
 		if (m_roads[i].m_pt2.count==2) {
 			insertTee(m_roads[i].m_pt2.loc, i, m_roads[i].m_scale);
-		}	
+		}
 		if (m_roads[i].m_pt1.count==3) {
 			insert4Way(m_roads[i].m_pt1.loc, i, m_roads[i].m_scale);
-		}	
+		}
 		if (m_roads[i].m_pt2.count==3) {
 			insert4Way(m_roads[i].m_pt2.loc, i, m_roads[i].m_scale);
-		}	
+		}
 	}
 }
 
@@ -2616,7 +2612,7 @@ void W3DRoadBuffer::insertTeeIntersections(void)
 //=============================================================================
 void W3DRoadBuffer::insertCurveSegments(void)
 {
-	// Insert the curve segments. 
+	// Insert the curve segments.
 	Int numRoadSegments = m_numRoads;
 	Int i;
 	Int segmentStartIndex = -1;
@@ -2646,10 +2642,10 @@ void W3DRoadBuffer::insertCurveSegments(void)
 Int W3DRoadBuffer::findCrossTypeJoinVector(Vector2 loc, Vector2 *joinVector, Int uniqueID)
 {
 	Vector2 newVector = *joinVector;
-	// Insert the curve segments. 
+	// Insert the curve segments.
 	Int numRoadSegments = m_numRoads;
 	Int i;
-	for (i=0; i<numRoadSegments; i++) {	
+	for (i=0; i<numRoadSegments; i++) {
 		// we only want different road types.
 		if (m_roads[i].m_uniqueID == uniqueID) continue;
 		// Only join to straight line segments.
@@ -2705,13 +2701,13 @@ void W3DRoadBuffer::adjustStacking(Int topUniqueID, Int bottomUniqueID)
 	for (i=0; i<m_maxRoadTypes; i++) {
 		if (m_roadTypes[i].getUniqueID() == topUniqueID) break;
 	}
-	DEBUG_ASSERTLOG(i<m_maxRoadTypes, ("***** Wrong unique id- john a should fix.\n"));
+	DEBUG_ASSERTLOG(i<m_maxRoadTypes, ("***** Wrong unique id- john a should fix."));
 	if (i>=m_maxRoadTypes) return;
 
 	for (j=0; j<m_maxRoadTypes; j++) {
 		if (m_roadTypes[j].getUniqueID() == bottomUniqueID) break;
 	}
-	DEBUG_ASSERTLOG(j<m_maxRoadTypes, ("***** Wrong unique id- john a should fix.\n"));
+	DEBUG_ASSERTLOG(j<m_maxRoadTypes, ("***** Wrong unique id- john a should fix."));
 	if (j>=m_maxRoadTypes) return;
 
 	if (m_roadTypes[i].getStacking() > m_roadTypes[j].getStacking()) {
@@ -2735,7 +2731,7 @@ void W3DRoadBuffer::adjustStacking(Int topUniqueID, Int bottomUniqueID)
 //=============================================================================
 void W3DRoadBuffer::insertCrossTypeJoins(void)
 {
-	// Insert the curve segments. 
+	// Insert the curve segments.
 	Int numRoadSegments = m_numRoads;
 	Int i;
 	for (i=0; i<numRoadSegments; i++) {
@@ -2754,7 +2750,7 @@ void W3DRoadBuffer::insertCrossTypeJoins(void)
 		}
 		Vector2 joinVector(1, 0);
 
-		
+
 		Vector2 roadVector(loc2.X-loc1.X, loc2.Y-loc1.Y);
 		roadVector.Normalize();
 		joinVector = roadVector;
@@ -2805,7 +2801,7 @@ void W3DRoadBuffer::insertCrossTypeJoins(void)
 				m_roads[i].m_pt2.top.Set(pInt1.X, pInt1.Y);
 				bottom = m_roads[i].m_pt2.top;
 			}
-		}	 
+		}
 
 		bottom = bottom-top;
 		Real scaleAdjustment = bottom.Length() / (m_roads[i].m_scale * m_roads[i].m_widthInTexture);
@@ -2817,10 +2813,10 @@ void W3DRoadBuffer::insertCrossTypeJoins(void)
 		m_roads[m_numRoads].m_pt2.loc.Set(loc1+joinVector);
 		m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 		m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-		m_roads[m_numRoads].m_scale = m_roads[i].m_scale; 
-		m_roads[m_numRoads].m_widthInTexture = m_roads[i].m_scale * scaleAdjustment;  
-		m_roads[m_numRoads].m_pt1.count = 0; 
-		m_roads[m_numRoads].m_type = ALPHA_JOIN; 
+		m_roads[m_numRoads].m_scale = m_roads[i].m_scale;
+		m_roads[m_numRoads].m_widthInTexture = m_roads[i].m_scale * scaleAdjustment;
+		m_roads[m_numRoads].m_pt1.count = 0;
+		m_roads[m_numRoads].m_type = ALPHA_JOIN;
 		m_roads[m_numRoads].m_uniqueID = m_roads[i].m_uniqueID;
 		m_numRoads++;
 	}
@@ -2946,11 +2942,11 @@ void W3DRoadBuffer::insertCurveSegmentAt(Int ndx1, Int ndx2)
 		Real angle = -PI/6.0f; // -30 degrees.
 		Vector2 pt2 = *pr4;
 		Vector2 pt1 = *pr3;
-		Vector2 direction(pt1.X-pt2.X, pt1.Y-pt2.Y);	
+		Vector2 direction(pt1.X-pt2.X, pt1.Y-pt2.Y);
 		// offset = normal of the vector from pt1 to pt2.
 		Vector2 centerOfCurve(-direction.Y,  direction.X);
 		centerOfCurve.Normalize();
-		centerOfCurve *= m_roads[ndx1].m_curveRadius*m_roads[ndx1].m_scale;	
+		centerOfCurve *= m_roads[ndx1].m_curveRadius*m_roads[ndx1].m_scale;
 		centerOfCurve += pt2;
 
 		rotateAbout(&pt2, centerOfCurve, angle);
@@ -2963,12 +2959,12 @@ void W3DRoadBuffer::insertCurveSegmentAt(Int ndx1, Int ndx2)
 		CHECK_SEGMENTS;
 		m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 		m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-		m_roads[m_numRoads].m_scale = m_roads[ndx1].m_scale; 
-		m_roads[m_numRoads].m_widthInTexture = m_roads[ndx1].m_widthInTexture; 
-		m_roads[m_numRoads].m_type = CURVE; 
+		m_roads[m_numRoads].m_scale = m_roads[ndx1].m_scale;
+		m_roads[m_numRoads].m_widthInTexture = m_roads[ndx1].m_widthInTexture;
+		m_roads[m_numRoads].m_type = CURVE;
 		m_roads[m_numRoads].m_curveRadius = m_roads[ndx1].m_curveRadius;
 		m_roads[m_numRoads].m_uniqueID = m_roads[ndx1].m_uniqueID;
-		m_numRoads++;		
+		m_numRoads++;
 		if (count > 2.0) {
 			Int i;
 			for (i=2; i<count; i++) {
@@ -2981,15 +2977,15 @@ void W3DRoadBuffer::insertCurveSegmentAt(Int ndx1, Int ndx2)
 				m_roads[m_numRoads].m_pt2.loc.Set(pt1);
 				m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 				m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-				m_roads[m_numRoads].m_scale = m_roads[ndx1].m_scale; 
-				m_roads[m_numRoads].m_widthInTexture = m_roads[ndx1].m_widthInTexture; 
-				m_roads[m_numRoads].m_type = CURVE; 
+				m_roads[m_numRoads].m_scale = m_roads[ndx1].m_scale;
+				m_roads[m_numRoads].m_widthInTexture = m_roads[ndx1].m_widthInTexture;
+				m_roads[m_numRoads].m_type = CURVE;
 				m_roads[m_numRoads].m_curveRadius = m_roads[ndx1].m_curveRadius;
 				m_roads[m_numRoads].m_uniqueID = m_roads[ndx1].m_uniqueID;
 				m_numRoads++;
 			}
 		}
-		
+
 		*pr1 = Vector2(pInt3.X, pInt3.Y);
 
 		m_roads[ndx1].m_pt1.last = true;
@@ -3003,9 +2999,9 @@ void W3DRoadBuffer::insertCurveSegmentAt(Int ndx1, Int ndx2)
 			m_roads[m_numRoads].m_pt2.loc.Set(pt1);
 			m_roads[m_numRoads].m_pt1.last = true; // if not, that one will clear flag in prior loop.
 			m_roads[m_numRoads].m_pt2.last = true; // if not, that one will clear flag in prior loop.
-			m_roads[m_numRoads].m_scale = m_roads[ndx1].m_scale; 
-			m_roads[m_numRoads].m_widthInTexture = m_roads[ndx1].m_widthInTexture; 
-			m_roads[m_numRoads].m_type = CURVE; 
+			m_roads[m_numRoads].m_scale = m_roads[ndx1].m_scale;
+			m_roads[m_numRoads].m_widthInTexture = m_roads[ndx1].m_widthInTexture;
+			m_roads[m_numRoads].m_type = CURVE;
 			m_roads[m_numRoads].m_curveRadius = m_roads[ndx1].m_curveRadius;
 			m_roads[m_numRoads].m_uniqueID = m_roads[ndx1].m_uniqueID;
 			m_numRoads++;
@@ -3026,9 +3022,9 @@ void W3DRoadBuffer::insertCurveSegmentAt(Int ndx1, Int ndx2)
 		m_roads[ndx2].m_pt2.top = m_roads[ndx2].m_pt2.loc+roadNormal;
 		m_roads[ndx2].m_pt2.bottom = m_roads[ndx2].m_pt2.loc - roadNormal;
 
-	} 
+	}
+
 
-		
 }
 
 //=============================================================================
@@ -3037,19 +3033,19 @@ void W3DRoadBuffer::insertCurveSegmentAt(Int ndx1, Int ndx2)
 /** Rotates ptP about center. */
 //=============================================================================
 void W3DRoadBuffer::rotateAbout(Vector2 *ptP, Vector2 center, Real angle)
-{	 
+{
 	Vector2 offset;
 	offset.X = ptP->X - center.X;
 	offset.Y = ptP->Y - center.Y;
 	Vector2 orgOffset = offset;
 	offset.Rotate(angle);
-	offset.Y -= orgOffset.Y; 
-	offset.X -= orgOffset.X; 
+	offset.Y -= orgOffset.Y;
+	offset.X -= orgOffset.X;
 	*ptP += offset;
 }
 
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -3095,14 +3091,11 @@ W3DRoadBuffer::W3DRoadBuffer(void)	:
 //=============================================================================
 void W3DRoadBuffer::freeRoadBuffers(void)
 {
-	if (m_roads) {
-		delete[] m_roads;
-		m_roads = NULL;
-	}
-	if (m_roadTypes) {
-		delete[] m_roadTypes;
-		m_roadTypes = NULL;
-	}
+	delete[] m_roads;
+	m_roads = NULL;
+
+	delete[] m_roadTypes;
+	m_roadTypes = NULL;
 }
 
 //=============================================================================
@@ -3145,9 +3138,9 @@ void W3DRoadBuffer::allocateRoadBuffers(void)
 				m_maxUID = id;
 #endif // LOAD_TEST_ASSETS
 
-		}  // end if
+		}
 
-	}  // end for road
+	}
 
 #ifdef LOAD_TEST_ASSETS
 	while (i<m_maxRoadTypes && m_roadTypes[i].isAutoLoaded()) {
@@ -3199,7 +3192,7 @@ void W3DRoadBuffer::setMap(WorldHeightMap *pMap)
 void W3DRoadBuffer::loadRoads()
 {
 	if (!m_initialized) {
-		return;  
+		return;
 	}
 	// Free any existing road segments.
 	clearAllRoads();
@@ -3229,22 +3222,22 @@ void W3DRoadBuffer::updateLighting(void)
 	When the player alt-tabs out of the game, m_roads is freed up, but when the other player
 	places a structure in this area, the terrain gets flattened and calls this code, and BOOM!
 
-	Submitted By:   	Lee, Pei                     
+	Submitted By:   	Lee, Pei
 	Date Submitted: 	08/21/03 18:47:25
-	Found: 
+	Found:
 	When playing a 2 player game both as USA-based armies, if one of the players uses Satellite Spy to reveal an area not yet reveal by either player then Alt-Tab's out, and then the enemy send a dozer over to build some structure in the previously revealed area, then the game will crash to desktop for the player who Alt-Tab'd.
 
-	Steps to reproduce: 
+	Steps to reproduce:
 	- Play a 2 player network game with both player being USA.
 		(Not sure if this will happen if the players are of different USA-based armies)
 	- Have the victim reveal an area that is not yet reveal to either player.
 	- Wait until the area has been shrouded again. (Not sure if required)
 	- Have the victim Alt-Tab.
-	- Have the remaining player then send a dozer to build a Cold Fusion Reactor in the area 
+	- Have the remaining player then send a dozer to build a Cold Fusion Reactor in the area
 		previously revealed by the other player's Spy Satellite.  (Not sure if it has to be Cold Fusion
 		Reactor.)
 
-	Result: 
+	Result:
 	As soon as the fence is set up, the player who Alt-tab'd would get Zero Hour crashing to desktop with Serious Error occured.
 	*/
 	if( !m_roads )
@@ -3255,7 +3248,7 @@ void W3DRoadBuffer::updateLighting(void)
 	// Do road segments.
 	for (curRoad=0; curRoad<m_numRoads; curRoad++) {
 		m_roads[curRoad].updateSegLighting();
-	}	
+	}
 	m_updateBuffers = true;
 }
 
@@ -3303,7 +3296,7 @@ void W3DRoadBuffer::drawRoads(CameraClass * camera, TextureClass *cloudTexture,
 	}
 	Int stacking;
 	W3DShaderManager::ShaderTypes st=W3DShaderManager::ST_ROAD_BASE; //set default shader
-	if (cloudTexture) {	
+	if (cloudTexture) {
 		st=W3DShaderManager::ST_ROAD_BASE_NOISE1;
 		if (noiseTexture)
 			st=W3DShaderManager::ST_ROAD_BASE_NOISE12;
@@ -3345,7 +3338,7 @@ void W3DRoadBuffer::drawRoads(CameraClass * camera, TextureClass *cloudTexture,
 			}
 	#ifdef RTS_DEBUG
 			//DX8Wrapper::Set_Shader(detailShader); // shows clipping.
-	#endif	
+	#endif
 			for (Int pass=0; pass < devicePasses; pass++)
 			{
 				if (!wireframe)
@@ -3363,7 +3356,7 @@ void W3DRoadBuffer::drawRoads(CameraClass * camera, TextureClass *cloudTexture,
 	}
 #ifdef LOG_STATS
 	if (loadBuffers) {
-		DEBUG_LOG(("Road poly count %d\n", polys));
+		DEBUG_LOG(("Road poly count %d", polys));
 	}
 #endif
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp
index 95153b513e0..66a19d43b98 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp
@@ -36,6 +36,7 @@
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/PerfTimer.h"
 #include "Common/Player.h"
@@ -64,16 +65,12 @@
 #include "WW3D2/colorspace.h"
 
 #include "WW3D2/shdlib.h"
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // DEFINITIONS ////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 ///@todo: Remove these globals since we no longer need W3D to call them for us.
+extern void PrepareShadows();
 extern void DoTrees(RenderInfoClass & rinfo);
 extern void DoShadows(RenderInfoClass & rinfo, Bool stencilPass);
 extern void DoParticles(RenderInfoClass & rinfo);
@@ -98,14 +95,15 @@ RTS3DScene::RTS3DScene()
 	m_numGlobalLights=0;
 	Int i=0;
 	for (; i<LightEnvironmentClass::MAX_LIGHTS; i++)
-	{	m_globalLight[i]=NULL;
+	{
+		m_globalLight[i]=NULL;
 		m_infantryLight[i]=NEW_REF( LightClass, (LightClass::DIRECTIONAL) );
 	}
 
 	m_scratchLight = NEW_REF( LightClass, (LightClass::DIRECTIONAL) );
 //	REF_PTR_SET(m_globalLight[lightIndex], pLight);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if ENABLE_CONFIGURABLE_SHROUD
 	if (TheGlobalData->m_shroudOn)
 		m_shroudMaterialPass = NEW_REF(W3DShroudMaterialPassClass,());
 	else
@@ -148,11 +146,11 @@ RTS3DScene::RTS3DScene()
 //	frenzyShader.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);
 //	m_frenzyMaterialPass->Set_Shader(frenzyShader);
 
-  
-	//Allocate memory to hold queue of visible renderobjects that need to be drawn last
+
+	//Allocate memory to hold queue of visible render objects that need to be drawn last
 	//because they are forced translucent.
 	m_translucentObjectsCount = 0;
-	if (TheGlobalData && TheGlobalData->m_maxVisibleTranslucentObjects)
+	if (TheGlobalData->m_maxVisibleTranslucentObjects > 0)
 		m_translucentObjectsBuffer = NEW RenderObjClass* [TheGlobalData->m_maxVisibleTranslucentObjects];
 	else
 		m_translucentObjectsBuffer = NULL;
@@ -162,22 +160,30 @@ RTS3DScene::RTS3DScene()
 	m_numNonOccluderOrOccludee=0;
 	m_occludedObjectsCount=0;
 
-	m_potentialOccluders=NULL;
-	m_potentialOccludees=NULL;
-	m_nonOccludersOrOccludees=NULL;
+	if (TheGlobalData->m_maxVisibleOccluderObjects > 0)
+		m_potentialOccluders = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccluderObjects];
+	else
+		m_potentialOccluders = NULL;
+
+	if (TheGlobalData->m_maxVisibleOccludeeObjects > 0)
+		m_potentialOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccludeeObjects];
+	else
+		m_potentialOccludees = NULL;
+
+	if (TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects > 0)
+		m_nonOccludersOrOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects];
+	else
+		m_nonOccludersOrOccludees = NULL;
 
 	//Modify the shader to make occlusion transparent
 	ShaderClass shader = PlayerColorShader;
 	shader.Set_Src_Blend_Func(ShaderClass::SRCBLEND_SRC_ALPHA);
 	shader.Set_Dst_Blend_Func(ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA);
 
-    m_potentialOccluders = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccluderObjects];
-	m_potentialOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleOccludeeObjects];
-	m_nonOccludersOrOccludees = NEW RenderObjClass* [TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects];
-
 #ifdef USE_NON_STENCIL_OCCLUSION
 	for (i=0; i<MAX_PLAYER_COUNT; i++)
-	{	m_occludedMaterialPass[i]=NEW_REF(MaterialPassClass,());
+	{
+		m_occludedMaterialPass[i]=NEW_REF(MaterialPassClass,());
 		VertexMaterialClass * vmtl = NEW_REF(VertexMaterialClass,());
 		vmtl->Set_Lighting(true);
 		vmtl->Set_Ambient(0,0,0);	//we're only using emissive so kill all other lights.
@@ -191,7 +197,7 @@ RTS3DScene::RTS3DScene()
 		m_occludedMaterialPass[i]=NULL;
 #endif
 
-}  // end RTS3DScene
+}
 
 //=============================================================================
 // RTS3DScene::~RTS3DScene
@@ -217,23 +223,16 @@ RTS3DScene::~RTS3DScene()
 
 	REF_PTR_RELEASE(m_heatVisionOnlyPass);
 
-	if (m_translucentObjectsBuffer)
-		delete [] m_translucentObjectsBuffer;
-
-	if (m_nonOccludersOrOccludees)
-		delete [] m_nonOccludersOrOccludees;
-
-	if (m_potentialOccludees)
-		delete [] m_potentialOccludees;
-
-	if (m_potentialOccluders)
-		delete [] m_potentialOccluders;
+	delete [] m_translucentObjectsBuffer;
+	delete [] m_nonOccludersOrOccludees;
+	delete [] m_potentialOccludees;
+	delete [] m_potentialOccluders;
 
 	for (i=0; i<MAX_PLAYER_COUNT; i++)
-	{	REF_PTR_RELEASE(m_occludedMaterialPass[i]);
+	{
+		REF_PTR_RELEASE(m_occludedMaterialPass[i]);
 	}
-
-}  // end ~RTS3DScene
+}
 
 
 void	RTS3DScene::setGlobalLight(LightClass *pLight, Int lightIndex)
@@ -265,7 +264,7 @@ void RTS3DScene::flagOccludedObjects(CameraClass * camera)
 	m_occludedObjectsCount=0;
 
 	for (Int i=0; i<m_numPotentialOccludees; i++,occludee++)
-	{	
+	{
 		raytest.Ray.Set(camPosition,(*occludee)->Get_Position());
 
 		RenderObjClass **occluder=m_potentialOccluders;
@@ -280,7 +279,7 @@ void RTS3DScene::flagOccludedObjects(CameraClass * camera)
 
 			// make a vector from the ray origin to the sphere center
 			Vector3 sphere_vector(sphere->Center - raytest.Ray.Get_P0());
-			
+
 			// get the dot product between the sphere_vector and the ray vector
 			Real Alpha = Vector3::Dot_Product(sphere_vector, raytest.Ray.Get_Dir());
 
@@ -288,7 +287,7 @@ void RTS3DScene::flagOccludedObjects(CameraClass * camera)
 
 			if(Beta < 0.0f)
 				continue;	//no intersection
-				
+
 			//Do a more accurate test against object geometry
 			if (robj->Cast_Ray(raytest))
 			{
@@ -297,12 +296,14 @@ void RTS3DScene::flagOccludedObjects(CameraClass * camera)
 				raytest.CollidedRenderObj = robj;
 				hit=TRUE;
 				//reset the result space for next test
-				result.StartBad = false; result.Fraction = 1.0f;
+				result.StartBad = false;
+				result.Fraction = 1.0f;
 				break;
 			}
 		}
 		if (hit)
-		{	//ocludee was blocked by something so flag it for custom rendering
+		{
+			//occludee was blocked by something so flag it for custom rendering
 			DrawableInfo *drawInfo=(DrawableInfo *)(*occludee)->Get_User_Data();
 			drawInfo->m_flags |= DrawableInfo::ERF_IS_OCCLUDED;
 			m_potentialOccludees[m_occludedObjectsCount++] = *occludee;
@@ -356,7 +357,7 @@ Bool RTS3DScene::castRay(RayCollisionTestClass & raytest, Bool testAll, Int coll
 
 			// make a vector from the ray origin to the sphere center
 			Vector3 sphere_vector(sphere->Center - tempRayTest.Ray.Get_P0());
-		
+
 			// get the dot product between the sphere_vector and the ray vector
 			Real Alpha = Vector3::Dot_Product(sphere_vector, tempRayTest.Ray.Get_Dir());
 
@@ -364,7 +365,7 @@ Bool RTS3DScene::castRay(RayCollisionTestClass & raytest, Bool testAll, Int coll
 
 			if(Beta < 0.0f)
 				continue;	//no intersection
-			
+
 			//Do a more accurate test against object geometry
 			if (robj->Cast_Ray(tempRayTest))
 			{
@@ -408,14 +409,13 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
 	m_translucentObjectsCount=0;
 	m_numNonOccluderOrOccludee=0;
 
-	Int currentFrame=0;
-	if (TheGameLogic) currentFrame = TheGameLogic->getFrame();
+	Int currentFrame = TheGameLogic ? TheGameLogic->getFrame() : 0;
 	if (currentFrame <= TheGlobalData->m_defaultOcclusionDelay)
 		currentFrame = TheGlobalData->m_defaultOcclusionDelay+1;	//make sure occlusion is enabled when game starts (frame 0).
 
-
-	if (ShaderClass::Is_Backface_Culling_Inverted()) 
-	{	//we are rendering reflections
+	if (ShaderClass::Is_Backface_Culling_Inverted())
+	{
+		//we are rendering reflections
 		///@todo: Have better flag to detect reflection pass
 
 		// Loop over all top-level RenderObjects in this scene. If the bounding sphere is not in front
@@ -438,7 +438,8 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
 				}
 			}
 			else
-			{	//perform normal culling on non-drawables
+			{
+				//perform normal culling on non-drawables
 				if (robj->Is_Force_Visible()) {
 					robj->Set_Visible(true);
 				} else {
@@ -465,12 +466,13 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
 				bool isVisible=!camera->Cull_Sphere(robj->Get_Bounding_Sphere());
 
 				if (isVisible)
-				{	//need to keep track of occluders and ocludees for subsequent code.
+				{
+					//need to keep track of occluders and occludees for subsequent code.
 					drawInfo = (DrawableInfo *)robj->Get_User_Data();
 					if (drawInfo && (draw=drawInfo->m_drawable) != NULL)
 					{
 						if (draw->isDrawableEffectivelyHidden() || draw->getFullyObscuredByShroud())
-						{	
+						{
 							isVisible = FALSE;
 						  robj->Set_Visible(isVisible);
             }
@@ -481,33 +483,36 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
               continue;
 
 						if (draw->getEffectiveOpacity() != 1.0f && m_translucentObjectsCount < TheGlobalData->m_maxVisibleTranslucentObjects)
-						{	drawInfo->m_flags |= DrawableInfo::ERF_IS_TRANSLUCENT;	//object is translucent
+						{
+							drawInfo->m_flags |= DrawableInfo::ERF_IS_TRANSLUCENT;
 							m_translucentObjectsBuffer[m_translucentObjectsCount++] = robj;
 						}
-						if (TheGlobalData->m_enableBehindBuildingMarkers && TheGameLogic->getShowBehindBuildingMarkers())
+						if (TheGlobalData->m_enableBehindBuildingMarkers && TheGameLogic && TheGameLogic->getShowBehindBuildingMarkers())
 						{
+							const Bool isTranslucent = (drawInfo->m_flags & DrawableInfo::ERF_IS_TRANSLUCENT) != 0;
 							//visible drawable. Check if it's either an occluder or occludee
 							if (draw->isKindOf(KINDOF_STRUCTURE) && m_numPotentialOccluders < TheGlobalData->m_maxVisibleOccluderObjects)
-							{	//object which could occlude other objects that need to be visible.
+							{
+								//object which could occlude other objects that need to be visible.
 								//Make sure this object is not translucent so it's not rendered twice (from m_potentialOccluders and m_translucentObjectsBuffer)
-								if (drawInfo->m_flags ^ DrawableInfo::ERF_IS_TRANSLUCENT)
+								if (!isTranslucent)
 									m_potentialOccluders[m_numPotentialOccluders++]=robj;
 								drawInfo->m_flags |= DrawableInfo::ERF_POTENTIAL_OCCLUDER;
 							}
-							else
-							if (draw->getObject() &&
+							else if (draw->getObject() &&
 									(draw->isKindOf(KINDOF_SCORE) || draw->isKindOf(KINDOF_SCORE_CREATE) || draw->isKindOf(KINDOF_SCORE_DESTROY) || draw->isKindOf(KINDOF_MP_COUNT_FOR_VICTORY)) &&
 									(draw->getObject()->getSafeOcclusionFrame()) <= currentFrame && m_numPotentialOccludees < TheGlobalData->m_maxVisibleOccludeeObjects)
-							{	//object which could be occluded but still needs to be visible.
-								//We process transucent units twice (also in m_translucentObjectsBuffer) because we need to see them when occluded.
+							{
+								//object which could be occluded but still needs to be visible.
+								//We process translucent units twice (also in m_translucentObjectsBuffer) because we need to see them when occluded.
 								m_potentialOccludees[m_numPotentialOccludees++]=robj;
 								drawInfo->m_flags |= DrawableInfo::ERF_POTENTIAL_OCCLUDEE;
 							}
-							else
-							if (drawInfo->m_flags == DrawableInfo::ERF_IS_NORMAL && m_numNonOccluderOrOccludee < TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects)
-							{	//regular object with no custom effects but still needs to be delayed to get the occlusion feature to work correctly.
-								//Make sure this object is not translucent so it's not rendered twice (from m_potentialOccluders and m_translucentObjectsBuffer)
-								if (drawInfo->m_flags ^ DrawableInfo::ERF_IS_TRANSLUCENT)	//make sure not translucent
+							else if (drawInfo->m_flags == DrawableInfo::ERF_IS_NORMAL && m_numNonOccluderOrOccludee < TheGlobalData->m_maxVisibleNonOccluderOrOccludeeObjects)
+							{
+								//regular object with no custom effects but still needs to be delayed to get the occlusion feature to work correctly.
+								//Make sure this object is not translucent so it's not rendered twice (from m_nonOccludersOrOccludees and m_translucentObjectsBuffer)
+								if (!isTranslucent)
 									m_nonOccludersOrOccludees[m_numNonOccluderOrOccludee++]=robj;
 								drawInfo->m_flags |= DrawableInfo::ERF_IS_NON_OCCLUDER_OR_OCCLUDEE;
 							}
@@ -541,10 +546,10 @@ void RTS3DScene::renderSpecificDrawables(RenderInfoClass &rinfo, Int numDrawable
 #ifdef DIRTY_CONDITION_FLAGS
 	StDrawableDirtyStuffLocker lockDirtyStuff;
 #endif
-	Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
-	RefRenderObjListIterator it(&UpdateList);	
+	const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
+	RefRenderObjListIterator it(&UpdateList);
 	// loop through all render objects in the list:
-	for (it.First(&RenderList); !it.Is_Done();) 
+	for (it.First(&RenderList); !it.Is_Done();)
 	{
 		RenderObjClass *robj;
 		// get the render object
@@ -577,7 +582,6 @@ void RTS3DScene::renderSpecificDrawables(RenderInfoClass &rinfo, Int numDrawable
 //=============================================================================
 void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, Int localPlayerIndex)
 {
-
 	Drawable *draw = NULL;
 	DrawableInfo *drawInfo = NULL;
 	Bool drawableHidden=FALSE;
@@ -587,10 +591,9 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 	Bool doExtraFlagsPop=FALSE;
 	LightClass **sceneLights=m_globalLight;
 
-
-
 	if (robj->Class_ID() == RenderObjClass::CLASSID_IMAGE3D	)
-	{	robj->Render(rinfo);	//notify decals system that this track is visible
+	{
+		robj->Render(rinfo);	//notify decals system that this track is visible
 		return;	//decals are not lit by this system yet so skip rest of lighting
 	}
 
@@ -598,7 +601,8 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 	SphereClass sph = robj->Get_Bounding_Sphere();
 	drawInfo = (DrawableInfo *)robj->Get_User_Data();
 	if (drawInfo)
-	{	draw = drawInfo->m_drawable;
+	{
+		draw = drawInfo->m_drawable;
 		//If we have a drawInfo but not drawable, we must be dealing with
 		//a ghost object which is always fogged.
 		if (!draw)
@@ -620,12 +624,12 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 		obj = draw->getObject();
 		if (obj) {
 			ss = obj->getShroudedStatus(localPlayerIndex);
-			// For objects like planes, that pop out of the shroud, fire, then head back, 
-			// we keep drawing them for 2 seconds after they return to the fogged area, 
+			// For objects like planes, that pop out of the shroud, fire, then head back,
+			// we keep drawing them for 2 seconds after they return to the fogged area,
 			// so the player can see them and missiles chasing them.  jba.
 			if (ss == OBJECTSHROUD_CLEAR) {
 				draw->setShroudClearFrame(TheGameLogic->getFrame());
-			}	else if (ss >= OBJECTSHROUD_FOGGED && draw->getShroudClearFrame()!=0) {
+			}	else if (ss >= OBJECTSHROUD_FOGGED && draw->getShroudClearFrame() != InvalidShroudClearFrame) {
 				UnsignedInt limit = 2*LOGICFRAMES_PER_SECOND;
 				if (obj->isEffectivelyDead()) {
 					limit += 3*LOGICFRAMES_PER_SECOND;
@@ -639,19 +643,22 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
  				return;	//this object was removed by the getShroudedStatus() call.
 		}
 		else
-		{	//drawable with no object so no way to know if it's shrouded.
+		{
+			//drawable with no object so no way to know if it's shrouded.
 			ss = OBJECTSHROUD_CLEAR;	//assume not shrouded/fogged.
 			//Check to see if there is another unrelated object which controls the shroud status
 			//(Hack for prison camps which contain enemy prisoner drawables)
 			if (drawInfo->m_shroudStatusObjectID != INVALID_ID)
-			{	Object *shroudObject=TheGameLogic->findObjectByID(drawInfo->m_shroudStatusObjectID);
+			{
+				Object *shroudObject=TheGameLogic->findObjectByID(drawInfo->m_shroudStatusObjectID);
 				if (shroudObject && shroudObject->getShroudedStatus(localPlayerIndex) >= OBJECTSHROUD_FOGGED)
 					ss = OBJECTSHROUD_SHROUDED;	//we will assume that drawables without objects are 'particle' like and therefore don't need drawing if fogged/shrouded.
 			}
 		}
 
 		if (draw->isKindOf(KINDOF_INFANTRY))
-		{	//ambient = m_infantryAmbient;  //has no effect - see comment on m_infantryAmbient
+		{
+			//ambient = m_infantryAmbient;  //has no effect - see comment on m_infantryAmbient
 			sceneLights = m_infantryLight;
 		}
 
@@ -669,9 +676,9 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 		if ( tintColor || selectionColor )
 		{
 			Vector3 sumTint, temp, restore;
-			
-			sumTint.Set(0,0,0); 
-			
+
+			sumTint.Set(0,0,0);
+
 			if (tintColor)
 				Vector3::Add(sumTint, *tintColor, &sumTint);
 			if (selectionColor)
@@ -688,8 +695,8 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 				lightEnv.Add_Light(*sceneLights[globalLightIndex]);
 				sceneLights[globalLightIndex]->Set_Diffuse( restore );
 
-			} // next light
-			
+			}
+
 			temp = lightEnv.Get_Equivalent_Ambient();
 			Vector3::Add(sumTint, temp, &temp );
 
@@ -705,7 +712,7 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 		}
 
 		//Apply custom render pass for any drawables with heatvision enabled
-		if (draw->getSecondMaterialPassOpacity() != 0 ) 
+		if (draw->getSecondMaterialPassOpacity() != 0 )
 		{
 			rinfo.materialPassEmissiveOverride = draw->getSecondMaterialPassOpacity();
 
@@ -713,7 +720,7 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
       //{
 			//	rinfo.Push_Material_Pass(m_heatVisionMaterialPass);
       //}
-			//else 
+			//else
       if (draw->getStealthLook() == STEALTHLOOK_VISIBLE_DETECTED )
 			{
 			  rinfo.materialPassEmissiveOverride = draw->getSecondMaterialPassOpacity();
@@ -733,13 +740,15 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 		}
 	}
 	else
-	{	//either no drawable or it is hidden
+	{
+		//either no drawable or it is hidden
 		if (drawableHidden)
 			return;	//don't bother with anything else
 
 		//Render object without a drawable.  Must be either some fluff/debug object or a ghostObject.
 		if (ss == OBJECTSHROUD_FOGGED)
-		{	//Must be ghost object because we don't fog normal things.  Fogged objects always have a predefined
+		{
+			//Must be ghost object because we don't fog normal things.  Fogged objects always have a predefined
 			//lighting environment applied which emulates the look of fog.
 			rinfo.light_environment = &m_foggedLightEnv;
 			robj->Render(rinfo);
@@ -747,7 +756,8 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 			return;
 		}
 		else
-		{	lightEnv.Reset(sph.Center, ambient);
+		{
+			lightEnv.Reset(sph.Center, ambient);
 			for (Int globalLightIndex = 0; globalLightIndex < m_numGlobalLights; globalLightIndex++)
 				lightEnv.Add_Light(*m_globalLight[globalLightIndex]);
 		}
@@ -756,9 +766,9 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 	if (!drawableHidden)
 	{
 		//standard scene lights
-		RefRenderObjListIterator it2(&LightList);	
+		RefRenderObjListIterator it2(&LightList);
 		for (it2.First(); !it2.Is_Done(); it2.Next())
-		{	
+		{
 			LightClass *pLight = (LightClass*)it2.Peek_Obj();
 			SphereClass lSph = pLight->Get_Bounding_Sphere();
 			Bool cull = (pLight->Get_Type() == LightClass::POINT && !Spheres_Intersect(sph, lSph));
@@ -770,9 +780,9 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
     if( draw && draw->getReceivesDynamicLights() )
     {
 		  // dynamic lights
-		  RefRenderObjListIterator dynaLightIt(&m_dynamicLightList);	
+		  RefRenderObjListIterator dynaLightIt(&m_dynamicLightList);
 		  for (dynaLightIt.First(); !dynaLightIt.Is_Done(); dynaLightIt.Next())
-		  {	
+		  {
 			  W3DDynamicLight* pDyna = (W3DDynamicLight*)dynaLightIt.Peek_Obj();
 			  if (!pDyna->isEnabled()) {
 				  continue;
@@ -784,45 +794,47 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 			  lightEnv.Add_Light(*(LightClass*)dynaLightIt.Peek_Obj());
 		  }
     }
-		
+
 		lightEnv.Pre_Render_Update(rinfo.Camera.Get_Transform());
 		rinfo.light_environment = &lightEnv;
 
 		if (drawInfo)
 		{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if ENABLE_CONFIGURABLE_SHROUD
 			if (!TheGlobalData->m_shroudOn)
 				ss = OBJECTSHROUD_CLEAR;
 #endif
-			
-			if (m_customPassMode == SCENE_PASS_DEFAULT)	
+
+			if (m_customPassMode == SCENE_PASS_DEFAULT)
 			{
 				if (ss <= OBJECTSHROUD_CLEAR)
+				{
 					robj->Render(rinfo);
+				}
 				else
-				{	
-						rinfo.Push_Material_Pass(m_shroudMaterialPass);
-						robj->Render(rinfo);
-						rinfo.Pop_Material_Pass();
+				{
+					rinfo.Push_Material_Pass(m_shroudMaterialPass);
+					robj->Render(rinfo);
+					rinfo.Pop_Material_Pass();
 				}
 			}
-			else
-			if (m_maskMaterialPass)
-			{	rinfo.Push_Material_Pass(m_maskMaterialPass);
+			else if (m_maskMaterialPass)
+			{
+				rinfo.Push_Material_Pass(m_maskMaterialPass);
 				rinfo.Push_Override_Flags(RenderInfoClass::RINFO_OVERRIDE_ADDITIONAL_PASSES_ONLY);
 				robj->Render(rinfo);
 				rinfo.Pop_Override_Flags();
 				rinfo.Pop_Material_Pass();
 			}
-		}//drawInfo exists so rendering a drawable.
+		}
 		else
 		{
 			robj->Render(rinfo);
 		}
-	}//drawable or robj is not hidden
+	}
 
 	rinfo.light_environment = NULL;
-	if (doExtraMaterialPop)	//check if there is an extra material on the stack from the add'l material effect.
+	if (doExtraMaterialPop)	//check if there is an extra material on the stack from the added material effect.
 		rinfo.Pop_Material_Pass();
 	if (doExtraFlagsPop)
 		rinfo.Pop_Override_Flags();	//flags used to disable base pass and only render custom heat vision pass.
@@ -833,9 +845,14 @@ void RTS3DScene::renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, I
 /**Draw everything that was submitted from this scene*/
 void RTS3DScene::Flush(RenderInfoClass & rinfo)
 {
+	// TheSuperHackers @bugfix Now always prepares shadows to guarantee correct state before doing any
+	// shadow draw calls. Originally just drawing shadows for trees would not properly prepare shadows.
+	PrepareShadows();
+
 	//don't draw shadows in this mode because they interfere with destination alpha or are invisible (wireframe)
 	if (m_customPassMode == SCENE_PASS_DEFAULT && Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
 		DoShadows(rinfo, false);	//draw all non-stencil shadows (decals) since they fall under other objects.
+
 	TheDX8MeshRenderer.Flush();	//draw all non-translucent objects.
 
 	//draw all non-translucent objects which were separated because they are hidden and need custom rendering.
@@ -846,7 +863,7 @@ void RTS3DScene::Flush(RenderInfoClass & rinfo)
 		flushOccludedObjectsIntoStencil(rinfo);
 #endif
 
-	// (gth) CNC3 Flush the shader meshes	
+	// (gth) CNC3 Flush the shader meshes
 	SHD_FLUSH;
 
 	// Draw the trees last so they alpha blend onto everything correctly.
@@ -855,10 +872,11 @@ void RTS3DScene::Flush(RenderInfoClass & rinfo)
 	//don't draw shadows in this mode because they interfere with destination alpha
 	if (m_customPassMode == SCENE_PASS_DEFAULT && Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
 		DoShadows(rinfo, true);	//draw all stencil shadows
+
 	WW3D::Render_And_Clear_Static_Sort_Lists(rinfo);	//draws things like water
 
 	if (m_customPassMode == SCENE_PASS_DEFAULT && Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
-		flushTranslucentObjects(rinfo);	//draw all translucent meshes which don't need per-poly sorting.
+		flushTranslucentObjects(rinfo);	//draw all translucent meshes which don't need per-polygon sorting.
 
 	{
 		//USE_PERF_TIMER(translucentRender)
@@ -867,13 +885,13 @@ void RTS3DScene::Flush(RenderInfoClass & rinfo)
 		if (m_customPassMode == SCENE_PASS_DEFAULT && Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
 			DoParticles(rinfo);	//queue up particles for rendering.
 
-		SortingRendererClass::Flush();	//draw sorted translucent polys like particles.
+		SortingRendererClass::Flush();	//draw sorted translucent polygons like particles.
 	}
 	TheDX8MeshRenderer.Clear_Pending_Delete_Lists();
 }
 
 /**Generate a predefined light environment(s) that will be applied to many objects.  Useful for things like totally fogged
-objects and most generaic map objects that are not lit by dynamic lights.*/
+objects and most generic map objects that are not lit by dynamic lights.*/
 void RTS3DScene::updateFixedLightEnvironments(RenderInfoClass & rinfo)
 {
 	//Figure out how dimly lit fogged objects should be compared to fully lit.
@@ -883,22 +901,23 @@ void RTS3DScene::updateFixedLightEnvironments(RenderInfoClass & rinfo)
 		infantryLightScale = TheGlobalData->m_scriptOverrideInfantryLightScale;
 	else
 		infantryLightScale = TheGlobalData->m_infantryLightScale[TheGlobalData->m_timeOfDay];
-	
+
 	//Generate the default light environment
 	m_defaultLightEnv.Reset(Vector3(0,0,0), Get_Ambient_Light());
 	m_foggedLightEnv.Reset(Vector3(0,0,0), Get_Ambient_Light()*foggedLightFrac);
 
 	Vector3 oldDiffuse, oldAmbient;
 	for (Int globalLightIndex = 0; globalLightIndex < m_numGlobalLights; globalLightIndex++)
-	{	m_defaultLightEnv.Add_Light(*m_globalLight[globalLightIndex]);
+	{
+		m_defaultLightEnv.Add_Light(*m_globalLight[globalLightIndex]);
 		//copy default lighting for infantry so we can tweak it.
 		*m_infantryLight[globalLightIndex]=*m_globalLight[globalLightIndex];
 		m_infantryLight[globalLightIndex]->Set_Transform(m_globalLight[globalLightIndex]->Get_Transform());
 
 		m_globalLight[globalLightIndex]->Get_Diffuse(&oldDiffuse);
 		m_globalLight[globalLightIndex]->Get_Ambient(&oldAmbient);
-    oldDiffuse *= infantryLightScale; 
-    oldAmbient *= infantryLightScale; 
+    oldDiffuse *= infantryLightScale;
+    oldAmbient *= infantryLightScale;
     static Vector3 id (1.0f, 1.0f, 1.0f);
     oldDiffuse.Cap_Absolute_To(id);
     oldAmbient.Cap_Absolute_To(id);
@@ -961,14 +980,14 @@ void RTS3DScene::Render(RenderInfoClass & rinfo)
 	if (Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
 	{
 		if (m_customPassMode == SCENE_PASS_DEFAULT)
-		{	//Regular rendering pass with no effects
+		{
+			//Regular rendering pass with no effects
 			updatePlayerColorPasses();///@todo: this probably doesn't need to be done each frame.
 			updateFixedLightEnvironments(rinfo);
 			Customized_Render(rinfo);
 			Flush(rinfo);
 		}
-		else
-		if (m_customPassMode == SCENE_PASS_ALPHA_MASK)
+		else if (m_customPassMode == SCENE_PASS_ALPHA_MASK)
 		{
 			//a projected alpha texture which will later be used to determine where
 			//wireframe should be visible.
@@ -992,14 +1011,15 @@ void RTS3DScene::Render(RenderInfoClass & rinfo)
 	{
 		Bool old_enable=WW3D::Is_Texturing_Enabled();
 		if (Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_CLEAR_LINE)
-		{	//render scene with solid black color but have destination alpha store
+		{
+			//render scene with solid black color but have destination alpha store
 			//a projected alpha texture which will later be used to determine where
 			//wireframe should be visible.
 			///@todo: Clearing to black may not be needed if the scene already did the clear.
 			DX8Wrapper::Clear(true, false, Vector3(0.0f,0.0f,0.0f),1.0f);	// Clear color but not z
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_ALPHA);
 			DX8Wrapper::Set_DX8_Render_State (D3DRS_ZBIAS, 0);
-			
+
 			//We're only filling the z-buffer so ignore normal textures and state changes to speed things up.
 			m_customPassMode = SCENE_PASS_ALPHA_MASK;
 			m_maskMaterialPass->setAllowUninstall(FALSE);
@@ -1009,7 +1029,7 @@ void RTS3DScene::Render(RenderInfoClass & rinfo)
 
 			m_maskMaterialPass->setAllowUninstall(TRUE);
 			m_maskMaterialPass->UnInstall_Materials();
-			
+
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
 			WW3D::Enable_Coloring(0xff008000);
 			WW3D::Enable_Texturing(false);
@@ -1037,7 +1057,8 @@ void RTS3DScene::Render(RenderInfoClass & rinfo)
 			ShaderClass::Invalidate();
 		}
 		else
-		{	//old W3D custom rendering code.
+		{
+			//old W3D custom rendering code.
 
 			//Disable writes to color buffer to save memory bandwidth - we only need Z.
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,0);
@@ -1089,7 +1110,7 @@ void RTS3DScene::Customized_Render( RenderInfoClass &rinfo )
 	m_translucentObjectsCount = 0;	//start of new frame so no translucent objects
 	m_occludedObjectsCount = 0;
 
-	Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+	const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
 
 #define USE_LIGHT_ENV 1
 
@@ -1100,17 +1121,17 @@ void RTS3DScene::Customized_Render( RenderInfoClass &rinfo )
 	   flagOccludedObjects(&rinfo.Camera);
 #endif
    }
-   Visibility_Checked = false;	
-	
+   Visibility_Checked = false;
 
-	RefRenderObjListIterator it(&UpdateList);	
+
+	RefRenderObjListIterator it(&UpdateList);
 	// allow all objects in the update list to do their "every frame" processing
 	for (it.First(); !it.Is_Done(); it.Next()) {
 		RenderObjClass * robj = it.Peek_Obj();
 		if (robj->Class_ID() == RenderObjClass::CLASSID_TILEMAP)
 			terrainObject=robj;	//found terrain object, store for later.
 		if (!ShaderClass::Is_Backface_Culling_Inverted()) {
-			// If we are doing water mirror, we draw with backface culling inverted.  In this case, 
+			// If we are doing water mirror, we draw with backface culling inverted.  In this case,
 			// we only want to call On_Frame_Update if we aren't drawing water, as otherwise
 			// we get 2 frame updates per frame, and it screws up the particle emitters.
 			it.Peek_Obj()->On_Frame_Update();
@@ -1119,7 +1140,7 @@ void RTS3DScene::Customized_Render( RenderInfoClass &rinfo )
 
 	//terrain needs to be rendered first
 	if (terrainObject)	// Don't check visibility - terrain is always visible. jba.
-	{		
+	{
 		robj=terrainObject;
 		rinfo.light_environment = NULL;		// Terrain is self lit.
 		rinfo.Camera.Set_User_Data(this);	//pass the scene to terrain via user data.
@@ -1129,8 +1150,7 @@ void RTS3DScene::Customized_Render( RenderInfoClass &rinfo )
 			robj->Render(rinfo);
 			rinfo.Pop_Material_Pass();
 		}
-		else
-		if (m_customPassMode == SCENE_PASS_ALPHA_MASK && m_maskMaterialPass)
+		else if (m_customPassMode == SCENE_PASS_ALPHA_MASK && m_maskMaterialPass)
 		{
 			rinfo.Push_Material_Pass(m_maskMaterialPass);
 			robj->Render(rinfo);
@@ -1144,15 +1164,14 @@ void RTS3DScene::Customized_Render( RenderInfoClass &rinfo )
 		return;
 	}
 #ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_disableObjects) { 
+	if (DX8Wrapper::stats.m_disableObjects) {
 		return;
 	}
 #endif
 
 	// loop through all render objects in the list:
-	for (it.First(&RenderList); !it.Is_Done();) 
+	for (it.First(&RenderList); !it.Is_Done();)
 	{
-
 		// get the render object
 		robj = it.Peek_Obj();
  		it.Next();	//advance to next object in case this one gets deleted during renderOneObject().
@@ -1173,20 +1192,22 @@ void RTS3DScene::Customized_Render( RenderInfoClass &rinfo )
 				renderOneObject(rinfo, robj, localPlayerIndex);
 		}
 	}
-	
+
 	//Tell shadow manager to render shadows at the end of this frame
 	//Don't draw shadows if there is no terrain present.
 	if (TheW3DShadowManager && terrainObject && !ShaderClass::Is_Backface_Culling_Inverted() &&
 		Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
+	{
 		TheW3DShadowManager->queueShadows(TRUE);
+	}
 
 	// only render particles once per frame
 	if (terrainObject != NULL && TheParticleSystemManager != NULL &&
 		Get_Extra_Pass_Polygon_Mode() == EXTRA_PASS_DISABLE)
-	{	TheParticleSystemManager->queueParticleRender();
+	{
+		TheParticleSystemManager->queueParticleRender();
 	}
-
-}  // end Customized_Renderer
+}
 
 /**Convert a player index to a color index, we use this because color indices are
 assigned in left-right binary flipped fashion so as not to occupy lower bits unless
@@ -1205,11 +1226,13 @@ Int playerIndexToColorIndex(Int playerIndex)
 		flippedPosition = NUMBER_PLAYER_COLOR_BITS-1-i;	//correct position of bit after it's flipped left/right
 
 		if (flippedPosition > i)
-		{	//shifting left
+		{
+			//shifting left
 			result |= (tmp & (1<<i))<<(flippedPosition-i);
 		}
 		else
-		{	//shifting right
+		{
+			//shifting right
 			result |= (tmp & (1<<i))>>(i-flippedPosition);
 		}
 	}
@@ -1222,7 +1245,7 @@ void renderStenciledPlayerColor( UnsignedInt color, UnsignedInt stencilRef, Bool
 {
 	struct _TRANSLITVERTEX {
 	    Vector4 p;
-		DWORD color;   // diffuse color    
+		DWORD color;   // diffuse color
 	} v[4];
 
 	Int xpos, ypos, width, height;
@@ -1244,7 +1267,7 @@ void renderStenciledPlayerColor( UnsignedInt color, UnsignedInt stencilRef, Bool
 	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 	DX8Wrapper::Set_Material(vmat);
 	REF_PTR_RELEASE(vmat);
-	DX8Wrapper::Apply_Render_State_Changes();	//force update all renderstates
+	DX8Wrapper::Apply_Render_State_Changes();	//force update all render states
 
 	LPDIRECT3DDEVICE8 m_pDev=DX8Wrapper::_Get_D3D_Device8();
 
@@ -1260,33 +1283,37 @@ void renderStenciledPlayerColor( UnsignedInt color, UnsignedInt stencilRef, Bool
 	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZENABLE, TRUE );
 	DWORD	oldColorWriteEnable=0x12345678;
 	if (clear)
-	{	//we want to clear the stencil buffer to some known value whereever a player index is stored
+	{
+		//we want to clear the stencil buffer to some known value whereever a player index is stored
 		Int occludedMask=TheW3DShadowManager->getStencilShadowMask();
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILREF,      0x80808080 );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILMASK,     occludedMask );	//isolate bits containing occluder|playerIndex
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILWRITEMASK,0xffffffff );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILFUNC,  D3DCMP_LESS );	//only draw to pixels that match the reference value
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILZFAIL, D3DSTENCILOP_REPLACE );	
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILZFAIL, D3DSTENCILOP_REPLACE );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILPASS,  D3DSTENCILOP_REPLACE );	//pixels which had occluded player colors, get MSB set.
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILFAIL,  D3DSTENCILOP_ZERO );	//pixels which had no occluded player colors are cleared.
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC, D3DCMP_NEVER  );	//fail all access to the frame buffer to improve memory bandwidth
 
 		//disable writes to color buffer
 		if (DX8Wrapper::Get_Current_Caps()->Get_DX8_Caps().PrimitiveMiscCaps & D3DPMISCCAPS_COLORWRITEENABLE)
-		{	DX8Wrapper::_Get_D3D_Device8()->GetRenderState(D3DRS_COLORWRITEENABLE, &oldColorWriteEnable);
+		{
+			DX8Wrapper::_Get_D3D_Device8()->GetRenderState(D3DRS_COLORWRITEENABLE, &oldColorWriteEnable);
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,0);
 		}
 		else
-		{	//device does not support disabling writes to color buffer so fake it through alpha blending
+		{
+			//device does not support disabling writes to color buffer so fake it through alpha blending
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE, TRUE);
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_ZERO );
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND, D3DBLEND_ONE );
 		}
 	}
 	else
-	{	DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILREF,      stencilRef );
+	{
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILREF,      stencilRef );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILMASK,     0xffffffff );
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILWRITEMASK,0xffffffff );	
+		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILWRITEMASK,0xffffffff );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILFUNC,  D3DCMP_EQUAL );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP );
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILPASS,  D3DSTENCILOP_KEEP );
@@ -1311,7 +1338,7 @@ void renderStenciledPlayerColor( UnsignedInt color, UnsignedInt stencilRef, Bool
 	if (oldColorWriteEnable != 0x12345678)
 		DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,oldColorWriteEnable);
 
-}  // end renderStencilShadows
+}
 
 #define MAX_VISIBLE_OCCLUDED_PLAYER_OBJECTS	512 //maximum number of occluded objects permitted per player
 void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo)
@@ -1332,14 +1359,15 @@ void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo)
 	//We do this so that all objects are sorted by color which reduces the number of
 	//state changes needed when drawing them.
 	for (Int i=0; i<MAX_PLAYER_COUNT; i++)
-	{	lastPlayerObject[i]=&playerObjects[i][0];
+	{
+		lastPlayerObject[i]=&playerObjects[i][0];
 		playerColorIndex[i]=-1;
 	}
 
 	//Assume no player colors are visible and all stencil bits are free for use by shadows.
 	TheW3DShadowManager->setStencilShadowMask(0);
 
-	Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+	const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
 
 	if (m_numPotentialOccludees && m_numPotentialOccluders)
 	{
@@ -1382,10 +1410,11 @@ void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo)
 		for (k=0; k<MAX_PLAYER_COUNT; k++)
 		{
 			if ((numObjects=lastPlayerObject[k]-&playerObjects[k][0]) != 0)
-			{	
+			{
 				//this player has some objects so draw them using his color index.
 				if (playerColorIndex[k]==-1)	//color index not assigned yet?
-				{	//assign a new color index to this player
+				{
+					//assign a new color index to this player
 					playerColorIndex[k]=playerIndexToColorIndex(usedPlayerColorIndex++);
 					//assign a color to this index by copying it from the controlling player
 					//of all objects in this list.
@@ -1410,7 +1439,8 @@ void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo)
 				{
 					DrawableInfo *drawInfo=((DrawableInfo *)(*renderList)->Get_User_Data());
 					if (drawInfo->m_flags & DrawableInfo::ERF_IS_TRANSLUCENT)
-					{	
+					{
+						// TheSuperHackers @info This only draws the occlusion of translucent objects.
 						TheDX8MeshRenderer.Flush();	//render all the submitted meshes using current stencil function
 						SHD_FLUSH;
 						//Disable writing to color buffer since translucent objects are rendered at end of frame.
@@ -1423,7 +1453,9 @@ void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo)
 						DX8Wrapper::Set_DX8_Render_State(D3DRS_STENCILFUNC,  D3DCMP_ALWAYS );
 					}
 					else
+					{
 						renderOneObject(rinfo, (*renderList), localPlayerIndex);
+					}
 					renderList++;	//advance to next object
 				}
 
@@ -1478,7 +1510,8 @@ void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo)
 
 		TheW3DShadowManager->setStencilShadowMask(usedPlayerColorBits);
 		if (numVisiblePlayerColors >= 8 && TheGlobalData->m_useShadowVolumes)
-		{	//for cases where we have 8 or more visible players, we're only left with 3 bits to store
+		{
+			//for cases where we have 8 or more visible players, we're only left with 3 bits to store
 			//stencil shadows.  That's probably not enough since it will only allow 7 overlapping shadows.
 			//So we clear the stencil buffer, leaving only the MSB set on any occluded player pixels so that
 			//shadow code knows not to overwrite these pixels.
@@ -1490,14 +1523,21 @@ void RTS3DScene::flushOccludedObjectsIntoStencil(RenderInfoClass & rinfo)
 	}
 	else
 	if (m_numNonOccluderOrOccludee || m_numPotentialOccluders || m_numPotentialOccludees)
-	{	//no occluded objects so don't need to render anything special.  Just draw the queued up
+	{
+		//no occluded objects so don't need to render anything special.  Just draw the queued up
 		//objects like normal because they were skipped in the main scene traversal.
 
 		RenderObjClass **occludeeList=m_potentialOccludees;
 		Int k=0;
 		for (; k<m_numPotentialOccludees; k++)
 		{
-			renderOneObject(rinfo, (*occludeeList), localPlayerIndex);
+			// TheSuperHackers @bugfix xezon 18/10/2025 No longer draws translucent objects
+			// as non-translucent ones here. They are drawn in another pass.
+			DrawableInfo *drawInfo = static_cast<DrawableInfo *>((*occludeeList)->Get_User_Data());
+			if ((drawInfo->m_flags & DrawableInfo::ERF_IS_TRANSLUCENT) == 0)
+			{
+				renderOneObject(rinfo, (*occludeeList), localPlayerIndex);
+			}
 			occludeeList++;	//advance to next one
 		}
 
@@ -1533,7 +1573,7 @@ void RTS3DScene::flushOccludedObjects(RenderInfoClass & rinfo)
 
 	if (m_occludedObjectsCount)
 	{
-		Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+		const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
 
 		if (DX8Wrapper::Has_Stencil())	//just in case we have shadows, disable them over occluded pixels.
 		{
@@ -1603,7 +1643,7 @@ void RTS3DScene::flushTranslucentObjects(RenderInfoClass & rinfo)
 
 	if (m_translucentObjectsCount)
 	{
-		Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
+		const Int localPlayerIndex = rts::getObservedOrLocalPlayerIndex_Safe();
 
 		for (Int i=0; i<m_translucentObjectsCount; i++)
 		{
@@ -1669,21 +1709,21 @@ void RTS3DScene::addDynamicLight(W3DDynamicLight * obj)
 //=============================================================================
 W3DDynamicLight * RTS3DScene::getADynamicLight(void)
 {
-		RefRenderObjListIterator dynaLightIt(&m_dynamicLightList);
-		W3DDynamicLight *pLight;
-		for (dynaLightIt.First(); !dynaLightIt.Is_Done(); dynaLightIt.Next())
-		{		
-			pLight = (W3DDynamicLight*)dynaLightIt.Peek_Obj();
-			if (!pLight->isEnabled()) {
-				pLight->setEnabled(true);
-				return(pLight);
-			}
+	RefRenderObjListIterator dynaLightIt(&m_dynamicLightList);
+	W3DDynamicLight *pLight;
+	for (dynaLightIt.First(); !dynaLightIt.Is_Done(); dynaLightIt.Next())
+	{
+		pLight = (W3DDynamicLight*)dynaLightIt.Peek_Obj();
+		if (!pLight->isEnabled()) {
+			pLight->setEnabled(true);
+			return(pLight);
 		}
-		pLight = NEW_REF(W3DDynamicLight, ());
-		addDynamicLight( pLight );
-		pLight->Release_Ref();
-		pLight->setEnabled(true);
-		return(pLight);
+	}
+	pLight = NEW_REF(W3DDynamicLight, ());
+	addDynamicLight( pLight );
+	pLight->Release_Ref();
+	pLight->setEnabled(true);
+	return(pLight);
 }
 
 //=============================================================================
@@ -1707,7 +1747,7 @@ void RTS3DScene::doRender( CameraClass * cam )
 	DRAW();
 	m_camera = NULL;
 
-}  // end Customized_Render
+}
 
 //=============================================================================
 // RTS3DScene::draw
@@ -1716,15 +1756,12 @@ void RTS3DScene::doRender( CameraClass * cam )
 //=============================================================================
 void RTS3DScene::draw( )
 {
-
 	if (m_camera == NULL) {
 		DEBUG_CRASH(("Null m_camera in RTS3DScene::draw"));
 		return;
 	}
 	WW3D::Render( this, m_camera );
-
-
-}  // end Customized_Render
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1741,7 +1778,7 @@ RTS2DScene::RTS2DScene()
 	setName("RTS2DScene");
 	m_status = NEW_REF( W3DStatusCircle, () );
 	Add_Render_Object( m_status );
-}  // end RTS2DScene
+}
 
 //=============================================================================
 // RTS2DScene::~RTS2DScene
@@ -1752,7 +1789,7 @@ RTS2DScene::~RTS2DScene()
 {
 	this->Remove_Render_Object(m_status);
 	REF_PTR_RELEASE(m_status);
-}  // end ~RTS2DScene
+}
 
 //=============================================================================
 // RTS2DScene::Custimized_Render
@@ -1761,11 +1798,9 @@ RTS2DScene::~RTS2DScene()
 //=============================================================================
 void RTS2DScene::Customized_Render( RenderInfoClass &rinfo )
 {
-
 	// call simple scene class renderer
 	SimpleSceneClass::Customized_Render( rinfo );
-
-}  // end Customized_Render
+}
 
 //=============================================================================
 // RTS2DScene::doRender
@@ -1774,12 +1809,10 @@ void RTS2DScene::Customized_Render( RenderInfoClass &rinfo )
 //=============================================================================
 void RTS2DScene::doRender( CameraClass * cam )
 {
-
 	m_camera = cam;
 	DRAW();
 	m_camera = NULL;
-
-}  // end Customized_Render
+}
 
 //=============================================================================
 // RTS2DScene::draw
@@ -1788,15 +1821,12 @@ void RTS2DScene::doRender( CameraClass * cam )
 //=============================================================================
 void RTS2DScene::draw( )
 {
-
 	if (m_camera == NULL) {
 		DEBUG_CRASH(("Null m_camera in RTS2DScene::draw"));
 		return;
 	}
 	WW3D::Render( this, m_camera );
-
-
-}  // end Customized_Render
+}
 
 
 
@@ -1811,7 +1841,7 @@ void RTS2DScene::draw( )
 //=============================================================================
 RTS3DInterfaceScene::RTS3DInterfaceScene()
 {
-}  // end RTS3DInterfaceScene
+}
 
 //=============================================================================
 // RTS3DInterfaceScene::~RTS3DInterfaceScene
@@ -1820,7 +1850,7 @@ RTS3DInterfaceScene::RTS3DInterfaceScene()
 //=============================================================================
 RTS3DInterfaceScene::~RTS3DInterfaceScene()
 {
-}  // end ~RTS3DInterfaceScene
+}
 
 //=============================================================================
 // RTS3DInterfaceScene::Custimized_Render
@@ -1829,18 +1859,16 @@ RTS3DInterfaceScene::~RTS3DInterfaceScene()
 //=============================================================================
 void RTS3DInterfaceScene::Customized_Render( RenderInfoClass &rinfo )
 {
-
 	// call simple scene class renderer
 	SimpleSceneClass::Customized_Render( rinfo );
-
-}  // end Customized_Render
+}
 
 
 
 /// The following is an :archive" of a partial attempt at detecting the mapshroud hack
 /*
  *
-	
+
 void RTS3DScene::Visibility_Check(CameraClass * camera)
 {
 #ifdef DIRTY_CONDITION_FLAGS
@@ -1863,7 +1891,7 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
 		currentFrame = TheGlobalData->m_defaultOcclusionDelay+1;	//make sure occlusion is enabled when game starts (frame 0).
 
 
-	if (ShaderClass::Is_Backface_Culling_Inverted()) 
+	if (ShaderClass::Is_Backface_Culling_Inverted())
 	{	//we are rendering reflections
 		///@todo: Have better flag to detect reflection pass
 
@@ -1912,7 +1940,7 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
 			} else {
 
 				UnsignedByte isVisible = 0;
-        
+
 
         //Cheater Foil
         isVisible |= (UnsignedByte)(camera->Cull_Sphere(robj->Get_Bounding_Sphere()) == FALSE);
@@ -1920,7 +1948,7 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
         isVisible |= (draw->getFullyObscuredByShroudWithCheatSpy());
 				robj->Set_VisibleWithCheatSpy(isVisible);
 				if (robj->Is_VisibleWithCheatSpy())//this will clear for the bit set above
-          
+
 				{	//need to keep track of occluders and ocludees for subsequent code.
 					drawInfo = (DrawableInfo *)robj->Get_User_Data();
 					if (drawInfo && (draw=drawInfo->m_drawable) != NULL)
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
deleted file mode 100644
index db70397bc35..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
+++ /dev/null
@@ -1,3737 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DShaderManager.cpp ////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: W3DShaderManager.cpp
-//
-// Created:   Mark Wilczynski, August 2001
-//
-// Desc:      Perform tests on currently selected WW3D/D3D device to determine
-//			  which of our rendering features are supported.  The system allows
-//			  setting up a few custom shaders that are selected based on video
-//			  card features.
-//
-//			  To add a new shader to the system:
-//			  0) Add your shader to the ShaderTypes enum
-//			  1) Create shader using W3DShaderInterface
-//			  2) Repeat step 1 for any alternate shaders
-//			  3) Create list of alternate shaders sorted by order of preference.
-//				 The first shader which passes hardware validation will be selected.
-//			  4) Add list from step 3) to MasterShaderList[].
-//
-//-----------------------------------------------------------------------------
-
-#include "dx8wrapper.h"
-#include "assetmgr.h"
-#include "Lib/BaseType.h"
-#include "Common/file.h"
-#include "Common/FileSystem.h"
-#include "W3DDevice/GameClient/W3DShaderManager.h"
-#include "W3DDevice/GameClient/W3DShroud.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/W3DCustomScene.h"
-#include "W3DDevice/GameClient/W3DSmudge.h"
-#include "GameClient/View.h"
-#include "GameClient/CommandXlat.h"
-#include "GameClient/Display.h"
-#include "GameClient/Water.h"
-#include "GameLogic/GameLogic.h"
-#include "Common/GlobalData.h"
-#include "Common/GameLOD.h"
-#include "d3dx8tex.h"
-#include "dx8caps.h"
-#include "Common/GameLOD.h"
-#include "benchmark.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// Turn this on to turn off pixel shaders. jba[4/3/2003]
-#define do_not_DISABLE_PIXEL_SHADERS 1
-
-/** Interface definition for custom shaders we define in our app.  These shaders can perform more complex
-	operations than those allowed in the WW3D2 shader system.
-*/
-class W3DShaderInterface
-{
-public:
-	Int getNumPasses(void) {return m_numPasses;};	///<return number of passes needed for this shader
-	virtual Int set(Int pass) {return TRUE;};		///<setup shader for the specified rendering pass.
-	 ///do any custom resetting necessary to bring W3D in sync.
-	virtual void reset(void) {
-		ShaderClass::Invalidate();
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);};
-	virtual Int init(void) = 0;			///<perform any one time initialization and validation
-	virtual Int shutdown(void) { return TRUE;};			///<release resources used by shader
-protected:
-	Int m_numPasses;						///<number of passes to complete shader
-};
-
-//this table will contain custom versions of each shader tuned for specific video card and user options.
-static W3DFilterInterface *W3DFilters[FT_MAX];
-static W3DShaderInterface *W3DShaders[W3DShaderManager::ST_MAX];
-static Int W3DShadersPassCount[W3DShaderManager::ST_MAX];	//number of passes for each of the above shaders
-TextureClass *W3DShaderManager::m_Textures[8];
-W3DShaderManager::ShaderTypes W3DShaderManager::m_currentShader;
-FilterTypes W3DShaderManager::m_currentFilter=FT_NULL_FILTER; ///< Last filter that was set.
-Int W3DShaderManager::m_currentShaderPass;
-ChipsetType W3DShaderManager::m_currentChipset;
-GraphicsVenderID W3DShaderManager::m_currentVendor;
-__int64 W3DShaderManager::m_driverVersion;
-
-Bool W3DShaderManager::m_renderingToTexture = false;
-IDirect3DSurface8 *W3DShaderManager::m_oldRenderSurface=NULL;	///<previous render target
-IDirect3DTexture8 *W3DShaderManager::m_renderTexture=NULL;		///<texture into which rendering will be redirected.
-IDirect3DSurface8 *W3DShaderManager::m_newRenderSurface=NULL;	///<new render target inside m_renderTexture
-IDirect3DSurface8 *W3DShaderManager::m_oldDepthSurface=NULL;	///<previous depth buffer surface
-/*===========================================================================================*/
-/*=========      Screen Shaders	=============================================================*/
-/*===========================================================================================*/
-
-class ScreenDefaultFilter : public W3DFilterInterface
-{
-public:
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render.  Only applies to screen filter shaders.
-	virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render.  Only applies to screen filter shaders.
-	virtual Bool setup(enum FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
-protected:
-	virtual Int set(enum FilterModes mode);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-};
-
-ScreenDefaultFilter screenDefaultFilter;
-
-///Default filter that just renders screen to off-screen texture and then copies it the the screen.
-///Useful because we added some full-time unit effects (microwave tank smudge) to Generals MD that need access
-///to the background as a texture.  This filter makes that texture always available for these effects.
-W3DFilterInterface *ScreenDefaultFilterList[]=
-{
-	&screenDefaultFilter,
-	NULL
-};
-
-Int ScreenDefaultFilter::init(void)
-{
-	if (!W3DShaderManager::canRenderToTexture()) {
-		// Have to be able to render to texture.
-		return FALSE;
-	}
-
-	//Can render to texture, but we don't know if it can read and write to the same texture.
-	//Since there is no D3D caps bit to tell you this, we will just hard-code some specific
-	//cards that we know should work.
-
-	Int res;
-
-	if ((res=W3DShaderManager::getChipset()) != DC_UNKNOWN)
-	{
-		if ( res >=	DC_GEFORCE2)
-		{	
-			//Check if their driver is newer than what we tested for this vendor
-/*			if (TheGameLODManager)
-			{
-				if (TheGameLODManager->getTestedDriverVersion(W3DShaderManager::getCurrentVendor()) < W3DShaderManager::getCurrentDriverVersion())
-					return FALSE;
-			}*/
-		}
-	}
-
-	W3DFilters[FT_VIEW_DEFAULT]=&screenDefaultFilter;
-
-	return TRUE;
-}
-
-Bool ScreenDefaultFilter::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
-{
-	//Right now this filter is only used for smudges, so don't bother if none are present.
-	if (TheSmudgeManager)
-	{	if (((W3DSmudgeManager *)TheSmudgeManager)->getSmudgeCountLastFrame() == 0)
-			return FALSE;
-	}
-	W3DShaderManager::startRenderToTexture();
-	return true;
-}
-
-Bool ScreenDefaultFilter::postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
-{
-	IDirect3DTexture8 * tex =	W3DShaderManager::endRenderToTexture();
-	DEBUG_ASSERTCRASH(tex, ("Require rendered texture."));
-	if (!tex) return false;
-	if (!set(mode)) return false;
-
-	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	struct _TRANS_LIT_TEX_VERTEX {
-		D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
-		float	u;
-		float	v;
-	} v[4];
-
-	Int xpos, ypos, width, height;
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
-	TheTacticalView->getOrigin(&xpos,&ypos);
-	width=TheTacticalView->getWidth();
-	height=TheTacticalView->getHeight();
-
-	//bottom right
-	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top right
-	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
-	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	//bottom left
-	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top left
-	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
-	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	v[0].color = 0xffffffff;
-	v[1].color = 0xffffffff;
-	v[2].color = 0xffffffff;
-	v[3].color = 0xffffffff;
-
-	//draw polygons like this is very inefficient but for only 2 triangles, it's
-	//not worth bothering with index/vertex buffers.
-	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
-
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-
-	reset();
-	return true;
-}
-
-Int ScreenDefaultFilter::set(enum FilterModes mode)
-{
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-	DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
-	DX8Wrapper::Set_Texture(0,NULL);
-	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-	return true;
-}
-
-void ScreenDefaultFilter::reset(void)
-{
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-/*=========  ScreenBWFilter	=============================================================*/
-///converts viewport to black & white.
-
-Int ScreenBWFilter::m_fadeFrames;
-Int ScreenBWFilter::m_curFadeFrame;
-Real ScreenBWFilter::m_curFadeValue;
-Int ScreenBWFilter::m_fadeDirection;
-
-ScreenBWFilter screenBWFilter;
-ScreenBWFilterDOT3 screenBWFilterDOT3;	//slower version for older cards without pixel shaders.
-
-///List of different BW shader implementations in order of preference
-W3DFilterInterface *ScreenBWFilterList[]=
-{
-	&screenBWFilter,
-	&screenBWFilterDOT3,	//slower version for older cards without pixel shaders.
-	NULL
-};
-
-Int ScreenBWFilter::init(void)
-{
-	Int res;
-	HRESULT hr;
-
-	m_dwBWPixelShader = NULL;
-	m_curFadeFrame = 0;
-
-	if (!W3DShaderManager::canRenderToTexture()) {
-		// Have to be able to render to texture.
-		return false;
-	}
-
-	if ((res=W3DShaderManager::getChipset()) != 0)
-	{
-		if (res >= DC_GENERIC_PIXEL_SHADER_1_1)
-		{
-			//this shader needs some assets that need to be loaded
-			//shader decleration
-			DWORD Declaration[]=
-			{
-				(D3DVSD_STREAM(0)),
-				(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
-				(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
-				(D3DVSD_REG(2, D3DVSDT_FLOAT2)), //  Texture Coordinates
-				(D3DVSD_END())
-			};
-
-			//Monochrome pixel shader.
-			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\monochrome.pso", &Declaration[0], 0, false, &m_dwBWPixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			W3DFilters[FT_VIEW_BW_FILTER]=&screenBWFilter;
-
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-Bool ScreenBWFilter::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
-{
-	skipRender = false;
-	W3DShaderManager::startRenderToTexture();
-	return true;
-}
-
-Bool ScreenBWFilter::postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
-{
-	IDirect3DTexture8 * tex =	W3DShaderManager::endRenderToTexture();
-	DEBUG_ASSERTCRASH(tex, ("Require rendered texture."));
-	if (!tex) return false;
-	if (!set(mode)) return false;
-
-	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	struct _TRANS_LIT_TEX_VERTEX {
-		D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
-		float	u;
-		float	v;
-	} v[4];
-
-	Int xpos, ypos, width, height;
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
-	TheTacticalView->getOrigin(&xpos,&ypos);
-	width=TheTacticalView->getWidth();
-	height=TheTacticalView->getHeight();
-
-	//bottom right
-	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top right
-	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
-	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	//bottom left
-	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top left
-	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
-	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	v[0].color = 0xffffffff;
-	v[1].color = 0xffffffff;
-	v[2].color = 0xffffffff;
-	v[3].color = 0xffffffff;
-
-	//draw polygons like this is very inefficient but for only 2 triangles, it's
-	//not worth bothering with index/vertex buffers.
-	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
-
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-
-	reset();
-	return true;
-}
-
-Int ScreenBWFilter::set(enum FilterModes mode)
-{
-	HRESULT hr;
-
-	if (mode > FM_NULL_MODE)
-	{	//rendering a quad with redirected rendering surface tinted by pixel shader
-
-		if (m_fadeDirection > 0)
-		{	//turning effect on
-			m_curFadeFrame++;
-			Int fade = m_curFadeFrame;
-
-			if (fade<m_fadeFrames)
-			{
-				m_curFadeValue = (Real)fade/(Real)m_fadeFrames;
-			}
-			else
-			{
-				m_curFadeFrame = 0;
-				m_curFadeValue = 1.0f;
-				m_fadeDirection = 0;
-			}
-		}
-		else
-		if (m_fadeDirection < 0)
-		{	//turning effect off
-			m_curFadeFrame++;
-			Int fade = m_curFadeFrame;
-			if (fade<m_fadeFrames)
-			{
-				m_curFadeValue = 1.0f - (Real)fade/(Real)m_fadeFrames;
-			}
-			else
-			{	m_curFadeValue = 0.0f;
-				TheTacticalView->setViewFilterMode(FM_NULL_MODE);
-				TheTacticalView->setViewFilter(FT_NULL_FILTER);
-				m_curFadeFrame = 0;
-				m_fadeDirection = 0;
-			}
-		}
-
-		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-		DX8Wrapper::Set_Material(vmat);
-		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		hr=DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBWPixelShader);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(0,   D3DXVECTOR4(0.3f, 0.59f, 0.11f, 1.0f), 1);
-
-		D3DXVECTOR4	color(1.0f,1.0f,1.0f,1.0f);	//multiply color
-
-		if (mode == FM_VIEW_BW_BLACK_AND_WHITE)
-		{	//back & white mode
-			color.x=1.0f;
-			color.y=1.0f;
-			color.z=1.0f;
-		}
-		if (mode == FM_VIEW_BW_RED_AND_WHITE)
-		{	//red is on
-			color.x = 1.0f;
-			color.y = 0.0f;
-			color.z = 0.0f;
-			//inverse red is on
-			//red is on
-//			color.x = 0.0f;
-//			color.y = 1.0f;
-//			color.z = 1.0f;
-		}
-		if (mode == FM_VIEW_BW_GREEN_AND_WHITE)
-		{
-			color.x = 0.0f;
-			color.y = 1.0f;
-			color.z = 0.0f;
-		}
-
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(1,   color, 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(2,	D3DXVECTOR4(m_curFadeValue, m_curFadeValue, m_curFadeValue, 1.0f), 1);
-/*		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(2,   D3DXVECTOR4(150.0f/255.0f, 150.0f/255.0f, 150.0f/255.0f, 0.0f), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(3,   D3DXVECTOR4((765.0f/450.0f)/3, (765.0f/450.0f)/3, (765.0f/450.0f)/3, 1.0f), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(4,   D3DXVECTOR4(0.5f, 0.5f, 0.5f, 0), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(5,   D3DXVECTOR4((60.0f)/255.0f, (60.0f)/255.0f, (60.0f)/255.0f, 0), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(6,   D3DXVECTOR4((157.0f)/255.0f, (157.0f)/255.0f, (157.0f)/255.0f, 0), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(7,   D3DXVECTOR4((30.0f)/255.0f, (30.0f)/255.0f, (30.0f)/255.0f, 0), 1);
-*/
-		return true;
-	}
-	return false;
-}
-
-void ScreenBWFilter::reset(void)
-{
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
-	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(0);	//turn off pixel shader
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-Int ScreenBWFilter::shutdown(void)
-{
-	if (m_dwBWPixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBWPixelShader);
-
-	m_dwBWPixelShader=NULL;
-
-	return TRUE;
-}
-
-/**Alternate version of the above filter which does not require pixel shaders - good for older cards*/
-Int ScreenBWFilterDOT3::init(void)
-{
-	Int res;
-
-	m_curFadeFrame = 0;
-
-	if (!W3DShaderManager::canRenderToTexture()) {
-		// Have to be able to render to texture.
-		return false;
-	}
-
-	if ((res=W3DShaderManager::getChipset()) != 0)
-	{
-			W3DFilters[FT_VIEW_BW_FILTER]=&screenBWFilterDOT3;
-			return TRUE;
-	}
-	return FALSE;
-}
-
-Bool ScreenBWFilterDOT3::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
-{
-	skipRender = false;
-	W3DShaderManager::startRenderToTexture();
-	return true;
-}
-
-Bool ScreenBWFilterDOT3::postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
-{
-	IDirect3DTexture8 * tex =	W3DShaderManager::endRenderToTexture();
-	DEBUG_ASSERTCRASH(tex, ("Require rendered texture."));
-	if (!tex) return false;
-	if (!set(mode)) return false;
-
-	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	struct _TRANS_LIT_TEX_VERTEX {
-		D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
-		float	u;
-		float	v;
-	} v[4];
-
-	Int xpos, ypos, width, height;
-
-	TheTacticalView->getOrigin(&xpos,&ypos);
-	width=TheTacticalView->getWidth();
-	height=TheTacticalView->getHeight();
-
-	//bottom right
-	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top right
-	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
-	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	//bottom left
-	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top left
-	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
-	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	
-	DWORD currentFade=(((Int)((1.0f-m_curFadeValue) * 255.0f))<<24) | 0x00ffffff;	//store alpha value
-
-	v[0].color = currentFade;
-	v[1].color = currentFade;
-	v[2].color = currentFade;
-	v[3].color = currentFade;
-
-	//draw polygons like this is very inefficient but for only 2 triangles, it's
-	//not worth bothering with index/vertex buffers.
-	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
-
-	//Draw B&W version first
-	if (DX8Wrapper::Get_Current_Caps()->Support_Dot3())
-	{	//Override W3D states with customizations for grayscale
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_TEXTUREFACTOR, 0x80A5CA8E);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG0, D3DTA_TFACTOR | D3DTA_ALPHAREPLICATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_TFACTOR | D3DTA_ALPHAREPLICATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_MULTIPLYADD);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_CURRENT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP, D3DTOP_DOTPRODUCT3);
-	}
-	else
-	{	//doesn't have DOT3 blend mode so fake it another way.
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_TEXTUREFACTOR, 0x60606060);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
-	}
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
-
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-
-	//Draw normal view blended by current fade level
-	ShaderClass::Invalidate();	//reset DOT3 blend from above.
-	ShaderClass shader=ShaderClass::_PresetAlphaShader;
-	shader.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);
-	DX8Wrapper::Set_Shader(shader);
-	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-	//replace texture alpha with vertex alpha
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG2);
-
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-
-	reset();
-	return true;
-}
-
-Int ScreenBWFilterDOT3::set(enum FilterModes mode)
-{
-	if (mode > FM_NULL_MODE)
-	{	//rendering a quad with redirected rendering surface tinted by pixel shader
-
-		if (m_fadeDirection > 0)
-		{	//turning effect on
-			m_curFadeFrame++;
-			Int fade = m_curFadeFrame;
-
-			if (fade<m_fadeFrames)
-			{
-				m_curFadeValue = (Real)fade/(Real)m_fadeFrames;
-			}
-			else
-			{
-				m_curFadeFrame = 0;
-				m_curFadeValue = 1.0f;
-				m_fadeDirection = 0;
-			}
-		}
-		else
-		if (m_fadeDirection < 0)
-		{	//turning effect off
-			m_curFadeFrame++;
-			Int fade = m_curFadeFrame;
-			if (fade<m_fadeFrames)
-			{
-				m_curFadeValue = 1.0f - (Real)fade/(Real)m_fadeFrames;
-			}
-			else
-			{	m_curFadeValue = 0.0f;
-				TheTacticalView->setViewFilterMode(FM_NULL_MODE);
-				TheTacticalView->setViewFilter(FT_NULL_FILTER);
-				m_curFadeFrame = 0;
-				m_fadeDirection = 0;
-			}
-		}
-
-		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-		DX8Wrapper::Set_Material(vmat);
-		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		return true;
-	}
-	return false;
-}
-
-void ScreenBWFilterDOT3::reset(void)
-{
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-Int ScreenBWFilterDOT3::shutdown(void)
-{
-	return TRUE;
-}
-
-/*=========  ScreenCrossFadeFilter	=============================================================*/
-///Fades screen between 2 different views of the scene with both being visible at once.
-
-Int ScreenCrossFadeFilter::m_fadeFrames;
-Int ScreenCrossFadeFilter::m_curFadeFrame;
-Real ScreenCrossFadeFilter::m_curFadeValue;
-Int ScreenCrossFadeFilter::m_fadeDirection;
-TextureClass *ScreenCrossFadeFilter::m_fadePatternTexture=NULL;
-Bool ScreenCrossFadeFilter::m_skipRender = FALSE;
-
-ScreenCrossFadeFilter screenCrossFadeFilter;
-
-///List of different BW shader implementations in order of preference
-///@todo: Add a version that doesn't require pixel shader
-W3DFilterInterface *ScreenCrossFadeFilterList[]=
-{
-	&screenCrossFadeFilter,
-	NULL
-};
-
-Int ScreenCrossFadeFilter::init(void)
-{
-	if (!TheDisplay)
-		return FALSE;	//effect is useless without a view so no point initializing for the WB, etc.
-
-	m_curFadeFrame = 0;
-
-	if (!W3DShaderManager::canRenderToTexture())
-		// Have to be able to render to texture.
-		return FALSE;
-
-	//Load an alpha mask texture that will mix foreground/background views.
-	m_fadePatternTexture=WW3DAssetManager::Get_Instance()->Get_Texture("exmask_g.tga");
-	if (!m_fadePatternTexture)
-		return FALSE;
-	m_fadePatternTexture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-	m_fadePatternTexture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-	m_fadePatternTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
-
-	W3DFilters[FT_VIEW_CROSSFADE]=&screenCrossFadeFilter;
-
-	return TRUE;
-}
-
-Bool ScreenCrossFadeFilter::updateFadeLevel(void)
-{
-	if (m_fadeDirection > 0)
-	{	//turning effect on
-		m_curFadeFrame++;
-		Int fade = m_curFadeFrame;
-
-		if (fade<m_fadeFrames)
-		{
-			m_curFadeValue = (Real)fade/(Real)m_fadeFrames;
-		}
-		else
-		{
-			m_curFadeFrame = 0;
-			m_curFadeValue = 1.0f;
-			m_fadeDirection = 0;
-			return false;
-		}
-	}
-	else
-	if (m_fadeDirection < 0)
-	{	//turning effect off
-		Int fade = m_curFadeFrame;
-		if (fade<m_fadeFrames)
-		{
-			m_curFadeValue = 1.0f - (Real)fade/(Real)m_fadeFrames;
-			m_curFadeFrame++;
-		}
-		else
-		{	m_curFadeValue = 0.0f;
-			TheTacticalView->setViewFilterMode(FM_NULL_MODE);
-			TheTacticalView->setViewFilter(FT_NULL_FILTER);
-			m_curFadeFrame = 0;
-			m_fadeDirection = 0;
-			return false;
-		}
-	}
-	return true;
-}
-
-Bool ScreenCrossFadeFilter::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
-{
-	if (updateFadeLevel())
-	{	//if fade has not completed
-		W3DShaderManager::startRenderToTexture();
-		scenePassMode=SCENE_PASS_ALPHA_MASK;
-		skipRender = false;
-		m_skipRender=true;	//tell the postRender function not to draw into framebuffer yet.
-		return true;
-	}
-	//fade must have completed
-	return true;
-}
-
-Bool ScreenCrossFadeFilter::postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
-{
-	IDirect3DTexture8 * tex;
-
-	if (m_skipRender)
-	{
-		//don't render anything to frame buffer because we still need to draw the new scene
-		//that we're fading into.  Okay to render on the next call.
-		m_skipRender = false;
-		doExtraRender = TRUE;
-		tex =	W3DShaderManager::endRenderToTexture();
-		return true;	
-	}
-
-	tex=W3DShaderManager::getRenderTexture();
-
-	DEBUG_ASSERTCRASH(tex, ("Require last rendered texture."));
-	if (!tex) return false;
-	if (!set(mode)) return false;
-
-	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	struct _TRANS_LIT_TEX_VERTEX {
-		D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
-		float	u;
-		float	v;
-		float	u1;
-		float	v1;
-	} v[4];
-
-	Int xpos, ypos, width, height;
-	Real radius = 0.0f;
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
-	if (mode == FM_VIEW_CROSSFADE_CIRCLE)
-	{	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1,m_fadePatternTexture->Peek_D3D_Texture());
-		//Use the current fade level to scale the mask texture, for other modes the texture
-		//comes pre-scaled so doesn't require uv scaling.
-		radius = (1.0f-m_curFadeValue)*2.0f;
-		if (radius <= 0)
-			radius = 0.01f;
-		radius = 0.5f/radius;
-	}
-
-	TheTacticalView->getOrigin(&xpos,&ypos);
-	width=TheTacticalView->getWidth();
-	height=TheTacticalView->getHeight();
-
-/*	Real radius = (1.0f-m_curFadeValue);
-	if (radius <= 0)
-		radius = 0.01f;
-	radius = 25.0f-radius*24.75f;
-*/
-	//bottom right
-	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	v[0].u1 = 0.5f+radius;	v[0].v1 = 0.5f+radius;
-	//top right
-	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
-	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	v[1].u1 = 0.5f+radius;	v[1].v1 = 0.5f-radius;
-	//bottom left
-	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	v[2].u1 = 0.5f-radius;	v[2].v1 = 0.5f+radius;
-	//top left
-	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
-	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	v[3].u1 = 0.5f-radius;	v[3].v1 = 0.5f-radius;
-
-	DWORD diffuse = 0xffffffff;//((Int)((m_curFadeValue) * 255.0f) << 24) | 0x00ffffff;	//store alpha value in vertex diffuse
-
-	v[0].color = diffuse;
-	v[1].color = diffuse;
-	v[2].color = diffuse;
-	v[3].color = diffuse;
-
-	//draw polygons like this is very inefficient but for only 2 triangles, it's
-	//not worth bothering with index/vertex buffers.
-	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX2);
-
-//		m_pDev->SetTextureStageState(0,D3DTSS_MAGFILTER,D3DTEXF_POINT); 
-//		m_pDev->SetTextureStageState(0,D3DTSS_MINFILTER,D3DTEXF_POINT); 
-
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-
-	reset();
-	return true;
-}
-
-Int ScreenCrossFadeFilter::set(enum FilterModes mode)
-{
-	if (mode > FM_NULL_MODE)
-	{	//rendering a quad with redirected rendering surface
-		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-		DX8Wrapper::Set_Material(vmat);
-		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaShader);
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Set_Texture(1,NULL);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-		if (mode == FM_VIEW_CROSSFADE_CIRCLE)
-		{	//cross-fading using circle mask stored in stage 1
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1 );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_MIPFILTER, D3DTEXF_NONE);
-		}
-
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-
-		return true;
-	}
-	return false;
-}
-
-void ScreenCrossFadeFilter::reset(void)
-{
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-Int ScreenCrossFadeFilter::shutdown(void)
-{
-	REF_PTR_RELEASE(m_fadePatternTexture);
-
-	return TRUE;
-}
-
-/*=========  ScreenMotionBlurFilter	=============================================================*/
-///applies motion blur to viewport.
-
-ScreenMotionBlurFilter screenMotionBlurFilter;
-
-Coord3D ScreenMotionBlurFilter::m_zoomToPos;
-Bool ScreenMotionBlurFilter::m_zoomToValid = false;
-
-ScreenMotionBlurFilter::ScreenMotionBlurFilter():
-m_decrement(false),
-m_maxCount(0),
-m_lastFrame(0), 
-m_skipRender(false)
-{
-}
-///List of different motion blur implementations in order of preference
-W3DFilterInterface *ScreenMotionBlurFilterList[]=
-{
-	&screenMotionBlurFilter,
-	NULL
-};
-
-Int ScreenMotionBlurFilter::init(void)
-{
-	if (!W3DShaderManager::canRenderToTexture()) {
-		// Have to be able to render to texture.
-		return false;
-	}
-	W3DFilters[FT_VIEW_MOTION_BLUR_FILTER]=this;
-	return true;
-}
-
-Bool ScreenMotionBlurFilter::preRender(Bool &skipRender, CustomScenePassModes &scenePassMode)
-{
-	skipRender = m_skipRender;
-	W3DShaderManager::startRenderToTexture();
-	return true;
-}
-
-Bool ScreenMotionBlurFilter::postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender)
-{
-	IDirect3DTexture8 * tex =	W3DShaderManager::endRenderToTexture();
-	DEBUG_ASSERTCRASH(tex, ("Require rendered texture."));
-	if (!tex) return false;
-	if (!set(mode)) return false;
-
-	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	Bool continueEffect = true;
-	struct _TRANS_LIT_TEX_VERTEX {
-		D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
-		float	u;
-		float	v;
-	} v[4];
-
-	Int xpos, ypos, width, height;
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,tex);	//previously rendered frame inside this texture
-	TheTacticalView->getOrigin(&xpos,&ypos);
-	width=TheTacticalView->getWidth();
-	height=TheTacticalView->getHeight();
-
-	//bottom right
-	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top right
-	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
-	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	//bottom left
-	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top left
-	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
-	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	v[0].color = 0xffffffff;
-	v[1].color = 0xffffffff;
-	v[2].color = 0xffffffff;
-	v[3].color = 0xffffffff;
-
-
-	if (m_additive) {
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ONE);
-	} else { 
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-	}
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
-	//draw polygons like this is very inefficient but for only 2 triangles, it's
-	//not worth bothering with index/vertex buffers.
-	DX8Wrapper::Apply_Render_State_Changes();
-	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
-
-	Coord2D center;
-	center.x = 0.5f;
-	center.y = 0.5f;
-	Bool pan = false;
-	if (mode>=FM_VIEW_MB_PAN_ALPHA) {
-		Real len = sqrt(scrollDelta.x*scrollDelta.x + scrollDelta.y*scrollDelta.y);
-		//center.x += 0.5f * (scrollDelta.x/len);
-		center.y -= 0.5f; // * (scrollDelta.y/len);
-		m_decrement = false;
-		m_maxCount = (len*200*m_panFactor/(Real)DEFAULT_PAN_FACTOR);
-		if (m_maxCount<m_panFactor/2) 
-			m_maxCount = m_panFactor/2;
-		if (m_maxCount>m_panFactor) 
-			m_maxCount=m_panFactor;
-		pan = true;
-		m_priorDelta = scrollDelta;
-	} else if (mode == FM_VIEW_MB_END_PAN_ALPHA) {
-		Real len = sqrt(m_priorDelta.x*m_priorDelta.x + m_priorDelta.y*m_priorDelta.y);
-		center.x += 0.5f * (m_priorDelta.x/len);
-		center.y -= 0.5f * (m_priorDelta.y/len);
-		m_decrement = false;
-		m_maxCount--;
-		if (m_maxCount<2) {
-			continueEffect = false;
-		}
-		pan = true;
-	}
-
-
-	m_skipRender = false;
-	if (!pan && m_lastFrame != TheGameLogic->getFrame()) {
-		if (m_decrement) {
-			m_maxCount-=COUNT_STEP;
-			if (m_maxCount<1) {
-				m_decrement = false;
-				continueEffect = false;
-			}	else {
-				m_skipRender = true;
-			}
-		} else {
-			m_maxCount+=COUNT_STEP;
-			if (m_maxCount>=MAX_COUNT) {
-				m_decrement = true;
-				if (m_doZoomTo && m_zoomToValid) {
-					TheTacticalView->lookAt(&m_zoomToPos);
-				} else {
-					continueEffect = false;
-				}
-			}	else {
-				m_skipRender = true;
-			}
-		}
-	}
-	Int	 i, j;
-	if (!pan) {
-		for (i=0; i<4; i++) {
-			Real factor = 1.0f - (m_maxCount/(Real)MAX_COUNT)*0.90f;
-			factor = sqrt(factor);
-			v[i].u = ((v[i].u-center.x)*factor) + center.x;
-			v[i].v = ((v[i].v-center.y)*factor) + center.y;
-		}
-	}
-	pDev->SetTextureStageState(0,D3DTSS_ALPHAARG1, D3DTA_CURRENT);
-	pDev->SetTextureStageState(0,D3DTSS_ALPHAARG2, D3DTA_TEXTURE);
-	pDev->SetTextureStageState(0,D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-
-	DX8Wrapper::Apply_Render_State_Changes();
-	{
-		Int limit = m_maxCount;
-		if (m_maxCount>30) limit = 30;
-		for (j=0; j<limit; j++) {
-			for (i=0; i<4; i++) {
-				Real factor = 0.99f;
-				if (m_additive) factor = 0.98f;
-				Int alpha = 0x15;
-				if (m_additive) {
-					alpha = 0x09;
-					if (m_maxCount>limit) {
-						alpha += (m_maxCount-limit)/5;
-					}
-					if (m_maxCount==MAX_COUNT) alpha += 60;
-				}
-				v[i].color = (alpha<<24)|0x00ffffff; // 
-				if (pan) {
-					v[i].u = ((v[i].u-center.x)*(factor+.006)) + center.x;
-					v[i].v = ((v[i].v-center.y)*factor) + center.y;
-				} else {
-					v[i].u = ((v[i].u-center.x)*factor) + center.x;
-					v[i].v = ((v[i].v-center.y)*factor) + center.y;
-				}
-			}
-			pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-
-		}
-	}
-	m_lastFrame = TheGameLogic->getFrame();
-	if (pan){
-		m_skipRender = false;
-	}
-	reset();
-	if (!continueEffect) {
-		m_zoomToValid = false;
-	}
-	return continueEffect;
-}
-
-Bool ScreenMotionBlurFilter::setup(enum FilterModes mode)
-{
-
-	m_additive = false;
-
-	if (mode == FM_VIEW_MB_IN_AND_OUT_SATURATE ||
-			mode == FM_VIEW_MB_IN_SATURATE ||
-			mode == FM_VIEW_MB_OUT_SATURATE) {
-		m_additive = true;
-	}
-
-	m_doZoomTo = false;
-	if (mode == FM_VIEW_MB_IN_AND_OUT_SATURATE ||
-			mode == FM_VIEW_MB_IN_AND_OUT_ALPHA ) {
-		m_doZoomTo = true;
-	}
-	if (mode >= FM_VIEW_MB_PAN_ALPHA)	{
-		m_panFactor = (int)mode - FM_VIEW_MB_PAN_ALPHA;
-		if (m_panFactor<1) m_panFactor = DEFAULT_PAN_FACTOR;
-	}
-	m_skipRender = false;
-	if (mode != FM_VIEW_MB_END_PAN_ALPHA) 
-		m_maxCount = 0;
-	m_decrement = false;
-	m_skipRender = false;
-	switch (mode) {
-		case FM_VIEW_MB_OUT_SATURATE:
-		case FM_VIEW_MB_OUT_ALPHA:
-			m_maxCount = MAX_COUNT;
-			m_decrement = TRUE;
-			break;
-	}
-	return true;
-}
-
-Int ScreenMotionBlurFilter::set(enum FilterModes mode)
-{
-	if (mode > FM_NULL_MODE)
-	{	//rendering a quad with redirected rendering surface motion blurred
-
-		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-		DX8Wrapper::Set_Material(vmat);
-		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Set_Texture(1,NULL);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_ALWAYS);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-	}
-	return TRUE;
-}
-
-void ScreenMotionBlurFilter::reset(void)
-{
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0,NULL);	//previously rendered frame inside this texture
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-Int ScreenMotionBlurFilter::shutdown(void)
-{
-	return TRUE;
-}
-
-/*===========================================================================================*/
-/*=========      Shroud Shaders	=============================================================*/
-/*===========================================================================================*/
-
-///Shroud layer rendering shader
-class ShroudTextureShader : public W3DShaderInterface
-{
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	Int m_stageOfSet;
-} shroudTextureShader;
-
-///List of different shroud shader implementations in order of preference
-W3DShaderInterface *ShroudShaderList[]=
-{
-	&shroudTextureShader,
-	NULL
-};
-
-//#define SHROUD_STRETCH_FACTOR	(1.0f/MAP_XY_FACTOR)	//1 texel per heightmap cell width
-
-Int ShroudTextureShader::init(void)
-{
-	W3DShaders[W3DShaderManager::ST_SHROUD_TEXTURE]=&shroudTextureShader;
-	W3DShadersPassCount[W3DShaderManager::ST_SHROUD_TEXTURE]=1;
-
-	return TRUE;
-}
-
-//Setup a texture projection in the given stage that applies our shroud.
-Int ShroudTextureShader::set(Int stage)
-{
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-	DX8Wrapper::Set_Texture(stage, W3DShaderManager::getShaderTexture(0));	//shroud always stored in texture 0
-
-	if (stage == 0)
-	{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaSpriteShader);
-	else
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetMultiplicativeSpriteShader);
-#else
-	DX8Wrapper::Set_Shader(ShaderClass::_PresetMultiplicativeSpriteShader);
-#endif
-	}
-	DX8Wrapper::Apply_Render_State_Changes();
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_EQUAL);
-
-	//We need to scale so shroud texel stretches over one full terrain cell.  Each texel
-	//is 1/128 the size of full texture. (assuming 128x128 vid-mem texture).
-	W3DShroud *shroud;
-	if ((shroud=TheTerrainRenderObject->getShroud()) != 0)
-	{	///@todo: All this code really only need to be done once per camera/view.  Find a way to optimize it out.
-		D3DXMATRIX inv;
-		float det;
-
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-		D3DXMATRIX scale,offset;
-
-		//We need to make all world coordinates be relative to the heightmap data origin since that
-		//is where the shroud begins.
-
-		float xoffset = 0;
-		float yoffset = 0;
-		Real width=shroud->getCellWidth();
-		Real height=shroud->getCellHeight();
-
-		if (TheTerrainRenderObject->getMap())
-		{	//subtract origin position from all coordinates.  Origin is shifted by 1 cell width/height to allow for unused border texels.
-			xoffset = -(float)shroud->getDrawOriginX() + width;
-			yoffset = -(float)shroud->getDrawOriginY() + height;
-		}
-
-		D3DXMatrixTranslation(&offset, xoffset, yoffset,0);
-
-		width = 1.0f/(width*shroud->getTextureWidth());
-		height = 1.0f/(height*shroud->getTextureHeight());
-		D3DXMatrixScaling(&scale, width, height, 1);
-		*((D3DXMATRIX *)&curView) = (inv * offset) * scale;
-		DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), *((Matrix4x4*)&curView));
-	}
-	m_stageOfSet=stage;
-	return TRUE;
-}
-
-void ShroudTextureShader::reset(void)
-{
-	DX8Wrapper::Set_Texture(m_stageOfSet,NULL);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_LESSEQUAL);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(m_stageOfSet,  D3DTSS_TEXCOORDINDEX, m_stageOfSet);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(m_stageOfSet,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);	
-}
-
-///Shroud layer rendering shader
-class FlatShroudTextureShader : public W3DShaderInterface
-{
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	Int m_stageOfSet;
-} flatShroudTextureShader;
-
-///List of different shroud shader implementations in order of preference
-W3DShaderInterface *FlatShroudShaderList[]=
-{
-	&flatShroudTextureShader,
-	NULL
-};
-
-//#define SHROUD_STRETCH_FACTOR	(1.0f/MAP_XY_FACTOR)	//1 texel per heightmap cell width
-
-Int FlatShroudTextureShader::init(void)
-{
-	W3DShaders[W3DShaderManager::ST_FLAT_SHROUD_TEXTURE]=&flatShroudTextureShader;
-	W3DShadersPassCount[W3DShaderManager::ST_FLAT_SHROUD_TEXTURE]=1;
-
-	return TRUE;
-}
-
-//Setup a texture projection in the given stage that applies our shroud.
-Int FlatShroudTextureShader::set(Int stage)
-{
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	if (stage < 2)
-		DX8Wrapper::Set_Texture(stage, W3DShaderManager::getShaderTexture(stage));
-	else	//stages larger than 1 are not supported by W3D so set them directly
-		DX8Wrapper::Set_DX8_Texture(stage, W3DShaderManager::getShaderTexture(stage)->Peek_D3D_Texture());
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG2, D3DTA_CURRENT );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	//DX8Wrapper::Apply_Render_State_Changes();
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-	//We need to scale so shroud texel stretches over one full terrain cell.  Each texel
-	//is 1/128 the size of full texture. (assuming 128x128 vid-mem texture).
-	W3DShroud *shroud;
-	if ((shroud=TheTerrainRenderObject->getShroud()) != 0)
-	{	///@todo: All this code really only need to be done once per camera/view.  Find a way to optimize it out.
-		D3DXMATRIX inv;
-		float det;
-
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-		D3DXMATRIX scale,offset;
-
-		//We need to make all world coordinates be relative to the heightmap data origin since that
-		//is where the shroud begins.
-
-		float xoffset = 0;
-		float yoffset = 0;
-		Real width=shroud->getCellWidth();
-		Real height=shroud->getCellHeight();
-
-		if (TheTerrainRenderObject->getMap())
-		{	//subtract origin position from all coordinates.  Origin is shifted by 1 cell width/height to allow for unused border texels.
-			xoffset = -(float)shroud->getDrawOriginX() + width;
-			yoffset = -(float)shroud->getDrawOriginY() + height;
-		}
-
-		D3DXMatrixTranslation(&offset, xoffset, yoffset,0);
-
-		width = 1.0f/(width*shroud->getTextureWidth());
-		height = 1.0f/(height*shroud->getTextureHeight());
-		D3DXMatrixScaling(&scale, width, height, 1);
-		*((D3DXMATRIX *)&curView) = (inv * offset) * scale;
-		DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), *((Matrix4x4*)&curView));
-	}
-	m_stageOfSet=stage;
-	return TRUE;
-}
-
-void FlatShroudTextureShader::reset(void)
-{
-	if (m_stageOfSet < MAX_TEXTURE_STAGES)
-		DX8Wrapper::Set_Texture(m_stageOfSet,NULL);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_LESSEQUAL);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(m_stageOfSet,  D3DTSS_TEXCOORDINDEX, m_stageOfSet);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(m_stageOfSet,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);	
-}
-
-///Mask layer rendering shader
-class MaskTextureShader : public W3DShaderInterface
-{
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-} maskTextureShader;
-
-///List of different shroud shader implementations in order of preference
-W3DShaderInterface *MaskShaderList[]=
-{
-	&maskTextureShader,
-	NULL
-};
-
-Int MaskTextureShader::init(void)
-{
-	W3DShaders[W3DShaderManager::ST_MASK_TEXTURE]=&maskTextureShader;
-	W3DShadersPassCount[W3DShaderManager::ST_MASK_TEXTURE]=1;
-
-	return TRUE;
-}
-
-Int MaskTextureShader::set(Int pass)
-{
-	Real fadeLevel=ScreenCrossFadeFilter::getCurrentFadeValue();
-
-	//Use the current fade level to scale the mask texture
-	Real radius = (1.0f-fadeLevel)*2.0f;
-	if (radius <= 0)
-		radius = 0.01f;
-	radius = 0.5f/radius;
-
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-
-	//For now we're always going to project the texture coming from the crossfade effect
-	DX8Wrapper::Set_Texture(0, ScreenCrossFadeFilter::getCurrentMaskTexture());
-	ShaderClass shader=ShaderClass::_PresetOpaqueShader;
-	shader.Set_Primary_Gradient(ShaderClass::GRADIENT_DISABLE);
-	DX8Wrapper::Set_Shader(shader);
-	DX8Wrapper::Apply_Render_State_Changes();
-	Matrix4x4 curView;
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-	D3DXMATRIX inv;
-	float det;
-
-	//Get inverse view matrix so we can transform camera space points back to world space
-	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-	D3DXMATRIX scale,offset,offsetTextureCenter;
-	Coord3D centerPos;
-
-	//Find center of projection (this should be returned from some other filter, etc. but
-	//for now assume terrain location at center of screen.
-	if (TheTacticalView)
-	{	Int xpos,ypos;
-
-		TheTacticalView->getOrigin(&xpos,&ypos);
-
-		ICoord2D screenPos;
-		screenPos.x=(Real)TheTacticalView->getWidth()*0.5f;
-		screenPos.y=(Real)TheTacticalView->getHeight()*0.5f;
-		TheTacticalView->screenToTerrain(&screenPos,&centerPos);
-	}
-
-	D3DXMatrixTranslation(&offset, -centerPos.x, -centerPos.y,0);
-
-	D3DXMatrixTranslation(&offsetTextureCenter, 0.5f, 0.5f, 0);	//shift coordinates so center of projection falls at uv 0.5,0.5
-
-	Real worldTexelWidth=(1.0f-fadeLevel)*25.0f;	//9 worked well for circle but weird shape requires more stretch to cover.
-	Real worldTexelHeight=(1.0f-fadeLevel)*25.0f;
-
-	///@todo: Fix this to work with non 128x128 textures.
-	if (worldTexelWidth != 0 && worldTexelHeight != 0)
-	{	Real widthScale = 1.0f/(worldTexelWidth*128.0f);
-		Real heightScale = 1.0f/(worldTexelHeight*128.0f);
-		D3DXMatrixScaling(&scale, widthScale, heightScale, 1);
-		*((D3DXMATRIX *)&curView) = ((inv * offset) * scale)*offsetTextureCenter;
-	}
-	else
-	{	D3DXMatrixScaling(&scale, 0, 0, 1);	//scaling by 0 will set uv coordinates to 0,0
-		*((D3DXMATRIX *)&curView) = ((inv * offset) * scale);
-	}
-
-	DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&curView));
-
-	return TRUE;
-}
-
-void MaskTextureShader::reset(void)
-{
-	DX8Wrapper::Set_Texture(0,NULL);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);	
-}
-
-/*===========================================================================================*/
-/*=========      Terrain Shaders	=========================================================*/
-/*===========================================================================================*/
-
-///regular terrain shader that should work on all multi-texture video cards (slowest version)
-class TerrainShader2Stage : public W3DShaderInterface
-{
-public:
-	float m_xSlidePerSecond ;	 ///< How far the clouds move per second.
-	float m_ySlidePerSecond ;	 ///< How far the clouds move per second.
-	int	  m_curTick;
-	float m_xOffset;
-	float m_yOffset;
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	void updateNoise1 (D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate=true);	///<generate the uv coordinates for Noise1 (i.e clouds)
-	void updateNoise2 (D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate=true);	///<generate the uv coordinates for Noise2 (i.e lightmap)
-} terrainShader2Stage;
-
-///regular terrain shader that should work on all multi-texture video cards (slowest version)
-class FlatTerrainShader2Stage : public W3DShaderInterface
-{
-public:
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-} flatTerrainShader2Stage;
-
-///regular terrain shader that should work on all multi-texture video cards (slowest version)
-class FlatTerrainShaderPixelShader : public W3DShaderInterface
-{
-public:
-	DWORD					m_dwBasePixelShader;	///<handle to terrain D3D pixel shader
-	DWORD					m_dwBaseNoise1PixelShader;	///<handle to terrain/single noise D3D pixel shader
-	DWORD					m_dwBaseNoise2PixelShader;	///<handle to terrain/double noise D3D pixel shader
-	DWORD					m_dwBase0PixelShader;	///<handle to terrain only pixel shader
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int shutdown(void);			///<release resources used by shader
-} flatTerrainShaderPixelShader;
-
-///8 stage terrain shader which only works on certain Nvidia cards.
-class TerrainShader8Stage : public W3DShaderInterface
-{
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int init(void);			///<perform any one time initialization and validation
-} terrainShader8Stage;
-
-//Offsets into constant register pool used by vertex shader
-#define CV_WORLDVIEWPROJ_0	0	//4 vectors for transform of world->clip space.
-
-///Pixel shader based terrain shader - fastest method for the newest cards.
-class TerrainShaderPixelShader : public W3DShaderInterface
-{
-	DWORD					m_dwBasePixelShader;	///<handle to terrain D3D pixel shader
-	DWORD					m_dwBaseNoise1PixelShader;	///<handle to terrain/single noise D3D pixel shader
-	DWORD					m_dwBaseNoise2PixelShader;	///<handle to terrain/double noise D3D pixel shader
-
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Int shutdown(void);			///<release resources used by shader
-} terrainShaderPixelShader;
-
-///List of different terrain shader implementations in order of preference
-W3DShaderInterface *TerrainShaderList[]=
-{
-	&terrainShaderPixelShader,
-	&terrainShader8Stage,
-	&terrainShader2Stage,
-	NULL
-};
-
-///List of different terrain shader implementations in order of preference
-W3DShaderInterface *FlatTerrainShaderList[]=
-{
-	&flatTerrainShaderPixelShader,
-	&flatTerrainShader2Stage,
-	NULL
-};
-
-Int TerrainShader2Stage::init( void )
-{
-	//initialize settings for uv animated clouds
-	m_xSlidePerSecond = -0.02f;	 
-	m_ySlidePerSecond =  1.50f * m_xSlidePerSecond;
-	m_curTick = 0;
-	m_curTick = WW3D::Get_Sync_Time();//::GetTickCount();
-	m_xOffset = 0;
-	m_yOffset = 0;
-
-	//no special device validation needed - anything in our min spec should handle this.
-
-	W3DShaders[W3DShaderManager::ST_TERRAIN_BASE]=&terrainShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE]=2;
-	W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=&terrainShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=3;
-	W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=&terrainShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=3;
-	W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=&terrainShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=3;
-
-	return TRUE;
-}
-
-void TerrainShader2Stage::reset(void)
-{
-	ShaderClass::Invalidate();
-
-	//Free references to textures
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
-}
-
-void TerrainShader2Stage::updateNoise1(D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate)
-{
-	#define STRETCH_FACTOR ((float)(1/(63.0*MAP_XY_FACTOR/2))) /* covers 63/2 tiles */
-
-	D3DXMATRIX scale;
-
-	D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
-	*destMatrix = *curViewInverse * scale;
-
-	D3DXMATRIX offset;
-
-	Int delta = m_curTick;
-	m_curTick = WW3D::Get_Sync_Time();//::GetTickCount();
-	delta = m_curTick-delta;
-	m_xOffset += m_xSlidePerSecond*delta/1000;
-	m_yOffset += m_ySlidePerSecond*delta/1000;
-
-
-	//m_xOffset += m_xSlidePerSecond*delta/500;
-	//m_yOffset += m_ySlidePerSecond*delta/500;
-
-
-	//m_yOffset = sinf( (float)m_curTick * 0.0001f );
-	//m_xOffset = cosf( (float)m_curTick * 0.0001f );
-
-	while (m_xOffset > 1) m_xOffset -= 1;
-	while (m_yOffset > 1) m_yOffset -= 1;
-	while (m_xOffset < -1) m_xOffset += 1;
-	while (m_yOffset < -1) m_yOffset += 1;
-
-	D3DXMatrixTranslation(&offset, m_xOffset, m_yOffset,0);
-	*destMatrix *= offset;
-}
-
-void TerrainShader2Stage::updateNoise2(D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate)
-{
-			
-	D3DXMATRIX scale;
-
-	D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
-	*destMatrix = *curViewInverse * scale;
-}
-
-Int TerrainShader2Stage::set(Int pass)																											  
-{
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	DX8Wrapper::Apply_Render_State_Changes();
-
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	}
-
-	switch (pass)
-	{
-		case 0:
-			DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-			// Modulate the diffuse color with the texture as lighting comes from diffuse.
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
-			break;
-		case 1:
-			DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-			// Modulate the diffuse color with the texture as lighting comes from diffuse.
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 1 );
-			// Blend the result using the alpha. (came from diffuse mod texture)
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-			// Disable stage 2.
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-			break;
-		case 2:
-			// Noise/cloud pass
-			Matrix4x4 curView;
-			DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-			//these states apply to all noise/cloud combination passes
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-			// Two output coordinates are used.
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-			//blend into frame buffer
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_DESTCOLOR);
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
-
-			
-			D3DXMATRIX inv;
-			float det;
-
-			D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-			if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE12)
-			{
-				//setup cloud pass
-				DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-
-				updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, curView);
-				//clouds always need bilinear filtering
-				DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-				//setup noise pass
-				DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
-
-				updateNoise2(((D3DXMATRIX*)&curView),&inv);
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
-				//noise always needs point/linear filtering.  Why point!?
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-				// Two output coordinates are used.
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-			} //ST_TERRAIN_BASE_NOISE12
-			else
-			{	//only 1 noise or cloud texture
-				// Now setup the texture pipeline.
-				if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE1)
-				{	//setup cloud pass
-					DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-					updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-					DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-					DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-				}
-				else
-				{
-					//setup noise pass
-					DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
-					updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-				}
-
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&curView));
-			}
-			break;
-	}
-
-	return TRUE;
-}
-
-Int TerrainShader8Stage::init( void )
-{	
-	ChipsetType res;
-
-	//this shader will also use the 2Stage shader for some of the passes so initialize it too.
-	if (terrainShader2Stage.init() && (res=W3DShaderManager::getChipset()) >= DC_TNT && res <= DC_GEFORCE2)
-	{
-		W3DShaders[W3DShaderManager::ST_TERRAIN_BASE]=&terrainShader8Stage;
-		W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE]=1;
-		W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=&terrainShader8Stage;
-		W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=2;
-		W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=&terrainShader8Stage;
-		W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=2;
-		W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=&terrainShader8Stage;
-		W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=2;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-Int TerrainShader8Stage::set(Int pass)
-{
-	if (pass == 0)
-	{
-		//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-		DX8Wrapper::Apply_Render_State_Changes();
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-		if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-		} else {
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_POINT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-		}
-		if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		} else {
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		}
-		
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP, D3DTOP_ADD);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_DIFFUSE | D3DTA_COMPLEMENT | D3DTA_ALPHAREPLICATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_ADD);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TFACTOR | D3DTA_COMPLEMENT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-		DX8Wrapper::Set_DX8_Texture(2, NULL);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, 2);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLORARG2, D3DTA_TEXTURE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-		DX8Wrapper::Set_DX8_Texture(3, NULL);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, 3);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLORARG1, D3DTA_DIFFUSE | 0 | D3DTA_ALPHAREPLICATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-		DX8Wrapper::Set_DX8_Texture(4, NULL);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLOROP, D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_TEXCOORDINDEX, 4);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLORARG1, D3DTA_CURRENT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAARG1, D3DTA_CURRENT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-
-		DX8Wrapper::Set_DX8_Texture(5, NULL);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLOROP, D3DTOP_ADD);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_TEXCOORDINDEX, 5);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLORARG1, D3DTA_DIFFUSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAOP,   D3DTOP_ADD);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAARG1, D3DTA_TFACTOR | D3DTA_COMPLEMENT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 5, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-		DX8Wrapper::Set_DX8_Texture(6, NULL);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLOROP, D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_TEXCOORDINDEX, 6);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLORARG1, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_COLORARG2, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAOP,   D3DTOP_MODULATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 6, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-
-		DX8Wrapper::Set_DX8_Texture(7, NULL);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_TEXCOORDINDEX, 7);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLORARG1, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_COLORARG2, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAARG1, D3DTA_TFACTOR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 7, D3DTSS_ALPHAARG2, D3DTA_TFACTOR);
-	}
-	else
-	{	//setup cloud noise/pass
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_DISABLE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLOROP, D3DTOP_DISABLE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
-		DX8Wrapper::Invalidate_Cached_Render_States();
-
-		terrainShader2Stage.set(2);
-	}
-	return TRUE;
-}
-
-void TerrainShader8Stage::reset(void)
-{
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_COLOROP, D3DTOP_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_COLOROP, D3DTOP_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 4, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-Int TerrainShaderPixelShader::shutdown(void)
-{
-	if (m_dwBasePixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBasePixelShader);
-
-	if (m_dwBaseNoise1PixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise1PixelShader);
-
-	if (m_dwBaseNoise2PixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise2PixelShader);
-
-	m_dwBasePixelShader=NULL;
-	m_dwBaseNoise1PixelShader=NULL;
-	m_dwBaseNoise2PixelShader=NULL;
-
-	return TRUE;
-}
-
-Int TerrainShaderPixelShader::init( void )
-{	
-	Int res;
-#ifdef DISABLE_PIXEL_SHADERS
-	return false;
-#endif
-	//this shader will also use the 2Stage shader for some of the passes so initialize it too.
-	if (terrainShader2Stage.init() && (res=W3DShaderManager::getChipset()) >= DC_GENERIC_PIXEL_SHADER_1_1)
-	{
-		if (res >= DC_GENERIC_PIXEL_SHADER_1_1)
-		{
-			//this shader needs some assets that need to be loaded
-			//shader decleration
-			DWORD Declaration[]=
-			{
-				(D3DVSD_STREAM(0)),
-				(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
-				(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
-				(D3DVSD_REG(2, D3DVSDT_FLOAT2)), //  Texture Coordinates
-				(D3DVSD_REG(3, D3DVSDT_FLOAT2)), //  Texture Coordinates
-				(D3DVSD_END())
-			};
-
-			//base version which doesn't apply any noise textures.
-			HRESULT hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\terrain.pso", &Declaration[0], 0, false, &m_dwBasePixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			//version which blends 1 noise texture.
-			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\terrainnoise.pso", &Declaration[0], 0, false, &m_dwBaseNoise1PixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			//version which blends 2 noise textures.
-			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\terrainnoise2.pso", &Declaration[0], 0, false, &m_dwBaseNoise2PixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			W3DShaders[W3DShaderManager::ST_TERRAIN_BASE]=&terrainShaderPixelShader;
-			W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=&terrainShaderPixelShader;
-			W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=&terrainShaderPixelShader;
-			W3DShaders[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=&terrainShaderPixelShader;
-			W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE]=1;
-			W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE1]=1;
-			W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE2]=1;
-			W3DShadersPassCount[W3DShaderManager::ST_TERRAIN_BASE_NOISE12]=1;
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-Int TerrainShaderPixelShader::set(Int pass)
-{	
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	DX8Wrapper::Apply_Render_State_Changes();
-
-	//setup base pass
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-	//tell pixel shader which UV set to use for each stage
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 1 );
-
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	}
-
-	if (W3DShaderManager::getCurrentShader() >= W3DShaderManager::ST_TERRAIN_BASE_NOISE1)
-	{	
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-		D3DXMATRIX inv;
-		float det;
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-		// Two output coordinates are used.
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-		
-		if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE12)
-		{	//full shader
-			DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-			DX8Wrapper::_Get_D3D_Device8()->SetTexture(2, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-			DX8Wrapper::_Get_D3D_Device8()->SetTexture(3, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
-			DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise2PixelShader);
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(3, D3DTSS_MINFILTER, D3DTEXF_POINT);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(3, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-			terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-			DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, curView);
-
-			terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-			DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE3, curView);
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-			// Two output coordinates are used.
-			DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-		}
-		else
-		{	//single noise texture shader
-			DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise1PixelShader);
-
-			if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE1)
-			{	//cloud map
-				DX8Wrapper::_Get_D3D_Device8()->SetTexture(2, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-				terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-				DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-			}
-			else
-			{	//light map
-				DX8Wrapper::_Get_D3D_Device8()->SetTexture(2, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
-				terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-				DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_POINT);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-			}
-			DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, curView);
-		}
-	}
-	else
-	{	//just base texturing
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBasePixelShader);
-	}
-
-	return TRUE;
-}
-
-void TerrainShaderPixelShader::reset(void)
-{
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(2,NULL);	//release reference to any texture
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,NULL);	//release reference to any texture
-
-	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(0);	//turn off pixel shader
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|2);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|3);
-
-
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-///Cloud layer rendering shader - used for objects similar to terrain which only need the cloud layer.
-class CloudTextureShader : public W3DShaderInterface
-{
-	virtual Int set(Int stage);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	Int m_stageOfSet;
-} cloudTextureShader;
-
-///List of different cloud shader implementations in order of preference
-W3DShaderInterface *CloudShaderList[]=
-{
-	&cloudTextureShader,
-	NULL
-};
-
-Int CloudTextureShader::init(void)
-{
-	W3DShaders[W3DShaderManager::ST_CLOUD_TEXTURE]=&cloudTextureShader;
-	W3DShadersPassCount[W3DShaderManager::ST_CLOUD_TEXTURE]=1;
-
-	return TRUE;
-}
-
-/**Setup a certain texture stage to project our cloud texture*/
-Int CloudTextureShader::set(Int stage)
-{
-	Matrix4x4 curView;
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-	D3DXMATRIX inv;
-	float det;
-
-	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-	//Get a texture matrix that applies the current cloud position
-	terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv,false);	//update curView with texture matrix
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-	DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), curView);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG2, D3DTA_CURRENT );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(stage, W3DShaderManager::getShaderTexture(stage)->Peek_D3D_Texture());
-
-	m_stageOfSet=stage;
-	return TRUE;
-}
-
-void CloudTextureShader::reset(void)
-{
-	//Free reference to texture
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(m_stageOfSet, NULL);
-	//Turn off texture projection
-	DX8Wrapper::Set_DX8_Texture_Stage_State( m_stageOfSet, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( m_stageOfSet, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|m_stageOfSet);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( m_stageOfSet, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( m_stageOfSet, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-}
-
-/*===========================================================================================*/
-/*=========      Road Shaders	=========================================================*/
-/*===========================================================================================*/
-class RoadShaderPixelShader : public W3DShaderInterface
-{
-	DWORD					m_dwBaseNoise2PixelShader;	///<handle to road/double noise D3D pixel shader
-
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual void reset(void);		///<do any custom resetting necessary to bring W3D in sync.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual Int shutdown(void);			///<release resources used by shader
-} roadShaderPixelShader;
-
-class RoadShader2Stage : public W3DShaderInterface
-{	friend class RoadShaderPixelShader;	//pixel shader version uses some of the same features.
-
-	virtual Int set(Int pass);		///<setup shader for the specified rendering pass.
-	virtual Int init(void);			///<perform any one time initialization and validation
-	virtual void reset(void);
-} roadShader2Stage;
-
-///List of different terrain shader implementations in order of preference
-W3DShaderInterface *RoadShaderList[]=
-{
-	&roadShaderPixelShader,
-	&roadShader2Stage,
-	NULL
-};
-
-Int RoadShaderPixelShader::shutdown(void)
-{
-	if (m_dwBaseNoise2PixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise2PixelShader);
-
-	m_dwBaseNoise2PixelShader=NULL;
-
-	return TRUE;
-}
-
-Int RoadShaderPixelShader::init( void )
-{	
-	Int res;
-
-	//this shader will also use the 2Stage shader for some of the passes so initialize it too.
-	if (roadShader2Stage.init() && (res=W3DShaderManager::getChipset()) >= DC_GENERIC_PIXEL_SHADER_1_1)
-	{
-		if (res >= DC_GENERIC_PIXEL_SHADER_1_1)
-		{
-			//this shader needs some assets that need to be loaded
-			//shader decleration
-			DWORD Declaration[]=
-			{
-				(D3DVSD_STREAM(0)),
-				(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
-				(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
-				(D3DVSD_REG(2, D3DVSDT_FLOAT2)), //  Texture Coordinates
-				(D3DVSD_END())
-			};
-
-			//version which blends 2 noise textures.
-			HRESULT hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\roadnoise2.pso", &Declaration[0], 0, false, &m_dwBaseNoise2PixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			//Only set this shader for use in dual noise mode.  The 2Stage shader will take care of
-			//all the other modes.
-			W3DShaders[W3DShaderManager::ST_ROAD_BASE_NOISE12]=&roadShaderPixelShader;
-			W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE_NOISE12]=1;
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-Int RoadShaderPixelShader::set(Int pass)
-{
-	DX8Wrapper::Set_Texture(0,W3DShaderManager::getShaderTexture(0));
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	DX8Wrapper::Apply_Render_State_Changes();
-
-	//tell pixel shader which UV set to use for each stage
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_LESSEQUAL);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_LIGHTING, FALSE);
-
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);	//blend roads into terrain
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-
-	Matrix4x4 curView;
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-	D3DXMATRIX inv;
-	float det;
-	D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex)
-	{	DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	}
-	else
-	{	DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	// Two output coordinates are used.
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-	
-	DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-	DX8Wrapper::Set_Texture(1,W3DShaderManager::getShaderTexture(1));
-	DX8Wrapper::Set_Texture(2,W3DShaderManager::getShaderTexture(2));
-
-	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise2PixelShader);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_POINT);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-	terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv, false);	//get texture projection matrix
-	DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
-
-	terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv, false);	//get texture projection matrix
-	DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, curView);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-	// Two output coordinates are used.
-	DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-	return TRUE;
-}
-
-void RoadShaderPixelShader::reset(void)
-{
-
-	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(0);	//turn off pixel shader
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|2);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|3);
-
-
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-Int RoadShader2Stage::init( void )
-{
-	//no special device validation needed - anything in our min spec should handle this.
-	W3DShaders[W3DShaderManager::ST_ROAD_BASE]=&roadShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE]=1;
-	W3DShaders[W3DShaderManager::ST_ROAD_BASE_NOISE1]=&roadShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE_NOISE1]=1;
-	W3DShaders[W3DShaderManager::ST_ROAD_BASE_NOISE2]=&roadShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE_NOISE2]=1;
-	W3DShaders[W3DShaderManager::ST_ROAD_BASE_NOISE12]=&roadShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_ROAD_BASE_NOISE12]=2;
-
-	return TRUE;
-}
-
-Int RoadShader2Stage::set(Int pass)																											  
-{
-	//First stage always contains base texture.
-	DX8Wrapper::Set_Texture(0,W3DShaderManager::getShaderTexture(0));
-	//Force system to apply world/view transforms.
-	DX8Wrapper::Apply_Render_State_Changes();
-
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC,D3DCMP_LESSEQUAL);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZWRITEENABLE,FALSE);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_LIGHTING, FALSE);
-
-	// Modulate the diffuse color with the texture as lighting comes from diffuse.
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE );
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);	//blend roads into terrain
-
-	if (pass == 0)
-	{	
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_SRCALPHA);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_INVSRCALPHA);
-
-		if (W3DShaderManager::getCurrentShader() >= W3DShaderManager::ST_ROAD_BASE_NOISE1)
-		{	//second texture unit will contain a noise pass
-			Matrix4x4 curView;
-			DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-			D3DXMATRIX inv;
-			float det;
-			D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-			if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex)
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-			else
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-			// Two output coordinates are used.
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-
-			if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_ROAD_BASE_NOISE12)
-			{	//full shader, apply noise 1 in pass 0.
-				DX8Wrapper::Set_Texture(1,W3DShaderManager::getShaderTexture(1));
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-				terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv, false);	//get texture projection matrix
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
-			}
-			else
-			{	//single noise texture shader
-				if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_ROAD_BASE_NOISE1)
-				{	//cloud map
-					DX8Wrapper::Set_Texture(1,W3DShaderManager::getShaderTexture(1));
-					terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv, false);	//update curView with texture matrix
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-				}
-				else
-				{	//light map
-					DX8Wrapper::Set_Texture(1,W3DShaderManager::getShaderTexture(2));
-					terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv, false);	//update curView with texture matrix
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-				}
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
-			}
-		}
-		else
-		{	//just base texturing
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-		}
-	}	//pass 0
-	else
-	{	//pass 1, apply additional noise pass
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-		D3DXMATRIX inv;
-		float det;
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-		if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex)
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		else
-			DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-
-		DX8Wrapper::Set_Texture(1,W3DShaderManager::getShaderTexture(2));
-
-		terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv, false);	//update curView with texture matrix
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-		// Two output coordinates are used.
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-		//Copy alpha channel into stage 1 but mask out color channel by replacing with white.
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		//Force color channel to white by copying the alpha into RGB
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE|D3DTA_ALPHAREPLICATE);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG2);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG1 );
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_BLENDCURRENTALPHA);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-		//Modulate into existing roads with clouds applied. - only apply where roads are transparent by
-		//using road texture as a mask.
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_ZERO);
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_SRCCOLOR);
-
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, curView);
-	}
-
-	return TRUE;
-}
-
-void RoadShader2Stage::reset(void)
-{
-	ShaderClass::Invalidate();
-
-	//Free references to textures
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
-}
-
-/** List of all custom shader lists - each list in this list contains variations of the same
-	shader to allow it to work on different hardware configurations.
-*/
-W3DShaderInterface **MasterShaderList[]=
-{
-	TerrainShaderList,
-	ShroudShaderList,
-	FlatShroudShaderList,
-	RoadShaderList,
-	MaskShaderList,
-	CloudShaderList,
-	FlatTerrainShaderList,
-	NULL
-};
-
-/** List of all custom filter lists - each list in this list contains variations of the same
-	filter to allow it to work on different hardware configurations.
-*/
-W3DFilterInterface **MasterFilterList[]=
-{
-	ScreenDefaultFilterList,
-	ScreenBWFilterList,
-	ScreenMotionBlurFilterList,
-	ScreenCrossFadeFilterList,
-	NULL
-};
-
-// W3DShaderManager::W3DShaderManager =========================================
-/** Constructor - just clears some variables */
-//=============================================================================
-W3DShaderManager::W3DShaderManager(void)
-{
-	m_currentShader = ST_INVALID;
-	m_currentFilter = FT_NULL_FILTER;
-	m_oldRenderSurface = NULL;
-	m_renderTexture = NULL;
-	m_newRenderSurface = NULL;
-	m_oldDepthSurface = NULL;
-	m_renderingToTexture = false;
-	Int i;
-	for (i=0; i<W3DShaderManager::ST_MAX; i++)
-	{	W3DShaders[i]=NULL;
-		W3DShadersPassCount[i]=0;
-	}
-	for (i=0; i<FT_MAX; i++)
-	{	W3DFilters[i]=NULL;
-	}
-	for (i=0; i<8; i++)
-	{
-		m_Textures[i]=NULL;
-	}
-	m_currentShader=(W3DShaderManager::ShaderTypes)-1;
-}
-
-// W3DShaderManager::init =======================================================
-/** Walk through all shaders and find versions suitable for current hardware */
-//=============================================================================
-void W3DShaderManager::init(void)
-{
-	int i,j;
-
-	D3DSURFACE_DESC desc;
-	// For now, check & see if we are gf3 or higher on the food chain.
-
-	ChipsetType res=DC_UNKNOWN;
-	if ((res=W3DShaderManager::getChipset()) != 0)
-	{
-		m_currentChipset = res;	//cache the current chipset.
-
-		//Some of our effects require an offscreen render target, so try creating it here.
-		HRESULT hr=DX8Wrapper::_Get_D3D_Device8()->GetRenderTarget(&m_oldRenderSurface);
-
-		m_oldRenderSurface->GetDesc(&desc);
-
-		hr=DX8Wrapper::_Get_D3D_Device8()->CreateTexture(desc.Width,desc.Height,1,D3DUSAGE_RENDERTARGET,desc.Format,D3DPOOL_DEFAULT,&m_renderTexture);
-
-		if (hr != S_OK)
-		{
-			if (m_oldRenderSurface) m_oldRenderSurface->Release();
-			m_oldRenderSurface = NULL;
-			m_renderTexture = NULL;
-		} else {
-			hr = m_renderTexture->GetSurfaceLevel(0, &m_newRenderSurface);
-			if (hr != S_OK)
-			{
-				if (m_renderTexture) m_renderTexture->Release();
-				m_renderTexture = NULL;
-				m_newRenderSurface = NULL;
-			}	else {
-				hr = DX8Wrapper::_Get_D3D_Device8()->GetDepthStencilSurface(&m_oldDepthSurface);
-				if (hr != S_OK)
-				{
-					if (m_newRenderSurface) m_newRenderSurface->Release();
-					if (m_renderTexture) m_renderTexture->Release();
-					m_renderTexture = NULL;
-					m_newRenderSurface = NULL;
-					m_oldDepthSurface = NULL;
-				}
-			}
-		}
-	}
-
-	W3DShaderInterface **shaders;
-
-	for (i=0; MasterShaderList[i] != NULL; i++)
-	{	
-		shaders=MasterShaderList[i];
-		for (j=0; shaders[j] != NULL; j++)
-		{
-			if (shaders[j]->init())
-				break;	//found a working shader
-		}
-	}
-	W3DFilterInterface **filters;
-
-	for (i=0; MasterFilterList[i] != NULL; i++)
-	{	
-		filters=MasterFilterList[i];
-		for (j=0; filters[j] != NULL; j++)
-		{
-			if (filters[j]->init())
-				break;	//found a working shader
-		}
-	}
-
-	DEBUG_LOG(("ShaderManager ChipsetID %d\n", res));
-}
-
-// W3DShaderManager::shutdown =======================================================
-/** Any shaders which allocate resources will be allowed to free them */
-//=============================================================================
-void W3DShaderManager::shutdown(void)
-{
-	if (m_newRenderSurface) m_newRenderSurface->Release();
-	if (m_renderTexture) m_renderTexture->Release();
-	if (m_oldRenderSurface) m_oldRenderSurface->Release();
-	if (m_oldDepthSurface) m_oldDepthSurface->Release();
-	m_renderTexture = NULL;
-	m_newRenderSurface = NULL;
-	m_oldDepthSurface = NULL;
-	m_oldRenderSurface = NULL;
-	m_currentShader = ST_INVALID;
-	m_currentFilter = FT_NULL_FILTER;
-	//release any assets associated with a shader (vertex/pixel shaders, textures, etc.)
-	Int i=0;
-	for (; i<W3DShaderManager::ST_MAX; i++) {
-		if (W3DShaders[i]) {
-			W3DShaders[i]->shutdown();
-		}
-	}
-
-	for (i=0; i < FT_MAX; i++)
-	{	
-		if (W3DFilters[i])
-		{
-			W3DFilters[i]->shutdown();
-		}
-	}
-
-}
-
-// W3DShaderManager::getShaderPasses =======================================================
-/** Return number of renderig passes required in perform the desired shader on current
-	hardware.  App will need to re-render the polygons this many times to complete the
-	effect.
- */
-//=============================================================================
-Int W3DShaderManager::getShaderPasses(ShaderTypes shader)
-{
-	return W3DShadersPassCount[shader];
-}
-
-// W3DShaderManager::setShader =======================================================
-/** Must call this method before each rendering pass in order to perform proper D3D
-	setup for each shader.
- */
-//=============================================================================
-Int W3DShaderManager::setShader(ShaderTypes shader, Int pass)
-{
-	if (shader == m_currentShader && pass == m_currentShaderPass)
-		return TRUE;	//shader is already set
-	m_currentShader=shader;
-	m_currentShaderPass = pass;
-	if (W3DShaders[shader])
-		return W3DShaders[shader]->set(pass);
-	return FALSE;
-}
-
-// W3DShaderManager::resetShader =======================================================
-/** Must call this method after all polygons and rendering passes have been submitted.
-	This method allows D3D to reset itself to a default state that doesn't conflict
-	with the WW3D2 Shader system.
- */
-//=============================================================================
-void W3DShaderManager::resetShader(ShaderTypes shader)
-{	
-	if (m_currentShader == ST_INVALID)
-		return;	//last shader is already reset.
-	if (W3DShaders[shader])
-		W3DShaders[shader]->reset();
-	m_currentShader = ST_INVALID;
-}
-// W3DShaderManager::filterPreRender =======================================================
-/** Call to view filter shaders before rendering starts.
- */
-//=============================================================================
-Bool W3DShaderManager::filterPreRender(FilterTypes filter, Bool &skipRender, CustomScenePassModes &scenePassMode)
-{
-	if (W3DFilters[filter])
-	{	Bool result=W3DFilters[filter]->preRender(skipRender,scenePassMode);
-		if (result)
-			m_currentFilter = filter;
-		return result;
-	}
-	return FALSE;
-}
-
-// W3DShaderManager::filterPostRender =======================================================
-/** Call to view filter shaders after rendering is complete.
- */
-//=============================================================================
-Bool W3DShaderManager::filterPostRender(FilterTypes filter, enum FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender)
-{
-	if (W3DFilters[filter])
-		return W3DFilters[filter]->postRender(mode, scrollDelta,doExtraRender);
-
-	m_currentFilter = FT_NULL_FILTER;
-	return FALSE;
-}
-
-// W3DShaderManager::filterPostRender =======================================================
-/** Call to view filter shaders after rendering is complete.
- */
-//=============================================================================
-	static Bool filterSetup(FilterTypes filter, enum FilterModes mode);
-Bool W3DShaderManager::filterSetup(FilterTypes filter, enum FilterModes mode)
-{
-	if (W3DFilters[filter])
-		return W3DFilters[filter]->setup(mode);
-	return FALSE;
-}
-
-/*Draws 2 triangles covering the viewport given the current render states*/
-void W3DShaderManager::drawViewport(Int color)
-{
-	LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	struct _TRANS_LIT_TEX_VERTEX {
-		D3DXVECTOR4 p;
-		DWORD color;   // diffuse color    
-		float	u;
-		float	v;
-	} v[4];
-
-	Int xpos, ypos, width, height;
-
-	TheTacticalView->getOrigin(&xpos,&ypos);
-	width=TheTacticalView->getWidth();
-	height=TheTacticalView->getHeight();
-
-	//bottom right
-	v[0].p = D3DXVECTOR4( xpos+width-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[0].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[0].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top right
-	v[1].p = D3DXVECTOR4( xpos+width-0.5f, ypos-0.5f, 0.0f, 1.0f );
-	v[1].u = (Real)(xpos+width)/(Real)TheDisplay->getWidth();	v[1].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	//bottom left
-	v[2].p = D3DXVECTOR4(  xpos-0.5f, ypos+height-0.5f, 0.0f, 1.0f );
-	v[2].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[2].v = (Real)(ypos+height)/(Real)TheDisplay->getHeight();
-	//top left
-	v[3].p = D3DXVECTOR4(  xpos-0.5f,  ypos-0.5f, 0.0f, 1.0f );
-	v[3].u = (Real)(xpos)/(Real)TheDisplay->getWidth();	v[3].v = (Real)(ypos)/(Real)TheDisplay->getHeight();
-	v[0].color = color;
-	v[1].color = color;
-	v[2].color = color;
-	v[3].color = color;
-
-	//draw polygons like this is very inefficient but for only 2 triangles, it's
-	//not worth bothering with index/vertex buffers.
-	pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
-
-	pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-}
-
-// W3DShaderManager::startRenderToTexture =======================================================
-/** Starts rendering to a texture.
- */
-//=============================================================================
-void W3DShaderManager::startRenderToTexture(void)
-{	
-	DEBUG_ASSERTCRASH(!m_renderingToTexture, ("Already rendering to texture - cannot nest calls."));
-
-	if (m_renderingToTexture || m_newRenderSurface==NULL || m_oldDepthSurface==NULL) return;
-	HRESULT hr = DX8Wrapper::_Get_D3D_Device8()->SetRenderTarget(m_newRenderSurface,m_oldDepthSurface);
-	DEBUG_ASSERTCRASH(hr==S_OK, ("Set target failed unexpectedly."));
-	if (hr != S_OK)
-		return;
-	m_renderingToTexture = true;
-	if (TheGlobalData->m_showSoftWaterEdge)
-	{	//Soft water edges use frame buffer destination alpha so we must clear it to a known value.
-		if (m_currentFilter == FT_VIEW_MOTION_BLUR_FILTER || m_currentFilter == FT_VIEW_CROSSFADE)
-		{	//these filters rely on the previous frame being visible so we must be careful about clearing
-			//frame buffer.  Only clear the alpha channel
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_ALPHA);	//only clear alpha
-			ShaderClass shader=ShaderClass::_PresetOpaqueSolidShader;
-			shader.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);
-			shader.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);
-			DX8Wrapper::Set_Shader(shader);
-
-			VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-			DX8Wrapper::Set_Material(vmat);
-			REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-		
-			drawViewport(0x00ffffff | (((Int)(TheWaterTransparency->m_minWaterOpacity*255.0f)) <<24));
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_RED|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_BLUE);	//disable writes to alpha
-		}
-		else	//normal clear that overwrites everything.
-			DX8Wrapper::Clear(true, false, Vector3( 0.0f, 0.0f, 0.0f ), TheWaterTransparency->m_minWaterOpacity);
-	}
-}
-
-// W3DShaderManager::startRenderToTexture =======================================================
-/** Ends rendering to a texture.
- */
-//=============================================================================
-IDirect3DTexture8 *W3DShaderManager::endRenderToTexture(void)
-{	
-	DEBUG_ASSERTCRASH(m_renderingToTexture, ("Not rendering to texture."));
-	if (!m_renderingToTexture) return NULL;
-	HRESULT hr = DX8Wrapper::_Get_D3D_Device8()->SetRenderTarget(m_oldRenderSurface,m_oldDepthSurface);	//restore original render target
-	DEBUG_ASSERTCRASH(hr==S_OK, ("Set target failed unexpectedly."));
-	if (hr == S_OK)
-	{
-		//assume render target texure will be in stage 0.  Most hardware has "conditional" support for
-		//non-power-of-2 textures so we must force some required states:
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSW, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_MIPFILTER, D3DTEXF_NONE);
-
-		m_renderingToTexture = false;
-	}
-	return m_renderTexture;
-}
-
-/**Returns texture containing the image that was last rendered using any of the effects requiring render target
-textures.  Used mostly for cross-fading effects that need an unmodified version of the view before the effect
-was applied.  NOTE: This texture does not survive device reset.. so quit effect on reset!*/
-IDirect3DTexture8 *W3DShaderManager::getRenderTexture(void)
-{
-	return m_renderTexture;
-}
-
-enum GraphicsVenderID CPP_11(: Int)
-{
-	DC_NVIDIA_VENDOR_ID	= 0x10DE,
-	DC_3DFX_VENDOR_ID	= 0x121A,
-	DC_ATI_VENDOR_ID	= 0x1002
-};
-
-// W3DShaderManager::ChipsetType =======================================================
-/** Returns the chipset used by the currently active rendering device.  Can be useful
-	for coding around specific driver bugs.
- */
-//=============================================================================
-ChipsetType W3DShaderManager::getChipset( void )
-{
-	//check if globaldata has an override for current chipset
-	if (TheGlobalData && TheGlobalData->m_chipSetType != DC_UNKNOWN)
-		return (ChipsetType)TheGlobalData->m_chipSetType;
-
-	ChipsetType chip=DC_UNKNOWN;
-	IDirect3D8* d3d8Interface=DX8Wrapper::_Get_D3D8();
-
-	if (d3d8Interface && DX8Wrapper::_Get_D3D_Device8())
-	{
-
-		D3DADAPTER_IDENTIFIER8 did;
-		::ZeroMemory(&did, sizeof(D3DADAPTER_IDENTIFIER8));
-	/*	HRESULT res = */ d3d8Interface->GetAdapterIdentifier(0,D3DENUM_NO_WHQL_LEVEL,&did);
-		*((LARGE_INTEGER*)&m_driverVersion) = did.DriverVersion;
-
-		if(did.VendorId == DC_NVIDIA_VENDOR_ID)
-		{
-			m_currentVendor = DC_NVIDIA_VENDOR_ID;
-
-			if (did.DeviceId == 0x20)
-				return DC_TNT;
-   
-			if (did.DeviceId >= 0x28 && did.DeviceId < 0x100)
-				return DC_TNT2;
-
-			if ( (did.DeviceId >= 0x100 && did.DeviceId <= 0x103) ||	//GeForce
-				 (did.DeviceId >= 0x110 && did.DeviceId <= 0x113) ||	//GeForce2 MX
-						 (did.DeviceId >= 0x150 && did.DeviceId <= 0x153) )	//GeForce2
-           		return DC_GEFORCE2;
-
-			if (did.DeviceId >= 0x200 && did.DeviceId < 0x250)
-				return DC_GEFORCE3;
-
-			if (did.DeviceId >= 0x250)
-				return DC_GEFORCE4;
-		}
-		else
-		if(did.VendorId == DC_3DFX_VENDOR_ID)
-		{
-			m_currentVendor = DC_3DFX_VENDOR_ID;
-
-			if (did.DeviceId == 0x0002)
-				return DC_VOODOO2;
-			if (did.DeviceId == 0x0005)
-				return DC_VOODOO3;
-			if (did.DeviceId == 0x0008)	///@todo: Just guessing on this one - find actual Voodoo4 deviceID.
-				return DC_VOODOO4;
-			if (did.DeviceId == 0x0009)
-				return DC_VOODOO5;
-		}
-		else
-		if(did.VendorId == DC_ATI_VENDOR_ID)
-		{
-			m_currentVendor = DC_ATI_VENDOR_ID;
-
-			if (did.DeviceId == 0x5144)
-				return DC_RADEON;
-			if (did.DeviceId == 0x514C)
-				return DC_RADEON_8500;
-			if (did.DeviceId == 0x4e44)
-				return DC_RADEON_9700;
-		}
-
-		//None of the vendor specific ID's matched so use generic means to classify the card
-		Int maxTextures=DX8Wrapper::Get_Current_Caps()->Get_Max_Simultaneous_Textures();
-		Real pixelShaderVersion;
-
-		char buf[256];
-
-		//Convert version to Real
-		sprintf(buf,"%d.%d",DX8Wrapper::Get_Current_Caps()->Get_Pixel_Shader_Major_Version(),DX8Wrapper::Get_Current_Caps()->Get_Pixel_Shader_Minor_Version());
-		sscanf(buf,"%f",&pixelShaderVersion);
-
-		if (maxTextures >= 4)
-		{	if (pixelShaderVersion >= 1.1f)
-				chip=DC_GENERIC_PIXEL_SHADER_1_1;
-			if (pixelShaderVersion >= 1.4f)
-				chip=DC_GENERIC_PIXEL_SHADER_1_4;
-			if (maxTextures >= 8 && pixelShaderVersion >= 2.0f)
-				chip=DC_GENERIC_PIXEL_SHADER_2_0;
-		}
-	}	//D3D8 interface and device exist. 
-	
-	return chip;
-}
-
-//=============================================================================
-// WaterRenderObjClass::LoadAndCreateShader
-//=============================================================================
-/** Loads and creates a D3D pixel or vertex shader.*/
-//=============================================================================
-HRESULT W3DShaderManager::LoadAndCreateD3DShader(const char* strFilePath, const DWORD* pDeclaration, DWORD Usage, Bool ShaderType, DWORD* pHandle)
-{
-	if (getChipset() < DC_GENERIC_PIXEL_SHADER_1_1)
-		return E_FAIL;	//don't allow loading any shaders if hardware can't handle it.
-	
-	try
-	{
-		File *file = NULL;
-		HRESULT hr;
-
-		file = TheFileSystem->openFile(strFilePath, File::READ | File::BINARY);
-		if (file == NULL)
-		{
-			OutputDebugString("Could not find file \n" );
-			return E_FAIL;
-		}
-
-		FileInfo fileInfo;
-		TheFileSystem->getFileInfo(AsciiString(strFilePath), &fileInfo);
-		DWORD dwFileSize = fileInfo.sizeLow;
-
-		const DWORD* pShader = (DWORD*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwFileSize);
-		if (!pShader)
-		{
-			OutputDebugString( "Failed to allocate memory to load shader\n " );
-			return E_FAIL;
-		}
-
-		file->read((void *)pShader, dwFileSize);
-
-		file->close();
-		file = NULL;
-
-		if (ShaderType == TRUE)//SHADERTYPE_VERTEX)
-		{
-			hr = DX8Wrapper::_Get_D3D_Device8()->CreateVertexShader(pDeclaration, pShader, pHandle, Usage);
-		}
-		else if (ShaderType == FALSE)//SHADERTYPE_PIXEL)
-		{
-			hr = DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader(pShader, pHandle);
-		}
-
-		HeapFree(GetProcessHeap(), 0, (void*)pShader);
-
-		if (FAILED(hr))
-		{
-			OutputDebugString( "Failed to create shader\n "); 
-			return E_FAIL;
-		}
-	}
-	catch(...)
-	{
-		OutputDebugString( "Error opening file \n" );
-		return E_FAIL;
-	}
-
-	return S_OK;
-}
-
-//For the MP test, we're enforcing high min-spec requirements that need to be verified.
-#define MIN_INTEL_CPU_FREQ	1300
-#define MIN_AMD_CPU_FREQ	1100
-#define MIN_ACCEPTED_FREQUENCY	1300
-#define MIN_ACCEPTED_MEMORY	(1024*1024*256)	//256 MB
-#define MIN_ACCEPTED_TEXTURE_MEMORY	(1024*1024*30)	//30 MB
-
-/**Hack to give gameengine access to this function*/
-Bool testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, Int *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex)
-{
-	return W3DShaderManager::testMinimumRequirements(videoChipType,cpuType,cpuFreq,numRAM,intBenchIndex,floatBenchIndex,memBenchIndex);
-}
-
-Bool W3DShaderManager::testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, Int *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex)
-{
-	if (videoChipType)
-		*videoChipType = getChipset();
-
-	if (cpuType)
-	{
-		*cpuType = XX;	//unknown
-
-		//Check if it's an Athlon
-		if (CPUDetectClass::Get_Processor_Manufacturer() == CPUDetectClass::MANUFACTURER_AMD &&
-				CPUDetectClass::Get_AMD_Processor() >= CPUDetectClass::AMD_PROCESSOR_ATHLON_025)
-				*cpuType = K7;
-
-		//Check if it's a P3
-		if (CPUDetectClass::Get_Processor_Manufacturer() == CPUDetectClass::MANUFACTURER_INTEL &&
-				CPUDetectClass::Get_Intel_Processor() >= CPUDetectClass::INTEL_PROCESSOR_PENTIUM_III_MODEL_7)
-				*cpuType = P3;
-		//Check if it's a P4
-		if (CPUDetectClass::Get_Processor_Manufacturer() == CPUDetectClass::MANUFACTURER_INTEL &&
-				CPUDetectClass::Get_Intel_Processor() >= CPUDetectClass::INTEL_PROCESSOR_PENTIUM4)
-				*cpuType = P4;
-	}
-
-	if (cpuFreq)
-		*cpuFreq=CPUDetectClass::Get_Processor_Speed();
-
-	if (numRAM)
-		*numRAM=CPUDetectClass::Get_Total_Physical_Memory();
-
-	if (intBenchIndex && floatBenchIndex && memBenchIndex)
-	{
-		RunBenchmark(0, NULL, floatBenchIndex, intBenchIndex, memBenchIndex);
-	}
-
-	return TRUE;
-}
-
-/**Try to guess how well the video card will handle the game assuming very fast CPU*/
-StaticGameLODLevel W3DShaderManager::getGPUPerformanceIndex(void)
-{
-	ChipsetType	chipType;
-	StaticGameLODLevel detailSetting=STATIC_GAME_LOD_LOW;	//assume lowest settings for now.
-
-	if ((chipType=getChipset()) != DC_UNKNOWN)
-	{	//a known video card so we can make some assumptions
-		if (chipType >=	DC_GEFORCE2)
-			detailSetting=STATIC_GAME_LOD_LOW;	//these cards need multiple terrain passes.
-		if (chipType >= DC_GENERIC_PIXEL_SHADER_1_1)	//these cards can do terrain in single pass.
-			detailSetting=STATIC_GAME_LOD_HIGH;
-	}
-
-	return detailSetting;
-}
-
-/**We need a hardware independent method to compare different CPU's.  For lack of anything better, we'll
-use time to calculate PIE using a slow random number algorithm.*/
-
-/**Used to test function call overhead*/
-void add(float *sum,float *addend)
-{
-	*sum = *sum + *addend;
-}
-
-/**Returns seconds needed to run the test*/
-Real W3DShaderManager::GetCPUBenchTime(void)
-{
-	float ztot, yran, ymult, ymod, x, y, z, pi, prod;
-    long int low, ixran, itot, j, iprod;
-
-  	__int64 endTime64,freq64,startTime64;
-	QueryPerformanceFrequency((LARGE_INTEGER *)&freq64);
-	QueryPerformanceCounter((LARGE_INTEGER *)&startTime64);
-
-    ztot = 0.0;
-    low = 1;
-    ixran = 1907;
-    yran = 5813.0;
-    ymult = 1307.0;
-    ymod = 5471.0;
-    itot = 560000;	//total iterations. This value ends up running at ~30 fps on our P4-2.2Ghz.
-
-    for(j=1; j<=itot; j++)
-    {
-		iprod = 27611 * ixran;
-		ixran = iprod - 74383*(long int)(iprod/74383);
-		x = (float)ixran / 74383.0;
-		prod = ymult * yran;
-		yran = (prod - ymod*(long int)(prod/ymod));
-		y = yran / ymod;
-		z = x*x + y*y;
-		add(&ztot,&z);
-		if ( z <= 1.0 )
-		{
-		  low = low + 1;
-		}
-	}
-	pi = 4.0 * (float)low/(float)itot;
-
-	QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
-	return ((double)(endTime64-startTime64)/(double)(freq64));
-}
-
-
-// W3DShaderManager::setShroudTex =======================================================
-/** Puts the shroud texture into a texture stage.
- */
-//=============================================================================
-Int W3DShaderManager::setShroudTex(Int stage)
-{
-	//We need to scale so shroud texel stretches over one full terrain cell.  Each texel
-	//is 1/128 the size of full texture. (assuming 128x128 vid-mem texture).
-	W3DShroud *shroud;
-	if ((shroud=TheTerrainRenderObject->getShroud()) != 0)
-	{	 
-		DX8Wrapper::Set_Texture(stage, shroud->getShroudTexture());
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLORARG2, D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( stage, D3DTSS_ALPHAOP,   D3DTOP_SELECTARG2 );
-		D3DXMATRIX inv;
-		float det;
-
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-		D3DXMATRIX scale,offset;
-
-		//We need to make all world coordinates be relative to the heightmap data origin since that
-		//is where the shroud begins.
-
-		float xoffset = 0;
-		float yoffset = 0;
-		Real width=shroud->getCellWidth();
-		Real height=shroud->getCellHeight();
-
-		if (TheTerrainRenderObject->getMap())
-		{	//subtract origin position from all coordinates.  Origin is shifted by 1 cell width/height to allow for unused border texels.
-			xoffset = -(float)shroud->getDrawOriginX() + width;
-			yoffset = -(float)shroud->getDrawOriginY() + height;
-		}
-
-		D3DXMatrixTranslation(&offset, xoffset, yoffset,0);
-
-		width = 1.0f/(width*shroud->getTextureWidth());
-		height = 1.0f/(height*shroud->getTextureHeight());
-		D3DXMatrixScaling(&scale, width, height, 1);
-		*((D3DXMATRIX *)&curView) = (inv * offset) * scale;
-		DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), *((Matrix4x4*)&curView));
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-
-Int FlatTerrainShader2Stage::init( void )
-{
-	//no special device validation needed - anything in our min spec should handle this.
-
-	W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE]=&flatTerrainShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE]=1;
-	W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1]=&flatTerrainShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1]=2;
-	W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE2]=&flatTerrainShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE2]=2;
-	W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12]=&flatTerrainShader2Stage;
-	W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12]=2;
-
-	return TRUE;
-}
-
-void FlatTerrainShader2Stage::reset(void)
-{
-	ShaderClass::Invalidate();
-
-	//Free references to textures
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
-}
-
-
-Int FlatTerrainShader2Stage::set(Int pass)																											  
-{
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	DX8Wrapper::Apply_Render_State_Changes();
-
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-
-	switch (pass)
-	{
-		case 0:
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-			// Modulate the diffuse color with the texture as lighting comes from diffuse.
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-			if (W3DShaderManager::getShaderTexture(0)) {
-				DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(0)->Peek_D3D_Texture());
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_CURRENT );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-				DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-				//We need to scale so shroud texel stretches over one full terrain cell.  Each texel
-				//is 1/128 the size of full texture. (assuming 128x128 vid-mem texture).
-				W3DShroud *shroud;
-				if ((shroud=TheTerrainRenderObject->getShroud()) != 0)
-				{	
-					D3DXMATRIX inv;
-					float det;
-
-					Matrix4x4 curView;
-					DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-					D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-					D3DXMATRIX scale,offset;
-
-					//We need to make all world coordinates be relative to the heightmap data origin since that
-					//is where the shroud begins.
-
-					float xoffset = 0;
-					float yoffset = 0;
-					Real width=shroud->getCellWidth();
-					Real height=shroud->getCellHeight();
-
-					if (TheTerrainRenderObject->getMap())
-					{	//subtract origin position from all coordinates.  Origin is shifted by 1 cell width/height to allow for unused border texels.
-						xoffset = -(float)shroud->getDrawOriginX() + width;
-						yoffset = -(float)shroud->getDrawOriginY() + height;
-					}
-
-					D3DXMatrixTranslation(&offset, xoffset, yoffset,0);
-
-					width = 1.0f/(width*shroud->getTextureWidth());
-					height = 1.0f/(height*shroud->getTextureHeight());
-					D3DXMatrixScaling(&scale, width, height, 1);
-					*((D3DXMATRIX *)&curView) = (inv * offset) * scale;
-					DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0), *((Matrix4x4*)&curView));
-				}
-			}	else {
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG2 );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, 0 );
-			}
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-			// Modulate the diffuse color with the texture as lighting comes from diffuse.
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, 0 );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,false);
-			break;
-		case 1:
-			// Noise/cloud pass
-			Matrix4x4 curView;
-			DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-			//these states apply to all noise/cloud combination passes
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1 );
-			DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-			// Two output coordinates are used.
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-			DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-			//blend into frame buffer
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHABLENDENABLE,true);
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_DESTCOLOR);
-			DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_ZERO);
-
-			
-			D3DXMATRIX inv;
-			float det;
-
-			D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-			if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12)
-			{
-				//setup cloud pass
-
-				terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, curView);
-				//clouds always need bilinear filtering
-				DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-				DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-
-				//setup noise pass
-
-				terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv);
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
-				//noise always needs point/linear filtering.  Why point!?
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-				// Two output coordinates are used.
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-				DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
-			} //ST_TERRAIN_BASE_NOISE12
-			else
-			{	//only 1 noise or cloud texture
-				// Now setup the texture pipeline.
-				if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1)
-				{	//setup cloud pass
-					DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-					terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-					DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-					DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-				}
-				else
-				{
-					//setup noise pass
-					DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
-					terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-					DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-				}
-
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&curView));
-			}
-			break;
-	}
-
-	return TRUE;
-}
-
-
-
-
-
-
-Int FlatTerrainShaderPixelShader::shutdown(void)
-{
-	if (m_dwBasePixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBasePixelShader);
-
-	if (m_dwBase0PixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBase0PixelShader);
-
-	if (m_dwBaseNoise1PixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise1PixelShader);
-
-	if (m_dwBaseNoise2PixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise2PixelShader);
-
-	m_dwBasePixelShader=NULL;
-	m_dwBase0PixelShader=NULL;
-	m_dwBaseNoise1PixelShader=NULL;
-	m_dwBaseNoise2PixelShader=NULL;
-
-	return TRUE;
-}
-
-Int FlatTerrainShaderPixelShader::init( void )
-{	
-	Int res;
-
-#ifdef DISABLE_PIXEL_SHADERS
-	return false;
-#endif
-
-	//this shader will also use the 2Stage shader for some of the passes so initialize it too.
-	if ((res=W3DShaderManager::getChipset()) >= DC_GENERIC_PIXEL_SHADER_1_1)
-	{
-		if (res >= DC_GENERIC_PIXEL_SHADER_1_1)
-		{
-			//this shader needs some assets that need to be loaded
-			//shader decleration
-			DWORD Declaration[]=
-			{
-				(D3DVSD_STREAM(0)),
-				(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
-				(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
-				(D3DVSD_REG(2, D3DVSDT_FLOAT2)), //  Texture Coordinates
-				(D3DVSD_REG(3, D3DVSDT_FLOAT2)), //  Texture Coordinates
-				(D3DVSD_END())
-			};
-
-			//base version which doesn't apply any noise textures.
-			HRESULT hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\fterrain.pso", &Declaration[0], 0, false, &m_dwBasePixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			//base version which doesn't apply any shroud textures.
-			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\fterrain0.pso", &Declaration[0], 0, false, &m_dwBase0PixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			//version which blends 1 noise texture.
-			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\fterrainnoise.pso", &Declaration[0], 0, false, &m_dwBaseNoise1PixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			//version which blends 2 noise textures.
-			hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\fterrainnoise2.pso", &Declaration[0], 0, false, &m_dwBaseNoise2PixelShader);
-			if (FAILED(hr))
-				return FALSE;
-
-			W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE]=&flatTerrainShaderPixelShader;
-			W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1]=&flatTerrainShaderPixelShader;
-			W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE2]=&flatTerrainShaderPixelShader;
-			W3DShaders[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12]=&flatTerrainShaderPixelShader;
-			W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE]=1;
-			W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1]=1;
-			W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE2]=1;
-			W3DShadersPassCount[W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12]=1;
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-Int FlatTerrainShaderPixelShader::set(Int pass)
-{
-	//setup base pass
-	Int curStage = 1;
-	// setup terrain [3/31/2003]
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_Texture(0, W3DShaderManager::getShaderTexture(2));
-	DX8Wrapper::Set_Texture(1, W3DShaderManager::getShaderTexture(2));
-	//force WW3D2 system to set it's states so it won't later overwrite our custom settings.
-	DX8Wrapper::Apply_Render_State_Changes();
-
-
-
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-	//tell pixel shader which UV set to use for each stage
-	DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_TEXCOORDINDEX, 0 );
-	DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);	
-
-	if (TheGlobalData && TheGlobalData->m_bilinearTerrainTex || TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MINFILTER, D3DTEXF_POINT);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-	}
-	if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
-	} else {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MIPFILTER, D3DTEXF_POINT);
-	}
-
-	curStage = 0;
-
-	W3DShroud *shroud = TheTerrainRenderObject->getShroud();
-	if (shroud) {
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-		//We need to scale so shroud texel stretches over one full terrain cell.  Each texel
-		//is 1/128 the size of full texture. (assuming 128x128 vid-mem texture).
-		{	
-			D3DXMATRIX inv;
-			float det;
-
-			Matrix4x4 curView;
-			DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-			D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-			D3DXMATRIX scale,offset;
-
-			//We need to make all world coordinates be relative to the heightmap data origin since that
-			//is where the shroud begins.
-
-			float xoffset = 0;
-			float yoffset = 0;
-			Real width=shroud->getCellWidth();
-			Real height=shroud->getCellHeight();
-
-			if (TheTerrainRenderObject->getMap())
-			{	//subtract origin position from all coordinates.  Origin is shifted by 1 cell width/height to allow for unused border texels.
-				xoffset = -(float)shroud->getDrawOriginX() + width;
-				yoffset = -(float)shroud->getDrawOriginY() + height;
-			}
-
-			D3DXMatrixTranslation(&offset, xoffset, yoffset,0);
-
-			width = 1.0f/(width*shroud->getTextureWidth());
-			height = 1.0f/(height*shroud->getTextureHeight());
-			D3DXMatrixScaling(&scale, width, height, 1);
-			*((D3DXMATRIX *)&curView) = (inv * offset) * scale;
-			DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+curStage), *((Matrix4x4*)&curView));
-		}
-		DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State( curStage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(curStage, shroud->getShroudTexture()->Peek_D3D_Texture());
-		curStage++;
-		if (curStage==1) curStage++;
-	}
-
-	Bool doNoise1 = (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE1 ||
-						W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12);
-	if (doNoise1) {	 // Cloud pass.
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-		D3DXMATRIX inv;
-		float det;
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-		// Two output coordinates are used.
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(curStage, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
-		terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-		DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+curStage), *((Matrix4x4*)&curView));
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-		
-		curStage++;
-		if (curStage==1) curStage++;
-	}
-
-	Bool doNoise2 = (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE2 ||
-						W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_FLAT_TERRAIN_BASE_NOISE12);
-	if (doNoise2)
-	{	
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-		D3DXMATRIX inv;
-		float det;
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-		// Two output coordinates are used.
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(curStage, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
-		terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv);	//update curView with texture matrix
-		DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+curStage), *((Matrix4x4*)&curView));
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(curStage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
-		
-		curStage++;
-		if (curStage==1) curStage++;
-	}
-	if (curStage<2) {
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBase0PixelShader);
-	}	else if (curStage==2) {
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBasePixelShader);
-	}	else if (curStage==3) {
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise1PixelShader);
-	}else if (curStage==4) {
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise2PixelShader);
-	}
-	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ALPHABLENDENABLE, false);
-	DX8Wrapper::Apply_Render_State_Changes();
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(curStage, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
-	return TRUE;
-}
-
-void FlatTerrainShaderPixelShader::reset(void)
-{
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(2,NULL);	//release reference to any texture
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,NULL);	//release reference to any texture
-
-	DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(0);	//turn off pixel shader
-
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, NULL);
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, NULL);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|2);
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 3, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|3);
-
-
-	DX8Wrapper::Invalidate_Cached_Render_States();
-}
-
-
-
-
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp
index d250b5f27c3..1c120148b73 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShroud.cpp
@@ -42,11 +42,6 @@
 #include "Common/GlobalData.h"
 #include "GameLogic/PartitionManager.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-----------------------------------------------------------------------------
 
@@ -97,13 +92,13 @@ W3DShroud::W3DShroud(void)
 W3DShroud::~W3DShroud(void)
 {
 	ReleaseResources();
+
 	if (m_pSrcTexture)
 		m_pSrcTexture->Release();
-	m_pSrcTexture=NULL;
-	if (m_finalFogData)
-		delete [] m_finalFogData;
-	if (m_currentFogData)
-		delete [] m_currentFogData;
+
+	delete [] m_finalFogData;
+	delete [] m_currentFogData;
+
 	m_drawFogOfWar=FALSE;
 }
 
@@ -124,7 +119,7 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi
 
 	//Precompute a bounding box for entire shroud layer
 	if (pMap)
-	{	
+	{
 		m_numCellsX = REAL_TO_INT_CEIL((Real)(pMap->getXExtent() - 1 - pMap->getBorderSizeInline()*2)*MAP_XY_FACTOR/m_cellWidth);
 		m_numCellsY = REAL_TO_INT_CEIL((Real)(pMap->getYExtent() - 1 - pMap->getBorderSizeInline()*2)*MAP_XY_FACTOR/m_cellHeight);
 
@@ -134,8 +129,8 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi
 		dstTextureHeight=m_numMaxVisibleCellsY=REAL_TO_INT_FLOOR((Real)(pMap->getDrawHeight()-1)*MAP_XY_FACTOR/m_cellHeight)+1;
 
 		dstTextureWidth = m_numCellsX;
-		dstTextureHeight = m_numCellsY; 
-		
+		dstTextureHeight = m_numCellsY;
+
 		dstTextureWidth += 2;	//enlarge by 2 pixels so we can have a border color all the way around.
 		unsigned int depth = 1;
 		dstTextureHeight += 2;	//enlarge by 2 pixels so we can have border color all the way around.
@@ -160,7 +155,7 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi
  	memset(m_finalFogData,0,srcWidth*srcHeight);
 #endif
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 		m_pSrcTexture = DX8Wrapper::_Create_DX8_Surface(srcWidth,srcHeight, WW3D_FORMAT_A4R4G4B4);
 	else
@@ -184,7 +179,7 @@ void W3DShroud::init(WorldHeightMap *pMap, Real worldCellSizeX, Real worldCellSi
 	//clear entire texture to black
 	memset(m_srcTextureData,0,m_srcTexturePitch*srcHeight);
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 		fillShroudData(TheGlobalData->m_shroudAlpha);	//initialize shroud to a known value
 #endif
@@ -209,14 +204,17 @@ void W3DShroud::reset()
 {
 	//Free old shroud data since it may no longer fit new map.
 	if (m_pSrcTexture)
+	{
 		m_pSrcTexture->Release();
-	m_pSrcTexture=NULL;
-	if (m_finalFogData)
-		delete [] m_finalFogData;
+		m_pSrcTexture=NULL;
+	}
+
+	delete [] m_finalFogData;
 	m_finalFogData=NULL;
-	if (m_currentFogData)
-		delete [] m_currentFogData;
+
+	delete [] m_currentFogData;
 	m_currentFogData=NULL;
+
 	m_clearDstTexture = TRUE;	//always refill the destination texture after a reset
 }
 
@@ -235,10 +233,10 @@ Bool W3DShroud::ReAcquireResources(void)
 			return TRUE;	//nothing to reaquire since shroud was never initialized with valid data
 
 		DEBUG_ASSERTCRASH( m_pDstTexture == NULL, ("ReAcquire of existing shroud texture"));
-	
+
 		// Create destination texture (stored in video memory).
 		// Since we control the video memory copy, we can do partial updates more efficiently. Or do shift blits.
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 			m_pDstTexture = MSGNEW("TextureClass") TextureClass(m_dstTextureWidth,m_dstTextureHeight,WW3D_FORMAT_A4R4G4B4,MIP_LEVELS_1, TextureClass::POOL_DEFAULT);
 		else
@@ -269,8 +267,8 @@ W3DShroudLevel W3DShroud::getShroudLevel(Int x, Int y)
 	if (x < m_numCellsX && y < m_numCellsY)
 	{
 		UnsignedShort pixel=*(UnsignedShort *)((Byte *)m_srcTextureData + x*2 + y*m_srcTexturePitch);
-		
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+
+#if defined(RTS_DEBUG)
 		if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 			//in this mode, alpha channel holds intensity
 			return (W3DShroudLevel)((1.0f-((Real)(pixel >> 12)/15.0f))*255.0f);
@@ -295,7 +293,7 @@ void W3DShroud::setShroudLevel(Int x, Int y, W3DShroudLevel level, Bool textureO
 		if (level < TheGlobalData->m_shroudAlpha)
 			level = TheGlobalData->m_shroudAlpha;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 		if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 		{
 			///@todo: optimize this case if we end up using fog shroud.
@@ -334,9 +332,9 @@ void W3DShroud::setShroudLevel(Int x, Int y, W3DShroudLevel level, Bool textureO
 
 //      For those interested, MLorenzen has this bock commented out until he gets back on Mon, Sept. 30 2002
 			// If this code is still here by mid october, nuke it!
-//			UnsignedInt texelRed =  ((*texel >> 8 ) & 0xf8); 
-//			UnsignedInt texelGreen =((*texel >> 3 ) & 0xfc);  
-//			UnsignedInt texelBlue = ((*texel << 3 ) & 0xf8);  
+//			UnsignedInt texelRed =  ((*texel >> 8 ) & 0xf8);
+//			UnsignedInt texelGreen =((*texel >> 3 ) & 0xfc);
+//			UnsignedInt texelBlue = ((*texel << 3 ) & 0xf8);
 //			if (texelRed < texelGreen && texelGreen > texelBlue)
 //			{
 //				bluepixel += redpixel;
@@ -360,7 +358,7 @@ void W3DShroud::fillShroudData(W3DShroudLevel level)
 	if (level < TheGlobalData->m_shroudAlpha)
 		level = TheGlobalData->m_shroudAlpha;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	//convert value to pixel format
 	if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 	{
@@ -394,7 +392,7 @@ void W3DShroud::fillShroudData(W3DShroudLevel level)
 	}
 
 	UnsignedShort *ptr=(UnsignedShort *)m_srcTextureData;
-	Int pitch = m_srcTexturePitch >> 1;	//2 bytes per pointer increment 
+	Int pitch = m_srcTexturePitch >> 1;	//2 bytes per pointer increment
 	for (y=0; y<m_numCellsY; y++)
 	{
 		for (x=0; x<m_numCellsX; x++)
@@ -423,7 +421,7 @@ void W3DShroud::fillBorderShroudData(W3DShroudLevel level, SurfaceClass* pDestSu
 	if (level < TheGlobalData->m_shroudAlpha)
 		level = TheGlobalData->m_shroudAlpha;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	//convert value to pixel format
 	if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 	{
@@ -479,7 +477,7 @@ void W3DShroud::fillBorderShroudData(W3DShroudLevel level, SurfaceClass* pDestSu
 		dstPoint.x=0;
 
 		for (x=0; x<numFullCopies; x++)
-		{	
+		{
 			dstPoint.x = x * srcRect.right;	//advance to next set of pixel in row.
 
 			DX8Wrapper::_Copy_DX8_Rects(
@@ -502,7 +500,7 @@ void W3DShroud::fillBorderShroudData(W3DShroudLevel level, SurfaceClass* pDestSu
 			srcRect.right = oldVal;
 		}
 	}
-	
+
 }
 
 /**Set the shroud color within the border area of the map*/
@@ -531,9 +529,9 @@ void W3DShroud::render(CameraClass *cam)
 	if (DX8Wrapper::_Get_D3D_Device8() && (DX8Wrapper::_Get_D3D_Device8()->TestCooperativeLevel()) != D3D_OK)
 		return;	//device not ready to render anything
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	if (TheGlobalData && TheGlobalData->m_fogOfWarOn != m_drawFogOfWar)
-	{	
+	{
 		//fog state has changed since last time shroud system was initialized
 		reset();
 		ReleaseResources();
@@ -547,10 +545,10 @@ void W3DShroud::render(CameraClass *cam)
 	DEBUG_ASSERTCRASH( m_pSrcTexture != NULL, ("Updating unallocated shroud texture"));
 
 #ifdef LOAD_DUMMY_SHROUD
-	
+
 	static doInit=1;
 	if (doInit)
-	{	
+	{
 		//some temporary code here to debug the shroud.
 
 		///@todo: remove this debug buffer fill.
@@ -591,7 +589,7 @@ void W3DShroud::render(CameraClass *cam)
 		{
 			for (Int x=0; x<desc.Width; x++)
 			{
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 				if (TheGlobalData && TheGlobalData->m_fogOfWarOn)
 				{
 					dataDest[x]=((TheGlobalData->m_shroudColor.getAsInt()>>4)&0xf) | (((TheGlobalData->m_shroudColor.getAsInt()>>12)&0xf)<<4) | (((TheGlobalData->m_shroudColor.getAsInt()>>20)&0xf)<<8) | ((((255-(dataSrc[x] & 0xff))>>4)&0xf)<<12);
@@ -633,13 +631,13 @@ void W3DShroud::render(CameraClass *cam)
 
 	Int visEndX=visStartX+REAL_TO_INT_FLOOR((Real)(hm->getDrawWidth()-1)*MAP_XY_FACTOR/m_cellWidth)+1;	//size of rendered heightmap rectangle
 	Int visEndY=visStartY+REAL_TO_INT_FLOOR((Real)(hm->getDrawHeight()-1)*MAP_XY_FACTOR/m_cellHeight)+1;
-	
+
 	// Do it all [3/11/2003]
 	visEndX = m_numCellsX;
 	visEndY = m_numCellsY;
 
 	if (visEndX > m_numCellsX)
-	{	
+	{
 		visStartX -= visEndX - m_numCellsX;	//shift visible rectangle to fall within terrain bounds
 		if (visStartX < 0)
 			visStartX = 0;
@@ -647,7 +645,7 @@ void W3DShroud::render(CameraClass *cam)
 	}
 
 	if (visEndY > m_numCellsY)
-	{	
+	{
 		visStartY -= visEndY - m_numCellsY;	//shift visible rectangle to fall within terrain bounds
 		if (visStartY < 0)
 			visStartY = 0;
@@ -665,7 +663,7 @@ void W3DShroud::render(CameraClass *cam)
 	pitch >>= 1;	//we have 2 bytes per pixel, so divide pitch by 2
 
 	Byte *sd=shroudData+visStartY*MAX_MAP_SHROUDSIZE;	//pointer to first shroud row
-	
+
 	for (Int y=visStartY; y<(visStartY+visSizeY); y++)
 	{
 		for (Int x=visStartX; x<(visStartX+visSizeX); x++)
@@ -692,7 +690,7 @@ void W3DShroud::render(CameraClass *cam)
 
 	RECT	srcRect;
 	POINT	dstPoint={1,1};	//first row/column is reserved for border.
-	
+
 	srcRect.left=visStartX;
 	srcRect.top=visStartY;
 	srcRect.right=visEndX;
@@ -707,7 +705,7 @@ void W3DShroud::render(CameraClass *cam)
 	{	//we need to clear unused parts of the destination texture to a known
 		//color in order to keep map border in the state we want.
 		m_clearDstTexture=FALSE;
-		
+
 		fillBorderShroudData(m_boderShroudLevel, pDestSurface);
 	}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp
index 4bb04cd7693..11e6747038b 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DStatusCircle.cpp
@@ -24,9 +24,7 @@
 
 #include "W3DDevice/GameClient/W3DStatusCircle.h"
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include <tri.h>
@@ -65,7 +63,7 @@
 	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
 
 #define VERTEX_BUFFER_TILE_LENGTH	32		//tiles of side length 32 (grid of 33x33 vertices).
-#define VERTS_IN_BLOCK_ROW			(VERTEX_BUFFER_TILE_LENGTH+1)	
+#define VERTS_IN_BLOCK_ROW			(VERTEX_BUFFER_TILE_LENGTH+1)
 
 
 static ShaderClass detailOpaqueShader(SC_ALPHA);
@@ -89,7 +87,7 @@ W3DStatusCircle::W3DStatusCircle(void)
 bool W3DStatusCircle::Cast_Ray(RayCollisionTestClass & raytest)
 {
 
-	return false;	
+	return false;
 
 }
 
@@ -110,7 +108,7 @@ void W3DStatusCircle::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
 {
 	Vector3	ObjSpaceCenter((float)1000*0.5f,(float)1000*0.5f,(float)0);
 	float length = ObjSpaceCenter.Length();
-	
+
 	sphere.Init(ObjSpaceCenter, length);
 }
 
@@ -146,7 +144,7 @@ Int W3DStatusCircle::freeMapResources(void)
 //Allocate a heightmap of x by y vertices.
 //data must be an array matching this size.
 Int W3DStatusCircle::initData(void)
-{	
+{
 	Int i;
 
 	m_needUpdate = true;
@@ -158,7 +156,7 @@ Int W3DStatusCircle::initData(void)
 	// Fill up the IB
 	DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
 	UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-		
+
 	for (i=0; i<3*m_numTriangles; i+=3)
 	{
 		ib[0]=i;
@@ -174,7 +172,7 @@ Int W3DStatusCircle::initData(void)
 	//go with a preset material for now.
 	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 
-	m_shaderClass = ShaderClass::ShaderClass(SC_ALPHA);// _PresetOpaque2DShader;//; //_PresetOpaqueShader;
+	m_shaderClass = ShaderClass(SC_ALPHA);// _PresetOpaque2DShader;//; //_PresetOpaqueShader;
 
 
 	return 0;
@@ -193,17 +191,17 @@ Int W3DStatusCircle::updateCircleVB(void)
 		m_needUpdate = false;
 		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
 		VertexFormatXYZDUV1 *vb = (VertexFormatXYZDUV1*)lockVtxBuffer.Get_Vertex_Array();
-		
+
 		const Real theZ = 0.0f;
 		const Real theRadius = 0.02f;
 		const Int theAlpha = 127;
-	  Int diffuse = m_diffuse + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.		 
+	  Int diffuse = m_diffuse + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.
 		Int limit = m_numTriangles;
 		float curAngle = 0;
 		float deltaAngle = 2*PI/limit;
 		for (i=0; i<limit; i++)
 		{
-			
+
 			shade=0.7f*255.0f;
 			for (k=0; k<3; k++) {
 				vb->z=  theZ;
@@ -219,19 +217,19 @@ Int W3DStatusCircle::updateCircleVB(void)
 					Real angle = curAngle+deltaAngle;
 					if (i==limit-1) {
 						angle = 0;
-					} 
+					}
 					Vector3 vec(theRadius,0,theZ);
 					vec.Rotate_Z(angle);
 					vb->x=	vec.X;
 					vb->y=	vec.Y;
 				}
-				vb->diffuse = diffuse; 
+				vb->diffuse = diffuse;
 				vb->u1=0;
 				vb->v1=0;
 				vb++;
 			}
 			curAngle += deltaAngle;
-			
+
 		}
 		return 0; //success.
 	}
@@ -248,60 +246,60 @@ Int W3DStatusCircle::updateScreenVB(Int diffuse)
 		m_needUpdate = false;
 		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB);
 		VertexFormatXYZDUV1 *vb = (VertexFormatXYZDUV1*)lockVtxBuffer.Get_Vertex_Array();
-							
+
 		vb->x =	-1;
 		vb->y =	-1;
 		vb->z = 0;
-		vb->diffuse = diffuse; 
+		vb->diffuse = diffuse;
 		vb->u1=0;
 		vb->v1=0;
-		vb++;	
+		vb++;
 
 		vb->x =	1;
 		vb->y =	1;
 		vb->z = 0;
-		vb->diffuse = diffuse; 
+		vb->diffuse = diffuse;
 		vb->u1=0;
 		vb->v1=0;
-		vb++;	
+		vb++;
 
 		vb->x =	-1;
 		vb->y =	1;
 		vb->z = 0;
-		vb->diffuse = diffuse; 
+		vb->diffuse = diffuse;
 		vb->u1=0;
 		vb->v1=0;
-		vb++;	
+		vb++;
 
 		vb->x =	-1;
 		vb->y =	-1;
 		vb->z = 0;
-		vb->diffuse = diffuse; 
+		vb->diffuse = diffuse;
 		vb->u1=0;
 		vb->v1=0;
-		vb++;	
+		vb++;
 
 		vb->x =	1;
 		vb->y =	-1;
 		vb->z = 0;
-		vb->diffuse = diffuse; 
+		vb->diffuse = diffuse;
 		vb->u1=0;
 		vb->v1=0;
-		vb++;	
+		vb++;
 
 		vb->x =	1;
 		vb->y =	1;
 		vb->z = 0;
-		vb->diffuse = diffuse; 
+		vb->diffuse = diffuse;
 		vb->u1=0;
 		vb->v1=0;
-		vb++;	
+		vb++;
 		return 0; //success.
 	}
 	return -1;
 }
 
-void W3DStatusCircle::Render(RenderInfoClass & rinfo)	 
+void W3DStatusCircle::Render(RenderInfoClass & rinfo)
 {
 	if (!TheGameLogic->isInGame() || TheGameLogic->getGameMode() == GAME_SHELL)
 		return;
@@ -351,7 +349,7 @@ void W3DStatusCircle::Render(RenderInfoClass & rinfo)
 	tm.Make_Identity();
 	Real intensity = TheScriptEngine->getFadeValue();
 	Int clr = 255*intensity;
-	Int diffuse = (0xff<<24)|(clr<<16)|(clr<<8)|clr;	 // b g<<8 r<<16 a<<24.		 
+	Int diffuse = (0xff<<24)|(clr<<16)|(clr<<8)|clr;	 // b g<<8 r<<16 a<<24.
 	updateScreenVB(diffuse);
 	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
 	DX8Wrapper::Set_Shader(ShaderClass(SC_ADD));
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
deleted file mode 100644
index 83f44e0b601..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
+++ /dev/null
@@ -1,979 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DTerrainTracks.cpp ////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: W3DTerrainTracks.cpp
-//
-// Created:   Mark Wilczynski, May 2001
-//
-// Desc:      Draw track marks on the terrain.  Uses a sequence of connected
-//			  quads that are oriented to fit the terrain and updated when object
-//			  moves.
-//-----------------------------------------------------------------------------
-
-#include "W3DDevice/GameClient/W3DTerrainTracks.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "Common/PerfTimer.h"
-#include "Common/GlobalData.h"
-#include "Common/Debug.h"
-#include "texture.h"
-#include "colmath.h"
-#include "coltest.h"
-#include "rinfo.h"
-#include "camera.h"
-#include "assetmgr.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/scene.h"
-#include "GameLogic/TerrainLogic.h"
-#include "GameLogic/Object.h"
-#include "GameClient/Drawable.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#define BRIDGE_OFFSET_FACTOR	0.25f	//amount to raise tracks above bridges.
-//=============================================================================
-// TerrainTracksRenderObjClass::~TerrainTracksRenderObjClass
-//=============================================================================
-/** Destructor. Releases w3d assets. */
-//=============================================================================
-TerrainTracksRenderObjClass::~TerrainTracksRenderObjClass(void)
-{
-	freeTerrainTracksResources();
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::TerrainTracksRenderObjClass
-//=============================================================================
-/** Constructor. Just nulls out some variables. */
-//=============================================================================
-TerrainTracksRenderObjClass::TerrainTracksRenderObjClass(void)
-{
-	m_stageZeroTexture=NULL;
-	m_lastAnchor=Vector3(0,1,2.25);
-	m_haveAnchor=false;
-	m_haveCap=true;
-	m_topIndex=0;
-	m_bottomIndex=0;
-	m_activeEdgeCount=0;
-	m_totalEdgesAdded=0;
-	m_bound=false;
-	m_ownerDrawable = NULL;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::Get_Obj_Space_Bounding_Sphere
-//=============================================================================
-/** WW3D method that returns object bounding sphere used in frustum culling*/
-//=============================================================================
-void TerrainTracksRenderObjClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
-{	/// @todo: Add code to cull track marks to screen by constantly updating bounding volumes
-	sphere=m_boundingSphere;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::Get_Obj_Space_Bounding_Box
-//=============================================================================
-/** WW3D method that returns object bounding box used in collision detection*/
-//=============================================================================
-void TerrainTracksRenderObjClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
-{
-	box=m_boundingBox;
-}
-
-//=============================================================================
-// MirrorRenderObjClass::Class_ID
-//=============================================================================
-/** returns the class id, so the scene can tell what kind of render object it has. */
-//=============================================================================
-Int TerrainTracksRenderObjClass::Class_ID(void) const
-{
-	return RenderObjClass::CLASSID_IMAGE3D;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::Clone
-//=============================================================================
-/** Not used, but required virtual method. */
-//=============================================================================
-RenderObjClass *	 TerrainTracksRenderObjClass::Clone(void) const
-{
-	assert(false);
-	return NULL;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::freeTerrainTracksResources
-//=============================================================================
-/** Free any W3D resources associated with this object */
-//=============================================================================
-Int TerrainTracksRenderObjClass::freeTerrainTracksResources(void)
-{
-	REF_PTR_RELEASE(m_stageZeroTexture);
-	m_haveAnchor=false;
-	m_haveCap=true;
-	m_topIndex=0;
-	m_bottomIndex=0;
-	m_activeEdgeCount=0;
-	m_totalEdgesAdded=0;
-	m_ownerDrawable = NULL;
-
-	return 0;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::init
-//=============================================================================
-/** Setup size settings and allocate W3D texture */
-//=============================================================================
-void TerrainTracksRenderObjClass::init( Real width, Real length, const Char *texturename)
-{	
-	freeTerrainTracksResources();	//free old data and ib/vb
-
-	m_boundingSphere.Init(Vector3(0,0,0),400*MAP_XY_FACTOR);
-	m_boundingBox.Center.Set(0.0f, 0.0f, 0.0f);
-	m_boundingBox.Extent.Set(400.0f*MAP_XY_FACTOR, 400.0f*MAP_XY_FACTOR, 1.0f);
-	m_width=width;
-	m_length=length;
-	//no sense culling these things since they have very irregular shape and fade
-	//out over time.
-	Set_Force_Visible(TRUE);
-	m_stageZeroTexture=WW3DAssetManager::Get_Instance()->Get_Texture(texturename);
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::addCapEdgeToTrack
-//=============================================================================
-/** Cap the current track (adding an feathered edge) so we're ready to resume
-		the track at a new location.  Used by objects entering FOW where we need to
-		stop adding edges to the track when they enter the fog boundary but resume
-		elsewhere if they become visible again.
-*/
-//=============================================================================
-void TerrainTracksRenderObjClass::addCapEdgeToTrack(Real x, Real y)
-{
-	/// @todo: Have object pass its height and orientation so we can remove extra calls.
-
-	if (m_haveCap)
-	{	//we already have a cap or there are no segments to cap
-		return;
-	}
-
-	if (m_activeEdgeCount == 1)
-	{	//if we only have one edge, then it must be the current anchor edge.
-		//since achnors are caps, there is not point in adding another.
-		m_haveCap=TRUE;
-		m_haveAnchor=false;	//recreate a new anchor when track resumes.
-		return;
-	}
-
-	Vector3	vPos,vZ;
-	Coord3D vZTmp;
-	PathfindLayerEnum objectLayer;
-	Real eHeight;
-
-	if (m_ownerDrawable && (objectLayer=m_ownerDrawable->getObject()->getLayer()) != LAYER_GROUND) 
-		eHeight=BRIDGE_OFFSET_FACTOR+TheTerrainLogic->getLayerHeight(x,y,objectLayer,&vZTmp);
-	else
-		eHeight=TheTerrainLogic->getGroundHeight(x,y,&vZTmp);
-
-	vZ.X = vZTmp.x;
-	vZ.Y = vZTmp.y;
-	vZ.Z = vZTmp.z;
-
-	vPos.X=x;
-	vPos.Y=y;
-	vPos.Z=eHeight;
-
-	Vector3	vDir=Vector3(x,y,eHeight)-m_lastAnchor;
-	Int maxEdgeCount=TheTerrainTracksRenderObjClassSystem->m_maxTankTrackEdges;
-
-	//avoid sqrt() by checking distance squared since last track mark
-	if (vDir.Length2() < sqr(m_length))
-	{	//not far enough from anchor to add track
-		//since this is a  cap, we'll force the previous segment to transparent
-		Int lastAddedEdge=m_topIndex-1;
-		if (lastAddedEdge < 0)
-			lastAddedEdge = maxEdgeCount-1;
-		m_edges[lastAddedEdge].alpha=0.0f;	//force the last added edge to transparent.
-		m_haveCap=TRUE;
-		m_haveAnchor=false;	//recreate a new anchor when track resumes.
-		return;
-	}
-
-	if (m_activeEdgeCount >= maxEdgeCount)
-	{	//no more room in buffer so release oldest edge
-		m_bottomIndex++;
-		m_activeEdgeCount--;
-
-		if (m_bottomIndex >= maxEdgeCount)
-			m_bottomIndex=0;	//roll buffer back to start
-	}
-
-	if (m_topIndex >= maxEdgeCount)
-		m_topIndex=0;	//roll around buffer
-
-	//we traveled far enough from last point.
-	//accept new point
-	vDir.Z=0;	//ignore height
-	vDir.Normalize();
-
-	Vector3	vX;
-
-	Vector3::Cross_Product(vDir,vZ,&vX);
-
-	//calculate left end point
-	edgeInfo& topEdge = m_edges[m_topIndex];
-
-	topEdge.endPointPos[0]=vPos-(m_width*0.5f*vX);	///@todo: try getting height at endpoint
-	topEdge.endPointPos[0].Z += 0.2f * MAP_XY_FACTOR;	//raise above terrain slightly
-
-	if (m_totalEdgesAdded&1)	//every other edge has different set of UV's
-	{	
-		topEdge.endPointUV[0].X=0.0f;
-		topEdge.endPointUV[0].Y=0.0f;
-	}
-	else
-	{	
-		topEdge.endPointUV[0].X=0.0f;
-		topEdge.endPointUV[0].Y=1.0f;
-	}
-
-	//calculate right end point
-	topEdge.endPointPos[1]=vPos+(m_width*0.5f*vX);	///@todo: try getting height at endpoint
-	topEdge.endPointPos[1].Z += 0.2f * MAP_XY_FACTOR;	//raise above terrain slightly
-
-	if (m_totalEdgesAdded&1)	//every other edge has different set of UV's
-	{	
-		topEdge.endPointUV[1].X=1.0f;
-		topEdge.endPointUV[1].Y=0.0f;
-	}
-	else
-	{	
-		topEdge.endPointUV[1].X=1.0f;
-		topEdge.endPointUV[1].Y=1.0f;
-	}
-
-	topEdge.timeAdded=WW3D::Get_Sync_Time();
-	topEdge.alpha=0.0f;	//fully transparent at cap.	
-	m_lastAnchor=vPos;
-	m_activeEdgeCount++;
-	m_totalEdgesAdded++;
-	m_topIndex++;	//make space for new edge
-	m_haveCap=TRUE;
-	m_haveAnchor=false;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::addEdgeToTrack
-//=============================================================================
-/** Try to add an additional segment to track mark.  Will do nothing if distance
-* from last edge is too small.  Will overwrite the oldest edge if maximum track
-* length is reached.  Oldest edges should by faded out by that time.
-*/
-//=============================================================================
-void TerrainTracksRenderObjClass::addEdgeToTrack(Real x, Real y)
-{
-	/// @todo: Have object pass its height and orientation so we can remove extra calls.
-
-	if (!m_haveAnchor)
-	{	//no anchor yet, make this point an anchor.
-		PathfindLayerEnum objectLayer;
-		if (m_ownerDrawable && (objectLayer=m_ownerDrawable->getObject()->getLayer()) != LAYER_GROUND) 
-			m_lastAnchor=Vector3(x,y,TheTerrainLogic->getLayerHeight(x,y,objectLayer)+BRIDGE_OFFSET_FACTOR);
-		else
-			m_lastAnchor=Vector3(x,y,TheTerrainLogic->getGroundHeight(x,y));
-
-		m_haveAnchor=true;
-		m_airborne = true;
-		m_haveCap = true;	//single segment tracks are always capped because nothing is drawn.
-		return;
-	}
-
-	m_haveCap = false;	//have more than 1 segment now so will need to cap if it's interrupted.
-
-	Vector3	vPos,vZ;
-	Coord3D vZTmp;
-	Real eHeight;
-	PathfindLayerEnum objectLayer;
-
-	if (m_ownerDrawable && (objectLayer=m_ownerDrawable->getObject()->getLayer()) != LAYER_GROUND) 
-		eHeight=BRIDGE_OFFSET_FACTOR+TheTerrainLogic->getLayerHeight(x,y,objectLayer,&vZTmp);
-	else
-		eHeight=TheTerrainLogic->getGroundHeight(x,y,&vZTmp);
-
-	vZ.X = vZTmp.x;
-	vZ.Y = vZTmp.y;
-	vZ.Z = vZTmp.z;
-
-	vPos.X=x;
-	vPos.Y=y;
-	vPos.Z=eHeight;
-
-	Vector3	vDir=Vector3(x,y,eHeight)-m_lastAnchor;
-
-	//avoid sqrt() by checking distance squared since last track mark
-	if (vDir.Length2() < sqr(m_length))
-		return;	//not far enough from anchor to add track
-
-	Int maxEdgeCount=TheTerrainTracksRenderObjClassSystem->m_maxTankTrackEdges;
-
-	if (m_activeEdgeCount >= maxEdgeCount)
-	{	//no more room in buffer so release oldest edge
-		m_bottomIndex++;
-		m_activeEdgeCount--;
-
-		if (m_bottomIndex >= maxEdgeCount)
-			m_bottomIndex=0;	//roll buffer back to start
-	}
-
-	if (m_topIndex >= maxEdgeCount)
-		m_topIndex=0;	//roll around buffer
-
-	//we traveled far enough from last point.
-	//accept new point
-	vDir.Z=0;	//ignore height
-	vDir.Normalize();
-
-	Vector3	vX;
-
-	Vector3::Cross_Product(vDir,vZ,&vX);
-
-	edgeInfo& topEdge = m_edges[m_topIndex];
-
-	//calculate left end point
-	topEdge.endPointPos[0]=vPos-(m_width*0.5f*vX);	///@todo: try getting height at endpoint
-	topEdge.endPointPos[0].Z += 0.2f * MAP_XY_FACTOR;	//raise above terrain slightly
-
-	if (m_totalEdgesAdded&1)	//every other edge has different set of UV's
-	{	
-		topEdge.endPointUV[0].X=0.0f;
-		topEdge.endPointUV[0].Y=0.0f;
-	}
-	else
-	{	
-		topEdge.endPointUV[0].X=0.0f;
-		topEdge.endPointUV[0].Y=1.0f;
-	}
-
-	//calculate right end point
-	topEdge.endPointPos[1]=vPos+(m_width*0.5f*vX);	///@todo: try getting height at endpoint
-	topEdge.endPointPos[1].Z += 0.2f * MAP_XY_FACTOR;	//raise above terrain slightly
-
-	if (m_totalEdgesAdded&1)	//every other edge has different set of UV's
-	{	
-		topEdge.endPointUV[1].X=1.0f;
-		topEdge.endPointUV[1].Y=0.0f;
-	}
-	else
-	{	
-		topEdge.endPointUV[1].X=1.0f;
-		topEdge.endPointUV[1].Y=1.0f;
-	}
-
-	topEdge.timeAdded=WW3D::Get_Sync_Time();
-	topEdge.alpha=1.0f;	//fully opaque at start.	
-	if (m_airborne || m_activeEdgeCount <= 1) {
-		topEdge.alpha=0.0f;	//smooth out track restarts by setting transparent
-	}
-	m_airborne = false;
-
-	m_lastAnchor=vPos;
-	m_activeEdgeCount++;
-	m_totalEdgesAdded++;
-	m_topIndex++;	//make space for new edge
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClass::Render
-//=============================================================================
-/** Does nothing.  Just increments a counter of how many track edges were
-*  requested for rendering this frame.  Actual rendering is done in flush().
-*/
-//=============================================================================
-void TerrainTracksRenderObjClass::Render(RenderInfoClass & rinfo)
-{	///@todo: After adding track mark visibility tests, add visible marks to another list.
-	if (TheGlobalData->m_makeTrackMarks && m_activeEdgeCount >= 2)
-		TheTerrainTracksRenderObjClassSystem->m_edgesToFlush += m_activeEdgeCount;
-}
-
-#define DEFAULT_TRACK_SPACING  (MAP_XY_FACTOR  * 1.4f)
-#define DEFAULT_TRACK_WIDTH	4.0f;
-
-/**Find distance between the "trackfx" bones of the model.  This tells us the correct
-   width for the trackmarks.
-*/
-static Real computeTrackSpacing(RenderObjClass *renderObj)
-{
-	Real trackSpacing = DEFAULT_TRACK_SPACING;
-	Int leftTrack;
-	Int rightTrack;
-
-	if ((leftTrack=renderObj->Get_Bone_Index( "TREADFX01" )) != 0 && (rightTrack=renderObj->Get_Bone_Index( "TREADFX02" )) != 0)
-	{	//both bones found, determine distance between them.
-		Vector3 leftPos,rightPos;
-		leftPos=renderObj->Get_Bone_Transform( leftTrack ).Get_Translation();
-		rightPos=renderObj->Get_Bone_Transform( rightTrack ).Get_Translation();
-		rightPos -= leftPos;	//get distance between centers of tracks
-		trackSpacing = rightPos.Length() + DEFAULT_TRACK_WIDTH;	//add width of each track
-		///@todo: It's assumed that all tank treads have the same width.
-	};
-
-	return trackSpacing;
-}
-
-//=============================================================================
-//TerrainTracksRenderObjClassSystem::bindTrack
-//=============================================================================
-/** Grab a track from the free store. If no free tracks exist, return NULL.
-	As long as a track is bound to an object (like a tank) it is ready to accept
-	updates with additional edges.  Once it is unbound, it will expire and return
-	to the free store once all tracks have faded out.
-
-	Input: width in world units of each track edge (should probably width of vehicle).
-		   length in world units between edges.  Shorter lengths produce more edges and
-		   smoother curves.
-		   texture to use for the tracks - image should be symetrical and include alpha channel.
-*/
-//=============================================================================
-TerrainTracksRenderObjClass *TerrainTracksRenderObjClassSystem::bindTrack( RenderObjClass *renderObject, Real length, const Char *texturename)
-{
-	TerrainTracksRenderObjClass *mod;
-
-	mod = m_freeModules;
-	if( mod )
-	{
-		// take module off the free list
-		if( mod->m_nextSystem )
-			mod->m_nextSystem->m_prevSystem = mod->m_prevSystem;
-		if( mod->m_prevSystem )
-			mod->m_prevSystem->m_nextSystem = mod->m_nextSystem;
-		else
-			m_freeModules = mod->m_nextSystem;
-
-		// put module on the used list
-		mod->m_prevSystem = NULL;
-		mod->m_nextSystem = m_usedModules;
-		if( m_usedModules )
-			m_usedModules->m_prevSystem = mod;
-		m_usedModules = mod;
-
-		mod->init(computeTrackSpacing(renderObject),length,texturename);
-		mod->m_bound=true;
-		m_TerrainTracksScene->Add_Render_Object( mod);
-	}  // end if
-
-	return mod;
-
-}  //end bindTrack
-
-//=============================================================================
-//TerrainTracksRenderObjClassSystem::unbindTrack
-//=============================================================================
-/** Called when an object (i.e Tank) will not lay down any more tracks and
-doesn't need this object anymore.  The track-laying object will be returned
-to pool of available tracks as soon as any remaining track edges have faded out.
-*/
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::unbindTrack( TerrainTracksRenderObjClass *mod )
-{
-	//this object should return to free store as soon as there is nothing
-	//left to render.
-	mod->m_bound=false;
-	mod->m_ownerDrawable = NULL;
-}
-
-//=============================================================================
-//TerrainTracksRenderObjClassSystem::releaseTrack
-//=============================================================================
-/** Returns a track laying object to free store to be used again later.
-*/
-void TerrainTracksRenderObjClassSystem::releaseTrack( TerrainTracksRenderObjClass *mod )
-{
-	if (mod==NULL)
-		return;
-	
-	DEBUG_ASSERTCRASH(mod->m_bound == false, ("mod is bound."));
-
-	// remove module from used list
-	if( mod->m_nextSystem )
-		mod->m_nextSystem->m_prevSystem = mod->m_prevSystem;
-	if( mod->m_prevSystem )
-		mod->m_prevSystem->m_nextSystem = mod->m_nextSystem;
-	else
-		m_usedModules = mod->m_nextSystem;
-
-	// add module to free list
-	mod->m_prevSystem = NULL;
-	mod->m_nextSystem = m_freeModules;
-	if( m_freeModules )
-		m_freeModules->m_prevSystem = mod;
-	m_freeModules = mod;
-	mod->freeTerrainTracksResources();
-	m_TerrainTracksScene->Remove_Render_Object(mod);
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::TerrainTracksRenderObjClassSystem
-//=============================================================================
-/** Constructor. Just nulls out some variables. */
-//=============================================================================
-TerrainTracksRenderObjClassSystem::TerrainTracksRenderObjClassSystem()
-{
-	m_usedModules = NULL;
-	m_freeModules = NULL;
-	m_TerrainTracksScene = NULL;
-	m_edgesToFlush = 0;
-	m_indexBuffer = NULL;
-	m_vertexMaterialClass = NULL;
-	m_vertexBuffer = NULL;
-
-	m_maxTankTrackEdges=TheGlobalData->m_maxTankTrackEdges;
-	m_maxTankTrackOpaqueEdges=TheGlobalData->m_maxTankTrackOpaqueEdges;
-	m_maxTankTrackFadeDelay=TheGlobalData->m_maxTankTrackFadeDelay;
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::~TerrainTracksRenderObjClassSystem
-//=============================================================================
-/** Destructor.  Free all pre-allocated track laying render objects*/
-//=============================================================================
-TerrainTracksRenderObjClassSystem::~TerrainTracksRenderObjClassSystem( void )
-{
-
-	// free all data
-	shutdown();
-
-	m_vertexMaterialClass=NULL;
-	m_TerrainTracksScene=NULL;
-
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::ReAcquireResources
-//=============================================================================
-/** (Re)allocates all W3D assets after a reset.. */
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::ReAcquireResources(void)
-{
-	Int i;
-	const Int numModules=TheGlobalData->m_maxTerrainTracks;
-
-	// just for paranoia's sake.
-	REF_PTR_RELEASE(m_indexBuffer);
-	REF_PTR_RELEASE(m_vertexBuffer);
-
-	//Create static index buffers.  These will index the vertex buffers holding the track segments
-	m_indexBuffer=NEW_REF(DX8IndexBufferClass,((m_maxTankTrackEdges-1)*6));
-
-	// Fill up the IB
-	{
-		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
-		UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-
-		for (i=0; i<(m_maxTankTrackEdges-1); i++)
-		{
-			ib[3]=ib[0]=i*2;
-			ib[1]=i*2+1;
-			ib[4]=ib[2]=(i+1)*2+1;
-			ib[5]=(i+1)*2;
-			ib+=6;	//skip the 6 indices we just filled
-		}
-	}
-
-	DEBUG_ASSERTCRASH(numModules*m_maxTankTrackEdges*2 < 65535, ("Too many terrain track edges"));
-
-	m_vertexBuffer=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZDUV1,numModules*m_maxTankTrackEdges*2,DX8VertexBufferClass::USAGE_DYNAMIC));
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::ReleaseResources
-//=============================================================================
-/** (Re)allocates all W3D assets after a reset.. */
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::ReleaseResources(void)
-{
-	REF_PTR_RELEASE(m_indexBuffer);
-	REF_PTR_RELEASE(m_vertexBuffer);
-	// Note - it is ok to not release the material, as it is a w3d object that
-	// has no dx8 resources. jba.
-}
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::init
-//=============================================================================
-/**  initialize the system, allocate all the render objects we will need */
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::init( SceneClass *TerrainTracksScene )
-{
-	const Int numModules=TheGlobalData->m_maxTerrainTracks;
-
-	Int i;
-	TerrainTracksRenderObjClass *mod;
-
-	m_TerrainTracksScene=TerrainTracksScene;
-
-	ReAcquireResources();
-	//go with a preset material for now.
-	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-
-	//use a multi-texture shader: (text1*diffuse)*text2.
-	m_shaderClass = ShaderClass::_PresetAlphaShader;//_PresetATestSpriteShader;//_PresetOpaqueShader;
-
-	// we cannot initialize a system that is already initialized
-	if( m_freeModules || m_usedModules )
-	{
-
-		// system already online!
-		assert( 0 );
-		return;
-
-	}  // end if
-
-	// allocate our modules for this system
-	for( i = 0; i < numModules; i++ )
-	{
-
-		mod = NEW_REF( TerrainTracksRenderObjClass, () );
-
-		if( mod == NULL )
-		{
-
-			// unable to allocate modules needed
-			assert( 0 );
-			return;
-
-		}  // end if
-
-		mod->m_prevSystem = NULL;
-		mod->m_nextSystem = m_freeModules;
-		if( m_freeModules )
-			m_freeModules->m_prevSystem = mod;
-		m_freeModules = mod;
-
-	}  // end for i
-
-}  // end init
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::shutdown
-//=============================================================================
-/** Shutdown and free all memory for this system */
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::shutdown( void )
-{
-	TerrainTracksRenderObjClass *nextMod,*mod;
-
-	//release unbound tracks that may still be fading out
-	mod=m_usedModules;
-
-	while(mod)
-	{
-		nextMod=mod->m_nextSystem;
-
-		if (!mod->m_bound)
-			releaseTrack(mod);
-
-		mod = nextMod;
-	}  // end while
-
-
-	// free all attached things and used modules
-	assert( m_usedModules == NULL );
-
-	// free all module storage
-	while( m_freeModules )
-	{
-
-		nextMod = m_freeModules->m_nextSystem;
-		REF_PTR_RELEASE (m_freeModules);
-		m_freeModules = nextMod;
-
-	}  // end while
-
-	REF_PTR_RELEASE(m_indexBuffer);
-	REF_PTR_RELEASE(m_vertexMaterialClass);
-	REF_PTR_RELEASE(m_vertexBuffer);
-
-}  // end shutdown
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::update
-//=============================================================================
-/** Update the state of all active track marks - fade, expire, etc. */
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::update()
-{
-
-	Int		iTime=WW3D::Get_Sync_Time();
-	Real	iDiff;
-	TerrainTracksRenderObjClass *mod=m_usedModules,*nextMod;
-
-	//first update all the tracks
-	while( mod )
-	{
-		Int i,index;
-		Vector3 *endPoint;
-		Vector2 *endPointUV;
-
-		nextMod = mod->m_nextSystem;
-
-		if (!TheGlobalData->m_makeTrackMarks)
-			mod->m_haveAnchor=false;	//force a track restart next time around.
-
-		for (i=0,index=mod->m_bottomIndex; i<mod->m_activeEdgeCount; i++,index++)
-		{
-			if (index >= m_maxTankTrackEdges)
-				index=0;
-
-			endPoint=&mod->m_edges[index].endPointPos[0];	//left endpoint
-			endPointUV=&mod->m_edges[index].endPointUV[0];
-			iDiff=(float)(iTime-mod->m_edges[index].timeAdded);
-			iDiff = 1.0f - iDiff/(Real)m_maxTankTrackFadeDelay;
-			if (iDiff < 0.0)
-				iDiff=0.0f;
-			if (mod->m_edges[index].alpha>0.0f) {
-				mod->m_edges[index].alpha=iDiff;
-			}
-
-			if (iDiff == 0.0f)
-			{	//this edge was invisible, we can remove it
-				mod->m_bottomIndex++;
-				mod->m_activeEdgeCount--;
-
-				if (mod->m_bottomIndex >= m_maxTankTrackEdges)
-					mod->m_bottomIndex=0;	//roll buffer back to start
-			}
-			if (mod->m_activeEdgeCount == 0 && !mod->m_bound)
-				releaseTrack(mod);
-		}
-		mod = nextMod;
-	}  // end while
-}
-
-
-//=============================================================================
-// TerrainTracksRenderObjClassSystem::flush
-//=============================================================================
-/** Draw all active track marks for this frame */
-//=============================================================================
-void TerrainTracksRenderObjClassSystem::flush()
-{
-/** @todo: Optimize system by drawing tracks as triangle strips and use dynamic vertex buffer access.
-May also try rendering all tracks with one call to W3D/D3D by grouping them by texture.
-Try improving the fit to vertical surfaces like cliffs.
-*/
-
-	Int	diffuseLight;
-	TerrainTracksRenderObjClass *mod=m_usedModules;
-	if (!mod)
-		return;	//nothing to render
-
-	Int	trackStartIndex;
-	Real distanceFade;
-
-	if (ShaderClass::Is_Backface_Culling_Inverted())
-		return;	//don't render track marks in reflections.
-
-	// adjust shading for time of day.
-	Real shadeR, shadeG, shadeB;
-	shadeR = TheGlobalData->m_terrainAmbient[0].red;
-	shadeG = TheGlobalData->m_terrainAmbient[0].green;
-	shadeB = TheGlobalData->m_terrainAmbient[0].blue;
-	shadeR += TheGlobalData->m_terrainDiffuse[0].red/2;
-	shadeG += TheGlobalData->m_terrainDiffuse[0].green/2;
-	shadeB += TheGlobalData->m_terrainDiffuse[0].blue/2;
-	shadeR*=255.0f;
-	shadeG*=255.0f;
-	shadeB*=255.0f;
-
-	diffuseLight = REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16);
-	Real numFadedEdges=m_maxTankTrackEdges-m_maxTankTrackOpaqueEdges;
-
-	//check if there is anything to draw and fill vertex buffer
-	if (m_edgesToFlush >= 2)
-	{
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexBuffer);
-		VertexFormatXYZDUV1 *verts = (VertexFormatXYZDUV1*)lockVtxBuffer.Get_Vertex_Array();
-		trackStartIndex=0;
-
-		mod=m_usedModules;
-		//Fill our vertex buffer with all the tracks
-		while( mod )
-		{
-			Int i,index;
-			Vector3 *endPoint;
-			Vector2 *endPointUV;
-
-			if (mod->m_activeEdgeCount >= 2 && mod->Is_Really_Visible())
-			{
-				for (i=0,index=mod->m_bottomIndex; i<mod->m_activeEdgeCount; i++,index++)
-				{
-					if (index >= m_maxTankTrackEdges)
-						index=0;
-
-					endPoint=&mod->m_edges[index].endPointPos[0];	//left endpoint
-					endPointUV=&mod->m_edges[index].endPointUV[0];
-		
-					distanceFade=1.0f;
-
-					if ((mod->m_activeEdgeCount -1 -i) >= m_maxTankTrackOpaqueEdges)// && i < (MAX_PER_TRACK_EDGE_COUNT-FORCE_FADE_AT_EDGE))
-					{	//we're getting close to the limit on the number of track pieces allowed
-						//so force it to fade out.
-						distanceFade=1.0f-(float)((mod->m_activeEdgeCount -i)-m_maxTankTrackOpaqueEdges)/numFadedEdges;
-					}
-
-					distanceFade *= mod->m_edges[index].alpha;	//adjust fade with distance from start of track
-
-					verts->x=endPoint->X;
-					verts->y=endPoint->Y;
-					verts->z=endPoint->Z;
-					
-					verts->u1=endPointUV->X;
-					verts->v1=endPointUV->Y;
-
-					//fade the alpha channel with distance
-					verts->diffuse=diffuseLight | ( REAL_TO_INT(distanceFade*255.0f) <<24);
-					verts++;
-
-					endPoint=&mod->m_edges[index].endPointPos[1];	//right endpoint
-					endPointUV=&mod->m_edges[index].endPointUV[1];
-
-					verts->x=endPoint->X;
-					verts->y=endPoint->Y;
-					verts->z=endPoint->Z;
-
-					verts->u1=endPointUV->X;
-					verts->v1=endPointUV->Y;			///@todo: Add diffuse lighting.
-
-					verts->diffuse=diffuseLight | ( REAL_TO_INT(distanceFade*255.0f) <<24);
-					verts++;
-				}//for
-			}// mod has edges to render
-			mod = mod->m_nextSystem;
-		}	//while (mod)
-	}//edges to flush
-
-	//draw the filled vertex buffers
-	if (m_edgesToFlush >= 2)
-	{
-		ShaderClass::Invalidate();
-		DX8Wrapper::Set_Material(m_vertexMaterialClass);
-		DX8Wrapper::Set_Shader(m_shaderClass);
-		DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
-		DX8Wrapper::Set_Vertex_Buffer(m_vertexBuffer);
-
-		trackStartIndex=0;
-		mod=m_usedModules;
-		Matrix3D tm(mod->Transform);
-		DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-		while (mod)
-		{
-			if (mod->m_activeEdgeCount >= 2 && mod->Is_Really_Visible())
-			{
-				DX8Wrapper::Set_Texture(0,mod->m_stageZeroTexture);
-				DX8Wrapper::Set_Index_Buffer_Index_Offset(trackStartIndex);
-				DX8Wrapper::Draw_Triangles(	0,(mod->m_activeEdgeCount-1)*2, 0, mod->m_activeEdgeCount*2);
-
-				trackStartIndex += mod->m_activeEdgeCount*2;
-			}
-			mod=mod->m_nextSystem;
-		}
-	}	//there are some edges to render in pool.
-
-	m_edgesToFlush=0;	//reset count for next flush
-}
-
-/**Removes all remaining tracks from the rendering system*/
-void TerrainTracksRenderObjClassSystem::Reset(void)
-{
-	TerrainTracksRenderObjClass *nextMod,*mod=m_usedModules;
-
-	while(mod)
-	{
-		nextMod=mod->m_nextSystem;
-
-		releaseTrack(mod);
-
-		mod = nextMod;
-	}  // end while
-
-
-	// free all attached things and used modules
-	assert( m_usedModules == NULL );
-	m_edgesToFlush=0;
-}
-
-/**Clear the treads from each track laying object without freeing the objects.
-Mostly used when user changed LOD level*/
-void TerrainTracksRenderObjClassSystem::clearTracks(void)
-{
-	TerrainTracksRenderObjClass *mod=m_usedModules;
-
-	while(mod)
-	{
-		mod->m_haveAnchor=false;
-		mod->m_haveCap=true;
-		mod->m_topIndex=0;
-		mod->m_bottomIndex=0;
-		mod->m_activeEdgeCount=0;
-		mod->m_totalEdgesAdded=0;
-
-		mod = mod->m_nextSystem;
-	}  // end while
-
-	m_edgesToFlush=0;
-}
-
-/**Adjust various paremeters which affect the cost of rendering tracks on the map.
-Parameters are passed via GlobalData*/
-void TerrainTracksRenderObjClassSystem::setDetail(void)
-{
-	//Remove all existing track segments from screen.
-	clearTracks();
-	ReleaseResources();
-
-	m_maxTankTrackEdges=TheGlobalData->m_maxTankTrackEdges;
-	m_maxTankTrackOpaqueEdges=TheGlobalData->m_maxTankTrackOpaqueEdges;
-	m_maxTankTrackFadeDelay=TheGlobalData->m_maxTankTrackFadeDelay;
-
-	//We changed the maximum number of visible edges so re-allocate our resources to match.
-	ReAcquireResources();
-};
-
-TerrainTracksRenderObjClassSystem *TheTerrainTracksRenderObjClassSystem=NULL;	///< singleton for track drawing system.
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
deleted file mode 100644
index 50afd95a4b3..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
+++ /dev/null
@@ -1,1303 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DTerrainVisual.cpp /////////////////////////////////////////////////////////////////////
-// W3D implementation details for visual aspects of terrain
-// Author: Colin Day, April 2001
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <windows.h>
-
-#include "Common/GameState.h"
-#include "Common/GlobalData.h"
-#include "Common/PerfTimer.h"
-#include "Common/MapReaderWriterInfo.h"
-#include "Common/ThingTemplate.h"
-#include "Common/WellKnownKeys.h"
-#include "Common/TerrainTypes.h"
-#include "Common/Xfer.h"
-#include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.		 
-
-#include "GameClient/Drawable.h"
-#include "GameClient/ClientRandomValue.h"
-
-#include "GameLogic/Object.h"
-#include "GameLogic/GameLogic.h"
-
-#include "W3DDevice/GameClient/W3DScene.h"
-#include "W3DDevice/GameClient/W3DTerrainVisual.h"
-#include "W3DDevice/GameClient/WorldHeightMap.h"
-#include "W3DDevice/GameClient/W3DWater.h"
-#include "W3DDevice/GameClient/W3DDisplay.h"
-#include "W3DDevice/GameClient/W3DDebugIcons.h"
-#include "W3DDevice/GameClient/W3DTerrainTracks.h"
-#include "W3DDevice/GameClient/W3DShadow.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/FlatHeightMap.h"
-#include "W3DDevice/GameClient/W3DSmudge.h"
-#include "W3DDevice/GameClient/Module/W3DModelDraw.h"
-#include "WW3D2/light.h"
-#include "WW3D2/rendobj.h"
-#include "WW3D2/coltype.h"
-#include "WW3D2/coltest.h"
-#include "WW3D2/assetmgr.h"
-
-
-
-class TestSeismicFilter : public SeismicSimulationFilterBase
-{
-
-  virtual SeismicSimStatusCode filterCallback( WorldHeightMapInterfaceClass *heightMap, const SeismicSimulationNode *node )
-  {
-
-
-    Int life = node->m_life;
-
-    if ( heightMap == NULL )
-      return SEISMIC_STATUS_INVALID;
-
-
-    if ( life == 0 )
-      return SEISMIC_STATUS_ACTIVE;
-    if ( life < 15 )
-    {
-      // ADD HEIGHT BECAUSE THE EXPLOSION IS PUSHING DIRT UP
-
-      Real magnitude = node->m_magnitude;
-
-      Real offsScalar =  magnitude / (Real)life; // real-life, get it?
-      Int radius = node->m_radius;
-      Int border = heightMap->getBorderSize();
-      Int centerX = node->m_center.x + border ;
-      Int centerY = node->m_center.y + border ;
-  
-      UnsignedInt workspaceWidth = radius*2;
-      Real *workspace = NEW Real[ sqr(workspaceWidth) ];
-      Real *workspaceEnd = workspace + sqr(workspaceWidth);
-
-
-      for ( Real *t = workspace; t < workspaceEnd; ++t ) *t = 0.0f;// clear the workspace
-
-      Int x = 0;
-      for (; x < radius; ++x)
-      {
-        for (Int y = 0; y < radius; ++y)
-        {
-
-          Real distance = sqrt( sqr(x) + sqr(y) );//Pythagoras
-      
-          if ( distance < radius )
-          {
-            Real distScalar = cos( ( distance / radius * (PI/2) ) );
-            Real height = (offsScalar * distScalar); 
-
-            workspace[ (radius + x) +  workspaceWidth * (radius + y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX + x,  centerY + y ) ;//kaleidoscope
-            
-            if ( x != 0 ) // non-zero test prevents cross-shaped double stamp 
-            {
-      			  workspace[ (radius - x) + workspaceWidth * (radius + y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX - x,  centerY + y ) ;
-              if ( y != 0 )
-                workspace[ (radius - x) + workspaceWidth * (radius - y) ] =  height + heightMap->getBilinearSampleSeismicZVelocity( centerX - x,  centerY - y ) ;
-            }
-            if ( y != 0 )
-      			  workspace[ (radius + x) + workspaceWidth * (radius - y) ] = height + heightMap->getBilinearSampleSeismicZVelocity( centerX + x,  centerY - y ) ;
-          }
-        }
-      }
-
-      // stuff the values from the workspace into the heightmap's velocities
-      for (x = 0; x < workspaceWidth; ++x)
-        for (Int y = 0; y < workspaceWidth; ++y)
-    			heightMap->setSeismicZVelocity( centerX - radius + x, centerY - radius + y,  workspace[  x + workspaceWidth * y ]  );
-
-      delete [] workspace;
-
-      return SEISMIC_STATUS_ACTIVE;
-    }
-    else
-      return SEISMIC_STATUS_ZERO_ENERGY;
-  }
-
-  virtual Real applyGravityCallback( Real velocityIn )
-  {
-    Real velocityOut = velocityIn;
-    velocityOut -= 1.5f;
-    return velocityOut;
-  }
-
-
-};
-static TestSeismicFilter testSeismicFilter;
-
-
-
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DTerrainVisual::W3DTerrainVisual()
-{
-
-	m_terrainRenderObject = NULL;
-	m_waterRenderObject = NULL;
-	TheWaterRenderObj = NULL;
-	
-  m_logicHeightMap   = NULL;
-  
-#ifdef DO_SEISMIC_SIMULATIONS
-  m_clientHeightMap = NULL;
-#endif
-
-
-
-
-
-
-
-
-
-
-
-}  // end W3DTerrainVisual
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DTerrainVisual::~W3DTerrainVisual()
-{
-	// release our render object
-	if (TheTerrainRenderObject == m_terrainRenderObject) {
-		TheTerrainRenderObject = NULL;
-	}
-
-	if (TheTerrainTracksRenderObjClassSystem)
-	{
-		delete TheTerrainTracksRenderObjClassSystem;
-		TheTerrainTracksRenderObjClassSystem=NULL;
-	}
-
-	if (TheW3DShadowManager)
-	{	
-		delete TheW3DShadowManager;
-		TheW3DShadowManager=NULL;
-	}
-
-	if (TheSmudgeManager)
-	{
-		delete TheSmudgeManager;
-		TheSmudgeManager=NULL;
-	}
-
-	REF_PTR_RELEASE( m_waterRenderObject );
-	TheWaterRenderObj=NULL;
-	REF_PTR_RELEASE( m_terrainRenderObject );
-	REF_PTR_RELEASE( m_logicHeightMap );
-
-#ifdef DO_SEISMIC_SIMULATIONS
-  REF_PTR_RELEASE( m_clientHeightMap );
-#endif
-}  // end ~W3DTerrainVisual
-
-//-------------------------------------------------------------------------------------------------
-/** init */
-//-------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::init( void )
-{
-
-	// extend
-	TerrainVisual::init();
-	// create a new render object for W3D
-	m_terrainRenderObject = NEW_REF( HeightMapRenderObjClass, () );
-	m_terrainRenderObject->Set_Collision_Type( PICK_TYPE_TERRAIN );
-	TheTerrainRenderObject = m_terrainRenderObject;
-
-	if (!TheGlobalData->m_headless)
-	{
-		// initialize track drawing system
-		TheTerrainTracksRenderObjClassSystem = NEW TerrainTracksRenderObjClassSystem;
-		TheTerrainTracksRenderObjClassSystem->init(W3DDisplay::m_3DScene);
-
-		// initialize object shadow drawing system
-		TheW3DShadowManager = NEW W3DShadowManager;
- 		TheW3DShadowManager->init();
-	
-		// create a water plane render object
-		TheWaterRenderObj=m_waterRenderObject = NEW_REF( WaterRenderObjClass, () );
-		m_waterRenderObject->init(TheGlobalData->m_waterPositionZ, TheGlobalData->m_waterExtentX, TheGlobalData->m_waterExtentY, W3DDisplay::m_3DScene, (WaterRenderObjClass::WaterType)TheGlobalData->m_waterType);	//create a water plane that's 128x128 units
-		m_waterRenderObject->Set_Position(Vector3(TheGlobalData->m_waterPositionX,TheGlobalData->m_waterPositionY,TheGlobalData->m_waterPositionZ));	//place water in world
-
-		// create smudge rendering system.
-		TheSmudgeManager = NEW(W3DSmudgeManager);
-		TheSmudgeManager->init();
-
-#ifdef DO_UNIT_TIMINGS
-#pragma MESSAGE("********************* WARNING- Doing UNIT TIMINGS. ")
-#else 
-		if (TheGlobalData->m_waterType == WaterRenderObjClass::WATER_TYPE_1_FB_REFLECTION)
-		{	// add water render object to the pre-pass scene (to be rendered before main scene)
- 			//W3DDisplay::m_prePass3DScene->Add_Render_Object( m_waterRenderObject);
-		}
-		else
-		{	// add water render object to the post-pass scene (to be rendered after main scene)
-			W3DDisplay::m_3DScene->Add_Render_Object( m_waterRenderObject);
-		}
-#endif
-		if (TheGlobalData->m_useCloudPlane)
-			m_waterRenderObject->toggleCloudLayer(true);
-		else
-			m_waterRenderObject->toggleCloudLayer(false);
-	}
-
-	// set the vertex animated water properties
-	Int waterSettingIndex = 0;  // use index 0 settings by default
-	TheTerrainVisual->setWaterGridHeightClamps( NULL, 
-																							TheGlobalData->m_vertexWaterHeightClampLow[ waterSettingIndex ], 
-																							TheGlobalData->m_vertexWaterHeightClampHi[ waterSettingIndex ] );
-	TheTerrainVisual->setWaterTransform( NULL, 
-																			 TheGlobalData->m_vertexWaterAngle[ waterSettingIndex ], 
-																			 TheGlobalData->m_vertexWaterXPosition[ waterSettingIndex ], 
-																			 TheGlobalData->m_vertexWaterYPosition[ waterSettingIndex ], 
-																			 TheGlobalData->m_vertexWaterZPosition[ waterSettingIndex ] );
-	TheTerrainVisual->setWaterGridResolution( NULL, 
-																						TheGlobalData->m_vertexWaterXGridCells[ waterSettingIndex ], 
-																						TheGlobalData->m_vertexWaterYGridCells[ waterSettingIndex ], 
-																						TheGlobalData->m_vertexWaterGridSize[ waterSettingIndex ] );
-	TheTerrainVisual->setWaterAttenuationFactors( NULL, 
-																								TheGlobalData->m_vertexWaterAttenuationA[ waterSettingIndex ], 
-																								TheGlobalData->m_vertexWaterAttenuationB[ waterSettingIndex ], 
-																								TheGlobalData->m_vertexWaterAttenuationC[ waterSettingIndex ], 
-																								TheGlobalData->m_vertexWaterAttenuationRange[ waterSettingIndex ] );	
-	m_isWaterGridRenderingEnabled = FALSE;
-
-#ifdef DO_SEISMIC_SIMULATIONS
-  m_seismicSimulationList.clear();
-#endif
-
-}  // end init
-
-//-------------------------------------------------------------------------------------------------
-/** reset */
-//-------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::reset( void )
-{
-
-	// extend
-	TerrainVisual::reset();
-
-	m_terrainRenderObject->reset();
-
-	if (TheW3DShadowManager)
-		TheW3DShadowManager->Reset();
-
-	if (TheSmudgeManager)
-		TheSmudgeManager->reset();
-
-	if (TheTerrainTracksRenderObjClassSystem)
-		TheTerrainTracksRenderObjClassSystem->Reset();
-
-	// reset water render object if present
-	if( m_waterRenderObject )
-	{
-		for (Int i=0; i<5; i++)
-		{
-			//check if this texture was ever changed from default
-			if (m_currentSkyboxTexNames[i] != m_initialSkyboxTexNames[i])
-			{
-				m_waterRenderObject->replaceSkyboxTexture(m_currentSkyboxTexNames[i], m_initialSkyboxTexNames[i]);
-				m_currentSkyboxTexNames[i]=m_initialSkyboxTexNames[i];	//update current state to new texture
-			}
-		}
-
-		m_waterRenderObject->reset();
-	}
-
-#ifdef DO_SEISMIC_SIMULATIONS
-  m_seismicSimulationList.clear();
-#endif
-  
-}  // end reset
-
-//-------------------------------------------------------------------------------------------------
-/** update */
-//-------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::update( void )
-{
-
-	// extend
-	TerrainVisual::update();
-
-#ifdef DO_SEISMIC_SIMULATIONS
-  handleSeismicSimulations();
-#endif
-	// if we have a water render object, it has an update method
-	if( m_waterRenderObject )
-		m_waterRenderObject->update();
-
-
-}  // end update
-
-
-#ifdef DO_SEISMIC_SIMULATIONS
-
-void W3DTerrainVisual::addSeismicSimulation( const SeismicSimulationNode& sim )
-{
-    // HERE WOULD BE A GREAT PLACE FOR AN IDIOT TEST:
-  // REJECT SIMULATION NODES THAT ARE OFF SCREEN!!!!!!!!!!
-    // HERE WOULD BE A GREAT PLACE FOR AN IDIOT TEST:
-  // REJECT SIMULATION NODES THAT ARE OFF SCREEN!!!!!!!!!!
-
-
-  m_seismicSimulationList.push_back( sim );
-}
-
-
-
-void W3DTerrainVisual::handleSeismicSimulations( void )
-{
-  if ( ! m_clientHeightMap || ! m_logicHeightMap || ! m_terrainRenderObject )
-    return;
-
-
-  if ( ! m_seismicSimulationList.empty() )
-  {
-    SeismicSimulationListIt it = m_seismicSimulationList.begin();
-    
-    
-    m_clientHeightMap->clearSeismicUpdateFlags();
-
-
-    while ( it != m_seismicSimulationList.end() )
-	  {
-      SeismicSimulationNode *ssn = &*it;
-
-      if ( ssn )
-      {
-        SeismicSimulationFilterBase::SeismicSimStatusCode code = ssn->handleFilterCallback( m_clientHeightMap );
-        DEBUG_ASSERTCRASH( code != SeismicSimulationFilterBase::SEISMIC_STATUS_INVALID, ("Trouble in the Seismic simulator.") );
-      
-        switch ( code ) 
-        {
-          case SeismicSimulationFilterBase::SEISMIC_STATUS_ACTIVE:
-          {
-        	  break;
-          }
-          case SeismicSimulationFilterBase::SEISMIC_STATUS_ZERO_ENERGY:
-          {
-        	  break;
-          }
-        }
-
-        Int border = m_clientHeightMap->getBorderSizeInline();
-
-        // Now we apply some gravity to the dirt, so it falls back to its "original" height
-        UnsignedInt fallCount = 0;
-        for (Int x = border+ssn->m_region.lo.x; x < border+ssn->m_region.hi.x; ++x)
-        {
-          for (Int y = border+ssn->m_region.lo.y; y < border+ssn->m_region.hi.y; ++y)
-          {
-            if ( ! m_clientHeightMap->getSeismicUpdateFlag( x, y ) )
-            {
-              UnsignedByte heightOfOriginal = m_logicHeightMap->getHeight( x, y ); // LOGIC, YES DEFINITELY THE LOGIC
-
-              Real oldSpeed = m_clientHeightMap->getSeismicZVelocity( x, y );
-              Real newSpeed = ssn->applyGravity( oldSpeed );// - 0.5f;
-              
-              m_clientHeightMap->setSeismicZVelocity( x, y, newSpeed );
-
-              Int heightToUse = m_clientHeightMap->getHeight( x, y ) + newSpeed ;
-
-
-              if (heightToUse <= heightOfOriginal)
-              {
-                heightToUse = heightOfOriginal;
-                m_clientHeightMap->setSeismicZVelocity( x, y, 0.0f ); //poof! the dirt hit ground level so stop "falling"
-              }
-              else
-              {
-                ++fallCount;
-                
-                if ( heightToUse > 255 )
-                  heightToUse = 255;
-
-              }
-    			    m_clientHeightMap->setRawHeight( x, y, heightToUse ); 
-              m_clientHeightMap->setSeismicUpdateFlag( x, y, TRUE );
-            }
-            
-          }
-        }
-
-        if ( fallCount == 0 )
-          ssn->m_clean = TRUE;
-
-      }
-
-      ++it;
-
-	  }
-  }
-
-
-
-
-
-}
-
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void W3DTerrainVisual::updateSeismicSimulations( void )
-{
-
-	if (m_logicHeightMap==NULL) 
-		return;
-
-	if (m_clientHeightMap==NULL) 
-		return;
-
-  if (m_terrainRenderObject==NULL)
-    return;
-
-  if ( ! m_seismicSimulationList.empty() )
-  {
-    SeismicSimulationListIt it = m_seismicSimulationList.begin();
-
-    // First we run through the list and do our business for each region
-
-	  while ( it != m_seismicSimulationList.end() )
-	  {
-      SeismicSimulationNode *hur = &*it;
-      if ( hur )
-      {
-        Int border = m_clientHeightMap->getBorderSizeInline();
-
-		    TheTerrainRenderObject->updateBlock(
-          hur->m_region.lo.x + border, 
-          hur->m_region.lo.y + border, 
-          hur->m_region.hi.x + border, 
-          hur->m_region.hi.y + border, 
-          m_clientHeightMap, 
-          0);
-      }
-
-      ++it;
-
-	  }
-    // Then we check to see if these need to get erased from the list
-    it = m_seismicSimulationList.begin();
-	  while ( it != m_seismicSimulationList.end() )
-	  {
-      SeismicSimulationNode *hur = &*it;
-      if ( hur->m_clean )
-      {
-		    it = m_seismicSimulationList.erase( it );
-      }
-      else
-        ++it; 
-
-	  }
-
-  }
-}
-
-
-#endif //#defined DO_SEISMIC_SIMULATIONS
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-//-------------------------------------------------------------------------------------------------
-/** load method for W3D visual terrain */
-//-------------------------------------------------------------------------------------------------
-Bool W3DTerrainVisual::load( AsciiString filename )
-{
-	
-#if 0	
-	// (gth) Testing exclusion list asset releasing
-	DynamicVectorClass<StringClass> exclusion_list(8000);
-	
-	WW3DAssetManager::Get_Instance()->Create_Asset_List(exclusion_list);
-
-	exclusion_list.Add(StringClass("avcomanche"));
-	exclusion_list.Add(StringClass("avcomanche_d"));
-	exclusion_list.Add(StringClass("ptdogwood08"));
-	exclusion_list.Add(StringClass("ptdogwood01_b"));
-	exclusion_list.Add(StringClass("ptpalm01"));
-	exclusion_list.Add(StringClass("ptpalm01_b"));
-	exclusion_list.Add(StringClass("avhummer"));
-	exclusion_list.Add(StringClass("avhummer_d"));
-	exclusion_list.Add(StringClass("avleopard"));
-	exclusion_list.Add(StringClass("avleopard_d"));
-
-	WW3DAssetManager::Get_Instance()->Free_Assets_With_Exclusion_List(exclusion_list);
-#endif
-
-	// enhancing functionality specific for W3D terrain
-	if( TerrainVisual::load( filename ) == FALSE )
-		return FALSE;  // failed
-
-	// open the terrain file
-	CachedFileInputStream fileStrm;
-	if( !fileStrm.open(filename) )
-	{
-
-		REF_PTR_RELEASE( m_terrainRenderObject );
-		return FALSE;
-
-	}  // end if
-
-	if( m_terrainRenderObject == NULL )
-		return FALSE;
-
-
-  ChunkInputStream *pStrm = &fileStrm;
-
-  // allocate new height map data to read from file
-  REF_PTR_RELEASE( m_logicHeightMap );
-	m_logicHeightMap = NEW WorldHeightMap(pStrm);
-
-
-
-
-#ifdef DO_SEISMIC_SIMULATIONS
-
-  fileStrm.close();
-  fileStrm.open(filename);
-  pStrm = &fileStrm;
-
-	REF_PTR_RELEASE( m_clientHeightMap );
-  m_clientHeightMap = NEW WorldHeightMap( pStrm );
-
-#endif
-
-
-
-
-
-
-
-
-	// Add any lights loaded by map.
-	MapObject *pMapObj = MapObject::getFirstMapObject();
-	while (pMapObj) 
-	{
-		Dict *d = pMapObj->getProperties();
-		if (pMapObj->isLight()) 
-		{ 
-			Coord3D loc = *pMapObj->getLocation();
-			if (loc.z < 0) {
-				Vector3 vec;
-				loc.z = m_terrainRenderObject->getHeightMapHeight(loc.x, loc.y, NULL);
-				loc.z += d->getReal(TheKey_lightHeightAboveTerrain);
-			}
-			// It is a light, and handled at the device level.  jba.
-			LightClass* lightP = NEW_REF(LightClass, (LightClass::POINT));
-
-			RGBColor c;
-			c.setFromInt(d->getInt(TheKey_lightAmbientColor));
-			lightP->Set_Ambient( Vector3( c.red, c.green, c.blue ) );
-
-			c.setFromInt(d->getInt(TheKey_lightDiffuseColor));
-			lightP->Set_Diffuse( Vector3(  c.red, c.green, c.blue) );
-
-			lightP->Set_Position(Vector3(loc.x, loc.y, loc.z));
-
-			lightP->Set_Far_Attenuation_Range(d->getReal(TheKey_lightInnerRadius), d->getReal(TheKey_lightOuterRadius));
- 			W3DDisplay::m_3DScene->Add_Render_Object(lightP);
-			REF_PTR_RELEASE( lightP );
-		}
-		pMapObj = pMapObj->getNext();
-	}
-
-
-	RefRenderObjListIterator *it = W3DDisplay::m_3DScene ? W3DDisplay::m_3DScene->createLightsIterator() : NULL;
-	// apply the heightmap to the terrain render object
-
-#ifdef DO_SEISMIC_SIMULATIONS
-	m_terrainRenderObject->initHeightData( m_clientHeightMap->getDrawWidth(), 
-																				 m_clientHeightMap->getDrawHeight(),
-																				 m_clientHeightMap,
-																				 it);
-#else
-	m_terrainRenderObject->initHeightData( m_logicHeightMap->getDrawWidth(), 
-																				 m_logicHeightMap->getDrawHeight(),
-																				 m_logicHeightMap,
-																				 it);
-#endif
-
-
-	if (it) {
-	 W3DDisplay::m_3DScene->destroyLightsIterator(it);
-	 it = NULL;
-	}
-	// add our terrain render object to the scene
-	if (W3DDisplay::m_3DScene != NULL)
-		W3DDisplay::m_3DScene->Add_Render_Object( m_terrainRenderObject );
-
-#if defined RTS_DEBUG || defined RTS_INTERNAL
-	// Icon drawing utility object for pathfinding.
-	if (W3DDisplay::m_3DScene != NULL)
-	{
-		W3DDebugIcons *icons = NEW W3DDebugIcons;
- 		W3DDisplay::m_3DScene->Add_Render_Object( icons );
-		icons->Release_Ref(); // belongs to scene.
-	}
-#endif
-
-#ifdef DO_UNIT_TIMINGS
-#pragma MESSAGE("********************* WARNING- Doing UNIT TIMINGS. ")
-#else 
-	if (m_waterRenderObject)
-	{
-		W3DDisplay::m_3DScene->Add_Render_Object( m_waterRenderObject);
-		m_waterRenderObject->enableWaterGrid(false);
-		m_waterRenderObject->updateMapOverrides();
-	}
-#endif
-
-	pMapObj = MapObject::getFirstMapObject();
-	while (pMapObj) 
-	{
-		Dict *d = pMapObj->getProperties();
-		if (pMapObj->isScorch()) {
-			const Coord3D *pos = pMapObj->getLocation();
-			Vector3 loc(pos->x, pos->y, pos->z);
-			Real radius = d->getReal(TheKey_objectRadius);
-			Scorches type = (Scorches)d->getInt(TheKey_scorchType);
-			m_terrainRenderObject->addScorch(loc, radius, type);
-		}
-		pMapObj = pMapObj->getNext();
-	}
-
-	// reset water render object if present
-	if( m_waterRenderObject )
-	{
-		m_waterRenderObject->load();
-	}
-
-	return TRUE;  // success
-
-}  // end load
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::enableWaterGrid( Bool enable )
-{
-
-	//Get default water type
-	m_isWaterGridRenderingEnabled = enable;
-
-	// make the changes in the water render object
-	if( m_waterRenderObject )
-		m_waterRenderObject->enableWaterGrid( enable );
-
-}  // end enableWaterGrid
-
-//-------------------------------------------------------------------------------------------------
-/** intersect the ray with the terrain, if a hit occurs TRUE is returned
-	* and the result point on the terrain is returned in "result" */
-//-------------------------------------------------------------------------------------------------
-Bool W3DTerrainVisual::intersectTerrain( Coord3D *rayStart, 
-																				 Coord3D *rayEnd, 
-																				 Coord3D *result )
-{
-	Bool hit = FALSE;
-
-	// sanity
-	if( rayStart == NULL || rayEnd == NULL )
-		return hit;
-
-	if( m_terrainRenderObject )
-	{
-		CastResultStruct res;
-		LineSegClass lineSeg( Vector3( rayStart->x, rayStart->y, rayStart->z ),
-													Vector3( rayEnd->x, rayEnd->y, rayEnd->z ) );
-		RayCollisionTestClass rayTest( lineSeg, &res );
-
-		hit = m_terrainRenderObject->Cast_Ray( rayTest );
-		if( hit && result )
-		{
-			Vector3 point = rayTest.Result->ContactPoint;
-
-			result->x = point.X;
-			result->y = point.Y;
-			result->z = point.Z;	
-
-		}  // end if
-		
-	}  // end if
-
-	// return hit result
-	return hit;
-
-}  // end intersectTerrain
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::getTerrainColorAt( Real x, Real y, RGBColor *pColor )
-{
-
-#ifdef DO_SEISMIC_SIMULATIONS
-  if( m_clientHeightMap )
-		m_clientHeightMap->getTerrainColorAt( x, y, pColor );
-#else
-  if( m_logicHeightMap )
-		m_logicHeightMap->getTerrainColorAt( x, y, pColor );
-#endif
-
-}  // end getTerrainColorAt
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-TerrainType *W3DTerrainVisual::getTerrainTile( Real x, Real y )
-{
-	TerrainType *tile = NULL;
-
-
-#ifdef DO_SEISMIC_SIMULATIONS
-	if( m_clientHeightMap )
-	{
-		AsciiString tileName = m_clientHeightMap->getTerrainNameAt( x, y );
-		tile = TheTerrainTypes->findTerrain( tileName );
-	}  // end if
-#else
-  if( m_logicHeightMap )
-	{
-		AsciiString tileName = m_logicHeightMap->getTerrainNameAt( x, y );
-		tile = TheTerrainTypes->findTerrain( tileName );
-	}  // end if
-#endif
-
-
-
-
-	return tile;
-
-}  // end getTerrainTile
-
-// ------------------------------------------------------------------------------------------------
-/** set min/max height values allowed in water grid pointed to by waterTable */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setWaterGridHeightClamps( const WaterHandle *waterTable, 
-																								 Real minZ, Real maxZ )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->setGridHeightClamps( minZ, maxZ );
-
-}  // end setWaterGridHeightClamps
-
-// ------------------------------------------------------------------------------------------------
-/** adjust fallof parameters for grid change method */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setWaterAttenuationFactors( const WaterHandle *waterTable, 
-																									 Real a, Real b, Real c, Real range )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->setGridChangeAttenuationFactors( a, b, c, range );
-
-}  // end setWaterAttenuationFactors
-
-// ------------------------------------------------------------------------------------------------
-/** set the water table position and orientation in world space */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setWaterTransform( const WaterHandle *waterTable, 
-																					Real angle, Real x, Real y, Real z )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->setGridTransform( angle, x, y, z );
-
-}  // end setWaterTransform
-
-// ------------------------------------------------------------------------------------------------
-/** set water table transform by matrix */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setWaterTransform( const Matrix3D *transform )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->setGridTransform( transform );
-			
-}  // end setWaterTransform
-
-// ------------------------------------------------------------------------------------------------
-/** get the water transform matrix */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::getWaterTransform( const WaterHandle *waterTable, Matrix3D *transform )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->getGridTransform( transform );
-
-}  // end getWaterTransform
-
-// ------------------------------------------------------------------------------------------------
-/** water grid resolution spacing */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setWaterGridResolution( const WaterHandle *waterTable,
-																							 Real gridCellsX, Real gridCellsY, Real cellSize )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->setGridResolution( gridCellsX, gridCellsY, cellSize );
-
-}  // end setWaterGridResolution
-
-// ------------------------------------------------------------------------------------------------
-/** get water grid resolution spacing */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::getWaterGridResolution( const WaterHandle *waterTable,	
-																							 Real *gridCellsX, Real *gridCellsY, Real *cellSize )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->getGridResolution( gridCellsX, gridCellsY, cellSize );
-
-}  // end getWaterGridResolution
-
-// ------------------------------------------------------------------------------------------------
-/** adjust the water grid in world coords by the delta */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::changeWaterHeight( Real x, Real y, Real delta )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->changeGridHeight( x, y, delta );
-
-}  // end changeWaterHeight
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::addWaterVelocity( Real worldX, Real worldY, 
-																				 Real velocity, Real preferredHeight )
-{
-
-	if( m_waterRenderObject )
-		m_waterRenderObject->addVelocity( worldX, worldY, velocity, preferredHeight );
-
-}  // end addWaterVelocity
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-Bool W3DTerrainVisual::getWaterGridHeight( Real worldX, Real worldY, Real *height)
-{
-	Real gridX, gridY;
-
-	if (m_isWaterGridRenderingEnabled && m_waterRenderObject &&
-		m_waterRenderObject->worldToGridSpace(worldX, worldY, gridX, gridY))
-	{	//point falls within grid, return correct height
-		m_waterRenderObject->getGridVertexHeight(REAL_TO_INT(gridX),REAL_TO_INT(gridY),height);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setRawMapHeight(const ICoord2D *gridPos, Int height)
-{
-  // This method writes to the m_logicHeightMap member, 
-  // since m_logicHeightMap is the true, golden standard to which m_clientHeightMap
-  // interpolates during or after its Seismic simulation displaces it..
-  // THIS IS TRUE ONLY WHEN DO_SEISMIC_SIMULATIONS is defined M Lorenzen, 8/23/03
-
-	if (m_logicHeightMap) 
-  {
-		Int x = gridPos->x+m_logicHeightMap->getBorderSizeInline();
-		Int y = gridPos->y+m_logicHeightMap->getBorderSizeInline();
- 		//if (m_logicHeightMap->getHeight(x,y) != height) //ML changed to prevent scissoring with roads
- 		if (m_logicHeightMap->getHeight(x,y) > height) 
-		{
-			m_logicHeightMap->setRawHeight(x, y, height);
-			m_terrainRenderObject->staticLightingChanged(); // OOH! this could benefit from the new Seismic update code
-
-
-#ifdef DO_SEISMIC_SIMULATIONS 
-      if ( m_clientHeightMap )
-      {
-        if ( height < m_clientHeightMap->getHeight( x,y ) )
-          m_clientHeightMap->setRawHeight( x, y, height ); // if the client map is heigher than this height, it will fall down to it anyway!
-      }
-#endif
-
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-Int W3DTerrainVisual::getRawMapHeight(const ICoord2D *gridPos)
-{
-	if (m_logicHeightMap) 
-  {
-		Int x = gridPos->x+m_logicHeightMap->getBorderSizeInline();
-		Int y = gridPos->y+m_logicHeightMap->getBorderSizeInline();
- 		//if (m_logicHeightMap->getHeight(x,y) != height) //ML changed to prevent scissoring with roads
-    return m_logicHeightMap->getHeight(x,y) ;
-	}
-  return 0;
-
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::addFactionBibDrawable(Drawable *factionBuilding, Bool highlight, Real extra)
-{
-#ifdef DO_SEISMIC_SIMULATIONS 
-	if (m_clientHeightMap)
-#else
-	if (m_logicHeightMap)
-#endif
-  {
-		const Matrix3D * mtx = factionBuilding->getTransformMatrix();
-		Vector3 corners[4];
-		Coord3D pos;
-		pos.set(0,0,0);
-		Real exitWidth = factionBuilding->getTemplate()->getFactoryExitWidth();
-		Real extraWidth = factionBuilding->getTemplate()->getFactoryExtraBibWidth() + extra;
-		const GeometryInfo info = factionBuilding->getTemplate()->getTemplateGeometryInfo();
-		Real sizeX = info.getMajorRadius();
-		Real sizeY = info.getMinorRadius();
-		if (info.getGeomType() != GEOMETRY_BOX) {
-			sizeY = sizeX;
-		}
-		corners[0].Set(pos.x, pos.y, pos.z);
-		corners[0].X -= sizeX+extraWidth;
-		corners[0].Y -= sizeY+extraWidth;
-		corners[1].Set(pos.x, pos.y, pos.z);
-		corners[1].X += sizeX+exitWidth+extraWidth;
-		corners[1].Y -= sizeY+extraWidth;
-		corners[2].Set(pos.x, pos.y, pos.z);
-		corners[2].X += sizeX+exitWidth+extraWidth;
-		corners[2].Y += sizeY+extraWidth;
-		corners[3].Set(pos.x, pos.y, pos.z);
-		corners[3].X -= sizeX+extraWidth;
-		corners[3].Y += sizeY+extraWidth;
-		mtx->Transform_Vector(*mtx, corners[0], &corners[0]);
-		mtx->Transform_Vector(*mtx, corners[1], &corners[1]);
-		mtx->Transform_Vector(*mtx, corners[2], &corners[2]);
-		mtx->Transform_Vector(*mtx, corners[3], &corners[3]);
-		m_terrainRenderObject->addTerrainBibDrawable(corners, factionBuilding->getID(), highlight);
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::addFactionBib(Object *factionBuilding, Bool highlight, Real extra)
-{
-#ifdef DO_SEISMIC_SIMULATIONS
-	if (m_clientHeightMap) 
-#else
-	if (m_logicHeightMap) 
-#endif
-  {
-		const Matrix3D * mtx = factionBuilding->getTransformMatrix();
-		Vector3 corners[4];
-		Coord3D pos;
-		pos.set(0,0,0);
-		Real exitWidth = factionBuilding->getTemplate()->getFactoryExitWidth();
-		Real extraWidth = factionBuilding->getTemplate()->getFactoryExtraBibWidth() + extra;
-		const GeometryInfo info = factionBuilding->getGeometryInfo();
-		Real sizeX = info.getMajorRadius();
-		Real sizeY = info.getMinorRadius();
-		if (info.getGeomType() != GEOMETRY_BOX) {
-			sizeY = sizeX;
-		}
-		corners[0].Set(pos.x, pos.y, pos.z);
-		corners[0].X -= sizeX+extraWidth;
-		corners[0].Y -= sizeY+extraWidth;
-		corners[1].Set(pos.x, pos.y, pos.z);
-		corners[1].X += sizeX+exitWidth+extraWidth;
-		corners[1].Y -= sizeY+extraWidth;
-		corners[2].Set(pos.x, pos.y, pos.z);
-		corners[2].X += sizeX+exitWidth+extraWidth;
-		corners[2].Y += sizeY+extraWidth;
-		corners[3].Set(pos.x, pos.y, pos.z);
-		corners[3].X -= sizeX+extraWidth;
-		corners[3].Y += sizeY+extraWidth;
-		mtx->Transform_Vector(*mtx, corners[0], &corners[0]);
-		mtx->Transform_Vector(*mtx, corners[1], &corners[1]);
-		mtx->Transform_Vector(*mtx, corners[2], &corners[2]);
-		mtx->Transform_Vector(*mtx, corners[3], &corners[3]);
-		m_terrainRenderObject->addTerrainBib(corners, factionBuilding->getID(), highlight);
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::removeFactionBibDrawable(Drawable *factionBuilding)
-{
-	if (m_terrainRenderObject) {
-		m_terrainRenderObject->removeTerrainBibDrawable(factionBuilding->getID());
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::removeFactionBib(Object *factionBuilding)
-{
-	if (m_terrainRenderObject) {
-		m_terrainRenderObject->removeTerrainBib(factionBuilding->getID());
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::removeAllBibs(void)
-{
-	if (m_terrainRenderObject) {
-		m_terrainRenderObject->removeAllTerrainBibs();
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::removeBibHighlighting(void)
-{
-	if (m_terrainRenderObject) {
-		m_terrainRenderObject->removeTerrainBibHighlighting();
-	}
-}
- 
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::removeTreesAndPropsForConstruction(const Coord3D* pos, 
-																				const GeometryInfo& geom,
-																				Real angle)
-{
-	if (m_terrainRenderObject) {
-		m_terrainRenderObject->removeTreesAndPropsForConstruction(pos, geom, angle);
-	}
-}
- 
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::addProp(const ThingTemplate *tTemplate, const Coord3D *pos, Real angle)
-{
-	ModelConditionFlags state;
-	state.clear();
-	if (TheGlobalData->m_weather == WEATHER_SNOWY)
-	{
-		state.set(MODELCONDITION_SNOW);
-	}
-	if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
-	{
-		state.set(MODELCONDITION_NIGHT);
-	}
-	AsciiString modelName;
-	Real scale = tTemplate->getAssetScale();
-	const ModuleInfo& mi = tTemplate->getDrawModuleInfo();
-	if (mi.getCount() > 0)
-	{
-		const ModuleData* mdd = mi.getNthData(0);
-		const W3DModelDrawModuleData* md = mdd ? mdd->getAsW3DModelDrawModuleData() : NULL;
-		if (md)
-		{
-			modelName = md->getBestModelNameForWB(state);
-		}
-	}
-	if (m_terrainRenderObject && modelName.isNotEmpty()) {
-		m_terrainRenderObject->addProp(1, *pos, angle, scale, modelName);
-	}
-}
- 
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setTerrainTracksDetail(void)
-{
-	if (TheTerrainTracksRenderObjClassSystem)
-		TheTerrainTracksRenderObjClassSystem->setDetail();
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::setShoreLineDetail(void)
-{
-	if (m_terrainRenderObject) 
-		m_terrainRenderObject->setShoreLineDetail();
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-/// Replace the skybox texture
-void W3DTerrainVisual::replaceSkyboxTextures(const AsciiString *oldTexName[5], const AsciiString *newTexName[5])
-{
-	if (m_waterRenderObject)
-	{
-		for (Int i=0; i<5; i++)
-		{
-			//check if this texture was never changed before and is still using the default art.
-			if (m_initialSkyboxTexNames[i].isEmpty())
-			{	m_initialSkyboxTexNames[i]=*oldTexName[i];
-				m_currentSkyboxTexNames[i]=*oldTexName[i];
-			}
-
-			if (m_currentSkyboxTexNames[i] != *newTexName[i])
-			{	m_waterRenderObject->replaceSkyboxTexture(m_currentSkyboxTexNames[i], *newTexName[i]);
-				m_currentSkyboxTexNames[i]=*newTexName[i];	//update current state to new texture
-			}
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::crc( Xfer *xfer )
-{
-
-	// extend base class
-	TerrainVisual::crc( xfer );
-
-}  // end CRC
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer
-	* Version Info:
-	* 1: Initial version 
-	* 2: Add height map heights.
-	* 3: Add client side trees & props. jba.
-*/
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 3;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// extend base class
-	TerrainVisual::xfer( xfer );
-
-	// flag for whether or not the water grid is enabled
-	Bool gridEnabled = m_isWaterGridRenderingEnabled;
-	xfer->xferBool( &gridEnabled );
-	if( gridEnabled != m_isWaterGridRenderingEnabled )
-	{
-
-		DEBUG_CRASH(( "W3DTerrainVisual::xfer - m_isWaterGridRenderingEnabled mismatch\n" ));
-		throw SC_INVALID_DATA;
-
-	}  // end if
-
-	// xfer grid data if enabled
-	if( gridEnabled )
-		xfer->xferSnapshot( m_waterRenderObject );
-
-/*
-	{
-
-		// grid width and height
-		Int width = getGridWidth();
-		Int height = getGridheight();
-		xfer->xferInt( &width );
-		xfer->xferInt( &height );
-		if( width != getGridWidth() )
-		{
-
-			DEBUG_CRASH(( "W3DTerainVisual::xfer - grid width mismatch '%d' should be '%d'\n",
-										width, getGridWidth() ));
-			throw SC_INVALID_DATA;
-
-		}  // end if
-		if( height != getGridHeight() )
-		{
-
-			DEBUG_CRASH(( "W3DTerainVisual::xfer - grid height mismatch '%d' should be '%d'\n",
-										height, getGridHeight() ));
-			throw SC_INVALID_DATA;
-
-		}  // end if
-
-		// write data for each grid
-
-	}  // end if
-*/
-
-	// Write out the terrain height data.
-	if (version >= 2) {
-		UnsignedByte *data = m_logicHeightMap->getDataPtr();
-		Int len = m_logicHeightMap->getXExtent()*m_logicHeightMap->getYExtent();
-		Int xferLen = len;
-		xfer->xferInt(&xferLen);
-		if (len!=xferLen) {
-			DEBUG_CRASH(("Bad height map length."));
-			if (len>xferLen) {
-				len = xferLen;
-			}
-		}
-		xfer->xferUser(data, len);	
-		if (xfer->getXferMode() == XFER_LOAD)	
-    {	
-			// Update the display height map.
-			m_terrainRenderObject->staticLightingChanged();
-		}
-	}
-
-	if (version >= 3) {
-		xfer->xferSnapshot(m_terrainRenderObject);
-	}
-
-
-
-         // XFER //
-         // X  R //
-         // X  R //
-         // XFER //
- /////   /USE CLIENT HEIGHT MAPCLIENT HEIGHT MAP
-//   //  /USE CLIENT HEIGHT MAPCLIENT HEIGHT MAP
-//    ////USE CLIENT HEIGHT MAPCLIENT HEIGHT MAP----------------------------
-//   //  /USE CLIENT HEIGHT MAPCLIENT HEIGHT MAP                            ^
- /////   /USE CLIENT HEIGHT MAPCLIENT HEIGHT MAP                            0
-         // XFER //
-         // X  R //
-         // X  R //
-         // XFER //
-
-
-
-
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void W3DTerrainVisual::loadPostProcess( void )
-{
-
-	// extend base class
-	TerrainVisual::loadPostProcess();
-
-}  // end loadPostProcess
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
deleted file mode 100644
index cd6f25f14b0..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
+++ /dev/null
@@ -1,2043 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DTreeBuffer.cpp ////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: W3DTreeBuffer.cpp
-//
-// Created:   John Ahlquist, May 2001
-//
-// Desc:      Draw buffer to handle all the trees in a scene.
-//
-//-----------------------------------------------------------------------------
-
-// ------------------------------------------------------------------------------------------------
-/** Topple options */
-// ------------------------------------------------------------------------------------------------
-enum
-{
-	W3D_TOPPLE_OPTIONS_NONE			 = 0x00000000,
-	W3D_TOPPLE_OPTIONS_NO_BOUNCE = 0x00000001,  ///< do not bounce when hit the ground
-	W3D_TOPPLE_OPTIONS_NO_FX		 = 0x00000002	///< do not play any FX when hit the ground
-};
-//-----------------------------------------------------------------------------
-//         Includes                                                      
-//-----------------------------------------------------------------------------
-#include "W3DDevice/GameClient/W3DTreeBuffer.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <assetmgr.h>
-#include <texture.h>
-#include "Common/MapReaderWriterInfo.h"
-#include "Common/FileSystem.h" 
-#include "Common/file.h"
-#include "Common/PerfTimer.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
-#include "GameLogic/ScriptEngine.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/Object.h"
-#include "GameLogic/PartitionManager.h"
-#include "GameClient/ClientRandomValue.h"
-#include "GameClient/FXList.h"
-#include "W3DDevice/GameClient/TerrainTex.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/W3DDynamicLight.h"
-#include "W3DDevice/GameClient/Module/W3DTreeDraw.h"
-#include "W3DDevice/GameClient/W3DShaderManager.h"
-#include "W3DDevice/GameClient/W3DShadow.h"
-#include "W3DDevice/GameClient/W3DShroud.h"
-#include "W3DDevice/GameClient/W3DProjectedShadow.h"
-#include "WW3D2/camera.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/dx8renderer.h"
-#include "WW3D2/matinfo.h"
-#include "WW3D2/mesh.h"
-#include "WW3D2/meshmdl.h"
-#include "d3dx8tex.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-// If TEST_AND_BLEND is defined, it will do an alpha test and blend.  Otherwise just alpha test. jba. [5/30/2003]
-#define dontTEST_AND_BLEND 1
-
-#define USE_STATIC 1
-
-#define END_OF_PARTITION (-1)
-
-#define DELETED_TREE_TYPE (-2)
-
-/******************************************************************************
-						W3DTreeTextureClass
-******************************************************************************/
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// W3DTreeBuffer::W3DTreeTextureClass::W3DTreeTextureClass
-//=============================================================================
-/** Constructor. Calls parent constructor to create a 16 bit per pixel D3D 
-texture of the desired height and mip level. */
-//=============================================================================
-W3DTreeBuffer::W3DTreeTextureClass::W3DTreeTextureClass(unsigned width, unsigned height) :
-	TextureClass(width, height, 
-		WW3D_FORMAT_A8R8G8B8, MIP_LEVELS_ALL )
-{
-}
-
-//=============================================================================
-// W3DTreeBuffer::W3DTreeTextureClass::update
-//=============================================================================
-/** Sets the tile bitmap data into the texture.  The tiles are placed with 4
-	pixel borders around them, so that when the tiles are scaled and bilinearly
-	interpolated, you don't get seams between the tiles.  */
-//=============================================================================
-int W3DTreeBuffer::W3DTreeTextureClass::update(W3DTreeBuffer *buffer)
-{
-
-	//Set to clamp.
-	Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-	Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-
-	IDirect3DSurface8 *surface_level;
-	D3DSURFACE_DESC surface_desc;
-	D3DLOCKED_RECT locked_rect;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0, &surface_level));
-	DX8_ErrorCode(surface_level->GetDesc(&surface_desc));
-
-	DX8_ErrorCode(surface_level->LockRect(&locked_rect, NULL, 0));
-
-	Int tilePixelExtent = TILE_PIXEL_EXTENT;		 
-//	Int numRows = surface_desc.Height/(tilePixelExtent+TILE_OFFSET);
-#ifdef RTS_DEBUG
-	//DASSERT_MSG(tilesPerRow*numRows >= htMap->m_numBitmapTiles,Debug::Format ("Too many tiles.")); 
-	//DEBUG_ASSERTCRASH((Int)surface_desc.Width >= tilePixelExtent*tilesPerRow, ("Bitmap too small."));
-#endif
-	if (surface_desc.Format == D3DFMT_A8R8G8B8) {
-		Int tileNdx;
-		Int pixelBytes = 4;
-#if 0 // Fill unused texture for debug display.
-		UnsignedInt cellX, cellY;
-		for (cellX = 0; cellX < surface_desc.Width; cellX++) {
-			for (cellY = 0; cellY < surface_desc.Height; cellY++) {
-				UnsignedByte *pBGR = ((UnsignedByte *)locked_rect.pBits)+(cellY*surface_desc.Width+cellX)*pixelBytes;
-				//*((Short*)pBGR) =  0x8000 + (((255-2*cellY)>>3)<<10) + ((4*cellX)>>4);
-				*((Int*)pBGR) =  0xFF000000 | ( (((255-cellY))<<16) + ((cellX)) );
-				
-			}
-		}
-#endif
-		for (tileNdx=0; tileNdx < buffer->getNumTiles(); tileNdx++) {
-			TileData *pTile = buffer->getSourceTile(tileNdx);
-			if (!pTile) continue;
-			ICoord2D position = pTile->m_tileLocationInTexture;
-			if (position.x<0) {
-				continue;
-			}
-			Int i,j;
-			for (j=0; j<tilePixelExtent; j++) {
-				UnsignedByte *pBGR = pTile->getRGBDataForWidth(tilePixelExtent);
-				pBGR += (tilePixelExtent-(1+j))*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
-				Int row = position.y+j;
-				UnsignedByte *pBGRA = ((UnsignedByte*)locked_rect.pBits) +
-							(row)*surface_desc.Width*pixelBytes;
-
-				Int column = position.x;
-				pBGRA += column*pixelBytes;
-				for (i=0; i<tilePixelExtent; i++) {
-					// 15 bit color *((Short*)pBGRA) = 0x8000 + ((pBGR[2]>>3)<<10) + ((pBGR[1]>>3)<<5) + (pBGR[0]>>3);
-					*((Int *)pBGRA) = (pBGR[3]<<24) + (pBGR[2]<<16) + (pBGR[1]<<8) + (pBGR[0]); 
-					pBGRA +=pixelBytes;
-					pBGR +=TILE_BYTES_PER_PIXEL;
-				}
-			}
-		}
-
-	}
-	DX8_ErrorCode(surface_level->UnlockRect());
-	surface_level->Release();
-	DX8_ErrorCode(D3DXFilterTexture(Peek_D3D_Texture(), NULL, (UINT)0, D3DX_FILTER_BOX));	
-	if (TheWritableGlobalData->m_textureReductionFactor) {
-		DX8_ErrorCode(Peek_D3D_Texture()->SetLOD((DWORD)TheWritableGlobalData->m_textureReductionFactor));
-	}
-	return(surface_desc.Height);
-}
-
-
-//=============================================================================
-// W3DTreeBuffer::W3DTreeTextureClass::setLOD
-//=============================================================================
-/** Sets the lod of the texture to be loaded into the video card.  */
-//=============================================================================
-void W3DTreeBuffer::W3DTreeTextureClass::setLOD(Int LOD) const
-{
-	if (Peek_D3D_Texture()) {
-		DX8_ErrorCode(Peek_D3D_Texture()->SetLOD((DWORD)LOD));
-	}
-}
-//=============================================================================
-// W3DTreeBuffer::W3DTreeTextureClass::Apply
-//=============================================================================
-/** Sets the texture as the current D3D texture, and does some custom setup
-(standard D3D setup, but beyond the scope of W3D).  */
-//=============================================================================
-void W3DTreeBuffer::W3DTreeTextureClass::Apply(unsigned int stage)
-{
-	// Do the base apply.
-	TextureClass::Apply(stage);
-}
-//-----------------------------------------------------------------------------
-//         Private Data                                                     
-//-----------------------------------------------------------------------------
-
-#ifdef TEST_AND_BLEND
-// A W3D shader that does alpha, texturing, tests zbuffer, doesn't update zbuffer.
-#define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
-	ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::ALPHATEST_ENABLE, ShaderClass::CULL_MODE_ENABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-#define SC_ALPHA_DETAIL_2X ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
-	ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE2X, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::ALPHATEST_ENABLE, ShaderClass::CULL_MODE_ENABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-#else
-#define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
-	ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::ALPHATEST_ENABLE, ShaderClass::CULL_MODE_DISABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-#define SC_ALPHA_DETAIL_2X ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
-	ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE2X, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::ALPHATEST_ENABLE, ShaderClass::CULL_MODE_ENABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-#endif
-static ShaderClass detailAlphaShader(SC_ALPHA_DETAIL);
-static ShaderClass detailAlphaShader2X(SC_ALPHA_DETAIL_2X);
-
-
-/*
-#define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_ONE, \
-	ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::ALPHATEST_ENABLE, ShaderClass::CULL_MODE_DISABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-static ShaderClass detailAlphaShader(SC_ALPHA_DETAIL);
-*/
-
-/*
-#define SC_ALPHA_DETAIL ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
-	ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::ALPHATEST_ENABLE, ShaderClass::CULL_MODE_ENABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-static ShaderClass detailAlphaShader(SC_ALPHA_DETAIL);
-*/
-
-/*
-#define SC_ALPHA_MIRROR ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_DISABLE, ShaderClass::COLOR_WRITE_ENABLE, ShaderClass::SRCBLEND_SRC_ALPHA, \
-	ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-static ShaderClass mirrorAlphaShader(SC_ALPHA_DETAIL);
-
-// ShaderClass::PASS_ALWAYS, 
-
-#define SC_ALPHA_2D ( SHADE_CNST(PASS_ALWAYS, DEPTH_WRITE_DISABLE, COLOR_WRITE_ENABLE, \
-	SRCBLEND_SRC_ALPHA, DSTBLEND_ONE_MINUS_SRC_ALPHA, FOG_DISABLE, GRADIENT_DISABLE, \
-	SECONDARY_GRADIENT_DISABLE, TEXTURING_ENABLE, DETAILCOLOR_DISABLE, DETAILALPHA_DISABLE, \
-	ALPHATEST_DISABLE, CULL_MODE_ENABLE, DETAILCOLOR_DISABLE, DETAILALPHA_DISABLE) )
-ShaderClass ShaderClass::_PresetAlpha2DShader(SC_ALPHA_2D);
-*/
-//-----------------------------------------------------------------------------
-//         Private Functions                                               
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// W3DTreeBuffer::cull
-//=============================================================================
-/** Culls the trees, marking the visible flag.  If a tree becomes visible, it sets
-it's sortKey */
-//=============================================================================
-void W3DTreeBuffer::cull(const CameraClass * camera)
-{
-	Int curTree;
-
-	// Calulate the vector direction that the camera is looking at.
-	Matrix3D camera_matrix = camera->Get_Transform();
-	float zmod = -1;
-	float x = zmod * camera_matrix[0][2] ;
-	float y = zmod * camera_matrix[1][2] ;
-	float z = zmod * camera_matrix[2][2] ;
-	m_cameraLookAtVector.Set(x,y,z);
-
-	for (curTree=0; curTree<m_numTrees; curTree++) {
-		Bool doKey = false;	// We calculate the key when a tree becomes visible.
-		Bool visible = !camera->Cull_Sphere(m_trees[curTree].bounds);
-		if (visible != m_trees[curTree].visible) {
-			m_trees[curTree].visible=visible;
-			m_anythingChanged = true;
-			if (visible) {
-				doKey = true;
-			}
-		}
-		// Also calculate sort key if a tree is visible, and the view changed setting m_updateAllKeys to true.
-		if (doKey || (visible&&m_updateAllKeys)) {
-			// The sort key is essentially the distance of location in the direction of the 
-			// camera look at.
-			m_trees[curTree].sortKey = Vector3::Dot_Product(m_trees[curTree].location, m_cameraLookAtVector); 
-		}
-	}
-	m_updateAllKeys = false;
-}
-//=============================================================================
-// W3DTreeBuffer::getPartitionBucket
-//=============================================================================
-/** Returns the bucket index into m_areaPartition for a given location. */
-//=============================================================================
-Int W3DTreeBuffer::getPartitionBucket(const Coord3D &pos) const
-{
-	Real x = pos.x;
-	Real y = pos.y;
-	if (x<m_bounds.lo.x) x = m_bounds.lo.x;
-	if (y<m_bounds.lo.y) y = m_bounds.lo.y;
-	if (x>m_bounds.hi.x) x = m_bounds.hi.x;
-	if (y>m_bounds.hi.y) y = m_bounds.hi.y;
-	Int xIndex = REAL_TO_INT_FLOOR ( (x/(m_bounds.hi.x-m_bounds.lo.x)) * (PARTITION_WIDTH_HEIGHT-0.1f) );
-	Int yIndex = REAL_TO_INT_FLOOR ( (y/(m_bounds.hi.y-m_bounds.lo.y)) * (PARTITION_WIDTH_HEIGHT-0.1f) );
-	DEBUG_ASSERTCRASH(xIndex>=0 && yIndex>=0 && xIndex<PARTITION_WIDTH_HEIGHT && yIndex<PARTITION_WIDTH_HEIGHT, ("Invalid range."));
-	return yIndex*PARTITION_WIDTH_HEIGHT + xIndex;
-}
-
-//=============================================================================
-// W3DTreeBuffer::cull
-//=============================================================================
-/** Culls the trees, marking the visible flag.  If a tree becomes visible, it sets
-it's sortKey */
-//=============================================================================
-void W3DTreeBuffer::updateSway(const BreezeInfo& info)
-{
-	Int i;
-	for	(i=0; i<NUM_SWAY_ENTRIES; i++) {
-		Real factor = Cos(i*2.0f*PI/(NUM_SWAY_ENTRIES+1.0f));
-		Real angle = info.m_lean + (info.m_intensity  * factor);
-		Real S = Sin(angle);
-		Real C = Cos(angle);
-		m_swayOffsets[i].X = info.m_directionVec.x * S;
-		m_swayOffsets[i].Y = info.m_directionVec.y * S;
-		m_swayOffsets[i].Z = C - 1.0f;
-	}
-	
-	Real delta				= info.m_randomness * 0.5f;
-	for	(i=0; i<m_numTrees; i++) {
-		m_trees[i].swayType = 1+GameClientRandomValue(0, MAX_SWAY_TYPES-1);
-	}
-	for (i=0; i<MAX_SWAY_TYPES; i++) {
-		m_curSwayStep[i] = NUM_SWAY_ENTRIES / (Real)info.m_breezePeriod;
-		m_curSwayStep[i]	*= GameClientRandomValueReal(1.0f-delta, 1.0f+delta);
-		if (m_curSwayStep[i]<0.0f) {
-			m_curSwayStep[i] = 0.0f;
-		}
-		m_curSwayOffset[i] = 0;
-		m_curSwayFactor[i] = GameClientRandomValueReal(1.0f-delta, 1.0f+delta);
-	}	
-	m_curSwayVersion = info.m_breezeVersion;
-}
-
-#if 0 // sort is not used, and messes up the order jba. [6/6/2003]
-//=============================================================================
-// W3DTreeBuffer::sort
-//=============================================================================
-/** Sorts the trees.  Does num_iterations of a bubble sort.  This is good because
-it ends immediately if the trees are already sorted (which is most of the time)
-and will perform a fixed amount of work each frame until it becomes sorted. */
-//=============================================================================
-void W3DTreeBuffer::sort(Int numIterations)
-{
-	// sort in descending order.
-	Int iter;
-	Bool swap = false;
-	for (iter = 0; iter<numIterations; iter++) {
-		Int cur = 0;
-		// Note - only sorts the visible trees.
-		while (cur<m_numTrees-iter && !m_trees[cur].visible) {
-			cur++;
-		}
-		Int i;
-		for (i=cur+1; i<m_numTrees-iter; i++) {
-			if (m_trees[i].visible) {
-				if (m_trees[cur].sortKey > m_trees[i].sortKey) {
-					TTree tmp = m_trees[cur];
-					m_trees[cur] = m_trees[i];
-					m_trees[i] = tmp;
-					swap = true;
-				}
-				cur = i;
-			}
-		}
-		if (!swap) {
-			return;
-		}
-		m_anythingChanged = true;
-	}
-}
-#endif 
-
-/********** GDIFileStream2 class ****************************/
-class GDIFileStream2 : public InputStream
-{
-protected:
-	File* m_file;
-public:
-	GDIFileStream2():m_file(NULL) {};
-	GDIFileStream2(File* pFile):m_file(pFile) {};
-	virtual Int read(void *pData, Int numBytes) {
-		return(m_file?m_file->read(pData, numBytes):0);
-	};
-};
-
-//=============================================================================
-// W3DTreeBuffer::updateTexture
-//=============================================================================
-/** Creates a new texture. */
-//=============================================================================
-void W3DTreeBuffer::updateTexture(void)
-{
-	
-	const Int MAX_TEX_WIDTH = 2048;
-
-	Int i, j;
-	Int maxHeight = 0;
-	const Int maxTilesPerRow = MAX_TEX_WIDTH/(TILE_PIXEL_EXTENT);
-
-	REF_PTR_RELEASE(m_treeTexture);
-
-	Bool availableGrid[maxTilesPerRow][maxTilesPerRow];
-	Int row, column;
-	for (row=0; row<maxTilesPerRow; row++) {
-		for (column=0; column<maxTilesPerRow; column++) {
-			availableGrid[row][column] = true;
-		}
-	}
-
-	for (i=0; i<m_numTiles; i++) {
-		REF_PTR_RELEASE (m_sourceTiles[i]);
-	}
-	m_numTiles = 0;
-	File *theFile = NULL;
-	for (i=0; i<m_numTreeTypes; i++) {
-		char texturePath[ _MAX_PATH ];
-		m_treeTypes[i].m_numTiles = 0;
-		sprintf( texturePath, "%s%s", TERRAIN_TGA_DIR_PATH, m_treeTypes[i].m_data->m_textureName.str() );
-		theFile = TheFileSystem->openFile( texturePath, File::READ|File::BINARY);
-		if (theFile==NULL) {
-			sprintf( texturePath, "%s%s", TGA_DIR_PATH, m_treeTypes[i].m_data->m_textureName.str() );
-			theFile = TheFileSystem->openFile( texturePath, File::READ|File::BINARY);
-		}
-		if (theFile != NULL) {
-			GDIFileStream2 theStream(theFile);
-			InputStream *pStr = &theStream;
-			Bool halfTile;
-			Int numTiles = WorldHeightMap::countTiles(pStr, &halfTile);
-			Int width;
-			for (width = 10; width >= 1; width--) {
-				if (numTiles >= width*width) {
-					numTiles = width*width;
-					break;
-				}
-			}
-			Bool texFound = false;
-			for	(j=0; j<i; j++) {
-				if (m_treeTypes[j].m_data->m_textureName.compareNoCase(m_treeTypes[i].m_data->m_textureName)==0) {					
-					m_treeTypes[i].m_firstTile = 0;
-					m_treeTypes[i].m_tileWidth = width;
-					m_treeTypes[i].m_numTiles = 0;
-					texFound = true;
-					break;
-				}
-			}
-			if (texFound) {
-				theFile->close();
-				continue;
-			}
-			if (m_numTiles+numTiles<=MAX_TILES) {
-				theFile->seek(0, File::START);
-				m_treeTypes[i].m_firstTile = m_numTiles;
-				m_treeTypes[i].m_tileWidth = width;
-				m_treeTypes[i].m_numTiles = numTiles;
-				m_treeTypes[i].m_halfTile = halfTile;
-				WorldHeightMap::readTiles(pStr, m_sourceTiles+m_treeTypes[i].m_firstTile, width);	
-				m_numTiles += numTiles;
-			} else {
-				m_treeTypes[i].m_firstTile = 0;
-				m_treeTypes[i].m_tileWidth = 0;
-				m_treeTypes[i].m_numTiles = 0;
-			}
-			theFile->close();
-		} else {
-			DEBUG_CRASH(("Could not find texture %s\n", m_treeTypes[i].m_data->m_textureName.str()));
-			m_treeTypes[i].m_firstTile = 0;
-			m_treeTypes[i].m_tileWidth = 0;
-			m_treeTypes[i].m_numTiles = 0;
-		}
-	}
-
-	Int tmpWidth = 8;
-	while (tmpWidth*tmpWidth<m_numTiles) {
-		tmpWidth*=2;
-	}
-	Int tilesPerRow = tmpWidth;
-	m_textureWidth = tmpWidth*TILE_PIXEL_EXTENT;
-	
-	if (m_textureWidth>MAX_TEX_WIDTH) {
-		m_textureWidth = 64;
-		m_textureHeight = 64;
-		if (m_treeTexture==NULL) {
-			m_treeTexture = new TextureClass("missing.tga");
-		}
-		DEBUG_CRASH(("Too many trees in a scene."));
-		return;
-	}
-
-	for (i=0; i<m_numTiles; i++) {
-		if (m_sourceTiles[i]) {
-			m_sourceTiles[i]->m_tileLocationInTexture.x = -1;
-			m_sourceTiles[i]->m_tileLocationInTexture.y = -1;
-		}
-	}	 
-
-	/* put the tree tiles into the texture */
-	Int texClass;
-	Int tileWidth;
-	for (tileWidth = tilesPerRow; tileWidth>0; tileWidth--) {
-		for (texClass=0; texClass<m_numTreeTypes; texClass++) {
-			Int width = m_treeTypes[texClass].m_tileWidth;
-			if (width != tileWidth) continue;
-			Bool texFound = false;
-			for	(i=0; i<texClass; i++) {
-				if (m_treeTypes[i].m_data->m_textureName.compareNoCase(m_treeTypes[texClass].m_data->m_textureName)==0) {					
-					m_treeTypes[texClass].m_textureOrigin.x = m_treeTypes[i].m_textureOrigin.x;
-					m_treeTypes[texClass].m_textureOrigin.y = m_treeTypes[i].m_textureOrigin.y;
-					texFound = true;
-					break;
-				}
-			}
-			if (texFound) {
-				continue;
-			}
-
-			// Find an available block of space.
-			Bool found = false;
-			for (row=0; row<(tilesPerRow-width)+1 && !found; row++) {
-				for (column=0; column<(tilesPerRow-width)+1 && !found; column++) {
-					if (availableGrid[row][column]) {
-						Bool open = true;
-						for (i=0; i<width && open; i++) {
-							for (j=0; j<width&&open; j++) {
-								if (!availableGrid[row+j][column+i]) {
-									open = false;
-								}
-							}
-						}
-						if (open) found = true;
-						break;
-					}
-				}
-				if (found) break;
-			}
-			if (!found) {
-				m_treeTypes[texClass].m_textureOrigin.x = 0;
-				m_treeTypes[texClass].m_textureOrigin.y = 0;
-				continue;
-			}
-
-			Int xOrigin = column*(TILE_PIXEL_EXTENT);
-			Int yOrigin = row*(TILE_PIXEL_EXTENT);
-			m_treeTypes[texClass].m_textureOrigin.x = xOrigin;
-			m_treeTypes[texClass].m_textureOrigin.y = yOrigin;
-			Int classHeight = yOrigin + width*TILE_PIXEL_EXTENT;
-			if (maxHeight < classHeight) maxHeight = classHeight;
-
-			for (i=0; i<width; i++) {
-				for (j=0; j<width; j++) {
-					availableGrid[row+j][column+i] = false;
-					Int baseNdx = m_treeTypes[texClass].m_firstTile + i + j*width;
-					Int x = xOrigin + i*TILE_PIXEL_EXTENT;
-					Int y = yOrigin + ((width-j)-1)*TILE_PIXEL_EXTENT;
-					m_sourceTiles[baseNdx]->m_tileLocationInTexture.x = x;
-					m_sourceTiles[baseNdx]->m_tileLocationInTexture.y = y;
-				}
-			}
-		}
-	}
-	DEBUG_ASSERTCRASH(maxHeight<=m_textureWidth, ("Bad max height."));
-	W3DTreeTextureClass *tex = new W3DTreeTextureClass((DWORD)m_textureWidth, (DWORD)m_textureWidth);
-	m_textureHeight = tex->update(this);
-
-	m_treeTexture = tex;
-	
-	for (i=0; i<m_numTiles; i++) {
-		REF_PTR_RELEASE (m_sourceTiles[i]);
-	}
-	//	m_treeTexture = NEW_REF (TextureClass, (m_treeTypes[0].m_textureName.str()));
-
-}
-
-/**Adjust the resolution of tree texture uploaded to the video card.  The system memory
-version always remains at full resolution.  Someone should probably optimize this at
-some point since it wastes a lot of system memory on low-end systems. -MW
-*/
-void W3DTreeBuffer::setTextureLOD(Int lod)
-{
-	if (m_treeTexture)
-		((W3DTreeTextureClass*)m_treeTexture)->setLOD(lod);
-}
-
-//=============================================================================
-// W3DTreeBuffer::doLighting
-//=============================================================================
-/** Calculates the diffuse lighting as affected by dynamic lighting. */
-//=============================================================================
-UnsignedInt W3DTreeBuffer::doLighting(const Vector3 *normal,  
-															const GlobalData::TerrainLighting	*objectLighting, 
-															const Vector3 *emissive, UnsignedInt vertDiffuse, Real scale) const
-{
-
-	Real shadeR, shadeG, shadeB;
-	Real shade;
-	shadeR = objectLighting[0].ambient.red+emissive->X;	//only the first light contributes to ambient
-	shadeG = objectLighting[0].ambient.green+emissive->Y;
-	shadeB = objectLighting[0].ambient.blue+emissive->Z;
-
-	Int i;
-	for	(i=0; i<MAX_GLOBAL_LIGHTS; i++) {
-		Vector3 lightDirection(objectLighting[i].lightPos.x, objectLighting[i].lightPos.y, objectLighting[i].lightPos.z);
-		lightDirection.Normalize();
-		Vector3 lightRay(-lightDirection.X, -lightDirection.Y, -lightDirection.Z);
-		shade = Vector3::Dot_Product(lightRay, *normal); 
-
-		if (shade > 1.0) shade = 1.0;
-		if(shade < 0.0f) shade = 0.0f;
-		shadeR += shade*objectLighting[i].diffuse.red;
-		shadeG += shade*objectLighting[i].diffuse.green;
-		shadeB += shade*objectLighting[i].diffuse.blue;	
-	}
-
-	shadeR *= scale;
-	shadeG *= scale;
-	shadeB *= scale;
-	
-	if (shadeR > 1.0) shadeR = 1.0;
-	if(shadeR < 0.0f) shadeR = 0.0f;
-	if (shadeG > 1.0) shadeG = 1.0;
-	if(shadeG < 0.0f) shadeG = 0.0f;
-	if (shadeB > 1.0) shadeB = 1.0;
-	if(shadeB < 0.0f) shadeB = 0.0f;
-	
-	if (vertDiffuse!=0xFFFFFFFF) {
-		shade = vertDiffuse&0xff; //blue;
-		shadeB *= shade/255.0f;
-		shade = (vertDiffuse>>8)&0xFF; // green;
-		shadeG *= shade/255.0f;
-		shade = (vertDiffuse>>16)&0xFF; // red;
-		shadeR *= shade/255.0f;
-	}
-
-	shadeR*=255.0f;
-	shadeG*=255.0f;
-	shadeB*=255.0f;
-	const Real alpha = 255.0;
-	return REAL_TO_UNSIGNEDINT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16) | ((Int)alpha << 24);
-	
-}
-
-//=============================================================================
-// W3DTreeBuffer::loadTreesInVertexAndIndexBuffers
-//=============================================================================
-/** Loads the trees into the vertex buffer for drawing. */
-//=============================================================================
-void W3DTreeBuffer::loadTreesInVertexAndIndexBuffers(RefRenderObjListIterator *pDynamicLightsIterator)
-{
-	if (!m_indexTree[0] || !m_vertexTree[0] || !m_initialized) {
-		return;
-	}
-	if (!m_anythingChanged) {
-		return;
-	}
-
-	if (m_shadow == NULL && TheW3DProjectedShadowManager) {
-		Shadow::ShadowTypeInfo shadowInfo;
-		shadowInfo.m_ShadowName[0] = 0;
-		shadowInfo.allowUpdates=FALSE;	//shadow image will never update
-		shadowInfo.allowWorldAlign=TRUE;	//shadow image will wrap around world objects
-		shadowInfo.m_type = (ShadowType)SHADOW_DECAL;
-		shadowInfo.m_sizeX=20;
-		shadowInfo.m_sizeY=20;
-		shadowInfo.m_offsetX=0;
-		shadowInfo.m_offsetY=0;
-		m_shadow = TheW3DProjectedShadowManager->createDecalShadow(&shadowInfo);
-	}
-	
-	m_anythingChanged = false;
-	Int curTree=0;
-	Int bNdx;
-	const GlobalData::TerrainLighting *objectLighting = TheGlobalData->m_terrainObjectsLighting[TheGlobalData->m_timeOfDay];
-	for (bNdx=0; bNdx<MAX_BUFFERS; bNdx++) {
-		m_curNumTreeVertices[bNdx] = 0;
-		m_curNumTreeIndices[bNdx] = 0;
-		if (curTree >= m_numTrees) {
-			break;
-		}
-		VertexFormatXYZNDUV1 *vb;
-		UnsignedShort *ib;
-		// Lock the buffers.
-	#ifdef USE_STATIC
-		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexTree[bNdx], 0);
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexTree[bNdx], 0);
-	#else 
-		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexTree[bNdx], D3DLOCK_DISCARD);
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexTree[bNdx], D3DLOCK_DISCARD);
-	#endif
-		vb=(VertexFormatXYZNDUV1*)lockVtxBuffer.Get_Vertex_Array();
-		ib = lockIdxBuffer.Get_Index_Array();
-		// Add to the index buffer & vertex buffer.
-		Vector2 lookAtVector(m_cameraLookAtVector.X, m_cameraLookAtVector.Y);
-		lookAtVector.Normalize();
-		// We draw from back to front, so we put the indexes in the buffer 
-		// from back to front.
-		UnsignedShort *curIb = ib;
-
-		VertexFormatXYZNDUV1 *curVb = vb;
-
-
-
-		
-		for ( ;curTree<m_numTrees;curTree++) {
-			Int type = m_trees[curTree].treeType;
-			if (type<0) {
-				continue; // Deleted tree. [6/9/2003]
-			}
-			if (!m_trees[curTree].visible) continue;
-			Real scale = m_trees[curTree].scale;
-			Vector3 loc = m_trees[curTree].location;
-			Real theSin = m_trees[curTree].sin;
-			Real theCos = m_trees[curTree].cos;
-			if (type<0 || m_treeTypes[type].m_mesh == 0) {
-				continue;
-			}
-
-			Bool doVertexLighting = true;
-
-	#if 0 // no dynamic lighting.
-			for (pDynamicLightsIterator->First(); !pDynamicLightsIterator->Is_Done(); pDynamicLightsIterator->Next())
-			{		
-				W3DDynamicLight *pLight = (W3DDynamicLight*)pDynamicLightsIterator->Peek_Obj();
-				if (!pLight->isEnabled()) {
-					continue; // he is turned off.
-				}
-				if (CollisionMath::Overlap_Test(m_trees[curTree].bounds, pLight->Get_Bounding_Sphere()) == CollisionMath::OUTSIDE) {
-					continue; // this tree is outside of the light's influence.
-				}
-				doVertexLighting = true;
-			}
-	#endif
-			Vector3 emissive(0.0f,0.0f,0.0f);
-			MaterialInfoClass * matInfo = m_treeTypes[type].m_mesh->Get_Material_Info();
-			if (matInfo) {
-				VertexMaterialClass *vertMat = matInfo->Peek_Vertex_Material(0);
-				if (vertMat) {
-					vertMat->Get_Emissive(&emissive);
-				}
-			}
-			REF_PTR_RELEASE(matInfo);
-
-
-			Int startVertex = m_curNumTreeVertices[bNdx];
-			m_trees[curTree].firstIndex = startVertex;
-			m_trees[curTree].bufferNdx = bNdx;
-			Int i;
-			Int numVertex = m_treeTypes[type].m_mesh->Peek_Model()->Get_Vertex_Count();
-			Vector3 *pVert = m_treeTypes[type].m_mesh->Peek_Model()->Get_Vertex_Array();
-
-
-
-			// If we happen to have too many trees, stop.
-			if (m_curNumTreeVertices[bNdx]+numVertex+2>= MAX_TREE_VERTEX) {
-				break;
-			}
-			Int numIndex = m_treeTypes[type].m_mesh->Peek_Model()->Get_Polygon_Count();
-			const TriIndex *pPoly = m_treeTypes[type].m_mesh->Peek_Model()->Get_Polygon_Array();
-			if (m_curNumTreeIndices[bNdx]+3*numIndex+6 >= MAX_TREE_INDEX) {
-				break;
-			}
-
-			const Vector2*uvs=m_treeTypes[type].m_mesh->Peek_Model()->Get_UV_Array_By_Index(0);
-			
-			const Vector3*normals = m_treeTypes[type].m_mesh->Peek_Model()->Get_Vertex_Normal_Array();
-			const unsigned *vecDiffuse = m_treeTypes[type].m_mesh->Peek_Model()->Get_Color_Array(0, false);
-
-			Int diffuse = 0;
-			if (normals == NULL) {
-				doVertexLighting = false;
-				Vector3 normal(0.0f,0.0f,1.0f);
-				diffuse = doLighting(&normal, objectLighting, &emissive, 0xFFFFFFFF, 1.0f);
-			}
-	/*
-	 *	
-			// If we are doing reduced resolution terrain, do reduced
-			// poly trees.
-			Bool doPanel = (TheGlobalData->m_useHalfHeightMap || TheGlobalData->m_stretchTerrain);
-
-			if (doPanel) {
-				if (m_trees[curTree].rotates) {
-					theSin = -lookAtVector.X;
-					theCos = lookAtVector.Y;
-				}
-				// panel start is index offset, there are 3 index per triangle.
-				if (m_trees[curTree].panelStart/3 + 2 > numIndex) {
-					continue; // not enought polygons for the offset.  jba.
-				}
-				for (j=0; j<6; j++) {
-					i = ((Int *)pPoly)[j+m_trees[curTree].panelStart];
-					if (m_curNumTreeVertices >= MAX_TREE_VERTEX) 
-						break;
-
-					// Update the uv values.  The W3D models each have their own texture, and 
-					// we use one texture with all images in one, so we have to change the uvs to 
-					// match.
-					Real U, V;
-					if (type==SHRUB) {
-						// shrub texture is tucked in the corner
-						U = ((512-64)+uvs[i].U*64.0f)/512.0f;
-						V = ((256-64)+uvs[i].V*64.0f)/256.0f;
-					} else if (type==FENCE) {
-						U = uvs[i].U*0.5f; 
-						V = 1.0f + uvs[i].V;		
-					} else {
-						U = typeOffset+uvs[i].U*0.5f; 
-						V = uvs[i].V;		
-					}
-
-					curVb->u1 = U;
-					curVb->v1 = V/2.0;
-					Vector3 vLoc;
-					vLoc.X = pVert[i].X*scale*theCos - pVert[i].Y*scale*theSin;
-					vLoc.Y = pVert[i].Y*scale*theCos + pVert[i].X*scale*theSin;
-
-					vLoc.X += loc.X;
-					vLoc.Y += loc.Y;
-					vLoc.Z = loc.Z + pVert[i].Z*scale; 
-
-					curVb->x = vLoc.X;
-					curVb->y = vLoc.Y;
-					curVb->z = vLoc.Z;	 
-					if (doVertexLighting) {
-						curVb->diffuse = doLighting(&vLoc, shadeR, shadeG, shadeB, m_trees[curTree].bounds, pDynamicLightsIterator);
-					} else {
-						curVb->diffuse = diffuse;
-					}
-					curVb++;
-					m_curNumTreeVertices++;
-				}
-
-				for (i=0; i<6; i++) {
-					if (m_curNumTreeIndices+4 > MAX_TREE_INDEX) 
-						break;
-					curIb--;
-					*curIb = startVertex + i;
-					m_curNumTreeIndices++;
-				}
-			} else {
-	 */
-			Real Uscale = m_treeTypes[type].m_tileWidth * (Real)TILE_PIXEL_EXTENT / (Real)m_textureWidth;
-			Real Vscale = m_treeTypes[type].m_tileWidth * (Real)TILE_PIXEL_EXTENT / (Real)m_textureHeight;
-			Real UOffset = m_treeTypes[type].m_textureOrigin.x/(Real)m_textureWidth; 
-			Real VOffset = m_treeTypes[type].m_textureOrigin.y/(Real)m_textureHeight; 
-			if (m_treeTypes[type].m_halfTile) {
-				Uscale *= 0.5f;
-				Vscale *= 0.5f;
-				VOffset += (TILE_PIXEL_EXTENT/2) / (Real)m_textureHeight;
-			}
-			for (i=0; i<numVertex; i++) {
-				if (m_curNumTreeVertices[bNdx] >= MAX_TREE_VERTEX) 
-					break;
-
-				// Update the uv values.  The W3D models each have their own texture, and 
-				// we use one texture with all images in one, so we have to change the uvs to 
-				// match.
-				Real U, V;
-				U = uvs[i].U; 
-				V = uvs[i].V;	
-				
-				if (U>1.0f) U=1.0f;
-				if (U<0.0f) U=0.0f;
-				if (V>1.0f) V=1.0f;
-				if (V<0.0f) V=0.0f;
-
-				curVb->u1 = U*Uscale + UOffset;
-				curVb->v1 = V*Vscale + VOffset;
-				Real x = pVert[i].X;
-				Real y = pVert[i].Y;
-
-				
-				Vector3 vLoc;
-				x += m_treeTypes[type].m_offset.X;
-				y += m_treeTypes[type].m_offset.Y;
-				vLoc.X = x*scale*theCos - y*scale*theSin;
-				vLoc.Y = y*scale*theCos + x*scale*theSin;
-				vLoc.Z = pVert[i].Z*scale; 
-				vLoc.Z += m_treeTypes[type].m_offset.Z;
-
-				if (m_trees[curTree].m_toppleState != TOPPLE_UPRIGHT) {
-					Matrix3D::Transform_Vector(m_trees[curTree].m_mtx, vLoc, &vLoc);
-				} else {
-					if (m_trees[curTree].pushAside>0.0f) {
-						vLoc.X += pVert[i].Z * m_trees[curTree].pushAside * m_trees[curTree].pushAsideCos * m_treeTypes[type].m_data->m_maxOutwardMovement;
-						vLoc.Y += pVert[i].Z * m_trees[curTree].pushAside * m_trees[curTree].pushAsideSin* m_treeTypes[type].m_data->m_maxOutwardMovement;
-					}
-					vLoc.X += loc.X;
-					vLoc.Y += loc.Y;
-					vLoc.Z += loc.Z;
-				}
-
-
-				curVb->x = vLoc.X;
-				curVb->y = vLoc.Y;
-				curVb->z = vLoc.Z;
-				curVb->nx = m_trees[curTree].swayType;
-				curVb->ny = 1.0f - m_treeTypes[type].m_data->m_darkening*m_trees[curTree].pushAside;
-				curVb->nz = loc.Z;
-				if (doVertexLighting) {
-					Vector3 normal(0.0f, 0.0f, 1.0f);
-					if (normals) {
-						normal.X = normals[i].X*theCos - normals[i].Y*theSin;
-						normal.Y = normals[i].Y*theCos + normals[i].X*theSin;
-						normal.Z = normals[i].Z;
-					}
-					UnsignedInt vertexDiffuse;
-					if (vecDiffuse) {
-						vertexDiffuse = vecDiffuse[i];
-					} else {
-						vertexDiffuse = 0xffffffff;
-					}
-					curVb->diffuse = doLighting(&normal, objectLighting, &emissive, 
-														vertexDiffuse, 1.0f);
-				} else {
-					curVb->diffuse = diffuse;
-				}
-				curVb++;
-				m_curNumTreeVertices[bNdx]++;
-			}
-
-			for (i=0; i<numIndex; i++) {
-				if (m_curNumTreeIndices[bNdx]+4 > MAX_TREE_INDEX) 
-					break;
-				*curIb++ = startVertex + pPoly[i].I;
-				*curIb++ = startVertex + pPoly[i].J;
-				*curIb++ = startVertex + pPoly[i].K;
-				m_curNumTreeIndices[bNdx]+=3;
-			}
-		}		
-	}
-
-}
-//=============================================================================
-// W3DTreeBuffer::updateVertexBuffer
-//=============================================================================
-/** Updates the push aside offset in vertex buffer. */
-//=============================================================================
-void W3DTreeBuffer::updateVertexBuffer(void)
-{
-	if (!m_indexTree[0] || !m_vertexTree[0] || !m_initialized) {
-		return;
-	}
-	Int bNdx;
-	for	(bNdx = 0; bNdx<MAX_BUFFERS; bNdx++) {
-		if (m_curNumTreeIndices[bNdx]==0) {
-			break;
-		}
-		VertexFormatXYZNDUV1 *vb;
-		// Lock the buffers.
-	#ifdef USE_STATIC
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexTree[bNdx], 0);
-	#else 
-		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexTree[bNdx], D3DLOCK_DISCARD);
-	#endif
-		vb=(VertexFormatXYZNDUV1*)lockVtxBuffer.Get_Vertex_Array();
-
-		VertexFormatXYZNDUV1 *curVb;
-
-		Int curTree;
-		for (curTree=0; curTree<m_numTrees; curTree++) {
-			if (m_trees[curTree].bufferNdx!=bNdx) {
-				continue;
-			}
-			Int type = m_trees[curTree].treeType;
-			if (type<0) {
-				continue; // Deleted tree. [6/9/2003]
-			}
-			if (m_trees[curTree].pushAsideDelta==0.0f && m_trees[curTree].m_toppleState == TOPPLE_UPRIGHT) {
-				continue; // not toppling or pushed, no need to update. jba [7/11/2003]
-			}
-			m_anyPushChanged = true;
-			if (!m_trees[curTree].visible) continue;
-			Real scale = m_trees[curTree].scale;
-			Vector3 loc = m_trees[curTree].location;
-			Real theSin = m_trees[curTree].sin;
-			Real theCos = m_trees[curTree].cos;
-			if (type<0 || m_treeTypes[type].m_mesh == 0) {
-				type = 0;
-			}
-
-			Int startVertex = m_trees[curTree].firstIndex;
-			curVb = vb+startVertex;
-			Int i;
-			Int numVertex = m_treeTypes[type].m_mesh->Peek_Model()->Get_Vertex_Count();
-			Vector3 *pVert = m_treeTypes[type].m_mesh->Peek_Model()->Get_Vertex_Array();
-
-			for (i=0; i<numVertex; i++) {
-				Real x = pVert[i].X;
-				Real y = pVert[i].Y;
-
-				
-				Vector3 vLoc;
-				x += m_treeTypes[type].m_offset.X;
-				y += m_treeTypes[type].m_offset.Y;
-				vLoc.X = x*scale*theCos - y*scale*theSin;
-				vLoc.Y = y*scale*theCos + x*scale*theSin;
-				vLoc.Z = pVert[i].Z*scale; 
-				vLoc.Z += m_treeTypes[type].m_offset.Z;
-
-				if (m_trees[curTree].m_toppleState != TOPPLE_UPRIGHT) {
-					m_trees[curTree].m_mtx.Transform_Vector(m_trees[curTree].m_mtx, vLoc, &vLoc);
-				} else {
-					if (m_trees[curTree].pushAside>0.0f) {
-						vLoc.X += pVert[i].Z * m_trees[curTree].pushAside * m_trees[curTree].pushAsideCos * m_treeTypes[type].m_data->m_maxOutwardMovement;
-						vLoc.Y += pVert[i].Z * m_trees[curTree].pushAside * m_trees[curTree].pushAsideSin* m_treeTypes[type].m_data->m_maxOutwardMovement;
-					}
-					vLoc.X += loc.X;
-					vLoc.Y += loc.Y;
-					vLoc.Z += loc.Z;
-				}
-
-				curVb->x = vLoc.X;
-				curVb->y = vLoc.Y;
-				curVb->z = vLoc.Z;
-				curVb->ny = 1.0f - m_treeTypes[type].m_data->m_darkening*m_trees[curTree].pushAside;
-				curVb++;
-			}
-		}		
-	}
-}
-
-//-----------------------------------------------------------------------------
-//         Public Functions                                                
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// W3DTreeBuffer::~W3DTreeBuffer
-//=============================================================================
-/** Destructor. Releases w3d assets. */
-//=============================================================================
-W3DTreeBuffer::~W3DTreeBuffer(void)
-{
-	freeTreeBuffers();
-	REF_PTR_RELEASE(m_treeTexture);
-	Int i;
-	for (i=0; i<MAX_TYPES; i++) {
-		REF_PTR_RELEASE(m_treeTypes[i].m_mesh);
-	}
-	if (m_shadow) {
-		delete m_shadow;
-		m_shadow = NULL;
-	}
-}
-
-//=============================================================================
-// W3DTreeBuffer::W3DTreeBuffer
-//=============================================================================
-/** Constructor. Sets m_initialized to true if it finds the w3d models it needs
-for the trees. */
-//=============================================================================
-W3DTreeBuffer::W3DTreeBuffer(void)
-{
-	memset(this, sizeof(W3DTreeBuffer), 0);
-	m_initialized = false;
-	Int i;
-	for	(i=0; i<MAX_BUFFERS; i++) {
-		m_vertexTree[i] = NULL;
-		m_indexTree[i] = NULL;
-		m_curNumTreeVertices[i]=0;
-		m_curNumTreeIndices[i]=0;
-	}
-	m_treeTexture = NULL;
-	m_dwTreeVertexShader = 0;
-	m_dwTreePixelShader = 0;
-	clearAllTrees();
-	allocateTreeBuffers();
-	m_initialized = true;
-	m_curSwayVersion = -1;
-
-	m_shadow = NULL;
-
-}
-
-
-//=============================================================================
-// W3DTreeBuffer::freeTreeBuffers
-//=============================================================================
-/** Frees the index and vertex buffers. */
-//=============================================================================
-void W3DTreeBuffer::freeTreeBuffers(void)
-{
-	Int i;
-	for	(i=0; i<MAX_BUFFERS; i++) {
-		REF_PTR_RELEASE(m_vertexTree[i]);
-		REF_PTR_RELEASE(m_indexTree[i]);
-	}
-	
-	if (m_dwTreePixelShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwTreePixelShader);
-	m_dwTreePixelShader = 0;
-
-	if (m_dwTreeVertexShader)
-		DX8Wrapper::_Get_D3D_Device8()->DeleteVertexShader(m_dwTreeVertexShader);
-	m_dwTreeVertexShader = 0;
-}
-
-//=============================================================================
-// W3DTreeBuffer::unitMoved
-//=============================================================================
-/** Check to see if a unit collided with a tree/grass/bush. */
-//=============================================================================
-void W3DTreeBuffer::unitMoved(Object *unit)
-{
-	if (unit->isKindOf(KINDOF_IMMOBILE)) {
-		// This is the initial positioning of the object, and we don't care. jba. [6/5/2003]
-		return;
-	}
-	Real radius = unit->getGeometryInfo().getMajorRadius();
-	if (unit->getGeometryInfo().getGeomType()==GEOMETRY_BOX) {
-		if (radius>unit->getGeometryInfo().getMinorRadius()) {
-			radius = unit->getGeometryInfo().getMinorRadius();
-		}
-	}
-	// Value to assume for the tree radius.
-#define TREE_RADIUS_APPROX 7.0f
-	radius += TREE_RADIUS_APPROX;
-
-	Coord3D pos = *unit->getPosition();
-	Real x = pos.x-radius;
-	Real y = pos.y-radius;
-	if (x<m_bounds.lo.x) x = m_bounds.lo.x;
-	if (y<m_bounds.lo.y) y = m_bounds.lo.y;
-	if (x>m_bounds.hi.x) x = m_bounds.hi.x;
-	if (y>m_bounds.hi.y) y = m_bounds.hi.y;
-	Int xIndex = REAL_TO_INT_FLOOR ( (x/(m_bounds.hi.x-m_bounds.lo.x)) * (PARTITION_WIDTH_HEIGHT-0.1f) );
-	Int yIndex = REAL_TO_INT_FLOOR ( (y/(m_bounds.hi.y-m_bounds.lo.y)) * (PARTITION_WIDTH_HEIGHT-0.1f) );
-	DEBUG_ASSERTCRASH(xIndex>=0 && yIndex>=0 && xIndex<PARTITION_WIDTH_HEIGHT && yIndex<PARTITION_WIDTH_HEIGHT, ("Invalid range."));
-
-	x = pos.x+radius;
-	y = pos.y+radius;
-	if (x<m_bounds.lo.x) x = m_bounds.lo.x;
-	if (y<m_bounds.lo.y) y = m_bounds.lo.y;
-	if (x>m_bounds.hi.x) x = m_bounds.hi.x;
-	if (y>m_bounds.hi.y) y = m_bounds.hi.y;
-	Int xMax = REAL_TO_INT_CEIL ( (x/(m_bounds.hi.x-m_bounds.lo.x)) * (PARTITION_WIDTH_HEIGHT-0.1f) );
-	Int yMax = REAL_TO_INT_CEIL ( (y/(m_bounds.hi.y-m_bounds.lo.y)) * (PARTITION_WIDTH_HEIGHT-0.1f) );
-	DEBUG_ASSERTCRASH(xMax>=0 && yMax>=0 && xMax<=PARTITION_WIDTH_HEIGHT && yMax<=PARTITION_WIDTH_HEIGHT, ("Invalid range."));
-	Int i, j;
-	for (i=xIndex; i<xMax; i++) {
-		for (j=yIndex; j<yMax; j++) {
-			Int treeNdx = m_areaPartition[i + PARTITION_WIDTH_HEIGHT*j];
-			while (treeNdx != END_OF_PARTITION) {
-				// paranoia [7/7/2003]
-				if (treeNdx<0 || treeNdx>=m_numTrees) {
-					DEBUG_CRASH(("Invalid index."));
-					break;
-				}
-				if (m_trees[treeNdx].treeType<0) {
-					treeNdx = m_trees[treeNdx].nextInPartition;
-					continue;	//  Tree is deleted. [7/11/2003]
-				}
-				Coord3D delta;
-				delta.set(m_trees[treeNdx].location.X, m_trees[treeNdx].location.Y, m_trees[treeNdx].location.Z );
-				delta.sub(&pos);
-				if (radius*radius>delta.lengthSqr()) {
-					bool canTopple = unit->getCrusherLevel() > 1;
-					if (canTopple && m_treeTypes[m_trees[treeNdx].treeType].m_data->m_doTopple) {
-						// Give a vector with direction to thing.
-						Coord3D toppleVector;
-						toppleVector.set(m_trees[treeNdx].location.X, m_trees[treeNdx].location.Y, 0);
-						toppleVector.x -= unit->getPosition()->x;
-						toppleVector.y -= unit->getPosition()->y;
-						applyTopplingForce(m_trees+treeNdx, &toppleVector, 0, W3D_TOPPLE_OPTIONS_NONE);
-					} else if (m_treeTypes[m_trees[treeNdx].treeType].m_data->m_framesToMoveOutward>1) {
-						pushAsideTree(m_trees[treeNdx].drawableID, &pos, unit->getUnitDirectionVector2D(), unit->getID());
-					}
-				}
-				treeNdx = m_trees[treeNdx].nextInPartition;
-			}
-		}
-	}
-
-
-}
-
-//=============================================================================
-// W3DTreeBuffer::allocateTreeBuffers
-//=============================================================================
-/** Allocates the index and vertex buffers. */
-//=============================================================================
-void W3DTreeBuffer::allocateTreeBuffers(void)
-{
-	Int i;
-	for	(i=0; i<MAX_BUFFERS; i++) {
-	#ifdef USE_STATIC
-		m_vertexTree[i]=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZNDUV1,MAX_TREE_VERTEX+4,DX8VertexBufferClass::USAGE_DEFAULT));
-		m_indexTree[i]=NEW_REF(DX8IndexBufferClass,(MAX_TREE_INDEX+4, DX8IndexBufferClass::USAGE_DEFAULT));
-	#else
-		m_vertexTree[i]=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZNDUV1,MAX_TREE_VERTEX+4,DX8VertexBufferClass::USAGE_DYNAMIC));
-		m_indexTree[i]=NEW_REF(DX8IndexBufferClass,(MAX_TREE_INDEX+4, DX8IndexBufferClass::USAGE_DYNAMIC));
-	#endif
-		m_curNumTreeVertices[i]=0;
-		m_curNumTreeIndices[i]=0;
-	}
-
-		//shader decleration
-	// DX8_FVF_XYZNDUV1
-	DWORD Declaration[] =
-	{
-		D3DVSD_STREAM( 0 ),
-		D3DVSD_REG( 0, D3DVSDT_FLOAT3 ),  // Position
-		D3DVSD_REG( 1, D3DVSDT_FLOAT3 ),  // Normal
-		D3DVSD_REG( 2, D3DVSDT_D3DCOLOR), // Diffuse color	
-		D3DVSD_REG( 7, D3DVSDT_FLOAT2 ),  // Tex coord
-		D3DVSD_END()
-	};
-
-	HRESULT hr;
-	hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\Trees.vso", &Declaration[0], 0, true, &m_dwTreeVertexShader);
-	if (FAILED(hr))
-		return;
-
-	hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\Trees.pso", &Declaration[0], 0, false, &m_dwTreePixelShader);
-	if (FAILED(hr))
-		return;
-}
-
-//=============================================================================
-// W3DTreeBuffer::clearAllTrees
-//=============================================================================
-/** Removes all trees. */
-//=============================================================================
-void W3DTreeBuffer::clearAllTrees(void)
-{
-	m_numTrees=0;
-	m_bounds.lo.x = m_bounds.lo.y = 0;
-	m_bounds.hi.x = m_bounds.hi.y = 1;
-	REF_PTR_RELEASE(m_treeTexture);
-	m_curNumTreeIndices[0]=0;
-	m_anythingChanged = true;
-	Int i;
-	for (i=0; i<MAX_TYPES; i++) {
-		REF_PTR_RELEASE(m_treeTypes[i].m_mesh);
-	}
-	for (i=0; i<PARTITION_WIDTH_HEIGHT*PARTITION_WIDTH_HEIGHT; i++) {
-		m_areaPartition[i] = END_OF_PARTITION;
-	}
-	m_numTreeTypes = 0;
-}
-
-//=============================================================================
-// W3DTreeBuffer::removeTree
-//=============================================================================
-/** Removes a tree.  */
-//=============================================================================
-void W3DTreeBuffer::removeTree(DrawableID id)
-{
-	Int i;
-	for (i=0; i<m_numTrees; i++) {
-		if (m_trees[i].drawableID == id) {
-			m_trees[i].location = Vector3(0,0,0);
-			m_trees[i].treeType = DELETED_TREE_TYPE;
-			// Translate the bounding sphere of the model.
-			m_trees[i].bounds.Center = Vector3(0,0,0);
-			m_trees[i].bounds.Radius = 1;
-			m_anythingChanged = true;
-		}
-	}
-}
-
-//=============================================================================
-// W3DTreeBuffer::removeTree
-//=============================================================================
-/** Removes any trees that would be under a building.  */
-//=============================================================================
-void W3DTreeBuffer::removeTreesForConstruction(const Coord3D* pos, const GeometryInfo& geom, Real angle )
-{
-	// Just iterate all trees, as even non-collidable ones get removed. jba. [7/11/2003]
-	Int i;
-	for (i=0; i<m_numTrees; i++) {				// small, height,							radius,									minor radius
-		if (m_trees[i].treeType < 0) {
-			continue; // already deleted. jba [7/11/2003]
-		}
-		GeometryInfo info(GEOMETRY_CYLINDER, false, 5*TREE_RADIUS_APPROX, 2*TREE_RADIUS_APPROX, 2*TREE_RADIUS_APPROX);
-		Coord3D treePos;
-		treePos.set(m_trees[i].location.X, m_trees[i].location.Y, m_trees[i].location.Z);
-		if (ThePartitionManager->geomCollidesWithGeom( pos, geom, angle, &treePos, info, 0.0f)) {
-			// remove it [7/11/2003]
-			m_trees[i].treeType = DELETED_TREE_TYPE;
-			m_anythingChanged = true;
-		} 
-	}
-}
-
-
-//=============================================================================
-// W3DTreeBuffer::addTreeTypes
-//=============================================================================
-/** Adds a type of tree (model & texture). */
-//=============================================================================
-Int W3DTreeBuffer::addTreeType(const W3DTreeDrawModuleData *data)
-{
-	if (m_numTreeTypes>=MAX_TYPES) {
-		DEBUG_CRASH(("Too many kinds of trees in map.  Reduce kinds of trees, or raise tree limit. jba."));
-		return 0;
-	}
-	m_needToUpdateTexture = true;
-
-	m_treeTypes[m_numTreeTypes].m_mesh = NULL;
-
-	RenderObjClass *robj=WW3DAssetManager::Get_Instance()->Create_Render_Obj(data->m_modelName.str());
-
-	if (robj==NULL) {
-		DEBUG_CRASH(("Unable to find model for tree %s\n", data->m_modelName.str()));
-		return 0;
-	}
-	AABoxClass box;
-
-	robj->Get_Obj_Space_Bounding_Box(box);
-	Vector3 offset(0,0,0);
-	if (robj->Class_ID() == RenderObjClass::CLASSID_HLOD) {
-		RenderObjClass *hlod = robj;
-		robj = hlod->Get_Sub_Object(0);
-		const Matrix3D xfm = robj->Get_Bone_Transform(0);
-		xfm.Get_Translation(&offset);
-		REF_PTR_RELEASE(hlod);
-	}
-
-	if (robj->Class_ID() == RenderObjClass::CLASSID_MESH)
-		m_treeTypes[m_numTreeTypes].m_mesh = (MeshClass*)robj;
-
-	if (m_treeTypes[m_numTreeTypes].m_mesh==NULL) {
-		DEBUG_CRASH(("Tree %s is not simple mesh. Tell artist to re-export. Don't Ignore!!!\n", data->m_modelName.str()));
-		return 0;
-	}
-
-	Int numVertex = m_treeTypes[m_numTreeTypes].m_mesh->Peek_Model()->Get_Vertex_Count();
-	Vector3 *pVert = m_treeTypes[m_numTreeTypes].m_mesh->Peek_Model()->Get_Vertex_Array();
-
-	const Matrix3D xfm = m_treeTypes[m_numTreeTypes].m_mesh->Get_Transform();
-	SphereClass bounds(pVert, numVertex);
-	bounds.Center += offset;
-	m_treeTypes[m_numTreeTypes].m_bounds = bounds;
-	m_treeTypes[m_numTreeTypes].m_textureOrigin.x = 0;
-	m_treeTypes[m_numTreeTypes].m_textureOrigin.y = 0;
-	m_treeTypes[m_numTreeTypes].m_data = data;
-	m_treeTypes[m_numTreeTypes].m_offset = offset;
-	m_treeTypes[m_numTreeTypes].m_shadowSize = (box.Extent.X + box.Extent.Y); // Average extent * 2. jba.
-	m_treeTypes[m_numTreeTypes].m_doShadow = data->m_doShadow;
-	m_numTreeTypes++;
-	return m_numTreeTypes-1;
-}
-
-//=============================================================================
-// W3DTreeBuffer::addTree
-//=============================================================================
-/** Adds a tree.  Name is the W3D model name, supported models are
-ALPINE, DECIDUOUS and SHRUB. */
-//=============================================================================
-void W3DTreeBuffer::addTree(DrawableID id, Coord3D location, Real scale, Real angle,
-								Real randomScaleAmount, const W3DTreeDrawModuleData *data)
-{
-	if (m_numTrees >= MAX_TREES) {
-		return;  
-	}
-	if (!m_initialized) {
-		return;  
-	}
-	Int treeType = DELETED_TREE_TYPE;
-	Int i;
-	for (i=0; i<m_numTreeTypes; i++) {
-		if (m_treeTypes[i].m_data->m_modelName.compareNoCase(data->m_modelName)==0 && 
-				m_treeTypes[i].m_data->m_textureName.compareNoCase(data->m_textureName)==0) {
-			treeType = i;
-			break;
-		}
-	}
-	if (treeType<0) {
-		treeType = addTreeType(data);
-		if (treeType<0) {
-			return;
-		}
-		m_needToUpdateTexture = true;
-	}
-	if (data->m_framesToMoveOutward > 2 || data->m_doTopple) {
-		// Trees/grass that topples or gets pushed aside (outward) gets put in the area partition. jba [7/7/2003]
-		Short bucket = getPartitionBucket(location);
-		m_trees[m_numTrees].nextInPartition = m_areaPartition[bucket];
-		m_areaPartition[bucket] = m_numTrees;
-	} else {
-		m_trees[m_numTrees].nextInPartition = END_OF_PARTITION;
-	}
-
-	Real randomScale = GameClientRandomValueReal( 1.0f - randomScaleAmount, 1.0f+ randomScaleAmount );
-	m_trees[m_numTrees].sin = WWMath::Sin(angle);
-	m_trees[m_numTrees].cos = WWMath::Cos(angle);
-	if (randomScaleAmount>0.0f) {
-		// Randomizes the scale and orientation of trees.
-		m_trees[m_numTrees].scale = scale*randomScale;
-	} else {
-		// Don't randomly scale & orient
-		m_trees[m_numTrees].scale = scale;
-	}
-	m_trees[m_numTrees].location = Vector3(location.x, location.y, location.z);
-	m_trees[m_numTrees].treeType = treeType;
-	// Translate the bounding sphere of the model.
-	m_trees[m_numTrees].bounds = m_treeTypes[treeType].m_bounds;
-	m_trees[m_numTrees].bounds.Center *= m_trees[m_numTrees].scale;
-	m_trees[m_numTrees].bounds.Radius *= m_trees[m_numTrees].scale;
-	m_trees[m_numTrees].bounds.Center += m_trees[m_numTrees].location;
-	// Initially set it invisible.  cull will update it's visiblity flag.
-	m_trees[m_numTrees].visible = false;
-	m_trees[m_numTrees].drawableID = id;
-
-	m_trees[m_numTrees].firstIndex = 0;
-	m_trees[m_numTrees].bufferNdx = -1;
-
-	m_trees[m_numTrees].swayType = GameClientRandomValue(0, MAX_SWAY_TYPES-1);
-	m_trees[m_numTrees].pushAside = 0;
-	m_trees[m_numTrees].lastFrameUpdated = 0;
-	m_trees[m_numTrees].pushAsideSource = INVALID_ID;
-	m_trees[m_numTrees].pushAsideDelta = 0;
-	m_trees[m_numTrees].pushAsideCos = 1;
-	m_trees[m_numTrees].pushAsideSin = 1;
-	m_trees[m_numTrees].m_toppleState = TOPPLE_UPRIGHT;
-	m_numTrees++;
-}
-
-//=============================================================================
-// W3DTreeBuffer::updateTreePosition
-//=============================================================================
-/** Updates a tree's position */
-//=============================================================================
-Bool W3DTreeBuffer::updateTreePosition(DrawableID id, Coord3D location, Real angle)
-{
-	Int i;
-	for (i=0; i<m_numTrees; i++) {
-		if (m_trees[i].drawableID == id) {
-			m_trees[i].location = Vector3(location.x, location.y, location.z);
-			m_trees[i].sin = WWMath::Sin(angle);
-			m_trees[i].cos = WWMath::Cos(angle);
-			// Translate the bounding sphere of the model.
-			m_trees[i].bounds = m_treeTypes[m_trees[i].treeType].m_bounds;
-			m_trees[i].bounds.Center *= m_trees[i].scale;
-			m_trees[i].bounds.Radius *= m_trees[i].scale;
-			m_trees[i].bounds.Center += m_trees[i].location;
-			m_anythingChanged = true;
-			return true;
-		}
-	}
-	return false;
-}
-
-//=============================================================================
-// W3DTreeBuffer::pushAsideTree
-//=============================================================================
-/** Push sideways tree or grass. */
-//=============================================================================
-void W3DTreeBuffer::pushAsideTree(DrawableID id, const Coord3D *pusherPos, 
-																	const Coord3D *pusherDirection, ObjectID pusherID )
-{
-	Int i;
-	for (i=0; i<m_numTrees; i++) {
-		if (m_trees[i].drawableID == id) {
-			UnsignedInt lastFrame = m_trees[i].lastFrameUpdated;
-			m_trees[i].lastFrameUpdated = TheGameLogic->getFrame();
-			if(m_trees[i].pushAsideSource == pusherID) {
-				if (m_trees[i].lastFrameUpdated - lastFrame < 3)
-					return; // already pushing. [5/28/2003]
-			}
-
-			if(m_trees[i].pushAside != 0.0f) {
-				return; // already pushing. [5/28/2003]
-			}
-			m_trees[i].pushAsideSource = pusherID;
-			Coord3D delta;
-			delta.set(m_trees[i].location.X, m_trees[i].location.Y, m_trees[i].location.Z);
-			delta.sub(pusherPos);
-
-			if (pusherDirection->x*delta.y - pusherDirection->y*delta.x > 0.0f) {
-				m_trees[i].pushAsideCos = -pusherDirection->y;
-				m_trees[i].pushAsideSin = pusherDirection->x;
-			} else {
-				m_trees[i].pushAsideCos = pusherDirection->y;
-				m_trees[i].pushAsideSin = -pusherDirection->x;
-			}
-			m_anyPushChanged = true;
-			m_trees[i].pushAsideDelta = 1.0f/(Real)m_treeTypes[m_trees[i].treeType].m_data->m_framesToMoveOutward;
-		}
-	}
-}
-
-DECLARE_PERF_TIMER(Tree_Render)
-
-//=============================================================================
-// W3DTreeBuffer::drawTrees
-//=============================================================================
-/** Draws the trees.  Uses camera to cull. */
-//=============================================================================
-void W3DTreeBuffer::drawTrees(CameraClass * camera, RefRenderObjListIterator *pDynamicLightsIterator)
-{
-	USE_PERF_TIMER(Tree_Render)
-	if (!m_isTerrainPass) {
-		return;
-	}
-
-	// if breeze changes, always process the full update, even if not visible, 
-	// so that things offscreen won't 'pop' when first viewed
-	const BreezeInfo& info = TheScriptEngine->getBreezeInfo();
-	Bool pause = TheScriptEngine->isTimeFrozenScript() || TheScriptEngine->isTimeFrozenDebug();
-	if (TheGameLogic && TheGameLogic->isGamePaused()) {
-		pause = true;
-	}
-	Int i;
-	if (!pause) {
-		if (info.m_breezeVersion != m_curSwayVersion) 
-		{
-			updateSway(info);
-		}		
-	}
-	Vector3 swayFactor[MAX_SWAY_TYPES];
-	for (i=0; i<MAX_SWAY_TYPES; i++) {
-		if (!pause) {
-			m_curSwayOffset[i] += m_curSwayStep[i];
-			if (m_curSwayOffset[i] > NUM_SWAY_ENTRIES-1) {
-				m_curSwayOffset[i] -= NUM_SWAY_ENTRIES-1;
-			}
-		}
-		Int minOffset = REAL_TO_INT_FLOOR(m_curSwayOffset[i]);
-		if (minOffset>=0 && minOffset+1<NUM_SWAY_ENTRIES) {
-			Real f2 = m_curSwayOffset[i] - minOffset;
-			Real f1 = 1.0f - f2;
-			swayFactor[i] = f1*m_swayOffsets[minOffset] + f2*m_swayOffsets[minOffset+1];
-			swayFactor[i] *= m_curSwayFactor[i];
-		}
-	}
-	
-	m_isTerrainPass = false;
-
-	if (m_needToUpdateTexture) {
-		m_needToUpdateTexture = false;
-		updateTexture();
-	}
-	if (m_treeTexture==NULL) {
-		return;
-	}
-	if (m_updateAllKeys) {
-		cull(camera);
-	}
-
-	Int curTree;
-	// Draw tree shadows.
-	if (m_shadow && TheW3DProjectedShadowManager && TheGlobalData->m_useShadowDecals) {
-		for (curTree=0; curTree<m_numTrees; curTree++) {
-			Int type = m_trees[curTree].treeType;
-			if (type<0) { // deleted.
-				continue;
-			}
-			if (!m_trees[curTree].visible || !m_treeTypes[type].m_doShadow) {
-				continue;
-			}
-			Real factor = 1.0f;
-			if (m_trees[curTree].m_toppleState == TOPPLE_FALLING ||
-					m_trees[curTree].m_toppleState == TOPPLE_DOWN) {
-				continue;
-			}
-			m_shadow->setSize(m_treeTypes[type].m_shadowSize, -m_treeTypes[type].m_shadowSize*factor);
-			m_shadow->setPosition(m_trees[curTree].location.X, m_trees[curTree].location.Y, m_trees[curTree].location.Z);
-			TheW3DProjectedShadowManager->queueDecal(m_shadow);
-		}
-		TheW3DProjectedShadowManager->flushDecals(m_shadow->getTexture(0), SHADOW_DECAL);
-	}
-
-	// Update pushed aside and toppling trees.
-	for (curTree=0; curTree<m_numTrees; curTree++) {
-		if (pause) {
-			break;
-		}
-		Int type = m_trees[curTree].treeType;
-		if (type<0) { // deleted.
-			continue;
-		}
-		if(m_trees[curTree].m_toppleState == TOPPLE_FALLING ||
-			 m_trees[curTree].m_toppleState == TOPPLE_FOGGED) {
-			updateTopplingTree(m_trees+curTree);
-		} else if(m_trees[curTree].m_toppleState == TOPPLE_DOWN) {
-			if (m_treeTypes[type].m_data->m_killWhenToppled) {
-				if (m_trees[curTree].m_sinkFramesLeft==0) {
-					m_trees[curTree].treeType = DELETED_TREE_TYPE; // delete it. [7/11/2003]
-					m_anythingChanged = true; // need to regenerate trees. [7/11/2003]
-				}
-				m_trees[curTree].m_sinkFramesLeft--;
-				m_trees[curTree].location.Z -= m_treeTypes[type].m_data->m_sinkDistance/m_treeTypes[type].m_data->m_sinkFrames;
-				m_trees[curTree].m_mtx.Set_Translation(m_trees[curTree].location);
-			}	
-		} else if (m_trees[curTree].pushAsideDelta!=0.0f) {
-			m_trees[curTree].pushAside += m_trees[curTree].pushAsideDelta;
-			if (m_trees[curTree].pushAside>=1.0f) {
-				m_trees[curTree].pushAsideDelta = -1.0/(Real)m_treeTypes[type].m_data->m_framesToMoveInward;
-			} else if (m_trees[curTree].pushAside<=0.0f) {
-				m_trees[curTree].pushAsideDelta = 0.0f;
-				m_trees[curTree].pushAside = 0.0f;
-			}
-		} 
-	}
-
-	if (m_anythingChanged) {
-		loadTreesInVertexAndIndexBuffers(pDynamicLightsIterator);
-		m_anythingChanged = false;
-	} else if (m_anyPushChanged) {
-		m_anyPushChanged = false;
-		updateVertexBuffer();
-	}
-
-//#define DEBUG_TEXTURE 1
-#ifdef DEBUG_TEXTURE // Draw the combined texture for debugging. jba. [4/21/2003]
-	// Setup the vertex buffer, shader & texture.
-	DX8Wrapper::Set_Shader(detailAlphaShader);
-	DX8Wrapper::Set_Texture(0,m_treeTexture);
-	DynamicIBAccessClass ib_access(BUFFER_TYPE_DYNAMIC_DX8, 6);
-	//draw an infinite sky plane
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8, DX8_FVF_XYZNDUV2, 4);
-	{
-		DynamicIBAccessClass::WriteLockClass ibLock(&ib_access);
-		UnsignedShort *ndx = ibLock.Get_Index_Array();
-
-		if (ndx) {
-			ndx[0] = 0;
-			ndx[1] = 1;
-			ndx[2] = 2;
-			ndx[3] = 1;
-			ndx[4] = 3;
-			ndx[5] = 2;
-		}
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* verts=lock.Get_Formatted_Vertex_Array();
-		if(verts)
-		{
-			Real width = 300;
-			Real origin = 40;
-			verts[0].x=origin;
-			verts[0].y=origin;
-			verts[0].z=15;
-			verts[0].u1=0;
-			verts[0].v1=0;
-			verts[0].diffuse=0xffffffff;
-	
-			verts[1].x=origin+width;
-			verts[1].y=origin;
-			verts[1].z=15;
-			verts[1].u1=1;
-			verts[1].v1=0;
-			verts[1].diffuse=0xffffffff;
-	
-			verts[2].x=origin;
-			verts[2].y=origin+width;
-			verts[2].z=15;
-			verts[2].u1=0;
-			verts[2].v1=1;
-			verts[2].diffuse=0xffffffff;
-	
-			verts[3].x=origin+width;
-			verts[3].y=origin+width;
-			verts[3].z=15;
-			verts[3].u1=1;
-			verts[3].v1=1;
-			verts[3].diffuse=0xffffffff;
-		}
-	}
-
-	DX8Wrapper::Set_Index_Buffer(ib_access,0);
-	DX8Wrapper::Set_Vertex_Buffer(vb_access);
-
-	Matrix3D tm(1);
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-
-	DX8Wrapper::Draw_Triangles(	0,2, 0,	4);	//draw a quad, 2 triangles, 4 verts
-#endif
-
-
-	if (m_curNumTreeIndices[0] == 0) {
-		return;
-	}
-	DX8Wrapper::Set_Shader(detailAlphaShader);	
-
-	DX8Wrapper::Set_Texture(0,m_treeTexture);
-	DX8Wrapper::Set_Texture(1,NULL);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, 1);
-	// Draw all the trees.
-	DX8Wrapper::Apply_Render_State_Changes();
-	W3DShaderManager::setShroudTex(1);
-	DX8Wrapper::Apply_Render_State_Changes();
- 
-	if (m_dwTreeVertexShader) {
-		D3DXMATRIX matProj, matView, matWorld;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_WORLD, *(Matrix4x4*)&matWorld);
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, *(Matrix4x4*)&matView);
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_PROJECTION, *(Matrix4x4*)&matProj);
-		D3DXMATRIX mat;
-		D3DXMatrixMultiply( &mat, &matView, &matProj );
-		D3DXMatrixMultiply( &mat, &matWorld, &mat );
-		D3DXMatrixTranspose( &mat, &mat );
-
-		// c4  - Composite World-View-Projection Matrix
-		DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  4, &mat,  4 );
-		Vector4 noSway(0,0,0,0);
-		DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  8, &noSway,  1 );
-
-		// c8 - c8+MAX_SWAY_TYPES - the sway amount.
-		for	(i=0; i<MAX_SWAY_TYPES; i++) {
-			Vector4 sway4(swayFactor[i].X, swayFactor[i].Y, swayFactor[i].Z, 0);
-			DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  9+i, &sway4,  1 );
-		}
-
-		W3DShroud *shroud;
-		if ((shroud=TheTerrainRenderObject->getShroud()) != 0) {
-			// Setup shroud texture info [6/6/2003]
-			float xoffset = 0;
-			float yoffset = 0;
-			Real width=shroud->getCellWidth();
-			Real height=shroud->getCellHeight();
-
-			xoffset = -(float)shroud->getDrawOriginX() + width;
-			yoffset = -(float)shroud->getDrawOriginY() + height;
-			Vector4 offset(xoffset, yoffset, 0, 0);
-			DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  32, &offset,  1 );
-			width = 1.0f/(width*shroud->getTextureWidth());
-			height = 1.0f/(height*shroud->getTextureHeight());
-			offset.Set(width, height, 1, 1);
-			DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  33, &offset,  1 );
-
-		} else {
-			Vector4 offset(0,0,0,0);
-			DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  32, &offset,  1 );
-			DX8Wrapper::_Get_D3D_Device8()->SetVertexShaderConstant(  33, &offset,  1 );
-		}
-
-		DX8Wrapper::Set_Vertex_Shader(m_dwTreeVertexShader);
-#if 0
-		DX8Wrapper::Set_Pixel_Shader(m_dwTreePixelShader);
-		// a.c. 6/16 - allow switching between normal and 2X mode for terrain
-		Real mulTwoX = 0.5f;
-		if(TheGlobalData && TheGlobalData->m_useOverbright)
-			mulTwoX = 1.0f;	
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(1, D3DXVECTOR4(mulTwoX, mulTwoX, mulTwoX, mulTwoX), 1);
-#endif
-
-	} else {
-		DX8Wrapper::Set_Vertex_Shader(DX8_FVF_XYZNDUV1);
-	}
-
-
-	Int bNdx;
-	for (bNdx=0;bNdx<MAX_BUFFERS; bNdx++) {
-		if (m_curNumTreeIndices[bNdx]==0) {
-			break;
-		}
-		DX8Wrapper::Set_Index_Buffer(m_indexTree[bNdx],0);
-		DX8Wrapper::Set_Vertex_Buffer(m_vertexTree[bNdx]);
-		// Render the waving grass
-		DX8Wrapper::Apply_Render_State_Changes();
-		if (m_dwTreeVertexShader) {
-			DX8Wrapper::_Get_D3D_Device8()->SetVertexShader(m_dwTreeVertexShader);
-			DX8Wrapper::_Get_D3D_Device8()->SetTextureStageState(0,  D3DTSS_TEXCOORDINDEX, 0);
-			DX8Wrapper::_Get_D3D_Device8()->SetTextureStageState(1,  D3DTSS_TEXCOORDINDEX, 1);
-			DX8Wrapper::_Get_D3D_Device8()->SetTextureStageState(1,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-		}
-		DX8Wrapper::Draw_Triangles(	0, m_curNumTreeIndices[bNdx]/3, 0,	m_curNumTreeVertices[bNdx]);
-	}
-
-	DX8Wrapper::Set_Vertex_Shader(DX8_FVF_XYZNDUV1);
-	DX8Wrapper::Set_Pixel_Shader(NULL);
-	DX8Wrapper::Invalidate_Cached_Render_States();	//code above mucks around with W3D states so make sure we reset
-
-}
-
-//-------------------------------------------------------------------------------------------------
-///< Start the toppling process by giving a force vector
-//-------------------------------------------------------------------------------------------------
-void W3DTreeBuffer::applyTopplingForce( TTree *tree, const Coord3D* toppleDirection, Real toppleSpeed,
-																			 UnsignedInt options )
-{
-	if (tree->m_toppleState != TOPPLE_UPRIGHT) {
-		return;
-	}
-	const W3DTreeDrawModuleData* d = m_treeTypes[tree->treeType].m_data;
-  // Having a low toppleSpeed is BAD. In particular, if the toppleSpeed is exactly 0, the
-  // tree will stay upright forever, frozen in place (because the sway update is dead) 
-  // but never dying
-  if ( toppleSpeed < d->m_minimumToppleSpeed )
-  {
-    toppleSpeed = d->m_minimumToppleSpeed;
-  }
-  
-	tree->m_toppleDirection = *toppleDirection;
-	tree->m_toppleDirection.normalize();
-	tree->m_angularAccumulation = 0;
-
-	tree->m_angularVelocity = toppleSpeed * d->m_initialVelocityPercent;
-	tree->m_angularAcceleration = toppleSpeed * d->m_initialAccelPercent;
-	tree->m_toppleState = TOPPLE_FALLING;
-	tree->m_options = options;
-	Coord3D pos;
-	pos.set(tree->location.X, tree->location.Y, tree->location.Z);
-	FXList::doFXPos(d->m_toppleFX, &pos);
-	m_anyPushChanged = true;
-	tree->m_mtx.Make_Identity();
-	tree->m_mtx.Set_Translation(tree->location);
-
-}
-
-// this is our "bounce" limit -- slightly less that 90 degrees, to account for slop.
-static const Real ANGULAR_LIMIT = PI/2 - PI/64;		
-
-//-------------------------------------------------------------------------------------------------
-///< Keep track of rotational fall distance, bounce and/or stop when needed.
-//-------------------------------------------------------------------------------------------------
-void W3DTreeBuffer::updateTopplingTree(TTree *tree)
-{
-	//DLOG(Debug::Format("updating W3DTreeBuffer %08lx\n",this));
-	DEBUG_ASSERTCRASH(tree->m_toppleState != TOPPLE_UPRIGHT, ("hmm, we should be sleeping here"));
-	if ( (tree->m_toppleState == TOPPLE_UPRIGHT)  ||  (tree->m_toppleState == TOPPLE_DOWN) )
-		return;
-
-	const W3DTreeDrawModuleData* d = m_treeTypes[tree->treeType].m_data;
-	Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
-	Coord3D pos;
-	pos.set(tree->location.X, tree->location.Y, tree->location.Z);
-	ObjectShroudStatus ss = ThePartitionManager->getPropShroudStatusForPlayer(localPlayerIndex, &pos);
-	if (ss==OBJECTSHROUD_FOGGED) {
-		// Don't update fogged trees. [8/11/2003]
-		tree->m_toppleState = TOPPLE_FOGGED;
-		return;
-	} else if (tree->m_toppleState == TOPPLE_FOGGED) {
-		// was fogged, now isn't.  
-		tree->m_angularVelocity = 0;
-		tree->m_toppleState = TOPPLE_DOWN;
-		tree->m_mtx.In_Place_Pre_Rotate_X(-ANGULAR_LIMIT * tree->m_toppleDirection.y);
-		tree->m_mtx.In_Place_Pre_Rotate_Y(ANGULAR_LIMIT * tree->m_toppleDirection.x);
-		if (d->m_killWhenToppled) {
-			// If got killed in the fog, just remove. jba [8/11/2003]
-			tree->m_sinkFramesLeft = 0;
-		}
-		return;
-	}
-	const Real VELOCITY_BOUNCE_LIMIT = 0.01f;				// if the velocity after a bounce will be this or lower, just stop at zero
-	const Real VELOCITY_BOUNCE_SOUND_LIMIT = 0.03f;	// and if this low, then skip the bounce sound
-
-	Real curVelToUse = tree->m_angularVelocity;
-	if (tree->m_angularAccumulation + curVelToUse > ANGULAR_LIMIT)
-		curVelToUse = ANGULAR_LIMIT - tree->m_angularAccumulation;
-
-	tree->m_mtx.In_Place_Pre_Rotate_X(-curVelToUse * tree->m_toppleDirection.y);
-	tree->m_mtx.In_Place_Pre_Rotate_Y(curVelToUse * tree->m_toppleDirection.x);
-
-	
-	tree->m_angularAccumulation += curVelToUse;
-	if ((tree->m_angularAccumulation >= ANGULAR_LIMIT) && (tree->m_angularVelocity > 0))
-	{
-		// Hit so either bounce or stop if too little remaining velocity.
-		tree->m_angularVelocity *= -d->m_bounceVelocityPercent;
-
-		if( BitIsSet( tree->m_options, W3D_TOPPLE_OPTIONS_NO_BOUNCE ) == TRUE || 
-				fabs(tree->m_angularVelocity) < VELOCITY_BOUNCE_LIMIT )
-		{
-			// too slow, just stop
-			tree->m_angularVelocity = 0;
-			tree->m_toppleState = TOPPLE_DOWN;
-			if (d->m_killWhenToppled) {
-				tree->m_sinkFramesLeft = d->m_sinkFrames;
-			}
-		}
-		else if( fabs(tree->m_angularVelocity) >= VELOCITY_BOUNCE_SOUND_LIMIT )
-		{
-			// fast enough bounce to warrant the bounce fx
-			if( BitIsSet( tree->m_options, W3D_TOPPLE_OPTIONS_NO_FX ) == FALSE ) {
-				Vector3 loc(0, 0, 3*TREE_RADIUS_APPROX); // Kinda towards the top of the tree. jba. [7/11/2003]
-				Vector3 xloc;
-				tree->m_mtx.Transform_Vector(tree->m_mtx, loc, &xloc);
-				Coord3D pos;
-				pos.set(xloc.X, xloc.Y, xloc.Z);
-				FXList::doFXPos(d->m_bounceFX, &pos);
-			}
-		}
-	}
-	else
-	{
-		tree->m_angularVelocity += tree->m_angularAcceleration;
-	}
-
-}
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void W3DTreeBuffer::crc( Xfer *xfer )
-{
-	// empty. jba [8/11/2003]	
-}  // end CRC
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer
-	* Version Info:
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-void W3DTreeBuffer::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	Int i;
-	Int numTrees = m_numTrees;
-	xfer->xferInt(&numTrees);
-	if (xfer->getXferMode() == XFER_LOAD)	{	
-		m_numTrees = 0;
-		for (i=0; i<PARTITION_WIDTH_HEIGHT*PARTITION_WIDTH_HEIGHT; i++) {
-			m_areaPartition[i] = END_OF_PARTITION;
-		}
-	}
-
-	// Save trees. [8/11/2003]
-	for	(i=0; i<numTrees; i++) {
-		TTree tree;
-		memset(&tree, 0, sizeof(tree));
-		AsciiString modelName;
-		AsciiString modelTexture;
-		Int treeType = DELETED_TREE_TYPE;
-		if (xfer->getXferMode() != XFER_LOAD) {
-			tree = m_trees[i];
-			treeType = m_trees[i].treeType;
-			if (treeType != DELETED_TREE_TYPE) {
-				modelName = m_treeTypes[treeType].m_data->m_modelName;
-				modelTexture = m_treeTypes[treeType].m_data->m_textureName;
-			}
-		}
-		xfer->xferAsciiString(&modelName);
-		xfer->xferAsciiString(&modelTexture);
-		if (xfer->getXferMode() == XFER_LOAD) {
-			Int j;
-			for (j=0; j<m_numTreeTypes; j++) {
-				if (m_treeTypes[j].m_data->m_modelName.compareNoCase(modelName)==0 && 
-						m_treeTypes[j].m_data->m_textureName.compareNoCase(modelTexture)==0) {
-					treeType = j;
-					break;
-				}
-			}
-		}
-				
-		xfer->xferReal(&tree.location.X);
-		xfer->xferReal(&tree.location.Y);
-		xfer->xferReal(&tree.location.Z);
-
-		xfer->xferReal(&tree.scale);	///< Scale at location.
-		xfer->xferReal(&tree.sin);	///< Sine of the rotation angle at location.
-		xfer->xferReal(&tree.cos);	///< Cosine of the rotation angle at location.
-
-		xfer->xferDrawableID(&tree.drawableID);	///< Drawable this tree corresponds to.
-
-		// Topple parameters. [7/7/2003]
-		xfer->xferReal(&tree.m_angularVelocity);	///< Velocity in degrees per frame (or is it radians per frame?)
-		xfer->xferReal(&tree.m_angularAcceleration);	///< Acceleration angularVelocity is increasing
-		xfer->xferCoord3D(&tree.m_toppleDirection);	///< Z-less direction we are toppling
-		xfer->xferUser(&tree.m_toppleState, sizeof(tree.m_toppleState));	///< Stage this module is in.
-		xfer->xferReal(&tree.m_angularAccumulation);	///< How much have I rotated so I know when to bounce.
-		xfer->xferUnsignedInt(&tree.m_options);	///< topple options
-		xfer->xferMatrix3D(&tree.m_mtx);
-		xfer->xferUnsignedInt(&tree.m_sinkFramesLeft);	///< Toppled trees sink into the terrain & disappear, how many frames left.
-
-		if (xfer->getXferMode() == XFER_LOAD && treeType != DELETED_TREE_TYPE && treeType < m_numTreeTypes) {
-			Coord3D pos;
-			pos.set(tree.location.X, tree.location.Y, tree.location.Z);
-			Real angle = 0;
-			addTree(tree.drawableID, pos, tree.scale, angle, 0, m_treeTypes[treeType].m_data);
-			if (m_numTrees) {
-				TTree *curTree = &m_trees[m_numTrees-1];
-				curTree->m_angularAcceleration = tree.m_angularAcceleration;
-				curTree->m_angularVelocity = tree.m_angularVelocity;
-				curTree->m_toppleDirection = tree.m_toppleDirection;
-				curTree->m_toppleState = tree.m_toppleState;
-				curTree->m_options = tree.m_options;
-				curTree->m_mtx = tree.m_mtx;
-				curTree->m_sinkFramesLeft = tree.m_sinkFramesLeft;
-			}
-		}
-	}
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void W3DTreeBuffer::loadPostProcess( void )
-{
-	// empty. jba [8/11/2003]	
-}  // end loadPostProcess
-
-
-
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
deleted file mode 100644
index 8ff77192ef2..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//----------------------------------------------------------------------------
-//
-// Project:   Generals
-//
-// Module:    Video
-//
-// File name: W3DDevice/GameClient/W3DVideoBuffer.cpp
-//
-// Created:   10/23/01 TR
-//
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//         Includes                                                      
-//----------------------------------------------------------------------------
-
-#include "Common/GameMemory.h"
-#include "WW3D2/texture.h"
-#include "WW3D2/textureloader.h"
-#include "W3DDevice/GameClient/W3DVideobuffer.h"
-
-//----------------------------------------------------------------------------
-//         Externals                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Defines                                                         
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Types                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Data                                                     
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Data                                                      
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Prototypes                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Private Functions                                               
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-//         Public Functions                                                
-//----------------------------------------------------------------------------
-
-
-//============================================================================
-// W3DVideoBuffer::W3DVideoBuffer
-//============================================================================
-
-W3DVideoBuffer::W3DVideoBuffer( VideoBuffer::Type format )
-: VideoBuffer(format),
-	m_texture(NULL),
-	m_surface(NULL)
-{
-
-}
-
-
-//============================================================================
-// W3DVideoBuffer::SetBuffer
-//============================================================================
-
-Bool W3DVideoBuffer::allocate( UnsignedInt width, UnsignedInt height )
-{
-	free();
-
-	m_width = width;
-	m_height = height;
-	m_textureWidth = width;;
-	m_textureHeight = height;;
-	unsigned int temp_depth=1;
-	TextureLoader::Validate_Texture_Size( m_textureWidth, m_textureHeight, temp_depth);
-
-	WW3DFormat w3dFormat = TypeToW3DFormat(  m_format );
- 
-	if ( w3dFormat == WW3D_FORMAT_UNKNOWN )
-	{
-		return NULL;	
-	}
-
-	m_texture  = MSGNEW("TextureClass") TextureClass ( m_textureWidth, m_textureHeight, w3dFormat, MIP_LEVELS_1 );
-
-	if ( m_texture == NULL )
-	{
-		return FALSE;
-	}
-
-	if ( lock() == NULL )
-	{
-		free();
-		return FALSE;
-	}
-
-	unlock();
-
-
-	return TRUE;
-}
-
-//============================================================================
-// W3DVideoBuffer::~W3DVideoBuffer
-//============================================================================
-
-W3DVideoBuffer::~W3DVideoBuffer()
-{
-	free();
-}
-
-//============================================================================
-// W3DVideoBuffer::lock
-//============================================================================
-
-void*		W3DVideoBuffer::lock( void )
-{
-	void *mem = NULL;
-
-	if ( m_surface != NULL )
-	{
-		unlock();
-	}
-
-	m_surface = m_texture->Get_Surface_Level();		
-
-	if ( m_surface )
-	{
-		mem = m_surface->Lock( (Int*) &m_pitch );
-	}
-
-	return mem;
-}
-
-//============================================================================
-// W3DVideoBuffer::unlock
-//============================================================================
-
-void		W3DVideoBuffer::unlock( void )
-{
-	if ( m_surface != NULL )
-	{
-		m_surface->Unlock();
-		m_surface->Release_Ref();
-		m_surface = NULL;
-	}
-}
-
-//============================================================================
-// W3DVideoBuffer::valid
-//============================================================================
-
-Bool		W3DVideoBuffer::valid( void )
-{
-	return m_texture != NULL;
-}
-
-//============================================================================
-// W3DVideoBuffer::reset
-//============================================================================
-
-void	W3DVideoBuffer::free( void )
-{
-	unlock();
-
-	if ( m_texture )
-	{
-		unlock();
-		m_texture->Release_Ref();
-		m_texture = NULL;
-	}
-	m_surface = NULL;
-
-	VideoBuffer::free();
-}
-
-
-//============================================================================
-// W3DVideoBuffer::TypeToW3DFormat
-//============================================================================
-
-WW3DFormat W3DVideoBuffer::TypeToW3DFormat( VideoBuffer::Type format )
-{
-	WW3DFormat w3dFormat = WW3D_FORMAT_UNKNOWN;
-	switch ( format )
-	{
-		case TYPE_X8R8G8B8:
-			w3dFormat = WW3D_FORMAT_X8R8G8B8;
-			break;
-
- 		case TYPE_R8G8B8:
-			w3dFormat = WW3D_FORMAT_R8G8B8;
-			break;
-
- 		case TYPE_R5G6B5:
-			w3dFormat = WW3D_FORMAT_R5G6B5;
-			break;
-
- 		case TYPE_X1R5G5B5:
-			w3dFormat = WW3D_FORMAT_X1R5G5B5;
-			break;
-	}
-
-	return w3dFormat;
-}
-
-//============================================================================
-// W3DFormatToType
-//============================================================================
-
-VideoBuffer::Type W3DVideoBuffer::W3DFormatToType( WW3DFormat w3dFormat )
-{
-	Type format = TYPE_UNKNOWN;
-	switch ( w3dFormat )
-	{
-		case WW3D_FORMAT_X8R8G8B8:
-				format = VideoBuffer::TYPE_X8R8G8B8;
-				break;
-		case WW3D_FORMAT_R8G8B8:
-				format = VideoBuffer::TYPE_R8G8B8;
-				break;
-		case WW3D_FORMAT_R5G6B5:
-				format = VideoBuffer::TYPE_R5G6B5;
-				break;
-		case WW3D_FORMAT_X1R5G5B5:
-				format = VideoBuffer::TYPE_X1R5G5B5;
-				break;
-	}
-
-	return format;
-}
\ No newline at end of file
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
deleted file mode 100644
index 5ed7c1f8af2..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
+++ /dev/null
@@ -1,3365 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DView.cpp //////////////////////////////////////////////////////////////////////////////
-//
-// W3D implementation of the game view class.  This view allows us to have
-// a "window" into the game world that can change its width, height as 
-// well as camera positioning controls
-//
-// Author: Colin Day, April 2001
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////////////////////////
-#include <stdlib.h>
-#include <windows.h>
-
-// USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "Common/BuildAssistant.h"
-#include "Common/GlobalData.h"
-#include "Common/Module.h"
-#include "Common/RandomValue.h"
-#include "Common/ThingTemplate.h"
-#include "Common/ThingSort.h"
-#include "Common/PerfTimer.h"
-#include "Common/PlayerList.h"
-#include "Common/Player.h"
-
-#include "GameClient/Color.h"
-#include "GameClient/CommandXlat.h"
-#include "GameClient/Drawable.h"
-#include "GameClient/GameClient.h"
-#include "GameClient/GameWindowManager.h"
-#include "GameClient/Image.h"
-#include "GameClient/InGameUI.h"
-#include "GameClient/Line2D.h"
-#include "GameClient/SelectionInfo.h"
-#include "GameClient/Shell.h"
-#include "GameClient/TerrainVisual.h"
-#include "GameClient/Water.h"
-
-#include "GameLogic/AI.h"			///< For AI debug (yes, I'm cheating for now)
-#include "GameLogic/AIPathfind.h"			///< For AI debug (yes, I'm cheating for now)
-#include "GameLogic/ExperienceTracker.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/Module/AIUpdate.h"
-#include "GameLogic/Module/BodyModule.h"
-#include "GameLogic/Module/ContainModule.h"
-#include "GameLogic/Module/OpenContain.h"
-#include "GameLogic/Object.h"
-#include "GameLogic/ScriptEngine.h"
-#include "GameLogic/TerrainLogic.h"									///< @todo This should be TerrainVisual (client side)
-#include "Common/AudioEventInfo.h"
-
-#include "W3DDevice/Common/W3DConvert.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/W3DAssetManager.h"
-#include "W3DDevice/GameClient/W3DDisplay.h"
-#include "W3DDevice/GameClient/W3DScene.h"
-#include "W3DDevice/GameClient/W3DView.h"
-#include "d3dx8math.h"
-#include "W3DDevice/GameClient/W3DShaderManager.h"
-#include "W3DDevice/GameClient/Module/W3DModelDraw.h"
-#include "W3DDevice/GameClient/W3DCustomScene.h"
-
-#include "WW3D2/dx8renderer.h"
-#include "WW3D2/light.h"
-#include "WW3D2/camera.h"
-#include "WW3D2/coltype.h"
-#include "WW3D2/predlod.h"
-#include "WW3D2/ww3d.h"
-
-#include "W3DDevice/GameClient/camerashakesystem.h"
-
-#include "WinMain.h"  /** @todo Remove this, it's only here because we
-													are using timeGetTime, but we can remove that
-													when we have our own timer */
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-
-
-// 30 fps
-Int TheW3DFrameLengthInMsec = 1000/LOGICFRAMES_PER_SECOND; // default is 33msec/frame == 30fps. but we may change it depending on sys config.
-static const Int MAX_REQUEST_CACHE_SIZE = 40;	// Any size larger than 10, or examine code below for changes. jkmcd.
-static const Real DRAWABLE_OVERSCAN = 75.0f;  ///< 3D world coords of how much to overscan in the 3D screen region
-
-
-
-
-
-
-//=================================================================================================
-inline Real minf(Real a, Real b) { if (a < b) return a; else return b; }
-inline Real maxf(Real a, Real b) { if (a > b) return a; else return b; }
-
-//-------------------------------------------------------------------------------------------------
-// Normalizes angle to +- PI.
-//-------------------------------------------------------------------------------------------------
-static void normAngle(Real &angle)
-{
-	if (angle < -10*PI) {
-		angle = 0;
-	}
-	if (angle > 10*PI) {
-		angle = 0;
-	}
-	while (angle < -PI) {
-		angle += 2*PI;
-	}
-	while (angle > PI) {
-		angle -= 2*PI;
-	}
-}
-
-#define TERRAIN_SAMPLE_SIZE 40.0f
-static Real getHeightAroundPos(Real x, Real y)
-{
-	// terrain height + desired height offset == cameraOffset * actual zoom
-	Real terrainHeight = TheTerrainLogic->getGroundHeight(x, y);
-
-	// find best approximation of max terrain height we can see
-	Real terrainHeightMax = terrainHeight;
-	terrainHeightMax = max(terrainHeightMax, TheTerrainLogic->getGroundHeight(x+TERRAIN_SAMPLE_SIZE, y-TERRAIN_SAMPLE_SIZE));
-	terrainHeightMax = max(terrainHeightMax, TheTerrainLogic->getGroundHeight(x-TERRAIN_SAMPLE_SIZE, y-TERRAIN_SAMPLE_SIZE));
-	terrainHeightMax = max(terrainHeightMax, TheTerrainLogic->getGroundHeight(x+TERRAIN_SAMPLE_SIZE, y+TERRAIN_SAMPLE_SIZE));
-	terrainHeightMax = max(terrainHeightMax, TheTerrainLogic->getGroundHeight(x-TERRAIN_SAMPLE_SIZE, y+TERRAIN_SAMPLE_SIZE));
-
-	return terrainHeightMax;
-}
-
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DView::W3DView()
-{
-	
-	m_3DCamera = NULL;
-	m_2DCamera = NULL;
-	m_groundLevel = 10.0;
-	m_cameraOffset.z = TheGlobalData->m_cameraHeight;
-	m_cameraOffset.y = -(m_cameraOffset.z / tan(TheGlobalData->m_cameraPitch * (PI / 180.0)));
-	m_cameraOffset.x = -(m_cameraOffset.y * tan(TheGlobalData->m_cameraYaw * (PI / 180.0)));
-
-	m_viewFilterMode = FM_VIEW_DEFAULT;
-	m_viewFilter = FT_VIEW_DEFAULT;
-	m_isWireFrameEnabled = m_nextWireFrameEnabled = FALSE;
-	m_shakeOffset.x = 0.0f;
-	m_shakeOffset.y = 0.0f;
-	m_shakeIntensity = 0.0f;
-	m_FXPitch = 1.0f;
-	m_freezeTimeForCameraMovement = false;
-	m_cameraHasMovedSinceRequest = true;
-	m_locationRequests.clear();
-	m_locationRequests.reserve(MAX_REQUEST_CACHE_SIZE + 10);	// This prevents the vector from ever re-allocing
-
-	//Enhancements from CNC3 WST 4/15/2003. JSC Integrated 5/20/03.
-	m_CameraArrivedAtWaypointOnPathFlag = false;	// Scripts for polling camera reached targets
-	m_isCameraSlaved = false;						// This is for 3DSMax camera playback
-	m_useRealZoomCam = false;						// true;	//WST 10/18/2002
-	m_shakerAngles.X =0.0f;							// Proper camera shake generator & sources
-	m_shakerAngles.Y =0.0f;
-	m_shakerAngles.Z =0.0f;
-
-}  // end W3DView
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-W3DView::~W3DView()
-{
-
-	REF_PTR_RELEASE( m_2DCamera );
-	REF_PTR_RELEASE( m_3DCamera );
-
-}  // end ~W3DView
-
-//-------------------------------------------------------------------------------------------------
-/** Sets the height of the viewport, while maintaining original camera perspective. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setHeight(Int height)
-{
-	// extend View functionality
-	View::setHeight(height);
-
-	Vector2 vMin,vMax;
-	m_3DCamera->Set_Aspect_Ratio((Real)getWidth()/(Real)height);
- 	m_3DCamera->Get_Viewport(vMin,vMax);
- 	vMax.Y=(Real)(m_originY+height)/(Real)TheDisplay->getHeight();
- 	m_3DCamera->Set_Viewport(vMin,vMax);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Sets the width of the viewport, while maintaining original camera perspective. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setWidth(Int width)
-{
-	// extend View functionality
-	View::setWidth(width);
-
-	Vector2 vMin,vMax;
-	m_3DCamera->Set_Aspect_Ratio((Real)width/(Real)getHeight());
- 	m_3DCamera->Get_Viewport(vMin,vMax);
- 	vMax.X=(Real)(m_originX+width)/(Real)TheDisplay->getWidth();
- 	m_3DCamera->Set_Viewport(vMin,vMax);
-
-	//we want to maintain the same scale, so we'll need to adjust the fov.
-	//default W3D fov for full-screen is 50 degrees.
-	m_3DCamera->Set_View_Plane((Real)width/(Real)TheDisplay->getWidth()*DEG_TO_RADF(50.0f),-1);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Sets location of top-left view corner on display */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setOrigin( Int x, Int y)
-{
-	// extend View functionality
-	View::setOrigin(x,y);
-
-	Vector2 vMin,vMax;
-
- 	m_3DCamera->Get_Viewport(vMin,vMax);
- 	vMin.X=(Real)x/(Real)TheDisplay->getWidth();
-	vMin.Y=(Real)y/(Real)TheDisplay->getHeight();
- 	m_3DCamera->Set_Viewport(vMin,vMax);
-
-	// bottom-right border was also moved my this call, so force an update of extents.
-	setWidth(m_width);
-	setHeight(m_height);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** @todo This is inefficient. We should construct the matrix directly using vectors. */
-//-------------------------------------------------------------------------------------------------
-#define MIN_CAPPED_ZOOM (0.5f) //WST 10.19.2002. JSC integrated 5/20/03.
-void W3DView::buildCameraTransform( Matrix3D *transform )
-{
-	Vector3 sourcePos, targetPos;
-
-	Real groundLevel = m_groundLevel; // 93.0f; 
-
-	Real zoom = getZoom();
-	Real angle = getAngle();
-	Real pitch = getPitch();
-	Coord3D pos = *getPosition();
-
-	// add in the camera shake, if any
-	pos.x += m_shakeOffset.x;
-	pos.y += m_shakeOffset.y;
-
-	if (m_cameraConstraintValid)
-	{
-		pos.x = maxf(m_cameraConstraint.lo.x, pos.x);
-		pos.x = minf(m_cameraConstraint.hi.x, pos.x);
-		pos.y = maxf(m_cameraConstraint.lo.y, pos.y);
-		pos.y = minf(m_cameraConstraint.hi.y, pos.y);
-	}
-
-	// set position of camera itself
-	if (m_useRealZoomCam) //WST 10/10/2002 Real Zoom using FOV
-	{
-		sourcePos.X = m_cameraOffset.x;
-		sourcePos.Y = m_cameraOffset.y;
-		sourcePos.Z = m_cameraOffset.z;
-		Real capped_zoom = zoom;
-		if (capped_zoom > 1.0f)
-		{
-			capped_zoom= 1.0f;
-		}
-		if (capped_zoom < MIN_CAPPED_ZOOM)
-		{
-			capped_zoom = MIN_CAPPED_ZOOM;
-		}
-		m_FOV = 50.0f * PI/180.0f * capped_zoom * capped_zoom;
-	}
-	else
-	{
-		sourcePos.X = m_cameraOffset.x*zoom;
-		sourcePos.Y = m_cameraOffset.y*zoom;
-		sourcePos.Z = m_cameraOffset.z*zoom;
-	}
-
-#ifdef NOT_IN_USE
-	if (TheGlobalData->m_isOffsetCameraZ && TheTerrainLogic)
-	{
-		sourcePos.Z += TheTerrainLogic->getGroundHeight(pos.x, pos.y);
-		if (m_prevSourcePosZ != SOURCEPOS_INVALID)
-		{
-			const Real MAX_SPZ_VARIATION = 0.05f;
-			Real spzMin = m_prevSourcePosZ*(1.0-MAX_SPZ_VARIATION);
-			Real spzMax			Coord3D center;
- = m_prevSourcePosZ*(1.0+MAX_SPZ_VARIATION);
-			if (sourcePos.Z < spzMin) sourcePos.Z = spzMin;
-			if (sourcePos.Z > spzMax) sourcePos.Z = spzMax;
-		}
-		m_prevSourcePosZ = sourcePos.Z;
-	}
-#endif
-
-	// camera looking at origin
-	targetPos.X = 0;
-	targetPos.Y = 0;
-	targetPos.Z = 0;
-
-
-	Real factor = 1.0 - (groundLevel/sourcePos.Z );
-
-	// construct a matrix to rotate around the up vector by the given angle
-	Matrix3D angleTransform( Vector3( 0.0f, 0.0f, 1.0f ), angle );
-
-	// construct a matrix to rotate around the horizontal vector by the given angle
-	Matrix3D pitchTransform( Vector3( 1.0f, 0.0f, 0.0f ), pitch );
-
-	// rotate camera position (pitch, then angle)
-#ifdef ALLOW_TEMPORARIES
-	sourcePos = pitchTransform * sourcePos;
-	sourcePos = angleTransform * sourcePos;
-#else
-	pitchTransform.mulVector3(sourcePos);
-	angleTransform.mulVector3(sourcePos);
-#endif
-	sourcePos *= factor;
-
-	// translate to current XY position
-	sourcePos.X += pos.x;
-	sourcePos.Y += pos.y;
-	sourcePos.Z += groundLevel;
-	
-	targetPos.X += pos.x;
-	targetPos.Y += pos.y;
-	targetPos.Z += groundLevel;
-
-	// do m_FXPitch adjustment.
-	//WST Real height = sourcePos.Z - targetPos.Z;
-	//WST height *= m_FXPitch;
-	//WST targetPos.Z = sourcePos.Z - height;
-
-
-	// The following code moves camera down and pitch up when player zooms in.
-	// Use scripts to switch to useRealZoomCam
-	if (m_useRealZoomCam)
-	{	
-		Real pitch_adjust = 1.0f;
-
-		if (!TheDisplay->isLetterBoxed())
-		{
-			Real capped_zoom = zoom;
-			if (capped_zoom > 1.0f)
-			{
-				 capped_zoom= 1.0f;
-			}
-			if (capped_zoom < MIN_CAPPED_ZOOM)
-			{
-				capped_zoom = MIN_CAPPED_ZOOM;
-			}
-			sourcePos.Z = sourcePos.Z * ( 0.5f + capped_zoom * 0.5f); // move camera down physically
-			pitch_adjust = capped_zoom;	// adjust camera to pitch up
-		}
-		m_FXPitch = 1.0f * (0.25f + pitch_adjust*0.75f);
-	}
-
-
-	// do fxPitch adjustment
-	if (m_useRealZoomCam)
-	{
-		sourcePos.X = targetPos.X + ((sourcePos.X - targetPos.X) / m_FXPitch);
-		sourcePos.Y = targetPos.Y + ((sourcePos.Y - targetPos.Y) / m_FXPitch);
-	}
-	else
-	{
-		if (m_FXPitch <= 1.0f)
-		{
-			Real height = sourcePos.Z - targetPos.Z;
-			height *= m_FXPitch;
-			targetPos.Z = sourcePos.Z - height;
-		}
-		else
-		{
-			sourcePos.X = targetPos.X + ((sourcePos.X - targetPos.X) / m_FXPitch);
-			sourcePos.Y = targetPos.Y + ((sourcePos.Y - targetPos.Y) / m_FXPitch);
-		}
-	}
-
-	//m_3DCamera->Set_View_Plane(DEG_TO_RADF(50.0f));
-	//DEBUG_LOG(("zoom %f, SourceZ %f, posZ %f, groundLevel %f CamOffZ %f\n",
-	//			zoom, sourcePos.Z, pos.z, groundLevel,m_cameraOffset.z));
-
-	// build new camera transform
-	transform->Make_Identity();
-	transform->Look_At( sourcePos, targetPos, 0 );
-
-	//WST 11/12/2002 New camera shaker system 
-	CameraShakerSystem.Timestep(1.0f/30.0f); 
-	CameraShakerSystem.Update_Camera_Shaker(sourcePos, &m_shakerAngles);
-	transform->Rotate_X(m_shakerAngles.X);
-	transform->Rotate_Y(m_shakerAngles.Y);
-	transform->Rotate_Z(m_shakerAngles.Z);
-
-	//if (m_shakerAngles.X >= 0.0f)
-	//{
-	//	DEBUG_LOG(("m_shakerAngles %f, %f, %f\n", m_shakerAngles.X, m_shakerAngles.Y, m_shakerAngles.Z));
-	//}
-
-	// (gth) check if the camera is being controlled by an animation
-	if (m_isCameraSlaved) {
-		// find object named m_cameraSlaveObjectName
-		Object * obj = TheScriptEngine->getUnitNamed(m_cameraSlaveObjectName);
-		
-		if (obj != NULL) {
-			// dig out the drawable
-			Drawable * draw = obj->getDrawable();
-			if (draw != NULL) {
-
-				// dig out the first draw module with an ObjectDrawInterface
-				for (DrawModule ** dm = draw->getDrawModules(); *dm; ++dm) {
-					const ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
-					if (di) {
-						Matrix3D tm;
-						di->clientOnly_getRenderObjBoneTransform(m_cameraSlaveObjectBoneName,&tm);
-
-						// Ok, slam it into the camera!
-						*transform = tm;
-
-						//--------------------------------------------------------------------
-						// WST 10.22.2002. Update the Listener positions used by audio system
-						//--------------------------------------------------------------------
-						Vector3 position = transform->Get_Translation();
-						m_pos.x = position.X; 
-						m_pos.y = position.Y; 
-						m_pos.z = position.Z; 
-						
-
-						//DEBUG_LOG(("mpos x%f, y%f, z%f\n", m_pos.x, m_pos.y, m_pos.z ));
-
-						break;
-					}
-				}
-
-			} else {
-				m_isCameraSlaved = false;
-			}
-		} else {
-			m_isCameraSlaved = false;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::calcCameraConstraints()
-{
-//	const Matrix3D& cameraTransform = m_3DCamera->Get_Transform();
-
-//	DEBUG_LOG(("*** rebuilding cam constraints\n"));
-
-	// ok, now check to ensure that we can't see outside the map region,
-	// and twiddle the camera if needed
-	if (TheTerrainLogic)
-	{
-		Region3D mapRegion;
-		TheTerrainLogic->getExtent( &mapRegion );
-		
-	/*
-		Note the following restrictions on camera constraints!
-
-		-- they assume that all maps are height 'm_groundLevel' at the edges.
-				(since you need to add some "buffer" around the edges of your map
-				anyway, this shouldn't be an issue.)
-
-		-- for angles/pitches other than zero, it may show boundaries.
-				since we currently plan the game to be restricted to this,
-				it shouldn't be an issue.
-
-	*/
-		Real maxEdgeZ = m_groundLevel;
-//		const Real BORDER_FUDGE = MAP_XY_FACTOR * 1.414f;
-		Coord3D center, bottom;
-		ICoord2D screen;
-
-		//Pick at the center
-		screen.x=0.5f*getWidth()+m_originX;
-		screen.y=0.5f*getHeight()+m_originY;
-
-		Vector3 rayStart,rayEnd;
-
-		getPickRay(&screen,&rayStart,&rayEnd);
-
-		center.x = Vector3::Find_X_At_Z(maxEdgeZ, rayStart, rayEnd);
-		center.y = Vector3::Find_Y_At_Z(maxEdgeZ, rayStart, rayEnd);
-		center.z = maxEdgeZ;
-
-		screen.y = m_originY+ 0.95f*getHeight();
- 		getPickRay(&screen,&rayStart,&rayEnd);
- 		bottom.x = Vector3::Find_X_At_Z(maxEdgeZ, rayStart, rayEnd);
-		bottom.y = Vector3::Find_Y_At_Z(maxEdgeZ, rayStart, rayEnd);
-		bottom.z = maxEdgeZ;
-		center.x -= bottom.x;
-		center.y -= bottom.y;
-
-		Real offset = center.length();
-
-		if (TheGlobalData->m_debugAI) {
-			offset = -1000; // push out the constraints so we can look at staging areas.
-		}
-
-		m_cameraConstraint.lo.x = mapRegion.lo.x + offset;
-		m_cameraConstraint.hi.x = mapRegion.hi.x - offset;
-		// this looks inverted, but is correct
-		m_cameraConstraint.lo.y = mapRegion.lo.y + offset;
-		m_cameraConstraint.hi.y = mapRegion.hi.y - offset;
-		m_cameraConstraintValid = true;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Returns a world-space ray originating at a given screen pixel position
-	and ending at the far clip plane for current camera.  Screen coordinates
-	assumed in absolute values relative to full display resolution.*/
-//-------------------------------------------------------------------------------------------------
-void W3DView::getPickRay(const ICoord2D *screen, Vector3 *rayStart, Vector3 *rayEnd)
-{
-	Real logX,logY;
-
-	//W3D Screen coordinates are -1 to 1, so we need to do some conversion:
-	PixelScreenToW3DLogicalScreen(screen->x - m_originX,screen->y - m_originY, &logX, &logY,getWidth(),getHeight());
-
-	*rayStart = m_3DCamera->Get_Position();	//get camera location
-	m_3DCamera->Un_Project(*rayEnd,Vector2(logX,logY));	//get world space point
-	*rayEnd -= *rayStart;	//vector camera to world space point
-	rayEnd->Normalize();	//make unit vector
-	*rayEnd *= m_3DCamera->Get_Depth();	//adjust length to reach far clip plane
-	*rayEnd += *rayStart;	//get point on far clip plane along ray from camera.
-}
-
-//-------------------------------------------------------------------------------------------------
-/** set the transform matrix of m_3DCamera, based on m_pos & m_angle */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setCameraTransform( void )
-{
-	if (TheGlobalData->m_headless)
-		return;
-	m_cameraHasMovedSinceRequest = true;
-	Matrix3D cameraTransform( 1 );
-	
-	Real nearZ, farZ;
-	// m_3DCamera->Get_Clip_Planes(nearZ, farZ);
-	// Set the near to MAP_XY_FACTOR.  Improves zbuffer resolution.
-	nearZ = MAP_XY_FACTOR; 
-	farZ = 1200.0f;
-
-	if (m_useRealZoomCam)	//WST 10.19.2002
-	{
-		if (m_FXPitch<0.95f)
-		{
-			farZ = farZ / m_FXPitch; //Extend far Z when we pitch up for RealZoomCam
-		}
-	}
-	else
-	{
-		if ((TheGlobalData && TheGlobalData->m_drawEntireTerrain) || (m_FXPitch<0.95f || m_zoom>1.05))
-		{	//need to extend far clip plane so entire terrain can be visible
-			farZ *= MAP_XY_FACTOR;
-		}
-	}
-
-	m_3DCamera->Set_Clip_Planes(nearZ, farZ);
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if (TheGlobalData->m_useCameraConstraints)
-#endif
-	{
-		if (!m_cameraConstraintValid)
-		{
-			buildCameraTransform(&cameraTransform);
-			m_3DCamera->Set_Transform( cameraTransform );
-			calcCameraConstraints();
-		}
-		DEBUG_ASSERTLOG(m_cameraConstraintValid,("*** cam constraints are not valid!!!\n"));
-
-		if (m_cameraConstraintValid)
-		{
-			Coord3D pos = *getPosition();
-			pos.x = maxf(m_cameraConstraint.lo.x, pos.x);
-			pos.x = minf(m_cameraConstraint.hi.x, pos.x);
-			pos.y = maxf(m_cameraConstraint.lo.y, pos.y);
-			pos.y = minf(m_cameraConstraint.hi.y, pos.y);
-			setPosition(&pos);
-		}
-	}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	m_3DCamera->Set_View_Plane( m_FOV, -1 );
-#endif
-
-	// rebuild it (even if we just did it due to camera constraints)
-	buildCameraTransform( &cameraTransform );
-	m_3DCamera->Set_Transform( cameraTransform );
-
-	if (TheTerrainRenderObject)
-	{
-		RefRenderObjListIterator *it = W3DDisplay::m_3DScene->createLightsIterator();
-		TheTerrainRenderObject->updateCenter(m_3DCamera, it);
-		if (it) 
-		{
-		 W3DDisplay::m_3DScene->destroyLightsIterator(it);
-		 it = NULL;
-		}
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::init( void )
-{
-	// extend View functionality
-	View::init();
-	setName("W3DView");
-	// set default camera "lookat" point
-	Coord3D pos;
-	pos.x = 87.0f;
-	pos.y = 77.0f;
-	pos.z = 0;
-
-	pos.x *= MAP_XY_FACTOR;
-	pos.y *= MAP_XY_FACTOR;
-
-	setPosition(&pos);
-
-	// create our 3D camera
-	m_3DCamera = NEW_REF( CameraClass, () );
-
-
-	setCameraTransform();
-
-	// create our 2D camera for the GUI overlay
-	m_2DCamera = NEW_REF( CameraClass, () );
-	m_2DCamera->Set_Position( Vector3( 0, 0, 1 ) );
-	Vector2 min = Vector2( -1, -0.75f );
-	Vector2 max = Vector2( +1, +0.75f );
-	m_2DCamera->Set_View_Plane( min, max );		
-	m_2DCamera->Set_Clip_Planes( 0.995f, 2.0f );
-
-	m_cameraConstraintValid = false;
-
-	m_scrollAmountCutoff = TheGlobalData->m_scrollAmountCutoff;
-
-}  // end init
-
-//-------------------------------------------------------------------------------------------------
-const Coord3D& W3DView::get3DCameraPosition() const
-{
-	Vector3 camera = m_3DCamera->Get_Position();
-	static Coord3D pos;
-	pos.set( camera.X, camera.Y, camera.Z );
-	return pos;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::reset( void )
-{
-	View::reset();
-
-	// Just in case...
-	setTimeMultiplier(1); // Set time rate back to 1.
-
-	Coord3D arbitraryPos = { 0, 0, 0 };
-	// Just move the camera to 0, 0, 0. It'll get repositioned at the beginning of the next game
-	// anyways.
-	resetCamera(&arbitraryPos, 1, 0.0f, 0.0f);
-
-	setViewFilter(FT_VIEW_DEFAULT);
-
-	Coord2D gb = { 0,0 };
-	setGuardBandBias( &gb );
-}
-
-//-------------------------------------------------------------------------------------------------
-/** draw worker for drawables in the view region */
-//-------------------------------------------------------------------------------------------------
-static void drawDrawable( Drawable *draw, void *userData )
-{
-
-	draw->draw( (View *)userData );
-
-}  // end drawDrawable
-
-// ------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-static void drawTerrainNormal( Drawable *draw, void *userData )
-{
-	UnsignedInt color = GameMakeColor( 255, 255, 0, 255 );
-  if (TheTerrainLogic)
-  {
-    Coord3D pos = *draw->getPosition();
-    Coord3D normal;
-    pos.z = TheTerrainLogic->getGroundHeight(pos.x, pos.y, &normal);
-    const Real NORMLEN = 20;
-    normal.x = pos.x + normal.x * NORMLEN;
-    normal.y = pos.y + normal.y * NORMLEN;
-    normal.z = pos.z + normal.z * NORMLEN;
-    ICoord2D start, end;
-		TheTacticalView->worldToScreen(&pos, &start);
-		TheTacticalView->worldToScreen(&normal, &end);
-		TheDisplay->drawLine(start.x, start.y, end.x, end.y, 1.0f, color);
-  }
-}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-// ------------------------------------------------------------------------------------------------
-// Draw a crude circle. Appears on top of any world geometry
-// ------------------------------------------------------------------------------------------------
-void drawDebugCircle( const Coord3D & center, Real radius, Real width, Color color )
-{
-  const Real inc = PI/4.0f;
-  Real angle = 0.0f;
-  Coord3D pnt, lastPnt;
-  ICoord2D start, end;
-  Bool endValid, startValid;
-
-  lastPnt.x = center.x + radius * (Real)cos(angle);
-  lastPnt.y = center.y + radius * (Real)sin(angle);
-  lastPnt.z = center.z;
-  endValid = ( TheTacticalView->worldToScreenTriReturn( &lastPnt, &end ) != View::WTS_INVALID );
-  
-  for( angle = inc; angle <= 2.0f * PI; angle += inc )
-  {
-    pnt.x = center.x + radius * (Real)cos(angle);
-    pnt.y = center.y + radius * (Real)sin(angle);
-    pnt.z = center.z;
-    startValid = ( TheTacticalView->worldToScreenTriReturn( &pnt, &start ) != View::WTS_INVALID );
-    
-    if ( startValid && endValid ) 
-      TheDisplay->drawLine( start.x, start.y, end.x, end.y, width, color );
-    
-    lastPnt = pnt;
-    end = start;
-    endValid = startValid;
-  }
-}
-
-void drawDrawableExtents( Drawable *draw, void *userData );  // FORWARD DECLARATION
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-static void drawContainedDrawable( Object *obj, void *userData )
-{
-	Drawable *draw = obj->getDrawable();
-
-	if( draw )
-		drawDrawableExtents( draw, userData );
-
-}  // end drawContainedDrawable
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-static void drawDrawableExtents( Drawable *draw, void *userData )
-{
-	UnsignedInt color = GameMakeColor( 0, 255, 0, 255 );
-
-	switch( draw->getDrawableGeometryInfo().getGeomType() )
-	{
-
-		//---------------------------------------------------------------------------------------------
-		case GEOMETRY_BOX:
-		{
-			Real angle = draw->getOrientation();
-			Real c = (Real)cos(angle);
-			Real s = (Real)sin(angle);
-			Real exc = draw->getDrawableGeometryInfo().getMajorRadius()*c;
-			Real eyc = draw->getDrawableGeometryInfo().getMinorRadius()*c;
-			Real exs = draw->getDrawableGeometryInfo().getMajorRadius()*s;
-			Real eys = draw->getDrawableGeometryInfo().getMinorRadius()*s;
-			Coord3D pts[4];
-			pts[0].x = draw->getPosition()->x - exc - eys;
-			pts[0].y = draw->getPosition()->y + eyc - exs;
-			pts[0].z = 0;
-			pts[1].x = draw->getPosition()->x + exc - eys;
-			pts[1].y = draw->getPosition()->y + eyc + exs;
-			pts[1].z = 0;
-			pts[2].x = draw->getPosition()->x + exc + eys;
-			pts[2].y = draw->getPosition()->y - eyc + exs;
-			pts[2].z = 0;
-			pts[3].x = draw->getPosition()->x - exc + eys;
-			pts[3].y = draw->getPosition()->y - eyc - exs;
-			pts[3].z = 0;
-			Real z = draw->getPosition()->z;
-			for( int i = 0; i < 2; i++ )
-			{
-
-				for (int corner = 0; corner < 4; corner++)
-				{
-					ICoord2D start, end;
-					pts[corner].z = z;
-					pts[(corner+1)&3].z = z;
-					TheTacticalView->worldToScreen(&pts[corner], &start);
-					TheTacticalView->worldToScreen(&pts[(corner+1)&3], &end);
-					TheDisplay->drawLine(start.x, start.y, end.x, end.y, 1.0f, color);
-				}
-
-				z += draw->getDrawableGeometryInfo().getMaxHeightAbovePosition();
-
-			}  // end for i
-
-			break;
-
-		}  // end case box
-
-		//---------------------------------------------------------------------------------------------
-		case GEOMETRY_SPHERE:	// not quite right, but close enough
-		case GEOMETRY_CYLINDER:
-		{ 
-      Coord3D center = *draw->getPosition();
-      const Real radius = draw->getDrawableGeometryInfo().getMajorRadius();
-
-			// draw cylinder
-			for( int i=0; i<2; i++ )
-			{
-        drawDebugCircle( center, radius, 1.0f, color );
-
-        // next time 'round, draw the top of the cylinder
-        center.z += draw->getDrawableGeometryInfo().getMaxHeightAbovePosition();
-			}	// end for i
-
-			// draw centerline
-      ICoord2D start, end;
-      center = *draw->getPosition();
-      TheTacticalView->worldToScreen( &center, &start );
-      center.z += draw->getDrawableGeometryInfo().getMaxHeightAbovePosition();
-      TheTacticalView->worldToScreen( &center, &end );
-			TheDisplay->drawLine( start.x, start.y, end.x, end.y, 1.0f, color );
-
-			break;
-
-		}	// case CYLINDER
-
-	} // end switch
-
-	// draw any extents for things that are contained by this
-	Object *obj = draw->getObject();
-	if( obj )
-	{
-		ContainModuleInterface *contain = obj->getContain();
-
-		if( contain )
-			contain->iterateContained( drawContainedDrawable, userData, FALSE );
-
-	}  // end if
-
-}  // end drawDrawableExtents
-
-
-void drawAudioLocations( Drawable *draw, void *userData );
-// ------------------------------------------------------------------------------------------------
-// Helper for drawAudioLocations
-// ------------------------------------------------------------------------------------------------
-static void drawContainedAudioLocations( Object *obj, void *userData )
-{
-  Drawable *draw = obj->getDrawable();
-  
-  if( draw )
-    drawAudioLocations( draw, userData );
-  
-}  // end drawContainedAudio
-
-
-//-------------------------------------------------------------------------------------------------
-// Draw the location of audio objects in the world
-//-------------------------------------------------------------------------------------------------
-static void drawAudioLocations( Drawable *draw, void *userData )
-{
-  // draw audio for things that are contained by this
-  Object *obj = draw->getObject();
-  if( obj )
-  {
-    ContainModuleInterface *contain = obj->getContain();
-    
-    if( contain )
-      contain->iterateContained( drawContainedAudioLocations, userData, FALSE );
-    
-  }  // end if
-
-  const ThingTemplate * thingTemplate = draw->getTemplate();
-
-  if ( thingTemplate == NULL || thingTemplate->getEditorSorting() != ES_AUDIO )
-  {
-    return; // All done
-  }
-
-  // Copied in hideously inappropriate code copying ways from DrawObject.cpp
-  // Should definately be a global, probably read in from an INI file <gasp>
-  static const Int poleHeight = 20;
-  static const Int flagHeight = 10;
-  static const Int flagWidth = 10;
-  const Color color = GameMakeColor(0x25, 0x25, 0xEF, 0xFF);
-
-  // Draw flag for audio-only objects:
-  //  *
-  //  * *
-  //  *   *
-  //  *     *
-  //  *   *
-  //  * *
-  //  *
-  //  *
-  //  *
-  //  *
-  //  *
-
-  Coord3D worldPoint;
-  ICoord2D start, end;
-
-  worldPoint = *draw->getPosition();
-  TheTacticalView->worldToScreen( &worldPoint, &start );
-  worldPoint.z += poleHeight;
-  TheTacticalView->worldToScreen( &worldPoint, &end );
-  TheDisplay->drawLine( start.x, start.y, end.x, end.y, 1.0f, color );
-  
-  worldPoint.z -= flagHeight / 2;
-  worldPoint.x += flagWidth;
-  TheTacticalView->worldToScreen( &worldPoint, &start );
-  TheDisplay->drawLine( start.x, start.y, end.x, end.y, 1.0f, color );
-
-  worldPoint.z -= flagHeight / 2;
-  worldPoint.x -= flagWidth;
-  TheTacticalView->worldToScreen( &worldPoint, &end );
-  TheDisplay->drawLine( start.x, start.y, end.x, end.y, 1.0f, color );
-}
-
-//-------------------------------------------------------------------------------------------------
-// Draw the radii of sounds attached to any type of object. 
-//-------------------------------------------------------------------------------------------------
-static void drawAudioRadii( const Drawable * drawable )
-{
-  
-  // Draw radii, if sound is playing
-  const AudioEventRTS * ambientSound = drawable->getAmbientSound();
-  
-  if ( ambientSound && ambientSound->isCurrentlyPlaying() )
-  {
-    const AudioEventInfo * ambientInfo = ambientSound->getAudioEventInfo();
-    
-    if ( ambientInfo == NULL )
-    {
-      // I don't think that's right...
-      OutputDebugString( ("Playing sound has NULL AudioEventInfo?\n" ) );
-      
-      if ( TheAudio != NULL )
-      {
-        ambientInfo = TheAudio->findAudioEventInfo( ambientSound->getEventName() );
-      }
-    }
-    
-    if ( ambientInfo != NULL )
-    {
-      // Colors match those used in WorldBuilder
-      drawDebugCircle( *drawable->getPosition(), ambientInfo->m_minDistance, 1.0f, GameMakeColor(0x00, 0x00, 0xFF, 0xFF) );
-      drawDebugCircle( *drawable->getPosition(), ambientInfo->m_maxDistance, 1.0f, GameMakeColor(0xFF, 0x00, 0xFF, 0xFF) );
-    }
-  }
-}
-
-#endif
-
-//-------------------------------------------------------------------------------------------------
-/** An opportunity to draw something after all drawables have been drawn once */
-//-------------------------------------------------------------------------------------------------
-static void drawablePostDraw( Drawable *draw, void *userData )
-{
-	Real FXPitch = TheTacticalView->getFXPitch();
-	if (draw->isDrawableEffectivelyHidden() || FXPitch < 0.0f)
-		return;
-
-	Object* obj = draw->getObject();
-	Int localPlayerIndex = ThePlayerList ? ThePlayerList->getLocalPlayer()->getPlayerIndex() : 0;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	ObjectShroudStatus ss = (!obj || !TheGlobalData->m_shroudOn) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex);
-#else
-	ObjectShroudStatus ss = (!obj) ? OBJECTSHROUD_CLEAR : obj->getShroudedStatus(localPlayerIndex);
-#endif
-	if (ss > OBJECTSHROUD_PARTIAL_CLEAR)
-		return;
-
-	// draw the any "icon" UI for a drawable (health bars, veterency, etc);
-	
-	//*****
-	//@TODO: Create a way to reject this call easily -- like objects that have no compatible modules.
-	//*****
-	//if( draw->getStatusBits() )
-	//{
-			draw->drawIconUI();
-	//}
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	// debug collision extents
-	if( TheGlobalData->m_showCollisionExtents )
-	  drawDrawableExtents( draw, userData );
-
-  if ( TheGlobalData->m_showAudioLocations )
-    drawAudioLocations( draw, userData );
-#endif
-
-	// debug terrain normals at object positions
-	if( TheGlobalData->m_showTerrainNormals )
-	  drawTerrainNormal( draw, userData );
-
-	TheGameClient->incrementRenderedObjectCount();
-
-}  // end drawablePostDraw
-
-//-------------------------------------------------------------------------------------------------
-// Display AI debug visuals
-//-------------------------------------------------------------------------------------------------
-static void renderAIDebug( void )
-{
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-Bool W3DView::updateCameraMovements()
-{
-	Bool didUpdate = false;
-
-	if (m_doingZoomCamera)
-	{
-		zoomCameraOneFrame();
-		didUpdate = true;
-	}
-	if (m_doingPitchCamera)
-	{
-		pitchCameraOneFrame();
-		didUpdate = true;
-	}
-	if (m_doingRotateCamera) {	
-		m_previousLookAtPosition = *getPosition();
-		rotateCameraOneFrame();
-		didUpdate = true;
-	} else if (m_doingMoveCameraOnWaypointPath) {
-		m_previousLookAtPosition = *getPosition();
-		moveAlongWaypointPath(TheW3DFrameLengthInMsec);
-		didUpdate = true;
-	}
-	if (m_doingScriptedCameraLock)
-	{
-		didUpdate = true;
-	}
-	return didUpdate;
-}
-
-
-/** This function performs all actions which affect the camera transform or 3D objects
-	rendered in this frame.
-
-   MW: I moved this code out out W3DView::draw() so that we can get final camera and object
-   positions before any rendering begins.  This was necessary so that reflection textures
-   (which update before the main rendering loop) could get a correct version of the scene.
-   Without this change, the reflections were always 1 frame behind the non-reflected view.
-*/
-void W3DView::updateView(void)
-{
-	UPDATE();
-}
-
-//DECLARE_PERF_TIMER(W3DView_updateView)
-void W3DView::update(void)
-{
-	//USE_PERF_TIMER(W3DView_updateView)
-	Bool recalcCamera = false;
-	Bool didScriptedMovement = false;
-#ifdef LOG_FRAME_TIMES
-	__int64 curTime64,freq64;
-	static __int64 prevTime64=0;
-	QueryPerformanceFrequency((LARGE_INTEGER *)&freq64);
-	QueryPerformanceCounter((LARGE_INTEGER *)&curTime64);
-	freq64 /= 1000;
-
-	Int elapsedTimeMs = (curTime64 - prevTime64)/freq64;
-	prevTime64 = curTime64;
-
-#endif
-
-//	Int elapsedTimeMs = TheW3DFrameLengthInMsec; // Assume a constant time flow.  It just works out better.  jba.
-
-	if (TheTerrainRenderObject->doesNeedFullUpdate()) {
-		RefRenderObjListIterator *it = W3DDisplay::m_3DScene->createLightsIterator();
-		TheTerrainRenderObject->updateCenter(m_3DCamera, it);
-		if (it) 
-		{
-		 W3DDisplay::m_3DScene->destroyLightsIterator(it);
-		 it = NULL;
-		}
-	}
-
-	static Real followFactor = -1;
-	ObjectID cameraLock = getCameraLock();
-	if (cameraLock == INVALID_ID) 
-	{
-		followFactor = -1;
-	}
-	if (cameraLock != INVALID_ID)
-	{
-		m_doingMoveCameraOnWaypointPath = false;
-		m_CameraArrivedAtWaypointOnPathFlag = false;
-
-		Object* cameraLockObj = TheGameLogic->findObjectByID(cameraLock);
-		Bool loseLock = false;
-
-		// check if object has been destroyed or is dead -> lose lock
-		if (cameraLockObj == NULL)
-		{
-			loseLock = true;
-		}
-#if 0
-		else
-		{
-			AIUpdateInterface *ai = cameraLockObj->getAIUpdateInterface();
-			if (ai && ai->isDead())
-				loseLock = true;
-		}
-#endif
-
-
-		if (loseLock)
-		{
-			setCameraLock(INVALID_ID);
-			setCameraLockDrawable(NULL);
-			followFactor = -1;
-		}
-		else
-		{
-			if (followFactor<0) {
-				followFactor = 0.05f;
-			} else {
-				followFactor += 0.05f;
-				if (followFactor>1.0f) followFactor = 1.0f;
-			}
-			if (getCameraLockDrawable() != NULL)
-			{
-				Drawable* cameraLockDrawable = (Drawable *)getCameraLockDrawable();
-
-				if (!cameraLockDrawable)
-				{
-					setCameraLockDrawable(NULL);
-				}
-				else
-				{
-					Coord3D pos;
-					Real boundingSphereRadius;
-					Matrix3D transform;
-					// this method must ONLY be called from the client, NEVER From the logic, not even indirectly.
-					if (cameraLockDrawable->clientOnly_getFirstRenderObjInfo(&pos, &boundingSphereRadius, &transform))
-					{
-						Vector3 zaxis(0,0,1);
-
-						Vector3 objPos;
-						objPos.X = pos.x;
-						objPos.Y = pos.y;
-						objPos.Z = pos.z;
-
-						//get position of top of object, assuming world z roughly along local z.
-						objPos += boundingSphereRadius * 1.0f * zaxis;
-						Vector3 objview = transform.Get_X_Vector();	//get view vector of object
-						//move camera back behind object far enough not to intersect bounding sphere
-						Vector3 camtran = objPos - objview * boundingSphereRadius*4.5f;
-
-						Vector3 prevCamTran = m_3DCamera->Get_Position();	//get current camera position.
-
-						Vector3 tranDiff = (camtran - prevCamTran);	//vector old position to new position.
-
-						camtran = prevCamTran + tranDiff * 0.1f;	//slowly move camera to new position.
-
-						Matrix3D camXForm;
-						camXForm.Look_At(camtran,objPos,0);
-						m_3DCamera->Set_Transform(camXForm);
-
-						recalcCamera = false;	//we already did it
-					}
-				}
-			}
-			else
-			{	Coord3D objpos = *cameraLockObj->getPosition();
-				Coord3D curpos = *getPosition();
-				// don't "snap" directly to the pos, but move there smoothly.
-				Real snapThreshSqr = sqr(TheGlobalData->m_partitionCellSize);
-				Real curDistSqr = sqr(curpos.x - objpos.x) + sqr(curpos.y - objpos.y);
-				if ( m_snapImmediate)
-				{
-					// close enough.
-					curpos.x = objpos.x;
-					curpos.y = objpos.y;
-				}
-				else
-				{
-//					Real ratio = 1.0f - snapThreshSqr/curDistSqr;
-					Real dx = objpos.x-curpos.x;
-					Real dy = objpos.y-curpos.y;
-					if (m_lockType == LOCK_TETHER)
-					{
-						//snapThreshSqr = sqr( m_lockDist * TheGlobalData->m_partitionCellSize );
-						if (curDistSqr >= snapThreshSqr)
-						{
-							Real ratio = 1.0f - snapThreshSqr/curDistSqr;
-							
-							// move halfway there.
-							curpos.x += dx*ratio*0.5f;
-							curpos.y += dy*ratio*0.5f;
-						}
-						else
-						{
-							// we're inside our 'play' tolerance.  Move slowly to the obj
-							Real ratio = 0.01f * m_lockDist;
-							Real dx = objpos.x-curpos.x;
-							Real dy = objpos.y-curpos.y;
-							curpos.x += dx*ratio;
-							curpos.y += dy*ratio;
-						}
-					}
-					else
-					{
-						curpos.x += dx*followFactor;
-						curpos.y += dy*followFactor;
-					}
-				}
-				if (!(TheScriptEngine->isTimeFrozenDebug() || TheScriptEngine->isTimeFrozenScript()) && !TheGameLogic->isGamePaused()) {
-					m_previousLookAtPosition = *getPosition();
-				}
-				setPosition(&curpos);
-
-				if (m_lockType == LOCK_FOLLOW)
-				{
-					// camera follow objects if they are flying
-					if (cameraLockObj->isUsingAirborneLocomotor() && cameraLockObj->isAboveTerrainOrWater())
-					{
-						Matrix3D camXForm;
-						Real oldZRot = m_angle;
-						Real idealZRot = cameraLockObj->getOrientation() - M_PI_2;
-						normAngle(oldZRot);
-						normAngle(idealZRot);
-						Real diff = idealZRot - oldZRot;
-						normAngle(diff);
-
-						if (m_snapImmediate)
-						{
-							m_angle = idealZRot;
-						}
-						else
-						{
-							m_angle += diff * 0.1f;
-						}
-						normAngle(m_angle);
-					}
-				}
-				if (m_snapImmediate)
-					m_snapImmediate = FALSE;
-
-				m_groundLevel = objpos.z;
-				didScriptedMovement = true;
-				recalcCamera = true;
-			}
-		}
-	}	
-
-	if (!(TheScriptEngine->isTimeFrozenDebug()/* || TheScriptEngine->isTimeFrozenScript()*/) && !TheGameLogic->isGamePaused()) {
-		// If we aren't frozen for debug, allow the camera to follow scripted movements.
-		if (updateCameraMovements()) {
-			didScriptedMovement = true;
-			recalcCamera = true;
-		}
-	} else {
-		if (m_doingRotateCamera || m_doingMoveCameraOnWaypointPath || m_doingPitchCamera || m_doingZoomCamera || m_doingScriptedCameraLock) {
-			didScriptedMovement = true; // don't mess up the scripted movement
-		}
-	}
-	//
-	// Process camera shake
-	/// @todo Make this framerate-independent
-	//
-	if (m_shakeIntensity > 0.01f)
-	{
-		m_shakeOffset.x = m_shakeIntensity * m_shakeAngleCos;
-		m_shakeOffset.y = m_shakeIntensity * m_shakeAngleSin;
-
-		// fake a stiff spring/damper
-		const Real dampingCoeff = 0.75f;
-		m_shakeIntensity *= dampingCoeff;
-
-		// spring is so "stiff", it pulls 180 degrees opposite each frame
-		m_shakeAngleCos = -m_shakeAngleCos;
-		m_shakeAngleSin = -m_shakeAngleSin;
-
-		recalcCamera = true;
-	}
-	else
-	{
-		m_shakeIntensity = 0.0f;
-		m_shakeOffset.x = 0.0f;
-		m_shakeOffset.y = 0.0f;
-	}
-
-	//Process New C3 Camera Shaker system
-	if (CameraShakerSystem.IsCameraShaking())
-	{
-		recalcCamera = true;
-	}
-
-	/*
-	 * In order to have the camera follow the terrain in a non-dizzying way, we will have a
-	 * "desired height" value that the user sets.  While scrolling, the actual height (set by
-	 * zoom) will not get updated unless we are scrolling uphill and our view either goes
-	 * underground or higher than the max allowed height.  When the camera is at rest (not
-	 * scrolling), the zoom will move toward matching the desired height.
-	 */
-	m_terrainHeightUnderCamera = getHeightAroundPos(m_pos.x, m_pos.y);
-	m_currentHeightAboveGround = m_cameraOffset.z * m_zoom - m_terrainHeightUnderCamera;
-	if (TheTerrainLogic && TheGlobalData && TheInGameUI && m_okToAdjustHeight && !TheGameLogic->isGamePaused())
-	{
-		Real desiredHeight = (m_terrainHeightUnderCamera + m_heightAboveGround);
-		Real desiredZoom = desiredHeight / m_cameraOffset.z;
-  	if (didScriptedMovement || (TheGameLogic->isInReplayGame() && TheGlobalData->m_useCameraInReplay))
-  	{
-  		// if we are in a scripted camera movement, take its height above ground as our desired height.
-  		m_heightAboveGround = m_currentHeightAboveGround;
-			//DEBUG_LOG(("Frame %d: height above ground: %g %g %g %g\n", TheGameLogic->getFrame(), m_heightAboveGround,
-			//	m_cameraOffset.z, m_zoom, m_terrainHeightUnderCamera));
-  	}
-		if (TheInGameUI->isScrolling())
-		{
-			// if scrolling, only adjust if we're too close or too far
-			if (m_scrollAmount.length() < m_scrollAmountCutoff || (m_currentHeightAboveGround < m_minHeightAboveGround) || (TheGlobalData->m_enforceMaxCameraHeight && m_currentHeightAboveGround > m_maxHeightAboveGround))
-			{
-				Real zoomAdj = (desiredZoom - m_zoom)*TheGlobalData->m_cameraAdjustSpeed;
-				if (fabs(zoomAdj) >= 0.0001)	// only do positive
-				{
-					m_zoom += zoomAdj;
-					recalcCamera = true;
-				}
-			}
-		}
-		else
-		{
-			// we're not scrolling; settle toward desired height above ground
-			Real zoomAdj = (m_zoom - desiredZoom)*TheGlobalData->m_cameraAdjustSpeed;
-			Real zoomAdjAbs = fabs(zoomAdj);
-			if (zoomAdjAbs >= 0.0001 && !didScriptedMovement)
-			{
-				//DEBUG_LOG(("W3DView::update() - m_zoom=%g, desiredHeight=%g\n", m_zoom, desiredZoom));
-				m_zoom -= zoomAdj;
-				recalcCamera = true;
-			}
-		}
-	}
-	if (TheScriptEngine->isTimeFast()) {
-		return; // don't draw - makes it faster :) jba.
-	}
-	
-	// (gth) C&C3 if m_isCameraSlaved then force the camera to update each frame
-	if ((recalcCamera) || (m_isCameraSlaved)) {
-		setCameraTransform();
-	}
-
-
-#ifdef DO_SEISMIC_SIMULATIONS
-  // Give the terrain a chance to refresh animaing (Seismic) regions, if any.
-  TheTerrainVisual->updateSeismicSimulations();
-#endif
-  
-	Region3D axisAlignedRegion;
-	getAxisAlignedViewRegion(axisAlignedRegion);
-
-	// render all of the visible Drawables
-	/// @todo this needs to use a real region partition or something
-	if (WW3D::Get_Frame_Time())	//make sure some time actually elapsed
-		TheGameClient->iterateDrawablesInRegion( &axisAlignedRegion, drawDrawable, this );
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Find region which contains all drawables in 3D space. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::getAxisAlignedViewRegion(Region3D &axisAlignedRegion)
-{
-	//
-	// get the 4 points in 3D space of the 4 corners of the view, we will use a z = 0.0f
-	// value so that we can get everything ... even stuff below the terrain
-	//
-	Coord3D box[ 4 ];
-	getScreenCornerWorldPointsAtZ( &box[ 0 ], &box[ 1 ], &box[ 2 ], &box[ 3 ], 0.0f );
-
-	//
-	// take those 4 corners projected into the world and create an axis aligned bounding
-	// box, we will use this box to iterate the drawables in 3D space
-	//
-	axisAlignedRegion.lo = box[ 0 ];
-	axisAlignedRegion.hi = box[ 0 ];
-	for( Int i = 0; i < 4; i++ )
-	{
-
-		if( box[ i ].x < axisAlignedRegion.lo.x )
-			axisAlignedRegion.lo.x = box[ i ].x;
-		if( box[ i ].y < axisAlignedRegion.lo.y )
-			axisAlignedRegion.lo.y = box[ i ].y;
-		if( box[ i ].x > axisAlignedRegion.hi.x )
-		  axisAlignedRegion.hi.x = box[ i ].x;
-		if( box[ i ].y > axisAlignedRegion.hi.y )
-		  axisAlignedRegion.hi.y = box[ i ].y;
-
-	}  // end for i
-
-	// low and high regions will be based of the extent of the map
-	Region3D mapExtent;
-	Real safeValue = 999999;
-	TheTerrainLogic->getExtent( &mapExtent );
-	axisAlignedRegion.lo.z = mapExtent.lo.z - safeValue;
-	axisAlignedRegion.hi.z = mapExtent.hi.z + safeValue;
-
-	// we want to overscan a little bit so that we get objects that are partially offscreen
-	axisAlignedRegion.lo.x -= (DRAWABLE_OVERSCAN + m_guardBandBias.x);
-	axisAlignedRegion.lo.y -= (DRAWABLE_OVERSCAN + m_guardBandBias.y + 60.0f );
-	axisAlignedRegion.hi.x += (DRAWABLE_OVERSCAN + m_guardBandBias.x);
-	axisAlignedRegion.hi.y += (DRAWABLE_OVERSCAN + m_guardBandBias.y);
-
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::setFadeParameters(Int fadeFrames, Int direction)
-{
-	ScreenBWFilter::setFadeParameters(fadeFrames, direction);
-	ScreenCrossFadeFilter::setFadeParameters(fadeFrames,direction);
-}
-
-void W3DView::set3DWireFrameMode(Bool enable)
-{
-	m_nextWireFrameEnabled = enable;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Sets the view filter mode. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setViewFilterPos(const Coord3D *pos)
-{
-	ScreenMotionBlurFilter::setZoomToPos(pos);
-}
-//-------------------------------------------------------------------------------------------------
-/** Sets the view filter mode. */
-//-------------------------------------------------------------------------------------------------
-Bool W3DView::setViewFilterMode(enum FilterModes filterMode)
-{
-	FilterModes oldMode = m_viewFilterMode;	//save previous mode in case setup fails.
-
-	m_viewFilterMode = filterMode;
-	if (m_viewFilterMode != FM_NULL_MODE && 
-		m_viewFilter != FT_NULL_FILTER) {
-		if (!W3DShaderManager::filterSetup(m_viewFilter, m_viewFilterMode))
-		{	//setup failed so restore previous mode.
-			m_viewFilterMode = oldMode;
-			return FALSE;
-		}
-	}
-	return TRUE;
-}
-//-------------------------------------------------------------------------------------------------
-/** Sets the view filter. */
-//-------------------------------------------------------------------------------------------------
-Bool W3DView::setViewFilter(enum FilterTypes filter)
-{
-	FilterTypes oldFilter = m_viewFilter;	//save previous filter in case setup fails.
-
-	m_viewFilter = filter;
-	if (m_viewFilterMode != FM_NULL_MODE && 
-		m_viewFilter != FT_NULL_FILTER) {
-		if (!W3DShaderManager::filterSetup(m_viewFilter, m_viewFilterMode))
-		{	//setup failed so restore previous mode.
-			m_viewFilter = oldFilter;
-			return FALSE;
-		};
-	}
-	return TRUE;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Calculates how many pixels we scrolled since last frame for motion blur calculations. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::calcDeltaScroll(Coord2D &screenDelta)
-{
-	screenDelta.x = 0;
-	screenDelta.y = 0;
-	Vector3 prevPos(m_previousLookAtPosition.x,m_previousLookAtPosition.y, m_groundLevel);
-	Vector3 prevScreen;
-	if (m_3DCamera->Project( prevScreen, prevPos ) != CameraClass::INSIDE_FRUSTUM)
-	{
-		return;
-	}
-	Vector3 pos(m_pos.x,m_pos.y, m_groundLevel);
-	Vector3 screen;
-	if (m_3DCamera->Project( screen, pos ) != CameraClass::INSIDE_FRUSTUM)
-	{
-		return;
-	}
-	screenDelta.x = screen.X-prevScreen.X;
-	screenDelta.y = screen.Y-prevScreen.Y;
-}
-
-
-//-------------------------------------------------------------------------------------------------
-/** Draw member for the W3D window, this will literally draw the window 
-  * for this view */
-//-------------------------------------------------------------------------------------------------
-void W3DView::drawView( void )
-{
-	DRAW();
-}
-
-//DECLARE_PERF_TIMER(W3DView_drawView)
-void W3DView::draw( void )
-{
-	//USE_PERF_TIMER(W3DView_drawView)
-	Bool skipRender = false;
-	Bool doExtraRender = false;
-	CustomScenePassModes customScenePassMode  = SCENE_PASS_DEFAULT;
-	Bool preRenderResult = false;
-
-	if (m_viewFilterMode && 
-			m_viewFilter > FT_NULL_FILTER && 
-			m_viewFilter < FT_MAX)
-	{	
-		// Most likely will redirect rendering to a texture.
-		preRenderResult=W3DShaderManager::filterPreRender(m_viewFilter, skipRender, customScenePassMode);
-		if (!skipRender && getCameraLock()) 
-		{
-			Object* cameraLockObj = TheGameLogic->findObjectByID(getCameraLock());
-			if (cameraLockObj) 
-			{
-				Drawable *drawable = cameraLockObj->getDrawable();
-				drawable->setDrawableHidden(true);
-			}
-		}
-	}
-
-	if (!skipRender) 
-	{
-		// Render 3D scene from our camera
-		W3DDisplay::m_3DScene->setCustomPassMode(customScenePassMode);
-		if (m_isWireFrameEnabled)
-			W3DDisplay::m_3DScene->Set_Extra_Pass_Polygon_Mode(SceneClass::EXTRA_PASS_CLEAR_LINE);
-		W3DDisplay::m_3DScene->doRender( m_3DCamera );
-		W3DDisplay::m_3DScene->Set_Extra_Pass_Polygon_Mode(SceneClass::EXTRA_PASS_DISABLE);
-		m_isWireFrameEnabled = m_nextWireFrameEnabled;
-	}
-
-	if (m_viewFilterMode && 
-			m_viewFilter > FT_NULL_FILTER && 
-			m_viewFilter < FT_MAX)
-	{	
-		Coord2D deltaScroll;
-		calcDeltaScroll(deltaScroll);
-		Bool continueTheEffect = false;
-		if (preRenderResult)	//if prerender passed, do the post render.
-			continueTheEffect = W3DShaderManager::filterPostRender(m_viewFilter, m_viewFilterMode, deltaScroll,doExtraRender);
-		if (!skipRender && getCameraLock()) 
-		{
-			Object* cameraLockObj = TheGameLogic->findObjectByID(getCameraLock());
-			if (cameraLockObj) 
-			{
-				Drawable *drawable = cameraLockObj->getDrawable();
-				drawable->setDrawableHidden(false);
-				RenderInfoClass rinfo(*m_3DCamera);
-				// Apply the camera and viewport (including depth range)
-				m_3DCamera->Apply();
-				TheDX8MeshRenderer.Set_Camera(&rinfo.Camera);
-				W3DDisplay::m_3DScene->renderSpecificDrawables(rinfo, 1, &drawable);
-				WW3D::Flush(rinfo);
-			}
-		}
-		if (!continueTheEffect) 
-		{
-			// shut it down.
-			m_viewFilter = FT_VIEW_DEFAULT;
-			m_viewFilterMode = FM_VIEW_DEFAULT;
-		}
-	}
-
-	//Some effects require that we render a modified version of the scene into a texture but also require
-	//an unaltered version in the framebuffer.  So we re-render again into framebuffer after texture rendering
-	//was turned off by filterPostRender().
-	if (doExtraRender)
-	{
-		//Reset to normal scene rendering.
-		//The pass that rendered into a texture may have left the z-buffer in a weird state
-		//so clear it before rendering normal scene.
-		///@todo: Don't clear z-buffer unless shader uses z-bias or anything else that would cause <= z to fail on normal render.
-		DX8Wrapper::Clear(false, true, Vector3(0.0f,0.0f,0.0f), TheWaterTransparency->m_minWaterOpacity);	// Clear z but not color
-		W3DDisplay::m_3DScene->setCustomPassMode(SCENE_PASS_DEFAULT);
-		W3DDisplay::m_3DScene->doRender( m_3DCamera );
-		Coord2D deltaScroll;
-		W3DShaderManager::filterPostRender(m_viewFilter, m_viewFilterMode, deltaScroll, doExtraRender);
-	}
-
-	if( TheGlobalData->m_debugAI )
-	{
-		if (TheAI->pathfinder()->getDebugPath())
-		{
-			// setup screen clipping region
-			IRegion2D clipRegion;
-			clipRegion.lo.x = 0;
-			clipRegion.lo.y = 0;
-			clipRegion.hi.x = getWidth();
-			clipRegion.hi.y = getHeight();
-
-			UnsignedInt color = 0xFFFFFF00;  //0xAARRGGBB
-			ICoord2D start, end;
-			PathNode *prevNode = TheAI->pathfinder()->getDebugPath()->getFirstNode();
-
-			if (worldToScreen( prevNode->getPosition(), &start )) {
-				TheDisplay->drawLine( start.x-3, start.y-3, start.x+3, start.y-3, 1.0f, color );
-				TheDisplay->drawLine( start.x+3, start.y-3, start.x+3, start.y+3, 1.0f, color );
-				TheDisplay->drawLine( start.x+3, start.y+3, start.x-3, start.y+3, 1.0f, color );
-				TheDisplay->drawLine( start.x-3, start.y+3, start.x-3, start.y-3, 1.0f, color );
-			}
-			for( PathNode *node = prevNode->getNext(); node; node = node->getNext() )
-			{
-				Int k;
-				Coord3D s, e;
-				Coord3D delta;
-				s = *node->getPosition();
-				e = *prevNode->getPosition();
-				delta.x = e.x-s.x;
-				delta.y = e.y-s.y;
-				delta.z = e.z-s.z;
-				for (k = 0; k<10; k++) {
-					Real factor1 = (k)/10.0;
-					Real factor2 = (k+1)/10.0;
-					s = *node->getPosition();
-					e = *node->getPosition();
-					s.x += delta.x*factor1;
-					s.y += delta.y*factor1;
-					s.z += delta.z*factor1;
-					e.x += delta.x*factor2;
-					e.y += delta.y*factor2;
-					e.z += delta.z*factor2;
-					Bool onScreen1 = worldToScreen( &e, &end );
-					Bool onScreen2 = worldToScreen( &s, &start );
-					if (!onScreen1 && !onScreen2) {
-						continue; // neither point visible.
-					}
-					ICoord2D clipStart, clipEnd;
-
-					if( ClipLine2D( &start, &end, &clipStart, &clipEnd, &clipRegion ) ) {
-						TheDisplay->drawLine( clipStart.x, clipStart.y, clipEnd.x, clipEnd.y, 1.0f, color );
-					}
-				}
-				prevNode = node;
-				if (node->getNext()) {
-					if (worldToScreen( node->getPosition(), &start )) {
- 						TheDisplay->drawLine( start.x-4, start.y, start.x+3, start.y, 1.0f, color );
-					}
-				}
-			}
-			if (prevNode && worldToScreen( prevNode->getPosition(), &start )) {
- 				TheDisplay->drawLine( start.x-4, start.y, start.x+3, start.y, 1.0f, color );
-				TheDisplay->drawLine( start.x, start.y-4, start.x, start.y+3, 1.0f, color );
-			}
-			color = 0xFFFF0000;  //0xAARRGGBB
-			if (worldToScreen( TheAI->pathfinder()->getDebugPathPosition(), &start )) {
-				TheDisplay->drawLine( start.x-3, start.y, start.x+3, start.y, 1.0f, color );
-				TheDisplay->drawLine( start.x, start.y-3, start.x, start.y+3, 1.0f, color );
-			}
-		}
-
-	}  // end if, show debug AI
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	if( TheGlobalData->m_debugCamera )
-	{
-		UnsignedInt c = 0xaaffffff;
-		Coord3D worldPos = *getPosition();
-		worldPos.z = TheTerrainLogic->getGroundHeight(worldPos.x, worldPos.y);
-
-		Coord3D p1, p2;
-		ICoord2D s1, s2;
-		p1 = worldPos;
-		p1.x += TERRAIN_SAMPLE_SIZE;
-		p1.y += TERRAIN_SAMPLE_SIZE;
-		p1.z = TheTerrainLogic->getGroundHeight(p1.x, p1.y);
-		p2 = worldPos;
-		p2.x += TERRAIN_SAMPLE_SIZE;
-		p2.y -= TERRAIN_SAMPLE_SIZE;
-		p2.z = TheTerrainLogic->getGroundHeight(p2.x, p2.y);
-		worldToScreen( &p1, &s1 );
-		worldToScreen( &p2, &s2 );
-		TheDisplay->drawLine(s1.x, s1.y, s2.x, s2.y, 1.0f, c);
-
-		p1 = worldPos;
-		p1.x += TERRAIN_SAMPLE_SIZE;
-		p1.y -= TERRAIN_SAMPLE_SIZE;
-		p1.z = TheTerrainLogic->getGroundHeight(p1.x, p1.y);
-		p2 = worldPos;
-		p2.x -= TERRAIN_SAMPLE_SIZE;
-		p2.y -= TERRAIN_SAMPLE_SIZE;
-		p2.z = TheTerrainLogic->getGroundHeight(p2.x, p2.y);
-		worldToScreen( &p1, &s1 );
-		worldToScreen( &p2, &s2 );
-		TheDisplay->drawLine(s1.x, s1.y, s2.x, s2.y, 1.0f, c);
-
-		p1 = worldPos;
-		p1.x -= TERRAIN_SAMPLE_SIZE;
-		p1.y -= TERRAIN_SAMPLE_SIZE;
-		p1.z = TheTerrainLogic->getGroundHeight(p1.x, p1.y);
-		p2 = worldPos;
-		p2.x -= TERRAIN_SAMPLE_SIZE;
-		p2.y += TERRAIN_SAMPLE_SIZE;
-		p2.z = TheTerrainLogic->getGroundHeight(p2.x, p2.y);
-		worldToScreen( &p1, &s1 );
-		worldToScreen( &p2, &s2 );
-		TheDisplay->drawLine(s1.x, s1.y, s2.x, s2.y, 1.0f, c);
-
-		p1 = worldPos;
-		p1.x -= TERRAIN_SAMPLE_SIZE;
-		p1.y += TERRAIN_SAMPLE_SIZE;
-		p1.z = TheTerrainLogic->getGroundHeight(p1.x, p1.y);
-		p2 = worldPos;
-		p2.x += TERRAIN_SAMPLE_SIZE;
-		p2.y += TERRAIN_SAMPLE_SIZE;
-		p2.z = TheTerrainLogic->getGroundHeight(p2.x, p2.y);
-		worldToScreen( &p1, &s1 );
-		worldToScreen( &p2, &s2 );
-		TheDisplay->drawLine(s1.x, s1.y, s2.x, s2.y, 1.0f, c);
-
-	}
-
-  if ( TheGlobalData->m_showAudioLocations )
-  {
-    // Draw audio radii for ALL drawables, not just those on screen
-    const Drawable * drawable = TheGameClient->getDrawableList();
-
-    while ( drawable != NULL )
-    {
-      drawAudioRadii( drawable );
-      drawable = drawable->getNextDrawable();
-    }
-  }
-#endif // DEBUG or INTERNAL
-
-	Region3D axisAlignedRegion;
-	getAxisAlignedViewRegion(axisAlignedRegion);
-
-	//
-	// there are several things we might want to do as a post pass on the objects after
-	// they are all drawn
-	/// @todo we might want to consider wiping this iterate out if there is nothing to post draw
-	//
-	TheGameClient->resetRenderedObjectCount();
-	TheGameClient->iterateDrawablesInRegion( &axisAlignedRegion, drawablePostDraw, this );
-
-	TheGameClient->flushTextBearingDrawables();
-
-	// Render 2D scene
-	W3DDisplay::m_2DScene->doRender( m_2DCamera );
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::setCameraLock(ObjectID id)
-{		 
-	// If we're disabling camera movements, don't lock onto the object.
-	if (TheGlobalData->m_disableCameraMovement && id!=INVALID_ID) {
-		return;
-	}
-	View::setCameraLock(id);
-	m_doingScriptedCameraLock = FALSE;
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::setSnapMode( CameraLockType lockType, Real lockDist )
-{
-	View::setSnapMode(lockType, lockDist);
-	m_doingScriptedCameraLock = TRUE;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Scroll the view by the given delta in SCREEN COORDINATES, this interface 
-	* assumes we will be scrolling along the X,Y plane */
-//-------------------------------------------------------------------------------------------------
-void W3DView::scrollBy( Coord2D *delta )
-{
-	// if we haven't moved, ignore
-	if( delta && (delta->x != 0 || delta->y != 0) )
-	{
-		const Real SCROLL_RESOLUTION = 250.0f;
-
-		Vector3 world, worldStart, worldEnd;
-		Vector2 screen, start, end;
-
-		m_scrollAmount = *delta;
-
-		screen.X = delta->x;
-		screen.Y = delta->y;
-													  
-		start.X = getWidth();
-		start.Y = getHeight();
-		Real aspect = getHeight() == 0 ? 1 : getWidth()/getHeight();
-		end.X = start.X + delta->x * SCROLL_RESOLUTION;
-		end.Y = start.Y + delta->y * SCROLL_RESOLUTION*aspect;
-
-		m_3DCamera->Device_To_World_Space( start, &worldStart );
-		m_3DCamera->Device_To_World_Space( end, &worldEnd );
-
-		world.X = worldEnd.X - worldStart.X;
-		world.Y = worldEnd.Y - worldStart.Y;
-		world.Z = worldEnd.Z - worldStart.Z;
-
-		// scroll by delta
-		Coord3D pos = *getPosition();
-		pos.x += world.X;
-		pos.y += world.Y;
-		//DEBUG_LOG(("Delta %.2f, %.2f\n", world.X, world.Z));
-		// no change to z
-		setPosition(&pos);
-
-		//m_cameraConstraintValid = false;	// pos change does NOT invalidate cam constraints
-
-		m_doingRotateCamera = false;
-		// set new camera position
-		setCameraTransform();
-
-	}  // end if
-
-}  // end scrollBy
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::forceRedraw()
-{
-
-	// set the camera
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Rotate the view around the up axis to the given angle. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setAngle( Real angle )
-{
-	// Normalize to +-PI.
-	normAngle(angle);
-	// call our base class, we are adding functionality
-	View::setAngle( angle );
-
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_CameraArrivedAtWaypointOnPathFlag = false;
-
-	m_doingRotateCamera = false;
-	m_doingPitchCamera = false;
-	m_doingZoomCamera = false;
-	m_doingScriptedCameraLock = false;
-	// set the camera
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Rotate the view around the horizontal (X) axis to the given angle. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setPitch( Real angle )
-{
-	// call our base class, we are extending functionality
-	View::setPitch( angle );
-
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_doingRotateCamera = false;
-	m_doingPitchCamera = false;
-	m_doingZoomCamera = false;
-	m_doingScriptedCameraLock = false;
-	// set the camera
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Set the view angle & pitch back to default */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setAngleAndPitchToDefault( void )
-{ 
-	// call our base class, we are adding functionality
-	View::setAngleAndPitchToDefault();
-
-	this->m_FXPitch = 1.0;
-
-	// set the camera
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::setDefaultView(Real pitch, Real angle, Real maxHeight)
-{
-	// MDC - we no longer want to rotate maps (design made all of them right to begin with)
-	//	m_defaultAngle = angle * M_PI/180.0f;
-	m_defaultPitchAngle = pitch;
-	m_maxHeightAboveGround = TheGlobalData->m_maxCameraHeight*maxHeight;
-	if (m_minHeightAboveGround > m_maxHeightAboveGround)
-		m_maxHeightAboveGround = m_minHeightAboveGround;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::setHeightAboveGround(Real z)
-{
-	m_heightAboveGround = z;
-
-  // if our zoom is limited, we will stay within a predefined distance from the terrain
-	if( m_zoomLimited )
-	{
-
-		if (m_heightAboveGround < m_minHeightAboveGround)
-			m_heightAboveGround = m_minHeightAboveGround;
-
-		if (m_heightAboveGround > m_maxHeightAboveGround)
-			m_heightAboveGround = m_maxHeightAboveGround;
-
-	}  // end if
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_CameraArrivedAtWaypointOnPathFlag = false;
-	m_doingRotateCamera = false;
-	m_doingPitchCamera = false;
-	m_doingZoomCamera = false;
-	m_doingScriptedCameraLock = false;
-	m_cameraConstraintValid = false; // recalc it.
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::setZoom(Real z)
-{
-	m_zoom = z;
-
-	if (m_zoom < m_minZoom)
-		m_zoom = m_minZoom;
-
-	if (m_zoom > m_maxZoom)
-		m_zoom = m_maxZoom;
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_CameraArrivedAtWaypointOnPathFlag = false;
-	m_doingRotateCamera = false;
-	m_doingPitchCamera = false;
-	m_doingZoomCamera = false;
-	m_doingScriptedCameraLock = false;
-	m_cameraConstraintValid = false; // recalc it.
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::setZoomToDefault( void )
-{
-	// default zoom has to be max, otherwise players will just zoom to max always
-
-	// terrain height + desired height offset == cameraOffset * actual zoom
-	// find best approximation of max terrain height we can see
-	Real terrainHeightMax = getHeightAroundPos(m_pos.x, m_pos.y);
-
-	Real desiredHeight = (terrainHeightMax + m_maxHeightAboveGround);
-	Real desiredZoom = desiredHeight / m_cameraOffset.z;
-
-	//DEBUG_LOG(("W3DView::setZoomToDefault() Current zoom: %g  Desired zoom: %g\n", m_zoom, desiredZoom));
-
-	m_zoom = desiredZoom;
-	m_heightAboveGround = m_maxHeightAboveGround;
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_CameraArrivedAtWaypointOnPathFlag = false;
-	m_doingRotateCamera = false;
-	m_doingPitchCamera = false;
-	m_doingZoomCamera = false;
-	m_doingScriptedCameraLock = false;
-	m_cameraConstraintValid = false; // recalc it.
-	setCameraTransform();
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Set the horizontal field of view angle */
-//-------------------------------------------------------------------------------------------------
-void W3DView::setFieldOfView( Real angle )
-{
-	View::setFieldOfView( angle );
-
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	// this is only for testing, and recalculating the 
-	// camera every frame is wasteful
-	setCameraTransform();
-#endif
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Using the W3D camera translate the world coordinate to a screen coord.
-	Screen coordinates returned in absolute values relative to full display resolution.  
-  Returns if the point is on screen, off screen, or not transformable */
-//-------------------------------------------------------------------------------------------------
-View::WorldToScreenReturn W3DView::worldToScreenTriReturn( const Coord3D *w, ICoord2D *s )
-{
-	// sanity
-	if( w == NULL || s == NULL )
-    return WTS_INVALID;
-
-	if( m_3DCamera )
-	{
-		Vector3 world;
-		Vector3 screen;
-
-		world.Set( w->x, w->y, w->z );
-		enum CameraClass::ProjectionResType projection = m_3DCamera->Project( screen, world );
-		if (projection != CameraClass::INSIDE_FRUSTUM && projection!=CameraClass::OUTSIDE_FRUSTUM)
-		{
-			// Can't get a valid number if it's beyond the clip planes.  jba
-			s->x = 0;
-			s->y = 0;
-      return WTS_INVALID;
-		}
-
-		//
-		// note that the screen coord returned from the project W3D camera 
-		// gave us a screen coords that range from (-1,-1) bottom left to
-		// (1,1) top right ... we are turning that into (0,0) upper left
-		// coords now
-		//
-		W3DLogicalScreenToPixelScreen( screen.X, screen.Y,
-																	 &s->x, &s->y,
-																	 getWidth(), getHeight());
-		s->x += m_originX;	//convert viewport coordinates to full screen coordinates
-		s->y += m_originY;
-
-//		s->x = (getWidth()  * (screen.X + 1.0f)) / 2.0f;
-//		s->y = (getHeight() * (-screen.Y + 1.0f)) / 2.0f;
-		if (projection != CameraClass::INSIDE_FRUSTUM)
-		{
-      return WTS_OUTSIDE_FRUSTUM;
-		}
-
-    return WTS_INSIDE_FRUSTUM;
-
-	}  // end if
-
-  return WTS_INVALID;
-}  // end worldToScreenTriReturn
-
-//-------------------------------------------------------------------------------------------------
-/** Using the W3D camera translate the screen coord to world coord */
-//-------------------------------------------------------------------------------------------------
-void W3DView::screenToWorld( const ICoord2D *s, Coord3D *w )
-{
-
-	// sanity
-	if( s == NULL || w == NULL )
-		return;
-
-	if( m_3DCamera )
-	{
-		DEBUG_CRASH(("implement me"));
-	}  // end if
-
-}  // end screenToWorld
-
-//-------------------------------------------------------------------------------------------------
-/** all the drawables in the view, that fall within the 2D screen region
-	* will call the callback function.  The number of drawables that passed
-	* the test are returned.
-	Screen coordinates assumed in absolute values relative to full display resolution. */
-//-------------------------------------------------------------------------------------------------
-Int W3DView::iterateDrawablesInRegion( IRegion2D *screenRegion,
-																			 Bool (*callback)( Drawable *draw, void *userData ),
-																			 void *userData )
-{
-	Bool inside = FALSE;
-	Int count = 0;
-	Drawable *draw;
-	Vector3 screen, world;
-	Coord3D pos;
-	Region2D normalizedRegion;
-
-	/** @todo we need to have partitions of which drawables are in the
-	view so we don't have to march through the whole list */
-
-	//
-	// to do this we are projecting the drawable centers onto the screen,
-	// the W3D camera->project method is used to do this and that method
-	// will return normalized screen coords from (-1,-1) bottom left to 
-	// (1,1) top right, normalize our screen region for comparison
-	//
-	/// @todo use fast int->real type casts here later
-
-	Bool regionIsPoint = FALSE;
-
-	if( screenRegion )
-	{
-		if (screenRegion->height() == 0 && screenRegion->width() == 0)
-		{
-			regionIsPoint = TRUE;
-		} 
-
-		normalizedRegion.lo.x = ((Real)(screenRegion->lo.x - m_originX) / (Real)getWidth()) * 2.0f - 1.0f;
-		normalizedRegion.lo.y = -(((Real)(screenRegion->hi.y - m_originY) / (Real)getHeight()) * 2.0f - 1.0f);
-		normalizedRegion.hi.x = ((Real)(screenRegion->hi.x - m_originX) / (Real)getWidth()) * 2.0f - 1.0f;
-		normalizedRegion.hi.y = -(((Real)(screenRegion->lo.y - m_originY) / (Real)getHeight()) * 2.0f - 1.0f);
-
-	}  // end if
-
-
-	Drawable *onlyDrawableToTest = NULL;
-	if (regionIsPoint)
-	{
-		// Allow all drawables to be picked.
-		onlyDrawableToTest = pickDrawable(&screenRegion->lo, TRUE, (PickType) getPickTypesForContext(TheInGameUI->isInForceAttackMode()));
-		if (onlyDrawableToTest == NULL) {
-			return 0;
-		}
-	}
-
-	for( draw = TheGameClient->firstDrawable();
-			 draw;
-			 draw = draw->getNextDrawable() )
-	{
-		if (onlyDrawableToTest)
-		{
-		 draw = onlyDrawableToTest;
-		 inside = TRUE;
-		}
-		else
-		{
-
-			// not inside	
-			inside = FALSE;
-
-			// no screen region, means all drawbles
-			if( screenRegion == NULL )
-				inside = TRUE;
-			else
-			{
-
-				// project the center of the drawable to the screen
-				/// @todo use a real 3D position in the drawable
-				pos = *draw->getPosition();
-				world.X = pos.x;
-				world.Y = pos.y;
-				world.Z = pos.z;
-
-				// project the world point to the screen
-				if( m_3DCamera->Project( screen, world ) == CameraClass::INSIDE_FRUSTUM &&
-						screen.X >= normalizedRegion.lo.x && 
-						screen.X <= normalizedRegion.hi.x &&
-						screen.Y >= normalizedRegion.lo.y && 
-						screen.Y <= normalizedRegion.hi.y )
-				{
-
-					inside = TRUE;
-
-				}  // end if
-			}
-	
-		}  //end else
-
-		// if inside do the callback and count up
-		if( inside )
-		{
-			
-			if( callback( draw, userData ) )
-				++count;
-
-		}  // end if
-
-		// If onlyDrawableToTest, then we should bail out now.
-		if (onlyDrawableToTest != NULL)
-			break;
-
-	}  // end for draw
-
-	return count;
-
-}  // end iterateDrawablesInRegion
-
-//-------------------------------------------------------------------------------------------------
-/** cast a ray from the screen coords into the scene and return a drawable
-  * there if present. Screen coordinates assumed in absolute values relative
-  * to full display resolution. */
-//-------------------------------------------------------------------------------------------------
-Drawable *W3DView::pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType )
-{
-	RenderObjClass *renderObj = NULL;
-	Drawable *draw = NULL;
-	DrawableInfo *drawInfo = NULL;
-
-	// sanity
-	if( screen == NULL )
-		return NULL;
-
-	// don't pick a drawable if there is a window under the cursor
-	GameWindow *window = NULL;
-	if (TheWindowManager)
-		window = TheWindowManager->getWindowUnderCursor(screen->x, screen->y);
-
-	while (window)
-	{
-		// check to see if it or any of its parents are opaque.  If so, we can't select anything.
-		if (!BitIsSet( window->winGetStatus(), WIN_STATUS_SEE_THRU ))
-			return NULL;
-
-		window = window->winGetParent();
-	}
-
-	Vector3 rayStart,rayEnd;
-	getPickRay(screen,&rayStart,&rayEnd);
-
-	LineSegClass lineseg;
-	lineseg.Set(rayStart,rayEnd);
-
-	CastResultStruct result;
-
-	if (forceAttack) 
-		result.ComputeContactPoint = true;
-
-	//Don't check against translucent or hidden objects
-	RayCollisionTestClass raytest(lineseg,&result,COLL_TYPE_ALL,false,false);
-
-	if( W3DDisplay::m_3DScene->castRay( raytest, false, (Int)pickType ) )
-		renderObj = raytest.CollidedRenderObj;
-
-	// for right now there is no drawable data in a render object which is			 	// if we've found a render object, return our drawable associated with it,
-
-	// the terrain, therefore the userdata is NULL
-	/// @todo terrain and picking!
-	if( renderObj )
-		drawInfo = (DrawableInfo *)renderObj->Get_User_Data();
-	if (drawInfo)
-		draw=drawInfo->m_drawable;
-
-	return draw;
-
-}  // end pickDrawable
-
-//-------------------------------------------------------------------------------------------------
-/** convert a pixel (x,y) to a location in the world on the terrain.
-	Screen coordinates assumed in absolute values relative to full display resolution.  */
-//-------------------------------------------------------------------------------------------------
-void W3DView::screenToTerrain( const ICoord2D *screen, Coord3D *world )
-{
-	// sanity
-	if( screen == NULL || world == NULL || TheTerrainRenderObject == NULL )
-		return;
-
-	if (m_cameraHasMovedSinceRequest) {
-		m_locationRequests.clear();
-		m_cameraHasMovedSinceRequest = false;
-	}
-
-	if (m_locationRequests.size() > MAX_REQUEST_CACHE_SIZE) {
-		m_locationRequests.erase(m_locationRequests.begin(), m_locationRequests.begin() + 10);
-	}
-
-
-	// We insert them at the end for speed (no copies needed), but using the princ of locality, we should 
-	// start searching where we most recently inserted
-	for (int i = m_locationRequests.size() - 1; i >= 0; --i) {
-		if (m_locationRequests[i].first.x == screen->x && m_locationRequests[i].first.y == screen->y) {
-			(*world) = m_locationRequests[i].second;
-			return;
-		}
-	}
-
-	Vector3 rayStart,rayEnd;
-	LineSegClass lineseg;
-	CastResultStruct result;
-	Vector3 intersection(0,0,0);
-
-	getPickRay(screen,&rayStart,&rayEnd);
-
-	lineseg.Set(rayStart,rayEnd);
-
-	RayCollisionTestClass raytest(lineseg,&result);
-
-	if( TheTerrainRenderObject->Cast_Ray(raytest) )
-	{
-		// get the point of intersection according to W3D
-		intersection = result.ContactPoint;
-		
-	}  // end if
-
-	// Pick bridges.  
-	Vector3 bridgePt;
-	Drawable *bridge = TheTerrainLogic->pickBridge(rayStart, rayEnd, &bridgePt);
-	if (bridge && bridgePt.Z > intersection.Z) {
-		intersection = bridgePt;
-	}
-
-	world->x = intersection.X;
-	world->y = intersection.Y;
-	world->z = intersection.Z;
-
-	PosRequest req;
-	req.first = (*screen);
-	req.second = (*world);
-	m_locationRequests.push_back(req);	// Insert this request at the end, requires no extra copies
-
-}  // end screenToTerrain
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::lookAt( const Coord3D *o ) 
-{
-	Coord3D pos = *o;
-
-
-// no, don't call the super-lookAt, since it will munge our coords
-// as for a 2d view. just call setPosition.
-//View::lookAt(&pos);
-
-	if (o->z > PATHFIND_CELL_SIZE_F+TheTerrainLogic->getGroundHeight(pos.x, pos.y)) {
-		// Pos.z is not used, so if we want to look at something off the ground, 
-		// we have to look at the spot on the ground such that the object intersects
-		// with the look at vector in the center of the screen.  jba.
-		Vector3 rayStart,rayEnd;
-		LineSegClass lineseg;
-		CastResultStruct result;
-		Vector3 intersection(0,0,0);
-
-		rayStart = m_3DCamera->Get_Position();	//get camera location
-		m_3DCamera->Un_Project(rayEnd,Vector2(0.0f,0.0f));	//get world space point
-		rayEnd -= rayStart;	//vector camera to world space point
-		rayEnd.Normalize();	//make unit vector
-		rayEnd *= m_3DCamera->Get_Depth();	//adjust length to reach far clip plane
-		rayStart.Set(pos.x, pos.y, pos.z);
-		rayEnd += rayStart;	//get point on far clip plane along ray from camera.
-		lineseg.Set(rayStart,rayEnd);
-
-		RayCollisionTestClass raytest(lineseg,&result);
-
-		if( TheTerrainRenderObject->Cast_Ray(raytest) )
-		{
-			// get the point of intersection according to W3D
-			pos.x = result.ContactPoint.X;
-			pos.y = result.ContactPoint.Y;
-			
-		}  // end if
-	}			 
-	pos.z = 0;
-	setPosition(&pos); 
-	m_doingRotateCamera = false;
-	m_doingMoveCameraOnWaypointPath = false;
-	m_CameraArrivedAtWaypointOnPathFlag = false;
-	m_doingScriptedCameraLock = false;
-
-	setCameraTransform();
-
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::initHeightForMap( void ) 
-{
-	m_groundLevel = TheTerrainLogic->getGroundHeight(m_pos.x, m_pos.y);
-	const Real MAX_GROUND_LEVEL = 120.0; // jba - starting ground level can't exceed this height.
-	if (m_groundLevel>MAX_GROUND_LEVEL) {
-		m_groundLevel = MAX_GROUND_LEVEL;
-	}
-
-	m_cameraOffset.z = m_groundLevel+TheGlobalData->m_cameraHeight;
-	m_cameraOffset.y = -(m_cameraOffset.z / tan(TheGlobalData->m_cameraPitch * (PI / 180.0)));
-	m_cameraOffset.x = -(m_cameraOffset.y * tan(TheGlobalData->m_cameraYaw * (PI / 180.0)));
-	m_cameraConstraintValid = false;	// possible ground level change invalidates cam constraints
-	setCameraTransform();
-
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Move camera to in an interesting fashion.  Sets up parameters that get
- * evaluated in draw(). */
-//-------------------------------------------------------------------------------------------------
-void W3DView::moveCameraTo(const Coord3D *o, Int milliseconds, Int shutter, Bool orient, Real easeIn, Real easeOut)
-{
-	m_mcwpInfo.waypoints[0] = *getPosition();	
-	m_mcwpInfo.cameraAngle[0] = getAngle();	
-	m_mcwpInfo.waySegLength[0] = 0;	
-
-	m_mcwpInfo.waypoints[1] = *getPosition();	
-	m_mcwpInfo.waySegLength[1] = 0;	
-
-	m_mcwpInfo.waypoints[2] = *o;	
-	m_mcwpInfo.waySegLength[2] = 0;	
-
-	m_mcwpInfo.numWaypoints = 2;
-	if (milliseconds<1) milliseconds = 1;
-	m_mcwpInfo.totalTimeMilliseconds = milliseconds;
-	m_mcwpInfo.shutter = 1;
-	m_mcwpInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
-	m_mcwpInfo.curSegment = 1;
-	m_mcwpInfo.curSegDistance = 0;
-	m_mcwpInfo.totalDistance = 0;
-
-	setupWaypointPath(orient);
-	if (m_mcwpInfo.totalTimeMilliseconds==1) {
-		// do it instantly.
-		moveAlongWaypointPath(1);
-		m_doingMoveCameraOnWaypointPath = true;
-		m_CameraArrivedAtWaypointOnPathFlag = false;
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Rotate the camera */
-//-------------------------------------------------------------------------------------------------
-void W3DView::rotateCamera(Real rotations, Int milliseconds, Real easeIn, Real easeOut)
-{
-	m_rcInfo.numHoldFrames = 0;
-	m_rcInfo.trackObject = FALSE;
-
-	if (milliseconds<1) milliseconds = 1;
-	m_rcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
-	if (m_rcInfo.numFrames < 1) {
-		m_rcInfo.numFrames = 1;
-	}
-	m_rcInfo.curFrame = 0;
-	m_doingRotateCamera = true;
-	m_rcInfo.angle.startAngle = m_angle;
-	m_rcInfo.angle.endAngle = m_angle + 2*PI*rotations;
-	m_rcInfo.startTimeMultiplier = m_timeMultiplier;
-	m_rcInfo.endTimeMultiplier = m_timeMultiplier;
-	m_rcInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_CameraArrivedAtWaypointOnPathFlag = false;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Rotate the camera to follow a unit */
-//-------------------------------------------------------------------------------------------------
-void W3DView::rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut)
-{
-	m_rcInfo.trackObject = TRUE;
-	if (holdMilliseconds<1) holdMilliseconds = 0;
-	m_rcInfo.numHoldFrames = holdMilliseconds/TheW3DFrameLengthInMsec;
-	if (m_rcInfo.numHoldFrames < 1) {
-		m_rcInfo.numHoldFrames = 0;
-	}
-
-	if (milliseconds<1) milliseconds = 1;
-	m_rcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
-	if (m_rcInfo.numFrames < 1) {
-		m_rcInfo.numFrames = 1;
-	}
-	m_rcInfo.curFrame = 0;
-	m_doingRotateCamera = true;
-	m_rcInfo.target.targetObjectID = id;
-	m_rcInfo.startTimeMultiplier = m_timeMultiplier;
-	m_rcInfo.endTimeMultiplier = m_timeMultiplier;
-	m_rcInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_CameraArrivedAtWaypointOnPathFlag = false;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Rotate camera to face a location */
-//-------------------------------------------------------------------------------------------------
-void W3DView::rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds, Real easeIn, Real easeOut, Bool reverseRotation)
-{
-	m_rcInfo.numHoldFrames = 0;
-	m_rcInfo.trackObject = FALSE;
-
-	if (milliseconds<1) milliseconds = 1;
-	m_rcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
-	if (m_rcInfo.numFrames < 1) {
-		m_rcInfo.numFrames = 1;
-	}
-	Coord3D curPos = *getPosition();
-	Vector2 dir(pLoc->x-curPos.x, pLoc->y-curPos.y);
-	const Real dirLength = dir.Length();
-	if (dirLength<0.1f) return;
-	Real angle = WWMath::Acos(dir.X/dirLength);
-	if (dir.Y<0.0f) {
-		angle = -angle;
-	}
-	// Default camera is rotated 90 degrees, so match.
-	angle -= PI/2;
-	normAngle(angle);
-
-	if (reverseRotation) {
-		if (m_angle < angle) {
-			angle -= 2.0f*WWMATH_PI;
-		} else {
-			angle += 2.0f*WWMATH_PI;
-		}
-	}
-
-	m_rcInfo.curFrame = 0;
-	m_doingRotateCamera = true;
-	m_rcInfo.angle.startAngle = m_angle;
-	m_rcInfo.angle.endAngle = angle;
-	m_rcInfo.startTimeMultiplier = m_timeMultiplier;
-	m_rcInfo.endTimeMultiplier = m_timeMultiplier;
-	m_rcInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
-
-	m_doingMoveCameraOnWaypointPath = false;
-	m_CameraArrivedAtWaypointOnPathFlag = false;
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::zoomCamera( Real finalZoom, Int milliseconds, Real easeIn, Real easeOut )
-{
-	if (milliseconds<1) milliseconds = 1;
-	m_zcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
-	if (m_zcInfo.numFrames < 1) {
-		m_zcInfo.numFrames = 1;
-	}
-	m_zcInfo.curFrame = 0;
-	m_doingZoomCamera = TRUE;
-	m_zcInfo.startZoom = m_zoom;
-	m_zcInfo.endZoom = finalZoom;
-	m_zcInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
-}
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void W3DView::pitchCamera( Real finalPitch, Int milliseconds, Real easeIn, Real easeOut )
-{
-	if (milliseconds<1) milliseconds = 1;
-	m_pcInfo.numFrames = milliseconds/TheW3DFrameLengthInMsec;
-	if (m_pcInfo.numFrames < 1) {
-		m_pcInfo.numFrames = 1;
-	}
-	m_pcInfo.curFrame = 0;
-	m_doingPitchCamera = TRUE;
-	m_pcInfo.startPitch = m_FXPitch;
-	m_pcInfo.endPitch = finalPitch;
-	m_pcInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Sets the final zoom for a camera movement. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::cameraModFinalZoom( Real finalZoom, Real easeIn, Real easeOut ) 
-{
-
-	if (m_doingRotateCamera) 
-	{
-		Real terrainHeightMax = getHeightAroundPos(m_pos.x, m_pos.y);
-		Real maxHeight = (terrainHeightMax + m_maxHeightAboveGround);
-		Real maxZoom = maxHeight / m_cameraOffset.z;
-
-		Real time = (m_rcInfo.numFrames + m_rcInfo.numHoldFrames - m_rcInfo.curFrame)*TheW3DFrameLengthInMsec;
-		zoomCamera( finalZoom*maxZoom, time, time*easeIn, time*easeOut );
-	}
-	if (m_doingMoveCameraOnWaypointPath) 
-	{
-		Coord3D pos = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-		Real terrainHeightMax = getHeightAroundPos(pos.x, pos.y);
-		Real maxHeight = (terrainHeightMax + m_maxHeightAboveGround);
-		Real maxZoom = maxHeight / m_cameraOffset.z;
-
-		Real time = m_mcwpInfo.totalTimeMilliseconds - m_mcwpInfo.elapsedTimeMilliseconds;
-		zoomCamera( finalZoom*maxZoom, time, time*easeIn, time*easeOut );
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Sets the final zoom for a camera movement. */
-//-------------------------------------------------------------------------------------------------
-void W3DView::cameraModFreezeAngle(void) 
-{
-	if (m_doingRotateCamera) {
-		if (m_rcInfo.trackObject) {
-			m_rcInfo.target.targetObjectID = INVALID_ID;
-		} else {
-			m_rcInfo.angle.startAngle = m_rcInfo.angle.endAngle = m_angle; // Silly, but consistent.
-		}
-	}
-	if (m_doingMoveCameraOnWaypointPath) {
-		Int i;
-//		Real curDistance = 0;
-		for (i=0; i<m_mcwpInfo.numWaypoints; i++) {
-			m_mcwpInfo.cameraAngle[i+1] = m_mcwpInfo.cameraAngle[0];
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Sets the look toward point for a camera movement. */
-// ------------------------------------------------------------------------------------------------
-void W3DView::cameraModLookToward(Coord3D *pLoc) 
-{
-	if (m_doingRotateCamera) {
-		return; // Doesn't apply to rotate about a point.
-	}
-	if (m_doingMoveCameraOnWaypointPath) {
-		Int i;
-//		Real curDistance = 0;
-		for (i=2; i<=m_mcwpInfo.numWaypoints; i++) {
-			Coord3D start, mid, end;
-			Real factor = 0.5;
-			start = m_mcwpInfo.waypoints[i-1];
-			start.x += m_mcwpInfo.waypoints[i].x;
-			start.y += m_mcwpInfo.waypoints[i].y;
-			start.x /= 2;
-			start.y /= 2;
-			mid = m_mcwpInfo.waypoints[i];
-			end = m_mcwpInfo.waypoints[i];
-			end.x += m_mcwpInfo.waypoints[i+1].x;
-			end.y += m_mcwpInfo.waypoints[i+1].y;
-			end.x /= 2;
-			end.y /= 2;
-			Coord3D result = start;
-			result.x += factor*(end.x-start.x);
-			result.y += factor*(end.y-start.y);
-			result.x += (1-factor)*factor*(mid.x-end.x + mid.x-start.x);
-			result.y += (1-factor)*factor*(mid.y-end.y + mid.y-start.y);
-			result.z = 0;
-			Vector2 dir(pLoc->x-result.x, pLoc->y-result.y);
-			const Real dirLength = dir.Length();
-			if (dirLength<0.1f) continue;
-			Real angle = WWMath::Acos(dir.X/dirLength);
-			if (dir.Y<0.0f) {
-				angle = -angle;
-			}
-			// Default camera is rotated 90 degrees, so match.
-			angle -= PI/2;
-			normAngle(angle);
-			m_mcwpInfo.cameraAngle[i] = angle;
-		}
-		if (m_mcwpInfo.totalTimeMilliseconds==1) {
-			// do it instantly.
-			moveAlongWaypointPath(1);
-			m_doingMoveCameraOnWaypointPath = true;
-			m_CameraArrivedAtWaypointOnPathFlag = false;
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Sets the look toward point for the end of a camera movement. */
-// ------------------------------------------------------------------------------------------------
-void W3DView::cameraModFinalMoveTo(Coord3D *pLoc) 
-{
-	if (m_doingRotateCamera) {
-		return; // Doesn't apply to rotate about a point.
-	}
-	if (m_doingMoveCameraOnWaypointPath) {
-		Int i;
-		Coord3D start, delta;
-		start = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-		delta.x = pLoc->x - start.x;
-		delta.y = pLoc->y - start.y;
-		for (i=2; i<=m_mcwpInfo.numWaypoints; i++) {
-			Coord3D result = m_mcwpInfo.waypoints[i];
-			result.x += delta.x;
-			result.y += delta.y;
-			m_mcwpInfo.waypoints[i] = result;
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Sets the look toward point for the end of a camera movement. */
-// ------------------------------------------------------------------------------------------------
-void W3DView::cameraModFinalLookToward(Coord3D *pLoc) 
-{
-	if (m_doingRotateCamera) {
-		return; // Doesn't apply to rotate about a point.
-	}
-	if (m_doingMoveCameraOnWaypointPath) {
-		Int i;
-		Int min = m_mcwpInfo.numWaypoints-1;
-		if (min<2) min=2;
-//		Real curDistance = 0;
-		for (i=min; i<=m_mcwpInfo.numWaypoints; i++) {
-			Coord3D start, mid, end;
-			Real factor = 0.5;
-			start = m_mcwpInfo.waypoints[i-1];
-			start.x += m_mcwpInfo.waypoints[i].x;
-			start.y += m_mcwpInfo.waypoints[i].y;
-			start.x /= 2;
-			start.y /= 2;
-			mid = m_mcwpInfo.waypoints[i];
-			end = m_mcwpInfo.waypoints[i];
-			end.x += m_mcwpInfo.waypoints[i+1].x;
-			end.y += m_mcwpInfo.waypoints[i+1].y;
-			end.x /= 2;
-			end.y /= 2;
-			Coord3D result = start;
-			result.x += factor*(end.x-start.x);
-			result.y += factor*(end.y-start.y);
-			result.x += (1-factor)*factor*(mid.x-end.x + mid.x-start.x);
-			result.y += (1-factor)*factor*(mid.y-end.y + mid.y-start.y);
-			result.z = 0;
-			Vector2 dir(pLoc->x-result.x, pLoc->y-result.y);
-			const Real dirLength = dir.Length();
-			if (dirLength<0.1f) continue;
-			Real angle = WWMath::Acos(dir.X/dirLength);
-			if (dir.Y<0.0f) {
-				angle = -angle;
-			}
-			// Default camera is rotated 90 degrees, so match.
-			angle -= PI/2;
-			normAngle(angle);
-			if (i==m_mcwpInfo.numWaypoints) { 
-				m_mcwpInfo.cameraAngle[i] = angle;
-			} else {
-				Real deltaAngle = angle - m_mcwpInfo.cameraAngle[i];
-				normAngle(deltaAngle);
-				angle = m_mcwpInfo.cameraAngle[i] + deltaAngle/2;
-				normAngle(angle);
-				m_mcwpInfo.cameraAngle[i] = angle;
-			}
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Sets the final time multiplier for a camera movement. */
-// ------------------------------------------------------------------------------------------------
-void W3DView::cameraModFinalTimeMultiplier(Int finalMultiplier) 
-{
-	if (m_doingZoomCamera)
-		m_zcInfo.endTimeMultiplier = finalMultiplier;
-	if (m_doingPitchCamera)
-		m_pcInfo.endTimeMultiplier = finalMultiplier;
-	if (m_doingRotateCamera) {
-		m_rcInfo.endTimeMultiplier = finalMultiplier;
-	} else if (m_doingMoveCameraOnWaypointPath) {
-		Int i;
-		Real curDistance = 0;
-		for (i=0; i<m_mcwpInfo.numWaypoints; i++) {
-			curDistance += m_mcwpInfo.waySegLength[i];
-			Real factor2 = curDistance / m_mcwpInfo.totalDistance;
-			Real factor1 = 1.0-factor2;
-			m_mcwpInfo.timeMultiplier[i+1] = REAL_TO_INT_FLOOR(0.5+m_mcwpInfo.timeMultiplier[i+1]*factor1 + finalMultiplier*factor2);
-		}
-	} else {
-		// If we aren't doing a camera movement, just set the time.
-		m_timeMultiplier = finalMultiplier;
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Sets the number of frames to average motion for a camera movement */
-// ------------------------------------------------------------------------------------------------
-void W3DView::cameraModRollingAverage(Int framesToAverage) 
-{
-	if (framesToAverage < 1) framesToAverage = 1;
-	m_mcwpInfo.rollingAverageFrames = framesToAverage;
-}
- 
-// ------------------------------------------------------------------------------------------------
-/** Sets the final pitch for a camera movement. */
-// ------------------------------------------------------------------------------------------------
-void W3DView::cameraModFinalPitch(Real finalPitch, Real easeIn, Real easeOut) {
-	if (m_doingRotateCamera) {
-		Real time = (m_rcInfo.numFrames + m_rcInfo.numHoldFrames - m_rcInfo.curFrame)*TheW3DFrameLengthInMsec;
-		pitchCamera( finalPitch, time, time*easeIn, time*easeOut );
-	}
-	if (m_doingMoveCameraOnWaypointPath) {
-		Real time = m_mcwpInfo.totalTimeMilliseconds - m_mcwpInfo.elapsedTimeMilliseconds;
-		pitchCamera( finalPitch, time, time*easeIn, time*easeOut );
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Move camera to a waypoint, resetting the default angle, pitch & zoom along the way.. */
-// ------------------------------------------------------------------------------------------------
-void W3DView::resetCamera(const Coord3D *location, Int milliseconds, Real easeIn, Real easeOut)
-{
-	moveCameraTo(location, milliseconds, 0, false, easeIn, easeOut);
-	m_mcwpInfo.cameraAngle[2] = 0.0; // default angle.
-	// m_mcwpInfo.cameraAngle[2] = m_defaultAngle;
-	m_angle = m_mcwpInfo.cameraAngle[0];
-
-	// terrain height + desired height offset == cameraOffset * actual zoom
-	// find best approximation of max terrain height we can see
-	//Real terrainHeightMax = getHeightAroundPos(m_pos.x, m_pos.y);
-	Real terrainHeightMax = getHeightAroundPos(location->x, location->y);
-	Real desiredHeight = (terrainHeightMax + m_maxHeightAboveGround);
-	Real desiredZoom = desiredHeight / m_cameraOffset.z;
-
-	zoomCamera( desiredZoom, milliseconds, easeIn, easeOut );	// this isn't right... or is it?
-
-	pitchCamera( 1.0, milliseconds, easeIn, easeOut );
-	// pitchCamera( m_defaultPitchAngle, milliseconds, easeIn, easeOut );
-	//DEBUG_LOG(("W3DView::resetCamera() Current zoom: %g  Desired zoom: %g  Current pitch: %g  Desired pitch: %g\n",
-	//	m_zoom, desiredZoom, m_pitchAngle, m_defaultPitchAngle));
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-Bool W3DView::isCameraMovementFinished(void)
-{
-	if (m_viewFilter == FT_VIEW_MOTION_BLUR_FILTER) {
-		// Several of the motion blur effects are similar to camera movements.
-		if (m_viewFilterMode == FM_VIEW_MB_IN_AND_OUT_ALPHA ||
-				m_viewFilterMode == FM_VIEW_MB_IN_AND_OUT_SATURATE ||
-				m_viewFilterMode == FM_VIEW_MB_IN_ALPHA ||
-				m_viewFilterMode == FM_VIEW_MB_OUT_ALPHA ||
-				m_viewFilterMode == FM_VIEW_MB_IN_SATURATE ||
-				m_viewFilterMode == FM_VIEW_MB_OUT_SATURATE ) {
-			return true;
-		}
-	}
-	return !m_doingMoveCameraOnWaypointPath && !m_doingRotateCamera && !m_doingPitchCamera && !m_doingZoomCamera;
-}
-
-
-Bool W3DView::isCameraMovementAtWaypointAlongPath(void)
-{
-	// WWDEBUG_SAY((( "MBL: Polling W3DView::isCameraMovementAtWaypointAlongPath\n" )));
-	
-	Bool return_value = m_CameraArrivedAtWaypointOnPathFlag;
-	#pragma message( "MBL: Clearing variable after polling - for scripting - see Adam.\n" )
-	m_CameraArrivedAtWaypointOnPathFlag = false;
-	return( return_value );
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Move camera along a waypoint path in an interesting fashion.  Sets up parameters that get
- * evaluated in draw(). */
- // ------------------------------------------------------------------------------------------------
-void W3DView::moveCameraAlongWaypointPath(Waypoint *pWay, Int milliseconds, Int shutter, Bool orient, Real easeIn, Real easeOut)
-{
-	const Real MIN_DELTA = MAP_XY_FACTOR;
-
-	m_mcwpInfo.waypoints[0] = *getPosition();	
-	m_mcwpInfo.cameraAngle[0] = getAngle();	
-	m_mcwpInfo.waySegLength[0] = 0;	
-	m_mcwpInfo.waypoints[1] = *getPosition();	
-	m_mcwpInfo.numWaypoints = 1;
-	if (milliseconds<1) milliseconds = 1;
-	m_mcwpInfo.totalTimeMilliseconds = milliseconds;
-	m_mcwpInfo.shutter = shutter/TheW3DFrameLengthInMsec;
-	if (m_mcwpInfo.shutter<1) m_mcwpInfo.shutter = 1;
-	m_mcwpInfo.ease.setEaseTimes(easeIn/milliseconds, easeOut/milliseconds);
-
-	while (pWay && m_mcwpInfo.numWaypoints <MAX_WAYPOINTS) {
-		m_mcwpInfo.numWaypoints++;
-		m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints] = *pWay->getLocation();
-		if (pWay->getNumLinks()>0) {
-			pWay = pWay->getLink(0);
-		} else {
-			pWay = NULL;
-		}	
-		Vector2 dir(m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints].x-m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints-1].x, m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints].y-m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints-1].y);
-		if (dir.Length()<MIN_DELTA) {
-			if (pWay) {
-				m_mcwpInfo.numWaypoints--; // drop this one.
-			} else {
-				m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints-1] = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-				m_mcwpInfo.numWaypoints--; // Push this one back.
-			}
-		}
-	}
-	setupWaypointPath(orient);
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Calculates angles and distances for moving along a waypoint path.  Sets up parameters that get
- * evaluated in draw(). */
-// ------------------------------------------------------------------------------------------------
-void W3DView::setupWaypointPath(Bool orient)
-{
-	m_mcwpInfo.curSegment = 1;
-	m_mcwpInfo.curSegDistance = 0;
-	m_mcwpInfo.totalDistance = 0;
-	m_mcwpInfo.rollingAverageFrames = 1;
-	Int i;
-	Real angle = getAngle();
-	for (i=1; i<m_mcwpInfo.numWaypoints; i++) {
-		Vector2 dir(m_mcwpInfo.waypoints[i+1].x-m_mcwpInfo.waypoints[i].x, m_mcwpInfo.waypoints[i+1].y-m_mcwpInfo.waypoints[i].y);
-		m_mcwpInfo.waySegLength[i] = dir.Length();
-		m_mcwpInfo.totalDistance += m_mcwpInfo.waySegLength[i];
-		if (orient) {
-			angle = WWMath::Acos(dir.X/m_mcwpInfo.waySegLength[i]);
-			if (dir.Y<0.0f) {
-				angle = -angle;
-			}
-
-			// Default camera is rotated 90 degrees, so match.
-			angle -= PI/2;
-			normAngle(angle);
-		}
-		//DEBUG_LOG(("Original Index %d, angle %.2f\n", i, angle*180/PI));
-		m_mcwpInfo.cameraAngle[i] = angle;
-	}
-	m_mcwpInfo.cameraAngle[1] = getAngle();	
-	m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints] = m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints-1];	
-	for (i=m_mcwpInfo.numWaypoints-1; i>1; i--) {
-		m_mcwpInfo.cameraAngle[i] = (m_mcwpInfo.cameraAngle[i] + m_mcwpInfo.cameraAngle[i-1]) / 2;  
-	}
-	m_mcwpInfo.waySegLength[m_mcwpInfo.numWaypoints+1] = m_mcwpInfo.waySegLength[m_mcwpInfo.numWaypoints];	
-
-	// Prevent a possible divide by zero.
-	if (m_mcwpInfo.totalDistance<1.0) {
-		m_mcwpInfo.waySegLength[m_mcwpInfo.numWaypoints-1] += 1.0-m_mcwpInfo.totalDistance;
-		m_mcwpInfo.totalDistance = 1.0;
-	}
-
-	Real curDistance = 0;
-	Coord3D finalPos = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-	Real newGround = TheTerrainLogic->getGroundHeight(finalPos.x, finalPos.y);
-	for (i=0; i<=m_mcwpInfo.numWaypoints+1; i++) {
-		Real factor2 = curDistance / m_mcwpInfo.totalDistance;
-		Real factor1 = 1.0-factor2;
-		m_mcwpInfo.timeMultiplier[i] = m_timeMultiplier;
-		m_mcwpInfo.groundHeight[i] = m_groundLevel*factor1 + newGround*factor2;
-		curDistance += m_mcwpInfo.waySegLength[i];
-		//DEBUG_LOG(("New Index %d, angle %.2f\n", i, m_mcwpInfo.cameraAngle[i]*180/PI));
-	}
-
-	// Pad the end.
-	m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints+1] = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-	Coord3D cur = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-	Coord3D prev = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints-1];
-	m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints+1].x += cur.x-prev.x;
-	m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints+1].y += cur.y-prev.y;
-	m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints+1] = m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints];	
-	m_mcwpInfo.groundHeight[m_mcwpInfo.numWaypoints+1] = newGround;	
-
-
-	cur = m_mcwpInfo.waypoints[2];
-	prev = m_mcwpInfo.waypoints[1];
-	m_mcwpInfo.waypoints[0].x -= cur.x-prev.x;
-	m_mcwpInfo.waypoints[0].y -= cur.y-prev.y;
-
-	m_doingMoveCameraOnWaypointPath = m_mcwpInfo.numWaypoints>1;
-	m_CameraArrivedAtWaypointOnPathFlag = false;
-	m_doingRotateCamera = false;
-
-	m_mcwpInfo.elapsedTimeMilliseconds = 0;
-	m_mcwpInfo.curShutter = m_mcwpInfo.shutter;
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-static Real makeQuadraticS(Real t) 
-{
-	// for t = linear 0-1, convert to quadratic s where 0==0, 0.5==0.5 && 1.0 == 1.0.
-	Real tPrime = t;
-	if (t<0.5) {
-		tPrime = 0.5 * (2*t*2*t);
-	} else {
-		tPrime = (t-0.5)*2;
-		tPrime = WWMath::Sqrt(tPrime);
-		tPrime = 0.5 + 0.5*(tPrime);
-	}
-	return tPrime*0.5 + t*0.5;
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::rotateCameraOneFrame(void)
-{
-	m_rcInfo.curFrame++;
-	if (TheGlobalData->m_disableCameraMovement) {
-		if (m_rcInfo.curFrame >= m_rcInfo.numFrames + m_rcInfo.numHoldFrames) {
-			m_doingRotateCamera = false;
-			m_freezeTimeForCameraMovement = false;
-		}
-		return;
-	}
-
-	if (m_rcInfo.trackObject)
-	{
-		if (m_rcInfo.curFrame <= m_rcInfo.numFrames + m_rcInfo.numHoldFrames)
-		{
-			const Object *obj = TheGameLogic->findObjectByID(m_rcInfo.target.targetObjectID);
-			if (obj)
-			{
-				// object has not been destroyed
-				m_rcInfo.target.targetObjectPos = *obj->getPosition();
-			}
-
-			const Vector2 dir(m_rcInfo.target.targetObjectPos.x - m_pos.x, m_rcInfo.target.targetObjectPos.y - m_pos.y);
-			const Real dirLength = dir.Length();
-			if (dirLength>=0.1f)
-			{
-				Real angle = WWMath::Acos(dir.X/dirLength);
-				if (dir.Y<0.0f) {
-					angle = -angle;
-				}
-				// Default camera is rotated 90 degrees, so match.
-				angle -= PI/2;
-				normAngle(angle);
-
-				if (m_rcInfo.curFrame <= m_rcInfo.numFrames)
-				{
-					Real factor = m_rcInfo.ease(((Real)m_rcInfo.curFrame)/m_rcInfo.numFrames);
-					Real angleDiff = angle - m_angle;
-					normAngle(angleDiff);
-					angleDiff *= factor;
-					m_angle += angleDiff;
-					normAngle(m_angle);
-					m_timeMultiplier = m_rcInfo.startTimeMultiplier + REAL_TO_INT_FLOOR(0.5 + (m_rcInfo.endTimeMultiplier-m_rcInfo.startTimeMultiplier)*factor);
-				}
-				else
-				{
-					m_angle = angle;
-				}
-			}
-		}
-	}
-	else if (m_rcInfo.curFrame <= m_rcInfo.numFrames)
-	{
-		Real factor = m_rcInfo.ease(((Real)m_rcInfo.curFrame)/m_rcInfo.numFrames);
-		m_angle = WWMath::Lerp(m_rcInfo.angle.startAngle, m_rcInfo.angle.endAngle, factor);
-		normAngle(m_angle);
-		m_timeMultiplier = m_rcInfo.startTimeMultiplier + REAL_TO_INT_FLOOR(0.5 + (m_rcInfo.endTimeMultiplier-m_rcInfo.startTimeMultiplier)*factor);
-	}
-
-
-	if (m_rcInfo.curFrame >= m_rcInfo.numFrames + m_rcInfo.numHoldFrames) {
-		m_doingRotateCamera = false;
-		m_freezeTimeForCameraMovement = false;
-		if (! m_rcInfo.trackObject)
-		{
-			m_angle = m_rcInfo.angle.endAngle;
-		}
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::zoomCameraOneFrame(void)
-{
-	m_zcInfo.curFrame++;
-	if (TheGlobalData->m_disableCameraMovement) {
-		if (m_zcInfo.curFrame >= m_zcInfo.numFrames) {
-			m_doingZoomCamera = false;
-		}
-		return;
-	}
-	if (m_zcInfo.curFrame <= m_zcInfo.numFrames)
-	{
-		// not just holding; do the camera adjustment
-		Real factor = m_zcInfo.ease(((Real)m_zcInfo.curFrame)/m_zcInfo.numFrames);
-		m_zoom = WWMath::Lerp(m_zcInfo.startZoom, m_zcInfo.endZoom, factor);
-	}
-
-	if (m_zcInfo.curFrame >= m_zcInfo.numFrames) {
-		m_doingZoomCamera = false;
-		m_zoom = m_zcInfo.endZoom;
-	}
-
-	//DEBUG_LOG(("W3DView::zoomCameraOneFrame() - m_zoom = %g\n", m_zoom));
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::pitchCameraOneFrame(void)
-{
-	m_pcInfo.curFrame++;
-	if (TheGlobalData->m_disableCameraMovement) {
-		if (m_pcInfo.curFrame >= m_pcInfo.numFrames) {
-			m_doingPitchCamera = false;
-		}
-		return;
-	}
-	if (m_pcInfo.curFrame <= m_pcInfo.numFrames)
-	{
-		// not just holding; do the camera adjustment
-		Real factor = m_pcInfo.ease(((Real)m_pcInfo.curFrame)/m_pcInfo.numFrames);
-		m_FXPitch = WWMath::Lerp(m_pcInfo.startPitch, m_pcInfo.endPitch, factor);
-	}
-
-	if (m_pcInfo.curFrame >= m_pcInfo.numFrames) {
-		m_doingPitchCamera = false;
-		m_FXPitch = m_pcInfo.endPitch;
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DView::moveAlongWaypointPath(Int milliseconds)
-{
-	m_mcwpInfo.elapsedTimeMilliseconds += milliseconds;
-	if (TheGlobalData->m_disableCameraMovement) {
-		if (m_mcwpInfo.elapsedTimeMilliseconds>m_mcwpInfo.totalTimeMilliseconds) {
-			m_doingMoveCameraOnWaypointPath = false;
-			m_freezeTimeForCameraMovement = false;
-		}
-		return;
-	}
-	if (m_mcwpInfo.elapsedTimeMilliseconds>m_mcwpInfo.totalTimeMilliseconds) {
-		m_doingMoveCameraOnWaypointPath = false;
-		m_CameraArrivedAtWaypointOnPathFlag = false;
-
-		m_freezeTimeForCameraMovement = false;
-		m_angle = m_mcwpInfo.cameraAngle[m_mcwpInfo.numWaypoints];
-
-		m_groundLevel = m_mcwpInfo.groundHeight[m_mcwpInfo.numWaypoints];
-		/////////////////////m_cameraOffset.z = m_groundLevel+TheGlobalData->m_cameraHeight;
-		m_cameraOffset.y = -(m_cameraOffset.z / tan(TheGlobalData->m_cameraPitch * (PI / 180.0)));
-		m_cameraOffset.x = -(m_cameraOffset.y * tan(TheGlobalData->m_cameraYaw * (PI / 180.0)));
-
-		Coord3D pos = m_mcwpInfo.waypoints[m_mcwpInfo.numWaypoints];
-		pos.z = 0;
-		setPosition(&pos);
-		// Note - assuming that the scripter knows what he is doing, we adjust the constraints so that
-		// the scripted action can occur.
-		m_cameraConstraint.lo.x = minf(m_cameraConstraint.lo.x, pos.x);
-		m_cameraConstraint.hi.x = maxf(m_cameraConstraint.hi.x, pos.x);
-		m_cameraConstraint.lo.y = minf(m_cameraConstraint.lo.y, pos.y);
-		m_cameraConstraint.hi.y = maxf(m_cameraConstraint.hi.y, pos.y);
-		return;
-	}
-
-	const Real totalTime = m_mcwpInfo.totalTimeMilliseconds;
-	const Real deltaTime = m_mcwpInfo.ease(m_mcwpInfo.elapsedTimeMilliseconds/totalTime) -
-		m_mcwpInfo.ease((m_mcwpInfo.elapsedTimeMilliseconds - milliseconds)/totalTime);
-	m_mcwpInfo.curSegDistance += deltaTime*m_mcwpInfo.totalDistance;
-	while (m_mcwpInfo.curSegDistance >= m_mcwpInfo.waySegLength[m_mcwpInfo.curSegment]) {
-
-		if ( m_doingMoveCameraOnWaypointPath )
-		{
-			//WWDEBUG_SAY(( "MBL TEST: Camera waypoint along path reached!\n" ));
-			m_CameraArrivedAtWaypointOnPathFlag = true;
-		}
-
-		m_mcwpInfo.curSegDistance -= m_mcwpInfo.waySegLength[m_mcwpInfo.curSegment];
-		m_mcwpInfo.curSegment++;
-		if (m_mcwpInfo.curSegment >= m_mcwpInfo.numWaypoints) { 
-			m_mcwpInfo.totalTimeMilliseconds = 0; // Will end following next frame.
-			return;
-		}
-	}
-	Real avgFactor = 1.0/m_mcwpInfo.rollingAverageFrames;
-	m_mcwpInfo.curShutter--;
-	if (m_mcwpInfo.curShutter>0) {
-		return;
-	}
-	m_mcwpInfo.curShutter = m_mcwpInfo.shutter;
-	Real factor = m_mcwpInfo.curSegDistance / m_mcwpInfo.waySegLength[m_mcwpInfo.curSegment];
-	if (m_mcwpInfo.curSegment == m_mcwpInfo.numWaypoints-1) {
-		avgFactor = avgFactor + (1.0-avgFactor)*factor;
-	}
-	Real factor1;
-	Real factor2;
-	factor1 = 1.0-factor;
-	//factor1 = makeQuadraticS(factor1);
-	factor2 = 1.0-factor1;
-	Real angle1 = m_mcwpInfo.cameraAngle[m_mcwpInfo.curSegment];
-	Real angle2 = m_mcwpInfo.cameraAngle[m_mcwpInfo.curSegment+1];
-	if (angle2-angle1 > PI) angle1 += 2*PI;
-	if (angle2-angle1 < -PI) angle1 -= 2*PI;
-	Real angle = angle1 * (factor1) + angle2 * (factor2); 
-
-	normAngle(angle);
-	Real deltaAngle = angle-m_angle;
-	normAngle(deltaAngle);
-	if (fabs(deltaAngle) > PI/10) {
-		DEBUG_LOG(("Huh.\n"));
-	}
-	m_angle += avgFactor*(deltaAngle);
-	normAngle(m_angle);
-
-	Real timeMultiplier = m_mcwpInfo.timeMultiplier[m_mcwpInfo.curSegment]*factor1 + 
-			m_mcwpInfo.timeMultiplier[m_mcwpInfo.curSegment+1]*factor2;
-	m_timeMultiplier = REAL_TO_INT_FLOOR(0.5 + timeMultiplier);
-
-	m_groundLevel = m_mcwpInfo.groundHeight[m_mcwpInfo.curSegment]*factor1 + 
-			m_mcwpInfo.groundHeight[m_mcwpInfo.curSegment+1]*factor2;
-	//////////////m_cameraOffset.z = m_groundLevel+TheGlobalData->m_cameraHeight;
-	m_cameraOffset.y = -(m_cameraOffset.z / tan(TheGlobalData->m_cameraPitch * (PI / 180.0)));
-	m_cameraOffset.x = -(m_cameraOffset.y * tan(TheGlobalData->m_cameraYaw * (PI / 180.0)));
-
-	Coord3D start, mid, end;
-	if (factor<0.5) {
-		start = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment-1];
-		start.x += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment].x;
-		start.y += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment].y;
-		start.x /= 2;
-		start.y /= 2;
-		mid = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment];
-		end = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment];
-		end.x += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1].x;
-		end.y += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1].y;
-		end.x /= 2;
-		end.y /= 2;
-		factor += 0.5;
-	} else {
-		start = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment];
-		start.x += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1].x;
-		start.y += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1].y;
-		start.x /= 2;
-		start.y /= 2;
-		mid = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1];
-		end = m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+1];
-		end.x += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+2].x;
-		end.y += m_mcwpInfo.waypoints[m_mcwpInfo.curSegment+2].y;
-		end.x /= 2;
-		end.y /= 2;
-		factor -= 0.5;
-	}
-
-	Coord3D result = start;
-	result.x += factor*(end.x-start.x);
-	result.y += factor*(end.y-start.y);
-	result.x += (1-factor)*factor*(mid.x-end.x + mid.x-start.x);
-	result.y += (1-factor)*factor*(mid.y-end.y + mid.y-start.y);
-	result.z = 0;
-/*
-	static Real prevGround = 0;
-	DEBUG_LOG(("Dx %.2f, dy %.2f, DeltaANgle = %.2f, %.2f DeltaGround %.2f\n", m_pos.x-result.x, m_pos.y-result.y, deltaAngle, m_groundLevel, m_groundLevel-prevGround));
-	prevGround = m_groundLevel;
-*/
-	setPosition(&result);
-	// Note - assuming that the scripter knows what he is doing, we adjust the constraints so that
-	// the scripted action can occur.
-	m_cameraConstraint.lo.x = minf(m_cameraConstraint.lo.x, result.x);
-	m_cameraConstraint.hi.x = maxf(m_cameraConstraint.hi.x, result.x);
-	m_cameraConstraint.lo.y = minf(m_cameraConstraint.lo.y, result.y);
-	m_cameraConstraint.hi.y = maxf(m_cameraConstraint.hi.y, result.y);
-
-}
-
-
-// ------------------------------------------------------------------------------------------------
-/** Add an impulse force to shake the camera.
- * The camera shake is a simple simulation of an oscillating spring/damper.
- * The idea is that some sort of shock has "pushed" the camera once, as an
- * impluse, after which the camera vibrates back to its rest position.
- * @todo This should be part of "View", not "W3DView". */
-// ------------------------------------------------------------------------------------------------
-void W3DView::shake( const Coord3D *epicenter, CameraShakeType shakeType )
-{
-	Real angle = GameClientRandomValueReal( 0, 2*PI );
-
-	m_shakeAngleCos = (Real)cos( angle );
-	m_shakeAngleSin = (Real)sin( angle );
-
-	Real intensity = 0.0f;
-	switch( shakeType )
-	{
-		case SHAKE_SUBTLE:
-			intensity = TheGlobalData->m_shakeSubtleIntensity;
-			break;
-
-		case SHAKE_NORMAL:
-			intensity = TheGlobalData->m_shakeNormalIntensity;
-			break;
-
-		case SHAKE_STRONG:
-			intensity = TheGlobalData->m_shakeStrongIntensity;
-			break;
-
-		case SHAKE_SEVERE:
-			intensity = TheGlobalData->m_shakeSevereIntensity;
-			break;
-		
-		case SHAKE_CINE_EXTREME:
-			intensity = TheGlobalData->m_shakeCineExtremeIntensity;
-			break;
-
-		case SHAKE_CINE_INSANE:
-			intensity = TheGlobalData->m_shakeCineInsaneIntensity;
-			break;
-	}
-
-	// intensity falls off with distance
-	const Coord3D *viewPos = getPosition();
-	Coord3D d;
-	d.x = epicenter->x - viewPos->x;
-	d.y = epicenter->y - viewPos->y;
-	/// @todo make this 3D once we have the real "lookat" spot
-	//d.z = epicenter->z - viewPos->z;
-
-	Real dist = (Real)sqrt( d.x*d.x + d.y*d.y );
-
-	if (dist > TheGlobalData->m_maxShakeRange)
-		return;
-
-	intensity *= 1.0f - (dist/TheGlobalData->m_maxShakeRange);
-
-	// add intensity and clamp
-	m_shakeIntensity += intensity;
-
-	//const Real maxIntensity = 10.0f;
-	const Real maxIntensity = 3.0f;
-	if (m_shakeIntensity > TheGlobalData->m_maxShakeIntensity)
-		m_shakeIntensity = maxIntensity;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Transformt he screen pixel coord passed in, to a world coordinate at the specified
-	* z value */
-//-------------------------------------------------------------------------------------------------
-void W3DView::screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z )
-{
-	Vector3 rayStart, rayEnd;
-	
-	getPickRay( s, &rayStart, &rayEnd );
-	w->x = Vector3::Find_X_At_Z( z, rayStart, rayEnd );
-	w->y = Vector3::Find_Y_At_Z( z, rayStart, rayEnd );
-	w->z = z;
-
-}  // end screenToWorldAtZ
-
-void W3DView::cameraEnableSlaveMode(const AsciiString & objectName, const AsciiString & boneName)
-{
-	m_isCameraSlaved = true;
-	m_cameraSlaveObjectName = objectName;
-	m_cameraSlaveObjectBoneName = boneName;
-}
-
-void W3DView::cameraDisableSlaveMode(void)	
-{
-	m_isCameraSlaved = false;
-}
-
-void W3DView::cameraEnableRealZoomMode(void) //WST added 10/18/2002
-{
-	m_useRealZoomCam = true;
-	m_FXPitch = 1.0f;	//Reset to default
-	//m_zoom = 1.0f;
-	updateView();
-}
-
-void W3DView::cameraDisableRealZoomMode(void) //WST added 10/18/2002
-{
-	m_useRealZoomCam = false;
-	m_FXPitch = 1.0f;	//Reset to default
-	//m_zoom = 1.0f;
-	m_FOV = 50.0f * PI/180.0f;
-	setCameraTransform();
-	updateView();
-}
-
-void W3DView::Add_Camera_Shake (const Coord3D & position,float radius,float duration,float power) //WST added 11/13/02
-{
-	Vector3 vpos;
-
-	vpos.X = position.x;
-	vpos.Y = position.y;
-	vpos.Z = position.z;
-
-
-	CameraShakerSystem.Add_Camera_Shake(vpos,radius,duration,power);
-}
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp
index c25b70847e6..b7ee59abd34 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp
@@ -39,7 +39,7 @@
 W3DWebBrowser::W3DWebBrowser() : WebBrowser() {
 }
 
-Bool W3DWebBrowser::createBrowserWindow(const char *tag, GameWindow *win) 
+Bool W3DWebBrowser::createBrowserWindow(const char *tag, GameWindow *win)
 {
 
 	WinInstanceData *winData = win->winGetInstanceData();
@@ -53,7 +53,7 @@ Bool W3DWebBrowser::createBrowserWindow(const char *tag, GameWindow *win)
 	WebBrowserURL *url = findURL( AsciiString(tag) );
 
 	if (url == NULL) {
-		DEBUG_LOG(("W3DWebBrowser::createBrowserWindow - couldn't find URL for page %s\n", tag));
+		DEBUG_LOG(("W3DWebBrowser::createBrowserWindow - couldn't find URL for page %s", tag));
 		return FALSE;
 	}
 
@@ -72,7 +72,7 @@ Bool W3DWebBrowser::createBrowserWindow(const char *tag, GameWindow *win)
 	return TRUE;
 }
 
-void W3DWebBrowser::closeBrowserWindow(GameWindow *win) 
+void W3DWebBrowser::closeBrowserWindow(GameWindow *win)
 {
 	DX8WebBrowser::DestroyBrowser(win->winGetInstanceData()->m_decoratedNameString.str());
 }
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
index 1bd414c0d0f..6c073b501d6 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
@@ -24,12 +24,12 @@
 
 // FILE: W3DWaypointBuffer.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   Command & Conquers: Generals
@@ -42,27 +42,27 @@
 //            are rendered after terrain, after roads & bridges, and after
 //            global fog, but before structures, objects, units, trees, etc.
 //            This way if we have two waypoints at the bottom of a hill but
-//            going through the hill, the line won't get cut off. However, 
+//            going through the hill, the line won't get cut off. However,
 //            structures and units on top of paths will render above it. Waypoints
 //            are only shown for selected units while in waypoint plotting mode.
 //
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "W3DDevice/GameClient/W3DWaypointBuffer.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 
+#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/RandomValue.h"
 #include "Common/ThingFactory.h"
 #include "Common/ThingTemplate.h"
 
+#include "GameClient/ControlBar.h"
 #include "GameClient/Drawable.h"
 #include "GameClient/GameClient.h"
 #include "GameClient/InGameUI.h"
@@ -86,11 +86,6 @@
 
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 //=============================================================================
@@ -236,7 +231,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 			Int numPoints = 0;
 			if( obj )
 			{
-				if ( ! obj->isLocallyControlled())
+				if ( obj->getControllingPlayer() != rts::getObservedOrLocalPlayer())
 					continue;
 
 
@@ -245,7 +240,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
         // lets test for that very special case of having a listeningoutpost selected, and some enemy drawable moused-over
         if ( obj->isKindOf( KINDOF_REVEALS_ENEMY_PATHS ) )
         {
- 
+
           DrawableID enemyID = TheInGameUI->getMousedOverDrawableID();
           Drawable *enemyDraw = TheGameClient->findDrawableByID( enemyID );
           if ( enemyDraw )
@@ -255,18 +250,18 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
             {
               if ( enemy->getRelationship( obj ) == ENEMIES )
               {
-                
+
                 Coord3D delta = *obj->getPosition();
                 delta.sub( enemy->getPosition() );
                 if ( delta.length() <= obj->getVisionRange() ) // is listening outpost close enough to do this?
                 {
 
 
-                  //////////////////////////////////////////////////////////////////////                
+                  //////////////////////////////////////////////////////////////////////
                   AIUpdateInterface *ai = enemy->getAI();
 				          Int goalSize = ai ? ai->friend_getWaypointGoalPathSize() : 0;
 				          Int gpIdx = ai ? ai->friend_getCurrentGoalPathIndex() : 0;
-                  if( ai ) 
+                  if( ai )
                   {
                     Bool lineExists = FALSE;
 
@@ -317,7 +312,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 					            m_line->Render( localRinfo );
                     }
                   }
-                  //////////////////////////////////////////////////////////////////////                
+                  //////////////////////////////////////////////////////////////////////
 
 
 
@@ -340,13 +335,13 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 					Coord3D exitPoint;
 					if ( ! exitInterface->getExitPosition(exitPoint))
 						exitPoint = *obj->getPosition();
-						
+
 					points[ numPoints ].Set( Vector3( exitPoint.x, exitPoint.y, exitPoint.z ) );
 					numPoints++;
 
 					Bool boxWrap = TRUE;
 					Coord3D naturalRallyPoint;
-					if (exitInterface->getNaturalRallyPoint(naturalRallyPoint, FALSE))//FALSE means "without the extra offset" 
+					if (exitInterface->getNaturalRallyPoint(naturalRallyPoint, FALSE))//FALSE means "without the extra offset"
 					{
 						if( !naturalRallyPoint.equals( exitPoint ) )
 						{
@@ -359,7 +354,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 							boxWrap = FALSE;
 						}
 					}
-					else 
+					else
 						continue; //next drawable
 
 					const Coord3D *rallyPoint = exitInterface->getRallyPoint();
@@ -391,7 +386,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 							//if the rallypoint is closer to the wayoutpoint than it is to the natural rally point then we definitely do not wrap
 							Coord3D rallyToWayOutDelta = wayOutPoint;
 							rallyToWayOutDelta.sub(rallyPoint);
-							if ( (100.0f + rallyToWayOutDelta.length()) > wayOutLength) 
+							if ( (100.0f + rallyToWayOutDelta.length()) > wayOutLength)
 							{
 
 								//if we passed the above idiot test, now lets be sure by testing the dotproduct of the rp against the wayoutpoint
@@ -406,7 +401,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 
 									Real angle = obj->getOrientation();
 									Real c = (Real)cos(angle);
-									Real s = (Real)sin(angle); 
+									Real s = (Real)sin(angle);
 
 									Coord3D NRPToCtrDelta;
 									NRPToCtrDelta.x = naturalRallyPoint.x - ctr->x;
@@ -437,7 +432,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 									cornerToExitDelta.z = 0.0f;
 									Real elbowDistanceNear = 99999.9f;
 									Real elbowDistanceFar = 99999.9f;
-									
+
 									for (UnsignedInt cornerIndex = 0; cornerIndex < 4; ++ cornerIndex)
 									{
 										nearCandidate = &corners[cornerIndex];//for quicker array access
@@ -528,8 +523,8 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 					m_line->Set_Points( numPoints, points );
 					m_line->Render( localRinfo );
 
-				}// end if exit interface
-				
+				}
+
 			}
 		}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp
deleted file mode 100644
index f880e070de9..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp
+++ /dev/null
@@ -1,3505 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DWater.cpp /////////////////////////////////////////////////////////////////////////////
-// Created:   Mark Wilczynski, June 2001
-// Desc:      Draw reflective water surface.  Also handles drawing of waves/ripples
-//			  on the surface.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define SCROLL_UV
-										 
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "stdio.h"
-#include "W3DDevice/GameClient/W3DWater.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/W3DShroud.h"
-#include "W3DDevice/GameClient/W3DWaterTracks.h"
-#include "W3DDevice/GameClient/W3DAssetManager.h"
-#include "texture.h"
-#include "assetmgr.h"
-#include "rinfo.h"
-#include "camera.h"
-#include "scene.h"
-#include "dx8wrapper.h"
-#include "light.h"
-#include "d3dx8math.h"
-#include "simplevec.h"
-#include "mesh.h"
-#include "matinfo.h"
-
-#include "Common/GameState.h"
-#include "Common/GlobalData.h"
-#include "Common/PerfTimer.h"
-#include "Common/Xfer.h"
-#include "Common/GameLOD.h"
-
-#include "GameClient/Water.h"
-#include "GameLogic/GameLogic.h"
-#include "GameLogic/PolygonTrigger.h"
-#include "GameLogic/ScriptEngine.h"
-#include "W3DDevice/GameClient/W3DShaderManager.h"
-#include "W3DDevice/GameClient/W3DDisplay.h"
-#include "W3DDevice/GameClient/W3DPoly.h"
-#include "W3DDevice/GameClient/W3DScene.h"
-#include "W3DDevice/GameClient/W3DCustomScene.h"
-
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#define MIPMAP_BUMP_TEXTURE
-
-// DEFINES ////////////////////////////////////////////////////////////////////////////////////////
-#define SKYPLANE_SIZE	(384.0f*MAP_XY_FACTOR)
-#define SKYPLANE_HEIGHT	(30.0f)
-
-#define SKYBODY_TEXTURE	"TSMoonLarg.tga"
-#define SKYBODY_SIZE	45.0f		//extent or radius of sky body
-
-#define SKYBODY_X	150.0f	//location of skybody
-#define SKYBODY_Y	550.0f	//location of skybody
-
-/* in the bay
-#define SKYBODY_X	120.0f			//location of skybody
-#define SKYBODY_Y	75.0f			//location of skybody
-*/
-
-#define SKYBODY_HEIGHT	SKYPLANE_HEIGHT	//altitude of sky body (z-buffer disabled, so can equal sky height).
-
-//GeForce3 water system defines
-#define PATCH_SIZE 15		//number of vertices on patch edge.  Large patches may waste vertices off edge of screen.
-#define PATCH_UV_TILES	42	//number of times the bump map texture is tiled across patch (must be integer!).
-#define PATCH_SCALE (4.0f * MAP_XY_FACTOR)	//horizontal scale factor. Adjust this and size to get desired vertex density.
-#define SEA_REFLECTION_SIZE 256		//dimensions of reflection texture
-
-#define SEA_BUMP_SCALE		(0.06f)		//scales the du/dv offsets stored in bump map (~ amount to perturb)
-#define BUMP_SIZE (50.f)
-#define REFLECTION_FACTOR 0.1f
-
-#define PATCH_WIDTH (PATCH_SIZE-1)	//internal defines
-#define PATCH_UV_SCALE	((Real)PATCH_UV_TILES/(Real)PATCH_WIDTH)	
-
-//3D Grid Mesh Water defines.
-#define WATER_MESH_OPACITY		0.5f
-#define WATER_MESH_X_VERTICES	128
-#define WATER_MESH_Y_VERTICES	128
-#define WATER_MESH_SPACING	MAP_XY_FACTOR	//same as terrain
-
-#ifdef USE_MESH_NORMALS
-#define WATER_MESH_FVF	DX8_FVF_XYZNDUV2
-typedef VertexFormatXYZNDUV2 MaterMeshVertexFormat;
-#else
-#define WATER_MESH_FVF	DX8_FVF_XYZDUV2
-typedef VertexFormatXYZDUV2 MaterMeshVertexFormat;
-#endif
-
-// Converts a FLOAT to a DWORD for use in SetRenderState() calls
-static inline DWORD F2DW( FLOAT f ) { return *((DWORD*)&f); }
-
-#define DRAW_WATER_WAKES
-/// @todo: Fix clipping of objects that intersect the mirror surface
-//#define CLIP_GEOMETRY_TO_PLANE	// this enables clipping of objects that intersect the mirror surfaces
-
-// Some shader combinations that can be useful in rendering water:
-
-// Modulate stage0 with stage1 texture.  Also modulate stage 0 with vertex color.
-#define SC_DETAIL_BLEND ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
-	ShaderClass::SRCBLEND_SRC_ALPHA,ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
-	ShaderClass::TEXTURING_ENABLE, 	ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_ENABLE, ShaderClass::DETAILCOLOR_DETAILBLEND, ShaderClass::DETAILALPHA_DISABLE) )
-
-// Just a z-buffer fill, nothing is written to the color buffer.
-#define SC_ZFILL_BLEND ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_DISABLE, ShaderClass::SRCBLEND_ZERO, \
-	ShaderClass::DSTBLEND_ONE, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, ShaderClass::TEXTURING_ENABLE, \
-	ShaderClass::DETAILCOLOR_SCALE, ShaderClass::DETAILALPHA_DISABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_ENABLE, \
-	ShaderClass::DETAILCOLOR_SCALE, ShaderClass::DETAILALPHA_DISABLE) )
-
-// No texturing, just vertex color with vertex alpha
-#define SC_ZFILL_BLENDx ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE, \
-	ShaderClass::SRCBLEND_ZERO, ShaderClass::DSTBLEND_SRC_COLOR, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
-	ShaderClass::TEXTURING_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_ENABLE, \
-	ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-// Modulate blended with vertex alpha modulation
-#define SC_ZFILL_MODULATE_TEX ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
-	ShaderClass::SRCBLEND_ZERO, ShaderClass::DSTBLEND_SRC_COLOR, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
-	ShaderClass::TEXTURING_ENABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-// Alpha blended with vertex alpha modulation
-#define SC_ZFILL_ALPHA_TEX ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
-	ShaderClass::SRCBLEND_SRC_ALPHA, ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_DISABLE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
-	ShaderClass::TEXTURING_ENABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-// Alpha blended with vertex alpha modulation
-#define SC_OPAQUE_TEXONLY ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
-	ShaderClass::SRCBLEND_ONE, ShaderClass::DSTBLEND_ZERO, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_DISABLE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
-	ShaderClass::TEXTURING_ENABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-// Alpha blended with vertex alpha modulation
-#define SC_ZFILL_BLEND3 ( SHADE_CNST(ShaderClass::PASS_LEQUAL, ShaderClass::DEPTH_WRITE_ENABLE, ShaderClass::COLOR_WRITE_ENABLE,\
-	ShaderClass::SRCBLEND_SRC_ALPHA, ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA, ShaderClass::FOG_DISABLE, ShaderClass::GRADIENT_MODULATE, ShaderClass::SECONDARY_GRADIENT_DISABLE, \
-	ShaderClass::TEXTURING_ENABLE, ShaderClass::ALPHATEST_DISABLE, ShaderClass::CULL_MODE_DISABLE, ShaderClass::DETAILCOLOR_DISABLE, ShaderClass::DETAILALPHA_DISABLE) )
-
-static ShaderClass zFillAlphaShader(SC_ZFILL_BLEND3);
-static ShaderClass blendStagesShader(SC_DETAIL_BLEND);
-
-WaterRenderObjClass *TheWaterRenderObj=NULL; ///<global water rendering object
-
-#define SAFE_RELEASE(p)      { if(p) { (p)->Release(); (p)=NULL; } }
-
-void doSkyBoxSet(Bool startDraw)
-{
-	if (TheWritableGlobalData)
-		TheWritableGlobalData->m_drawSkyBox = startDraw;
-}
-
-
-#define DONUT_SIDES	90
-#define INNER_RADIUS 200.0f
-#define OUTER_RADIUS 250.0f
-#define TEXTURE_REPEAT_COUNT 16
-#define DONUT_HEIGHT	15.0f
-//#define DO_FLAT_DONUT
-#define AMP_SCALE	(30.0f/120.0f)
-#define WAVE_FREQ	0.3f
-#define AMP_SCALE2	(10.0f/120.0f)
-#define NOISE_FREQ	(2.0f*PI/WAVE_FREQ)
-
-#define NOISE_REPEAT_FACTOR ((float)(1.0f/(16.0f)))
-
-					
-static Bool wireframeForDebug = 0;
-
-void WaterRenderObjClass::setupJbaWaterShader(void) 
-{
-	if (!TheWaterTransparency->m_additiveBlend)
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaShader);
-	else
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetAdditiveShader);
-
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);
-	m_riverTexture->Get_Filter().Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_BEST);
-	m_riverTexture->Get_Filter().Set_Min_Filter(TextureFilterClass::FILTER_TYPE_BEST);
-	m_riverTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_BEST);
-
-
-//	Setting *setting=&m_settings[m_tod];	
-
-
-	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_ADD );
-	if (!m_riverAlphaEdge->Is_Initialized())
-		m_riverAlphaEdge->Init();
-	DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,m_riverAlphaEdge->Peek_D3D_Texture());	
-	DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, 0);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(3,  D3DTSS_TEXCOORDINDEX, 1);
-	
-	Bool doSparkles = true;
-
-	if (m_riverWaterPixelShader && doSparkles) {
-		if (!m_waterSparklesTexture->Is_Initialized())
-			m_waterSparklesTexture->Init();
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1,m_waterSparklesTexture->Peek_D3D_Texture());	
-
-		if (!m_waterNoiseTexture->Is_Initialized())
-			m_waterNoiseTexture->Init();
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(2,m_waterNoiseTexture->Peek_D3D_Texture());	
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
- 
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-		// Two output coordinates are used.
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-		D3DXMATRIX inv;
-		float det;
-
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-		D3DXMATRIX scale;
-
-		D3DXMatrixScaling(&scale, NOISE_REPEAT_FACTOR, NOISE_REPEAT_FACTOR,1);
-		D3DXMATRIX destMatrix = inv * scale;
-		D3DXMatrixTranslation(&scale, m_riverVOrigin, m_riverVOrigin,0);
-		destMatrix = destMatrix*scale;
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, *(Matrix4x4*)&destMatrix);
-		
-	}
-	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 1, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 2, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 3, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 3, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	if (m_riverWaterPixelShader){
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(0,   D3DXVECTOR4(REFLECTION_FACTOR, REFLECTION_FACTOR, REFLECTION_FACTOR, 1.0f), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_riverWaterPixelShader);
-	}
-}
-
-
-
-
-//-------------------------------------------------------------------------------------------------
-/** Destructor. Releases w3d assets. */
-//-------------------------------------------------------------------------------------------------
-WaterRenderObjClass::~WaterRenderObjClass(void)
-{
-	REF_PTR_RELEASE(m_meshVertexMaterialClass);
-	REF_PTR_RELEASE(m_vertexMaterialClass);
-	REF_PTR_RELEASE(m_meshLight);
-	REF_PTR_RELEASE(m_alphaClippingTexture);
-	REF_PTR_RELEASE (m_skyBox);
-
-	REF_PTR_RELEASE (m_riverTexture);
-	REF_PTR_RELEASE (m_whiteTexture);
-	REF_PTR_RELEASE (m_waterNoiseTexture);
-	REF_PTR_RELEASE (m_riverAlphaEdge);
-	REF_PTR_RELEASE (m_waterSparklesTexture);
-
-	Int i;
-
-	for(i=0; i<TIME_OF_DAY_COUNT; i++)
-	{	REF_PTR_RELEASE(m_settings[i].skyTexture);
-		REF_PTR_RELEASE(m_settings[i].waterTexture);
-	}
-
-	i=NUM_BUMP_FRAMES;
-	while (i--)
-	{	SAFE_RELEASE( m_pBumpTexture[i]);
-		SAFE_RELEASE( m_pBumpTexture2[i]);
-	}
-
-	if (m_meshData)
-		delete [] m_meshData;
-	m_meshData = NULL;
-	m_meshDataSize = 0;
-
-	//Release strings allocated inside global water settings.
-	for  (i=0; i<TIME_OF_DAY_COUNT; i++)
-	{	WaterSettings[i].m_skyTextureFile.clear();
-		WaterSettings[i].m_waterTextureFile.clear();
-	}
-	deleteInstance((WaterTransparencySetting*)TheWaterTransparency.getNonOverloadedPointer());
-	TheWaterTransparency = NULL;
-	ReleaseResources();
-
-	if (m_waterTrackSystem)
-		delete m_waterTrackSystem;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Constructor. Just nulls out some variables. */
-//-------------------------------------------------------------------------------------------------
-WaterRenderObjClass::WaterRenderObjClass(void)
-{
-	memset( &m_settings, 0, sizeof( m_settings ) );
-	m_dx=0;
-	m_dy=0;
-	m_indexBuffer=NULL;
-	m_waterTrackSystem = NULL;
-	m_doWaterGrid = FALSE;
-	m_meshVertexMaterialClass=NULL;
-	m_meshLight=NULL;
-	m_vertexMaterialClass=NULL;
-	m_alphaClippingTexture=NULL;
-	m_useCloudLayer=true;
-	m_waterType = WATER_TYPE_0_TRANSLUCENT;
-	m_tod=TIME_OF_DAY_AFTERNOON;
-	m_pReflectionTexture=NULL;
-	m_skyBox=NULL;
-	m_vertexBufferD3D=NULL;
-	m_indexBufferD3D=NULL;
-	m_vertexBufferD3DOffset=0;
-
-	m_dwWavePixelShader=NULL;
-	m_dwWaveVertexShader=NULL;
-	m_meshData=NULL;
-	m_meshDataSize = 0;
-	m_meshInMotion = FALSE;
-	m_gridOrigin=Vector2(0,0);
-	m_gridDirectionX=Vector2(1.0f,0.0f);
-	m_gridDirectionY=Vector2(1.0f,0.0f);
-
-	m_gridCellSize=WATER_MESH_SPACING;
-	m_gridCellsX=WATER_MESH_X_VERTICES;
-	m_gridCellsY=WATER_MESH_Y_VERTICES;
-	m_gridWidth = m_gridCellsX * m_gridCellSize;
-	m_gridHeight = m_gridCellsY * m_gridCellSize;
-	
-	Int i=NUM_BUMP_FRAMES;
-	while (i--)
-		m_pBumpTexture[i]=NULL;
-
-	m_riverVOrigin=0;
-	m_riverTexture=NULL;
-	m_whiteTexture=NULL;
-	m_waterNoiseTexture=NULL;
-	m_riverAlphaEdge=NULL;
-	m_waterPixelShader=0;		///<D3D handle to pixel shader.
-	m_riverWaterPixelShader=0;		///<D3D handle to pixel shader.
-	m_trapezoidWaterPixelShader=0;		///<D3D handle to pixel shader.
-	m_waterSparklesTexture=0;
-	m_riverXOffset=0;
-	m_riverYOffset=0;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** WW3D method that returns object bounding sphere used in frustum culling*/
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
-{
-	//Since this object is more of a system (containing lots of water pieces),
-	//let's disable culling by making bounds huge.  Let each piece do it's own cull.
-	Vector3	ObjSpaceCenter(0,0,0);
-//	Vector3	ObjSpaceRadius(m_dx,m_dy,0);
-	Vector3	ObjSpaceRadius(50000,50000,0);
-
-	sphere.Init(ObjSpaceCenter,ObjSpaceRadius.Length());
-}
-
-//-------------------------------------------------------------------------------------------------
-/** WW3D method that returns object bounding box used in collision detection*/
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
-{
-	//Since this object is more of a system (containing lots of water pieces),
-	//let's disable culling by making bounds huge.  Let each piece do it's own cull.
-
-	Vector3	ObjSpaceCenter(0,0,0);
-	Vector3	ObjSpaceExtents(50000,50000,0.001f*m_dy);	//since mirror is a plane, it has no thickness. Set to m_dy/1000.
-
-	box.Init(ObjSpaceCenter,ObjSpaceExtents);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** returns the class id, so the scene can tell what kind of render object it has. */
-//-------------------------------------------------------------------------------------------------
-Int WaterRenderObjClass::Class_ID(void) const
-{
-	return RenderObjClass::CLASSID_UNKNOWN;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Not used, but required virtual method. */
-//-------------------------------------------------------------------------------------------------
-RenderObjClass *	 WaterRenderObjClass::Clone(void) const
-{
-	assert(false);
-	return NULL;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Copies raw bits from pBumpSrc (a regular grayscale texture) into a D3D
-	*   bump-map format. */
-//-------------------------------------------------------------------------------------------------
-HRESULT WaterRenderObjClass::initBumpMap(LPDIRECT3DTEXTURE8 *pTex, TextureClass *pBumpSource)
-{
-    SurfaceClass::SurfaceDescription    d3dsd;
-	SurfaceClass * surf;
-    D3DLOCKED_RECT     d3dlr;
-	DWORD dwSrcPitch;
-	BYTE* pSrc;
-	Int numLevels;
-
-#ifdef MIPMAP_BUMP_TEXTURE
-
-	pBumpSource->Get_Level_Description(d3dsd);
-
-	if (Get_Bytes_Per_Pixel(d3dsd.Format) != 4)
-	{
-		// LORENZEN WAS BUGGED BY THIS, 
-		//		DEBUG_CRASH(("WaterRenderObjClass::Invalid BumpMap format - Was it compressed?") );
-		return S_OK;
-	}
-	
-	if (pBumpSource->Peek_D3D_Texture())
-	{
-		numLevels=pBumpSource->Peek_D3D_Texture()->GetLevelCount();
-	}
-	else
-		return S_OK;
-
-	pTex[0]=DX8Wrapper::_Create_DX8_Texture(d3dsd.Width,d3dsd.Height,WW3D_FORMAT_U8V8,MIP_LEVELS_ALL,D3DPOOL_MANAGED,false);
-
-	for (Int level=0; level < numLevels; level++)
-	{
-		surf=pBumpSource->Get_Surface_Level(level);
-		surf->Get_Description(d3dsd);
-		pSrc=(unsigned char *)surf->Lock((int *)&dwSrcPitch);
-
-		pTex[0]->LockRect( level, &d3dlr, 0, 0 );
-		DWORD dwDstPitch = (DWORD)d3dlr.Pitch;
-		BYTE* pDst       = (BYTE*)d3dlr.pBits;
-
-		for( DWORD y=0; y<d3dsd.Height; y++ )
-		{
-			BYTE* pDstT  = pDst;
-			BYTE* pSrcB0 = (BYTE*)pSrc;
-			BYTE* pSrcB1 = ( pSrcB0 + dwSrcPitch );
-			BYTE* pSrcB2 = ( pSrcB0 - dwSrcPitch );
-
-			if( y == d3dsd.Height-1 )  // Don't go past the last line
-				pSrcB1 = pSrcB0;
-			if( y == 0 )               // Don't go before first line
-				pSrcB2 = pSrcB0;
-
-			for( DWORD x=0; x<d3dsd.Width; x++ )
-			{
-				LONG v00 = 256-*(pSrcB0+0); // Get the current pixel
-				LONG v01 = 256-*(pSrcB0+4); // and the pixel to the right
-				LONG vM1 = 256-*(pSrcB0-4); // and the pixel to the left
-				LONG v10 = 256-*(pSrcB1+0); // and the pixel one line below.
-				LONG v1M = 256-*(pSrcB2+0); // and the pixel one line above.
-
-				LONG iDu = (vM1-v01); // The delta-u bump value
-				LONG iDv = (v1M-v10); // The delta-v bump value
-
-				if( (v00 < vM1) && (v00 < v01) )  // If we are at valley
-				{
-					iDu = vM1-v00;                 // Choose greater of 1st order diffs
-					if( iDu < v00-v01 )
-						iDu = v00-v01;
-				}
-
-				// The luminance bump value (land masses are less shiny)
-				WORD uL = ( v00>1 ) ? 63 : 127;
-
-				switch( D3DFMT_V8U8)//m_BumpMapFormat )
-				{
-					case D3DFMT_V8U8:
-						*pDstT++ = (BYTE)iDu;
-						*pDstT++ = (BYTE)iDv;
-						break;
-
-					case D3DFMT_L6V5U5:
-						*(WORD*)pDstT  = (WORD)( ( (iDu>>3) & 0x1f ) <<  0 );
-						*(WORD*)pDstT |= (WORD)( ( (iDv>>3) & 0x1f ) <<  5 );
-						*(WORD*)pDstT |= (WORD)( ( ( uL>>2) & 0x3f ) << 10 );
-						pDstT += 2;
-						break;
-
-					case D3DFMT_X8L8V8U8:
-						*pDstT++ = (BYTE)iDu;
-						*pDstT++ = (BYTE)iDv;
-						*pDstT++ = (BYTE)uL;
-						*pDstT++ = (BYTE)0L;
-						break;
-				}
-
-				// Move one pixel to the left (src is 32-bpp)
-				pSrcB0+=4;   pSrcB1+=4;   pSrcB2+=4;
-			}
-
-			// Move to the next line
-			pSrc += dwSrcPitch;    pDst += dwDstPitch;
-		}
-
-		pTex[0]->UnlockRect(level);
-		surf->Unlock();
-		REF_PTR_RELEASE (surf);
-	}//for each level
-
-#else
-	surf=pBumpSource->Get_Surface_Level();
-	surf->Get_Description(d3dsd);
-	pSrc=(unsigned char *)surf->Lock((int *)&dwSrcPitch);
-
-    // Create the bumpmap's surface and texture objects
-	m_pBumpTexture[i]=DX8Wrapper::_Create_DX8_Texture(d3dsd.Width,d3dsd.Height,WW3D_FORMAT_U8V8,TextureClass::MIP_LEVELS_1,D3DPOOL_MANAGED,false);
-
-    // Fill the bits of the new texture surface with bits from
-    // a private format.
-
-    m_pBumpTexture[i]->LockRect( 0, &d3dlr, 0, 0 );
-    DWORD dwDstPitch = (DWORD)d3dlr.Pitch;
-    BYTE* pDst       = (BYTE*)d3dlr.pBits;
-
-    for( DWORD y=0; y<d3dsd.Height; y++ )
-    {
-        BYTE* pDstT  = pDst;
-        BYTE* pSrcB0 = (BYTE*)pSrc;
-        BYTE* pSrcB1 = ( pSrcB0 + dwSrcPitch );
-        BYTE* pSrcB2 = ( pSrcB0 - dwSrcPitch );
-
-        if( y == d3dsd.Height-1 )  // Don't go past the last line
-            pSrcB1 = pSrcB0;
-        if( y == 0 )               // Don't go before first line
-            pSrcB2 = pSrcB0;
-
-        for( DWORD x=0; x<d3dsd.Width; x++ )
-        {
-            LONG v00 = 256-*(pSrcB0+0); // Get the current pixel
-            LONG v01 = 256-*(pSrcB0+4); // and the pixel to the right
-            LONG vM1 = 256-*(pSrcB0-4); // and the pixel to the left
-            LONG v10 = 256-*(pSrcB1+0); // and the pixel one line below.
-            LONG v1M = 256-*(pSrcB2+0); // and the pixel one line above.
-
-            LONG iDu = (vM1-v01); // The delta-u bump value
-            LONG iDv = (v1M-v10); // The delta-v bump value
-
-            if( (v00 < vM1) && (v00 < v01) )  // If we are at valley
-            {
-                iDu = vM1-v00;                 // Choose greater of 1st order diffs
-                if( iDu < v00-v01 )
-                    iDu = v00-v01;
-            }
-
-            // The luminance bump value (land masses are less shiny)
-            WORD uL = ( v00>1 ) ? 63 : 127;
-
-            switch( D3DFMT_V8U8)//m_BumpMapFormat )
-            {
-                case D3DFMT_V8U8:
-                    *pDstT++ = (BYTE)iDu;
-                    *pDstT++ = (BYTE)iDv;
-                    break;
-
-                case D3DFMT_L6V5U5:
-                    *(WORD*)pDstT  = (WORD)( ( (iDu>>3) & 0x1f ) <<  0 );
-                    *(WORD*)pDstT |= (WORD)( ( (iDv>>3) & 0x1f ) <<  5 );
-                    *(WORD*)pDstT |= (WORD)( ( ( uL>>2) & 0x3f ) << 10 );
-                    pDstT += 2;
-                    break;
-
-                case D3DFMT_X8L8V8U8:
-                    *pDstT++ = (BYTE)iDu;
-                    *pDstT++ = (BYTE)iDv;
-                    *pDstT++ = (BYTE)uL;
-                    *pDstT++ = (BYTE)0L;
-                    break;
-            }
-
-            // Move one pixel to the left (src is 32-bpp)
-            pSrcB0+=4;   pSrcB1+=4;   pSrcB2+=4;
-        }
-
-        // Move to the next line
-        pSrc += dwSrcPitch;    pDst += dwDstPitch;
-    }
-
-    m_pBumpTexture[i]->UnlockRect(0);
-    surf->Unlock();
-#endif
-
-    return S_OK;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Create and fill a D3D vertex buffer with water surface vertices */
-//-------------------------------------------------------------------------------------------------
-HRESULT WaterRenderObjClass::generateVertexBuffer( Int sizeX, Int sizeY, Int vertexSize, Bool doStatic)
-{
-	m_numVertices=sizeX*sizeY;
-	//Assuming dynamic vertex buffer, allocate maximum multiple of required size to allow rendering from
- 	//different parts of the buffer. 5-15-03: Disabled this since we use DISCARD mode instead to avoid Nvidia Runtime bug. -MW
- 	//m_numVertices=(65536 / (sizeX*sizeY))*sizeX*sizeY;
-
-	SEA_PATCH_VERTEX* pVertices;
-
-	Setting *setting=&m_settings[m_tod];
-
-	HRESULT hr;
-
-	//default setting for a dynamic vertex buffer
-	D3DPOOL pool = D3DPOOL_DEFAULT;
-	DWORD usage = D3DUSAGE_WRITEONLY | D3DUSAGE_DYNAMIC;
-	DWORD fvf = WATER_MESH_FVF;
-
-	if (doStatic)
-	{	//change settings for a static vertex buffer
-		pool = D3DPOOL_MANAGED;
-		usage = D3DUSAGE_WRITEONLY;
-		fvf=0;// DX8 Docs confusing on this. Say no FVF for vertex shaders. Else DX8_FVF_XYZDUV1;
-		m_numVertices=sizeX*sizeY;
-	}
-
-	if (m_vertexBufferD3D == NULL)
-	{	// Create vertex buffer
-
-		if (FAILED(hr=m_pDev->CreateVertexBuffer
-		(
-			m_numVertices*vertexSize,
-			usage,
-			fvf,
-			pool, 
-			&m_vertexBufferD3D
-		)))
-			return hr;
-	}
-
-	m_vertexBufferD3DOffset=0;
-
-	if (!doStatic)
-		return S_OK;	//only create the buffer, other code will fill it.
-
-	// load results into buffer
-	if (FAILED(hr=m_vertexBufferD3D->Lock
-	(
-		0,
-		m_numVertices*sizeof(SEA_PATCH_VERTEX), 
-		(BYTE**)&pVertices,
-		0//D3DLOCK_DISCARD
-	)))
-		return hr;
-
-	Int x,z;
-	for (z=0; z<sizeY; z++)
-	{
-		for (x=0; x<sizeX; x++)
-		{
-			pVertices->x=(float)x;
-			pVertices->y=m_level;
-			pVertices->z=(float)z;
-
-			pVertices->tu=(float)x*PATCH_UV_SCALE;
-			pVertices->tv=(float)z*PATCH_UV_SCALE;
-			pVertices->c=setting->transparentWaterDiffuse;	//vertex alpha/color
-			pVertices++;
-		}
-	}
-
-	if (FAILED(hr=m_vertexBufferD3D->Unlock())) return hr;
-
-	return S_OK;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Create and fill a D3D index buffer with water surface strip indices */
-//-------------------------------------------------------------------------------------------------
-HRESULT WaterRenderObjClass::generateIndexBuffer(Int sizeX, Int sizeY)
-{
-	HRESULT hr;
-
-	//Will need SizeY-1 strips, each of length SizeX*2 (2 indices per strip segment).
-	//Will also need 2 extra indices to connect each strip to next one (except last strip)
-	//Total index buffer size = (SizeY-1)*(SizeX*2+2) - 2 (drop the extra 2 indices from last strip)
-
-	m_numIndices=(sizeY-1)*(sizeX*2+2) - 2;
-
-	//old way
-
-	// Create index buffer
-	WORD* pIndices;
-
-	if (FAILED(hr=m_pDev->CreateIndexBuffer
-	(
-		(m_numIndices+2)*sizeof(WORD), 
-		D3DUSAGE_WRITEONLY, 
-		D3DFMT_INDEX16, 
-		D3DPOOL_MANAGED, 
-		&m_indexBufferD3D
-	)))
-		return hr;
-
-	if (FAILED(hr=m_indexBufferD3D->Lock
-	(
-		0, 
-		m_numIndices*sizeof(WORD), 
-		(BYTE**)&pIndices, 
-		0
-	)))
-		return hr;
-
-	Int i,j,k;
-
-	for (i=0,j=0,k=0; i<m_numIndices; j++)
-	{
-		for (;k<(sizeX*(j+1)); k++,i+=2)
-		{
-			pIndices[i]=(UnsignedShort) k+sizeX;
-			pIndices[i+1]=(UnsignedShort) k;
-		}
-		//Generate 4 degenerate triangle to connect current strip to next strip/row of map
-		//To do this, we just repeat the last index of first strip and first index of new strip.
-		//Any triangles with repeated vertices will be skipped during rendering.
-		if (i<m_numIndices) //check if there is at least 1 more strip to go
-		{
-			pIndices[i]=k-1;
-			pIndices[i+1]=k+sizeX;
-			i+=2;
-		}
-	}
-
-	/*Old way
-	Int step=1;
-	Int psize=(size-1)/step;
-
-	m_numIndices=psize*((psize+1)*2)+(psize*2)-2;
-
-
-	Int x,z,s_toggle=1;
-	for (z=step; z<size; z+=step)
-	{
-		if (s_toggle)
-		{
-			for (x=0; x<(size-step); x+=step)
-			{
-				*pIndices++=(WORD)((z-0)*size+(x));
-				*pIndices++=(WORD)((z-step)*size+(x));
-			}
-				*pIndices++=(WORD)((z-0)*size+(size-1));
-			*pIndices++=(WORD)((z-step)*size+(size-1));
-			// insert additional degenerate to start next row
-			*pIndices++=pIndices[-2];
-			*pIndices++=pIndices[-1];
-		}
-		else
-		{
-			*pIndices++=(WORD)((z-step)*size+(size-1));
-			*pIndices++=(WORD)((z-0)*size+(size-1));
-			for (x=size-1; x>0; x-=step)
-			{
-				*pIndices++=(WORD)((z-step)*size+(x-step));
-				*pIndices++=(WORD)((z-0)*size+(x-step));
-			}
-			// insert additional degenerate to start next row
-			*pIndices++=pIndices[-1];
-			*pIndices++=pIndices[-1];
-		}
-
-		s_toggle=!s_toggle;
-	}
-*/
-	if (FAILED(hr=m_indexBufferD3D->Unlock())) return hr;
-
-	return S_OK;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Releases all w3d assets, to prepare for Reset device call. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::ReleaseResources(void)
-{
-
-	REF_PTR_RELEASE(m_indexBuffer);
-
-	REF_PTR_RELEASE(m_pReflectionTexture);
-	SAFE_RELEASE(m_vertexBufferD3D);
-	SAFE_RELEASE(m_indexBufferD3D);
-
-	if (m_waterTrackSystem)
-		m_waterTrackSystem->ReleaseResources();
-
-	if (m_dwWavePixelShader)
-		m_pDev->DeletePixelShader(m_dwWavePixelShader);
-
-	if (m_dwWaveVertexShader)
-		m_pDev->DeleteVertexShader(m_dwWaveVertexShader);
-	
-	if (m_waterPixelShader)
-		m_pDev->DeletePixelShader(m_waterPixelShader);
-
-	if (m_trapezoidWaterPixelShader)
-		m_pDev->DeletePixelShader(m_trapezoidWaterPixelShader);
-
-	if (m_riverWaterPixelShader)
-		m_pDev->DeletePixelShader(m_riverWaterPixelShader);
-
-	m_dwWavePixelShader=0;
-	m_dwWaveVertexShader=0;
-	m_waterPixelShader = 0;
-	m_trapezoidWaterPixelShader=0;
-	m_riverWaterPixelShader=0;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** (Re)allocates all W3D assets after a reset.. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::ReAcquireResources(void)
-{
-	HRESULT hr;
-
-	m_indexBuffer=NEW_REF(DX8IndexBufferClass,(6));
-	// Fill up the IB
-	{
-		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
-		UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-		//quad of 2 triangles:
-		//	3-----2
-		//  |    /|
-		//  |  /  |
-		//	|/    |
-		//  0-----1
-		ib[0]=3;
-		ib[1]=0;
-		ib[2]=2;
-		ib[3]=2;
-		ib[4]=0;
-		ib[5]=1;
-	}
-
-	m_pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	//We're using the same grid for either 3D Water Mesh or Pixel/Vertex shader.  Just
-	//allocate the right size depending on usage
-	if (m_meshData)
-	{
-		//Create new grid data
-		if (FAILED(generateIndexBuffer(m_gridCellsX+1,m_gridCellsY+1)))
-			return;
-		if (FAILED(generateVertexBuffer(m_gridCellsX+1,m_gridCellsY+1,sizeof(MaterMeshVertexFormat),false)))
-			return;
-	}
-	else
-	if (m_waterType == WATER_TYPE_2_PVSHADER)
-	{	//pixel/vertex shader based water assets.
-		if (FAILED(hr=generateIndexBuffer(PATCH_SIZE,PATCH_SIZE)))
-			return;
-
-		if (FAILED(hr=generateVertexBuffer(PATCH_SIZE,PATCH_SIZE,sizeof(SEA_PATCH_VERTEX),true)))
-			return;
-
-		//shader decleration
-		DWORD Declaration[]=
-		{
-			(D3DVSD_STREAM(0)),
-			(D3DVSD_REG(0, D3DVSDT_FLOAT3)), // Position
-			(D3DVSD_REG(1, D3DVSDT_D3DCOLOR)), // Diffuse
-			(D3DVSD_REG(2, D3DVSDT_FLOAT2)), // Bump map texture	
-			(D3DVSD_END())
-		};
-
-		hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\wave.pso", &Declaration[0], 0, false, &m_dwWavePixelShader);
-		if (FAILED(hr))
-			return;
-
-		hr = W3DShaderManager::LoadAndCreateD3DShader("shaders\\wave.vso", &Declaration[0], 0, true, &m_dwWaveVertexShader);
-		if (FAILED(hr))
-			return;
-
-		// Create reflection texture
-		m_pReflectionTexture = DX8Wrapper::Create_Render_Target (SEA_REFLECTION_SIZE, SEA_REFLECTION_SIZE);
-	}
-
-	if (m_waterTrackSystem)
-		m_waterTrackSystem->ReAcquireResources();
-
-	if (W3DShaderManager::getChipset() >= DC_GENERIC_PIXEL_SHADER_1_1)
-	{
-		ID3DXBuffer *compiledShader;
-		const char *shader = 
-			"ps.1.1\n \
-			tex t0 \n\
-			tex t1	\n\
-			tex t2	\n\
-			tex t3\n\
-			mul r0,v0,t0 ; blend vertex color into t0. \n\
-			mul r1, t1, t2 ; mul\n\
-			add r0.rgb, r0, t3\n\
-			+mul r0.a, r0, t3\n\
-			add r0.rgb, r0, r1\n";
-		hr = D3DXAssembleShader( shader, strlen(shader), 0, NULL, &compiledShader, NULL);
-		if (hr==0) {
-			hr = 	DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader((DWORD*)compiledShader->GetBufferPointer(), &m_riverWaterPixelShader);
-			compiledShader->Release();
-		}
-		shader = 
-			"ps.1.1\n \
-			tex t0 \n\
-			tex t1	\n\
-			texbem t2, t1 ; use t1 as env map adjustment on t2.\n\
-			mul r0,v0,t0 ; blend vertex color into t0. \n\
-			mul r1.rgb,t2,c0 ; reduce t2 (environment mapped reflection) by constant\n\
-			add r0.rgb, r0, r1";
-		hr = D3DXAssembleShader( shader, strlen(shader), 0, NULL, &compiledShader, NULL);
-		if (hr==0) {
-			hr = 	DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader((DWORD*)compiledShader->GetBufferPointer(), &m_waterPixelShader);
-			compiledShader->Release();
-		}
-		shader = 
-			"ps.1.1\n \
-			tex t0 ;get water texture\n\
-			tex t1 ;get white highlights on black background\n\
-			tex t2 ;get white highlights with more tiling\n\
-			tex t3	; get black shroud \n\
-			mul r0,v0,t0 ; blend vertex color and alpha into base texture. \n\
-			mad r0.rgb, t1, t2, r0	; blend sparkles and noise \n\
-			mul r0.rgb, r0, t3 ; blend in black shroud \n\
-			;\n";
-		hr = D3DXAssembleShader( shader, strlen(shader), 0, NULL, &compiledShader, NULL);
-		if (hr==0) {
-			hr = 	DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader((DWORD*)compiledShader->GetBufferPointer(), &m_trapezoidWaterPixelShader);
-			compiledShader->Release();
-		}
-	}
-
-	//W3D Invalidate textures after losing the device and since we peek at the textures directly, it won't
-	//know to reinit them for us.  Do it here manually:
-	if (m_riverTexture && !m_riverTexture->Is_Initialized())
-		m_riverTexture->Init();
-	if (m_waterNoiseTexture && !m_waterNoiseTexture->Is_Initialized())
-		m_waterNoiseTexture->Init();
-	if (m_riverAlphaEdge && !m_riverAlphaEdge->Is_Initialized())
-		m_riverAlphaEdge->Init();
-	if (m_waterSparklesTexture && !m_waterSparklesTexture->Is_Initialized())
-		m_waterSparklesTexture->Init();
-	if (m_whiteTexture && !m_whiteTexture->Is_Initialized())
-	{	m_whiteTexture->Init();
-		SurfaceClass *surface=m_whiteTexture->Get_Surface_Level();
-		surface->DrawPixel(0,0,0xffffffff);
-		REF_PTR_RELEASE(surface);
-	}
-}
-
-void WaterRenderObjClass::load(void)
-{
-	if (m_waterTrackSystem)
-		m_waterTrackSystem->loadTracks();
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Initializes water with dimensions and parent scene.
-	* During rendering, we will render a water surface of given dimensions
-	* and reflect the parent scene in its surface.  For now, waters are
-	* forced to be rectangles. */
-//-------------------------------------------------------------------------------------------------
-Int WaterRenderObjClass::init(Real waterLevel, Real dx, Real dy, SceneClass *parentScene, WaterType type)
-{
-
-	m_iBumpFrame=0;
-	m_fBumpScale=SEA_BUMP_SCALE;
-
-	m_dx=dx;
-	m_dy=dy;
-	m_level=waterLevel;
-
-	m_LastUpdateTime=timeGetTime();
-	m_uScrollPerMs=0.001f;
-	m_vScrollPerMs=0.001f;
-	m_uOffset=0;
-	m_vOffset=0;
-
-	m_parentScene=parentScene;
-	m_waterType = type;
-
-	/// Hack for now
-	//m_waterType = WATER_TYPE_0_TRANSLUCENT;
-
-	///@todo: calculate a real normal/distance for arbitrary planes.
-	m_planeNormal=Vector3(0,0,1);		//water plane normal
-	m_planeDistance=m_level;	//water plane distance(always at zero for now)
-
-	m_meshLight=NEW_REF(LightClass,(LightClass::DIRECTIONAL));	
-	m_meshLight->Set_Ambient(Vector3(0.1f,0.1f,0.1f));
-	m_meshLight->Set_Diffuse(Vector3(1.0f,1.0f,1.0f));
-	m_meshLight->Set_Specular(Vector3(1.0f,1.0f,1.0f));
-	m_meshLight->Set_Position(Vector3(1000,1000,1000));
-	//testLight->Set_Spot_Direction(Vector3(TheGlobalData->m_terrainLightX,TheGlobalData->m_terrainLightY,TheGlobalData->m_terrainLightZ));
-	m_meshLight->Set_Spot_Direction(Vector3(-0.57f,-0.57f,-0.57f));
-
-	//Setup material for 3D Mesh water.
-	m_meshVertexMaterialClass=NEW_REF(VertexMaterialClass,());
-	m_meshVertexMaterialClass->Set_Shininess(20.0);
-	m_meshVertexMaterialClass->Set_Ambient(1.0f,1.0f,1.0f);
-	m_meshVertexMaterialClass->Set_Diffuse(1.0f,1.0f,1.0f);
-	m_meshVertexMaterialClass->Set_Specular(0.5,0.5,0.5);
-	m_meshVertexMaterialClass->Set_Opacity(WATER_MESH_OPACITY);
-	m_meshVertexMaterialClass->Set_Lighting(true);
-
-	//
-	// assign the data from the WaterSettings[] global to the data for this
-	// render object (we at present only have one water plane)
-	//
-	loadSetting( &m_settings[ TIME_OF_DAY_MORNING ], TIME_OF_DAY_MORNING );
-	loadSetting( &m_settings[ TIME_OF_DAY_AFTERNOON ], TIME_OF_DAY_AFTERNOON );
-	loadSetting( &m_settings[ TIME_OF_DAY_EVENING ], TIME_OF_DAY_EVENING );
-	loadSetting( &m_settings[ TIME_OF_DAY_NIGHT ], TIME_OF_DAY_NIGHT );
-
-	Set_Sort_Level(2);	//force water to be drawn after all other non translucent objects in scene.
-	Set_Force_Visible(TRUE);	//water is always visible since it's a composite object made of multiple planes all over the map.
-
-	ReAcquireResources();
-#if 0	//MD does not support the old bump-mapped water at all so no point loading textures. -MW 8-11-03
-	if (type == WATER_TYPE_2_PVSHADER || (W3DShaderManager::getChipset() >= DC_GENERIC_PIXEL_SHADER_1_1))
-	{	//geforce3 specific water requires some extra D3D assets
-		m_pDev=DX8Wrapper::_Get_D3D_Device8();
-		//save previous thumbnail mode
-		bool thumbnails_enabled = WW3D::Get_Thumbnail_Enabled();
-		WW3D::Set_Thumbnail_Enabled(false);
-
-		//load bump map textures off disk
-		TextureClass *pBumpSource;	//temporary textures in a format W3D understands
-		TextureClass *pBumpSource2;	//temporary textures in a format W3D understands
-		Int i;
-		i=NUM_BUMP_FRAMES;
-		while (i--)
-		{
-			char bump_name[128];
-
-			sprintf(bump_name,"caust%.2d.tga",i);
-			pBumpSource=WW3DAssetManager::Get_Instance()->Get_Texture(bump_name);
-			sprintf(bump_name,"caustS%.2d.tga",i);
-			pBumpSource2=WW3DAssetManager::Get_Instance()->Get_Texture(bump_name);
-			initBumpMap(m_pBumpTexture+i, pBumpSource);
-			initBumpMap(m_pBumpTexture2+i, pBumpSource2);
-			WW3DAssetManager::Get_Instance()->Release_Texture(pBumpSource);
-			WW3DAssetManager::Get_Instance()->Release_Texture(pBumpSource2);
-			REF_PTR_RELEASE(pBumpSource);
-			REF_PTR_RELEASE(pBumpSource2);
-		}
-		//restore previous thumpnail mode
-		WW3D::Set_Thumbnail_Enabled(thumbnails_enabled);
-	}
-#endif
-
-	//Setup material for regular water
-	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	
-
-
-	m_shaderClass = zFillAlphaShader;//ShaderClass::_PresetAlphaShader;ShaderClass::_PresetOpaqueShader;//detailOpaqueShader;
-	m_shaderClass.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);	//water should be visible from both sides
-
-	//Assets used for all types of water
-	m_alphaClippingTexture=WW3DAssetManager::Get_Instance()->Get_Texture(SKYBODY_TEXTURE);
-
-#ifdef CLIP_GEOMETRY_TO_PLANE
-	m_alphaClippingTexture=WW3DAssetManager::Get_Instance()->Get_Texture("alphaclip.tga");
-#endif
-
-	m_skyBox = ((W3DAssetManager*)W3DAssetManager::Get_Instance())->Create_Render_Obj( "new_skybox", TheGlobalData->m_skyBoxScale, 0);
-
-	//Enable clamping on all textures used by the skybox (to reduce corner seams).
-	if (m_skyBox && m_skyBox->Class_ID() == RenderObjClass::CLASSID_MESH)
-	{
-		MeshClass *mesh=(MeshClass*) m_skyBox;
-		MaterialInfoClass	*material = mesh->Get_Material_Info();
-
-		for (Int i=0; i<material->Texture_Count(); i++)
-		{
-			if (material->Peek_Texture(i))
-			{		
-				material->Peek_Texture(i)->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-				material->Peek_Texture(i)->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-			}
-		}
-
-		REF_PTR_RELEASE(material);
-	}
-
-	m_riverTexture=WW3DAssetManager::Get_Instance()->Get_Texture(TheWaterTransparency->m_standingWaterTexture.str()); 
-
-	//For some reason setting a NULL texture does not result in 0xffffffff for pixel shaders so using explicit "white" texture.
-	m_whiteTexture=MSGNEW("TextureClass") TextureClass(1,1,WW3D_FORMAT_A4R4G4B4,MIP_LEVELS_1);
-	SurfaceClass *surface=m_whiteTexture->Get_Surface_Level();
-	surface->DrawPixel(0,0,0xffffffff);
-	REF_PTR_RELEASE(surface);
-
-	m_waterNoiseTexture=WW3DAssetManager::Get_Instance()->Get_Texture("Noise0000.tga");
-	m_riverAlphaEdge=WW3DAssetManager::Get_Instance()->Get_Texture("TWAlphaEdge.tga");
-	m_waterSparklesTexture=WW3DAssetManager::Get_Instance()->Get_Texture("WaterSurfaceBubbles.tga");
-#ifdef DRAW_WATER_WAKES
-	m_waterTrackSystem = NEW WaterTracksRenderSystem;
-	m_waterTrackSystem->init();
-#endif
-
-	return 0;
-}
-
-void WaterRenderObjClass::updateMapOverrides(void)
-{
-	if (m_riverTexture && TheWaterTransparency->m_standingWaterTexture.compareNoCase(m_riverTexture->Get_Texture_Name()) != 0)
-	{
-		REF_PTR_RELEASE(m_riverTexture);
-		m_riverTexture = WW3DAssetManager::Get_Instance()->Get_Texture(TheWaterTransparency->m_standingWaterTexture.str());
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::reset( void )
-{
-
-	// for vertex animated water mesh reset the values
-	if( m_meshData)
-	{
-		Int i, j;
-		WaterMeshData *pData;
-		Int	mx = m_gridCellsX + 1;
-		Int my = m_gridCellsY + 1;
-
-		// go through each mesh point and adjust the height according to the velocity
-		for( j = 0, pData = m_meshData; j < (my + 2); j++ )
-		{	
-
-			for( i = 0; i < (mx + 2); i++ )
-			{
-
-				// areset grid values for this cell
-				pData->velocity = 0.0f;
-				pData->height = 0.0f;
-				pData->preferredHeight = 0.0f;
-				pData->status = WaterRenderObjClass::AT_REST;
-
-				// on to the next one
-				pData++;
-
-			}  // end for i
-
-		}  // end for j
-
-		// mesh data is no longer in motion
-		m_meshInMotion = FALSE;
-
-	}  // end if, water type 3
-
-	if (m_waterTrackSystem)
-		m_waterTrackSystem->reset();
-} 
-
-void WaterRenderObjClass::enableWaterGrid(Bool state)
-{
-	m_doWaterGrid = state;
-
-	m_drawingRiver = false;
-	m_disableRiver = false;
-
-	if (state && m_meshData == NULL)
-	{	//water type has changed, must allocate necessary assets for new water.
-		//contains the current deformed water surface z(height) values.  With 1 vertex invisible border
-		//around surface to speed up normal calculations.
-		m_meshDataSize = (m_gridCellsX+1+2)*(m_gridCellsY+1+2);
-		m_meshData=NEW WaterMeshData[ m_meshDataSize ];
-		memset(m_meshData,0,sizeof(WaterMeshData)*(m_gridCellsX+1+2)*(m_gridCellsY+1+2));
-		reset();
-
-		//Release existing grid data
-		SAFE_RELEASE(m_vertexBufferD3D);
-		SAFE_RELEASE(m_indexBufferD3D);
-
-		//Create new grid data
-		if (FAILED(generateIndexBuffer(m_gridCellsX+1,m_gridCellsY+1)))
-			return;
-		if (FAILED(generateVertexBuffer(m_gridCellsX+1,m_gridCellsY+1,sizeof(MaterMeshVertexFormat),false)))
-			return;
-	}
-}
-
-// ------------------------------------------------------------------------------------------------
-/** Update phase for water if we need it.  This called once per client frame reguardless
-	* of how fast the logic framerate is running */
-// ------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::update( void )
-{
-	static UnsignedInt lastLogicFrame = 0;
-	UnsignedInt currLogicFrame = 0;
-	
-	if( TheGameLogic )
-		currLogicFrame = TheGameLogic->getFrame();
-
-	m_riverVOrigin += 0.002f;
-	m_riverXOffset += (Real)(0.0125*33/5000);
-	m_riverYOffset += (Real)(2*0.0125*33/5000);
-	if (m_riverXOffset > 1) m_riverXOffset -= 1;
-	if (m_riverYOffset > 1) m_riverYOffset -= 1;
-	if (m_riverXOffset < -1) m_riverXOffset += 1;
-	if (m_riverYOffset < -1) m_riverYOffset += 1;
- 	m_iBumpFrame++;
-	if (m_iBumpFrame >= NUM_BUMP_FRAMES) {
-		m_iBumpFrame = 0;
-	}
-
-
-
-	// we only process some things if the logic frame has changed
-	if( lastLogicFrame != currLogicFrame )
-	{
-
-		// for vertex animated water we need to update the vector field
-		if( m_doWaterGrid && m_meshInMotion == TRUE )
-		{
-			const Real PREFERRED_HEIGHT_FUDGE = 1.0f;		///< this is close enough to at rest
-			const Real AT_REST_VELOCITY_FUDGE = 1.0f;		///< when we're close enought to at rest height and velocity we will stop
-			const Real WATER_DAMPENING = 0.93f;					///< use with up force of 15.0
-			Int i, j;
-			Int	mx = m_gridCellsX+1;
-			Int my = m_gridCellsY+1;
-			WaterMeshData *pData;
-
-			//
-			// we will mark the mesh as clean now ... if any of the fields are still in motion
-			// they will continue to mark the mesh as dirty so processing continues next frame
-			//
-			m_meshInMotion = FALSE;
-
-			// go through each mesh point and adjust the height according to the velocity
-			for( j = 0, pData = m_meshData; j < (my + 2); j++ )
-			{	
-
-				for( i = 0; i < (mx + 2); i++ )
-				{
-
-					// only pay attention to mesh points that are in motion
-					if( BitIsSet( pData->status, WaterRenderObjClass::IN_MOTION ) )
-					{
-
-						// DAMPENING to slow the changes down
-						pData->velocity *= WATER_DAMPENING;
-
-						// if the height here is below our preferred height, we want to add upward force to counteract it
-						if( pData->height < pData->preferredHeight )
-							pData->velocity -= TheGlobalData->m_gravity * 3.0f;
-						else				
-							pData->velocity += TheGlobalData->m_gravity * 3.0f;
-
-						// adjust the height at this grid location according to the current velocity		
-						pData->height = pData->height + pData->velocity;
-
-						//
-						// if we are close enough to our preferred height and our velocity is small enough
-						// this will be our resting location
-						//
-						if( fabs( pData->height - pData->preferredHeight ) < PREFERRED_HEIGHT_FUDGE &&
-								fabs( pData->velocity ) < AT_REST_VELOCITY_FUDGE )
-						{
-
-							BitClear( pData->status, WaterRenderObjClass::IN_MOTION );
-							pData->height = pData->preferredHeight;
-							pData->velocity = 0.0f;
-
-						}  // end if
-						else
-						{
-
-							// there is still motion in the mesh, we need to process next frame
-							m_meshInMotion = TRUE;
-
-						}  // end else
-
-					}  // end if
-
-					// on to the next one
-					pData++;
-
-				}  // end for i
-
-			}  // end for j
-
-		}  // end if
-
-		// mark the last logic frame we processed on
-		lastLogicFrame = currLogicFrame;
-
-	}  // end if, a logic frame has passed
-
-}  // end update
-
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::replaceSkyboxTexture(const AsciiString& oldTexName, const AsciiString& newTextName)
-{
-	W3DAssetManager* assetManager = ((W3DAssetManager*)W3DAssetManager::Get_Instance());
-
-	assetManager->replacePrototypeTexture(m_skyBox, oldTexName.str(), newTextName.str());
-
-	//Enable clamping on all textures used by the skybox (to reduce corner seams).
-	if (m_skyBox && m_skyBox->Class_ID() == RenderObjClass::CLASSID_MESH)
-	{
-		MeshClass *mesh=(MeshClass*) m_skyBox;
-		MaterialInfoClass	*material = mesh->Get_Material_Info();
-
-		for (Int i=0; i<material->Texture_Count(); i++)
-		{
-			if (material->Peek_Texture(i))
-			{		
-				material->Peek_Texture(i)->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-				material->Peek_Texture(i)->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-			}
-		}
-	}
-
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Adjusts various water/sky rendering settings that depend on time of day. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::setTimeOfDay(TimeOfDay tod)
-{
-	m_tod=tod;
-	if (m_waterType == WATER_TYPE_2_PVSHADER)
-		generateVertexBuffer(PATCH_SIZE,PATCH_SIZE,sizeof(SEA_PATCH_VERTEX),true);	//update the water mesh with new lighting/alpha
-}
-
-//-------------------------------------------------------------------------------------------------
-/**Copies GDF settings dealing with a particular time of day into our own
-	* structures.  Also allocates any required W3D assets (textures). */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::loadSetting( Setting *setting, TimeOfDay timeOfDay )
-{
-	SurfaceClass::SurfaceDescription surfaceDesc;
-
-	// sanity
-	DEBUG_ASSERTCRASH( setting, ("WaterRenderObjClass::loadSetting, NULL setting\n") );
-	
-	// textures
-	setting->skyTexture = WW3DAssetManager::Get_Instance()->Get_Texture( WaterSettings[ timeOfDay ].m_skyTextureFile.str() );
-	setting->waterTexture = WW3DAssetManager::Get_Instance()->Get_Texture( WaterSettings[ timeOfDay ].m_waterTextureFile.str() );
-
-	// texelss per unit
-	setting->skyTexelsPerUnit = WaterSettings[ timeOfDay ].m_skyTexelsPerUnit;
-	setting->waterTexture->Get_Level_Description( surfaceDesc, 0 );
-	setting->skyTexelsPerUnit /= (Real)surfaceDesc.Width;
-
-	// water repeat
-	setting->waterRepeatCount = WaterSettings[ timeOfDay ].m_waterRepeatCount;
-
-	// U and V scroll per ms
-	setting->uScrollPerMs = WaterSettings[ timeOfDay ].m_uScrollPerMs;
-	setting->vScrollPerMs = WaterSettings[ timeOfDay ].m_vScrollPerMs;
-
-	//
-	// vertex colors
-	//
-	// bottom left
-	setting->vertex00Diffuse = (WaterSettings[ timeOfDay ].m_vertex00Diffuse.red << 16) |
-														 (WaterSettings[ timeOfDay ].m_vertex00Diffuse.green << 8) |
-														  WaterSettings[ timeOfDay ].m_vertex00Diffuse.blue;
-	// top left
-	setting->vertex01Diffuse = (WaterSettings[ timeOfDay ].m_vertex01Diffuse.red << 16) |
-														 (WaterSettings[ timeOfDay ].m_vertex01Diffuse.green << 8) |
-														  WaterSettings[ timeOfDay ].m_vertex01Diffuse.blue;
-	// bottom right
-	setting->vertex10Diffuse = (WaterSettings[ timeOfDay ].m_vertex10Diffuse.red << 16) |
-														 (WaterSettings[ timeOfDay ].m_vertex10Diffuse.green << 8) |
-														  WaterSettings[ timeOfDay ].m_vertex10Diffuse.blue;
-	// top right
-	setting->vertex11Diffuse = (WaterSettings[ timeOfDay ].m_vertex11Diffuse.red << 16) |
-														 (WaterSettings[ timeOfDay ].m_vertex11Diffuse.green << 8) |
-														  WaterSettings[ timeOfDay ].m_vertex11Diffuse.blue;
-
-	// diffuse water color
-	setting->waterDiffuse = (WaterSettings[ timeOfDay ].m_waterDiffuseColor.alpha << 24) |
-												  (WaterSettings[ timeOfDay ].m_waterDiffuseColor.red		<< 16) |
-													(WaterSettings[ timeOfDay ].m_waterDiffuseColor.green << 8) |
-												   WaterSettings[ timeOfDay ].m_waterDiffuseColor.blue;
-
-	// transparent water color
-	setting->transparentWaterDiffuse = (WaterSettings[ timeOfDay ].m_transparentWaterDiffuse.alpha << 24) |
-																		 (WaterSettings[ timeOfDay ].m_transparentWaterDiffuse.red	 << 16) |
-																		 (WaterSettings[ timeOfDay ].m_transparentWaterDiffuse.green << 8) |
-																		  WaterSettings[ timeOfDay ].m_transparentWaterDiffuse.blue;
-
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Our water may use effects that require run-time rendered textures.  These
-	*	textures need to be updated before we start rendering to the main screen
-	* render target because D3D doesn't multiple render targets. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::updateRenderTargetTextures(CameraClass *cam)
-{
-	if (m_waterType == WATER_TYPE_2_PVSHADER && getClippedWaterPlane(cam, NULL) &&
-		TheTerrainRenderObject && TheTerrainRenderObject->getMap())
-		renderMirror(cam);	//generate texture containing reflected scene
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Renders the reflected scene into an offscreen texture. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::renderMirror(CameraClass *cam)
-{
-#ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_disableWater) {
-		return;
-	}
-#endif
-	Matrix3D	OldCameraMatrix=cam->Get_Transform();
-	Matrix4x4	FullMatrix4(cam->Get_Transform());	//copy 3x4 matrix into a 4x4
-	Vector3		WaterNormal(0,0,1);	//normal of plane used for reflection
-	Vector4		WaterPlane(WaterNormal.X,WaterNormal.Y,WaterNormal.Z,m_level);
-	Vector3		rRight,rUp,rN,rPos;	//orientation and translation vectors of camera
-
-	Matrix4x4	FullMatrix(FullMatrix4.Transpose());	//swap rows/columns
-
-	//reflect camera right vector
-	Real axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[0],WaterNormal);
-	rRight = (Vector3&)FullMatrix[0] - (2.0f*axis_distance*WaterNormal);
-
-	//reflect camera up vector
-	axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[1],WaterNormal);
-	rUp = (Vector3&)FullMatrix[1] - (2.0f*axis_distance*WaterNormal);
-
-	//reflect camera n vector
-	axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[2],WaterNormal);
-	rN = (Vector3&)FullMatrix[2] - (2.0f*axis_distance*WaterNormal);
-
-	//reflect camera position
-	axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[3],WaterNormal);	//distance cam to origin
-	axis_distance -= WaterPlane.W;	// subtract mirror plane distance to get distance camera to plane
-	rPos = (Vector3&)FullMatrix[3] - (2.0f*axis_distance*WaterNormal);
-
-	//generate a new camera matrix from reflected vectors
-	Matrix3D reflectedTransform(rRight,rUp,rN,rPos);
-
-
-	DX8Wrapper::Set_Render_Target_With_Z((TextureClass*)m_pReflectionTexture);
-
-	// Clear the backbuffer
-	WW3D::Begin_Render(false,true,Vector3(0.0f,0.0f,0.0f));	//clearing only z-buffer since background always filled with clouds
-
-	cam->Set_Transform( reflectedTransform );
-
-	//Force reflected image to be drawn into full texture size - not a viewport inside texture.
-	Vector2 vMin,vMax,vOldMax,vOldMin;
- 	cam->Get_Viewport(vOldMin,vOldMax);
- 	vMax.X=vMax.Y=1.0f;
-	vMin.X=vMin.Y=0.0f;
- 	cam->Set_Viewport(vMin,vMax);
-
-	cam->Apply();	//force an update of all the camera dependent parameters like frustum clip planes
-
-	//flip the winding order of polygons to draw the reflected back sides.
-	ShaderClass::Invert_Backface_Culling(true);
-
-	// Render the scene
-	renderSky();
-	if (m_tod == TIME_OF_DAY_NIGHT)
-		renderSkyBody(&reflectedTransform);
-
-	WW3D::Render(m_parentScene,cam);
-
-	cam->Set_Transform(OldCameraMatrix);	//restore original non-reflected matrix
- 	cam->Set_Viewport(vOldMin,vOldMax);
-
-	cam->Apply();	//force an update of all the camera dependent parameters like frustum clip planes
-
-	ShaderClass::Invert_Backface_Culling(false);
-
-	WW3D::End_Render(false);
-
-	// Change the rendertarget back to the main backbuffer
-	DX8Wrapper::Set_Render_Target((IDirect3DSurface8 *)NULL);
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Renders (draws) the water.
-	*	Algorithm:
-	*	Draw reflected scene.
-	*	Draw reflected sky layer(s) and bodies.
-	*	Clear Zbuffer
-	*	Fill Zbuffer by drawing water surface (allows proper sorting into regular scene).
-	*	Draw non-reflected scene (done in regular app render loop).
-	*
-	*	This algorithm doesn't apply to translucent water, which is rendered into a
-	*   texture and rendered at end of scene. */
-//-------------------------------------------------------------------------------------------------
-//DECLARE_PERF_TIMER(Water)
-void WaterRenderObjClass::Render(RenderInfoClass & rinfo)
-{
-	//USE_PERF_TIMER(Water)
-	if (TheTerrainRenderObject && !TheTerrainRenderObject->getMap())
-		return;	//no map has been loaded yet.
-
-	if (((RTS3DScene *)rinfo.Camera.Get_User_Data())->getCustomPassMode() == SCENE_PASS_ALPHA_MASK ||
-		((SceneClass *)rinfo.Camera.Get_User_Data())->Get_Extra_Pass_Polygon_Mode() == SceneClass::EXTRA_PASS_CLEAR_LINE)
-		return;	//water is not drawn in wireframe or custom scene passes
-
-#ifdef EXTENDED_STATS
-	if (DX8Wrapper::stats.m_disableWater) {
-		return;
-	}
-#endif
-	if (ShaderClass::Is_Backface_Culling_Inverted())
-		return;	//the water object will not reflect in itself, so don't do anything if rendering a mirror.
-
-	//this water type needs to rendered after the rest of scene, so buffer it up for later
-
-	// If static sort lists are enabled and this mesh has a sort level, put it on the list instead
-	// of rendering it.
-	unsigned int sort_level = (unsigned int)Get_Sort_Level();
-
-	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level != SORT_LEVEL_NONE) 
-	{	
-		WW3D::Add_To_Static_Sort_List(this, sort_level);
-		return;
-	}
-
-	switch(m_waterType)
-	{
-		case WATER_TYPE_0_TRANSLUCENT:
-		case WATER_TYPE_3_GRIDMESH:
-			//Draw the water surface as a bunch of alpha blended tiles covering areas where water is visible
-			renderWater();
-			if (!m_drawingRiver || m_disableRiver) {
-				renderWaterMesh();	//Draw water surface as 3D deforming mesh if it's enabled on this map.
-			}
-			break;
-
-		case WATER_TYPE_2_PVSHADER:
-			//Pixel/Vertex Shader based water which uses an off-screen rendered reflection texture
-			drawSea(rinfo);	//draw water surface
-			break;
-
-		case WATER_TYPE_1_FB_REFLECTION:
-			{
-				//Normal frame buffer reflection water type. Non translucent.  Legacy code we're not using anymore.
-				Matrix3D	OldCameraMatrix=rinfo.Camera.Get_Transform();
-				Matrix4x4	FullMatrix4(rinfo.Camera.Get_Transform());	//copy 3x4 matrix into a 4x4
-				Vector3		WaterNormal(0,0,1);	//normal of plane used for reflection
-				Vector4		WaterPlane(WaterNormal.X,WaterNormal.Y,WaterNormal.Z,m_level);	//assume distance to origin 0
-				Vector3		rRight,rUp,rN,rPos;	//orientation and translation vectors of camera
-
-				Matrix4x4	FullMatrix(FullMatrix4.Transpose());	//swap rows/columns
-
-				//reflect camera right vector
-				Real axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[0],WaterNormal);
-				rRight = (Vector3&)FullMatrix[0] - (2.0f*axis_distance*WaterNormal);
-
-				//reflect camera up vector
-				axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[1],WaterNormal);
-				rUp = (Vector3&)FullMatrix[1] - (2.0f*axis_distance*WaterNormal);
-
-				//reflect camera n vector
-				axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[2],WaterNormal);
-				rN = (Vector3&)FullMatrix[2] - (2.0f*axis_distance*WaterNormal);
-
-				//reflect camera position
-				axis_distance=Vector3::Dot_Product((Vector3&)FullMatrix[3],WaterNormal);	//distance cam to origin
-				axis_distance -= WaterPlane.W;	// subtract mirror plane distance to get distance camera to plane
-				rPos = (Vector3&)FullMatrix[3] - (2.0f*axis_distance*WaterNormal);
-
-				//generate a new camera matrix from reflected vectors
-				Matrix3D reflectedTransform(rRight,rUp,rN,rPos);
-
-				//flip the winding order of polygons to draw the reflected back sides.
-				ShaderClass::Invert_Backface_Culling(true);
-
-			#ifdef CLIP_GEOMETRY_TO_PLANE
-			  // Set a clip plane, so that only objects above the water are reflected
-				WaterPlane.W *= -1.0f;	//flip sign of plane distance for D3D use.
-
-			//	DX8Wrapper::Set_DX8_Clip_Plane( 0, &WaterPlane.X );
-			//	DX8Wrapper::Set_DX8_Render_State(D3DRS_CLIPPLANEENABLE, D3DCLIPPLANE0 );	//turn on first clip plane
-
-				// Alternate Clipping Method using alpha testing hack!
-				/**************************************************************************************/
-
-				D3DXMATRIX inv;
-				D3DXMATRIX clipMatrix;
-				Real det;
-				Matrix4x4 curView;
-
-				//get current view matrix
-				DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-
-				//get inverse of view matrix(= view to world matrix)
-				D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-
-				//create clipping matrix by inserting our plane equation into the 1st column
-				D3DXMatrixIdentity(&clipMatrix);
-				clipMatrix(0,0)=WaterNormal.X;
-				clipMatrix(1,0)=WaterNormal.Y;
-				clipMatrix(2,0)=WaterNormal.Z;
-				clipMatrix(3,0)=WaterPlane.W+0.5f;
-				inv *=clipMatrix;
-
-				// Change texture wrapping mode to 'clamp' for texture stage 1
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-				// Use CameraSpace vertices as input to matrix and use texture wrap mode from stage 1
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION|1);
-				// Two output coordinates are used.
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-
-				// Set texture generation matrix for stage 1
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, *((Matrix4*)&inv));
-
-				// Disable bilinear filtering
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_POINT);
-
-				// Pass stage 0 texture data untouched(by modulating with white)
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );	//stage 1 texture
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );	//previous stage texture
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );	//module with white => does nothing
-
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );	//stage 1 texture
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );	//previous stage texture
-				DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );	//modulate with clipping texture
-
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHAREF,0x00);
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHAFUNC,D3DCMP_NOTEQUAL);	//pass pixels who's alpha is not zero
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHATESTENABLE, true);	//test pixels if transparent(clipped) before rendering.
-
-				// Set clipping texture
-				m_alphaClippingTexture->Set_U_Addr_Mode(TextureClass::TEXTURE_ADDRESS_CLAMP);
-				m_alphaClippingTexture->Set_V_Addr_Mode(TextureClass::TEXTURE_ADDRESS_CLAMP);
-				m_alphaClippingTexture->Set_Min_Filter(TextureClass::FILTER_TYPE_NONE);
-				m_alphaClippingTexture->Set_Mag_Filter(TextureClass::FILTER_TYPE_NONE);
-				m_alphaClippingTexture->Set_Mip_Mapping(TextureClass::FILTER_TYPE_NONE);
-
-				DX8Wrapper::Set_Texture(0,m_alphaClippingTexture);
-
-				//TODO: Will have to make sure that the shader system is not resetting my stage 1 setup
-				//while rendering the scene
-
-				/*************************************************************************************/
-			#endif
-
-			#if 0	// No longer do simple rendering.
-				if (TheGlobalData->m_useWaterPlane)
-				{
-					//@todo : Would it be better to create a new camera or change the transform of the
-					//existing one?
-					rinfo.Camera.Set_Transform( reflectedTransform );
-					rinfo.Camera.Apply();	//force an update of all the camera dependent parameters like frustum clip planes
-
-					if(m_useCloudLayer)
-					{	
-						if (TheGlobalData && TheGlobalData->m_drawEntireTerrain)
-							m_skyBox->Render(rinfo);
-						else
-						{
-							renderSky();
-							if (m_tod == TIME_OF_DAY_NIGHT)
-								renderSkyBody(&reflectedTransform);
-						}
-					}
-
-					WW3D::Render(m_parentScene,&rinfo.Camera);
-
-					rinfo.Camera.Set_Transform(OldCameraMatrix);	//restore original non-reflected matrix
-					rinfo.Camera.Apply();	//force an update of all the camera dependent parameters like frustum clip planes
-
-					//clear the z-buffer to remove changes made by objects inside mirror
-					DX8Wrapper::Clear(false,true,Vector3(0.1f,0.1f,0.1f));
-				}
-			#endif
-
-			#ifdef CLIP_GEOMETRY_TO_PLANE
-				//restore default culling mode
-			//	DX8Wrapper::Set_DX8_Render_State(D3DRS_CLIPPLANEENABLE, 0 );	//turn off first clip plane
-
-				//disable texture coordinate generation
-				DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHATESTENABLE, false);	//disable alpha testing
-			#endif
-
-				ShaderClass::Invert_Backface_Culling(false);	//return culling back to normal
-
-				ShaderClass::Invalidate();	//reset shading system so it forces full state set.
-
-				renderWater();
-			}	//WATER_TYPE_1
-
-		default:
-			break;
-	}//switch
-
-	if (TheGlobalData && TheGlobalData->m_drawSkyBox)
-	{	//center skybox around camera
-		Vector3 pos=rinfo.Camera.Get_Position();
-		pos.Z = TheGlobalData->m_skyBoxPositionZ;
-		m_skyBox->Set_Position(pos);
-		m_skyBox->Render(rinfo);
-	}
-
-	//Clean up after any pixel shaders.
-	//Force render state apply so that the "NULL" texture gets applied to D3D, thus releasing shroud reference count.
-	DX8Wrapper::Apply_Render_State_Changes();
-	DX8Wrapper::Invalidate_Cached_Render_States();
-
-	if (m_waterTrackSystem)
-		m_waterTrackSystem->flush(rinfo);
-
-//	renderWaterMesh();
-//	renderWaterWave();
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Clips the water plane to the current camera frustum and returns a bounding
-	* box enclosing the clipped plane.  Returns false if water plane is not visible. */
-//-------------------------------------------------------------------------------------------------
-Bool WaterRenderObjClass::getClippedWaterPlane(CameraClass *cam, AABoxClass *box)
-{
-	const FrustumClass & frustum = cam->Get_Frustum();
-
-	ClipPolyClass	ClippedPoly0;
-	ClipPolyClass	ClippedPoly1;
-
-	///@todo: generate proper sized polygon
-	ClippedPoly0.Reset();
-	ClippedPoly0.Add_Vertex(Vector3(0,0,m_level));
-	ClippedPoly0.Add_Vertex(Vector3(0,m_dy,m_level));
-	ClippedPoly0.Add_Vertex(Vector3(m_dx,m_dy,m_level));
-	ClippedPoly0.Add_Vertex(Vector3(m_dx,0,m_level));
-
-	//clip against all 6 frustum planes
-	ClippedPoly0.Clip(frustum.Planes[0],ClippedPoly1);
-	ClippedPoly1.Clip(frustum.Planes[1],ClippedPoly0);
-	ClippedPoly0.Clip(frustum.Planes[2],ClippedPoly1);
-	ClippedPoly1.Clip(frustum.Planes[3],ClippedPoly0);
-	ClippedPoly0.Clip(frustum.Planes[4],ClippedPoly1);
-	ClippedPoly1.Clip(frustum.Planes[5],ClippedPoly0);
-
-	Int final_vcount = ClippedPoly0.Verts.Count();
-
-	//make sure the polygon is visible
-	if (final_vcount >= 3)
-	{	
-		//find axis aligned bounding box around visible polygon
-		if (box)
-  			box->Init(&(ClippedPoly0.Verts[0]),final_vcount);
-		return TRUE;
-	}
-
-	return FALSE;	//water plane is not visible
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Draws the water surface using a custom D3D vertex/pixel shader and a
-	* reflection texture.  Only tested to work on GeForce3. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::drawSea(RenderInfoClass & rinfo)
-{
-	AABoxClass	seaBox;
-
-	if (!getClippedWaterPlane(&rinfo.Camera,&seaBox))
-		return;	//the sea is not visible
-
-	D3DXMATRIX matProj, matView, matWW3D;
-
-	//create a transform which will flip the y and z coordinates to fit our system
-	memset(&matWW3D,0,sizeof(D3DMATRIX));
-	matWW3D._11=1.0f;
-	matWW3D._32=1.0f;
-	matWW3D._23=1.0f;
-	matWW3D._44=1.0f;
-
-	Matrix3D tm(Transform);
-
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
-	DX8Wrapper::Set_Texture(0,NULL);	//we'll be setting our own textures, so reset W3D
-	DX8Wrapper::Set_Texture(1,NULL);	//we'll be setting our own textures, so reset W3D
-
-
-	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-	Vector3 camTran;
-
-	rinfo.Camera.Get_Transform().Get_Translation(&camTran);
-
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, *(Matrix4x4*)&matView);
-	DX8Wrapper::_Get_DX8_Transform(D3DTS_PROJECTION, *(Matrix4x4*)&matProj);
-
-	//default setup from Kenny's demo
-	m_pDev->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	m_pDev->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE );
-	m_pDev->SetTextureStageState( 0, D3DTSS_COLOROP,   D3DTOP_MODULATE);
-	m_pDev->SetTextureStageState( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, 0 );
-
-	m_pDev->SetTextureStageState( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );
-	m_pDev->SetTextureStageState( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );
-	m_pDev->SetTextureStageState( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE);
-	m_pDev->SetTextureStageState( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 1, D3DTSS_TEXCOORDINDEX, 1 );
-
-	m_pDev->SetTextureStageState( 2, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	m_pDev->SetTextureStageState( 2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|2);
-
-	m_pDev->SetTextureStageState( 3, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	m_pDev->SetTextureStageState( 3, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|3);
-
-//	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-//	m_pDev->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-//	m_pDev->SetTextureStageState( 0, D3DTSS_MIPFILTER, D3DTEXF_POINT );
-
-//	m_pDev->SetTextureStageState( 1, D3DTSS_MINFILTER, D3DTEXF_POINT );
-//	m_pDev->SetTextureStageState( 1, D3DTSS_MAGFILTER, D3DTEXF_POINT );
-//	m_pDev->SetTextureStageState( 1, D3DTSS_MIPFILTER, D3DTEXF_NONE );
-	//end of default setup
-
-	m_pDev->SetTextureStageState(0, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	m_pDev->SetTextureStageState(0, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-	m_pDev->SetRenderState( D3DRS_WRAP0, D3DWRAP_U | D3DWRAP_V);
-
-	m_pDev->SetTextureStageState(1, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-	m_pDev->SetTextureStageState(1, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-
-	m_pDev->SetTexture( 0, m_pBumpTexture[m_iBumpFrame]);
-#ifdef MIPMAP_BUMP_TEXTURE
-	m_pDev->SetTextureStageState( 0, D3DTSS_MIPFILTER, D3DTEXF_POINT );
-	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-#endif
-	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVMAT00, F2DW(m_fBumpScale) );
-	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVMAT01, F2DW(0.0f) );
-	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVMAT10, F2DW(0.0f) );
-	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVMAT11, F2DW(m_fBumpScale) );
-	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVLSCALE, F2DW(1.0f) );
-	m_pDev->SetTextureStageState( 1, D3DTSS_BUMPENVLOFFSET, F2DW(0.0f) );
-
-	m_pDev->SetTextureStageState( 2, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 2, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-	m_pDev->SetRenderState(D3DRS_ZWRITEENABLE , FALSE);
-
-	D3DXMATRIX mat;
-	memset(&mat,0,sizeof(D3DXMATRIX));
-
-	mat._11 = 0.5f; mat._12 = -0.5f; mat._13 = 0.5f;   mat._14=0.5f;
-	mat._21 = 0.5f; mat._22 = 0.5f; mat._23 = 0.0f;   mat._24=0.0f;
-	mat._31 = 0.0f; mat._32 = 0.0f; mat._33 = 0.0f;   mat._34=1.0f;
-	mat._41 = 0.0f; mat._42 = 0.0f; mat._43 = 0.0f;   mat._44=1.0f;
-
-	m_pDev->SetVertexShaderConstant(CV_TEXPROJ_0, &mat, 4);
-
-	// Setup constants
-	m_pDev->SetVertexShaderConstant(CV_ZERO,   D3DXVECTOR4(0.0f, 0.0f, 0.0f, 0.0f), 1);
-	m_pDev->SetVertexShaderConstant(CV_ONE,    D3DXVECTOR4(1.0f, 1.0f, 1.0f, 1.0f), 1);
-
-	m_pDev->SetVertexShader(m_dwWaveVertexShader);
-	m_pDev->SetPixelShader(m_dwWavePixelShader);
-
-//	Make reflection brighter to compensate for darker coloring on sea floor
-//	m_pDev->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_ONE );
-//	m_pDev->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_SRCCOLOR );
-
-	m_pDev->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_SRCALPHA );
-	m_pDev->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA );
-
-	m_pDev->SetRenderState(D3DRS_ALPHABLENDENABLE , TRUE);
-	m_pDev->SetTexture( 1, m_pReflectionTexture->Peek_D3D_Texture());
-
-//	m_pDev->SetRenderState(D3DRS_FILLMODE,D3DFILL_WIREFRAME);//LORENZEN
-
-	Int patchX,patchY,startX,startY;
-
-	D3DXMATRIX patchMatrix;
-	memset(&patchMatrix,0,sizeof(D3DXMATRIX));
-	patchMatrix._11=PATCH_SCALE;
-	patchMatrix._22=1.0f;
-	patchMatrix._33=PATCH_SCALE;
-	patchMatrix._44=1.0f;
-
-	m_pDev->SetStreamSource(0,m_vertexBufferD3D,sizeof(WaterRenderObjClass::SEA_PATCH_VERTEX));
-	m_pDev->SetIndices(m_indexBufferD3D,0);
-
-	for (startY=patchY=(seaBox.Center.Y-seaBox.Extent.Y)/(PATCH_WIDTH*PATCH_SCALE); (patchY*PATCH_WIDTH*PATCH_SCALE)<(seaBox.Center.Y+seaBox.Extent.Y); patchY++)
-	{
-		for (startX=patchX=(seaBox.Center.X-seaBox.Extent.X)/(PATCH_WIDTH*PATCH_SCALE); (patchX*PATCH_WIDTH*PATCH_SCALE)<(seaBox.Center.X+seaBox.Extent.X); patchX++)
-		{
-			D3DXMATRIX matWorldViewProj, matTemp, matTempWorld;
-			patchMatrix._41=(float)(patchX*PATCH_WIDTH*PATCH_SCALE );
-			patchMatrix._43=(float)(patchY*PATCH_WIDTH*PATCH_SCALE );
-			//convert the default D3D coordinate system into ours
-			D3DXMatrixMultiply(&matTempWorld, &patchMatrix, &matWW3D);
-
-			D3DXMatrixMultiply(&matTemp, &matTempWorld, &matView);
-			D3DXMatrixMultiply(&matWorldViewProj, &matTemp, &matProj);
-			//matrices must be transposed before loading into vertex shader registers
-			D3DXMatrixTranspose(&matWorldViewProj, &matWorldViewProj);
-			m_pDev->SetVertexShaderConstant(CV_WORLDVIEWPROJ_0, &matWorldViewProj, 4);	//pass transform matrix into shader
-
-			m_pDev->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,0,m_numVertices,0,m_numIndices);
-		}
-	}
-//	m_pDev->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
-	m_pDev->SetRenderState(D3DRS_ALPHABLENDENABLE , FALSE);
-	m_pDev->SetTexture( 0, NULL);	//release reference to bump texture
-	m_pDev->SetTexture( 1, NULL);	//release reference to reflection texture
-	m_pDev->SetTexture( 2, NULL);	//release reference to reflection texture
-
-	m_pDev->SetTextureStageState( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	m_pDev->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|0);
-	m_pDev->SetTextureStageState( 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE);
-	m_pDev->SetTextureStageState( 1, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU|1);
-	m_pDev->SetRenderState(D3DRS_ZWRITEENABLE , TRUE);
-
-	m_pDev->SetTextureStageState(1, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-	m_pDev->SetTextureStageState(1, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-
-	m_pDev->SetRenderState( D3DRS_WRAP0, 0);	//turn off texture wrapping
-
-	m_pDev->SetTextureStageState( 0, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 0, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 1, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 1, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 2, D3DTSS_COLOROP,   D3DTOP_DISABLE );
-	m_pDev->SetTextureStageState( 2, D3DTSS_ALPHAOP,   D3DTOP_DISABLE );
-
-	//Restore old transforms
-	DX8Wrapper::_Set_DX8_Transform(D3DTS_VIEW, *(Matrix4x4*)&matView);
-	DX8Wrapper::_Set_DX8_Transform(D3DTS_PROJECTION, *(Matrix4x4*)&matProj);
-
-	m_pDev->SetPixelShader(0);	//turn off pixel shader
-	m_pDev->SetVertexShader(DX8_FVF_XYZDUV1);	//turn off custom vertex shader
-
-	DX8Wrapper::Invalidate_Cached_Render_States();
-
-	if (TheTerrainRenderObject->getShroud())
-	{
-		//do second pass to apply the shroud on water plane
-		W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
-		W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 0);
-		m_pDev->SetStreamSource(0,m_vertexBufferD3D,sizeof(WaterRenderObjClass::SEA_PATCH_VERTEX));
-		m_pDev->SetIndices(m_indexBufferD3D,0);
-		for (startY=patchY=(seaBox.Center.Y-seaBox.Extent.Y)/(PATCH_WIDTH*PATCH_SCALE); (patchY*PATCH_WIDTH*PATCH_SCALE)<(seaBox.Center.Y+seaBox.Extent.Y); patchY++)
-		{
-			for (startX=patchX=(seaBox.Center.X-seaBox.Extent.X)/(PATCH_WIDTH*PATCH_SCALE); (patchX*PATCH_WIDTH*PATCH_SCALE)<(seaBox.Center.X+seaBox.Extent.X); patchX++)
-			{
-				D3DXMATRIX matTemp;
-				patchMatrix._41=(float)(patchX*PATCH_WIDTH*PATCH_SCALE);
-				patchMatrix._43=(float)(patchY*PATCH_WIDTH*PATCH_SCALE);
-
-				D3DXMatrixMultiply(&matTemp, &patchMatrix, &matWW3D);
-
-				DX8Wrapper::_Set_DX8_Transform(D3DTS_WORLD, *(Matrix4x4*)&matTemp);
-
-				m_pDev->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,0,m_numVertices,0,m_numIndices);
-			}
-		}
-		W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-	}
-
-}
-
-
-#define FEATHER_LAYER_COUNT (5.0f)
-#define FEATHER_THICKNESS   (4.0f)
-
-//-------------------------------------------------------------------------------------------------
-/** Renders (draws) the water surface.*/
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::renderWater(void)
-{
-	for (PolygonTrigger *pTrig=PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
-		if (pTrig->isWaterArea()) {
-			if (pTrig->getNumPoints()>2) {
-				if (pTrig->isRiver()) {
-					drawRiverWater(pTrig);
-					continue;
-				} 
-				Int k;
-				for (k=1; k<pTrig->getNumPoints()-1; k=k+2) {
-					ICoord3D pt3 = *pTrig->getPoint(0);
-					ICoord3D pt2 = *pTrig->getPoint(k);
-					ICoord3D pt1 = *pTrig->getPoint(k+1);
-					ICoord3D pt0 = *pTrig->getPoint(k+1);
-					if (k+2<pTrig->getNumPoints()) {
-						pt0 = *pTrig->getPoint(k+2);
-					}
-					Vector3 points[4];
-					points[0].Set(pt0.x, pt0.y, pt0.z);
-					points[1].Set(pt1.x, pt1.y, pt1.z);
-					points[2].Set(pt2.x, pt2.y, pt2.z);
-					points[3].Set(pt3.x, pt3.y, pt3.z);
-
-					if ( TheGlobalData->m_featherWater )
-					{
-						for (int r = 0; r < TheGlobalData->m_featherWater; ++r)
-						{
-							drawTrapezoidWater(points);
-							points[0].Z += (FEATHER_THICKNESS/TheGlobalData->m_featherWater);
-						}
-					}
-
-					else
-						drawTrapezoidWater(points);
-
-
-				}
-			}
-		}
-	}
-
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Renders (draws) the sky plane.  Will apply current time-of-day settings including
-	* some simple UV scrolling animation. */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::renderSky(void)
-{
-	Int timeNow,timeDiff;
-	Real fu,fv;
-
-	Setting *setting=&m_settings[m_tod];
-
-	timeNow=timeGetTime();
-
-	timeDiff=timeNow-m_LastUpdateTime;
-	m_LastUpdateTime=timeNow;
-
-	m_uOffset += timeDiff * setting->uScrollPerMs * setting->skyTexelsPerUnit;
-	m_vOffset += timeDiff * setting->vScrollPerMs * setting->skyTexelsPerUnit;
-
-	//clamp uv coordinate into 0,1 range
-	m_uOffset = m_uOffset - (Real)((Int) m_uOffset);
-	m_vOffset = m_vOffset - (Real)((Int) m_vOffset);
-
-	fu= m_uOffset + (SKYPLANE_SIZE * 2) * setting->skyTexelsPerUnit;
-	fv= m_vOffset + (SKYPLANE_SIZE * 2) * setting->skyTexelsPerUnit;
-
-
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);
-
-	ShaderClass m_shader2=ShaderClass::_PresetOpaqueShader;
-	m_shader2.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);
-	m_shader2.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);	//no need to check against z-buffer, sky always rendered first.
-	m_shader2.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);	//sky is always behind everything so no need to update z-buffer
-
-	DX8Wrapper::Set_Shader(m_shader2);
-
-	DX8Wrapper::Set_Texture(0,setting->skyTexture);
-
-	//draw an infinite sky plane
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,4);
-	{
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* verts=lock.Get_Formatted_Vertex_Array();
-		if(verts)
-		{
-			verts[0].x=-SKYPLANE_SIZE;
-			verts[0].y=SKYPLANE_SIZE;
-			verts[0].z=SKYPLANE_HEIGHT;
-			verts[0].u1=m_uOffset;
-			verts[0].v1=fv;
-			verts[0].diffuse=setting->vertex01Diffuse;
-	
-			verts[1].x=SKYPLANE_SIZE;
-			verts[1].y=SKYPLANE_SIZE;
-			verts[1].z=SKYPLANE_HEIGHT;
-			verts[1].u1=fu;
-			verts[1].v1=fv;
-			verts[1].diffuse=setting->vertex11Diffuse;
-	
-			verts[2].x=SKYPLANE_SIZE;
-			verts[2].y=-SKYPLANE_SIZE;
-			verts[2].z=SKYPLANE_HEIGHT;
-			verts[2].u1=fu;
-			verts[2].v1=m_vOffset;
-			verts[2].diffuse=setting->vertex10Diffuse;
-	
-			verts[3].x=-SKYPLANE_SIZE;
-			verts[3].y=-SKYPLANE_SIZE;
-			verts[3].z=SKYPLANE_HEIGHT;
-			verts[3].u1=m_uOffset;
-			verts[3].v1=m_vOffset;
-			verts[3].diffuse=setting->vertex00Diffuse;
-		}
-	}
-
-	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
-	DX8Wrapper::Set_Vertex_Buffer(vb_access);
-
-	Matrix3D tm(1);
-	tm.Set_Translation(Vector3(0,0,0));
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-
-	DX8Wrapper::Draw_Triangles(	0,2, 0,	4);	//draw a quad, 2 triangles, 4 verts
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Renders (draws) the sky body.  Used for moon and sun.  We rotate the image
-	* so that it always faces the camera.  This removes perspective and helps hide that
-	* it's a flat image. */
-//-------------------------------------------------------------------------------------------------
-///	@todo: Add code to render properly sorted sun sky body.
-void WaterRenderObjClass::renderSkyBody(Matrix3D *mat)
-{	
-	Vector3 cPos;
-
-	Vector3 pView,pRight,pUp,pPos(SKYBODY_X,SKYBODY_Y,SKYBODY_HEIGHT);
-
-	mat->Get_Translation(&cPos);
-
-	pView=cPos-pPos;	//billboard to camera
-	pView.Normalize();	//particle view direction
-
-	Vector3 WorldUp(0,0,-1);	///@todo: hacked so only works for reflections across xy plane
-
-#ifdef ALLOW_TEMPORARIES
-	Vector3 rotAxis=Vector3::Cross_Product(WorldUp,pView);	//get axis of rotation.
-	rotAxis.Normalize();
-#else
-	Vector3 rotAxis;
-	Vector3::Normalized_Cross_Product(WorldUp, pView, &rotAxis);	
-#endif
-
-	Real angle=Vector3::Dot_Product(WorldUp,pView);
-
-	angle = acos(angle);
-
-
-	Matrix3D tm(1);
-	tm.Set(rotAxis,angle);
-	tm.Adjust_Translation(Vector3(SKYBODY_X,SKYBODY_Y,SKYBODY_HEIGHT));
-
-
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-
-
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);
-
-	ShaderClass m_shader2=ShaderClass::_PresetAlphaShader;
-	m_shader2.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);
-	m_shader2.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);	//no need to check against z-buffer, sky always rendered first.
-	m_shader2.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);	//sky is always behind everything so no need to update z-buffer
-
-	DX8Wrapper::Set_Shader(m_shader2);
-
-
-//	DX8Wrapper::Set_Shader(ShaderClass::/*_PresetAdditiveShader*//*_PresetOpaqueShader*/_PresetAlphaShader);
-//	DX8Wrapper::Set_Texture(0,setting->skyBodyTexture);
-
-	DX8Wrapper::Set_Texture(0,m_alphaClippingTexture);
-
-	//draw an infinite sky plane
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,4);
-	{
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* verts=lock.Get_Formatted_Vertex_Array();
-		if(verts)
-		{
-			verts[0].x=-SKYBODY_SIZE;
-			verts[0].y=SKYBODY_SIZE;
-			verts[0].z=0;
-			verts[0].u2=0;
-			verts[0].v2=1;
-			verts[0].diffuse=0xffffffff;
-	
-			verts[1].x=SKYBODY_SIZE;
-			verts[1].y=SKYBODY_SIZE;
-			verts[1].z=0;
-			verts[1].u2=1;
-			verts[1].v2=1;
-			verts[1].diffuse=0xffffffff;
-	
-			verts[2].x=SKYBODY_SIZE;
-			verts[2].y=-SKYBODY_SIZE;
-			verts[2].z=0;
-			verts[2].u2=1;
-			verts[2].v2=0;
-			verts[2].diffuse=0xffffffff;
-	
-			verts[3].x=-SKYBODY_SIZE;
-			verts[3].y=-SKYBODY_SIZE;
-			verts[3].z=0;
-			verts[3].u2=0;
-			verts[3].v2=0;
-			verts[3].diffuse=0xffffffff;
-		}
-	}
-
-	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
-	DX8Wrapper::Set_Vertex_Buffer(vb_access);
-
-	DX8Wrapper::Draw_Triangles(	0,2, 0,	4);	//draw a quad, 2 triangles, 4 verts
-}
-
-//Defines for procedural water animation.
-#define WATER_FREQ	(2.0*3.2831/4.0)	//2pi (full cycle) cover 4 units
-#define WATER_AMP	(1.0f)
-#define	WATER_OFFSET (0.1f)
-
-//-------------------------------------------------------------------------------------------------
-/** Renders (draws) the water surface mesh geometry.
-	*	This is a work-in-progress!  Do not use this code! */
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::renderWaterMesh(void)
-{
-
-	if (!m_doWaterGrid)
-		return;	//the water grid is disabled.
-
- 	//According to Nvidia there's a D3D bug that happens if you don't start with a
- 	//new dynamic VB each frame - so we force a DISCARD by overflowing the counter.
- 	m_vertexBufferD3DOffset = 0xffff;
-
-	Setting *setting=&m_settings[m_tod];
-
-	WaterMeshData *pData;
-	Int	mx=m_gridCellsX+1;
-	Int my=m_gridCellsY+1;
-	Int i,j;
-	
-	Real cellSizeX=m_gridCellSize;
-	Real cellSizeY=m_gridCellSize;
-//	Real	uScale2=5.0f*setting->waterRepeatCount/(128.0f)*cellSizeX/10.0f;
-//	Real	vScale2=5.0f*setting->waterRepeatCount/(128.0f)*cellSizeY/10.0f;
-
-	//Old waterRepeatCount settings in INI were based on 128x128 water grid of cellsize=10
-	//Scale values to correct size.
-	Real	uScale=setting->waterRepeatCount/(128.0f)*cellSizeX/10.0f*0.2f;
-	Real	vScale=setting->waterRepeatCount/(128.0f)*cellSizeY/10.0f*0.2f;
-
-	Vector3	nx(cellSizeX*2.0f,0,0);
-	Vector3 ny(0,cellSizeY*2.0f,0);
-	Vector3 C;
-
-#ifdef DO_WATER_SIMULATION		//Debug code used to create a dummy water animation
-	//
-	// Mark: If you re-enable this water simulation, you might want to consider moving
-	// this code to the update() method of the water render object (Colin)
-	//
-
-	static Real PhasePerFrameX=0.1f;
-	static Real PhasePerFrameY=0.1f;
-
-	//update the mesh heights for this frame (update buffer is 2 samples wider/taller due to border)
-	for (j=0,pData=m_meshData; j<(my+2); j++)
-	{	
-		for (i=0; i<(mx+2); i++)
-		{
-			//*pData = WATER_AMP * sin(WATER_FREQ*(0.7f*i + 0.7f*j) - PhasePerFrame);
-
-			pData->height=WATER_OFFSET+WATER_AMP*(sin((float)i*WATER_FREQ*0.4+PhasePerFrameX*0.5)+sin((float)i*WATER_FREQ*0.6+PhasePerFrameX*0.2)+sin((float)j*WATER_FREQ+PhasePerFrameX)+sin((float)j*WATER_FREQ*0.7+PhasePerFrameX*0.3));
-//			*pData=WATER_OFFSET+WATER_AMP*(sin((float)i*WATER_FREQ*0.4+PhasePerFrameX*0.5)+sin((float)i*WATER_FREQ*0.6+PhasePerFrameX*0.2)+sin((float)j*WATER_FREQ+PhasePerFrameX)+sin((float)j*WATER_FREQ*0.7+PhasePerFrameX*0.3));
-			pData++;
-		}
-	}
-
-	PhasePerFrameX -= 0.08f;
-	PhasePerFrameY -= 0.1f;
-#endif
-
-	MaterMeshVertexFormat *vb;
-	if (m_vertexBufferD3DOffset < m_numVertices)
-	{	//we have room in current VB, append new verts
-		if(m_vertexBufferD3D->Lock(m_vertexBufferD3DOffset*sizeof(MaterMeshVertexFormat),mx*my*sizeof(MaterMeshVertexFormat),(unsigned char**)&vb,D3DLOCK_NOOVERWRITE) != D3D_OK)
-			return;
-	}
-	else
-	{	//ran out of room in last VB, request a substitute VB.
-		if(m_vertexBufferD3D->Lock(0,mx*my*sizeof(MaterMeshVertexFormat),(unsigned char**)&vb,D3DLOCK_DISCARD) != D3D_OK)
-			return;
-		m_vertexBufferD3DOffset=0;	//reset start of page to first vertex
-	}
-	Int diffuse;
-	diffuse = setting->waterDiffuse&0x00ffffff;
-	Int alpha = (setting->waterDiffuse & 0xff000000)>>24;
-	// Reduce alpha for wave mesh
-	alpha -= 0x20;
-	diffuse |= alpha<<24;
-
-	//I pulled some of these constants out of the loops for speed:
-	Real uvCosScale=0.02*cos(3*m_riverVOrigin);
-	Real sinOffset=25*m_riverVOrigin;
-	Real originScale=m_riverVOrigin/vScale; 
-	Real bumpSizeDiv=cellSizeY/BUMP_SIZE;
-	Real bumpSizeDiv2=0.3f*cellSizeY/BUMP_SIZE;
-
-	//Data has a 1 vertex padding all around it so we don't need to special-case edges.  Improves performance
-	for (j=0,pData=m_meshData+mx+2+1; j<my; j++,pData+=2)	//skip 2 horizontal border samples after each row
-	{	
-		Real y=(float)j*cellSizeY;
-		Real v1Offset=m_riverVOrigin+(float)j*vScale + uvCosScale*WWMath::Fast_Sin(sinOffset+y*PI/(8*MAP_XY_FACTOR));
-		Real v2Offset=((float)j+originScale)*bumpSizeDiv + (float)j*bumpSizeDiv2;
-
-		for (i=0; i<mx; i++)
-		{
-			//compute normal by looking at 4 vertex neightbors
-#ifdef USE_MESH_NORMALS
-			nx.Z=(pData+1)->height - (pData-1)->height;
-			ny.Z=(pData+mx+2)->height - (pData-mx-2)->height;
-//			nx.Z=*(pData+1)-*(pData-1);
-//			ny.Z=*(pData+mx+2)-*(pData-mx-2);
-			Vector3::Cross_Product(nx,ny,&C);
-			C.Normalize();
-			vb->nx = C.X;
-			vb->ny = C.X;
-			vb->nz = C.X;
-#endif
-			Real x = (float)i*cellSizeX;
-			vb->x=	x;
-			vb->y=	y;
-			vb->z=  pData->height;//WATER_OFFSET+WATER_AMP*(sin((float)i*WATER_FREQ+PhasePerFrame)+cos((float)j*WATER_FREQ+PhasePerFrame));
-
-			vb->diffuse = diffuse;
-#ifdef SCROLL_UV
-//			vb->diffuse=0x80ffffff;
-			vb->u1=(float)i*uScale;
-			vb->v1=v1Offset;
-
-			//old slow version
-			//vb->v1=m_riverVOrigin+(float)j*vScale + 0.02*cos(3*m_riverVOrigin)*sin(25*m_riverVOrigin+y*PI/(8*MAP_XY_FACTOR));
-
-//			vb->u2=m_initialGridU2+(float)i*uScale2;
-//			vb->v2=m_initialGridV2+(float)j*vScale2;
-#else
-			vb->u1=(float)i*uScale;
-			vb->v1=(float)j*vScale;
-#endif
-			vb->u2=(float)(i)*cellSizeX/BUMP_SIZE; 
-			vb->v2=v2Offset;
-			//old slow code
-			//vb->v2=(float)(j+m_riverVOrigin/vScale )*cellSizeY/BUMP_SIZE+ 0.3f*(float)j*cellSizeY/BUMP_SIZE;
-			vb++;
-			pData++;
-		}
-	}
-
-	m_vertexBufferD3D->Unlock();
-
-	Matrix3D tm(Transform);
-
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
-	DX8Wrapper::Set_Material(m_meshVertexMaterialClass);
-
-	ShaderClass::CullModeType oldCullMode=m_shaderClass.Get_Cull_Mode();
-
-	ShaderClass::DepthMaskType oldDepthMask=m_shaderClass.Get_Depth_Mask();
-	m_shaderClass.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);	//disable writing to z-buffer to prevent particle clipping.
-
-	m_shaderClass.Set_Cull_Mode(ShaderClass::CULL_MODE_ENABLE);	//water should be visible from both sides
-
-	DX8Wrapper::Set_Shader(m_shaderClass);
-#if 1
-	setupFlatWaterShader();
-#else 
-	//DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaqueShader);
-	DX8Wrapper::Set_Texture(0,setting->waterTexture);
-	DX8Wrapper::Set_Texture(1,setting->waterTexture);
-
-	DX8Wrapper::Set_Light(0,*m_meshLight);
-	DX8Wrapper::Set_Light(1,NULL);
-	DX8Wrapper::Set_Light(2,NULL);
-	DX8Wrapper::Set_Light(3,NULL);
-/*
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_AMBIENT,0);	//turn off scene ambient
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_SPECULARENABLE,TRUE);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_LOCALVIEWER,TRUE); 
-*/
-
-	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-#endif
-
-
-//	m_pDev->SetRenderState(D3DRS_ZFUNC,D3DCMP_ALWAYS);	//used to display grid under map.
-
-	m_pDev->SetIndices(m_indexBufferD3D,m_vertexBufferD3DOffset);
-	m_pDev->SetStreamSource(0,m_vertexBufferD3D,sizeof(MaterMeshVertexFormat));
-	m_pDev->SetVertexShader(WATER_MESH_FVF);
-
-
-	if (TheTerrainRenderObject->getShroud() && !m_trapezoidWaterPixelShader)
-	{	//we have a shroud to apply and can't do it inside the pixel shader.
-		//so do it in stage1
-		W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
-		W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 1);
-
-		//modulate with shroud texture
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );	//stage 1 texture
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );	//previous stage texture
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-
-		//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
-		//write to the zbuffer.  Change to LESSEQUAL.
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
-		m_pDev->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,0,mx*my,0,m_numIndices-2);
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
-		W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-	}
-	else
-		m_pDev->DrawIndexedPrimitive(D3DPT_TRIANGLESTRIP,0,mx*my,0,m_numIndices-2);
-	
-	Debug_Statistics::Record_DX8_Polys_And_Vertices(m_numIndices-2,mx*my,ShaderClass::_PresetOpaqueShader);
-
-//	m_pDev->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
-
-	if (m_trapezoidWaterPixelShader) DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(NULL);
-
-	m_vertexBufferD3DOffset += mx*my;	//advance past vertices already in buffer
-
-	DX8Wrapper::Set_Texture(0,NULL);
-	DX8Wrapper::Set_Texture(1,NULL);
-	ShaderClass::Invalidate();
-	m_shaderClass.Set_Cull_Mode(oldCullMode);	//water should be visible from both sides
-
-	// restore shader to old mask
-	m_shaderClass.Set_Depth_Mask(oldDepthMask);	 
-
-	//W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-
-}
-
-inline void WaterRenderObjClass::setGridVertexHeight(Int x, Int y, Real value)
-{
-	DEBUG_ASSERTCRASH( x < (m_gridCellsX+1) && y < (m_gridCellsY+1), ("Invalid Water Mesh Coordinates\n") );
-
-	if (m_meshData)
-	{
-		m_meshData[(y+1)*(m_gridCellsX+1+2)+x+1].height = value;
-	}
-}
-
-void WaterRenderObjClass::setGridHeightClamps(Real minz, Real maxz)
-{
-	m_minGridHeight = minz;
-	m_maxGridHeight = maxz;
-}
-
-void WaterRenderObjClass::addVelocity( Real worldX, Real worldY, 
-																			 Real zVelocity, Real preferredHeight )
-{
-
-	if( m_doWaterGrid)
-	{
-		Real gx,gy;
-		Real minX,maxX,minY,maxY;
-		Int x,y;
-		WaterMeshData *meshPoint;
-		m_disableRiver = true;
-
-		//check if center falls within grid bounds
-		if (worldToGridSpace(worldX, worldY, gx, gy))
-		{	
-		
-			//find extents of influence
-			minX = floorf(gx - m_gridChangeMaxRange);
-			if (minX < 0 )
-				minX = 0;	//clamp extent to fall within box
-			maxX = ceilf(gx + m_gridChangeMaxRange);
-			if (maxX > m_gridCellsX)
-				maxX = m_gridCellsX;	//clamp extent to fall within box
-
-			minY = floorf(gy - m_gridChangeMaxRange);
-			if (minY < 0 )
-				minY = 0;	//clamp extent to fall within box
-			maxY = ceilf(gy + m_gridChangeMaxRange);
-			if (maxY > m_gridCellsY)
-				maxY = m_gridCellsY;	//clamp extent to fall within box
-
-			for (y=minY; y<=maxY; y++)
-			{
-				for (x=minX; x<=maxX; x++)
-				{	
-
-					// get the mesh point that we're concerned with
-					meshPoint = &m_meshData[ (y + 1) * (m_gridCellsX + 1 + 2) + x + 1 ];
-
-					// we now have a new preferred height
-					meshPoint->preferredHeight = preferredHeight;
-
-					//
-					// set the velocity of this point based on the distance from the center of the
-					// "core" point for this call
-					//
-					meshPoint->velocity = meshPoint->velocity + zVelocity;				
-
-					// this point is now "in motion"
-					BitSet( meshPoint->status, WaterRenderObjClass::IN_MOTION );
-
-				}
-			}
-
-			//
-			// the mesh data is now dirty, we need to pass through the velocity field
-			// during an update phase to update the positions
-			//
-			m_meshInMotion = TRUE;
-
-		}
-
-	}  // end if, water type is 3
-
-}
-
-void WaterRenderObjClass::changeGridHeight(Real wx, Real wy, Real delta)
-{
-	Real gx,gy;
-	Real *oldData;
-	Real newData;
-	Real distance;
-	Real minX,maxX,minY,maxY;
-	Int x,y;
-	
-	//check if center falls within grid bounds
-	if (worldToGridSpace(wx, wy, gx, gy))
-	{	//find extents of influence
-		minX = floorf(gx - m_gridChangeMaxRange);
-		if (minX < 0 )
-			minX = 0;	//clamp extent to fall within box
-		maxX = ceilf(gx + m_gridChangeMaxRange);
-		if (maxX > m_gridCellsX)
-			maxX = m_gridCellsX;	//clamp extent to fall within box
-
-		minY = floorf(gy - m_gridChangeMaxRange);
-		if (minY < 0 )
-			minY = 0;	//clamp extent to fall within box
-		maxY = ceilf(gy + m_gridChangeMaxRange);
-		if (maxY > m_gridCellsY)
-			maxY = m_gridCellsY;	//clamp extent to fall within box
-
-		for (y=minY; y<=maxY; y++)
-		{
-			for (x=minX; x<=maxX; x++)
-			{	oldData = &m_meshData[(y+1)*(m_gridCellsX+1+2)+x+1].height;
-				distance = (gx - (Real)x)*(gx - (Real)x) + (gy - (Real)y)*(gy - (Real)y);
-				distance = sqrt(distance);
-				newData = *oldData + 1.0f/(m_gridChangeAtt0+m_gridChangeAtt1*distance+distance*distance*m_gridChangeAtt2)*delta;
-				//Clamp to min/max values
-				if (newData < m_minGridHeight)
-					newData = m_minGridHeight;
-				if (newData > m_maxGridHeight)
-					newData = m_maxGridHeight;
-				*oldData = newData;
-			}
-		}
-	}
-}
-
-void WaterRenderObjClass::setGridChangeAttenuationFactors(Real a, Real b, Real c, Real range)
-{
-	m_gridChangeAtt0 = a;
-	m_gridChangeAtt1 = b;
-	m_gridChangeAtt2 = c;
-	m_gridChangeMaxRange = range/m_gridCellSize;	//convert range to grid space
-}
-
-void WaterRenderObjClass::setGridTransform(Real angle, Real x, Real y, Real z)
-{
-	m_gridDirectionX = Vector2(1.0f,0.0f);
-
-	m_gridOrigin.X = x;
-	m_gridOrigin.Y = y;
-
-	Matrix3D xform(1);
-	xform.Rotate_Z(angle);
-
-	m_gridDirectionX.X = xform.Get_X_Vector().X;
-	m_gridDirectionX.Y = xform.Get_X_Vector().Y;
-
-	m_gridDirectionY.X = xform.Get_Y_Vector().X;
-	m_gridDirectionY.Y = xform.Get_Y_Vector().Y;
-
-	xform.Set_Translation(Vector3(x,y,z));
-	Set_Transform(xform);
-}
-
-void WaterRenderObjClass::setGridTransform(const Matrix3D *transform )
-{
-
-	if( transform )
-		Set_Transform( *transform );
-
-}
-
-void WaterRenderObjClass::getGridTransform(Matrix3D *transform )
-{
-
-	if( transform )
-		*transform = Get_Transform();
-
-}
-
-void WaterRenderObjClass::setGridResolution(Real gridCellsX, Real gridCellsY, Real cellSize)
-{
-	m_gridCellSize=cellSize;
-
-	if (m_gridCellsX != gridCellsX || m_gridCellsY != gridCellsY)
-	{	//resolution has changed
-		m_gridCellsX=gridCellsX;
-		m_gridCellsY=gridCellsY;
-
-		if (m_meshData)
-		{	
-
-			delete [] m_meshData;//free previously allocated grid and allocate new size
-			m_meshData = NULL;	 // must set to NULL so that we properly re-allocate
-			m_meshDataSize = 0;
-
-			Bool enable = m_doWaterGrid;
-			enableWaterGrid(true);	// allocates buffers.
-			m_doWaterGrid = enable;
-
-		}
-	}
-}
-
-void WaterRenderObjClass::getGridResolution( Real *gridCellsX, Real *gridCellsY, Real *cellSize )
-{
-
-	if( gridCellsX )
-		*gridCellsX = m_gridCellsX;
-	if( gridCellsY )
-		*gridCellsY = m_gridCellsY;
-	if( cellSize )
-		*cellSize = m_gridCellSize;
-
-}
-
-static Real wobble(Real baseV, Real offset, Bool wobble)
-{
-	if (!wobble) return 0;
-	offset = sin(2*PI*baseV - 3*offset);
-	return offset/22;
-}
-
-/**Utility function used to query water heights in a manner that works in both RTS and WB.*/
-Real WaterRenderObjClass::getWaterHeight(Real x, Real y)
-{
-	const WaterHandle *waterHandle = NULL;
-	Real waterZ = 0.0f;
-	ICoord3D iLoc;
-
-	iLoc.x = REAL_TO_INT_FLOOR( x + 0.5f );
-	iLoc.y = REAL_TO_INT_FLOOR( y + 0.5f );
-	iLoc.z = 0;
-
-	for( PolygonTrigger *pTrig = PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext() ) 
-	{
-
-		if( !pTrig->isWaterArea() ) 
-			continue;
-
-		// See if point is in a water area
-		if( pTrig->pointInTrigger( iLoc ) ) 
-		{
-
-			if( pTrig->getPoint( 0 )->z >= waterZ )
-			{
-
-				waterZ = pTrig->getPoint( 0 )->z;
-				waterHandle = pTrig->getWaterHandle();
-
-			}  // end if
-
-		}  // end if
-
-	}  // end for
-
-	if (waterHandle)
-		return waterHandle->m_polygon->getPoint( 0 )->z;
-	return INVALID_WATER_HEIGHT;	//point not underwater
-}
-
-//-------------------------------------------------------------------------------------------------
-//Draw a many sided river polygon.
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::drawRiverWater(PolygonTrigger *pTrig)
-{
-	DX8Wrapper::Invalidate_Cached_Render_States();	///@todo: Figure out why rivers don't draw without reset of all states.
-
-	Int rectangleCount = pTrig->getNumPoints()/2;
-	rectangleCount--;
-
-	Real bumpFactor = 5;
-	static Bool doWobble = true;
-
-	if (m_disableRiver) return;
-	m_drawingRiver = true;
-
-	//allocate 2 triangles per side with 3 indices per triangle
-	DynamicIBAccessClass ib_access(BUFFER_TYPE_DYNAMIC_DX8,(rectangleCount+1)*2*3);
-	{
-		DynamicIBAccessClass::WriteLockClass lockib(&ib_access);
- 		UnsignedShort *curIb = lockib.Get_Index_Array();
-		for (Int i=0; i<rectangleCount; i++)
-		{
-			//triangle 1
-			curIb[0] = i*2;
-			curIb[1] = i*2+1;
-			curIb[2] = i*2+3;
-
-			//triangle 2
-			curIb[3] = i*2;
-			curIb[4] = i*2+3;
-			curIb[5] = i*2+2;
-
-			curIb += 6;	//skip the 6 indices we just added.
-		}
-	}
-
-
-	Real shadeR=TheWaterTransparency->m_standingWaterColor.red;
-	Real shadeG=TheWaterTransparency->m_standingWaterColor.green;
-	Real shadeB=TheWaterTransparency->m_standingWaterColor.blue;
-
-	//If the water color is not overridden, use legacy lighting code.
-	if ( shadeR==1.0f && shadeG==1.0f && shadeB==1.0f)
-	{
-		shadeR = TheGlobalData->m_terrainAmbient[0].red;
-		shadeG = TheGlobalData->m_terrainAmbient[0].green;
-		shadeB = TheGlobalData->m_terrainAmbient[0].blue;
-
-		//Add in diffuse lighting from each terrain light
-		for (Int lightIndex=0; lightIndex < TheGlobalData->m_numGlobalLights; lightIndex++)
-		{
-			if (-TheGlobalData->m_terrainLightPos[lightIndex].z > 0)
-			{	shadeR += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].red;
-				shadeG += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].green;
-				shadeB += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].blue;
-			}
-		}
-
-		//Get water material colors
-		Real waterShadeR = (m_settings[m_tod].waterDiffuse & 0xff) / 255.0f;
-		Real waterShadeG = ((m_settings[m_tod].waterDiffuse >> 8) & 0xff) / 255.0f;
-		Real waterShadeB = ((m_settings[m_tod].waterDiffuse >> 16) & 0xff) / 255.0f;
-
-		shadeR=shadeR*waterShadeR*255.0f;
-		shadeG=shadeG*waterShadeG*255.0f;
-		shadeB=shadeB*waterShadeB*255.0f;
-	}
-	else
-	{
-		shadeR=shadeR*255.0f;
-		shadeG=shadeG*255.0f;
-		shadeB=shadeB*255.0f;
-
-		if (shadeR == 0 && shadeG == 0 && shadeB == 0)
-		{	//special case where we disable lighting
-			shadeR=255;
-			shadeG=255;
-			shadeB=255;
-		}
-	}
-
-	Int diffuse=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16);
-
-	//Keep diffuse from lighting calculations but substitute custom alpha
-	diffuse |= m_settings[m_tod].waterDiffuse & 0xff000000;	//copy alpha/opacity from ini setting
-
-	Int innerNdx = pTrig->getRiverStart();
-	Int outerNdx = innerNdx+1;
-
-	Real endLen=0;
-	Real totalLen=0;
-	Int i;
-	for (i=0; i<pTrig->getNumPoints()-1; i++) {
-		ICoord3D innerPt = *pTrig->getPoint(i);
-		ICoord3D outerPt = *pTrig->getPoint(i+1);
-		Real dx = innerPt.x-outerPt.x;
-		Real dy = innerPt.y-outerPt.y;
-		Real curLen = sqrt(dx*dx+dy*dy);
-		totalLen += curLen;
-		if ( i==innerNdx) {
-			endLen = curLen;
-		}
-	}
-	bumpFactor = endLen/BUMP_SIZE;
-
-	Real lengthOfRiver = (totalLen/2)-endLen;
-	Real repeatCount = lengthOfRiver / (endLen); 
-
-	Real vScale=(Real)repeatCount/(Real)rectangleCount;
-
-#define HEIGHT_TO_USE (0.5f)
-	if (innerNdx >= pTrig->getNumPoints()-1) return;
-	//allocate 2 vertices per side
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,(rectangleCount+1)*2);
-	{
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* vb=lock.Get_Formatted_Vertex_Array();
-
-		Real constA=3*m_riverVOrigin;
-
-		for (i=0; i<(pTrig->getNumPoints()/2); i++)
-		{
-			Real x,y;
-			ICoord3D innerPt = *pTrig->getPoint(outerNdx);
-			ICoord3D outerPt = *pTrig->getPoint(innerNdx);
-			outerNdx++;
-			innerNdx--;
-			if (innerNdx<0) {
-				innerNdx = pTrig->getNumPoints()-1;
-			}
-			if (outerNdx >= pTrig->getNumPoints()) {
-				outerNdx = 0;
-			}
-			x=innerPt.x;
-			y=innerPt.y;
-
-			vb->x=x;
-			vb->y=y;
-
-			vb->z=innerPt.z;
-			vb->diffuse= diffuse;
-	
-			Real wobbleConst=-m_riverVOrigin+vScale*(Real)i + WWMath::Fast_Sin(2*PI*(vScale*(Real)i) - constA)/22.0f;
- 			//old slower version
-			//vb->v1=-m_riverVOrigin+vScale*(Real)i + wobble(vScale*i, m_riverVOrigin, doWobble);
-			vb->v1=wobbleConst;
-			vb->u1=HEIGHT_TO_USE ;
-			//old slower version
-			//vb->v2 = -m_riverVOrigin+vScale*(Real)i + wobble(vScale*i, m_riverVOrigin, doWobble);
-			vb->v2=wobbleConst;
-			vb->u2 = 1.0f;
-			vb->nx = 0;
-			vb->ny = 0;
-			vb->nz = 1.0f;
-			vb++;
-
-			x=outerPt.x;
-			y=outerPt.y;
-
-			vb->x=x;
-			vb->y=y;
-			vb->z=outerPt.z;
-			vb->diffuse= diffuse;
- 			//old slower version
-			//vb->v1=-m_riverVOrigin+vScale*(Real)i + wobble(vScale*i, m_riverVOrigin, doWobble);
-			vb->v1=wobbleConst;
-			vb->u1=0;
-			//old slower version
- 			//vb->v2 = -m_riverVOrigin+vScale*(Real)i + wobble(vScale*i, m_riverVOrigin, doWobble);
-			vb->v2 =wobbleConst;
-			vb->u2 = 0;
-			vb->nx = 0;
-			vb->ny = 0;
-			vb->nz = 1.0f;
-			vb++;
-
-		}
-	}
-
-	Matrix3D tm(1);
-
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
-	DX8Wrapper::Set_Index_Buffer(ib_access,0);
-	DX8Wrapper::Set_Vertex_Buffer(vb_access);
-	DX8Wrapper::Set_Texture(0,m_riverTexture);	//set to blue
-
-	setupJbaWaterShader();
-
-	//In additive blending we need to use the alpha at the edges of river to darken
-	//rgb instead.
-	if (TheWaterTransparency->m_additiveBlend)
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA );
-
-	if (m_riverWaterPixelShader) DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_riverWaterPixelShader);
- 	DWORD cull;
-	DX8Wrapper::_Get_D3D_Device8()->GetRenderState(D3DRS_CULLMODE, &cull);
-	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-
-
-
-	if (wireframeForDebug) {
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_WIREFRAME);
-	}
-	DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);
-	if (wireframeForDebug) {
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
-	}
-
-	if (m_riverWaterPixelShader) DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(NULL);
-
-	//restore blend mode to what W3D expects.
-	if (TheWaterTransparency->m_additiveBlend)
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_ONE );
-
-	//do second pass to apply the shroud on water plane
-	if (TheTerrainRenderObject->getShroud())
-	{
-		W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
-		W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 0);
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-		//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
-		//write to the zbuffer.  Change to LESSEQUAL.
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
-		DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
-		W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-	}
-	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, cull);
-
-
-}
-
-void WaterRenderObjClass::setupFlatWaterShader(void) 
-{
-
-	DX8Wrapper::Set_Texture(0,m_riverTexture);
-	if (!TheWaterTransparency->m_additiveBlend)
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetAlphaShader);
-	else
-		DX8Wrapper::Set_Shader(ShaderClass::_PresetAdditiveShader);
-
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);
-	m_riverTexture->Get_Filter().Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_BEST);
-	m_riverTexture->Get_Filter().Set_Min_Filter(TextureFilterClass::FILTER_TYPE_BEST);
-	m_riverTexture->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_BEST);
-
-	DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-	//Setup shroud to render in same pass as water
-	if (m_trapezoidWaterPixelShader)
-	{	if (TheTerrainRenderObject->getShroud())
-		{
-			W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
-			//Use stage 3 to apply the shroud
-			W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 3);
-			//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
-			//write to the zbuffer.  Change to LESSEQUAL.
-			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
-		}
-		else
-		{	//Assume no shroud, so stage 3 will be "NULL" texture but using actual white because
-			//pixel shader on GF4 generates random colors with SetTexture(3,NULL).
-			if (!m_whiteTexture->Is_Initialized())
-			{	m_whiteTexture->Init();
-				SurfaceClass *surface=m_whiteTexture->Get_Surface_Level();
-				surface->DrawPixel(0,0,0xffffffff);
-				REF_PTR_RELEASE(surface);
-			}
-			DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,m_whiteTexture->Peek_D3D_Texture());	
-		}
-	}
-
-	DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP,   D3DTOP_ADD );
-	DX8Wrapper::Set_DX8_Texture_Stage_State(0,  D3DTSS_TEXCOORDINDEX, 0);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_TEXCOORDINDEX, 0);
-	
-	Bool doSparkles = true;
-
-	if (m_trapezoidWaterPixelShader && doSparkles) {
-
-		if (!m_waterSparklesTexture->Is_Initialized())
-			m_waterSparklesTexture->Init();
-
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(1,m_waterSparklesTexture->Peek_D3D_Texture());	
-
-		if (!m_waterNoiseTexture->Is_Initialized())
-			m_waterNoiseTexture->Init();
-
-		DX8Wrapper::_Get_D3D_Device8()->SetTexture(2,m_waterNoiseTexture->Peek_D3D_Texture());	
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
- 
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
-		// Two output coordinates are used.
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);	
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(2,  D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-		D3DXMATRIX inv;
-		float det;
-
-		Matrix4x4 curView;
-		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
-		D3DXMATRIX scale;
-
-		D3DXMatrixScaling(&scale, NOISE_REPEAT_FACTOR, NOISE_REPEAT_FACTOR,1);
-		D3DXMATRIX destMatrix = inv * scale;
-		D3DXMatrixTranslation(&scale, m_riverVOrigin, m_riverVOrigin,0);
-		destMatrix = destMatrix*scale;
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, *(Matrix4x4*)&destMatrix);
-
-	}
-	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 1, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 2, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
-	m_pDev->SetTextureStageState( 2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR );
-	if (m_trapezoidWaterPixelShader){
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShaderConstant(0,   D3DXVECTOR4(REFLECTION_FACTOR, REFLECTION_FACTOR, REFLECTION_FACTOR, 1.0f), 1);
-		DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_trapezoidWaterPixelShader);
-	}
-}
-
-//-------------------------------------------------------------------------------------------------
-//Draw a 4 sided flat water area.
-//-------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::drawTrapezoidWater(Vector3 points[4])
-{
-	Vector3 origin(points[0]);
-	Vector3 uVec1(points[1]);
-	Vector3 vVec1(points[3]);
-	Vector3 uVec2(points[2]);
-	Vector3 vVec2(points[2]);
-	uVec2 -= vVec1;
-	vVec2	-= uVec1;
-	uVec1 -= origin;
-	vVec1 -= origin;
-	Int uCount = (uVec1.Length()+uVec2.Length()) / (8*MAP_XY_FACTOR);
-	if (uCount<1) uCount = 1;
-	Int vCount = (vVec1.Length()+vVec2.Length()) / (8*MAP_XY_FACTOR);
-	if (vCount<1) vCount = 1;	
-
-	if (uCount>50) uCount = 50;
-	if (vCount>50) vCount = 50;
-
-	static Bool doWobble = true;
-
-	Int rectangleCount = uCount*vCount;
-
-	uCount++;
-	vCount++;
-
-	Int i, j;
-	//allocate 2 triangles per side with 3 indices per triangle
-	DynamicIBAccessClass ib_access(BUFFER_TYPE_DYNAMIC_DX8,(rectangleCount+1)*2*3);
-	{
-		DynamicIBAccessClass::WriteLockClass lockib(&ib_access);
- 		UnsignedShort *curIb = lockib.Get_Index_Array();
-		for (j=0; j<vCount-1; j++)
-		{	for (i=0; i<uCount-1; i++)
-			{
-				//triangle 1
-				curIb[0] = (j)*uCount + i;
-				curIb[1] = (j+1)*uCount + i+1;
-				curIb[2] = (j+1)*uCount + i;
-
-				//triangle 2
-				curIb[3] = (j)*uCount + i;
-				curIb[4] = (j)*uCount + i+1;
-				curIb[5] = (j+1)*uCount + i+1;
-
-				curIb += 6;	//skip the 6 indices we just added.
-			}
-		}
-	}
-
-	Real	waterFactor=150;
-	Real shadeR=TheWaterTransparency->m_standingWaterColor.red;
-	Real shadeG=TheWaterTransparency->m_standingWaterColor.green;
-	Real shadeB=TheWaterTransparency->m_standingWaterColor.blue;
-
-	//If the water color is not overridden, use legacy lighting code.
-	if ( shadeR==1.0f && shadeG==1.0f && shadeB==1.0f)
-	{
-		shadeR = TheGlobalData->m_terrainAmbient[0].red;
-		shadeG = TheGlobalData->m_terrainAmbient[0].green;
-		shadeB = TheGlobalData->m_terrainAmbient[0].blue;
-
-		//Add in diffuse lighting from each terrain light
-		for (Int lightIndex=0; lightIndex < TheGlobalData->m_numGlobalLights; lightIndex++)
-		{
-			if (-TheGlobalData->m_terrainLightPos[lightIndex].z > 0)
-			{	shadeR += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].red;
-				shadeG += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].green;
-				shadeB += -TheGlobalData->m_terrainLightPos[lightIndex].z * TheGlobalData->m_terrainDiffuse[lightIndex].blue;
-			}
-		}
-
-		//Get water material colors
-		Real waterShadeR = (m_settings[m_tod].waterDiffuse & 0xff) / 255.0f;
-		Real waterShadeG = ((m_settings[m_tod].waterDiffuse >> 8) & 0xff) / 255.0f;
-		Real waterShadeB = ((m_settings[m_tod].waterDiffuse >> 16) & 0xff) / 255.0f;
-
-		shadeR=shadeR*waterShadeR*255.0f;
-		shadeG=shadeG*waterShadeG*255.0f;
-		shadeB=shadeB*waterShadeB*255.0f;
-	}
-	else
-	{
-		shadeR=shadeR*255.0f;
-		shadeG=shadeG*255.0f;
-		shadeB=shadeB*255.0f;
-
-		if (shadeR == 0 && shadeG == 0 && shadeB == 0)
-		{	//special case where we disable lighting
-			shadeR=255;
-			shadeG=255;
-			shadeB=255;
-		}
-	}
-
-	Int diffuse=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16);
-
-	//Keep diffuse from lighting calculations but substitute custom alpha
-	diffuse |= m_settings[m_tod].waterDiffuse & 0xff000000;	//copy alpha/opacity from ini setting
-
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,(rectangleCount+1)*2);
-
-//#define WAVY_WATER
-//#define FEATHER_LAYER_COUNT (3) //LORENZEN
-//#define FEATHER_LAYER_THICKNESS (2.5f)
-//#define FEATHER_WATER
-
-//#ifdef WAVY_WATER // the NEW WATER a'la LORENZEN
-	if ( TheGlobalData->m_featherWater )
-	{
-
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* vb=lock.Get_Formatted_Vertex_Array();
-
-		Real phase = 0;
-		Real mapCoeff = PI/(4*MAP_XY_FACTOR);
-		Real wave = 0;
-		Real amplitude = 0.5f;
-
-		//The first (high order) byte is the Alpha value for this patch
-		// It needs to be set proportional to the number of feather layers
-		// this comes from TheGlobalData->m_featherWater, which is a count of layers
-
-
-		Int Alpha = 0;
-		if ( TheGlobalData->m_featherWater == 5) Alpha = 80;
-		if ( TheGlobalData->m_featherWater == 4) Alpha = 110;
-		if ( TheGlobalData->m_featherWater == 3) Alpha = 140;
-		if ( TheGlobalData->m_featherWater == 2) Alpha = 200;
-		if ( TheGlobalData->m_featherWater == 1) Alpha = 255;
-
-		//Keep diffuse from lighting calculations but substitute custom alpha
-		Int customDiffuse = (diffuse & 0x00ffffff) | (Alpha<< 24);//(0x80 << 16)|(0x90 << 8)|0xa0;
-
-		for (j=0; j<vCount; j++)
-		{
-			Real dv = j;
-			dv /= (vCount-1);
-			for (i=0; i<uCount; i++)
-			{
-				Real du = i;
-				du /= (uCount-1);
-				Vector3 vertex = origin;
-				vertex += uVec1*du;
-				vertex += vVec1*dv;
-				vertex += (dv)*(du)*(vVec2-vVec1);
-
-				vb->x=vertex.X;
-				vb->y=vertex.Y;
-
-				// common to all the waving effects
-				phase = 25 * m_riverVOrigin + vertex.X * mapCoeff;
-				wave = (sin(phase) - 1.0f) * amplitude;
-
-				vb->z = (vertex.Z + wave);
-				vb->diffuse = customDiffuse;
-				vb->u1 = (vertex.X/waterFactor) + 0.02*cos(11*m_riverVOrigin)*wave;
-				vb->v1 = (vertex.Y/waterFactor) + 0.02*cos(5*m_riverVOrigin)*wave;
-				vb->u2 = vertex.X/BUMP_SIZE;
-				vb->v2 = vertex.Y/BUMP_SIZE + 0.3f*vertex.X/BUMP_SIZE;
-				vb->nx = 0;
-				vb->ny = 0;
-				vb->nz = 1.0f;
-				vb++;
-			}
-		}
-	}
-//#else // STILL THE OLD FLAT WATER
-	else
-
-	{
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* vb=lock.Get_Formatted_Vertex_Array();
-
-		//Pulling some constants out of the inner loops to improve performance -MW
-		Real constA=0.02*cos(11*m_riverVOrigin);
-		Real constB=0.02*cos(5*m_riverVOrigin);
-		Real constC=25*m_riverVOrigin;
-		Real ooWaterFactor = 1.0f/waterFactor;
-		const Real constD=PI/(4*MAP_XY_FACTOR);
-		Real constE=1.0f/(Real)(vCount-1);
-		Real constF=1.0f/(Real)(uCount-1);
-
-		for (j=0; j<vCount; j++)
-		{
-			Real dv = (Real)j * constE;
-
-			for (i=0; i<uCount; i++)
-			{
-				Real du = (Real)i * constF;
-				Vector3 vertex = origin;
-				vertex += uVec1*du;
-				vertex += vVec1*dv;
-				vertex += (dv)*(du)*(vVec2-vVec1);
-
-				vb->x=vertex.X;
-				vb->y=vertex.Y;
-				vb->z=vertex.Z;
-
-				vb->diffuse= diffuse;
-				//Old slower version
- 				//vb->u1=(vertex.X/waterFactor) + 0.02*cos(11*m_riverVOrigin)*sin(25*m_riverVOrigin+vertex.X*PI/(4*MAP_XY_FACTOR));
- 				//vb->v1=(vertex.Y/waterFactor) + 0.02*cos(5*m_riverVOrigin)*sin(25*m_riverVOrigin+vertex.Y*PI/(4*MAP_XY_FACTOR));
-				vb->u1=vertex.X*ooWaterFactor + constA*WWMath::Fast_Sin(constC+vertex.X*constD);
-				vb->v1=vertex.Y*ooWaterFactor + constB*WWMath::Fast_Sin(constC+vertex.Y*constD);
-				vb->u2 = vertex.X/BUMP_SIZE;
-				//Old slower version
- 				//vb->v2 = vertex.Y/BUMP_SIZE + 0.3f*vertex.X/BUMP_SIZE;
-				vb->v2 = (vertex.Y+0.3f*vertex.X)/BUMP_SIZE;
-				vb->nx = 0;
-				vb->ny = 0;
-				vb->nz = 1.0f;
-				vb++;
-			}
-		}
-	}
-
-//#endif // OLD VS NEW WATER
-
-
-
-	Matrix3D tm(1);
-
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
-	DX8Wrapper::Set_Index_Buffer(ib_access,0);
-	DX8Wrapper::Set_Vertex_Buffer(vb_access);
-
-	setupFlatWaterShader();// lorenzen sez use the alpha shader
-
-	//If video card supports it and it's enabled, feather the water edge using destination alpha
-	if (DX8Wrapper::getBackBufferFormat() == WW3D_FORMAT_A8R8G8B8 && TheGlobalData->m_showSoftWaterEdge && TheWaterTransparency->m_transparentWaterDepth !=0)
-	{		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_DESTALPHA );
-			if (!TheWaterTransparency->m_additiveBlend)
-				DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND, D3DBLEND_INVDESTALPHA );
-	}
-
-
- 	DWORD cull;
-	DX8Wrapper::_Get_D3D_Device8()->GetRenderState(D3DRS_CULLMODE, &cull);
-	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-
-
-
-//#ifdef FEATHER_WATER // the NEW WATER a'la LORENZEN
-
-//	int layer = 0;//LORENZEN
-//	for (layer = 0; layer < FEATHER_LAYER_COUNT; ++layer)//LORENZEN
-//#endif // FEATHER_WATER
-	{
-//#ifdef WAVY_WATER // the NEW WATER a'la LORENZEN
-
-		//increment the depth of the water's surface for every vert in the buffer
-//#ifdef  FEATHER_WATER
-//		VertexFormatXYZNDUV2 *vertBuf = vertexBufferStart;
-//		while (vertBuf < vertexBufferStart + vCount * uCount)
-//		{
-//			vertBuf->z *= FEATHER_LAYER_THICKNESS;
-//			++vertBuf;
-//		}
-//#endif // FEATHER_WATER
-//#endif //WAVY_WATER
-		DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);//lorenzen thinks this is where to itereate the soft shoreline effect
-	}
-
-
-
-
-	if (false) {
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_WIREFRAME);
-		m_pDev->SetRenderState(D3DRS_ALPHABLENDENABLE , false);
-		DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);
-		m_pDev->SetRenderState(D3DRS_ALPHABLENDENABLE , true);
-		DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_FILLMODE,D3DFILL_SOLID);
-	}
-
-	if (m_riverWaterPixelShader) DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(NULL);
-	//Restore alpha blend to default values since we may have changed them to feather edges.
-	if (!TheWaterTransparency->m_additiveBlend)
-	{	DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA );
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA );
-	}
-	else
-	{
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND, D3DBLEND_ONE );
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND, D3DBLEND_ONE );
-	}
-
-	if (TheTerrainRenderObject->getShroud())
-	{
-		if (m_trapezoidWaterPixelShader)
-		{	//shroud was applied in stage3 of main pass so just need to restore state here.
-			W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-			DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,NULL);	//free possible reference to shroud texture
-			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
-		}
-		else
-		{	//do second pass to apply the shroud on water plane for cards that can't do it in main pass.
-			W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
-			W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 0);
-			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
-			//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
-			//write to the zbuffer.  Change to LESSEQUAL.
-			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
-			DX8Wrapper::Draw_Triangles(	0,rectangleCount*2, 0,	(rectangleCount+1)*2);
-			DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL);
-			W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-		}
-	}
-	DX8Wrapper::_Get_D3D_Device8()->SetRenderState(D3DRS_CULLMODE, cull);
-}
-
-
-
-//-------------------------------------------------------------------------------------------------
-//debug version where moon rotates with the camera	(always upright on screen)
-//-------------------------------------------------------------------------------------------------
-#if 0
-void WaterRenderObjClass::renderSkyBody(Matrix3D *mat)
-{	
-	Vector3 vRight,vUp,V0,V1,V2,V3;
-
-	mat->Get_X_Vector(&vRight);
-	mat->Get_Y_Vector(&vUp);
-
-	//calculate offsets from quad center to each of the 4 corners
-	//	0-----1
-	//  |    /|
-	//  |  /  |
-	//	|/    |
-	//  3-----2
-	V0=-vRight+vUp;
-	V2=vRight+vUp;
-	V2=vRight-vUp;
-	V3=-vRight-vUp;
-
-	VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-	DX8Wrapper::Set_Material(vmat);
-	REF_PTR_RELEASE(vmat);
-	DX8Wrapper::Set_Shader(ShaderClass::/*_PresetAdditiveShader*//*_PresetOpaqueShader*/_PresetAlphaShader);
-//	DX8Wrapper::Set_Texture(0,setting->skyBodyTexture);
-
-	DX8Wrapper::Set_Texture(0,m_alphaClippingTexture);
-
-	//draw an infinite sky plane
-	DynamicVBAccessClass vb_access(BUFFER_TYPE_DYNAMIC_DX8,4);
-	{
-		DynamicVBAccessClass::WriteLockClass lock(&vb_access);
-		VertexFormatXYZNDUV2* verts=lock.Get_Formatted_Vertex_Array();
-		if(verts)
-		{
-			verts[0].x=SKYBODY_SIZE*V0.X;
-			verts[0].y=SKYBODY_SIZE*V0.Y;
-			verts[0].z=SKYBODY_SIZE*V0.Z;
-			verts[0].u2=0;
-			verts[0].v2=1;
-			verts[0].diffuse=0xffffffff;
-	
-			verts[1].x=SKYBODY_SIZE*V1.X;
-			verts[1].y=SKYBODY_SIZE*V1.Y;
-			verts[1].z=SKYBODY_SIZE*V1.Z;
-			verts[1].u2=1;
-			verts[1].v2=1;
-			verts[1].diffuse=0xffffffff;
-	
-			verts[2].x=SKYBODY_SIZE*V2.X;
-			verts[2].y=SKYBODY_SIZE*V2.Y;
-			verts[2].z=SKYBODY_SIZE*V2.Z;
-			verts[2].u2=1;
-			verts[2].v2=0;
-			verts[2].diffuse=0xffffffff;
-	
-			verts[3].x=SKYBODY_SIZE*V3.X;
-			verts[3].y=SKYBODY_SIZE*V3.Y;
-			verts[3].z=SKYBODY_SIZE*V3.Z;
-			verts[3].u2=0;
-			verts[3].v2=0;
-			verts[3].diffuse=0xffffffff;
-		}
-	}
-
-	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
-	DX8Wrapper::Set_Vertex_Buffer(vb_access);
-
-	Matrix3D tm(1);
-	//set postion of skybody in world
-//	tm.Set_Translation(Vector3(40,0,0));
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
-
-	DX8Wrapper::Draw_Triangles(	0,2, 0,	4);	//draw a quad, 2 triangles, 4 verts
-}
-#endif
-
-// ------------------------------------------------------------------------------------------------
-/** CRC */
-// ------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::crc( Xfer *xfer )
-{
-
-}  // end crc
-
-// ------------------------------------------------------------------------------------------------
-/** Xfer
-	* Version Info:
-	* 1: Initial version */
-// ------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::xfer( Xfer *xfer )
-{
-
-	// version
-	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;
-	xfer->xferVersion( &version, currentVersion );
-
-	// grid cells x
-	Int cellsX = m_gridCellsX;
-	xfer->xferInt( &cellsX );
-	if( cellsX != m_gridCellsX )
-	{
-
-		DEBUG_CRASH(( "WaterRenderObjClass::xfer - cells X mismatch\n" ));
-		throw SC_INVALID_DATA;
-
-	}  // end if
-	
-	// grid cells Y
-	Int cellsY = m_gridCellsY;
-	xfer->xferInt( &cellsY );
-	if( cellsY != m_gridCellsY )
-	{
-	
-		DEBUG_CRASH(( "WaterRenderObjClass::xfer - cells Y mismatch\n" ));
-		throw SC_INVALID_DATA;
-
-	}  // end if
-
-	// xfer each of the mesh data points
-	for( UnsignedInt i = 0; i < m_meshDataSize; ++i )
-	{
-
-		// height
-		xfer->xferReal( &m_meshData[ i ].height );
-
-		// velocity
-		xfer->xferReal( &m_meshData[ i ].velocity );
-
-		// status
-		xfer->xferUnsignedByte( &m_meshData[ i ].status );
-
-		// preferred height
-		xfer->xferUnsignedByte( &m_meshData[ i ].preferredHeight );
-
-	}  // end for, i
-
-}  // end xfer
-
-// ------------------------------------------------------------------------------------------------
-/** Load post process */
-// ------------------------------------------------------------------------------------------------
-void WaterRenderObjClass::loadPostProcess( void )
-{
-
-}  // end loadPostProcess
-
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
deleted file mode 100644
index 55eedb48b2d..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
+++ /dev/null
@@ -1,1328 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: W3DWaterTracks.cpp ////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
-//-----------------------------------------------------------------------------
-//
-// Project:   RTS3
-//
-// File name: W3DWaterTracks.cpp
-//
-// Created:   Mark Wilczynski, July 2001
-//
-// Desc:      Draw waves and splash marks on water surface.  System allows for
-//			  some simple animation : dynamic uv coordinates, scaling, scrolling,
-//			  and alpha.
-//-----------------------------------------------------------------------------
-
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/W3DWaterTracks.h"
-#include "W3DDevice/GameClient/W3DShaderManager.h"
-#include "W3DDevice/GameClient/W3DShroud.h"
-#include "GameClient/InGameUI.h"
-#include "GameClient/Water.h"
-#include "GameLogic/TerrainLogic.h"
-#include "Common/GlobalData.h"
-#include "Common/UnicodeString.h"
-#include "Common/file.h"
-#include "Common/FileSystem.h"
-#include "texture.h"
-#include "colmath.h"
-#include "coltest.h"
-#include "rinfo.h"
-#include "camera.h"
-#include "assetmgr.h"
-#include "WW3D2/dx8wrapper.h"
-
-//#pragma optimize("", off)
-
-//#define ALLOW_WATER_TRACK_EDIT
-
-//number of vertex pages allocated - allows double buffering of vertex updates.
-//while one is being rendered, another is being updated.  Improves HW parallelism.
-#define WATER_VB_PAGES	1000
-#define WATER_STRIP_X	2		//vertex resolution of each strip
-#define WATER_STRIP_Y	2		
-#define SYNC_WAVES			//all the waves are in sync - movement resets at same time.
-//#define DEFAULT_FINAL_WAVE_WIDTH	28.0f
-//#define DEFAULT_FINAL_WAVE_HEIGHT	18.0f
-//#define DEFAULT_SECOND_WAVE_TIME_OFFSET 6267	//should always be half of totalMs
-
-WaterTracksRenderSystem *TheWaterTracksRenderSystem=NULL;	///< singleton for track drawing system.
-
-static Bool pauseWaves=FALSE;
-
-enum waveType CPP_11(: Int)
-{
-	WaveTypeFirst,
-	WaveTypePond=WaveTypeFirst,
-	WaveTypeOcean,
-	WaveTypeCloseOcean,	//same as above but appears much closer to beach.
-	WaveTypeCloseOceanDouble,	//same as above but waves much sloser together.
-	WaveTypeRadial,
-	WaveTypeLast = WaveTypeRadial,
-	WaveTypeStationary,
-	WaveTypeMax,
-};
-
-struct waveInfo
-{
-	Real m_finalWidth;				//final width of of wave when it reaches beach.
-	Real m_finalHeight;				//final height of wave after it stretched out on beach.
-	Real m_waveDistance;			//distance away from beach where wave starts.
-	Real m_initialVelocity;
-	Int m_fadeMs;					//time to fade out wave after it stops on shore.
-	Real m_initialWidthFraction;	//fraction of m_finalWidth when wave first appears.
-	Real m_initialHeightWidthFraction;	//fraction of initial width to use as the initial height.
-	Int m_timeToCompress;			//time for back of wave to continue moving forward after front starts retreating.
-	Int m_secondWaveTimeOffset;		//time for second wave to start.  Should always be half of first wave's TotalMs.
-	const char *m_textureName;			//name of texture to use on wave.
-	const char *m_waveTypeName;			//name of this wave type.
-};
-
-waveInfo waveTypeInfo[WaveTypeMax]=
-{
-	{28.0f, 18.0f, 25.0f, 0.018f, 900, 0.01f, 0.18f, 1500, 0,"wave256.tga","Pond"},	//pond
-	{55.0f, 36.0f, 80.0f, 0.015f, 2000, 0.5f, 0.18f, 1000, 6267,"wave256.tga","Ocean"},	//ocean
-	{55.0f, 36.0f, 80.0f, 0.015f, 2000, 0.05f, 0.18f, 1000, 6267,"wave256.tga","Close Ocean"},
-	{55.0f, 36.0f, 80.0f, 0.015f, 4000, 0.01f, 0.18f, 2000, 6267,"wave256.tga","Close Ocean Double"},
-	{55.0f, 27.0f, 80.0f, 0.015f, 2000, 0.01f, 8.0f, 2000, 5367,"wave256.tga","Radial"},
-};
-
-//=============================================================================
-// WaterTracksObj::~WaterTracksObj
-//=============================================================================
-/** Destructor. Releases w3d assets. */
-//=============================================================================
-WaterTracksObj::~WaterTracksObj(void)
-{
-	freeWaterTracksResources();
-}
-
-//=============================================================================
-// WaterTracksObj::WaterTracksObj
-//=============================================================================
-/** Constructor. Just nulls out some variables. */
-//=============================================================================
-WaterTracksObj::WaterTracksObj(void)
-{
-	m_stageZeroTexture=NULL;
-	m_bound=false;
-	m_initTimeOffset=0;
-}
-
-//=============================================================================
-// WaterTracksObj::Get_Obj_Space_Bounding_Sphere
-//=============================================================================
-/** WW3D method that returns object bounding sphere used in frustum culling*/
-//=============================================================================
-void WaterTracksObj::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
-{	/// @todo: Add code to cull track marks to screen by constantly updating bounding volumes
-	sphere=m_boundingSphere;
-}
-
-//=============================================================================
-// WaterTracksObj::Get_Obj_Space_Bounding_Box
-//=============================================================================
-/** WW3D method that returns object bounding box used in collision detection*/
-//=============================================================================
-void WaterTracksObj::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
-{
-	box=m_boundingBox;
-}
-
-//=============================================================================
-// WaterTracksObj::freeWaterTracksResources
-//=============================================================================
-/** Free any W3D resources associated with this object */
-//=============================================================================
-Int WaterTracksObj::freeWaterTracksResources(void)
-{
-	REF_PTR_RELEASE(m_stageZeroTexture);
-	return 0;
-}
-
-//=============================================================================
-// WaterTracksObj::init
-//=============================================================================
-/** Setup size settings and allocate W3D texture
-*	The width/length define the size of the polygon quad which will contain
-*	the specified texture.
- */
-//=============================================================================
-void WaterTracksObj::init( Real width, Real length, const Vector2 &start, const Vector2 &end, const Char *texturename, Int waveTimeOffset)
-{	
-	freeWaterTracksResources();	//free old resources used by this track
-
-	//save original settings used to create this wave
-	m_initStartPos = start;
-	m_initEndPos = end;
-	m_initTimeOffset = waveTimeOffset;
-
-	m_boundingSphere.Init(Vector3(0,0,0),400);
-	m_boundingBox.Center.Set(0.0f, 0.0f, 0.0f);
-	m_boundingBox.Extent.Set(400.0f, 400.0f, 1.0f);
-	m_x=WATER_STRIP_X;
-	m_y=WATER_STRIP_Y;
-	m_elapsedMs=m_initTimeOffset;
-	m_startPos=start;
-	m_perpDir=m_waveDir=end-start;
-	m_perpDir.Rotate(-1.57079632679f);	//get vector perpendicular to wave motion.
-	m_perpDir.Normalize();
-
-	m_waveDir=m_perpDir;
-	m_waveDir.Rotate(PI/2);	//get vector along wave travel direction.
-	//move back by width of wave so start point turns into maximum reach of wave.
-	//m_startPos -= m_waveDir*m_width;
-	//move back initial tip off of wave a couple units off the final position
-	//to give it some room to travel. Travel vector is stored in m_waveDir.
-	m_waveDistance = waveTypeInfo[m_type].m_waveDistance;	//total distance traveled by wave front
-
-	m_waveDir *= m_waveDistance;
-	m_startPos -= m_waveDir;	//move start point down away from shoreline
-
-	m_initialVelocity=waveTypeInfo[m_type].m_initialVelocity;			//velocity per ms
-	m_totalMs = m_waveDistance/m_initialVelocity; //amount of time for wave to travel complete distance
-
-	m_fadeMs = waveTypeInfo[m_type].m_fadeMs;		//time for wave to fade out after it stops on beach
-
-	m_waveInitialWidth=length * waveTypeInfo[m_type].m_initialWidthFraction;///<width of wave segment when it first appears
-	m_waveInitialHeight=m_waveInitialWidth * waveTypeInfo[m_type].m_initialHeightWidthFraction;	///<height of wave segment when it first appears
-	m_waveFinalWidth=length;	///<width of wave segment at full size
-	m_waveFinalHeight=width;		///<final height of unstretched wave
-
-	//get total time for front to complete its cycle
-	m_timeToReachBeach=(m_waveDistance - m_waveFinalHeight)/m_initialVelocity;
-	m_frontSlowDownAcc= -(m_initialVelocity*m_initialVelocity)/(2*m_waveFinalHeight);	//deceleration of wave after it hits land
-	m_timeToStop = -m_initialVelocity/m_frontSlowDownAcc;
-	m_timeToRetreat = sqrt(fabs(2.0f*m_waveFinalHeight/m_frontSlowDownAcc));
-	m_totalMs = m_timeToReachBeach + m_timeToStop + m_timeToRetreat;	//total time that wave front is on screen
-	m_backSlowDownAcc = (2.0f*m_waveInitialHeight/(m_timeToStop*m_timeToStop));//((m_waveInitialHeight - m_velocity*m_timeToStop)*2.0f)/(m_timeToStop*m_timeToStop);
-	m_timeToCompress = waveTypeInfo[m_type].m_timeToCompress;	//time for back of wave to continue moving forward after front starts retreating.
-
-
-	if (m_type == WaveTypeStationary)
-	{	//this is a stationary wave slightly behind starting point
-		m_timeToRetreat = 1000; //time to fade out.
-		m_totalMs = m_timeToReachBeach + m_timeToStop+m_fadeMs+m_timeToRetreat;	//trigger when other wave stops.
-		m_startPos = start;
-		m_fadeMs = 1000;		//time for wave to fade out after it stops on beach
-	}
-
-	m_stageZeroTexture=WW3DAssetManager::Get_Instance()->Get_Texture(texturename);
-}
-
-//=============================================================================
-// WaterTracksObj::init
-//=============================================================================
-/** Setup size settings and allocate W3D texture
-*	Alternate version of init where:
-*	(start, end) define a vector perpendicular to wave travel.  The length of this
-*	vector is used as the length of the wave segment.  The line between start-end
-*	defines the maximum distance the wave will reach.
- */
-//=============================================================================
-void WaterTracksObj::init( Real width, const Vector2 &start, const Vector2 &end, const Char *texturename)
-{	
-	freeWaterTracksResources();	//free old resources used by this track
-	m_boundingSphere.Init(Vector3(0,0,0),400);
-	m_boundingBox.Center.Set(0.0f, 0.0f, 0.0f);
-	m_boundingBox.Extent.Set(400.0f, 400.0f, 1.0f);
-	m_perpDir=end-start;
-	m_startPos=start + m_perpDir*0.5f;	//move start point to middle
-	Real length=m_perpDir.Length();
-	m_perpDir *= 1.0f/length;	//normalize it.
-	m_waveDir=m_perpDir;
-	m_waveDir.Rotate(PI/2);	//get vector along wave travel direction.
-	m_startPos -= m_waveDir*width;	//move back by width of wave
-	m_waveDir *= 1.3f*MAP_XY_FACTOR;	//travel 4 units
-	m_startPos -= m_waveDir;	//move start point down away from shoreline
-	m_x=WATER_STRIP_X;
-	m_y=WATER_STRIP_Y;
-	m_elapsedMs=0;
-	m_initialVelocity=0.001f*MAP_XY_FACTOR;		//velocity per ms
-	m_totalMs=m_waveDir.Length()/m_initialVelocity;
-	m_fadeMs = 3000;		//time for wave to fade out after it stops on beach
-
-	m_stageZeroTexture=WW3DAssetManager::Get_Instance()->Get_Texture(texturename);
-}
-
-//=============================================================================
-// WaterTracksObj::update
-//=============================================================================
-/** Update state of object - advance animations and other states.
- */
-//=============================================================================
-Int WaterTracksObj::update(Int msElapsed)
-{
-#ifdef	ALLOW_WATER_TRACK_EDIT
-//	if (pauseWaves)
-//		m_elapsedMs = m_timeToReachBeach+m_timeToStop;
-//	else
-#endif
-
-	//nothing to do here...most of the work is done on render.
-	m_elapsedMs += msElapsed;	//advance time for this update
-
-	///@todo: Should check in here if we are done with this object are return FALSE to free it.
-	//	return FALSE;
-
-	return TRUE;	//assume we had an update
-}
-
-#define waveInitialV = 0.01f
-#define waveAcceleration = -0.01f
-
-//=============================================================================
-// WaterTracksObj::render
-//=============================================================================
-/** Draws the object in it's current state.
- */
-//=============================================================================
-
-Int WaterTracksObj::render(DX8VertexBufferClass	*vertexBuffer, Int batchStart)
-{
-	VertexFormatXYZDUV1 *vb;
-	Vector2	waveTailOrigin,waveFrontOrigin;
-	Real	ooWaveDirLen=1.0f/m_waveDir.Length();	//one over length
-	Real	waterHeight;
-	Real	waveAlpha;
-	Real	widthFrac;
-	Real	heightFrac;
-
-	if (batchStart < (WATER_VB_PAGES*WATER_STRIP_X*WATER_STRIP_Y-m_x*m_y))
-	{	//we have room in current VB, append new verts
-		if(vertexBuffer->Get_DX8_Vertex_Buffer()->Lock(batchStart*vertexBuffer->FVF_Info().Get_FVF_Size(),m_x*m_y*vertexBuffer->FVF_Info().Get_FVF_Size(),(unsigned char**)&vb,D3DLOCK_NOOVERWRITE) != D3D_OK)
-			return batchStart;
-	}
-	else
-	{	//ran out of room in last VB, request a substitute VB.
-		if(vertexBuffer->Get_DX8_Vertex_Buffer()->Lock(0,m_x*m_y*vertexBuffer->FVF_Info().Get_FVF_Size(),(unsigned char**)&vb,D3DLOCK_DISCARD) != D3D_OK)
-			return batchStart;
-		batchStart=0;	//reset start of page to first vertex
-	}
-
-	//Adjust wave position in a non-linear way so that it slows down as it hits the target.  Using 1/4 sine wave
-	//seems to work okay since it maxes out at 1.0 at our final position.
-	//Real	timeFrac=(Real)m_elapsedMs/(Real)m_totalMs;//sinf(0.5f*3.14159f*(Real)m_elapsedMs/(Real)m_totalMs);
-
-	//Real displacement=m_elapsedMs*waveInitialV+0.5*waveAcceleration*m_elapsed*m_elapsed;
-
-	heightFrac=1.0f;
-	widthFrac = 1.0f;
-
-	if (m_type == WaveTypeStationary)
-	{	//stationary wave
-		waveFrontOrigin = m_startPos;
-		waveFrontOrigin -= m_perpDir*m_waveFinalWidth*0.5f;	//offset to left edge of wave
-		waveTailOrigin = waveFrontOrigin - m_waveFinalHeight * ooWaveDirLen*m_waveDir;
-		waveAlpha = 0.0f;
-
-		if (m_elapsedMs >= m_totalMs)
-			m_elapsedMs = 0;	//done with effect*/
-		if (m_elapsedMs > (m_timeToReachBeach + m_timeToStop -1000 + m_fadeMs))
-		{	//fading out
-			waveAlpha = m_elapsedMs-(m_timeToReachBeach + m_timeToStop - 1000 +m_fadeMs);//(m_totalMs-m_timeToRetreat -m_fadeMs - m_elapsedMs)/m_fadeMs;
-			waveAlpha = waveAlpha / m_timeToRetreat;
-			waveAlpha = 1.0f - waveAlpha;
-			if (waveAlpha < 0.0f)
-				waveAlpha = 0.0f;
-		}
-		else
-		if (m_elapsedMs > (m_timeToReachBeach + m_timeToStop - 1000))
-		{	//start fading up
-			
-			waveAlpha = m_elapsedMs-(m_timeToReachBeach + m_timeToStop - 1000);//(m_totalMs-m_timeToRetreat -m_fadeMs - m_elapsedMs)/m_fadeMs;
-			waveAlpha = waveAlpha / m_fadeMs;
-			if (waveAlpha > 1.0f)
-				waveAlpha = 1.0f;
-		}
-	}
-	else
-	{	//moving wave
-
-		//get coordinate of top left of wave strip
-		if (m_elapsedMs < m_timeToReachBeach)
-		{	//wave has not reached beach yet so position only depends on velocity
-			waveAlpha = m_elapsedMs / m_timeToReachBeach;
-			widthFrac = waveAlpha;
-			widthFrac=(m_waveInitialWidth + widthFrac* (m_waveFinalWidth-m_waveInitialWidth))/m_waveFinalWidth;
-
-			waveFrontOrigin = m_startPos + m_initialVelocity*m_elapsedMs*ooWaveDirLen*m_waveDir;
-			waveFrontOrigin -= m_perpDir*m_waveFinalWidth*0.5f*widthFrac;	//offset to left edge of wave
-			//Tail of wave will be behind the front by fixed amount.
-			waveTailOrigin = waveFrontOrigin - m_waveInitialHeight * ooWaveDirLen*m_waveDir;
-		}
-		else	//wave has reached beach and is decelerating
-		if (m_elapsedMs < m_totalMs)
-		{	waveAlpha = 1.0f;
-			widthFrac = 1.0f;
-			//Get position of wave when it hit the beach
-			waveFrontOrigin = m_startPos + m_initialVelocity*m_timeToReachBeach*ooWaveDirLen*m_waveDir;
-			waveTailOrigin = waveFrontOrigin;	//store position for calculating tail position
-			//Add movement after it hit the beach	
-			Real elapsedMs=m_elapsedMs - m_timeToReachBeach;
-			waveFrontOrigin += (m_initialVelocity*elapsedMs+0.5f*m_frontSlowDownAcc*elapsedMs*elapsedMs)*ooWaveDirLen*m_waveDir;
-			waveFrontOrigin -= m_perpDir*m_waveFinalWidth*0.5f*widthFrac;	//offset to left edge of wave
-
-			Real timeSinceBacktrack = m_elapsedMs - m_timeToReachBeach - m_timeToStop;
-			if (timeSinceBacktrack < 0)
-				timeSinceBacktrack = 0;
-			waveAlpha = timeSinceBacktrack/m_fadeMs;
-			if (waveAlpha > 1.0f)
-				waveAlpha = 1.0f;
-
-			waveAlpha = 1.0f - waveAlpha;
-
-			//Get position of tail when front hits the beach.
-			waveTailOrigin -= m_waveInitialHeight * ooWaveDirLen*m_waveDir;
-
-			if (m_elapsedMs > (m_timeToReachBeach+m_timeToStop+m_timeToCompress))
-			{	elapsedMs=elapsedMs;	///@todo: bug?
-				waveTailOrigin += (0.5f*m_backSlowDownAcc*(m_timeToStop+m_timeToCompress)*(m_timeToStop+m_timeToCompress))*ooWaveDirLen*m_waveDir;
-				//get time since wave should have stopped moving forward
-				Real newElapsed = m_elapsedMs - (m_timeToReachBeach+m_timeToStop+m_timeToCompress);
-				waveTailOrigin += (0.5f*m_frontSlowDownAcc*newElapsed*newElapsed)*ooWaveDirLen*m_waveDir;
-			}
-			else
-	//		if (m_elapsedMs < (m_totalMs-m_timeToRetreat))
-				//find position of tail including slowdown after it hit the beach
-	//		waveTailOrigin += (m_initialVelocity*elapsedMs+0.5f*m_backSlowDownAcc*elapsedMs*elapsedMs)*ooWaveDirLen*m_waveDir;
-			waveTailOrigin += (0.5f*m_backSlowDownAcc*elapsedMs*elapsedMs)*ooWaveDirLen*m_waveDir;
-
-			waveTailOrigin -= m_perpDir*m_waveFinalWidth*0.5f*widthFrac;	//offset to left edge of wave
-		}
-		else
-		{	m_elapsedMs = 0;
-			waveAlpha = m_elapsedMs / m_timeToReachBeach;
-			widthFrac = waveAlpha;
-			widthFrac=(m_waveInitialWidth + widthFrac* (m_waveFinalWidth-m_waveInitialWidth))/m_waveFinalWidth;
-
-			waveFrontOrigin = m_startPos + m_initialVelocity*m_elapsedMs*ooWaveDirLen*m_waveDir;
-			waveFrontOrigin -= m_perpDir*m_waveFinalWidth*0.5f*widthFrac;	//offset to left edge of wave
-			//Tail of wave will be behind the front by fixed amount.
-			waveTailOrigin = waveFrontOrigin - m_waveInitialHeight * ooWaveDirLen*m_waveDir;
-		}
-	}
-
-	//First insert tail of wave:
-	Vector2 testPoint(waveTailOrigin);
-	TheTerrainLogic->isUnderwater(testPoint.X,testPoint.Y,&waterHeight);
-	vb->x=	testPoint.X;
-	vb->y=	testPoint.Y;
-	vb->z=waterHeight+1.5f;
-	vb->diffuse=(REAL_TO_INT(waveAlpha*255.0f)<<24) |0xffffff;
-	if (m_flipU)
-		vb->u1=1;	
-	else
-		vb->u1=0;	
-	vb->v1=0;	
-	vb++;
-	testPoint.Set(waveTailOrigin + m_perpDir*m_waveFinalWidth*widthFrac);
-	vb->x=	testPoint.X;
-	vb->y=	testPoint.Y;
-	vb->z=waterHeight+1.5f;
-	vb->diffuse=(REAL_TO_INT(waveAlpha*255.0f)<<24) |0xffffff;
-	if (m_flipU)
-		vb->u1=0.0f;
-	else
-		vb->u1=1.0f;
-	vb->v1=0;
-	vb++;
-	//insert front of wave
-	testPoint.Set(waveFrontOrigin);
-	vb->x=	testPoint.X;
-	vb->y=	testPoint.Y;
-	vb->z=waterHeight+1.5f;
-	vb->diffuse=(REAL_TO_INT(waveAlpha*255.0f)<<24) |0xffffff;
-	if (m_flipU)
-		vb->u1=1;
-	else
-		vb->u1=0;
-	vb->v1=1.0f;
-	vb++;
-	testPoint.Set(waveFrontOrigin + m_perpDir*m_waveFinalWidth*widthFrac);
-	vb->x=	testPoint.X;
-	vb->y=	testPoint.Y;
-	vb->z=waterHeight+1.5f;
-	vb->diffuse=(REAL_TO_INT(waveAlpha*255.0f)<<24) |0xffffff;
-	if (m_flipU)
-		vb->u1=0;
-	else
-		vb->u1=1.0f;
-	vb->v1=1.0f;
-	vb++;
-
-	vertexBuffer->Get_DX8_Vertex_Buffer()->Unlock();
-
-	Int idxCount=(m_y-1)*(m_x*2+2) - 2;	//index count
-
-	DX8Wrapper::Set_Index_Buffer(TheWaterTracksRenderSystem->m_indexBuffer,batchStart);
-	DX8Wrapper::Draw_Strip(0,idxCount-2,0,m_x*m_y);	//there are always n-2 primitives for n index strip.
-
-	return batchStart+m_x*m_y;	//return new offset into unused area of vertex buffer
-}
-
-//=============================================================================
-//WaterTracksRenderSystem::bindTrack
-//=============================================================================
-/** Grab a track from the free store. If no free tracks exist, return NULL.
-	As long as a track is bound to an object (like a tank) it is ready to accept
-	updates with additional edges.  Once it is unbound, it will expire and return
-	to the free store once all tracks have faded out.
-*/
-//=============================================================================
-WaterTracksObj *WaterTracksRenderSystem::bindTrack(waveType type)
-{
-	WaterTracksObj *mod,*nextmod,*prevmod;
-
-	mod = m_freeModules;
-	if( mod )
-	{
-		// take module off the free list
-		if( mod->m_nextSystem )
-			mod->m_nextSystem->m_prevSystem = mod->m_prevSystem;
-		if( mod->m_prevSystem )
-			mod->m_prevSystem->m_nextSystem = mod->m_nextSystem;
-		else
-			m_freeModules = mod->m_nextSystem;
-
-		mod->m_type=type;
-
-		// put module on the used list (sorted next to similar types)
-		nextmod=NULL,prevmod=NULL;
-		for( nextmod = m_usedModules; nextmod; prevmod=nextmod,nextmod = nextmod->m_nextSystem )
-		{
-			if (nextmod->m_type==type)
-			{	//found start of other shadows using same texture, insert new shadow here.
-				mod->m_nextSystem=nextmod;
-				mod->m_prevSystem=prevmod;
-				nextmod->m_prevSystem=mod;
-				if (prevmod)
-				{	prevmod->m_nextSystem=mod;
-				}
-				else
-					m_usedModules=mod;
-				break;
-			}
-		}
-
-		if (nextmod==NULL)
-		{	//shadow with new texture. Add to top of list.
-			mod->m_nextSystem = m_usedModules;
-			if (m_usedModules)
-				m_usedModules->m_prevSystem=mod;
-			m_usedModules = mod;
-		}
-	
-		mod->m_bound=true;
-	}  // end if
-
-	#ifdef SYNC_WAVES
-	nextmod=m_usedModules;
-
-	while(nextmod)
-	{
-		nextmod->m_elapsedMs=nextmod->m_initTimeOffset;
-		nextmod=nextmod->m_nextSystem;
-	}  // end while
-	#endif
-
-	return mod;
-}  //end bindTrack
-
-//=============================================================================
-//WaterTracksRenderSystem::unbindTrack
-//=============================================================================
-/** Called when an object (i.e Tank) will not lay down any more tracks and
-doesn't need this object anymore.  The track-laying object will be returned
-to pool of available tracks as soon as any remaining track edges have faded out.
-*/
-//=============================================================================
-void WaterTracksRenderSystem::unbindTrack( WaterTracksObj *mod )
-{
-	//this object should return to free store as soon as there is nothing
-	//left to render.
-	mod->m_bound=false;
-	releaseTrack(mod);
-}
-
-//=============================================================================
-//WaterTracksRenderSystem::releaseTrack
-//=============================================================================
-/** Returns a track laying object to free store to be used again later.
-*/
-void WaterTracksRenderSystem::releaseTrack( WaterTracksObj *mod )
-{
-	if (mod==NULL)
-		return;
-	
-	assert(mod->m_bound == false);
-
-	// remove module from used list
-	if( mod->m_nextSystem )
-		mod->m_nextSystem->m_prevSystem = mod->m_prevSystem;
-	if( mod->m_prevSystem )
-		mod->m_prevSystem->m_nextSystem = mod->m_nextSystem;
-	else
-		m_usedModules = mod->m_nextSystem;
-
-	// add module to free list
-	mod->m_prevSystem = NULL;
-	mod->m_nextSystem = m_freeModules;
-	if( m_freeModules )
-		m_freeModules->m_prevSystem = mod;
-	m_freeModules = mod;
-	mod->freeWaterTracksResources();
-}
-
-//=============================================================================
-// WaterTracksRenderSystem::WaterTracksRenderSystem
-//=============================================================================
-/** Constructor. Just nulls out some variables. */
-//=============================================================================
-WaterTracksRenderSystem::WaterTracksRenderSystem()
-{
-	m_usedModules = NULL;
-	m_freeModules = NULL;
-	m_indexBuffer = NULL;
-	m_vertexMaterialClass = NULL;
-	m_vertexBuffer = NULL;
-	m_stripSizeX=WATER_STRIP_X;
-	m_stripSizeY=WATER_STRIP_Y;
-	m_batchStart=0;
-	TheWaterTracksRenderSystem = this;	//only allow one instance of this object.
-}
-
-//=============================================================================
-// WaterTracksRenderSystem::~WaterTracksRenderSystem
-//=============================================================================
-/** Destructor.  Free all pre-allocated track laying render objects*/
-//=============================================================================
-WaterTracksRenderSystem::~WaterTracksRenderSystem( void )
-{
-
-	// free all data
-	shutdown();
-
-	m_vertexMaterialClass=NULL;
-
-}
-
-//=============================================================================
-// WaterTracksRenderSystem::ReAcquireResources
-//=============================================================================
-/** (Re)allocates all W3D assets after a reset.. */
-//=============================================================================
-void WaterTracksRenderSystem::ReAcquireResources(void)
-{
-	Int i,j,k;
-//	const Int numModules=16;	///@todo: Get a value out of gdf
-
-	// just for paranoia's sake.
-	REF_PTR_RELEASE(m_indexBuffer);
-	REF_PTR_RELEASE(m_vertexBuffer);
-
-	//Will need m_y-1 strips, each of length m_x*2.
-	//Will also need 2 extra indices to connect each strip to next one (except last strip)
-	//Total index buffer size = (m_y-1)*(m_x*2+2) - 2 (drop the extra 2 indices from last strip)
-
-	Int idxCount=(m_stripSizeY-1)*(m_stripSizeX*2+2) - 2;
-
-	m_indexBuffer=NEW_REF(DX8IndexBufferClass,(idxCount));
-
-	// Fill up the IB
-	{
-		DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer);
-		UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-		
-		for (i=0,j=0,k=0; i<idxCount; j++)
-		{
-			for (;k<(m_stripSizeX*(j+1)); k++,i+=2)
-			{
-				ib[i]=(UnsignedShort) k+m_stripSizeX;
-				ib[i+1]=(UnsignedShort) k;
-			}
-			//Generate 4 degenerate triangle to connect current strip to next strip/row of map
-			//To do this, we just repeat the last index of first strip and first index of new strip.
-			//Any triangles with repeated vertices will be skipped during rendering.
-			if (i<idxCount) //check if there is at least 1 more strip to go
-			{
-				ib[i]=k-1;
-				ib[i+1]=k+m_stripSizeX;
-				i+=2;
-			}
-		}
-	}
-
-	m_vertexBuffer=NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZDUV1,m_stripSizeX*m_stripSizeY*WATER_VB_PAGES,DX8VertexBufferClass::USAGE_DYNAMIC));
-	m_batchStart=0;
-}
-
-//=============================================================================
-// WaterTracksRenderSystem::ReleaseResources
-//=============================================================================
-/** (Re)allocates all W3D assets after a reset.. */
-//=============================================================================
-void WaterTracksRenderSystem::ReleaseResources(void)
-{
-	REF_PTR_RELEASE(m_indexBuffer);
-	REF_PTR_RELEASE(m_vertexBuffer);
-	// Note - it is ok to not release the material, as it is a w3d object that
-	// has no dx8 resources. jba.
-}
-
-//=============================================================================
-// WaterTracksRenderSystem::init
-//=============================================================================
-/**  initialize the system, allocate all the render objects we will need */
-//=============================================================================
-void WaterTracksRenderSystem::init(void)
-{
-	const Int numModules=2000;	///@todo: Get a value out of gdf
-	Int i;
-	WaterTracksObj *mod;
-
-	m_stripSizeX=WATER_STRIP_X;	///@todo: grab these out of gdf or define
-	m_stripSizeY=WATER_STRIP_Y;
-	m_level=TheGlobalData->m_waterPositionZ;
-
-	ReAcquireResources();
-	//go with a preset material for now.
-	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-
-	//use a multi-texture shader:
-	m_shaderClass = ShaderClass::_PresetAlphaShader;
-	m_shaderClass.Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);	//water should be visible from both sides
-
-	// we cannot initialize a system that is already initialized
-	if( m_freeModules || m_usedModules )
-	{
-
-		// system already online!
-		assert( 0 );
-		return;
-
-	}  // end if
-
-	// allocate our modules for this system
-	for( i = 0; i < numModules; i++ )
-	{
-
-		mod = NEW WaterTracksObj;
-
-		if( mod == NULL )
-		{
-
-			// unable to allocate modules needed
-			assert( 0 );
-			return;
-
-		}  // end if
-
-		mod->m_prevSystem = NULL;
-		mod->m_nextSystem = m_freeModules;
-		if( m_freeModules )
-			m_freeModules->m_prevSystem = mod;
-		m_freeModules = mod;
-
-	}  // end for i
-
-}  // end init
-
-void WaterTracksRenderSystem::reset(void)
-{
-	WaterTracksObj *nextMod,*mod;
-
-	//release unbound tracks that may still be fading out
-	mod=m_usedModules;
-
-	while(mod)
-	{
-		nextMod=mod->m_nextSystem;
-		mod->m_bound=false;
-		releaseTrack(mod);
-
-		mod = nextMod;
-	}  // end while
-
-
-	// free all attached things and used modules
-	assert( m_usedModules == NULL );
-}
-
-//=============================================================================
-// WaterTracksRenderSystem::shutdown
-//=============================================================================
-/** Shutdown and free all memory for this system */
-//=============================================================================
-void WaterTracksRenderSystem::shutdown( void )
-{
-	WaterTracksObj *nextMod,*mod;
-
-	//release unbound tracks that may still be fading out
-	mod=m_usedModules;
-
-	while(mod)
-	{
-		nextMod=mod->m_nextSystem;
-
-		if (!mod->m_bound)
-			releaseTrack(mod);
-
-		mod = nextMod;
-	}  // end while
-
-
-	// free all attached things and used modules
-	assert( m_usedModules == NULL );
-
-	// free all module storage
-	while( m_freeModules )
-	{
-
-		nextMod = m_freeModules->m_nextSystem;
-		delete m_freeModules;
-		m_freeModules = nextMod;
-
-	}  // end while
-
-	REF_PTR_RELEASE(m_indexBuffer);
-	REF_PTR_RELEASE(m_vertexMaterialClass);
-	REF_PTR_RELEASE(m_vertexBuffer);
-
-}  // end shutdown
-
-//=============================================================================
-// WaterTracksRenderSystem::update
-//=============================================================================
-/** Update the state of all active track marks - fade, expire, etc. */
-//=============================================================================
-void WaterTracksRenderSystem::update()
-{
-
-	static  Int iLastTime=timeGetTime();
-	WaterTracksObj *mod=m_usedModules,*nextMod;
-
-	Int timeDiff = timeGetTime()-iLastTime;
-	iLastTime += timeDiff;
-
-	//Lock framerate to 30 fps
-	timeDiff = 1.0f/30.0f*1000.0f;
-
-	//first update all the tracks
-	while( mod )
-	{
-		nextMod = mod->m_nextSystem;
-
-		if (!mod->m_bound || (!mod->update(timeDiff) && !mod->m_bound))
-		{ //object is not longer updating and is unbound so ok to release it.
-			releaseTrack(mod);
-		}
-
-		mod = nextMod;
-	}  // end while
-}
-
-
-void TestWaterUpdate(void);
-void setFPMode( void );
-
-//=============================================================================
-// WaterTracksRenderSystem::flush
-//=============================================================================
-/** Draw all active track marks for this frame */
-//=============================================================================
-void WaterTracksRenderSystem::flush(RenderInfoClass & rinfo)
-{
-/** @todo: Optimize system by drawing tracks as triangle strips and use dynamic vertex buffer access.
-May also try rendering all tracks with one call to W3D/D3D by grouping them by texture.
-Try improving the fit to vertical surfaces like cliffs.
-*/
-	Int	diffuseLight;
-
-	if (!TheGlobalData->m_showSoftWaterEdge || TheWaterTransparency->m_transparentWaterDepth ==0 )
-		return;
-
-	if (TheGlobalData->m_usingWaterTrackEditor)
-		TestWaterUpdate();
-
-	update();	//update positions of all the tracks
-
-	rinfo.Camera.Apply();
-
-	if (!m_usedModules || ShaderClass::Is_Backface_Culling_Inverted())
-		return;	//don't render track marks in reflections.
-
- 	//According to Nvidia there's a D3D bug that happens if you don't start with a
- 	//new dynamic VB each frame - so we force a DISCARD by overflowing the counter.
- 	m_batchStart = 0xffff;
-
-	// adjust shading for time of day.
-	Real shadeR, shadeG, shadeB;
-	shadeR = TheGlobalData->m_terrainAmbient[0].red;
-	shadeG = TheGlobalData->m_terrainAmbient[0].green;
-	shadeB = TheGlobalData->m_terrainAmbient[0].blue;
-	shadeR += TheGlobalData->m_terrainDiffuse[0].red/2;
-	shadeG += TheGlobalData->m_terrainDiffuse[0].green/2;
-	shadeB += TheGlobalData->m_terrainDiffuse[0].blue/2;
-	shadeR*=255.0f;
-	shadeG*=255.0f;
-	shadeB*=255.0f;
-
-	diffuseLight=REAL_TO_INT(shadeB) | (REAL_TO_INT(shadeG) << 8) | (REAL_TO_INT(shadeR) << 16);
-
-	Matrix3D tm(1);	///set to identity
-	DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);	//position the water surface
-
-	DX8Wrapper::Set_Material(m_vertexMaterialClass);
-	DX8Wrapper::Set_Shader(m_shaderClass);
-
-	DX8Wrapper::Set_Vertex_Buffer(m_vertexBuffer);
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZBIAS,8);
-	//Force apply of render states so we can override them.
-	DX8Wrapper::Apply_Render_State_Changes();
-
-	if (TheTerrainRenderObject->getShroud())
-	{	
-		W3DShaderManager::setTexture(0,TheTerrainRenderObject->getShroud()->getShroudTexture());
-		W3DShaderManager::setShader(W3DShaderManager::ST_SHROUD_TEXTURE, 1);
-
-		//modulate with shroud texture
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG1, D3DTA_TEXTURE );	//stage 1 texture
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLORARG2, D3DTA_CURRENT );	//previous stage texture
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP,   D3DTOP_MODULATE );
-		DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP,   D3DTOP_MODULATE );
-
-		//Shroud shader uses z-compare of EQUAL which wouldn't work on water because it doesn't
-		//write to the zbuffer.  Change to LESSEQUAL.
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
-	}
-
-	Int LastTextureType=-1;
-
-	WaterTracksObj *mod=m_usedModules;
-
-	while( mod )
-	{
-		if (LastTextureType != mod->m_type)
-			DX8Wrapper::Set_Texture(0,mod->m_stageZeroTexture);
-
-		Int vertsRendered=mod->render(m_vertexBuffer,m_batchStart);
-
-		m_batchStart = vertsRendered;	//advance past vertices already in buffer
-
-		mod = mod->m_nextSystem;
-	}	//while (mod)
-
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZBIAS,0);
-
-	if (TheTerrainRenderObject->getShroud())
-	{	//we used the shroud shader, so reset it.
-		DX8Wrapper::Set_DX8_Render_State(D3DRS_ZFUNC, D3DCMP_EQUAL);
-		W3DShaderManager::resetShader(W3DShaderManager::ST_SHROUD_TEXTURE);
-	}
-}
-
-WaterTracksObj *WaterTracksRenderSystem::findTrack(Vector2 &start, Vector2 &end, waveType type)
-{
-	WaterTracksObj *mod=m_usedModules;
-
-	while( mod )
-	{
-		if (mod->m_initEndPos == end &&
-			mod->m_initStartPos == start &&
-			mod->m_type == type)
-			return mod;
-		mod = mod->m_nextSystem;
-	}	//while (mod)
-	return NULL;
-}
-void WaterTracksRenderSystem::saveTracks(void)
-{
-
-	if (!TheTerrainLogic)
-		return;
-
-	AsciiString fileName=TheTerrainLogic->getSourceFilename();
-	char path[256];
-
-	strcpy(path,fileName.str());
-	Int len=strlen(path);
-
-	strcpy(path+len-4,".wak");
-
-	WaterTracksObj *umod;
-	Int trackCount=0;
-
-	FILE *fp=fopen(path,"wb");
-
-	if (fp)
-	{
-		umod=m_usedModules;
-		while(umod)
-		{	if (umod->m_initTimeOffset == 0)
-			{	//only save the primary wave front, second layer is added automatically.
-				fwrite(&umod->m_initStartPos,sizeof(umod->m_startPos),1,fp);
-				fwrite(&umod->m_initEndPos,sizeof(umod->m_perpDir),1,fp);
-				fwrite(&umod->m_type,sizeof(umod->m_type),1,fp);
-	//			fwrite(&umod->m_initTimeOffset,sizeof(umod->m_initTimeOffset),1,fp);
-				trackCount++;
-			}
-			umod=umod->m_nextSystem;
-		}  // end while
-		fwrite(&trackCount,sizeof(trackCount),1,fp);
-		fclose(fp);
-	}
-}
-
-void WaterTracksRenderSystem::loadTracks(void)
-{
-
-	if (!TheTerrainLogic)
-		return;
-
-	AsciiString fileName=TheTerrainLogic->getSourceFilename();
-	char path[256];
-
-	strcpy(path,fileName.str());
-	Int len=strlen(path);
-
-	strcpy(path+len-4,".wak");
-
-	File *file = TheFileSystem->openFile(path, File::READ | File::BINARY);
-	WaterTracksObj *umod;
-	Int trackCount=0;
-	Int flipU=0;
-	Vector2 startPos,endPos;
-	waveType wtype;
-
-	if (file)
-	{
-		file->seek(-4,File::END);
-		file->read(&trackCount,sizeof(trackCount));
-		file->seek(0, File::START);
-		for (Int i=0; i<trackCount; i++)
-		{
-		tryagain:
-			file->read(&startPos,sizeof(startPos));
-			file->read(&endPos,sizeof(endPos));
-			file->read(&wtype,sizeof(wtype));
-			//Check if this track already exists.
-			if (findTrack(startPos,endPos,wtype))
-			{	i++;
-				goto tryagain;
-			}
-
-			umod=TheWaterTracksRenderSystem->bindTrack(wtype);
-			if (umod)
-			{	//umod->init(1.5f*MAP_XY_FACTOR,Vector2(0,0),Vector2(1,1),"wave256.tga");
-				flipU ^= 1;	//toggle flip state
-				umod->init(waveTypeInfo[wtype].m_finalHeight,waveTypeInfo[wtype].m_finalWidth,startPos,endPos,waveTypeInfo[wtype].m_textureName,0);
-				umod->m_flipU=flipU;
-
-				if (waveTypeInfo[wtype].m_secondWaveTimeOffset)	//check if we need a second wave to follow
-				{
-					umod=TheWaterTracksRenderSystem->bindTrack(wtype);
-					if (umod)
-					{
-						umod->init(waveTypeInfo[wtype].m_finalHeight,waveTypeInfo[wtype].m_finalWidth,startPos,endPos,waveTypeInfo[wtype].m_textureName,waveTypeInfo[wtype].m_secondWaveTimeOffset);
-						umod->m_flipU = !flipU;
-					}
-				}
-			}
-		}
-		file->close();
-	}
-
-#if 0	//Obsolete code used before there was another editor to place waves.
-	//Look for all waypoints that start with "waveStart_"
-	for (Waypoint *way = TheTerrainLogic->getFirstWaypoint(); way; way = way->getNext())
-	{
-		if (way->getName().startsWith("waveStart_") && way->getNumLinks() == 1)
-		{
-			Waypoint *nextWay = way->getLink(0);
-			Coord3D startPos = *way->getLocation();
-			Coord3D endPos = *nextWay->getLocation();
-
-			//initialize surface layer (1)
-			WaterTracksObj *umod=TheWaterTracksRenderSystem->bindTrack(1);
-			if (umod)
-			{
-				umod->init(DEFAULT_FINAL_WAVE_HEIGHT,DEFAULT_FINAL_WAVE_WIDTH,Vector2(startPos.x,startPos.y),Vector2(endPos.x,endPos.y),"wave1.tga",0);
-			}
-/*
-			//initialize foam layer (0)
-			umod=TheWaterTracksRenderSystem->bindTrack(0);
-			if (umod)
-			{
-				umod->init(2.5f*MAP_XY_FACTOR,5.0f*MAP_XY_FACTOR,Vector2(startPos.x,startPos.y),Vector2(endPos.x,endPos.y),"wave2.tga");
-//				umod->m_fadeMs += 1500;	//take extra 500 ms to fade out wave.
-//				umod->m_retreatFrac = 1.0f;	//don't move wave back after it hits final position.
-			}*/
-		}
-	}
-#endif
-}
-
-/**@todo: this is a quick hack for adding/removing/testing breaking waves inside the client.
-Will need to move this code to an external editor at some pont. */
-#include "GameClient/Display.h"
-
-extern HWND ApplicationHWnd;
-
-//TODO: Fix editor so it actually draws the wave segment instead of line while editing
-//Could freeze all the water while editing?  Or keep setting elapsed time on current segment.
-//Have to make it so seamless merge of segments at final position.
-static void TestWaterUpdate(void)
-{
-	static Int doInit=1;
-	static WaterTracksObj *track=NULL,*track2=NULL;
-	static Int trackEditMode=0;
-	static waveType currentWaveType = WaveTypeOcean;
-	POINT	screenPoint;
-	POINT	endPoint;
-	static POINT	mouseAnchor;
-	static Int		haveStart=0;
-	static Int		haveEnd=0;
-	static Coord3D	terrainPointStart,terrainPointEnd;
-	//flags to tell me when the user lets go of a key
-	static Int trackEditModeReset=1;
-	static Int addPointReset=1;
-	static Int deleteTrackReset=1;
-	static Int saveTracksReset=1;
-	static Int loadTracksReset=1;
-	static Int changeTypeReset=1;
-
-	pauseWaves=FALSE;
-
-	if (doInit)
-	{	//create the system
-		doInit=0;
-
-//		TheWaterTracksRenderSystem = NEW (WaterTracksRenderSystem);
-//		TheWaterTracksRenderSystem->init();
-
-		//create a dummy track
-//		track=TheWaterTracksRenderObjClassSystem->bindTrack(0);
-//		track->init(1.5f,8.0f,Vector2(147.0f,67.0f),Vector2(146.9f,68.6f),"wave2.tga");
-
-//		track=TheWaterTracksRenderObjClassSystem->bindTrack(0);
-//		track->init(1.5f,8.0f,Vector2(139.0f,66.0f),Vector2(138.8f,67.6f),"wave2.tga");
-	}
-
-	if (GetAsyncKeyState(VK_F5) & 0x8001)	//check if F5 pressed since last call
-	{	
-		if (trackEditModeReset)
-		{
-			if (trackEditMode)
-			{
-				UnicodeString string;
-				string.format(L"Leaving Water Track Edit Mode");
-				TheInGameUI->message(string);
-			}
-			else
-			{
-				UnicodeString string;
-				string.format(L"Entering Water Track Edit Mode");
-				TheInGameUI->message(string);
-
-				string.format(L"Wave Type: %hs",waveTypeInfo[currentWaveType].m_waveTypeName);
-				TheInGameUI->message(string);
-			}
-
-			trackEditMode ^= 1;	//toggle editor on/off
-
-			if (trackEditMode == 0)
-			{	//editor was turned off, save changes
-				haveStart=0;
-				haveEnd=0;
-			}
-			trackEditModeReset=0;
-		}
-	}
-	else
-		trackEditModeReset=1;
-
-	if (trackEditMode)
-	{   //we are in wave edit mode
-
-		if (GetCursorPos(&screenPoint))	//read mouse position
-		{
-			ScreenToClient( ApplicationHWnd, &screenPoint);
-
-			if (GetAsyncKeyState(VK_F6) & 0x8001)
-			{
-				if (addPointReset)
-				{
-					if (!haveStart)
-					{	mouseAnchor=screenPoint;
-						TheTacticalView->screenToTerrain( (ICoord2D *)&screenPoint, &terrainPointStart);
-						haveStart=1;
-						UnicodeString string;
-						string.format(L"Added Start");
-						TheInGameUI->message(string);
-					}
-					else
-					{
-						endPoint=screenPoint;
-						TheTacticalView->screenToTerrain( (ICoord2D *)&screenPoint, &terrainPointEnd);
-						haveEnd=1;
-						//Have enough info to add a wave now
-						track=TheWaterTracksRenderSystem->bindTrack(currentWaveType);
-						if (track)
-						{//	track->init(1.5f*MAP_XY_FACTOR,Vector2(terrainPointStart.x,terrainPointStart.y),Vector2(terrainPointEnd.x,terrainPointEnd.y),"wave256.tga");
-							//Generate valid input for the 2 points
-							Vector2 startPoint(terrainPointStart.x,terrainPointStart.y);
-							Vector2 endPoint(terrainPointEnd.x,terrainPointEnd.y);
-							Vector2 midPoint = endPoint - startPoint;
-							Vector2 m_perpDir = midPoint;
-							m_perpDir.Rotate(1.57079632679f);	//get vector perpendicular to wave motion.
-							m_perpDir.Normalize();
-							midPoint = startPoint + (midPoint)*0.5f;
-							Vector2 dirMidPoint = midPoint + m_perpDir;
-
-							track->init(waveTypeInfo[currentWaveType].m_finalHeight,waveTypeInfo[currentWaveType].m_finalWidth,Vector2(midPoint.X,midPoint.Y),Vector2(dirMidPoint.X,dirMidPoint.Y),waveTypeInfo[currentWaveType].m_textureName,0);
-
-							if (waveTypeInfo[currentWaveType].m_secondWaveTimeOffset)
-							{
-								//Add a second track slightly behind this one
-								track2=TheWaterTracksRenderSystem->bindTrack(currentWaveType);
-								if (track2)
-								{
-									track2->init(waveTypeInfo[currentWaveType].m_finalHeight,waveTypeInfo[currentWaveType].m_finalWidth,Vector2(midPoint.X,midPoint.Y),Vector2(dirMidPoint.X,dirMidPoint.Y),waveTypeInfo[currentWaveType].m_textureName,waveTypeInfo[currentWaveType].m_secondWaveTimeOffset);
-								}
-							}
-
-							UnicodeString string;
-							string.format(L"Added End");
-							TheInGameUI->message(string);
-						}
-						haveStart=0;	//reset for next segment
-						haveEnd=0;
-					}
-					addPointReset=0;
-				}
-			}
-			else
-				addPointReset=1;
-
-			if (GetAsyncKeyState(VK_DELETE) & 0x8001)
-			{	//delete last segment added
-				if (deleteTrackReset && track)
-				{	deleteTrackReset=0;
-					TheWaterTracksRenderSystem->unbindTrack(track);
-					if (track2)
-						TheWaterTracksRenderSystem->unbindTrack(track2);
-					haveStart=0;	//reset for next segment
-					haveEnd=0;
-					track=NULL;
-					track2=NULL;
-				}
-			}
-			else
-				deleteTrackReset=1;
-
-			if (GetAsyncKeyState(VK_INSERT) & 0x8001)
-			{	//change current wave type
-				if (changeTypeReset)
-				{	changeTypeReset=0;
-					currentWaveType = (waveType)((Int)currentWaveType + 1);
-					if (currentWaveType > WaveTypeLast)
-						currentWaveType = WaveTypeFirst;
-
-					UnicodeString string;
-					string.format(L"Wave Type: %hs",waveTypeInfo[currentWaveType].m_waveTypeName);
-					TheInGameUI->message(string);
-				}
-			}
-			else
-				changeTypeReset=1;
-
-			if (GetAsyncKeyState(VK_F7) & 0x8001)
-			{	//save all segments added
-				if (saveTracksReset)
-				{	saveTracksReset=0;
-					TheWaterTracksRenderSystem->saveTracks();
-					haveStart=0;	//reset for next segment
-					haveEnd=0;
-					track=NULL;
-					track2=NULL;
-					UnicodeString string;
-					string.format(L"Saved Tracks");
-					TheInGameUI->message(string);
-				}
-			}
-			else
-				saveTracksReset=1;
-
-			if (GetAsyncKeyState(VK_F8) & 0x8001)
-			{	//load tracks for map
-				if (loadTracksReset)
-				{	loadTracksReset=0;
-					TheWaterTracksRenderSystem->reset();
-					TheWaterTracksRenderSystem->loadTracks();
-					haveStart=0;	//reset for next segment
-					haveEnd=0;
-					track=NULL;
-					track2=NULL;
-					UnicodeString string;
-					string.format(L"Loaded Tracks");
-					TheInGameUI->message(string);
-				}
-			}
-			else
-				saveTracksReset=1;
-		};
-
-		if (haveStart && !haveEnd)
-		{	//draw a guide line
-//			View *tacticalView = TheDisplay->getFirstView();
-//			tacticalView->worldToScreen( &m_moveHint[i].pos, &pos );
-
-			TheTacticalView->screenToTerrain( (ICoord2D *)&screenPoint, &terrainPointEnd);
-			//Check if point is within correct distance of start
-			Real xdiff=terrainPointEnd.x - terrainPointStart.x;
-			Real ydiff=terrainPointEnd.y - terrainPointStart.y;
-			if (sqrt (xdiff * xdiff + ydiff * ydiff) <= waveTypeInfo[currentWaveType].m_finalWidth)
-			{	TheDisplay->drawLine(mouseAnchor.x, mouseAnchor.y, screenPoint.x, screenPoint.y,1,0xffccccff);
-				DX8Wrapper::Invalidate_Cached_Render_States();
-				ShaderClass::Invalidate();
-			}
-
-			pauseWaves=TRUE;
-
-//			char buffer[64];
-//			sprintf(buffer,"\n%d,%d,%d,%d",mouseAnchor.x, mouseAnchor.y, screenPoint.x, screenPoint.y);
-//			OutputDebugString (buffer);
-		}
-	}
-}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
deleted file mode 100644
index 680dfd099de..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
+++ /dev/null
@@ -1,2578 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-// WorldHeightMap.cpp
-// Class to encapsulate height map.
-// Author: John Ahlquist, April 2001
-
-#define INSTANTIATE_WELL_KNOWN_KEYS
-
-#include "windows.h"
-#include "stdlib.h"
-#include <string.h>
-#include "Common/STLTypedefs.h"
-
-#include "Common/DataChunk.h"
-//#include "Common/GameFileSystem.h"
-#include "Common/FileSystem.h" // for LOAD_TEST_ASSETS
-#include "Common/GlobalData.h"
-#include "Common/MapReaderWriterInfo.h"
-#include "Common/TerrainTypes.h"
-#include "Common/ThingFactory.h"
-#include "Common/ThingTemplate.h"
-#include "Common/WellKnownKeys.h"
-
-#include "GameLogic/PolygonTrigger.h"
-#include "GameLogic/SidesList.h"
-
-#include "W3DDevice/GameClient/WorldHeightMap.h"
-#include "W3DDevice/GameClient/TileData.h"
-#include "W3DDevice/GameClient/HeightMap.h"
-#include "W3DDevice/GameClient/TerrainTex.h"
-#include "W3DDevice/GameClient/W3DShadow.h"
-
-#include "Common/file.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-#define K_OBSOLETE_HEIGHT_MAP_VERSION 8
-
-#define PATHFIND_CLIFF_SLOPE_LIMIT_F	9.8f	
-
-// -----------------------------------------------------------
-static AsciiString validateName(AsciiString n, Int flags)
-{
-
-	return n;
-
-}
-
-/* ********* GDIFileStream class ****************************/
-class GDIFileStream : public InputStream
-{
-protected:
-	File* m_file;
-public:
-	GDIFileStream(File* pFile):m_file(pFile) {};
-	virtual Int read(void *pData, Int numBytes) {
-			return(m_file->read(pData, numBytes));
-	};
-};
-
-
-/* ********* MapObject class ****************************/
-/*static*/ MapObject *MapObject::TheMapObjectListPtr = NULL;
-/*static*/ Dict MapObject::TheWorldDict;
-
-MapObject::MapObject(Coord3D loc, AsciiString name, Real angle, Int flags, const Dict* props,
-										 const ThingTemplate *thingTemplate )
-{
-	m_objectName = validateName( name, flags );
-	m_thingTemplate = thingTemplate;
-	m_nextMapObject = NULL;
-	m_location = loc;
-	m_angle = normalizeAngle(angle);
-	m_color = (0xff)<<8; // Bright green.
-	m_flags = flags;
-	m_renderObj = NULL;
-	m_shadowObj = NULL;
-	m_runtimeFlags = 0;
-	// Note - do NOT set TheKey_objectSelectable on creation - allow it to follow the .ini value unless specified by user action.  jba. [3/20/2003]
-	if (props)
-	{
-		m_properties = *props;
-	} 
-	else 
-	{
-		m_properties.setInt(TheKey_objectInitialHealth, 100);
-		m_properties.setBool(TheKey_objectEnabled, true);
-		m_properties.setBool(TheKey_objectIndestructible, false);
-		m_properties.setBool(TheKey_objectUnsellable, false);
-		m_properties.setBool(TheKey_objectPowered, true);
-		m_properties.setBool(TheKey_objectRecruitableAI, true);
-		m_properties.setBool(TheKey_objectTargetable, false );
-	}
-
-	for( Int i = 0; i < BRIDGE_MAX_TOWERS; ++i )
-		setBridgeRenderObject( (BridgeTowerType)i, NULL );
-
-}	
-
-
-MapObject::~MapObject(void)
-{
-	setRenderObj(NULL);
-	setShadowObj(NULL);
-	if (m_nextMapObject) {
-		MapObject *cur = m_nextMapObject;
-		MapObject *next;
-		while (cur) {
-			next = cur->getNext();
-			cur->setNextMap(NULL); // prevents recursion. 
-			deleteInstance(cur);
-			cur = next;
-		}
-	}
-	for( Int i = 0; i < BRIDGE_MAX_TOWERS; ++i )	
-		setBridgeRenderObject( (BridgeTowerType)i, NULL );
-
-}
-
-MapObject *MapObject::duplicate(void)
-{
-	MapObject *pObj = newInstance( MapObject)(m_location, m_objectName, m_angle, m_flags, &m_properties, m_thingTemplate);
-	pObj->setColor(getColor());
-	pObj->m_runtimeFlags = m_runtimeFlags;
-	return pObj;
-}
-
-void MapObject::setRenderObj(RenderObjClass *pObj)
-{
-	REF_PTR_SET(m_renderObj, pObj);
-}
-
-void MapObject::setBridgeRenderObject( BridgeTowerType type, RenderObjClass* renderObj )
-{
-
-	if( type >= 0 && type < BRIDGE_MAX_TOWERS )
-		REF_PTR_SET( m_bridgeTowers[ type ], renderObj );
-
-}
-
-RenderObjClass* MapObject::getBridgeRenderObject( BridgeTowerType type )
-{
-
-	if( type >= 0 && type < BRIDGE_MAX_TOWERS )
-		return m_bridgeTowers[ type ];
-	return NULL;
-
-}
-
-void MapObject::validate(void)
-{
-	verifyValidTeam();
-	verifyValidUniqueID();
-}
-
-void MapObject::verifyValidTeam(void)
-{
-	// if this map object has a valid team, then do nothing.
-	// if it has an invalid team, the place it on the default neutral team, (by clearing the 
-	// existing team name.)
-	Bool exists;
-	AsciiString teamName = getProperties()->getAsciiString(TheKey_originalOwner, &exists);
-	if (exists) {
-		Bool valid = false;
-
-		int numSides = TheSidesList->getNumTeams();
-
-		for (int i = 0; i < numSides; ++i) {
-			TeamsInfo *teamInfo = TheSidesList->getTeamInfo(i);
-			if (!teamInfo) {
-				continue;
-			}
-			
-			Bool itBetter;
-			AsciiString testAgainstTeamName = teamInfo->getDict()->getAsciiString(TheKey_teamName, &itBetter);
-			if (itBetter) {
-				if (testAgainstTeamName.compare(teamName) == 0) {
-					valid = true;
-				}
-			}
-		}
-
-		if (!valid) {
-			getProperties()->remove(TheKey_originalOwner);
-		}
-	}
-}
-
-void MapObject::verifyValidUniqueID(void)
-{
-	Bool exists;
-	AsciiString uniqueID = getProperties()->getAsciiString(TheKey_uniqueID, &exists);
-	MapObject *obj = MapObject::getFirstMapObject();
-
-	// -1 is the sentinel
-	int highestIndex = -1;
-
-	while (obj) {
-		if (obj == this) {
-			// the first object is THIS OBJECT, cause we've already been added. 
-			obj = obj->getNext();
-			continue;
-		}
-
-		if (obj->isWaypoint()) {
-			// waypoints throw this off. Sad but true. :-(
-			obj = obj->getNext();
-			continue;
-		}
-
-		Bool iterateExists;
-		AsciiString tempStr = obj->getProperties()->getAsciiString(TheKey_uniqueID, &iterateExists);
-		const char* lastSpace = tempStr.reverseFind(' ');
-
-		int testIndex = -1; 
-		if (lastSpace) {
-			testIndex = atoi(lastSpace);
-		}
-
-		if (testIndex > highestIndex) {
-			highestIndex = testIndex;
-		}
-		break;
-	}
-
-	int indexOfThisObject = highestIndex + 1;
-	
-	const char* thingName;
-	if (getThingTemplate()) {
-		thingName = getThingTemplate()->getName().str();
-	} else if (isWaypoint()) {
-		thingName = getWaypointName().str();
-	} else {
-		thingName = getName().str();
-	}
-	const char* pName = thingName;
-
-	while (*thingName) {
-		if ((*thingName) == '/') {
-			pName = thingName + 1;
-		}
-		++thingName;
-	}
-
-	AsciiString newID;
-	if (isWaypoint()) {
-		newID.format("%s", pName);
-	} else {
-		newID.format("%s %d", pName, indexOfThisObject);
-	}
-	getProperties()->setAsciiString(TheKey_uniqueID, newID);
-}
-
-void MapObject::fastAssignAllUniqueIDs(void)
-{
-	// here's what we do. Take all of them, push them onto a stack. Then, pop each one, setting its id.
-	// should be much faster than what we currently do.
-
-	MapObject *pMapObj = getFirstMapObject();
-
-	std::stack<MapObject*> objStack;
-	Int actualNumObjects = 0;
-	
-	while (pMapObj) {
-		++actualNumObjects;
-		objStack.push(pMapObj);
-		pMapObj = pMapObj->getNext();
-	}
-
-	Int indexOfThisObject = 0;
-	while (actualNumObjects) {
-		MapObject *obj = objStack.top();
-		
-
-		const char* thingName;
-		if (obj->getThingTemplate()) {
-			thingName = obj->getThingTemplate()->getName().str();
-		} else if (obj->isWaypoint()) {
-			thingName = obj->getWaypointName().str();
-		} else {
-			thingName = obj->getName().str();
-		}
-		const char* pName = thingName;
-
-		while (*thingName) {
-			if ((*thingName) == '/') {
-				pName = thingName + 1;
-			}
-			++thingName;
-		}
-
-		AsciiString newID;
-		if (obj->isWaypoint()) {
-			newID.format("%s", pName);
-		} else {
-			newID.format("%s %d", pName, indexOfThisObject);
-		}
-
-		obj->getProperties()->setAsciiString(TheKey_uniqueID, newID);
-		objStack.pop();
-	
-		++indexOfThisObject;
-		--actualNumObjects;
-	}
-}
-
-
-
-void MapObject::setThingTemplate(const ThingTemplate *thing)
-{
-	m_thingTemplate = thing;
-	m_objectName = thing->getName();
-}
-
-
-void MapObject::setName(AsciiString name)
-{
-	m_objectName = name;
-}
-
-WaypointID MapObject::getWaypointID() { return (WaypointID)getProperties()->getInt(TheKey_waypointID); }
-AsciiString MapObject::getWaypointName() { return getProperties()->getAsciiString(TheKey_waypointName); }
-void MapObject::setWaypointID(Int i) { getProperties()->setInt(TheKey_waypointID, i); }
-void MapObject::setWaypointName(AsciiString n) { getProperties()->setAsciiString(TheKey_waypointName, n); }
-
-/*static */ Int MapObject::countMapObjectsWithOwner(const AsciiString& n)
-{
-	Int count = 0;
-	for (MapObject *pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
-	{
-		if (pMapObj->getProperties()->getAsciiString(TheKey_originalOwner) == n)
-			++count;
-	}
-	return count;
-}
-
-//-------------------------------------------------------------------------------------------------
-const ThingTemplate *MapObject::getThingTemplate( void ) const
-{
-	if (m_thingTemplate)
-		return (const ThingTemplate*) m_thingTemplate->getFinalOverride(); 
-	
-	return NULL;
-}
-
-
-/* ********* WorldHeightMap class ****************************/
-
-TileData *WorldHeightMap::m_alphaTiles[NUM_ALPHA_TILES]={0,0,0,0,0,0,0,0,0,0,0,0};
-
-//
-// WorldHeightMap destructor .
-//
-WorldHeightMap::~WorldHeightMap(void)
-{
-	if (m_data) {
-		delete[](m_data);
-		m_data = NULL;
-	}
-	if (m_tileNdxes) {
-		delete[](m_tileNdxes);
-		m_tileNdxes = NULL;
-	}
-	if (m_blendTileNdxes) {
-		delete[](m_blendTileNdxes);
-		m_blendTileNdxes = NULL;
-	}
-	if (m_extraBlendTileNdxes) {
-		delete[](m_extraBlendTileNdxes);
-		m_extraBlendTileNdxes = NULL;
-	}
-	if (m_cliffInfoNdxes) {
-		delete[](m_cliffInfoNdxes);
-		m_cliffInfoNdxes = NULL;
-	}
-	if (m_cellFlipState)
-	{	delete[](m_cellFlipState);
-		m_cellFlipState = NULL;
-	}
-	if (m_seismicUpdateFlag)
-	{	delete[](m_seismicUpdateFlag);
-		m_seismicUpdateFlag = NULL;
-	}
-	if (m_seismicZVelocities)
-	{	delete[](m_seismicZVelocities);
-		m_seismicZVelocities = NULL;
-	}
-	if (m_cellCliffState)
-	{	delete[](m_cellCliffState);
-		m_cellCliffState = NULL;
-	}
-	int i;
-	for (i=0; i<NUM_SOURCE_TILES; i++) {
-		REF_PTR_RELEASE(m_sourceTiles[i]);
-		REF_PTR_RELEASE(m_edgeTiles[i]);
-	}
-	for (i=0; i<NUM_ALPHA_TILES; i++) {
-		REF_PTR_RELEASE(m_alphaTiles[i]);
-	}
-	REF_PTR_RELEASE(m_terrainTex);
-	REF_PTR_RELEASE(m_alphaTerrainTex);
-	REF_PTR_RELEASE(m_alphaEdgeTex);
-}
-
-void WorldHeightMap::freeListOfMapObjects(void)
-{
-	if (MapObject::TheMapObjectListPtr) 
-	{
-		deleteInstance(MapObject::TheMapObjectListPtr);
-		MapObject::TheMapObjectListPtr = NULL;
-	}
-	MapObject::getWorldDict()->clear();
-}
-
-
-/**
- WorldHeightMap - create a new height map for class WorldHeightMap.
- Note that there is 1 m_numBlendedTiles, which is the implied
- transparent tile for non-blended tiles.
-*/
-WorldHeightMap::WorldHeightMap():
-	m_width(0), m_height(0),  m_dataSize(0), m_data(NULL), m_cellFlipState(NULL), m_seismicUpdateFlag(NULL), m_seismicZVelocities(NULL),
-	m_drawOriginX(0), m_drawOriginY(0), 
-	m_numTextureClasses(0),	
-	m_drawWidthX(NORMAL_DRAW_WIDTH), m_drawHeightY(NORMAL_DRAW_HEIGHT), 
-	m_tileNdxes(NULL), m_blendTileNdxes(NULL), m_extraBlendTileNdxes(NULL), m_cliffInfoNdxes(NULL),
-	m_terrainTexHeight(1), m_alphaTexHeight(1),	m_cellCliffState(NULL),
-#ifdef EVAL_TILING_MODES
-	m_tileMode(TILE_4x4),
-#endif
-	m_numCliffInfo(1),
-	m_terrainTex(NULL), m_alphaTerrainTex(NULL), m_numBitmapTiles(0), m_numBlendedTiles(1)
-{
-	Int i;
-	for (i=0; i<NUM_SOURCE_TILES; i++) {
-		m_sourceTiles[i] = NULL;
-		m_edgeTiles[i] = NULL;
-	}
-
-	TheSidesList->validateSides();
-	setupAlphaTiles();
-}
-
-#ifdef EVAL_TILING_MODES
-static Bool ParseFunkyTilingDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	WorldHeightMap *pThis = (WorldHeightMap *)userData;
-	*((Int *)&pThis->m_tileMode) = file.readInt();
-	return true;
-}
-#endif
-
-/**
-* WorldHeightMap - read a height map from a file.
-* Format is  Chunky.
-*
-*	Input: ChunkInputStream, 
-*		
-*/
-WorldHeightMap::WorldHeightMap(ChunkInputStream *pStrm, Bool logicalDataOnly):
-	m_width(0), m_height(0),  m_dataSize(0), m_data(NULL), m_cellFlipState(NULL), m_seismicUpdateFlag(NULL), m_seismicZVelocities(NULL),
-	m_drawOriginX(0),	m_cellCliffState(NULL), m_drawOriginY(0),
-	m_numTextureClasses(0),	
-	m_drawWidthX(NORMAL_DRAW_WIDTH), m_drawHeightY(NORMAL_DRAW_HEIGHT), 
-	m_tileNdxes(NULL), m_blendTileNdxes(NULL), m_extraBlendTileNdxes(NULL), m_cliffInfoNdxes(NULL),
-	m_terrainTexHeight(1), m_alphaTexHeight(1),
-#ifdef EVAL_TILING_MODES
-	m_tileMode(TILE_4x4),
-#endif
-	m_numCliffInfo(1),
-	m_terrainTex(NULL), m_alphaTerrainTex(NULL), m_numBitmapTiles(0), m_numBlendedTiles(1)
-{
-
-	int i;
-	for (i=0; i<NUM_SOURCE_TILES; i++) {
-		m_sourceTiles[i]=NULL;
-		m_edgeTiles[i]=NULL;
-	}
-	if (TheGlobalData && TheGlobalData->m_stretchTerrain) {
-		m_drawWidthX=STRETCH_DRAW_WIDTH;
-		m_drawHeightY=STRETCH_DRAW_HEIGHT;
-	}
-
-	DataChunkInput file( pStrm );
-
-	if (logicalDataOnly) {
-		file.registerParser( AsciiString("HeightMapData"), AsciiString::TheEmptyString, ParseSizeOnlyInChunk );
-		file.registerParser( AsciiString("WorldInfo"), AsciiString::TheEmptyString, ParseWorldDictDataChunk );
-		file.registerParser( AsciiString("ObjectsList"), AsciiString::TheEmptyString, ParseObjectsDataChunk );
-		freeListOfMapObjects(); // just in case.
-		file.registerParser( AsciiString("PolygonTriggers"), AsciiString::TheEmptyString, PolygonTrigger::ParsePolygonTriggersDataChunk );
-		PolygonTrigger::deleteTriggers(); // just in case.
-		TheSidesList->emptySides();
-		file.registerParser(AsciiString("SidesList"), AsciiString::TheEmptyString,	SidesList::ParseSidesDataChunk );
-	}	else {
-		file.registerParser( AsciiString("HeightMapData"), AsciiString::TheEmptyString, ParseHeightMapDataChunk );
-		file.registerParser( AsciiString("BlendTileData"), AsciiString::TheEmptyString, ParseBlendTileDataChunk );
-#ifdef EVAL_TILING_MODES
-		file.registerParser( AsciiString("FUNKY_TILING"), AsciiString::TheEmptyString, ParseFunkyTilingDataChunk );
-#endif
-		file.registerParser( AsciiString("GlobalLighting"), AsciiString::TheEmptyString, ParseLightingDataChunk );
-	}
-	if (!file.parse(this)) {
-    
-		throw(ERROR_CORRUPT_FILE_FORMAT);
-	}
-	// patch bad maps. 
-	if (!logicalDataOnly) {
-		for(i=0; i<m_dataSize; i++) {
-			if (m_cliffInfoNdxes[i]<0 || m_cliffInfoNdxes[i]>= m_numCliffInfo) {
-				m_cliffInfoNdxes[i] = 0;		
-			}
-			if (m_blendTileNdxes[i]<0 || m_blendTileNdxes[i]>= m_numBlendedTiles) {
-				m_blendTileNdxes[i] = 0;		
-			}
-			if (m_extraBlendTileNdxes[i]<0 || m_extraBlendTileNdxes[i]>= m_numBlendedTiles) {
-				m_extraBlendTileNdxes[i] = 0;		
-			}
-		}
-	}
-	if (TheGlobalData && TheGlobalData->m_drawEntireTerrain) {
-		m_drawWidthX=m_width;
-		m_drawHeightY=m_height;
-	}
-	if (m_drawWidthX > m_width) {
-		m_drawWidthX = m_width;
-	}
-	if (m_drawHeightY > m_height) {
-		m_drawHeightY = m_height;
-	}
-
-	TheSidesList->validateSides();
-	setupAlphaTiles();
-}
-
-/** Optimized version of method to get triangle flip state of a terrain cell.  Use this
-*	instead of getAlphaUVData() whenever possible.
-*/
-Bool WorldHeightMap::getFlipState(Int xIndex, Int yIndex) const
-{
-	if (xIndex<0 || yIndex<0) return false;
-	if (yIndex>=m_height) return false;
-	if (xIndex>=m_width) return false;
-	if (!m_cellFlipState) return false;
-	return m_cellFlipState[yIndex*m_flipStateWidth + (xIndex >> 3)] & (1<<(xIndex&0x7));
-}
-
-/** Sets the value of the flip state bit.
-*/
-void WorldHeightMap::setFlipState(Int xIndex, Int yIndex, Bool value) 
-{
-	if (xIndex<0 || yIndex<0) return ;
-	if (yIndex>=m_height) return ;
-	if (xIndex>=m_width) return ;
-	if (!m_cellFlipState) return ;
-	UnsignedByte *curVal = &m_cellFlipState[yIndex*m_flipStateWidth + (xIndex >> 3)];
-	if (value) {
-		*curVal |= (1<<(xIndex&0x7));
-	}	else {
-		*curVal &= ~(1<<(xIndex&0x7));
-	}
-}
-
-/** Clears all flip state bits.
-*/
-void WorldHeightMap::clearFlipStates(void) {
-	if (m_cellFlipState) {
-		memset(m_cellFlipState,0,m_flipStateWidth*m_height);	//clear all flags
-	}
-}
-
-
-
-
-//////////////////////////////////////////////////////////////////////////////m_SeismicUpdateFlag
-Bool WorldHeightMap::getSeismicUpdateFlag(Int xIndex, Int yIndex) const
-{
-	if (xIndex<0 || yIndex<0) return false;
-	if (yIndex>=m_height) return false;
-	if (xIndex>=m_width) return false;
-	if (!m_seismicUpdateFlag) return false;
-	return m_seismicUpdateFlag[yIndex*m_seismicUpdateWidth + (xIndex >> 3)] & (1<<(xIndex&0x7));
-}
-void WorldHeightMap::setSeismicUpdateFlag(Int xIndex, Int yIndex, Bool value) 
-{
-	if (xIndex<0 || yIndex<0) return ;
-	if (yIndex>=m_height) return ;
-	if (xIndex>=m_width) return ;
-	if (!m_seismicUpdateFlag) return ;
-	UnsignedByte *curVal = &m_seismicUpdateFlag[yIndex*m_seismicUpdateWidth + (xIndex >> 3)];
-	if (value) {
-		*curVal |= (1<<(xIndex&0x7));
-	}	else {
-		*curVal &= ~(1<<(xIndex&0x7));
-	}
-}
-void WorldHeightMap::clearSeismicUpdateFlags(void) 
-{
-	if (m_seismicUpdateFlag) {
-		memset(m_seismicUpdateFlag,0,m_seismicUpdateWidth*m_height);	//clear all flags
-	}
-}
-
-///////////////////////////////////////////////m_SeismicZVelocities
-Real WorldHeightMap::getSeismicZVelocity(Int xIndex, Int yIndex) const
-{
-	if (xIndex<0 || yIndex<0) return false;
-	if (yIndex>=m_height) return false;
-	if (xIndex>=m_width) return false;
-	if (!m_seismicZVelocities) return false;
-	return m_seismicZVelocities[yIndex*m_width + xIndex];
-}
-void WorldHeightMap::setSeismicZVelocity(Int xIndex, Int yIndex, Real value) 
-{
-	if (xIndex<0 || yIndex<0) return ;
-	if (yIndex>=m_height) return ;
-	if (xIndex>=m_width) return ;
-	if (!m_seismicZVelocities) return ;
-	m_seismicZVelocities[yIndex*m_width + xIndex] = value;
-}
-void WorldHeightMap::fillSeismicZVelocities( Real value ) 
-{
-	if (!m_seismicZVelocities) return ;
-  for (Int idx = 0; idx < m_width*m_height; ++idx)
-    m_seismicZVelocities[idx] = value;
-}
-
-Real WorldHeightMap::getBilinearSampleSeismicZVelocity( Int x, Int y)
-{
-	if ( x < 0 || y < 0 ) return 0;
-	if ( y >= m_height ) return 0;
-	if ( x >= m_width ) return 0;
-	if (!m_seismicZVelocities) return 0;
-
-  Real collector = 0.0f;
-  Real divisor = 0.0f;
-
-  collector += m_seismicZVelocities[ y * m_width + x ];
-  ++divisor;
-
-  if ( y > 0 )
-  {
-    collector += m_seismicZVelocities[ (y-1) * m_width + x ];//bottom
-    ++divisor;
-
-    if( x > 0 )
-    {
-      collector += m_seismicZVelocities[ (y-1) * m_width + (x-1) ];//lower left
-      ++divisor;
-    }
-    if ( x < m_width-1 )
-    {
-      collector += m_seismicZVelocities[ (y-1) * m_width + (x+1) ];//lower right
-      ++divisor;
-    }
-  }
-  if ( y < m_height-1 )
-  {
-    collector += m_seismicZVelocities[ (y+1) * m_width + x ];//top
-    ++divisor;
-
-    if( x > 0 )
-    {
-      collector += m_seismicZVelocities[ (y+1) * m_width + (x-1) ];//upper left
-      ++divisor;
-    }
-    if ( x < m_width-1 )
-    {
-      collector += m_seismicZVelocities[ (y+1) * m_width + (x+1) ];//upper right
-      ++divisor;
-    }
-  }
-  if( x > 0 )
-  {
-    collector += m_seismicZVelocities[ y * m_width + (x-1) ];//left
-    ++divisor;
-  }
-  if ( x < m_width-1 )
-  {
-    collector += m_seismicZVelocities[ y * m_width + (x+1) ];//right
-    ++divisor;
-  }
-
-  collector /= divisor;
-
-  return collector;
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/** Get whether the cell is a cliff cell (impassable to ground vehicles).
-*/
-Bool WorldHeightMap::getCliffState(Int xIndex, Int yIndex) const
-{
-	if (xIndex<0 || yIndex<0) return false;
-	if (yIndex>=m_height) return false;
-	if (xIndex>=m_width) return false;
-	if (!m_cellCliffState) return false;
-	return m_cellCliffState[yIndex*m_flipStateWidth + (xIndex >> 3)] & (1<<(xIndex&0x7));
-}
-
-//=============================================================================
-// setCliffState
-//=============================================================================
-/** Sets the cliff state for a given cell. */
-//=============================================================================
-void WorldHeightMap::setCliffState(Int xIndex, Int yIndex, Bool state) 
-{
-	if (xIndex<0 || yIndex<0) return;
-	if (yIndex>=m_height) return;
-	if (xIndex>=m_width) return;
-	if (!m_cellCliffState) return;
-	UnsignedByte	flagByte = m_cellCliffState[yIndex*m_flipStateWidth + (xIndex >> 3)];
-	UnsignedByte flagMask = (1<<(xIndex&0x7));
-	if (state) {
-		flagByte |= flagMask;
-	} else {
-		flagByte &= (~flagMask);
-	}
-	m_cellCliffState[yIndex*m_flipStateWidth + (xIndex >> 3)] = flagByte;
-}
-
-Bool WorldHeightMap::ParseWorldDictDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	Dict d = file.readDict();
-	*MapObject::getWorldDict() = d;
-	Bool exists;
-	Int theWeather = MapObject::getWorldDict()->getInt(TheKey_weather, &exists);
-	if (exists) {
-		TheWritableGlobalData->m_weather = (Weather) theWeather;
-	}
-	return true;
-}
-
-/**
-* WorldHeightMap::ParseLightingDataChunk - read a global lights chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseLightingDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-		TheWritableGlobalData->m_timeOfDay = (TimeOfDay)file.readInt();
-		Int i;
-		GlobalData::TerrainLighting	initLightValues	= { { 0,0,0},{0,0,0},{0,0,-1.0f}};
-
-		// initialize the directions of the lights to not be totally invalid, in case old maps are read
-		for (i=0; i<4; i++) {
-			for (Int j=0;j<MAX_GLOBAL_LIGHTS; j++) {
-				TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j]=initLightValues;
-				TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j]=initLightValues;
-			}
-		}
-
-		for (i=0; i<4; i++) {
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].ambient.red = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].ambient.green = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].ambient.blue = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].diffuse.red = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].diffuse.green = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].diffuse.blue = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].lightPos.x = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].lightPos.y = file.readReal();
-			TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][0].lightPos.z = file.readReal();
-
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].ambient.red = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].ambient.green = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].ambient.blue = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].diffuse.red = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].diffuse.green = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].diffuse.blue = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].lightPos.x = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].lightPos.y = file.readReal();
-			TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][0].lightPos.z = file.readReal();
-
-			if (info->version >= K_LIGHTING_VERSION_2) {
-				for (Int j=1; j<3; j++)	//added support for 2 extra object lights
-				{
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].ambient.red = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].ambient.green = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].ambient.blue = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].diffuse.red = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].diffuse.green = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].diffuse.blue = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].lightPos.x = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].lightPos.y = file.readReal();
-					TheWritableGlobalData->m_terrainObjectsLighting[i+TIME_OF_DAY_FIRST][j].lightPos.z = file.readReal();
-				}
-			}
-			if (info->version >= K_LIGHTING_VERSION_3) {
-				for (Int j=1; j<3; j++)	//added support for 2 extra terrain lights
-				{
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].ambient.red = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].ambient.green = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].ambient.blue = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].diffuse.red = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].diffuse.green = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].diffuse.blue = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].lightPos.x = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].lightPos.y = file.readReal();
-					TheWritableGlobalData->m_terrainLighting[i+TIME_OF_DAY_FIRST][j].lightPos.z = file.readReal();
-				}
-			}
-		}
-		if (!file.atEndOfChunk()) {
-			UnsignedInt shadowColor = file.readInt();
-			if (TheW3DShadowManager) {
-				TheW3DShadowManager->setShadowColor(shadowColor);
-			}
-		}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
-	return true;
-}
-
-/**
-* WorldHeightMap::ParseObjectsDataChunk - read a height map chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	file.m_currentObject = NULL;
-	file.registerParser( AsciiString("Object"), info->label, ParseObjectDataChunk );
-	return (file.parse(userData));
-}
-
-/**
-* WorldHeightMap::ParseHeightMapData - read a height map chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseHeightMapDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	WorldHeightMap *pThis = (WorldHeightMap *)userData;
-	return pThis->ParseHeightMapData(file, info, userData);
-}
-
-/**
-* WorldHeightMap::ParseHeightMapData - read a height map chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseHeightMapData(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	m_width = file.readInt();
-	m_height = file.readInt();
-	if (info->version >= K_HEIGHT_MAP_VERSION_3) {
-		m_borderSize = file.readInt();
-	} else {
-		m_borderSize = 0;
-	}
-
-	if (info->version >= K_HEIGHT_MAP_VERSION_4) {
-		Int numBorders = file.readInt();
-		m_boundaries.resize(numBorders);
-		for (int i = 0; i < numBorders; ++i) {
-			m_boundaries[i].x = file.readInt();
-			m_boundaries[i].y = file.readInt();
-		}
-	} else {
-		m_boundaries.resize(1);
-		m_boundaries[0].x = m_width - 2 * m_borderSize;
-		m_boundaries[0].y = m_height - 2 * m_borderSize;
-	}
-
-	m_dataSize = file.readInt();
-	m_data = MSGNEW("WorldHeightMap_ParseHeightMapData") UnsignedByte[m_dataSize];
-	if (m_dataSize <= 0 || (m_dataSize != (m_width*m_height))) {
-		throw ERROR_CORRUPT_FILE_FORMAT	;
-	}
-
-	Int numBytesX = (m_width+7)/8;	//how many bytes to fit all bitflags
-	Int numBytesY = m_height;	
-	m_seismicUpdateWidth=numBytesX;
-	m_seismicUpdateFlag	= MSGNEW("WorldHeightMap::ParseHeightMapData _ m_seismicUpdateFlag allocated") UnsignedByte[numBytesX*numBytesY];
-  clearSeismicUpdateFlags();
-  m_seismicZVelocities = MSGNEW("WorldHeightMap_ParseHeightMapData _ zvelocities allocated") Real[m_dataSize];
-  fillSeismicZVelocities( 0 );
-
-
-	file.readArrayOfBytes((char *)m_data, m_dataSize);
-	// Resize me. 
-	if (info->version == K_HEIGHT_MAP_VERSION_1) {
-		Int newWidth = (m_width+1)/2;
-		Int newHeight = (m_height+1)/2;
-		Int i, j;
-		for (i=0; i<newHeight; i++) {
-			for (j=0; j<newWidth; j++) {
-				m_data[i*newWidth+j] = m_data[2*i*m_width+2*j];
-			}
-		}
-	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
-	return true;
-}
-
-/**
-* WorldHeightMap::ParseHeightMapData - read a height map chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseSizeOnlyInChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	WorldHeightMap *pThis = (WorldHeightMap *)userData;
-	return pThis->ParseSizeOnly(file, info, userData);
-}
-
-/**
-* WorldHeightMap::ParseHeightMapData - read a height map chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseSizeOnly(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	m_width = file.readInt();
-	m_height = file.readInt();
-	if (info->version >= K_HEIGHT_MAP_VERSION_3) {
-		m_borderSize = file.readInt();
-	} else {
-		m_borderSize = 0;
-	}
-
-	if (info->version >= K_HEIGHT_MAP_VERSION_4) {
-		Int numBorders = file.readInt();
-		m_boundaries.resize(numBorders);
-		for (int i = 0; i < numBorders; ++i) {
-			m_boundaries[i].x = file.readInt();
-			m_boundaries[i].y = file.readInt();
-		}
-	} else {
-		m_boundaries.resize(1);
-		m_boundaries[0].x = m_width - 2 * m_borderSize;
-		m_boundaries[0].y = m_height - 2 * m_borderSize;
-	}
-
-	m_dataSize = file.readInt();
-	m_data = MSGNEW("WorldHeightMap_ParseSizeOnly") UnsignedByte[m_dataSize];
-	if (m_dataSize <= 0 || (m_dataSize != (m_width*m_height))) {
-		throw ERROR_CORRUPT_FILE_FORMAT	;
-	}
-	file.readArrayOfBytes((char *)m_data, m_dataSize);
-	// Resize me. 
-	if (info->version == K_HEIGHT_MAP_VERSION_1) {
-		Int newWidth = (m_width+1)/2;
-		Int newHeight = (m_height+1)/2;
-		Int i, j;
-		for (i=0; i<newHeight; i++) {
-			for (j=0; j<newWidth; j++) {
-				m_data[i*newWidth+j] = m_data[2*i*m_width+2*j];
-			}
-		}
-		m_width = newWidth;
-		m_height = newHeight;
-	}
-	return true;
-}
-
-/**
-* WorldHeightMap::ParseBlendTileDataChunk - read a blend tile info chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseBlendTileDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	WorldHeightMap *pThis = (WorldHeightMap *)userData;
-	return pThis->ParseBlendTileData(file, info, userData);
-}
-
-/** Function to read in the tiles for a texture class. */
-void WorldHeightMap::readTexClass(TXTextureClass *texClass, TileData **tileData) 
-{
-	char path[_MAX_PATH];
-	path[0] = 0;
-	File *theFile = NULL;
-
-	// get the file from the description in TheTerrainTypes
-	TerrainType *terrain = TheTerrainTypes->findTerrain( texClass->name );
-	char texturePath[ _MAX_PATH ];
-	if (terrain==NULL) 
-	{
-#ifdef LOAD_TEST_ASSETS
-		theFile = TheFileSystem->openFile( texClass->name.str(), File::READ|File::BINARY);
-#endif
-	} 
-	else 
-	{
-		sprintf( texturePath, "%s%s", TERRAIN_TGA_DIR_PATH, terrain->getTexture().str() );
-		theFile = TheFileSystem->openFile( texturePath, File::READ|File::BINARY);
-	}
-
-	if (theFile != NULL) {
-		GDIFileStream theStream(theFile);
-		InputStream *pStr = &theStream;
-		Int numTiles = WorldHeightMap::countTiles(pStr);
-		theFile->seek(0, File::START);
-		if (numTiles >= texClass->numTiles) { 
-			numTiles = texClass->numTiles;
-			Int width;
-			for (width = 10; width >= 1; width--) {
-				if (numTiles >= width*width) {
-					numTiles = width*width;
-					break;
-				}
-			}
-			WorldHeightMap::readTiles(pStr, tileData+texClass->firstTile, width);						
-		}
-		theFile->close();
-	}
-}
-
-/**
-* WorldHeightMap::ParseBlendTileData - read a blend tile info chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseBlendTileData(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	int i, j;
-	Int len = file.readInt();
-	if (m_dataSize != len) {
-		throw ERROR_CORRUPT_FILE_FORMAT	;
-	}
-	m_tileNdxes = MSGNEW("WorldHeightMap_ParseBlendTileData") Short[m_dataSize];
-	m_cliffInfoNdxes = MSGNEW("WorldHeightMap_ParseBlendTileData") Short[m_dataSize]; 
-	m_blendTileNdxes = MSGNEW("WorldHeightMap_ParseBlendTileData") Short[m_dataSize];
-	m_extraBlendTileNdxes = MSGNEW("WorldHeightMap_ParseBlendTileData") Short[m_dataSize];
-	// Note - we have one less cell than the width & height. But for paranoia, allocate
-	// extra row. jba.
-	// 
-	Int numBytesX = (m_width+7)/8;	//how many bytes to fit all bitflags
-	Int numBytesY = m_height;	
-
-	m_flipStateWidth=numBytesX;
-
-	m_cellFlipState	= MSGNEW("WorldHeightMap_getTerrainTexture") UnsignedByte[numBytesX*numBytesY];
-	m_cellCliffState	= MSGNEW("WorldHeightMap_getTerrainTexture") UnsignedByte[numBytesX*numBytesY];
-	memset(m_cellFlipState,0,numBytesX*numBytesY);	//clear all flags
-	memset(m_cellCliffState,0,numBytesX*numBytesY);	//clear all flags
-
-	file.readArrayOfBytes((char*)m_tileNdxes, m_dataSize*sizeof(Short));
-	file.readArrayOfBytes((char*)m_blendTileNdxes, m_dataSize*sizeof(Short));
-	if (info->version >= K_BLEND_TILE_VERSION_6) {
-		file.readArrayOfBytes((char*)m_extraBlendTileNdxes, m_dataSize*sizeof(Short));
-		//Allow clearing of extra blend tiles via ini and resaving of map.
-		//Useful for flushing out initial maps made with buggy 3-way blending.
-		if (!TheGlobalData->m_use3WayTerrainBlends)
-			memset(m_extraBlendTileNdxes,0,m_dataSize*sizeof(Short));		
-	} 
-	if (info->version >= K_BLEND_TILE_VERSION_5) {
-		file.readArrayOfBytes((char*)m_cliffInfoNdxes, m_dataSize*sizeof(Short));
-	} 
-	if (info->version >= K_BLEND_TILE_VERSION_7) {
-		if (info->version==K_BLEND_TILE_VERSION_7) {
-			Int byteWidth = (m_width+1)/8; // previous incorrect length that got used to save the file.  jba. [4/3/2003]
-			UnsignedByte *data = new UnsignedByte[m_height*byteWidth];
-			file.readArrayOfBytes((char*)data, m_height*byteWidth);
-			for (j=0; j<m_height; j++) {
-				for (i=0; i<byteWidth; i++) {
-					m_cellCliffState[j*m_flipStateWidth + i] = data[j*byteWidth + i];
-				}
-			}
-		} else {
-			file.readArrayOfBytes((char*)m_cellCliffState, m_height*m_flipStateWidth);
-		}
-	} else {
-		initCliffFlagsFromHeights();
-	}
-	m_numBitmapTiles = file.readInt();
-	DEBUG_ASSERTCRASH(m_numBitmapTiles>0 && m_numBitmapTiles<2048, ("Unlikely numBitmapTiles."));
-	m_numBlendedTiles = file.readInt();
-	DEBUG_ASSERTCRASH(m_numBlendedTiles>0 && m_numBlendedTiles<NUM_BLEND_TILES+1, ("Unlikely numBlendedTiles."));
-	if (info->version >= K_BLEND_TILE_VERSION_5) {
-		m_numCliffInfo = file.readInt();
-	} else {
-		m_numCliffInfo = 1;	// cliffInfo[0] is the default info.
-	}
-// --> file loading here
-	m_numTextureClasses	= file.readInt();
-	DEBUG_ASSERTCRASH(m_numTextureClasses>0 && m_numTextureClasses<200, ("Unlikely m_numTextureClasses."));
-	for (i=0; i<m_numTextureClasses; i++) {
-		m_textureClasses[i].globalTextureClass = -1;
-		m_textureClasses[i].firstTile = file.readInt();
-		m_textureClasses[i].numTiles = file.readInt();
-		m_textureClasses[i].width = file.readInt();
-
-		// legacy GDF data
-		// used to read "m_textureClasses[i].isGDF = file.readInt();"
-	/*	Int legacy = */ file.readInt();
-
-		m_textureClasses[i].name = file.readAsciiString();
-		readTexClass(&m_textureClasses[i], m_sourceTiles);
-	}
-	m_numEdgeTextureClasses = 0;
-	m_numEdgeTiles = 0;
-	if (info->version >= K_BLEND_TILE_VERSION_4) {
-		m_numEdgeTiles	= file.readInt();
-		m_numEdgeTextureClasses	= file.readInt();
-		for (i=0; i<m_numEdgeTextureClasses; i++) {
-			m_edgeTextureClasses[i].globalTextureClass = -1;
-			m_edgeTextureClasses[i].firstTile = file.readInt();
-			m_edgeTextureClasses[i].numTiles = file.readInt();
-			m_edgeTextureClasses[i].width = file.readInt();
-			m_edgeTextureClasses[i].name = file.readAsciiString();
-			readTexClass(&m_edgeTextureClasses[i], m_edgeTiles);
-		}
-	}
-	for (i=1; i<m_numBlendedTiles; i++) {
-		Int flag;
-		m_blendedTiles[i].blendNdx = file.readInt();
-		m_blendedTiles[i].horiz = file.readByte();
-		m_blendedTiles[i].vert = file.readByte();
-		m_blendedTiles[i].rightDiagonal = file.readByte();
-		m_blendedTiles[i].leftDiagonal = file.readByte();
-		m_blendedTiles[i].inverted = file.readByte();
-		//Allow clearing of extra blend tiles via ini and resaving of map.
-		//Useful for flushing out initial maps made with buggy 3-way blending.
-		if (!TheGlobalData->m_use3WayTerrainBlends)
-			m_blendedTiles[i].inverted &= ~FLIPPED_MASK;	//filter out extra flips from 3-way
-
-		if (info->version >= K_BLEND_TILE_VERSION_3) {
-			m_blendedTiles[i].longDiagonal = file.readByte();
-		} else {
-			m_blendedTiles[i].longDiagonal = false;
-		}
-		if (info->version >= K_BLEND_TILE_VERSION_4) {
-			m_blendedTiles[i].customBlendEdgeClass = file.readInt();
-		} else {
-			m_blendedTiles[i].customBlendEdgeClass = -1;
-		}
-		
-		flag = file.readInt();
-		DEBUG_ASSERTCRASH(flag==FLAG_VAL, ("Invalid format."));
-		if (flag != FLAG_VAL) {
-			throw ERROR_CORRUPT_FILE_FORMAT;
-		}
-	}
-	if (info->version >= K_BLEND_TILE_VERSION_5) {
-		for (i=1; i<m_numCliffInfo; i++) {
-			m_cliffInfo[i].tileIndex = file.readInt();
-			m_cliffInfo[i].u0 = file.readReal();
-			m_cliffInfo[i].v0 = file.readReal();
-			m_cliffInfo[i].u1 = file.readReal();
-			m_cliffInfo[i].v1 = file.readReal();
-			m_cliffInfo[i].u2 = file.readReal();
-			m_cliffInfo[i].v2 = file.readReal();
-			m_cliffInfo[i].u3 = file.readReal();
-			m_cliffInfo[i].v3 = file.readReal();
-			m_cliffInfo[i].flip = file.readByte();
-			m_cliffInfo[i].mutant = file.readByte();
-		}
-	}
-	// Resize me. 
-	if (info->version == K_BLEND_TILE_VERSION_1) {
-		Int newWidth = (m_width+1)/2;
-		Int newHeight = (m_height+1)/2;
-		Int i, j;
-		for (i=0; i<newHeight; i++) {
-			for (j=0; j<newWidth; j++) {
-				m_tileNdxes[i*newWidth+j] = m_tileNdxes[2*i*m_width+2*j];
-				m_blendTileNdxes[i*newWidth+j] = 0;
-				m_extraBlendTileNdxes[i*newWidth+j] = 0;
-				m_cliffInfoNdxes[i*newWidth+j] = 0;	 
-			}
-		}
-		m_numBlendedTiles = 1;
-		m_numCliffInfo = 1;
-		m_width= newWidth;
-		m_height = newHeight;
-		m_dataSize = m_width*m_height;
-	}
-	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
-	return true;
-}
-
-
-/**
-* WorldHeightMap::ParseObjectData - read a object info chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
-{
-	WorldHeightMap *pThis = (WorldHeightMap *)file.m_userData;
-	return pThis->ParseObjectData(file, info, userData, info->version >= K_OBJECTS_VERSION_2);
-}
-
-/**
-* WorldHeightMap::ParseObjectData - read a object info chunk.
-* Format is the newer CHUNKY format.
-*	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
-*/
-Bool WorldHeightMap::ParseObjectData(DataChunkInput &file, DataChunkInfo *info, void *userData, Bool readDict)
-{
-	MapObject *pPrevious = (MapObject *)file.m_currentObject;
-
-	Coord3D loc;
-	loc.x = file.readReal();
-	loc.y = file.readReal();
-	loc.z = file.readReal();
-
-	Real minZ = -100*MAP_XY_FACTOR;
-	Real maxZ = (255*10)*MAP_HEIGHT_SCALE;
-
-	if (info->version <= K_OBJECTS_VERSION_2) {
-		loc.z = 0;
-	}
-
-	Real angle = file.readReal();
-	Int flags = file.readInt(); 
-	AsciiString name = file.readAsciiString();
-	Dict d;
-	if (readDict)
-	{
-		d = file.readDict();
-	}		 
-
-	if (loc.z<minZ || loc.z>maxZ) {
-		DEBUG_LOG(("Removing object at z height %f\n", loc.z));
-		return true;
-	}
-
-	MapObject *pThisOne;
-	
-	// create the map object
-	pThisOne = newInstance( MapObject )( loc, name, angle, flags, &d, 
-														TheThingFactory->findTemplate( name, FALSE ) );
-
-//DEBUG_LOG(("obj %s owner %s\n",name.str(),d.getAsciiString(TheKey_originalOwner).str()));
-
-	if (pThisOne->getProperties()->getType(TheKey_waypointID) == Dict::DICT_INT)
-		pThisOne->setIsWaypoint();
-
-	if (pThisOne->getProperties()->getType(TheKey_lightHeightAboveTerrain) == Dict::DICT_REAL)
-		pThisOne->setIsLight();
-
-	if (pThisOne->getProperties()->getType(TheKey_scorchType) == Dict::DICT_INT)
-		pThisOne->setIsScorch();
-	
-
-	if (pPrevious) {
-		DEBUG_ASSERTCRASH(MapObject::TheMapObjectListPtr != NULL && pPrevious->getNext() == NULL, ("Bad linkage."));
-		pPrevious->setNextMap(pThisOne);
-	}	else {
-		DEBUG_ASSERTCRASH(MapObject::TheMapObjectListPtr == NULL, ("Bad linkage."));
-		MapObject::TheMapObjectListPtr = pThisOne;
-	}
-	file.m_currentObject = pThisOne;
-	return true;
-}
-
-
-
-// Targa format:  Header
-
-typedef struct {
-	UnsignedByte	idLength;
-	UnsignedByte	colorMapType; // 0 = rgb, 1 = indexed.
-	UnsignedByte	imageType; //0x1 = indexed, 0x2 = rgb, 0x8 = rle.
-	UnsignedByte	colorMapInfo[5]; // we ignore, only do rgb.
-	Short			xOrigin;
-	Short			yOrigin;
-	Short			imageWidth;
-	Short			imageHeight;
-	UnsignedByte	pixelDepth;
-	UnsignedByte	flags; //  &0x0F = alpha channel bits, &0x10 is right to left flag,
-						   // 0x20 is top to bottom flag.  (0x0? is left to right, bottom to top)
-						   // 0x3? is top to bottom, right to left.
-} TTargaHeader;
-
-// followed by idLength bytes of ascii data
-
-// followed by pixel data
-
-// followed by optional data.
-
-
-
-/// Count how many tiles come in from a targa file.
-Int WorldHeightMap::countTiles(InputStream *pStr, Bool *halfTile)
-{
-	TTargaHeader hdr;
-	if (halfTile) {
-		*halfTile = false;
-	}
-	Int len = pStr->read(&hdr,sizeof(hdr));
-	if (len!=sizeof(hdr)) return(0);
-	Int tileWidth = hdr.imageWidth/TILE_PIXEL_EXTENT;
-	Int tileHeight = hdr.imageHeight/TILE_PIXEL_EXTENT;
-
-	if (hdr.colorMapType != 0) {
-		return(0); // we don't do indexed at this time. jba.
-	}
-	if (hdr.imageType != 0x2 && hdr.imageType != 0xA) {
-		return(0); // we don't do indexed at this time. jba.
-	}
-
-	if (hdr.pixelDepth < 24) return(false);
-	if (hdr.pixelDepth > 32) return(false);
-	// 3x3 gives 9, 
-	// 2x2 gives 4, 
-	// 1x1 gives 1, 
-	// else 0;
-	if (tileWidth>10 || tileHeight>10) return(0);  // don't do huge images, or bad files.
-	if (tileWidth>=10 && tileHeight >=10) return(100);
-	if (tileWidth>=9 && tileHeight >=9) return(81);
-	if (tileWidth>=8 && tileHeight >=8) return(64);
-	if (tileWidth>=7 && tileHeight >=7) return(49);
-	if (tileWidth>=6 && tileHeight >=6) return(36);
-	if (tileWidth>=5 && tileHeight >=5) return(25);
-	if (tileWidth>=4 && tileHeight >=4) return(16);
-	if (tileWidth>=3 && tileHeight >=3) return(9);
-	if (tileWidth>=2 && tileHeight >=2) return(4);
-	if (tileWidth>=1 && tileHeight >=1) return(1);
-	if (halfTile && hdr.imageHeight==TILE_PIXEL_EXTENT/2 && hdr.imageWidth==TILE_PIXEL_EXTENT/2) {
-		*halfTile = true;
-		return 1;
-	}
-	return(0);
-}
-/*Break down a .tga file into a collection of tiles.  numRows * numRows total tiles.*/
-Bool WorldHeightMap::readTiles(InputStream *pStr, TileData **tiles, Int numRows)
-{
-	TTargaHeader hdr;
-	pStr->read(&hdr, sizeof(hdr));
-	Int tileWidth = hdr.imageWidth/TILE_PIXEL_EXTENT;
-	Int tileHeight = hdr.imageHeight/TILE_PIXEL_EXTENT; 
-
-	if (hdr.imageHeight==TILE_PIXEL_EXTENT/2) {
-		tileHeight = 1;
-	}
-	if (hdr.imageWidth==TILE_PIXEL_EXTENT/2) {
-		tileWidth = 1;
-	}
-
-	if (tileWidth<numRows && tileHeight<numRows) {
-		return(false);
-	}
-	Bool compressed = false;
-	if (hdr.imageType & 0x08) {
-		compressed = true;
-	}
-	int row = 0;
-	int column = 0;
-	int bytesPerPixel = (hdr.pixelDepth+7)/8;
-	if (bytesPerPixel < 3) return(false);
-	if (bytesPerPixel > 4) return(false);
-	int i;
-	for (i=0; i<numRows*numRows; i++) {
-		if (tiles[i] == NULL) 
-			tiles[i] = MSGNEW("WorldHeightMap_readTiles") TileData;	
-	}
-	UnsignedByte buf[4];
-	int repeatCount = 0;
-//	Bool read = false;
-	Bool running = false;
-	for (row = 0; row < numRows*TILE_PIXEL_EXTENT; row++) {
-		for (column=0; column<hdr.imageWidth; column++) {
-			UnsignedByte r, g, b, a;
-			if (row < hdr.imageHeight) {
-				if (compressed && repeatCount==0) {
-					UnsignedByte flag;
-					pStr->read(&flag, 1);
-					repeatCount = flag&0x7f;
-					repeatCount++;
-					if (flag&0x80) {
-						running = true;
-						pStr->read(buf, bytesPerPixel);
-					} else {
-						running = false;
-					}
-				}
-				if (compressed) repeatCount--;
-				if (!running) {
-					pStr->read(buf, bytesPerPixel);
-				}
-				r = buf[2]; g = buf[1]; b = buf[0];
-				if (bytesPerPixel==4) {
-					a = buf[3];
-				} else {
-					a = 255;// solid alpha.
-				}
-			} else {
-				r = g = b = a = 0;
-			}
-			if (column >= (numRows*TILE_PIXEL_EXTENT)) continue;
-			int tileNdx = (column/TILE_PIXEL_EXTENT) + numRows*(row/TILE_PIXEL_EXTENT);
-			int pixelNdx = (column%TILE_PIXEL_EXTENT) + TILE_PIXEL_EXTENT*(row%TILE_PIXEL_EXTENT);
-
-			UnsignedByte *pixel = tiles[tileNdx]->getDataPtr();
-
-			pixel += pixelNdx*TILE_BYTES_PER_PIXEL;
-			*pixel++ = b; 
-			*pixel++ = g;
-			*pixel++ = r;
-			*pixel = a; 
-
-		}
-		DEBUG_ASSERTCRASH(repeatCount==0, ("Invalid tga."));
-	}
-	for (i=0; i<numRows*numRows; i++) {
-		tiles[i]->updateMips();
-	}
-	return(true);
-}
-
-
-
-/** updateTileTexturePositions - assigns each tile a location in the texture.
-*/
-Int WorldHeightMap::updateTileTexturePositions(Int *edgeHeight)
-{
-	Int i, j;
-	Int maxHeight = 0;
-	const Int tilesPerRow = TEXTURE_WIDTH/(TILE_PIXEL_EXTENT+TILE_OFFSET);
-
-	Bool availableGrid[tilesPerRow][tilesPerRow];
-	Int row, column;
-	for (row=0; row<tilesPerRow; row++) {
-		for (column=0; column<tilesPerRow; column++) {
-			availableGrid[row][column] = true;
-		}
-	}
-
-	for (i=0; i<m_numBitmapTiles; i++) {
-		if (m_sourceTiles[i]) {
-			m_sourceTiles[i]->m_tileLocationInTexture.x = 0;
-			m_sourceTiles[i]->m_tileLocationInTexture.y = 0;
-		}
-	}	 
-
-	/* put the normal tiles into the terrain texture */
-	Int texClass;
-	Int tileWidth;
-	for (tileWidth = tilesPerRow; tileWidth>0; tileWidth--) {
-		for (texClass=0; texClass<m_numTextureClasses; texClass++) {
-			Int width = m_textureClasses[texClass].width;
-			if (width != tileWidth) continue;
-			// Find an available block of space.
-			Bool found = false;
-			for (row=0; row<tilesPerRow-width+1 && !found; row++) {
-				for (column=0; column<tilesPerRow-width+1 && !found; column++) {
-					if (availableGrid[row][column]) {
-						Bool open = true;
-						for (i=0; i<width && open; i++) {
-							for (j=0; j<width&&open; j++) {
-								if (!availableGrid[row+j][column+i]) {
-									open = false;
-								}
-							}
-						}
-						if (open) found = true;
-						break;
-					}
-				}
-				if (found) break;
-			}
-			if (!found) {
-				m_textureClasses[texClass].positionInTexture.x = 0;
-				m_textureClasses[texClass].positionInTexture.y = 0;
-				continue;
-			}
-
-			Int xOrigin = TILE_OFFSET/2 + column*(TILE_PIXEL_EXTENT+TILE_OFFSET);
-			Int yOrigin = TILE_OFFSET/2 + row*(TILE_PIXEL_EXTENT+TILE_OFFSET);
-			m_textureClasses[texClass].positionInTexture.x = xOrigin;
-			m_textureClasses[texClass].positionInTexture.y = yOrigin;
-			Int classHeight = yOrigin + width*TILE_PIXEL_EXTENT+ TILE_OFFSET/2;
-			if (maxHeight < classHeight) maxHeight = classHeight;
-
-			for (i=0; i<width; i++) {
-				for (j=0; j<width; j++) {
-					availableGrid[row+j][column+i] = false;
-					Int baseNdx = m_textureClasses[texClass].firstTile + i + j*width;
-					// In case we are just checking for room...
-					if (m_sourceTiles[baseNdx] == NULL) continue;
-					Int x = xOrigin + i*TILE_PIXEL_EXTENT;
-					Int y = yOrigin + (width-j-1)*TILE_PIXEL_EXTENT;
-					m_sourceTiles[baseNdx]->m_tileLocationInTexture.x = x;
-					m_sourceTiles[baseNdx]->m_tileLocationInTexture.y = y;
-				}
-			}
-		}
-	}
-
-	for (i=0; i<m_numBitmapTiles; i++) {
-		if (m_edgeTiles[i]) {
-			m_edgeTiles[i]->m_tileLocationInTexture.x = 0;
-			m_edgeTiles[i]->m_tileLocationInTexture.y = 0;
-		}
-	}	 
-
-	/* put the blend edge tiles into the blend edges texture */
-	Int maxEdgeHeight = 0;
-	// Reset the grid, cause we're using a different texture now.
-	for (row=0; row<tilesPerRow; row++) {
-		for (column=0; column<tilesPerRow; column++) {
-			availableGrid[row][column] = true;
-		}
-	}
-	for (texClass=0; texClass<m_numEdgeTextureClasses; texClass++) {
-		Int width = m_edgeTextureClasses[texClass].width;
-		// Find an available block of space.
-		Bool found = false;
-		for (row=0; row<tilesPerRow-width+1 && !found; row++) {
-			for (column=0; column<tilesPerRow-width+1 && !found; column++) {
-				if (availableGrid[row][column]) {
-					Bool open = true;
-					for (i=0; i<width && open; i++) {
-						for (j=0; j<width&&open; j++) {
-							if (!availableGrid[row+j][column+i]) {
-								open = false;
-							}
-						}
-					}
-					if (open) found = true;
-					break;
-				}
-			}
-			if (found) break;
-		}
-		if (!found) {
-			m_edgeTextureClasses[texClass].positionInTexture.x = 0;
-			m_edgeTextureClasses[texClass].positionInTexture.y = 0;
-			continue;
-		}
-
-		Int xOrigin = TILE_OFFSET/2 + column*(TILE_PIXEL_EXTENT+TILE_OFFSET);
-		Int yOrigin = TILE_OFFSET/2 + row*(TILE_PIXEL_EXTENT+TILE_OFFSET);
-		m_edgeTextureClasses[texClass].positionInTexture.x = xOrigin;
-		m_edgeTextureClasses[texClass].positionInTexture.y = yOrigin;
-		Int classHeight = yOrigin + width*TILE_PIXEL_EXTENT+ TILE_OFFSET/2;
-		if (maxEdgeHeight < classHeight) maxEdgeHeight = classHeight;
-
-		for (i=0; i<width; i++) {
-			for (j=0; j<width; j++) {
-				availableGrid[row+j][column+i] = false;
-				Int baseNdx = m_edgeTextureClasses[texClass].firstTile + i + j*width;
-				// In case we are just checking for room...
-				if (m_edgeTiles[baseNdx] == NULL) continue;
-				Int x = xOrigin + i*TILE_PIXEL_EXTENT;
-				Int y = yOrigin + (width-j-1)*TILE_PIXEL_EXTENT;
-				// Use negative offsets to differentiate between tiles & edges.
-				m_edgeTiles[baseNdx]->m_tileLocationInTexture.x = x;
-				m_edgeTiles[baseNdx]->m_tileLocationInTexture.y = y;
-			}
-		}
-	}
-	if (edgeHeight) *edgeHeight = maxEdgeHeight;
-	return maxHeight;
-}
-
-/** getUVData - Gets the texture coordinates to use.  See getTerrainTexture.
-*/
-void WorldHeightMap::getUVForNdx(Int tileNdx, float *minU, float *minV, float *maxU, float*maxV, Bool fullTile)
-{
-	Short baseNdx = tileNdx>>2;
-	if (m_sourceTiles[baseNdx] == NULL) {
-		// Missing texture.
-		*minU = *minV = *maxU = *maxV = 0.0f;
-		return;
-	}
-	ICoord2D pos = m_sourceTiles[baseNdx]->m_tileLocationInTexture;
-	*minU = pos.x;
-	*minV = pos.y;
-	*maxU = *minU+TILE_PIXEL_EXTENT; 
-	*maxV = *minV+TILE_PIXEL_EXTENT;
-#ifdef EVAL_TILING_MODES 
-	if (m_tileMode == TILE_8x8) {
-		*maxU = *minU+TILE_PIXEL_EXTENT/2.0f; 
-		*maxV = *minV+TILE_PIXEL_EXTENT/2.0f;
-	} else if (m_tileMode == TILE_6x6) {
-		*maxU = *minU+2.0f*TILE_PIXEL_EXTENT/3.0f; 
-		*maxV = *minV+2.0f*TILE_PIXEL_EXTENT/3.0f;
-	} else {
-		*maxU = *minU+TILE_PIXEL_EXTENT; 
-		*maxV = *minV+TILE_PIXEL_EXTENT;
-	}
-#endif
-	*minU/=TEXTURE_WIDTH;
-	*minV/=m_terrainTexHeight;
-	*maxU/=TEXTURE_WIDTH;
-	*maxV/=m_terrainTexHeight;
-	if (!fullTile) {
-		// Tiles are 64x64 pixels, height grids map to 32x32. 
-		// So get the proper quadrant of the tile.
-		Real midX = (*minU+*maxU)/2;
-		Real midY = (*minV+*maxV)/2;
-		if (tileNdx&2) {		// y's are flipped.
-			*maxV = midY;
-		} else {
-			*minV = midY;
-		}
-		if (tileNdx&1) {
-			*minU = midX;
-		} else {
-			*maxU = midX;
-		}
-	}
-}
-
-/** getUVData - Gets the texture coordinates to use.  See getTerrainTexture.
-*/
-void WorldHeightMap::getUVForBlend(Int edgeClass, Region2D *range)
-{
-	ICoord2D pos = m_edgeTextureClasses[edgeClass].positionInTexture;
-	Int width = m_edgeTextureClasses[edgeClass].width;
-	range->lo.x = (Real)pos.x/TEXTURE_WIDTH;
-	range->lo.y = (Real)pos.y/m_alphaEdgeHeight;
-	range->hi.x = ((Real)pos.x + width*TILE_PIXEL_EXTENT)/TEXTURE_WIDTH;
-	range->hi.y = ((Real)pos.y + width*TILE_PIXEL_EXTENT)/m_alphaEdgeHeight;
-}
-
-/// Get whether something is cliff indexed with the offset that HeightMapRenderObjClass uses built in.
-Bool WorldHeightMap::isCliffMappedTexture(Int x, Int y) { 
-	Int ndx = x+m_drawOriginX+m_width*(y+m_drawOriginY);
-	if (ndx>=0 && ndx<m_dataSize) {
-		return m_cliffInfoNdxes[ndx] != 0;
-	}
-	return false;
-};
-
-/** getUVData - Gets the texture coordinates to use.  See getTerrainTexture.
-		xIndex and yIndex are the integer coorddinates into the height map.
-		U and V are the texture coordiantes for the 4 corners of a height map cell.
-		fullTile is true if we are doing 1/2 resolution height map, and require a full
-		tile to texture  a cell.  Otherwise, we use quarter tiles per cell.
-*/
-Bool WorldHeightMap::getUVData(Int xIndex, Int yIndex, float U[4], float V[4], Bool fullTile)
-{
-#define dont_SHOW_THE_TEXTURE_FOR_DEBUG 1
-#if SHOW_THE_TEXTURE_FOR_DEBUG
-		// This is debug code that just shows the generated texture laid on the terrain.
-		// For debugging ;) jba.
-		xIndex += m_drawOriginX;
-		yIndex += m_drawOriginY;
-		float nU= xIndex;
-		float xU = xIndex+1;
-		float nV = 48-yIndex-1;
-		float xV = 48-yIndex;
-		float k = 48;
-		nU /= k;
-		xU /= k;
-		k = k*m_terrainTexHeight/TEXTURE_WIDTH;
-		nV /= k;
-		xV /= k;
-		U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
-		V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
-		return(true);
-#else
-	xIndex += m_drawOriginX;
-	yIndex += m_drawOriginY;
-	Int ndx = (yIndex*m_width)+xIndex;
-	if ((ndx<m_dataSize) && m_tileNdxes) {
-		Short tileNdx = m_tileNdxes[ndx];
-		return getUVForTileIndex(ndx, tileNdx, U, V, fullTile);
-	}
-	return false;
-#endif
-}
-
-/** getUVForTileIndex - Gets the texture coordinates to use.  See getTerrainTexture.
-		ndx is the index into the linear height array.
-		tileNdx is the index into the texture tiles array.
-		U and V are the texture coordiantes for the 4 corners of a height map cell.
-		fullTile is true if we are doing 1/2 resolution height map, and require a full
-		tile to texture  a cell.  Otherwise, we use quarter tiles per cell.
-*/
-
-Bool WorldHeightMap::getUVForTileIndex(Int ndx, Short tileNdx, float U[4], float V[4], Bool fullTile)
-{
-	Real nU, nV, xU, xV;
-	nU=nV=xU=xV = 0.0f;
-	Int tilesPerRow = TEXTURE_WIDTH/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
-	tilesPerRow *= 4;
-
-	if ((ndx<m_dataSize) && m_tileNdxes) {
-		getUVForNdx(tileNdx, &nU, &nV, &xU, &xV, fullTile);
-		U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
-		V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
-		if (TheGlobalData && !TheGlobalData->m_adjustCliffTextures) {
-			return false;
-		}
-		if (nU==0.0) {
-			return false; // missing texture.
-		}
-		if (fullTile) {
-			return false;
-		}
-		if (m_cliffInfoNdxes[ndx]) {
-			TCliffInfo info = m_cliffInfo[m_cliffInfoNdxes[ndx]]; 
-			Bool tilesMatch = false;
-			Int ndx1 = tileNdx>>2;
-			Int ndx2 = info.tileIndex>>2;
-			Int i;
-			for (i=0; i<this->m_numTextureClasses; i++) {
-				if (ndx1 >= m_textureClasses[i].firstTile && ndx1 < m_textureClasses[i].firstTile + m_textureClasses[i].numTiles) {
-					tilesMatch = ndx2 >= m_textureClasses[i].firstTile && ndx2 < m_textureClasses[i].firstTile + m_textureClasses[i].numTiles;
-					//tilesMatch = true;
-					break;
-				}
-			}
-			if (tilesMatch) {
-				Real minU = m_textureClasses[i].positionInTexture.x;
-				Real maxV = m_textureClasses[i].positionInTexture.y + m_textureClasses[i].width*TILE_PIXEL_EXTENT;
-				minU/=TEXTURE_WIDTH;
-				maxV/=m_terrainTexHeight;
-				Real vFactor = TEXTURE_WIDTH/m_terrainTexHeight;
-				U[0] = info.u0+minU;
-				U[1] = info.u1+minU;
-				U[2] = info.u2+minU;
-				U[3] = info.u3+minU;
-				V[0] = info.v0*vFactor+maxV;
-				V[1] = info.v1*vFactor+maxV;
-				V[2] = info.v2*vFactor+maxV;
-				V[3] = info.v3*vFactor+maxV;
-				return info.flip;
-			}
-		}
-#define DO_OLD_UV
-#ifdef DO_OLD_UV
-// old uv adjustment for cliffs 
-		static Real STRETCH_LIMIT = 1.5f;	 // If it is stretching less than this, don't adjust.
-		static Real TILE_LIMIT = 4.0;			// Our tiles are currently 4 cells wide & tall, so dont'
-																			// adjust to more than 4.0.
-
-		static Real TALL_STRETCH_LIMIT = 2.0f; 
-		static Real DIAMOND_STRETCH_LIMIT = 2.4f;
-		static Real HEIGHT_SCALE = MAP_HEIGHT_SCALE / MAP_XY_FACTOR;
-
-		Real nU, nV, xU, xV;
-		nU=nV=xU=xV = 0.0f;
-		Int tilesPerRow = TEXTURE_WIDTH/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
-		tilesPerRow *= 4;
-
-
-		getUVForNdx(tileNdx, &nU, &nV, &xU, &xV, fullTile);
-		U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
-		V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
-		if (TheGlobalData && !TheGlobalData->m_adjustCliffTextures) {
-			return false;
-		}
-		if (nU==0.0) {
-			return false; // missing texture.
-		}
-		if (fullTile) {
-			return false;
-		}
-		// check for excessive heights. 
-		if (ndx < this->m_dataSize - m_width - 1) {
-			Int h0 = m_data[ndx];
-			Int h1 = m_data[ndx+1];
-			Int h2 = m_data[ndx+m_width+1];
-			Int h3 = m_data[ndx+m_width];
-			Int minH, maxH;
-			minH = maxH = h0;
-			if (minH>h1) minH = h1;
-			if (maxH<h1) maxH = h1;
-			if (minH>h2) minH = h2;
-			if (maxH<h2) maxH = h2;
-			if (minH>h3) minH = h3;
-			if (maxH<h3) maxH = h3;
-//			Int avgH = (h1+h2+h3+h0+2)/4;
-			Int deltaH = maxH-minH;
-			Int below = 0;
-			Int above = 0;
-			Int belowLimit = minH+(2*deltaH+1)/3;
-			Int aboveLimit = minH+(deltaH+1)/3;
-			if (h0<belowLimit) below++;
-			if (h1<belowLimit) below++;
-			if (h2<belowLimit) below++;
-			if (h3<belowLimit) below++;
-			if (h0>aboveLimit) above++;
-			if (h1>aboveLimit) above++;
-			if (h2>aboveLimit) above++;
-			if (h3>aboveLimit) above++;
-			if (deltaH*HEIGHT_SCALE < STRETCH_LIMIT) { 
-				return false;
-			}
-
-			Short baseNdx = tileNdx>>2;
-			Short texClass;
-			for (texClass=0; texClass<m_numTextureClasses; texClass++) {
-				if (m_textureClasses[texClass].firstTile<0) {
-					continue;
-				}
-				// see if the blend tile is in a texture class, and get the right tile for xIndex, yIndex.
-				if (baseNdx >= m_textureClasses[texClass].firstTile && 
-					baseNdx < m_textureClasses[texClass].firstTile+m_textureClasses[texClass].numTiles) {
-					break;
-				}
-			}
-			if (texClass>= m_numTextureClasses) return false;
-			Real nUb, nVb, xUb, xVb;
-			nUb = m_textureClasses[texClass].positionInTexture.x;
-			nVb = m_textureClasses[texClass].positionInTexture.y;
-			xUb = nUb+m_textureClasses[texClass].width*TILE_PIXEL_EXTENT; 
-			xVb = nVb+m_textureClasses[texClass].width*TILE_PIXEL_EXTENT;
-			nUb/=TEXTURE_WIDTH;
-			nVb/=m_terrainTexHeight;
-			xUb/=TEXTURE_WIDTH;
-			xVb/=m_terrainTexHeight;
-			// Now covers texture bounds.
-			// too much stretch.
-			Real divisor = TILE_LIMIT/(deltaH*HEIGHT_SCALE);
-			if (divisor > TILE_LIMIT) divisor = TILE_LIMIT;
-			if (divisor < 1.0f) divisor = 1.0f;
-			Real deltaV = (xVb-nVb); 
-//			Real deltaU = (xUb-nUb); 
-
-			if (above != 1 && below != 1 && (above!=2 || below != 2)) {
-				// diamond shaped.  Use default if it is not too stretched, as
-				// the fix is not that appealing either.
-				if (deltaH*HEIGHT_SCALE < DIAMOND_STRETCH_LIMIT) { 
-					return false;
-				}
-			}
-
-			if (below==1 || above>below) { //(avgH > minH + (2*deltaH+2)/3) 
-				// we got one low guy.
-				if (h0==minH) {
-					V[0] = nV+deltaV/divisor;
-				} else if (h1 == minH) {
-					V[1] = nV+deltaV/divisor;
-				}	else if (h2 == minH) {
-					V[2] = xV-deltaV/divisor;
-				} else if (h3 == minH) {
-					V[3] = xV-deltaV/divisor;
-				}
-#if 0
-				nU = nV = xU = xV = 1.0f;
-				U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
-				V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
-				return false;
-#endif
-			}	else if (above==1 || below>above) { //(avgH < minH + (deltaH+1)/3) 
-				// we got one high guy
-				if (h0==maxH) {
-					V[0] = nV+deltaV/divisor;
-				} else if (h1 == maxH) {
-					V[1] = nV+deltaV/divisor;
-				}	else if (h2 == maxH) {
-					V[2] = xV-deltaV/divisor;
-				} else if (h3 == maxH) {
-					V[3] = xV-deltaV/divisor;
-				}
-#if 0
-				nU = nV = xU = xV = 0.0f;
-				U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
-				V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
-				return false;
-#endif
-			} else {
-				// we got two up and two down.
-				if (deltaH*HEIGHT_SCALE < TALL_STRETCH_LIMIT) { 
-					return false;
-				}
-#if 0
-				nU = nV = xU = xV = 0.0f;
-				U[0] = nU; U[1] = xU; U[2] = xU; U[3] = nU;
-				V[0] = xV; V[1] = xV; V[2] = nV; V[3] = nV;
-				return;
-#endif
-				Real dx = (h3-h2)*HEIGHT_SCALE;
-				dx = sqrt(1+dx*dx); // lenght of the bottom of the cell
-				Real dy =	(h3-h0)*HEIGHT_SCALE;
-				dy = sqrt(1+dy*dy); // length of the left side.
-				if (dx<STRETCH_LIMIT) dx = 1.0f; // don't make a seam unless there is great stretch. 
-				if (dy<STRETCH_LIMIT) dy = 1.0f; // don't make a seam unless there is great stretch. 
-				if (dx>TILE_LIMIT) dx = TILE_LIMIT; // don't tile past the texture's edge. 
-				if (dy>TILE_LIMIT) dy = TILE_LIMIT; // don't tile past the texture's edge. 
-				dx *= xU-nU;
-				dy *= xV-nV;
-				U[0] = nU; U[1] = nU+dx; U[2] = nU+dx; U[3] = nU;
-				V[0] = nV+dy; V[1] = nV+dy; V[2] = nV; V[3] = nV;
-				if (below==1) {
-					below = 1;
-				}
-				// recalc for point 1.
-				dx = (h1-h0)*HEIGHT_SCALE;
-				dx = sqrt(1+dx*dx); // lenght of the bottom of the cell
-				dy =	(h2-h1)*HEIGHT_SCALE;
-				dy = sqrt(1+dy*dy); // length of the left side.
-				if (dx<STRETCH_LIMIT) dx = 1.0f; // don't make a seam unless there is great stretch. 
-				if (dy<STRETCH_LIMIT) dy = 1.0f; // don't make a seam unless there is great stretch. 
-				if (dx>TILE_LIMIT) dx = TILE_LIMIT; // don't tile past the texture's edge. 
-				if (dy>TILE_LIMIT) dy = TILE_LIMIT; // don't tile past the texture's edge. 
-				dx *= xU-nU;
-				dy *= xV-nV;
-				U[1] = U[0]+dx;
-				V[1] = V[3] + dy;
-			}
-			// Make sure we are within the texture;
-			Real adjU = 0;
-			Real adjV = 0;
-			Int i;
-			for (i=0; i<4; i++) {
-				if (nVb - V[i] > adjV) adjV = nVb - V[i];
-			}
-			for (i=0; i<4; i++) {
-				V[i] += adjV;
-			}
-			adjV = 0;
-			for (i=0; i<4; i++) {
-				if (U[i] - xUb > adjU) adjU = U[i]-xUb;
-				if (V[i] - xVb > adjV) adjV = V[i]-xVb;
-			}
-			for (i=0; i<4; i++) {
-				U[i] -= adjU;
-				V[i] -= adjV;
-			}
-		}	
-		return true;
-// 
-#endif
-
-	}	
-	return false;
-}
-
-///@todo: Are the different "if" cases mutually exclusive?  If so, should add else statements.
-Bool WorldHeightMap::getExtraAlphaUVData(Int xIndex, Int yIndex, float U[4], float V[4], UnsignedByte alpha[4], Bool *needFlip, Bool *cliff)
-{
-	Int ndx = (yIndex*m_width)+xIndex;
-	*needFlip = FALSE;
-	*cliff = FALSE;
-
-	if ( (ndx>=0) && (ndx<m_dataSize) && m_tileNdxes) {
-		Short blendNdx = m_extraBlendTileNdxes[ndx];
-		if (blendNdx == 0) {
-			return FALSE;
-		} else {
-			*cliff = getUVForTileIndex(ndx, m_blendedTiles[blendNdx].blendNdx, U, V, FALSE);
-			alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
-			if (m_blendedTiles[blendNdx].horiz) {
-				// Horizontals don't need flipping unless forced because of 3way blend
-				// and a diagonal in base blend layer.
-				*needFlip = m_blendedTiles[blendNdx].inverted & FLIPPED_MASK;
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					alpha[0] = alpha[3] = 255;
-				} else {
-					alpha[1] = alpha[2] = 255;
-				}
-			}
-			if (m_blendedTiles[blendNdx].vert) {
-				// Verticals don't need flipping unless forced because of 3way blend
-				// and a diagonal in base blend layer.
-				*needFlip = m_blendedTiles[blendNdx].inverted & FLIPPED_MASK;
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					alpha[0] = alpha[1] = 255;
-				} else {
-					alpha[2] = alpha[3]  = 255;
-				}
-			}
-			if (m_blendedTiles[blendNdx].rightDiagonal) {
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					alpha[1] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[0] = 255;
-						alpha[2] = 255;
-					}
-				} else {
-					// Uninverted right diagonals need flipping.
-					*needFlip = TRUE;
-					alpha[2] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[1] = 255;
-						alpha[3] = 255;
-					}
-				}
-			}
-			if (m_blendedTiles[blendNdx].leftDiagonal) {
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					// Inverted left diagonals need flipping.
-					*needFlip = TRUE;
-					alpha[0] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[1] = 255;
-						alpha[3] = 255;
-					}
-				} else {
-					alpha[3] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[0] = 255;
-						alpha[2] = 255;
-					}
-				}
-			}
-			if (m_blendedTiles[blendNdx].customBlendEdgeClass>=0) {
-				alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
-				// No alpha blend, so never need to flip.
-				*needFlip = FALSE;
-			}
-		}
-	}
-
-	return TRUE;
-}
-
-/** getUVData - Gets the texture coordinates to use with the alpha texture.  
-		xIndex and yIndex are the integer coorddinates into the height map.
-		U and V are the texture coordiantes for the 4 corners of a height map cell.
-		fullTile is true if we are doing 1/2 resolution height map, and require a full
-		tile to texture  a cell.  Otherwise, we use quarter tiles per cell.
-		flip is set if we need to flip the diagonal across the cell to make the 
-		alpha coordinates blend properly.  Filling a square with 2 triangles is not symmetrical :)
-*/
-void WorldHeightMap::getAlphaUVData(Int xIndex, Int yIndex, float U[4], float V[4], 
-																		UnsignedByte alpha[4], Bool *flip, Bool fullTile)
-{
-	xIndex += m_drawOriginX;
-	yIndex += m_drawOriginY;
-	Int ndx = (yIndex*m_width)+xIndex;
-	Bool stretchedForCliff = false;
-	Bool needFlip = false;
-
-	if ((ndx<m_dataSize) && m_tileNdxes) {
-		Short blendNdx = m_blendTileNdxes[ndx];
-		if (fullTile) blendNdx = 0;
-		if (blendNdx == 0) {
-			stretchedForCliff = getUVForTileIndex(ndx, m_tileNdxes[ndx], U, V, fullTile);		
-			alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
-			// No alpha blend, so never need to flip.
-			needFlip = false;
-		} else {
-			stretchedForCliff = getUVForTileIndex(ndx, m_blendedTiles[blendNdx].blendNdx, U, V, fullTile);
-			alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
-			if (m_blendedTiles[blendNdx].horiz) {
-				// Horizontals don't need flipping unless forced because of 3way blend.
-				needFlip = m_blendedTiles[blendNdx].inverted & FLIPPED_MASK;
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					alpha[0] = alpha[3] = 255;
-				} else {
-					alpha[1] = alpha[2] = 255;
-				}
-			}
-			if (m_blendedTiles[blendNdx].vert) {
-				// Verticals don't need flipping unless forced because of 3way blend.
-				needFlip = m_blendedTiles[blendNdx].inverted & FLIPPED_MASK;
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					alpha[0] = alpha[1] = 255;
-				} else {
-					alpha[2] = alpha[3]  = 255;
-				}
-			}
-			if (m_blendedTiles[blendNdx].rightDiagonal) {
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					alpha[1] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[0] = 255;
-						alpha[2] = 255;
-					}
-				} else {
-					// Uninverted right diagonals need flipping.
-					needFlip = true;
-					alpha[2] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[1] = 255;
-						alpha[3] = 255;
-					}
-				}
-			}
-			if (m_blendedTiles[blendNdx].leftDiagonal) {
-				if (m_blendedTiles[blendNdx].inverted & INVERTED_MASK) {
-					// Inverted left diagonals need flipping.
-					needFlip = true;
-					alpha[0] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[1] = 255;
-						alpha[3] = 255;
-					}
-				} else {
-					alpha[3] = 255;
-					if (m_blendedTiles[blendNdx].longDiagonal) {
-						alpha[0] = 255;
-						alpha[2] = 255;
-					}
-				}
-			}
-			if (m_blendedTiles[blendNdx].customBlendEdgeClass>=0) {
-				alpha[0] = alpha[1] = alpha[2] = alpha[3] = 0;
-				// No alpha blend, so never need to flip.
-				needFlip = false;
-			}
-		}
-	}
-	if (stretchedForCliff) {
-		// If we had to stretch for clif, check heights.
-		Int p0=getHeight(xIndex, yIndex);
-		Int p1=getHeight(xIndex+1, yIndex);
-		Int p2=getHeight(xIndex+1, yIndex+1);
-		Int p3=getHeight(xIndex, yIndex+1);
-		Int dz1 = abs(p0-p2);
-		Int dz2 = abs(p1-p3);
-		needFlip = dz1>dz2;
-	}
-#ifdef FLIP_TRIANGLES
-	*flip = needFlip;
-#endif
-}
-
-void WorldHeightMap::setTextureLOD(Int lod)
-{
-	if (m_terrainTex)
-		m_terrainTex->setLOD(lod);
-}
-
-TextureClass *WorldHeightMap::getTerrainTexture(void)
-{
-	if (m_terrainTex == NULL) {
-		Int edgeHeight;
-		Int height = updateTileTexturePositions(&edgeHeight);
-		Int pow2Height = 1;
-		while (pow2Height<height) {
-			pow2Height *=2;
-		}
-		REF_PTR_RELEASE(m_terrainTex);
-		m_terrainTex = MSGNEW("WorldHeightMap_getTerrainTexture") TerrainTextureClass(pow2Height);
-		m_terrainTexHeight = m_terrainTex->update(this);
-		char buf[64];
-		sprintf(buf, "Base tex height %d\n", pow2Height);
-		DEBUG_LOG((buf));
-		REF_PTR_RELEASE(m_alphaTerrainTex);
-		m_alphaTerrainTex = MSGNEW("WorldHeightMap_getTerrainTexture") AlphaTerrainTextureClass(m_terrainTex);
-
-		pow2Height = 1;
-		while (pow2Height<edgeHeight) {
-			pow2Height *=2;
-		}
-		REF_PTR_RELEASE(m_alphaEdgeTex);
-		m_alphaEdgeTex = MSGNEW("WorldHeightMap_getTerrainTexture") AlphaEdgeTextureClass(pow2Height);
-		m_alphaEdgeHeight = m_alphaEdgeTex->update(this);
-
-		//Generate lookup table for determining triangle order in each terrain cell.
-		//Not the best place to put this but getAlphaUVData() requires a valid terrain
-		//texture to return valid values.
-
-		for (Int y=0; y<(m_height-1); y++)
-			for (Int x=0; x<(m_width-1); x++)
-			{
-				UnsignedByte alpha[4];
-				float UA[4], VA[4];
-				Bool flipForBlend;
-
-				getAlphaUVData(x, y, UA, VA, alpha, &flipForBlend, false);
-
-				m_cellFlipState[y*m_flipStateWidth+(x>>3)] |= flipForBlend << (x & 0x7);
-				DEBUG_ASSERTCRASH ((y*m_flipStateWidth+(x>>3)) < (m_flipStateWidth * m_height), ("Bad range"));
-			}
-	}
-
-	return m_terrainTex;
-}
-
-TextureClass *WorldHeightMap::getAlphaTerrainTexture(void)
-{
-	if (m_alphaTerrainTex == NULL) {
-		getTerrainTexture();
-	}
-	return m_alphaTerrainTex;
-}
-	
-TextureClass *WorldHeightMap::getEdgeTerrainTexture(void)
-{
-	if (m_alphaEdgeTex == NULL) {
-		getTerrainTexture();
-	}
-	return m_alphaEdgeTex;
-}
-
-TerrainTextureClass *WorldHeightMap::getFlatTexture(Int xCell, Int yCell, Int cellWidth, Int pixelsPerCell)	
-{
-	if (TheWritableGlobalData->m_textureReductionFactor) {
-		if (TheWritableGlobalData->m_textureReductionFactor>1) {
-			pixelsPerCell /= 4;
-		} else {
-			pixelsPerCell /= 2;
-		}
-	}
-	Int pow2Height = 1;
-	while (pow2Height<cellWidth*pixelsPerCell) {
-		pow2Height *=2;
-	}
-	TerrainTextureClass *newTexture = MSGNEW("WorldHeightMap_getTerrainTexture") TerrainTextureClass(pow2Height, pow2Height);
-	newTexture->updateFlat(this, xCell, yCell, cellWidth, pixelsPerCell);
-	return newTexture;
-}
-
-
-Bool WorldHeightMap::setDrawOrg(Int xOrg, Int yOrg)
-{
-	Int newX, newY;
-	Int newWidth, newHeight;
-	newX = xOrg;
-	newY = yOrg;
-	newWidth = m_drawWidthX;
-	newHeight = m_drawHeightY;
-	if (TheGlobalData && TheGlobalData->m_stretchTerrain) {
-		newWidth=STRETCH_DRAW_WIDTH;
-		newHeight=STRETCH_DRAW_HEIGHT;
-	}
-	if (TheGlobalData && TheGlobalData->m_drawEntireTerrain) {
-		newWidth=m_width;
-		newHeight=m_height;
-	}
-	if (newWidth > m_width) newWidth = m_width;
-	if (newHeight > m_height) newHeight = m_height;
-	if (newX > m_width - newWidth) newX = m_width-newWidth; 
-	if (newX<0) newX=0;
-	if (newY > m_height - newHeight) newY = m_height - newHeight; 
-	if (newY<0) newY=0;
-	Bool anythingDifferent = (m_drawOriginX!=newX) ||
-										 (m_drawOriginY!=newY) ||
-										 (m_drawWidthX!=newWidth) ||
-										 (m_drawHeightY!=newHeight) ;
-
-	if (anythingDifferent) {
-		m_drawOriginX=newX;
-		m_drawOriginY=newY;
-		m_drawWidthX=newWidth;
-		m_drawHeightY=newHeight;
-		return(true);
-	}
-	return(false);
-}
-
-/** Gets global texture class. */
-Int WorldHeightMap::getTextureClass(Int xIndex, Int yIndex, Bool baseClass)
-{
-	Int ndx = (yIndex*m_width)+xIndex;
-	DEBUG_ASSERTCRASH((ndx>=0 && ndx<this->m_dataSize),("oops"));
-	if (ndx<0 || ndx >= this->m_dataSize) return(-1);
-	Int textureNdx = m_tileNdxes[ndx];
-	if (!baseClass && (m_blendTileNdxes[ndx] != 0 || m_extraBlendTileNdxes[ndx] != 0)) {
-		return(-1);  // blended, so not of the original class.
-	}
-	return getTextureClassFromNdx(textureNdx);
-}
-
-
-/** Sets all the cliff flags in map based on height. */
-void WorldHeightMap::initCliffFlagsFromHeights()
-{
-	Int xIndex, yIndex;
-
-	for (xIndex=0; xIndex<m_width-1; xIndex++) {
-		for (yIndex=0; yIndex<m_height-1; yIndex++) {
-			setCellCliffFlagFromHeights(xIndex, yIndex);
-		}
-	}
-}
-
-/** Sets the cliff flag for a cell based on height. */
-void WorldHeightMap::setCellCliffFlagFromHeights(Int xIndex, Int yIndex)
-{
-	Real height1 = getHeight(xIndex, yIndex)*MAP_HEIGHT_SCALE;
-	Real height2 = getHeight(xIndex+1, yIndex)*MAP_HEIGHT_SCALE;
-	Real height3 = getHeight(xIndex, yIndex+1)*MAP_HEIGHT_SCALE;
-	Real height4 = getHeight(xIndex+1, yIndex+1)*MAP_HEIGHT_SCALE;
-	Real minZ = height1;
-	if (minZ > height2) minZ = height2;
-	if (minZ > height3) minZ = height3;
-	if (minZ > height4) minZ = height4;
-	Real maxZ = height1;
-	if (maxZ < height2) maxZ = height2;
-	if (maxZ < height3) maxZ = height3;
-	if (maxZ < height4) maxZ = height4;
-	const Real cliffRange = PATHFIND_CLIFF_SLOPE_LIMIT_F;	
-	Bool isCliff = (maxZ-minZ > cliffRange);
-	setCliffState(xIndex, yIndex, isCliff);
-
-}
-
-/** Gets global texture class. */
-Int WorldHeightMap::getTextureClassFromNdx(Int tileNdx) 
-{
-	Int i;
-	tileNdx = tileNdx>>2;
-	for (i=0; i<m_numTextureClasses; i++) {
-		if (m_textureClasses[i].firstTile<0) {
-			continue;
-		}
-		// see if the blend tile is in a texture class, and get the right tile for xIndex, yIndex.
-		if (tileNdx >= m_textureClasses[i].firstTile && 
-			tileNdx < m_textureClasses[i].firstTile+m_textureClasses[i].numTiles) {
-			return(m_textureClasses[i].globalTextureClass);
-		}
-	}
-	return(-1);
-}
-
-TXTextureClass WorldHeightMap::getTextureFromIndex( Int textureIndex )
-{
-	return m_textureClasses[textureIndex];
-}
-
-void WorldHeightMap::getTerrainColorAt(Real x, Real y, RGBColor *pColor)
-{
-	Int xIndex = REAL_TO_INT_FLOOR(x/MAP_XY_FACTOR);
-	Int yIndex = REAL_TO_INT_FLOOR(y/MAP_XY_FACTOR);
-	xIndex += m_borderSize;
-	yIndex += m_borderSize;
-	pColor->red = pColor->green = pColor->blue = 0;
-	if (xIndex<0) xIndex = 0;
-	if (yIndex<0) yIndex = 0;
-	if (xIndex >= m_width) xIndex = m_width-1;
-	if (yIndex >= m_height) yIndex = m_height-1;
-	Int ndx = (yIndex*m_width)+xIndex;
-	if (ndx<0 || ndx >= this->m_dataSize) return;
-	Int tileNdx = m_tileNdxes[ndx];
-	tileNdx = tileNdx>>2;	 // We pack 4 grids into a tile.
-
-	TileData *pTile = getSourceTile(tileNdx);
-	if (pTile) {
-		// pTile contains the bitmap data for 4 squares.
-		// Get the data mipped down to one pixel for the tile.
-		UnsignedByte *pData = pTile->getRGBDataForWidth(1);
-		// Data is in microsoft bgra format.
-		pColor->red = pData[2]/255.0;
-		pColor->green = pData[1]/255.0;
-		pColor->blue = pData[0]/255.0;
-	}
-}	
-
-AsciiString WorldHeightMap::getTerrainNameAt(Real x, Real y)
-{
-	Int xIndex = REAL_TO_INT_FLOOR(x/MAP_XY_FACTOR);
-	Int yIndex = REAL_TO_INT_FLOOR(y/MAP_XY_FACTOR);
-	xIndex += m_borderSize;
-	yIndex += m_borderSize;
-	if (xIndex<0) xIndex = 0;
-	if (yIndex<0) yIndex = 0;
-	if (xIndex >= m_width) xIndex = m_width-1;
-	if (yIndex >= m_height) yIndex = m_height-1;
-	Int ndx = (yIndex*m_width)+xIndex;
-	if (ndx<0 || ndx >= this->m_dataSize) return AsciiString::TheEmptyString;
-	Int tileNdx = m_tileNdxes[ndx];
-	tileNdx = tileNdx>>2;	 // We pack 4 grids into a tile.
-
-	Int i;
-	for (i=0; i<this->m_numTextureClasses; i++) {
-		if (tileNdx >= m_textureClasses[i].firstTile && tileNdx < m_textureClasses[i].firstTile + m_textureClasses[i].numTiles) {
-			return(m_textureClasses[i].name);
-		}
-	}
-	return AsciiString::TheEmptyString;
-}	
-
-
-static UnsignedByte s_buffer[DATA_LEN_BYTES];
-static UnsignedByte s_blendBuffer[DATA_LEN_BYTES];
-
-UnsignedByte * WorldHeightMap::getPointerToTileData(Int xIndex, Int yIndex, Int width) 
-{
-	Int ndx = (yIndex*m_width)+xIndex;
-	if (yIndex<0 || xIndex<0 || xIndex>=m_width || yIndex>=m_height) {
-		return NULL;
-	}
-	if (ndx<0 || ndx>=m_dataSize) {
-		return NULL;
-	}
-	TBlendTileInfo *pBlend = NULL;  
-	Short tileNdx = m_tileNdxes[ndx];
-	if (getRawTileData(tileNdx, width, s_buffer, DATA_LEN_BYTES)) {
-		Short blendTileNdx = m_blendTileNdxes[ndx];
-		if (blendTileNdx>0 && blendTileNdx < NUM_BLEND_TILES) {
-			pBlend = &m_blendedTiles[blendTileNdx];
-			if (getRawTileData(pBlend->blendNdx, width, s_blendBuffer, DATA_LEN_BYTES)) {
-				UnsignedByte *pAlpha = getRGBAlphaDataForWidth(width, pBlend);
-				pAlpha += 3;  // skip over the rgb to the a.
-				Int i, limit;
-				limit = width*width;
-				UnsignedByte *pBlendData = s_blendBuffer;
-				UnsignedByte *pDestData = s_buffer;
-				for (i=0; i<limit; i++) {				
-					Int r,g,b,a;
-					b = *pBlendData++;
-					g = *pBlendData++;
-					r = *pBlendData++; *pBlendData++;
-					a = *pAlpha; pAlpha += 4;
-					*pDestData++ = ((b*a)/255) + (((*pDestData)*(255-a))/255);
-					*pDestData++ = ((g*a)/255) + (((*pDestData)*(255-a))/255);
-					*pDestData++ = ((r*a)/255) + (((*pDestData)*(255-a))/255);
-					*pDestData++ = 255; // just skip alpha.  not really used. jba.
-				}
-			}
-		}
-		return(s_buffer);
-	}
-
-	return(NULL);
-}
-
-#define K_HORIZ 0
-#define K_VERT 1
-#define K_LDIAG 2
-#define K_RDIAG 3
-#define K_LLDIAG 4
-#define K_LRDIAG 5
-#define K_DIR_MOD 0x05
-#define K_INV 6
-
-UnsignedByte *WorldHeightMap::getRGBAlphaDataForWidth(Int width, TBlendTileInfo *pBlend)
-{
-	Int alphaTileNdx = 0;
-	if (pBlend->horiz) {
-		alphaTileNdx = K_HORIZ;
-	} else if (pBlend->vert) {
-		alphaTileNdx = K_VERT;
-	} else if (pBlend->rightDiagonal) {
-		alphaTileNdx = K_RDIAG;
-		if (pBlend->longDiagonal) alphaTileNdx=K_LRDIAG;
-	} else if (pBlend->leftDiagonal) {
-		alphaTileNdx = K_LDIAG; 
-		if (pBlend->longDiagonal) alphaTileNdx=K_LLDIAG;
-	}
-	if (pBlend->inverted) {
-		alphaTileNdx += K_INV;
-	}
-	return m_alphaTiles[alphaTileNdx]->getRGBDataForWidth(width);
-}
-
-void WorldHeightMap::setupAlphaTiles(void)
-{
-	TBlendTileInfo blendInfo;
-	if (m_alphaTiles[0] != NULL) return;
-	Int k;
-	for (k=0; k<NUM_ALPHA_TILES; k++) {
-		memset(&blendInfo, 0, sizeof(blendInfo));
-		Int baseK = k;
-		if (k>=K_INV) {
-			blendInfo.inverted = true;
-			baseK -= K_INV;
-		}
-		switch(baseK) {
-			case K_HORIZ : blendInfo.horiz = true; break;
-			case K_VERT : blendInfo.vert = true; break;
-			case K_LDIAG : blendInfo.leftDiagonal = true; break;
-			case K_RDIAG : blendInfo.rightDiagonal = true; break;
-			case K_LLDIAG : blendInfo.leftDiagonal = true; blendInfo.longDiagonal = true; break;
-			case K_LRDIAG : blendInfo.rightDiagonal = true; blendInfo.longDiagonal = true; break;
-		} // end of case.
-		m_alphaTiles[k] = new TileData;
-		TileData *pTile = m_alphaTiles[k];
-
-		Int i, j;
-		UnsignedByte *pDest = pTile->getDataPtr();
-		for (j=0; j<TILE_PIXEL_EXTENT; j++) {
-			for (i=0; i<TILE_PIXEL_EXTENT; i++) {
-				Int h = i;
-				Int v = j;
-				Int alpha = 255;  // 0 - 255.
-				if (blendInfo.horiz) {
-					if (!blendInfo.inverted) h = TILE_PIXEL_EXTENT-h-1;
-					alpha = (alpha*h)/(TILE_PIXEL_EXTENT-1);
-				} else if (blendInfo.vert) {
-					if (!blendInfo.inverted) v = TILE_PIXEL_EXTENT-v-1;
-					alpha = (alpha*v)/(TILE_PIXEL_EXTENT-1);
-				} else if (blendInfo.rightDiagonal) {
-					h = TILE_PIXEL_EXTENT-h-1;
-					if (!blendInfo.inverted) v = TILE_PIXEL_EXTENT-v-1;
-					v += h;				// angled
-					if (blendInfo.longDiagonal) {
-						v -= TILE_PIXEL_EXTENT;
-					}
-					alpha = (alpha*v)/(TILE_PIXEL_EXTENT-1);
-				} else if (blendInfo.leftDiagonal) {
-					if (!blendInfo.inverted) v = TILE_PIXEL_EXTENT-v-1;
-					v += h;				// angled
-					if (blendInfo.longDiagonal) {
-						v -= TILE_PIXEL_EXTENT;
-					}
-					alpha = (alpha*v)/(TILE_PIXEL_EXTENT-1);
-				}
-				
-				if (alpha > 255) alpha = 255;
-				if (alpha<0) alpha = 0;
-				alpha = 255-alpha;
-				
-				pDest += 3; // skip blue, green & red bytes.
-				*pDest = alpha;		// alpha.
-				//*pDest = 255;
-				pDest++;
-			}
-		}
-		pTile->updateMips();
-	}
-}
-
-
-Bool  WorldHeightMap::getRawTileData(Short tileNdx, Int width, 
-																				 UnsignedByte *buffer, Int bufLen)
-{
-	TileData *pSrc = NULL;
-	if (tileNdx/4 < NUM_SOURCE_TILES) {
-		pSrc = m_sourceTiles[tileNdx/4];
-	}
-	if (bufLen < (width*width*TILE_BYTES_PER_PIXEL)) {
-		return(false);
-	}
-	if (pSrc && pSrc->hasRGBDataForWidth(2*width)) {
-		Int j;
-		UnsignedByte *pSrcData = pSrc->getRGBDataForWidth(2*width);
-		Int xOffset=0;
-		Int yOffset=0;
-		if (tileNdx & 1) xOffset = width;
-		if (tileNdx & 2) yOffset = width;
-		for (j=0; j<width; j++) {
-			UnsignedByte *pDestData = buffer;
-			pDestData += j*(width)*TILE_BYTES_PER_PIXEL;
-			UnsignedByte *pSrc = pSrcData;
-			pSrc += (j+yOffset)*width*TILE_BYTES_PER_PIXEL*2;
-			pSrc += xOffset*TILE_BYTES_PER_PIXEL; 
-			memcpy(pDestData, pSrc, width*TILE_BYTES_PER_PIXEL);
-		}
-		return(true);
-	}
-	return(false);
-}
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/camerashakesystem.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/camerashakesystem.cpp
deleted file mode 100644
index 5d5737a6b02..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/camerashakesystem.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WWPhys                                                       *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/wwphys/camerashakesystem.cpp                 $*
- *                                                                                             *
- *              Original Author:: Greg Hjelstrom                                               *
- *                                                                                             *
- *                      $Author:: Greg_h                                                      $*
- *                                                                                             *
- *                     $Modtime:: 6/12/01 10:25a                                              $*
- *                                                                                             *
- *                    $Revision:: 3                                                           $*
- *                                                                                             *
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assetmgr.h>
-#include <texture.h>
-#include <tri.h>
-#include <colmath.h>
-#include <coltest.h>
-#include <rinfo.h>
-#include <camera.h>
-#include <d3dx8core.h>
-#include "Common/GlobalData.h"
-#include "Common/PerfTimer.h"
-
-#include "GameClient/TerrainVisual.h"
-#include "GameClient/View.h"
-#include "GameClient/Water.h"
-
-#include "GameLogic/AIPathfind.h"
-#include "GameLogic/TerrainLogic.h"
-#include "W3DDevice/GameClient/TerrainTex.h"
-#include "W3DDevice/GameClient/W3DDynamicLight.h"
-#include "W3DDevice/GameClient/W3DScene.h"
-#include "W3DDevice/GameClient/W3DTerrainTracks.h"
-#include "W3DDevice/GameClient/W3DBibBuffer.h"
-#include "W3DDevice/GameClient/W3DTreeBuffer.h"
-#include "W3DDevice/GameClient/W3DRoadBuffer.h"
-#include "W3DDevice/GameClient/W3DBridgeBuffer.h"
-#include "W3DDevice/GameClient/W3DWaypointBuffer.h"
-#include "W3DDevice/GameClient/W3DCustomEdging.h"
-#include "W3DDevice/GameClient/WorldHeightMap.h"
-#include "W3DDevice/GameClient/W3DShaderManager.h"
-#include "W3DDevice/GameClient/W3DShadow.h"
-#include "W3DDevice/GameClient/W3DWater.h"
-#include "W3DDevice/GameClient/W3DShroud.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/light.h"
-#include "WW3D2/scene.h"
-#include "W3DDevice/GameClient/W3DPoly.h"
-#include "W3DDevice/GameClient/W3DCustomScene.h"
-
-#include "W3DDevice/GameClient/camerashakesystem.h"
-#include "WW3D2/camera.h"
-
-//#include "W3DDevice/GameClient/camera.h"
-//#include "W3DDevice/GameClient/wwmemlog.h"
-
-/*
-** (gth) According to my "research" the artists say that there are several factors that
-** go into a good camera shake.  
-** - The motion should be sinusoidal.
-** - Camera rotation is more effective than camera motion (good, I won't use any translation)
-** - The camera should pitch up and down a lot more than it yaws left and right.
-*/
-
-DEFINE_AUTO_POOL(CameraShakeSystemClass::CameraShakerClass,256);
-
-const float MIN_OMEGA			= DEG_TO_RADF(12.5f*360.0f);
-const float MAX_OMEGA			= DEG_TO_RADF(15.0f*360.0f);
-const float END_OMEGA			= DEG_TO_RADF(360.0f);
-const float MIN_PHI				= DEG_TO_RADF(0.0f);
-const float MAX_PHI				= DEG_TO_RADF(360.0f);
-const Vector3 AXIS_ROTATION	= Vector3(DEG_TO_RADF(7.5f),DEG_TO_RADF(15.0f),DEG_TO_RADF(5.0f));
-
-
-/************************************************************************************************
-**
-** CameraShakeSystemClass::CameraShakerClass Implementation
-**
-************************************************************************************************/
-CameraShakeSystemClass::CameraShakerClass::CameraShakerClass
-(
-	const Vector3 & position,
-	float radius,
-	float duration,
-	float intensity
-) :
-	Position(position),
-	Radius(radius),
-	Duration(duration),
-	Intensity(intensity),
-	ElapsedTime(0.0f)
-{
-	/*
-	** Initialize random sinusoid values
-	*/
-	Omega.X = WWMath::Random_Float(MIN_OMEGA,MAX_OMEGA);
-	Omega.Y = WWMath::Random_Float(MIN_OMEGA,MAX_OMEGA);
-	Omega.Z = WWMath::Random_Float(MIN_OMEGA,MAX_OMEGA);
-	Phi.X = WWMath::Random_Float(MIN_PHI,MAX_PHI);
-	Phi.Y = WWMath::Random_Float(MIN_PHI,MAX_PHI);
-	Phi.Z = WWMath::Random_Float(MIN_PHI,MAX_PHI);
-}
-
-CameraShakeSystemClass::CameraShakerClass::~CameraShakerClass(void)
-{
-}
-
-
-void CameraShakeSystemClass::CameraShakerClass::Compute_Rotations(const Vector3 & camera_position, Vector3 * set_angles)
-{
-	WWASSERT(set_angles != NULL);
-
-	/*
-	** We want several different sinusiods, each with a different phase shift and 
-	** frequency.  The frequency is a function of time as well, stretching the
-	** sine wave out.  These waves are modulated based on the distance from the
-	** center of the "shake", the intensity of the shake, and based on the axis
-	** being affected.  The vertical axis should have about 3x the amplitude of
-	** the horizontal axis.
-	*/
-
-	float len2 = (camera_position - Position).Length2();
-
-
-	if (len2 > Radius*Radius) {
-		return;
-	}
-
-
-	/*
-	** f(t) = intensity(t,pos) * sin( omega(t) * t + phi );
-	** intensity(t,pos) = intensity * (radius/distance) * timeremaing/totaltime
-	** omega(t) = start_omega + (end_omega - start_omega) * t
-	** phi = random(0..start_omega)
-	*/
-	float intensity = Intensity * (1.0f - WWMath::Sqrt(len2) / Radius) * (1.0f - ElapsedTime / Duration);
-	for (int i=0; i<3; i++) {
-		float omega = Omega[i] + (END_OMEGA - Omega[i]) * ElapsedTime;
-		(*set_angles)[i] += AXIS_ROTATION[i] * intensity * WWMath::Sin(omega * ElapsedTime + Phi[i]);
-
-		//WST 11/14/2002. Add in additional random fudge.  There seems to be a too mathematical pattern of shake with the above
-		Vector3 secondary_angles;
-		float minor_intensity = intensity * 0.5f;
-		secondary_angles.X = WWMath::Random_Float(-minor_intensity,minor_intensity);
-		secondary_angles.Y = WWMath::Random_Float(-minor_intensity,minor_intensity);
-		secondary_angles.Z = WWMath::Random_Float(-minor_intensity,minor_intensity);
-		(*set_angles) += secondary_angles;
-	}
-}
-
-
-/************************************************************************************************
-**
-** CameraShakeSystemClass Implementation
-**
-************************************************************************************************/
-CameraShakeSystemClass::CameraShakeSystemClass(void)
-{
-}
-
-CameraShakeSystemClass::~CameraShakeSystemClass(void)
-{
-	/*
-	** delete all of the objects out of the list
-	*/
-	while (!CameraShakerList.Is_Empty()) {
-		CameraShakerClass * obj = CameraShakerList.Remove_Head();
-		CameraShakerList.Remove(obj);
-		delete obj;
-	}
-}
-
-void CameraShakeSystemClass::Add_Camera_Shake
-(
-	const Vector3 & position,
-	float radius,
-	float duration,
-	float power
-)
-{
-	//WWMEMLOG(MEM_PHYSICSDATA);
-	/*
-	** Allocate a new camera shaker object.  Note that these are mem-pooled so the allocation
-	** is very cheap.
-	*/
-
-	//Power is in degrees of amplitude.
-	power = power * PI/180.0f;
-
-	CameraShakerClass * shaker = new CameraShakerClass(position,radius,duration,power);
-	CameraShakerList.Add(shaker);
-}
-
-bool CameraShakeSystemClass::IsCameraShaking(void)
-{
-	/*
-	** Loop through to find if there is any active camera shakers
-	*/
-	MultiListIterator<CameraShakerClass> iterator(&CameraShakerList);
-	for (iterator.First(); !iterator.Is_Done(); iterator.Next()) {
-		CameraShakerClass * obj = iterator.Peek_Obj();
-		if (obj){
-			return (true);
-		}
-	}
-	return(false);
-}
-
-
-void CameraShakeSystemClass::Timestep(float dt)
-{
-	/*
-	** Allow each camera shaker to timestep.  Any that expire are added to a temporary
-	** list for deletion.
-	*/
-	MultiListClass<CameraShakerClass> deletelist;
-	MultiListIterator<CameraShakerClass> iterator(&CameraShakerList);
-	for (iterator.First(); !iterator.Is_Done(); iterator.Next()) {
-		CameraShakerClass * obj = iterator.Peek_Obj();
-		obj->Timestep(dt);
-		if (obj->Is_Expired()) {
-			deletelist.Add(obj);
-		}
-	}
-
-	/*
-	** Remove and delete all the ones that expired
-	*/
-	while (!deletelist.Is_Empty()) {
-		CameraShakerClass * obj = deletelist.Remove_Head();
-		CameraShakerList.Remove(obj);
-		delete obj;
-	}
-}
-
-void CameraShakeSystemClass::Update_Camera_Shaker(Vector3 camera_position, Vector3 *shaker_angle)
-{
-	MultiListIterator<CameraShakerClass> iterator(&CameraShakerList);
-	
-	Vector3 angles(0,0,0);
-	Matrix3D camera_transform;
-
-	//camera_transform = camera.Get_Transform();
-	//camera_transform.Get_Translation(&camera_position);
-
-	/*
-	** Accumulate the effects of any active camera shakers
-	*/
-
-	for (iterator.First(); !iterator.Is_Done(); iterator.Next()) {
-		iterator.Peek_Obj()->Compute_Rotations(camera_position,&angles);
-	}
-
-	/*
-	** Clamp the result
-	*/
-	for (int i=0; i<3; i++) {
-		WWMath::Clamp(angles[i],-AXIS_ROTATION[i],AXIS_ROTATION[i]);
-	}
-	
-	*shaker_angle = angles;
-
-	/*
-	** Apply to the camera
-	*/
-	/*
-	camera_transform.Rotate_X(angles.X);
-	camera_transform.Rotate_Y(angles.Y);
-	camera_transform.Rotate_Z(angles.Z);
-	camera.Set_Transform(camera_transform);
-	*/
-}
-
-// The Instance of the system
-CameraShakeSystemClass CameraShakerSystem; //WST 11/12/2002 This is the new Camera Shaker system upgrade
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGameLogic.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGameLogic.cpp
index d0e12b058e8..c1b12837fec 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGameLogic.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGameLogic.cpp
@@ -25,7 +25,7 @@
 // FILE: W3DGameLogic.cpp /////////////////////////////////////////////////////
 //
 // W3D game logic class, there shouldn't be a lot of new functionality
-// in this class, but there are certain things that need to have close 
+// in this class, but there are certain things that need to have close
 // knowledge of each other like ther logical and visual terrain
 //
 // Author: Colin Day, April 2001
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
index a3e4ed6aae5..7ef77aff298 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DGhostObject.cpp
@@ -44,6 +44,7 @@
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 #include "W3DDevice/GameClient/W3DAssetManager.h"
 #include "W3DDevice/GameClient/W3DDisplay.h"
+#include "W3DDevice/GameClient/W3DScene.h"
 #include "W3DDevice/GameLogic/W3DGhostObject.h"
 #include "WW3D2/rendobj.h"
 #include "WW3D2/hlod.h"
@@ -51,11 +52,6 @@
 #include "WW3D2/matinfo.h"
 
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 /**This class will hold all information about a W3D RenderObject needed to
 reconstruct it if necessary*/
@@ -65,8 +61,11 @@ class W3DRenderObjectSnapshot : public Snapshot
 
 	W3DRenderObjectSnapshot(RenderObjClass *m_parentRobj, DrawableInfo *drawInfo, Bool cloneParentRobj = TRUE);
 	~W3DRenderObjectSnapshot() {REF_PTR_RELEASE(m_robj);}
-	inline void update(RenderObjClass *robj, DrawableInfo *drawInfo, Bool cloneParentRobj=TRUE);	///<refresh the current snapshot with latest state
-	inline void addToScene(void);	///< add this fogged renderobject to the scene.
+
+	inline void update(RenderObjClass *robj, DrawableInfo *drawInfo, Bool cloneParentRobj = TRUE);	///<refresh the current snapshot with latest state
+	inline Bool addToScene(void); ///< add this fogged render object to the scene.
+	inline Bool removeFromScene(); ///< remove this fogged render object from the scene.
+
 protected:
 
 	virtual void crc( Xfer *xfer );
@@ -93,17 +92,19 @@ void disableUVAnimations(RenderObjClass *robj)
 		//Also disable any animations that may be playing using mappers (texture scrolling)
 		for (Int i=0; i < robj->Get_Num_Sub_Objects(); i++)
 		{
-			RenderObjClass *subObj=robj->Get_Sub_Object(i);
+			RenderObjClass *subObj = robj->Get_Sub_Object(i);
 			if (subObj && subObj->Class_ID() == RenderObjClass::CLASSID_MESH)
-			{	//check if sub-object has the correct material to do texture scrolling.
-				MaterialInfoClass *mat=subObj->Get_Material_Info();
+			{
+				//check if sub-object has the correct material to do texture scrolling.
+				MaterialInfoClass *mat = subObj->Get_Material_Info();
 				if (mat)
-				{	for (Int j=0; j<mat->Vertex_Material_Count(); j++)
+				{
+					for (Int j=0; j<mat->Vertex_Material_Count(); j++)
 					{
-						VertexMaterialClass *vmaterial=mat->Peek_Vertex_Material(j);
-						LinearOffsetTextureMapperClass *mapper=(LinearOffsetTextureMapperClass *)vmaterial->Peek_Mapper();
+						VertexMaterialClass *vmaterial = mat->Peek_Vertex_Material(j);
+						LinearOffsetTextureMapperClass *mapper = (LinearOffsetTextureMapperClass *)vmaterial->Peek_Mapper();
 						if (mapper && mapper->Mapper_ID() == TextureMapperClass::MAPPER_ID_LINEAR_OFFSET)
-						{	
+						{
 							subObj->Set_User_Data(&animationDisableOverride);	//tell W3D about custom material settings
 						}
 					}
@@ -127,8 +128,7 @@ void W3DRenderObjectSnapshot::update(RenderObjClass *robj, DrawableInfo *drawInf
 
 	if( cloneParentRobj == TRUE )
 	{
-
-		m_robj=robj->Clone();
+		m_robj = robj->Clone();
 		m_robj->Set_ObjectColor(robj->Get_ObjectColor());
 #ifdef DEBUG_FOG_MEMORY
 		m_robjName = m_robj->Get_Name();
@@ -136,28 +136,40 @@ void W3DRenderObjectSnapshot::update(RenderObjClass *robj, DrawableInfo *drawInf
 		//Set cloned object to same state as original object.
 		m_robj->Set_Transform(robj->Get_Transform());
 		if (robj->Class_ID() == RenderObjClass::CLASSID_HLOD)
-		{	
+		{
 			float frame,mult;
 			int mode,numFrames;
 
-			HAnimClass *hanim=((HLodClass *)robj)->Peek_Animation_And_Info(frame,numFrames,mode,mult);
+			HAnimClass *hanim = ((HLodClass *)robj)->Peek_Animation_And_Info(frame,numFrames,mode,mult);
 			m_robj->Set_Animation(hanim,frame);
 			disableUVAnimations(m_robj);
-		}	//HLOD
+		}
 	}
 	else
-		m_robj=robj;
+	{
+		m_robj = robj;
+	}
 
 	m_robj->Set_User_Data(drawInfo);
+}
 
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+Bool W3DRenderObjectSnapshot::addToScene(void)
+{
+	if (!m_robj->Is_In_Scene())
+	{
+		W3DDisplay::m_3DScene->Add_Render_Object(m_robj);
+		return true;
+	}
+	return false;
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void W3DRenderObjectSnapshot::addToScene(void)
+Bool W3DRenderObjectSnapshot::removeFromScene()
 {
-	if (W3DDisplay::m_3DScene != NULL)
-		((SimpleSceneClass *)W3DDisplay::m_3DScene)->Add_Render_Object(m_robj);
+	return m_robj->Remove();
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -165,8 +177,8 @@ void W3DRenderObjectSnapshot::addToScene(void)
 W3DRenderObjectSnapshot::W3DRenderObjectSnapshot(RenderObjClass *robj, DrawableInfo *drawInfo,
 																								 Bool cloneParentRobj)
 {
-	m_robj=NULL;
-	m_next=NULL;
+	m_robj = NULL;
+	m_next = NULL;
 	update(robj, drawInfo, cloneParentRobj);
 }
 
@@ -175,8 +187,7 @@ W3DRenderObjectSnapshot::W3DRenderObjectSnapshot(RenderObjClass *robj, DrawableI
 // ------------------------------------------------------------------------------------------------
 void W3DRenderObjectSnapshot::crc( Xfer *xfer )
 {
-
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -185,14 +196,13 @@ void W3DRenderObjectSnapshot::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 void W3DRenderObjectSnapshot::xfer( Xfer *xfer )
 {
-
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
 	// sanity
-	DEBUG_ASSERTCRASH( m_robj, ("W3DRenderObjectSnapshot::xfer - invalid m_robj\n") );
+	DEBUG_ASSERTCRASH( m_robj, ("W3DRenderObjectSnapshot::xfer - invalid m_robj") );
 
 	// transform on the main render object
 	Matrix3D transform;
@@ -208,40 +218,37 @@ void W3DRenderObjectSnapshot::xfer( Xfer *xfer )
 	Bool visible;
 	RenderObjClass *subObject;
 	AsciiString subObjectName;
+
 	for( Int i = 0; i < subObjectCount; ++i )
 	{
-
 		//
 		// when saving we get sub objects by index and xfer their name, when loading
 		// we read the name and find that sub object
 		//
 		if( xfer->getXferMode() == XFER_SAVE )
 		{
-
 			// get sub object
 			subObject = m_robj->Get_Sub_Object( i );
 
 			// xfer sub object name which is unique among those in this render object
 			subObjectName.set( subObject->Get_Name() );
 			xfer->xferAsciiString( &subObjectName );
-
-		}  // end if, save
+		}
 		else
 		{
-
 			// read sub object name
 			xfer->xferAsciiString( &subObjectName );
 
 			// find this sub object on the object
 			subObject = m_robj->Get_Sub_Object_By_Name( subObjectName.str() );
 
-		}  // end else load
+		}
 
 		//
 		// NOTE that the remainder of this xfer code works on a sub object only *if*
 		// it is present.  It is possible that in future patches we change the artwork
 		// for some objects which could remove sub objects for which we have data saved
-		// for in the save game file.  If we encounter data in the save file for 
+		// for in the save game file.  If we encounter data in the save file for
 		// sub objects that are no longer in the artwork we just read the data and
 		// throw it away
 		//
@@ -263,23 +270,20 @@ void W3DRenderObjectSnapshot::xfer( Xfer *xfer )
 		// need to tell W3D that this sub object transforms are ok
 		if( subObject )
 		{
-
 			// need to cast to HLod if we can to validate the hierarchy
 			if( subObject->Class_ID() == RenderObjClass::CLASSID_HLOD )
 				((HLodClass *)subObject)->Friend_Set_Hierarchy_Valid( TRUE );
-
-		}  // end if
+		}
 
 		// release reference to sub object
 		if( subObject )
 			REF_PTR_RELEASE( subObject );
-
-	}  // end for, i
+	}
 
 	// tell W3D that the transforms for our sub objects are all OK cause we've done them ourselves
 	m_robj->Set_Sub_Object_Transforms_Dirty( FALSE );
 
-}  // end xfer
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -287,15 +291,14 @@ void W3DRenderObjectSnapshot::xfer( Xfer *xfer )
 void W3DRenderObjectSnapshot::loadPostProcess( void )
 {
 
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 W3DGhostObject::W3DGhostObject()
 {
-
-	for (Int i=0; i< MAX_PLAYER_COUNT; i++) 
-		m_parentSnapshots[i]=NULL;
+	for (Int i = 0; i < MAX_PLAYER_COUNT; i++)
+		m_parentSnapshots[i] = NULL;
 
 	m_drawableInfo.m_drawable = NULL;
 	m_drawableInfo.m_flags = 0;
@@ -304,40 +307,51 @@ W3DGhostObject::W3DGhostObject()
 
 	m_nextSystem = NULL;
 	m_prevSystem = NULL;
-
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 W3DGhostObject::~W3DGhostObject()
 {
-#ifdef DEBUG_FOG_MEMORY
-	for (Int i=0; i<MAX_PLAYER_COUNT; i++)
+#ifdef DEBUG_CRASHING
+	if (TheGhostObjectManager->trackAllPlayers())
 	{
-		DEBUG_ASSERTCRASH(m_parentSnapshots[i] == NULL, ("Delete of non-empty GhostObject"));
+		for (Int i = 0; i < MAX_PLAYER_COUNT; i++)
+		{
+			DEBUG_ASSERTCRASH(m_parentSnapshots[i] == NULL, ("Delete of non-empty GhostObject"));
+		}
+	}
+	else
+	{
+		DEBUG_ASSERTCRASH(m_parentSnapshots[TheGhostObjectManager->getLocalPlayerIndex()] == NULL, ("Delete of non-empty GhostObject"));
 	}
-#else
-	DEBUG_ASSERTCRASH(m_parentSnapshots[TheGhostObjectManager->getLocalPlayerIndex()] == NULL, ("Delete of non-empty GhostObject"));
 #endif
 }
 
 // ------------------------------------------------------------------------------------------------
-/** Record the current state of the renderobjects used by this parent object
+/** Record the current state of the render objects used by this parent object
 so we can display cached state when player is looking at fogged object.
 Should only be called when object enters the fogged state.*/
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::snapShot(int playerIndex)
 {
-#ifndef DEBUG_FOG_MEMORY
-	if (playerIndex != TheGhostObjectManager->getLocalPlayerIndex())
-		return;	//we only snapshot things for the initial local player because local player can't change in non-debug game.
-#endif
+	DEBUG_ASSERTCRASH(TheGhostObjectManager->trackAllPlayers() || playerIndex == TheGhostObjectManager->getLocalPlayerIndex(),
+		("We are supposed to only snapshot things for the initial local player because local player can't change in non-debug game."));
+
+	Drawable *draw = m_parentObject->getDrawable();
 
-	Drawable *draw=m_parentObject->getDrawable();
 	if (draw->isDrawableEffectivelyHidden())
 		return;	//don't bother to snapshot things which nobody can see.
-	
-	W3DRenderObjectSnapshot *snap=m_parentSnapshots[playerIndex],*prevSnap=NULL;
+
+	//After we remove the unfogged object, we also disable
+	//anything that should be hidden inside fog - shadow, particles, etc.
+	draw->setFullyObscuredByShroud(true);
+
+	// TheSuperHackers @bugfix Definitely keep this shrouded from here on until the shroud becomes clear again.
+	draw->setShroudClearFrame(InvalidShroudClearFrame);
+
+	W3DRenderObjectSnapshot *snap = m_parentSnapshots[playerIndex];
+	W3DRenderObjectSnapshot *prevSnap = NULL;
 
 	//walk through all W3D render objects used by this object
 	for (DrawModule ** dm = draw->getDrawModules(); *dm; ++dm)
@@ -345,24 +359,25 @@ void W3DGhostObject::snapShot(int playerIndex)
 		const ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
 		if (di)
 		{
-			W3DModelDraw *w3dDraw= (W3DModelDraw *)di;
-			RenderObjClass *robj=NULL;
+			W3DModelDraw *w3dDraw = (W3DModelDraw *)di;
+			RenderObjClass *robj = w3dDraw->getRenderObject();
 
-			robj=w3dDraw->getRenderObject();
 			//robj may be null for modules which have no render objects such
 			//as for build-ups that are currently disabled.
 			if (robj)
 			{
 				if (snap == NULL)
-				{	
+				{
 					snap = NEW W3DRenderObjectSnapshot(robj, &m_drawableInfo);	// poolify
 					if (prevSnap)
-						prevSnap->m_next=snap;
+						prevSnap->m_next = snap;
 					else
-						m_parentSnapshots[playerIndex]=snap;
+						m_parentSnapshots[playerIndex] = snap;
 				}
 				else
-					m_parentSnapshots[playerIndex]->update(robj, &m_drawableInfo);
+				{
+					snap->update(robj, &m_drawableInfo);
+				}
 
 				//Adding and removing render objects to the scene is expensive
 				//so only do it for the real player watching the screen.  There is
@@ -374,7 +389,7 @@ void W3DGhostObject::snapShot(int playerIndex)
 					snap->addToScene();
 				}
 
-				prevSnap=snap;
+				prevSnap = snap;
 				snap = snap->m_next;
 			}
 		}
@@ -382,16 +397,17 @@ void W3DGhostObject::snapShot(int playerIndex)
 
 	//Check if we captured at least one snapshot
 	if (snap != m_parentSnapshots[playerIndex])
-	{	//save off other info we may need in case the parent object is destroyed.
+	{
+		//save off other info we may need in case the parent object is destroyed.
 		///@todo: We're going to ignore the case where each player index could be
-		//looking at a different geometry info/orientation because ghostobjects
+		//looking at a different geometry info/orientation because ghost objects
 		//are supposed to be used on immobile buildings.
-		m_parentGeometryType=m_parentObject->getGeometryInfo().getGeomType();
-		m_parentGeometryIsSmall=m_parentObject->getGeometryInfo().getIsSmall();
-		m_parentGeometryMajorRadius=m_parentObject->getGeometryInfo().getMajorRadius();
-		m_parentGeometryminorRadius=m_parentObject->getGeometryInfo().getMinorRadius();
-		m_parentPosition=*m_parentObject->getPosition();
-		m_parentAngle=m_parentObject->getOrientation();
+		m_parentGeometryType = m_parentObject->getGeometryInfo().getGeomType();
+		m_parentGeometryIsSmall = m_parentObject->getGeometryInfo().getIsSmall();
+		m_parentGeometryMajorRadius = m_parentObject->getGeometryInfo().getMajorRadius();
+		m_parentGeometryminorRadius = m_parentObject->getGeometryInfo().getMinorRadius();
+		m_parentPosition = *m_parentObject->getPosition();
+		m_parentAngle = m_parentObject->getOrientation();
 	}
 }
 
@@ -400,30 +416,32 @@ void W3DGhostObject::snapShot(int playerIndex)
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::removeParentObject(void)
 {
-
 	// sanity
 	if( m_parentObject == NULL )
 		return;
 
-	Drawable *draw=m_parentObject->getDrawable();
+	Drawable *draw = m_parentObject->getDrawable();
+	if (!draw)
+		return;
 
 	//After we remove the unfogged object, we also disable
 	//anything that should be hidden inside fog - shadow, particles, etc.
 	draw->setFullyObscuredByShroud(true);
 
+	// TheSuperHackers @bugfix Definitely keep this shrouded from here on until the shroud becomes clear again.
+	draw->setShroudClearFrame(InvalidShroudClearFrame);
+
 	//walk through all W3D render objects used by this object
 	for (DrawModule ** dm = draw->getDrawModules(); *dm; ++dm)
 	{
 		const ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
 		if (di)
 		{
-			W3DModelDraw *w3dDraw= (W3DModelDraw *)di;
-			RenderObjClass *robj=NULL;
-
-			robj=w3dDraw->getRenderObject();
+			W3DModelDraw *w3dDraw = (W3DModelDraw *)di;
+			RenderObjClass *robj = w3dDraw->getRenderObject();
 			if (robj)
 			{
-				DEBUG_ASSERTCRASH(robj->Peek_Scene() != NULL, ("Removing GhostObject parent not in scene "));
+				DEBUG_ASSERTCRASH(robj->Peek_Scene() != NULL, ("Removing GhostObject parent not in scene"));
 				robj->Remove();
 			}
 		}
@@ -437,7 +455,11 @@ void W3DGhostObject::restoreParentObject(void)
 {
 	if (TheGlobalData->m_headless)
 		return;
-	Drawable *draw=m_parentObject->getDrawable();
+
+	if (!m_parentObject)
+		return;
+
+	Drawable *draw = m_parentObject->getDrawable();
 	if (!draw)
 		return;
 
@@ -450,19 +472,19 @@ void W3DGhostObject::restoreParentObject(void)
 		const ObjectDrawInterface* di = (*dm)->getObjectDrawInterface();
 		if (di)
 		{
-			W3DModelDraw *w3dDraw= (W3DModelDraw *)di;
-			RenderObjClass *robj=NULL;
+			W3DModelDraw *w3dDraw = (W3DModelDraw *)di;
+			RenderObjClass *robj = w3dDraw->getRenderObject();
 
-			robj=w3dDraw->getRenderObject();
 			//robj may be null for modules which have no render objects such
 			//as for build-ups that are currently disabled.
 			if (robj)
-			{	//if we have a render object that's not in the scene, it must have been
+			{
+				//if we have a render object that's not in the scene, it must have been
 				//removed by the ghost object manager, so restore it.  If we have a render
 				//object that is in the scene, then it was probably added because the model
 				//changed while the object was ghosted (for damage states, garrison, etc.).
-				if (robj->Peek_Scene() == NULL)
-					((SimpleSceneClass *)W3DDisplay::m_3DScene)->Add_Render_Object(robj);
+				if (!robj->Is_In_Scene())
+					W3DDisplay::m_3DScene->Add_Render_Object(robj);
 			}
 		}
 	}
@@ -472,31 +494,15 @@ void W3DGhostObject::restoreParentObject(void)
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::freeAllSnapShots(void)
 {
-	Int playerIndex;
-
-#ifdef DEBUG_FOG_MEMORY
-	for (playerIndex=0; playerIndex<MAX_PLAYER_COUNT; playerIndex++)
-#else
-	playerIndex = TheGhostObjectManager->getLocalPlayerIndex();
-#endif
-		if (m_parentSnapshots[playerIndex])
-		{	//if we have a snapshot for this object, remove it from
-			//scene.
-			removeFromScene(playerIndex);
-
-			//Restore actual objects assuming they are still alive.
-			if (m_parentObject)
-				restoreParentObject();
-
-			W3DRenderObjectSnapshot *snap=m_parentSnapshots[playerIndex];
-			W3DRenderObjectSnapshot *nextSnap;
-			while (snap)
-			{	nextSnap = snap->m_next;
-				delete snap;
-				snap = nextSnap;
-			}
-			m_parentSnapshots[playerIndex]=NULL;
-		}
+	if (TheGhostObjectManager->trackAllPlayers())
+	{
+		for (Int playerIndex = 0; playerIndex < MAX_PLAYER_COUNT; playerIndex++)
+			freeSnapShot(playerIndex);
+	}
+	else
+	{
+		freeSnapShot(TheGhostObjectManager->getLocalPlayerIndex());
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -504,13 +510,9 @@ void W3DGhostObject::freeAllSnapShots(void)
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::freeSnapShot(int playerIndex)
 {
-#ifndef DEBUG_FOG_MEMORY
-	if (playerIndex != TheGhostObjectManager->getLocalPlayerIndex())
-		return;	//we only snapshot things for the local player
-#endif
-
 	if (m_parentSnapshots[playerIndex])
-	{	//if we have a snapshot for this object, remove it from
+	{
+		//if we have a snapshot for this object, remove it from
 		//scene and put back the original object if it still exists.
 		if (playerIndex == TheGhostObjectManager->getLocalPlayerIndex())
 		{
@@ -521,18 +523,18 @@ void W3DGhostObject::freeSnapShot(int playerIndex)
 			removeFromScene(playerIndex);
 
 			//Restore actual objects assuming they are still alive.
-			if (m_parentObject)
-				restoreParentObject();
+			restoreParentObject();
 		}
 
-		W3DRenderObjectSnapshot *snap=m_parentSnapshots[playerIndex];
+		W3DRenderObjectSnapshot *snap = m_parentSnapshots[playerIndex];
 		W3DRenderObjectSnapshot *nextSnap;
 		while (snap)
-		{	nextSnap = snap->m_next;
+		{
+			nextSnap = snap->m_next;
 			delete snap;
 			snap = nextSnap;
 		}
-		m_parentSnapshots[playerIndex]=NULL;
+		m_parentSnapshots[playerIndex] = NULL;
 	}
 }
 
@@ -547,54 +549,44 @@ void W3DGhostObject::updateParentObject(Object *object, PartitionData *mod)
 // ------------------------------------------------------------------------------------------------
 /**Remove the dummy render objects from scene that belong to given player*/
 // ------------------------------------------------------------------------------------------------
-void W3DGhostObject::removeFromScene(int playerIndex)
+Bool W3DGhostObject::removeFromScene(int playerIndex)
 {
-	W3DRenderObjectSnapshot *snap=m_parentSnapshots[playerIndex];
+	W3DRenderObjectSnapshot *snap = m_parentSnapshots[playerIndex];
+
+	Bool removed = false;
 
 	while (snap)
 	{
-		snap->m_robj->Remove();
-		snap=snap->m_next;
+		removed |= snap->removeFromScene();
+		snap = snap->m_next;
 	}
+
+	return removed;
 }
 
 // ------------------------------------------------------------------------------------------------
 /**Add the dummy render objects to scene so player sees the correct version within the fog*/
 // ------------------------------------------------------------------------------------------------
-void W3DGhostObject::addToScene(int playerIndex)
+Bool W3DGhostObject::addToScene(int playerIndex)
 {
-	W3DRenderObjectSnapshot *snap=m_parentSnapshots[playerIndex];
+	W3DRenderObjectSnapshot *snap = m_parentSnapshots[playerIndex];
+
+	Bool added = false;
 
 	while (snap)
 	{
-		((SimpleSceneClass *)W3DDisplay::m_3DScene)->Add_Render_Object(snap->m_robj);
-		snap=snap->m_next;
+		added |= snap->addToScene();
+		snap = snap->m_next;
 	}
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-void W3DGhostObject::release(void)
-{
-	W3DRenderObjectSnapshot *snap,*nextSnap;
 
-	for (Int i=0; i<MAX_PLAYER_COUNT; i++)
-	{	snap = m_parentSnapshots[i];
-		while (snap)
-		{
-			nextSnap=snap->m_next;
-			delete snap;
-			snap=nextSnap;
-		}
-		m_parentSnapshots[i]=NULL;
-	}
+	return added;
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void W3DGhostObject::getShroudStatus(int playerIndex)
+ObjectShroudStatus W3DGhostObject::getShroudStatus(int playerIndex)
 {
-	m_partitionData->getShroudedStatus(playerIndex); 
+	return m_partitionData->getShroudedStatus(playerIndex);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -602,11 +594,9 @@ void W3DGhostObject::getShroudStatus(int playerIndex)
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::crc( Xfer *xfer )
 {
-
 	// extend base class
 	GhostObject::crc( xfer );
-
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
@@ -615,7 +605,6 @@ void W3DGhostObject::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::xfer( Xfer *xfer )
 {
-
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
@@ -623,7 +612,7 @@ void W3DGhostObject::xfer( Xfer *xfer )
 
 	// extend base class
 	GhostObject::xfer( xfer );
-	
+
 	// xfer the drawable info object id
 	xfer->xferObjectID( &m_drawableInfo.m_shroudStatusObjectID );
 
@@ -635,40 +624,35 @@ void W3DGhostObject::xfer( Xfer *xfer )
 	xfer->xferDrawableID( &drawableID );
 	if( xfer->getXferMode() == XFER_LOAD )
 	{
-
 		// reconnect the drawable pointer
 		m_drawableInfo.m_drawable = TheGameClient->findDrawableByID( drawableID );
 
 		// sanity
 		if( drawableID != INVALID_DRAWABLE_ID && m_drawableInfo.m_drawable == NULL )
-			DEBUG_CRASH(( "W3DGhostObject::xfer - Unable to find drawable for ghost object\n" ));
-
-	}  // end if
+			DEBUG_CRASH(( "W3DGhostObject::xfer - Unable to find drawable for ghost object" ));
+	}
 
 	//
 	// no need to mess with this "circular" back into itself pointer to the ghost object
 	// because it is already valid and assigned upon creation of this ghost object
 	//
 	// m_drawableInfo.m_ghostObject <--- no need to mess with this
-	
+
 	// xfer snapshot array
 	UnsignedByte snapshotCount;
 	for( Int i = 0; i < MAX_PLAYER_COUNT; ++i )
 	{
-
 		// count the snapshots at this index
 		snapshotCount = 0;
 		W3DRenderObjectSnapshot *objectSnapshot = m_parentSnapshots[ i ];
 		while( objectSnapshot )
 		{
-		
 			// increment count
 			snapshotCount++;
 
 			// on to the next snapshot
 			objectSnapshot = objectSnapshot->m_next;
-
-		}  // end while
+		}
 
 		// xfer the snapshot count at this index
 		xfer->xferUnsignedByte( &snapshotCount );
@@ -679,24 +663,21 @@ void W3DGhostObject::xfer( Xfer *xfer )
 		//
 		if( snapshotCount == 0 && m_parentSnapshots[ i ] != NULL )
 		{
-
-			DEBUG_CRASH(( "W3DGhostObject::xfer - m_parentShapshots[ %d ] has data present but the count from the xfer stream is empty\n" ));
+			DEBUG_CRASH(( "W3DGhostObject::xfer - m_parentShapshots[ %d ] has data present but the count from the xfer stream is empty", i ));
 			throw INI_INVALID_DATA;
-
-		}  // end if
+		}
 
 		// xfer each of the snapshots at this index
 		Real scale;
 		UnsignedInt color;
 		AsciiString name;
+
 		if( xfer->getXferMode() == XFER_SAVE )
 		{
-
 			// iterate through list
 			objectSnapshot = m_parentSnapshots[ i ];
 			while( objectSnapshot )
 			{
-
 				// write name from render object
 				name.set( objectSnapshot->m_robj->Get_Name() );
 				xfer->xferAsciiString( &name );
@@ -714,10 +695,8 @@ void W3DGhostObject::xfer( Xfer *xfer )
 
 				// onto the next
 				objectSnapshot = objectSnapshot->m_next;
-
-			}  // end while
-
-		}  // end if, save
+			}
+		}
 		else
 		{
 			RenderObjClass *renderObject;
@@ -725,7 +704,6 @@ void W3DGhostObject::xfer( Xfer *xfer )
 
 			for( UnsignedByte j = 0; j < snapshotCount; ++j )
 			{
-
 				// read render object name
 				xfer->xferAsciiString( &name );
 
@@ -754,19 +732,16 @@ void W3DGhostObject::xfer( Xfer *xfer )
 
 				// add snapshot to the scene
 				objectSnapshot->addToScene();
-										
-			}  // end for, j	
-
-		}  // end else, load
-
-	}  // end for, i
+			}
+		}
+	}
 
 	//
 	// since there is a snapshot for this object, there cannot be a regular object/drawable
 	// in the world, we need to remove it
 	//
-	if( m_parentObject && 
-			m_parentSnapshots[ ThePlayerList->getLocalPlayer()->getPlayerIndex() ] != NULL &&
+	if( m_parentObject &&
+			m_parentSnapshots[TheGhostObjectManager->getLocalPlayerIndex()] != NULL &&
 			xfer->getXferMode() == XFER_LOAD )
 		removeParentObject();
 
@@ -782,15 +757,12 @@ void W3DGhostObject::xfer( Xfer *xfer )
 	ObjectShroudStatus status;
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
-
 		// iterate through all array points
 		for( playerIndex = 0; playerIndex < MAX_PLAYER_COUNT; ++playerIndex )
 		{
-
 			// is this a location with any info
 			if( m_parentSnapshots[ playerIndex ] )
 			{
-
 				// write this index
 				xfer->xferUnsignedByte( &playerIndex );
 
@@ -801,12 +773,9 @@ void W3DGhostObject::xfer( Xfer *xfer )
 				// write previous shroudedness
 				status = m_partitionData->friend_getShroudednessPrevious( playerIndex );
 				xfer->xferUser( &status, sizeof( ObjectShroudStatus ) );
-
-			}  // end if, snapshot list here exists
-
-		}  // end for, i
-
-	}  // end if, save
+			}
+		}
+	}
 	else
 	{
 		UnsignedByte i;
@@ -825,32 +794,25 @@ void W3DGhostObject::xfer( Xfer *xfer )
 			// read shroudedness previous and set
 			xfer->xferUser( &status, sizeof( ObjectShroudStatus ) );
 			m_partitionData->friend_setShroudednessPrevious( playerIndex, status );
-
-		}  // end for, i
-
-	}  // end else load
-		
-}  // end xfer
+		}
+	}
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObject::loadPostProcess( void )
 {
-
 	// extend base class
 	GhostObject::loadPostProcess();
-
-}  // end loadPostProcess
+}
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 W3DGhostObjectManager::W3DGhostObjectManager(void)
 {
-
 	m_freeModules = NULL;
 	m_usedModules = NULL;
-	
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -858,15 +820,15 @@ W3DGhostObjectManager::W3DGhostObjectManager(void)
 W3DGhostObjectManager::~W3DGhostObjectManager()
 {
 	reset();	//make sure it's empty
-	
+
 	W3DGhostObject *mod = m_freeModules;
 	W3DGhostObject *nextmod;
 
 	while (mod)
 	{
-		nextmod=mod->m_nextSystem;
+		nextmod = mod->m_nextSystem;
 		delete mod;
-		mod=nextmod;
+		mod = nextmod;
 	}
 }
 
@@ -874,30 +836,32 @@ W3DGhostObjectManager::~W3DGhostObjectManager()
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObjectManager::reset(void)
 {
+	GhostObjectManager::reset();
+
 	W3DGhostObject *mod = m_usedModules;
 	W3DGhostObject *nextmod;
 
 	//Remove any orphaned modules that were not deleted with their parent object because player had fogged memory of them.
 	while (mod)
 	{
-		nextmod=mod->m_nextSystem;
+		nextmod = mod->m_nextSystem;
 		if (!mod->m_parentObject)	//make sure it has no parent object
 		{
 			ThePartitionManager->unRegisterGhostObject(mod);
 			removeGhostObject(mod);
 		}
-		mod=nextmod;
+		mod = nextmod;
 	}
 
 	DEBUG_ASSERTCRASH(m_usedModules == NULL, ("Reset of Non-Empty GhostObjectManager"));
 
 	//Delete any remaining modules (should be none)
-	mod=m_usedModules;
+	mod = m_usedModules;
 	while (mod)
 	{
-		nextmod=mod->m_nextSystem;
+		nextmod = mod->m_nextSystem;
 		removeGhostObject(mod);
-		mod=nextmod;
+		mod = nextmod;
 	}
 }
 
@@ -932,27 +896,22 @@ void W3DGhostObjectManager::removeGhostObject(GhostObject *object)
 // ------------------------------------------------------------------------------------------------
 GhostObject *W3DGhostObjectManager::addGhostObject(Object *object, PartitionData *pd)
 {
-
 	// we disabled adding new ghost objects - used during map border resizing and loading
 	if (m_lockGhostObjects || m_saveLockGhostObjects )
 		return NULL;
 
-#ifdef DEBUG_FOG_MEMORY
+#if defined(DEBUG_FOG_MEMORY) && defined(DEBUG_CRASHING)
 	// sanity
 	if( object != NULL )
 	{
-
 		W3DGhostObject *sanity = m_usedModules;
 		while( sanity )
 		{
-
-			DEBUG_ASSERTCRASH( sanity->m_parentObject != object,	
-												 ("W3DGhostObjectManager::addGhostObject - Duplicate ghost object detected\n") );
+			DEBUG_ASSERTCRASH( sanity->m_parentObject != object,
+				("W3DGhostObjectManager::addGhostObject - Duplicate ghost object detected") );
 			sanity = sanity->m_nextSystem;
-
-		}  // end while
-
-	}  // end if
+		}
+	}
 #endif
 
 	W3DGhostObject *mod = m_freeModules;
@@ -978,46 +937,75 @@ GhostObject *W3DGhostObjectManager::addGhostObject(Object *object, PartitionData
 	m_usedModules = mod;
 
 	//Copy settings from parent object
-	mod->m_parentObject=object;
-	mod->m_drawableInfo.m_drawable=NULL;	//these dummy render objects don't have drawables.
+	mod->m_parentObject = object;
+	mod->m_drawableInfo.m_drawable = NULL;	//these dummy render objects don't have drawables.
 	mod->m_drawableInfo.m_ghostObject = mod;
-	mod->m_partitionData=pd;
+	mod->m_partitionData = pd;
 
 	return mod;
 }
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void W3DGhostObjectManager::setLocalPlayerIndex(int index)
+void W3DGhostObjectManager::setLocalPlayerIndex(int playerIndex)
 {
+	const int oldPlayerIndex = getLocalPlayerIndex();
+
+	if (playerIndex == oldPlayerIndex)
+		return;
+
+	GhostObjectManager::setLocalPlayerIndex(playerIndex);
+
 	//Whenever we switch local players, we need to remove all ghost objects belonging
 	//to another player from the map.  We then insert the current local player's
 	//ghost objects into the map.
+	// TheSuperHackers @bugfix xezon 06/09/2025 This function now properly
+	// updates ghost objects and real objects when changing players.
 
 	W3DGhostObject *mod = m_usedModules;
 
 	while (mod)
 	{
-		mod->removeFromScene(m_localPlayer);
-		if (mod->m_parentSnapshots[index])
-		{	//new player has his own snapshot
-			if (!mod->m_parentSnapshots[m_localPlayer] && mod->m_parentObject)
-			{	//previous player didn't have a snapshot so real object must
-				//have been in the scene.  Replace it with our snapshot.
-				mod->removeParentObject();
-			}
-			mod->addToScene(index);
+		const Bool oldGhostRemoved = mod->removeFromScene(oldPlayerIndex);
+		const ObjectShroudStatus newShroudStatus = mod->getShroudStatus(playerIndex);
+		Bool newGhostAdded = false;
+
+		if (newShroudStatus >= OBJECTSHROUD_FOGGED)
+		{
+			newGhostAdded = mod->addToScene(playerIndex);
 		}
-		//new player doesn't have a snapshot which means restore original object
-		//if it was replaced by a snapshot by the previous player.
-		else
-		if (mod->m_parentSnapshots[m_localPlayer] && mod->m_parentObject)
+
+		if (oldGhostRemoved && !newGhostAdded)
+		{
 			mod->restoreParentObject();
-	
-		mod=mod->m_nextSystem;
+		}
+		else if (!oldGhostRemoved && newGhostAdded)
+		{
+			mod->removeParentObject();
+		}
+
+		mod = mod->m_nextSystem;
 	}
 
-	m_localPlayer = index;
+	// TheSuperHackers @bugfix xezon 06/09/2025 This function now properly updates
+	// all real objects when changing players without waiting for another logic step.
+	// This is particularly noticeable when changing the player while the game is paused.
+	for (Drawable* draw = TheGameClient->firstDrawable(); draw != NULL; draw = draw->getNextDrawable())
+	{
+		Object* obj = draw->getObject();
+		if (obj == NULL)
+			continue;
+
+		const ObjectShroudStatus shroudStatus = obj->getShroudedStatus(playerIndex);
+		const Bool shrouded = shroudStatus >= OBJECTSHROUD_FOGGED;
+		draw->setFullyObscuredByShroud(shrouded);
+
+		if (shrouded)
+		{
+			// TheSuperHackers @bugfix Definitely keep this shrouded from here on until the shroud becomes clear again.
+			draw->setShroudClearFrame(InvalidShroudClearFrame);
+		}
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -1026,40 +1014,48 @@ a GhostObject in case any players didn't see the death and have a fogged view of
 We need to manually determine if these orphaned GhostObjects ever become visible and are no longer
 needed*/
 // ------------------------------------------------------------------------------------------------
-void W3DGhostObjectManager::updateOrphanedObjects(int *playerIndexList, int numNonLocalPlayers)
+void W3DGhostObjectManager::updateOrphanedObjects(int *playerIndexList, int playerIndexCount)
 {
-
 	W3DGhostObject *mod = m_usedModules, *nextmod;
 	int numStoredSnapshots;
 
 	while (mod)
 	{
-		//updating the shroud status of this ghostobject could remove
+		//updating the shroud status of this ghost object could remove
 		//it from the scene if it becomes visible but parent object is gone.
-		nextmod=mod->m_nextSystem;
+		nextmod = mod->m_nextSystem;
 		if (!mod->m_parentObject)
-		{	
-			numStoredSnapshots=0;
-#ifdef DEBUG_FOG_MEMORY
-			for (int i=0; i<numNonLocalPlayers; i++, playerIndexList++)
+		{
+			numStoredSnapshots = 0;
+
+			if (playerIndexList != NULL && playerIndexCount > 0)
 			{
-				if (mod->m_parentSnapshots[*playerIndexList])
-					mod->getShroudStatus(*playerIndexList);
-				if (mod->m_parentSnapshots[*playerIndexList])
-					numStoredSnapshots++;
+				int* playerIndex = playerIndexList;
+				int* const playerIndexEnd = playerIndexList + playerIndexCount;
+				for (; playerIndex < playerIndexEnd; ++playerIndex)
+				{
+					if (mod->m_parentSnapshots[*playerIndex])
+						mod->getShroudStatus(*playerIndex);
+
+					if (mod->m_parentSnapshots[*playerIndex])
+						numStoredSnapshots++;
+				}
 			}
-#endif
+
 			mod->getShroudStatus(m_localPlayer);
+
 			if (mod->m_parentSnapshots[m_localPlayer])
 					numStoredSnapshots++;
+
 			if (!numStoredSnapshots)
-			{	ThePartitionManager->unRegisterGhostObject(mod);
-				mod->m_partitionData=NULL;
+			{
+				ThePartitionManager->unRegisterGhostObject(mod);
+				mod->m_partitionData = NULL;
 				removeGhostObject(mod);
 			}
 		}
 
-		mod=nextmod;
+		mod = nextmod;
 	}
 }
 
@@ -1075,7 +1071,8 @@ void W3DGhostObjectManager::releasePartitionData(void)
 
 	while (mod)
 	{
-		nextmod=mod->m_nextSystem;
+		nextmod = mod->m_nextSystem;
+
 		//if module has no parent object, then its holding a ghost object which
 		//needs to have it's own partition data.
 		if (!mod->m_parentObject)
@@ -1084,7 +1081,8 @@ void W3DGhostObjectManager::releasePartitionData(void)
 			mod->m_partitionData = NULL;
 		}
 		else
-		{	//The parent object will handle unregistering so just tell to break the
+		{
+			//The parent object will handle unregistering so just tell to break the
 			//ghost object link.
 			mod->friend_getPartitionData()->friend_setGhostObject(NULL);
 			mod->m_partitionData = NULL;
@@ -1104,28 +1102,30 @@ void W3DGhostObjectManager::restorePartitionData(void)
 	while (mod)
 	{
 		nextmod=mod->m_nextSystem;
+
 		//if module has no parent object, then its holding a ghost object which
 		//needs to have it's own partition data.
 		if (mod->m_parentObject)
 		{
 			//restore into parent's partition data
 			mod->m_parentObject->friend_getPartitionData()->friend_setGhostObject(mod);
-			mod->m_partitionData=mod->m_parentObject->friend_getPartitionData();
+			mod->m_partitionData = mod->m_parentObject->friend_getPartitionData();
 		}
 		else
-		{	
+		{
 			//restore into our own partition data
 			ThePartitionManager->registerGhostObject(mod);
 		}
 
 		//set partition data to reflect that we've seen a fogged version
 		//of this object if one exists.
-		for (Int i=0; i<MAX_PLAYER_COUNT; i++)
-		{	if (mod->m_parentSnapshots[i])
+		for (Int i = 0; i < MAX_PLAYER_COUNT; i++)
+		{
+			if (mod->m_parentSnapshots[i])
 				mod->m_partitionData->friend_setShroudednessPrevious(i,OBJECTSHROUD_FOGGED);
 		}
 
-		mod=nextmod;
+		mod = nextmod;
 	}
 }
 
@@ -1134,11 +1134,9 @@ void W3DGhostObjectManager::restorePartitionData(void)
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObjectManager::crc( Xfer *xfer )
 {
-
 	// extend base class
 	GhostObjectManager::crc( xfer );
-
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
@@ -1147,7 +1145,6 @@ void W3DGhostObjectManager::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObjectManager::xfer( Xfer *xfer )
 {
-
 	// version
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
@@ -1169,11 +1166,9 @@ void W3DGhostObjectManager::xfer( Xfer *xfer )
 	ObjectID objectID;
 	if( xfer->getXferMode() == XFER_SAVE )
 	{
-
 		// iterate all ghost objects
 		for( w3dGhostObject = m_usedModules; w3dGhostObject; w3dGhostObject = w3dGhostObject->m_nextSystem )
 		{
-
 			// write out object ID
 			if( w3dGhostObject->m_parentObject )
 				objectID = w3dGhostObject->m_parentObject->getID();
@@ -1183,80 +1178,68 @@ void W3DGhostObjectManager::xfer( Xfer *xfer )
 
 			// write out ghost object data
 			xfer->xferSnapshot( w3dGhostObject );
-
-		}  // end for, ghostObject
-
-	}  // end if, saving
+		}
+	}
 	else
 	{
-
 		// sanity, there should be no ghost objects loaded at this time
-		DEBUG_ASSERTCRASH( m_usedModules == NULL, 
-											 ("W3DGhostObjectManager::xfer - The used module list is not NULL upon load, but should be!\n") );
+		DEBUG_ASSERTCRASH( m_usedModules == NULL,
+			("W3DGhostObjectManager::xfer - The used module list is not NULL upon load, but should be!") );
 
 		// now it's time to unlock the ghost objects for loading
 		DEBUG_ASSERTCRASH( m_saveLockGhostObjects == TRUE,
-											 ("W3DGhostObjectManager::xfer - Ghost object manager is not save locked, but should be\n") );
+			("W3DGhostObjectManager::xfer - Ghost object manager is not save locked, but should be") );
+
 		TheGhostObjectManager->saveLockGhostObjects( FALSE );
 
 		// read all ghost objects
 		GhostObject *ghostObject;
 		Object *object;
+
 		for( UnsignedShort i = 0; i < count; ++i )
 		{
-
 			// read object id
 			xfer->xferObjectID( &objectID );
-					
+
 			// get object from id
 			object = TheGameLogic->findObjectByID( objectID );
 
 			// create ghost object data
 			if( object )
 			{
-				
 				// create ghost object
 				ghostObject = addGhostObject( object, object->friend_getPartitionData() );
 
 				// sanity
-				DEBUG_ASSERTCRASH( ghostObject != NULL, 
-													 ("W3DGhostObjectManager::xfer - Could not create ghost object for object '%s'\n", 
-													 object->getTemplate()->getName().str()) );
+				DEBUG_ASSERTCRASH( ghostObject != NULL,
+					("W3DGhostObjectManager::xfer - Could not create ghost object for object '%s'", object->getTemplate()->getName().str()) );
 
 				// link the ghost object and logical object togehter through partition/ghostObject dat
 				DEBUG_ASSERTCRASH( object->friend_getPartitionData()->getGhostObject() == NULL,
-													 ("W3DGhostObjectManager::xfer - Ghost object already on object '%s'\n",
-													  object->getTemplate()->getName().str()) );
-				object->friend_getPartitionData()->friend_setGhostObject( ghostObject );
+					("W3DGhostObjectManager::xfer - Ghost object already on object '%s'", object->getTemplate()->getName().str()) );
 
-			}  // end if
+				object->friend_getPartitionData()->friend_setGhostObject( ghostObject );
+			}
 			else
 			{
-
 				// create object with no object or partition data
 				ghostObject = addGhostObject( NULL, NULL );
 
 				// register ghost object object with partition system and fill out partition data
 				ThePartitionManager->registerGhostObject( ghostObject );
-
-			}  // end else
+			}
 
 			// read ghost object data
 			xfer->xferSnapshot( ghostObject );
-
-		}  // end for, i
-
-	}  // end else, loading
-
-}  // end xfer
+		}
+	}
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
 // ------------------------------------------------------------------------------------------------
 void W3DGhostObjectManager::loadPostProcess( void )
 {
-
 	// extend base class
 	GhostObjectManager::loadPostProcess();
-
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
index d5de687649e..0b7a8ef24a1 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameLogic/W3DTerrainLogic.cpp
@@ -41,11 +41,6 @@
 #include "GameLogic/AI.h"
 #include "GameLogic/AIPathfind.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -53,8 +48,8 @@ W3DTerrainLogic::W3DTerrainLogic():
 m_mapMinZ(0),
 m_mapMaxZ(1)
 {
-	m_mapData = NULL; 
-}  // end W3DTerrainLogic
+	m_mapData = NULL;
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -63,7 +58,7 @@ W3DTerrainLogic::~W3DTerrainLogic()
 
 	// free terrain data
 
-}  // end W3DTerrainLogic
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Device DEPENDENT implementation init details for logical terrain */
@@ -78,7 +73,7 @@ void W3DTerrainLogic::init( void )
 	m_mapMinZ = 0;
 	m_mapMaxZ = 1;
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -91,7 +86,7 @@ void W3DTerrainLogic::reset( void )
 	m_mapMinZ = 0;
 	m_mapMaxZ = 1;
 	WorldHeightMap::freeListOfMapObjects();
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** newMap */
@@ -101,7 +96,7 @@ void W3DTerrainLogic::newMap( Bool saveGame )
 
 	TheTerrainRenderObject->loadRoadsAndBridges( this, saveGame );
 	TerrainLogic::newMap( saveGame );
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update */
@@ -109,7 +104,7 @@ void W3DTerrainLogic::newMap( Bool saveGame )
 void W3DTerrainLogic::update( void )
 {
 	TerrainLogic::update();
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Device DEPENDENT implementation for load details of logical terrain.
@@ -122,23 +117,6 @@ Bool W3DTerrainLogic::loadMap( AsciiString filename , Bool query )
 
 	WorldHeightMap *terrainHeightMap;				///< holds raw heightmap data samples
 
-	char	tempBuf[_MAX_PATH];
-	char	filenameBuf[_MAX_PATH];
-	int length = 0;
-
-	strcpy(tempBuf, filename.str());
-
-	length = strlen( tempBuf );
-	if( length >= 4 )
-	{
-		memset( filenameBuf, '\0', _MAX_PATH);
-		strncpy( filenameBuf, tempBuf, length - 4);
-	}
-
-//	const char *fname = filename.reverseFind('\\');
-//	if (fname)
-//		filename = fname+1;
-
 	CachedFileInputStream fileStrm;
 	if ( !fileStrm.open(filename) )
 	{
@@ -192,12 +170,12 @@ Bool W3DTerrainLogic::loadMap( AsciiString filename , Bool query )
 
 	return TRUE;  // success
 
-}  // end load
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the 3D extent of the terrain in world coordinates */
 //-------------------------------------------------------------------------------------------------
-void W3DTerrainLogic::getExtent( Region3D *extent ) const 
+void W3DTerrainLogic::getExtent( Region3D *extent ) const
 {
 	extent->lo.x = 0.0f;
 
@@ -205,7 +183,7 @@ void W3DTerrainLogic::getExtent( Region3D *extent ) const
 
 	// Note - m_boundaries are stored in height map grids wide, so we have to
 	// multiply by the grid width.
-	if (m_boundaries.size() > 0) {
+	if (!m_boundaries.empty()) {
 		extent->hi.x = m_boundaries[m_activeBoundary].x*MAP_XY_FACTOR;
 		extent->hi.y = m_boundaries[m_activeBoundary].y*MAP_XY_FACTOR;
 	} else {
@@ -249,7 +227,7 @@ void W3DTerrainLogic::getMaximumPathfindExtent( Region3D *extent ) const
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void W3DTerrainLogic::getExtentIncludingBorder( Region3D *extent ) const 
+void W3DTerrainLogic::getExtentIncludingBorder( Region3D *extent ) const
 {
 	extent->lo.x = 0.0f;
 	extent->lo.y = 0.0f;
@@ -264,10 +242,10 @@ void W3DTerrainLogic::getExtentIncludingBorder( Region3D *extent ) const
 //-------------------------------------------------------------------------------------------------
 Bool W3DTerrainLogic::isClearLineOfSight(const Coord3D& pos, const Coord3D& posOther) const
 {
-	if (TheTerrainRenderObject) 
+	if (TheTerrainRenderObject)
 	{
 		return TheTerrainRenderObject->isClearLineOfSight(pos, posOther);
-	}	
+	}
 	else
 	{
 		return false;
@@ -283,14 +261,14 @@ Real W3DTerrainLogic::getGroundHeight( Real x, Real y, Coord3D* normal ) const
 #ifdef USE_THE_TERRAIN_OBJECT
 	// TheSuperHackers @logic-client-separation helmutbuhler 11/04/2025
 	// W3DTerrainLogic shouldn't depend on TheTerrainRenderObject!
-	if (TheTerrainRenderObject) 
+	if (TheTerrainRenderObject)
 	{
 		return TheTerrainRenderObject->getHeightMapHeight(x,y,normal);
-	}	
-	else 
+	}
+	else
 	{
 		if (normal)
-		{	
+		{
 			//return a default normal pointing up
 			normal->x=0.0f;
 			normal->y=0.0f;
@@ -299,7 +277,7 @@ Real W3DTerrainLogic::getGroundHeight( Real x, Real y, Coord3D* normal ) const
 		return 0;
 	}
 #endif
-}  // end getHight
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get the height considering the layer. */
@@ -311,7 +289,7 @@ Real W3DTerrainLogic::getLayerHeight( Real x, Real y, PathfindLayerEnum layer, C
 	if (!TheTerrainRenderObject)
 	{
 		if (normal)
-		{	
+		{
 			//return a default normal pointing up
 			normal->x=0.0f;
 			normal->y=0.0f;
@@ -322,15 +300,15 @@ Real W3DTerrainLogic::getLayerHeight( Real x, Real y, PathfindLayerEnum layer, C
 
 	Real height = TheTerrainRenderObject->getHeightMapHeight(x,y,normal);
 
-	if (layer != LAYER_GROUND) 
+	if (layer != LAYER_GROUND)
 	{
 		Coord3D loc;
 		loc.x = x;
 		loc.y = y;
 		loc.z = height;
-		if (layer == LAYER_WALL) 
+		if (layer == LAYER_WALL)
 		{
-			if (!clip || TheAI->pathfinder()->isPointOnWall(&loc)) 
+			if (!clip || TheAI->pathfinder()->isPointOnWall(&loc))
 			{
 				return TheAI->pathfinder()->getWallHeight();
 			}
@@ -340,10 +318,10 @@ Real W3DTerrainLogic::getLayerHeight( Real x, Real y, PathfindLayerEnum layer, C
 			}
 		}
 		Bridge* pBridge;
-		if ((pBridge = findBridgeLayerAt(&loc, layer, clip)) != 0) 
+		if ((pBridge = findBridgeLayerAt(&loc, layer, clip)) != 0)
 		{
 			Real bridgeHeight = pBridge->getBridgeHeight(&loc, normal);
-			if (bridgeHeight > height) 
+			if (bridgeHeight > height)
 			{
 				return bridgeHeight;	// Don't return bridge height if it's in the ground.
 			}
@@ -353,7 +331,7 @@ Real W3DTerrainLogic::getLayerHeight( Real x, Real y, PathfindLayerEnum layer, C
 	return height;
 
 #endif
-}  // end getLayerHeight
+}
 
 //-------------------------------------------------------------------------------------------------
 /** W3D isCliffCell for terrain logic */
@@ -364,7 +342,7 @@ Bool W3DTerrainLogic::isCliffCell( Real x, Real y) const
 	// W3DTerrainLogic shouldn't depend on TheTerrainRenderObject!
 	return TheTerrainRenderObject->isCliffCell(x,y);
 
-}  // end isCliffCell
+}
 
 // ------------------------------------------------------------------------------------------------
 /** CRC */
@@ -375,7 +353,7 @@ void W3DTerrainLogic::crc( Xfer *xfer )
 	// extend base class
 	TerrainLogic::crc( xfer );
 
-}  // end crc
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Xfer
@@ -389,11 +367,11 @@ void W3DTerrainLogic::xfer( Xfer *xfer )
 	XferVersion currentVersion = 1;
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
-	
+
 	// extend base class
 	TerrainLogic::xfer( xfer );
-		
-}  // end xfer
+
+}
 
 // ------------------------------------------------------------------------------------------------
 /** Load post process */
@@ -404,4 +382,4 @@ void W3DTerrainLogic::loadPostProcess( void )
 	// extend base class
 	TerrainLogic::loadPostProcess();
 
-}  // end loadPostProcess
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp
deleted file mode 100644
index 9eb8ca5fe79..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFile.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-////// Win32BIGFile.cpp /////////////////////////
-// Bryan Cleveland, August 2002
-/////////////////////////////////////////////////////
-
-#include "Common/LocalFile.h"
-#include "Common/LocalFileSystem.h"
-#include "Common/RAMFile.h"
-#include "Common/StreamingArchiveFile.h"
-#include "Common/GameMemory.h"
-#include "Common/PerfTimer.h"
-#include "Win32Device/Common/Win32BIGFile.h"
-
-//============================================================================
-// Win32BIGFile::Win32BIGFile
-//============================================================================
-
-Win32BIGFile::Win32BIGFile()
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::~Win32BIGFile
-//============================================================================
-
-Win32BIGFile::~Win32BIGFile()
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::openFile
-//============================================================================
-
-File* Win32BIGFile::openFile( const Char *filename, Int access ) 
-{
-	const ArchivedFileInfo *fileInfo = getArchivedFileInfo(AsciiString(filename));
-
-	if (fileInfo == NULL) {
-		return NULL;
-	}
-
-	RAMFile *ramFile = NULL;
-	
-	if (BitIsSet(access, File::STREAMING)) 
-		ramFile = newInstance( StreamingArchiveFile );
-	else 
-		ramFile = newInstance( RAMFile );
-
-	ramFile->deleteOnClose();
-	if (ramFile->openFromArchive(m_file, fileInfo->m_filename, fileInfo->m_offset, fileInfo->m_size) == FALSE) {
-		ramFile->close();
-		ramFile = NULL;
-		return NULL;
-	}
-
-	if ((access & File::WRITE) == 0) {
-		// requesting read only access. Just return the RAM file.
-		return ramFile;
-	}
-
-	// whoever is opening this file wants write access, so copy the file to the local disk
-	// and return that file pointer.
-
-	File *localFile = TheLocalFileSystem->openFile(filename, access);
-	if (localFile != NULL) {
-		ramFile->copyDataToFile(localFile);
-	}
-
-	ramFile->close();
-	ramFile = NULL;
-
-	return localFile;
-}
-
-//============================================================================
-// Win32BIGFile::closeAllFiles
-//============================================================================
-
-void Win32BIGFile::closeAllFiles( void )
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::getName
-//============================================================================
-
-AsciiString Win32BIGFile::getName( void )
-{
-	return m_name;
-}
-
-//============================================================================
-// Win32BIGFile::getPath
-//============================================================================
-
-AsciiString Win32BIGFile::getPath( void )
-{
-	return m_path;
-}
-
-//============================================================================
-// Win32BIGFile::setSearchPriority
-//============================================================================
-
-void Win32BIGFile::setSearchPriority( Int new_priority )
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::close
-//============================================================================
-
-void Win32BIGFile::close( void )
-{
-
-}
-
-//============================================================================
-// Win32BIGFile::getFileInfo
-//============================================================================
-
-Bool Win32BIGFile::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const 
-{
-	const ArchivedFileInfo *tempFileInfo = getArchivedFileInfo(filename);
-
-	if (tempFileInfo == NULL) {
-		return FALSE;
-	}
-
-	TheLocalFileSystem->getFileInfo(AsciiString(m_file->getName()), fileInfo);
-
-	// fill in the size info.  Since the size can't be bigger than a JUNK file, the high Int will always be 0.
-	fileInfo->sizeHigh = 0;
-	fileInfo->sizeLow = tempFileInfo->m_size;
-
-	return TRUE;
-}
-
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
deleted file mode 100644
index 8ba95f2adba..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-//////// Win32BIGFileSystem.h ///////////////////////////
-// Bryan Cleveland, August 2002
-/////////////////////////////////////////////////////////////
-
-#include "Common/AudioAffect.h"
-#include "Common/ArchiveFile.h"
-#include "Common/ArchiveFileSystem.h"
-#include "Common/file.h"
-#include "Common/GameAudio.h"
-#include "Common/GameMemory.h"
-#include "Common/LocalFileSystem.h"
-#include "Win32Device/Common/Win32BIGFile.h"
-#include "Win32Device/Common/Win32BIGFileSystem.h"
-#include "Common/Registry.h"
-#include "Utility/endian_compat.h"
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
-
-static const char *BIGFileIdentifier = "BIGF";
-
-Win32BIGFileSystem::Win32BIGFileSystem() : ArchiveFileSystem() {
-}
-
-Win32BIGFileSystem::~Win32BIGFileSystem() {
-}
-
-void Win32BIGFileSystem::init() {
-	DEBUG_ASSERTCRASH(TheLocalFileSystem != NULL, ("TheLocalFileSystem must be initialized before TheArchiveFileSystem."));
-	if (TheLocalFileSystem == NULL) {
-		return;
-	}
-
-	loadBigFilesFromDirectory("", "*.big");
-
-    // load original Generals assets
-    AsciiString installPath;
-    GetStringFromGeneralsRegistry("", "InstallPath", installPath );
-    //@todo this will need to be ramped up to a crash for release
-#ifndef RTS_INTERNAL
-    // had to make this non-internal only, otherwise we can't autobuild
-    // GeneralsZH...
-    DEBUG_ASSERTCRASH(installPath != "", ("Be 1337! Go install Generals!"));
-#endif
-    if (installPath!="")
-      loadBigFilesFromDirectory(installPath, "*.big");
-}
-
-void Win32BIGFileSystem::reset() {
-}
-
-void Win32BIGFileSystem::update() {
-}
-
-void Win32BIGFileSystem::postProcessLoad() {
-}
-
-ArchiveFile * Win32BIGFileSystem::openArchiveFile(const Char *filename) {
-	File *fp = TheLocalFileSystem->openFile(filename, File::READ | File::BINARY);
-	AsciiString archiveFileName;
-	archiveFileName = filename;
-	archiveFileName.toLower();
-	Int archiveFileSize = 0;
-	Int numLittleFiles = 0;
-
-	DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - opening BIG file %s\n", filename));
-
-	if (fp == NULL) {
-		DEBUG_CRASH(("Could not open archive file %s for parsing", filename));
-		return NULL;
-	}
-
-	AsciiString asciibuf;
-	char buffer[_MAX_PATH];
-	fp->read(buffer, 4); // read the "BIG" at the beginning of the file.
-	buffer[4] = 0;
-	if (strcmp(buffer, BIGFileIdentifier) != 0) {
-		DEBUG_CRASH(("Error reading BIG file identifier in file %s", filename));
-		fp->close();
-		fp = NULL;
-		return NULL;
-	}
-
-	// read in the file size.
-	fp->read(&archiveFileSize, 4);
-
-	DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - size of archive file is %d bytes\n", archiveFileSize));
-
-//	char t;
-
-	// read in the number of files contained in this BIG file.
-	// change the order of the bytes cause the file size is in reverse byte order for some reason.
-	fp->read(&numLittleFiles, 4);
-	numLittleFiles = betoh(numLittleFiles);
-
-	DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - %d are contained in archive\n", numLittleFiles));
-//	for (Int i = 0; i < 2; ++i) {
-//		t = buffer[i];
-//		buffer[i] = buffer[(4-i)-1];
-//		buffer[(4-i)-1] = t;
-//	}
-
-	// seek to the beginning of the directory listing.
-	fp->seek(0x10, File::START);
-	// read in each directory listing.
-	ArchivedFileInfo *fileInfo = NEW ArchivedFileInfo;
-	// TheSuperHackers @fix Mauller 23/04/2025 Create new file handle when necessary to prevent memory leak
-	ArchiveFile *archiveFile = NEW Win32BIGFile;
-
-	for (Int i = 0; i < numLittleFiles; ++i) {
-		Int filesize = 0;
-		Int fileOffset = 0;
-		fp->read(&fileOffset, 4);
-		fp->read(&filesize, 4);
-
-		filesize = betoh(filesize);
-		fileOffset = betoh(fileOffset);
-
-		fileInfo->m_archiveFilename = archiveFileName;
-		fileInfo->m_offset = fileOffset;
-		fileInfo->m_size = filesize;
-		
-		// read in the path name of the file.
-		Int pathIndex = -1;
-		do {
-			++pathIndex;
-			fp->read(buffer + pathIndex, 1);
-		} while (buffer[pathIndex] != 0);
-
-		Int filenameIndex = pathIndex;
-		while ((filenameIndex >= 0) && (buffer[filenameIndex] != '\\') && (buffer[filenameIndex] != '/')) {
-			--filenameIndex;
-		}
-
-		fileInfo->m_filename = (char *)(buffer + filenameIndex + 1);
-		fileInfo->m_filename.toLower();
-		buffer[filenameIndex + 1] = 0;
-
-		AsciiString path;
-		path = buffer;
-
-		AsciiString debugpath;
-		debugpath = path;
-		debugpath.concat(fileInfo->m_filename);
-//		DEBUG_LOG(("Win32BIGFileSystem::openArchiveFile - adding file %s to archive file %s, file number %d\n", debugpath.str(), fileInfo->m_archiveFilename.str(), i));
-
-		archiveFile->addFile(path, fileInfo);
-	}
-
-	archiveFile->attachFile(fp);
-
-	delete fileInfo;
-	fileInfo = NULL;
-
-	// leave fp open as the archive file will be using it.
-
-	return archiveFile;
-}
-
-void Win32BIGFileSystem::closeArchiveFile(const Char *filename) {
-	// Need to close the specified big file
-	ArchiveFileMap::iterator it =  m_archiveFileMap.find(filename);
-	if (it == m_archiveFileMap.end()) {
-		return;
-	}
-
-	if (stricmp(filename, MUSIC_BIG) == 0) {
-		// Stop the current audio
-		TheAudio->stopAudio(AudioAffect_Music);
-
-		// No need to turn off other audio, as the lookups will just fail.
-	}
-	DEBUG_ASSERTCRASH(stricmp(filename, MUSIC_BIG) == 0, ("Attempting to close Archive file '%s', need to add code to handle its shutdown correctly.", filename));
-
-	// may need to do some other processing here first.
-	
-	delete (it->second);
-	m_archiveFileMap.erase(it);
-}
-
-void Win32BIGFileSystem::closeAllArchiveFiles() {
-}
-
-void Win32BIGFileSystem::closeAllFiles() {
-}
-
-Bool Win32BIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite) {
-
-	FilenameList filenameList;
-	TheLocalFileSystem->getFileListInDirectory(dir, AsciiString(""), fileMask, filenameList, TRUE);
-
-	Bool actuallyAdded = FALSE;
-	FilenameListIter it = filenameList.begin();
-	while (it != filenameList.end()) {
-		ArchiveFile *archiveFile = openArchiveFile((*it).str());
-
-		if (archiveFile != NULL) {
-			DEBUG_LOG(("Win32BIGFileSystem::loadBigFilesFromDirectory - loading %s into the directory tree.\n", (*it).str()));
-			loadIntoDirectoryTree(archiveFile, *it, overwrite);
-			m_archiveFileMap[(*it)] = archiveFile;
-			DEBUG_LOG(("Win32BIGFileSystem::loadBigFilesFromDirectory - %s inserted into the archive file map.\n", (*it).str()));
-			actuallyAdded = TRUE;
-		}
-
-		it++;
-	}
-
-	return actuallyAdded;
-}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32CDManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32CDManager.cpp
index 1034e7338b5..4b0f2b791ef 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32CDManager.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32CDManager.cpp
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:   Generals
@@ -42,7 +42,7 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //----------------------------------------------------------------------------
 
 #include "windows.h"
@@ -53,49 +53,49 @@
 #include "Win32Device/Common/Win32CDManager.h"
 
 //----------------------------------------------------------------------------
-//         Externals                                                     
+//         Externals
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Defines                                                         
+//         Defines
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Types                                                     
+//         Private Types
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Data                                                      
+//         Public Data
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Prototypes                                               
+//         Private Prototypes
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //----------------------------------------------------------------------------
 
 
 
 //----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //----------------------------------------------------------------------------
 
 
@@ -140,8 +140,8 @@ void Win32CDDrive::refreshInfo( void )
 	{
 		m_diskName.clear();
 		m_disk = CD::NO_DISK;
-		
-		if (mayRequireUpdate) 
+
+		if (mayRequireUpdate)
 			TheFileSystem->unloadMusicFilesFromCD();
 	}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32GameEngine.cpp b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32GameEngine.cpp
index 4994465ac8f..02597c45675 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32GameEngine.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32GameEngine.cpp
@@ -25,7 +25,7 @@
 // FILE: W3DGameEngine.cpp ////////////////////////////////////////////////////////////////////////
 // Author: Colin Day, April 2001
 // Description:
-//   Implementation of the Win32 game engine, this is the highest level of 
+//   Implementation of the Win32 game engine, this is the highest level of
 //   the game application, it creates all the devices we will use for the game
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -65,7 +65,7 @@ void Win32GameEngine::init( void )
 	// extending functionality
 	GameEngine::init();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset the system */
@@ -76,10 +76,10 @@ void Win32GameEngine::reset( void )
 	// extending functionality
 	GameEngine::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
-/** Update the game engine by updating the GameClient and 
+/** Update the game engine by updating the GameClient and
 	* GameLogic singletons. */
 //-------------------------------------------------------------------------------------------------
 void Win32GameEngine::update( void )
@@ -105,13 +105,13 @@ void Win32GameEngine::update( void )
 			}
 
 			// If we are running a multiplayer game, keep running the logic.
-			// There is code in the client to skip client redraw if we are 
+			// There is code in the client to skip client redraw if we are
 			// iconic.  jba.
 			if (TheGameEngine->getQuitting() || TheGameLogic->isInInternetGame() || TheGameLogic->isInLanGame()) {
 				break; // keep running.
 			}
 		}
-    
+
     // When we are alt-tabbed out... the MilesAudioManager seems to go into a coma sometimes
     // and not regain focus properly when we come back. This seems to wake it up nicely.
     AudioAffect aa = (AudioAffect)0x10;
@@ -122,7 +122,7 @@ void Win32GameEngine::update( void )
 	// allow windows to perform regular windows maintenance stuff like msgs
 	serviceWindowsOS();
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** This function may be called from within this application to let
@@ -162,8 +162,8 @@ void Win32GameEngine::serviceWindowsOS( void )
 		TranslateMessage( &msg );
 		DispatchMessage( &msg );
 		TheMessageTime = 0;
-			
-	}  // end while
 
-}  // end ServiceWindowsOS
+	}
+
+}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp
deleted file mode 100644
index 34262dbb825..00000000000
--- a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32LocalFileSystem.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-//																																						//
-//  (c) 2001-2003 Electronic Arts Inc.																				//
-//																																						//
-////////////////////////////////////////////////////////////////////////////////
-
-///////// Win32LocalFileSystem.cpp /////////////////////////
-// Bryan Cleveland, August 2002
-////////////////////////////////////////////////////////////
-
-#include <windows.h>
-#include "Common/AsciiString.h"
-#include "Common/GameMemory.h"
-#include "Common/PerfTimer.h"
-#include "Win32Device/Common/Win32LocalFileSystem.h"
-#include "Win32Device/Common/Win32LocalFile.h"
-#include <io.h>
-
-Win32LocalFileSystem::Win32LocalFileSystem() : LocalFileSystem() 
-{
-}
-
-Win32LocalFileSystem::~Win32LocalFileSystem() {
-}
-
-//DECLARE_PERF_TIMER(Win32LocalFileSystem_openFile)
-File * Win32LocalFileSystem::openFile(const Char *filename, Int access /* = 0 */) 
-{
-	//USE_PERF_TIMER(Win32LocalFileSystem_openFile)
-
-	// sanity check
-	if (strlen(filename) <= 0) {
-		return NULL;
-	}
-
-	if (access & File::WRITE) {
-		// if opening the file for writing, we need to make sure the directory is there
-		// before we try to create the file.
-		AsciiString string;
-		string = filename;
-		AsciiString token;
-		AsciiString dirName;
-		string.nextToken(&token, "\\/");
-		dirName = token;
-		while ((token.find('.') == NULL) || (string.find('.') != NULL)) {
-			createDirectory(dirName);
-			string.nextToken(&token, "\\/");
-			dirName.concat('\\');
-			dirName.concat(token);
-		}
-	}
-
-	// TheSuperHackers @fix Mauller 21/04/2025 Create new file handle when necessary to prevent memory leak
-	Win32LocalFile *file = newInstance( Win32LocalFile );	
-
-	if (file->open(filename, access) == FALSE) {
-		file->close();
-		deleteInstance(file);
-		file = NULL;
-	} else {
-		file->deleteOnClose();
-	}
-
-// this will also need to play nice with the STREAMING type that I added, if we ever enable this
-
-// srj sez: this speeds up INI loading, but makes BIG files unusable. 
-// don't enable it without further tweaking.
-//
-// unless you like running really slowly.
-//	if (!(access&File::WRITE)) {
-//		// Return a ramfile.
-//		RAMFile *ramFile = newInstance( RAMFile );
-//		if (ramFile->open(file)) {
-//			file->close(); // is deleteonclose, so should delete.
-//			ramFile->deleteOnClose();
-//			return ramFile;
-//		}	else {
-//			ramFile->close();
-//			deleteInstance(ramFile);
-//		}
-//	}
-
-	return file;
-}
-
-void Win32LocalFileSystem::update() 
-{
-}
-
-void Win32LocalFileSystem::init() 
-{
-}
-
-void Win32LocalFileSystem::reset() 
-{
-}
-
-//DECLARE_PERF_TIMER(Win32LocalFileSystem_doesFileExist)
-Bool Win32LocalFileSystem::doesFileExist(const Char *filename) const
-{
-	//USE_PERF_TIMER(Win32LocalFileSystem_doesFileExist)
-	if (_access(filename, 0) == 0) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-void Win32LocalFileSystem::getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList & filenameList, Bool searchSubdirectories) const
-{
-	HANDLE fileHandle = NULL;
-	WIN32_FIND_DATA findData;
-
-	char search[_MAX_PATH];
-	AsciiString asciisearch;
-	asciisearch = originalDirectory;
-	asciisearch.concat(currentDirectory);
-	asciisearch.concat(searchName);
-	strcpy(search, asciisearch.str());
-
-	Bool done = FALSE;
-
-	fileHandle = FindFirstFile(search, &findData);
-	done = (fileHandle == INVALID_HANDLE_VALUE);
-
-	while (!done)	{
-		if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-				(strcmp(findData.cFileName, ".") && strcmp(findData.cFileName, ".."))) {
-			// if we haven't already, add this filename to the list.
-				// a stl set should only allow one copy of each filename
-				AsciiString newFilename;
-				newFilename = originalDirectory;
-				newFilename.concat(currentDirectory);
-				newFilename.concat(findData.cFileName);
-				if (filenameList.find(newFilename) == filenameList.end()) {
-					filenameList.insert(newFilename);
-				}
-		}
-
-		done = (FindNextFile(fileHandle, &findData) == 0);
-	}
-	FindClose(fileHandle);
-
-	if (searchSubdirectories) {
-		AsciiString subdirsearch;
-		subdirsearch = originalDirectory;
-		subdirsearch.concat(currentDirectory);
-		subdirsearch.concat("*.");
-		fileHandle = FindFirstFile(subdirsearch.str(), &findData);
-		done = fileHandle == INVALID_HANDLE_VALUE;
-
-		while (!done) {
-			if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
-					(strcmp(findData.cFileName, ".") && strcmp(findData.cFileName, ".."))) {
-
-					AsciiString tempsearchstr;
-					tempsearchstr.concat(currentDirectory);
-					tempsearchstr.concat(findData.cFileName);
-					tempsearchstr.concat('\\');
-					
-					// recursively add files in subdirectories if required.
-					getFileListInDirectory(tempsearchstr, originalDirectory, searchName, filenameList, searchSubdirectories);
-			}
-
-			done = (FindNextFile(fileHandle, &findData) == 0);
-		}
-
-		FindClose(fileHandle);
-	}
-
-}
-
-Bool Win32LocalFileSystem::getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const 
-{
-	WIN32_FIND_DATA findData;
-	HANDLE findHandle = NULL;
-	findHandle = FindFirstFile(filename.str(), &findData);
-
-	if (findHandle == INVALID_HANDLE_VALUE) {
-		return FALSE;
-	}
-
-	fileInfo->timestampHigh = findData.ftLastWriteTime.dwHighDateTime;
-	fileInfo->timestampLow = findData.ftLastWriteTime.dwLowDateTime;
-	fileInfo->sizeHigh = findData.nFileSizeHigh;
-	fileInfo->sizeLow = findData.nFileSizeLow;
-
-	FindClose(findHandle);
-
-	return TRUE;
-}
-
-Bool Win32LocalFileSystem::createDirectory(AsciiString directory) 
-{
-	if ((directory.getLength() > 0) && (directory.getLength() < _MAX_DIR)) {
-		return (CreateDirectory(directory.str(), NULL) != 0);
-	}
-	return FALSE;
-}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp
index 811d8c88478..085edf99f4d 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/Common/Win32OSDisplay.cpp
@@ -37,10 +37,6 @@
 #include "Common/UnicodeString.h"
 #include "GameClient/GameText.h"
 
-#ifdef RTS_INTERNAL
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 extern HWND ApplicationHWnd;
@@ -53,7 +49,7 @@ static void RTSFlagsToOSFlags(UnsignedInt buttonFlags, UnsignedInt otherFlags, U
 	if (BitIsSet(buttonFlags, OSDBT_OK)) {
 		outWindowsFlags |= MB_OK;
 	}
-	
+
 	if (BitIsSet(buttonFlags, OSDBT_CANCEL)) {
 		outWindowsFlags |= MB_OKCANCEL;
 	}
@@ -101,17 +97,17 @@ OSDisplayButtonType OSDisplayWarningBox(AsciiString p, AsciiString m, UnsignedIn
 
 	UnsignedInt windowsOptionsFlags = 0;
 	RTSFlagsToOSFlags(buttonFlags, otherFlags, windowsOptionsFlags);
-	
+
 	// @todo Make this return more than just ok/cancel - jkmcd
 	// (we need a function to translate back the other way.)
 	Int returnResult = 0;
-	if (TheSystemIsUnicode) 
+	if (TheSystemIsUnicode)
 	{
 		returnResult = ::MessageBoxW(NULL, mesgStr.str(), promptStr.str(), windowsOptionsFlags);
-	} 
-	else 
+	}
+	else
 	{
-		// However, if we're using the default version of the message box, we need to 
+		// However, if we're using the default version of the message box, we need to
 		// translate the string into an AsciiString
 		AsciiString promptA, mesgA;
 		promptA.translate(promptStr);
@@ -123,7 +119,17 @@ OSDisplayButtonType OSDisplayWarningBox(AsciiString p, AsciiString m, UnsignedIn
 
 	if (returnResult == IDOK) {
 		return OSDBT_OK;
-	} 
+	}
 
 	return OSDBT_CANCEL;
 }
+
+//-------------------------------------------------------------------------------------------------
+void OSDisplaySetBusyState(Bool busyDisplay, Bool busySystem)
+{
+	EXECUTION_STATE state = ES_CONTINUOUS;
+	state |= busyDisplay ? ES_DISPLAY_REQUIRED : 0;
+	state |= busySystem ? ES_SYSTEM_REQUIRED : 0;
+
+	::SetThreadExecutionState(state);
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIKeyboard.cpp b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIKeyboard.cpp
index 6611376deb6..0591902e29f 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIKeyboard.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIKeyboard.cpp
@@ -47,7 +47,7 @@ struct ErrorLookup
 	HRESULT error;
 	const char *string;
 };
-static ErrorLookup errorLookup[] = 
+static ErrorLookup errorLookup[] =
 {
 { (HRESULT)DIERR_ACQUIRED, "DIERR_ACQUIRED" },
 { (HRESULT)DIERR_ALREADYINITIALIZED, "DIERR_ALREADYINITIALIZED" },
@@ -73,7 +73,7 @@ static ErrorLookup errorLookup[] =
 { (HRESULT)DIERR_NOTFOUND, "DIERR_NOTFOUND" },
 { (HRESULT)DIERR_NOTINITIALIZED, "DIERR_NOTINITIALIZED" },
 { (HRESULT)DIERR_OBJECTNOTFOUND, "DIERR_OBJECTNOTFOUND" },
-{ (HRESULT)DIERR_OLDDIRECTINPUTVERSION, "DIERR_OLDDIRECTINPUTVERSION" }, 
+{ (HRESULT)DIERR_OLDDIRECTINPUTVERSION, "DIERR_OLDDIRECTINPUTVERSION" },
 { (HRESULT)DIERR_OTHERAPPHASPRIO, "DIERR_OTHERAPPHASPRIO" },
 { (HRESULT)DIERR_OUTOFMEMORY, "DIERR_OUTOFMEMORY" },
 { (HRESULT)DIERR_READONLY, "DIERR_READONLY" },
@@ -100,14 +100,14 @@ static void printReturnCode( char *label, HRESULT hr )
 
 		if( error->error == hr )
 		{
-			DEBUG_LOG(( "%s: '%s' - '0x%08x'\n", label, error->string, hr ));
+			DEBUG_LOG(( "%s: '%s' - '0x%08x'", label, error->string, hr ));
 			break;
 		}
 		error++;
 
 	}
 
-}  // end printReturnCode
+}
 
 //-------------------------------------------------------------------------------------------------
 /** create our interface to the direct input keybard */
@@ -119,18 +119,18 @@ void DirectInputKeyboard::openKeyboard( void )
 	// create our interface to direct input
 	hr = DirectInput8Create( ApplicationHInstance,
 													 DIRECTINPUT_VERSION,
-													 IID_IDirectInput8, 
+													 IID_IDirectInput8,
 													 (void **)&m_pDirectInput,
 													 NULL );
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openKeyboard: DirectInputCreate failed\r\n" ));
+		DEBUG_LOG(( "ERROR - openKeyboard: DirectInputCreate failed" ));
 		assert( 0 );
 		closeKeyboard();
 		return;
 
-	}  // end if
+	}
 
 	// obtain an interface to the system keyboard device
 	hr = m_pDirectInput->CreateDevice( GUID_SysKeyboard,
@@ -139,42 +139,42 @@ void DirectInputKeyboard::openKeyboard( void )
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openKeyboard: Unabled to create keyboard device\n" ));
+		DEBUG_LOG(( "ERROR - openKeyboard: Unabled to create keyboard device" ));
 		assert( 0 );
 		closeKeyboard();
 		return;
 
-	}  // end if
+	}
 
 	// set the data format for the keyboard
 	hr = m_pKeyboardDevice->SetDataFormat( &c_dfDIKeyboard );
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openKeyboard: Unabled to set data format for keyboard\n" ));
+		DEBUG_LOG(( "ERROR - openKeyboard: Unabled to set data format for keyboard" ));
 		assert( 0 );
 		closeKeyboard();
 		return;
 
-	}  // end if
+	}
 
 	/// @todo Check the cooperative level of keyboard for NT, 2000, DX8 etc ...
 	// set the cooperative level for the keyboard, must be non-exclusive for
 	// NT support, but we should check with the latest versions of DirectX
 	// on 2000 etc
 	//
-	hr = m_pKeyboardDevice->SetCooperativeLevel( ApplicationHWnd, 
-																							 DISCL_FOREGROUND | 
+	hr = m_pKeyboardDevice->SetCooperativeLevel( ApplicationHWnd,
+																							 DISCL_FOREGROUND |
 																							 DISCL_NONEXCLUSIVE );
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openKeyboard: Unabled to set cooperative level\n" ));
+		DEBUG_LOG(( "ERROR - openKeyboard: Unabled to set cooperative level" ));
 		assert( 0 );
 		closeKeyboard();
 		return;
 
-	}  // end if
+	}
 
   // set the keyboard buffer size
 	DIPROPDWORD prop;
@@ -187,29 +187,29 @@ void DirectInputKeyboard::openKeyboard( void )
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openKeyboard: Unable to set keyboard buffer size property\n" ));
+		DEBUG_LOG(( "ERROR - openKeyboard: Unable to set keyboard buffer size property" ));
 		assert( 0 );
 		closeKeyboard();
 		return;
 
-	}  // end if
+	}
 
 	// acquire the keyboard
 	hr = m_pKeyboardDevice->Acquire();
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openKeyboard: Unable to acquire keyboard device\n" ));
-		// Note - This can happen in windowed mode, and we can re-acquire later.  So don't 
+		DEBUG_LOG(( "ERROR - openKeyboard: Unable to acquire keyboard device" ));
+		// Note - This can happen in windowed mode, and we can re-acquire later.  So don't
 		// close the keyboard. jba.
 		// closeKeyboard();
 		return;
 
-	}  // end if
+	}
 
-	DEBUG_LOG(( "OK - Keyboard initialized successfully.\n" ));
+	DEBUG_LOG(( "OK - Keyboard initialized successfully." ));
 
-}  // end openKeyboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** close the direct input keyboard */
@@ -223,21 +223,21 @@ void DirectInputKeyboard::closeKeyboard( void )
 		m_pKeyboardDevice->Unacquire();
 		m_pKeyboardDevice->Release();
 		m_pKeyboardDevice = NULL;
-		DEBUG_LOG(( "OK - Keyboard deviced closed\n" ));
+		DEBUG_LOG(( "OK - Keyboard deviced closed" ));
 
-	}  // end if
+	}
 	if( m_pDirectInput )
 	{
 
 		m_pDirectInput->Release();
 		m_pDirectInput = NULL;
-		DEBUG_LOG(( "OK - Keyboard direct input interface closed\n" ));
+		DEBUG_LOG(( "OK - Keyboard direct input interface closed" ));
 
-	}  // end if
+	}
 
-	DEBUG_LOG(( "OK - Keyboard shutdown complete\n" ));
+	DEBUG_LOG(( "OK - Keyboard shutdown complete" ));
 
-}  // end closeKeyboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get a single keyboard event from direct input */
@@ -251,7 +251,6 @@ void DirectInputKeyboard::getKey( KeyboardIO *key )
 	HRESULT hr;
 
 	assert( key );
-	key->sequence = 0;
 	key->key = KEY_NONE;
 
 	if( m_pKeyboardDevice )
@@ -296,9 +295,9 @@ void DirectInputKeyboard::getKey( KeyboardIO *key )
 
 						break;
 
-					}  // end, got the keyboard back OK
+					}
 
-				}  // end switch
+				}
 
 				return;
 
@@ -306,7 +305,7 @@ void DirectInputKeyboard::getKey( KeyboardIO *key )
 			default:
 				return;
 
-		}  // end switch( hr )
+		}
 
 		// no keys returned
 		if( num == 0 )
@@ -315,22 +314,27 @@ void DirectInputKeyboard::getKey( KeyboardIO *key )
 		// set the key
 		key->key = (UnsignedByte)(kbdat.dwOfs & 0xFF);
 
-		// sequence
-		key->sequence = kbdat.dwSequence;
-
 		//
 		// state of key, note we are setting the key state here with an assignment
 		// and not a bit set of the up/down state, this is the "start"
 		// of building this "key"
 		//
-		key->state = (( kbdat.dwData & 0x0080 ) ? KEY_STATE_DOWN : KEY_STATE_UP);
+		if( kbdat.dwData & 0x0080 )
+		{
+			key->state = KEY_STATE_DOWN;
+			key->keyDownTimeMsec = kbdat.dwTimeStamp;
+		}
+		else
+		{
+			key->state = KEY_STATE_UP;
+		}
 
 		// set status as unused (unprocessed)
 		key->status = KeyboardIO::STATUS_UNUSED;
 
-	}  // end if, we have a DI keyboard device
+	}
 
-}  // end getKey
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -354,7 +358,7 @@ DirectInputKeyboard::DirectInputKeyboard( void )
 		m_modifiers &= ~KEY_STATE_CAPSLOCK;
 	}
 
-}  // end DirectInputKeyboard
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -364,7 +368,7 @@ DirectInputKeyboard::~DirectInputKeyboard( void )
 	// close keyboard and release all resource
 	closeKeyboard();
 
-}  // end ~DirectInputKeyboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** initialize the keyboard */
@@ -378,7 +382,7 @@ void DirectInputKeyboard::init( void )
 	// open the direct input keyboard
 	openKeyboard();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset keyboard system */
@@ -389,7 +393,7 @@ void DirectInputKeyboard::reset( void )
 	// extend functionality
 	Keyboard::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** called once per frame to update the keyboard state */
@@ -409,10 +413,10 @@ void DirectInputKeyboard::update( void )
 		m_pKeyboardDevice->GetDeviceData( sizeof( DIDEVICEOBJECTDATA ),
 																			NULL, &items, 0 );
 
-	}  // end if
+	}
 */
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Return TRUE if the caps lock key is down/hilighted */
@@ -422,4 +426,4 @@ Bool DirectInputKeyboard::getCapsState( void )
 
 	return BitIsSet( GetKeyState( VK_CAPITAL ), 0X01);
 
-}  // end getCapsState
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp
index 204c8599e5e..c8b59e10e62 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp
@@ -54,12 +54,12 @@ void DirectInputMouse::openMouse( void )
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openMouse: Unabled to create direct input interface\n" ));
+		DEBUG_LOG(( "ERROR - openMouse: Unabled to create direct input interface" ));
 		assert( 0 );
 		closeMouse();
 		return;
 
-	}  // end if
+	}
 
 	// create a device for the system mouse
 	hr = m_pDirectInput->CreateDevice( GUID_SysMouse,
@@ -68,24 +68,24 @@ void DirectInputMouse::openMouse( void )
 	if( FAILED( hr ) )
 	{
 
-			DEBUG_LOG(( "ERROR - openMouse: Unable to create mouse device\n" ));
+			DEBUG_LOG(( "ERROR - openMouse: Unable to create mouse device" ));
 			assert( 0 );
 			closeMouse();
 			return;
 
-	}  // end if
+	}
 
 	// set the data format for the mouse
 	hr = m_pMouseDevice->SetDataFormat( &c_dfDIMouse );
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openMouse: Unabled to set mouse data format\n" ));
+		DEBUG_LOG(( "ERROR - openMouse: Unabled to set mouse data format" ));
 		assert( 0 );
 		closeMouse();
 		return;
 
-	}  // end if
+	}
 
 	// set the mouse cooperative level
 	hr = m_pMouseDevice->SetCooperativeLevel( ApplicationHWnd,
@@ -94,15 +94,15 @@ void DirectInputMouse::openMouse( void )
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openMouse: Unabled to set coop level\n" ));
+		DEBUG_LOG(( "ERROR - openMouse: Unabled to set coop level" ));
 		assert( 0 );
 		closeMouse();
 		return;
 
-	}  // end if
+	}
 
 	// set the mouse buffer size
-	DIPROPDWORD prop;		
+	DIPROPDWORD prop;
 	prop.diph.dwSize = sizeof( DIPROPDWORD );
 	prop.diph.dwHeaderSize = sizeof( DIPROPHEADER );
 	prop.diph.dwObj = 0;
@@ -112,24 +112,24 @@ void DirectInputMouse::openMouse( void )
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "ERROR - openMouse: Unabled to set buffer property\n" ));
+		DEBUG_LOG(( "ERROR - openMouse: Unabled to set buffer property" ));
 		assert( 0 );
 		closeMouse();
 		return;
 
-	}  // end if
+	}
 
 	// acquire the mouse
 	hr = m_pMouseDevice->Acquire();
 	if( FAILED( hr ) )
 	{
-	
-		DEBUG_LOG(( "ERROR - openMouse: Unabled to acquire mouse\n" ));
+
+		DEBUG_LOG(( "ERROR - openMouse: Unabled to acquire mouse" ));
 		assert( 0 );
 		closeMouse();
 		return;
 
-	}  // end if
+	}
 
 	// get some information about the mouse
 	DIDEVCAPS diDevCaps;
@@ -139,9 +139,9 @@ void DirectInputMouse::openMouse( void )
 	if( FAILED( hr ) )
 	{
 
-		DEBUG_LOG(( "WARNING - openMouse: Cann't get capabilities of mouse for button setup\n" ));
+		DEBUG_LOG(( "WARNING - openMouse: Cann't get capabilities of mouse for button setup" ));
 
-	}  // end if
+	}
 	else
 	{
 
@@ -150,14 +150,14 @@ void DirectInputMouse::openMouse( void )
 		m_numAxes = (UnsignedByte)diDevCaps.dwAxes;
 		m_forceFeedback = BitIsSet( diDevCaps.dwFlags, DIDC_FORCEFEEDBACK );
 
-		DEBUG_LOG(( "OK - Mouse info: Buttons = '%d', Force Feedback = '%s', Axes = '%d'\n",
+		DEBUG_LOG(( "OK - Mouse info: Buttons = '%d', Force Feedback = '%s', Axes = '%d'",
 						 m_numButtons, m_forceFeedback ? "Yes" : "No", m_numAxes ));
 
-	}  // end else
-	
-	DEBUG_LOG(( "OK - Mouse initialized successfully\n" ));
+	}
 
-}  // end openMouse
+	DEBUG_LOG(( "OK - Mouse initialized successfully" ));
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Release any resources for our direct input mouse */
@@ -172,9 +172,9 @@ void DirectInputMouse::closeMouse( void )
 		m_pMouseDevice->Unacquire();
 		m_pMouseDevice->Release();
 		m_pMouseDevice = NULL;
-		DEBUG_LOG(( "OK - Mouse device closed\n" ));
+		DEBUG_LOG(( "OK - Mouse device closed" ));
 
-	}  // end if
+	}
 
 	// release our direct input interface for the mouse
 	if( m_pDirectInput )
@@ -182,13 +182,13 @@ void DirectInputMouse::closeMouse( void )
 
 		m_pDirectInput->Release();
 		m_pDirectInput = NULL;
-		DEBUG_LOG(( "OK - Mouse direct input interface closed\n" ));
+		DEBUG_LOG(( "OK - Mouse direct input interface closed" ));
 
-	}  // end if
+	}
 
-	DEBUG_LOG(( "OK - Mouse shutdown complete\n" ));
+	DEBUG_LOG(( "OK - Mouse shutdown complete" ));
 
-}  // end closeMouse
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Get a single mouse event from the device */
@@ -202,7 +202,7 @@ UnsignedByte DirectInputMouse::getMouseEvent( MouseIO *result, Bool flush )
 
 	/* set these to defaults */
 	result->leftState = result->middleState = result->rightState = FALSE;
-	result->leftFrame = result->middleFrame = result->rightFrame = 0;
+	result->leftState = result->middleState = result->rightState = MBS_None;
 	result->pos.x = result->pos.y = result->wheelPos = 0;
 
 	if( m_pMouseDevice )
@@ -254,7 +254,7 @@ UnsignedByte DirectInputMouse::getMouseEvent( MouseIO *result, Bool flush )
 					default:
 						break;
 
-				}  // end switch
+				}
 
 				break;
 			}
@@ -264,36 +264,33 @@ UnsignedByte DirectInputMouse::getMouseEvent( MouseIO *result, Bool flush )
 //				DBGPRINTF(("GetMouseEvent: GetDeviceData Error: %X.\r\n", hr ));
 				break;
 
-		}  // end switch
+		}
 
-	}  // end if
+	}
 
 	return mouseResult;
 
-}  // end getMouseEvent
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Map the direct input codes to our own mouse format */
 //-------------------------------------------------------------------------------------------------
-void DirectInputMouse::mapDirectInputMouse( MouseIO *mouse, 
+void DirectInputMouse::mapDirectInputMouse( MouseIO *mouse,
 																						DIDEVICEOBJECTDATA *mdat )
 {
 
 	switch( mdat->dwOfs )
 	{
 		case DIMOFS_BUTTON0:
-			mouse->leftState = (( mdat->dwData & 0x0080 ) ? TRUE : FALSE);
-			mouse->leftFrame = mdat->dwSequence;
+			mouse->leftState = (( mdat->dwData & 0x0080 ) ? MBS_Down : MBS_Up);
 			break;
 
 		case DIMOFS_BUTTON1:
-			mouse->rightState = (( mdat->dwData & 0x0080 ) ? TRUE : FALSE);
-			mouse->rightFrame = mdat->dwSequence;
+			mouse->rightState = (( mdat->dwData & 0x0080 ) ? MBS_Down : MBS_Up);
 			break;
 
 		case DIMOFS_BUTTON2:
-			mouse->middleState = (( mdat->dwData & 0x0080 ) ? TRUE : FALSE);
-			mouse->middleFrame = mdat->dwSequence;
+			mouse->middleState = (( mdat->dwData & 0x0080 ) ? MBS_Down : MBS_Up);
 			break;
 
 		case DIMOFS_BUTTON3:
@@ -312,7 +309,7 @@ void DirectInputMouse::mapDirectInputMouse( MouseIO *mouse,
 			break;
 	}
 
-}  // end mapDirectInputMouse
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -326,7 +323,7 @@ DirectInputMouse::DirectInputMouse( void )
 	m_pDirectInput = NULL;
 	m_pMouseDevice = NULL;
 
-}  // end DirectInputMouse
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -337,7 +334,7 @@ DirectInputMouse::~DirectInputMouse( void )
 	closeMouse();
 //	ShowCursor( TRUE );
 
-}  // end ~DirectInputMouse
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize the direct input mouse device */
@@ -359,7 +356,7 @@ void DirectInputMouse::init( void )
 	SetCursorPos( p.x, p.y );
 //	ShowCursor( FALSE );
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset direct input mouse */
@@ -370,7 +367,7 @@ void DirectInputMouse::reset( void )
 	// extend
 	Mouse::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update the mouse position and button data, this is called once per
@@ -396,7 +393,7 @@ void DirectInputMouse::update( void )
 	ScreenToClient( ApplicationHWnd, &p );
 	moveMouse( p.x, p.y, MOUSE_MOVE_ABSOLUTE );
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Set the limits which the mouse is allowed to move around in.  We
@@ -424,13 +421,13 @@ void DirectInputMouse::setMouseLimits( void )
 
 		// get the window rect
 		GetWindowRect( ApplicationHWnd, &windowRect );
-	
+
 		// keep the cursor clipped to these coords when running windowed
 		ClipCursor( &windowRect );
 
-	}  // end if
+	}
 
-}  // end setMouseLimits
+}
 
 //-------------------------------------------------------------------------------------------------
 /** set the cursor position for windows OS */
@@ -450,7 +447,7 @@ void DirectInputMouse::setPosition( Int x, Int y )
 	// set the window mouse
 	SetCursorPos( p.x, p.y );
 
-}  // end setPosition
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Super basic simplistic cursor */
@@ -485,12 +482,12 @@ void DirectInputMouse::setCursor( MouseCursor cursor )
 			SetCursor( LoadCursor( NULL, IDC_CROSS ) );
 			break;
 
-	}  // end switch
+	}
 
 	// save current cursor
 	m_currentCursor = cursor;
 
-}  // end setCursor
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Capture the mouse to our application */
@@ -500,7 +497,7 @@ void DirectInputMouse::capture( void )
 
 	SetCapture( ApplicationHWnd );
 
-}  // end capture
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Release the mouse capture for our app window */
@@ -510,4 +507,4 @@ void DirectInputMouse::releaseCapture( void )
 
 	ReleaseCapture();
 
-}  // end releaseCapture
+}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp
index 5a5c91cd7a2..085bcd461d3 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp
@@ -37,11 +37,6 @@
 #include "Win32Device/GameClient/Win32Mouse.h"
 #include "WinMain.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // EXTERN /////////////////////////////////////////////////////////////////////////////////////////
 extern Win32Mouse *TheWin32Mouse;
@@ -53,7 +48,7 @@ HCURSOR cursorResources[Mouse::NUM_MOUSE_CURSORS][MAX_2D_CURSOR_DIRECTIONS];
 
 //-------------------------------------------------------------------------------------------------
 /** Get a mouse event from the buffer if available, we need to translate
-	* from the windows message meanings to our own internal mouse 
+	* from the windows message meanings to our own internal mouse
 	* structure */
 //-------------------------------------------------------------------------------------------------
 UnsignedByte Win32Mouse::getMouseEvent( MouseIO *result, Bool flush )
@@ -80,7 +75,7 @@ UnsignedByte Win32Mouse::getMouseEvent( MouseIO *result, Bool flush )
 	// got event OK and all done with this one
 	return MOUSE_OK;
 
-}  // end getMouseEvent
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Translate a win32 mouse event to our own event info */
@@ -90,136 +85,115 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
 	UINT msg = m_eventBuffer[ eventIndex ].msg;
 	WPARAM wParam = m_eventBuffer[ eventIndex ].wParam;
 	LPARAM lParam = m_eventBuffer[ eventIndex ].lParam;
-	UnsignedInt frame;
-
-	//
-	// get the current input frame from the client, if we don't have
-	// a client (like in the GUI editor) we just use frame 1 so it
-	// registers with the system
-	//
-	if( TheGameClient )
-		frame = TheGameClient->getFrame();
-	else
-		frame = 1;
 
 	// set these to defaults
-	result->leftState = result->middleState = result->rightState = MBS_Up;
-	result->leftFrame = result->middleFrame = result->rightFrame = 0;
+	result->leftState = result->middleState = result->rightState = MBS_None;
 	result->pos.x = result->pos.y = result->wheelPos = 0;
 
 	// Time is the same for all events
 	result->time = m_eventBuffer[ eventIndex ].time;
-	
+
 	switch( msg )
 	{
 
 		// ------------------------------------------------------------------------
 		case WM_LBUTTONDOWN:
 		{
-			
+
 			result->leftState = MBS_Down;
-			result->leftFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end left button down
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_LBUTTONUP:
 		{
 
 			result->leftState = MBS_Up;
-			result->leftFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end left button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_LBUTTONDBLCLK:
 		{
 
 			result->leftState = MBS_DoubleClick;
-			result->leftFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end left button double click
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MBUTTONDOWN:
 		{
 
 			result->middleState = MBS_Down;
-			result->middleFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end middle button down
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MBUTTONUP:
 		{
 
 			result->middleState = MBS_Up;
-			result->middleFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end middle button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MBUTTONDBLCLK:
 		{
 
 			result->middleState = MBS_DoubleClick;
-			result->middleFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end middle button double click
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_RBUTTONDOWN:
 		{
 
 			result->rightState = MBS_Down;
-			result->rightFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end right button down
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_RBUTTONUP:
 		{
 
 			result->rightState = MBS_Up;
-			result->rightFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end right button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_RBUTTONDBLCLK:
 		{
 
 			result->rightState = MBS_DoubleClick;
-			result->rightFrame = frame;
 			result->pos.x = LOWORD( lParam );
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end right button double click
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MOUSEMOVE:
@@ -229,7 +203,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
 			result->pos.y = HIWORD( lParam );
 			break;
 
-		}  // end mouse move
+		}
 
 		// ------------------------------------------------------------------------
 		case 0x020A:	// WM_MOUSEWHEEL
@@ -240,28 +214,28 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
 			p.x = LOWORD( lParam );
 			p.y = HIWORD( lParam );
 			ScreenToClient( ApplicationHWnd, &p );
-	
+
 			// note the short cast here to keep signed information in tact
 			result->wheelPos = (Short)HIWORD( wParam );
 			result->pos.x = p.x;
 			result->pos.y = p.y;
 			break;
 
-		}  // end mouse wheel
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 		{
 
-			DEBUG_CRASH(( "translateEvent: Unknown Win32 mouse event [%d,%d,%d]\n",
+			DEBUG_CRASH(( "translateEvent: Unknown Win32 mouse event [%d,%d,%d]",
 							 msg, wParam, lParam ));
 			return;
 
-		}  // end default
+		}
 
-	}  // end switch on message at event index in buffer
+	}
 
-}  // end translateEvent
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
@@ -283,7 +257,7 @@ Win32Mouse::Win32Mouse( void )
 			cursorResources[i][j]=NULL;
 	m_directionFrame=0; //points up.
 	m_lostFocus = FALSE;
-}  // end Win32Mouse
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -293,7 +267,7 @@ Win32Mouse::~Win32Mouse( void )
 	// remove our global reference that was for the WndProc() only
 	TheWin32Mouse = NULL;
 
-}  // end ~Win32Mouse
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Initialize our device */
@@ -311,7 +285,7 @@ void Win32Mouse::init( void )
 	//
 	m_inputMovesAbsolute = TRUE;
 
-}  // end int
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Reset */
@@ -322,7 +296,7 @@ void Win32Mouse::reset( void )
 	// extend
 	Mouse::reset();
 
-}  // end reset
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Update, called once per frame */
@@ -330,10 +304,10 @@ void Win32Mouse::reset( void )
 void Win32Mouse::update( void )
 {
 
-	// extend 
+	// extend
 	Mouse::update();
 
-}  // end update
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Add a window message event along with its WPARAM and LPARAM parameters
@@ -361,7 +335,7 @@ void Win32Mouse::addWin32Event( UINT msg, WPARAM wParam, LPARAM lParam, DWORD ti
 	if( m_nextFreeIndex >= Mouse::NUM_MOUSE_EVENTS )
 		m_nextFreeIndex = 0;
 
-}  // end addWin32Event
+}
 
 extern HINSTANCE ApplicationHInstance;
 
@@ -373,6 +347,20 @@ void Win32Mouse::setVisibility(Bool visible)
 	Win32Mouse::setCursor(getMouseCursor());
 }
 
+//-------------------------------------------------------------------------------------------------
+void Win32Mouse::loseFocus()
+{
+	Mouse::loseFocus();
+	m_lostFocus = true;
+}
+
+//-------------------------------------------------------------------------------------------------
+void Win32Mouse::regainFocus()
+{
+	Mouse::regainFocus();
+	m_lostFocus = false;
+}
+
 /**Preload all the cursors we may need during the game.  This must be done before the D3D device
 is created to avoid cursor corruption on buggy ATI Radeon cards. */
 void Win32Mouse::initCursorResources(void)
@@ -388,7 +376,7 @@ void Win32Mouse::initCursorResources(void)
 					sprintf(resourcePath,"data\\cursors\\%s%d.ANI",m_cursorInfo[cursor].textureName.str(),direction);
 				else
 					sprintf(resourcePath,"data\\cursors\\%s.ANI",m_cursorInfo[cursor].textureName.str());
-				
+
 				// check for a MOD cursor.
 				Bool loaded = FALSE;
 				if (TheGlobalData->m_modDir.isNotEmpty())
@@ -408,7 +396,7 @@ void Win32Mouse::initCursorResources(void)
 
 				if (!loaded)
 					cursorResources[cursor][direction]=LoadCursorFromFile(resourcePath);
-				DEBUG_ASSERTCRASH(cursorResources[cursor][direction], ("MissingCursor %s\n",resourcePath));
+				DEBUG_ASSERTCRASH(cursorResources[cursor][direction], ("MissingCursor %s",resourcePath));
 			}
 		}
 //		SetCursor(cursorResources[cursor][m_directionFrame]);
@@ -431,12 +419,12 @@ void Win32Mouse::setCursor( MouseCursor cursor )
 	else
 	{
 		SetCursor(cursorResources[cursor][m_directionFrame]);
-	}  // end switch
+	}
 
 	// save current cursor
 	m_currentWin32Cursor=m_currentCursor = cursor;
-	
-}  // end setCursor
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Capture the mouse to our application */
@@ -444,24 +432,41 @@ void Win32Mouse::setCursor( MouseCursor cursor )
 void Win32Mouse::capture( void )
 {
 
-//	SetCapture( ApplicationHWnd );
-
-}  // end capture
-
-//-------------------------------------------------------------------------------------------------
-/** Release the mouse capture for our app window */
-//-------------------------------------------------------------------------------------------------
-void Win32Mouse::releaseCapture( void )
-{
-
-//	ReleaseCapture();
+	RECT rect;
+	::GetClientRect(ApplicationHWnd, &rect);
 
-}  // end releaseCapture
+	POINT leftTop;
+	leftTop.x = rect.left;
+	leftTop.y = rect.top;
 
+	POINT rightBottom;
+	rightBottom.x = rect.right;
+	rightBottom.y = rect.bottom;
 
+	::ClientToScreen(ApplicationHWnd, &leftTop);
+	::ClientToScreen(ApplicationHWnd, &rightBottom);
 
+	rect.left = leftTop.x;
+	rect.top = leftTop.y;
+	rect.right = rightBottom.x;
+	rect.bottom = rightBottom.y;
 
+	if (::ClipCursor(&rect))
+	{
+		onCursorCaptured(true);
+	}
 
+}
 
+//-------------------------------------------------------------------------------------------------
+/** Release the mouse capture for our app window */
+//-------------------------------------------------------------------------------------------------
+void Win32Mouse::releaseCapture( void )
+{
 
+	if (::ClipCursor(NULL))
+	{
+		onCursorCaptured(false);
+	}
 
+}
diff --git a/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h b/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h
index d48c7141157..e0a8c74641d 100644
--- a/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h
+++ b/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h
@@ -26,11 +26,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // tell the compiler to only load this file once
-#pragma once
-
 
-#ifndef _BASE_TYPE_H_
-#define _BASE_TYPE_H_
+#pragma once
 
 #include "Lib/BaseTypeCore.h"
 #include "Lib/trig.h"
@@ -68,7 +65,7 @@ inline Real deg2rad(Real rad) { return rad * (PI/180); }
 //-----------------------------------------------------------------------------
 // For twiddling bits
 //-----------------------------------------------------------------------------
-// TheSuperHackers @compile xezon 17/03/2025 Renames BitTest to BitIsSet to prevent conflict with BitTest macro from winnt.h
+// TheSuperHackers @build xezon 17/03/2025 Renames BitTest to BitIsSet to prevent conflict with BitTest macro from winnt.h
 #define BitIsSet( x, i ) ( ( (x) & (i) ) != 0 )
 #define BitSet( x, i ) ( (x) |= (i) )
 #define BitClear( x, i ) ( (x ) &= ~(i) )
@@ -76,7 +73,7 @@ inline Real deg2rad(Real rad) { return rad * (PI/180); }
 
 //-------------------------------------------------------------------------------------------------
 
-// note, this function depends on the cpu rounding mode, which we set to CHOP every frame, 
+// note, this function depends on the cpu rounding mode, which we set to CHOP every frame,
 // but apparently tends to be left in unpredictable modes by various system bits of
 // code, so use this function with caution -- it might not round in the way you want.
 __forceinline long fast_float2long_round(float f)
@@ -142,16 +139,16 @@ __forceinline float fast_float_ceil(float f)
 }
 
 //-------------------------------------------------------------------------------------------------
-#define REAL_TO_INT(x)						((Int)(fast_float2long_round(fast_float_trunc(x))))
-#define REAL_TO_UNSIGNEDINT(x)		((UnsignedInt)(fast_float2long_round(fast_float_trunc(x))))
-#define REAL_TO_SHORT(x)					((Short)(fast_float2long_round(fast_float_trunc(x))))
-#define REAL_TO_UNSIGNEDSHORT(x)	((UnsignedShort)(fast_float2long_round(fast_float_trunc(x))))
-#define REAL_TO_BYTE(x)						((Byte)(fast_float2long_round(fast_float_trunc(x))))
-#define REAL_TO_UNSIGNEDBYTE(x)		((UnsignedByte)(fast_float2long_round(fast_float_trunc(x))))
-#define REAL_TO_CHAR(x)						((Char)(fast_float2long_round(fast_float_trunc(x))))
-#define DOUBLE_TO_REAL(x)					((Real) (x))
-#define DOUBLE_TO_INT(x)					((Int) (fast_float2long_round(fast_float_trunc(x))))
-#define INT_TO_REAL(x)						((Real) (x))
+#define REAL_TO_INT(x)						((Int)(x))
+#define REAL_TO_UNSIGNEDINT(x)		((UnsignedInt)(x))
+#define REAL_TO_SHORT(x)					((Short)(x))
+#define REAL_TO_UNSIGNEDSHORT(x)	((UnsignedShort)(x))
+#define REAL_TO_BYTE(x)						((Byte)(x))
+#define REAL_TO_UNSIGNEDBYTE(x)		((UnsignedByte)(x))
+#define REAL_TO_CHAR(x)						((Char)(x))
+#define DOUBLE_TO_REAL(x)					((Real)(x))
+#define DOUBLE_TO_INT(x)					((Int)(x))
+#define INT_TO_REAL(x)						((Real)(x))
 
 // once we've ceiled/floored, trunc and round are identical, and currently, round is faster... (srj)
 #define REAL_TO_INT_CEIL(x)				(fast_float2long_round(fast_float_ceil(x)))
@@ -169,7 +166,7 @@ __forceinline float fast_float_ceil(float f)
 // so they can be used within unions.
 
 // real-valued range defined by low and high values
-struct RealRange 
+struct RealRange
 {
 	Real lo, hi;							// low and high values of the range
 
@@ -182,7 +179,7 @@ struct RealRange
 	}
 };
 
-struct Coord2D 
+struct Coord2D
 {
 	Real x, y;
 
@@ -197,7 +194,7 @@ struct Coord2D
 			y /= len;
 		}
 	}
-	
+
 	Real toAngle( void ) const;  ///< turn 2D vector into angle (where angle 0 is down the +x axis)
 
 };
@@ -216,9 +213,9 @@ inline Real Coord2D::toAngle( void ) const
 		c = 1.0f;
 
 	return y < 0.0f ? -ACos(c) : ACos(c);
-}  // end toAngle
+}
 
-struct ICoord2D 
+struct ICoord2D
 {
 	Int x, y;
 
@@ -242,7 +239,7 @@ struct IRegion2D
 };
 
 
-struct Coord3D 
+struct Coord3D
 {
 	Real x, y, z;
 
@@ -260,14 +257,14 @@ struct Coord3D
 			z /= len;
 		}
 	}
-	
+
 	static void crossProduct( const Coord3D *a, const Coord3D *b, Coord3D *r )
 	{
 		r->x = (a->y * b->z - a->z * b->y);
 		r->y = (a->z * b->x - a->x * b->z);
 		r->z = (a->x * b->y - a->y * b->x);
 	}
-	
+
 	void zero( void )
 	{
 		x = 0.0f;
@@ -281,21 +278,21 @@ struct Coord3D
 		y += a->y;
 		z += a->z;
 	}
-	
+
 	void sub( const Coord3D *a )
 	{
 		x -= a->x;
 		y -= a->y;
 		z -= a->z;
 	}
-	
+
 	void set( const Coord3D *a )
 	{
 		x = a->x;
 		y = a->y;
 		z = a->z;
 	}
-	
+
 	void set( Real ax, Real ay, Real az )
 	{
 		x = ax;
@@ -312,7 +309,7 @@ struct Coord3D
 
 	Bool equals( const Coord3D &r )
 	{
-		return (x == r.x && 
+		return (x == r.x &&
 						y == r.y &&
 						z == r.z);
 	}
@@ -325,7 +322,7 @@ struct Coord3D
 	}
 };
 
-struct ICoord3D 
+struct ICoord3D
 {
 	Int x, y, z;
 
@@ -350,12 +347,12 @@ struct Region3D
 	void zero() { lo.zero(); hi.zero(); }
 	Bool isInRegionNoZ( const Coord3D *query ) const
 	{
-		return (lo.x < query->x) && (query->x < hi.x) 
+		return (lo.x < query->x) && (query->x < hi.x)
 						&& (lo.y < query->y) && (query->y < hi.y);
 	}
 	Bool isInRegionWithZ( const Coord3D *query ) const
 	{
-		return (lo.x < query->x) && (query->x < hi.x) 
+		return (lo.x < query->x) && (query->x < hi.x)
 						&& (lo.y < query->y) && (query->y < hi.y)
 						&& (lo.z < query->z) && (query->z < hi.z);
 	}
@@ -375,7 +372,7 @@ struct RGBColor
 {
 	Real red, green, blue;		// range between 0 and 1
 
-	inline Int getAsInt() const
+	Int getAsInt() const
 	{
 		return
 			((Int)(red * 255.0) << 16) |
@@ -383,7 +380,7 @@ struct RGBColor
 			((Int)(blue * 255.0) << 0);
 	}
 
-	inline void setFromInt(Int c)
+	void setFromInt(Int c)
 	{
 		red = ((c >> 16) & 0xff) / 255.0f;
 		green = ((c >>  8) & 0xff) / 255.0f;
@@ -405,5 +402,3 @@ struct RGBAColorInt
 	UnsignedInt red, green, blue, alpha;  // range between 0 and 255
 
 };
-
-#endif // _BASE_TYPE_H_
diff --git a/GeneralsMD/Code/Libraries/Include/Lib/trig.h b/GeneralsMD/Code/Libraries/Include/Lib/trig.h
index a1cd459cef9..d6f3fa22cd8 100644
--- a/GeneralsMD/Code/Libraries/Include/Lib/trig.h
+++ b/GeneralsMD/Code/Libraries/Include/Lib/trig.h
@@ -21,13 +21,10 @@
 // Author: Sondra Iverson, March 1998
 // Converted to Generals by Matthew D. Campbell, February 2002
 
-#ifndef _TRIG_H_
-#define _TRIG_H_
+#pragma once
 
 Real Sin(Real);
 Real Cos(Real);
 Real Tan(Real);
 Real ACos(Real);
 Real ASin(Real x);
-
-#endif // _TRIG_H_
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
index b1a98488375..13f5bc1ef6e 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
@@ -15,8 +15,8 @@ set(WW3D2_SRC
     #assetstatus.h
     #bitmaphandler.cpp
     #bitmaphandler.h
-    bmp2d.cpp
-    bmp2d.h
+    #bmp2d.cpp
+    #bmp2d.h
     boxrobj.cpp
     boxrobj.h
     #bwrender.cpp
@@ -56,8 +56,8 @@ set(WW3D2_SRC
     dx8renderer.h
     dx8rendererdebugger.cpp
     dx8rendererdebugger.h
-    dx8texman.cpp
-    dx8texman.h
+    #dx8texman.cpp
+    #dx8texman.h
     dx8vertexbuffer.cpp
     dx8vertexbuffer.h
     #dx8webbrowser.cpp
@@ -81,7 +81,7 @@ set(WW3D2_SRC
     hlod.cpp
     hlod.h
     #hmdldef.cpp
-    #hmdldef.H
+    #hmdldef.h
     hmorphanim.cpp
     hmorphanim.h
     hrawanim.cpp
@@ -108,8 +108,8 @@ set(WW3D2_SRC
     mapper.h
     #matinfo.cpp
     #matinfo.h
-    matpass.cpp
-    matpass.h
+    #matpass.cpp
+    #matpass.h
     matrixmapper.cpp
     matrixmapper.h
     mesh.cpp
@@ -200,18 +200,18 @@ set(WW3D2_SRC
     #stripoptimizer.h
     #surfaceclass.cpp
     #surfaceclass.h
-    texproject.cpp
-    texproject.h
+    #texproject.cpp
+    #texproject.h
     #textdraw.cpp
     #textdraw.h
-    texture.cpp
-    texture.h
-    texturefilter.cpp
-    texturefilter.h
-    textureloader.cpp
-    textureloader.h
-    texturethumbnail.cpp
-    texturethumbnail.h
+    #texture.cpp
+    #texture.h
+    #texturefilter.cpp
+    #texturefilter.h
+    #textureloader.cpp
+    #textureloader.h
+    #texturethumbnail.cpp
+    #texturethumbnail.h
     vertmaterial.cpp
     vertmaterial.h
     #visrasterizer.cpp
@@ -238,6 +238,20 @@ set_target_properties(z_ww3d2 PROPERTIES OUTPUT_NAME ww3d2)
 
 target_sources(z_ww3d2 PRIVATE ${WW3D2_SRC})
 
+target_compile_definitions(z_ww3d2 PRIVATE
+    $<$<BOOL:${IS_VS6_BUILD}>:WINVER=0x0500>
+)
+
+target_precompile_headers(z_ww3d2 PRIVATE
+    dx8wrapper.h
+    [["always.h"]]
+    [["STLUtils.h"]]
+    [["win.h"]]
+    [["WWCommon.h"]]
+    [["wwstring.h"]]
+    <windows.h>
+)
+
 target_link_libraries(z_ww3d2 PRIVATE
     corei_ww3d2
     z_wwcommon
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp
index a1469be3811..54687281681 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.cpp
@@ -61,7 +61,6 @@
 #include "chunkio.h"
 #include "w3d_file.h"
 #include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 
 #undef WWASSERT
@@ -80,8 +79,8 @@ const float COINCIDENCE_EPSILON = 0.001f;
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-AABTreeBuilderClass::AABTreeBuilderClass(void) : 
-	Root(NULL), 
+AABTreeBuilderClass::AABTreeBuilderClass(void) :
+	Root(NULL),
 	CurPolyIndex(0),
 	PolyCount(0),
 	Polys(NULL),
@@ -103,8 +102,8 @@ AABTreeBuilderClass::AABTreeBuilderClass(void) :
  * HISTORY:                                                                                    *
  *   5/19/2000  gth : Created.                                                                 *
  *=============================================================================================*/
-AABTreeBuilderClass::~AABTreeBuilderClass(void) 
-{ 
+AABTreeBuilderClass::~AABTreeBuilderClass(void)
+{
 	Reset();
 }
 
@@ -123,19 +122,14 @@ AABTreeBuilderClass::~AABTreeBuilderClass(void)
  *=============================================================================================*/
 void AABTreeBuilderClass::Reset(void)
 {
-	if (Root) { 
-		delete Root; Root = NULL; 
-	} 
+	delete Root;
+	Root = NULL;
 
-	if (Verts != NULL) {
-		delete[] Verts;
-		Verts = NULL;
-	}
+	delete[] Verts;
+	Verts = NULL;
 
-	if (Polys != NULL) {
-		delete[] Polys;
-		Polys = NULL;
-	}
+	delete[] Polys;
+	Polys = NULL;
 }
 
 /***********************************************************************************************
@@ -298,7 +292,7 @@ void AABTreeBuilderClass::Build_Tree(CullNodeStruct * node,int polycount,int * p
 	SplitChoiceStruct sc;
 
 	sc = Select_Splitting_Plane(polycount,polyindices);
-	
+
 	/*
 	** If the algorithm could not separate any polys, just install the polys
 	** in this node and terminate.  TODO: explore how this happens.
@@ -343,7 +337,7 @@ void AABTreeBuilderClass::Build_Tree(CullNodeStruct * node,int polycount,int * p
 		Build_Tree(node->Front,arrays.FrontCount,arrays.FrontPolys);
 		arrays.FrontPolys = NULL;
 	}
-	
+
 	/*
 	** Build a back tree if necessary. Remember that the build function
 	** deletes the tile array.
@@ -371,7 +365,7 @@ void AABTreeBuilderClass::Build_Tree(CullNodeStruct * node,int polycount,int * p
  * HISTORY:                                                                                    *
  *   6/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-AABTreeBuilderClass::SplitChoiceStruct 
+AABTreeBuilderClass::SplitChoiceStruct
 AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices)
 {
 	WWASSERT(polyindices != NULL);
@@ -380,14 +374,14 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices)
 
 	SplitChoiceStruct best_plane_stats;
 	SplitChoiceStruct considered_plane_stats;
-	
+
 	/*
 	** Try putting axis-aligned planes through some random vertices
 	*/
 	for (int trys = 0; trys < MIN(NUM_TRYS,polycount); trys++) {
 
 		AAPlaneClass plane;
-		
+
 		/*
 		** Select a random poly and vertex index;
 		*/
@@ -395,7 +389,7 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices)
 		int vert_index = rand() % 3;
 		const TriIndex * polyverts = Polys + poly_index;
 		const Vector3 * vert = Verts + (*polyverts)[vert_index];
-		
+
 		/*
 		** Select a random plane
 		*/
@@ -431,7 +425,7 @@ AABTreeBuilderClass::Select_Splitting_Plane(int polycount,int * polyindices)
  * HISTORY:                                                                                    *
  *   6/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-AABTreeBuilderClass::SplitChoiceStruct 
+AABTreeBuilderClass::SplitChoiceStruct
 AABTreeBuilderClass::Compute_Plane_Score(int polycount,int * polyindices,const AAPlaneClass & plane)
 {
 	/*
@@ -446,16 +440,16 @@ AABTreeBuilderClass::Compute_Plane_Score(int polycount,int * polyindices,const A
 
 		switch(Which_Side(plane,polyindices[i])) {
 
-			case FRONT:	
+			case FRONT:
 			case ON:
 			case BOTH:
 				{
-					sc.FrontCount++;		
+					sc.FrontCount++;
 					Update_Min_Max(polyindices[i],sc.FMin,sc.FMax );
 					break;
 				}
 
-			case BACK:		
+			case BACK:
 				{
 					sc.BackCount++;
 					Update_Min_Max(polyindices[i],sc.BMin,sc.BMax );
@@ -463,21 +457,21 @@ AABTreeBuilderClass::Compute_Plane_Score(int polycount,int * polyindices,const A
 				}
 		}
 	}
-	
+
 	/*
 	** Inflate the box a tiny amount so that we never
 	** get volumes of zero!
 	*/
 	sc.BMin -= Vector3(WWMATH_EPSILON,WWMATH_EPSILON,WWMATH_EPSILON);
 	sc.BMax += Vector3(WWMATH_EPSILON,WWMATH_EPSILON,WWMATH_EPSILON);
-	
+
 	/*
 	** Compute the cost.
 	*/
 	float back_cost = (sc.BMax.X - sc.BMin.X) * (sc.BMax.Y - sc.BMin.Y) * (sc.BMax.Z - sc.BMin.Z) * sc.BackCount;
 	float front_cost = (sc.FMax.X - sc.FMin.X) * (sc.FMax.Y - sc.FMin.Y) * (sc.FMax.Z - sc.FMin.Z) * sc.FrontCount;
 	sc.Cost = front_cost + back_cost;
-	
+
 	if ((sc.FrontCount == 0) || (sc.BackCount == 0)) {
 		sc.Cost = FLT_MAX;
 	}
@@ -498,7 +492,7 @@ AABTreeBuilderClass::Compute_Plane_Score(int polycount,int * polyindices,const A
  * HISTORY:                                                                                    *
  *   6/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-AABTreeBuilderClass::OverlapType 
+AABTreeBuilderClass::OverlapType
 AABTreeBuilderClass::Which_Side(const AAPlaneClass & plane,int poly_index)
 {
 	/*
@@ -506,13 +500,13 @@ AABTreeBuilderClass::Which_Side(const AAPlaneClass & plane,int poly_index)
 	*/
 	int mask = 0;
 	for (int vi=0; vi<3; vi++) {
-		
+
 		const Vector3 & point = Verts[ Polys[poly_index][vi] ];
 		float delta = point[plane.Normal] - plane.Dist;
-		
+
 		if (delta > COINCIDENCE_EPSILON) {
 			mask |= POS;
-		} 
+		}
 		if (delta < -COINCIDENCE_EPSILON) {
 			mask |= NEG;
 		}
@@ -520,7 +514,7 @@ AABTreeBuilderClass::Which_Side(const AAPlaneClass & plane,int poly_index)
 	}
 
 	/*
-	** Now evaluate the status of all of the verts to determine whether the 
+	** Now evaluate the status of all of the verts to determine whether the
 	** triangle is in front, behind, on or overlapping the plane
 	*/
 
@@ -573,7 +567,7 @@ void AABTreeBuilderClass::Split_Polys
 )
 {
 	/*
-	** Note that this routine arrays of polygons. The caller is then responsible for keeping 
+	** Note that this routine arrays of polygons. The caller is then responsible for keeping
 	** track of the memory this routine allocates.
 	*/
 	if (sc.FrontCount > 0) {
@@ -591,7 +585,7 @@ void AABTreeBuilderClass::Split_Polys
 
 		switch(Which_Side(sc.Plane,polyindices[i])) {
 
-			case FRONT: 
+			case FRONT:
 			case ON:
 			case BOTH:
 				arrays->FrontPolys[arrays->FrontCount++] = polyindices[i];
@@ -604,7 +598,7 @@ void AABTreeBuilderClass::Split_Polys
 	}
 
 	/*
-	** when we are all done, the counts should match. 
+	** when we are all done, the counts should match.
 	*/
 	WWASSERT(arrays->FrontCount == sc.FrontCount);
 	WWASSERT(arrays->BackCount == sc.BackCount);
@@ -656,7 +650,7 @@ void AABTreeBuilderClass::Compute_Bounding_Box(CullNodeStruct * node)
 
 		if (node->Front->Min.Y < node->Min.Y) node->Min.Y = node->Front->Min.Y;
 		if (node->Front->Max.Y > node->Max.Y) node->Max.Y = node->Front->Max.Y;
-		
+
 		if (node->Front->Min.Z < node->Min.Z) node->Min.Z = node->Front->Min.Z;
 		if (node->Front->Max.Z > node->Max.Z) node->Max.Z = node->Front->Max.Z;
 	}
@@ -670,7 +664,7 @@ void AABTreeBuilderClass::Compute_Bounding_Box(CullNodeStruct * node)
 
 		if (node->Back->Min.Y < node->Min.Y) node->Min.Y = node->Back->Min.Y;
 		if (node->Back->Max.Y > node->Max.Y) node->Max.Y = node->Back->Max.Y;
-		
+
 		if (node->Back->Min.Z < node->Min.Z) node->Min.Z = node->Back->Min.Z;
 		if (node->Back->Max.Z > node->Max.Z) node->Max.Z = node->Back->Max.Z;
 	}
@@ -700,7 +694,7 @@ int AABTreeBuilderClass::Assign_Index(CullNodeStruct * node,int index)
 {
 	/*
 	** This function is used to assign a sequential index to
-	** each node in the tree.  The AABTree stores its nodes in 
+	** each node in the tree.  The AABTree stores its nodes in
 	** an array so this index is used to determine which slot
 	** in the array to put each node into.
 	*/
@@ -733,9 +727,9 @@ int AABTreeBuilderClass::Assign_Index(CullNodeStruct * node,int index)
  *   6/19/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 int AABTreeBuilderClass::Node_Count(void)
-{	
+{
 	if (Root) {
-		return Node_Count_Recursive(Root,0);	
+		return Node_Count_Recursive(Root,0);
 	} else {
 		return 0;
 	}
@@ -754,8 +748,8 @@ int AABTreeBuilderClass::Node_Count(void)
  * HISTORY:                                                                                    *
  *   10/23/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-int AABTreeBuilderClass::Poly_Count(void) 
-{ 
+int AABTreeBuilderClass::Poly_Count(void)
+{
 	return PolyCount;
 }
 
@@ -958,7 +952,7 @@ void AABTreeBuilderClass::Build_W3D_AABTree_Recursive
 	newnode->Max.X = node->Max.X;
 	newnode->Max.Y = node->Max.Y;
 	newnode->Max.Z = node->Max.Z;
-	
+
 	/*
 	** If this is a non-leaf node, set up the child indices, otherwise set up the polygon indices
 	*/
@@ -967,7 +961,7 @@ void AABTreeBuilderClass::Build_W3D_AABTree_Recursive
 		WWASSERT(node->Back != NULL);		// if we have one child, we better have both!
 		newnode->FrontOrPoly0 = node->Front->Index;
 		newnode->BackOrPolyCount = node->Back->Index;
-	
+
 	} else {
 
 		newnode->FrontOrPoly0 = cur_poly | 0x80000000;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h
index 482ecd9e9f6..b3b25842637 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h
@@ -36,13 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef AABTREEBUILDER_H
-#define AABTREEBUILDER_H
 
 #include "always.h"
 #include "vector3.h"
@@ -65,19 +59,19 @@ struct W3dMeshAABTreeNode;
 class AABTreeBuilderClass
 {
 public:
-	
+
 	AABTreeBuilderClass(void);
 	~AABTreeBuilderClass(void);
 
 	void					Build_AABTree(int polycount,TriIndex * polys,int vertcount,Vector3 * verts);
 	void					Build_AABTree(int polycount,Vector3i* polys,int vertcount,Vector3 * verts);
 	void					Export(ChunkSaveClass & csave);
-	
+
 	int					Node_Count(void);
 	int					Poly_Count(void);
 
-	enum 
-	{ 
+	enum
+	{
 		MIN_POLYS_PER_NODE =		4,
 		SMALL_VERTEX =				-100000,
 		BIG_VERTEX =				100000
@@ -90,14 +84,14 @@ class AABTreeBuilderClass
 	** wasteful in terms of memory footprint and number of allocations than the
 	** streamlined version found in the actual AABTreeClass.
 	*/
-	struct CullNodeStruct 
+	struct CullNodeStruct
 	{
 		CullNodeStruct(void) : Index(0),Min(0,0,0),Max(0,0,0),Front(NULL),Back(NULL),PolyCount(0),PolyIndices(NULL) {}
-		~CullNodeStruct(void) 
+		~CullNodeStruct(void)
 		{
-			if (Front) { delete Front; } 
-			if (Back) { delete Back; }
-			if (PolyIndices) { delete[] PolyIndices; }
+			delete Front;
+			delete Back;
+			delete[] PolyIndices;
 		}
 
 		int						Index;
@@ -114,7 +108,7 @@ class AABTreeBuilderClass
 	*/
 	struct SplitChoiceStruct
 	{
-		SplitChoiceStruct(void) : 
+		SplitChoiceStruct(void) :
 			Cost(FLT_MAX),
 			FrontCount(0),
 			BackCount(0),
@@ -122,10 +116,10 @@ class AABTreeBuilderClass
 			BMax(SMALL_VERTEX,SMALL_VERTEX,SMALL_VERTEX),
 			FMin(BIG_VERTEX,BIG_VERTEX,BIG_VERTEX),
 			FMax(SMALL_VERTEX,SMALL_VERTEX,SMALL_VERTEX),
-			Plane(AAPlaneClass::XNORMAL,0) 
+			Plane(AAPlaneClass::XNORMAL,0)
 		{
 		}
-		
+
 		float						Cost;				// try to minimize this!
 		int						FrontCount;		// number of polys in front of the plane
 		int						BackCount;		// number of polys behind the plane
@@ -138,7 +132,7 @@ class AABTreeBuilderClass
 
 	struct SplitArraysStruct
 	{
-		SplitArraysStruct(void) : 
+		SplitArraysStruct(void) :
 			FrontCount(0),
 			BackCount(0),
 			FrontPolys(NULL),
@@ -181,14 +175,14 @@ class AABTreeBuilderClass
 	void								Update_Min(int poly_index,Vector3 & set_min);
 	void								Update_Max(int poly_index,Vector3 & set_max);
 	void								Update_Min_Max(int poly_index, Vector3 & set_min, Vector3 & set_max);
-	
+
 	void								Build_W3D_AABTree_Recursive(CullNodeStruct *	node,
 											W3dMeshAABTreeNode * w3dnodes,
 											uint32 * poly_indices,
 											int & cur_node,
 											int &	cur_poly);
 	/*
-	** Tree 
+	** Tree
 	*/
 	CullNodeStruct *				Root;
 	int								CurPolyIndex;
@@ -203,9 +197,3 @@ class AABTreeBuilderClass
 
 	friend class AABTreeClass;
 };
-
-
-
-
-#endif //AABTREEBUILDER_H
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
index 329705a2577..910f1f7d2f9 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
@@ -89,7 +89,7 @@ Animatable3DObjClass::Animatable3DObjClass(const char * htree_name) :
   ModeAnim.Motion=NULL;
 	ModeAnim.Frame=0.0f;
 	ModeAnim.PrevFrame=0.0f;
-	ModeAnim.LastSyncTime=WW3D::Get_Sync_Time();
+	ModeAnim.LastSyncTime=WW3D::Get_Logic_Time_Milliseconds();
 	ModeAnim.frameRateMultiplier=1.0;	// 020607 srj -- added
 	ModeAnim.animDirection=1.0;	// 020607 srj -- added
 	ModeInterp.Motion0=NULL;
@@ -100,7 +100,7 @@ Animatable3DObjClass::Animatable3DObjClass(const char * htree_name) :
 	ModeInterp.Frame1=0.0f;
 	ModeInterp.Percentage=0.0f;
 	ModeCombo.AnimCombo=NULL;
-  
+
 	/*
 	** Store a pointer to the htree
 	*/
@@ -114,7 +114,7 @@ Animatable3DObjClass::Animatable3DObjClass(const char * htree_name) :
 		if (source != NULL) {
 			HTree = W3DNEW HTreeClass(*source);
 		} else {
-			WWDEBUG_SAY(("Unable to find HTree: %s\r\n",htree_name));
+			WWDEBUG_SAY(("Unable to find HTree: %s",htree_name));
 			HTree = W3DNEW HTreeClass;
 			HTree->Init_Default();
 		}
@@ -145,7 +145,7 @@ Animatable3DObjClass::Animatable3DObjClass(const Animatable3DObjClass & src) :
 	ModeAnim.Motion=NULL;
 	ModeAnim.Frame=0.0f;
 	ModeAnim.PrevFrame=0.0f;
-	ModeAnim.LastSyncTime=WW3D::Get_Sync_Time();
+	ModeAnim.LastSyncTime=WW3D::Get_Logic_Time_Milliseconds();
 	ModeAnim.frameRateMultiplier=1.0;	// 020607 srj -- added
 	ModeAnim.animDirection=1.0;	// 020607 srj -- added
 	ModeInterp.Motion0=NULL;
@@ -177,9 +177,7 @@ Animatable3DObjClass::~Animatable3DObjClass(void)
 {
 	Release();
 
-	if (HTree) {
-		delete HTree;
-	}
+	delete HTree;
 }
 
 
@@ -196,12 +194,9 @@ Animatable3DObjClass::~Animatable3DObjClass(void)
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 Animatable3DObjClass & Animatable3DObjClass::operator = (const Animatable3DObjClass & that)
-{ 
+{
 	if (&that != this) {
 		Release();
-		if (HTree) {
-			delete HTree;
-		}
 
 		CompositeRenderObjClass::operator = (that);
 
@@ -210,7 +205,7 @@ Animatable3DObjClass & Animatable3DObjClass::operator = (const Animatable3DObjCl
 		ModeAnim.Motion = NULL;
 		ModeAnim.Frame = 0.0f;
 		ModeAnim.PrevFrame = 0.0f;
-		ModeAnim.LastSyncTime = WW3D::Get_Sync_Time();
+		ModeAnim.LastSyncTime = WW3D::Get_Logic_Time_Milliseconds();
 		ModeAnim.frameRateMultiplier=1.0;	// 020607 srj -- added
 		ModeAnim.animDirection=1.0;	// 020607 srj -- added
 		ModeInterp.Motion0 = NULL;
@@ -222,9 +217,10 @@ Animatable3DObjClass & Animatable3DObjClass::operator = (const Animatable3DObjCl
 		ModeInterp.Percentage = 0.0f;
 		ModeCombo.AnimCombo = NULL;
 
+		delete HTree;
 		HTree = W3DNEW HTreeClass(*that.HTree);
 	}
-	return *this; 
+	return *this;
 }
 
 /***********************************************************************************************
@@ -239,7 +235,7 @@ Animatable3DObjClass & Animatable3DObjClass::operator = (const Animatable3DObjCl
  * HISTORY:                                                                                    *
  *   12/8/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-void Animatable3DObjClass::Release( void ) 
+void Animatable3DObjClass::Release( void )
 {
 	switch (CurMotionMode) {
 
@@ -293,13 +289,12 @@ void Animatable3DObjClass::Render(RenderInfoClass & rinfo)
 		return;
 	}
 
-	if ( CurMotionMode == SINGLE_ANIM ) {
-		if ( ModeAnim.AnimMode != ANIM_MODE_MANUAL ) {
-			Single_Anim_Progress();
-		}
-	}
+	//
+	// Force the hierarchy to be recalculated for single animations.
+	//
+	const bool isSingleAnim = CurMotionMode == SINGLE_ANIM && ModeAnim.AnimMode != ANIM_MODE_MANUAL;
 
-	if (!Is_Hierarchy_Valid() || Are_Sub_Object_Transforms_Dirty()) {
+	if (isSingleAnim || !Is_Hierarchy_Valid() || Are_Sub_Object_Transforms_Dirty()) {
 		Update_Sub_Object_Transforms();
 	}
 }
@@ -320,13 +315,12 @@ void Animatable3DObjClass::Special_Render(SpecialRenderInfoClass & rinfo)
 {
 	if (HTree == NULL) return;
 
-	if ( CurMotionMode == SINGLE_ANIM ) {
-		if ( ModeAnim.AnimMode != ANIM_MODE_MANUAL ) {
-			Single_Anim_Progress();
-		}
-	}
+	//
+	// Force the hierarchy to be recalculated for single animations.
+	//
+	const bool isSingleAnim = CurMotionMode == SINGLE_ANIM && ModeAnim.AnimMode != ANIM_MODE_MANUAL;
 
-	if (!Is_Hierarchy_Valid()) {
+	if (isSingleAnim || !Is_Hierarchy_Valid()) {
 		Update_Sub_Object_Transforms();
 	}
 }
@@ -345,9 +339,9 @@ void Animatable3DObjClass::Special_Render(SpecialRenderInfoClass & rinfo)
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Set_Transform(const Matrix3D &m)
-{ 
-	CompositeRenderObjClass::Set_Transform(m); 
-	Set_Hierarchy_Valid(false); 
+{
+	CompositeRenderObjClass::Set_Transform(m);
+	Set_Hierarchy_Valid(false);
 }
 
 
@@ -364,9 +358,9 @@ void Animatable3DObjClass::Set_Transform(const Matrix3D &m)
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Set_Position(const Vector3 &v)
-{ 
-	CompositeRenderObjClass::Set_Position(v); 
-	Set_Hierarchy_Valid(false); 
+{
+	CompositeRenderObjClass::Set_Position(v);
+	Set_Hierarchy_Valid(false);
 }
 
 
@@ -479,8 +473,8 @@ void Animatable3DObjClass::Set_Animation(HAnimClass * motion, float frame, int m
 		CurMotionMode = SINGLE_ANIM;
 		ModeAnim.Motion = motion;
 		ModeAnim.PrevFrame = ModeAnim.Frame;
-		ModeAnim.Frame = frame;		
-		ModeAnim.LastSyncTime = WW3D::Get_Sync_Time();
+		ModeAnim.Frame = frame;
+		ModeAnim.LastSyncTime = WW3D::Get_Logic_Time_Milliseconds();
 		ModeAnim.frameRateMultiplier=1.0;	// 020607 srj -- added
 		ModeAnim.animDirection=1.0;	// 020607 srj -- added
 
@@ -490,7 +484,7 @@ void Animatable3DObjClass::Set_Animation(HAnimClass * motion, float frame, int m
 			ModeAnim.animDirection = 1.0f;	//assume playing forwards
 		else
 			ModeAnim.animDirection = -1.0f;	//reverse animation playback
- 
+
 		const char* sound_name = AnimatedSoundMgrClass::Get_Embedded_Sound_Name(motion);
 		if (sound_name) {
 			int bone_index = Get_Bone_Index(sound_name);
@@ -502,7 +496,7 @@ void Animatable3DObjClass::Set_Animation(HAnimClass * motion, float frame, int m
 	}
 
 	Set_Hierarchy_Valid(false);
-}	
+}
 
 /***********************************************************************************************
  * Animatable3DObjClass::Set_Animation -- set the animation state to a blend of two anims      *
@@ -517,7 +511,7 @@ void Animatable3DObjClass::Set_Animation(HAnimClass * motion, float frame, int m
  *   12/8/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Set_Animation
-( 
+(
 	HAnimClass * motion0,
 	float frame0,
 	HAnimClass * motion1,
@@ -570,7 +564,7 @@ void Animatable3DObjClass::Set_Animation
  *   12/8/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Set_Animation
-( 
+(
 	HAnimComboClass * anim_combo
 )
 {
@@ -582,7 +576,7 @@ void Animatable3DObjClass::Set_Animation
 
 	if (anim_combo) {
 		int count = anim_combo->Get_Num_Anims();
-		for (int index = 0; index < count; index ++) {				
+		for (int index = 0; index < count; index ++) {
 			HAnimClass *motion = anim_combo->Peek_Motion(index);
 
 			const char* sound_name = AnimatedSoundMgrClass::Get_Embedded_Sound_Name(motion);
@@ -592,7 +586,7 @@ void Animatable3DObjClass::Set_Animation
 			}
 		}
 	}
-}						 
+}
 
 
 /***********************************************************************************************
@@ -634,7 +628,7 @@ const Matrix3D &	Animatable3DObjClass::Get_Bone_Transform(const char * bonename)
 	if (HTree) {
 		WWASSERT(HTree);
 		WWASSERT(bonename);
-		
+
 		int idx = HTree->Get_Bone_Index(bonename);
 		return Get_Bone_Transform(idx);
 	} else {
@@ -688,9 +682,9 @@ const Matrix3D &	Animatable3DObjClass::Get_Bone_Transform(int boneindex)
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Capture_Bone(int boneindex)
-{ 
+{
 	if (HTree) {
-		HTree->Capture_Bone(boneindex); 
+		HTree->Capture_Bone(boneindex);
 	}
 }
 
@@ -708,9 +702,9 @@ void Animatable3DObjClass::Capture_Bone(int boneindex)
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Release_Bone(int boneindex)
-{ 
+{
 	if (HTree) {
-		HTree->Release_Bone(boneindex); 
+		HTree->Release_Bone(boneindex);
 	}
 }
 
@@ -727,10 +721,10 @@ void Animatable3DObjClass::Release_Bone(int boneindex)
  * HISTORY:                                                                                    *
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
-bool Animatable3DObjClass::Is_Bone_Captured(int boneindex) const					
-{ 
+bool Animatable3DObjClass::Is_Bone_Captured(int boneindex) const
+{
 	if (HTree) {
-		return HTree->Is_Bone_Captured(boneindex); 
+		return HTree->Is_Bone_Captured(boneindex);
 	} else {
 		return false;
 	}
@@ -750,8 +744,8 @@ bool Animatable3DObjClass::Is_Bone_Captured(int boneindex) const
  *   3/2/99     GTH : Created.                                                                 *
  *=============================================================================================*/
 void Animatable3DObjClass::Control_Bone(int bindex,const Matrix3D & objtm,bool world_space_translation)
-{ 
-#ifdef WWDEBUG	
+{
+#ifdef WWDEBUG
 	for (int j=0; j<3; j++) {
 		for (int i=0; i<4; i++) {
 			WWASSERT(WWMath::Is_Valid_Float(objtm[j][i]));
@@ -760,7 +754,7 @@ void Animatable3DObjClass::Control_Bone(int bindex,const Matrix3D & objtm,bool w
 #endif
 
 	if (HTree) {
-		HTree->Control_Bone(bindex,objtm,world_space_translation); 
+		HTree->Control_Bone(bindex,objtm,world_space_translation);
 		Set_Hierarchy_Valid(false);
 	}
 }
@@ -780,7 +774,7 @@ void Animatable3DObjClass::Control_Bone(int bindex,const Matrix3D & objtm,bool w
 void Animatable3DObjClass::Update_Sub_Object_Transforms(void)
 {
 	/*
-	** The RenderObj impementation will cause our 'container' 
+	** The RenderObj implementation will cause our 'container'
 	** to update if we are not valid yet
 	*/
 	CompositeRenderObjClass::Update_Sub_Object_Transforms();
@@ -795,12 +789,12 @@ void Animatable3DObjClass::Update_Sub_Object_Transforms(void)
 			break;
 
 		case SINGLE_ANIM:
-			
+
 			if ( ModeAnim.AnimMode != ANIM_MODE_MANUAL ) {
 				Single_Anim_Progress();
 			}
 			Anim_Update(Transform,ModeAnim.Motion,ModeAnim.Frame);
-			
+
 			/*
 			**	Play any sounds that are triggered by this frame of animation
 			*/
@@ -824,7 +818,7 @@ void Animatable3DObjClass::Update_Sub_Object_Transforms(void)
 				ModeInterp.PrevFrame1 = AnimatedSoundMgrClass::Trigger_Sound(ModeInterp.Motion1, ModeInterp.PrevFrame1, ModeInterp.Frame1, HTree->Get_Transform(ModeInterp.Motion1->Get_Embedded_Sound_Bone_Index()));
 			}
 
-  			break;
+			break;
 
 		case MULTIPLE_ANIM:
 		{
@@ -834,7 +828,7 @@ void Animatable3DObjClass::Update_Sub_Object_Transforms(void)
 			**	Play any sounds that are triggered by this frame of animation
 			*/
 			int count = ModeCombo.AnimCombo->Get_Num_Anims();
-			for (int index = 0; index < count; index ++) {				
+			for (int index = 0; index < count; index ++) {
 				HAnimClass *motion = ModeCombo.AnimCombo->Peek_Motion(index);
 
 				if ( motion != NULL && motion->Has_Embedded_Sounds() ) {
@@ -842,7 +836,7 @@ void Animatable3DObjClass::Update_Sub_Object_Transforms(void)
 																				ModeCombo.AnimCombo->Get_Frame(index), HTree->Get_Transform(motion->Get_Embedded_Sound_Bone_Index()));
 					ModeCombo.AnimCombo->Set_Prev_Frame(index, prev_frame);
 				}
-				
+
 			}
 			break;
 		}
@@ -877,16 +871,16 @@ bool Animatable3DObjClass::Simple_Evaluate_Bone(int boneindex, Matrix3D *tm) con
 	if (	CurMotionMode == NONE ||
 			CurMotionMode == BASE_POSE ||
 			CurMotionMode == SINGLE_ANIM)
-	{		
+	{
 		//
 		//	Determine which frame we should be on, then use this
 		// information to determine the bone's transform.
 		//
 		float curr_frame = Compute_Current_Frame ();
 		retval = Simple_Evaluate_Bone (boneindex, curr_frame, tm);
-	
+
 	} else {
-		
+
 		const_cast <Animatable3DObjClass *>(this)->Update_Sub_Object_Transforms();
 		*tm = HTree->Get_Transform(boneindex);
 
@@ -917,7 +911,7 @@ bool Animatable3DObjClass::Simple_Evaluate_Bone(int boneindex, float frame, Matr
 	//	Only do this for simple animations
 	//
 	if (HTree != NULL) {
-		
+
 		if (CurMotionMode == SINGLE_ANIM) {
 			retval = HTree->Simple_Evaluate_Pivot (ModeAnim.Motion, boneindex, frame, Get_Transform (), tm);
 		} else if (CurMotionMode == NONE || CurMotionMode == BASE_POSE) {
@@ -957,31 +951,36 @@ float Animatable3DObjClass::Compute_Current_Frame(float *newDirection) const
 		{
 			frame = ModeAnim.Frame;
 
-			//
-			//	Compute the current frame based on elapsed time.
-			//
 			if (ModeAnim.AnimMode != ANIM_MODE_MANUAL) {
-				float sync_time_diff = WW3D::Get_Sync_Time() - ModeAnim.LastSyncTime;
-				float delta = ModeAnim.Motion->Get_Frame_Rate() * ModeAnim.frameRateMultiplier * ModeAnim.animDirection * sync_time_diff * 0.001f;
-				frame += delta;
+				//
+				//	Compute the current frame based on elapsed time.
+				//	TheSuperHackers @info Is using elapsed time because frame computation is not guaranteed to be called every render frame!
+				//
+				// TheSuperHackers @tweak The animation render update is now decoupled from the logic step.
+				const float syncMilliseconds = WW3D::Get_Logic_Time_Milliseconds() - ModeAnim.LastSyncTime;
+				const float animMilliseconds = ModeAnim.Motion->Get_Frame_Rate() * ModeAnim.frameRateMultiplier * ModeAnim.animDirection * syncMilliseconds;
+				const float animSeconds = animMilliseconds * 0.001f;
+				frame += animSeconds;
 
 				//
 				//	Wrap the frame
 				//
+				const int numFrames = ModeAnim.Motion->Get_Num_Frames() - 1;
+
 				switch (ModeAnim.AnimMode)
 				{
 					case ANIM_MODE_ONCE:
-						if (frame >= ModeAnim.Motion->Get_Num_Frames() - 1) {
-							frame = ModeAnim.Motion->Get_Num_Frames() - 1;
+						if (frame >= numFrames) {
+							frame = numFrames;
 						}
 						break;
 					case ANIM_MODE_LOOP:
-						if ( frame >= ModeAnim.Motion->Get_Num_Frames() - 1 ) {
-							frame -= ModeAnim.Motion->Get_Num_Frames() - 1;
-						}
-						// If it is still too far out, reset
-						if ( frame >= ModeAnim.Motion->Get_Num_Frames() - 1 ) {
-							frame = 0;
+						if ( frame >= numFrames ) {
+							frame -= numFrames;
+							// If it is still too far out, reset
+							if ( frame >= numFrames ) {
+								frame = 0;
+							}
 						}
 						break;
 					case ANIM_MODE_ONCE_BACKWARDS:	//play animation one time but backwards
@@ -991,22 +990,22 @@ float Animatable3DObjClass::Compute_Current_Frame(float *newDirection) const
 						break;
 					case ANIM_MODE_LOOP_BACKWARDS:	//play animation backwards in a loop
 						if ( frame < 0 ) {
-							frame += ModeAnim.Motion->Get_Num_Frames() - 1;
-						}
-						// If it is still too far out, reset
-						if ( frame < 0 ) {
-							frame = ModeAnim.Motion->Get_Num_Frames() - 1;
+							frame += numFrames;
+							// If it is still too far out, reset
+							if ( frame < 0 ) {
+								frame = numFrames;
+							}
 						}
 						break;
 					case ANIM_MODE_LOOP_PINGPONG:
 						if (ModeAnim.animDirection >= 1.0f)
 						{	//playing forwards, reverse direction
-							if (frame >= (ModeAnim.Motion->Get_Num_Frames() - 1))
+							if (frame >= numFrames)
 							{	//step backwards in animation by excess time
-								frame = (ModeAnim.Motion->Get_Num_Frames() - 1)*2 - frame;
+								frame = numFrames * 2 - frame;
 								// If it is still too far out, reset
-								if ( frame >= ModeAnim.Motion->Get_Num_Frames() - 1 )
-									frame = (ModeAnim.Motion->Get_Num_Frames() - 1);
+								if ( frame >= numFrames - 1 )
+									frame = numFrames;
 								direction = ModeAnim.animDirection * -1.0f;
 							}
 						}
@@ -1016,7 +1015,7 @@ float Animatable3DObjClass::Compute_Current_Frame(float *newDirection) const
 							{	//step forwards in animation by excess time
 								frame = -frame;
 								// If it is still too far out, reset
-								if ( frame >= ModeAnim.Motion->Get_Num_Frames() - 1 )
+								if ( frame >= numFrames )
 										frame = 0;
 								direction = ModeAnim.animDirection * -1.0f;
 							}
@@ -1027,10 +1026,10 @@ float Animatable3DObjClass::Compute_Current_Frame(float *newDirection) const
 		}
 		break;
 	}
-  
+
 	if (newDirection)
 		*newDirection = direction;
-	return frame;	  
+	return frame;
 }
 
 /***********************************************************************************************
@@ -1050,27 +1049,14 @@ void Animatable3DObjClass::Single_Anim_Progress (void)
 	//
 	//	Update the current frame (only works in "SINGLE_ANIM" mode!)
 	//
-	if (CurMotionMode == SINGLE_ANIM) {
-		
-		// 
-		// Update the frame number and sync time
-		//
-		float oldprev = ModeAnim.PrevFrame;
-		ModeAnim.PrevFrame		= ModeAnim.Frame;
-		ModeAnim.Frame				= Compute_Current_Frame(&ModeAnim.animDirection);
-		ModeAnim.LastSyncTime	= WW3D::Get_Sync_Time();
-	
-		if (ModeAnim.Frame == ModeAnim.PrevFrame) {
-			// This function was somehow called twice per frame.
-			// Since ModeAnim.Frame hasn't changed, reset the ModeAnim.PrevFrame.
-			// If you don't do this sounds won't be triggered properly because Frame and PrevFrame will be the same.
-			ModeAnim.PrevFrame = oldprev;
-		}
-		//
-		// Force the heirarchy to be recalculated
-		//
-		Set_Hierarchy_Valid (false);
-	}
+	WWASSERT(CurMotionMode == SINGLE_ANIM);
+
+	//
+	// Update the frame number and sync time
+	//
+	ModeAnim.PrevFrame		= ModeAnim.Frame;
+	ModeAnim.Frame				= Compute_Current_Frame(&ModeAnim.animDirection);
+	ModeAnim.LastSyncTime	= WW3D::Get_Logic_Time_Milliseconds();
 }
 
 
@@ -1089,7 +1075,7 @@ void Animatable3DObjClass::Single_Anim_Progress (void)
 bool	Animatable3DObjClass::Is_Animation_Complete( void ) const
 {
 	if (CurMotionMode == SINGLE_ANIM) {
-	
+
 		if ( ModeAnim.AnimMode == ANIM_MODE_ONCE ) {
 			return ( ModeAnim.Frame == ModeAnim.Motion->Get_Num_Frames() - 1 );
 		}
@@ -1128,16 +1114,14 @@ void Animatable3DObjClass::Set_Animation_Frame_Rate_Multiplier(float multiplier)
 
 // (gth) TESTING DYNAMICALLY SWAPPING SKELETONS!
 
-void Animatable3DObjClass::Set_HTree(HTreeClass * new_htree) 
-{ 
+void Animatable3DObjClass::Set_HTree(HTreeClass * new_htree)
+{
 	WWMEMLOG(MEM_ANIMATION);
 	// try to ensure that the htree we're using has the same structure...
-	WWASSERT(new_htree->Num_Pivots() == HTree->Num_Pivots()); 
-	
+	WWASSERT(new_htree->Num_Pivots() == HTree->Num_Pivots());
+
 	// just assign it...
-	if (HTree != NULL) {
-		delete HTree;
-	}
+	delete HTree;
 	HTree = W3DNEW HTreeClass(*new_htree);
 }
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h
index b8bba817fc9..2168a3f37a7 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h
@@ -38,12 +38,7 @@
  *   Animatable3DObjClass::Combo_Update -- Animation update for a combination of anims         *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef ANIMOBJ_H
-#define ANIMOBJ_H
 
 #include "always.h"
 #include "composite.h"
@@ -97,7 +92,7 @@ class Animatable3DObjClass : public CompositeRenderObjClass
 	virtual void					Set_Animation_Frame_Rate_Multiplier(float multiplier);	// 020607 srj -- added
 
 	virtual HAnimClass *	Peek_Animation_And_Info(float& frame, int& numFrames, int& mode, float& mult);	// 020710 srj -- added
-	
+
 	virtual HAnimClass *			Peek_Animation( void );
 	virtual bool					Is_Animation_Complete( void ) const;
 	virtual int						Get_Num_Bones(void);
@@ -110,10 +105,10 @@ class Animatable3DObjClass : public CompositeRenderObjClass
 	virtual bool					Is_Bone_Captured(int boneindex) const;
 	virtual void					Control_Bone(int bindex,const Matrix3D & objtm,bool world_space_translation = false);
 	virtual const HTreeClass *	Get_HTree(void) const { return HTree; }
-	
+
 	//
 	//	Simple bone evaluation methods for when the caller doesn't want
-	// to update the heirarchy, but needs to know the transform of
+	// to update the hierarchy, but needs to know the transform of
 	// a bone at a given frame.
 	//
 	virtual bool					Simple_Evaluate_Bone(int boneindex, Matrix3D *tm) const;
@@ -153,14 +148,14 @@ class Animatable3DObjClass : public CompositeRenderObjClass
 	void								Combo_Update(	const Matrix3D & root,
 															HAnimComboClass *anim);
 
-	// flag to kep track of whether the hierarchy tree transforms are currently valid
+	// flag to keep track of whether the hierarchy tree transforms are currently valid
 	bool								Is_Hierarchy_Valid(void) const				{ return IsTreeValid; }
 	void								Set_Hierarchy_Valid(bool onoff) const  	{ IsTreeValid = onoff; }
 
-	// Progress anims for single anim (loop and once)
+	// Progress animations for single anim (loop and once)
 	void								Single_Anim_Progress( void );
 
-	// Release any anims
+	// Release any animations
 	void								Release( void );
 
 protected:
@@ -170,7 +165,7 @@ class Animatable3DObjClass : public CompositeRenderObjClass
 
 	// Hierarchy Tree
 	HTreeClass *					HTree;
-	
+
 	// Animation state for the next frame.  When we add more flexible motion
 	// compositing, add a new state and its associated data to the union below
 	enum {
@@ -190,14 +185,14 @@ class Animatable3DObjClass : public CompositeRenderObjClass
 			float		  				Frame;
 			float						PrevFrame;
 			int						AnimMode;
-			mutable int				LastSyncTime;
+			int								LastSyncTime;
 			float							animDirection;
 			float							frameRateMultiplier;	// 020607 srj -- added
-		} ModeAnim;				  
+		} ModeAnim;
 
 		// CurMotionMode == DOUBLE_ANIM
 		struct {
-			
+
 			HAnimClass *			Motion0;
 			HAnimClass *			Motion1;
 			float		  				Frame0;
@@ -211,9 +206,9 @@ class Animatable3DObjClass : public CompositeRenderObjClass
 		struct {
 			HAnimComboClass *		AnimCombo;
 		} ModeCombo;
-  
+
 	};
-	
+
 	friend class SkinClass;
 };
 
@@ -262,9 +257,11 @@ inline void Animatable3DObjClass::Anim_Update(const Matrix3D & root,HAnimClass *
 	** Apply motion to the base pose
 	*/
 	if ((motion) && (HTree)) {
-		if (ModeAnim.Motion->Class_ID() == HAnimClass::CLASSID_HRAWANIM)
-			HTree->Anim_Update(Transform,(HRawAnimClass*)ModeAnim.Motion,ModeAnim.Frame);
+#if !WW3D_ENABLE_RAW_ANIM_INTERPOLATION
+		if (motion->Class_ID() == HAnimClass::CLASSID_HRAWANIM)
+			HTree->Anim_Update_Without_Interpolation(root,(HRawAnimClass*)motion,frame);
 		else
+#endif
 			HTree->Anim_Update(root,motion,frame);
 	}
 	Set_Hierarchy_Valid(true);
@@ -322,7 +319,3 @@ inline void Animatable3DObjClass::Combo_Update( const Matrix3D & root, HAnimComb
 	}
 	Set_Hierarchy_Valid(true);
 }
-
-
-
-#endif //ANIMOBJ_H
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
index 3344bee416e..56b257de897 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
@@ -17,27 +17,27 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/assetmgr.cpp 43    11/01/01 1:11a Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando                                                     * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/assetmgr.cpp                           $* 
- *                                                                                             * 
- *                   Org Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando                                                     *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/assetmgr.cpp                           $*
+ *                                                                                             *
+ *                   Org Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 08/05/02 10:14a                                              $*
- *                                                                                             * 
- *                    $Revision:: 46                                                          $* 
- *                                                                                             * 
+ *                                                                                             *
+ *                    $Revision:: 46                                                          $*
+ *                                                                                             *
  * 06/27/02 KM Texture class abstraction																			*
  * 07/01/02 KM Shader library integration
  * 08/05/02 KM Texture class redesign (revisited)
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   WW3DAssetManager::WW3DAssetManager -- Constructor                                         *
  *   WW3DAssetManager::~WW3DAssetManager -- Destructor                                         *
  *   WW3DAssetManager::Free -- free all memory (un-needed?)                                    *
@@ -69,11 +69,11 @@
  *   WW3DAssetManager::Find_Prototype_Loader -- find the loader that handles this chunk type   *
  *   WW3DAssetManager::Add_Prototype -- adds the prototype to the hash table                   *
  *   WW3DAssetManager::Find_Prototype -- searches the hash table for the prototype             *
- *   WW3DAssetManager::Open_Texture_File_Cache -- Turn on the texture cache system.            * 
- *   WW3DAssetManager::Close_Texture_File_Cache -- Turn off the texture cache system.          * 
- *   CachedTextureFileClass::getMipmapData -- get data for texture - check to see if in cache. * 
- *   CachedTextureFileClass::getMipmapLevelPartial -- not yet implemented                      * 
- *   CachedTextureFileClass::setupDefaultValues -- loads texture in to get default data.       * 
+ *   WW3DAssetManager::Open_Texture_File_Cache -- Turn on the texture cache system.            *
+ *   WW3DAssetManager::Close_Texture_File_Cache -- Turn off the texture cache system.          *
+ *   CachedTextureFileClass::getMipmapData -- get data for texture - check to see if in cache. *
+ *   CachedTextureFileClass::getMipmapLevelPartial -- not yet implemented                      *
+ *   CachedTextureFileClass::setupDefaultValues -- loads texture in to get default data.       *
  *   WW3DAssetManager::Get_Streaming_Texture -- Gets a streaming texture.                      *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
@@ -110,11 +110,9 @@
 #include "dx8renderer.h"
 #include "metalmap.h"
 #include "w3dexclusionlist.h"
-#include <INI.H>
+#include <INI.h>
 #include <windows.h>
-#include <stdio.h>
 #include <d3dx8core.h>
-#include "texture.h"
 #include "wwprofile.h"
 #include "assetstatus.h"
 #include "ringobj.h"
@@ -202,7 +200,7 @@ class Font3DDataIterator : public AssetIterator
  *                                                                                             *
  * HISTORY:                                                                                    *
  *   12/21/97   GTH : Created.                                                                 *
- *   05/10/1999 SKB : Add TextureCache                                                         * 
+ *   05/10/1999 SKB : Add TextureCache                                                         *
  *=============================================================================================*/
 WW3DAssetManager::WW3DAssetManager(void) :
 	PrototypeLoaders		(PROTOLOADERS_VECTOR_SIZE),
@@ -236,10 +234,10 @@ WW3DAssetManager::WW3DAssetManager(void) :
 	Register_Prototype_Loader (&_SphereLoader);
 
 	SHD_REG_LOADER;
-	
+
 	// allocate the hash table and clear it.
 	PrototypeHashTable = W3DNEWARRAY PrototypeClass * [PROTOTYPE_HASH_TABLE_SIZE];
-	memset(PrototypeHashTable,0,sizeof(PrototypeClass *) * PROTOTYPE_HASH_TABLE_SIZE);		
+	memset(PrototypeHashTable,0,sizeof(PrototypeClass *) * PROTOTYPE_HASH_TABLE_SIZE);
 }
 
 
@@ -257,15 +255,13 @@ WW3DAssetManager::WW3DAssetManager(void) :
  *=============================================================================================*/
 WW3DAssetManager::~WW3DAssetManager(void)
 {
-	if (MetalManager) delete MetalManager;
+	delete MetalManager;
+
 	Free();
 	TheInstance = NULL;
 
-	// If we need to, free the hash table
-	if (PrototypeHashTable != NULL) {
-		delete [] PrototypeHashTable;
-		PrototypeHashTable = NULL;
-	}
+	delete [] PrototypeHashTable;
+	PrototypeHashTable = NULL;
 }
 
 static void Create_Number_String(StringClass& number, unsigned value)
@@ -293,13 +289,13 @@ void	WW3DAssetManager::Load_Procedural_Textures()
 		ini.Load("metals.ini");
 		MetalManager=W3DNEW MetalMapManagerClass(ini);
 	}
-	
-	count=MetalManager->Metal_Map_Count();		
+
+	count=MetalManager->Metal_Map_Count();
 	for (i=0; i<count; i++)
 	{
 		TextureClass *tex=MetalManager->Get_Metal_Map(i);
 		TextureHash.Insert(tex->Get_Texture_Name(),tex);
-	}	
+	}
 }
 
 static void Log_Textures(bool inited,unsigned& total_count, unsigned& total_mem)
@@ -333,7 +329,7 @@ static void Log_Textures(bool inited,unsigned& total_count, unsigned& total_mem)
 		case D3DFMT_A8L8: tex_format="D3DFMT_A8L8"; break;
 		case D3DFMT_A4L4: tex_format="D3DFMT_A4L4"; break;
 		case D3DFMT_V8U8: tex_format="D3DFMT_V8U8"; break;
-		case D3DFMT_L6V5U5: tex_format="D3DFMT_L6V5U5"; break;  
+		case D3DFMT_L6V5U5: tex_format="D3DFMT_L6V5U5"; break;
 		case D3DFMT_X8L8V8U8: tex_format="D3DFMT_X8L8V8U8"; break;
 		case D3DFMT_Q8W8V8U8: tex_format="D3DFMT_Q8W8V8U8"; break;
 		case D3DFMT_V16U16: tex_format="D3DFMT_V16U16"; break;
@@ -361,16 +357,16 @@ static void Log_Textures(bool inited,unsigned& total_count, unsigned& total_mem)
 		StringClass number;
 		Create_Number_String(number,texmem);
 
-		WWDEBUG_SAY(("%32s	%4d * %4d (%15s), init %d, size: %14s bytes, refs: %d\n",
-			tex->Get_Texture_Name(),
+		WWDEBUG_SAY(("%32s	%4d * %4d (%15s), init %d, size: %14s bytes, refs: %d",
+			tex->Get_Texture_Name().str(),
 			desc.Width,
 			desc.Height,
-			tex_format,
+			tex_format.str(),
 			tex->Is_Initialized(),
-			number,
+			number.str(),
 			tex->Num_Refs()));
 
-	}	
+	}
 }
 
 void WW3DAssetManager::Log_Texture_Statistics()
@@ -381,32 +377,32 @@ void WW3DAssetManager::Log_Texture_Statistics()
 	unsigned total_uninitialized_count=0;
 	StringClass number;
 
-	WWDEBUG_SAY(("\nInitialized textures ------------------------------------------\n\n"));
+	WWDEBUG_SAY(("\nInitialized textures ------------------------------------------\n"));
 	Log_Textures(true,total_initialized_count,total_initialized_tex_mem);
 
 	Create_Number_String(number,total_initialized_tex_mem);
-	WWDEBUG_SAY(("\n%d initialized textures, totalling %14s bytes\n\n",
+	WWDEBUG_SAY(("\n%d initialized textures, totalling %14s bytes\n",
 		total_initialized_count,
-		number));
+		number.str()));
 
-	WWDEBUG_SAY(("\nUn-initialized textures ---------------------------------------\n\n"));
+	WWDEBUG_SAY(("\nUn-initialized textures ---------------------------------------\n"));
 	Log_Textures(false,total_uninitialized_count,total_uninitialized_tex_mem);
 
 	Create_Number_String(number,total_uninitialized_tex_mem);
-	WWDEBUG_SAY(("\n%d un-initialized textures, totalling, totalling %14s bytes\n\n",
+	WWDEBUG_SAY(("\n%d un-initialized textures, totalling, totalling %14s bytes\n",
 		total_uninitialized_count,
-		number));
+		number.str()));
 /*
 	RenderObjIterator * rite=WW3DAssetManager::Get_Instance()->Create_Render_Obj_Iterator();
 	if (rite) {
 		for (rite->First(); !rite->Is_Done(); rite->Next()) {
-//			RenderObjClass * robj=Create_Render_Obj(rite->Current_Item_Name());	
+//			RenderObjClass * robj=Create_Render_Obj(rite->Current_Item_Name());
 //			if (robj) {
 //
 //				robj->Release_Ref();
 //			}
 			if (rite->Current_Item_Class_ID()==RenderObjClass::CLASSID_HMODEL) {
-				WWDEBUG_SAY(("robj: %s\n",rite->Current_Item_Name()));
+				WWDEBUG_SAY(("robj: %s",rite->Current_Item_Name()));
 			}
 		}
 
@@ -444,7 +440,7 @@ void WW3DAssetManager::Free(void)
  *                                                                                             *
  * HISTORY:                                                                                    *
  *   12/21/97   GTH : Created.                                                                 *
- *   05/10/1999 SKB : Close down texture cache file.                                           * 
+ *   05/10/1999 SKB : Close down texture cache file.                                           *
  *=============================================================================================*/
 void WW3DAssetManager::Free_Assets(void)
 {
@@ -461,9 +457,9 @@ void WW3DAssetManager::Free_Assets(void)
 			proto->DeleteSelf();
 		}
 	}
-	
+
 	// clear the prototype hash table
-	memset(PrototypeHashTable,0,sizeof(PrototypeClass *) * PROTOTYPE_HASH_TABLE_SIZE);	
+	memset(PrototypeHashTable,0,sizeof(PrototypeClass *) * PROTOTYPE_HASH_TABLE_SIZE);
 
 	// delete all of the anims and trees
 	HAnimManager.Free_All_Anims();
@@ -515,7 +511,7 @@ void WW3DAssetManager::Release_Unused_Assets(void)
  * WARNINGS:                                                                                   *
  *                                                                                             *
  * HISTORY:                                                                                    *
- *   12/12/2002 GH  : Created.                                                                 * 
+ *   12/12/2002 GH  : Created.                                                                 *
  *=============================================================================================*/
 void WW3DAssetManager::Free_Assets_With_Exclusion_List(const DynamicVectorClass<StringClass> & exclusion_names)
 {
@@ -524,7 +520,7 @@ void WW3DAssetManager::Free_Assets_With_Exclusion_List(const DynamicVectorClass<
 
 	// Build an exclusion list object that will do the real filtering work for us
 	W3DExclusionListClass exclusion_list(exclusion_names);
-   
+
 	// temporary vector to hold the prototypes that get excluded from being deleted.
 	// grow by the initial size so we don't waste lots of time re-allocating!
 	const int DEFAULT_EXCLUDE_ARRAY_SIZE = 8000;
@@ -536,25 +532,25 @@ void WW3DAssetManager::Free_Assets_With_Exclusion_List(const DynamicVectorClass<
 	for (; i<Prototypes.Count(); i++) {
 
 		PrototypeClass * proto = Prototypes[i];
-		if (proto != NULL) {		
+		if (proto != NULL) {
 
 			// If this prototype is excluded, copy the pointer, otherwise delete it.
 			if (exclusion_list.Is_Excluded(proto)) {
-				//WWDEBUG_SAY(("excluding %s\n",proto->Get_Name()));
+				//WWDEBUG_SAY(("excluding %s",proto->Get_Name()));
 				exclude_array.Add(proto);
 			} else {
-				//WWDEBUG_SAY(("deleting %s\n",proto->Get_Name()));
+				//WWDEBUG_SAY(("deleting %s",proto->Get_Name()));
 				proto->DeleteSelf();
 			}
 			Prototypes[i] = NULL;
 		}
 	}
-	
+
 	// reset the array now that we've gotten rid of everything.
 	Prototypes.Reset_Active();
 
 	// clear the prototype hash table
-	memset(PrototypeHashTable,0,sizeof(PrototypeClass *) * PROTOTYPE_HASH_TABLE_SIZE);	
+	memset(PrototypeHashTable,0,sizeof(PrototypeClass *) * PROTOTYPE_HASH_TABLE_SIZE);
 
 	// re-add the prototypes that we saved
 	for (i=0; i<exclude_array.Count(); i++) {
@@ -586,7 +582,7 @@ void WW3DAssetManager::Free_Assets_With_Exclusion_List(const DynamicVectorClass<
  * render object contained within them!                                                        *
  *                                                                                             *
  * HISTORY:                                                                                    *
- *   12/12/2002 GH  : Created.                                                                 * 
+ *   12/12/2002 GH  : Created.                                                                 *
  *=============================================================================================*/
 void WW3DAssetManager::Create_Asset_List(DynamicVectorClass<StringClass> & model_list)
 {
@@ -630,7 +626,7 @@ bool WW3DAssetManager::Load_3D_Assets( const char * filename )
 		if ( file->Is_Available() ) {
 			result = WW3DAssetManager::Load_3D_Assets( *file );
 		} else {
-			WWDEBUG_SAY(("Missing asset '%s'.\n", filename));
+			WWDEBUG_SAY(("Missing asset '%s'.", filename));
 		}
 		_TheFileFactory->Return_File( file );
 	}
@@ -673,7 +669,7 @@ bool WW3DAssetManager::Load_3D_Assets(FileClass & w3dfile)
 			case W3D_CHUNK_MORPH_ANIMATION:
 				HAnimManager.Load_Anim(cload);
 				break;
-        
+
 			default:
 				Load_Prototype(cload);
 				break;
@@ -731,7 +727,7 @@ bool WW3DAssetManager::Load_Prototype(ChunkLoadClass & cload)
 		/*
 		** Warn user about an unknown chunk type
 		*/
-		WWDEBUG_SAY(("Unknown chunk type encountered!  Chunk Id = %d\r\n",chunk_id));
+		WWDEBUG_SAY(("Unknown chunk type encountered!  Chunk Id = %d",chunk_id));
 		return false;
 	}
 
@@ -742,7 +738,7 @@ bool WW3DAssetManager::Load_Prototype(ChunkLoadClass & cload)
 	if (newproto != NULL) {
 
 		if (!Render_Obj_Exists(newproto->Get_Name())) {
-				
+
 			/*
 			** Add the new, unique prototype to our list
 			*/
@@ -751,25 +747,25 @@ bool WW3DAssetManager::Load_Prototype(ChunkLoadClass & cload)
 		} else {
 
 			/*
-			** Warn the user about a name collision with this prototype 
+			** Warn the user about a name collision with this prototype
 			** and dump it
 			*/
-			WWDEBUG_SAY(("Render Object Name Collision: %s\r\n",newproto->Get_Name()));
+			WWDEBUG_SAY(("Render Object Name Collision: %s",newproto->Get_Name()));
 			newproto->DeleteSelf();
 			newproto = NULL;
 			return false;
 		}
-	
+
 	} else {
 
 		/*
-		** Warn user that a prototype was not generated from this 
+		** Warn user that a prototype was not generated from this
 		** chunk type
 		*/
-		WWDEBUG_SAY(("Could not generate prototype!  Chunk  = %d\r\n",chunk_id));
+		WWDEBUG_SAY(("Could not generate prototype!  Chunk  = %d",chunk_id));
 		return false;
 	}
-	
+
 	return true;
 }
 
@@ -824,7 +820,7 @@ RenderObjClass * WW3DAssetManager::Create_Render_Obj(const char * name)
 		// Note - objects named "#..." are scaled cached objects, so don't warn...
 		if (name[0] != '#') {
 			if (++warning_count <= 20) {
-				WWDEBUG_SAY(("WARNING: Failed to create Render Object: %s\r\n",name));
+				WWDEBUG_SAY(("WARNING: Failed to create Render Object: %s",name));
 			}
 			AssetStatusClass::Peek_Instance()->Report_Missing_RObj(name);
 		}
@@ -913,7 +909,7 @@ void WW3DAssetManager::Release_Render_Obj_Iterator(RenderObjIterator * it)
 AssetIterator * WW3DAssetManager::Create_HAnim_Iterator(void)
 {
 	return W3DNEW HAnimIterator();
-}														
+}
 
 
 /***********************************************************************************************
@@ -976,7 +972,7 @@ HAnimClass *	WW3DAssetManager::Get_HAnim(const char * name)
 	HAnimClass * anim = HAnimManager.Get_Anim(name);
 
 	if (WW3D_Load_On_Demand && anim == NULL) {	// If we didn't find it, try to load on demand
-		
+
 		if ( !HAnimManager.Is_Missing( name ) ) {	// if this is NOT a known missing anim
 
 			AssetStatusClass::Peek_Instance()->Report_Load_On_Demand_HAnim(name);
@@ -986,7 +982,7 @@ HAnimClass *	WW3DAssetManager::Get_HAnim(const char * name)
 			if (animname != NULL) {
 				sprintf( filename, "%s.w3d", animname+1);
 			} else {
-				WWDEBUG_SAY(( "Animation %s has no . in the name\n", name ));
+				WWDEBUG_SAY(( "Animation %s has no . in the name", name ));
 				WWASSERT( 0 );
 				return NULL;
 			}
@@ -1006,7 +1002,7 @@ HAnimClass *	WW3DAssetManager::Get_HAnim(const char * name)
 	}
 
 	return anim;
-}										 
+}
 
 
 /***********************************************************************************************
@@ -1030,7 +1026,7 @@ HTreeClass *	WW3DAssetManager::Get_HTree(const char * name)
 	HTreeClass * htree = HTreeManager.Get_Tree(name);
 
 	if (WW3D_Load_On_Demand && htree == NULL) {	// If we didn't find it, try to load on demand
-		
+
 		AssetStatusClass::Peek_Instance()->Report_Load_On_Demand_HTree(name);
 
 		char filename[ MAX_PATH ];
@@ -1067,7 +1063,7 @@ HTreeClass *	WW3DAssetManager::Get_HTree(const char * name)
  *=============================================================================================*/
 TextureClass * WW3DAssetManager::Get_Texture
 (
-	const char * filename, 
+	const char * filename,
 	MipCountType mip_level_count,
 	WW3DFormat texture_format,
 	bool allow_compression,
@@ -1080,7 +1076,7 @@ TextureClass * WW3DAssetManager::Get_Texture
 	/*
 	** We cannot currently mip-map bumpmaps
 	*/
-	if (texture_format==WW3D_FORMAT_U8V8) 
+	if (texture_format==WW3D_FORMAT_U8V8)
 	{
 		mip_level_count=MIP_LEVELS_1;
 	}
@@ -1088,7 +1084,7 @@ TextureClass * WW3DAssetManager::Get_Texture
 	/*
 	** Bail if the user isn't really asking for anything
 	*/
-	if ((filename == NULL) || (strlen(filename) == 0)) 
+	if ((filename == NULL) || (strlen(filename) == 0))
 	{
 		return NULL;
 	}
@@ -1100,7 +1096,7 @@ TextureClass * WW3DAssetManager::Get_Texture
 	** See if the texture has already been loaded.
 	*/
 	TextureClass* tex = TextureHash.Get(lower_case_name);
-	if (tex && (tex->Is_Initialized() == true) && (texture_format!=WW3D_FORMAT_UNKNOWN)) 
+	if (tex && (tex->Is_Initialized() == true) && (texture_format!=WW3D_FORMAT_UNKNOWN))
 	{
 		WWASSERT_PRINT(tex->Get_Texture_Format()==texture_format,("Texture %s has already been loaded with different format",filename));
 	}
@@ -1108,7 +1104,7 @@ TextureClass * WW3DAssetManager::Get_Texture
 	/*
 	** Didn't have it so we have to create a new texture
 	*/
-	if (!tex) 
+	if (!tex)
 	{
 		if (type==TextureBaseClass::TEX_REGULAR)
 		{
@@ -1122,6 +1118,12 @@ TextureClass * WW3DAssetManager::Get_Texture
 		{
 			tex = NEW_REF (VolumeTextureClass, (lower_case_name, NULL, mip_level_count, texture_format, allow_compression, allow_reduction));
 		}
+		else
+		{
+			WWASSERT_PRINT(false, ("Unhandled case"));
+			return NULL;
+		}
+
 		TextureHash.Insert(tex->Get_Texture_Name(),tex);
 	}
 
@@ -1236,7 +1238,7 @@ void WW3DAssetManager::Log_All_Textures(void)
 	WWDEBUG_SAY((
 		"Lightmap textures: %d\n\n"
 		"size     name\n"
-		"--------------------------------------\n"
+		"--------------------------------------"
 		,
 		TextureClass::_Get_Total_Lightmap_Texture_Count()));
 
@@ -1252,7 +1254,7 @@ void WW3DAssetManager::Log_All_Textures(void)
 		else {
 			tmp+=" ";
 		}
-		WWDEBUG_SAY(("%4.4dkb %s%s\n",bytes/1024,tmp,t->Get_Texture_Name()));
+		WWDEBUG_SAY(("%4.4dkb %s%s",bytes/1024,tmp.str(),t->Get_Texture_Name().str()));
 	}
 
 	// Log procedural textures -------------------------------
@@ -1260,7 +1262,7 @@ void WW3DAssetManager::Log_All_Textures(void)
 	WWDEBUG_SAY((
 		"Procedural textures: %d\n\n"
 		"size     name\n"
-		"--------------------------------------\n"
+		"--------------------------------------"
 		,
 		TextureClass::_Get_Total_Procedural_Texture_Count()));
 
@@ -1276,7 +1278,7 @@ void WW3DAssetManager::Log_All_Textures(void)
 		else {
 			tmp+=" ";
 		}
-		WWDEBUG_SAY(("%4.4dkb %s%s\n",bytes/1024,tmp,t->Get_Texture_Name()));
+		WWDEBUG_SAY(("%4.4dkb %s%s",bytes/1024,tmp.str(),t->Get_Texture_Name().str()));
 	}
 
 	// Log "ordinary" textures -------------------------------
@@ -1284,7 +1286,7 @@ void WW3DAssetManager::Log_All_Textures(void)
 	WWDEBUG_SAY((
 		"Ordinary textures: %d\n\n"
 		"size     name\n"
-		"--------------------------------------\n"
+		"--------------------------------------"
 		,
 		TextureClass::_Get_Total_Texture_Count()-TextureClass::_Get_Total_Lightmap_Texture_Count()-TextureClass::_Get_Total_Procedural_Texture_Count()));
 
@@ -1301,7 +1303,7 @@ void WW3DAssetManager::Log_All_Textures(void)
 		else {
 			tmp+=" ";
 		}
-		WWDEBUG_SAY(("%4.4dkb %s%s\n",bytes/1024,tmp,t->Get_Texture_Name()));
+		WWDEBUG_SAY(("%4.4dkb %s%s",bytes/1024,tmp.str(),t->Get_Texture_Name().str()));
 	}
 
 }
@@ -1345,7 +1347,7 @@ Font3DDataClass * WW3DAssetManager::Get_Font3DData( const char *name )
 	// loop through and see if the Font3D we are looking for has already been
 	// allocated and thus we can just return it.
 	for (	SLNode<Font3DDataClass> *node = Font3DDatas.Head(); node; node = node->Next()) {
-		if (!stricmp(name, node->Data()->Name)) {
+		if (stricmp(name, node->Data()->Name) == 0) {
 			node->Data()->Add_Ref();
 			return node->Data();
 		}
@@ -1459,12 +1461,17 @@ FontCharsClass *	WW3DAssetManager::Get_FontChars( const char * name, int point_s
 		}
 	}
 
-	// If one hasn't been found, create it
+	// If one hasn't been found, try create it
 	FontCharsClass * font = NEW_REF( FontCharsClass, () );
-	font->Initialize_GDI_Font( name, point_size, is_bold );
-	font->Add_Ref();
-	FontCharsList.Add( font );			// add it to the list	
-	return font;							// return it
+	if (font->Initialize_GDI_Font( name, point_size, is_bold ))
+	{
+		font->Add_Ref();
+		FontCharsList.Add( font );
+		return font;
+	}
+
+	font->Release_Ref();
+	return NULL;
 }
 
 
@@ -1587,14 +1594,14 @@ void WW3DAssetManager::Remove_Prototype(PrototypeClass *proto)
 		const char *pname = proto->Get_Name ();
 		bool bfound = false;
 		PrototypeClass *prev = NULL;
-		int hash = CRC_Stringi(pname) & PROTOTYPE_HASH_MASK;				
+		int hash = CRC_Stringi(pname) & PROTOTYPE_HASH_MASK;
 		for (PrototypeClass *test = PrototypeHashTable[hash];
 			  (test != NULL) && (bfound == false);
 			  test = test->friend_getNextHash()) {
-			
+
 			// Is this the prototype?
 			if (::stricmp (test->Get_Name(), pname) == 0) {
-				
+
 				// Remove this prototype from the linked list for this hash index.
 				if (prev == NULL) {
 					PrototypeHashTable[hash] = test->friend_getNextHash();
@@ -1668,7 +1675,7 @@ PrototypeClass * WW3DAssetManager::Find_Prototype(const char * name)
 	if (stricmp(name,"NULL") == 0) {
 		return &(_NullPrototype);
 	}
-	
+
 	// Find the prototype
 	int hash = CRC_Stringi(name) & PROTOTYPE_HASH_MASK;
 	PrototypeClass * test = PrototypeHashTable[hash];
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h
index 9133c494800..82f5b6b763d 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h
@@ -17,37 +17,31 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/assetmgr.h 19    12/17/01 7:55p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando                                                     * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/assetmgr.h                             $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 12/15/01 4:14p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 19                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando                                                     *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/assetmgr.h                             $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 12/15/01 4:14p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 19                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef ASSETMGR_H
-#define ASSETMGR_H
 
 #include "always.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "htreemgr.h"
 #include "hanimmgr.h"
-#include "SLIST.H"
+#include "SLIST.h"
 #include "texture.h"
 #include "hashtemplate.h"
 #include "simplevec.h"
@@ -116,7 +110,7 @@ class RenderObjIterator : public AssetIterator
 	WW3DAssetManager
 
 	This object is the manager of all of the 3D data.  Load your meshes, animations,
-	etc etc using the Load_3D_Assets function.  
+	etc etc using the Load_3D_Assets function.
 
 	WARNING: hierarchy trees should be loaded before the meshes and animations
 	which attach to them.
@@ -124,15 +118,15 @@ class RenderObjIterator : public AssetIterator
 	-------------------------------------------------------------------------------------
 	Dec 11, 1997, Asset Manager Brainstorming:
 
-	- WW3DAssetManager will be diferentiated from other game data asset managers
+	- WW3DAssetManager will be differentiated from other game data asset managers
 	(sounds, strings, etc) because they behave differently and serve different
 	purposes
 
 	- WW3D creates "clones" from the blueprints it has of render objects whereas
-	Our commando data asset manager will provide the data (file images) for the 
+	Our commando data asset manager will provide the data (file images) for the
 	blueprints.  Maybe the CommandoDataManager could deal in MemoryFileClasses.
 	Or void * and then the ww3d manager could convert to MemoryFiles...
-	
+
 	- Future caching: In the case that we want to implement a caching system,
 	assets must be "released" when not in use.
 
@@ -154,7 +148,7 @@ class RenderObjIterator : public AssetIterator
 	the 3d asset manager may find that it needs another asset (such as a hierarchy tree).
 	It will then recurse, and ask for that asset.
 
-	- Copy Mode will go away.  It will be internally set based on whether the mesh 
+	- Copy Mode will go away.  It will be internally set based on whether the mesh
 	contains vertex animation.  All other render objects will simply "Clone".
 
 	- Commando will derive a Cmdo3DAssetManager which knows about the special chunks
@@ -163,14 +157,14 @@ class RenderObjIterator : public AssetIterator
 	-------------------------------------------------------------------------------------
 	July 28, 1998
 
-	- Exposed the prototype system and added prototype loaders (PrototypeClass and 
+	- Exposed the prototype system and added prototype loaders (PrototypeClass and
 	PrototypeLoaderClass in proto.h).  This now allows the user to install his own
-	loaders for new render object types. 
+	loaders for new render object types.
 
 	- Simplified the interface by removing the special purpose creation functions,
-	leaving only the Create_Render_Obj function.  
-	
-	- In certain cases some users need to know what kind of render object was created 
+	leaving only the Create_Render_Obj function.
+
+	- In certain cases some users need to know what kind of render object was created
 	so we added a Class_ID mechanism to RenderObjClass.
 
 	- Class_ID for render objects is not enough.  Need the asset iterator to be able
@@ -178,6 +172,10 @@ class RenderObjIterator : public AssetIterator
 	the prototype class needs to be able to tell you the class ID.  Actually this
 	code only seems to be used by tools such as SView but is needed anyway...
 
+	-------------------------------------------------------------------------------------
+	TheSuperHackers @fix xezon 08/11/2025
+	The Asset Manager will now return null when it cannot find or create a valid font
+	with the given inputs. This way the user knows that the requested font is unusable.
 */
 
 
@@ -203,7 +201,7 @@ class WW3DAssetManager
 	**	WW3DAssetManager::Get_Instance();
 	*/
 	static WW3DAssetManager *		Get_Instance(void) { return TheInstance; }
-	static void							Delete_This(void) { if (TheInstance) delete TheInstance; TheInstance=NULL; }
+	static void							Delete_This(void) { delete TheInstance; TheInstance=NULL; }
 
 	/*
 	** Load data from any type of w3d file
@@ -230,7 +228,7 @@ class WW3DAssetManager
 	/*
 	** create me an instance of one of the prototype render objects
 	*/
-	virtual RenderObjClass *		Create_Render_Obj(const char * name);	
+	virtual RenderObjClass *		Create_Render_Obj(const char * name);
 
 	/*
 	** query if there is a render object with the specified name
@@ -264,7 +262,7 @@ class WW3DAssetManager
 
 	virtual TextureClass *			Get_Texture
 	(
-		const char * filename, 
+		const char * filename,
 		MipCountType mip_level_count=MIP_LEVELS_ALL,
 		WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN,
 		bool allow_compression=true,
@@ -280,12 +278,12 @@ class WW3DAssetManager
 
 	/*
 	** Access to Font3DInstances. (These are not saved, we just use the
-	** asset manager as a convienient way to create them.)
+	** asset manager as a convenient way to create them.)
 	*/
 	virtual Font3DInstanceClass * Get_Font3DInstance( const char * name);
 
 	/*
-	** Access to FontChars. Used by Render2DSentenceClass
+	** Access to FontChars. Used by Render2DSentenceClass. Can return null.
 	*/
 	virtual FontCharsClass *		Get_FontChars( const char * name, int point_size, bool is_bold = false );
 
@@ -303,7 +301,7 @@ class WW3DAssetManager
 	virtual void						Register_Prototype_Loader(PrototypeLoaderClass * loader);
 
 	/*
-	**	The Add_Prototype is public so that we can add prototypes for procedurally 
+	**	The Add_Prototype is public so that we can add prototypes for procedurally
 	** generated objects to the asset manager.
 	*/
 	void									Add_Prototype(PrototypeClass * newproto);
@@ -348,7 +346,7 @@ class WW3DAssetManager
 	/*
 	** Compile time control over the dynamic arrays:
 	*/
-	enum 
+	enum
 	{
 		PROTOLOADERS_VECTOR_SIZE =	32,
 		PROTOLOADERS_GROWTH_RATE =	16,
@@ -363,7 +361,7 @@ class WW3DAssetManager
 	** them into prototypes.
 	*/
 	DynamicVectorClass < PrototypeLoaderClass * >			PrototypeLoaders;
-	
+
 	/*
 	** Prototypes
 	** These objects are abstract factories for named render objects.  Prototypes is
@@ -375,10 +373,10 @@ class WW3DAssetManager
 	** Prototype Hash Table
 	** This structure is simply used to speed up the name lookup for prototypes
 	*/
-	enum 
-	{ 
-		PROTOTYPE_HASH_TABLE_SIZE =	4096, 
-		PROTOTYPE_HASH_BITS =			12, 
+	enum
+	{
+		PROTOTYPE_HASH_TABLE_SIZE =	4096,
+		PROTOTYPE_HASH_BITS =			12,
 		PROTOTYPE_HASH_MASK =			0x00000FFF
 	};
 
@@ -436,5 +434,3 @@ class WW3DAssetManager
 	// Font3DInstance need access to the Font3DData
 	friend class Font3DInstanceClass;
 };
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp
deleted file mode 100644
index beab5f7b3b8..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Commando/G                               * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/bmp2d.cpp          $* 
- *                                                                         * 
- *                  $Org Author:: Jani_p                                  $* 
- *                                                                         * 
- *                      $Author:: Kenny_m                                  $* 
- *                                                                         * 
- *                     $Modtime:: 08/05/02 10:44a                          $* 
- *                                                                         * 
- *                    $Revision:: 12                                      $* 
- *                                                                         * 
- * 08/05/02 KM Texture class redesign
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include "bmp2d.h"
-#include "pot.h"
-#include "ww3d.h"
-#include "texture.h"
-#include "surfaceclass.h"
-#include "assetmgr.h"
-#include "textureloader.h"
-#include "ww3dformat.h"
-
-Bitmap2DObjClass::Bitmap2DObjClass
-(
-	const char *filename,
-	float screen_x,
-	float screen_y,
-	bool center,
-	bool additive,
-	bool colorizable,
-	int usable_width,
-	int usable_height,
-	bool ignore_alpha
-)
-	:	DynamicScreenMeshClass(2, 4)
-{
-	
-	int resw, resh, resbits;
-	bool windowed;
-	
-	// find the resolution (for centering and pixel to pixel translation)
-	WW3D::Get_Device_Resolution(resw, resh, resbits, windowed);
-	// This should be the correct way to do things
-	// but other code expects an aspect ratio of 1.0
-	// Hector Yee 2/22/01
-	// Set_Aspect(resh/(float)resw);
-	
-
-	// load up the surfaces file name
-	TextureClass *tex = WW3DAssetManager::Get_Instance()->Get_Texture(filename, MIP_LEVELS_1);
-	if (!tex->Is_Initialized())	
-		TextureLoader::Request_Foreground_Loading(tex);
-
-	SurfaceClass *surface = tex->Get_Surface_Level(0);
-
-	if (!surface) {
-		surface = NEW_REF(SurfaceClass, (32, 32, Get_Valid_Texture_Format(WW3D_FORMAT_R8G8B8,true)));
-	}
-
-	SurfaceClass::SurfaceDescription sd;
-	surface->Get_Description(sd);
-
-	if (usable_width == -1)
-		usable_width = sd.Width;
-	if (usable_height == -1)
-		usable_height = sd.Height;
-
-	// if we requested the image to be centered around a point adjust the
-	// coordinates accordingly.
-	if (center) {
-		screen_x -= ((float)usable_width  / resw) / 2;
-		screen_y -= ((float)usable_height / resh) / 2;
-	}
-
-	// The image will be broken down into square textures. The size of these
-	// textures will be the smallest POT (power of two) which is equal or
-	// greater than the smaller dimension of the image. Also, the pieces can
-	// never be larger than 256 texels because some rendering devices don't
-	// support textures larger than that.
-	int surf_w = usable_width;
-	int surf_h = usable_height;
-	int piece = Find_POT(MIN(surf_w, surf_h));
-	piece = MIN(piece, 256);
-
-	// now take the image in question and break it down into
-	// "piece"x"piece"-pixel polygons and calculate the number of textures
-	// based from those calculations.
-	int mw = (surf_w & (piece - 1)) ? (surf_w / piece)+1 : (surf_w /piece);
-	int mh = (surf_h & (piece - 1)) ? (surf_h / piece)+1 : (surf_h /piece);
-	
-	// for every square texture it takes four vertexes to express the two
-	// polygons.
-	Resize(mw * mh *2, mw * mh * 4);
-
-	// Set shader to additive if requested, else alpha or opaque depending on
-	// whether the texture has an alpha channel. Sorting is always set so that
-	// sortbias can be used to determine occlusion between the various 2D
-	// elements.
-	ShaderClass shader;
-
-	if (additive) {
-		shader = ShaderClass::_PresetAdditive2DShader;
-	} else {
-		if (ignore_alpha == false && Has_Alpha(sd.Format)) {
-			shader = ShaderClass::_PresetAlpha2DShader;
-		} else {
-			shader = ShaderClass::_PresetOpaque2DShader;
-		}
-	}
-
-	Enable_Sort();
-
-
-	// If we want to be able to colorize this bitmap later (by setting
-	// emissive color for the vertex material, or via a vertex emissive color
-	// array) we need to enable the primary gradient in the shader (it is
-	// disabled in the 2D presets), and set an appropriate vertex material.
-	if (colorizable) {
-		shader.Set_Primary_Gradient(ShaderClass::GRADIENT_MODULATE);
-		VertexMaterialClass *vertex_material = NEW_REF( VertexMaterialClass, ());
-		vertex_material->Set_Ambient(0.0f, 0.0f, 0.0f);
-		vertex_material->Set_Diffuse(0.0f, 0.0f, 0.0f);
-		vertex_material->Set_Specular(0.0f, 0.0f, 0.0f);
-		vertex_material->Set_Emissive(1.0f, 1.0f, 1.0f);
-		Set_Vertex_Material(vertex_material, true);
-		vertex_material->Release_Ref();
-	}
-
-	// Set desired shader.
-	Set_Shader(shader);
-
-	// loop through the rows and columns of the image and make valid
-	// textures from the pieces.
-	for (int lpy = 0, tlpy=0; lpy < mh; lpy++, tlpy += piece) {
-		for (int lpx = 0, tlpx = 0; lpx < mw; lpx++, tlpx += piece) {
-
-			// figure the desired width and height of the texture (max "piece")
-			int iw				= MIN(piece, usable_width - (tlpx));
-			int ih				= MIN(piece, usable_height - (tlpy));
-			int pot				= MAX(Find_POT(iw), Find_POT(ih));
-
-			// create the texture and turn MIP-mapping off.
-			SurfaceClass *piece_surface=NEW_REF(SurfaceClass,(pot,pot,sd.Format));			
-			piece_surface->Copy(0,0,tlpx,tlpy,pot,pot,surface);
-			TextureClass *piece_texture =NEW_REF(TextureClass,(piece_surface,MIP_LEVELS_1));			
-			piece_texture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-			piece_texture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-			REF_PTR_RELEASE(piece_surface);			
-
-			// calculate our actual texture coordinates based on the difference between
-			// the width and height of the texture and the width and height the font
-			// occupys.
-			float tw = (float)iw / (float)pot;
-			float th = (float)ih / (float)pot;
-
-			// convert image width and image height to normalized values
-			float vw = (float)iw / (float)resw;
-			float vh = (float)ih / (float)resh;
-
-			// figure out the screen space x and y positions of the object in question.
-			float x	= screen_x + (((float)tlpx) / (float)resw);
-			float y	= screen_y + (((float)tlpy) / (float)resh);
-			
-			Set_Texture(piece_texture);
-			Begin_Tri_Strip();
-				Vertex( x, 			y, 		0, 	0, 	0);
-				Vertex( x + vw, 	y, 		0, 	tw, 	0);
-				Vertex( x, 			y + vh, 	0, 	0, 	th);
-				Vertex( x + vw, 	y + vh, 	0, 	tw, 	th);
-			End_Tri_Strip();
-
-			// release our reference to the texture
-			REF_PTR_RELEASE(piece_texture);			
-		}
-	}
-	REF_PTR_RELEASE(tex);
-	REF_PTR_RELEASE(surface);	
-
-	Set_Dirty();
-}
-
-Bitmap2DObjClass::Bitmap2DObjClass
-(
-	TextureClass *texture,
-	float screen_x,
-	float screen_y,
-	bool center,
-	bool additive,
-	bool colorizable,
-	bool ignore_alpha
-)
-	:	DynamicScreenMeshClass(2, 4)
-{
-	int resw, resh, resbits;
-	bool windowed;
-
-	// find the resolution (for centering and pixel to pixel translation)
-	WW3D::Get_Device_Resolution(resw, resh, resbits, windowed);
-	// This should be the correct way to do things
-	// but other code expects an aspect ratio of 1.0
-	// Hector Yee 2/22/01
-	//Set_Aspect(resh/(float)resw);
-
-	// Find the dimensions of the texture:
-//	SurfaceClass::SurfaceDescription sd;
-//	texture->Get_Level_Description(sd);
-
-	if (!texture->Is_Initialized())	
-		TextureLoader::Request_Foreground_Loading(texture);
-		
-	// convert image width and image height to normalized values
-	float vw = (float) texture->Get_Width() / (float)resw;
-	float vh = (float) texture->Get_Height() / (float)resh;
-
-	// if we requested the image to be centered around a point adjust the
-	// coordinates accordingly.
-	if (center) {
-		screen_x -= vw / 2;
-		screen_y -= vh / 2;
-	}
-
-	// Set shader to additive if requested, else alpha or opaque depending on whether the texture
-	// has an alpha channel. Sorting is never set - if you wish to sort these types of objects you
-	// should use static sort levels (note that static sort levels are not implemented for these
-	// objects yet, but it should be very simple to do).
-	ShaderClass shader;
-
-	if (additive) {
-		shader = ShaderClass::_PresetAdditive2DShader;
-	} else {
-		if (ignore_alpha == false && Has_Alpha(texture->Get_Texture_Format())) {
-			shader = ShaderClass::_PresetAlpha2DShader;
-		} else {
-			shader = ShaderClass::_PresetOpaque2DShader;
-		}
-	}
-	Disable_Sort();
-
-	// If we want to be able to colorize this bitmap later (by setting
-	// emissive color for the vertex material, or via a vertex emissive color
-	// array) we need to enable the primary gradient in the shader (it is
-	// disabled in the 2D presets), and set an appropriate vertex material.
-	if (colorizable) {
-		shader.Set_Primary_Gradient(ShaderClass::GRADIENT_MODULATE);
-		VertexMaterialClass *vertex_material = NEW_REF( VertexMaterialClass, ());
-		vertex_material->Set_Ambient(0.0f, 0.0f, 0.0f);
-		vertex_material->Set_Diffuse(0.0f, 0.0f, 0.0f);
-		vertex_material->Set_Specular(0.0f, 0.0f, 0.0f);
-		vertex_material->Set_Emissive(1.0f, 1.0f, 1.0f);
-		Set_Vertex_Material(vertex_material, true);
-		vertex_material->Release_Ref();
-	}
-
-	// Set desired shader.
-	Set_Shader(shader);
-
-	// Set texture to requested texture:
-	Set_Texture(texture);
-
-	Begin_Tri_Strip();
-		Vertex( screen_x,			screen_y,		0,	0,		0);
-		Vertex( screen_x + vw, 	screen_y,		0,	1.0,	0);
-		Vertex( screen_x, 		screen_y + vh,	0,	0,		1.0);
-		Vertex( screen_x + vw, 	screen_y + vh,	0,	1.0,	1.0);
-	End_Tri_Strip();
-
-	Set_Dirty();
-}
-
-RenderObjClass * Bitmap2DObjClass::Clone(void) const
-{
-	return NEW_REF( Bitmap2DObjClass, (*this));
-}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h
deleted file mode 100644
index 1ed773b3c57..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : Commando/G                               * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/bmp2d.h            $* 
- *                                                                         * 
- *                      $Author:: Hector_y                                $* 
- *                                                                         * 
- *                     $Modtime:: 2/21/01 1:31p                           $* 
- *                                                                         * 
- *                    $Revision:: 3                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef BMP2D_H
-#define BMP2D_H
-
-#include "dynamesh.h"
-
-class Bitmap2DObjClass : public DynamicScreenMeshClass
-{
-	public:
-		Bitmap2DObjClass(const char *filename, float norm_x, float norm_y,
-			bool center, bool additive, bool colorizable = false, int width = -1, int height = -1, bool ignore_alpha = false);
-		Bitmap2DObjClass(TextureClass *texture, float norm_x, float norm_y,
-			bool center, bool additive, bool colorizable = false, bool ignore_alpha = false);
-		Bitmap2DObjClass( const Bitmap2DObjClass & src) : DynamicScreenMeshClass(src) {}
-
-		virtual RenderObjClass * 	Clone(void) const;
-		virtual int						Class_ID(void) const { return CLASSID_BITMAP2D; }
-};
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp
index 22872b6e7fd..f2bb6637b5c 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp
@@ -110,10 +110,10 @@
 #define NUM_BOX_FACES	12
 
 // Face Connectivity
-static TriIndex					_BoxFaces[NUM_BOX_FACES] = 
+static TriIndex					_BoxFaces[NUM_BOX_FACES] =
 {
 	TriIndex( 0,1,2 ),		// +z faces
-	TriIndex( 0,2,3 ),		
+	TriIndex( 0,2,3 ),
 	TriIndex( 4,7,6 ),		// -z faces
 	TriIndex( 4,6,5 ),
 	TriIndex( 0,3,7 ),		// +x faces
@@ -127,7 +127,7 @@ static TriIndex					_BoxFaces[NUM_BOX_FACES] =
 };
 
 // Vertex Positions as a function of the box extents
-static Vector3						_BoxVerts[NUM_BOX_VERTS] = 
+static Vector3						_BoxVerts[NUM_BOX_VERTS] =
 {
 	Vector3(  1.0f, 1.0f, 1.0f ),		// +z ring of 4 verts
 	Vector3( -1.0f, 1.0f, 1.0f ),
@@ -307,8 +307,8 @@ const char * BoxRenderObjClass::Get_Name(void) const
 void BoxRenderObjClass::Set_Name(const char * name)
 {
 	WWASSERT(name != NULL);
-	WWASSERT(strlen(name) < 2*W3D_NAME_LEN);
-	strcpy(Name,name);
+	size_t nameLen = strlcpy(Name, name, ARRAY_SIZE(Name));
+	(void)nameLen; WWASSERT(nameLen < ARRAY_SIZE(Name));
 }
 
 
@@ -385,7 +385,7 @@ void BoxRenderObjClass::Shutdown(void)
 {
 	WWASSERT(IsInitted == true);
 	REF_PTR_RELEASE(_BoxMaterial);
-	
+
 	IsInitted = false;
 }
 
@@ -456,10 +456,10 @@ void BoxRenderObjClass::render_box(RenderInfoClass & rinfo,const Vector3 & cente
 		}
 
 		/*
-		** Dump the box vertices into the sorting dynamic vertex buffer. 
+		** Dump the box vertices into the sorting dynamic vertex buffer.
 		*/
 		DWORD color = DX8Wrapper::Convert_Color(Color,Opacity);
-		
+
 		int buffer_type = BUFFER_TYPE_DYNAMIC_DX8;
 
 		DynamicVBAccessClass vbaccess(buffer_type,dynamic_fvf_type,NUM_BOX_VERTS);
@@ -474,7 +474,7 @@ void BoxRenderObjClass::render_box(RenderInfoClass & rinfo,const Vector3 & cente
 				vb->x=verts[i][0];
 				vb->y=verts[i][1];
 				vb->z=verts[i][2];
-				
+
 				// Normals
 				vb->nx=_BoxVertexNormals[i][0];
 				vb->ny=_BoxVertexNormals[i][1];
@@ -507,12 +507,12 @@ void BoxRenderObjClass::render_box(RenderInfoClass & rinfo,const Vector3 & cente
 		DX8Wrapper::Set_Material(_BoxMaterial);
 		DX8Wrapper::Set_Shader(_BoxShader);
 		DX8Wrapper::Set_Texture(0,NULL);
-		
+
 		DX8Wrapper::Set_Index_Buffer(ibaccess,0);
 		DX8Wrapper::Set_Vertex_Buffer(vbaccess);
 
 		SphereClass sphere;
-		Get_Obj_Space_Bounding_Sphere(sphere); 
+		Get_Obj_Space_Bounding_Sphere(sphere);
 
 		DX8Wrapper::Draw_Triangles(buffer_type,0,NUM_BOX_FACES,0,NUM_BOX_VERTS);
 	}
@@ -536,7 +536,7 @@ void BoxRenderObjClass::render_box(RenderInfoClass & rinfo,const Vector3 & cente
 void BoxRenderObjClass::vis_render_box(SpecialRenderInfoClass & rinfo,const Vector3 & center,const Vector3 & extent)
 {
 	if (!IsInitted) return;
-	
+
 	static Vector3 verts[NUM_BOX_VERTS];
 
 	// compute the vertex positions
@@ -881,7 +881,7 @@ bool AABoxRenderObjClass::Cast_OBBox(OBBoxCollisionTestClass & boxtest)
 bool AABoxRenderObjClass::Intersect_AABox(AABoxIntersectionTestClass & boxtest)
 {
 	if ((Get_Collision_Type() & boxtest.CollisionType) == 0) return false;
-	return CollisionMath::Intersection_Test(CachedBox,boxtest.Box);	
+	return CollisionMath::Intersection_Test(CachedBox,boxtest.Box);
 }
 
 
@@ -1264,7 +1264,7 @@ bool OBBoxRenderObjClass::Cast_OBBox(OBBoxCollisionTestClass & boxtest)
 bool OBBoxRenderObjClass::Intersect_AABox(AABoxIntersectionTestClass & boxtest)
 {
 	if ((Get_Collision_Type() & boxtest.CollisionType) == 0) return false;
-	return CollisionMath::Intersection_Test(CachedBox,boxtest.Box);	
+	return CollisionMath::Intersection_Test(CachedBox,boxtest.Box);
 }
 
 
@@ -1373,7 +1373,7 @@ int BoxPrototypeClass::Get_Class_ID(void) const
 		return RenderObjClass::CLASSID_AABOX;
 	}
 }
-	
+
 RenderObjClass * BoxPrototypeClass::Create(void)
 {
 	if (Definition.Attributes & W3D_BOX_ATTRIBUTE_ORIENTED) {
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h
index 73d2a665c85..5a93e0e1c1b 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h
@@ -34,12 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef BOXROBJ_H
-#define BOXROBJ_H
 
 #include "always.h"
 #include "rendobj.h"
@@ -54,14 +49,14 @@ class VertexMaterialClass;
 /**
 ** BoxRenderObjClass: base class for AABox and OBBox collision boxes
 **
-** NOTE: these render objects were designed from the start to be used for 
+** NOTE: these render objects were designed from the start to be used for
 ** collision boxes.  They are designed to normally never render unless you
 ** set the display mask and then, all boxes of that type will render.
 ** The display mask is 'AND'ed with the collision bits in the base render
 ** object class to determine if the box should be rendered.  WW3D provides
 ** an interface for setting this mask in your app.
 **
-** NOTE2: AABoxRenderObjClass is an axis-aligned box which will be positioned 
+** NOTE2: AABoxRenderObjClass is an axis-aligned box which will be positioned
 ** at a world-space offset (its local center) from the origin of the transform.
 ** This is done because AABoxes are used for rotationally invariant collision
 ** detection so we don't want the boxes to move around as the object rotates.
@@ -70,10 +65,10 @@ class VertexMaterialClass;
 **
 ** NOTE3: OBBoxRenderObjClass is an oriented box which is aligned with its transform
 ** but can have a center point that is offest from the transform's origin.
-** 
+**
 */
 class BoxRenderObjClass : public RenderObjClass
-{	
+{
 
 public:
 
@@ -90,7 +85,7 @@ class BoxRenderObjClass : public RenderObjClass
 
 	static void							Init(void);
 	static void							Shutdown(void);
-	
+
 	static void							Set_Box_Display_Mask(int mask);
 	static int							Get_Box_Display_Mask(void);
 
@@ -101,7 +96,7 @@ class BoxRenderObjClass : public RenderObjClass
 	const Vector3 &					Get_Local_Extent(void) { return ObjSpaceExtent; }
 
 protected:
-	
+
 	virtual void						update_cached_box(void) = 0;
 	void									render_box(RenderInfoClass & rinfo,const Vector3 & center,const Vector3 & extent);
 	void									vis_render_box(SpecialRenderInfoClass & rinfo,const Vector3 & center,const Vector3 & extent);
@@ -146,13 +141,13 @@ class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass
 	AABoxRenderObjClass & operator = (const AABoxRenderObjClass &);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
 	virtual void					Render(RenderInfoClass & rinfo);
 	virtual void					Special_Render(SpecialRenderInfoClass & rinfo);
-	virtual void 					Set_Transform(const Matrix3D &m); 
+	virtual void 					Set_Transform(const Matrix3D &m);
 	virtual void 					Set_Position(const Vector3 &v);
 	virtual bool					Cast_Ray(RayCollisionTestClass & raytest);
 	virtual bool					Cast_AABox(AABoxCollisionTestClass & boxtest);
@@ -163,23 +158,23 @@ class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass
    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & box) const;
 
 	/////////////////////////////////////////////////////////////////////////////
-	// AABoxRenderObjClass Interface 
+	// AABoxRenderObjClass Interface
 	/////////////////////////////////////////////////////////////////////////////
 	const AABoxClass &			Get_Box(void);
 
 protected:
-	
+
 	virtual void					update_cached_box(void);
 
 	AABoxClass						CachedBox;
 
 };
 
-inline const AABoxClass & AABoxRenderObjClass::Get_Box(void) 
-{ 
+inline const AABoxClass & AABoxRenderObjClass::Get_Box(void)
+{
 	Validate_Transform();
 	update_cached_box();
-	return CachedBox; 
+	return CachedBox;
 }
 
 /*
@@ -197,13 +192,13 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass
 	OBBoxRenderObjClass & operator = (const OBBoxRenderObjClass &);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
 	virtual void					Render(RenderInfoClass & rinfo);
 	virtual void					Special_Render(SpecialRenderInfoClass & rinfo);
-	virtual void 					Set_Transform(const Matrix3D &m); 
+	virtual void 					Set_Transform(const Matrix3D &m);
 	virtual void 					Set_Position(const Vector3 &v);
 	virtual bool					Cast_Ray(RayCollisionTestClass & raytest);
 	virtual bool					Cast_AABox(AABoxCollisionTestClass & boxtest);
@@ -214,14 +209,14 @@ class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass
    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & box) const;
 
 	/////////////////////////////////////////////////////////////////////////////
-	// OBBoxRenderObjClass Interface 
+	// OBBoxRenderObjClass Interface
 	/////////////////////////////////////////////////////////////////////////////
 	OBBoxClass &					Get_Box(void);
 
 protected:
-	
+
 	virtual void					update_cached_box(void);
-	
+
 	OBBoxClass						CachedBox;
 
 };
@@ -259,9 +254,3 @@ class BoxPrototypeClass : public W3DMPO, public PrototypeClass
 ** Instance of the loader which the asset manager installs
 */
 extern BoxLoaderClass			_BoxLoader;
-
-
-
-
-#endif
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp
index 3caa21c5c87..ba12206dea5 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                    Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 24                                                          $*
@@ -117,7 +117,7 @@ CameraClass::CameraClass(void) :
  *   3/21/98    GTH : Created.                                                                 *
  *   4/13/2001  hy : added in copy code for new member functions                               *
  *=============================================================================================*/
-CameraClass::CameraClass(const CameraClass & src) : 
+CameraClass::CameraClass(const CameraClass & src) :
 	RenderObjClass(src),
 	Projection(src.Projection),
 	Viewport(src.Viewport),
@@ -154,7 +154,7 @@ CameraClass & CameraClass::operator = (const CameraClass & that)
 {
 	if (this != &that) {
 		RenderObjClass::operator = (that);
-	
+
 		Projection = that.Projection;
 		Viewport = that.Viewport;
 		ViewPlane = that.ViewPlane;
@@ -165,13 +165,13 @@ CameraClass & CameraClass::operator = (const CameraClass & that)
 		NearClipBBox = that.NearClipBBox;
 		ProjectionTransform = that.ProjectionTransform;
 		CameraInvTransform = that.CameraInvTransform;
-		
+
 		// just being paraniod in case any parent class doesn't completely copy the entire state...
 		FrustumValid = false;
 	}
 
 	return * this;
-}  	
+}
 
 
 /***********************************************************************************************
@@ -261,10 +261,10 @@ void CameraClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
  * HISTORY:                                                                                    *
  *   5/29/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-void CameraClass::Set_Transform(const Matrix3D &m)	
-{ 
+void CameraClass::Set_Transform(const Matrix3D &m)
+{
 	RenderObjClass::Set_Transform(m);
-	FrustumValid = false; 
+	FrustumValid = false;
 }
 
 
@@ -283,9 +283,9 @@ void CameraClass::Set_Transform(const Matrix3D &m)
  *   5/29/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 void CameraClass::Set_Position(const Vector3 &v)
-{ 
-	RenderObjClass::Set_Position(v); 
-	FrustumValid = false; 
+{
+	RenderObjClass::Set_Position(v);
+	FrustumValid = false;
 }
 
 
@@ -329,17 +329,17 @@ void CameraClass::Set_View_Plane(float hfov,float vfov)
 
 	float width_half = tan(hfov/2.0);
 	float height_half = 0.0f;
-	
-	if (vfov == -1) {									
+
+	if (vfov == -1) {
 		height_half = (1.0f / AspectRatio) * width_half;		// use the aspect ratio
 	} else {
 		height_half = tan(vfov/2.0);
 		AspectRatio = width_half / height_half;					// or, initialize the aspect ratio
 	}
-	
+
 	ViewPlane.Min.Set(-width_half,-height_half);
 	ViewPlane.Max.Set(width_half,height_half);
-	
+
 	FrustumValid = false;
 }
 
@@ -424,7 +424,7 @@ CameraClass::ProjectionResType CameraClass::Project(Vector3 & dest,const Vector3
 
 	if ((dest.X < -1.0f) || (dest.X > 1.0f) || (dest.Y < -1.0f) || (dest.Y > 1.0f)) {
 		return OUTSIDE_FRUSTUM;
-	}	
+	}
 
 	return INSIDE_FRUSTUM;
 }
@@ -445,7 +445,7 @@ CameraClass::ProjectionResType CameraClass::Project(Vector3 & dest,const Vector3
  * HISTORY:                                                                                    *
  *   11/17/2000 gth : Created.                                                                 *
  *=============================================================================================*/
-CameraClass::ProjectionResType 
+CameraClass::ProjectionResType
 CameraClass::Project_Camera_Space_Point(Vector3 & dest,const Vector3 & cam_point) const
 {
 	Update_Frustum();
@@ -467,7 +467,7 @@ CameraClass::Project_Camera_Space_Point(Vector3 & dest,const Vector3 & cam_point
 
 	if ((dest.X < -1.0f) || (dest.X > 1.0f) || (dest.Y < -1.0f) || (dest.Y > 1.0f)) {
 		return OUTSIDE_FRUSTUM;
-	}	
+	}
 
 	return INSIDE_FRUSTUM;
 }
@@ -497,7 +497,7 @@ void CameraClass::Un_Project(Vector3 & dest,const Vector2 & view_point) const
 	*/
 	float vpdx = ViewPlane.Max.X - ViewPlane.Min.X;
 	float vpdy = ViewPlane.Max.Y - ViewPlane.Min.Y;
-	
+
 	Vector3 point;
 	point.X = ViewPlane.Min.X + vpdx * (view_point.X + 1.0f) * 0.5f;
 	point.Y = ViewPlane.Min.Y + vpdy * (view_point.Y + 1.0f) * 0.5f;
@@ -505,7 +505,7 @@ void CameraClass::Un_Project(Vector3 & dest,const Vector2 & view_point) const
 
 	Matrix3D::Transform_Vector(Transform,point,&dest);
 }
-	
+
 
 /***********************************************************************************************
  * CameraClass::Transform_To_View_Space -- transforms the given world space point to camera sp *
@@ -524,7 +524,7 @@ void CameraClass::Transform_To_View_Space(Vector3 & dest,const Vector3 & ws_poin
 	Update_Frustum();
 	Matrix3D::Transform_Vector(CameraInvTransform,ws_point,&dest);
 }
-	
+
 
 /***********************************************************************************************
  * CameraClass::Rotate_To_View_Space -- rotates the given world space vector to camera space   *
@@ -561,8 +561,8 @@ void CameraClass::Rotate_To_View_Space(Vector3 & dest,const Vector3 & ws_vector)
 const OBBoxClass & CameraClass::Get_Near_Clip_Bounding_Box(void) const
 {
 	Update_Frustum();
-	return NearClipBBox;	
-}	
+	return NearClipBBox;
+}
 
 
 /***********************************************************************************************
@@ -639,7 +639,7 @@ void CameraClass::Update_Frustum(void) const
 															znear_dist, zfar_dist );
 
 	} else {
-		
+
 		ProjectionTransform.Init_Ortho( vpmin.X,vpmax.X,vpmin.Y,vpmax.Y,znear_dist,zfar_dist);
 
 	}
@@ -676,7 +676,7 @@ void CameraClass::Device_To_View_Space(const Vector2 & device_coord,Vector3 * se
 	Vector2 vs_min;
 	Vector2 vs_max;
 	Get_View_Plane(vs_min,vs_max);
-	
+
 	// mapping from the viewport coordinates to view space coordinates
 	set_view->X = vs_min.X + (ndev.X - Viewport.Min.X) * (vs_max.X - vs_min.X) / (Viewport.Width());
 	set_view->Y = vs_max.Y - (ndev.Y - Viewport.Min.Y) * (vs_max.Y - vs_min.Y) / (Viewport.Height());
@@ -723,7 +723,7 @@ void CameraClass::Apply(void)
 	int width,height,bits;
 	bool windowed;
 	WW3D::Get_Render_Target_Resolution(width,height,bits,windowed);
-	
+
 	D3DVIEWPORT8 vp;
 	vp.X = (DWORD)(Viewport.Min.X * (float)width);
 	vp.Y = (DWORD)(Viewport.Min.Y * (float)height);
@@ -739,40 +739,40 @@ void CameraClass::Apply(void)
 	DX8Wrapper::Set_Transform(D3DTS_VIEW,CameraInvTransform);
 }
 
-void CameraClass::Set_Clip_Planes(float znear,float zfar)						
-{ 
+void CameraClass::Set_Clip_Planes(float znear,float zfar)
+{
 	FrustumValid = false;
 	ZNear = znear;
 	ZFar = zfar;
 }
 
-void CameraClass::Get_Clip_Planes(float & znear,float & zfar) const		
-{ 
+void CameraClass::Get_Clip_Planes(float & znear,float & zfar) const
+{
 	znear = ZNear;
 	zfar = ZFar;
 }
 
-float CameraClass::Get_Horizontal_FOV(void) const 
-{ 
+float CameraClass::Get_Horizontal_FOV(void) const
+{
 	float width = ViewPlane.Max.X - ViewPlane.Min.X;
 	return 2*WWMath::Atan2(width,2.0);
 }
 
-float CameraClass::Get_Vertical_FOV(void) const 
-{ 
+float CameraClass::Get_Vertical_FOV(void) const
+{
 	float height = ViewPlane.Max.Y - ViewPlane.Min.Y;
 	return 2*WWMath::Atan2(height,2.0);
 }
 
-float CameraClass::Get_Aspect_Ratio(void) const 
-{ 
+float CameraClass::Get_Aspect_Ratio(void) const
+{
 	return AspectRatio;
 }
 
 void CameraClass::Get_Projection_Matrix(Matrix4x4 * set_tm)
 {
 	WWASSERT(set_tm != NULL);
-	
+
 	Update_Frustum();
 	*set_tm = ProjectionTransform;
 }
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h
index d2177808f88..8766dea3a10 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                    Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 14                                                          $*
@@ -43,12 +43,7 @@
  *   CameraClass::Get_View_Space_Frustum_Corners -- returns the corners of the view space frus *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef CAMERA_H
-#define CAMERA_H
 
 #include "always.h"
 #include "rendobj.h"
@@ -69,11 +64,11 @@ class RenderInfoClass;
 */
 class ViewportClass
 {
-public:	
+public:
 	ViewportClass(void) : Min(0,0), Max(1,1)													{ }
 	ViewportClass(const Vector2 & min,const Vector2 & max) : Min(min), Max(max)	{ }
 	ViewportClass(const ViewportClass & vp) : Min(vp.Min), Max(vp.Max)				{ }
-	
+
 	float	Width(void)	const																			{ return Max.X - Min.X; }
 	float Height(void) const																		{ return Max.Y - Min.Y; }
 
@@ -88,15 +83,15 @@ class ViewportClass
 ** space, the parameters of the perspective projection, and the viewport
 ** on screen that the result is mapped into.
 **
-** Cameras are not "rendered" and do not need to be "added" to a scene.  A 
-** CameraClass is passed into the WW3D::Render(...) function.  The reason 
-** they are render objects is so that they can be inserted onto the bone of 
+** Cameras are not "rendered" and do not need to be "added" to a scene.  A
+** CameraClass is passed into the WW3D::Render(...) function.  The reason
+** they are render objects is so that they can be inserted onto the bone of
 ** some animation and move with the animation...
 **
-** For all of the projection functions (Matrix4x4, ProjectorClass (used by 
-** decals and texture projections), and CameraClass) I followed the OpenGL 
-** convention of passing positive distances for your clip planes even though 
-** in a right-handed coordinate system your z values are negative after 
+** For all of the projection functions (Matrix4x4, ProjectorClass (used by
+** decals and texture projections), and CameraClass) I followed the OpenGL
+** convention of passing positive distances for your clip planes even though
+** in a right-handed coordinate system your z values are negative after
 ** transformation to camera space.  So Set_Clip_Planes expects positive distances
 ** to your near and far clip planes.
 **
@@ -128,15 +123,15 @@ class CameraClass : public RenderObjClass
 	virtual ~CameraClass(void);
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const { return CLASSID_CAMERA; }
-		
+
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface -  Rendering, cameras don't "render"
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void					Render(RenderInfoClass & rinfo) { }
-			
+
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - "Scene Graph"
-	// Cameras cache their frustum description, this is invalidated whenever 
+	// Cameras cache their frustum description, this is invalidated whenever
 	// the transform/position is changed
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void 					Set_Transform(const Matrix3D &m);
@@ -157,7 +152,7 @@ class CameraClass : public RenderObjClass
 	// Setting the projection type
 	void								Set_Projection_Type(ProjectionType ptype);
 	ProjectionType					Get_Projection_Type(void);
-	
+
 	// Setting the clipping ranges in world space distances
 	void								Set_Clip_Planes(float znear,float zfar);
 	void								Get_Clip_Planes(float & znear,float & zfar) const;
@@ -166,13 +161,13 @@ class CameraClass : public RenderObjClass
 	void								Set_Zbuffer_Range(float znear,float zfar) {ZBufferMin = znear;ZBufferMax=zfar;}
 	void								Get_Zbuffer_Range(float & znear,float & zfar) const {znear=ZBufferMin;zfar=ZBufferMax;}
 
-	// Methods for setting the View Plane.  
+	// Methods for setting the View Plane.
 	// NOTE: View plane is always at a distance of 1.0 from the eye.
 	void								Set_View_Plane(const Vector2 & min,const Vector2 & max);
 	void								Set_View_Plane(float hfov,float vfov = -1);
 	void								Set_Aspect_Ratio(float width_to_height);
 
-	// Methods for querying the View Plane settings.		
+	// Methods for querying the View Plane settings.
 	void								Get_View_Plane(Vector2 & set_min,Vector2 & set_max) const;
 	float								Get_Horizontal_FOV(void) const;
 	float								Get_Vertical_FOV(void) const;
@@ -196,20 +191,20 @@ class CameraClass : public RenderObjClass
 	void								Set_Viewport(const Vector2 & min,const Vector2 & max);
 	void								Get_Viewport(Vector2 & set_min,Vector2 & set_max) const;
 	const ViewportClass &		Get_Viewport(void) const;
-	
+
 	void								Set_Depth_Range(float zstart = 0.0f,float zend = 1.0f);
 	void								Get_Depth_Range(float * set_zstart,float * set_zend) const;
 
-	// Culling for various bounding volumes.  These functions will return true if the 
+	// Culling for various bounding volumes.  These functions will return true if the
 	// given primitive is culled (i.e. it is *outside* the view frustum)
 	bool								Cull_Sphere(const SphereClass & sphere) const;
 	bool								Cull_Sphere_On_Frustum_Sides(const SphereClass & sphere) const;
 	bool								Cull_Box(const AABoxClass & box) const;
 
 	// Various properties of the camera's frustum:  These funcitons return a
-	// pointer to the internal storage of the descriptions.  there will be 
-	// 6 frustum planes, 8 corner points, see the implementations of these 
-	// functions for definitions on which points/planes are associated with 
+	// pointer to the internal storage of the descriptions.  there will be
+	// 6 frustum planes, 8 corner points, see the implementations of these
+	// functions for definitions on which points/planes are associated with
 	// each index.  Better yet, just use the Frustum object.
 	const FrustumClass &			Get_Frustum(void) const;
 	const PlaneClass *			Get_Frustum_Planes(void) const;
@@ -218,9 +213,9 @@ class CameraClass : public RenderObjClass
 	const PlaneClass *			Get_View_Space_Frustum_Planes(void) const;
 	const Vector3 *				Get_View_Space_Frustum_Corners(void) const;
 	const OBBoxClass &			Get_Near_Clip_Bounding_Box(void) const;
-	
+
 	// Methods for transforming/projecting points between various coordinate systems
-	// associated with this camera.  
+	// associated with this camera.
 	// "Device Space" - pixel coordinate
 	// "View Space" - 3D space where the view point is at 0,0,0 and the view plane is at z=-1.0
 	// "World Space" - 3D world coordinate system.
@@ -235,7 +230,7 @@ class CameraClass : public RenderObjClass
 	static void	Convert_Old(Vector3 &pos);
 
 protected:
-	
+
 	void								Update_Frustum(void) const;
 
 	ProjectionType					Projection;		// projection type, orthographic or perspective
@@ -256,8 +251,8 @@ class CameraClass : public RenderObjClass
 };
 
 
-inline float CameraClass::Get_Depth(void) const 
-{ 
+inline float CameraClass::Get_Depth(void) const
+{
 	return ZFar;
 }
 
@@ -272,16 +267,16 @@ inline CameraClass::ProjectionType CameraClass::Get_Projection_Type(void)
 	return Projection;
 }
 
-inline void CameraClass::Set_Viewport(const Vector2 & min,const Vector2 & max)		
-{ 
-	Viewport.Min = min; Viewport.Max = max; 
+inline void CameraClass::Set_Viewport(const Vector2 & min,const Vector2 & max)
+{
+	Viewport.Min = min; Viewport.Max = max;
 	FrustumValid = false;
 }
 
-inline void	CameraClass::Get_Viewport(Vector2 & set_min,Vector2 & set_max) const	
-{ 
-	set_min = Viewport.Min; 
-	set_max = Viewport.Max; 
+inline void	CameraClass::Get_Viewport(Vector2 & set_min,Vector2 & set_max) const
+{
+	set_min = Viewport.Min;
+	set_max = Viewport.Max;
 }
 
 inline void	CameraClass::Set_Depth_Range(float zmin,float zmax)
@@ -300,9 +295,9 @@ inline void	CameraClass::Get_Depth_Range(float * set_zmin,float * set_zmax) cons
 	}
 }
 
-inline const ViewportClass & CameraClass::Get_Viewport(void) const											
-{ 
-	return Viewport; 
+inline const ViewportClass & CameraClass::Get_Viewport(void) const
+{
+	return Viewport;
 }
 
 inline bool CameraClass::Cull_Sphere(const SphereClass & sphere) const
@@ -381,7 +376,7 @@ CameraClass::Get_Frustum_Planes(void) const
  * HISTORY:                                                                                    *
  *   5/29/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-inline const Vector3 * 
+inline const Vector3 *
 CameraClass::Get_Frustum_Corners(void) const
 {
 	const FrustumClass & frustum = Get_Frustum();
@@ -451,6 +446,3 @@ inline const Vector3 * CameraClass::Get_View_Space_Frustum_Corners(void) const
 	const FrustumClass & frustum = Get_View_Space_Frustum();
 	return frustum.Corners;
 }
-
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
index 7ea6d67194d..6b0b4d736e4 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Jani Penttinen                                               *
  *                                                                                             *
- *                       $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 32                                                          $*
@@ -48,12 +48,12 @@
 #include "assetmgr.h"
 #include "Vector3i.h"
 #include "quat.h"
-#include "INI.H"
+#include "INI.h"
 #include "Point.h"
 #include "rinfo.h"
 #include "vertmaterial.h"
 #include "chunkio.h"
-#include "WWFILE.H"
+#include "WWFILE.h"
 #include "inisup.h"
 #include "persistfactory.h"
 #include "ww3dids.h"
@@ -65,7 +65,6 @@
 #include "scene.h"
 #include "wwprofile.h"
 #include "visrasterizer.h"
-#include <cstdio>
 #include <limits.h>
 #include <wwprofile.h>
 
@@ -508,7 +507,7 @@ void DazzleTypeClass::Calculate_Intensities(
 	float distance) const
 {
 	float dot = -Vector3::Dot_Product(dir_to_dazzle,camera_dir);
-	dazzle_intensity = dot;	
+	dazzle_intensity = dot;
 
 	if (ic.use_camera_translation && distance>(fadeout_end_sqr)) {
 		dazzle_intensity=0.0f;
@@ -532,10 +531,10 @@ void DazzleTypeClass::Calculate_Intensities(
 	}
 	else {
 		dazzle_intensity=0.0f;
-	}	
+	}
 
-	if (ic.halo_intensity_pow > WWMATH_EPSILON) {		
-		if (dot > 0.0f) {			
+	if (ic.halo_intensity_pow > WWMATH_EPSILON) {
+		if (dot > 0.0f) {
 			float scale = powf(dot, ic.halo_intensity_pow);
 			halo_intensity *= scale;
 		} else {
@@ -685,7 +684,8 @@ void DazzleRenderObjClass::Init_Type(const DazzleInitClass& i)
 		unsigned new_count=i.type+1;
 		DazzleTypeClass** new_types=W3DNEWARRAY DazzleTypeClass*[new_count];
 		unsigned a=0;
-		for (;a<type_count;++a) {
+		unsigned copy_count = min(type_count, new_count);
+		for (;a<copy_count;++a) {
 			new_types[a]=types[a];
 		}
 		for (;a<new_count;++a) {
@@ -709,7 +709,8 @@ void DazzleRenderObjClass::Init_Lensflare(const LensflareInitClass& i)
 		unsigned new_count=i.type+1;
 		LensflareTypeClass** new_lensflares=W3DNEWARRAY LensflareTypeClass*[new_count];
 		unsigned a=0;
-		for (;a<lensflare_count;++a) {
+		unsigned copy_count = min(lensflare_count, new_count);
+		for (;a<copy_count;++a) {
 			new_lensflares[a]=lensflares[a];
 		}
 		for (;a<new_count;++a) {
@@ -973,8 +974,7 @@ void DazzleRenderObjClass::Render(RenderInfoClass & rinfo)
 			const DazzleTypeClass* params=types[type];
 			params->Calculate_Intensities(dazzle_intensity,dazzle_size,current_halo_intensity,camera_dir,current_dir,dir,current_distance);
 
-			unsigned time_ms=WW3D::Get_Frame_Time();
-			if (time_ms==0) time_ms=1;
+			float time_ms=WW3D::Get_Logic_Frame_Time_Milliseconds();
 			float weight=pow(params->ic.history_weight,time_ms);
 
 			if (dazzle_intensity>0.0f) {
@@ -1046,9 +1046,6 @@ void DazzleRenderObjClass::Render_Dazzle(CameraClass* camera)
 		screen_x_scale=h/w;
 	}
 
-//	unsigned time_ms=WW3D::Get_Frame_Time();
-//	if (time_ms==0) time_ms=1;
-
 	// Do NOT scale halo by current scale
 	// because it uses screen parallel primitives
 	// and if it's too big it will be visible until
@@ -1149,7 +1146,7 @@ void DazzleRenderObjClass::Render_Dazzle(CameraClass* camera)
 
 			unsigned color=DX8Wrapper::Convert_Color(col,1.0f);
 
-			Vector3 offset;			
+			Vector3 offset;
 
 			offset = (halo_dxt - halo_dyt) * halo_size;
 			dl = current_vloc + offset;
@@ -1159,7 +1156,7 @@ void DazzleRenderObjClass::Render_Dazzle(CameraClass* camera)
 			vertex->diffuse=color;
 			vertex++;
 
-			offset = (halo_dxt + halo_dyt) * halo_size;  
+			offset = (halo_dxt + halo_dyt) * halo_size;
 			dl =current_vloc + offset;
 			reinterpret_cast<Vector3&>(vertex->x)=dl;
 			vertex->u1=1.0f;
@@ -1480,7 +1477,7 @@ PersistClass *	DazzlePersistFactoryClass::Load(ChunkLoadClass & cload) const
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		};
 		cload.Close_Chunk();
@@ -1500,9 +1497,9 @@ PersistClass *	DazzlePersistFactoryClass::Load(ChunkLoadClass & cload) const
 	*/
 	if (new_obj == NULL) {
 		static int count = 0;
-		if ( ++count < 10 ) {
-			WWDEBUG_SAY(("DazzlePersistFactory failed to create dazzle of type: %s!!\r\n",dazzle_type));
-			WWDEBUG_SAY(("Replacing it with a NULL render object!\r\n"));
+		if ( count++ < 10 ) {
+			WWDEBUG_SAY(("DazzlePersistFactory failed to create dazzle of type: %s!!",dazzle_type));
+			WWDEBUG_SAY(("Replacing it with a NULL render object!"));
 		}
 		new_obj = WW3DAssetManager::Get_Instance()->Create_Render_Obj("NULL");
 	}
@@ -1585,9 +1582,6 @@ void DazzleLayerClass::Render(CameraClass* camera)
 
 	camera->Apply();
 
-	unsigned time_ms=WW3D::Get_Frame_Time();
-	if (time_ms==0) time_ms=1;
-
 	DX8Wrapper::Set_Material(NULL);
 
 	for (unsigned type=0;type<type_count;++type) {
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h
index e7dc99c2e81..24d38779401 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DAZZLE_H
-#define DAZZLE_H
 
 #include "always.h"
 #include "vector3.h"
@@ -148,8 +143,8 @@ class DazzleTypeClass
 public:
 
 	virtual void Calculate_Intensities(
-		float& dazzle_intensity, 
-		float& dazzle_size, 
+		float& dazzle_intensity,
+		float& dazzle_size,
 		float& halo_intensity,
 		const Vector3& camera_dir,
 		const Vector3& dazzle_dir,
@@ -182,7 +177,7 @@ class DazzleLayerClass {
 	friend DazzleRenderObjClass;
 
 	public:
-	
+
 		DazzleLayerClass(void);
 		~DazzleLayerClass(void);
 
@@ -235,7 +230,7 @@ class LensflareTypeClass
 class INIClass;
 
 class DazzleRenderObjClass : public RenderObjClass
-{	
+{
 	friend DazzleLayerClass;
 
 	DazzleRenderObjClass * succ;
@@ -255,7 +250,7 @@ class DazzleRenderObjClass : public RenderObjClass
 	bool on_list;	// This is used to avoid insterting a dazzle into a list twice.
 	float radius;	// Used to cast rays against
 	unsigned int creation_time;
-	
+
 	static bool	_dazzle_rendering_enabled;
 
 //	static void Draw_Debug_Dazzle(int idx);
@@ -274,17 +269,17 @@ class DazzleRenderObjClass : public RenderObjClass
 	const DazzleRenderObjClass* Succ() const { return succ; }
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void)	const { return CLASSID_DAZZLE; }
-	
+
 	virtual void					Render(RenderInfoClass & rinfo);
 	virtual void Special_Render(SpecialRenderInfoClass & rinfo);
-	virtual void 					Set_Transform(const Matrix3D &m); 
+	virtual void 					Set_Transform(const Matrix3D &m);
    virtual void					Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const;
    virtual void					Get_Obj_Space_Bounding_Box(AABoxClass & box) const;
-	virtual void					Scale(float scale) 															{ current_scale*=scale; };	
+	virtual void					Scale(float scale) 															{ current_scale*=scale; };
 
 	void Set_Dazzle_Color(const Vector3& col) { dazzle_color=col; }
 	void Set_Halo_Color(const Vector3& col) { halo_color=col; }
@@ -354,7 +349,7 @@ class DazzleVisibilityClass
 
 /**
 ** DazzlePrototypeClass
-** This description object is generated when reading a W3D_CHUNK_DAZZLE.  It stores the 
+** This description object is generated when reading a W3D_CHUNK_DAZZLE.  It stores the
 ** information needed to construct a particular instance of a dazzle.  Prototypes are
 ** stored in the asset manager and used to construct render objects when needed.
 */
@@ -363,14 +358,14 @@ class DazzlePrototypeClass : public W3DMPO, public PrototypeClass
 	W3DMPO_GLUE(DazzlePrototypeClass)
 public:
 	DazzlePrototypeClass(void) : DazzleType(0)				{ }
-	
+
 	virtual const char *			Get_Name(void) const			{ return Name; }
 	virtual int								Get_Class_ID(void) const	{ return RenderObjClass::CLASSID_DAZZLE; }
 	virtual RenderObjClass *	Create(void);
 	virtual void							DeleteSelf()							{ delete this; }
 
 	WW3DErrorType					Load_W3D(ChunkLoadClass & cload);
-	
+
 private:
 
 	StringClass				Name;
@@ -380,7 +375,7 @@ class DazzlePrototypeClass : public W3DMPO, public PrototypeClass
 
 /**
 ** DazzleLoaderClass
-** An instance of this class is registered with the asset manager and handles loading W3D_CHUNK_DAZZLE.  
+** An instance of this class is registered with the asset manager and handles loading W3D_CHUNK_DAZZLE.
 ** It creates DazzlePrototypes from the data in the chunk.
 */
 class DazzleLoaderClass : public PrototypeLoaderClass
@@ -394,5 +389,3 @@ class DazzleLoaderClass : public PrototypeLoaderClass
 };
 
 extern DazzleLoaderClass		_DazzleLoader;
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp
index 6d1373f69ef..58f13203c0f 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp
@@ -24,7 +24,6 @@
 #include "dx8wrapper.h"
 #include "bitmaphandler.h"
 #include "colorspace.h"
-#include <string.h>
 #include <ddraw.h>
 
 // ----------------------------------------------------------------------------
@@ -47,15 +46,15 @@ DDSFileClass::DDSFileClass(const char* name,unsigned reduction_factor)
 	DateTime(0),
 	CubeFaceSize(0)
 {
-	strncpy(Name,name,sizeof(Name));
+	strlcpy(Name,name,sizeof(Name));
 	// The name could be given in .tga or .dds format, so ensure we're opening .dds...
 	int len=strlen(Name);
 	Name[len-3]='d';
 	Name[len-2]='d';
 	Name[len-1]='s';
 
-	file_auto_ptr file(_TheFileFactory,Name);	
-	if (!file->Is_Available()) 
+	file_auto_ptr file(_TheFileFactory,Name);
+	if (!file->Is_Available())
 	{
 		return;
 	}
@@ -63,7 +62,7 @@ DDSFileClass::DDSFileClass(const char* name,unsigned reduction_factor)
 	int result=file->Open();
 	if (!result)
 	{
-		WWASSERT("File would not open\n");
+		WWASSERT("File would not open");
 		return;
 	}
 
@@ -73,17 +72,17 @@ DDSFileClass::DDSFileClass(const char* name,unsigned reduction_factor)
 	unsigned read_bytes=file->Read(header,4);
 	if (!read_bytes)
 	{
-		WWASSERT("File loading failed trying to read header\n");
+		WWASSERT("File loading failed trying to read header");
 		return;
 	}
 	// Now, we read DDSURFACEDESC2 defining the compressed data
 	read_bytes=file->Read(&SurfaceDesc,sizeof(LegacyDDSURFACEDESC2));
 	// Verify the structure size matches the read size
-	if (read_bytes==0 || read_bytes!=SurfaceDesc.Size) 
+	if (read_bytes==0 || read_bytes!=SurfaceDesc.Size)
 	{
 		StringClass tmp(0,true);
-		tmp.Format("File %s loading failed.\nTried to read %d bytes, got %d. (SurfDesc.size=%d)\n",name,sizeof(LegacyDDSURFACEDESC2),read_bytes,SurfaceDesc.Size);
-		WWASSERT_PRINT(0,tmp);
+		tmp.Format("File %s loading failed.\nTried to read %d bytes, got %d. (SurfDesc.size=%d)",name,sizeof(LegacyDDSURFACEDESC2),read_bytes,SurfaceDesc.Size);
+		WWASSERT_PRINT(0,tmp.str());
 		return;
 	}
 
@@ -145,19 +144,19 @@ DDSFileClass::DDSFileClass(const char* name,unsigned reduction_factor)
 	LevelSizes=W3DNEWARRAY unsigned[MipLevels];
 	LevelOffsets=W3DNEWARRAY unsigned[MipLevels];
 	unsigned level=0;
-	for (;level<ReductionFactor;++level) 
+	for (;level<ReductionFactor;++level)
 	{
-		if (level_size>16) 
+		if (level_size>16)
 		{	// If surface is bigger than one block (8 or 16 bytes)...
 			level_size/=level_mip_dec;
 		}
 	}
-	for (level=0;level<MipLevels;++level) 
+	for (level=0;level<MipLevels;++level)
 	{
 		LevelSizes[level]=level_size;
 		LevelOffsets[level]=level_offset;
 		level_offset+=level_size;
-		if (level_size>16) 
+		if (level_size>16)
 		{	// If surface is bigger than one block (8 or 16 bytes)...
 			level_size/=level_mip_dec;
 		}
@@ -188,7 +187,7 @@ DDSFileClass::~DDSFileClass()
 
 unsigned DDSFileClass::Get_Width(unsigned level) const
 {
-	WWASSERT(level<MipLevels); 
+	WWASSERT(level<MipLevels);
 	unsigned width=Width>>level;
 	if (width<4) width=4;
 	return width;
@@ -196,7 +195,7 @@ unsigned DDSFileClass::Get_Width(unsigned level) const
 
 unsigned DDSFileClass::Get_Height(unsigned level) const
 {
-	WWASSERT(level<MipLevels); 
+	WWASSERT(level<MipLevels);
 	unsigned height=Height>>level;
 	if (height<4) height=4;
 	return height;
@@ -212,26 +211,26 @@ unsigned DDSFileClass::Get_Depth(unsigned level) const
 
 const unsigned char* DDSFileClass::Get_Memory_Pointer(unsigned level) const
 {
-	WWASSERT(level<MipLevels); 
+	WWASSERT(level<MipLevels);
 	return DDSMemory+LevelOffsets[level];
 }
 
 unsigned DDSFileClass::Get_Level_Size(unsigned level) const
 {
-	WWASSERT(level<MipLevels); 
+	WWASSERT(level<MipLevels);
 	return LevelSizes[level];
 }
 
 // For some reason DX-Tex tool doesn't fill the surface size field, so we need to calculate it...
 unsigned DDSFileClass::Calculate_DXTC_Surface_Size
 (
-	unsigned width, 
-	unsigned height, 
+	unsigned width,
+	unsigned height,
 	WW3DFormat format
 )
 {
 	unsigned level_size=(width/4)*(height/4);
-	switch (format) 
+	switch (format)
 	{
 	case WW3D_FORMAT_DXT1:
 		level_size*=8;
@@ -254,8 +253,8 @@ bool DDSFileClass::Load()
 	if (DDSMemory) return false;
 	if (!LevelSizes || !LevelOffsets) return false;
 
-	file_auto_ptr file(_TheFileFactory,Name);	
-	if (!file->Is_Available()) 
+	file_auto_ptr file(_TheFileFactory,Name);
+	if (!file->Is_Available())
 	{
 		return false;
 	}
@@ -278,11 +277,11 @@ bool DDSFileClass::Load()
 	);
 
 	unsigned skipped_offset=0;
-	for (unsigned i=0;i<ReductionFactor;++i) 
+	for (unsigned i=0;i<ReductionFactor;++i)
 	{
 		skipped_offset+=level_size;
 		size-=level_size;
-		if (level_size>16) 
+		if (level_size>16)
 		{	// If surface is bigger than one block (8 or 16 bytes)...
 			level_size/=4;
 		}
@@ -292,7 +291,7 @@ bool DDSFileClass::Load()
 	unsigned seek_size=file->Seek(SurfaceDesc.Size+4+skipped_offset);
 	WWASSERT(seek_size==(SurfaceDesc.Size+4+skipped_offset));
 
-	if (size && size<0x80000000) 
+	if (size && size<0x80000000)
 	{
 		// Allocate memory for the data excluding the headers
 		DDSMemory=MSGW3DNEWARRAY("DDSMemory") unsigned char[size];
@@ -371,10 +370,10 @@ void DDSFileClass::Copy_Level_To_Surface(unsigned level,IDirect3DSurface8* d3d_s
 void DDSFileClass::Copy_Level_To_Surface
 (
 	unsigned level,
-	WW3DFormat dest_format, 
-	unsigned dest_width, 
-	unsigned dest_height, 
-	unsigned char* dest_surface, 
+	WW3DFormat dest_format,
+	unsigned dest_width,
+	unsigned dest_height,
+	unsigned char* dest_surface,
 	unsigned dest_pitch,
 	const Vector3& hsv_shift
 )
@@ -384,7 +383,7 @@ void DDSFileClass::Copy_Level_To_Surface
 
 	if (!DDSMemory || !Get_Memory_Pointer(level))
 	{
-		WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing\n");
+		WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing");
 		return;
 	}
 
@@ -399,8 +398,8 @@ void DDSFileClass::Copy_Level_To_Surface
 				for (unsigned y=0;y<dest_height;y+=4) {
 					for (unsigned x=0;x<dest_width;x+=4) {
 						unsigned cols=*src_ptr++;		// Bytes 1-4 of color block
-						unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-						unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+						unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+						unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 						Recolor(col0,hsv_shift);
 						Recolor(col1,hsv_shift);
 						col0=ARGB8888_To_RGB565(col0);
@@ -420,8 +419,8 @@ void DDSFileClass::Copy_Level_To_Surface
 						*dest_ptr++=*src_ptr++;		// Bytes 1-4 of alpha block
 						*dest_ptr++=*src_ptr++;		// Bytes 5-8 of alpha block
 						unsigned cols=*src_ptr++;		// Bytes 1-4 of color block
-						unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-						unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+						unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+						unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 						Recolor(col0,hsv_shift);
 						Recolor(col1,hsv_shift);
 						col0=ARGB8888_To_RGB565(col0);
@@ -461,8 +460,8 @@ void DDSFileClass::Copy_Level_To_Surface
 //							*dest_ptr++=*src_ptr++;		// Bytes 1-4 of color block
 
 							unsigned cols=*src_ptr++;	// Bytes 1-4 of color block
-							unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-							unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+							unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+							unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 							Recolor(col0,hsv_shift);
 							Recolor(col1,hsv_shift);
 							col0=ARGB8888_To_RGB565(col0);
@@ -500,7 +499,7 @@ void DDSFileClass::Copy_Level_To_Surface
 					}
 				}
 				if (Format==WW3D_FORMAT_DXT1 && contains_alpha) {
-					WWDEBUG_SAY(("Warning: DXT1 format should not contain alpha information - file %s\n",Name));
+					WWDEBUG_SAY(("Warning: DXT1 format should not contain alpha information - file %s",Name));
 				}
 			}
 		}
@@ -535,28 +534,28 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
 
 	if (!DDSMemory || !Get_CubeMap_Memory_Pointer(face,level))
 	{
-		WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing\n");
+		WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing");
 		return;
 	}
 
 	// If the format and size is a match just copy the contents
 	bool has_hsv_shift = hsv_shift[0]!=0.0f || hsv_shift[1]!=0.0f || hsv_shift[2]!=0.0f;
-	if (dest_format==Format && dest_width==Get_Width(level) && dest_height==Get_Height(level)) 
+	if (dest_format==Format && dest_width==Get_Width(level) && dest_height==Get_Height(level))
 	{
 		// If hue shift, we can't just copy...
-		if (has_hsv_shift) 
+		if (has_hsv_shift)
 		{
-			if (Format==WW3D_FORMAT_DXT1) 
+			if (Format==WW3D_FORMAT_DXT1)
 			{
 				const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_CubeMap_Memory_Pointer(face,level));
 				unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-				for (unsigned y=0;y<dest_height;y+=4) 
+				for (unsigned y=0;y<dest_height;y+=4)
 				{
-					for (unsigned x=0;x<dest_width;x+=4) 
+					for (unsigned x=0;x<dest_width;x+=4)
 					{
 						unsigned cols=*src_ptr++;		// Bytes 1-4 of color block
-						unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-						unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+						unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+						unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 						Recolor(col0,hsv_shift);
 						Recolor(col1,hsv_shift);
 						col0=ARGB8888_To_RGB565(col0);
@@ -568,19 +567,19 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
 					}
 				}
 			}
-			else if (Format==WW3D_FORMAT_DXT5) 
+			else if (Format==WW3D_FORMAT_DXT5)
 			{
 				const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_CubeMap_Memory_Pointer(face,level));
 				unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-				for (unsigned y=0;y<dest_height;y+=4) 
+				for (unsigned y=0;y<dest_height;y+=4)
 				{
-					for (unsigned x=0;x<dest_width;x+=4) 
+					for (unsigned x=0;x<dest_width;x+=4)
 					{
 						*dest_ptr++=*src_ptr++;		// Bytes 1-4 of alpha block
 						*dest_ptr++=*src_ptr++;		// Bytes 5-8 of alpha block
 						unsigned cols=*src_ptr++;		// Bytes 1-4 of color block
-						unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-						unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+						unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+						unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 						Recolor(col0,hsv_shift);
 						Recolor(col1,hsv_shift);
 						col0=ARGB8888_To_RGB565(col0);
@@ -592,7 +591,7 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
 					}
 				}
 			}
-			else 
+			else
 			{
 				WWASSERT(0);
 			}
@@ -604,32 +603,32 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
 			memcpy(dest_surface,Get_CubeMap_Memory_Pointer(face,level),compressed_size);
 		}
 	}
-	else 
+	else
 	{
 		// If size matches, copy each pixel linearly with color space conversion
-		if (dest_width==Get_Width(level) && dest_height==Get_Height(level)) 
+		if (dest_width==Get_Width(level) && dest_height==Get_Height(level))
 		{
 			// An exception here - if the source format is DXT1 and the destination
 			// is DXT2, just copy the contents and create an empty alpha channel.
 			// This is needed on NVidia cards that have problems with DXT1 compression.
-			if (Format==WW3D_FORMAT_DXT1 && dest_format==WW3D_FORMAT_DXT2) 
+			if (Format==WW3D_FORMAT_DXT1 && dest_format==WW3D_FORMAT_DXT2)
 			{
 				// If hue shift, we can't just copy...
-				if (has_hsv_shift) 
+				if (has_hsv_shift)
 				{
 					const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_CubeMap_Memory_Pointer(face,level));
 					unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-					for (unsigned y=0;y<dest_height;y+=4) 
+					for (unsigned y=0;y<dest_height;y+=4)
 					{
-						for (unsigned x=0;x<dest_width;x+=4) 
+						for (unsigned x=0;x<dest_width;x+=4)
 						{
 							*dest_ptr++=0xffffffff;		// Bytes 1-4 of alpha block
 							*dest_ptr++=0xffffffff;		// Bytes 5-8 of alpha block
 //							*dest_ptr++=*src_ptr++;		// Bytes 1-4 of color block
 
 							unsigned cols=*src_ptr++;	// Bytes 1-4 of color block
-							unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-							unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+							unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+							unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 							Recolor(col0,hsv_shift);
 							Recolor(col1,hsv_shift);
 							col0=ARGB8888_To_RGB565(col0);
@@ -641,13 +640,13 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
 						}
 					}
 				}
-				else 
+				else
 				{
 					const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_CubeMap_Memory_Pointer(face,level));
 					unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-					for (unsigned y=0;y<dest_height;y+=4) 
+					for (unsigned y=0;y<dest_height;y+=4)
 					{
-						for (unsigned x=0;x<dest_width;x+=4) 
+						for (unsigned x=0;x<dest_width;x+=4)
 						{
 							*dest_ptr++=0xffffffff;		// Bytes 1-4 of alpha block
 							*dest_ptr++=0xffffffff;		// Bytes 5-8 of alpha block
@@ -657,24 +656,24 @@ void DDSFileClass::Copy_CubeMap_Level_To_Surface
 					}
 				}
 			}
-			else 
+			else
 			{
 				unsigned dest_bpp=Get_Bytes_Per_Pixel(dest_format);
 
 				// Copy 4x4 block at a time
 				bool contains_alpha=false;
-				for (unsigned y=0;y<dest_height;y+=4) 
+				for (unsigned y=0;y<dest_height;y+=4)
 				{
 					unsigned char* dest_ptr=dest_surface;
 					dest_ptr+=y*dest_pitch;
-					for (unsigned x=0;x<dest_width;x+=4,dest_ptr+=dest_bpp*4) 
+					for (unsigned x=0;x<dest_width;x+=4,dest_ptr+=dest_bpp*4)
 					{
 						contains_alpha|=Get_4x4_Block(dest_ptr,dest_pitch,dest_format,level,x,y,hsv_shift);
 					}
 				}
-				if (Format==WW3D_FORMAT_DXT1 && contains_alpha) 
+				if (Format==WW3D_FORMAT_DXT1 && contains_alpha)
 				{
-					WWDEBUG_SAY(("Warning: DXT1 format should not contain alpha information - file %s\n",Name));
+					WWDEBUG_SAY(("Warning: DXT1 format should not contain alpha information - file %s",Name));
 				}
 			}
 		}
@@ -705,7 +704,7 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 
 	if (!DDSMemory || !Get_Volume_Memory_Pointer(level))
 	{
-		WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing\n");
+		WWASSERT_PRINT(DDSMemory,"Surface mip level pointer is missing");
 		return;
 	}
 
@@ -714,22 +713,22 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 
 	// If the format and size is a match just copy the contents
 	bool has_hsv_shift = hsv_shift[0]!=0.0f || hsv_shift[1]!=0.0f || hsv_shift[2]!=0.0f;
-	if (dest_format==Format && dest_width==Get_Width(level) && dest_height==Get_Height(level)) 
+	if (dest_format==Format && dest_width==Get_Width(level) && dest_height==Get_Height(level))
 	{
 		// If hue shift, we can't just copy...
-		if (has_hsv_shift) 
+		if (has_hsv_shift)
 		{
-			if (Format==WW3D_FORMAT_DXT1) 
+			if (Format==WW3D_FORMAT_DXT1)
 			{
 				const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_Volume_Memory_Pointer(level));
 				unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-				for (unsigned y=0;y<dest_height;y+=4) 
+				for (unsigned y=0;y<dest_height;y+=4)
 				{
-					for (unsigned x=0;x<dest_width;x+=4) 
+					for (unsigned x=0;x<dest_width;x+=4)
 					{
 						unsigned cols=*src_ptr++;		// Bytes 1-4 of color block
-						unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-						unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+						unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+						unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 						Recolor(col0,hsv_shift);
 						Recolor(col1,hsv_shift);
 						col0=ARGB8888_To_RGB565(col0);
@@ -741,19 +740,19 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 					}
 				}
 			}
-			else if (Format==WW3D_FORMAT_DXT5) 
+			else if (Format==WW3D_FORMAT_DXT5)
 			{
 				const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_Volume_Memory_Pointer(level));
 				unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-				for (unsigned y=0;y<dest_height;y+=4) 
+				for (unsigned y=0;y<dest_height;y+=4)
 				{
-					for (unsigned x=0;x<dest_width;x+=4) 
+					for (unsigned x=0;x<dest_width;x+=4)
 					{
 						*dest_ptr++=*src_ptr++;		// Bytes 1-4 of alpha block
 						*dest_ptr++=*src_ptr++;		// Bytes 5-8 of alpha block
 						unsigned cols=*src_ptr++;		// Bytes 1-4 of color block
-						unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-						unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+						unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+						unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 						Recolor(col0,hsv_shift);
 						Recolor(col1,hsv_shift);
 						col0=ARGB8888_To_RGB565(col0);
@@ -765,44 +764,44 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 					}
 				}
 			}
-			else 
+			else
 			{
 				WWASSERT(0);
 			}
 
 		}
-		else 
+		else
 		{
 			unsigned compressed_size=Get_Level_Size(level);
 			memcpy(dest_surface,Get_Volume_Memory_Pointer(level),compressed_size);
 		}
 	}
-	else 
+	else
 	{
 		// If size matches, copy each pixel linearly with color space conversion
-		if (dest_width==Get_Width(level) && dest_height==Get_Height(level)) 
+		if (dest_width==Get_Width(level) && dest_height==Get_Height(level))
 		{
 			// An exception here - if the source format is DXT1 and the destination
 			// is DXT2, just copy the contents and create an empty alpha channel.
 			// This is needed on NVidia cards that have problems with DXT1 compression.
-			if (Format==WW3D_FORMAT_DXT1 && dest_format==WW3D_FORMAT_DXT2) 
+			if (Format==WW3D_FORMAT_DXT1 && dest_format==WW3D_FORMAT_DXT2)
 			{
 				// If hue shift, we can't just copy...
-				if (has_hsv_shift) 
+				if (has_hsv_shift)
 				{
 					const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_Volume_Memory_Pointer(level));
 					unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-					for (unsigned y=0;y<dest_height;y+=4) 
+					for (unsigned y=0;y<dest_height;y+=4)
 					{
-						for (unsigned x=0;x<dest_width;x+=4) 
+						for (unsigned x=0;x<dest_width;x+=4)
 						{
 							*dest_ptr++=0xffffffff;		// Bytes 1-4 of alpha block
 							*dest_ptr++=0xffffffff;		// Bytes 5-8 of alpha block
 //							*dest_ptr++=*src_ptr++;		// Bytes 1-4 of color block
 
 							unsigned cols=*src_ptr++;	// Bytes 1-4 of color block
-							unsigned col0=RGB565_To_ARGB8888(unsigned short(cols>>16));
-							unsigned col1=RGB565_To_ARGB8888(unsigned short(cols&0xffff));
+							unsigned col0=RGB565_To_ARGB8888((unsigned short)(cols>>16));
+							unsigned col1=RGB565_To_ARGB8888((unsigned short)(cols&0xffff));
 							Recolor(col0,hsv_shift);
 							Recolor(col1,hsv_shift);
 							col0=ARGB8888_To_RGB565(col0);
@@ -814,13 +813,13 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 						}
 					}
 				}
-				else 
+				else
 				{
 					const unsigned* src_ptr=reinterpret_cast<const unsigned*>(Get_Volume_Memory_Pointer(level));
 					unsigned* dest_ptr=reinterpret_cast<unsigned*>(dest_surface);
-					for (unsigned y=0;y<dest_height;y+=4) 
+					for (unsigned y=0;y<dest_height;y+=4)
 					{
-						for (unsigned x=0;x<dest_width;x+=4) 
+						for (unsigned x=0;x<dest_width;x+=4)
 						{
 							*dest_ptr++=0xffffffff;		// Bytes 1-4 of alpha block
 							*dest_ptr++=0xffffffff;		// Bytes 5-8 of alpha block
@@ -830,7 +829,7 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 					}
 				}
 			}
-			else 
+			else
 			{
 				WWASSERT(0);
 			/*	todo
@@ -840,18 +839,18 @@ void DDSFileClass::Copy_Volume_Level_To_Surface
 				bool contains_alpha=false;
 				for (unsigned z=0;z<dest_depth;z++)
 				{
-					for (unsigned y=0;y<dest_height;y+=4) 
+					for (unsigned y=0;y<dest_height;y+=4)
 					{
 						unsigned char* dest_ptr=dest_surface;
 						row_ptr+=y*row_pitch;
-						for (unsigned x=0;x<dest_width;x+=4,dest_ptr+=dest_bpp*4) 
+						for (unsigned x=0;x<dest_width;x+=4,dest_ptr+=dest_bpp*4)
 						{
 							contains_alpha|=Get_4x4_Block(dest_ptr,dest_pitch,dest_format,level,x,y,hsv_shift);
 						}
 					}
-					if (Format==WW3D_FORMAT_DXT1 && contains_alpha) 
+					if (Format==WW3D_FORMAT_DXT1 && contains_alpha)
 					{
-						WWDEBUG_SAY(("Warning: DXT1 format should not contain alpha information - file %s\n",Name));
+						WWDEBUG_SAY(("Warning: DXT1 format should not contain alpha information - file %s",Name));
 					}
 				}*/
 			}
@@ -972,10 +971,10 @@ unsigned DDSFileClass::Get_Pixel(unsigned level,unsigned x,unsigned y) const
 			}
 			WWASSERT(alpha_index<8);
 
-			// 8-alpha or 6-alpha block?    
+			// 8-alpha or 6-alpha block?
 			unsigned alpha_value=0;
-			if (alpha0>alpha1) {    
-				// 8-alpha block:  derive the other six alphas.    
+			if (alpha0>alpha1) {
+				// 8-alpha block:  derive the other six alphas.
 				// Bit code 000 = alpha_0, 001 = alpha_1, others are interpolated.
 				switch (alpha_index) {
 				case 0: alpha_value=alpha0; break;
@@ -985,11 +984,11 @@ unsigned DDSFileClass::Get_Pixel(unsigned level,unsigned x,unsigned y) const
 				case 4: alpha_value=(4*alpha0+3*alpha1+3) / 7; break;    // bit code 100
 				case 5: alpha_value=(3*alpha0+4*alpha1+3) / 7; break;    // bit code 101
 				case 6: alpha_value=(2*alpha0+5*alpha1+3) / 7; break;    // bit code 110
-				case 7: alpha_value=(1*alpha0+6*alpha1+3) / 7; break;    // bit code 111  
+				case 7: alpha_value=(1*alpha0+6*alpha1+3) / 7; break;    // bit code 111
 				}
-			}    
-			else {  
-				// 6-alpha block.    
+			}
+			else {
+				// 6-alpha block.
 				// Bit code 000 = alpha_0, 001 = alpha_1, others are interpolated.
 				switch (alpha_index) {
 				case 0: alpha_value=alpha0; break;
@@ -1136,14 +1135,14 @@ bool DDSFileClass::Get_4x4_Block(
 			alphas[0]=alpha_block[0];
 			alphas[1]=alpha_block[1];
 
-			// 8-alpha or 6-alpha block?    
-			if (alphas[0]>alphas[1]) {    
+			// 8-alpha or 6-alpha block?
+			if (alphas[0]>alphas[1]) {
 				alphas[2]=(6*alphas[0]+1*alphas[1]+3) / 7;   // bit code 010
 				alphas[3]=(5*alphas[0]+2*alphas[1]+3) / 7;   // bit code 011
 				alphas[4]=(4*alphas[0]+3*alphas[1]+3) / 7;   // bit code 100
 				alphas[5]=(3*alphas[0]+4*alphas[1]+3) / 7;   // bit code 101
 				alphas[6]=(2*alphas[0]+5*alphas[1]+3) / 7;   // bit code 110
-				alphas[7]=(1*alphas[0]+6*alphas[1]+3) / 7;   // bit code 111  
+				alphas[7]=(1*alphas[0]+6*alphas[1]+3) / 7;   // bit code 111
 			}
 			else {
 				alphas[2]=(4*alphas[0]+1*alphas[1]+2) / 5;   // Bit code 010
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h
index 07bd8e80fd1..4ac4e73a2e6 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h
@@ -18,12 +18,7 @@
 
 // 08/06/02 KM Added cube map and volume texture support
 
-#ifndef DDSFILE_H
-#define DDSFILE_H
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
 #include "always.h"
 #include "ww3dformat.h"
@@ -41,10 +36,10 @@ struct IDirect3DVolume8;
 // ----------------------------------------------------------------------------
 
 struct LegacyDDCOLORKEY
-{ 
-	unsigned ColorSpaceLowValue; 
-	unsigned ColorSpaceHighValue; 
-}; 
+{
+	unsigned ColorSpaceLowValue;
+	unsigned ColorSpaceHighValue;
+};
 
 // ----------------------------------------------------------------------------
 //
@@ -58,7 +53,7 @@ struct LegacyDDSCAPS2
 	unsigned Caps;
 	unsigned Caps2;
 	unsigned Caps3;
-	unsigned Caps4; 
+	unsigned Caps4;
 };
 
 // ----------------------------------------------------------------------------
@@ -70,47 +65,47 @@ struct LegacyDDSCAPS2
 
 struct LegacyDDPIXELFORMAT
 {
-	unsigned Size; 
-	unsigned Flags; 
-	unsigned FourCC; 
-	union 
-	{ 
-		unsigned RGBBitCount; 
-		unsigned YUVBitCount; 
-		unsigned ZBufferBitDepth; 
-		unsigned AlphaBitDepth; 
+	unsigned Size;
+	unsigned Flags;
+	unsigned FourCC;
+	union
+	{
+		unsigned RGBBitCount;
+		unsigned YUVBitCount;
+		unsigned ZBufferBitDepth;
+		unsigned AlphaBitDepth;
 		unsigned LuminanceBitCount;
 		unsigned BumpBitCount;
 	};
-	union 
-	{ 
-		unsigned RBitMask; 
-		unsigned YBitMask; 
+	union
+	{
+		unsigned RBitMask;
+		unsigned YBitMask;
 		unsigned StencilBitDepth;
 		unsigned LuminanceBitMask;
 		unsigned BumpDuBitMask;
 	};
-	union 
-	{ 
-		unsigned GBitMask; 
-		unsigned UBitMask; 
+	union
+	{
+		unsigned GBitMask;
+		unsigned UBitMask;
 		unsigned ZBitMask;
 		unsigned BumpDvBitMask;
 	};
-	union 
-	{ 
-		unsigned BBitMask; 
-		unsigned VBitMask; 
+	union
+	{
+		unsigned BBitMask;
+		unsigned VBitMask;
 		unsigned StencilBitMask;
 		unsigned BumpLuminanceBitMask;
 	};
-	union 
-	{ 
-		unsigned RGBAlphaBitMask; 
-		unsigned YUVAlphaBitMask; 
+	union
+	{
+		unsigned RGBAlphaBitMask;
+		unsigned YUVAlphaBitMask;
 		unsigned LuminanceAlphaBitMask;
-		unsigned RGBZBitMask; 
-		unsigned YUVZBitMask; 
+		unsigned RGBZBitMask;
+		unsigned YUVZBitMask;
 	};
 };
 
@@ -223,10 +218,10 @@ class DDSFileClass
 	void Copy_Level_To_Surface(unsigned level,IDirect3DSurface8* d3d_surface,const Vector3& hsv_shift=Vector3(0.0f,0.0f,0.0f));
 	void Copy_Level_To_Surface(
 		unsigned level,
-		WW3DFormat dest_format, 
-		unsigned dest_width, 
-		unsigned dest_height, 
-		unsigned char* dest_surface, 
+		WW3DFormat dest_format,
+		unsigned dest_width,
+		unsigned dest_height,
+		unsigned char* dest_surface,
 		unsigned dest_pitch,
 		const Vector3& hsv_shift=Vector3(0.0f,0.0f,0.0f));
 
@@ -258,7 +253,7 @@ class DDSFileClass
 		unsigned slice_pitch,
 		const Vector3& hsv_shift=Vector3(0.0f,0.0f,0.0f)
 	);
-	
+
 	// Get pixel in A8R8G8B8 format. This isn't the fastest possible way of reading data from DDS.
 	unsigned Get_Pixel(unsigned level,unsigned x,unsigned y) const;
 
@@ -279,5 +274,3 @@ class DDSFileClass
 };
 
 // ----------------------------------------------------------------------------
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp
index d9b08d9333e..936d25c396b 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 24                                                          $*
@@ -69,13 +69,13 @@
 
 /**
 ** DecalPolyClass - This class is used to clip polygons as they are
-** added to a RigidDecalMesh. 
+** added to a RigidDecalMesh.
 **
 ** Data needed to add a poly to the decal mesh:
 ** connectivity - generated on the fly after the poly is clipped
 ** planeeq - constant for entire poly, copy from source after done
 ** verts - plug into DecalPolyClass, clip, pull back out
-** vnorms - plug into DecalPolyClass, clip, copy back out 
+** vnorms - plug into DecalPolyClass, clip, copy back out
 ** texcoords - compute after poly is clipped
 ** material - contstant for entire poly, get from generator
 ** shader - constant for entire poly, get from generator
@@ -116,7 +116,7 @@ void DecalPolyClass::Clip(const PlaneClass & plane,DecalPolyClass & dest) const
 	int iprev = Verts.Count() - 1;
 	bool cur_point_in_front;
 	bool prev_point_in_front;
-	
+
 	float alpha;
 	Vector3 int_point;
 	Vector3 int_normal;
@@ -127,22 +127,22 @@ void DecalPolyClass::Clip(const PlaneClass & plane,DecalPolyClass & dest) const
 	prev_point_in_front = true;
 #endif
 
-	for (int j=0; j<Verts.Count(); j++) { 
-		
+	for (int j=0; j<Verts.Count(); j++) {
+
 		cur_point_in_front = plane.In_Front(Verts[i]);
 #if DISABLE_CLIPPING
-		cur_point_in_front = true;		
+		cur_point_in_front = true;
 #endif
 
 		if (prev_point_in_front) {
 
 			if (cur_point_in_front) {
-			
+
 				// Previous vertex was in front of plane and this vertex is in
 				// front of the plane so we emit this vertex.
 				dest.Add_Vertex(Verts[i],VertNorms[i]);
 
-			} else { 
+			} else {
 
 				// Previous vert was in front, this vert is behind, compute
 				// the intersection and emit the point.
@@ -165,9 +165,9 @@ void DecalPolyClass::Clip(const PlaneClass & plane,DecalPolyClass & dest) const
 				Vector3::Lerp(VertNorms[iprev],VertNorms[i],alpha,&int_normal);
 				dest.Add_Vertex(int_point,int_normal);
 				dest.Add_Vertex(Verts[i],VertNorms[i]);
-			
-			} 
-		} 
+
+			}
+		}
 
 		prev_point_in_front = cur_point_in_front;
 		iprev = i;
@@ -265,7 +265,7 @@ RigidDecalMeshClass::~RigidDecalMeshClass(void)
 		DecalSystem->Decal_Mesh_Destroyed(Decals[i].DecalID,this);
 	}
 
-	// Release all of our references.  The memory in the arrays will automatically be 
+	// Release all of our references.  The memory in the arrays will automatically be
 	// released by the SimpleDynVecClass...
 	for (i=0; i<Polys.Count(); i++) {
 		REF_PTR_RELEASE(Textures[i]);
@@ -292,7 +292,7 @@ RigidDecalMeshClass::~RigidDecalMeshClass(void)
 void RigidDecalMeshClass::Render(void)
 {
 	if ((Decals.Count() == 0) || (WW3D::Are_Decals_Enabled() == false)) return;
-	
+
 	/*
 	** Install the mesh'es transform.  NOTE, this could go wrong if someone changes the
 	** transform between the time that the mesh is rendered and the time that the decal
@@ -304,12 +304,12 @@ void RigidDecalMeshClass::Render(void)
 	** Copy the vertices into the dynamic vb
 	*/
 	DynamicVBAccessClass dynamic_vb(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,Verts.Count());
-	{	
+	{
 		DynamicVBAccessClass::WriteLockClass lock(&dynamic_vb);
 		VertexFormatXYZNDUV2 * vertex = lock.Get_Formatted_Vertex_Array();
 
 		for (int i=0; i<Verts.Count(); i++) {
-			
+
 			vertex->x = Verts[i].X;
 			vertex->y = Verts[i].Y;
 			vertex->z = Verts[i].Z;
@@ -329,7 +329,7 @@ void RigidDecalMeshClass::Render(void)
 			vertex++;
 		}
 	}
-	
+
 	/*
 	** Copy the indices into the dynamic ib
 	*/
@@ -358,11 +358,11 @@ void RigidDecalMeshClass::Render(void)
 		DX8Wrapper::Set_Vertex_Buffer(dynamic_vb);
 		DX8Wrapper::Draw_Triangles(	3*cur_poly_index,
 												(next_poly_index - cur_poly_index), // poly count
-												Polys[cur_poly_index].I, 
+												Polys[cur_poly_index].I,
 												1 + Polys[next_poly_index-1].K - Polys[cur_poly_index].I);
 		cur_poly_index = next_poly_index;
 	}
-		
+
 }
 
 
@@ -388,10 +388,10 @@ int RigidDecalMeshClass::Process_Material_Run(int start_index)
 	DX8Wrapper::Set_Shader(Shaders[start_index]);
 
 	int next_index = start_index;
-	while (	(next_index < Polys.Count()) && 
+	while (	(next_index < Polys.Count()) &&
 				(Textures[next_index] == Textures[start_index]) &&
 				(Shaders[next_index] == Shaders[start_index]) &&
-				(VertexMaterials[next_index] == VertexMaterials[start_index])) 
+				(VertexMaterials[next_index] == VertexMaterials[start_index]))
 	{
 		next_index++;
 	}
@@ -423,7 +423,7 @@ bool RigidDecalMeshClass::Create_Decal
 	// the decal polygons along the normal of the decal generator.  If we could instead rely
 	// on hardware "polygon offset" we could remove this code and we could make decals non-sorting
 	Vector3 zbias_offset(0.0f,0.0f,0.0f);
-	
+
 	if (!DX8Wrapper::Get_Current_Caps()->Support_ZBias()) {
 		const float ZBIAS_DISTANCE = 0.01f;
 		generator->Get_Transform().Get_Z_Vector(&zbias_offset);
@@ -438,7 +438,7 @@ bool RigidDecalMeshClass::Create_Decal
 
 	int i,j;
 	WWASSERT(generator->Peek_Decal_System() == DecalSystem);
-	
+
 	/*
 	** If any polys were collected, add a new MeshDecalStruct
 	*/
@@ -452,7 +452,7 @@ bool RigidDecalMeshClass::Create_Decal
 	newdecal.FaceCount = 0;								// init facecount to zero
 	newdecal.VertexStartIndex = Verts.Count();	// start vertices at the end of the current array
 	newdecal.VertexCount = 0;							// init vertcount to zero
-	
+
 	/*
 	** Grab pointers to the parent mesh's components
 	*/
@@ -465,12 +465,12 @@ bool RigidDecalMeshClass::Create_Decal
 	** Grab a pointer to the material settings
 	*/
 	MaterialPassClass * material = generator->Get_Material();
-	
+
 	/*
 	** Set up the generator for our coordinate system
 	*/
 	generator->Set_Mesh_Transform(Parent->Get_Transform());
-	
+
 	/*
 	** Compute the clipping planes
 	*/
@@ -479,13 +479,13 @@ bool RigidDecalMeshClass::Create_Decal
 
 	Matrix3x3::Rotate_Vector(localbox.Basis,Vector3(localbox.Extent.X,0,0),&extent);
 	Vector3 direction(localbox.Basis.Get_X_Vector());
-	
+
 	planes[0].Set(-direction,localbox.Center + extent);
 	planes[1].Set(direction,localbox.Center - extent);
-	
+
 	Matrix3x3::Rotate_Vector(localbox.Basis,Vector3(0,localbox.Extent.Y,0),&extent);
 	direction.Set(localbox.Basis.Get_Y_Vector());
-	
+
 	planes[2].Set(-direction,localbox.Center + extent);
 	planes[3].Set(direction,localbox.Center - extent);
 
@@ -578,11 +578,11 @@ bool RigidDecalMeshClass::Create_Decal
 		** tell the generator that we added a decal
 		*/
 		generator->Add_Mesh(Parent);
-	} 
+	}
 
 	material->Release_Ref();
-	
-#ifdef WWDEBUG	
+
+#ifdef WWDEBUG
 	/*
 	** Some paranoid debug code: ensure all tris have valid vertex indices
 	*/
@@ -637,7 +637,7 @@ bool RigidDecalMeshClass::Delete_Decal(uint32 id)
 	DecalStruct * decal = &Decals[decal_index];
 
 	/*
-	** Remove all geometry used by this decal 
+	** Remove all geometry used by this decal
 	*/
 	Polys.Delete_Range(decal->FaceStartIndex,decal->FaceCount);
 	Verts.Delete_Range(decal->VertexStartIndex,decal->VertexCount);
@@ -675,7 +675,7 @@ bool RigidDecalMeshClass::Delete_Decal(uint32 id)
 	}
 	Decals.Delete(decal_index);
 
-#ifdef WWDEBUG	
+#ifdef WWDEBUG
 	/*
 	** Some paranoid debug code: ensure all tris have valid vertex indices
 	*/
@@ -697,8 +697,8 @@ bool RigidDecalMeshClass::Delete_Decal(uint32 id)
 
 /*
 ** Temporary Buffers
-** These buffers are used by the skin code for temporary storage of the deformed vertices and 
-** vertex normals.  
+** These buffers are used by the skin code for temporary storage of the deformed vertices and
+** vertex normals.
 */
 static SimpleVecClass<Vector3>	_TempVertexBuffer;
 static SimpleVecClass<Vector3>	_TempNormalBuffer;
@@ -748,7 +748,7 @@ SkinDecalMeshClass::~SkinDecalMeshClass(void)
 		DecalSystem->Decal_Mesh_Destroyed(Decals[i].DecalID,this);
 	}
 
-	// Release all of our references.  The memory in the arrays will automatically be 
+	// Release all of our references.  The memory in the arrays will automatically be
 	// released by the SimpleDynVecClass...
 	for (i=0; i<Polys.Count(); i++) {
 		REF_PTR_RELEASE(Textures[i]);
@@ -781,7 +781,7 @@ void SkinDecalMeshClass::Render(void)
 	*/
 	MeshModelClass * model = Parent->Peek_Model();
 	if (model->Get_Flag(MeshModelClass::SORT)) {
-		WWDEBUG_SAY(("ERROR: decals applied to a sorted mesh!\n"));
+		WWDEBUG_SAY(("ERROR: decals applied to a sorted mesh!"));
 		return;
 	}
 
@@ -792,7 +792,7 @@ void SkinDecalMeshClass::Render(void)
 
 	/*
 	** Skin decals have to get the deformed vertices of their parent meshes.  For this
-	** reason, decals on skins is not a very good idea...  
+	** reason, decals on skins is not a very good idea...
 	*/
 	_TempVertexBuffer.Uninitialised_Grow(model->Get_Vertex_Count());
 	_TempNormalBuffer.Uninitialised_Grow(model->Get_Vertex_Count());
@@ -802,7 +802,7 @@ void SkinDecalMeshClass::Render(void)
 	** Copy the vertices into the dynamic vb
 	*/
 	DynamicVBAccessClass dynamic_vb(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,ParentVertexIndices.Count());
-	{	
+	{
 		DynamicVBAccessClass::WriteLockClass lock(&dynamic_vb);
 		VertexFormatXYZNDUV2 * vertex = lock.Get_Formatted_Vertex_Array();
 
@@ -823,7 +823,7 @@ void SkinDecalMeshClass::Render(void)
 
 			vertex->u2 = 0.0f;
 			vertex->v2 = 0.0f;
-			
+
 			vertex++;
 		}
 	}
@@ -856,9 +856,9 @@ void SkinDecalMeshClass::Render(void)
 		DX8Wrapper::Set_Vertex_Buffer(dynamic_vb);
 		DX8Wrapper::Draw_Triangles(3*cur_poly_index,
 											(next_poly_index - cur_poly_index), // poly count
-											Polys[cur_poly_index].I, 
+											Polys[cur_poly_index].I,
 											1 + Polys[next_poly_index-1].K - Polys[cur_poly_index].I);
-		
+
 		cur_poly_index = next_poly_index;
 	}
 }
@@ -886,10 +886,10 @@ int SkinDecalMeshClass::Process_Material_Run(int start_index)
 	DX8Wrapper::Set_Shader(Shaders[start_index]);
 
 	int next_index = start_index;
-	while (	(next_index < Polys.Count()) && 
+	while (	(next_index < Polys.Count()) &&
 				(Textures[next_index] == Textures[start_index]) &&
 				(Shaders[next_index] == Shaders[start_index]) &&
-				(VertexMaterials[next_index] == VertexMaterials[start_index])) 
+				(VertexMaterials[next_index] == VertexMaterials[start_index]))
 	{
 		next_index++;
 	}
@@ -919,7 +919,7 @@ bool SkinDecalMeshClass::Create_Decal(DecalGeneratorClass * generator,
 
 	// The dynamically updated vertex locations are needed - we have no static geometry
 	WWASSERT(world_vertex_locs);
-	
+
 	/*
 	** If any polys were collected, add a new MeshDecalStruct
 	*/
@@ -933,7 +933,7 @@ bool SkinDecalMeshClass::Create_Decal(DecalGeneratorClass * generator,
 	newdecal.FaceCount = 0;												// init facecount to zero
 	newdecal.VertexStartIndex = ParentVertexIndices.Count();	// start vertices at the end of the current array
 	newdecal.VertexCount = 0;											// init vertcount to zero
-	
+
 	/*
 	** Grab pointers to the parent mesh's components
 	*/
@@ -944,12 +944,12 @@ bool SkinDecalMeshClass::Create_Decal(DecalGeneratorClass * generator,
 	** Grab a pointer to the material settings
 	*/
 	MaterialPassClass * material = generator->Get_Material();
-	
+
 	/*
 	** Set up the generator for the world coordinate system (the deformed vertices are in worldspace)
 	*/
 	generator->Set_Mesh_Transform(Matrix3D::Identity);
-	
+
 	/*
 	** Generate the faces and per-face info (remember to add-ref's)
 	** TODO: rewrite this to take advantage of vertex sharing...
@@ -959,7 +959,7 @@ bool SkinDecalMeshClass::Create_Decal(DecalGeneratorClass * generator,
 	for (i = 0; i < apt.Count(); i++) {
 		int offset = first_vert + i * 3;
 		Polys.Add(TriIndex(offset, offset + 1, offset + 2), face_size_hint);
-		
+
 		Shaders.Add(material->Peek_Shader(), face_size_hint);
 		Textures.Add(material->Get_Texture(), face_size_hint);		// Get_Texture gives us a reference...
 	}
@@ -1001,7 +1001,7 @@ bool SkinDecalMeshClass::Create_Decal(DecalGeneratorClass * generator,
 	*/
 	generator->Add_Mesh(Parent);
 
-#ifdef WWDEBUG	
+#ifdef WWDEBUG
 	/*
 	** Some paranoid debug code: ensure all tris have valid vertex indices
 	*/
@@ -1016,8 +1016,8 @@ bool SkinDecalMeshClass::Create_Decal(DecalGeneratorClass * generator,
 		WWASSERT (Polys[poly_idx].K >= 0);
 	}
 #endif
-	
-	// WWDEBUG_SAY(("Decal mesh now has: %d polys\r\n",Polys.Count()));
+
+	// WWDEBUG_SAY(("Decal mesh now has: %d polys",Polys.Count()));
 	return true;
 }
 
@@ -1054,7 +1054,7 @@ bool SkinDecalMeshClass::Delete_Decal(uint32 id)
 	DecalStruct * decal = &Decals[decal_index];
 
 	/*
-	** Remove all geometry used by this decal 
+	** Remove all geometry used by this decal
 	*/
 	Polys.Delete_Range(decal->FaceStartIndex, decal->FaceCount);
 	ParentVertexIndices.Delete_Range(decal->VertexStartIndex, decal->VertexCount);
@@ -1091,7 +1091,7 @@ bool SkinDecalMeshClass::Delete_Decal(uint32 id)
 	}
 	Decals.Delete(decal_index);
 
-#ifdef WWDEBUG	
+#ifdef WWDEBUG
 	/*
 	** Some paranoid debug code: ensure all tris have valid vertex indices
 	*/
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h
index dc8f4715e40..c09fa37cb51 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h
@@ -36,17 +36,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DECALMSH_H
-#define DECALMSH_H
 
 #include "always.h"
 #include "bittype.h"
 #include "simplevec.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "vector2.h"
 #include "vector3.h"
 #include "Vector3i.h"
@@ -79,7 +74,7 @@ class TextureClass;
 class DecalMeshClass : public RefCountClass
 {
 public:
-	
+
 	DecalMeshClass(MeshClass * parent,DecalSystemClass * system);
 	virtual ~DecalMeshClass(void);
 
@@ -106,7 +101,7 @@ class DecalMeshClass : public RefCountClass
 	void														Set_Next_Visible(DecalMeshClass * mesh) { NextVisible = mesh; }
 
 protected:
-	
+
 	/*
 	** Members
 	*/
@@ -124,7 +119,7 @@ class DecalMeshClass : public RefCountClass
 class RigidDecalMeshClass : public DecalMeshClass
 {
 public:
-	
+
 	RigidDecalMeshClass(MeshClass * parent,DecalSystemClass * system);
 	virtual ~RigidDecalMeshClass(void);
 
@@ -169,14 +164,14 @@ class RigidDecalMeshClass : public DecalMeshClass
 	** Decal Organization
 	*/
 	struct DecalStruct
-	{	
+	{
 		uint32	DecalID;
 		uint16	VertexStartIndex;
 		uint16	VertexCount;
 		uint16	FaceStartIndex;
 		uint16	FaceCount;
 	};
-	
+
 	SimpleDynVecClass<DecalStruct>					Decals;
 };
 
@@ -189,7 +184,7 @@ class RigidDecalMeshClass : public DecalMeshClass
 class SkinDecalMeshClass : public DecalMeshClass
 {
 public:
-	
+
 	SkinDecalMeshClass(MeshClass * parent,DecalSystemClass * system);
 	virtual ~SkinDecalMeshClass(void);
 
@@ -233,14 +228,14 @@ class SkinDecalMeshClass : public DecalMeshClass
 	** Decal Organization
 	*/
 	struct DecalStruct
-	{	
+	{
 		uint32	DecalID;
 		uint16	VertexStartIndex;
 		uint16	VertexCount;
 		uint16	FaceStartIndex;
 		uint16	FaceCount;
 	};
-	
+
 	SimpleDynVecClass<DecalStruct>					Decals;
 };
 
@@ -288,7 +283,3 @@ inline uint32 SkinDecalMeshClass::Get_Decal_ID(int decal_index)
 {
 	return Decals[decal_index].DecalID;
 }
-
-
-#endif //DECALMSH_H
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.cpp
index 035fddc23b3..c63442871a5 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Hector Yee                                                   *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 31                                                          $*
@@ -50,7 +50,7 @@ static StringClass CapsWorkString;
 #define DXLOG(n) CapsWorkString.Format n ; CapsLog+=CapsWorkString;
 #define COMPACTLOG(n) CapsWorkString.Format n ; CompactLog+=CapsWorkString;
 
-static const char* VendorNames[]={
+static const char* const VendorNames[]={
 	"Unknown",
 	"NVidia",
 	"ATI",
@@ -63,6 +63,7 @@ static const char* VendorNames[]={
 	"CirrusLogic",
 	"Rendition"
 };
+static_assert(ARRAY_SIZE(VendorNames) == DX8Caps::VENDOR_COUNT, "Incorrect array size");
 
 DX8Caps::VendorIdType DX8Caps::Define_Vendor(unsigned vendor_id)
 {
@@ -255,11 +256,11 @@ DX8Caps::DeviceTypeATI DX8Caps::Get_ATI_Device(unsigned device_id)
 	case 0x4C45:
 	case 0x4C46: return DEVICE_ATI_RAGE_128_MOBILITY_M3;
 
-	case 0x5041: 
-	case 0x5042: 
-	case 0x5043: 
-	case 0x5044: 
-	case 0x5045: 
+	case 0x5041:
+	case 0x5042:
+	case 0x5043:
+	case 0x5044:
+	case 0x5045:
 	case 0x5046: return DEVICE_ATI_RAGE_128_PRO_GL;
 
 	case 0x5047:
@@ -295,10 +296,10 @@ DX8Caps::DeviceTypeATI DX8Caps::Get_ATI_Device(unsigned device_id)
 
 	case 0x5157: return DEVICE_ATI_R7500;
 
-	case 0x5245: 
-	case 0x5246: 
-	case 0x534B: 
-	case 0x534C: 
+	case 0x5245:
+	case 0x5246:
+	case 0x534B:
+	case 0x534C:
 	case 0x534D: return DEVICE_ATI_RAGE_128_GL;
 
 	case 0x524B:
@@ -434,7 +435,7 @@ DX8Caps::DeviceTypeMatrox DX8Caps::Get_Matrox_Device(unsigned device_id)
 	default: return DEVICE_MATROX_UNKNOWN;
 	}
 }
- 
+
 DX8Caps::DeviceTypePowerVR DX8Caps::Get_PowerVR_Device(unsigned device_id)
 {
 	switch (device_id) {
@@ -465,8 +466,8 @@ DX8Caps::DeviceTypeIntel DX8Caps::Get_Intel_Device(unsigned device_id)
 
 DX8Caps::DX8Caps(
 	IDirect3D8* direct3d,
-	IDirect3DDevice8* D3DDevice, 
-	WW3DFormat display_format, 
+	IDirect3DDevice8* D3DDevice,
+	WW3DFormat display_format,
 	const D3DADAPTER_IDENTIFIER8& adapter_id)
 	:
 	Direct3D(direct3d),
@@ -479,8 +480,8 @@ DX8Caps::DX8Caps(
 
 DX8Caps::DX8Caps(
 	IDirect3D8* direct3d,
-	const D3DCAPS8& caps, 
-	WW3DFormat display_format, 
+	const D3DCAPS8& caps,
+	WW3DFormat display_format,
 	const D3DADAPTER_IDENTIFIER8& adapter_id)
 	:
 	Direct3D(direct3d),
@@ -491,7 +492,7 @@ DX8Caps::DX8Caps(
 	if ((Caps.DevCaps&D3DDEVCAPS_HWTRANSFORMANDLIGHT)==D3DDEVCAPS_HWTRANSFORMANDLIGHT) {
 		SupportTnL=true;
 	} else {
-		SupportTnL=false;			
+		SupportTnL=false;
 	}
 
 	Compute_Caps(display_format,adapter_id);
@@ -519,9 +520,9 @@ void DX8Caps::Init_Caps(IDirect3DDevice8* D3DDevice)
 		SupportTnL=true;
 
 		D3DDevice->SetRenderState(D3DRS_SOFTWAREVERTEXPROCESSING,FALSE);
-		DX8CALL(GetDeviceCaps(&Caps));	
+		DX8CALL(GetDeviceCaps(&Caps));
 	} else {
-		SupportTnL=false;			
+		SupportTnL=false;
 	}
 }
 
@@ -721,7 +722,7 @@ void DX8Caps::Check_Texture_Format_Support(WW3DFormat display_format,const D3DCA
 			if (SupportTextureFormat[i]) {
 				StringClass name(0,true);
 				Get_WW3D_Format_Name(format,name);
-				DXLOG(("Supports texture format: %s\r\n",name));
+				DXLOG(("Supports texture format: %s\r\n",name.str()));
 			}
 		}
 	}
@@ -753,7 +754,7 @@ void DX8Caps::Check_Render_To_Texture_Support(WW3DFormat display_format,const D3
 			if (SupportRenderToTextureFormat[i]) {
 				StringClass name(0,true);
 				Get_WW3D_Format_Name(format,name);
-				DXLOG(("Supports render-to-texture format: %s\r\n",name));
+				DXLOG(("Supports render-to-texture format: %s\r\n",name.str()));
 			}
 		}
 	}
@@ -765,9 +766,9 @@ void DX8Caps::Check_Render_To_Texture_Support(WW3DFormat display_format,const D3
 */
 void DX8Caps::Check_Depth_Stencil_Support(WW3DFormat display_format, const D3DCAPS8& caps)
 {
-	if (display_format==WW3D_FORMAT_UNKNOWN) 
+	if (display_format==WW3D_FORMAT_UNKNOWN)
 	{
-		for (unsigned i=0;i<WW3D_ZFORMAT_COUNT;++i) 
+		for (unsigned i=0;i<WW3D_ZFORMAT_COUNT;++i)
 		{
 			SupportDepthStencilFormat[i]=false;
 		}
@@ -775,14 +776,14 @@ void DX8Caps::Check_Depth_Stencil_Support(WW3DFormat display_format, const D3DCA
 	}
 
 	D3DFORMAT d3d_display_format=WW3DFormat_To_D3DFormat(display_format);
-	
-	for (unsigned i=0;i<WW3D_ZFORMAT_COUNT;++i) 
+
+	for (unsigned i=0;i<WW3D_ZFORMAT_COUNT;++i)
 	{
-		if (i==WW3D_ZFORMAT_UNKNOWN) 
+		if (i==WW3D_ZFORMAT_UNKNOWN)
 		{
 			SupportDepthStencilFormat[i]=false;
 		}
-		else 
+		else
 		{
 			WW3DZFormat format=(WW3DZFormat)i;
 			SupportDepthStencilFormat[i]=SUCCEEDED
@@ -798,11 +799,11 @@ void DX8Caps::Check_Depth_Stencil_Support(WW3DFormat display_format, const D3DCA
 				)
 			);
 
-			if (SupportDepthStencilFormat[i]) 
+			if (SupportDepthStencilFormat[i])
 			{
 				StringClass name(0,true);
 				Get_WW3D_ZFormat_Name(format,name);
-				DXLOG(("Supports depth stencil format: %s\r\n",name));
+				DXLOG(("Supports depth stencil format: %s\r\n",name.str()));
 			}
 		}
 	}
@@ -832,14 +833,14 @@ void DX8Caps::Check_Driver_Version_Status()
 		DriverVersionStatus=DRIVER_STATUS_BAD;
 		break;
 	case VENDOR_NVIDIA:
-		if (!stricmp(DriverDLL,"nv4.dll")) {
+		if (stricmp(DriverDLL,"nv4.dll") == 0) {
 			switch (DriverBuildVersion) {
 			case 327:	// 5.00.2165.327
 				DriverVersionStatus=DRIVER_STATUS_BAD;
 			}
 		}
 
-		if (!stricmp(DriverDLL,"nv4_disp.dll") || !stricmp(DriverDLL,"nvdd32.dll")) {
+		if (stricmp(DriverDLL,"nv4_disp.dll") == 0 || stricmp(DriverDLL,"nvdd32.dll") == 0) {
 			switch (DriverBuildVersion) {
 			// 23.11 Is known to be very unstable
 			case 2311:
@@ -901,7 +902,7 @@ void DX8Caps::Check_Driver_Version_Status()
 			}
 		}
 		// Elsa OEM drivers?
-		if (!stricmp(DriverDLL,"egdad.dll")) {
+		if (stricmp(DriverDLL,"egdad.dll") == 0) {
 			// We know of version 5.9.0.312 (asked MShelling if he the drivers seem ok)
 			switch (DriverBuildVersion) {
 			default:
@@ -912,7 +913,7 @@ void DX8Caps::Check_Driver_Version_Status()
 		}
 
 		// Elsa GLoria
-		if (!stricmp(DriverDLL,"egliid.dll")) {
+		if (stricmp(DriverDLL,"egliid.dll") == 0) {
 			switch (DriverBuildVersion) {
 			default:
 				DriverVersionStatus=DRIVER_STATUS_UNKNOWN;
@@ -923,12 +924,12 @@ void DX8Caps::Check_Driver_Version_Status()
 		}
 
 		// ASUS OEM drivers?
-		if (!stricmp(DriverDLL,"v66_disp.dll")) {
+		if (stricmp(DriverDLL,"v66_disp.dll") == 0) {
 		// TOMSS1: 5.0.2195.379
 		}
 		break;
 	case VENDOR_ATI:
-		if (!stricmp(DriverDLL,"ati2dvag.dll")) {
+		if (stricmp(DriverDLL,"ati2dvag.dll") == 0) {
 			switch (DriverBuildVersion) {
 			case 3287:
 				DriverVersionStatus=DRIVER_STATUS_UNKNOWN;
@@ -947,13 +948,13 @@ void DX8Caps::Check_Driver_Version_Status()
 				break;
 			}
 		}
-		if (!stricmp(DriverDLL,"atid32ae.dll")) {
+		if (stricmp(DriverDLL,"atid32ae.dll") == 0) {
 			switch (DriverBuildVersion) {
 			case 1010:
 				DriverVersionStatus=DRIVER_STATUS_OK;
 			}
 		}
-		if (!stricmp(DriverDLL,"ati3drai.dll")) {
+		if (stricmp(DriverDLL,"ati3drai.dll") == 0) {
 			switch (DriverBuildVersion) {
 			case 1119:
 				DriverVersionStatus=DRIVER_STATUS_UNKNOWN;
@@ -961,7 +962,7 @@ void DX8Caps::Check_Driver_Version_Status()
 		}
 		break;
 	case VENDOR_POWERVR:
-		if (!stricmp(DriverDLL,"pmx2hal.dll")) {
+		if (stricmp(DriverDLL,"pmx2hal.dll") == 0) {
 			switch (DriverBuildVersion) {
 			case 3111:	// Michael Ruppert - TESTIBM104
 			default: DriverVersionStatus=DRIVER_STATUS_UNKNOWN;
@@ -1005,7 +1006,7 @@ bool DX8Caps::Is_Valid_Display_Format(int width, int height, WW3DFormat format)
 
 void DX8Caps::Vendor_Specific_Hacks(const D3DADAPTER_IDENTIFIER8& adapter_id)
 {
-	if (VendorId==VENDOR_NVIDIA) 
+	if (VendorId==VENDOR_NVIDIA)
   {
 		if (SupportNPatches) {
 			DXLOG(("NVidia Driver reported N-Patch support, disabling.\r\n"));
@@ -1027,7 +1028,7 @@ void DX8Caps::Vendor_Specific_Hacks(const D3DADAPTER_IDENTIFIER8& adapter_id)
     if (DeviceId == DEVICE_NVIDIA_GEFORCE2_MX ||
         DeviceId == DEVICE_NVIDIA_GEFORCE2_MX_400 )
     {
-		  DXLOG(("Maximum screen resolution limited to 1024 x 768 on NVidia GeForce2 mx/mx400 cards\r\n"));			
+		  DXLOG(("Maximum screen resolution limited to 1024 x 768 on NVidia GeForce2 mx/mx400 cards\r\n"));
 		  MaxDisplayWidth=1024;
 		  MaxDisplayHeight=768;
     }
@@ -1049,7 +1050,7 @@ void DX8Caps::Vendor_Specific_Hacks(const D3DADAPTER_IDENTIFIER8& adapter_id)
 		// Rage Pro doesn't handle multitexturing well enough...
 		// It also doesn't really handle render-to-texture...
 		if (DeviceId==DEVICE_ATI_RAGE_PRO || DeviceId==DEVICE_ATI_RAGE_PRO_MOBILITY) {
-			DXLOG(("Disabling multitexturing on ATI Rage Pro\r\n"));			
+			DXLOG(("Disabling multitexturing on ATI Rage Pro\r\n"));
 			MaxTexturesPerPass=1;
 			CanDoMultiPass=false;
 
@@ -1083,7 +1084,7 @@ void DX8Caps::Vendor_Specific_Hacks(const D3DADAPTER_IDENTIFIER8& adapter_id)
 			DeviceId==DEVICE_ATI_RAGE_128_PRO_VR ||
 			DeviceId==DEVICE_ATI_RAGE_128_GL ||
 			DeviceId==DEVICE_ATI_RAGE_128_VR) {
-			DXLOG(("Maximum screen resolution limited to 1280 x 1024 on ATI Rage 128 cards\r\n"));			
+			DXLOG(("Maximum screen resolution limited to 1280 x 1024 on ATI Rage 128 cards\r\n"));
 			MaxDisplayWidth=1280;
 			MaxDisplayHeight=1024;
 			DXLOG(("ModAlphaAddClr disabled ATI Rage 128 cards (cannot put texture in 2nd arg)\r\n"));
@@ -1117,10 +1118,10 @@ void DX8Caps::Vendor_Specific_Hacks(const D3DADAPTER_IDENTIFIER8& adapter_id)
 		if (DeviceId==DEVICE_3DFX_VOODOO_3 ||
 			DeviceId==DEVICE_3DFX_BANSHEE ||
 			DeviceId==DEVICE_3DFX_VOODOO_2) {
-			DXLOG(("Disabling multitexturing on Voodoo2/Voodoo3/Banshee\r\n"));			
+			DXLOG(("Disabling multitexturing on Voodoo2/Voodoo3/Banshee\r\n"));
 			MaxTexturesPerPass=1;	// Especially important on Banshee (multitexturing crashes)!!!
 
-			DXLOG(("Maximum screen resolution limited to 1280 x 1024 on Voodoo2/Voodoo3/Banshee\r\n"));			
+			DXLOG(("Maximum screen resolution limited to 1280 x 1024 on Voodoo2/Voodoo3/Banshee\r\n"));
 			MaxDisplayWidth=1280;
 			MaxDisplayHeight=1024;
 		}
@@ -1134,7 +1135,7 @@ void DX8Caps::Vendor_Specific_Hacks(const D3DADAPTER_IDENTIFIER8& adapter_id)
 	}
 
 	if (VendorId==VENDOR_POWERVR) {
-		DXLOG(("Maximum screen resolution limited to 1280 x 1024 on PowerVR Kyro cards\r\n"));			
+		DXLOG(("Maximum screen resolution limited to 1280 x 1024 on PowerVR Kyro cards\r\n"));
 		MaxDisplayWidth=1280;
 		MaxDisplayHeight=1024;
 
@@ -1144,13 +1145,13 @@ void DX8Caps::Vendor_Specific_Hacks(const D3DADAPTER_IDENTIFIER8& adapter_id)
 
 	if (VendorId==VENDOR_S3) {
 		if (DeviceId==DEVICE_S3_SAVAGE_4) {
-			DXLOG(("Maximum screen resolution limited to 1024 x 768 on S3 Savage 4 cards\r\n"));			
+			DXLOG(("Maximum screen resolution limited to 1024 x 768 on S3 Savage 4 cards\r\n"));
 			MaxDisplayWidth=800;//1024;
 			MaxDisplayHeight=600;//768;
 		}
 
 		if (DeviceId==DEVICE_S3_SAVAGE_200) {
-			DXLOG(("Disabling multitexturing on S3 Savage 2000\r\n"));			
+			DXLOG(("Disabling multitexturing on S3 Savage 2000\r\n"));
 			MaxTexturesPerPass=1;
 			CanDoMultiPass=false;
 		}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h
index 3f8c689b002..88a1dba2621 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Hector Yee                                                   *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 24                                                          $*
@@ -37,12 +37,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef DX8CAPS_H
-#define DX8CAPS_H
 
 #include "always.h"
 #include "ww3dformat.h"
@@ -69,7 +64,9 @@ class DX8Caps
 		VENDOR_3DFX,
 		VENDOR_3DLABS,
 		VENDOR_CIRRUSLOGIC,
-		VENDOR_RENDITION
+		VENDOR_RENDITION,
+
+		VENDOR_COUNT
 	};
 
 	enum DeviceTypeATI {
@@ -212,7 +209,7 @@ class DX8Caps
 	static void Shutdown(void);
 
 	void Compute_Caps(WW3DFormat display_format, const D3DADAPTER_IDENTIFIER8& adapter_id);
-	bool Support_TnL() const { return SupportTnL; };	
+	bool Support_TnL() const { return SupportTnL; };
 	bool Support_DXTC() const { return SupportDXTC; }
 	bool Support_Gamma() const { return supportGamma; }
 	bool Support_NPatches() const { return SupportNPatches; }
@@ -287,7 +284,7 @@ class DX8Caps
 	int MaxDisplayHeight;
 
 	D3DCAPS8 Caps;
-	bool SupportTnL;	
+	bool SupportTnL;
 	bool SupportDXTC;
 	bool supportGamma;
 	bool SupportNPatches;
@@ -317,6 +314,3 @@ class DX8Caps
 	StringClass CapsLog;
 	StringClass CompactLog;
 };
-
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp
index 6552cec1a8b..3852472252e 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Jani Penttinen                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 5:06p                                             $*
  *                                                                                             *
  *                    $Revision:: 7                                                          $*
@@ -48,14 +48,14 @@ static unsigned Get_FVF_Vertex_Size(unsigned FVF)
 	return D3DXGetFVFVertexSize(FVF);
 }
 
-FVFInfoClass::FVFInfoClass(unsigned FVF_, unsigned vertex_size) 
+FVFInfoClass::FVFInfoClass(unsigned FVF_, unsigned vertex_size)
 	:
 	FVF(FVF_),
 	fvf_size(FVF!=0 ? Get_FVF_Vertex_Size(FVF) : vertex_size)
 {
 	location_offset=0;
 	blend_offset=location_offset;
-	
+
 	if ((FVF&D3DFVF_XYZ)==D3DFVF_XYZ) blend_offset+=3*sizeof(float);
 	normal_offset=blend_offset;
 
@@ -69,7 +69,7 @@ FVFInfoClass::FVFInfoClass(unsigned FVF_, unsigned vertex_size)
 	if ((FVF&D3DFVF_DIFFUSE)==D3DFVF_DIFFUSE) specular_offset+=sizeof(DWORD);
 	texcoord_offset[0]=specular_offset;
 
-	if ((FVF&D3DFVF_SPECULAR)==D3DFVF_SPECULAR) texcoord_offset[0]+=sizeof(DWORD);	
+	if ((FVF&D3DFVF_SPECULAR)==D3DFVF_SPECULAR) texcoord_offset[0]+=sizeof(DWORD);
 
 	for (unsigned int i=1; i<D3DDP_MAXTEXCOORD; i++)
 	{
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
index 1363ca70530..e9137e93013 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Jani Penttinen                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 5:06p                                             $*
  *                                                                                             *
  *                    $Revision:: 7                                                          $*
@@ -39,13 +39,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8_FVF_H
-#define DX8_FVF_H
 
 #include "always.h"
 #include <d3d8.h>
@@ -260,31 +254,28 @@ class FVFInfoClass : public W3DMPO
 	unsigned							location_offset;
 	unsigned							normal_offset;
 	unsigned							blend_offset;
-	unsigned							texcoord_offset[D3DDP_MAXTEXCOORD];	
+	unsigned							texcoord_offset[D3DDP_MAXTEXCOORD];
 	unsigned							diffuse_offset;
 	unsigned							specular_offset;
 public:
 	FVFInfoClass(unsigned FVF, unsigned vertex_size=0);
 
-	inline unsigned Get_Location_Offset() const { return location_offset; }
-	inline unsigned Get_Normal_Offset() const { return normal_offset; }
+	unsigned Get_Location_Offset() const { return location_offset; }
+	unsigned Get_Normal_Offset() const { return normal_offset; }
 #ifdef WWDEBUG
-	inline unsigned Get_Tex_Offset(unsigned int n) const { WWASSERT(n<D3DDP_MAXTEXCOORD); return texcoord_offset[n]; }	
+	inline unsigned Get_Tex_Offset(unsigned int n) const { WWASSERT(n<D3DDP_MAXTEXCOORD); return texcoord_offset[n]; }
 #else
-	inline unsigned Get_Tex_Offset(unsigned int n) const { return texcoord_offset[n]; }	
+	unsigned Get_Tex_Offset(unsigned int n) const { return texcoord_offset[n]; }
 #endif
 
-	inline unsigned Get_Diffuse_Offset() const { return diffuse_offset; }
-	inline unsigned Get_Specular_Offset() const { return specular_offset; }
-	inline unsigned Get_FVF() const { return FVF; }
-	inline unsigned Get_FVF_Size() const { return fvf_size; }
+	unsigned Get_Diffuse_Offset() const { return diffuse_offset; }
+	unsigned Get_Specular_Offset() const { return specular_offset; }
+	unsigned Get_FVF() const { return FVF; }
+	unsigned Get_FVF_Size() const { return fvf_size; }
 
 	void Get_FVF_Name(StringClass& fvfname) const;	// For debug purposes
 
 	// for enabling vertex shaders
-	inline void Set_FVF(unsigned fvf) const { FVF=fvf; }
-	inline void Set_FVF_Size(unsigned size) const { fvf_size=size; }
+	void Set_FVF(unsigned fvf) const { FVF=fvf; }
+	void Set_FVF_Size(unsigned size) const { fvf_size=size; }
 };
-
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp
index 3e237873b5e..12bd6d00682 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp
@@ -50,12 +50,12 @@
 static bool _DynamicSortingIndexArrayInUse=false;
 static SortingIndexBufferClass* _DynamicSortingIndexArray;
 static unsigned short _DynamicSortingIndexArraySize=0;
-static unsigned short _DynamicSortingIndexArrayOffset=0;	
+static unsigned short _DynamicSortingIndexArrayOffset=0;
 
 static bool _DynamicDX8IndexBufferInUse=false;
 static DX8IndexBufferClass* _DynamicDX8IndexBuffer=NULL;
 static unsigned short _DynamicDX8IndexBufferSize=DEFAULT_IB_SIZE;
-static unsigned short _DynamicDX8IndexBufferOffset=0;	
+static unsigned short _DynamicDX8IndexBufferOffset=0;
 
 static int _IndexBufferCount;
 static int _IndexBufferTotalIndices;
@@ -80,8 +80,8 @@ IndexBufferClass::IndexBufferClass(unsigned type_, unsigned short index_count_)
 	_IndexBufferTotalIndices+=index_count;
 	_IndexBufferTotalSize+=index_count*sizeof(unsigned short);
 #ifdef VERTEX_BUFFER_LOG
-	WWDEBUG_SAY(("New IB, %d indices, size %d bytes\n",index_count,index_count*sizeof(unsigned short)));
-	WWDEBUG_SAY(("Total IB count: %d, total %d indices, total size %d bytes\n",
+	WWDEBUG_SAY(("New IB, %d indices, size %d bytes",index_count,index_count*sizeof(unsigned short)));
+	WWDEBUG_SAY(("Total IB count: %d, total %d indices, total size %d bytes",
 		_IndexBufferCount,
 		_IndexBufferTotalIndices,
 		_IndexBufferTotalSize));
@@ -94,8 +94,8 @@ IndexBufferClass::~IndexBufferClass()
 	_IndexBufferTotalIndices-=index_count;
 	_IndexBufferTotalSize-=index_count*sizeof(unsigned short);
 #ifdef VERTEX_BUFFER_LOG
-	WWDEBUG_SAY(("Delete IB, %d indices, size %d bytes\n",index_count,index_count*sizeof(unsigned short)));
-	WWDEBUG_SAY(("Total IB count: %d, total %d indices, total size %d bytes\n",
+	WWDEBUG_SAY(("Delete IB, %d indices, size %d bytes",index_count,index_count*sizeof(unsigned short)));
+	WWDEBUG_SAY(("Total IB count: %d, total %d indices, total size %d bytes",
 		_IndexBufferCount,
 		_IndexBufferTotalIndices,
 		_IndexBufferTotalSize));
@@ -119,7 +119,7 @@ unsigned IndexBufferClass::Get_Total_Allocated_Memory()
 
 void IndexBufferClass::Add_Engine_Ref() const
 {
-	engine_refs++; 
+	engine_refs++;
 }
 
 void IndexBufferClass::Release_Engine_Ref() const
@@ -142,14 +142,14 @@ void IndexBufferClass::Copy(unsigned int* indices,unsigned first_index,unsigned
 		DX8IndexBufferClass::AppendLockClass l(this,first_index,count);
 		unsigned short* inds=l.Get_Index_Array();
 		for (unsigned v=0;v<count;++v) {
-			*inds++=unsigned short(*indices++);
+			*inds++=(unsigned short)(*indices++);
 		}
 	}
 	else {
 		DX8IndexBufferClass::WriteLockClass l(this);
 		unsigned short* inds=l.Get_Index_Array();
 		for (unsigned v=0;v<count;++v) {
-			*inds++=unsigned short(*indices++);
+			*inds++=(unsigned short)(*indices++);
 		}
 	}
 }
@@ -308,7 +308,7 @@ DX8IndexBufferClass::DX8IndexBufferClass(unsigned short index_count_,UsageType u
 		return;
 	}
 
-	WWDEBUG_SAY(("Index buffer creation failed, trying to release assets...\n"));
+	WWDEBUG_SAY(("Index buffer creation failed, trying to release assets..."));
 
 	// Vertex buffer creation failed, so try releasing least used textures and flushing the mesh cache.
 
@@ -327,7 +327,7 @@ DX8IndexBufferClass::DX8IndexBufferClass(unsigned short index_count_,UsageType u
 		&index_buffer);
 
 	if (SUCCEEDED(ret)) {
-		WWDEBUG_SAY(("...Index buffer creation succesful\n"));
+		WWDEBUG_SAY(("...Index buffer creation succesful"));
 	}
 
 	// If it still fails it is fatal
@@ -410,7 +410,7 @@ void DynamicIBAccessClass::_Deinit()
 	REF_PTR_RELEASE(_DynamicSortingIndexArray);
 	_DynamicSortingIndexArrayInUse=false;
 	_DynamicSortingIndexArraySize=0;
-	_DynamicSortingIndexArrayOffset=0;	
+	_DynamicSortingIndexArrayOffset=0;
 }
 
 // ----------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
index cdb1baba3e6..344815bb18b 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
@@ -36,16 +36,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8INDEXBUFFER_H
-#define DX8INDEXBUFFER_H
 
 #include "always.h"
 #include "wwdebug.h"
-#include "refcount.h"
 #include "sphere.h"
 
 class DX8Wrapper;
@@ -68,13 +62,13 @@ class IndexBufferClass : public W3DMPO, public RefCountClass
 	void Copy(unsigned int* indices,unsigned start_index,unsigned index_count);
 	void Copy(unsigned short* indices,unsigned start_index,unsigned index_count);
 
-	inline unsigned short Get_Index_Count() const { return index_count; }
+	unsigned short Get_Index_Count() const { return index_count; }
 
-	inline unsigned Type() const { return type; }
+	unsigned Type() const { return type; }
 
 	void Add_Engine_Ref() const;
 	void Release_Engine_Ref() const;
-	inline unsigned Engine_Refs() const { return engine_refs; }
+	unsigned Engine_Refs() const { return engine_refs; }
 
 	class WriteLockClass
 	{
@@ -119,7 +113,7 @@ class DynamicIBAccessClass : public W3DMPO
 	friend SortingRendererClass;
 
 	unsigned Type;
-	unsigned short IndexCount;	
+	unsigned short IndexCount;
 	unsigned short IndexBufferOffset;
 	IndexBufferClass* IndexBuffer;
 
@@ -144,7 +138,7 @@ class DynamicIBAccessClass : public W3DMPO
 	class WriteLockClass
 	{
 		DynamicIBAccessClass* DynamicIBAccess;
-		unsigned short* Indices;		
+		unsigned short* Indices;
 	public:
 		WriteLockClass(DynamicIBAccessClass* ib_access);
 		~WriteLockClass();
@@ -179,8 +173,8 @@ class DX8IndexBufferClass : public IndexBufferClass
 	void Copy(unsigned int* indices,unsigned start_index,unsigned index_count);
 	void Copy(unsigned short* indices,unsigned start_index,unsigned index_count);
 
-	inline IDirect3DIndexBuffer8* Get_DX8_Index_Buffer()	{ return index_buffer; }
-	
+	IDirect3DIndexBuffer8* Get_DX8_Index_Buffer()	{ return index_buffer; }
+
 private:
 	IDirect3DIndexBuffer8*	index_buffer;		// actual dx8 index buffer
 };
@@ -203,6 +197,3 @@ class SortingIndexBufferClass : public IndexBufferClass
 protected:
 	unsigned short* index_buffer;
 };
-
-#endif //DX8INDEXBUFFER_H
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp
index 30d751d93c0..ae773e36076 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 111                                                         $*
@@ -95,7 +95,7 @@ typedef MultiListIterator<PolyRemover>		PolyRemoverListIterator;
 ** for this frame.  Since MeshClass instances can share meshmodels
 ** (and therefore their dx8 polygon renderers) this record contains
 ** a pointer to the polygon renderer and the MeshClass instance that
-** it is being rendered for. 
+** it is being rendered for.
 */
 class PolyRenderTaskClass : public AutoPoolClass<PolyRenderTaskClass, 256>
 {
@@ -135,7 +135,7 @@ DEFINE_AUTO_POOL(PolyRenderTaskClass, 256);
 ** MatPassTaskClass
 ** This is the record of a material pass that needs to be rendered on
 ** a particular mesh.  These are linked into the FVF container which
-** contains the mesh model.  They are also pooled to remove memory 
+** contains the mesh model.  They are also pooled to remove memory
 ** allocation overhead.
 */
 class MatPassTaskClass : public AutoPoolClass<MatPassTaskClass, 256>
@@ -157,10 +157,10 @@ class MatPassTaskClass : public AutoPoolClass<MatPassTaskClass, 256>
 		MaterialPass->Release_Ref();
 		Mesh->Release_Ref();
 	}
-	
+
 	MaterialPassClass *	Peek_Material_Pass(void)							{ return MaterialPass; }
 	MeshClass *				Peek_Mesh(void)										{ return Mesh; }
-	
+
 	MatPassTaskClass *	Get_Next_Visible(void)								{ return NextVisible; }
 	void						Set_Next_Visible(MatPassTaskClass * mpr)		{ NextVisible = mpr; }
 
@@ -188,7 +188,7 @@ inline static bool Equal_Material(const VertexMaterialClass* mat1,const VertexMa
 DX8TextureCategoryClass::DX8TextureCategoryClass(
 	DX8FVFCategoryContainer* container_,
 	TextureClass** texs,
-	ShaderClass shd, 
+	ShaderClass shd,
 	VertexMaterialClass* mat,
 	int pass_)
 	:
@@ -201,7 +201,7 @@ DX8TextureCategoryClass::DX8TextureCategoryClass(
 	WWASSERT(pass>=0);
 	WWASSERT(pass<DX8FVFCategoryContainer::MAX_PASSES);
 
-	for (int a=0;a<MeshMatDescClass::MAX_TEX_STAGES;++a) 
+	for (int a=0;a<MeshMatDescClass::MAX_TEX_STAGES;++a)
 	{
 		textures[a]=NULL;
 		REF_PTR_SET(textures[a],texs[a]);
@@ -216,12 +216,14 @@ DX8TextureCategoryClass::~DX8TextureCategoryClass()
 	while (DX8PolygonRendererClass* p_renderer=PolygonRendererList.Get_Head()) {
 		TheDX8MeshRenderer.Unregister_Mesh_Type(p_renderer->Get_Mesh_Model_Class());
 	}
-	for (int a=0;a<MeshMatDescClass::MAX_TEX_STAGES;++a) 
+	for (int a=0;a<MeshMatDescClass::MAX_TEX_STAGES;++a)
 	{
 		REF_PTR_RELEASE(textures[a]);
 	}
 
 	REF_PTR_RELEASE(material);
+
+	DEBUG_ASSERTCRASH(render_task_head == NULL, ("~DX8TextureCategoryClass: Leaking render tasks"));
 }
 
 void DX8TextureCategoryClass::Add_Render_Task(DX8PolygonRendererClass * p_renderer,MeshClass * p_mesh)
@@ -296,10 +298,10 @@ void DX8FVFCategoryContainer::Render_Procedural_Material_Passes(void)
    	bool renderTasksRemaining=false;
 
 	while (mpr != NULL) {
-		SNAPSHOT_SAY(("Render_Procedural_Material_Pass\n"));
+		SNAPSHOT_SAY(("Render_Procedural_Material_Pass"));
 
    		MeshClass * mesh = mpr->Peek_Mesh();
-   	
+
    		if (mesh->Get_Base_Vertex_Offset() == VERTEX_BUFFER_OVERFLOW)	//check if this mesh is valid
    		{	//skip this mesh so it gets rendered later after vertices are filled in.
 	        last_mpr = mpr;
@@ -307,10 +309,10 @@ void DX8FVFCategoryContainer::Render_Procedural_Material_Passes(void)
    			renderTasksRemaining = true;
    			continue;
    		}
-	
+
 		mpr->Peek_Mesh()->Render_Material_Pass(mpr->Peek_Material_Pass(),index_buffer);
 		MatPassTaskClass * next_mpr = mpr->Get_Next_Visible();
-		
+
 		// remove from list, then delete
 		if (last_mpr == NULL) {
 			visible_matpass_head = next_mpr;
@@ -349,15 +351,15 @@ void DX8RigidFVFCategoryContainer::Render_Delayed_Procedural_Material_Passes(voi
 	DX8Wrapper::Set_Vertex_Buffer(vertex_buffer);
 	DX8Wrapper::Set_Index_Buffer(index_buffer,0);
 
-	SNAPSHOT_SAY(("DX8RigidFVFCategoryContainer::Render_Delayed_Procedural_Material_Passes()\n"));
+	SNAPSHOT_SAY(("DX8RigidFVFCategoryContainer::Render_Delayed_Procedural_Material_Passes()"));
 
 	// additional passes
 	MatPassTaskClass * mpr = delayed_matpass_head;
 	while (mpr != NULL) {
-	
+
 		mpr->Peek_Mesh()->Render_Material_Pass(mpr->Peek_Material_Pass(),index_buffer);
 		MatPassTaskClass * next_mpr = mpr->Get_Next_Visible();
-		
+
 		delete mpr;
 		mpr = next_mpr;
 	}
@@ -370,19 +372,18 @@ void DX8TextureCategoryClass::Log(bool only_visible)
 {
 #ifdef ENABLE_CATEGORY_LOG
 	StringClass work(255,true);
-	work.Format("	DX8TextureCategoryClass\n");
-	WWDEBUG_SAY((work));
+	work.Format("	DX8TextureCategoryClass");
 
 	StringClass work2(255,true);
 	for (int stage=0;stage<MeshMatDescClass::MAX_TEX_STAGES;++stage) {
-		work2.Format("	texture[%d]: %x (%s)\n", stage, textures[stage], textures[stage] ? textures[stage]->Get_Name() : "-");
+		work2.Format("\n	texture[%d]: %x (%s)", stage, textures[stage], textures[stage] ? textures[stage]->Get_Name() : "-");
 		work+=work2;
 	}
-	work2.Format("	material: %x (%s)\n	shader: %x\n", material, material ? material->Get_Name() : "-", shader);
+	work2.Format("\n	material: %x (%s)\n	shader: %x", material, material ? material->Get_Name() : "-", shader);
 	work+=work2;
 	WWDEBUG_SAY((work));
 
-	work.Format("	%8s %8s %6s %6s %6s %5s %s\n",
+	work.Format("	%8s %8s %6s %6s %6s %5s %s",
 		"idx_cnt",
 		"poly_cnt",
 		"i_offs",
@@ -394,7 +395,7 @@ void DX8TextureCategoryClass::Log(bool only_visible)
 
 	DX8PolygonRendererListIterator it(&PolygonRendererList);
 	while (!it.Is_Done()) {
-	
+
 		DX8PolygonRendererClass* p_renderer = it.Peek_Obj();
 
 		PolyRenderTaskClass * prtc=render_task_head;
@@ -489,7 +490,7 @@ DX8TextureCategoryClass* DX8FVFCategoryContainer::Find_Matching_Texture_Category
 
 DX8TextureCategoryClass* DX8FVFCategoryContainer::Find_Matching_Texture_Category(
 		VertexMaterialClass* vmat,
-		unsigned pass,		
+		unsigned pass,
 		DX8TextureCategoryClass* ref_category)
 {
 	// Find texture category which matches ref_category's properties but has 'vmat' on given pass
@@ -501,8 +502,8 @@ DX8TextureCategoryClass* DX8FVFCategoryContainer::Find_Matching_Texture_Category
 			dest_tex_category=dest_it.Peek_Obj();
 			bool all_textures_same = true;
 			for (unsigned int s = 0; s < MeshMatDescClass::MAX_TEX_STAGES; s++)
-				all_textures_same = all_textures_same && (dest_tex_category->Peek_Texture(s) == ref_category->Peek_Texture(s));			
-			if (all_textures_same &&				
+				all_textures_same = all_textures_same && (dest_tex_category->Peek_Texture(s) == ref_category->Peek_Texture(s));
+			if (all_textures_same &&
 				dest_tex_category->Get_Shader()==ref_category->Get_Shader()) {
 				return dest_tex_category;
 			}
@@ -531,7 +532,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Texture(
 	// and move them to destination category.
 	TextureCategoryListIterator src_it(&texture_category_list[pass]);
 	while (!src_it.Is_Done()) {
-		DX8TextureCategoryClass* src_tex_category=src_it.Peek_Obj();		
+		DX8TextureCategoryClass* src_tex_category=src_it.Peek_Obj();
 		if (src_tex_category->Peek_Texture(stage)==texture) {
 			foundtexture=true;
 			DX8PolygonRendererListIterator poly_it(&polygon_renderer_list);
@@ -540,7 +541,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Texture(
 				DX8PolygonRendererClass* polygon_renderer=poly_it.Peek_Obj();
 				DX8TextureCategoryClass *prc=polygon_renderer->Get_Texture_Category();
 
-				if (prc==src_tex_category) {					
+				if (prc==src_tex_category) {
 					DX8TextureCategoryClass* dest_tex_category=Find_Matching_Texture_Category(new_texture,pass,stage,src_tex_category);
 
 					if (!dest_tex_category) {
@@ -556,7 +557,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Texture(
 							src_tex_category->Get_Shader(),
 							const_cast<VertexMaterialClass*>(src_tex_category->Peek_Material()),
 							pass);
-		
+
 						/*
 						** Add the texture category object into the list, immediately after any existing
 						** texture category object which uses the same texture.  This will result in
@@ -583,16 +584,16 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Texture(
 					rem->src=src_tex_category;
 					rem->dest=dest_tex_category;
 					rem->pr=polygon_renderer;
-					prl.Add(rem);					
+					prl.Add(rem);
 				}
 				poly_it.Next();
-			} // while			
-		} //if src_texture==texture
+			}
+		}
 		else
 			// quit loop if we've got a texture change
 			if (foundtexture) break;
 		src_it.Next();
-	} // while
+	}
 
 	PolyRemoverListIterator prli(&prl);
 
@@ -600,7 +601,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Texture(
 	{
 		PolyRemover *rem=prli.Peek_Obj();
 		rem->src->Remove_Polygon_Renderer(rem->pr);
-		rem->dest->Add_Polygon_Renderer(rem->pr);		
+		rem->dest->Add_Polygon_Renderer(rem->pr);
 		prli.Remove_Current_Object();
 		delete rem;
 	}
@@ -625,7 +626,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Material(
 	TextureCategoryListIterator src_it(&texture_category_list[pass]);
 	while (!src_it.Is_Done()) {
 		DX8TextureCategoryClass* src_tex_category=src_it.Peek_Obj();
-		if (src_tex_category->Peek_Material()==vmat) {			
+		if (src_tex_category->Peek_Material()==vmat) {
 			DX8PolygonRendererListIterator poly_it(&polygon_renderer_list);
 			while (!poly_it.Is_Done()) {
 				// If source texture category contains polygon renderer, move to destination category
@@ -639,7 +640,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Material(
 						TextureClass * tmp_textures[MeshMatDescClass::MAX_TEX_STAGES];
 						for (int s=0;s<MeshMatDescClass::MAX_TEX_STAGES;++s) {
 							tmp_textures[s]=src_tex_category->Peek_Texture(s);
-						}						
+						}
 
 						DX8TextureCategoryClass * new_tex_category=W3DNEW DX8TextureCategoryClass(
 							this,
@@ -647,7 +648,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Material(
 							src_tex_category->Get_Shader(),
 							const_cast<VertexMaterialClass*>(new_vmat),
 							pass);
-		
+
 						/*
 						** Add the texture category object into the list, immediately after any existing
 						** texture category object which uses the same texture.  This will result in
@@ -677,12 +678,12 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Material(
 					prl.Add(rem);
 				}
 				poly_it.Next();
-			} // while			
-		} // if 
+			}
+		}
 		else
 			if (foundtexture) break;
 		src_it.Next();
-	} // while
+	}
 
 	PolyRemoverListIterator prli(&prl);
 
@@ -690,7 +691,7 @@ void DX8FVFCategoryContainer::Change_Polygon_Renderer_Material(
 	{
 		PolyRemover *rem=prli.Peek_Obj();
 		rem->src->Remove_Polygon_Renderer(rem->pr);
-		rem->dest->Add_Polygon_Renderer(rem->pr);		
+		rem->dest->Add_Polygon_Renderer(rem->pr);
 		prli.Remove_Current_Object();
 		delete rem;
 	}
@@ -714,7 +715,7 @@ unsigned DX8FVFCategoryContainer::Define_FVF(MeshModelClass* mmc,bool enable_lig
 	if (mmc->Get_Color_Array(1,false)) {
 		fvf|=D3DFVF_SPECULAR;
 	}
-	
+
 	switch (tex_coord_count) {
 	default:
 	case 0:
@@ -762,27 +763,27 @@ void DX8RigidFVFCategoryContainer::Log(bool only_visible)
 {
 #ifdef ENABLE_CATEGORY_LOG
 	StringClass work(255,true);
-	work.Format("DX8RigidFVFCategoryContainer --------------\n");
+	work.Format("DX8RigidFVFCategoryContainer --------------");
 	WWDEBUG_SAY((work));
 	if (vertex_buffer) {
 		StringClass fvfname(255,true);
 		vertex_buffer->FVF_Info().Get_FVF_Name(fvfname);
-		work.Format("VB size (used/total): %d/%d FVF: %s\n",used_vertices,vertex_buffer->Get_Vertex_Count(),fvfname);
+		work.Format("VB size (used/total): %d/%d FVF: %s",used_vertices,vertex_buffer->Get_Vertex_Count(),fvfname);
 		WWDEBUG_SAY((work));
 	}
 	else {
-		WWDEBUG_SAY(("EMPTY VB\n"));
+		WWDEBUG_SAY(("EMPTY VB"));
 	}
 	if (index_buffer) {
-		work.Format("IB size (used/total): %d/%d\n",used_indices,index_buffer->Get_Index_Count());
+		work.Format("IB size (used/total): %d/%d",used_indices,index_buffer->Get_Index_Count());
 		WWDEBUG_SAY((work));
 	}
 	else {
-		WWDEBUG_SAY(("EMPTY IB\n"));
+		WWDEBUG_SAY(("EMPTY IB"));
 	}
 
 	for (unsigned p=0;p<passes;++p) {
-		WWDEBUG_SAY(("Pass: %d\n",p));
+		WWDEBUG_SAY(("Pass: %d",p));
 
 		TextureCategoryListIterator it(&texture_category_list[p]);
 		while (!it.Is_Done()) {
@@ -808,13 +809,13 @@ void DX8RigidFVFCategoryContainer::Render(void)
 
 	DX8Wrapper::Set_Index_Buffer(index_buffer,0);
 
-	SNAPSHOT_SAY(("DX8RigidFVFCategoryContainer::Render()\n"));
+	SNAPSHOT_SAY(("DX8RigidFVFCategoryContainer::Render()"));
 	// The Z-biasing was causing more problems than they solved.
 	// Disabling it for now HY.
 	//int zbias=0;
 	//DX8Wrapper::Set_DX8_ZBias(zbias);
 	for (unsigned p=0;p<passes;++p) {
-		SNAPSHOT_SAY(("Pass: %d\n",p));
+		SNAPSHOT_SAY(("Pass: %d",p));
 		while (DX8TextureCategoryClass * tex = visible_texture_category_list[p].Remove_Head()) {
 			tex->Render();
 		}
@@ -838,7 +839,7 @@ bool DX8RigidFVFCategoryContainer::Check_If_Mesh_Fits(MeshModelClass* mmc)
 	unsigned required_polygons=mmc->Get_Polygon_Count();
 	if (mmc->Get_Gap_Filler()) {
 		required_polygons+=mmc->Get_Gap_Filler()->Get_Polygon_Count();
-	} 
+	}
 	unsigned required_indices=required_polygons*3*mmc->Get_Pass_Count();
 	unsigned available_indices=index_buffer->Get_Index_Count()-used_indices;
 	if (
@@ -966,7 +967,7 @@ class Vertex_Split_Table
 	{
 		if (mmc->Has_Shader_Array(pass)) {
 			ShaderClass shader;
-			
+
 			if (idx>=unsigned(mmc->Get_Polygon_Count())) {
 				WWASSERT(mmc->Get_Gap_Filler());
 				shader=mmc->Get_Gap_Filler()->Get_Shader_Array(pass)[idx-mmc->Get_Polygon_Count()];
@@ -1040,7 +1041,7 @@ void DX8RigidFVFCategoryContainer::Add_Mesh(MeshModelClass* mmc_)
 	for (i=0; i<split_table.Get_Vertex_Count(); i++)
 	{
 		*(Vector3*)(vb+fi.Get_Location_Offset())=locs[i];
-		
+
 		if ((FVF&D3DFVF_NORMAL)==D3DFVF_NORMAL && norms) {
 			*(Vector3*)(vb+fi.Get_Normal_Offset())=norms[i];
 		}
@@ -1052,7 +1053,7 @@ void DX8RigidFVFCategoryContainer::Add_Mesh(MeshModelClass* mmc_)
 				*(unsigned int*)(vb+fi.Get_Diffuse_Offset()) = 0xFFFFFFFF;
 			}
 		}
-		
+
 		if ((FVF&D3DFVF_SPECULAR)==D3DFVF_SPECULAR) {
 			if (specular) {
 				*(unsigned int*)(vb+fi.Get_Specular_Offset())=specular[i];
@@ -1063,7 +1064,7 @@ void DX8RigidFVFCategoryContainer::Add_Mesh(MeshModelClass* mmc_)
 
 		vb+=fi.Get_FVF_Size();
 	}
-	
+
 
 	/*
 	** Append the UV coordinates to the vertex buffer
@@ -1093,7 +1094,7 @@ void DX8RigidFVFCategoryContainer::Add_Mesh(MeshModelClass* mmc_)
 	if ((FVF&D3DFVF_TEX8) == D3DFVF_TEX8) {
 		uvcount = 8;
 	}
-	
+
 	for (int j=0; j<uvcount; j++) {
 		unsigned char *vb=(unsigned char*) l.Get_Vertex_Array();
 		const Vector2*uvs=split_table.Get_UV_Array(j);
@@ -1102,7 +1103,7 @@ void DX8RigidFVFCategoryContainer::Add_Mesh(MeshModelClass* mmc_)
 			{
 				*(Vector2*)(vb+fi.Get_Tex_Offset(j))=uvs[i];
 				vb+=fi.Get_FVF_Size();
-			}		
+			}
 		}
 	}
 
@@ -1141,10 +1142,10 @@ void DX8FVFCategoryContainer::Insert_To_Texture_Category(
 	}
 
 	if (!fit_in_existing_category) {
-		
+
 		DX8TextureCategoryClass * new_tex_category=W3DNEW DX8TextureCategoryClass(this,texs,shader,mat,pass);
 		used_indices+=new_tex_category->Add_Mesh(split_table,vertex_offset,used_indices,index_buffer,pass);
-		
+
 		/*
 		** Add the texture category object into the list, immediately after any existing
 		** texture category object which uses the same texture.  This will result in
@@ -1204,14 +1205,14 @@ struct Textures_Material_And_Shader_Booking_Struct
 void DX8FVFCategoryContainer::Generate_Texture_Categories(Vertex_Split_Table& split_table,unsigned vertex_offset)
 {
 	int polygon_count=split_table.Get_Polygon_Count();
-	int index_count=polygon_count*3*split_table.Get_Pass_Count(); 
+	int index_count=polygon_count*3*split_table.Get_Pass_Count();
 
 	/*
 	** If we don't have an index buffer yet, allocate one.  Make it hold at least 12000 entries,
-	** more if the mesh requires it.  
+	** more if the mesh requires it.
 	*/
 	if (!index_buffer) {
-		int ib_size=12000;  
+		int ib_size=12000;
 		if (ib_size<index_count) ib_size=index_count;
 		if (sorting) {
 			index_buffer=NEW_REF(SortingIndexBufferClass,(ib_size));
@@ -1232,7 +1233,7 @@ void DX8FVFCategoryContainer::Generate_Texture_Categories(Vertex_Split_Table& sp
 			TextureClass* textures[MeshMatDescClass::MAX_TEX_STAGES];
 			// disabled this assert as MAX_TEXTURE_STAGES is now 8, but legacy MeshMat::MAX_TEX_STAGES is still 2
 	//		WWASSERT(MAX_TEXTURE_STAGES==MeshMatDescClass::MAX_TEX_STAGES);
-			for (int stage=0;stage<MeshMatDescClass::MAX_TEX_STAGES;stage++) 
+			for (int stage=0;stage<MeshMatDescClass::MAX_TEX_STAGES;stage++)
 			{
 				textures[stage]=split_table.Peek_Texture(i,pass,stage);
 			}
@@ -1271,15 +1272,15 @@ void DX8SkinFVFCategoryContainer::Log(bool only_visible)
 {
 #ifdef ENABLE_CATEGORY_LOG
 	StringClass work(255,true);
-	work.Format("DX8SkinFVFCategoryContainer --------------\n");
+	work.Format("DX8SkinFVFCategoryContainer --------------");
 	WWDEBUG_SAY((work));
 
 	if (index_buffer) {
-		work.Format("IB size (used/total): %d/%d\n",used_indices,index_buffer->Get_Index_Count());
+		work.Format("IB size (used/total): %d/%d",used_indices,index_buffer->Get_Index_Count());
 		WWDEBUG_SAY((work));
 	}
 	else {
-		WWDEBUG_SAY(("EMPTY IB\n"));
+		WWDEBUG_SAY(("EMPTY IB"));
 	}
 
 	for (unsigned pass=0;pass<passes;++pass) {
@@ -1296,9 +1297,9 @@ void DX8SkinFVFCategoryContainer::Log(bool only_visible)
 
 void DX8SkinFVFCategoryContainer::Render(void)
 {
-	SNAPSHOT_SAY(("DX8SkinFVFCategoryContainer::Render()\n"));
+	SNAPSHOT_SAY(("DX8SkinFVFCategoryContainer::Render()"));
 	if (!Anything_To_Render()) {
-		SNAPSHOT_SAY(("Nothing to render\n"));
+		SNAPSHOT_SAY(("Nothing to render"));
 		return;
 	}
 	AnythingToRender=false;
@@ -1317,7 +1318,7 @@ void DX8SkinFVFCategoryContainer::Render(void)
 		sorting ? BUFFER_TYPE_DYNAMIC_SORTING : BUFFER_TYPE_DYNAMIC_DX8,
 		dynamic_fvf_type,
 		maxVertexCount);
-	SNAPSHOT_SAY(("DynamicVBAccess - %s - %d vertices\n",sorting ? "sorting" : "non-sorting",VisibleVertexCount));
+	SNAPSHOT_SAY(("DynamicVBAccess - %s - %d vertices",sorting ? "sorting" : "non-sorting",VisibleVertexCount));
 
 	unsigned int renderedVertexCount=0;
 
@@ -1350,7 +1351,7 @@ void DX8SkinFVFCategoryContainer::Render(void)
 		WWASSERT((vertex_offset+mesh_vertex_count)<=VisibleVertexCount);
 			DX8_RECORD_SKIN_RENDER(mesh->Get_Num_Polys(),mesh_vertex_count);
 
-				if (_TempVertexBuffer.Length() < mesh_vertex_count) _TempVertexBuffer.Resize(mesh_vertex_count); 
+				if (_TempVertexBuffer.Length() < mesh_vertex_count) _TempVertexBuffer.Resize(mesh_vertex_count);
 				if (_TempNormalBuffer.Length() < mesh_vertex_count) _TempNormalBuffer.Resize(mesh_vertex_count);
 
 				Vector3* loc=&(_TempVertexBuffer[0]);
@@ -1402,19 +1403,19 @@ void DX8SkinFVFCategoryContainer::Render(void)
 				mesh->Set_Base_Vertex_Offset(vertex_offset);
 				vertex_offset+=mesh_vertex_count;
 				renderedVertexCount += mesh_vertex_count;
-				
+
 				mesh = mesh->Peek_Next_Visible_Skin();
-			}	//while
-		}//lock
+			}
+		}
 
-		SNAPSHOT_SAY(("Set vb: %x ib: %x\n",vb,index_buffer));
+		SNAPSHOT_SAY(("Set vb: %x ib: %x",&vb.FVF_Info(),index_buffer));
 
 		DX8Wrapper::Set_Vertex_Buffer(vb);
 		DX8Wrapper::Set_Index_Buffer(index_buffer,0);
 
 		//Flush the meshes which fit in the vertex buffer, applying all texture variations
 		for (unsigned pass=0;pass<passes;++pass) {
-			SNAPSHOT_SAY(("Pass: %d\n",pass));
+			SNAPSHOT_SAY(("Pass: %d",pass));
 
 			TextureCategoryListIterator it(&visible_texture_category_list[pass]);
 			while (!it.Is_Done()) {
@@ -1424,7 +1425,7 @@ void DX8SkinFVFCategoryContainer::Render(void)
 		}
 
 		Render_Procedural_Material_Passes();
-	}//while
+	}
 
 	//remove all the rendered data from queues
 	for (unsigned pass=0;pass<passes;++pass) {
@@ -1452,7 +1453,7 @@ bool DX8SkinFVFCategoryContainer::Check_If_Mesh_Fits(MeshModelClass* mmc)
 	return false;
 }
 
-void DX8SkinFVFCategoryContainer::clearVisibleSkinList() 
+void DX8SkinFVFCategoryContainer::clearVisibleSkinList()
 {
 	while (VisibleSkinHead != NULL)
 	{
@@ -1464,11 +1465,11 @@ void DX8SkinFVFCategoryContainer::clearVisibleSkinList()
 	VisibleSkinTail = NULL;
 	VisibleVertexCount = 0;
 }
-void DX8SkinFVFCategoryContainer::Add_Visible_Skin(MeshClass * mesh) 
+void DX8SkinFVFCategoryContainer::Add_Visible_Skin(MeshClass * mesh)
 {
 	if (mesh->Peek_Next_Visible_Skin() != NULL || mesh == VisibleSkinTail)
 	{
-		DEBUG_CRASH(("Mesh %s is already a visible skin, and we tried to add it again... please notify Mark W or Steven J immediately!\n",mesh->Get_Name()));
+		DEBUG_CRASH(("Mesh %s is already a visible skin, and we tried to add it again... please notify Mark W or Steven J immediately!",mesh->Get_Name()));
 		return;
 	}
 	if (VisibleSkinHead == NULL)
@@ -1484,7 +1485,7 @@ void DX8SkinFVFCategoryContainer::Add_Visible_Skin(MeshClass * mesh)
 void DX8SkinFVFCategoryContainer::Reset()
 {
 	clearVisibleSkinList();
-	
+
 	for (unsigned pass=0;pass<passes;++pass) {
 		while (DX8TextureCategoryClass* texture_category=texture_category_list[pass].Peek_Head()) {
 			delete texture_category;
@@ -1603,12 +1604,12 @@ unsigned DX8TextureCategoryClass::Add_Mesh(
 					for (unsigned i=0;i<index_count;++i) {
 						unsigned short idx;
 
-						idx=unsigned short(strip[i+1]);
+						idx=(unsigned short)(strip[i+1]);
 						vmin=MIN(vmin,idx);
 						vmax=MAX(vmax,idx);
 						*dst_indices++=idx;
 					}
-					
+
 					/*
 					** Remember the min and max vertex indices that these polygons used (for optimization)
 					*/
@@ -1650,28 +1651,28 @@ unsigned DX8TextureCategoryClass::Add_Mesh(
 				if (all_textures_same && Equal_Material(mat,material) && shd==shader) {
 					unsigned short idx;
 
-					idx=unsigned short(src_indices[i][0]+vertex_offset);
+					idx=(unsigned short)(src_indices[i][0]+vertex_offset);
 					vmin=MIN(vmin,idx);
 					vmax=MAX(vmax,idx);
 					*dst_indices++=idx;
 //					WWDEBUG_SAY(("%d, ",idx));
 
-					idx=unsigned short(src_indices[i][1]+vertex_offset);
+					idx=(unsigned short)(src_indices[i][1]+vertex_offset);
 					vmin=MIN(vmin,idx);
 					vmax=MAX(vmax,idx);
 					*dst_indices++=idx;
 //					WWDEBUG_SAY(("%d, ",idx));
 
-					idx=unsigned short(src_indices[i][2]+vertex_offset);
+					idx=(unsigned short)(src_indices[i][2]+vertex_offset);
 					vmin=MIN(vmin,idx);
 					vmax=MAX(vmax,idx);
 					*dst_indices++=idx;
-//					WWDEBUG_SAY(("%d\n",idx));
+//					WWDEBUG_SAY(("%d",idx));
 				}
 			}
 
 			WWASSERT((vmax-vmin)<split_table.Get_Mesh_Model_Class()->Get_Vertex_Count());
-			
+
 			/*
 			** Remember the min and max vertex indices that these polygons used (for optimization)
 			*/
@@ -1691,9 +1692,9 @@ void DX8TextureCategoryClass::Render(void)
 	if (!WW3D::Expose_Prelit()) {
 	#endif
 
-		for (unsigned i=0;i<MeshMatDescClass::MAX_TEX_STAGES;++i) 
+		for (unsigned i=0;i<MeshMatDescClass::MAX_TEX_STAGES;++i)
 		{
-			SNAPSHOT_SAY(("Set_Texture(%d,%s)\n",i,Peek_Texture(i) ? Peek_Texture(i)->Get_Texture_Name().str() : "NULL"));
+			SNAPSHOT_SAY(("Set_Texture(%d,%s)",i,Peek_Texture(i) ? Peek_Texture(i)->Get_Texture_Name().str() : "NULL"));
 			DX8Wrapper::Set_Texture(i,Peek_Texture(i));
 		}
 
@@ -1701,11 +1702,11 @@ void DX8TextureCategoryClass::Render(void)
 	}
 	#endif
 
-	SNAPSHOT_SAY(("Set_Material(%s)\n",Peek_Material() ? Peek_Material()->Get_Name() : "NULL"));
+	SNAPSHOT_SAY(("Set_Material(%s)",Peek_Material() ? Peek_Material()->Get_Name() : "NULL"));
 	VertexMaterialClass *vmaterial=(VertexMaterialClass *)Peek_Material();	//ugly cast from const but we'll restore it after changes so okay. -MW
 	DX8Wrapper::Set_Material(vmaterial);
 
-	SNAPSHOT_SAY(("Set_Shader(%x)\n",Get_Shader()));
+	SNAPSHOT_SAY(("Set_Shader(%x)",Get_Shader().Get_Bits()));
 	ShaderClass theShader = Get_Shader();
 
 	//Setup an alpha blend version of this shader just in case it's needed. -MW
@@ -1742,7 +1743,7 @@ void DX8TextureCategoryClass::Render(void)
 		*/
 		DX8PolygonRendererClass * renderer = prt->Peek_Polygon_Renderer();
 		MeshClass * mesh = prt->Peek_Mesh();
-		
+
 		if (mesh->Get_Base_Vertex_Offset() == VERTEX_BUFFER_OVERFLOW)	//check if this mesh is valid
 		{	//skip this mesh so it gets rendered later after vertices are filled in.
 			last_prt = prt;
@@ -1751,9 +1752,9 @@ void DX8TextureCategoryClass::Render(void)
 			continue;
 		}
 
-		SNAPSHOT_SAY(("mesh = %s\n",mesh->Get_Name()));
+		SNAPSHOT_SAY(("mesh = %s",mesh->Get_Name()));
 
-		#ifdef WWDEBUG	
+		#ifdef WWDEBUG
 		// Debug rendering: if it exists, expose prelighting on this mesh by disabling all base textures.
 		if (WW3D::Expose_Prelit()) {
 			switch (mesh->Peek_Model()->Get_Flag (MeshGeometryClass::PRELIT_MASK)) {
@@ -1761,19 +1762,19 @@ void DX8TextureCategoryClass::Render(void)
 				unsigned i;
 
 				case MeshGeometryClass::PRELIT_VERTEX:
-					
+
 					// Disable texturing on all stages and passes.
-					for (i = 0; i < MeshMatDescClass::MAX_TEX_STAGES; i++) 
+					for (i = 0; i < MeshMatDescClass::MAX_TEX_STAGES; i++)
 					{
 						DX8Wrapper::Set_Texture (i, NULL);
 					}
 					break;
 
 				case MeshGeometryClass::PRELIT_LIGHTMAP_MULTI_PASS:
-					
+
 					// Disable texturing on all but the last pass.
 					if (pass == mesh->Peek_Model()->Get_Pass_Count() - 1) {
-						for (i = 0; i < MeshMatDescClass::MAX_TEX_STAGES; i++) 
+						for (i = 0; i < MeshMatDescClass::MAX_TEX_STAGES; i++)
 						{
 							DX8Wrapper::Set_Texture (i, Peek_Texture (i));
 						}
@@ -1785,17 +1786,17 @@ void DX8TextureCategoryClass::Render(void)
 					break;
 
 				case MeshGeometryClass::PRELIT_LIGHTMAP_MULTI_TEXTURE:
-					
+
 					// Disable texturing on all but the zeroth stage of each pass.
 					DX8Wrapper::Set_Texture (0, Peek_Texture (0));
-					for (i = 1; i < MeshMatDescClass::MAX_TEX_STAGES; i++) 
+					for (i = 1; i < MeshMatDescClass::MAX_TEX_STAGES; i++)
 					{
 						DX8Wrapper::Set_Texture (i, NULL);
 					}
 					break;
 
 				default:
-					for (i = 0; i < MeshMatDescClass::MAX_TEX_STAGES; i++) 
+					for (i = 0; i < MeshMatDescClass::MAX_TEX_STAGES; i++)
 					{
 						DX8Wrapper::Set_Texture (i, Peek_Texture (i));
 					}
@@ -1810,11 +1811,11 @@ void DX8TextureCategoryClass::Render(void)
 		*/
 		LightEnvironmentClass * lenv = mesh->Get_Lighting_Environment();
 		if (lenv != NULL) {
-			SNAPSHOT_SAY(("LightEnvironment, lights: %d\n",lenv->Get_Light_Count()));
+			SNAPSHOT_SAY(("LightEnvironment, lights: %d",lenv->Get_Light_Count()));
 			DX8Wrapper::Set_Light_Environment(lenv);
 		}
 		else {
-			SNAPSHOT_SAY(("No light environment\n"));
+			SNAPSHOT_SAY(("No light environment"));
 		}
 
 		/*
@@ -1825,11 +1826,11 @@ void DX8TextureCategoryClass::Render(void)
 		Matrix3D tmp_world;
 
 		if (mesh->Peek_Model()->Get_Flag(MeshModelClass::ALIGNED)) {
-			SNAPSHOT_SAY(("Camera mode ALIGNED\n"));
+			SNAPSHOT_SAY(("Camera mode ALIGNED"));
 
 			Vector3 mesh_position;
 			Vector3 camera_z_vector;
-			
+
 			TheDX8MeshRenderer.Peek_Camera()->Get_Transform().Get_Z_Vector(&camera_z_vector);
 			mesh->Get_Transform().Get_Translation(&mesh_position);
 
@@ -1837,8 +1838,8 @@ void DX8TextureCategoryClass::Render(void)
 			world_transform = &tmp_world;
 
 		} else if (mesh->Peek_Model()->Get_Flag(MeshModelClass::ORIENTED)) {
-			SNAPSHOT_SAY(("Camera mode ORIENTED\n"));
-		
+			SNAPSHOT_SAY(("Camera mode ORIENTED"));
+
 			Vector3 mesh_position;
 			Vector3 camera_position;
 
@@ -1847,10 +1848,10 @@ void DX8TextureCategoryClass::Render(void)
 
 			tmp_world.Obj_Look_At(mesh_position,camera_position,0.0f);
 			world_transform = &tmp_world;
-		
+
 		} else if (mesh->Peek_Model()->Get_Flag(MeshModelClass::SKIN)) {
-			SNAPSHOT_SAY(("Set world identity (for skin)\n"));
-			
+			SNAPSHOT_SAY(("Set world identity (for skin)"));
+
 			tmp_world.Make_Identity();
 			world_transform = &tmp_world;
 			identity=true;
@@ -1858,15 +1859,15 @@ void DX8TextureCategoryClass::Render(void)
 
 
 		if (identity) {
-			SNAPSHOT_SAY(("Set_World_Identity\n"));
+			SNAPSHOT_SAY(("Set_World_Identity"));
 			DX8Wrapper::Set_World_Identity();
 		}
 		else {
-			SNAPSHOT_SAY(("Set_World_Transform\n"));
+			SNAPSHOT_SAY(("Set_World_Transform"));
 			DX8Wrapper::Set_Transform(D3DTS_WORLD,*world_transform);
 		}
 
-		
+
 //--------------------------------------------------------------------
 		if (mesh->Get_ObjectScale() != 1.0f)
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_NORMALIZENORMALS, TRUE);
@@ -1927,7 +1928,7 @@ void DX8TextureCategoryClass::Render(void)
 				}
 				DX8Wrapper::Set_Material(NULL);	//force a reset of vertex material since we secretly changed opacity
 				DX8Wrapper::Set_Material(vmaterial);	//restore previous material.
-			} 
+			}
 			else
 				renderer->Render(mesh->Get_Base_Vertex_Offset());
 		}
@@ -1939,7 +1940,7 @@ void DX8TextureCategoryClass::Render(void)
 
 
 
-        } // (gth) non-tabbed to aviod per-force merge problems...
+        }
 
 		/*
 		** Move to the next render task.  Note that the delete should be fast because prt's are pooled
@@ -1958,11 +1959,22 @@ void DX8TextureCategoryClass::Render(void)
 	}
 
 	if (!renderTasksRemaining)
-	{	WWASSERT(!render_task_head);
+	{
+		WWASSERT(!render_task_head);
 		Clear_Render_List();
 	}
 }
 
+void DX8TextureCategoryClass::Clear_Render_List()
+{
+	while (render_task_head != NULL)
+	{
+		PolyRenderTaskClass* next = render_task_head->Get_Next_Visible();
+		delete render_task_head;
+		render_task_head = next;
+	}
+}
+
 
 DX8MeshRendererClass::DX8MeshRendererClass()
 	:
@@ -1975,22 +1987,20 @@ DX8MeshRendererClass::DX8MeshRendererClass()
 
 DX8MeshRendererClass::~DX8MeshRendererClass()
 {
-	Invalidate(true);
-	Clear_Pending_Delete_Lists();
-	if (texture_category_container_list_skin != NULL) {
-		delete texture_category_container_list_skin;
-	}
+	Shutdown();
 }
 
 void DX8MeshRendererClass::Init(void)
 {
-	// DMS - Only allocate one if we havent already (leak fix)
+	// DMS - Only allocate one if we have not already (leak fix)
 	if(!texture_category_container_list_skin)
 		texture_category_container_list_skin = W3DNEW FVFCategoryList;
 }
 
 void DX8MeshRendererClass::Shutdown(void)
 {
+	camera = NULL;
+	visible_decal_meshes = NULL;
 	Invalidate(true);
 	Clear_Pending_Delete_Lists();
 	_TempVertexBuffer.Clear();	//free memory
@@ -2055,7 +2065,7 @@ void DX8MeshRendererClass::Register_Mesh_Type(MeshModelClass* mmc)
 {
 	WWMEMLOG(MEM_GEOMETRY);
 #ifdef ENABLE_CATEGORY_LOG
-	WWDEBUG_SAY(("Registering mesh: %s (%d polys, %d verts + %d gap polygons)\n",mmc->Get_Name(),mmc->Get_Polygon_Count(),mmc->Get_Vertex_Count(),mmc->Get_Gap_Filler_Polygon_Count()));
+	WWDEBUG_SAY(("Registering mesh: %s (%d polys, %d verts + %d gap polygons)",mmc->Get_Name(),mmc->Get_Polygon_Count(),mmc->Get_Vertex_Count(),mmc->Get_Gap_Filler_Polygon_Count()));
 #endif
 	bool skin=(mmc->Get_Flag(MeshModelClass::SKIN) && mmc->VertexBoneLink);
 	bool sorting=((!!mmc->Get_Flag(MeshModelClass::SORT)) && WW3D::Is_Sorting_Enabled() && (mmc->Get_Sort_Level() == SORT_LEVEL_NONE));
@@ -2080,7 +2090,7 @@ void DX8MeshRendererClass::Register_Mesh_Type(MeshModelClass* mmc)
 		DX8FVFCategoryContainer * new_container=W3DNEW DX8SkinFVFCategoryContainer(sorting);
 		texture_category_container_list_skin->Add_Tail(new_container);
 		new_container->Add_Mesh(mmc);
-	
+
 	} else {
 
 		/*
@@ -2127,7 +2137,7 @@ void DX8MeshRendererClass::Register_Mesh_Type(MeshModelClass* mmc)
 				_RegisteredMeshList.Add_Tail(mmc);
 			}
 			else {
-				WWDEBUG_SAY(("Error: Register_Mesh_Type failed! file: %s line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Error: Register_Mesh_Type failed! file: %s line: %d",__FILE__,__LINE__));
 			}
 		}
 	}
@@ -2173,10 +2183,10 @@ void DX8MeshRendererClass::Flush(void)
 
 	WWPROFILE("DX8MeshRenderer::Flush");
 	if (!camera) return;
-	Log_Statistics_String(true);	
+	Log_Statistics_String(true);
 
 	/*
-	** Render the FVF categories.  Note that it is critical that skins be 
+	** Render the FVF categories.  Note that it is critical that skins be
 	** rendered *after* the rigid meshes.  This is caused by the fact that an object may
 	** have its base passes disabled and a translucent procedural material pass rendered
 	** instead.  In this case, technically we have to delay rendering of the material pass but
@@ -2194,7 +2204,7 @@ void DX8MeshRendererClass::Flush(void)
 
 	/*
 	** Render the translucent procedural material passes that were applied to meshes that
-	** had their base passes disabled. 
+	** had their base passes disabled.
 	*/
 	for (i=0;i<texture_category_container_lists_rigid.Count();++i) {
 		Render_FVF_Category_Container_List_Delayed_Passes(*texture_category_container_lists_rigid[i]);
@@ -2218,7 +2228,7 @@ void DX8MeshRendererClass::Render_Decal_Meshes(void)
 	if (!decal_mesh) return;
 
 	DX8Wrapper::Set_DX8_Render_State(D3DRS_ZBIAS,8);
-	
+
 	while (decal_mesh != NULL) {
 		decal_mesh->Render();
 		decal_mesh = decal_mesh->Peek_Next_Visible();
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h
index 048ed8ec7df..c040eee6ea4 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Jani Penttinen                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 29                                                          $*
@@ -37,19 +37,12 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8_RENDERER_H
-#define DX8_RENDERER_H
 
 #include "always.h"
 #include "wwstring.h"
 #include "simplevec.h"
-#include "refcount.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "dx8list.h"
 #include "shader.h"
 #include "dx8wrapper.h"
@@ -85,9 +78,9 @@ class DX8TextureCategoryClass : public MultiListObjectClass
 	int												pass;
 	TextureClass *									textures[MeshMatDescClass::MAX_TEX_STAGES];
 	ShaderClass										shader;
-	VertexMaterialClass *						material;					
+	VertexMaterialClass *						material;
 	DX8PolygonRendererList						PolygonRendererList;
-	DX8FVFCategoryContainer*					container;	
+	DX8FVFCategoryContainer*					container;
 
 	PolyRenderTaskClass *						render_task_head;			// polygon renderers queued for rendering
 	static bool											m_gForceMultiply;  // Forces opaque materials to use the multiply blend - pseudo transparent effect.  jba.
@@ -101,10 +94,10 @@ class DX8TextureCategoryClass : public MultiListObjectClass
 
 	void									Render(void);
 	bool									Anything_To_Render() { return (render_task_head != NULL); }
-	void									Clear_Render_List() { render_task_head = NULL; }
+	void									Clear_Render_List();
 
 	TextureClass *						Peek_Texture(int stage)	{ return textures[stage]; }
-	const VertexMaterialClass *	Peek_Material() { return material; }	
+	const VertexMaterialClass *	Peek_Material() { return material; }
 	ShaderClass							Get_Shader() { return shader; }
 
 	DX8PolygonRendererList&			Get_Polygon_Renderer_List() { return PolygonRendererList; }
@@ -119,7 +112,7 @@ class DX8TextureCategoryClass : public MultiListObjectClass
 
 	void Remove_Polygon_Renderer(DX8PolygonRendererClass* p_renderer);
 	void Add_Polygon_Renderer(DX8PolygonRendererClass* p_renderer,DX8PolygonRendererClass* add_after_this=NULL);
-	
+
 
 	DX8FVFCategoryContainer * Get_Container(void) { return container; }
 
@@ -144,7 +137,7 @@ class DX8FVFCategoryContainer : public MultiListObjectClass
 
 	TextureCategoryList									texture_category_list[MAX_PASSES];
 	TextureCategoryList									visible_texture_category_list[MAX_PASSES];
-	
+
 	MatPassTaskClass *									visible_matpass_head;
 	MatPassTaskClass *									visible_matpass_tail;
 
@@ -166,8 +159,8 @@ class DX8FVFCategoryContainer : public MultiListObjectClass
 		int pass,
 		unsigned vertex_offset);
 
-	inline bool Anything_To_Render()					{ return AnythingToRender; }
-	inline bool Any_Delayed_Passes_To_Render()	{ return AnyDelayedPassesToRender; }
+	bool Anything_To_Render()					{ return AnythingToRender; }
+	bool Any_Delayed_Passes_To_Render()	{ return AnyDelayedPassesToRender; }
 
 	void Render_Procedural_Material_Passes(void);
 
@@ -179,11 +172,11 @@ class DX8FVFCategoryContainer : public MultiListObjectClass
 
 	DX8TextureCategoryClass* Find_Matching_Texture_Category(
 		VertexMaterialClass* vmat,
-		unsigned pass,		
+		unsigned pass,
 		DX8TextureCategoryClass* ref_category);
 
 public:
-	
+
 	DX8FVFCategoryContainer(unsigned FVF,bool sorting);
 	virtual ~DX8FVFCategoryContainer();
 
@@ -210,9 +203,9 @@ class DX8FVFCategoryContainer : public MultiListObjectClass
 	virtual void Log(bool only_visible)=0;
 	virtual bool Check_If_Mesh_Fits(MeshModelClass* mmc)=0;
 
-	inline unsigned Get_FVF() const { return FVF; }
-	
-	inline void Add_Visible_Texture_Category(DX8TextureCategoryClass * tex_category,int pass) 
+	unsigned Get_FVF() const { return FVF; }
+
+	void Add_Visible_Texture_Category(DX8TextureCategoryClass * tex_category,int pass)
 	{
 		WWASSERT(pass<MAX_PASSES);
 		WWASSERT(tex_category != NULL);
@@ -225,8 +218,8 @@ class DX8FVFCategoryContainer : public MultiListObjectClass
 	** Material pass rendering.  The following two functions allow procedural material passes
 	** to be applied to meshes in this FVF category.  In certain cases, the game will *only* render
 	** the procedural pass and not the base materials for the mesh.  When this happens there can
-	** be rendering errors unless these procedural passes are rendered after all of the meshes in 
-	** the scene.  The virtual method Add_Delayed_Material_Pass is used in this case.  
+	** be rendering errors unless these procedural passes are rendered after all of the meshes in
+	** the scene.  The virtual method Add_Delayed_Material_Pass is used in this case.
 	*/
 	void Add_Visible_Material_Pass(MaterialPassClass * pass,MeshClass * mesh);
 	virtual void Add_Delayed_Visible_Material_Pass(MaterialPassClass * pass, MeshClass * mesh) = 0;
@@ -250,8 +243,8 @@ class DX8RigidFVFCategoryContainer : public DX8FVFCategoryContainer
 
 	void Render(void);	// Generic render function
 
-	/* 
-	** This method adds a material pass which must be rendered after all of the other rendering is complete. 
+	/*
+	** This method adds a material pass which must be rendered after all of the other rendering is complete.
 	** This is needed whenever a mesh turns off its base passes and renders a translucent pass on its geometry.
 	*/
 	virtual void Add_Delayed_Visible_Material_Pass(MaterialPassClass * pass, MeshClass * mesh);
@@ -286,7 +279,7 @@ class DX8SkinFVFCategoryContainer: public DX8FVFCategoryContainer
 
 	void Add_Visible_Skin(MeshClass * mesh);
 
-	/* 
+	/*
 	** Since skins are already rendered after the rigid meshes, the Add_Delayed_Material_Pass function simply
 	** routes into the Add_Visible_Material_Pass method and no extra overhead is added.
 	*/
@@ -309,7 +302,7 @@ class DX8SkinFVFCategoryContainer: public DX8FVFCategoryContainer
 /**
 ** DX8MeshRendererClass
 ** This object is controller for the entire DX8 mesh rendering system.  It organizes mesh
-** fragments into groups based on FVF, texture, and material.  During rendering, a list of 
+** fragments into groups based on FVF, texture, and material.  During rendering, a list of
 ** the visible mesh fragments is composed and rendered.  There is a global instance of this
 ** class called TheDX8MeshRenderer that should be used for all mesh rendering.
 */
@@ -356,5 +349,3 @@ class DX8MeshRendererClass
 };
 
 extern DX8MeshRendererClass TheDX8MeshRenderer;
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h
index a78c8f2be16..555e654d70c 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h
@@ -36,13 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8_RENDERER_DEBUGGER_H
-#define DX8_RENDERER_DEBUGGER_H
 
 #include "always.h"
 
@@ -71,5 +65,3 @@ class DX8RendererDebugger
 	static void Disable_All();
 	static void Enable_All();
 };
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.cpp
deleted file mode 100644
index 61cc0a99529..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : DX8 Texture Manager                                          *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/dx8texman.cpp                          $*
- *                                                                                             *
- *              Original Author:: Hector Yee                                                   *
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 06/27/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 4                                                           $*
- *                                                                                             *
- * 06/27/02 KM Texture class abstraction																			*
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *   DX8TextureManagerClass::Shutdown -- Shuts down the texture manager                        *
- *   DX8TextureManagerClass::Add -- Adds a texture to be managed                               *
- *   DX8TextureManagerClass::Remove -- Removes a texture from being managed                    *
- *   DX8TextureManagerClass::Release_Textures -- Releases the internal d3d texture             *
- *   DX8TextureManagerClass::Recreate_Textures -- Reallocates lost textures                    *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-// This class manages textures that are in the default pool
-// ensuring that they are released on device loss
-// and created on device reset
-
-// Note: It does NOT addref to textures because it is called in the texture
-// destructor
-
-#include "dx8texman.h"
-
-TextureTrackerList DX8TextureManagerClass::Managed_Textures;
-
-
-/***********************************************************************************************
- * DX8TextureManagerClass::Shutdown -- Shuts down the texture manager                          *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/25/2001  hy : Created.                                                                  *
- *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
- *=============================================================================================*/
-void DX8TextureManagerClass::Shutdown()
-{
-	while (!Managed_Textures.Is_Empty())
-	{
-		TextureTrackerClass *track=Managed_Textures.Remove_Head();
-		delete track;
-		track=NULL;
-	}
-}
-
-/***********************************************************************************************
- * DX8TextureManagerClass::Add -- Adds a texture to be managed                                 *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/25/2001  hy : Created.                                                                  *
- *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
- *=============================================================================================*/
-void DX8TextureManagerClass::Add(TextureTrackerClass *track)
-{
-	// this function should only be called by the texture constructor
-	Managed_Textures.Add(track);
-}
-
-
-/***********************************************************************************************
- * DX8TextureManagerClass::Remove -- Removes a texture from being managed                      *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/25/2001  hy : Created.                                                                  *
- *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
- *=============================================================================================*/
-void DX8TextureManagerClass::Remove(TextureBaseClass *tex)
-{
-	// this function should only be called by the texture destructor
-	TextureTrackerListIterator it(&Managed_Textures);
-
-	while (!it.Is_Done())
-	{
-		TextureTrackerClass *track=it.Peek_Obj();		
-		if (track->Get_Texture()==tex)
-		{			
-			it.Remove_Current_Object();
-			delete track;
-			break;
-		}
-		it.Next();
-	}
-}
-
-
-/***********************************************************************************************
- * DX8TextureManagerClass::Release_Textures -- Releases the internal d3d texture               *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/25/2001  hy : Created.                                                                  *
- *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
- *=============================================================================================*/
-void DX8TextureManagerClass::Release_Textures()
-{
-	TextureTrackerListIterator it(&Managed_Textures);
-
-	while (!it.Is_Done())
-	{
-		TextureTrackerClass *track=it.Peek_Obj();		
-		track->Release();
-		it.Next();
-	}
-}
-
-
-/***********************************************************************************************
- * DX8TextureManagerClass::Recreate_Textures -- Reallocates lost textures                      *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/25/2001  hy : Created.                                                                  *
- *   5/16/2002  km : Added depth stencil texture tracking and abstraction                      *
- *=============================================================================================*/
-void DX8TextureManagerClass::Recreate_Textures()
-{
-	TextureTrackerListIterator it(&Managed_Textures);
-
-	while (!it.Is_Done())
-	{
-		TextureTrackerClass *track=it.Peek_Obj();
-		track->Recreate();
-		track->Get_Texture()->Set_Dirty();
-		it.Next();
-	}
-}
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h
deleted file mode 100644
index c2142279992..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : DX8 Texture Manager                                          *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/dx8texman.h                            $*
- *                                                                                             *
- *              Original Author:: Hector Yee                                                   *
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 06/27/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 4                                                           $*
- *                                                                                             *
- * 06/27/02 KM Texture class abstraction																			*
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef DX8TEXTUREMANAGER_H
-#define DX8TEXTUREMANAGER_H
-
-#include "always.h"
-#include "texture.h"
-#include "dx8wrapper.h"
-#include "ww3dformat.h"
-#include "dx8list.h"
-#include "ww3dformat.h"
-#include "multilist.h"
-
-class DX8TextureManagerClass;
-
-class TextureTrackerClass : public MultiListObjectClass
-{
-public:
-	TextureTrackerClass
-	(
-		unsigned int w, 
-		unsigned int h, 
-		MipCountType count,
-		TextureBaseClass *tex
-	)
-	: Width(w),
-	  Height(h),
-	  Mip_level_count(count),
-	  Texture(tex)
-	{
-	}
-
-	virtual void Recreate() const =0;
-
-	void Release()
-	{
-		Texture->Set_D3D_Base_Texture(NULL);
-	}
-
-	TextureBaseClass* Get_Texture() const { return Texture; }
-
-
-protected:
-
-	unsigned int Width;
-	unsigned int Height;
-	MipCountType Mip_level_count;
-	TextureBaseClass *Texture;
-};
-
-class DX8TextureTrackerClass : public TextureTrackerClass
-{
-public:
-	DX8TextureTrackerClass
-	(
-		unsigned int w, 
-		unsigned int h, 
-		WW3DFormat format,
-		MipCountType count,
-		TextureBaseClass *tex,
-		bool rt
-	) 
-	: TextureTrackerClass(w,h,count,tex), Format(format), RenderTarget(rt)
-	{
-	}
-
-	virtual void Recreate() const
-	{
-		WWASSERT(Texture->Peek_D3D_Base_Texture()==NULL);
-		Texture->Poke_Texture
-		(
-			DX8Wrapper::_Create_DX8_Texture
-			(
-				Width,
-				Height,
-				Format,
-				Mip_level_count,
-				D3DPOOL_DEFAULT,
-				RenderTarget
-			)
-		);
-	}
-
-private:
-	WW3DFormat Format;
-	bool RenderTarget;
-};
-
-class DX8ZTextureTrackerClass : public TextureTrackerClass
-{
-public:
-	DX8ZTextureTrackerClass
-	(
-		unsigned int w,
-		unsigned int h,
-		WW3DZFormat zformat,
-		MipCountType count,
-		TextureBaseClass* tex
-	)
-	: TextureTrackerClass(w,h,count,tex), ZFormat(zformat)
-	{
-	}
-
-	virtual void Recreate() const
-	{
-		WWASSERT(Texture->Peek_D3D_Base_Texture()==NULL);
-		Texture->Poke_Texture
-		(
-			DX8Wrapper::_Create_DX8_ZTexture
-			(
-				Width,
-				Height,
-				ZFormat,
-				Mip_level_count,
-				D3DPOOL_DEFAULT
-			)
-		);
-	}
-
-
-private:
-	WW3DZFormat ZFormat;
-};
-
-
-class DX8TextureManagerClass
-{
-public:
-	static void Shutdown();
-	static void Add(TextureTrackerClass *track);
-	static void Remove(TextureBaseClass *tex);
-	static void Release_Textures();
-	static void Recreate_Textures();
-private:
-	static TextureTrackerList Managed_Textures;
-};
-
-#endif // ifdef TEXTUREMANAGER
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp
index 9c155892953..db1b697aa1c 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Jani Penttinen                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 5:06p                                             $*
  *                                                                                             *
  *                    $Revision:: 39                                                          $*
@@ -53,7 +53,7 @@ static bool _DynamicSortingVertexArrayInUse=false;
 //static VertexFormatXYZNDUV2* _DynamicSortingVertexArray=NULL;
 static SortingVertexBufferClass* _DynamicSortingVertexArray=NULL;
 static unsigned short _DynamicSortingVertexArraySize=0;
-static unsigned short _DynamicSortingVertexArrayOffset=0;	
+static unsigned short _DynamicSortingVertexArrayOffset=0;
 
 static bool _DynamicDX8VertexBufferInUse=false;
 static DX8VertexBufferClass* _DynamicDX8VertexBuffer=NULL;
@@ -90,8 +90,8 @@ VertexBufferClass::VertexBufferClass(unsigned type_, unsigned FVF, unsigned shor
 	_VertexBufferTotalVertices+=VertexCount;
 	_VertexBufferTotalSize+=VertexCount*fvf_info->Get_FVF_Size();
 #ifdef VERTEX_BUFFER_LOG
-	WWDEBUG_SAY(("New VB, %d vertices, size %d bytes\n",VertexCount,VertexCount*fvf_info->Get_FVF_Size()));
-	WWDEBUG_SAY(("Total VB count: %d, total %d vertices, total size %d bytes\n",
+	WWDEBUG_SAY(("New VB, %d vertices, size %d bytes",VertexCount,VertexCount*fvf_info->Get_FVF_Size()));
+	WWDEBUG_SAY(("Total VB count: %d, total %d vertices, total size %d bytes",
 		_VertexBufferCount,
 		_VertexBufferTotalVertices,
 		_VertexBufferTotalSize));
@@ -107,8 +107,8 @@ VertexBufferClass::~VertexBufferClass()
 	_VertexBufferTotalSize-=VertexCount*fvf_info->Get_FVF_Size();
 
 #ifdef VERTEX_BUFFER_LOG
-	WWDEBUG_SAY(("Delete VB, %d vertices, size %d bytes\n",VertexCount,VertexCount*fvf_info->Get_FVF_Size()));
-	WWDEBUG_SAY(("Total VB count: %d, total %d vertices, total size %d bytes\n",
+	WWDEBUG_SAY(("Delete VB, %d vertices, size %d bytes",VertexCount,VertexCount*fvf_info->Get_FVF_Size()));
+	WWDEBUG_SAY(("Total VB count: %d, total %d vertices, total size %d bytes",
 		_VertexBufferCount,
 		_VertexBufferTotalVertices,
 		_VertexBufferTotalSize));
@@ -167,7 +167,7 @@ VertexBufferClass::WriteLockClass::WriteLockClass(VertexBufferClass* VertexBuffe
 		{
 		StringClass fvf_name;
 		VertexBuffer->FVF_Info().Get_FVF_Name(fvf_name);
-		WWDEBUG_SAY(("VertexBuffer->Lock(start_index: 0, index_range: 0(%d), fvf_size: %d, fvf: %s)\n",
+		WWDEBUG_SAY(("VertexBuffer->Lock(start_index: 0, index_range: 0(%d), fvf_size: %d, fvf: %s)",
 			VertexBuffer->Get_Vertex_Count(),
 			VertexBuffer->FVF_Info().Get_FVF_Size(),
 			fvf_name));
@@ -197,7 +197,7 @@ VertexBufferClass::WriteLockClass::~WriteLockClass()
 	switch (VertexBuffer->Type()) {
 	case BUFFER_TYPE_DX8:
 #ifdef VERTEX_BUFFER_LOG
-		WWDEBUG_SAY(("VertexBuffer->Unlock()\n"));
+		WWDEBUG_SAY(("VertexBuffer->Unlock()"));
 #endif
 		DX8_Assert();
 		DX8_ErrorCode(static_cast<DX8VertexBufferClass*>(VertexBuffer)->Get_DX8_Vertex_Buffer()->Unlock());
@@ -232,7 +232,7 @@ VertexBufferClass::AppendLockClass::AppendLockClass(VertexBufferClass* VertexBuf
 		{
 		StringClass fvf_name;
 		VertexBuffer->FVF_Info().Get_FVF_Name(fvf_name);
-		WWDEBUG_SAY(("VertexBuffer->Lock(start_index: %d, index_range: %d, fvf_size: %d, fvf: %s)\n",
+		WWDEBUG_SAY(("VertexBuffer->Lock(start_index: %d, index_range: %d, fvf_size: %d, fvf: %s)",
 			start_index,
 			index_range,
 			VertexBuffer->FVF_Info().Get_FVF_Size(),
@@ -264,7 +264,7 @@ VertexBufferClass::AppendLockClass::~AppendLockClass()
 	case BUFFER_TYPE_DX8:
 		DX8_Assert();
 #ifdef VERTEX_BUFFER_LOG
-		WWDEBUG_SAY(("VertexBuffer->Unlock()\n"));
+		WWDEBUG_SAY(("VertexBuffer->Unlock()"));
 #endif
 		DX8_ErrorCode(static_cast<DX8VertexBufferClass*>(VertexBuffer)->Get_DX8_Vertex_Buffer()->Unlock());
 		break;
@@ -319,8 +319,8 @@ DX8VertexBufferClass::DX8VertexBufferClass(unsigned FVF, unsigned short vertex_c
 
 DX8VertexBufferClass::DX8VertexBufferClass(
 	const Vector3* vertices,
-	const Vector3* normals, 
-	const Vector2* tex_coords, 
+	const Vector3* normals,
+	const Vector2* tex_coords,
 	unsigned short VertexCount,
 	UsageType usage)
 	:
@@ -339,9 +339,9 @@ DX8VertexBufferClass::DX8VertexBufferClass(
 
 DX8VertexBufferClass::DX8VertexBufferClass(
 	const Vector3* vertices,
-	const Vector3* normals, 
+	const Vector3* normals,
 	const Vector4* diffuse,
-	const Vector2* tex_coords, 
+	const Vector2* tex_coords,
 	unsigned short VertexCount,
 	UsageType usage)
 	:
@@ -362,7 +362,7 @@ DX8VertexBufferClass::DX8VertexBufferClass(
 DX8VertexBufferClass::DX8VertexBufferClass(
 	const Vector3* vertices,
 	const Vector4* diffuse,
-	const Vector2* tex_coords, 
+	const Vector2* tex_coords,
 	unsigned short VertexCount,
 	UsageType usage)
 	:
@@ -381,7 +381,7 @@ DX8VertexBufferClass::DX8VertexBufferClass(
 
 DX8VertexBufferClass::DX8VertexBufferClass(
 	const Vector3* vertices,
-	const Vector2* tex_coords, 
+	const Vector2* tex_coords,
 	unsigned short VertexCount,
 	UsageType usage)
 	:
@@ -400,9 +400,9 @@ DX8VertexBufferClass::DX8VertexBufferClass(
 DX8VertexBufferClass::~DX8VertexBufferClass()
 {
 #ifdef VERTEX_BUFFER_LOG
-	WWDEBUG_SAY(("VertexBuffer->Release()\n"));
+	WWDEBUG_SAY(("VertexBuffer->Release()"));
 	_DX8VertexBufferCount--;
-	WWDEBUG_SAY(("Current vertex buffer count: %d\n",_DX8VertexBufferCount));
+	WWDEBUG_SAY(("Current vertex buffer count: %d",_DX8VertexBufferCount));
 #endif
 	VertexBuffer->Release();
 }
@@ -421,7 +421,7 @@ void DX8VertexBufferClass::Create_Vertex_Buffer(UsageType usage)
 #ifdef VERTEX_BUFFER_LOG
 	StringClass fvf_name;
 	FVF_Info().Get_FVF_Name(fvf_name);
-	WWDEBUG_SAY(("CreateVertexBuffer(fvfsize=%d, vertex_count=%d, D3DUSAGE_WRITEONLY|%s|%s, fvf: %s, %s)\n",
+	WWDEBUG_SAY(("CreateVertexBuffer(fvfsize=%d, vertex_count=%d, D3DUSAGE_WRITEONLY|%s|%s, fvf: %s, %s)",
 		FVF_Info().Get_FVF_Size(),
 		VertexCount,
 		(usage&USAGE_DYNAMIC) ? "D3DUSAGE_DYNAMIC" : "-",
@@ -429,7 +429,7 @@ void DX8VertexBufferClass::Create_Vertex_Buffer(UsageType usage)
 		fvf_name,
 		(usage&USAGE_DYNAMIC) ? "D3DPOOL_DEFAULT" : "D3DPOOL_MANAGED"));
 	_DX8VertexBufferCount++;
-	WWDEBUG_SAY(("Current vertex buffer count: %d\n",_DX8VertexBufferCount));
+	WWDEBUG_SAY(("Current vertex buffer count: %d",_DX8VertexBufferCount));
 #endif
 
 	unsigned usage_flags=
@@ -456,7 +456,7 @@ void DX8VertexBufferClass::Create_Vertex_Buffer(UsageType usage)
 		return;
 	}
 
-	WWDEBUG_SAY(("Vertex buffer creation failed, trying to release assets...\n"));
+	WWDEBUG_SAY(("Vertex buffer creation failed, trying to release assets..."));
 
 	// Vertex buffer creation failed, so try releasing least used textures and flushing the mesh cache.
 
@@ -478,7 +478,7 @@ void DX8VertexBufferClass::Create_Vertex_Buffer(UsageType usage)
 		&VertexBuffer);
 
 	if (SUCCEEDED(ret)) {
-		WWDEBUG_SAY(("...Vertex buffer creation succesful\n"));
+		WWDEBUG_SAY(("...Vertex buffer creation succesful"));
 	}
 
 	// If it still fails it is fatal
@@ -744,7 +744,7 @@ DynamicVBAccessClass::~DynamicVBAccessClass()
 		_DynamicSortingVertexArrayInUse=false;
 		_DynamicSortingVertexArrayOffset+=VertexCount;
 	}
-	
+
 	REF_PTR_RELEASE (VertexBuffer);
 }
 
@@ -788,7 +788,7 @@ void DynamicVBAccessClass::Allocate_DX8_Dynamic_Buffer()
 		}
 
 		_DynamicDX8VertexBuffer=NEW_REF(DX8VertexBufferClass,(
-			dynamic_fvf_type, 
+			dynamic_fvf_type,
 			_DynamicDX8VertexBufferSize,
 			(DX8VertexBufferClass::UsageType)usage));
 		_DynamicDX8VertexBufferOffset=0;
@@ -841,7 +841,7 @@ DynamicVBAccessClass::WriteLockClass::WriteLockClass(DynamicVBAccessClass* dynam
 		dx8_lock++;
 		StringClass fvf_name;
 		DynamicVBAccess->VertexBuffer->FVF_Info().Get_FVF_Name(fvf_name);
-		WWDEBUG_SAY(("DynamicVertexBuffer->Lock(start_index: %d, index_range: %d, fvf_size: %d, fvf: %s)\n",
+		WWDEBUG_SAY(("DynamicVertexBuffer->Lock(start_index: %d, index_range: %d, fvf_size: %d, fvf: %s)",
 			DynamicVBAccess->VertexBufferOffset,
 			DynamicVBAccess->Get_Vertex_Count(),
 			DynamicVBAccess->VertexBuffer->FVF_Info().Get_FVF_Size(),
@@ -881,7 +881,7 @@ DynamicVBAccessClass::WriteLockClass::~WriteLockClass()
 #ifdef VERTEX_BUFFER_LOG
 /*		dx8_lock--;
 		WWASSERT(!dx8_lock);
-		WWDEBUG_SAY(("DynamicVertexBuffer->Unlock()\n"));
+		WWDEBUG_SAY(("DynamicVertexBuffer->Unlock()"));
 */
 #endif
 		DX8_Assert();
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
index fdf3ad1cbef..e5a7c5c5917 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Jani Penttinen                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 5:06p                                             $*
  *                                                                                             *
  *                    $Revision:: 26                                                          $*
@@ -37,16 +37,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8VERTEXBUFFER_H
-#define DX8VERTEXBUFFER_H
 
 #include "always.h"
 #include "wwdebug.h"
-#include "refcount.h"
 #include "dx8fvf.h"
 
 const unsigned dynamic_fvf_type=D3DFVF_XYZ|D3DFVF_NORMAL|D3DFVF_TEX2|D3DFVF_DIFFUSE;
@@ -89,13 +83,13 @@ class VertexBufferClass : public W3DMPO, public RefCountClass
 	virtual ~VertexBufferClass();
 public:
 
-	inline const FVFInfoClass& FVF_Info() const { return *fvf_info; }
-	inline unsigned short Get_Vertex_Count() const { return VertexCount; }
-	inline unsigned Type() const { return type; }
+	const FVFInfoClass& FVF_Info() const { return *fvf_info; }
+	unsigned short Get_Vertex_Count() const { return VertexCount; }
+	unsigned Type() const { return type; }
 
 	void Add_Engine_Ref() const;
 	void Release_Engine_Ref() const;
-	inline unsigned Engine_Refs() const { return engine_refs; } 
+	unsigned Engine_Refs() const { return engine_refs; }
 
 	class WriteLockClass : public VertexBufferLockClass
 	{
@@ -179,7 +173,7 @@ class DynamicVBAccessClass
 	public:
 		WriteLockClass(DynamicVBAccessClass* vb_access);
 		~WriteLockClass();
-		
+
 		// Use this function to get a pointer to the first vertex you can write into.
 		// If we ever change the format used by DynamicVBAccessClass, then the
 		// return type of this function will change and we'll easily find all code
@@ -260,6 +254,3 @@ class SortingVertexBufferClass : public VertexBufferClass
 public:
 	SortingVertexBufferClass(unsigned short VertexCount);
 };
-
-
-#endif //DX8VERTEXBUFFER_H
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
index 205e1986d8b..9fa4fa06867 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Jani Penttinen                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 08/05/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 170                                                         $*
@@ -35,7 +35,7 @@
  * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
  * 06/27/02 KM Render to shadow buffer texture support														*
  * 06/27/02 KM Shader system updates																				*
- * 08/05/02 KM Texture class redesign 
+ * 08/05/02 KM Texture class redesign
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  *   DX8Wrapper::_Update_Texture -- Copies a texture from system memory to video memory        *
@@ -45,7 +45,7 @@
 //#define CREATE_DX8_FPU_PRESERVE
 #define WW3D_DEVTYPE D3DDEVTYPE_HAL
 
-#if defined(_MSC_VER) && _MSC_VER < 1300
+#if !defined(WINVER) || WINVER < 0x0500
 #undef WINVER
 #define WINVER 0x0500 // Required to access GetMonitorInfo in VC6.
 #endif
@@ -75,7 +75,6 @@
 #include "textureloader.h"
 #include "missingtexture.h"
 #include "thread.h"
-#include <stdio.h>
 #include <d3dx8core.h>
 #include "pot.h"
 #include "wwprofile.h"
@@ -84,7 +83,7 @@
 #include "formconv.h"
 #include "dx8texman.h"
 #include "bound.h"
-#include "dx8webbrowser.h"
+#include "DbgHelpGuard.h"
 
 #include "shdlib.h"
 
@@ -243,7 +242,7 @@ void Non_Fatal_Log_DX8_ErrorCode(unsigned res,const char * file,int line)
 		sizeof(tmp));
 
 	if (new_res==D3D_OK) {
-		WWDEBUG_SAY(("DX8 Error: %s, File: %s, Line: %d\n",tmp,file,line));
+		WWDEBUG_SAY(("DX8 Error: %s, File: %s, Line: %d",tmp,file,line));
 	}
 }
 
@@ -288,14 +287,14 @@ bool DX8Wrapper::Init(void * hwnd, bool lite)
 	*/
 	_Hwnd = (HWND)hwnd;
 	_MainThreadID=ThreadClass::_Get_Current_Thread_ID();
-	WWDEBUG_SAY(("DX8Wrapper main thread: 0x%x\n",_MainThreadID));
+	WWDEBUG_SAY(("DX8Wrapper main thread: 0x%x",_MainThreadID));
 	CurRenderDevice = -1;
 	ResolutionWidth = DEFAULT_RESOLUTION_WIDTH;
 	ResolutionHeight = DEFAULT_RESOLUTION_HEIGHT;
 	// Initialize Render2DClass Screen Resolution
 	Render2DClass::Set_Screen_Resolution( RectClass( 0, 0, ResolutionWidth, ResolutionHeight ) );
 	BitDepth = DEFAULT_BIT_DEPTH;
-	IsWindowed = false;	
+	IsWindowed = false;
 	DX8Wrapper_IsWindowed = false;
 
 	for (int light=0;light<4;++light) CurrentDX8LightEnables[light]=false;
@@ -314,7 +313,7 @@ bool DX8Wrapper::Init(void * hwnd, bool lite)
 	D3DInterface = NULL;
 	D3DDevice = NULL;
 
-	WWDEBUG_SAY(("Reset DX8Wrapper statistics\n"));
+	WWDEBUG_SAY(("Reset DX8Wrapper statistics"));
 	Reset_Statistics();
 
 	Invalidate_Cached_Render_States();
@@ -330,8 +329,14 @@ bool DX8Wrapper::Init(void * hwnd, bool lite)
 		/*
 		** Create the D3D interface object
 		*/
-		WWDEBUG_SAY(("Create Direct3D8\n"));
-		D3DInterface = Direct3DCreate8Ptr(D3D_SDK_VERSION);		// TODO: handle failure cases...
+		WWDEBUG_SAY(("Create Direct3D8"));
+		{
+			// TheSuperHackers @bugfix xezon 13/06/2025 Front load the system dbghelp.dll to prevent
+			// the graphics driver from potentially loading the old game dbghelp.dll and then crashing the game process.
+			DbgHelpGuard dbgHelpGuard;
+
+			D3DInterface = Direct3DCreate8Ptr(D3D_SDK_VERSION);		// TODO: handle failure cases...
+		}
 		if (D3DInterface == NULL) {
 			return(false);
 		}
@@ -340,9 +345,9 @@ bool DX8Wrapper::Init(void * hwnd, bool lite)
 		/*
 		** Enumerate the available devices
 		*/
-		WWDEBUG_SAY(("Enumerate devices\n"));
+		WWDEBUG_SAY(("Enumerate devices"));
 		Enumerate_Devices();
-		WWDEBUG_SAY(("DX8Wrapper Init completed\n"));
+		WWDEBUG_SAY(("DX8Wrapper Init completed"));
 	}
 
 	return(true);
@@ -365,9 +370,9 @@ void DX8Wrapper::Shutdown(void)
 	if (CurrentCaps)
 	{
 		int max=CurrentCaps->Get_Max_Textures_Per_Pass();
-		for (int i = 0; i < max; i++) 
+		for (int i = 0; i < max; i++)
 		{
-			if (Textures[i]) 
+			if (Textures[i])
 			{
 				Textures[i]->Release();
 				Textures[i] = NULL;
@@ -387,7 +392,7 @@ void DX8Wrapper::Shutdown(void)
 
 	_RenderDeviceNameTable.Clear();		 // note - Delete_All() resizes the vector, causing a reallocation.  Clear is better. jba.
 	_RenderDeviceShortNameTable.Clear();
-	_RenderDeviceDescriptionTable.Clear();	
+	_RenderDeviceDescriptionTable.Clear();
 
 	DX8Caps::Shutdown();
 	IsInitted = false;		// 010803 srj
@@ -457,9 +462,9 @@ void DX8Wrapper::Invalidate_Cached_Render_States(void)
 	for (a=0;a<sizeof(RenderStates)/sizeof(unsigned);++a) {
 		RenderStates[a]=0x12345678;
 	}
-	for (a=0;a<MAX_TEXTURE_STAGES;++a) 
+	for (a=0;a<MAX_TEXTURE_STAGES;++a)
 	{
-		for (int b=0; b<32;b++) 
+		for (int b=0; b<32;b++)
 		{
 			TextureStageStates[a][b]=0x12345678;
 		}
@@ -516,10 +521,8 @@ void DX8Wrapper::Do_Onetime_Device_Dependent_Shutdowns(void)
 	TheDX8MeshRenderer.Shutdown();
 	MissingTexture::_Deinit();
 
-	if (CurrentCaps) {
-		delete CurrentCaps;
-		CurrentCaps=NULL;
-	}
+	delete CurrentCaps;
+	CurrentCaps=NULL;
 
 }
 
@@ -529,7 +532,7 @@ bool DX8Wrapper::Create_Device(void)
 	WWASSERT(D3DDevice==NULL);	// for now, once you've created a device, you're stuck with it!
 
 	D3DCAPS8 caps;
-	if 
+	if
 	(
 		FAILED
 		(
@@ -546,25 +549,25 @@ bool DX8Wrapper::Create_Device(void)
 	}
 
 	::ZeroMemory(&CurrentAdapterIdentifier, sizeof(D3DADAPTER_IDENTIFIER8));
-	
+
 	if
 	(
 		FAILED
-		( 
+		(
 			D3DInterface->GetAdapterIdentifier
 			(
 				CurRenderDevice,
 				D3DENUM_NO_WHQL_LEVEL,
 				&CurrentAdapterIdentifier
 			)
-			)	
-	) 
+			)
+	)
 	{
 		return false;
 	}
 
 #ifndef _XBOX
-	
+
 	Vertex_Processing_Behavior=(caps.DevCaps&D3DDEVCAPS_HWTRANSFORMANDLIGHT) ?
 		D3DCREATE_MIXED_VERTEXPROCESSING : D3DCREATE_SOFTWARE_VERTEXPROCESSING;
 
@@ -592,6 +595,10 @@ bool DX8Wrapper::Create_Device(void)
 	Vertex_Processing_Behavior|=D3DCREATE_FPU_PRESERVE;
 #endif
 
+	// TheSuperHackers @bugfix xezon 13/06/2025 Front load the system dbghelp.dll to prevent
+	// the graphics driver from potentially loading the old game dbghelp.dll and then crashing the game process.
+	DbgHelpGuard dbgHelpGuard;
+
 	HRESULT hr=D3DInterface->CreateDevice
 	(
 		CurRenderDevice,
@@ -599,10 +606,10 @@ bool DX8Wrapper::Create_Device(void)
 		_Hwnd,
 		Vertex_Processing_Behavior,
 		&_PresentParameters,
-		&D3DDevice 
+		&D3DDevice
 	);
 
-	if (FAILED(hr)) 
+	if (FAILED(hr))
 	{
 		// The device selection may fail because the device lied that it supports 32 bit zbuffer with 16 bit
 		// display. This happens at least on Voodoo2.
@@ -612,7 +619,7 @@ bool DX8Wrapper::Create_Device(void)
 			_PresentParameters.BackBufferFormat==D3DFMT_A1R5G5B5) &&
 			(_PresentParameters.AutoDepthStencilFormat==D3DFMT_D32 ||
 			_PresentParameters.AutoDepthStencilFormat==D3DFMT_D24S8 ||
-			_PresentParameters.AutoDepthStencilFormat==D3DFMT_D24X8)) 
+			_PresentParameters.AutoDepthStencilFormat==D3DFMT_D24X8))
 		{
 			_PresentParameters.AutoDepthStencilFormat=D3DFMT_D16;
 			hr = D3DInterface->CreateDevice
@@ -622,20 +629,22 @@ bool DX8Wrapper::Create_Device(void)
 				_Hwnd,
 				Vertex_Processing_Behavior,
 				&_PresentParameters,
-				&D3DDevice 
+				&D3DDevice
 			);
 
-			if (FAILED(hr)) 
+			if (FAILED(hr))
 			{
 				return false;
 			}
         }
-		else 
+		else
 		{
 				return false;
 		}
 	}
 
+	dbgHelpGuard.deactivate();
+
 	/*
 	** Initialize all subsystems
 	*/
@@ -645,13 +654,13 @@ bool DX8Wrapper::Create_Device(void)
 
 bool DX8Wrapper::Reset_Device(bool reload_assets)
 {
-	WWDEBUG_SAY(("Resetting device.\n"));
+	WWDEBUG_SAY(("Resetting device."));
 	DX8_THREAD_ASSERT();
 	if ((IsInitted) && (D3DDevice != NULL)) {
 		// Release all non-MANAGED stuff
 		WW3D::_Invalidate_Textures();
 
-		for (unsigned i=0;i<MAX_VERTEX_STREAMS;++i) 
+		for (unsigned i=0;i<MAX_VERTEX_STREAMS;++i)
 		{
 			Set_Vertex_Buffer (NULL,i);
 		}
@@ -689,10 +698,10 @@ bool DX8Wrapper::Reset_Device(bool reload_assets)
 		Invalidate_Cached_Render_States();
 		Set_Default_Global_Render_States();
 		SHD_INIT_SHADERS;
-		WWDEBUG_SAY(("Device reset completed\n"));
+		WWDEBUG_SAY(("Device reset completed"));
 		return true;
 	}
-	WWDEBUG_SAY(("Device reset failed\n"));
+	WWDEBUG_SAY(("Device reset failed"));
 	return false;
 }
 
@@ -712,7 +721,7 @@ void DX8Wrapper::Release_Device(void)
 		/*
 		** Release the current vertex and index buffers
 		*/
-		for (unsigned i=0;i<MAX_VERTEX_STREAMS;++i) 
+		for (unsigned i=0;i<MAX_VERTEX_STREAMS;++i)
 		{
 			if (render_state.vertex_buffers[i]) render_state.vertex_buffers[i]->Release_Engine_Ref();
 			REF_PTR_RELEASE(render_state.vertex_buffers[i]);
@@ -889,7 +898,7 @@ void DX8Wrapper::Get_Format_Name(unsigned int format, StringClass *tex_format)
 		case D3DFMT_A8L8: *tex_format="D3DFMT_A8L8"; break;
 		case D3DFMT_A4L4: *tex_format="D3DFMT_A4L4"; break;
 		case D3DFMT_V8U8: *tex_format="D3DFMT_V8U8"; break;
-		case D3DFMT_L6V5U5: *tex_format="D3DFMT_L6V5U5"; break;  
+		case D3DFMT_L6V5U5: *tex_format="D3DFMT_L6V5U5"; break;
 		case D3DFMT_X8L8V8U8: *tex_format="D3DFMT_X8L8V8U8"; break;
 		case D3DFMT_Q8W8V8U8: *tex_format="D3DFMT_Q8W8V8U8"; break;
 		case D3DFMT_V16U16: *tex_format="D3DFMT_V16U16"; break;
@@ -920,8 +929,8 @@ void DX8Wrapper::Resize_And_Position_Window()
 
 	// Is the window the correct size for this resolution?
 	if ((rect.right-rect.left) != ResolutionWidth ||
-			(rect.bottom-rect.top) != ResolutionHeight) {			
-			
+			(rect.bottom-rect.top) != ResolutionHeight) {
+
 		// Calculate what the main window's bounding rectangle should be to
 		// accommodate this resolution
 		rect.left = 0;
@@ -938,7 +947,7 @@ void DX8Wrapper::Resize_And_Position_Window()
 		{
 			::SetWindowPos(_Hwnd, HWND_TOPMOST, 0, 0, width, height, SWP_NOSIZE | SWP_NOMOVE);
 
-			DEBUG_LOG(("Window resized to w:%d h:%d\n", width, height));
+			DEBUG_LOG(("Window resized to w:%d h:%d", width, height));
 		}
 		else
 		{
@@ -961,7 +970,7 @@ void DX8Wrapper::Resize_And_Position_Window()
 
 			::SetWindowPos (_Hwnd, NULL, left, top, width, height, SWP_NOZORDER);
 
-			DEBUG_LOG(("Window positioned to x:%d y:%d, resized to w:%d h:%d\n", left, top, width, height));
+			DEBUG_LOG(("Window positioned to x:%d y:%d, resized to w:%d h:%d", left, top, width, height));
 		}
 	}
 }
@@ -981,14 +990,14 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
 	} else if (dev != -1) {
 		CurRenderDevice = dev;
 	}
-	
+
 	/*
-	** If user doesn't want to change res, set the res variables to match the 
+	** If user doesn't want to change res, set the res variables to match the
 	** current resolution
 	*/
 	if (width != -1)		ResolutionWidth = width;
 	if (height != -1)		ResolutionHeight = height;
-	
+
 	// Initialize Render2DClass Screen Resolution
 	Render2DClass::Set_Screen_Resolution( RectClass( 0, 0, ResolutionWidth, ResolutionHeight ) );
 
@@ -996,14 +1005,14 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
 	if (windowed != -1)	IsWindowed = (windowed != 0);
 	DX8Wrapper_IsWindowed = IsWindowed;
 
-	WWDEBUG_SAY(("Attempting Set_Render_Device: name: %s (%s:%s), width: %d, height: %d, windowed: %d\n",
-		_RenderDeviceNameTable[CurRenderDevice],_RenderDeviceDescriptionTable[CurRenderDevice].Get_Driver_Name(),
+	WWDEBUG_SAY(("Attempting Set_Render_Device: name: %s (%s:%s), width: %d, height: %d, windowed: %d",
+		_RenderDeviceNameTable[CurRenderDevice].str(),_RenderDeviceDescriptionTable[CurRenderDevice].Get_Driver_Name(),
 		_RenderDeviceDescriptionTable[CurRenderDevice].Get_Driver_Version(),ResolutionWidth,ResolutionHeight,(IsWindowed ? 1 : 0)));
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	// PWG 4/13/2000 - changed so that if you say to resize the window it resizes
 	// regardless of whether its windowed or not as OpenGL resizes its self around
-	// the caption and edges of the window type you provide, so its important to 
+	// the caption and edges of the window type you provide, so its important to
 	// push the client area to be the size you really want.
 	// if ( resize_window && windowed ) {
 	if (resize_window) {
@@ -1012,16 +1021,16 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
 #endif
 	//must be either resetting existing device or creating a new one.
 	WWASSERT(reset_device || D3DDevice == NULL);
-	
+
 	/*
-	** Initialize values for D3DPRESENT_PARAMETERS members. 	
+	** Initialize values for D3DPRESENT_PARAMETERS members.
 	*/
 	::ZeroMemory(&_PresentParameters, sizeof(D3DPRESENT_PARAMETERS));
 
 	_PresentParameters.BackBufferWidth = ResolutionWidth;
 	_PresentParameters.BackBufferHeight = ResolutionHeight;
 	_PresentParameters.BackBufferCount = IsWindowed ? 1 : 2;
-	
+
 	_PresentParameters.MultiSampleType = D3DMULTISAMPLE_NONE;
 	//I changed this to discard all the time (even when full-screen) since that the most efficient. 07-16-03 MW:
 	_PresentParameters.SwapEffect = D3DSWAPEFFECT_DISCARD;//IsWindowed ? D3DSWAPEFFECT_DISCARD : D3DSWAPEFFECT_FLIP;		// Shouldn't this be D3DSWAPEFFECT_FLIP?
@@ -1030,14 +1039,14 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
 
 	_PresentParameters.EnableAutoDepthStencil = TRUE;				// Driver will attempt to match Z-buffer depth
 	_PresentParameters.Flags=0;											// We're not going to lock the backbuffer
-	
+
 	_PresentParameters.FullScreen_PresentationInterval = D3DPRESENT_INTERVAL_DEFAULT;
 	_PresentParameters.FullScreen_RefreshRateInHz = D3DPRESENT_RATE_DEFAULT;
 
 	/*
 	** Set up the buffer formats.  Several issues here:
 	** - if in windowed mode, the backbuffer must use the current display format.
-	** - the depth buffer must use 
+	** - the depth buffer must use
 	*/
 	if (IsWindowed) {
 
@@ -1113,19 +1122,19 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
 	Get_Format_Name(DisplayFormat,&displayFormat);
 	Get_Format_Name(_PresentParameters.BackBufferFormat,&backbufferFormat);
 
-	WWDEBUG_SAY(("Using Display/BackBuffer Formats: %s/%s\n",displayFormat,backbufferFormat));
-	
+	WWDEBUG_SAY(("Using Display/BackBuffer Formats: %s/%s",displayFormat.str(),backbufferFormat.str()));
+
 	bool ret;
 
 	if (reset_device)
 	{
-		WWDEBUG_SAY(("DX8Wrapper::Set_Render_Device is resetting the device.\n"));
+		WWDEBUG_SAY(("DX8Wrapper::Set_Render_Device is resetting the device."));
 		ret = Reset_Device(restore_assets);	//reset device without restoring data - we're likely switching out of the app.
 	}
 	else
 		ret = Create_Device();
 
-	WWDEBUG_SAY(("Reset/Create_Device done, reset_device=%d, restore_assets=%d\n", reset_device, restore_assets));
+	WWDEBUG_SAY(("Reset/Create_Device done, reset_device=%d, restore_assets=%d", reset_device, restore_assets));
 
 	return ret;
 }
@@ -1193,7 +1202,7 @@ void DX8Wrapper::Set_Swap_Interval(int swap)
 		default: _PresentParameters.FullScreen_PresentationInterval = D3DPRESENT_INTERVAL_ONE ; break;
 	}
 
-	WWDEBUG_SAY(("DX8Wrapper::Set_Swap_Interval is resetting the device.\n"));
+	WWDEBUG_SAY(("DX8Wrapper::Set_Swap_Interval is resetting the device."));
 	Reset_Device();
 }
 
@@ -1263,7 +1272,7 @@ bool DX8Wrapper::Set_Device_Resolution(int width,int height,int bits,int windowe
 			Resize_And_Position_Window();
 		}
 #pragma message("TODO: support changing windowed status and changing the bit depth")
-		WWDEBUG_SAY(("DX8Wrapper::Set_Device_Resolution is resetting the device.\n"));
+		WWDEBUG_SAY(("DX8Wrapper::Set_Device_Resolution is resetting the device."));
 		return Reset_Device();
 	} else {
 		return false;
@@ -1317,7 +1326,7 @@ bool DX8Wrapper::Registry_Save_Render_Device( const char *sub_key, int device, i
 
 	if ( !registry->Is_Valid() ) {
 		delete registry;
-		WWDEBUG_SAY(( "Error getting Registry\n" ));
+		WWDEBUG_SAY(( "Error getting Registry" ));
 		return false;
 	}
 
@@ -1348,12 +1357,12 @@ bool DX8Wrapper::Registry_Load_Render_Device( const char * sub_key, bool resize_
 													TextureBitDepth) &&
 			(*name != 0))
 	{
-		WWDEBUG_SAY(( "Device %s (%d X %d) %d bit windowed:%d\n", name,width,height,depth,windowed));
+		WWDEBUG_SAY(( "Device %s (%d X %d) %d bit windowed:%d", name,width,height,depth,windowed));
 
 		if (TextureBitDepth==16 || TextureBitDepth==32) {
-//			WWDEBUG_SAY(( "Texture depth %d\n", TextureBitDepth));
+//			WWDEBUG_SAY(( "Texture depth %d", TextureBitDepth));
 		} else {
-			WWDEBUG_SAY(( "Invalid texture depth %d, switching to 16 bits\n", TextureBitDepth));
+			WWDEBUG_SAY(( "Invalid texture depth %d, switching to 16 bits", TextureBitDepth));
 			TextureBitDepth=16;
 		}
 
@@ -1419,7 +1428,7 @@ bool DX8Wrapper::Registry_Load_Render_Device( const char * sub_key, bool resize_
 		return true;
 	}
 
-	WWDEBUG_SAY(( "Error getting Registry\n" ));
+	WWDEBUG_SAY(( "Error getting Registry" ));
 
 	return Set_Any_Render_Device();
 }
@@ -1531,7 +1540,7 @@ bool DX8Wrapper::Find_Color_Mode(D3DFORMAT colorbuffer, int resx, int resy, UINT
 	{
 		D3DInterface->EnumAdapterModes(D3DADAPTER_DEFAULT, i, &dmode);
 		if (dmode.Width==rx && dmode.Height==ry && dmode.Format==colorbuffer) {
-			WWDEBUG_SAY(("Found valid color mode.  Width = %d Height = %d Format = %d\r\n",dmode.Width,dmode.Height,dmode.Format));
+			WWDEBUG_SAY(("Found valid color mode.  Width = %d Height = %d Format = %d",dmode.Width,dmode.Height,dmode.Format));
 			found=true;
 		}
 		i++;
@@ -1541,7 +1550,7 @@ bool DX8Wrapper::Find_Color_Mode(D3DFORMAT colorbuffer, int resx, int resy, UINT
 
 	// no match
 	if (!found) {
-		WWDEBUG_SAY(("Failed to find a valid color mode\r\n"));
+		WWDEBUG_SAY(("Failed to find a valid color mode"));
 		return false;
 	}
 
@@ -1571,47 +1580,47 @@ bool DX8Wrapper::Find_Z_Mode(D3DFORMAT colorbuffer,D3DFORMAT backbuffer, D3DFORM
 	if (Test_Z_Mode(colorbuffer,backbuffer,D3DFMT_D24S8))
 	{
 		*zmode=D3DFMT_D24S8;
-		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D24S8\n"));
+		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D24S8"));
 		return true;
 	}
 
 	if (Test_Z_Mode(colorbuffer,backbuffer,D3DFMT_D32))
 	{
 		*zmode=D3DFMT_D32;
-		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D32\n"));
+		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D32"));
 		return true;
 	}
 
 	if (Test_Z_Mode(colorbuffer,backbuffer,D3DFMT_D24X8))
 	{
 		*zmode=D3DFMT_D24X8;
-		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D24X8\n"));
+		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D24X8"));
 		return true;
 	}
 
 	if (Test_Z_Mode(colorbuffer,backbuffer,D3DFMT_D24X4S4))
 	{
 		*zmode=D3DFMT_D24X4S4;
-		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D24X4S4\n"));
+		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D24X4S4"));
 		return true;
 	}
 
 	if (Test_Z_Mode(colorbuffer,backbuffer,D3DFMT_D16))
 	{
 		*zmode=D3DFMT_D16;
-		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D16\n"));
+		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D16"));
 		return true;
 	}
 
 	if (Test_Z_Mode(colorbuffer,backbuffer,D3DFMT_D15S1))
 	{
 		*zmode=D3DFMT_D15S1;
-		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D15S1\n"));
+		WWDEBUG_SAY(("Found zbuffer mode D3DFMT_D15S1"));
 		return true;
 	}
 
 	// can't find a match
-	WWDEBUG_SAY(("Failed to find a valid zbuffer mode\r\n"));
+	WWDEBUG_SAY(("Failed to find a valid zbuffer mode"));
 	return false;
 }
 
@@ -1621,7 +1630,7 @@ bool DX8Wrapper::Test_Z_Mode(D3DFORMAT colorbuffer,D3DFORMAT backbuffer, D3DFORM
 	if (FAILED(D3DInterface->CheckDeviceFormat(D3DADAPTER_DEFAULT,WW3D_DEVTYPE,
 		colorbuffer,D3DUSAGE_DEPTHSTENCIL,D3DRTYPE_SURFACE,zmode)))
 	{
-		WWDEBUG_SAY(("CheckDeviceFormat failed.  Colorbuffer format = %d  Zbufferformat = %d\n",colorbuffer,zmode));
+		WWDEBUG_SAY(("CheckDeviceFormat failed.  Colorbuffer format = %d  Zbufferformat = %d",colorbuffer,zmode));
 		return false;
 	}
 
@@ -1629,7 +1638,7 @@ bool DX8Wrapper::Test_Z_Mode(D3DFORMAT colorbuffer,D3DFORMAT backbuffer, D3DFORM
 	if(FAILED(D3DInterface->CheckDepthStencilMatch(D3DADAPTER_DEFAULT, WW3D_DEVTYPE,
 		colorbuffer,backbuffer,zmode)))
 	{
-		WWDEBUG_SAY(("CheckDepthStencilMatch failed.  Colorbuffer format = %d  Backbuffer format = %d Zbufferformat = %d\n",colorbuffer,backbuffer,zmode));
+		WWDEBUG_SAY(("CheckDepthStencilMatch failed.  Colorbuffer format = %d  Backbuffer format = %d Zbufferformat = %d",colorbuffer,backbuffer,zmode));
 		return false;
 	}
 	return true;
@@ -1714,7 +1723,7 @@ void DX8Wrapper::Begin_Scene(void)
 #if ENABLE_EMBEDDED_BROWSER
 	DX8WebBrowser::Update();
 #endif
-	
+
 	DX8CALL(BeginScene());
 
 	DX8WebBrowser::Update();
@@ -1754,7 +1763,7 @@ void DX8Wrapper::End_Scene(bool flip_frames)
 		if (hr==D3DERR_DEVICELOST) {
 			hr=_Get_D3D_Device8()->TestCooperativeLevel();
 			if (hr==D3DERR_DEVICENOTRESET) {
-				WWDEBUG_SAY(("DX8Wrapper::End_Scene is resetting the device.\n"));
+				WWDEBUG_SAY(("DX8Wrapper::End_Scene is resetting the device."));
 				Reset_Device();
 			}
 			else {
@@ -1792,28 +1801,28 @@ void DX8Wrapper::Flip_To_Primary(void)
 			HRESULT hr = _Get_D3D_Device8()->TestCooperativeLevel();
 
 			if (FAILED(hr)) {
-				WWDEBUG_SAY(("TestCooperativeLevel Failed!\n"));
+				WWDEBUG_SAY(("TestCooperativeLevel Failed!"));
 
 				if (D3DERR_DEVICELOST == hr) {
 					IsDeviceLost=true;
-					WWDEBUG_SAY(("DEVICELOST: Cannot flip to primary.\n"));
+					WWDEBUG_SAY(("DEVICELOST: Cannot flip to primary."));
 					return;
 				}
 				IsDeviceLost=false;
 
 				if (D3DERR_DEVICENOTRESET == hr) {
-					WWDEBUG_SAY(("DEVICENOTRESET\n"));
+					WWDEBUG_SAY(("DEVICENOTRESET"));
 					Reset_Device();
 					resetAttempts++;
 				}
 			} else {
-				WWDEBUG_SAY(("Flipping: %ld\n", FrameCount));
+				WWDEBUG_SAY(("Flipping: %ld", FrameCount));
 				hr = _Get_D3D_Device8()->Present(NULL, NULL, NULL, NULL);
 
 				if (SUCCEEDED(hr)) {
 					IsDeviceLost=false;
 					FrameCount++;
-					WWDEBUG_SAY(("Flip to primary succeeded %ld\n", FrameCount));
+					WWDEBUG_SAY(("Flip to primary succeeded %ld", FrameCount));
 				}
 				else {
 					IsDeviceLost=true;
@@ -2073,7 +2082,7 @@ void DX8Wrapper::Draw(
 	if (DrawPolygonLowBoundLimit && DrawPolygonLowBoundLimit>=polygon_count) return;
 
 	DX8_THREAD_ASSERT();
-	SNAPSHOT_SAY(("DX8 - draw\n"));
+	SNAPSHOT_SAY(("DX8 - draw"));
 
 	Apply_Render_State_Changes();
 
@@ -2083,55 +2092,55 @@ void DX8Wrapper::Draw(
 #ifdef MESH_RENDER_SNAPSHOT_ENABLED
 	if (WW3D::Is_Snapshot_Activated()) {
 		unsigned long passes=0;
-		SNAPSHOT_SAY(("ValidateDevice: "));
+		SNAPSHOT_SAY(("ValidateDevice:"));
 		HRESULT res=D3DDevice->ValidateDevice(&passes);
 		switch (res) {
 		case D3D_OK:
-			SNAPSHOT_SAY(("OK\n"));
+			SNAPSHOT_SAY(("OK"));
 			break;
 
 		case D3DERR_CONFLICTINGTEXTUREFILTER:
-			SNAPSHOT_SAY(("D3DERR_CONFLICTINGTEXTUREFILTER\n"));
+			SNAPSHOT_SAY(("D3DERR_CONFLICTINGTEXTUREFILTER"));
 			break;
 		case D3DERR_CONFLICTINGTEXTUREPALETTE:
-			SNAPSHOT_SAY(("D3DERR_CONFLICTINGTEXTUREPALETTE\n"));
+			SNAPSHOT_SAY(("D3DERR_CONFLICTINGTEXTUREPALETTE"));
 			break;
 		case D3DERR_DEVICELOST:
-			SNAPSHOT_SAY(("D3DERR_DEVICELOST\n"));
+			SNAPSHOT_SAY(("D3DERR_DEVICELOST"));
 			break;
 		case D3DERR_TOOMANYOPERATIONS:
-			SNAPSHOT_SAY(("D3DERR_TOOMANYOPERATIONS\n"));
+			SNAPSHOT_SAY(("D3DERR_TOOMANYOPERATIONS"));
 			break;
 		case D3DERR_UNSUPPORTEDALPHAARG:
-			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDALPHAARG\n"));
+			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDALPHAARG"));
 			break;
 		case D3DERR_UNSUPPORTEDALPHAOPERATION:
-			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDALPHAOPERATION\n"));
+			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDALPHAOPERATION"));
 			break;
 		case D3DERR_UNSUPPORTEDCOLORARG:
-			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDCOLORARG\n"));
+			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDCOLORARG"));
 			break;
 		case D3DERR_UNSUPPORTEDCOLOROPERATION:
-			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDCOLOROPERATION\n"));
+			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDCOLOROPERATION"));
 			break;
 		case D3DERR_UNSUPPORTEDFACTORVALUE:
-			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDFACTORVALUE\n"));
+			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDFACTORVALUE"));
 			break;
 		case D3DERR_UNSUPPORTEDTEXTUREFILTER:
-			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDTEXTUREFILTER\n"));
+			SNAPSHOT_SAY(("D3DERR_UNSUPPORTEDTEXTUREFILTER"));
 			break;
 		case D3DERR_WRONGTEXTUREFORMAT:
-			SNAPSHOT_SAY(("D3DERR_WRONGTEXTUREFORMAT\n"));
+			SNAPSHOT_SAY(("D3DERR_WRONGTEXTUREFORMAT"));
 			break;
 		default:
-			SNAPSHOT_SAY(("UNKNOWN Error\n"));
+			SNAPSHOT_SAY(("UNKNOWN Error"));
 			break;
 		}
 	}
 #endif	// MESH_RENDER_SHAPSHOT_ENABLED
 
 
-	SNAPSHOT_SAY(("DX8 - draw %d polygons (%d vertices)\n",polygon_count,vertex_count));
+	SNAPSHOT_SAY(("DX8 - draw %d polygons (%d vertices)",polygon_count,vertex_count));
 
 	if (vertex_count<3) {
 		min_vertex_index=0;
@@ -2259,38 +2268,38 @@ void DX8Wrapper::Draw_Strip(
 
 void DX8Wrapper::Apply_Render_State_Changes()
 {
-	SNAPSHOT_SAY(("DX8Wrapper::Apply_Render_State_Changes()\n"));
-	
+	SNAPSHOT_SAY(("DX8Wrapper::Apply_Render_State_Changes()"));
+
 	if (!render_state_changed) return;
 	if (render_state_changed&SHADER_CHANGED) {
-		SNAPSHOT_SAY(("DX8 - apply shader\n"));
+		SNAPSHOT_SAY(("DX8 - apply shader"));
 		render_state.shader.Apply();
 	}
 
 	unsigned mask=TEXTURE0_CHANGED;
 	int i=0;
-	for (;i<CurrentCaps->Get_Max_Textures_Per_Pass();++i,mask<<=1) 
+	for (;i<CurrentCaps->Get_Max_Textures_Per_Pass();++i,mask<<=1)
 	{
-		if (render_state_changed&mask) 
+		if (render_state_changed&mask)
 		{
-			SNAPSHOT_SAY(("DX8 - apply texture %d (%s)\n",i,render_state.Textures[i] ? render_state.Textures[i]->Get_Full_Path().str() : "NULL"));
+			SNAPSHOT_SAY(("DX8 - apply texture %d (%s)",i,render_state.Textures[i] ? render_state.Textures[i]->Get_Full_Path().str() : "NULL"));
 
-			if (render_state.Textures[i]) 
+			if (render_state.Textures[i])
 			{
 				render_state.Textures[i]->Apply(i);
 			}
-			else 
+			else
 			{
 				TextureBaseClass::Apply_Null(i);
 			}
 		}
 	}
 
-	if (render_state_changed&MATERIAL_CHANGED) 
+	if (render_state_changed&MATERIAL_CHANGED)
 	{
-		SNAPSHOT_SAY(("DX8 - apply material\n"));
+		SNAPSHOT_SAY(("DX8 - apply material"));
 		VertexMaterialClass* material=const_cast<VertexMaterialClass*>(render_state.material);
-		if (material) 
+		if (material)
 		{
 			material->Apply();
 		}
@@ -2302,20 +2311,20 @@ void DX8Wrapper::Apply_Render_State_Changes()
 		unsigned mask=LIGHT0_CHANGED;
 		for (unsigned index=0;index<4;++index,mask<<=1) {
 			if (render_state_changed&mask) {
-				SNAPSHOT_SAY(("DX8 - apply light %d\n",index));
+				SNAPSHOT_SAY(("DX8 - apply light %d",index));
 				if (render_state.LightEnable[index]) {
-#ifdef MESH_RENDER_SNAPSHOT_ENABLED		
+#ifdef MESH_RENDER_SNAPSHOT_ENABLED
 					if ( WW3D::Is_Snapshot_Activated() ) {
 						D3DLIGHT8 * light = &(render_state.Lights[index]);
 						static const char * _light_types[] = { "Unknown", "Point","Spot", "Directional" };
-						WWASSERT((light->Type >= 0) && (light->Type <= 3));					
+						WWASSERT((light->Type >= 0) && (light->Type <= 3));
 
-						SNAPSHOT_SAY((" type = %s amb = %4.2f,%4.2f,%4.2f  diff = %4.2f,%4.2f,%4.2f spec = %4.2f, %4.2f, %4.2f\n",
+						SNAPSHOT_SAY((" type = %s amb = %4.2f,%4.2f,%4.2f  diff = %4.2f,%4.2f,%4.2f spec = %4.2f, %4.2f, %4.2f",
 							_light_types[light->Type],
 							light->Ambient.r,light->Ambient.g,light->Ambient.b,
 							light->Diffuse.r,light->Diffuse.g,light->Diffuse.b,
 							light->Specular.r,light->Specular.g,light->Specular.b ));
-						SNAPSHOT_SAY((" pos = %f, %f, %f  dir = %f, %f, %f\n",
+						SNAPSHOT_SAY((" pos = %f, %f, %f  dir = %f, %f, %f",
 							light->Position.x, light->Position.y, light->Position.z,
 							light->Direction.x, light->Direction.y, light->Direction.z ));
 					}
@@ -2325,22 +2334,22 @@ void DX8Wrapper::Apply_Render_State_Changes()
 				}
 				else {
 					Set_DX8_Light(index,NULL);
-					SNAPSHOT_SAY((" clearing light to NULL\n"));
+					SNAPSHOT_SAY((" clearing light to NULL"));
 				}
 			}
 		}
 	}
 
 	if (render_state_changed&WORLD_CHANGED) {
-		SNAPSHOT_SAY(("DX8 - apply world matrix\n"));
+		SNAPSHOT_SAY(("DX8 - apply world matrix"));
 		_Set_DX8_Transform(D3DTS_WORLD,render_state.world);
 	}
 	if (render_state_changed&VIEW_CHANGED) {
-		SNAPSHOT_SAY(("DX8 - apply view matrix\n"));
+		SNAPSHOT_SAY(("DX8 - apply view matrix"));
 		_Set_DX8_Transform(D3DTS_VIEW,render_state.view);
 	}
 	if (render_state_changed&VERTEX_BUFFER_CHANGED) {
-		SNAPSHOT_SAY(("DX8 - apply vb change\n"));
+		SNAPSHOT_SAY(("DX8 - apply vb change"));
 		for (i=0;i<MAX_VERTEX_STREAMS;++i) {
 			if (render_state.vertex_buffers[i]) {
 				switch (render_state.vertex_buffer_types[i]) {//->Type()) {
@@ -2372,7 +2381,7 @@ void DX8Wrapper::Apply_Render_State_Changes()
 		}
 	}
 	if (render_state_changed&INDEX_BUFFER_CHANGED) {
-		SNAPSHOT_SAY(("DX8 - apply ib change\n"));
+		SNAPSHOT_SAY(("DX8 - apply ib change"));
 		if (render_state.index_buffer) {
 			switch (render_state.index_buffer_type) {//->Type()) {
 			case BUFFER_TYPE_DX8:
@@ -2399,7 +2408,7 @@ void DX8Wrapper::Apply_Render_State_Changes()
 
 	render_state_changed&=((unsigned)WORLD_IDENTITY|(unsigned)VIEW_IDENTITY);
 
-	SNAPSHOT_SAY(("DX8Wrapper::Apply_Render_State_Changes() - finished\n"));
+	SNAPSHOT_SAY(("DX8Wrapper::Apply_Render_State_Changes() - finished"));
 }
 
 IDirect3DTexture8 * DX8Wrapper::_Create_DX8_Texture
@@ -2442,7 +2451,7 @@ IDirect3DTexture8 * DX8Wrapper::_Create_DX8_Texture
 
 		// If ran out of texture ram, try invalidating some textures and mesh cache.
 		if (ret==D3DERR_OUTOFVIDEOMEMORY) {
-			WWDEBUG_SAY(("Error: Out of memory while creating render target. Trying to release assets...\n"));
+			WWDEBUG_SAY(("Error: Out of memory while creating render target. Trying to release assets..."));
 			// Free all textures that haven't been used in the last 5 seconds
 			TextureClass::Invalidate_Old_Unused_Textures(5000);
 
@@ -2460,10 +2469,10 @@ IDirect3DTexture8 * DX8Wrapper::_Create_DX8_Texture
 				&texture);
 
 			if (SUCCEEDED(ret)) {
-				WWDEBUG_SAY(("...Render target creation succesful.\n"));
+				WWDEBUG_SAY(("...Render target creation succesful."));
 			}
 			else {
-				WWDEBUG_SAY(("...Render target creation failed.\n"));
+				WWDEBUG_SAY(("...Render target creation failed."));
 			}
 			if (ret==D3DERR_OUTOFVIDEOMEMORY) {
 				Non_Fatal_Log_DX8_ErrorCode(ret,__FILE__,__LINE__);
@@ -2492,7 +2501,7 @@ IDirect3DTexture8 * DX8Wrapper::_Create_DX8_Texture
 
 	// If ran out of texture ram, try invalidating some textures and mesh cache.
 	if (ret==D3DERR_OUTOFVIDEOMEMORY) {
-		WWDEBUG_SAY(("Error: Out of memory while creating texture. Trying to release assets...\n"));
+		WWDEBUG_SAY(("Error: Out of memory while creating texture. Trying to release assets..."));
 		// Free all textures that haven't been used in the last 5 seconds
 		TextureClass::Invalidate_Old_Unused_Textures(5000);
 
@@ -2509,12 +2518,12 @@ IDirect3DTexture8 * DX8Wrapper::_Create_DX8_Texture
 			pool,
 			&texture);
 		if (SUCCEEDED(ret)) {
-			WWDEBUG_SAY(("...Texture creation succesful.\n"));
+			WWDEBUG_SAY(("...Texture creation succesful."));
 		}
 		else {
 			StringClass format_name(0,true);
 			Get_WW3D_Format_Name(format, format_name);
-			WWDEBUG_SAY(("...Texture creation failed. (%d x %d, format: %s, mips: %d\n",width,height,format_name,mip_level_count));
+			WWDEBUG_SAY(("...Texture creation failed. (%d x %d, format: %s, mips: %d",width,height,format_name.str(),mip_level_count));
 		}
 
 	}
@@ -2594,7 +2603,7 @@ IDirect3DTexture8 * DX8Wrapper::_Create_DX8_Texture
 	tex_surface->Release();
 
 	// Create mipmaps if needed
-	if (mip_level_count!=MIP_LEVELS_1) 
+	if (mip_level_count!=MIP_LEVELS_1)
 	{
 		DX8_ErrorCode(D3DXFilterTexture(texture, NULL, 0, D3DX_FILTER_BOX));
 	}
@@ -2626,22 +2635,22 @@ IDirect3DTexture8 * DX8Wrapper::_Create_DX8_ZTexture
 		width,
 		height,
 		mip_level_count,
-		D3DUSAGE_DEPTHSTENCIL, 
-		zfmt, 
+		D3DUSAGE_DEPTHSTENCIL,
+		zfmt,
 		pool,
 		&texture
 	);
 
-	if (ret==D3DERR_NOTAVAILABLE) 
+	if (ret==D3DERR_NOTAVAILABLE)
 	{
 		Non_Fatal_Log_DX8_ErrorCode(ret,__FILE__,__LINE__);
 		return NULL;
 	}
 
 	// If ran out of texture ram, try invalidating some textures and mesh cache.
-	if (ret==D3DERR_OUTOFVIDEOMEMORY) 
+	if (ret==D3DERR_OUTOFVIDEOMEMORY)
 	{
-		WWDEBUG_SAY(("Error: Out of memory while creating render target. Trying to release assets...\n"));
+		WWDEBUG_SAY(("Error: Out of memory while creating render target. Trying to release assets..."));
 		// Free all textures that haven't been used in the last 5 seconds
 		TextureClass::Invalidate_Old_Unused_Textures(5000);
 
@@ -2653,21 +2662,21 @@ IDirect3DTexture8 * DX8Wrapper::_Create_DX8_ZTexture
 			width,
 			height,
 			mip_level_count,
-			D3DUSAGE_DEPTHSTENCIL, 
-			zfmt, 
+			D3DUSAGE_DEPTHSTENCIL,
+			zfmt,
 			pool,
 			&texture
 		);
 
-		if (SUCCEEDED(ret)) 
+		if (SUCCEEDED(ret))
 		{
-			WWDEBUG_SAY(("...Render target creation succesful.\n"));
+			WWDEBUG_SAY(("...Render target creation succesful."));
 		}
-		else 
+		else
 		{
-			WWDEBUG_SAY(("...Render target creation failed.\n"));
+			WWDEBUG_SAY(("...Render target creation failed."));
 		}
-		if (ret==D3DERR_OUTOFVIDEOMEMORY) 
+		if (ret==D3DERR_OUTOFVIDEOMEMORY)
 		{
 			Non_Fatal_Log_DX8_ErrorCode(ret,__FILE__,__LINE__);
 			return NULL;
@@ -2710,7 +2719,7 @@ IDirect3DCubeTexture8* DX8Wrapper::_Create_DX8_Cube_Texture
 
 	// Render target may return NOTAVAILABLE, in
 	// which case we return NULL.
-	if (rendertarget) 
+	if (rendertarget)
 	{
 		unsigned ret=D3DXCreateCubeTexture
 		(
@@ -2723,16 +2732,16 @@ IDirect3DCubeTexture8* DX8Wrapper::_Create_DX8_Cube_Texture
 			&texture
 		);
 
-		if (ret==D3DERR_NOTAVAILABLE) 
+		if (ret==D3DERR_NOTAVAILABLE)
 		{
 			Non_Fatal_Log_DX8_ErrorCode(ret,__FILE__,__LINE__);
 			return NULL;
 		}
 
 		// If ran out of texture ram, try invalidating some textures and mesh cache.
-		if (ret==D3DERR_OUTOFVIDEOMEMORY) 
+		if (ret==D3DERR_OUTOFVIDEOMEMORY)
 		{
-			WWDEBUG_SAY(("Error: Out of memory while creating render target. Trying to release assets...\n"));
+			WWDEBUG_SAY(("Error: Out of memory while creating render target. Trying to release assets..."));
 			// Free all textures that haven't been used in the last 5 seconds
 			TextureClass::Invalidate_Old_Unused_Textures(5000);
 
@@ -2752,13 +2761,13 @@ IDirect3DCubeTexture8* DX8Wrapper::_Create_DX8_Cube_Texture
 
 			if (SUCCEEDED(ret))
 			{
-				WWDEBUG_SAY(("...Render target creation succesful.\n"));
+				WWDEBUG_SAY(("...Render target creation succesful."));
 			}
-			else 
+			else
 			{
-				WWDEBUG_SAY(("...Render target creation failed.\n"));
+				WWDEBUG_SAY(("...Render target creation failed."));
 			}
-			if (ret==D3DERR_OUTOFVIDEOMEMORY) 
+			if (ret==D3DERR_OUTOFVIDEOMEMORY)
 			{
 				Non_Fatal_Log_DX8_ErrorCode(ret,__FILE__,__LINE__);
 				return NULL;
@@ -2786,9 +2795,9 @@ IDirect3DCubeTexture8* DX8Wrapper::_Create_DX8_Cube_Texture
 	);
 
 	// If ran out of texture ram, try invalidating some textures and mesh cache.
-	if (ret==D3DERR_OUTOFVIDEOMEMORY) 
+	if (ret==D3DERR_OUTOFVIDEOMEMORY)
 	{
-		WWDEBUG_SAY(("Error: Out of memory while creating texture. Trying to release assets...\n"));
+		WWDEBUG_SAY(("Error: Out of memory while creating texture. Trying to release assets..."));
 		// Free all textures that haven't been used in the last 5 seconds
 		TextureClass::Invalidate_Old_Unused_Textures(5000);
 
@@ -2805,15 +2814,15 @@ IDirect3DCubeTexture8* DX8Wrapper::_Create_DX8_Cube_Texture
 			pool,
 			&texture
 		);
-		if (SUCCEEDED(ret)) 
+		if (SUCCEEDED(ret))
 		{
-			WWDEBUG_SAY(("...Texture creation succesful.\n"));
+			WWDEBUG_SAY(("...Texture creation succesful."));
 		}
-		else 
+		else
 		{
 			StringClass format_name(0,true);
 			Get_WW3D_Format_Name(format, format_name);
-			WWDEBUG_SAY(("...Texture creation failed. (%d x %d, format: %s, mips: %d\n",width,height,format_name,mip_level_count));
+			WWDEBUG_SAY(("...Texture creation failed. (%d x %d, format: %s, mips: %d",width,height,format_name.str(),mip_level_count));
 		}
 
 	}
@@ -2863,9 +2872,9 @@ IDirect3DVolumeTexture8* DX8Wrapper::_Create_DX8_Volume_Texture
 	);
 
 	// If ran out of texture ram, try invalidating some textures and mesh cache.
-	if (ret==D3DERR_OUTOFVIDEOMEMORY) 
+	if (ret==D3DERR_OUTOFVIDEOMEMORY)
 	{
-		WWDEBUG_SAY(("Error: Out of memory while creating texture. Trying to release assets...\n"));
+		WWDEBUG_SAY(("Error: Out of memory while creating texture. Trying to release assets..."));
 		// Free all textures that haven't been used in the last 5 seconds
 		TextureClass::Invalidate_Old_Unused_Textures(5000);
 
@@ -2884,15 +2893,15 @@ IDirect3DVolumeTexture8* DX8Wrapper::_Create_DX8_Volume_Texture
 			pool,
 			&texture
 		);
-		if (SUCCEEDED(ret)) 
+		if (SUCCEEDED(ret))
 		{
-			WWDEBUG_SAY(("...Texture creation succesful.\n"));
+			WWDEBUG_SAY(("...Texture creation succesful."));
 		}
-		else 
+		else
 		{
 			StringClass format_name(0,true);
 			Get_WW3D_Format_Name(format, format_name);
-			WWDEBUG_SAY(("...Texture creation failed. (%d x %d, format: %s, mips: %d\n",width,height,format_name,mip_level_count));
+			WWDEBUG_SAY(("...Texture creation failed. (%d x %d, format: %s, mips: %d",width,height,format_name.str(),mip_level_count));
 		}
 
 	}
@@ -2942,11 +2951,11 @@ IDirect3DSurface8 * DX8Wrapper::_Create_DX8_Surface(const char *filename_)
 			// If file not found, try the dds format
 			// else create a surface with missing texture in it
 			char compressed_name[200];
-			strncpy(compressed_name,filename_, 200);
+			strlcpy(compressed_name,filename_, sizeof(compressed_name));
 			char *ext = strstr(compressed_name, ".");
-			if ( (strlen(ext)==4) && 
-				  ( (ext[1] == 't') || (ext[1] == 'T') ) && 
-				  ( (ext[2] == 'g') || (ext[2] == 'G') ) && 
+			if ( ext && (strlen(ext)==4) &&
+				  ( (ext[1] == 't') || (ext[1] == 'T') ) &&
+				  ( (ext[2] == 'g') || (ext[2] == 'G') ) &&
 				  ( (ext[3] == 'a') || (ext[3] == 'A') ) ) {
 				ext[1]='d';
 				ext[2]='d';
@@ -3096,7 +3105,7 @@ void DX8Wrapper::Set_Light_Environment(LightEnvironmentClass* light_env)
 
 	Light_Environment=light_env;
 
-	if (light_env) 
+	if (light_env)
 	{
 		int light_count = light_env->Get_Light_Count();
 		unsigned int color=Convert_Color(light_env->Get_Equivalent_Ambient(),0.0f);
@@ -3109,12 +3118,12 @@ void DX8Wrapper::Set_Light_Environment(LightEnvironmentClass* light_env)
 #endif
 		}
 
-		D3DLIGHT8 light;		
+		D3DLIGHT8 light;
 		int l=0;
 		for (;l<light_count;++l) {
-			
+
 			::ZeroMemory(&light, sizeof(D3DLIGHT8));
-			
+
 			light.Type=D3DLIGHT_DIRECTIONAL;
 			(Vector3&)light.Diffuse=light_env->Get_Light_Diffuse(l);
 			Vector3 dir=-light_env->Get_Light_Direction(l);
@@ -3131,14 +3140,14 @@ void DX8Wrapper::Set_Light_Environment(LightEnvironmentClass* light_env)
 				(Vector3&)light.Ambient=light_env->getPointAmbient(l);
 				light.Position = (const D3DVECTOR&)light_env->getPointCenter(l);
 				light.Range = light_env->getPointOrad(l);
-				
+
 				// Inverse linear light 1/(1+D)
 				double a,b;
 				b = light_env->getPointOrad(l);
 				a = light_env->getPointIrad(l);
 
 //(gth) CNC3 Generals code for the attenuation factors is causing the lights to over-brighten
-//I'm changing the Attenuation0 parameter to 1.0 to avoid this problem.				
+//I'm changing the Attenuation0 parameter to 1.0 to avoid this problem.
 #if 0
 				light.Attenuation0=0.01f;
 #else
@@ -3150,7 +3159,7 @@ void DX8Wrapper::Set_Light_Environment(LightEnvironmentClass* light_env)
 				else
 					// this will cause the light to drop to half intensity at the first far attenuation
 					light.Attenuation1=(float) 0.1/a;
-	
+
 				light.Attenuation2=8.0f/(b*b);
 			}
 
@@ -3217,7 +3226,7 @@ DX8Wrapper::Create_Render_Target (int width, int height, WW3DFormat format)
 
 	// If render target format isn't supported return NULL
 	if (!Get_Current_Caps()->Support_Render_To_Texture_Format(format)) {
-		WWDEBUG_SAY(("DX8Wrapper - Render target format is not supported\r\n"));
+		WWDEBUG_SAY(("DX8Wrapper - Render target format is not supported"));
 		return NULL;
 	}
 
@@ -3247,9 +3256,9 @@ DX8Wrapper::Create_Render_Target (int width, int height, WW3DFormat format)
 
 	// 3dfx drivers are lying in the CheckDeviceFormat call and claiming
 	// that they support render targets!
-	if (tex->Peek_D3D_Base_Texture() == NULL) 
+	if (tex->Peek_D3D_Base_Texture() == NULL)
 	{
-		WWDEBUG_SAY(("DX8Wrapper - Render target creation failed!\r\n"));
+		WWDEBUG_SAY(("DX8Wrapper - Render target creation failed!"));
 		REF_PTR_RELEASE(tex);
 	}
 
@@ -3262,8 +3271,8 @@ DX8Wrapper::Create_Render_Target (int width, int height, WW3DFormat format)
 */
 void DX8Wrapper::Create_Render_Target
 (
-	int width, 
-	int height, 
+	int width,
+	int height,
 	WW3DFormat format,
 	WW3DZFormat zformat,
 	TextureClass** target,
@@ -3275,7 +3284,7 @@ void DX8Wrapper::Create_Render_Target
 	number_of_DX8_calls++;
 
 	// Use the current display format if format isn't specified
-	if (format==WW3D_FORMAT_UNKNOWN) 
+	if (format==WW3D_FORMAT_UNKNOWN)
 	{
 		*target=NULL;
 		*depth_buffer=NULL;
@@ -3287,27 +3296,27 @@ void DX8Wrapper::Create_Render_Target
 
 	// If render target format isn't supported return NULL
 	if (!Get_Current_Caps()->Support_Render_To_Texture_Format(format) ||
-		 !Get_Current_Caps()->Support_Depth_Stencil_Format(zformat)) 
+		 !Get_Current_Caps()->Support_Depth_Stencil_Format(zformat))
 	{
-		WWDEBUG_SAY(("DX8Wrapper - Render target with depth format is not supported\r\n"));
+		WWDEBUG_SAY(("DX8Wrapper - Render target with depth format is not supported"));
 		return;
 	}
 
 	//	Note: We're going to force the width and height to be powers of two and equal
 	const D3DCAPS8& dx8caps=Get_Current_Caps()->Get_DX8_Caps();
 	float poweroftwosize = width;
-	if (height > 0 && height < width) 
+	if (height > 0 && height < width)
 	{
 		poweroftwosize = height;
 	}
 	poweroftwosize = ::Find_POT (poweroftwosize);
 
-	if (poweroftwosize>dx8caps.MaxTextureWidth) 
+	if (poweroftwosize>dx8caps.MaxTextureWidth)
 	{
 		poweroftwosize=dx8caps.MaxTextureWidth;
 	}
 
-	if (poweroftwosize>dx8caps.MaxTextureHeight) 
+	if (poweroftwosize>dx8caps.MaxTextureHeight)
 	{
 		poweroftwosize=dx8caps.MaxTextureHeight;
 	}
@@ -3319,9 +3328,9 @@ void DX8Wrapper::Create_Render_Target
 
 	// 3dfx drivers are lying in the CheckDeviceFormat call and claiming
 	// that they support render targets!
-	if (tex->Peek_D3D_Base_Texture() == NULL) 
+	if (tex->Peek_D3D_Base_Texture() == NULL)
 	{
-		WWDEBUG_SAY(("DX8Wrapper - Render target creation failed!\r\n"));
+		WWDEBUG_SAY(("DX8Wrapper - Render target creation failed!"));
 		REF_PTR_RELEASE(tex);
 	}
 
@@ -3413,10 +3422,10 @@ DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target, bool use_default
 	//
 	//	Should we restore the default render target set a new one?
 	//
-	if (render_target == NULL || render_target == DefaultRenderTarget) 
+	if (render_target == NULL || render_target == DefaultRenderTarget)
 	{
 		// If there is currently a custom render target, default must NOT be NULL.
-		if (CurrentRenderTarget) 
+		if (CurrentRenderTarget)
 		{
 			WWASSERT(DefaultRenderTarget!=NULL);
 		}
@@ -3424,12 +3433,12 @@ DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target, bool use_default
 		//
 		//	Restore the default render target
 		//
-		if (DefaultRenderTarget != NULL) 
+		if (DefaultRenderTarget != NULL)
 		{
 			DX8CALL(SetRenderTarget (DefaultRenderTarget, DefaultDepthBuffer));
 			DefaultRenderTarget->Release ();
 			DefaultRenderTarget = NULL;
-			if (DefaultDepthBuffer) 
+			if (DefaultDepthBuffer)
 			{
 				DefaultDepthBuffer->Release ();
 				DefaultDepthBuffer = NULL;
@@ -3439,7 +3448,7 @@ DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target, bool use_default
 		//
 		//	Release our hold on the "current" render target
 		//
-		if (CurrentRenderTarget != NULL) 
+		if (CurrentRenderTarget != NULL)
 		{
 			CurrentRenderTarget->Release ();
 			CurrentRenderTarget = NULL;
@@ -3451,15 +3460,15 @@ DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target, bool use_default
 			CurrentDepthBuffer=NULL;
 		}
 
-	} 
-	else if (render_target != CurrentRenderTarget) 
+	}
+	else if (render_target != CurrentRenderTarget)
 	{
 		WWASSERT(DefaultRenderTarget==NULL);
 
 		//
 		//	We'll need the depth buffer later...
 		//
-		if (DefaultDepthBuffer == NULL) 
+		if (DefaultDepthBuffer == NULL)
 		{
 //		IDirect3DSurface8 *depth_buffer = NULL;
 			DX8CALL(GetDepthStencilSurface (&DefaultDepthBuffer));
@@ -3468,7 +3477,7 @@ DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target, bool use_default
 		//
 		//	Get a pointer to the default render target (if necessary)
 		//
-		if (DefaultRenderTarget == NULL) 
+		if (DefaultRenderTarget == NULL)
 		{
 			DX8CALL(GetRenderTarget (&DefaultRenderTarget));
 		}
@@ -3476,7 +3485,7 @@ DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target, bool use_default
 		//
 		//	Release our hold on the old "current" render target
 		//
-		if (CurrentRenderTarget != NULL) 
+		if (CurrentRenderTarget != NULL)
 		{
 			CurrentRenderTarget->Release ();
 			CurrentRenderTarget = NULL;
@@ -3493,18 +3502,18 @@ DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target, bool use_default
 		//
 		CurrentRenderTarget = render_target;
 		WWASSERT (CurrentRenderTarget != NULL);
-		if (CurrentRenderTarget != NULL) 
+		if (CurrentRenderTarget != NULL)
 		{
 			CurrentRenderTarget->AddRef ();
 
 			//
 			//	Switch render targets
 			//
-			if (use_default_depth_buffer) 
+			if (use_default_depth_buffer)
 			{
 				DX8CALL(SetRenderTarget (CurrentRenderTarget, DefaultDepthBuffer));
 			}
-			else 
+			else
 			{
 				DX8CALL(SetRenderTarget (CurrentRenderTarget, NULL));
 			}
@@ -3531,8 +3540,8 @@ DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target, bool use_default
 */
 void DX8Wrapper::Set_Render_Target
 (
-	IDirect3DSurface8* render_target, 
-	IDirect3DSurface8* depth_buffer 
+	IDirect3DSurface8* render_target,
+	IDirect3DSurface8* depth_buffer
 )
 {
 //#ifndef _XBOX
@@ -3542,10 +3551,10 @@ void DX8Wrapper::Set_Render_Target
 	//
 	//	Should we restore the default render target set a new one?
 	//
-	if (render_target == NULL || render_target == DefaultRenderTarget) 
+	if (render_target == NULL || render_target == DefaultRenderTarget)
 	{
 		// If there is currently a custom render target, default must NOT be NULL.
-		if (CurrentRenderTarget) 
+		if (CurrentRenderTarget)
 		{
 			WWASSERT(DefaultRenderTarget!=NULL);
 		}
@@ -3553,12 +3562,12 @@ void DX8Wrapper::Set_Render_Target
 		//
 		//	Restore the default render target
 		//
-		if (DefaultRenderTarget != NULL) 
+		if (DefaultRenderTarget != NULL)
 		{
 			DX8CALL(SetRenderTarget (DefaultRenderTarget, DefaultDepthBuffer));
 			DefaultRenderTarget->Release ();
 			DefaultRenderTarget = NULL;
-			if (DefaultDepthBuffer) 
+			if (DefaultDepthBuffer)
 			{
 				DefaultDepthBuffer->Release ();
 				DefaultDepthBuffer = NULL;
@@ -3568,7 +3577,7 @@ void DX8Wrapper::Set_Render_Target
 		//
 		//	Release our hold on the "current" render target
 		//
-		if (CurrentRenderTarget != NULL) 
+		if (CurrentRenderTarget != NULL)
 		{
 			CurrentRenderTarget->Release ();
 			CurrentRenderTarget = NULL;
@@ -3580,14 +3589,14 @@ void DX8Wrapper::Set_Render_Target
 			CurrentDepthBuffer=NULL;
 		}
 	}
-	else if (render_target != CurrentRenderTarget) 
+	else if (render_target != CurrentRenderTarget)
 	{
 		WWASSERT(DefaultRenderTarget==NULL);
 
 		//
 		//	We'll need the depth buffer later...
 		//
-		if (DefaultDepthBuffer == NULL) 
+		if (DefaultDepthBuffer == NULL)
 		{
 //		IDirect3DSurface8 *depth_buffer = NULL;
 			DX8CALL(GetDepthStencilSurface (&DefaultDepthBuffer));
@@ -3596,7 +3605,7 @@ void DX8Wrapper::Set_Render_Target
 		//
 		//	Get a pointer to the default render target (if necessary)
 		//
-		if (DefaultRenderTarget == NULL) 
+		if (DefaultRenderTarget == NULL)
 		{
 			DX8CALL(GetRenderTarget (&DefaultRenderTarget));
 		}
@@ -3604,7 +3613,7 @@ void DX8Wrapper::Set_Render_Target
 		//
 		//	Release our hold on the old "current" render target
 		//
-		if (CurrentRenderTarget != NULL) 
+		if (CurrentRenderTarget != NULL)
 		{
 			CurrentRenderTarget->Release ();
 			CurrentRenderTarget = NULL;
@@ -3622,7 +3631,7 @@ void DX8Wrapper::Set_Render_Target
 		CurrentRenderTarget = render_target;
 		CurrentDepthBuffer = depth_buffer;
 		WWASSERT (CurrentRenderTarget != NULL);
-		if (CurrentRenderTarget != NULL) 
+		if (CurrentRenderTarget != NULL)
 		{
 			CurrentRenderTarget->AddRef ();
 			CurrentDepthBuffer->AddRef();
@@ -3698,7 +3707,7 @@ void DX8Wrapper::Set_Gamma(float gamma,float bright,float contrast,bool calibrat
 	DWORD flag=(calibrate?D3DSGR_CALIBRATE:D3DSGR_NO_CALIBRATION);
 
 	D3DGAMMARAMP ramp;
-	float			 limit;	
+	float			 limit;
 
 	// IML: I'm not really sure what the intent of the 'limit' variable is. It does not produce useful results for my purposes.
 	if (uselimit) {
@@ -3740,8 +3749,8 @@ void DX8Wrapper::Set_Gamma(float gamma,float bright,float contrast,bool calibrat
 */
 void DX8Wrapper::Apply_Default_State()
 {
-	SNAPSHOT_SAY(("DX8Wrapper::Apply_Default_State()\n"));
-	
+	SNAPSHOT_SAY(("DX8Wrapper::Apply_Default_State()"));
+
 	// only set states used in game
 	Set_DX8_Render_State(D3DRS_ZENABLE, TRUE);
 //	Set_DX8_Render_State(D3DRS_FILLMODE, D3DFILL_SOLID);
@@ -3833,7 +3842,7 @@ void DX8Wrapper::Apply_Default_State()
 		Set_DX8_Texture_Stage_State(i, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
 		Set_DX8_Texture_Stage_State(i, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
 		Set_DX8_Texture_Stage_State(i, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE);
-	
+
 		/*Set_DX8_Texture_Stage_State(i, D3DTSS_BUMPENVMAT00, 0);
 		Set_DX8_Texture_Stage_State(i, D3DTSS_BUMPENVMAT01, 0);
 		Set_DX8_Texture_Stage_State(i, D3DTSS_BUMPENVMAT10, 0);
@@ -3842,7 +3851,7 @@ void DX8Wrapper::Apply_Default_State()
 		Set_DX8_Texture_Stage_State(i, D3DTSS_BUMPENVLOFFSET, 0);*/
 
 		Set_DX8_Texture_Stage_State(i, D3DTSS_TEXCOORDINDEX, i);
-		
+
 
 		Set_DX8_Texture_Stage_State(i, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
 		Set_DX8_Texture_Stage_State(i, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
@@ -3866,11 +3875,11 @@ void DX8Wrapper::Apply_Default_State()
 	VertexMaterialClass::Apply_Null();
 
 	for (unsigned index=0;index<4;++index) {
-		SNAPSHOT_SAY(("Clearing light %d to NULL\n",index));
+		SNAPSHOT_SAY(("Clearing light %d to NULL",index));
 		Set_DX8_Light(index,NULL);
 	}
 
-	// set up simple default TSS 
+	// set up simple default TSS
 	Vector4 vconst[MAX_VERTEX_SHADER_CONSTANTS];
 	memset(vconst,0,sizeof(Vector4)*MAX_VERTEX_SHADER_CONSTANTS);
 	Set_Vertex_Shader_Constant(0, vconst, MAX_VERTEX_SHADER_CONSTANTS);
@@ -4182,6 +4191,7 @@ void DX8Wrapper::Get_DX8_Texture_Stage_State_Value_Name(StringClass& name, D3DTE
 
 	case D3DTSS_TEXTURETRANSFORMFLAGS:
 		name=Get_DX8_Texture_Transform_Flag_Name(value);
+		break;
 
 	// Floating point values
 	case D3DTSS_MIPMAPLODBIAS:
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h
index b87250b78e1..db5b93030cb 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h
@@ -26,25 +26,20 @@
  *                                                                                             *
  *              Original Author:: Jani Penttinen                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 08/05/02 2:40p                                              $*
  *                                                                                             *
  *                    $Revision:: 92                                                          $*
  *                                                                                             *
  * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
  * 06/27/02 KM Render to shadow buffer texture support														*
- * 08/05/02 KM Texture class redesign 
+ * 08/05/02 KM Texture class redesign
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef DX8_WRAPPER_H
-#define DX8_WRAPPER_H
 
 #include "always.h"
 #include "dllist.h"
@@ -494,8 +489,8 @@ class DX8Wrapper
 	// for depth map support KJM V
 	static void Create_Render_Target
 	(
-		int width, 
-		int height, 
+		int width,
+		int height,
 		WW3DFormat format,
 		WW3DZFormat zformat,
 		TextureClass** target,
@@ -643,7 +638,7 @@ class DX8Wrapper
 	static int								TextureBitDepth;
 	static bool								IsWindowed;
 	static D3DFORMAT					DisplayFormat;
-	
+
 	static D3DMATRIX						old_world;
 	static D3DMATRIX						old_view;
 	static D3DMATRIX						old_prj;
@@ -764,11 +759,11 @@ WWINLINE void DX8Wrapper::_Set_DX8_Transform(D3DTRANSFORMSTATETYPE transform,con
 {
 	WWASSERT(transform<=D3DTS_WORLD);
 #if 0 // (gth) this optimization is breaking generals because they set the transform behind our backs.
-	if (m!=DX8Transforms[transform]) 
+	if (m!=DX8Transforms[transform])
 #endif
 	{
 		DX8Transforms[transform]=m;
-		SNAPSHOT_SAY(("DX8 - SetTransform %d [%f,%f,%f,%f][%f,%f,%f,%f][%f,%f,%f,%f][%f,%f,%f,%f]\n",transform,m[0][0],m[0][1],m[0][2],m[0][3],m[1][0],m[1][1],m[1][2],m[1][3],m[2][0],m[2][1],m[2][2],m[2][3],m[3][0],m[3][1],m[3][2],m[3][3]));
+		SNAPSHOT_SAY(("DX8 - SetTransform %d [%f,%f,%f,%f][%f,%f,%f,%f][%f,%f,%f,%f][%f,%f,%f,%f]",transform,m[0][0],m[0][1],m[0][2],m[0][3],m[1][0],m[1][1],m[1][2],m[1][3],m[2][0],m[2][1],m[2][2],m[2][3],m[3][0],m[3][1],m[3][2],m[3][3]));
 		DX8_RECORD_MATRIX_CHANGE();
 		DX8CALL(SetTransform(transform,(D3DMATRIX*)&m));
 	}
@@ -780,11 +775,11 @@ WWINLINE void DX8Wrapper::_Set_DX8_Transform(D3DTRANSFORMSTATETYPE transform,con
 	WWASSERT(transform<=D3DTS_WORLD);
 	Matrix4x4 mtx(m);
 #if 0 // (gth) this optimization is breaking generals because they set the transform behind our backs.
-	if (mtx!=DX8Transforms[transform]) 
+	if (mtx!=DX8Transforms[transform])
 #endif
 	{
 		DX8Transforms[transform]=mtx;
-		SNAPSHOT_SAY(("DX8 - SetTransform %d [%f,%f,%f,%f][%f,%f,%f,%f][%f,%f,%f,%f]\n",transform,m[0][0],m[0][1],m[0][2],m[0][3],m[1][0],m[1][1],m[1][2],m[1][3],m[2][0],m[2][1],m[2][2],m[2][3]));
+		SNAPSHOT_SAY(("DX8 - SetTransform %d [%f,%f,%f,%f][%f,%f,%f,%f][%f,%f,%f,%f]",transform,m[0][0],m[0][1],m[0][2],m[0][3],m[1][0],m[1][1],m[1][2],m[1][3],m[2][0],m[2][1],m[2][2],m[2][3]));
 		DX8_RECORD_MATRIX_CHANGE();
 		DX8CALL(SetTransform(transform,(D3DMATRIX*)&m));
 	}
@@ -850,7 +845,7 @@ WWINLINE void DX8Wrapper::Set_DX8_Material(const D3DMATERIAL8* mat)
 {
 	DX8_RECORD_MATERIAL_CHANGE();
 	WWASSERT(mat);
-	SNAPSHOT_SAY(("DX8 - SetMaterial\n"));
+	SNAPSHOT_SAY(("DX8 - SetMaterial"));
 	DX8CALL(SetMaterial(mat));
 }
 
@@ -861,13 +856,13 @@ WWINLINE void DX8Wrapper::Set_DX8_Light(int index, D3DLIGHT8* light)
 		DX8CALL(SetLight(index,light));
 		DX8CALL(LightEnable(index,TRUE));
 		CurrentDX8LightEnables[index]=true;
-		SNAPSHOT_SAY(("DX8 - SetLight %d\n",index));
+		SNAPSHOT_SAY(("DX8 - SetLight %d",index));
 	}
 	else if (CurrentDX8LightEnables[index]) {
 		DX8_RECORD_LIGHT_CHANGE();
 		CurrentDX8LightEnables[index]=false;
 		DX8CALL(LightEnable(index,FALSE));
-		SNAPSHOT_SAY(("DX8 - DisableLight %d\n",index));
+		SNAPSHOT_SAY(("DX8 - DisableLight %d",index));
 	}
 }
 
@@ -880,9 +875,9 @@ WWINLINE void DX8Wrapper::Set_DX8_Render_State(D3DRENDERSTATETYPE state, unsigne
 	if (WW3D::Is_Snapshot_Activated()) {
 		StringClass value_name(0,true);
 		Get_DX8_Render_State_Value_Name(value_name,state,value);
-		SNAPSHOT_SAY(("DX8 - SetRenderState(state: %s, value: %s)\n",
+		SNAPSHOT_SAY(("DX8 - SetRenderState(state: %s, value: %s)",
 			Get_DX8_Render_State_Name(state),
-			value_name));
+			value_name.str()));
 	}
 #endif
 
@@ -909,10 +904,10 @@ WWINLINE void DX8Wrapper::Set_DX8_Texture_Stage_State(unsigned stage, D3DTEXTURE
 	if (WW3D::Is_Snapshot_Activated()) {
 		StringClass value_name(0,true);
 		Get_DX8_Texture_Stage_State_Value_Name(value_name,state,value);
-		SNAPSHOT_SAY(("DX8 - SetTextureStageState(stage: %d, state: %s, value: %s)\n",
+		SNAPSHOT_SAY(("DX8 - SetTextureStageState(stage: %d, state: %s, value: %s)",
 			stage,
 			Get_DX8_Texture_Stage_State_Name(state),
-			value_name));
+			value_name.str()));
 	}
 #endif
 
@@ -930,7 +925,7 @@ WWINLINE void DX8Wrapper::Set_DX8_Texture(unsigned int stage, IDirect3DBaseTextu
 
 	if (Textures[stage]==texture) return;
 
-	SNAPSHOT_SAY(("DX8 - SetTexture(%x) \n",texture));
+	SNAPSHOT_SAY(("DX8 - SetTexture(%x) ",texture));
 
 	if (Textures[stage]) Textures[stage]->Release();
 	Textures[stage] = texture;
@@ -1197,7 +1192,7 @@ WWINLINE void DX8Wrapper::Set_Material(const VertexMaterialClass* material)
 //	}
 	REF_PTR_SET(render_state.material,const_cast<VertexMaterialClass*>(material));
 	render_state_changed|=MATERIAL_CHANGED;
-	SNAPSHOT_SAY(("DX8Wrapper::Set_Material(%s)\n",material ? material->Get_Name() : "NULL"));
+	SNAPSHOT_SAY(("DX8Wrapper::Set_Material(%s)",material ? material->Get_Name() : "NULL"));
 }
 
 WWINLINE void DX8Wrapper::Set_Shader(const ShaderClass& shader)
@@ -1210,7 +1205,7 @@ WWINLINE void DX8Wrapper::Set_Shader(const ShaderClass& shader)
 #ifdef MESH_RENDER_SNAPSHOT_ENABLED
 	StringClass str;
 #endif
-	SNAPSHOT_SAY(("DX8Wrapper::Set_Shader(%s)\n",shader.Get_Description(str)));
+	SNAPSHOT_SAY(("DX8Wrapper::Set_Shader(%s)",shader.Get_Description(str).str()));
 }
 
 WWINLINE void DX8Wrapper::Set_Projection_Transform_With_Z_Bias(const Matrix4x4& matrix, float znear, float zfar)
@@ -1350,7 +1345,7 @@ WWINLINE void DX8Wrapper::Get_Transform(D3DTRANSFORMSTATETYPE transform, Matrix4
 
 WWINLINE const D3DLIGHT8& DX8Wrapper::Peek_Light(unsigned index)
 {
-	return render_state.Lights[index];;
+	return render_state.Lights[index];
 }
 
 WWINLINE bool DX8Wrapper::Is_Light_Enabled(unsigned index)
@@ -1367,9 +1362,9 @@ WWINLINE void DX8Wrapper::Set_Render_State(const RenderStateStruct& state)
 		render_state.index_buffer->Release_Engine_Ref();
 	}
 
-	for (i=0;i<MAX_VERTEX_STREAMS;++i) 
+	for (i=0;i<MAX_VERTEX_STREAMS;++i)
 	{
-		if (render_state.vertex_buffers[i]) 
+		if (render_state.vertex_buffers[i])
 		{
 			render_state.vertex_buffers[i]->Release_Engine_Ref();
 		}
@@ -1382,9 +1377,9 @@ WWINLINE void DX8Wrapper::Set_Render_State(const RenderStateStruct& state)
 		render_state.index_buffer->Add_Engine_Ref();
 	}
 
-	for (i=0;i<MAX_VERTEX_STREAMS;++i) 
+	for (i=0;i<MAX_VERTEX_STREAMS;++i)
 	{
-		if (render_state.vertex_buffers[i]) 
+		if (render_state.vertex_buffers[i])
 		{
 			render_state.vertex_buffers[i]->Add_Engine_Ref();
 		}
@@ -1411,8 +1406,8 @@ WWINLINE void DX8Wrapper::Release_Render_State()
 	REF_PTR_RELEASE(render_state.index_buffer);
 	REF_PTR_RELEASE(render_state.material);
 
-	
-	for (i=0;i<MAX_TEXTURE_STAGES;++i) 
+
+	for (i=0;i<MAX_TEXTURE_STAGES;++i)
 	{
 		REF_PTR_RELEASE(render_state.Textures[i]);
 	}
@@ -1439,7 +1434,7 @@ WWINLINE RenderStateStruct::~RenderStateStruct()
 	}
 	REF_PTR_RELEASE(index_buffer);
 
-	for (i=0;i<MAX_TEXTURE_STAGES;++i) 
+	for (i=0;i<MAX_TEXTURE_STAGES;++i)
 	{
 		REF_PTR_RELEASE(Textures[i]);
 	}
@@ -1448,14 +1443,14 @@ WWINLINE RenderStateStruct::~RenderStateStruct()
 
 WWINLINE unsigned flimby( char* name, unsigned crib )
 {
-  unsigned lnt prevVer = 0x00000000;  
+  unsigned lnt prevVer = 0x00000000;
   unsigned D3D2_BASE_VEC nextVer = 0;
   for( unsigned t = 0; t < crib; ++t )
   {
     (D3D2_BASE_VEC)nextVer += name[t];
     (D3D2_BASE_VEC)nextVer %= 32;
     (D3D2_BASE_VEC)nextVer-- ;
-    (lnt) prevVer ^=  ( 1 << (D3D2_BASE_VEC)prevVer ); 
+    (lnt) prevVer ^=  ( 1 << (D3D2_BASE_VEC)prevVer );
   }
   return (lnt) prevVer;
 }
@@ -1469,7 +1464,7 @@ WWINLINE RenderStateStruct& RenderStateStruct::operator= (const RenderStateStruc
 	}
 	REF_PTR_SET(index_buffer,src.index_buffer);
 
-	for (i=0;i<MAX_TEXTURE_STAGES;++i) 
+	for (i=0;i<MAX_TEXTURE_STAGES;++i)
 	{
 		REF_PTR_SET(Textures[i],src.Textures[i]);
 	}
@@ -1509,6 +1504,3 @@ WWINLINE RenderStateStruct& RenderStateStruct::operator= (const RenderStateStruc
 
 	return *this;
 }
-
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp
index fd5720e8025..8d3faef5209 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp
@@ -17,37 +17,36 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/hanimmgr.cpp 3     1/16/02 9:51a Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/hanimmgr.cpp                           $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 1/16/02 9:49a                                               $* 
- *                                                                                             * 
- *                    $Revision:: 3                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   HAnimManagerClass::HAnimManagerClass -- constructor                                       * 
- *   HAnimManagerClass::~HAnimManagerClass -- destructor                                       * 
- *   HAnimManagerClass::Load_Anim -- loads a set of motion data from a file                    * 
- *   HAnimManagerClass::Get_Anim_ID -- looks up the ID of a named Hierarchy Animation          * 
- *   HAnimManagerClass::Get_Anim -- returns a pointer to the specified animation data          * 
- *   HAnimManagerClass::Get_Anim -- returns a pointer to the specified Hierarchy Animation     * 
- *   HAnimManagerClass::Free -- de-allocate all memory in use                                  * 
- *   HAnimManagerClass::Free_All_Anims -- de-allocate all currently loaded animations          * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/hanimmgr.cpp                           $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 1/16/02 9:49a                                               $*
+ *                                                                                             *
+ *                    $Revision:: 3                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   HAnimManagerClass::HAnimManagerClass -- constructor                                       *
+ *   HAnimManagerClass::~HAnimManagerClass -- destructor                                       *
+ *   HAnimManagerClass::Load_Anim -- loads a set of motion data from a file                    *
+ *   HAnimManagerClass::Get_Anim_ID -- looks up the ID of a named Hierarchy Animation          *
+ *   HAnimManagerClass::Get_Anim -- returns a pointer to the specified animation data          *
+ *   HAnimManagerClass::Get_Anim -- returns a pointer to the specified Hierarchy Animation     *
+ *   HAnimManagerClass::Free -- de-allocate all memory in use                                  *
+ *   HAnimManagerClass::Free_All_Anims -- de-allocate all currently loaded animations          *
  *   HAnimManagerClass::Load_Raw_Anim -- Load a raw anim                                       *
  *   HAnimManagerClass::Load_Compressed_Anim -- load a compressed animation                    *
  *	  HAnimManagerClass::Add_Anim -- Adds an externally created animation to the manager		  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "hanimmgr.h"
-#include <string.h>
 #include "hanim.h"
 #include "hrawanim.h"
 #include "hcanim.h"
@@ -58,19 +57,19 @@
 #include "animatedsoundmgr.h"
 
 
-/*********************************************************************************************** 
- * HAnimManagerClass::HAnimManagerClass -- constructor                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::HAnimManagerClass -- constructor                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
-HAnimManagerClass::HAnimManagerClass(void) 
+HAnimManagerClass::HAnimManagerClass(void)
 {
 	// Create the hash tables
 	AnimPtrTable = W3DNEW HashTableClass( 2048 );
@@ -78,17 +77,17 @@ HAnimManagerClass::HAnimManagerClass(void)
 }
 
 
-/*********************************************************************************************** 
- * HAnimManagerClass::~HAnimManagerClass -- destructor                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::~HAnimManagerClass -- destructor                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HAnimManagerClass::~HAnimManagerClass(void)
 {
@@ -104,23 +103,23 @@ HAnimManagerClass::~HAnimManagerClass(void)
 }
 
 
-/*********************************************************************************************** 
- * HAnimManagerClass::Load_Anim -- loads a set of motion data from a file                      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::Load_Anim -- loads a set of motion data from a file                      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HAnimManagerClass::Load_Anim(ChunkLoadClass & cload)
 {
 	WWMEMLOG(MEM_ANIMATION);
 
-	switch (cload.Cur_Chunk_ID()) 
+	switch (cload.Cur_Chunk_ID())
 	{
 	case W3D_CHUNK_ANIMATION:
 		return Load_Raw_Anim(cload);
@@ -267,17 +266,17 @@ int HAnimManagerClass::Load_Compressed_Anim(ChunkLoadClass & cload)
 	return 1;
 }
 
-/*********************************************************************************************** 
- * HAnimManagerClass::Peek_Anim -- returns a pointer to the specified animation data            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::Peek_Anim -- returns a pointer to the specified animation data            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HAnimClass * HAnimManagerClass::Peek_Anim(const char * name)
 {
@@ -285,20 +284,20 @@ HAnimClass * HAnimManagerClass::Peek_Anim(const char * name)
 }
 
 
-/*********************************************************************************************** 
- * HAnimManagerClass::Get_Anim -- returns a pointer to the specified animation data            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::Get_Anim -- returns a pointer to the specified animation data            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HAnimClass * HAnimManagerClass::Get_Anim(const char * name)
-{	
+{
 	HAnimClass * anim = Peek_Anim( name );
 	if ( anim != NULL ) {
 		anim->Add_Ref();
@@ -307,17 +306,17 @@ HAnimClass * HAnimManagerClass::Get_Anim(const char * name)
 }
 
 
-/*********************************************************************************************** 
- * HAnimManagerClass::Free_All_Anims -- de-allocate all currently loaded animations            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::Free_All_Anims -- de-allocate all currently loaded animations            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HAnimManagerClass::Free_All_Anims(void)
 {
@@ -331,18 +330,18 @@ void HAnimManagerClass::Free_All_Anims(void)
 	// Then clear the table
 	AnimPtrTable->Reset();
 }
-	
-/*********************************************************************************************** 
- * HAnimManagerClass::Free_All_Anims_With_Exclusion_List -- release animations not in the list * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   12/12/2002 GH  : Created.                                                                 * 
+
+/***********************************************************************************************
+ * HAnimManagerClass::Free_All_Anims_With_Exclusion_List -- release animations not in the list *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/12/2002 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HAnimManagerClass::Free_All_Anims_With_Exclusion_List(const W3DExclusionListClass & exclusion_list)
 {
@@ -352,29 +351,29 @@ void HAnimManagerClass::Free_All_Anims_With_Exclusion_List(const W3DExclusionLis
 		HAnimClass *anim = it.Get_Current_Anim();
 
 		if ((anim->Num_Refs() == 1) && (exclusion_list.Is_Excluded(anim) == false)) {
-			//WWDEBUG_SAY(("deleting HAnim %s\n",anim->Get_Name()));
+			//WWDEBUG_SAY(("deleting HAnim %s",anim->Get_Name()));
 			AnimPtrTable->Remove(anim);
 			anim->Release_Ref();
 		}
 		//else
 		//{
-		//	WWDEBUG_SAY(("keeping HAnim %s (ref %d)\n",anim->Get_Name(),anim->Num_Refs()));
+		//	WWDEBUG_SAY(("keeping HAnim %s (ref %d)",anim->Get_Name(),anim->Num_Refs()));
 		//}
 	}
 }
 
 
-/*********************************************************************************************** 
- * HAnimManagerClass::Create_Asset_List -- Create a list of the W3D files that are loaded      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   12/12/2002 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HAnimManagerClass::Create_Asset_List -- Create a list of the W3D files that are loaded      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/12/2002 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HAnimManagerClass::Create_Asset_List(DynamicVectorClass<StringClass> & exclusion_list)
 {
@@ -386,24 +385,24 @@ void HAnimManagerClass::Create_Asset_List(DynamicVectorClass<StringClass> & excl
 		// Anims are named in the format: <skeleton>.<animname>
 		const char * anim_name = anim->Get_Name();
 		const char * filename = strchr(anim_name,'.');
-		if (filename != NULL) {	
+		if (filename != NULL) {
 			exclusion_list.Add(StringClass(filename+1));
 		}
 	}
 }
 
 
-/*********************************************************************************************** 
+/***********************************************************************************************
  * HAnimManagerClass::Add_Anim -- Adds an externally created animation to the manager			  *
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   05/31/2000 PDS  : Created.                                                                * 
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   05/31/2000 PDS  : Created.                                                                *
  *=============================================================================================*/
 bool HAnimManagerClass::Add_Anim(HAnimClass *new_anim)
 {
@@ -451,8 +450,8 @@ void	HAnimManagerClass::Reset_Missing( void )
 /*
 ** Iterator converter from HashableClass to HAnimClass
 */
-HAnimClass * HAnimManagerIterator::Get_Current_Anim( void )	
-{ 
-	return (HAnimClass *)Get_Current(); 
+HAnimClass * HAnimManagerIterator::Get_Current_Anim( void )
+{
+	return (HAnimClass *)Get_Current();
 }
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h
index 02200112d53..74dc55d3fa0 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h
@@ -17,36 +17,30 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/hanimmgr.h 1     1/22/01 3:36p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/hanimmgr.h                             $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 1/08/01 10:04a                                              $* 
- *                                                                                             * 
- *                    $Revision:: 1                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/hanimmgr.h                             $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 1/08/01 10:04a                                              $*
+ *                                                                                             *
+ *                    $Revision:: 1                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HANIMMGR_H
-#define HANIMMGR_H
 
 #include "always.h"
 #include "hash.h"
 #include "wwstring.h"
-#include "Vector.H"
+#include "Vector.h"
 
 class HAnimClass;
 class ChunkLoadClass;
@@ -113,5 +107,3 @@ class HAnimManagerIterator : public HashTableIteratorClass {
 	HAnimManagerIterator( HAnimManagerClass & manager ) : HashTableIteratorClass( *manager.AnimPtrTable ) {}
 	HAnimClass * Get_Current_Anim( void );
 };
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
index 7ed86d8c585..383a03d2825 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
@@ -128,12 +128,11 @@
 
 #include "hlod.h"
 #include "assetmgr.h"
-#include "hmdldef.H"
+#include "hmdldef.h"
 #include "w3derr.h"
 #include "chunkio.h"
 #include "predlod.h"
 #include "rinfo.h"
-#include <string.h>
 #include <win.h>
 #include "sphere.h"
 #include "boxrobj.h"
@@ -145,14 +144,14 @@
 HLodLoaderClass			_HLodLoader;
 
 
-/** 
+/**
 ** ProxyRecordClass
 ** This is a structure that contains the data describing a single "proxy" object.  These
 ** are used for application purposes and simply provide a way for the assets to associate
 ** a string with a bone index.
 */
 class ProxyRecordClass
-{	
+{
 public:
 	ProxyRecordClass(void) : BoneIndex(0)
 	{
@@ -165,7 +164,7 @@ class ProxyRecordClass
 	void					Init(const W3dHLodSubObjectStruct & w3d_data)
 	{
 		BoneIndex = w3d_data.BoneIndex;
-		strncpy(Name,w3d_data.Name,sizeof(Name));
+		strlcpy(Name,w3d_data.Name,sizeof(Name));
 	}
 
 	int					Get_Bone_Index(void)		{ return BoneIndex; }
@@ -224,9 +223,9 @@ PrototypeClass *HLodLoaderClass::Load_W3D( ChunkLoadClass &cload )
 		delete def;
 		return NULL;
 	} else {
-		// ok, accept this model! 
+		// ok, accept this model!
 		HLodPrototypeClass *proto = W3DNEW HLodPrototypeClass(def);
-		return proto;	
+		return proto;
 	}
 	return NULL;
 }
@@ -248,9 +247,9 @@ PrototypeClass *HLodLoaderClass::Load_W3D( ChunkLoadClass &cload )
  * HISTORY:                                                                                    *
  *   1/26/00    gth : Created.                                                                 *
  *=============================================================================================*/
-RenderObjClass * HLodPrototypeClass::Create(void)			
-{ 
-	HLodClass * hlod = NEW_REF( HLodClass , ( *Definition ) ); 
+RenderObjClass * HLodPrototypeClass::Create(void)
+{
+	HLodClass * hlod = NEW_REF( HLodClass , ( *Definition ) );
 	return hlod;
 }
 
@@ -270,7 +269,7 @@ RenderObjClass * HLodPrototypeClass::Create(void)
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-HLodDefClass::HLodDefClass(void) : 
+HLodDefClass::HLodDefClass(void) :
 	Name(NULL),
 	HierarchyTreeName(NULL),
 	LodCount(0),
@@ -337,20 +336,14 @@ HLodDefClass::~HLodDefClass(void)
  *=============================================================================================*/
 void HLodDefClass::Free(void)
 {
-	if (Name) {
-		::free(Name);
-		Name = NULL;
-	}
+	::free(Name);
+	Name = NULL;
 
-	if (HierarchyTreeName) {
-		::free(HierarchyTreeName);
-		HierarchyTreeName = NULL;
-	}
+	::free(HierarchyTreeName);
+	HierarchyTreeName = NULL;
 
-	if (Lod) {
-		delete[] Lod;
-		Lod = NULL;
-	}
+	delete[] Lod;
+	Lod = NULL;
 	LodCount = 0;
 
 	REF_PTR_RELEASE(ProxyArray);
@@ -387,7 +380,7 @@ void HLodDefClass::Initialize(HLodClass &src_lod)
 	LodCount = src_lod.Get_LOD_Count ();
 	WWASSERT (LodCount > 0);
 	if (LodCount > 0) {
-		
+
 		// Allocate an array large enough to hold all the LODs and
 		// loop through each LOD.
 		Lod = W3DNEWARRAY SubObjectArrayClass[LodCount];
@@ -396,13 +389,13 @@ void HLodDefClass::Initialize(HLodClass &src_lod)
 			// Fill in the maximum screen size for this LOD
 			Lod[index].MaxScreenSize = src_lod.Get_Max_Screen_Size (index);
 			Lod[index].ModelCount = src_lod.Get_Lod_Model_Count (index);
-			
-			// Loop through all the models that compose this LOD and generate a 
+
+			// Loop through all the models that compose this LOD and generate a
 			// list of model's and the bones they live on
 			char **model_names = W3DNEWARRAY char *[Lod[index].ModelCount];
 			int *bone_indicies = W3DNEWARRAY int[Lod[index].ModelCount];
 			for (int model_index = 0; model_index < Lod[index].ModelCount; model_index ++) {
-				
+
 				// Record information about this model (if possible)
 				RenderObjClass *prender_obj = src_lod.Peek_Lod_Model (index, model_index);
 				if (prender_obj != NULL) {
@@ -419,7 +412,7 @@ void HLodDefClass::Initialize(HLodClass &src_lod)
 			Lod[index].BoneIndex = bone_indicies;
 		}
 	}
-	
+
 	return;
 }
 
@@ -443,11 +436,11 @@ WW3DErrorType HLodDefClass::Save(ChunkSaveClass & csave)
 
 	// Begin a chunk that identifies an aggregate
 	if (csave.Begin_Chunk (W3D_CHUNK_HLOD) == TRUE) {
-		
+
 		// Attempt to save the different sections of the aggregate definition
 		if ((Save_Header (csave) == WW3D_ERROR_OK) &&
 			 (Save_Lod_Array (csave) == WW3D_ERROR_OK)) {
-			
+
 			// Success!
 			ret_val = WW3D_ERROR_OK;
 		}
@@ -480,25 +473,25 @@ WW3DErrorType HLodDefClass::Save_Header(ChunkSaveClass &csave)
 
 	// Begin a chunk that identifies the aggregate
 	if (csave.Begin_Chunk (W3D_CHUNK_HLOD_HEADER) == TRUE) {
-		
+
 		// Fill the header structure
 		W3dHLodHeaderStruct header = { 0 };
 		header.Version = W3D_CURRENT_HLOD_VERSION;
 		header.LodCount = LodCount;
-		
+
 		// Copy the name to the header
 		::lstrcpyn (header.Name, Name, sizeof (header.Name));
 		header.Name[sizeof (header.Name) - 1] = 0;
 
 		// Copy the hierarchy tree name to the header
 		::lstrcpyn (header.HierarchyName, HierarchyTreeName, sizeof (header.HierarchyName));
-		header.HierarchyName[sizeof (header.HierarchyName) - 1] = 0;		
+		header.HierarchyName[sizeof (header.HierarchyName) - 1] = 0;
 
 		// Write the header out to the chunk
 		if (csave.Write (&header, sizeof (header)) == sizeof (header)) {
 
 			// Success!
-			ret_val = WW3D_ERROR_OK;			
+			ret_val = WW3D_ERROR_OK;
 		}
 
 		// End the header chunk
@@ -528,7 +521,7 @@ WW3DErrorType HLodDefClass::Save_Lod_Array(ChunkSaveClass &csave)
 	bool success = true;
 	for (int lod_index = 0;
 		  (lod_index < LodCount) && success;
-		  lod_index ++) {		
+		  lod_index ++) {
 		success = Lod[lod_index].Save_W3D (csave);
 	}
 
@@ -577,18 +570,18 @@ WW3DErrorType HLodDefClass::Save_Aggregate_Array(ChunkSaveClass & csave)
  *=============================================================================================*/
 WW3DErrorType HLodDefClass::Load_W3D(ChunkLoadClass & cload)
 {
-	/* 
+	/*
 	** First make sure we release any memory in use
 	*/
 	Free();
 
-	if (read_header(cload) == FALSE) {        
+	if (read_header(cload) == FALSE) {
 	  return WW3D_ERROR_LOAD_FAILED;
 	}
 
 	/*
 	**	Loop through all the LODs and read the info from its chunk
-	*/    
+	*/
 	for (int iLOD = 0; iLOD < LodCount; iLOD ++) {
 
 		/*
@@ -611,7 +604,7 @@ WW3DErrorType HLodDefClass::Load_W3D(ChunkLoadClass & cload)
 	** Parse the rest of the chunks
 	*/
 	while (cload.Open_Chunk()) {
-		switch(cload.Cur_Chunk_ID()) 
+		switch(cload.Cur_Chunk_ID())
 		{
 			case W3D_CHUNK_HLOD_AGGREGATE_ARRAY:
 				Aggregates.Load_W3D(cload);
@@ -622,7 +615,7 @@ WW3DErrorType HLodDefClass::Load_W3D(ChunkLoadClass & cload)
 		}
 		cload.Close_Chunk();
 	}
-	
+
 	return WW3D_ERROR_OK;
 }
 
@@ -694,7 +687,7 @@ bool HLodDefClass::read_proxy_array(ChunkLoadClass & cload)
 
 	W3dHLodArrayHeaderStruct header;
 	if (cload.Read(&header,sizeof(header)) != sizeof(header)) return false;
-	
+
 	if (!cload.Close_Chunk()) return false;
 
 	ProxyArray = NEW_REF(ProxyArrayClass,(header.ModelCount));
@@ -727,11 +720,11 @@ bool HLodDefClass::read_proxy_array(ChunkLoadClass & cload)
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-HLodDefClass::SubObjectArrayClass::SubObjectArrayClass(void) : 
+HLodDefClass::SubObjectArrayClass::SubObjectArrayClass(void) :
 	MaxScreenSize(NO_MAX_SCREEN_SIZE),
 	ModelCount(0),
 	ModelName(NULL),
-	BoneIndex(NULL) 
+	BoneIndex(NULL)
 {
 }
 
@@ -769,7 +762,7 @@ HLodDefClass::SubObjectArrayClass::~SubObjectArrayClass(void)
 void HLodDefClass::SubObjectArrayClass::Reset(void)
 {
 	MaxScreenSize = NO_MAX_SCREEN_SIZE;
-	
+
 	if (ModelName != NULL) {
 		for (int imodel=0; imodel<ModelCount;imodel++) {
 			free(ModelName[imodel]);
@@ -777,10 +770,9 @@ void HLodDefClass::SubObjectArrayClass::Reset(void)
 		delete[] ModelName;
 		ModelName = NULL;
 	}
-	if (BoneIndex != NULL) {
-		delete[] BoneIndex;
-		BoneIndex = NULL;
-	}
+
+	delete[] BoneIndex;
+	BoneIndex = NULL;
 
 	ModelCount = 0;
 }
@@ -805,14 +797,17 @@ bool HLodDefClass::SubObjectArrayClass::Load_W3D(ChunkLoadClass & cload)
 	*/
 	if (!cload.Open_Chunk()) return false;
 	if (cload.Cur_Chunk_ID() != W3D_CHUNK_HLOD_SUB_OBJECT_ARRAY_HEADER) return false;
-	
+
 	W3dHLodArrayHeaderStruct header;
 	if (cload.Read(&header,sizeof(header)) != sizeof(header)) return false;
-	
+
 	if (!cload.Close_Chunk()) return false;
 
 	ModelCount = header.ModelCount;
 	MaxScreenSize = header.MaxScreenSize;
+
+	DEBUG_ASSERTCRASH(ModelName == NULL, ("HLodDefClass::SubObjectArrayClass::Load_W3D: Leaking ModelName"));
+	DEBUG_ASSERTCRASH(BoneIndex == NULL, ("HLodDefClass::SubObjectArrayClass::Load_W3D: Leaking BoneIndex"));
 	ModelName = W3DNEWARRAY char * [ModelCount];
 	BoneIndex = W3DNEWARRAY int [ModelCount];
 
@@ -849,7 +844,7 @@ bool HLodDefClass::SubObjectArrayClass::Load_W3D(ChunkLoadClass & cload)
 bool HLodDefClass::SubObjectArrayClass::Save_W3D(ChunkSaveClass &csave)
 {
 	// Assume error
-	bool ret_val = false;	
+	bool ret_val = false;
 
 	// Begin a chunk that identifies the LOD array
 	if (csave.Begin_Chunk (W3D_CHUNK_HLOD_LOD_ARRAY) == TRUE) {
@@ -860,7 +855,7 @@ bool HLodDefClass::SubObjectArrayClass::Save_W3D(ChunkSaveClass &csave)
 			W3dHLodArrayHeaderStruct header = { 0 };
 			header.ModelCount = ModelCount;
 			header.MaxScreenSize = MaxScreenSize;
-			
+
 			// Write the LOD header structure out to the chunk
 			ret_val = (csave.Write (&header, sizeof (header)) == sizeof (header));
 
@@ -874,14 +869,14 @@ bool HLodDefClass::SubObjectArrayClass::Save_W3D(ChunkSaveClass &csave)
 			for (int index = 0;
 				  (index < ModelCount) && ret_val;
 				  index ++) {
-			
+
 				// Save this LOD sub-obj to the chunk
 				ret_val &= (csave.Begin_Chunk (W3D_CHUNK_HLOD_SUB_OBJECT) == TRUE);
 				if (ret_val) {
-					
+
 					W3dHLodSubObjectStruct info = { 0 };
 					info.BoneIndex = BoneIndex[index];
-					
+
 					// Copy this model name into the structure
 					::lstrcpyn (info.Name, ModelName[index], sizeof (info.Name));
 					info.Name[sizeof (info.Name) - 1] = 0;
@@ -891,7 +886,7 @@ bool HLodDefClass::SubObjectArrayClass::Save_W3D(ChunkSaveClass &csave)
 
 					// End the sub-obj chunk
 					csave.End_Chunk ();
-				}			
+				}
 			}
 		}
 
@@ -917,7 +912,7 @@ bool HLodDefClass::SubObjectArrayClass::Save_W3D(ChunkSaveClass &csave)
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-HLodClass::HLodClass(void) : 
+HLodClass::HLodClass(void) :
 	Animatable3DObjClass(NULL),
 	LodCount(0),
 	CurLod(0),
@@ -945,7 +940,7 @@ HLodClass::HLodClass(void) :
  * HISTORY:                                                                                    *
  *   1/26/00    gth : Created.                                                                 *
  *=============================================================================================*/
-HLodClass::HLodClass(const HLodClass & src) : 
+HLodClass::HLodClass(const HLodClass & src) :
 	Animatable3DObjClass(src),
 	LodCount(0),
 	CurLod(0),
@@ -994,10 +989,10 @@ HLodClass::HLodClass(const char * name,RenderObjClass ** lods,int count) :
 	WWASSERT(name != NULL);
 	WWASSERT(lods != NULL);
 	WWASSERT((count > 0) && (count < 256));
-	
+
 	// Set the name
 	Set_Name(name);
-	
+
 	LodCount = count;
 	WWASSERT(LodCount >= 1);
 	Lod = W3DNEWARRAY ModelArrayClass[LodCount];
@@ -1024,22 +1019,22 @@ HLodClass::HLodClass(const char * name,RenderObjClass ** lods,int count) :
 		RenderObjClass * lod_obj = lods[lod_index];
 		WWASSERT(lod_obj);
 
-		if (	(lod_obj->Class_ID() == RenderObjClass::CLASSID_HMODEL) || 
+		if (	(lod_obj->Class_ID() == RenderObjClass::CLASSID_HMODEL) ||
 				(lod_obj->Class_ID() == RenderObjClass::CLASSID_HLOD) ||
 				(lod_obj->Get_Num_Sub_Objects() > 1) ) {
-			
+
 			// here we insert all sub-objects of this render object into the current LOD array
 			while (lod_obj->Get_Num_Sub_Objects() > 0) {
 
 				RenderObjClass * sub_obj = lod_obj->Get_Sub_Object(0);
 				int boneindex = lod_obj->Get_Sub_Object_Bone_Index(sub_obj);
-				lod_obj->Remove_Sub_Object(sub_obj);				
-				
+				lod_obj->Remove_Sub_Object(sub_obj);
+
 				Add_Lod_Model(lod_index,sub_obj,boneindex);
 
 				sub_obj->Release_Ref();
 			}
-		
+
 		} else {
 
 			// just insert the render object as the sole member of the current LOD array.  This
@@ -1110,7 +1105,7 @@ HLodClass::HLodClass(const HLodDefClass & def) :
 
 	// Add Models to the ModelArrays
 	for (int ilod=0; ilod < def.LodCount; ilod++) {
-		
+
 		Lod[ilod].MaxScreenSize = def.Lod[ilod].MaxScreenSize;
 
 		for (int imodel=0; imodel < def.Lod[ilod].ModelCount; imodel++) {
@@ -1125,7 +1120,7 @@ HLodClass::HLodClass(const HLodDefClass & def) :
 	}
 
 	Recalculate_Static_LOD_Factors();
-	
+
 	// Add aggregates to this model
 	for (int iagg=0; iagg<def.Aggregates.ModelCount; iagg++) {
 		RenderObjClass * robj = WW3DAssetManager::Get_Instance()->Create_Render_Obj(def.Aggregates.ModelName[iagg]);
@@ -1168,7 +1163,7 @@ HLodClass::HLodClass(const HLodDefClass & def) :
  * HISTORY:                                                                                    *
  *   1/26/00    gth : Created.                                                                 *
  *=============================================================================================*/
-HLodClass::HLodClass(const HModelDefClass & def) : 
+HLodClass::HLodClass(const HModelDefClass & def) :
 	Animatable3DObjClass(def.BasePoseName),
 	LodCount(0),
 	CurLod(0),
@@ -1183,7 +1178,7 @@ HLodClass::HLodClass(const HModelDefClass & def) :
 {
 	// Set the name
 	Set_Name(def.Get_Name());
-	
+
 	// This is a "simple" HLod, only one LOD
 	LodCount = 1;
 	Lod = W3DNEWARRAY ModelArrayClass[1];
@@ -1198,7 +1193,7 @@ HLodClass::HLodClass(const HModelDefClass & def) :
 	// no lod size clamping
 	Lod[0].MaxScreenSize = NO_MAX_SCREEN_SIZE;
 
-	// create the sub-objects 
+	// create the sub-objects
 	int imodel;
 	for (imodel=0; imodel < def.SubObjectCount; ++imodel) {
 		RenderObjClass * robj = WW3DAssetManager::Get_Instance()->Create_Render_Obj(def.SubObjects[imodel].RenderObjName);
@@ -1259,16 +1254,16 @@ HLodClass & HLodClass::operator = (const HLodClass & that)
 		// Value has LodCount + 1 entries so PostIncrementValue can always use
 		// Value[CurLod + 1] (the last entry wil be AT_MAX_LOD).
 		Value = W3DNEWARRAY float[LodCount + 1];
-		WWASSERT(Value);		
-		
+		WWASSERT(Value);
+
 		for (lod=0; lod<LodCount;lod++) {
 			Lod[lod].Resize(that.Lod[lod].Count());
 			Lod[lod].MaxScreenSize = that.Lod[lod].MaxScreenSize;
 
 			for (model = 0; model < that.Lod[lod].Count(); model++) {
-				
+
 				ModelNodeClass newnode;
-				newnode.Model = that.Lod[lod][model].Model->Clone();	
+				newnode.Model = that.Lod[lod][model].Model->Clone();
 				newnode.BoneIndex = that.Lod[lod][model].BoneIndex;
 				newnode.Model->Set_Container(this);
 				if (Is_In_Scene()) {
@@ -1283,7 +1278,7 @@ HLodClass & HLodClass::operator = (const HLodClass & that)
 		for (model = 0; model < that.AdditionalModels.Count(); model++) {
 
 			ModelNodeClass newnode;
-			newnode.Model = that.AdditionalModels[model].Model->Clone();	
+			newnode.Model = that.AdditionalModels[model].Model->Clone();
 			newnode.BoneIndex = that.AdditionalModels[model].BoneIndex;
 			newnode.Model->Set_Container(this);
 			if (Is_In_Scene()) {
@@ -1355,29 +1350,25 @@ void HLodClass::Free(void)
 
 			RenderObjClass * robj = Lod[lod][model].Model;
 			Lod[lod][model].Model = NULL;
-			
+
 			WWASSERT(robj);
 			robj->Set_Container(NULL);
 			robj->Release_Ref();
-		
+
 		}
 
 		Lod[lod].Delete_All();
 	}
-	if (Lod != NULL) {
-		delete[] Lod;
-		Lod = NULL;
-	}
+
+	delete[] Lod;
+	Lod = NULL;
 	LodCount = 0;
 
-	if (Cost != NULL) {
-		delete[] Cost;
-		Cost = NULL;
-	}
-	if (Value != NULL) {
-		delete[] Value;
-		Value = NULL;
-	}
+	delete[] Cost;
+	Cost = NULL;
+
+	delete[] Value;
+	Value = NULL;
 
 	for (model = 0; model < AdditionalModels.Count(); model++) {
 		RenderObjClass * robj = AdditionalModels[model].Model;
@@ -1431,18 +1422,18 @@ void HLodClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
 	//
 	int count = Lod[LodCount - 1].Count ();
 	if (BoundingBoxIndex >= 0 && BoundingBoxIndex < count) {
-		
+
 		RenderObjClass *mesh = Lod[LodCount - 1][BoundingBoxIndex].Model;
 		if (mesh != NULL && mesh->Class_ID () == RenderObjClass::CLASSID_OBBOX) {
-			
+
 			OBBoxRenderObjClass *obbox_mesh = (OBBoxRenderObjClass *)mesh;
-			
+
 			//
 			//	Determine what the box's transform 'should' be this frame.
 			// Note:  We do this because some animation types don't update
 			// unless they are visible.
 			//
-			Matrix3D box_tm; 
+			Matrix3D box_tm;
 			Simple_Evaluate_Bone (Lod[LodCount - 1][BoundingBoxIndex].BoneIndex, &box_tm);
 
 			//
@@ -1457,7 +1448,7 @@ void HLodClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
 
 			box_to_hlod_tm.Transform_Center_Extent_AABox(	obbox_mesh->Get_Local_Center(),
 																			obbox_mesh->Get_Local_Extent(),
-																			&box.Center,&box.Extent);							
+																			&box.Center,&box.Extent);
 		}
 
 	} else {
@@ -1467,7 +1458,7 @@ void HLodClass::Get_Obj_Space_Bounding_Box(AABoxClass & box) const
 
 
 /***********************************************************************************************
- * HLodClass::Get_Obj_Space_Bounding_Sphere -- Use the bounding box mesh to calculate a sphere.* 
+ * HLodClass::Get_Obj_Space_Bounding_Sphere -- Use the bounding box mesh to calculate a sphere.*
  *                                                                                             *
  * INPUT:                                                                                      *
  *                                                                                             *
@@ -1488,7 +1479,7 @@ void HLodClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
 
 
 /***********************************************************************************************
- * HLodClass::Get_Obj_Space_Bounding_Sphere -- Use the bounding box mesh to calculate a sphere.* 
+ * HLodClass::Get_Obj_Space_Bounding_Sphere -- Use the bounding box mesh to calculate a sphere.*
  *                                                                                             *
  * INPUT:                                                                                      *
  *                                                                                             *
@@ -1507,7 +1498,7 @@ const SphereClass &HLodClass::Get_Bounding_Sphere(void) const
 		//
 		SphereClass sphere;
 		Get_Obj_Space_Bounding_Sphere (sphere);
-		
+
 		//
 		//	Transform the sphere into world coords and return the sphere
 		//
@@ -1516,7 +1507,7 @@ const SphereClass &HLodClass::Get_Bounding_Sphere(void) const
 #else
 		Get_Transform().mulVector3(sphere.Center, CachedBoundingSphere.Center);
 #endif
-		CachedBoundingSphere.Radius = sphere.Radius;	
+		CachedBoundingSphere.Radius = sphere.Radius;
 	} else {
 		Animatable3DObjClass::Get_Bounding_Sphere ();
 	}
@@ -1546,7 +1537,7 @@ const AABoxClass &HLodClass::Get_Bounding_Box(void) const
 		//
 		AABoxClass box;
 		Get_Obj_Space_Bounding_Box (box);
-		
+
 		//
 		//	Transform the bounding box to world coordinates
 		//
@@ -1594,7 +1585,7 @@ void HLodClass::Set_Max_Screen_Size(int lod_index, float size)
 		// Ensure lod is no less than minimum allowed
 		if (CurLod < minlod) Set_LOD_Level(minlod);
 	}
-	
+
 	return ;
 }
 
@@ -1623,7 +1614,7 @@ float HLodClass::Get_Max_Screen_Size(int lod_index) const
 		// Get the screen size for this LOD
 		size = Lod[lod_index].MaxScreenSize;
 	}
-	
+
 	// Return the LOD's screen size to the caller
 	return size;
 }
@@ -1696,7 +1687,7 @@ int HLodClass::Get_Lod_Model_Count(int lod_index) const
 		// Get the number of models in this Lod
 		count = Lod[lod_index].Count ();
 	}
-	
+
 	// Return the number of models that compose this Lod
 	return count;
 }
@@ -1728,7 +1719,7 @@ RenderObjClass *HLodClass::Peek_Lod_Model(int lod_index, int model_index) const
 		// Get a pointer to the requested model
 		pmodel = Lod[lod_index][model_index].Model;
 	}
-	
+
 	// Return a pointer to the requested model
 	return pmodel;
 }
@@ -1763,7 +1754,7 @@ RenderObjClass *HLodClass::Get_Lod_Model(int lod_index, int model_index) const
 			pmodel->Add_Ref ();
 		}
 	}
-	
+
 	// Return the number of models that compose this Lod
 	return pmodel;
 }
@@ -1795,7 +1786,7 @@ int HLodClass::Get_Lod_Model_Bone(int lod_index, int model_index) const
 		// Get the bone that this model resides on
 		bone_index = Lod[lod_index][model_index].BoneIndex;
 	}
-	
+
 	// Return the bone that this model resides on
 	return bone_index;
 }
@@ -1844,7 +1835,7 @@ RenderObjClass * HLodClass::Peek_Additional_Model (int model_index) const
 		// Get a pointer to the requested model
 		pmodel = AdditionalModels[model_index].Model;
 	}
-	
+
 	// Return a pointer to the requested model
 	return pmodel;
 }
@@ -1878,7 +1869,7 @@ RenderObjClass * HLodClass::Get_Additional_Model (int model_index) const
 			pmodel->Add_Ref ();
 		}
 	}
-	
+
 	// Return a pointer to the requested model
 	return pmodel;
 }
@@ -1909,7 +1900,7 @@ int HLodClass::Get_Additional_Model_Bone (int model_index) const
 		// Get the bone that this model resides on
 		bone_index = AdditionalModels[model_index].BoneIndex;
 	}
-	
+
 	// Return the bone that this model resides on
 	return bone_index;
 }
@@ -1935,7 +1926,7 @@ bool HLodClass::Is_NULL_Lod_Included(void) const
 	if ((LodCount > 0) && (Lod[0][0].Model != NULL)) {
 		included = (Lod[0][0].Model->Class_ID () == RenderObjClass::CLASSID_NULL);
 	}
-	
+
 	// Return the true/false result code
 	return included;
 }
@@ -1963,7 +1954,7 @@ void HLodClass::Include_NULL_Lod(bool include)
 
 			RenderObjClass * robj = Lod[index][model].Model;
 			Lod[index][model].Model = NULL;
-			
+
 			WWASSERT(robj);
 			robj->Set_Container (NULL);
 			robj->Release_Ref ();
@@ -1971,7 +1962,7 @@ void HLodClass::Include_NULL_Lod(bool include)
 
 		// Resize the lod array
 		LodCount -= 1;
-		Lod[index].Delete_All ();		
+		Lod[index].Delete_All ();
 		ModelArrayClass *temp_lods = W3DNEWARRAY ModelArrayClass[LodCount];
 		for (index = 0; index < LodCount; index ++) {
 			temp_lods[index] = Lod[index + 1];
@@ -1990,7 +1981,7 @@ void HLodClass::Include_NULL_Lod(bool include)
 		Value = temp_value;
 		Cost = temp_cost;
 		CurLod = (CurLod >= LodCount) ? (LodCount - 1) : CurLod;
-		
+
 	} else if (include && (Is_NULL_Lod_Included () == false)) {
 
 		// Tag the NULL render object onto the end
@@ -2073,19 +2064,19 @@ bool HLodClass::Get_Proxy (int index, ProxyClass &proxy) const
 	bool retval = false;
 
 	if (ProxyArray != NULL) {
-		
+
 		//
 		//	Lookup the proxy's transform
 		//
 		HTree->Base_Update(Get_Transform());
 		Matrix3D transform = HTree->Get_Transform((*ProxyArray)[index].Get_Bone_Index());
 		Set_Hierarchy_Valid(false);
-		
+
 		//
 		//	Pass the data onto the proxy object
 		//
 		proxy.Set_Transform(transform);
-		proxy.Set_Name((*ProxyArray)[index].Get_Name());		
+		proxy.Set_Name((*ProxyArray)[index].Get_Name());
 		retval = true;
 
 	} else {
@@ -2221,7 +2212,7 @@ void HLodClass::Special_Render(SpecialRenderInfoClass & rinfo)
  *=============================================================================================*/
 void HLodClass::Set_Transform(const Matrix3D &m)
 {
-	Animatable3DObjClass::Set_Transform(m); 
+	Animatable3DObjClass::Set_Transform(m);
 	Set_Sub_Object_Transforms_Dirty(true);
 }
 
@@ -2240,7 +2231,7 @@ void HLodClass::Set_Transform(const Matrix3D &m)
  *=============================================================================================*/
 void HLodClass::Set_Position(const Vector3 &v)
 {
-	Animatable3DObjClass::Set_Position(v); 
+	Animatable3DObjClass::Set_Position(v);
 	Set_Sub_Object_Transforms_Dirty(true);
 }
 
@@ -2389,7 +2380,7 @@ int HLodClass::Remove_Sub_Object(RenderObjClass * removeme)
 		return 0;
 	}
 
-	// find the sub-object 
+	// find the sub-object
 	bool found = false;
 	bool iscurrent = false;
 
@@ -2418,7 +2409,7 @@ int HLodClass::Remove_Sub_Object(RenderObjClass * removeme)
 			iscurrent = true;
 		}
 	}
-	
+
 	if (found) {
 
 		// clear the object's container pointer
@@ -2490,7 +2481,7 @@ RenderObjClass * HLodClass::Get_Sub_Object_On_Bone(int index,int boneindex) cons
 	int count = 0;
 	for (int lod = 0; lod < LodCount; lod++) {
 		for (int model = 0; model < Lod[lod].Count(); model++) {
-			if (Lod[lod][model].BoneIndex == boneindex) {				
+			if (Lod[lod][model].BoneIndex == boneindex) {
 				if (count == index) {
 					Lod[lod][model].Model->Add_Ref();
 					return Lod[lod][model].Model;
@@ -2500,7 +2491,7 @@ RenderObjClass * HLodClass::Get_Sub_Object_On_Bone(int index,int boneindex) cons
 		}
 	}
 	for (int model = 0; model < AdditionalModels.Count(); model++) {
-		if (AdditionalModels[model].BoneIndex == boneindex) {			
+		if (AdditionalModels[model].BoneIndex == boneindex) {
 			if (count == index) {
 				AdditionalModels[model].Model->Add_Ref();
 				return AdditionalModels[model].Model;
@@ -2565,7 +2556,7 @@ int HLodClass::Add_Sub_Object_To_Bone(RenderObjClass * subobj,int boneindex)
 	if ((boneindex < 0) || (boneindex >= HTree->Num_Pivots())) return 0;
 
 	subobj->Set_LOD_Bias(LODBias);
-	
+
 	ModelNodeClass newnode;
 	newnode.Model = subobj;
 	newnode.Model->Add_Ref();
@@ -2583,7 +2574,7 @@ int HLodClass::Add_Sub_Object_To_Bone(RenderObjClass * subobj,int boneindex)
 	if (Is_In_Scene()) {
 		subobj->Notify_Added(Scene);
 	}
-	
+
 	return result;
 }
 
@@ -2602,7 +2593,7 @@ int HLodClass::Add_Sub_Object_To_Bone(RenderObjClass * subobj,int boneindex)
  *=============================================================================================*/
 void HLodClass::Set_Animation(void)
 {
-	Animatable3DObjClass::Set_Animation(); 
+	Animatable3DObjClass::Set_Animation();
 	Set_Sub_Object_Transforms_Dirty(true);
 }
 
@@ -2758,7 +2749,7 @@ bool HLodClass::Cast_OBBox(OBBoxCollisionTestClass & boxtest)
 	if (Are_Sub_Object_Transforms_Dirty ()) {
 		Update_Sub_Object_Transforms ();
 	}
-	
+
 	bool res = false;
 	int i;
 
@@ -3274,7 +3265,7 @@ void HLodClass::Scale(float scale)
 			Lod[lod][model].Model->Scale(scale);
 		}
 	}
-	
+
 	for (model = 0; model < AdditionalModels.Count(); model++) {
 		AdditionalModels[model].Model->Scale(scale);
 	}
@@ -3360,14 +3351,14 @@ void HLodClass::Update_Sub_Object_Transforms(void)
 	** Put the computed transforms into our sub objects.
 	*/
 	int lod,model;
-	
+
 	for (lod = 0; lod < LodCount; lod++) {
 		for (model = 0; model < Lod[lod].Count(); model++) {
 
 			RenderObjClass * robj = Lod[lod][model].Model;
 			int bone = Lod[lod][model].BoneIndex;
 
-			robj->Set_Transform(HTree->Get_Transform(bone)); 
+			robj->Set_Transform(HTree->Get_Transform(bone));
 			robj->Set_Animation_Hidden(!HTree->Get_Visibility(bone));
 			robj->Update_Sub_Object_Transforms();
 		}
@@ -3378,7 +3369,7 @@ void HLodClass::Update_Sub_Object_Transforms(void)
 		RenderObjClass * robj = AdditionalModels[model].Model;
 		int bone = AdditionalModels[model].BoneIndex;
 
-		robj->Set_Transform(HTree->Get_Transform(bone)); 
+		robj->Set_Transform(HTree->Get_Transform(bone));
 		robj->Set_Animation_Hidden(!HTree->Get_Visibility(bone));
 		robj->Update_Sub_Object_Transforms();
 	}
@@ -3419,7 +3410,7 @@ void HLodClass::Update_Obj_Space_Bounding_Volumes(void)
 	int index = high_lod.Count ();
 	while (index -- && BoundingBoxIndex == -1) {
 		RenderObjClass *model = high_lod[index].Model;
-		
+
 		//
 		//	Is this an OBBox mesh?
 		//
@@ -3434,7 +3425,7 @@ void HLodClass::Update_Obj_Space_Bounding_Volumes(void)
 			//
 			//	Does the name match the designator we are looking for?
 			//
-			if (::stricmp (name, "BOUNDINGBOX") == 0) {				
+			if (::stricmp (name, "BOUNDINGBOX") == 0) {
 				BoundingBoxIndex = index;
 			}
 		}
@@ -3459,15 +3450,15 @@ void HLodClass::Update_Obj_Space_Bounding_Volumes(void)
 	MinMaxAABoxClass box;
 
 	HTree->Base_Update(Matrix3D(1));
-	
+
 	robj = Get_Sub_Object(0);
 	WWASSERT(robj);
-	
+
 	const Matrix3D & bonetm = HTree->Get_Transform(Get_Sub_Object_Bone_Index(robj));
 	robj->Get_Obj_Space_Bounding_Sphere(sphere);
 	sphere.Transform(bonetm);
 	robj->Get_Obj_Space_Bounding_Box(obj_aabox);
-	
+
 	box.Init(obj_aabox);
 	box.Transform(bonetm);
 
@@ -3476,15 +3467,15 @@ void HLodClass::Update_Obj_Space_Bounding_Volumes(void)
 	for (i=1; i<Get_Num_Sub_Objects(); i++) {
 		robj = Get_Sub_Object(i);
 		WWASSERT(robj);
-		
+
 		const Matrix3D & bonetm = HTree->Get_Transform(Get_Sub_Object_Bone_Index(robj));
-		
+
 		SphereClass tmpsphere;
 		robj->Get_Obj_Space_Bounding_Sphere(tmpsphere);
 		tmpsphere.Transform(bonetm);
 		sphere.Add_Sphere(tmpsphere);
 
-		AABoxClass tmpbox; 
+		AABoxClass tmpbox;
 		robj->Get_Obj_Space_Bounding_Box(tmpbox);
 		tmpbox.Transform(bonetm);
 		box.Add_Box(tmpbox);
@@ -3517,17 +3508,17 @@ void HLodClass::Update_Obj_Space_Bounding_Volumes(void)
  *   1/26/00    gth : Created.                                                                 *
  *=============================================================================================*/
 void HLodClass::Add_Lod_Model(int lod, RenderObjClass * robj, int boneindex)
-{		
+{
 	WWASSERT(robj != NULL);
 
 	// (gth) survive the case where the skeleton for this object no longer has
 	// the bone that we're trying to use.  This happens when a skeleton is re-exported
 	// but the models that depend on it aren't re-exported...
 	if (boneindex >= HTree->Num_Pivots()) {
-		WWDEBUG_SAY(("ERROR: Model %s tried to use bone %d in skeleton %s.  Please re-export!\n",Get_Name(),boneindex,HTree->Get_Name()));
+		WWDEBUG_SAY(("ERROR: Model %s tried to use bone %d in skeleton %s.  Please re-export!",Get_Name(),boneindex,HTree->Get_Name()));
 		boneindex = 0;
 	}
-	
+
 	ModelNodeClass newnode;
 	newnode.Model = robj;
 	newnode.Model->Add_Ref();
@@ -3634,13 +3625,13 @@ void HLodClass::Set_Hidden(int onoff)
 	//
 	int additional_count = AdditionalModels.Count();
 	for (int index = 0; index < additional_count; index ++) {
-		
+
 		//
 		//	Is this a particle emitter?
 		//
 		RenderObjClass *model = AdditionalModels[index].Model;
 		if (model->Class_ID () == RenderObjClass::CLASSID_PARTICLEEMITTER) {
-			
+
 			//
 			//	Pass the hidden bit onto the emitter
 			//
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
index d0ff12634d8..53c9dc95456 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
@@ -34,37 +34,14 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HLOD_H
-#define HLOD_H
 
-#ifndef ANIMOBJ_H
 #include "animobj.h"
-#endif
-
-#ifndef VECTOR_H
-#include "Vector.H"
-#endif
-
-#ifndef SNAPPTS_H
+#include "Vector.h"
 #include "snapPts.h"
-#endif
-
-#ifndef PROTO_H
 #include "proto.h"
-#endif
-
-#ifndef W3DERR_H
 #include "w3derr.h"
-#endif
-
-#ifndef __PROXY_H
 #include "proxy.h"
-#endif
 
 
 class DistLODClass;
@@ -107,7 +84,7 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void					Set_Max_Screen_Size(int lod_index, float size);
 	virtual float					Get_Max_Screen_Size(int lod_index) const;
-	
+
 	virtual int						Get_Lod_Count(void) const;
 	virtual int						Get_Lod_Model_Count (int lod_index) const;
 	virtual RenderObjClass *	Peek_Lod_Model (int lod_index, int model_index) const;
@@ -143,12 +120,12 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 	virtual void					Notify_Added(SceneClass * scene);
 	virtual void					Notify_Removed(SceneClass * scene);
 
-	virtual int						Get_Num_Sub_Objects(void) const; 					
+	virtual int						Get_Num_Sub_Objects(void) const;
 	virtual RenderObjClass *	Get_Sub_Object(int index) const;
 	virtual int						Add_Sub_Object(RenderObjClass * subobj);
 	virtual int						Remove_Sub_Object(RenderObjClass * robj);
 
-	virtual int						Get_Num_Sub_Objects_On_Bone(int boneindex) const;							
+	virtual int						Get_Num_Sub_Objects_On_Bone(int boneindex) const;
 	virtual RenderObjClass *	Get_Sub_Object_On_Bone(int index,int boneindex) const;
 	virtual int						Get_Sub_Object_Bone_Index(RenderObjClass * subobj) const;
 	virtual int						Get_Sub_Object_Bone_Index(int LodIndex, int ModelIndex)	const;
@@ -206,7 +183,7 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	virtual void					Create_Decal(DecalGeneratorClass * generator);
 	virtual void					Delete_Decal(uint32 decal_id);
-	
+
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Attributes, Options, Properties, etc
 	/////////////////////////////////////////////////////////////////////////////
@@ -229,9 +206,9 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 	virtual void					Update_Obj_Space_Bounding_Volumes(void);
 
 protected:
-	
-	
-	class ModelNodeClass 
+
+
+	class ModelNodeClass
 	{
 	public:
 		RenderObjClass *			Model;
@@ -240,7 +217,7 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 		bool operator != (const ModelNodeClass & that) { return !operator == (that); }
 	};
 
-	class ModelArrayClass : public DynamicVectorClass<ModelNodeClass> 
+	class ModelArrayClass : public DynamicVectorClass<ModelNodeClass>
 	{
 	public:
 		ModelArrayClass(void) : MaxScreenSize(NO_MAX_SCREEN_SIZE), NonPixelCost(0.0f),
@@ -250,7 +227,7 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 		float							PixelCostPerArea;	// PixelCostPerArea * area(normalized) + NonPixelCost = total Cost
 		float							BenefitFactor;		// BenefitFactor * area(normalized) = Benefit
 	};
-	
+
 	// Lod Render Objects, basically one of the LOD Models will be rendered. Typically
 	// each model in an HLodModel will be a mesh or a "simple" HLod (one with a single LOD)
 	int								LodCount;
@@ -263,7 +240,7 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 	//
 	int								BoundingBoxIndex;
 
-	float *							Cost;					// Cost array (recalculated every frame) 
+	float *							Cost;					// Cost array (recalculated every frame)
 	float *							Value;				// Value array (recalculated every frame)
 
 	// Additional Models, these models have been linked to one of the bones in this
@@ -277,7 +254,7 @@ class HLodClass : public W3DMPO, public Animatable3DObjClass
 	SnapPointsClass *				SnapPoints;
 
 	// possible array of proxy objects (names and bone indexes for application defined usage)
-	ProxyArrayClass *				ProxyArray; 
+	ProxyArrayClass *				ProxyArray;
 
 	// Current LOD Bias (affects recalculation of the Value array)
 	float								LODBias;
@@ -297,7 +274,7 @@ class HLodLoaderClass : public PrototypeLoaderClass
 
 /**
 ** HLodDefClass
-** This description object is generated when reading a W3D_CHUNK_HLOD.  It 
+** This description object is generated when reading a W3D_CHUNK_HLOD.  It
 ** directly describes the contents of an HLod model.
 */
 class HLodDefClass : public W3DMPO
@@ -335,7 +312,7 @@ class HLodDefClass : public W3DMPO
 	{
 	public:
 		SubObjectArrayClass(void);
-		~SubObjectArrayClass(void);		
+		~SubObjectArrayClass(void);
 		void		Reset(void);
 		void		operator = (const SubObjectArrayClass & that);
 
@@ -371,12 +348,12 @@ class HLodPrototypeClass : public W3DMPO, public PrototypeClass
 	W3DMPO_GLUE(HLodPrototypeClass)
 public:
 	HLodPrototypeClass( HLodDefClass *def )					{ Definition = def; }
-	
+
 	virtual const char *			Get_Name(void) const			{ return Definition->Get_Name(); }
 	virtual int								Get_Class_ID(void) const	{ return RenderObjClass::CLASSID_HLOD; }
 	virtual RenderObjClass *	Create(void);
 	virtual void							DeleteSelf()							{ delete this; }
-	
+
 	HLodDefClass *					Get_Definition(void) const	{ return Definition; }
 
 protected:
@@ -390,6 +367,3 @@ class HLodPrototypeClass : public W3DMPO, public PrototypeClass
 ** Instance of the loaders which the asset manager install
 */
 extern HLodLoaderClass			_HLodLoader;
-
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
index 6d03386dd6f..0696c96d364 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
@@ -100,7 +100,7 @@ void TimeCodedMorphKeysClass::Get_Morph_Info(float morph_frame,int * pose_frame0
 		*pose_frame0 = *pose_frame1 = Keys[0].PoseFrame;
 		*fraction = 0.0f;
 		return;
-	} 
+	}
 
 	if (morph_frame >= Keys[Keys.Count ()-1].MorphFrame) {
 		*pose_frame0 = *pose_frame1 = Keys[Keys.Count ()-1].PoseFrame;
@@ -127,13 +127,13 @@ uint32 TimeCodedMorphKeysClass::get_index(float frame)
 
 		// special case for end packets
 		if (CachedIdx == (uint32)Keys.Count ()-1) return(CachedIdx);
-		
+
 		// check if the requested time is still in the cached interval
 		if (frame < Keys[CachedIdx + 1].MorphFrame) return(CachedIdx);
 
 		// do one time look-ahead before reverting to a search
 		CachedIdx++;
-	
+
 		// again, special case the end interval
 		if (CachedIdx == (uint32)Keys.Count ()-1) return(CachedIdx);
 
@@ -156,10 +156,10 @@ uint32 TimeCodedMorphKeysClass::binary_search_index(float req_frame)
 	int leftIdx = 0;
 	int rightIdx = Keys.Count ();
 	int idx,dx;
-	
+
 	// binary search for the desired interval
 	for (;;) {
-	
+
 		// if we've zeroed in on the interval, return the left index
 		dx = rightIdx - leftIdx;
 		if (dx == 1) {
@@ -185,7 +185,7 @@ uint32 TimeCodedMorphKeysClass::binary_search_index(float req_frame)
 
 
 /*********************************************************************************************
-** 
+**
 ** HMorphAnimClass Implementation
 **
 *********************************************************************************************/
@@ -200,7 +200,7 @@ HMorphAnimClass::HMorphAnimClass(void) :
 	PivotChannel(NULL)
 {
 	memset(Name,0,sizeof(Name));
-	memset(AnimName,0,sizeof(AnimName));	
+	memset(AnimName,0,sizeof(AnimName));
 	memset(HierarchyName,0,sizeof(HierarchyName));
 }
 
@@ -219,15 +219,11 @@ void HMorphAnimClass::Free(void)
 		PoseData = NULL;
 	}
 
-	if (MorphKeyData != NULL) {
-		delete[] MorphKeyData;
-		MorphKeyData = NULL;
-	}
+	delete[] MorphKeyData;
+	MorphKeyData = NULL;
 
-	if (PivotChannel != NULL) {
-		delete[] PivotChannel;
-		PivotChannel = NULL;
-	}
+	delete[] PivotChannel;
+	PivotChannel = NULL;
 }
 
 
@@ -257,7 +253,7 @@ static int Build_List_From_String
 			  (entry != NULL) && (entry[1] != 0);
 			  entry = ::strstr (entry, delimiter))
 		{
-			
+
 			//
 			// Move past the current delimiter (if necessary)
 			//
@@ -268,14 +264,14 @@ static int Build_List_From_String
 			// Increment the count of entries
 			count ++;
 		}
-	
+
 		if (count > 0) {
 
 			//
 			// Allocate enough StringClass objects to hold all the strings in the list
 			//
 			(*string_list) = W3DNEWARRAY StringClass[count];
-		
+
 			//
 			// Parse the string and pull out its entries.
 			//
@@ -284,7 +280,7 @@ static int Build_List_From_String
 				  (entry != NULL) && (entry[1] != 0);
 				  entry = ::strstr (entry, delimiter))
 			{
-				
+
 				//
 				// Move past the current delimiter (if necessary)
 				//
@@ -296,7 +292,7 @@ static int Build_List_From_String
 				// Copy this entry into its own string
 				//
 				StringClass entry_string = entry;
-				char *delim_start = ::strstr (entry_string.Peek_Buffer(), delimiter);				
+				char *delim_start = ::strstr (entry_string.Peek_Buffer(), delimiter);
 				if (delim_start != NULL) {
 					delim_start[0] = 0;
 				}
@@ -304,7 +300,7 @@ static int Build_List_From_String
 				//
 				// Add this entry to our list
 				//
-				if ((entry_string.Get_Length () > 0) || (count == 0)) {
+				if ((!entry_string.Is_Empty()) || (count == 0)) {
 					(*string_list)[count++] = entry_string;
 				}
 			}
@@ -314,7 +310,7 @@ static int Build_List_From_String
 			(*string_list) = W3DNEWARRAY StringClass[count];
 			(*string_list)[0] = buffer;
 		}
-				
+
 	}
 
 	//
@@ -329,7 +325,7 @@ bool Is_Number (const char *str)
 	bool retval = true;
 
 	while (retval && str[0] != NULL){
-		retval = ((str[0] >= '0' && str[0] <= '9') || str[0] == '-' || str[0] == '.'); 
+		retval = ((str[0] >= '0' && str[0] <= '9') || str[0] == '-' || str[0] == '.');
 		str ++;
 	}
 
@@ -347,9 +343,8 @@ bool HMorphAnimClass::Import(const char *hierarchy_name, TextFileClass &text_des
 	//
 	// Copy the hierarchy name into a class variable
 	//
-	::strncpy (HierarchyName, hierarchy_name, W3D_NAME_LEN);
-	HierarchyName[W3D_NAME_LEN - 1] = 0;
-	
+	strlcpy (HierarchyName, hierarchy_name, W3D_NAME_LEN);
+
 	//
 	// Attempt to load the new base pose
 	//
@@ -378,13 +373,13 @@ bool HMorphAnimClass::Import(const char *hierarchy_name, TextFileClass &text_des
 
 		WWASSERT (ChannelCount > 0);
 		if (ChannelCount > 0) {
-			
+
 			//
 			// Allocate and initialize each animation channel
 			//
 			PoseData			= W3DNEWARRAY HAnimClass *[ChannelCount];
 			MorphKeyData	= W3DNEWARRAY TimeCodedMorphKeysClass[ChannelCount];
-			for (int index = 0; index < ChannelCount; index ++) {				
+			for (int index = 0; index < ChannelCount; index ++) {
 				StringClass channel_anim_name;
 				channel_anim_name.Format ("%s.%s", HierarchyName, (const char *)column_list[index + 1]);
 				PoseData[index] = WW3DAssetManager::Get_Instance()->Get_HAnim (channel_anim_name);
@@ -415,7 +410,7 @@ bool HMorphAnimClass::Import(const char *hierarchy_name, TextFileClass &text_des
 					//
 					for (int index = 1; index < list_count; index ++) {
 						StringClass &channel_frame = channel_list[index];
-						
+
 						//
 						// If this channel contains a valid number, then record
 						// its animation frame
@@ -426,16 +421,14 @@ bool HMorphAnimClass::Import(const char *hierarchy_name, TextFileClass &text_des
 					}
 
 					FrameCount = frame + 1;
-				}				
+				}
 
 				//
 				// Cleanup
 				//
-				if (channel_list != NULL) {
-					delete [] channel_list;
-					channel_list = NULL;
-				}
-			}			
+				delete [] channel_list;
+				channel_list = NULL;
+			}
 
 			//
 			// Allocate the pivot channel list
@@ -447,10 +440,8 @@ bool HMorphAnimClass::Import(const char *hierarchy_name, TextFileClass &text_des
 		//
 		// Cleanup
 		//
-		if (column_list != NULL) {
-			delete [] column_list;
-			column_list = NULL;
-		}
+		delete [] column_list;
+		column_list = NULL;
 	}
 
 	return retval;
@@ -463,13 +454,13 @@ void HMorphAnimClass::Resolve_Pivot_Channels(void)
 	//
 	//	Loop over all the pivots in the HTree
 	//
-	for (int pivot = 0; pivot < NumNodes; pivot ++) {		
+	for (int pivot = 0; pivot < NumNodes; pivot ++) {
 		PivotChannel[pivot] = 0;
 
 		//
 		// Find out which animation channel affects this pivot
 		//
-		for (int channel = 0; channel < ChannelCount; channel ++) {			
+		for (int channel = 0; channel < ChannelCount; channel ++) {
 			if (PoseData[channel]->Is_Node_Motion_Present (pivot)) {
 				PivotChannel[pivot] = channel;
 			}
@@ -484,7 +475,7 @@ void HMorphAnimClass::Set_Name(const char * name)
 	//
 	// Copy the full name
 	//
-	::strcpy (Name, name);
+	strlcpy(Name, name, ARRAY_SIZE(Name));
 
 	//
 	// Try to find the separator (a period)
@@ -492,14 +483,14 @@ void HMorphAnimClass::Set_Name(const char * name)
 	StringClass full_name	= name;
 	char *separator			= ::strchr (full_name.Peek_Buffer(), '.');
 	if (separator != NULL) {
-		
+
 		//
 		// Null out the separator and copy the two names
 		// into our two buffers
 		//
 		separator[0] = 0;
-		::strcpy (AnimName, separator + 1);
-		::strcpy (HierarchyName, full_name);
+		strlcpy(AnimName, separator + 1, ARRAY_SIZE(AnimName));
+		strlcpy(HierarchyName, full_name, ARRAY_SIZE(HierarchyName));
 	}
 
 	return ;
@@ -522,7 +513,7 @@ int HMorphAnimClass::Create_New_Morph(const int channels, HAnimClass *anim[])
 	if (anim == NULL) {
 		return LOAD_ERROR;
 	}
-	
+
 	// set up info
 	//	FrameCount = anim[0]->Get_Num_Frames();
 	FrameCount = 0;
@@ -541,7 +532,7 @@ int HMorphAnimClass::Create_New_Morph(const int channels, HAnimClass *anim[])
 	// Resolve the pivots so that they correspond to the proper morphing channels
 	memset(PivotChannel,0,NumNodes * sizeof(uint32));
 	Resolve_Pivot_Channels();
-	
+
 	// Signal successful process
 	return OK;
 }
@@ -557,11 +548,14 @@ int HMorphAnimClass::Load_W3D(ChunkLoadClass & cload)
 	cload.Read(&header,sizeof(header));
 	cload.Close_Chunk();
 
-	strncpy(AnimName,header.Name,sizeof(AnimName));
-   strncpy(HierarchyName,header.HierarchyName,sizeof(HierarchyName));
-	strcpy(Name,HierarchyName);
-	strcat(Name,".");
-	strcat(Name,AnimName);
+	static_assert(ARRAY_SIZE(AnimName) >= ARRAY_SIZE(header.Name), "Incorrect array size");
+	static_assert(ARRAY_SIZE(HierarchyName) >= ARRAY_SIZE(header.HierarchyName), "Incorrect array size");
+	static_assert(ARRAY_SIZE(Name) >= ARRAY_SIZE(HierarchyName), "Incorrect array size");
+	strcpy(AnimName, header.Name);
+	strcpy(HierarchyName, header.HierarchyName);
+	strcpy(Name, HierarchyName);
+	strlcat(Name, ".", ARRAY_SIZE(Name));
+	strlcat(Name, AnimName, ARRAY_SIZE(Name));
 
 	HTreeClass * base_pose = WW3DAssetManager::Get_Instance()->Get_HTree(HierarchyName);
 	if (base_pose == NULL) {
@@ -581,14 +575,14 @@ int HMorphAnimClass::Load_W3D(ChunkLoadClass & cload)
 	// read in the rest of the chunks
 	int cur_channel = 0;
 	while (cload.Open_Chunk()) {
-		switch(cload.Cur_Chunk_ID()) 
+		switch(cload.Cur_Chunk_ID())
 		{
 		case W3D_CHUNK_MORPHANIM_CHANNEL:
 			read_channel(cload,cur_channel++);
 			break;
 
 		case W3D_CHUNK_MORPHANIM_PIVOTCHANNELDATA:
-			cload.Read(PivotChannel,cload.Cur_Chunk_Length());	
+			cload.Read(PivotChannel,cload.Cur_Chunk_Length());
 			break;
 		};
 		cload.Close_Chunk();
@@ -608,7 +602,7 @@ void HMorphAnimClass::read_channel(ChunkLoadClass & cload,int channel)
 	WWASSERT(cload.Cur_Chunk_ID() == W3D_CHUNK_MORPHANIM_POSENAME);
 	cload.Read(anim_name.Get_Buffer(cload.Cur_Chunk_Length()),cload.Cur_Chunk_Length());
 	cload.Close_Chunk();
-	
+
 	//StringClass channel_anim_name;
 	//channel_anim_name.Format ("%s.%s", HierarchyName, anim_name);
 	PoseData[channel] = WW3DAssetManager::Get_Instance()->Get_HAnim(anim_name);
@@ -623,21 +617,22 @@ void HMorphAnimClass::read_channel(ChunkLoadClass & cload,int channel)
 
 int HMorphAnimClass::Save_W3D(ChunkSaveClass & csave)
 {
-	// W3D objects write their own wrapper chunks 
+	// W3D objects write their own wrapper chunks
 	csave.Begin_Chunk(W3D_CHUNK_MORPH_ANIMATION);
-	
+
 	// init the header data
 	W3dMorphAnimHeaderStruct header;
-	memset(&header,0,sizeof(header));
-	strncpy(header.Name,AnimName,sizeof(header.Name));
-	strncpy(header.HierarchyName,HierarchyName,sizeof(header.HierarchyName));
+	static_assert(ARRAY_SIZE(header.Name) >= ARRAY_SIZE(AnimName), "Incorrect array size");
+	static_assert(ARRAY_SIZE(header.HierarchyName) >= ARRAY_SIZE(HierarchyName), "Incorrect array size");
+	strcpy(header.Name, AnimName);
+	strcpy(header.HierarchyName, HierarchyName);
 
 	header.FrameCount = FrameCount;
 	header.FrameRate = FrameRate;
 	header.ChannelCount = ChannelCount;
 
 	// write out the animation header
-	csave.Begin_Chunk(W3D_CHUNK_MORPHANIM_HEADER);	
+	csave.Begin_Chunk(W3D_CHUNK_MORPHANIM_HEADER);
 	csave.Write(&header,sizeof(header));
 	csave.End_Chunk();
 
@@ -678,7 +673,7 @@ void HMorphAnimClass::Get_Translation(Vector3& trans,int pividx,float frame) con
 	int pose_frame0,pose_frame1;
 	float fraction;
 	MorphKeyData[channel].Get_Morph_Info(frame,&pose_frame0,&pose_frame1,&fraction);
-	
+
 	Vector3 t0;
 	PoseData[channel]->Get_Translation(t0,pividx,pose_frame0);
 	Vector3 t1;
@@ -692,7 +687,7 @@ void HMorphAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) con
 	int pose_frame0,pose_frame1;
 	float fraction;
 	MorphKeyData[channel].Get_Morph_Info(frame,&pose_frame0,&pose_frame1,&fraction);
-	
+
 	Quaternion q0;
 	PoseData[channel]->Get_Orientation(q0,pividx,pose_frame0);
 	Quaternion q1;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h
index f6ae698b9eb..6771abd756b 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h
@@ -36,12 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HMORPHANIM_H
-#define HMORPHANIM_H
 
 #include "always.h"
 #include "hanim.h"
@@ -56,13 +51,13 @@ class TextFileClass;
 
 	HMorphAnimClass
 
-	This is an animation format designed for facial animation.  It basically morphs the 
+	This is an animation format designed for facial animation.  It basically morphs the
 	htree between a set of poses.  These animations are created by exporting an
 	HRawAnimClass which contains the poses, using Magpie to create a text file
 	describing which pose to use on each frame, and finally using W3dView to combine
 	the data into an HMorphAnimClass.
 
-	There can be multiple channels for the morphing.  For example, some of the 
+	There can be multiple channels for the morphing.  For example, some of the
 	bones can be controlled by the "phoneme" poses (e.g. mouth) while other bones are
 	controlled by the "expression" poses (e.g. eyebrows)
 
@@ -72,13 +67,13 @@ class HMorphAnimClass : public HAnimClass
 {
 
 public:
-	
+
 	enum
 	{
 		OK,
 		LOAD_ERROR
 	};
-	
+
 	HMorphAnimClass(void);
 	~HMorphAnimClass(void);
 
@@ -94,8 +89,6 @@ class HMorphAnimClass : public HAnimClass
 	float							Get_Frame_Rate()									{ return FrameRate; }
 	float							Get_Total_Time()									{ return (float)FrameCount / FrameRate; }
 
-//	Vector3						Get_Translation(int pividx,float frame);
-//	Quaternion					Get_Orientation(int pividx,float frame);
 	void							Get_Translation(Vector3& translation, int pividx,float frame) const;
 	void							Get_Orientation(Quaternion& orientation, int pividx,float frame) const;
 	void							Get_Transform(Matrix3D& transform, int pividx,float frame) const;
@@ -114,7 +107,7 @@ class HMorphAnimClass : public HAnimClass
 
 protected:
 
-	void							Free(void);	
+	void							Free(void);
 	void							read_channel(ChunkLoadClass & cload,int channel);
 	void							write_channel(ChunkSaveClass & csave,int channel);
 	void							Resolve_Pivot_Channels(void);
@@ -122,7 +115,7 @@ class HMorphAnimClass : public HAnimClass
 	char							Name[2*W3D_NAME_LEN];
 	char							AnimName[W3D_NAME_LEN];
 	char							HierarchyName[W3D_NAME_LEN];
-	
+
 	int							FrameCount;								// number of frames in the animation
 	float							FrameRate;								// framerate for playback
 	int							ChannelCount;							// number of independent morphing channels
@@ -131,16 +124,16 @@ class HMorphAnimClass : public HAnimClass
 	HAnimClass **					PoseData;		// pointer to pose for each morph channel
 	TimeCodedMorphKeysClass *	MorphKeyData;	// morph keys for each channel
 	uint32 *							PivotChannel;	// controlling channel for each pivot/bone
-	
+
 };
 
 
 /*********************************************************************************************
-** 
+**
 ** TimeCodedMorphKeysClass
 ** This class basically stores a vector of morph keys.  An HMorphAnimClass contains
 ** one of these for each independent morphing channel.  For example, the facial animation
-** stuff generates HMorphAnims which contain 2 channels, one which specifies what the 
+** stuff generates HMorphAnims which contain 2 channels, one which specifies what the
 ** "phoneme" bones are doing and one which specifies what the "expression" bones are doing.
 **
 *********************************************************************************************/
@@ -152,7 +145,7 @@ class TimeCodedMorphKeysClass
 	TimeCodedMorphKeysClass(void);
 	~TimeCodedMorphKeysClass(void);
 
-	bool					Load_W3D(ChunkLoadClass & cload);		
+	bool					Load_W3D(ChunkLoadClass & cload);
 	bool					Save_W3D(ChunkSaveClass & csave);
 	void					Get_Morph_Info(float morph_frame,int * pose_frame0,int * pose_frame1,float * fraction);
 
@@ -173,7 +166,7 @@ class TimeCodedMorphKeysClass
 		uint32	MorphFrame;				// morph animation frame index
 		uint32	PoseFrame;				// which pose frame to use at this time
 	};
-	
+
 	SimpleDynVecClass<MorphKeyStruct>	Keys;	// morph key data
 	uint32				CachedIdx;					// last accessed index
 
@@ -184,9 +177,3 @@ class TimeCodedMorphKeysClass
 
 	friend class HMorphAnimClass;
 };
-
-
-
-#endif
-
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
index 281a9f4cb96..17875705d1b 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
@@ -34,17 +34,17 @@
  *                                                                                             *
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
- *   HRawAnimClass::HRawAnimClass -- constructor                                                     * 
- *   HRawAnimClass::~HRawAnimClass -- Destructor                                                     * 
- *   HRawAnimClass::Free -- De-allocates all memory in use                                        * 
- *   HRawAnimClass::Load -- Loads hierarchy animation from a file                                 * 
- *   HRawAnimClass::read_channel -- Reads in a single channel of motion                           * 
- *   HRawAnimClass::add_channel -- Adds a motion channel to the animation                         * 
- *   HRawAnimClass::Get_Translation -- returns the translation vector for the given frame         * 
- *   HRawAnimClass::Get_Orientation -- returns a quaternion for the orientation of the pivot      * 
- *   HRawAnimClass::Get_XRotation -- Returns the X euler angle for the given pivot, frame         * 
- *   HRawAnimClass::Get_YRotation -- returns the Y Euler angle for the given pivot, frame         * 
- *   HRawAnimClass::Get_ZRotation -- returns the Z Euler angle for the given pivot, frame         * 
+ *   HRawAnimClass::HRawAnimClass -- constructor                                                     *
+ *   HRawAnimClass::~HRawAnimClass -- Destructor                                                     *
+ *   HRawAnimClass::Free -- De-allocates all memory in use                                        *
+ *   HRawAnimClass::Load -- Loads hierarchy animation from a file                                 *
+ *   HRawAnimClass::read_channel -- Reads in a single channel of motion                           *
+ *   HRawAnimClass::add_channel -- Adds a motion channel to the animation                         *
+ *   HRawAnimClass::Get_Translation -- returns the translation vector for the given frame         *
+ *   HRawAnimClass::Get_Orientation -- returns a quaternion for the orientation of the pivot      *
+ *   HRawAnimClass::Get_XRotation -- Returns the X euler angle for the given pivot, frame         *
+ *   HRawAnimClass::Get_YRotation -- returns the Y Euler angle for the given pivot, frame         *
+ *   HRawAnimClass::Get_ZRotation -- returns the Z Euler angle for the given pivot, frame         *
  *   HRawAnimClass::read_bit_channel -- read a bit channel from the file                          *
  *   HRawAnimClass::add_bit_channel -- install a bit channel into the animation                   *
  *   HRawAnimClass::Get_Visibility -- return visibility state for given pivot/frame               *
@@ -67,7 +67,7 @@
  *                                                                                             *
  * HISTORY:                                                                                    *
  *=============================================================================================*/
-NodeMotionStruct::NodeMotionStruct() : 
+NodeMotionStruct::NodeMotionStruct() :
 	X(NULL),
 	Y(NULL),
 	Z(NULL),
@@ -94,44 +94,28 @@ NodeMotionStruct::NodeMotionStruct() :
  *=============================================================================================*/
 NodeMotionStruct::~NodeMotionStruct()
 {
-	if (X != NULL) {
-		delete X;
-	}
-	if (Y != NULL) {
-		delete Y;
-	}
-	if (Z != NULL) {
-		delete Z;
-	}
-	if (XR != NULL) {
-		delete XR;
-	}
-	if (YR != NULL) {
-		delete YR;
-	}
-	if (ZR != NULL) {
-		delete ZR;
-	}
-	if (Q != NULL) {
-		delete Q;
-	}
-	if (Vis != NULL) {
-		delete Vis;
-	}
+	delete X;
+	delete Y;
+	delete Z;
+	delete XR;
+	delete YR;
+	delete ZR;
+	delete Q;
+	delete Vis;
 }
 
 
-/*********************************************************************************************** 
- * HRawAnimClass::HRawAnimClass -- constructor                                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::HRawAnimClass -- constructor                                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HRawAnimClass::HRawAnimClass(void) :
 	NumFrames(0),
@@ -144,17 +128,17 @@ HRawAnimClass::HRawAnimClass(void) :
 }
 
 
-/*********************************************************************************************** 
- * HRawAnimClass::~HRawAnimClass -- Destructor                                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::~HRawAnimClass -- Destructor                                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HRawAnimClass::~HRawAnimClass(void)
 {
@@ -162,44 +146,42 @@ HRawAnimClass::~HRawAnimClass(void)
 }
 
 
-/*********************************************************************************************** 
- * HRawAnimClass::Free -- De-allocates all memory in use                                          * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::Free -- De-allocates all memory in use                                          *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HRawAnimClass::Free(void)
 {
-	if (NodeMotion != NULL) {
-		delete[] NodeMotion;
-		NodeMotion = NULL;
-	}
+	delete[] NodeMotion;
+	NodeMotion = NULL;
 }
 
 
-/*********************************************************************************************** 
- * HRawAnimClass::Load -- Loads hierarchy animation from a file                                   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::Load -- Loads hierarchy animation from a file                                   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HRawAnimClass::Load_W3D(ChunkLoadClass & cload)
 {
 	bool pre30 = false;
 
-	/* 
+	/*
 	** First make sure we release any memory in use
 	*/
 	Free();
@@ -229,15 +211,13 @@ int HRawAnimClass::Load_W3D(ChunkLoadClass & cload)
 		pre30 = true;
 	}
 
-	strcpy(Name,aheader.HierarchyName);
-	strcat(Name,".");
-	strcat(Name,aheader.Name);
+	static_assert(ARRAY_SIZE(Name) >= ARRAY_SIZE(aheader.HierarchyName), "Incorrect array size");
+	strcpy(Name, aheader.HierarchyName);
+	strlcat(Name, ".", ARRAY_SIZE(Name));
+	strlcat(Name, aheader.Name, ARRAY_SIZE(Name));
 
-	// TSS chasing crash bug 05/26/99
-   WWASSERT(HierarchyName != NULL);
-   WWASSERT(aheader.HierarchyName != NULL);
-   WWASSERT(sizeof(HierarchyName) >= W3D_NAME_LEN);
-   strncpy(HierarchyName,aheader.HierarchyName,W3D_NAME_LEN);
+	static_assert(ARRAY_SIZE(HierarchyName) >= ARRAY_SIZE(aheader.HierarchyName), "Incorrect array size");
+	strcpy(HierarchyName, aheader.HierarchyName);
 
 	HTreeClass * base_pose = WW3DAssetManager::Get_Instance()->Get_HTree(HierarchyName);
 	if (base_pose == NULL) {
@@ -266,31 +246,31 @@ int HRawAnimClass::Load_W3D(ChunkLoadClass & cload)
 			case W3D_CHUNK_ANIMATION_CHANNEL:
 				if (!read_channel(cload,&newchan,pre30)) {
 					goto Error;
-				}			
+				}
 
-				// (gth) if the channel is referring to a node which is outside the range, 
+				// (gth) if the channel is referring to a node which is outside the range,
 				// just throw away the channel.  This probably means the animation must
 				// be re-exported
 				if (newchan->Get_Pivot() < NumNodes) {
 					add_channel(newchan);
 				} else {
-					WWDEBUG_SAY(("Animation %s referring to missing Bone! Please re-export.\n",Name));
+					WWDEBUG_SAY(("Animation %s referring to missing Bone! Please re-export.",Name));
 					delete newchan;
 				}
 				break;
-	
+
 			case W3D_CHUNK_BIT_CHANNEL:
 				if (!read_bit_channel(cload,&newbitchan,pre30)) {
 					goto Error;
 				}
 
-				// (gth) if the channel is referring to a node which is outside the range, 
+				// (gth) if the channel is referring to a node which is outside the range,
 				// just throw away the channel.  This probably means the animation must
 				// be re-exported
 				if (newbitchan->Get_Pivot() < NumNodes) {
 					add_bit_channel(newbitchan);
 				} else {
-					WWDEBUG_SAY(("Animation %s referring to missing Bone! Please re-export.\n",Name));
+					WWDEBUG_SAY(("Animation %s referring to missing Bone! Please re-export.",Name));
 					delete newbitchan;
 				}
 				break;
@@ -310,42 +290,42 @@ int HRawAnimClass::Load_W3D(ChunkLoadClass & cload)
 
 }
 
-/*********************************************************************************************** 
- * HRawAnimClass::read_channel -- Reads in a single channel of motion                             * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::read_channel -- Reads in a single channel of motion                             *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool HRawAnimClass::read_channel(ChunkLoadClass & cload,MotionChannelClass * * newchan,bool pre30)
 {
 	*newchan = W3DNEW MotionChannelClass;
-	bool result = (*newchan)->Load_W3D(cload);	
-	
+	bool result = (*newchan)->Load_W3D(cload);
+
 	if (result && pre30) {
 //		(*newchan)->PivotIdx += 1;
 		(*newchan)->Set_Pivot((*newchan)->Get_Pivot()+1);
 	}
-	
+
 	return result;
 }
 
-/*********************************************************************************************** 
- * HRawAnimClass::add_channel -- Adds a motion channel to the animation                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::add_channel -- Adds a motion channel to the animation                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HRawAnimClass::add_channel(MotionChannelClass * newchan)
 {
@@ -400,12 +380,12 @@ void HRawAnimClass::add_channel(MotionChannelClass * newchan)
 bool HRawAnimClass::read_bit_channel(ChunkLoadClass & cload,BitChannelClass * * newchan,bool pre30)
 {
 	*newchan = W3DNEW BitChannelClass;
-	bool result = (*newchan)->Load_W3D(cload);	
+	bool result = (*newchan)->Load_W3D(cload);
 
 	if (result && pre30) {
 		(*newchan)->PivotIdx += 1;
 	}
-	
+
 	return result;
 }
 
@@ -434,17 +414,17 @@ void HRawAnimClass::add_bit_channel(BitChannelClass * newchan)
 	}
 }
 
-/*********************************************************************************************** 
- * HRawAnimClass::Get_Translation -- returns the translation vector for the given fr              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::Get_Translation -- returns the translation vector for the given fr              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HRawAnimClass::Get_Translation(Vector3& trans, int pividx, float frame ) const
 {
@@ -492,24 +472,24 @@ void HRawAnimClass::Get_Translation(Vector3& trans, int pividx, float frame ) co
 	if (motion->Y != NULL) {
 		motion->Y->Get_Vector((int)frame1,&(trans1[1]));
 	}
-	if (motion->Z != NULL) {				
+	if (motion->Z != NULL) {
 		motion->Z->Get_Vector((int)frame1,&(trans1[2]));
 	}
 
 	Vector3::Lerp( trans0, trans1, ratio, &trans );
 }
 
-/*********************************************************************************************** 
- * HRawAnimClass::Get_Orientation -- returns a quaternion for the orientation of the              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::Get_Orientation -- returns a quaternion for the orientation of the              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HRawAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) const
 {
@@ -520,7 +500,7 @@ void HRawAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) const
 	float ratio = frame - (float)frame0;
 	WWASSERT( (ratio >= -WWMATH_EPSILON) && (ratio < 1.0f + WWMATH_EPSILON) );
 
-	if ( frame1 >= NumFrames ) 
+	if ( frame1 >= NumFrames )
 	{
 		frame1 = 0;
 	}
@@ -530,7 +510,7 @@ void HRawAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) const
 	Quaternion q0, q1;
 
 	MotionChannelClass* mc = NodeMotion[pividx].Q;
-	if (mc != NULL) 
+	if (mc != NULL)
 	{
 		mc->Get_Vector_As_Quat((int)frame0, q0);
 		mc->Get_Vector_As_Quat((int)frame1, q1);
@@ -541,11 +521,11 @@ void HRawAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) const
 		q1.Set();
 	}
 
-	if ( ratio == 0.0f ) 
+	if ( ratio == 0.0f )
 	{
 		q = q0;
 	}
-	else if ( ratio == 1.0f ) 
+	else if ( ratio == 1.0f )
 	{
 		q = q1;
 	}
@@ -578,17 +558,17 @@ void HRawAnimClass::Get_Orientation(Quaternion& q, int pividx,float frame) const
 #endif
 }
 
-/*********************************************************************************************** 
- * HRawAnimClass::Get_Transform -- returns the transform matrix for the given frame            * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HRawAnimClass::Get_Transform -- returns the transform matrix for the given frame            *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HRawAnimClass::Get_Transform(Matrix3D& mtx, int pividx, float frame ) const
 {
@@ -686,7 +666,7 @@ bool HRawAnimClass::Get_Visibility(int pividx,float frame)
  * HISTORY:                                                                                    *
  *   3/23/99    EHC : Created.                                                                 *
  *=============================================================================================*/
-bool HRawAnimClass::Is_Node_Motion_Present(int pividx) 
+bool HRawAnimClass::Is_Node_Motion_Present(int pividx)
 {
 	WWASSERT((pividx >= 0) && (pividx < NumNodes));
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h
index 6d1062e71b6..9c549afe570 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h
@@ -36,16 +36,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HRAWANIM_H
-#define HRAWANIM_H
 
 #include "always.h"
 #include "hanim.h"
- 
+
 class MotionChannelClass;
 class BitChannelClass;
 
@@ -64,7 +59,7 @@ struct NodeMotionStruct
 
 	BitChannelClass *			Vis;
 };
- 
+
 /**********************************************************************************
 
 	HRawAnimClass
@@ -79,13 +74,13 @@ class HRawAnimClass : public HAnimClass
 {
 
 public:
-	
+
 	enum
 	{
 		OK,
 		LOAD_ERROR
 	};
-	
+
 	HRawAnimClass(void);
 	~HRawAnimClass(void);
 
@@ -97,8 +92,6 @@ class HRawAnimClass : public HAnimClass
 	float							Get_Frame_Rate() { return FrameRate; }
 	float							Get_Total_Time() { return (float)NumFrames / FrameRate; }
 
-//	Vector3						Get_Translation(int pividx,float frame);
-//	Quaternion					Get_Orientation(int pividx,float frame);
 	void							Get_Translation(Vector3& translation, int pividx,float frame) const;
 	void							Get_Orientation(Quaternion& orientation, int pividx,float frame) const;
 	void							Get_Transform(Matrix3D& transform, int pividx,float frame) const;
@@ -120,14 +113,14 @@ class HRawAnimClass : public HAnimClass
 
 	char							Name[2*W3D_NAME_LEN];
 	char							HierarchyName[W3D_NAME_LEN];
-	
+
 	int							NumFrames;
 	int							NumNodes;
 	float							FrameRate;
 
 	NodeMotionStruct *		NodeMotion;
 
-	void Free(void);	
+	void Free(void);
 	bool read_channel(ChunkLoadClass & cload,MotionChannelClass * * newchan,bool pre30);
 	void add_channel(MotionChannelClass * newchan);
 
@@ -135,9 +128,3 @@ class HRawAnimClass : public HAnimClass
 	void add_bit_channel(BitChannelClass * newchan);
 
 };
-
-
-
-
-#endif
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp
index 55b52646de4..fde4a853fac 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp
@@ -17,52 +17,51 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/htreemgr.cpp 2     9/19/01 6:17p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/htreemgr.cpp                           $* 
- *                                                                                             * 
- *                       Author:: Byon_g                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 9/14/01 12:01p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 2                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   HTreeManagerClass::HTreeManagerClass -- constructor                                       * 
- *   HTreeManagerClass::~HTreeManagerClass -- destructor                                       * 
- *   HTreeManagerClass::Free -- de-allocate all memory in use                                  * 
- *   HTreeManagerClass::Free_All_Trees -- de-allocates all hierarchy trees currently loaded    * 
- *   HTreeManagerClass::Load_Tree -- load a hierarchy tree from a file                         * 
- *   HTreeManagerClass::Get_Tree_ID -- look up the ID of a named hierarchy tree                * 
- *   HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree              * 
- *   HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree              * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/htreemgr.cpp                           $*
+ *                                                                                             *
+ *                       Author:: Byon_g                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 9/14/01 12:01p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   HTreeManagerClass::HTreeManagerClass -- constructor                                       *
+ *   HTreeManagerClass::~HTreeManagerClass -- destructor                                       *
+ *   HTreeManagerClass::Free -- de-allocate all memory in use                                  *
+ *   HTreeManagerClass::Free_All_Trees -- de-allocates all hierarchy trees currently loaded    *
+ *   HTreeManagerClass::Load_Tree -- load a hierarchy tree from a file                         *
+ *   HTreeManagerClass::Get_Tree_ID -- look up the ID of a named hierarchy tree                *
+ *   HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree              *
+ *   HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
 #include "htreemgr.h"
-#include <string.h>
 #include "htree.h"
 #include "chunkio.h"
 #include "wwmemlog.h"
 #include "w3dexclusionlist.h"
 
 
-/*********************************************************************************************** 
- * HTreeManagerClass::HTreeManagerClass -- constructor                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::HTreeManagerClass -- constructor                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HTreeManagerClass::HTreeManagerClass(void) :
 	NumTrees(0)
@@ -72,51 +71,51 @@ HTreeManagerClass::HTreeManagerClass(void) :
 	}
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::~HTreeManagerClass -- destructor                                         * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::~HTreeManagerClass -- destructor                                         *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HTreeManagerClass::~HTreeManagerClass(void)
 {
 	Free();
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Free -- de-allocate all memory in use                                    * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Free -- de-allocate all memory in use                                    *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HTreeManagerClass::Free(void)
 {
 	Free_All_Trees();
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Free_All_Trees -- de-allocates all hierarchy trees currently loaded      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Free_All_Trees -- de-allocates all hierarchy trees currently loaded      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HTreeManagerClass::Free_All_Trees(void)
 {
@@ -124,25 +123,23 @@ void HTreeManagerClass::Free_All_Trees(void)
 	TreeHash.Remove_All();
 
 	for (int treeidx=0; treeidx < MAX_TREES; treeidx++) {
-		if (TreePtr[treeidx] != NULL) {
-			delete TreePtr[treeidx];
-			TreePtr[treeidx] = NULL;
-		}
+		delete TreePtr[treeidx];
+		TreePtr[treeidx] = NULL;
 	}
 	NumTrees = 0;
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Free_All_Trees_With_Exclusion_List -- de-allocates all trees not in list * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   12/12/2002 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Free_All_Trees_With_Exclusion_List -- de-allocates all trees not in list *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   12/12/2002 GH  : Created.                                                                 *
  *=============================================================================================*/
 void HTreeManagerClass::Free_All_Trees_With_Exclusion_List(const W3DExclusionListClass & exclusion_list)
 {
@@ -153,16 +150,16 @@ void HTreeManagerClass::Free_All_Trees_With_Exclusion_List(const W3DExclusionLis
 	int treeidx=0;
 	for (; treeidx < MAX_TREES; treeidx++) {
 		if (TreePtr[treeidx] != NULL) {
-			
+
 			if (exclusion_list.Is_Excluded(TreePtr[treeidx])) {
 
-				//WWDEBUG_SAY(("excluding tree %s\n",TreePtr[treeidx]->Get_Name()));
+				//WWDEBUG_SAY(("excluding tree %s",TreePtr[treeidx]->Get_Name()));
 				TreePtr[new_tail] = TreePtr[treeidx];
 				new_tail++;
 
 			} else {
-				
-				//WWDEBUG_SAY(("deleting tree %s\n",TreePtr[treeidx]->Get_Name()));
+
+				//WWDEBUG_SAY(("deleting tree %s",TreePtr[treeidx]->Get_Name()));
 				delete TreePtr[treeidx];
 				TreePtr[treeidx] = NULL;
 			}
@@ -183,17 +180,17 @@ void HTreeManagerClass::Free_All_Trees_With_Exclusion_List(const W3DExclusionLis
 	}
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Load_Tree -- load a hierarchy tree from a file                           * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Load_Tree -- load a hierarchy tree from a file                           *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HTreeManagerClass::Load_Tree(ChunkLoadClass & cload)
 {
@@ -205,14 +202,14 @@ int HTreeManagerClass::Load_Tree(ChunkLoadClass & cload)
 	}
 
 	if (newtree->Load_W3D(cload) != HTreeClass::OK) {
-		
+
 		// load failed, delete and return error
 		delete newtree;
 		goto Error;
 
 	} else if (Get_Tree_ID(newtree->Get_Name()) != -1) {
-		
-		// tree with this name already exists, reject it!	
+
+		// tree with this name already exists, reject it!
 		delete newtree;
 		goto Error;
 
@@ -236,17 +233,17 @@ int HTreeManagerClass::Load_Tree(ChunkLoadClass & cload)
 
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Get_Tree_ID -- look up the ID of a named hierarchy tree                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Get_Tree_ID -- look up the ID of a named hierarchy tree                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 int HTreeManagerClass::Get_Tree_ID(const char * name)
 {
@@ -258,17 +255,17 @@ int HTreeManagerClass::Get_Tree_ID(const char * name)
 	return -1;
 }
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Get_Tree_Name -- look up the name of a id'd hierarchy tree                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Get_Tree_Name -- look up the name of a id'd hierarchy tree                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 char *HTreeManagerClass::Get_Tree_Name(const int idx)
 {
@@ -283,17 +280,17 @@ char *HTreeManagerClass::Get_Tree_Name(const int idx)
 
 
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HTreeClass * HTreeManagerClass::Get_Tree(const char * name)
 {
@@ -311,17 +308,17 @@ HTreeClass * HTreeManagerClass::Get_Tree(const char * name)
 }
 
 
-/*********************************************************************************************** 
- * HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree                * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * HTreeManagerClass::Get_Tree -- get a pointer to the specified hierarchy tree                *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 HTreeClass * HTreeManagerClass::Get_Tree(int id)
 {
@@ -330,4 +327,4 @@ HTreeClass * HTreeManagerClass::Get_Tree(int id)
 	} else {
 		return NULL;
 	}
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h
index 7b8416866fa..e1b747a5079 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h
@@ -17,31 +17,25 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/htreemgr.h 2     9/19/01 6:17p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/htreemgr.h                             $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 9/13/01 7:22p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 2                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/htreemgr.h                             $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 9/13/01 7:22p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 2                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef HTREEMGR_H
-#define HTREEMGR_H
 
 #include "always.h"
 #include "bittype.h"
@@ -93,6 +87,3 @@ class HTreeManagerClass
 	HashTemplateClass<StringClass,HTreeClass*> TreeHash;
 
 };
-
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.cpp
index ef78e57d75f..aa415607bf8 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.cpp
@@ -78,7 +78,7 @@ SimplePersistFactoryClass<LightClass,WW3D_PERSIST_CHUNKID_LIGHT>	_LightFactory;
 /*
 ** Chunk ID's used by LightClass's save-load support (different from the W3D file format...)
 */
-enum 
+enum
 {
 	LIGHT_CHUNK_W3DFILE						= 0x02157100,			// (w3d format light)
 	LIGHT_CHUNK_VARIABLES,												// other state not stored in the w3d format
@@ -102,7 +102,7 @@ enum
  *   3/21/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 LightClass::LightClass(LightType type) :
-	Type(type),	
+	Type(type),
 	Flags(0),
 	CastShadows(false),
 	Intensity(1.0f),
@@ -139,7 +139,7 @@ LightClass::LightClass(LightType type) :
  *   3/21/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 LightClass::LightClass(const LightClass & src) :
-	Type(src.Type),	
+	Type(src.Type),
 	Flags(src.Flags),
 	CastShadows(src.CastShadows),
 	Intensity(src.Intensity),
@@ -175,7 +175,7 @@ LightClass & LightClass::operator = (const LightClass & that)
 	if (this != &that) {
 		RenderObjClass::operator = (that);
 
-		Type = that.Type;	
+		Type = that.Type;
 		Flags = that.Flags;
 		CastShadows = that.CastShadows;
 		Intensity = that.Intensity;
@@ -341,7 +341,7 @@ WW3DErrorType LightClass::Load_W3D(ChunkLoadClass & cload)
 		Type = SPOT;
 		break;
 	}
-	
+
 	Enable_Shadows((lightinfo.Attributes & W3D_LIGHT_ATTRIBUTE_CAST_SHADOWS) == W3D_LIGHT_ATTRIBUTE_CAST_SHADOWS);
 	Set_Intensity(lightinfo.Intensity);
 
@@ -358,7 +358,7 @@ WW3DErrorType LightClass::Load_W3D(ChunkLoadClass & cload)
 	Vector3								vec;
 
 	while (cload.Open_Chunk()) {
-		switch(cload.Cur_Chunk_ID()) 
+		switch(cload.Cur_Chunk_ID())
 		{
 		case W3D_CHUNK_SPOT_LIGHT_INFO:
 			cload.Read(&spotinfo,sizeof(spotinfo));
@@ -367,7 +367,7 @@ WW3DErrorType LightClass::Load_W3D(ChunkLoadClass & cload)
 			W3dUtilityClass::Convert_Vector(spotinfo.SpotDirection,&vec);
 			Set_Spot_Direction(vec);
 			break;
-		
+
 		case W3D_CHUNK_NEAR_ATTENUATION:
 			cload.Read(&atteninfo,sizeof(atteninfo));
 			Set_Flag(NEAR_ATTENUATION,true);
@@ -407,8 +407,8 @@ WW3DErrorType LightClass::Save_W3D(ChunkSaveClass & csave)
 
 	W3dLightStruct lightinfo;
 	memset(&lightinfo,0,sizeof(lightinfo));
-	
-	switch (Type) 
+
+	switch (Type)
 	{
 	case POINT:
 		lightinfo.Attributes |= W3D_LIGHT_ATTRIBUTE_POINT;
@@ -432,9 +432,9 @@ WW3DErrorType LightClass::Save_W3D(ChunkSaveClass & csave)
 	W3dUtilityClass::Convert_Color(color,(&lightinfo.Diffuse));
 	Get_Specular(&color);
 	W3dUtilityClass::Convert_Color(color,(&lightinfo.Specular));
-	
+
 	lightinfo.Intensity = Get_Intensity();
-	
+
 	csave.Write(&lightinfo,sizeof(lightinfo));
 	csave.End_Chunk();
 
@@ -449,13 +449,13 @@ WW3DErrorType LightClass::Save_W3D(ChunkSaveClass & csave)
 		spotinfo.SpotDirection.Y = SpotDirection.Y;
 		spotinfo.SpotDirection.Z = SpotDirection.Z;
 		csave.Write(&spotinfo,sizeof(spotinfo));
-		
+
 		csave.End_Chunk();
 	}
 
 	if (Get_Flag(NEAR_ATTENUATION)) {
 		csave.Begin_Chunk(W3D_CHUNK_NEAR_ATTENUATION);
-		
+
 		double start,end;
 		Get_Near_Attenuation_Range(start,end);
 
@@ -470,7 +470,7 @@ WW3DErrorType LightClass::Save_W3D(ChunkSaveClass & csave)
 
 	if (Get_Flag(FAR_ATTENUATION)) {
 		csave.Begin_Chunk(W3D_CHUNK_FAR_ATTENUATION);
-		
+
 		double start,end;
 		Get_Far_Attenuation_Range(start,end);
 
@@ -484,7 +484,7 @@ WW3DErrorType LightClass::Save_W3D(ChunkSaveClass & csave)
 	}
 
 	csave.End_Chunk();
-	
+
 	return WW3D_ERROR_OK;
 }
 
@@ -503,7 +503,7 @@ WW3DErrorType LightClass::Save_W3D(ChunkSaveClass & csave)
  *=============================================================================================*/
 const PersistFactoryClass & LightClass::Get_Factory (void) const
 {
-	return _LightFactory;	
+	return _LightFactory;
 }
 
 
@@ -565,12 +565,12 @@ bool LightClass::Load (ChunkLoadClass &cload)
 					switch(cload.Cur_Micro_Chunk_ID()) {
 						READ_MICRO_CHUNK(cload,LIGHT_VARIABLE_TRANSFORM,tm);
 					}
-					cload.Close_Micro_Chunk();	
+					cload.Close_Micro_Chunk();
 				}
 				break;
 
 			default:
-				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d\r\n",__FILE__,__LINE__));
+				WWDEBUG_SAY(("Unhandled Chunk: 0x%X File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
 		cload.Close_Chunk();
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h
index 267cd99aed6..cb8396e5a56 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef LIGHT_H
-#define LIGHT_H
 
 #include "always.h"
 #include "rendobj.h"
@@ -51,14 +45,14 @@ class ChunkSaveClass;
 
 
 /**
-** LightClass 
-** This "render object" is a light source.  
+** LightClass
+** This "render object" is a light source.
 */
 class LightClass : public RenderObjClass
 {
 public:
-	
-	enum LightType 
+
+	enum LightType
 	{
 		POINT = 0,
 		DIRECTIONAL,
@@ -68,7 +62,7 @@ class LightClass : public RenderObjClass
 	enum FlagsType
 	{
 		NEAR_ATTENUATION				= 0,
-		FAR_ATTENUATION,					
+		FAR_ATTENUATION,
 	};
 
 	LightClass(LightType type = POINT);
@@ -84,7 +78,7 @@ class LightClass : public RenderObjClass
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void			Render(RenderInfoClass & rinfo)							{ }
 	virtual bool			Is_Vertex_Processor(void)									{ return true; }
-	
+
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - "Scene Graph"
 	// Lights register themselves with the scene as VertexProcessors.
@@ -103,7 +97,7 @@ class LightClass : public RenderObjClass
 	// LightClass Interface
 	/////////////////////////////////////////////////////////////////////////////
 	LightType				Get_Type() {return (Type);}
-	
+
 	void						Set_Intensity(float inten) { Intensity = inten; }
 	float						Get_Intensity(void) const { return Intensity; }
 
@@ -121,8 +115,8 @@ class LightClass : public RenderObjClass
 	void						Get_Far_Attenuation_Range(float & fStart, float & fEnd) const	{ fStart = FarAttenStart; fEnd = FarAttenEnd; }
 	void						Set_Near_Attenuation_Range(double nStart, double nEnd)			{ NearAttenStart = nStart; NearAttenEnd = nEnd; }
 	void						Get_Near_Attenuation_Range(double& nStart, double& nEnd)	const	{ nStart = NearAttenStart; nEnd = NearAttenEnd; }
-	float						Get_Attenuation_Range(void) const										{ return FarAttenEnd; } 
-	
+	float						Get_Attenuation_Range(void) const										{ return FarAttenEnd; }
+
 	/////////////////////////////////////////////////////////////////////////////
 	// Control over the light flags
 	/////////////////////////////////////////////////////////////////////////////
@@ -168,17 +162,15 @@ class LightClass : public RenderObjClass
 	Vector3					Ambient;
 	Vector3					Diffuse;
 	Vector3					Specular;
-	
+
 	float						NearAttenStart;
 	float						NearAttenEnd;
 	float						FarAttenStart;
 	float						FarAttenEnd;
-	
+
 	float						SpotAngle;
 	float						SpotAngleCos;
 	float						SpotExponent;
 	Vector3					SpotDirection;
 	//bool						Donut; ///does this light only apply at edges
 };
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp
index 1ff112cb2c6..165647ea678 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp
@@ -70,8 +70,8 @@ void LightEnvironmentClass::InputLightStruct::Init
 	const Vector3 & object_center
 )
 {
-	m_point = false; 
-	switch(light.Get_Type()) 
+	m_point = false;
+	switch(light.Get_Type())
 	{
 	case LightClass::POINT:
 	case LightClass::SPOT:
@@ -106,7 +106,7 @@ void LightEnvironmentClass::InputLightStruct::Init_From_Point_Or_Spot_Light
 	light.Get_Far_Attenuation_Range(atten_start,atten_end);
 
 	if (light.Get_Flag(LightClass::FAR_ATTENUATION)) {
-		
+
 		if (WWMath::Fabs(atten_end - atten_start) < WWMATH_EPSILON) {
 
 			/*
@@ -114,10 +114,10 @@ void LightEnvironmentClass::InputLightStruct::Init_From_Point_Or_Spot_Light
 			*/
 			if (dist > atten_start) {
 				atten = 0.0f;
-			} 
-		
+			}
+
 		} else {
-			
+
 			/*
 			** Compute the attenuation
 			*/
@@ -128,7 +128,7 @@ void LightEnvironmentClass::InputLightStruct::Init_From_Point_Or_Spot_Light
 
 
 	if (light.Get_Type() == LightClass::SPOT) {
-		
+
 		Vector3 spot_dir;
 		light.Get_Spot_Direction(spot_dir);
 		Matrix3D::Rotate_Vector(light.Get_Transform(),spot_dir,&spot_dir);
@@ -146,9 +146,9 @@ void LightEnvironmentClass::InputLightStruct::Init_From_Point_Or_Spot_Light
 	light.Get_Ambient(&Ambient);
 	light.Get_Diffuse(&Diffuse);
 	Ambient *= light.Get_Intensity();  //(gth) CNC3 obey the intensity parameter
-	Diffuse *= light.Get_Intensity();  
+	Diffuse *= light.Get_Intensity();
 
-	m_point = (light.Get_Type() == LightClass::POINT); 
+	m_point = (light.Get_Type() == LightClass::POINT);
 	m_center = light.Get_Position();
 	m_innerRadius = atten_start;
 	m_outerRadius = atten_end;
@@ -160,7 +160,7 @@ void LightEnvironmentClass::InputLightStruct::Init_From_Point_Or_Spot_Light
 		DiffuseRejected = false;
 		Ambient *= atten;
 		Diffuse *= atten;
-		
+
 	} else {
 
 		DiffuseRejected = true;
@@ -190,7 +190,7 @@ float LightEnvironmentClass::InputLightStruct::Contribution(void)
 {
 	return Diffuse.Length2();
 }
-	
+
 
 /************************************************************************************************
 **
@@ -206,12 +206,12 @@ void LightEnvironmentClass::OutputLightStruct::Init
 {
 	Diffuse = input.Diffuse;
 	Matrix3D::Inverse_Rotate_Vector(camera_tm,input.Direction,&Direction);
-	
+
 	// Guard against a direction that is invalid
 	if(Direction.Length2() == 0.0f) {
 		Direction.X = 1.0f;
 	}
-}	
+}
 
 
 
@@ -276,7 +276,7 @@ void LightEnvironmentClass::Add_Light(const LightClass & light)
 		// Insert the light into the sorted list of InputLights if it's contribution is greater than the any of the current number of lights
 		for (int light_index=0; light_index < LightCount; light_index++) {
 			if (new_light.Contribution() > InputLights[light_index].Contribution()) {
-				
+
 				// Move back the lights in the InputLights Array to make space for the new light.
 				// The last light might be discarded if it moves off the array as it is the weakest light in the list.
 				for (int i = LightCount; i > light_index; --i) {
@@ -338,7 +338,7 @@ float LightEnvironmentClass::Get_Lighting_LOD_Cutoff(void)
 /************************************************************************************************
 **
 ** LightEnvironmentClass::Add_Fill_Light Implementation
-** The fill light is inserted in the InputLights list as ont of the lights, and if the 
+** The fill light is inserted in the InputLights list as ont of the lights, and if the
 ** list is already full, it preempts the last and weakest light in that list.
 **
 ************************************************************************************************/
@@ -379,30 +379,30 @@ void LightEnvironmentClass::Add_Fill_Light(void)
 **
 ************************************************************************************************/
 void LightEnvironmentClass::Calculate_Fill_Light(void)
-{	
+{
 	// Early exit if we have no lights at all or if the fill light intensity is zero
 	if (LightCount == 0 || FillIntensity == 0.0f) return;
 
 	// Initialize the averaged light to the primary light source (light with the most contribution)
 	float primary_contribution = InputLights[0].Contribution();
-	InputLightStruct average_light = InputLights[0]; 
+	InputLightStruct average_light = InputLights[0];
 
 	// Loop through the remaining lights on the list (up to 2) and add their contributions to the averaged light
-	int num_lights = min(LightCount, MAX_LIGHTS - 1); 
+	int num_lights = min(LightCount, MAX_LIGHTS - 1);
 	for (int i = 1; i < num_lights; ++i) {
-		
+
 		// The ratio is the percentage of the remaining light's contribution compared to the primary light source
 		float ratio = InputLights[i].Contribution() / primary_contribution;
-		
+
 		average_light.Direction += (InputLights[i].Direction * ratio);
 		average_light.Ambient	+= (InputLights[i].Ambient * ratio);
 		average_light.Diffuse	+= (InputLights[i].Diffuse * ratio);
 	}
-	
+
 	// Normalize the averaged light direction
 	average_light.Direction.Normalize();
-	
-	// Now we have the averaged light, we should derive the fill light 
+
+	// Now we have the averaged light, we should derive the fill light
 	// Convert from RGB to HSV to get the reserve hue and with the value modified by the fill intensity
 	Vector3 temp;
 	RGB_To_HSV(temp, average_light.Diffuse);
@@ -411,13 +411,13 @@ void LightEnvironmentClass::Calculate_Fill_Light(void)
 		temp.X -= 360.0f;
 	}
 	temp.Z *= FillIntensity;	// fraction of the intensity
-	HSV_To_RGB(FillLight.Diffuse, temp);	
+	HSV_To_RGB(FillLight.Diffuse, temp);
 
 	// Zero out the fill ambient
 	FillLight.Ambient.Set(0.0f, 0.0f, 0.0f);
 
 	// now we set the fill light direction to be opposite the average light
-	FillLight.Direction = average_light.Direction * (-1.0f);		
+	FillLight.Direction = average_light.Direction * (-1.0f);
 	FillLight.DiffuseRejected = false;
 
 	// Add the fill light into the InputLights list
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h
index 228790efb66..437106e7feb 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h
@@ -37,12 +37,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef LIGHTENVIRONMENT_H
-#define LIGHTENVIRONMENT_H
 
 #include "always.h"
 #include "vector3.h"
@@ -58,7 +53,7 @@ class LightClass;
 ** is to collect all of the point light sources affecting an object at any given time and
 ** create temporary directional light sources representing them.  Any distance or directional
 ** attenuation will be precalculated into the overall intensity of the light and a vector from
-** the light source to the center of the bounding sphere of the model will be used as the 
+** the light source to the center of the bounding sphere of the model will be used as the
 ** directional component.
 ** In addition, the engine will provide the ambient component which will be determined by
 ** a combination of the ambient setting for the level and sampling the light maps in the area.
@@ -70,7 +65,7 @@ class LightClass;
 ** - we need the direction of the lights in eye-space
 ** - the ambient light from all lights should be added into the ambient light (not just scene)
 */
-class LightEnvironmentClass 
+class LightEnvironmentClass
 {
 public:
 
@@ -96,19 +91,19 @@ class LightEnvironmentClass
 	void					Set_Fill_Intensity(float intensity)			{ FillIntensity = intensity; }
 
 	/*
-	** Accessors 
+	** Accessors
 	*/
 	const Vector3 &	Get_Equivalent_Ambient(void) const			{ return OutputAmbient; }
 	void Set_Output_Ambient(Vector3& oa) { OutputAmbient = oa; }
 	int					Get_Light_Count(void) const					{ return LightCount; }
 	const Vector3 &	Get_Light_Direction(int i)	const				{ return InputLights[i].Direction; }
-	const Vector3 &	Get_Light_Diffuse(int i) const				{ return InputLights[i].Diffuse; }	
+	const Vector3 &	Get_Light_Diffuse(int i) const				{ return InputLights[i].Diffuse; }
 
-	bool isPointLight(int i) const {return InputLights[i].m_point;} 
-	float getPointIrad(int i) const {return InputLights[i].m_innerRadius;} 
-	float getPointOrad(int i) const {return InputLights[i].m_outerRadius;} 
-	const Vector3 &	getPointDiffuse(int i) const				{ return InputLights[i].m_diffuse; }	
-	const Vector3 &	getPointAmbient(int i) const				{ return InputLights[i].m_ambient; }	
+	bool isPointLight(int i) const {return InputLights[i].m_point;}
+	float getPointIrad(int i) const {return InputLights[i].m_innerRadius;}
+	float getPointOrad(int i) const {return InputLights[i].m_outerRadius;}
+	const Vector3 &	getPointDiffuse(int i) const				{ return InputLights[i].m_diffuse; }
+	const Vector3 &	getPointAmbient(int i) const				{ return InputLights[i].m_ambient; }
  	const Vector3 &	getPointCenter(int i)	const				{ return InputLights[i].m_center; }
 
 	/*
@@ -121,7 +116,7 @@ class LightEnvironmentClass
 	static int			Get_Max_Lights() { return MAX_LIGHTS; }
 	enum { MAX_LIGHTS = 4 };	//Made this public, so other code can tell how many lights are allowed. - MW
 
-	inline bool operator== (const LightEnvironmentClass& that) const
+	bool operator== (const LightEnvironmentClass& that) const
 	{
 		if (LightCount!=that.LightCount) return false;
 		bool dif=!(ObjectCenter==that.ObjectCenter);
@@ -147,7 +142,7 @@ class LightEnvironmentClass
 		Vector3			Ambient;
 		Vector3			Diffuse;
 		bool				DiffuseRejected;
-		
+
 		bool				m_point;
 		Vector3			m_center;
 		float				m_innerRadius;
@@ -156,11 +151,11 @@ class LightEnvironmentClass
 		Vector3			m_diffuse;
 
 	};
-	
+
 	struct OutputLightStruct
 	{
 		void				Init(const InputLightStruct & input,const Matrix3D & camera_tm);
-		
+
 		Vector3			Direction;						// direction to the light.
 		Vector3			Diffuse;							// diffuse color * attenuation
 	};
@@ -178,7 +173,3 @@ class LightEnvironmentClass
 	InputLightStruct 	FillLight;						// Used to store the calculated fill light
 	float					FillIntensity;					// Used to determine how strong the fill light should be
 };
-
-
-#endif //LIGHTENVIRONMENT_H
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.cpp
index 98f01b57126..b42a36c3fdc 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Hector Yee                                                   *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 2                                                            $*
@@ -70,7 +70,7 @@ LineGroupClass::LineGroupClass(void) :
 	Shader(ShaderClass::_PresetAdditiveSpriteShader),
 	DefaultLineSize(0.0f),
 	DefaultLineColor(1.0f, 1.0f, 1.0f),
-	DefaultLineAlpha(1.0f),		
+	DefaultLineAlpha(1.0f),
 	DefaultLineUCoord(0.0f),
 	DefaultTailDiffuse(0.0f, 0.0f, 0.0f, 0.0f),
 	LineMode(TETRAHEDRON)
@@ -92,11 +92,11 @@ LineGroupClass::~LineGroupClass(void)
 void LineGroupClass::Set_Arrays(
 	ShareBufferClass<Vector3> *startlocs,
 	ShareBufferClass<Vector3> *endlocs,
-	ShareBufferClass<Vector4> *diffuse,		
+	ShareBufferClass<Vector4> *diffuse,
 	ShareBufferClass<Vector4> *taildiffuse,
 	ShareBufferClass<unsigned int> *alt,
-	ShareBufferClass<float> *sizes,	
-	ShareBufferClass<float> *ucoords, 
+	ShareBufferClass<float> *sizes,
+	ShareBufferClass<float> *ucoords,
 	int active_line_count
 	)
 {
@@ -108,7 +108,7 @@ void LineGroupClass::Set_Arrays(
 	WWASSERT(startlocs->Get_Count() == endlocs->Get_Count());
 	WWASSERT(!diffuse || startlocs->Get_Count() == diffuse->Get_Count());
 	WWASSERT(!alt || startlocs->Get_Count() == alt->Get_Count());
-	WWASSERT(!sizes || startlocs->Get_Count() == sizes->Get_Count());	
+	WWASSERT(!sizes || startlocs->Get_Count() == sizes->Get_Count());
 	WWASSERT(!ucoords || startlocs->Get_Count() == ucoords->Get_Count());
 	WWASSERT(!taildiffuse || startlocs->Get_Count() == taildiffuse->Get_Count());
 
@@ -117,7 +117,7 @@ void LineGroupClass::Set_Arrays(
 	REF_PTR_SET(LineDiffuse,diffuse);
 	REF_PTR_SET(TailDiffuse,taildiffuse);
 	REF_PTR_SET(ALT,alt);
-	REF_PTR_SET(LineSize,sizes);	
+	REF_PTR_SET(LineSize,sizes);
 	REF_PTR_SET(LineUCoord,ucoords);
 
 	if (ALT) {
@@ -180,8 +180,8 @@ float LineGroupClass::Get_Line_UCoord(void)
 
 void LineGroupClass::Set_Flag(FlagsType flag, bool on)
 {
-	if (on) Flags |= 1 << flag; 
-	else 
+	if (on) Flags |= 1 << flag;
+	else
 		Flags &= ~(1 << flag);
 }
 
@@ -274,7 +274,7 @@ void	LineGroupClass::Render(RenderInfoClass &rinfo)
 	const static Vector3 offset_c = Vector3(WWMath::Cos(11 * WWMATH_PI / 6),	WWMath::Sin(11 * WWMATH_PI / 6), 0);
 
 	static Vector3 offset[3];
-	
+
 	offset[0].Set(offset_a);
 	offset[1].Set(offset_b);
 	offset[2].Set(offset_c);
@@ -284,7 +284,7 @@ void	LineGroupClass::Render(RenderInfoClass &rinfo)
 	DX8Wrapper::Get_Transform(D3DTS_VIEW, view);
 
 	Matrix4x4 identity(true);
-	DX8Wrapper::Set_Transform(D3DTS_WORLD, identity);	
+	DX8Wrapper::Set_Transform(D3DTS_WORLD, identity);
 
 	// if the points are in world space, transform the offsets
 	if (Get_Flag(TRANSFORM)) {
@@ -298,7 +298,7 @@ void	LineGroupClass::Render(RenderInfoClass &rinfo)
 	} else {
 		DX8Wrapper::Set_Transform(D3DTS_VIEW, identity);
 	}
-	
+
 	int num_tris=0;
 	int num_indices=0;
 	int num_vertices=0;
@@ -314,10 +314,10 @@ void	LineGroupClass::Render(RenderInfoClass &rinfo)
 			num_indices		=3 * num_tris;
 			num_vertices	=6 * LineCount;
 			break;
-	}	
+	}
 
 	// construct the tetrahedra in the index buffers
-	// assume first vertex is the apex, followed by offset[0-3]	
+	// assume first vertex is the apex, followed by offset[0-3]
 
 	DynamicIBAccessClass iba(sort?BUFFER_TYPE_DYNAMIC_SORTING:BUFFER_TYPE_DYNAMIC_DX8,num_indices);
 
@@ -332,7 +332,7 @@ void	LineGroupClass::Render(RenderInfoClass &rinfo)
 					// apex, offset[1], offset[0]
 					*ibptr++	= idx + 0;
 					*ibptr++	= idx + 2;
-					*ibptr++	= idx + 1;			
+					*ibptr++	= idx + 1;
 					// apex, offset[2], offset[1]
 					*ibptr++	= idx + 0;
 					*ibptr++	= idx + 3;
@@ -379,12 +379,12 @@ void	LineGroupClass::Render(RenderInfoClass &rinfo)
 					*ibptr++ = idx + 3;
 					*ibptr++ = idx + 5;
 					*ibptr++ = idx + 4;
-				}			
+				}
 				break;
 		}
-	}	// writing to ib
+	}
 
-	// make the vertex buffers	
+	// make the vertex buffers
 
 	DynamicVBAccessClass vba(sort ? BUFFER_TYPE_DYNAMIC_SORTING : BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,num_vertices);
 
@@ -396,7 +396,7 @@ void	LineGroupClass::Render(RenderInfoClass &rinfo)
 		Vector3 loc, start, end;
 		int point, j;
 		float size = DefaultLineSize;
-		Vector4 diffuse(DefaultLineColor.X, DefaultLineColor.Y, DefaultLineColor.Z, DefaultLineAlpha);		
+		Vector4 diffuse(DefaultLineColor.X, DefaultLineColor.Y, DefaultLineColor.Z, DefaultLineAlpha);
 		float ucoord = DefaultLineUCoord;
 		Vector4 taildiffuse = DefaultTailDiffuse;
 
@@ -430,7 +430,7 @@ void	LineGroupClass::Render(RenderInfoClass &rinfo)
 						vb->diffuse	= DX8Wrapper::Convert_Color(diffuse);
 						vb->u1		= ucoord;
 						vb->v1		= 0.0f;
-						vb++;				
+						vb++;
 					}
 					break;
 			case PRISM:
@@ -443,12 +443,12 @@ void	LineGroupClass::Render(RenderInfoClass &rinfo)
 						vb->diffuse	= DX8Wrapper::Convert_Color(diffuse);
 						vb->u1		= ucoord;
 						vb->v1		= 0.0f;
-						vb++;				
+						vb++;
 					}
 					// Do not merge loops. The vb has to be written in a specific order
 					// (This is to optimize AGP memory write)
 
-					// end cap 
+					// end cap
 					for (j=0; j<3; j++) {
 						loc.Set(end + size * offset[j]);
 						vb->x			= loc.X;
@@ -457,23 +457,23 @@ void	LineGroupClass::Render(RenderInfoClass &rinfo)
 						vb->diffuse	= DX8Wrapper::Convert_Color(taildiffuse);
 						vb->u1		= ucoord;
 						vb->v1		= 1.0f;
-						vb++;				
+						vb++;
 					}
 					break;
 			}
 
 		}
-	} // writing to vb
+	}
 
 	DX8Wrapper::Set_Index_Buffer(iba, 0);
 	DX8Wrapper::Set_Vertex_Buffer(vba);
-	
+
 	if (sort) {
 		SortingRendererClass::Insert_Triangles(0, num_tris, 0, num_vertices);
 	} else {
 		DX8Wrapper::Draw_Triangles(0, num_tris, 0, num_vertices);
-	}		
-	
+	}
+
 	// restore the matrices
 	DX8Wrapper::Set_Transform(D3DTS_VIEW, view);
 }
@@ -490,4 +490,4 @@ int LineGroupClass::Get_Polygon_Count(void)
 	}
 	WWASSERT(0);
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h
index 2f28e8d5fd5..1e37ea0cd4f 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h
@@ -36,12 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef LINEGRP_H
-#define LINEGRP_H
 
 #include "shader.h"
 #include "vector4.h"
@@ -52,11 +47,11 @@ class RenderInfoClass;
 class TextureClass;
 
 template <class T> class ShareBufferClass;
- 
+
 /*
-** LineGroupClass -- a custom object for rendering 
+** LineGroupClass -- a custom object for rendering
 ** groups of lines (such as motion blurred particle systems).
-*/ 
+*/
 class LineGroupClass
 {
 public:
@@ -71,7 +66,7 @@ class LineGroupClass
 	};
 
 	LineGroupClass(void);
-	virtual ~LineGroupClass(void);	
+	virtual ~LineGroupClass(void);
 
 	// LineGroupClass interface:
 	void						Set_Arrays(
@@ -114,7 +109,7 @@ class LineGroupClass
 	ShareBufferClass<Vector4> *			LineDiffuse; // (NULL if not used) RGBA values
 	ShareBufferClass<Vector4> *			TailDiffuse; // (NULL if not used) RGBA values
 	ShareBufferClass<unsigned int> *		ALT;			// (NULL if not used) active line table
-	ShareBufferClass<float> *				LineSize;	// (NULL if not used) size override table	
+	ShareBufferClass<float> *				LineSize;	// (NULL if not used) size override table
 	ShareBufferClass<float> *				LineUCoord; // (NULL if not used) U coordinates
 	int											LineCount;	// Active (if ALT) or total point count
 
@@ -125,10 +120,8 @@ class LineGroupClass
 	unsigned int			Flags;						// operation control flags
 	float						DefaultLineSize;			// Line size (size array overrides if present)
 	Vector3					DefaultLineColor;		// Line color (color array overrides if present)
-	float						DefaultLineAlpha;		// Line alpha (alpha array overrides if present)	
+	float						DefaultLineAlpha;		// Line alpha (alpha array overrides if present)
 	float						DefaultLineUCoord;	// Line texture Ucoord (ucoord array overrides if present)
 	Vector4					DefaultTailDiffuse;	// Tail diffuse RGBA
 	LineModeType			LineMode;
 };
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp
index 4a94f28b233..3d3ec642472 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp
@@ -16,28 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/mapper.cpp         $* 
- *                                                                         * 
- *                  $Org Author:: Hector_y                                $* 
- *                                                                         * 
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/mapper.cpp         $*
+ *                                                                         *
+ *                  $Org Author:: Hector_y                                $*
+ *                                                                         *
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
- *                                                                         * 
- *                    $Revision:: 33                                      $* 
- *                                                                         * 
+ *                                                                         *
+ *                    $Revision:: 33                                      $*
+ *                                                                         *
  * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "mapper.h"
 #include "ww3d.h"
-#include "INI.H"
+#include "INI.h"
 #include "chunkio.h"
 #include "w3derr.h"
 #include "meshmatdesc.h"
@@ -46,7 +46,7 @@
 #include "matinfo.h"
 #include "rendobj.h"
 #include "mesh.h"
-#include <RANDOM.H>
+#include <RANDOM.h>
 #include <bound.h>
 
 Random4Class rand4;
@@ -73,10 +73,10 @@ ScaleTextureMapperClass::ScaleTextureMapperClass(const Vector2 &scale, unsigned
 }
 
 ScaleTextureMapperClass::ScaleTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage) :
-	TextureMapperClass(stage)	
+	TextureMapperClass(stage)
 {
 	Scale.U = ini.Get_Float(section, "UScale", 1.0f);
-	Scale.V = ini.Get_Float(section, "VScale", 1.0f);	
+	Scale.V = ini.Get_Float(section, "VScale", 1.0f);
 }
 
 ScaleTextureMapperClass::ScaleTextureMapperClass(const ScaleTextureMapperClass & src) :
@@ -93,7 +93,7 @@ void ScaleTextureMapperClass::Apply(int uv_array_index)
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),m);
 
 	// Disable Texgen
-	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);	
+	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | uv_array_index);
 
 	// Tell rasterizer to expect 2D texture coordinates
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
@@ -169,7 +169,7 @@ void LinearOffsetTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_mat
 	// This works well for clamped textures.
 	if (!ClampFix) {
 		offset_u = offset_u - WWMath::Floor(offset_u);
-		offset_v = offset_v - WWMath::Floor(offset_v);	
+		offset_v = offset_v - WWMath::Floor(offset_v);
 	} else {
 		offset_u = WWMath::Clamp(offset_u, -Scale.X, Scale.X);
 		offset_v = WWMath::Clamp(offset_v, -Scale.Y, Scale.Y);
@@ -177,7 +177,7 @@ void LinearOffsetTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_mat
 
 	// Set up the offset matrix
 	tex_matrix.Make_Identity();
-	
+
 	// According to the docs this should work since its 2D
 	// otherwise change to translate
 	tex_matrix[0].Z=offset_u;
@@ -212,7 +212,7 @@ GridTextureMapperClass::GridTextureMapperClass(const INIClass &ini, const char *
 }
 
 GridTextureMapperClass::GridTextureMapperClass(const GridTextureMapperClass & src) :
-	TextureMapperClass(src),	
+	TextureMapperClass(src),
 	Sign(src.Sign),
 	MSPerFrame(src.MSPerFrame),
 	OOGridWidth(src.OOGridWidth),
@@ -231,7 +231,7 @@ void GridTextureMapperClass::Apply(int uv_array_index)
 	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage), m);
 
 	// Disable Texgen
-	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU | uv_array_index);	
+	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU | uv_array_index);
 
 	// Tell rasterizer to expect 2D texture coordinates
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
@@ -257,7 +257,7 @@ void GridTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 
 	// Set up the offset matrix
 	tex_matrix.Make_Identity();
-	
+
 	// According to the docs this should work since its 2D
 	// otherwise change to translate
 	tex_matrix[0].Z = u_offset;
@@ -335,7 +335,7 @@ RotateTextureMapperClass::RotateTextureMapperClass(float rad_per_sec, const Vect
 {
 }
 
-RotateTextureMapperClass::RotateTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage) :	
+RotateTextureMapperClass::RotateTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage) :
 	ScaleTextureMapperClass(ini, section, stage),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	CurrentAngle(0.0f)
@@ -346,7 +346,7 @@ RotateTextureMapperClass::RotateTextureMapperClass(const INIClass &ini, const ch
 }
 
 RotateTextureMapperClass::RotateTextureMapperClass(const RotateTextureMapperClass & src) :
-	ScaleTextureMapperClass(src),	
+	ScaleTextureMapperClass(src),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	RadiansPerMilliSec(src.RadiansPerMilliSec),
 	CurrentAngle(0.0f),
@@ -368,9 +368,9 @@ void RotateTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 
 	CurrentAngle+=RadiansPerMilliSec * delta;
 	CurrentAngle=fmodf(CurrentAngle,2*WWMATH_PI);
-	if (CurrentAngle<0.0f) CurrentAngle+=2*WWMATH_PI;	
+	if (CurrentAngle<0.0f) CurrentAngle+=2*WWMATH_PI;
 
-	// Set up the rotation matrix	
+	// Set up the rotation matrix
 	float c,s;
 	c=WWMath::Cos(CurrentAngle);
 	s=WWMath::Sin(CurrentAngle);
@@ -381,7 +381,7 @@ void RotateTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 	// add center
 	// then scale
 	tex_matrix[0].Set(Scale.X * c, -Scale.X * s, -Scale.X * (c * Center.U - s * Center.V - Center.U), 0.0f);
-	tex_matrix[1].Set(Scale.Y * s, Scale.Y * c, -Scale.Y * (s * Center.U + c * Center.V - Center.V), 0.0f);	
+	tex_matrix[1].Set(Scale.Y * s, Scale.Y * c, -Scale.Y * (s * Center.U + c * Center.V - Center.V), 0.0f);
 }
 
 // SineLinearOffset Mapper
@@ -400,11 +400,11 @@ SineLinearOffsetTextureMapperClass::SineLinearOffsetTextureMapperClass(const INI
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	CurrentAngle(0.0f)
 {
-	UAFP.X = ini.Get_Float(section, "UAmp", 1.0f);	
+	UAFP.X = ini.Get_Float(section, "UAmp", 1.0f);
 	UAFP.Y = ini.Get_Float(section, "UFreq", 1.0f);
-	UAFP.Z = ini.Get_Float(section, "UPhase", 0.0f);	
+	UAFP.Z = ini.Get_Float(section, "UPhase", 0.0f);
 
-	VAFP.X = ini.Get_Float(section, "VAmp", 1.0f);	
+	VAFP.X = ini.Get_Float(section, "VAmp", 1.0f);
 	VAFP.Y = ini.Get_Float(section, "VFreq", 1.0f);
 	VAFP.Z = ini.Get_Float(section, "VPhase", 0.0f);
 }
@@ -415,7 +415,7 @@ SineLinearOffsetTextureMapperClass::SineLinearOffsetTextureMapperClass(const Sin
 	UAFP(src.UAFP),
 	VAFP(src.VAFP),
 	CurrentAngle(0.0f)
-{	
+{
 }
 
 void SineLinearOffsetTextureMapperClass::Reset(void)
@@ -439,7 +439,7 @@ void SineLinearOffsetTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex
 
 	// Set up the offset matrix
 	tex_matrix.Make_Identity();
-	
+
 	// According to the docs this should work since its 2D
 	// otherwise change to translate
 	tex_matrix[0].Z = offset_u;
@@ -468,8 +468,8 @@ StepLinearOffsetTextureMapperClass::StepLinearOffsetTextureMapperClass(const INI
 	CurrentStep(0.0f,0.0f),
 	Remainder(0)
 {
-	Step.U = ini.Get_Float(section, "UStep", 0.0f);	
-	Step.V = ini.Get_Float(section, "VStep", 0.0f);	
+	Step.U = ini.Get_Float(section, "UStep", 0.0f);
+	Step.V = ini.Get_Float(section, "VStep", 0.0f);
 	StepsPerMilliSec = ini.Get_Float(section, "SPS", 0.0f)/1000.0f;
 	ClampFix = ini.Get_Bool(section, "ClampFix", false);
 }
@@ -482,7 +482,7 @@ StepLinearOffsetTextureMapperClass::StepLinearOffsetTextureMapperClass(const Ste
 	CurrentStep(0.0f,0.0f),
 	Remainder(0),
 	ClampFix(src.ClampFix)
-{	
+{
 }
 
 void StepLinearOffsetTextureMapperClass::Reset(void)
@@ -499,14 +499,14 @@ void StepLinearOffsetTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex
 	LastUsedSyncTime=now;
 
 	Remainder+=delta;
-	int num_steps=(int) (StepsPerMilliSec*Remainder);	
+	int num_steps=(int) (StepsPerMilliSec*Remainder);
 
 	if (num_steps!=0)
 	{
 		CurrentStep+=Step*num_steps;
 		Remainder-=num_steps/(float)StepsPerMilliSec;
 	}
-	
+
 	// We need to clamp these texture coordinates to a reasonable range so the hardware doesn't
 	// choke on them. We do this in one of two ways:
 	// If ClampFix is not TRUE we use the fractional part of the offset, restricting it between
@@ -515,7 +515,7 @@ void StepLinearOffsetTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex
 	// This works well for clamped textures.
 	if (!ClampFix) {
 		CurrentStep.U -= WWMath::Floor(CurrentStep.U);
-	  	CurrentStep.V -= WWMath::Floor(CurrentStep.V);	
+	  	CurrentStep.V -= WWMath::Floor(CurrentStep.V);
 	} else {
 		CurrentStep.U = WWMath::Clamp(CurrentStep.U, -Scale.X, Scale.X);
 		CurrentStep.V = WWMath::Clamp(CurrentStep.V, -Scale.Y, Scale.Y);
@@ -523,7 +523,7 @@ void StepLinearOffsetTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex
 
 	// Set up the offset matrix
 	tex_matrix.Make_Identity();
-	
+
 	// According to the docs this should work since its 2D
 	// otherwise change to translate
 	tex_matrix[0].Z = CurrentStep.U;
@@ -560,12 +560,12 @@ ZigZagLinearOffsetTextureMapperClass::ZigZagLinearOffsetTextureMapperClass(const
 
 ZigZagLinearOffsetTextureMapperClass::ZigZagLinearOffsetTextureMapperClass(const ZigZagLinearOffsetTextureMapperClass & src) :
 	ScaleTextureMapperClass(src),
-	LastUsedSyncTime(WW3D::Get_Sync_Time()),	
+	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	Speed(src.Speed),
 	Period(src.Period),
 	Half_Period(src.Half_Period),
 	Remainder(0)
-{		
+{
 }
 
 void ZigZagLinearOffsetTextureMapperClass::Reset(void)
@@ -587,10 +587,10 @@ void ZigZagLinearOffsetTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &t
 	if (Period>0.0f)
 	{
 		// figure out the fractional number of periods
-		int num_periods=(int) (Remainder/Period);		
+		int num_periods=(int) (Remainder/Period);
 		Remainder-=num_periods*Period;
 
-		float time=0.0f;		
+		float time=0.0f;
 		if (Remainder>Half_Period) {
 			time=Period-Remainder;
 		} else {
@@ -598,11 +598,11 @@ void ZigZagLinearOffsetTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &t
 		}
 		offset_u=Speed.U * time;
 		offset_v=Speed.V * time;
-	}	
+	}
 
 	// Set up the offset matrix
 	tex_matrix.Make_Identity();
-	
+
 	// According to the docs this should work since its 2D
 	// otherwise change to translate
 	tex_matrix[0].Z = offset_u;
@@ -630,7 +630,7 @@ void ClassicEnvironmentMapperClass::Apply(int uv_array_index)
 
 	// Tell rasterizer to expect 2D matrices
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
-	
+
 }
 
 void ClassicEnvironmentMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
@@ -656,13 +656,13 @@ void EnvironmentMapperClass::Apply(int uv_array_index)
 
 	// Tell rasterizer to expect 2D matrices
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
-	
+
 }
 
 void EnvironmentMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 {
 	// The canonical environment map
-	// scale the normal by (.5,.5) and add (.5,.5) to move it to (0,1) range	
+	// scale the normal by (.5,.5) and add (.5,.5) to move it to (0,1) range
 	tex_matrix.Init(	0.5f, 0.0f, 0.0f, 0.5f,
 							0.0f, 0.5f, 0.0f, 0.5f,
 							0.0f, 0.0f, 1.0f, 0.0f,
@@ -715,7 +715,7 @@ void EdgeMapperClass::Apply(int uv_array_index)
 
 	// Tell rasterizer to expect 2D matrices
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
-	
+
 }
 
 void EdgeMapperClass::Reset(void)
@@ -739,7 +739,7 @@ void EdgeMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 	tex_matrix.Init(	0.0f, 0.0f, 0.5f, 0.5f,
 							0.0f, 0.0f, 0.0f, VOffset,
 							0.0f, 0.0f, 1.0f, 0.0f,
-							0.0f, 0.0f, 0.0f, 1.0f );	
+							0.0f, 0.0f, 0.0f, 1.0f );
 }
 
 WSEnvMapperClass::WSEnvMapperClass(const INIClass &ini, const char *section, unsigned int stage) :
@@ -792,14 +792,14 @@ void WSEnvMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 									0.0f, 0.0f, 0.0f, 1.0f );
 			break;
 	}
-	// multiply by inverse of view transform	
-	Matrix4x4 mat;	
-	DX8Wrapper::Get_Transform(D3DTS_VIEW,mat);		
+	// multiply by inverse of view transform
+	Matrix4x4 mat;
+	DX8Wrapper::Get_Transform(D3DTS_VIEW,mat);
 	Matrix4x4 mat2(	mat[0].X, mat[1].X, mat[2].X, 0.0f,
 						mat[0].Y, mat[1].Y, mat[2].Y, 0.0f,
 						mat[0].Z, mat[1].Z, mat[2].Z, 0.0f,
-						0.0f, 0.0f, 0.0f, 1.0f );						  	
-	tex_matrix = tex_matrix * mat2;	
+						0.0f, 0.0f, 0.0f, 1.0f );
+	tex_matrix = tex_matrix * mat2;
 }
 
 void WSClassicEnvironmentMapperClass::Apply(int uv_array_index)
@@ -814,7 +814,7 @@ void WSClassicEnvironmentMapperClass::Apply(int uv_array_index)
 
 	// Tell rasterizer to expect 2D matrices
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
-	
+
 }
 
 void WSEnvironmentMapperClass::Apply(int uv_array_index)
@@ -822,14 +822,14 @@ void WSEnvironmentMapperClass::Apply(int uv_array_index)
 	// Set up the texture matrix
 	Matrix4x4 m;
 	Calculate_Texture_Matrix(m);
-	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),m);	
+	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),m);
 
 	// Get camera reflection
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR);
 
 	// Tell rasterizer to expect 2D matrices
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
-	
+
 }
 
 void GridClassicEnvironmentMapperClass::Apply(int uv_array_index)
@@ -853,12 +853,12 @@ void GridClassicEnvironmentMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_
 	float u_offset, v_offset;
 	calculate_uv_offset(&u_offset, &v_offset);
 
-	float del = 0.5f * OOGridWidth;	
-	// Set up the offset matrix		
+	float del = 0.5f * OOGridWidth;
+	// Set up the offset matrix
 	tex_matrix.Init(	del,	0.0f,	0.0f,	u_offset + del,
 							0.0f,	del,	0.0f,	v_offset + del,
 							0.0f,	0.0f,	1.0f,	0.0f,
-							0.0f, 0.0f, 0.0f, 1.0f );		
+							0.0f, 0.0f, 0.0f, 1.0f );
 }
 
 void GridEnvironmentMapperClass::Apply(int uv_array_index)
@@ -882,12 +882,12 @@ void GridEnvironmentMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 	float u_offset, v_offset;
 	calculate_uv_offset(&u_offset, &v_offset);
 
-	float del=0.5f * OOGridWidth;	
-	// Set up the offset matrix		
+	float del=0.5f * OOGridWidth;
+	// Set up the offset matrix
 	tex_matrix.Init(	del,	0.0f,	0.0f,	u_offset + del,
 							0.0f,	del,	0.0f,	v_offset + del,
 							0.0f,	0.0f,	1.0f,	0.0f,
-							0.0f, 0.0f, 0.0f, 1.0f );		
+							0.0f, 0.0f, 0.0f, 1.0f );
 }
 
 void ScreenMapperClass::Apply(int uv_array_index)
@@ -895,7 +895,7 @@ void ScreenMapperClass::Apply(int uv_array_index)
 	// Set up the texture matrix
 	Matrix4x4 m;
 	Calculate_Texture_Matrix(m);
-	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),m);	
+	DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE) (D3DTS_TEXTURE0+Stage),m);
 
 	// Get camera space position
 	DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACEPOSITION);
@@ -919,15 +919,15 @@ void ScreenMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 	// This works well for clamped textures.
 	if (!ClampFix) {
 		offset_u = offset_u - WWMath::Floor(offset_u);
-		offset_v = offset_v - WWMath::Floor(offset_v);	
+		offset_v = offset_v - WWMath::Floor(offset_v);
 	} else {
 		offset_u = WWMath::Clamp(offset_u, -Scale.X, Scale.X);
 		offset_v = WWMath::Clamp(offset_v, -Scale.Y, Scale.Y);
 	}
 
-	// multiply by projection matrix	
+	// multiply by projection matrix
 	// followed by scale and translation
-	DX8Wrapper::Get_Transform(D3DTS_PROJECTION, tex_matrix);	
+	DX8Wrapper::Get_Transform(D3DTS_PROJECTION, tex_matrix);
 	tex_matrix[0] *= Scale.X; // entire row since we're pre-multiplying
 	tex_matrix[1] *= Scale.Y;
 	Vector4 last(tex_matrix[3]); // this gets the w
@@ -945,7 +945,7 @@ void ScreenMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 
 RandomTextureMapperClass::RandomTextureMapperClass(float fps, const Vector2 &scale, unsigned int stage):
 	ScaleTextureMapperClass(scale, stage),
-	FPMS(fps/1000.0f),	
+	FPMS(fps/1000.0f),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	Speed(0.0f,0.0f),
 	Remainder(0)
@@ -966,7 +966,7 @@ RandomTextureMapperClass::RandomTextureMapperClass(const INIClass &ini, const ch
 
 RandomTextureMapperClass::RandomTextureMapperClass(const RandomTextureMapperClass & src):
 	ScaleTextureMapperClass(src),
-	FPMS(src.FPMS),	
+	FPMS(src.FPMS),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	Speed(src.Speed),
 	Remainder(0)
@@ -993,7 +993,7 @@ void RandomTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 	unsigned int delta=now-LastUsedSyncTime;
 	LastUsedSyncTime=now;
 	Remainder+=delta;
-	
+
 	if (FPMS!=0.0f) {
 
 		int num_frames=(int) (Remainder*FPMS);
@@ -1001,8 +1001,8 @@ void RandomTextureMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 		if (num_frames!=0) {
 			randomize();
 			Remainder-=num_frames/FPMS;
-		}		
-	}	
+		}
+	}
 
 	// Set up the random matrix - start with a rotation matrix of 'CurrentAngle' about the Z-axis.
 	// We apply the scale matrix to the right of the unscaled rotate/offset matrix, because we
@@ -1040,17 +1040,17 @@ BumpEnvTextureMapperClass::BumpEnvTextureMapperClass(float rad_per_sec, float sc
 {
 }
 
-BumpEnvTextureMapperClass::BumpEnvTextureMapperClass(INIClass &ini, const char *section, unsigned int stage) :	
+BumpEnvTextureMapperClass::BumpEnvTextureMapperClass(INIClass &ini, const char *section, unsigned int stage) :
 	LinearOffsetTextureMapperClass(ini, section, stage),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	CurrentAngle(0.0f)
 {
-	RadiansPerSecond = 2*WWMATH_PI*ini.Get_Float(section,"BumpRotation",0.0f);	
+	RadiansPerSecond = 2*WWMATH_PI*ini.Get_Float(section,"BumpRotation",0.0f);
 	ScaleFactor = ini.Get_Float(section,"BumpScale",1.0f);
 }
 
 BumpEnvTextureMapperClass::BumpEnvTextureMapperClass(const BumpEnvTextureMapperClass & src) :
-	LinearOffsetTextureMapperClass(src),	
+	LinearOffsetTextureMapperClass(src),
 	LastUsedSyncTime(WW3D::Get_Sync_Time()),
 	CurrentAngle(0.0f),
 	RadiansPerSecond(src.RadiansPerSecond),
@@ -1088,7 +1088,7 @@ void Reset_All_Texture_Mappers(RenderObjClass *robj, bool make_unique)
 {
 
 	if (robj->Class_ID()==RenderObjClass::CLASSID_MESH) {
-		MeshClass *mesh=(MeshClass*) robj;	
+		MeshClass *mesh=(MeshClass*) robj;
 		MaterialInfoClass *minfo = robj->Get_Material_Info();
 		if (minfo && minfo->Has_Time_Variant_Texture_Mappers()) {
 			if (make_unique) {
@@ -1152,22 +1152,22 @@ GridWSEnvMapperClass::GridWSEnvMapperClass(const INIClass &ini, const char *sect
 
 void GridWSEnvMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 {
-	// multiply by inverse of view transform	
-	Matrix4x4 mat;	
-	DX8Wrapper::Get_Transform(D3DTS_VIEW,mat);		
+	// multiply by inverse of view transform
+	Matrix4x4 mat;
+	DX8Wrapper::Get_Transform(D3DTS_VIEW,mat);
 	Matrix4x4 mv (	mat[0].X, mat[1].X, mat[2].X, 0.0f,
 						mat[0].Y, mat[1].Y, mat[2].Y, 0.0f,
 						mat[0].Z, mat[1].Z, mat[2].Z, 0.0f,
-						0.0f, 0.0f, 0.0f, 1.0f );	
+						0.0f, 0.0f, 0.0f, 1.0f );
 
 	update_temporal_state();
 
 	float u_offset, v_offset;
 	calculate_uv_offset(&u_offset, &v_offset);
 
-	float del=0.5f * OOGridWidth;	
-	// Set up the offset matrix		
-	Matrix4x4 md;	
+	float del=0.5f * OOGridWidth;
+	// Set up the offset matrix
+	Matrix4x4 md;
 
 	switch (Axis) {
 		case AXISTYPE_X:
@@ -1187,9 +1187,9 @@ void GridWSEnvMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 			md.Init(				del, 0.0f, 0.0f, u_offset + del,
 									0.0f, del, 0.0f, v_offset + del,
 									0.0f, 0.0f, 1.0f, 0.0f,
-									0.0f, 0.0f, 0.0f, 1.0f );			
+									0.0f, 0.0f, 0.0f, 1.0f );
 			break;
-	}	
+	}
 	// multiply by inverse of view transform, then
 	// change the world space reflection vector to a UV coordinate
 	// then offset by the grid coordinate
@@ -1213,16 +1213,16 @@ void GridWSEnvMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
  *=============================================================================================*/
 GridWSClassicEnvironmentMapperClass::GridWSClassicEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, AxisType axis, unsigned int stage) :
 	GridWSEnvMapperClass(fps, gridwidth_log2, last_frame, offset, axis, stage)
-{	
+{
 }
 
 GridWSClassicEnvironmentMapperClass::GridWSClassicEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage):
 	GridWSEnvMapperClass(ini,section,stage)
-{	
+{
 }
 
 GridWSClassicEnvironmentMapperClass::GridWSClassicEnvironmentMapperClass(const GridWSEnvMapperClass & src):
-	GridWSEnvMapperClass(src)	
+	GridWSEnvMapperClass(src)
 {
 }
 
@@ -1257,7 +1257,7 @@ void GridWSClassicEnvironmentMapperClass::Apply(int uv_array_index)
  *=============================================================================================*/
 GridWSEnvironmentMapperClass::GridWSEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, AxisType axis, unsigned int stage) :
 	GridWSEnvMapperClass(fps, gridwidth_log2, last_frame, offset, axis, stage)
-{	
+{
 }
 
 GridWSEnvironmentMapperClass::GridWSEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage):
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
index 06401a95736..a22c3bb469c 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
@@ -16,38 +16,32 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/mapper.h           $* 
- *                                                                         * 
- *                     $Org Author:: Greg_h                                  $* 
- *                                                                         * 
- *                       $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/mapper.h           $*
+ *                                                                         *
+ *                     $Org Author:: Greg_h                                  $*
+ *                                                                         *
+ *                       $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
- *                                                                         * 
- *                    $Revision:: 26                                      $* 
- *                                                                         * 
+ *                                                                         *
+ *                    $Revision:: 26                                      $*
+ *                                                                         *
  * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
 
-#ifndef VERTEXMAPPER_H
-#define VERTEXMAPPER_H
-
-#include "refcount.h"
+#include "always.h"
 #include "w3d_file.h"
 #include "w3derr.h"
-#include "wwdebug.h"
 #include "vector2.h"
 #include "vector3.h"
 #include "ww3d.h"
@@ -120,7 +114,7 @@ class TextureMapperClass : public W3DMPO, public RefCountClass
 class ScaleTextureMapperClass : public TextureMapperClass
 {
 	W3DMPO_GLUE(ScaleTextureMapperClass)
-public:	
+public:
 	ScaleTextureMapperClass(const Vector2 &scale, unsigned int stage);
 	ScaleTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
 	ScaleTextureMapperClass(const ScaleTextureMapperClass & src);
@@ -170,7 +164,7 @@ class LinearOffsetTextureMapperClass : public ScaleTextureMapperClass
 	}
 	void Set_LastUsedSyncTime(unsigned int time) { LastUsedSyncTime = time;}
 	unsigned int Get_LastUsedSyncTime() { return LastUsedSyncTime;}
-	
+
 protected:
 	Vector2			CurrentUVOffset;		// Current UV offset
 	Vector2			UVOffsetDeltaPerMS;	// Amount to increase offset each millisec
@@ -202,8 +196,8 @@ class GridTextureMapperClass : public TextureMapperClass
 
 	void Set_Frame(unsigned int frame) { CurrentFrame=frame; }
 	void Set_Frame_Per_Second(float fps);
-	
-protected:	
+
+protected:
 	// Utility functions
 	void initialize(float fps, unsigned int gridwidth_log2);
 	void update_temporal_state(void);
@@ -398,7 +392,7 @@ class WSEnvMapperClass : public TextureMapperClass
 	WSEnvMapperClass(const INIClass &ini, const char *section, unsigned int stage);
 	virtual bool Needs_Normals(void) { return true; }
 	virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix);
-protected:	
+protected:
 	AxisType		Axis;
 };
 
@@ -411,7 +405,7 @@ class WSClassicEnvironmentMapperClass : public WSEnvMapperClass
 	WSClassicEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : WSEnvMapperClass(ini, section, stage) { }
 	virtual int	Mapper_ID(void) const { return MAPPER_ID_WS_CLASSIC_ENVIRONMENT;}
 	virtual TextureMapperClass* Clone() const { return NEW_REF( WSClassicEnvironmentMapperClass, (*this)); }
-	virtual void Apply(int uv_array_index);		
+	virtual void Apply(int uv_array_index);
 };
 
 class WSEnvironmentMapperClass : public WSEnvMapperClass
@@ -423,7 +417,7 @@ class WSEnvironmentMapperClass : public WSEnvMapperClass
 	WSEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : WSEnvMapperClass(ini, section, stage) { }
 	virtual int	Mapper_ID(void) const { return MAPPER_ID_WS_ENVIRONMENT;}
 	virtual TextureMapperClass* Clone() const { return NEW_REF( WSEnvironmentMapperClass, (*this)); }
-	virtual void Apply(int uv_array_index);	
+	virtual void Apply(int uv_array_index);
 };
 
 class GridClassicEnvironmentMapperClass : public GridTextureMapperClass
@@ -443,7 +437,7 @@ class GridClassicEnvironmentMapperClass : public GridTextureMapperClass
 class GridEnvironmentMapperClass : public GridTextureMapperClass
 {
 	W3DMPO_GLUE(GridEnvironmentMapperClass)
-public:	
+public:
 	GridEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, unsigned int stage) : GridTextureMapperClass(fps, gridwidth_log2, last_frame, offset, stage) { }
 	GridEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini, section, stage) { }
 	GridEnvironmentMapperClass(const GridTextureMapperClass & src) : GridTextureMapperClass(src) { }
@@ -538,10 +532,10 @@ class GridWSEnvMapperClass : public GridTextureMapperClass
 	enum AxisType { AXISTYPE_X=0, AXISTYPE_Y=1, AXISTYPE_Z=2 };
 	GridWSEnvMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, AxisType axis, unsigned int stage);
 	GridWSEnvMapperClass(const GridWSEnvMapperClass & src);
-	GridWSEnvMapperClass(const INIClass &ini, const char *section, unsigned int stage);	
+	GridWSEnvMapperClass(const INIClass &ini, const char *section, unsigned int stage);
 	virtual void Calculate_Texture_Matrix(Matrix4x4 &tex_matrix);
 	virtual bool Needs_Normals(void) { return true; }
-protected:	
+protected:
 	AxisType		Axis;
 };
 
@@ -553,18 +547,18 @@ class GridWSClassicEnvironmentMapperClass : public GridWSEnvMapperClass
 	GridWSClassicEnvironmentMapperClass(const GridWSEnvMapperClass & src);
 	virtual int	Mapper_ID(void) const { return MAPPER_ID_GRID_WS_CLASSIC_ENVIRONMENT;}
 	virtual TextureMapperClass* Clone() const { return NEW_REF( GridWSClassicEnvironmentMapperClass, (*this)); }
-	virtual void Apply(int uv_array_index);	
+	virtual void Apply(int uv_array_index);
 };
 
 class GridWSEnvironmentMapperClass : public GridWSEnvMapperClass
 {
-public:	
+public:
 	GridWSEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, AxisType axis, unsigned int stage);
 	GridWSEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage);
 	GridWSEnvironmentMapperClass(const GridWSEnvMapperClass & src);
 	virtual int	Mapper_ID(void) const { return MAPPER_ID_GRID_WS_ENVIRONMENT;}
 	virtual TextureMapperClass* Clone() const { return NEW_REF( GridWSEnvironmentMapperClass, (*this)); }
-	virtual void Apply(int uv_array_index);	
+	virtual void Apply(int uv_array_index);
 };
 
 
@@ -572,5 +566,3 @@ class GridWSEnvironmentMapperClass : public GridWSEnvMapperClass
 ** Utility functions
 */
 void Reset_All_Texture_Mappers(RenderObjClass *robj, bool make_unique);
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.cpp
deleted file mode 100644
index 714f7b5e63d..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3d                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/matpass.cpp                            $*
- *                                                                                             *
- *              Original Author:: Greg Hjelstrom                                               *
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 06/27/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 8                                                           $*
- *                                                                                             *
- * 06/27/02 KM Changes to max texture stage caps															*
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *   MaterialPassClass::MaterialPassClass -- Constructor                                       *
- *   MaterialPassClass::~MaterialPassClass -- Destructor                                       *
- *   MaterialPassClass::Install_Materials -- Plug our material settings into D3D               *
- *   MaterialPassClass::Set_Texture -- Set texture to use                                      *
- *   MaterialPassClass::Set_Shader -- Set the shader to use                                    *
- *   MaterialPassClass::Set_Material -- set vertex material to use                             * 
- *   MaterialPassClass::Get_Texture -- Get a pointer to the texture                            *
- *   MaterialPassClass::Get_Material -- get the vertex material                                *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-#include "matpass.h"
-#include "vertmaterial.h"
-#include "shader.h"
-#include "texture.h"
-#include "statistics.h"
-#include "dx8wrapper.h"
-
-
-bool MaterialPassClass::EnablePerPolygonCulling = true;
-
-
-/***********************************************************************************************
- * MaterialPassClass::MaterialPassClass -- Constructor                                         *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/26/2001  gth : Created.                                                                 *
- *=============================================================================================*/
-MaterialPassClass::MaterialPassClass(void) : 
-	Shader(0),
-	Material(NULL),
-	CullVolume(NULL),
-	EnableOnTranslucentMeshes(true)
-{
-	for (int i=0; i<MAX_TEX_STAGES; i++) {
-		Texture[i] = NULL;
-	}
-}
-
-/***********************************************************************************************
- * MaterialPassClass::~MaterialPassClass -- Destructor                                         *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *	  06/27/02   kjm : Changes to max texture stage caps															*
- *=============================================================================================*/
-MaterialPassClass::~MaterialPassClass(void)
-{
-	for (int i=0; i<MAX_TEX_STAGES; i++) {
-		REF_PTR_RELEASE(Texture[i]);
-	}
-	REF_PTR_RELEASE(Material);
-}
-
-
-/***********************************************************************************************
- * MaterialPassClass::Install_Materials -- Plug our material settings into D3D                 *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *   2/26/2001  gth : Changed to Install_Materials                                             *
- *=============================================================================================*/
-void MaterialPassClass::Install_Materials(void) const
-{
-	DX8Wrapper::Set_Material(Peek_Material());
-	DX8Wrapper::Set_Shader(Peek_Shader());
-	for (int i=0;i<DX8Wrapper::Get_Current_Caps()->Get_Max_Textures_Per_Pass();++i) 
-	{
-		DX8Wrapper::Set_Texture(i,Peek_Texture(i));
-	}
-}
-
-
-/***********************************************************************************************
- * MaterialPassClass::Set_Texture -- Set texture to use                                        *
- *                                                                                             *
- * INPUT:                                                                                      *
- * tex - pointer to the texture for this material pass (or NULL)                               *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *=============================================================================================*/
-void MaterialPassClass::Set_Texture(TextureClass * tex,int stage)
-{
-	WWASSERT(stage >= 0);
-	WWASSERT(stage < MAX_TEX_STAGES);
-
-	REF_PTR_SET(Texture[stage],tex);
-}
-
-
-/***********************************************************************************************
- * MaterialPassClass::Set_Shader -- Set the shader to use                                      *
- *                                                                                             *
- * INPUT:                                                                                      *
- * shader - shader for this material pass                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *=============================================================================================*/
-void MaterialPassClass::Set_Shader(ShaderClass shader)
-{
-	Shader = shader;
-	Shader.Enable_Fog ("MaterialPassClass");
-}
-
-
-/***********************************************************************************************
- * MaterialPassClass::Set_Material -- set vertex material to use                               *
- *                                                                                             *
- * INPUT:                                                                                      *
- * mat - pointer to the vertex material this material pass uses                                *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *=============================================================================================*/
-void MaterialPassClass::Set_Material(VertexMaterialClass * mat)
-{
-	REF_PTR_SET(Material,mat);
-}
-
-
-/***********************************************************************************************
- * MaterialPassClass::Get_Texture -- Get a pointer to the texture                              *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- * reference counted pointer to the texture this material pass is using                        *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *=============================================================================================*/
-TextureClass * MaterialPassClass::Get_Texture(int stage) const
-{
-	WWASSERT(stage >= 0);
-	WWASSERT(stage < MAX_TEX_STAGES);
-	
-	if (Texture[stage]) {
-		Texture[stage]->Add_Ref();
-	}
-	return Texture[stage];
-}
-
-
-/***********************************************************************************************
- * MaterialPassClass::Get_Material -- get the vertex material                                  *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- * reference counted pointer to the vertex material being used by this material pass           *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   12/9/99    gth : Created.                                                                 *
- *=============================================================================================*/
-VertexMaterialClass * MaterialPassClass::Get_Material(void) const
-{
-	if (Material) {
-		Material->Add_Ref();
-	}
-	return Material;
-}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h
deleted file mode 100644
index 158a135f4e0..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : ww3d                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/matpass.h                              $*
- *                                                                                             *
- *              Original Author:: Greg Hjelstrom                                               *
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 06/27/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 6                                                           $*
- *                                                                                             *
- * 06/27/02 KM Texture class abstraction																			*
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef MATPASS_H
-#define MATPASS_H
-
-#ifndef REFCOUNT_H
-#include "refcount.h"
-#endif
-
-#ifndef SHADER_H
-#include "shader.h"
-#endif
-
-#ifndef WWDEBUG_H
-#include "wwdebug.h"
-#endif
-
-
-class TextureClass;
-class VertexMaterialClass;
-class MeshModelClass;
-class OBBoxClass;
-
-/**
-** MaterialPassClass
-**
-** This class wraps all of the data needed to describe an additional
-** material pass for any object.  The motivation for this class is to
-** implement certain types of special effects.  All data needed to 
-** apply the pass should be generated procedurally.  Typically a 
-** vertex processor will be used to generate any needed u-v's or vertex
-** colors.  Alternatively, we could add the option to request to
-** re-use the model's existing u-v's or vertex colors.
-**
-**
-*/
-class MaterialPassClass : public RefCountClass
-{
-public:
-
-	MaterialPassClass(void);
-	~MaterialPassClass(void);
-
-	/// MW: Had to make this virtual so app can perform direct/custom D3D setup.
-	virtual void	Install_Materials(void) const;
-	virtual void	UnInstall_Materials(void) const { };	///< reset/cleanup D3D states
-
-	void							Set_Texture(TextureClass * Texture,int stage = 0);
-	void							Set_Shader(ShaderClass shader);
-	void							Set_Material(VertexMaterialClass * mat);
-
-	TextureClass *				Get_Texture(int stage = 0) const;
-	VertexMaterialClass *	Get_Material(void) const;
-
-	TextureClass *				Peek_Texture(int stage = 0) const;
-	ShaderClass					Peek_Shader(void)	const							{ return Shader; }
-	VertexMaterialClass *	Peek_Material(void) const						{ return Material; }	
-
-	void							Set_Cull_Volume(OBBoxClass * volume)		{ CullVolume = volume; }
-	OBBoxClass *				Get_Cull_Volume(void) const					{ return CullVolume; }
-	
-	void							Enable_On_Translucent_Meshes(bool onoff)	{ EnableOnTranslucentMeshes = onoff; }
-	bool							Is_Enabled_On_Translucent_Meshes(void)		{ return EnableOnTranslucentMeshes; }
-
-	static void					Enable_Per_Polygon_Culling(bool onoff)		{ EnablePerPolygonCulling = onoff; }
-	static bool					Is_Per_Polygon_Culling_Enabled(void)		{ return EnablePerPolygonCulling; }
-
-protected:
-	
-	enum { MAX_TEX_STAGES = 8 };
-
-	TextureClass *				Texture[MAX_TEX_STAGES];
-	ShaderClass					Shader;
-	VertexMaterialClass *	Material;
-	bool							EnableOnTranslucentMeshes;
-
-	OBBoxClass *				CullVolume;
-	static bool					EnablePerPolygonCulling;
-
-};
-
-
-inline TextureClass * MaterialPassClass::Peek_Texture(int stage) const
-{	
-	WWASSERT(stage >= 0);
-	WWASSERT(stage < MAX_TEX_STAGES);
-	return Texture[stage];
-}
-
-
-#endif // MATPASS_H
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp
index 4719c3dd5c9..005b2567f13 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 11                                                          $*
@@ -76,7 +76,7 @@ MatrixMapperClass::MatrixMapperClass(int stage) :
 	ViewToPixel(true),
 	ViewSpaceProjectionNormal(0.0f, 0.0f, 0.0f),
 	GradientUCoord(0.5f)
-{	
+{
 }
 
 /***********************************************************************************************
@@ -111,7 +111,7 @@ void MatrixMapperClass::Set_Texture_Transform(const Matrix3D & view_to_texture,f
  *=============================================================================================*/
 void	MatrixMapperClass::Set_Texture_Transform(const Matrix4x4 & view_to_texture,float texsize)
 {
-	ViewToTexture=view_to_texture;	
+	ViewToTexture=view_to_texture;
 
 	Update_View_To_Pixel_Transform(texsize);
 }
@@ -131,9 +131,9 @@ void	MatrixMapperClass::Set_Texture_Transform(const Matrix4x4 & view_to_texture,
 void MatrixMapperClass::Update_View_To_Pixel_Transform(float tex_size)
 {
 	/*
-	** Create a ViewToPixel matrix which also does all of the offseting and flipping that has 
+	** Create a ViewToPixel matrix which also does all of the offseting and flipping that has
 	** to take place to get the actual texture coordinates.
-	** 
+	**
 	** Here is a description of the math:
 	** If you transform eye-space points with the ViewToTexture matrix, you then need to compute:
 	** s = ((x/w) + 1.0f) * 0.5f * ((texwid-2)/texwid)
@@ -148,7 +148,7 @@ void MatrixMapperClass::Update_View_To_Pixel_Transform(float tex_size)
 	** | 0 -K 0 K |
 	** | 0  0 1 0 |
 	** | 0  0 0 1 |
-	** 
+	**
 	** The code below manually "optimally" pre-multiplies this matrix with the ViewToTexture matrix
 	**
 	** In addition, the z-coordinate is modified so that it goes from 0 to 1 rather than -1 to +1.
@@ -227,14 +227,14 @@ void MatrixMapperClass::Apply(int uv_array_index)
 {
 	Matrix4x4 m;
 
-	switch (Type) 
+	switch (Type)
 	{
 	case ORTHO_PROJECTION:
 		/*
 		** Orthographic projection
 		*/
 		DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0 + Stage),ViewToPixel);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACEPOSITION);		
+		DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACEPOSITION);
 		DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
 		break;
 	case PERSPECTIVE_PROJECTION:
@@ -245,13 +245,13 @@ void MatrixMapperClass::Apply(int uv_array_index)
 		m[1]=ViewToPixel[1];
 		m[2]=ViewToPixel[3];
 		DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0 + Stage),m);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACEPOSITION);		
+		DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACEPOSITION);
 		DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_PROJECTED|D3DTTFF_COUNT3);
 		break;
 	case DEPTH_GRADIENT:
 		/*
-		** Depth gradient, Set up second stage texture coordinates to 
-		** apply a depth gradient to the projection.  Note that the 
+		** Depth gradient, Set up second stage texture coordinates to
+		** apply a depth gradient to the projection.  Note that the
 		** depth values have been set up to vary from 0 to 1 in the
 		** Update_View_To_Pixel_Transform function.
 		*/
@@ -271,7 +271,7 @@ void MatrixMapperClass::Apply(int uv_array_index)
 		m[0].Set(0,0,0,GradientUCoord);
 		m[1].Set(ViewSpaceProjectionNormal.X,ViewSpaceProjectionNormal.Y,ViewSpaceProjectionNormal.Z, 0);
 		DX8Wrapper::Set_Transform((D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0 + Stage),m);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACENORMAL);		
+		DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_CAMERASPACENORMAL);
 		DX8Wrapper::Set_DX8_Texture_Stage_State(Stage,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_COUNT2);
 		break;
 	}
@@ -296,7 +296,7 @@ void MatrixMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 	// We return ViewToPixel. This is not, strictly speaking, always correct, but it is close
 	// and it is OK not to be 100% correct since this function is not called by the Apply()
 	// function.
-	tex_matrix = ViewToPixel; 
+	tex_matrix = ViewToPixel;
 }
 
 /***********************************************************************************************
@@ -451,4 +451,4 @@ void CompositeMatrixMapperClass::Calculate_Texture_Matrix(Matrix4x4 &tex_matrix)
 	} else {
 		MatrixMapperClass::Calculate_Texture_Matrix(tex_matrix);
 	}
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h
index a9e52d31d3b..13d2f8c846d 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 8                                                           $*
@@ -37,9 +37,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#ifndef MATRIXMAPPER_H
-#define MATRIXMAPPER_H
+#pragma once
 
 #include "always.h"
 #include "bittype.h"
@@ -50,7 +48,7 @@
 // Hector Yee 1/29/01
 
 /**
-** MatrixMapperClass.  Does the chore of computing the u-v coorinates for 
+** MatrixMapperClass.  Does the chore of computing the u-v coorinates for
 ** a projected texture.  Note that this VP must be "baby-sat" by something
 ** external to ensure that its ViewToTexture transform is up-to-date.  I
 ** use it in the TexProjectClass to implement projected textures.
@@ -58,7 +56,7 @@
 ** NOTE: for projected textures, the equation for computing a valid ViewToTexture
 ** transform is as follows (assuming my usual column vectors, etc):
 **                                                        -1
-** ViewToTexture = Projection * Mwrld-shadow * Mwrld-camera 
+** ViewToTexture = Projection * Mwrld-shadow * Mwrld-camera
 */
 class MatrixMapperClass : public TextureMapperClass
 {
@@ -82,8 +80,8 @@ class MatrixMapperClass : public TextureMapperClass
 	** Interface
 	*/
 	void						Set_Flag(uint32 flag,bool onoff);
-	bool						Get_Flag(uint32 flag) const;	
-	
+	bool						Get_Flag(uint32 flag) const;
+
 	void						Set_Type(MappingType type);
 	MappingType				Get_Type(void);
 
@@ -102,7 +100,7 @@ class MatrixMapperClass : public TextureMapperClass
 	virtual void			Calculate_Texture_Matrix(Matrix4x4 &tex_matrix);
 
 protected:
-	
+
 	void						Update_View_To_Pixel_Transform(float texsize);
 
 	uint32					Flags;
@@ -140,18 +138,18 @@ class CompositeMatrixMapperClass : public MatrixMapperClass
 	TextureMapperClass *InternalMapper;
 };
 
-inline void MatrixMapperClass::Set_Flag(uint32 flag,bool onoff)	
-{ 
-	if (onoff) { 
-		Flags |= flag; 
-	} else { 
-		Flags &= ~flag; 
-	} 
+inline void MatrixMapperClass::Set_Flag(uint32 flag,bool onoff)
+{
+	if (onoff) {
+		Flags |= flag;
+	} else {
+		Flags &= ~flag;
+	}
 }
 
 inline bool MatrixMapperClass::Get_Flag(uint32 flag) const
-{ 
-	return (Flags & flag) == flag; 
+{
+	return (Flags & flag) == flag;
 }
 
 inline void MatrixMapperClass::Set_Type(MappingType type)
@@ -165,8 +163,6 @@ inline MatrixMapperClass::MappingType MatrixMapperClass::Get_Type(void)
 }
 
 inline const Matrix4x4 & MatrixMapperClass::Get_Texture_Transform(void) const
-{ 
-	return ViewToTexture; 
+{
+	return ViewToTexture;
 }
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp
index ab03f962988..f96e6a8c049 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp
@@ -17,22 +17,22 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/mesh.cpp 69    1/19/02 1:01p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MESH.CPP                                                     * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/11/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 12, 1997 [GH]                                           * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MESH.cpp                                                     *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/11/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 12, 1997 [GH]                                           *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   MeshClass::MeshClass -- Constructor for MeshClass                                         *
  *   MeshClass::MeshClass -- Copy Constructor for MeshClass                                    *
  *	  MeshClass::operator == -- assignment operator for MeshClass                               *
@@ -47,7 +47,7 @@
  *   MeshClass::Scale -- Scales the mesh                                                       *
  *   MeshClass::Scale -- Scales the mesh                                                       *
  *   MeshClass::Init -- Init the mesh from a MeshBuilder object                                *
- *   MeshClass::Load -- creates a mesh out of a mesh chunk in a .w3d file                      * 
+ *   MeshClass::Load -- creates a mesh out of a mesh chunk in a .w3d file                      *
  *   MeshClass::Cast_Ray -- compute a ray intersection with this mesh                          *
  *   MeshClass::Cast_AABox -- cast an AABox against this mesh                                  *
  *   MeshClass::Cast_OBBox -- Cast an obbox against this mesh                                  *
@@ -55,18 +55,18 @@
  *   MeshClass::Intersect_OBBox -- test for intersection with the given OBBox                  *
  *   MeshClass::Generate_Culling_Tree -- Generates a hierarchical culling tree for the mesh    *
  *   MeshClass::Direct_Load -- read the w3d file directly into this mesh object                *
- *   MeshClass::read_chunks -- read all of the chunks from the .wtm file                       * 
- *	  MeshClass::read_vertices -- reads the vertex chunk                                        * 
+ *   MeshClass::read_chunks -- read all of the chunks from the .wtm file                       *
+ *	  MeshClass::read_vertices -- reads the vertex chunk                                        *
  *   MeshClass::read_texcoords -- read in the texture coordinates chunk                        *
  *   MeshClass::install_texture_coordinates -- installs the given u-v's in each channel that is*
- *   MeshClass::read_vertex_normals -- reads a surrender normal chunk from the wtm file        * 
+ *   MeshClass::read_vertex_normals -- reads a surrender normal chunk from the wtm file        *
  *   MeshClass::read_v3_materials -- Reads in version 3 materials.                             *
  *   MeshClass::read_map -- Reads definition of a texture map from the file                    *
  *   MeshClass::read_triangles -- read the triangles chunk                                     *
  *   MeshClass::read_per_tri_materials -- read the material indices for each triangle          *
- *   MeshClass::read_user_text -- read in the user text chunk                                  * 
- *   MeshClass::read_vertex_colors -- read in the vertex colors chunk                          * 
- *   MeshClass::read_vertex_influences -- read in the vertex influences chunk                  * 
+ *   MeshClass::read_user_text -- read in the user text chunk                                  *
+ *   MeshClass::read_vertex_colors -- read in the vertex colors chunk                          *
+ *   MeshClass::read_vertex_influences -- read in the vertex influences chunk                  *
  *   MeshClass::Get_Material_Info -- returns a pointer to the material info                    *
  *   MeshClass::Create_Decal -- creates a decal on this mesh                                   *
  *   MeshClass::Delete_Decal -- removes a decal from this mesh                                 *
@@ -88,7 +88,6 @@
 
 #include "mesh.h"
 #include <assert.h>
-#include <string.h>
 #include "w3d_file.h"
 #include "assetmgr.h"
 #include "w3derr.h"
@@ -119,7 +118,6 @@
 #include "visrasterizer.h"
 #include "wwmemlog.h"
 #include "dx8rendererdebugger.h"
-#include <stdio.h>
 #include <wwprofile.h>
 
 static unsigned MeshDebugIdCount;
@@ -129,7 +127,7 @@ static SimpleDynVecClass<uint32> temp_apt;
 
 /*
 ** This #define causes the collision code to always recompute the triangle normals rather
-** than using the ones in the model. 
+** than using the ones in the model.
 ** TODO: ensure that the models have unit normals and start re-using them again or write
 ** collision code to handle non-unit normals!
 */
@@ -244,7 +242,7 @@ MeshClass & MeshClass::operator = (const MeshClass & that)
  * HISTORY:                                                                                    *
  *   1/6/98     GTH : Created.                                                                 *
  *=============================================================================================*/
-MeshClass::~MeshClass(void) 
+MeshClass::~MeshClass(void)
 {
 	Free();
 }
@@ -322,8 +320,8 @@ RenderObjClass * MeshClass::Clone(void) const
  *   5/15/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 const char * MeshClass::Get_Name(void) const
-{ 
-	return Model->Get_Name(); 
+{
+	return Model->Get_Name();
 }
 
 
@@ -357,8 +355,8 @@ void MeshClass::Set_Name(const char * name)
  *   5/15/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 uint32 MeshClass::Get_W3D_Flags(void)
-{ 
-	return Model->W3dAttributes; 
+{
+	return Model->W3dAttributes;
 }
 
 
@@ -375,9 +373,9 @@ uint32 MeshClass::Get_W3D_Flags(void)
  *   5/15/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 const char * MeshClass::Get_User_Text(void) const
-{ 
-	return Model->Get_User_Text(); 
-}		
+{
+	return Model->Get_User_Text();
+}
 
 
 /***********************************************************************************************
@@ -393,11 +391,11 @@ const char * MeshClass::Get_User_Text(void) const
  *   5/20/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 MaterialInfoClass * MeshClass::Get_Material_Info(void)
-{ 
+{
 	if (Model) {
 		if (Model->MatInfo) {
 			Model->MatInfo->Add_Ref();
-			return Model->MatInfo; 
+			return Model->MatInfo;
 		}
 	}
 	return NULL;
@@ -444,7 +442,7 @@ void MeshClass::Scale(float scale)
 	Make_Unique();
 	Model->Make_Geometry_Unique();
 	Model->Scale(sc);
-	
+
    Invalidate_Cached_Bounding_Volumes();
 
    // Now update the object space bounding volumes of this object's container:
@@ -476,7 +474,7 @@ void MeshClass::Scale(float scalex, float scaley, float scalez)
 	Make_Unique();
 	Model->Make_Geometry_Unique();
 	Model->Scale(sc);
-	
+
    Invalidate_Cached_Bounding_Volumes();
 
    // Now update the object space bounding volumes of this object's container:
@@ -548,9 +546,9 @@ void MeshClass::Create_Decal(DecalGeneratorClass * generator)
 	if (Is_Translucent() && (generator->Is_Applied_To_Translucent_Meshes() == false)) {
 		return;
 	}
-	
+
 	if (!Model->Get_Flag(MeshGeometryClass::SKIN)) {
-		
+
 		// Rigid mesh
 		Matrix3D modeltm_inv;
 		OBBoxClass localbox;
@@ -561,7 +559,7 @@ void MeshClass::Create_Decal(DecalGeneratorClass * generator)
 		// generate apt, if it is not empty, add a decal.
 		temp_apt.Delete_All(false);	// reset contents
 		Model->Generate_Rigid_APT(localbox, temp_apt);
-		
+
 		if (temp_apt.Count() > 0) {
 			if (DecalMesh == NULL) {
 				DecalMesh =		NEW_REF(RigidDecalMeshClass, (this, generator->Peek_Decal_System()));
@@ -570,8 +568,8 @@ void MeshClass::Create_Decal(DecalGeneratorClass * generator)
 		}
 
 	} else {
-		
-		WWDEBUG_SAY(("PERFORMANCE WARNING: Decal being applied to a SKIN mesh!\r\n"));
+
+		WWDEBUG_SAY(("PERFORMANCE WARNING: Decal being applied to a SKIN mesh!"));
 
 		// Skin
 		// The deformed worldspace vertices are used both for the APT and in Create_Decal() to
@@ -588,7 +586,7 @@ void MeshClass::Create_Decal(DecalGeneratorClass * generator)
 
 		// We compare the worldspace box vs. the worldspace vertices
 		Model->Generate_Skin_APT(worldbox, temp_apt, dst_vert);
-		
+
 		// if it is not empty, add a decal
 		if (temp_apt.Count() > 0) {
 			if (DecalMesh == NULL) {
@@ -691,10 +689,10 @@ void MeshClass::Render(RenderInfoClass & rinfo)
 		const FrustumClass & frustum=rinfo.Camera.Get_Frustum();
 
 		if (	Model->Get_Flag(MeshGeometryClass::SKIN) ||
-				CollisionMath::Overlap_Test(frustum,Get_Bounding_Box())!=CollisionMath::OUTSIDE ) 
+				CollisionMath::Overlap_Test(frustum,Get_Bounding_Box())!=CollisionMath::OUTSIDE )
 		{
 			bool rendered_something = false;
-			
+
 			/*
 			** If this mesh model has never been rendered, we need to generate the DX8 datastructures
 			*/
@@ -724,7 +722,7 @@ void MeshClass::Render(RenderInfoClass & rinfo)
 			** Look up the FVF container that this mesh is in
 			*/
 			DX8FVFCategoryContainer * fvf_container = Model->PolygonRendererList.Peek_Head()->Get_Texture_Category()->Get_Container();
-			
+
 			/*
 			** Check if we should render the base passes.  One special case here: if
 			** the mesh is translucent (alpha) and the base passes are disabled but we
@@ -732,15 +730,15 @@ void MeshClass::Render(RenderInfoClass & rinfo)
 			** to get our tree shadows and other alpha textured shadows to work.
 			*/
 			bool render_base_passes = ((rinfo.Current_Override_Flags() & RenderInfoClass::RINFO_OVERRIDE_ADDITIONAL_PASSES_ONLY) == 0);
-			bool is_alpha =	(Model->Get_Single_Shader().Get_Alpha_Test() == ShaderClass::ALPHATEST_ENABLE) || 
+			bool is_alpha =	(Model->Get_Single_Shader().Get_Alpha_Test() == ShaderClass::ALPHATEST_ENABLE) ||
 									(Model->Get_Single_Shader().Get_Src_Blend_Func() == ShaderClass::SRCBLEND_SRC_ALPHA);
-			
-			if (	(rinfo.Current_Override_Flags() & RenderInfoClass::RINFO_OVERRIDE_SHADOW_RENDERING) && 
+
+			if (	(rinfo.Current_Override_Flags() & RenderInfoClass::RINFO_OVERRIDE_SHADOW_RENDERING) &&
 					(is_alpha == true))
 			{
 				render_base_passes = true;
 			}
-			
+
 			if (render_base_passes) {
 
 				/*
@@ -762,11 +760,11 @@ void MeshClass::Render(RenderInfoClass & rinfo)
 			** for rendering
 			*/
 			for (int i=0; i<rinfo.Additional_Pass_Count(); i++) {
-				
+
 				MaterialPassClass * matpass = rinfo.Peek_Additional_Pass(i);
 
 				if ((!Is_Translucent()) || (matpass->Is_Enabled_On_Translucent_Meshes())) {
-					
+
 					/*
 					** If the base pass for this mesh has been disabled, we have to make sure
 					** the procedural material pass is rendered after everything else has rendered
@@ -792,7 +790,7 @@ void MeshClass::Render(RenderInfoClass & rinfo)
 			/*
 			** If we have a decal mesh, link it into the mesh rendering system
 			*/
-			if (	(DecalMesh != NULL) && 
+			if (	(DecalMesh != NULL) &&
 					((rinfo.Current_Override_Flags() & RenderInfoClass::RINFO_OVERRIDE_ADDITIONAL_PASSES_ONLY) == 0))
 			{
 				const SphereClass & ws_sphere = Get_Bounding_Sphere();
@@ -856,7 +854,7 @@ void MeshClass::Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass *
 		pass->Install_Materials();
 		DX8Wrapper::Set_Index_Buffer(ib,0);
 
-		SNAPSHOT_SAY(("Set_World_Identity\n"));
+		SNAPSHOT_SAY(("Set_World_Identity"));
 		DX8Wrapper::Set_World_Identity();
 
 		DX8PolygonRendererListIterator it(&Model->PolygonRendererList);
@@ -880,28 +878,28 @@ void MeshClass::Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass *
 		pass->UnInstall_Materials();
 
 	} else if ((pass->Get_Cull_Volume() != NULL) && (MaterialPassClass::Is_Per_Polygon_Culling_Enabled())) {
-		
+
 		/*
-		** Generate the APT 
+		** Generate the APT
 		*/
 		temp_apt.Delete_All(false);
-			
+
 		Matrix3D modeltminv;
 		Get_Transform().Get_Orthogonal_Inverse(modeltminv);
-		
+
 		OBBoxClass localbox;
 		OBBoxClass::Transform(modeltminv,*(pass->Get_Cull_Volume()),&localbox);
 
 		Vector3 view_dir;
 		localbox.Basis.Get_Z_Vector(&view_dir);
 		view_dir = -view_dir;
-			
+
 		if (Model->Has_Cull_Tree()) {
 			Model->Generate_Rigid_APT(localbox,view_dir,temp_apt);
 		} else {
 			Model->Generate_Rigid_APT(view_dir,temp_apt);
 		}
-	
+
 		if (temp_apt.Count() > 0) {
 
 			int buftype = BUFFER_TYPE_DYNAMIC_DX8;
@@ -946,7 +944,7 @@ void MeshClass::Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass *
 			*/
 			int vertex_offset = Model->PolygonRendererList.Peek_Head()->Get_Vertex_Offset();
 			pass->Install_Materials();
-			
+
 			DX8Wrapper::Set_Transform(D3DTS_WORLD,Get_Transform());
 			DX8Wrapper::Set_Index_Buffer(dynamic_ib,vertex_offset);
 
@@ -958,8 +956,8 @@ void MeshClass::Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass *
 			//MW: Need uninstall custom materials in case they leave D3D in unknown state
 			pass->UnInstall_Materials();
 		}
-	} else {		
-		
+	} else {
+
 		/*
 		** Normal mesh case, render polys with this mesh's transform
 		*/
@@ -982,7 +980,7 @@ void MeshClass::Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass *
 		pass->Install_Materials();
 		DX8Wrapper::Set_Index_Buffer(ib,0);
 
-		SNAPSHOT_SAY(("Set_World_Transform\n"));
+		SNAPSHOT_SAY(("Set_World_Transform"));
 		DX8Wrapper::Set_Transform(D3DTS_WORLD,Transform);
 
 		DX8PolygonRendererListIterator it(&Model->PolygonRendererList);
@@ -992,7 +990,7 @@ void MeshClass::Render_Material_Pass(MaterialPassClass * pass,IndexBufferClass *
 				it.Peek_Obj()->Render(BaseVertexOffset);
 			it.Next();
 		}
-		
+
 		if (oldOpacity >= 0)
 		{	//opacity was modified for this mesh instance, so need to restore the material setting which may be shared
 			//among other instances.
@@ -1026,9 +1024,9 @@ void MeshClass::Special_Render(SpecialRenderInfoClass & rinfo)
 	if ((Is_Not_Hidden_At_All() == false) && (rinfo.RenderType != SpecialRenderInfoClass::RENDER_SHADOW)) {
 		return;
 	}
-	
+
 	if (rinfo.RenderType == SpecialRenderInfoClass::RENDER_VIS) {
-	
+
 		WWASSERT(rinfo.VisRasterizer != NULL);
 		rinfo.VisRasterizer->Enable_Two_Sided_Rendering(!!Model->Get_Flag(MeshGeometryClass::TWO_SIDED));
 
@@ -1121,17 +1119,17 @@ void MeshClass::Make_Unique(bool force_meshmdl_clone)
 	REF_PTR_RELEASE(newmesh);
 }
 
-/*********************************************************************************************** 
- * MeshClass::Load -- creates a mesh out of a mesh chunk in a .w3d file                        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- * 																														  * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   06/12/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshClass::Load -- creates a mesh out of a mesh chunk in a .w3d file                        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * 																														  *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   06/12/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 WW3DErrorType MeshClass::Load_W3D(ChunkLoadClass & cload)
 {
@@ -1147,7 +1145,7 @@ WW3DErrorType MeshClass::Load_W3D(ChunkLoadClass & cload)
 	*/
 	Model = NEW_REF(MeshModelClass,());
 	if (Model == NULL) {
-		WWDEBUG_SAY(("MeshClass::Load - Failed to allocate model\r\n"));
+		WWDEBUG_SAY(("MeshClass::Load - Failed to allocate model"));
 		return WW3D_ERROR_LOAD_FAILED;
 	}
 
@@ -1165,7 +1163,7 @@ WW3DErrorType MeshClass::Load_W3D(ChunkLoadClass & cload)
 	int col_bits = (Model->W3dAttributes & W3D_MESH_FLAG_COLLISION_TYPE_MASK) >> W3D_MESH_FLAG_COLLISION_TYPE_SHIFT;
 	Set_Collision_Type( col_bits << 1 );
 	Set_Hidden(Model->W3dAttributes & W3D_MESH_FLAG_HIDDEN);
-	
+
 	/*
 	** Indicate whether this mesh is translucent.  The mesh is considered translucent
 	** if sorting has been enabled (alpha blending on pass 0) or if pass0 contains alpha-test.
@@ -1231,7 +1229,7 @@ bool MeshClass::Cast_Ray(RayCollisionTestClass & raytest)
 			Vector3 mesh_position;
 			world.Get_Translation(&mesh_position);
 			world.Obj_Look_At(mesh_position,mesh_position - raytest.Ray.Get_Dir(),0.0f);
-	} else if (Model->Get_Flag(MeshModelClass::ORIENTED)) {		
+	} else if (Model->Get_Flag(MeshModelClass::ORIENTED)) {
 			Vector3 mesh_position;
 			world.Get_Translation(&mesh_position);
 			world.Obj_Look_At(mesh_position,raytest.Ray.Get_P0(),0.0f);
@@ -1241,9 +1239,9 @@ bool MeshClass::Cast_Ray(RayCollisionTestClass & raytest)
 	RayCollisionTestClass objray(raytest,world_to_obj);
 
 	WWASSERT(Model);
-	
+
 	bool hit = Model->Cast_Ray(objray);
-	
+
 	// transform result back into original coordinate system
 	if (hit) {
 		raytest.CollidedRenderObj = this;
@@ -1252,7 +1250,7 @@ bool MeshClass::Cast_Ray(RayCollisionTestClass & raytest)
 			Matrix3D::Transform_Vector(world,raytest.Result->ContactPoint, &(raytest.Result->ContactPoint));
 		}
 	}
-	
+
 	return hit;
 }
 
@@ -1472,12 +1470,12 @@ void MeshClass::Add_Dependencies_To_List
 	//
 	MaterialInfoClass *material = Get_Material_Info ();
 	if (material != NULL) {
-		
+
 		//
 		// Loop through all the textures and add their filenames to our list
 		//
 		for (int index = 0; index < material->Texture_Count (); index ++) {
-			
+
 			//
 			//	Add this texture's filename to the list
 			//
@@ -1486,7 +1484,7 @@ void MeshClass::Add_Dependencies_To_List
 				file_list.Add (texture->Get_Full_Path ());
 			}
 		}
-		
+
 		//
 		// Release our hold on the material information object
 		//
@@ -1560,15 +1558,15 @@ void Set_MeshModel_Flag(RenderObjClass *robj, int flag, int onoff)
 }
 
 int MeshClass::Get_Sort_Level(void) const
-{ 
+{
 	if (Model) {
 		return (Model->Get_Sort_Level());
 	}
 	return(SORT_LEVEL_NONE);
-}	
+}
 
 void MeshClass::Set_Sort_Level(int level)
-{ 
+{
 	if (Model) {
 		Model->Set_Sort_Level(level);
 	}
@@ -1582,7 +1580,7 @@ int MeshClass::Get_Draw_Call_Count(void) const
 		if (prcount > 0) {
 			return prcount;
 		}
-		
+
 		// Otherwise if we have textures, return the number of textures (e.g. dont have prs when sorting)
 		if ((Model->MatInfo != NULL) && (Model->MatInfo->Texture_Count() > 0)) {
 			return Model->MatInfo->Texture_Count();
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
index 4503be9050f..2a6697a7b1d 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
@@ -17,31 +17,25 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/mesh.h 16    11/07/01 5:50p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D engine                                       * 
- *                                                                                             * 
- *                    File Name : MESH.H                                                       * 
- *                                                                                             * 
- *                   Programmer : Greg Hjelstrom                                               * 
- *                                                                                             * 
- *                   Start Date : 06/11/97                                                     * 
- *                                                                                             * 
- *                  Last Update : June 11, 1997 [GH]                                           * 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D engine                                       *
+ *                                                                                             *
+ *                    File Name : MESH.h                                                       *
+ *                                                                                             *
+ *                   Programmer : Greg Hjelstrom                                               *
+ *                                                                                             *
+ *                   Start Date : 06/11/97                                                     *
+ *                                                                                             *
+ *                  Last Update : June 11, 1997 [GH]                                           *
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MESH_H
-#define MESH_H
 
 #include "always.h"
 #include "rendobj.h"
@@ -82,7 +76,7 @@ class MeshClass : public W3DMPO, public RenderObjClass
 	virtual ~MeshClass(void);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const { return CLASSID_MESH; }
@@ -95,13 +89,13 @@ class MeshClass : public W3DMPO, public RenderObjClass
 
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Collision Detection
-	/////////////////////////////////////////////////////////////////////////////	
+	/////////////////////////////////////////////////////////////////////////////
 	virtual bool					Cast_Ray(RayCollisionTestClass & raytest);
 	virtual bool					Cast_AABox(AABoxCollisionTestClass & boxtest);
 	virtual bool					Cast_OBBox(OBBoxCollisionTestClass & boxtest);
 	virtual bool					Intersect_AABox(AABoxIntersectionTestClass & boxtest);
 	virtual bool					Intersect_OBBox(OBBoxIntersectionTestClass & boxtest);
-   
+
 	/////////////////////////////////////////////////////////////////////////////
 	// Render Object Interface - Bounding Volumes
 	/////////////////////////////////////////////////////////////////////////////
@@ -114,9 +108,9 @@ class MeshClass : public W3DMPO, public RenderObjClass
 	virtual void					Scale(float scale);
 	virtual void					Scale(float scalex, float scaley, float scalez);
 	virtual MaterialInfoClass * Get_Material_Info(void);
-	
+
    virtual int						Get_Sort_Level(void) const;
-   virtual void					Set_Sort_Level(int level);	
+   virtual void					Set_Sort_Level(int level);
 
 
 	/////////////////////////////////////////////////////////////////////////////
@@ -124,7 +118,7 @@ class MeshClass : public W3DMPO, public RenderObjClass
 	/////////////////////////////////////////////////////////////////////////////
 	virtual void					Create_Decal(DecalGeneratorClass * generator);
 	virtual void					Delete_Decal(uint32 decal_id);
-	
+
 	/////////////////////////////////////////////////////////////////////////////
 	// MeshClass Interface
 	/////////////////////////////////////////////////////////////////////////////
@@ -144,7 +138,7 @@ class MeshClass : public W3DMPO, public RenderObjClass
 
 	void								Set_Lighting_Environment(LightEnvironmentClass * light_env) { if (light_env) {m_localLightEnv=*light_env;LightEnvironment = &m_localLightEnv;} else {LightEnvironment = NULL;} }
 	LightEnvironmentClass *		Get_Lighting_Environment(void) { return LightEnvironment; }
-	inline float	Get_Alpha_Override(void) { return m_alphaOverride;}
+	float	Get_Alpha_Override(void) { return m_alphaOverride;}
 
 	void								Set_Next_Visible_Skin(MeshClass * next_visible) { NextVisibleSkin = next_visible; }
 	MeshClass *						Peek_Next_Visible_Skin(void) { return NextVisibleSkin; }
@@ -203,6 +197,3 @@ inline MeshModelClass * MeshClass::Peek_Model(void)
 // model. This is useful for stuff like making a RenderObjects' polys sort.
 //void Set_MeshModel_Flag(RenderObjClass *robj, MeshModelClass::FlagsType flag, int onoff);
 void Set_MeshModel_Flag(RenderObjClass *robj, int flag, int onoff);
-
-#endif /*MESH_H*/
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp
index eff58da5a78..572aa03d385 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp
@@ -61,7 +61,6 @@
 #include "meshbuild.h"
 #include "uarray.h"
 #include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 
 
@@ -83,7 +82,7 @@ static int vertex_compare(const void *elem1, const void *elem2);
 
 typedef int (*COMPARE_FUNC_TYPE)(const void * elem1,const void * elem2);
 
-COMPARE_FUNC_TYPE Texture_Compare_Funcs[MeshBuilderClass::MAX_PASSES][MeshBuilderClass::MAX_STAGES] = 
+COMPARE_FUNC_TYPE Texture_Compare_Funcs[MeshBuilderClass::MAX_PASSES][MeshBuilderClass::MAX_STAGES] =
 {
 	{ pass0_stage0_compare, pass0_stage1_compare },
 	{ pass1_stage0_compare, pass1_stage1_compare },
@@ -95,7 +94,7 @@ COMPARE_FUNC_TYPE Texture_Compare_Funcs[MeshBuilderClass::MAX_PASSES][MeshBuilde
 /************************************************************************************
 **
 ** FaceHasherClass, support class for the unique faces hash table.  The unique
-** faces table is going to detect exactly duplicated faces and discard them.  It 
+** faces table is going to detect exactly duplicated faces and discard them.  It
 ** appears that the artists occasionally accidentally duplicate a face which causes
 ** problems in the stripping algorithm...
 **
@@ -104,40 +103,40 @@ class FaceHasherClass : public HashCalculatorClass<MeshBuilderClass::FaceClass>
 {
 public:
 
-	virtual bool	Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b) 
+	virtual bool	Items_Match(const MeshBuilderClass::FaceClass & a, const MeshBuilderClass::FaceClass & b)
 	{
 		// Note: if we want this to detect duplicates that are "rotated", must change
 		// both this function and the Compute_Hash function...
-		return 
+		return
 		(
-			(a.VertIdx[0] == b.VertIdx[0]) && 
-			(a.VertIdx[1] == b.VertIdx[1]) && 
+			(a.VertIdx[0] == b.VertIdx[0]) &&
+			(a.VertIdx[1] == b.VertIdx[1]) &&
 			(a.VertIdx[2] == b.VertIdx[2])
 		);
 	}
 
 	virtual void	Compute_Hash(const MeshBuilderClass::FaceClass & item)
 	{
-		HashVal = (int)(item.VertIdx[0]*12345.6f + item.VertIdx[1]*1714.38484f + item.VertIdx[2]*27561.3f)&1023; 
+		HashVal = (int)(item.VertIdx[0]*12345.6f + item.VertIdx[1]*1714.38484f + item.VertIdx[2]*27561.3f)&1023;
 	}
 
-	virtual int		Num_Hash_Bits(void) 
-	{ 
-		return 10;  
+	virtual int		Num_Hash_Bits(void)
+	{
+		return 10;
 	}
-	
+
 	virtual int		Num_Hash_Values(void)
 	{
-		return 1;	
+		return 1;
 	}
-	
+
 	virtual int		Get_Hash_Value(int /*index*/)
 	{
 		return HashVal;
 	}
 
 private:
-	
+
 	int HashVal;
 
 };
@@ -154,12 +153,12 @@ class VertexArrayClass
 {
 public:
 
-	enum 
-	{ 
+	enum
+	{
 		HASH_TABLE_SIZE = 4096,
 	};
 
-	VertexArrayClass(int maxsize,int match_normals = 0) 
+	VertexArrayClass(int maxsize,int match_normals = 0)
 	{
 		Verts = NULL;
 		assert(maxsize > 0);
@@ -217,9 +216,9 @@ class VertexArrayClass
 
 		for (x = xstart - EPSILON; x <= xstart + EPSILON + 0.0000001; x+= EPSILON) {
 			for (y = ystart - EPSILON; y <= ystart + EPSILON + 0.000001; y+= EPSILON) {
-				
+
 				hash = compute_hash((float)x,(float)y);
-		
+
 				if (hash != lasthash) {
 					MeshBuilderClass::VertClass * test_vert = HashTable[hash];
 					while (test_vert) {
@@ -227,13 +226,13 @@ class VertexArrayClass
 						if (Verts_Shading_Match(vert,*test_vert)) {
 							if (shadeindex == 0xFFFFFFFF) {
 								shadeindex = test_vert->UniqueIndex;
-							
+
 								// mask the "master" smoothed vertex's smoothing group with our
 								// face's smoothing group since we are going to be smoothed with it.
 								Verts[shadeindex].SharedSmGroup &= vert.SmGroup;
 							}
 						}
-							
+
 						if (Verts_Match(vert,*test_vert)) {
 							return test_vert->UniqueIndex;
 						}
@@ -263,10 +262,10 @@ class VertexArrayClass
 			Verts[newindex].ShadeIndex = shadeindex;
 
 		}
-		
+
 		// This is a new vertex, store the face's smoothing group with it
 		//Verts[newindex].SmoothingGroup = face_smooth_group;
-		
+
 		// And add to the hash table
 		x = (vert.Position.X - Center.X) / Extent.X;
 		y = (vert.Position.Y - Center.Y) / Extent.Y;
@@ -304,7 +303,7 @@ class VertexArrayClass
 			if (v0.DiffuseIllumination[pass] != v1.DiffuseIllumination[pass]) return 0;
 			if (v0.Alpha[pass] != v1.Alpha[pass]) return 0;
 			if (v0.VertexMaterialIndex[pass] != v1.VertexMaterialIndex[pass]) return 0;
-			
+
 		}
 
 		// texcoords must match for all passes and stages
@@ -325,13 +324,13 @@ class VertexArrayClass
 	{
 		float dv = (v0.Position - v1.Position).Length();
 		int smgroup_match = ((v0.SmGroup & v1.SmGroup) || (v0.SmGroup == v1.SmGroup));
-	
-		if (	(dv < EPSILON) && 
+
+		if (	(dv < EPSILON) &&
 				(smgroup_match) &&
-				(v0.Id == v1.Id)) 
+				(v0.Id == v1.Id))
 		{
 			return 1;
-		} 
+		}
 		return 0;
 	}
 
@@ -354,7 +353,7 @@ class VertexArrayClass
 
 	MeshBuilderClass::VertClass * *	HashTable;
 	int										MatchNormals;
-	
+
 	Vector3									Center;
 	Vector3									Extent;
 
@@ -390,7 +389,7 @@ void MeshBuilderClass::VertClass::Reset(void)
 	MaxVertColIndex = 0;
 
 	for (int pass = 0; pass < MeshBuilderClass::MAX_PASSES; pass++) {
-		
+
 		DiffuseColor[pass].Set(1,1,1);
 		SpecularColor[pass].Set(1,1,1);
 		DiffuseIllumination[pass].Set(0,0,0);
@@ -495,8 +494,8 @@ bool MeshBuilderClass::FaceClass::Is_Degenerate(void)
 				return true;
 			}
 
-			if (	(Verts[v0].Position.X == Verts[v1].Position.X) && 
-					(Verts[v0].Position.Y == Verts[v1].Position.Y) && 
+			if (	(Verts[v0].Position.X == Verts[v1].Position.X) &&
+					(Verts[v0].Position.Y == Verts[v1].Position.Y) &&
 					(Verts[v0].Position.Z == Verts[v1].Position.Z) )
 			{
 				return true;
@@ -569,7 +568,7 @@ MeshBuilderClass::MeshBuilderClass(int pass_count,int face_count_guess,int face_
 	PolyOrderStage(0),
 	WorldInfo (NULL)
 {
-	Reset(pass_count,face_count_guess,face_count_growth_rate);		
+	Reset(pass_count,face_count_guess,face_count_growth_rate);
 }
 
 /***********************************************************************************************
@@ -605,15 +604,11 @@ MeshBuilderClass::~MeshBuilderClass(void)
  *=============================================================================================*/
 void MeshBuilderClass::Free(void)
 {
-	if (Faces != NULL) {
-		delete[] Faces;
-		Faces = NULL;
-	}
+	delete[] Faces;
+	Faces = NULL;
 
-	if (Verts != NULL) {
-		delete Verts;
-		Verts = NULL;
-	}
+	delete Verts;
+	Verts = NULL;
 
 	FaceCount = 0;
 	VertCount = 0;
@@ -637,7 +632,7 @@ void MeshBuilderClass::Free(void)
 void MeshBuilderClass::Reset(int passcount,int face_count_guess,int face_count_growth_rate)
 {
 	Free();
-	
+
 	State = STATE_ACCEPTING_INPUT;
 	PassCount = passcount;
 	AllocFaceCount = face_count_guess;
@@ -671,11 +666,11 @@ int MeshBuilderClass::Add_Face(const FaceClass & face)
 
 	// copy the face
 	Faces[CurFace] = face;
-	
+
 	// calculate the normal
 	Faces[CurFace].Compute_Plane();
 
-	// set the "add index" 
+	// set the "add index"
 	Faces[CurFace].AddIndex = CurFace;
 
 	// copy the smoothing group into each vert
@@ -823,7 +818,7 @@ void MeshBuilderClass::Compute_Vertex_Normals(void)
 			int shadeindex = Verts[vertindex].ShadeIndex;
 			Verts[shadeindex].Normal += Faces[faceidx].Normal;
 		}
-	}	
+	}
 
 	/*
 	** Smooth this mesh with neighboring meshes!
@@ -863,7 +858,7 @@ void MeshBuilderClass::Remove_Degenerate_Faces(void)
 	int faceidx;
 	FaceHasherClass facehasher;
 	UniqueArrayClass<MeshBuilderClass::FaceClass> uniquefaces(FaceCount,FaceCount/4,&facehasher);
-	
+
 	for (faceidx = 0; faceidx < FaceCount; faceidx++) {
 		if (!Faces[faceidx].Is_Degenerate()) {
 			uniquefaces.Add(Faces[faceidx]);
@@ -908,7 +903,7 @@ void MeshBuilderClass::Compute_Mesh_Stats(void)
 	int	vmat_index[MAX_PASSES];
 
 	Stats.Reset();
-	
+
 	for (pass = 0; pass<MAX_PASSES; pass++) {
 		for (stage = 0; stage < MAX_STAGES; stage++) {
 			tex_index[pass][stage] = Faces[0].TextureIndex[pass][stage];
@@ -918,7 +913,7 @@ void MeshBuilderClass::Compute_Mesh_Stats(void)
 	}
 
 	for (pass = 0; pass<MAX_PASSES; pass++) {
-		
+
 		for (stage = 0; stage<MAX_STAGES; stage++) {
 			for (face_index=0; face_index < FaceCount; face_index++) {
 				if (Faces[face_index].TextureIndex[pass][stage] != tex_index[pass][stage]) {
@@ -964,7 +959,7 @@ void MeshBuilderClass::Compute_Mesh_Stats(void)
 				break;
 			}
 		}
-	
+
 		for (vert_index=0; vert_index < VertCount; vert_index++) {
 			if (Verts[vert_index].DiffuseIllumination[pass] != Vector3(0,0,0)) {
 				Stats.HasDiffuseIllumination[pass] = true;
@@ -972,7 +967,7 @@ void MeshBuilderClass::Compute_Mesh_Stats(void)
 			}
 		}
 
-		
+
 		for (stage = 0; stage<MAX_STAGES; stage++) {
 			for (face_index=0; face_index < FaceCount; face_index++) {
 				if (Faces[face_index].TextureIndex[pass][stage] != -1) {
@@ -1090,7 +1085,7 @@ void MeshBuilderClass::Compute_Bounding_Sphere(Vector3 * set_center,float * set_
 			zmax.X = Verts[i].Position.X; zmax.Y = Verts[i].Position.Y; zmax.Z = Verts[i].Position.Z;
 		}
 	}
-	
+
 	// xspan = distance between the 2 points xmin and xmax squared.
 	// same goes for yspan and zspan.
 	dx = xmax.X - xmin.X;
@@ -1126,7 +1121,7 @@ void MeshBuilderClass::Compute_Bounding_Sphere(Vector3 * set_center,float * set_
 		dia2 = zmax;
 	}
 
-	
+
 	// Compute initial center and radius and radius squared
 	Vector3 center;
 	center.X = (dia1.X + dia2.X) / 2.0f;
@@ -1140,7 +1135,7 @@ void MeshBuilderClass::Compute_Bounding_Sphere(Vector3 * set_center,float * set_
 	double radsqr = dx*dx + dy*dy + dz*dz;
 	double radius = sqrt(radsqr);
 
-	
+
 	// SECOND PASS:
 	// Increment current sphere if any points fall outside of it.
 	for (i=0; i<VertCount; i++) {
@@ -1148,15 +1143,15 @@ void MeshBuilderClass::Compute_Bounding_Sphere(Vector3 * set_center,float * set_
 		dx = Verts[i].Position.X - center.X;
 		dy = Verts[i].Position.Y - center.Y;
 		dz = Verts[i].Position.Z - center.Z;
-		
+
 		double testrad2 = dx*dx + dy*dy + dz*dz;
 
 		if (testrad2 > radsqr) {
-			
+
 			// this point was outside the old sphere, compute a new
 			// center point and radius which contains this point
 			double testrad = sqrt(testrad2);
-			
+
 			// adjust center and radius
 			radius = (radius + testrad) / 2.0;
 			radsqr = radius * radius;
@@ -1199,7 +1194,7 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	}
 
 	VertexArrayClass unique_verts(FaceCount * 3,match_normals);
-	
+
 	/*
 	** Find the min and max of the array of vertices
 	*/
@@ -1208,7 +1203,7 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 
 	for (faceidx = 0; faceidx < FaceCount; faceidx++) {
 		for (facevertidx = 0; facevertidx < 3; facevertidx++) {
-			
+
 			minv.Update_Min(Faces[faceidx].Verts[facevertidx].Position);
 			maxv.Update_Max(Faces[faceidx].Verts[facevertidx].Position);
 		}
@@ -1224,9 +1219,9 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	*/
 	for (faceidx = 0; faceidx < FaceCount; faceidx++) {
 		for (facevertidx = 0; facevertidx < 3; facevertidx++) {
-			Faces[faceidx].VertIdx[facevertidx] = 
+			Faces[faceidx].VertIdx[facevertidx] =
 				unique_verts.Submit_Vertex(Faces[faceidx].Verts[facevertidx]);
-		}		
+		}
 	}
 
 	/*
@@ -1244,7 +1239,7 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	for (vertidx=0; vertidx<VertCount;vertidx++) {
 		Verts[vertidx] = unique_verts[vertidx];
 	}
-	
+
 	/*
 	** Build a new array of faces, removing degenerate faces
 	*/
@@ -1262,12 +1257,12 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 
 	/*
 	** An "Optimal" mesh will follow the following rules:
-	** 
+	**
 	** Triangle Ordering:
 	** - Triangles are in strip order
 	** - Triangles are sorted by textures and detail textures in all passes (!?)
 	** - Triangles are sorted by shader in all passes(!)
-	** 
+	**
 	** Vertex Ordering:
 	** - Skin matrix order if the mesh is being "skinned"
    ** - Few vertex material switches
@@ -1275,7 +1270,7 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	**
 	** All verts should use the same data fields in each pass (alpha, dcg, ect)
 	** All triangles must use same number of passes.
-	** 
+	**
 	** Here is how I will attempt to get as "close as possible" to this
 	** - find the pass and stage which has the "worst-case" number of textures
 	**   and sort all polys with respect to the textures in that pass and stage
@@ -1288,14 +1283,14 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
 	** We should throw up a warning flag in the asset manager whenever we encounter
 	** a mesh which uses more than one of these per pass...
 	*/
-	Compute_Mesh_Stats();	
+	Compute_Mesh_Stats();
 	Stats.UVSplitCount = unique_verts.UVSplits;
 
 	/*
 	** Sort the polys by texture
 	*/
 	qsort(Faces,FaceCount,sizeof(FaceClass),Texture_Compare_Funcs[PolyOrderPass][PolyOrderStage]);
-		
+
 	/*
 	** Sort the vertices by bone index and vertex material
 	*/
@@ -1328,21 +1323,21 @@ void MeshBuilderClass::Optimize_Mesh(bool compute_normals)
  *=============================================================================================*/
 void MeshBuilderClass::Strip_Optimize_Mesh(void)
 {
-	WingedEdgeStruct *		edgehash[512];		
+	WingedEdgeStruct *		edgehash[512];
 	WingedEdgeStruct *		edgetab			= W3DNEWARRAY WingedEdgeStruct[FaceCount*3];
 	WingedEdgePolyStruct *	pedges			= W3DNEWARRAY WingedEdgePolyStruct[FaceCount];
-	
+
 	FaceClass *					newpolys			= W3DNEWARRAY FaceClass[FaceCount];
 	int *							newmat			= W3DNEWARRAY int[FaceCount];
 	int *							premap			= W3DNEWARRAY int[FaceCount];
 	int *							vtimestamp		= W3DNEWARRAY int[VertCount];
-	
+
 	int							vcount			= 0;
 	int							polysinserted	= 0;
 	int							lastmat			= 0;
 	int							edgecount		= 0;
 	int							i,j;
-	
+
 	// init the tables
 	memset(edgehash,0,sizeof(WingedEdgeStruct *) * 512);
 	memset(edgetab,0,sizeof(WingedEdgeStruct) * FaceCount * 3);
@@ -1352,12 +1347,12 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 	for (i=0; i<VertCount; i++) {
 		vtimestamp[i] = -1;
 	}
-	
+
 	// Build the edge table for the mesh
 	// Oct 20,1998: modifying so that every place we were looking at the
 	// material index, we now use TextureIndex[PolyOrderPass][PolyOrderStage]
 	for (i=0; i<FaceCount; i++) {
-		
+
 		int mat = Faces[i].TextureIndex[PolyOrderPass][PolyOrderStage];
 
 		for (j=0; j<3; j++) {
@@ -1371,7 +1366,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 
 			v0 = j;
 			if (v0 < 2) v1 = v0+1; else v1 = 0;
-			
+
 			v0 = Faces[i].VertIdx[v0];
 			v1 = Faces[i].VertIdx[v1];
 
@@ -1391,7 +1386,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 
 				// found the edge
 				edge->Poly[1] = i;
-			
+
 			} else {
 
 				// create new edge and link it to hash table
@@ -1403,7 +1398,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 				edge->Poly[0] = i;
 				edge->Poly[1] = -1;
 				edge->MaterialIdx  = mat;
-			}			
+			}
 
 			pedges[i].Edge[j] = edge;
 		}
@@ -1424,8 +1419,8 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 
 		// first attempt to minimize material switches by choosing a polygon with same material
 		// as the starting poly. Basically what we want is the poly with same material with
-		// least shared edges and most recent vertices (as we'd like to start the strip from 
-		// a 'corner polygon'). This pass is done only if mesh has multiple materials. 
+		// least shared edges and most recent vertices (as we'd like to start the strip from
+		// a 'corner polygon'). This pass is done only if mesh has multiple materials.
 		// The second pass scans through all polygons.
 
 		// this loop is O(N*N) -> might turn a bit nasty on larger meshes. Try
@@ -1435,18 +1430,18 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 		{
 			// loop through all polygons
 			for (i = 0; i < FaceCount; i++) {
-			
+
 				// if polygon not picked yet
 				if (premap[i]==-1) {
 
 					// if material mismatch, cannot choose poly (except in pass 1)
-					if (findpass == 0 && Faces[i].TextureIndex[PolyOrderPass][PolyOrderStage] != lastmat)		
+					if (findpass == 0 && Faces[i].TextureIndex[PolyOrderPass][PolyOrderStage] != lastmat)
 						continue;
 
 					// calculate number of shared edges
 					for (c = 0, j = 0; j < 3; j++) {
-						
-						// if edge j is shared by two tris, 
+
+						// if edge j is shared by two tris,
 						// use a weight factor of vCount for each edge
 						if (pedges[i].Edge[j]->Poly[1] >= 0) {
 							c += (vcount+1);
@@ -1489,7 +1484,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 		for (int edge_index = 0; (edge_index < 3) && !found_shared_edge; edge_index++) {
 
 			for (int side_index = 0; (side_index < 2) && !found_shared_edge; side_index++) {
-				
+
 				// if this polygon is not the startpoly and it is not "taken", then this edge is ok!
 				int poly = pedges[startpoly].Edge[edge_index]->Poly[side_index];
 				if ((poly != -1) && (poly != startpoly) && (premap[poly] == -1)) {
@@ -1499,7 +1494,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 					for (int vidx=0; vidx<3; vidx++) {
 						if (	(newpoly->VertIdx[vidx] != pedges[startpoly].Edge[edge_index]->Vertex[0]) &&
 								(newpoly->VertIdx[vidx] != pedges[startpoly].Edge[edge_index]->Vertex[1])) {
-						
+
 								first_vert = newpoly->VertIdx[vidx];
 								break;
 						}
@@ -1512,16 +1507,16 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 						newpoly->VertIdx[0] = newpoly->VertIdx[1];
 						newpoly->VertIdx[1] = newpoly->VertIdx[2];
 						newpoly->VertIdx[2] = tmp;
-					}	
+					}
 
-					// ok, we found a shareable edge and adjusted our poly so the strip 
+					// ok, we found a shareable edge and adjusted our poly so the strip
 					// will start with it.  Now break out of this loop...
 					found_shared_edge = true;
 					break;
 				}
 			}
 		}
-		
+
 		// if a shared edge wasn't found, just copy the poly
 		if (!found_shared_edge) {
 			newpolys[polysinserted] = Faces[startpoly];
@@ -1538,9 +1533,9 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 		}
 
 		// If we have no shared edges, this is a lone poly, start another strip
-		if (pedges[startpoly].Edge[0]->Poly[1] == -1 &&					
+		if (pedges[startpoly].Edge[0]->Poly[1] == -1 &&
 			pedges[startpoly].Edge[1]->Poly[1] == -1 &&
-			pedges[startpoly].Edge[2]->Poly[1] == -1) 
+			pedges[startpoly].Edge[2]->Poly[1] == -1)
 				continue;
 
 		// Build the strip starting from the polygon chosen in the previous loop
@@ -1557,16 +1552,16 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 			nextpoly		= -1;
 
 			for (i = 0; i < 3; i++) {
-				
+
 				// if edge 'i' of startpoly matches the vertices in the fifo
 				if	((pedges[startpoly].Edge[i]->Vertex[0] == vFIFO[0] && pedges[startpoly].Edge[i]->Vertex[1] == vFIFO[1]) ||
 					(pedges[startpoly].Edge[i]->Vertex[1] == vFIFO[0] && pedges[startpoly].Edge[i]->Vertex[0] == vFIFO[1]))
 				{
 
 					for (j = 0; j < 2; j++) {
-						
+
 						// if poly 'j' attached to this edge has not been used already, use it!
-						if (pedges[startpoly].Edge[i]->Poly[j] > -1 && 
+						if (pedges[startpoly].Edge[i]->Poly[j] > -1 &&
 							premap[pedges[startpoly].Edge[i]->Poly[j]] == -1)
 						{
 							nextpoly = pedges[startpoly].Edge[i]->Poly[j];
@@ -1580,7 +1575,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 			break;
 
 			found:;
-	
+
 			// now, find the new vertex (two verts are on the edge, find the third)
 			int nw = -1;
 			for (i = 0; i < 3; i++) {
@@ -1626,7 +1621,7 @@ void MeshBuilderClass::Strip_Optimize_Mesh(void)
 		}
 	}
 
-	// Use the premap array to get the rest of the info into the new face table, 
+	// Use the premap array to get the rest of the info into the new face table,
 	for (i=0; i<FaceCount; i++) {
 
 		int old_idx = i;
@@ -1693,7 +1688,7 @@ void MeshBuilderClass::Grow_Face_Array(void)
 	for (int i=0; i<oldcount; i++) {
 		Faces[i] = oldfaces[i];
 	}
-	
+
 	delete[] oldfaces;
 }
 
@@ -1752,7 +1747,7 @@ int face_material_compare(const void *elem1, const void *elem2 )
 {
 	MeshBuilderClass::FaceClass * f0 = (MeshBuilderClass::FaceClass *)elem1;
 	MeshBuilderClass::FaceClass * f1 = (MeshBuilderClass::FaceClass *)elem2;
-	
+
 	if (f0->TextureIndex[0][0] < f1->TextureIndex[0][0]) return -1;
 	if (f0->TextureIndex[0][0] > f1->TextureIndex[0][0]) return 1;
 	return 0;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h
index 9b8b2714bfb..8d64114a1f2 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h
@@ -26,24 +26,19 @@
  *                                                                                             *
  *                   Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 9:23a                                              $*
  *                                                                                             *
  *                    $Revision:: 2                                                           $*
  *                                                                                             *
- * 
+ *
  * 06/27/02 KM Shader system MAX plugin updates                                       *
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MESHBUILD_H
-#define MESHBUILD_H
 
 #include	"always.h"
 #include "vector2.h"
@@ -64,7 +59,7 @@ class WorldInfoClass
 		WorldInfoClass(void)				{ }
 		virtual ~WorldInfoClass(void)	{ }
 
-		// Public methods		
+		// Public methods
 		virtual Vector3	Get_Shared_Vertex_Normal (Vector3 pos, int smgroup) = 0;
 		virtual bool		Are_Meshes_Smoothed (void) const { return true; }
 };
@@ -86,7 +81,7 @@ class WorldInfoClass
 ** 2. Loop through the verts, looking at each one using Get_Vertex
 ** 3. Loop through the faces, looking at each one using Get_Face
 **
-** *NOTE*  This class is meant to be relatively self-sufficient.  It is used in a 
+** *NOTE*  This class is meant to be relatively self-sufficient.  It is used in a
 ** variety of different applications which are built on completely different
 ** code-bases.  Do not introduce dependencies into this module lightly! :-)
 */
@@ -98,7 +93,7 @@ class MeshBuilderClass
 	enum {
 		STATE_ACCEPTING_INPUT = 0,		// mesh builder is accepting input triangles
 		STATE_MESH_PROCESSED,			// mesh builder has processed the mesh
-	
+
 		MAX_PASSES = 4,					// maximum number of material passes supported
 		MAX_STAGES = 8,					// maximum number of texture stages supported in a single pass
 	};
@@ -110,12 +105,12 @@ class MeshBuilderClass
 	~MeshBuilderClass(void);
 
 	/*
-	** VertClass.  The MeshBuilder deals with vertices in this format.  
+	** VertClass.  The MeshBuilder deals with vertices in this format.
 	*/
 	class VertClass
 	{
 	public:
-		VertClass(void)		{ Reset(); } 
+		VertClass(void)		{ Reset(); }
 		void						Reset(void);
 
 	public:
@@ -127,8 +122,8 @@ class MeshBuilderClass
 		int						BoneIndex;			// bone influence if the mesh is a skin
 
 		int						MaxVertColIndex;	// Index into the Max mesh.vertCol array of this vertex.
-		
-		Vector2					TexCoord[MAX_PASSES][MAX_STAGES];				
+
+		Vector2					TexCoord[MAX_PASSES][MAX_STAGES];
 		Vector3					DiffuseColor[MAX_PASSES];			// diffuse color
 		Vector3					SpecularColor[MAX_PASSES];			// specular color
 		Vector3					DiffuseIllumination[MAX_PASSES];	// pre-calced diffuse illum
@@ -144,7 +139,7 @@ class MeshBuilderClass
 		int						UniqueIndex;		// used internally!
 		int						ShadeIndex;			// used internally!
 		VertClass *				NextHash;			// used internally!
-	
+
 	};
 
 	/*
@@ -157,7 +152,7 @@ class MeshBuilderClass
 	public:
 		FaceClass(void)		{ Reset(); }
 		void						Reset(void);									// reset this face
-		
+
 	public:
 		VertClass				Verts[3];										// array of 3 verts
 		int						SmGroup;											// smoothing group
@@ -171,7 +166,7 @@ class MeshBuilderClass
 		int						VertIdx[3];			// set by builder: "optimized" vertex indices
 		Vector3					Normal;		 		// set by builder: Face normal
 		float32					Dist;			 		// set by builder: Plane distance
-	
+
 		void						Compute_Plane(void);
 		bool						operator != (const FaceClass & that)		{ return !(*this == that); }
 		bool						operator == (const FaceClass & /*that*/)	{ return false; }
@@ -179,27 +174,27 @@ class MeshBuilderClass
 
 		friend class MeshBuilderClass;
 	};
-	
+
 	/*
 	** To "build" a mesh:
 	** 1. Reset the builder with the approximate number of polys you're going to sumbit, etc.
 	** 3. Submit each face in the form of a FaceClass, set only the fields you need (leave others at default)
 	** 4. Call Build_Mesh
-	*/ 
+	*/
 	void							Reset(int pass_count,int face_count_guess,int face_count_growth_rate);
 	int							Add_Face(const FaceClass & face);
 	void							Build_Mesh(bool compute_normals);
 
 	/*
-	** Optional controls: 
+	** Optional controls:
 	** If one of your passes has more textures than another, you may wish to do the
-	** stripping and sorting based on that channel.  By default, everything will 
+	** stripping and sorting based on that channel.  By default, everything will
 	** be stripped and sorted based on pass 0, stage 0
 	** Sort_Vertices can be used to order the vertices arbitrarily.  I use it to
 	** sort them according to the bone they are attached for skin meshes.
 	*/
 	void							Set_Polygon_Ordering_Channel(int pass,int texstage);
-	
+
 	/*
 	** To use the results:
 	** 1. Call Get_Vertex_Count and Get_Face_Count to get the counts
@@ -237,9 +232,9 @@ class MeshBuilderClass
 	*/
 	WorldInfoClass *			Peek_World_Info(void) const						{ return WorldInfo; }
 	void							Set_World_Info(WorldInfoClass *world_info)	{ WorldInfo = world_info; }
-	
+
 	/*
-	** Mesh Stats, mainly lots of flags for whether this mesh has various 
+	** Mesh Stats, mainly lots of flags for whether this mesh has various
 	** channels of information.
 	*/
 	struct MeshStatsStruct
@@ -251,7 +246,7 @@ class MeshBuilderClass
 		bool		HasVertexMaterial[MAX_PASSES];					// has at least one vert material in given pass
 
 		bool		HasPerPolyTexture[MAX_PASSES][MAX_STAGES];	// has 2+ textures in given pass/stage
-		bool		HasPerPolyShader[MAX_PASSES];						// has 2+ shaders in given pass 
+		bool		HasPerPolyShader[MAX_PASSES];						// has 2+ shaders in given pass
 		bool		HasPerVertexMaterial[MAX_PASSES];				// has 2+ vertex materials in given pass
 
 		bool		HasDiffuseColor[MAX_PASSES];						// has diffuse colors in given pass
@@ -350,7 +345,7 @@ inline const MeshBuilderClass::VertClass & MeshBuilderClass::Get_Vertex(int inde
 	assert(State == STATE_MESH_PROCESSED);
 	assert(index >= 0);
 	assert(index < VertCount);
-	return Verts[index];	
+	return Verts[index];
 }
 
 inline const MeshBuilderClass::FaceClass & MeshBuilderClass::Get_Face(int index) const
@@ -366,7 +361,7 @@ inline MeshBuilderClass::VertClass & MeshBuilderClass::Get_Vertex(int index)
 	assert(State == STATE_MESH_PROCESSED);
 	assert(index >= 0);
 	assert(index < VertCount);
-	return Verts[index];	
+	return Verts[index];
 }
 
 inline MeshBuilderClass::FaceClass & MeshBuilderClass::Get_Face(int index)
@@ -382,5 +377,3 @@ inline const MeshBuilderClass::MeshStatsStruct & MeshBuilderClass::Get_Mesh_Stat
 	assert(State == STATE_MESH_PROCESSED);
 	return Stats;
 }
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
index 3cd652ffc55..242f66da06e 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
@@ -214,7 +214,7 @@ MeshGeometryClass & MeshGeometryClass::operator = (const MeshGeometryClass & tha
 		REF_PTR_SET(MeshName,that.MeshName);
 		REF_PTR_SET(UserText,that.UserText);
 		REF_PTR_SET(Poly,that.Poly);
-		REF_PTR_SET(PolySurfaceType,that.PolySurfaceType);		
+		REF_PTR_SET(PolySurfaceType,that.PolySurfaceType);
 		REF_PTR_SET(Vertex,that.Vertex);
 		REF_PTR_SET(VertexNorm,that.VertexNorm);
 		REF_PTR_SET(PlaneEq,that.PlaneEq);
@@ -275,7 +275,7 @@ void MeshGeometryClass::Reset_Geometry(int polycount,int vertcount)
 	REF_PTR_RELEASE(MeshName);
 	REF_PTR_RELEASE(UserText);
 	REF_PTR_RELEASE(Poly);
-	REF_PTR_RELEASE(PolySurfaceType);	
+	REF_PTR_RELEASE(PolySurfaceType);
 	REF_PTR_RELEASE(Vertex);
 	REF_PTR_RELEASE(VertexNorm);
 	REF_PTR_RELEASE(PlaneEq);
@@ -322,7 +322,7 @@ const char * MeshGeometryClass::Get_Name(void) const
 {
 	if (MeshName) {
 		return MeshName->Get_Array();
-	} 
+	}
 	return NULL;
 }
 
@@ -413,7 +413,7 @@ void MeshGeometryClass::Get_Bounding_Box(AABoxClass * set_box)
 	WWASSERT(set_box != NULL);
 	set_box->Center = (BoundBoxMax + BoundBoxMin) * 0.5f;
 	set_box->Extent = (BoundBoxMax - BoundBoxMin) * 0.5f;
-}	
+}
 
 
 /***********************************************************************************************
@@ -461,7 +461,7 @@ void MeshGeometryClass::Generate_Rigid_APT(const Vector3 & view_dir, SimpleDynVe
 		tri.V[1] = &(loc[ polys[poly_counter][1] ]);
 		tri.V[2] = &(loc[ polys[poly_counter][2] ]);
 		tri.N = (Vector3*)&(norms[poly_counter]);
-		
+
 		if (Vector3::Dot_Product(*tri.N,view_dir) < 0.0f) {
 			apt.Add(poly_counter);
 		}
@@ -501,7 +501,7 @@ void MeshGeometryClass::Generate_Rigid_APT(const OBBoxClass & local_box, SimpleD
 			tri.V[1] = &(loc[ polys[poly_counter][1] ]);
 			tri.V[2] = &(loc[ polys[poly_counter][2] ]);
 			tri.N = (Vector3*)&(norms[poly_counter]);
-				
+
 			if (CollisionMath::Intersection_Test(local_box, tri)) {;
 				apt.Add(poly_counter);
 			}
@@ -540,11 +540,11 @@ void MeshGeometryClass::Generate_Rigid_APT(const OBBoxClass & local_box,const Ve
 			tri.V[1] = &(loc[ polys[poly_counter][1] ]);
 			tri.V[2] = &(loc[ polys[poly_counter][2] ]);
 			tri.N = (Vector3*)&(norms[poly_counter]);
-				
+
 			if (Vector3::Dot_Product(*tri.N,viewdir) < 0.0f) {
 				if (CollisionMath::Intersection_Test(local_box,tri)) {
 					apt.Add(poly_counter);
-				} 
+				}
 			}
 		}
 	}
@@ -583,7 +583,7 @@ void MeshGeometryClass::Generate_Skin_APT(const OBBoxClass & world_box, SimpleDy
 		// in the Intersection_Test, so we set it to a dummy value.
 		static const Vector3 dummy_vec(0.0f, 0.0f, 1.0f);
 		tri.N = &dummy_vec;
-			
+
 		if (CollisionMath::Intersection_Test(world_box,tri)) {;
 			apt.Add(poly_counter);
 		}
@@ -660,7 +660,7 @@ bool MeshGeometryClass::Cast_Ray(RayCollisionTestClass & raytest)
 	return hit;
 }
 
- 
+
 /***********************************************************************************************
  * MeshGeometryClass::Cast_AABox -- cast an AABox against this mesh                            *
  *                                                                                             *
@@ -676,7 +676,7 @@ bool MeshGeometryClass::Cast_Ray(RayCollisionTestClass & raytest)
 bool MeshGeometryClass::Cast_AABox(AABoxCollisionTestClass & boxtest)
 {
 	bool hit = false;
-	
+
 	if (CullTree) {
 		hit = CullTree->Cast_AABox(boxtest);
 	} else {
@@ -686,7 +686,7 @@ bool MeshGeometryClass::Cast_AABox(AABoxCollisionTestClass & boxtest)
 	return hit;
 }
 
-  
+
 /***********************************************************************************************
  * MeshGeometryClass::Cast_OBBox -- Cast an obbox against this mesh                            *
  *                                                                                             *
@@ -712,7 +712,7 @@ bool MeshGeometryClass::Cast_OBBox(OBBoxCollisionTestClass & boxtest)
 	return hit;
 }
 
-  
+
 /***********************************************************************************************
  * MeshGeometryClass::Intersect_OBBox -- test for intersection with the given OBBox            *
  *                                                                                             *
@@ -763,26 +763,26 @@ bool MeshGeometryClass::Cast_World_Space_AABox(AABoxCollisionTestClass & boxtest
 	** that these compares are done
 	*/
 	bool hit = false;
-	
+
 	if ((transform[0][0] == 1.0f) && (transform[1][1] == 1.0f)) {
 
 		hit = cast_aabox_identity(boxtest,-transform.Get_Translation());
-	
+
 	} else if ((transform[0][1] == -1.0f) && (transform[1][0] == 1.0f)) {
-	
+
 		// this mesh has been rotated 90 degrees about z
 		hit = cast_aabox_z90(boxtest,-transform.Get_Translation());
-	
+
 	} else if ((transform[0][0] == -1.0f) && (transform[1][1] == -1.0f)) {
-	
+
 		// this mesh has been rotated 180
 		hit = cast_aabox_z180(boxtest,-transform.Get_Translation());
-	
+
 	} else if ((transform[0][1] == 1.0f) && (transform[1][0] == -1.0f)) {
-	
-		// this mesh has been rotated 270 
+
+		// this mesh has been rotated 270
 		hit = cast_aabox_z270(boxtest,-transform.Get_Translation());
-	
+
 	} else {
 
 		/*
@@ -837,7 +837,7 @@ int MeshGeometryClass::cast_semi_infinite_axis_aligned_ray(const Vector3 & start
 	if (CullTree) {
 		count = CullTree->Cast_Semi_Infinite_Axis_Aligned_Ray(start_point, axis_dir, flags);
 	} else {
-	
+
 		const Vector3 * loc = Get_Vertex_Array();
 		const Vector4 * plane = Get_Plane_Array();
 		const TriIndex * polyverts = Get_Polygon_Array();
@@ -864,7 +864,7 @@ int MeshGeometryClass::cast_semi_infinite_axis_aligned_ray(const Vector3 & start
 		*/
 		int poly_count = Get_Polygon_Count();
 		for (int poly_counter=0; poly_counter < poly_count; poly_counter++) {
-		
+
 			const Vector3 &v0 = loc[ polyverts[poly_counter][0] ];
 			const Vector3 &v1 = loc[ polyverts[poly_counter][1] ];
 			const Vector3 &v2 = loc[ polyverts[poly_counter][2] ];
@@ -973,7 +973,7 @@ bool MeshGeometryClass::cast_aabox_z180(AABoxCollisionTestClass & boxtest, const
 	} else {
 		hit = cast_aabox_brute_force(newbox);
 	}
-	
+
 	// if we hit something, we need to rotate the normal back out of the mesh coordinate system
 	if (hit) {
 		// rotating the normal by 180 degrees about Z
@@ -1051,19 +1051,19 @@ bool MeshGeometryClass::intersect_obbox_brute_force(OBBoxIntersectionTestClass &
 	** Loop over each polygon
 	*/
 	for (int srtri=0; srtri < Get_Polygon_Count(); srtri++) {
-	
+
 		tri.V[0] = &(loc[ polyverts[srtri][0] ]);
 		tri.V[1] = &(loc[ polyverts[srtri][1] ]);
 		tri.V[2] = &(loc[ polyverts[srtri][2] ]);
 
-#ifdef COMPUTE_NORMALS					
+#ifdef COMPUTE_NORMALS
 		static Vector3 _normal;
 		tri.N = &_normal;
 		tri.Compute_Normal();
 #else
 		tri.N = (Vector3 *)&(norms[srtri]);
 #endif
-		
+
 		if (CollisionMath::Intersection_Test(localtest.Box, tri)) {
 			return true;
 		}
@@ -1101,25 +1101,25 @@ bool MeshGeometryClass::cast_ray_brute_force(RayCollisionTestClass & raytest)
 	*/
 	bool hit = false;
 	for (srtri=0; srtri < Get_Polygon_Count(); srtri++) {
-	
+
 		// TODO: find a better way to do this?
 		tri.V[0] = &(loc[ polyverts[srtri][0] ]);
 		tri.V[1] = &(loc[ polyverts[srtri][1] ]);
 		tri.V[2] = &(loc[ polyverts[srtri][2] ]);
 
-#ifdef COMPUTE_NORMALS					
+#ifdef COMPUTE_NORMALS
 		static Vector3 _normal;
 		tri.N = &_normal;
 		tri.Compute_Normal();
 #else
 		tri.N = (Vector3 *)&(norms[srtri]);
 #endif
-		
+
 		if (CollisionMath::Collide(raytest.Ray, tri, raytest.Result)) {
 			hit = true;
 			raytest.Result->SurfaceType = Get_Poly_Surface_Type (srtri);
 		}
-	
+
 		if (raytest.Result->StartBad) return true;
 
 	}
@@ -1161,7 +1161,7 @@ bool MeshGeometryClass::cast_aabox_brute_force(AABoxCollisionTestClass & boxtest
 		tri.V[1] = &(loc[ polyverts[srtri][1] ]);
 		tri.V[2] = &(loc[ polyverts[srtri][2] ]);
 
-#ifdef COMPUTE_NORMALS					
+#ifdef COMPUTE_NORMALS
 		static Vector3 _normal;
 		tri.N = &_normal;
 		tri.Compute_Normal();
@@ -1219,7 +1219,7 @@ bool MeshGeometryClass::cast_obbox_brute_force(OBBoxCollisionTestClass & boxtest
 		tri.V[1] = &(loc[ polyverts[srtri][1] ]);
 		tri.V[2] = &(loc[ polyverts[srtri][2] ]);
 
-#ifdef COMPUTE_NORMALS					
+#ifdef COMPUTE_NORMALS
 		static Vector3 _normal;
 		tri.N = &_normal;
 		tri.Compute_Normal();
@@ -1317,18 +1317,18 @@ void MeshGeometryClass::Compute_Vertex_Normals(Vector3 * vnorm)
 			vnorm[poly[pidx].I].X += peq[pidx].X;
 			vnorm[poly[pidx].I].Y += peq[pidx].Y;
 			vnorm[poly[pidx].I].Z += peq[pidx].Z;
-			
+
 			vnorm[poly[pidx].J].X += peq[pidx].X;
 			vnorm[poly[pidx].J].Y += peq[pidx].Y;
 			vnorm[poly[pidx].J].Z += peq[pidx].Z;
-			
+
 			vnorm[poly[pidx].K].X += peq[pidx].X;
 			vnorm[poly[pidx].K].Y += peq[pidx].Y;
 			vnorm[poly[pidx].K].Z += peq[pidx].Z;
 		}
-	
+
 	} else {
-	
+
 		VectorProcessorClass::Clear (vnorm, VertexCount);
 
 		for (int pidx = 0; pidx < PolyCount; pidx++)	{
@@ -1439,15 +1439,15 @@ Vector3 * MeshGeometryClass::get_vert_normals(void)
  *   6/14/2001  gth : Created.                                                                 *
  *=============================================================================================*/
 const Vector3 * MeshGeometryClass::Get_Vertex_Normal_Array(void)
-{ 
+{
 #if (OPTIMIZE_VNORM_RAM)
 	Compute_Vertex_Normals(get_vert_normals());
-	return get_vert_normals(); 
+	return get_vert_normals();
 #else
 	if (Get_Flag(DIRTY_VNORMALS)) {
 		Compute_Vertex_Normals(get_vert_normals());
 	}
-	return get_vert_normals(); 
+	return get_vert_normals();
 #endif
 }
 
@@ -1495,7 +1495,7 @@ Vector4 * MeshGeometryClass::get_planes(bool create)
  *   6/14/2001  gth : Created.                                                                 *
  *=============================================================================================*/
 const Vector4 * MeshGeometryClass::Get_Plane_Array(bool create)
-{ 
+{
 #if (OPTIMIZE_PLANEEQ_RAM)
 	Vector4 * planes = get_planes(create);
 	Compute_Plane_Equations(planes);
@@ -1551,7 +1551,8 @@ void MeshGeometryClass::Generate_Culling_Tree(void)
 	{
 		AABTreeBuilderClass builder;
 		builder.Build_AABTree(PolyCount,Poly->Get_Array(),VertexCount,Vertex->Get_Array());
-	
+
+		DEBUG_ASSERTCRASH(CullTree == NULL, ("MeshGeometryClass::Generate_Culling_Tree: Leaking CullTree"));
 		CullTree = NEW_REF(AABTreeClass,(&builder));
 		CullTree->Set_Mesh(this);
 	}
@@ -1578,19 +1579,19 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 	/*
 	** This function will initialize this MeshGeometryClass from the contents of a W3D file.
 	** Note that derived classes need to completely replace this function; only re-using the individual
-	** chunk handling functions.  
+	** chunk handling functions.
 	*/
 
 	/*
 	**	Open the first chunk, it should be the mesh header
 	*/
 	cload.Open_Chunk();
-	
+
 	if (cload.Cur_Chunk_ID() != W3D_CHUNK_MESH_HEADER3) {
-		WWDEBUG_SAY(("Old format mesh mesh, no longer supported.\n"));
+		WWDEBUG_SAY(("Old format mesh mesh, no longer supported."));
 		goto Error;
 	}
-	
+
 	W3dMeshHeader3Struct header;
 	if (cload.Read(&header,sizeof(W3dMeshHeader3Struct)) != sizeof(W3dMeshHeader3Struct)) {
 		goto Error;
@@ -1602,22 +1603,22 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 	*/
 	char *	tmpname;
 	int		namelen;
-	
+
 	Reset_Geometry(header.NumTris,header.NumVertices);
-	
+
 	namelen = strlen(header.ContainerName);
 	namelen += strlen(header.MeshName);
 	namelen += 2;
-	W3dAttributes = header.Attributes;	
+	W3dAttributes = header.Attributes;
 	SortLevel = header.SortLevel;
 	tmpname = W3DNEWARRAY char[namelen];
 	memset(tmpname,0,namelen);
 
 	if (strlen(header.ContainerName) > 0) {
 		strcpy(tmpname,header.ContainerName);
-		strcat(tmpname,".");
+		strcat(tmpname, ".");
 	}
-	strcat(tmpname,header.MeshName);
+	strcat(tmpname, header.MeshName);
 
 	Set_Name(tmpname);
 
@@ -1638,7 +1639,7 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 	*/
 	if (header.Version >= W3D_MAKE_VERSION(4,1)) {
 		int geometry_type = header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK;
-		switch (geometry_type) 
+		switch (geometry_type)
 		{
 			case W3D_MESH_FLAG_GEOMETRY_TYPE_NORMAL:
 				break;
@@ -1651,7 +1652,7 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 			case W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN:
 				Set_Flag(SKIN,true);
 				break;
-		} 
+		}
 	}
 
 	if (header.Attributes & W3D_MESH_FLAG_TWO_SIDED) {
@@ -1672,7 +1673,7 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 
 		uint16 * links = get_bone_links();
 		WWASSERT(links);
-		
+
 		for (int bi = 0; bi < Get_Vertex_Count(); bi++) {
 			links[bi] += 1;
 		}
@@ -1682,7 +1683,7 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 	** If this mesh is collideable and no AABTree was in the file, generate one now
 	*/
 	if (	(((W3dAttributes & W3D_MESH_FLAG_COLLISION_TYPE_MASK) >> W3D_MESH_FLAG_COLLISION_TYPE_SHIFT) != 0) &&
-			(CullTree == NULL)) 
+			(CullTree == NULL))
 	{
 		Generate_Culling_Tree();
 	}
@@ -1710,7 +1711,7 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
  * HISTORY:                                                                                    *
  *   11/9/2000  gth : Created.                                                                 *
  *=============================================================================================*/
-WW3DErrorType MeshGeometryClass::read_chunks(ChunkLoadClass & cload) 
+WW3DErrorType MeshGeometryClass::read_chunks(ChunkLoadClass & cload)
 {
 	/*
 	**	Read in the chunk header
@@ -1742,7 +1743,7 @@ WW3DErrorType MeshGeometryClass::read_chunks(ChunkLoadClass & cload)
 			case W3D_CHUNK_MESH_USER_TEXT:
 					error = read_user_text(cload);
 					break;
-			
+
 			case W3D_CHUNK_VERTEX_INFLUENCES:
 					error = read_vertex_influences(cload);
 					break;
@@ -1758,8 +1759,8 @@ WW3DErrorType MeshGeometryClass::read_chunks(ChunkLoadClass & cload)
 			default:
 					break;
 
-		}	
-		
+		}
+
 		cload.Close_Chunk();
 
 		if (error != WW3D_ERROR_OK) {
@@ -1794,13 +1795,13 @@ WW3DErrorType MeshGeometryClass::read_vertices(ChunkLoadClass & cload)
 		if (cload.Read(&vert,sizeof(W3dVectorStruct)) != sizeof(W3dVectorStruct)) {
 			return WW3D_ERROR_LOAD_FAILED;
 		}
-		
+
 		loc[i].X = vert.X;
 		loc[i].Y = vert.Y;
 		loc[i].Z = vert.Z;
 	}
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 
@@ -1830,7 +1831,7 @@ WW3DErrorType MeshGeometryClass::read_vertex_normals(ChunkLoadClass & cload)
 		mdlnorms[i].Set(norm.X,norm.Y,norm.Z);
 	}
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 
@@ -1879,7 +1880,7 @@ WW3DErrorType MeshGeometryClass::read_triangles(ChunkLoadClass & cload)
 		surface_types[i] = (uint8)(tri.Attributes);
 	}
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 
@@ -1908,7 +1909,7 @@ WW3DErrorType MeshGeometryClass::read_user_text(ChunkLoadClass & cload)
 	if (UserText != NULL) {
 		return WW3D_ERROR_OK;
 	}
-	
+
 	/*
 	** Allocate the buffer and read in the text
 	*/
@@ -1918,7 +1919,7 @@ WW3DErrorType MeshGeometryClass::read_user_text(ChunkLoadClass & cload)
 		return WW3D_ERROR_LOAD_FAILED;
 	}
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 
@@ -1945,11 +1946,11 @@ WW3DErrorType MeshGeometryClass::read_vertex_influences(ChunkLoadClass & cload)
 		if (cload.Read(&vinf,sizeof(W3dVertInfStruct)) != sizeof(W3dVertInfStruct)) {
 			return WW3D_ERROR_LOAD_FAILED;
 		}
-		links[i] = vinf.BoneIdx;		
-	}	
+		links[i] = vinf.BoneIdx;
+	}
 	Set_Flag(SKIN,true);
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 
@@ -2005,17 +2006,17 @@ void MeshGeometryClass::Scale(const Vector3 &sc)
 {
 	WWASSERT(Vertex);
 	Vector3 * vert = Vertex->Get_Array();
-	
+
 	for (int i=0;i<VertexCount; i++) {
 		vert[i].X *= sc.X;
 		vert[i].Y *= sc.Y;
 		vert[i].Z *= sc.Z;
 	}
-		
+
 	BoundBoxMin.Scale(sc);
 	BoundBoxMax.Scale(sc);
 	BoundSphereCenter.Scale(sc);
-	
+
 	float max;
 	max = (sc.X > sc.Y)	? sc.X	: sc.Y;
 	max = (max > sc.Z)	? max		: sc.Z;
@@ -2077,7 +2078,7 @@ void MeshGeometryClass::get_deformed_vertices(Vector3 *dst_vert, Vector3 *dst_no
 		const Matrix3D & tm = htree->Get_Transform(bonelink[vi]);
 
 		// Make a copy so we can set the translation to zero
-		Matrix3D mytm=tm;		
+		Matrix3D mytm=tm;
 
 		int idx=bonelink[vi];
 		int cnt;
@@ -2101,7 +2102,7 @@ void MeshGeometryClass::get_deformed_screenspace_vertices(Vector4 *dst_vert,cons
 
 	Vector3 * src_vert = Vertex->Get_Array();
 	int vertex_count=Get_Vertex_Count();
-	
+
 	if (Get_Flag(SKIN) && VertexBoneLink && htree) {
 		uint16 * bonelink = VertexBoneLink->Get_Array();
 		for (int vi = 0; vi < vertex_count;) {
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
index 4e65c36403b..beced9e1581 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
@@ -36,11 +36,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef MESHGEOMETRY_H
-#define MESHGEOMETRY_H
+#pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "bittype.h"
 #include "simplevec.h"
 #include "sharebuf.h"
@@ -70,7 +68,7 @@ typedef Vector3i16 TriIndex;
 ** The following two defines control two space-saving optimizations.  In Renegade I've found
 ** that the plane equations are about 8% of the geometry space and vertex normals are about 10%
 ** so I'm trying to see if we can get by without them.  The plane equations are mainly used
-** by collision detection functions and those are culled pretty well.  Anyway, collision is 
+** by collision detection functions and those are culled pretty well.  Anyway, collision is
 ** already so expensive that adding a cross product to it doesn't seem to matter.
 **
 ** NOTE: currently with optimizations enabled, memory gets trashed if you use OPTIMIZE_VNORM_RAM
@@ -82,8 +80,8 @@ typedef Vector3i16 TriIndex;
 
 /**
 ** MeshGeometryClass
-** This class encapsulates the geometry data for a triangle mesh. 
-*/ 
+** This class encapsulates the geometry data for a triangle mesh.
+*/
 
 class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListObjectClass
 {
@@ -108,7 +106,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 		DISABLE_BOUNDING_SPHERE				= 0x00000040,
 		DISABLE_PLANE_EQ						= 0x00000080,
 		TWO_SIDED								= 0x00000100,
-	
+
 		ALIGNED									= 0x00000200,
 		SKIN										= 0x00000400,
 		ORIENTED									= 0x00000800,
@@ -143,7 +141,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 	Vector3 *					Get_Vertex_Array(void)										{ WWASSERT(Vertex); return Vertex->Get_Array(); }
 	const Vector3 *			Get_Vertex_Normal_Array(void);
 	const Vector4 *			Get_Plane_Array(bool create = true);
-	void							Compute_Plane(int pidx,PlaneClass * set_plane) const;	
+	void							Compute_Plane(int pidx,PlaneClass * set_plane) const;
 	const uint32 *				Get_Vertex_Shade_Index_Array(bool create = true)	{ return get_shade_indices(create); }
 	const uint16 *				Get_Vertex_Bone_Links(void)								{ return get_bone_links(); }
 	uint8 *						Get_Poly_Surface_Type_Array(void)						{ WWASSERT(PolySurfaceType); return PolySurfaceType->Get_Array(); }
@@ -154,7 +152,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 
 	// exposed culling support
 	bool							Has_Cull_Tree(void)											{ return CullTree != NULL; }
-	
+
 	void							Generate_Rigid_APT(const Vector3 & view_dir, SimpleDynVecClass<uint32> & apt);
 	void							Generate_Rigid_APT(const OBBoxClass & local_box, SimpleDynVecClass<uint32> & apt);
 	void							Generate_Rigid_APT(const OBBoxClass & local_box, const Vector3 & view_dir, SimpleDynVecClass<uint32> & apt);
@@ -184,7 +182,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 	void							Scale(const Vector3 &sc);
 
 protected:
-	
+
 	// internal accessor functions that are not exposed to the user (non-const...)
 	TriIndex *					get_polys(void);
 	Vector3 *					get_vert_normals(void);
@@ -199,7 +197,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 	bool							cast_aabox_z90(AABoxCollisionTestClass & boxtest,const Vector3 & trans);
 	bool							cast_aabox_z180(AABoxCollisionTestClass & boxtest,const Vector3 & trans);
 	bool							cast_aabox_z270(AABoxCollisionTestClass & boxtest,const Vector3 & trans);
-	
+
 	bool							intersect_obbox_brute_force(OBBoxIntersectionTestClass & localtest);
 	bool							cast_ray_brute_force(RayCollisionTestClass & raytest);
 	bool							cast_aabox_brute_force(AABoxCollisionTestClass & boxtest);
@@ -211,7 +209,7 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 	virtual void				Compute_Bounds(Vector3 * verts);
 	void							Generate_Culling_Tree(void);
 
-	// W3D chunk reading	
+	// W3D chunk reading
 	WW3DErrorType				read_chunks(ChunkLoadClass & cload);
 	WW3DErrorType				read_vertices(ChunkLoadClass & cload);
 	WW3DErrorType				read_vertex_normals(ChunkLoadClass & cload);
@@ -226,18 +224,18 @@ class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListO
 	void get_deformed_vertices(Vector3 *dst_vert, Vector3 *dst_norm, const HTreeClass * htree);
 	void get_deformed_vertices(Vector3 *dst_vert, const HTreeClass * htree);
 	void get_deformed_screenspace_vertices(Vector4 *dst_vert,const RenderInfoClass & rinfo,const Matrix3D & mesh_tm,const HTreeClass * htree);
-	
+
 	// General info
 	ShareBufferClass<char> *							MeshName;
 	ShareBufferClass<char> *							UserText;
 	int														Flags;
 	char														SortLevel;
 	uint32													W3dAttributes;
-	
+
 	// Geometry
 	int														PolyCount;
 	int														VertexCount;
-		
+
 	ShareBufferClass<TriIndex> *						Poly;
 	ShareBufferClass<Vector3> *						Vertex;
 	ShareBufferClass<Vector3> *						VertexNorm;
@@ -293,6 +291,3 @@ inline uint8 MeshGeometryClass::Get_Poly_Surface_Type(int poly_index) const
 	uint8 *type = PolySurfaceType->Get_Array();
 	return type[poly_index];
 }
-
-#endif //MESHGEOMETRY_H
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp
index 5130b0520c5..f901d669038 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp
@@ -428,7 +428,7 @@ void MeshMatDescClass::Init_Alternate(MeshMatDescClass & default_materials,MeshM
 				Material[pass] = NEW_REF(VertexMaterialClass,(*(default_materials.Material[pass])));
 			} else {
 				if (default_materials.MaterialArray[pass]) {
-					WWDEBUG_SAY(("Unimplemented case: mesh has more than one default vertex material but no alternate vertex materials have been defined.\r\n"));
+					WWDEBUG_SAY(("Unimplemented case: mesh has more than one default vertex material but no alternate vertex materials have been defined."));
 				}
 				Material[pass] = NULL;
 			}
@@ -936,7 +936,7 @@ void MeshMatDescClass::Post_Load_Process(bool lighting_enabled,MeshModelClass *
 				}
 			}
 		}
-	}	
+	}
 }
 
 void MeshMatDescClass::Configure_Material(VertexMaterialClass * mtl,int pass,bool lighting_enabled)
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h
index 77445d0b1b8..d0bbc93eec9 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h
@@ -36,8 +36,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef MESHMATDESC_H
-#define MESHMATDESC_H
+#pragma once
 
 #include "always.h"
 #include "vector2.h"
@@ -63,7 +62,7 @@ class MeshMatDescClass : public W3DMPO
 	W3DMPO_GLUE(MeshMatDescClass)
 public:
 
-	enum 
+	enum
 	{
 		MAX_PASSES = 4,
 		MAX_TEX_STAGES = 2,
@@ -104,7 +103,7 @@ class MeshMatDescClass : public W3DMPO
 
 	int							Get_UV_Array_Count(void);
 	Vector2 *					Get_UV_Array_By_Index(int index, bool create = true);
-	
+
 	unsigned*					Get_DCG_Array(int pass);
 	unsigned*					Get_DIG_Array(int pass);
 	void							Set_DCG_Source(int pass,VertexMaterialClass::ColorSourceType source);
@@ -121,15 +120,15 @@ class MeshMatDescClass : public W3DMPO
 	** the "Get" functions add a reference before returning the pointer (if appropriate)
 	*/
 	VertexMaterialClass *	Get_Single_Material(int pass=0) const;
-	TextureClass *				Get_Single_Texture(int pass=0,int stage=0) const;	
+	TextureClass *				Get_Single_Texture(int pass=0,int stage=0) const;
 	ShaderClass					Get_Single_Shader(int pass=0) const;
 
 	/*
-	** the "Peek" functions just return the pointer and it's the caller's responsibility to 
+	** the "Peek" functions just return the pointer and it's the caller's responsibility to
 	** maintain a reference to an object with a reference to the data
 	*/
 	VertexMaterialClass *	Peek_Single_Material(int pass=0) const;
-	TextureClass *				Peek_Single_Texture(int pass=0,int stage=0) const;	
+	TextureClass *				Peek_Single_Texture(int pass=0,int stage=0) const;
 
 	void							Set_Material(int vidx,VertexMaterialClass * vmat,int pass=0);
 	void							Set_Shader(int pidx,ShaderClass shader,int pass=0);
@@ -147,10 +146,10 @@ class MeshMatDescClass : public W3DMPO
 	*/
 	bool							Has_UV(int pass,int stage)					{ return UVSource[pass][stage] != -1; }
 	bool							Has_Color_Array(int array)					{ return ColorArray[array] != NULL; }
-	
+
 	bool							Has_Texture_Data(int pass,int stage)	{ return (Texture[pass][stage] != NULL) || (TextureArray[pass][stage] != NULL); }
-	bool							Has_Shader_Data(int pass)					{ return (Shader[pass] != NullShader) || (ShaderArray[pass] != NULL); }					
-	bool							Has_Material_Data(int pass)				{ return (Material[pass] != NULL) || (MaterialArray[pass] != NULL); }				
+	bool							Has_Shader_Data(int pass)					{ return (Shader[pass] != NullShader) || (ShaderArray[pass] != NULL); }
+	bool							Has_Material_Data(int pass)				{ return (Material[pass] != NULL) || (MaterialArray[pass] != NULL); }
 
 	/*
 	** "Get" functions for Materials, Textures, and Shaders when there are more than one (per-polygon or per-vertex)
@@ -176,7 +175,7 @@ class MeshMatDescClass : public W3DMPO
 	void							Make_Color_Array_Unique(int index);
 
 	/*
-	** Post-Load processing, configures all materials to use the correct passes and 
+	** Post-Load processing, configures all materials to use the correct passes and
 	** material color sources, etc.
 	*/
 	void							Post_Load_Process(bool enable_lighting = true,MeshModelClass * parent = NULL);
@@ -190,22 +189,22 @@ class MeshMatDescClass : public W3DMPO
 	static ShaderClass NullShader;	// Used to mark no shader data
 
 protected:
-	
+
 	void							Configure_Material(VertexMaterialClass * mtl,int pass,bool lighting_enabled);
 	void							Disable_Backface_Culling(void);
 	void							Delete_Pass(int pass);
 
 	int													PassCount;
 	int													VertexCount;
-	int													PolyCount;	
+	int													PolyCount;
 
 	// u-v coordinates
 	UVBufferClass *									UV[MAX_UV_ARRAYS];
 	int													UVSource[MAX_PASSES][MAX_TEX_STAGES];
 
-	// vertex color arrays, we support two arrays: each can only be used on the 
+	// vertex color arrays, we support two arrays: each can only be used on the
 	// first pass.
-	ShareBufferClass<unsigned> *					ColorArray[2];	
+	ShareBufferClass<unsigned> *					ColorArray[2];
 	VertexMaterialClass::ColorSourceType		DCGSource[MAX_PASSES];
 	VertexMaterialClass::ColorSourceType		DIGSource[MAX_PASSES];
 
@@ -226,7 +225,7 @@ class MeshMatDescClass : public W3DMPO
 /**
 ** MatBufferClass
 ** This is a ShareBufferClass of pointers to vertex materials.  Should be written as a template...
-** Get and Peek work like normal, and all non-NULL pointers will be released when the buffer 
+** Get and Peek work like normal, and all non-NULL pointers will be released when the buffer
 ** is destroyed.
 */
 class MatBufferClass : public ShareBufferClass < VertexMaterialClass * >
@@ -248,7 +247,7 @@ class MatBufferClass : public ShareBufferClass < VertexMaterialClass * >
 
 /**
 ** TexBufferClass
-** This is a ShareBufferClass of pointers to textures.  Works just like MatBufferClass but with 
+** This is a ShareBufferClass of pointers to textures.  Works just like MatBufferClass but with
 ** TextureClass's...
 */
 class TexBufferClass : public ShareBufferClass < TextureClass * >
@@ -257,7 +256,7 @@ class TexBufferClass : public ShareBufferClass < TextureClass * >
 public:
 	TexBufferClass(int count, const char* msg) : ShareBufferClass<TextureClass *>(count, msg) { Clear(); }
 	TexBufferClass(const TexBufferClass & that);
-	~TexBufferClass(void);						
+	~TexBufferClass(void);
 
 	void				Set_Element(int index,TextureClass * mat);
 	TextureClass *	Get_Element(int index);
@@ -318,7 +317,7 @@ inline void MeshMatDescClass::Set_UV_Source(int pass,int stage,int sourceindex)
 	WWASSERT(pass < MAX_PASSES);
 	WWASSERT(stage >= 0);
 	WWASSERT(stage < MAX_TEX_STAGES);
-	UVSource[pass][stage] = sourceindex;	
+	UVSource[pass][stage] = sourceindex;
 }
 
 inline int MeshMatDescClass::Get_UV_Source(int pass,int stage)
@@ -479,7 +478,7 @@ inline bool MeshMatDescClass::Has_Texture_Array(int pass,int stage) const
 	return (TextureArray[pass][stage] != NULL);
 }
 
-inline void MeshMatDescClass::Disable_Backface_Culling(void) 
+inline void MeshMatDescClass::Disable_Backface_Culling(void)
 {
 	for (int pass = 0; pass < PassCount; pass++) {
 		Shader[pass].Set_Cull_Mode(ShaderClass::CULL_MODE_DISABLE);
@@ -490,6 +489,3 @@ inline void MeshMatDescClass::Disable_Backface_Culling(void)
 		}
 	}
 }
-
-#endif //MESHMATDESC_H
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp
index 5d8b9876b08..b83cbd89c12 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                    Org Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                      $Author:: Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/26/02 4:04p                                             $*
  *                                                                                             *
  *                    $Revision:: 48                                                          $*
@@ -52,8 +52,8 @@
 
 /*
 ** Temporary Buffers
-** These buffers are used by the skin code for temporary storage of the deformed vertices and 
-** vertex normals.  
+** These buffers are used by the skin code for temporary storage of the deformed vertices and
+** vertex normals.
 */
 static DynamicVectorClass<Vector3>	_TempVertexBuffer;
 static DynamicVectorClass<Vector3>	_TempNormalBuffer;
@@ -79,9 +79,9 @@ MeshModelClass::MeshModelClass(void) :
 
 	DefMatDesc = W3DNEW MeshMatDescClass;
 	CurMatDesc = DefMatDesc;
-	
+
 	MatInfo = NEW_REF( MaterialInfoClass, () );
-	
+
 	return ;
 }
 
@@ -110,13 +110,9 @@ MeshModelClass::~MeshModelClass(void)
 	Reset(0,0,0);
 	REF_PTR_RELEASE(MatInfo);
 
-	if (DefMatDesc != NULL) {
-		delete DefMatDesc;
-	}
-	if (AlternateMatDesc != NULL) {
-		delete AlternateMatDesc;
-	}
-	return ;
+	delete DefMatDesc;
+	delete AlternateMatDesc;
+
 }
 
 MeshModelClass & MeshModelClass::operator = (const MeshModelClass & that)
@@ -131,10 +127,8 @@ MeshModelClass & MeshModelClass::operator = (const MeshModelClass & that)
 		*DefMatDesc = *(that.DefMatDesc);
 		CurMatDesc = DefMatDesc;
 
-		if (AlternateMatDesc != NULL) {
-			delete AlternateMatDesc;
-			AlternateMatDesc = NULL;
-		}
+		delete AlternateMatDesc;
+		AlternateMatDesc = NULL;
 
 		if (that.AlternateMatDesc != NULL) {
 			AlternateMatDesc = W3DNEW MeshMatDescClass(*(that.AlternateMatDesc));
@@ -142,12 +136,12 @@ MeshModelClass & MeshModelClass::operator = (const MeshModelClass & that)
 
 		clone_materials(that);
 
-		if (GapFiller) {
-			// DMS - using approriate deallocation method
-			delete GapFiller;
-			GapFiller=NULL;
-		}
-		if (that.GapFiller) GapFiller=W3DNEW GapFillerClass(*that.GapFiller);
+		// DMS - using approriate deallocation method
+		delete GapFiller;
+		GapFiller=NULL;
+
+		if (that.GapFiller)
+			GapFiller=W3DNEW GapFillerClass(*that.GapFiller);
 	}
 	return * this;
 }
@@ -167,10 +161,10 @@ void MeshModelClass::Reset(int polycount,int vertcount,int passcount)
 
 	MatInfo->Reset();
 	DefMatDesc->Reset(polycount,vertcount,passcount);
-	if (AlternateMatDesc != NULL) {
-		delete AlternateMatDesc;
-		AlternateMatDesc = NULL;
-	}
+
+	delete AlternateMatDesc;
+	AlternateMatDesc = NULL;
+
 	CurMatDesc = DefMatDesc;
 
 	return ;
@@ -184,7 +178,7 @@ void MeshModelClass::Register_For_Rendering()
 		if (WW3D::Get_NPatches_Gap_Filling_Mode()!=WW3D::NPATCHES_GAP_FILLING_DISABLED) {
 			Init_For_NPatch_Rendering();
 		}
-		else if (GapFiller) {
+		else {
 			delete GapFiller;
 			GapFiller=NULL;
 		}
@@ -193,7 +187,7 @@ void MeshModelClass::Register_For_Rendering()
 		if (WW3D::Get_NPatches_Gap_Filling_Mode()==WW3D::NPATCHES_GAP_FILLING_FORCE) {
 			Init_For_NPatch_Rendering();
 		}
-		else if (GapFiller) {
+		else {
 			delete GapFiller;
 			GapFiller=NULL;
 		}
@@ -234,7 +228,7 @@ void MeshModelClass::Replace_VertexMaterial(VertexMaterialClass* vmat,VertexMate
 {
 	WWASSERT(vmat);
 	WWASSERT(new_vmat);
-	
+
 	for (int pass=0;pass<Get_Pass_Count();++pass) {
 		if (Has_Material_Array(pass)) {
 			for (int i=0;i<Get_Vertex_Count();++i) {
@@ -254,7 +248,7 @@ void MeshModelClass::Replace_VertexMaterial(VertexMaterialClass* vmat,VertexMate
 		if (fvf_category) {
 			fvf_category->Change_Polygon_Renderer_Material(PolygonRendererList,vmat,new_vmat,pass);
 		}
-	}	
+	}
 }
 
 DX8FVFCategoryContainer* MeshModelClass::Peek_FVF_Category_Container()
@@ -293,13 +287,13 @@ void MeshModelClass::Make_Geometry_Unique()
 	ShareBufferClass<Vector3> * unique_verts = NEW_REF(ShareBufferClass<Vector3>,(*Vertex));
 	REF_PTR_SET(Vertex,unique_verts);
 	REF_PTR_RELEASE(unique_verts);
-	
+
 	ShareBufferClass<Vector3> * norms = NEW_REF(ShareBufferClass<Vector3>,(*VertexNorm));
 	REF_PTR_SET(VertexNorm,norms);
 	REF_PTR_RELEASE(norms);
 
 #if (!OPTIMIZE_PLANEEQ_RAM)
-	ShareBufferClass<Vector4> * peq = NEW_REF(ShareBufferClass<Vector4>,(*PlaneEq, "MeshModelClass::PlaneEq"));	
+	ShareBufferClass<Vector4> * peq = NEW_REF(ShareBufferClass<Vector4>,(*PlaneEq, "MeshModelClass::PlaneEq"));
 	REF_PTR_SET(PlaneEq,peq);
 	REF_PTR_RELEASE(peq);
 #endif
@@ -320,13 +314,13 @@ void MeshModelClass::Enable_Alternate_Material_Description(bool onoff)
 	if ((onoff == true) && (AlternateMatDesc != NULL)) {
 		if (CurMatDesc != AlternateMatDesc) {
 			CurMatDesc = AlternateMatDesc;
-			
+
 			if (Get_Flag(SORT) && WW3D::Is_Munge_Sort_On_Load_Enabled())
 				compute_static_sort_levels();
 
 			if (WW3D::Is_Overbright_Modify_On_Load_Enabled())
 				modify_for_overbright();
-			
+
 			// TODO: Invalidate just this meshes DX8 data!!!
 			TheDX8MeshRenderer.Invalidate();
 		}
@@ -387,7 +381,7 @@ struct TriangleSide
 	}
 	TriangleSide() {}
 
-	bool operator== (const TriangleSide& s) 
+	bool operator== (const TriangleSide& s)
 	{
 		unsigned i=*(unsigned*)&loc1[0]^*(unsigned*)&s.loc1[0];
 		i|=*(unsigned*)&loc1[1]^*(unsigned*)&s.loc1[1];
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h
index cbb1814a7c4..c94234d9e13 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MESHMDL_H
-#define MESHMDL_H
 
 #include "vector2.h"
 #include "vector3.h"
@@ -100,13 +94,13 @@ struct VertexFormatXYZNDUV2;
 ** Copy/Add_Ref Rules:
 ** The purpose of this model was to share data between models whenever possible.  To this
 ** end, some of the arrays of data are handled differently:
-** 
+**
 ** ALWAYS SHARED: These are *ALWAYS* Add_Ref'd and thus all point to the same array
 ** Poly - Connectivity of a mesh are always shared (cannot be changed at runtime)
 ** VertexShadeIdx - Shade indices of a mesh are always shared (cannot be changed at runtime)
 ** VertexInfluences - Vertex bone attachments are always shared (cannot be changed at runtime)
 **
-** SHARED UNTIL SCALED, SKIN DEFORMED, or DAMAGED:  
+** SHARED UNTIL SCALED, SKIN DEFORMED, or DAMAGED:
 ** Vertex - vertex positions must be copied if any are moved...
 ** VertexNorm - vertex normals cannot be shared if a vertex is moved
 ** PlaneEq - plane equations cannot be shared if a vertex is moved
@@ -155,16 +149,16 @@ class MeshModelClass : public MeshGeometryClass
 {
 	W3DMPO_GLUE(MeshModelClass)
 
-public:	
+public:
 
 	MeshModelClass(void);
 	MeshModelClass(const MeshModelClass & that);
 	~MeshModelClass(void);
-	
+
 	MeshModelClass & operator = (const MeshModelClass & that);
 	void							Reset(int polycount,int vertcount,int passcount);
 	void							Register_For_Rendering();
-	void							Shadow_Render(SpecialRenderInfoClass & rinfo,const Matrix3D & tm,const HTreeClass * htree);	
+	void							Shadow_Render(SpecialRenderInfoClass & rinfo,const Matrix3D & tm,const HTreeClass * htree);
 
 	/////////////////////////////////////////////////////////////////////////////////////
 	// Material interface, All of these functions call through to the current
@@ -172,7 +166,7 @@ class MeshModelClass : public MeshGeometryClass
 	/////////////////////////////////////////////////////////////////////////////////////
 	void							Set_Pass_Count(int passes)														{ CurMatDesc->Set_Pass_Count(passes); }
 	int							Get_Pass_Count(void) const														{ return CurMatDesc->Get_Pass_Count(); }
-	
+
 	const Vector2 *			Get_UV_Array(int pass = 0, int stage = 0)									{ return CurMatDesc->Get_UV_Array(pass,stage); }
 	int							Get_UV_Array_Count(void)														{ return CurMatDesc->Get_UV_Array_Count(); }
 	const Vector2 *			Get_UV_Array_By_Index(int index)												{ return CurMatDesc->Get_UV_Array_By_Index(index, false); }
@@ -190,10 +184,10 @@ class MeshModelClass : public MeshGeometryClass
 
 	// the "Get" functions add a reference before returning the pointer (if appropriate)
 	VertexMaterialClass *	Get_Single_Material(int pass=0) const										{ return CurMatDesc->Get_Single_Material(pass); }
-	TextureClass *				Get_Single_Texture(int pass=0,int stage=0) const						{ return CurMatDesc->Get_Single_Texture(pass,stage); }	
+	TextureClass *				Get_Single_Texture(int pass=0,int stage=0) const						{ return CurMatDesc->Get_Single_Texture(pass,stage); }
 	ShaderClass					Get_Single_Shader(int pass=0) const											{ return CurMatDesc->Get_Single_Shader(pass); }
 
-	// the "Peek" functions just return the pointer and it's the caller's responsibility to 
+	// the "Peek" functions just return the pointer and it's the caller's responsibility to
 	// maintain a reference to an object with a reference to the data
 	VertexMaterialClass *	Peek_Single_Material(int pass=0) const										{ return CurMatDesc->Peek_Single_Material(pass); }
 	TextureClass *				Peek_Single_Texture(int pass=0,int stage=0) const						{ return CurMatDesc->Peek_Single_Texture(pass,stage); }
@@ -319,7 +313,7 @@ class MeshModelClass : public MeshGeometryClass
 	void install_materials(MeshLoadContextClass * loadinfo);
 	void clone_materials(const MeshModelClass & srcmesh);
 	void install_alternate_material_desc(MeshLoadContextClass * context);
-	
+
 	// Material Descriptions
 	// DefMatDesc - the default material description, allocated in constructor, always present.
 	// AlternateMatDes - an optional alternate material description, allocated at load time if needed
@@ -330,7 +324,7 @@ class MeshModelClass : public MeshGeometryClass
 
 	// Collection of the unique materials in the mesh
 	MaterialInfoClass	*									MatInfo;
-	
+
 	// DX8 Mesh rendering system data
 	DX8PolygonRendererList								PolygonRendererList;
 
@@ -346,12 +340,3 @@ class MeshModelClass : public MeshGeometryClass
 	friend class DX8MeshRendererClass;
 	friend class DX8PolygonRendererClass;
 };
-
-
-
-
-
-
-
-#endif
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
index 9cfcad01d74..e4c76ef83e2 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
@@ -34,15 +34,15 @@
  * Functions:                                                                                  *
  *   MeshModelClass::Load_W3D -- Load a mesh from a W3D file                                   *
  *   MeshModelClass::read_chunks -- read all of the chunks for a mesh                          *
- *   MeshModelClass::read_vertices -- reads the vertex chunk                                   * 
+ *   MeshModelClass::read_vertices -- reads the vertex chunk                                   *
  *   MeshModelClass::read_texcoords -- read in the texture coordinates chunk                   *
- *   MeshModelClass::read_vertex_normals -- reads a vertex normal chunk from the w3d file      * 
+ *   MeshModelClass::read_vertex_normals -- reads a vertex normal chunk from the w3d file      *
  *   MeshModelClass::read_v3_materials -- Reads in version 3 materials.                        *
  *   MeshModelClass::read_triangles -- read the triangles chunk                                *
  *   MeshModelClass::read_per_tri_materials -- read the material indices for each triangle     *
- *   MeshModelClass::read_user_text -- read in the user text chunk                             * 
- *   MeshModelClass::read_vertex_colors -- read in the vertex colors chunk                     * 
- *   MeshModelClass::read_vertex_influences -- read in the vertex influences chunk             * 
+ *   MeshModelClass::read_user_text -- read in the user text chunk                             *
+ *   MeshModelClass::read_vertex_colors -- read in the vertex colors chunk                     *
+ *   MeshModelClass::read_vertex_influences -- read in the vertex influences chunk             *
  *   MeshModelClass::read_vertex_shade_indices -- read the shade index chunk                   *
  *   MeshModelClass::read_material_info -- read the material info chunk                        *
  *   MeshModelClass::read_shaders -- read the shaders chunk                                    *
@@ -90,8 +90,6 @@
 #include "realcrc.h"
 #include "dx8wrapper.h"
 
-#include <stdio.h>
-
 #ifdef _UNIX
 #include "osdep/osdep.h"
 #endif
@@ -117,7 +115,7 @@ class MeshLoadContextClass : public W3DMPO
 private:
 	MeshLoadContextClass(void);
 	~MeshLoadContextClass(void);
-	
+
 	W3dTexCoordStruct *		Get_Texcoord_Array(void);
 
 	int							Add_Shader(ShaderClass shader);
@@ -127,13 +125,13 @@ class MeshLoadContextClass : public W3DMPO
 	ShaderClass					Peek_Shader(int index)											{ return Shaders[index]; }
 	VertexMaterialClass *	Peek_Vertex_Material(int index)								{ return VertexMaterials[index]; }
 	TextureClass *				Peek_Texture(int index)											{ return Textures[index]; }
-	
+
 	int							Shader_Count(void)												{ return Shaders.Count(); }
 	int							Vertex_Material_Count(void)									{ return VertexMaterials.Count(); }
 	int							Texture_Count(void)												{ return Textures.Count(); }
 
 	/*
-	** Legacy material support.  
+	** Legacy material support.
 	*/
 	void							Add_Legacy_Material(ShaderClass shader,VertexMaterialClass * vmat,TextureClass * tex);
 	ShaderClass					Peek_Legacy_Shader(int legacy_material_index);
@@ -152,7 +150,7 @@ class MeshLoadContextClass : public W3DMPO
 	** for linking the emissive material color to an array seems poor, We're just going to multiply
 	** the DIG array into the DCG array (or make it the DCG array).  Now, to properly support the
 	** "alternate material set", we have to know whether we've already encountered a DIG chunk so
-	** these flags provide that functionality. 
+	** these flags provide that functionality.
 	*/
 	void							Notify_Loaded_DIG_Chunk(bool onoff = true)				{ LoadedDIG = onoff; }
 	bool							Already_Loaded_DIG(void)										{ return LoadedDIG; }
@@ -162,16 +160,16 @@ class MeshLoadContextClass : public W3DMPO
 	struct LegacyMaterialClass
 	{
 		LegacyMaterialClass(void) : VertexMaterialIdx(0),ShaderIdx(0),TextureIdx(0)	{ }
-		~LegacyMaterialClass(void)	{ }		
+		~LegacyMaterialClass(void)	{ }
 		void		Set_Name(const char * name) { Name=name; }
-		
+
 		StringClass Name;
 		int		VertexMaterialIdx;
 		int		ShaderIdx;
 		int		TextureIdx;
 	};
-	
-	
+
+
 	W3dMeshHeader3Struct		Header;
 	W3dTexCoordStruct *		TexCoords;
 	W3dMaterialInfoStruct	MatInfo;
@@ -185,11 +183,11 @@ class MeshLoadContextClass : public W3DMPO
 	DynamicVectorClass < ShaderClass >					Shaders;
 	DynamicVectorClass < VertexMaterialClass * >		VertexMaterials;
 	DynamicVectorClass < unsigned long >				VertexMaterialCrcs;
-	DynamicVectorClass < TextureClass * >				Textures;			
+	DynamicVectorClass < TextureClass * >				Textures;
 
 	/*
-	** Alternate material data.  Any alternate material data will be loaded into 
-	** this MeshMatDescClass object.  When loading is finished, an alternate MeshMatDescClass 
+	** Alternate material data.  Any alternate material data will be loaded into
+	** this MeshMatDescClass object.  When loading is finished, an alternate MeshMatDescClass
 	** will be allocated in the mesh model.  This MeshMatDescClass will be initialized to be
 	** identical to the default MeshMatDescClass and then any data contained in this
 	** MeshMatDescClass will replace the relevant arrays.
@@ -244,12 +242,12 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 	**	Open the first chunk, it should be the mesh header
 	*/
 	cload.Open_Chunk();
-	
+
 	if (cload.Cur_Chunk_ID() != W3D_CHUNK_MESH_HEADER3) {
-		WWDEBUG_SAY(("Old format mesh mesh, no longer supported.\n"));
+		WWDEBUG_SAY(("Old format mesh mesh, no longer supported."));
 		goto Error;
 	}
-	
+
 	context = W3DNEW MeshLoadContextClass;
 
 	if (cload.Read(&(context->Header),sizeof(W3dMeshHeader3Struct)) != sizeof(W3dMeshHeader3Struct)) {
@@ -262,22 +260,22 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 	*/
 	char *	tmpname;
 	int		namelen;
-	
+
 	Reset(context->Header.NumTris,context->Header.NumVertices,1);
-	
+
 	namelen = strlen(context->Header.ContainerName);
 	namelen += strlen(context->Header.MeshName);
 	namelen += 2;
-	W3dAttributes = context->Header.Attributes;	
+	W3dAttributes = context->Header.Attributes;
 	SortLevel = context->Header.SortLevel;
 	tmpname = W3DNEWARRAY char[namelen];
 	memset(tmpname,0,namelen);
 
 	if (strlen(context->Header.ContainerName) > 0) {
 		strcpy(tmpname,context->Header.ContainerName);
-		strcat(tmpname,".");
+		strcat(tmpname, ".");
 	}
-	strcat(tmpname,context->Header.MeshName);
+	strcat(tmpname, context->Header.MeshName);
 
 	Set_Name(tmpname);
 
@@ -301,7 +299,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 	*/
 	if (context->Header.Version >= W3D_MAKE_VERSION(4,1)) {
 		int geometry_type = context->Header.Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK;
-		switch (geometry_type) 
+		switch (geometry_type)
 		{
 			case W3D_MESH_FLAG_GEOMETRY_TYPE_NORMAL:
 				break;
@@ -315,7 +313,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 				Set_Flag(SKIN,true);
 				Set_Flag(ALLOW_NPATCHES,true);
 				break;
-		} 
+		}
 	}
 
 	if (context->Header.Attributes & W3D_MESH_FLAG_TWO_SIDED) {
@@ -344,7 +342,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 					Set_Flag (PRELIT_LIGHTMAP_MULTI_TEXTURE, true);
 					break;
 				}
-				// Else fall thru...
+				FALLTHROUGH; // Else fall thru...
 
 			case WW3D::PRELIT_MODE_LIGHTMAP_MULTI_PASS:
 				if (context->Header.Attributes & W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_PASS) {
@@ -352,7 +350,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 					Set_Flag (PRELIT_LIGHTMAP_MULTI_PASS, true);
 					break;
 				}
-				// Else fall thru...
+				FALLTHROUGH; // Else fall thru...
 
 			case WW3D::PRELIT_MODE_VERTEX:
 				if (context->Header.Attributes & W3D_MESH_FLAG_PRELIT_VERTEX) {
@@ -360,7 +358,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 					Set_Flag (PRELIT_VERTEX, true);
 					break;
 				}
-				// Else fall thru...
+				FALLTHROUGH; // Else fall thru...
 
 			default:
 
@@ -371,7 +369,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 		}
 
 	} else {
-		
+
 		// For backwards compatibility, test for obsolete lightmap flag.
 		if (context->Header.Attributes & OBSOLETE_W3D_MESH_FLAG_LIGHTMAPPED) {
 			Set_Flag (PRELIT_LIGHTMAP_MULTI_PASS, true);
@@ -390,7 +388,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 
 		uint16 * links = get_bone_links();
 		WWASSERT(links);
-		
+
 		for (int bi = 0; bi < Get_Vertex_Count(); bi++) {
 			links[bi] += 1;
 		}
@@ -400,7 +398,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 	** If this mesh is collideable and no AABTree was in the file, generate one now
 	*/
 	if (	(((W3dAttributes & W3D_MESH_FLAG_COLLISION_TYPE_MASK) >> W3D_MESH_FLAG_COLLISION_TYPE_SHIFT) != 0) &&
-			(CullTree == NULL)) 
+			(CullTree == NULL))
 	{
 		Generate_Culling_Tree();
 	}
@@ -440,7 +438,7 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
  * HISTORY:                                                                                    *
  *   2/16/99    GTH : Created.                                                                 *
  *=============================================================================================*/
-WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContextClass * context) 
+WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContextClass * context)
 {
 	/*
 	**	Read in the chunk header
@@ -458,7 +456,7 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
 
 			case W3D_CHUNK_VERTICES:
 					// call up to MeshGeometryClass
-					error = read_vertices(cload);		
+					error = read_vertices(cload);
 					break;
 
 			case W3D_CHUNK_SURRENDER_NORMALS:
@@ -472,20 +470,20 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
 					break;
 
 			case O_W3D_CHUNK_MATERIALS:
-			case O_W3D_CHUNK_MATERIALS2:		
-					WWDEBUG_SAY(( "Obsolete material chunk encountered in mesh: %s.%s\r\n", context->Header.ContainerName,context->Header.MeshName));
+			case O_W3D_CHUNK_MATERIALS2:
+					WWDEBUG_SAY(( "Obsolete material chunk encountered in mesh: %s.%s", context->Header.ContainerName,context->Header.MeshName));
 					WWASSERT(0);
 					break;
 
 			case W3D_CHUNK_MATERIALS3:
-					WWDEBUG_SAY(( "Obsolete material chunk encountered in mesh: %s.%s\r\n", context->Header.ContainerName,context->Header.MeshName));
+					WWDEBUG_SAY(( "Obsolete material chunk encountered in mesh: %s.%s", context->Header.ContainerName,context->Header.MeshName));
 					error = read_v3_materials(cload,context);
 					break;
-				
+
 			case O_W3D_CHUNK_SURRENDER_TRIANGLES:
-					WWASSERT_PRINT( 0, "Obsolete Triangle Chunk Encountered!\r\n" );
+					WWASSERT_PRINT( 0, "Obsolete Triangle Chunk Encountered!" );
 					break;
-			
+
 			case W3D_CHUNK_TRIANGLES:
 					// call up to MeshGeometryClass
 					error = read_triangles(cload);
@@ -499,7 +497,7 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
 					// call up to MeshGeometryClass
 					error = read_user_text(cload);
 					break;
-			
+
 			case W3D_CHUNK_VERTEX_COLORS:
 					error = read_vertex_colors(cload,context);
 					break;
@@ -535,11 +533,11 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
 					break;
 
 			case W3D_CHUNK_DEFORM:
-					WWDEBUG_SAY(("Obsolete deform chunk encountered in mesh: %s.%s\r\n", context->Header.ContainerName,context->Header.MeshName));
+					WWDEBUG_SAY(("Obsolete deform chunk encountered in mesh: %s.%s", context->Header.ContainerName,context->Header.MeshName));
 					break;
-			
+
 			case W3D_CHUNK_DAMAGE:
-					WWDEBUG_SAY(("Obsolete damage chunk encountered in mesh: %s.%s\r\n", context->Header.ContainerName,context->Header.MeshName));
+					WWDEBUG_SAY(("Obsolete damage chunk encountered in mesh: %s.%s", context->Header.ContainerName,context->Header.MeshName));
 					break;
 
 			case W3D_CHUNK_PRELIT_UNLIT:
@@ -548,7 +546,7 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
 			case W3D_CHUNK_PRELIT_LIGHTMAP_MULTI_TEXTURE:
 					read_prelit_material (cload, context);
 					break;
-			
+
 			case W3D_CHUNK_AABTREE:
 					// call up to MeshGeometryClass
 					read_aabtree(cload);
@@ -557,8 +555,8 @@ WW3DErrorType MeshModelClass::read_chunks(ChunkLoadClass & cload,MeshLoadContext
 			default:
 					break;
 
-		}	
-		
+		}
+
 		cload.Close_Chunk();
 
 		if (error != WW3D_ERROR_OK) {
@@ -603,11 +601,11 @@ WW3DErrorType MeshModelClass::read_texcoords(ChunkLoadClass & cload,MeshLoadCont
 			}
 			uvarray[i].Set(texcoord.U,1.0f - texcoord.V);
 		}
-	
+
 		DefMatDesc->Install_UV_Array(context->CurPass,context->CurTexStage,uvarray,elementcount);
 	}
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 /***********************************************************************************************
@@ -645,7 +643,7 @@ WW3DErrorType MeshModelClass::read_v3_materials(ChunkLoadClass & cload,MeshLoadC
 		** W3D_MATERIAL3_SC_MAP - specular color map
 		** W3D_MATERIAL3_SI_MAP - specular illumination map
 		*/
-		VertexMaterialClass *		vmat = NULL;	
+		VertexMaterialClass *		vmat = NULL;
 		ShaderClass						shader;
 		TextureClass *					tex = NULL;
 		char								name[256];
@@ -677,7 +675,7 @@ WW3DErrorType MeshModelClass::read_v3_materials(ChunkLoadClass & cload,MeshLoadC
 			if (shader.Get_Dst_Blend_Func() != ShaderClass::DSTBLEND_ZERO) {
 				Set_Flag(MeshModelClass::SORT,true);
 			}
-	
+
 		if (!cload.Close_Chunk()) goto Error;
 
 		/*
@@ -706,7 +704,7 @@ WW3DErrorType MeshModelClass::read_v3_materials(ChunkLoadClass & cload,MeshLoadC
 				if (!cload.Close_Chunk()) goto Error;
 
 				if ( mapinfo.FrameCount > 1 ) {
-					WWDEBUG_SAY(("ERROR: Obsolete Animated Texture detected in model: %s\r\n",context->Header.MeshName));
+					WWDEBUG_SAY(("ERROR: Obsolete Animated Texture detected in model: %s",context->Header.MeshName));
 				}
 
 				tex = WW3DAssetManager::Get_Instance()->Get_Texture(filename);
@@ -738,9 +736,9 @@ WW3DErrorType MeshModelClass::read_v3_materials(ChunkLoadClass & cload,MeshLoadC
 						if (cload.Cur_Chunk_ID() != W3D_CHUNK_MAP3_INFO) goto Error;
 						if (cload.Read(&mapinfo,sizeof(W3dMap3Struct)) != sizeof(W3dMap3Struct)) goto Error;
 					if (!cload.Close_Chunk()) goto Error;
-			
+
 					if ( mapinfo.FrameCount > 1 ) {
-						WWDEBUG_SAY(("ERROR: Obsolete Animated Texture detected in model: %s\r\n",context->Header.MeshName));
+						WWDEBUG_SAY(("ERROR: Obsolete Animated Texture detected in model: %s",context->Header.MeshName));
 					}
 
 					tex = WW3DAssetManager::Get_Instance()->Get_Texture(filename);
@@ -762,7 +760,7 @@ WW3DErrorType MeshModelClass::read_v3_materials(ChunkLoadClass & cload,MeshLoadC
 			vmat->Set_Ambient( color );
 			vmat->Set_Diffuse( Vector3( 0, 0, 0 ) );
 		}
-		
+
 		context->Add_Legacy_Material(shader,vmat,tex);
 
 		vmat->Release_Ref();
@@ -791,7 +789,7 @@ WW3DErrorType MeshModelClass::read_v3_materials(ChunkLoadClass & cload,MeshLoadC
 		Set_Single_Shader(context->Peek_Shader(0),0);
 	}
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 
 Error:
 
@@ -862,24 +860,24 @@ WW3DErrorType MeshModelClass::read_per_tri_materials(ChunkLoadClass & cload,Mesh
 }
 
 
-/*********************************************************************************************** 
- * MeshModelClass::read_vertex_colors -- read in the vertex colors chunk                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   10/28/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MeshModelClass::read_vertex_colors -- read in the vertex colors chunk                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   10/28/1997 GH  : Created.                                                                 *
  *   2/16/99    GTH : Moved into MeshModelClass                                                *
  *=============================================================================================*/
 WW3DErrorType MeshModelClass::read_vertex_colors(ChunkLoadClass & cload,MeshLoadContextClass * context)
 {
 	/*
 	** The W3D file format supports arbitrary vertex color arrays for each pass; however since
-	** our conversion to hardware T&L, we only support two unique color arrays.  So here is 
+	** our conversion to hardware T&L, we only support two unique color arrays.  So here is
 	** what is happening in this function:
 	**
 	** 1 - If this is the first diffuse color array we've encountered, load the values
@@ -901,11 +899,11 @@ WW3DErrorType MeshModelClass::read_vertex_colors(ChunkLoadClass & cload,MeshLoad
 			Vector4 col;
 			col.Set((float)color.R / 255.0f,(float)color.G / 255.0f,(float)color.B / 255.0f, 1.0f);
 			dcg[i]=DX8Wrapper::Convert_Color(col);
-		}	
+		}
 	}
 	CurMatDesc->Set_DCG_Source(context->CurPass,VertexMaterialClass::COLOR1);
 
-	return WW3D_ERROR_OK;	
+	return WW3D_ERROR_OK;
 }
 
 
@@ -1004,7 +1002,7 @@ WW3DErrorType MeshModelClass::read_vertex_materials(ChunkLoadClass & cload,MeshL
  *   3/05/99	 PDS : Broke the guts of this function into a util function in texture.cpp		  *
  *=============================================================================================*/
 WW3DErrorType MeshModelClass::read_textures(ChunkLoadClass & cload,MeshLoadContextClass * context)
-{	
+{
 	// Keep reading textures until there are no more...
 	for (TextureClass *newtex = ::Load_Texture (cload);
 		  newtex != NULL;
@@ -1100,16 +1098,16 @@ WW3DErrorType MeshModelClass::read_vertex_material_ids(ChunkLoadClass & cload,Me
 	}
 
 	/*
-	** This chunk will either have a single index in it or an array of indices 
+	** This chunk will either have a single index in it or an array of indices
 	** with the length equal to the vertex count.
 	*/
 	uint32 vmat;
 #if (!MESH_SINGLE_MATERIAL_HACK)
 	if (cload.Cur_Chunk_Length() == 1*sizeof(uint32)) {
-		
+
 		cload.Read(&vmat,sizeof(uint32));
 		matdesc->Set_Single_Material(context->Peek_Vertex_Material(vmat),context->CurPass);
-	
+
 	} else {
 
 		for (int i=0; i<Get_Vertex_Count(); i++) {
@@ -1156,13 +1154,13 @@ WW3DErrorType MeshModelClass::read_shader_ids(ChunkLoadClass & cload,MeshLoadCon
 	uint32 shaderid;
 #if (!MESH_SINGLE_MATERIAL_HACK)
 	if (cload.Cur_Chunk_Length() == 1*sizeof(uint32)) {
-		
+
 		cload.Read(&shaderid,sizeof(shaderid));
 		ShaderClass shader = context->Peek_Shader(shaderid);
 		matdesc->Set_Single_Shader(shader,context->CurPass);
 
 		// turn on sorting of pass 0 has non-zero dest blend (unless alpha testing on)
-		if (	(context->CurPass == 0) && 
+		if (	(context->CurPass == 0) &&
 				(shader.Get_Dst_Blend_Func() != ShaderClass::DSTBLEND_ZERO) &&
 				(shader.Get_Alpha_Test() == ShaderClass::ALPHATEST_DISABLE) &&
 				(SortLevel == SORT_LEVEL_NONE) )
@@ -1173,16 +1171,16 @@ WW3DErrorType MeshModelClass::read_shader_ids(ChunkLoadClass & cload,MeshLoadCon
 			Set_Flag(SORT,true);
 #endif
 		}
-		
+
 	} else {
-		
+
 		for (int i=0; i<Get_Polygon_Count(); i++) {
 			cload.Read(&shaderid,sizeof(uint32));
 			ShaderClass shader = context->Peek_Shader(shaderid);
 			matdesc->Set_Shader(i,shader,context->CurPass);
 
 			// turn on sorting of pass 0 has non-zero dest blend (unless alpha testing on)
-			if (	(context->CurPass == 0) && 
+			if (	(context->CurPass == 0) &&
 				(shader.Get_Dst_Blend_Func() != ShaderClass::DSTBLEND_ZERO) &&
 				(shader.Get_Alpha_Test() == ShaderClass::ALPHATEST_DISABLE) &&
 				(SortLevel == SORT_LEVEL_NONE) )
@@ -1203,7 +1201,7 @@ WW3DErrorType MeshModelClass::read_shader_ids(ChunkLoadClass & cload,MeshLoadCon
 		matdesc->Set_Single_Shader(shader,context->CurPass);
 
 		// turn on sorting of pass 0 has non-zero dest blend (unless alpha testing on)
-		if (	(context->CurPass == 0) && 
+		if (	(context->CurPass == 0) &&
 				(shader.Get_Dst_Blend_Func() != ShaderClass::DSTBLEND_ZERO) &&
 				(shader.Get_Alpha_Test() == ShaderClass::ALPHATEST_DISABLE) &&
 				(SortLevel == SORT_LEVEL_NONE) )
@@ -1246,7 +1244,7 @@ WW3DErrorType MeshModelClass::read_dcg(ChunkLoadClass & cload,MeshLoadContextCla
 
 	/*
 	** The W3D file format supports arbitrary vertex color arrays for each pass; however since
-	** our conversion to hardware T&L, we only support two unique color arrays.  So here is 
+	** our conversion to hardware T&L, we only support two unique color arrays.  So here is
 	** what is happening in this function:
 	**
 	** 1 - If this is the first diffuse color array we've encountered, load the values.
@@ -1269,7 +1267,7 @@ WW3DErrorType MeshModelClass::read_dcg(ChunkLoadClass & cload,MeshLoadContextCla
 			dcg[i]=DX8Wrapper::Convert_Color(col);
 		}
 	} else if (context->PrelitChunkID==W3D_CHUNK_PRELIT_VERTEX) {
-		
+
 		W3dRGBAStruct color;
 		unsigned * dcg = matdesc->Get_Color_Array(0);
 
@@ -1315,7 +1313,7 @@ WW3DErrorType MeshModelClass::read_dig(ChunkLoadClass & cload,MeshLoadContextCla
 
 	/*
 	** It appears that there isn't wide support for having the emissive material color source
-	** be a vertex color array so when there is a pre-existing color array, I'm just multiplying 
+	** be a vertex color array so when there is a pre-existing color array, I'm just multiplying
 	** the DIG values into it.
 	*/
 	W3dRGBAStruct color;
@@ -1387,7 +1385,7 @@ WW3DErrorType MeshModelClass::read_texture_stage(ChunkLoadClass & cload,MeshLoad
 	while (cload.Open_Chunk()) {
 
 		WW3DErrorType error = WW3D_ERROR_OK;
-		
+
 		switch(cload.Cur_Chunk_ID()) {
 			case W3D_CHUNK_TEXTURE_IDS:
 				error = read_texture_ids(cload,context);
@@ -1457,7 +1455,7 @@ WW3DErrorType MeshModelClass::read_texture_ids(ChunkLoadClass & cload,MeshLoadCo
 			cload.Read(&texid,sizeof(uint32));
 			if (texid != 0xffffffff) {
 				matdesc->Set_Texture(i,context->Peek_Texture(texid),pass,stage);
-			} 
+			}
 		}
 	}
 #else
@@ -1491,7 +1489,7 @@ WW3DErrorType MeshModelClass::read_stage_texcoords(ChunkLoadClass & cload,MeshLo
 	unsigned				elementcount;
 	Vector2			  *uvs;
 	W3dTexCoordStruct texcoord;
-	
+
 	/*
 	** Determine whether this chunk should be read into the default or alternate material description
 	*/
@@ -1505,7 +1503,7 @@ WW3DErrorType MeshModelClass::read_stage_texcoords(ChunkLoadClass & cload,MeshLo
 	*/
 	elementcount = cload.Cur_Chunk_Length() / sizeof (W3dTexCoordStruct);
 	uvs = context->Get_Temporary_UV_Array(elementcount);
-	
+
 	if (uvs != NULL) {
 		for (unsigned i = 0; i < elementcount; i++) {
 			cload.Read (&texcoord, sizeof (texcoord));
@@ -1519,7 +1517,7 @@ WW3DErrorType MeshModelClass::read_stage_texcoords(ChunkLoadClass & cload,MeshLo
 	return (WW3D_ERROR_OK);
 }
 
-	
+
 /***********************************************************************************************
  * MeshModelClass::read_per_face_texcoord_ids -- read uv indices for given (pass,stage).		  *
  *                                                                                             *
@@ -1536,7 +1534,7 @@ WW3DErrorType MeshModelClass::read_stage_texcoords(ChunkLoadClass & cload,MeshLo
 WW3DErrorType MeshModelClass::read_per_face_texcoord_ids (ChunkLoadClass &cload, MeshLoadContextClass *context)
 {
 	unsigned size;
-	
+
 	/*
 	** Determine whether this chunk should be read into the default or alternate material description
 	*/
@@ -1551,9 +1549,9 @@ WW3DErrorType MeshModelClass::read_per_face_texcoord_ids (ChunkLoadClass &cload,
 	*/
 	size = sizeof (Vector3i) * Get_Polygon_Count();
 	if (cload.Cur_Chunk_Length() == size) {
-			
+
 //		Vector3i *uvindices;
-//	
+//
 //		uvindices = matdesc->Get_UVIndex_Array (context->CurPass, true);
 //		WWASSERT (uvindices != NULL);
 
@@ -1562,7 +1560,7 @@ WW3DErrorType MeshModelClass::read_per_face_texcoord_ids (ChunkLoadClass &cload,
 //delete[] uvindices;
 		cload.Seek(size);
 		return (WW3D_ERROR_OK);
-		
+
 	} else {
 		return (WW3D_ERROR_LOAD_FAILED);
 	}
@@ -1585,7 +1583,7 @@ WW3DErrorType MeshModelClass::read_prelit_material (ChunkLoadClass &cload, MeshL
 {
 	// If this chunk ID matches the selected prelit chunk ID then load it, otherwise skip it.
 	if (cload.Cur_Chunk_ID() == context->PrelitChunkID) {
-	
+
 		// While there are chunks in the prelit material chunk wrapper...
 		while (cload.Open_Chunk()) {
 
@@ -1614,21 +1612,21 @@ WW3DErrorType MeshModelClass::read_prelit_material (ChunkLoadClass &cload, MeshL
 					break;
 
 				default:
-					
+
 					// Unknown chunk.
 					break;
-			}	
+			}
 			cload.Close_Chunk();
 			if (error != WW3D_ERROR_OK) return (error);
 		}
 	}
-	
+
 	return (WW3D_ERROR_OK);
 }
 
 
 /***********************************************************************************************
- * MeshModelClass::post_process -- post loading, perform any processing on this model.			  *			
+ * MeshModelClass::post_process -- post loading, perform any processing on this model.			  *
  *                                                                                             *
  * INPUT:                                                                                      *
  *                                                                                             *
@@ -1643,10 +1641,10 @@ WW3DErrorType MeshModelClass::read_prelit_material (ChunkLoadClass &cload, MeshL
 void MeshModelClass::post_process()
 {
 #if 0
-	// we want to allow this now due to usage of the static sort 
+	// we want to allow this now due to usage of the static sort
 	// Ensure no sorting, multipass meshes (for they are abomination...)
 	if (DefMatDesc->Get_Pass_Count() > 1 && Get_Flag(SORT)) {
-		WWDEBUG_SAY(( "Turning SORT off for multipass mesh %s\n",Get_Name() ));
+		WWDEBUG_SAY(( "Turning SORT off for multipass mesh %s",Get_Name() ));
 		Set_Flag(SORT, false);
 	}
 #endif
@@ -1669,7 +1667,7 @@ void MeshModelClass::post_process()
 	}
 
 	// fog activation.
-	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) { 
+	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) {
 		post_process_fog();
 	}
 
@@ -1747,7 +1745,7 @@ void MeshModelClass::post_process_fog(void)
 
 				return;
 			}
-				
+
 			// Analyze the mesh to determine if it is the shiny mask effect and if it is, fix it up appropriately.
 			bool shiny_mask_effect = shader0.Get_Src_Blend_Func() == ShaderClass::SRCBLEND_ONE &&
 											 shader0.Get_Dst_Blend_Func() == ShaderClass::DSTBLEND_ZERO &&
@@ -1762,7 +1760,7 @@ void MeshModelClass::post_process_fog(void)
 			}
 		}
 	}
-		
+
 	// Mesh is not one of the special two-pass combinations. Apply a per-pass generic fix-up.
 	for (int pass = 0; pass < DefMatDesc->PassCount; pass++) {
 		DefMatDesc->Shader [pass].Enable_Fog (Get_Name());
@@ -1782,7 +1780,7 @@ unsigned int MeshModelClass::get_sort_flags(int pass) const
 		for (int tri = 0; tri < CurMatDesc->ShaderArray[pass]->Get_Count(); tri++) {
 			scat = CurMatDesc->ShaderArray[pass]->Get_Element(tri).Get_SS_Category();
 			flags |= (1 << scat);
-		}			
+		}
 	} else {
 		scat = Get_Single_Shader(pass).Get_SS_Category();
 		flags |= (1 << scat);
@@ -1828,7 +1826,7 @@ void MeshModelClass::compute_static_sort_levels(void)
 	case SSCAT_SCREEN_BF:
 		SortLevel = SORT_LEVEL_BIN2;
 		break;
-		
+
 	default:
 		SortLevel = SORT_LEVEL_BIN1;
 		break;
@@ -1871,7 +1869,7 @@ void MeshModelClass::install_materials(MeshLoadContextClass * context)
 	** If alternate material chunks were loaded, initialize the AlternateMatDesc
 	*/
 	install_alternate_material_desc(context);
-	
+
 	/*
 	** Finish configuring the vertex materials and color arrays.
 	*/
@@ -1966,10 +1964,9 @@ MeshLoadContextClass::~MeshLoadContextClass(void)
 {
 	int i;
 
-	if (TexCoords != NULL) {
-		delete TexCoords;
-		TexCoords = NULL;
-	}
+	delete TexCoords;
+	TexCoords = NULL;
+
 	for (i=0; i<Textures.Count(); i++) {
 		Textures[i]->Release_Ref();
 	}
@@ -2017,10 +2014,10 @@ W3dTexCoordStruct * MeshLoadContextClass::Get_Texcoord_Array(void)
  * HISTORY:                                                                                    *
  *   12/10/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-int MeshLoadContextClass::Add_Shader(ShaderClass shader)								
-{ 
+int MeshLoadContextClass::Add_Shader(ShaderClass shader)
+{
 	int index = Shaders.Count();
-	Shaders.Add(shader); 
+	Shaders.Add(shader);
 	return index;
 }
 
@@ -2037,12 +2034,12 @@ int MeshLoadContextClass::Add_Shader(ShaderClass shader)
  * HISTORY:                                                                                    *
  *   12/10/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-int MeshLoadContextClass::Add_Vertex_Material(VertexMaterialClass * vmat)			
-{ 
+int MeshLoadContextClass::Add_Vertex_Material(VertexMaterialClass * vmat)
+{
 	WWASSERT(vmat != NULL);
 	vmat->Add_Ref();
 	int index = VertexMaterials.Count();
-	VertexMaterials.Add(vmat); 
+	VertexMaterials.Add(vmat);
 	return index;
 }
 
@@ -2059,12 +2056,12 @@ int MeshLoadContextClass::Add_Vertex_Material(VertexMaterialClass * vmat)
  * HISTORY:                                                                                    *
  *   12/10/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-int MeshLoadContextClass::Add_Texture(TextureClass * tex)							
-{ 
+int MeshLoadContextClass::Add_Texture(TextureClass * tex)
+{
 	WWASSERT(tex != NULL);
 	tex->Add_Ref();
 	int index = Textures.Count();
-	Textures.Add(tex); 
+	Textures.Add(tex);
 	return index;
 }
 
@@ -2104,7 +2101,7 @@ void MeshLoadContextClass::Add_Legacy_Material(ShaderClass shader,VertexMaterial
 	if (vmat == NULL) {
 		mat->VertexMaterialIdx = -1;
 	} else {
-		unsigned long crc = vmat->Get_CRC();	
+		unsigned long crc = vmat->Get_CRC();
 		int vi=0;
 		for (; vi<VertexMaterialCrcs.Count(); vi++) {
 			if (VertexMaterialCrcs[vi] == crc) break;
@@ -2139,7 +2136,7 @@ void MeshLoadContextClass::Add_Legacy_Material(ShaderClass shader,VertexMaterial
 
 
 /***********************************************************************************************
- * MeshLoadContextClass::Peek_Legacy_Shader -- returns a legacy shader								  *		
+ * MeshLoadContextClass::Peek_Legacy_Shader -- returns a legacy shader								  *
  *                                                                                             *
  * This function does the re-indexing to go from the legacy shader index to the actual shader  *
  * index and then returns that shader                                                          *
@@ -2285,13 +2282,13 @@ WW3DErrorType MeshModelClass::Save_W3D(ChunkSaveClass & csave)
 
 WW3DErrorType MeshModelClass::write_chunks(ChunkSaveClass & csave,MeshSaveContextClass * context)
 {
-	
+
 	// write the header
 	write_header(csave,context);
 	write_user_text(csave,context);
 
 	// write the geometry
-	write_triangles(csave,context);	
+	write_triangles(csave,context);
 	write_vertices(csave,context);
 	write_vertex_normals(csave,context);
 	write_vertex_shade_indices(csave,context);
@@ -2316,13 +2313,13 @@ WW3DErrorType MeshModelClass::write_header(ChunkSaveClass & csave,MeshSaveContex
 {
 	W3dMeshHeader3Struct header;
 	memset(&header,0,sizeof(header));
-	
+
 	// Set names
 	if (MeshName) {
 
 		char * name = MeshName->Get_Array();
 		char * mesh_name = strchr(name,'.');
-		
+
 		int hierarchy_name_len = 0;
 		if (mesh_name == NULL) {
 			mesh_name = name;
@@ -2330,9 +2327,9 @@ WW3DErrorType MeshModelClass::write_header(ChunkSaveClass & csave,MeshSaveContex
 			hierarchy_name_len = (int)mesh_name - (int)name;
 			mesh_name++;
 		}
-		assert( hierarchy_name_len <= W3D_NAME_LEN);
-		strncpy( header.MeshName, mesh_name, W3D_NAME_LEN);
-		strncpy( header.ContainerName, name, hierarchy_name_len);
+		assert( hierarchy_name_len < W3D_NAME_LEN);
+		strlcpy( header.MeshName, mesh_name, W3D_NAME_LEN);
+		strlcpy( header.ContainerName, name, hierarchy_name_len + 1);
 	} else {
 		sprintf(header.MeshName,"UnNamed");
 	}
@@ -2403,7 +2400,7 @@ WW3DErrorType MeshModelClass::write_triangles(ChunkSaveClass & csave,MeshSaveCon
 			tri.Normal.Z = 		poly_eq[i].Z;
 			tri.Dist =				poly_eq[i].W;
 		} else {
-			
+
 			Vector3 a,b,normal;
 			Vector3 * verts = Vertex->Get_Array();
 			const Vector3 & p0= verts[poly_verts[i][0]];
@@ -2422,7 +2419,7 @@ WW3DErrorType MeshModelClass::write_triangles(ChunkSaveClass & csave,MeshSaveCon
 
 		if (csave.Write(&tri,sizeof(W3dTriStruct)) != sizeof(W3dTriStruct)) {
 			return WW3D_ERROR_SAVE_FAILED;
-		} 
+		}
 	}
 
 	if (!csave.End_Chunk()) {
@@ -2437,7 +2434,7 @@ WW3DErrorType MeshModelClass::write_vertices(ChunkSaveClass & csave,MeshSaveCont
 	if (!csave.Begin_Chunk(W3D_CHUNK_VERTICES)) {
 		return WW3D_ERROR_SAVE_FAILED;
 	}
-	
+
 	WWASSERT(Get_Vertex_Count() > 0);
 	Vector3 * verts = Vertex->Get_Array();
 
@@ -2447,12 +2444,12 @@ WW3DErrorType MeshModelClass::write_vertices(ChunkSaveClass & csave,MeshSaveCont
    	vert.X = verts[i].X;
 		vert.Y = verts[i].Y;
 		vert.Z = verts[i].Z;
-		
+
 		if (csave.Write(&(vert),sizeof(W3dVectorStruct)) != sizeof(W3dVectorStruct)) {
 			return WW3D_ERROR_SAVE_FAILED;
 		}
 	}
-	
+
 	if (!csave.End_Chunk()) {
 		return WW3D_ERROR_SAVE_FAILED;
 	}
@@ -2465,21 +2462,21 @@ WW3DErrorType MeshModelClass::write_vertex_normals(ChunkSaveClass & csave,MeshSa
 	if (!csave.Begin_Chunk(W3D_CHUNK_VERTEX_NORMALS)) {
 		return WW3D_ERROR_SAVE_FAILED;
 	}
-	
+
 	const Vector3 * verts = Get_Vertex_Normal_Array();
-	
+
 	for (int i=0; i<Get_Vertex_Count(); i++) {
 
 		W3dVectorStruct vert;
    	vert.X = verts[i].X;
 		vert.Y = verts[i].Y;
 		vert.Z = verts[i].Z;
-		
+
 		if (csave.Write(&(vert),sizeof(W3dVectorStruct)) != sizeof(W3dVectorStruct)) {
 			return WW3D_ERROR_SAVE_FAILED;
 		}
 	}
-	
+
 	if (!csave.End_Chunk()) {
 		return WW3D_ERROR_SAVE_FAILED;
 	}
@@ -2585,9 +2582,9 @@ WW3DErrorType MeshModelClass::write_vertex_materials(ChunkSaveClass & csave,Mesh
 {
 	if (context->Materials.Get_Vertex_Material_Count() <= 0) return WW3D_ERROR_OK;
 	if (!csave.Begin_Chunk(W3D_CHUNK_VERTEX_MATERIALS)) return WW3D_ERROR_SAVE_FAILED;
-	
+
 	for (int vi=0; vi<context->Materials.Get_Vertex_Material_Count(); vi++) {
-		
+
 		csave.Begin_Chunk(W3D_CHUNK_VERTEX_MATERIAL);
 		VertexMaterialClass * vmat = context->Materials.Peek_Vertex_Material(vi);
 		vmat->Save_W3D(csave);
@@ -2602,7 +2599,7 @@ WW3DErrorType MeshModelClass::write_textures(ChunkSaveClass & csave,MeshSaveCont
 {
 	if (context->Materials.Get_Texture_Count() <= 0) return WW3D_ERROR_OK;
 	if (!csave.Begin_Chunk(W3D_CHUNK_TEXTURES)) return WW3D_ERROR_SAVE_FAILED;
-	
+
 	for (int ti=0; ti<context->Materials.Get_Texture_Count(); ti++) {
 		TextureClass * tex = context->Materials.Peek_Texture(ti);
 		Save_Texture(tex,csave);
@@ -2634,14 +2631,14 @@ WW3DErrorType MeshModelClass::write_material_pass(ChunkSaveClass & csave,MeshSav
 WW3DErrorType MeshModelClass::write_vertex_material_ids(ChunkSaveClass & csave,MeshSaveContextClass * context)
 {
 	// first check if all vertex material pointers are Null (is this legal?)
-	if (	(DefMatDesc->Material[context->CurPass] == NULL) && 
+	if (	(DefMatDesc->Material[context->CurPass] == NULL) &&
 			(DefMatDesc->MaterialArray[context->CurPass] == NULL)) return WW3D_ERROR_OK;
 
 	csave.Begin_Chunk(W3D_CHUNK_VERTEX_MATERIAL_IDS);
 
 	uint32 id = 0;
 	if (DefMatDesc->MaterialArray[context->CurPass] == NULL) {
-		
+
 		id = context->Materials.Find_Vertex_Material(DefMatDesc->Material[context->CurPass]);
 		csave.Write(&id,sizeof(id));
 
@@ -2665,12 +2662,12 @@ WW3DErrorType MeshModelClass::write_shader_ids(ChunkSaveClass & csave,MeshSaveCo
 
 	uint32 id = 0;
 	if (DefMatDesc->ShaderArray[context->CurPass] == NULL) {
-		
+
 		id = context->Materials.Find_Shader(DefMatDesc->Shader[context->CurPass]);
 		csave.Write(&id,sizeof(id));
 
 	} else {
-		
+
 		ShaderClass * array = DefMatDesc->ShaderArray[context->CurPass]->Get_Array();
 		for (int pi=0; pi<Get_Polygon_Count(); pi++) {
 			id = context->Materials.Find_Shader(array[pi]);
@@ -2686,7 +2683,7 @@ WW3DErrorType MeshModelClass::write_scg(ChunkSaveClass & csave,MeshSaveContextCl
 {
 	if (DefMatDesc->SCG[context->CurPass] == NULL) return WW3D_ERROR_OK;
 	csave.Begin_Chunk(W3D_CHUNK_SCG);
-	
+
 	W3dRGBAStruct color;
 	Vector4 * color_array = DefMatDesc->SCG[context->CurPass]->Get_Array();
 	for (int vi=0; vi<Get_Vertex_Count(); vi++) {
@@ -2732,7 +2729,7 @@ WW3DErrorType MeshModelClass::write_texture_stage(ChunkSaveClass & csave,MeshSav
 {
 	if (	(DefMatDesc->Texture[context->CurPass][context->CurStage] == NULL) &&
 			(DefMatDesc->TextureArray[context->CurPass][context->CurStage] == NULL)) return WW3D_ERROR_OK;
-	
+
 	csave.Begin_Chunk(W3D_CHUNK_TEXTURE_STAGE);
 	write_texture_ids(csave,context);
 	write_stage_texcoords(csave,context);
@@ -2745,15 +2742,15 @@ WW3DErrorType MeshModelClass::write_texture_stage(ChunkSaveClass & csave,MeshSav
 WW3DErrorType MeshModelClass::write_texture_ids(ChunkSaveClass & csave,MeshSaveContextClass * context)
 {
 	csave.Begin_Chunk(W3D_CHUNK_TEXTURE_IDS);
-	
+
 	uint32 id = 0;
 	if (DefMatDesc->TextureArray[context->CurPass][context->CurStage] == NULL) {
-		
+
 		id = context->Materials.Find_Texture(DefMatDesc->Texture[context->CurPass][context->CurStage]);
 		csave.Write(&id,sizeof(id));
 
 	} else {
-		
+
 		srTextureIFace ** array = DefMatDesc->TextureArray[context->CurPass][context->CurStage]->Get_Array();
 		for (int pi=0; pi<Get_Polygon_Count(); pi++) {
 			id = context->Materials.Find_Texture(array[pi]);
@@ -2777,7 +2774,7 @@ WW3DErrorType MeshModelClass::write_stage_texcoords(ChunkSaveClass & csave,MeshS
 
 		tex.U = array[vi].X;
 		tex.V = 1.0f - array[vi].Y;
-		
+
 		csave.Write(&tex,sizeof(tex));
 	}
 
@@ -2785,4 +2782,4 @@ WW3DErrorType MeshModelClass::write_stage_texcoords(ChunkSaveClass & csave,MeshS
 	return WW3D_ERROR_OK;
 }
 
-#endif // 0 (disabled mesh saving code)
\ No newline at end of file
+#endif // 0 (disabled mesh saving code)
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp
index c099cddabe7..79099864f77 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.cpp
@@ -17,26 +17,26 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/motchan.cpp 6     11/29/01 1:07p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/motchan.cpp                            $* 
- *                                                                                             * 
- *                       Author:: Greg_h                                                       * 
- *                                                                                             * 
- *                     $Modtime:: 11/29/01 1:01p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 6                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
- *   MotionChannelClass::MotionChannelClass -- constructor                                     * 
- *   MotionChannelClass::~MotionChannelClass -- destructor                                     * 
- *   MotionChannelClass::Free -- de-allocates all memory in use                                * 
- *   MotionChannelClass::Load -- loads a motion channel from a file                            * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/motchan.cpp                            $*
+ *                                                                                             *
+ *                       Author:: Greg_h                                                       *
+ *                                                                                             *
+ *                     $Modtime:: 11/29/01 1:01p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 6                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
+ *   MotionChannelClass::MotionChannelClass -- constructor                                     *
+ *   MotionChannelClass::~MotionChannelClass -- destructor                                     *
+ *   MotionChannelClass::Free -- de-allocates all memory in use                                *
+ *   MotionChannelClass::Load -- loads a motion channel from a file                            *
  *   BitChannelClass::BitChannelClass -- Constructor for BitChannelClass                       *
  *   BitChannelClass::~BitChannelClass -- Destructor for BitChannelClass                       *
  *   BitChannelClass::Free -- Free all "external" memory in use                                *
@@ -47,11 +47,9 @@
 #include "motchan.h"
 #include "w3d_file.h"
 #include "chunkio.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "wwmath.h"
 #include "quat.h"
-#include "wwmath.h"
-//#include <stdio.h>
 //#include <Windows.h>
 // Static Table, for Adaptive Delta Decompressor
 #define FILTER_TABLE_SIZE (256)
@@ -77,19 +75,19 @@ static float filtertable[FILTER_TABLE_SIZE] = {
 	10000000.0f,
 
 };
-static bool table_valid = false; 
-
-/*********************************************************************************************** 
- * MotionChannelClass::MotionChannelClass -- constructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+static bool table_valid = false;
+
+/***********************************************************************************************
+ * MotionChannelClass::MotionChannelClass -- constructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 MotionChannelClass::MotionChannelClass(void) :
 	PivotIdx(0),
@@ -104,66 +102,63 @@ MotionChannelClass::MotionChannelClass(void) :
 {
 }
 
-/*********************************************************************************************** 
- * MotionChannelClass::~MotionChannelClass -- destructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionChannelClass::~MotionChannelClass -- destructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 MotionChannelClass::~MotionChannelClass(void)
 {
 	Free();
 }
 
-/*********************************************************************************************** 
- * MotionChannelClass::Free -- de-allocates all memory in use                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionChannelClass::Free -- de-allocates all memory in use                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void MotionChannelClass::Free(void)
 {
-	if (CompressedData) {
-		delete[] CompressedData;
-		CompressedData=NULL;
-	}
-	if (Data) {
-		delete[] Data;
-		Data = NULL;
-	}
+	delete[] CompressedData;
+	CompressedData=NULL;
+
+	delete[] Data;
+	Data = NULL;
 }
 
 
-/*********************************************************************************************** 
- * MotionChannelClass::Load -- loads a motion channel from a file                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionChannelClass::Load -- loads a motion channel from a file                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool MotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 {
 	int size = cload.Cur_Chunk_Length();
 	// There was a bug in the exporter which saved too much data, so let's try and not load everything.
 	unsigned int saved_datasize = (size - sizeof(W3dAnimChannelStruct));
-  
+
 	W3dAnimChannelStruct chan;
 	if (cload.Read(&chan,sizeof(W3dAnimChannelStruct)) != sizeof(W3dAnimChannelStruct)) {
 		return false;
@@ -181,7 +176,7 @@ bool MotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 
 	Data = MSGW3DNEWARRAY("MotionChannelClass::Data") float32[num_floats];
 	Data[0] = chan.Data[0];
-	
+
 	if (cload.Read(&(Data[1]),datasize) != datasize) {
 		Free();
 		return false;
@@ -251,10 +246,8 @@ BitChannelClass::~BitChannelClass(void)
  *=============================================================================================*/
 void BitChannelClass::Free(void)
 {
-	if (Bits != NULL) {
-		delete[] Bits;
-		Bits = NULL;
-	}
+	delete[] Bits;
+	Bits = NULL;
 }
 
 
@@ -273,7 +266,7 @@ void BitChannelClass::Free(void)
 bool BitChannelClass::Load_W3D(ChunkLoadClass & cload)
 {
 	Free();
-	
+
 	int chunk_size = cload.Cur_Chunk_Length();
 
 	W3dBitChannelStruct chan;
@@ -297,29 +290,29 @@ bool BitChannelClass::Load_W3D(ChunkLoadClass & cload)
 	assert(Bits);
 
 	Bits[0] = chan.Data[0];
-	
+
 	if (bytesleft > 0) {
 		if (cload.Read(&(Bits[1]),bytesleft) != bytesleft) {
 			Free();
 			return false;
-		}	
+		}
 	}
 
 	return true;
 }
 
 
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::TimeCodedMotionChannelClass -- constructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::TimeCodedMotionChannelClass -- constructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 TimeCodedMotionChannelClass::TimeCodedMotionChannelClass(void) :
 	PivotIdx(0),
@@ -333,55 +326,53 @@ TimeCodedMotionChannelClass::TimeCodedMotionChannelClass(void) :
 {
 }
 
-/*********************************************************************************************** 
- * MotionChannelClass::~MotionChannelClass -- destructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionChannelClass::~MotionChannelClass -- destructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 TimeCodedMotionChannelClass::~TimeCodedMotionChannelClass(void)
 {
 	Free();
 }
 
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::Free -- de-allocates all memory in use                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::Free -- de-allocates all memory in use                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void TimeCodedMotionChannelClass::Free(void)
 {
-	if (Data) {
-		delete[] Data;
-		Data = NULL;
-	}
+	delete[] Data;
+	Data = NULL;
 }
 
 
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::Load -- loads a motion channel from a file                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::Load -- loads a motion channel from a file                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 bool TimeCodedMotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 {
@@ -393,8 +384,8 @@ bool TimeCodedMotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 	if (cload.Read(&chan,sizeof(W3dTimeCodedAnimChannelStruct)) != sizeof(W3dTimeCodedAnimChannelStruct)) {
 		return false;
 	}
-						
-	NumTimeCodes = chan.NumTimeCodes;          
+
+	NumTimeCodes = chan.NumTimeCodes;
 	VectorLen    = chan.VectorLen;
 	Type 		    = chan.Flags;
 	PivotIdx     = chan.Pivot;
@@ -404,54 +395,54 @@ bool TimeCodedMotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 
 	Data = MSGW3DNEWARRAY("TimeCodedMotionChannelClass::Data") uint32[numInts];
 	Data[0] = chan.Data[0];
-	
+
 	if (cload.Read(&(Data[1]), datasize) != datasize) {
 		Free();
 		return false;
-	}	
+	}
 	return true;
 }
 
 
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::Get_Vector -- returns the vector for the specified frame #              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::Get_Vector -- returns the vector for the specified frame #              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void	TimeCodedMotionChannelClass::Get_Vector(float32 frame,float * setvec)
-{		
-	
+{
+
   uint32	tc0;
-  
+
   tc0 = frame;
-	
-  uint32 pidx = get_index( tc0 );						
+
+  uint32 pidx = get_index( tc0 );
   uint32 p2idx;
-  
+
   if (pidx == ((NumTimeCodes - 1) * PacketSize))  {
-  	
-     float32 *frm = (float32 *) &Data[pidx+1];	 									
-                           
+
+     float32 *frm = (float32 *) &Data[pidx+1];
+
 		for (int i=0; i < VectorLen; i++)  {
-	  	
+
 	   	setvec[i] = frm[i];
-	     
-	  }               
-     
-     return;		  
-             
+
+	  }
+
+     return;
+
   }
   else {
   	p2idx = pidx + PacketSize;
   }
-  
+
   uint32 time = Data[p2idx];
 
    if (time & W3D_TIMECODED_BINARY_MOVEMENT_FLAG) {
@@ -464,19 +455,19 @@ void	TimeCodedMotionChannelClass::Get_Vector(float32 frame,float * setvec)
 
   float32 time1 = (Data[pidx]  & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG);
   float32 time2 = (time & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG);
-  
-  float32 ratio = (frame - time1) / (time2 - time1);	
-     
+
+  float32 ratio = (frame - time1) / (time2 - time1);
+
   float32 *frame1 = (float32 *) &Data[pidx+1];
   float32 *frame2 = (float32 *) &Data[p2idx+1];
-  					
+
   for (int i=0; i < VectorLen; i++)  {
-  	
+
      setvec[i] = WWMath::Lerp(frame1[i],frame2[i],ratio);
-     
-  }               
 
-}	// Get_Vector
+  }
+
+}
 
 
 Quaternion TimeCodedMotionChannelClass::Get_QuatVector(float32 frame)
@@ -487,25 +478,25 @@ Quaternion TimeCodedMotionChannelClass::Get_QuatVector(float32 frame)
 	Quaternion q(1);
 
 	uint32	tc0;
-  
+
 	tc0 = frame;
-	
-	uint32 pidx = get_index( tc0 );						
+
+	uint32 pidx = get_index( tc0 );
 	uint32 p2idx;
-  
+
 	if (pidx == ((NumTimeCodes - 1) * PacketSize))  {
-  	
-		float32 *vec = (float32 *) &Data[pidx+1];	 									
-               
+
+		float32 *vec = (float32 *) &Data[pidx+1];
+
 		q.Set(vec[0], vec[1], vec[2], vec[3]);
 
-		return( q );		  
-             
+		return( q );
+
 	}
 	else {
   		p2idx = pidx + PacketSize;
 	}
-  
+
 	uint32 time = Data[p2idx];
 
 	if (time & W3D_TIMECODED_BINARY_MOVEMENT_FLAG) {
@@ -513,18 +504,18 @@ Quaternion TimeCodedMotionChannelClass::Get_QuatVector(float32 frame)
 		float32 *vec = (float32 *) &Data[pidx+1];
 
 		q.Set(vec[0], vec[1], vec[2], vec[3]);
-		
+
 		return( q );
 	}
-	
+
 	float32 time1 = (Data[pidx]  & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG);
 	float32 time2 = (time & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG);
 
-	float32 ratio = (frame - time1) / (time2 - time1);	
-	   
+	float32 ratio = (frame - time1) / (time2 - time1);
+
 	float32 *frame1 = (float32 *) &Data[pidx+1];
 	float32 *frame2 = (float32 *) &Data[p2idx+1];
-  					
+
 	Quaternion q1(1);
 	Quaternion q2(1);
 
@@ -535,25 +526,25 @@ Quaternion TimeCodedMotionChannelClass::Get_QuatVector(float32 frame)
 
 	return( q );
 
-} // Get_QuatVector
+}
 
 
 
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::binary_search_index / returns packet index 				        * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   01/27/2000 JGA  : Created.                                                                * 
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::binary_search_index / returns packet index 				        *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   01/27/2000 JGA  : Created.                                                                *
  *=============================================================================================*/
 // New version that uses a binary search, and no cache
 uint32 TimeCodedMotionChannelClass::binary_search_index(uint32 timecode)
-{	
+{
 	int leftIdx = 0;
 	int rightIdx = NumTimeCodes - 2;
 	int dx;
@@ -570,7 +561,7 @@ uint32 TimeCodedMotionChannelClass::binary_search_index(uint32 timecode)
 	if (timecode >= time) return(idx);
 
 	for (;;) {
-	
+
 		dx = rightIdx - leftIdx;
 
 		dx>>=1;	// divide by 2
@@ -588,7 +579,7 @@ uint32 TimeCodedMotionChannelClass::binary_search_index(uint32 timecode)
 
 		time = Data[idx + PacketSize] & ~W3D_TIMECODED_BINARY_MOVEMENT_FLAG;
 
-		if (timecode < time) return(idx); 
+		if (timecode < time) return(idx);
 
 		if (leftIdx ^ dx) {
 			leftIdx = dx;
@@ -606,23 +597,23 @@ uint32 TimeCodedMotionChannelClass::binary_search_index(uint32 timecode)
 	assert(0);
 	return(0);
 
-}	// binary_search_index
-
-	 
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::get_index / returns packet index												       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   01/27/2000 JGA  : Created.                                                                * 
+}
+
+
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::get_index / returns packet index												       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   01/27/2000 JGA  : Created.                                                                *
  *=============================================================================================*/
 uint32 TimeCodedMotionChannelClass::get_index(uint32 timecode)
-{	
+{
 	assert(CachedIdx <= LastTimeCodeIdx);
 
 	uint32	time;
@@ -648,19 +639,19 @@ uint32 TimeCodedMotionChannelClass::get_index(uint32 timecode)
 
 	return(CachedIdx);
 
-}	// get_index
-   
-/*********************************************************************************************** 
- * TimeCodedMotionChannelClass::set_identity -- returns an "identity" vector (not really...hmm...)      * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   08/11/1997 GH  : Created.                                                                 * 
+}
+
+/***********************************************************************************************
+ * TimeCodedMotionChannelClass::set_identity -- returns an "identity" vector (not really...hmm...)      *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   08/11/1997 GH  : Created.                                                                 *
  *=============================================================================================*/
 void TimeCodedMotionChannelClass::set_identity(float * setvec)
 {
@@ -676,7 +667,7 @@ void TimeCodedMotionChannelClass::set_identity(float * setvec)
 		setvec[0] = 0.0f;
 
 	}
-}	// set_identity
+}
 
 
 /***********************************************************************************************
@@ -732,10 +723,8 @@ TimeCodedBitChannelClass::~TimeCodedBitChannelClass(void)
  *=============================================================================================*/
 void TimeCodedBitChannelClass::Free(void)
 {
-	if (Bits != NULL) {
-		delete[] Bits;
-		Bits = NULL;
-	}
+	delete[] Bits;
+	Bits = NULL;
 }
 
 
@@ -754,15 +743,15 @@ void TimeCodedBitChannelClass::Free(void)
 bool TimeCodedBitChannelClass::Load_W3D(ChunkLoadClass & cload)
 {
 	Free();
-	
+
 	int chunk_size = cload.Cur_Chunk_Length();
 
 	W3dTimeCodedBitChannelStruct chan;
 	if (cload.Read(&chan,sizeof(W3dTimeCodedBitChannelStruct)) != sizeof(W3dTimeCodedBitChannelStruct)) {
 		return false;
 	}
-			 
-	NumTimeCodes = chan.NumTimeCodes;     
+
+	NumTimeCodes = chan.NumTimeCodes;
 	Type 			 = chan.Flags;
 	PivotIdx 	 = chan.Pivot;
 	DefaultVal = chan.DefaultVal;
@@ -776,16 +765,16 @@ bool TimeCodedBitChannelClass::Load_W3D(ChunkLoadClass & cload)
 	assert(Bits);
 
 	Bits[0] = chan.Data[0];
-	
+
 	if (bytesleft > 0) {
 		if (cload.Read(&(Bits[1]),bytesleft) != bytesleft) {
 			Free();
 			return false;
-		}	
+		}
 	}
 
 	return true;
-}	 // Load_W3D
+}
 
 
 /***********************************************************************************************
@@ -801,8 +790,8 @@ bool TimeCodedBitChannelClass::Load_W3D(ChunkLoadClass & cload)
  *   1/21/98    GTH : Created.                                                                 *
  *=============================================================================================*/
 int TimeCodedBitChannelClass::Get_Bit(int frame)
-{		
-	assert(frame >= 0);	 
+{
+	assert(frame >= 0);
 	assert(CachedIdx < NumTimeCodes);
 
 	int time;
@@ -810,47 +799,47 @@ int TimeCodedBitChannelClass::Get_Bit(int frame)
 
 	time = Bits[CachedIdx] & ~W3D_TIMECODED_BIT_MASK;
 
-	
+
 	if (frame >= time) {
-		
+
 		// start from here
 		idx = CachedIdx+1;
 
 	}
 
 	for (;idx < (int) NumTimeCodes ; idx++)  {
-	
+
 		time = Bits[idx] &~W3D_TIMECODED_BIT_MASK;
-     
-		if (frame < time) break;	
-     
-	}  
-  
+
+		if (frame < time) break;
+
+	}
+
 	idx--;
-  
+
 	if (idx < 0) idx = 0;
-  
+
 	CachedIdx = idx;
 
 	return (((Bits[idx] & W3D_TIMECODED_BIT_MASK) == W3D_TIMECODED_BIT_MASK));
-  
-}	 // Get_Bit
+
+}
 
 
 // Begin Adaptive Delta
 
 
-/*********************************************************************************************** 
- * AdaptiveDeltaMotionChannelClass::AdaptiveDeltaMotionChannelClass -- constructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/18/2000 JGA : Created.                                                                 * 
+/***********************************************************************************************
+ * AdaptiveDeltaMotionChannelClass::AdaptiveDeltaMotionChannelClass -- constructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/18/2000 JGA : Created.                                                                 *
  *=============================================================================================*/
 AdaptiveDeltaMotionChannelClass::AdaptiveDeltaMotionChannelClass(void) :
 	PivotIdx(0),
@@ -859,7 +848,7 @@ AdaptiveDeltaMotionChannelClass::AdaptiveDeltaMotionChannelClass(void) :
 	Data(NULL),
 	NumFrames(0),
 	CacheData(NULL),
-	Scale(0.0f)	
+	Scale(0.0f)
 {
 
 	if (false == table_valid) {
@@ -869,7 +858,7 @@ AdaptiveDeltaMotionChannelClass::AdaptiveDeltaMotionChannelClass(void) :
 		{
 			float ratio = i;
 
-			//ratio = ((ratio + 1.0f) / 128.0f); 
+			//ratio = ((ratio + 1.0f) / 128.0f);
 			ratio/=((float) FILTER_TABLE_GEN_SIZE);
 
 			filtertable[i + FILTER_TABLE_GEN_START] = 1.0f - WWMath::Sin( DEG_TO_RAD(90.0f * ratio));
@@ -881,61 +870,56 @@ AdaptiveDeltaMotionChannelClass::AdaptiveDeltaMotionChannelClass(void) :
 
 }
 
-/*********************************************************************************************** 
- * MotionChannelClass::~MotionChannelClass -- destructor                                       * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/18/1000 JGA : Created.                                                                 * 
+/***********************************************************************************************
+ * MotionChannelClass::~MotionChannelClass -- destructor                                       *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/18/1000 JGA : Created.                                                                 *
  *=============================================================================================*/
 AdaptiveDeltaMotionChannelClass::~AdaptiveDeltaMotionChannelClass(void)
 {
 	Free();
 }
 
-/*********************************************************************************************** 
- * AdaptiveDeltaMotionChannelClass::Free -- de-allocates all memory in use                                  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/18/2000 JGA  : Created.                                                                 * 
+/***********************************************************************************************
+ * AdaptiveDeltaMotionChannelClass::Free -- de-allocates all memory in use                                  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/18/2000 JGA  : Created.                                                                 *
  *=============================================================================================*/
 void AdaptiveDeltaMotionChannelClass::Free(void)
 {
-	if (Data) {
-		delete[] Data;
-		Data = NULL;
-	}
-
-	if (CacheData) {
-		delete CacheData;
-		CacheData = NULL;
-	}
+	delete[] Data;
+	Data = NULL;
 
-}	// Free
+	delete CacheData;
+	CacheData = NULL;
+}
 
 
-/*********************************************************************************************** 
- * AdaptiveDeltaMotionChannelClass::Load -- loads a motion channel from a file                              * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/18/2000 JGA : Created.                                                                 * 
+/***********************************************************************************************
+ * AdaptiveDeltaMotionChannelClass::Load -- loads a motion channel from a file                              *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/18/2000 JGA : Created.                                                                 *
  *=============================================================================================*/
 bool AdaptiveDeltaMotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 {
@@ -947,7 +931,7 @@ bool AdaptiveDeltaMotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 	if (cload.Read(&chan,sizeof(W3dAdaptiveDeltaAnimChannelStruct)) != sizeof(W3dAdaptiveDeltaAnimChannelStruct)) {
 		return false;
 	}
-						
+
 	VectorLen   = chan.VectorLen;
 	Type 		   = chan.Flags;
 	PivotIdx    = chan.Pivot;
@@ -958,31 +942,31 @@ bool AdaptiveDeltaMotionChannelClass::Load_W3D(ChunkLoadClass & cload)
 
 	Data = MSGW3DNEWARRAY("AdaptiveDeltaMotionChannelClass::Data") uint32[numInts];
 	Data[0] = chan.Data[0];
-	
+
 	if (cload.Read(&(Data[1]), datasize) != datasize) {
 		Free();
 		return false;
-	}	
+	}
 	return true;
 
-}	// Load_W3D
+}
 
 
-/*********************************************************************************************** 
- * AdaptiveDeltaMotionChannelClass::decompress																  * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/23/2000 JGA  : Created.                                                                * 
+/***********************************************************************************************
+ * AdaptiveDeltaMotionChannelClass::decompress																  *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/23/2000 JGA  : Created.                                                                *
  *=============================================================================================*/
 #define PACKET_SIZE (9)
 void AdaptiveDeltaMotionChannelClass::decompress(uint32 frame_idx, float *outdata)
-{	  
+{
 	// Start Over from the beginning
 	float *base	= (float *) &Data[0];	// pointer to our true know beginning values
 
@@ -991,7 +975,7 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 frame_idx, float *outdat
 	for(int vi=0; vi<VectorLen; vi++) {
 		// Decompress all the vector indices, since they will probably all be needed
 		unsigned char *pPacket = (unsigned char *) Data;	// pointer to current packet
-		pPacket+= (sizeof(float) * VectorLen);					// skip non-compressed header information 
+		pPacket+= (sizeof(float) * VectorLen);					// skip non-compressed header information
 		pPacket+= PACKET_SIZE * vi;								// skip to the appropriate packet start
 
 		float last_value = base[vi];
@@ -1008,7 +992,7 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 frame_idx, float *outdat
 			for (int fi=0; fi < 16; fi++) {
 
 				int pi = fi>>1;	// create packet index
-		  
+
 				int factor;			// factor, contains extracted nybble -8 to +7
 
 				if (fi & 1) {
@@ -1026,7 +1010,7 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 frame_idx, float *outdat
 				}
 
 				// Convert to Floating Point
-			
+
 				float ffactor = factor;
 
 				float delta = ffactor * filter;
@@ -1039,27 +1023,27 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 frame_idx, float *outdat
 				}
 				frame++;
 
-			} // for fi < 16
+			}
 
 			if (done) break;	// we're at the desired frame
 
 			pPacket+= ((PACKET_SIZE * VectorLen) - 1);	// skip to next packet
 
-		} // for frame_idx
-      
+		}
+
       outdata[vi] = last_value;
 
-	} // for vi=0; vi < 4
+	}
+
+}
 
-} // decompress, from beginning
-				  
 void AdaptiveDeltaMotionChannelClass::decompress(uint32 src_idx, float *srcdata, uint32 frame_idx, float *outdata)
-{	 		
+{
 	// Contine decompressing from src_idx, up to frame_idx
-   
-   assert(src_idx < frame_idx);											  
+
+   assert(src_idx < frame_idx);
    src_idx++;
-   
+
 	float *base	= (float *) &Data[0];	// pointer to our true know beginning values
    base += VectorLen;						// skip header information
 
@@ -1069,11 +1053,11 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 src_idx, float *srcdata,
 		// Decompress all the vector indices, since they will probably all be needed
 		unsigned char *pPacket = (unsigned char *) base;	// pointer to current packet
 		pPacket+= PACKET_SIZE * vi;								// skip to the appropriate packet start
-		pPacket+= (PACKET_SIZE * VectorLen) * ((src_idx-1)>>4); // skip out to current packet				 
-               
-      // initial filter index 
-      int fi = (src_idx-1) & 0xF;          
-                   
+		pPacket+= (PACKET_SIZE * VectorLen) * ((src_idx-1)>>4); // skip out to current packet
+
+      // initial filter index
+      int fi = (src_idx-1) & 0xF;
+
 		float last_value = srcdata[vi];
 
 		for (uint32 frame=src_idx; frame<=frame_idx;) {
@@ -1088,7 +1072,7 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 src_idx, float *srcdata,
 			for (fi; fi < 16; fi++) {
 
 				int pi = fi>>1;	// create packet index
-		  
+
 				int factor;			// factor, contains extracted nybble -8 to +7
 
 				if (fi & 1) {
@@ -1106,7 +1090,7 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 src_idx, float *srcdata,
 				}
 
 				// Convert to Floating Point
-			
+
 				float ffactor = factor;
 
 				float delta = ffactor * filter;
@@ -1119,33 +1103,33 @@ void AdaptiveDeltaMotionChannelClass::decompress(uint32 src_idx, float *srcdata,
 				}
 				frame++;
 
-			} // for fi < 16
+			}
          fi = 0;
 
 			if (done) break;	// we're at the desired frame
 
 			pPacket+= ((PACKET_SIZE * VectorLen) - 1);	// skip to next packet
 
-		} // for frame_idx
-      
+		}
+
       outdata[vi] = last_value;
 
-	} // for vi=0; vi < 4
-   
-} // decompress, from continuation											
-                           
-
-/*********************************************************************************************** 
- * AdaptiveDeltaMotionChannelClass::getframe returns decompressed data for frame/vectorindex   * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/18/2000 JGA  : Created.                                                                 * 
+	}
+
+}
+
+
+/***********************************************************************************************
+ * AdaptiveDeltaMotionChannelClass::getframe returns decompressed data for frame/vectorindex   *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/18/2000 JGA  : Created.                                                                 *
  *=============================================================================================*/
 float AdaptiveDeltaMotionChannelClass::getframe(uint32 frame_idx, uint32 vector_idx)
 {
@@ -1162,72 +1146,72 @@ float AdaptiveDeltaMotionChannelClass::getframe(uint32 frame_idx, uint32 vector_
 	if ((CacheFrame+1) == frame_idx) {
 		return(CacheData[vector_idx + VectorLen]);
 	}
-		
+
 	if (frame_idx < CacheFrame)  {
 		// Requested Frame isn't cached, so cache it, and frame_idx+1, and return the decompressed data
       // from frame_idx
-      
+
       decompress(frame_idx, &CacheData[0]);
-      
+
       if (frame_idx != (NumFrames - 1))  {
       	decompress(frame_idx, &CacheData[0], frame_idx+1, &CacheData[VectorLen]);
       }
-      
-      CacheFrame = frame_idx;	
-         
+
+      CacheFrame = frame_idx;
+
       return(CacheData[vector_idx]);
-	}	 
-   
+	}
+
    // Copy last known Cached data down
-   
+
    if (frame_idx == (CacheFrame + 2))  {
-   	
+
       // Sliding window
    	memcpy(&CacheData[0], &CacheData[VectorLen], VectorLen * sizeof(float));
-      
+
       CacheFrame++;
-      
+
       decompress(CacheFrame, &CacheData[0], frame_idx, &CacheData[VectorLen]);
-      
+
     	return(CacheData[VectorLen + vector_idx]);
    }
-   
+
    // Else just use last known frame to decompress forwards
-   
+
    assert(VectorLen <= 4);
-   
+
    float temp[4];
-   
+
    memcpy(&temp[0], &CacheData[VectorLen], VectorLen * sizeof(float));
-   
+
    decompress(CacheFrame, &temp[0], frame_idx, &CacheData[0]);
-   CacheFrame = frame_idx;																	  
-   
+   CacheFrame = frame_idx;
+
    if (frame_idx != (NumFrames - 1))  {
-   	decompress(CacheFrame, &CacheData[0], frame_idx+1, &CacheData[VectorLen]);	
+   	decompress(CacheFrame, &CacheData[0], frame_idx+1, &CacheData[VectorLen]);
    }
-   
+
    return(CacheData[vector_idx]);
 
-} // getframe
-
-/*********************************************************************************************** 
- * AdaptiveDeltaMotionChannelClass::Get_Vector -- returns the vector for the specified frame # * 
- *                                                                                             * 
- * INPUT:                                                                                      * 
- *                                                                                             * 
- * OUTPUT:                                                                                     * 
- *                                                                                             * 
- * WARNINGS:                                                                                   * 
- *                                                                                             * 
- * HISTORY:                                                                                    * 
- *   02/18/2000 JGA  : Created.                                                                 * 
+}
+
+/***********************************************************************************************
+ * AdaptiveDeltaMotionChannelClass::Get_Vector -- returns the vector for the specified frame # *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ *                                                                                             *
+ * OUTPUT:                                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ *                                                                                             *
+ * HISTORY:                                                                                    *
+ *   02/18/2000 JGA  : Created.                                                                 *
  *=============================================================================================*/
 void	AdaptiveDeltaMotionChannelClass::Get_Vector(float32 frame,float * setvec)
-{		
+{
 
 	uint32 frame1 = frame;
-	
+
 	float ratio = frame - frame1;
 
 	float value1 = getframe(frame1);
@@ -1236,7 +1220,7 @@ void	AdaptiveDeltaMotionChannelClass::Get_Vector(float32 frame,float * setvec)
    *setvec = WWMath::Lerp(value1,value2,ratio);
 
 
-}	// Get_Vector
+}
 
 
 //
@@ -1269,7 +1253,7 @@ Quaternion AdaptiveDeltaMotionChannelClass::Get_QuatVector(float32 frame)
 
 	return( q );
 
-} // Get_QuatVector
+}
 
 //==========================================================================================
 void MotionChannelClass::
@@ -1309,7 +1293,7 @@ return;
 		value-=ValueOffset;
 		value*=inv_scale;
 		int ivalue=WWMath::Float_To_Int_Floor(value);
-		CompressedData[i]=unsigned short(ivalue);
+		CompressedData[i]=(unsigned short)(ivalue);
 
 		float new_scale=ValueScale/65535.0f;
 		float new_value=int(CompressedData[i]);
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h
index a1982baa575..354ac9c7f80 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h
@@ -17,31 +17,25 @@
 */
 
 /* $Header: /Commando/Code/ww3d2/motchan.h 5     11/29/01 1:07p Jani_p $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/ww3d2/motchan.h                              $* 
- *                                                                                             * 
- *                      $Author:: Jani_p                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 11/28/01 5:43p                                              $* 
- *                                                                                             * 
- *                    $Revision:: 5                                                           $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/ww3d2/motchan.h                              $*
+ *                                                                                             *
+ *                      $Author:: Jani_p                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 11/28/01 5:43p                                              $*
+ *                                                                                             *
+ *                    $Revision:: 5                                                           $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef MOTCHAN_H
-#define MOTCHAN_H
 
 #include "always.h"
 #include "bittype.h"
@@ -72,7 +66,7 @@ class MotionChannelClass : public W3DMPO
 	MotionChannelClass(void);
 	~MotionChannelClass(void);
 
-	bool	Load_W3D(ChunkLoadClass & cload);		
+	bool	Load_W3D(ChunkLoadClass & cload);
 	WWINLINE int Get_Type(void) const { return Type; }
 	WWINLINE int Get_Pivot(void) const { return PivotIdx; }
 	WWINLINE void Set_Pivot(int idx) { PivotIdx=idx; }
@@ -125,7 +119,7 @@ WWINLINE void	MotionChannelClass::Get_Vector(int frame,float * setvec) const
 		set_identity(setvec);
 
 	} else {
-	
+
 		int vframe = frame - FirstFrame;
 
 		for (int i=0; i<VectorLen; i++) {
@@ -142,7 +136,7 @@ WWINLINE void MotionChannelClass::Get_Vector_As_Quat(int frame, Quaternion& quat
 		quat.Set(0.0f, 0.0f, 0.0f, 1.0f);
 
 	} else {
-	
+
 		const float* d = &Data[(frame - FirstFrame) * VectorLen];
 		quat.Set(d[0], d[1], d[2], d[3]);
 
@@ -154,7 +148,7 @@ WWINLINE void MotionChannelClass::Get_Vector_As_Quat(int frame, Quaternion& quat
 /******************************************************************************
 
 	BitChannelClass is used to store a boolean "on/off" value for each frame
-	in an animation.  
+	in an animation.
 
 ******************************************************************************/
 
@@ -195,12 +189,12 @@ WWINLINE int BitChannelClass::Get_Bit(int frame) const
 		return DefaultVal;
 
 	} else {
-	
+
 		int bit = frame - FirstFrame;
 
 		uint8 mask = (uint8)(1 << (bit % 8));
 		return ((*(Bits + (bit/8)) & mask) != 0);
-		
+
 	}
 }
 
@@ -223,7 +217,7 @@ class TimeCodedMotionChannelClass : public W3DMPO
 	TimeCodedMotionChannelClass(void);
 	~TimeCodedMotionChannelClass(void);
 
-	bool	Load_W3D(ChunkLoadClass & cload);		
+	bool	Load_W3D(ChunkLoadClass & cload);
 	int	Get_Type(void) { return Type; }
 	int	Get_Pivot(void) { return PivotIdx; }
 	void	Get_Vector(float32 frame, float * setvec);
@@ -236,12 +230,12 @@ class TimeCodedMotionChannelClass : public W3DMPO
 	uint32	Type;					// what type of channel is this
 	int		VectorLen;			// size of each individual vector
 	uint32	PacketSize;			// size of each packet
-	
+
 	uint32	NumTimeCodes;		// Number of packets
 
 	uint32	LastTimeCodeIdx;	// absolute index to last time code
 	uint32	CachedIdx;			// Last Index Used
-  
+
 	uint32	*	Data;			 	// pointer to packet data
 
 	void 		Free(void);
@@ -261,7 +255,7 @@ class AdaptiveDeltaMotionChannelClass : public W3DMPO
 	AdaptiveDeltaMotionChannelClass(void);
 	~AdaptiveDeltaMotionChannelClass(void);
 
-	bool	Load_W3D(ChunkLoadClass & cload);		
+	bool	Load_W3D(ChunkLoadClass & cload);
 	int	Get_Type(void) { return Type; }
 	int	Get_Pivot(void) { return PivotIdx; }
 	void	Get_Vector(float32 frame, float * setvec);
@@ -273,11 +267,11 @@ class AdaptiveDeltaMotionChannelClass : public W3DMPO
 	uint32	PivotIdx;			// what pivot is this channel applied to
 	uint32	Type;					// what type of channel is this
 	int		VectorLen;			// size of each individual vector
-	
+
 	uint32	NumFrames;			// Number of frames
 
 	float		Scale;				// Scale Filter, this much
-  
+
 	uint32  *Data;				 	// pointer to packet data
 
 	uint32	CacheFrame;
@@ -297,7 +291,7 @@ class AdaptiveDeltaMotionChannelClass : public W3DMPO
 /******************************************************************************
 
 	TimeCodedBitChannelClass is used to store a boolean "on/off" value for each frame
-	in an animation.  
+	in an animation.
 
 ******************************************************************************/
 
@@ -320,7 +314,7 @@ class TimeCodedBitChannelClass : public W3DMPO
 	uint32	PivotIdx;
 	uint32	Type;
 	int		DefaultVal;
-	
+
 	uint32	NumTimeCodes;
 	uint32	CachedIdx;
 
@@ -330,6 +324,3 @@ class TimeCodedBitChannelClass : public W3DMPO
 
 	friend class HCompressedAnimClass;
 };
-
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.cpp
index 1194eebdd59..68fe079e741 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.cpp
@@ -38,43 +38,40 @@
 #include "nullrobj.h"
 #include "chunkio.h"
 
-#include <string.h>
-
-
 NullLoaderClass _NullLoader;
 
 
 
 
-Null3DObjClass::Null3DObjClass(const char * name)																	
+Null3DObjClass::Null3DObjClass(const char * name)
 {
-	strcpy(Name, name);
+	strlcpy(Name, name, ARRAY_SIZE(Name));
 }
 
-Null3DObjClass::Null3DObjClass(const Null3DObjClass & src)									
+Null3DObjClass::Null3DObjClass(const Null3DObjClass & src)
 {
 	strcpy(Name, src.Name);
 }
 
-Null3DObjClass & Null3DObjClass::operator = (const Null3DObjClass & that)				
+Null3DObjClass & Null3DObjClass::operator = (const Null3DObjClass & that)
 {
 	strcpy(Name, that.Name);
 
-	RenderObjClass::operator = (that); return *this; 
+	RenderObjClass::operator = (that); return *this;
 }
 
-int Null3DObjClass::Class_ID(void) const													
-{ 
-	return CLASSID_NULL; 
+int Null3DObjClass::Class_ID(void) const
+{
+	return CLASSID_NULL;
 }
 
-RenderObjClass * Null3DObjClass::Clone(void) const									
-{ 
-	return NEW_REF( Null3DObjClass, (*this)); 
+RenderObjClass * Null3DObjClass::Clone(void) const
+{
+	return NEW_REF( Null3DObjClass, (*this));
 }
 
 void Null3DObjClass::Render(RenderInfoClass & rinfo)
-{ 
+{
 }
 
 void Null3DObjClass::Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const
@@ -115,4 +112,4 @@ PrototypeClass * NullLoaderClass::Load_W3D (ChunkLoadClass &cload)
 	W3dNullObjectStruct null;
 	cload.Read(&null,sizeof(null));
 	return W3DNEW NullPrototypeClass(null);
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
index 8462725b640..8c674ca8961 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
@@ -34,18 +34,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef NULL_H
-#define NULL_H
 
-#ifndef RENDOBJ_H
 #include "rendobj.h"
-#endif
-
 #include "proto.h"
 
 class Null3DObjClass : public RenderObjClass
@@ -55,7 +46,7 @@ class Null3DObjClass : public RenderObjClass
 	Null3DObjClass(const char * name = "NULL");
 	Null3DObjClass(const Null3DObjClass & src);
 	Null3DObjClass & operator = (const Null3DObjClass & that);
-			
+
 	virtual int						Class_ID(void) const;
 	virtual RenderObjClass *	Clone(void) const;
 	virtual const char *			Get_Name(void) const						{ return Name; }
@@ -99,7 +90,3 @@ class NullLoaderClass : public PrototypeLoaderClass
 ** automatically install at creation time
 */
 extern NullLoaderClass _NullLoader;
-
-
-#endif
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
index f8edab3d7c2..6f8e52b0d59 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/part_buf.cpp       $* 
- *                                                                         * 
- *                      $Author:: Jani_p                                  $* 
- *                                                                         * 
- *                     $Modtime:: 9/07/01 12:57p                          $* 
- *                                                                         * 
- *                    $Revision:: 20                                      $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/part_buf.cpp       $*
+ *                                                                         *
+ *                      $Author:: Jani_p                                  $*
+ *                                                                         *
+ *                     $Modtime:: 9/07/01 12:57p                          $*
+ *                                                                         *
+ *                    $Revision:: 20                                      $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 #include "part_buf.h"
 #include "part_emt.h"
@@ -83,22 +83,22 @@ static const W3dEmitterLinePropertiesStruct _DefaultLineEmitterProps=
 
 ParticleBufferClass::ParticleBufferClass
 (
-	ParticleEmitterClass *emitter, 
+	ParticleEmitterClass *emitter,
 	unsigned int buffer_size,
-	ParticlePropertyStruct<Vector3> &color, 
+	ParticlePropertyStruct<Vector3> &color,
 	ParticlePropertyStruct<float> &opacity,
-	ParticlePropertyStruct<float> &size, 
+	ParticlePropertyStruct<float> &size,
 	ParticlePropertyStruct<float> &rotation,
 	float orient_rnd,
 	ParticlePropertyStruct<float> &frame,
 	ParticlePropertyStruct<float> &blurtime,
-	Vector3 accel, 
-	float max_age, 
+	Vector3 accel,
+	float max_age,
 	float future_start,
 	TextureClass *tex,
-	ShaderClass shader, 
+	ShaderClass shader,
 	bool pingpong,
-	int render_mode, 
+	int render_mode,
 	int frame_mode,
 	const W3dEmitterLinePropertiesStruct * line_props
 ) :
@@ -222,16 +222,16 @@ ParticleBufferClass::ParticleBufferClass
 	// These inputs don't need to be range-checked (emitter did that).
 	Accel = accel;
 	HasAccel = (accel.X != 0.0f) || (accel.Y != 0.0f) || (accel.Z != 0.0f);
-   
+
 	shader.Enable_Fog ("ParticleBufferClass");
-	switch (RenderMode)	
+	switch (RenderMode)
 	{
 	case W3D_EMITTER_RENDER_MODE_TRI_PARTICLES:
 		{
 			// Set up worldspace point group
 			PointGroup = W3DNEW PointGroupClass();
 			PointGroup->Set_Flag(PointGroupClass::TRANSFORM, true);
-			PointGroup->Set_Texture(tex);			
+			PointGroup->Set_Texture(tex);
 			PointGroup->Set_Shader(shader);
 			PointGroup->Set_Frame_Row_Column_Count_Log2(frame_mode);
 			PointGroup->Set_Point_Mode(PointGroupClass::TRIS);
@@ -242,20 +242,20 @@ ParticleBufferClass::ParticleBufferClass
 			// Set up worldspace point group
 			PointGroup = W3DNEW PointGroupClass();
 			PointGroup->Set_Flag(PointGroupClass::TRANSFORM, true);
-			PointGroup->Set_Texture(tex);			
+			PointGroup->Set_Texture(tex);
 			PointGroup->Set_Shader(shader);
 			PointGroup->Set_Frame_Row_Column_Count_Log2(frame_mode);
 			PointGroup->Set_Point_Mode(PointGroupClass::QUADS);
 		}
 		break;
 	case W3D_EMITTER_RENDER_MODE_LINE:
-		{			
+		{
 			LineRenderer = W3DNEW SegLineRendererClass;
 			LineRenderer->Init(*line_props);
 			LineRenderer->Set_Texture(tex);
 			LineRenderer->Set_Shader(shader);
 			LineRenderer->Set_Width(Get_Particle_Size());
-			if (line_props != NULL) {				
+			if (line_props != NULL) {
 				LineRenderer->Init(*line_props);
 			} else {
 				// This code should not be run, but if it does,
@@ -295,7 +295,7 @@ ParticleBufferClass::ParticleBufferClass
 	default:
 		WWASSERT(0);
 		break;
-	}	
+	}
 
 	// Set up circular buffer. Contents are not initialized because the
 	// start/end indices currently indicate the buffer is empty.
@@ -305,7 +305,7 @@ ParticleBufferClass::ParticleBufferClass
 	}
 	APT = NEW_REF( ShareBufferClass<unsigned int> , (MaxNum, "ParticleBufferClass::APT") );
 	GroupID = NEW_REF( ShareBufferClass<unsigned char> , (MaxNum, "ParticleBufferClass::GroupID") );
-	Velocity = W3DNEWARRAY Vector3[MaxNum]; 
+	Velocity = W3DNEWARRAY Vector3[MaxNum];
 	TimeStamp = W3DNEWARRAY unsigned int[MaxNum];
 
 	// So that the object is ready for use after construction, we will
@@ -420,7 +420,7 @@ ParticleBufferClass::ParticleBufferClass(const ParticleBufferClass & src) :
 	Emitter(src.Emitter),
 	DecimationThreshold(src.DecimationThreshold),
 	ProjectedArea(0.0f),
-	DefaultTailDiffuse(src.DefaultTailDiffuse)	
+	DefaultTailDiffuse(src.DefaultTailDiffuse)
 {
 	Position[0] = NULL;
 	Position[1] = NULL;
@@ -625,7 +625,7 @@ ParticleBufferClass::ParticleBufferClass(const ParticleBufferClass & src) :
 	Accel = src.Accel;
 	HasAccel = src.HasAccel;
 
-	switch (RenderMode)	
+	switch (RenderMode)
 	{
 	case W3D_EMITTER_RENDER_MODE_TRI_PARTICLES:
 		{
@@ -652,7 +652,7 @@ ParticleBufferClass::ParticleBufferClass(const ParticleBufferClass & src) :
 		}
 		break;
 	case W3D_EMITTER_RENDER_MODE_LINE:
-		{	
+		{
 			WWASSERT(src.LineRenderer);
 			LineRenderer = W3DNEW SegLineRendererClass(*src.LineRenderer);
 		}
@@ -698,7 +698,7 @@ ParticleBufferClass::ParticleBufferClass(const ParticleBufferClass & src) :
 	}
 	APT = NEW_REF( ShareBufferClass<unsigned int> , (MaxNum, "ParticleBufferClass::APT") );
 	GroupID = NEW_REF( ShareBufferClass<unsigned char> , (MaxNum, "ParticleBufferClass::GroupID") );
-	Velocity = W3DNEWARRAY Vector3[MaxNum]; 
+	Velocity = W3DNEWARRAY Vector3[MaxNum];
 	TimeStamp = W3DNEWARRAY unsigned int[MaxNum];
 
 	// So that the object is ready for use after construction, we will
@@ -728,37 +728,37 @@ ParticleBufferClass & ParticleBufferClass::operator = (const ParticleBufferClass
 
 ParticleBufferClass::~ParticleBufferClass(void)
 {
-	if (NewParticleQueue)				delete [] NewParticleQueue;
-	if (ColorKeyFrameTimes)				delete [] ColorKeyFrameTimes;
-	if (ColorKeyFrameValues)			delete [] ColorKeyFrameValues;
-	if (ColorKeyFrameDeltas)			delete [] ColorKeyFrameDeltas;
-	if (AlphaKeyFrameTimes)				delete [] AlphaKeyFrameTimes;
-	if (AlphaKeyFrameValues)			delete [] AlphaKeyFrameValues;
-	if (AlphaKeyFrameDeltas)			delete [] AlphaKeyFrameDeltas;
-	if (SizeKeyFrameTimes)				delete [] SizeKeyFrameTimes;
-	if (SizeKeyFrameValues)				delete [] SizeKeyFrameValues;
-	if (SizeKeyFrameDeltas)				delete [] SizeKeyFrameDeltas;
-	if (RotationKeyFrameTimes)			delete [] RotationKeyFrameTimes;
-	if (RotationKeyFrameValues)		delete [] RotationKeyFrameValues;
-	if (HalfRotationKeyFrameDeltas)	delete [] HalfRotationKeyFrameDeltas;
-	if (OrientationKeyFrameValues)	delete [] OrientationKeyFrameValues;
-	if (FrameKeyFrameTimes)				delete [] FrameKeyFrameTimes;
-	if (FrameKeyFrameValues)			delete [] FrameKeyFrameValues;
-	if (FrameKeyFrameDeltas)			delete [] FrameKeyFrameDeltas;
-	if (BlurTimeKeyFrameTimes)			delete [] BlurTimeKeyFrameTimes;
-	if (BlurTimeKeyFrameValues)		delete [] BlurTimeKeyFrameValues;
-	if (BlurTimeKeyFrameDeltas)		delete [] BlurTimeKeyFrameDeltas;
-	if (RandomColorEntries)				delete [] RandomColorEntries;
-	if (RandomAlphaEntries)				delete [] RandomAlphaEntries;
-	if (RandomSizeEntries)				delete [] RandomSizeEntries;
-	if (RandomRotationEntries)			delete [] RandomRotationEntries;
-	if (RandomOrientationEntries)		delete [] RandomOrientationEntries;
-	if (RandomFrameEntries)				delete [] RandomFrameEntries;
-	if (RandomBlurTimeEntries)			delete [] RandomBlurTimeEntries;
-	
-	if (PointGroup)						delete PointGroup;
-	if (LineRenderer)						delete LineRenderer;
-	if (LineGroup)							delete LineGroup;
+	delete [] NewParticleQueue;
+	delete [] ColorKeyFrameTimes;
+	delete [] ColorKeyFrameValues;
+	delete [] ColorKeyFrameDeltas;
+	delete [] AlphaKeyFrameTimes;
+	delete [] AlphaKeyFrameValues;
+	delete [] AlphaKeyFrameDeltas;
+	delete [] SizeKeyFrameTimes;
+	delete [] SizeKeyFrameValues;
+	delete [] SizeKeyFrameDeltas;
+	delete [] RotationKeyFrameTimes;
+	delete [] RotationKeyFrameValues;
+	delete [] HalfRotationKeyFrameDeltas;
+	delete [] OrientationKeyFrameValues;
+	delete [] FrameKeyFrameTimes;
+	delete [] FrameKeyFrameValues;
+	delete [] FrameKeyFrameDeltas;
+	delete [] BlurTimeKeyFrameTimes;
+	delete [] BlurTimeKeyFrameValues;
+	delete [] BlurTimeKeyFrameDeltas;
+	delete [] RandomColorEntries;
+	delete [] RandomAlphaEntries;
+	delete [] RandomSizeEntries;
+	delete [] RandomRotationEntries;
+	delete [] RandomOrientationEntries;
+	delete [] RandomFrameEntries;
+	delete [] RandomBlurTimeEntries;
+
+	delete PointGroup;
+	delete LineRenderer;
+	delete LineGroup;
 
 	REF_PTR_RELEASE(Position[0]);
 	REF_PTR_RELEASE(Position[1]);
@@ -774,8 +774,9 @@ ParticleBufferClass::~ParticleBufferClass(void)
 	REF_PTR_RELEASE(APT);
 	REF_PTR_RELEASE(GroupID);
 
-	if (Velocity)	delete [] Velocity;
-	if (TimeStamp)	delete [] TimeStamp;
+	delete [] Velocity;
+	delete [] TimeStamp;
+
 	if (Emitter) {
 		// We should not have an emitter at this point, since the emitter
 		// should still have a live ref to us if it still exists which would
@@ -788,7 +789,7 @@ ParticleBufferClass::~ParticleBufferClass(void)
 		// other neither would ever get deleted).
 		// Emitter->Release_Ref();
 		Emitter = NULL;
-	}	
+	}
 
 	// Update Global Count
 	TotalActiveCount--;
@@ -814,15 +815,15 @@ int ParticleBufferClass::Get_Particle_Count(void) const
 
 void ParticleBufferClass::Render(RenderInfoClass & rinfo)
 {
-	WWPROFILE("ParticleBuffer::Render");	
+	WWPROFILE("ParticleBuffer::Render");
 
 	unsigned int sort_level = SORT_LEVEL_NONE;
 
 	if (!WW3D::Is_Sorting_Enabled())
 		sort_level=Get_Shader().Guess_Sort_Level();
 
-	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level!=SORT_LEVEL_NONE) {		
-		
+	if (WW3D::Are_Static_Sort_Lists_Enabled() && sort_level!=SORT_LEVEL_NONE) {
+
 		WW3D::Add_To_Static_Sort_List(this, sort_level);
 
 	} else {
@@ -944,7 +945,7 @@ void ParticleBufferClass::Render_Particles(RenderInfoClass & rinfo)
 
 	unsigned int active_point_count = 0;
 
-	Generate_APT(&apt,active_point_count);	
+	Generate_APT(&apt,active_point_count);
 
 	// Set color, alpha, size defaults if array not present:
 	if (!Color) {
@@ -977,8 +978,8 @@ void ParticleBufferClass::Render_Particles(RenderInfoClass & rinfo)
 	Combine_Color_And_Alpha();
 
 	PointGroup->Set_Arrays(Position[pingpong], Diffuse, apt, Size, Orientation, Frame, active_point_count);
-	Update_Bounding_Box();	
-	PointGroup->Render(rinfo);	
+	Update_Bounding_Box();
+	PointGroup->Render(rinfo);
 }
 
 
@@ -1003,7 +1004,7 @@ void ParticleBufferClass::Render_Line(RenderInfoClass & rinfo)
 	Vector4 default_diffuse(0, 0, 0, 0);
 	unsigned char *ids = GroupID->Get_Array();
 	Combine_Color_And_Alpha();
-	if (Diffuse) {		
+	if (Diffuse) {
 		diffuse = Diffuse->Get_Array();
 	} else {
 		default_diffuse.Set(ColorKeyFrameValues[0].X, ColorKeyFrameValues[0].Y, ColorKeyFrameValues[0].Z,
@@ -1038,7 +1039,7 @@ void ParticleBufferClass::Render_Line(RenderInfoClass & rinfo)
 			tmp_id.Add(last_id);
 		}
 	}
-	
+
 	for (i = sub2_start; i < End; i++) {
 		if (PermutationArray[i & 0xF] >= DecimationThreshold) {
 			tmp_points.Add(positions[i]);
@@ -1049,13 +1050,13 @@ void ParticleBufferClass::Render_Line(RenderInfoClass & rinfo)
 		}
 	}
 
-	// add in the emitter's position too for the source	
+	// add in the emitter's position too for the source
 	if (Emitter && !Emitter->Is_Stopped() && (last_id == CurrentGroupID)) {
 		tmp_points.Add(Emitter->Get_Position());
 		// it has the color of the last point
 		tmp_diffuse.Add(*last_color);
 		tmp_id.Add(last_id);
-	}	
+	}
 
 	// If we got any points, render them
 	if (tmp_points.Count() > 0) {
@@ -1065,7 +1066,7 @@ void ParticleBufferClass::Render_Line(RenderInfoClass & rinfo)
 		// Draw line segments only if they are in the same group
 		int count = tmp_points.Count();
 		int start = 0;
-		int end = 0;		
+		int end = 0;
 
 		while (end < count) {
 			// detect contiguous runs of IDs
@@ -1093,9 +1094,9 @@ void ParticleBufferClass::Render_Line_Group(RenderInfoClass & rinfo)
 	// (for LOD purposes), build the active point table:
 	ShareBufferClass<unsigned int> *apt = NULL;
 
-	unsigned int active_point_count = 0;	
+	unsigned int active_point_count = 0;
 
-	Generate_APT(&apt,active_point_count);	
+	Generate_APT(&apt,active_point_count);
 
 	// Set color, alpha, size defaults if array not present:
 	if (!Color) {
@@ -1142,7 +1143,7 @@ void ParticleBufferClass::Render_Line_Group(RenderInfoClass & rinfo)
 			// otherwise allocate and copy tail diffuse
 			if (!TailDiffuse) TailDiffuse=NEW_REF(ShareBufferClass<Vector4>,(MaxNum, "ParticleBufferClass::TailDiffuse"));
 			for (unsigned int i=0; i<MaxNum; i++) {
-				Vector4 elt=Diffuse->Get_Element(i);				
+				Vector4 elt=Diffuse->Get_Element(i);
 				elt.W=0;
 				TailDiffuse->Set_Element(i,elt);
 			}
@@ -1166,10 +1167,10 @@ void ParticleBufferClass::Render_Line_Group(RenderInfoClass & rinfo)
 
 	if (!TailDiffuse)
 		LineGroup->Set_Tail_Diffuse(DefaultTailDiffuse);
-	
+
 	LineGroup->Set_Arrays(Position[pingpong], TailPosition,Diffuse,TailDiffuse, apt, Size, UCoord, active_point_count);
-	Update_Bounding_Box();	
-	LineGroup->Render(rinfo);	
+	Update_Bounding_Box();
+	LineGroup->Render(rinfo);
 }
 
 // Scales the size of the individual particles but doesn't affect their
@@ -1185,7 +1186,7 @@ void ParticleBufferClass::Scale(float scale)
 			SizeKeyFrameDeltas[i] *= scale;
 		}
 	} else {
-		SizeKeyFrameValues[0] *= scale;		
+		SizeKeyFrameValues[0] *= scale;
 	}
 	if (RandomSizeEntries) {
 		for (i = 0; i <= NumRandomSizeEntriesMinus1; i++) {
@@ -1217,7 +1218,7 @@ void ParticleBufferClass::On_Frame_Update(void)
 	if (Emitter) {
 		Emitter->Emit();
 	}
-	
+
 	if (Is_Complete()) {
 		WWASSERT(Scene);
 		Scene->Register(this,SceneClass::RELEASE);
@@ -1381,7 +1382,7 @@ int ParticleBufferClass::Calculate_Cost_Value_Arrays(float screen_area, float *v
 	case W3D_EMITTER_RENDER_MODE_LINEGRP_PRISM:
 		cost_factor = (float)MaxNum * 8.0f * 0.0625f;
 		break;
-	}	
+	}
 	for (lod = 0; lod < LodCount; lod++) {
 		costs[lod] = cost_factor * (float)lod;
 		// If cost is zero set it to a small nonzero amount to avoid divisions by zero.
@@ -1420,7 +1421,7 @@ int ParticleBufferClass::Calculate_Cost_Value_Arrays(float screen_area, float *v
 	return minlod;
 }
 
-		
+
 void ParticleBufferClass::Reset_Colors(ParticlePropertyStruct<Vector3> &new_props)
 {
 
@@ -1443,14 +1444,13 @@ void ParticleBufferClass::Reset_Colors(ParticlePropertyStruct<Vector3> &new_prop
 			Color->Release_Ref();
 			Color = NULL;
 		}
-		if (ColorKeyFrameTimes) {
-			delete [] ColorKeyFrameTimes;
-			ColorKeyFrameTimes = NULL;
-		}
-		if (ColorKeyFrameDeltas) {
-			delete [] ColorKeyFrameDeltas;
-			ColorKeyFrameDeltas = NULL;
-		}
+
+		delete [] ColorKeyFrameTimes;
+		ColorKeyFrameTimes = NULL;
+
+		delete [] ColorKeyFrameDeltas;
+		ColorKeyFrameDeltas = NULL;
+
 		if (ColorKeyFrameValues) {
 			if (NumColorKeyFrames > 1) {
 				delete [] ColorKeyFrameValues;
@@ -1489,21 +1489,10 @@ void ParticleBufferClass::Reset_Colors(ParticlePropertyStruct<Vector3> &new_prop
 		// otherwise release and reallocate.
 		unsigned int new_num_color_key_frames = ckey + 1;// Includes start keyframe (keytime == 0).
 		if (new_num_color_key_frames != NumColorKeyFrames) {
-
-			if (ColorKeyFrameTimes) {
-				delete [] ColorKeyFrameTimes;
-				ColorKeyFrameTimes = NULL;
-			}
-			if (ColorKeyFrameValues) {
-				delete [] ColorKeyFrameValues;
-				ColorKeyFrameValues = NULL;
-			}
-			if (ColorKeyFrameDeltas) {
-				delete [] ColorKeyFrameDeltas;
-				ColorKeyFrameDeltas = NULL;
-			}
-
-			NumColorKeyFrames = new_num_color_key_frames;	
+			NumColorKeyFrames = new_num_color_key_frames;
+			delete [] ColorKeyFrameTimes;
+			delete [] ColorKeyFrameValues;
+			delete [] ColorKeyFrameDeltas;
 			ColorKeyFrameTimes = W3DNEWARRAY unsigned int [NumColorKeyFrames];
 			ColorKeyFrameValues = W3DNEWARRAY Vector3 [NumColorKeyFrames];
 			ColorKeyFrameDeltas = W3DNEWARRAY Vector3 [NumColorKeyFrames];
@@ -1603,14 +1592,13 @@ void ParticleBufferClass::Reset_Opacity(ParticlePropertyStruct<float> &new_props
 			Alpha->Release_Ref();
 			Alpha = NULL;
 		}
-		if (AlphaKeyFrameTimes) {
-			delete [] AlphaKeyFrameTimes;
-			AlphaKeyFrameTimes = NULL;
-		}
-		if (AlphaKeyFrameDeltas) {
-			delete [] AlphaKeyFrameDeltas;
-			AlphaKeyFrameDeltas = NULL;
-		}
+
+		delete [] AlphaKeyFrameTimes;
+		AlphaKeyFrameTimes = NULL;
+
+		delete [] AlphaKeyFrameDeltas;
+		AlphaKeyFrameDeltas = NULL;
+
 		if (AlphaKeyFrameValues) {
 			if (NumAlphaKeyFrames > 1) {
 				delete [] AlphaKeyFrameValues;
@@ -1649,21 +1637,10 @@ void ParticleBufferClass::Reset_Opacity(ParticlePropertyStruct<float> &new_props
 		// otherwise release and reallocate.
 		unsigned int new_num_alpha_key_frames = akey + 1;// Includes start keyframe (keytime == 0).
 		if (new_num_alpha_key_frames != NumAlphaKeyFrames) {
-
-			if (AlphaKeyFrameTimes) {
-				delete [] AlphaKeyFrameTimes;
-				AlphaKeyFrameTimes = NULL;
-			}
-			if (AlphaKeyFrameValues) {
-				delete [] AlphaKeyFrameValues;
-				AlphaKeyFrameValues = NULL;
-			}
-			if (AlphaKeyFrameDeltas) {
-				delete [] AlphaKeyFrameDeltas;
-				AlphaKeyFrameDeltas = NULL;
-			}
-
-			NumAlphaKeyFrames = new_num_alpha_key_frames;	
+			NumAlphaKeyFrames = new_num_alpha_key_frames;
+			delete [] AlphaKeyFrameValues;
+			delete [] AlphaKeyFrameTimes;
+			delete [] AlphaKeyFrameDeltas;
 			AlphaKeyFrameTimes = W3DNEWARRAY unsigned int [NumAlphaKeyFrames];
 			AlphaKeyFrameValues = W3DNEWARRAY float [NumAlphaKeyFrames];
 			AlphaKeyFrameDeltas = W3DNEWARRAY float [NumAlphaKeyFrames];
@@ -1760,14 +1737,13 @@ void ParticleBufferClass::Reset_Size(ParticlePropertyStruct<float> &new_props)
 			Size->Release_Ref();
 			Size = NULL;
 		}
-		if (SizeKeyFrameTimes) {
-			delete [] SizeKeyFrameTimes;
-			SizeKeyFrameTimes = NULL;
-		}
-		if (SizeKeyFrameDeltas) {
-			delete [] SizeKeyFrameDeltas;
-			SizeKeyFrameDeltas = NULL;
-		}
+
+		delete [] SizeKeyFrameTimes;
+		SizeKeyFrameTimes = NULL;
+
+		delete [] SizeKeyFrameDeltas;
+		SizeKeyFrameDeltas = NULL;
+
 		if (SizeKeyFrameValues) {
 			if (NumSizeKeyFrames > 1) {
 				delete [] SizeKeyFrameValues;
@@ -1806,21 +1782,10 @@ void ParticleBufferClass::Reset_Size(ParticlePropertyStruct<float> &new_props)
 		// otherwise release and reallocate.
 		unsigned int new_num_size_key_frames = skey + 1;// Includes start keyframe (keytime == 0).
 		if (new_num_size_key_frames != NumSizeKeyFrames) {
-
-			if (SizeKeyFrameTimes) {
-				delete [] SizeKeyFrameTimes;
-				SizeKeyFrameTimes = NULL;
-			}
-			if (SizeKeyFrameValues) {
-				delete [] SizeKeyFrameValues;
-				SizeKeyFrameValues = NULL;
-			}
-			if (SizeKeyFrameDeltas) {
-				delete [] SizeKeyFrameDeltas;
-				SizeKeyFrameDeltas = NULL;
-			}
-
-			NumSizeKeyFrames = new_num_size_key_frames;	
+			NumSizeKeyFrames = new_num_size_key_frames;
+			delete [] SizeKeyFrameTimes;
+			delete [] SizeKeyFrameValues;
+			delete [] SizeKeyFrameDeltas;
 			SizeKeyFrameTimes = W3DNEWARRAY unsigned int [NumSizeKeyFrames];
 			SizeKeyFrameValues = W3DNEWARRAY float [NumSizeKeyFrames];
 			SizeKeyFrameDeltas = W3DNEWARRAY float [NumSizeKeyFrames];
@@ -1909,7 +1874,7 @@ void ParticleBufferClass::Reset_Size(ParticlePropertyStruct<float> &new_props)
 void ParticleBufferClass::Reset_Rotations(ParticlePropertyStruct<float> &new_props, float orient_rnd)
 {
 
-	unsigned int i;	// Used in loops	
+	unsigned int i;	// Used in loops
    float oo_intmax = 1.0f / (float)INT_MAX;
 	unsigned int ui_previous_key_time = 0;
 	unsigned int ui_current_key_time = 0;
@@ -1928,29 +1893,25 @@ void ParticleBufferClass::Reset_Rotations(ParticlePropertyStruct<float> &new_pro
 	bool rotation_rand_zero = fabs(new_props.Rand) < eps_rotation;
 	if (orientation_rand_zero && rotation_rand_zero && new_props.NumKeyFrames == 0 && fabs(new_props.Start) < eps_rotation) {
 
-		// Release Arrays, 
+		// Release Arrays,
 		REF_PTR_RELEASE(Orientation);
-		if (RotationKeyFrameTimes) {
-			delete [] RotationKeyFrameTimes;
-			RotationKeyFrameTimes = NULL;
-		}
-		if (HalfRotationKeyFrameDeltas) {
-			delete [] HalfRotationKeyFrameDeltas;
-			HalfRotationKeyFrameDeltas = NULL;
-		}
-		if (RotationKeyFrameValues) {
-			delete [] RotationKeyFrameValues;
-			RotationKeyFrameValues = NULL;
-		}
-		if (OrientationKeyFrameValues) {
-			delete [] OrientationKeyFrameValues;
-			OrientationKeyFrameValues = NULL;
-		}
+
+		delete [] RotationKeyFrameTimes;
+		RotationKeyFrameTimes = NULL;
+
+		delete [] HalfRotationKeyFrameDeltas;
+		HalfRotationKeyFrameDeltas = NULL;
+
+		delete [] RotationKeyFrameValues;
+		RotationKeyFrameValues = NULL;
+
+		delete [] OrientationKeyFrameValues;
+		OrientationKeyFrameValues = NULL;
 
 		NumRotationKeyFrames = 0;
 		NumRandomRotationEntriesMinus1 = 0;
 		NumRandomOrientationEntriesMinus1 = 0;
-	
+
 	} else {
 
 		// Create the array if not present
@@ -1976,25 +1937,11 @@ void ParticleBufferClass::Reset_Rotations(ParticlePropertyStruct<float> &new_pro
 		// OrientationKeyFrameValues if the right size, otherwise release and reallocate.
 		unsigned int new_num_key_frames = key + 1;// Includes start keyframe (keytime == 0).
 		if (new_num_key_frames != NumRotationKeyFrames) {
-
-			if (RotationKeyFrameTimes) {
-				delete [] RotationKeyFrameTimes;
-				RotationKeyFrameTimes = NULL;
-			}
-			if (RotationKeyFrameValues) {
-				delete [] RotationKeyFrameValues;
-				RotationKeyFrameValues = NULL;
-			}
-			if (HalfRotationKeyFrameDeltas) {
-				delete [] HalfRotationKeyFrameDeltas;
-				HalfRotationKeyFrameDeltas = NULL;
-			}
-			if (OrientationKeyFrameValues) {
-				delete [] OrientationKeyFrameValues;
-				OrientationKeyFrameValues = NULL;
-			}
-
 			NumRotationKeyFrames = new_num_key_frames;
+			delete [] RotationKeyFrameTimes;
+			delete [] RotationKeyFrameValues;
+			delete [] HalfRotationKeyFrameDeltas;
+			delete [] OrientationKeyFrameValues;
 			RotationKeyFrameTimes = W3DNEWARRAY unsigned int [NumRotationKeyFrames];
 			RotationKeyFrameValues = W3DNEWARRAY float [NumRotationKeyFrames];
 			HalfRotationKeyFrameDeltas = W3DNEWARRAY float [NumRotationKeyFrames];
@@ -2120,7 +2067,7 @@ void ParticleBufferClass::Reset_Rotations(ParticlePropertyStruct<float> &new_pro
 void ParticleBufferClass::Reset_Frames(ParticlePropertyStruct<float> &new_props)
 {
 
-	unsigned int i;	// Used in loops	
+	unsigned int i;	// Used in loops
    float oo_intmax = 1.0f / (float)INT_MAX;
 	unsigned int ui_previous_key_time = 0;
 	unsigned int ui_current_key_time = 0;
@@ -2134,18 +2081,17 @@ void ParticleBufferClass::Reset_Frames(ParticlePropertyStruct<float> &new_props)
 	bool frame_rand_zero	= (fabs(new_props.Rand) < eps_frame);
 	if (frame_rand_zero && new_props.NumKeyFrames == 0) {
 
-		// Release Arrays, Reuse KeyFrameValues if the right size, 
+		// Release Arrays, Reuse KeyFrameValues if the right size,
 		// otherwise release and reallocate.
 		REF_PTR_RELEASE(Frame);
 		REF_PTR_RELEASE(UCoord);
-		if (FrameKeyFrameTimes) {
-			delete [] FrameKeyFrameTimes;
-			FrameKeyFrameTimes = NULL;
-		}
-		if (FrameKeyFrameDeltas) {
-			delete [] FrameKeyFrameDeltas;
-			FrameKeyFrameDeltas = NULL;
-		}
+
+		delete [] FrameKeyFrameTimes;
+		FrameKeyFrameTimes = NULL;
+
+		delete [] FrameKeyFrameDeltas;
+		FrameKeyFrameDeltas = NULL;
+
 		if (FrameKeyFrameValues) {
 			if (NumFrameKeyFrames > 1) {
 				delete [] FrameKeyFrameValues;
@@ -2158,7 +2104,7 @@ void ParticleBufferClass::Reset_Frames(ParticlePropertyStruct<float> &new_props)
 		NumFrameKeyFrames = 0;
 		NumRandomFrameEntriesMinus1 = 0;
 		FrameKeyFrameValues[0] = new_props.Start;
-	
+
 	} else {
 
 		// Create the array if not present
@@ -2191,21 +2137,10 @@ void ParticleBufferClass::Reset_Frames(ParticlePropertyStruct<float> &new_props)
 		// otherwise release and reallocate.
 		unsigned int new_num_key_frames = key + 1;// Includes start keyframe (keytime == 0).
 		if (new_num_key_frames != NumFrameKeyFrames) {
-
-			if (FrameKeyFrameTimes) {
-				delete [] FrameKeyFrameTimes;
-				FrameKeyFrameTimes = NULL;
-			}
-			if (FrameKeyFrameValues) {
-				delete [] FrameKeyFrameValues;
-				FrameKeyFrameValues = NULL;
-			}
-			if (FrameKeyFrameDeltas) {
-				delete [] FrameKeyFrameDeltas;
-				FrameKeyFrameDeltas = NULL;
-			}
-
-			NumFrameKeyFrames = new_num_key_frames;	
+			NumFrameKeyFrames = new_num_key_frames;
+			delete [] FrameKeyFrameTimes;
+			delete [] FrameKeyFrameValues;
+			delete [] FrameKeyFrameDeltas;
 			FrameKeyFrameTimes = W3DNEWARRAY unsigned int [NumFrameKeyFrames];
 			FrameKeyFrameValues = W3DNEWARRAY float [NumFrameKeyFrames];
 			FrameKeyFrameDeltas = W3DNEWARRAY float [NumFrameKeyFrames];
@@ -2282,7 +2217,7 @@ void ParticleBufferClass::Reset_Frames(ParticlePropertyStruct<float> &new_props)
 void ParticleBufferClass::Reset_Blur_Times(ParticlePropertyStruct<float> &new_blur_times)
 {
 
-	unsigned int i;	// Used in loops	
+	unsigned int i;	// Used in loops
    float oo_intmax = 1.0f / (float)INT_MAX;
 	unsigned int ui_previous_key_time = 0;
 	unsigned int ui_current_key_time = 0;
@@ -2296,16 +2231,15 @@ void ParticleBufferClass::Reset_Blur_Times(ParticlePropertyStruct<float> &new_bl
 	bool blurtime_rand_zero	= (fabs(new_blur_times.Rand) < eps_blur);
 	if (blurtime_rand_zero && new_blur_times.NumKeyFrames == 0) {
 
-		// Release Arrays, Reuse KeyFrameValues if the right size, 
-		// otherwise release and reallocate.		
-		if (BlurTimeKeyFrameTimes) {
-			delete [] BlurTimeKeyFrameTimes;
-			BlurTimeKeyFrameTimes = NULL;
-		}
-		if (BlurTimeKeyFrameDeltas) {
-			delete [] BlurTimeKeyFrameDeltas;
-			BlurTimeKeyFrameDeltas = NULL;
-		}
+		// Release Arrays, Reuse KeyFrameValues if the right size,
+		// otherwise release and reallocate.
+
+		delete [] BlurTimeKeyFrameTimes;
+		BlurTimeKeyFrameTimes = NULL;
+
+		delete [] BlurTimeKeyFrameDeltas;
+		BlurTimeKeyFrameDeltas = NULL;
+
 		if (BlurTimeKeyFrameValues) {
 			if (NumBlurTimeKeyFrames > 1) {
 				delete [] BlurTimeKeyFrameValues;
@@ -2318,7 +2252,7 @@ void ParticleBufferClass::Reset_Blur_Times(ParticlePropertyStruct<float> &new_bl
 		NumBlurTimeKeyFrames = 0;
 		NumRandomBlurTimeEntriesMinus1 = 0;
 		BlurTimeKeyFrameValues[0] = new_blur_times.Start;
-	
+
 	} else {
 
 		// Check times of the keyframes (each keytime must be larger than the
@@ -2339,21 +2273,10 @@ void ParticleBufferClass::Reset_Blur_Times(ParticlePropertyStruct<float> &new_bl
 		// otherwise release and reallocate.
 		unsigned int new_num_key_frames = key + 1;// Includes start keyframe (keytime == 0).
 		if (new_num_key_frames != NumBlurTimeKeyFrames) {
-
-			if (BlurTimeKeyFrameTimes) {
-				delete [] BlurTimeKeyFrameTimes;
-				BlurTimeKeyFrameTimes = NULL;
-			}
-			if (BlurTimeKeyFrameValues) {
-				delete [] BlurTimeKeyFrameValues;
-				BlurTimeKeyFrameValues = NULL;
-			}
-			if (BlurTimeKeyFrameDeltas) {
-				delete [] BlurTimeKeyFrameDeltas;
-				BlurTimeKeyFrameDeltas = NULL;
-			}
-
-			NumBlurTimeKeyFrames = new_num_key_frames;	
+			NumBlurTimeKeyFrames = new_num_key_frames;
+			delete [] BlurTimeKeyFrameTimes;
+			delete [] BlurTimeKeyFrameValues;
+			delete [] BlurTimeKeyFrameDeltas;
 			BlurTimeKeyFrameTimes = new unsigned int [NumBlurTimeKeyFrames];
 			BlurTimeKeyFrameValues = new float [NumBlurTimeKeyFrames];
 			BlurTimeKeyFrameDeltas = new float [NumBlurTimeKeyFrames];
@@ -2458,7 +2381,7 @@ void ParticleBufferClass::Set_Emitter(ParticleEmitterClass *emitter)
 	}
 }
 
-		
+
 NewParticleStruct * ParticleBufferClass::Add_Uninitialized_New_Particle(void)
 {
 	// Note that this function does not initialize the new particle - it
@@ -2571,7 +2494,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 
 	if (PingPongPosition) {
 		int pingpong = WW3D::Get_Frame_Count() & 0x1;
-		position = Position[pingpong]->Get_Array();		
+		position = Position[pingpong]->Get_Array();
 	} else {
 		position = Position[0]->Get_Array();
 	}
@@ -2629,7 +2552,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 				(RotationKeyFrameValues[rkey] + HalfRotationKeyFrameDeltas[rkey] * f_delta_t) * f_delta_t +
 				RandomRotationEntries[part & NumRandomRotationEntriesMinus1] * (float)part_age +
 				RandomOrientationEntries[part & NumRandomOrientationEntriesMinus1];
-			
+
 			orientation[part] = (uint)(((int)(tmp_orient * 256.0f)) & 0xFF);
 		}
 
@@ -2644,7 +2567,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 			float tmp_frame = FrameKeyFrameValues[fkey] +
 				FrameKeyFrameDeltas[fkey] * (float)(part_age - FrameKeyFrameTimes[fkey]) +
 				RandomFrameEntries[part & NumRandomFrameEntriesMinus1];
-			
+
 			frame[part] = (uint)(((int)(tmp_frame)) & 0xFF);
 		}
 
@@ -2659,7 +2582,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 
 			ucoord[part] = FrameKeyFrameValues[fkey] +
 				FrameKeyFrameDeltas[fkey] * (float)(part_age - FrameKeyFrameTimes[fkey]) +
-				RandomFrameEntries[part & NumRandomFrameEntriesMinus1];		
+				RandomFrameEntries[part & NumRandomFrameEntriesMinus1];
 		}
 
 		if (tailposition) {
@@ -2673,7 +2596,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 					RandomBlurTimeEntries[part & NumRandomBlurTimeEntriesMinus1];
 			}
 			tailposition[part]=position[part]-Velocity[part]*blur_time*1000;
-		}		
+		}
 	}
 
 	for (part = sub2_start; part < End; part++) {
@@ -2686,7 +2609,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 			// age >= keytime. This loop must terminate because the 0th keytime is 0.
 			for (; part_age < ColorKeyFrameTimes[ckey]; ckey--);
 
-			color[part] = 
+			color[part] =
 					ColorKeyFrameValues[ckey] +
 					ColorKeyFrameDeltas[ckey] * (float)(part_age - ColorKeyFrameTimes[ckey]) +
 					RandomColorEntries[part & NumRandomColorEntriesMinus1];
@@ -2729,7 +2652,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 				(RotationKeyFrameValues[rkey] + HalfRotationKeyFrameDeltas[rkey] * f_delta_t) * f_delta_t +
 				RandomRotationEntries[part & NumRandomRotationEntriesMinus1] * (float)part_age +
 				RandomOrientationEntries[part & NumRandomOrientationEntriesMinus1];
-			
+
 			orientation[part] = (uint)(((int)(tmp_orient * 256.0f)) & 0xFF);
 		}
 
@@ -2744,7 +2667,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 			float tmp_frame = FrameKeyFrameValues[fkey] +
 				FrameKeyFrameDeltas[fkey] * (float)(part_age - FrameKeyFrameTimes[fkey]) +
 				RandomFrameEntries[part & NumRandomFrameEntriesMinus1];
-			
+
 			frame[part] = (uint)(((int)(tmp_frame)) & 0xFF);
 		}
 
@@ -2759,7 +2682,7 @@ void ParticleBufferClass::Update_Visual_Particle_State(void)
 
 			ucoord[part] = FrameKeyFrameValues[fkey] +
 				FrameKeyFrameDeltas[fkey] * (float)(part_age - FrameKeyFrameTimes[fkey]) +
-				RandomFrameEntries[part & NumRandomFrameEntriesMinus1];			
+				RandomFrameEntries[part & NumRandomFrameEntriesMinus1];
 		}
 
 		if (tailposition) {
@@ -2829,7 +2752,7 @@ void ParticleBufferClass::Update_Bounding_Box(void)
 		min_coords.Y = min_coords.Y <= position[i].Y ? min_coords.Y : position[i].Y;
 		min_coords.Z = min_coords.Z <= position[i].Z ? min_coords.Z : position[i].Z;
 	}
-	
+
 	// Extend by maximum possible particle size:
 	Vector3 size(MaxSize, MaxSize, MaxSize);
 	max_coords += size;
@@ -2885,7 +2808,7 @@ void ParticleBufferClass::Get_New_Particles(void)
 		if (HasAccel) {
 			position[NewEnd] = new_particle.Position +
 									(new_particle.Velocity + 0.5f * Accel * fp_age) * fp_age;
-			
+
 			Velocity[NewEnd] = new_particle.Velocity + (Accel * fp_age);
 		} else {
 			position[NewEnd] =new_particle.Position +
@@ -2922,7 +2845,7 @@ void ParticleBufferClass::Get_New_Particles(void)
             NewNum--;
          }
       }
-	}	
+	}
 }
 
 
@@ -3080,7 +3003,7 @@ void ParticleBufferClass::Get_Color_Key_Frames (ParticlePropertyStruct<Vector3>
 		//
 		//	Add a keyframe at the very end of the timeline if necessary
 		//
-		if (create_last_keyframe) {			
+		if (create_last_keyframe) {
 			colors.KeyTimes[index - 1] = ((float)MaxAge / 1000);
 
 			//
@@ -3136,7 +3059,7 @@ void ParticleBufferClass::Get_Opacity_Key_Frames (ParticlePropertyStruct<float>
 		//
 		//	Add a keyframe at the very end of the timeline if necessary
 		//
-		if (create_last_keyframe) {			
+		if (create_last_keyframe) {
 			opacities.KeyTimes[index - 1] = ((float)MaxAge / 1000);
 
 			//
@@ -3193,7 +3116,7 @@ void ParticleBufferClass::Get_Size_Key_Frames (ParticlePropertyStruct<float> &si
 		//
 		//	Add a keyframe at the very end of the timeline if necessary
 		//
-		if (create_last_keyframe) {			
+		if (create_last_keyframe) {
 			sizes.KeyTimes[index - 1] = ((float)MaxAge / 1000);
 
 			//
@@ -3255,7 +3178,7 @@ void ParticleBufferClass::Get_Rotation_Key_Frames (ParticlePropertyStruct<float>
 		//
 		//	Add a keyframe at the very end of the timeline if necessary
 		//
-		if (create_last_keyframe) {			
+		if (create_last_keyframe) {
 			rotations.KeyTimes[index - 1] = ((float)MaxAge / 1000);
 
 			//
@@ -3312,7 +3235,7 @@ void ParticleBufferClass::Get_Frame_Key_Frames (ParticlePropertyStruct<float> &f
 		//
 		//	Add a keyframe at the very end of the timeline if necessary
 		//
-		if (create_last_keyframe) {			
+		if (create_last_keyframe) {
 			frames.KeyTimes[index - 1] = ((float)MaxAge / 1000);
 
 			//
@@ -3368,7 +3291,7 @@ void ParticleBufferClass::Get_Blur_Time_Key_Frames (ParticlePropertyStruct<float
 		//
 		//	Add a keyframe at the very end of the timeline if necessary
 		//
-		if (create_last_keyframe) {			
+		if (create_last_keyframe) {
 			blurtimes.KeyTimes[index - 1] = ((float)MaxAge / 1000);
 
 			//
@@ -3406,7 +3329,7 @@ int ParticleBufferClass::Get_Line_Texture_Mapping_Mode(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Get_Texture_Mapping_Mode();
-	} 
+	}
 	return SegLineRendererClass::UNIFORM_WIDTH_TEXTURE_MAP;
 }
 
@@ -3414,7 +3337,7 @@ int ParticleBufferClass::Is_Merge_Intersections(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Is_Merge_Intersections();
-	} 
+	}
 	return false;
 }
 
@@ -3422,7 +3345,7 @@ int ParticleBufferClass::Is_Freeze_Random(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Is_Freeze_Random();
-	} 
+	}
 	return false;
 }
 
@@ -3430,7 +3353,7 @@ int ParticleBufferClass::Is_Sorting_Disabled(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Is_Sorting_Disabled();
-	} 
+	}
 	return false;
 }
 
@@ -3438,7 +3361,7 @@ int ParticleBufferClass::Are_End_Caps_Enabled(void)	const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Are_End_Caps_Enabled();
-	} 
+	}
 	return false;
 }
 
@@ -3446,7 +3369,7 @@ int ParticleBufferClass::Get_Subdivision_Level(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Get_Current_Subdivision_Level();
-	} 
+	}
 	return 0;
 }
 
@@ -3454,7 +3377,7 @@ float ParticleBufferClass::Get_Noise_Amplitude(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Get_Noise_Amplitude();
-	} 
+	}
 	return 0.0f;
 }
 
@@ -3462,7 +3385,7 @@ float ParticleBufferClass::Get_Merge_Abort_Factor(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Get_Merge_Abort_Factor();
-	} 
+	}
 	return 0.0f;
 }
 
@@ -3470,7 +3393,7 @@ float ParticleBufferClass::Get_Texture_Tile_Factor(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Get_Texture_Tile_Factor();
-	} 
+	}
 	return 1.0f;
 }
 
@@ -3478,7 +3401,7 @@ Vector2 ParticleBufferClass::Get_UV_Offset_Rate(void) const
 {
 	if (LineRenderer != NULL) {
 		return LineRenderer->Get_UV_Offset_Rate();
-	} 
+	}
 	return Vector2(0.0f,0.0f);
 }
 
@@ -3496,14 +3419,14 @@ ParticleBufferClass::TailDiffuseTypeEnum ParticleBufferClass::Determine_Tail_Dif
 
 	ShaderClass shader=Get_Shader();
 
-	
+
 	//Multiplicative		RGB is white (A is don't care)
 	//Additive				RGB is Black (A is don't care)
 	//Screen					RGB is Black (A is don't care)
 	//Alpha					Same RGB as head but A is 0
-	//Alpha test blend	Same ARGB as head but A is 0	
+	//Alpha test blend	Same ARGB as head but A is 0
 	//Alpha test			Same ARGB as head
-	//Opaque					Same ARGB as head	
+	//Opaque					Same ARGB as head
 
 	// Multiplicative
 	if (shader.Get_Dst_Blend_Func()==ShaderClass::DSTBLEND_SRC_COLOR) return WHITE;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h
index 8c53e211155..95053db6306 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h
@@ -16,29 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /VSS_Sync/ww3d2/part_buf.h              $* 
- *                                                                         * 
- *                      $Author:: Vss_sync                                $* 
- *                                                                         * 
- *                     $Modtime:: 8/29/01 7:29p                           $* 
- *                                                                         * 
- *                    $Revision:: 9                                       $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /VSS_Sync/ww3d2/part_buf.h              $*
+ *                                                                         *
+ *                      $Author:: Vss_sync                                $*
+ *                                                                         *
+ *                     $Modtime:: 8/29/01 7:29p                           $*
+ *                                                                         *
+ *                    $Revision:: 9                                       $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if defined(_MSC_VER)
-#pragma once
-#endif
 
-#ifndef PART_BUF_H
-#define PART_BUF_H
+#pragma once
 
 #include "rendobj.h"
 #include "pointgr.h"
@@ -103,7 +99,7 @@ class ParticleBufferClass : public RenderObjClass
 		/*
 		** RenderObjClass Interface:
 		*/
-		virtual RenderObjClass * Clone(void) const;		
+		virtual RenderObjClass * Clone(void) const;
 		virtual int Class_ID(void) const { return CLASSID_PARTICLEBUFFER; }
 
 		virtual int Get_Num_Polys(void) const;
@@ -197,7 +193,7 @@ class ParticleBufferClass : public RenderObjClass
 		float						Get_Fade_Time (void) const			{ return (NumColorKeyFrames > 1) ? (((float)ColorKeyFrameTimes[1]) / 1000.0f) : 0.0f; }
 		ShaderClass				Get_Shader (void) const;
 
-		// 
+		//
 		// Line rendering properties.  These functions will always return
 		// a default value if line rendering is not enabled.
 		//
@@ -212,7 +208,7 @@ class ParticleBufferClass : public RenderObjClass
 		float						Get_Texture_Tile_Factor(void) const;
 		Vector2					Get_UV_Offset_Rate(void) const;
 
-		
+
 		// This is a utility function only meant to be called by the particle emitter.
 		unsigned int			Get_Buffer_Size(void) const		{ return MaxNum; }
 
@@ -230,10 +226,10 @@ class ParticleBufferClass : public RenderObjClass
 		// Total Active Particle Buffer Count
 		static unsigned int	Get_Total_Active_Count( void )	{ return TotalActiveCount; }
 
-		// Global control of particle LOD.  
+		// Global control of particle LOD.
 		static void				Set_LOD_Max_Screen_Size(int lod_level,float max_screen_size);
-		static float			Get_LOD_Max_Screen_Size(int lod_level);		
-			
+		static float			Get_LOD_Max_Screen_Size(int lod_level);
+
 	protected:
 
 		virtual void			Update_Cached_Bounding_Volumes(void) const;
@@ -256,7 +252,7 @@ class ParticleBufferClass : public RenderObjClass
 		// Update the visual particle state. This includes updating color/size
 		// for all existing particles. Only needs to happen at rendering time.
 		void Update_Visual_Particle_State(void);
-		
+
 		// Update the bounding box. (Updates the particle state if it needs to).
 		void Update_Bounding_Box(void);
 
@@ -320,7 +316,7 @@ class ParticleBufferClass : public RenderObjClass
 		// the Values array which will have one entry (the constant value).
 		// Note that the rotation and orientation properties are different -
 		// only orientation is used in rendering. The rotation data is only
-		// used to compute the orientations. So the condition is different - 
+		// used to compute the orientations. So the condition is different -
 		// if rotation and orientation randomizers, and all rotation keyframes
 		// are all zero, then all of the arrays will be NULL (including the
 		// Values array).
@@ -374,7 +370,7 @@ class ParticleBufferClass : public RenderObjClass
 		float *			RandomFrameEntries;
 		unsigned int	NumRandomBlurTimeEntriesMinus1;		// 2^n - 1 so can be used as a mask also
 		float *			RandomBlurTimeEntries;
-		
+
 		Vector3			ColorRandom;
 		float				OpacityRandom;
 		float				SizeRandom;
@@ -399,7 +395,7 @@ class ParticleBufferClass : public RenderObjClass
 		// points are active (it is only used if all are not active)..
 		ShareBufferClass<Vector3> *	Position[2];	// Only [0] used unless pingpong enabled
 		ShareBufferClass<Vector4> *	Diffuse;			// passed into point group
-		ShareBufferClass<Vector3> *	Color;			
+		ShareBufferClass<Vector3> *	Color;
 		ShareBufferClass<float> *		Alpha;
 		ShareBufferClass<float> *		Size;
 		ShareBufferClass<uint8> *		Frame;
@@ -408,7 +404,7 @@ class ParticleBufferClass : public RenderObjClass
 		ShareBufferClass<Vector4> *	TailDiffuse;	// Only used for line groups
 		ShareBufferClass<uint8> *		Orientation;
 		ShareBufferClass<unsigned int> *	APT;
-		ShareBufferClass<unsigned char> * GroupID;	// Only used for lines		
+		ShareBufferClass<unsigned char> * GroupID;	// Only used for lines
 
 		// Do we keep two ping-pong position buffers (for collision and possibly other effects
 		// which need the previous frames position as well as this frames)
@@ -441,7 +437,7 @@ class ParticleBufferClass : public RenderObjClass
 
 		// Projected area, used for LOD purposes
 		float									ProjectedArea;
-		
+
 		// Total Active Particle Buffer Count
 		static unsigned int				TotalActiveCount;
 
@@ -463,6 +459,3 @@ class ParticleBufferClass : public RenderObjClass
 
 		unsigned char						CurrentGroupID;
 };
-
-#endif // PART_BUF_H
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
index a6e119327a5..735610ee76c 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
@@ -16,25 +16,25 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /Commando/Code/ww3d2/part_emt.cpp       $* 
- *                                                                         * 
- *                  $Org Author:: Jani_p                                  $* 
- *                                                                         * 
- *                      $Author:: Kenny_m                                  $* 
- *                                                                         * 
- *                     $Modtime:: 08/05/02 10:44a                          $* 
- *                                                                         * 
- *                    $Revision:: 14                                      $* 
- *                                                                         * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /Commando/Code/ww3d2/part_emt.cpp       $*
+ *                                                                         *
+ *                  $Org Author:: Jani_p                                  $*
+ *                                                                         *
+ *                      $Author:: Kenny_m                                  $*
+ *                                                                         *
+ *                     $Modtime:: 08/05/02 10:44a                          $*
+ *                                                                         *
+ *                    $Revision:: 14                                      $*
+ *                                                                         *
  * 08/05/02 KM Texture class redesign
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "part_emt.h"
@@ -48,8 +48,6 @@
 #include "wwprofile.h"
 #include <limits.h>
 #include <gcd_lcm.h>
-#include "texture.h"
-#include "part_ldr.h"
 
 
 // Global variable which is only used to communicate the worldspace emitter
@@ -70,9 +68,9 @@ bool ParticleEmitterClass::DefaultRemoveOnComplete = true;
 
 ParticleEmitterClass::ParticleEmitterClass(float emit_rate, unsigned int burst_size,
 			Vector3Randomizer *pos_rnd, Vector3 base_vel, Vector3Randomizer *vel_rnd, float out_vel,
-			float vel_inherit_factor, 
+			float vel_inherit_factor,
 			ParticlePropertyStruct<Vector3> &color,
-			ParticlePropertyStruct<float> &opacity, 
+			ParticlePropertyStruct<float> &opacity,
 			ParticlePropertyStruct<float> &size,
 			ParticlePropertyStruct<float> &rotation, float orient_rnd,
 			ParticlePropertyStruct<float> &frames,
@@ -177,15 +175,11 @@ ParticleEmitterClass::~ParticleEmitterClass(void)
 	Buffer->Emitter_Is_Dead();
 	Buffer->Release_Ref();
 
-	if (PosRand != NULL) {
-		delete PosRand;
-		PosRand = NULL;
-	}
+	delete PosRand;
+	PosRand = NULL;
 
-	if (VelRand != NULL) {
-		delete VelRand;
-		VelRand = NULL;
-	}
+	delete VelRand;
+	VelRand = NULL;
 
 	if (NameString != NULL) {
 		::free (NameString);
@@ -219,7 +213,7 @@ ParticleEmitterClass::Create_From_Definition (const ParticleEmitterDefClass &def
 		);
 //			false);	// no compression for particle textures!
 	}
-	
+
 	ShaderClass shader;
 	definition.Get_Shader (shader);
 	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) {
@@ -258,10 +252,10 @@ ParticleEmitterClass::Create_From_Definition (const ParticleEmitterDefClass &def
 	pemitter = NEW_REF( ParticleEmitterClass, (	definition.Get_Emission_Rate (),
 																definition.Get_Burst_Size (),
 																definition.Get_Creation_Volume (),
-																definition.Get_Velocity (), 
+																definition.Get_Velocity (),
 																definition.Get_Velocity_Random (),
 																definition.Get_Outward_Vel (),
-																definition.Get_Vel_Inherit (), 
+																definition.Get_Vel_Inherit (),
 																color_keys,
 																opacity_keys,
 																size_keys,
@@ -273,7 +267,7 @@ ParticleEmitterClass::Create_From_Definition (const ParticleEmitterDefClass &def
 																definition.Get_Lifetime (),
 																definition.Get_Future_Start_Time(),
 																ptexture,
-																shader, 
+																shader,
 																definition.Get_Max_Emissions (),
 																0,
 																false,
@@ -281,27 +275,24 @@ ParticleEmitterClass::Create_From_Definition (const ParticleEmitterDefClass &def
 																definition.Get_Frame_Mode (),
 																definition.Get_Line_Properties ()) );
 
-	if (color_keys.KeyTimes != NULL) delete [] color_keys.KeyTimes;
-	if (color_keys.Values != NULL) delete [] color_keys.Values;
-	if (opacity_keys.KeyTimes != NULL) delete [] opacity_keys.KeyTimes;
-	if (opacity_keys.Values != NULL) delete [] opacity_keys.Values;
-	if (size_keys.KeyTimes != NULL) delete [] size_keys.KeyTimes;
-	if (size_keys.Values != NULL) delete [] size_keys.Values;
-	if (rotation_keys.KeyTimes != NULL) delete [] rotation_keys.KeyTimes;
-	if (rotation_keys.Values != NULL) delete [] rotation_keys.Values;
-	if (frame_keys.KeyTimes != NULL) delete [] frame_keys.KeyTimes;
-	if (frame_keys.Values != NULL) delete [] frame_keys.Values;
-	if (blur_time_keys.KeyTimes != NULL) delete [] blur_time_keys.KeyTimes;
-	if (blur_time_keys.Values != NULL) delete [] blur_time_keys.Values;
+	delete [] color_keys.KeyTimes;
+	delete [] color_keys.Values;
+	delete [] opacity_keys.KeyTimes;
+	delete [] opacity_keys.Values;
+	delete [] size_keys.KeyTimes;
+	delete [] size_keys.Values;
+	delete [] rotation_keys.KeyTimes;
+	delete [] rotation_keys.Values;
+	delete [] frame_keys.KeyTimes;
+	delete [] frame_keys.Values;
+	delete [] blur_time_keys.KeyTimes;
+	delete [] blur_time_keys.Values;
 
 	// Pass the name along to the emitter
 	pemitter->Set_Name (definition.Get_Name ());
 
 	// release our reference to particle texture.
-	if (ptexture) {
-		REF_PTR_RELEASE(ptexture);
-		ptexture = 0;
-	}
+	REF_PTR_RELEASE(ptexture);
 
 	// Return a pointer to the new emitter
 	return pemitter;
@@ -365,7 +356,7 @@ void ParticleEmitterClass::On_Frame_Update(void)
 			// until it finds a non-NULL Scene), and then adds the particle
 			// buffer to it.
 			if ( BufferSceneNeeded ) {
-			
+
 				if (Is_In_Scene()) {
 					Buffer->Add(Scene);
 					BufferSceneNeeded = false;
@@ -407,7 +398,7 @@ void ParticleEmitterClass::Reset(void)
 
 	// Reset the number of particles to emit
 	ParticlesLeft = MaxParticles;
-	EmitRemain = 0;	
+	EmitRemain = 0;
 	IsComplete = false;
 }
 
@@ -439,7 +430,7 @@ void ParticleEmitterClass::Start(void)
 
 void ParticleEmitterClass::Stop(void)
 {
-	Active = false;	
+	Active = false;
 }
 
 
@@ -451,21 +442,16 @@ bool ParticleEmitterClass::Is_Stopped(void)
 
 void ParticleEmitterClass::Set_Position_Randomizer(Vector3Randomizer *rand)
 {
-	if (PosRand) {
-		delete PosRand;
-		PosRand =NULL;
-	}
+	delete PosRand;
 	PosRand = rand;
 }
 
 
 void ParticleEmitterClass::Set_Velocity_Randomizer(Vector3Randomizer *rand)
 {
-	if (VelRand) {
-		delete VelRand;
-		VelRand =NULL;
-	}
+	delete VelRand;
 	VelRand = rand;
+
 	if (VelRand) {
 		VelRand->Scale(0.001f);	// Convert from seconds to ms
 	}
@@ -483,7 +469,7 @@ Vector3Randomizer *ParticleEmitterClass::Get_Creation_Volume (void) const
 }
 
 
-Vector3Randomizer *ParticleEmitterClass::Get_Velocity_Random (void) const	
+Vector3Randomizer *ParticleEmitterClass::Get_Velocity_Random (void) const
 {
 	Vector3Randomizer *randomizer = NULL;
 	if (VelRand != NULL) {
@@ -525,7 +511,7 @@ void ParticleEmitterClass::Emit(void)
 	if (Active && !IsComplete) {
 		Quaternion curr_quat;   // Quaternion form of orientation.
 		Vector3 curr_orig;      // Origin.
-	   
+
 	   // Convert current matrix into quaternion + origin form.
 	   curr_quat = Build_Quaternion(Get_Transform());
 	   curr_orig = Get_Transform().Get_Translation();
@@ -546,8 +532,8 @@ void ParticleEmitterClass::Emit(void)
 // is only important to avoid affecting the collision spheres of composite
 // objects into which the emitter is inserted.
 void ParticleEmitterClass::Update_Cached_Bounding_Volumes(void) const
-{ 
-	CachedBoundingSphere.Init(Get_Position(),0.0); 
+{
+	CachedBoundingSphere.Init(Get_Position(),0.0);
 	CachedBoundingBox.Center = Get_Position();
 	CachedBoundingBox.Extent.Set(0,0,0);
 	Validate_Cached_Bounding_Volumes();
@@ -565,12 +551,12 @@ void ParticleEmitterClass::Create_New_Particles(const Quaternion & curr_quat, co
 {
    Quaternion quat;
    Vector3 orig;
-   
+
    // The emit remainder from the previous interval (the time remaining in
 	// the previous interval when the last particle was emitted) is added to
 	// the size of the current frame to yield the time currently available
 	// for emitting particles.
-	unsigned int frametime = WW3D::Get_Frame_Time();
+	unsigned int frametime = WW3D::Get_Sync_Frame_Time();
 	// Since the particles are written into a wraparound buffer, we can take the time modulo a time
 	// constant which represents the time it takes to fill up the entire buffer with new particles.
 	// We will do this so we don't run into performance problems with very large frame times.
@@ -608,9 +594,9 @@ void ParticleEmitterClass::Create_New_Particles(const Quaternion & curr_quat, co
 	} else {
 		InheritedWorldSpaceEmitterVel.Set(0.0, 0.0, 0.0);
 	}
-	
+
    for (; EmitRemain > EmitRate;) {
-		
+
 		// Calculate the new remainder.
 		EmitRemain -= EmitRate;
 
@@ -703,25 +689,25 @@ void ParticleEmitterClass::Initialize_Particle(NewParticleStruct * newpart,
 	newpart->Velocity = InheritedWorldSpaceEmitterVel + quat.Rotate_Vector(rand_vel);
 
 	// GroupID
-	newpart->GroupID = GroupID;	
+	newpart->GroupID = GroupID;
 }
 
 
 ParticleEmitterDefClass *
 ParticleEmitterClass::Build_Definition (void) const
-{	
+{
 	// Allocate a new emitter definition object
 	ParticleEmitterDefClass *pdefinition = W3DNEW ParticleEmitterDefClass;
 	WWASSERT (pdefinition != NULL);
 	if (pdefinition != NULL) {
-		
+
 		// Set the texture's filename
 		TextureClass *ptexture = Get_Texture ();
 		if (ptexture != NULL) {
 			pdefinition->Set_Texture_Filename (ptexture->Get_Texture_Name());
 			REF_PTR_RELEASE(ptexture);
 		}
-		
+
 		// Now fill the definition with data from this emitter instance
 		pdefinition->Set_Render_Mode (Get_Render_Mode());
 		pdefinition->Set_Frame_Mode (Get_Frame_Mode());
@@ -739,7 +725,7 @@ ParticleEmitterClass::Build_Definition (void) const
 		pdefinition->Set_Outward_Vel (Get_Outwards_Vel ());
 		pdefinition->Set_Vel_Inherit (Get_Velocity_Inherit ());
 		pdefinition->Set_Shader (Get_Shader ());
-		
+
 		//
 		//	Pass the creation volume onto the definition
 		//
@@ -758,8 +744,8 @@ ParticleEmitterClass::Build_Definition (void) const
 		ParticlePropertyStruct<Vector3> colors;
 		Get_Color_Key_Frames (colors);
 		pdefinition->Set_Color_Keyframes (colors);
-		if (colors.KeyTimes != NULL) delete [] colors.KeyTimes;
-		if (colors.Values != NULL) delete [] colors.Values;
+		delete [] colors.KeyTimes;
+		delete [] colors.Values;
 
 		//
 		//	Pass the opacity keyframes onto the definition
@@ -767,8 +753,8 @@ ParticleEmitterClass::Build_Definition (void) const
 		ParticlePropertyStruct<float> opacities;
 		Get_Opacity_Key_Frames (opacities);
 		pdefinition->Set_Opacity_Keyframes (opacities);
-		if (opacities.KeyTimes != NULL) delete [] opacities.KeyTimes;
-		if (opacities.Values != NULL) delete [] opacities.Values;
+		delete [] opacities.KeyTimes;
+		delete [] opacities.Values;
 
 		//
 		//	Pass the size keyframes onto the definition
@@ -776,8 +762,8 @@ ParticleEmitterClass::Build_Definition (void) const
 		ParticlePropertyStruct<float> sizes;
 		Get_Size_Key_Frames (sizes);
 		pdefinition->Set_Size_Keyframes (sizes);
-		if (sizes.KeyTimes != NULL) delete [] sizes.KeyTimes;
-		if (sizes.Values != NULL) delete [] sizes.Values;
+		delete [] sizes.KeyTimes;
+		delete [] sizes.Values;
 
 		//
 		//	Pass the rotation keyframes onto the definition
@@ -785,8 +771,8 @@ ParticleEmitterClass::Build_Definition (void) const
 		ParticlePropertyStruct<float> rotations;
 		Get_Rotation_Key_Frames (rotations);
 		pdefinition->Set_Rotation_Keyframes (rotations, Get_Initial_Orientation_Random());
-		if (rotations.KeyTimes != NULL) delete [] rotations.KeyTimes;
-		if (rotations.Values != NULL) delete [] rotations.Values;
+		delete [] rotations.KeyTimes;
+		delete [] rotations.Values;
 
 		//
 		//	Pass the frame keyframes onto the definition
@@ -794,8 +780,8 @@ ParticleEmitterClass::Build_Definition (void) const
 		ParticlePropertyStruct<float> frames;
 		Get_Frame_Key_Frames (frames);
 		pdefinition->Set_Frame_Keyframes (frames);
-		if (frames.KeyTimes != NULL) delete [] frames.KeyTimes;
-		if (frames.Values != NULL) delete [] frames.Values;
+		delete [] frames.KeyTimes;
+		delete [] frames.Values;
 
 		//
 		//	Pass the blur time keyframes onto the definition
@@ -803,12 +789,12 @@ ParticleEmitterClass::Build_Definition (void) const
 		ParticlePropertyStruct<float> blur_times;
 		Get_Blur_Time_Key_Frames (blur_times);
 		pdefinition->Set_Blur_Time_Keyframes (blur_times);
-		if (blur_times.KeyTimes != NULL) delete [] blur_times.KeyTimes;
-		if (blur_times.Values != NULL) delete [] blur_times.Values;
+		delete [] blur_times.KeyTimes;
+		delete [] blur_times.Values;
 
 
 		//
-		// Set up the line parameters 
+		// Set up the line parameters
 		//
 		pdefinition->Set_Line_Texture_Mapping_Mode(Get_Line_Texture_Mapping_Mode());
 		pdefinition->Set_Merge_Intersections(Is_Merge_Intersections());
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h
index b8eba0cc4ac..bbd31a4975e 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h
@@ -16,32 +16,28 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*************************************************************************** 
- ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     *** 
- *************************************************************************** 
- *                                                                         * 
- *                 Project Name : G                                        * 
- *                                                                         * 
- *                     $Archive:: /VSS_Sync/ww3d2/part_emt.h              $* 
- *                                                                         * 
- *                      $Author:: Vss_sync                                $* 
- *                                                                         * 
- *                     $Modtime:: 8/29/01 7:29p                           $* 
- *                                                                         * 
- *                    $Revision:: 10                                      $* 
- *                                                                         * 
- *-------------------------------------------------------------------------* 
- * Functions:                                                              * 
+/***************************************************************************
+ ***    C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S     ***
+ ***************************************************************************
+ *                                                                         *
+ *                 Project Name : G                                        *
+ *                                                                         *
+ *                     $Archive:: /VSS_Sync/ww3d2/part_emt.h              $*
+ *                                                                         *
+ *                      $Author:: Vss_sync                                $*
+ *                                                                         *
+ *                     $Modtime:: 8/29/01 7:29p                           $*
+ *                                                                         *
+ *                    $Revision:: 10                                      $*
+ *                                                                         *
+ *-------------------------------------------------------------------------*
+ * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if defined(_MSC_VER)
-#pragma once
-#endif
 
-#ifndef PART_EMT_H
-#define PART_EMT_H
+#pragma once
 
 #include "rendobj.h"
-#include "RANDOM.H"
+#include "RANDOM.h"
 #include "part_buf.h"
 #include "quat.h"
 #include "w3d_file.h"
@@ -71,11 +67,11 @@ template<class T> struct ParticlePropertyStruct {
 /*
 ** Utility function for copying the contents of one keyframe struct into another.
 */
-template<class T> __inline 
+template<class T> __inline
 void Copy_Emitter_Property_Struct
 (
 	ParticlePropertyStruct<T> &dest,
-	const ParticlePropertyStruct<T> &src	
+	const ParticlePropertyStruct<T> &src
 )
 {
 	dest.Start			= src.Start;
@@ -109,24 +105,24 @@ class ParticleEmitterClass : public RenderObjClass
 
 		// Note: all time/velocity/acceleration quantities use seconds (converted to ms internally)
 		ParticleEmitterClass(float emit_rate, unsigned int burst_size, Vector3Randomizer *pos_rnd,
-			Vector3 base_vel, Vector3Randomizer *vel_rnd, float out_vel, float vel_inherit_factor, 
-			ParticlePropertyStruct<Vector3> &color, 
+			Vector3 base_vel, Vector3Randomizer *vel_rnd, float out_vel, float vel_inherit_factor,
+			ParticlePropertyStruct<Vector3> &color,
 			ParticlePropertyStruct<float> &opacity,
-			ParticlePropertyStruct<float> &size, 
+			ParticlePropertyStruct<float> &size,
 			ParticlePropertyStruct<float> &rotation, float orient_rnd,
 			ParticlePropertyStruct<float> &frames,
 			ParticlePropertyStruct<float> &blur_times,
 			Vector3 accel, float max_age, float future_start, TextureClass *tex,
-			ShaderClass shader = ShaderClass::_PresetAdditiveSpriteShader, 
+			ShaderClass shader = ShaderClass::_PresetAdditiveSpriteShader,
 			int max_particles = 0, int max_buffer_size = -1, bool pingpong = false,
 			int render_mode = W3D_EMITTER_RENDER_MODE_TRI_PARTICLES,
 			int frame_mode = W3D_EMITTER_FRAME_MODE_1x1,
 			const W3dEmitterLinePropertiesStruct * line_props = NULL);
-				
+
 		ParticleEmitterClass(const ParticleEmitterClass & src);
 		ParticleEmitterClass & operator = (const ParticleEmitterClass &);
-		virtual ~ParticleEmitterClass(void);				
-		
+		virtual ~ParticleEmitterClass(void);
+
 		// Creation/serialization methods
 		virtual RenderObjClass *		Clone(void) const;
 		static ParticleEmitterClass * Create_From_Definition (const ParticleEmitterDefClass &definition);
@@ -176,7 +172,7 @@ class ParticleEmitterClass : public RenderObjClass
 		// to set, for example, when setting RINFO_OVERRIDE_ADDITIONAL_PASSES_ONLY on the container.
 		void						Set_Invisible(bool onoff)	{ IsInvisible = onoff; }
 		bool						Is_Invisible(void)			{ return IsInvisible; }
-		
+
 		// Change starting position/velocity/acceleration parameters:
 		void Set_Position_Randomizer(Vector3Randomizer *rand);
 		void Set_Velocity_Randomizer(Vector3Randomizer *rand);
@@ -184,7 +180,7 @@ class ParticleEmitterClass : public RenderObjClass
 		void Set_Outwards_Velocity(float out_vel);
 		void Set_Velocity_Inheritance_Factor(float inh_factor);
 		void Set_Acceleration (const Vector3 &acceleration)	{ if (Buffer != NULL) Buffer->Set_Acceleration (acceleration/1000000.0f); }
-	
+
 		// Change visual properties of emitter / buffer:
 		void Reset_Colors(ParticlePropertyStruct<Vector3> &new_props)							{ if (Buffer) Buffer->Reset_Colors(new_props); }
 		void Reset_Opacity(ParticlePropertyStruct<float> &new_props)							{ if (Buffer) Buffer->Reset_Opacity(new_props); }
@@ -213,7 +209,7 @@ class ParticleEmitterClass : public RenderObjClass
 
 		// from RenderObj...
       virtual bool			Is_Complete(void)							{ return IsComplete; }
-		
+
 		// Auto deletion behavior controls
 		bool						Is_Remove_On_Complete_Enabled(void)				{ return RemoveOnComplete; }
 		void						Enable_Remove_On_Complete(bool onoff)			{ RemoveOnComplete = onoff; }
@@ -286,11 +282,11 @@ class ParticleEmitterClass : public RenderObjClass
 
 		// Used to build a list of filenames this emitter is dependent on
 		virtual void			Add_Dependencies_To_List (DynamicVectorClass<StringClass> &file_list, bool textures_only = false);
-		
+
 		// This method is called each time the visiblity state of the emitter changes.
 		virtual void			Update_On_Visibilty (void);
 
-	private:		
+	private:
 
 		// Collision sphere is a point - emitter emits also when not visible,
       // so this is only important to avoid affecting the collision spheres
@@ -327,12 +323,12 @@ class ParticleEmitterClass : public RenderObjClass
 		bool							BufferSceneNeeded;// Does the buffer need a scene?
 		int							ParticlesLeft;		// Particles left to emit
 		int							MaxParticles;		// Total particles to emit
-		bool							IsComplete;			// Completed Emissions		
+		bool							IsComplete;			// Completed Emissions
 		char *						NameString;
 		char *						UserString;
 		bool							RemoveOnComplete;	// Should this emitter destroy itself when it completes?
 		bool							IsInScene;
-		unsigned char				GroupID;				// The group ID of a particle. A start causes the group ID to increment.		
+		unsigned char				GroupID;				// The group ID of a particle. A start causes the group ID to increment.
 
 		// This pointer is used only for sending new particles to the particle
 		// buffer and for informing the buffer when the emitter is destroyed.
@@ -350,7 +346,3 @@ class ParticleEmitterClass : public RenderObjClass
 		// all particle emitters.
 		static bool					DebugDisable;
 };
-
-#endif // PART_EMT_H
-
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
index c58b2e5ae36..9b19d924f2f 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
@@ -24,7 +24,7 @@
  *                                                                                             *
  *                     $Archive:: /VSS_Sync/ww3d2/part_ldr.cpp              $*
  *                                                                                             *
- *                       Author:: Patrick Smith                                                
+ *                       Author:: Patrick Smith
  *                                                                                             *
  *                     $Modtime:: 10/26/01 2:57p                                              $*
  *                                                                                             *
@@ -42,23 +42,12 @@
 #include "texture.h"
 
 #ifndef SAFE_DELETE
-#define SAFE_DELETE(pointer) \
-{ \
-	if (pointer) {	\
-		delete pointer; \
-		pointer = 0; \
-	} \
-}
-#endif //SAFE_DELETE
+#define SAFE_DELETE(pointer) { delete pointer; pointer = NULL; }
+#endif
 
 #ifndef SAFE_DELETE_ARRAY
-#define SAFE_DELETE_ARRAY(pointer)	\
-	if (pointer) {					\
-		delete [] pointer;			\
-		pointer = 0;				\
-	}									\
-
-#endif //SAFE_DELETE
+#define SAFE_DELETE_ARRAY(pointer) { delete [] pointer; pointer = NULL; }
+#endif
 
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -67,8 +56,8 @@
 //
 ParticleEmitterLoaderClass	_ParticleEmitterLoader;
 
-//	This array is declared in "W3D_File.H"
-const char *EMITTER_TYPE_NAMES[EMITTER_TYPEID_COUNT] = 
+//	This array is declared in "W3D_File.h"
+const char *EMITTER_TYPE_NAMES[EMITTER_TYPEID_COUNT] =
 {
 	"Default"
 };
@@ -81,14 +70,14 @@ const char *EMITTER_TYPE_NAMES[EMITTER_TYPEID_COUNT] =
 ParticleEmitterDefClass::ParticleEmitterDefClass (void)
 	:	m_pName (NULL),
 		m_Version (0L),
-		m_pUserString (NULL),	  
+		m_pUserString (NULL),
 		m_iUserType (EMITTER_TYPEID_DEFAULT),
 		m_InitialOrientationRandom (0),
 		m_pCreationVolume (NULL),
 		m_pVelocityRandomizer (NULL)
 {
 	::memset (&m_Info, 0, sizeof (m_Info));
-	::memset (&m_InfoV2, 0, sizeof (m_InfoV2));	
+	::memset (&m_InfoV2, 0, sizeof (m_InfoV2));
 	::memset (&m_ExtraInfo, 0, sizeof (m_ExtraInfo));
 
 	::memset (&m_ColorKeyframes, 0, sizeof (m_ColorKeyframes));
@@ -109,15 +98,15 @@ ParticleEmitterDefClass::ParticleEmitterDefClass (void)
 ParticleEmitterDefClass::ParticleEmitterDefClass (const ParticleEmitterDefClass &src)
 	:	m_pName (NULL),
 		m_Version (0L),
-		m_pUserString (NULL),	  
+		m_pUserString (NULL),
 		m_iUserType (EMITTER_TYPEID_DEFAULT),
 		m_InitialOrientationRandom (src.m_InitialOrientationRandom),
 		m_pCreationVolume (NULL),
 		m_pVelocityRandomizer (NULL)
 {
 	::memset (&m_Info, 0, sizeof (m_Info));
-	::memset (&m_InfoV2, 0, sizeof (m_InfoV2));	
-	::memset (&m_ExtraInfo, 0, sizeof (m_ExtraInfo));	
+	::memset (&m_InfoV2, 0, sizeof (m_InfoV2));
+	::memset (&m_ExtraInfo, 0, sizeof (m_ExtraInfo));
 
 	::memset (&m_ColorKeyframes, 0, sizeof (m_ColorKeyframes));
 	::memset (&m_OpacityKeyframes, 0, sizeof (m_OpacityKeyframes));
@@ -140,15 +129,15 @@ ParticleEmitterDefClass::~ParticleEmitterDefClass (void)
 {
 	// Free the name buffer if necessary
 	if (m_pName != NULL) {
-		
+
 		// free() is used because the buffer was allocated with ::_strdup().
 		::free (m_pName);
 		m_pName = NULL;
-	}	
+	}
 
 	// Free the user-string buffer if necessary
 	if (m_pUserString != NULL) {
-		
+
 		// free() is used because the buffer was allocated with ::malloc() or ::_strdup().
 		::free (m_pUserString);
 		m_pUserString = NULL;
@@ -242,7 +231,7 @@ ParticleEmitterDefClass::Free_Props (void)
 //
 //	Set_Velocity_Random
 //
-void							
+void
 ParticleEmitterDefClass::Set_Velocity_Random (Vector3Randomizer *randomizer)
 {
 	SAFE_DELETE (m_pVelocityRandomizer);
@@ -263,7 +252,7 @@ ParticleEmitterDefClass::Set_Velocity_Random (Vector3Randomizer *randomizer)
 //
 //	Set_Creation_Volume
 //
-void							
+void
 ParticleEmitterDefClass::Set_Creation_Volume (Vector3Randomizer *randomizer)
 {
 	SAFE_DELETE (m_pCreationVolume);
@@ -273,7 +262,7 @@ ParticleEmitterDefClass::Set_Creation_Volume (Vector3Randomizer *randomizer)
 	//	Ensure our persistent structure is up-to-date so it will save correctly
 	//
 	if (m_pCreationVolume != NULL) {
-		Initialize_Randomizer_Struct (*m_pCreationVolume, m_InfoV2.CreationVolume);		
+		Initialize_Randomizer_Struct (*m_pCreationVolume, m_InfoV2.CreationVolume);
 	}
 
 	return ;
@@ -284,11 +273,11 @@ ParticleEmitterDefClass::Set_Creation_Volume (Vector3Randomizer *randomizer)
 //
 //	Set_User_String
 //
-void							
-ParticleEmitterDefClass::Set_User_String (const char *pstring)		
-{ 
-	SAFE_FREE (m_pUserString); 
-	m_pUserString = ::_strdup (pstring); 
+void
+ParticleEmitterDefClass::Set_User_String (const char *pstring)
+{
+	SAFE_FREE (m_pUserString);
+	m_pUserString = ::_strdup (pstring);
 	return ;
 }
 
@@ -297,11 +286,11 @@ ParticleEmitterDefClass::Set_User_String (const char *pstring)
 //
 //	Set_Name
 //
-void							
-ParticleEmitterDefClass::Set_Name (const char *pname)			
-{ 
-	SAFE_FREE (m_pName); 
-	m_pName = ::_strdup (pname); 
+void
+ParticleEmitterDefClass::Set_Name (const char *pname)
+{
+	SAFE_FREE (m_pName);
+	m_pName = ::_strdup (pname);
 	return ;
 }
 
@@ -310,11 +299,11 @@ ParticleEmitterDefClass::Set_Name (const char *pname)
 //
 //	Set_Texture_Filename
 //
-void							
-ParticleEmitterDefClass::Set_Texture_Filename (const char *pname)	
-{ 
-	::lstrcpy (m_Info.TextureFilename, pname); 
-	Normalize_Filename (); 
+void
+ParticleEmitterDefClass::Set_Texture_Filename (const char *pname)
+{
+	::lstrcpy (m_Info.TextureFilename, pname);
+	Normalize_Filename ();
 	return ;
 }
 
@@ -325,14 +314,14 @@ ParticleEmitterDefClass::Set_Texture_Filename (const char *pname)
 //
 void
 ParticleEmitterDefClass::Normalize_Filename (void)
-{	
+{
 	TCHAR path[MAX_PATH];
 	::lstrcpy (path, m_Info.TextureFilename);
 
 	// Find the last occurance of the directory deliminator
 	LPCTSTR filename = ::strrchr (path, '\\');
 	if (filename != NULL) {
-		
+
 		// Increment past the directory deliminator
 		filename ++;
 
@@ -359,9 +348,9 @@ ParticleEmitterDefClass::Load_W3D (ChunkLoadClass &chunk_load)
 	if ((Read_Header (chunk_load) == WW3D_ERROR_OK) &&
 		 (Read_User_Data (chunk_load) == WW3D_ERROR_OK) &&
 		 (Read_Info (chunk_load) == WW3D_ERROR_OK)) {
-		
+
 		if (m_Version > 0x00010000) {
-			
+
 			//
 			// Read the version 2.0 structures from the chunk
 			//
@@ -380,15 +369,15 @@ ParticleEmitterDefClass::Load_W3D (ChunkLoadClass &chunk_load)
 	}
 
 	// (gth) Handle all future additions to the particle emitter file format
-	// in the typical chunk fashion.  
+	// in the typical chunk fashion.
 	while (chunk_load.Open_Chunk() && ret_val == WW3D_ERROR_OK) {
-		
-		switch (chunk_load.Cur_Chunk_ID()) 
+
+		switch (chunk_load.Cur_Chunk_ID())
 		{
 			case W3D_CHUNK_EMITTER_LINE_PROPERTIES:
 				ret_val = Read_Line_Properties(chunk_load);
 				break;
-			
+
 			case W3D_CHUNK_EMITTER_ROTATION_KEYFRAMES:
 				ret_val = Read_Rotation_Keyframes(chunk_load);
 				break;
@@ -404,12 +393,12 @@ ParticleEmitterDefClass::Load_W3D (ChunkLoadClass &chunk_load)
 			case W3D_CHUNK_EMITTER_EXTRA_INFO:
 				ret_val = Read_Extra_Info(chunk_load);
 				break;
-				
-			default: 
-				WWDEBUG_SAY(("Unhandled Chunk! File: %s Line: %d\r\n",__FILE__,__LINE__));
+
+			default:
+				WWDEBUG_SAY(("Unhandled Chunk! File: %s Line: %d",__FILE__,__LINE__));
 				break;
 		}
-		
+
 		chunk_load.Close_Chunk();
 	}
 
@@ -428,15 +417,15 @@ ParticleEmitterDefClass::Initialize_To_Ver2 (void)
 	::memset (&m_Info, 0, sizeof (m_Info));
 	::memset (&m_InfoV2, 0, sizeof (m_InfoV2));
 	::memset (&m_ExtraInfo, 0, sizeof (m_ExtraInfo));
-	
+
 	//
 	//	Set the version 2 values using defaults from version 1
 	//
 	m_InfoV2.BurstSize = 1;
 	m_InfoV2.OutwardVel = 0;
 	m_InfoV2.VelInherit = 0;
-	W3dUtilityClass::Convert_Shader (ShaderClass::_PresetAdditiveSpriteShader, &m_InfoV2.Shader);	
-	
+	W3dUtilityClass::Convert_Shader (ShaderClass::_PresetAdditiveSpriteShader, &m_InfoV2.Shader);
+
 	m_InfoV2.CreationVolume.ClassID = Vector3Randomizer::CLASSID_SOLIDBOX;
 	m_InfoV2.CreationVolume.Value1 = 0;
 	m_InfoV2.CreationVolume.Value2 = 0;
@@ -446,7 +435,7 @@ ParticleEmitterDefClass::Initialize_To_Ver2 (void)
 	m_InfoV2.VelRandom.Value1 = 0;
 	m_InfoV2.VelRandom.Value2 = 0;
 	m_InfoV2.VelRandom.Value3 = 0;
-	
+
 	Free_Props ();
 	return ;
 }
@@ -459,10 +448,10 @@ ParticleEmitterDefClass::Initialize_To_Ver2 (void)
 void
 ParticleEmitterDefClass::Convert_To_Ver2 (void)
 {
-	if (m_Version < 0x00020000) {		
+	if (m_Version < 0x00020000) {
 		m_InfoV2.BurstSize = 1;
 		m_InfoV2.OutwardVel = 0;
-		m_InfoV2.VelInherit = 0;		
+		m_InfoV2.VelInherit = 0;
 
 		//
 		//	Determine which shader to use...
@@ -483,7 +472,7 @@ ParticleEmitterDefClass::Convert_To_Ver2 (void)
 		}
 		W3dUtilityClass::Convert_Shader (shader, &m_InfoV2.Shader);
 
-				
+
 		//
 		//	Convert the randomziers
 		//
@@ -507,7 +496,7 @@ ParticleEmitterDefClass::Convert_To_Ver2 (void)
 
 		//
 		//	Convert the colors, opacities, and sizes
-		//		
+		//
 		Free_Props ();
 		m_ColorKeyframes.Start = RGBA_TO_VECTOR3 (m_Info.StartColor);
 		m_ColorKeyframes.Rand = Vector3 (0, 0, 0);
@@ -625,7 +614,7 @@ ParticleEmitterDefClass::Read_Info (ChunkLoadClass &chunk_load)
 		// Read the chunk straight into our member structure
 		::memset (&m_Info, 0, sizeof (m_Info));
 		if (chunk_load.Read (&m_Info, sizeof (m_Info)) == sizeof (m_Info)) {
-				
+
 			// Success!
 			ret_val = WW3D_ERROR_OK;
 		}
@@ -663,7 +652,7 @@ ParticleEmitterDefClass::Create_Randomizer (W3dVolumeRandomizerStruct &info)
 
 		case Vector3Randomizer::CLASSID_SOLIDCYLINDER:
 			randomizer = W3DNEW Vector3SolidCylinderRandomizer (info.Value1, info.Value2);
-			break;		
+			break;
 	}
 
 	return randomizer;
@@ -703,8 +692,8 @@ ParticleEmitterDefClass::Initialize_Randomizer_Struct
 
 		case Vector3Randomizer::CLASSID_SOLIDCYLINDER:
 			info.Value1 = ((Vector3SolidCylinderRandomizer &)randomizer).Get_Height ();
-			info.Value2 = ((Vector3SolidCylinderRandomizer &)randomizer).Get_Radius ();			
-			break;		
+			info.Value2 = ((Vector3SolidCylinderRandomizer &)randomizer).Get_Radius ();
+			break;
 	}
 
 	return ;
@@ -735,8 +724,8 @@ ParticleEmitterDefClass::Read_InfoV2 (ChunkLoadClass &chunk_load)
 			SAFE_DELETE (m_pCreationVolume);
 			SAFE_DELETE (m_pVelocityRandomizer);
 			m_pCreationVolume = Create_Randomizer (m_InfoV2.CreationVolume);
-			m_pVelocityRandomizer = Create_Randomizer (m_InfoV2.VelRandom);			
-				
+			m_pVelocityRandomizer = Create_Randomizer (m_InfoV2.VelRandom);
+
 			// Success!
 			ret_val = WW3D_ERROR_OK;
 		}
@@ -769,7 +758,7 @@ ParticleEmitterDefClass::Read_Props (ChunkLoadClass &chunk_load)
 		if (chunk_load.Read (&info, sizeof (info)) == sizeof (info)) {
 
 			unsigned int index=0;
-			
+
 			//ParticlePropertyStruct<Vector3>
 			m_ColorKeyframes.NumKeyFrames		= info.ColorKeyframes - 1;
 			m_OpacityKeyframes.NumKeyFrames	= info.OpacityKeyframes - 1;
@@ -801,7 +790,7 @@ ParticleEmitterDefClass::Read_Props (ChunkLoadClass &chunk_load)
 				m_SizeKeyframes.KeyTimes = W3DNEWARRAY float[m_SizeKeyframes.NumKeyFrames];
 				m_SizeKeyframes.Values = W3DNEWARRAY float[m_SizeKeyframes.NumKeyFrames];
 			}
-			
+
 			//
 			//	Read the color keyframes from the chunk
 			//
@@ -848,7 +837,7 @@ ParticleEmitterDefClass::Read_Props (ChunkLoadClass &chunk_load)
 											&m_SizeKeyframes.KeyTimes[index],
 											&m_SizeKeyframes.Values[index]);
 			}
-				
+
 			// Success!
 			ret_val = WW3D_ERROR_OK;
 		}
@@ -881,7 +870,7 @@ ParticleEmitterDefClass::Read_Color_Keyframe
 	//
 	W3dEmitterColorKeyframeStruct key_frame = { 0 };
 	if (chunk_load.Read (&key_frame, sizeof (key_frame)) == sizeof (key_frame)) {
-		
+
 		// Pass the key time to the caller
 		if (key_time != NULL) {
 			(*key_time) = key_frame.Time;
@@ -919,7 +908,7 @@ ParticleEmitterDefClass::Read_Opacity_Keyframe
 	//
 	W3dEmitterOpacityKeyframeStruct key_frame = { 0 };
 	if (chunk_load.Read (&key_frame, sizeof (key_frame)) == sizeof (key_frame)) {
-		
+
 		// Pass the key time to the caller
 		if (key_time != NULL) {
 			(*key_time) = key_frame.Time;
@@ -957,7 +946,7 @@ ParticleEmitterDefClass::Read_Size_Keyframe
 	//
 	W3dEmitterSizeKeyframeStruct key_frame = { 0 };
 	if (chunk_load.Read (&key_frame, sizeof (key_frame)) == sizeof (key_frame)) {
-		
+
 		// Pass the key time to the caller
 		if (key_time != NULL) {
 			(*key_time) = key_frame.Time;
@@ -991,7 +980,7 @@ ParticleEmitterDefClass::Read_Line_Properties(ChunkLoadClass & chunk_load)
 
 		// Read the chunk straight into our member structure
 		if (chunk_load.Read (&m_LineProperties, sizeof (m_LineProperties)) == sizeof (m_LineProperties)) {
-				
+
 			// Success!
 			ret_val = WW3D_ERROR_OK;
 		}
@@ -1006,7 +995,7 @@ ParticleEmitterDefClass::Read_Line_Properties(ChunkLoadClass & chunk_load)
 //
 //	Read_Rotation_Keyframes
 //
-WW3DErrorType 
+WW3DErrorType
 ParticleEmitterDefClass::Read_Rotation_Keyframes (ChunkLoadClass &chunk_load)
 {
 	// Assume success
@@ -1026,7 +1015,7 @@ ParticleEmitterDefClass::Read_Rotation_Keyframes (ChunkLoadClass &chunk_load)
 	if (chunk_load.Read(&key,sizeof(key)) == sizeof(key)) {
 		m_RotationKeyframes.Start = key.Rotation;
 	}
-	
+
 	// Allocate the rotation keys
 	if (m_RotationKeyframes.NumKeyFrames > 0) {
 		m_RotationKeyframes.KeyTimes = W3DNEWARRAY float[m_RotationKeyframes.NumKeyFrames];
@@ -1053,7 +1042,7 @@ ParticleEmitterDefClass::Read_Rotation_Keyframes (ChunkLoadClass &chunk_load)
 //
 //	Read_Frame_Keyframes
 //
-WW3DErrorType 
+WW3DErrorType
 ParticleEmitterDefClass::Read_Frame_Keyframes (ChunkLoadClass &chunk_load)
 {
 	// Assume success
@@ -1070,7 +1059,7 @@ ParticleEmitterDefClass::Read_Frame_Keyframes (ChunkLoadClass &chunk_load)
 	if (chunk_load.Read(&key,sizeof(key)) == sizeof(key)) {
 		m_FrameKeyframes.Start = key.Frame;
 	}
-	
+
 	// Allocate the keys
 	m_FrameKeyframes.NumKeyFrames		= header.KeyframeCount;
 	m_FrameKeyframes.Rand				= header.Random;
@@ -1113,7 +1102,7 @@ ParticleEmitterDefClass::Read_Blur_Time_Keyframes (ChunkLoadClass &chunk_load)
 	if (chunk_load.Read(&key,sizeof(key)) == sizeof(key)) {
 		m_BlurTimeKeyframes.Start = key.BlurTime;
 	}
-	
+
 	// Allocate the keys
 	m_BlurTimeKeyframes.NumKeyFrames		= header.KeyframeCount;
 	m_BlurTimeKeyframes.Rand					= header.Random;
@@ -1150,7 +1139,7 @@ ParticleEmitterDefClass::Read_Extra_Info (ChunkLoadClass &chunk_load)
 	if (chunk_load.Read (&m_ExtraInfo, sizeof (m_ExtraInfo)) == sizeof (m_ExtraInfo)) {
 		// Success!
 		ret_val = WW3D_ERROR_OK;
-	}	
+	}
 
 	// Return the WW3DErrorType return code
 	return ret_val;
@@ -1168,12 +1157,12 @@ ParticleEmitterDefClass::Save_W3D (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies an emitter
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER) == TRUE) {
-		
+
 		// Attempt to save the different sections of the emitter definition
 		if ((Save_Header (chunk_save) == WW3D_ERROR_OK) &&
 			 (Save_User_Data (chunk_save) == WW3D_ERROR_OK) &&
 			 (Save_Info (chunk_save) == WW3D_ERROR_OK) &&
-			 (Save_InfoV2 (chunk_save) == WW3D_ERROR_OK) &&			 
+			 (Save_InfoV2 (chunk_save) == WW3D_ERROR_OK) &&
 			 (Save_Props (chunk_save) == WW3D_ERROR_OK) &&
 			 (Save_Line_Properties (chunk_save) == WW3D_ERROR_OK) &&
 			 (Save_Rotation_Keyframes (chunk_save) == WW3D_ERROR_OK) &&
@@ -1207,7 +1196,7 @@ ParticleEmitterDefClass::Save_Header (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the emitter
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_HEADER) == TRUE) {
-		
+
 		// Fill the header structure
 		W3dEmitterHeaderStruct header = { 0 };
 		header.Version = W3D_CURRENT_EMITTER_VERSION;
@@ -1218,7 +1207,7 @@ ParticleEmitterDefClass::Save_Header (ChunkSaveClass &chunk_save)
 		if (chunk_save.Write (&header, sizeof (header)) == sizeof (header))
 		{
 			// Success!
-			ret_val = WW3D_ERROR_OK;			
+			ret_val = WW3D_ERROR_OK;
 		}
 
 		// End the header chunk
@@ -1242,7 +1231,7 @@ ParticleEmitterDefClass::Save_User_Data (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that contains user information
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_USER_DATA) == TRUE) {
-		
+
 		DWORD string_len = m_pUserString ? (::lstrlen (m_pUserString) + 1) : 0;
 
 		// Fill the header structure
@@ -1258,10 +1247,10 @@ ParticleEmitterDefClass::Save_User_Data (ChunkSaveClass &chunk_save)
 
 			// Do we need to write the user string to the file?
 			if (m_pUserString != NULL) {
-				
+
 				// Now write the user string param to the file
 				if (chunk_save.Write (m_pUserString, string_len) != string_len) {
-					
+
 					// Something went wrong
 					ret_val = WW3D_ERROR_SAVE_FAILED;
 				}
@@ -1289,7 +1278,7 @@ ParticleEmitterDefClass::Save_Info (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the generic emitter settings
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_INFO) == TRUE) {
-		
+
 		// Write the settings structure out to the chunk
 		if (chunk_save.Write (&m_Info, sizeof (m_Info)) == sizeof (m_Info))
 		{
@@ -1318,7 +1307,7 @@ ParticleEmitterDefClass::Save_InfoV2 (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the generic emitter settings
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_INFOV2) == TRUE) {
-		
+
 		// Write the settings structure out to the chunk
 		if (chunk_save.Write (&m_InfoV2, sizeof (m_InfoV2)) == sizeof (m_InfoV2))
 		{
@@ -1347,7 +1336,7 @@ ParticleEmitterDefClass::Save_Props (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the generic emitter settings
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_PROPS) == TRUE) {
-		
+
 		//
 		//	Fill in the property struct
 		//
@@ -1357,7 +1346,7 @@ ParticleEmitterDefClass::Save_Props (ChunkSaveClass &chunk_save)
 		info.SizeKeyframes		= m_SizeKeyframes.NumKeyFrames + 1;
 		info.OpacityRandom		= m_OpacityKeyframes.Rand;
 		info.SizeRandom			= m_SizeKeyframes.Rand;
-		VECTOR3_TO_RGBA (m_ColorKeyframes.Rand, info.ColorRandom);		
+		VECTOR3_TO_RGBA (m_ColorKeyframes.Rand, info.ColorRandom);
 
 		//
 		// Write the property structure out to the chunk
@@ -1372,7 +1361,7 @@ ParticleEmitterDefClass::Save_Props (ChunkSaveClass &chunk_save)
 				 (Save_Size_Keyframes (chunk_save) == WW3D_ERROR_OK)) {
 
 				// Success!
-				ret_val = WW3D_ERROR_OK;			
+				ret_val = WW3D_ERROR_OK;
 			}
 		}
 
@@ -1403,13 +1392,13 @@ ParticleEmitterDefClass::Save_Color_Keyframes (ChunkSaveClass &chunk_save)
 	// Write the starting color keyframe to the chunk
 	//
 	if (chunk_save.Write (&info, sizeof (info)) == sizeof (info)) {
-		
+
 		//
 		// Write each of the remaining color keyframes to the chunk
 		//
 		int count = m_ColorKeyframes.NumKeyFrames;
 		bool success = true;
-		for (int index = 0; (index < count) && success; index ++) {			
+		for (int index = 0; (index < count) && success; index ++) {
 			info.Time = m_ColorKeyframes.KeyTimes[index];
 			VECTOR3_TO_RGBA (m_ColorKeyframes.Values[index], info.Color);
 			success = (chunk_save.Write (&info, sizeof (info)) == sizeof (info));
@@ -1441,13 +1430,13 @@ ParticleEmitterDefClass::Save_Opacity_Keyframes (ChunkSaveClass &chunk_save)
 	// Write the starting keyframe to the chunk
 	//
 	if (chunk_save.Write (&info, sizeof (info)) == sizeof (info)) {
-		
+
 		//
 		// Write each of the remaining keyframes to the chunk
 		//
 		int count = m_OpacityKeyframes.NumKeyFrames;
 		bool success = true;
-		for (int index = 0; (index < count) && success; index ++) {			
+		for (int index = 0; (index < count) && success; index ++) {
 			info.Time = m_OpacityKeyframes.KeyTimes[index];
 			info.Opacity = m_OpacityKeyframes.Values[index];
 			success = (chunk_save.Write (&info, sizeof (info)) == sizeof (info));
@@ -1479,13 +1468,13 @@ ParticleEmitterDefClass::Save_Size_Keyframes (ChunkSaveClass &chunk_save)
 	// Write the starting keyframe to the chunk
 	//
 	if (chunk_save.Write (&info, sizeof (info)) == sizeof (info)) {
-		
+
 		//
 		// Write each of the remaining keyframes to the chunk
 		//
 		int count = m_SizeKeyframes.NumKeyFrames;
 		bool success = true;
-		for (int index = 0; (index < count) && success; index ++) {			
+		for (int index = 0; (index < count) && success; index ++) {
 			info.Time = m_SizeKeyframes.KeyTimes[index];
 			info.Size = m_SizeKeyframes.Values[index];
 			success = (chunk_save.Write (&info, sizeof (info)) == sizeof (info));
@@ -1506,7 +1495,7 @@ ParticleEmitterDefClass::Save_Line_Properties (ChunkSaveClass &chunk_save)
 
 	// Begin a chunk that identifies the line properties
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_LINE_PROPERTIES) == TRUE) {
-		
+
 		// Write the line properties structure out to the chunk
 		if (chunk_save.Write (&m_LineProperties, sizeof (m_LineProperties)) == sizeof (m_LineProperties))
 		{
@@ -1526,7 +1515,7 @@ ParticleEmitterDefClass::Save_Line_Properties (ChunkSaveClass &chunk_save)
 //
 //	Save_Rotation_Keyframes
 // NOTE: Rotation keyframes are saved in a separate chunk unlike color,size,and
-// opacity which are embedded inside the PROPS chunk. 
+// opacity which are embedded inside the PROPS chunk.
 //
 WW3DErrorType
 ParticleEmitterDefClass::Save_Rotation_Keyframes (ChunkSaveClass & chunk_save)
@@ -1543,7 +1532,7 @@ ParticleEmitterDefClass::Save_Rotation_Keyframes (ChunkSaveClass & chunk_save)
 		header.Random = m_RotationKeyframes.Rand;
 		header.OrientationRandom = m_InitialOrientationRandom;
 		chunk_save.Write (&header, sizeof (W3dEmitterRotationHeaderStruct));
-		
+
 		// Write the keyframes
 		bool success = true;
 		W3dEmitterRotationKeyframeStruct key;
@@ -1554,7 +1543,7 @@ ParticleEmitterDefClass::Save_Rotation_Keyframes (ChunkSaveClass & chunk_save)
 		chunk_save.Write (&key, sizeof (key));
 
 		// Write the remaining keyframes
-		for (unsigned int index = 0; (index < header.KeyframeCount) && success; index ++) {			
+		for (unsigned int index = 0; (index < header.KeyframeCount) && success; index ++) {
 			key.Time = m_RotationKeyframes.KeyTimes[index];
 			key.Rotation = m_RotationKeyframes.Values[index];
 			success = (chunk_save.Write (&key, sizeof (key)) == sizeof (key));
@@ -1575,14 +1564,14 @@ ParticleEmitterDefClass::Save_Rotation_Keyframes (ChunkSaveClass & chunk_save)
 //
 //	Save_Frame_Keyframes
 // NOTE: Frame keyframes are saved in a separate chunk unlike color,size,and
-// opacity which are embedded inside the PROPS chunk. 
+// opacity which are embedded inside the PROPS chunk.
 //
 WW3DErrorType
 ParticleEmitterDefClass::Save_Frame_Keyframes (ChunkSaveClass & chunk_save)
 {
 	// Assume error
 	WW3DErrorType ret_val = WW3D_ERROR_SAVE_FAILED;
-	
+
 	// Begin a chunk that identifies the rotation keyframes
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_FRAME_KEYFRAMES) == TRUE) {
 
@@ -1591,7 +1580,7 @@ ParticleEmitterDefClass::Save_Frame_Keyframes (ChunkSaveClass & chunk_save)
 		header.KeyframeCount = m_FrameKeyframes.NumKeyFrames;
 		header.Random = m_FrameKeyframes.Rand;
 		chunk_save.Write (&header, sizeof (W3dEmitterFrameHeaderStruct));
-		
+
 		// Write the keyframes
 		bool success = true;
 		W3dEmitterFrameKeyframeStruct key;
@@ -1602,7 +1591,7 @@ ParticleEmitterDefClass::Save_Frame_Keyframes (ChunkSaveClass & chunk_save)
 		chunk_save.Write (&key, sizeof (key));
 
 		// Write the remaining keyframes
-		for (unsigned int index = 0; (index < header.KeyframeCount) && success; index ++) {			
+		for (unsigned int index = 0; (index < header.KeyframeCount) && success; index ++) {
 			key.Time = m_FrameKeyframes.KeyTimes[index];
 			key.Frame = m_FrameKeyframes.Values[index];
 			success = (chunk_save.Write (&key, sizeof (key)) == sizeof (key));
@@ -1622,14 +1611,14 @@ ParticleEmitterDefClass::Save_Frame_Keyframes (ChunkSaveClass & chunk_save)
 //
 //	Save_Blur_Time_Keyframes
 // NOTE: Blur Time keyframes are saved in a separate chunk unlike color,size,and
-// opacity which are embedded inside the PROPS chunk. 
+// opacity which are embedded inside the PROPS chunk.
 //
 WW3DErrorType
 ParticleEmitterDefClass::Save_Blur_Time_Keyframes (ChunkSaveClass & chunk_save)
 {
 	// Assume error
 	WW3DErrorType ret_val = WW3D_ERROR_SAVE_FAILED;
-	
+
 	// Begin a chunk that identifies the rotation keyframes
 	if (chunk_save.Begin_Chunk (W3D_CHUNK_EMITTER_BLUR_TIME_KEYFRAMES) == TRUE) {
 
@@ -1638,7 +1627,7 @@ ParticleEmitterDefClass::Save_Blur_Time_Keyframes (ChunkSaveClass & chunk_save)
 		header.KeyframeCount = m_BlurTimeKeyframes.NumKeyFrames;
 		header.Random = m_BlurTimeKeyframes.Rand;
 		chunk_save.Write (&header, sizeof (W3dEmitterBlurTimeHeaderStruct));
-		
+
 		// Write the keyframes
 		bool success = true;
 		W3dEmitterBlurTimeKeyframeStruct key;
@@ -1649,7 +1638,7 @@ ParticleEmitterDefClass::Save_Blur_Time_Keyframes (ChunkSaveClass & chunk_save)
 		chunk_save.Write (&key, sizeof (key));
 
 		// Write the remaining keyframes
-		for (unsigned int index = 0; (index < header.KeyframeCount) && success; index ++) {			
+		for (unsigned int index = 0; (index < header.KeyframeCount) && success; index ++) {
 			key.Time = m_BlurTimeKeyframes.KeyTimes[index];
 			key.BlurTime = m_BlurTimeKeyframes.Values[index];
 			success = (chunk_save.Write (&key, sizeof (key)) == sizeof (key));
@@ -1678,9 +1667,9 @@ ParticleEmitterDefClass::Save_Extra_Info (ChunkSaveClass & chunk_save)
 
 		memset(&data, 0, sizeof(data));
 		data.FutureStartTime = Get_Future_Start_Time();
-		bool success = (chunk_save.Write (&data, sizeof (data)) == sizeof (data));		
+		bool success = (chunk_save.Write (&data, sizeof (data)) == sizeof (data));
 		ret_val = success ? WW3D_ERROR_OK : WW3D_ERROR_SAVE_FAILED;
-		
+
 		chunk_save.End_Chunk ();
 	}
 
@@ -1736,7 +1725,7 @@ ParticleEmitterDefClass::Set_Size_Keyframes (ParticlePropertyStruct<float> &keyf
 //
 //	Set_Rotation_Keyframes
 //
-void 
+void
 ParticleEmitterDefClass::Set_Rotation_Keyframes (ParticlePropertyStruct<float> &keyframes, float orient_rnd)
 {
 	SAFE_DELETE_ARRAY (m_RotationKeyframes.KeyTimes);
@@ -1751,7 +1740,7 @@ ParticleEmitterDefClass::Set_Rotation_Keyframes (ParticlePropertyStruct<float> &
 //
 //	Set_Frame_Keyframes
 //
-void 
+void
 ParticleEmitterDefClass::Set_Frame_Keyframes (ParticlePropertyStruct<float> &keyframes)
 {
 	SAFE_DELETE_ARRAY (m_FrameKeyframes.KeyTimes);
@@ -1826,7 +1815,7 @@ ParticleEmitterDefClass::Get_Rotation_Keyframes (ParticlePropertyStruct<float> &
 //
 //	Get_Frame_Keyframes
 //
-void 
+void
 ParticleEmitterDefClass::Get_Frame_Keyframes (ParticlePropertyStruct<float> &keyframes) const
 {
 	::Copy_Emitter_Property_Struct (keyframes, m_FrameKeyframes);
@@ -1869,13 +1858,12 @@ ParticleEmitterLoaderClass::Load_W3D (ChunkLoadClass &chunk_load)
 	// Create a definition object
 	ParticleEmitterDefClass *pdefinition = W3DNEW ParticleEmitterDefClass;
 	if (pdefinition != NULL) {
-		
+
 		// Ask the definition object to load the emitter data
 		if (pdefinition->Load_W3D (chunk_load) != WW3D_ERROR_OK) {
-			
+
 			// Error!  Free the definition
 			delete pdefinition;
-			pdefinition = NULL;
 		} else {
 
 			// Success!  Create a prototype from the definition
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h
index f455a1ded2d..98b3b487260 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h
@@ -24,7 +24,7 @@
  *                                                                                             *
  *                     $Archive:: /Commando/Code/ww3d2/part_ldr.h          $*
  *                                                                                             *
- *                       Author:: Patrick Smith                                                
+ *                       Author:: Patrick Smith
  *                                                                                             *
  *                     $Modtime:: 8/01/01 3:35p                                               $*
  *                                                                                             *
@@ -32,14 +32,7 @@
  *                                                                                             *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef __PART_EMT_LDR_H
-#define __PART_EMT_LDR_H
-
 
 #include "proto.h"
 #include "rendobj.h"
@@ -100,7 +93,7 @@ class ParticleEmitterDefClass
 		///////////////////////////////////////////////////////////
 		//
 		//	Public constructors/destructors
-		//		
+		//
 		ParticleEmitterDefClass (void);
 		ParticleEmitterDefClass (const ParticleEmitterDefClass &src);
 		virtual ~ParticleEmitterDefClass (void);
@@ -109,14 +102,14 @@ class ParticleEmitterDefClass
 		///////////////////////////////////////////////////////////
 		//
 		//	Public operators
-		//		
+		//
 		const ParticleEmitterDefClass &operator= (const ParticleEmitterDefClass &src);
 
 
 		///////////////////////////////////////////////////////////
 		//
 		//	Public methods
-		//		
+		//
 		virtual WW3DErrorType	Load_W3D (ChunkLoadClass &chunk_load);
 		virtual WW3DErrorType	Save_W3D (ChunkSaveClass &chunk_save);
 		const char *				Get_Name (void) const					{ return m_pName; }
@@ -147,7 +140,7 @@ class ParticleEmitterDefClass
 		float						Get_Future_Start_Time (void) const	{ return m_ExtraInfo.FutureStartTime; }
 
 		virtual void			Set_Render_Mode (int mode)						{ m_InfoV2.RenderMode = mode; } // values in w3d_file.h
-		virtual void			Set_Frame_Mode (int mode)						{ m_InfoV2.FrameMode = mode; } // values in w3d_file.h 
+		virtual void			Set_Frame_Mode (int mode)						{ m_InfoV2.FrameMode = mode; } // values in w3d_file.h
 		virtual void			Set_Texture_Filename (const char *pname);
 		virtual void			Set_Lifetime (float value)						{ m_Info.Lifetime = value; }
 		virtual void			Set_Emission_Rate (float value)				{ m_Info.EmissionRate = value; }
@@ -215,7 +208,7 @@ class ParticleEmitterDefClass
 		float						Get_Merge_Abort_Factor(void) const			{ return m_LineProperties.MergeAbortFactor; }
 		float						Get_Texture_Tile_Factor(void) const			{ return m_LineProperties.TextureTileFactor; }
 		Vector2					Get_UV_Offset_Rate(void) const				{ return Vector2(m_LineProperties.UPerSec,m_LineProperties.VPerSec); }
-		
+
 		virtual void			Set_Line_Texture_Mapping_Mode(int mode);
 		virtual void			Set_Merge_Intersections(int onoff)			{ if (onoff) { m_LineProperties.Flags |= W3D_ELINE_MERGE_INTERSECTIONS; } else { m_LineProperties.Flags &= ~W3D_ELINE_MERGE_INTERSECTIONS; }; }
 		virtual void			Set_Freeze_Random(int onoff)					{ if (onoff) { m_LineProperties.Flags |= W3D_ELINE_FREEZE_RANDOM; } else { m_LineProperties.Flags &= ~W3D_ELINE_FREEZE_RANDOM; }; }
@@ -228,12 +221,12 @@ class ParticleEmitterDefClass
 		virtual void			Set_UV_Offset_Rate(const Vector2 & rate)	{ m_LineProperties.UPerSec = rate.X; m_LineProperties.VPerSec = rate.Y; }
 
 	protected:
-		
+
 		///////////////////////////////////////////////////////////
 		//
 		//	Protected methods
 		//
-		
+
 		//
 		//	Loading methods
 		//
@@ -312,10 +305,10 @@ class ParticleEmitterDefClass
 		Vector3Randomizer *					m_pVelocityRandomizer;
 };
 
-inline void ParticleEmitterDefClass::Set_Line_Texture_Mapping_Mode(int mode)	
-{ 
+inline void ParticleEmitterDefClass::Set_Line_Texture_Mapping_Mode(int mode)
+{
 	m_LineProperties.Flags &= ~W3D_ELINE_TEXTURE_MAP_MODE_MASK;
-	m_LineProperties.Flags |= ((mode << W3D_ELINE_TEXTURE_MAP_MODE_OFFSET) & W3D_ELINE_TEXTURE_MAP_MODE_MASK); 
+	m_LineProperties.Flags |= ((mode << W3D_ELINE_TEXTURE_MAP_MODE_OFFSET) & W3D_ELINE_TEXTURE_MAP_MODE_MASK);
 }
 
 
@@ -324,7 +317,7 @@ inline void ParticleEmitterDefClass::Set_Line_Texture_Mapping_Mode(int mode)
 //
 //	ParticleEmitterPrototypeClass
 //
-class ParticleEmitterPrototypeClass : public W3DMPO, public PrototypeClass 
+class ParticleEmitterPrototypeClass : public W3DMPO, public PrototypeClass
 {
 	W3DMPO_GLUE(ParticleEmitterPrototypeClass)
 	public:
@@ -332,9 +325,9 @@ class ParticleEmitterPrototypeClass : public W3DMPO, public PrototypeClass
 		///////////////////////////////////////////////////////////
 		//
 		//	Public constructors/destructors
-		//		
+		//
 		ParticleEmitterPrototypeClass (ParticleEmitterDefClass *pdef)	{ m_pDefinition = pdef; }
-		
+
 		///////////////////////////////////////////////////////////
 		//
 		//	Public methods
@@ -375,6 +368,3 @@ class ParticleEmitterLoaderClass : public PrototypeLoaderClass
 //	Global variables
 //
 extern ParticleEmitterLoaderClass	_ParticleEmitterLoader;
-
-
-#endif //__PART_EMT_LDR_H
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
index a1950938980..5272e27f406 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
@@ -26,22 +26,22 @@
  *                                                                                             *
  *                   $Org Author:: Byon_g                                                                                                                                                                                  $Modtime:: 1/24/01 3:54p                                               $*
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 08/05/02 2:40p                                              $*
  *                                                                                             *
  *                    $Revision:: 48                                                          $*
  *                                                                                             *
  * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
- * 08/05/02 KM Texture class redesign 
+ * 08/05/02 KM Texture class redesign
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
+#include "always.h"
 #include "render2d.h"
 #include "mutex.h"
 #include "ww3d.h"
-#include "refcount.h"
 #include "font3d.h"
 #include "rect.h"
 #include "texture.h"
@@ -58,9 +58,6 @@
 #include "wwmemlog.h"
 #include "assetmgr.h"
 
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-
 RectClass							Render2DClass::ScreenResolution( 0,0,0,0 );
 
 
@@ -79,19 +76,19 @@ Render2DClass::Render2DClass( TextureClass* tex ) :
 	UVCoordinates(sizeof(PreAllocatedUVCoordinates)/sizeof(Vector2),PreAllocatedUVCoordinates),
 	Colors(sizeof(PreAllocatedColors)/sizeof(unsigned long),PreAllocatedColors)
 {
-	Set_Texture( tex );	
+	Set_Texture( tex );
    Shader = Get_Default_Shader();
 	return ;
 }
 
 Render2DClass::~Render2DClass()
 {
-	REF_PTR_RELEASE(Texture);	
+	REF_PTR_RELEASE(Texture);
 }
 
-void	Render2DClass::Set_Screen_Resolution( const RectClass & screen )	
-{ 
-	ScreenResolution = screen; 
+void	Render2DClass::Set_Screen_Resolution( const RectClass & screen )
+{
+	ScreenResolution = screen;
 #if 0
 	// Fool into pixel doubling  - Byon..
 	if ( screen.Width() >= 1280 ) {
@@ -107,7 +104,7 @@ Render2DClass::Get_Default_Shader( void )
 	ShaderClass shader;
 
    shader.Set_Depth_Mask( ShaderClass::DEPTH_WRITE_DISABLE );
-	shader.Set_Depth_Compare( ShaderClass::PASS_ALWAYS );	
+	shader.Set_Depth_Compare( ShaderClass::PASS_ALWAYS );
 	shader.Set_Dst_Blend_Func( ShaderClass::DSTBLEND_ONE_MINUS_SRC_ALPHA );
 	shader.Set_Src_Blend_Func( ShaderClass::SRCBLEND_SRC_ALPHA );
 	shader.Set_Fog_Func( ShaderClass::FOG_DISABLE );
@@ -129,7 +126,7 @@ void	Render2DClass::Reset(void)
 
 void Render2DClass::Set_Texture(TextureClass* tex)
 {
-	REF_PTR_SET(Texture,tex);	
+	REF_PTR_SET(Texture,tex);
 }
 
 void Render2DClass::Set_Texture( const char * filename)
@@ -146,7 +143,7 @@ void Render2DClass::Set_Texture( const char * filename)
 void Render2DClass::Enable_Grayscale(bool b)
 {
 	IsGrayScale = b;
-}	
+}
 
 void Render2DClass::Enable_Alpha(bool b)
 {
@@ -213,7 +210,7 @@ void	  Render2DClass::Update_Bias( void )
 }
 
 #if 0
-Vector2 Render2DClass::Convert_Vert( const Vector2 & v ) 
+Vector2 Render2DClass::Convert_Vert( const Vector2 & v )
 {
 	Vector2 out;
 
@@ -221,7 +218,7 @@ Vector2 Render2DClass::Convert_Vert( const Vector2 & v )
 	out.X = v.X * CoordinateScale.X + CoordinateOffset.X;
 	out.Y = v.Y * CoordinateScale.Y + CoordinateOffset.Y;
 
-	// Convert to pixels 
+	// Convert to pixels
 	out.X = (out.X + 1.0f) * (Get_Screen_Resolution().Width() * 0.5f);
 	out.Y = (out.Y - 1.0f) * (Get_Screen_Resolution().Height() * -0.5f);
 
@@ -238,7 +235,7 @@ Vector2 Render2DClass::Convert_Vert( const Vector2 & v )
 
 	// Convert back to (-1,1)-(1,-1)
 	out.X = out.X / (Get_Screen_Resolution().Width() * 0.5f) - 1.0f;
-	out.Y = out.Y / (Get_Screen_Resolution().Height() * -0.5f) + 1.0f;	
+	out.Y = out.Y / (Get_Screen_Resolution().Height() * -0.5f) + 1.0f;
 
 	return out;
 }
@@ -265,7 +262,7 @@ void Render2DClass::Convert_Vert( Vector2 & vert_out, float x_in, float y_in )
 
 #endif
 
-void	Render2DClass::Move( const Vector2 & move )	// Move all verts 
+void	Render2DClass::Move( const Vector2 & move )	// Move all verts
 {
 	Vector2 scaled_move;
 	scaled_move.X = move.X * CoordinateScale.X;
@@ -275,7 +272,7 @@ void	Render2DClass::Move( const Vector2 & move )	// Move all verts
 	}
 }
 
-void	Render2DClass::Force_Alpha( float alpha )		// Force all alphas 
+void	Render2DClass::Force_Alpha( float alpha )		// Force all alphas
 {
 	unsigned long a = (unsigned)(WWMath::Clamp( alpha, 0, 1 ) * 255.0f);
 	a <<= 24;
@@ -285,7 +282,7 @@ void	Render2DClass::Force_Alpha( float alpha )		// Force all alphas
 }
 
 
-void	Render2DClass::Force_Color( int color )		// Force all alphas 
+void	Render2DClass::Force_Color( int color )		// Force all alphas
 {
 	for ( int i = 0; i < Colors.Count(); i++ ) {
 		Colors[i] = color;
@@ -325,7 +322,7 @@ void	Render2DClass::Internal_Add_Quad_UVs( const RectClass & uv )
 	uvs=UVCoordinates.Uninitialized_Add();
 	uvs->X = uv.Right;	uvs->Y = uv.Top;
 	uvs=UVCoordinates.Uninitialized_Add();
-	uvs->X = uv.Right;	uvs->Y = uv.Bottom;	
+	uvs->X = uv.Right;	uvs->Y = uv.Bottom;
 
 }
 
@@ -376,7 +373,7 @@ void	Render2DClass::Internal_Add_Quad_HColors( unsigned long color1, unsigned lo
 void	Render2DClass::Internal_Add_Quad_Indicies( int start_vert_index, bool backfaced )
 {
 	unsigned short * indices;
-	
+
 	if (backfaced ^ (CoordinateScale.X * CoordinateScale.Y > 0)) {
 		indices=Indices.Uninitialized_Add();
 		*indices = start_vert_index + 1;
@@ -500,7 +497,7 @@ void	Render2DClass::Add_Tri( const Vector2 & v0, const Vector2 & v1, const Vecto
 	Convert_Vert( *Vertices.Uninitialized_Add(), v0 );
 	Convert_Vert( *Vertices.Uninitialized_Add(), v1 );
 	Convert_Vert( *Vertices.Uninitialized_Add(), v2 );
-	
+
 #endif
 
 	// Add the uv coordinates
@@ -598,7 +595,7 @@ void	Render2DClass::Add_Outline( const RectClass & rect, float width, const Rect
 	Add_Line (Vector2 (rect.Left + 1, rect.Bottom),	Vector2 (rect.Left + 1, rect.Top + 1),		width, color);
 	Add_Line (Vector2 (rect.Left, rect.Top + 1),		Vector2 (rect.Right - 1, rect.Top + 1),			width, color);
 	Add_Line (Vector2 (rect.Right, rect.Top),		Vector2 (rect.Right, rect.Bottom - 1),		width, color);
-	Add_Line (Vector2 (rect.Right, rect.Bottom),	Vector2 (rect.Left + 1, rect.Bottom),	width, color);	
+	Add_Line (Vector2 (rect.Right, rect.Bottom),	Vector2 (rect.Left + 1, rect.Bottom),	width, color);
 }
 
 void Render2DClass::Render(void)
@@ -652,7 +649,7 @@ void Render2DClass::Render(void)
 			*(unsigned int*)(va+fi.Get_Diffuse_Offset())=Colors[i];
 			*(Vector2*)(va+fi.Get_Tex_Offset(0))=UVCoordinates[i];
 			va+=fi.Get_FVF_Size();
-		}		
+		}
 	}
 
 	DynamicIBAccessClass ib(BUFFER_TYPE_DYNAMIC_DX8,Indices.Count());
@@ -661,7 +658,7 @@ void Render2DClass::Render(void)
 		unsigned short *mem=Lock.Get_Index_Array();
 		for (int i=0; i<Indices.Count(); i++)
 			mem[i]=Indices[i];
-	}	
+	}
 
 	DX8Wrapper::Set_Vertex_Buffer(vb);
 	DX8Wrapper::Set_Index_Buffer(ib,0);
@@ -692,7 +689,7 @@ void Render2DClass::Render(void)
 	}
 	else
 		DX8Wrapper::Set_Shader(Shader);
-	DX8Wrapper::Draw_Triangles(0,Indices.Count()/3,0,Vertices.Count());	
+	DX8Wrapper::Draw_Triangles(0,Indices.Count()/3,0,Vertices.Count());
 
 	DX8Wrapper::Set_Transform(D3DTS_VIEW,view);
 	DX8Wrapper::Set_Transform(D3DTS_PROJECTION,proj);
@@ -715,7 +712,7 @@ Render2DTextClass::Render2DTextClass(Font3DInstanceClass *font) :
 {
 	Set_Coordinate_Range( RectClass( -320, -240, 320, 240 ) );
 	Set_Font( font );
-	
+
 	Reset();
 }
 
@@ -757,7 +754,7 @@ void	Render2DTextClass::Draw_Char( WCHAR ch, unsigned long color )
 {
 	float char_spacing	= Font->Char_Spacing( ch );
 	float char_height		= Font->Char_Height();
-	
+
 	//
 	//	Check to see if this character is clipped
 	//
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h
index b77e0cceaae..8b485725e75 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h
@@ -34,17 +34,11 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef RENDER2D_H
-#define RENDER2D_H
 
 #include "always.h"
 //#include "simplevec.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "vector2.h"
 
 #include "shader.h"
@@ -116,7 +110,7 @@ class Render2DClass : public W3DMPO
 	void	Enable_Alpha(bool b);
 	void	Enable_Grayscale(bool b);///<added for generals to draw disabled button states - MW
 	void  Enable_Texturing(bool b);
-	
+
 	ShaderClass *			Get_Shader( void ) { return &Shader; }
 	static ShaderClass	Get_Default_Shader( void );
 
@@ -149,10 +143,10 @@ class Render2DClass : public W3DMPO
 	// Z-value support (this is usefull for playing tricks with the z-buffer)
 	void	Set_Z_Value (float z_value)	{ ZValue = z_value; }
 
-	// Move all verts 
+	// Move all verts
 	void	Move( const Vector2 & a );
 
-	// Force all alphas 
+	// Force all alphas
 	void	Force_Alpha( float alpha );
 	void	Force_Color( int color );
 
@@ -213,7 +207,7 @@ class Render2DTextClass : public Render2DClass {
 
 	void	Set_Location( const Vector2 & loc )				{ Location = loc; Cursor = loc; }
 	void	Set_Wrapping_Width (float width)					{ WrapWidth = width; }
-	
+
 	// Clipping support
 	void	Set_Clipping_Rect( const RectClass &rect )	{ ClipRect = rect; IsClippedEnabled = true; }
 	bool	Is_Clipping_Enabled( void ) const				{ return IsClippedEnabled; }
@@ -243,5 +237,3 @@ class Render2DTextClass : public Render2DClass {
 
 	void	Draw_Char( WCHAR ch, unsigned long color );
 };
-
-#endif	// RENDER2D_H
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp
index b0daaab30f3..66ac05f3792 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                   Org Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 15                                                          $*
@@ -49,7 +49,7 @@
 **
 ***********************************************************************************************/
 RenderInfoClass::RenderInfoClass(CameraClass & cam) :
-	Camera(cam), 
+	Camera(cam),
 	fog_start(0.0f),
 	fog_end(0.0f),
 	fog_scale(0.0f),
@@ -61,7 +61,7 @@ RenderInfoClass::RenderInfoClass(CameraClass & cam) :
 	alphaOverride(1.0f),
 	materialPassAlphaOverride(1.0f),
 	materialPassEmissiveOverride(1.0f)
-{ 
+{
 	// Need to have one entry in the override flags stack, initialize it to default values.
 	OverrideFlag[OverrideFlagLevel]=RINFO_OVERRIDE_DEFAULT;
 }
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h
index 01b89acad43..ccaaf35d5e8 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                   Org Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 16                                                          $*
@@ -37,21 +37,14 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef RINFO_H
-#define RINFO_H
-
 
 #include "always.h"
 #include "bittype.h"
 #include "ww3d.h"
 #include "wwdebug.h"
 #include "shader.h"
-#include "Vector.H"
+#include "Vector.h"
 #include "matrix3d.h"
 #include "matrix4.h"
 
@@ -119,31 +112,31 @@ class RenderInfoClass
 
 };
 
-	
+
 /**
 ** SpecialRenderInfoClass
 ** This structure also contains a "grab-bag" of junk for use by the Special_Render
-** function.  The first use that I have for Special_Render is to implement the 
+** function.  The first use that I have for Special_Render is to implement the
 ** visibility detection algorithm where each object is rendered in such a way
 ** that I can get the 'id' of the object which generated each pixel on the screen.
 ** Another use I have planned for Special_Render is a shadow rendering mode that
-** just draws an object in solid black from the point of view of a light source. 
+** just draws an object in solid black from the point of view of a light source.
 ** This would just need another enum for the RenderType...
-** 
+**
 ** The reason for a Special_Render function is that I didn't want to pollute
 ** the main rendering pipeline with checks for these alternate rendering operations.
-*/	
+*/
 class SpecialRenderInfoClass : public RenderInfoClass
-{	
+{
 
-public:	
+public:
 	SpecialRenderInfoClass(CameraClass & cam,int render_type);
 	~SpecialRenderInfoClass(void);
 
 	// The following fields are only used by the Special_Render function.
 	// this is basically just a place to stick whatever information you need.
-	enum 
-	{ 
+	enum
+	{
 		RENDER_VIS,
 		RENDER_SHADOW
 	};
@@ -163,7 +156,3 @@ class SpecialRenderInfoClass : public RenderInfoClass
 	SpecialRenderInfoClass & operator = (const RenderInfoClass &);
 
 };
-
-
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp
index 8bb0ddcc418..c18624f26f3 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *                   Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 07/01/02 12:55p                                              $*
  *                                                                                             *
  *                    $Revision:: 24                                                          $*
@@ -76,7 +76,7 @@
 /*
 ** Chunk ID's used by SceneClass
 */
-enum 
+enum
 {
 	SCENECLASS_CHUNK_VARIABLES			= 0x00042300,
 
@@ -91,7 +91,7 @@ enum
 /*
 ** SimpleSceneIterator
 ** This iterator is used by the SimpleSceneClass to allow
-** the user to iterate through its render objects. 
+** the user to iterate through its render objects.
 */
 class SimpleSceneIterator : public SceneIterator
 {
@@ -105,8 +105,8 @@ class SimpleSceneIterator : public SceneIterator
 
 	SimpleSceneIterator(RefRenderObjListClass * renderlist,bool onlyvis);
 
-	RefRenderObjListIterator	RobjIterator;	
-	SimpleSceneClass *			Scene;	
+	RefRenderObjListIterator	RobjIterator;
+	SimpleSceneClass *			Scene;
 	bool								OnlyVis;
 
 	friend class SimpleSceneClass;
@@ -125,7 +125,7 @@ class SimpleSceneIterator : public SceneIterator
  * HISTORY:                                                                                    *
  *   12/10/98   GTH : Created.                                                                 *
  *=============================================================================================*/
-SceneClass::SceneClass(void) : 
+SceneClass::SceneClass(void) :
 	AmbientLight(0.5f,0.5f,0.5f),
 	PolyRenderMode(FILL),
 	ExtraPassPolyRenderMode(EXTRA_PASS_DISABLE),
@@ -183,7 +183,7 @@ void SceneClass::Add_Render_Object(RenderObjClass * obj)
  * the object...                                                                               *
  *                                                                                             *
  * INPUT:                                                                                      *
- * obj - pointer to the object to remove                                                       * 
+ * obj - pointer to the object to remove                                                       *
  *                                                                                             *
  * OUTPUT:                                                                                     *
  *                                                                                             *
@@ -287,7 +287,7 @@ void SceneClass::Load(ChunkLoadClass & cload)
 {
 	cload.Open_Chunk();
 	if (cload.Cur_Chunk_ID() == SCENECLASS_CHUNK_VARIABLES) {
-		
+
 		while (cload.Open_Micro_Chunk()) {
 			switch(cload.Cur_Micro_Chunk_ID()) {
 				READ_MICRO_CHUNK(cload,SCENECLASS_VARIABLE_AMBIENTLIGHT,AmbientLight);
@@ -301,7 +301,7 @@ void SceneClass::Load(ChunkLoadClass & cload)
 		}
 
 	} else {
-		WWDEBUG_SAY(("Unhandled Chunk: 0x%X in file: %s line: %d\r\n",cload.Cur_Chunk_ID(),__FILE__,__LINE__));
+		WWDEBUG_SAY(("Unhandled Chunk: 0x%X in file: %s line: %d",cload.Cur_Chunk_ID(),__FILE__,__LINE__));
 	}
 	cload.Close_Chunk();
 }
@@ -410,14 +410,14 @@ void SimpleSceneClass::Remove_Render_Object(RenderObjClass * obj)
 void SimpleSceneClass::Register(RenderObjClass * obj,RegType for_what)
 {
 	switch (for_what) {
-		case ON_FRAME_UPDATE:	
-			UpdateList.Add(obj);			
+		case ON_FRAME_UPDATE:
+			UpdateList.Add(obj);
 			break;
-		case LIGHT:	
-			LightList.Add_Tail(obj);	
+		case LIGHT:
+			LightList.Add_Tail(obj);
 			break;
-		case RELEASE:				
-			ReleaseList.Add(obj);		
+		case RELEASE:
+			ReleaseList.Add(obj);
 			break;
 	};
 }
@@ -425,14 +425,14 @@ void SimpleSceneClass::Register(RenderObjClass * obj,RegType for_what)
 void SimpleSceneClass::Unregister(RenderObjClass * obj,RegType for_what)
 {
 	switch (for_what) {
-		case ON_FRAME_UPDATE:	
-			UpdateList.Remove(obj);			
+		case ON_FRAME_UPDATE:
+			UpdateList.Remove(obj);
 			break;
-		case LIGHT:	
-			LightList.Remove(obj);	
+		case LIGHT:
+			LightList.Remove(obj);
 			break;
-		case RELEASE:				
-			ReleaseList.Remove(obj);		
+		case RELEASE:
+			ReleaseList.Remove(obj);
 			break;
 	}
 }
@@ -494,7 +494,7 @@ void SimpleSceneClass::Visibility_Check(CameraClass * camera)
  *   6/13/2001  gth : Created.                                                                 *
  *=============================================================================================*/
 float SimpleSceneClass::Compute_Point_Visibility
-(	
+(
 	RenderInfoClass & rinfo,
 	const Vector3 & point
 )
@@ -533,7 +533,7 @@ float SimpleSceneClass::Compute_Point_Visibility
  *   06/27/02	KM Shader system light environment updates                                       *
  *=============================================================================================*/
 void SimpleSceneClass::Customized_Render(RenderInfoClass & rinfo)
-{	
+{
 //	SceneClass::Render(rinfo);
 
    // If visibility has not been checked for this scene since the last
@@ -543,9 +543,9 @@ void SimpleSceneClass::Customized_Render(RenderInfoClass & rinfo)
       // set the visibility bit in all render objects in all layers.
 	   Visibility_Check(&rinfo.Camera);
    }
-   Visibility_Checked = false;	
-	
-	RefRenderObjListIterator it(&UpdateList);	
+   Visibility_Checked = false;
+
+	RefRenderObjListIterator it(&UpdateList);
 
 	// allow all objects in the update list to do their "every frame" processing
 	for (it.First(); !it.Is_Done(); it.Next()) {
@@ -567,14 +567,14 @@ void SimpleSceneClass::Customized_Render(RenderInfoClass & rinfo)
 // rather than optimizing lights into directional lights...
 #if 0
 	for (it.First(&LightList); !it.Is_Done(); it.Next())
-	{		
+	{
 		if (count<4)
 		{
 			DX8Wrapper::Set_Light(count,*(LightClass*)it.Peek_Obj());
 		} else
 		{
 			// Simple scene only supports 4 global lights
-			WWDEBUG_SAY(("Light %d ignored\n",count));
+			WWDEBUG_SAY(("Light %d ignored",count));
 		}
 		count++;
 	}
@@ -587,10 +587,10 @@ void SimpleSceneClass::Customized_Render(RenderInfoClass & rinfo)
 
 		lenv.Reset(Vector3(0,0,0),AmbientLight);
 
-		for (it.First(&LightList); !it.Is_Done(); it.Next()) 
+		for (it.First(&LightList); !it.Is_Done(); it.Next())
 		{
 			lenv.Add_Light(*(LightClass*)it.Peek_Obj());
-		}	
+		}
 		lenv.Pre_Render_Update(rinfo.Camera.Get_Transform());
 
 		rinfo.light_environment=&lenv;
@@ -620,7 +620,7 @@ void SimpleSceneClass::Post_Render_Processing(RenderInfoClass& rinfo)
 {
 	// process the 'Release' list.  These are objects that have notified us that they
 	// want to be released.  We have to walk this list twice, first un-linking the
-	// object from the scene or its container.  And then removing them all from 
+	// object from the scene or its container.  And then removing them all from
 	// the list.  (this last removal will destroy any auto-created objects)
 	RefRenderObjListIterator it(&ReleaseList);
 	for (it.First(&ReleaseList); !it.Is_Done(); it.Next()) {
@@ -674,7 +674,7 @@ void SimpleSceneClass::Destroy_Iterator(SceneIterator * it)
 }
 
 
-SimpleSceneIterator::SimpleSceneIterator(RefRenderObjListClass * list,bool onlyvis) : 
+SimpleSceneIterator::SimpleSceneIterator(RefRenderObjListClass * list,bool onlyvis) :
 	RobjIterator(list)
 {
 	// TODO: make SimpleSceneIterator able to iterate through only the visible nodes.
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h
index 16f4339be3d..3b243968bdf 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h
@@ -34,16 +34,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SCENE_H
-#define SCENE_H
 
 #include "always.h"
-#include "refcount.h"
 #include "vector3.h"
 #include "robjlist.h"
 #include "wwdebug.h"
@@ -83,7 +76,7 @@ class SceneIterator
 **   to surrender when asked in the Render method.
 ** - The ability to add and remove render objects from the scene
 ** - The ability to create an iterator for the user which uses the
-**   SceneIterator interface and allows the user to iterate through 
+**   SceneIterator interface and allows the user to iterate through
 **   all render objects or visible render objects in the scene.
 **
 ** The "registration" interface is used by certain render objects to enable
@@ -185,7 +178,7 @@ class SceneClass : public RefCountClass
 
 protected:
 	virtual void	Render(RenderInfoClass & rinfo);	//Made virtual so we can override -MW
-	
+
 	Vector3						AmbientLight;
 	PolyRenderType				PolyRenderMode;
 	ExtraPassPolyRenderType	ExtraPassPolyRenderMode;
@@ -251,19 +244,17 @@ class SimpleSceneClass : public SceneClass
 																		const Vector3 & point);
 
 protected:
-	
+
    // Has a visibility check been performed since scene was last rendered?
    bool Visibility_Checked;
 
 	RefRenderObjListClass	RenderList;
 	RefRenderObjListClass	UpdateList;
 	RefRenderObjListClass	LightList;
-	RefRenderObjListClass	ReleaseList;	
+	RefRenderObjListClass	ReleaseList;
 
 	friend class SimpleSceneIterator;
 
 	virtual void Customized_Render(RenderInfoClass & rinfo);
 	virtual void Post_Render_Processing(RenderInfoClass& rinfo);
 };
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp
index 9af2dd0fd3b..a711dbdfa19 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp
@@ -274,7 +274,7 @@ void ShaderClass::Init_From_Material3(const W3dMaterial3Struct & mat3)
  * WARNINGS:                                                                                   *
  *                                                                                             *
  * HISTORY:																												  *
- *		05/02/00    IML : Created.																					  *	
+ *		05/02/00    IML : Created.																					  *
  *=============================================================================================*/
 
 void ShaderClass::Enable_Fog (const char *source)
@@ -287,12 +287,12 @@ void ShaderClass::Enable_Fog (const char *source)
 				Set_Fog_Func (ShaderClass::FOG_WHITE);
 			} else {
 				Report_Unable_To_Fog (source);
-			}	
+			}
 			break;
 
 		case ShaderClass::SRCBLEND_ONE:
 			switch (Get_Dst_Blend_Func()) {
-				
+
 				case ShaderClass::DSTBLEND_ZERO:							// Opaque.
 					Set_Fog_Func (ShaderClass::FOG_ENABLE);
 					break;
@@ -313,7 +313,7 @@ void ShaderClass::Enable_Fog (const char *source)
 				Set_Fog_Func (ShaderClass::FOG_ENABLE);
 			} else {
 				Report_Unable_To_Fog (source);
-			}	
+			}
 			break;
 
 		case ShaderClass::SRCBLEND_ONE_MINUS_SRC_ALPHA:
@@ -321,14 +321,14 @@ void ShaderClass::Enable_Fog (const char *source)
 				Set_Fog_Func (ShaderClass::FOG_ENABLE);
 			} else {
 				Report_Unable_To_Fog (source);
-			}	
+			}
 			break;
 	}
 }
 
 
 /***********************************************************************************************
- * ShaderClass::Report_Unable_To_Fog --																		  *	
+ * ShaderClass::Report_Unable_To_Fog --																		  *
  *                                                                                             *
  * INPUT:                                                                                      *
  *                                                                                             *
@@ -337,15 +337,15 @@ void ShaderClass::Enable_Fog (const char *source)
  * WARNINGS:                                                                                   *
  *                                                                                             *
  * HISTORY:																												  *
- *		10/04/00    IML : Created.																					  *	
+ *		10/04/00    IML : Created.																					  *
  *=============================================================================================*/
 void ShaderClass::Report_Unable_To_Fog (const char *source)
 {
 	#ifdef WWDEBUG
 	static unsigned _reportcount = 0;
 
-	const char		*unabletofogtext		= "WARNING: Unable to fog shader in %s with given blending mode.\r\n";
-	const char		*unabletofogmoretext = "WARNING: Unable to fog additional shaders (further warnings will be suppressed).\r\n";
+	const char		*unabletofogtext		= "WARNING: Unable to fog shader in %s with given blending mode.";
+	const char		*unabletofogmoretext = "WARNING: Unable to fog additional shaders (further warnings will be suppressed).";
 	const unsigned  maxreportcount		= 10;
 
 	// Limit the no. of warning messages to some practical maximum. Suppress all subsequent warnings.
@@ -375,7 +375,7 @@ class Blend
 	bool		useAlpha;
 };
 
-const Blend srcBlendLUT[ShaderClass::SRCBLEND_MAX] = 
+const Blend srcBlendLUT[ShaderClass::SRCBLEND_MAX] =
 {
 	Blend(D3DBLEND_ZERO, false),
 	Blend(D3DBLEND_ONE, false),
@@ -383,7 +383,7 @@ const Blend srcBlendLUT[ShaderClass::SRCBLEND_MAX] =
  	Blend(D3DBLEND_DESTCOLOR, true)
 };
 
-const Blend dstBlendLUT[ShaderClass::DSTBLEND_MAX] = 
+const Blend dstBlendLUT[ShaderClass::DSTBLEND_MAX] =
 {
 	Blend(D3DBLEND_ZERO, false),
 	Blend(D3DBLEND_ONE, false),
@@ -467,7 +467,7 @@ void ShaderClass::Apply()
 		if(Get_Alpha_Test() == ShaderClass::ALPHATEST_ENABLE)
 		{
 			unsigned char alphareference = 0x60;	// Alpha reference value that produces best results with mip-mapped textures.
-			
+
 			if(sf == D3DBLEND_INVSRCALPHA)
 			{
 				DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHAREF,0xff - alphareference);
@@ -496,14 +496,14 @@ void ShaderClass::Apply()
 
 			BOOL fm = FALSE;
 			D3DCOLOR fogColor = DX8Wrapper::Get_Fog_Color();
-			
+
 			switch(Get_Fog_Func())
 			{
 			case ShaderClass::FOG_ENABLE:
 				fm = TRUE;
 				break;
 			case ShaderClass::FOG_SCALE_FRAGMENT:
-				fogColor = 0;	
+				fogColor = 0;
 				fm = TRUE;
 				break;
 			case ShaderClass::FOG_WHITE:
@@ -525,19 +525,19 @@ void ShaderClass::Apply()
 		} else {
 			DX8Wrapper::Set_DX8_Render_State(D3DRS_FOGENABLE,FALSE);
 		}
-		
+
 		diff &= ~(ShaderClass::MASK_FOG);
 		if(!diff)
 			return;
 	}
 
 	// Defaults
-	
+
 	D3DTEXTUREOP	PricOp	= D3DTOP_SELECTARG1;
 	DWORD				PricArg1 = D3DTA_DIFFUSE;
 	DWORD				PricArg2 = D3DTA_DIFFUSE;
 
-	D3DTEXTUREOP	PriaOp	 = D3DTOP_SELECTARG1;	
+	D3DTEXTUREOP	PriaOp	 = D3DTOP_SELECTARG1;
 	DWORD			PriaArg1 = D3DTA_DIFFUSE;
 	DWORD			PriaArg2 = D3DTA_DIFFUSE;
 
@@ -552,7 +552,7 @@ void ShaderClass::Apply()
 	bool voodoo3=(DX8Wrapper::Get_Current_Caps()->Get_Vendor()==DX8Caps::VENDOR_3DFX) &&
 					 (DX8Wrapper::Get_Current_Caps()->Get_Device()==DX8Caps::DEVICE_3DFX_VOODOO_3);
 	int pri_mask=ShaderClass::MASK_PRIGRADIENT|ShaderClass::MASK_TEXTURING;
-	int sec_mask=ShaderClass::MASK_POSTDETAILALPHAFUNC|ShaderClass::MASK_POSTDETAILCOLORFUNC|ShaderClass::MASK_TEXTURING;	
+	int sec_mask=ShaderClass::MASK_POSTDETAILALPHAFUNC|ShaderClass::MASK_POSTDETAILCOLORFUNC|ShaderClass::MASK_TEXTURING;
 
 	// Voodoo3s need to keep track of any changes in any of the above
 	// because it shuffles the stages around
@@ -587,7 +587,7 @@ void ShaderClass::Apply()
 				break;
 			case ShaderClass::GRADIENT_ADD:
 				//Modulate Alpha
-				if(!(TextureOpCaps & D3DTEXOPCAPS_ADD))	
+				if(!(TextureOpCaps & D3DTEXOPCAPS_ADD))
 					PricOp = D3DTOP_MODULATE;
 				else
 					PricOp = D3DTOP_ADD;
@@ -640,7 +640,7 @@ void ShaderClass::Apply()
 
 			case ShaderClass::GRADIENT_MODULATE2X:
 				//Modulate Alpha
-				if(!(TextureOpCaps & D3DTOP_MODULATE2X))	
+				if(!(TextureOpCaps & D3DTOP_MODULATE2X))
 					PricOp = D3DTOP_MODULATE;
 				else
 					PricOp = D3DTOP_MODULATE2X;
@@ -684,7 +684,7 @@ void ShaderClass::Apply()
 				break;
 			}
 		}
-	}	
+	}
 
 	if(diff & sec_mask)
 	{
@@ -704,7 +704,7 @@ void ShaderClass::Apply()
 					SeccArg2 = D3DTA_CURRENT;
 				}
 				else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: SELECTARG1\n"));
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: SELECTARG1"));
 				}
 				break;
 
@@ -716,7 +716,7 @@ void ShaderClass::Apply()
 					SeccArg2 = D3DTA_CURRENT;
 				}
 				else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: MODULATE\n"));
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: MODULATE"));
 				}
 				break;
 
@@ -732,7 +732,7 @@ void ShaderClass::Apply()
 					SeccArg2 = D3DTA_CURRENT;
 				}
 				else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: ADDSMOOTH\n"));
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: ADDSMOOTH"));
 				}
 				break;
 
@@ -744,7 +744,7 @@ void ShaderClass::Apply()
 					SeccArg2 = D3DTA_CURRENT;
 				}
 				else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: ADD\n"));
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: ADD"));
 				}
 				break;
 
@@ -756,7 +756,7 @@ void ShaderClass::Apply()
 					SeccArg2 = D3DTA_CURRENT;
 				}
 				else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: SUBTRACT\n"));
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: SUBTRACT"));
 				}
 				break;
 
@@ -768,7 +768,7 @@ void ShaderClass::Apply()
 					SeccArg2 = D3DTA_TEXTURE;
 				}
 				else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: SUBTRACT\n"));
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: SUBTRACT"));
 				}
 				break;
 
@@ -780,7 +780,7 @@ void ShaderClass::Apply()
 					SeccArg2 = D3DTA_CURRENT;
 				}
 				else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: BLENDTEXTUREALPHA\n"));
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: BLENDTEXTUREALPHA"));
 				}
 				break;
 
@@ -792,7 +792,7 @@ void ShaderClass::Apply()
 					SeccArg2 = D3DTA_CURRENT;
 				}
 				else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: BLENDCURRENTALPHA\n"));
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: BLENDCURRENTALPHA"));
 				}
 				break;
 
@@ -806,8 +806,8 @@ void ShaderClass::Apply()
 					SeccArg1 = D3DTA_TEXTURE;
 					SeccArg2 = D3DTA_CURRENT;
 				} else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: ADDSIGNED\n"));
-				}					
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: ADDSIGNED"));
+				}
 				break;
 
 			case ShaderClass::DETAILCOLOR_ADDSIGNED2X:
@@ -824,8 +824,8 @@ void ShaderClass::Apply()
 					SeccArg1 = D3DTA_TEXTURE;
 					SeccArg2 = D3DTA_CURRENT;
 				} else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: ADDSIGNED2X\n"));
-				}					
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: ADDSIGNED2X"));
+				}
 				break;
 
 			case ShaderClass::DETAILCOLOR_SCALE2X:
@@ -839,8 +839,8 @@ void ShaderClass::Apply()
 					SeccArg2 = D3DTA_CURRENT;
 				}
 				else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: MODULATE2X\n"));
-				}				
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: MODULATE2X"));
+				}
 				break;
 
 			case ShaderClass::DETAILCOLOR_MODALPHAADDCOLOR:
@@ -853,10 +853,10 @@ void ShaderClass::Apply()
 					SeccArg1 = D3DTA_TEXTURE;
 					SeccArg2 = D3DTA_CURRENT;
 				} else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: MODULATEALPHA_ADDCOLOR\n"));
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: MODULATEALPHA_ADDCOLOR"));
 				}
 				break;
-			} // color operations
+			}
 
 			switch(Get_Post_Detail_Alpha_Func())
 			{
@@ -872,7 +872,7 @@ void ShaderClass::Apply()
 					SecaArg2 = D3DTA_CURRENT;
 				}
 				else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: SELECTARG1\n"));
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: SELECTARG1"));
 				}
 				break;
 
@@ -884,7 +884,7 @@ void ShaderClass::Apply()
 					SecaArg2 = D3DTA_CURRENT;
 				}
 				else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: MODULATE\n"));
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: MODULATE"));
 				}
 				break;
 
@@ -896,10 +896,10 @@ void ShaderClass::Apply()
 					SecaArg2 = D3DTA_CURRENT;
 				}
 				else {
-					SNAPSHOT_SAY(("Warning: Using unsupported texture op: ADDSMOOTH\n"));
+					SNAPSHOT_SAY(("Warning: Using unsupported texture op: ADDSMOOTH"));
 				}
 				break;
-			} // alpha operations
+			}
 
 			// if color is enabled and alpha is disabled set to pass alpha through
 			if ((SeccOp!=D3DTOP_DISABLE) && (SecaOp==D3DTOP_DISABLE)) {
@@ -909,33 +909,33 @@ void ShaderClass::Apply()
 				SeccOp = D3DTOP_SELECTARG2;
 				SeccArg2 = D3DTA_CURRENT;
 			}
-		}	// texturing enabled
-	}	// if diff sec_mask	
-	
+		}
+	}
+
 	bool kill_stage_2=false;
 
 	// Apply the stage settings
 	if (diff & pri_mask) {
 		// for voodoo3 supported blend modes, the stage 0 color and alpha are both diffuse
 		// or both not, so we can check for color diffuse only
-		if ( voodoo3 && (PricArg2==D3DTA_DIFFUSE) && 
+		if ( voodoo3 && (PricArg2==D3DTA_DIFFUSE) &&
 			  ( (SecaOp!=D3DTOP_DISABLE) || (SeccOp!=D3DTOP_DISABLE) )
 			) {
 			// Special Voodoo3 code
 			// If stage 0 has a diffuse input
-			// and stage 1 has an input put the diffuse in stage 2			
-			
+			// and stage 1 has an input put the diffuse in stage 2
+
 			DWORD tex_arg=D3DTA_CURRENT;
 			if(Get_Texturing() == ShaderClass::TEXTURING_ENABLE) {
 				tex_arg=D3DTA_TEXTURE;
 			}
-			
+
 			// this is for the bad case of using
 			// stage 0 for diffuse only
 			if ((PricOp==D3DTOP_SELECTARG1)&&(PricArg1==D3DTA_DIFFUSE)) {
 				WWDEBUG_SAY(("Wasted Stage 0 in shader-vertex diffuse only"));
 				// set stage 0 to disable
-				DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_DISABLE);				
+				DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_DISABLE);
 				DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_ALPHAOP,D3DTOP_DISABLE);
 				// set stage 1 to accept diffuse
 				if (SeccArg2==D3DTA_CURRENT) SeccArg2=D3DTA_DIFFUSE;
@@ -946,7 +946,7 @@ void ShaderClass::Apply()
 				// set stage 0 to pass through what it needs
 				DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLOROP,D3DTOP_SELECTARG1);
 				DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_COLORARG1,tex_arg);
-				DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_ALPHAOP,D3DTOP_SELECTARG1);			
+				DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_ALPHAOP,D3DTOP_SELECTARG1);
 				DX8Wrapper::Set_DX8_Texture_Stage_State(0,D3DTSS_ALPHAARG1,tex_arg);
 
 				// set stage 2 to do the diffuse op
@@ -961,9 +961,9 @@ void ShaderClass::Apply()
 				DX8CALL(SetTexture(2,0));
 				kill_stage_2=false;
 				ShaderDirty=true;
-			}			
+			}
 		} else {
-			
+
 #pragma message("(gth) Generals added a feature here WW3D::Is_Coloring_Enabled() which needs to be merged properly")
 #if 0
 			if (WW3D::Is_Coloring_Enabled())
@@ -981,12 +981,12 @@ void ShaderClass::Apply()
 			kill_stage_2=true;
 		}
 		diff &= ~(ShaderClass::MASK_PRIGRADIENT);
-	}	
+	}
 
 	if (diff & sec_mask) {
 		DX8Wrapper::Set_DX8_Texture_Stage_State(1,D3DTSS_COLOROP,SeccOp);
 		DX8Wrapper::Set_DX8_Texture_Stage_State(1,D3DTSS_COLORARG1,SeccArg1);
-		DX8Wrapper::Set_DX8_Texture_Stage_State(1,D3DTSS_COLORARG2,SeccArg2);	
+		DX8Wrapper::Set_DX8_Texture_Stage_State(1,D3DTSS_COLORARG2,SeccArg2);
 		DX8Wrapper::Set_DX8_Texture_Stage_State(1,D3DTSS_ALPHAOP,SecaOp);
 		DX8Wrapper::Set_DX8_Texture_Stage_State(1,D3DTSS_ALPHAARG1,SecaArg1);
 		DX8Wrapper::Set_DX8_Texture_Stage_State(1,D3DTSS_ALPHAARG2,SecaArg2);
@@ -994,7 +994,7 @@ void ShaderClass::Apply()
 		diff &= ~(ShaderClass::MASK_POSTDETAILALPHAFUNC);
 		diff &= ~(ShaderClass::MASK_TEXTURING);
 	}
-	
+
 	// Make sure to disable stage 2 for voodoos since we don't have state tracking for
 	// stage 2
 	// bypass the wrapper since it only supports 2 texture stages
@@ -1037,7 +1037,7 @@ void ShaderClass::Apply()
 	}
 
 	// Enable/disable alpha test
-	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHATESTENABLE,BOOL(Get_Alpha_Test()));	
+	DX8Wrapper::Set_DX8_Render_State(D3DRS_ALPHATESTENABLE,BOOL(Get_Alpha_Test()));
 
 	// Enable/disable stencil test
 	// Not supported yet
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h
index 78e65dfd77b..5397b5f1e01 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h
@@ -34,20 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SHADER_H
-#define SHADER_H
 
 #include "always.h"
 
-#if defined (SR_OS_SOLARIS)
-#undef PASS_MAX
-#endif
-
 class DX8Wrapper;
 struct W3dMaterial3Struct;
 class StringClass;
@@ -90,12 +80,11 @@ class ShaderClass
 
 	void	Apply();
 public:
-	
+
 	enum AlphaTestType
 	{
 		ALPHATEST_DISABLE= 0,// disable alpha testing (default)
 		ALPHATEST_ENABLE,		// enable alpha testing
-		ALPHATEST_MAX			// end of enumeration
 	};
 
 	enum DepthCompareType
@@ -104,25 +93,22 @@ class ShaderClass
 		PASS_LESS,        	// pass if incoming less than stored
 		PASS_EQUAL,        	// pass if incoming equal to stored
 		PASS_LEQUAL,			// pass if incoming less than or equal to stored (default)
-		PASS_GREATER,        // pass if incoming greater than stored	
+		PASS_GREATER,        // pass if incoming greater than stored
 		PASS_NOTEQUAL,       // pass if incoming not equal to stored
 		PASS_GEQUAL,			// pass if incoming greater than or equal to stored
 		PASS_ALWAYS,			// pass always
-		PASS_MAX					// end of enumeration
 	};
 
 	enum DepthMaskType
 	{
-		DEPTH_WRITE_DISABLE=0,	// disable depth buffer writes 
+		DEPTH_WRITE_DISABLE=0,	// disable depth buffer writes
 		DEPTH_WRITE_ENABLE,		// enable depth buffer writes		(default)
-		DEPTH_WRITE_MAX			// end of enumeration
 	};
 
 	enum ColorMaskType
 	{
-		COLOR_WRITE_DISABLE=0,	// disable color buffer writes 
+		COLOR_WRITE_DISABLE=0,	// disable color buffer writes
 		COLOR_WRITE_ENABLE,		// enable color buffer writes		(default)
-		COLOR_WRITE_MAX			// end of enumeration
 	};
 
  	enum DetailAlphaFuncType
@@ -131,7 +117,6 @@ class ShaderClass
 		DETAILALPHA_DETAIL,		// other
 		DETAILALPHA_SCALE,		// local * other
 		DETAILALPHA_INVSCALE,	// ~(~local * ~other) = local + (1-local)*other
-		DETAILALPHA_MAX			// end of enumeration
 	};
 
 	enum DetailColorFuncType
@@ -149,22 +134,18 @@ class ShaderClass
 		DETAILCOLOR_ADDSIGNED2X,	// 1010	(local + other - 0.5) * 2
 		DETAILCOLOR_SCALE2X,			// 1011	local * other * 2
 		DETAILCOLOR_MODALPHAADDCOLOR,	// 1100 local + localAlpha * other
-
-		DETAILCOLOR_MAX				//			end of enumeration
 	};
 
 	enum CullModeType
 	{
 		CULL_MODE_DISABLE=0,
 		CULL_MODE_ENABLE,
-		CULL_MODE_MAX
 	};
 
 	enum NPatchEnableType
 	{
 		NPATCH_DISABLE=0,
 		NPATCH_ENABLE,
-		NPATCH_TYPE_MAX
 	};
 
   	enum DstBlendFuncType
@@ -175,7 +156,8 @@ class ShaderClass
  		DSTBLEND_ONE_MINUS_SRC_COLOR,	// destination pixel multiplied by one minus (i.e. inverse) fragment RGB components
  		DSTBLEND_SRC_ALPHA,        	// destination pixel multiplied by fragment alpha component
  		DSTBLEND_ONE_MINUS_SRC_ALPHA, // destination pixel multiplied by fragment inverse alpha
-		DSTBLEND_MAX						// end of enumeration
+
+		DSTBLEND_MAX
   	};
 
 	enum FogFuncType
@@ -184,7 +166,6 @@ class ShaderClass
  		FOG_ENABLE,        	// apply fog, f*fogColor + (1-f)*fragment
  		FOG_SCALE_FRAGMENT,  // fog scalar value multiplies fragment, (1-f)*fragment
  		FOG_WHITE,				// fog scalar value replaces fragment, f*fogColor
-		FOG_MAX					// end of enumeration
  	};
 
  	enum PriGradientType
@@ -195,30 +176,28 @@ class ShaderClass
 		GRADIENT_BUMPENVMAP,				// 011	environment-mapped bump mapping
 		GRADIENT_BUMPENVMAPLUMINANCE,	// 100	environment-mapped bump mapping with luminance control
 		GRADIENT_MODULATE2X,				// 101	modulate fragment ARGB by gradient ARGB and multiply RGB by 2
-		GRADIENT_MAX						// end of enumeration
  	};
 
 	enum SecGradientType
 	{
 		SECONDARY_GRADIENT_DISABLE=0,	// don't draw secondary gradient (default)
-		SECONDARY_GRADIENT_ENABLE,    // add secondary gradient RGB to fragment RGB 
-		SECONDARY_GRADIENT_MAX			// end of enumeration
+		SECONDARY_GRADIENT_ENABLE,    // add secondary gradient RGB to fragment RGB
 	};
 
-	enum SrcBlendFuncType	
+	enum SrcBlendFuncType
   	{
   		SRCBLEND_ZERO=0,						// fragment not added to color buffer
   		SRCBLEND_ONE,							// fragment added unmodified to color buffer (default)
  		SRCBLEND_SRC_ALPHA,					// fragment RGB components multiplied by fragment A
  		SRCBLEND_ONE_MINUS_SRC_ALPHA,		// fragment RGB components multiplied by fragment inverse (one minus) A
-		SRCBLEND_MAX							// end of enumeration
+
+		SRCBLEND_MAX
   	};
 
 	enum TexturingType
 	{
 		TEXTURING_DISABLE=0, // no texturing (treat fragment initial color as 1,1,1,1)
 		TEXTURING_ENABLE,    // enable texturing
-		TEXTURING_MAX			// end of enumeration
 	};
 
 	enum StaticSortCategoryType
@@ -230,7 +209,7 @@ class ShaderClass
 		SSCAT_OTHER
 	};
 
-	enum														
+	enum
 	{
 		MASK_DEPTHCOMPARE			= (7<<0),			// mask for depth comparison setting
 		MASK_DEPTHMASK				= (1<<3),			// mask for depth mask setting
@@ -260,10 +239,10 @@ class ShaderClass
 	bool operator == (const ShaderClass & s) { return ShaderBits == s.ShaderBits; }
 	bool operator != (const ShaderClass & s) { return ShaderBits != s.ShaderBits; }
 
-	inline unsigned int Get_Bits(void) const
+	unsigned int Get_Bits(void) const
 	{	return ShaderBits; }
 
-	inline int Uses_Alpha(void) const
+	int Uses_Alpha(void) const
 	{
 		// check if alpha test is enabled
 		if (Get_Alpha_Test() != ALPHATEST_DISABLE)
@@ -278,62 +257,62 @@ class ShaderClass
 		return (src == SRCBLEND_SRC_ALPHA || src == SRCBLEND_ONE_MINUS_SRC_ALPHA);
 	}
 
-	inline int	Uses_Fog(void) const
+	int	Uses_Fog(void) const
 	{
 		return (Get_Fog_Func() != FOG_DISABLE);
 	}
 
-	inline int	Uses_Primary_Gradient(void) const
+	int	Uses_Primary_Gradient(void) const
 	{
 		return (Get_Primary_Gradient() != GRADIENT_DISABLE);
 	}
 
-	inline int	Uses_Secondary_Gradient(void) const
+	int	Uses_Secondary_Gradient(void) const
 	{
 		return (Get_Secondary_Gradient() != SECONDARY_GRADIENT_DISABLE);
 	}
 
-	inline int	Uses_Texture(void) const
+	int	Uses_Texture(void) const
 	{ return (Get_Texturing() != TEXTURING_DISABLE); }
 
-	inline int	Uses_Post_Detail_Texture(void) const
+	int	Uses_Post_Detail_Texture(void) const
 	{
 		if (Get_Texturing() == TEXTURING_DISABLE)
 		return false;
 		return ((Get_Post_Detail_Color_Func() != DETAILCOLOR_DISABLE) || (Get_Post_Detail_Alpha_Func() != DETAILALPHA_DISABLE));
 	}
-	
+
 	inline void	Reset(void);
 
-	inline DepthCompareType		Get_Depth_Compare(void)	const								{ return (DepthCompareType)(ShaderBits&MASK_DEPTHCOMPARE>>SHIFT_DEPTHCOMPARE); }
-	inline DepthMaskType			Get_Depth_Mask(void) const									{ return (DepthMaskType)((ShaderBits&MASK_DEPTHMASK)>>SHIFT_DEPTHMASK); }
-	inline ColorMaskType			Get_Color_Mask(void) const									{ return (ColorMaskType)((ShaderBits&MASK_COLORMASK)>>SHIFT_COLORMASK); }
-	inline DetailAlphaFuncType	Get_Post_Detail_Alpha_Func(void) const					{ return (DetailAlphaFuncType)((ShaderBits&MASK_POSTDETAILALPHAFUNC)>>SHIFT_POSTDETAILALPHAFUNC); }
-	inline DetailColorFuncType	Get_Post_Detail_Color_Func(void) const					{ return (DetailColorFuncType)((ShaderBits&MASK_POSTDETAILCOLORFUNC)>>SHIFT_POSTDETAILCOLORFUNC); }
-	inline AlphaTestType			Get_Alpha_Test(void) const									{ return (AlphaTestType)((ShaderBits&MASK_ALPHATEST)>>SHIFT_ALPHATEST); }
-	inline CullModeType			Get_Cull_Mode(void) const									{ return (CullModeType)((ShaderBits&MASK_CULLMODE)>>SHIFT_CULLMODE); }
-	inline DstBlendFuncType		Get_Dst_Blend_Func(void) const							{ return (DstBlendFuncType)((ShaderBits&MASK_DSTBLEND)>>SHIFT_DSTBLEND); }
-	inline FogFuncType			Get_Fog_Func(void) const									{ return (FogFuncType)((ShaderBits&MASK_FOG)>>SHIFT_FOG); }
-	inline PriGradientType		Get_Primary_Gradient(void) const							{ return (PriGradientType)((ShaderBits&MASK_PRIGRADIENT)>>SHIFT_PRIGRADIENT); }
-	inline SecGradientType		Get_Secondary_Gradient(void) const						{ return (SecGradientType)((ShaderBits&MASK_SECGRADIENT)>>SHIFT_SECGRADIENT); }
-	inline SrcBlendFuncType		Get_Src_Blend_Func(void) const							{ return (SrcBlendFuncType)((ShaderBits&MASK_SRCBLEND)>>SHIFT_SRCBLEND); }
-	inline TexturingType			Get_Texturing(void) const									{ return (TexturingType)((ShaderBits&MASK_TEXTURING)>>SHIFT_TEXTURING); }
-	inline NPatchEnableType		Get_NPatch_Enable(void) const								{ return (NPatchEnableType)((ShaderBits&MASK_NPATCHENABLE)>>SHIFT_NPATCHENABLE); }
-
-	inline	void	Set_Depth_Compare(DepthCompareType x)					{ ShaderBits&=~MASK_DEPTHCOMPARE;ShaderBits|=(x<<SHIFT_DEPTHCOMPARE);	}
-	inline	void	Set_Depth_Mask(DepthMaskType x)							{ ShaderBits&=~MASK_DEPTHMASK; ShaderBits|=(x<<SHIFT_DEPTHMASK);	}
-	inline	void	Set_Color_Mask(ColorMaskType x)							{ ShaderBits&=~MASK_COLORMASK; ShaderBits|=(x<<SHIFT_COLORMASK);	}
-	inline	void	Set_Post_Detail_Alpha_Func(DetailAlphaFuncType x)	{ ShaderBits&=~MASK_POSTDETAILALPHAFUNC;ShaderBits|=(x<<SHIFT_POSTDETAILALPHAFUNC);	}
-	inline	void	Set_Post_Detail_Color_Func(DetailColorFuncType x)	{ ShaderBits&=~MASK_POSTDETAILCOLORFUNC;ShaderBits|=(x<<SHIFT_POSTDETAILCOLORFUNC);	}
-	inline	void	Set_Alpha_Test(AlphaTestType x)							{ ShaderBits&=~MASK_ALPHATEST; ShaderBits|=(x<<SHIFT_ALPHATEST);		}
-	inline	void	Set_Cull_Mode(CullModeType x)								{ ShaderBits&=~MASK_CULLMODE; ShaderBits|=(x<<SHIFT_CULLMODE);		}
-	inline	void	Set_Dst_Blend_Func(DstBlendFuncType x)					{ ShaderBits&=~MASK_DSTBLEND; ShaderBits|=(x<<SHIFT_DSTBLEND);		}
-	inline	void	Set_Fog_Func(FogFuncType x)								{ ShaderBits&=~MASK_FOG; ShaderBits|=(x<<SHIFT_FOG);			}
-	inline	void	Set_Primary_Gradient(PriGradientType x)				{ ShaderBits&=~MASK_PRIGRADIENT;ShaderBits|=(x<<SHIFT_PRIGRADIENT);	}
-	inline	void	Set_Secondary_Gradient(SecGradientType x)				{ ShaderBits&=~MASK_SECGRADIENT;ShaderBits|=(x<<SHIFT_SECGRADIENT);	}
-	inline	void	Set_Src_Blend_Func(SrcBlendFuncType x)					{ ShaderBits&=~MASK_SRCBLEND;ShaderBits|=(x<<SHIFT_SRCBLEND);		}
-	inline	void	Set_Texturing(TexturingType x)							{ ShaderBits&=~MASK_TEXTURING; ShaderBits|=(x<<SHIFT_TEXTURING);	}
-	inline	void	Set_NPatch_Enable(NPatchEnableType x)					{ ShaderBits&=~MASK_NPATCHENABLE; ShaderBits|=(x<<SHIFT_NPATCHENABLE);	}
+	DepthCompareType		Get_Depth_Compare(void)	const								{ return (DepthCompareType)(ShaderBits&MASK_DEPTHCOMPARE>>SHIFT_DEPTHCOMPARE); }
+	DepthMaskType			Get_Depth_Mask(void) const									{ return (DepthMaskType)((ShaderBits&MASK_DEPTHMASK)>>SHIFT_DEPTHMASK); }
+	ColorMaskType			Get_Color_Mask(void) const									{ return (ColorMaskType)((ShaderBits&MASK_COLORMASK)>>SHIFT_COLORMASK); }
+	DetailAlphaFuncType	Get_Post_Detail_Alpha_Func(void) const					{ return (DetailAlphaFuncType)((ShaderBits&MASK_POSTDETAILALPHAFUNC)>>SHIFT_POSTDETAILALPHAFUNC); }
+	DetailColorFuncType	Get_Post_Detail_Color_Func(void) const					{ return (DetailColorFuncType)((ShaderBits&MASK_POSTDETAILCOLORFUNC)>>SHIFT_POSTDETAILCOLORFUNC); }
+	AlphaTestType			Get_Alpha_Test(void) const									{ return (AlphaTestType)((ShaderBits&MASK_ALPHATEST)>>SHIFT_ALPHATEST); }
+	CullModeType			Get_Cull_Mode(void) const									{ return (CullModeType)((ShaderBits&MASK_CULLMODE)>>SHIFT_CULLMODE); }
+	DstBlendFuncType		Get_Dst_Blend_Func(void) const							{ return (DstBlendFuncType)((ShaderBits&MASK_DSTBLEND)>>SHIFT_DSTBLEND); }
+	FogFuncType			Get_Fog_Func(void) const									{ return (FogFuncType)((ShaderBits&MASK_FOG)>>SHIFT_FOG); }
+	PriGradientType		Get_Primary_Gradient(void) const							{ return (PriGradientType)((ShaderBits&MASK_PRIGRADIENT)>>SHIFT_PRIGRADIENT); }
+	SecGradientType		Get_Secondary_Gradient(void) const						{ return (SecGradientType)((ShaderBits&MASK_SECGRADIENT)>>SHIFT_SECGRADIENT); }
+	SrcBlendFuncType		Get_Src_Blend_Func(void) const							{ return (SrcBlendFuncType)((ShaderBits&MASK_SRCBLEND)>>SHIFT_SRCBLEND); }
+	TexturingType			Get_Texturing(void) const									{ return (TexturingType)((ShaderBits&MASK_TEXTURING)>>SHIFT_TEXTURING); }
+	NPatchEnableType		Get_NPatch_Enable(void) const								{ return (NPatchEnableType)((ShaderBits&MASK_NPATCHENABLE)>>SHIFT_NPATCHENABLE); }
+
+	void	Set_Depth_Compare(DepthCompareType x)					{ ShaderBits&=~MASK_DEPTHCOMPARE;ShaderBits|=(x<<SHIFT_DEPTHCOMPARE);	}
+	void	Set_Depth_Mask(DepthMaskType x)							{ ShaderBits&=~MASK_DEPTHMASK; ShaderBits|=(x<<SHIFT_DEPTHMASK);	}
+	void	Set_Color_Mask(ColorMaskType x)							{ ShaderBits&=~MASK_COLORMASK; ShaderBits|=(x<<SHIFT_COLORMASK);	}
+	void	Set_Post_Detail_Alpha_Func(DetailAlphaFuncType x)	{ ShaderBits&=~MASK_POSTDETAILALPHAFUNC;ShaderBits|=(x<<SHIFT_POSTDETAILALPHAFUNC);	}
+	void	Set_Post_Detail_Color_Func(DetailColorFuncType x)	{ ShaderBits&=~MASK_POSTDETAILCOLORFUNC;ShaderBits|=(x<<SHIFT_POSTDETAILCOLORFUNC);	}
+	void	Set_Alpha_Test(AlphaTestType x)							{ ShaderBits&=~MASK_ALPHATEST; ShaderBits|=(x<<SHIFT_ALPHATEST);		}
+	void	Set_Cull_Mode(CullModeType x)								{ ShaderBits&=~MASK_CULLMODE; ShaderBits|=(x<<SHIFT_CULLMODE);		}
+	void	Set_Dst_Blend_Func(DstBlendFuncType x)					{ ShaderBits&=~MASK_DSTBLEND; ShaderBits|=(x<<SHIFT_DSTBLEND);		}
+	void	Set_Fog_Func(FogFuncType x)								{ ShaderBits&=~MASK_FOG; ShaderBits|=(x<<SHIFT_FOG);			}
+	void	Set_Primary_Gradient(PriGradientType x)				{ ShaderBits&=~MASK_PRIGRADIENT;ShaderBits|=(x<<SHIFT_PRIGRADIENT);	}
+	void	Set_Secondary_Gradient(SecGradientType x)				{ ShaderBits&=~MASK_SECGRADIENT;ShaderBits|=(x<<SHIFT_SECGRADIENT);	}
+	void	Set_Src_Blend_Func(SrcBlendFuncType x)					{ ShaderBits&=~MASK_SRCBLEND;ShaderBits|=(x<<SHIFT_SRCBLEND);		}
+	void	Set_Texturing(TexturingType x)							{ ShaderBits&=~MASK_TEXTURING; ShaderBits|=(x<<SHIFT_TEXTURING);	}
+	void	Set_NPatch_Enable(NPatchEnableType x)					{ ShaderBits&=~MASK_NPATCHENABLE; ShaderBits|=(x<<SHIFT_NPATCHENABLE);	}
 
 	void	Init_From_Material3(const W3dMaterial3Struct & mat3);
 	void	Enable_Fog (const char *source);
@@ -343,13 +322,13 @@ class ShaderClass
 	int							Guess_Sort_Level(void) const;
 
 	// DX 8 state management routines
-	static inline void	Invalidate() { ShaderDirty=true; }
-	
+	static void	Invalidate() { ShaderDirty=true; }
+
 	// Global backface culling invert.  This interface can be used to globally invert all backface
-	// culling.  This is a global setting and will affect everything being rendered.  Typically it 
-	// should be left alone at the default setting.  Renegade uses this feature to render the entire 
-	// scene's backfacing polygons only; this is used in a VIS-debugging process.  In order for this 
-	// to work, you will have to ww3d::Flush all rendering before changing the setting back.  
+	// culling.  This is a global setting and will affect everything being rendered.  Typically it
+	// should be left alone at the default setting.  Renegade uses this feature to render the entire
+	// scene's backfacing polygons only; this is used in a VIS-debugging process.  In order for this
+	// to work, you will have to ww3d::Flush all rendering before changing the setting back.
 	// NORMAL USERS SHOULD NEVER CALL THESE FUNCTIONS!
 	static void				Invert_Backface_Culling(bool onoff);
 	static bool				Is_Backface_Culling_Inverted(void);
@@ -375,7 +354,7 @@ class ShaderClass
 
 	// Texturing, zbuffer, primary gradient, multiplicative blending
 	static ShaderClass _PresetMultiplicativeShader;
-	
+
 	// Texturing, no zbuffer reading/writing, no gradients, no blending, no
 	// fogging - mostly for opaque 2D objects.
 	static ShaderClass _PresetOpaque2DShader;
@@ -482,5 +461,3 @@ inline void ShaderClass::Reset()
 	Set_Post_Detail_Alpha_Func(DETAILALPHA_DISABLE);
 	Set_NPatch_Enable(NPATCH_DISABLE);
 }
-
-#endif //SHADER_H
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h
index 6601f691810..0307babe95c 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h
@@ -27,7 +27,7 @@
  *                    Org Author:: Kenny Mitchell
  *                                                                                             *
  *                       $Author:: Kenny_m
- *																																	
+ *
  *								$Modtime:: 07/01/02 9:58p                                               $*
  *                                                                                             *
  *                    $Revision:: 1                                                          $*
@@ -36,10 +36,9 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef SHDLIB_H
-#define SHDLIB_H
+#pragma once
 
-// TheSuperHackers @compile Removes the unused WWShade code. (#596)
+// TheSuperHackers @build Removes the unused WWShade code. (#596)
 // If there is a desire to revive this, then the WWShade library needs to be re-added.
 
 #ifdef USE_WWSHADE
@@ -60,14 +59,11 @@ extern void SHD_Register_Loader();
 
 #else // USE_WWSHADE
 
-#define SHD_INIT					
-#define SHD_SHUTDOWN				
-#define SHD_INIT_SHADERS		
-#define SHD_SHUTDOWN_SHADERS	
-#define SHD_FLUSH					
-#define SHD_REG_LOADER			
+#define SHD_INIT
+#define SHD_SHUTDOWN
+#define SHD_INIT_SHADERS
+#define SHD_SHUTDOWN_SHADERS
+#define SHD_FLUSH
+#define SHD_REG_LOADER
 
 #endif // USE_WWSHADE
-
-
-#endif // SHDLIB_H
\ No newline at end of file
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
index 2bf6401a9b0..68a58c327ff 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
@@ -26,8 +26,8 @@
  *                                                                                             *
  *              Original Author:: Greg Hjelstrom                                               *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *                     $Modtime:: 06/27/02 1:27p                                              $*
  *                                                                                             *
  *                    $Revision:: 2                                                           $*
@@ -50,11 +50,6 @@
 #include <wwprofile.h>
 #include <algorithm>
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-// #pragma optimize("", off)
-// #pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 bool SortingRendererClass::_EnableTriangleDraw=true;
 static unsigned DEFAULT_SORTING_POLY_COUNT = 16384;	// (count * 3) must be less than 65536
@@ -119,10 +114,10 @@ void Sort(TempIndexStruct *begin, TempIndexStruct *end)
 		}
 		if (begin[0] > end[-1]) {
 			std::swap(begin[0], end[-1]);
-		}																// end[-1] has the largest element
+		}
 		if (begin[1] > begin[0]) {
 			std::swap(begin[1], begin[0]);
-		}																// begin[0] has the middle element and begin[1] has the smallest element
+		}
 
 		// *begin is now the partitioning element
 		TempIndexStruct *begin1 = begin + 1;	// TODO: Temp fix until I find out who is passing me NaN
@@ -216,7 +211,7 @@ static TempIndexStruct* Get_Temp_Index_Array(unsigned count)
 
 void SortingRendererClass::Insert_Triangles(
 	const SphereClass& bounding_sphere,
-	unsigned short start_index, 
+	unsigned short start_index,
 	unsigned short polygon_count,
 	unsigned short min_vertex_index,
 	unsigned short vertex_count)
@@ -226,7 +221,7 @@ void SortingRendererClass::Insert_Triangles(
 		return;
 	}
 
-	SNAPSHOT_SAY(("SortingRenderer::Insert(start_i: %d, polygons : %d, min_vi: %d, vertex_count: %d)\n",
+	SNAPSHOT_SAY(("SortingRenderer::Insert(start_i: %d, polygons : %d, min_vi: %d, vertex_count: %d)",
 		start_index,polygon_count,min_vertex_index,vertex_count));
 
 
@@ -257,10 +252,10 @@ void SortingRendererClass::Insert_Triangles(
 	D3DXVec3Transform(
 		&transformed_vec,
 		&vec,
-		&mtx); 
+		&mtx);
 	state->transformed_center=Vector3(transformed_vec[0],transformed_vec[1],transformed_vec[2]);
 
-	
+
 	/// @todo lorenzen sez use a bucket sort here... and stop copying so much data so many times
 
 	SortingNodeStruct* node=sorted_list.Head();
@@ -303,7 +298,7 @@ void SortingRendererClass::Insert_Triangles(
 // ----------------------------------------------------------------------------
 
 void SortingRendererClass::Insert_Triangles(
-	unsigned short start_index, 
+	unsigned short start_index,
 	unsigned short polygon_count,
 	unsigned short min_vertex_index,
 	unsigned short vertex_count)
@@ -326,7 +321,7 @@ void Release_Refs(SortingNodeStruct* state)
 	}
 	REF_PTR_RELEASE(state->sorting_state.index_buffer);
 	REF_PTR_RELEASE(state->sorting_state.material);
-	for (i=0;i<DX8Wrapper::Get_Current_Caps()->Get_Max_Textures_Per_Pass();++i) 
+	for (i=0;i<DX8Wrapper::Get_Current_Caps()->Get_Max_Textures_Per_Pass();++i)
 	{
 		REF_PTR_RELEASE(state->sorting_state.Textures[i]);
 	}
@@ -364,7 +359,7 @@ static void Apply_Render_State(RenderStateStruct& render_state)
 
 	DX8Wrapper::Set_Material(render_state.material);
 
-	for (int i=0;i<DX8Wrapper::Get_Current_Caps()->Get_Max_Textures_Per_Pass();++i) 
+	for (int i=0;i<DX8Wrapper::Get_Current_Caps()->Get_Max_Textures_Per_Pass();++i)
 	{
 		DX8Wrapper::Set_Texture(i,render_state.Textures[i]);
 	}
@@ -411,7 +406,7 @@ void SortingRendererClass::Flush_Sorting_Pool()
 {
 	if (!overlapping_node_count) return;
 
-	SNAPSHOT_SAY(("SortingSystem - Flush \n"));
+	SNAPSHOT_SAY(("SortingSystem - Flush"));
 
 	// Fill dynamic index buffer with sorting index buffer vertices
 	TempIndexStruct* tis=Get_Temp_Index_Array(overlapping_polygon_count);
@@ -596,7 +591,7 @@ void SortingRendererClass::Flush_Sorting_Pool()
 	overlapping_polygon_count=0;
 	overlapping_vertex_count=0;
 
-	SNAPSHOT_SAY(("SortingSystem - Done flushing\n"));
+	SNAPSHOT_SAY(("SortingSystem - Done flushing"));
 
 }
 
@@ -612,7 +607,7 @@ void SortingRendererClass::Flush()
 
 	while (SortingNodeStruct* state=sorted_list.Head()) {
 		state->Remove();
-		
+
 		if ((state->sorting_state.index_buffer_type==BUFFER_TYPE_SORTING || state->sorting_state.index_buffer_type==BUFFER_TYPE_DYNAMIC_SORTING) &&
 			(state->sorting_state.vertex_buffer_types[0]==BUFFER_TYPE_SORTING || state->sorting_state.vertex_buffer_types[0]==BUFFER_TYPE_DYNAMIC_SORTING)) {
 			Insert_To_Sorting_Pool(state);
@@ -680,7 +675,7 @@ void SortingRendererClass::Deinit()
 
 void SortingRendererClass::Insert_VolumeParticle(
 	const SphereClass& bounding_sphere,
-	unsigned short start_index, 
+	unsigned short start_index,
 	unsigned short polygon_count,
 	unsigned short min_vertex_index,
 	unsigned short vertex_count,
@@ -720,14 +715,14 @@ void SortingRendererClass::Insert_VolumeParticle(
 	D3DXVec3Transform(
 		&transformed_vec,
 		&vec,
-		&mtx); 
+		&mtx);
 	state->transformed_center=Vector3(transformed_vec[0],transformed_vec[1],transformed_vec[2]);
 
 
 	// BUT WHAT IS THE DEAL WITH THE VERTCOUNT AND POLYCOUNT BEING N BUT TRANSFORMED CENTER COUNT == 1
 
 	//THE TRANSFORMED CENTER[2] IS THE ZBUFFER DEPTH
-	
+
 	/// @todo lorenzen sez use a bucket sort here... and stop copying so much data so many times
 
 	SortingNodeStruct* node=sorted_list.Head();
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h
index 100652529bd..06f0b5e826c 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef SORTING_RENDERER_H
-#define SORTING_RENDERER_H
 
 #include "always.h"
 
@@ -38,20 +33,20 @@ class SortingRendererClass
 public:
 	static void Insert_Triangles(
 		const SphereClass& bounding_sphere,
-		unsigned short start_index, 
+		unsigned short start_index,
 		unsigned short polygon_count,
 		unsigned short min_vertex_index,
 		unsigned short vertex_count);
 
 	static void Insert_Triangles(
-		unsigned short start_index, 
+		unsigned short start_index,
 		unsigned short polygon_count,
 		unsigned short min_vertex_index,
 		unsigned short vertex_count);
 
 	static void Insert_VolumeParticle(
 		const SphereClass& bounding_sphere,
-		unsigned short start_index, 
+		unsigned short start_index,
 		unsigned short polygon_count,
 		unsigned short min_vertex_index,
 		unsigned short vertex_count,
@@ -59,12 +54,9 @@ class SortingRendererClass
 
 	static void Flush();
 	static void Deinit();
-	
+
 	static void SetMinVertexBufferSize( unsigned val );
 
 	static void _Enable_Triangle_Draw(bool enable) { _EnableTriangleDraw=enable; }
 	static bool _Is_Triangle_Draw_Enabled() { return _EnableTriangleDraw; }
 };
-
-#endif
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.cpp
deleted file mode 100644
index 4aa3bfed673..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.cpp
+++ /dev/null
@@ -1,1390 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/texproject.cpp                         $*
- *                                                                                             *
- *              Original Author:: Greg Hjelstrom                                               *
- *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
- *								$Modtime:: 08/05/02 10:03a                                             $*
- *                                                                                             *
- *                    $Revision:: 22                                                          $*
- *                                                                                             *
- * 06/26/02 KM Matrix name change to avoid MAX conflicts                                       *
- * 06/27/02 KM Render to shadow buffer texture support														*
- * 08/05/02 KM Texture class redesign 
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *   TexProjectClass::TexProjectClass -- Constructor                                           *
- *   TexProjectClass::~TexProjectClass -- Destructor                                           *
- *   TexProjectClass::Set_Texture_Size -- Set the size of texture to use                       *
- *   TexProjectClass::Get_Texture_Size -- Returns the stored texture size                      *
- *   TexProjectClass::Set_Flag -- Turn specified flag on or off                                *
- *   TexProjectClass::Get_Flag -- Get the current state of specified flag                      *
- *   TexProjectClass::Set_Intensity -- Set the intensity of this projector                     *
- *   TexProjectClass::Get_Intensity -- returns the current "desired" intensity                 *
- *   TexProjectClass::Set_Attenuation -- Set the attenuation factor                            *
- *   TexProjectClass::Get_Attenuation -- Returns the attenuation value                         *
- *   TexProjectClass::Enable_Attenuation -- Set the state of the ATTENUATE flag                *
- *   TexProjectClass::Is_Attenuation_Enabled -- Get the state of the ATTENUATE flag            *
- *   TexProjectClass::Is_Depth_Gradient_Enabled -- returns whether the depth gradient is enabl *
- *   TexProjectClass::Enable_Depth_Gradient -- enable/disable depth gradient                   *
- *   TexProjectClass::Init_Multiplicative -- Initialize this to be a multiplicative texture pr *
- *   TexProjectClass::Is_Intensity_Zero -- check if we can eliminate this projector            *
- *   TexProjectClass::Init_Additive -- Set up the projector to be additive                     *
- *   TexProjectClass::Set_Perspective_Projection -- Set up a perspective projection            *
- *   TexProjectClass::Set_Ortho_Projection -- Set up an orthographic projection                *
- *   TexProjectClass::Set_Texture -- Set the texture to be projected                           *
- *   TexProjectClass::Get_Texture -- Returns the texture being projected                       *
- *   TexProjectClass::Peek_Texture -- Returns the texture being projected                      *
- *   TexProjectClass::Peek_Material_Pass -- Returns the material pass object                   *
- *   TexProjectClass::Compute_Perspective_Projection -- Set up a perspective projection of an  *
- *   TexProjectClass::Compute_Perspective_Projection -- Set up a perspective projection of an  *
- *   TexProjectClass::Compute_Ortho_Projection -- Automatic Orthographic projection            *
- *   TexProjectClass::Compute_Ortho_Projection -- Automatic Orthographic projection            *
- *   TexProjectClass::Compute_Texture -- Generates texture by rendering an object              *
- *   TexProjectClass::Configure_Camera -- setup a camera to match this projector               *
- *   TexProjectClass::Pre_Render_Update -- Prepare the projector for rendering                 *
- *   TexProjectClass::Update_WS_Bounding_Volume -- Recalculate the world-space bounding box    *
- *   TexProjectClass::Get_Surface -- Returns pointer to the texture surface                    *
- *   TexProjectClass::Set_Render_Target -- Install a render target for this projector to use   *
- *   TexProjectClass::Needs_Render_Target -- returns wheter this projector needs a render targ *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-#include "texproject.h"
-#include "vertmaterial.h"
-#include "shader.h"
-#include "texture.h"
-#include "rendobj.h"
-#include "rinfo.h"
-#include "camera.h"
-#include "matpass.h"
-#include "bwrender.h"
-#include "assetmgr.h"
-#include "dx8wrapper.h"
-
-
-// DEBUG DEBUG
-#include "MPU.H"
-
-#define DEBUG_SHADOW_RENDERING					0
-//#define DEFAULT_TEXTURE_SIZE						64
-
-const float INTENSITY_RATE_OF_CHANGE			= 1.0f;			// change in intensity per second
-
-
-/*
-** 
-** Shadow mapping:  from pre-projected view coordinates back to world space
-** then to shadow space
-**
-** (1) Vshadow = PShadow * Mwrld-shadow * Vwrld
-** 
-** (2) Vview = Mwrld-camera * Vwrld
-**
-** Using (2) to solve for Vwrld in terms of Vview
-**                -1
-** (3) Mwrld-camera  * Vview = Vwrld
-**
-** Substituting (3) into (1)
-**                                                   -1
-** (4) Vshadow = Pshadow * Mwrld-shadow * Mwrld-camera * Vview
-**
-** ---------------------------------------------------------------------------------
-** 
-** Shadow mapping: from pre-projected view space to world space, to shadow space, 
-** then projecting.
-** 
-** (1) Vshadow = Mwrld-shadow * Vwrld
-**
-** (2) Vview = Mwrld-camera * Vwrld
-**
-** solving (2) for Vwrld:
-**                -1
-** (3) Mwrld-camera * Vview = Vwrld
-**
-** substitute into (1)
-**                                         -1
-** (4) Vshadow = Mwrld-shadow * Mwrld-camera * Vview
-**
-** project shadow
-**                                                         -1
-** (5) Vproj-shadow = Pshadow * (Mwrld-shadow * Mwrld-camera ) * Vview
-**
-** aaah! same thing :-)
-**
-** ---------------------------------------------------------------------------------
-**
-** Shadow mapping:  from pre-projected view coordinates back to obj space
-** then to shadow space
-** 
-** (1) Vshadow = PShadow * Mwrld-shadow * Mobj-wrld * Vobj
-** 
-** (2) Vview = Mwrld-camera * Mobj-wrld * Vobj
-**             -1             -1
-** (3) Mobj-wrld * Mwrld-camera * Vview = Vobj
-**                                                            -1             -1
-** (4) Vshadow = PShadow * Mwrld-shadow * Mobj-wrld * Mobj-wrld * Mwrld-camera * Vview
-**                                                   -1
-** (5) Vshadow = PShadow * Mwrld-shadow * Mvrld-camera * Vview
-**
-**
-** Ideas:
-** - Use Texture Projectors to implement spot lights and stained glass windows
-** - Attenuate texture projections with distance from the projector
-** - Should be able to handle lots of pre-calculated static texture projectors.  They
-**   should cull well and we can pre-generate the textures. 
-**
-** Ideas maybe used in conjunction with texture projections:
-** - Light volumes: the problem is when the volume is cliped it looks funny, we can
-**   fill in the clipped face of a non-translucent object by rendering the backfaces
-** - Use the backface-fill to make the camera slicing through the commando look like
-**   its *really* slicing through the commando :-)
-** - The back-face-fill trick might be able to use el-cheapo screen mapping!
-**  
-*/
-
-
-
-/***********************************************************************************************
- * TexProjectClass::TexProjectClass -- Constructor                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-TexProjectClass::TexProjectClass(void) :
-	Flags(DEFAULT_FLAGS),
-	DesiredIntensity(1.0f),
-	Intensity(1.0f),
-	Attenuation(1.0f),
-	MaterialPass(NULL),
-	Mapper1(NULL),
-	RenderTarget(NULL),
-	DepthStencilTarget(NULL),
-	HFov(90.0f),
-	VFov(90.0f),
-	XMin(-10.0f),
-	XMax(10.0f),
-	YMin(-10.0f),
-	YMax(10.0f),
-	ZNear(1.0f),
-	ZFar(1000.0f)
-{
-	// create a material pass class
-	MaterialPass = NEW_REF(MaterialPassClass,()); 
-	MaterialPass->Set_Cull_Volume(&WorldBoundingVolume);
-
-	// create a vertex material
-	VertexMaterialClass * vmtl = NEW_REF(VertexMaterialClass,());
-	WWASSERT(vmtl != NULL);
-	
-	// Plug our parent's mapper into our vertex material
-	// the mapper for stage1 will be allocated as needed
-	vmtl->Set_Mapper(Mapper);
-
-	MaterialPass->Set_Material(vmtl);
-	vmtl->Release_Ref();
-	vmtl = NULL;
-
-	// by default init our material pass to be multiplicative (shadow)
-	Init_Multiplicative();
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::~TexProjectClass -- Destructor                                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-TexProjectClass::~TexProjectClass(void)
-{
-	REF_PTR_RELEASE(Mapper1);
-	REF_PTR_RELEASE(MaterialPass);
-	REF_PTR_RELEASE(RenderTarget);
-	REF_PTR_RELEASE(DepthStencilTarget);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Texture_Size -- Set the size of texture to use                         *
- *                                                                                             *
- *    This function stores the desired texture size in this TexProjectClass.  Note that        *
- *    this size is only used if you have the TexProjectClass generate a texture.               *
- *                                                                                             *
- * INPUT:                                                                                      *
- *    size - dimension of the texture in pixels                                                *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Texture_Size(int size)
-{
-	WWASSERT(size > 0);
-	WWASSERT(size <= 512);
-	Flags &= ~SIZE_MASK;
-	Flags |= (size << SIZE_SHIFT);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Get_Texture_Size -- Returns the stored texture size                        *
- *                                                                                             *
- *    Returns the size stored in the flags variable.  This can be different than the actual    *
- *    texture's size if you manually installed a texture.  This size is only used when         *
- *    automatically generating a texture as is the case when creating shadows.                 *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-int TexProjectClass::Get_Texture_Size(void)
-{
-	return (Flags & SIZE_MASK) >> SIZE_SHIFT;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Flag -- Turn specified flag on or off                                  *
- *                                                                                             *
- *    See the TexProjectClass header file for valid flags                                      *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Flag(uint32 flag,bool onoff)	
-{ 
-	if (onoff) { 
-		Flags |= flag; 
-	} else { 
-		Flags &= ~flag; 
-	} 
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Get_Flag -- Get the current state of specified flag                        *
- *                                                                                             *
- *    See the TexProjectClass header file for valid flags                                      *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Get_Flag(uint32 flag) const
-{ 
-	return (Flags & flag) == flag; 
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Intensity -- Set the intensity of this projector                       *
- *                                                                                             *
- *    The "intensity" is a value between 0 and 1.  At 0, the projector will have no effect     *
- *    At 1, the projector will be at its highest strength.  The intensity will automatically   *
- *    smoothly interpolate towards the value specified unless you use the immediate option.    *
- *                                                                                             *
- * INPUT:                                                                                      *
- * intensity - desired intensity, 0 <= intensity <= 1                                          *
- * immediate - should the intensity be immediately set to the desired value? (default = false) *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Intensity(float intensity,bool immediate)
-{
-	WWASSERT(intensity <= 1.0f);
-	WWASSERT(intensity >= 0.0f);
-	
-	DesiredIntensity = intensity;
-	if (immediate) {
-		Intensity = DesiredIntensity;
-	}
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Get_Intensity -- returns the current "desired" intensity                   *
- *                                                                                             *
- *    This will return the last value that was sent into this object through Set_Intensity.    *
- *    Note however that the actual intensity used in rendering may not have arrived at         *
- *    that value yet.                                                                          *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-float TexProjectClass::Get_Intensity(void)
-{
-	return DesiredIntensity;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Is_Intensity_Zero -- check if we can eliminate this projector              *
- *                                                                                             *
- *    Only returns true if the current intensity is zero AND the target intensity is zero      *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Is_Intensity_Zero(void)
-{
-	return ((Intensity == 0.0f) && (DesiredIntensity == 0.0f));
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Attenuation -- Set the attenuation factor                              *
- *                                                                                             *
- *    Attenuation scales the intensity.  I use attenuation to make shadows fade away as they   *
- *    get farther away from the light source or from the viewer.                               *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Attenuation(float attenuation)
-{
-	WWASSERT(attenuation >= 0.0f);
-	WWASSERT(attenuation <= 1.0f);
-	Attenuation = attenuation;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Get_Attenuation -- Returns the attenuation value                           *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-float TexProjectClass::Get_Attenuation(void)
-{
-	return Attenuation;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Enable_Attenuation -- Set the state of the ATTENUATE flag                  *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Enable_Attenuation(bool onoff)
-{
-	Set_Flag(ATTENUATE,onoff);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Is_Attenuation_Enabled -- Get the state of the ATTENUATE flag              *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Is_Attenuation_Enabled(void)
-{
-	return Get_Flag(ATTENUATE);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Enable_Depth_Gradient -- enable/disable depth gradient                     *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/25/2000  gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Enable_Depth_Gradient(bool onoff)
-{
-	Set_Flag(USE_DEPTH_GRADIENT,onoff);
-
-	// re-setup the shader settings
-	if (Get_Flag(ADDITIVE)) {
-		Init_Additive();
-	} else {
-		Init_Multiplicative();
-	}
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Is_Depth_Gradient_Enabled -- returns whether the depth gradient is enabled *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   2/25/2000  gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Is_Depth_Gradient_Enabled(bool onoff)
-{
-	return Get_Flag(USE_DEPTH_GRADIENT);
-}
-
-/***********************************************************************************************
- * TexProjectClass::Init_Multiplicative -- Initialize this to be a multiplicative texture proj *
- *                                                                                             *
- *    Set up the internal materials so that the texture is multiplied with whatever it is      *
- *    projected onto.                                                                          *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/4/00     gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Init_Multiplicative(void)
-{	
-	Set_Flag(ADDITIVE,false);
-
-	/*
-	** Set up the shader
-	*/
-	static ShaderClass mult_shader(		SHADE_CNST(	ShaderClass::PASS_LEQUAL,						//depth_compare, 
-																	ShaderClass::DEPTH_WRITE_DISABLE,			//depth_mask, 
-																	ShaderClass::COLOR_WRITE_ENABLE,				//color_mask, 
-																	ShaderClass::SRCBLEND_ZERO,					//src_blend,
-																	ShaderClass::DSTBLEND_SRC_COLOR,				//dst_blend, 
-																	ShaderClass::FOG_DISABLE,						//fog, 
-																	ShaderClass::GRADIENT_ADD,						//pri_grad, 
-																	ShaderClass::SECONDARY_GRADIENT_DISABLE,	//sec_grad, 
-																	ShaderClass::TEXTURING_ENABLE,				//texture, 
-
-																	ShaderClass::ALPHATEST_DISABLE,				//alpha_test, 
-																	ShaderClass::CULL_MODE_ENABLE,				//cull mode
-																	0,														//post_det_color, 
-																	0) );													//post_det_alpha		
-
-	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) {
-		mult_shader.Enable_Fog ("TexProjectClass");
-	}
-
-	if (Get_Flag(USE_DEPTH_GRADIENT)) {
-		
-		/*
-		** enable multi-texturing
-		*/
-		mult_shader.Set_Post_Detail_Color_Func(ShaderClass::DETAILCOLOR_ADD);
-		
-		/*
-		** plug the gradient texture into the second stage
-		*/
-		TextureClass * grad_tex = WW3DAssetManager::Get_Instance()->Get_Texture("MultProjectorGradient.tga");
-		if (grad_tex) {
-			grad_tex->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-			grad_tex->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-			MaterialPass->Set_Texture(grad_tex,1);
-			grad_tex->Release_Ref();
-		} else {
-			WWDEBUG_SAY(("Could not find texture: MultProjectorGradient.tga!\n"));
-		}
-
-	} else {
-		
-		/*
-		** disable multi-texturing
-		*/
-		mult_shader.Set_Post_Detail_Color_Func(ShaderClass::DETAILCOLOR_DISABLE);
-
-		/*
-		** remove the texture from the second stage
-		*/
-		MaterialPass->Set_Texture(NULL,1);
-	}
-
-#if (DEBUG_SHADOW_RENDERING)
-	// invert the shader so we can see what polygons it is hitting
-	mult_shader.Set_Dst_Blend_Func(ShaderClass::DSTBLEND_ONE);
-	mult_shader.Set_Src_Blend_Func(ShaderClass::SRCBLEND_ONE);
-#endif
-
-	MaterialPass->Set_Shader(mult_shader);
-
-	/*
-	** Set up the Vertex Material parameters
-	*/
-	VertexMaterialClass * vmtl = MaterialPass->Peek_Material();
-	vmtl->Set_Ambient(0,0,0);
-	vmtl->Set_Diffuse(0,0,0);
-	vmtl->Set_Specular(0,0,0);
-	vmtl->Set_Emissive(0.0f,0.0f,0.0f);
-	vmtl->Set_Opacity(1.0f);
-	vmtl->Set_Lighting(true); // I need the emissive value to scale the intensity of the shadow
-
-	/*
-	** Set up some mapper settings related to depth gradient
-	*/
-	if (Get_Flag(USE_DEPTH_GRADIENT)) {
-		if (Mapper1 == NULL) {
-			Mapper1 = NEW_REF(MatrixMapperClass,(1));
-		}
-		Mapper1->Set_Type(MatrixMapperClass::DEPTH_GRADIENT);
-		vmtl->Set_Mapper(Mapper1,1);
-	} else {
-		vmtl->Set_Mapper(NULL,1);
-	}
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Init_Additive -- Set up the projector to be additive                       *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Init_Additive(void)
-{
-	Set_Flag(ADDITIVE,true);
-
-	/*
-	** Set up the shader
-	*/
-	static ShaderClass add_shader(		SHADE_CNST(	ShaderClass::PASS_LEQUAL,						//depth_compare, 
-																	ShaderClass::DEPTH_WRITE_DISABLE,			//depth_mask, 
-																	ShaderClass::COLOR_WRITE_ENABLE,				//color_mask, 
-																	ShaderClass::SRCBLEND_ONE,						//src_blend,
-																	ShaderClass::DSTBLEND_ONE,						//dst_blend, 
-																	ShaderClass::FOG_DISABLE,						//fog,
-																	ShaderClass::GRADIENT_MODULATE,				//pri_grad, 
-																	ShaderClass::SECONDARY_GRADIENT_DISABLE,	//sec_grad, 
-																	ShaderClass::TEXTURING_ENABLE,				//texture, 
-																	ShaderClass::ALPHATEST_DISABLE,				//alpha_test, 
-																	ShaderClass::CULL_MODE_ENABLE,				//cullmode, 
-																	ShaderClass::DETAILCOLOR_DISABLE,			//post_det_color, 
-																	ShaderClass::DETAILALPHA_DISABLE) );		//post_det_alpha		
-
-	if (WW3DAssetManager::Get_Instance()->Get_Activate_Fog_On_Load()) {
-		add_shader.Enable_Fog ("TexProjectClass");
-	}
-
-	/*
-	** Additive projectors always use the normal gradient so they need multi-texturing
-	*/
-	add_shader.Set_Post_Detail_Color_Func(ShaderClass::DETAILCOLOR_SCALE);
-
-	/*
-	** plug in the gradient texture
-	*/
-	TextureClass * grad_tex = WW3DAssetManager::Get_Instance()->Get_Texture("AddProjectorGradient.tga");
-	if (grad_tex) {
-		grad_tex->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-		grad_tex->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-		MaterialPass->Set_Texture(grad_tex,1);
-		grad_tex->Release_Ref();
-	} else {
-		WWDEBUG_SAY(("Could not find texture: AddProjectorGradient.tga!\n"));
-	}
-
-#if (DEBUG_SHADOW_RENDERING)
-	// invert the shader so we can see what polygons it is hitting
-	add_shader.Set_Dst_Blend_Func(ShaderClass::DSTBLEND_SRC_COLOR);
-	add_shader.Set_Src_Blend_Func(ShaderClass::SRCBLEND_ZERO);
-#endif
-	
-	MaterialPass->Set_Shader(add_shader);
-
-	/*
-	** Set up the Vertex Material parameters
-	*/
-	VertexMaterialClass * vmtl = MaterialPass->Peek_Material();
-	vmtl->Set_Ambient(0,0,0);
-	vmtl->Set_Diffuse(0,0,0);
-	vmtl->Set_Specular(0,0,0);
-	vmtl->Set_Emissive(1,1,1);
-	vmtl->Set_Opacity(1.0f);
-	vmtl->Set_Lighting(true); //need emissive to scale the intensity of the projector
-
-	/*
-	** Set up some mapper settings related to depth gradient
-	** Additive texture projections always use the normal gradient
-	*/
-	if (Mapper1 == NULL) {
-		Mapper1 = NEW_REF(MatrixMapperClass,(1));
-	}
-	Mapper1->Set_Type(MatrixMapperClass::NORMAL_GRADIENT);
-	vmtl->Set_Mapper(Mapper1,1);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Texture -- Set the texture to be projected                             *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Texture(TextureClass * texture)
-{
-	if (texture != NULL) 
-	{
-		texture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
-		texture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);	
-		MaterialPass->Set_Texture(texture);
-	}
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Get_Texture -- Returns the texture being projected                         *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- * the pointer is ref-counted!  make sure to keep track of your references                     *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-TextureClass * TexProjectClass::Get_Texture(void) const
-{
-	return MaterialPass->Get_Texture();
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Peek_Texture -- Returns the texture being projected                        *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-TextureClass * TexProjectClass::Peek_Texture(void) const
-{
-	return MaterialPass->Peek_Texture();
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Peek_Material_Pass -- Returns the material pass object                     *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-MaterialPassClass * TexProjectClass::Peek_Material_Pass(void) 
-{
-	return MaterialPass;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Perspective_Projection -- set up a perspective projection              *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/27/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Perspective_Projection(float hfov,float vfov,float znear,float zfar)
-{
-	HFov = hfov;
-	VFov = vfov;
-	ZNear = znear;
-	ZFar = zfar;
-
-	ProjectorClass::Set_Perspective_Projection(hfov,vfov,znear,zfar);
-	Set_Flag(PERSPECTIVE,true);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Ortho_Projection -- set up an orthographic projection                  *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/27/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Ortho_Projection(float xmin,float xmax,float ymin,float ymax,float znear,float zfar)
-{
-	XMin = xmin;
-	XMax = xmax;
-	YMin = ymin;
-	YMax = ymax;
-	ZNear = znear;
-	ZFar = zfar;
-
-	ProjectorClass::Set_Ortho_Projection(xmin,xmax,ymin,ymax,znear,zfar);
-	Set_Flag(PERSPECTIVE,false);
-}
-
-/***********************************************************************************************
- * TexProjectClass::Compute_Perspective_Projection -- Set up a perspective projection of an ob *
- *                                                                                             *
- * This function automates the process of generating the perspective parameters needed to      *
- * tightly bound the projection of an object.                                                  *
- *                                                                                             *
- * INPUT:                                                                                      *
- * model - object which we are created a projection of                                         *
- * lightpos - positional light source                                                          *
- * znear - distance to near clipping plane for the projection (if -1.0, will be generated)     *
- * zfar - distance to far clipping plane for the projection (if -1.0, will be generated)       *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Compute_Perspective_Projection
-(
-	RenderObjClass *	model,
-	const Vector3 &	lightpos,
-	float					znear,
-	float					zfar
-)
-{
-	if (model == NULL) {
-		WWDEBUG_SAY(("Attempting to generate projection for a NULL model\r\n"));
-		return false;
-	}
-
-	AABoxClass box;
-	model->Get_Obj_Space_Bounding_Box(box);
-	const Matrix3D & tm = model->Get_Transform();
-	
-	return Compute_Perspective_Projection(box,tm,lightpos,znear,zfar);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Compute_Perspective_Projection -- Set up a perspective projection of an ob *
- *                                                                                             *
- * This function automates the process of generating the perspective parameters needed to      *
- * tightly bound the projection of an object.                                                  *
- *                                                                                             *
- * INPUT:                                                                                      *
- * obj_box - object space bounding box of the object we are projecting                         *
- * tm - transform of the object we are projecting                                              *
- * lightpos - positional light source                                                          *
- * user_znear - distance to near clipping plane for the projection (if -1.0, will be generated)*
- * user_zfar - distance to far clipping plane for the projection (if -1.0, will be generated)  *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Compute_Perspective_Projection
-(
-	const AABoxClass & obj_box,
-	const Matrix3D & tm,
-	const Vector3 & lightpos,
-	float user_znear,
-	float user_zfar
-)
-{
-	/*
-	** Compute the center of the box in world-space
-	*/
-	Vector3 wrld_center;
-	Matrix3D::Transform_Vector(tm,obj_box.Center,&wrld_center);
-
-	/*
-	** Create a camera transform looking at the object.
-	** Set this as our transform later in this routine.
-	*/
-	Matrix3D texture_tm,texture_tm_inv;
-	texture_tm.Look_At(lightpos,wrld_center,0.0f);
-	texture_tm.Get_Orthogonal_Inverse(texture_tm_inv);
-
-	/*
-	** Calculate the axis-aligned bounding box of the model in the camera's coordinate system.
-	*/
-	AABoxClass box = obj_box;
-	Matrix3D obj_to_world = tm;
-	Matrix3D obj_to_texture;
-	Matrix3D::Multiply(texture_tm_inv,obj_to_world,&obj_to_texture);
-	box.Transform(obj_to_texture);
-
-	/*
-	** If the box is behind the viewpoint or the viewpoint is inside the box
-	** our FOV will be > 180 degrees. Have to give up
-	*/
-	if ((box.Center.Z > 0.0f) || (box.Extent.Z > WWMath::Fabs(box.Center.Z))) {
-		return false;
-	}
-	
-	/*
-	** Compute the frustum parameters. Remember that our z coordinates are negative but the
-	** projection code needs positive z distances.
-	*/
-	float znear = -box.Center.Z; //-(box.Center.Z + obj_box.Extent.Quick_Length());
-	float zfar = -(box.Center.Z - obj_box.Extent.Quick_Length()) * 2.0f;
-
-	if (user_znear != -1.0f) {
-		znear = box.Center.Z + user_znear;
-	}
-	if (user_zfar != -1.0f) {
-		zfar = box.Center.Z + user_zfar;
-	}
-
-	float tan_hfov2 = WWMath::Fabs(box.Extent.X / (box.Center.Z + box.Extent.Z));
-	float tan_vfov2 = WWMath::Fabs(box.Extent.Y / (box.Center.Z + box.Extent.Z));
-	float hfov = 2.0f * WWMath::Atan(tan_hfov2);
-	float vfov = 2.0f * WWMath::Atan(tan_vfov2);
-
-	/*
-	** Plug in the results.  
-	*/
-	Set_Perspective_Projection(hfov,vfov,znear,zfar);
-	Set_Transform(texture_tm);
-	return true;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Compute_Ortho_Projection -- Automatic Orthographic projection              *
- *                                                                                             *
- * Generates the orthographic projection parameters to tightly bound an object                 *
- *                                                                                             *
- * INPUT:                                                                                      *
- * model - object which we are created a projection of                                         *
- * lightdir - directional light source                                                         *
- * znear - distance to near clipping plane for the projection (if -1.0, will be generated)     *
- * zfar - distance to far clipping plane for the projection (if -1.0, will be generated)       *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Compute_Ortho_Projection
-(
-	RenderObjClass *	model,
-	const Vector3 &	lightdir,
-	float					znear,
-	float					zfar
-)
-{
-	if (model == NULL) {
-		WWDEBUG_SAY(("Attempting to generate projection for a NULL model\r\n"));
-		return false;
-	}
-
-	AABoxClass box;
-	model->Get_Obj_Space_Bounding_Box(box);
-	const Matrix3D & tm = model->Get_Transform();
-
-	return Compute_Ortho_Projection(box,tm,lightdir,znear,zfar);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Compute_Ortho_Projection -- Automatic Orthographic projection              *
- *                                                                                             *
- * Generates the orthographic projection parameters to tightly bound an object                 *
- *                                                                                             *
- * INPUT:                                                                                      *
- * obj_box - object space bounding box of the object we are projecting                         *
- * tm - transform of the object we are projecting                                              *
- * lightdir - directional light                                                                *
- * user_znear - distance to near clipping plane for the projection (if -1.0, will be generated)*
- * user_zfar - distance to far clipping plane for the projection (if -1.0, will be generated)  *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Compute_Ortho_Projection
-(
-	const AABoxClass & obj_box,
-	const Matrix3D & tm,
-	const Vector3 & lightdir,
-	float user_znear,
-	float user_zfar
-)
-{
-	/*
-	** Compute the center of the box in world-space
-	*/
-	AABoxClass wrldbox = obj_box;
-	wrldbox.Transform(tm);
-
-	/*
-	** Create a camera transform looking at the object.
-	** Set this as our transform later in this routine.
-	*/
-	Vector3 camera_target = wrldbox.Center;
-	Vector3 camera_position = camera_target - 2.0f * wrldbox.Extent.Length() * lightdir;
-
-	Matrix3D texture_tm,texture_tm_inv;
-	texture_tm.Look_At(camera_position,camera_target,0.0f);
-	texture_tm.Get_Orthogonal_Inverse(texture_tm_inv);
-
-	/*
-	** Calculate the axis-aligned bounding box of the model in the camera's coordinate system.
-	*/
-	AABoxClass box = obj_box;
-	Matrix3D obj_to_world = tm;
-	Matrix3D obj_to_texture;
-	Matrix3D::Multiply(texture_tm_inv,obj_to_world,&obj_to_texture);
-	box.Transform(obj_to_texture);
-
-	/*
-	** Expand the box to help with bounding box errors
-	*/
-	box.Extent *= 1.0f;
-
-	/*
-	** Compute the frustum parameters.  Note that znear and zfar are supposed to
-	** be positive distances for the projection code.
-	*/
-	float znear = -box.Center.Z; //-(box.Center.Z + obj_box.Extent.Quick_Length());
-	float zfar = -(box.Center.Z - obj_box.Extent.Quick_Length()) * 2.0f;
-
-	if (user_znear != -1.0f) {
-		znear = -box.Center.Z + user_znear;
-	}
-	if (user_zfar != -1.0f) {
-		zfar = -box.Center.Z + user_zfar;
-	}
-
-	/*
-	** All done!
-	*/
-	Set_Ortho_Projection(	box.Center.X - box.Extent.X,
-									box.Center.X + box.Extent.X,
-									box.Center.Y - box.Extent.Y,
-									box.Center.Y + box.Extent.Y,
-									znear,
-									zfar	);
-	Set_Transform(texture_tm);
-	return true;
-}
-
-/***********************************************************************************************
- * TexProjectClass::Compute_Texture -- Generates texture by rendering an object                *
- *                                                                                             *
- * INPUT:                                                                                      *
- * model - pointer to the render object to generate a shadow texture for                       *
- * context - shadow render context which has been initialized to <TextureSize> resolution      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *   5/16/02    kjm : Added optional custom depth/stencil target										  *
- *=============================================================================================*/
-bool TexProjectClass::Compute_Texture
-(
-	RenderObjClass * model,
-	SpecialRenderInfoClass * context
-)
-{
-	if ((model == NULL) || (context == NULL)) 
-	{
-		return false;
-	}
-	/*
-	** Render to texture
-	*/
-	TextureClass * rtarget=NULL;
-	ZTextureClass* ztarget=NULL;
-
-	Peek_Render_Target(&rtarget,&ztarget);
-
-	if (rtarget != NULL) 
-	{
-		// set projector for render context KJM
-		context->Texture_Projector=this;
-
-		/*
-		** Set the render target
-		*/
-		DX8Wrapper::Set_Render_Target_With_Z (rtarget,ztarget);
-
-		/*
-		** Set up the camera
-		*/
-		Configure_Camera(context->Camera);
-		
-		/*
-		** Render the object
-		*/
-		Vector3 color(0.0f,0.0f,0.0f);
-		if (Get_Flag(ADDITIVE) == false) {
-			color.Set(1.0f,1.0f,1.0f);
-		}
-
-		bool zclear=ztarget!=NULL;
-
-		bool snapshot=WW3D::Is_Snapshot_Activated();
-		SNAPSHOT_SAY(("TexProjectCLass::Begin_Render()\n"));
-		WW3D::Begin_Render(true,zclear,color);	// false to zclear as we don't have z-buffer
-		WW3D::Render(*model,*context);
-		SNAPSHOT_SAY(("TexProjectCLass::End_Render()\n"));
-		WW3D::End_Render(false);
-		WW3D::Activate_Snapshot(snapshot);	// End_Render() ends the shapsnot, so restore the state
-
-		DX8Wrapper::Set_Render_Target((IDirect3DSurface8 *)NULL);
-
-	}
-
-#if 0
-
-	/*
-	** Render the object with the BW Renderer into our color surface
-	*/
-	BWRenderClass bwr((unsigned char*)shadow_surface->getDataPtr(),tex_size);
-	bwr.Fill(0xff);
-	context->BWRenderer = &bwr;
-	model->Special_Render(*context);
-	context->BWRenderer = NULL;
-#endif
-	return true;
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Needs_Render_Target -- returns wheter this projector needs a render target *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/17/2001  gth : Created.                                                                 *
- *=============================================================================================*/
-bool TexProjectClass::Needs_Render_Target(void)
-{
-	return Get_Flag(TEXTURE_DIRTY);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Set_Render_Target -- Install a render target for this projector to use     *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/16/2001  gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Set_Render_Target
-(
-	TextureClass* render_target,
-	ZTextureClass* zbuffer
-)
-{
-	REF_PTR_SET(RenderTarget,render_target);
-	Set_Texture(RenderTarget);
-	REF_PTR_SET(DepthStencilTarget,zbuffer);
-}
-
-/***********************************************************************************************
- * TexProjectClass::Peek_Render_Target -- Returns pointer to the render target if we have one  *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   4/5/2001   gth : Created.                                                                 *
- *   5/16/2002  kjm : Added optional custom zbuffer                                            *
- *=============================================================================================*/
-TextureClass* TexProjectClass::Peek_Render_Target
-(
-	TextureClass** rtarget, 
-	ZTextureClass** ztarget
-)
-{
-	// some uses of this function just want to know if a render target exists
-	if (rtarget==NULL) return RenderTarget;
-	
-	*rtarget=RenderTarget;
-
-	// don't set if pointer isn't supplied
-	if (ztarget!=NULL)
-		*ztarget=DepthStencilTarget;
-
-	return RenderTarget;
-}
-
-/***********************************************************************************************
- * TexProjectClass::Configure_Camera -- set up a camera to match this projector                *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Configure_Camera(CameraClass & camera)
-{
-	camera.Set_Transform(Transform);
-	camera.Set_Clip_Planes(0.01f,ZFar);
-
-	if (Get_Flag(PERSPECTIVE)) {
-		camera.Set_Projection_Type(CameraClass::PERSPECTIVE);
-		camera.Set_View_Plane(HFov,VFov);
-
-	} else {
-		camera.Set_Projection_Type(CameraClass::ORTHO);
-		camera.Set_View_Plane(Vector2(XMin,YMin),Vector2(XMax,YMax));
-	}
-
-	// Set one-pixel borders to the texture to avoid "flooding" shadows...
-	float size=Get_Texture_Size();
-	float inv_size=1.0f/size;
-	Vector2 vmin(1.0f*inv_size,1.0f*inv_size);
-	Vector2 vmax((size-1.0f)*inv_size,(size-1.0f)*inv_size);
-	camera.Set_Viewport(vmin,vmax);
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Pre_Render_Update -- Prepare the projector for rendering                   *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Pre_Render_Update(const Matrix3D & camera)
-{
-	/*
-	** Mview-texture = PShadow * Mwrld-texture * Mcamera-vrld	
-	*/
-	Matrix3D		world_to_texture;
-	Matrix3D		tmp;
-	Matrix4x4	view_to_texture;
-
-	Transform.Get_Orthogonal_Inverse(world_to_texture);
-	Matrix3D::Multiply(world_to_texture,camera,&tmp);
-	Matrix4x4::Multiply(Projection,tmp,&view_to_texture);
-
-	/*
-	** update the current intensity by iterating it towards the desired intensity
-	*/
-	float frame_time = (float)WW3D::Get_Frame_Time() / 1000.0f;
-	float intensity_delta = DesiredIntensity - Intensity;
-	float max_intensity_delta = INTENSITY_RATE_OF_CHANGE * frame_time;
-	
-	if (intensity_delta > max_intensity_delta) {
-		Intensity += max_intensity_delta;
-	} else if (intensity_delta < -max_intensity_delta) {
-		Intensity -= max_intensity_delta;
-	} else {
-		Intensity = DesiredIntensity;
-	}
-
-	float actual_intensity = Intensity * Attenuation;
-
-	/*
-	** install the current intensity
-	*/
-	VertexMaterialClass * vmat = MaterialPass->Peek_Material();
-	if (Get_Flag(ADDITIVE)) {
-		vmat->Set_Emissive(actual_intensity,actual_intensity,actual_intensity);
-	} else {
-		vmat->Set_Emissive(1.0f - actual_intensity,1.0f - actual_intensity,1.0f - actual_intensity);
-	}
-
-	/*
-	** update the mappers
-	*/
-	if (Get_Flag(PERSPECTIVE)) {
-		Mapper->Set_Type(MatrixMapperClass::PERSPECTIVE_PROJECTION);
-	} else {
-		Mapper->Set_Type(MatrixMapperClass::ORTHO_PROJECTION);
-	}
-
-	if (Get_Texture_Size() == 0) {
-//		SurfaceClass::SurfaceDescription surface_desc;
-//		MaterialPass->Peek_Texture()->Get_Level_Description(surface_desc);
-		Set_Texture_Size(MaterialPass->Peek_Texture()->Get_Width());
-		WWASSERT(Get_Texture_Size() != 0);
-	}
-	
-	Mapper->Set_Texture_Transform(view_to_texture,Get_Texture_Size());
-	if (Mapper1) {
-		Mapper1->Set_Texture_Transform(view_to_texture,Get_Texture_Size());
-	}
-}
-
-
-/***********************************************************************************************
- * TexProjectClass::Update_WS_Bounding_Volume -- Recalculate the world-space bounding box      *
- *                                                                                             *
- * INPUT:                                                                                      *
- *                                                                                             *
- * OUTPUT:                                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- *                                                                                             *
- * HISTORY:                                                                                    *
- *   1/11/00    gth : Created.                                                                 *
- *=============================================================================================*/
-void TexProjectClass::Update_WS_Bounding_Volume(void)
-{
-	ProjectorClass::Update_WS_Bounding_Volume();
-
-	/*
-	** Tell our culling system that we've changed
-	*/
-	Vector3 extent;
-	WorldBoundingVolume.Compute_Axis_Aligned_Extent(&extent);
-	Set_Cull_Box(AABoxClass(WorldBoundingVolume.Center,extent));
-}
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h
deleted file mode 100644
index d053cc9553e..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/texproject.h                           $*
- *                                                                                             *
- *              Original Author:: Greg Hjelstrom                                               *
- *                                                                                             *
- *                      $Author:: Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 06/26/02 4:04p                                             $*
- *                                                                                             *
- *                    $Revision:: 8                                                           $*
- *                                                                                             *
- * 06/27/02 KM Render to shadow buffer texture support														*
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef TEXPROJECT_H
-#define TEXPROJECT_H
-
-#include "always.h"
-#include "matrix3d.h"
-#include "matrix4.h"
-#include "obbox.h"
-#include "matpass.h"
-#include "matrixmapper.h"
-#include "cullsys.h"
-#include "multilist.h"
-#include "projector.h"
-
-
-class SpecialRenderInfoClass;
-class RenderObjClass;
-class MaterialPassClass;
-class SurfaceClass;
-
-class TextureClass;
-class ZTextureClass;
-
-
-/**
-** TexProjectClass
-** This class is used to project textures onto object in the world.  It contains
-** a pointer to the texture to be projected, a bounding volume for the projection,
-** and a material pass which can perform the projection.
-**
-** Design Goals:
-** - Texture Projectors should be easy to place in the world and move around.
-**   solution: Store the bounding volume and any other parameters in a coordinate
-**   system local to the projector.  Update the world-space cache whenever needed.
-**   The automatically generated shadow texture projectors are a special case subset 
-**   of the general texture projection code.  For this reason, a local bounding 
-**   volume will be stored and its world-space equivalent will be updated whenever 
-**   needed.  
-**
-** - Texture projectors need to be compatible with the culling systems.
-**   solution: inherit the Cullable interface.
-**
-** - Texture projectors need to be quickly pulled in and out of many lists during
-**   the rendering process.
-**   solution: list system similar to PhysListClass?  I really need to templatize this. 
-**   - done:  MultiListClass!
-**  
-** - Dynamic Texture projectors need to be updated in stages.  Update/recompute only the 
-**   bounding volume first, then defer computing the actual texture until it is
-**   determined that the volume falls into the frustum and is applied to at least one 
-**   object.
-**   solution: Code the bounding volume/projection paramter generation separate from
-**   the texture generation code.  A derived texture projection object. Let texture 
-**   projectors know about the object they are projecting so that they can have that 
-**   object rendered from the desired viewpoint.  Need a 'Dirty' flag and a pointer to 
-**   a 'parent' object.  Perhaps separate this code into a ShadowProjectClass since shadows 
-**   are the only case I can think of that need the ability to re-render their 'parent' 
-**   object.  Everything else should be a static texture-map either generated 'artistically' 
-**   or generated off-line.
-**
-*/
-class TexProjectClass : public ProjectorClass, public CullableClass, public MultiListObjectClass
-{
-public:
-
-	TexProjectClass(void);
-	virtual ~TexProjectClass(void);
-	
-	/*
-	** Material settings
-	*/
-	void						Set_Texture_Size(int size);
-	int						Get_Texture_Size(void);
-	void						Init_Multiplicative(void);
-	void						Init_Additive(void);
-	void						Set_Intensity(float intensity,bool immediate = false);	// 1.0 = on 100%, 0.0 = 'off'
-	float						Get_Intensity(void);
-	bool						Is_Intensity_Zero(void);
-	void						Set_Attenuation(float attenuation);								// 1.0 = on, 0.0 = off
-	float						Get_Attenuation(void);
-	void						Enable_Attenuation(bool onoff);
-	bool						Is_Attenuation_Enabled(void);
-	MaterialPassClass *	Peek_Material_Pass(void);
-
-	/*
-	** Options
-	*/
-	void						Enable_Affect_Dynamic_Objects(bool onoff)				{ Set_Flag(AFFECT_DYNAMIC_OBJS,onoff); }
-	bool						Is_Affect_Dynamic_Objects_Enabled(void)				{ return Get_Flag(AFFECT_DYNAMIC_OBJS); }
-	void						Enable_Affect_Static_Objects(bool onoff)				{ Set_Flag(AFFECT_STATIC_OBJS,onoff); } 
-	bool						Is_Affect_Static_Objects_Enabled(void)					{ return Get_Flag(AFFECT_STATIC_OBJS); }
-	void						Enable_Depth_Gradient(bool onoff);
-	bool						Is_Depth_Gradient_Enabled(bool onoff);
-
-	/*
-	** Manual initialization of a TexProjectClass
-	** 1 - call ProjectorClass::Set_Transform
-	** 2 - call Set_Projection_Perspective -or- Set_Projection_Ortho
-	** 3 - call Set_Texture.
-	*/
-	virtual void			Set_Perspective_Projection(float hfov,float vfov,float znear,float zfar);
-	virtual void			Set_Ortho_Projection(float xmin,float xmax,float ymin,float ymax,float znear,float zfar);
-
-	void						Set_Texture(TextureClass * texture);
-	TextureClass *			Get_Texture(void) const;
-	TextureClass *			Peek_Texture(void) const;
-	
-
-	void						Set_DepthStencilBuffer(ZTextureClass* ztex);
-	ZTextureClass*			Get_DepthStencilBuffer() const;
-	ZTextureClass*			Peek_DepthStencilBuffer() const;
-
-	/*
-	** Automatic initialization of a TexProjectClass.
-	** First set up your projection parameters, give the projector a render target, then call Compute_Texture
-	*/
-	bool						Compute_Perspective_Projection(RenderObjClass * obj,const Vector3 & lightpos,float znear=-1.0f,float zfar=-1.0f);
-	bool						Compute_Perspective_Projection(const AABoxClass & obj_box,const Matrix3D & tm,const Vector3 & lightpos,float znear=-1.0f,float zfar=-1.0f);
-	
-	bool						Compute_Ortho_Projection(RenderObjClass * obj,const Vector3 & lightdir,float znear=-1.0f,float zfar=-1.0f);
-	bool						Compute_Ortho_Projection(const AABoxClass & obj_box,const Matrix3D & tm,const Vector3 & lightdir,float znear=-1.0f,float zfar=-1.0f);
-
-	bool						Needs_Render_Target(void);
-	void						Set_Render_Target(TextureClass* render_target, ZTextureClass* ztarget=NULL);
-	TextureClass*			Peek_Render_Target(TextureClass** rtarget=NULL, ZTextureClass** ztarget=NULL);
-
-	bool						Compute_Texture(RenderObjClass * model,SpecialRenderInfoClass * context);
-
-	/*
-	** Prep for rendering, called by the scene prior to usage.
-	*/
-	virtual void			Pre_Render_Update(const Matrix3D & camera);
-
-	/*
-	** virtual interface for getting the pointer of the object that generated this shadow.  
-	** defaults to returning NULL.  This is implemented by some derived classes and used by
-	** the system to prevent a projection from being applied to the object that generated
-	** the projection...  
-	** (gth) feels kludgy, this got a little messy when I moved this code into WW3D from WWPhys
-	*/
-	virtual void *			Get_Projection_Object_ID(void) const { return NULL; }
-
-protected:
-
-	void						Set_Flag(uint32 flag,bool onoff);
-	bool						Get_Flag(uint32 flag) const;
-	virtual void			Update_WS_Bounding_Volume(void);
-	void						Configure_Camera(CameraClass & camera);
-
-	enum FlagsType
-	{
-		PERSPECTIVE				= 0x00000001,		// PERSPECTIVE or ORTHO
-		ADDITIVE					= 0x00000002,		// ADDITIVE or MULTIPLICATIVE
-		TEXTURE_DIRTY			= 0x00000004,		// used by derived DynTexProjectClass		
-		VOLATILE					= 0x00000008,		// this is a volatile texture.
-		ATTENUATE				= 0x00000010,		// this projector should be attenuated based on distance to viewer
-		AFFECT_DYNAMIC_OBJS	= 0x00000020,		// this projector affects dynamic objects
-		AFFECT_STATIC_OBJS	= 0x00000040,		// this projector affects static objects
-		USE_DEPTH_GRADIENT	= 0x00000080,		// fade the projection as a function of depth
-		HAS_RENDER_TARGET		= 0x00000100,		// the texture we have can be a render target
-		SIZE_MASK				= 0xFFF00000,		// desired texture size stored in upper 3 nibbles
-		SIZE_SHIFT				= 20,
-
-		DEFAULT_FLAGS			= ATTENUATE | AFFECT_DYNAMIC_OBJS | AFFECT_STATIC_OBJS
-	};
-	
-	uint32						Flags;
-
-	/*
-	** Intensity Controls
-	*/
-	float							DesiredIntensity;					// last input desired intensity.
-	float							Intensity;							// basic shadow intensity.  value between 0 and 1
-	float							Attenuation;						// attenuation factor based on distance from camera.  value between 0 and 1
-
-	/*
-	** Material pass to be added to any object that intersects the volume
-	*/
-	MaterialPassClass *		MaterialPass;
-	MatrixMapperClass *		Mapper1;
-	TextureClass *				RenderTarget;
-	ZTextureClass*				DepthStencilTarget;
-	
-	/*
-	** I have to remember all of these values so that I can properly initialize a CameraClass
-	** when we do render-to-texture.  Some day we will merge CameraClass and ProjectorClass.
-	*/
-	float							HFov;				// horizontal fov (for perspective mode)
-	float							VFov;				// vertical fov (for perspective mode)
-	float							XMin;				// left x clip plane (for ortho)
-	float							XMax;				// right x clip plane (for ortho)
-	float							YMin;				// bottom y clip plane (for ortho)
-	float							YMax;				// top y clip plane (for ortho)
-	float							ZNear,ZFar;		// z clip planes (for both modes)
-};
-
-
-/*
-** Texture Projector Lists
-*/
-typedef RefMultiListClass<TexProjectClass>		TexProjListClass;
-typedef RefMultiListIterator<TexProjectClass>	TexProjListIterator;
-
-
-#endif
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp
deleted file mode 100644
index cd3598ecf09..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp
+++ /dev/null
@@ -1,1912 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/texture.cpp                            $*
- *                                                                                             *
- *                  $Org Author:: Steve_t                                                     $*
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 08/05/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 85                                                          $*
- *                                                                                             *
- * 06/27/02 KM Texture class abstraction																			*
- * 08/05/02 KM Texture class redesign (revisited)
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- *   FileListTextureClass::Load_Frame_Surface -- Load source texture                           *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include "texture.h"
-
-#include <d3d8.h>
-#include <stdio.h>
-#include <d3dx8core.h>
-#include "dx8wrapper.h"
-#include "TARGA.H"
-#include <nstrdup.h>
-#include "w3d_file.h"
-#include "assetmgr.h"
-#include "formconv.h"
-#include "textureloader.h"
-#include "missingtexture.h"
-#include "ffactory.h"
-#include "dx8caps.h"
-#include "dx8texman.h"
-#include "meshmatdesc.h"
-#include "texturethumbnail.h"
-#include "wwprofile.h"
-
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-
-const unsigned DEFAULT_INACTIVATION_TIME=20000;
-
-/*
-** Definitions of static members:
-*/
-
-static unsigned unused_texture_id;
-
-// This throttles submissions to the background texture loading queue.
-static unsigned TexturesAppliedPerFrame;
-const unsigned MAX_TEXTURES_APPLIED_PER_FRAME=2;
-
-
-/*!
- * KM General base constructor for texture classes
- */
-TextureBaseClass::TextureBaseClass
-(
-	unsigned int width,
-	unsigned int height,
-	enum MipCountType mip_level_count,
-	enum PoolType pool,
-	bool rendertarget,
-	bool reducible
-)
-:	MipLevelCount(mip_level_count),
-	D3DTexture(NULL),
-	Initialized(false),
-   Name(""),
-	FullPath(""),
-	texture_id(unused_texture_id++),
-	IsLightmap(false),
-	IsProcedural(false),
-	IsReducible(reducible),
-	IsCompressionAllowed(false),
-	InactivationTime(0),
-	ExtendedInactivationTime(0),
-	LastInactivationSyncTime(0),
-	LastAccessed(0),
-	Width(width),
-	Height(height),
-	Pool(pool),
-	Dirty(false),
-	TextureLoadTask(NULL),
-	ThumbnailLoadTask(NULL),
-	HSVShift(0.0f,0.0f,0.0f)
-{
-}
-
-
-//**********************************************************************************************
-//! Base texture class destructor
-/*! KJM
-*/
-TextureBaseClass::~TextureBaseClass(void)
-{
-	delete TextureLoadTask;
-	TextureLoadTask=NULL;
-	delete ThumbnailLoadTask;
-	ThumbnailLoadTask=NULL;
-
-	if (D3DTexture) 
-	{
-		D3DTexture->Release();
-		D3DTexture = NULL;
-	}
-
-	DX8TextureManagerClass::Remove(this);
-}
-
-
-
-
-//**********************************************************************************************
-//! Invalidate old unused textures
-/*! 
-*/
-void TextureBaseClass::Invalidate_Old_Unused_Textures(unsigned invalidation_time_override)
-{
-	// (gth) If thumbnails are not enabled, then we don't run this code.
-	if (WW3D::Get_Thumbnail_Enabled() == false) {
-		return;
-	}
-
-	// Zero the texture apply count in this function because this is called every frame...(this wasn't in E&B main branch KJM)
-	TexturesAppliedPerFrame=0;
-
-	unsigned synctime=WW3D::Get_Sync_Time();
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-
-	for (ite.First ();!ite.Is_Done();ite.Next ()) 
-	{
-		TextureClass* tex=ite.Peek_Value();
-
-		// Consider invalidating if texture has been initialized and defines inactivation time
-		if (tex->Initialized && tex->InactivationTime) 
-		{
-			unsigned age=synctime-tex->LastAccessed;
-
-			if (invalidation_time_override) 
-			{
-				if (age>invalidation_time_override) 
-				{
-					tex->Invalidate();
-					tex->LastInactivationSyncTime=synctime;
-				}
-			}
-			else 
-			{
-				// Not used in the last n milliseconds?
-				if (age>(tex->InactivationTime+tex->ExtendedInactivationTime)) 
-				{
-					tex->Invalidate();
-					tex->LastInactivationSyncTime=synctime;
-				}
-			}
-		}
-	}
-}
-
-
-
-
-
-//**********************************************************************************************
-//! Invalidate this texture
-/*! 
-*/
-void TextureBaseClass::Invalidate()
-{
-	if (TextureLoadTask) {
-		return;
-	}
-	if (ThumbnailLoadTask) {
-		return;
-	}
-
-	// Don't invalidate procedural textures
-	if (IsProcedural) {
-		return;
-	}
-
-	if (D3DTexture) 
-	{
-		D3DTexture->Release();
-		D3DTexture = NULL;
-	}
-
-	Initialized=false;
-
-	LastAccessed=WW3D::Get_Sync_Time();
-/*	was battlefield version// If the texture has already been initialised we should exit now
-	if (Initialized) return;
-
-	WWPROFILE(("TextureClass::Init()"));
-
-	// If the texture has recently been inactivated, increase the inactivation time (this texture obviously
-	// should not have been inactivated yet).
-
-	if (InactivationTime && LastInactivationSyncTime) {
-		if ((WW3D::Get_Sync_Time()-LastInactivationSyncTime)<InactivationTime) {
-			ExtendedInactivationTime=3*InactivationTime;
-		}
-		LastInactivationSyncTime=0;
-	}
-
-	if (ThumbnailLoadTask) 
-	{
-		return;
-	}
-
-	// Don't invalidate procedural textures
-	if (IsProcedural) 
-	{
-		return;
-	}
-
-	if (D3DTexture) 
-	{
-		D3DTexture->Release();
-		D3DTexture = NULL;
-	}
-
-	Initialized=false;
-
-	LastAccessed=WW3D::Get_Sync_Time();*/
-}
-
-//**********************************************************************************************
-//! Returns a pointer to the d3d texture
-/*! 
-*/
-IDirect3DBaseTexture8 * TextureBaseClass::Peek_D3D_Base_Texture() const 
-{ 	
-	LastAccessed=WW3D::Get_Sync_Time(); 
-	return D3DTexture; 
-}
-
-//**********************************************************************************************
-//! Set the d3d texture pointer.  Handles ref counts properly.
-/*! 
-*/
-void TextureBaseClass::Set_D3D_Base_Texture(IDirect3DBaseTexture8* tex) 
-{ 
-	// (gth) Generals does stuff directly with the D3DTexture pointer so lets
-	// reset the access timer whenever someon messes with this pointer.
-	LastAccessed=WW3D::Get_Sync_Time();
-	
-	if (D3DTexture != NULL) {
-		D3DTexture->Release();
-	}
-	D3DTexture = tex;
-	if (D3DTexture != NULL) {
-		D3DTexture->AddRef();
-	}
-}
-
-
-//**********************************************************************************************
-//! Load locked surface
-/*! 
-*/
-void TextureBaseClass::Load_Locked_Surface()
-{
-	WWPROFILE(("TextureClass::Load_Locked_Surface()"));
-	if (D3DTexture) D3DTexture->Release();
-	D3DTexture=0;
-	TextureLoader::Request_Thumbnail(this);
-	Initialized=false;
-}
-
-
-//**********************************************************************************************
-//! Is missing texture
-/*! 
-*/
-bool TextureBaseClass::Is_Missing_Texture()
-{
-	bool flag = false;
-	IDirect3DBaseTexture8 *missing_texture = MissingTexture::_Get_Missing_Texture();
-
-	if (D3DTexture == missing_texture)
-		flag = true;
-
-	if (missing_texture)
-	{
-		missing_texture->Release();
-	}
-
-	return flag;
-}
-
-
-//**********************************************************************************************
-//! Set texture name
-/*! 
-*/
-void TextureBaseClass::Set_Texture_Name(const char * name)
-{
-	Name=name;
-}
-
-
-
-
-//**********************************************************************************************
-//! Get priority
-/*! 
-*/
-unsigned int TextureBaseClass::Get_Priority(void)
-{
-	if (!D3DTexture) 
-	{
-		WWASSERT_PRINT(0, "Get_Priority: D3DTexture is NULL!\n");
-		return 0;
-	}
-
-#ifndef _XBOX
-	return D3DTexture->GetPriority();
-#else
-	return 0;
-#endif
-}
-
-
-//**********************************************************************************************
-//! Set priority
-/*! 
-*/
-unsigned int TextureBaseClass::Set_Priority(unsigned int priority)
-{
-	if (!D3DTexture) 
-	{
-		WWASSERT_PRINT(0, "Set_Priority: D3DTexture is NULL!\n");
-		return 0;
-	}
-
-#ifndef _XBOX
-	return D3DTexture->SetPriority(priority);
-#else
-	return 0;
-#endif
-}
-
-
-//**********************************************************************************************
-//! Get reduction mip levels
-/*! 
-*/
-unsigned TextureBaseClass::Get_Reduction() const
-{
-	// don't reduce if the texture is too small already or
-	// has no mip map levels
-	if (MipLevelCount==MIP_LEVELS_1) return 0;
-	if (Width <= 32 || Height <= 32) return 0;
-
-	int reduction=WW3D::Get_Texture_Reduction();
-
-	// 'large texture extra reduction' causes textures above 256x256 to be reduced one more step.
-	if (WW3D::Is_Large_Texture_Extra_Reduction_Enabled() && (Width > 256 || Height > 256)) {
-		reduction++;
-	}
-	if (MipLevelCount && reduction>MipLevelCount) {
-		reduction=MipLevelCount;
-	}
-	return reduction;
-}
-
-
-
-//**********************************************************************************************
-//! Apply NULL texture state
-/*! 
-*/
-void TextureBaseClass::Apply_Null(unsigned int stage)
-{
-	// This function sets the render states for a "NULL" texture
-	DX8Wrapper::Set_DX8_Texture(stage, NULL);
-}
-
-// ----------------------------------------------------------------------------
-// Setting HSV_Shift value is always relative to the original texture. This function invalidates the
-// texture surface and causes the texture to be reloaded. For thumbnailable textures, the hue shifting
-// is done in the background loading thread.
-// ----------------------------------------------------------------------------
-void TextureBaseClass::Set_HSV_Shift(const Vector3 &hsv_shift)
-{
-	Invalidate();
-	HSVShift=hsv_shift;
-}
-
-//**********************************************************************************************
-//! Get total locked surface size
-/*! KM
-*/
-int TextureBaseClass::_Get_Total_Locked_Surface_Size()
-{
-	int total_locked_surface_size=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) 
-	{
-		// Get the current texture
-		TextureBaseClass* tex=ite.Peek_Value();
-		if (!tex->Initialized) 
-		{
-			total_locked_surface_size+=tex->Get_Texture_Memory_Usage();
-		}
-	}
-	return total_locked_surface_size;
-}
-
-//**********************************************************************************************
-//! Get total texture size
-/*! KM
-*/
-int TextureBaseClass::_Get_Total_Texture_Size()
-{
-	int total_texture_size=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) 
-	{
-		// Get the current texture
-		TextureBaseClass* tex=ite.Peek_Value();
-		total_texture_size+=tex->Get_Texture_Memory_Usage();
-	}
-	return total_texture_size;
-}
-
-// ----------------------------------------------------------------------------
-
-
-//**********************************************************************************************
-//! Get total lightmap texture size
-/*!
-*/
-int TextureBaseClass::_Get_Total_Lightmap_Texture_Size()
-{
-	int total_texture_size=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) 
-	{
-		// Get the current texture
-		TextureBaseClass* tex=ite.Peek_Value();
-		if (tex->Is_Lightmap()) 
-		{
-			total_texture_size+=tex->Get_Texture_Memory_Usage();
-		}
-	}
-	return total_texture_size;
-}
-
-
-//**********************************************************************************************
-//! Get total procedural texture size
-/*!
-*/
-int TextureBaseClass::_Get_Total_Procedural_Texture_Size()
-{
-	int total_texture_size=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) 
-	{
-		// Get the current texture
-		TextureBaseClass* tex=ite.Peek_Value();
-		if (tex->Is_Procedural()) 
-		{
-			total_texture_size+=tex->Get_Texture_Memory_Usage();
-		}
-	}
-	return total_texture_size;
-}
-
-//**********************************************************************************************
-//! Get total texture count
-/*!
-*/
-int TextureBaseClass::_Get_Total_Texture_Count()
-{
-	int texture_count=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) 
-	{
-		texture_count++;
-	}
-
-	return texture_count;
-}
-
-// ----------------------------------------------------------------------------
-
-
-//**********************************************************************************************
-//! Get total light map texture count
-/*!
-*/
-int TextureBaseClass::_Get_Total_Lightmap_Texture_Count()
-{
-	int texture_count=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) 
-	{
-		if (ite.Peek_Value()->Is_Lightmap()) 
-		{
-			texture_count++;
-		}
-	}
-
-	return texture_count;
-}
-
-//**********************************************************************************************
-//! Get total procedural texture count
-/*!
-*/
-int TextureBaseClass::_Get_Total_Procedural_Texture_Count()
-{
-	int texture_count=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) 
-	{
-		if (ite.Peek_Value()->Is_Procedural()) 
-		{
-			texture_count++;
-		}
-	}
-
-	return texture_count;
-}
-
-
-//**********************************************************************************************
-//! Get total locked surface count
-/*!
-*/
-int TextureBaseClass::_Get_Total_Locked_Surface_Count()
-{
-	int texture_count=0;
-
-	HashTemplateIterator<StringClass,TextureClass*> ite(WW3DAssetManager::Get_Instance()->Texture_Hash());
-	// Loop through all the textures in the manager
-	for (ite.First ();!ite.Is_Done();ite.Next ()) 
-	{
-		// Get the current texture
-		TextureBaseClass* tex=ite.Peek_Value();
-		if (!tex->Initialized) 
-		{
-			texture_count++;
-		}
-	}
-
-	return texture_count;
-}
-
-/*************************************************************************
-**                             TextureClass
-*************************************************************************/
-TextureClass::TextureClass
-(
-	unsigned width, 
-	unsigned height, 
-	WW3DFormat format, 
-	MipCountType mip_level_count, 
-	PoolType pool,
-	bool rendertarget,
-	bool allow_reduction
-)
-:	TextureBaseClass(width, height, mip_level_count, pool, rendertarget,allow_reduction),
-	Filter(mip_level_count),
-	TextureFormat(format)
-{
-	Initialized=true;
-	IsProcedural=true;
-	IsReducible=false;
-
-	switch (format) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	default : break;
-	}
-		
-	D3DPOOL d3dpool=(D3DPOOL)0;
-	switch(pool)
-	{
-	case POOL_DEFAULT		: d3dpool=D3DPOOL_DEFAULT; break;
-	case POOL_MANAGED		: d3dpool=D3DPOOL_MANAGED; break;
-	case POOL_SYSTEMMEM	: d3dpool=D3DPOOL_SYSTEMMEM; break;
-	default: WWASSERT(0);
-	}
-
-	Poke_Texture
-	(
-		DX8Wrapper::_Create_DX8_Texture
-		(
-			width, 
-			height, 
-			format, 
-			mip_level_count,
-			d3dpool,
-			rendertarget
-		)
-	);
-
-	if (pool==POOL_DEFAULT)
-	{
-		Set_Dirty();
-		DX8TextureTrackerClass *track=new DX8TextureTrackerClass
-		(
-			width, 
-			height, 
-			format, 
-			mip_level_count,
-			this,
-			rendertarget
-		);
-		DX8TextureManagerClass::Add(track);
-	}
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-
-
-// ----------------------------------------------------------------------------
-TextureClass::TextureClass
-(
-	const char *name,
-	const char *full_path,
-	MipCountType mip_level_count,
-	WW3DFormat texture_format,
-	bool allow_compression,
-	bool allow_reduction
-)
-:	TextureBaseClass(0, 0, mip_level_count),
-	Filter(mip_level_count),
-	TextureFormat(texture_format)
-{
-	IsCompressionAllowed=allow_compression;
-	InactivationTime=DEFAULT_INACTIVATION_TIME;		// Default inactivation time 30 seconds
-	IsReducible=allow_reduction;
-
-	switch (TextureFormat) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	case WW3D_FORMAT_U8V8:		// Bumpmap
-	case WW3D_FORMAT_L6V5U5:	// Bumpmap
-	case WW3D_FORMAT_X8L8V8U8:	// Bumpmap
-		// If requesting bumpmap format that isn't available we'll just return the surface in whatever color
-		// format the texture file is in. (This is illegal case, the format support should always be queried
-		// before creating a bump texture!)
-		if (!DX8Wrapper::Is_Initted() || !DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(TextureFormat)) 
-		{
-			TextureFormat=WW3D_FORMAT_UNKNOWN;
-		}
-		// If bump format is valid, make sure compression is not allowed so that we don't even attempt to load
-		// from a compressed file (quality isn't good enough for bump map). Also disable mipmapping.
-		else 
-		{
-			IsCompressionAllowed=false;
-			MipLevelCount=MIP_LEVELS_1;
-			Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
-		}
-		break;
-	default:	break;
-	}
-
-	WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name\n");
-	int len=strlen(name);
-	for (int i=0;i<len;++i) 
-	{
-		if (name[i]=='+') 
-		{
-			IsLightmap=true;
-
-			// Set bilinear filtering for lightmaps (they are very stretched and
-			// low detail so we don't care for anisotropic or trilinear filtering...)
-			Filter.Set_Min_Filter(TextureFilterClass::FILTER_TYPE_FAST);
-			Filter.Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_FAST);
-			if (mip_level_count!=MIP_LEVELS_1) Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_FAST);
-			break;
-		}
-	}
-	Set_Texture_Name(name);
-	Set_Full_Path(full_path);
-	WWASSERT(name[0]!='\0');
-	if (!WW3D::Is_Texturing_Enabled()) 
-	{
-		Initialized=true;
-		Poke_Texture(NULL);
-	}
-
-	// Find original size from the thumbnail (but don't create thumbnail texture yet!)
-	ThumbnailClass* thumb=ThumbnailManagerClass::Peek_Thumbnail_Instance_From_Any_Manager(Get_Full_Path());
-	if (thumb) 
-	{
-		Width=thumb->Get_Original_Texture_Width();
-		Height=thumb->Get_Original_Texture_Height();
- 		if (MipLevelCount!=MIP_LEVELS_1) {
- 			MipLevelCount=(MipCountType)thumb->Get_Original_Texture_Mip_Level_Count();
- 		}
-	}
-
-	LastAccessed=WW3D::Get_Sync_Time();
-
-	// If the thumbnails are not enabled, init the texture at this point to avoid stalling when the
-	// mesh is rendered.
-	if (!WW3D::Get_Thumbnail_Enabled()) 
-	{
-		if (TextureLoader::Is_DX8_Thread()) 
-		{
-			Init();
-		}
-	}
-}
-
-// ----------------------------------------------------------------------------
-TextureClass::TextureClass
-(
-	SurfaceClass *surface, 
-	MipCountType mip_level_count
-)
-:  TextureBaseClass(0,0,mip_level_count),
-	Filter(mip_level_count),
-	TextureFormat(surface->Get_Surface_Format())
-{
-	IsProcedural=true;
-	Initialized=true;
-	IsReducible=false;
-
-	SurfaceClass::SurfaceDescription sd;
-	surface->Get_Description(sd);
-	Width=sd.Width;
-	Height=sd.Height;
-	switch (sd.Format) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	default: break;
-	}
-
-	Poke_Texture
-	(
-		DX8Wrapper::_Create_DX8_Texture
-		(
-			surface->Peek_D3D_Surface(), 
-			mip_level_count
-		)
-	);
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-// ----------------------------------------------------------------------------
-TextureClass::TextureClass(IDirect3DBaseTexture8* d3d_texture)
-:	TextureBaseClass
-	(
-		0,
-		0,
-		((MipCountType)d3d_texture->GetLevelCount())
-	),
-	Filter((MipCountType)d3d_texture->GetLevelCount())
-{
-	Initialized=true;
-	IsProcedural=true;
-	IsReducible=false;
-	
-	Set_D3D_Base_Texture(d3d_texture);
-	IDirect3DSurface8* surface;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0,&surface));
-	D3DSURFACE_DESC d3d_desc;
-	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
-	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
-	Width=d3d_desc.Width;
-	Height=d3d_desc.Height;
-	TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
-	switch (TextureFormat) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	default: break;
-	}
-
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-//**********************************************************************************************
-//! Initialise the texture
-/*! 
-*/
-void TextureClass::Init()
-{
-	// If the texture has already been initialised we should exit now
-	if (Initialized) return;
-
-	WWPROFILE("TextureClass::Init");
-
-	// If the texture has recently been inactivated, increase the inactivation time (this texture obviously
-	// should not have been inactivated yet).
-	if (InactivationTime && LastInactivationSyncTime) 
-	{
-		if ((WW3D::Get_Sync_Time()-LastInactivationSyncTime)<InactivationTime) 
-		{
-			ExtendedInactivationTime=3*InactivationTime;
-		}
-		LastInactivationSyncTime=0;
-	}
-
-
-	if (!Peek_D3D_Base_Texture()) 
-	{
-		if (!WW3D::Get_Thumbnail_Enabled() || MipLevelCount==MIP_LEVELS_1) 
-		{
-//		if (MipLevelCount==MIP_LEVELS_1) {
-			TextureLoader::Request_Foreground_Loading(this);
-		}
-		else 
-		{
-			WW3DFormat format=TextureFormat;
-			Load_Locked_Surface();
-			TextureFormat=format;
-		}
-	}
-
-	if (!Initialized) 
-	{
-		TextureLoader::Request_Background_Loading(this);
-	}
-
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-//**********************************************************************************************
-//! Apply new surface to texture
-/*! 
-*/
-void TextureClass::Apply_New_Surface
-(
-	IDirect3DBaseTexture8* d3d_texture,
-	bool initialized,
-	bool disable_auto_invalidation
-)
-{
-	IDirect3DBaseTexture8* d3d_tex=Peek_D3D_Base_Texture();
-
-	if (d3d_tex) d3d_tex->Release();
-
-	Poke_Texture(d3d_texture);//TextureLoadTask->Peek_D3D_Texture();
-	d3d_texture->AddRef();
-
-	if (initialized) Initialized=true;
-	if (disable_auto_invalidation) InactivationTime = 0;
-
-	WWASSERT(d3d_texture);
-	IDirect3DSurface8* surface;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0,&surface));
-	D3DSURFACE_DESC d3d_desc;
-	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
-	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
-	if (initialized) 
-	{
-		TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
-		Width=d3d_desc.Width;
-		Height=d3d_desc.Height;
-	}
-	surface->Release();
-
-}
-
-
-//**********************************************************************************************
-//! Apply texture states
-/*! 
-*/
-void TextureClass::Apply(unsigned int stage)
-{
-	// Initialization needs to be done when texture is used if it hasn't been done before.
-	// XBOX always initializes textures at creation time.
-	if (!Initialized) 
-	{
-		Init();
-
-		/* was in battlefield// Non-thumbnailed textures are always initialized when used
-		if (MipLevelCount==MIP_LEVELS_1) 
-		{
-		}
-		// Thumbnailed textures have delayed initialization and a background loading system
-		else 
-		{
-			// Limit the number of texture initializations per frame to reduce stuttering
-			if (TexturesAppliedPerFrame<MAX_TEXTURES_APPLIED_PER_FRAME) 
-			{
-				TexturesAppliedPerFrame++;
-				Init();
-			}
-			else 
-			{
-				// If texture can't be initialized in this frame, at least make sure we have the thumbnail.
-				if (!Peek_Texture()) 
-				{
-					WW3DFormat format=TextureFormat;
-					Load_Locked_Surface();
-					TextureFormat=format;
-				}
-			}
-		}*/
-	}
-	LastAccessed=WW3D::Get_Sync_Time();
-
-	DX8_RECORD_TEXTURE(this);
-
-	// Set texture itself
-	if (WW3D::Is_Texturing_Enabled()) 
-	{
-		DX8Wrapper::Set_DX8_Texture(stage, Peek_D3D_Base_Texture());
-	}
-	else 
-	{
-		DX8Wrapper::Set_DX8_Texture(stage, NULL);
-	}
-
-	Filter.Apply(stage);
-}
-
-//**********************************************************************************************
-//! Get surface from mip level
-/*! 
-*/
-SurfaceClass *TextureClass::Get_Surface_Level(unsigned int level)
-{
-	if (!Peek_D3D_Texture()) 
-	{
-		WWASSERT_PRINT(0, "Get_Surface_Level: D3DTexture is NULL!\n");
-		return 0;
-	}
-
-	IDirect3DSurface8 *d3d_surface = NULL;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(level, &d3d_surface));
-	SurfaceClass *surface = new SurfaceClass(d3d_surface);
-	d3d_surface->Release();
-
-	return surface;
-}
-
-//**********************************************************************************************
-//! Get surface description for a mip level
-/*!
-*/
-void TextureClass::Get_Level_Description( SurfaceClass::SurfaceDescription & desc, unsigned int level )
-{
-	SurfaceClass * surf = Get_Surface_Level(level);
-	if (surf != NULL) {
-		surf->Get_Description(desc);
-	}
-	REF_PTR_RELEASE(surf);
-}
-
-//**********************************************************************************************
-//! Get D3D surface from mip level
-/*! 
-*/
-IDirect3DSurface8 *TextureClass::Get_D3D_Surface_Level(unsigned int level)
-{
-	if (!Peek_D3D_Texture()) 
-	{
-		WWASSERT_PRINT(0, "Get_D3D_Surface_Level: D3DTexture is NULL!\n");
-		return 0;
-	}
-
-	IDirect3DSurface8 *d3d_surface = NULL;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(level, &d3d_surface));
-	return d3d_surface;
-}
-
-//**********************************************************************************************
-//! Get texture memory usage
-/*! 
-*/
-unsigned TextureClass::Get_Texture_Memory_Usage() const
-{
-	int size=0;
-	if (!Peek_D3D_Texture()) return 0;
-	for (unsigned i=0;i<Peek_D3D_Texture()->GetLevelCount();++i) 
-	{
-		D3DSURFACE_DESC desc;
-		DX8_ErrorCode(Peek_D3D_Texture()->GetLevelDesc(i,&desc));
-		size+=desc.Size;
-	}
-	return size;
-}
-
-
-// Utility functions
-TextureClass* Load_Texture(ChunkLoadClass & cload)
-{
-	// Assume failure
-	TextureClass *newtex = NULL;
-
-	char name[256];
-	if (cload.Open_Chunk () && (cload.Cur_Chunk_ID () == W3D_CHUNK_TEXTURE)) 
-	{
-
-		W3dTextureInfoStruct texinfo;
-		bool hastexinfo = false;
-
-		/*
-		** Read in the texture filename, and a possible texture info structure.
-		*/
-		while (cload.Open_Chunk()) {
-			switch (cload.Cur_Chunk_ID()) {
-				case W3D_CHUNK_TEXTURE_NAME:
-					cload.Read(&name,cload.Cur_Chunk_Length());
-					break;
-
-				case W3D_CHUNK_TEXTURE_INFO:
-					cload.Read(&texinfo,sizeof(W3dTextureInfoStruct));
-					hastexinfo = true;
-					break;
-			};
-			cload.Close_Chunk();
-		}
-		cload.Close_Chunk();
-
-		/*
-		** Get the texture from the asset manager
-		*/
-		if (hastexinfo) 
-		{
-
-			MipCountType mipcount;
-
-			bool no_lod = ((texinfo.Attributes & W3DTEXTURE_NO_LOD) == W3DTEXTURE_NO_LOD);
-
-			if (no_lod) 
-			{
-				mipcount = MIP_LEVELS_1;
-			} 
-			else 
-			{
-				switch (texinfo.Attributes & W3DTEXTURE_MIP_LEVELS_MASK) {
-
-					case W3DTEXTURE_MIP_LEVELS_ALL:
-						mipcount = MIP_LEVELS_ALL;
-						break;
-
-					case W3DTEXTURE_MIP_LEVELS_2:
-						mipcount = MIP_LEVELS_2;
-						break;
-
-					case W3DTEXTURE_MIP_LEVELS_3:
-						mipcount = MIP_LEVELS_3;
-						break;
-
-					case W3DTEXTURE_MIP_LEVELS_4:
-						mipcount = MIP_LEVELS_4;
-						break;
-
-					default:
-						WWASSERT (false);
-						mipcount = MIP_LEVELS_ALL;
-						break;
-				}
-			}
-
-			WW3DFormat format=WW3D_FORMAT_UNKNOWN;
-
-			switch (texinfo.Attributes & W3DTEXTURE_TYPE_MASK) 
-			{
-
-				case W3DTEXTURE_TYPE_COLORMAP:
-					// Do nothing.
-					break;
-
-				case W3DTEXTURE_TYPE_BUMPMAP:
-				{
-					if (DX8Wrapper::Is_Initted() && DX8Wrapper::Get_Current_Caps()->Support_Bump_Envmap()) 
-					{
-						// No mipmaps to bumpmap for now
-						mipcount=MIP_LEVELS_1;
-
-						if (DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(WW3D_FORMAT_U8V8)) format=WW3D_FORMAT_U8V8;
-						else if (DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(WW3D_FORMAT_X8L8V8U8)) format=WW3D_FORMAT_X8L8V8U8;
-						else if (DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(WW3D_FORMAT_L6V5U5)) format=WW3D_FORMAT_L6V5U5;
-					}
-					break;
-				}
-
-				default:
-					WWASSERT (false);
-					break;
-			}
-
-			newtex = WW3DAssetManager::Get_Instance()->Get_Texture (name, mipcount, format);
-
-			if (no_lod) 
-			{
-				newtex->Get_Filter().Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
-			}
-			bool u_clamp = ((texinfo.Attributes & W3DTEXTURE_CLAMP_U) != 0);
-			newtex->Get_Filter().Set_U_Addr_Mode(u_clamp ? TextureFilterClass::TEXTURE_ADDRESS_CLAMP : TextureFilterClass::TEXTURE_ADDRESS_REPEAT);
-			bool v_clamp = ((texinfo.Attributes & W3DTEXTURE_CLAMP_V) != 0);
-			newtex->Get_Filter().Set_V_Addr_Mode(v_clamp ? TextureFilterClass::TEXTURE_ADDRESS_CLAMP : TextureFilterClass::TEXTURE_ADDRESS_REPEAT);
-
-		} else 
-		{
-			newtex = WW3DAssetManager::Get_Instance()->Get_Texture(name);
-		}
-
-		WWASSERT(newtex);
-	}
-
-	// Return a pointer to the new texture
-	return newtex;
-}
-
-// Utility function used by Save_Texture
-void setup_texture_attributes(TextureClass * tex, W3dTextureInfoStruct * texinfo)
-{
-	texinfo->Attributes = 0;
-
-	if (tex->Get_Filter().Get_Mip_Mapping() == TextureFilterClass::FILTER_TYPE_NONE) texinfo->Attributes |= W3DTEXTURE_NO_LOD;
-	if (tex->Get_Filter().Get_U_Addr_Mode() == TextureFilterClass::TEXTURE_ADDRESS_CLAMP) texinfo->Attributes |= W3DTEXTURE_CLAMP_U;
-	if (tex->Get_Filter().Get_V_Addr_Mode() == TextureFilterClass::TEXTURE_ADDRESS_CLAMP) texinfo->Attributes |= W3DTEXTURE_CLAMP_V;
-}
-
-
-void Save_Texture(TextureClass * texture,ChunkSaveClass & csave)
-{
-	const char * filename;
-	W3dTextureInfoStruct texinfo;
-	memset(&texinfo,0,sizeof(texinfo));
-
-	filename = texture->Get_Full_Path();
-
-	setup_texture_attributes(texture, &texinfo);
-
-	csave.Begin_Chunk(W3D_CHUNK_TEXTURE_NAME);
-	csave.Write(filename,strlen(filename)+1);
-	csave.End_Chunk();
-
-	if ((texinfo.Attributes != 0) || (texinfo.AnimType != 0) || (texinfo.FrameCount != 0)) {
-		csave.Begin_Chunk(W3D_CHUNK_TEXTURE_INFO);
-		csave.Write(&texinfo, sizeof(texinfo));
-		csave.End_Chunk();
-	}
-}
-
-
-/*!
- *	KJM depth stencil texture constructor
- */
-ZTextureClass::ZTextureClass
-(
-	unsigned width, 
-	unsigned height, 
-	WW3DZFormat zformat, 
-	MipCountType mip_level_count, 
-	PoolType pool
-)
-:	TextureBaseClass(width,height, mip_level_count, pool),
-	DepthStencilTextureFormat(zformat)
-{
-	D3DPOOL d3dpool=(D3DPOOL)0;
-	switch (pool)
-	{
-	case POOL_DEFAULT: d3dpool=D3DPOOL_DEFAULT; break;
-	case POOL_MANAGED: d3dpool=D3DPOOL_MANAGED; break;
-	case POOL_SYSTEMMEM: d3dpool=D3DPOOL_SYSTEMMEM;	break;
-	default:	WWASSERT(0);
-	}
-
-	Poke_Texture
-	(
-		DX8Wrapper::_Create_DX8_ZTexture
-		(
-			width,
-			height, 
-			zformat, 
-			mip_level_count,
-			d3dpool
-		)
-	);
-
-	if (pool==POOL_DEFAULT)
-	{
-		Set_Dirty();
-		DX8ZTextureTrackerClass *track=new DX8ZTextureTrackerClass
-		(
-			width, 
-			height, 
-			zformat, 
-			mip_level_count,
-			this
-		);
-		DX8TextureManagerClass::Add(track);
-	}
-	Initialized=true;
-	IsProcedural=true;
-	IsReducible=false;
-
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-
-//**********************************************************************************************
-//! Apply depth stencil texture
-/*! KM
-*/
-void ZTextureClass::Apply(unsigned int stage)
-{
-	DX8Wrapper::Set_DX8_Texture(stage, Peek_D3D_Base_Texture());
-}
-
-//**********************************************************************************************
-//! Apply new surface to texture
-/*! KM
-*/
-void ZTextureClass::Apply_New_Surface
-(
-	IDirect3DBaseTexture8* d3d_texture,
-	bool initialized,
-	bool disable_auto_invalidation
-)
-{
-	IDirect3DBaseTexture8* d3d_tex=Peek_D3D_Base_Texture();
-
-	if (d3d_tex) d3d_tex->Release();
-
-	Poke_Texture(d3d_texture);//TextureLoadTask->Peek_D3D_Texture();
-	d3d_texture->AddRef();
-
-	if (initialized) Initialized=true;
-	if (disable_auto_invalidation) InactivationTime = 0;
-
-	WWASSERT(Peek_D3D_Texture());
-	IDirect3DSurface8* surface;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0,&surface));
-	D3DSURFACE_DESC d3d_desc;
-	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
-	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
-	if (initialized) 
-	{
-		DepthStencilTextureFormat=D3DFormat_To_WW3DZFormat(d3d_desc.Format);
-		Width=d3d_desc.Width;
-		Height=d3d_desc.Height;
-	}
-	surface->Release();
-}
-
-//**********************************************************************************************
-//! Get D3D surface from mip level
-/*! 
-*/
-IDirect3DSurface8* ZTextureClass::Get_D3D_Surface_Level(unsigned int level)
-{
-	if (!Peek_D3D_Texture()) 
-	{
-		WWASSERT_PRINT(0, "Get_D3D_Surface_Level: D3DTexture is NULL!\n");
-		return 0;
-	}
-
-	IDirect3DSurface8 *d3d_surface = NULL;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(level, &d3d_surface));
-	return d3d_surface;
-}
-
-//**********************************************************************************************
-//! Get texture memory usage
-/*! 
-*/
-unsigned ZTextureClass::Get_Texture_Memory_Usage() const
-{
-	int size=0;
-	if (!Peek_D3D_Texture()) return 0;
-	for (unsigned i=0;i<Peek_D3D_Texture()->GetLevelCount();++i) 
-	{
-		D3DSURFACE_DESC desc;
-		DX8_ErrorCode(Peek_D3D_Texture()->GetLevelDesc(i,&desc));
-		size+=desc.Size;
-	}
-	return size;
-}
-
-
-
-/*************************************************************************
-**                             CubeTextureClass
-*************************************************************************/
-CubeTextureClass::CubeTextureClass
-(
-	unsigned width, 
-	unsigned height, 
-	WW3DFormat format, 
-	MipCountType mip_level_count, 
-	PoolType pool,
-	bool rendertarget,
-	bool allow_reduction
-)
-: TextureClass(width, height, format, mip_level_count, pool, rendertarget)
-{
-	Initialized=true;
-	IsProcedural=true;
-	IsReducible=false;
-
-	switch (format) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	default : break;
-	}
-		
-	D3DPOOL d3dpool=(D3DPOOL)0;
-	switch(pool)
-	{
-	case POOL_DEFAULT		: d3dpool=D3DPOOL_DEFAULT; break;
-	case POOL_MANAGED		: d3dpool=D3DPOOL_MANAGED; break;
-	case POOL_SYSTEMMEM	: d3dpool=D3DPOOL_SYSTEMMEM; break;
-	default: WWASSERT(0);
-	}
-
-	Poke_Texture
-	(
-		DX8Wrapper::_Create_DX8_Cube_Texture
-		(
-			width, 
-			height, 
-			format, 
-			mip_level_count,
-			d3dpool,
-			rendertarget
-		)
-	);
-
-	if (pool==POOL_DEFAULT)
-	{
-		Set_Dirty();
-		DX8TextureTrackerClass *track=new DX8TextureTrackerClass
-		(
-			width, 
-			height, 
-			format, 
-			mip_level_count,
-			this,
-			rendertarget
-		);
-		DX8TextureManagerClass::Add(track);
-	}
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-
-
-// ----------------------------------------------------------------------------
-CubeTextureClass::CubeTextureClass
-(
-	const char *name,
-	const char *full_path,
-	MipCountType mip_level_count,
-	WW3DFormat texture_format,
-	bool allow_compression,
-	bool allow_reduction
-)
-:	TextureClass(0,0,mip_level_count, POOL_MANAGED, false, texture_format)
-{
-	IsCompressionAllowed=allow_compression;
-	InactivationTime=DEFAULT_INACTIVATION_TIME;		// Default inactivation time 30 seconds
-
-	switch (TextureFormat) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	case WW3D_FORMAT_U8V8:		// Bumpmap
-	case WW3D_FORMAT_L6V5U5:	// Bumpmap
-	case WW3D_FORMAT_X8L8V8U8:	// Bumpmap
-		// If requesting bumpmap format that isn't available we'll just return the surface in whatever color
-		// format the texture file is in. (This is illegal case, the format support should always be queried
-		// before creating a bump texture!)
-		if (!DX8Wrapper::Is_Initted() || !DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(TextureFormat)) 
-		{
-			TextureFormat=WW3D_FORMAT_UNKNOWN;
-		}
-		// If bump format is valid, make sure compression is not allowed so that we don't even attempt to load
-		// from a compressed file (quality isn't good enough for bump map). Also disable mipmapping.
-		else 
-		{
-			IsCompressionAllowed=false;
-			MipLevelCount=MIP_LEVELS_1;
-			Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
-		}
-		break;
-	default:	break;
-	}
-
-	WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name\n");
-	int len=strlen(name);
-	for (int i=0;i<len;++i) 
-	{
-		if (name[i]=='+') 
-		{
-			IsLightmap=true;
-
-			// Set bilinear filtering for lightmaps (they are very stretched and
-			// low detail so we don't care for anisotropic or trilinear filtering...)
-			Filter.Set_Min_Filter(TextureFilterClass::FILTER_TYPE_FAST);
-			Filter.Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_FAST);
-			if (mip_level_count!=MIP_LEVELS_1) Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_FAST);
-			break;
-		}
-	}
-	Set_Texture_Name(name);
-	Set_Full_Path(full_path);
-	WWASSERT(name[0]!='\0');
-	if (!WW3D::Is_Texturing_Enabled()) 
-	{
-		Initialized=true;
-		Poke_Texture(NULL);
-	}
-
-	// Find original size from the thumbnail (but don't create thumbnail texture yet!)
-	ThumbnailClass* thumb=ThumbnailManagerClass::Peek_Thumbnail_Instance_From_Any_Manager(Get_Full_Path());
-	if (thumb) 
-	{
-		Width=thumb->Get_Original_Texture_Width();
-		Height=thumb->Get_Original_Texture_Height();
- 		if (MipLevelCount!=MIP_LEVELS_1) {
- 			MipLevelCount=(MipCountType)thumb->Get_Original_Texture_Mip_Level_Count();
- 		}
-	}
-
-	LastAccessed=WW3D::Get_Sync_Time();
-
-	// If the thumbnails are not enabled, init the texture at this point to avoid stalling when the
-	// mesh is rendered.
-	if (!WW3D::Get_Thumbnail_Enabled()) 
-	{
-		if (TextureLoader::Is_DX8_Thread()) 
-		{
-			Init();
-		}
-	}
-}
-
-// don't know if these are needed
-#if 0
-// ----------------------------------------------------------------------------
-CubeTextureClass::CubeTextureClass
-(
-	SurfaceClass *surface, 
-	MipCountType mip_level_count
-)
-:	TextureClass(0,0,mip_level_count, POOL_MANAGED, false, surface->Get_Surface_Format())
-{
-	IsProcedural=true;
-	Initialized=true;
-	IsReducible=false;
-
-	SurfaceClass::SurfaceDescription sd;
-	surface->Get_Description(sd);
-	Width=sd.Width;
-	Height=sd.Height;
-	switch (sd.Format) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	default: break;
-	}
-
-	Poke_Texture
-	(
-		DX8Wrapper::_Create_DX8_Cube_Texture
-		(
-			surface->Peek_D3D_Surface(), 
-			mip_level_count
-		)
-	);
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-// ----------------------------------------------------------------------------
-CubeTextureClass::CubeTextureClass(IDirect3DBaseTexture8* d3d_texture)
-:	TextureBaseClass
-	(
-		0,
-		0,
-		((MipCountType)d3d_texture->GetLevelCount())
-	),
-	Filter((MipCountType)d3d_texture->GetLevelCount())
-{
-	Initialized=true;
-	IsProcedural=true;
-	IsReducible=false;
-
-	Peek_Texture()->AddRef();
-	IDirect3DSurface8* surface;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0,&surface));
-	D3DSURFACE_DESC d3d_desc;
-	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
-	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
-	Width=d3d_desc.Width;
-	Height=d3d_desc.Height;
-	TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
-	switch (TextureFormat) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	default: break;
-	}
-
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-#endif
-
-//**********************************************************************************************
-//! Apply new surface to texture
-/*! 
-*/
-void CubeTextureClass::Apply_New_Surface
-(
-	IDirect3DBaseTexture8* d3d_texture,
-	bool initialized,
-	bool disable_auto_invalidation
-)
-{
-	IDirect3DBaseTexture8* d3d_tex=Peek_D3D_Base_Texture();
-
-	if (d3d_tex) d3d_tex->Release();
-
-	Poke_Texture(d3d_texture);//TextureLoadTask->Peek_D3D_Texture();
-	d3d_texture->AddRef();
-
-	if (initialized) Initialized=true;
-	if (disable_auto_invalidation) InactivationTime = 0;
-
-	WWASSERT(d3d_texture);
-	D3DSURFACE_DESC d3d_desc;
-	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
-	DX8_ErrorCode(Peek_D3D_CubeTexture()->GetLevelDesc(0,&d3d_desc));
-
-	if (initialized) 
-	{
-		TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
-		Width=d3d_desc.Width;
-		Height=d3d_desc.Height;
-	}
-}
-
-
-/*************************************************************************
-**                             VolumeTextureClass
-*************************************************************************/
-VolumeTextureClass::VolumeTextureClass
-(
-	unsigned width, 
-	unsigned height, 
-	unsigned depth,
-	WW3DFormat format, 
-	MipCountType mip_level_count, 
-	PoolType pool,
-	bool rendertarget,
-	bool allow_reduction
-)
-: TextureClass(width, height, format, mip_level_count, pool, rendertarget),
-  Depth(depth)
-{
-	Initialized=true;
-	IsProcedural=true;
-	IsReducible=false;
-
-	switch (format) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	default : break;
-	}
-		
-	D3DPOOL d3dpool=(D3DPOOL)0;
-	switch(pool)
-	{
-	case POOL_DEFAULT		: d3dpool=D3DPOOL_DEFAULT; break;
-	case POOL_MANAGED		: d3dpool=D3DPOOL_MANAGED; break;
-	case POOL_SYSTEMMEM	: d3dpool=D3DPOOL_SYSTEMMEM; break;
-	default: WWASSERT(0);
-	}
-
-	Poke_Texture
-	(
-		DX8Wrapper::_Create_DX8_Volume_Texture
-		(
-			width, 
-			height, 
-			depth,
-			format, 
-			mip_level_count,
-			d3dpool
-		)
-	);
-
-	if (pool==POOL_DEFAULT)
-	{
-		Set_Dirty();
-		DX8TextureTrackerClass *track=new DX8TextureTrackerClass
-		(
-			width, 
-			height, 
-			format, 
-			mip_level_count,
-			this,
-			rendertarget
-		);
-		DX8TextureManagerClass::Add(track);
-	}
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-
-
-// ----------------------------------------------------------------------------
-VolumeTextureClass::VolumeTextureClass
-(
-	const char *name,
-	const char *full_path,
-	MipCountType mip_level_count,
-	WW3DFormat texture_format,
-	bool allow_compression,
-	bool allow_reduction
-)
-:	TextureClass(0,0,mip_level_count, POOL_MANAGED, false, texture_format),
-	Depth(0)
-{
-	IsCompressionAllowed=allow_compression;
-	InactivationTime=DEFAULT_INACTIVATION_TIME;		// Default inactivation time 30 seconds
-
-	switch (TextureFormat) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	case WW3D_FORMAT_U8V8:		// Bumpmap
-	case WW3D_FORMAT_L6V5U5:	// Bumpmap
-	case WW3D_FORMAT_X8L8V8U8:	// Bumpmap
-		// If requesting bumpmap format that isn't available we'll just return the surface in whatever color
-		// format the texture file is in. (This is illegal case, the format support should always be queried
-		// before creating a bump texture!)
-		if (!DX8Wrapper::Is_Initted() || !DX8Wrapper::Get_Current_Caps()->Support_Texture_Format(TextureFormat)) 
-		{
-			TextureFormat=WW3D_FORMAT_UNKNOWN;
-		}
-		// If bump format is valid, make sure compression is not allowed so that we don't even attempt to load
-		// from a compressed file (quality isn't good enough for bump map). Also disable mipmapping.
-		else 
-		{
-			IsCompressionAllowed=false;
-			MipLevelCount=MIP_LEVELS_1;
-			Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_NONE);
-		}
-		break;
-	default:	break;
-	}
-
-	WWASSERT_PRINT(name && name[0], "TextureClass CTor: NULL or empty texture name\n");
-	int len=strlen(name);
-	for (int i=0;i<len;++i) 
-	{
-		if (name[i]=='+') 
-		{
-			IsLightmap=true;
-
-			// Set bilinear filtering for lightmaps (they are very stretched and
-			// low detail so we don't care for anisotropic or trilinear filtering...)
-			Filter.Set_Min_Filter(TextureFilterClass::FILTER_TYPE_FAST);
-			Filter.Set_Mag_Filter(TextureFilterClass::FILTER_TYPE_FAST);
-			if (mip_level_count!=MIP_LEVELS_1) Filter.Set_Mip_Mapping(TextureFilterClass::FILTER_TYPE_FAST);
-			break;
-		}
-	}
-	Set_Texture_Name(name);
-	Set_Full_Path(full_path);
-	WWASSERT(name[0]!='\0');
-	if (!WW3D::Is_Texturing_Enabled()) 
-	{
-		Initialized=true;
-		Poke_Texture(NULL);
-	}
-
-	// Find original size from the thumbnail (but don't create thumbnail texture yet!)
-	ThumbnailClass* thumb=ThumbnailManagerClass::Peek_Thumbnail_Instance_From_Any_Manager(Get_Full_Path());
-	if (thumb) 
-	{
-		Width=thumb->Get_Original_Texture_Width();
-		Height=thumb->Get_Original_Texture_Height();
- 		if (MipLevelCount!=MIP_LEVELS_1) {
- 			MipLevelCount=(MipCountType)thumb->Get_Original_Texture_Mip_Level_Count();
- 		}
-	}
-
-	LastAccessed=WW3D::Get_Sync_Time();
-
-	// If the thumbnails are not enabled, init the texture at this point to avoid stalling when the
-	// mesh is rendered.
-	if (!WW3D::Get_Thumbnail_Enabled()) 
-	{
-		if (TextureLoader::Is_DX8_Thread()) 
-		{
-			Init();
-		}
-	}
-}
-
-// don't know if these are needed
-#if 0
-// ----------------------------------------------------------------------------
-CubeTextureClass::CubeTextureClass
-(
-	SurfaceClass *surface, 
-	MipCountType mip_level_count
-)
-:	TextureClass(0,0,mip_level_count, POOL_MANAGED, false, surface->Get_Surface_Format())
-{
-	IsProcedural=true;
-	Initialized=true;
-	IsReducible=false;
-
-	SurfaceClass::SurfaceDescription sd;
-	surface->Get_Description(sd);
-	Width=sd.Width;
-	Height=sd.Height;
-	switch (sd.Format) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	default: break;
-	}
-
-	Poke_Texture
-	(
-		DX8Wrapper::_Create_DX8_Cube_Texture
-		(
-			surface->Peek_D3D_Surface(), 
-			mip_level_count
-		)
-	);
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-
-// ----------------------------------------------------------------------------
-CubeTextureClass::CubeTextureClass(IDirect3DBaseTexture8* d3d_texture)
-:	TextureBaseClass
-	(
-		0,
-		0,
-		((MipCountType)d3d_texture->GetLevelCount())
-	),
-	Filter((MipCountType)d3d_texture->GetLevelCount())
-{
-	Initialized=true;
-	IsProcedural=true;
-	IsReducible=false;
-
-	Peek_Texture()->AddRef();
-	IDirect3DSurface8* surface;
-	DX8_ErrorCode(Peek_D3D_Texture()->GetSurfaceLevel(0,&surface));
-	D3DSURFACE_DESC d3d_desc;
-	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
-	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
-	Width=d3d_desc.Width;
-	Height=d3d_desc.Height;
-	TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
-	switch (TextureFormat) 
-	{
-	case WW3D_FORMAT_DXT1:
-	case WW3D_FORMAT_DXT2:
-	case WW3D_FORMAT_DXT3:
-	case WW3D_FORMAT_DXT4:
-	case WW3D_FORMAT_DXT5:
-		IsCompressionAllowed=true;
-		break;
-	default: break;
-	}
-
-	LastAccessed=WW3D::Get_Sync_Time();
-}
-#endif
-
-
-
-
-//**********************************************************************************************
-//! Apply new surface to texture
-/*! 
-*/
-void VolumeTextureClass::Apply_New_Surface
-(
-	IDirect3DBaseTexture8* d3d_texture,
-	bool initialized,
-	bool disable_auto_invalidation
-)
-{
-	IDirect3DBaseTexture8* d3d_tex=Peek_D3D_Base_Texture();
-
-	if (d3d_tex) d3d_tex->Release();
-
-	Poke_Texture(d3d_texture);//TextureLoadTask->Peek_D3D_Texture();
-	d3d_texture->AddRef();
-
-	if (initialized) Initialized=true;
-	if (disable_auto_invalidation) InactivationTime = 0;
-
-	WWASSERT(d3d_texture);
-	D3DVOLUME_DESC d3d_desc;
-	::ZeroMemory(&d3d_desc, sizeof(D3DVOLUME_DESC));
-
-	DX8_ErrorCode(Peek_D3D_VolumeTexture()->GetLevelDesc(0,&d3d_desc));
-
-	if (initialized)
-	{
-		TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
-		Width=d3d_desc.Width;
-		Height=d3d_desc.Height;
-		Depth=d3d_desc.Depth;
-	}
-}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h
deleted file mode 100644
index fe2b444b01a..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/texture.h                              $*
- *                                                                                             *
- *                  $Org Author:: Jani_p                                                      $*
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 08/05/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 46                                                          $*
- *                                                                                             *
- * 05/16/02 KM Base texture class to abstract major texture types, e.g. 3d, z, cube, etc.
- * 06/27/02 KM Texture class abstraction																			*
- * 08/05/02 KM Texture class redesign (revisited)
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#ifndef TEXTURE_H
-#define TEXTURE_H
-
-#include "always.h"
-#include "refcount.h"
-#include "chunkio.h"
-#include "surfaceclass.h"
-#include "ww3dformat.h"
-#include "wwstring.h"
-#include "vector3.h"
-#include "texturefilter.h"
-
-struct IDirect3DBaseTexture8;
-struct IDirect3DTexture8;
-struct IDirect3DCubeTexture8;
-struct IDirect3DVolumeTexture8;
-
-class DX8Wrapper;
-class TextureLoader;
-class LoaderThreadClass;
-class TextureLoadTaskClass;
-class CubeTextureClass;
-class VolumeTextureClass;
-
-class TextureBaseClass : public RefCountClass
-{
-	friend class TextureLoader;
-	friend class LoaderThreadClass;
-	friend class DX8TextureTrackerClass;  //(gth) so it can call Poke_Texture, 
-	friend class DX8ZTextureTrackerClass;
-
-public:
-
-	enum PoolType 
-	{
-		POOL_DEFAULT=0,
-		POOL_MANAGED,
-		POOL_SYSTEMMEM
-	};
-
-	enum TexAssetType
-	{
-		TEX_REGULAR,
-		TEX_CUBEMAP,
-		TEX_VOLUME
-	};
-
-	// base constructor for derived classes
-	TextureBaseClass
-	(
-		unsigned width, 
-		unsigned height, 
-		MipCountType mip_level_count=MIP_LEVELS_ALL,
-		PoolType pool=POOL_MANAGED,
-		bool rendertarget=false,
-		bool reducible=true
-	);
-
-	virtual ~TextureBaseClass();
-
-	virtual TexAssetType Get_Asset_Type() const=0;
-
-	// Names
-	void	Set_Texture_Name(const char * name);
-	void	Set_Full_Path(const char * path)			{ FullPath = path; }
-	const StringClass& Get_Texture_Name(void) const		{ return Name; }
-	const StringClass& Get_Full_Path(void) const			{ if (FullPath.Is_Empty ()) return Name; return FullPath; }
-
-	unsigned Get_ID() const { return texture_id; }	// Each textrure has a unique id
-
-	// The number of Mip levels in the texture
-	unsigned int Get_Mip_Level_Count(void) const
-	{
-		return MipLevelCount;
-	}
-
-	// Note! Width and Height may be zero and may change if texture uses mipmaps
-	int Get_Width() const
-	{
-		return Width;
-	}
-	int Get_Height() const
-	{
-		return Height; 
-	}
-
-	// Time, after which the texture is invalidated if not used. Set to zero to indicate infinite.
-	// Time is in milliseconds.
-	void Set_Inactivation_Time(unsigned time) { InactivationTime=time; }
-	int Get_Inactivation_Time() const { return InactivationTime; }
-
-	// Texture priority affects texture management and caching.
-	unsigned int Get_Priority(void);
-	unsigned int Set_Priority(unsigned int priority);	// Returns previous priority
-
-	// Debug utility functions for returning the texture memory usage
-	virtual unsigned Get_Texture_Memory_Usage() const=0;
-
-	bool Is_Initialized() const { return Initialized; }
-	bool Is_Lightmap() const { return IsLightmap; }
-	bool Is_Procedural() const { return IsProcedural; }
-	bool Is_Reducible() const { return IsReducible; } //can texture be reduced in resolution for LOD purposes?
-
-	static int _Get_Total_Locked_Surface_Size();
-	static int _Get_Total_Texture_Size();
-	static int _Get_Total_Lightmap_Texture_Size();
-	static int _Get_Total_Procedural_Texture_Size();
-	static int _Get_Total_Locked_Surface_Count();
-	static int _Get_Total_Texture_Count();
-	static int _Get_Total_Lightmap_Texture_Count();
-	static int _Get_Total_Procedural_Texture_Count();
-
-	virtual void Init()=0;
-
-	// This utility function processes the texture reduction (used during rendering)
-	void Invalidate();
-
-	// texture accessors (dx8)
-	IDirect3DBaseTexture8 *Peek_D3D_Base_Texture() const;
-	void Set_D3D_Base_Texture(IDirect3DBaseTexture8* tex);
-
-	PoolType Get_Pool() const { return Pool; }
-
-	bool Is_Missing_Texture();
-
-	// Support for self managed textures
-	bool Is_Dirty() { WWASSERT(Pool==POOL_DEFAULT); return Dirty; };
-	void Set_Dirty() { WWASSERT(Pool==POOL_DEFAULT); Dirty=true; }
-	void Clean() { Dirty=false; };
-
-	void Set_HSV_Shift(const Vector3 &hsv_shift);
-	const Vector3& Get_HSV_Shift() { return HSVShift; }
-
-	bool Is_Compression_Allowed() const { return IsCompressionAllowed; }
-
-	unsigned Get_Reduction() const;
-
-	// Background texture loader will call this when texture has been loaded
-	virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false)=0;	// If the parameter is true, the texture will be flagged as initialised
-
-	MipCountType MipLevelCount;
-
-	// Inactivate textures that haven't been used in a while. Pass zero to use textures'
-	// own inactive times (default). In urgent need to free up texture memory, try
-	// calling with relatively small (just few seconds) time override to free up everything
-	// but the currently used textures.
-	static void Invalidate_Old_Unused_Textures(unsigned inactive_time_override);
-
-	// Apply this texture's settings into D3D
-	virtual void Apply(unsigned int stage)=0;
-
-	// Apply a Null texture's settings into D3D
-	static void Apply_Null(unsigned int stage);
-
-	virtual TextureClass* As_TextureClass() { return NULL; }
-	virtual CubeTextureClass* As_CubeTextureClass() { return NULL; }
-	virtual VolumeTextureClass* As_VolumeTextureClass() { return NULL; }
-
-	IDirect3DTexture8* Peek_D3D_Texture() const { return (IDirect3DTexture8*)Peek_D3D_Base_Texture(); }
-	IDirect3DVolumeTexture8* Peek_D3D_VolumeTexture() const { return (IDirect3DVolumeTexture8*)Peek_D3D_Base_Texture(); }
-	IDirect3DCubeTexture8* Peek_D3D_CubeTexture() const { return (IDirect3DCubeTexture8*)Peek_D3D_Base_Texture(); }
-
-protected:
-
-	void Load_Locked_Surface();
-	void Poke_Texture(IDirect3DBaseTexture8* tex) { D3DTexture = tex; }
-
-	bool Initialized;
-
-	// For debug purposes the texture sets this true if it is a lightmap texture
-	bool IsLightmap;
-	bool IsCompressionAllowed;
-	bool IsProcedural;
-	bool IsReducible;
-
-
-	unsigned InactivationTime;	// In milliseconds
-	unsigned ExtendedInactivationTime;	// This is set by the engine, if needed
-	unsigned LastInactivationSyncTime;
-	mutable unsigned LastAccessed;
-
-	// If this is non-zero, the texture will have a hue shift done at the next init (this
-	// value should only be changed by Set_HSV_Shift() function, which also invalidates the
-	// texture).
-	Vector3 HSVShift;	
-
-	int Width;
-	int Height;
-
-private:
-
-	// Direct3D texture object
-	IDirect3DBaseTexture8 *D3DTexture;
-
-	// Name
-	StringClass Name;
-	StringClass	FullPath;
-
-	// Unique id
-	unsigned texture_id;
-
-	// Support for self-managed textures
-
-	PoolType Pool;
-	bool Dirty;
-
-	friend class TextureLoadTaskClass;
-	friend class CubeTextureLoadTaskClass;
-	friend class VolumeTextureLoadTaskClass;
-	TextureLoadTaskClass* TextureLoadTask;
-	TextureLoadTaskClass* ThumbnailLoadTask;
-
-};
-
-
-/*************************************************************************
-**                             TextureClass
-**
-** This is our regular texture class. For legacy reasons it contains some
-** information beyond the D3D texture itself, such as texture addressing
-** modes.
-**
-*************************************************************************/
-class TextureClass : public TextureBaseClass
-{
-	W3DMPO_GLUE(TextureClass)
-//	friend DX8Wrapper;
-
-public:
-
-	// Create texture with desired height, width and format.
-	TextureClass
-	(
-		unsigned width, 
-		unsigned height, 
-		WW3DFormat format,
-		MipCountType mip_level_count=MIP_LEVELS_ALL,
-		PoolType pool=POOL_MANAGED,
-		bool rendertarget=false,
-		bool allow_reduction=true
-	);
-
-	// Create texture from a file. If format is specified the texture is converted to that format.
-	// Note that the format must be supported by the current device and that a texture can't exist
-	// in the system with the same name in multiple formats.
-	TextureClass
-	(
-		const char *name,
-		const char *full_path=NULL,
-		MipCountType mip_level_count=MIP_LEVELS_ALL,
-		WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN,
-		bool allow_compression=true,
-		bool allow_reduction=true
-	);
-
-	// Create texture from a surface.
-	TextureClass
-	(
-		SurfaceClass *surface, 
-		MipCountType mip_level_count=MIP_LEVELS_ALL
-	);		
-
-	TextureClass(IDirect3DBaseTexture8* d3d_texture);
-
-	// defualt constructors for derived classes (cube & vol)
-	TextureClass
-	(
-		unsigned width,
-		unsigned height,
-		MipCountType mip_level_count=MIP_LEVELS_ALL,
-		PoolType pool=POOL_MANAGED,
-		bool rendertarget=false,
-		WW3DFormat format=WW3D_FORMAT_UNKNOWN,
-		bool allow_reduction=true
-	)
-	: TextureBaseClass(width,height,mip_level_count,pool,rendertarget,allow_reduction), TextureFormat(format), Filter(mip_level_count) { }
-
-	virtual TexAssetType Get_Asset_Type() const { return TEX_REGULAR; }
-
-	virtual void Init();
-
-	// Background texture loader will call this when texture has been loaded
-	virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false);	// If the parameter is true, the texture will be flagged as initialised
-
-	// Get the surface of one of the mipmap levels (defaults to highest-resolution one)
-	SurfaceClass *Get_Surface_Level(unsigned int level = 0);
-	IDirect3DSurface8 *Get_D3D_Surface_Level(unsigned int level = 0);
-	void Get_Level_Description( SurfaceClass::SurfaceDescription & desc, unsigned int level = 0 );
-	
-	TextureFilterClass& Get_Filter() { return Filter; }
-
-	WW3DFormat Get_Texture_Format() const { return TextureFormat; }
-
-	virtual void Apply(unsigned int stage);
-
-	virtual unsigned Get_Texture_Memory_Usage() const;
-
-	virtual TextureClass* As_TextureClass() { return this; }
-
-protected:
-
-	WW3DFormat				TextureFormat;
-
-	// legacy
-	TextureFilterClass	Filter;
-};
-
-class ZTextureClass : public TextureBaseClass
-{
-public:
-	// Create a z texture with desired height, width and format
-	ZTextureClass
-	(
-		unsigned width,
-		unsigned height,
-		WW3DZFormat zformat,
-		MipCountType mip_level_count=MIP_LEVELS_ALL,
-		PoolType pool=POOL_MANAGED
-	);
-
-	WW3DZFormat Get_Texture_Format() const { return DepthStencilTextureFormat; }
-
-	virtual TexAssetType Get_Asset_Type() const { return TEX_REGULAR; }
-
-	virtual void Init() {}
-
-	// Background texture loader will call this when texture has been loaded
-	virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false);	// If the parameter is true, the texture will be flagged as initialised
-
-	virtual void Apply(unsigned int stage);
-
-	IDirect3DSurface8 *Get_D3D_Surface_Level(unsigned int level = 0);
-	virtual unsigned Get_Texture_Memory_Usage() const;
-
-private:
-
-	WW3DZFormat DepthStencilTextureFormat;
-};
-
-class CubeTextureClass : public TextureClass
-{
-public:
-	// Create texture with desired height, width and format.
-	CubeTextureClass
-	(
-		unsigned width, 
-		unsigned height, 
-		WW3DFormat format,
-		MipCountType mip_level_count=MIP_LEVELS_ALL,
-		PoolType pool=POOL_MANAGED,
-		bool rendertarget=false,
-		bool allow_reduction=true
-	);
-
-	// Create texture from a file. If format is specified the texture is converted to that format.
-	// Note that the format must be supported by the current device and that a texture can't exist
-	// in the system with the same name in multiple formats.
-	CubeTextureClass
-	(
-		const char *name,
-		const char *full_path=NULL,
-		MipCountType mip_level_count=MIP_LEVELS_ALL,
-		WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN,
-		bool allow_compression=true,
-		bool allow_reduction=true
-	);
-
-	// Create texture from a surface.
-	CubeTextureClass
-	(
-		SurfaceClass *surface, 
-		MipCountType mip_level_count=MIP_LEVELS_ALL
-	);		
-
-	CubeTextureClass(IDirect3DBaseTexture8* d3d_texture);
-
-	virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false);	// If the parameter is true, the texture will be flagged as initialised
-
-	virtual TexAssetType Get_Asset_Type() const { return TEX_CUBEMAP; }
-
-	virtual CubeTextureClass* As_CubeTextureClass() { return this; }
-
-};
-
-class VolumeTextureClass : public TextureClass
-{
-public:
-	// Create texture with desired height, width and format.
-	VolumeTextureClass
-	(
-		unsigned width, 
-		unsigned height, 
-		unsigned depth,
-		WW3DFormat format,
-		MipCountType mip_level_count=MIP_LEVELS_ALL,
-		PoolType pool=POOL_MANAGED,
-		bool rendertarget=false,
-		bool allow_reduction=true
-	);
-
-	// Create texture from a file. If format is specified the texture is converted to that format.
-	// Note that the format must be supported by the current device and that a texture can't exist
-	// in the system with the same name in multiple formats.
-	VolumeTextureClass
-	(
-		const char *name,
-		const char *full_path=NULL,
-		MipCountType mip_level_count=MIP_LEVELS_ALL,
-		WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN,
-		bool allow_compression=true,
-		bool allow_reduction=true
-	);
-
-	// Create texture from a surface.
-	VolumeTextureClass
-	(
-		SurfaceClass *surface, 
-		MipCountType mip_level_count=MIP_LEVELS_ALL
-	);		
-
-	VolumeTextureClass(IDirect3DBaseTexture8* d3d_texture);
-
-	virtual void Apply_New_Surface(IDirect3DBaseTexture8* tex, bool initialized, bool disable_auto_invalidation = false);	// If the parameter is true, the texture will be flagged as initialised
-
-	virtual TexAssetType Get_Asset_Type() const { return TEX_VOLUME; }
-
-	virtual VolumeTextureClass* As_VolumeTextureClass() { return this; }
-
-protected:
-
-	int Depth;
-};
-
-// Utility functions for loading and saving texture descriptions from/to W3D files
-TextureClass *Load_Texture(ChunkLoadClass & cload);
-void Save_Texture(TextureClass * texture, ChunkSaveClass & csave);
-
-#endif //TEXTURE_H
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.cpp
deleted file mode 100644
index 3d2ebe11d8a..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: ww3d2/texturefilter.cpp												$*
- *                                                                                             *
- *                  $Org Author:: Kenny Mitchell                                              $*
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 08/05/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 1                                                          $*
- *                                                                                             *
- * 08/05/02 KM Texture filter class abstraction																			*
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include "texturefilter.h"
-#include "dx8wrapper.h"
-
-unsigned _MinTextureFilters[MAX_TEXTURE_STAGES][TextureFilterClass::FILTER_TYPE_COUNT];
-unsigned _MagTextureFilters[MAX_TEXTURE_STAGES][TextureFilterClass::FILTER_TYPE_COUNT];
-unsigned _MipMapFilters[MAX_TEXTURE_STAGES][TextureFilterClass::FILTER_TYPE_COUNT];
-
-/*************************************************************************
-**                             TextureFilterClass
-*************************************************************************/
-TextureFilterClass::TextureFilterClass(MipCountType mip_level_count=MIP_LEVELS_1)
-:	TextureMinFilter(FILTER_TYPE_DEFAULT),
-	TextureMagFilter(FILTER_TYPE_DEFAULT),
-	UAddressMode(TEXTURE_ADDRESS_REPEAT),
-	VAddressMode(TEXTURE_ADDRESS_REPEAT)
-{
-	if (mip_level_count!=MIP_LEVELS_1)
-	{
-		MipMapFilter=FILTER_TYPE_DEFAULT;
-	}
-	else
-	{
-		MipMapFilter=FILTER_TYPE_NONE;
-	}
-}
-
-//**********************************************************************************************
-//! Apply filters (legacy)
-/*!
-*/
-void TextureFilterClass::Apply(unsigned int stage)
-{
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,D3DTSS_MINFILTER,_MinTextureFilters[stage][TextureMinFilter]);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,D3DTSS_MAGFILTER,_MagTextureFilters[stage][TextureMagFilter]);
-	DX8Wrapper::Set_DX8_Texture_Stage_State(stage,D3DTSS_MIPFILTER,_MipMapFilters[stage][MipMapFilter]);
-
-	switch (Get_U_Addr_Mode()) 
-	{
-	case TEXTURE_ADDRESS_REPEAT:
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
-		break;
-
-	case TEXTURE_ADDRESS_CLAMP:
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);
-		break;
-	}
-
-	switch (Get_V_Addr_Mode()) 
-	{
-	case TEXTURE_ADDRESS_REPEAT:
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSV, D3DTADDRESS_WRAP);
-		break;
-
-	case TEXTURE_ADDRESS_CLAMP:
-		DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);
-		break;
-	}
-}
-
-//**********************************************************************************************
-//! Init filters (legacy)
-/*!
-*/
-void TextureFilterClass::_Init_Filters(TextureFilterMode filter_type)
-{
-	const D3DCAPS8& dx8caps=DX8Wrapper::Get_Current_Caps()->Get_DX8_Caps();
-
-#ifndef _XBOX
-   	_MinTextureFilters[0][FILTER_TYPE_NONE]=D3DTEXF_POINT;
-   	_MagTextureFilters[0][FILTER_TYPE_NONE]=D3DTEXF_POINT;
-   	_MipMapFilters[0][FILTER_TYPE_NONE]=D3DTEXF_NONE;
-   
-   	_MinTextureFilters[0][FILTER_TYPE_FAST]=D3DTEXF_LINEAR;
-   	_MagTextureFilters[0][FILTER_TYPE_FAST]=D3DTEXF_LINEAR;
-   	_MipMapFilters[0][FILTER_TYPE_FAST]=D3DTEXF_POINT;
-   
-   	_MagTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_POINT;
-   	_MinTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_POINT;
-   	_MipMapFilters[0][FILTER_TYPE_BEST]=D3DTEXF_POINT;
-#else
-	_MinTextureFilters[0][FILTER_TYPE_NONE]=D3DTEXF_ANISOTROPIC;
-	_MagTextureFilters[0][FILTER_TYPE_NONE]=D3DTEXF_ANISOTROPIC;
-	_MipMapFilters[0][FILTER_TYPE_NONE]=D3DTEXF_LINEAR;
-
-	_MinTextureFilters[0][FILTER_TYPE_FAST]=D3DTEXF_ANISOTROPIC;
-	_MagTextureFilters[0][FILTER_TYPE_FAST]=D3DTEXF_ANISOTROPIC;
-	_MipMapFilters[0][FILTER_TYPE_FAST]=D3DTEXF_LINEAR;
-
-	_MagTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_ANISOTROPIC;
-	_MinTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_ANISOTROPIC;
-	_MipMapFilters[0][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
-#endif
-
-#ifndef _XBOX
-	if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MAGFLINEAR) _MagTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
-	if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MINFLINEAR) _MinTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
-
-	// Set anisotropic filtering only if requested and available
-	if (filter_type==TEXTURE_FILTER_ANISOTROPIC) {
-		if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MAGFANISOTROPIC) _MagTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_ANISOTROPIC;
-		if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MINFANISOTROPIC) _MinTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_ANISOTROPIC;
-	}
-
-	// Set linear mip filter only if requested trilinear or anisotropic, and linear available
-	if (filter_type==TEXTURE_FILTER_ANISOTROPIC || filter_type==TEXTURE_FILTER_TRILINEAR) {
-		if (dx8caps.TextureFilterCaps&D3DPTFILTERCAPS_MIPFLINEAR) _MipMapFilters[0][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
-	}
-#endif
-
-	// For stages above zero, set best filter to the same as the stage zero, except if anisotropic
-	int i=1;
-	for (;i<MAX_TEXTURE_STAGES;++i) {
-/*		_MinTextureFilters[i][FILTER_TYPE_NONE]=D3DTEXF_POINT;
-		_MagTextureFilters[i][FILTER_TYPE_NONE]=D3DTEXF_POINT;
-		_MipMapFilters[i][FILTER_TYPE_NONE]=D3DTEXF_NONE;
-
-		_MinTextureFilters[i][FILTER_TYPE_FAST]=D3DTEXF_LINEAR;
-		_MagTextureFilters[i][FILTER_TYPE_FAST]=D3DTEXF_LINEAR;
-		_MipMapFilters[i][FILTER_TYPE_FAST]=D3DTEXF_POINT;
-
-		_MagTextureFilters[i][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
-		_MinTextureFilters[i][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
-		_MipMapFilters[i][FILTER_TYPE_BEST]=D3DTEXF_POINT;
-*/
-		_MinTextureFilters[i][FILTER_TYPE_NONE]=_MinTextureFilters[i-1][FILTER_TYPE_NONE];
-		_MagTextureFilters[i][FILTER_TYPE_NONE]=_MagTextureFilters[i-1][FILTER_TYPE_NONE];
-		_MipMapFilters[i][FILTER_TYPE_NONE]=_MipMapFilters[i-1][FILTER_TYPE_NONE];
-
-		_MinTextureFilters[i][FILTER_TYPE_FAST]=_MinTextureFilters[i-1][FILTER_TYPE_FAST];
-		_MagTextureFilters[i][FILTER_TYPE_FAST]=_MagTextureFilters[i-1][FILTER_TYPE_FAST];
-		_MipMapFilters[i][FILTER_TYPE_FAST]=_MipMapFilters[i-1][FILTER_TYPE_FAST];
-
-		if (_MagTextureFilters[i-1][FILTER_TYPE_BEST]==D3DTEXF_ANISOTROPIC) {
-			_MagTextureFilters[i][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
-		}
-		else {
-			_MagTextureFilters[i][FILTER_TYPE_BEST]=_MagTextureFilters[i-1][FILTER_TYPE_BEST];
-		}
-
-		if (_MinTextureFilters[i-1][FILTER_TYPE_BEST]==D3DTEXF_ANISOTROPIC) {
-			_MinTextureFilters[i][FILTER_TYPE_BEST]=D3DTEXF_LINEAR;
-		}
-		else {
-			_MinTextureFilters[i][FILTER_TYPE_BEST]=_MinTextureFilters[i-1][FILTER_TYPE_BEST];
-		}
-		_MipMapFilters[i][FILTER_TYPE_BEST]=_MipMapFilters[i-1][FILTER_TYPE_BEST];
-
-
-	}
-
-	// Set default to best. The level of best filter mode is controlled by the input parameter.
-	for (i=0;i<MAX_TEXTURE_STAGES;++i) {
-		_MinTextureFilters[i][FILTER_TYPE_DEFAULT]=_MinTextureFilters[i][FILTER_TYPE_BEST];
-		_MagTextureFilters[i][FILTER_TYPE_DEFAULT]=_MagTextureFilters[i][FILTER_TYPE_BEST];
-		_MipMapFilters[i][FILTER_TYPE_DEFAULT]=_MipMapFilters[i][FILTER_TYPE_BEST];
-
-		DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_MAXANISOTROPY,2);
-	}
-
-}
-
-
-//**********************************************************************************************
-//! Set mip mapping filter (legacy)
-/*!
-*/
-void TextureFilterClass::Set_Mip_Mapping(FilterType mipmap)
-{
-//	if (mipmap != FILTER_TYPE_NONE && Get_Mip_Level_Count() <= 1 && Is_Initialized()) 
-//	{
-//		WWASSERT_PRINT(0, "Trying to enable MipMapping on texture w/o Mip levels!\n");
-//		return;
-//	}
-	MipMapFilter=mipmap;
-}
-
-//**********************************************************************************************
-//! Set default min filter (legacy)
-/*!
-*/
-void TextureFilterClass::_Set_Default_Min_Filter(FilterType filter)
-{
-	for (int i=0;i<MAX_TEXTURE_STAGES;++i) 
-	{
-		_MinTextureFilters[i][FILTER_TYPE_DEFAULT]=_MinTextureFilters[i][filter];
-	}
-}
-
-
-//**********************************************************************************************
-//! Set default mag filter (legacy)
-/*!
-*/
-void TextureFilterClass::_Set_Default_Mag_Filter(FilterType filter)
-{
-	for (int i=0;i<MAX_TEXTURE_STAGES;++i) 
-	{
-		_MagTextureFilters[i][FILTER_TYPE_DEFAULT]=_MagTextureFilters[i][filter];
-	}
-}
-
-//**********************************************************************************************
-//! Set default mip filter (legacy)
-/*!
-*/
-void TextureFilterClass::_Set_Default_Mip_Filter(FilterType filter)
-{
-	for (int i=0;i<MAX_TEXTURE_STAGES;++i) 
-	{
-		_MipMapFilters[i][FILTER_TYPE_DEFAULT]=_MipMapFilters[i][filter];
-	}
-}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h
deleted file mode 100644
index 6bee63ba666..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : WW3D                                                         *
- *                                                                                             *
- *                     $Archive:: ww3d2/texturefilter.h												$*
- *                                                                                             *
- *                  $Org Author:: Kenny Mitchell                                              $*
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 08/05/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 1                                                          $*
- *                                                                                             *
- * 08/05/02 KM Texture filter class abstraction																			*
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#ifndef TEXTUREFILTER_H
-#define TEXTUREFILTER_H
-
-#ifndef DX8_WRAPPER_H
-//#include "dx8wrapper.h"
-#endif
-
-enum MipCountType 
-{
-	MIP_LEVELS_ALL=0,		// generate all mipmap levels down to 1x1 size
-	MIP_LEVELS_1,			// no mipmapping at all (just one mip level)
-	MIP_LEVELS_2,
-	MIP_LEVELS_3,
-	MIP_LEVELS_4,
-	MIP_LEVELS_5,
-	MIP_LEVELS_6,
-	MIP_LEVELS_7,
-	MIP_LEVELS_8,
-	MIP_LEVELS_10,
-	MIP_LEVELS_11,
-	MIP_LEVELS_12,
-	MIP_LEVELS_MAX			// This isn't to be used (use MIP_LEVELS_ALL instead), it is just an enum for creating static tables etc.
-};
-
-
-// NOTE: Since "texture wrapping" (NOT TEXTURE WRAP MODE - THIS IS
-// SOMETHING ELSE) is a global state that affects all texture stages,
-// and this class only affects its own stage, we will not worry about
-// it for now. Later (probably when we implement world-oriented
-// environment maps) we will consider where to put it.
-
-// This is legacy and should be phased out into wwshade shader states
-// keeping as an abstracted class for now to support this transition later
-class TextureFilterClass
-{
-public:
-
-	enum FilterType 
-	{
-		FILTER_TYPE_NONE,
-		FILTER_TYPE_FAST,
-		FILTER_TYPE_BEST,
-		FILTER_TYPE_DEFAULT,
-		FILTER_TYPE_COUNT
-	};
-
-	enum TextureFilterMode
-	{
-		TEXTURE_FILTER_BILINEAR,
-		TEXTURE_FILTER_TRILINEAR,
-		TEXTURE_FILTER_ANISOTROPIC
-	};
-
-	enum TxtAddrMode
-	{
-		TEXTURE_ADDRESS_REPEAT=0,
-		TEXTURE_ADDRESS_CLAMP
-	};
-
-	TextureFilterClass(MipCountType mip_level_count);
-
-	void Apply(unsigned int stage);
-
-	// Filter and MIPmap settings:
-	FilterType Get_Min_Filter(void) const { return TextureMinFilter; }
-	FilterType Get_Mag_Filter(void) const { return TextureMagFilter; }
-	FilterType Get_Mip_Mapping(void) const { return MipMapFilter; }
-	void Set_Min_Filter(FilterType filter) { TextureMinFilter=filter; }
-	void Set_Mag_Filter(FilterType filter) { TextureMagFilter=filter; }
-	void Set_Mip_Mapping(FilterType mipmap);
-
-	// Texture address mode
-	TxtAddrMode Get_U_Addr_Mode(void) const { return UAddressMode; }
-	TxtAddrMode Get_V_Addr_Mode(void) const { return VAddressMode; }
-	void Set_U_Addr_Mode(TxtAddrMode mode) { UAddressMode=mode; }
-	void Set_V_Addr_Mode(TxtAddrMode mode) { VAddressMode=mode; }
-
-	// This needs to be called after device has been created
-	static void _Init_Filters(TextureFilterMode texture_filter);
-
-	static void _Set_Default_Min_Filter(FilterType filter);
-	static void _Set_Default_Mag_Filter(FilterType filter);
-	static void _Set_Default_Mip_Filter(FilterType filter);
-
-private:
-	// State not contained in the Direct3D texture object:
-	FilterType TextureMinFilter;
-	FilterType TextureMagFilter;
-	FilterType MipMapFilter;
-	TxtAddrMode UAddressMode;
-	TxtAddrMode VAddressMode;
-};
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
deleted file mode 100644
index de38599c400..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
+++ /dev/null
@@ -1,2823 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : DX8 Texture Manager                                          *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/textureloader.h                            $*
- *                                                                                             *
- *              Original Author:: vss_sync                                                   *
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *								$Modtime:: 08/05/02 10:03a                                             $*
- *                                                                                             *
- *                    $Revision:: 3                                                           $*
- *                                                                                             *
- * 06/27/02 KM Texture class abstraction																			*
- * 08/05/02 KM Texture class redesign (revisited)
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#include "textureloader.h"
-#include "mutex.h"
-#include "thread.h"
-#include "wwdebug.h"
-#include "texture.h"
-#include "ffactory.h"
-#include "wwstring.h"
-#include	"bufffile.h"
-#include "ww3d.h"
-#include "assetmgr.h"
-#include "dx8wrapper.h"
-#include "dx8caps.h"
-#include "missingtexture.h"
-#include "TARGA.H"
-#include <d3dx8tex.h>
-#include <cstdio>
-#include "wwmemlog.h"
-#include "texture.h"
-#include "formconv.h"
-#include "texturethumbnail.h"
-#include "ddsfile.h"
-#include "bitmaphandler.h"
-#include "wwprofile.h"
-
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-
-bool TextureLoader::TextureLoadSuspended;
-int TextureLoader::TextureInactiveOverrideTime = 0;
-
-#define USE_MANAGED_TEXTURES
-
-////////////////////////////////////////////////////////////////////////////////
-// 
-// TextureLoadTaskListClass implementation
-// 
-////////////////////////////////////////////////////////////////////////////////
-
-TextureLoadTaskListClass::TextureLoadTaskListClass(void)
-: Root()
-{
-	Root.Next = Root.Prev = &Root;
-}
-
-void TextureLoadTaskListClass::Push_Front	(TextureLoadTaskClass *task)
-{
-	// task should non-null and not on any list
-	WWASSERT(task != NULL && task->Next == NULL && task->Prev == NULL);
-
-	// update inserted task to point to list
-	task->Next			= Root.Next;
-	task->Prev			= &Root;
-	task->List			= this;
-
-	// update list to point to inserted task
-	Root.Next->Prev	= task;
-	Root.Next			= task;
-}
-
-void TextureLoadTaskListClass::Push_Back(TextureLoadTaskClass *task)
-{
-	// task should be non-null and not on any list
-	WWASSERT(task != NULL && task->Next == NULL && task->Prev == NULL);
-
-	// update inserted task to point to list
-	task->Next			= &Root;
-	task->Prev			= Root.Prev;
-	task->List			= this;
-
-	// update list to point to inserted task
-	Root.Prev->Next	= task;
-	Root.Prev			= task;
-}
-
-TextureLoadTaskClass *TextureLoadTaskListClass::Pop_Front(void)
-{
-	// exit early if list is empty
-	if (Is_Empty()) {
-		return 0;
-	}
-
-	// otherwise, grab first task and remove it.
-	TextureLoadTaskClass *task = (TextureLoadTaskClass *)Root.Next;
-	Remove(task);
-	return task;
-
-}
-
-TextureLoadTaskClass *TextureLoadTaskListClass::Pop_Back(void)
-{
-	// exit early if list is empty
-	if (Is_Empty()) { 
-		return 0;
-	}
-
-	// otherwise, grab last task and remove it.
-	TextureLoadTaskClass *task = (TextureLoadTaskClass *)Root.Prev;
-	Remove(task);
-	return task;
-}
-
-void TextureLoadTaskListClass::Remove(TextureLoadTaskClass *task)
-{
-	// exit early if task is not on this list.
-	if (task->List != this) {
-		return;
-	}
-
-	// update list to skip task
-	task->Prev->Next = task->Next;
-	task->Next->Prev = task->Prev;
-
-	// update task to no longer point at list
-	task->Prev	= 0;
-	task->Next	= 0;
-	task->List	= 0;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// 
-// SynchronizedTextureLoadTaskListClass implementation
-// 
-////////////////////////////////////////////////////////////////////////////////
-
-SynchronizedTextureLoadTaskListClass::SynchronizedTextureLoadTaskListClass(void)
-:	TextureLoadTaskListClass(),
-	CriticalSection()
-{
-}
-
-void SynchronizedTextureLoadTaskListClass::Push_Front(TextureLoadTaskClass *task)
-{
-	FastCriticalSectionClass::LockClass lock(CriticalSection);
-	TextureLoadTaskListClass::Push_Front(task);
-}
-
-void SynchronizedTextureLoadTaskListClass::Push_Back(TextureLoadTaskClass *task)
-{
-	FastCriticalSectionClass::LockClass lock(CriticalSection);
-	TextureLoadTaskListClass::Push_Back(task);
-}
-
-TextureLoadTaskClass *SynchronizedTextureLoadTaskListClass::Pop_Front(void)
-{
-	// this duplicates code inside base class, but saves us an unnecessary lock.
-	if (Is_Empty()) {
-		return 0;
-	}
-
-	FastCriticalSectionClass::LockClass lock(CriticalSection);
-	return TextureLoadTaskListClass::Pop_Front();
-
-}
-
-TextureLoadTaskClass *SynchronizedTextureLoadTaskListClass::Pop_Back(void)
-{
-	// this duplicates code inside base class, but saves us an unnecessary lock.
-	if (Is_Empty()) {
-		return 0;
-	}
-
-	FastCriticalSectionClass::LockClass lock(CriticalSection);
-	return TextureLoadTaskListClass::Pop_Back();
-}
-
-void SynchronizedTextureLoadTaskListClass::Remove(TextureLoadTaskClass *task)
-{
-	FastCriticalSectionClass::LockClass lock(CriticalSection);
-	TextureLoadTaskListClass::Remove(task);
-}
-
-
-// Locks
-
-// To prevent deadlock, threads should acquire locks in the order in which
-// they are defined below. No ordering is necessary for the task list locks,
-// since one thread can never hold two at once.
-
-static FastCriticalSectionClass					_ForegroundCriticalSection;
-static FastCriticalSectionClass					_BackgroundCriticalSection;
-
-// Lists
-
-static SynchronizedTextureLoadTaskListClass	_ForegroundQueue;
-static SynchronizedTextureLoadTaskListClass	_BackgroundQueue;
-
-static TextureLoadTaskListClass					_TexLoadFreeList;
-static TextureLoadTaskListClass					_CubeTexLoadFreeList;
-static TextureLoadTaskListClass					_VolTexLoadFreeList;
-
-
-// The background texture loading thread.
-static class LoaderThreadClass : public ThreadClass
-{
-public:
-#ifdef Exception_Handler
-	LoaderThreadClass(const char *thread_name = "Texture loader thread") : ThreadClass(thread_name, &Exception_Handler) {}
-#else
-	LoaderThreadClass(const char *thread_name = "Texture loader thread") : ThreadClass(thread_name) {}
-#endif
-
-	void Thread_Function();
-} _TextureLoadThread;
-
-
-// TODO: Legacy - remove this call!
-IDirect3DTexture8* Load_Compressed_Texture(
-	const StringClass& filename,
-	unsigned reduction_factor,
-	MipCountType mip_level_count,
-	WW3DFormat dest_format)
-{
-	// If DDS file isn't available, use TGA file to convert to DDS.
-
-	DDSFileClass dds_file(filename,reduction_factor);
-	if (!dds_file.Is_Available()) return NULL;
-	if (!dds_file.Load()) return NULL;
-
-	unsigned width=dds_file.Get_Width(0);
-	unsigned height=dds_file.Get_Height(0);
-	unsigned mips=dds_file.Get_Mip_Level_Count();
-
-	// If format isn't defined get the nearest valid texture format to the compressed file format
-	// Note that the nearest valid format could be anything, even uncompressed.
-	if (dest_format==WW3D_FORMAT_UNKNOWN) dest_format=Get_Valid_Texture_Format(dds_file.Get_Format(),true);
-
-	IDirect3DTexture8* d3d_texture = DX8Wrapper::_Create_DX8_Texture
-	(
-		width,
-		height,
-		dest_format,
-		(MipCountType)mips
-	);
-
-	for (unsigned level=0;level<mips;++level) {
-		IDirect3DSurface8* d3d_surface=NULL;
-		WWASSERT(d3d_texture);
-		DX8_ErrorCode(d3d_texture->GetSurfaceLevel(level/*-reduction_factor*/,&d3d_surface));
-		dds_file.Copy_Level_To_Surface(level,d3d_surface);
-		d3d_surface->Release();
-	}
-	return d3d_texture;
-}
-
-static bool Is_Format_Compressed(WW3DFormat texture_format,bool allow_compression)
-{
-	// Verify that the user isn't requesting compressed texture without hardware support
-
-	bool compressed=false;
-	if (texture_format!=WW3D_FORMAT_UNKNOWN) {
-		if (!DX8Wrapper::Get_Current_Caps()->Support_DXTC() || !allow_compression) {
-			WWASSERT(texture_format!=WW3D_FORMAT_DXT1);
-			WWASSERT(texture_format!=WW3D_FORMAT_DXT2);
-			WWASSERT(texture_format!=WW3D_FORMAT_DXT3);
-			WWASSERT(texture_format!=WW3D_FORMAT_DXT4);
-			WWASSERT(texture_format!=WW3D_FORMAT_DXT5);
-		}
-		if (texture_format==WW3D_FORMAT_DXT1 ||
-			texture_format==WW3D_FORMAT_DXT2 ||
-			texture_format==WW3D_FORMAT_DXT3 ||
-			texture_format==WW3D_FORMAT_DXT4 ||
-			texture_format==WW3D_FORMAT_DXT5) {
-			compressed=true;
-		}
-	}
-
-	// If hardware supports DXTC compression, load a compressed texture. Proceed only if the texture format hasn't been
-	// defined as non-compressed.
-	compressed|=(
-		texture_format==WW3D_FORMAT_UNKNOWN &&
-		DX8Wrapper::Get_Current_Caps()->Support_DXTC() &&
-		allow_compression);
-
-	return compressed;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// 
-// TextureLoader implementation
-// 
-////////////////////////////////////////////////////////////////////////////////
-
-void TextureLoader::Init()
-{
-	WWASSERT(!_TextureLoadThread.Is_Running());
-
-	ThumbnailManagerClass::Init();
-
-	_TextureLoadThread.Execute();
-	_TextureLoadThread.Set_Priority(-4);
-	TextureInactiveOverrideTime = 0;
-}
-
-
-void TextureLoader::Deinit()
-{
-	FastCriticalSectionClass::LockClass lock(_BackgroundCriticalSection);
-	_TextureLoadThread.Stop();
-
-	ThumbnailManagerClass::Deinit();
-	TextureLoadTaskClass::Delete_Free_Pool();
-}
-
-
-bool TextureLoader::Is_DX8_Thread(void)
-{
-	return (ThreadClass::_Get_Current_Thread_ID() == DX8Wrapper::_Get_Main_Thread_ID());
-}
-
-
-// ----------------------------------------------------------------------------
-//
-// Modify given texture size to nearest valid size on current hardware.
-//
-// ----------------------------------------------------------------------------
-
-void TextureLoader::Validate_Texture_Size
-(
-	unsigned& width, 
-	unsigned& height,
-	unsigned& depth
-)
-{
-	const D3DCAPS8& dx8caps=DX8Wrapper::Get_Current_Caps()->Get_DX8_Caps();
-
-	unsigned poweroftwowidth = 1;
-	while (poweroftwowidth < width) 
-	{
-		poweroftwowidth <<= 1;
-	}
-
-	unsigned poweroftwoheight = 1;
-	while (poweroftwoheight < height) 
-	{
-		poweroftwoheight <<= 1;
-	}
-
-	unsigned poweroftwodepth = 1;
-	while (poweroftwodepth< depth)
-	{
-		poweroftwodepth <<= 1;
-	}
-
-	if (poweroftwowidth>dx8caps.MaxTextureWidth) 
-	{
-		poweroftwowidth=dx8caps.MaxTextureWidth;
-	}
-	if (poweroftwoheight>dx8caps.MaxTextureHeight) 
-	{
-		poweroftwoheight=dx8caps.MaxTextureHeight;
-	}
-	if (poweroftwodepth>dx8caps.MaxVolumeExtent)
-	{
-		poweroftwodepth=dx8caps.MaxVolumeExtent;
-	}
-
-	if (poweroftwowidth>poweroftwoheight) 
-	{
-		while (poweroftwowidth/poweroftwoheight>8) 
-		{
-			poweroftwoheight*=2;
-		}
-	}
-	else 
-	{
-		while (poweroftwoheight/poweroftwowidth>8) 
-		{
-			poweroftwowidth*=2;
-		}
-	}
-
-	width=poweroftwowidth;
-	height=poweroftwoheight;
-	depth=poweroftwodepth;
-}
-
-IDirect3DTexture8* TextureLoader::Load_Thumbnail(const StringClass& filename, const Vector3& hsv_shift)//,WW3DFormat texture_format)
-{
-	WWASSERT(Is_DX8_Thread());
-
-	ThumbnailClass* thumb=NULL;
-	thumb=ThumbnailManagerClass::Peek_Thumbnail_Instance_From_Any_Manager(filename);
-
-	// If no thumb is found return a missing texture
-	if (!thumb) {
-		return MissingTexture::_Get_Missing_Texture();
-	}
-
-	WWASSERT(thumb->Get_Format()==WW3D_FORMAT_A4R4G4B4);
-	unsigned src_pitch=thumb->Get_Width()*2;	// Thumbs are always 16 bits
-	WW3DFormat dest_format;
-	WW3DFormat texture_format=WW3D_FORMAT_UNKNOWN;
-	if (texture_format==WW3D_FORMAT_UNKNOWN) {
-		dest_format=Get_Valid_Texture_Format(WW3D_FORMAT_A4R4G4B4,false); // no compressed formats please
-	}
-	else {
-		dest_format=Get_Valid_Texture_Format(texture_format,false);	// no compressed formats please
-		WWASSERT(dest_format==texture_format);
-	}
-
-	IDirect3DTexture8* sysmem_texture = DX8Wrapper::_Create_DX8_Texture(
-		thumb->Get_Width(),
-		thumb->Get_Height(),
-		dest_format,
-		MIP_LEVELS_ALL,
-#ifdef USE_MANAGED_TEXTURES
-		D3DPOOL_MANAGED);
-#else
-		D3DPOOL_SYSTEMMEM);
-#endif
-
-	unsigned level=0;
-	D3DLOCKED_RECT locked_rects[12];
-	WWASSERT(sysmem_texture->GetLevelCount()<=12);
-
-	// Lock all surfaces
-	for (level=0;level<sysmem_texture->GetLevelCount();++level) {
-		DX8_ErrorCode(
-			sysmem_texture->LockRect(
-				level,
-				&locked_rects[level],
-				NULL,
-				0));
-	}
-
-	unsigned char* src_surface=thumb->Peek_Bitmap();
-	WW3DFormat src_format=thumb->Get_Format();
-	unsigned width=thumb->Get_Width();
-	unsigned height=thumb->Get_Height();
-
-	Vector3 hsv=hsv_shift;
-	for (level=0;level<sysmem_texture->GetLevelCount()-1;++level) {
-		BitmapHandlerClass::Copy_Image_Generate_Mipmap(
-			width,
-			height,
-			(unsigned char*)locked_rects[level].pBits,
-			locked_rects[level].Pitch,
-			dest_format,
-			src_surface,
-			src_pitch,
-			src_format,
-			(unsigned char*)locked_rects[level+1].pBits,	// mipmap
-			locked_rects[level+1].Pitch,
-			hsv);
-		hsv=Vector3(0.0f,0.0f,0.0f);	// Only do the shift for the first level, as the mipmaps are based on it.
-
-		src_format=dest_format;
-		src_surface=(unsigned char*)locked_rects[level].pBits;
-		src_pitch=locked_rects[level].Pitch;
-		width>>=1;
-		height>>=1;
-	}
-
-	// Unlock all surfaces
-	for (level=0;level<sysmem_texture->GetLevelCount();++level) {
-		DX8_ErrorCode(sysmem_texture->UnlockRect(level));
-	}
-#ifdef USE_MANAGED_TEXTURES
-	return sysmem_texture;
-#else
-	IDirect3DTexture8* d3d_texture = DX8Wrapper::_Create_DX8_Texture(
-		thumb->Get_Width(),
-		thumb->Get_Height(),
-		dest_format,
-		TextureBaseClass::MIP_LEVELS_ALL,
-		D3DPOOL_DEFAULT);
-	DX8CALL(UpdateTexture(sysmem_texture,d3d_texture));
-	sysmem_texture->Release();
-
-	WWDEBUG_SAY(("Created non-managed texture (%s)\n",filename));
-	return d3d_texture;
-#endif
-}
-
-
-// ----------------------------------------------------------------------------
-//
-// Load image to a surface. The function tries to create texture that matches
-// targa format. If suitable format is not available, it selects closest matching
-// format and performs color space conversion.
-//
-// ----------------------------------------------------------------------------
-IDirect3DSurface8* TextureLoader::Load_Surface_Immediate(
-	const StringClass& filename,
-	WW3DFormat texture_format,
-	bool allow_compression)
-{
-	WWASSERT(Is_DX8_Thread());
-
-	bool compressed=Is_Format_Compressed(texture_format,allow_compression);
-
-	if (compressed) {
-		IDirect3DTexture8* comp_tex=Load_Compressed_Texture(filename,0,MIP_LEVELS_1,WW3D_FORMAT_UNKNOWN);
-		if (comp_tex) {
-			IDirect3DSurface8* d3d_surface=NULL;
-			DX8_ErrorCode(comp_tex->GetSurfaceLevel(0,&d3d_surface));
-			comp_tex->Release();
-			return d3d_surface;
-		}
-	}
-
-	// Make sure the file can be opened. If not, return missing texture.
-	Targa targa;
-	if (TARGA_ERROR_HANDLER(targa.Open(filename, TGA_READMODE),filename)) return MissingTexture::_Create_Missing_Surface();
-
-	// DX8 uses image upside down compared to TGA
-	targa.Header.ImageDescriptor ^= TGAIDF_YORIGIN;
-
-	WW3DFormat src_format,dest_format;
-	unsigned src_bpp=0;
-	Get_WW3D_Format(dest_format,src_format,src_bpp,targa);
-
-	if (texture_format!=WW3D_FORMAT_UNKNOWN) {
-		dest_format=texture_format;
-	}
-
-	// Destination size will be the next power of two square from the larger width and height...
-	unsigned width, height;
-	width=targa.Header.Width;
-	height=targa.Header.Height;
-	unsigned src_width=targa.Header.Width;
-	unsigned src_height=targa.Header.Height;
-
-	// NOTE: We load the palette but we do not yet support paletted textures!
-	char palette[256*4];
-	targa.SetPalette(palette);
-	if (TARGA_ERROR_HANDLER(targa.Load(filename, TGAF_IMAGE, false),filename)) return MissingTexture::_Create_Missing_Surface();
-
-	unsigned char* src_surface=(unsigned char*)targa.GetImage();
-
-	// No paletted destination format allowed
-	unsigned char* converted_surface=NULL;
-	if (src_format==WW3D_FORMAT_A1R5G5B5 || src_format==WW3D_FORMAT_R5G6B5 || src_format==WW3D_FORMAT_A4R4G4B4 ||
-		src_format==WW3D_FORMAT_P8 || src_format==WW3D_FORMAT_L8 || src_width!=width || src_height!=height) {
-		converted_surface=W3DNEWARRAY unsigned char[width*height*4];
-		dest_format=Get_Valid_Texture_Format(WW3D_FORMAT_A8R8G8B8,false);
-		BitmapHandlerClass::Copy_Image(
-			converted_surface,
-			width,
-			height,
-			width*4,
-			WW3D_FORMAT_A8R8G8B8,//dest_format,
-			src_surface,
-			src_width,
-			src_height,
-			src_width*src_bpp,
-			src_format,
-			(unsigned char*)targa.GetPalette(),
-			targa.Header.CMapDepth>>3,
-			false);
-		src_surface=converted_surface;
-		src_format=WW3D_FORMAT_A8R8G8B8;//dest_format;
-		src_width=width;
-		src_height=height;
-		src_bpp=Get_Bytes_Per_Pixel(src_format);
-	}
-
-	unsigned src_pitch=src_width*src_bpp;
-
-	IDirect3DSurface8* d3d_surface = DX8Wrapper::_Create_DX8_Surface(width,height,dest_format);
-	WWASSERT(d3d_surface);
-	D3DLOCKED_RECT locked_rect;
-	DX8_ErrorCode(
-		d3d_surface->LockRect(
-			&locked_rect,
-			NULL,
-			0));
-
-	BitmapHandlerClass::Copy_Image(
-		(unsigned char*)locked_rect.pBits,
-		width,
-		height,
-		locked_rect.Pitch,
-		dest_format,
-		src_surface,
-		src_width,
-		src_height,
-		src_pitch,
-		src_format,
-		(unsigned char*)targa.GetPalette(),
-		targa.Header.CMapDepth>>3,
-		false);	// No mipmap
-
-	DX8_ErrorCode(d3d_surface->UnlockRect());
-
-	if (converted_surface) delete[] converted_surface;
-
-	return d3d_surface;
-}
-
-
-void TextureLoader::Request_Thumbnail(TextureBaseClass *tc)
-{
-	// Grab the foreground lock. This prevents the foreground thread
-	// from retiring any tasks related to this texture. It also
-	// serializes calls to Request_Thumbnail from multiple threads.
-	FastCriticalSectionClass::LockClass lock(_ForegroundCriticalSection);
-
-	// Has a Direct3D texture already been loaded?
-	if (tc->Peek_D3D_Base_Texture()) {
-		return;
-	}
-
-	TextureLoadTaskClass *task = tc->ThumbnailLoadTask;
-
-	if (Is_DX8_Thread()) {
-		// load the thumbnail immediately
-		TextureLoader::Load_Thumbnail(tc);
-
-		// clear any pending thumbnail load
-		if (task) {
-			_ForegroundQueue.Remove(task);
-			task->Destroy();
-		}
-
-	} else {
-		TextureLoadTaskClass *load_task = tc->TextureLoadTask;
-
-		// if texture is not already loading a thumbnail and there is no
-		// background load near completion. (a background load waiting
-		// to be applied will be ready at the same time as a queued thumbnail.
-		// Why do the extra work?)
-		if (!task && (!load_task || load_task->Get_State() < TextureLoadTaskClass::STATE_LOAD_MIPMAP)) {
-
-			// create a thumbnail load task and add to foreground queue.
-			task = TextureLoadTaskClass::Create(tc, TextureLoadTaskClass::TASK_THUMBNAIL, TextureLoadTaskClass::PRIORITY_LOW);
-			_ForegroundQueue.Push_Back(task);
-		}
-	}
-}
-
-
-void TextureLoader::Request_Background_Loading(TextureBaseClass *tc)
-{
-	WWPROFILE(("TextureLoader::Request_Background_Loading()"));
-	// Grab the foreground lock. This prevents the foreground thread
-	// from retiring any tasks related to this texture. It also 
-	// serializes calls to Request_Background_Loading from other
-	// threads.
-	FastCriticalSectionClass::LockClass foreground_lock(_ForegroundCriticalSection);
-
-	// Has the texture already been loaded?
-	if (tc->Is_Initialized()) {
-		return;
-	}
-
-	TextureLoadTaskClass *task = tc->TextureLoadTask;
-
-	// if texture already has a load task, we don't need to create another one.
-	if (task) {
-		return;
-	}
-
-	task = TextureLoadTaskClass::Create(tc, TextureLoadTaskClass::TASK_LOAD, TextureLoadTaskClass::PRIORITY_LOW);
-	
-	if (Is_DX8_Thread()) {
-		Begin_Load_And_Queue(task);
-	} else {
-		_ForegroundQueue.Push_Back(task);
-	}
-}
-
-
-void TextureLoader::Request_Foreground_Loading(TextureBaseClass *tc)
-{
-	WWPROFILE(("TextureLoader::Request_Foreground_Loading()"));
-	// Grab the foreground lock. This prevents the foreground thread
-	// from retiring the load tasks for this texture. It also 
-	// serializes calls to Request_Foreground_Loading from other
-	// threads.
-	FastCriticalSectionClass::LockClass foreground_lock(_ForegroundCriticalSection);
-
-	// Has the texture already been loaded?
-	if (tc->Is_Initialized()) {
-		return;
-	}
-
-	TextureLoadTaskClass *task			= tc->TextureLoadTask;
-	TextureLoadTaskClass *task_thumb = tc->ThumbnailLoadTask;
-
-	if (Is_DX8_Thread()) {
-
-		// since we're in the DX8 thread, we can load the entire
-		// texture right now.
-
-		// if we have a thumbnail task waiting, kill it.
-		if (task_thumb) {
-			_ForegroundQueue.Remove(task_thumb);
-			task_thumb->Destroy();
-		}
-
-		if (task) {
-			// we need to remove the task from any queue, since we're going
-			// to finish it up right now.
-
-			// halt background thread. After we're holding this lock,
-			// we know the background thread cannot begin loading
-			// mipmap levels for this texture.
-			FastCriticalSectionClass::LockClass background_lock(_BackgroundCriticalSection);
-			_ForegroundQueue.Remove(task);
-			_BackgroundQueue.Remove(task);
-		} else {
-			// Since the task manages all the state associated with loading
-			// a texture, we temporarily create one.
-			task = TextureLoadTaskClass::Create(tc, TextureLoadTaskClass::TASK_LOAD, TextureLoadTaskClass::PRIORITY_HIGH);
-		}
-
-		// finish loading the task and destroy it.
-		task->Finish_Load();
-		task->Destroy();
-
-	} else {
-		// we are not in the DX8 thread. We need to add a high-priority loading
-		// task to the foreground queue.
-
-		// Grab the background lock. After we're holding this lock, we
-		// know the background thread cannot begin loading mipmap levels 
-		// for this texture.
-		FastCriticalSectionClass::LockClass background_lock(_BackgroundCriticalSection);
-
-		// if we have a thumbnail task, we should cancel it. Since we are not
-		// the foreground thread, we are not allowed to call Destroy(). Instead,
-		// leave it queued in the completed state so it will be destroyed by Update().
-		if (task_thumb) {
-			task_thumb->Set_State(TextureLoadTaskClass::STATE_COMPLETE);
-		}
-
-		if (task) {
-			// if a load task is waiting on the background queue, we need to 
-			// move it to the foreground queue.
-			if (task->Get_List() == &_BackgroundQueue) {
-
-				// remove task from list
-				_BackgroundQueue.Remove(task);
-
-				// add to foreground queue.
-				_ForegroundQueue.Push_Back(task);
-			}
-
-			// upgrade the task priority
-			task->Set_Priority(TextureLoadTaskClass::PRIORITY_HIGH);
-
-		} else {
-			// allocate high priority load task
-			task = TextureLoadTaskClass::Create(tc, TextureLoadTaskClass::TASK_LOAD, TextureLoadTaskClass::PRIORITY_HIGH);
-
-			// add to back of foreground queue.
-			_ForegroundQueue.Push_Back(task);
-		}
-	}
-}
-
-
-void TextureLoader::Flush_Pending_Load_Tasks(void)
-{
-	// This function can only be called from the main thread.
-	// (Only the main thread can make the DX8 calls necessary
-	// to complete texture loading. If we wanted to flush
-	// the pending tasks from another thread, we'd probably
-	// want to set a bool that is checked by Update().
-	WWASSERT(Is_DX8_Thread());
-
-	for (;;) {
-		bool done = false;
-
-		{
-			// we have no pending load tasks when both queues are empty
-			// and the background thread is not processing a texture.
-			
-			// Grab the background lock. Once we're holding it, we
-			// know that the background thread is not processing any
-			// textures.
-
-			// NOTE: It's important that we do only hold on to the background
-			// lock while we check for completion. Otherwise, we will either
-			// violate the lock order when we call Update() (which grabs
-			// the foreground lock) or never give the background thread
-			// a chance to empty its queue.
-			FastCriticalSectionClass::LockClass background_lock(_BackgroundCriticalSection);
-			done = _BackgroundQueue.Is_Empty() && _ForegroundQueue.Is_Empty();
-		}
-
-		// exit loop if no entries in list
-		if (done) {
-			break;
-		}
-
-		Update();
-		ThreadClass::Switch_Thread();
-	}
-}
-
-
-// Nework update macro for texture loader.
-#pragma warning(disable:4201) // warning C4201: nonstandard extension used : nameless struct/union
-#include <mmsystem.h>
-#define UPDATE_NETWORK 											\
-	if (network_callback) {                            \
-		unsigned long time2 = timeGetTime();            \
-		if (time2 - time > 20) {                        \
-			network_callback();                          \
-			time = time2;                                \
-		}                                               \
-	}                                                  \
-
-
-void TextureLoader::Update(void (*network_callback)(void))
-{
-	WWASSERT_PRINT(Is_DX8_Thread(), "TextureLoader::Update must be called from the main thread!");
-
-	if (TextureLoadSuspended) {
-		return;
-	}
-
-	// grab foreground lock to prevent any other thread from
-	// modifying texture tasks.
-	FastCriticalSectionClass::LockClass lock(_ForegroundCriticalSection);
-
-	unsigned long time = timeGetTime();
-
-	// while we have tasks on the foreground queue
-	while (TextureLoadTaskClass *task = _ForegroundQueue.Pop_Front()) {
-		UPDATE_NETWORK;
-		// dispatch to proper task handler
-		switch (task->Get_Type()) {
-			case TextureLoadTaskClass::TASK_THUMBNAIL:
-				Process_Foreground_Thumbnail(task);
-				break;
-
-			case TextureLoadTaskClass::TASK_LOAD:
-				Process_Foreground_Load(task);
-				break;
-		}
-	}
-
-	TextureBaseClass::Invalidate_Old_Unused_Textures(TextureInactiveOverrideTime);
-}
-
-void TextureLoader::Suspend_Texture_Load()
-{
-	WWASSERT_PRINT(Is_DX8_Thread(),"TextureLoader::Suspend_Texture_Load must be called from the main thread!");
-	TextureLoadSuspended=true;
-}
-
-void TextureLoader::Continue_Texture_Load()
-{
-	WWASSERT_PRINT(Is_DX8_Thread(),"TextureLoader::Continue_Texture_Load must be called from the main thread!");
-	TextureLoadSuspended=false;
-}
-
-void TextureLoader::Process_Foreground_Thumbnail(TextureLoadTaskClass *task)
-{
-	switch (task->Get_State()) {
-		case TextureLoadTaskClass::STATE_NONE:
-			Load_Thumbnail(task->Peek_Texture());
-			// NOTE: fall-through is intentional
-
-		case TextureLoadTaskClass::STATE_COMPLETE:
-			task->Destroy();
-			break;
-	}
-}
-
-
-void TextureLoader::Process_Foreground_Load(TextureLoadTaskClass *task)
-{
-	// Is high-priority task?
-	if (task->Get_Priority() == TextureLoadTaskClass::PRIORITY_HIGH) {
-		task->Finish_Load();
-		task->Destroy();
-		return;
-	}
-
-	// otherwise, must be a low-priority task.
-
-	switch (task->Get_State()) {
-		case TextureLoadTaskClass::STATE_NONE:
-			Begin_Load_And_Queue(task);
-			break;
-
-		case TextureLoadTaskClass::STATE_LOAD_MIPMAP:
-			task->End_Load();
-			task->Destroy();
-			break;
-	}
-}
-
-
-void TextureLoader::Begin_Load_And_Queue(TextureLoadTaskClass *task)
-{
-	// should only be called from the DX8 thread.
-	WWASSERT(Is_DX8_Thread());
-
-	if (task->Begin_Load()) {
-		// add to front of background queue. This means the
-		// background load thread will service tasks in LIFO
-		// (last in, first out) order.
-
-		// NOTE: this was how the old code did it, with a 
-		// comment that mentioned good reasons for doing so,
-		// without actually listing the reasons. I suspect 
-		// it has something to do with visually important textures,
-		// like those in the foreground, starting their load last.
-		_BackgroundQueue.Push_Front(task);
-	} else {
-		// unable to load.
-		task->Apply_Missing_Texture();
-		task->Destroy();
-	}
-}
-
-
-void TextureLoader::Load_Thumbnail(TextureBaseClass *tc)
-{
-	// All D3D operations must run from main thread
-	WWASSERT(Is_DX8_Thread());
-
-	// load thumbnail texture
-	IDirect3DTexture8 *d3d_texture = Load_Thumbnail(tc->Get_Full_Path(),tc->Get_HSV_Shift());
-
-	// apply thumbnail to texture
-	if (tc->Get_Asset_Type()==TextureBaseClass::TEX_REGULAR)
-	{
-		tc->Apply_New_Surface(d3d_texture, false);
-	}
-
-	// release our reference to thumbnail texture
-	d3d_texture->Release();
-	d3d_texture = 0;
-}
-
-
-void LoaderThreadClass::Thread_Function(void)
-{
-	while (running) {
-		// if there are no tasks on the background queue, no need to grab background lock.
-		if (!_BackgroundQueue.Is_Empty()) {
-			// Grab background load so other threads know we could be 
-			// loading a texture.
-			FastCriticalSectionClass::LockClass lock(_BackgroundCriticalSection);
-
-			// try to remove a task from the background queue. This could fail
-			// if another thread modified the queue between our test above and
-			// grabbing the lock.
-			TextureLoadTaskClass* task = _BackgroundQueue.Pop_Front();
-			if (task) {
-				// verify task is in proper state for background processing.
-				WWASSERT(task->Get_Type() == TextureLoadTaskClass::TASK_LOAD);
-				WWASSERT(task->Get_State() == TextureLoadTaskClass::STATE_LOAD_BEGUN);
-
-				// load mip map levels and return to foreground queue for final step.
-				task->Load();
-				_ForegroundQueue.Push_Back(task);
-			}
-		}
-
-		Switch_Thread();
-	}
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// 
-// TextureLoaderTaskClass implementation
-// 
-////////////////////////////////////////////////////////////////////////////////
-
-TextureLoadTaskClass::TextureLoadTaskClass()
-:	Texture			(0),
-	D3DTexture		(0),
-	Format			(WW3D_FORMAT_UNKNOWN),
-	Width				(0),
-	Height			(0),
-	MipLevelCount	(0),
-	Reduction		(0),
-	Type				(TASK_NONE),
-	Priority			(PRIORITY_LOW),
-	State				(STATE_NONE),
-	HSVShift			(0.0f,0.0f,0.0f)	
-{
-	// because texture load tasks are pooled, the constructor and destructor
-	// don't need to do much. The work of attaching a task to a texture is
-	// is done by Init() and Deinit().
-
-	for (int i = 0; i < MIP_LEVELS_MAX; ++i) {
-		LockedSurfacePtr[i]		= NULL;
-		LockedSurfacePitch[i]	= 0;
-	}
-}
-
-
-TextureLoadTaskClass::~TextureLoadTaskClass(void)
-{
-	Deinit();
-}
-
-
-TextureLoadTaskClass *TextureLoadTaskClass::Create(TextureBaseClass *tc, TaskType type, PriorityType priority)
-{
-	// recycle or create a new texture load task with the given type 
-	// and priority, then associate the texture with the task.
-
-	// pull a load task from front of free list
-	TextureLoadTaskClass *task = NULL;
-	switch (tc->Get_Asset_Type()) 
-	{
-		case TextureBaseClass::TEX_REGULAR : task=_TexLoadFreeList.Pop_Front(); break;
-		case TextureBaseClass::TEX_CUBEMAP : task=_CubeTexLoadFreeList.Pop_Front(); break;
-		case TextureBaseClass::TEX_VOLUME : task=_VolTexLoadFreeList.Pop_Front(); break;
-		default : WWASSERT(0);
-	};
-
-	// if no tasks on free list, allocate a new task
-	if (!task) 
-	{
-		switch (tc->Get_Asset_Type())
-		{
-		case TextureBaseClass::TEX_REGULAR : task=new TextureLoadTaskClass; break;
-		case TextureBaseClass::TEX_CUBEMAP : task=new CubeTextureLoadTaskClass; break;
-		case TextureBaseClass::TEX_VOLUME : task=new VolumeTextureLoadTaskClass; break;
-		default : WWASSERT(0);
-		}
-	}
-	task->Init(tc, type, priority);
-	return task;
-}
-
-
-void TextureLoadTaskClass::Destroy(void)
-{
-	// detach the task from its texture, and return to free pool.
-	Deinit();
-	_TexLoadFreeList.Push_Front(this);
-}
-
-
-void TextureLoadTaskClass::Delete_Free_Pool(void)
-{
-	// (gth) We should probably just MEMPool these task objects...
-	while (TextureLoadTaskClass *task = _TexLoadFreeList.Pop_Front()) {
-		delete task;
-	}
-	while (TextureLoadTaskClass *task = _CubeTexLoadFreeList.Pop_Front()) {
-		delete task;
-	}
-	while (TextureLoadTaskClass *task = _VolTexLoadFreeList.Pop_Front()) {
-		delete task;
-	}
-}
-
-
-void TextureLoadTaskClass::Init(TextureBaseClass* tc, TaskType type, PriorityType priority)
-{
-	WWASSERT(tc);
-
-	// NOTE: we must be in the main thread to avoid corrupting the texture's refcount.
-	WWASSERT(TextureLoader::Is_DX8_Thread());
-	REF_PTR_SET(Texture, tc);
-
-	// Make sure texture has a filename.
-	WWASSERT(Texture->Get_Full_Path() != "");
-
-	Type				= type;
-	Priority			= priority;
-	State				= STATE_NONE;
-
-	D3DTexture		= 0;
-
-	TextureClass* tex=Texture->As_TextureClass();
-
-	if (tex)
-	{
-		Format			= tex->Get_Texture_Format(); // don't assume format yet KM
-	}
-	else
-	{
-		Format			= WW3D_FORMAT_UNKNOWN;
-	}
-
-	Width				= 0;
-	Height			= 0;
-	MipLevelCount	= Texture->MipLevelCount;
-	Reduction		= Texture->Get_Reduction();
-	HSVShift			= Texture->Get_HSV_Shift();
-
-
-	for (int i = 0; i < MIP_LEVELS_MAX; ++i) 
-	{
-		LockedSurfacePtr[i]		= NULL;
-		LockedSurfacePitch[i]	= 0;
-	}
-
-	switch (Type) 
-	{
-		case TASK_THUMBNAIL:
-			WWASSERT(Texture->ThumbnailLoadTask == NULL);
-			Texture->ThumbnailLoadTask = this;
-			break;
-
-		case TASK_LOAD:
-			WWASSERT(Texture->TextureLoadTask == NULL);
-			Texture->TextureLoadTask = this;
-			break;
-	}
-}
-
-
-void TextureLoadTaskClass::Deinit()
-{
-	// task should not be on any list when it is being detached from texture.
-	WWASSERT(Next == NULL);
-	WWASSERT(Prev == NULL);
-
-	WWASSERT(D3DTexture == NULL);
-
-	for (int i = 0; i < MIP_LEVELS_MAX; ++i) {
-		WWASSERT(LockedSurfacePtr[i] == NULL);
-	}
-
-	if (Texture) {
-		switch (Type) {
-			case TASK_THUMBNAIL:
-				WWASSERT(Texture->ThumbnailLoadTask == this);
-				Texture->ThumbnailLoadTask = NULL;
-				break;
-
-			case TASK_LOAD:
-				WWASSERT(Texture->TextureLoadTask == this);
-				Texture->TextureLoadTask = NULL;
-				break;
-		}
-
-		// NOTE: we must be in main thread to avoid corrupting Texture's refcount.
-		WWASSERT(TextureLoader::Is_DX8_Thread());
-		REF_PTR_RELEASE(Texture);
-	}
-}
-
-
-bool TextureLoadTaskClass::Begin_Load(void)
-{
-	WWASSERT(TextureLoader::Is_DX8_Thread());
-
-	bool loaded = false;
-
-	// if allowed, begin a compressed load
-	if (Texture->Is_Compression_Allowed()) {
-		loaded = Begin_Compressed_Load();
-	}
-
-	// otherwise, begin an uncompressed load
-	if (!loaded) {
-		loaded = Begin_Uncompressed_Load();
-	}
-
-	// if not loaded, abort.
-	if (!loaded) {
-		return false;
-	}
-
-	// lock surfaces in preparation for copy
-	Lock_Surfaces();
-
-	State = STATE_LOAD_BEGUN;
-
-	return true;
-}
-
-
-// ----------------------------------------------------------------------------
-//
-// Load mipmap levels to a pre-generated and locked texture object based on
-// information in load task object. Try loading from a DDS file first and if
-// that fails try a TGA.
-//
-// ----------------------------------------------------------------------------
-bool TextureLoadTaskClass::Load(void)
-{
-	WWMEMLOG(MEM_TEXTURE);
-	WWASSERT(Peek_D3D_Texture());
-
-	bool loaded = false;
-
-	// if allowed, try to load compressed mipmaps
-	if (Texture->Is_Compression_Allowed()) {
-		loaded = Load_Compressed_Mipmap();
-	}
-
-	// otherwise, load uncompressed mipmaps
-	if (!loaded) {
-		loaded = Load_Uncompressed_Mipmap();
-	}
-
-	State = STATE_LOAD_MIPMAP;
-
-	return loaded;
-}
-
-
-void TextureLoadTaskClass::End_Load(void)
-{
-	WWASSERT(TextureLoader::Is_DX8_Thread());
-
-	Unlock_Surfaces();
-	Apply(true);
-
-	State = STATE_LOAD_COMPLETE;
-}
-
-
-void TextureLoadTaskClass::Finish_Load(void)
-{
-	switch (State) {
-		// NOTE: fall-through below is intentional.
-
-		case STATE_NONE:
-			if (!Begin_Load()) {
-				Apply_Missing_Texture();
-				break;
-			}
-
-		case STATE_LOAD_BEGUN:
-			Load();
-
-		case STATE_LOAD_MIPMAP:
-			End_Load();
-
-		default:
-			break;
-	}
-}
-
-
-void TextureLoadTaskClass::Apply_Missing_Texture(void)
-{
-	WWASSERT(TextureLoader::Is_DX8_Thread());
-	WWASSERT(!D3DTexture);
-
-	D3DTexture = MissingTexture::_Get_Missing_Texture();
-	Apply(true);
-}
-
-
-void TextureLoadTaskClass::Apply(bool initialize)
-{
-	WWASSERT(D3DTexture);
-
-	// Verify that none of the mip levels are locked
-	for (unsigned i=0;i<MipLevelCount;++i) {
-		WWASSERT(LockedSurfacePtr[i]==NULL);
-	}
-
-	Texture->Apply_New_Surface(D3DTexture, initialize);
-
-	D3DTexture->Release();
-	D3DTexture = NULL;
-}
-
-static bool	Get_Texture_Information
-(
-	const char* filename,
-	unsigned& reduction,
-	unsigned& w,
-	unsigned& h,
-	unsigned& d,
-	WW3DFormat& format,
-	unsigned& mip_count,
-	bool compressed
-)
-{
-	ThumbnailClass* thumb=ThumbnailManagerClass::Peek_Thumbnail_Instance_From_Any_Manager(filename);
-
-	if (!thumb) 
-	{
-		if (compressed) 
-		{
-			DDSFileClass dds_file(filename, 0);
-			if (!dds_file.Is_Available()) return false;
-
-			// Destination size will be the next power of two square from the larger width and height...
-			w = dds_file.Get_Width(0);
-			h = dds_file.Get_Height(0);
-			d = dds_file.Get_Depth(0);
-			format = dds_file.Get_Format();
-			mip_count = dds_file.Get_Mip_Level_Count();
-			//Figure out correct reduction
-			int reqReduction=WW3D::Get_Texture_Reduction();	//requested reduction
-
-			if (reqReduction >= mip_count)
-				reqReduction=mip_count-1;	//leave only the lowest level
-
-			//Clamp reduction
-			int curReduction=0;
-			int curWidth=w;
-			int curHeight=h;
-			int minDim=WW3D::Get_Texture_Min_Dimension();
-
-			while (curReduction < reqReduction && curWidth > minDim && curHeight > minDim)
-			{	curWidth >>=1;	//keep dividing
-				curHeight >>=1;
-				curReduction++;
-			}
-			reduction=curReduction;
-			return true;
-		}
-
-		Targa targa;
-		if (TARGA_ERROR_HANDLER(targa.Open(filename, TGA_READMODE), filename)) 
-		{
-			return false;
-		}
-
-		unsigned int bpp;
-		WW3DFormat dest_format;
-		Get_WW3D_Format(dest_format,format,bpp,targa);
-
-		mip_count = 0;
-
-		//Figure out how many mip levels this texture will occupy
-		for (int i=targa.Header.Width, j=targa.Header.Height; i > 0 && j > 0; i>>=1, j>>=1)
-				mip_count++;
-
-		//Figure out correct reduction
-		int reqReduction=WW3D::Get_Texture_Reduction();	//requested reduction
-
-		if (reqReduction >= mip_count)
-			reqReduction=mip_count-1;	//leave only the lowest level
-
-		//Clamp reduction
-		int curReduction=0;
-		int curWidth=targa.Header.Width;
-		int curHeight=targa.Header.Height;
-		int minDim=WW3D::Get_Texture_Min_Dimension();
-
-		while (curReduction < reqReduction && curWidth > minDim && curHeight > minDim)
-		{	curWidth >>=1;	//keep dividing
-			curHeight >>=1;
-			curReduction++;
-		}
-		reduction=curReduction;
-
-		// Destination size will be the next power of two square from the larger width and height...
-		w = targa.Header.Width;
-		h = targa.Header.Height;
-		d = 1;
-		return true; 
-	}
-
-	if (compressed &&
-		thumb->Get_Original_Texture_Format()!=WW3D_FORMAT_DXT1 &&
-		thumb->Get_Original_Texture_Format()!=WW3D_FORMAT_DXT2 &&
-		thumb->Get_Original_Texture_Format()!=WW3D_FORMAT_DXT3 &&
-		thumb->Get_Original_Texture_Format()!=WW3D_FORMAT_DXT4 &&
-		thumb->Get_Original_Texture_Format()!=WW3D_FORMAT_DXT5) {
-		return false;
-	}
-
-	w=thumb->Get_Original_Texture_Width() >> reduction;
-	h=thumb->Get_Original_Texture_Height() >> reduction;
-	//d=thumb->Get_Original_Texture_Depth() >> reduction; // need to a volume texture support to thumbnails...maybe
-	mip_count=thumb->Get_Original_Texture_Mip_Level_Count();
-	format=thumb->Get_Original_Texture_Format();
-	return true;
-}
-
-
-bool TextureLoadTaskClass::Begin_Compressed_Load(void)
-{
-	unsigned orig_w,orig_h,orig_d,orig_mip_count,reduction;
-	WW3DFormat orig_format;
-	if (!Get_Texture_Information
-		  (
-				Texture->Get_Full_Path(),
-				reduction,
-				orig_w,
-				orig_h,
-				orig_d,
-				orig_format,
-				orig_mip_count,
-				true
-			)
-		)
-	{
-		return false;
-	}
-
-	// Destination size will be the next power of two square from the larger width and height...
-	unsigned int width	= orig_w;
-	unsigned int height	= orig_h;
-	TextureLoader::Validate_Texture_Size(width, height,orig_d);
-
-	// If the size doesn't match, try and see if texture reduction would help... (mainly for
-	// cases where loaded texture is larger than hardware limit)
-	if (width != orig_w || height != orig_h) 
-	{
-		for (unsigned int i = 1; i < orig_mip_count; ++i) 
-		{
-			unsigned w=orig_w>>i;
-			if (w<4) w=4;
-			unsigned h=orig_h>>i;
-			if (h<4) h=4;
-			unsigned tmp_w=w;
-			unsigned tmp_h=h;
-
-			TextureLoader::Validate_Texture_Size(w,h,orig_d);
-
-			if (w == tmp_w && h == tmp_h) 
-			{
-				Reduction	+= i;
-				width			=	w;
-				height		=	h;
-				break;
-			}
-		}
-	}
-
-	Width		= width;
-	Height	= height;
-	Format	= Get_Valid_Texture_Format(orig_format, Texture->Is_Compression_Allowed());
-	Reduction = reduction;
-
-
-	if (!Texture->Is_Reducible() || Texture->MipLevelCount == MIP_LEVELS_1)
-		Reduction = 0;	//app doesn't want this texture to ever be reduced.
-	else
-	//Make sure we don't reduce below the level requested by the app
-	if (Texture->MipLevelCount != MIP_LEVELS_ALL && (Texture->MipLevelCount - Reduction) < 1)
-		Reduction = Texture->MipLevelCount - 1;
-
-	//Another sanity check
-	if (Reduction >= orig_mip_count)
-		Reduction = 0;	//should not be possible to get here, but check just in case.
-
-	unsigned int mip_level_count = Get_Mip_Level_Count();
-	int reducedWidth=Width;
-	int reducedHeight=Height;
-
-	// If texture wants all mip levels, take as many as the file contains (not necessarily all)
-	// Otherwise take as many mip levels as the texture wants, not to exceed the count in file...
-	if (!mip_level_count) 
-	{
-		reducedWidth >>= Reduction;
-		reducedHeight >>= Reduction;
-		mip_level_count = orig_mip_count-Reduction;//dds_file.Get_Mip_Level_Count();
-		if (mip_level_count < 1)
-			mip_level_count = 1;	//sanity check to make sure something gets loaded.
-	} 
-	else
-	{
-		if (mip_level_count > orig_mip_count) 
-		{	//dds_file.Get_Mip_Level_Count()) {
-			mip_level_count = orig_mip_count;//dds_file.Get_Mip_Level_Count();
-		}
-
-		if (Reduction)
-		{	reducedWidth >>= Reduction;
-			reducedHeight >>= Reduction;
-			mip_level_count -= Reduction;	//reduced requested number by those removed.
-		}
-	}
-
-	// Once more, verify that the mip level count is correct (in case it was changed here it might not
-	// match the size...well actually it doesn't have to match but it can't be bigger than the size)
-	unsigned int max_mip_level_count = 1;
-	unsigned int w = 4;
-	unsigned int h = 4;
-
-	while (w < Width && h < Height) 
-	{
-		w += w;
-		h += h;
-		max_mip_level_count++;
-	}
-
-	if (mip_level_count > max_mip_level_count) 
-	{
-		mip_level_count = max_mip_level_count;
-	}
-
-	D3DTexture	= DX8Wrapper::_Create_DX8_Texture
-	(
-		reducedWidth, 
-		reducedHeight, 
-		Format, 
-		(MipCountType)mip_level_count,
-#ifdef USE_MANAGED_TEXTURES
-		D3DPOOL_MANAGED
-#else
-		D3DPOOL_SYSTEMMEM
-#endif
-	);
-
-	MipLevelCount = mip_level_count;
-
-	return true;
-}
-
-bool TextureLoadTaskClass::Begin_Uncompressed_Load(void)
-{
-	unsigned width,height,depth,orig_mip_count,reduction;
-	WW3DFormat orig_format;
-	if (!Get_Texture_Information
-		  (
-				Texture->Get_Full_Path(),
-				reduction,
-				width,
-				height,
-				depth,
-				orig_format,
-				orig_mip_count,
-				false
-			)
-		)
-	{
-		return false;
-	}
-
-	WW3DFormat src_format=orig_format;
-	WW3DFormat dest_format=src_format;
-	dest_format=Get_Valid_Texture_Format(dest_format,false);	// No compressed destination format if reading from targa...
-
-   if (	src_format != WW3D_FORMAT_A8R8G8B8 
-   	&&	src_format != WW3D_FORMAT_R8G8B8 
-  		&&	src_format != WW3D_FORMAT_X8R8G8B8 ) 
-	{
-		WWDEBUG_SAY(("Invalid TGA format used in %s - only 24 and 32 bit formats should be used!\n", Texture->Get_Full_Path()));
-	}
-
-	// Destination size will be the next power of two square from the larger width and height...
-	unsigned ow = width;
-	unsigned oh = height;
-	TextureLoader::Validate_Texture_Size(width, height,depth);
-	if (width != ow || height != oh) 
-	{
-		WWDEBUG_SAY(("Invalid texture size, scaling required. Texture: %s, size: %d x %d -> %d x %d\n", Texture->Get_Full_Path(), ow, oh, width, height));
-	}
-
-	Width		= width;
-	Height	= height;
-	Reduction = reduction;
-
-	if (!Texture->Is_Reducible() || Texture->MipLevelCount == MIP_LEVELS_1)
-		Reduction = 0;	//app doesn't want this texture to ever be reduced.
-	else
-	//Make sure we don't reduce below the level requested by the app
-	if (Texture->MipLevelCount != MIP_LEVELS_ALL && (Texture->MipLevelCount - Reduction) < 1)
-		Reduction = Texture->MipLevelCount - 1;
-
-	//Another sanity check
-	if (Reduction >= orig_mip_count)
-		Reduction = 0;	//should not be possible to get here, but check just in case.
-
-	if (Format == WW3D_FORMAT_UNKNOWN) 
-	{
-		Format=dest_format;
-	//	Format = Get_Valid_Texture_Format(dest_format, false); validated above
-	}
-	else 
-	{
-		Format = Get_Valid_Texture_Format(Format, false);
-	}
-
-	int reducedWidth=Width;
-	int reducedHeight=Height;
-	int reducedMipCount=Texture->MipLevelCount;
-
-	if (Reduction)
-	{	//we don't care about specific levels so reduce them if needed.
-		reducedWidth >>= Reduction;
-		reducedHeight >>= Reduction;
-		if (reducedMipCount != MIP_LEVELS_ALL)
-			reducedMipCount -= Reduction;
-	}
-
-	D3DTexture = DX8Wrapper::_Create_DX8_Texture
-	(
-		reducedWidth, 
-		reducedHeight, 
-		Format, 
-		(MipCountType)reducedMipCount,
-#ifdef USE_MANAGED_TEXTURES
-		D3DPOOL_MANAGED
-#else
-		D3DPOOL_SYSTEMMEM
-#endif
-	);
-
-	return true;
-}
-
-/*
-bool TextureLoadTaskClass::Begin_Compressed_Load(void)
-{
-	DDSFileClass dds_file(Texture->Get_Full_Path(), Get_Reduction());
-	if (!dds_file.Is_Available()) {
-		return false; 
-	}
-
-	// Destination size will be the next power of two square from the larger width and height...
-	unsigned int width	= dds_file.Get_Width(0);
-	unsigned int height	= dds_file.Get_Height(0);
-	TextureLoader::Validate_Texture_Size(width, height);
-
-	// If the size doesn't match, try and see if texture reduction would help... (mainly for
-	// cases where loaded texture is larger than hardware limit)
-	if (width != dds_file.Get_Width(0) || height != dds_file.Get_Height(0)) {
-		for (unsigned int i = 1; i < dds_file.Get_Mip_Level_Count(); ++i) {
-			unsigned int w = dds_file.Get_Width(i);
-			unsigned int h = dds_file.Get_Height(i);
-			TextureLoader::Validate_Texture_Size(w,h);
-
-			if (w == dds_file.Get_Width(i) && h == dds_file.Get_Height(i)) {
-				Reduction	+= i;
-				width			=	w;
-				height		=	h;
-				break;
-			}
-		}
-	}
-
-	Width		= width;
-	Height	= height;
-	Format	= Get_Valid_Texture_Format(dds_file.Get_Format(), Texture->Is_Compression_Allowed());
-
-	unsigned int mip_level_count = Get_Mip_Level_Count();
-
-	// If texture wants all mip levels, take as many as the file contains (not necessarily all)
-	// Otherwise take as many mip levels as the texture wants, not to exceed the count in file...
-	if (!mip_level_count) {
-		mip_level_count = dds_file.Get_Mip_Level_Count();
-	} else if (mip_level_count > dds_file.Get_Mip_Level_Count()) {
-		mip_level_count = dds_file.Get_Mip_Level_Count();
-	}
-
-	// Once more, verify that the mip level count is correct (in case it was changed here it might not
-	// match the size...well actually it doesn't have to match but it can't be bigger than the size)
-	unsigned int max_mip_level_count = 1;
-	unsigned int w = 4;
-	unsigned int h = 4;
-
-	while (w < Width && h < Height) {
-		w += w;
-		h += h;
-		max_mip_level_count++;
-	}
-
-	if (mip_level_count > max_mip_level_count) {
-		mip_level_count = max_mip_level_count;
-	}
-
-	D3DTexture	= DX8Wrapper::_Create_DX8_Texture(
-		Width, 
-		Height, 
-		Format, 
-		(TextureBaseClass::MipCountType)mip_level_count,
-#ifdef USE_MANAGED_TEXTURES
-		D3DPOOL_MANAGED);
-#else
-		D3DPOOL_SYSTEMMEM);
-#endif
-	MipLevelCount = mip_level_count;
-	return true;
-}
-
-
-bool TextureLoadTaskClass::Begin_Uncompressed_Load(void)
-{
-	Targa targa;
-	if (TARGA_ERROR_HANDLER(targa.Open(Texture->Get_Full_Path(), TGA_READMODE), Texture->Get_Full_Path())) {
-		return false;
-	}
-
-	unsigned int bpp;
-	WW3DFormat src_format, dest_format;
-	Get_WW3D_Format(dest_format,src_format,bpp,targa);
-
-	if (	src_format != WW3D_FORMAT_A8R8G8B8 
-		&&	src_format != WW3D_FORMAT_R8G8B8 
-		&&	src_format != WW3D_FORMAT_X8R8G8B8) {
-		WWDEBUG_SAY(("Invalid TGA format used in %s - only 24 and 32 bit formats should be used!\n", Texture->Get_Full_Path()));
-	}
-
-	// Destination size will be the next power of two square from the larger width and height...
-	unsigned width=targa.Header.Width, height=targa.Header.Height;
-	int ReductionFactor=Get_Reduction();
-	int MipLevels=0;
-
-	//Figure out how many mip levels this texture will occupy
-	for (int i=width, j=height; i > 0 && j > 0; i>>=1, j>>=1)
-		MipLevels++;
-
-	//Adjust the reduction factor to keep textures above some minimum dimensions
-	if (MipLevels <= WW3D::Get_Texture_Min_Mip_Levels())
-		ReductionFactor=0;
-	else
-	{	int mipToDrop=MipLevels-WW3D::Get_Texture_Min_Mip_Levels();
-		if (ReductionFactor >= mipToDrop)
-		ReductionFactor=mipToDrop;
-	}
-
-	width=targa.Header.Width>>ReductionFactor;
-	height=targa.Header.Height>>ReductionFactor;
-	unsigned ow = width;
-	unsigned oh = height;
-	TextureLoader::Validate_Texture_Size(width, height);
-	if (width != ow || height != oh) {
-		WWDEBUG_SAY(("Invalid texture size, scaling required. Texture: %s, size: %d x %d -> %d x %d\n", Texture->Get_Full_Path(), ow, oh, width, height));
-	}
-
-	Width		= width;
-	Height	= height;
-
-	// changed because format was being read from previous loading task?! KJM
-	Format=dest_format;
-	//if (Format == WW3D_FORMAT_UNKNOWN) {
-	//	Format = Get_Valid_Texture_Format(dest_format, false);
-	//} else {
-	//	Format = Get_Valid_Texture_Format(Format, false);
-	//}
-
-	D3DTexture = DX8Wrapper::_Create_DX8_Texture
-	(
-		Width, 
-		Height, 
-		Format, 
-		Texture->MipLevelCount,
-#ifdef USE_MANAGED_TEXTURES
-		D3DPOOL_MANAGED);
-#else
-		D3DPOOL_SYSTEMMEM);
-#endif
-	return true;
-}
-*/
-
-void TextureLoadTaskClass::Lock_Surfaces(void)
-{
-	MipLevelCount = D3DTexture->GetLevelCount();
-
-	for (unsigned int i = 0; i < MipLevelCount; ++i) 
-	{
-		D3DLOCKED_RECT locked_rect;
-		DX8_ErrorCode
-		(
-			Peek_D3D_Texture()->LockRect
-			(
-				i,
-				&locked_rect,
-				NULL,
-				0
-			)
-		);
-		LockedSurfacePtr[i]		= (unsigned char *)locked_rect.pBits;
-		LockedSurfacePitch[i]	= locked_rect.Pitch;
-	}
-}
-
-
-void TextureLoadTaskClass::Unlock_Surfaces(void)
-{
-	for (unsigned int i = 0; i < MipLevelCount; ++i) 
-	{
-		if (LockedSurfacePtr[i]) 
-		{
-			WWASSERT(ThreadClass::_Get_Current_Thread_ID() == DX8Wrapper::_Get_Main_Thread_ID());
-			DX8_ErrorCode(Peek_D3D_Texture()->UnlockRect(i));
-		}
-		LockedSurfacePtr[i] = NULL;
-	}
-
-#ifndef USE_MANAGED_TEXTURES
-	IDirect3DTexture8* tex = DX8Wrapper::_Create_DX8_Texture(Width, Height, Format, Texture->MipLevelCount,D3DPOOL_DEFAULT);
-	DX8CALL(UpdateTexture(Peek_D3D_Texture(),tex));
-	Peek_D3D_Texture()->Release();
-	D3DTexture=tex;
-	WWDEBUG_SAY(("Created non-managed texture (%s)\n",Texture->Get_Full_Path()));
-#endif
-
-}
-
-
-bool TextureLoadTaskClass::Load_Compressed_Mipmap(void)
-{
-	DDSFileClass dds_file(Texture->Get_Full_Path(), Get_Reduction());
-
-	// if we can't load from file, indicate rror.
-	if (!dds_file.Is_Available() || !dds_file.Load()) 
-	{
-		return false;
-	}
-
-	// regular 2d texture
-	unsigned int width	= Get_Width();
-	unsigned int height	= Get_Height();
-
-	if (Reduction)
-	{	for (unsigned int level = 0; level < Reduction; ++level) {
-			width		>>= 1;
-			height		>>= 1;
-		}
-	}
-
-	for (unsigned int level = 0; level < Get_Mip_Level_Count(); ++level) 
-	{
-		WWASSERT(width && height);
-		dds_file.Copy_Level_To_Surface
-		(
-			level,
-			Get_Format(),
-			width,
-			height,
-			Get_Locked_Surface_Ptr(level),
-			Get_Locked_Surface_Pitch(level),
-			HSVShift
-		);
-
-		width		>>= 1;
-		height	>>= 1;
-	}
-
-	return true;
-}
-
-
-bool TextureLoadTaskClass::Load_Uncompressed_Mipmap(void)
-{
-	if (!Get_Mip_Level_Count()) 
-	{
-		return false;
-	}
-
-	Targa targa;
-	if (TARGA_ERROR_HANDLER(targa.Open(Texture->Get_Full_Path(), TGA_READMODE), Texture->Get_Full_Path())) {
-		return false;
-	}
-
-	// DX8 uses image upside down compared to TGA
-	targa.Header.ImageDescriptor ^= TGAIDF_YORIGIN;
-
-	WW3DFormat src_format;
-	WW3DFormat dest_format;
-	unsigned int src_bpp = 0;
-	Get_WW3D_Format(dest_format,src_format,src_bpp,targa);
-	if (src_format==WW3D_FORMAT_UNKNOWN) return false;
-
-	dest_format = Get_Format();	// Texture can be requested in different format than the most obvious from the TGA
-
-	char palette[256*4];
-	targa.SetPalette(palette);
-
-	unsigned int src_width	= targa.Header.Width;
-	unsigned int src_height	= targa.Header.Height;
-	unsigned int width		= Get_Width();
-	unsigned int height		= Get_Height();
-
-	// NOTE: We load the palette but we do not yet support paletted textures!
-	if (TARGA_ERROR_HANDLER(targa.Load(Texture->Get_Full_Path(), TGAF_IMAGE, false), Texture->Get_Full_Path())) {
-		return false;
-	}
-
-	unsigned char * src_surface			= (unsigned char*)targa.GetImage();
-	unsigned char * converted_surface	= NULL;
-
-	// No paletted format allowed when generating mipmaps
-	Vector3 hsv_shift=HSVShift;
-	if (	src_format	== WW3D_FORMAT_A1R5G5B5 
-		|| src_format	== WW3D_FORMAT_R5G6B5 
-		|| src_format	== WW3D_FORMAT_A4R4G4B4 
-		||	src_format	== WW3D_FORMAT_P8 
-		|| src_format	== WW3D_FORMAT_L8 
-		|| src_width	!= width 
-		|| src_height	!= height) {
-
-		converted_surface = new unsigned char[width*height*4];
-		dest_format = Get_Valid_Texture_Format(WW3D_FORMAT_A8R8G8B8, false);
-
-		BitmapHandlerClass::Copy_Image(
-			converted_surface,
-			width,
-			height,
-			width*4,
-			WW3D_FORMAT_A8R8G8B8,	//dest_format,
-			src_surface,
-			src_width,
-			src_height,
-			src_width*src_bpp,
-			src_format,
-			(unsigned char*)targa.GetPalette(),
-			targa.Header.CMapDepth>>3,
-			false,
-			hsv_shift);
-		hsv_shift=Vector3(0.0f,0.0f,0.0f);
-
-		src_surface	= converted_surface;
-		src_format	= WW3D_FORMAT_A8R8G8B8;	//dest_format;
-		src_width	= width;
-		src_height	= height;
-		src_bpp		= Get_Bytes_Per_Pixel(src_format);
-	}
-
-	unsigned src_pitch = src_width * src_bpp;
-
-	if (Reduction)
-	{	//texture needs to be reduced so allocate storage for full-sized version.
-		unsigned char * destination_surface	= new unsigned char[width*height*4];
-		//generate upper mip-levels that will be dropped in final texture
-		for (unsigned int level = 0; level < Reduction; ++level) {
-		BitmapHandlerClass::Copy_Image(
-			(unsigned char *)destination_surface,
-			width,
-			height,
-			src_pitch,
-			Get_Format(),
-			src_surface,
-			src_width,
-			src_height,
-			src_pitch,
-			src_format,
-			NULL,
-			0,
-			true,
-			hsv_shift);
-
-			width			>>= 1;
-			height		>>= 1;
-			src_width	>>= 1;
-			src_height	>>= 1;
-		}
-		delete [] destination_surface;
-	}
-
-	for (unsigned int level = 0; level < Get_Mip_Level_Count(); ++level) {
-		WWASSERT(Get_Locked_Surface_Ptr(level));
-		BitmapHandlerClass::Copy_Image(
-			Get_Locked_Surface_Ptr(level),
-			width,
-			height,
-			Get_Locked_Surface_Pitch(level),
-			Get_Format(),
-			src_surface,
-			src_width,
-			src_height,
-			src_pitch,
-			src_format,
-			NULL,
-			0,
-			true,
-			hsv_shift);
-		hsv_shift=Vector3(0.0f,0.0f,0.0f);
-
-		width			>>= 1;
-		height		>>= 1;
-		src_width	>>= 1;
-		src_height	>>= 1;
-
-		if (!width || !height || !src_width || !src_height) {
-			break;
-		}
-	}
-
-	if (converted_surface) {
-		delete[] converted_surface;
-	}
-
-	return true;
-}
-
-
-unsigned char * TextureLoadTaskClass::Get_Locked_Surface_Ptr(unsigned int level)
-{
-	WWASSERT(level<MipLevelCount);
-	WWASSERT(LockedSurfacePtr[level]);
-	return LockedSurfacePtr[level];
-}
-
-// ----------------------------------------------------------------------------
-//
-// Return locked surface pitch (in bytes) at a specific level. The call will
-// assert if level is greater or equal to the number of mip levels or if the
-// requested level has not been locked.
-//
-// ----------------------------------------------------------------------------
-
-unsigned int TextureLoadTaskClass::Get_Locked_Surface_Pitch(unsigned int level) const
-{
-	WWASSERT(level<MipLevelCount);
-	WWASSERT(LockedSurfacePtr[level]);
-	return LockedSurfacePitch[level];
-}
-
-
-
-
-
-// CubeTextureLoadTaskClass
-CubeTextureLoadTaskClass::CubeTextureLoadTaskClass()
-:	TextureLoadTaskClass()
-{
-	// because texture load tasks are pooled, the constructor and destructor
-	// don't need to do much. The work of attaching a task to a texture is
-	// is done by Init() and Deinit().
-
-	for (int f=0;f<6;f++)
-	{
-		for (int i = 0; i < MIP_LEVELS_MAX; ++i) 
-		{
-			LockedCubeSurfacePtr[f][i]		= NULL;
-			LockedCubeSurfacePitch[f][i]	= 0;
-		}
-	}
-}
-
-void CubeTextureLoadTaskClass::Destroy(void)
-{
-	// detach the task from its texture, and return to free pool.
-	Deinit();
-	_CubeTexLoadFreeList.Push_Front(this);
-}
-
-
-void CubeTextureLoadTaskClass::Init(TextureBaseClass* tc, TaskType type, PriorityType priority)
-{
-	WWASSERT(tc);
-
-	// NOTE: we must be in the main thread to avoid corrupting the texture's refcount.
-	WWASSERT(TextureLoader::Is_DX8_Thread());
-	REF_PTR_SET(Texture, tc);
-
-	// Make sure texture has a filename.
-	WWASSERT(Texture->Get_Full_Path() != "");
-
-	Type				= type;
-	Priority			= priority;
-	State				= STATE_NONE;
-
-	D3DTexture		= 0;
-
-	CubeTextureClass* tex=Texture->As_CubeTextureClass();
-
-	if (tex)
-	{
-		Format			= tex->Get_Texture_Format(); // don't assume format yet KM
-	}
-	else
-	{
-		Format			= WW3D_FORMAT_UNKNOWN;
-	}
-
-	Width				= 0;
-	Height			= 0;
-	MipLevelCount	= Texture->MipLevelCount;
-	Reduction		= Texture->Get_Reduction();
-	HSVShift			= Texture->Get_HSV_Shift();
-
-
-	for (int f=0; f<6; f++)
-	{
-		for (int i = 0; i < MIP_LEVELS_MAX; ++i) 
-		{
-			LockedCubeSurfacePtr[f][i]		= NULL;
-			LockedCubeSurfacePitch[f][i]	= 0;
-		}
-	}
-
-	switch (Type) 
-	{
-	case TASK_THUMBNAIL:
-		WWASSERT(Texture->ThumbnailLoadTask == NULL);
-		Texture->ThumbnailLoadTask = this;
-		break;
-
-	case TASK_LOAD:
-		WWASSERT(Texture->TextureLoadTask == NULL);
-		Texture->TextureLoadTask = this;
-		break;
-	}
-}
-
-
-void CubeTextureLoadTaskClass::Deinit()
-{
-	// task should not be on any list when it is being detached from texture.
-	WWASSERT(Next == NULL);
-	WWASSERT(Prev == NULL);
-
-	WWASSERT(D3DTexture == NULL);
-
-	for (int f=0; f<6; f++)
-	{
-		for (int i = 0; i < MIP_LEVELS_MAX; ++i) 
-		{
-			WWASSERT(LockedCubeSurfacePtr[f][i] == NULL);
-		}
-	}
-
-	if (Texture) 
-	{
-		switch (Type) 
-		{
-			case TASK_THUMBNAIL:
-				WWASSERT(Texture->ThumbnailLoadTask == this);
-				Texture->ThumbnailLoadTask = NULL;
-				break;
-
-			case TASK_LOAD:
-				WWASSERT(Texture->TextureLoadTask == this);
-				Texture->TextureLoadTask = NULL;
-				break;
-		}
-
-		// NOTE: we must be in main thread to avoid corrupting Texture's refcount.
-		WWASSERT(TextureLoader::Is_DX8_Thread());
-		REF_PTR_RELEASE(Texture);
-	}
-}
-
-void CubeTextureLoadTaskClass::Lock_Surfaces(void)
-{
-	for (unsigned int f=0; f<6; f++)
-	{
-		for (unsigned int i=0; i<MipLevelCount; i++)
-		{
-			D3DLOCKED_RECT locked_rect;
-			DX8_ErrorCode
-			(
-				Peek_D3D_Cube_Texture()->LockRect
-				(
-					(D3DCUBEMAP_FACES)f,
-					i,
-					&locked_rect,
-					NULL,
-					0
-				)
-			);
-			LockedCubeSurfacePtr[f][i]	 = (unsigned char *)locked_rect.pBits;
-			LockedCubeSurfacePitch[f][i]= locked_rect.Pitch;
-		}
-	}
-}
-
-void CubeTextureLoadTaskClass::Unlock_Surfaces(void)
-{
-	for (unsigned int f=0; f<6; f++)
-	{
-		for (unsigned int i = 0; i < MipLevelCount; ++i) 
-		{
-			if (LockedCubeSurfacePtr[f][i]) 
-			{
-				WWASSERT(ThreadClass::_Get_Current_Thread_ID() == DX8Wrapper::_Get_Main_Thread_ID());
-				DX8_ErrorCode
-				(
-					Peek_D3D_Cube_Texture()->UnlockRect((D3DCUBEMAP_FACES)f,i)
-				);
-			}
-			LockedCubeSurfacePtr[f][i] = NULL;
-		}
-	}
-
-#ifndef USE_MANAGED_TEXTURES
-	IDirect3DCubeTexture8* tex = DX8Wrapper::_Create_DX8_Cube_Texture
-	(
-		Width, 
-		Height, 
-		Format, 
-		Texture->MipLevelCount,
-		D3DPOOL_DEFAULT
-	);
-	DX8CALL(UpdateTexture(Peek_D3D_Volume_Texture(),tex));
-	Peek_D3D_Volume_Texture()->Release();
-	D3DTexture=tex;
-	WWDEBUG_SAY(("Created non-managed texture (%s)\n",Texture->Get_Full_Path()));
-#endif
-
-}
-
-
-
-bool CubeTextureLoadTaskClass::Begin_Compressed_Load()
-{
-	unsigned orig_w,orig_h,orig_d,orig_mip_count,reduction;
-	WW3DFormat orig_format;
-	if (!Get_Texture_Information
-		  (
-				Texture->Get_Full_Path(),
-				reduction,
-				orig_w,
-				orig_h,
-				orig_d,
-				orig_format,
-				orig_mip_count,
-				true
-		  )
-		)
-	{
-		return false;
-	}
-
-	// Destination size will be the next power of two square from the larger width and height...
-	unsigned int width	= orig_w;
-	unsigned int height	= orig_h;
-	TextureLoader::Validate_Texture_Size(width, height,orig_d);
-
-	// If the size doesn't match, try and see if texture reduction would help... (mainly for
-	// cases where loaded texture is larger than hardware limit)
-	if (width != orig_w || height != orig_h) 
-	{
-		for (unsigned int i = 1; i < orig_mip_count; ++i) 
-		{
-			unsigned w=orig_w>>i;
-			if (w<4) w=4;
-			unsigned h=orig_h>>i;
-			if (h<4) h=4;
-			unsigned tmp_w=w;
-			unsigned tmp_h=h;
-
-			TextureLoader::Validate_Texture_Size(w,h,orig_d);
-
-			if (w == tmp_w && h == tmp_h) 
-			{
-				Reduction	+= i;
-				width			=	w;
-				height		=	h;
-				break;
-			}
-		}
-	}
-
-	Width		= width;
-	Height	= height;
-	Format	= Get_Valid_Texture_Format(orig_format, Texture->Is_Compression_Allowed());
-
-	unsigned int mip_level_count = Get_Mip_Level_Count();
-
-	// If texture wants all mip levels, take as many as the file contains (not necessarily all)
-	// Otherwise take as many mip levels as the texture wants, not to exceed the count in file...
-	if (!mip_level_count) 
-	{
-		mip_level_count = orig_mip_count;//dds_file.Get_Mip_Level_Count();
-	} 
-	else if (mip_level_count > orig_mip_count) 
-	{//dds_file.Get_Mip_Level_Count()) {
-		mip_level_count = orig_mip_count;//dds_file.Get_Mip_Level_Count();
-	}
-
-	// Once more, verify that the mip level count is correct (in case it was changed here it might not
-	// match the size...well actually it doesn't have to match but it can't be bigger than the size)
-	unsigned int max_mip_level_count = 1;
-	unsigned int w = 4;
-	unsigned int h = 4;
-
-	while (w < Width && h < Height) 
-	{
-		w += w;
-		h += h;
-		max_mip_level_count++;
-	}
-
-	if (mip_level_count > max_mip_level_count) 
-	{
-		mip_level_count = max_mip_level_count;
-	}
-
-	D3DTexture	= DX8Wrapper::_Create_DX8_Cube_Texture
-	(
-		Width, 
-		Height, 
-		Format, 
-		(MipCountType)mip_level_count,
-#ifdef USE_MANAGED_TEXTURES
-		D3DPOOL_MANAGED
-#else
-		D3DPOOL_SYSTEMMEM
-#endif
-	);
-
-	MipLevelCount = mip_level_count;
-	return true;
-}
-
-bool CubeTextureLoadTaskClass::Begin_Uncompressed_Load(void)
-{
-	unsigned width,height,depth,orig_mip_count,reduction;
-	WW3DFormat orig_format;
-	if (!Get_Texture_Information
-		  (
-				Texture->Get_Full_Path(),
-				reduction,
-				width,
-				height,
-				depth,
-				orig_format,
-				orig_mip_count,
-				false
-			)
-		)
-	{
-		return false;
-	}
-
-	WW3DFormat src_format=orig_format;
-	WW3DFormat dest_format=src_format;
-	dest_format=Get_Valid_Texture_Format(dest_format,false);	// No compressed destination format if reading from targa...
-
-   if (		src_format != WW3D_FORMAT_A8R8G8B8 
-   		&&	src_format != WW3D_FORMAT_R8G8B8 
-  			&&	src_format != WW3D_FORMAT_X8R8G8B8 ) 
-	{
-		WWDEBUG_SAY(("Invalid TGA format used in %s - only 24 and 32 bit formats should be used!\n", Texture->Get_Full_Path()));
-	}
-
-	// Destination size will be the next power of two square from the larger width and height...
-	unsigned ow = width;
-	unsigned oh = height;
-	TextureLoader::Validate_Texture_Size(width, height,depth);
-	if (width != ow || height != oh) 
-	{
-		WWDEBUG_SAY(("Invalid texture size, scaling required. Texture: %s, size: %d x %d -> %d x %d\n", Texture->Get_Full_Path(), ow, oh, width, height));
-	}
-
-	Width		= width;
-	Height	= height;
-
-	if (Format == WW3D_FORMAT_UNKNOWN) 
-	{
-		Format=dest_format;
-	}
-	else 
-	{
-		Format = Get_Valid_Texture_Format(Format, false);
-	}
-
-	D3DTexture = DX8Wrapper::_Create_DX8_Cube_Texture
-	(
-		Width, 
-		Height, 
-		Format, 
-		Texture->MipLevelCount,
-#ifdef USE_MANAGED_TEXTURES
-		D3DPOOL_MANAGED
-#else
-		D3DPOOL_SYSTEMMEM
-#endif
-	);
-
-	return true;
-}
-
-bool CubeTextureLoadTaskClass::Load_Compressed_Mipmap(void)
-{
-	DDSFileClass dds_file(Texture->Get_Full_Path(), Get_Reduction());
-
-	// if we can't load from file, indicate rror.
-	if (!dds_file.Is_Available() || !dds_file.Load()) 
-	{
-		return false;
-	}
-
-	// load cube map faces
-	for (unsigned int face=0; face<6; face++)
-	{
-		unsigned int width = Get_Width();
-		unsigned int height = Get_Height();
-
-		for (unsigned int level=0; level<Get_Mip_Level_Count(); level++)
-		{
-			WWASSERT(width && height);
-
-			// get cube map surface
-			dds_file.Copy_CubeMap_Level_To_Surface
-			(
-				face,
-				level,
-				Get_Format(),
-				width,
-				height,
-				Get_Locked_CubeMap_Surface_Pointer(face,level),
-				Get_Locked_CubeMap_Surface_Pitch(face,level),
-				HSVShift
-			);
-
-			width>>=1;
-			height>>=1;
-		}
-	}
-
-	return true;
-}
-
-unsigned char*	CubeTextureLoadTaskClass::Get_Locked_CubeMap_Surface_Pointer(unsigned int face, unsigned int level)
-{
-	WWASSERT(face<6 && level<MipLevelCount);
-	WWASSERT(LockedCubeSurfacePtr[face][level]);
-	return LockedCubeSurfacePtr[face][level];
-}
-
-unsigned int CubeTextureLoadTaskClass::Get_Locked_CubeMap_Surface_Pitch(unsigned int face, unsigned int level) const
-{
-	WWASSERT(face<6 && level<MipLevelCount);
-	WWASSERT(LockedCubeSurfacePitch[face][level]);
-	return LockedCubeSurfacePitch[face][level];
-}
-
-
-
-
-
-
-
-// VolumeTextureLoadTaskClass
-VolumeTextureLoadTaskClass::VolumeTextureLoadTaskClass()
-:	TextureLoadTaskClass()
-{
-	// because texture load tasks are pooled, the constructor and destructor
-	// don't need to do much. The work of attaching a task to a texture is
-	// is done by Init() and Deinit().
-
-	for (int i = 0; i < MIP_LEVELS_MAX; ++i) 
-	{
-		LockedSurfacePtr[i]			= NULL;
-		LockedSurfacePitch[i]		= 0;
-		LockedSurfaceSlicePitch[i]	= 0;
-	}
-}
-
-void VolumeTextureLoadTaskClass::Destroy(void)
-{
-	// detach the task from its texture, and return to free pool.
-	Deinit();
-	_VolTexLoadFreeList.Push_Front(this);
-}
-
-void VolumeTextureLoadTaskClass::Init(TextureBaseClass* tc, TaskType type, PriorityType priority)
-{
-	WWASSERT(tc);
-
-	// NOTE: we must be in the main thread to avoid corrupting the texture's refcount.
-	WWASSERT(TextureLoader::Is_DX8_Thread());
-	REF_PTR_SET(Texture, tc);
-
-	// Make sure texture has a filename.
-	WWASSERT(Texture->Get_Full_Path() != "");
-
-	Type				= type;
-	Priority			= priority;
-	State				= STATE_NONE;
-
-	D3DTexture		= 0;
-
-	VolumeTextureClass* tex=Texture->As_VolumeTextureClass();
-
-	if (tex)
-	{
-		Format			= tex->Get_Texture_Format(); // don't assume format yet KM
-	}
-	else
-	{
-		Format			= WW3D_FORMAT_UNKNOWN;
-	}
-
-	Width				= 0;
-	Height			= 0;
-	Depth				= 0;
-	MipLevelCount	= Texture->MipLevelCount;
-	Reduction		= Texture->Get_Reduction();
-	HSVShift			= Texture->Get_HSV_Shift();
-
-
-	for (int i = 0; i < MIP_LEVELS_MAX; ++i) 
-	{
-		LockedSurfacePtr[i]			= NULL;
-		LockedSurfacePitch[i]		= 0;
-		LockedSurfaceSlicePitch[i]	= 0;
-	}
-
-	switch (Type) 
-	{
-	case TASK_THUMBNAIL:
-		WWASSERT(Texture->ThumbnailLoadTask == NULL);
-		Texture->ThumbnailLoadTask = this;
-		break;
-
-	case TASK_LOAD:
-		WWASSERT(Texture->TextureLoadTask == NULL);
-		Texture->TextureLoadTask = this;
-		break;
-	}
-}
-
-void VolumeTextureLoadTaskClass::Lock_Surfaces()
-{
-	for (unsigned int i=0; i<MipLevelCount; i++)
-	{
-		D3DLOCKED_BOX locked_box;
-		DX8_ErrorCode
-		(
-			Peek_D3D_Volume_Texture()->LockBox
-			(
-				i,
-				&locked_box,
-				NULL,
-				0
-			)
-		);
-		LockedSurfacePtr[i]			= (unsigned char *)locked_box.pBits;
-		LockedSurfacePitch[i]		= locked_box.RowPitch;
-		LockedSurfaceSlicePitch[i]	= locked_box.SlicePitch;
-	}
-}
-
-
-void VolumeTextureLoadTaskClass::Unlock_Surfaces()
-{
-	for (unsigned int i = 0; i < MipLevelCount; ++i) 
-	{
-		if (LockedSurfacePtr[i]) 
-		{
-			WWASSERT(ThreadClass::_Get_Current_Thread_ID() == DX8Wrapper::_Get_Main_Thread_ID());
-			DX8_ErrorCode
-			(
-				Peek_D3D_Volume_Texture()->UnlockBox(i)
-			);
-		}
-		LockedSurfacePtr[i] = NULL;
-	}
-
-#ifndef USE_MANAGED_TEXTURES
-	IDirect3DTexture8* tex = DX8Wrapper::_Create_DX8_Volume_Texture(Width, Height, Depth, Format, Texture->MipLevelCount,D3DPOOL_DEFAULT);
-	DX8CALL(UpdateTexture(Peek_D3D_Volume_Texture(),tex));
-	Peek_D3D_Volume_Texture()->Release();
-	D3DTexture=tex;
-	WWDEBUG_SAY(("Created non-managed texture (%s)\n",Texture->Get_Full_Path()));
-#endif
-
-}
-
-
-
-bool VolumeTextureLoadTaskClass::Begin_Compressed_Load()
-{
-	unsigned orig_w,orig_h,orig_d,orig_mip_count,reduction;
-	WW3DFormat orig_format;
-	if (!Get_Texture_Information
-		  (
-				Texture->Get_Full_Path(),
-				reduction,
-				orig_w,
-				orig_h,
-				orig_d,
-				orig_format,
-				orig_mip_count,
-				true
-		  )
-		)
-	{
-		return false;
-	}
-
-	// Destination size will be the next power of two square from the larger width and height...
-	unsigned int width	= orig_w;
-	unsigned int height	= orig_h;
-	unsigned int depth	= orig_d;
-	TextureLoader::Validate_Texture_Size(width, height, depth);
-
-	// If the size doesn't match, try and see if texture reduction would help... (mainly for
-	// cases where loaded texture is larger than hardware limit)
-	if (width != orig_w || height != orig_h || depth != orig_d) 
-	{
-		for (unsigned int i = 1; i < orig_mip_count; ++i) 
-		{
-			unsigned w=orig_w>>i;
-			if (w<4) w=4;
-			unsigned h=orig_h>>i;
-			if (h<4) h=4;
-			unsigned d=orig_d>>i;
-			if (d<1) d=1;
-			unsigned tmp_w=w;
-			unsigned tmp_h=h;
-			unsigned tmp_d=d;
-
-			TextureLoader::Validate_Texture_Size(w,h,d);
-
-			if (w == tmp_w && h == tmp_h && d== tmp_d) 
-			{
-				Reduction	+= i;
-				width			=	w;
-				height		=	h;
-				depth			=  d;
-				break;
-			}
-		}
-	}
-
-	Width		= width;
-	Height	= height;
-	Depth		= depth;
-	Format	= Get_Valid_Texture_Format(orig_format, Texture->Is_Compression_Allowed());
-
-	unsigned int mip_level_count = Get_Mip_Level_Count();
-
-	// If texture wants all mip levels, take as many as the file contains (not necessarily all)
-	// Otherwise take as many mip levels as the texture wants, not to exceed the count in file...
-	if (!mip_level_count) 
-	{
-		mip_level_count = orig_mip_count;//dds_file.Get_Mip_Level_Count();
-	} 
-	else if (mip_level_count > orig_mip_count) 
-	{//dds_file.Get_Mip_Level_Count()) {
-		mip_level_count = orig_mip_count;//dds_file.Get_Mip_Level_Count();
-	}
-
-	// Once more, verify that the mip level count is correct (in case it was changed here it might not
-	// match the size...well actually it doesn't have to match but it can't be bigger than the size)
-	unsigned int max_mip_level_count = 1;
-	unsigned int w = 4;
-	unsigned int h = 4;
-
-	while (w < Width && h < Height) 
-	{
-		w += w;
-		h += h;
-		max_mip_level_count++;
-	}
-	if (mip_level_count > max_mip_level_count) 
-	{
-		mip_level_count = max_mip_level_count;
-	}
-
-	D3DTexture	= DX8Wrapper::_Create_DX8_Volume_Texture
-	(
-		Width, 
-		Height, 
-		Depth,
-		Format, 
-		(MipCountType)mip_level_count,
-#ifdef USE_MANAGED_TEXTURES
-		D3DPOOL_MANAGED
-#else
-		D3DPOOL_SYSTEMMEM
-#endif
-	);
-
-	MipLevelCount = mip_level_count;
-	return true;
-}
-
-bool VolumeTextureLoadTaskClass::Begin_Uncompressed_Load(void)
-{
-	unsigned width,height,depth,orig_mip_count,reduction;
-	WW3DFormat orig_format;
-	if (!Get_Texture_Information
-		  (
-				Texture->Get_Full_Path(),
-				reduction,
-				width,
-				height,
-				depth,
-				orig_format,
-				orig_mip_count,
-				false
-			)
-		)
-	{
-		return false;
-	}
-
-	WW3DFormat src_format=orig_format;
-	WW3DFormat dest_format=src_format;
-	dest_format=Get_Valid_Texture_Format(dest_format,false);	// No compressed destination format if reading from targa...
-
-   if (		src_format != WW3D_FORMAT_A8R8G8B8 
-   		&&	src_format != WW3D_FORMAT_R8G8B8 
-  			&&	src_format != WW3D_FORMAT_X8R8G8B8 ) 
-	{
-		WWDEBUG_SAY(("Invalid TGA format used in %s - only 24 and 32 bit formats should be used!\n", Texture->Get_Full_Path()));
-	}
-
-	// Destination size will be the next power of two square from the larger width and height...
-	unsigned ow = width;
-	unsigned oh = height;
-	unsigned od = depth;
-	TextureLoader::Validate_Texture_Size(width, height, depth);
-	if (width != ow || height != oh || depth != od) 
-	{
-		WWDEBUG_SAY(("Invalid texture size, scaling required. Texture: %s, size: %d x %d -> %d x %d\n", Texture->Get_Full_Path(), ow, oh, width, height));
-	}
-
-	Width		= width;
-	Height	= height;
-	Depth		= depth;
-
-	if (Format == WW3D_FORMAT_UNKNOWN) 
-	{
-		Format=dest_format;
-	}
-	else 
-	{
-		Format = Get_Valid_Texture_Format(Format, false);
-	}
-
-	D3DTexture = DX8Wrapper::_Create_DX8_Volume_Texture
-	(
-		Width, 
-		Height, 
-		Depth,
-		Format, 
-		Texture->MipLevelCount,
-#ifdef USE_MANAGED_TEXTURES
-		D3DPOOL_MANAGED
-#else
-		D3DPOOL_SYSTEMMEM
-#endif
-	);
-
-	return true;
-}
-
-bool VolumeTextureLoadTaskClass::Load_Compressed_Mipmap(void)
-{
-	DDSFileClass dds_file(Texture->Get_Full_Path(), Get_Reduction());
-
-	// if we can't load from file, indicate rror.
-	if (!dds_file.Is_Available() || !dds_file.Load()) 
-	{
-		return false;
-	}
-
-	// load volume
-	unsigned int depth=dds_file.Get_Depth(0);
-	unsigned int width=Get_Width();
-	unsigned int height=Get_Height();
-
-	WWASSERT(width && height && depth);
-
-	for (unsigned int level=0; level<Get_Mip_Level_Count(); level++)
-	{
-		if (width<1) width=1;
-		if (height<1) height=1;
-		if (depth<1) depth=1;
-
-		// get volume
-		dds_file.Copy_Volume_Level_To_Surface
-		(
-			level,
-			depth,
-			Get_Format(),
-			width,
-			height,
-			Get_Locked_Volume_Pointer(level),
-			Get_Locked_Volume_Row_Pitch(level),
-			Get_Locked_Volume_Slice_Pitch(level),
-			HSVShift	
-		);
-
-		width>>=1;
-		height>>=1;
-		depth>>=1;
-	}
-
-	return true;
-}
-
-unsigned char* VolumeTextureLoadTaskClass::Get_Locked_Volume_Pointer(unsigned int level)
-{
-	WWASSERT(level<MipLevelCount);
-	WWASSERT(LockedSurfacePtr[level]);
-	return LockedSurfacePtr[level];
-}
-
-unsigned int VolumeTextureLoadTaskClass::Get_Locked_Volume_Row_Pitch(unsigned int level)
-{
-	WWASSERT(level<MipLevelCount);
-	WWASSERT(LockedSurfacePtr[level]);
-	return LockedSurfacePitch[level];
-}
-
-unsigned int VolumeTextureLoadTaskClass::Get_Locked_Volume_Slice_Pitch(unsigned int level)
-{
-	WWASSERT(level<MipLevelCount);
-	WWASSERT(LockedSurfacePtr[level]);
-	return LockedSurfaceSlicePitch[level];
-}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h
deleted file mode 100644
index b5062814472..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***********************************************************************************************
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
- ***********************************************************************************************
- *                                                                                             *
- *                 Project Name : DX8 Texture Manager                                          *
- *                                                                                             *
- *                     $Archive:: /Commando/Code/ww3d2/textureloader.h                            $*
- *                                                                                             *
- *              Original Author:: vss_sync                                                   *
- *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
- *                     $Modtime:: 06/27/02 1:27p                                              $*
- *                                                                                             *
- *                    $Revision:: 2                                                           $*
- *                                                                                             *
- * 06/27/02 KM Texture class abstraction																			*
- *---------------------------------------------------------------------------------------------*
- * Functions:                                                                                  *
- * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-
-#ifndef TEXTURELOADER_H
-#define TEXTURELOADER_H
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#include "always.h"
-#include "texture.h"
-
-class StringClass;
-struct IDirect3DTexture8;
-class TextureLoadTaskClass;
-
-class TextureLoader
-{
-public:
-	static void Init(void);
-	static void Deinit(void);
-
-	// Modify given texture size to nearest valid size on current hardware.
-	static void Validate_Texture_Size(unsigned& width, unsigned& height, unsigned& depth);
-
-	static IDirect3DTexture8 * Load_Thumbnail(
-		const StringClass& filename,const Vector3& hsv_shift);
-//		WW3DFormat texture_format);	// Pass WW3D_FORMAT_UNKNOWN if you don't care
-
-	static IDirect3DSurface8 *		Load_Surface_Immediate(
-		const StringClass& filename,
-		WW3DFormat surface_format,		// Pass WW3D_FORMAT_UNKNOWN if you don't care
-		bool allow_compression);
-
-	static void	Request_Thumbnail(TextureBaseClass* tc);
-
-	// Adds a loading task to the system. The task if processed in a separate
-	// thread as soon as possible. The task will appear in finished tasks list
-	// when it's been completed. The texture will be refreshed on the next
-	// update call after appearing to the finished tasks list.
-	static void Request_Background_Loading(TextureBaseClass* tc);
-
-	// Textures can only be created and locked by the main thread so this function sends a request to the texture
-	// handling system to load the texture immediatelly next time it enters the main thread. If this function
-	// is called from the main thread the texture is loaded immediatelly.
-	static void Request_Foreground_Loading(TextureBaseClass* tc);
-
-	static void	Flush_Pending_Load_Tasks(void);
-	static void Update(void(*network_callback)(void) = NULL);
-
-	// returns true if current thread of execution is allowed to make DX8 calls.
-	static bool Is_DX8_Thread(void);
-
-	static void Suspend_Texture_Load();
-	static void Continue_Texture_Load();
-
-	static void Set_Texture_Inactive_Override_Time(int time_ms) {TextureInactiveOverrideTime = time_ms;}
-
-private:
-	static void Process_Foreground_Load			(TextureLoadTaskClass *task);
-	static void Process_Foreground_Thumbnail	(TextureLoadTaskClass *task);
-
-	static void Begin_Load_And_Queue				(TextureLoadTaskClass *task);
-	static void Load_Thumbnail						(TextureBaseClass *tc);
-
-	static bool TextureLoadSuspended;
-
-	// The time in ms before a texture is thrown out.
-	// The default is zero.  The scripted movies set this to reduce texture stalls in movies.
-	static int	TextureInactiveOverrideTime;
-};
-
-class TextureLoadTaskListNodeClass
-{
-	friend class TextureLoadTaskListClass;
-
-	public:
-		TextureLoadTaskListNodeClass(void) : Next(0), Prev(0) { }
-
-		TextureLoadTaskListClass *Get_List(void)		{ return List; }
-
-		TextureLoadTaskListNodeClass *Next;
-		TextureLoadTaskListNodeClass *Prev;
-		TextureLoadTaskListClass *		List;
-};
-
-
-class TextureLoadTaskListClass
-{
-	// This class implements an unsynchronized, double-linked list of TextureLoadTaskClass 
-	// objects, using an embedded list node.
-
-	public:
-		TextureLoadTaskListClass(void);
-
-		// Returns true if list is empty, false otherwise.
-		bool									Is_Empty		(void) const		{ return (Root.Next == &Root); }
-
-		// Add a task to beginning of list
-		void									Push_Front	(TextureLoadTaskClass *task);
-
-		// Add a task to end of list
-		void									Push_Back	(TextureLoadTaskClass *task);
-
-		// Remove and return a task from beginning of list, or NULL if list is empty.
-		TextureLoadTaskClass *			Pop_Front	(void);
-
-		// Remove and return a task from end of list, or NULL if list is empty
-		TextureLoadTaskClass *			Pop_Back		(void);
-
-		// Remove specified task from list, if present
-		void									Remove		(TextureLoadTaskClass *task);
-
-	private:
-		// This list is implemented using a sentinel node.
-		TextureLoadTaskListNodeClass	Root;
-};
-
-
-class SynchronizedTextureLoadTaskListClass : public TextureLoadTaskListClass
-{
-	// This class added thread-safety to the basic TextureLoadTaskListClass.
-
-	public:
-		SynchronizedTextureLoadTaskListClass(void);
-
-		// See comments above for description of member functions.
-		void									Push_Front	(TextureLoadTaskClass *task);
-		void									Push_Back	(TextureLoadTaskClass *task);
-		TextureLoadTaskClass *			Pop_Front	(void);
-		TextureLoadTaskClass *			Pop_Back		(void);
-		void									Remove		(TextureLoadTaskClass *task);
-
-	private:
-		FastCriticalSectionClass		CriticalSection;
-};
-
-/*
-** (gth) The allocation system we're using for TextureLoadTaskClass has gotten a little
-** complicated since Kenny added the new task types for Cube and Volume textures.  The
-** ::Destroy member is used to return a task to the pool now and must be over-ridden in
-** each derived class to put the task back into the correct free list.  
-*/
-
-
-class TextureLoadTaskClass : public TextureLoadTaskListNodeClass
-{
-	public:
-		enum TaskType {
-			TASK_NONE,
-			TASK_THUMBNAIL,
-			TASK_LOAD,
-		};
-
-		enum PriorityType {
-			PRIORITY_LOW,
-			PRIORITY_HIGH,
-		};
-
-		enum StateType {
-			STATE_NONE,
-
-			STATE_LOAD_BEGUN,
-			STATE_LOAD_MIPMAP,
-			STATE_LOAD_COMPLETE,
-
-			STATE_COMPLETE,
-		};
-
-
-		TextureLoadTaskClass(void);
-		~TextureLoadTaskClass(void);
-
-		static TextureLoadTaskClass *	Create			(TextureBaseClass *tc, TaskType type, PriorityType priority);
-		static void				Delete_Free_Pool			(void);
-
-		virtual void			Destroy						(void);
-		virtual void			Init							(TextureBaseClass *tc, TaskType type, PriorityType priority);
-		virtual void			Deinit						(void);
-
-		TaskType					Get_Type						(void) const		{ return Type;				}
-		PriorityType			Get_Priority				(void) const		{ return Priority;		}
-		StateType				Get_State					(void) const		{ return State;			}
-
-		WW3DFormat				Get_Format					(void) const		{ return Format;			}
-		unsigned int			Get_Width					(void) const		{ return Width;			}
-		unsigned int			Get_Height					(void) const		{ return Height;			}
-		unsigned int			Get_Mip_Level_Count		(void) const		{ return MipLevelCount; }
-		unsigned int			Get_Reduction				(void) const		{ return Reduction;		}
-
-		unsigned char *		Get_Locked_Surface_Ptr	(unsigned int level);
-		unsigned int			Get_Locked_Surface_Pitch(unsigned int level) const;
-
-		TextureBaseClass *	Peek_Texture				(void)				{ return Texture;			}
-		IDirect3DTexture8	*	Peek_D3D_Texture			(void)				{ return (IDirect3DTexture8*)D3DTexture;		}
-
-		void						Set_Type						(TaskType t)		{ Type		= t;			}
-		void						Set_Priority				(PriorityType p)	{ Priority	= p;			}
-		void						Set_State					(StateType s)		{ State		= s;			}
-
-		bool						Begin_Load					(void);
-		bool						Load							(void);
-		void						End_Load						(void);
-		void						Finish_Load					(void);
-		void						Apply_Missing_Texture	(void);						
-
-	protected:
-		virtual bool			Begin_Compressed_Load	(void);
-		virtual bool			Begin_Uncompressed_Load	(void);
-
-		virtual bool			Load_Compressed_Mipmap	(void);
-		virtual bool			Load_Uncompressed_Mipmap(void);
-
-		virtual void			Lock_Surfaces				(void);
-		virtual void			Unlock_Surfaces			(void);
-
-		void						Apply							(bool initialize);
-		
-		TextureBaseClass*		Texture;
-		IDirect3DBaseTexture8*	D3DTexture;
-		WW3DFormat				Format;
-
-		unsigned int			Width;
-		unsigned	int			Height;
-		unsigned	int			MipLevelCount;
-		unsigned	int			Reduction;
-		Vector3					HSVShift;
-
-		unsigned char *		LockedSurfacePtr[MIP_LEVELS_MAX];
-		unsigned	int			LockedSurfacePitch[MIP_LEVELS_MAX];
-
-		TaskType					Type;
-		PriorityType			Priority;
-		StateType				State;
-};
-
-class CubeTextureLoadTaskClass : public TextureLoadTaskClass
-{
-public:
-	CubeTextureLoadTaskClass();
-
-	virtual void			Destroy						(void);
-	virtual void			Init							(TextureBaseClass *tc, TaskType type, PriorityType priority);
-	virtual void			Deinit						(void);
-
-protected:
-	virtual bool			Begin_Compressed_Load	(void);
-	virtual bool			Begin_Uncompressed_Load	(void);
-
-	virtual bool			Load_Compressed_Mipmap	(void);
-//	virtual bool			Load_Uncompressed_Mipmap(void);
-
-	virtual void			Lock_Surfaces				(void);
-	virtual void			Unlock_Surfaces			(void);
-
-private:
-	unsigned char*			Get_Locked_CubeMap_Surface_Pointer(unsigned int face, unsigned int level);
-	unsigned int			Get_Locked_CubeMap_Surface_Pitch(unsigned int face, unsigned int level) const;
-
-	IDirect3DCubeTexture8*	Peek_D3D_Cube_Texture(void)				{ return (IDirect3DCubeTexture8*)D3DTexture;		}
-
-	unsigned char*			LockedCubeSurfacePtr[6][MIP_LEVELS_MAX];
-	unsigned int			LockedCubeSurfacePitch[6][MIP_LEVELS_MAX];
-};
-
-class VolumeTextureLoadTaskClass : public TextureLoadTaskClass
-{
-public:
-	VolumeTextureLoadTaskClass();
-
-	virtual void			Destroy						(void);
-	virtual void			Init							(TextureBaseClass *tc, TaskType type, PriorityType priority);
-
-protected:
-	virtual bool			Begin_Compressed_Load	(void);
-	virtual bool			Begin_Uncompressed_Load	(void);
-
-	virtual bool			Load_Compressed_Mipmap	(void);
-//	virtual bool			Load_Uncompressed_Mipmap(void);
-
-	virtual void			Lock_Surfaces				(void);
-	virtual void			Unlock_Surfaces			(void);
-
-private:
-	unsigned char*			Get_Locked_Volume_Pointer(unsigned int level);
-	unsigned int			Get_Locked_Volume_Row_Pitch(unsigned int level);
-	unsigned int			Get_Locked_Volume_Slice_Pitch(unsigned int level);
-
-	IDirect3DVolumeTexture8*	Peek_D3D_Volume_Texture(void)				{ return (IDirect3DVolumeTexture8*)D3DTexture;		}
-
-	unsigned	int			LockedSurfaceSlicePitch[MIP_LEVELS_MAX];
-
-	unsigned int		Depth;
-};
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
deleted file mode 100644
index 89d5e0d82ed..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "texturethumbnail.h"
-#include "hashtemplate.h"
-#include "missingtexture.h"
-#include "TARGA.H"
-#include "ww3dformat.h"
-#include "ddsfile.h"
-#include "textureloader.h"
-#include "bitmaphandler.h"
-#include "ffactory.h"
-#include "RAWFILE.H"
-#include "wwprofile.h"
-#include <windows.h>
-
-static DLListClass<ThumbnailManagerClass> ThumbnailManagerList;
-static ThumbnailManagerClass* GlobalThumbnailManager;
-bool ThumbnailManagerClass::CreateThumbnailIfNotFound=false;
-
-static void Create_Hash_Name(StringClass& name, const StringClass& thumb_name)
-{
-	name=thumb_name;
-	int len=name.Get_Length();
-	WWASSERT(!stricmp(&name[len-4],".tga") || !stricmp(&name[len-4],".dds"));
-	name[len-4]='\0';
-	_strlwr(name.Peek_Buffer());
-}
-
-	/*	file_auto_ptr my_tga_file(_TheFileFactory,filename);
-	if (my_tga_file->Is_Available()) {
-		my_tga_file->Open();
-		unsigned size=my_tga_file->Size();
-		char* tga_memory=new char[size];
-		my_tga_file->Read(tga_memory,size);
-		my_tga_file->Close();
-
-		StringClass pth("data\\");
-		pth+=filename;
-		RawFileClass tmp_tga_file(pth);
-		tmp_tga_file.Create();
-		tmp_tga_file.Write(tga_memory,size);
-		tmp_tga_file.Close();
-		delete[] tga_memory;
-
-	}
-*/
-
-
-ThumbnailClass::ThumbnailClass(
-	ThumbnailManagerClass* manager,
-	const char* name,
-	unsigned char* bitmap,
-	unsigned w,
-	unsigned h,
-	unsigned original_w,
-	unsigned original_h,
-	unsigned original_mip_level_count,
-	WW3DFormat original_format,
-	bool allocated,
-	unsigned long date_time)
-	:
-	Manager(manager),
-	Name(name),
-	Bitmap(bitmap),
-	Allocated(allocated),
-	Width(w),
-	Height(h),
-	OriginalTextureWidth(original_w),
-	OriginalTextureHeight(original_h),
-	OriginalTextureMipLevelCount(original_mip_level_count),
-	OriginalTextureFormat(original_format),
-	DateTime(date_time)
-{
-	Manager->Insert_To_Hash(this);
-}
-
-// ----------------------------------------------------------------------------
-//
-// Load texture and generate mipmap levels if requested. The function tries
-// to create texture that matches targa format. If suitable format is not
-// available, it selects closest matching format and performs color space
-// conversion.
-//
-// ----------------------------------------------------------------------------
-
-ThumbnailClass::ThumbnailClass(ThumbnailManagerClass* manager, const StringClass& filename)
-	:
-	Manager(manager),
-	Bitmap(0),
-	Name(filename),
-	Allocated(false),
-	Width(0),
-	Height(0),
-	OriginalTextureWidth(0),
-	OriginalTextureHeight(0),
-	OriginalTextureMipLevelCount(0),
-	OriginalTextureFormat(WW3D_FORMAT_UNKNOWN),
-	DateTime(0)
-{
-	WWPROFILE(("ThumbnailClass::ThumbnailClass"));
-	unsigned reduction_factor=3;
-
-	// First, try loading image from a DDS file
-	DDSFileClass dds_file(filename,reduction_factor);
-	if (dds_file.Is_Available() && dds_file.Load()) {
-		DateTime=dds_file.Get_Date_Time();
-
-		int len=Name.Get_Length();
-		WWASSERT(len>4);
-		Name[len-3]='d';
-		Name[len-2]='d';
-		Name[len-1]='s';
-
-		unsigned level=0;
-		while (dds_file.Get_Width(level)>32 || dds_file.Get_Height(level)>32) {
-			if (level>=dds_file.Get_Mip_Level_Count()) break;
-			level++;
-		}
-
-		OriginalTextureWidth=dds_file.Get_Full_Width();
-		OriginalTextureHeight=dds_file.Get_Full_Height();
-		OriginalTextureFormat=dds_file.Get_Format();
-		OriginalTextureMipLevelCount=dds_file.Get_Mip_Level_Count();
-		Width=dds_file.Get_Width(0);
-		Height=dds_file.Get_Height(0);
-		Bitmap=W3DNEWARRAY unsigned char[Width*Height*2];
-		Allocated=true;
-		dds_file.Copy_Level_To_Surface(
-			0,			// Level
-			WW3D_FORMAT_A4R4G4B4,
-			Width,
-			Height,
-			Bitmap,
-			Width*2,
-			Vector3(0.0f,0.0f,0.0f));// We don't want to HSV-shift here
-	}
-	// If DDS file can't be used try loading from TGA
-	else {
-		// Make sure the file can be opened. If not, return missing texture.
-		Targa targa;
-		if (TARGA_ERROR_HANDLER(targa.Open(filename,TGA_READMODE),filename)) return;
-
-		// DX8 uses image upside down compared to TGA
-		targa.Header.ImageDescriptor ^= TGAIDF_YORIGIN;
-
-		WW3DFormat src_format,dest_format;
-		unsigned src_bpp=0;
-		Get_WW3D_Format(src_format,src_bpp,targa);
-		if (src_format==WW3D_FORMAT_UNKNOWN) {
-			WWDEBUG_SAY(("Unknown texture format for %s\n",filename));
-			return;
-		}
-
-		// Destination size will be the next power of two square from the larger width and height...
-		OriginalTextureWidth=targa.Header.Width;
-		OriginalTextureHeight=targa.Header.Height;
-		OriginalTextureFormat=src_format;
-		Width=targa.Header.Width>>reduction_factor;
-		Height=targa.Header.Height>>reduction_factor;
-		OriginalTextureMipLevelCount=1;
-		unsigned iw=1;
-		unsigned ih=1;
-		while (iw<OriginalTextureWidth && ih<OriginalTextureHeight) {
-			iw+=iw;
-			ih+=ih;
-			OriginalTextureMipLevelCount++;
-		}
-
-		while (Width>32 || Height>32) {
-			reduction_factor++;
-			Width>>=2;
-			Height>>=2;
-		}
-
-		unsigned poweroftwowidth = 1;
-		while (poweroftwowidth < Width) {
-			poweroftwowidth <<= 1;
-		}
-
-		unsigned poweroftwoheight = 1;
-		while (poweroftwoheight < Height) {
-			poweroftwoheight <<= 1;
-		}
-
-		Width=poweroftwowidth;
-		Height=poweroftwoheight;
-
-		unsigned src_width=targa.Header.Width;
-		unsigned src_height=targa.Header.Height;
-
-		// NOTE: We load the palette but we do not yet support paletted textures!
-		char palette[256*4];
-		targa.SetPalette(palette);
-		if (TARGA_ERROR_HANDLER(targa.Load(filename, TGAF_IMAGE, false),filename)) return;
-
-		// Get time stamp from the tga file
-		{
-			file_auto_ptr my_tga_file(_TheFileFactory,filename);
-			WWASSERT(my_tga_file->Is_Available());
-			my_tga_file->Open();
-			DateTime=my_tga_file->Get_Date_Time();
-			my_tga_file->Close();
-		}
-
-		unsigned char* src_surface=(unsigned char*)targa.GetImage();
-
-		int len=Name.Get_Length();
-		WWASSERT(len>4);
-		Name[len-3]='t';
-		Name[len-2]='g';
-		Name[len-1]='a';
-
-		Bitmap=W3DNEWARRAY unsigned char[Width*Height*2];
-		Allocated=true;
-
-		dest_format=WW3D_FORMAT_A8R8G8B8;
-		BitmapHandlerClass::Copy_Image(
-			Bitmap,
-			Width,
-			Height,
-			Width*2,
-			WW3D_FORMAT_A4R4G4B4,
-			src_surface,
-			src_width,
-			src_height,
-			src_width*src_bpp,
-			src_format,
-			(unsigned char*)targa.GetPalette(),
-			targa.Header.CMapDepth>>3,
-			false);
-	}
-
-	Manager->Insert_To_Hash(this);
-}
-
-ThumbnailClass::~ThumbnailClass()
-{
-	if (Allocated) delete[] Bitmap;
-	Manager->Remove_From_Hash(this);
-}
-
-
-// ----------------------------------------------------------------------------
-ThumbnailManagerClass::ThumbnailManagerClass(const char* thumbnail_filename)
-	:
-	ThumbnailMemory(NULL),
-	ThumbnailFileName(thumbnail_filename),
-	PerTextureTimeStampUsed(false),
-	Changed(false),
-	DateTime(0)
-{
-}
-
-// ----------------------------------------------------------------------------
-ThumbnailManagerClass::~ThumbnailManagerClass()
-{
-	HashTemplateIterator<StringClass,ThumbnailClass*> ite(ThumbnailHash);
-	ite.First();
-	while (!ite.Is_Done()) {
-		ThumbnailClass* thumb=ite.Peek_Value();
-		delete thumb;
-		ite.First();
-	}
-
-	if (ThumbnailMemory) delete[] ThumbnailMemory;
-	ThumbnailMemory=NULL;
-}
-
-// ----------------------------------------------------------------------------
-ThumbnailManagerClass* ThumbnailManagerClass::Peek_Thumbnail_Manager(const char* thumbnail_filename)
-{
-	ThumbnailManagerClass* man=ThumbnailManagerList.Head();
-	while (man) {
-		if (man->ThumbnailFileName==thumbnail_filename) return man;
-		man=man->Succ();
-	}
-	if (GlobalThumbnailManager &&
-		GlobalThumbnailManager->ThumbnailFileName==thumbnail_filename) return GlobalThumbnailManager;
-	return NULL;
-}
-
-// ----------------------------------------------------------------------------
-void ThumbnailManagerClass::Add_Thumbnail_Manager(const char* thumbnail_filename)
-{
-	// First loop over all thumbnail managers to see if we already have this one created. This isn't
-	// supposed to be called often at all and there are usually just couple managers alive,
-	// so we'll do pure string compares here...
-
-	// Must NOT add global manager with this function
-	WWASSERT(stricmp(thumbnail_filename,GLOBAL_THUMBNAIL_MANAGER_FILENAME));
-
-	ThumbnailManagerClass* man=Peek_Thumbnail_Manager(thumbnail_filename);
-	if (man) return;
-
-	// Not found, create and add to the list.
-	man=new ThumbnailManagerClass(thumbnail_filename);
-	ThumbnailManagerList.Add_Tail(man);
-}
-// ----------------------------------------------------------------------------
-void ThumbnailManagerClass::Remove_Thumbnail_Manager(const char* thumbnail_filename)
-{
-	ThumbnailManagerClass* man=ThumbnailManagerList.Head();
-	while (man) {
-		if (man->ThumbnailFileName==thumbnail_filename) {
-			delete man;
-			return;
-		}
-		man=man->Succ();
-	}
-	if (GlobalThumbnailManager &&
-		GlobalThumbnailManager->ThumbnailFileName==thumbnail_filename) {
-		delete GlobalThumbnailManager;
-		GlobalThumbnailManager=NULL;
-	}
-}
-// ----------------------------------------------------------------------------
-ThumbnailClass* ThumbnailManagerClass::Peek_Thumbnail_Instance(const StringClass& name)
-{
-
-	return Get_From_Hash(name);
-}
-
-ThumbnailClass* ThumbnailManagerClass::Peek_Thumbnail_Instance_From_Any_Manager(const StringClass& filename)
-{
-	WWPROFILE(("Peek_Thumbnail_Instance_From_Any_Manager"));
-	ThumbnailManagerClass* thumb_man=ThumbnailManagerList.Head();
-	while (thumb_man) {
-		ThumbnailClass* thumb=thumb_man->Peek_Thumbnail_Instance(filename);
-		if (thumb) return thumb;
-		thumb_man=thumb_man->Succ();
-	}
-
-	if (GlobalThumbnailManager) {
-		ThumbnailClass* thumb=GlobalThumbnailManager->Peek_Thumbnail_Instance(filename);
-		if (thumb) return thumb;
-	}
-
-// If thumbnail is not found, see if we can find a texture. It is possible that the texture is outside of
-// a mix file and didn't get included in any thumbnail database based on a mixfile. If so, we'll add it to
-// our global thumbnail database.
-	if (Is_Thumbnail_Created_If_Not_Found()) {
-		if (GlobalThumbnailManager) {
-			ThumbnailClass* thumb=new ThumbnailClass(GlobalThumbnailManager,filename);
-			if (!thumb->Peek_Bitmap()) {
-				delete thumb;
-				thumb=NULL;
-			}
-			return thumb;
-		}
-	}
-
-	return NULL;
-}
-
-
-void ThumbnailManagerClass::Insert_To_Hash(ThumbnailClass* thumb)
-{
-	Changed=true;
-	StringClass hash_name(0,true);
-	Create_Hash_Name(hash_name,thumb->Get_Name());
-	ThumbnailHash.Insert(hash_name,thumb);
-}
-
-ThumbnailClass* ThumbnailManagerClass::Get_From_Hash(const StringClass& name)
-{
-	StringClass hash_name(0,true);
-	Create_Hash_Name(hash_name,name);
-	return ThumbnailHash.Get(hash_name);
-}
-
-void ThumbnailManagerClass::Remove_From_Hash(ThumbnailClass* thumb)
-{
-	Changed=true;
-	StringClass hash_name(0,true);
-	Create_Hash_Name(hash_name,thumb->Get_Name());
-	ThumbnailHash.Remove(hash_name);
-}
-
-void ThumbnailManagerClass::Init()
-{
-	WWASSERT(GlobalThumbnailManager == NULL);
-	GlobalThumbnailManager=new ThumbnailManagerClass(GLOBAL_THUMBNAIL_MANAGER_FILENAME);
-	GlobalThumbnailManager->Enable_Per_Texture_Time_Stamp(true);
-}
-
-void ThumbnailManagerClass::Deinit()
-{
-	while (ThumbnailManagerClass* man=ThumbnailManagerList.Head()) {
-		delete man;
-	}
-	if (GlobalThumbnailManager) {
-		delete GlobalThumbnailManager;
-		GlobalThumbnailManager=NULL;
-	}
-}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h
deleted file mode 100644
index 6efa782afdb..00000000000
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// 08/07/02 KM Texture class redesign (revisited)
-#ifndef TEXTURETHUMBNAIL_H
-#define TEXTURETHUMBNAIL_H
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#include "always.h"
-#include "wwstring.h"
-#include "hashtemplate.h"
-#include "dllist.h"
-#include "ww3dformat.h"
-
-#define GLOBAL_THUMBNAIL_MANAGER_FILENAME "global.th6"
-
-class ThumbnailManagerClass;
-
-// ----------------------------------------------------------------------------
-
-class ThumbnailClass
-{
-	friend ThumbnailManagerClass;
-
-	StringClass Name;
-	unsigned char* Bitmap;
-	unsigned Width;
-	unsigned Height;
-	unsigned OriginalTextureWidth;
-	unsigned OriginalTextureHeight;
-	unsigned OriginalTextureMipLevelCount;
-	WW3DFormat OriginalTextureFormat;
-	unsigned long DateTime;
-	bool Allocated;	// if true, destructor will free the memory
-	ThumbnailManagerClass* Manager;
-
-	ThumbnailClass(
-		ThumbnailManagerClass* manager,
-		const char* name, 
-		unsigned char* bitmap, 
-		unsigned w, 
-		unsigned h, 
-		unsigned original_w, 
-		unsigned original_h, 
-		unsigned original_mip_level_count,
-		WW3DFormat original_format,
-		bool allocated,
-		unsigned long date_time);
-	ThumbnailClass(
-		ThumbnailManagerClass* manager,
-		const StringClass& filename);
-	~ThumbnailClass();
-public:
-
-	unsigned char* Peek_Bitmap() { return Bitmap; }
-	WW3DFormat Get_Format() { return WW3D_FORMAT_A4R4G4B4; }
-	unsigned Get_Width() const { return Width; }
-	unsigned Get_Height() const { return Height; }
-	unsigned Get_Original_Texture_Width() const { return OriginalTextureWidth; }
-	unsigned Get_Original_Texture_Height() const { return OriginalTextureHeight; }
-	unsigned Get_Original_Texture_Mip_Level_Count() const { return OriginalTextureMipLevelCount; }
-	WW3DFormat Get_Original_Texture_Format() const { return OriginalTextureFormat; }
-	unsigned long Get_Date_Time() const { return DateTime; }
-	const StringClass& Get_Name() const { return Name; }
-
-};
-
-// ----------------------------------------------------------------------------
-
-class ThumbnailManagerClass : public DLNodeClass<ThumbnailManagerClass>
-{
-	W3DMPO_GLUE(ThumbnailManagerClass);
-
-	friend ThumbnailClass;
-
-	static bool CreateThumbnailIfNotFound;
-	bool PerTextureTimeStampUsed;
-	StringClass ThumbnailFileName;
-	HashTemplateClass<StringClass,ThumbnailClass*> ThumbnailHash;
-	unsigned char* ThumbnailMemory;
-	bool Changed;
-	unsigned long DateTime;
-
-	ThumbnailManagerClass(const char* thumbnail_filename);
-	~ThumbnailManagerClass();
-
-	void Remove_From_Hash(ThumbnailClass* thumb);
-	void Insert_To_Hash(ThumbnailClass* thumb);
-	ThumbnailClass* Get_From_Hash(const StringClass& name);
-
-public:
-	ThumbnailClass* Peek_Thumbnail_Instance(const StringClass& name);
-
-	static void Add_Thumbnail_Manager(const char* thumbnail_filename);
-	static void Remove_Thumbnail_Manager(const char* thumbnail_filename);
-	static ThumbnailManagerClass* Peek_Thumbnail_Manager(const char* thumbnail_filename);
-
-	static ThumbnailClass* Peek_Thumbnail_Instance_From_Any_Manager(const StringClass& name);
-
-	static bool Is_Thumbnail_Created_If_Not_Found() { return CreateThumbnailIfNotFound; }
-	static void Create_Thumbnail_If_Not_Found(bool create) { CreateThumbnailIfNotFound=create; }
-
-	bool Is_Per_Texture_Time_Stamp_Used() const { return PerTextureTimeStampUsed; }
-	void Enable_Per_Texture_Time_Stamp(bool enable) { PerTextureTimeStampUsed=enable; }
-
-	static void Init();
-	static void Deinit();
-};
-
-// ----------------------------------------------------------------------------
-
-#endif
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
index ee73dfbe983..288d4cec6f8 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
@@ -43,12 +43,10 @@
 #include "w3d_util.h"
 #include "chunkio.h"
 #include "w3derr.h"
-#include "INI.H"
-#include "XSTRAW.H"
+#include "INI.h"
+#include "XSTRAW.h"
 #include "dx8wrapper.h"
 
-#include <stdio.h>
-#include <string.h>
 
 static unsigned int unique=1;
 
@@ -89,9 +87,9 @@ VertexMaterialClass::VertexMaterialClass(void):
 
 	for (i=0; i<MeshBuilderClass::MAX_STAGES; i++)
 	{
-		Mapper[i]=NULL;		
+		Mapper[i]=NULL;
 		UVSource[i] = i;
-	}	
+	}
 
 #ifdef DYN_MAT8
 	MaterialDyn=W3DNEW DynD3DMATERIAL8;
@@ -132,7 +130,7 @@ VertexMaterialClass::VertexMaterialClass(const VertexMaterialClass & src) :
 		}
 
 		UVSource[i] = src.UVSource[i];
-	}	
+	}
 
 #ifdef DYN_MAT8
 	MaterialDyn=W3DNEW DynD3DMATERIAL8;
@@ -170,7 +168,7 @@ VertexMaterialClass::~VertexMaterialClass(void)
 }
 
 VertexMaterialClass & VertexMaterialClass::operator = (const VertexMaterialClass &src)
-{	
+{
 
 	if (this != &src) {
 		Name=src.Name;
@@ -205,7 +203,7 @@ VertexMaterialClass & VertexMaterialClass::operator = (const VertexMaterialClass
 unsigned long VertexMaterialClass::Compute_CRC(void) const
 {
 	unsigned long crc = 0;
-	
+
 // don't include the name when determining whether two vertex materials match
 //	crc = CRC_Memory(reinterpret_cast<const unsigned char *>(Name.Peek_Buffer()),sizeof(char)*strlen(Name),crc);
 
@@ -231,7 +229,7 @@ unsigned long VertexMaterialClass::Compute_CRC(void) const
 
 void VertexMaterialClass::Get_Ambient(Vector3 * set) const
 {
-	assert(set); 
+	assert(set);
 	*set=Vector3(Material->Ambient.r,Material->Ambient.g,Material->Ambient.b);
 }
 
@@ -240,7 +238,7 @@ void VertexMaterialClass::Set_Ambient(const Vector3 & color)
 	CRCDirty=true;
 	Material->Ambient.r=color.X;
 	Material->Ambient.g=color.Y;
-	Material->Ambient.b=color.Z;	
+	Material->Ambient.b=color.Z;
 }
 
 void VertexMaterialClass::Set_Ambient(float r,float g,float b)
@@ -248,14 +246,14 @@ void VertexMaterialClass::Set_Ambient(float r,float g,float b)
 	CRCDirty=true;
 	Material->Ambient.r=r;
 	Material->Ambient.g=g;
-	Material->Ambient.b=b;	
+	Material->Ambient.b=b;
 }
 
 // Diffuse Get and Sets
 
 void VertexMaterialClass::Get_Diffuse(Vector3 * set) const
 {
-	assert(set); 
+	assert(set);
 	*set=Vector3(Material->Diffuse.r,Material->Diffuse.g,Material->Diffuse.b);
 }
 
@@ -264,7 +262,7 @@ void VertexMaterialClass::Set_Diffuse(const Vector3 & color)
 	CRCDirty=true;
 	Material->Diffuse.r=color.X;
 	Material->Diffuse.g=color.Y;
-	Material->Diffuse.b=color.Z;	
+	Material->Diffuse.b=color.Z;
 }
 
 void VertexMaterialClass::Set_Diffuse(float r,float g,float b)
@@ -272,14 +270,14 @@ void VertexMaterialClass::Set_Diffuse(float r,float g,float b)
 	CRCDirty=true;
 	Material->Diffuse.r=r;
 	Material->Diffuse.g=g;
-	Material->Diffuse.b=b;	
+	Material->Diffuse.b=b;
 }
 
 // Specular Get and Sets
 
 void VertexMaterialClass::Get_Specular(Vector3 * set) const
 {
-	assert(set); 
+	assert(set);
 	*set=Vector3(Material->Specular.r,Material->Specular.g,Material->Specular.b);
 }
 
@@ -288,7 +286,7 @@ void VertexMaterialClass::Set_Specular(const Vector3 & color)
 	CRCDirty=true;
 	Material->Specular.r=color.X;
 	Material->Specular.g=color.Y;
-	Material->Specular.b=color.Z;	
+	Material->Specular.b=color.Z;
 }
 
 void VertexMaterialClass::Set_Specular(float r,float g,float b)
@@ -303,7 +301,7 @@ void VertexMaterialClass::Set_Specular(float r,float g,float b)
 
 void VertexMaterialClass::Get_Emissive(Vector3 * set) const
 {
-	assert(set); 
+	assert(set);
 	*set=Vector3(Material->Emissive.r,Material->Emissive.g,Material->Emissive.b);
 }
 
@@ -349,7 +347,7 @@ void	VertexMaterialClass::Set_Opacity(float o)
 void	VertexMaterialClass::Set_Ambient_Color_Source(ColorSourceType src)
 {
 	CRCDirty=true;
-	switch (src) 
+	switch (src)
 	{
 	case	COLOR1:		AmbientColorSource = D3DMCS_COLOR1; break;
 	case	COLOR2:		AmbientColorSource = D3DMCS_COLOR2; break;
@@ -360,7 +358,7 @@ void	VertexMaterialClass::Set_Ambient_Color_Source(ColorSourceType src)
 void	VertexMaterialClass::Set_Emissive_Color_Source(ColorSourceType src)
 {
 	CRCDirty=true;
-	switch (src) 
+	switch (src)
 	{
 	case	COLOR1:		EmissiveColorSource = D3DMCS_COLOR1; break;
 	case	COLOR2:		EmissiveColorSource = D3DMCS_COLOR2; break;
@@ -371,7 +369,7 @@ void	VertexMaterialClass::Set_Emissive_Color_Source(ColorSourceType src)
 void	VertexMaterialClass::Set_Diffuse_Color_Source(ColorSourceType src)
 {
 	CRCDirty=true;
-	switch (src) 
+	switch (src)
 	{
 	case	COLOR1:		DiffuseColorSource = D3DMCS_COLOR1; break;
 	case	COLOR2:		DiffuseColorSource = D3DMCS_COLOR2; break;
@@ -379,32 +377,32 @@ void	VertexMaterialClass::Set_Diffuse_Color_Source(ColorSourceType src)
 	}
 }
 
-VertexMaterialClass::ColorSourceType 
+VertexMaterialClass::ColorSourceType
 VertexMaterialClass::Get_Ambient_Color_Source(void)
 {
-	switch(AmbientColorSource) 
+	switch(AmbientColorSource)
 	{
 	case D3DMCS_COLOR1:	return COLOR1;
 	case D3DMCS_COLOR2:	return COLOR2;
 	default:					return MATERIAL;
 	}
-}	
+}
 
-VertexMaterialClass::ColorSourceType 
+VertexMaterialClass::ColorSourceType
 VertexMaterialClass::Get_Emissive_Color_Source(void)
 {
-	switch(EmissiveColorSource) 
+	switch(EmissiveColorSource)
 	{
 	case D3DMCS_COLOR1:	return COLOR1;
 	case D3DMCS_COLOR2:	return COLOR2;
 	default:					return MATERIAL;
 	}
-}	
+}
 
-VertexMaterialClass::ColorSourceType	
+VertexMaterialClass::ColorSourceType
 VertexMaterialClass::Get_Diffuse_Color_Source(void)
 {
-	switch(DiffuseColorSource) 
+	switch(DiffuseColorSource)
 	{
 	case D3DMCS_COLOR1:	return COLOR1;
 	case D3DMCS_COLOR2:	return COLOR2;
@@ -433,7 +431,7 @@ int VertexMaterialClass::Get_UV_Source(int stage)
 void VertexMaterialClass::Init_From_Material3(const W3dMaterial3Struct & mat3)
 {
 	Vector3 tmp0,tmp1,tmp2;
-	
+
 	W3dUtilityClass::Convert_Color(mat3.DiffuseColor,&tmp0);
 	W3dUtilityClass::Convert_Color(mat3.DiffuseCoefficients,&tmp1);
 	tmp2.X = tmp0.X * tmp1.X;
@@ -523,10 +521,10 @@ void VertexMaterialClass::Parse_W3dVertexMaterialStruct(const W3dVertexMaterialS
 	Vector3 tmp;
 	W3dUtilityClass::Convert_Color(vmat.Ambient,&tmp);
 	Set_Ambient(tmp);
-	
+
 	W3dUtilityClass::Convert_Color(vmat.Diffuse,&tmp);
 	Set_Diffuse(tmp);
-	
+
 	W3dUtilityClass::Convert_Color(vmat.Specular,&tmp);
 	Set_Specular(tmp);
 
@@ -547,14 +545,14 @@ void VertexMaterialClass::Parse_W3dVertexMaterialStruct(const W3dVertexMaterialS
 
 void VertexMaterialClass::Parse_Mapping_Args(const W3dVertexMaterialStruct & vmat,char * mapping0_arg_buffer,char * mapping1_arg_buffer)
 {
-	
+
 	// Read an INIClass from the mapping argument buffer - this will be used
 	// to initialize any special mappers used.
 	INIClass mapping0_arg_ini;
 	if (mapping0_arg_buffer) {
 
 		int mapping0_arg_len = strlen(mapping0_arg_buffer);
-	
+
 		char *extended_arg_buffer = MSGW3DNEWARRAY("VertexMaterialClassTemp") char[mapping0_arg_len + 10];
 		sprintf(extended_arg_buffer, "[Args]\n%s", mapping0_arg_buffer);
 		mapping0_arg_len = strlen(extended_arg_buffer) + 1;
@@ -584,11 +582,11 @@ void VertexMaterialClass::Parse_Mapping_Args(const W3dVertexMaterialStruct & vma
 	}
 
 	// Set up the vertex mapper.  If it is one of the simple
-	// ones, set the pointer to one of the global instances. 
+	// ones, set the pointer to one of the global instances.
 	int mapping = vmat.Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK;
 
 	switch(mapping) {
-		
+
 		case W3DVERTMAT_STAGE0_MAPPING_UV:
 			break;
 
@@ -605,7 +603,7 @@ void VertexMaterialClass::Parse_Mapping_Args(const W3dVertexMaterialStruct & vma
 				Set_Mapper(mapper);
 				mapper->Release_Ref();
 			}
-			break;		
+			break;
 		case W3DVERTMAT_STAGE0_MAPPING_LINEAR_OFFSET:
 			{
 				LinearOffsetTextureMapperClass *mapper =
@@ -684,7 +682,7 @@ void VertexMaterialClass::Parse_Mapping_Args(const W3dVertexMaterialStruct & vma
 				Set_Mapper(mapper,0);
 				mapper->Release_Ref();
 			}
-			break;		
+			break;
 
 		case W3DVERTMAT_STAGE0_MAPPING_WS_ENVIRONMENT:
 			{
@@ -791,7 +789,7 @@ void VertexMaterialClass::Parse_Mapping_Args(const W3dVertexMaterialStruct & vma
 			mapper->Release_Ref();
 		}
 		break;
-		
+
 		case W3DVERTMAT_STAGE1_MAPPING_SCREEN:
 		{
 			ScreenMapperClass *mapper =
@@ -861,7 +859,7 @@ void VertexMaterialClass::Parse_Mapping_Args(const W3dVertexMaterialStruct & vma
 				Set_Mapper(mapper,1);
 				mapper->Release_Ref();
 			}
-			break;		
+			break;
 
 		case W3DVERTMAT_STAGE1_MAPPING_WS_ENVIRONMENT:
 			{
@@ -965,8 +963,8 @@ void VertexMaterialClass::Apply(void) const
 		if (Mapper[i]) {
 			Mapper[i]->Apply(UVSource[i]);
 		} else {
-			DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | UVSource[i]);	
-			DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_DISABLE);		
+			DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | UVSource[i]);
+			DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_DISABLE);
 		}
 	}
 }
@@ -974,7 +972,7 @@ void VertexMaterialClass::Apply(void) const
 void VertexMaterialClass::Apply_Null(void)
 {
 	int i;
-	static D3DMATERIAL8 default_settings = 
+	static D3DMATERIAL8 default_settings =
 	{
 		{ 1.0f, 1.0f, 1.0f, 1.0f },	// diffuse
 		{ 1.0f, 1.0f, 1.0f, 1.0f },	// ambient
@@ -992,8 +990,8 @@ void VertexMaterialClass::Apply_Null(void)
 
 	// set to default values if no mappers
 	for (i=0; i<MeshBuilderClass::MAX_STAGES; i++) {
-		DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | i);	
-		DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_DISABLE);		
+		DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXCOORDINDEX,D3DTSS_TCI_PASSTHRU | i);
+		DX8Wrapper::Set_DX8_Texture_Stage_State(i,D3DTSS_TEXTURETRANSFORMFLAGS,D3DTTFF_DISABLE);
 	}
 }
 
@@ -1069,4 +1067,4 @@ VertexMaterialClass * VertexMaterialClass::Get_Preset(PresetType type)
 	WWASSERT(type<PRESET_COUNT);
 	Presets[type]->Add_Ref();
 	return Presets[type];
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
index 15d7c3484df..2ee5548681c 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
@@ -34,17 +34,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef VERTMATERIAL_H
-#define VERTMATERIAL_H
 
 #include "always.h"
 
-#include "refcount.h"
 #include "vector3.h"
 #include "w3d_file.h"
 #include "meshbuild.h"
@@ -52,8 +45,6 @@
 #include "mapper.h"
 #include "wwstring.h"
 
-#include <string.h>
-
 class ChunkLoadClass;
 class ChunkSaveClass;
 
@@ -106,8 +97,8 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 		PRELIT_NODIFFUSE,
 		PRESET_COUNT
 	};
-		
-	
+
+
 	VertexMaterialClass(void);
 	VertexMaterialClass(const VertexMaterialClass & src);
 	~VertexMaterialClass(void);
@@ -119,7 +110,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 	** Name Access
 	*/
 	void					Set_Name(const char * name)
-	{	
+	{
 		Name = name;
 	}
 
@@ -154,7 +145,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 	void			Get_Ambient(Vector3 * set_color) const;
 	void			Set_Ambient(const Vector3 & color);
 	void			Set_Ambient(float r,float g,float b);
-	
+
 	void			Get_Diffuse(Vector3 * set_color) const;
 	void			Set_Diffuse(const Vector3 & color);
 	void			Set_Diffuse(float r,float g,float b);
@@ -162,7 +153,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 	void			Get_Specular(Vector3 * set_color) const;
 	void			Set_Specular(const Vector3 & color);
 	void			Set_Specular(float r,float g,float b);
-	
+
 	void			Get_Emissive(Vector3 * set_color) const;
 	void			Set_Emissive(const Vector3 & color);
 	void			Set_Emissive(float r,float g,float b);
@@ -172,8 +163,8 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 
 	/*
 	** Color source control.  Note that if you set one of the sources to be one of
-	** the arrays, then the setting in the material is ignored.  (i.e. if you 
-	** set the diffuse source to array0, then the diffuse color set into the 
+	** the arrays, then the setting in the material is ignored.  (i.e. if you
+	** set the diffuse source to array0, then the diffuse color set into the
 	** vertex material is ignored.
 	*/
 	void					Set_Ambient_Color_Source(ColorSourceType src);
@@ -194,7 +185,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 	int					Get_UV_Source(int stage);
 
 	/*
-	** Mapper control.  
+	** Mapper control.
 	*/
 	inline void							Set_Mapper(TextureMapperClass *mapper,int stage=0);
 	inline TextureMapperClass *	Get_Mapper(int stage=0);
@@ -214,13 +205,13 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 	/*
 	** CRC, used by the loading code to build a list of the unique materials
 	*/
-	inline unsigned long Get_CRC(void) const
+	unsigned long Get_CRC(void) const
 	{
 		if (CRCDirty) {
 			CRC=Compute_CRC();
 			CRCDirty=false;
 		}
-			
+
 		return CRC;
 	}
 
@@ -279,7 +270,7 @@ class VertexMaterialClass : public W3DMPO, public RefCountClass
 inline void VertexMaterialClass::Set_Mapper(TextureMapperClass *mapper, int stage)
 {
 	CRCDirty=true;
-	REF_PTR_SET(Mapper[stage],mapper);	
+	REF_PTR_SET(Mapper[stage],mapper);
 }
 
 inline TextureMapperClass * VertexMaterialClass::Get_Mapper(int stage)
@@ -319,6 +310,3 @@ inline bool VertexMaterialClass::Are_Mappers_Time_Variant(void) const
 	}
 	return false;
 }
-
-#endif //VERTMATERIAL_H
-
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h
index e7e3f642b80..65201f6a9d5 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h
@@ -17,31 +17,25 @@
 */
 
 /* $Header: /Commando/Code/Tools/max2w3d/w3d_file.h 19    9/12/01 2:08p Greg_h $ */
-/*********************************************************************************************** 
- ***                            Confidential - Westwood Studios                              *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Commando / G 3D Library                                      * 
- *                                                                                             * 
- *                     $Archive:: /Commando/Code/Tools/max2w3d/w3d_file.h                     $* 
- *                                                                                             * 
- *                      $Author:: Greg_h                                                      $* 
- *                                                                                             * 
- *                     $Modtime:: 9/12/01 2:04p                                               $* 
- *                                                                                             * 
- *                    $Revision:: 19                                                          $* 
- *                                                                                             * 
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+/***********************************************************************************************
+ ***                            Confidential - Westwood Studios                              ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Commando / G 3D Library                                      *
+ *                                                                                             *
+ *                     $Archive:: /Commando/Code/Tools/max2w3d/w3d_file.h                     $*
+ *                                                                                             *
+ *                      $Author:: Greg_h                                                      $*
+ *                                                                                             *
+ *                     $Modtime:: 9/12/01 2:04p                                               $*
+ *                                                                                             *
+ *                    $Revision:: 19                                                          $*
+ *                                                                                             *
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef W3D_FILE_H
-#define W3D_FILE_H
 
 #include "always.h"
 #include "bittype.h"
@@ -80,50 +74,50 @@ Version 1.0:
 		W3D_CHUNK_TEXCOORDS,				// array of texture coordinates
 		W3D_CHUNK_MATERIALS,				// array of materials
 		W3D_CHUNK_TRIANGLES,				// array of triangles
-		W3D_CHUNK_SURRENDER_TRIANGLES,// array of surrender format tris	
+		W3D_CHUNK_SURRENDER_TRIANGLES,// array of surrender format tris
 		W3D_CHUNK_MESH_USER_TEXT,		// Name of owning hierarchy, text from the MAX comment field
-		
+
 	HIERARCHY TREES - contained the following chunks:
 		W3D_CHUNK_HIERARCHY_HEADER,
 		W3D_CHUNK_PIVOTS,
-		W3D_CHUNK_PIVOT_FIXUPS,		
+		W3D_CHUNK_PIVOT_FIXUPS,
 
-	HIERARCHY ANIMATIONS - contained the following chunks:  
+	HIERARCHY ANIMATIONS - contained the following chunks:
 		W3D_CHUNK_ANIMATION_HEADER,
 		W3D_CHUNK_ANIMATION_CHANNEL,
 
 	MESH CONNECTIONS - (blueprint for a hierarchical model) contained these chunks:
 
-	 
+
 Version 2.0:
 
-	MESHES: 
+	MESHES:
 
 	- Mesh header now contains the hierarchy model name.  The mesh name will be built
 	as <HModelName>.<MeshName> instead of the old convention: <HTreeName>.<Meshname>
 
-	- The material chunk is replaced with a new material structure which contains 
+	- The material chunk is replaced with a new material structure which contains
 	some information for animating materials.
-	
-	- Vertex Influences link vertices of a mesh to bones in a hierarchy, this is 
-	the information needed for skinning.  
-	
+
+	- Vertex Influences link vertices of a mesh to bones in a hierarchy, this is
+	the information needed for skinning.
+
 	- Damage chunks added.  A damage chunk contains	a new set of materials, a set
 	of vertex offsets, and a set of vertex colors.
-	
+
 	Added the following chunks:
 
-		W3D_CHUNK_VERTEX_COLORS,		
-		W3D_CHUNK_VERTEX_INFLUENCES,	
-		W3D_CHUNK_DAMAGE,					
+		W3D_CHUNK_VERTEX_COLORS,
+		W3D_CHUNK_VERTEX_INFLUENCES,
+		W3D_CHUNK_DAMAGE,
 		W3D_CHUNK_DAMAGE_HEADER,
 			W3D_CHUNK_DAMAGE_MATERIALS,
 			W3D_CHUNK_DAMAGE_VERTICES,
 			W3D_CHUNK_DAMAGE_COLORS,
-		W3D_CHUNK_MATERIALS2,		
+		W3D_CHUNK_MATERIALS2,
 
 	MESH CONNECTIONS: Hierarchy models can now contain skins and collision meshes
-	in addition to the normal meshes.  
+	in addition to the normal meshes.
 
 		W3D_CHUNK_COLLISION_CONNECTION,		// collision meshes connected to the hierarchy
 		W3D_CHUNK_SKIN_CONNECTION,				// skins connected to the hierarchy
@@ -143,14 +137,14 @@ Dec 12, 1997
 Feb 6, 1998
 
 	Added W3D_CHUNK_SECTMESH and its sub-chunks.  This will be the file
-	format for the terrain geometry exported from POV's Atlas tool.  
+	format for the terrain geometry exported from POV's Atlas tool.
 
 March 29, 1998 : Version 3.0
 
 	- New material chunk which supports the new features of the 3D engine
 	- Modified HTrees to always have a root transform to remove all of the
 	  special case -1 bone indexes.
-	- Added new mesh types, A mesh can now be categorized as: normal, 
+	- Added new mesh types, A mesh can now be categorized as: normal,
 	  aligned, skin, collision, or shadow.
 
 June 22, 1998
@@ -159,9 +153,9 @@ June 22, 1998
 
 	Adding a new type of object: The 'Tilemap'.  This simple-sounding object
 	is a binary partition tree of tiles where tiles are rectangular regions of
-	space.  In each leaf to the tree, a mesh is referenced.  The tile map is 
+	space.  In each leaf to the tree, a mesh is referenced.  The tile map is
 	made of several chunks:
-	
+
 	- W3D_CHUNK_TILEMAP
 		- W3D_CHUNK_TILEMAP_HEADER
 		- W3D_CHUNK_TILES
@@ -177,7 +171,7 @@ June 22, 1998
 			- W3D_CHUNK_TILE_INSTANCE
 
 October 19, 1998
-	
+
 	Created the w3d_obsolete.h header file and moved everything that I could into
 	it.  This header was getting so messy that even I couldn't understand it so
 	hopefully this helps a little...
@@ -188,10 +182,10 @@ October 19, 1998
 	- per pass vertex diffuse color arrays
 	- per pass vertex specular color arrays
 	- per pass vertex pre-calced diffuse illumination arrays
-	
+
 	In addition, the way you describe the materials for a mesh has *completely*
 	changed.  The new system separates the concepts of VertexMaterial, Texture
-	and Shader.  A VertexMaterial defines the parameters which control the 
+	and Shader.  A VertexMaterial defines the parameters which control the
 	gradient calculations for vertices.  Textures you know about.  Shaders
 	define how the gradients (diffuse and specular) are combined with the texture
 	and the frame buffer.  In addition, a mesh can have several passes; each
@@ -207,13 +201,13 @@ October 19, 1998
 	The culling system changed a bit requiring some re-working of the "Tilemap"
 	so I have removed the tilemap chunks.  At this point in time, all of the AABTree
 	building is being done at run-time.  Once we get the editor a little farther
-	along, we'll define some new chunks for this stuff.  
+	along, we'll define some new chunks for this stuff.
 
 	At this point in time, meshes look like the following.  I've placed an asterisk
 	next to the new chunk types.
 
 	W3D_CHUNK_MESH
-		W3D_CHUNK_MESH_HEADER3					
+		W3D_CHUNK_MESH_HEADER3
 		W3D_CHUNK_MESH_USER_TEXT
 		W3D_CHUNK_VERTICES
 		W3D_CHUNK_VERTEX_NORMALS
@@ -223,7 +217,7 @@ October 19, 1998
 
 *		W3D_CHUNK_MATERIAL_INFO					// how many passes, vertex mtls, shaders, and textures...
 *		W3D_CHUNK_SHADERS							// array of W3dShaderStruct's
-*		W3D_CHUNK_VERTEX_MATERIALS				
+*		W3D_CHUNK_VERTEX_MATERIALS
 *			W3D_CHUNK_VERTEX_MATERIAL
 *				W3D_CHUNK_VERTEX_MATERIAL_NAME
 *				W3D_CHUNK_VERTEX_MATERIAL_INFO
@@ -242,14 +236,14 @@ October 19, 1998
 *			W3D_CHUNK_DCG
 *			W3D_CHUNK_DIG
 *			W3D_CHUNK_SCG
-			
+
 *			W3D_CHUNK_TEXTURE_STAGE
 *				W3D_CHUNK_TEXTURE_IDS
 *				W3D_CHUNK_STAGE_TEXCOORDS
 
 
-	Added a Collection chunk type.  When we export a bunch of independent meshes 
-	(turning off the hierarchy and animation options) this chunk will be added 
+	Added a Collection chunk type.  When we export a bunch of independent meshes
+	(turning off the hierarchy and animation options) this chunk will be added
 	on to the end of the file.  It lists by name each render object that was
 	defined in the file.  Presumably the run-time asset manager will be able
 	to give you a "collection" render object which will be named the same as
@@ -260,8 +254,8 @@ October 19, 1998
 	Added the W3D_CHUNK_POINTS chunk.  This is used to implement "snap points"
 	for the level editor.  It is just an array of points that were found in
 	the max scene (helper object->point).  We make these points co-incide in
-	the level editor to snap objects together.  This chunk can occur inside a 
-	mesh, hmodel, or collection chunk.  When it does, the points should simply 
+	the level editor to snap objects together.  This chunk can occur inside a
+	mesh, hmodel, or collection chunk.  When it does, the points should simply
 	be associated with the model being defined.
 
 August 5, 1999
@@ -284,7 +278,7 @@ March 31, 2000
   different application. Now the information will indicate how a w3d asset with the
   same name as that in the node should pre-transform itself relative to the object
   that contains the transform node.
-  
+
 April 07, 2000
 
   Added W3D_CHUNK_LIGHTSCAPE, W3D_CHUNK_LIGHTSCAPE_LIGHT and W3D_CHUNK_LIGHT_TRANSFORM.
@@ -302,7 +296,7 @@ August 5, 2000
   Added W3D_CHUNK_LIGHT_GLARE and its sub-chunks.  Light glares are going to
   be a new 'geometry type' which simply define points where light glare effects
   should be placed.  The application will supply a callback to the WW3D code
-  which indicates the visibilty of any light glares in the view frustum.  
+  which indicates the visibilty of any light glares in the view frustum.
 
 June 5, 2001
 
@@ -312,7 +306,7 @@ June 5, 2001
 TheSuperHackers @forwardport:
 April 5, 2025
 
-  Added W3D_CHUNK_FX_SHADERS and subchunks, which were added in BFME2. These 
+  Added W3D_CHUNK_FX_SHADERS and subchunks, which were added in BFME2. These
   chunks are used to define usage of a specific shader and pass params.
 
 April 21, 2025
@@ -342,14 +336,14 @@ April 21, 2025
 	W3d to prevent naming conflicts with in-game structures which
 	may be slightly different than the on-disk structures.
 
-	Oct 19,1998: Moved obsolete chunk id's to w3d_obsolete.h, added many 
+	Oct 19,1998: Moved obsolete chunk id's to w3d_obsolete.h, added many
 	new chunk types.
 
 ********************************************************************************/
 
 enum {
 
-	W3D_CHUNK_MESH											=0x00000000,	// Mesh definition 
+	W3D_CHUNK_MESH											=0x00000000,	// Mesh definition
 		W3D_CHUNK_VERTICES								=0x00000002,	// array of vertices (array of W3dVectorStruct's)
 		W3D_CHUNK_VERTEX_NORMALS						=0x00000003,	// array of normals (array of W3dVectorStruct's)
 		W3D_CHUNK_MESH_USER_TEXT						=0x0000000C,	// Text from the MAX comment field (Null terminated string)
@@ -357,7 +351,7 @@ enum {
 		W3D_CHUNK_MESH_HEADER3							=0x0000001F,	//	mesh header contains general info about the mesh. (W3dMeshHeader3Struct)
 		W3D_CHUNK_TRIANGLES								=0x00000020,	// New improved triangles chunk (array of W3dTriangleStruct's)
 		W3D_CHUNK_VERTEX_SHADE_INDICES				=0x00000022,	// shade indexes for each vertex (array of uint32's)
-		
+
 		W3D_CHUNK_PRELIT_UNLIT							=0x00000023,	// optional unlit material chunk wrapper
 		W3D_CHUNK_PRELIT_VERTEX							=0x00000024,	// optional vertex-lit material chunk wrapper
 		W3D_CHUNK_PRELIT_LIGHTMAP_MULTI_PASS		=0x00000025,	// optional lightmapped multi-pass material chunk wrapper
@@ -366,7 +360,7 @@ enum {
 			W3D_CHUNK_MATERIAL_INFO						=0x00000028,	// materials information, pass count, etc (contains W3dMaterialInfoStruct)
 
 			W3D_CHUNK_SHADERS								=0x00000029,	// shaders (array of W3dShaderStruct's)
-			
+
 			W3D_CHUNK_VERTEX_MATERIALS					=0x0000002A,	// wraps the vertex materials
 				W3D_CHUNK_VERTEX_MATERIAL				=0x0000002B,
 					W3D_CHUNK_VERTEX_MATERIAL_NAME	=0x0000002C,	// vertex material name (NULL-terminated string)
@@ -378,7 +372,7 @@ enum {
 				W3D_CHUNK_TEXTURE							=0x00000031,	// wraps a texture definition
 					W3D_CHUNK_TEXTURE_NAME				=0x00000032,	// texture filename (NULL-terminated string)
 					W3D_CHUNK_TEXTURE_INFO				=0x00000033,	// optional W3dTextureInfoStruct
-			
+
 			W3D_CHUNK_MATERIAL_PASS						=0x00000038,	// wraps the information for a single material pass
 				W3D_CHUNK_VERTEX_MATERIAL_IDS			=0x00000039,	// single or per-vertex array of uint32 vertex material indices (check chunk size)
 				W3D_CHUNK_SHADER_IDS						=0x0000003A,	// single or per-tri array of uint32 shader indices (check chunk size)
@@ -396,7 +390,7 @@ enum {
 			W3D_CHUNK_FX_SHADER					=0x00000051,	// a single shader entry
 				W3D_CHUNK_FX_SHADER_INFO		=0x00000052,	// information about the shader to be used (W3dFXShaderInfoStruct)
 				W3D_CHUNK_FX_SHADER_CONSTANT	=0x00000053,	// contains a constant name and value for the shader
-		
+
 		W3D_CHUNK_DEFORM									=0x00000058,	// mesh deform or 'damage' information.
 			W3D_CHUNK_DEFORM_SET							=0x00000059,	// set of deform information
 				W3D_CHUNK_DEFORM_KEYFRAME				=0x0000005A,	// a keyframe of deform information in the set
@@ -404,9 +398,9 @@ enum {
 
 		W3D_CHUNK_VERTEX_TANGENTS = 0x00000060,         // array of tangents (array of W3dVectorStruct's)
 		W3D_CHUNK_VERTEX_BINORMALS = 0x00000061,         // array of binormals (array of W3dVectorStruct's)
-				
+
 		W3D_CHUNK_PS2_SHADERS							=0x00000080,	// Shader info specific to the Playstation 2.
-		
+
 		W3D_CHUNK_AABTREE									=0x00000090,	// Axis-Aligned Box Tree for hierarchical polygon culling
 			W3D_CHUNK_AABTREE_HEADER,										// catalog of the contents of the AABTree
 			W3D_CHUNK_AABTREE_POLYINDICES,								// array of uint32 polygon indices with count=mesh.PolyCount
@@ -416,7 +410,7 @@ enum {
 		W3D_CHUNK_HIERARCHY_HEADER,
 		W3D_CHUNK_PIVOTS,
 		W3D_CHUNK_PIVOT_FIXUPS,												// only needed by the exporter...
-	
+
 	W3D_CHUNK_ANIMATION									=0x00000200,	// hierarchy animation data
 		W3D_CHUNK_ANIMATION_HEADER,
 		W3D_CHUNK_ANIMATION_CHANNEL,										// channel of vectors
@@ -426,7 +420,7 @@ enum {
 		W3D_CHUNK_COMPRESSED_ANIMATION_HEADER,							// describes playback rate, number of frames, and type of compression
 		W3D_CHUNK_COMPRESSED_ANIMATION_CHANNEL,						// compressed channel, format dependent on type of compression
 		W3D_CHUNK_COMPRESSED_BIT_CHANNEL,								// compressed bit stream channel, format dependent on type of compression
-        
+
 	W3D_CHUNK_MORPH_ANIMATION							=0x000002C0,	// hierarchy morphing animation data (morphs between poses, for facial animation)
 		W3D_CHUNK_MORPHANIM_HEADER,										// W3dMorphAnimHeaderStruct describes playback rate, number of frames, and type of compression
 		W3D_CHUNK_MORPHANIM_CHANNEL,										// wrapper for a channel
@@ -495,7 +489,7 @@ enum {
 
 	W3D_CHUNK_NULL_OBJECT							=0x00000750,		// defines a NULL object (W3dNullObjectStruct)
 
-	W3D_CHUNK_LIGHTSCAPE								=0x00000800,		// wrapper for lights created with Lightscape.	
+	W3D_CHUNK_LIGHTSCAPE								=0x00000800,		// wrapper for lights created with Lightscape.
 		W3D_CHUNK_LIGHTSCAPE_LIGHT,										// definition of a light created with Lightscape.
 			W3D_CHUNK_LIGHT_TRANSFORM,										// position and orientation (defined as right-handed 4x3 matrix transform W3dLightTransformStruct).
 
@@ -505,7 +499,7 @@ enum {
 
 	W3D_CHUNK_SOUNDROBJ								=0x00000A00,		// description of a sound render object
 		W3D_CHUNK_SOUNDROBJ_HEADER,										// general information such as name and version
-		W3D_CHUNK_SOUNDROBJ_DEFINITION,									// chunk containing the definition of the sound that is to play	
+		W3D_CHUNK_SOUNDROBJ_DEFINITION,									// chunk containing the definition of the sound that is to play
 
 	W3D_CHUNK_SHDMESH									=0x00000B00,		// "Shader mesh" Mesh with multiple sub-meshes that use the scaleable shader system
 		W3D_CHUNK_SHDMESH_NAME,
@@ -574,13 +568,13 @@ struct W3dTexCoordStruct
 /////////////////////////////////////////////////////////////////////////////////////////////
 struct W3dRGBStruct
 {
-	W3dRGBStruct () {} 
+	W3dRGBStruct () {}
 	W3dRGBStruct (uint8 r, uint8 g, uint8 b)
 	{
 		R = r;
 		G = g;
 		B = b;
-	} 
+	}
 
 	void Set (uint8 r, uint8 g, uint8 b)
 	{
@@ -605,7 +599,7 @@ struct W3dRGBStruct
 	{
 		return (!(*this == c));
 	}
-	
+
 	W3dRGBStruct operator += (W3dRGBStruct c)
 	{
 		R = MIN (((unsigned) R) + ((unsigned) c.R), (unsigned) UCHAR_MAX);
@@ -645,10 +639,10 @@ struct W3dRGBAStruct
 /////////////////////////////////////////////////////////////////////////////////////////////
 // MATERIALS
 //
-// Surrender 1.40 significantly changed the way that materials are described.  To 
-// accomodate this, the w3d file format has changed since there are new features and 
-// optimizations that we want to take advangage of.  
-// 
+// Surrender 1.40 significantly changed the way that materials are described.  To
+// accomodate this, the w3d file format has changed since there are new features and
+// optimizations that we want to take advangage of.
+//
 // The VertexMaterial defines parameters which control the calculation of the primary
 // and secondary gradients.  The shader defines how those gradients are combined with
 // the texel and the frame buffer contents.
@@ -743,7 +737,7 @@ struct W3dVertexMaterialStruct
 	{
 		return (!(*this == vm));
 	}
-	
+
 	uint32					Attributes;					// bitfield for the flags defined above
 	W3dRGBStruct			Ambient;
 	W3dRGBStruct			Diffuse;
@@ -754,8 +748,8 @@ struct W3dVertexMaterialStruct
 	float32					Translucency;				// how much light passes through the material. (default = 0)
 };
 
-inline void W3d_Vertex_Material_Reset(W3dVertexMaterialStruct * vmat) 
-{ 
+inline void W3d_Vertex_Material_Reset(W3dVertexMaterialStruct * vmat)
+{
 	vmat->Attributes = 0;
 	vmat->Ambient.R = vmat->Ambient.G = vmat->Ambient.B = 255;
 	vmat->Diffuse.R = vmat->Diffuse.G = vmat->Diffuse.B = 255;
@@ -775,13 +769,13 @@ enum
 	W3DSHADER_DEPTHCOMPARE_PASS_LESS,				// pass if incoming less than stored
 	W3DSHADER_DEPTHCOMPARE_PASS_EQUAL,				// pass if incoming equal to stored
 	W3DSHADER_DEPTHCOMPARE_PASS_LEQUAL,				// pass if incoming less than or equal to stored (default)
-	W3DSHADER_DEPTHCOMPARE_PASS_GREATER,			// pass if incoming greater than stored	
+	W3DSHADER_DEPTHCOMPARE_PASS_GREATER,			// pass if incoming greater than stored
 	W3DSHADER_DEPTHCOMPARE_PASS_NOTEQUAL,			// pass if incoming not equal to stored
 	W3DSHADER_DEPTHCOMPARE_PASS_GEQUAL,				// pass if incoming greater than or equal to stored
 	W3DSHADER_DEPTHCOMPARE_PASS_ALWAYS,				// pass always
 	W3DSHADER_DEPTHCOMPARE_PASS_MAX,					// end of enumeration
 
-	W3DSHADER_DEPTHMASK_WRITE_DISABLE = 0,			// disable depth buffer writes 
+	W3DSHADER_DEPTHMASK_WRITE_DISABLE = 0,			// disable depth buffer writes
 	W3DSHADER_DEPTHMASK_WRITE_ENABLE,				// enable depth buffer writes		(default)
 	W3DSHADER_DEPTHMASK_WRITE_MAX,					// end of enumeration
 
@@ -807,7 +801,7 @@ enum
 	W3DSHADER_PRIGRADIENT_MAX,							// end of enumeration
 
 	W3DSHADER_SECGRADIENT_DISABLE = 0,				// don't draw secondary gradient (default)
-	W3DSHADER_SECGRADIENT_ENABLE,						// add secondary gradient RGB to fragment RGB 
+	W3DSHADER_SECGRADIENT_ENABLE,						// add secondary gradient RGB to fragment RGB
 	W3DSHADER_SECGRADIENT_MAX,							// end of enumeration
 
   	W3DSHADER_SRCBLENDFUNC_ZERO = 0,					// fragment not added to color buffer
@@ -832,7 +826,7 @@ enum
 	W3DSHADER_DETAILCOLORFUNC_ADDSIGNED,			// (local + other - 0.5)
 	W3DSHADER_DETAILCOLORFUNC_ADDSIGNED2X,			// (local + other - 0.5) * 2
 	W3DSHADER_DETAILCOLORFUNC_SCALE2X,				// local * other * 2
-	W3DSHADER_DETAILCOLORFUNC_MODALPHAADDCOLOR,	// local + localAlpha * other	
+	W3DSHADER_DETAILCOLORFUNC_MODALPHAADDCOLOR,	// local + localAlpha * other
 	W3DSHADER_DETAILCOLORFUNC_MAX,					// end of enumeration
 
 	W3DSHADER_DETAILALPHAFUNC_DISABLE = 0,			// local (default)
@@ -853,11 +847,11 @@ enum
 	W3DSHADER_DETAILALPHAFUNC_DEFAULT = W3DSHADER_DETAILALPHAFUNC_DISABLE,
 };
 
-enum PS2_SHADER_SETTINGS { 
+enum PS2_SHADER_SETTINGS {
 	PSS_SRC = 0,
 	PSS_DEST,
 	PSS_ZERO,
-	
+
 	PSS_SRC_ALPHA = 0,
 	PSS_DEST_ALPHA,
 	PSS_ONE,
@@ -875,16 +869,16 @@ enum PS2_SHADER_SETTINGS {
 	PSS_PS2_PRIGRADIENT_HIGHLIGHT2,
 
 
-	PSS_DEPTHCOMPARE_PASS_NEVER = 0,			
-	PSS_DEPTHCOMPARE_PASS_LESS,			
-	PSS_DEPTHCOMPARE_PASS_ALWAYS,	
-	PSS_DEPTHCOMPARE_PASS_LEQUAL,				
+	PSS_DEPTHCOMPARE_PASS_NEVER = 0,
+	PSS_DEPTHCOMPARE_PASS_LESS,
+	PSS_DEPTHCOMPARE_PASS_ALWAYS,
+	PSS_DEPTHCOMPARE_PASS_LEQUAL,
 };
 
 struct W3dShaderStruct
 {
 	W3dShaderStruct(void) {}
-	
+
 	uint8						DepthCompare;
 	uint8						DepthMask;
 	uint8						ColorMask;		// now obsolete and ignored
@@ -903,11 +897,11 @@ struct W3dShaderStruct
 	uint8						pad[1];
 
 	// Required by DynamicVectorClass...
-	inline bool			operator == (const W3dShaderStruct & that) 
-	{		
+	bool			operator == (const W3dShaderStruct & that)
+	{
 		return (
-			(DepthCompare == that.DepthCompare) && 
-			(DepthMask == that.DepthMask) && 
+			(DepthCompare == that.DepthCompare) &&
+			(DepthMask == that.DepthMask) &&
 			/*(ColorMask == that.ColorMask) &&       obsolete*/
 			(DestBlend == that.DestBlend) &&
 			/*(FogFunc == that.FogFunc) &&           obsolete*/
@@ -921,7 +915,7 @@ struct W3dShaderStruct
 			(AlphaTest == that.AlphaTest) );
 	}
 
-	inline bool			operator != (const W3dShaderStruct & that)
+	bool			operator != (const W3dShaderStruct & that)
 	{
 		return !(*this == that);
 	}
@@ -959,7 +953,7 @@ typedef enum
 	CONSTANT_TYPE_BOOL = 7
 } W3D_FX_SHADER_CONSTANT_TYPES;
 
-inline void W3d_Shader_Reset(W3dShaderStruct * s)									{	
+inline void W3d_Shader_Reset(W3dShaderStruct * s)									{
 																										s->DepthCompare = W3DSHADER_DEPTHCOMPARE_PASS_LEQUAL;
 																										s->DepthMask = W3DSHADER_DEPTHMASK_WRITE_ENABLE;
 																										s->ColorMask = 0;	// obsolete
@@ -1011,18 +1005,18 @@ inline int W3d_Shader_Get_PS2_Param_D(const W3dPS2ShaderStruct *s) {return (s->D
 
 inline int W3d_Shader_Get_Depth_Compare(const W3dPS2ShaderStruct * s)				 { return s->DepthCompare; }
 inline int W3d_Shader_Get_Depth_Mask(const W3dPS2ShaderStruct * s)					 { return s->DepthMask; }
-inline int W3d_Shader_Get_Pri_Gradient(const W3dPS2ShaderStruct * s)					 { return s->PriGradient; } 
-inline int W3d_Shader_Get_Texturing(const W3dPS2ShaderStruct * s)						 { return s->Texturing; } 
+inline int W3d_Shader_Get_Pri_Gradient(const W3dPS2ShaderStruct * s)					 { return s->PriGradient; }
+inline int W3d_Shader_Get_Texturing(const W3dPS2ShaderStruct * s)						 { return s->Texturing; }
 inline int W3d_Shader_Get_Alpha_Test(const W3dPS2ShaderStruct * s)					 { return s->AlphaTest; }
 
 
 inline int W3d_Shader_Get_Depth_Compare(const W3dShaderStruct * s)				 { return s->DepthCompare; }
 inline int W3d_Shader_Get_Depth_Mask(const W3dShaderStruct * s)					 { return s->DepthMask; }
 inline int W3d_Shader_Get_Dest_Blend_Func(const W3dShaderStruct * s)				 { return s->DestBlend; }
-inline int W3d_Shader_Get_Pri_Gradient(const W3dShaderStruct * s)					 { return s->PriGradient; } 
-inline int W3d_Shader_Get_Sec_Gradient(const W3dShaderStruct * s)					 { return s->SecGradient; } 
-inline int W3d_Shader_Get_Src_Blend_Func(const W3dShaderStruct * s)				 { return s->SrcBlend; } 
-inline int W3d_Shader_Get_Texturing(const W3dShaderStruct * s)						 { return s->Texturing; } 
+inline int W3d_Shader_Get_Pri_Gradient(const W3dShaderStruct * s)					 { return s->PriGradient; }
+inline int W3d_Shader_Get_Sec_Gradient(const W3dShaderStruct * s)					 { return s->SecGradient; }
+inline int W3d_Shader_Get_Src_Blend_Func(const W3dShaderStruct * s)				 { return s->SrcBlend; }
+inline int W3d_Shader_Get_Texturing(const W3dShaderStruct * s)						 { return s->Texturing; }
 inline int W3d_Shader_Get_Detail_Color_Func(const W3dShaderStruct * s)			 { return s->DetailColorFunc; }
 inline int W3d_Shader_Get_Detail_Alpha_Func(const W3dShaderStruct * s)			 { return s->DetailAlphaFunc; }
 inline int W3d_Shader_Get_Alpha_Test(const W3dShaderStruct * s)					 { return s->AlphaTest; }
@@ -1059,7 +1053,7 @@ inline int W3d_Shader_Get_Post_Detail_Alpha_Func(const W3dShaderStruct * s)	 { r
 #define W3DTEXTURE_HINT_ENVIRONMENT		0x0200		// environment/reflection map
 #define W3DTEXTURE_HINT_SHINY_MASK		0x0300		// shinyness mask map
 
-#define W3DTEXTURE_TYPE_MASK				0x1000	
+#define W3DTEXTURE_TYPE_MASK				0x1000
 #define W3DTEXTURE_TYPE_COLORMAP			0x0000		// Color map.
 #define W3DTEXTURE_TYPE_BUMPMAP			0x1000		// Grayscale heightmap (to be converted to bumpmap).
 
@@ -1173,7 +1167,7 @@ const char * const SURFACE_TYPE_STRINGS[SURFACE_TYPE_MAX] =
 /////////////////////////////////////////////////////////////////////////////////////////////
 #define W3D_MESH_FLAG_NONE										0x00000000		// plain ole normal mesh
 #define W3D_MESH_FLAG_COLLISION_BOX							0x00000001		// (obsolete as of 4.1) mesh is a collision box (should be 8 verts, should be hidden, etc)
-#define W3D_MESH_FLAG_SKIN										0x00000002		// (obsolete as of 4.1) skin mesh 
+#define W3D_MESH_FLAG_SKIN										0x00000002		// (obsolete as of 4.1) skin mesh
 #define W3D_MESH_FLAG_SHADOW									0x00000004		// (obsolete as of 4.1) intended to be projected as a shadow
 #define W3D_MESH_FLAG_ALIGNED									0x00000008		// (obsolete as of 4.1) always aligns with camera
 
@@ -1200,9 +1194,9 @@ const char * const SURFACE_TYPE_STRINGS[SURFACE_TYPE_MAX] =
 #define W3D_MESH_FLAG_GEOMETRY_TYPE_OBBOX					0x00050000		// (4.1+) obbox OBSOLETE!
 #define W3D_MESH_FLAG_GEOMETRY_TYPE_CAMERA_ORIENTED	0x00060000		// (4.1+) camera oriented mesh (points _towards_ camera)
 
-#define W3D_MESH_FLAG_PRELIT_MASK							0x0F000000		// (4.2+) 
+#define W3D_MESH_FLAG_PRELIT_MASK							0x0F000000		// (4.2+)
 #define W3D_MESH_FLAG_PRELIT_UNLIT							0x01000000		// mesh contains an unlit material chunk wrapper
-#define W3D_MESH_FLAG_PRELIT_VERTEX							0x02000000		// mesh contains a precalculated vertex-lit material chunk wrapper 
+#define W3D_MESH_FLAG_PRELIT_VERTEX							0x02000000		// mesh contains a precalculated vertex-lit material chunk wrapper
 #define W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_PASS		0x04000000		// mesh contains a precalculated multi-pass lightmapped material chunk wrapper
 #define W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_TEXTURE	0x08000000		// mesh contains a precalculated multi-texture lightmapped material chunk wrapper
 
@@ -1214,7 +1208,7 @@ const char * const SURFACE_TYPE_STRINGS[SURFACE_TYPE_MAX] =
 	Meshes
 
 	Version 3 Mesh Header, trimmed out some of the junk that was in the
-	previous versions.  
+	previous versions.
 
 ********************************************************************************/
 
@@ -1237,10 +1231,10 @@ const char * const SURFACE_TYPE_STRINGS[SURFACE_TYPE_MAX] =
 
 struct W3dMeshHeader3Struct
 {
-	uint32					Version;							
+	uint32					Version;
 	uint32					Attributes;
-	
-	char						MeshName[W3D_NAME_LEN];		
+
+	char						MeshName[W3D_NAME_LEN];
 	char						ContainerName[W3D_NAME_LEN];
 
 	//
@@ -1256,7 +1250,7 @@ struct W3dMeshHeader3Struct
 
 	uint32					VertexChannels;	// bits for presence of types of per-vertex info
 	uint32					FaceChannels;		// bits for presence of types of per-face info
-	
+
 	//
 	// Bounding volumes
 	//
@@ -1270,7 +1264,7 @@ struct W3dMeshHeader3Struct
 //
 // Vertex Influences.  For "skins" each vertex can be associated with a
 // different bone.
-// 
+//
 struct W3dVertInfStruct
 {
 	uint16					BoneIdx;
@@ -1280,7 +1274,7 @@ struct W3dVertInfStruct
 //
 // Deform information.  Each mesh can have sets of keyframes of
 //	deform info associated with it.
-// 
+//
 struct W3dMeshDeform
 {
 	uint32					SetCount;
@@ -1291,9 +1285,9 @@ struct W3dMeshDeform
 //
 // Deform set information.  Each set is made up of a series
 // of keyframes.
-// 
+//
 struct W3dDeformSetInfo
-{	
+{
 	uint32					KeyframeCount;
 	uint32					flags;
 	uint32					reserved[1];
@@ -1304,7 +1298,7 @@ struct W3dDeformSetInfo
 //
 // Deform keyframe information.  Each keyframe is made up of
 // a set of per-vert deform data.
-// 
+//
 struct W3dDeformKeyframeInfo
 {
 	float32					DeformPercent;
@@ -1315,7 +1309,7 @@ struct W3dDeformKeyframeInfo
 //
 // Deform data.  Contains deform information about a vertex
 // in the mesh.
-// 
+//
 struct W3dDeformData
 {
 	uint32					VertexIndex;
@@ -1324,9 +1318,9 @@ struct W3dDeformData
 	uint32					reserved[2];
 };
 
-// 
+//
 // AABTree header.  Each mesh can have an associated Axis-Aligned-Bounding-Box tree
-// which is used for collision detection and certain rendering algorithms (like 
+// which is used for collision detection and certain rendering algorithms (like
 // texture projection.
 //
 struct W3dMeshAABTreeHeader
@@ -1336,7 +1330,7 @@ struct W3dMeshAABTreeHeader
 	uint32					Padding[6];
 };
 
-// 
+//
 // AABTree Node.  This is a node in the AABTree.
 // If the MSB of FrontOrPoly0 is 1, then the node is a leaf and contains Poly0 and PolyCount
 // else, the node is not a leaf and contains indices to its front and back children.  This matches
@@ -1344,7 +1338,7 @@ struct W3dMeshAABTreeHeader
 //
 struct W3dMeshAABTreeNode
 {
-	W3dVectorStruct		Min;						// min corner of the box 
+	W3dVectorStruct		Min;						// min corner of the box
 	W3dVectorStruct		Max;						// max corner of the box
 	uint32					FrontOrPoly0;			// index of the front child or poly0 (if MSB is set, then leaf and poly0 is valid)
 	uint32					BackOrPolyCount;		// index of the back child or polycount
@@ -1356,12 +1350,12 @@ struct W3dMeshAABTreeNode
 	WHT ( Westwood Hierarchy Tree )
 
 	A hierarchy tree defines a set of coordinate systems which are connected
-	hierarchically.  The header defines the name, number of pivots, etc.  
+	hierarchically.  The header defines the name, number of pivots, etc.
 	The pivots chunk will contain a W3dPivotStructs for each node in the
-	tree.  
-	
+	tree.
+
 	The W3dPivotFixupStruct contains a transform for each MAX coordinate
-	system and our version of that same coordinate system (bone).  It is 
+	system and our version of that same coordinate system (bone).  It is
 	needed when the user exports the base pose using "Translation Only".
 	These are the matrices which go from the MAX rotated coordinate systems
 	to a system which is unrotated in the base pose.  These transformations
@@ -1372,7 +1366,7 @@ struct W3dMeshAABTreeNode
 
 	What are the "fixup" matrices?  These are the transforms which
 	were applied to the base pose when the user wanted to force the
-	base pose to use only matrices with certain properties.  For 
+	base pose to use only matrices with certain properties.  For
 	example, if we wanted the base pose to use translations only,
 	the fixup transform for each node is a transform which when
 	multiplied by the real node's world transform, yeilds a pure
@@ -1390,8 +1384,8 @@ struct W3dHierarchyStruct
 {
 	uint32					Version;
 	char						Name[W3D_NAME_LEN];	// Name of the hierarchy
-	uint32					NumPivots;				
-	W3dVectorStruct		Center;					
+	uint32					NumPivots;
+	W3dVectorStruct		Center;
 };
 
 struct W3dPivotStruct
@@ -1413,9 +1407,9 @@ struct W3dPivotFixupStruct
 
 	WHA (Westwood Hierarchy Animation)
 
-	A Hierarchy Animation is a set of data defining deltas from the base 
+	A Hierarchy Animation is a set of data defining deltas from the base
 	position of a hierarchy tree.  Translation and Rotation channels can be
-	attached to any node of the hierarchy tree which the animation is 
+	attached to any node of the hierarchy tree which the animation is
 	associated with.
 
 ********************************************************************************/
@@ -1427,7 +1421,7 @@ struct W3dPivotFixupStruct
 struct W3dAnimHeaderStruct
 {
 	uint32					Version;
-	char						Name[W3D_NAME_LEN];				
+	char						Name[W3D_NAME_LEN];
 	char						HierarchyName[W3D_NAME_LEN];
 	uint32					NumFrames;
 	uint32					FrameRate;
@@ -1437,7 +1431,7 @@ struct W3dAnimHeaderStruct
 struct W3dCompressedAnimHeaderStruct
 {
 	uint32					Version;
-	char						Name[W3D_NAME_LEN];				
+	char						Name[W3D_NAME_LEN];
 	char						HierarchyName[W3D_NAME_LEN];
 	uint32					NumFrames;
 	uint16					FrameRate;
@@ -1445,7 +1439,7 @@ struct W3dCompressedAnimHeaderStruct
 };
 
 
-enum 
+enum
 {
 	ANIM_CHANNEL_X = 0,
 	ANIM_CHANNEL_Y,
@@ -1481,8 +1475,8 @@ enum
 
 struct W3dAnimChannelStruct
 {
-	uint16					FirstFrame;			
-	uint16					LastFrame;			
+	uint16					FirstFrame;
+	uint16					LastFrame;
 	uint16					VectorLen;			// length of each vector in this channel
 	uint16					Flags;					// channel type.
 	uint16					Pivot;					// pivot affected by this channel
@@ -1490,7 +1484,7 @@ struct W3dAnimChannelStruct
 	float32					Data[1];				// will be (LastFrame - FirstFrame + 1) * VectorLen long
 };
 
-enum 
+enum
 {
 	BIT_CHANNEL_VIS = 0,							// turn meshes on and off depending on anim frame.
 	BIT_CHANNEL_TIMECODED_VIS,
@@ -1499,7 +1493,7 @@ enum
 struct W3dBitChannelStruct
 {
 	uint16					FirstFrame;			// all frames outside "First" and "Last" are assumed = DefaultVal
-	uint16					LastFrame;			
+	uint16					LastFrame;
 	uint16					Flags;					// channel type.
 	uint16					Pivot;					// pivot affected by this channel
 	uint8						DefaultVal;			// default state when outside valid range.
@@ -1521,14 +1515,14 @@ struct W3dTimeCodedAnimChannelStruct
 	uint8						VectorLen;			// length of each vector in this channel
 	uint8						Flags;				// channel type.
 	uint32					Data[1];				// will be (NumTimeCodes * ((VectorLen * sizeof(uint32)) + sizeof(uint32)))
-};								  
+};
 
 // The bit channel is encoded right into the MSB of each time code
 #define W3D_TIMECODED_BIT_MASK	0x80000000
 
 struct W3dTimeCodedBitChannelStruct
 {
-	uint32					NumTimeCodes;  		// number of time coded entries 
+	uint32					NumTimeCodes;  		// number of time coded entries
 	uint16					Pivot;					// pivot affected by this channel
 	uint8						Flags;					// channel type.
 	uint8						DefaultVal;				// default state when outside valid range.
@@ -1551,7 +1545,7 @@ struct W3dAdaptiveDeltaAnimChannelStruct
 // End AdaptiveDelta Structures
 
 /********************************************************************************
-	
+
 	HMorphAnimClass
 
 	This is an animation format which describes morphs between poses in another
@@ -1596,7 +1590,7 @@ struct W3dMorphAnimKeyStruct
 
 	HModel - Hiearchical Model
 
-	A Hierarchy Model is a set of render objects which should be attached to 
+	A Hierarchy Model is a set of render objects which should be attached to
 	bones in a hierarchy tree.  There can be multiple objects per node
 	in the tree.  Or there may be no objects attached to a particular bone.
 
@@ -1619,7 +1613,7 @@ struct W3dHModelHeaderStruct
 	uint32					Version;
 	char						Name[W3D_NAME_LEN];				// Name of this model
 	char						HierarchyName[W3D_NAME_LEN];	// Name of the hierarchy tree this model uses
-	uint16					NumConnections;				
+	uint16					NumConnections;
 };
 
 
@@ -1644,10 +1638,10 @@ struct W3dLODModelHeaderStruct
 {
 	uint32					Version;
 	char						Name[W3D_NAME_LEN];				// Name of this LOD Model
-	uint16					NumLODs;				
+	uint16					NumLODs;
 };
 
-struct W3dLODStruct 
+struct W3dLODStruct
 {
 	char						RenderObjName[2*W3D_NAME_LEN];
 	float32					LODMin;								// "artist" inspired switching distances
@@ -1664,12 +1658,12 @@ struct W3dLODStruct
 	contain a string chunk for the name of each render object in the collection.
 	A collection may also contain a "Snap Points" chunk.
 
-	W3D_CHUNK_COLLECTION								
+	W3D_CHUNK_COLLECTION
 		W3D_CHUNK_COLLECTION_HEADER
 		W3D_CHUNK_SNAP_POINTS
-		W3D_CHUNK_COLLECTION_OBJ_NAME			
-		W3D_CHUNK_COLLECTION_OBJ_NAME			
-		W3D_CHUNK_COLLECTION_OBJ_NAME			
+		W3D_CHUNK_COLLECTION_OBJ_NAME
+		W3D_CHUNK_COLLECTION_OBJ_NAME
+		W3D_CHUNK_COLLECTION_OBJ_NAME
 		...
 
 ********************************************************************************/
@@ -1703,7 +1697,7 @@ struct W3dPlaceholderStruct
 };
 
 
-/*							 
+/*
 ** Transform chunks.  These chunks refer to other W3D files which should be transformed by
 ** this file.  This feature is used to allow user to (for example) lightmap the interior
 ** of a building once and then just transform that into all of our levels that use it.
@@ -1767,7 +1761,7 @@ struct W3dLightTransformStruct
 {
 	float32 Transform [3][4];
 };
-	
+
 
 /********************************************************************************
 
@@ -1873,7 +1867,7 @@ struct W3dEmitterInfoStructV2
 };
 
 // W3D_CHUNK_EMITTER_PROPS
-// Contains a W3dEmitterPropertyStruct followed by a number of color keyframes, 
+// Contains a W3dEmitterPropertyStruct followed by a number of color keyframes,
 // opacity keyframes, and size keyframes
 
 struct W3dEmitterPropertyStruct
@@ -1906,9 +1900,9 @@ struct W3dEmitterSizeKeyframeStruct
 	float32				Size;
 };
 
-// W3D_CHUNK_EMITTER_ROTATION_KEYFRAMES 
+// W3D_CHUNK_EMITTER_ROTATION_KEYFRAMES
 // Contains a W3dEmitterRotationHeaderStruct followed by a number of
-// rotational velocity keyframes.  
+// rotational velocity keyframes.
 struct W3dEmitterRotationHeaderStruct
 {
 	uint32				KeyframeCount;
@@ -1976,7 +1970,7 @@ struct W3dEmitterBlurTimeKeyframeStruct
 struct W3dEmitterLinePropertiesStruct
 {
 	uint32							Flags;
-	uint32							SubdivisionLevel;	
+	uint32							SubdivisionLevel;
 	float32							NoiseAmplitude;
 	float32							MergeAbortFactor;
 	float32							TextureTileFactor;
@@ -2067,14 +2061,14 @@ struct W3dAggregateMiscInfo
 			W3D_CHUNK_HLOD_SUB_OBJECT,										// an object in this level of detail array
 		W3D_CHUNK_HLOD_AGGREGATE_ARRAY,									// array of aggregates, contains W3D_CHUNK_SUB_OBJECT_ARRAY_HEADER and W3D_CHUNK_SUB_OBJECT_ARRAY
 		W3D_CHUNK_HLOD_PROXY_ARRAY,										// array of proxies, used for application-defined purposes
-	
+
 	An HLOD is the basic hierarchical model format used by W3D.  It references
 	an HTree for its hierarchical structure and animation data and several arrays
 	of sub-objects; one for each LOD in the model.  In addition, it can contain
 	an array of "aggregates" which are references to external W3D objects to
 	be automatically attached into it.  And it can have a list of "proxy" objects
 	which can be used for application purposes such as instantiating game objects
-	at the specified transform. 
+	at the specified transform.
 
 ********************************************************************************/
 
@@ -2108,9 +2102,9 @@ struct W3dHLodSubObjectStruct
 
 	Collision boxes are meant to be used for, you guessed it, collision detection.
 	For this reason, they only contain a minimal amount of rendering information
-	(a color).  
+	(a color).
 
-	Axis Aligned - This is a bounding box which is *always* aligned with the world 
+	Axis Aligned - This is a bounding box which is *always* aligned with the world
 	coordinate system.  So, the center point is to be transformed by whatever
 	transformation matrix is being used but the extents always point down the
 	world space x,y, and z axes.  (in effect, you are translating the center).
@@ -2169,8 +2163,8 @@ struct W3dNullObjectStruct
 
 	The only data needed to instantiate a dazzle object is the type-name of
 	the dazzle to use.  The dazzle is always assumed to be at the pivot point
-	of the bone it is attached to (you should enable Export_Transform) for 
-	dazzles.  If the dazzle-type (from dazzle.ini) is directional, then the 
+	of the bone it is attached to (you should enable Export_Transform) for
+	dazzles.  If the dazzle-type (from dazzle.ini) is directional, then the
 	coordinate-system of the bone will define the direction.
 
 ********************************************************************************/
@@ -2232,9 +2226,9 @@ struct W3dSoundRObjHeaderStruct
 */
 struct W3dShdMeshHeaderStruct
 {
-	uint32					Version;							
+	uint32					Version;
 	uint32					Attributes;			// Uses same #defines as Mesh, e.g. W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN
-	
+
 	//
 	// Counts, these can be regarded as an inventory of what is to come in the file.
 	//
@@ -2277,6 +2271,3 @@ struct W3dShdSubMeshHeaderStruct
 ** Include the obsolete structures and chunk ID's
 */
 #include "w3d_obsolete.h"
-
-
-#endif // W3D_FILE_H
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
index 8458d21ddc4..1201a349a8f 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
@@ -26,14 +26,14 @@
  *                                                                                             *
  *                   Org Author:: Greg_h                                                       *
  *                                                                                             *
- *                       Author : Kenny Mitchell                                               * 
- *                                                                                             * 
+ *                       Author : Kenny Mitchell                                               *
+ *                                                                                             *
  *								$Modtime:: 08/05/02 10:03a                                             $*
  *                                                                                             *
  *                    $Revision:: 98                                                          $*
  *                                                                                             *
  * 07/01/02 KM Scalable shader library integration				                               *
- * 08/05/02 KM Texture class redesign 
+ * 08/05/02 KM Texture class redesign
  *---------------------------------------------------------------------------------------------*
  * Functions:                                                                                  *
  *   WW3D::Init -- Initialize the WW3D Library                                                 *
@@ -100,7 +100,7 @@
 #include "statistics.h"
 #include "pointgr.h"
 #include "ffactory.h"
-#include "INI.H"
+#include "INI.h"
 #include "dazzle.h"
 #include "meshmdl.h"
 #include "dx8renderer.h"
@@ -108,9 +108,8 @@
 #include "bound.h"
 #include "rddesc.h"
 #include "Vector3i.h"
-#include <cstdio>
 #include "dx8wrapper.h"
-#include "TARGA.H"
+#include "TARGA.h"
 #include "sortingrenderer.h"
 #include "thread.h"
 #include "cpudetect.h"
@@ -118,12 +117,8 @@
 #include "formconv.h"
 #include "animatedsoundmgr.h"
 #include "static_sort_list.h"
-
 #include "shdlib.h"
-
-#ifndef _UNIX
 #include "framgrab.h"
-#endif
 
 
 const char* DAZZLE_INI_FILENAME="DAZZLE.INI";
@@ -166,6 +161,8 @@ const char* DAZZLE_INI_FILENAME="DAZZLE.INI";
 **
 ***********************************************************************************/
 
+float														WW3D::LogicFrameTimeMs = 1000.0f / WWSyncPerSecond; // initialized to something to avoid division by zero on first use
+float															WW3D::FractionalSyncMs = 0.0f;
 unsigned int											WW3D::SyncTime = 0;
 unsigned int											WW3D::PreviousSyncTime = 0;
 bool														WW3D::IsSortingEnabled = true;
@@ -267,7 +264,7 @@ void WW3D::Set_NPatches_Level(unsigned level)
 WW3DErrorType WW3D::Init(void *hwnd, char *defaultpal, bool lite)
 {
 	assert(IsInitted == false);
-	WWDEBUG_SAY(("WW3D::Init hwnd = %p\n",hwnd));
+	WWDEBUG_SAY(("WW3D::Init hwnd = %p",hwnd));
 	_Hwnd = (HWND)hwnd;
 	Lite = lite;
 
@@ -275,11 +272,11 @@ WW3DErrorType WW3D::Init(void *hwnd, char *defaultpal, bool lite)
 	** Initialize d3d, this also enumerates the available devices and resolutions.
 	*/
 	Init_D3D_To_WW3_Conversion();
-	WWDEBUG_SAY(("Init DX8Wrapper\n"));
+	WWDEBUG_SAY(("Init DX8Wrapper"));
 	if (!DX8Wrapper::Init(_Hwnd, lite)) {
 		return(WW3D_ERROR_INITIALIZATION_FAILED);
 	}
-	WWDEBUG_SAY(("Allocate Debug Resources\n"));
+	WWDEBUG_SAY(("Allocate Debug Resources"));
 	Allocate_Debug_Resources();
 
  	MMRESULT r=timeBeginPeriod(1);
@@ -289,7 +286,7 @@ WW3DErrorType WW3D::Init(void *hwnd, char *defaultpal, bool lite)
 	** Initialize the dazzle system
 	*/
 	if (!lite) {
-		WWDEBUG_SAY(("Init Dazzles\n"));
+		WWDEBUG_SAY(("Init Dazzles"));
 		FileClass * dazzle_ini_file = _TheFileFactory->Get_File(DAZZLE_INI_FILENAME);
 		if (dazzle_ini_file) {
 			INIClass dazzle_ini(*dazzle_ini_file);
@@ -311,7 +308,7 @@ WW3DErrorType WW3D::Init(void *hwnd, char *defaultpal, bool lite)
 		AnimatedSoundMgrClass::Initialize ();
 		IsInitted = true;
 	}
-	WWDEBUG_SAY(("WW3D Init completed\n"));
+	WWDEBUG_SAY(("WW3D Init completed"));
 	return WW3D_ERROR_OK;
 }
 
@@ -331,7 +328,7 @@ WW3DErrorType WW3D::Init(void *hwnd, char *defaultpal, bool lite)
 WW3DErrorType WW3D::Shutdown(void)
 {
 	assert(Lite || IsInitted == true);
-//	WWDEBUG_SAY(("WW3D::Shutdown\n"));
+//	WWDEBUG_SAY(("WW3D::Shutdown"));
 
 #ifdef WW3D_DX8
 	if (IsCapturing) {
@@ -797,9 +794,9 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f
 	WWASSERT(IsInitted);
 	HRESULT hr;
 
-	SNAPSHOT_SAY(("==========================================\r\n"));
-	SNAPSHOT_SAY(("========== WW3D::Begin_Render ============\r\n"));
-	SNAPSHOT_SAY(("==========================================\r\n\r\n"));
+	SNAPSHOT_SAY(("=========================================="));
+	SNAPSHOT_SAY(("========== WW3D::Begin_Render ============"));
+	SNAPSHOT_SAY(("==========================================\n"));
 
 	if (DX8Wrapper::_Get_D3D_Device8() && (hr=DX8Wrapper::_Get_D3D_Device8()->TestCooperativeLevel()) != D3D_OK)
 	{
@@ -810,7 +807,7 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f
         // Check if the device needs to be reset
         if( D3DERR_DEVICENOTRESET == hr )
         {
-            WWDEBUG_SAY(("WW3D::Begin_Render is resetting the device.\n"));
+            WWDEBUG_SAY(("WW3D::Begin_Render is resetting the device."));
             DX8Wrapper::Reset_Device();
         }
 
@@ -847,7 +844,7 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f
 		vp.Y = 0;
 		vp.Width = width;
 		vp.Height = height;
-		vp.MinZ = 0.0f;;
+		vp.MinZ = 0.0f;
 		vp.MaxZ = 1.0f;
 		DX8Wrapper::Set_Viewport(&vp);
 		DX8Wrapper::Clear(clear, clearz, color, dest_alpha);
@@ -1107,13 +1104,13 @@ WW3DErrorType WW3D::End_Render(bool flip_frame)
 		Debug_Statistics::End_Statistics();
 	}
 
-	SNAPSHOT_SAY(("==========================================\r\n"));
-	SNAPSHOT_SAY(("========== WW3D::End_Render ==============\r\n"));
-	SNAPSHOT_SAY(("==========================================\r\n\r\n"));
+	SNAPSHOT_SAY(("=========================================="));
+	SNAPSHOT_SAY(("========== WW3D::End_Render =============="));
+	SNAPSHOT_SAY(("==========================================\n"));
 
 	Activate_Snapshot(false);
-	
-	// (gth) I've found some cases where its not safe to rely on our "shadow" copy (of 
+
+	// (gth) I've found some cases where its not safe to rely on our "shadow" copy (of
 	// matrices for example) across multiple frames.  So even though this is slightly
 	// less "optimal", lets just reset the caches each frame.
 	DX8Wrapper::Invalidate_Cached_Render_States();
@@ -1162,6 +1159,12 @@ unsigned int WW3D::Get_Last_Frame_Vertex_Count(void)
 	return Debug_Statistics::Get_DX8_Vertices();
 }
 
+void WW3D::Update_Logic_Frame_Time(float milliseconds)
+{
+	LogicFrameTimeMs = milliseconds;
+	FractionalSyncMs += milliseconds;
+}
+
 
 /***********************************************************************************************
  * WW3D::Sync -- Time sychronization                                                           *
@@ -1175,12 +1178,17 @@ unsigned int WW3D::Get_Last_Frame_Vertex_Count(void)
  * HISTORY:                                                                                    *
  *   3/24/98    GTH : Created.                                                                 *
  *=============================================================================================*/
-void WW3D::Sync(unsigned int sync_time)
+void WW3D::Sync(bool step)
 {
 	PreviousSyncTime = SyncTime;
-   SyncTime = sync_time;
-}
 
+	if (step)
+	{
+		unsigned int integralSyncMs = (unsigned int)FractionalSyncMs;
+		FractionalSyncMs -= integralSyncMs;
+		SyncTime += integralSyncMs;
+	}
+}
 
 /***********************************************************************************************
  * WW3D::Set_Ext_Swap_Interval -- Sets the swap interval the device should aim sync for.       *
@@ -1329,7 +1337,7 @@ void WW3D::Make_Screen_Shot( const char * filename_base , const float gamma, con
 		}
 	}
 
-	WWDEBUG_SAY(( "Creating Screen Shot %s\n", filename ));
+	WWDEBUG_SAY(( "Creating Screen Shot %s", filename ));
 
 	// make the gamma look up table
 	int i;
@@ -1431,7 +1439,7 @@ void WW3D::Make_Screen_Shot( const char * filename_base , const float gamma, con
 				header.biXPelsPerMeter = 0xB12;
 				header.biYPelsPerMeter = 0xB12;
 				int len = ((width * 24 +31) & ~31) /8;
-    
+
 				memset(&fileheader, 0, sizeof(BITMAPFILEHEADER));
 				fileheader.bfType = 19778; // BM
 				fileheader.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER);
@@ -1486,7 +1494,7 @@ void WW3D::Make_Screen_Shot( const char * filename_base , const float gamma, con
  *=============================================================================================*/
 void WW3D::Start_Movie_Capture( const char * filename_base, float frame_rate )
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	if (IsCapturing) {
 		Stop_Movie_Capture();
 	}
@@ -1510,7 +1518,7 @@ void WW3D::Start_Movie_Capture( const char * filename_base, float frame_rate )
 
 	Movie = W3DNEW FrameGrabClass( filename_base, FrameGrabClass::AVI, width, height, depth, frame_rate);
 
-	WWDEBUG_SAY(( "Starting Movie %s\n", filename_base ));
+	WWDEBUG_SAY(( "Starting Movie %s", filename_base ));
 #endif
 }
 
@@ -1529,10 +1537,10 @@ void WW3D::Start_Movie_Capture( const char * filename_base, float frame_rate )
  *=============================================================================================*/
 void WW3D::Stop_Movie_Capture( void )
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	if (IsCapturing) {
 		IsCapturing = false;
-		WWDEBUG_SAY(( "Stoping Movie\n" ));
+		WWDEBUG_SAY(( "Stoping Movie" ));
 
 		WWASSERT( Movie != NULL);
 		delete Movie;
@@ -1687,10 +1695,10 @@ bool WW3D::Is_Movie_Ready()
  *=============================================================================================*/
 void WW3D::Update_Movie_Capture( void )
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	WWASSERT( IsCapturing);
 	WWPROFILE("WW3D::Update_Movie_Capture");
-	WWDEBUG_SAY(( "Updating\n"));
+	WWDEBUG_SAY(( "Updating"));
 
 	// TheSuperHackers @bugfix xezon 21/05/2025 Get the back buffer and create a copy of the surface.
 	// Originally this code took the front buffer and tried to lock it. This does not work when the
@@ -1764,7 +1772,7 @@ void WW3D::Update_Movie_Capture( void )
  *=============================================================================================*/
 float	WW3D::Get_Movie_Capture_Frame_Rate( void )
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	if (IsCapturing) {
 		return Movie->GetFrameRate();
 	}
@@ -2050,4 +2058,4 @@ void WW3D::Reset_Current_Static_Sort_Lists_To_Default(void)
 void WW3D::Set_Gamma(float gamma,float bright,float contrast,bool calibrate)
 {
 	DX8Wrapper::Set_Gamma(gamma,bright,contrast,calibrate);
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h
index bf453bc9d04..533396f1dec 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h
@@ -34,13 +34,7 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
-#if defined(_MSC_VER)
 #pragma once
-#endif
-
-#ifndef WW3D_H
-#define WW3D_H
 
 #include "always.h"
 #include "vector3.h"
@@ -162,16 +156,37 @@ class WW3D
 
 	static void Flip_To_Primary(void);
 
-
+	// TheSuperHackers @info Add amount of milliseconds that the simulation has advanced in this render frame.
+	// This can be a fraction of a logic step.
+	static void Update_Logic_Frame_Time(float milliseconds);
 	/*
 	** Timing
 	** By calling the Sync function, the application can move the ww3d library time forward.  This
 	** will control things like animated uv-offset mappers and render object animations.
 	*/
-	static void					Sync( unsigned int sync_time );
+	static void						Sync(bool step);
+
+	// Total sync time in milliseconds. Advances in full logic time steps only.
 	static unsigned int		Get_Sync_Time(void) { return SyncTime; }
-   static unsigned int     Get_Frame_Time(void) { return SyncTime - PreviousSyncTime; }
-   static unsigned int     Get_Frame_Count(void) { return FrameCount; }
+
+	// Current sync frame time in milliseconds. Can be zero when the logic has not stepped forward in the current render update.
+	static unsigned int		Get_Sync_Frame_Time(void) { return SyncTime - PreviousSyncTime; }
+
+	// Fractional sync frame time. Accumulates for as long as the sync frame is not stepped forward.
+	static unsigned int		Get_Fractional_Sync_Milliseconds() { return (unsigned int)FractionalSyncMs; }
+
+	// Total logic time in milliseconds. Can include fractions of a logic step. Is rounded to integer.
+	static unsigned int		Get_Logic_Time_Milliseconds() { return SyncTime + (unsigned int)FractionalSyncMs; }
+
+	// Logic time step in milliseconds. Can be a fraction of a logic step.
+	static float					Get_Logic_Frame_Time_Milliseconds() { return LogicFrameTimeMs; }
+
+	// Logic time step in seconds. Can be a fraction of a logic step.
+	static float					Get_Logic_Frame_Time_Seconds() { return LogicFrameTimeMs * 0.001f; }
+
+	// Returns the render frame count.
+	static unsigned int		Get_Frame_Count(void) { return FrameCount; }
+
 	static unsigned int		Get_Last_Frame_Poly_Count(void);
 	static unsigned int		Get_Last_Frame_Vertex_Count(void);
 
@@ -321,17 +336,23 @@ class WW3D
 	static void					Allocate_Debug_Resources(void);
 	static void					Release_Debug_Resources(void);
 
+	// Logic frame time, in milliseconds
+	static float LogicFrameTimeMs;
+
+	// Accumulated synchronized frame time in milliseconds
+	static float FractionalSyncMs;
+
 	// Timing info:
-   // The absolute synchronized frame time (in milliseconds) supplied by the
-   // application at the start of every frame. Note that wraparound cases
-   // etc. need to be considered.
-	static unsigned int				SyncTime;
+	// The absolute synchronized frame time (in milliseconds) supplied by the
+	// application at the start of every frame. Note that wraparound cases
+	// etc. need to be considered.
+	static unsigned int SyncTime;
 
-   // The previously set absolute sync time - this is used to get the interval between
-   // the most recently set sync time and the previous one. Assuming the
-   // application sets sync time at the start of every frame, this represents
-   // the frame interval.
-   static unsigned int           PreviousSyncTime;
+	// The previously set absolute sync time - this is used to get the interval between
+	// the most recently set sync time and the previous one. Assuming the
+	// application sets sync time at the start of every frame, this represents
+	// the frame interval.
+	static unsigned int PreviousSyncTime;
 
 	static float						PixelCenterX;
 	static float						PixelCenterY;
@@ -447,7 +468,3 @@ struct RenderStatistics
       long     UserStat1;
       long     UserStat2;
 };
-
-
-
-#endif
diff --git a/GeneralsMD/Code/Main/CMakeLists.txt b/GeneralsMD/Code/Main/CMakeLists.txt
index 2ef80b3e87e..cabc45befa4 100644
--- a/GeneralsMD/Code/Main/CMakeLists.txt
+++ b/GeneralsMD/Code/Main/CMakeLists.txt
@@ -14,7 +14,6 @@ target_link_libraries(z_generals PRIVATE
     core_profile
     d3d8
     d3dx8
-    dbghelplib
     dinput8
     dxguid
     imm32
@@ -31,8 +30,8 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/GeneratedVersion.h
 "#pragma once
 
 #define VERSION_LOCALBUILDNUM 0
-#define VERSION_BUILDUSER \"Someone\"
-#define VERSION_BUILDLOC \"Someplace\"
+#define VERSION_BUILDUSER \"\"
+#define VERSION_BUILDLOC \"\"
 "
 )
 
diff --git a/GeneralsMD/Code/Main/WinMain.cpp b/GeneralsMD/Code/Main/WinMain.cpp
index 412b0313f3b..3f887a07ca6 100644
--- a/GeneralsMD/Code/Main/WinMain.cpp
+++ b/GeneralsMD/Code/Main/WinMain.cpp
@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // FILE: WinMain.cpp //////////////////////////////////////////////////////////
-// 
+//
 // Entry point for game application
 //
 // Author: Colin Day, April 2001
@@ -42,6 +42,7 @@
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "WinMain.h"
 #include "Lib/BaseType.h"
+#include "Common/CommandLine.h"
 #include "Common/CriticalSection.h"
 #include "Common/GlobalData.h"
 #include "Common/GameEngine.h"
@@ -64,33 +65,26 @@
 #include "BuildVersion.h"
 #include "GeneratedVersion.h"
 #include "resource.h"
-#include "trim.h"
 
 #include <rts/profile.h>
-
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
+#ifdef RTS_ENABLE_CRASHDUMP
+#include "Common/MiniDumper.h"
 #endif
 
+
 // GLOBALS ////////////////////////////////////////////////////////////////////
 HINSTANCE ApplicationHInstance = NULL;  ///< our application instance
 HWND ApplicationHWnd = NULL;  ///< our application window handle
-Bool ApplicationIsWindowed = false;
-Win32Mouse *TheWin32Mouse= NULL;  ///< for the WndProc() only
+Win32Mouse *TheWin32Mouse = NULL;  ///< for the WndProc() only
 DWORD TheMessageTime = 0;	///< For getting the time that a message was posted from Windows.
 
 const Char *g_strFile = "data\\Generals.str";
 const Char *g_csfFile = "data\\%s\\Generals.csf";
 const char *gAppPrefix = ""; /// So WB can have a different debug log file name.
 
-#define DEFAULT_XRESOLUTION 800
-#define DEFAULT_YRESOLUTION 600
-
 static Bool gInitializing = false;
 static Bool gDoPaint = true;
-static Bool isWinMainActive = false; 
+static Bool isWinMainActive = false;
 
 static HBITMAP gLoadScreenBitmap = NULL;
 
@@ -98,198 +92,198 @@ static HBITMAP gLoadScreenBitmap = NULL;
 
 #ifdef DEBUG_WINDOWS_MESSAGES
 static const char *messageToString(unsigned int message)
-{	
+{
 	static char name[32];
 
 	switch (message)
 	{
-	case WM_NULL: return "WM_NULL";                     
-	case WM_CREATE: return  "WM_CREATE";               
-	case WM_DESTROY: return  "WM_DESTROY";            
-	case WM_MOVE: return  "WM_MOVE";               
-	case WM_SIZE: return  "WM_SIZE";                 
-	case WM_ACTIVATE: return  "WM_ACTIVATE";             
-	case WM_SETFOCUS: return  "WM_SETFOCUS";             
-	case WM_KILLFOCUS: return  "WM_KILLFOCUS";            
-	case WM_ENABLE: return  "WM_ENABLE";               
-	case WM_SETREDRAW: return  "WM_SETREDRAW";            
-	case WM_SETTEXT: return  "WM_SETTEXT";              
-	case WM_GETTEXT: return  "WM_GETTEXT";              
-	case WM_GETTEXTLENGTH: return  "WM_GETTEXTLENGTH";        
-	case WM_PAINT: return  "WM_PAINT";                
-	case WM_CLOSE: return  "WM_CLOSE";                
-	case WM_QUERYENDSESSION: return  "WM_QUERYENDSESSION";      
-	case WM_QUIT: return  "WM_QUIT";                 
-	case WM_QUERYOPEN: return  "WM_QUERYOPEN";            
-	case WM_ERASEBKGND: return  "WM_ERASEBKGND";           
-	case WM_SYSCOLORCHANGE: return  "WM_SYSCOLORCHANGE";       
-	case WM_ENDSESSION: return  "WM_ENDSESSION";           
-	case WM_SHOWWINDOW: return  "WM_SHOWWINDOW";           
+	case WM_NULL: return "WM_NULL";
+	case WM_CREATE: return  "WM_CREATE";
+	case WM_DESTROY: return  "WM_DESTROY";
+	case WM_MOVE: return  "WM_MOVE";
+	case WM_SIZE: return  "WM_SIZE";
+	case WM_ACTIVATE: return  "WM_ACTIVATE";
+	case WM_SETFOCUS: return  "WM_SETFOCUS";
+	case WM_KILLFOCUS: return  "WM_KILLFOCUS";
+	case WM_ENABLE: return  "WM_ENABLE";
+	case WM_SETREDRAW: return  "WM_SETREDRAW";
+	case WM_SETTEXT: return  "WM_SETTEXT";
+	case WM_GETTEXT: return  "WM_GETTEXT";
+	case WM_GETTEXTLENGTH: return  "WM_GETTEXTLENGTH";
+	case WM_PAINT: return  "WM_PAINT";
+	case WM_CLOSE: return  "WM_CLOSE";
+	case WM_QUERYENDSESSION: return  "WM_QUERYENDSESSION";
+	case WM_QUIT: return  "WM_QUIT";
+	case WM_QUERYOPEN: return  "WM_QUERYOPEN";
+	case WM_ERASEBKGND: return  "WM_ERASEBKGND";
+	case WM_SYSCOLORCHANGE: return  "WM_SYSCOLORCHANGE";
+	case WM_ENDSESSION: return  "WM_ENDSESSION";
+	case WM_SHOWWINDOW: return  "WM_SHOWWINDOW";
 	case WM_WININICHANGE: return "WM_WININICHANGE";
-	case WM_DEVMODECHANGE: return  "WM_DEVMODECHANGE";        
-	case WM_ACTIVATEAPP: return  "WM_ACTIVATEAPP";          
-	case WM_FONTCHANGE: return  "WM_FONTCHANGE";           
-	case WM_TIMECHANGE: return  "WM_TIMECHANGE";           
-	case WM_CANCELMODE: return  "WM_CANCELMODE";           
-	case WM_SETCURSOR: return  "WM_SETCURSOR";            
-	case WM_MOUSEACTIVATE: return  "WM_MOUSEACTIVATE";        
-	case WM_CHILDACTIVATE: return  "WM_CHILDACTIVATE";        
-	case WM_QUEUESYNC: return  "WM_QUEUESYNC";            
-	case WM_GETMINMAXINFO: return  "WM_GETMINMAXINFO";        
-	case WM_PAINTICON: return  "WM_PAINTICON";            
-	case WM_ICONERASEBKGND: return  "WM_ICONERASEBKGND";       
-	case WM_NEXTDLGCTL: return  "WM_NEXTDLGCTL";           
-	case WM_SPOOLERSTATUS: return  "WM_SPOOLERSTATUS";        
-	case WM_DRAWITEM: return  "WM_DRAWITEM";             
-	case WM_MEASUREITEM: return  "WM_MEASUREITEM";          
-	case WM_DELETEITEM: return  "WM_DELETEITEM";           
-	case WM_VKEYTOITEM: return  "WM_VKEYTOITEM";           
-	case WM_CHARTOITEM: return  "WM_CHARTOITEM";           
-	case WM_SETFONT: return  "WM_SETFONT";              
-	case WM_GETFONT: return  "WM_GETFONT";              
-	case WM_SETHOTKEY: return  "WM_SETHOTKEY";            
-	case WM_GETHOTKEY: return  "WM_GETHOTKEY";            
-	case WM_QUERYDRAGICON: return  "WM_QUERYDRAGICON";        
-	case WM_COMPAREITEM: return  "WM_COMPAREITEM";          
-	case WM_COMPACTING: return  "WM_COMPACTING";           
+	case WM_DEVMODECHANGE: return  "WM_DEVMODECHANGE";
+	case WM_ACTIVATEAPP: return  "WM_ACTIVATEAPP";
+	case WM_FONTCHANGE: return  "WM_FONTCHANGE";
+	case WM_TIMECHANGE: return  "WM_TIMECHANGE";
+	case WM_CANCELMODE: return  "WM_CANCELMODE";
+	case WM_SETCURSOR: return  "WM_SETCURSOR";
+	case WM_MOUSEACTIVATE: return  "WM_MOUSEACTIVATE";
+	case WM_CHILDACTIVATE: return  "WM_CHILDACTIVATE";
+	case WM_QUEUESYNC: return  "WM_QUEUESYNC";
+	case WM_GETMINMAXINFO: return  "WM_GETMINMAXINFO";
+	case WM_PAINTICON: return  "WM_PAINTICON";
+	case WM_ICONERASEBKGND: return  "WM_ICONERASEBKGND";
+	case WM_NEXTDLGCTL: return  "WM_NEXTDLGCTL";
+	case WM_SPOOLERSTATUS: return  "WM_SPOOLERSTATUS";
+	case WM_DRAWITEM: return  "WM_DRAWITEM";
+	case WM_MEASUREITEM: return  "WM_MEASUREITEM";
+	case WM_DELETEITEM: return  "WM_DELETEITEM";
+	case WM_VKEYTOITEM: return  "WM_VKEYTOITEM";
+	case WM_CHARTOITEM: return  "WM_CHARTOITEM";
+	case WM_SETFONT: return  "WM_SETFONT";
+	case WM_GETFONT: return  "WM_GETFONT";
+	case WM_SETHOTKEY: return  "WM_SETHOTKEY";
+	case WM_GETHOTKEY: return  "WM_GETHOTKEY";
+	case WM_QUERYDRAGICON: return  "WM_QUERYDRAGICON";
+	case WM_COMPAREITEM: return  "WM_COMPAREITEM";
+	case WM_COMPACTING: return  "WM_COMPACTING";
 	case WM_COMMNOTIFY: return  "WM_COMMNOTIFY";
-	case WM_WINDOWPOSCHANGING: return  "WM_WINDOWPOSCHANGING";    
-	case WM_WINDOWPOSCHANGED: return  "WM_WINDOWPOSCHANGED";     
-	case WM_POWER: return  "WM_POWER";                
-	case WM_COPYDATA: return  "WM_COPYDATA";             
-	case WM_CANCELJOURNAL: return  "WM_CANCELJOURNAL";        
-	case WM_NOTIFY: return  "WM_NOTIFY";               
+	case WM_WINDOWPOSCHANGING: return  "WM_WINDOWPOSCHANGING";
+	case WM_WINDOWPOSCHANGED: return  "WM_WINDOWPOSCHANGED";
+	case WM_POWER: return  "WM_POWER";
+	case WM_COPYDATA: return  "WM_COPYDATA";
+	case WM_CANCELJOURNAL: return  "WM_CANCELJOURNAL";
+	case WM_NOTIFY: return  "WM_NOTIFY";
 	case WM_INPUTLANGCHANGEREQUEST: return  "WM_INPUTLANGCHANGEREQUES";
-	case WM_INPUTLANGCHANGE: return  "WM_INPUTLANGCHANGE";      
-	case WM_TCARD: return  "WM_TCARD";                
-	case WM_HELP: return  "WM_HELP";                 
-	case WM_USERCHANGED: return  "WM_USERCHANGED";          
-	case WM_NOTIFYFORMAT: return  "WM_NOTIFYFORMAT";         
-	case WM_CONTEXTMENU: return  "WM_CONTEXTMENU";          
-	case WM_STYLECHANGING: return  "WM_STYLECHANGING";        
-	case WM_STYLECHANGED: return  "WM_STYLECHANGED";         
-	case WM_DISPLAYCHANGE: return  "WM_DISPLAYCHANGE";        
-	case WM_GETICON: return  "WM_GETICON";              
-	case WM_SETICON: return  "WM_SETICON";              
-	case WM_NCCREATE: return  "WM_NCCREATE";             
-	case WM_NCDESTROY: return  "WM_NCDESTROY";            
-	case WM_NCCALCSIZE: return  "WM_NCCALCSIZE";           
-	case WM_NCHITTEST: return  "WM_NCHITTEST";            
-	case WM_NCPAINT: return  "WM_NCPAINT";              
-	case WM_NCACTIVATE: return  "WM_NCACTIVATE";           
-	case WM_GETDLGCODE: return  "WM_GETDLGCODE";           
-	case WM_SYNCPAINT: return  "WM_SYNCPAINT";            
-	case WM_NCMOUSEMOVE: return  "WM_NCMOUSEMOVE";          
-	case WM_NCLBUTTONDOWN: return  "WM_NCLBUTTONDOWN";        
-	case WM_NCLBUTTONUP: return  "WM_NCLBUTTONUP";          
-	case WM_NCLBUTTONDBLCLK: return  "WM_NCLBUTTONDBLCLK";      
-	case WM_NCRBUTTONDOWN: return  "WM_NCRBUTTONDOWN";        
-	case WM_NCRBUTTONUP: return  "WM_NCRBUTTONUP";          
-	case WM_NCRBUTTONDBLCLK: return  "WM_NCRBUTTONDBLCLK";      
-	case WM_NCMBUTTONDOWN: return  "WM_NCMBUTTONDOWN";        
-	case WM_NCMBUTTONUP: return  "WM_NCMBUTTONUP";          
-	case WM_NCMBUTTONDBLCLK: return  "WM_NCMBUTTONDBLCLK";      
-	case WM_KEYDOWN: return  "WM_KEYDOWN";              
-	case WM_KEYUP: return  "WM_KEYUP";                
-	case WM_CHAR: return  "WM_CHAR";                 
-	case WM_DEADCHAR: return  "WM_DEADCHAR";             
-	case WM_SYSKEYDOWN: return  "WM_SYSKEYDOWN";           
-	case WM_SYSKEYUP: return  "WM_SYSKEYUP";             
-	case WM_SYSCHAR: return  "WM_SYSCHAR";              
-	case WM_SYSDEADCHAR: return  "WM_SYSDEADCHAR";          
-	case WM_KEYLAST: return  "WM_KEYLAST";              
-	case WM_IME_STARTCOMPOSITION: return  "WM_IME_STARTCOMPOSITION"; 
-	case WM_IME_ENDCOMPOSITION: return  "WM_IME_ENDCOMPOSITION";   
-	case WM_IME_COMPOSITION: return  "WM_IME_COMPOSITION";      
-	case WM_INITDIALOG: return  "WM_INITDIALOG";           
-	case WM_COMMAND: return  "WM_COMMAND";              
-	case WM_SYSCOMMAND: return  "WM_SYSCOMMAND";           
-	case WM_TIMER: return  "WM_TIMER";                
-	case WM_HSCROLL: return  "WM_HSCROLL";              
-	case WM_VSCROLL: return  "WM_VSCROLL";              
-	case WM_INITMENU: return  "WM_INITMENU";             
-	case WM_INITMENUPOPUP: return  "WM_INITMENUPOPUP";        
-	case WM_MENUSELECT: return  "WM_MENUSELECT";           
-	case WM_MENUCHAR: return  "WM_MENUCHAR";             
-	case WM_ENTERIDLE: return  "WM_ENTERIDLE";            
-	case WM_CTLCOLORMSGBOX: return  "WM_CTLCOLORMSGBOX";       
-	case WM_CTLCOLOREDIT: return  "WM_CTLCOLOREDIT";         
-	case WM_CTLCOLORLISTBOX: return  "WM_CTLCOLORLISTBOX";      
-	case WM_CTLCOLORBTN: return  "WM_CTLCOLORBTN";          
-	case WM_CTLCOLORDLG: return  "WM_CTLCOLORDLG";          
-	case WM_CTLCOLORSCROLLBAR: return  "WM_CTLCOLORSCROLLBAR";    
-	case WM_CTLCOLORSTATIC: return  "WM_CTLCOLORSTATIC";       
-	case WM_MOUSEMOVE: return  "WM_MOUSEMOVE";            
-	case WM_LBUTTONDOWN: return  "WM_LBUTTONDOWN";          
-	case WM_LBUTTONUP: return  "WM_LBUTTONUP";            
-	case WM_LBUTTONDBLCLK: return  "WM_LBUTTONDBLCLK";        
-	case WM_RBUTTONDOWN: return  "WM_RBUTTONDOWN";          
-	case WM_RBUTTONUP: return  "WM_RBUTTONUP";            
-	case WM_RBUTTONDBLCLK: return  "WM_RBUTTONDBLCLK";        
-	case WM_MBUTTONDOWN: return  "WM_MBUTTONDOWN";          
-	case WM_MBUTTONUP: return  "WM_MBUTTONUP";            
-	case WM_MBUTTONDBLCLK: return  "WM_MBUTTONDBLCLK";        
-//	case WM_MOUSEWHEEL: return  "WM_MOUSEWHEEL";           
-	case WM_PARENTNOTIFY: return  "WM_PARENTNOTIFY";         
-	case WM_ENTERMENULOOP: return  "WM_ENTERMENULOOP";        
-	case WM_EXITMENULOOP: return  "WM_EXITMENULOOP";         
-	case WM_NEXTMENU: return  "WM_NEXTMENU";             
-	case WM_SIZING: return  "WM_SIZING";               
-	case WM_CAPTURECHANGED: return  "WM_CAPTURECHANGED";       
-	case WM_MOVING: return  "WM_MOVING";               
+	case WM_INPUTLANGCHANGE: return  "WM_INPUTLANGCHANGE";
+	case WM_TCARD: return  "WM_TCARD";
+	case WM_HELP: return  "WM_HELP";
+	case WM_USERCHANGED: return  "WM_USERCHANGED";
+	case WM_NOTIFYFORMAT: return  "WM_NOTIFYFORMAT";
+	case WM_CONTEXTMENU: return  "WM_CONTEXTMENU";
+	case WM_STYLECHANGING: return  "WM_STYLECHANGING";
+	case WM_STYLECHANGED: return  "WM_STYLECHANGED";
+	case WM_DISPLAYCHANGE: return  "WM_DISPLAYCHANGE";
+	case WM_GETICON: return  "WM_GETICON";
+	case WM_SETICON: return  "WM_SETICON";
+	case WM_NCCREATE: return  "WM_NCCREATE";
+	case WM_NCDESTROY: return  "WM_NCDESTROY";
+	case WM_NCCALCSIZE: return  "WM_NCCALCSIZE";
+	case WM_NCHITTEST: return  "WM_NCHITTEST";
+	case WM_NCPAINT: return  "WM_NCPAINT";
+	case WM_NCACTIVATE: return  "WM_NCACTIVATE";
+	case WM_GETDLGCODE: return  "WM_GETDLGCODE";
+	case WM_SYNCPAINT: return  "WM_SYNCPAINT";
+	case WM_NCMOUSEMOVE: return  "WM_NCMOUSEMOVE";
+	case WM_NCLBUTTONDOWN: return  "WM_NCLBUTTONDOWN";
+	case WM_NCLBUTTONUP: return  "WM_NCLBUTTONUP";
+	case WM_NCLBUTTONDBLCLK: return  "WM_NCLBUTTONDBLCLK";
+	case WM_NCRBUTTONDOWN: return  "WM_NCRBUTTONDOWN";
+	case WM_NCRBUTTONUP: return  "WM_NCRBUTTONUP";
+	case WM_NCRBUTTONDBLCLK: return  "WM_NCRBUTTONDBLCLK";
+	case WM_NCMBUTTONDOWN: return  "WM_NCMBUTTONDOWN";
+	case WM_NCMBUTTONUP: return  "WM_NCMBUTTONUP";
+	case WM_NCMBUTTONDBLCLK: return  "WM_NCMBUTTONDBLCLK";
+	case WM_KEYDOWN: return  "WM_KEYDOWN";
+	case WM_KEYUP: return  "WM_KEYUP";
+	case WM_CHAR: return  "WM_CHAR";
+	case WM_DEADCHAR: return  "WM_DEADCHAR";
+	case WM_SYSKEYDOWN: return  "WM_SYSKEYDOWN";
+	case WM_SYSKEYUP: return  "WM_SYSKEYUP";
+	case WM_SYSCHAR: return  "WM_SYSCHAR";
+	case WM_SYSDEADCHAR: return  "WM_SYSDEADCHAR";
+	case WM_KEYLAST: return  "WM_KEYLAST";
+	case WM_IME_STARTCOMPOSITION: return  "WM_IME_STARTCOMPOSITION";
+	case WM_IME_ENDCOMPOSITION: return  "WM_IME_ENDCOMPOSITION";
+	case WM_IME_COMPOSITION: return  "WM_IME_COMPOSITION";
+	case WM_INITDIALOG: return  "WM_INITDIALOG";
+	case WM_COMMAND: return  "WM_COMMAND";
+	case WM_SYSCOMMAND: return  "WM_SYSCOMMAND";
+	case WM_TIMER: return  "WM_TIMER";
+	case WM_HSCROLL: return  "WM_HSCROLL";
+	case WM_VSCROLL: return  "WM_VSCROLL";
+	case WM_INITMENU: return  "WM_INITMENU";
+	case WM_INITMENUPOPUP: return  "WM_INITMENUPOPUP";
+	case WM_MENUSELECT: return  "WM_MENUSELECT";
+	case WM_MENUCHAR: return  "WM_MENUCHAR";
+	case WM_ENTERIDLE: return  "WM_ENTERIDLE";
+	case WM_CTLCOLORMSGBOX: return  "WM_CTLCOLORMSGBOX";
+	case WM_CTLCOLOREDIT: return  "WM_CTLCOLOREDIT";
+	case WM_CTLCOLORLISTBOX: return  "WM_CTLCOLORLISTBOX";
+	case WM_CTLCOLORBTN: return  "WM_CTLCOLORBTN";
+	case WM_CTLCOLORDLG: return  "WM_CTLCOLORDLG";
+	case WM_CTLCOLORSCROLLBAR: return  "WM_CTLCOLORSCROLLBAR";
+	case WM_CTLCOLORSTATIC: return  "WM_CTLCOLORSTATIC";
+	case WM_MOUSEMOVE: return  "WM_MOUSEMOVE";
+	case WM_LBUTTONDOWN: return  "WM_LBUTTONDOWN";
+	case WM_LBUTTONUP: return  "WM_LBUTTONUP";
+	case WM_LBUTTONDBLCLK: return  "WM_LBUTTONDBLCLK";
+	case WM_RBUTTONDOWN: return  "WM_RBUTTONDOWN";
+	case WM_RBUTTONUP: return  "WM_RBUTTONUP";
+	case WM_RBUTTONDBLCLK: return  "WM_RBUTTONDBLCLK";
+	case WM_MBUTTONDOWN: return  "WM_MBUTTONDOWN";
+	case WM_MBUTTONUP: return  "WM_MBUTTONUP";
+	case WM_MBUTTONDBLCLK: return  "WM_MBUTTONDBLCLK";
+//	case WM_MOUSEWHEEL: return  "WM_MOUSEWHEEL";
+	case WM_PARENTNOTIFY: return  "WM_PARENTNOTIFY";
+	case WM_ENTERMENULOOP: return  "WM_ENTERMENULOOP";
+	case WM_EXITMENULOOP: return  "WM_EXITMENULOOP";
+	case WM_NEXTMENU: return  "WM_NEXTMENU";
+	case WM_SIZING: return  "WM_SIZING";
+	case WM_CAPTURECHANGED: return  "WM_CAPTURECHANGED";
+	case WM_MOVING: return  "WM_MOVING";
 	case WM_POWERBROADCAST: return  "WM_POWERBROADCAST";
-	case WM_DEVICECHANGE: return  "WM_DEVICECHANGE";         
-	case WM_MDICREATE: return  "WM_MDICREATE";            
-	case WM_MDIDESTROY: return  "WM_MDIDESTROY";           
-	case WM_MDIACTIVATE: return  "WM_MDIACTIVATE";          
-	case WM_MDIRESTORE: return  "WM_MDIRESTORE";           
-	case WM_MDINEXT: return  "WM_MDINEXT";              
-	case WM_MDIMAXIMIZE: return  "WM_MDIMAXIMIZE";          
-	case WM_MDITILE: return  "WM_MDITILE";              
-	case WM_MDICASCADE: return  "WM_MDICASCADE";           
-	case WM_MDIICONARRANGE: return  "WM_MDIICONARRANGE";       
-	case WM_MDIGETACTIVE: return  "WM_MDIGETACTIVE";         
-	case WM_MDISETMENU: return  "WM_MDISETMENU";           
-	case WM_ENTERSIZEMOVE: return  "WM_ENTERSIZEMOVE";        
-	case WM_EXITSIZEMOVE: return  "WM_EXITSIZEMOVE";         
-	case WM_DROPFILES: return  "WM_DROPFILES";            
-	case WM_MDIREFRESHMENU: return  "WM_MDIREFRESHMENU";       
-	case WM_IME_SETCONTEXT: return  "WM_IME_SETCONTEXT";       
-	case WM_IME_NOTIFY: return  "WM_IME_NOTIFY";           
-	case WM_IME_CONTROL: return  "WM_IME_CONTROL";          
-	case WM_IME_COMPOSITIONFULL: return  "WM_IME_COMPOSITIONFULL";  
-	case WM_IME_SELECT: return  "WM_IME_SELECT";           
-	case WM_IME_CHAR: return  "WM_IME_CHAR";             
-	case WM_IME_KEYDOWN: return  "WM_IME_KEYDOWN";          
-	case WM_IME_KEYUP: return  "WM_IME_KEYUP";            
-//	case WM_MOUSEHOVER: return  "WM_MOUSEHOVER";           
-//	case WM_MOUSELEAVE: return  "WM_MOUSELEAVE";           
-	case WM_CUT: return  "WM_CUT";                  
-	case WM_COPY: return  "WM_COPY";                 
-	case WM_PASTE: return  "WM_PASTE";                
-	case WM_CLEAR: return  "WM_CLEAR";                
-	case WM_UNDO: return  "WM_UNDO";                 
-	case WM_RENDERFORMAT: return  "WM_RENDERFORMAT";         
-	case WM_RENDERALLFORMATS: return  "WM_RENDERALLFORMATS";     
-	case WM_DESTROYCLIPBOARD: return  "WM_DESTROYCLIPBOARD";     
-	case WM_DRAWCLIPBOARD: return  "WM_DRAWCLIPBOARD";        
-	case WM_PAINTCLIPBOARD: return  "WM_PAINTCLIPBOARD";       
-	case WM_VSCROLLCLIPBOARD: return  "WM_VSCROLLCLIPBOARD";     
-	case WM_SIZECLIPBOARD: return  "WM_SIZECLIPBOARD";        
-	case WM_ASKCBFORMATNAME: return  "WM_ASKCBFORMATNAME";      
-	case WM_CHANGECBCHAIN: return  "WM_CHANGECBCHAIN";        
-	case WM_HSCROLLCLIPBOARD: return  "WM_HSCROLLCLIPBOARD";     
-	case WM_QUERYNEWPALETTE: return  "WM_QUERYNEWPALETTE";      
-	case WM_PALETTEISCHANGING: return  "WM_PALETTEISCHANGING";    
-	case WM_PALETTECHANGED: return  "WM_PALETTECHANGED";       
-	case WM_HOTKEY: return  "WM_HOTKEY";               
-	case WM_PRINT: return  "WM_PRINT";                
-	case WM_PRINTCLIENT: return  "WM_PRINTCLIENT";          
-	case WM_HANDHELDFIRST: return  "WM_HANDHELDFIRST";        
-	case WM_HANDHELDLAST: return  "WM_HANDHELDLAST";         
-	case WM_AFXFIRST: return  "WM_AFXFIRST";             
-	case WM_AFXLAST: return  "WM_AFXLAST";              
-	case WM_PENWINFIRST: return  "WM_PENWINFIRST";          
+	case WM_DEVICECHANGE: return  "WM_DEVICECHANGE";
+	case WM_MDICREATE: return  "WM_MDICREATE";
+	case WM_MDIDESTROY: return  "WM_MDIDESTROY";
+	case WM_MDIACTIVATE: return  "WM_MDIACTIVATE";
+	case WM_MDIRESTORE: return  "WM_MDIRESTORE";
+	case WM_MDINEXT: return  "WM_MDINEXT";
+	case WM_MDIMAXIMIZE: return  "WM_MDIMAXIMIZE";
+	case WM_MDITILE: return  "WM_MDITILE";
+	case WM_MDICASCADE: return  "WM_MDICASCADE";
+	case WM_MDIICONARRANGE: return  "WM_MDIICONARRANGE";
+	case WM_MDIGETACTIVE: return  "WM_MDIGETACTIVE";
+	case WM_MDISETMENU: return  "WM_MDISETMENU";
+	case WM_ENTERSIZEMOVE: return  "WM_ENTERSIZEMOVE";
+	case WM_EXITSIZEMOVE: return  "WM_EXITSIZEMOVE";
+	case WM_DROPFILES: return  "WM_DROPFILES";
+	case WM_MDIREFRESHMENU: return  "WM_MDIREFRESHMENU";
+	case WM_IME_SETCONTEXT: return  "WM_IME_SETCONTEXT";
+	case WM_IME_NOTIFY: return  "WM_IME_NOTIFY";
+	case WM_IME_CONTROL: return  "WM_IME_CONTROL";
+	case WM_IME_COMPOSITIONFULL: return  "WM_IME_COMPOSITIONFULL";
+	case WM_IME_SELECT: return  "WM_IME_SELECT";
+	case WM_IME_CHAR: return  "WM_IME_CHAR";
+	case WM_IME_KEYDOWN: return  "WM_IME_KEYDOWN";
+	case WM_IME_KEYUP: return  "WM_IME_KEYUP";
+//	case WM_MOUSEHOVER: return  "WM_MOUSEHOVER";
+//	case WM_MOUSELEAVE: return  "WM_MOUSELEAVE";
+	case WM_CUT: return  "WM_CUT";
+	case WM_COPY: return  "WM_COPY";
+	case WM_PASTE: return  "WM_PASTE";
+	case WM_CLEAR: return  "WM_CLEAR";
+	case WM_UNDO: return  "WM_UNDO";
+	case WM_RENDERFORMAT: return  "WM_RENDERFORMAT";
+	case WM_RENDERALLFORMATS: return  "WM_RENDERALLFORMATS";
+	case WM_DESTROYCLIPBOARD: return  "WM_DESTROYCLIPBOARD";
+	case WM_DRAWCLIPBOARD: return  "WM_DRAWCLIPBOARD";
+	case WM_PAINTCLIPBOARD: return  "WM_PAINTCLIPBOARD";
+	case WM_VSCROLLCLIPBOARD: return  "WM_VSCROLLCLIPBOARD";
+	case WM_SIZECLIPBOARD: return  "WM_SIZECLIPBOARD";
+	case WM_ASKCBFORMATNAME: return  "WM_ASKCBFORMATNAME";
+	case WM_CHANGECBCHAIN: return  "WM_CHANGECBCHAIN";
+	case WM_HSCROLLCLIPBOARD: return  "WM_HSCROLLCLIPBOARD";
+	case WM_QUERYNEWPALETTE: return  "WM_QUERYNEWPALETTE";
+	case WM_PALETTEISCHANGING: return  "WM_PALETTEISCHANGING";
+	case WM_PALETTECHANGED: return  "WM_PALETTECHANGED";
+	case WM_HOTKEY: return  "WM_HOTKEY";
+	case WM_PRINT: return  "WM_PRINT";
+	case WM_PRINTCLIENT: return  "WM_PRINTCLIENT";
+	case WM_HANDHELDFIRST: return  "WM_HANDHELDFIRST";
+	case WM_HANDHELDLAST: return  "WM_HANDHELDLAST";
+	case WM_AFXFIRST: return  "WM_AFXFIRST";
+	case WM_AFXLAST: return  "WM_AFXLAST";
+	case WM_PENWINFIRST: return  "WM_PENWINFIRST";
 	case WM_PENWINLAST: return  "WM_PENWINLAST";
 	default: return "WM_UNKNOWN";
 	};
@@ -299,13 +293,13 @@ static const char *messageToString(unsigned int message)
 // WndProc ====================================================================
 /** Window Procedure */
 //=============================================================================
-LRESULT CALLBACK WndProc( HWND hWnd, UINT message, 
+LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 													WPARAM wParam, LPARAM lParam )
 {
 
 	try
 	{
-		// First let the IME manager do it's stuff. 
+		// First let the IME manager do it's stuff.
 		if ( TheIMEManager )
 		{
 			if ( TheIMEManager->serviceIMEMessage( hWnd, message, wParam, lParam ) )
@@ -318,60 +312,60 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 #ifdef	DEBUG_WINDOWS_MESSAGES
 		static msgCount=0;
 		char testString[256];
-		sprintf(testString,"\n%d: %s (%X,%X)", msgCount++,messageToString(message), wParam, lParam); 
+		sprintf(testString,"\n%d: %s (%X,%X)", msgCount++,messageToString(message), wParam, lParam);
 		OutputDebugString(testString);
 #endif
 
 		// handle all window messages
-		switch( message ) 
+		switch( message )
 		{
 			//-------------------------------------------------------------------------
 			case WM_NCHITTEST:
-			// Prevent the user from selecting the menu in fullscreen mode
-            if( !ApplicationIsWindowed )
-                return HTCLIENT;
-            break;
+				// Prevent the user from selecting the menu in fullscreen mode
+				if( !TheGlobalData->m_windowed )
+					return HTCLIENT;
+				break;
 
 			//-------------------------------------------------------------------------
 			case WM_POWERBROADCAST:
-            switch( wParam )
-            {
-                #ifndef PBT_APMQUERYSUSPEND
-                    #define PBT_APMQUERYSUSPEND 0x0000
-                #endif
-                case PBT_APMQUERYSUSPEND:
-                    // At this point, the app should save any data for open
-                    // network connections, files, etc., and prepare to go into
-                    // a suspended mode.
-                    return TRUE;
-
-                #ifndef PBT_APMRESUMESUSPEND
-                    #define PBT_APMRESUMESUSPEND 0x0007
-                #endif
-                case PBT_APMRESUMESUSPEND:
-                    // At this point, the app should recover any data, network
-                    // connections, files, etc., and resume running from when
-                    // the app was suspended.
-                    return TRUE;
-            }
-            break;
+				switch( wParam )
+				{
+					#ifndef PBT_APMQUERYSUSPEND
+						#define PBT_APMQUERYSUSPEND 0x0000
+					#endif
+					case PBT_APMQUERYSUSPEND:
+						// At this point, the app should save any data for open
+						// network connections, files, etc., and prepare to go into
+						// a suspended mode.
+						return TRUE;
+
+					#ifndef PBT_APMRESUMESUSPEND
+						#define PBT_APMRESUMESUSPEND 0x0007
+					#endif
+					case PBT_APMRESUMESUSPEND:
+						// At this point, the app should recover any data, network
+						// connections, files, etc., and resume running from when
+						// the app was suspended.
+						return TRUE;
+				}
+				break;
 			//-------------------------------------------------------------------------
 			case WM_SYSCOMMAND:
-            // Prevent moving/sizing and power loss in fullscreen mode
-            switch( wParam )
-            {
-                case SC_KEYMENU:
-                    // TheSuperHackers @bugfix Mauller 10/05/2025 Always handle this command to prevent halting the game when left Alt is pressed.
-                    return 1;
-                case SC_MOVE:
-                case SC_SIZE:
-                case SC_MAXIMIZE:
-                case SC_MONITORPOWER:
-                    if( FALSE == ApplicationIsWindowed )
-                        return 1;
-                    break;
-            }
-            break;
+				// Prevent moving/sizing and power loss in fullscreen mode
+				switch( wParam )
+				{
+					case SC_KEYMENU:
+						// TheSuperHackers @bugfix Mauller 10/05/2025 Always handle this command to prevent halting the game when left Alt is pressed.
+						return 1;
+					case SC_MOVE:
+					case SC_SIZE:
+					case SC_MAXIMIZE:
+					case SC_MONITORPOWER:
+						if( !TheGlobalData->m_windowed )
+							return 1;
+						break;
+				}
+				break;
 
 			case WM_QUERYENDSESSION:
 			{
@@ -381,57 +375,78 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 			// ------------------------------------------------------------------------
 			case WM_CLOSE:
-			if (!TheGameEngine->getQuitting())
-			{
-				//user is exiting without using the menus
+				if (!TheGameEngine->getQuitting())
+				{
+					//user is exiting without using the menus
 
-				//This method didn't work in cinematics because we don't process messages.
-				//But it's the cleanest way to exit that's similar to using menus.
-				TheMessageStream->appendMessage(GameMessage::MSG_META_DEMO_INSTANT_QUIT);
+					//This method didn't work in cinematics because we don't process messages.
+					//But it's the cleanest way to exit that's similar to using menus.
+					TheMessageStream->appendMessage(GameMessage::MSG_META_DEMO_INSTANT_QUIT);
 
-				//This method used to disable quitting.  We just put up the options screen instead.
-				//TheMessageStream->appendMessage(GameMessage::MSG_META_OPTIONS);
+					//This method used to disable quitting.  We just put up the options screen instead.
+					//TheMessageStream->appendMessage(GameMessage::MSG_META_OPTIONS);
 
-				//This method works everywhere but isn't as clean at shutting down.
-				//TheGameEngine->checkAbnormalQuitting();	//old way to log disconnections for ALT-F4
-				//TheGameEngine->reset();
-				//TheGameEngine->setQuitting(TRUE);
-				//_exit(EXIT_SUCCESS);
+					//This method works everywhere but isn't as clean at shutting down.
+					//TheGameEngine->checkAbnormalQuitting();	//old way to log disconnections for ALT-F4
+					//TheGameEngine->reset();
+					//TheGameEngine->setQuitting(TRUE);
+					//_exit(EXIT_SUCCESS);
+				}
 				return 0;
+
+			//-------------------------------------------------------------------------
+			case WM_MOVE:
+			{
+				if (TheMouse)
+					TheMouse->refreshCursorCapture();
+
+				break;
+			}
+
+			//-------------------------------------------------------------------------
+			case WM_SIZE:
+			{
+				// When W3D initializes, it resizes the window.  So stop repainting.
+				if (!gInitializing)
+					gDoPaint = false;
+
+				if (TheMouse)
+					TheMouse->refreshCursorCapture();
+
+				break;
 			}
 
 			// ------------------------------------------------------------------------
 			case WM_SETFOCUS:
 			{
-
 				//
 				// reset the state of our keyboard cause we haven't been paying
 				// attention to the keys while focus was away
 				//
-				if( TheKeyboard )
+				if (TheKeyboard)
 					TheKeyboard->resetKeys();
 
-				if (TheWin32Mouse)
-					TheWin32Mouse->lostFocus(FALSE);
-
-				break;
-
-			}  // end set focus
+				if (TheMouse)
+					TheMouse->regainFocus();
 
-			//-------------------------------------------------------------------------
-			case WM_SIZE:
-				// When W3D initializes, it resizes the window.  So stop repainting.
-				if (!gInitializing) 
-					gDoPaint = false;
 				break;
+			}
 
 			//-------------------------------------------------------------------------
 			case WM_KILLFOCUS:
 			{
-				if (TheKeyboard )
+				if (TheKeyboard)
 					TheKeyboard->resetKeys();
-				if (TheWin32Mouse)
-					TheWin32Mouse->lostFocus(TRUE);
+
+				if (TheMouse)
+				{
+					TheMouse->loseFocus();
+
+					if (TheMouse->isCursorInside())
+					{
+						TheMouse->onCursorMovedOutside();
+					}
+				}
 
 				break;
 			}
@@ -449,47 +464,41 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					// paths that take care of that.
 
 					isWinMainActive = (BOOL) wParam;
-					
+
 					if (TheGameEngine)
 						TheGameEngine->setIsActive(isWinMainActive);
 
 					if (isWinMainActive)
-					{	//restore mouse cursor to our custom version.
+					{
+						//restore mouse cursor to our custom version.
 						if (TheWin32Mouse)
 							TheWin32Mouse->setCursor(TheWin32Mouse->getMouseCursor());
 					}
 				}
 				return 0;
 			}
+
 			//-------------------------------------------------------------------------
 			case WM_ACTIVATE:
 			{
 				Int active = LOWORD( wParam );
 
-				//
-				// when window is becoming deactivated we must release mouse cursor
-				// locks on our region, otherwise set the mouse limit region again
-				// which will clip the cursor to our window
-				//
 				if( active == WA_INACTIVE )
 				{
-
-					ClipCursor( NULL );
 					if (TheAudio)
 						TheAudio->loseFocus();
-				}  // end if
+				}
 				else
 				{
-					if( TheMouse )
-						TheMouse->setMouseLimits();
-
 					if (TheAudio)
 						TheAudio->regainFocus();
 
-				}  // end else
+					// Cursor can only be captured after one of the activation events.
+					if (TheMouse)
+						TheMouse->refreshCursorCapture();
+				}
 				break;
-
-			}  // end case activate
+			}
 
 			//-------------------------------------------------------------------------
 			case WM_KEYDOWN:
@@ -498,22 +507,14 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 				switch( key )
 				{
-
-					//---------------------------------------------------------------------
 					case VK_ESCAPE:
 					{
-
 						PostQuitMessage( 0 );
 						break;
-
-					}  // end VK_ESCAPE
-
-
-				}  // end switch
-
+					}
+				}
 				return 0;
-
-			}  // end WM_KEYDOWN
+			}
 
 			//-------------------------------------------------------------------------
 			case WM_LBUTTONDOWN:
@@ -528,17 +529,18 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			case WM_RBUTTONUP:
 			case WM_RBUTTONDBLCLK:
 			{
-
 				if( TheWin32Mouse )
 					TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
 
 				return 0;
-
-			}  // end WM_LBUTTONDOWN
+			}
 
 			//-------------------------------------------------------------------------
 			case 0x020A: // WM_MOUSEWHEEL
 			{
+				if( TheWin32Mouse == NULL )
+					return 0;
+
 				long x = (long) LOWORD(lParam);
 				long y = (long) HIWORD(lParam);
 				RECT rect;
@@ -548,33 +550,43 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				if( x < rect.left || x > rect.right || y < rect.top || y > rect.bottom )
 					return 0;
 
-				if( TheWin32Mouse )
-					TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
-
+				TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
 				return 0;
-
-			}  // end WM_MOUSEWHEEL
-
+			}
 
 			//-------------------------------------------------------------------------
 			case WM_MOUSEMOVE:
 			{
+				if( TheWin32Mouse == NULL )
+					return 0;
+
+				// ignore when window is not active
+				if( !isWinMainActive )
+					return 0;
+
 				Int x = (Int)LOWORD( lParam );
 				Int y = (Int)HIWORD( lParam );
 				RECT rect;
-//				Int keys = wParam;
 
 				// ignore when outside of client area
 				GetClientRect( ApplicationHWnd, &rect );
 				if( x < rect.left || x > rect.right || y < rect.top || y > rect.bottom )
+				{
+					if ( TheMouse->isCursorInside() )
+					{
+						TheMouse->onCursorMovedOutside();
+					}
 					return 0;
+				}
 
-				if( TheWin32Mouse )
-					TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
+				if( !TheMouse->isCursorInside() )
+				{
+					TheMouse->onCursorMovedInside();
+				}
 
+				TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
 				return 0;
-
-			}  // end WM_MOUSEMOVE
+			}
 
 			//-------------------------------------------------------------------------
 			case WM_SETCURSOR:
@@ -589,7 +601,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				if (gDoPaint) {
 					PAINTSTRUCT paint;
 					HDC dc = ::BeginPaint(hWnd, &paint);
-#if 0  
+#if 0
 					::SetTextColor(dc, RGB(255,255,255));
 					::SetBkColor(dc, RGB(0,0,0));
 					::TextOut(dc, 30, 30, "Loading Command & Conquer Generals...", 37);
@@ -598,7 +610,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						Int savContext = ::SaveDC(dc);
 						HDC tmpDC = ::CreateCompatibleDC(dc);
 						HBITMAP savBitmap = (HBITMAP)::SelectObject(tmpDC, gLoadScreenBitmap);
-						::BitBlt(dc, 0, 0, DEFAULT_XRESOLUTION, DEFAULT_YRESOLUTION, tmpDC, 0, 0, SRCCOPY);
+						::BitBlt(dc, 0, 0, DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_HEIGHT, tmpDC, 0, 0, SRCCOPY);
 						::SelectObject(tmpDC, savBitmap);
 						::DeleteDC(tmpDC);
 						::RestoreDC(dc, savContext);
@@ -611,18 +623,18 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 			case WM_ERASEBKGND:
 			{
-				if (!gDoPaint) 
+				if (!gDoPaint)
 					return TRUE;	//we don't need to erase the background because we always draw entire window.
 				break;
 			}
 
-// Well, it was a nice idea, but we don't get a message for an ejection. 
+// Well, it was a nice idea, but we don't get a message for an ejection.
 // (Really unforunate, actually.) I'm leaving this in in-case some one wants
 // to trap a different device change (for instance, removal of a mouse) - jkmcd
 #if 0
-			case WM_DEVICECHANGE: 
+			case WM_DEVICECHANGE:
 			{
-				if (((UINT) wParam) == DBT_DEVICEREMOVEPENDING) 
+				if (((UINT) wParam) == DBT_DEVICEREMOVEPENDING)
 				{
 					DEV_BROADCAST_HDR *hdr = (DEV_BROADCAST_HDR*) lParam;
 					if (!hdr) {
@@ -638,7 +650,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					// its done. I hate Windows. - jkmcd
 					DEV_BROADCAST_VOLUME *vol = (DEV_BROADCAST_VOLUME*) (hdr);
 
-					// @todo - Yikes. This could cause us all kinds of pain. I don't really want 
+					// @todo - Yikes. This could cause us all kinds of pain. I don't really want
 					// to even think about the stink this could cause us.
 					TheFileSystem->unloadMusicFilesFromCD(vol->dbcv_unitmask);
 					return TRUE;
@@ -646,19 +658,19 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				break;
 			}
 #endif
-		}  // end switch
+		}
 
 	}
 	catch (...)
 	{
-		RELEASE_CRASH(("Uncaught exception in Main::WndProc... probably should not happen\n"));
+		RELEASE_CRASH(("Uncaught exception in Main::WndProc... probably should not happen"));
 		// no rethrow
 	}
 
 //In full-screen mode, only pass these messages onto the default windows handler.
 //Appears to fix issues with dual monitor systems but doesn't seem safe?
 ///@todo: Look into proper support for dual monitor systems.
-/*	if (!ApplicationIsWindowed)
+/*	if (!TheGlobalData->m_windowed)
 	switch (message)
 	{
 		case WM_PAINT:
@@ -672,7 +684,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 	return DefWindowProc( hWnd, message, wParam, lParam );
 
-}  // end WndProc
+}
 
 // initializeAppWindows =======================================================
 /** Register windows class and create application windows. */
@@ -680,21 +692,21 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 static Bool initializeAppWindows( HINSTANCE hInstance, Int nCmdShow, Bool runWindowed )
 {
 	DWORD windowStyle;
-	Int startWidth = DEFAULT_XRESOLUTION,
-			startHeight = DEFAULT_YRESOLUTION;
+	Int startWidth = DEFAULT_DISPLAY_WIDTH,
+			startHeight = DEFAULT_DISPLAY_HEIGHT;
 
 	// register the window class
 
   WNDCLASS wndClass = { CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS, WndProc, 0, 0, hInstance,
                        LoadIcon (hInstance, MAKEINTRESOURCE(IDI_ApplicationIcon)),
-                       NULL/*LoadCursor(NULL, IDC_ARROW)*/, 
+                       NULL/*LoadCursor(NULL, IDC_ARROW)*/,
                        (HBRUSH)GetStockObject(BLACK_BRUSH), NULL,
 	                     TEXT("Game Window") };
   RegisterClass( &wndClass );
 
    // Create our main window
 	windowStyle =  WS_POPUP|WS_VISIBLE;
-	if (runWindowed) 
+	if (runWindowed)
 		windowStyle |= WS_DLGFRAME | WS_CAPTION | WS_SYSMENU;
 	else
 		windowStyle |= WS_EX_TOPMOST | WS_SYSMENU;
@@ -707,34 +719,34 @@ static Bool initializeAppWindows( HINSTANCE hInstance, Int nCmdShow, Bool runWin
 	AdjustWindowRect (&rect, windowStyle, FALSE);
 	if (runWindowed) {
 		// Makes the normal debug 800x600 window center in the screen.
-		startWidth = DEFAULT_XRESOLUTION;
-		startHeight= DEFAULT_YRESOLUTION;
+		startWidth = DEFAULT_DISPLAY_WIDTH;
+		startHeight= DEFAULT_DISPLAY_HEIGHT;
 	}
 
 	gInitializing = true;
 
   HWND hWnd = CreateWindow( TEXT("Game Window"),
                             TEXT("Command and Conquer Generals"),
-                            windowStyle, 
+                            windowStyle,
 														(GetSystemMetrics( SM_CXSCREEN ) / 2) - (startWidth / 2), // original position X
 														(GetSystemMetrics( SM_CYSCREEN ) / 2) - (startHeight / 2),// original position Y
 														// Lorenzen nudged the window higher
-														// so the constantdebug report would 
+														// so the constantdebug report would
 														// not get obliterated by assert windows, thank you.
 														//(GetSystemMetrics( SM_CXSCREEN ) / 2) - (startWidth / 2),   //this works with any screen res
 														//(GetSystemMetrics( SM_CYSCREEN ) / 25) - (startHeight / 25),//this works with any screen res
 														rect.right-rect.left,
 														rect.bottom-rect.top,
-														0L, 
-														0L, 
-														hInstance, 
+														0L,
+														0L,
+														hInstance,
 														0L );
 
 
 	if (!runWindowed)
 	{	SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, 0, 0,SWP_NOSIZE |SWP_NOMOVE);
 	}
-	else 
+	else
 		SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0,SWP_NOSIZE |SWP_NOMOVE);
 
 	SetFocus(hWnd);
@@ -752,70 +764,37 @@ static Bool initializeAppWindows( HINSTANCE hInstance, Int nCmdShow, Bool runWin
 
 	return true;  // success
 
-}  // end initializeAppWindow
+}
 
-char *nextParam(char *newSource, const char *seps)
-{
-	static char *source = NULL;
-	if (newSource)
-	{
-		source = newSource;
-	}
-	if (!source)
-	{
-		return NULL;
-	}
+// Necessary to allow memory managers and such to have useful critical sections
+static CriticalSection critSec1, critSec2, critSec3, critSec4, critSec5;
 
-	// find first separator
-	char *first = source;//strpbrk(source, seps);
-	if (first)
+// UnHandledExceptionFilter ===================================================
+/** Handler for unhandled win32 exceptions. */
+//=============================================================================
+static LONG WINAPI UnHandledExceptionFilter( struct _EXCEPTION_POINTERS* e_info )
+{
+	DumpExceptionInfo( e_info->ExceptionRecord->ExceptionCode, e_info );
+#ifdef RTS_ENABLE_CRASHDUMP
+	if (TheMiniDumper && TheMiniDumper->IsInitialized())
 	{
-		// go past separator
-		char *firstSep = strpbrk(first, seps);
-		char firstChar[2] = {0,0};
-		if (firstSep == first)
-		{
-			firstChar[0] = *first;
-			while (*first == firstChar[0]) first++;
-		}
-
-		// find end
-		char *end;
-		if (firstChar[0])
-			end = strpbrk(first, firstChar);
-		else
-			end = strpbrk(first, seps);
-
-		// trim string & save next start pos
-		if (end)
-		{
-			source = end+1;
-			*end = 0;
-
-			if (!*source)
-				source = NULL;
-		}
-		else
-		{
-			source = NULL;
-		}
-
-		if (first && !*first)
-			first = NULL;
+		// Create both minimal and full memory dumps
+		TheMiniDumper->TriggerMiniDumpForException(e_info, DumpType_Minimal);
+		TheMiniDumper->TriggerMiniDumpForException(e_info, DumpType_Full);
 	}
 
-	return first;
+	MiniDumper::shutdownMiniDumper();
+#endif
+	return EXCEPTION_EXECUTE_HANDLER;
 }
 
-// Necessary to allow memory managers and such to have useful critical sections
-static CriticalSection critSec1, critSec2, critSec3, critSec4, critSec5;
-
 // WinMain ====================================================================
 /** Application entry point */
 //=============================================================================
 Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
                       LPSTR lpCmdLine, Int nCmdShow )
 {
+	Int exitcode = 1;
 
 #ifdef RTS_PROFILE
   Profile::StartRange("init");
@@ -823,78 +802,34 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 
 	try {
 
-		_set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
+		SetUnhandledExceptionFilter( UnHandledExceptionFilter );
 		//
-		// there is something about checkin in and out the .dsp and .dsw files 
-		// that blows the working directory information away on each of the 
+		// there is something about checkin in and out the .dsp and .dsw files
+		// that blows the working directory information away on each of the
 		// developers machines so we're going to hack it for a while and set our
 		// working directory to the directory with the .exe since that's not the
 		// default in a DevStudio project
 		//
 
+		TheAsciiStringCriticalSection = &critSec1;
 		TheUnicodeStringCriticalSection = &critSec2;
 		TheDmaCriticalSection = &critSec3;
 		TheMemoryPoolCriticalSection = &critSec4;
 		TheDebugLogCriticalSection = &critSec5;
 
+		// initialize the memory manager early
+		initMemoryManager();
+
 		/// @todo remove this force set of working directory later
 		Char buffer[ _MAX_PATH ];
 		GetModuleFileName( NULL, buffer, sizeof( buffer ) );
-		Char *pEnd = buffer + strlen( buffer );
-		while( pEnd != buffer ) 
+		if (Char *pEnd = strrchr(buffer, '\\'))
 		{
-			if( *pEnd == '\\' ) 
-			{
-				*pEnd = 0;
-				break;
-			}
-			pEnd--;
+			*pEnd = 0;
 		}
 		::SetCurrentDirectory(buffer);
 
 
-		/*
-		** Convert WinMain arguments to simple main argc and argv
-		*/
-		int argc = 1;
-		char * argv[20];
-		argv[0] = NULL;
-
-		Bool headless = false;
-
-		char *token;
-		token = nextParam(lpCmdLine, "\" ");
-		while (argc < 20 && token != NULL) {
-			argv[argc++] = strtrim(token);
-			
-			//added a preparse step for this flag because it affects window creation style
-			if (stricmp(token, "-win") == 0)
-				ApplicationIsWindowed = true;
-
-			// preparse for headless as well. We need to know about this before we create the window.
-			if (stricmp(token, "-headless") == 0)
-				headless = true;
-			
-			token = nextParam(NULL, "\" ");	   
-		}
-
-		if (argc>2 && strcmp(argv[1],"-DX")==0) {  
-			Int i;
-			DEBUG_LOG(("\n--- DX STACK DUMP\n"));
-			for (i=2; i<argc; i++) {
-				Int pc;
-				pc = 0;
-				sscanf(argv[i], "%x",  &pc);
-				char name[_MAX_PATH], file[_MAX_PATH];
-				unsigned int line;
-				unsigned int addr;
-				GetFunctionDetails((void*)pc, name, file, &line, &addr);
-				DEBUG_LOG(("0x%x - %s, %s, line %d address 0x%x\n", pc, name, file, line, addr));
-			}
-			DEBUG_LOG(("\n--- END OF DX STACK DUMP\n"));
-			return 0;
-		}
-
 		#ifdef RTS_DEBUG
 			// Turn on Memory heap tracking
 			int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG );
@@ -911,14 +846,14 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 
 
 // Force "splash image" to be loaded from a file, not a resource so same exe can be used in different localizations.
-#if defined RTS_DEBUG || defined RTS_INTERNAL || defined RTS_PROFILE
+#if defined(RTS_DEBUG) || defined RTS_PROFILE
 
 			// check both localized directory and root dir
 		char filePath[_MAX_PATH];
 		const char *fileName = "Install_Final.bmp";
 		static const char *localizedPathFormat = "Data/%s/";
 		sprintf(filePath,localizedPathFormat, GetRegistryLanguage().str());
-		strcat( filePath, fileName );
+		strlcat(filePath, fileName, ARRAY_SIZE(filePath));
 		FILE *fileImage = fopen(filePath, "r");
 		if (fileImage) {
 			fclose(fileImage);
@@ -928,15 +863,21 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 			gLoadScreenBitmap = (HBITMAP)LoadImage(hInstance, fileName, IMAGE_BITMAP, 0, 0, LR_SHARED|LR_LOADFROMFILE);
 		}
 #else
-		
+
 		// in release, the file only ever lives in the root dir
 		gLoadScreenBitmap = (HBITMAP)LoadImage(hInstance, "Install_Final.bmp", IMAGE_BITMAP, 0, 0, LR_SHARED|LR_LOADFROMFILE);
 #endif
 
+		CommandLine::parseCommandLineForStartup();
+#ifdef RTS_ENABLE_CRASHDUMP
+		// Initialize minidump facilities - requires TheGlobalData so performed after parseCommandLineForStartup
+		MiniDumper::initMiniDumper(TheGlobalData->getPath_UserData());
+#endif
+
 		// register windows class and create application window
-		if(!headless && initializeAppWindows(hInstance, nCmdShow, ApplicationIsWindowed) == false)
-			return 0;
-		
+		if(!TheGlobalData->m_headless && initializeAppWindows(hInstance, nCmdShow, TheGlobalData->m_windowed) == false)
+			return exitcode;
+
 		// save our application instance for future use
 		ApplicationHInstance = hInstance;
 
@@ -949,11 +890,8 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 		// BGC - initialize COM
 	//	OleInitialize(NULL);
 
-		// start the log
-		DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
-		initMemoryManager();
 
- 
+
 		// Set up version info
 		TheVersion = NEW Version;
 		TheVersion->setVersion(VERSION_MAJOR, VERSION_MINOR, VERSION_BUILDNUM, VERSION_LOCALBUILDNUM,
@@ -971,19 +909,18 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 				ShowWindow(ccwindow, SW_RESTORE);
 			}
 
-			DEBUG_LOG(("Generals is already running...Bail!\n"));
+			DEBUG_LOG(("Generals is already running...Bail!"));
 			delete TheVersion;
 			TheVersion = NULL;
 			shutdownMemoryManager();
-			DEBUG_SHUTDOWN();
-			return 0;
+			return exitcode;
 		}
-		DEBUG_LOG(("Create Generals Mutex okay.\n"));
+		DEBUG_LOG(("Create Generals Mutex okay."));
 
-		DEBUG_LOG(("CRC message is %d\n", GameMessage::MSG_LOGIC_CRC));
+		DEBUG_LOG(("CRC message is %d", GameMessage::MSG_LOGIC_CRC));
 
 		// run the game main loop
-		GameMain(argc, argv);
+		exitcode = GameMain();
 
 		delete TheVersion;
 		TheVersion = NULL;
@@ -991,29 +928,30 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	#ifdef MEMORYPOOL_DEBUG
 		TheMemoryPoolFactory->debugMemoryReport(REPORT_POOLINFO | REPORT_POOL_OVERFLOW | REPORT_SIMPLE_LEAKS, 0, 0);
 	#endif
-	#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+	#if defined(RTS_DEBUG)
 		TheMemoryPoolFactory->memoryPoolUsageReport("AAAMemStats");
 	#endif
 
-		// close the log
 		shutdownMemoryManager();
-		DEBUG_SHUTDOWN();
 
 		// BGC - shut down COM
 	//	OleUninitialize();
-	}	
-	catch (...) 
-	{ 
-	
 	}
+	catch (...)
+	{
 
+	}
+
+#ifdef RTS_ENABLE_CRASHDUMP
+	MiniDumper::shutdownMiniDumper();
+#endif
 	TheUnicodeStringCriticalSection = NULL;
 	TheDmaCriticalSection = NULL;
 	TheMemoryPoolCriticalSection = NULL;
 
-	return 0;
+	return exitcode;
 
-}  // end WinMain
+}
 
 // CreateGameEngine ===========================================================
 /** Create the Win32 game engine we're going to use */
@@ -1029,4 +967,4 @@ GameEngine *CreateGameEngine( void )
 
 	return engine;
 
-}  // end CreateGameEngine
+}
diff --git a/GeneralsMD/Code/Main/WinMain.h b/GeneralsMD/Code/Main/WinMain.h
index 76a704f345c..594964a79b8 100644
--- a/GeneralsMD/Code/Main/WinMain.h
+++ b/GeneralsMD/Code/Main/WinMain.h
@@ -30,8 +30,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __WINMAIN_H_
-#define __WINMAIN_H_
+#pragma once
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
@@ -43,6 +42,3 @@
 extern HINSTANCE ApplicationHInstance;  ///< our application instance
 extern HWND ApplicationHWnd;  ///< our application window handle
 extern Win32Mouse *TheWin32Mouse;  ///< global for win32 mouse only!
-
-#endif  // end __WINMAIN_H_
-
diff --git a/GeneralsMD/Code/Main/resource.h b/GeneralsMD/Code/Main/resource.h
index a4327a925ba..8349736bd95 100644
--- a/GeneralsMD/Code/Main/resource.h
+++ b/GeneralsMD/Code/Main/resource.h
@@ -24,7 +24,7 @@
 #define IDB_LOAD_SCREEN                 103
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        106
diff --git a/GeneralsMD/Code/Tools/GUIEdit/CMakeLists.txt b/GeneralsMD/Code/Tools/GUIEdit/CMakeLists.txt
index e401d8d335c..2b36b302134 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/CMakeLists.txt
+++ b/GeneralsMD/Code/Tools/GUIEdit/CMakeLists.txt
@@ -46,12 +46,10 @@ target_include_directories(z_guiedit PRIVATE
 )
 
 target_link_libraries(z_guiedit PRIVATE
-    benchmark
     comctl32
     core_debug
     core_profile
     d3d8lib
-    dbghelplib
     imm32
     stlport
     vfw32
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h b/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h
index 8214e593720..60a5473621e 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h
+++ b/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h
@@ -24,12 +24,12 @@
 
 // FILE: DialogProc.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __DIALOGPROC_H_
-#define __DIALOGPROC_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 
@@ -63,12 +60,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 // EXTERNALS //////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-extern LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message, 
+extern LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message,
 																						 WPARAM wParam, LPARAM lParam );
-extern BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message, 
+extern BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 																						 WPARAM wParam, LPARAM lParam );
-extern BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message, 
+extern BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 																							 WPARAM wParam, LPARAM lParam );
-
-#endif // __DIALOGPROC_H_
-
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h b/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h
index 307a14552a6..e021fdc3f0e 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h
+++ b/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h
@@ -24,12 +24,12 @@
 
 // FILE: EditWindow.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __EDITWINDOW_H_
-#define __EDITWINDOW_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
 #include <windows.h>
@@ -78,9 +75,9 @@ class EditWindow
 	EditWindow( void );
 	~EditWindow( void );
 
-	/// initialize the edit window singleton 
+	/// initialize the edit window singleton
 	void init( UnsignedInt clientWidth, UnsignedInt clientHeight );
-	void shutdown( void );  ///< free all data 
+	void shutdown( void );  ///< free all data
 	void draw( void );  ///< draw the edit window
 
 	void updatePulse( void );  ///< pulse message from timer
@@ -108,7 +105,7 @@ class EditWindow
 	// **************************************************************************
 
 	/// draw a line on the display in screen coordinates
-	void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	void drawLine( Int startX, Int startY, Int endX, Int endY,
 								 Real lineWidth, UnsignedInt lineColor );
 
 	/// draw a rect border on the display in pixel coordinates with the specified color
@@ -116,11 +113,11 @@ class EditWindow
 										 Real lineWidth, UnsignedInt lineColor );
 
 	/// draw a filled rect on the display in pixel coords with the specified color
-	void drawFillRect( Int startX, Int startY, Int width, Int height, 
+	void drawFillRect( Int startX, Int startY, Int width, Int height,
 										 UnsignedInt color );
 
 	/// draw an image fit within the screen coordinates
-	void drawImage( const Image *image, Int startX, Int startY, 
+	void drawImage( const Image *image, Int startX, Int startY,
 									Int endX, Int endY, Color color = 0xFFFFFFFF );
 
 	/// image clipping support
@@ -133,7 +130,7 @@ class EditWindow
 	void registerEditWindowClass( void );  ///< register class with OS
 
 	/// callback from windows, NOTE that it's static and has no this pointer
-	static LRESULT CALLBACK editProc( HWND hWnd, UINT message, 
+	static LRESULT CALLBACK editProc( HWND hWnd, UINT message,
 																		WPARAM wParam, LPARAM lParam );
 
 	void drawGrid( void );  ///< draw the grid
@@ -157,7 +154,7 @@ class EditWindow
 	static Bool m_classRegistered;  ///< TRUE when we've register with OS
 	static const char *m_className;  ///< name for windows class
 
-	ICoord2D m_size;  ///< width and height of edit window	
+	ICoord2D m_size;  ///< width and height of edit window
 	UnsignedByte m_bitDepth;  ///< bit depth for edit window
 	HWND m_editWindowHWnd;  ///< edit window handle
 
@@ -186,7 +183,7 @@ class EditWindow
 	IRegion2D m_clipRegion;		///< the clipping region for images
 	Bool m_isClippedEnabled;	///<used by 2D drawing operations to define clip re
 
-};  // end EditWindow
+};
 
 ///////////////////////////////////////////////////////////////////////////////
 // INLINING ///////////////////////////////////////////////////////////////////
@@ -203,6 +200,3 @@ inline ICoord2D EditWindow::getDragMoveOrigin( void ) { return m_dragMoveOrigin;
 // EXTERNALS //////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 extern EditWindow *TheEditWindow;  ///< edit window singleton extern
-
-#endif // __EDITWINDOW_H_
-
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h
index 1e91365de88..9ec56ecc7f5 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h
+++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h
@@ -29,12 +29,8 @@
 
 #pragma once
 
-#ifndef __GUIEDIT_H_
-#define __GUIEDIT_H_
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include <windows.h>
-#include <stdio.h>
 
 #include "GameClient/GameWindow.h"
 #include "GameClient/WindowLayout.h"
@@ -70,8 +66,6 @@ typedef enum
 	MODE_RESIZE_LEFT,								///< resize dragging left vertical
 	MODE_KEYBOARD_MOVE,							///< moving windows with the Keyboard
 
-	MODE_NUM_MODES									///< keep this last!
-
 } EditMode;
 
 //-------------------------------------------------------------------------------------------------
@@ -80,13 +74,13 @@ typedef enum
 typedef enum
 {
 
-	STATUS_MODE = 0, 
+	STATUS_MODE = 0,
 	STATUS_PART2,			/// change to meaningful name when decided what goes here
 	STATUS_PART3,			/// change to meaningful name when decided what goes here
 	STATUS_PART4,			/// change to meaningful name when decided what goes here
 	STATUS_MOUSE_COORDS,
 
-	STATUS_NUM_PARTS  ///< keep this last!
+	STATUS_NUM_PARTS
 
 } StatusPart;
 
@@ -103,8 +97,6 @@ typedef enum
 	CURSOR_SIZE_WE,
 	CURSOR_WAIT,
 
-	CURSOR_NUM_CURSORS  // keep last
-
 } CursorType;
 
 //-------------------------------------------------------------------------------------------------
@@ -164,7 +156,7 @@ class GUIEdit
 
 	void setUnsaved( Bool unsaved );  ///< set unsaved flag to FALSE or TRUE
 	Bool newLayout( void );  ///< reset editor for new layout
-	
+
 	// grid settings
 	void setGridResolution( Int res );
 	Int getGridResolution( void );
@@ -205,7 +197,7 @@ class GUIEdit
 	// resizing/moving help ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	void dragMoveSelectedWindows( ICoord2D *dragOrigin, ICoord2D *dragDest );  ///< move windows via drag move
 	/// given a position to move a window to, keep it onscreen and inside parent
-	void computeSafeLocation( GameWindow *window, Int x, Int y, 
+	void computeSafeLocation( GameWindow *window, Int x, Int y,
 														Int *safeX, Int *safeY );
 	/// given position and size to move a window to, keep it inside parent and on screen
 	void computeSafeSizeLocation( GameWindow *window,
@@ -216,7 +208,7 @@ class GUIEdit
 	/// compute new size of window using drag-resize logic
 	void computeResizeLocation( EditMode resizeMode,
 														  GameWindow *window,
-														  ICoord2D *resizeOrigin, 
+														  ICoord2D *resizeOrigin,
 														  ICoord2D *resizeDest,
 														  ICoord2D *resultLoc,
 														  ICoord2D *resultSize );
@@ -241,8 +233,8 @@ class GUIEdit
 																	 Int *x, Int *y, Int *width, Int *height );
 
 	GameWindow *newWindow( UnsignedInt windowStyle,
-												 GameWindow *parent, 
-												 Int x, Int y, 
+												 GameWindow *parent,
+												 Int x, Int y,
 												 Int width, Int height );
 	GameWindow *newUserWindow( GameWindow *parent,
 														 Int x, Int y,
@@ -254,31 +246,31 @@ class GUIEdit
 													 Int x, Int y,
 													 Int width, Int height );
 	GameWindow *newRadioButton( GameWindow *parent,
-														  Int x, Int y, 
+														  Int x, Int y,
 															Int width, Int height );
 	GameWindow *newTabControl( GameWindow *parent,
-														  Int x, Int y, 
+														  Int x, Int y,
 															Int width, Int height );
 	GameWindow *newHorizontalSlider( GameWindow *parent,
-																	 Int x, Int y, 
+																	 Int x, Int y,
 																	 Int width, Int height );
 	GameWindow *newVerticalSlider( GameWindow *parent,
-																 Int x, Int y, 
+																 Int x, Int y,
 																 Int width, Int height );
 	GameWindow *newProgressBar( GameWindow *parent,
-														  Int x, Int y, 
+														  Int x, Int y,
 															Int width, Int height );
 	GameWindow *newListbox( GameWindow *parent,
-													Int x, Int y, 
+													Int x, Int y,
 													Int width, Int height );
 	GameWindow *newTextEntry( GameWindow *parent,
-													  Int x, Int y, 
+													  Int x, Int y,
 														Int width, Int height );
 	GameWindow *newStaticText( GameWindow *parent,
-														 Int x, Int y, 
+														 Int x, Int y,
 														 Int width, Int height );
 	GameWindow *newComboBox( GameWindow *parent,
-														 Int x, Int y, 
+														 Int x, Int y,
 														 Int width, Int height );
 
 	// menu options ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -348,7 +340,7 @@ class GUIEdit
 	AsciiString m_layoutUpdateString;	 ///< layout update function name
 	AsciiString m_layoutShutdownString;///< layout shutdown function name
 
-};  // end GUIEdit
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////////////////////////
 inline HWND GUIEdit::getWindowHandle( void ) { return m_appHWnd; }
@@ -378,6 +370,3 @@ inline AsciiString GUIEdit::getLayoutShutdown( void ) { return m_layoutShutdownS
 
 // EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
 extern GUIEdit *TheEditor;  ///< editor application singleton
-
-#endif // __GUIEDIT_H_
-
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h
index 2908ce9a2d9..71fccd5568d 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h
+++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h
@@ -24,12 +24,12 @@
 
 // FILE: GUIEditColor.h ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GUIEDITCOLOR_H_
-#define __GUIEDITCOLOR_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -67,7 +64,7 @@ struct RGBColorInt
 	Int green;
 	Int blue;
 	Int alpha;
-};  // end RGBColorInt
+};
 
 // RGBColorReal ---------------------------------------------------------------
 /** Colors using 0.0 to 1.0 reals */
@@ -78,7 +75,7 @@ struct RGBColorReal
 	Real green;
 	Real blue;
 	Real alpha;
-};  // end RGBColorReal
+};
 
 // HSVColorReal ---------------------------------------------------------------
 /** Colors using hue, saturation, value using 0.0 to 1.0 reals */
@@ -89,13 +86,10 @@ struct HSVColorReal
   Real saturation;
   Real value;
 	Real alpha;
-};  // end HSVReal
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
 extern RGBColorInt *SelectColor( Int red, Int green, Int blue, Int alpha,
 																 Int mouseX = 0, Int mouseY = 0 );
-
-#endif // __GUIEDITCOLOR_H_
-
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h
index bcae0e79f21..e7741c4016c 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h
+++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h
@@ -24,12 +24,12 @@
 
 // FILE: GUIEditDisplay.h /////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __GUIEDITDISPLAY_H_
-#define __GUIEDITDISPLAY_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -72,9 +69,9 @@ class GUIEditDisplay : public Display
 	virtual void draw( void ) { };
 
 	/// draw a line on the display in pixel coordinates with the specified color
-	virtual void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
 												 Real lineWidth, UnsignedInt lineColor );
-	virtual void drawLine( Int startX, Int startY, Int endX, Int endY, 
+	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
 												 Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) { }
 	/// draw a rect border on the display in pixel coordinates with the specified color
 	virtual void drawOpenRect( Int startX, Int startY, Int width, Int height,
@@ -88,7 +85,7 @@ class GUIEditDisplay : public Display
 	virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) { }
 
 	/// draw an image fit within the screen coordinates
-	virtual void drawImage( const Image *image, Int startX, Int startY, 
+	virtual void drawImage( const Image *image, Int startX, Int startY,
 													Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA);
 	/// image clipping support
 	virtual void setClipRegion( IRegion2D *region );
@@ -101,14 +98,15 @@ class GUIEditDisplay : public Display
 	virtual VideoBuffer*	createVideoBuffer( void ) { return NULL; }
 
 	/// draw a video buffer fit within the screen coordinates
-	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY, 
+	virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) { }
+	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY,
 																Int endX, Int endY ) { }
 	virtual void takeScreenShot(void){ }
 	virtual void toggleMovieCapture(void) {}
 
 	// methods that we need to stub
 	virtual void setTimeOfDay( TimeOfDay tod ) {}
-	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius, Real attenuationWidth, 
+	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius, Real attenuationWidth,
 																 UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime ) {}
 	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) {}
 	void setBorderShroudLevel(UnsignedByte level){}
@@ -117,24 +115,22 @@ class GUIEditDisplay : public Display
 	virtual void preloadTextureAssets( AsciiString texture ) {}
 	virtual void toggleLetterBox(void) {}
 	virtual void enableLetterBox(Bool enable) {}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void dumpModelAssets(const char *path) {}
 #endif
 	virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) {}
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
+#if defined(RTS_DEBUG)
 	virtual void dumpAssetUsage(const char* mapname) {}
 #endif
 
 	virtual Real getAverageFPS(void) { return 0; }
+	virtual Real getCurrentFPS(void) { return 0; }
 	virtual Int getLastFrameDrawCalls( void ) { return 0; }
 
 protected:
 
-};  // end GUIEditDisplay
+};
 
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
-
-#endif // __GUIEDITDISPLAY_H_
-
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h
index dae7ea5e3e9..98e6f0f310e 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h
+++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h
@@ -34,9 +34,6 @@
 
 #pragma once
 
-#ifndef __GUIEDITWINDOWMANAGER_H_
-#define __GUIEDITWINDOWMANAGER_H_
-
 #include <stdlib.h>
 #include "W3DDevice/GameClient/W3DGameWindowManager.h"
 
@@ -88,7 +85,7 @@ class GUIEditWindowManager : public W3DGameWindowManager
 	Bool isWindowInClipboard( GameWindow *window, GameWindow **list );
 	void linkToClipboard( GameWindow *window, GameWindow **list );  ///< add window to clipboard
 	void unlinkFromClipboard( GameWindow *window, GameWindow **list );  ///< remove window from clipboard
-		
+
 	/** remove selected children from the select list that have a parent
 	also in the select list */
 	void removeSupervisedChildSelections( void );
@@ -114,6 +111,3 @@ inline GameWindow *GUIEditWindowManager::getClipboardDupeList( void ) { return m
 
 // EXTERN /////////////////////////////////////////////////////////////////////////////////////////
 extern GUIEditWindowManager *TheGUIEditWindowManager;  ///< editor use only
-
-#endif // __GUIEDITWINDOWMANAGER_H_
-
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h b/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h
index 7a427420a64..8b319ef4742 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h
+++ b/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h
@@ -24,12 +24,12 @@
 
 // FILE: HierarchyView.h //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __HIERARCHYVIEW_H_
-#define __HIERARCHYVIEW_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 #include <commctrl.h>
@@ -106,7 +103,7 @@ class HierarchyView
 	void getDialogPos( ICoord2D *pos );
 	void setDialogSize( ICoord2D *size );
 	void getDialogSize( ICoord2D *size );
-	
+
 	void setDragWindow( GameWindow *window );
 	void setDragTarget( GameWindow *window );
 	GameWindow *getDragWindow( void );
@@ -121,7 +118,7 @@ class HierarchyView
 
 	HTREEITEM treePointToItem( Int x, Int y );  ///< translate mouse pos to item location
 	GameWindow *getWindowFromItem( HTREEITEM treeItem );  ///< get game window from user data in the tree item
-	
+
 protected:
 
 	static LRESULT CALLBACK dialogProc( HWND hWndDialog, UINT message,
@@ -135,7 +132,7 @@ class HierarchyView
 
 	HWND m_dialog;  ///< window handle for our control dialog
 	HWND m_tree;  ///< window handle for the tree control
-	
+
 	GameWindow *m_dragWindow;  ///< for drag drop operations
 	GameWindow *m_dragTarget;  ///< target for drag and drop operations while mouse is moving
 	GameWindow *m_popupTarget;  ///< the target for right mouse popup menus
@@ -151,14 +148,14 @@ class HierarchyView
  			return hasher((UnsignedInt)p);
  		}
  	};
- 
+
  	typedef std::hash_map< ConstGameWindowPtr, HTREEITEM, hashConstGameWindowPtr, std::equal_to<ConstGameWindowPtr> > TreeHash;
- 
+
  	TreeHash 		m_treeHash;	///< Speed up the search with a nice hash.
 #endif
 
 
-};  // end HierarchyView
+};
 
 ///////////////////////////////////////////////////////////////////////////////
 // INLINING ///////////////////////////////////////////////////////////////////
@@ -174,6 +171,3 @@ inline GameWindow *HierarchyView::getPopupTarget( void ) { return m_popupTarget;
 
 // EXTERNALS //////////////////////////////////////////////////////////////////
 extern HierarchyView *TheHierarchyView;  ///< singleton for our view
-
-#endif // __CONTROLPALETTE_H_
-
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h b/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h
index 1a306fae848..747c588de07 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h
+++ b/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h
@@ -24,12 +24,12 @@
 
 // FILE: LayoutScheme.h ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __LAYOUTSCHEME_H_
-#define __LAYOUTSCHEME_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 
@@ -62,14 +59,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // LayoutScheme ---------------------------------------------------------------
-/** The layout scheme provides a place for default look of newly 
+/** The layout scheme provides a place for default look of newly
 	* created controls and windows */
 //-----------------------------------------------------------------------------
 class LayoutScheme
 {
 
 public:
-	
+
 	LayoutScheme();
 	~LayoutScheme();
 
@@ -121,13 +118,13 @@ class LayoutScheme
 
 	GameFont *m_font;  ///< default font
 
-};  // end LayoutScheme
+};
 
 ///////////////////////////////////////////////////////////////////////////////
 // INLINING ///////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 inline char *LayoutScheme::getSchemeFilename( void ) { return m_schemeFilename; }
-inline void LayoutScheme::setSchemeFilename( char *filename ) { strcpy( m_schemeFilename, filename ); }
+inline void LayoutScheme::setSchemeFilename( char *filename ) { strlcpy(m_schemeFilename, filename, ARRAY_SIZE(m_schemeFilename)); }
 inline Color LayoutScheme::getEnabledTextColor( void ) { return m_enabledText.color; }
 inline Color LayoutScheme::getEnabledTextBorderColor( void ) { return m_enabledText.borderColor; }
 inline Color LayoutScheme::getDisabledTextColor( void ) { return m_disabledText.color; }
@@ -147,6 +144,3 @@ inline GameFont *LayoutScheme::getFont( void ) { return m_font; }
 // EXTERNALS //////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 extern LayoutScheme *TheDefaultScheme;
-
-#endif // end __LAYOUTSCHEME_H_
-
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h b/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h
index 438c1204ab2..b584d35a442 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h
+++ b/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h
@@ -24,12 +24,12 @@
 
 // FILE: Properties.h /////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -46,9 +46,6 @@
 
 #pragma once
 
-#ifndef __PROPERTIES_H_
-#define __PROPERTIES_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -80,7 +77,7 @@ typedef enum
 {
 
 	IDENTIFIER_INVALID = 0,  // keep this 0 and keep it first
-	
+
 	FIRST_VALID_IDENTIFIER = 1,
 
 	BUTTON_ENABLED = FIRST_VALID_IDENTIFIER,
@@ -316,45 +313,45 @@ typedef enum
 	TEXT_ENTRY_HILITE_SMALL_CENTER,
 
 	TC_TAB_0_ENABLED,
-	TC_TAB_0_DISABLED,			
-	TC_TAB_0_HILITE,				
-	TC_TAB_1_ENABLED,				
-	TC_TAB_1_DISABLED,			
-	TC_TAB_1_HILITE,				
-	TC_TAB_2_ENABLED,				
-	TC_TAB_2_DISABLED,			
-	TC_TAB_2_HILITE,				
-	TC_TAB_3_ENABLED,				
-	TC_TAB_3_DISABLED,			
-	TC_TAB_3_HILITE,				
+	TC_TAB_0_DISABLED,
+	TC_TAB_0_HILITE,
+	TC_TAB_1_ENABLED,
+	TC_TAB_1_DISABLED,
+	TC_TAB_1_HILITE,
+	TC_TAB_2_ENABLED,
+	TC_TAB_2_DISABLED,
+	TC_TAB_2_HILITE,
+	TC_TAB_3_ENABLED,
+	TC_TAB_3_DISABLED,
+	TC_TAB_3_HILITE,
 	TC_TAB_4_ENABLED,
-	TC_TAB_4_DISABLED,			
-	TC_TAB_4_HILITE,				
-	TC_TAB_5_ENABLED,				
-	TC_TAB_5_DISABLED,			
-	TC_TAB_5_HILITE,				
-	TC_TAB_6_ENABLED,				
-	TC_TAB_6_DISABLED,			
-	TC_TAB_6_HILITE,				
-	TC_TAB_7_ENABLED,				
-	TC_TAB_7_DISABLED,			
-	TC_TAB_7_HILITE,				
-	TAB_CONTROL_ENABLED,		
-	TAB_CONTROL_DISABLED,		
-	TAB_CONTROL_HILITE,			
+	TC_TAB_4_DISABLED,
+	TC_TAB_4_HILITE,
+	TC_TAB_5_ENABLED,
+	TC_TAB_5_DISABLED,
+	TC_TAB_5_HILITE,
+	TC_TAB_6_ENABLED,
+	TC_TAB_6_DISABLED,
+	TC_TAB_6_HILITE,
+	TC_TAB_7_ENABLED,
+	TC_TAB_7_DISABLED,
+	TC_TAB_7_HILITE,
+	TAB_CONTROL_ENABLED,
+	TAB_CONTROL_DISABLED,
+	TAB_CONTROL_HILITE,
 
 	GENERIC_ENABLED,
 	GENERIC_DISABLED,
 	GENERIC_HILITE,
 
-	NUM_STATE_IDENTIFIERS  // keep this last
+	NUM_STATE_IDENTIFIERS
 
 } StateIdentifier;
 
 // ImageAndColorInfo ----------------------------------------------------------
-/** This is a place for us to store image and color information for	
+/** This is a place for us to store image and color information for
 	* all the various states for each of the controls, it makes it easier
-	* for us cause we can just put and get queries in this table and 
+	* for us cause we can just put and get queries in this table and
 	* work with only one set of dialog controls on all the property
 	* dialog windows */
 //-----------------------------------------------------------------------------
@@ -425,6 +422,3 @@ extern Color GetPropsDisabledTextColor( void );
 extern Color GetPropsDisabledTextBorderColor( void );
 extern Color GetPropsHiliteTextColor( void );
 extern Color GetPropsHiliteTextBorderColor( void );
-
-#endif // __PROPERTIES_H_
-
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h b/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h
index ff6d322f589..051704cdd57 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h
+++ b/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h
@@ -24,12 +24,12 @@
 
 // FILE: WinMain.h ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,9 +45,6 @@
 
 #pragma once
 
-#ifndef __WINMAIN_H_
-#define __WINMAIN_H_
-
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 
@@ -65,6 +62,3 @@
 extern HWND ApplicationHWnd;  ///< application main window handle
 extern HINSTANCE ApplicationHInstance;  ///< application main instance handle
 extern Win32Mouse *TheWin32Mouse;  ///< the mouse for win processing
-
-#endif // __WINMAIN_H_
-
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Resource/resource.h b/GeneralsMD/Code/Tools/GUIEdit/Resource/resource.h
index e280a8bdfc7..b1c220f0d51 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Resource/resource.h
+++ b/GeneralsMD/Code/Tools/GUIEdit/Resource/resource.h
@@ -212,7 +212,7 @@
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        155
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/CallbackEditor.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/CallbackEditor.cpp
index c179d718d13..7a1ef8e37ac 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/CallbackEditor.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/CallbackEditor.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: CallbackEditor.cpp ///////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -85,7 +85,7 @@ void SaveCallbacks( GameWindow *window, HWND dialog )
 
 	// get edit data for window
 	GameWindowEditData *editData = window->winGetEditData();
-	DEBUG_ASSERTCRASH( editData, ("No edit data for window saving callbacks!\n") );
+	DEBUG_ASSERTCRASH( editData, ("No edit data for window saving callbacks!") );
 
 	// get the currently selected item from each of the combos and save
 	Int index;
@@ -111,11 +111,11 @@ void SaveCallbacks( GameWindow *window, HWND dialog )
 	SendDlgItemMessage( dialog, COMBO_DRAW, CB_GETLBTEXT, index, (LPARAM)buffer );
 	editData->drawCallbackString = buffer;
 
-	// if there was a window we have a change 
+	// if there was a window we have a change
 	if( window )
 		TheEditor->setUnsaved( TRUE );
 
-}  // end SaveCallbacks
+}
 
 // setCurrentWindow ===========================================================
 /** Set the window passed in as the active window for editing */
@@ -147,12 +147,12 @@ static void setCurrentWindow( GameWindow *window, HWND dialog )
 	//
 	AsciiString name;
 
-	// system 
+	// system
 	if( editData )
 		name = editData->systemCallbackString;
 	if( name.isEmpty() )
 		name = GUIEDIT_NONE_STRING;
-	SendDlgItemMessage( dialog, COMBO_SYSTEM, 
+	SendDlgItemMessage( dialog, COMBO_SYSTEM,
 											CB_SELECTSTRING, -1, (LPARAM)name.str() );
 
 	// input
@@ -161,7 +161,7 @@ static void setCurrentWindow( GameWindow *window, HWND dialog )
 		name = editData->inputCallbackString;
 	if( name.isEmpty() )
 		name = GUIEDIT_NONE_STRING;
-	SendDlgItemMessage( dialog, COMBO_INPUT, 
+	SendDlgItemMessage( dialog, COMBO_INPUT,
 											CB_SELECTSTRING, -1, (LPARAM)name.str() );
 
 	// tooltip
@@ -170,7 +170,7 @@ static void setCurrentWindow( GameWindow *window, HWND dialog )
 		name = editData->tooltipCallbackString;
 	if( name.isEmpty() )
 		name = GUIEDIT_NONE_STRING;
-	SendDlgItemMessage( dialog, COMBO_TOOLTIP, 
+	SendDlgItemMessage( dialog, COMBO_TOOLTIP,
 											CB_SELECTSTRING, -1, (LPARAM)name.str() );
 
 	// draw
@@ -179,7 +179,7 @@ static void setCurrentWindow( GameWindow *window, HWND dialog )
 		name = editData->drawCallbackString;
 	if( name.isEmpty() )
 		name = GUIEDIT_NONE_STRING;
-	SendDlgItemMessage( dialog, COMBO_DRAW, 
+	SendDlgItemMessage( dialog, COMBO_DRAW,
 											CB_SELECTSTRING, -1, (LPARAM)name.str() );
 
 	//
@@ -196,10 +196,10 @@ static void setCurrentWindow( GameWindow *window, HWND dialog )
 		else
 			name = noNameWindowString;
 
-	}  // end if
+	}
 	SetWindowText( GetDlgItem( dialog, STATIC_WINDOW ), name.str() );
 
-}  // end setCurrentWindow
+}
 
 // loadUserWindows ============================================================
 /** Given the window list passed in, load the list box passed with the
@@ -209,7 +209,7 @@ static void loadUserWindows( HWND listbox, GameWindow *root )
 {
 
 	// end recursion
-	if( root == NULL )	
+	if( root == NULL )
 		return;
 
 	// is this a candidate
@@ -235,12 +235,12 @@ static void loadUserWindows( HWND listbox, GameWindow *root )
 		// check the children
 		loadUserWindows( listbox, root->winGetChild() );
 
-	}  // end if
+	}
 
 	// check the rest of the list
 	loadUserWindows( listbox, root->winGetNext() );
 
-}  // end loadUserWindows
+}
 
 //-------------------------------------------------------------------------------------------------
 /** save the layout callbacks */
@@ -265,7 +265,7 @@ static void saveLayoutCallbacks( HWND dialog )
 	SendDlgItemMessage( dialog, COMBO_SHUTDOWN, CB_GETLBTEXT, sel, (LPARAM)buffer );
 	TheEditor->setLayoutShutdown( AsciiString(buffer) );
 
-}  // end saveLayoutCallbacks
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -274,7 +274,7 @@ static void saveLayoutCallbacks( HWND dialog )
 // CallbackEditorDialogProc ===================================================
 /** Dialog procedure for grid settings dialog */
 //=============================================================================
-BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message, 
+BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 																				WPARAM wParam, LPARAM lParam )
 {
 
@@ -295,7 +295,7 @@ BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 			SendDlgItemMessage( hWndDialog, COMBO_DRAW, CB_SETCURSEL, 0, 0 );
 
 			// load the listbox with all the USER windows in the edit window
-			loadUserWindows( GetDlgItem( hWndDialog, LIST_WINDOWS ), 
+			loadUserWindows( GetDlgItem( hWndDialog, LIST_WINDOWS ),
 											 TheWindowManager->winGetWindowList() );
 
 			// no current window
@@ -303,7 +303,7 @@ BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 
 			return TRUE;
 
-		}  // end init dialog
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -318,7 +318,7 @@ BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 				// --------------------------------------------------------------------
 				case LIST_WINDOWS:
 				{
-		
+
 					switch( notifyCode )
 					{
 
@@ -332,9 +332,9 @@ BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 							selected = SendMessage( hWndControl, LB_GETCURSEL, 0, 0 );
 
 							// get the window of the selected listbox item
-							win = (GameWindow *)SendMessage( hWndControl, LB_GETITEMDATA,		
+							win = (GameWindow *)SendMessage( hWndControl, LB_GETITEMDATA,
 																							 selected, 0 );
-							
+
 
 							// sanity
 							DEBUG_ASSERTCRASH( win, ("NULL window set in listbox item data") );
@@ -344,16 +344,16 @@ BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 
 							// set the current window to the new selection
 							setCurrentWindow( win, hWndDialog );
-							
+
 							break;
 
-						}  // end case selection change
+						}
 
-					}  // end switch
+					}
 
 					break;
 
-				}  // end window listbox
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -371,20 +371,20 @@ BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message,
 
           break;
 
-				}  // end ok
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end CallbackEditorDialogProc
+}
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/CheckBoxProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/CheckBoxProperties.cpp
index 2b5388dd39f..d1751313cb6 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/CheckBoxProperties.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/CheckBoxProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: CheckBoxProperties.cpp ///////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -80,7 +80,7 @@ static LRESULT CALLBACK checkBoxPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -93,7 +93,7 @@ static LRESULT CALLBACK checkBoxPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -143,7 +143,7 @@ static LRESULT CALLBACK checkBoxPropertiesCallback( HWND hWndDialog,
 						GadgetCheckBoxSetDisabledCheckedBoxImage( window, info->image );
 						GadgetCheckBoxSetDisabledCheckedBoxColor( window, info->color );
 						GadgetCheckBoxSetDisabledCheckedBoxBorderColor( window, info->borderColor );
-						
+
 						// ----------------------------------------------------------------
 						info = GetStateInfo( CHECK_BOX_HILITE );
 						GadgetCheckBoxSetHiliteImage( window, info->image );
@@ -160,12 +160,12 @@ static LRESULT CALLBACK checkBoxPropertiesCallback( HWND hWndDialog,
 						GadgetCheckBoxSetHiliteCheckedBoxColor( window, info->color );
 						GadgetCheckBoxSetHiliteCheckedBoxBorderColor( window, info->borderColor );
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -174,13 +174,13 @@ static LRESULT CALLBACK checkBoxPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -189,15 +189,15 @@ static LRESULT CALLBACK checkBoxPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end checkBoxPropertiesCallback
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -284,7 +284,7 @@ HWND InitCheckBoxPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitCheckBoxPropertiesDialog
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ColorDialog.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ColorDialog.cpp
index a124394f28d..c60c72551df 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ColorDialog.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ColorDialog.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: ColorDialog.cpp //////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -100,7 +100,7 @@ HSVColorReal rgbToHSV( RGBColorReal rgbColor )
     max = green;
   if (blue > max)
     max = blue;
-  
+
   min = red;
   if (green < red)
     min = green;
@@ -111,7 +111,7 @@ HSVColorReal rgbToHSV( RGBColorReal rgbColor )
   value = max;
 
   // calculate saturation
-  if (max != 0) 
+  if (max != 0)
     saturation = (max - min) / max;
   else
     saturation = 0;  // saturation is 0 if all RGB are 0
@@ -119,7 +119,7 @@ HSVColorReal rgbToHSV( RGBColorReal rgbColor )
   // calculate hue
   if (saturation == 0)  {
     hue = 0;  // hue is really undefined
-  }  // end if
+  }
   else  {  // chromatic case, determine hue
     Real delta = max - min;
 
@@ -134,7 +134,7 @@ HSVColorReal rgbToHSV( RGBColorReal rgbColor )
     if (hue < 0)
       hue += 360;  // make sure hue is non negative
 
-  }  // end else, chromatic case, determine hue
+  }
 
   // set and return an HSVColor
   hsvColor.hue        = hue;
@@ -155,7 +155,7 @@ HSVColorReal rgbToHSV( RGBColorReal rgbColor )
 
   return hsvColor;
 
-}  // end rgbToHSV
+}
 
 // hsvToRGB ===================================================================
 // Converts the HSV colors passed in to RGB values
@@ -175,22 +175,22 @@ RGBColorReal hsvToRGB( HSVColorReal hsvColor )
   saturation = hsvColor.saturation;
   value = hsvColor.value;
 
-  if( saturation == 0.0f )  
-	{  
+  if( saturation == 0.0f )
+	{
 		// the colors is on the black and white center line
-    if( hue == 0.0f )  
+    if( hue == 0.0f )
 		{  // achromatic color ... there is no hue
       red = green = blue = value;
-    }  // end if, achromatic color .. there is no hue
-    else  
+    }
+    else
 		{
       DEBUG_LOG(( "HSVToRGB error, hue should be undefined" ));
-    }  // end else
+    }
 
-  }  // end if
+  }
   else
 	{
-	 
+
     if( hue == 360.0f )
       hue = 0.0f;
     hue = hue / 60.0f;  // h is now in [0, 6)
@@ -230,9 +230,9 @@ RGBColorReal hsvToRGB( HSVColorReal hsvColor )
         green = p;
         blue = q;
         break;
-    }  // end switch (i)
+    }
 
-  }  // end else, chromatic case
+  }
 
   // store and return and RGB color
   rgbColor.red   = red;
@@ -241,11 +241,11 @@ RGBColorReal hsvToRGB( HSVColorReal hsvColor )
   rgbColor.alpha = hsvColor.alpha;
 
   return rgbColor;
-      
-}  // end hsvToRGB
+
+}
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////
-BOOL CALLBACK SelectColorDlgProc( HWND hWnd, UINT uMsg, 
+BOOL CALLBACK SelectColorDlgProc( HWND hWnd, UINT uMsg,
                                   WPARAM wParam, LPARAM lParam );
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -253,15 +253,15 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWnd, UINT uMsg,
 ///////////////////////////////////////////////////////////////////////////////
 
 // SelectColor ================================================================
-/** Bring up the color selection requestor.  
+/** Bring up the color selection requestor.
 	*
 	* Returns:
 	* Pointer to selected color
-	* NULL for canceled request 
+	* NULL for canceled request
 	*/
 // ============================================================================
 RGBColorInt *SelectColor( Int red, Int green, Int blue, Int alpha,
-													Int mouseX, Int mouseY )  
+													Int mouseX, Int mouseY )
 {
 
   selectedColor.red = red;
@@ -272,18 +272,18 @@ RGBColorInt *SelectColor( Int red, Int green, Int blue, Int alpha,
 	displayPos.x = mouseX;
 	displayPos.y = mouseY;
 
-  if( DialogBox( TheEditor->getInstance(), (LPCTSTR)COLOR_SELECT_DIALOG, 
+  if( DialogBox( TheEditor->getInstance(), (LPCTSTR)COLOR_SELECT_DIALOG,
 								 TheEditor->getWindowHandle(), SelectColorDlgProc ) )
 		return &selectedColor;
   else
     return NULL;
 
-}  // end SelectColor
+}
 
 // SelectColorDlgProc =========================================================
 /** Dialog procedure for color selector dialog */
 // ============================================================================
-BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg, 
+BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
                                   WPARAM wParam, LPARAM lParam )
 {
   static HWND hWndScrollColor1;  // red / hue
@@ -294,11 +294,11 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
   static HWND hWndColorBar2;  // green / saturation
   static HWND hWndColorBar3;  // blue / value
   static HWND hWndPreview;
-              
+
   switch (uMsg)  {
 
     // ------------------------------------------------------------------------
-    case WM_INITDIALOG:  
+    case WM_INITDIALOG:
 		{
 
       // save some window handles for later comparing during processing
@@ -310,9 +310,9 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
       hWndColorBar2    = GetDlgItem( hWndDlg, BUTTON_COLORBAR2 );
       hWndColorBar3    = GetDlgItem( hWndDlg, BUTTON_COLORBAR3 );
       hWndPreview = GetDlgItem (hWndDlg, BUTTON_PREVIEW);
-			
+
       // init the scroll bars and labels to the current color
-			if (mode == MODE_HSV)  
+			if (mode == MODE_HSV)
 			{
 				RGBColorReal rgbColor;
 				HSVColorReal hsvColor;
@@ -333,20 +333,20 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
 
 				// set the scroll bars and labels
 				SetScrollPos (hWndScrollColor1, SB_CTL, (Int) hsvColor.hue, TRUE);
-				SetDlgItemInt (hWndDlg, LABEL_COLOR1,   
+				SetDlgItemInt (hWndDlg, LABEL_COLOR1,
 											 (Int) hsvColor.hue, FALSE);
 				SetScrollPos (hWndScrollColor2, SB_CTL, (Int) hsvColor.saturation, TRUE);
-				SetDlgItemInt (hWndDlg, LABEL_COLOR2,   
+				SetDlgItemInt (hWndDlg, LABEL_COLOR2,
 											 (Int) hsvColor.saturation, FALSE);
 				SetScrollPos (hWndScrollColor3, SB_CTL, (Int) hsvColor.value, TRUE);
-				SetDlgItemInt (hWndDlg, LABEL_COLOR3,   
+				SetDlgItemInt (hWndDlg, LABEL_COLOR3,
 											 (Int) hsvColor.value, FALSE);
 				SetScrollPos (hWndScrollAlpha, SB_CTL, (Int) hsvColor.alpha, TRUE);
-				SetDlgItemInt (hWndDlg, LABEL_ALPHA,   
+				SetDlgItemInt (hWndDlg, LABEL_ALPHA,
 											 (Int) hsvColor.alpha, FALSE);
 
-      }  // end if
-      else  
+      }
+      else
 			{
 
         // init the RGB and intensity scroll bar extents
@@ -355,19 +355,19 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
         SendMessage( hWndScrollColor3, SBM_SETRANGE, 1, 255 );
 				SendMessage( hWndScrollAlpha, SBM_SETRANGE, 0, 255 );
         SetScrollPos (hWndScrollColor1, SB_CTL, selectedColor.red, TRUE);
-        SetDlgItemInt (hWndDlg, LABEL_COLOR1,   
+        SetDlgItemInt (hWndDlg, LABEL_COLOR1,
                        selectedColor.red, FALSE);
         SetScrollPos (hWndScrollColor2, SB_CTL, selectedColor.green, TRUE);
-        SetDlgItemInt (hWndDlg, LABEL_COLOR2,   
+        SetDlgItemInt (hWndDlg, LABEL_COLOR2,
                        selectedColor.green, FALSE);
         SetScrollPos (hWndScrollColor3, SB_CTL, selectedColor.blue, TRUE);
-        SetDlgItemInt (hWndDlg, LABEL_COLOR3,   
+        SetDlgItemInt (hWndDlg, LABEL_COLOR3,
                        selectedColor.blue, FALSE);
         SetScrollPos (hWndScrollAlpha, SB_CTL, selectedColor.alpha, TRUE);
-        SetDlgItemInt (hWndDlg, LABEL_ALPHA,   
+        SetDlgItemInt (hWndDlg, LABEL_ALPHA,
                        selectedColor.alpha, FALSE);
 
-      }  // end else
+      }
 
 			//
 			// move the window to the display position, but keep the whole
@@ -377,12 +377,12 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
 
       return TRUE;
 
-    }  // end case WM_INITDIALOG
+    }
 
     // ------------------------------------------------------------------------
     case WM_DRAWITEM:  {
-      UINT idCtl = (UINT) wParam;             // control identifier 
-      LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT) lParam; // item drawing 
+      UINT idCtl = (UINT) wParam;             // control identifier
+      LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT) lParam; // item drawing
       HWND hWndControl;
       RECT rect;
       ICoord2D center;
@@ -393,31 +393,31 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
       GetClientRect (hWndControl, &rect);
       center.x = (rect.right - rect.left) / 2;
       center.y = (rect.bottom - rect.top) / 2;
-      
+
       // record radius we have to work with
       radius = (rect.right - rect.left) / 2;
 
       switch (idCtl)  {
-    
+
         case BUTTON_PREVIEW:  {
           RGBColorReal rgbColor;
           HSVColorReal hsvColor;
           HBRUSH hBrushOld, hBrushNew;
 
           if (mode == MODE_RGB)  {
-            rgbColor.red =   (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, 
+            rgbColor.red =   (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1,
                                                     NULL, FALSE);
-            rgbColor.green = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2, 
+            rgbColor.green = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2,
                                                     NULL, FALSE);
-            rgbColor.blue =  (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3, 
+            rgbColor.blue =  (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3,
                                                     NULL, FALSE);
-          }  // end if
+          }
           else  {
-            hsvColor.hue        = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, 
+            hsvColor.hue        = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1,
                                                          NULL, FALSE);
-            hsvColor.saturation = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2, 
+            hsvColor.saturation = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2,
                                                          NULL, FALSE);
-            hsvColor.value      = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3, 
+            hsvColor.value      = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3,
                                                          NULL, FALSE);
             // convert to ranges 0 - 1 for RGB conversion
             hsvColor.saturation /= 100.0f;
@@ -427,8 +427,8 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
             rgbColor.red   *= 255;
             rgbColor.green *= 255;
             rgbColor.blue  *= 255;
-          }  // end else
-     
+          }
+
           // create a new brush and select it into DC
           hBrushNew = CreateSolidBrush (RGB ((BYTE) rgbColor.red,
                                              (BYTE) rgbColor.green,
@@ -436,7 +436,7 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           hBrushOld = (HBRUSH)SelectObject( lpdis->hDC, hBrushNew );
 
           // draw the rectangle
-          Rectangle (lpdis->hDC, rect.left, rect.top, 
+          Rectangle (lpdis->hDC, rect.left, rect.top,
                      rect.right, rect.bottom);
 
           // put the old brush back and delete the new one
@@ -447,8 +447,8 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           ValidateRect (hWndControl, NULL);
 
           break;
-          
-        }  // end case BUTTON_PREVIEW
+
+        }
 
         // --------------------------------------------------------------------
         // Draw the bar of either HUE or RED next to the scroll bar
@@ -476,13 +476,13 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
             rgbColor.red   *= 255.0f;
             rgbColor.green *= 255.0f;
             rgbColor.blue  *= 255.0f;
-          }  // end if
+          }
           else  {
             rgbColor.red = 0;
             rgbColor.green = 0;
             rgbColor.blue = 0;
-          }  // end else
-          
+          }
+
           // loop through each horizontal line available in the bar drawing
           // the correct color there
           for (x = 0; x < (rect.right - rect.left) - 1;  x++)  {
@@ -500,16 +500,16 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
               rgbColor.red   *= 255;
               rgbColor.green *= 255;
               rgbColor.blue  *= 255;
-            }  // end if
+            }
             else  {
               rgbColor.red += step;
-            }  // end else
-            
-          }  // end for i
+            }
+
+          }
 
           break;
 
-        }  // end case BUTTON_COLORBAR1
+        }
 
         // --------------------------------------------------------------------
         // Draw the bar of either SATURATION or GREEN next to the scroll bar
@@ -530,7 +530,7 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           // compute the first color, create pen for it, and save the
           // original pen
           if (mode == MODE_HSV)  {
-            hsvColor.hue = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, 
+            hsvColor.hue = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1,
                                                   NULL, FALSE);
             hsvColor.saturation = 1.0f / 100.0f;
             hsvColor.value = 1;
@@ -538,13 +538,13 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
             rgbColor.red   *= 255;
             rgbColor.green *= 255;
             rgbColor.blue  *= 255;
-          }  // end if
+          }
           else  {
             rgbColor.red = 0;
             rgbColor.green = 0;
             rgbColor.blue = 0;
-          }  // end else
-          
+          }
+
           // loop through each horizontal line available in the bar drawing
           // the correct color there
           for (x = 0; x < (rect.right - rect.left) - 1;  x++)  {
@@ -562,16 +562,16 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
               rgbColor.red   *= 255;
               rgbColor.green *= 255;
               rgbColor.blue  *= 255;
-            }  // end if
+            }
             else  {
               rgbColor.green += step;
-            }  // end else
-            
-          }  // end for i
+            }
+
+          }
 
           break;
 
-        }  // end case BUTTON_COLORBAR2
+        }
 
         // --------------------------------------------------------------------
         // Draw the bar of either VALUE or BLUE next to the scroll bar
@@ -592,26 +592,26 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           // compute the first color, create pen for it, and save the
           // original pen
           if (mode == MODE_HSV)  {
-            hsvColor.hue = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, 
+            hsvColor.hue = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1,
                                                   NULL, FALSE);
-            hsvColor.saturation = 
+            hsvColor.saturation =
               (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2, NULL, FALSE) / 100.0f;
             hsvColor.value = 1.0f / 100.0f;
             rgbColor = hsvToRGB (hsvColor);
             rgbColor.red   *= 255.0f;
             rgbColor.green *= 255.0f;
             rgbColor.blue  *= 255.0f;
-          }  // end if
+          }
           else  {
             rgbColor.red = 0;
             rgbColor.green = 0;
             rgbColor.blue = 0;
-          }  // end else
-          
+          }
+
           // loop through each horizontal line available in the bar drawing
           // the correct color there
           for (x = 0; x < (rect.right - rect.left) - 1;  x++)  {
-            
+
             // draw a horizontal row of pixels with this color
             for (y = 0; y < rect.bottom; y++)
               SetPixel (lpdis->hDC, x, y, RGB ((BYTE) rgbColor.red,
@@ -625,31 +625,31 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
               rgbColor.red   *= 255;
               rgbColor.green *= 255;
               rgbColor.blue  *= 255;
-            }  // end if
+            }
             else  {
               rgbColor.blue += step;
-            }  // end else
-            
-          }  // end for i
+            }
+
+          }
 
           break;
 
-        }  // end case BUTTON_COLORBAR3
+        }
 
-      }  // end switch
+      }
 
       return TRUE;
 
-    }  // end case WM_DRAWITEM
+    }
 
     // ------------------------------------------------------------------------
     // horizontal scrolling on the color bars
     // ------------------------------------------------------------------------
-    case WM_HSCROLL:  
+    case WM_HSCROLL:
 		{
-      Int  nScrollCode = (Int) LOWORD (wParam);        // scroll bar value 
+      Int  nScrollCode = (Int) LOWORD (wParam);        // scroll bar value
       Short nPos  = (Short) HIWORD (wParam);   // for thumbtrack only
-      HWND hWndScroll = (HWND) lParam;                // handle of scroll bar 
+      HWND hWndScroll = (HWND) lParam;                // handle of scroll bar
       Int  labelID;         // identifier of the text label for this scroll bar
       Int  thumbPos;        // current thumb position
       Int  minPos, maxPos;  // max and min of this scrollbar
@@ -676,34 +676,34 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           if (thumbPos > minPos)
             thumbPos--;
           break;
-        }  // end case SB_LINELEFT
+        }
         case SB_PAGELEFT:  {
           if (thumbPos - 45 >= minPos)
             thumbPos -= 45;
           else
             thumbPos = minPos;
           break;
-        }  // end case SB_PAGELEFT
+        }
         case SB_LINERIGHT:  {
           if (thumbPos < maxPos)
             thumbPos++;
           break;
-        }  // end case SB_LINERIGHT
+        }
         case SB_PAGERIGHT:  {
           if (thumbPos + 45 < maxPos)
             thumbPos += 45;
           else
             thumbPos = maxPos;
           break;
-        }  // end case SB_PAGERIGHT
+        }
         case SB_THUMBTRACK:  {
           thumbPos = nPos;
           break;
-        }  // end case SB_THUBTRACK
+        }
         default:  {
           return 0;
-        }  // end default
-      }  // end switch nScrollCode
+        }
+      }
 
       // set the new scrollbar position and the text with it
       SendMessage (hWndScroll, SBM_SETPOS, (WPARAM) thumbPos, (LPARAM) TRUE);
@@ -714,31 +714,31 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
       if (hWndScroll == hWndScrollColor1 ||
           hWndScroll == hWndScrollColor2 ||
           hWndScroll == hWndScrollColor3 ||
-					hWndScroll == hWndScrollAlpha )  
+					hWndScroll == hWndScrollAlpha )
 			{
 
         RGBColorReal rgbColor;
         HSVColorReal hsvColor;
 
         if (mode == MODE_RGB)  {
-          rgbColor.red =   (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, 
+          rgbColor.red =   (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1,
                                                   NULL, FALSE);
-          rgbColor.green = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2, 
+          rgbColor.green = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2,
                                                   NULL, FALSE);
-          rgbColor.blue =  (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3, 
+          rgbColor.blue =  (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3,
                                                   NULL, FALSE);
-					rgbColor.alpha = (Real) GetDlgItemInt( hWndDlg, LABEL_ALPHA, 
+					rgbColor.alpha = (Real) GetDlgItemInt( hWndDlg, LABEL_ALPHA,
 																								  NULL, FALSE );
 
-        }  // end if
+        }
         else  {
-          hsvColor.hue        = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, 
+          hsvColor.hue        = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1,
                                                        NULL, FALSE);
-          hsvColor.saturation = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2, 
+          hsvColor.saturation = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2,
                                                        NULL, FALSE);
-          hsvColor.value      = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3, 
+          hsvColor.value      = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR3,
                                                        NULL, FALSE);
-					hsvColor.alpha			= (Real) GetDlgItemInt( hWndDlg, LABEL_ALPHA, 
+					hsvColor.alpha			= (Real) GetDlgItemInt( hWndDlg, LABEL_ALPHA,
 																											 NULL, FALSE );
 
           // convert to ranges 0 - 1 for RGB conversion
@@ -749,7 +749,7 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           rgbColor.red   *= 255;
           rgbColor.green *= 255;
           rgbColor.blue  *= 255;
-        }  // end else
+        }
 
         // store the color
         selectedColor.red   = (Int) rgbColor.red;
@@ -770,17 +770,17 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
         UpdateWindow (hWndColorBar2);
         UpdateWindow (hWndColorBar3);
 
-      }  // end if, color bar scroll message
-    
+      }
+
       return 0;
 
-    }  // end case WM_HSCROLL
+    }
 
     // ------------------------------------------------------------------------
     case WM_COMMAND:  {
-//      Int wNotifyCode = HIWORD(wParam); // notification code 
+//      Int wNotifyCode = HIWORD(wParam); // notification code
       Int wID = LOWORD(wParam);         // id of control
-//      HWND hWndControl = (HWND) lParam; // handle of control 
+//      HWND hWndControl = (HWND) lParam; // handle of control
 
       switch (wID)  {
 
@@ -791,8 +791,8 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
 
           EndDialog( hWndDlg, TRUE );  // color selected
           break;
-        
-        }  // end case IDOK
+
+        }
 
         // --------------------------------------------------------------------
         case IDCANCEL:  {
@@ -800,7 +800,7 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
           EndDialog( hWndDlg, FALSE );  // selection cancelled
           break;
 
-        }  // end case IDCANCEL
+        }
 
         // --------------------------------------------------------------------
         // Change from RGB mode to HSV mode and vice versa
@@ -844,10 +844,10 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
             mode = MODE_HSV;
 
             // change the text for the button
-            SetWindowText (GetDlgItem (hWndDlg, BUTTON_RGB_HSV), 
+            SetWindowText (GetDlgItem (hWndDlg, BUTTON_RGB_HSV),
                            "Switch to RGB");
 
-          }  // end if, switch to HSV
+          }
           else  {  // switch to RGB
             hsvColor.hue = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR1, NULL, FALSE);
             hsvColor.saturation = (Real) GetDlgItemInt (hWndDlg, LABEL_COLOR2, NULL, FALSE);
@@ -880,25 +880,25 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
             SetDlgItemInt (hWndDlg, LABEL_COLOR3, (Int) rgbColor.blue, FALSE);
 
             // change the text for the button
-            SetWindowText (GetDlgItem (hWndDlg, BUTTON_RGB_HSV), 
+            SetWindowText (GetDlgItem (hWndDlg, BUTTON_RGB_HSV),
                            "Switch to HSV");
 
             mode = MODE_RGB;
 
-          }  // end else, switch to RGB
+          }
 
           // invalidate all the vertical color bars so they are redrawn
           InvalidateRect (hWndColorBar1, NULL, TRUE);
           InvalidateRect (hWndColorBar2, NULL, TRUE);
           InvalidateRect (hWndColorBar3, NULL, TRUE);
 
-        }  // end case BUTTON_RGB_HSV
+        }
 
-      }  // end switch (LOWORD (wParam))
+      }
 
       return 0;
 
-    } // end case WM_COMMAND
+    }
 
     // ------------------------------------------------------------------------
     // Only hide the window on a close rather than destroy it since it will
@@ -911,6 +911,6 @@ BOOL CALLBACK SelectColorDlgProc( HWND hWndDlg, UINT uMsg,
     default:
       return 0;  // for all messages that are not processed
 
-  }  // end of switch (uMsg)
+  }
 
-}  // End of SelectColor
+}
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ComboBoxProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ComboBoxProperties.cpp
index f05588c7184..e15c2950e2a 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ComboBoxProperties.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ComboBoxProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: ComboBoxProperties.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -88,7 +88,7 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -101,7 +101,7 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -153,7 +153,7 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 					StoreColor( COMBOBOX_LISTBOX_DOWN_BUTTON_HILITE, info->color, info->borderColor );
 					StoreColor( COMBOBOX_LISTBOX_SLIDER_HILITE_TOP, info->color, info->borderColor );
 					StoreColor( COMBOBOX_LISTBOX_SLIDER_THUMB_HILITE, info->color, info->borderColor );
-					
+
 					info = GetStateInfo( COMBOBOX_HILITE_SELECTED_ITEM_LEFT );
 					StoreColor( COMBOBOX_DROP_DOWN_BUTTON_HILITE_PUSHED, info->color, info->borderColor );
 					StoreColor( COMBOBOX_EDIT_BOX_HILITE_LEFT, info->color, info->borderColor );
@@ -164,7 +164,7 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 
 					break;
 
-				}  // end case subcontrol color
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -405,7 +405,7 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 								GadgetButtonSetHiliteSelectedColor( upButton, info->color );
 								GadgetButtonSetHiliteSelectedBorderColor( upButton, info->borderColor );
 
-							}  // end if
+							}
 
 							// down button
 							GameWindow *downButton = GadgetListBoxGetDownButton( listBox );
@@ -445,7 +445,7 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 								GadgetButtonSetHiliteSelectedColor( downButton, info->color );
 								GadgetButtonSetHiliteSelectedBorderColor( downButton, info->borderColor );
 
-							}  // end if
+							}
 
 							// slider
 							GameWindow *slider = GadgetListBoxGetSlider( listBox );
@@ -532,15 +532,15 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 								GadgetSliderSetHiliteSelectedThumbColor( slider, info->color );
 								GadgetSliderSetHiliteSelectedThumbBorderColor( slider, info->borderColor );
 
-							}  // end if
-						} // end if (listBox)
+							}
+						}
 						// save specific list data
 						ComboBoxData *comboData = (ComboBoxData *)window->winGetUserData();
-						
+
 						GadgetComboBoxSetIsEditable(window, IsDlgButtonChecked( hWndDialog, CHECK_IS_EDITABLE ));
 						GadgetComboBoxSetAsciiOnly(window, IsDlgButtonChecked( hWndDialog, CHECK_ASCII_TEXT ));
 						GadgetComboBoxSetLettersAndNumbersOnly(window, IsDlgButtonChecked( hWndDialog, CHECK_LETTERS_AND_NUMBERS ));
-	
+
 						// change in the size of the comboBox
 						Int newMaxChars = GetDlgItemInt( hWndDialog, EDIT_MAX_CHARS, NULL, FALSE );
 						if( newMaxChars != comboData->maxChars)
@@ -551,12 +551,12 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
 							GadgetComboBoxSetMaxDisplay( window, newMaxDisplay );
 
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -565,13 +565,13 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -580,15 +580,15 @@ static LRESULT CALLBACK comboBoxPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end comboBoxPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -717,7 +717,7 @@ HWND InitComboBoxPropertiesDialog( GameWindow *window )
 		StoreImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 		image = GadgetListBoxGetHiliteSelectedItemImageSmallCenter( listBox );
 		StoreImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-		
+
 
 
 		// --------------------------------------------------------------------------
@@ -758,7 +758,7 @@ HWND InitComboBoxPropertiesDialog( GameWindow *window )
 			borderColor = GadgetButtonGetHiliteSelectedBorderColor( upButton );
 			StoreImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_HILITE_PUSHED, image, color, borderColor );
 
-		}  // end if
+		}
 
 		// --------------------------------------------------------------------------
 		GameWindow *downButton = GadgetListBoxGetDownButton( listBox );
@@ -798,7 +798,7 @@ HWND InitComboBoxPropertiesDialog( GameWindow *window )
 			borderColor = GadgetButtonGetHiliteSelectedBorderColor( downButton );
 			StoreImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_HILITE_PUSHED, image, color, borderColor );
 
-		}  // end if
+		}
 
 		GameWindow *slider = GadgetListBoxGetSlider( listBox );
 		if( slider )
@@ -882,8 +882,8 @@ HWND InitComboBoxPropertiesDialog( GameWindow *window )
 			borderColor = GadgetSliderGetHiliteSelectedThumbBorderColor( slider );
 			StoreImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_HILITE_PUSHED, image, color, borderColor );
 
-		}  // end if
-	
+		}
+
 		GameWindow *dropDownButton = GadgetComboBoxGetDropDownButton( window );
 		if ( dropDownButton )
 		{
@@ -977,7 +977,7 @@ HWND InitComboBoxPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitComboBoxPropertiesDialog
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp
index ab722ab0f72..fbd5fef5455 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/GenericProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: GenericProperties.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -48,7 +48,6 @@
 #include <assert.h>
 #include <windows.h>
 #include <commctrl.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
@@ -89,7 +88,7 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -99,8 +98,8 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 		// ------------------------------------------------------------------------
 		case WM_DRAWITEM:
 		{
-      UINT controlID = (UINT)wParam;  // control identifier 
-      LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; // item drawing 
+      UINT controlID = (UINT)wParam;  // control identifier
+      LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; // item drawing
 			RGBColorInt *color = GetControlColor( controlID );
 
 			// we only care about color button controls
@@ -136,11 +135,11 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 				// we have taken care of it
 				return TRUE;
 
-			}  // end if
+			}
 
 			return FALSE;
 
-		}  // end draw item
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -148,7 +147,7 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -167,9 +166,9 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 					{
 						RGBColorInt *newColor;
 						POINT mouse;
-						
+
 						GetCursorPos( &mouse );
-						newColor = SelectColor( currColor->red, currColor->green, 
+						newColor = SelectColor( currColor->red, currColor->green,
 																		currColor->blue, currColor->alpha,
 																		mouse.x, mouse.y );
 
@@ -182,13 +181,13 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 							SetControlColor( controlID, newGameColor );
 							InvalidateRect( hWndControl, NULL, TRUE );
 
-						}  // end if
+						}
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end color buttons
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -239,12 +238,12 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
 						color = GameMakeColor( rgbColor->red, rgbColor->green, rgbColor->blue, rgbColor->alpha );
 						window->winSetHiliteBorderColor( 0, color );
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -253,13 +252,13 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -268,15 +267,15 @@ static LRESULT CALLBACK genericPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end genericPropertiesCallback
+}
 
 // InitCallbackCombos =========================================================
 /** load the callbacks combo boxes with the functions that the user cal
@@ -300,7 +299,7 @@ void InitCallbackCombos( HWND dialog, GameWindow *window )
 	{
 		SendMessage( combo, CB_ADDSTRING, 0, (LPARAM)entry->name );
 		entry++;
-	}  // end while
+	}
 	SendMessage( combo, CB_INSERTSTRING, 0, (LPARAM)GUIEDIT_NONE_STRING );
 
 	// select the current function of the window in the combo if present
@@ -318,7 +317,7 @@ void InitCallbackCombos( HWND dialog, GameWindow *window )
 	{
 		SendMessage( combo, CB_ADDSTRING, 0, (LPARAM)entry->name );
 		entry++;
-	}  // end while
+	}
 	SendMessage( combo, CB_INSERTSTRING, 0, (LPARAM)GUIEDIT_NONE_STRING );
 
 	// select the current function of the window in the combo if present
@@ -336,7 +335,7 @@ void InitCallbackCombos( HWND dialog, GameWindow *window )
 	{
 		SendMessage( combo, CB_ADDSTRING, 0, (LPARAM)entry->name );
 		entry++;
-	}  // end while
+	}
 	SendMessage( combo, CB_INSERTSTRING, 0, (LPARAM)GUIEDIT_NONE_STRING );
 
 	// select the current function of the window in the combo if present
@@ -354,13 +353,13 @@ void InitCallbackCombos( HWND dialog, GameWindow *window )
 	{
 		SendMessage( combo, CB_ADDSTRING, 0, (LPARAM)entry->name );
 		entry++;
-	}  // end while
+	}
 	entry = TheFunctionLexicon->getTable( FunctionLexicon::TABLE_GAME_WIN_DEVICEDRAW );
 	while( entry && entry ->key != NAMEKEY_INVALID )
 	{
 		SendMessage( combo, CB_ADDSTRING, 0, (LPARAM)entry->name );
 		entry++;
-	}  // end while
+	}
 	SendMessage( combo, CB_INSERTSTRING, 0, (LPARAM)GUIEDIT_NONE_STRING );
 
 	// select the current function of the window in the combo if present
@@ -417,7 +416,7 @@ void InitCallbackCombos( HWND dialog, GameWindow *window )
 	name = TheEditor->getLayoutShutdown();
 	SendMessage( combo, CB_SELECTSTRING, -1, (LPARAM)name.str() );
 
-}  // end InitCallbackCombos
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -445,7 +444,7 @@ HWND InitUserWinPropertiesDialog( GameWindow *window )
 	// initialize the dialog with values from the window
 	//
 
-	// fill out the image combo boxes	
+	// fill out the image combo boxes
 	LoadImageListComboBox( GetDlgItem( dialog, COMBO_ENABLED_IMAGE ) );
 	LoadImageListComboBox( GetDlgItem( dialog, COMBO_DISABLED_IMAGE ) );
 	LoadImageListComboBox( GetDlgItem( dialog, COMBO_HILITE_IMAGE ) );
@@ -455,15 +454,15 @@ HWND InitUserWinPropertiesDialog( GameWindow *window )
 
 	image = window->winGetEnabledImage( 0 );
 	if( image )
-		SendDlgItemMessage( dialog, COMBO_ENABLED_IMAGE, CB_SELECTSTRING, 
+		SendDlgItemMessage( dialog, COMBO_ENABLED_IMAGE, CB_SELECTSTRING,
 												-1, (LPARAM)image->getName().str() );
 	image = window->winGetDisabledImage( 0 );
 	if( image )
-		SendDlgItemMessage( dialog, COMBO_DISABLED_IMAGE, CB_SELECTSTRING, 
+		SendDlgItemMessage( dialog, COMBO_DISABLED_IMAGE, CB_SELECTSTRING,
 												-1, (LPARAM)image->getName().str() );
 	image = window->winGetHiliteImage( 0 );
 	if( image )
-		SendDlgItemMessage( dialog, COMBO_HILITE_IMAGE, CB_SELECTSTRING, 
+		SendDlgItemMessage( dialog, COMBO_HILITE_IMAGE, CB_SELECTSTRING,
 												-1, (LPARAM)image->getName().str() );
 
 	// initialize the color buttons
@@ -479,7 +478,7 @@ HWND InitUserWinPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitUserWinPropertiesDialog
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/GridSettings.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/GridSettings.cpp
index 071bd0de3a0..e6bb26af6ce 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/GridSettings.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/GridSettings.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: GridSettings.cpp /////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -78,10 +78,10 @@ static void initGridSettings( HWND hWndDialog )
 {
 
 	// set resolution
-	SetDlgItemInt( hWndDialog, EDIT_RESOLUTION, 
+	SetDlgItemInt( hWndDialog, EDIT_RESOLUTION,
 								 TheEditor->getGridResolution(), FALSE );
 
-	// check box for on/off 
+	// check box for on/off
 	if( TheEditor->isGridVisible() == TRUE )
 		CheckDlgButton( hWndDialog, CHECK_VISIBLE, BST_CHECKED );
 
@@ -96,12 +96,12 @@ static void initGridSettings( HWND hWndDialog )
 	RGBColorInt *color = TheEditor->getGridColor();
 	gridColor = *color;
 
-}  // end initGridSettings
+}
 
 // GridSettingsDialogProc =====================================================
 /** Dialog procedure for grid settings dialog */
 //=============================================================================
-BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message, 
+BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 																			WPARAM wParam, LPARAM lParam )
 {
 
@@ -116,13 +116,13 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 			initGridSettings( hWndDialog );
 			return TRUE;
 
-		}  // end init dialog
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_DRAWITEM:
 		{
-      UINT controlID = (UINT)wParam;  // control identifier 
-      LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; // item drawing 
+      UINT controlID = (UINT)wParam;  // control identifier
+      LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; // item drawing
 			RGBColorInt *color = &gridColor;
 
 			// we only care about color button controls
@@ -158,11 +158,11 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 				// we have taken care of it
 				return TRUE;
 
-			}  // end if
+			}
 
 			return FALSE;
 
-		}  // end draw item
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -184,9 +184,9 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 					{
 						RGBColorInt *newColor;
 						POINT mouse;
-						
+
 						GetCursorPos( &mouse );
-						newColor = SelectColor( currColor->red, currColor->green, 
+						newColor = SelectColor( currColor->red, currColor->green,
 																		currColor->blue, currColor->alpha,
 																		mouse.x, mouse.y );
 
@@ -196,13 +196,13 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 							gridColor = *newColor;
 							InvalidateRect( hWndControl, NULL, TRUE );
 
-						}  // end if
+						}
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end color buttons
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -229,7 +229,7 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 
           break;
 
-				}  // end ok
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -238,13 +238,13 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 					EndDialog( hWndDialog, FALSE );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -253,13 +253,13 @@ BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message,
 			EndDialog( hWndDialog, FALSE );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end GridSettingsDialogProc
+}
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ListboxProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ListboxProperties.cpp
index 8230c16bb11..569de7ba74d 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ListboxProperties.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ListboxProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: ListboxProperties.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -135,7 +135,7 @@ static void addScrollbar( GameWindow *listbox )
 		info = TheDefaultScheme->getImageAndColor( LISTBOX_UP_BUTTON_HILITE_PUSHED );
 		GadgetButtonSetHiliteSelectedImage( upButton, info->image );
 
-	}  // end if
+	}
 
 	GameWindow *downButton = GadgetListBoxGetDownButton( listbox );
 	if( downButton )
@@ -156,7 +156,7 @@ static void addScrollbar( GameWindow *listbox )
 		info = TheDefaultScheme->getImageAndColor( LISTBOX_DOWN_BUTTON_HILITE_PUSHED );
 		GadgetButtonSetHiliteSelectedImage( downButton, info->image );
 
-	}  // end if
+	}
 
 	GameWindow *slider = GadgetListBoxGetSlider( listbox );
 	if( slider )
@@ -211,9 +211,9 @@ static void addScrollbar( GameWindow *listbox )
 		info = TheDefaultScheme->getImageAndColor( LISTBOX_SLIDER_THUMB_HILITE_PUSHED );
 		GadgetSliderSetHiliteSelectedThumbImage( slider, info->image );
 
-	}  // end if, slider
+	}
 
-}  // end addScrollbar
+}
 
 // removeScrollbar ============================================================
 /** Remove all scrollbar constructs froma listbox that has it already */
@@ -237,7 +237,7 @@ static void removeScrollbar( GameWindow *listbox )
 	// remove the scrollbar flag from the listbox data
 	listData->scrollBar = FALSE;
 
-}  // end removeScrollbar
+}
 
 // resizeMaxItems =============================================================
 /** Change the max items that a listbox can accomodate */
@@ -248,7 +248,7 @@ static void resizeMaxItems( GameWindow *listbox, UnsignedInt newMaxItems )
 
 
 
-}  // end resizeMaxItems
+}
 
 // listboxPropertiesCallback ==================================================
 /** Dialog callback for properties */
@@ -265,7 +265,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -278,7 +278,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -318,7 +318,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 					StoreColor( LISTBOX_DOWN_BUTTON_HILITE, info->color, info->borderColor );
 					StoreColor( LISTBOX_SLIDER_HILITE_TOP, info->color, info->borderColor );
 					StoreColor( LISTBOX_SLIDER_THUMB_HILITE, info->color, info->borderColor );
-					
+
 					info = GetStateInfo( LISTBOX_HILITE_SELECTED_ITEM_LEFT );
 					StoreColor( LISTBOX_UP_BUTTON_HILITE_PUSHED, info->color, info->borderColor );
 					StoreColor( LISTBOX_DOWN_BUTTON_HILITE_PUSHED, info->color, info->borderColor );
@@ -326,7 +326,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 
 					break;
 
-				}  // end case subcontrol color
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -432,7 +432,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 							GadgetButtonSetHiliteSelectedColor( upButton, info->color );
 							GadgetButtonSetHiliteSelectedBorderColor( upButton, info->borderColor );
 
-						}  // end if
+						}
 
 						// down button
 						GameWindow *downButton = GadgetListBoxGetDownButton( window );
@@ -472,7 +472,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 							GadgetButtonSetHiliteSelectedColor( downButton, info->color );
 							GadgetButtonSetHiliteSelectedBorderColor( downButton, info->borderColor );
 
-						}  // end if
+						}
 
 						// slider
 						GameWindow *slider = GadgetListBoxGetSlider( window );
@@ -559,7 +559,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 							GadgetSliderSetHiliteSelectedThumbColor( slider, info->color );
 							GadgetSliderSetHiliteSelectedThumbBorderColor( slider, info->borderColor );
 
-						}  // end if
+						}
 
 						// save specific list data
 						ListboxData *listData = (ListboxData *)window->winGetUserData();
@@ -597,7 +597,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 
 						// Multi-column
 						Int newColumns = GetDlgItemInt( hWndDialog, EDIT_NUM_COLUMNS,NULL,FALSE);
-						
+
 						if(newColumns > 1)
 						{
 							Char percentages[200];
@@ -607,13 +607,13 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 								MessageBox(NULL,"You have specified a column amount greater then 1, please enter the same about of percentages","whoops",MB_OK | MB_ICONSTOP | MB_APPLMODAL);
 								break;
 							}
-														
+
 							Int *newPercentages = new Int[newColumns];
 							Int i = 0;
 							Int total = 0;
 							Char *token = strtok( percentages, "," );
 							while( token != NULL )
-							{			
+							{
 								newPercentages[i] = atoi(token);
 								total += newPercentages[i];
 								token = strtok( NULL, "," );
@@ -642,17 +642,17 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
 									delete[] newPercentages;
 									return 0;
 								}
-							}						
+							}
 							listData->columnWidthPercentage = newPercentages;
 						}
 						listData->columns = newColumns;
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -661,13 +661,13 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -676,15 +676,15 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end listboxPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -804,7 +804,7 @@ HWND InitListboxPropertiesDialog( GameWindow *window )
 		borderColor = GadgetButtonGetHiliteSelectedBorderColor( upButton );
 		StoreImageAndColor( LISTBOX_UP_BUTTON_HILITE_PUSHED, image, color, borderColor );
 
-	}  // end if
+	}
 
 	// --------------------------------------------------------------------------
 	GameWindow *downButton = GadgetListBoxGetDownButton( window );
@@ -844,7 +844,7 @@ HWND InitListboxPropertiesDialog( GameWindow *window )
 		borderColor = GadgetButtonGetHiliteSelectedBorderColor( downButton );
 		StoreImageAndColor( LISTBOX_DOWN_BUTTON_HILITE_PUSHED, image, color, borderColor );
 
-	}  // end if
+	}
 
 	GameWindow *slider = GadgetListBoxGetSlider( window );
 	if( slider )
@@ -928,7 +928,7 @@ HWND InitListboxPropertiesDialog( GameWindow *window )
 		borderColor = GadgetSliderGetHiliteSelectedThumbBorderColor( slider );
 		StoreImageAndColor( LISTBOX_SLIDER_THUMB_HILITE_PUSHED, image, color, borderColor );
 
-	}  // end if
+	}
 
 	// init listbox specific property section
 	ListboxData *listData = (ListboxData *)window->winGetUserData();
@@ -948,8 +948,8 @@ HWND InitListboxPropertiesDialog( GameWindow *window )
 		sprintf(percentages,"%d",listData->columnWidthPercentage[0]);
 		for(Int i = 1; i < listData->columns; i++ )
 		{
-			strcat(percentages,",");
-			strcat(percentages,itoa(listData->columnWidthPercentage[i],tempStr,10));
+			strlcat(percentages, ",", ARRAY_SIZE(percentages));
+			strlcat(percentages, itoa(listData->columnWidthPercentage[i],tempStr,10), ARRAY_SIZE(percentages));
 		}
 		SetDlgItemText(dialog,EDIT_COLUMN_PERCENT,percentages);
 
@@ -968,7 +968,7 @@ HWND InitListboxPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitListboxPropertiesDialog
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/NewLayoutDialog.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/NewLayoutDialog.cpp
index e9fa39a6309..d325a3aa938 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/NewLayoutDialog.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/NewLayoutDialog.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: NewLayoutDialog.cpp //////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -77,13 +77,13 @@ static void initNewLayoutDialog( HWND hWndDialog )
 	// set default keyboard focus
 	SetFocus( GetDlgItem( hWndDialog, IDOK ) );
 
-}  // end initNewLayoutDialog
+}
 
 // NewLayoutDialogProc ========================================================
 /** Dialog procedure for the new layout dialog when starting an entire
 	* new layout in the editor */
 //=============================================================================
-LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message, 
+LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message,
 																			WPARAM wParam, LPARAM lParam )
 {
 
@@ -98,7 +98,7 @@ LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message,
 			initNewLayoutDialog( hWndDialog );
 			return FALSE;
 
-		}  // end init dialog
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -119,7 +119,7 @@ LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message,
 
           break;
 
-				}  // end ok
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -128,13 +128,13 @@ LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message,
 					EndDialog( hWndDialog, FALSE );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -143,13 +143,13 @@ LRESULT CALLBACK NewLayoutDialogProc( HWND hWndDialog, UINT message,
 			EndDialog( hWndDialog, FALSE );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end NewLayoutDialogProc
+}
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ProgressBarProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ProgressBarProperties.cpp
index 6119e5d31c5..32c8ae17323 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ProgressBarProperties.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ProgressBarProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: ProgressBarProperties.cpp ////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -80,7 +80,7 @@ static LRESULT CALLBACK progressBarPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -93,7 +93,7 @@ static LRESULT CALLBACK progressBarPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -181,12 +181,12 @@ static LRESULT CALLBACK progressBarPropertiesCallback( HWND hWndDialog,
 						info = GetStateInfo( PROGRESS_BAR_HILITE_BAR_SMALL_CENTER );
 						GadgetProgressBarSetHiliteBarImageSmallCenter( window, info->image );
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -195,13 +195,13 @@ static LRESULT CALLBACK progressBarPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -210,15 +210,15 @@ static LRESULT CALLBACK progressBarPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end progressBarPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -327,7 +327,7 @@ HWND InitProgressBarPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitProgressBarPropertiesDialog
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/PushButtonProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/PushButtonProperties.cpp
index d4d4b9c8d55..065b7822544 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/PushButtonProperties.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/PushButtonProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: PushButtonProperties.cpp /////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -80,7 +80,7 @@ static LRESULT CALLBACK pushButtonPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -93,7 +93,7 @@ static LRESULT CALLBACK pushButtonPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -151,12 +151,12 @@ static LRESULT CALLBACK pushButtonPropertiesCallback( HWND hWndDialog,
 						if( IsDlgButtonChecked( hWndDialog, CHECK_RIGHT_CLICK ) )
 							window->winSetStatus( bit );
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -165,13 +165,13 @@ static LRESULT CALLBACK pushButtonPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -180,15 +180,15 @@ static LRESULT CALLBACK pushButtonPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end pushButtonPropertiesCallback
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -260,7 +260,7 @@ HWND InitPushButtonPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitPushButtonPropertiesDialog
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp
index 5597f4797f1..524f483be84 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/RadioButtonProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: RadioButtonProperties.cpp ////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -45,7 +45,6 @@
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/NameKeyGenerator.h"
@@ -87,7 +86,7 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -100,7 +99,7 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -111,7 +110,7 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
 					SetDlgItemInt( hWndDialog, COMBO_GROUP, 0, FALSE );
 					break;
 
-				}  // end clear group
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -159,7 +158,7 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
 						GadgetRadioSetDisabledCheckedBoxImage( window, info->image );
 						GadgetRadioSetDisabledCheckedBoxColor( window, info->color );
 						GadgetRadioSetDisabledCheckedBoxBorderColor( window, info->borderColor );
-						
+
 						// ----------------------------------------------------------------
 						info = GetStateInfo( RADIO_HILITE );
 						GadgetRadioSetHiliteImage( window, info->image );
@@ -178,15 +177,15 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
 
 						// save group
 						Int group = GetDlgItemInt( hWndDialog, COMBO_GROUP, NULL, FALSE );
-						Int screen = TheNameKeyGenerator->nameToKey( AsciiString(TheEditor->getSaveFilename()) );
+						Int screen = TheNameKeyGenerator->nameToKey( TheEditor->getSaveFilename() );
 						GadgetRadioSetGroup( window, group, screen );
-																	
-					}  // end if
+
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -195,13 +194,13 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -210,15 +209,15 @@ static LRESULT CALLBACK radioButtonPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end radioButtonPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -252,7 +251,7 @@ static void loadExistingGroupsCombo( HWND combo, GameWindow *window )
 		if( SendMessage( combo, CB_FINDSTRINGEXACT, -1, (LPARAM)buffer ) == CB_ERR )
 			SendMessage( combo, CB_ADDSTRING, 0, (LPARAM)buffer );
 
-	}  // end if
+	}
 
 	// search our children
 	GameWindow *child;
@@ -261,8 +260,8 @@ static void loadExistingGroupsCombo( HWND combo, GameWindow *window )
 
 	// search the next in line
 	loadExistingGroupsCombo( combo, window->winGetNext() );
-	
-}  // end loadExistingGroupsCombo
+
+}
 
 // InitRadioButtonPropertiesDialog ============================================
 /** Bring up the radio button properties dialog */
@@ -355,7 +354,7 @@ HWND InitRadioButtonPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitRadioButtonPropertiesDialog
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/SliderProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/SliderProperties.cpp
index 82314f10a93..23ec57af6e8 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/SliderProperties.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/SliderProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: SliderProperties.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -81,7 +81,7 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -94,7 +94,7 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -127,7 +127,7 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 						StoreColor( VSLIDER_THUMB_HILITE, info->color, info->borderColor );
 						StoreColor( VSLIDER_THUMB_HILITE_PUSHED, info->borderColor, info->color );
 
-					}  // end if, vertical slider
+					}
 					else
 					{
 
@@ -143,11 +143,11 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 						StoreColor( HSLIDER_THUMB_HILITE, info->color, info->borderColor );
 						StoreColor( HSLIDER_THUMB_HILITE_PUSHED, info->borderColor, info->color );
 
-					}  // end else horizontal slider
+					}
 
 					break;
 
-				}  // end case subcontrol color
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -172,20 +172,20 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 							GadgetSliderSetEnabledImageTop( window, info->image );
 							GadgetSliderSetEnabledColor( window, info->color );
 							GadgetSliderSetEnabledBorderColor( window, info->borderColor );
-						
+
 							info = GetStateInfo( VSLIDER_ENABLED_BOTTOM );
 							GadgetSliderSetEnabledImageBottom( window, info->image );
-						}  // end if
+						}
 						else
 						{
 							info = GetStateInfo( HSLIDER_ENABLED_LEFT );
 							GadgetSliderSetEnabledImageLeft( window, info->image );
 							GadgetSliderSetEnabledColor( window, info->color );
 							GadgetSliderSetEnabledBorderColor( window, info->borderColor );
-							
+
 							info = GetStateInfo( HSLIDER_ENABLED_RIGHT );
 							GadgetSliderSetEnabledImageRight( window, info->image );
-						}  // end else
+						}
 
 						info = GetStateInfo( vert ? VSLIDER_ENABLED_CENTER : HSLIDER_ENABLED_CENTER );
 						GadgetSliderSetEnabledImageCenter( window, info->image );
@@ -200,20 +200,20 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 							GadgetSliderSetDisabledImageTop( window, info->image );
 							GadgetSliderSetDisabledColor( window, info->color );
 							GadgetSliderSetDisabledBorderColor( window, info->borderColor );
-						
+
 							info = GetStateInfo( VSLIDER_DISABLED_BOTTOM );
 							GadgetSliderSetDisabledImageBottom( window, info->image );
-						}  // end if
+						}
 						else
 						{
 							info = GetStateInfo( HSLIDER_DISABLED_LEFT );
 							GadgetSliderSetDisabledImageLeft( window, info->image );
 							GadgetSliderSetDisabledColor( window, info->color );
 							GadgetSliderSetDisabledBorderColor( window, info->borderColor );
-							
+
 							info = GetStateInfo( HSLIDER_DISABLED_RIGHT );
 							GadgetSliderSetDisabledImageRight( window, info->image );
-						}  // end else
+						}
 
 						info = GetStateInfo( vert ? VSLIDER_DISABLED_CENTER : HSLIDER_DISABLED_CENTER );
 						GadgetSliderSetDisabledImageCenter( window, info->image );
@@ -228,20 +228,20 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 							GadgetSliderSetHiliteImageTop( window, info->image );
 							GadgetSliderSetHiliteColor( window, info->color );
 							GadgetSliderSetHiliteBorderColor( window, info->borderColor );
-						
+
 							info = GetStateInfo( VSLIDER_HILITE_BOTTOM );
 							GadgetSliderSetHiliteImageBottom( window, info->image );
-						}  // end if
+						}
 						else
 						{
 							info = GetStateInfo( HSLIDER_HILITE_LEFT );
 							GadgetSliderSetHiliteImageLeft( window, info->image );
 							GadgetSliderSetHiliteColor( window, info->color );
 							GadgetSliderSetHiliteBorderColor( window, info->borderColor );
-							
+
 							info = GetStateInfo( HSLIDER_HILITE_RIGHT );
 							GadgetSliderSetHiliteImageRight( window, info->image );
-						}  // end else
+						}
 
 						info = GetStateInfo( vert ? VSLIDER_HILITE_CENTER : HSLIDER_HILITE_CENTER );
 						GadgetSliderSetHiliteImageCenter( window, info->image );
@@ -295,17 +295,17 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
 							sliderData->minVal = sliderData->maxVal;
 							sliderData->maxVal = temp;
 
-							MessageBox( NULL, "Slider min greated than max, the values were swapped", 
+							MessageBox( NULL, "Slider min greated than max, the values were swapped",
 													"Warning", MB_OK | MB_ICONINFORMATION );
 
-						}  // end if
+						}
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -314,13 +314,13 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -329,15 +329,15 @@ static LRESULT CALLBACK sliderPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end sliderPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -478,7 +478,7 @@ HWND InitSliderPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitSliderPropertiesDialog
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/StaticTextProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/StaticTextProperties.cpp
index 129e9f7bc43..2cf73abfe8e 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/StaticTextProperties.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/StaticTextProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: StaticTextProperties.cpp /////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -84,7 +84,7 @@ static LRESULT CALLBACK staticTextPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -97,7 +97,7 @@ static LRESULT CALLBACK staticTextPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -112,7 +112,7 @@ static LRESULT CALLBACK staticTextPropertiesCallback( HWND hWndDialog,
 						SetDlgItemText( hWndDialog, BUTTON_CENTERED, "No" );
 					break;
 
-				}  // end centered
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -150,13 +150,13 @@ static LRESULT CALLBACK staticTextPropertiesCallback( HWND hWndDialog,
 						// text data
 						TextData *textData = (TextData *)window->winGetUserData();
 						textData->centered = currCentered;
-						
-					}  // end if
+
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -165,13 +165,13 @@ static LRESULT CALLBACK staticTextPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -180,15 +180,15 @@ static LRESULT CALLBACK staticTextPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end staticTextPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -248,10 +248,10 @@ HWND InitStaticTextPropertiesDialog( GameWindow *window )
 
 	// select the button enabled state for display
 	SwitchToState( STATIC_TEXT_ENABLED, dialog );
-	
+
 	return dialog;
 
-}  // end InitStaticTextPropertiesDialog
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp
index f4dd666f825..d11224b79a9 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp	
@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -44,7 +44,6 @@
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/NameKeyGenerator.h"
@@ -105,7 +104,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -118,7 +117,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -182,7 +181,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 						GadgetTabControlSetEnabledBorderColorBackground( tabControl, info->borderColor );
 
 
-					
+
 						info = GetStateInfo( TC_TAB_0_DISABLED );
 						GadgetTabControlSetDisabledImageTabZero( tabControl, info->image );
 						GadgetTabControlSetDisabledColorTabZero( tabControl, info->color );
@@ -229,7 +228,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 						GadgetTabControlSetDisabledBorderColorBackground( tabControl, info->borderColor );
 
 
-						
+
 
 						info = GetStateInfo( TC_TAB_0_HILITE );
 						GadgetTabControlSetHiliteImageTabZero( tabControl, info->image );
@@ -276,7 +275,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 						GadgetTabControlSetHiliteColorBackground( tabControl, info->color );
 						GadgetTabControlSetHiliteBorderColorBackground( tabControl, info->borderColor );
 
-					
+
 						TabControlData *tabData = (TabControlData *)tabControl->winGetUserData();
 
 						tabData->tabWidth = GetDlgItemInt( hWndDialog, TAB_WIDTH, NULL, FALSE );
@@ -343,12 +342,12 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
 						GadgetTabControlShowSubPane( tabControl, tabData->activeTab );
 						GadgetTabControlUpdatePaneNames( tabControl );
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -357,13 +356,13 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -372,15 +371,15 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end tabControlPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -458,7 +457,7 @@ HWND InitTabControlPropertiesDialog( GameWindow *tabControl )
 	StoreImageAndColor( TAB_CONTROL_ENABLED, image, color, borderColor );
 
 
-	
+
 	image = GadgetTabControlGetDisabledImageTabZero( tabControl );
 	color = GadgetTabControlGetDisabledColorTabZero( tabControl );
 	borderColor = GadgetTabControlGetDisabledBorderColorTabZero( tabControl );
@@ -505,7 +504,7 @@ HWND InitTabControlPropertiesDialog( GameWindow *tabControl )
 	StoreImageAndColor( TAB_CONTROL_DISABLED, image, color, borderColor );
 
 
-	
+
 	image = GadgetTabControlGetHiliteImageTabZero( tabControl );
 	color = GadgetTabControlGetHiliteColorTabZero( tabControl );
 	borderColor = GadgetTabControlGetHiliteBorderColorTabZero( tabControl );
@@ -616,7 +615,7 @@ HWND InitTabControlPropertiesDialog( GameWindow *tabControl )
 
 	return dialog;
 
-}  // end InitTabControlPropertiesDialog
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TextEntryProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TextEntryProperties.cpp
index 4d436d34f97..3d9ef8bd4dd 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TextEntryProperties.cpp	
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TextEntryProperties.cpp	
@@ -24,12 +24,12 @@
 
 // FILE: TextEntryProperties.cpp //////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -80,7 +80,7 @@ static LRESULT CALLBACK textEntryPropertiesCallback( HWND hWndDialog,
 	// are designed to have controls doing the same functionality
 	// and names
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -93,7 +93,7 @@ static LRESULT CALLBACK textEntryPropertiesCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -160,28 +160,28 @@ static LRESULT CALLBACK textEntryPropertiesCallback( HWND hWndDialog,
 							entryData->alphaNumericalOnly = TRUE;
 							entryData->numericalOnly = FALSE;
 
-						}  // end if
+						}
 						else if( IsDlgButtonChecked( hWndDialog, RADIO_NUMBERS ) )
 						{
 
 							entryData->alphaNumericalOnly = FALSE;
 							entryData->numericalOnly = TRUE;
 
-						}  // end else if
+						}
 						else
 						{
 
 							entryData->alphaNumericalOnly = FALSE;
 							entryData->numericalOnly = FALSE;
 
-						}  // end else
+						}
 
-					}  // end if
+					}
 
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end OK
+				}
 
 				// --------------------------------------------------------------------
         case IDCANCEL:
@@ -190,13 +190,13 @@ static LRESULT CALLBACK textEntryPropertiesCallback( HWND hWndDialog,
           DestroyWindow( hWndDialog );
           break;
 
-				}  // end cancel
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
     case WM_CLOSE:
@@ -205,15 +205,15 @@ static LRESULT CALLBACK textEntryPropertiesCallback( HWND hWndDialog,
       DestroyWindow( hWndDialog );
       return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end textEntryPropertiesCallback
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -294,7 +294,7 @@ HWND InitTextEntryPropertiesDialog( GameWindow *window )
 		CheckDlgButton( dialog, RADIO_LETTERS_AND_NUMBERS, BST_CHECKED );
 	else
 		CheckDlgButton( dialog, RADIO_ANY_TEXT, BST_CHECKED );
-	
+
 	// select the button enabled state for display
 	SwitchToState( TEXT_ENTRY_ENABLED_LEFT, dialog );
 
@@ -304,7 +304,7 @@ HWND InitTextEntryPropertiesDialog( GameWindow *window )
 
 	return dialog;
 
-}  // end InitTextEntryPropertiesDialog
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp
index e2b56543374..d541e5d0006 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp
@@ -24,12 +24,12 @@
 
 // FILE: EditWindow.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -45,10 +45,10 @@
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
+#include "Common/FramePacer.h"
 #include "GameClient/Display.h"
 #include "GameClient/GameWindowManager.h"
 #include "W3DDevice/GameClient/W3DFileSystem.h"
@@ -87,10 +87,10 @@ EditWindow *TheEditWindow = NULL;  ///< edit window singleton
 // editProc ===================================================================
 /** Window procedure for the edit window */
 //=============================================================================
-LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message, 
+LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 																			 WPARAM wParam, LPARAM lParam )
 {
-	
+
 	switch( message )
 	{
 
@@ -101,15 +101,15 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 
 			if( TheEditWindow )
 			{
-			
+
 				if( timerID == TIMER_EDIT_WINDOW_PULSE )
 					TheEditWindow->updatePulse();
 
-			}  // end if
+			}
 
 			return 0;
 
-		}  // end timer
+		}
 
 		//-------------------------------------------------------------------------
 		case WM_MOUSEMOVE:
@@ -124,7 +124,7 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 			TheEditWindow->mouseEvent( message, wParam, lParam );
 			return 0;
 
-		}  // end mouse events
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_COMMAND:
@@ -168,11 +168,11 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 					// create new window at that location
 					switch( controlID )
 					{
-						
+
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_WINDOW:
-							TheEditor->newWindow( GWS_USER_WINDOW, 
-																		window, pos.x, pos.y, 
+							TheEditor->newWindow( GWS_USER_WINDOW,
+																		window, pos.x, pos.y,
 																		15 * TheEditor->getGridResolution(),
 																		15 * TheEditor->getGridResolution() );
 							break;
@@ -180,15 +180,15 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_PUSH_BUTTON:
 							TheEditor->newWindow( GWS_PUSH_BUTTON,
-																		window, pos.x, pos.y, 
-																		15 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		15 * TheEditor->getGridResolution(),
 																		3 * TheEditor->getGridResolution() );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_CHECK_BOX:
 							TheEditor->newWindow( GWS_CHECK_BOX,
-																		window, pos.x, pos.y, 
+																		window, pos.x, pos.y,
 																		15 * TheEditor->getGridResolution(),
 																		3 * TheEditor->getGridResolution() );
 							break;
@@ -196,72 +196,72 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_RADIO_BUTTON:
 							TheEditor->newWindow( GWS_RADIO_BUTTON,
-																		window, pos.x, pos.y, 
-																		15 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		15 * TheEditor->getGridResolution(),
 																		3 * TheEditor->getGridResolution() );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_TAB_CONTROL:
 							TheEditor->newWindow( GWS_TAB_CONTROL,
-																		window, pos.x, pos.y, 
-																		45 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		45 * TheEditor->getGridResolution(),
 																		30 * TheEditor->getGridResolution() );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_LISTBOX:
 							TheEditor->newWindow( GWS_SCROLL_LISTBOX,
-																		window, pos.x, pos.y, 
-																		20 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		20 * TheEditor->getGridResolution(),
 																		20 * TheEditor->getGridResolution() );
 							break;
-						
+
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_COMBO_BOX:
 							TheEditor->newWindow( GWS_COMBO_BOX,
-																		window, pos.x, pos.y, 
-																		15 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		15 * TheEditor->getGridResolution(),
 																		3 * TheEditor->getGridResolution() );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_HORIZONTAL_SLIDER:
 							TheEditor->newWindow( GWS_HORZ_SLIDER,
-																		window, pos.x, pos.y, 
-																		20 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		20 * TheEditor->getGridResolution(),
 																		GADGET_SIZE );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_VERTICAL_SLIDER:
 							TheEditor->newWindow( GWS_VERT_SLIDER,
-																		window, pos.x, pos.y, 
-																		GADGET_SIZE, 
+																		window, pos.x, pos.y,
+																		GADGET_SIZE,
 																		20 * TheEditor->getGridResolution() );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_PROGRESS_BAR:
 							TheEditor->newWindow( GWS_PROGRESS_BAR,
-																		window, pos.x, pos.y, 
-																		40 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		40 * TheEditor->getGridResolution(),
 																		GADGET_SIZE );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_TEXT_ENTRY:
 							TheEditor->newWindow( GWS_ENTRY_FIELD,
-																		window, pos.x, pos.y, 
-																		20 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		20 * TheEditor->getGridResolution(),
 																		25 );
 							break;
 
 						// ----------------------------------------------------------------
 						case POPUP_MENU_NEW_STATIC_TEXT:
 							TheEditor->newWindow( GWS_STATIC_TEXT,
-																		window, pos.x, pos.y, 
-																		15 * TheEditor->getGridResolution(), 
+																		window, pos.x, pos.y,
+																		15 * TheEditor->getGridResolution(),
 																		15 * TheEditor->getGridResolution() );
 							break;
 
@@ -281,31 +281,31 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message,
 								InitPropertiesDialog( window, pos.x, pos.y );
 							break;
 
-					}  // end switch
+					}
 
 					break;
 
-				}  // end new window
+				}
 
-			}  // end switch on control id
+			}
 
 			return 0;
 
-		}  // end command
+		}
 
 		// ------------------------------------------------------------------------
 		default:
 		{
-			
+
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch( message )
+	}
 
 	return DefWindowProc( hWnd, message, wParam, lParam );
 
-}  // end editProc
+}
 
 // EditWindow::registerEditWindowClass ========================================
 /** Register a class with the windows OS for an edit window */
@@ -316,7 +316,7 @@ void EditWindow::registerEditWindowClass( void )
 	ATOM atom;
 	HINSTANCE hInst = TheEditor->getInstance();
 
-	wcex.cbSize = sizeof( WNDCLASSEX ); 
+	wcex.cbSize = sizeof( WNDCLASSEX );
 
 	wcex.style					= CS_HREDRAW | CS_VREDRAW;
 	wcex.lpfnWndProc		= (WNDPROC)editProc;
@@ -331,12 +331,12 @@ void EditWindow::registerEditWindowClass( void )
 	wcex.hIconSm				= LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL);
 
 	atom = RegisterClassEx( &wcex );
-	
+
 	// if successfully registered we don't ever need to do this again
 	if( atom != 0 )
 		m_classRegistered = TRUE;
 
-}  // end registerEditWindowClass
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -391,7 +391,7 @@ EditWindow::EditWindow( void )
 	m_clipRegion.hi.y = 0;
 	m_isClippedEnabled = FALSE;
 
-}  // end EditWindow
+}
 
 // EditWindow::~EditWindow ====================================================
 /** */
@@ -402,7 +402,7 @@ EditWindow::~EditWindow( void )
 	// call the shutdown
 	shutdown();
 
-}  // end ~EditWindow
+}
 
 // EditWindow::init ===========================================================
 /** Initialize the edit window */
@@ -472,7 +472,7 @@ void EditWindow::init( UnsignedInt clientWidth, UnsignedInt clientHeight )
 		shutdown();
 		return;
 
-	}  // end if
+	}
 
 	// create asset manager
 	m_assetManager = new WW3DAssetManager;
@@ -485,7 +485,7 @@ void EditWindow::init( UnsignedInt clientWidth, UnsignedInt clientHeight )
 	// set a timer for updating visual pulse drawing
 	SetTimer( m_editWindowHWnd, TIMER_EDIT_WINDOW_PULSE, 5, NULL );
 
-}  // end init
+}
 
 // EditWindow::shutdown =======================================================
 /** Shutdown edit window */
@@ -500,6 +500,7 @@ void EditWindow::shutdown( void )
 	// delete asset manager
 	m_assetManager->Free_Assets();
 	delete m_assetManager;
+	m_assetManager = NULL;
 
 	// shutdown WW3D
 	WW3D::Shutdown();
@@ -518,7 +519,7 @@ void EditWindow::shutdown( void )
 	UnregisterClass( m_className, TheEditor->getInstance() );
 	m_classRegistered = FALSE;
 
-}  // EditWindowShutdown
+}
 
 // EditWindow::updatePulse ====================================================
 /** Update pulse from timer message */
@@ -536,15 +537,15 @@ void EditWindow::updatePulse( void )
 		m_pulse += stepSize;
 		if( m_pulse >= pulseMax )
 			dir = 0;
-	}  // end if
+	}
 	else
 	{
 		m_pulse -= stepSize;
 		if( m_pulse <= pulseMin )
 			dir = 1;
-	}  // end else
+	}
 
-}  // end updatePulse
+}
 
 // EditWindow::mouseEvent =====================================================
 /** A mouse event has occurred from our window procedure */
@@ -579,7 +580,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 		if( mousePrint.y > m_size.y )
 			mousePrint.y = m_size.y;
 
-		sprintf( buffer, "Mouse Location (X = %d, Y = %d)", 
+		sprintf( buffer, "Mouse Location (X = %d, Y = %d)",
 						 mousePrint.x, mousePrint.y );
 		TheEditor->statusMessage( STATUS_MOUSE_COORDS, buffer );
 
@@ -587,20 +588,20 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 		if( GetFocus() != TheEditor->getWindowHandle() )
 			SetFocus( TheEditor->getWindowHandle() );
 
-	}  // end if
+	}
 
 	//
-	// if we're in test mode just pump all input through to the 
+	// if we're in test mode just pump all input through to the
 	// window system so we can see how everything acts
 	//
 	if( TheEditor->getMode() == MODE_TEST_RUN )
 	{
 		if( TheWin32Mouse )
 			TheWin32Mouse->addWin32Event( windowsMessage, wParam, lParam, NO_TIME_FROM_WINDOWS);
-		
+
 		return;
 
-	}  // end if
+	}
 
 	//
 	// If we're in the keyboard move, ignore the mouse
@@ -619,7 +620,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 			//
 			// this is really stupid, but the tree controls just don't
 			// give enough hooks into all the events we need ... it's possible
-			// to be in drag and drop mode due to menus opening up and the 
+			// to be in drag and drop mode due to menus opening up and the
 			// user clicking on blank area etc.  So if the mouse is in the
 			// the edit window just make sure all our drag and drop stuff is
 			// clear in the hierarchy
@@ -634,7 +635,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				// update destination for drag move
 				m_dragMoveDest = mouse;
 
-			}  // end if
+			}
 			else if( m_dragSelecting )
 			{
 
@@ -642,14 +643,14 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				m_selectRegion.hi.x = x;
 				m_selectRegion.hi.y = y;
 
-			}  // end else if
+			}
 			else if( m_resizingWindow )
 			{
 
 					// save the position of our mouse for resizing
 					m_resizeDest = mouse;
 
-			}  // end else if
+			}
 			else
 			{
 
@@ -657,13 +658,13 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				// if we have ONE window selected and are close to an anchor corner
 				// to resize it change the cursor to resize cursor
 				//
-				TheEditWindow->handleResizeAvailable( x, y );
+				handleResizeAvailable( x, y );
 
-			}  // end else
+			}
 
 			break;
 
-		}  // end mouse move
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_LBUTTONDOWN:
@@ -682,7 +683,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 
 			//
 			// if we are in one of the resize modes then this click will
-			// resize the window selected 
+			// resize the window selected
 			//
 			if( TheEditor->getMode() == MODE_RESIZE_TOP_LEFT ||
 					TheEditor->getMode() == MODE_RESIZE_BOTTOM_RIGHT ||
@@ -703,7 +704,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				m_resizeOrigin = mouse;
 				m_resizeDest = mouse;
 
-			}  // end if
+			}
 			else
 			{
 				GameWindow *window = TheEditor->getWindowAtPos( x, y );
@@ -727,7 +728,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 						// select this window
 						TheEditor->selectWindow( window );
 
-					}  // end if
+					}
 					else
 					{
 
@@ -753,12 +754,12 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 							// change to drag move mode and switch cursor
 							TheEditor->setMode( MODE_DRAG_MOVE );
 
-						}  // end if
+						}
 
-					}  // end else
+					}
 
 
-				}  // end if
+				}
 				else
 				{
 
@@ -769,13 +770,13 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 					m_selectRegion.hi.x = x;
 					m_selectRegion.hi.y = y;
 
-				}  // end else
+				}
 
-			}  // end if
+			}
 
 			break;
 
-		}  // end left button down 
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_LBUTTONUP:
@@ -795,7 +796,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				// go back to normal mode
 				TheEditor->setMode( MODE_EDIT );
 
-			}  // end if
+			}
 			else if( m_dragSelecting )
 			{
 
@@ -805,7 +806,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				// stop a drag selection if in progress
 				m_dragSelecting = FALSE;
 
-			}  // end else
+			}
 			else if( m_resizingWindow )
 			{
 				GameWindow *window = TheEditor->getFirstSelected();
@@ -832,16 +833,16 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 					// resize the window
 					window->winSetSize( resultSize.x, resultSize.y );
 				}
-							
+
 				// go back to normal
 				m_resizingWindow = FALSE;
 				TheEditor->setMode( MODE_EDIT );
 
-			}  // end resizing window
+			}
 
 			break;
 
-		}  // end left button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MBUTTONDOWN:
@@ -849,7 +850,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 
 			break;
 
-		}  // end middle button down
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MBUTTONUP:
@@ -857,7 +858,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 
 			break;
 
-		}  // end middle button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_RBUTTONDOWN:
@@ -871,7 +872,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 
 			// get the window at the click pos
 			window = TheEditor->getWindowAtPos( clickPos.x, clickPos.y );
-					
+
 			//
 			// if there is a window here and it is not part of the selection
 			// list, everything else is unselected
@@ -885,21 +886,21 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 				// select this window
 				TheEditor->selectWindow( window );
 
-			}  // end if
+			}
 			else
 			{
 
 				// no window here, clear selections anyway
 				TheEditor->clearSelections();
 
-			}  // end else
-												
+			}
+
 			// open right click menu
-			TheEditWindow->openPopupMenu( clickPos.x, clickPos.y );
+			openPopupMenu( clickPos.x, clickPos.y );
 
 			break;
 
-		}  // end right button down
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_RBUTTONUP:
@@ -907,7 +908,7 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 
 			break;
 
-		}  // end right button up
+		}
 
 		// ------------------------------------------------------------------------
 		default:
@@ -915,11 +916,11 @@ void EditWindow::mouseEvent( UnsignedInt windowsMessage,
 
 			break;
 
-		}  // end default
+		}
 
-	}  // end switch on widnows message
+	}
 
-}  // end mouseEvent
+}
 
 // EditWindow::inCornerTolerance ==============================================
 /** If the 'dest' point is within 'tolerance' distance to the 'source'
@@ -948,10 +949,10 @@ Bool EditWindow::inCornerTolerance( ICoord2D *dest, ICoord2D *source,
 			dest->y >= region.lo.y &&
 			dest->y <= region.hi.y )
 		return TRUE;
-		
+
 	return FALSE;
-		
-}  // end inCornerTolerance
+
+}
 
 // EditWindow::inLineTolerance ================================================
 /** If the 'dest' point is within the region defined around the
@@ -964,7 +965,7 @@ Bool EditWindow::inLineTolerance( ICoord2D *dest,
 	IRegion2D region;
 
 	// sanity
-	if( dest == NULL || lineStart == NULL || lineEnd == NULL )	
+	if( dest == NULL || lineStart == NULL || lineEnd == NULL )
 		return FALSE;
 
 	// setup region
@@ -979,10 +980,10 @@ Bool EditWindow::inLineTolerance( ICoord2D *dest,
 			dest->y >= region.lo.y &&
 			dest->y <= region.hi.y )
 		return TRUE;
-		
+
 	return FALSE;
 
-}  // end inLineTolerance
+}
 
 // EditWindow::handleResizeAvailable ==========================================
 /** Given the mouse position, if it is close enough to a corner of a
@@ -995,7 +996,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 	GameWindow *window;
 	ICoord2D origin, size, mouse, point;
 	const Int tol = 5;
-		
+
 	// if there is zero or more than 1 window selected we can't resize
 	if( TheEditor->selectionCount() != 1 )
 		return;
@@ -1008,7 +1009,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 	window = TheEditor->getFirstSelected();
 	window->winGetScreenPosition( &origin.x, &origin.y );
 	window->winGetSize( &size.x, &size.y );
-		
+
 	// check for around top left corner
 	point = origin;
 	if( inCornerTolerance( &mouse, &point, tol ) == TRUE )
@@ -1017,7 +1018,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_TOP_LEFT );
 		return;
 
-	}  // end if
+	}
 
 	// check for around bottom right corner
 	point.x = origin.x + size.x;
@@ -1028,18 +1029,18 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_BOTTOM_RIGHT );
 		return;
 
-	}  // end if
+	}
 
 	// check for around top right corner
 	point.x = origin.x + size.x;
 	point.y = origin.y;
 	if( inCornerTolerance( &mouse, &point, tol ) == TRUE )
 	{
-		
+
 		TheEditor->setMode( MODE_RESIZE_TOP_RIGHT );
 		return;
 
-	}  // end if
+	}
 
 	// check for around bottom left corner
 	point.x = origin.x;
@@ -1050,7 +1051,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_BOTTOM_LEFT );
 		return;
 
-	}  // end if
+	}
 
 	ICoord2D lineStart, lineEnd;
 
@@ -1064,7 +1065,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_TOP );
 		return;
 
-	}  // end if
+	}
 
 	// check for along bottom edge
 	lineStart.x = origin.x;
@@ -1077,7 +1078,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_BOTTOM );
 		return;
 
-	}  // end if
+	}
 
 	// check for along left edge
 	lineStart = origin;
@@ -1089,7 +1090,7 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_LEFT );
 		return;
 
-	}  // end if
+	}
 
 	// check for along right edge
 	lineStart.x = origin.x + size.x;
@@ -1102,12 +1103,12 @@ void EditWindow::handleResizeAvailable( Int mouseX, Int mouseY )
 		TheEditor->setMode( MODE_RESIZE_RIGHT );
 		return;
 
-	}  // end if
+	}
 
 	// we are not resizing anything at all, set us to normal mode
 	TheEditor->setMode( MODE_EDIT );
 
-}  // end handleResizeAvailable
+}
 
 // EditWindow::drawSeeThruOutlines ============================================
 /** Draw an outline for a window that is see thru so we can still work
@@ -1133,7 +1134,7 @@ void EditWindow::drawSeeThruOutlines( GameWindow *windowList, Color c )
 		// draw a box on the window
 		drawOpenRect( pos.x, pos.y, size.x, size.y, 1, c );
 
-	}  // end if
+	}
 
 	// check window children
 	GameWindow *child;
@@ -1143,7 +1144,7 @@ void EditWindow::drawSeeThruOutlines( GameWindow *windowList, Color c )
 	// go to siblings
 	drawSeeThruOutlines( windowList->winGetNext(), c );
 
-}  // end drawSeeThruOutlines
+}
 
 // EditWindow::drawHiddenOutlines =============================================
 /** Draw an outline for a window that is hidden so we can still work
@@ -1169,7 +1170,7 @@ void EditWindow::drawHiddenOutlines( GameWindow *windowList, Color c )
 			hidden = TRUE;
 		parent = parent->winGetParent();
 
-	}  // end while
+	}
 	if( BitIsSet( windowList->winGetStatus(), WIN_STATUS_HIDDEN ) )
 		hidden = TRUE;
 	if( hidden )
@@ -1184,7 +1185,7 @@ void EditWindow::drawHiddenOutlines( GameWindow *windowList, Color c )
 		// draw a box on the window
 		drawOpenRect( pos.x, pos.y, size.x, size.y, 2, c );
 
-	}  // end if
+	}
 
 	// check window children
 	GameWindow *child;
@@ -1194,7 +1195,7 @@ void EditWindow::drawHiddenOutlines( GameWindow *windowList, Color c )
 	// go to siblings
 	drawHiddenOutlines( windowList->winGetNext(), c );
 
-}  // end drawHiddenOutlines
+}
 
 // EditWindow::drawUIback =====================================================
 /** Draw any visual feedback to the user about selection boxes or windows
@@ -1234,7 +1235,7 @@ void EditWindow::drawUIFeedback( void )
 		drawOpenRect( m_selectRegion.lo.x, m_selectRegion.lo.y,
 		              width, height, selectBoxWidth, selectBoxColor );
 
-	}  // end if
+	}
 
 	// draw select lines on selected windows
 	select = TheEditor->getSelectList();
@@ -1244,7 +1245,7 @@ void EditWindow::drawUIFeedback( void )
 		GameWindow *window;
 		Real windowSelectWidth = 2.0f;
 		Color windowSelectColor;
-		
+
 		windowSelectColor = GameMakeColor( 0, color, 0, 255 );
 
 		// get window properties
@@ -1253,13 +1254,13 @@ void EditWindow::drawUIFeedback( void )
 		window->winGetSize( &size.x, &size.y );
 
 		// draw a box on the window
-		drawOpenRect( origin.x, origin.y, size.x, size.y, 
-									windowSelectWidth, windowSelectColor );		
+		drawOpenRect( origin.x, origin.y, size.x, size.y,
+									windowSelectWidth, windowSelectColor );
 
 		// go to next selection
 		select = select->next;
 
-	}  // end while
+	}
 
 	//
 	// if we're drag moving, draw outlines of all the windows in the
@@ -1290,7 +1291,7 @@ void EditWindow::drawUIFeedback( void )
  			ICoord2D change;
  			change.x = (m_dragMoveDest.x - m_dragMoveOrigin.x);
  			change.y = (m_dragMoveDest.y - m_dragMoveOrigin.y);
- 
+
  		// [SKB: Jun 02 2003 @ 2:7pm] :
  		// Don't move the object unless we have moved the mouse,
  		// this is to avoid the irritating movement of a window when just
@@ -1306,7 +1307,7 @@ void EditWindow::drawUIFeedback( void )
 
 
 				// keep location legal
- 				TheEditor->computeSafeLocation( window, moveLoc.x, moveLoc.y, 
+ 				TheEditor->computeSafeLocation( window, moveLoc.x, moveLoc.y,
 																				&safeLoc.x, &safeLoc.y );
 
 				// adjust location by parent location if present
@@ -1319,19 +1320,19 @@ void EditWindow::drawUIFeedback( void )
 					safeLoc.x += parentOrigin.x;
 					safeLoc.y += parentOrigin.y;
 
-				}  // end if
+				}
 
 				// draw outline of window at what would be the drag move destination
-				drawOpenRect( safeLoc.x, safeLoc.y, size.x, size.y, 
+				drawOpenRect( safeLoc.x, safeLoc.y, size.x, size.y,
 											outlineWidth, outlineColor );
 			}
 
 			// go to next selection
 			select = select->next;
 
-		}  // end while
+		}
 
-	}  // end if
+	}
 
 	// if resizing a window draw that resize representation
 	if( m_resizingWindow )
@@ -1367,13 +1368,13 @@ void EditWindow::drawUIFeedback( void )
 			loc.x += parentOrigin.x;
 			loc.y += parentOrigin.y;
 
-		}  // end if
+		}
 
 		// draw a box for the window at its new location
 		outlineColor = GameMakeColor( m_pulse, m_pulse, m_pulse, 255 );
 		drawOpenRect( loc.x, loc.y, size.x, size.y, outlineWidth, outlineColor );
 
-	}  // end if
+	}
 
 	// draw lines around any drag source and drag targets in the hierarchy view
 	GameWindow *dragSource = TheHierarchyView->getDragWindow();
@@ -1389,14 +1390,14 @@ void EditWindow::drawUIFeedback( void )
 		// draw box
 		drawOpenRect( origin.x, origin.y, size.x, size.y, 2, dragColor );
 
-	}  // end if
+	}
 
 	// drag target
 	GameWindow *dragTarget = TheHierarchyView->getDragTarget();
 	if( dragTarget )
 	{
 		ICoord2D origin, size;
-		
+
 		// get size and position
 		dragTarget->winGetScreenPosition( &origin.x, &origin.y );
 		dragTarget->winGetSize( &size.x, &size.y );
@@ -1404,9 +1405,9 @@ void EditWindow::drawUIFeedback( void )
 		// draw box
 		drawOpenRect( origin.x, origin.y, size.x, size.y, 2, dragColor );
 
-	}  // end if
+	}
 
-}  // end drawUIFeedback
+}
 
 // EditWindow::drawGrid =======================================================
 /** Draw the grid */
@@ -1417,7 +1418,7 @@ void EditWindow::drawGrid( void )
 	Int res = TheEditor->getGridResolution();
 	Int x, y;
 	RGBColorInt *gridColor = TheEditor->getGridColor();
-	Color color = GameMakeColor( gridColor->red, gridColor->green,	
+	Color color = GameMakeColor( gridColor->red, gridColor->green,
 															 gridColor->blue, gridColor->alpha );
 
 	// set us to invert where we draw
@@ -1431,7 +1432,7 @@ void EditWindow::drawGrid( void )
 //		MoveToEx( hdc, 0, y, NULL );
 //		LineTo( hdc, m_size.x, y );
 
-	} 
+	}
 
 	for( x = 0; x < m_size.x; x += res )
 	{
@@ -1440,7 +1441,7 @@ void EditWindow::drawGrid( void )
 //		MoveToEx( hdc, x, 0, NULL );
 //		LineTo( hdc, x, m_size.y );
 
-	} 
+	}
 
 /*
 	for( y = 0; y < m_size.y; y += res )
@@ -1454,32 +1455,28 @@ void EditWindow::drawGrid( void )
 
 //				TheDisplay->drawLine( x, y, x + 1, y + 1, 1, 0xFFFFFFFF );
 
-		}  // end for x
+		}
 
-	}  // end for y
+	}
 */
 
 	// release the dc
 //	ReleaseDC( getWindowHandle(), hdc );
 
-}  // end drawGrid
+}
 
 // EditWindow::draw ===========================================================
 /** Draw the edit window */
 //=============================================================================
 void EditWindow::draw( void )
 {
-	static UnsignedInt syncTime = 0;
-
 	// allow W3D to update its internals
-	WW3D::Sync( syncTime );
-
-	// for now, use constant time steps to avoid animations running independent of framerate
-	syncTime += 50;
+	WW3D::Update_Logic_Frame_Time(TheFramePacer->getLogicTimeStepMilliseconds());
+	WW3D::Sync(WW3D::Get_Fractional_Sync_Milliseconds() >= WWSyncMilliseconds);
 
 	// start render block
-	WW3D::Begin_Render( true, true, Vector3( m_backgroundColor.red, 
-																					 m_backgroundColor.green, 
+	WW3D::Begin_Render( true, true, Vector3( m_backgroundColor.red,
+																					 m_backgroundColor.green,
 																					 m_backgroundColor.blue ) );
 
 	// draw the windows
@@ -1492,7 +1489,8 @@ void EditWindow::draw( void )
 	// render is all done!
 	WW3D::End_Render();
 
-}  // end draw
+	TheFramePacer->update();
+}
 
 // EditWindow::setSize ========================================================
 /** The edit window should now be logically consider this size */
@@ -1510,7 +1508,7 @@ void EditWindow::setSize( ICoord2D *size )
 		TheDisplay->setWidth( m_size.x );
 		TheDisplay->setHeight( m_size.y );
 
-	}  // end if
+	}
 
 	// set the extents for our 2D renderer
 	if( m_2DRender )
@@ -1519,7 +1517,7 @@ void EditWindow::setSize( ICoord2D *size )
 																								 m_size.x,
 																								 m_size.y ) );
 
-}  // end setSize
+}
 
 // EditWindow::openPopupMenu ==================================================
 /** Open the new control menu that comes up when the user right clicks
@@ -1543,7 +1541,7 @@ void EditWindow::openPopupMenu( Int x, Int y )
 		EnableMenuItem( subMenu, POPUP_MENU_PROPERTIES, MF_GRAYED );
 		EnableMenuItem( subMenu, POPUP_MENU_BRING_TO_TOP, MF_GRAYED );
 
-	}  // end if
+	}
 	else
 	{
 
@@ -1551,8 +1549,8 @@ void EditWindow::openPopupMenu( Int x, Int y )
 		EnableMenuItem( subMenu, POPUP_MENU_PROPERTIES, MF_ENABLED );
 		EnableMenuItem( subMenu, POPUP_MENU_BRING_TO_TOP, MF_ENABLED );
 
-	}  // end else
-	
+	}
+
 	//
 	// open up right mouse track menu, note that we have to translate the
 	// x,y of this mouse click which is local to this window into
@@ -1567,69 +1565,69 @@ void EditWindow::openPopupMenu( Int x, Int y )
 	m_popupMenuClickPos.x = x;
 	m_popupMenuClickPos.y = y;
 
-}  // end openPopupMenu
+}
 
 // EditWindow::drawLine =======================================================
 /** draw a line on the display in pixel coordinates with the specified color */
 //=============================================================================
-void EditWindow::drawLine( Int startX, Int startY, 
-													 Int endX, Int endY, 
+void EditWindow::drawLine( Int startX, Int startY,
+													 Int endX, Int endY,
 													 Real lineWidth, UnsignedInt lineColor )
 {
 
 	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
-	m_2DRender->Add_Line( Vector2( startX, startY ), Vector2( endX, endY ), 
+	m_2DRender->Add_Line( Vector2( startX, startY ), Vector2( endX, endY ),
 												lineWidth, lineColor );
 	m_2DRender->Render();
-	
-}  // end drawLIne
+
+}
 
 // EditWindow::drawOpenRect ===================================================
-/** draw a rect border on the display in pixel coordinates with the 
+/** draw a rect border on the display in pixel coordinates with the
 	* specified color */
 //=============================================================================
-void EditWindow::drawOpenRect( Int startX, Int startY, 
+void EditWindow::drawOpenRect( Int startX, Int startY,
 															 Int width, Int height,
 															 Real lineWidth, UnsignedInt lineColor )
 {
 
-	m_2DRender->Reset();		
+	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
-	m_2DRender->Add_Outline( RectClass( startX, startY, 
-																			startX + width, startY + height ), 
+	m_2DRender->Add_Outline( RectClass( startX, startY,
+																			startX + width, startY + height ),
 													 lineWidth, lineColor );
 
 	// render it now!
 	m_2DRender->Render();
 
-}  // end drawOpenRect
+}
 
 // EditWindow::drawFillRect ===================================================
-/** draw a filled rect on the display in pixel coords with the 
+/** draw a filled rect on the display in pixel coords with the
 	* specified color */
 //=============================================================================
-void EditWindow::drawFillRect( Int startX, Int startY, 
+void EditWindow::drawFillRect( Int startX, Int startY,
 															 Int width, Int height,
 															 UnsignedInt color )
 {
 
-	m_2DRender->Reset();		
+	m_2DRender->Reset();
 	m_2DRender->Enable_Texturing( FALSE );
-	m_2DRender->Add_Rect( RectClass( startX, startY, 
-																	 startX + width, startY + height ), 
+	m_2DRender->Add_Rect( RectClass( startX, startY,
+																	 startX + width, startY + height ),
 												0, 0, color );
 
 	// render it now!
 	m_2DRender->Render();
 
-}  // end drawFillRect
+}
 
 // EditWindow::drawImage ======================================================
 /** draw an image fit within the screen coordinates */
 //=============================================================================
-void EditWindow::drawImage( const Image *image, 
-														Int startX, Int startY, 
+void EditWindow::drawImage( const Image *image,
+														Int startX, Int startY,
 														Int endX, Int endY,
 														Color color )
 {
@@ -1696,7 +1694,7 @@ void EditWindow::drawImage( const Image *image,
 	if( BitIsSet( image->getStatus(), IMAGE_STATUS_ROTATED_90_CLOCKWISE ) )
 	{
 
-		m_2DRender->Add_Tri( Vector2( screen_rect.Left, screen_rect.Top ), 
+		m_2DRender->Add_Tri( Vector2( screen_rect.Left, screen_rect.Top ),
 												 Vector2( screen_rect.Left, screen_rect.Bottom ),
 												 Vector2( screen_rect.Right, screen_rect.Top ),
 												 Vector2( uv_rect.Right, uv_rect.Top),
@@ -1712,28 +1710,28 @@ void EditWindow::drawImage( const Image *image,
 												 Vector2( uv_rect.Left, uv_rect.Top ),
 												 color );
 
-	}  // end if
+	}
 	else
 	{
 
 		// just draw as normal
 		m_2DRender->Add_Quad( screen_rect, uv_rect, color );
 
-	}  // end else
+	}
 
 	m_2DRender->Render();
 
-}  // end drawImage
+}
 
 // EditWindow::getBackgroundColor =============================================
 /** Get the background color for the edit window */
 //=============================================================================
 RGBColorReal EditWindow::getBackgroundColor( void )
 {
-	
+
 	return m_backgroundColor;
 
-}  // end getBackgroundColor
+}
 
 // EditWindow::setBackgroundColor =============================================
 /** Set the background color for the edit window */
@@ -1743,7 +1741,7 @@ void EditWindow::setBackgroundColor( RGBColorReal color )
 
 	m_backgroundColor = color;
 
-}  // end setBackgroundColor
+}
 
 // EditWindow::notifyWindowDeleted ============================================
 /** A window has been deleted from the editor and the editor is now
@@ -1766,7 +1764,7 @@ void EditWindow::notifyWindowDeleted( GameWindow *window )
 		m_resizingWindow = FALSE;
 		TheEditor->setMode( MODE_EDIT );
 
-	}  // end if
+	}
 
 	// null out picked window if needed
 	if( m_pickedWindow == window )
@@ -1778,4 +1776,4 @@ void EditWindow::notifyWindowDeleted( GameWindow *window )
 	//
 	TheEditor->setMode( MODE_EDIT );
 
-}  // end notifyWindowDeleted
+}
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp
index ce3112edd22..301dc0c86e1 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp
@@ -24,12 +24,12 @@
 
 // FILE: GUIEdit.cpp //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -77,8 +77,6 @@
 
 #include "W3DDevice/Common/W3DFunctionLexicon.h"
 #include "W3DDevice/GameClient/W3DGameWindowManager.h"
-#include "W3DDevice/GameClient/W3DDisplay.h"
-#include "W3DDevice/GameClient/W3DGameWindowManager.h"
 #include "W3DDevice/GameClient/W3DGameFont.h"
 #include "W3DDevice/GameClient/W3DDisplayStringManager.h"
 #include "GameClient/Keyboard.h"
@@ -155,7 +153,7 @@ char *GUIEdit::saveAsDialog( void )
 	else
 		return NULL;
 
-}  // end saveAsDialog
+}
 
 // GUIEdit::openDialog ========================================================
 /** Bring up the standard windows browser open dialog and return
@@ -197,12 +195,12 @@ char *GUIEdit::openDialog( void )
 	else
 		return NULL;
 
-}  // end openDialog
+}
 
 // GUIEdit::setUnsaved ========================================================
 /** Set the current contents of the editor as either saved or unsaved,
 	* when we're entering an unsaved state we will put a marker in the title
-	* bar of the app, when leaving an unsaved state we will remove 
+	* bar of the app, when leaving an unsaved state we will remove
 	* that marker */
 //=============================================================================
 void GUIEdit::setUnsaved( Bool unsaved )
@@ -226,7 +224,7 @@ void GUIEdit::setUnsaved( Bool unsaved )
 		sprintf( title, "GUIEdit:  %s  *", filename );
 		SetWindowText( m_appHWnd, title );
 
-	}  // end if
+	}
 	//else if( m_unsaved == TRUE && unsaved == FALSE )
 	else
 	{
@@ -236,12 +234,12 @@ void GUIEdit::setUnsaved( Bool unsaved )
 		sprintf( title, "GUIEdit:  %s", filename );
 		SetWindowText( m_appHWnd, title );
 
-	}  // end else
+	}
 
 	// save the new state we're in
 	m_unsaved = unsaved;
 
-}  // end setUnsaved
+}
 
 // GUIEdit::setSaveFile =======================================================
 /** Set our member variables for the full path and filename passed in
@@ -253,16 +251,16 @@ void GUIEdit::setSaveFile( const char *fullPathAndFilename )
   const char *ptr;
 
 	// copy over the full path and filename
-	strcpy( m_savePathAndFilename, fullPathAndFilename );
+	strlcpy(m_savePathAndFilename, fullPathAndFilename, ARRAY_SIZE(m_savePathAndFilename));
 
 	//
 	// copy everything after the last '\' from the full path, this will
 	// be just the filename with extension
 	//
 	ptr = strrchr( fullPathAndFilename, '\\' ) + 1;
-	strcpy( m_saveFilename, ptr );
+	strlcpy(m_saveFilename, ptr, ARRAY_SIZE(m_saveFilename));
 
-}  // end setSaveFile
+}
 
 // GUIEdit::validateParentForCreate ===========================================
 /** This method is used when creating new windows and gadgets, if a
@@ -277,19 +275,19 @@ Bool GUIEdit::validateParentForCreate( GameWindow *parent )
 	// gadgets are units themselves and should have no user defined
 	// children
 	//
-	if( parent && TheEditor->windowIsGadget( parent ) )
+	if( parent && windowIsGadget( parent ) )
 	{
-		
-		MessageBox( TheEditor->getWindowHandle(),
+
+		MessageBox( getWindowHandle(),
 								"You cannot make a new window as a child to a GUI Gadget Control",
 								"Illegal Parent", MB_OK );
 		return FALSE;
 
-	}  // end if
+	}
 
 	return TRUE;  // ok
 
-}  // end validateParentForCreate
+}
 
 // GUIEdit::findSelectionEntry ================================================
 /** Find selection entry for this window */
@@ -313,11 +311,11 @@ WindowSelectionEntry *GUIEdit::findSelectionEntry( GameWindow *window )
 		// next entry
 		entry = entry->next;
 
-	}  // end while
+	}
 
 	return NULL;  // not found
 
-}  // end findSelectionEntry
+}
 
 // GUIEdit::normalizeRegion ===================================================
 /** Normalize the region so that lo and hi are actually lo and hi */
@@ -336,17 +334,17 @@ void GUIEdit::normalizeRegion( IRegion2D *region )
 			region->hi = region->lo;
 			region->lo = temp;
 
-		}  // end if
+		}
 		else
 		{
-			
+
 			temp = region->hi;
 			region->hi.x = region->lo.x;
 			region->lo.x = temp.x;
 
-		}  // end else
+		}
 
-	}  // end if
+	}
 	else if( region->hi.y < region->lo.y )
 	{
 
@@ -354,9 +352,9 @@ void GUIEdit::normalizeRegion( IRegion2D *region )
 		region->hi.y = region->lo.y;
 		region->lo.y = temp.y;
 
-	}  // end if
+	}
 
-}  // end normalizeRegion
+}
 
 // GUIEdit::selectWindowsInRegion =============================================
 /** Select all the windows that are fully in the region */
@@ -386,7 +384,7 @@ void GUIEdit::selectWindowsInRegion( IRegion2D *region )
 		window->winGetSize( &size.x, &size.y );
 
 		// compare window extents to selection region
-		if( origin.x >= region->lo.x && 
+		if( origin.x >= region->lo.x &&
 				origin.y >= region->lo.y &&
 				origin.x + size.x <= region->hi.x &&
 				origin.y + size.y <= region->hi.y )
@@ -395,14 +393,14 @@ void GUIEdit::selectWindowsInRegion( IRegion2D *region )
 			// add to selection list
 			selectWindow( window );
 
-		}  // end if
+		}
 
 		// go to next window
 		window = window->winGetNext();
 
-	}  // end while
+	}
 
-}  // end selectWindowsInRegion
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -440,37 +438,27 @@ GUIEdit::GUIEdit( void )
 	m_layoutInitString = GUIEDIT_NONE_STRING;
 	m_layoutUpdateString = GUIEDIT_NONE_STRING;
 	m_layoutShutdownString = GUIEDIT_NONE_STRING;
-}  // end GUIEdit
+}
 
 // GUIEdit::~GUIEdit ==========================================================
 /** */
 //=============================================================================
 GUIEdit::~GUIEdit( void )
 {
-	if (TheHeaderTemplateManager)
-	{
-		delete TheHeaderTemplateManager;
-		TheHeaderTemplateManager = NULL;
-	}
+	delete TheHeaderTemplateManager;
+	TheHeaderTemplateManager = NULL;
 
-	if (TheGameText)
-	{
-		delete TheGameText;
-		TheGameText = NULL;
-	}
-	
-	// delete the IME Manager
-//	if ( TheIMEManager )
-//	{
-//		delete TheIMEManager;
-//		TheIMEManager = NULL;
-//	}
+	delete TheGameText;
+	TheGameText = NULL;
 
+	// delete the IME Manager
+//	delete TheIMEManager;
+//	TheIMEManager = NULL;
 
 	// all the shutdown routine
 	shutdown();
 
-}  // end ~GUIEdit
+}
 
 // GUIEdit::init ==============================================================
 /** Initialize all the GUI edit data */
@@ -498,8 +486,6 @@ void GUIEdit::init( void )
 	TheArchiveFileSystem = new Win32BIGFileSystem;
 	TheFileSystem->init();
 
-	TheGlobalLanguageData = new GlobalLanguage;
-	TheGlobalLanguageData->init();
 	//---------------------------------------------------------------------------
 	// GUI tool specific initializations ----------------------------------------
 	//---------------------------------------------------------------------------
@@ -522,14 +508,18 @@ void GUIEdit::init( void )
 	// Game engine specific initializations -------------------------------------
 	//---------------------------------------------------------------------------
 
-	// create the name key generator
+	// create the global data
 	TheWritableGlobalData = new GlobalData;
 	TheWritableGlobalData->init();
 
+	// TheSuperHackers @info global language relies on global data being initialized
+	TheGlobalLanguageData = new GlobalLanguage;
+	TheGlobalLanguageData->init();
+
 	// create the message stream
 	TheMessageStream = new MessageStream;
 	TheMessageStream->init();
-	TheMessageStream->attachTranslator( new WindowTranslator, 10 );	
+	TheMessageStream->attachTranslator( new WindowTranslator, 10 );
 
 	// create the command list
 	TheCommandList = new CommandList;
@@ -611,7 +601,7 @@ void GUIEdit::init( void )
 		TheGameText->init();
 	}
 
-	TheHeaderTemplateManager = new HeaderTemplateManager;	
+	TheHeaderTemplateManager = new HeaderTemplateManager;
 	if(TheHeaderTemplateManager)
 		TheHeaderTemplateManager->init();
 	// create the IME manager
@@ -620,7 +610,7 @@ void GUIEdit::init( void )
 //	{
 //		TheIMEManager->init();
 //	}
-}  // end init
+}
 
 // GUIEdit::shutdown ==========================================================
 /** Shutdown our GUI edit application */
@@ -685,7 +675,7 @@ void GUIEdit::shutdown( void )
 	// delete name key generator
 	delete TheNameKeyGenerator;
 	TheNameKeyGenerator = NULL;
-	
+
 	delete TheGlobalLanguageData;
 	TheGlobalLanguageData = NULL;
 
@@ -715,7 +705,7 @@ void GUIEdit::shutdown( void )
 	TheKeyboard = NULL;
 
 
-}  // end shutdown
+}
 
 // GUIEdit::update ============================================================
 /** Update method for our GUI edit application */
@@ -727,15 +717,15 @@ void GUIEdit::update( void )
 	TheMouse->update();
 
 	// process the mouse if we're in test mode
-	if( TheEditor->getMode() == MODE_TEST_RUN )
+	if( getMode() == MODE_TEST_RUN )
 	{
-		
+
 		// send input through the window system and clear all messages after
 		TheMouse->createStreamMessages();
 		TheMessageStream->propagateMessages();
 		TheCommandList->reset();
 
-	}  // end if
+	}
 
 	// update the window manager itself
 	TheWindowManager->update();
@@ -743,7 +733,7 @@ void GUIEdit::update( void )
 	// draw the edit window
 	TheEditWindow->draw();
 
-}  // end update
+}
 
 // GUIEdit::writeConfigFile ===================================================
 /** Write the guiedit config file */
@@ -757,27 +747,27 @@ Bool GUIEdit::writeConfigFile( const char *filename )
 	if( fp == NULL )
 	{
 
-		DEBUG_LOG(( "writeConfigFile: Unable to open file '%s'\n", filename ));
+		DEBUG_LOG(( "writeConfigFile: Unable to open file '%s'", filename ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
-	// version 
+	// version
 	fprintf( fp, "GUIEdit Config file version '%d'\n", GUIEDIT_CONFIG_VERSION );
 
 	// edit window background color
 	RGBColorReal backColor = TheEditWindow->getBackgroundColor();
-	fprintf( fp, "BACKGROUNDCOLOR = %f %f %f %f\n", 
+	fprintf( fp, "BACKGROUNDCOLOR = %f %f %f %f\n",
 					 backColor.red, backColor.green, backColor.blue, backColor.alpha );
 
 	// grid settings
-	fprintf( fp, "GRIDRESOLUTION = %d\n", TheEditor->getGridResolution() );
-	RGBColorInt *gridColor = TheEditor->getGridColor();
+	fprintf( fp, "GRIDRESOLUTION = %d\n", getGridResolution() );
+	RGBColorInt *gridColor = getGridColor();
 	fprintf( fp, "GRIDCOLOR = %d %d %d %d\n",
 					 gridColor->red, gridColor->green, gridColor->blue, gridColor->alpha );
-	fprintf( fp, "SNAPTOGRID = %d\n", TheEditor->isGridSnapOn() );
-	fprintf( fp, "GRIDVISIBLE = %d\n", TheEditor->isGridVisible() );
+	fprintf( fp, "SNAPTOGRID = %d\n", isGridSnapOn() );
+	fprintf( fp, "GRIDVISIBLE = %d\n", isGridVisible() );
 
 	// write hierarchy position and size
 	ICoord2D pos, size;
@@ -798,7 +788,7 @@ Bool GUIEdit::writeConfigFile( const char *filename )
 
 	return TRUE;
 
-}  // end writeConfigFile
+}
 
 // GUIEdit::readConfigFile ====================================================
 /** Read the guiedit config file */
@@ -812,7 +802,7 @@ Bool GUIEdit::readConfigFile( const char *filename )
 	if( fp == NULL )
 		return TRUE;
 
-	// version 
+	// version
 	Int version;
 	fscanf( fp, "GUIEdit Config file version '%d'\n", &version );
 	if( version != GUIEDIT_CONFIG_VERSION )
@@ -820,22 +810,22 @@ Bool GUIEdit::readConfigFile( const char *filename )
 
 	// edit window background color
 	RGBColorReal backColor;
-	fscanf( fp, "BACKGROUNDCOLOR = %f %f %f %f\n", 
+	fscanf( fp, "BACKGROUNDCOLOR = %f %f %f %f\n",
 				  &backColor.red, &backColor.green, &backColor.blue, &backColor.alpha );
 	TheEditWindow->setBackgroundColor( backColor );
 
 	// grid settings
 	Int intData;
 	fscanf( fp, "GRIDRESOLUTION = %d\n", &intData );
-	TheEditor->setGridResolution( intData );
+	setGridResolution( intData );
 	RGBColorInt gridColor;
 	fscanf( fp, "GRIDCOLOR = %d %d %d %d\n",
 					&gridColor.red, &gridColor.green, &gridColor.blue, &gridColor.alpha );
-	TheEditor->setGridColor( &gridColor );
+	setGridColor( &gridColor );
 	fscanf( fp, "SNAPTOGRID = %d\n", &intData );
-	TheEditor->setGridSnap( intData );
+	setGridSnap( intData );
 	fscanf( fp, "GRIDVISIBLE = %d\n", &intData );
-	TheEditor->setGridVisible( intData );
+	setGridVisible( intData );
 
 	// hierarchy view
 	ICoord2D pos, size;
@@ -863,7 +853,7 @@ Bool GUIEdit::readConfigFile( const char *filename )
 
 	return TRUE;
 
-}  // end readConfigFile
+}
 
 // GUIEdit::readFontFile ======================================================
 /** Read the font file defintitions and load them */
@@ -906,7 +896,7 @@ void GUIEdit::readFontFile( const char *filename )
 			fontBuffer[ index++ ] = c;
 			c = fgetc( fp );
 
-		}  // end while
+		}
 		fontBuffer[ index ] = '\0';
 		c = fgetc( fp );  // the end quite itself
 
@@ -922,15 +912,15 @@ void GUIEdit::readFontFile( const char *filename )
 			sprintf( buffer, "Warning: The font '%s' Size: '%d' Bold: '%d', specified in the config file could not be loaded.  Does that font exist?",
 							 fontBuffer, size, bold );
 			MessageBox( m_appHWnd, buffer, "Cannot Load Font", MB_OK );
-			
-		}  // end if
 
-	}  // end for i
+		}
+
+	}
 
 	// close the file
 	fclose( fp );
 
-}  // end readFontFile
+}
 
 // GUIEdit::writeFontFile =====================================================
 /** If we can, write a file containing a definition of all the fonts
@@ -954,18 +944,18 @@ void GUIEdit::writeFontFile( const char *filename )
 	fprintf( fp, "AVAILABLE_FONT_COUNT = %d\n", count );
 
 	GameFont *font;
-	for( font = TheFontLibrary->firstFont(); 
-			 font; 
+	for( font = TheFontLibrary->firstFont();
+			 font;
 			 font = TheFontLibrary->nextFont( font ) )
 	{
 		fprintf( fp, "AVAILABLEFONT = \"%s\" Size: %d Bold: %d\n",
 						 font->nameString.str(), font->pointSize, font->bold );
-	}  // end for
+	}
 
 	// close the file
 	fclose( fp );
 
-}  // end writeFontFile
+}
 
 // GUIEdit::setMode ===========================================================
 /** Set a new mode for the editor */
@@ -985,14 +975,14 @@ void GUIEdit::setMode( EditMode mode )
 		TheMessageStream->removeTranslator( transID );
 		transID = 0;
 
-	}  // end if
+	}
 
 	// assign new mode
 	m_mode = mode;
 
 	// uncheck menu item for test mode by default
 	unCheckMenuItem( MENU_TEST_MODE );
-	
+
 	// update status message
 	switch( m_mode )
 	{
@@ -1074,9 +1064,9 @@ void GUIEdit::setMode( EditMode mode )
 			statusMessage( STATUS_MODE, "Drag right to resize" );
 			break;
 
-	}  // end switch
+	}
 
-}  // end setMode
+}
 
 // GUIEdit::setCursor =========================================================
 /** Set the cursor to the specified type */
@@ -1123,17 +1113,17 @@ void GUIEdit::setCursor( CursorType type )
 			identifier = IDC_WAIT;
 			break;
 
-	}  // end switchType
+	}
 
 	// set the new cursor
 	SetCursor( LoadCursor( NULL, identifier ) );
 
-}  // end setCursor
+}
 
 // pointInChild ===============================================================
-/** Given a mouse position, get the topmost window at that location. We needed 
+/** Given a mouse position, get the topmost window at that location. We needed
 		to pull this out into it's own special case function since the standard
-		winPointInAnyChild is used by the game and we needed a special case to 
+		winPointInAnyChild is used by the game and we needed a special case to
 		select a disabled control in GUIEdit																		*/
 //=============================================================================
 static GameWindow *pointInChild( Int x, Int y , GameWindow *win)
@@ -1143,38 +1133,38 @@ static GameWindow *pointInChild( Int x, Int y , GameWindow *win)
 	ICoord2D origin;
 	IRegion2D tempRegion;
 	Int tempX, tempY;
-	for( child = win->winGetChild(); child; child = child->winGetNext() ) 
+	for( child = win->winGetChild(); child; child = child->winGetNext() )
 	{
 
 		child->winGetRegion(&tempRegion);
 		origin = tempRegion.lo;
 		parent = child->winGetParent();
 
-		while( parent ) 
+		while( parent )
 		{
 			parent->winGetRegion(&tempRegion);
 			origin.x += tempRegion.lo.x;
 			origin.y += tempRegion.lo.y;
 			parent = parent->winGetParent();
 
-		}  // end while
+		}
 		child->winGetSize(&tempX,&tempY);
 		if( x >= origin.x && x <= origin.x + tempX &&
 				y >= origin.y && y <= origin.y + tempY &&
 				BitIsSet( child->winGetStatus(), WIN_STATUS_HIDDEN ) == FALSE)
 			return child->winPointInChild( x, y );
 
-	}  // end for child
+	}
 
 	// not in any children, must be in parent
 	return win;
 
-}  // end pointInChild
+}
 
 // pointInAnyChild ============================================================
-/** Given a mouse position, get the topmost window at that location. We needed 
+/** Given a mouse position, get the topmost window at that location. We needed
 		to pull this out into it's own special case function since the standard
-		winPointInAnyChild is used by the game and we needed a special case to 
+		winPointInAnyChild is used by the game and we needed a special case to
 		select a disabled control in GUIEdit																		*/
 //=============================================================================
 static GameWindow *pointInAnyChild( Int x, Int y, Bool ignoreHidden, GameWindow *win )
@@ -1184,13 +1174,13 @@ static GameWindow *pointInAnyChild( Int x, Int y, Bool ignoreHidden, GameWindow
 	ICoord2D origin;
 	IRegion2D tempRegion;
 	Int tempX, tempY;
-	for( child = win->winGetChild(); child; child = child->winGetNext() ) 
+	for( child = win->winGetChild(); child; child = child->winGetNext() )
 	{
 		child->winGetRegion(&tempRegion);
 		origin = tempRegion.lo;
 		parent = child->winGetParent();
 
-		while( parent ) 
+		while( parent )
 		{
 
 			parent->winGetRegion(&tempRegion);
@@ -1198,7 +1188,7 @@ static GameWindow *pointInAnyChild( Int x, Int y, Bool ignoreHidden, GameWindow
 			origin.y += tempRegion.lo.y;
 			parent = parent->winGetParent();
 
-		}  // end while
+		}
 		child->winGetSize(&tempX,&tempY);
 		if( x >= origin.x && x <= origin.x + tempX &&
 				y >= origin.y && y <= origin.y + tempY )
@@ -1207,14 +1197,14 @@ static GameWindow *pointInAnyChild( Int x, Int y, Bool ignoreHidden, GameWindow
 			if( !(ignoreHidden == TRUE &&	BitIsSet( child->winGetStatus(), WIN_STATUS_HIDDEN )) )
 				return pointInChild( x, y , child);
 
-		}  // end if
+		}
 
-	}  // end for child
+	}
 
 	// not in any children, must be in parent
 	return win;
 
-}  // end pointInAnyChild
+}
 
 // GUIEdit::getWindowAtPos ====================================================
 /** Given a mouse position, get the topmost window at that location */
@@ -1229,7 +1219,7 @@ GameWindow *GUIEdit::getWindowAtPos( Int x, Int y )
 			 window;
 			 window = window->winGetNext() )
 	{
-	
+
 		// get window region
 		window->winGetRegion( &region );
 
@@ -1240,9 +1230,9 @@ GameWindow *GUIEdit::getWindowAtPos( Int x, Int y )
 			pick = pointInAnyChild( x, y, FALSE, window );
 			break;  // exit for
 
-		}  // end if
+		}
 
-	}  // end for 
+	}
 
 	//
 	// gadget controls are just composed of generic windows and buttons,
@@ -1257,11 +1247,11 @@ GameWindow *GUIEdit::getWindowAtPos( Int x, Int y )
 
 		//
 		// all gadget components are children of their parent, therefore they
-		// all have a parent 
+		// all have a parent
 		//
 		if( parent )
 		{
-		
+
 			if( BitIsSet( parent->winGetStyle(), GWS_VERT_SLIDER |
 																					GWS_HORZ_SLIDER |
 																					GWS_SCROLL_LISTBOX |
@@ -1270,17 +1260,17 @@ GameWindow *GUIEdit::getWindowAtPos( Int x, Int y )
 									)
 				)
 			{
-				
+
 				// the parent is what we care about
 				pick = parent;
-				
+
 				//
 				// the parent is the thing we want to return here, unless we clicked
 				// on the thumb of a scroll list box, that element is implemented as
 				// a slider, therefore in that situation only we want to return the
 				// parent of the slider
 				//
-				if( BitIsSet( parent->winGetStyle(), GWS_HORZ_SLIDER | 
+				if( BitIsSet( parent->winGetStyle(), GWS_HORZ_SLIDER |
 																						GWS_VERT_SLIDER ) )
 				{
 					GameWindow *grandParent = parent->winGetParent();
@@ -1289,7 +1279,7 @@ GameWindow *GUIEdit::getWindowAtPos( Int x, Int y )
 																			GWS_SCROLL_LISTBOX ) )
 						pick = grandParent;
 
-				}  // end if
+				}
 
 				//must check to see of the parent of a scroll box is a combo box
 				if(BitIsSet(pick->winGetStyle(), GWS_SCROLL_LISTBOX))
@@ -1297,24 +1287,24 @@ GameWindow *GUIEdit::getWindowAtPos( Int x, Int y )
 					GameWindow *grandParent = pick->winGetParent();
 					if( grandParent && BitIsSet( grandParent->winGetStyle(), GWS_COMBO_BOX))
 						pick = grandParent;
-				}					
-			}  // end if
+				}
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	return pick;
 
-}  // end getWindowAtPos
+}
 
 // GUIEdit::clipCreationParamsToParent ========================================
 /** when creating child windows we don't want them to exist outside the
-	* parent so we use this to clip them to the the parent size and 
+	* parent so we use this to clip them to the the parent size and
 	* locations */
 //=============================================================================
 void GUIEdit::clipCreationParamsToParent( GameWindow *parent,
-																					Int *x, Int *y, 
+																					Int *x, Int *y,
 																					Int *width, Int *height )
 {
 	IRegion2D parentScreenRegion;
@@ -1364,7 +1354,7 @@ void GUIEdit::clipCreationParamsToParent( GameWindow *parent,
 	*width = newWidth;
 	*height= newHeight;
 
-}  // end clipcreationParamsToParent
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -1385,13 +1375,13 @@ void GUIEdit::deleteAllWindows( void )
 		deleteWindow( window );
 		window = next;
 
-	}  // end while
+	}
 
-}  // end deleteAllWindows
+}
 
 // GUIEdit::removeWindowCleanup ===============================================
 /** This is called on each window before it is deleted or removed from
-	* the active windows in the editor to allow the system to 
+	* the active windows in the editor to allow the system to
 	* cleanup before the delete */
 //=============================================================================
 void GUIEdit::removeWindowCleanup( GameWindow *window )
@@ -1425,7 +1415,7 @@ void GUIEdit::removeWindowCleanup( GameWindow *window )
 	for( child = window->winGetChild(); child; child = child->winGetNext() )
 		removeWindowCleanup( child );
 
-}  // end removeWindowCleanup
+}
 
 // GUIEdit::deleteWindow ======================================================
 /** Delete the window from the editor */
@@ -1442,7 +1432,7 @@ void GUIEdit::deleteWindow( GameWindow *window )
 	// we've changed contents
 	setUnsaved( TRUE );
 
-}  // end deleteWindow
+}
 
 // GUIEdit::newWindow =========================================================
 /** Create a new window of the specified type.  This is the single creation
@@ -1458,7 +1448,7 @@ GameWindow *GUIEdit::newWindow( UnsignedInt windowStyle,
 	// create the appropriate window based on style bit passed in
 	switch( windowStyle )
 	{
-	
+
 		// ------------------------------------------------------------------------
 		case GWS_USER_WINDOW:
 			window = newUserWindow( parent, x, y, width, height );
@@ -1498,7 +1488,7 @@ GameWindow *GUIEdit::newWindow( UnsignedInt windowStyle,
 		case GWS_SCROLL_LISTBOX:
 			window = newListbox( parent, x, y, width, height );
 			break;
-		
+
 		// ------------------------------------------------------------------------
 		case GWS_COMBO_BOX:
 			window = newComboBox( parent, x, y, width, height );
@@ -1521,20 +1511,20 @@ GameWindow *GUIEdit::newWindow( UnsignedInt windowStyle,
 
 		// ------------------------------------------------------------------------
 		default:
-			MessageBox( m_appHWnd, "Unknown window type to newWindow()", "ERROR", 
+			MessageBox( m_appHWnd, "Unknown window type to newWindow()", "ERROR",
 									MB_OK | MB_ICONERROR );
 			break;
 
-	}  // end switch
+	}
 
 	return window;
 
-}  // end newWindow
+}
 
 // GUIEdit::newUserWindow =====================================================
 /** Create a new window at the given location */
 //=============================================================================
-GameWindow *GUIEdit::newUserWindow( GameWindow *parent, Int x, Int y, 
+GameWindow *GUIEdit::newUserWindow( GameWindow *parent, Int x, Int y,
 																		Int width, Int height )
 {
 	UnsignedInt status = WIN_STATUS_ENABLED;
@@ -1587,7 +1577,7 @@ GameWindow *GUIEdit::newUserWindow( GameWindow *parent, Int x, Int y,
 
 	return window;
 
-}  // end newUserWindow
+}
 
 // GUIEdit::newPushButton =====================================================
 /** Create a new push button */
@@ -1669,7 +1659,7 @@ GameWindow *GUIEdit::newPushButton( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -1679,7 +1669,7 @@ GameWindow *GUIEdit::newPushButton( GameWindow *parent,
 
 	return window;
 
-}  // end newPushButton
+}
 
 // GUIEdit::newCheckBox =======================================================
 /** Create a new check box */
@@ -1774,7 +1764,7 @@ GameWindow *GUIEdit::newCheckBox( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -1784,7 +1774,7 @@ GameWindow *GUIEdit::newCheckBox( GameWindow *parent,
 
 	return window;
 
-}  // end newCheckBox
+}
 
 // GUIEdit::newRadioButton ====================================================
 /** Create a new radio button */
@@ -1882,7 +1872,7 @@ GameWindow *GUIEdit::newRadioButton( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -1892,7 +1882,7 @@ GameWindow *GUIEdit::newRadioButton( GameWindow *parent,
 
 	return window;
 
-}  // end newRadioButton
+}
 
 // GUIEdit::newTabControl ====================================================
 /** Create a tab control gadget */
@@ -1986,7 +1976,7 @@ GameWindow *GUIEdit::newTabControl( GameWindow *parent,
 		GadgetTabControlSetEnabledBorderColorBackground( window, info->borderColor );
 
 
-	
+
 		info = TheDefaultScheme->getImageAndColor( TC_TAB_0_DISABLED );
 		GadgetTabControlSetDisabledImageTabZero( window, info->image );
 		GadgetTabControlSetDisabledColorTabZero( window, info->color );
@@ -2033,7 +2023,7 @@ GameWindow *GUIEdit::newTabControl( GameWindow *parent,
 		GadgetTabControlSetDisabledBorderColorBackground( window, info->borderColor );
 
 
-		
+
 
 		info = TheDefaultScheme->getImageAndColor( TC_TAB_0_HILITE );
 		GadgetTabControlSetHiliteImageTabZero( window, info->image );
@@ -2080,7 +2070,7 @@ GameWindow *GUIEdit::newTabControl( GameWindow *parent,
 		GadgetTabControlSetHiliteColorBackground( window, info->color );
 		GadgetTabControlSetHiliteBorderColorBackground( window, info->borderColor );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -2090,13 +2080,13 @@ GameWindow *GUIEdit::newTabControl( GameWindow *parent,
 
 	return window;
 
-}  // end newTabControl
+}
 
 // GUIEdit::newHorizontalSlider ===============================================
 /** Create a new horizontal slider*/
 //=============================================================================
 GameWindow *GUIEdit::newHorizontalSlider( GameWindow *parent,
-																					Int x, Int y, 
+																					Int x, Int y,
 																					Int width, Int height )
 {
 	GameWindow *window;
@@ -2201,7 +2191,7 @@ GameWindow *GUIEdit::newHorizontalSlider( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -2211,13 +2201,13 @@ GameWindow *GUIEdit::newHorizontalSlider( GameWindow *parent,
 
 	return window;
 
-}  // end newHorizontalSlider
+}
 
 // GUIEdit::newVerticlaSlider =================================================
 /** Create a new vertical slider */
 //=============================================================================
 GameWindow *GUIEdit::newVerticalSlider( GameWindow *parent,
-																				Int x, Int y, 
+																				Int x, Int y,
 																				Int width, Int height )
 {
 	GameWindow *window;
@@ -2322,7 +2312,7 @@ GameWindow *GUIEdit::newVerticalSlider( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -2332,13 +2322,13 @@ GameWindow *GUIEdit::newVerticalSlider( GameWindow *parent,
 
 	return window;
 
-}  // end newVerticalSlider
+}
 
 // GUIEdit::newProgressBar ====================================================
 /** Create a new progress bar */
 //=============================================================================
 GameWindow *GUIEdit::newProgressBar( GameWindow *parent,
-																		 Int x, Int y, 
+																		 Int x, Int y,
 																		 Int width, Int height )
 {
 	GameWindow *window;
@@ -2457,7 +2447,7 @@ GameWindow *GUIEdit::newProgressBar( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -2467,13 +2457,13 @@ GameWindow *GUIEdit::newProgressBar( GameWindow *parent,
 
 	return window;
 
-}  // end newProgressBar
+}
 
 // GUIEdit::newListbox ========================================================
 /** Create a new list box */
 //=============================================================================
 GameWindow *GUIEdit::newComboBox( GameWindow *parent,
-																 Int x, Int y, 
+																 Int x, Int y,
 																 Int width, Int height )
 {
 	GameWindow *window;
@@ -2496,12 +2486,12 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 
 	ComboBoxData *comboData = new ComboBoxData;
 	memset ( comboData, 0, sizeof(comboData));
-	
+
 	comboData->entryData = new EntryData;
 	memset ( comboData->entryData, 0, sizeof(EntryData));
 	comboData->listboxData = new ListboxData;
 	memset ( comboData->listboxData, 0, sizeof(ListboxData));
-		
+
 
 	//initialize combo box data
 	comboData->isEditable = TRUE;
@@ -2511,14 +2501,14 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 	comboData->dontHide = FALSE;
 	comboData->asciiOnly = FALSE;
 	comboData->lettersAndNumbersOnly = FALSE;
-		
+
 	//initialize entry data
 	comboData->entryData->maxTextLen = 16;
 	comboData->entryData->alphaNumericalOnly = FALSE;
 	comboData->entryData->aSCIIOnly = FALSE;
 	comboData->entryData->numericalOnly = FALSE;
 
-	
+
 	//initialize listbox data
 	comboData->listboxData->listLength = 10;
 	comboData->listboxData->autoScroll = 0;
@@ -2542,7 +2532,7 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 																								TRUE );
 
 	// set default colors based on the default scheme
-	
+
 	if( window )
 	{
 		ImageAndColorInfo *info;
@@ -2711,7 +2701,7 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 				GadgetButtonSetHiliteSelectedColor( upButton, info->color );
 				GadgetButtonSetHiliteSelectedBorderColor( upButton, info->borderColor );
 
-			}  // end if
+			}
 
 			GameWindow *downButton = GadgetListBoxGetDownButton( listBox );
 			if( downButton )
@@ -2744,7 +2734,7 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 				GadgetButtonSetHiliteSelectedColor( downButton, info->color );
 				GadgetButtonSetHiliteSelectedBorderColor( downButton, info->borderColor );
 
-			}  // end if
+			}
 
 			GameWindow *slider = GadgetListBoxGetSlider( listBox );
 			if( slider )
@@ -2816,7 +2806,7 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 				GadgetSliderSetHiliteSelectedThumbBorderColor( slider, info->borderColor );
 
 				}
-		} //end listbox if
+		}
 		GameWindow *dropDownButton = GadgetComboBoxGetDropDownButton( window );
 		if( dropDownButton )
 		{
@@ -2848,7 +2838,7 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 			GadgetButtonSetHiliteSelectedColor( dropDownButton, info->color );
 			GadgetButtonSetHiliteSelectedBorderColor( dropDownButton, info->borderColor );
 
-		}  // end if
+		}
 
 		Color color, border;
 
@@ -2864,15 +2854,15 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 		color = TheDefaultScheme->getHiliteTextColor();
 		border = TheDefaultScheme->getHiliteTextBorderColor();
 		window->winSetHiliteTextColors( color, border );
-		
+
 		/// @TODO: We still need to set the IME Composite Text colors in TheDefaultScheme
 		window->winSetIMECompositeTextColors( color, border );
 
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
-		
-	}// end if
-	
+
+	}
+
 	// contents have changed
 	setUnsaved( TRUE );
 
@@ -2882,13 +2872,13 @@ GameWindow *GUIEdit::newComboBox( GameWindow *parent,
 	return window;
 
 
-} // end newComboBox
+}
 
 // GUIEdit::newListbox ========================================================
 /** Create a new list box */
 //=============================================================================
 GameWindow *GUIEdit::newListbox( GameWindow *parent,
-																 Int x, Int y, 
+																 Int x, Int y,
 																 Int width, Int height )
 {
 	GameWindow *window;
@@ -3012,7 +3002,7 @@ GameWindow *GUIEdit::newListbox( GameWindow *parent,
 			GadgetButtonSetHiliteSelectedColor( upButton, info->color );
 			GadgetButtonSetHiliteSelectedBorderColor( upButton, info->borderColor );
 
-		}  // end if
+		}
 
 		GameWindow *downButton = GadgetListBoxGetDownButton( window );
 		if( downButton )
@@ -3045,7 +3035,7 @@ GameWindow *GUIEdit::newListbox( GameWindow *parent,
 			GadgetButtonSetHiliteSelectedColor( downButton, info->color );
 			GadgetButtonSetHiliteSelectedBorderColor( downButton, info->borderColor );
 
-		}  // end if
+		}
 
 		GameWindow *slider = GadgetListBoxGetSlider( window );
 		if( slider )
@@ -3116,7 +3106,7 @@ GameWindow *GUIEdit::newListbox( GameWindow *parent,
 			GadgetSliderSetHiliteSelectedThumbColor( slider, info->color );
 			GadgetSliderSetHiliteSelectedThumbBorderColor( slider, info->borderColor );
 
-		}  // end if, slider
+		}
 
 		Color color, border;
 
@@ -3135,7 +3125,7 @@ GameWindow *GUIEdit::newListbox( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -3145,13 +3135,13 @@ GameWindow *GUIEdit::newListbox( GameWindow *parent,
 
 	return window;
 
-}	 // end newListbox
+}
 
 // GUIEdit::newTextEntry ======================================================
 /** Create a new text entry */
 //=============================================================================
 GameWindow *GUIEdit::newTextEntry( GameWindow *parent,
-																	 Int x, Int y, 
+																	 Int x, Int y,
 																	 Int width, Int height )
 {
 	GameWindow *window;
@@ -3241,7 +3231,7 @@ GameWindow *GUIEdit::newTextEntry( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -3251,13 +3241,13 @@ GameWindow *GUIEdit::newTextEntry( GameWindow *parent,
 
 	return window;
 
-}  // end newTextEntry
+}
 
 // GUIEdit::newStaticText =====================================================
 /** Create a new static text*/
 //=============================================================================
 GameWindow *GUIEdit::newStaticText( GameWindow *parent,
-																		Int x, Int y, 
+																		Int x, Int y,
 																		Int width, Int height )
 {
 	GameWindow *window;
@@ -3329,7 +3319,7 @@ GameWindow *GUIEdit::newStaticText( GameWindow *parent,
 		// set default font
 		window->winSetFont( TheDefaultScheme->getFont() );
 
-	}  // end if
+	}
 
 	// contents have changed
 	setUnsaved( TRUE );
@@ -3339,7 +3329,7 @@ GameWindow *GUIEdit::newStaticText( GameWindow *parent,
 
 	return window;
 
-}  // end newStaticText
+}
 
 // GUIEdit::createStatusBar ===================================================
 /** Create a status bar at the bottom of the editor */
@@ -3352,14 +3342,14 @@ void GUIEdit::createStatusBar( void )
 
 	// create the bar
 	m_statusBarHWnd = CreateStatusWindow( WS_CHILD |
-																				WS_VISIBLE | 
-																				WS_CLIPSIBLINGS | 
-																				CCS_BOTTOM | 
+																				WS_VISIBLE |
+																				WS_CLIPSIBLINGS |
+																				CCS_BOTTOM |
 																				SBARS_SIZEGRIP,
 																				"Ready",
 																				m_appHWnd,
 																				STATUS_BAR_ID );
-	
+
 	// get size of status bar
 	GetWindowRect( m_statusBarHWnd, &rect );
 	width = rect.right - rect.left;
@@ -3373,11 +3363,11 @@ void GUIEdit::createStatusBar( void )
 
 		sizes[ i ] = (i + 1) * (width / STATUS_NUM_PARTS);
 
-	}  // end for i
+	}
 	sizes[ STATUS_NUM_PARTS - 1 ] = -1;  // right edge
   SendMessage( m_statusBarHWnd, SB_SETPARTS, STATUS_NUM_PARTS, (LPARAM)sizes );
 
-}  // end createStatusBar
+}
 
 // GUIEdit::statusMessage =====================================================
 /** Set a message in the status bar */
@@ -3388,17 +3378,17 @@ void GUIEdit::statusMessage( StatusPart part, const char *message )
 	// check for out of bounds part
 	if( part < 0 || part >= STATUS_NUM_PARTS )
 	{
-	
-		DEBUG_LOG(( "Status message part out of range '%d', '%s'\n", part, message ));
+
+		DEBUG_LOG(( "Status message part out of range '%d', '%s'", part, message ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	if( m_statusBarHWnd )
 		SendMessage( m_statusBarHWnd, SB_SETTEXT, part, (LPARAM)message );
 
-}  // end statusMessage
+}
 
 // GUIEdit::createToolbar =====================================================
 /** Create the toolbar for the editor */
@@ -3406,7 +3396,7 @@ void GUIEdit::statusMessage( StatusPart part, const char *message )
 void GUIEdit::createToolbar( void )
 {
 
-}  // end createToolbar
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -3431,7 +3421,7 @@ Bool GUIEdit::newLayout( void )
 
 	return TRUE;
 
-}  // end newLayout
+}
 
 // GUIEdit::menuExit ==========================================================
 /** The user clicked on exit in the menu and wishes to exit the editor */
@@ -3447,7 +3437,7 @@ Bool GUIEdit::menuExit( void )
 	if( m_unsaved )
 	{
 
-		result = MessageBox( m_appHWnd, "Save file before quitting?", 
+		result = MessageBox( m_appHWnd, "Save file before quitting?",
 												 "Save?", MB_YESNOCANCEL );
 		if( result == IDCANCEL )
 			return TRUE;  // no error
@@ -3456,20 +3446,20 @@ Bool GUIEdit::menuExit( void )
 			Bool success;
 
 			// save all our data
-			success = TheEditor->menuSave();
+			success = menuSave();
 
 			//
 			// if we were unable to save file ask them if it's still OK to
 			// quit and lose the data
 			//
 			if( success == FALSE )
-				MessageBox( m_appHWnd, 
-										"File not saved.  If you continue to exit all data will be LOST!", 
+				MessageBox( m_appHWnd,
+										"File not saved.  If you continue to exit all data will be LOST!",
 										"File Not Saved", MB_OK );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// ask them if they really want to quit
 	result = MessageBox( m_appHWnd, "Exit GUIEdit?", "Really Quit?", MB_YESNO );
@@ -3478,14 +3468,14 @@ Bool GUIEdit::menuExit( void )
 
 	return TRUE;
 
-}  // end menuExit
+}
 
 // GUIEdit::menuNew ===========================================================
 /** file->new menu option */
 //=============================================================================
 Bool GUIEdit::menuNew( void )
 {
-	
+
 	//
 	// if the current data is unsaved ask the user if they want to save
 	// before proceeding with a new layout
@@ -3494,7 +3484,7 @@ Bool GUIEdit::menuNew( void )
 	{
 		Int result;
 
-		result = MessageBox( m_appHWnd, 
+		result = MessageBox( m_appHWnd,
 												 "Current data is not saved.  Save before proceeding?",
 												 "Save?",
 												 MB_YESNOCANCEL );
@@ -3518,11 +3508,11 @@ Bool GUIEdit::menuNew( void )
 				if( result == IDNO )
 					return TRUE;  // they chose to proceed anyway, no error
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// reset the layout in the editor
 	strcpy( m_savePathAndFilename, "" );
@@ -3532,7 +3522,7 @@ Bool GUIEdit::menuNew( void )
 
 	return TRUE;
 
-}  // end menuNew
+}
 
 // GUIEdit::stripNameDecorations ==============================================
 /** Strip name decorations of the entire tree of windows */
@@ -3549,7 +3539,6 @@ void GUIEdit::stripNameDecorations( GameWindow *root )
 
 	if( !instData->m_decoratedNameString.isEmpty() )
 	{
-		char nameOnly[ MAX_WINDOW_NAME_LEN ];
 		const char *c;
 
 		// skip past the "filename.wnd:" to the name only
@@ -3560,15 +3549,12 @@ void GUIEdit::stripNameDecorations( GameWindow *root )
 			// skip beyong the scope resolution colon
 			c++;
 
-			// copy the name
-			strcpy( nameOnly, c );
-
 			// put the name only in the decoration field
-			instData->m_decoratedNameString = nameOnly;
+			instData->m_decoratedNameString = c;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// strip from children
 	GameWindow *child;
@@ -3578,7 +3564,7 @@ void GUIEdit::stripNameDecorations( GameWindow *root )
 	// onto the next
 	stripNameDecorations( root->winGetNext() );
 
-}  // end stripNameDecorations
+}
 
 //=============================================================================
 /** After a load, we will restore default callbacks to all user windows
@@ -3600,7 +3586,7 @@ void GUIEdit::revertDefaultCallbacks( GameWindow *root )
 		root->winSetTooltipFunc( TheWindowManager->getDefaultTooltip() );
 		root->winSetDrawFunc( TheWindowManager->getDefaultDraw() );
 
-	}  // end if
+	}
 
 	// do the children
 	revertDefaultCallbacks( root->winGetChild() );
@@ -3608,7 +3594,7 @@ void GUIEdit::revertDefaultCallbacks( GameWindow *root )
 	// do the next window
 	revertDefaultCallbacks( root->winGetNext() );
 
-}  // end revertDefaultCallbacks
+}
 
 // GUIEdit::menuOpen ==========================================================
 /** User has clicked on file->open */
@@ -3625,7 +3611,7 @@ Bool GUIEdit::menuOpen( void )
 	{
 		Int result;
 
-		result = MessageBox( m_appHWnd, 
+		result = MessageBox( m_appHWnd,
 												 "Current data is not saved.  Save before proceeding?",
 												 "Save?",
 												 MB_YESNOCANCEL );
@@ -3649,11 +3635,11 @@ Bool GUIEdit::menuOpen( void )
 				if( result == IDNO )
 					return TRUE;  // they chose to proceed anyway, no error
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// open the standard window file browser
 	filePath = openDialog();
@@ -3667,10 +3653,10 @@ Bool GUIEdit::menuOpen( void )
 	// just the filename in members of the editor
 	//
 	setSaveFile( filePath );
-	
+
 	// clear the contents of the editor
 	newLayout();
-	
+
 	// load the new layout file
 	WindowLayoutInfo info;
 	TheWindowManager->winCreateFromScript( AsciiString(filePath), &info );
@@ -3708,7 +3694,7 @@ Bool GUIEdit::menuOpen( void )
 
 	return TRUE;
 
-}  // end menuOpen
+}
 
 // GUIEdit::menuSave ==========================================================
 /** file->save menu option */
@@ -3729,17 +3715,17 @@ Bool GUIEdit::menuSave( void )
 		// our contents are now considered "unchanged"
 		setUnsaved( FALSE );
 
-	}  // end if
+	}
 	else
 	{
-		
+
 		MessageBox( m_appHWnd, "Layout not saved!", "Error", MB_OK );
 
-	}  // end else
+	}
 
 	return success;
 
-}  // end menuSave
+}
 
 // GUIEdit::menuSaveAs ========================================================
 /** file->saveAs menu option */
@@ -3767,17 +3753,17 @@ Bool GUIEdit::menuSaveAs( void )
 		// our contents are now considered "unchanged"
 		setUnsaved( FALSE );
 
-	}  // end if
+	}
 	else
 	{
-		
+
 		MessageBox( m_appHWnd, "Layout not saved!", "Error", MB_OK );
 
-	}  // end else
+	}
 
 	return success;
 
-}  // end menuSaveAs
+}
 
 // GUIEdit::menuCopy ==========================================================
 /** Copy selected windows into clipboard */
@@ -3791,21 +3777,21 @@ Bool GUIEdit::menuCopy( void )
 	if( select == NULL )
 	{
 
-		MessageBox( m_appHWnd, "You must have windows selected before you can copy them.", 
+		MessageBox( m_appHWnd, "You must have windows selected before you can copy them.",
 								"No Windows Selected", MB_OK );
 		return TRUE;
 
-	}  // end if
+	}
 
 	//
-	// cut the selected windows out of the current window system, and 
+	// cut the selected windows out of the current window system, and
 	// into the clipboard
 	//
 	TheGUIEditWindowManager->copySelectedToClipboard();
 
 	return TRUE;
 
-}  // end menuCopy
+}
 
 // GUIEdit::menuPaste =========================================================
 /** Paste contents of clipboard into current layout */
@@ -3816,7 +3802,7 @@ Bool GUIEdit::menuPaste( void )
 	TheGUIEditWindowManager->pasteClipboard();
 	return TRUE;
 
-}  // end menuPaste
+}
 
 // GUIEdit::menuCut ===========================================================
 /** Cut selected windows into the clipboard */
@@ -3830,21 +3816,21 @@ Bool GUIEdit::menuCut( void )
 	if( select == NULL )
 	{
 
-		MessageBox( m_appHWnd, "You must have windows selected before you can cut.", 
+		MessageBox( m_appHWnd, "You must have windows selected before you can cut.",
 								"No Windows Selected", MB_OK );
 		return TRUE;
 
-	}  // end if
+	}
 
 	//
-	// cut the selected windows out of the current window system, and 
+	// cut the selected windows out of the current window system, and
 	// into the clipboard
 	//
 	TheGUIEditWindowManager->cutSelectedToClipboard();
 
 	return TRUE;
 
-}  // end menuCut
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -3868,7 +3854,7 @@ Bool GUIEdit::isWindowSelected( GameWindow *window )
 	else
 		return FALSE;
 
-}  // end isWindowSelected
+}
 
 // GUIEdit::selectWindow ======================================================
 /** Add window to selection list */
@@ -3890,11 +3876,11 @@ void GUIEdit::selectWindow( GameWindow *window )
 	if( entry == NULL )
 	{
 
-		DEBUG_LOG(( "Unable to allocate selection entry for window\n" ));
+		DEBUG_LOG(( "Unable to allocate selection entry for window" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// fill out information and tie to head of list
 	entry->window = window;
@@ -3908,7 +3894,7 @@ void GUIEdit::selectWindow( GameWindow *window )
 	if( selectionCount() == 1 )
 		TheHierarchyView->selectWindow( window );
 
-}  // end selectWindow
+}
 
 // GUIEdit::unSelectWindow ====================================================
 /** Remove window from the selection list */
@@ -3937,9 +3923,9 @@ void GUIEdit::unSelectWindow( GameWindow *window )
 		// delete the entry
 		delete entry;
 
-	}  // end if
+	}
 
-}  // end unSelectWindow
+}
 
 // GUIEdit::clearSelections ===================================================
 /** Clear the entire selection list */
@@ -3950,7 +3936,7 @@ void GUIEdit::clearSelections( void )
 	while( m_selectList )
 		unSelectWindow( m_selectList->window );
 
-}  // end clearSelections
+}
 
 // GUIEdit::selectionCount ====================================================
 /** How many items are selected */
@@ -3967,11 +3953,11 @@ Int GUIEdit::selectionCount( void )
 		count++;
 		select = select->next;
 
-	}  // end while
+	}
 
 	return count;
 
-}  // end selectionCount
+}
 
 // GUIEdit::notifyNewWindow ===================================================
 /** The passed in window has just been added into the GUI layout.  It
@@ -4005,16 +3991,16 @@ void GUIEdit::notifyNewWindow( GameWindow *window )
 		for( child = window->winGetChild(); child; child = child->winGetNext() )
 			notifyNewWindow( child );
 
-	}  // end if
+	}
 
-}  // end notifyNewWindow
+}
 
 // GUIEdit::deleteSelected ====================================================
 /** Delete the windows in the selection list */
 //=============================================================================
 void GUIEdit::deleteSelected( void )
 {
-	Int count = TheEditor->selectionCount();
+	Int count = selectionCount();
 	Int i;
 	GameWindow **deleteList;
 	WindowSelectionEntry *select;
@@ -4028,12 +4014,12 @@ void GUIEdit::deleteSelected( void )
 	deleteList = new GameWindow *[ count ];
 	if( deleteList == NULL )
 	{
-	
-		DEBUG_LOG(( "Cannot allocate delete list!\n" ));
+
+		DEBUG_LOG(( "Cannot allocate delete list!" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// fill out the delete list
 	for( i = 0, select = m_selectList; i < count; i++, select = select->next )
@@ -4046,17 +4032,17 @@ void GUIEdit::deleteSelected( void )
 	// free memory for the delete list
 	delete [] deleteList;
 
-}  // end deleteSelected
+}
 
 // GUIEdit::bringSelectedToTop ================================================
 /** Bring the selected windows to the top so they draw on top of
-	* other windows.  For window with no parents this brings them to 
+	* other windows.  For window with no parents this brings them to
 	* the top of the window stack for all windows, for child windows it will
 	* bring them to the top of the child list for their parent */
 //=============================================================================
 void GUIEdit::bringSelectedToTop( void )
 {
-	Int count = TheEditor->selectionCount();
+	Int count = selectionCount();
 
 	// no-op
 	if( count == 0 )
@@ -4072,11 +4058,11 @@ void GUIEdit::bringSelectedToTop( void )
 	if( snapshot == NULL )
 	{
 
-		DEBUG_LOG(( "bringSelectedToTop: Unabled to allocate selectList\n" ));
+		DEBUG_LOG(( "bringSelectedToTop: Unabled to allocate selectList" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// take the snapshot
 	Int i;
@@ -4094,19 +4080,19 @@ void GUIEdit::bringSelectedToTop( void )
 		// update the hierarchy to have the new window on the top
 		TheHierarchyView->bringWindowToTop( snapshot[ i ] );
 
-	}  // end for i
+	}
 
 	// delete the snapshot list
 	delete [] snapshot;
 
-}  // end bringSelectedToTop
+}
 
 // GUIEdit::dragMoveSelectedWindows ===========================================
 /** Move all the windows in the selection list from a drag move, note
-	* that we are keeping the positions within the screen and parent 
+	* that we are keeping the positions within the screen and parent
 	* windows */
 //=============================================================================
-void GUIEdit::dragMoveSelectedWindows( ICoord2D *dragOrigin, 
+void GUIEdit::dragMoveSelectedWindows( ICoord2D *dragOrigin,
 																			 ICoord2D *dragDest )
 {
 	WindowSelectionEntry *select;
@@ -4132,22 +4118,22 @@ void GUIEdit::dragMoveSelectedWindows( ICoord2D *dragOrigin,
 		moveLoc.y = origin.y + (dragDest->y - dragOrigin->y);
 
 		// snap move location to grid if on
-		if( (TheEditor->getMode() == MODE_DRAG_MOVE) && TheEditor->isGridSnapOn() )
-			TheEditor->gridSnapLocation( &moveLoc, &moveLoc );
+		if( (getMode() == MODE_DRAG_MOVE) && isGridSnapOn() )
+			gridSnapLocation( &moveLoc, &moveLoc );
 
 		// kee the location legal
 		computeSafeLocation( window, moveLoc.x, moveLoc.y, &safeLoc.x, &safeLoc.y );
-		
+
 		// move the window
 		moveWindowTo( window, safeLoc.x, safeLoc.y );
 
 		// goto next selected window
 		select = select->next;
 
-	}  // end while
+	}
 
 
-}  // end dragMoveSelectedWindows
+}
 
 // GUIEdit::getSelectList =====================================================
 /** Return the selection list */
@@ -4157,7 +4143,7 @@ WindowSelectionEntry *GUIEdit::getSelectList( void )
 
 	return m_selectList;
 
-}  // end getSelectList
+}
 
 // GUIEdit::getFirstSelected ==================================================
 /** Get the first GameWindow * from the selection list */
@@ -4170,7 +4156,7 @@ GameWindow *GUIEdit::getFirstSelected( void )
 
 	return NULL;
 
-}  // end getFirstSelected
+}
 
 // GUIEdit::computeSafeLocation ===============================================
 /** If we attempt to move the window to the given (x,y) it may result
@@ -4217,8 +4203,8 @@ void GUIEdit::computeSafeLocation( GameWindow *window,
 		else if( region.hi.y + dy > parentSize.y )
 			dy = parentSize.y - region.hi.y;
 
-	}  // end else if, parent
-			
+	}
+
 	// Move the window, but keep it completely visible within screen boundaries
 	IRegion2D newRegion;
 	ICoord2D grabSize;
@@ -4248,7 +4234,7 @@ void GUIEdit::computeSafeLocation( GameWindow *window,
 	*safeX = newRegion.lo.x;
 	*safeY = newRegion.lo.y;
 
-}  // end computeSafeLocation
+}
 
 // GUIEdit::computeSafeSizeLocation ===========================================
 /** Like the method computeSafeLocation, this method also takes into
@@ -4274,7 +4260,7 @@ void GUIEdit::computeSafeSizeLocation( GameWindow *window,
 	ICoord2D parentSize;
 	ICoord2D topLeftLimit;
 	ICoord2D bottomRightLimit;
-		
+
 	// get parent window and data is present
 	parent = window->winGetParent();
 	if( parent )
@@ -4283,7 +4269,7 @@ void GUIEdit::computeSafeSizeLocation( GameWindow *window,
 		parent->winGetScreenPosition( &parentLoc.x, &parentLoc.y );
 		parent->winGetSize( &parentSize.x, &parentSize.y );
 
-	}  // end if
+	}
 
 	// upper left corner must be in screen or in parent
 	topLeftLimit.x = 0;  // screen top left
@@ -4311,7 +4297,7 @@ void GUIEdit::computeSafeSizeLocation( GameWindow *window,
 		bottomRightLimit.x = parentLoc.x + parentSize.x;
 		bottomRightLimit.y = parentLoc.y + parentSize.y;
 
-	}  // end if
+	}
 	if( newX + newWidth > bottomRightLimit.x )
 		newWidth = bottomRightLimit.x - newX;
 	if( newY + newHeight > bottomRightLimit.y )
@@ -4328,7 +4314,7 @@ void GUIEdit::computeSafeSizeLocation( GameWindow *window,
 		*safeY = *safeY - parentLoc.y;
 	}
 
-}  // end computeSafeSizeLocation
+}
 
 // GUIEdit::computeResizeLocation =============================================
 /** Given the current resize drag mode, the selected window to resize,
@@ -4338,7 +4324,7 @@ void GUIEdit::computeSafeSizeLocation( GameWindow *window,
 //=============================================================================
 void GUIEdit::computeResizeLocation( EditMode resizeMode,
 																		 GameWindow *window,
-																		 ICoord2D *resizeOrigin, 
+																		 ICoord2D *resizeOrigin,
 																		 ICoord2D *resizeDest,
 																		 ICoord2D *resultLoc,
 																		 ICoord2D *resultSize )
@@ -4372,7 +4358,7 @@ void GUIEdit::computeResizeLocation( EditMode resizeMode,
 			// bottom right is the anchor
 			newX = origin.x + (resizeDest->x - resizeOrigin->x);
 			newY = origin.y + (resizeDest->y - resizeOrigin->y);
-	
+
 			// don't let it become too small or inverted
 			if( newX >= bottomRight.x - sizeLimit )
 				newX = bottomRight.x - sizeLimit;
@@ -4395,7 +4381,7 @@ void GUIEdit::computeResizeLocation( EditMode resizeMode,
 			// don't let it become too small or inverted
 			if( newY >= bottomRight.y - sizeLimit )
 				newY = bottomRight.y - sizeLimit;
-	
+
 			// compute new size
 			newSizeX = resizeDest->x - origin.x;
 			newSizeY = (origin.y + size.y) - resizeDest->y;
@@ -4440,7 +4426,7 @@ void GUIEdit::computeResizeLocation( EditMode resizeMode,
 			// compute new size
 			newSizeX = bottomRight.x - newX;
 			newSizeY = resizeDest->y - origin.y;
-			
+
 			// don't let it go inverted
 			if( newSizeY < sizeLimit )
 				newSizeY = sizeLimit;
@@ -4470,7 +4456,7 @@ void GUIEdit::computeResizeLocation( EditMode resizeMode,
 			// left SIDE is the anchor
 			newX = origin.x;
 			newY = origin.y;
-			
+
 			// compute new size
 			newSizeX = resizeDest->x - origin.x;
 			newSizeY = size.y;
@@ -4500,7 +4486,7 @@ void GUIEdit::computeResizeLocation( EditMode resizeMode,
 
 		// ------------------------------------------------------------------------
 		case MODE_RESIZE_LEFT:
-			
+
 			// right SIDE is the anchor
 			newX = resizeDest->x;
 			newY = origin.y;
@@ -4515,19 +4501,19 @@ void GUIEdit::computeResizeLocation( EditMode resizeMode,
 
 			break;
 
-	}  // end switch( resizeMode )
+	}
 
 	// to finalize the size we must now clip to any parent or the screen
-	computeSafeSizeLocation( window, 
-													 newX, newY, 
+	computeSafeSizeLocation( window,
+													 newX, newY,
 													 newSizeX, newSizeY,
-													 &resultLoc->x, &resultLoc->y, 
+													 &resultLoc->x, &resultLoc->y,
 													 &resultSize->x, &resultSize->y );
 
-}  // end computeResizeLocation
+}
 
 // GUIEdit::moveWindowTo ======================================================
-/** Move the window passed into the the absolute position (x,y), 
+/** Move the window passed into the the absolute position (x,y),
 	* note that there is NO SAFE checking done on that position */
 //=============================================================================
 void GUIEdit::moveWindowTo( GameWindow *window, Int x, Int y )
@@ -4537,9 +4523,9 @@ void GUIEdit::moveWindowTo( GameWindow *window, Int x, Int y )
 	window->winSetPosition( x, y );
 
 	// we've now made a change
-	TheEditor->setUnsaved( TRUE );
+	setUnsaved( TRUE );
 
-}  // end moveWindowTo
+}
 
 // GUIEdit::windowIsGadget ====================================================
 /** Return TRUE if this window is one of our predefined gadtet types */
@@ -4553,7 +4539,7 @@ Bool GUIEdit::windowIsGadget( GameWindow *window )
 
 	return BitIsSet( window->winGetStyle(), GWS_GADGET_WINDOW );
 
-}  // end windowIsGadget
+}
 
 // GUIEdit::gridSnapLocation ==================================================
 /** Given the source input point, return in 'snapped' the closest grid
@@ -4569,7 +4555,7 @@ void GUIEdit::gridSnapLocation( ICoord2D *source, ICoord2D *snapped )
 	snapped->x = (source->x / m_gridResolution) * m_gridResolution;
 	snapped->y = (source->y / m_gridResolution) * m_gridResolution;
 
-}  // end gridSnapLocation
+}
 
 // GUIEdit::checkMenuItem =====================================================
 /** Check the menu item from the guiedit main menu */
@@ -4585,7 +4571,7 @@ void GUIEdit::checkMenuItem( Int item )
 	// check it
 	CheckMenuItem( menu, item, MF_CHECKED );
 
-}  // end checkMenuItem
+}
 
 // GUIEdit::unCheckMenuItem ===================================================
 /** Un-check the menu item from the guiedit main menu */
@@ -4601,7 +4587,7 @@ void GUIEdit::unCheckMenuItem( Int item )
 	// check it
 	CheckMenuItem( menu, item, MF_UNCHECKED );
 
-}  // end unCheckMenuItem
+}
 
 // GUIEdit::isNameDuplicate ===================================================
 /** Is the name passed in found as the name of any window in in the
@@ -4623,7 +4609,7 @@ Bool GUIEdit::isNameDuplicate( GameWindow *root, GameWindow *ignore, AsciiString
 	if( root != ignore )
 		if( instData->m_decoratedNameString == name )
 			return TRUE;  // no need to search anymore
-	
+
 	//You only call this on the first child since the call right after it will handle siblings (depth first)
 	GameWindow *child = root->winGetChild();
 	if( isNameDuplicate( child, ignore, name ) == TRUE )
@@ -4632,7 +4618,7 @@ Bool GUIEdit::isNameDuplicate( GameWindow *root, GameWindow *ignore, AsciiString
 	// check the next window in the list
 	return isNameDuplicate( root->winGetNext(), ignore, name );
 
-}  // end isNameDuplicate
+}
 
 // GUIEdit::loadGUIEditFontLibrary ============================================
 /** Load the set of fonts that we will make available to users in
@@ -4655,12 +4641,12 @@ void GUIEdit::loadGUIEditFontLibrary( FontLibrary *library )
 	library->getFont( times, 10, FALSE );
 	library->getFont( times, 10, TRUE );
 
-}  // end loadGUIEditFontLibrary
+}
 
 // GUIEdit::setShowHiddenOutlines =============================================
 //=============================================================================
 void GUIEdit::setShowHiddenOutlines( Bool show )
-{ 
+{
 
 	m_showHiddenOutlines = show;
 
@@ -4669,19 +4655,19 @@ void GUIEdit::setShowHiddenOutlines( Bool show )
 	else
 		CheckMenuItem( GetMenu( m_appHWnd ), MENU_SHOW_HIDDEN_OUTLINES, MF_UNCHECKED );
 
-}  // end setShowHiddenOutlines
+}
 
 // GUIEdit::setShowSeeThruOutlines ============================================
 //=============================================================================
 void GUIEdit::setShowSeeThruOutlines( Bool show )
-{ 
+{
 
-	m_showSeeThruOutlines = show; 
+	m_showSeeThruOutlines = show;
 
 	if( m_showSeeThruOutlines )
 		CheckMenuItem( GetMenu( m_appHWnd ), MENU_SHOW_SEE_THRU_OUTLINES, MF_CHECKED );
 	else
 		CheckMenuItem( GetMenu( m_appHWnd ), MENU_SHOW_SEE_THRU_OUTLINES, MF_UNCHECKED );
 
-}  // end setShowSeeThruOutlines
+}
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp
index 39373d414f6..e72b810841a 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp
@@ -24,21 +24,21 @@
 
 // FILE: .cpp /////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
 //
 // File name:  .cpp
 //
-// Created:    
+// Created:
 //
-// Desc:       
+// Desc:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
@@ -72,7 +72,7 @@
 GUIEditDisplay::GUIEditDisplay( void )
 {
 
-}  // end GUIEditDisplay
+}
 
 // GUIEditDisplay::~GUIEditDisplay ============================================
 /** */
@@ -80,39 +80,39 @@ GUIEditDisplay::GUIEditDisplay( void )
 GUIEditDisplay::~GUIEditDisplay( void )
 {
 
-}  // end ~GUIEditDisplay
+}
 
 // GUIEditDisplay::drawLine ===================================================
 /** draw a line on the display in pixel coordinates with the specified color */
 //=============================================================================
-void GUIEditDisplay::drawLine( Int startX, Int startY, 
-															 Int endX, Int endY, 
+void GUIEditDisplay::drawLine( Int startX, Int startY,
+															 Int endX, Int endY,
 															 Real lineWidth, UnsignedInt lineColor )
 {
 
 	TheEditWindow->drawLine( startX, startY, endX, endY, lineWidth, lineColor );
-	
-}  // end drawLIne
+
+}
 
 // GUIEditDisplay::drawOpenRect ===============================================
-/** draw a rect border on the display in pixel coordinates with the 
+/** draw a rect border on the display in pixel coordinates with the
 	* specified color */
 //=============================================================================
-void GUIEditDisplay::drawOpenRect( Int startX, Int startY, 
+void GUIEditDisplay::drawOpenRect( Int startX, Int startY,
 																	 Int width, Int height,
 																	 Real lineWidth, UnsignedInt lineColor )
 {
 
-	TheEditWindow->drawOpenRect( startX, startY, width, height, 
+	TheEditWindow->drawOpenRect( startX, startY, width, height,
 															 lineWidth, lineColor );
 
-}  // end drawOpenRect
+}
 
 // GUIEditDisplay::drawFillRect ===============================================
-/** draw a filled rect on the display in pixel coords with the 
+/** draw a filled rect on the display in pixel coords with the
 	* specified color */
 //=============================================================================
-void GUIEditDisplay::drawFillRect( Int startX, Int startY, 
+void GUIEditDisplay::drawFillRect( Int startX, Int startY,
 																	 Int width, Int height,
 																	 UnsignedInt color )
 {
@@ -121,24 +121,24 @@ void GUIEditDisplay::drawFillRect( Int startX, Int startY,
 															 width, height,
 															 color );
 
-}  // end drawFillRect
+}
 
 // GUIEditDisplay::drawImage ==================================================
 /** draw an image fit within the screen coordinates */
 //=============================================================================
-void GUIEditDisplay::drawImage( const Image *image, 
-																Int startX, Int startY, 
-																Int endX, Int endY, 
+void GUIEditDisplay::drawImage( const Image *image,
+																Int startX, Int startY,
+																Int endX, Int endY,
 																Color color, DrawImageMode mode )
 {
 
 	TheEditWindow->drawImage( image,
 														startX, startY,
-														endX, endY, 
+														endX, endY,
 														color );
 
 
-}  // end drawImage
+}
 
 // GUIEditDisplay::setClipRegion ==============================================
 /** sets clipping rectangle for 2D drawing operations */
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp
index 905de3fd8ac..efc03f66915 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp
@@ -33,7 +33,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include <stdlib.h>
-#include <stdio.h>
 
 #include "Common/Debug.h"
 #include "GameClient/GadgetSlider.h"
@@ -70,11 +69,11 @@ Bool GUIEditWindowManager::isWindowInClipboard( GameWindow *window,
 		if( window == other )
 			return TRUE;  // found
 
-	}  // end for window
+	}
 
 	return FALSE;  // not found
 
-}  // end isWindowInClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Add the window to clipboard list */
@@ -97,7 +96,7 @@ void GUIEditWindowManager::linkToClipboard( GameWindow *window,
 		(*list)->winSetPrev( window );
 	*list = window;
 
-}  // end linkToClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Unlink window from the clipboard list */
@@ -125,7 +124,7 @@ void GUIEditWindowManager::unlinkFromClipboard( GameWindow *window,
 	else
 		*list = next;
 
-}  // end unlinkFromClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove selection entries for child windows that also have ANY of
@@ -157,7 +156,7 @@ void GUIEditWindowManager::removeSupervisedChildSelections( void )
 				parentSelected = TRUE;
 			parent = parent->winGetParent();
 
-		}  // end while
+		}
 
 		//
 		// if there is a parent selected then we can remove this
@@ -166,9 +165,9 @@ void GUIEditWindowManager::removeSupervisedChildSelections( void )
 		if( parentSelected == TRUE )
 			TheEditor->unSelectWindow( window );
 
-	}  // end for select
+	}
 
-}  // end removeSupervisedChildSelections
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Traverse the selected window list, any child windows we encounter
@@ -184,7 +183,7 @@ void GUIEditWindowManager::orphanSelectedChildren( void )
 
 	for( select = TheEditor->getSelectList(); select; select = select->next )
 	{
-			
+
 		// get window information
 		window = select->window;
 		parent = window->winGetParent();
@@ -206,11 +205,11 @@ void GUIEditWindowManager::orphanSelectedChildren( void )
 			//
 			window->winSetPosition( pos.x, pos.y );
 
-		}  // end if, we had a parent
+		}
 
-	}  // end for select
+	}
 
-}  // end orphanSelectedChildren
+}
 */
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -228,7 +227,7 @@ GUIEditWindowManager::GUIEditWindowManager( void )
 	m_copySpacing = 8;
 	m_numCopiesPasted = 0;
 
-}  // end GUIEditWindowManager
+}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -241,7 +240,7 @@ GUIEditWindowManager::~GUIEditWindowManager( void )
 	// free all data on the clipboard
 	resetClipboard();
 
-}  // end ~GUIEditWindowManager
+}
 
 //-------------------------------------------------------------------------------------------------
 /** initialize the system */
@@ -252,7 +251,7 @@ void GUIEditWindowManager::init( void )
 	// extending functionality
 	W3DGameWindowManager::init();
 
-}  // end init
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Destroy a game window */
@@ -275,18 +274,18 @@ Int GUIEditWindowManager::winDestroy( GameWindow *window )
 		// set the edit data to NULL in the window
 		window->winSetEditData( NULL );
 
-	}  // end if
+	}
 
 	// call our base class functionality
 	return W3DGameWindowManager::winDestroy( window );
 
-}  // end winDestroy
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a new window by setting up its parameters and callbacks. */
 //-------------------------------------------------------------------------------------------------
-GameWindow *GUIEditWindowManager::winCreate( GameWindow *parent, 
-																						 UnsignedInt status, 
+GameWindow *GUIEditWindowManager::winCreate( GameWindow *parent,
+																						 UnsignedInt status,
 	 																				   Int x, Int y,
 																						 Int width, Int height,
 																						 GameWinSystemFunc system,
@@ -310,11 +309,11 @@ GameWindow *GUIEditWindowManager::winCreate( GameWindow *parent,
 		// attach edit data to window
 		window->winSetEditData( editData );
 
-	}  // end if
+	}
 
 	return window;
 
-}  // end winCreate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Destroy all windows in the clipboard */
@@ -346,7 +345,7 @@ void GUIEditWindowManager::resetClipboard( void )
 		//
 		winDestroy( window );
 
-	}  // end for window
+	}
 
 	// immediately process the destroyed windows just to be clean here
 	processDestroyList();
@@ -355,7 +354,7 @@ void GUIEditWindowManager::resetClipboard( void )
 	m_clipboard = NULL;
 	m_numCopiesPasted = 0;
 
-}  // end resetClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Is the clipboard empty */
@@ -368,7 +367,7 @@ Bool GUIEditWindowManager::isClipboardEmpty( void )
 
 	return FALSE;
 
-}  // end isClipboardEmtpy
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Remove the selected windows from the current layout and put them into
@@ -395,7 +394,7 @@ void GUIEditWindowManager::cutSelectedToClipboard( void )
 	if( m_clipboard )
 		TheEditor->deleteSelected();
 
-}  // end cutSelectedToClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Given the current window in a list pointed to by 'root', if that
@@ -424,7 +423,7 @@ void GUIEditWindowManager::duplicateSelected( GameWindow *root )
 			//
 			// if our source window had a parent, that means that the child
 			// was selected, but the parent wasn't.  Therefore the new
-			// duplicate has no parent, but needs to have its position 
+			// duplicate has no parent, but needs to have its position
 			// adjusted to be relative to the screen instead of the now
 			// missing parent
 			//
@@ -439,15 +438,15 @@ void GUIEditWindowManager::duplicateSelected( GameWindow *root )
 				pos.x += parentPos.x;
 				pos.y += parentPos.y;
 				duplicate->winSetPosition( pos.x, pos.y );
-				
-			}  // end if
+
+			}
 
 			// add window to the clipboard
 			linkToClipboard( duplicate, &m_clipboard );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 	else
 	{
 
@@ -457,12 +456,12 @@ void GUIEditWindowManager::duplicateSelected( GameWindow *root )
 		//
 		duplicateSelected( root->winGetChild() );
 
-	}  // end else
+	}
 
 	// move on to the next window
 	duplicateSelected( root->winGetNext() );
 
-}  // end duplicateSelected
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Copy the selected windows to the clipboard */
@@ -487,7 +486,7 @@ void GUIEditWindowManager::copySelectedToClipboard( void )
 	//
 	duplicateSelected( m_windowList );
 
-}  // end copySelectedToClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Take the string representation of the name of the window passed in,
@@ -502,7 +501,7 @@ void GUIEditWindowManager::incrementName( GameWindow *window )
 	// this I will botch it (cuz I'm currently not sure
 	// how to test it)
 	char name[MAX_WINDOW_NAME_LEN];
-	strcpy(name, instData->m_decoratedNameString.str());
+	strlcpy(name, instData->m_decoratedNameString.str(), ARRAY_SIZE(name));
 
 	Int len = strlen( name );
 	char numberBuffer[ MAX_WINDOW_NAME_LEN ];
@@ -514,11 +513,11 @@ void GUIEditWindowManager::incrementName( GameWindow *window )
 	// trivial case, just append a number to the end and get outta here
 	if( len == 0 )
 	{
-		
-		strcat( name, "1" );
+
+		strlcat(name, "1", ARRAY_SIZE(name));
 		goto cleanup;
 
-	}  // end if
+	}
 
 	//
 	// start from the end of the string and back up to the start picking
@@ -540,16 +539,16 @@ void GUIEditWindowManager::incrementName( GameWindow *window )
 			hasNumberSuffix = TRUE;
 			numberBuffer[ j-- ] = c;
 
-		}  // end if
+		}
 		else
 		{
-			
+
 			numberStartIndex = i + 1;
 			break;  // exit for i
 
-		}  // end else
+		}
 
-	}  // end for i
+	}
 
 	//
 	// if we have a number suffix change it to a number, increment it, and
@@ -577,24 +576,24 @@ void GUIEditWindowManager::incrementName( GameWindow *window )
 				name[ i + numberStartIndex ] = numberBuffer[ i ];
 				charsAdded++;
 
-			}  // end if
+			}
 		}
 		name[ numberStartIndex + charsAdded ] = 0;  // terminate at end of new string
 
-	}  // end if
+	}
 	else
 	{
 
 		// no number at end, easy ... just append a number '1'
-		strcat( name, "1" );
+		strlcat(name, "1", ARRAY_SIZE(name));
 
-	}  // end else
+	}
 
 cleanup:
 
 	instData->m_decoratedNameString = name;
 
-}  // end incrementName
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Validate the names for all the windows and child windows in the copy
@@ -644,9 +643,9 @@ void GUIEditWindowManager::validateClipboardNames( GameWindow *root )
 			MessageBox( TheEditor->getWindowHandle(), buffer, "Error Mapping Names", MB_OK );
 			nameOK = TRUE;
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	// validate our children names
 	GameWindow *child;
@@ -656,7 +655,7 @@ void GUIEditWindowManager::validateClipboardNames( GameWindow *root )
 	// validate the next window in the list
 	validateClipboardNames( root->winGetNext() );
 
-}  // end validateClipboardNames
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Paste the contents of the clipboard into the window world */
@@ -676,7 +675,7 @@ void GUIEditWindowManager::pasteClipboard( void )
 								MB_OK );
 		return;
 
-	}  // end if
+	}
 
 	// create a duplicate of everything in the clipboard
 	assert( m_clipboardDup == NULL );
@@ -727,7 +726,7 @@ void GUIEditWindowManager::pasteClipboard( void )
 		// notify the hierarchy of the new window added
 		TheHierarchyView->addWindow( window, HIERARCHY_ADD_AT_TOP );
 
-	}  // end for window
+	}
 
 	// the clipboard duplicate list is only for the act of pasting
 	assert( m_clipboardDup == NULL );
@@ -754,13 +753,13 @@ void GUIEditWindowManager::pasteClipboard( void )
 		// notify the editor that each of the windows was created
 		TheEditor->notifyNewWindow( window );
 
-	}  // end while
+	}
 
 	// if we did in fact paste a window then our file contents have changed
 	if( firstWindow )
 		TheEditor->setUnsaved( TRUE );
 
-}  // end pasteClipboard
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Convinience funtion to copy the Draw state info for a given instance */
@@ -817,7 +816,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 	if( BitIsSet( style, GWS_PUSH_BUTTON ) )
 	{
 
-		duplicate = 
+		duplicate =
 			TheWindowManager->gogoGadgetPushButton( parent,
 																							status,
 																							pos.x,
@@ -828,7 +827,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 																							source->winGetFont(),
 																							FALSE );
 
-	}  // end if
+	}
 	else if( BitIsSet( style, GWS_RADIO_BUTTON ) )
 	{
 		RadioButtonData *radioData = (RadioButtonData *)source->winGetUserData();
@@ -849,11 +848,11 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 																							 source->winGetFont(),
 																							 FALSE );
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_CHECK_BOX ) )
 	{
 
-		duplicate = 
+		duplicate =
 			TheWindowManager->gogoGadgetCheckbox( parent,
 																						status,
 																						pos.x,
@@ -864,7 +863,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 																						source->winGetFont(),
 																						FALSE );
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_HORZ_SLIDER | GWS_VERT_SLIDER ) )
 	{
 		SliderData *sliderData = (SliderData *)source->winGetUserData();
@@ -901,7 +900,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 
 				instData = thumb->winGetInstanceData();
 				sourceInstData = sourceThumb->winGetInstanceData();
-				
+
 				// do the copy of the colors for each state
 				memcpy( &instData->m_enabledDrawData,
 								&sourceInstData->m_enabledDrawData,
@@ -913,25 +912,25 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 								&sourceInstData->m_hiliteDrawData,
 								sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-			}  // end if
+			}
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_COMBO_BOX ) )
 	{
 		ComboBoxData *comboData = (ComboBoxData *)source->winGetUserData();
 		ComboBoxData comboDataCopy;
 
-		memset( &comboDataCopy, 0, sizeof( ComboBoxData ) );		
-		
+		memset( &comboDataCopy, 0, sizeof( ComboBoxData ) );
+
 		comboDataCopy.entryData = new EntryData;
 		memset ( comboDataCopy.entryData, 0, sizeof(EntryData));
 		comboDataCopy.listboxData = new ListboxData;
 		memset ( comboDataCopy.listboxData, 0, sizeof(ListboxData));
 
-	
-		
+
+
 		comboDataCopy.entryCount = comboData->entryCount;
 		comboDataCopy.isEditable = comboData->isEditable;
 		comboDataCopy.maxChars = comboData->maxChars;
@@ -954,10 +953,10 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 		comboDataCopy.entryData->aSCIIOnly = comboData->entryData->aSCIIOnly;
 		comboDataCopy.entryData->maxTextLen = comboData->entryData->maxTextLen;
 		comboDataCopy.entryData->numericalOnly = comboData->entryData->numericalOnly;
-		
-		
 
-		duplicate = 
+
+
+		duplicate =
 			TheWindowManager->gogoGadgetComboBox( parent,
 																					 status,
 																					 pos.x,
@@ -979,7 +978,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 			ComboBoxData *sourceComboData = (ComboBoxData *)source->winGetUserData();
 			WinInstanceData *instData;
 			WinInstanceData *sourceInstData;
-			
+
 
 			// drop down button
 			GameWindow *dropDownButton = comboData->dropDownButton;
@@ -989,7 +988,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 				instData = dropDownButton->winGetInstanceData();
 				sourceInstData = sourceDropDownButton->winGetInstanceData();
 
-				InstDrawCopy(instData,sourceInstData);			
+				InstDrawCopy(instData,sourceInstData);
 			}
 
 			// edit box
@@ -1000,9 +999,9 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 				instData = editBox->winGetInstanceData();
 				sourceInstData = sourceEditBox->winGetInstanceData();
 
-				InstDrawCopy(instData,sourceInstData);			
+				InstDrawCopy(instData,sourceInstData);
 			}
-			
+
 			// ListBox
 			GameWindow *listBox = comboData->listBox;
 			GameWindow *sourceListBox = sourceComboData->listBox;
@@ -1011,17 +1010,17 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 				instData = listBox->winGetInstanceData();
 				sourceInstData = sourceListBox->winGetInstanceData();
 
-				InstDrawCopy(instData,sourceInstData);			
-				
+				InstDrawCopy(instData,sourceInstData);
+
 				// up button
 				GameWindow *upButton = comboData->listboxData->upButton;
 				GameWindow *sourceUpButton = sourceComboData->listboxData->upButton;
 				if( upButton && sourceUpButton )
 				{
-				
+
 					instData = upButton->winGetInstanceData();
 					sourceInstData = sourceUpButton->winGetInstanceData();
-					
+
 					// do the copy of the colors for each state
 					memcpy( &instData->m_enabledDrawData,
 									&sourceInstData->m_enabledDrawData,
@@ -1033,17 +1032,17 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 									&sourceInstData->m_hiliteDrawData,
 									sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-				}  // if
+				}
 
 				// down button
 				GameWindow *downButton = comboData->listboxData->downButton;
 				GameWindow *sourceDownButton = sourceComboData->listboxData->downButton;
 				if( downButton && sourceDownButton )
 				{
-				
+
 					instData = downButton->winGetInstanceData();
 					sourceInstData = sourceDownButton->winGetInstanceData();
-					
+
 					// do the copy of the colors for each state
 					memcpy( &instData->m_enabledDrawData,
 									&sourceInstData->m_enabledDrawData,
@@ -1055,17 +1054,17 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 									&sourceInstData->m_hiliteDrawData,
 									sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-				}  // if
+				}
 
 				// slider
 				GameWindow *slider = comboData->listboxData->slider;
 				GameWindow *sourceSlider = sourceComboData->listboxData->slider;
 				if( slider && sourceSlider )
 				{
-				
+
 					instData = slider->winGetInstanceData();
 					sourceInstData = sourceSlider->winGetInstanceData();
-					
+
 					// do the copy of the colors for each state
 					memcpy( &instData->m_enabledDrawData,
 									&sourceInstData->m_enabledDrawData,
@@ -1085,7 +1084,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 
 						instData = thumb->winGetInstanceData();
 						sourceInstData = sourceThumb->winGetInstanceData();
-						
+
 					// do the copy of the colors for each state
 					memcpy( &instData->m_enabledDrawData,
 									&sourceInstData->m_enabledDrawData,
@@ -1097,15 +1096,15 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 									&sourceInstData->m_hiliteDrawData,
 									sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-					}  // end if
+					}
 
-				}  // if
+				}
 
-			} // if
+			}
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_SCROLL_LISTBOX ) )
 	{
 		ListboxData *listData = (ListboxData *)source->winGetUserData();
@@ -1142,7 +1141,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 		else
 			listDataCopy.columnWidthPercentage = NULL;
 
-		duplicate = 
+		duplicate =
 			TheWindowManager->gogoGadgetListBox( parent,
 																					 status,
 																					 pos.x,
@@ -1170,10 +1169,10 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 			GameWindow *sourceUpButton = sourceListData->upButton;
 			if( upButton && sourceUpButton )
 			{
-			
+
 				instData = upButton->winGetInstanceData();
 				sourceInstData = sourceUpButton->winGetInstanceData();
-				
+
 				// do the copy of the colors for each state
 				memcpy( &instData->m_enabledDrawData,
 								&sourceInstData->m_enabledDrawData,
@@ -1185,17 +1184,17 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 								&sourceInstData->m_hiliteDrawData,
 								sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-			}  // if
+			}
 
 			// down button
 			GameWindow *downButton = listData->downButton;
 			GameWindow *sourceDownButton = sourceListData->downButton;
 			if( downButton && sourceDownButton )
 			{
-			
+
 				instData = downButton->winGetInstanceData();
 				sourceInstData = sourceDownButton->winGetInstanceData();
-				
+
 				// do the copy of the colors for each state
 				memcpy( &instData->m_enabledDrawData,
 								&sourceInstData->m_enabledDrawData,
@@ -1207,17 +1206,17 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 								&sourceInstData->m_hiliteDrawData,
 								sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-			}  // if
+			}
 
 			// slider
 			GameWindow *slider = listData->slider;
 			GameWindow *sourceSlider = sourceListData->slider;
 			if( slider && sourceSlider )
 			{
-			
+
 				instData = slider->winGetInstanceData();
 				sourceInstData = sourceSlider->winGetInstanceData();
-				
+
 				// do the copy of the colors for each state
 				memcpy( &instData->m_enabledDrawData,
 								&sourceInstData->m_enabledDrawData,
@@ -1237,7 +1236,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 
 					instData = thumb->winGetInstanceData();
 					sourceInstData = sourceThumb->winGetInstanceData();
-					
+
 				// do the copy of the colors for each state
 				memcpy( &instData->m_enabledDrawData,
 								&sourceInstData->m_enabledDrawData,
@@ -1249,13 +1248,13 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 								&sourceInstData->m_hiliteDrawData,
 								sizeof( WinDrawData ) * MAX_DRAW_DATA );
 
-				}  // end if
+				}
 
-			}  // if
+			}
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_ENTRY_FIELD ) )
 	{
 		EntryData *entryData = (EntryData *)source->winGetUserData();
@@ -1268,7 +1267,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 		entryDataCopy.numericalOnly = entryData->numericalOnly;
 		entryDataCopy.secretText = entryData->secretText;
 
-		duplicate = 
+		duplicate =
 			TheWindowManager->gogoGadgetTextEntry( parent,
 																						 status,
 																						 pos.x,
@@ -1280,7 +1279,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 																						 source->winGetFont(),
 																						 FALSE );
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_STATIC_TEXT ) )
 	{
 		TextData *textData = (TextData *)source->winGetUserData();
@@ -1288,7 +1287,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 
 		textDataCopy.centered = textData->centered;
 
-		duplicate = 
+		duplicate =
 			TheWindowManager->gogoGadgetStaticText( parent,
 																							status,
 																							pos.x,
@@ -1300,22 +1299,22 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 																							source->winGetFont(),
 																							FALSE );
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_PROGRESS_BAR ) )
 	{
-		
-		duplicate = 
+
+		duplicate =
 			TheWindowManager->gogoGadgetProgressBar( parent,
 																							 status,
 																							 pos.x,
 																							 pos.y,
 																							 size.x,
 																							 size.y,
-																							 &instDataCopy, 
+																							 &instDataCopy,
 																							 source->winGetFont(),
 																							 FALSE );
 
-	}  // end else if
+	}
 	else if( BitIsSet( style, GWS_USER_WINDOW ) )
 	{
 
@@ -1329,35 +1328,35 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 																						 NULL,
 																						 &instDataCopy );
 
-	}  // end else if
+	}
 	else
 	{
 
-		MessageBox( TheEditor->getWindowHandle(), 
-								"Cannot duplicate window, undefined style.", 
+		MessageBox( TheEditor->getWindowHandle(),
+								"Cannot duplicate window, undefined style.",
 								"Internal Error", MB_OK );
 		assert( 0 );
 		memset( &instDataCopy, 0, sizeof( instDataCopy ) );  // see comment below
 		return NULL;
 
-	}  // end else
+	}
 
 	// sanity
 	if( duplicate == NULL )
 	{
 
-		MessageBox( TheEditor->getWindowHandle(), "Unable to duplicate window", 
+		MessageBox( TheEditor->getWindowHandle(), "Unable to duplicate window",
 								"Internal Error", MB_OK );
 		assert( 0 );
 		memset( &instDataCopy, 0, sizeof( instDataCopy ) );  // see comment below
 		return NULL;
 
-	}  // end if
+	}
 
 	//
 	// since we're using the real window system here to create things, we
 	// want to immediately remove it from the real system list cause we're
-	// not adding windows to the layout, only duplicating windows in 
+	// not adding windows to the layout, only duplicating windows in
 	// isolation.  Note that child windows are linked to their parents
 	// but that is totally isolated in the parent so that's OK and
 	// necessary.
@@ -1376,7 +1375,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 			*editData = *sourceEditData;
 //			memcpy( editData, sourceEditData, sizeof( GameWindowEditData ) );
 
-	}  // end if
+	}
 
 	//
 	// duplicate all the children for the window, except if this window
@@ -1391,7 +1390,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 		for( child = source->winGetChild(); child; child = child->winGetNext() )
 			duplicateWindow( child, duplicate );
 
-	}  // end if
+	}
 
 	//
 	// the inst data copy was literally a copy, now it's going to go out of
@@ -1403,7 +1402,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source,
 	// return the duped window
 	return duplicate;
 
-}  // end duplicateWindow
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Create a duplicate everything on the clipboard list and put it
@@ -1435,9 +1434,9 @@ void GUIEditWindowManager::createClipboardDuplicate( void )
 		if( duplicate )
 			linkToClipboard( duplicate, &m_clipboardDup );
 
-	}  // end for
+	}
 
-}  // end createClipboardDuplicate
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Make the 'target' a child of the 'parent' */
@@ -1473,7 +1472,7 @@ void GUIEditWindowManager::makeChildOf( GameWindow *target,
 		target->winSetPosition( screenPos.x, screenPos.y );
 		return;
 
-	}  // end if
+	}
 
 	// check to see if this is already out parent, nothing to do
 	if( prevParent == parent )
@@ -1489,7 +1488,7 @@ void GUIEditWindowManager::makeChildOf( GameWindow *target,
 								MB_OK );
 		return;
 
-	}  // end if
+	}
 
 	// get the target screen position before the move to child
 	ICoord2D screenPosBeforeMove;
@@ -1522,19 +1521,19 @@ void GUIEditWindowManager::makeChildOf( GameWindow *target,
 	target->winGetScreenPosition( &origin.x, &origin.y );
 
 	// kee the location legal
-	TheEditor->computeSafeLocation( target, origin.x, origin.y, 
+	TheEditor->computeSafeLocation( target, origin.x, origin.y,
 																	&safeLoc.x, &safeLoc.y );
-	
+
 	// move the target
 	TheEditor->moveWindowTo( target, safeLoc.x, safeLoc.y );
-	
-}  // end makeChildOf
+
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Move the 'windowToMove' to be just in front of the 'aheadOf' window
 	* in either the master window list or in the child list */
 //-------------------------------------------------------------------------------------------------
-void GUIEditWindowManager::moveAheadOf( GameWindow *windowToMove, 
+void GUIEditWindowManager::moveAheadOf( GameWindow *windowToMove,
 																				GameWindow *aheadOf )
 {
 
@@ -1547,7 +1546,7 @@ void GUIEditWindowManager::moveAheadOf( GameWindow *windowToMove,
 	// same place after we're moved
 	//
 	ICoord2D beforeMoveScreenPos;
-	windowToMove->winGetScreenPosition( &beforeMoveScreenPos.x, 
+	windowToMove->winGetScreenPosition( &beforeMoveScreenPos.x,
 																			&beforeMoveScreenPos.y );
 
 	// get the parent of that which we are moving
@@ -1570,14 +1569,14 @@ void GUIEditWindowManager::moveAheadOf( GameWindow *windowToMove,
 		//
 		windowToMove->winSetPosition( pos.x, pos.y );
 
-	}  // end if
+	}
 	else
 	{
 
 		// just take off the main list
 		unlinkWindow( windowToMove );
-	
-	}  // end else
+
+	}
 
 	// insert the window at the specified location
 	insertWindowAheadOf( windowToMove, aheadOf );
@@ -1607,11 +1606,11 @@ void GUIEditWindowManager::moveAheadOf( GameWindow *windowToMove,
 	windowToMove->winGetScreenPosition( &origin.x, &origin.y );
 
 	// kee the location legal
-	TheEditor->computeSafeLocation( windowToMove, origin.x, origin.y, 
+	TheEditor->computeSafeLocation( windowToMove, origin.x, origin.y,
 																	&safeLoc.x, &safeLoc.y );
-	
+
 	// move the target
 	TheEditor->moveWindowTo( windowToMove, safeLoc.x, safeLoc.y );
 
-}  // end moveAheadOf
+}
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/HierarchyView.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/HierarchyView.cpp
index a25e7d1ce46..98648b24f23 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/HierarchyView.cpp
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/HierarchyView.cpp
@@ -24,12 +24,12 @@
 
 // FILE: HierarchyView.cpp ////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -46,7 +46,6 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <windows.h>
 #include <commctrl.h>
-#include <string.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
@@ -94,7 +93,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
  		{
 // 			Int x = LOWORD( lParam );
 // 			Int y = HIWORD( lParam );
- 
+
  			// record our position
  			RECT rect;
  			POINT p;
@@ -104,11 +103,11 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
  			ScreenToClient( TheEditor->getWindowHandle(), &p );
  			dialogPos.x = p.x;
  			dialogPos.y = p.y;
- 
+
  			return 0;
- 
- 		}  // end move
- 
+
+ 		}
+
 		// ------------------------------------------------------------------------
 		case WM_SIZE:
 		{
@@ -137,17 +136,17 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 					p.x = treeRect.left;
 					p.y = treeRect.top;
 					ScreenToClient( hWndDialog, &p );
-					MoveWindow( tree, border, p.y, 
-											width - (border * 2), (height - border) - p.y, 
+					MoveWindow( tree, border, p.y,
+											width - (border * 2), (height - border) - p.y,
 											TRUE );
 
-				}  // end if
+				}
+
+			}
 
-			}  // end if
-						
 			return 0;
 
-		}  // end size
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_MOUSEMOVE:
@@ -183,7 +182,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 					TreeView_SelectItem( TheHierarchyView->getTreeHandle(), overItem );
 
 					//
-					// if this operation is legal set the cross cursor, otherwise 
+					// if this operation is legal set the cross cursor, otherwise
 					// use the "no" cursor
 					//
 					if( TheHierarchyView->validateDragDropOperation( dragWindow, target ) )
@@ -191,13 +190,13 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 					else
 						SetCursor( LoadCursor( NULL, IDC_NO ) );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
 			return 0;
 
-		}  // end mouse move
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_LBUTTONUP:
@@ -235,7 +234,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 					assert( overWindow );
 
 					// do the drag drop if allowed
-					if( TheHierarchyView->validateDragDropOperation( dragWindow, 
+					if( TheHierarchyView->validateDragDropOperation( dragWindow,
 																													 overWindow ) )
 					{
 
@@ -270,21 +269,21 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 							clearDragWindow = FALSE;
 							TheHierarchyView->setPopupTarget( overWindow );
 
-						}  // end if
+						}
 						else
 						{
 
 							// our only option is to move the window here
 							TheGUIEditWindowManager->moveAheadOf( dragWindow, overWindow );
 
-						}  // end else
+						}
 
 						// we've made a change now
 						TheEditor->setUnsaved( TRUE );
 
-					}  // end if
+					}
 
-				}  // end if
+				}
 
 				// window has been dragged and operation complete
 				if( clearDragWindow )
@@ -293,7 +292,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 					TheHierarchyView->setDragWindow( NULL );
 					TheHierarchyView->setDragTarget( NULL );
 
-				}  // end if
+				}
 
 				// release window capture
 				ReleaseCapture();
@@ -301,11 +300,11 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 				// set the cursor back to normal
 				SetCursor( LoadCursor( NULL, IDC_ARROW ) );
 
-			}  // end if, drag in progress
+			}
 
 			return 0;
 
-		}  // end left button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_RBUTTONUP:
@@ -325,7 +324,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 			if( overItem )
 			{
 				GameWindow *overWindow;
-				
+
 				// get the game window from the tree item
 				overWindow = TheHierarchyView->getWindowFromItem( overItem );
 
@@ -351,12 +350,12 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 				screen.y = y;
 				ClientToScreen( hWndDialog, &screen );
 				TrackPopupMenuEx( subMenu, 0, screen.x, screen.y, hWndDialog, NULL );
-				
-			}  // end if
+
+			}
 
 			return 0;
 
-		}  // end right button up
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_NOTIFY:
@@ -371,11 +370,11 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 				// --------------------------------------------------------------------
 				case TREE_HIERARCHY:
 				{
-				
+
 					// switch on notify code for the tree
 					switch( notifyMessageHandler->code )
 					{
-						
+
 						// ----------------------------------------------------------------
 						case TVN_SELCHANGED:
 						{
@@ -395,23 +394,23 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 								TheEditor->clearSelections();
 								if( window )
 									TheEditor->selectWindow( window );
-			
-							}  // end if
+
+							}
 
 							break;
 
-						}  // end selection changed
+						}
 
 						// ----------------------------------------------------------------
 						case NM_DBLCLK:
 						{
-							
+
 							// get the selected tree item
 							HTREEITEM selected = TreeView_GetSelection( TheHierarchyView->getTreeHandle() );
 							if( selected )
 							{
 								GameWindow *overWindow;
-								
+
 								// get the game window from the tree item
 								overWindow = TheHierarchyView->getWindowFromItem( selected );
 
@@ -434,13 +433,13 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 								menu = LoadMenu( TheEditor->getInstance(), (LPCTSTR)HIERARCHY_POPUP_MENU );
 								subMenu = GetSubMenu( menu, 0 );
 								GetCursorPos( &screen );
-								TrackPopupMenuEx( subMenu, 0, screen.x, screen.y, hWndDialog, NULL );								
+								TrackPopupMenuEx( subMenu, 0, screen.x, screen.y, hWndDialog, NULL );
 
-							}  // end if
+							}
 
 							break;
 
-						}  // end double click
+						}
 
 						// ----------------------------------------------------------------
 						case TVN_BEGINDRAG:
@@ -450,7 +449,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 
 							// get the item being dragged
 							newItem = treeNotify->itemNew;
-							
+
 							// save the window being dragged
 							TheHierarchyView->setDragWindow( (GameWindow *)newItem.lParam );
 							TheHierarchyView->setDragTarget( NULL );
@@ -460,17 +459,17 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 
 							break;
 
-						}  // end begin left mouse drag
+						}
 
-					}  // end switch
+					}
 
-				}  // end hierarchy
+				}
 
-			}  // end switch
+			}
 
 			return 0;
 
-		}  // end notify
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -499,7 +498,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end hierarchy move window in heirarchy
+				}
 
 				// --------------------------------------------------------------------
 				case HIERARCHY_MAKE_CHILD_HERE:
@@ -518,7 +517,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end hierarchy, make child of
+				}
 
 				// --------------------------------------------------------------------
 				case HIERARCHY_POPUP_MOVE:
@@ -545,7 +544,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end move
+				}
 
 				// --------------------------------------------------------------------
 				case HIERARCHY_POPUP_DELETE:
@@ -557,7 +556,7 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 
 					break;
 
-				}  // end delete
+				}
 
 				// --------------------------------------------------------------------
 				case HIERARCHY_POPUP_PROPERTIES:
@@ -572,11 +571,11 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
 						ScreenToClient( TheEditWindow->getWindowHandle(), &p );
 						InitPropertiesDialog( target, p.x, p.y );
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end properties
+				}
 
 				// --------------------------------------------------------------------
         case IDOK:
@@ -586,19 +585,19 @@ LRESULT CALLBACK HierarchyView::dialogProc( HWND hWndDialog, UINT message,
         case IDCANCEL:
           break;
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       return 0;
 
-    } // end of WM_COMMAND
+    }
 
 		// ------------------------------------------------------------------------
 		default:
 			return 0;
 
-  }  // end of switch
+  }
 
-}  // end dialogProc
+}
 
 // HierarchyView::findItemEntry ===============================================
 /** Workhorse to find the tree item anywhere in the tree with the
@@ -637,14 +636,14 @@ HTREEITEM HierarchyView::findItemEntry( HTREEITEM node, GameWindow *window )
 		if( found )
 			return found;
 
-	}  // end if
+	}
 
 	// not there, check the siblings
-	return findItemEntry( TreeView_GetNextItem( m_tree, node, TVGN_NEXT ), 
+	return findItemEntry( TreeView_GetNextItem( m_tree, node, TVGN_NEXT ),
 												window );
 #endif
 
-}  // end findItemEntry
+}
 
 // HierarchyView::findTreeEntry ===============================================
 /** Find the game window entry in the hierarchy tree, if found the
@@ -652,15 +651,15 @@ HTREEITEM HierarchyView::findItemEntry( HTREEITEM node, GameWindow *window )
 //=============================================================================
 HTREEITEM HierarchyView::findTreeEntry( GameWindow *window )
 {
-	
+
 	// no-op
 	if( window == NULL )
 		return NULL;
-		
+
 	// get root and search from there
 	return findItemEntry( TreeView_GetRoot( m_tree ), window );
 
-}  // end findTreeEntry
+}
 
 // HierarchyView::addWindowToTree =============================================
 /** Add a single window to the hierarchy tree */
@@ -705,17 +704,17 @@ void HierarchyView::addWindowToTree( GameWindow *window,
 		if( newItem == NULL )
 		{
 
-			DEBUG_LOG(( "Error adding window to tree\n" ));
+			DEBUG_LOG(( "Error adding window to tree" ));
 			assert( 0 );
 			return;
 
-		}  // end if
+		}
 
 #if USE_FAST_FIND_ITEM
 		m_treeHash[window] = newItem;
 #endif
 
-	}  // end if, not in already
+	}
 
 	//
 	// add children if requested, but not on gadgets no matter what becuase
@@ -728,14 +727,14 @@ void HierarchyView::addWindowToTree( GameWindow *window,
 		for( child = window->winGetChild(); child; child = child->winGetNext() )
 			addWindowToTree( child, newItem, HIERARCHY_ADD_AT_BOTTOM, TRUE, TRUE );
 
-	}  // end if
+	}
 
 	// add siblings if requested
 	if( addSiblings )
-		addWindowToTree( window->winGetNext(), treeParent, option, 
+		addWindowToTree( window->winGetNext(), treeParent, option,
 										 addChildren, addSiblings );
 
-}  // end addWindowToTree
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -755,7 +754,7 @@ HierarchyView::HierarchyView( void )
 	m_dragTarget = NULL;
 	m_popupTarget = NULL;
 
-}  // end HierarchyView
+}
 
 // HierarchyView::~HierarchyView ==============================================
 /** */
@@ -766,7 +765,7 @@ HierarchyView::~HierarchyView( void )
 	// call the shutdown
 	shutdown();
 
-}  // end ~HierarchyView
+}
 
 // HierarchyView::init =========================================================
 /** Create the control palette */
@@ -779,9 +778,9 @@ void HierarchyView::init( void )
 	// create the modless dialog box
 	m_dialog = CreateDialog( TheEditor->getInstance(),
 													 (LPCSTR)HIERARCHY_DIALOG,
-													 TheEditor->getWindowHandle(), 
+													 TheEditor->getWindowHandle(),
 													 (DLGPROC)dialogProc );
-	
+
 	// display the dialog
 	ShowWindow( m_dialog, SW_SHOW );
 
@@ -809,7 +808,7 @@ void HierarchyView::init( void )
 	// keep a handle to the tree
 	m_tree = GetDlgItem( m_dialog, TREE_HIERARCHY );
 
-}  // end init
+}
 
 // HierarchyView::reset =======================================================
 /** Reset everything about our hierarchy view */
@@ -825,7 +824,7 @@ void HierarchyView::reset( void )
  	m_treeHash.clear();
 #endif
 
-}  // end reset
+}
 
 // HierarchyView::shutdown ====================================================
 /** Destroy the control palette and all data associated with it */
@@ -838,7 +837,7 @@ void HierarchyView::shutdown( void )
 	m_dialog = NULL;
 	m_tree = NULL;
 
-}  // end shutdown
+}
 
 // HierarchyView::getWindowTreeName ===========================================
 /** Given a window, return a string representation for that window in
@@ -875,7 +874,7 @@ char *HierarchyView::getWindowTreeName( GameWindow *window )
 		strcpy( buffer, "Text Entry" );
 	else if( BitIsSet( style, GWS_SCROLL_LISTBOX ) )
 		strcpy( buffer, "Listbox" );
-	else if( BitIsSet( style, GWS_PROGRESS_BAR ) )	
+	else if( BitIsSet( style, GWS_PROGRESS_BAR ) )
 		strcpy( buffer, "Progress Bar" );
 	else if( BitIsSet( style, GWS_USER_WINDOW ) )
 		strcpy( buffer, "User Window" );
@@ -891,21 +890,21 @@ char *HierarchyView::getWindowTreeName( GameWindow *window )
 	if( !instData->m_decoratedNameString.isEmpty() )
 	{
 
-		strcat( buffer, ": " );
-		strcat( buffer, instData->m_decoratedNameString.str() );
+		strlcat(buffer, ": ", ARRAY_SIZE(buffer));
+		strlcat(buffer, instData->m_decoratedNameString.str(), ARRAY_SIZE(buffer));
 
-	}  // end if
+	}
 
 	return buffer;
 
-}  // end getWindowTreeName
+}
 
 // HierarchyView::addWindow ===================================================
 /** Add a window to the hierarchy view AND any of it's children */
 //=============================================================================
 void HierarchyView::addWindow( GameWindow *window, HierarchyOption option )
 {
-	
+
 	// sanity
 	if( window == NULL || m_dialog == NULL )
 		return;
@@ -927,7 +926,7 @@ void HierarchyView::addWindow( GameWindow *window, HierarchyOption option )
 	//
 	InvalidateRect( m_tree, NULL, TRUE );
 
-}  // end addWindow
+}
 
 // HierarchyView::removeWindow ================================================
 /** Remove the window from the hierarchy tree view */
@@ -968,7 +967,7 @@ void HierarchyView::removeWindow( GameWindow *window )
  		m_treeHash.erase(find);
  	#endif
 
-}  // end removeWindow
+}
 
 // HierarchyView::bringWindowToTop ============================================
 /** Bring the window to the top of its parent list in the hierarchy
@@ -986,11 +985,11 @@ void HierarchyView::bringWindowToTop( GameWindow *window )
 	if( item == NULL )
 	{
 
-		DEBUG_LOG(( "Cannot bring window to top, no entry in tree!\n" ));
+		DEBUG_LOG(( "Cannot bring window to top, no entry in tree!" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// remove the entry from the tree
 	removeWindow( window );
@@ -1001,7 +1000,7 @@ void HierarchyView::bringWindowToTop( GameWindow *window )
 	// add the window as a child of the parent entry at the top of it's list
 	addWindowToTree( window, itemParent, HIERARCHY_ADD_AT_TOP, TRUE, FALSE );
 
-}  // end bringWindowToTop
+}
 
 // HierarchyView::updateWindowName ============================================
 /** A window name may have been updated, reconstruct its hierarchy
@@ -1019,11 +1018,11 @@ void HierarchyView::updateWindowName( GameWindow *window )
 	if( item == NULL )
 	{
 
-		DEBUG_LOG(( "updateWindowName: No hierarchy entry for window!\n" ));
+		DEBUG_LOG(( "updateWindowName: No hierarchy entry for window!" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// setup the item to modify in the tree
 	TVITEM modify;
@@ -1034,7 +1033,7 @@ void HierarchyView::updateWindowName( GameWindow *window )
 	// modify the item
 	TreeView_SetItem( m_tree, &modify );
 
-}  // end updateWindowName
+}
 
 // HierarchyView::getDialogPos ================================================
 /** Get the dialog position as recorded from the static */
@@ -1048,7 +1047,7 @@ void HierarchyView::getDialogPos( ICoord2D *pos )
 
 	*pos = dialogPos;
 
-}  // end getDialogPos
+}
 
 // HierarchyView::getDialogSize ===============================================
 /** Get the dialog size as recorded from the static */
@@ -1062,7 +1061,7 @@ void HierarchyView::getDialogSize( ICoord2D *size )
 
 	*size = dialogSize;
 
-}  // end getDialogSize
+}
 
 // HierarchyView::setDialogPos ================================================
 /** */
@@ -1074,10 +1073,10 @@ void HierarchyView::setDialogPos( ICoord2D *pos )
 	if( pos )
 		dialogPos = *pos;
 
-	MoveWindow( m_dialog, dialogPos.x, dialogPos.y, 
+	MoveWindow( m_dialog, dialogPos.x, dialogPos.y,
 							dialogSize.x, dialogSize.y, TRUE );
 
-}  // end setDialogPos
+}
 
 // HierarchyView::setDialogSize ===============================================
 /** */
@@ -1089,16 +1088,16 @@ void HierarchyView::setDialogSize( ICoord2D *size )
 	if( size )
 		dialogSize = *size;
 
-	MoveWindow( m_dialog, dialogPos.x, dialogPos.y, 
+	MoveWindow( m_dialog, dialogPos.x, dialogPos.y,
 							dialogSize.x, dialogSize.y, TRUE );
 
-}  // end setDialogSize
+}
 
 // HierarchyView::moveWindowAheadOf ===========================================
 /** Move the window hierarchy representation to be just ahead of the
 	* hierarchy entry of 'aheadOf' */
 //=============================================================================
-void HierarchyView::moveWindowAheadOf( GameWindow *window, 
+void HierarchyView::moveWindowAheadOf( GameWindow *window,
 																			 GameWindow *aheadOf )
 {
 
@@ -1116,18 +1115,18 @@ void HierarchyView::moveWindowAheadOf( GameWindow *window,
 		addWindow( window, HIERARCHY_ADD_AT_TOP );
 		return;
 
-	}  // end if
+	}
 
 	// get the hierarchy item of the aheadOf window
 	HTREEITEM aheadOfItem = findTreeEntry( aheadOf );
 	if( aheadOfItem == NULL )
 	{
 
-		DEBUG_LOG(( "moveWindowAheadOf: aheadOf has no hierarchy entry!\n" ));
+		DEBUG_LOG(( "moveWindowAheadOf: aheadOf has no hierarchy entry!" ));
 		assert( 0 );
 		return;
 
-	}  // end iof
+	}
 
 	//
 	// get the parent item we will be inserting the new entry at, a parent
@@ -1159,11 +1158,11 @@ void HierarchyView::moveWindowAheadOf( GameWindow *window,
 	if( newItem == NULL )
 	{
 
-		DEBUG_LOG(( "moveWindowAheadOf: Error adding window to tree\n" ));
+		DEBUG_LOG(( "moveWindowAheadOf: Error adding window to tree" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	//
 	// add ALL the children of this window as well, do not worry about
@@ -1172,12 +1171,12 @@ void HierarchyView::moveWindowAheadOf( GameWindow *window,
 	if( TheEditor->windowIsGadget( window ) == FALSE )
 	{
 		GameWindow *child = window->winGetChild();
-	
+
 		addWindowToTree( child, newItem, HIERARCHY_ADD_AT_BOTTOM, TRUE, TRUE );
 
-	}  // end if
+	}
 
-}  // end moveWindowAheadOf
+}
 
 // HierarchyView::moveWindowChildOf ===========================================
 /** Move the hierarchy entry for window so that it is now the first
@@ -1200,24 +1199,24 @@ void HierarchyView::moveWindowChildOf( GameWindow *window, GameWindow *parent )
 		addWindow( window, HIERARCHY_ADD_AT_TOP );
 		return;
 
-	}  // end if
+	}
 
 	// find the entry of the parent
 	HTREEITEM parentItem = findTreeEntry( parent );
 	if( parentItem == NULL )
 	{
 
-		DEBUG_LOG(( "moveWindowChildOf: No parent entry\n" ));
+		DEBUG_LOG(( "moveWindowChildOf: No parent entry" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// add the window as child of the parent at the top, dont forget to
 	// also add the children of the window too!
 	addWindowToTree( window, parentItem, HIERARCHY_ADD_AT_TOP, TRUE, FALSE );
 
-}  // end moveWindowChildOf
+}
 
 // HierarchyView::treePointToItem =============================================
 /** Given the location (x,y) in TREE COORDINATES, correlate that to
@@ -1232,9 +1231,9 @@ HTREEITEM HierarchyView::treePointToItem( Int x, Int y )
 	hitTest.pt.y = y;
 	hitTest.hItem = NULL;
 	hitTest.flags = TVHT_ONITEM;
-	return TreeView_HitTest( TheHierarchyView->getTreeHandle(), &hitTest );
+	return TreeView_HitTest( getTreeHandle(), &hitTest );
 
-}  // end treePointToItem
+}
 
 // HierarchyView::getWindowFromItem ===========================================
 /** Get the game window we stored as the user data lParam in the tree
@@ -1260,7 +1259,7 @@ GameWindow *HierarchyView::getWindowFromItem( HTREEITEM treeItem )
 
 	return window;
 
-}  // end getWindowFromItem
+}
 
 // HierarchyView::selectWindow ================================================
 /** Select the tree item */
@@ -1277,7 +1276,7 @@ void HierarchyView::selectWindow( GameWindow *window )
 	TreeView_SelectItem( m_tree, item );
 	TreeView_Expand( m_tree, item, 0 );
 
-}  // end selectWindow
+}
 
 // HierarchyView::validateDragDropOperation ===================================
 /** Return TRUE if the drag drop operation of source onto target
@@ -1301,12 +1300,12 @@ Bool HierarchyView::validateDragDropOperation( GameWindow *source,
 			return FALSE;
 		other = other->winGetParent();
 
-	}  // end while
+	}
 
 	// everything is ok
 	return TRUE;
 
-}  // end validateDragDropOperation
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp
index ecd0a9eed1f..bb83dbe0d30 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp
@@ -24,12 +24,12 @@
 
 // FILE: LayoutScheme.cpp /////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -46,7 +46,6 @@
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
 #include <assert.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
@@ -99,7 +98,7 @@ static void loadSchemeDataToDialog( HWND hWndDialog )
 {
 
 	// load the name of the current scheme
-	SetDlgItemText( hWndDialog, STATIC_CURRENT_SCHEME, 
+	SetDlgItemText( hWndDialog, STATIC_CURRENT_SCHEME,
 									theScheme->getSchemeFilename() );
 
 	// load the state combo box with every option available
@@ -112,7 +111,7 @@ static void loadSchemeDataToDialog( HWND hWndDialog )
 									GWS_HORZ_SLIDER |
 									GWS_VERT_SLIDER |
 									GWS_STATIC_TEXT |
-									GWS_ENTRY_FIELD | 
+									GWS_ENTRY_FIELD |
 									GWS_USER_WINDOW |
 									GWS_COMBO_BOX,
 									GetDlgItem( hWndDialog, COMBO_STATE ) );
@@ -122,7 +121,7 @@ static void loadSchemeDataToDialog( HWND hWndDialog )
 	LoadImageListComboBox( GetDlgItem( hWndDialog, COMBO_IMAGE ) );
 
 	//
-	// load our own internal table of images and colors to the 
+	// load our own internal table of images and colors to the
 	// property dialog tables
 	//
 	Int i;
@@ -137,7 +136,7 @@ static void loadSchemeDataToDialog( HWND hWndDialog )
 												info->color,
 												info->borderColor );
 
-	}  // end for i
+	}
 
 	// switch to the generic state
 	SwitchToState( GENERIC_ENABLED, hWndDialog );
@@ -156,7 +155,7 @@ static void loadSchemeDataToDialog( HWND hWndDialog )
 	SendDlgItemMessage( hWndDialog, COMBO_FONT, CB_RESETCONTENT, 0, 0 );
 	LoadFontCombo( GetDlgItem( hWndDialog, COMBO_FONT ), theScheme->getFont() );
 
-}  // end loadSchemeDataToDialog
+}
 
 // saveData ===================================================================
 //=============================================================================
@@ -179,7 +178,7 @@ static void saveData( HWND hWndDialog )
 																 info->color,
 																 info->borderColor );
 
-	}  // end for i
+	}
 
 	// save default text colors
 	theScheme->setEnabledTextColor( GetPropsEnabledTextColor() );
@@ -192,7 +191,7 @@ static void saveData( HWND hWndDialog )
 	// save the font
 	theScheme->setFont( GetSelectedFontFromCombo( GetDlgItem( hWndDialog, COMBO_FONT ) ) );
 
-}  // end saveData
+}
 
 // saveAsDialog ===============================================================
 /** Bring up the standard windows browser save as dialog and return
@@ -234,7 +233,7 @@ char *saveAsDialog( void )
 	else
 		return NULL;
 
-}  // end saveAsDialog
+}
 
 // openDialog =================================================================
 /** Bring up the standard windows browser open dialog and return
@@ -276,7 +275,7 @@ char *openDialog( void )
 	else
 		return NULL;
 
-}  // end openDialog
+}
 
 // layoutSchemeCallback =======================================================
 /** Dialog callback for layout scheme dialog */
@@ -292,7 +291,7 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 	// this is largely based on the property dialog code so lets just
 	// let the default handle code work here too
 	//
-	if( HandleCommonDialogMessages( hWndDialog, message, 
+	if( HandleCommonDialogMessages( hWndDialog, message,
 																	wParam, lParam, &returnCode ) == TRUE )
 		return returnCode;
 
@@ -307,7 +306,7 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 			loadSchemeDataToDialog( hWndDialog );
 			break;
 
-		}  // end init dialog
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -315,7 +314,7 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 //			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 //			HWND hWndControl = (HWND)lParam;  // control window handle
-		
+
 			switch( controlID )
 			{
 
@@ -355,7 +354,7 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 
 					break;
 
-				}  // end apply scheme
+				}
 
 				// --------------------------------------------------------------------
 				case BUTTON_SAVE:
@@ -367,15 +366,15 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 
 						saveData( hWndDialog );
 						theScheme->saveScheme( filename );
-						SetDlgItemText( hWndDialog, STATIC_CURRENT_SCHEME, 
+						SetDlgItemText( hWndDialog, STATIC_CURRENT_SCHEME,
 														theScheme->getSchemeFilename() );
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end save
-				
+				}
+
 				// --------------------------------------------------------------------
 				case BUTTON_LOAD:
 				{
@@ -387,25 +386,25 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 						// load the new data
 						if( theScheme->loadScheme( filename ) )
 						{
-										
+
 							// load the dialog engine and items with the current data of the scheme
 							loadSchemeDataToDialog( hWndDialog );
 
-						}  // end if
+						}
 						else
 						{
 
 							MessageBox( TheEditor->getWindowHandle(),
 													"Unable to open scheme file.", "Error", MB_OK );
 
-						}  // end else
+						}
 
-					}  // end if
+					}
 
 					break;
 
-				}  // end load
-							
+				}
+
 				// --------------------------------------------------------------------
 				case IDOK:
 
@@ -421,17 +420,17 @@ static LRESULT CALLBACK layoutSchemeCallback( HWND hWndDialog,
 					EndDialog( hWndDialog, FALSE );
 					break;
 
-			}  // end switch
-				
+			}
+
 			break;
 
-		}  // end command
+		}
 
-	}  // end switch, message
+	}
 
 	return 0;
 
-}  // end layoutSchemeCallback
+}
 
 // LayoutScheme::applyPropertyTablesToWindow ==================================
 /** apply the image and color info stored in the state identifer tables
@@ -478,7 +477,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetButtonSetHiliteSelectedColor( root, info->color );
 		GadgetButtonSetHiliteSelectedBorderColor( root, info->borderColor );
 
-	}  // end if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_RADIO_BUTTON ) )
 	{
 
@@ -521,7 +520,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetRadioSetHiliteCheckedBoxColor( root, info->color );
 		GadgetRadioSetHiliteCheckedBoxBorderColor( root, info->borderColor );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_CHECK_BOX ) )
 	{
 
@@ -564,7 +563,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetCheckBoxSetHiliteCheckedBoxColor( root, info->color );
 		GadgetCheckBoxSetHiliteCheckedBoxBorderColor( root, info->borderColor );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_VERT_SLIDER ) )
 	{
 
@@ -628,7 +627,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetSliderSetHiliteSelectedThumbColor( root, info->color );
 		GadgetSliderSetHiliteSelectedThumbBorderColor( root, info->borderColor );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_HORZ_SLIDER ) )
 	{
 
@@ -692,7 +691,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetSliderSetHiliteSelectedThumbColor( root, info->color );
 		GadgetSliderSetHiliteSelectedThumbBorderColor( root, info->borderColor );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_SCROLL_LISTBOX ) )
 	{
 
@@ -772,7 +771,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 			GadgetButtonSetHiliteSelectedColor( upButton, info->color );
 			GadgetButtonSetHiliteSelectedBorderColor( upButton, info->borderColor );
 
-		}  // end if
+		}
 
 		GameWindow *downButton = GadgetListBoxGetDownButton( root );
 		if( downButton )
@@ -805,7 +804,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 			GadgetButtonSetHiliteSelectedColor( downButton, info->color );
 			GadgetButtonSetHiliteSelectedBorderColor( downButton, info->borderColor );
 
-		}  // end if
+		}
 
 		GameWindow *slider = GadgetListBoxGetSlider( root );
 		if( slider )
@@ -871,9 +870,9 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 			GadgetSliderSetHiliteSelectedThumbColor( slider, info->color );
 			GadgetSliderSetHiliteSelectedThumbBorderColor( slider, info->borderColor );
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_COMBO_BOX ) )
 	{
 		info = GetStateInfo( COMBOBOX_ENABLED );
@@ -950,8 +949,8 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 			GadgetButtonSetHiliteSelectedImage( dropDownButton, info->image );
 			GadgetButtonSetHiliteSelectedColor( dropDownButton, info->color );
 			GadgetButtonSetHiliteSelectedBorderColor( dropDownButton, info->borderColor );
-		}// end if
-		
+		}
+
 		GameWindow *editBox = GadgetComboBoxGetEditBox( root );
 		if ( editBox )
 		{
@@ -987,7 +986,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 			GadgetTextEntrySetHiliteImageCenter( editBox, info->image );
 			info = GetStateInfo( COMBOBOX_EDIT_BOX_HILITE_SMALL_CENTER );
 			GadgetTextEntrySetHiliteImageSmallCenter( editBox, info->image );
-		} // end if
+		}
 
 		GameWindow *listBox = GadgetComboBoxGetListBox( root );
 		if( listBox )
@@ -1068,7 +1067,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 				GadgetButtonSetHiliteSelectedColor( upButton, info->color );
 				GadgetButtonSetHiliteSelectedBorderColor( upButton, info->borderColor );
 
-			}  // end if
+			}
 
 			GameWindow *downButton = GadgetListBoxGetDownButton( listBox );
 			if( downButton )
@@ -1101,7 +1100,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 				GadgetButtonSetHiliteSelectedColor( downButton, info->color );
 				GadgetButtonSetHiliteSelectedBorderColor( downButton, info->borderColor );
 
-			}  // end if
+			}
 
 			GameWindow *slider = GadgetListBoxGetSlider( listBox );
 			if( slider )
@@ -1167,9 +1166,9 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 				GadgetSliderSetHiliteSelectedThumbColor( slider, info->color );
 				GadgetSliderSetHiliteSelectedThumbBorderColor( slider, info->borderColor );
 
-			}  // end if
-		}// end if (combo listbox)
-	}// end if
+			}
+		}
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_ENTRY_FIELD ) )
 	{
 
@@ -1206,7 +1205,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		info = GetStateInfo( TEXT_ENTRY_HILITE_SMALL_CENTER );
 		GadgetTextEntrySetHiliteImageSmallCenter( root, info->image );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_STATIC_TEXT ) )
 	{
 
@@ -1225,7 +1224,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetStaticTextSetHiliteColor( root, info->color );
 		GadgetStaticTextSetHiliteBorderColor( root, info->borderColor );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_PROGRESS_BAR ) )
 	{
 
@@ -1292,7 +1291,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		info = GetStateInfo( PROGRESS_BAR_HILITE_BAR_SMALL_CENTER );
 		GadgetProgressBarSetHiliteBarImageSmallCenter( root, info->image );
 
-	}  // end else if
+	}
 	else if( BitIsSet( root->winGetStyle(), GWS_TAB_CONTROL ) )
 	{
 		info = GetStateInfo( TC_TAB_0_ENABLED );
@@ -1341,7 +1340,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetTabControlSetEnabledBorderColorBackground( root, info->borderColor );
 
 
-	
+
 		info = GetStateInfo( TC_TAB_0_DISABLED );
 		GadgetTabControlSetDisabledImageTabZero( root, info->image );
 		GadgetTabControlSetDisabledColorTabZero( root, info->color );
@@ -1388,7 +1387,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		GadgetTabControlSetDisabledBorderColorBackground( root, info->borderColor );
 
 
-		
+
 
 		info = GetStateInfo( TC_TAB_0_HILITE );
 		GadgetTabControlSetHiliteImageTabZero( root, info->image );
@@ -1454,10 +1453,10 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 		root->winSetHiliteColor( 0, info->color );
 		root->winSetHiliteBorderColor( 0, info->borderColor );
 
-	}  // end else
+	}
 
 	//
-	// apply changes to children of this window, unless this 
+	// apply changes to children of this window, unless this
 	// window is a gadget itself, those are "atomic" units remember ;)
 	//
 	if( TheEditor->windowIsGadget( root ) == FALSE )
@@ -1469,7 +1468,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root )
 	// force an update of the edit window
 	TheEditWindow->draw();
 
-}  // end applyPropertyTablesToWindow
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -1491,7 +1490,7 @@ LayoutScheme::LayoutScheme( void )
 	m_hiliteText.borderColor = GAME_COLOR_UNDEFINED;
 	m_font = NULL;
 
-}  // end LayoutScheme
+}
 
 // LayoutScheme::~LayoutScheme ================================================
 /** */
@@ -1506,16 +1505,16 @@ LayoutScheme::~LayoutScheme( void )
 
 		if( m_imageAndColorTable[ i ].stateNameBuffer )
 		{
-			
+
 			delete [] m_imageAndColorTable[ i ].stateNameBuffer;
 			m_imageAndColorTable[ i ].stateNameBuffer = NULL;
 			m_imageAndColorTable[ i ].stateName = NULL;
 
-		}  // end if
+		}
 
-	}  // end for i
+	}
 
-}  // end ~LayoutScheme
+}
 
 // LayoutScheme::init =========================================================
 /** Init */
@@ -1528,10 +1527,10 @@ void LayoutScheme::init( void )
 	// just up the default state values
 	for( i = FIRST_VALID_IDENTIFIER; i < NUM_STATE_IDENTIFIERS; i++ )
 	{
-	
+
 		// get info from the static table created for property editing
 		info = GetStateInfo( (StateIdentifier)i );
-		assert( info );	
+		assert( info );
 		m_imageAndColorTable[ i ].windowType = info->windowType;
 		m_imageAndColorTable[ i ].stateID = info->stateID;
 		m_imageAndColorTable[ i ].image = info->image;
@@ -1541,7 +1540,7 @@ void LayoutScheme::init( void )
 		m_imageAndColorTable[ i ].stateName = m_imageAndColorTable[ i ].stateNameBuffer;
 		strcpy(m_imageAndColorTable[ i ].stateNameBuffer, info->stateName );
 
-	}  // end for i
+	}
 
 	// assign a default set of colors
 	UnsignedByte alpha = 255;
@@ -1571,573 +1570,573 @@ void LayoutScheme::init( void )
 	const Image *image;
 
 	// push button
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "PushButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "PushButtonEnabled" );
 	storeImageAndColor( BUTTON_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "PushButtonEnabledSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "PushButtonEnabledSelected" );
 	storeImageAndColor( BUTTON_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "PushButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "PushButtonDisabled" );
 	storeImageAndColor( BUTTON_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "PushButtonDisabledSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "PushButtonDisabledSelected" );
 	storeImageAndColor( BUTTON_DISABLED_PUSHED, image, lightGray, gray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "PushButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "PushButtonHilite" );
 	storeImageAndColor( BUTTON_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "PushButtonHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "PushButtonHiliteSelected" );
 	storeImageAndColor( BUTTON_HILITE_PUSHED, image, yellow, white );
 
 	// radio button
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonEnabled" );
 	storeImageAndColor( RADIO_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonEnabledBoxUnselected" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonEnabledBoxUnselected" );
 	storeImageAndColor( RADIO_ENABLED_UNCHECKED_BOX, image, darkRed, black );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonEnabledBoxSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonEnabledBoxSelected" );
 	storeImageAndColor( RADIO_ENABLED_CHECKED_BOX, image, blue, lightBlue );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonDisabled" );
 	storeImageAndColor( RADIO_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonDisabledBoxUnselected" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonDisabledBoxUnselected" );
 	storeImageAndColor( RADIO_DISABLED_UNCHECKED_BOX, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonDisabledBoxSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonDisabledBoxSelected" );
 	storeImageAndColor( RADIO_DISABLED_CHECKED_BOX, image, darkGray, white );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonHilite" );
 	storeImageAndColor( RADIO_HILITE, image, green, lightGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonHiliteBoxUnselected" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonHiliteBoxUnselected" );
 	storeImageAndColor( RADIO_HILITE_UNCHECKED_BOX, image, darkGreen, lightGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "RadioButtonHiliteBoxSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "RadioButtonHiliteBoxSelected" );
 	storeImageAndColor( RADIO_HILITE_CHECKED_BOX, image, yellow, white );
 
 	// check box
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxEnabled" );
 	storeImageAndColor( CHECK_BOX_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxEnabledBoxUnselected" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxEnabledBoxUnselected" );
 	storeImageAndColor( CHECK_BOX_ENABLED_UNCHECKED_BOX, image, WIN_COLOR_UNDEFINED, lightBlue );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxEnabledBoxSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxEnabledBoxSelected" );
 	storeImageAndColor( CHECK_BOX_ENABLED_CHECKED_BOX, image, blue, lightBlue );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxDisabled" );
 	storeImageAndColor( CHECK_BOX_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxDisabledBoxUnselected" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxDisabledBoxUnselected" );
 	storeImageAndColor( CHECK_BOX_DISABLED_UNCHECKED_BOX, image, WIN_COLOR_UNDEFINED, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxDisabledBoxSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxDisabledBoxSelected" );
 	storeImageAndColor( CHECK_BOX_DISABLED_CHECKED_BOX, image, darkGray, white );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxHilite" );
 	storeImageAndColor( CHECK_BOX_HILITE, image, green, lightGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxHiliteBoxUnselected" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxHiliteBoxUnselected" );
 	storeImageAndColor( CHECK_BOX_HILITE_UNCHECKED_BOX, image, WIN_COLOR_UNDEFINED, lightBlue );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "CheckBoxHiliteBoxSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "CheckBoxHiliteBoxSelected" );
 	storeImageAndColor( CHECK_BOX_HILITE_CHECKED_BOX, image, yellow, white );
 
 	// horz slider
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderEnabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderEnabledLeftEnd" );
 	storeImageAndColor( HSLIDER_ENABLED_LEFT, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderEnabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderEnabledRightEnd" );
 	storeImageAndColor( HSLIDER_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderEnabledRepeatingCenter" );
 	storeImageAndColor( HSLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderEnabledSmallRepeatingCenter" );
 	storeImageAndColor( HSLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderDisabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderDisabledLeftEnd" );
 	storeImageAndColor( HSLIDER_DISABLED_LEFT, image, gray, darkGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderDisabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderDisabledRightEnd" );
 	storeImageAndColor( HSLIDER_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderDisabledRepeatingCenter" );
 	storeImageAndColor( HSLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderDisabledSmallRepeatingCenter" );
 	storeImageAndColor( HSLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderHiliteLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderHiliteLeftEnd" );
 	storeImageAndColor( HSLIDER_HILITE_LEFT, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderHiliteRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderHiliteRightEnd" );
 	storeImageAndColor( HSLIDER_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderHiliteRepeatingCenter" );
 	storeImageAndColor( HSLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderHiliteSmallRepeatingCenter" );
 	storeImageAndColor( HSLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderThumbEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderThumbEnabled" );
 	storeImageAndColor( HSLIDER_THUMB_ENABLED, image, lightRed, red );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderThumbEnabledSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderThumbEnabledSelected" );
 	storeImageAndColor( HSLIDER_THUMB_ENABLED_PUSHED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderThumbDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderThumbDisabled" );
 	storeImageAndColor( HSLIDER_THUMB_DISABLED, image, darkGray, gray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderThumbDisabledSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderThumbDisabledSelected" );
 	storeImageAndColor( HSLIDER_THUMB_DISABLED_PUSHED, image, black, darkGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderThumbHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderThumbHilite" );
 	storeImageAndColor( HSLIDER_THUMB_HILITE, image, green, lightGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "HSliderThumbHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "HSliderThumbHiliteSelected" );
 	storeImageAndColor( HSLIDER_THUMB_HILITE_PUSHED, image, blue, lightBlue );
 
 	// vert slider
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderEnabledTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderEnabledTopEnd" );
 	storeImageAndColor( VSLIDER_ENABLED_TOP, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderEnabledBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderEnabledBottomEnd" );
 	storeImageAndColor( VSLIDER_ENABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderEnabledRepeatingCenter" );
 	storeImageAndColor( VSLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderEnabledSmallRepeatingCenter" );
 	storeImageAndColor( VSLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderDisabledTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderDisabledTopEnd" );
 	storeImageAndColor( VSLIDER_DISABLED_TOP, image, gray, darkGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderDisabledBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderDisabledBottomEnd" );
 	storeImageAndColor( VSLIDER_DISABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderDisabledRepeatingCenter" );
 	storeImageAndColor( VSLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderDisabledSmallRepeatingCenter" );
 	storeImageAndColor( VSLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderHiliteTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderHiliteTopEnd" );
 	storeImageAndColor( VSLIDER_HILITE_TOP, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderHiliteBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderHiliteBottomEnd" );
 	storeImageAndColor( VSLIDER_HILITE_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderHiliteRepeatingCenter" );
 	storeImageAndColor( VSLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderHiliteSmallRepeatingCenter" );
 	storeImageAndColor( VSLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderThumbEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderThumbEnabled" );
 	storeImageAndColor( VSLIDER_THUMB_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderThumbEnabledSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderThumbEnabledSelected" );
 	storeImageAndColor( VSLIDER_THUMB_ENABLED_PUSHED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderThumbDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderThumbDisabled" );
 	storeImageAndColor( VSLIDER_THUMB_DISABLED, image, darkGray, gray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderThumbDisabledSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderThumbDisabledSelected" );
 	storeImageAndColor( VSLIDER_THUMB_DISABLED_PUSHED, image, black, darkGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderThumbHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderThumbHilite" );
 	storeImageAndColor( VSLIDER_THUMB_HILITE, image, green, lightGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderThumbHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderThumbHiliteSelected" );
 	storeImageAndColor( VSLIDER_THUMB_HILITE_PUSHED, image, blue, lightBlue );
 
 	// listbox
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabled" );
 	storeImageAndColor( LISTBOX_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxEnabledSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemLeftEnd" );
 	storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_LEFT, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxEnabledSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRightEnd" );
 	storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxEnabledSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRepeatingCenter" );
 	storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxEnabledSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabled" );
 	storeImageAndColor( LISTBOX_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxDisabledSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemLeftEnd" );
 	storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_LEFT, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxDisabledSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRightEnd" );
 	storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxDisabledSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRepeatingCenter" );
 	storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxDisabledSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHilite" );
 	storeImageAndColor( LISTBOX_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxHiliteSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemLeftEnd" );
 	storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_LEFT, image, white, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxHiliteSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRightEnd" );
 	storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxHiliteSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRepeatingCenter" );
 	storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxHiliteSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeUpButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" );
 	storeImageAndColor( LISTBOX_UP_BUTTON_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeUpButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" );
 	storeImageAndColor( LISTBOX_UP_BUTTON_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeUpButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" );
 	storeImageAndColor( LISTBOX_UP_BUTTON_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeUpButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" );
 	storeImageAndColor( LISTBOX_UP_BUTTON_DISABLED_PUSHED, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeUpButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHilite" );
 	storeImageAndColor( LISTBOX_UP_BUTTON_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeUpButtonHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHiliteSelected" );
 	storeImageAndColor( LISTBOX_UP_BUTTON_HILITE_PUSHED, image, white, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDownButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" );
 	storeImageAndColor( LISTBOX_DOWN_BUTTON_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDownButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" );
 	storeImageAndColor( LISTBOX_DOWN_BUTTON_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDownButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" );
 	storeImageAndColor( LISTBOX_DOWN_BUTTON_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDownButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" );
 	storeImageAndColor( LISTBOX_DOWN_BUTTON_DISABLED_PUSHED, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDownButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" );
 	storeImageAndColor( LISTBOX_DOWN_BUTTON_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDownButtonHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHiliteSelected" );
 	storeImageAndColor( LISTBOX_DOWN_BUTTON_HILITE_PUSHED, image, white, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeEnabledTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledTopEnd" );
 	storeImageAndColor( LISTBOX_SLIDER_ENABLED_TOP, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeEnabledBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledBottomEnd" );
 	storeImageAndColor( LISTBOX_SLIDER_ENABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledRepeatingCenter" );
 	storeImageAndColor( LISTBOX_SLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledSmallRepeatingCenter" );
 	storeImageAndColor( LISTBOX_SLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDisabledTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledTopEnd" );
 	storeImageAndColor( LISTBOX_SLIDER_DISABLED_TOP, image, gray, darkGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDisabledBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledBottomEnd" );
 	storeImageAndColor( LISTBOX_SLIDER_DISABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledRepeatingCenter" );
 	storeImageAndColor( LISTBOX_SLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledSmallRepeatingCenter" );
 	storeImageAndColor( LISTBOX_SLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeHiliteTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteTopEnd" );
 	storeImageAndColor( LISTBOX_SLIDER_HILITE_TOP, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeHiliteBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteBottomEnd" );
 	storeImageAndColor( LISTBOX_SLIDER_HILITE_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteRepeatingCenter" );
 	storeImageAndColor( LISTBOX_SLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteSmallRepeatingCenter" );
 	storeImageAndColor( LISTBOX_SLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeThumbEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" );
 	storeImageAndColor( LISTBOX_SLIDER_THUMB_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeThumbEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" );
 	storeImageAndColor( LISTBOX_SLIDER_THUMB_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeThumbDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" );
 	storeImageAndColor( LISTBOX_SLIDER_THUMB_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeThumbDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" );
 	storeImageAndColor( LISTBOX_SLIDER_THUMB_DISABLED_PUSHED, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeThumbHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHilite" );
 	storeImageAndColor( LISTBOX_SLIDER_THUMB_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "VSliderLargeThumbHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHiliteSelected" );
 	storeImageAndColor( LISTBOX_SLIDER_THUMB_HILITE_PUSHED, image, white, darkGreen );
 
-	// Combo Box 
+	// Combo Box
 	//---------------------------------------------------------------------------
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabled" );
 	storeImageAndColor( COMBOBOX_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ListBoxEnabledSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemLeftEnd" );
 	storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_LEFT, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRightEnd" );
 	storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabled" );
 	storeImageAndColor( COMBOBOX_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemLeftEnd" );
 	storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_LEFT, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRightEnd" );
 	storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHilite" );
 	storeImageAndColor( COMBOBOX_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemLeftEnd" );
 	storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_LEFT, image, white, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRightEnd" );
 	storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" );
 	storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" );
 	storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" );
 	storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" );
 	storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_DISABLED_PUSHED, image, lightGray, gray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" );
 	storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" );
 	storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_HILITE_PUSHED, image, yellow, white );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledLeftEnd" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_LEFT, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRightEnd" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledLeftEnd" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_LEFT, image, gray, black );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRightEnd" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteLeftEnd" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_LEFT, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRightEnd" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabled" ) );
+
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemLeftEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_LEFT, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRightEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemLeftEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_LEFT, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRightEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHilite" );
 	storeImageAndColor( COMBOBOX_LISTBOX_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemLeftEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_LEFT, image, white, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRightEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_DISABLED_PUSHED, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHilite" );
 	storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHiliteSelected" );
 	storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_HILITE_PUSHED, image, white, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_DISABLED_PUSHED, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHiliteSelected" );
 	storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_HILITE_PUSHED, image, white, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledTopEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_TOP, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledBottomEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledTopEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_TOP, image, gray, darkGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledBottomEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteTopEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteTopEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_TOP, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteBottomEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteBottomEnd" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteSmallRepeatingCenter" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_ENABLED_PUSHED, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_DISABLED_PUSHED, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHilite" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_HILITE, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbHiliteSelected" ) );
+	image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHiliteSelected" );
 	storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_HILITE_PUSHED, image, white, darkGreen );
 
 
 	// progress bar
 	//---------------------------------------------------------------------------
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledLeftEnd" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_LEFT, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledRightEnd" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledSmallRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledBarLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarLeftEnd" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_LEFT, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledBarRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarRightEnd" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledBarRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarEnabledBarSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarSmallRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
 	//---------------------------------------------------------------------------
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledLeftEnd" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_LEFT, image, darkGray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledRightEnd" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledSmallRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledBarLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarLeftEnd" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_LEFT, image, lightGray, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledBarRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarRightEnd" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledBarRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarDisabledBarSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarSmallRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
 	//---------------------------------------------------------------------------
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteLeftEnd" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_LEFT, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteRightEnd" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteSmallRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteBarLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarLeftEnd" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_BAR_LEFT, image, yellow, white );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteBarRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarRightEnd" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_BAR_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteBarRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_BAR_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "ProgressBarHiliteBarSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarSmallRepeatingCenter" );
 	storeImageAndColor( PROGRESS_BAR_HILITE_BAR_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
 	// static text
 	//---------------------------------------------------------------------------
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "StaticTextEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "StaticTextEnabled" );
 	storeImageAndColor( STATIC_TEXT_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "StaticTextDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "StaticTextDisabled" );
 	storeImageAndColor( STATIC_TEXT_DISABLED, image, darkGray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "StaticTextHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "StaticTextHilite" );
 	storeImageAndColor( STATIC_TEXT_HILITE, image, darkGreen, lightGreen );
 
 	// text entry
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryEnabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledLeftEnd" );
 	storeImageAndColor( TEXT_ENTRY_ENABLED_LEFT, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryEnabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRightEnd" );
 	storeImageAndColor( TEXT_ENTRY_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryEnabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRepeatingCenter" );
 	storeImageAndColor( TEXT_ENTRY_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryEnabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryEnabledSmallRepeatingCenter" );
 	storeImageAndColor( TEXT_ENTRY_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryDisabledLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledLeftEnd" );
 	storeImageAndColor( TEXT_ENTRY_DISABLED_LEFT, image, gray, black );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryDisabledRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRightEnd" );
 	storeImageAndColor( TEXT_ENTRY_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryDisabledRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRepeatingCenter" );
 	storeImageAndColor( TEXT_ENTRY_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryDisabledSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryDisabledSmallRepeatingCenter" );
 	storeImageAndColor( TEXT_ENTRY_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryHiliteLeftEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteLeftEnd" );
 	storeImageAndColor( TEXT_ENTRY_HILITE_LEFT, image, green, darkGreen );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryHiliteRightEnd" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRightEnd" );
 	storeImageAndColor( TEXT_ENTRY_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryHiliteRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRepeatingCenter" );
 	storeImageAndColor( TEXT_ENTRY_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TextEntryHiliteSmallRepeatingCenter" ) );
+	image = TheMappedImageCollection->findImageByName( "TextEntryHiliteSmallRepeatingCenter" );
 	storeImageAndColor( TEXT_ENTRY_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED );
 
 	// Tab Control
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlZeroEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlZeroEnabled" );
 	storeImageAndColor( TC_TAB_0_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlZeroDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlZeroDisabled" );
 	storeImageAndColor( TC_TAB_0_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlZeroHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlZeroHilite" );
 	storeImageAndColor( TC_TAB_0_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlOneEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlOneEnabled" );
 	storeImageAndColor( TC_TAB_1_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlOneDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlOneDisabled" );
 	storeImageAndColor( TC_TAB_1_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlOneHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlOneHilite" );
 	storeImageAndColor( TC_TAB_1_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlTwoEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlTwoEnabled" );
 	storeImageAndColor( TC_TAB_2_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlTwoDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlTwoDisabled" );
 	storeImageAndColor( TC_TAB_2_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlTwoHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlTwoHilite" );
 	storeImageAndColor( TC_TAB_2_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlThreeEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlThreeEnabled" );
 	storeImageAndColor( TC_TAB_3_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlThreeDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlThreeDisabled" );
 	storeImageAndColor( TC_TAB_3_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlThreeHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlThreeHilite" );
 	storeImageAndColor( TC_TAB_3_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlFourEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlFourEnabled" );
 	storeImageAndColor( TC_TAB_4_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlFourDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlFourDisabled" );
 	storeImageAndColor( TC_TAB_4_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlFourHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlFourHilite" );
 	storeImageAndColor( TC_TAB_4_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlFiveEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlFiveEnabled" );
 	storeImageAndColor( TC_TAB_5_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlFiveDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlFiveDisabled" );
 	storeImageAndColor( TC_TAB_5_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlFiveHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlFiveHilite" );
 	storeImageAndColor( TC_TAB_5_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlSixEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlSixEnabled" );
 	storeImageAndColor( TC_TAB_6_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlSixDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlSixDisabled" );
 	storeImageAndColor( TC_TAB_6_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlSixHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlSixHilite" );
 	storeImageAndColor( TC_TAB_6_HILITE, image, green, darkGreen );
 
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlSevenEnabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlSevenEnabled" );
 	storeImageAndColor( TC_TAB_7_ENABLED, image, red, lightRed );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlSevenDisabled" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlSevenDisabled" );
 	storeImageAndColor( TC_TAB_7_DISABLED, image, gray, lightGray );
-	image = TheMappedImageCollection->findImageByName( AsciiString(  "TabControlSevenHilite" ) );
+	image = TheMappedImageCollection->findImageByName( "TabControlSevenHilite" );
 	storeImageAndColor( TC_TAB_7_HILITE, image, green, darkGreen );
 
 	storeImageAndColor( TAB_CONTROL_ENABLED, NULL, black, white );
 	storeImageAndColor( TAB_CONTROL_DISABLED, NULL, darkGray, white );
-	storeImageAndColor( TAB_CONTROL_HILITE, NULL, black, white );	
+	storeImageAndColor( TAB_CONTROL_HILITE, NULL, black, white );
 
 	// generic
 	storeImageAndColor( GENERIC_ENABLED, NULL, darkBlue, white );
 	storeImageAndColor( GENERIC_DISABLED, NULL, darkGray, white );
-	storeImageAndColor( GENERIC_HILITE, NULL, lightBlue, white );	
+	storeImageAndColor( GENERIC_HILITE, NULL, lightBlue, white );
 
 	// default text colors
 	m_enabledText.color = white;
@@ -2148,8 +2147,8 @@ void LayoutScheme::init( void )
 	m_hiliteText.borderColor = darkBlue;
 
 	// default font
-	m_font = TheWindowManager->winFindFont( AsciiString("Times New Roman"), 14, FALSE );
-}  // end init
+	m_font = TheWindowManager->winFindFont( "Times New Roman", 14, FALSE );
+}
 
 // LayoutScheme::openDialog ===================================================
 /** Bring up the layout scheme dialog box */
@@ -2166,7 +2165,7 @@ void LayoutScheme::openDialog( void )
 
 	theScheme = NULL;
 
-}  // end openDialog
+}
 
 // LayoutScheme::findEntry ====================================================
 /** Find the entry for the state */
@@ -2178,11 +2177,11 @@ ImageAndColorInfo *LayoutScheme::findEntry( StateIdentifier id )
 	if( id < 0 || id >= NUM_STATE_IDENTIFIERS )
 	{
 
-		DEBUG_LOG(( "Illegal state to to layout 'findEntry' '%d'\n", id ));
+		DEBUG_LOG(( "Illegal state to to layout 'findEntry' '%d'", id ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// search the state table
 	for( Int i = 0; i < NUM_STATE_IDENTIFIERS; i++ )
@@ -2191,11 +2190,11 @@ ImageAndColorInfo *LayoutScheme::findEntry( StateIdentifier id )
 		if( m_imageAndColorTable[ i ].stateID == id )
 			return &m_imageAndColorTable[ i ];
 
-	}  // end for i
+	}
 
 	return NULL;  // not found
 
-}  // end findEntry
+}
 
 // LayoutScheme::getImageAndColor =============================================
 /** Get the color and color info for the state */
@@ -2207,16 +2206,16 @@ ImageAndColorInfo *LayoutScheme::getImageAndColor( StateIdentifier id )
 	if( id < 0 || id >= NUM_STATE_IDENTIFIERS )
 	{
 
-		DEBUG_LOG(( "getImageAndColor: Illegal state '%d'\n", id ));
+		DEBUG_LOG(( "getImageAndColor: Illegal state '%d'", id ));
 		assert( 0 );
 		return NULL;
 
-	}  // end if
+	}
 
 	// return the entry for the state
 	return findEntry( id );
 
-}  // end getImageAndColor
+}
 
 // LayoutScheme::storeImageAndColor ===========================================
 /** Store the image and colors of the specific state in our own data array */
@@ -2229,11 +2228,11 @@ void LayoutScheme::storeImageAndColor( StateIdentifier id, const Image *image,
 	if( id < 0 || id >= NUM_STATE_IDENTIFIERS )
 	{
 
-		DEBUG_LOG(( "Illegal state identifier in layout scheme store image and color '%d'\n", id ));
+		DEBUG_LOG(( "Illegal state identifier in layout scheme store image and color '%d'", id ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// store the info
 	ImageAndColorInfo *entry = findEntry( id );
@@ -2244,9 +2243,9 @@ void LayoutScheme::storeImageAndColor( StateIdentifier id, const Image *image,
 		entry->color = color;
 		entry->borderColor = borderColor;
 
-	}  // en dif
+	}
 
-}  // end storeImageAndColor
+}
 
 // LayoutScheme::saveScheme ===================================================
 /** Save the scheme to the filename provided */
@@ -2262,12 +2261,12 @@ Bool LayoutScheme::saveScheme( char *filename )
 	if( fp == NULL )
 	{
 
-		DEBUG_LOG(( "saveScheme: Unable to open file '%s'\n", filename ));
+		DEBUG_LOG(( "saveScheme: Unable to open file '%s'", filename ));
 		MessageBox( TheEditor->getWindowHandle(),
 								"Unable to open scheme for for saving.  Read only?", "Save Error", MB_OK );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// save the filename we're using now
 	setSchemeFilename( filename );
@@ -2311,9 +2310,9 @@ Bool LayoutScheme::saveScheme( char *filename )
 		assert( info );
 
 		// get the color data in more RGB friendly output
-		GameGetColorComponents( info->color, &colorR, &colorG, 
+		GameGetColorComponents( info->color, &colorR, &colorG,
 														&colorB, &colorA );
-		GameGetColorComponents( info->borderColor, &bColorR, &bColorG, 
+		GameGetColorComponents( info->borderColor, &bColorR, &bColorG,
 														&bColorB, &bColorA );
 
 		// output it
@@ -2321,14 +2320,14 @@ Bool LayoutScheme::saveScheme( char *filename )
 						 i, info->image ? info->image->getName().str() : "NONE", colorR, colorG, colorB, colorA,
 						 bColorR, bColorG, bColorB, bColorA );
 
-	}  // end for i
+	}
 
 	// close the file
 	fclose( fp );
 
 	return TRUE;
 
-}  // end saveScheme
+}
 
 // LayoutScheme::loadScheme ===================================================
 /** Load the layout scheme into this class instance */
@@ -2354,12 +2353,12 @@ Bool LayoutScheme::loadScheme( char *filename )
 		if( version != SCHEME_VERSION )
 		{
 
-			DEBUG_LOG(( "loadScheme: Old layout file version '%d'\n", version ));
+			DEBUG_LOG(( "loadScheme: Old layout file version '%d'", version ));
 			MessageBox( TheEditor->getWindowHandle(),
 									"Old layout version, cannot open.", "Old File", MB_OK );
 			return FALSE;
 
-		}  // end if
+		}
 	}
 
 	// default text colors
@@ -2405,7 +2404,7 @@ Bool LayoutScheme::loadScheme( char *filename )
 		fontBuffer[ index++ ] = c;
 		c = fgetc( fp );
 
-	}  // end while
+	}
 	fontBuffer[ index ] = '\0';
 	c = fgetc( fp );  // the end quite itself
 
@@ -2434,11 +2433,11 @@ Bool LayoutScheme::loadScheme( char *filename )
 
 				// store the info
 				storeImageAndColor( (StateIdentifier)state,
-														TheMappedImageCollection->findImageByName( AsciiString(  imageBuffer ) ),
+														TheMappedImageCollection->findImageByName( imageBuffer ),
 														GameMakeColor( colorR, colorG, colorB, colorA ),
 														GameMakeColor( bColorR, bColorG, bColorB, bColorA ) );
 			}
-		}  // end for i
+		}
 	}
 
 	// close the file
@@ -2446,5 +2445,5 @@ Bool LayoutScheme::loadScheme( char *filename )
 
 	return TRUE;
 
-}  // end loadScheme
+}
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp
index be97de5bc63..1b6c26daf0a 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Properties.cpp ///////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -46,11 +46,10 @@
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
- 
+
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 #include <stdlib.h>
 #include <assert.h>
-#include <stdio.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
@@ -83,7 +82,7 @@ static Int enabledTextIndex,
 			 disabledTextIndex,
 			 hiliteTextIndex;
 
-ColorControl colorControlTable[] = 
+ColorControl colorControlTable[] =
 {
 	{ BUTTON_ENABLED_COLOR, { 255, 255, 255, 255 } },
 	{ BUTTON_ENABLED_BORDER_COLOR, { 255, 255, 255, 255 } },
@@ -91,14 +90,14 @@ ColorControl colorControlTable[] =
 	{ BUTTON_DISABLED_BORDER_COLOR, { 255, 255, 255, 255 } },
 	{ BUTTON_HILITE_COLOR, { 255, 255, 255, 255 } },
 	{ BUTTON_HILITE_BORDER_COLOR, { 255, 255, 255, 255 } },
-	
+
 	{ BUTTON_COLOR, 0, },
 	{ BUTTON_BORDER_COLOR, 0 },
 
-	{ 0, { 0, 0, 0, 0 } }  // keep this last!
+	{ 0, { 0, 0, 0, 0 } }
 };
 
-ImageAndColorInfo imageAndColorTable[] = 
+ImageAndColorInfo imageAndColorTable[] =
 {
 	{ GWS_PUSH_BUTTON, BUTTON_ENABLED, "[Button] Enabled (Normal)", NULL, 0, 0 },
 	{ GWS_PUSH_BUTTON, BUTTON_ENABLED_PUSHED, "[Button] Enabled (Pushed)", NULL, 0, 0 },
@@ -205,7 +204,7 @@ ImageAndColorInfo imageAndColorTable[] =
 	{ GWS_SCROLL_LISTBOX, LISTBOX_SLIDER_HILITE_BOTTOM, "[Slider [Listbox]] Hilite Bottom End", NULL, 0, 0 },
 	{ GWS_SCROLL_LISTBOX, LISTBOX_SLIDER_HILITE_CENTER, "[Slider [Listbox]] Hilite Repeating Center", NULL, 0, 0 },
 	{ GWS_SCROLL_LISTBOX, LISTBOX_SLIDER_HILITE_SMALL_CENTER, "[Slider [Listbox]] Hilite Repeating Small Cener", NULL, 0, 0 },
-	
+
 	{ GWS_SCROLL_LISTBOX, LISTBOX_SLIDER_THUMB_ENABLED, "[Slider Thumb [Listbox]] Enabled (Normal)", NULL, 0, 0 },
 	{ GWS_SCROLL_LISTBOX, LISTBOX_SLIDER_THUMB_ENABLED_PUSHED, "[Slider Thumb [Listbox]] Enabled (Pushed)", NULL, 0, 0 },
 	{ GWS_SCROLL_LISTBOX, LISTBOX_SLIDER_THUMB_DISABLED, "[Slider Thumb [Listbox]] Disabled (Normal)", NULL, 0, 0 },
@@ -248,7 +247,7 @@ ImageAndColorInfo imageAndColorTable[] =
 	{ GWS_COMBO_BOX, COMBOBOX_EDIT_BOX_HILITE_RIGHT, "[Text Entry [ComboBox]] Hilite Right End", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_EDIT_BOX_HILITE_CENTER, "[Text Entry [ComboBox]] Hilite Repeating Center", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_EDIT_BOX_HILITE_SMALL_CENTER, "[Text Entry [ComboBox]] Hilite Small Repeating Center", NULL, 0, 0 },
-	
+
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_ENABLED,															"[Listbox [ComboBox]] Enabled Surface", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_LEFT,						"[Listbox [ComboBox]] Enabled Selected Item Left End (or colors)", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_RIGHT,					"[Listbox [ComboBox]] Enabled Selected Item Right End", NULL, 0, 0 },
@@ -289,7 +288,7 @@ ImageAndColorInfo imageAndColorTable[] =
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_SLIDER_HILITE_BOTTOM, "[Slider [Listbox [ComboBox]]] Hilite Bottom End", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_SLIDER_HILITE_CENTER, "[Slider [Listbox [ComboBox]]] Hilite Repeating Center", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_SLIDER_HILITE_SMALL_CENTER, "[Slider [Listbox [ComboBox]]] Hilite Repeating Small Cener", NULL, 0, 0 },
-	
+
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_SLIDER_THUMB_ENABLED, "[Slider Thumb [Listbox [ComboBox]]] Enabled (Normal)", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_SLIDER_THUMB_ENABLED_PUSHED, "[Slider Thumb [Listbox [ComboBox]]] Enabled (Pushed)", NULL, 0, 0 },
 	{ GWS_COMBO_BOX, COMBOBOX_LISTBOX_SLIDER_THUMB_DISABLED, "[Slider Thumb [Listbox [ComboBox]]] Disabled (Normal)", NULL, 0, 0 },
@@ -373,7 +372,7 @@ ImageAndColorInfo imageAndColorTable[] =
 	{ GWS_USER_WINDOW, GENERIC_DISABLED, "[User]Disabled Surface", NULL, 0, 0 },
 	{ GWS_USER_WINDOW, GENERIC_HILITE, "[User]Hilite Surface", NULL, 0, 0 },
 
-	{ 0, IDENTIFIER_INVALID, NULL, NULL, 0, 0 }  // keep this last!
+	{ 0, IDENTIFIER_INVALID, NULL, NULL, 0, 0 }
 
 };
 
@@ -432,12 +431,12 @@ void InitPropertiesDialog( GameWindow *window, Int x, Int y )
 	if( dialog == NULL )
 	{
 
-		DEBUG_LOG(( "Error creating properties dialog\n" ));
+		DEBUG_LOG(( "Error creating properties dialog" ));
 		MessageBox( TheEditor->getWindowHandle(), "Error creating property dialog!", "Error", MB_OK );
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// save the window we're working with
 	TheEditor->setPropertyTarget( window );
@@ -448,7 +447,7 @@ void InitPropertiesDialog( GameWindow *window, Int x, Int y )
 	//
 	PositionWindowOnScreen( dialog, screen.x, screen.y );
 
-}  // end InitPropertiesDialog
+}
 
 // LoadFontCombo ==============================================================
 /** Load the font combo with fonts currently available */
@@ -486,7 +485,7 @@ void LoadFontCombo( HWND comboBox, GameFont *currFont )
 		// attach pointer to font at combo index
 		SendMessage( comboBox, CB_SETITEMDATA, index, (DWORD)font );
 
-	}  // end for font
+	}
 
 	// add a "[None]" at the top index
 	SendMessage( comboBox, CB_INSERTSTRING, 0, (LPARAM)"[None]" );
@@ -497,7 +496,7 @@ void LoadFontCombo( HWND comboBox, GameFont *currFont )
 
 		SendMessage( comboBox, CB_SETCURSEL, 0, 0 );
 
-	}  // end if
+	}
 	else
 	{
 		Int count;
@@ -518,13 +517,13 @@ void LoadFontCombo( HWND comboBox, GameFont *currFont )
 				SendMessage( comboBox, CB_SETCURSEL, i, 0 );
 				break;  // exit for i
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-	}  // end else
+	}
 
-}  // end LoadFontCombo
+}
 
 // GetSelectedFontFromCombo ===================================================
 /** Based on the combo box selection return the game font associated
@@ -548,7 +547,7 @@ GameFont *GetSelectedFontFromCombo( HWND combo )
 	// get the font from the selected item
 	return (GameFont *)SendMessage( combo, CB_GETITEMDATA, selected, 0 );
 
-}  // end GetSelectedFontFromCombo
+}
 
 // saveFontSelection ==========================================================
 /** Save the font from the currently selected item in the font dialog */
@@ -565,7 +564,7 @@ static void saveFontSelection( HWND combo, GameWindow *window )
 	font = GetSelectedFontFromCombo( combo );
 	window->winSetFont( font );
 
-}  // end saveFontSelection
+}
 
 // saveHeaderSelection ========================================================
 /** Save the Header from the currently selected item in the font dialog */
@@ -592,7 +591,7 @@ static void saveHeaderSelection( HWND comboBox, GameWindow *window )
 	// return the image loc that matches the string
 	window->winGetInstanceData()->m_headerTemplateName.set(buffer);
 
-}  // end ComboBoxSelectionToImage
+}
 
 // loadTooltipTextLabel ==============================================================
 /** Load the edit control with the window text label */
@@ -609,9 +608,9 @@ static void loadTooltipTextLabel( HWND edit, GameWindow *window )
 
 	// load the text
 	WinInstanceData *instData = window->winGetInstanceData();
-	
+
 	SendMessage( edit, WM_SETTEXT, 0, (LPARAM)instData->m_tooltipString.str() );
-}  // end loadTooltipTextLabel
+}
 
 // loadTooltipDelayTextLabel ==============================================================
 /** Load the edit control with the window text label */
@@ -628,9 +627,9 @@ static void loadTooltipDelayTextLabel( HWND dialog, HWND edit, GameWindow *windo
 
 	// load the text
 //	WinInstanceData *instData = window->winGetInstanceData();
-	
+
 //	SetDlgItemInt( dialog, edit, instData->m_tooltipDelay, TRUE );
-}  // end loadTooltipDelayTextLabel
+}
 
 // saveTooltipTextLabel ==============================================================
 /** Save the text label entry */
@@ -649,7 +648,7 @@ static void saveTooltipTextLabel( HWND edit, GameWindow *window )
 	instData->m_tooltipString.set(buffer);
 	instData->setTooltipText(TheGameText->fetch(buffer) );
 
-}  // end saveTooltipTextLabel
+}
 
 // saveTooltipTextLabel ==============================================================
 /** Save the text label entry */
@@ -663,8 +662,8 @@ static void saveTooltipDelayTextLabel(HWND dialog, HWND edit, GameWindow *window
 //  WinInstanceData *instData = window->winGetInstanceData();
 
 //  instData->m_tooltipDelay = GetDlgItemInt( dialog, edit, NULL, TRUE );
-	
-}  // end saveTooltipDelayTextLabel
+
+}
 
 
 // loadTextLabel ==============================================================
@@ -683,7 +682,7 @@ static void loadTextLabel( HWND edit, GameWindow *window )
 	// load the text
 	WinInstanceData *instData = window->winGetInstanceData();
 	SendMessage( edit, WM_SETTEXT, 0, (LPARAM)instData->m_textLabelString.str() );
-}  // end loadTextLabel
+}
 
 // saveTextLabel ==============================================================
 /** Save the text label entry */
@@ -707,7 +706,7 @@ static void saveTextLabel( HWND edit, GameWindow *window )
 	//
 	UnicodeString text;
 	text = TheGameText->fetch( (char *)instData->m_textLabelString.str()); //TheWindowManager->winTextLabelToText( instData->m_textLabelString );
-	
+
 	UnsignedInt style = window->winGetStyle();
 	if( BitIsSet( style, GWS_PUSH_BUTTON ) )
 		GadgetButtonSetText( window, text );
@@ -722,12 +721,12 @@ static void saveTextLabel( HWND edit, GameWindow *window )
 	else
 		window->winSetText( text );
 
-}  // end saveTextLavel
+}
 
 // LoadTextStateCombo =========================================================
 /** Load the text state combo */
 //=============================================================================
-void LoadTextStateCombo( HWND comboBox, 
+void LoadTextStateCombo( HWND comboBox,
 												 Color enabled, Color enabledBorder,
 												 Color disabled, Color disabledBorder,
 												 Color hilite, Color hiliteBorder )
@@ -756,7 +755,7 @@ void LoadTextStateCombo( HWND comboBox,
 	currTextIndex = 0;
 	SendMessage( comboBox, CB_SETCURSEL, currTextIndex, 0 );
 
-}  // end LoadTextStateCombo
+}
 
 // LoadStateCombo =============================================================
 /** Load the state combo box passed in based on the window type
@@ -779,18 +778,18 @@ void LoadStateCombo( UnsignedInt style, HWND comboBox )
 
 		if( BitIsSet( entry->windowType, style ) )
 		{
-			
+
 			// add string
 			index = SendMessage( comboBox, CB_ADDSTRING, 0, (LPARAM)entry->stateName );
 
 			// set the state identifier as the item data of this entry
 			SendMessage( comboBox, CB_SETITEMDATA, index, entry->stateID );
 
-		}  // end if
+		}
 
-	}  // end for entry
+	}
 
-}  // end LoadStateCombo
+}
 
 // CommonDialogInitialize =====================================================
 /** Called from all dialog initializations */
@@ -827,12 +826,12 @@ void CommonDialogInitialize( GameWindow *window, HWND dialog )
 		CheckDlgButton( dialog, CHECK_WRAP_CENTERED, BST_CHECKED );
 	if( BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) )
 		CheckDlgButton( dialog, CHECK_CHECK_LIKE, BST_CHECKED );
-		
+
 	//
 	// limit the window name box to the max name size minus some breathing
 	// room for the filename
 	//
-	SendMessage( GetDlgItem( dialog, EDIT_NAME ), EM_SETLIMITTEXT, 
+	SendMessage( GetDlgItem( dialog, EDIT_NAME ), EM_SETLIMITTEXT,
 							 MAX_WINDOW_NAME_LEN - 16, 0 );
 
 	// set the text explaining the name size limit to the user
@@ -840,7 +839,7 @@ void CommonDialogInitialize( GameWindow *window, HWND dialog )
 	sprintf( buffer, "Name length + layout filename length (.wnd) must not exceed %d characters.",
 					 MAX_WINDOW_NAME_LEN );
 	SetDlgItemText( dialog, STATIC_NAME_MAX, buffer );
-								
+
 	// set name
 	SetDlgItemText( dialog, EDIT_NAME, instData->m_decoratedNameString.str() );
 
@@ -849,7 +848,7 @@ void CommonDialogInitialize( GameWindow *window, HWND dialog )
 
 		// load listbox with image names
 	LoadHeaderTemplateListComboBox( GetDlgItem( dialog, COMBO_HEADER ), instData->m_headerTemplateName);
-	
+
 
 	// load the combo box for available properties
 	LoadStateCombo( window->winGetStyle(), GetDlgItem( dialog, COMBO_STATE ) );
@@ -882,10 +881,10 @@ void CommonDialogInitialize( GameWindow *window, HWND dialog )
 	HWND tooltipDelay = GetDlgItem( dialog, EDIT_TOOLTIP_DELAY );
 	if( tooltipDelay )
     SetDlgItemInt( dialog, EDIT_TOOLTIP_DELAY, instData->m_tooltipDelay, TRUE );
-		
 
 
-}  // end CommonDialogInitialize
+
+}
 
 // validateName ===============================================================
 /** Validate a name before saving it into a window.  All window names
@@ -907,7 +906,7 @@ static Bool validateName( GameWindow *root, GameWindow *exception, char *name )
 		MessageBox( TheEditor->getWindowHandle(), buffer, "Illegal Character", MB_OK );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// if this root window is not the exception window compare name
 	if( root != exception )
@@ -922,10 +921,10 @@ static Bool validateName( GameWindow *root, GameWindow *exception, char *name )
 			MessageBox( TheEditor->getWindowHandle(), buffer, "Duplicate Name", MB_OK );
 			return FALSE;
 
-		}  // end if
+		}
 
 
-	}  // end if
+	}
 
 	// check our children
 	GameWindow *child;
@@ -936,7 +935,7 @@ static Bool validateName( GameWindow *root, GameWindow *exception, char *name )
 	// check the next window in the list
 	return validateName( root->winGetNext(), exception, name );
 
-}  // end validateName
+}
 
 // adjustGadgetDrawMethods ====================================================
 /** Based on the WIN_STATUS_IMAGE, set the draw callbacks to the
@@ -944,7 +943,7 @@ static Bool validateName( GameWindow *root, GameWindow *exception, char *name )
 //=============================================================================
 static void adjustGadgetDrawMethods( Bool useImages, GameWindow *window )
 {
-	
+
 	// sanity
 	if( window == NULL )
 		return;
@@ -983,16 +982,16 @@ static void adjustGadgetDrawMethods( Bool useImages, GameWindow *window )
 			else
 			{
 
-				DEBUG_LOG(( "Unable to adjust draw method, undefined gadget\n" ));
+				DEBUG_LOG(( "Unable to adjust draw method, undefined gadget" ));
 				assert( 0 );
 				return;
 
-			}  // end else
+			}
 
 			// set the image status bit
 			window->winSetStatus( WIN_STATUS_IMAGE );
 
-		}  // end if, image set
+		}
 		else
 		{
 
@@ -1021,24 +1020,24 @@ static void adjustGadgetDrawMethods( Bool useImages, GameWindow *window )
 			else
 			{
 
-				DEBUG_LOG(( "Unable to adjust draw method, undefined gadget\n" ));
+				DEBUG_LOG(( "Unable to adjust draw method, undefined gadget" ));
 				assert( 0 );
 				return;
 
-			}  // end else
+			}
 
 			// clear the image bit
 			window->winClearStatus( WIN_STATUS_IMAGE );
 
-		}  // end else, image not set
-	}//end if window is gadget
+		}
+	}
 
 	// adjust any child gadgets
 	GameWindow *child;
 	for( child = window->winGetChild(); child; child = child->winGetNext() )
 		adjustGadgetDrawMethods( useImages, child );
 
-}  // end adjustGadgetDrawMethods
+}
 
 // SaveCommonDialogProperties =================================================
 /** Save properties common on all dialogs for all windows */
@@ -1148,7 +1147,7 @@ Bool SaveCommonDialogProperties( HWND dialog, GameWindow *window )
   	// save delay text label data if present
 	HWND editTooltipDelayText = GetDlgItem( dialog, EDIT_TOOLTIP_DELAY );
 	if( editTooltipDelayText )
-  	instData->m_tooltipDelay = GetDlgItemInt( dialog, EDIT_TOOLTIP_DELAY, NULL, TRUE ); 
+  	instData->m_tooltipDelay = GetDlgItemInt( dialog, EDIT_TOOLTIP_DELAY, NULL, TRUE );
 
 	HWND headerCombo = GetDlgItem( dialog, COMBO_HEADER );
 	if( headerCombo )
@@ -1158,8 +1157,8 @@ Bool SaveCommonDialogProperties( HWND dialog, GameWindow *window )
 	TheEditor->setUnsaved( TRUE );
 
 	return TRUE;
-								
-}  // end SaveCommonDialogProperties
+
+}
 
 // LoadImageListComboBox ======================================================
 /** Load a combo box with image names from the GUI image collection
@@ -1182,15 +1181,15 @@ void LoadImageListComboBox( HWND comboBox )
 
 		SendMessage( comboBox, CB_ADDSTRING, 0, (LPARAM)image->getName().str() );
 
-	}  // end for image
+	}
 
 	// add a [NONE] at the top of the image lists
 	SendMessage( comboBox, CB_INSERTSTRING, 0, (LPARAM)"[NONE]" );
 
 	// select the [NONE] label
 	SendMessage( comboBox, CB_SETCURSEL, 0, 0 );
-	
-}  // end LoadImageListComboBox
+
+}
 
 // LoadHeaderTemplateListComboBox =============================================
 /** Load a combo box with header template names
@@ -1215,7 +1214,7 @@ void LoadHeaderTemplateListComboBox( HWND comboBox, AsciiString selected )
 
 		SendMessage( comboBox, CB_ADDSTRING, 0, (LPARAM)ht->m_name.str());
 
-	}  // end for image
+	}
 
 	// add a [NONE] at the top of the image lists
 	SendMessage( comboBox, CB_INSERTSTRING, 0, (LPARAM)"[NONE]" );
@@ -1225,9 +1224,9 @@ void LoadHeaderTemplateListComboBox( HWND comboBox, AsciiString selected )
 		SendMessage( comboBox, CB_SETCURSEL, 0, 0 );
 	else
 		SendMessage( comboBox, CB_SELECTSTRING, -1, (LPARAM)selected.str() );
-	
-		
-}  // end LoadHeaderTemplateListComboBox
+
+
+}
 
 
 // ComboBoxSelectionToImage ===================================================
@@ -1236,7 +1235,7 @@ void LoadHeaderTemplateListComboBox( HWND comboBox, AsciiString selected )
 	* image Loc from the GUI collection
 	*
 	* NOTE: The image list combo boxes have a [NONE] at index 0, if that
-	* is selected NULL will be returned 
+	* is selected NULL will be returned
 	*/
 //=============================================================================
 const Image *ComboBoxSelectionToImage( HWND comboBox )
@@ -1259,9 +1258,9 @@ const Image *ComboBoxSelectionToImage( HWND comboBox )
 	SendMessage( comboBox, CB_GETLBTEXT, selected, (LPARAM)buffer );
 
 	// return the image loc that matches the string
-	return TheMappedImageCollection->findImageByName( AsciiString( buffer ) );
+	return TheMappedImageCollection->findImageByName( buffer );
 
-}  // end ComboBoxSelectionToImage
+}
 
 // GetControlColor ============================================================
 /** Search the control color table and return the color for the
@@ -1277,12 +1276,12 @@ RGBColorInt *GetControlColor( UnsignedInt controlID )
 		if( entry->controlID == controlID )
 			return &entry->color;
 
-	}  // end for
+	}
 
 	// not found
 	return NULL;
 
-}  // end GetControlColor
+}
 
 // SetControlColor ============================================================
 /** Set the color in the table with the matching control ID */
@@ -1307,11 +1306,11 @@ void SetControlColor( UnsignedInt controlID, Color color )
 			entry->color.blue = blue;
 			break;
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
-}  // end SetControlColor
+}
 
 // GetStateInfo ===============================================================
 /** Get a image and color state entry */
@@ -1326,11 +1325,11 @@ ImageAndColorInfo *GetStateInfo( StateIdentifier id )
 		if( entry->stateID == id )
 			return entry;
 
-	}  // end for entry
+	}
 
 	return NULL;
 
-}  // end GetStateInfo
+}
 
 // SwitchToState ==============================================================
 /** Switch the image and color combo box to specified state, invalidate
@@ -1349,11 +1348,11 @@ void SwitchToState( StateIdentifier id, HWND dialog )
 	if( info == NULL )
 	{
 
-		DEBUG_LOG(( "Invalid state request\n" ));
+		DEBUG_LOG(( "Invalid state request" ));
 		assert( 0 );
 		return;
 
-	}  // end if
+	}
 
 	// select the string in the state combo box
 	SendMessage( stateBox, CB_SELECTSTRING, -1, (LPARAM)info->stateName );
@@ -1371,7 +1370,7 @@ void SwitchToState( StateIdentifier id, HWND dialog )
 	InvalidateRect( colorButton, NULL, TRUE );
 	InvalidateRect( borderColorButton, NULL, TRUE );
 
-}  // end SwitchToState
+}
 
 // StoreImageAndColor =========================================================
 /** Store the image and colors in the table */
@@ -1392,11 +1391,11 @@ void StoreImageAndColor( StateIdentifier id, const Image *image,
 			entry->borderColor = borderColor;
 			break;  // exit for
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
-}  // end StoreImageAndColor
+}
 
 // StoreColor =================================================================
 /** Store the colors in the table */
@@ -1415,11 +1414,11 @@ void StoreColor( StateIdentifier id, Color color, Color borderColor )
 			entry->borderColor = borderColor;
 			break;  // exit for
 
-		}  // end if
+		}
 
-	}  // end for
+	}
 
-}  // end StoreColor
+}
 
 // GetCurrentStateInfo ========================================================
 /** Get the info on the current state selected in the state combo */
@@ -1440,7 +1439,7 @@ ImageAndColorInfo *GetCurrentStateInfo( HWND dialog )
 
 	return GetStateInfo( stateID );
 
-}  // end GetCurrentStateInfo
+}
 
 // PositionWindowOnScreen =====================================================
 /** Position the window on the screen, but keep the window completely
@@ -1474,13 +1473,13 @@ void PositionWindowOnScreen( HWND window, Int x, Int y )
 		windowPos.y = screenRect.bottom - windowSize.y;
 
 	// place the window
-	MoveWindow( window, windowPos.x, windowPos.y, 
+	MoveWindow( window, windowPos.x, windowPos.y,
 							windowSize.x, windowSize.y, TRUE );
 
 	// show the window
 	ShowWindow( window, SW_SHOW );
 
-}  // end PositionWindowOnScreen
+}
 
 // HandleCommonDialogMessages =================================================
 /** Handle any messages common to all controls on all property dialogs */
@@ -1497,8 +1496,8 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 		// ------------------------------------------------------------------------
 		case WM_DRAWITEM:
 		{
-      UINT controlID = (UINT)wParam;  // control identifier 
-      LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; // item drawing 
+      UINT controlID = (UINT)wParam;  // control identifier
+      LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam; // item drawing
 			Color color = GAME_COLOR_UNDEFINED;
 //			ImageAndColorInfo *info = GetCurrentStateInfo( hWndDialog );
 
@@ -1513,9 +1512,9 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 					else
 						color = info->borderColor;
 
-			}  // end if
+			}
 			else if( controlID == BUTTON_TEXT_COLOR || controlID == BUTTON_TEXT_BORDER_COLOR )
-			{		
+			{
 				TextDrawData textDraw = textDrawData[ currTextIndex ];
 
 				if( controlID == BUTTON_TEXT_COLOR )
@@ -1523,7 +1522,7 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 				else
 					color = textDraw.borderColor;
 
-			}  // end else if
+			}
 
 			if( color != GAME_COLOR_UNDEFINED )
 			{
@@ -1535,11 +1534,11 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 				// if this control is disabled just let windows handle drawing
 				if( IsWindowEnabled( hWndControl ) == FALSE )
 				{
-					
+
 					*returnCode = FALSE;
 					break;
 
-				}  // end if
+				}
 
 				// get the color info
 				GameGetColorComponents( color, &r, &g, &b, &a );
@@ -1566,12 +1565,12 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 				used = TRUE;
 				break;
 
-			}  // end if
+			}
 
 			*returnCode = FALSE;
 			break;
 
-		}  // end draw item
+		}
 
 		// ------------------------------------------------------------------------
     case WM_COMMAND:
@@ -1579,7 +1578,7 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 			Int notifyCode = HIWORD( wParam );  // notification code
 			Int controlID = LOWORD( wParam );  // control ID
 			HWND hWndControl = (HWND)lParam;  // control window handle
- 
+
       switch( controlID )
       {
 
@@ -1598,11 +1597,11 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 						newState = (StateIdentifier)SendMessage( hWndControl, CB_GETITEMDATA, selected, 0 );
 						SwitchToState( newState, hWndDialog );
 
-					}  // end if
+					}
 					used = TRUE;
 					break;
 
-				}  // end state
+				}
 
 				// --------------------------------------------------------------------
 				case COMBO_TEXT_STATE:
@@ -1619,31 +1618,31 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 						InvalidateRect( GetDlgItem( hWndDialog, BUTTON_TEXT_COLOR ), NULL, TRUE );
 						InvalidateRect( GetDlgItem( hWndDialog, BUTTON_TEXT_BORDER_COLOR ), NULL, TRUE );
 
-					}  // end if
+					}
 					used = TRUE;
 					break;
 
-				}  // end text state
+				}
 
 				// --------------------------------------------------------------------
 				case COMBO_IMAGE:
 				{
-					
+
 					// store image selection changes
 					if( notifyCode == CBN_SELCHANGE )
 					{
 						ImageAndColorInfo *info = GetCurrentStateInfo( hWndDialog );
 						const Image *newImage = ComboBoxSelectionToImage( hWndControl );
 
-						StoreImageAndColor( info->stateID, newImage, 
+						StoreImageAndColor( info->stateID, newImage,
 																info->color, info->borderColor );
 
-					}  // end if
-	
+					}
+
 					used = TRUE;
 					break;
 
-				}  // end image
+				}
 
 				// --------------------------------------------------------------------
 				case BUTTON_COLOR:
@@ -1698,25 +1697,25 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message,
 						// invalidate the color preview
 						InvalidateRect( hWndControl, NULL, TRUE );
 
-					}  // end if
+					}
 
 					used = TRUE;
 					break;
 
-				}  // end color buttons
+				}
 
-      }  // end switch( LOWORD( wParam ) )
+      }
 
       *returnCode = 0;
 			break;
 
-    } // end of WM_COMMAND
+    }
 
-  }  // end of switch
+  }
 
 	return used;
 
-}  // end HandleCommonDialogMessages
+}
 
 // GetProprsEnabledTextColor ==================================================
 //=============================================================================
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp
index 615ef68267a..0cafceb9661 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp
@@ -24,12 +24,12 @@
 
 // FILE: Save.cpp /////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    GUIEdit
@@ -44,7 +44,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-#include <stdio.h>
 #include <assert.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
@@ -88,7 +87,7 @@ static void fileNewLine( FILE *fp )
 	fprintf( fp, "\n" );
 	fflush( fp );
 
-}  // end fileNewLine
+}
 
 // writeBufferToFile ==========================================================
 /** Write the contents of the buffer to the file */
@@ -106,7 +105,7 @@ static void writeBufferToFile( FILE *fp, char *buffer )
 	//
 	fflush( fp );
 
-}  // end writeBufferToFile
+}
 
 // clearBufferToSpaces ========================================================
 /** Clear the buffer to all spaces */
@@ -118,7 +117,7 @@ static void clearBufferToSpaces( void )
 	for( i = 0; i < BUFFER_SIZE; i++ )
 		buffer[ i ] = ' ';
 
-}  // end clearBufferToSpaces
+}
 
 // saveType ===================================================================
 /** Save type of window */
@@ -159,7 +158,7 @@ static Bool saveType( GameWindow *window, FILE *fp, Int dataIndent )
 
 	return TRUE;
 
-}  // end saveType
+}
 
 // savePosition ===============================================================
 /** Save window position data */
@@ -180,19 +179,19 @@ static Bool savePosition( GameWindow *window, FILE *fp, Int dataIndent )
 	// created them in (the edit window size) so we can scale them by
 	// that ratio if need be
 	//
-	sprintf( &buffer[ dataIndent ], "SCREENRECT = UPPERLEFT: %d %d,\n", 
+	sprintf( &buffer[ dataIndent ], "SCREENRECT = UPPERLEFT: %d %d,\n",
 					 screenRect.lo.x, screenRect.lo.y );
 	writeBufferToFile( fp, buffer );
-	sprintf( &buffer[ dataIndent ], "             BOTTOMRIGHT: %d %d,\n", 
+	sprintf( &buffer[ dataIndent ], "             BOTTOMRIGHT: %d %d,\n",
 					 screenRect.hi.x, screenRect.hi.y );
 	writeBufferToFile( fp, buffer );
-	sprintf( &buffer[ dataIndent ], "             CREATIONRESOLUTION: %d %d;\n", 
+	sprintf( &buffer[ dataIndent ], "             CREATIONRESOLUTION: %d %d;\n",
 					 TheDisplay->getWidth(), TheDisplay->getHeight() );
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
 
-}  // end savePosition
+}
 
 // saveName ===================================================================
 // Save name */
@@ -201,13 +200,13 @@ static Bool saveName( GameWindow *window, FILE *fp, Int dataIndent )
 {
 	WinInstanceData *instData = window->winGetInstanceData();
 
-	sprintf( &buffer[ dataIndent ], "NAME = \"%s:%s\";\n", 
+	sprintf( &buffer[ dataIndent ], "NAME = \"%s:%s\";\n",
 					 TheEditor->getSaveFilename(), instData->m_decoratedNameString.str() );
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
 
-}  // end saveName
+}
 
 // saveStatus =================================================================
 /** Save status information */
@@ -227,31 +226,31 @@ static Bool saveStatus( GameWindow *window, FILE *fp, Int dataIndent )
 		bit = 1 << i;
 		if( BitIsSet( window->winGetStatus(), bit ) )
 		{
-			
+
 			// if this is an additional bit add a +
 			if( bitWritten == TRUE )
-				strcat( buffer, "+");
+				strlcat(buffer, "+", ARRAY_SIZE(buffer));
 
 			// add status name
-			strcat( buffer, WindowStatusNames[ i ] );
+			strlcat(buffer, WindowStatusNames[ i ], ARRAY_SIZE(buffer));
 			bitWritten = TRUE;
 
-		}  // end
+		}
 		i++;
 
-	}  // end while
-	
+	}
+
 	// if no bits written write NONE in the file
 	if( bitWritten == FALSE )
-		strcat( buffer, "NONE" );
+		strlcat(buffer, "NONE", ARRAY_SIZE(buffer));
 
 	// complete line and write
-	strcat( buffer, ";\n" );
+	strlcat(buffer, ";\n", ARRAY_SIZE(buffer));
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
 
-}  // end saveStatus
+}
 
 // saveStyle ==================================================================
 /** Save style information */
@@ -271,31 +270,31 @@ static Bool saveStyle( GameWindow *window, FILE *fp, Int dataIndent )
 		bit = 1 << i;
 		if( BitIsSet( window->winGetStyle(), bit ) )
 		{
-			
+
 			// if this is an additional bit add a +
 			if( bitWritten == TRUE )
-				strcat( buffer, "+");
+				strlcat(buffer, "+", ARRAY_SIZE(buffer));
 
 			// add status name
-			strcat( buffer, WindowStyleNames[ i ] );
+			strlcat(buffer, WindowStyleNames[ i ], ARRAY_SIZE(buffer));
 			bitWritten = TRUE;
 
-		}  // end
+		}
 		i++;
-	
-	}  // end while
+
+	}
 
 	// if no bits written write NONE in the file
 	if( bitWritten == FALSE )
-		strcat( buffer, "NONE" );
+		strlcat(buffer, "NONE", ARRAY_SIZE(buffer));
 
 	// complete line and write
-	strcat( buffer, ";\n" );
+	strlcat(buffer, ";\n", ARRAY_SIZE(buffer));
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
 
-}  // end saveStyle
+}
 
 // saveCallbacks ==============================================================
 /** Save string representations of the window function callbacks into
@@ -341,7 +340,7 @@ static Bool saveCallbacks( GameWindow *window, FILE *fp, Int dataIndent )
 
 	return TRUE;
 
-}  // end saveCallbacks
+}
 
 // saveHeaderTemplate =========================================================
 /** Save HeaderTemplate for a window */
@@ -354,9 +353,9 @@ static Bool  saveHeaderTemplate(GameWindow *window, FILE *fp, Int dataIndent  )
 		headerName = GUIEDIT_NONE_STRING;
 	sprintf( &buffer[ dataIndent ], "HEADERTEMPLATE = \"%s\";\n", headerName.str() );
 	writeBufferToFile( fp, buffer );
-	
+
 	return TRUE;
-} 
+}
 
 // saveFont ===================================================================
 /** Save font name for a window */
@@ -366,17 +365,17 @@ static Bool saveFont( GameWindow *window, FILE *fp, Int dataIndent )
 	GameFont *font = window->winGetFont();
 
 	// if no font data don't write anything
-	if( font == NULL )	
+	if( font == NULL )
 		return TRUE;
 
 	// write the font data
-	sprintf( &buffer[ dataIndent ], "FONT = NAME: \"%s\", SIZE: %d, BOLD: %d;\n", 
+	sprintf( &buffer[ dataIndent ], "FONT = NAME: \"%s\", SIZE: %d, BOLD: %d;\n",
 					 font->nameString.str(), font->pointSize, font->bold );
 	writeBufferToFile( fp, buffer );
-	
+
 	return TRUE;
 
-}  // end saveFont
+}
 
 // saveTooltipText ===================================================================
 /** Save the text for a window */
@@ -391,11 +390,11 @@ static Bool saveTooltipText( GameWindow *window, FILE *fp, Int dataIndent )
 		sprintf( &buffer[ dataIndent ], "TOOLTIPTEXT = \"%s\";\n", instData->m_tooltipString.str() );
 		writeBufferToFile( fp, buffer );
 
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end saveTooltipText
+}
 
 // saveTooltipDelay ===================================================================
 /** Save the delay for a window */
@@ -414,7 +413,7 @@ static Bool saveTooltipDelay( GameWindow *window, FILE *fp, Int dataIndent )
 
 	return TRUE;
 
-}  // end saveTooltipText
+}
 
 // saveText ===================================================================
 /** Save the text for a window */
@@ -430,11 +429,11 @@ static Bool saveText( GameWindow *window, FILE *fp, Int dataIndent )
 		sprintf( &buffer[ dataIndent ], "TEXT = \"%s\";\n", instData->m_textLabelString.str() );
 		writeBufferToFile( fp, buffer );
 
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end saveText
+}
 
 // saveTextColor ==============================================================
 /** Save the text colors for enabled, disable, and hilite with
@@ -470,18 +469,18 @@ static Bool saveTextColor( GameWindow *window, FILE *fp, Int dataIndent )
 			sprintf( &buffer[ dataIndent ], "TEXTCOLOR = ENABLED:  %d %d %d %d, ENABLEDBORDER:  %d %d %d %d,\n",
 							 r, g, b, a, br, bg, bb, ba );
 		else if( i == max - 1 )
-			sprintf( &buffer[ dataIndent ], "            HILITE:   %d %d %d %d, HILITEBORDER:   %d %d %d %d;\n",			
+			sprintf( &buffer[ dataIndent ], "            HILITE:   %d %d %d %d, HILITEBORDER:   %d %d %d %d;\n",
 							 r, g, b, a, br, bg, bb, ba );
 		else
-			sprintf( &buffer[ dataIndent ], "            DISABLED: %d %d %d %d, DISABLEDBORDER: %d %d %d %d,\n",			
+			sprintf( &buffer[ dataIndent ], "            DISABLED: %d %d %d %d, DISABLEDBORDER: %d %d %d %d,\n",
 							 r, g, b, a, br, bg, bb, ba );
 		writeBufferToFile( fp, buffer );
 
-	}  // end for i
+	}
 
 	return TRUE;
 
-}  // end saveTextColor
+}
 
 // tokenIsEnabledData =========================================================
 /** Token refers to enabled draw data */
@@ -501,8 +500,8 @@ static Bool tokenIsEnabledData( const char *token )
 		return TRUE;
 
 	return FALSE;
-	
-}  // end tokenIsEnabledData
+
+}
 
 // tokenIsDisabledData ========================================================
 /** Token refers to Disabled draw data */
@@ -521,8 +520,8 @@ static Bool tokenIsDisabledData( const char *token )
 		return TRUE;
 
 	return FALSE;
-	
-}  // end tokenIsDisabledData
+
+}
 
 // tokenIsHiliteData ==========================================================
 /** Token refers to Hilite draw data */
@@ -541,13 +540,13 @@ static Bool tokenIsHiliteData( const char *token )
 		return TRUE;
 
 	return FALSE;
-	
-}  // end tokenIsHiliteData
+
+}
 
 // saveDrawData ===============================================================
 /** Save the draw data array */
 //=============================================================================
-static Bool saveDrawData( const char *token, GameWindow *window, 
+static Bool saveDrawData( const char *token, GameWindow *window,
 													FILE *fp, Int dataIndent )
 {
 	Int i;
@@ -577,11 +576,11 @@ static Bool saveDrawData( const char *token, GameWindow *window,
 		else
 		{
 
-			DEBUG_LOG(( "Save draw data, unknown token '%s'\n", token ));
+			DEBUG_LOG(( "Save draw data, unknown token '%s'", token ));
 			assert( 0 );
 			return FALSE;
 
-		}  // end else
+		}
 
 		image = drawData->image;
 		GameGetColorComponents( drawData->color, &r, &g, &b, &a );
@@ -599,11 +598,11 @@ static Bool saveDrawData( const char *token, GameWindow *window,
 
 		writeBufferToFile( fp, buffer );
 
-	}  // end for i
+	}
 
 	return TRUE;
 
-}  // end saveDrawData
+}
 
 // saveListboxData ============================================================
 /** Save listbox data to the file */
@@ -616,12 +615,12 @@ static Bool saveListboxData( GameWindow *window, FILE *fp, Int dataIndent )
 	if( listData == NULL )
 	{
 
-		DEBUG_LOG(( "No listbox data to save for window '%d'\n", 
+		DEBUG_LOG(( "No listbox data to save for window '%d'",
 						 window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	sprintf( &buffer[ dataIndent ], "LISTBOXDATA = LENGTH: %d,\n", listData->listLength );
 	writeBufferToFile( fp, buffer );
@@ -641,13 +640,13 @@ static Bool saveListboxData( GameWindow *window, FILE *fp, Int dataIndent )
 	{
 		for(Int i = 0; i < listData->columns; i++ )
 		{
-			sprintf( &buffer[ dataIndent ], "              COLUMNSWIDTH%%: %d,\n", listData->columnWidthPercentage[i] );	
-			writeBufferToFile( fp, buffer );	
+			sprintf( &buffer[ dataIndent ], "              COLUMNSWIDTH%%: %d,\n", listData->columnWidthPercentage[i] );
+			writeBufferToFile( fp, buffer );
 		}
 	}
-	sprintf( &buffer[ dataIndent ], "              FORCESELECT: %d;\n", listData->forceSelect );	
-	writeBufferToFile( fp, buffer );	
-	
+	sprintf( &buffer[ dataIndent ], "              FORCESELECT: %d;\n", listData->forceSelect );
+	writeBufferToFile( fp, buffer );
+
 	// save the up button draw data for the listbox
 	if( listData->upButton )
 	{
@@ -656,7 +655,7 @@ static Bool saveListboxData( GameWindow *window, FILE *fp, Int dataIndent )
 		saveDrawData( "LISTBOXDISABLEDUPBUTTONDRAWDATA", listData->upButton, fp, dataIndent );
 		saveDrawData( "LISTBOXHILITEUPBUTTONDRAWDATA", listData->upButton, fp, dataIndent );
 
-	}  // end if
+	}
 
 	// save down button draw data for listbox
 	if( listData->downButton )
@@ -666,7 +665,7 @@ static Bool saveListboxData( GameWindow *window, FILE *fp, Int dataIndent )
 		saveDrawData( "LISTBOXDISABLEDDOWNBUTTONDRAWDATA", listData->downButton, fp, dataIndent );
 		saveDrawData( "LISTBOXHILITEDOWNBUTTONDRAWDATA", listData->downButton, fp, dataIndent );
 
-	}  // end if
+	}
 
 	// save the slider draw data on the listbox
 	if( listData->slider )
@@ -683,13 +682,13 @@ static Bool saveListboxData( GameWindow *window, FILE *fp, Int dataIndent )
 			saveDrawData( "SLIDERTHUMBDISABLEDDRAWDATA", thumb, fp, dataIndent );
 			saveDrawData( "SLIDERTHUMBHILITEDRAWDATA", thumb, fp, dataIndent );
 
-		}  // end if
+		}
 
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end saveListboxData
+}
 
 // saveComboBoxData ============================================================
 /** Save Combo Box data to the file */
@@ -702,33 +701,33 @@ static Bool saveComboBoxData( GameWindow *window, FILE *fp, Int dataIndent )
 	if( comboData == NULL )
 	{
 
-		DEBUG_LOG(( "No comboData data to save for window '%d'\n", 
+		DEBUG_LOG(( "No comboData data to save for window '%d'",
 						 window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
-	
+	}
+
 	sprintf( &buffer[ dataIndent ], "COMBOBOXDATA = ISEDITABLE: %d,\n", comboData->isEditable );
 	writeBufferToFile( fp, buffer );
-	sprintf( &buffer[ dataIndent ], "              MAXCHARS: %d,\n", comboData->maxChars );	
-	writeBufferToFile( fp, buffer );	
-	sprintf( &buffer[ dataIndent ], "              MAXDISPLAY: %d,\n", comboData->maxDisplay );	
-	writeBufferToFile( fp, buffer );	
-	sprintf( &buffer[ dataIndent ], "              ASCIIONLY: %d,\n", comboData->asciiOnly );	
-	writeBufferToFile( fp, buffer );	
-	sprintf( &buffer[ dataIndent ], "              LETTERSANDNUMBERS: %d;\n", comboData->lettersAndNumbersOnly );	
-	writeBufferToFile( fp, buffer );	
-	
+	sprintf( &buffer[ dataIndent ], "              MAXCHARS: %d,\n", comboData->maxChars );
+	writeBufferToFile( fp, buffer );
+	sprintf( &buffer[ dataIndent ], "              MAXDISPLAY: %d,\n", comboData->maxDisplay );
+	writeBufferToFile( fp, buffer );
+	sprintf( &buffer[ dataIndent ], "              ASCIIONLY: %d,\n", comboData->asciiOnly );
+	writeBufferToFile( fp, buffer );
+	sprintf( &buffer[ dataIndent ], "              LETTERSANDNUMBERS: %d;\n", comboData->lettersAndNumbersOnly );
+	writeBufferToFile( fp, buffer );
+
 	//Save teh dropDownButton draw data for the combo box
 	if( comboData->dropDownButton )
 	{
-									 
+
 		saveDrawData( "COMBOBOXDROPDOWNBUTTONENABLEDDRAWDATA", comboData->dropDownButton, fp, dataIndent );
 		saveDrawData( "COMBOBOXDROPDOWNBUTTONDISABLEDDRAWDATA", comboData->dropDownButton, fp, dataIndent );
 		saveDrawData( "COMBOBOXDROPDOWNBUTTONHILITEDRAWDATA", comboData->dropDownButton, fp, dataIndent );
 
-	}  // end if
+	}
 
 	if( comboData->editBox )
 	{
@@ -737,7 +736,7 @@ static Bool saveComboBoxData( GameWindow *window, FILE *fp, Int dataIndent )
 		saveDrawData( "COMBOBOXEDITBOXDISABLEDDRAWDATA", comboData->editBox, fp, dataIndent );
 		saveDrawData( "COMBOBOXEDITBOXHILITEDRAWDATA", comboData->editBox, fp, dataIndent );
 
-	}  // end if
+	}
 
 	if(comboData->listBox)
 	{
@@ -746,7 +745,7 @@ static Bool saveComboBoxData( GameWindow *window, FILE *fp, Int dataIndent )
 			saveDrawData( "COMBOBOXLISTBOXENABLEDDRAWDATA", comboData->listBox, fp, dataIndent );
 			saveDrawData( "COMBOBOXLISTBOXDISABLEDDRAWDATA", comboData->listBox, fp, dataIndent );
 			saveDrawData( "COMBOBOXLISTBOXHILITEDRAWDATA", comboData->listBox, fp, dataIndent );
-		
+
 		// save the up button draw data for the listbox
 		if( listData->upButton )
 		{
@@ -755,7 +754,7 @@ static Bool saveComboBoxData( GameWindow *window, FILE *fp, Int dataIndent )
 			saveDrawData( "LISTBOXDISABLEDUPBUTTONDRAWDATA", listData->upButton, fp, dataIndent );
 			saveDrawData( "LISTBOXHILITEUPBUTTONDRAWDATA", listData->upButton, fp, dataIndent );
 
-		}  // end if
+		}
 
 		// save down button draw data for listbox
 		if( listData->downButton )
@@ -765,7 +764,7 @@ static Bool saveComboBoxData( GameWindow *window, FILE *fp, Int dataIndent )
 			saveDrawData( "LISTBOXDISABLEDDOWNBUTTONDRAWDATA", listData->downButton, fp, dataIndent );
 			saveDrawData( "LISTBOXHILITEDOWNBUTTONDRAWDATA", listData->downButton, fp, dataIndent );
 
-		}  // end if
+		}
 
 		// save the slider draw data on the listbox
 		if( listData->slider )
@@ -782,13 +781,13 @@ static Bool saveComboBoxData( GameWindow *window, FILE *fp, Int dataIndent )
 				saveDrawData( "SLIDERTHUMBDISABLEDDRAWDATA", thumb, fp, dataIndent );
 				saveDrawData( "SLIDERTHUMBHILITEDRAWDATA", thumb, fp, dataIndent );
 
-			}  // end if
+			}
 
-		}  // end if
-	}// end if
+		}
+	}
 	return TRUE;
 
-}  // end saveComboBoxData
+}
 
 
 // saveRadioButtonData ========================================================
@@ -802,19 +801,19 @@ static Bool saveRadioButtonData( GameWindow *window, FILE *fp, Int dataIndent )
 	{
 
 
-		DEBUG_LOG(( "No radio button data to save for window '%d'\n", 
+		DEBUG_LOG(( "No radio button data to save for window '%d'",
 						 window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	sprintf( &buffer[ dataIndent ], "RADIOBUTTONDATA = GROUP: %d;\n", radioData->group );
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
 
-}  // end saveRadioButtonData
+}
 
 // saveSliderData =============================================================
 /** Save slider specific data */
@@ -827,12 +826,12 @@ static Bool saveSliderData( GameWindow *window, FILE *fp, Int dataIndent )
 	if( sliderData == NULL )
 	{
 
-		DEBUG_LOG(( "No slider data in window to save for window %d\n", 
+		DEBUG_LOG(( "No slider data in window to save for window %d",
 							window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	sprintf( &buffer[ dataIndent ], "SLIDERDATA = MINVALUE: %d,\n", sliderData->minVal );
 	writeBufferToFile( fp, buffer );
@@ -848,11 +847,11 @@ static Bool saveSliderData( GameWindow *window, FILE *fp, Int dataIndent )
 		saveDrawData( "SLIDERTHUMBDISABLEDDRAWDATA", thumb, fp, dataIndent );
 		saveDrawData( "SLIDERTHUMBHILITEDRAWDATA", thumb, fp, dataIndent );
 
-	}  // end if
+	}
 
 	return TRUE;
 
-}  // end saveSliderData
+}
 
 // saveStaticTextData =========================================================
 /** Save static text data entry */
@@ -865,19 +864,19 @@ static Bool saveStaticTextData( GameWindow *window, FILE *fp, Int dataIndent )
 	if( textData == NULL )
 	{
 
-		DEBUG_LOG(( "No text data in window to save for window %d\n", 
+		DEBUG_LOG(( "No text data in window to save for window %d",
 							window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	sprintf( &buffer[ dataIndent ], "STATICTEXTDATA = CENTERED: %d;\n", textData->centered );
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
 
-}  // end saveStaticTextData
+}
 
 // saveTextEntryData ==========================================================
 /** Save static text data entry */
@@ -890,12 +889,12 @@ static Bool saveTextEntryData( GameWindow *window, FILE *fp, Int dataIndent )
 	if( entryData == NULL )
 	{
 
-		DEBUG_LOG(( "No text entry data in window to save for window %d\n", 
+		DEBUG_LOG(( "No text entry data in window to save for window %d",
 							window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	sprintf( &buffer[ dataIndent ], "TEXTENTRYDATA = MAXLEN: %d,\n", entryData->maxTextLen );
 	writeBufferToFile( fp, buffer );
@@ -910,7 +909,7 @@ static Bool saveTextEntryData( GameWindow *window, FILE *fp, Int dataIndent )
 
 	return TRUE;
 
-}  // end saveTextEntryData
+}
 
 // saveTabControlData ==========================================================
 /** Save tab control entry */
@@ -923,12 +922,12 @@ static Bool saveTabControlData( GameWindow *window, FILE *fp, Int dataIndent )
 	if( tabControlData == NULL )
 	{
 
-		DEBUG_LOG(( "No text entry data in window to save for window %d\n", 
+		DEBUG_LOG(( "No text entry data in window to save for window %d",
 							window->winGetWindowId() ));
 		assert( 0 );
 		return FALSE;
 
-	}  // end if
+	}
 
 	sprintf( &buffer[ dataIndent ], "TABCONTROLDATA = TABORIENTATION: %d,\n", tabControlData->tabOrientation );
 	writeBufferToFile( fp, buffer );
@@ -970,7 +969,7 @@ static Bool saveGadgetData( GameWindow *window, FILE *fp, Int dataIndent )
 		return saveComboBoxData( window, fp, dataIndent );
 	else if( BitIsSet( window->winGetStyle(), GWS_RADIO_BUTTON ) )
 		return saveRadioButtonData( window, fp, dataIndent );
-	else if( BitIsSet( window->winGetStyle(), GWS_VERT_SLIDER | 
+	else if( BitIsSet( window->winGetStyle(), GWS_VERT_SLIDER |
 																					 GWS_HORZ_SLIDER ) )
 		return saveSliderData( window, fp, dataIndent );
 	else if( BitIsSet( window->winGetStyle(), GWS_STATIC_TEXT ) )
@@ -982,7 +981,7 @@ static Bool saveGadgetData( GameWindow *window, FILE *fp, Int dataIndent )
 
 	return TRUE;
 
-}  // end saveGadgetData
+}
 
 // saveWindow =================================================================
 /** Save a single window and any of its child windows.  Note that child
@@ -1027,7 +1026,7 @@ static Bool saveWindow( FILE *fp, GameWindow *window, Int indent )
 	}
 
 	//
-	// save child data if present, we do not save child data of GUI controls 
+	// save child data if present, we do not save child data of GUI controls
 	// themselves, only generic stuff, except for the Tab Control again, which
 	// is the gadget with children exception
 	//
@@ -1041,7 +1040,7 @@ static Bool saveWindow( FILE *fp, GameWindow *window, Int indent )
 			// traverse to end of child list
 			while( child->winGetNext() != NULL )
 				child = child->winGetNext();
-					
+
 			// save children windows in reverse order
 			while( child )
 			{
@@ -1058,30 +1057,30 @@ static Bool saveWindow( FILE *fp, GameWindow *window, Int indent )
 				// previous child
 				child = child->winGetPrev();
 
-			}  // end while
+			}
 
 			// all children saved
 			sprintf( &buffer[ dataIndent ], "ENDALLCHILDREN\n" );
 			writeBufferToFile( fp, buffer );
 
-		}  // end if, children present
+		}
 
-	}  // end if
+	}
 	else
 	{
 
 		// save specific gadget data
 		saveGadgetData( window, fp, dataIndent );
 
-	}  // end else
-			
+	}
+
 	// end of window definition
 	sprintf( &buffer[ indent ], "END\n" );
 	writeBufferToFile( fp, buffer );
 
 	return success;
 
-}  // end saveWindow
+}
 
 // GUIEdit::validateNames =====================================================
 /** Stored in the m_decorated field for each window is a name given
@@ -1094,7 +1093,7 @@ static Bool saveWindow( FILE *fp, GameWindow *window, Int indent )
 //=============================================================================
 void GUIEdit::validateNames( GameWindow *root, char *filename, Bool *valid )
 {
-	
+
 	// the end of recursion
 	if( root == NULL )
 		return;
@@ -1108,35 +1107,35 @@ void GUIEdit::validateNames( GameWindow *root, char *filename, Bool *valid )
 		*valid = FALSE;
 		return;
 
-	}  // end if
+	}
 
 	// check this name for too long
 	WinInstanceData *instData = root->winGetInstanceData();
 	if( strlen( filename ) + instData->m_decoratedNameString.getLength() >= MAX_WINDOW_NAME_LEN )
 	{
 
-		strcat( offendingNames, "[Too Long] " );
-		strcat( offendingNames, filename );
-		strcat( offendingNames, ":" );
-		strcat( offendingNames, instData->m_decoratedNameString.str() );
-		strcat( offendingNames, "\n");
+		strlcat(offendingNames, "[Too Long] ", ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, filename, ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, ":", ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, instData->m_decoratedNameString.str(), ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, "\n", ARRAY_SIZE(offendingNames));
 		*valid = FALSE;
 
-	}  // end if
+	}
 
 	// check for a duplicate filename
-	if( TheEditor->isNameDuplicate( TheWindowManager->winGetWindowList(),
+	if( isNameDuplicate( TheWindowManager->winGetWindowList(),
 																	root, instData->m_decoratedNameString ) )
 	{
 
-		strcat( offendingNames, "[Duplicate] " );
-		strcat( offendingNames, filename );
-		strcat( offendingNames, ":" );
-		strcat( offendingNames, instData->m_decoratedNameString.str() );
-		strcat( offendingNames, "\n" );
+		strlcat(offendingNames, "[Duplicate] ", ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, filename, ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, ":", ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, instData->m_decoratedNameString.str(), ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, "\n", ARRAY_SIZE(offendingNames));
 		*valid = FALSE;
 
-	}  // end if
+	}
 
 	//You only call this on the first child since the call right after it will handle siblings (depth first)
 	GameWindow *child = root->winGetChild();
@@ -1145,7 +1144,7 @@ void GUIEdit::validateNames( GameWindow *root, char *filename, Bool *valid )
 	// onto the next window
 	validateNames( root->winGetNext(), filename, valid );
 
-}  // end validateNames
+}
 
 // GUIEdit::updateRadioScreenIdentifiers ======================================
 /** update all radio button screen identifiers with the new identifier */
@@ -1164,7 +1163,7 @@ void GUIEdit::updateRadioScreenIdentifiers( GameWindow *window, Int screenID )
 
 		GadgetRadioSetGroup( window, radioData->group, screenID );
 
-	}  // end if
+	}
 
 	// check our children
 	GameWindow *child;
@@ -1174,7 +1173,7 @@ void GUIEdit::updateRadioScreenIdentifiers( GameWindow *window, Int screenID )
 	// check the next one
 	updateRadioScreenIdentifiers( window->winGetNext(), screenID );
 
-}  // end updateRadioScreenIdentifiers
+}
 
 //-------------------------------------------------------------------------------------------------
 /** Write layout block for a window file */
@@ -1193,7 +1192,7 @@ static void writeLayoutBlock( FILE *fp )
 	// end marker
 	fprintf( fp, "ENDLAYOUTBLOCK\n" );
 
-}  // end writeLayoutBlock
+}
 
 // GUIEdit::saveData ==========================================================
 /** Save all our data to the file specified in filePath, which is a full
@@ -1229,14 +1228,14 @@ Bool GUIEdit::saveData( char *filePathAndFilename, char *filename )
 	if( valid == FALSE )
 	{
 
-		MessageBox( TheEditor->getWindowHandle(), offendingNames, "Window Name Error", MB_OK );	
+		MessageBox( getWindowHandle(), offendingNames, "Window Name Error", MB_OK );
 		return FALSE;
 
-	}  // end if
+	}
 
 	// update all radio button screen identifiers with the filename
 	updateRadioScreenIdentifiers( TheWindowManager->winGetWindowList(),
-																TheNameKeyGenerator->nameToKey( AsciiString(m_saveFilename) ) );
+																TheNameKeyGenerator->nameToKey( m_saveFilename ) );
 
 	// open the file
 	fp = fopen( filePathAndFilename, "w" );
@@ -1270,14 +1269,14 @@ Bool GUIEdit::saveData( char *filePathAndFilename, char *filename )
 			break;
 		window = window->winGetPrev();
 
-	}  // end while
+	}
 
 	// close the file
 	fclose( fp );
 
 	return success;
 
-}  // end saveData
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/WinMain.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/WinMain.cpp
index cbe8569b0c2..52ea538ae19 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Source/WinMain.cpp
+++ b/GeneralsMD/Code/Tools/GUIEdit/Source/WinMain.cpp
@@ -24,12 +24,12 @@
 
 // FILE: WinMain.cpp //////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -50,8 +50,8 @@
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 #include "Common/Debug.h"
+#include "Common/FramePacer.h"
 #include "Common/GameMemory.h"
-#include "Common/GameEngine.h"
 #include "GameClient/GameWindowManager.h"
 #include "Win32Device/GameClient/Win32Mouse.h"
 #include "resource.h"
@@ -128,7 +128,7 @@ static BOOL initInstance( HINSTANCE hInstance, int nCmdShow )
 
 	return TRUE;
 
-}  // end initInstance
+}
 
 // registerClass ==============================================================
 //
@@ -149,7 +149,7 @@ static ATOM registerClass(HINSTANCE hInstance)
 {
 	WNDCLASSEX wcex;
 
-	wcex.cbSize = sizeof( WNDCLASSEX ); 
+	wcex.cbSize = sizeof( WNDCLASSEX );
 
 	wcex.style					= CS_HREDRAW | CS_VREDRAW;
 	wcex.lpfnWndProc		= (WNDPROC)WndProc;
@@ -165,7 +165,7 @@ static ATOM registerClass(HINSTANCE hInstance)
 
 	return RegisterClassEx( &wcex );
 
-}  // registerClass
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////
@@ -187,27 +187,20 @@ Int APIENTRY WinMain(HINSTANCE hInstance,
 	/// @todo remove this force set of working directory later
 	Char buffer[ _MAX_PATH ];
 	GetModuleFileName( NULL, buffer, sizeof( buffer ) );
-	Char *pEnd = buffer + strlen( buffer );
-	while( pEnd != buffer ) 
+	if (Char *pEnd = strrchr(buffer, '\\'))
 	{
-		if( *pEnd == '\\' ) 
-		{
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buffer);
 
-	// start the log
-	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+	// initialize the memory manager early
 	initMemoryManager();
 
 	// register a class for our window with the OS
 	registerClass( hInstance );
 
 	// Perform application initialization:
-	if( !initInstance( hInstance, nCmdShow ) ) 
+	if( !initInstance( hInstance, nCmdShow ) )
 		return FALSE;
 
 	// load accellerator table
@@ -223,7 +216,9 @@ Int APIENTRY WinMain(HINSTANCE hInstance,
 	TheEditor = new GUIEdit;
 	if( TheEditor == NULL )
 		return FALSE;
-	TheEditor->init();	
+	TheEditor->init();
+
+	TheFramePacer = new FramePacer();
 
 	//
 	// see if we have any messages to process, a NULL window handle tells the
@@ -255,33 +250,34 @@ Int APIENTRY WinMain(HINSTANCE hInstance,
 					TranslateMessage( &msg );
 					DispatchMessage( &msg );
 
-				}  // end if
+				}
 
-			}  // end while
+			}
 
-		}  // end if
+		}
 		else
 		{
 
-			// udpate our universe
+			// update our universe
 			TheEditor->update();
 			Sleep(1);
 
-		}  // end else
-						
-	}  // end while
+		}
+
+	}
 
 	// shutdown GUIEdit data
+	delete TheFramePacer;
+	TheFramePacer = NULL;
+
 	delete TheEditor;
 	TheEditor = NULL;
 
-	// close the log
 	shutdownMemoryManager();
-	DEBUG_SHUTDOWN();
 
 	return msg.wParam;
 
-}  // end WinMain
+}
 
 // WndProc ====================================================================
 //
@@ -294,11 +290,11 @@ Int APIENTRY WinMain(HINSTANCE hInstance,
 //  WM_DESTROY	- post a quit message and return
 //
 //=============================================================================
-LRESULT CALLBACK WndProc( HWND hWnd, UINT message, 
+LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 													WPARAM wParam, LPARAM lParam )
 {
 
-	switch( message ) 
+	switch( message )
 	{
 
 		// ------------------------------------------------------------------------
@@ -310,7 +306,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				SetFocus( hWnd );
 			return 0;
 
-		}  // end move mouse
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_COMMAND:
@@ -383,7 +379,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				case MENU_SHOW_SEE_THRU_OUTLINES:
 					TheEditor->setShowSeeThruOutlines( !TheEditor->getShowSeeThruOutlines() );
 					break;
-														
+
 				// --------------------------------------------------------------------
 				case MENU_TEST_MODE:
 
@@ -397,12 +393,12 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						else
 							TheEditor->setMode( MODE_EDIT );
 
-					}  // end if
-					break;				
-					
+					}
+					break;
+
 				// --------------------------------------------------------------------
 				case MENU_BACKGROUND_COLOR:
-					
+
 					if( TheEditWindow )
 					{
 						RGBColorReal color = TheEditWindow->getBackgroundColor();
@@ -420,16 +416,16 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 																		mouse.x, mouse.y );
 						if( newColor )
 						{
-							
+
 							color.red   = (Real)newColor->red / 255.0f;
 							color.green = (Real)newColor->green / 255.0f;
 							color.blue  = (Real)newColor->blue / 255.0f;
 							color.alpha = (Real)newColor->alpha / 255.0f;
 							TheEditWindow->setBackgroundColor( color );
 
-						}  // end if
+						}
 
-					}  //  end if
+					}
 
 					break;
 
@@ -442,17 +438,17 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						TheDefaultScheme->openDialog();
 					break;
 
-				}  // end scheme
+				}
 
 				// --------------------------------------------------------------------
 				case MENU_ABOUT:
 				{
 
-					DialogBox( ApplicationHInstance, (LPCTSTR)ABOUT_DIALOG, 
+					DialogBox( ApplicationHInstance, (LPCTSTR)ABOUT_DIALOG,
 										 hWnd, (DLGPROC)AboutCallback );
 					break;
 
-				}  // end about
+				}
 
 
 				// --------------------------------------------------------------------
@@ -461,13 +457,13 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 					return DefWindowProc( hWnd, message, wParam, lParam );
 
-				}  // end default
+				}
 
-			}  // end switch( controlID )
+			}
 
 			return 0;
 
-		}  // end command
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_CLOSE:
@@ -477,13 +473,13 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			TheEditor->menuExit();
 			return 0;
 
-		}  // end close
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_KEYDOWN:
 		{
 			Int virtualKey = wParam;
-//			Int keyData = lParam;	
+//			Int keyData = lParam;
 			Bool controlDown = BitIsSet( GetKeyState( VK_CONTROL ), 0x1000 );
 
 			switch( virtualKey )
@@ -501,7 +497,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 							TheEditor->clearSelections();
 					break;
 
-				}  // end escape
+				}
 
 				// --------------------------------------------------------------------
 				case VK_DELETE:
@@ -512,7 +508,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						TheEditor->deleteSelected();
 					break;
 
-				}  // end delete
+				}
 
 				// --------------------------------------------------------------------
 				case VK_LEFT:
@@ -523,14 +519,14 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					{
 						if(TheEditor->getMode() == MODE_EDIT)
 						{
-					
+
 							if(TheEditor->selectionCount() <= 0 )
 								break;
 							ICoord2D zero;
 							zero.x = zero.y = 0;
 							TheEditWindow->setDragMoveOrigin(&zero);
 							TheEditWindow->setDragMoveDest(&zero);
-							
+
 							TheEditor->setMode(MODE_KEYBOARD_MOVE);
 						}
 						if(TheEditor->getMode() == MODE_KEYBOARD_MOVE)
@@ -545,7 +541,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 							}
 							else
 							{
-								temp.x--;	
+								temp.x--;
 							}
 							TheEditWindow->setDragMoveDest(&temp);
 						}
@@ -553,7 +549,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					}
 					break;
 
-				}  // end Left
+				}
 				// --------------------------------------------------------------------
 				case VK_RIGHT:
 				{
@@ -563,20 +559,20 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					{
 						if(TheEditor->getMode() == MODE_EDIT)
 						{
-					
+
 							if(TheEditor->selectionCount() <= 0 )
 								break;
 							ICoord2D zero;
 							zero.x = zero.y = 0;
 							TheEditWindow->setDragMoveOrigin(&zero);
 							TheEditWindow->setDragMoveDest(&zero);
-							
+
 							TheEditor->setMode(MODE_KEYBOARD_MOVE);
 						}
 						if(TheEditor->getMode() == MODE_KEYBOARD_MOVE)
 						{
 							ICoord2D temp;
-							
+
 							temp = TheEditWindow->getDragMoveDest();
 							if(!controlDown && TheEditor->isGridSnapOn())
 							{
@@ -585,7 +581,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 							}
 							else
 							{
-								temp.x++;	
+								temp.x++;
 							}
 							TheEditWindow->setDragMoveDest(&temp);
 						}
@@ -593,7 +589,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					}
 					break;
 
-				}  // end RIGHT
+				}
 				// --------------------------------------------------------------------
 				case VK_UP:
 				{
@@ -603,14 +599,14 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					{
 						if(TheEditor->getMode() == MODE_EDIT)
 						{
-					
+
 							if(TheEditor->selectionCount() <= 0 )
 								break;
 							ICoord2D zero;
 							zero.x = zero.y = 0;
 							TheEditWindow->setDragMoveOrigin(&zero);
 							TheEditWindow->setDragMoveDest(&zero);
-							
+
 							TheEditor->setMode(MODE_KEYBOARD_MOVE);
 						}
 						if(TheEditor->getMode() == MODE_KEYBOARD_MOVE)
@@ -618,7 +614,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 							ICoord2D temp;
 
 							temp = TheEditWindow->getDragMoveDest();
-							
+
 							if(!controlDown && TheEditor->isGridSnapOn())
 							{
 								temp.y -= TheEditor->getGridResolution();
@@ -626,7 +622,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 							}
 							else
 							{
-								temp.y--;	
+								temp.y--;
 							}
 							TheEditWindow->setDragMoveDest(&temp);
 						}
@@ -634,7 +630,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					}
 					break;
 
-				}  // end Up
+				}
 				// --------------------------------------------------------------------
 				case VK_DOWN:
 				{
@@ -644,14 +640,14 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					{
 						if(TheEditor->getMode() == MODE_EDIT)
 						{
-					
+
 							if(TheEditor->selectionCount() <= 0 )
 								break;
 							ICoord2D zero;
 							zero.x = zero.y = 0;
 							TheEditWindow->setDragMoveOrigin(&zero);
 							TheEditWindow->setDragMoveDest(&zero);
-							
+
 							TheEditor->setMode(MODE_KEYBOARD_MOVE);
 						}
 						if(TheEditor->getMode() == MODE_KEYBOARD_MOVE)
@@ -666,7 +662,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 							}
 							else
 							{
-								temp.y++;	
+								temp.y++;
 							}
 							TheEditWindow->setDragMoveDest(&temp);
 						}
@@ -674,8 +670,8 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					}
 					break;
 
-				}  // end Down
-				
+				}
+
 				// --------------------------------------------------------------------
 				case VK_RETURN:
 				{
@@ -692,13 +688,13 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						TheEditor->setMode( MODE_EDIT );
 					}
 					break;
-				}// end Enter
+				}
 
-			}  // end switch( virtualKey )
+			}
 
 			return 0;
 
-		}  // end key down
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_SIZE:
@@ -726,13 +722,13 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					barY = height - barHeight;
 					MoveWindow( statusBar, barX, barY, barWidth, barHeight, TRUE );
 
-				}  // end if
+				}
 
-			}  // end if
+			}
 
 			return 0;
 
-		}  // end size
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_PAINT:
@@ -744,7 +740,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			EndPaint(hWnd, &ps);
 			break;
 
-		}  // end paint
+		}
 
 		// ------------------------------------------------------------------------
 		case WM_DESTROY:
@@ -753,7 +749,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			PostQuitMessage(0);
 			break;
 
-		}  // end destroy
+		}
 
 		// ------------------------------------------------------------------------
 		default:
@@ -761,18 +757,18 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 			return DefWindowProc(hWnd, message, wParam, lParam);
 
-		}  // end default
+		}
 
-	}  // end switch( message )
+	}
 
 	return DefWindowProc( hWnd, message, wParam, lParam );
 
-}  // end WndProc
+}
 
 // AboutCallback ==============================================================
 /** Mesage handler for about box. */
 //=============================================================================
-LRESULT CALLBACK AboutCallback( HWND hDlg, UINT message, 
+LRESULT CALLBACK AboutCallback( HWND hDlg, UINT message,
 																WPARAM wParam, LPARAM lParam )
 {
 
@@ -782,7 +778,7 @@ LRESULT CALLBACK AboutCallback( HWND hDlg, UINT message,
 				return TRUE;
 
 		case WM_COMMAND:
-			if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) 
+			if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
 			{
 				EndDialog(hDlg, LOWORD(wParam));
 				return TRUE;
@@ -791,5 +787,5 @@ LRESULT CALLBACK AboutCallback( HWND hDlg, UINT message,
 	}
     return FALSE;
 
-}  // end AboutCallback
+}
 
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.cpp b/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.cpp
index 8e2c4534abd..c90376306ca 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.cpp
+++ b/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.cpp
@@ -22,11 +22,11 @@
 #include "CButtonShowColor.h"
 
 // CButtonShowColor ///////////////////////////////////////////////////////////////////////////////
-void CButtonShowColor::OnPaint() 
+void CButtonShowColor::OnPaint()
 {
 	try {
 		CPaintDC paintDC(this);
-	
+
 		CPen pen(PS_SOLID, 1, 0xFFFFFF00);
 		CBrush brush(RGBtoBGR(m_color.getAsInt()));
 		// Select my stuff
@@ -45,7 +45,7 @@ void CButtonShowColor::OnPaint()
 
 		// Restore the states.
 		paintDC.SelectObject(oldPen);
- 
+
 	} catch (...) {
 		// Unlikely, but possible.
 		return;
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h b/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h
index 9897b82015f..8d99dc6c7f8 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h
@@ -18,9 +18,6 @@
 
 #pragma once
 
-#ifndef _H_CBUTTONSHOWCOLOR_
-#define _H_CBUTTONSHOWCOLOR_
-
 #include "Lib/BaseType.h"
 
 class CButtonShowColor : public CButton
@@ -33,8 +30,8 @@ class CButtonShowColor : public CButton
 		void setColor(Int color) { m_color.setFromInt(color); }
 		void setColor(const RGBColor& color) { m_color = color; }
 		~CButtonShowColor();
-		
-		
+
+
 		static COLORREF RGBtoBGR(Int color);
 		static Int BGRtoRGB(COLORREF color);
 
@@ -44,5 +41,3 @@ class CButtonShowColor : public CButton
 
 	DECLARE_MESSAGE_MAP();
 };
-
-#endif /* _H_CBUTTONSHOWCOLOR_ */
\ No newline at end of file
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CColorAlphaDialog.cpp b/GeneralsMD/Code/Tools/ParticleEditor/CColorAlphaDialog.cpp
index a3386816e33..d1ed59b416e 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/CColorAlphaDialog.cpp
+++ b/GeneralsMD/Code/Tools/ParticleEditor/CColorAlphaDialog.cpp
@@ -31,33 +31,33 @@
 
 #define		ARBITRARY_BUFF_SIZE		128
 
-static const UINT colorControls[][2] = 
+static const UINT colorControls[][2] =
 {
-	{IDC_PSEd_Color1,	IDC_PSEd_CF1_Frame}, 
-	{IDC_PSEd_Color2,	IDC_PSEd_CF2_Frame}, 
-	{IDC_PSEd_Color3,	IDC_PSEd_CF3_Frame}, 
-	{IDC_PSEd_Color4,	IDC_PSEd_CF4_Frame}, 
-	{IDC_PSEd_Color5,	IDC_PSEd_CF5_Frame}, 
-	{IDC_PSEd_Color6,	IDC_PSEd_CF6_Frame}, 
-	{IDC_PSEd_Color7,	IDC_PSEd_CF7_Frame}, 
+	{IDC_PSEd_Color1,	IDC_PSEd_CF1_Frame},
+	{IDC_PSEd_Color2,	IDC_PSEd_CF2_Frame},
+	{IDC_PSEd_Color3,	IDC_PSEd_CF3_Frame},
+	{IDC_PSEd_Color4,	IDC_PSEd_CF4_Frame},
+	{IDC_PSEd_Color5,	IDC_PSEd_CF5_Frame},
+	{IDC_PSEd_Color6,	IDC_PSEd_CF6_Frame},
+	{IDC_PSEd_Color7,	IDC_PSEd_CF7_Frame},
 	{IDC_PSEd_Color8,	IDC_PSEd_CF8_Frame}
 };
 
-static const UINT alphaControls[][3] = 
+static const UINT alphaControls[][3] =
 {
-	{IDC_PSEd_AF1_Min, IDC_PSEd_AF1_Max, IDC_PSEd_AF1_Frame}, 
-	{IDC_PSEd_AF2_Min, IDC_PSEd_AF2_Max, IDC_PSEd_AF2_Frame}, 
-	{IDC_PSEd_AF3_Min, IDC_PSEd_AF3_Max, IDC_PSEd_AF3_Frame}, 
-	{IDC_PSEd_AF4_Min, IDC_PSEd_AF4_Max, IDC_PSEd_AF4_Frame}, 
-	{IDC_PSEd_AF5_Min, IDC_PSEd_AF5_Max, IDC_PSEd_AF5_Frame}, 
-	{IDC_PSEd_AF6_Min, IDC_PSEd_AF6_Max, IDC_PSEd_AF6_Frame}, 
-	{IDC_PSEd_AF7_Min, IDC_PSEd_AF7_Max, IDC_PSEd_AF7_Frame}, 
+	{IDC_PSEd_AF1_Min, IDC_PSEd_AF1_Max, IDC_PSEd_AF1_Frame},
+	{IDC_PSEd_AF2_Min, IDC_PSEd_AF2_Max, IDC_PSEd_AF2_Frame},
+	{IDC_PSEd_AF3_Min, IDC_PSEd_AF3_Max, IDC_PSEd_AF3_Frame},
+	{IDC_PSEd_AF4_Min, IDC_PSEd_AF4_Max, IDC_PSEd_AF4_Frame},
+	{IDC_PSEd_AF5_Min, IDC_PSEd_AF5_Max, IDC_PSEd_AF5_Frame},
+	{IDC_PSEd_AF6_Min, IDC_PSEd_AF6_Max, IDC_PSEd_AF6_Frame},
+	{IDC_PSEd_AF7_Min, IDC_PSEd_AF7_Max, IDC_PSEd_AF7_Frame},
 	{IDC_PSEd_AF8_Min, IDC_PSEd_AF8_Max, IDC_PSEd_AF8_Frame}
 };
 
 
 
-CColorAlphaDialog::CColorAlphaDialog(UINT nIDTemplate, CWnd* pParentWnd) : 
+CColorAlphaDialog::CColorAlphaDialog(UINT nIDTemplate, CWnd* pParentWnd) :
 										CDialog(nIDTemplate, pParentWnd)
 {}
 
@@ -136,7 +136,7 @@ void CColorAlphaDialog::performUpdate(IN Bool toUI)
 	{ // update the values
 		for (int i = 0; i < MAX_KEYFRAMES; ++i) {
 			ParticleSystemInfo::RandomKeyframe keyFrame;
-			
+
 			pParent->getAlphaRangeFromSystem(i, keyFrame);
 
 			{	// Minimum first
@@ -194,7 +194,7 @@ void CColorAlphaDialog::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -207,7 +207,7 @@ BOOL CColorAlphaDialog::OnInitDialog()
 		if (!item) {
 			continue;
 		}
-		
+
 		item->GetWindowRect(&rect);
 		ScreenToClient(&rect);
 		DWORD style = item->GetStyle();
@@ -215,11 +215,11 @@ BOOL CColorAlphaDialog::OnInitDialog()
 
 		item->DestroyWindow();
 	}
-	
+
 	return CDialog::OnInitDialog();
 }
 
-#define ONCOLORDLG(x) void CColorAlphaDialog::OnColor##x##() { onColorPress( x ); }
+#define ONCOLORDLG(x) void CColorAlphaDialog::OnColor##x() { onColorPress( x ); }
 ONCOLORDLG(1)
 ONCOLORDLG(2)
 ONCOLORDLG(3)
@@ -236,7 +236,7 @@ void CColorAlphaDialog::onColorPress(Int colorPressed)
 	dlg.m_cc.Flags |= (CC_FULLOPEN | CC_ANYCOLOR);
 	dlg.m_cc.lpCustColors = m_customColors;
 	if (dlg.DoModal() == IDOK) {
-		
+
 		m_colorButton[colorPressed - 1].setColor(CButtonShowColor::BGRtoRGB(dlg.GetColor()));
 		static char buff[ARBITRARY_BUFF_SIZE];
 
@@ -272,7 +272,7 @@ void CColorAlphaDialog::onColorPress(Int colorPressed)
 		AfxGetApp()->WriteProfileString("Custom Colors", "Color15", buff);
 		ltoa(m_customColors[15], buff, 10);
 		AfxGetApp()->WriteProfileString("Custom Colors", "Color16", buff);
-		
+
 
 
 		OnParticleSystemEdit();
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CColorAlphaDialog.h b/GeneralsMD/Code/Tools/ParticleEditor/CColorAlphaDialog.h
index a6071c0ce0d..1c8801e14ba 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/CColorAlphaDialog.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/CColorAlphaDialog.h
@@ -16,7 +16,6 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #pragma once
 
 #include "CButtonShowColor.h"
@@ -24,7 +23,7 @@
 
 class CColorAlphaDialog : public CDialog
 {
-	protected:	
+	protected:
 		DWORD m_customColors[16];
 		CButtonShowColor m_colorButton[MAX_KEYFRAMES];
 
@@ -35,9 +34,9 @@ class CColorAlphaDialog : public CDialog
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 
 
 	protected:
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt b/GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt
index 0b410f34701..4d09c98ec22 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt
+++ b/GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt
@@ -42,7 +42,6 @@ target_link_libraries(z_particleeditor PRIVATE
     corei_libraries_source_wwvegas
     corei_libraries_source_wwvegas_wwlib
     d3d8lib
-    dbghelplib
     imm32
     core_config
     stlport
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CParticleEditorPage.h b/GeneralsMD/Code/Tools/ParticleEditor/CParticleEditorPage.h
index ccef3161f33..bc932935799 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/CParticleEditorPage.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/CParticleEditorPage.h
@@ -18,15 +18,14 @@
 
 #pragma once
 
-
 struct CParticleEditorPage : public CDialog
 {
 	UINT m_templateID;
 	public:
 		CParticleEditorPage(UINT nIDTemplate = 0, CWnd* pParentWnd = NULL);
 		void InitPanel( int templateID );
-		
-		
+
+
 	protected:
 		afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
 		DECLARE_MESSAGE_MAP()
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CSwitchesDialog.cpp b/GeneralsMD/Code/Tools/ParticleEditor/CSwitchesDialog.cpp
index e6a79ad1a7e..48683cbb839 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/CSwitchesDialog.cpp
+++ b/GeneralsMD/Code/Tools/ParticleEditor/CSwitchesDialog.cpp
@@ -32,7 +32,7 @@ void CSwitchesDialog::InitPanel( void )
 
 }
 
-// if true, updates the UI from the Particle System. 
+// if true, updates the UI from the Particle System.
 // if false, updates the Particle System from the UI
 void CSwitchesDialog::performUpdate( IN Bool toUI )
 {
@@ -123,7 +123,7 @@ void CSwitchesDialog::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CSwitchesDialog.h b/GeneralsMD/Code/Tools/ParticleEditor/CSwitchesDialog.h
index e76224558ef..5b467b0c2b4 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/CSwitchesDialog.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/CSwitchesDialog.h
@@ -16,7 +16,6 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #pragma once
 
 #include "Lib/BaseType.h"
@@ -31,9 +30,9 @@ class CSwitchesDialog : public CDialog
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 		DebugWindowDialog* GetDWDParent(void) { return (DebugWindowDialog*) GetParent(); }
 
 	protected:
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.cpp b/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.cpp
index 1711b9e7fc8..8f464e74bbb 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.cpp
+++ b/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: EmissionTypePanels.cpp 
+// FILE: EmissionTypePanels.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -61,7 +61,7 @@ void EmissionPanelPoint::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -100,7 +100,7 @@ void EmissionPanelLine::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getLineFromSystem(0, linePoint);
-				
+
 				sprintf(buff, FORMAT_STRING, linePoint);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -115,7 +115,7 @@ void EmissionPanelLine::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getLineFromSystem(1, linePoint);
-				
+
 				sprintf(buff, FORMAT_STRING, linePoint);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -130,7 +130,7 @@ void EmissionPanelLine::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getLineFromSystem(2, linePoint);
-				
+
 				sprintf(buff, FORMAT_STRING, linePoint);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -145,7 +145,7 @@ void EmissionPanelLine::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getLineFromSystem(3, linePoint);
-				
+
 				sprintf(buff, FORMAT_STRING, linePoint);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -160,7 +160,7 @@ void EmissionPanelLine::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getLineFromSystem(4, linePoint);
-				
+
 				sprintf(buff, FORMAT_STRING, linePoint);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -175,7 +175,7 @@ void EmissionPanelLine::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getLineFromSystem(5, linePoint);
-				
+
 				sprintf(buff, FORMAT_STRING, linePoint);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -194,7 +194,7 @@ void EmissionPanelLine::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -237,7 +237,7 @@ void EmissionPanelBox::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getHalfSizeFromSystem(0, halfSize);
-				
+
 				sprintf(buff, FORMAT_STRING, halfSize);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -252,7 +252,7 @@ void EmissionPanelBox::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getHalfSizeFromSystem(1, halfSize);
-				
+
 				sprintf(buff, FORMAT_STRING, halfSize);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -267,7 +267,7 @@ void EmissionPanelBox::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getHalfSizeFromSystem(2, halfSize);
-				
+
 				sprintf(buff, FORMAT_STRING, halfSize);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -285,7 +285,7 @@ void EmissionPanelBox::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -325,7 +325,7 @@ void EmissionPanelSphere::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getHalfSizeFromSystem(0, radius);
-				
+
 				sprintf(buff, FORMAT_STRING, radius);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -343,7 +343,7 @@ void EmissionPanelSphere::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -381,7 +381,7 @@ void EmissionPanelCylinder::performUpdate( IN Bool toUI )
 			Real radius;
 			if (toUI) {
 				pParent->getCylinderRadiusFromSystem(radius);
-				
+
 				sprintf(buff, FORMAT_STRING, radius);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -396,9 +396,9 @@ void EmissionPanelCylinder::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			Real length;
 			if (toUI) {
-				
+
 				pParent->getCylinderLengthFromSystem(length);
-				
+
 				sprintf(buff, FORMAT_STRING, length);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -416,11 +416,11 @@ void EmissionPanelCylinder::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
 BEGIN_MESSAGE_MAP(EmissionPanelCylinder, ISwapablePanel)
 	ON_EN_KILLFOCUS(IDC_PSEd_CylRadius, OnParticleSystemEdit)
 	ON_EN_KILLFOCUS(IDC_PSEd_CylLength, OnParticleSystemEdit)
-END_MESSAGE_MAP()
\ No newline at end of file
+END_MESSAGE_MAP()
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h b/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h
index a9bdef51663..347c65f152d 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: EmissionTypePanels.h 
+// FILE: EmissionTypePanels.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_EMISSIONTYPEPANELS_
-#define _H_EMISSIONTYPEPANELS_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Resource.h"
@@ -55,9 +53,9 @@ class EmissionPanelPoint : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -73,9 +71,9 @@ class EmissionPanelLine : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -91,9 +89,9 @@ class EmissionPanelBox : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -109,9 +107,9 @@ class EmissionPanelSphere : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -127,12 +125,10 @@ class EmissionPanelCylinder : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif /* _H_EMISSIONTYPEPANELS_ */
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h b/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h
index ea972f44796..96b12558989 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: ISwapablePanel.h 
+// FILE: ISwapablePanel.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -33,8 +33,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_ISWAPABLEPANEL_
-#define _H_ISWAPABLEPANEL_
 
 #include "Lib/BaseType.h"
 
@@ -50,5 +48,3 @@ interface ISwapablePanel : public CDialog
 	virtual void performUpdate( IN Bool toUI ) = 0;
 	virtual void InitPanel( void ) = 0;
 };
-
-#endif /* _H_ISWAPABLEPANEL_ */
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.cpp b/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.cpp
index b08a4f731e6..e05e45b1040 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.cpp
+++ b/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: MoreParmsDialog.cpp 
+// FILE: MoreParmsDialog.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -251,7 +251,7 @@ void MoreParmsDialog::performUpdate( IN Bool toUI )
 				}
 			}
 		}
-	
+
 		{	// start size rate
 			Real startSizeRate;
 
@@ -281,7 +281,7 @@ void MoreParmsDialog::performUpdate( IN Bool toUI )
 				}
 			}
 		}
-	
+
 		{	// size rate
 			Real sizeRate;
 
@@ -514,7 +514,7 @@ void MoreParmsDialog::performUpdate( IN Bool toUI )
 				}
 			}
 		}
-	
+
 		{	// ping pong wind start angle
 			Real angle;
 
@@ -635,7 +635,7 @@ void MoreParmsDialog::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h b/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h
index 3fe69dbfb9f..a8be3b1cd48 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: MoreParmsDialog.h 
+// FILE: MoreParmsDialog.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_MOREPARMSDIALOG_
-#define _H_MOREPARMSDIALOG_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Resource.h"
@@ -51,8 +49,8 @@ class MoreParmsDialog : public CDialog
 		virtual ~MoreParmsDialog();
 
 		void InitPanel( void );
-	
-		// if true, updates the UI from the Particle System. 
+
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
 		void performUpdate( IN Bool toUI );
 
@@ -60,5 +58,3 @@ class MoreParmsDialog : public CDialog
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif /* _H_MOREPARMSDIALOG_ */
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.cpp b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.cpp
index 7a57812b62e..00e8a591c92 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.cpp
+++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.cpp
@@ -47,7 +47,7 @@ static char THIS_FILE[] = __FILE__;
 //
 //		It is very important that this macro appear in each
 //		function, prior to any calls into MFC.  This means that
-//		it must appear as the first statement within the 
+//		it must appear as the first statement within the
 //		function, even before any object variable declarations
 //		as their constructors may generate calls into the MFC
 //		DLL.
@@ -105,14 +105,14 @@ void __declspec(dllexport) CreateParticleSystemDialog(void)
 		DebugWindowDialog* tmpWnd;
 		tmpWnd = new DebugWindowDialog;
 		tmpWnd->Create(DebugWindowDialog::IDD, NULL);
-		
+
 		tmpWnd->SetWindowPos(NULL, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOZORDER);
 		tmpWnd->InitPanel();
 		tmpWnd->ShowWindow(SW_SHOW);
 		if (tmpWnd->GetMainWndHWND()) {
 			SetFocus(tmpWnd->GetMainWndHWND());
 		}
-		
+
 		theApp.SetDialogWindow(tmpWnd);
 	} catch (...) { }
 }
@@ -121,8 +121,8 @@ void __declspec(dllexport) DestroyParticleSystemDialog(void)
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->DestroyWindow();
 			delete tmpWnd;
@@ -135,8 +135,8 @@ void __declspec(dllexport) RemoveAllParticleSystems(void)
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->clearAllParticleSystems();
 		}
@@ -147,8 +147,8 @@ void __declspec(dllexport) AppendParticleSystem(const char* particleSystemName)
 {
 	try{
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->addParticleSystem(particleSystemName);
 		}
@@ -159,11 +159,11 @@ void __declspec(dllexport) RemoveAllThingTemplates( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->clearAllThingTemplates();
-		} 
+		}
 	} catch (...) { }
 }
 
@@ -172,8 +172,8 @@ void __declspec(dllexport) AppendThingTemplate( const char* thingTemplateName )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->addThingTemplate(thingTemplateName);
 		}
@@ -185,8 +185,8 @@ Bool __declspec(dllexport) HasUpdatedSelectedParticleSystem( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->hasSelectionChanged();
 		}
@@ -199,8 +199,8 @@ void __declspec(dllexport) GetSelectedParticleSystemName( char *bufferToCopyInto
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->getSelectedSystemName(bufferToCopyInto);
 		}
@@ -211,8 +211,8 @@ void __declspec(dllexport) UpdateCurrentParticleCap( int currentParticleCap )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->updateCurrentParticleCap(currentParticleCap);
 		}
@@ -223,8 +223,8 @@ void __declspec(dllexport) UpdateCurrentNumParticles( int currentParticleCount )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->updateCurrentNumParticles(currentParticleCount);
 		}
@@ -235,8 +235,8 @@ int __declspec(dllexport) GetNewParticleCap( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->getNewParticleCap();
 		}
@@ -249,8 +249,8 @@ void __declspec(dllexport) GetSelectedParticleAsciiStringParm( int parmNum, char
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->getSelectedParticleAsciiStringParm(parmNum, bufferToCopyInto);
 			if (whichTemplate) {
@@ -264,8 +264,8 @@ void __declspec(dllexport) UpdateParticleAsciiStringParm( int parmNum, const cha
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->updateParticleAsciiStringParm(parmNum, bufferToCopyFrom);
 			if (whichTemplate) {
@@ -279,8 +279,8 @@ void __declspec(dllexport) UpdateCurrentParticleSystem( ParticleSystemTemplate *
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->updateCurrentParticleSystem(particleTemplate);
 		}
@@ -291,8 +291,8 @@ void __declspec(dllexport) UpdateSystemUseParameters( ParticleSystemTemplate *pa
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			tmpWnd->updateSystemUseParameters(particleTemplate);
 		}
@@ -303,8 +303,8 @@ Bool __declspec(dllexport) ShouldWriteINI( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->shouldWriteINI();
 		}
@@ -317,8 +317,8 @@ Bool __declspec(dllexport) HasRequestedReload( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->hasRequestedReload();
 		}
@@ -331,8 +331,8 @@ Bool __declspec(dllexport) ShouldBusyWait( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->shouldBusyWait();
 		}
@@ -345,8 +345,8 @@ Bool __declspec(dllexport) ShouldUpdateParticleCap( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->shouldUpdateParticleCap();
 		}
@@ -359,8 +359,8 @@ Bool __declspec(dllexport) ShouldReloadTextures( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->shouldReloadTextures();
 		}
@@ -373,8 +373,8 @@ Bool __declspec(dllexport) HasRequestedKillAllSystems( void )
 {
 	try {
 		AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
-		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow(); 
-		
+		DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
+
 		if (tmpWnd) {
 			return tmpWnd->shouldKillAllParticleSystems();
 		}
@@ -385,7 +385,7 @@ Bool __declspec(dllexport) HasRequestedKillAllSystems( void )
 
 int __declspec(dllexport) NextParticleEditorBehavior( void )
 {
-	try { 
+	try {
 		if (HasUpdatedSelectedParticleSystem()) {
 			return PEB_UpdateCurrentSystem;
 		}
@@ -401,7 +401,7 @@ int __declspec(dllexport) NextParticleEditorBehavior( void )
 		if (ShouldBusyWait()) {
 			return PEB_BusyWait;
 		}
-		
+
 		if (ShouldUpdateParticleCap()) {
 			return PEB_SetParticleCap;
 		}
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h
index de455e867b6..cc285778c9c 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h
@@ -19,12 +19,7 @@
 // DebugWindow.h : main header file for the DEBUGWINDOW DLL
 //
 
-#if !defined(AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_)
-#define AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #ifndef __AFXWIN_H__
 	#error include 'stdafx.h' before including this file for PCH
@@ -68,5 +63,3 @@ class CDebugWindowApp : public CWinApp
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorDialog.cpp b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorDialog.cpp
index 2ac0d119af0..b41df2cc2f5 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorDialog.cpp
+++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorDialog.cpp
@@ -30,9 +30,9 @@
 
 #define		ARBITRARY_BUFF_SIZE		128
 
-DebugWindowDialog::DebugWindowDialog(UINT nIDTemplate, CWnd* pParentWnd) : CDialog(nIDTemplate, pParentWnd), 
-m_colorAlphaDialog(CColorAlphaDialog::IDD, this), 
-m_switchesDialog(CSwitchesDialog::IDD, this), 
+DebugWindowDialog::DebugWindowDialog(UINT nIDTemplate, CWnd* pParentWnd) : CDialog(nIDTemplate, pParentWnd),
+m_colorAlphaDialog(CColorAlphaDialog::IDD, this),
+m_switchesDialog(CSwitchesDialog::IDD, this),
 m_moreParmsDialog(MoreParmsDialog::IDD, this)
 {
 	mMainWndHWND = ::FindWindow(NULL, "Command & Conquer: Generals");
@@ -40,8 +40,8 @@ m_moreParmsDialog(MoreParmsDialog::IDD, this)
 	m_activeVelocityPage = 0;
 	m_activeParticlePage = 0;
 	m_particleSystem = NULL;
-	
-	
+
+
 	m_changeHasOcurred = false;
 	m_shouldWriteINI = false;
 	m_showColorDlg = false;
@@ -52,13 +52,13 @@ m_moreParmsDialog(MoreParmsDialog::IDD, this)
 	m_shouldUpdateParticleCap = false;
 	m_shouldReloadTextures = false;
 	m_shouldKillAllParticleSystems = false;
-	
+
 	m_emissionTypePanels[0] = new EmissionPanelPoint;
 	m_emissionTypePanels[1] = new EmissionPanelLine;
 	m_emissionTypePanels[2] = new EmissionPanelBox;
 	m_emissionTypePanels[3] = new EmissionPanelSphere;
 	m_emissionTypePanels[4] = new EmissionPanelCylinder;
-	
+
 	m_velocityTypePanels[0] = new VelocityPanelOrtho;
 	m_velocityTypePanels[1] = new VelocityPanelSphere;
 	m_velocityTypePanels[2] = new VelocityPanelHemisphere;
@@ -240,7 +240,7 @@ void DebugWindowDialog::clearAllParticleSystems(void)
 	if (!combo) {
 		return;
 	}
-	
+
 	m_listOfParticleSystems.clear();
 	combo->ResetContent();
 }
@@ -259,7 +259,7 @@ void DebugWindowDialog::appendParticleSystemToList( const std::string &rString )
 	if (!combo) {
 		return;
 	}
-	
+
 	m_listOfParticleSystems.push_front(rString);
 	combo->AddString(rString.c_str());
 }
@@ -302,7 +302,7 @@ Bool DebugWindowDialog::hasSelectionChanged(void)
 		m_changeHasOcurred = false;
 		return true;
 	}
-	
+
 	return false;
 }
 
@@ -336,7 +336,7 @@ void DebugWindowDialog::getSelectedParticleAsciiStringParm( IN int parmNum, OUT
 		return;
 	}
 
-	if (m_particleParmValues[parmNum].length()) {
+	if (!m_particleParmValues[parmNum].empty()) {
 		strcpy(bufferToCopyInto, m_particleParmValues[parmNum].c_str());
 	} else {
 		bufferToCopyInto[0] = 0;
@@ -366,7 +366,7 @@ void DebugWindowDialog::updateColorValueToSystem(IN Int systemNum, IN const RGBC
 	if (systemNum >= MAX_KEYFRAMES || systemNum < 0 || !m_particleSystem) {
 		return;
 	}
-	
+
 	m_particleSystem->m_colorKey[systemNum] = colorFrame;
 }
 
@@ -520,7 +520,7 @@ void DebugWindowDialog::getVelSphereFromSystem( IN Int velNum, OUT Real &radius)
 		case 0: radius = m_particleSystem->m_emissionVelocity.spherical.speed.m_low; return;
 		case 1: radius = m_particleSystem->m_emissionVelocity.spherical.speed.m_high; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::updateVelSphereToSystem( IN Int velNum, IN const Real &radius)
@@ -534,7 +534,7 @@ void DebugWindowDialog::updateVelSphereToSystem( IN Int velNum, IN const Real &r
 		case 0: m_particleSystem->m_emissionVelocity.spherical.speed.m_low = radius; return;
 		case 1: m_particleSystem->m_emissionVelocity.spherical.speed.m_high = radius; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::getVelHemisphereFromSystem( IN Int velNum, OUT Real &radius) const
@@ -548,7 +548,7 @@ void DebugWindowDialog::getVelHemisphereFromSystem( IN Int velNum, OUT Real &rad
 		case 0: radius = m_particleSystem->m_emissionVelocity.hemispherical.speed.m_low; return;
 		case 1: radius = m_particleSystem->m_emissionVelocity.hemispherical.speed.m_high; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::updateVelHemisphereToSystem( IN Int velNum, IN const Real &radius)
@@ -562,7 +562,7 @@ void DebugWindowDialog::updateVelHemisphereToSystem( IN Int velNum, IN const Rea
 		case 0: m_particleSystem->m_emissionVelocity.hemispherical.speed.m_low = radius; return;
 		case 1: m_particleSystem->m_emissionVelocity.hemispherical.speed.m_high = radius; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::getVelOrthoFromSystem( IN Int coordNum, OUT Real& ortho) const
@@ -705,7 +705,7 @@ void DebugWindowDialog::updateDrawableNameToSystem( IN const char* buffer )
 }
 
 void DebugWindowDialog::updateCurrentParticleSystem(ParticleSystemTemplate *particleTemplate )
-{	
+{
 	m_particleSystem = particleTemplate;
 	performUpdate(true);
 }
@@ -727,7 +727,7 @@ void DebugWindowDialog::getInitialDelayFromSystem( IN Int parmNum, OUT Real& ini
 		case 0: initialDelay = m_particleSystem->m_initialDelay.m_low; return;
 		case 1: initialDelay = m_particleSystem->m_initialDelay.m_high; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::updateInitialDelayToSystem( IN Int parmNum, IN const Real& initialDelay )
@@ -741,7 +741,7 @@ void DebugWindowDialog::updateInitialDelayToSystem( IN Int parmNum, IN const Rea
 		case 0: m_particleSystem->m_initialDelay.m_low = initialDelay; return;
 		case 1: m_particleSystem->m_initialDelay.m_high = initialDelay; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::getBurstDelayFromSystem( IN Int parmNum, OUT Real& burstDelay ) const
@@ -755,7 +755,7 @@ void DebugWindowDialog::getBurstDelayFromSystem( IN Int parmNum, OUT Real& burst
 		case 0: burstDelay = m_particleSystem->m_burstDelay.m_low; return;
 		case 1: burstDelay = m_particleSystem->m_burstDelay.m_high; return;
 		default: return;
-	};	
+	};
 }
 
 void DebugWindowDialog::updateBurstDelayToSystem( IN Int parmNum, IN const Real& burstDelay )
@@ -1314,7 +1314,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 					m_particleSystem->m_particleType = (ParticleSystemInfo::ParticleType) (selndx + 1);
 				}
 			}
-			
+
 			// do the swap
 			if (selndx != m_activeParticlePage && selndx >= 0) {
 				m_particleTypePanels[m_activeParticlePage]->ShowWindow(SW_HIDE);
@@ -1362,7 +1362,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angleZ.m_low = atof(buff);	
+				m_particleSystem->m_angleZ.m_low = atof(buff);
 			}
 		}
 
@@ -1389,7 +1389,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angleZ.m_high = atof(buff);	
+				m_particleSystem->m_angleZ.m_high = atof(buff);
 			}
 		}
 
@@ -1416,7 +1416,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angularRateZ.m_low = atof(buff);	
+				m_particleSystem->m_angularRateZ.m_low = atof(buff);
 			}
 		}
 
@@ -1443,7 +1443,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angularRateZ.m_high = atof(buff);	
+				m_particleSystem->m_angularRateZ.m_high = atof(buff);
 			}
 		}
 	}
@@ -1457,10 +1457,10 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angularDamping.m_low = atof(buff);	
+				m_particleSystem->m_angularDamping.m_low = atof(buff);
 			}
 		}
-	
+
 		pWnd = GetDlgItem(IDC_PSEd_AngleDampingMax);
 		if (pWnd) {
 			if (toUI) {
@@ -1468,10 +1468,10 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_angularDamping.m_high = atof(buff);	
+				m_particleSystem->m_angularDamping.m_high = atof(buff);
 			}
 		}
-		
+
 		pWnd = GetDlgItem(IDC_PSEd_VelocityDampingMin);
 		if (pWnd) {
 			if (toUI) {
@@ -1479,10 +1479,10 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_velDamping.m_low = atof(buff);	
+				m_particleSystem->m_velDamping.m_low = atof(buff);
 			}
 		}
-	
+
 		pWnd = GetDlgItem(IDC_PSEd_VelocityDampingMax);
 		if (pWnd) {
 			if (toUI) {
@@ -1490,7 +1490,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_velDamping.m_high = atof(buff);	
+				m_particleSystem->m_velDamping.m_high = atof(buff);
 			}
 		}
 	}
@@ -1504,7 +1504,7 @@ void DebugWindowDialog::performUpdate( IN Bool toUI )
 				pWnd->SetWindowText(buff);
 			} else {
 				pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-				m_particleSystem->m_gravity = atof(buff);	
+				m_particleSystem->m_gravity = atof(buff);
 			}
 		}
 	}
@@ -1587,7 +1587,7 @@ void DebugWindowDialog::OnEditMoreParms()
 	} else {
 		m_moreParmsDialog.ShowWindow(SW_HIDE);
 		pButton->SetCheck(FALSE);
-	}	
+	}
 }
 
 Bool DebugWindowDialog::shouldWriteINI( void )
@@ -1595,7 +1595,7 @@ Bool DebugWindowDialog::shouldWriteINI( void )
 	if (m_shouldWriteINI) {
 		m_shouldWriteINI = false;
 		return true;
-	} 
+	}
 
 	return false;
 }
@@ -1687,7 +1687,7 @@ void DebugWindowDialog::updateCurrentParticleCap( IN int particleCap )
 	if (!pWnd) {
 		return;
 	}
-	
+
 	sprintf(buff, "%d", particleCap);
 	pWnd->SetWindowText(buff);
 }
@@ -1713,7 +1713,7 @@ int DebugWindowDialog::getNewParticleCap( void )
 	}
 
 	pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
-	
+
 	return atoi(buff);
 }
 
@@ -1730,7 +1730,7 @@ BEGIN_MESSAGE_MAP(DebugWindowDialog, CDialog)
 	ON_BN_CLICKED(IDC_PSEd_EditSwitchesButton, OnEditSwitches)
 	ON_BN_CLICKED(IDC_PSEd_KillAll, OnKillAllParticleSystems)
 
-	ON_CBN_SELCHANGE(IDC_PSEd_Priority, OnParticleSystemEdit)	
+	ON_CBN_SELCHANGE(IDC_PSEd_Priority, OnParticleSystemEdit)
 	ON_CBN_SELCHANGE(IDC_PSEd_EmissionType, OnParticleSystemEdit)
 	ON_CBN_SELCHANGE(IDC_PSEd_VelocityType, OnParticleSystemEdit)
 	ON_CBN_SELCHANGE(IDC_PSEd_ParticleType, OnParticleSystemEdit)
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorDialog.h b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorDialog.h
index 416db29adf2..b38afd9d18f 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorDialog.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorDialog.h
@@ -16,7 +16,6 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #pragma once
 
 #include <map>			// for std::pair
@@ -48,7 +47,7 @@ enum SwitchType
 	ST_ONESHOT,
 	ST_ALIGNXY,
 	ST_EMITABOVEGROUNDONLY,
-	ST_PARTICLEUPTOWARDSEMITTER, 
+	ST_PARTICLEUPTOWARDSEMITTER,
 };
 
 class DebugWindowDialog : public CDialog
@@ -57,7 +56,7 @@ class DebugWindowDialog : public CDialog
 		enum {IDD = IDD_PSEd};
 		DebugWindowDialog(UINT nIDTemplate = DebugWindowDialog::IDD, CWnd* pParentWnd = NULL);
 		virtual ~DebugWindowDialog();
-		
+
 		void InitPanel( void );
 		HWND GetMainWndHWND( void );
 		void addParticleSystem( IN const char *particleSystem );
@@ -79,11 +78,11 @@ class DebugWindowDialog : public CDialog
 
 		// The purpose of these is to add as few friends as possible to the particle system classes.
 		// Therefore, this class has ALL the access to ParticleSystems, and dances on the data directly.
-		// Child panels make calls here 
-		void getColorValueFromSystem( IN Int systemNum, 
+		// Child panels make calls here
+		void getColorValueFromSystem( IN Int systemNum,
 																  OUT RGBColorKeyframe &colorFrame ) const;
 
-		void updateColorValueToSystem( IN Int systemNum, 
+		void updateColorValueToSystem( IN Int systemNum,
 																	 IN const RGBColorKeyframe &colorFrame );
 
 		void getAlphaRangeFromSystem( IN Int systemNum,
@@ -109,7 +108,7 @@ class DebugWindowDialog : public CDialog
 
 		void getLineFromSystem( IN Int coordNum, // 0:X1, 1:Y1, 2:Z1, 3:X2, 4:Y2, 5:Z2
 														OUT Real& linePoint ) const;
-		
+
 		void updateLineToSystem( IN Int coordNum, // 0:X, 1:Y, 2:Z, 3:X2, 4:Y2, 5:Z2
 														 IN const Real &linePoint );
 
@@ -127,7 +126,7 @@ class DebugWindowDialog : public CDialog
 
 		void getVelOrthoFromSystem( IN Int coordNum, // 0:Xmin, 1:Ymin, 2:Zmin, 3:Xmax, 4:Ymax, 5:Zmax
 																OUT Real& ortho ) const;
-		
+
 		void updateVelOrthoToSystem( IN Int coordNum, // 0:Xmin, 1:Ymin, 2:Zmin, 3:Xmax, 4:Ymax, 5:Zmax
 																 IN const Real& ortho );
 
@@ -218,10 +217,10 @@ class DebugWindowDialog : public CDialog
 		void updateDriftVelocityToSystem( IN Int parmNum, // 0:min, 1:min
 																	 IN const Real& driftVelocity );
 
-		void getSwitchFromSystem( IN SwitchType switchType, 
+		void getSwitchFromSystem( IN SwitchType switchType,
 															OUT Bool& switchVal ) const;
 
-		void updateSwitchToSystem( IN SwitchType switchType, 
+		void updateSwitchToSystem( IN SwitchType switchType,
 															 IN const Bool& switchVal );
 
 		void getSlaveSystemFromSystem( OUT char *buffer, IN Int bufferSize) const;
@@ -251,10 +250,10 @@ class DebugWindowDialog : public CDialog
 
 
 
-		const std::list<std::string> &getAllThingTemplates( void ) const { return m_listOfThingTemplates; } 
+		const std::list<std::string> &getAllThingTemplates( void ) const { return m_listOfThingTemplates; }
 		const std::list<std::string> &getAllParticleSystems( void ) const { return m_listOfParticleSystems; }
 
-		ParticleSystemTemplate *getCurrentParticleSystem( void ) { return m_particleSystem; } 
+		ParticleSystemTemplate *getCurrentParticleSystem( void ) { return m_particleSystem; }
 
 	protected:
 		HWND			mMainWndHWND;
@@ -263,7 +262,7 @@ class DebugWindowDialog : public CDialog
 		std::list<std::string> m_listOfThingTemplates;
 		std::vector<std::string> m_particleParmValues;
 		std::list<std::string> m_listOfParticleSystems;
-		
+
 		Bool			m_shouldWriteINI;
 		Bool			m_showColorDlg;
 		Bool			m_showSwitchesDlg;
@@ -289,10 +288,10 @@ class DebugWindowDialog : public CDialog
 
 		void appendParticleSystemToList( IN const std::string &rString );
 		void appendThingTemplateToList( IN const std::string &rString );
-		
-		// if true, updates the UI from the Particle System. 
+
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 
 
 	protected:
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorExport.h b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorExport.h
index 84c1dae65e1..b8b32ba3c02 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorExport.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorExport.h
@@ -26,7 +26,7 @@ class ParticleSystemTemplate;
 extern "C" {
 	// Called to create the dialog
 	void __declspec(dllexport) CreateParticleSystemDialog( void );
-	
+
 	// Called to (not surprisingly) destroy the dialog (and free the resources)
 	void __declspec(dllexport) DestroyParticleSystemDialog( void );
 
@@ -47,9 +47,8 @@ extern "C" {
 #	define PARM_ParticleTypeName		0x00
 # define PARM_SlaveSystemName			0x01
 #	define PARM_AttachedSystemName	0x02
+# define PARM_NumParms						0x03
 
-// Keep this one last
-# define PARM_NumParms	0x03	
 	// parmNum can be exactly one of the above defines (PARM_*)
 	void __declspec(dllexport) GetSelectedParticleAsciiStringParm( int parmNum, char *bufferToCopyInto, ParticleSystemTemplate **whichTemplate );
 	void __declspec(dllexport) UpdateParticleAsciiStringParm( int parmNum, const char *bufferToCopyFrom, ParticleSystemTemplate **whichTemplate  );
@@ -76,8 +75,8 @@ extern "C" {
 #	define PEB_BusyWait								0xFE
 #	define PEB_Error									0xFF
 
-	
+
 	int __declspec(dllexport) NextParticleEditorBehavior( void );
 
-	
+
 }
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.cpp b/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.cpp
index d4844c05301..69108771f45 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.cpp
+++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: ParticleTypePanels.cpp 
+// FILE: ParticleTypePanels.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -51,12 +51,12 @@ ParticlePanelParticle::ParticlePanelParticle(UINT nIDTemplate, CWnd* pParentWnd)
 void ParticlePanelParticle::InitPanel( void )
 {
 	CFileFind finder;
-	
+
 	CComboBox *pWnd = (CComboBox*) GetDlgItem(IDC_PSEd_ParticleTypeParticle);
 	if (!pWnd) {
 		return;
 	}
-	
+
 	// first, clear out any items.
 	pWnd->ResetContent();
 
@@ -64,7 +64,7 @@ void ParticlePanelParticle::InitPanel( void )
 	findString = PATH;
 	findString += PREFIX;
 	findString += POSTFIX;
-//	DEBUG_LOG(("ParticlePanedParticle::InitPanel - looking for textures, search string is '%s'\n", findString.begin()));
+//	DEBUG_LOG(("ParticlePanedParticle::InitPanel - looking for textures, search string is '%s'", findString.begin()));
 	BOOL bWorkin = finder.FindFile(findString.c_str());
 	while (bWorkin) {
 		bWorkin = finder.FindNextFile();
@@ -107,7 +107,7 @@ void ParticlePanelParticle::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -168,7 +168,7 @@ void ParticlePanelDrawable::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h b/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h
index 290333c3664..3858e1256a5 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: ParticleTypePanels.h 
+// FILE: ParticleTypePanels.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_PARTICLETYPEPANELS_
-#define _H_PARTICLETYPEPANELS_
 
 #include "Resource.h"
 #include "ISwapablePanel.h"
@@ -54,9 +52,9 @@ class ParticlePanelParticle : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -73,9 +71,9 @@ class ParticlePanelDrawable : public ISwapablePanel
 		void InitPanel( void );
 		void clearAllThingTemplates( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -91,12 +89,10 @@ class ParticlePanelStreak : public ParticlePanelParticle
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif /* _H_PARTICLETYPEPANELS_ */
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/Resource.h b/GeneralsMD/Code/Tools/ParticleEditor/Resource.h
index cb63ab900d1..2281197a0da 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/Resource.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/Resource.h
@@ -194,7 +194,7 @@
 #define ID_FILE_RELOADTEXTURES          32776
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        1019
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.cpp b/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.cpp
index ddac55523b9..1ca7933c699 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.cpp
+++ b/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: ShaderTypePanels.cpp 
+// FILE: ShaderTypePanels.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h b/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h
index a3475e2f0a7..4b4875a37db 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: ShaderTypePanels.h 
+// FILE: ShaderTypePanels.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,13 +32,8 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_SHADERTYPEPANELS_
-#define _H_SHADERTYPEPANELS_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 // DEFINES ////////////////////////////////////////////////////////////////////
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////
-
-
-#endif /* _H_SHADERTYPEPANELS_ */
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h b/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h
index 3cb3e20d597..a5879cdae31 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h
@@ -21,16 +21,11 @@
 //      are changed infrequently
 //
 
-#if !defined(AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_)
-#define AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
-// TheSuperHackers @compile xezon 24/03/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
+// TheSuperHackers @build xezon 24/03/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
 #define _d3d9TYPES_H_
 
 #include <afxwin.h>         // MFC core and standard components
@@ -75,5 +70,3 @@
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.cpp b/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.cpp
index d12d529aa85..b1dbfaa6df7 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.cpp
+++ b/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.cpp
@@ -17,7 +17,7 @@
 */
 
 
-// FILE: VelocityTypePanels.cpp 
+// FILE: VelocityTypePanels.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -66,7 +66,7 @@ void VelocityPanelOrtho::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOrthoFromSystem(0, ortho);
-				
+
 				sprintf(buff, FORMAT_STRING, ortho);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -81,7 +81,7 @@ void VelocityPanelOrtho::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOrthoFromSystem(1, ortho);
-				
+
 				sprintf(buff, FORMAT_STRING, ortho);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -96,7 +96,7 @@ void VelocityPanelOrtho::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOrthoFromSystem(2, ortho);
-				
+
 				sprintf(buff, FORMAT_STRING, ortho);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -111,7 +111,7 @@ void VelocityPanelOrtho::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOrthoFromSystem(3, ortho);
-				
+
 				sprintf(buff, FORMAT_STRING, ortho);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -126,7 +126,7 @@ void VelocityPanelOrtho::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOrthoFromSystem(4, ortho);
-				
+
 				sprintf(buff, FORMAT_STRING, ortho);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -141,7 +141,7 @@ void VelocityPanelOrtho::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOrthoFromSystem(5, ortho);
-				
+
 				sprintf(buff, FORMAT_STRING, ortho);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -159,7 +159,7 @@ void VelocityPanelOrtho::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -200,7 +200,7 @@ void VelocityPanelSphere::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelSphereFromSystem(0, radial);
-				
+
 				sprintf(buff, FORMAT_STRING, radial);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -215,7 +215,7 @@ void VelocityPanelSphere::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelSphereFromSystem(1, radial);
-				
+
 				sprintf(buff, FORMAT_STRING, radial);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -233,7 +233,7 @@ void VelocityPanelSphere::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -271,7 +271,7 @@ void VelocityPanelHemisphere::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelHemisphereFromSystem(0, radial);
-				
+
 				sprintf(buff, FORMAT_STRING, radial);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -286,7 +286,7 @@ void VelocityPanelHemisphere::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelHemisphereFromSystem(1, radial);
-				
+
 				sprintf(buff, FORMAT_STRING, radial);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -304,7 +304,7 @@ void VelocityPanelHemisphere::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -341,7 +341,7 @@ void VelocityPanelCylinder::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelCylinderFromSystem(0, cylinder);
-				
+
 				sprintf(buff, FORMAT_STRING, cylinder);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -356,7 +356,7 @@ void VelocityPanelCylinder::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelCylinderFromSystem(1, cylinder);
-				
+
 				sprintf(buff, FORMAT_STRING, cylinder);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -371,7 +371,7 @@ void VelocityPanelCylinder::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelCylinderFromSystem(2, cylinder);
-				
+
 				sprintf(buff, FORMAT_STRING, cylinder);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -386,7 +386,7 @@ void VelocityPanelCylinder::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelCylinderFromSystem(3, cylinder);
-				
+
 				sprintf(buff, FORMAT_STRING, cylinder);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -404,7 +404,7 @@ void VelocityPanelCylinder::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
@@ -443,7 +443,7 @@ void VelocityPanelOutward::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOutwardFromSystem(0, outward);
-				
+
 				sprintf(buff, FORMAT_STRING, outward);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -458,7 +458,7 @@ void VelocityPanelOutward::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOutwardFromSystem(1, outward);
-				
+
 				sprintf(buff, FORMAT_STRING, outward);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -473,7 +473,7 @@ void VelocityPanelOutward::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOutwardFromSystem(2, outward);
-				
+
 				sprintf(buff, FORMAT_STRING, outward);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -488,7 +488,7 @@ void VelocityPanelOutward::performUpdate( IN Bool toUI )
 		if (pWnd) {
 			if (toUI) {
 				pParent->getVelOutwardFromSystem(3, outward);
-				
+
 				sprintf(buff, FORMAT_STRING, outward);
 				pWnd->SetWindowText(buff);
 			} else {
@@ -506,7 +506,7 @@ void VelocityPanelOutward::OnParticleSystemEdit()
 	if (!pParent) {
 		return;
 	}
-	
+
 	pParent->signalParticleSystemEdit();
 }
 
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h b/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h
index e7f34c9d1ab..ecc4ac07382 100644
--- a/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h
+++ b/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: VelocityTypePanels.h 
+// FILE: VelocityTypePanels.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_VELOCITYTYPEPANELS_
-#define _H_VELOCITYTYPEPANELS_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Resource.h"
@@ -55,9 +53,9 @@ class VelocityPanelOrtho : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -73,9 +71,9 @@ class VelocityPanelSphere : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -91,9 +89,9 @@ class VelocityPanelHemisphere : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -109,9 +107,9 @@ class VelocityPanelCylinder : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
@@ -127,12 +125,10 @@ class VelocityPanelOutward : public ISwapablePanel
 
 		void InitPanel( void );
 
-		// if true, updates the UI from the Particle System. 
+		// if true, updates the UI from the Particle System.
 		// if false, updates the Particle System from the UI
-		void performUpdate( IN Bool toUI );	
+		void performUpdate( IN Bool toUI );
 	protected:
 		afx_msg void OnParticleSystemEdit();
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif /* _H_VELOCITYTYPEPANELS_ */
diff --git a/GeneralsMD/Code/Tools/W3DView/CMakeLists.txt b/GeneralsMD/Code/Tools/W3DView/CMakeLists.txt
index 7225e63bd5f..9f321bc93db 100644
--- a/GeneralsMD/Code/Tools/W3DView/CMakeLists.txt
+++ b/GeneralsMD/Code/Tools/W3DView/CMakeLists.txt
@@ -8,7 +8,6 @@ target_link_libraries(z_w3dview PRIVATE
     d3d8
     d3d8lib
     d3dx8
-    dbghelplib
     imm32
     milesstub
     Version
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt b/GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt
index d984b454403..2bab1c648c4 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt
+++ b/GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt
@@ -11,7 +11,6 @@ set(WORLDBUILDER_SRC
     "src/BuildListTool.cpp"
     "src/CameraOptions.cpp"
     "src/CButtonShowColor.cpp"
-    "src/CButtonShowColor.h"
     "src/CellWidth.cpp"
     "src/CFixTeamOwnerDialog.cpp"
     "src/ContourOptions.cpp"
@@ -111,6 +110,7 @@ set(WORLDBUILDER_SRC
     "include/BuildList.h"
     "include/BuildListTool.h"
     "include/CameraOptions.h"
+    "include/CButtonShowColor.h"
     "include/CellWidth.h"
     "include/CFixTeamOwnerDialog.h"
     "include/ContourOptions.h"
@@ -209,19 +209,23 @@ target_include_directories(z_worldbuilder PRIVATE
     res
 )
 
+target_precompile_headers(z_worldbuilder PRIVATE
+    [["always.h"]]
+    [["Common/STLTypedefs.h"]]
+    [["StdAfx.h"]]
+    [["WWCommon.h"]]
+)
+
 target_link_libraries(z_worldbuilder PRIVATE
     core_debug
     core_profile
     d3d8lib
-    dbghelplib
     imm32
     vfw32
     winmm
     core_browserdispatch
     z_gameengine
     z_gameenginedevice
-    zi_gameengine_include
-    zi_gameenginedevice_include
     zi_always
 )
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h
index 618e17bfbdc..c4a76c63e17 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef AUTOEDGEOUTTOOL_H
-#define AUTOEDGEOUTTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************/
 /**                             AutoEdgeOutTool
-	 Does the BlendEdgesOut tool operation. 
+	 Does the BlendEdgesOut tool operation.
 ***************************************************************************/
 ///  Blend edges out tool.
-class AutoEdgeOutTool : public Tool 
+class AutoEdgeOutTool : public Tool
 {
 public:
 	AutoEdgeOutTool(void);
@@ -43,6 +40,3 @@ class AutoEdgeOutTool : public Tool
 	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 	virtual void activate(); ///< Become the current tool.
 };
-
-
-#endif //TOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h
index 422d09d10ac..309efe287fd 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_BASEBUILDPROPS_H__71A01D97_E81A_45F8_982D_57D83E5342DF__INCLUDED_)
-#define AFX_BASEBUILDPROPS_H__71A01D97_E81A_45F8_982D_57D83E5342DF__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // BaseBuildProps.h : header file
 //
 
@@ -74,5 +70,3 @@ class BaseBuildProps : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BASEBUILDPROPS_H__71A01D97_E81A_45F8_982D_57D83E5342DF__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h
index e0a58fe490f..d3a62b21218 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef BLEND_EDGE_TOOL_H
-#define BLEND_EDGE_TOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************/
 /**                             BlendEdgeTool
-	 Does the BlendEdgesOut tool operation. 
+	 Does the BlendEdgesOut tool operation.
 ***************************************************************************/
 ///  Blend edges out tool.
-class BlendEdgeTool : public Tool 
+class BlendEdgeTool : public Tool
 {
 protected:
 	Coord3D m_downPt;
@@ -47,6 +44,3 @@ class BlendEdgeTool : public Tool
 	virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 
 };
-
-
-#endif //TOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h
index 6791dddd719..713b517da49 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_BlendMaterial_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
-#define AFX_BlendMaterial_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // BlendMaterial.h : header file
 //
 
@@ -84,9 +80,7 @@ class BlendMaterial : public COptionsPanel
 public:
 	Bool setTerrainTreeViewSelection(HTREEITEM parent, Int selection);
 
-}; 
+};
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BlendMaterial_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h
index 73fe9820410..60721052bf9 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h
@@ -17,6 +17,7 @@
 */
 
 #pragma once
+
 #include "Tool.h"
 
 class BorderTool : public Tool
@@ -27,8 +28,8 @@ class BorderTool : public Tool
 		Bool m_addingNewBorder;
 		Int m_modifyBorderNdx;
 		ModificationType m_modificationType;
-		
-	
+
+
 	public:
 		BorderTool();
 		~BorderTool();
@@ -36,12 +37,12 @@ class BorderTool : public Tool
 		Int getToolID(void) {return m_toolID;}
 		virtual void setCursor(void);
 
-		virtual void activate(); 
-		virtual void deactivate(); 
+		virtual void activate();
+		virtual void deactivate();
 
 		virtual Bool followsTerrain(void) { return false;	}
 
 		virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 		virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 		virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-};
\ No newline at end of file
+};
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h
index bf7c97949d0..7c767c82bba 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef BRUSHTOOL_H
-#define BRUSHTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************/
 /**                             BrushTool
-	 Does the Height Brush tool operation. 
+	 Does the Height Brush tool operation.
 ***************************************************************************/
 ///  Height brush tool.
-class BrushTool : public Tool 
+class BrushTool : public Tool
 {
 protected:
 	WorldHeightMapEdit *m_htMapEditCopy; ///< ref counted.
@@ -64,6 +61,3 @@ class BrushTool : public Tool
 	virtual Bool followsTerrain(void) {return false;};
 
 };
-
-
-#endif //BRUSHTOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h
index 5b454bb50ce..51365043040 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_BuildList_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_)
-#define AFX_BuildList_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // BuildList.h : header file
 //
 
@@ -105,9 +101,7 @@ class BuildList : public COptionsPanel, public PopupSliderOwner
 	virtual void PopSliderChanged(const long sliderID, long theVal);
 	virtual void PopSliderFinished(const long sliderID, long theVal);
 
-}; 
+};
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BuildList_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h
index 5a4907e9d29..f764a82e14d 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef BUILDLISTTOOL_H
-#define BUILDLISTTOOL_H
-
 #include "Tool.h"
 #include "Common/AsciiString.h"
 #include "PickUnitDialog.h"
@@ -33,9 +30,9 @@ class BuildListInfo;
 
 /*************************************************************************/
 /**                             BuildListTool
-	 Does the add item to build list tool operation. 
+	 Does the add item to build list tool operation.
 ***************************************************************************/
-class BuildListTool : public Tool 
+class BuildListTool : public Tool
 {
 protected:
 	CPoint m_downPt2d;
@@ -78,6 +75,3 @@ class BuildListTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual void deactivate(); ///< Become not the current tool.
 };
-
-
-#endif //TOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h
new file mode 100644
index 00000000000..3685c569525
--- /dev/null
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h
@@ -0,0 +1,41 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+class CButtonShowColor : public CButton
+{
+	protected:
+		RGBColor m_color;
+
+	public:
+		const RGBColor& getColor(void) const { return m_color; }
+		void setColor(Int color) { m_color.setFromInt(color); }
+		void setColor(const RGBColor& color) { m_color = color; }
+		~CButtonShowColor();
+
+
+		static COLORREF RGBtoBGR(Int color);
+		static Int BGRtoRGB(COLORREF color);
+
+
+	protected:
+		afx_msg void OnPaint();
+
+	DECLARE_MESSAGE_MAP();
+};
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h
index a45243f1378..b0f88d8f2d7 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h
@@ -42,4 +42,4 @@ class CFixTeamOwnerDialog : public CDialog
 		AsciiString m_selectedOwner;
 		TeamsInfo *m_ti;
 		SidesList *m_sl;
-};
\ No newline at end of file
+};
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h
index 207ed444e1f..32c27ecd8be 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h
@@ -22,14 +22,10 @@
 
 #pragma once
 
-#ifndef CUNDOABLE_H
-#define CUNDOABLE_H
-
 #include "Lib/BaseType.h"
 #include "../../GameEngine/Include/Common/MapObject.h"
 #include "../../GameEngine/Include/Common/GameCommon.h"
 #include "../../GameEngine/Include/GameLogic/SidesList.h"
-#include "refcount.h"
 #include <vector>
 
 class PolygonTrigger;
@@ -65,7 +61,7 @@ class MapObject;
 **                             CWBDocUndoable
 ***************************************************************************/
 /// Command that saves & restores entire height map.
-/** An undoable that actually undoes something.  Saves and restores the 
+/** An undoable that actually undoes something.  Saves and restores the
 entire height map. */
 class WBDocUndoable : public Undoable
 {
@@ -75,12 +71,12 @@ class WBDocUndoable : public Undoable
 	WorldHeightMapEdit		*mPOldHeightMapData;  ///< ref counted.
 	Bool									m_offsetObjects;			///< If true, apply m_objOffset.
 	Coord3D								m_objOffset;					///< Offset to adjust all objects.
-	
+
 
 public:
 		WBDocUndoable(CWorldBuilderDoc *pDoc, WorldHeightMapEdit *pNewHtMap, Coord3D *pObjOffset = NULL);
 
-		// destructor. 
+		// destructor.
 		~WBDocUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -94,7 +90,7 @@ to the height map.  If it is a linked list, adds all objects. */
 class AddObjectUndoable : public Undoable
 {
 protected:
-	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway. 
+	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway.
 	MapObject				 *m_objectToAdd;
 	Int							  m_numObjects;
 	Bool							m_addedToList;
@@ -102,7 +98,7 @@ class AddObjectUndoable : public Undoable
 public:
 		AddObjectUndoable(CWorldBuilderDoc *pDoc, MapObject *pObjectToAdd);
 
-		// destructor. 
+		// destructor.
 		~AddObjectUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -113,7 +109,7 @@ class AddObjectUndoable : public Undoable
 /** An undoable that actually undoes something.  Modifies an object's
 location and angle. */
 // Helper class
-class MoveInfo 
+class MoveInfo
 {
 public:
 	MoveInfo(MapObject *pObjToMove);
@@ -143,13 +139,13 @@ class MoveInfo
 class ModifyObjectUndoable : public Undoable
 {
 protected:
-	CWorldBuilderDoc*	m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway. 
+	CWorldBuilderDoc*	m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway.
 	MoveInfo*					m_moveList;
 	Bool							m_inval;
 
 public:
 		ModifyObjectUndoable(CWorldBuilderDoc *pDoc);
-		// destructor. 
+		// destructor.
 		~ModifyObjectUndoable(void);
 
 		virtual void Do(void);
@@ -167,7 +163,7 @@ class ModifyObjectUndoable : public Undoable
 /** An undoable that actually undoes something.  Modifies an object's
 flags. */
 // Helper class
-class FlagsInfo 
+class FlagsInfo
 {
 public:
 	FlagsInfo(MapObject *pObjToMove, Int flagMask, Int flagValue );
@@ -186,12 +182,12 @@ class FlagsInfo
 class ModifyFlagsUndoable : public Undoable
 {
 protected:
-	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway. 
+	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway.
 	FlagsInfo *m_flagsList;
 
 public:
 		ModifyFlagsUndoable(CWorldBuilderDoc *pDoc, Int flagMask, Int flagValue);
-		// destructor. 
+		// destructor.
 		~ModifyFlagsUndoable(void);
 
 		virtual void Do(void);
@@ -204,7 +200,7 @@ class SidesListUndoable : public Undoable
 {
 protected:
 	SidesList		m_old, m_new;
-	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway. 
+	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway.
 
 public:
 
@@ -234,7 +230,7 @@ class DictItemUndoable : public Undoable
 	// if you want to just add/modify/remove a single dict item, pass the item's key.
 	// if you want to substitute the entire contents of the new dict, pass NAMEKEY_INVALID.
 	DictItemUndoable(Dict **d, Dict data, NameKeyType key, Int dictsToModify = 1, CWorldBuilderDoc *pDoc = NULL, Bool inval = false);
-	// destructor. 
+	// destructor.
 	~DictItemUndoable(void);
 
 	virtual void Do(void);
@@ -246,7 +242,7 @@ class DictItemUndoable : public Undoable
 ///                            DeleteObjectUndoable
 /** An undoable that actually undoes something.  Deletes an object. */
 // Helper class
-class DeleteInfo 
+class DeleteInfo
 {
 public:
 	DeleteInfo(MapObject *pObjToDelete);
@@ -265,12 +261,12 @@ class DeleteInfo
 class DeleteObjectUndoable : public Undoable
 {
 protected:
-	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway. 
+	CWorldBuilderDoc *m_pDoc;  ///< Not ref counted.  This undoable should be in a list attached to the doc anyway.
 	DeleteInfo *m_deleteList;
 public:
 		DeleteObjectUndoable(CWorldBuilderDoc *pDoc);
 
-		// destructor. 
+		// destructor.
 		~DeleteObjectUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -285,7 +281,7 @@ class AddPolygonUndoable : public Undoable
 	Bool					 m_isTriggerInList;
 public:
 		AddPolygonUndoable( PolygonTrigger *pTrig);
-		// destructor. 
+		// destructor.
 		~AddPolygonUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -300,7 +296,7 @@ class AddPolygonPointUndoable : public Undoable
 	ICoord3D				m_point;
 public:
 		AddPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt);
-		// destructor. 
+		// destructor.
 		~AddPolygonPointUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -317,7 +313,7 @@ class ModifyPolygonPointUndoable : public Undoable
 	ICoord3D				m_savPoint;
 public:
 		ModifyPolygonPointUndoable(PolygonTrigger *pTrig, Int ndx);
-		// destructor. 
+		// destructor.
 		~ModifyPolygonPointUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -333,7 +329,7 @@ class MovePolygonUndoable : public Undoable
 	ICoord3D				m_offset;
 public:
 		MovePolygonUndoable(PolygonTrigger *pTrig);
-		// destructor. 
+		// destructor.
 		~MovePolygonUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -352,7 +348,7 @@ class InsertPolygonPointUndoable : public Undoable
 	ICoord3D				m_point;
 public:
 		InsertPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt, Int ndx);
-		// destructor. 
+		// destructor.
 		~InsertPolygonPointUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -368,7 +364,7 @@ class DeletePolygonPointUndoable : public Undoable
 	ICoord3D				m_point;
 public:
 		DeletePolygonPointUndoable(PolygonTrigger *pTrig, Int ndx);
-		// destructor. 
+		// destructor.
 		~DeletePolygonPointUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -383,7 +379,7 @@ class DeletePolygonUndoable : public Undoable
 	Bool					 m_isTriggerInList;
 public:
 		DeletePolygonUndoable(PolygonTrigger *pTrig);
-		// destructor. 
+		// destructor.
 		~DeletePolygonUndoable(void);
 		virtual void Do(void);
 		virtual void Undo(void);
@@ -391,8 +387,8 @@ class DeletePolygonUndoable : public Undoable
 
 ///                            MultipleUndoable
 /**
-  * An undoable that doesn't do anything; it just consolidates a number of other 
-  * Undoables in a single logical undo step. 
+  * An undoable that doesn't do anything; it just consolidates a number of other
+  * Undoables in a single logical undo step.
   */
 class MultipleUndoable : public Undoable
 {
@@ -400,7 +396,7 @@ class MultipleUndoable : public Undoable
   Undoable * m_undoableList; //< The head of the list of undoables, in the order they should be done. Reverse order for undoes
 public:
 		MultipleUndoable();
-    // destructor. 
+    // destructor.
     ~MultipleUndoable(void);
 
     /** Add other undoables in the order you would want them UNdone; e.g. in the reverse order you want them done
@@ -412,7 +408,3 @@ class MultipleUndoable : public Undoable
     virtual void Undo(void);
     virtual void Redo(void);
 };
-
-
-
-#endif //CUNDOABLE_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h
index 9a2a1bc47aa..3ba623f52d9 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_CAMERAOPTIONS_H__4EF4F775_1290_47AE_817F_9340BA3A898C__INCLUDED_)
-#define AFX_CAMERAOPTIONS_H__4EF4F775_1290_47AE_817F_9340BA3A898C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // CameraOptions.h : header file
 //
 
@@ -90,5 +86,3 @@ class CameraOptions : public CDialog, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_CAMERAOPTIONS_H__4EF4F775_1290_47AE_817F_9340BA3A898C__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h
index 6c11dce9a4c..8dd420e5c17 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_CELLWIDTH_H__E4023BA4_28DE_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_CELLWIDTH_H__E4023BA4_28DE_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // CellWidth.h : header file
 //
 
@@ -65,5 +61,3 @@ class CellWidth : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_CELLWIDTH_H__E4023BA4_28DE_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h
index 3393212805f..974aeca6f83 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ContourOptions_H__7B56E24C_582E_4530_A451_873397C8852D__INCLUDED_)
-#define AFX_ContourOptions_H__7B56E24C_582E_4530_A451_873397C8852D__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ContourOptions.h : header file
 //
 
@@ -86,5 +82,3 @@ class ContourOptions : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ContourOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h b/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h
index 9c6a87e2257..77ea5426b16 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h
@@ -16,9 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-#ifndef __DRAW_OBJECT_H_
-#define __DRAW_OBJECT_H_
+#pragma once
 
 #include "always.h"
 #include "rendobj.h"
@@ -31,7 +29,7 @@
 #include "Common/AsciiString.h"
 
 // The draw objects draw a circle of diameter 1.0 cells.
-#define THE_RADIUS (0.8f*MAP_XY_FACTOR) 
+#define THE_RADIUS (0.8f*MAP_XY_FACTOR)
 
 class MeshClass;
 class PolygonTrigger;
@@ -43,7 +41,7 @@ class Render2DClass;
 //
 //
 class DrawObject : public RenderObjClass
-{	
+{
 
 public:
 
@@ -53,13 +51,13 @@ class DrawObject : public RenderObjClass
 	~DrawObject(void);
 
 	/////////////////////////////////////////////////////////////////////////////
-	// Render Object Interface 
+	// Render Object Interface
 	/////////////////////////////////////////////////////////////////////////////
 	virtual RenderObjClass *	Clone(void) const;
 	virtual int						Class_ID(void) const;
 	virtual void					Render(RenderInfoClass & rinfo);
 //	virtual void					Special_Render(SpecialRenderInfoClass & rinfo);
-//	virtual void 					Set_Transform(const Matrix3D &m); 
+//	virtual void 					Set_Transform(const Matrix3D &m);
 //	virtual void 					Set_Position(const Vector3 &v);
 //TODO: MW: do these later - only needed for collision detection
 	virtual Bool					Cast_Ray(RayCollisionTestClass & raytest);
@@ -83,15 +81,15 @@ class DrawObject : public RenderObjClass
 	Int freeMapResources(void);
 	int initData(void);
 
-  void setDrawObjects(Bool val, Bool waypoints, Bool poly, Bool bounding, Bool sight, Bool weapon, Bool sound, Bool testart, Bool letterbox) { m_drawObjects = val; m_drawWaypoints=waypoints; m_drawPolygonAreas = poly; m_drawBoundingBoxes = bounding; m_drawSightRanges = sight; m_drawWeaponRanges = weapon; m_drawSoundRanges = sound; m_drawTestArtHighlight = testart, m_drawLetterbox = letterbox;}	
-	static void setDoBrushFeedback(Bool val) { m_toolWantsFeedback = val; m_meshFeedback=false;}	
-	static void setDoMeshFeedback(Bool val) { m_meshFeedback = val; }	
+  void setDrawObjects(Bool val, Bool waypoints, Bool poly, Bool bounding, Bool sight, Bool weapon, Bool sound, Bool testart, Bool letterbox) { m_drawObjects = val; m_drawWaypoints=waypoints; m_drawPolygonAreas = poly; m_drawBoundingBoxes = bounding; m_drawSightRanges = sight; m_drawWeaponRanges = weapon; m_drawSoundRanges = sound; m_drawTestArtHighlight = testart, m_drawLetterbox = letterbox;}
+	static void setDoBrushFeedback(Bool val) { m_toolWantsFeedback = val; m_meshFeedback=false;}
+	static void setDoMeshFeedback(Bool val) { m_meshFeedback = val; }
 	static void setDoRampFeedback(Bool val) { m_rampFeedback = val; }
 	static void setDoBoundaryFeedback(Bool val) { m_boundaryFeedback = val; }
 
 	static void setDoAmbientSoundFeedback(Bool val) { m_ambientSoundFeedback = val; }
-	
-	static void setBrushFeedbackParms(Bool square, Int width, Int featherWidth) 
+
+	static void setBrushFeedbackParms(Bool square, Int width, Int featherWidth)
 														{ m_squareFeedback = square; m_brushWidth=width;
 															m_meshFeedback = false; m_brushFeatherWidth = featherWidth;}
 	static void disableFeedback(void) {m_disableFeedback = true;};
@@ -102,16 +100,16 @@ class DrawObject : public RenderObjClass
 	static void setWaypointDragFeedback(const Coord3D &start, const Coord3D &end);
 	static void setRampFeedbackParms(const Coord3D *start, const Coord3D *end, Real rampWidth);
 	static void stopWaypointDragFeedback();
-	
-	
-	
+
+
+
 
 	MeshClass *peekMesh(void) {return m_moldMesh;};
 	void getMeshBounds(SphereClass *pSphere) {*pSphere = m_moldMeshBounds;};
 
 protected:
 	enum {MAX_RADIUS = 50, NUM_FEEDBACK_VERTEX = 201*201, NUM_FEEDBACK_INDEX = 101*101*6};
-	Int	m_numTriangles;	//dimensions of list 
+	Int	m_numTriangles;	//dimensions of list
 
 	DX8IndexBufferClass				*m_indexBuffer;	///< indices defining a object icon
 	ShaderClass								m_shaderClass; ///< shader or rendering state for heightmap
@@ -188,7 +186,5 @@ class DrawObject : public RenderObjClass
 
 };
 
-void BuildRectFromSegmentAndWidth(const Coord3D* b, const Coord3D* t, Real width, 
+void BuildRectFromSegmentAndWidth(const Coord3D* b, const Coord3D* t, Real width,
 																	Coord3D* outBL, Coord3D* outTL, Coord3D* outBR, Coord3D* outTR);
-
-#endif  // end __DRAW_OBJECT_H_
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h
index a0756e07008..67c8affbb26 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h
@@ -16,17 +16,13 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EditAction_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_)
-#define AFX_EditAction_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EditAction.h : header file
 //
 
 
-class ScriptAction;	 
+class ScriptAction;
 class SidesList;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -81,5 +77,3 @@ class EditAction : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EditAction_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h
index f3a5a0c0374..56dd2efe3a7 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EDITCONDITION_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_)
-#define AFX_EDITCONDITION_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EditCondition.h : header file
 //
 
@@ -87,5 +83,3 @@ class EditCondition : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EDITCONDITION_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h
index 056d8403b19..1f007f9b470 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EDITCOORDPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_)
-#define AFX_EDITCOORDPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EditCoordParameter.h : header file
 //
 #include "GameLogic/Scripts.h"
@@ -72,5 +68,3 @@ friend class EditParameter;
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EDITCOORDPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h
index ce6f19dcb68..b75952dfefd 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EDITGROUP_H__712F9978_4300_4625_9364_39E903FA3284__INCLUDED_)
-#define AFX_EDITGROUP_H__712F9978_4300_4625_9364_39E903FA3284__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EditGroup.h : header file
 //
 
@@ -65,5 +61,3 @@ class EditGroup : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EDITGROUP_H__712F9978_4300_4625_9364_39E903FA3284__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h
index d4fd4b38de1..2f4c11394d4 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EDITOBJPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_)
-#define AFX_EDITOBJPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EditObjectParameter.h : header file
 //
 #include "GameLogic/Scripts.h"
@@ -76,5 +72,3 @@ friend class EditParameter;
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EDITOBJPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h
index 2f3cce64535..8141ef0df32 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EDITPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_)
-#define AFX_EDITPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // EditParameter.h : header file
 //
 #include "GameLogic/Scripts.h"
@@ -59,8 +55,8 @@ class EditParameter : public CDialog
 	static AsciiString getInfoText(Parameter *pParm);
 	static void setCurSidesList(SidesList *sidesListP) {m_sidesListP = sidesListP;};
 	static Bool loadScripts(CComboBox *pCombo, Bool subr, AsciiString match = AsciiString::TheEmptyString);
-	static Bool loadWaypoints(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString); 
-	static Bool loadTransports(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString); 
+	static Bool loadWaypoints(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
+	static Bool loadTransports(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static Bool loadObjectTypeList(CComboBox *pCombo, std::vector<AsciiString> *strings = NULL, AsciiString match = AsciiString::TheEmptyString);
 
 protected:
@@ -69,10 +65,10 @@ class EditParameter : public CDialog
 	static Bool loadCommandButtons(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static Bool loadFontNames(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static void readFontFile( const char *filename );
-	static Bool loadTeams(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString); 
-	static Bool loadTeamOrUnit(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString); 
-	static Bool loadUnits(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString); 
-	static Bool loadBridges(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString); 
+	static Bool loadTeams(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
+	static Bool loadTeamOrUnit(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
+	static Bool loadUnits(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
+	static Bool loadBridges(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static Bool loadObjectType(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static Bool loadAudioType(Parameter::ParameterType comboType, CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static Bool loadMovies(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
@@ -93,17 +89,17 @@ class EditParameter : public CDialog
 	static Bool loadCreateObjectListsParameter(Script *pScr, CComboBox *pCombo, std::vector<AsciiString> *strings, AsciiString match);
 	static Bool loadRevealNames(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static Bool loadRevealNamesParameter(Script *pScr, CComboBox *pCombo, AsciiString match);
-	
+
 	static Bool loadEmoticons( CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString );
 	static AsciiString getCreatedUnitTemplateName(AsciiString unitName);
-	
+
 	static Bool loadCounters(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
 	static void loadConditionParameter(Script *pScr, Parameter::ParameterType type, CComboBox *pCombo);
 	static Bool loadActionParameter(Script *pScr, Parameter::ParameterType type, CComboBox *pCombo, AsciiString match);
 	static Bool loadFlags(CComboBox *pCombo, AsciiString match = AsciiString::TheEmptyString);
-	
 
-protected:							
+
+protected:
 	Parameter		*m_parameter;
 	static AsciiString m_unitName; //This is the name of the unit that this script command is dedicated to (if applicable).
 	AsciiString m_string;
@@ -133,5 +129,3 @@ class EditParameter : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EDITPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h
index 15ac9d3a011..30a2a22e6ce 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EXPORTSCRIPTSOPTIONS_H__706D8D87_E01C_431A_ADB8_DFC4CA8A8422__INCLUDED_)
-#define AFX_EXPORTSCRIPTSOPTIONS_H__706D8D87_E01C_431A_ADB8_DFC4CA8A8422__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ExportScriptsOptions.h : header file
 //
 
@@ -62,7 +58,7 @@ class ExportScriptsOptions : public CDialog
 	Bool getDoTriggers(void) {return m_triggers;}
 	Bool getDoAllScripts(void) {return m_allScripts;}
 	Bool getDoSides(void) {return m_sides;}
-	
+
 protected:
 
 	// Generated message map functions
@@ -75,5 +71,3 @@ class ExportScriptsOptions : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EXPORTSCRIPTSOPTIONS_H__706D8D87_E01C_431A_ADB8_DFC4CA8A8422__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h
index 2132bed1018..90b25177a47 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef EYEDROPPERTOOL_H
-#define EYEDROPPERTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************/
 /**                             EyedropperTool
-	 Does the select tile from drawing window tool operation. 
+	 Does the select tile from drawing window tool operation.
 ***************************************************************************/
 ///  Select tile tool.
-class EyedropperTool : public Tool 
+class EyedropperTool : public Tool
 {
 public:
 	EyedropperTool(void);
@@ -43,6 +40,3 @@ class EyedropperTool : public Tool
 	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 	virtual void activate(); ///< Become the current tool.
 };
-
-
-#endif //TOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h
index f377fd70b6c..66ef13d9171 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_FEATHEROPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
-#define AFX_FEATHEROPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // brushoptions.h : header file
 //
 
@@ -95,5 +91,3 @@ class FeatherOptions : public COptionsPanel	, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_FEATHEROPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h
index e6d5c452efc..c0617139f97 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef FEATHERTOOL_H
-#define FEATHERTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /**************************************************************************/
 /**                             FeatherTool
-	 Does the smooth height map tool operation. 
+	 Does the smooth height map tool operation.
 ***************************************************************************/
 ///  smooth height map tool.
-class FeatherTool : public Tool 
+class FeatherTool : public Tool
 {
 protected:
 	WorldHeightMapEdit *m_htMapEditCopy; //< ref counted.
@@ -56,6 +53,3 @@ class FeatherTool : public Tool
 	virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;};
 	virtual void activate(); ///< Become the current tool.
 };
-
-
-#endif //FEATHERTOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h
index 5c98bfd3a84..dff1241e7aa 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_FenceOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_)
-#define AFX_FenceOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // FenceOptions.h : header file
 //
 
@@ -81,7 +77,7 @@ class FenceOptions : public COptionsPanel
 	Bool							m_customSpacing;
 
 protected:
-	void addObject( MapObject *mapObject, const char *pPath, const char *name, 
+	void addObject( MapObject *mapObject, const char *pPath, const char *name,
 									Int objectNdx, HTREEITEM parent );
 	HTREEITEM findOrAdd(HTREEITEM parent, const char *pLabel);
 	Bool setObjectTreeViewSelection(HTREEITEM parent, Int selection);
@@ -92,9 +88,7 @@ class FenceOptions : public COptionsPanel
 	static Bool hasSelectedObject(void);
 	static Real getFenceSpacing(void) {return m_fenceSpacing;}
 	static Real getFenceOffset(void) {return m_fenceOffset;}
-}; 
+};
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_FenceOptions_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h
index 16bc73ee3fd..2ea16a9e358 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h
@@ -22,18 +22,15 @@
 
 #pragma once
 
-#ifndef FenceTool_H
-#define FenceTool_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 class MapObject;
 class Vector3;
 /*************************************************************************/
 /**                             FenceTool
-	 Does the fence tool operation. 
+	 Does the fence tool operation.
 ***************************************************************************/
-class FenceTool : public Tool 
+class FenceTool : public Tool
 {
 protected:
 	CPoint		m_downPt2d;
@@ -48,7 +45,7 @@ class FenceTool : public Tool
 	~FenceTool(void);
 
 protected:
-	void updateMapObjectList(Coord3D downPt, Coord3D curPt, WbView* pView, CWorldBuilderDoc *pDoc, Bool checkPlayers); 
+	void updateMapObjectList(Coord3D downPt, Coord3D curPt, WbView* pView, CWorldBuilderDoc *pDoc, Bool checkPlayers);
 
 public:
 	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
@@ -57,6 +54,3 @@ class FenceTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual void deactivate(); ///< Become not the current tool.
 };
-
-
-#endif //FenceTool_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h
index 5740c4fbc84..e33be6a5766 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h
@@ -22,16 +22,13 @@
 
 #pragma once
 
-#ifndef FloodFillTool_H
-#define FloodFillTool_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /**************************************************************************
                             FloodFillTool
 ***************************************************************************/
 ///  Fill area with texture tool.
-class FloodFillTool : public Tool 
+class FloodFillTool : public Tool
 {
 public:
 	FloodFillTool(void);
@@ -51,6 +48,3 @@ class FloodFillTool : public Tool
 	void setAdjustCliffs(Bool val) {m_adjustCliffTextures = val;}
 
 };
-
-
-#endif //TOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h
index e64db45a5c5..7ea4d1f37b6 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_GLOBALLIGHTOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
-#define AFX_GLOBALLIGHTOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // GLOBALLIGHTOPTIONS.h : header file
 //
 
@@ -39,9 +35,9 @@ class GlobalLightOptions : public CDialog	, public PopupSliderOwner
 public:
 	enum {K_TERRAIN=1, K_OBJECTS=2, K_BOTH=3};
 	enum {K_SUN=0, K_ACCENT1=1, K_ACCENT2=2};
-	int kUIRedIDs[3];// = {IDC_RD_EDIT, IDC_RD_EDIT1, IDC_RD_EDIT2}; 
-	int kUIGreenIDs[3];// = {IDC_GD_EDIT, IDC_GD_EDIT1, IDC_GD_EDIT2}; 
-	int kUIBlueIDs[3];// = {IDC_BD_EDIT, IDC_BD_EDIT1, IDC_BD_EDIT2}; 
+	int kUIRedIDs[3];// = {IDC_RD_EDIT, IDC_RD_EDIT1, IDC_RD_EDIT2};
+	int kUIGreenIDs[3];// = {IDC_GD_EDIT, IDC_GD_EDIT1, IDC_GD_EDIT2};
+	int kUIBlueIDs[3];// = {IDC_BD_EDIT, IDC_BD_EDIT1, IDC_BD_EDIT2};
 	CButtonShowColor m_colorButton;
 
 	GlobalLightOptions(CWnd* pParent = NULL);   // standard constructor
@@ -76,7 +72,7 @@ class GlobalLightOptions : public CDialog	, public PopupSliderOwner
 	afx_msg void OnRadioTerrain();
 	afx_msg void OnColorPress();
 	afx_msg void OnResetLights();
-	afx_msg void OnClose(); 
+	afx_msg void OnClose();
 	virtual void OnOK(){return;};  //!< Modeless dialogs don't OK, so eat this for modeless.
 	virtual void OnCancel(){return;}; //!< Modeless dialogs don't close on ESC, so eat this for modeless.
 	//}}AFX_MSG
@@ -139,5 +135,3 @@ class GlobalLightOptions : public CDialog	, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_GLOBALLIGHTOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h
index 59a9ee95fd4..27101c97335 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h
@@ -16,9 +16,6 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef GROVEOPTIONS_H
-#define GROVEOPTIONS_H
-
 #pragma once
 
 #include <map>
@@ -46,7 +43,7 @@ class GroveOptions : public COptionsPanel
 		VecPairNameDisplayName mVecDisplayNames;
 
 		Int	mNumTrees;
-	
+
 	public:
 		GroveOptions(CWnd* pParent = NULL);
 		~GroveOptions();
@@ -78,5 +75,3 @@ class GroveOptions : public COptionsPanel
 };
 
 extern GroveOptions *TheGroveOptions;
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h
index c097d76b17a..cd69ab6ecaa 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h
@@ -21,9 +21,6 @@
 
 #pragma once
 
-#ifndef GroveTool_H
-#define GroveTool_H
-
 #include "Lib/BaseType.h"
 #include "Tool.h"
 #include "Common/MapObject.h"
@@ -31,10 +28,10 @@ class WorldHeightMapEdit;
 
 /*************************************************************************/
 /**                             GroveTool
-	 Does the add a grove of trees tool operation. 
+	 Does the add a grove of trees tool operation.
 ***************************************************************************/
 ///  Add a grove of trees tool.
-class GroveTool : public Tool 
+class GroveTool : public Tool
 {
 protected:
 	enum {HYSTERESIS = 3};
@@ -61,6 +58,3 @@ class GroveTool : public Tool
 	virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 	virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 };
-
-
-#endif //TOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h
index e117ce4cf2d..fa47bbfa1ce 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h
@@ -22,15 +22,12 @@
 
 #pragma once
 
-#ifndef HandScrollTool_H
-#define HandScrollTool_H
-
 #include "Tool.h"
 /**************************************************************************
                             HandScrollTool
 ***************************************************************************/
 ///  Scroll tool.
-class HandScrollTool : public Tool 
+class HandScrollTool : public Tool
 {
 public:
 	HandScrollTool(void);
@@ -53,6 +50,3 @@ class HandScrollTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual Bool followsTerrain(void) {return false;};
 };
-
-
-#endif //TOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h
index 3e453f55c17..ad3cbad52aa 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #pragma once
 
-#ifndef __IMPASSABLEOPTIONS_H__
-#define __IMPASSABLEOPTIONS_H__
-
 class ImpassableOptions : public CDialog
 {
 	public:
@@ -40,12 +36,10 @@ class ImpassableOptions : public CDialog
 		Bool m_showImpassableAreas;
 
 		Bool ValidateSlope();	// Returns TRUE if it was valid, FALSE if it had to adjust it.
-		
+
 	protected:
 		virtual BOOL OnInitDialog();
 		afx_msg void OnAngleChange();
 		afx_msg void OnPreview();
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif /* __IMPASSABLEOPTIONS_H__ */
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h b/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h
index 876788ec21b..00a8c5f5aa0 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: LayersList.h 
+// FILE: LayersList.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_LAYERSLIST_
-#define _H_LAYERSLIST_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Common/AsciiString.h"
@@ -70,14 +68,14 @@ class CLLTreeCtrl : public CTreeCtrl
 	public:
 		AsciiString getLastClickedLayer(void) {	return mLastClickedLayer; }
 		AsciiString getLastClickedObject(void) {	return mLastClickedObject; }
-	
+
 	protected:
 		AsciiString mLastClickedLayer;
 		AsciiString mLastClickedObject;
 		void buildMoveMenu(CMenu* pPopup, UINT firstID);
 		virtual void OnRButtonDown(UINT nFlags, CPoint point);
 		DECLARE_MESSAGE_MAP()
-		
+
 };
 
 
@@ -88,7 +86,7 @@ class LayersList : public CDialog
 
 	public:
 		enum { IDD = IDD_LAYERSLIST };
-		LayersList(UINT nIDTemplate = LayersList::IDD, CWnd *parentWnd = NULL); 
+		LayersList(UINT nIDTemplate = LayersList::IDD, CWnd *parentWnd = NULL);
 		virtual ~LayersList();
 
 		void resetLayers();
@@ -120,7 +118,7 @@ class LayersList : public CDialog
 		static Bool findAndSelectPolygonTrigger(AsciiString selectedItemAsciiString);
 		static void unselectAllMapObjects(void);
 		static void unselectAllPolygonTriggers(void);
-		
+
 	public:
 		// This is a string because making it an AsciiString makes us barf on construction. :-(
 		static std::string TheDefaultLayerName;
@@ -141,17 +139,17 @@ class LayersList : public CDialog
 
 		HTREEITEM findTreeLayerNamed(const AsciiString& nameToFind);
 		HTREEITEM findTreeObjectNamed(const AsciiString& objectToFind, HTREEITEM layerItem);
-			   
-		// This function takes an MapObject, and does one of the following: 
-		// 1) Return true if the MapObject can be found, and 
-		//    layerIt points to a valid layer iterator in which the MapObject was found 
-		//    MapObjectIt points to a valid MapObject iterator on the layerIts MapObjectsInLayer member 
+
+		// This function takes an MapObject, and does one of the following:
+		// 1) Return true if the MapObject can be found, and
+		//    layerIt points to a valid layer iterator in which the MapObject was found
+		//    MapObjectIt points to a valid MapObject iterator on the layerIts MapObjectsInLayer member
 		// 2) Returns false if the MapObject cannot be found.
 		Bool findMapObjectAndList(IN MapObject *MapObjectToFind, OUT ListLayerIt *layerIt = NULL, OUT ListMapObjectPtrIt *MapObjectIt = NULL);
 		Bool findPolygonTriggerAndList(IN PolygonTrigger *PolygonTriggerToFind, OUT ListLayerIt *layerIt = NULL, OUT ListPolygonTriggerPtrIt *PolygonTriggerIt = NULL);
-		
+
 		// This function takes a layer name, and does one of the following:
-		// 1) Return true if the layer can be found, and 
+		// 1) Return true if the layer can be found, and
 		//		layerIt points to a valid layer iterator named layerName
 		// 2) Returns false if the layer cannot be found.
 		Bool findLayerNamed(IN AsciiString layerName, OUT ListLayerIt *layerIt = NULL);
@@ -176,7 +174,7 @@ class LayersList : public CDialog
 		afx_msg void OnMergeViewSelection(UINT commandID);
 		afx_msg void OnSelectActiveLayer();
 
-				
+
 		afx_msg void OnSelectLayerObject();
 		afx_msg void OnNewLayer();
 		afx_msg void OnDeleteLayer();
@@ -185,5 +183,3 @@ class LayersList : public CDialog
 };
 
 extern LayersList *TheLayersList;
-
-#endif /* _H_LAYERSLIST_ */
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h
index 6e6429a81cf..3e155832561 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_LightOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_)
-#define AFX_LightOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // LightOptions.h : header file
 //
 #include "OptionsPanel.h"
@@ -78,5 +74,3 @@ class LightOptions : public COptionsPanel
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_LightOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h
index 506cc138854..e8081da8c49 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h
@@ -20,12 +20,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_MAINFRM_H__371EC7AB_29D3_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_MAINFRM_H__371EC7AB_29D3_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "Lib/BaseType.h"
 #include "MyToolbar.h"
@@ -60,9 +55,9 @@ class ScriptDialog;
 
 class CMainFrame : public CFrameWnd
 {
-  DECLARE_DYNAMIC(CMainFrame) 
+  DECLARE_DYNAMIC(CMainFrame)
 
-public:	
+public:
 	CMainFrame();
 
 // Attributes
@@ -122,7 +117,7 @@ class CMainFrame : public CFrameWnd
 	LayersList*					m_layersList;
 	ScriptDialog*				m_scriptDialog;
 	RulerOptions				m_rulerOptions;
-	
+
 	CWnd							*m_curOptions;
 	Int								m_curOptionsX;
 	Int								m_curOptionsY;
@@ -158,5 +153,3 @@ class CMainFrame : public CFrameWnd
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MAINFRM_H__371EC7AB_29D3_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h
index cb7996259e6..64c66765204 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h
@@ -18,12 +18,12 @@
 
 // FILE: MapPreview.h /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Oct 2002
@@ -31,17 +31,14 @@
 //	Filename: 	MapPreview.h
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	
+//
+//	purpose:
 //
 //-----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 #pragma once
 
-#ifndef __MAP_PREVIEW_H_
-#define __MAP_PREVIEW_H_
-
 //-----------------------------------------------------------------------------
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
@@ -72,9 +69,9 @@ class MapPreview
 	void interpolateColorForHeight( RGBColor *color, Real height, Real hiZ, Real midZ, Real loZ );
 	Bool mapPreviewToWorld(const ICoord2D *radar, Coord3D *world);
 	void buildMapPreviewTexture( CString tgaName );
-	
+
 	UnsignedInt m_pixelBuffer[MAP_PREVIEW_HEIGHT][MAP_PREVIEW_WIDTH];
-	
+
 
 };
 //-----------------------------------------------------------------------------
@@ -84,5 +81,3 @@ class MapPreview
 //-----------------------------------------------------------------------------
 // EXTERNALS //////////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-
-#endif // __MAP_PREVIEW_H_
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h
index bebe11475ee..d6e1517d692 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_MAPSETTINGS_H__21749744_4DF4_462C_8DD4_FEEC1003DCFE__INCLUDED_)
-#define AFX_MAPSETTINGS_H__21749744_4DF4_462C_8DD4_FEEC1003DCFE__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // MapSettings.h : header file
 //
 
@@ -65,5 +61,3 @@ class MapSettings : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MAPSETTINGS_H__21749744_4DF4_462C_8DD4_FEEC1003DCFE__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h
index 7cdd75174cf..973c9c285ea 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_MESHMOLDOPTIONS_H__D5E62CB9_2830_4FA1_8306_DE18DD971087__INCLUDED_)
-#define AFX_MESHMOLDOPTIONS_H__D5E62CB9_2830_4FA1_8306_DE18DD971087__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // MeshMoldOptions.h : header file
 //
 #include "WBPopupSlider.h"
@@ -114,5 +110,3 @@ class MeshMoldOptions : public COptionsPanel , public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MESHMOLDOPTIONS_H__D5E62CB9_2830_4FA1_8306_DE18DD971087__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h
index 4d5b83b07ab..66ed3e1c988 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef MESHMOLDTOOL_H
-#define MESHMOLDTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************/
 /**                             MeshMoldTool
-	 Does the Mesh Mold tool operation. 
+	 Does the Mesh Mold tool operation.
 ***************************************************************************/
 ///  Height brush tool.
-class MeshMoldTool : public Tool 
+class MeshMoldTool : public Tool
 {
 protected:
 
@@ -65,6 +62,3 @@ class MeshMoldTool : public Tool
 	static void updateMeshLocation(Bool changePreview);
 
 };
-
-
-#endif //MESHMOLDTOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h
index 69413dfaccc..2d0ef585e2f 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_MoundOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_)
-#define AFX_MoundOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // MoundOptions.h : header file
 //
 #include "WBPopupSlider.h"
@@ -100,5 +96,3 @@ class MoundOptions : public COptionsPanel	, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MoundOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h
index fc0400e0e0b..5d28cfbf99b 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h
@@ -22,15 +22,12 @@
 
 #pragma once
 
-#ifndef MOUND_TOOL_H
-#define MOUND_TOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************
 **                             MoundTool
 ***************************************************************************/
-class MoundTool : public Tool 
+class MoundTool : public Tool
 {
 	enum {MIN_DELAY_TIME=60}; // 60 ms minimum delay between applications.
 protected:
@@ -66,10 +63,9 @@ class MoundTool : public Tool
 /*************************************************************************
 **                             DigTool
 ***************************************************************************/
-class DigTool : public MoundTool 
+class DigTool : public MoundTool
 {
 public:
 	DigTool(void);
 
 };
-#endif //MoundTool_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h
index c83140ba199..ab80c805440 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h
@@ -22,11 +22,6 @@
 
 #pragma once
 
-#ifndef MYTOOLBAR_H
-#define MYTOOLBAR_H
-
-
-
 /*************************************************************************
 **                             CellSizeToolBar
 ***************************************************************************/
@@ -47,7 +42,3 @@ class CellSizeToolBar : public CDialogBar
 	static void CellSizeChanged(Int cellSize);
 
 };
-
-
-
-#endif //MYTOOLBAR_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h
index 0376cf3abfa..3a376456251 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_NEWHEIGHTMAP_H__239CD6A3_2919_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_NEWHEIGHTMAP_H__239CD6A3_2919_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // NewHeightMap.h : header file
 //
 
@@ -85,5 +81,3 @@ class CNewHeightMap : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_NEWHEIGHTMAP_H__239CD6A3_2919_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h
index 8bb92c196e9..94af9739d8a 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ObjectOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_)
-#define AFX_ObjectOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ObjectOptions.h : header file
 //
 
@@ -83,7 +79,7 @@ class ObjectOptions : public COptionsPanel
 	ObjectPreview			m_objectPreview;
 
 protected:
-	void addObject( MapObject *mapObject, const char *pPath,  
+	void addObject( MapObject *mapObject, const char *pPath,
 									Int objectNdx, HTREEITEM parent );
 	HTREEITEM findOrAdd(HTREEITEM parent, const char *pLabel);
 	HTREEITEM findOrDont(const char *pLabel);
@@ -101,9 +97,7 @@ class ObjectOptions : public COptionsPanel
 	static Real getCurObjectHeight(void);
 	static void update();
 	static AsciiString getCurGdfName(void);
-}; 
+};
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ObjectOptions_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h
index 47059bddfa6..70b5262e5c1 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_OBJECTPREVIEW_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_)
-#define AFX_OBJECTPREVIEW_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ObjectPreview.h : header file
 //
 
@@ -72,5 +68,3 @@ class ObjectPreview : public CWnd
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OBJECTPREVIEW_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h
index 59f904805a5..8e58449bbab 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h
@@ -22,17 +22,14 @@
 
 #pragma once
 
-#ifndef OBJECTTOOL_H
-#define OBJECTTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************/
 /**                             ObjectTool
-	 Does the BlendEdgesOut tool operation. 
+	 Does the BlendEdgesOut tool operation.
 ***************************************************************************/
 ///  Blend edges out tool.
-class ObjectTool : public Tool 
+class ObjectTool : public Tool
 {
 protected:
 	CPoint m_downPt2d;
@@ -53,6 +50,3 @@ class ObjectTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual void deactivate(); ///< Become not the current tool.
 };
-
-
-#endif //TOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h
index e165e99e434..f43de286e75 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_OPENMAP_H__D3FD3B43_B0B7_42F6_BB77_2380A8B9945B__INCLUDED_)
-#define AFX_OPENMAP_H__D3FD3B43_B0B7_42F6_BB77_2380A8B9945B__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // OpenMap.h : header file
 //
 
@@ -76,5 +72,3 @@ class OpenMap : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OPENMAP_H__D3FD3B43_B0B7_42F6_BB77_2380A8B9945B__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h b/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h
index 8b8d32cf6d6..b105a97c9f0 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_OPTIONSPANEL_H__CB473165_D123_42D9_AE80_32F16928E3AE__INCLUDED_)
-#define AFX_OPTIONSPANEL_H__CB473165_D123_42D9_AE80_32F16928E3AE__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // OptionsPanel.h : header file
 //
 
@@ -68,5 +64,3 @@ class COptionsPanel : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OPTIONSPANEL_H__CB473165_D123_42D9_AE80_32F16928E3AE__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h
index acab9d2e6f1..18ee6f3dd22 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_PICKUNITDIALOG_H__B4C16E7D_FEED_472B_95FC_496D4C9006F5__INCLUDED_)
-#define AFX_PICKUNITDIALOG_H__B4C16E7D_FEED_472B_95FC_496D4C9006F5__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // PickUnitDialog.h : header file
 //
 
@@ -112,5 +108,3 @@ class ReplaceUnitDialog : public PickUnitDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PICKUNITDIALOG_H__B4C16E7D_FEED_472B_95FC_496D4C9006F5__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h
index fba357f18f2..4dd8dd1876f 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef POINTER_TOOL_H
-#define POINTER_TOOL_H
-
 #include "PolygonTool.h"
 class WorldHeightMapEdit;
 #include "../../GameEngine/Include/Common/MapObject.h"
@@ -32,7 +29,7 @@ class WorldHeightMapEdit;
 class ModifyObjectUndoable;
 /*************************************************************************/
 /**                             PointerTool
-	 Does the select/move tool operation. 
+	 Does the select/move tool operation.
 ***************************************************************************/
 ///  Blend edges out tool.
 class PointerTool : public PolygonTool
@@ -48,7 +45,7 @@ class PointerTool : public PolygonTool
 	Bool m_dragSelect; ///< True if we are drag selecting.
 
 	Bool m_doPolyTool; ///< True if we are using the polygon tool to modify a polygon triggter.
-	
+
 	ModifyObjectUndoable *m_modifyUndoable;	 ///< The modify undoable that is in progress while we track the mouse.
 
 	Bool m_mouseUpRotate;///< True if we are over the "rotate" hotspot.
@@ -77,6 +74,3 @@ class PointerTool : public PolygonTool
 	static void clearSelection(void); ///< Clears the selected objects selected flags.
 	static Bool allowPick(MapObject* pMapObj, WbView* pView);
 };
-
-
-#endif //POINTER_TOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h
index 12eeb513f80..674709b8efd 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef POLYGONTOOL_H
-#define POLYGONTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 class MapObject;
@@ -32,10 +29,10 @@ class PolygonTrigger;
 class MovePolygonUndoable;
 /*************************************************************************/
 /**                             PolygonTool
-	 Does the add/select polygon operation. 
+	 Does the add/select polygon operation.
 ***************************************************************************/
 ///  Select tile tool.
-class PolygonTool : public Tool 
+class PolygonTool : public Tool
 {
 public:
 	PolygonTool(void);
@@ -51,7 +48,7 @@ class PolygonTool : public Tool
 	HCURSOR m_poly_plusCursor;
 	Bool m_poly_mouseUpMove;///< True if we are over the "move" hotspot.
 	HCURSOR m_poly_moveCursor;
-					
+
 	MovePolygonUndoable *m_poly_moveUndoable;
 
 	static Bool		m_poly_isAdding;
@@ -59,7 +56,7 @@ class PolygonTool : public Tool
 	static Bool		m_poly_isActive;
 	static PolygonTrigger *m_poly_curSelectedPolygon;
 
-protected: 
+protected:
 	static Int poly_pickPoint(PolygonTrigger *pTrig, CPoint viewPt, WbView* pView);
 	static Int poly_getInsertIndex(PolygonTrigger *pTrig, Coord3D loc);
 	Bool poly_snapToPoly(Coord3D *pLoc);
@@ -84,7 +81,3 @@ class PolygonTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual void deactivate(); ///< Become not the current tool.
 };
-
-
-#endif //POLYGONTOOL_H
-
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h
index 38a8eb6e995..8137f0a91cf 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: RampOptions.h 
+// FILE: RampOptions.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_RAMPOPTIONS_
-#define _H_RAMPOPTIONS_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "OptionsPanel.h"
@@ -62,5 +60,3 @@ class RampOptions : public COptionsPanel
 };
 
 extern RampOptions* TheRampOptions;
-
-#endif /* _H_RAMPOPTIONS_ */
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h
index 5d8a129c170..41f979d6458 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: RampTool.h 
+// FILE: RampTool.h
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -32,8 +32,6 @@
 /*---------------------------------------------------------------------------*/
 
 #pragma once
-#ifndef _H_RAMPTOOL_
-#define _H_RAMPTOOL_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////
 #include "Tool.h"
@@ -41,14 +39,14 @@
 // TYPE DEFINES ///////////////////////////////////////////////////////////////
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////
 
-class RampTool : public Tool 
+class RampTool : public Tool
 {
 	Coord3D mStartPoint;
 	Coord3D mEndPoint;
 	Coord3D mCurvePoint;
 
 	Bool mIsMouseDown;
-	
+
 	public:
 		RampTool();
 		virtual void activate();
@@ -64,6 +62,3 @@ class RampTool : public Tool
 		void drawFeedback(Coord3D* endPoint);
 		void applyRamp(CWorldBuilderDoc* pDoc);
 };
-
-
-#endif /* _H_RAMPTOOL_ */
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h
index 65ef207d9fa..939e00a6197 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_RoadOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_)
-#define AFX_RoadOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // RoadOptions.h : header file
 //
 
@@ -103,9 +99,7 @@ class RoadOptions : public COptionsPanel
 	static void updateSelection(void);
 	static Bool selectionIsRoadsOnly(void);
 	void applyToSelection(void);
-}; 
+};
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_RoadOptions_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h
index 301f6863be7..1bae16e13dd 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h
@@ -22,19 +22,16 @@
 
 #pragma once
 
-#ifndef RoadTool_H
-#define RoadTool_H
-
 #include "Tool.h"
 #include "W3DDevice/GameClient/WorldHeightMap.h"
 class WorldHeightMapEdit;
 #define ROAD_SNAP_DISTANCE (1.0f)
 /*************************************************************************/
 /**                             RoadTool
-	 Does the Add a section of road tool operation. 
+	 Does the Add a section of road tool operation.
 ***************************************************************************/
 ///  Road segment tool.
-class RoadTool : public Tool 
+class RoadTool : public Tool
 {
 protected:
 	enum {HYSTERESIS = 3,
@@ -58,6 +55,3 @@ class RoadTool : public Tool
 	virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 	virtual void activate(); ///< Become the current tool.
 };
-
-
-#endif //TOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h
index d60cb8a173b..38cf6e0ba81 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h
@@ -16,13 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-#ifndef __RULEROPTIONS_H_
-#define __RULEROPTIONS_H_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // RulerOptions.h : header file
 //
 #include "OptionsPanel.h"
@@ -30,7 +25,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // RulerOptions dialog
 
-class RulerOptions : public COptionsPanel	
+class RulerOptions : public COptionsPanel
 {
 
 // Construction
@@ -76,5 +71,3 @@ class RulerOptions : public COptionsPanel
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // __RULEROPTIONS_H_
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h
index fe6d75afa1b..4d0ff121ec0 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h
@@ -21,16 +21,13 @@
 
 #pragma once
 
-#ifndef RULER_TOOL_H
-#define RULER_TOOL_H
-
 #include "Tool.h"
 
 class RulerTool : public Tool
 {
 protected:
 	Coord3D		m_downPt3d;
-	int				m_rulerType; 
+	int				m_rulerType;
 	WbView*		m_View;
 	Real			m_savedLength;
 
@@ -48,14 +45,11 @@ class RulerTool : public Tool
 	virtual void setCursor(void);
 	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 	virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-	virtual Bool followsTerrain(void) {return false;};	
-	
+	virtual Bool followsTerrain(void) {return false;};
+
 	static void setLength(Real length);
 	static Bool switchType();
 	static int	getType();
 	static Real getLength(void);
 
 };
-
-#endif //RULER_TOOL_H
-
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h
index f358ba2fbac..553e42c6497 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SAVEMAP_H__BCE93FF1_DA04_4F63_A483_D89BF1F49E32__INCLUDED_)
-#define AFX_SAVEMAP_H__BCE93FF1_DA04_4F63_A483_D89BF1F49E32__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // SaveMap.h : header file
 //
 
@@ -78,5 +74,3 @@ class SaveMap : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SAVEMAP_H__BCE93FF1_DA04_4F63_A483_D89BF1F49E32__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h
index 53ec1ebca82..8746d039953 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SCORCHOPTIONS_H__33FD4D9A_2C39_4494_A4EF_A20CEC76A95D__INCLUDED_)
-#define AFX_SCORCHOPTIONS_H__33FD4D9A_2C39_4494_A4EF_A20CEC76A95D__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ScorchOptions.h : header file
 //
 
@@ -80,6 +76,7 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner
 	void changeSize(void);
 	void changeScorch(void);
 	void getAllSelectedDicts(void);
+	Dict** getAllSelectedDictsData();
 
 public:
 	static void update(void);
@@ -93,5 +90,3 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SCORCHOPTIONS_H__33FD4D9A_2C39_4494_A4EF_A20CEC76A95D__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h
index 01601f7a274..a644cc23436 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h
@@ -21,9 +21,6 @@
 
 #pragma once
 
-#ifndef SCORCHTOOL_H
-#define SCORCHTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 class MapObject;
@@ -31,7 +28,7 @@ class MapObject;
 /**                             ScorchTool
 ***************************************************************************/
 ///  Scorch tool.
-class ScorchTool : public Tool 
+class ScorchTool : public Tool
 {
 public:
 	ScorchTool(void);
@@ -40,7 +37,7 @@ class ScorchTool : public Tool
 protected:
 	Coord3D m_mouseDownPt;
 
-protected: 
+protected:
 	MapObject *pickScorch(Coord3D loc);
 
 public:
@@ -51,6 +48,3 @@ class ScorchTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual void deactivate(); ///< Become not the current tool.
 };
-
-
-#endif //SCORCHTOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h
index fa78adb0e5b..284c6412db5 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SCRIPTACTIONSFALSE_H__227F217F_458B_4020_B6E9_6EB25E228FD5__INCLUDED_)
-#define AFX_SCRIPTACTIONSFALSE_H__227F217F_458B_4020_B6E9_6EB25E228FD5__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ScriptActionsFalse.h : header file
 //
 class Script;
@@ -64,7 +60,7 @@ class ScriptActionsFalse : public CPropertyPage
 	Int					m_index; // Index of whatever is currently selected.
 
 protected:
-	void enableUI(void); 
+	void enableUI(void);
 	void loadList(void);
 	Bool doMoveDown(void);
 
@@ -88,5 +84,3 @@ class ScriptActionsFalse : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SCRIPTACTIONSFALSE_H__227F217F_458B_4020_B6E9_6EB25E228FD5__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h
index 904f757766f..f10b085569b 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SCRIPTACTIONSTRUE_H__D8CAEC29_8B71_461C_B1B8_DF55624330AA__INCLUDED_)
-#define AFX_SCRIPTACTIONSTRUE_H__D8CAEC29_8B71_461C_B1B8_DF55624330AA__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ScriptActionsTrue.h : header file
 //
 class Script;
@@ -64,7 +60,7 @@ class ScriptActionsTrue : public CPropertyPage
 	Int					m_index; // Index of whatever is currently selected.
 
 protected:
-	void enableUI(void); 
+	void enableUI(void);
 	void loadList(void);
 	Bool doMoveDown(void);
 
@@ -88,5 +84,3 @@ class ScriptActionsTrue : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SCRIPTACTIONSTRUE_H__D8CAEC29_8B71_461C_B1B8_DF55624330AA__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h
index 2fd424bcd90..7d8d9397ee4 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ScriptConditionsDlg_H__EEFDFF65_2440_4AFE_B5D6_9E887C8C2DED__INCLUDED_)
-#define AFX_ScriptConditionsDlg_H__EEFDFF65_2440_4AFE_B5D6_9E887C8C2DED__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ScriptConditionsDlg.h : header file
 //
 class Script;
@@ -66,7 +62,7 @@ class ScriptConditionsDlg : public CPropertyPage
 	Int					m_index; // Index of whatever is currently selected.
 
 protected:
-	void enableUI(void); 
+	void enableUI(void);
 	void loadList(void);
 	Int doMoveUp( OrCondition **outWhichNow );
 	Int doMoveDown( OrCondition **outWhichNow );
@@ -93,5 +89,3 @@ class ScriptConditionsDlg : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ScriptConditionsDlg_H__EEFDFF65_2440_4AFE_B5D6_9E887C8C2DED__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h
index e8d4d57b0fc..3bebff4376d 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SCRIPTDIALOG_H__885FEF28_85F9_4556_9908_1BEC0B6E4C62__INCLUDED_)
-#define AFX_SCRIPTDIALOG_H__885FEF28_85F9_4556_9908_1BEC0B6E4C62__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ScriptDialog.h : header file
 //
 
@@ -52,7 +48,7 @@ class Parameter;
 class CSDTreeCtrl : public CTreeCtrl
 {
 	public:
-	
+
 	protected:
 		virtual void OnRButtonDown(UINT nFlags, CPoint point);
 		DECLARE_MESSAGE_MAP()
@@ -167,5 +163,3 @@ class ScriptDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SCRIPTDIALOG_H__885FEF28_85F9_4556_9908_1BEC0B6E4C62__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h
index 6cac2deda7e..49d0b001ded 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SCRIPTPROPERTIES_H__CE62125B_9FAB_4EF0_A8B5_36DD5393A2B0__INCLUDED_)
-#define AFX_SCRIPTPROPERTIES_H__CE62125B_9FAB_4EF0_A8B5_36DD5393A2B0__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ScriptProperties.h : header file
 //
 class Script;
@@ -85,5 +81,3 @@ class ScriptProperties : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SCRIPTPROPERTIES_H__CE62125B_9FAB_4EF0_A8B5_36DD5393A2B0__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h b/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h
index c5c5e8e719d..1b6c2cba685 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SELECTMACROTEXTURE_H__0AB61BFA_3A67_40CB_A38F_7067F6BA352B__INCLUDED_)
-#define AFX_SELECTMACROTEXTURE_H__0AB61BFA_3A67_40CB_A38F_7067F6BA352B__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // SelectMacrotexture.h : header file
 //
 
@@ -48,7 +44,7 @@ class SelectMacrotexture : public CDialog
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
 	//}}AFX_VIRTUAL
-	
+
 protected:
 	CTreeCtrl		m_textureTreeView;
 
@@ -65,5 +61,3 @@ class SelectMacrotexture : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SELECTMACROTEXTURE_H__0AB61BFA_3A67_40CB_A38F_7067F6BA352B__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h
index cdde5dc8d6e..a4b742afa20 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_SHADOWOPTIONS_H__25CB23E2_9E42_44D4_BE83_4B89F87746DE__INCLUDED_)
-#define AFX_SHADOWOPTIONS_H__25CB23E2_9E42_44D4_BE83_4B89F87746DE__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // ShadowOptions.h : header file
 //
 
@@ -71,5 +67,3 @@ class ShadowOptions : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SHADOWOPTIONS_H__25CB23E2_9E42_44D4_BE83_4B89F87746DE__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h b/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h
index fa01ff2ba70..f492f825f5d 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #pragma once
 
-#ifndef __SPLASHSCREEN_H__
-#define __SPLASHSCREEN_H__
-
 class SplashScreen : public CDialog
 {
 	protected:
@@ -41,5 +37,3 @@ class SplashScreen : public CDialog
 
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif /* __SPLASHSCREEN_H__ */
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h b/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h
index 35ee5436aca..2b9de438d01 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h
@@ -21,12 +21,7 @@
 //      are changed infrequently
 //
 
-#if !defined(AFX_STDAFX_H__FBA41347_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_STDAFX_H__FBA41347_2826_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
@@ -34,7 +29,7 @@
 // To prevent pragma errors.
 #include "Lib/BaseType.h"
 
-// TheSuperHackers @compile xezon 24/03/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
+// TheSuperHackers @build xezon 24/03/2025 Prevent afxwin.h from loading d3d9types.h, colliding with our own DirectX library.
 #define _d3d9TYPES_H_
 
 #include <afxwin.h>         // MFC core and standard components
@@ -44,10 +39,8 @@
 #include <afxcmn.h>			// MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
-
+#include <Utility/stdio_adapter.h>
 
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__FBA41347_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h
index b4cbf994bfd..67134dedadf 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TEAMBEHAVIOR_H__40A707E0_08CB_4544_9FF1_AF0DACAB02A6__INCLUDED_)
-#define AFX_TEAMBEHAVIOR_H__40A707E0_08CB_4544_9FF1_AF0DACAB02A6__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // TeamBehavior.h : header file
 //
 
@@ -80,5 +76,3 @@ class TeamBehavior : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TEAMBEHAVIOR_H__40A707E0_08CB_4544_9FF1_AF0DACAB02A6__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h
index 25fa4da3cec..a180fa298d8 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #pragma once
 
-#ifndef __TEAMGENERIC_H__
-#define __TEAMGENERIC_H__
-
 class Dict;
 
 class TeamGeneric : public CPropertyPage
@@ -38,10 +34,10 @@ class TeamGeneric : public CPropertyPage
 	protected:
 		void _fillComboBoxesWithScripts();
 		void _dictToScripts();
-	
+
 	protected:
 		Dict *m_teamDict;
-		
+
 
 	protected: // Windows Functions
 		virtual BOOL OnInitDialog();
@@ -49,5 +45,3 @@ class TeamGeneric : public CPropertyPage
 		afx_msg void OnScriptAdjust();
 		DECLARE_MESSAGE_MAP()
 };
-
-#endif
\ No newline at end of file
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h
index bcab82379b5..2fee1ad6b69 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TEAMIDENTITY_H__B37DB2FD_297F_4D0E_AACD_193BE30C6C85__INCLUDED_)
-#define AFX_TEAMIDENTITY_H__B37DB2FD_297F_4D0E_AACD_193BE30C6C85__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // TeamIdentity.h : header file
 //
 class Dict;
@@ -55,7 +51,7 @@ class TeamIdentity : public CPropertyPage
 	Dict		*m_teamDict;
 	SidesList	*m_sides;
 protected:
-	void loadUnitsInfo(int idcMinUnit, NameKeyType keyMinUnit, 
+	void loadUnitsInfo(int idcMinUnit, NameKeyType keyMinUnit,
 								int idcMaxUnit, NameKeyType keyMaxUnit,
 								int idcUnitType, NameKeyType keyUnitType);
 	void OnUnitTypeButton(Int idcUnitType);
@@ -98,5 +94,3 @@ class TeamIdentity : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TEAMIDENTITY_H__B37DB2FD_297F_4D0E_AACD_193BE30C6C85__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h
index a0ee89f2880..95d4e713e72 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h
@@ -21,13 +21,7 @@
 // January, 2003
 // (c) Electronic Arts 2003
 
-
-#ifndef TEAM_OBJECT_PROPERTIES_H
-#define TEAM_OBJECT_PROPERTIES_H
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "resource.h"
 
@@ -41,7 +35,7 @@ class TeamObjectProperties : public CPropertyPage
 {
 // Construction
 public:
-	TeamObjectProperties(Dict* dictToEdit = NULL);  
+	TeamObjectProperties(Dict* dictToEdit = NULL);
 	~TeamObjectProperties();
 
 // Dialog Data
@@ -62,7 +56,7 @@ class TeamObjectProperties : public CPropertyPage
 protected:
 	Dict* m_dictToEdit;
 
-#if 0 // Keys not implemented yet.  jba. [3/26/2003]//	
+#if 0 // Keys not implemented yet.  jba. [3/26/2003]//
 	void updateTheUI(void);
 
 	// Generated message map functions
@@ -110,4 +104,3 @@ class TeamObjectProperties : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-#endif //TEAM_OBJECT_PROPERTIES_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h
index e4557ecf5a9..bdf0bc025ae 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TEAMREINFORCEMENT_H__29B5C0C7_10E8_4869_8B43_815422C51C24__INCLUDED_)
-#define AFX_TEAMREINFORCEMENT_H__29B5C0C7_10E8_4869_8B43_815422C51C24__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // TeamReinforcement.h : header file
 //
 
@@ -70,5 +66,3 @@ class TeamReinforcement : public CPropertyPage
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TEAMREINFORCEMENT_H__29B5C0C7_10E8_4869_8B43_815422C51C24__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h
index 2dcf063ef40..98349d4ef41 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TERRAINMATERIAL_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
-#define AFX_TERRAINMATERIAL_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // terrainmaterial.h : header file
 //
 
@@ -109,9 +105,7 @@ class TerrainMaterial : public COptionsPanel, public PopupSliderOwner
 	virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial);
 	virtual void PopSliderChanged(const long sliderID, long theVal);
 	virtual void PopSliderFinished(const long sliderID, long theVal);
-}; 
+};
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TERRAINMATERIAL_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h
index 3a094160e62..e2f5f6cca18 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TERRAINMODAL_H__F013E9EF_2DE1_4084_97A8_5B87466535FC__INCLUDED_)
-#define AFX_TERRAINMODAL_H__F013E9EF_2DE1_4084_97A8_5B87466535FC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // TerrainModal.h : header file
 //
 
@@ -82,5 +78,3 @@ class TerrainModal : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TERRAINMODAL_H__F013E9EF_2DE1_4084_97A8_5B87466535FC__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h
index 9913518ef79..d7174476e61 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TERRAINSWATCHES_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_)
-#define AFX_TERRAINSWATCHES_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // TerrainSwatches.h : header file
 //
 
@@ -66,5 +62,3 @@ class TerrainSwatches : public CWnd
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TERRAINSWATCHES_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h
index 648b478ba5c..c42d23e415c 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h
@@ -22,15 +22,12 @@
 
 #pragma once
 
-#ifndef TILETOOL_H
-#define TILETOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 /*************************************************************************
 **                             TileTool
 ***************************************************************************/
-class TileTool : public Tool 
+class TileTool : public Tool
 {
 protected:
 	WorldHeightMapEdit *m_htMapEditCopy; //< ref counted.
@@ -53,7 +50,7 @@ class TileTool : public Tool
 /*************************************************************************
 **                             BigTileTool
 ***************************************************************************/
-class BigTileTool : public TileTool 
+class BigTileTool : public TileTool
 {
 
 protected:
@@ -69,4 +66,3 @@ class BigTileTool : public TileTool
 	virtual Int getWidth(void) {return m_currentWidth;};
 
 };
-#endif //TOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h
index 2397b6217eb..dcb2b9ead44 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef TOOL_H
-#define TOOL_H
-
 #include "Lib/BaseType.h"
 #include "Common/STLTypedefs.h"
 
@@ -53,7 +50,7 @@ class WbView;
 /*************************************************************************
 **                             Tool
 ***************************************************************************/
-class Tool  
+class Tool
 {
 protected:
 	Int	m_toolID;  //< Tool button ui id in resource.
@@ -83,11 +80,8 @@ class Tool
 	static Real calcRoundBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int featherWidth);
 	static Real calcSquareBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int featherWidth);
 	static void getCenterIndex(Coord3D *docLocP, Int brushWidth, CPoint *center, CWorldBuilderDoc *pDoc);
-	static void getAllIndexesIn(const Coord3D *bl, const Coord3D *br, 
-															const Coord3D *tl, const Coord3D *tr, 
-															Int widthOutside, CWorldBuilderDoc *pDoc, 
+	static void getAllIndexesIn(const Coord3D *bl, const Coord3D *br,
+															const Coord3D *tl, const Coord3D *tr,
+															Int widthOutside, CWorldBuilderDoc *pDoc,
 															VecHeightMapIndexes* allIndices);
 };
-
-
-#endif //TOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h
index 17d18a79565..f67256a84fb 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WBFRAMEWND_H__83965AA4_8750_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_WBFRAMEWND_H__83965AA4_8750_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // WBFrameWnd.h : header file
 //
 
@@ -96,11 +92,9 @@ class CWB3dFrameWnd : public CMainFrame
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
-								
+
 
 /////////////////////////////////////////////////////////////////////////////
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WBFRAMEWND_H__83965AA4_8750_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h
index 1c0d14bc775..e521aff4b87 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h
@@ -16,19 +16,17 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#pragma once
 
-#ifndef __WBHEIGHTMAP_H_
-#define __WBHEIGHTMAP_H_
-
-#include "W3DDevice/GameClient/FlatHeightMap.h"	
-#include "W3DDevice/GameClient/HeightMap.h"	
+#include "W3DDevice/GameClient/FlatHeightMap.h"
+#include "W3DDevice/GameClient/HeightMap.h"
 #define dont_USE_FLAT_HEIGHT_MAP // Use the origina height map for mission disk. jba. [4/15/2003]
 #ifdef USE_FLAT_HEIGHT_MAP
 class WBHeightMap : public FlatHeightMapRenderObjClass
 #else
 class WBHeightMap : public HeightMapRenderObjClass
-#endif	
-{	
+#endif
+{
 
 public:
 	WBHeightMap(void);
@@ -52,5 +50,3 @@ class WBHeightMap : public HeightMapRenderObjClass
 	Bool m_drawEntireMap;
 	Bool m_flattenHeights;
 };
-
-#endif  // end __WBHEIGHTMAP_H_
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h
index 69b65e10e92..a5e4dc265b3 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WBPopupSliderButton_H__8B217F41_937B_11D1_8CA3_00A024CDC039__INCLUDED_)
-#define AFX_WBPopupSliderButton_H__8B217F41_937B_11D1_8CA3_00A024CDC039__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // WBPopupSliderButton.h : header file
 //
 
@@ -102,7 +98,7 @@ class PopupSlider : public CWnd
 		constructs the object, calls its create method,
 		and starts it running
 	*/
-	static void New(CWnd* pParentWnd, long kind, 
+	static void New(CWnd* pParentWnd, long kind,
 					PopupSliderOwner *pSliderOwner, long sliderID);
 
 // Attributes
@@ -162,7 +158,7 @@ class PopupSlider : public CWnd
 	CPoint mOrigPt;
 	Bool mSetOrigPt;
 	Bool mEverMoved;
-	
+
 	// for the thumb icon
 	HICON mIcon;
 
@@ -180,5 +176,3 @@ class PopupSlider : public CWnd
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WBPopupSliderButton_H__8B217F41_937B_11D1_8CA3_00A024CDC039__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h
index 6da68a557cd..c748ad6fe1f 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef WHeightMapEdit_H
-#define WHeightMapEdit_H
-
 #include "W3DDevice/GameClient/WorldHeightMap.h"
 
 class DataChunkOutput;
@@ -44,7 +41,7 @@ class CProcessNode
 
 #define MAX_TILES_PER_CLASS 100
 /// Struct in memory.
-typedef struct 
+typedef struct
 {
 #ifdef DEBUG_CRASHING
 	Int forDebugOnly_fileTextureClass;
@@ -56,7 +53,7 @@ typedef struct
 	AsciiString filePath;
 	AsciiString uiName;
 	TileData *tiles[MAX_TILES_PER_CLASS];
-	TerrainType *terrainType;	
+	TerrainType *terrainType;
 } TGlobalTextureClass;
 
 
@@ -67,7 +64,7 @@ class WorldHeightMapEdit : public WorldHeightMap
 	Bool m_warnTooManyBlend;  ///< warning message flag.
 
 	// Texture classes.  There is one texture class for each bitmap read in.
-	// A class may have more than one tile.  For example, if the grass bitmap is 
+	// A class may have more than one tile.  For example, if the grass bitmap is
 	// 128x128, it creates 4 64x64 tiles, so the grass texture class will have 4 tiles.
 	static int m_numGlobalTextureClasses;
 	static TGlobalTextureClass m_globalTextureClasses[NUM_TEXTURE_CLASSES];
@@ -89,10 +86,10 @@ class WorldHeightMapEdit : public WorldHeightMap
 	Int getBlendTileNdxForClass(Int xIndex, Int yIndex, Int textureClass);
 	Int getTextureClassFromNdx(Int tileNdx);
 	void getTexClassNeighbors(Int xIndex, Int yIndex, Int textureClass, Int *pSideCount, Int *pTotalCount);
-	void updateForAdjacentCliffs(Int xIndex, Int yIndex, 
+	void updateForAdjacentCliffs(Int xIndex, Int yIndex,
 								UnsignedByte *pProcessed, TCliffInfo &cliffInfo);
 	Bool adjustForTiling(TCliffInfo &cliffInfo, Real textureWidth);
-	void updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex, 
+	void updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 								Int curTileClass, UnsignedByte *pProcessed=NULL);
 
 public: // construction
@@ -134,7 +131,7 @@ class WorldHeightMapEdit : public WorldHeightMap
 
 	Bool isTexClassUsed(Int textureClass);
 	Int getFirstTile(Int textureClass);
-	
+
 	Bool optimizeTiles(void); ///< Optimizes tile allocations.
 
 	void showTileStatusInfo(void); ///< pops up a dialog box with tile mem usage.
@@ -144,7 +141,7 @@ class WorldHeightMapEdit : public WorldHeightMap
 	Bool selectSimilar(void); ///< Selects any dupicate map objects.
 	Bool selectInvalidTeam(void); ///< Selects any objects with invalid teams.
 
-	Bool resize(Int newXSize, Int newYSize, Int newHeight, Int newBorder, Bool anchorTop, Bool anchorBottom, 
+	Bool resize(Int newXSize, Int newYSize, Int newHeight, Int newBorder, Bool anchorTop, Bool anchorBottom,
 							Bool anchorLeft, Bool anchorRight, Coord3D *pObjOffset);
 	Bool remapTextures(void); ///< returns true if the operation had an effect.
 	void reloadTextures(void); ///< Reloads textures from disk.
@@ -153,7 +150,7 @@ class WorldHeightMapEdit : public WorldHeightMap
 	void dbgVerifyAfterUndo(void); ///< Verifies the structures are still consistent.
 	Bool doCliffAdjustment(Int xIndex, Int yIndex);
 	Bool removeCliffMapping(void);
-	
+
 	Int getNumBoundaries(void) const ;
 	void getBoundary(Int ndx, ICoord2D* border) const;
 	void addBoundary(ICoord2D* boundaryToAdd);
@@ -164,5 +161,3 @@ class WorldHeightMapEdit : public WorldHeightMap
 	// outHandle: 0 means BL, 1 means TL, 2 means TR, 3 means BR
 	void findBoundaryNear(Coord3D *pt, float okDistance, Int *outNdx, Int *outHandle);
 };
-
-#endif
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h
index ff5e519f139..7d55f6c7850 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WaterOptions_H__6B56E20C_582E_4132_A251_87902218852C__INCLUDED_)
-#define AFX_WaterOptions_H__6B56E20C_582E_4132_A251_87902218852C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // WaterOptions.h : header file
 //
 #include "WBPopupSlider.h"
@@ -104,5 +100,3 @@ class WaterOptions : public COptionsPanel, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WaterOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h
index a412a54e803..65f1e142aef 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h
@@ -22,9 +22,6 @@
 
 #pragma once
 
-#ifndef WaterTool_H
-#define WaterTool_H
-
 #include "PolygonTool.h"
 class WorldHeightMapEdit;
 class MapObject;
@@ -32,16 +29,16 @@ class PolygonTrigger;
 class MovePolygonUndoable;
 /*************************************************************************/
 /**                             WaterTool
-	 Does the add/select water polygon operation. 
+	 Does the add/select water polygon operation.
 ***************************************************************************/
 ///  Select tile tool.
-class WaterTool : public PolygonTool 
+class WaterTool : public PolygonTool
 {
 public:
 	WaterTool(void);
 	~WaterTool(void);
 
-protected: 
+protected:
 	static Bool		m_water_isActive;
 
 	Real	m_currentZ;
@@ -62,6 +59,3 @@ class WaterTool : public PolygonTool
 	void fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
 	PolygonTrigger *adjustSpacing(PolygonTrigger *trigger, Real spacing);
 };
-
-
-#endif //WaterTool_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h
index ae3816103dd..6934e7f6ba2 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WaypointOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_)
-#define AFX_WaypointOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // WaypointOptions.h : header file
 //
 #include "OptionsPanel.h"
@@ -80,7 +76,7 @@ class WaypointOptions : public COptionsPanel
 	Int									 m_originalHeight;
 protected:
 	void updateTheUI(void);
-	void changeWaypointLabel(Int editControlID, NameKeyType key); 
+	void changeWaypointLabel(Int editControlID, NameKeyType key);
 
 public:
 	static void update(void);
@@ -94,5 +90,3 @@ class WaypointOptions : public COptionsPanel
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WaypointOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h
index 8d789efec30..b6db067ffc3 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h
@@ -22,18 +22,15 @@
 
 #pragma once
 
-#ifndef WAYPOINTTOOL_H
-#define WAYPOINTTOOL_H
-
 #include "Tool.h"
 class WorldHeightMapEdit;
 class MapObject;
 /*************************************************************************/
 /**                             WaypointTool
-	 Does the add/select waypoint operation. 
+	 Does the add/select waypoint operation.
 ***************************************************************************/
 ///  Select tile tool.
-class WaypointTool : public Tool 
+class WaypointTool : public Tool
 {
 public:
 	WaypointTool(void);
@@ -44,7 +41,7 @@ class WaypointTool : public Tool
 	Coord3D m_mouseDownPt;
 	static Bool m_isActive;
 
-protected: 
+protected:
 	MapObject *pickWaypoint(Coord3D loc);
 
 public:
@@ -58,6 +55,3 @@ class WaypointTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual void deactivate(); ///< Become not the current tool.
 };
-
-
-#endif //WAYPOINTTOOL_H
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h
index 80b9f08631f..90159d4c738 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h
@@ -19,12 +19,7 @@
 // WorldBuilder.h : main header file for the WORLDBUILDER application
 //
 
-#if !defined(AFX_WORLDBUILDER_H__FBA41345_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_WORLDBUILDER_H__FBA41345_2826_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #ifndef __AFXWIN_H__
 	#error include 'stdafx.h' before including this file for PCH
@@ -65,7 +60,7 @@
 //
 
 // Force maps into a directory structure.
-#define DO_MAPS_IN_DIRECTORIES 1	
+#define DO_MAPS_IN_DIRECTORIES 1
 
 #define NONE_STRING "<none>"
 
@@ -139,11 +134,10 @@ class CWorldBuilderApp : public CWinApp
 	MapObject					*m_pasteMapObjList;	///< List of copied/cut map objects.
 
 protected:
-	void deletePasteObjList(void) 
-	{ 
-		if (m_pasteMapObjList) 
-			deleteInstance(m_pasteMapObjList); 
-		m_pasteMapObjList = NULL; 
+	void deletePasteObjList(void)
+	{
+		deleteInstance(m_pasteMapObjList);
+		m_pasteMapObjList = NULL;
 	};
 
 public:
@@ -199,5 +193,3 @@ inline CWorldBuilderApp *WbApp() { return (CWorldBuilderApp*)::AfxGetApp(); }
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WORLDBUILDER_H__FBA41345_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h
index dfbca524960..5ee67174cc5 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h
@@ -20,12 +20,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_WORLDBUILDERDOC_H__FBA4134D_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_WORLDBUILDERDOC_H__FBA4134D_2826_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "Lib/BaseType.h"
 #include "Common/MapObject.h"
@@ -65,7 +60,7 @@ class CWorldBuilderDoc : public CDocument
 	std::vector<ICoord2D> m_boundaries;
 
 protected:	// waypoint stuff.
-	MapObject		*m_waypointTable[MAX_WAYPOINTS];							
+	MapObject		*m_waypointTable[MAX_WAYPOINTS];
 	Bool				m_waypointTableNeedsUpdate;
 	struct {
 		Int waypoint1;
@@ -86,7 +81,7 @@ class CWorldBuilderDoc : public CDocument
 	Bool waypointLinkExists(Int waypointID1, Int waypointID2);
 	Bool isWaypointLinked(MapObject *pWay);
 	void updateLinkedWaypointLabels(MapObject *pWay);
-	
+
 	// Boundary stuff
 	Int getNumBoundaries(void) const ;
 	void getBoundary(Int ndx, ICoord2D* border) const;
@@ -134,10 +129,10 @@ class CWorldBuilderDoc : public CDocument
 
 	/// Gets a real xy location from a pixel point.
 	Bool getCellPositionFromCoord(Coord3D pt,  Coord3D *locP);
-	
+
 	/// Gets all of the indices within widthOutside of the rectangle and places them into
 	/// allIndices
-	Bool getAllIndexesInRect(const Coord3D* bl, const Coord3D* br, 
+	Bool getAllIndexesInRect(const Coord3D* bl, const Coord3D* br,
 													 const Coord3D* tl, const Coord3D* tr,
 													 Int widthOutside, VecHeightMapIndexes* allIndices);
 
@@ -213,5 +208,3 @@ class CWorldBuilderDoc : public CDocument
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WORLDBUILDERDOC_H__FBA4134D_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h
index fc5c7405778..3ed7c354825 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h
@@ -20,12 +20,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_WORLDBUILDERVIEW_H__FBA4134F_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_WORLDBUILDERVIEW_H__FBA4134F_2826_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "Lib/BaseType.h"
 #include "W3DDevice/GameClient/WorldHeightMap.h"
@@ -90,7 +85,7 @@ class CWorldBuilderView : public WbView
 	void drawContours(CDC *pDc, CRgn *pRgn, Int minX, Int maxX, Int minY, Int maxY);
 
 	/// Compound boolean expression.
-	static inline Bool isBetween(Int cur, Int first, Int second) { 
+	static Bool isBetween(Int cur, Int first, Int second) {
 		Bool is = false;
 		if (cur>=first && cur<=second) is = true;
 		if (cur<=first && cur>=second) is = true;
@@ -101,7 +96,7 @@ class CWorldBuilderView : public WbView
 	void interpolate(CPoint *pt, Int ht, CPoint pt1, Int ht1, CPoint pt2, Int ht2);
 
 	/// Draw the object's icon in the dc at a given point.
-	void drawObjectInView(CDC *pDc, MapObject *pMapObj); 
+	void drawObjectInView(CDC *pDc, MapObject *pMapObj);
 
 public:
 	/// Get the current draw size in pixels in the 2d window of one height map cell.
@@ -161,5 +156,3 @@ class CWorldBuilderView : public WbView
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WORLDBUILDERVIEW_H__FBA4134F_2826_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h
index 78cc53f6385..88d7b0ad09c 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_ADDPLAYERDIALOG_H__96179004_35C9_436A_A302_A777E77F8F04__INCLUDED_)
-#define AFX_ADDPLAYERDIALOG_H__96179004_35C9_436A_A302_A777E77F8F04__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // addplayerdialog.h : header file
 //
 
@@ -71,5 +67,3 @@ class AddPlayerDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ADDPLAYERDIALOG_H__96179004_35C9_436A_A302_A777E77F8F04__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h
index fc387385c0c..251eceee380 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_BRUSHOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
-#define AFX_BRUSHOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // brushoptions.h : header file
 //
 
@@ -97,5 +93,3 @@ class BrushOptions : public COptionsPanel	, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_BRUSHOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h
index fb3a2340947..1e9d912fadd 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_EULADIALOG_H__9F6A134E_C2A3_425E_8485_F90B1A5F9B58__INCLUDED_)
-#define AFX_EULADIALOG_H__9F6A134E_C2A3_425E_8485_F90B1A5F9B58__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // euladialog.h : header file
 //
 
@@ -60,5 +56,3 @@ class EulaDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EULADIALOG_H__9F6A134E_C2A3_425E_8485_F90B1A5F9B58__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h b/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h
index b3924e4ea57..74942008725 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_MAPOBJECTPROPS_H__44517B9E_12AB_4E2C_B49B_D6BB65C59649__INCLUDED_)
-#define AFX_MAPOBJECTPROPS_H__44517B9E_12AB_4E2C_B49B_D6BB65C59649__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // mapobjectprops.h : header file
 //
 
@@ -68,8 +64,9 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner
 // Implementation
 protected:
 	void getAllSelectedDicts(void);
+	Dict** getAllSelectedDictsData();
 
-	static MapObjectProps *TheMapObjectProps; 
+	static MapObjectProps *TheMapObjectProps;
 
 	// Data common to all property pages
 	Dict* m_dictToEdit;
@@ -199,7 +196,7 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner
 public:
 	static MapObject *getSingleSelectedMapObject(void);
 	static void update(void);
-  
+
 private:
   /// Disallow copying: Object is not set up to be copied
   MapObjectProps( const MapObjectProps & other ); // Deliberately undefined
@@ -210,5 +207,3 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MAPOBJECTPROPS_H__44517B9E_12AB_4E2C_B49B_D6BB65C59649__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h b/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h
index 75ad987a08e..37f4a3c9f42 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_PLAYERLISTDLG_H__103B4125_78ED_48A8_9DBB_289DDC6B0208__INCLUDED_)
-#define AFX_PLAYERLISTDLG_H__103B4125_78ED_48A8_9DBB_289DDC6B0208__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // playerlistdlg.h : header file
 //
 
@@ -88,5 +84,3 @@ class PlayerListDlg : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PLAYERLISTDLG_H__103B4125_78ED_48A8_9DBB_289DDC6B0208__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h b/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h
index 68f26861cd1..a6a1781381f 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_PROPEDIT_H__93C02F45_592B_4CFD_A092_7445559D26EB__INCLUDED_)
-#define AFX_PROPEDIT_H__93C02F45_592B_4CFD_A092_7445559D26EB__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // propedit.h : header file
 //
 
@@ -73,5 +69,3 @@ class PropEdit : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROPEDIT_H__93C02F45_592B_4CFD_A092_7445559D26EB__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h
index a8ab098b030..ea4e3419f1c 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_TEAMSDIALOG_H__1410F415_1597_4EAF_AE0B_42DACDEB35B9__INCLUDED_)
-#define AFX_TEAMSDIALOG_H__1410F415_1597_4EAF_AE0B_42DACDEB35B9__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // teamsdialog.h : header file
 //
 
@@ -97,5 +93,3 @@ class CTeamsDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TEAMSDIALOG_H__1410F415_1597_4EAF_AE0B_42DACDEB35B9__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h
index ab047e5b61d..60f9cdd6428 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h
@@ -16,12 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WBVIEW_H__875234A1_8815_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_WBVIEW_H__875234A1_8815_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "Lib/BaseType.h"
 #include "Tool.h"
@@ -109,7 +104,7 @@ class WbView : public CView
 
 	virtual Bool viewToDocCoords(CPoint curPt, Coord3D *newPt, Bool constrained=true) { DEBUG_CRASH(("should not call")); newPt->zero(); return false; }
 	virtual Bool docToViewCoords(Coord3D curPt, CPoint* newPt) { DEBUG_CRASH(("should not call")); return false; }
- 
+
 	virtual Bool viewToDocCoordZ(CPoint curPt, Coord3D *newPt, Real Z) { return viewToDocCoords(curPt, newPt, false); }
 
 	/// Set the center for display.
@@ -256,5 +251,3 @@ class WbView : public CView
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WBVIEW_H__875234A1_8815_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h
index 65e9057d121..95d71082e58 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h
@@ -21,12 +21,8 @@
 // Class to encapsulate height map.
 // Author: Steven Johnson, Aug 2001
 
-#if !defined(AFX_WBVIEW3D_H__832D8241_87F6_11D5_8CE0_00010297BBAC__INCLUDED_)
-#define AFX_WBVIEW3D_H__832D8241_87F6_11D5_8CE0_00010297BBAC__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // wbview3d.h : header file
 //
 
@@ -40,7 +36,7 @@
 #include "dx8wrapper.h"
 
 //#include "GameLogic/Module/BodyModule.h" -- Yikes... not necessary to include this! (KM)
-enum BodyDamageType; //Ahhhh much better!
+enum BodyDamageType CPP_11(: Int); //Ahhhh much better!
 
 class WorldHeightMap;
 class LayerClass;
@@ -260,7 +256,7 @@ class WbView3d : public WbView, public DX8_CleanupHook
 	virtual void scrollInView(Real x, Real y, Bool end);
 
 	virtual void setDefaultCamera();
-	virtual void rotateCamera(Real delta);	 
+	virtual void rotateCamera(Real delta);
 	virtual void pitchCamera(Real delta);
 	void setCameraPitch(Real absolutePitch);
 	Real getCameraPitch(void);
@@ -290,7 +286,7 @@ class WbView3d : public WbView, public DX8_CleanupHook
 	AsciiString getModelNameAndScale(MapObject *pMapObj, Real *scale, BodyDamageType curDamageState);
 
 	virtual Int getPickPixels(void) {return m_pickPixels;}
-	virtual Bool viewToDocCoordZ(CPoint curPt, Coord3D *newPt, Real Z); 
+	virtual Bool viewToDocCoordZ(CPoint curPt, Coord3D *newPt, Real Z);
 public:
 
 //	void init(CWorldBuilderView *pMainView, HINSTANCE hInstance, CWnd* parent);
@@ -329,5 +325,3 @@ inline Bool WbView3d::getShowWireframe() { return m_showWireframe; }
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WBVIEW3D_H__832D8241_87F6_11D5_8CE0_00010297BBAC__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/res/resource.h b/GeneralsMD/Code/Tools/WorldBuilder/res/resource.h
index ad372a666d3..f2f8982adf0 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/res/resource.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/res/resource.h
@@ -761,7 +761,7 @@
 #define IDS_NEED_TO_FIX_TEAMS           61485
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp
index d9c27734b0e..3c016d6bdf0 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "AutoEdgeOutTool.h"
@@ -34,17 +34,17 @@
 //
 /// Constructor
 AutoEdgeOutTool::AutoEdgeOutTool(void) :
-	Tool(ID_AUTO_EDGE_OUT_TOOL, IDC_AUTO_EDGE_OUT) 
+	Tool(ID_AUTO_EDGE_OUT_TOOL, IDC_AUTO_EDGE_OUT)
 {
 }
-	
+
 /// Destructor
-AutoEdgeOutTool::~AutoEdgeOutTool(void) 
+AutoEdgeOutTool::~AutoEdgeOutTool(void)
 {
 }
 
 /// Shows the brush options panel.
-void AutoEdgeOutTool::activate() 
+void AutoEdgeOutTool::activate()
 {
 	Tool::activate();
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_BLEND_MATERIAL);
@@ -53,7 +53,7 @@ void AutoEdgeOutTool::activate()
 
 /** Execute the tool on mouse down - Create a copy of the height map
 * to edit, blend the edges, and give the undoable command to the doc. */
-void AutoEdgeOutTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void AutoEdgeOutTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BaseBuildProps.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BaseBuildProps.cpp
index 90533980ffe..31f7891263d 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/BaseBuildProps.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BaseBuildProps.cpp
@@ -66,14 +66,14 @@ BOOL BaseBuildProps::OnInitDialog()
 	// add health
 	CWnd* pHealth = GetDlgItem(IDC_MAPOBJECT_StartingHealthEdit);
 	static char buff[12];
-	sprintf(buff, "%d", m_health);
+	snprintf(buff, ARRAY_SIZE(buff), "%d", m_health);
 	pHealth->SetWindowText(buff);
 
 	CButton* pItem;
 	pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Unsellable);
 	if (pItem) {
 		pItem->SetCheck(m_unsellable);
-	}	
+	}
 
 	return TRUE;
 }
@@ -94,7 +94,7 @@ void BaseBuildProps::setProps(AsciiString name, AsciiString script, Int health,
 	m_unsellable = unsellable;
 }
 
-void BaseBuildProps::OnOK() 
+void BaseBuildProps::OnOK()
 {
 	CComboBox *combo;
 	CWnd* edit;
@@ -104,7 +104,7 @@ void BaseBuildProps::OnOK()
 	edit = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Name);
 	edit->GetWindowText(buf, sizeof(buf)-2);
 	m_name = AsciiString(buf);
-	
+
 	combo = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Script);
 	combo->GetWindowText(buf, sizeof(buf)-2);
 	m_script = AsciiString(buf);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp
index bc6898d0d34..ac9c75df19d 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "BlendEdgeTool.h"
@@ -34,18 +34,18 @@
 //
 /// Constructor
 BlendEdgeTool::BlendEdgeTool(void) :
-	Tool(ID_BLEND_EDGE_TOOL, IDC_BLEND_EDGE) 
+	Tool(ID_BLEND_EDGE_TOOL, IDC_BLEND_EDGE)
 {
 }
-	
+
 /// Destructor
-BlendEdgeTool::~BlendEdgeTool(void) 
+BlendEdgeTool::~BlendEdgeTool(void)
 {
 }
 
 
 /** Execute the tool on mouse down - Place an object. */
-void BlendEdgeTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void BlendEdgeTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	Coord3D cpt;
 	pView->viewToDocCoords(viewPt, &cpt);
@@ -54,10 +54,10 @@ void BlendEdgeTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWo
 }
 
 /** Execute the tool on mouse up - Blend an edge.  Left mouse blends the from
-texture to the to texture based on your drag. Right mouse blends the 
-foreground texture in the texture panel on top of the destination tile for 
+texture to the to texture based on your drag. Right mouse blends the
+foreground texture in the texture panel on top of the destination tile for
 custom blends. */
-void BlendEdgeTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void BlendEdgeTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	CPoint from, to;
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BlendMaterial.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BlendMaterial.cpp
index 5419db94565..6dc85eadc1d 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/BlendMaterial.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BlendMaterial.cpp
@@ -29,7 +29,7 @@
 #include "WorldBuilderDoc.h"
 #include "TileTool.h"
 #include "Common/TerrainTypes.h"
-#include "W3DDevice/GameClient/TerrainTex.h"	  
+#include "W3DDevice/GameClient/TerrainTex.h"
 
 BlendMaterial *BlendMaterial::m_staticThis = NULL;
 
@@ -67,7 +67,7 @@ END_MESSAGE_MAP()
 // BlendMaterial data access method.
 
 /// Set foreground texture and invalidate swatches.
-void BlendMaterial::setBlendTexClass(Int texClass) 
+void BlendMaterial::setBlendTexClass(Int texClass)
 {
 	if (m_staticThis) {
 		m_staticThis->m_currentBlendTexture=texClass;
@@ -88,7 +88,7 @@ Bool BlendMaterial::setTerrainTreeViewSelection(HTREEITEM parent, Int selection)
 		item.mask = TVIF_HANDLE|TVIF_PARAM;
 		item.hItem = child;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_terrainTreeView.GetItem(&item);
 		if (item.lParam == selection) {
 			m_terrainTreeView.SelectItem(child);
@@ -107,7 +107,7 @@ Bool BlendMaterial::setTerrainTreeViewSelection(HTREEITEM parent, Int selection)
 // BlendMaterial message handlers
 
 /// Setup the controls in the dialog.
-BOOL BlendMaterial::OnInitDialog() 
+BOOL BlendMaterial::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -148,7 +148,7 @@ HTREEITEM BlendMaterial::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_terrainTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -163,7 +163,7 @@ HTREEITEM BlendMaterial::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = const_cast<char*>(pLabel);
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_terrainTreeView.InsertItem(&ins);
 	return(child);
 }
@@ -191,26 +191,22 @@ void BlendMaterial::addTerrain(const char *pPath, Int terrainNdx, HTREEITEM pare
 		}
 
 		// set the name in the tree view to that of the entry
-		strcpy( buffer, terrain->getName().str() );
+		strlcpy(buffer, terrain->getName().str(), ARRAY_SIZE(buffer));
 
 		doAdd = TRUE;
 	} else if (terrainNdx==-1) {
-		strcpy(buffer, pPath);
+		strlcpy(buffer, pPath, ARRAY_SIZE(buffer));
 		doAdd = true;
 	} else if (WorldHeightMapEdit::getTexClassIsBlendEdge(terrainNdx)) {
 		parent = findOrAdd( parent, "**EVAL**" );
-		strcpy(buffer, pPath);
+		strlcpy(buffer, pPath, ARRAY_SIZE(buffer));
 		doAdd = true;
-	}  // end if
+	}
 
 //	Int tilesPerRow = TEXTURE_WIDTH/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
 //	Int availableTiles = 4 * tilesPerRow * tilesPerRow;
 //	Int percent = (WorldHeightMapEdit::getTexClassNumTiles(terrainNdx)*100 + availableTiles/2) / availableTiles;
 
-	char label[_MAX_PATH];
-	sprintf(label, "%s", buffer);
-
-
 	if( doAdd )
 	{
 		TVINSERTSTRUCT ins;
@@ -220,8 +216,8 @@ void BlendMaterial::addTerrain(const char *pPath, Int terrainNdx, HTREEITEM pare
 		ins.hInsertAfter = TVI_LAST;
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = terrainNdx;
-		ins.item.pszText = label;
-		ins.item.cchTextMax = strlen(label)+2;				
+		ins.item.pszText = buffer;
+		ins.item.cchTextMax = strlen(buffer)+2;
 		m_terrainTreeView.InsertItem(&ins);
 	}
 
@@ -239,18 +235,18 @@ void BlendMaterial::updateTextures(void)
 	for (i=WorldHeightMapEdit::getNumTexClasses()-1; i>=0; i--) {
 		char path[_MAX_PATH];
 		AsciiString uiName = WorldHeightMapEdit::getTexClassUiName(i);
-		strncpy(path, uiName.str(), _MAX_PATH-2);
+		strlcpy(path, uiName.str(), _MAX_PATH);
 		addTerrain(path, i, TVI_ROOT);
 	}
 	m_updating = false;
 	m_currentBlendTexture = defaultMaterialIndex;
-	setTerrainTreeViewSelection(TVI_ROOT, m_currentBlendTexture);	
+	setTerrainTreeViewSelection(TVI_ROOT, m_currentBlendTexture);
 }
 
 
 
 
-BOOL BlendMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL BlendMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_terrainTreeView.m_hWnd) {
@@ -282,6 +278,6 @@ BOOL BlendMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			}
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BorderTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BorderTool.cpp
index d1cf81a6200..c9c2f148032 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/BorderTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BorderTool.cpp
@@ -27,9 +27,9 @@
 
 const long BOUNDARY_PICK_DISTANCE = 5.0f;
 
-BorderTool::BorderTool() : Tool(ID_BORDERTOOL, IDC_POINTER), 
+BorderTool::BorderTool() : Tool(ID_BORDERTOOL, IDC_POINTER),
 													 m_mouseDown(false),
-													 m_addingNewBorder(false), 
+													 m_addingNewBorder(false),
 													 m_modifyBorderNdx(-1)
 
 { }
@@ -93,15 +93,15 @@ void BorderTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 		switch (m_modificationType)
 		{
 			case MOD_TYPE_INVALID: m_modifyBorderNdx = -1; return;
-			case MOD_TYPE_UP:	
-				currentBorder.y = REAL_TO_INT((new3DPoint.y / MAP_XY_FACTOR) + 0.5f); 
+			case MOD_TYPE_UP:
+				currentBorder.y = REAL_TO_INT((new3DPoint.y / MAP_XY_FACTOR) + 0.5f);
 				break;
-			case MOD_TYPE_RIGHT: 
-				currentBorder.x = REAL_TO_INT((new3DPoint.x / MAP_XY_FACTOR) + 0.5f); 
+			case MOD_TYPE_RIGHT:
+				currentBorder.x = REAL_TO_INT((new3DPoint.x / MAP_XY_FACTOR) + 0.5f);
 				break;
-			case MOD_TYPE_FREE: 
-				currentBorder.x = REAL_TO_INT((new3DPoint.x / MAP_XY_FACTOR) + 0.5f); 
-				currentBorder.y = REAL_TO_INT((new3DPoint.y / MAP_XY_FACTOR) + 0.5f); 
+			case MOD_TYPE_FREE:
+				currentBorder.x = REAL_TO_INT((new3DPoint.x / MAP_XY_FACTOR) + 0.5f);
+				currentBorder.y = REAL_TO_INT((new3DPoint.y / MAP_XY_FACTOR) + 0.5f);
 				break;
 		}
 
@@ -125,12 +125,12 @@ void BorderTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 	}
 
 	//static Coord3D zero = {0.0f, 0.0f, 0.0f};
-	
+
 	Coord3D groundPt;
 	pView->viewToDocCoords(viewPt, &groundPt);
 	if (groundPt.length() < BOUNDARY_PICK_DISTANCE) {
 		m_addingNewBorder = true;
-		
+
 		ICoord2D initialBoundary = { 1, 1 };
 		pDoc->addBoundary(&initialBoundary);
 		return;
@@ -138,9 +138,9 @@ void BorderTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 
 	Int motion;
 	pDoc->findBoundaryNear(&groundPt, BOUNDARY_PICK_DISTANCE, &m_modifyBorderNdx, &motion);
-	
+
 	// if bottom left boundary grabbed
-	if (motion == 0) 
+	if (motion == 0)
 	{
 		// modifying the bottom left is not allowed.
 		m_modifyBorderNdx = -1;
@@ -150,10 +150,10 @@ void BorderTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 	{
 		// add a boundary
 		m_addingNewBorder = true;
-		
+
 		ICoord2D initialBoundary = { 1, 1 };
 		pDoc->addBoundary(&initialBoundary);
-	} 
+	}
 	else
 	{
 		m_modificationType = (ModificationType) motion;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BrushTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BrushTool.cpp
index c4fe2ae3c92..7cbef8f8547 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/BrushTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BrushTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "BrushTool.h"
@@ -42,7 +42,7 @@ Int BrushTool::m_brushHeight;
 
 
 
-/// Constructor 
+/// Constructor
 BrushTool::BrushTool(void) :
 	Tool(ID_BRUSH_TOOL, IDC_BRUSH_CROSS)
 {
@@ -54,17 +54,17 @@ BrushTool::BrushTool(void) :
 	m_brushHeight = 0;
 	m_brushSquare = false;
 }
-	
+
 /// Destructor
-BrushTool::~BrushTool(void) 
+BrushTool::~BrushTool(void)
 {
 	REF_PTR_RELEASE(m_htMapEditCopy);
 	REF_PTR_RELEASE(m_htMapFeatherCopy);
 }
 
 /// Set the brush height and notify the height options panel of the change.
-void BrushTool::setHeight(Int height) 
-{ 
+void BrushTool::setHeight(Int height)
+{
 	if (m_brushHeight != height) {
 		m_brushHeight = height;
 		// notify height palette options panel
@@ -73,8 +73,8 @@ void BrushTool::setHeight(Int height)
 };
 
 /// Set the brush width and notify the height options panel of the change.
-void BrushTool::setWidth(Int width) 
-{ 
+void BrushTool::setWidth(Int width)
+{
 	if (m_brushWidth != width) {
 		m_brushWidth = width;
 		// notify brush palette options panel
@@ -84,8 +84,8 @@ void BrushTool::setWidth(Int width)
 };
 
 /// Set the brush feather and notify the height options panel of the change.
-void BrushTool::setFeather(Int feather) 
-{ 
+void BrushTool::setFeather(Int feather)
+{
 	if (m_brushFeather != feather) {
 		m_brushFeather = feather;
 		// notify height palette options panel
@@ -95,7 +95,7 @@ void BrushTool::setFeather(Int feather)
 };
 
 /// Shows the brush options panel.
-void BrushTool::activate() 
+void BrushTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_BRUSH_OPTIONS);
 	DrawObject::setDoBrushFeedback(true);
@@ -105,7 +105,7 @@ void BrushTool::activate()
 /// Start tool.
 /** Setup the tool to start brushing - make a copy of the height map
 to edit, another copy because we need it :), and call mouseMovedDown. */
-void BrushTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void BrushTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -121,9 +121,9 @@ void BrushTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 }
 
 /// End tool.
-/** Finish the tool operation - create a command, pass it to the 
+/** Finish the tool operation - create a command, pass it to the
 doc to execute, and cleanup ref'd objects. */
-void BrushTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void BrushTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -168,7 +168,7 @@ void BrushTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 		if (i<0 || i>=m_htMapEditCopy->getXExtent()) {
 			continue;
 		}
-		for (j=ndx.y-sub; j<ndx.y+add; j++) {					
+		for (j=ndx.y-sub; j<ndx.y+add; j++) {
 			if (j<0 || j>=m_htMapEditCopy->getYExtent()) {
 				continue;
 			}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BuildList.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BuildList.cpp
index a0aa98aa16b..99ff8ccd63a 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/BuildList.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BuildList.cpp
@@ -94,7 +94,7 @@ END_MESSAGE_MAP()
 // BuildList message handlers
 
 /// Setup the controls in the dialog.
-BOOL BuildList::OnInitDialog() 
+BOOL BuildList::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -113,11 +113,11 @@ BOOL BuildList::OnInitDialog()
 }
 
 /// Load the sides in the sides list.
-void BuildList::loadSides(void) 
+void BuildList::loadSides(void)
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_SIDES_COMBO);
 	if (!pCombo) {
-		DEBUG_LOG(("*** BuildList::loadSides Missing resource!!!\n"));
+		DEBUG_LOG(("*** BuildList::loadSides Missing resource!!!"));
 		return;
 	}
 	pCombo->ResetContent();
@@ -137,14 +137,14 @@ void BuildList::loadSides(void)
 }
 
 /// Updates the current side, loading it's build list.
-void BuildList::updateCurSide(void) 
+void BuildList::updateCurSide(void)
 {
 	if (TheSidesList->getNumSides() < 1)
 		return;
 
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_SIDES_COMBO);
 	if (!pCombo) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!!\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!!"));
 		return;
 	}
 	if (m_curSide<0 || m_curSide >= TheSidesList->getNumSides()) {
@@ -153,32 +153,32 @@ void BuildList::updateCurSide(void)
 	if (pCombo->GetCurSel() != m_curSide) {
 		pCombo->SetCurSel(m_curSide);
 	}
-	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	if (!pList) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST"));
 		return;
 	}
 	pList->ResetContent();
-	
+
 	BuildListInfo *pBuild = pSide->getBuildList();
 	while (pBuild) {
-		const char *pName = pBuild->getTemplateName().str(); 
+		const char *pName = pBuild->getTemplateName().str();
 		pList->AddString(pName);
 		pBuild = pBuild->getNext();
 	}
 	OnSelchangeBuildList();
 }
 
-void BuildList::OnSelchangeSidesCombo() 
+void BuildList::OnSelchangeSidesCombo()
 {
 	if (TheSidesList->getNumSides() < 1)
 		return;
 
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_SIDES_COMBO);
 	if (!pCombo) {
-		DEBUG_LOG(("*** BuildList::OnSelchangeSidesCombo Missing resource!!!\n"));
+		DEBUG_LOG(("*** BuildList::OnSelchangeSidesCombo Missing resource!!!"));
 		return;
 	}
 
@@ -191,14 +191,14 @@ void BuildList::OnSelchangeSidesCombo()
 		}
 		OnSelchangeBuildList();
 	}
-	
+
 }
 
-void BuildList::OnMoveUp() 
+void BuildList::OnMoveUp()
 {
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	if (!pList) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST"));
 		return;
 	}
 	m_curBuildList = pList->GetCurSel();
@@ -216,7 +216,7 @@ void BuildList::OnMoveUp()
 		if (pBuildInfo == NULL) return;
 	}
 	Int newSel = m_curBuildList-1;
-	pSide->reorderInBuildList(pBuildInfo, newSel); 
+	pSide->reorderInBuildList(pBuildInfo, newSel);
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	SidesListUndoable *pUndo = new SidesListUndoable(sides, pDoc);
 	pDoc->AddAndDoUndoable(pUndo);
@@ -227,11 +227,11 @@ void BuildList::OnMoveUp()
 	OnSelchangeBuildList();
 }
 
-void BuildList::OnMoveDown() 
+void BuildList::OnMoveDown()
 {
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	if (!pList) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST"));
 		return;
 	}
 	if (m_curBuildList < 0) return;
@@ -248,12 +248,12 @@ void BuildList::OnMoveDown()
 		if (pBuildInfo == NULL) return;
 	}
 	if (pBuildInfo->getNext() == NULL) {
-		// there isn't one to move down after. 
+		// there isn't one to move down after.
 		return;
 	}
 	Int newSel = m_curBuildList+1;
 
-	pSide->reorderInBuildList(pBuildInfo, newSel); 
+	pSide->reorderInBuildList(pBuildInfo, newSel);
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	SidesListUndoable *pUndo = new SidesListUndoable(sides, pDoc);
 	pDoc->AddAndDoUndoable(pUndo);
@@ -263,7 +263,7 @@ void BuildList::OnMoveDown()
 	OnSelchangeBuildList();
 }
 
-void BuildList::OnAddBuilding() 
+void BuildList::OnAddBuilding()
 {
 	BuildListTool::addBuilding();
 }
@@ -301,7 +301,7 @@ void BuildList::setSelectedBuildList(BuildListInfo *pInfo)
 	}
 	Int i;
  	for (i=0; i<TheSidesList->getNumSides(); i++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(i);
 		Int listSel = 0;
 		for (BuildListInfo *pBuild = pSide->getBuildList(); pBuild; pBuild = pBuild->getNext()) {
 			if (pInfo == pBuild) {
@@ -323,19 +323,19 @@ void BuildList::setSelectedBuildList(BuildListInfo *pInfo)
 };
 
 
-void BuildList::OnSelchangeBuildList() 
+void BuildList::OnSelchangeBuildList()
 {
 	if (TheSidesList->getNumSides() < 1)
 		return;
 
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	if (!pList) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST"));
 		return;
 	}
 	m_curBuildList = pList->GetCurSel();
 	Int numBL = pList->GetCount();
-	
+
 	SidesInfo *pSide = NULL;
 	if (TheSidesList) {
 		pSide = TheSidesList->getSideInfo(m_curSide);
@@ -363,7 +363,7 @@ void BuildList::OnSelchangeBuildList()
 
 	// add up energy consumed/produced by objects on the map
 	const ThingTemplate *thingTemplate;
-	for (MapObject *pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+	for (MapObject *pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
 		// get thing template based from map object name
 		thingTemplate = pMapObj->getThingTemplate();
@@ -419,7 +419,7 @@ void BuildList::OnSelchangeBuildList()
 	{
 		energyUsed = 1.0f;
 	}
-	//DEBUG_LOG(("Energy: %d/%d - %g\n", energyConsumption, energyProduction, energyUsed));
+	//DEBUG_LOG(("Energy: %d/%d - %g", energyConsumption, energyProduction, energyUsed));
 	CProgressCtrl *progressWnd = (CProgressCtrl *)GetDlgItem(IDC_POWER);
 	if (progressWnd)
 	{
@@ -449,16 +449,16 @@ void BuildList::OnSelchangeBuildList()
 	PointerTool::clearSelection(); // unselect other stuff.
 	if (pBuildInfo) {
 		CWnd *edit;
-		static char buff[12];
+		static char buff[32];
 		pBuildInfo->setSelected(true);
 
 		m_angle = pBuildInfo->getAngle() * 180/PI;
-		sprintf(buff, "%0.2f", m_angle);
+		snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_angle);
 		edit = GetDlgItem(IDC_MAPOBJECT_Angle);
 		edit->SetWindowText(buff);
 
 		m_height = pBuildInfo->getLocation()->z;
-		sprintf(buff, "%0.2f", m_height);
+		snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_height);
 		edit = GetDlgItem(IDC_MAPOBJECT_ZOffset);
 		edit->SetWindowText(buff);
 
@@ -481,14 +481,14 @@ void BuildList::OnSelchangeBuildList()
 
 }
 
-void BuildList::OnAlreadyBuild() 
+void BuildList::OnAlreadyBuild()
 {
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	if (!pList) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST"));
 		return;
 	}
-	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 	m_curBuildList = pList->GetCurSel();
 	if (m_curBuildList < 0) return;
 	Int count = m_curBuildList;
@@ -504,11 +504,11 @@ void BuildList::OnAlreadyBuild()
 	}
 }
 
-void BuildList::OnDeleteBuilding() 
+void BuildList::OnDeleteBuilding()
 {
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	if (!pList) {
-		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST\n"));
+		DEBUG_LOG(("*** BuildList::updateCurSide Missing resource!!! IDC_BUILD_LIST"));
 		return;
 	}
 	m_curBuildList = pList->GetCurSel();
@@ -524,7 +524,7 @@ void BuildList::OnDeleteBuilding()
 		pBuildInfo = pBuildInfo->getNext();
 		if (pBuildInfo == NULL) return;
 	}
-	pSide->removeFromBuildList(pBuildInfo); 
+	pSide->removeFromBuildList(pBuildInfo);
 
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	SidesListUndoable *pUndo = new SidesListUndoable(sides, pDoc);
@@ -536,7 +536,7 @@ void BuildList::OnDeleteBuilding()
 	pList->SetCurSel(-1);
 }
 
-void BuildList::OnSelendokRebuilds() 
+void BuildList::OnSelendokRebuilds()
 {
 	CComboBox *pCombo = (CComboBox *)GetDlgItem(IDC_REBUILDS);
 	if (pCombo==NULL) return;
@@ -547,8 +547,8 @@ void BuildList::OnSelendokRebuilds()
 		nr = BuildListInfo::UNLIMITED_REBUILDS;
 	} else if (sel<6) {
 		nr = sel;
-	} 
-	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+	}
+	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 	if (m_curBuildList < 0) return;
 	Int count = m_curBuildList;
 	BuildListInfo *pBuildInfo = pSide->getBuildList();
@@ -560,7 +560,7 @@ void BuildList::OnSelendokRebuilds()
 	pBuildInfo->setNumRebuilds(nr);
 }
 
-void BuildList::OnEditchangeRebuilds() 
+void BuildList::OnEditchangeRebuilds()
 {
 	CComboBox *pCombo = (CComboBox *)GetDlgItem(IDC_REBUILDS);
 	if (pCombo==NULL) return;
@@ -572,7 +572,7 @@ void BuildList::OnEditchangeRebuilds()
 		Int nr;
 		if (1==sscanf(buffer, "%d", &nr)) {
 		}
-			SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+			SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 			if (m_curBuildList < 0) return;
 			Int count = m_curBuildList;
 			BuildListInfo *pBuildInfo = pSide->getBuildList();
@@ -585,9 +585,9 @@ void BuildList::OnEditchangeRebuilds()
 	}
 }
 
-void BuildList::OnDblclkBuildList() 
+void BuildList::OnDblclkBuildList()
 {
-	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	m_curBuildList = pList->GetCurSel();
 	if (m_curBuildList < 0) return;
@@ -631,18 +631,18 @@ void BuildList::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, lo
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void BuildList::PopSliderChanged(const long sliderID, long theVal)
 {
 //	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	CWnd* edit;
-	static char buff[12];
+	static char buff[32];
 	switch (sliderID) {
 		case IDC_HEIGHT_POPUP:
 			m_height = theVal;
-			sprintf(buff, "%0.2f", m_height);
+			snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_height);
 			edit = GetDlgItem(IDC_MAPOBJECT_ZOffset);
 			edit->SetWindowText(buff);
 			OnChangeZOffset();
@@ -650,7 +650,7 @@ void BuildList::PopSliderChanged(const long sliderID, long theVal)
 
 		case IDC_ANGLE_POPUP:
 			m_angle = theVal;
-			sprintf(buff, "%0.2f", m_angle);
+			snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_angle);
 			edit = GetDlgItem(IDC_MAPOBJECT_Angle);
 			edit->SetWindowText(buff);
 			break;
@@ -659,7 +659,7 @@ void BuildList::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void BuildList::PopSliderFinished(const long sliderID, long theVal)
@@ -673,11 +673,11 @@ void BuildList::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
-void BuildList::OnChangeZOffset() 
+void BuildList::OnChangeZOffset()
 {
 	Real value = 0.0f;
 	CWnd* edit = GetDlgItem(IDC_MAPOBJECT_ZOffset);
@@ -688,7 +688,7 @@ void BuildList::OnChangeZOffset()
 	}
 	m_height = value;
 
-	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	m_curBuildList = pList->GetCurSel();
 	if (m_curBuildList < 0) return;
@@ -706,7 +706,7 @@ void BuildList::OnChangeZOffset()
 	p3View->invalBuildListItemInView(pBuildInfo);
 }
 
-void BuildList::OnChangeAngle() 
+void BuildList::OnChangeAngle()
 {
 	Real angle = 0.0f;
 	CWnd* edit = GetDlgItem(IDC_MAPOBJECT_Angle);
@@ -716,7 +716,7 @@ void BuildList::OnChangeAngle()
 		angle = atof(cstr);
 	}
 	m_angle = angle;
-	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
+	SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 	CListBox *pList = (CListBox*)GetDlgItem(IDC_BUILD_LIST);
 	m_curBuildList = pList->GetCurSel();
 	if (m_curBuildList < 0) return;
@@ -732,47 +732,37 @@ void BuildList::OnChangeAngle()
 	p3View->invalBuildListItemInView(pBuildInfo);
 }
 
-void BuildList::OnExport() 
+void BuildList::OnExport()
 {
 	static FILE *theLogFile = NULL;
 	Bool open = false;
 	try {
-		char dirbuf[ _MAX_PATH ];
-		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
-		char *pEnd = dirbuf + strlen( dirbuf );
-		while( pEnd != dirbuf ) 
+		char buffer[_MAX_PATH];
+		::GetModuleFileName(NULL, buffer, sizeof(buffer));
+		if (char* pEnd = strrchr(buffer, '\\'))
 		{
-			if( *pEnd == '\\' ) 
-			{
-				*(pEnd + 1) = 0;
-				break;
-			}
-			pEnd--;
+			*(pEnd + 1) = 0;
 		}
 
-		char curbuf[ _MAX_PATH ];
-
-		strcpy(curbuf, dirbuf);
-		SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide); 
-		Dict *d = TheSidesList->getSideInfo(m_curSide)->getDict();
+		SidesInfo* pSide = TheSidesList->getSideInfo(m_curSide);
+		Dict* d = TheSidesList->getSideInfo(m_curSide)->getDict();
 		AsciiString name = d->getAsciiString(TheKey_playerName);
-		strcat(curbuf, name.str());
-		strcat(curbuf, "_BuildList");
-		strcat(curbuf, ".ini");
+		strlcat(buffer, name.str(), ARRAY_SIZE(buffer));
+		strlcat(buffer, "_BuildList.ini", ARRAY_SIZE(buffer));
 
-		theLogFile = fopen(curbuf, "w");
+		theLogFile = fopen(buffer, "w");
 		if (theLogFile == NULL)
 			throw;
 
 		AsciiString tmplname = d->getAsciiString(TheKey_playerFaction);
 		const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(tmplname));
-		DEBUG_ASSERTCRASH(pt != NULL, ("PlayerTemplate %s not found -- this is an obsolete map (please open and resave in WB)\n",tmplname.str()));
-		
+		DEBUG_ASSERTCRASH(pt != NULL, ("PlayerTemplate %s not found -- this is an obsolete map (please open and resave in WB)",tmplname.str()));
+
 		fprintf(theLogFile, ";Skirmish AI Build List\n");
 		fprintf(theLogFile, "SkirmishBuildList %s\n", pt->getSide().str());
 
 		open = true;
-		
+
 		BuildListInfo *pBuildInfo = pSide->getBuildList();
 		while (pBuildInfo) {
 			fprintf(theLogFile, "  Structure %s\n", pBuildInfo->getTemplateName().str());
@@ -795,5 +785,5 @@ void BuildList::OnExport()
 			fclose(theLogFile);
 		}
 	}
-	
+
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BuildListTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BuildListTool.cpp
index b2ccebfa1a8..77e054a11fe 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/BuildListTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BuildListTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "BuildListTool.h"
@@ -44,7 +44,7 @@ PickUnitDialog* BuildListTool::m_static_pickBuildingDlg = NULL;
 
 /// Constructor
 BuildListTool::BuildListTool(void) :
-	Tool(ID_BUILD_LIST_TOOL, IDC_BUILD_LIST_TOOL), 
+	Tool(ID_BUILD_LIST_TOOL, IDC_BUILD_LIST_TOOL),
 	m_rotateCursor(NULL),
 	m_pointerCursor(NULL),
 	m_moveCursor(NULL),
@@ -52,9 +52,9 @@ BuildListTool::BuildListTool(void) :
 {
 	m_curObject = NULL;
 }
-	
+
 /// Destructor
-BuildListTool::~BuildListTool(void) 
+BuildListTool::~BuildListTool(void)
 {
 }
 
@@ -88,7 +88,7 @@ Bool BuildListTool::isDoingAdd(void)
 }
 
 /// Shows the object options panel.
-void BuildListTool::addBuilding() 
+void BuildListTool::addBuilding()
 {
 	//PickUnitDialog dlg;
 	//dlg.SetAllowableType(ES_STRUCTURE);
@@ -100,7 +100,7 @@ void BuildListTool::addBuilding()
 }
 
 /// Shows the object options panel.
-void BuildListTool::activate() 
+void BuildListTool::activate()
 {
 	Bool wasActive = m_isActive;
 	m_isActive = true;
@@ -120,7 +120,7 @@ void BuildListTool::activate()
 }
 
 /// Clears the isActive flag.
-void BuildListTool::deactivate() 
+void BuildListTool::deactivate()
 {
 	m_isActive = false;
 	WbView3d *p3View = CWorldBuilderDoc::GetActive3DView();
@@ -133,7 +133,7 @@ void BuildListTool::deactivate()
 }
 
 /** Set the cursor. */
-void BuildListTool::setCursor(void) 
+void BuildListTool::setCursor(void)
 {
 	if (isDoingAdd()) {
 		Tool::setCursor();	// Default cursor is the adding cursor
@@ -156,7 +156,7 @@ void BuildListTool::setCursor(void)
 }
 
 /** Execute the tool on mouse down - Place an object. */
-void BuildListTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void BuildListTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	m_moving = false;
@@ -165,7 +165,7 @@ void BuildListTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWo
 	pView->viewToDocCoords(viewPt, &cpt);
 	m_downPt2d = viewPt;
 	m_downPt3d = cpt;
-	if (isDoingAdd()) return; 
+	if (isDoingAdd()) return;
 	BuildListInfo *pInfo = pView->pickedBuildObjectInView(viewPt);
 	if (pInfo) {
 		m_curObject = pInfo;
@@ -197,11 +197,11 @@ void BuildListTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CW
 		Coord3D loc = cpt;
 		MapObject *pCur = ObjectOptions::getObjectNamed(m_pickBuildingDlg.getPickedUnit());
 		loc.z = 0;
-		if (pCur) { 
+		if (pCur) {
 			// Display the transparent version of this object.
 			p3View->setObjTracking(pCur, loc, 0, true);
 		} else {
-			// Don't display anything. 
+			// Don't display anything.
 			p3View->setObjTracking(NULL, loc, 0, false);
 		}
 		return;
@@ -246,13 +246,13 @@ void BuildListTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CW
 	}
 	p3View->invalBuildListItemInView(m_curObject);
 	m_prevPt3d = cpt;
-	
+
 }
 
 
 
 /** Execute the tool on mouse up - Place an object. */
-void BuildListTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void BuildListTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	if (!isDoingAdd()) {
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/CButtonShowColor.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/CButtonShowColor.cpp
index 8e2c4534abd..c90376306ca 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/CButtonShowColor.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/CButtonShowColor.cpp
@@ -22,11 +22,11 @@
 #include "CButtonShowColor.h"
 
 // CButtonShowColor ///////////////////////////////////////////////////////////////////////////////
-void CButtonShowColor::OnPaint() 
+void CButtonShowColor::OnPaint()
 {
 	try {
 		CPaintDC paintDC(this);
-	
+
 		CPen pen(PS_SOLID, 1, 0xFFFFFF00);
 		CBrush brush(RGBtoBGR(m_color.getAsInt()));
 		// Select my stuff
@@ -45,7 +45,7 @@ void CButtonShowColor::OnPaint()
 
 		// Restore the states.
 		paintDC.SelectObject(oldPen);
- 
+
 	} catch (...) {
 		// Unlikely, but possible.
 		return;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/CButtonShowColor.h b/GeneralsMD/Code/Tools/WorldBuilder/src/CButtonShowColor.h
deleted file mode 100644
index 05d09c7ff6c..00000000000
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/CButtonShowColor.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#ifndef _H_CBUTTONSHOWCOLOR_
-#define _H_CBUTTONSHOWCOLOR_
-
-class CButtonShowColor : public CButton
-{
-	protected:
-		RGBColor m_color;
-
-	public:
-		const RGBColor& getColor(void) const { return m_color; }
-		void setColor(Int color) { m_color.setFromInt(color); }
-		void setColor(const RGBColor& color) { m_color = color; }
-		~CButtonShowColor();
-		
-		
-		static COLORREF RGBtoBGR(Int color);
-		static Int BGRtoRGB(COLORREF color);
-
-
-	protected:
-		afx_msg void OnPaint();
-
-	DECLARE_MESSAGE_MAP();
-};
-
-#endif /* _H_CBUTTONSHOWCOLOR_ */
\ No newline at end of file
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/CFixTeamOwnerDialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/CFixTeamOwnerDialog.cpp
index fc9c7a2247c..fca3eb953f0 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/CFixTeamOwnerDialog.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/CFixTeamOwnerDialog.cpp
@@ -21,7 +21,6 @@
 #include "CFixTeamOwnerDialog.h"
 #include "GameLogic/SidesList.h"
 #include "Common/WellKnownKeys.h"
-#include "GameLogic/SidesList.h"
 
 static const char* NEUTRAL_NAME_STR = "(neutral)";
 
@@ -88,7 +87,7 @@ void CFixTeamOwnerDialog::OnOK()
 	CListBox *pList = (CListBox*) GetDlgItem(IDC_VALIDTEAMLIST);
 	int curSel = pList->GetCurSel();
 
-	if (curSel < 0) { 
+	if (curSel < 0) {
 		return;
 	}
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/CUndoable.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/CUndoable.cpp
index 2b84af23339..406793275f5 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/CUndoable.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/CUndoable.cpp
@@ -20,7 +20,7 @@
 // Class to handle undo/redo.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "CUndoable.h"
@@ -38,7 +38,7 @@
 #include "wbview3d.h"
 #include "LayersList.h"
 #include "Common/WellKnownKeys.h"
-#include "WorldBuilder.h"	// for MAX_OBJECTS_IN_MAP 
+#include "WorldBuilder.h"	// for MAX_OBJECTS_IN_MAP
 #include "Common/UnicodeString.h"
 
 
@@ -74,13 +74,13 @@ void Undoable::LinkNext(Undoable *pNext)
 //
 void Undoable::Redo(void)
 {
-	Do();  
+	Do();
 }
 
 
 /*************************************************************************
 **                             WBDocUndoable
- An undoable that actually undoes something.  Saves the entire height map 
+ An undoable that actually undoes something.  Saves the entire height map
  state, and restores it.
 ***************************************************************************/
 //
@@ -133,7 +133,7 @@ void WBDocUndoable::Do(void)
 		Int i;
 		// Update build lists.
 		for (i=0; i<TheSidesList->getNumSides(); i++) {
-			SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+			SidesInfo *pSide = TheSidesList->getSideInfo(i);
 			for (BuildListInfo *pBuild = pSide->getBuildList(); pBuild; pBuild = pBuild->getNext()) {
 				// Update.
 				Coord3D loc = *pBuild->getLocation();
@@ -143,7 +143,7 @@ void WBDocUndoable::Do(void)
 				pBuild->setLocation(loc);
 			}
 		}
-		mPDoc->invalObject(NULL); // Inval all objects.	
+		mPDoc->invalObject(NULL); // Inval all objects.
 	}
 	mPNewHeightMapData->dbgVerifyAfterUndo();
 }
@@ -168,7 +168,7 @@ void WBDocUndoable::Redo(void)
 			pCur->setLocation(&loc);
 			pCur = pCur->getNext();
 		}
-		mPDoc->invalObject(NULL); // Inval all objects.	
+		mPDoc->invalObject(NULL); // Inval all objects.
 	}
 	mPNewHeightMapData->dbgVerifyAfterUndo();
 }
@@ -193,7 +193,7 @@ void WBDocUndoable::Undo(void)
 			pCur->setLocation(&loc);
 			pCur = pCur->getNext();
 		}
-		mPDoc->invalObject(NULL); // Inval all objects.	
+		mPDoc->invalObject(NULL); // Inval all objects.
 	}
 	mPOldHeightMapData->dbgVerifyAfterUndo();
 }
@@ -207,7 +207,7 @@ void WBDocUndoable::Undo(void)
 AddObjectUndoable::~AddObjectUndoable(void)
 {
 	m_pDoc = NULL;  // not ref counted.
-	if (m_objectToAdd && !m_addedToList) {
+	if (!m_addedToList) {
 		deleteInstance(m_objectToAdd);
 		m_objectToAdd=NULL;
 	}
@@ -239,8 +239,8 @@ void AddObjectUndoable::Do(void)
 	// Clear selection.
 	PointerTool::clearSelection();
 	m_numObjects = 0;
-	while (pCur) { 
-		if (!pCur->getFlag(FLAG_ROAD_FLAGS) && !pCur->getFlag(FLAG_BRIDGE_FLAGS) && !pCur->isWaypoint()) 
+	while (pCur) {
+		if (!pCur->getFlag(FLAG_ROAD_FLAGS) && !pCur->getFlag(FLAG_BRIDGE_FLAGS) && !pCur->isWaypoint())
 		{
 			pCur->setSelected(true);
 		}
@@ -252,16 +252,16 @@ void AddObjectUndoable::Do(void)
 		return;
 	}
 	pLast->setNextMap(MapObject::getFirstMapObject());
-	
+
 	MapObject::TheMapObjectListPtr	= m_objectToAdd;
 	m_addedToList = true;
 
 	pCur = m_objectToAdd;
 	for (int i = 0; i < m_numObjects; i++) {
-		// validate the object, giving it a valid ID and team.	
+		// validate the object, giving it a valid ID and team.
 		pCur->validate();
 		Dict *props = pCur->getProperties();
-		Bool dontCare;	
+		Bool dontCare;
 		TheLayersList->addMapObjectToLayersList(pCur, props->getAsciiString(TheKey_objectLayer, &dontCare));
 
 		m_pDoc->invalObject(pCur);
@@ -271,13 +271,13 @@ void AddObjectUndoable::Do(void)
 	pCur = MapObject::getFirstMapObject();
 
 	const Int flagsWeDontWant = FLAG_ROAD_FLAGS | FLAG_ROAD_CORNER_ANGLED | FLAG_BRIDGE_FLAGS | FLAG_ROAD_CORNER_TIGHT | FLAG_ROAD_JOIN;
-	
+
 	Int numObjects = 0;
 	while (pCur) {
 		Int flags = pCur->getFlags();
 		if (!(pCur->isWaypoint() || (flags & flagsWeDontWant) != 0))
 			++numObjects;
-		
+
 		pCur = pCur->getNext();
 	}
 
@@ -301,7 +301,7 @@ void AddObjectUndoable::Undo(void)
 	}
 	MapObject *pCur = MapObject::TheMapObjectListPtr;
 	while (pCur && (m_numObjects > 1)) {
-		m_pDoc->invalObject(pCur);	
+		m_pDoc->invalObject(pCur);
 		pCur = pCur->getNext();
 		m_numObjects--;
 	}
@@ -312,7 +312,7 @@ void AddObjectUndoable::Undo(void)
 	}
 	pCur = m_objectToAdd;
 	while (pCur) {
-		m_pDoc->invalObject(pCur);	
+		m_pDoc->invalObject(pCur);
 		// Note : This undoable can add multiple objects, and removes multiple objects.
 		TheLayersList->removeMapObjectFromLayersList(pCur);
 		pCur = pCur->getNext();
@@ -470,7 +470,7 @@ ModifyObjectUndoable::ModifyObjectUndoable(CWorldBuilderDoc *pDoc):
 /// Sets the offset for all the objects in the move list, and moves them there.
 //
 void ModifyObjectUndoable::SetOffset(Real x, Real y)
-{			
+{
 	MoveInfo *pCur = m_moveList;
 	while (pCur) {
 		pCur->SetOffset(m_pDoc, x, y);
@@ -509,7 +509,7 @@ void ModifyObjectUndoable::SetThingTemplate(const ThingTemplate* thing)
 		pCur = pCur->m_next;
 	}
 	m_inval = true;
-	if (m_inval) 
+	if (m_inval)
 	{
 		WbView3d *p3View = m_pDoc->GetActive3DView();
 		p3View->resetRenderObjects();
@@ -525,7 +525,7 @@ void ModifyObjectUndoable::SetName(AsciiString name)
 		pCur = pCur->m_next;
 	}
 	m_inval = true;
-	if (m_inval) 
+	if (m_inval)
 	{
 		WbView3d *p3View = m_pDoc->GetActive3DView();
 		p3View->resetRenderObjects();
@@ -551,7 +551,7 @@ void ModifyObjectUndoable::Redo(void)
 		pCur->DoMove(m_pDoc);
 		pCur = pCur->m_next;
 	}
-	if (m_inval) 
+	if (m_inval)
 	{
 		WbView3d *p3View = m_pDoc->GetActive3DView();
 		p3View->resetRenderObjects();
@@ -569,7 +569,7 @@ void ModifyObjectUndoable::Undo(void)
 		pCur->UndoMove(m_pDoc);
 		pCur = pCur->m_next;
 	}
-	if (m_inval) 
+	if (m_inval)
 	{
 		WbView3d *p3View = m_pDoc->GetActive3DView();
 		p3View->resetRenderObjects();
@@ -609,7 +609,7 @@ FlagsInfo::FlagsInfo( MapObject *pObjToMove, Int flagMask, Int flagValue):
 void FlagsInfo::DoFlags(CWorldBuilderDoc *pDoc)
 {
 	Bool found = false;
-	MapObject *pMapObj; 
+	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj == m_objectToModify) {
 			found = true;
@@ -626,7 +626,7 @@ void FlagsInfo::DoFlags(CWorldBuilderDoc *pDoc)
 void FlagsInfo::UndoFlags(CWorldBuilderDoc *pDoc)
 {
 	Bool found = false;
-	MapObject *pMapObj; 
+	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj == m_objectToModify) {
 			found = true;
@@ -649,9 +649,8 @@ void FlagsInfo::UndoFlags(CWorldBuilderDoc *pDoc)
 ModifyFlagsUndoable::~ModifyFlagsUndoable(void)
 {
 	m_pDoc = NULL;  // not ref counted.
-	if (m_flagsList) {
-		delete m_flagsList;
-	}
+
+	delete m_flagsList;
 	m_flagsList = NULL;
 }
 
@@ -724,7 +723,7 @@ m_pDoc(pDoc)
 	// ensure the new setup is valid. (don't mess with the old one.)
 	Bool modified = m_new.validateSides();
 	(void)modified;
-	DEBUG_ASSERTLOG(!modified,("*** had to clean up sides in SidesListUndoable! (caller should do this)\n"));
+	DEBUG_ASSERTLOG(!modified,("*** had to clean up sides in SidesListUndoable! (caller should do this)"));
 }
 
 SidesListUndoable::~SidesListUndoable()
@@ -857,7 +856,7 @@ void DictItemUndoable::Undo(void)
 ***************************************************************************/
 DeleteInfo::~DeleteInfo(void)
 {
-	if (m_didDelete && m_objectToDelete) {
+	if (m_didDelete) {
 		deleteInstance(m_objectToDelete);
 	}
 	DeleteInfo *pCur = m_next;
@@ -937,9 +936,8 @@ void DeleteInfo::UndoDelete(WorldHeightMapEdit *pMap)
 DeleteObjectUndoable::~DeleteObjectUndoable(void)
 {
 	m_pDoc = NULL;  // not ref counted.
-	if (m_deleteList) {
-		delete m_deleteList;
-	}
+
+	delete m_deleteList;
 	m_deleteList=NULL;
 }
 
@@ -996,7 +994,7 @@ void DeleteObjectUndoable::Do(void)
 	DeleteInfo *pCur = m_deleteList;
 	DeleteInfo *pInvertedList = NULL;
 	while (pCur) {
-		// first, remove it from the Layers list. 
+		// first, remove it from the Layers list.
 		TheLayersList->removeMapObjectFromLayersList(pCur->m_objectToDelete);
 
 		DeleteInfo *tmp;
@@ -1070,7 +1068,7 @@ AddPolygonUndoable::AddPolygonUndoable(PolygonTrigger *pTrig):
 void AddPolygonUndoable::Do(void)
 {
 	// The call to LayersList must be done here because only the WorldBuilder knows about Layers.
-	TheLayersList->addPolygonTriggerToLayersList(m_trigger, m_trigger->getLayerName()); 
+	TheLayersList->addPolygonTriggerToLayersList(m_trigger, m_trigger->getLayerName());
 	PolygonTrigger::addPolygonTrigger(m_trigger);
 	m_isTriggerInList = true;
 }
@@ -1182,7 +1180,7 @@ MovePolygonUndoable::~MovePolygonUndoable(void)
 MovePolygonUndoable::MovePolygonUndoable(PolygonTrigger *pTrig):
 	m_trigger(pTrig)
 {
-	m_offset.x = 0; 
+	m_offset.x = 0;
 	m_offset.y = 0;
 	m_offset.z = 0;
 }
@@ -1421,7 +1419,7 @@ static void undoHelper(Undoable * undoable)
 }
 
 //
-// Undo all the list's actions. This is harder, because we need to do it in reverse order, for a 
+// Undo all the list's actions. This is harder, because we need to do it in reverse order, for a
 // singly linked list
 //
 void MultipleUndoable::Undo(void)
@@ -1436,7 +1434,7 @@ void MultipleUndoable::Undo(void)
 void MultipleUndoable::Redo(void)
 {
   Undoable * undoable = m_undoableList;
-  
+
   while ( undoable != NULL )
   {
     Undoable * next = undoable->GetNext();
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/CameraOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/CameraOptions.cpp
index 0d4115ce2a4..9a5e47225c9 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/CameraOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/CameraOptions.cpp
@@ -25,7 +25,6 @@
 #include "CameraOptions.h"
 #include "wbview3d.h"
 #include "WorldBuilderDoc.h"
-#include "wbview3d.h"
 
 
 #include "WaypointOptions.h" //WST 10/7/2002
@@ -69,7 +68,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CameraOptions message handlers
 
-void CameraOptions::OnCameraReset() 
+void CameraOptions::OnCameraReset()
 {
 	WbView3d * p3View = CWorldBuilderDoc::GetActive3DView();
 	if (p3View)
@@ -80,11 +79,11 @@ void CameraOptions::OnCameraReset()
 }
 
 //WST 10/7/2002 - Drop waypoint button for Adam Isgreen -----------
-void CameraOptions::OnDropWaypointButton() 
+void CameraOptions::OnDropWaypointButton()
 {
 	//The following code is taken from waypointTool.cpp. On mouse down.
 	WbView3d		* p3View = CWorldBuilderDoc::GetActive3DView();
-	Coord3D			docPt;	
+	Coord3D			docPt;
 	CWorldBuilderDoc *pDoc	= CWorldBuilderDoc::GetActiveDoc();
 
 	Vector3 camTarget = p3View->getCameraTarget();
@@ -95,8 +94,8 @@ void CameraOptions::OnDropWaypointButton()
 	//
 	// MBL CNC3 INCURSION 10.29.2002 - Fix compile error w/ 10-15-2002 Drop
 	//
-	// MapObject *pNew = new MapObject(docPt, AsciiString("*Waypoints/Waypoint"), 0, 0, NULL, NULL );
-	MapObject *pNew = newInstance(MapObject)(docPt, AsciiString("*Waypoints/Waypoint"), 0, 0, NULL, NULL );
+	// MapObject *pNew = new MapObject(docPt, "*Waypoints/Waypoint", 0, 0, NULL, NULL );
+	MapObject *pNew = newInstance(MapObject)(docPt, "*Waypoints/Waypoint", 0, 0, NULL, NULL );
 
 	Int id = pDoc->getNextWaypointID();
 	AsciiString name = WaypointOptions::GenerateUniqueName(id);
@@ -104,7 +103,7 @@ void CameraOptions::OnDropWaypointButton()
 	pNew->setIsWaypoint();
 	pNew->setWaypointID(id);
 	pNew->setWaypointName(name);
-	pNew->getProperties()->setAsciiString(TheKey_originalOwner, AsciiString("team"));
+	pNew->getProperties()->setAsciiString(TheKey_originalOwner, "team");
 	AddObjectUndoable *pUndo = new AddObjectUndoable(pDoc, pNew);
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
@@ -112,7 +111,7 @@ void CameraOptions::OnDropWaypointButton()
 }
 
 //WST 11/25/2002 - New Center Camera button for Designers -----------
-void CameraOptions::OnCenterOnSelectedButton() 
+void CameraOptions::OnCenterOnSelectedButton()
 {
 	// Center camera on the selected map object
 
@@ -124,7 +123,7 @@ void CameraOptions::OnCenterOnSelectedButton()
 		if (mapObject->isSelected()) {
 			objectPosition = mapObject->getLocation();
 			count++;
-		}	
+		}
 		mapObject = mapObject->getNext();
 	}
 
@@ -138,17 +137,17 @@ void CameraOptions::OnCenterOnSelectedButton()
 }
 
 
-void CameraOptions::OnMove(int x, int y) 
+void CameraOptions::OnMove(int x, int y)
 {
 	CDialog::OnMove(x, y);
-	
+
 	if (this->IsWindowVisible() && !this->IsIconic()) {
 		CRect frameRect;
 		GetWindowRect(&frameRect);
 		::AfxGetApp()->WriteProfileInt(CAMERA_OPTIONS_PANEL_SECTION, "Top", frameRect.top);
 		::AfxGetApp()->WriteProfileInt(CAMERA_OPTIONS_PANEL_SECTION, "Left", frameRect.left);
 	}
-	
+
 }
 
 void CameraOptions::putInt(Int ctrlID, Int val)
@@ -181,7 +180,7 @@ void CameraOptions::putAsciiString(Int ctrlID, AsciiString val)
 	}
 }
 
-BOOL CameraOptions::getReal(Int ctrlID, Real *rVal) 
+BOOL CameraOptions::getReal(Int ctrlID, Real *rVal)
 {
 	CWnd *pEdit = GetDlgItem(ctrlID);
 	char buffer[_MAX_PATH];
@@ -262,7 +261,7 @@ void CameraOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void CameraOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -278,7 +277,7 @@ void CameraOptions::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void CameraOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -291,22 +290,22 @@ void CameraOptions::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
 
-BOOL CameraOptions::OnInitDialog() 
+BOOL CameraOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_pitchPopup.SetupPopSliderButton(this, IDC_PITCH_POPUP, this);
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void CameraOptions::OnChangePitchEdit() 
+void CameraOptions::OnChangePitchEdit()
 {
 	if (m_updating)
 		return;
@@ -320,7 +319,7 @@ void CameraOptions::OnChangePitchEdit()
 	}
 }
 
-void CameraOptions::OnShowWindow(BOOL bShow, UINT nStatus) 
+void CameraOptions::OnShowWindow(BOOL bShow, UINT nStatus)
 {
 	CDialog::OnShowWindow(bShow, nStatus);
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/CellWidth.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/CellWidth.cpp
index 7adcf68949a..07aded667ca 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/CellWidth.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/CellWidth.cpp
@@ -50,7 +50,7 @@ void CellWidth::DoDataExchange(CDataExchange* pDX)
 // CellWidth message handlers
 
 /// Get the cell width value from the ui on ok.
-void CellWidth::OnOK() 
+void CellWidth::OnOK()
 {
 	CWnd *combo = GetDlgItem(IDC_CELL_WIDTH);
 	CString val;
@@ -63,15 +63,15 @@ void CellWidth::OnOK()
 
 
 /// Set the initial value of cell width into the combobox.
-BOOL CellWidth::OnInitDialog() 
+BOOL CellWidth::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CWnd *combo = GetDlgItem(IDC_CELL_WIDTH);
 	CString val;
 	val.Format("%d", mCellWidth);
 	if (combo) combo->SetWindowText(val);
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ContourOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ContourOptions.cpp
index 3f3d4e95e5e..dba345f5082 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ContourOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ContourOptions.cpp
@@ -36,7 +36,7 @@ Int ContourOptions::m_contourWidth = 1;
 ContourOptions::ContourOptions(CWnd* pParent /*=NULL*/)
 	: CDialog(ContourOptions::IDD, pParent)
 {
-	//{{AFX_DATA_INIT(ContourOptions) 
+	//{{AFX_DATA_INIT(ContourOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -56,12 +56,12 @@ void ContourOptions::DoDataExchange(CDataExchange* pDX)
 // ContourOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL ContourOptions::OnInitDialog() 
+BOOL ContourOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CWnd *pWnd = GetDlgItem(IDC_SLIDER1);
 	CRect rect;
 	pWnd->GetWindowRect(&rect);
@@ -107,10 +107,10 @@ BOOL ContourOptions::OnInitDialog()
 }
 
 /// Handles slider ui messages.
-/** Gets the info, determines if it is the feather or width slider, 
+/** Gets the info, determines if it is the feather or width slider,
 		gets the new value, and updates the correspondig edit control
 		and the brush tool. */
-void ContourOptions::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
+void ContourOptions::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 {
 	CString str;
 	m_updating = true;
@@ -121,12 +121,12 @@ void ContourOptions::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 			nPos = m_contourStepSlider.GetPos();
 		}
 		m_contourStep = MIN_CONTOUR_STEP + MAX_CONTOUR_STEP - nPos;
-	} else if (offset) { // width 
+	} else if (offset) { // width
 		if (nSBCode != TB_THUMBTRACK) {
 			nPos = m_contourOffsetSlider.GetPos();
 		}
 		m_contourOffset = nPos;
-	} else { // width 
+	} else { // width
 		if (nSBCode != TB_THUMBTRACK) {
 			nPos = m_contourWidthSlider.GetPos();
 		}
@@ -148,7 +148,7 @@ BEGIN_MESSAGE_MAP(ContourOptions, CDialog)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-void ContourOptions::OnShowContours() 
+void ContourOptions::OnShowContours()
 {
 	CWorldBuilderView *pView = CWorldBuilderDoc::GetActive2DView();
 	if (pView) {
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp
index d835153f7f5..b5b794ba003 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp
@@ -20,9 +20,7 @@
 
 #include "DrawObject.h"
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <assetmgr.h>
 #include <texture.h>
 #include <tri.h>
@@ -109,7 +107,7 @@ Coord3D	DrawObject::m_rampEndPoint;
 Real DrawObject::m_rampWidth = 0.0f;
 
 
-Bool DrawObject::m_dragWaypointFeedback = false; 
+Bool DrawObject::m_dragWaypointFeedback = false;
 Coord3D DrawObject::m_dragWayStart;
 Coord3D DrawObject::m_dragWayEnd;
 
@@ -170,7 +168,7 @@ DrawObject::DrawObject(void) :
 Bool DrawObject::Cast_Ray(RayCollisionTestClass & raytest)
 {
 
-	return false;	
+	return false;
 
 }
 
@@ -227,18 +225,18 @@ Int DrawObject::freeMapResources(void)
 	REF_PTR_RELEASE(m_vertexBufferWater);
 	REF_PTR_RELEASE(m_vertexMaterialClass);
 	REF_PTR_RELEASE(m_vertexFeedback);
-	REF_PTR_RELEASE(m_indexFeedback);	
-	REF_PTR_RELEASE(m_indexWater);	
+	REF_PTR_RELEASE(m_indexFeedback);
+	REF_PTR_RELEASE(m_indexWater);
 	REF_PTR_RELEASE(m_moldMesh);
-	if (m_lineRenderer) {
-		delete m_lineRenderer;
-		m_lineRenderer = NULL;
-	}
+
+	delete m_lineRenderer;
+	m_lineRenderer = NULL;
+
 	return 0;
 }
 
 // Total number of triangles
-#define NUM_TRI 26	 
+#define NUM_TRI 26
 // Number of triangles in the arrow.
 #define NUM_ARROW_TRI 4
 // Number of triangles in the selection pyramid.
@@ -248,7 +246,7 @@ Int DrawObject::freeMapResources(void)
 
 
 Int DrawObject::initData(void)
-{	
+{
 	Int i;
 
 	freeMapResources();	//free old data and ib/vb
@@ -259,7 +257,7 @@ Int DrawObject::initData(void)
 	// Fill up the IB
 	DX8IndexBufferClass::WriteLockClass lockIdxBuffer(m_indexBuffer, D3DLOCK_DISCARD);
 	UnsignedShort *ib=lockIdxBuffer.Get_Index_Array();
-		
+
 	for (i=0; i<3*m_numTriangles; i+=3)
 	{
 		ib[0]=i;
@@ -279,12 +277,12 @@ Int DrawObject::initData(void)
 	m_vertexMaterialClass=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
 
 	//use a multi-texture shader: (text1*diffuse)*text2.
-	m_shaderClass = ShaderClass::ShaderClass(SC_OPAQUE);//_PresetOpaque2DShader;//ShaderClass(SC_OPAQUE); //_PresetOpaqueShader;
+	m_shaderClass = ShaderClass(SC_OPAQUE);//_PresetOpaque2DShader;//ShaderClass(SC_OPAQUE); //_PresetOpaqueShader;
 
 	m_shaderClass = ShaderClass::_PresetOpaque2DShader;
-	updateForWater();			 
+	updateForWater();
 	updateVB(m_vertexBufferTile1, 255<<8, true, false);
-	
+
 	return 0;
 }
 
@@ -346,7 +344,7 @@ void DrawObject::updateMeshVB(void)
 	}
 
 #if 0	//this wasn't being used (see below) so I commented it out. -MW
-	Vector3 lightRay=Normalize(Vector3(-TheGlobalData->m_terrainLightPos[0].x, 
+	Vector3 lightRay=Normalize(Vector3(-TheGlobalData->m_terrainLightPos[0].x,
 		-TheGlobalData->m_terrainLightPos[0].y, -TheGlobalData->m_terrainLightPos[0].z));
 #endif
 
@@ -362,7 +360,7 @@ void DrawObject::updateMeshVB(void)
 		curVb->x = vLoc.X;
 		curVb->y = vLoc.Y;
 		curVb->z = vLoc.Z;
-		
+
 		VertexFormatXYZDUV2 vb;
 		vb.x = vLoc.X;
 		vb.y = vLoc.Y;
@@ -370,7 +368,7 @@ void DrawObject::updateMeshVB(void)
 
 #if 1
 		curVb->diffuse = 0x0000ffff | (theAlpha << 24);		// bright cyan.
-#else 
+#else
 		TheTerrainRenderObject->doTheLight(&vb, &lightRay, (Vector3 *)(&pNormal[i]), NULL, 1.0f);
 		vb.diffuse &= 0x0000ffff;
 		curVb->diffuse = vb.diffuse | (theAlpha << 24);
@@ -465,45 +463,45 @@ void DrawObject::updateRampVB(void)
 	Int numVertex = widthVerts * lengthVerts;
 
 /*
-	Generate the rectangle via the function BuildRectFromSegmentAndWidth(...). 
-	Note that for the rectangular case, this is easy, as we simply step along the line at 
-	pre-determined step sizes, with no additional calculation. (IE, we can simply perform 
-	linear interpolation.) However, with the curved case, we will need to recalculate the 
-	value every step along the way. 
- 
- 
+	Generate the rectangle via the function BuildRectFromSegmentAndWidth(...).
+	Note that for the rectangular case, this is easy, as we simply step along the line at
+	pre-determined step sizes, with no additional calculation. (IE, we can simply perform
+	linear interpolation.) However, with the curved case, we will need to recalculate the
+	value every step along the way.
+
+
 	Ultimately, what I'd like to do is to precompute what the terrain is actually going to
 	do, and then use the faux-adjusted vertices, but this is much easier to start from. jkmcd
 */
 	Coord3D coordBL, coordTL, coordBR, coordTR;
-	BuildRectFromSegmentAndWidth(&m_rampStartPoint, &m_rampEndPoint, m_rampWidth, 
+	BuildRectFromSegmentAndWidth(&m_rampStartPoint, &m_rampEndPoint, m_rampWidth,
 															 &coordBL, &coordTL, &coordBR, &coordTR);
 
 	Vector3 bl(coordBL.x, coordBL.y, coordBL.z);
 	Vector3 tl(coordTL.x, coordTL.y, coordTL.z);
 	Vector3 br(coordBR.x, coordBR.y, coordBR.z);
 	Vector3 tr(coordTR.x, coordTR.y, coordTR.z);
-	
+
 	for (i = 0; i < numVertex; i++) {
 		curVb->u1 = INT_TO_REAL(i % widthVerts) / widthVerts;
 		curVb->v1 = INT_TO_REAL(i / lengthVerts) / lengthVerts;
 
 		curVb->diffuse = curVb->diffuse = 0x0000ffff | (theAlpha << 24);		// bright cyan.
-		
+
 		Vector3 vLoc;
-		vLoc.X = (br.X - bl.X) * INT_TO_REAL(i % widthVerts) / (widthVerts  - 1) + 
+		vLoc.X = (br.X - bl.X) * INT_TO_REAL(i % widthVerts) / (widthVerts  - 1) +
 						 (tl.X - bl.X) * INT_TO_REAL(i / lengthVerts) / (lengthVerts - 1) + bl.X;
-		
-		vLoc.Y = (br.Y - bl.Y) * INT_TO_REAL(i % widthVerts) / (widthVerts - 1) + 
+
+		vLoc.Y = (br.Y - bl.Y) * INT_TO_REAL(i % widthVerts) / (widthVerts - 1) +
 						 (tl.Y - bl.Y) * INT_TO_REAL(i / lengthVerts) / (lengthVerts - 1) + bl.Y;
 
-		vLoc.Z = (br.Z - bl.Z) * INT_TO_REAL(i % widthVerts) / (widthVerts - 1) + 
+		vLoc.Z = (br.Z - bl.Z) * INT_TO_REAL(i % widthVerts) / (widthVerts - 1) +
 						 (tl.Z - bl.Z) * INT_TO_REAL(i / lengthVerts) / (lengthVerts - 1) + bl.Z;
 
 		curVb->x = vLoc.X;
 		curVb->y = vLoc.Y;
 		curVb->z = vLoc.Z;
-		
+
 		curVb++;
 		m_feedbackVertexCount++;
 	}
@@ -514,13 +512,13 @@ void DrawObject::updateRampVB(void)
 			(*curIb++) = i * lengthVerts + j;
 			(*curIb++) = (i + 1) * lengthVerts + j;
 			(*curIb++) = (i + 1) * lengthVerts + j + 1;
-			
+
 			(*curIb++) = i * lengthVerts + j;
 			(*curIb++) = (i + 1) * lengthVerts + j + 1;
 			(*curIb++) = (i) * lengthVerts + j + 1;
 			m_feedbackIndexCount += 6;
 		}
-				
+
 	}
 #if 0
 	// Put in the "center anchor"
@@ -1135,7 +1133,7 @@ void DrawObject::updatePolygonVB(PolygonTrigger *pTrig, Bool selected, Bool isOp
 		curVb->x = loc1.x+normal.X;
 		curVb->y = loc1.y+normal.Y;
 		curVb->z = loc1.z;
-		curVb->diffuse = diffuse;  
+		curVb->diffuse = diffuse;
 		curVb++;
 		m_feedbackVertexCount++;
 		curVb->u1 = 0;
@@ -1143,7 +1141,7 @@ void DrawObject::updatePolygonVB(PolygonTrigger *pTrig, Bool selected, Bool isOp
 		curVb->x = loc1.x-normal.X;
 		curVb->y = loc1.y-normal.Y;
 		curVb->z = loc1.z;
-		curVb->diffuse = diffuse;  
+		curVb->diffuse = diffuse;
 		curVb++;
 		m_feedbackVertexCount++;
 		curVb->u1 = 0;
@@ -1151,7 +1149,7 @@ void DrawObject::updatePolygonVB(PolygonTrigger *pTrig, Bool selected, Bool isOp
 		curVb->x = loc2.x+normal.X;
 		curVb->y = loc2.y+normal.Y;
 		curVb->z = loc2.z;
-		curVb->diffuse = diffuse; 
+		curVb->diffuse = diffuse;
 		curVb++;
 		m_feedbackVertexCount++;
 		curVb->u1 = 0;
@@ -1245,13 +1243,13 @@ void DrawObject::updateFeedbackVB(void)
 					curVb->diffuse = 0;
 				}
 			}
-			Real X, Y, theZ; 
+			Real X, Y, theZ;
 			if (doubleResolution) {
-				X = ADJUST_FROM_INDEX_TO_REAL(i)/2.0f + ADJUST_FROM_INDEX_TO_REAL(2*offset+m_cellCenter.x)  / 2.0; 
+				X = ADJUST_FROM_INDEX_TO_REAL(i)/2.0f + ADJUST_FROM_INDEX_TO_REAL(2*offset+m_cellCenter.x)  / 2.0;
 				Y = ADJUST_FROM_INDEX_TO_REAL(j)/2.0f + ADJUST_FROM_INDEX_TO_REAL(2*offset+m_cellCenter.y)  / 2.0;
 				theZ = TheTerrainRenderObject->getHeightMapHeight(X, Y, NULL);
 			} else {
-				X = ADJUST_FROM_INDEX_TO_REAL(i); 
+				X = ADJUST_FROM_INDEX_TO_REAL(i);
 				Y = ADJUST_FROM_INDEX_TO_REAL(j);
 				theZ = TheTerrainRenderObject->getHeightMapHeight(X, Y, NULL);
 			}
@@ -1263,7 +1261,7 @@ void DrawObject::updateFeedbackVB(void)
 			curVb++;
 			m_feedbackVertexCount++;
 		}
-	} 
+	}
 	Int yOffset = maxX-minX;
 	Int halfWidth = yOffset/2;
 	for (j=0; j<maxY-minY-1; j++) {
@@ -1296,7 +1294,7 @@ void DrawObject::updateFeedbackVB(void)
 
 
 /** Calculate the sign of the cross product.  If the tails of the vectors are both placed
-at 0,0, then the cross product can be interpreted as -1 means v2 is to the right of v1, 
+at 0,0, then the cross product can be interpreted as -1 means v2 is to the right of v1,
 1 means v2 is to the left of v1, and 0 means v2 is parallel to v1. */
 
 static Int xpSign(const ICoord3D &v1, const ICoord3D &v2) {
@@ -1313,8 +1311,8 @@ void DrawObject::updateForWater(void)
 {
 }
 
-/* This is a code snippet that starts to attempt to solve the concave area problem, 
-but doesn't, really.  
+/* This is a code snippet that starts to attempt to solve the concave area problem,
+but doesn't, really.
 				const Int maxPoints = 256;
 				Bool pointFlags[256];
 				Int numPoints = pTrig->getNumPoints();
@@ -1388,15 +1386,15 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 	g *= factor;
 	b *= factor;
 	const Int theAlpha = 127;
-	static const Int highlightColors[NUM_HIGHLIGHT] = { ((255<<8) + (255<<16)) , 
+	static const Int highlightColors[NUM_HIGHLIGHT] = { ((255<<8) + (255<<16)) ,
 				((255<<16)), (255<<8) };
 	Int diffuse =  b + (g<<8) + (r<<16) + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.
 	if (pVB )
 	{
-		
+
 		DX8VertexBufferClass::WriteLockClass lockVtxBuffer(pVB, D3DLOCK_DISCARD);
 		VertexFormatXYZDUV1 *vb = (VertexFormatXYZDUV1*)lockVtxBuffer.Get_Vertex_Array();
-		
+
 		const Real theZ = 0.0f;
 		Real theRadius = THE_RADIUS;
 		Real halfLineWidth = 0.03f*MAP_XY_FACTOR;
@@ -1435,7 +1433,7 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 					Real angle = curAngle+deltaAngle;
 					if (i==limit-1) {
 						angle = 0;
-					} 
+					}
 					Vector3 vec(theRadius/10,0,theZ);
 					vec.Rotate_Z(angle);
 					vb->x=	vec.X;
@@ -1464,7 +1462,7 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 		}
 		/* Now do the arrow. */
 		for (k=0; k<3; k++) {
-			vb->x=	(k&1)?2*theRadius:0.0f;	 
+			vb->x=	(k&1)?2*theRadius:0.0f;
 			vb->y=	-halfLineWidth + ((k&2)?2*halfLineWidth:0);
 			vb->z=  theZ;
 			vb->diffuse=highlightColors[curHighlight] + (theAlpha<<24);
@@ -1474,7 +1472,7 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 			vb++;
 		}
 		for (k=0; k<3; k++) {
-			vb->x=	(k&1)?0.0f:2*theRadius;	 
+			vb->x=	(k&1)?0.0f:2*theRadius;
 			vb->y=	halfLineWidth - ((k&2)?2*halfLineWidth:0);
 			vb->z=  theZ;
 			vb->diffuse=highlightColors[curHighlight] + (theAlpha<<24);
@@ -1538,7 +1536,7 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 					Real angle = curAngle+deltaAngle;
 					if (i==limit-1) {
 						angle = 0;
-					} 
+					}
 					Vector3 vec(theRadius,0,theZ);
 					vec.Rotate_Z(angle);
 					vb->x=	vec.X;
@@ -1555,14 +1553,14 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 				vb++;
 			}
 			curAngle += deltaAngle;
-			
+
 		}
 
 #if 0
 		// Now do the highlight triangle.  This is in yellow.
 		for (k=0; k<3; k++) {
-			vb->x = k==0?theRadius:0;	 
-			vb->y = k==1?theRadius:0;	 
+			vb->x = k==0?theRadius:0;
+			vb->y = k==1?theRadius:0;
 			vb->z=  k==2?theZ+SELECT_PYRAMID_HEIGHT:theZ;
 			vb->diffuse= highlightColors[curHighlight] + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.
 			vb->u1=0;
@@ -1571,8 +1569,8 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 			vb++;
 		}
 		for (k=0; k<3; k++) {
-			vb->x = k==1?-theRadius:0;	 
-			vb->y = k==0?theRadius:0;	 
+			vb->x = k==1?-theRadius:0;
+			vb->y = k==0?theRadius:0;
 			vb->z=  k==2?theZ+SELECT_PYRAMID_HEIGHT:theZ;
 			vb->diffuse= highlightColors[curHighlight] + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.
 			vb->u1=0;
@@ -1582,8 +1580,8 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 		}
 
 		for (k=0; k<3; k++) {
-			vb->x = k==1?theRadius:0;	 
-			vb->y = k==0?-theRadius:0;	 
+			vb->x = k==1?theRadius:0;
+			vb->y = k==0?-theRadius:0;
 			vb->z=  k==2?theZ+SELECT_PYRAMID_HEIGHT:theZ;
 			vb->diffuse= highlightColors[curHighlight] + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.
 			vb->u1=0;
@@ -1592,8 +1590,8 @@ Int DrawObject::updateVB(DX8VertexBufferClass	*pVB, Int color, Bool doArrow, Boo
 			vb++;
 		}
 		for (k=0; k<3; k++) {
-			vb->x = k==0?-theRadius:0;	 
-			vb->y = k==1?-theRadius:0;	 
+			vb->x = k==0?-theRadius:0;
+			vb->y = k==1?-theRadius:0;
 			vb->z=  k==2?theZ+SELECT_PYRAMID_HEIGHT:theZ;
 			vb->diffuse= highlightColors[curHighlight] + (theAlpha<<24);	 // b g<<8 r<<16 a<<24.
 			vb->u1=0;
@@ -1617,7 +1615,7 @@ void DrawObject::updateVBWithBoundingBox(MapObject *pMapObj, CameraClass* camera
 	}
 
 	unsigned long color = 0xFFAA00AA; // Purple
-	
+
 	GeometryInfo ginfo = pMapObj->getThingTemplate()->getTemplateGeometryInfo();
 
 	Coord3D pos = *pMapObj->getLocation();
@@ -1625,7 +1623,7 @@ void DrawObject::updateVBWithBoundingBox(MapObject *pMapObj, CameraClass* camera
 		// Make sure that the position is on the terrain.
 		pos.z += TheTerrainRenderObject->getHeightMapHeight(pos.x, pos.y, NULL);
 	}
-		
+
 	switch (ginfo.getGeomType())
 	{
 		//---------------------------------------------------------------------------------------------
@@ -1665,14 +1663,14 @@ void DrawObject::updateVBWithBoundingBox(MapObject *pMapObj, CameraClass* camera
 				}
 
 				z += ginfo.getMaxHeightAbovePosition();
-			}  
+			}
 			break;
-		}  
+		}
 
 		//---------------------------------------------------------------------------------------------
 		case GEOMETRY_SPHERE:	// not quite right, but close enough
 		case GEOMETRY_CYLINDER:
-		{ 
+		{
 			Real angle, inc = PI/4.0f;
 			Real radius = ginfo.getMajorRadius();
 			Coord3D pnt, lastPnt;
@@ -1703,7 +1701,7 @@ void DrawObject::updateVBWithBoundingBox(MapObject *pMapObj, CameraClass* camera
 
 				// Next time around, draw the top of the cylinder.
 				z += ginfo.getMaxHeightAbovePosition();
-			}	
+			}
 
 			// Draw centerline
 			pnt.x = pos.x;
@@ -1716,8 +1714,8 @@ void DrawObject::updateVBWithBoundingBox(MapObject *pMapObj, CameraClass* camera
 				m_lineRenderer->Add_Line(Vector2(start.x, start.y), Vector2(end.x, end.y), BOUNDING_BOX_LINE_WIDTH, color);
 			}
 			break;
-		}	
-	} 
+		}
+	}
 }
 
 /** Draw a "circle" into the m_lineRenderer, e.g. to visualize weapon range, sight range, sound range **/
@@ -1727,24 +1725,24 @@ void DrawObject::addCircleToLineRenderer( const Coord3D & center, Real radius, R
   Coord3D pnt, lastPnt;
   ICoord2D start, end;
   Real z = center.z;
-  
+
   // Draw the circle.
   angle = 0.0f;
   lastPnt.x = center.x + radius * (Real)cos(angle);
   lastPnt.y = center.y + radius * (Real)sin(angle);
   lastPnt.z = z;
   bool shouldEnd = worldToScreen(&lastPnt, &end, camera);
-  
+
   for( angle = inc; angle <= 2.0f * PI; angle += inc ) {
     pnt.x = center.x + radius * (Real)cos(angle);
     pnt.y = center.y + radius * (Real)sin(angle);
     pnt.z = z;
-    
+
     bool shouldStart = worldToScreen(&pnt, &start, camera);
     if (shouldStart && shouldEnd) {
       m_lineRenderer->Add_Line(Vector2(start.x, start.y), Vector2(end.x, end.y), width, color);
     }
-    
+
     lastPnt = pnt;
     end = start;
     shouldEnd = shouldStart;
@@ -1762,7 +1760,7 @@ void DrawObject::updateVBWithSightRange(MapObject *pMapObj, CameraClass* camera)
 	}
 
 	const unsigned long color = 0xFFF0F0F0; // Light blue.
-	
+
 	Real radius = pMapObj->getThingTemplate()->friend_calcVisionRange();
 
 	Coord3D pos = *pMapObj->getLocation();
@@ -1785,7 +1783,7 @@ void DrawObject::updateVBWithWeaponRange(MapObject *pMapObj, CameraClass* camera
 
   const unsigned long colors[WEAPONSLOT_COUNT] = {0xFF00FF00, 0xFFE0F00A, 0xFFFF0000}; // Green, Yellow, Red
 
-	
+
 	Coord3D pos = *pMapObj->getLocation();
 	if (TheTerrainRenderObject) {
 		// Make sure that the position is on the terrain.
@@ -1821,11 +1819,11 @@ void DrawObject::updateVBWithSoundRanges(MapObject *pMapObj, CameraClass* camera
   if (!pMapObj || !m_lineRenderer) {
     return;
   }
-  
+
   const unsigned long colors[2] = {0xFF0000FF, 0xFFFF00FF}; // Blue and purple
                                                             // Colors match those used in W3DView.cpp
 
-  
+
   Coord3D pos = *pMapObj->getLocation();
   if (TheTerrainRenderObject) {
     // Make sure that the position is on the terrain.
@@ -1895,9 +1893,9 @@ void DrawObject::updateVBWithSoundRanges(MapObject *pMapObj, CameraClass* camera
         DEBUG_CRASH( ("TheAudio is NULL! Can't draw sound circles") );
         return;
       }
-      
+
       audioInfo = TheAudio->findAudioEventInfo( event->getEventName() );
-      
+
       if ( audioInfo == NULL )
       {
         DEBUG_CRASH( ("Default ambient sound %s has no info; Can't draw sound circles", event->getEventName().str() ) );
@@ -1920,7 +1918,7 @@ void DrawObject::updateVBWithSoundRanges(MapObject *pMapObj, CameraClass* camera
   if ( exists && customized )
   {
     Real valReal;
-   
+
     valReal = properties->getReal( TheKey_objectSoundAmbientMinRange, &exists );
     if ( exists )
     {
@@ -1931,7 +1929,7 @@ void DrawObject::updateVBWithSoundRanges(MapObject *pMapObj, CameraClass* camera
     {
       maxRadius = valReal;
     }
-  } 
+  }
   addCircleToLineRenderer(pos, minRadius, SOUND_RANGE_LINE_WIDTH, colors[0], camera );
   addCircleToLineRenderer(pos, maxRadius, SOUND_RANGE_LINE_WIDTH, colors[1], camera );
 }
@@ -1948,8 +1946,8 @@ void DrawObject::updateVBWithTestArtHighlight(MapObject *pMapObj, CameraClass* c
 	}
 
 	unsigned long color = 0xFFA000A0; // Purple
-	
-	
+
+
 	Coord3D pos = *pMapObj->getLocation();
 	if (TheTerrainRenderObject) {
 		// Make sure that the position is on the terrain.
@@ -1991,7 +1989,7 @@ void DrawObject::updateVBWithTestArtHighlight(MapObject *pMapObj, CameraClass* c
 // MLL C&C3
 bool DrawObject::worldToScreen(const Coord3D *w, ICoord2D *s, CameraClass* camera)
 {
-	
+
 	if ((w == NULL) || (s == NULL) || (camera == NULL)) {
 		return false;
 	}
@@ -2003,7 +2001,7 @@ bool DrawObject::worldToScreen(const Coord3D *w, ICoord2D *s, CameraClass* camer
 	camera->Project(screen, world);
 
 	//
-	// note that the screen coord returned from the project W3D camera 
+	// note that the screen coord returned from the project W3D camera
 	// gave us a screen coords that range from (-1,-1) bottom left to
 	// (1,1) top right ... we are turning that into (0,0) upper left
 	// coords now
@@ -2011,15 +2009,15 @@ bool DrawObject::worldToScreen(const Coord3D *w, ICoord2D *s, CameraClass* camer
 	W3DLogicalScreenToPixelScreen(screen.X, screen.Y, &s->x, &s->y, m_winSize.x, m_winSize.y);
 
 	if ((screen.X > 2.0f) || (screen.Y > 2.0f) || (screen.X < -2.0f) || (screen.Y < -2.0f)) {
-		// Too far off the screen. 
+		// Too far off the screen.
 		return false;
 	}
 
 	return (true);
-}  
+}
 
 /** Tells drawobject where the tool is located, so it can draw feedback. */
-void DrawObject::setFeedbackPos(Coord3D pos) 
+void DrawObject::setFeedbackPos(Coord3D pos)
 {
 	m_feedbackPoint = pos;
 	// center on half pixel for even widths.
@@ -2034,7 +2032,7 @@ void DrawObject::setFeedbackPos(Coord3D pos)
 	if (ndx.x != m_cellCenter.x || ndx.y != m_cellCenter.y) {
 		m_cellCenter = ndx;
 		if (m_toolWantsFeedback && !m_disableFeedback) {
-			WbView3d *pView = pDoc->Get3DView();		
+			WbView3d *pView = pDoc->Get3DView();
 			if (pView) {
 				pView->Invalidate(false);
 			}
@@ -2048,19 +2046,13 @@ void DrawObject::setRampFeedbackParms(const Coord3D *start, const Coord3D *end,
 	if (!(start && end)) {
 		return;
 	}
-	
+
 	m_rampStartPoint = *start;
 	m_rampEndPoint = *end;
 	m_rampWidth = rampWidth;
-	
-}
-
 
-// This routine fails to draw poly triggers in some cases when optimized.
-// So just shut it off for now.  The failure case was new doc, add a poly trigger.
-// Adding any other object fixed the problem.	jba
+}
 
-#pragma optimize("", off)
 
 bool _skip_drawobject_render = false;
 
@@ -2078,7 +2070,7 @@ if (_skip_drawobject_render) {
 		ASSERT(m_lineRenderer);
 		CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 		ASSERT(pDoc);
-		WbView3d *pView = pDoc->Get3DView(); 
+		WbView3d *pView = pDoc->Get3DView();
 		ASSERT(pView);
 		m_winSize = pView->getActualWinSize();
 		m_lineRenderer->Set_Coordinate_Range(RectClass(0, 0, m_winSize.x, m_winSize.y));
@@ -2108,7 +2100,7 @@ if (_skip_drawobject_render) {
 
 		//WST Variables below are for optimization to reduce VB updates which are extremely slow
 		// Optimization strategy is to remember last setting and avoid re-updating unless it changed
-		int rememberLastSettingVB1 = -99999;	
+		int rememberLastSettingVB1 = -99999;
 		int rememberLastSettingVB2 = -99999;
 
 		MapObject *pMapObj;
@@ -2127,12 +2119,12 @@ if (pMapObj->isSelected()) {
 				loc.z += TheTerrainRenderObject->getHeightMapHeight(loc.x, loc.y, NULL);
 			}
 			// Cull.
-			//SphereClass bounds(Vector3(loc.x, loc.y, loc.z), THE_RADIUS); 
+			//SphereClass bounds(Vector3(loc.x, loc.y, loc.z), THE_RADIUS);
 			//if (rinfo.Camera.Cull_Sphere(bounds)) {
 			//	continue;
 			//}
 			Bool doArrow = true;
-			if (pMapObj->getFlag(FLAG_ROAD_FLAGS) || pMapObj->getFlag(FLAG_BRIDGE_FLAGS) || pMapObj->isWaypoint()) 
+			if (pMapObj->getFlag(FLAG_ROAD_FLAGS) || pMapObj->getFlag(FLAG_BRIDGE_FLAGS) || pMapObj->isWaypoint())
 			{
 				doArrow = false;
 			}
@@ -2147,25 +2139,25 @@ if (pMapObj->isSelected()) {
 				if (pMapObj->isSelected()) {
 					if (doArrow && m_drawBoundingBoxes) {
 						linesToRender = true;
-						updateVBWithBoundingBox(pMapObj, &rinfo.Camera); 
+						updateVBWithBoundingBox(pMapObj, &rinfo.Camera);
 					}
 					if (doArrow && m_drawSightRanges) {
 						linesToRender = true;
-						updateVBWithSightRange(pMapObj, &rinfo.Camera); 
+						updateVBWithSightRange(pMapObj, &rinfo.Camera);
 					}
 					if (doArrow && m_drawWeaponRanges) {
 						linesToRender = true;
-						updateVBWithWeaponRange(pMapObj, &rinfo.Camera); 
+						updateVBWithWeaponRange(pMapObj, &rinfo.Camera);
 					}
           if (doArrow && m_drawSoundRanges) {
             linesToRender = true;
-            updateVBWithSoundRanges(pMapObj, &rinfo.Camera); 
+            updateVBWithSoundRanges(pMapObj, &rinfo.Camera);
           }
 				}
 
 				if (doArrow && m_drawTestArtHighlight) {
 					linesToRender = true;
-					updateVBWithTestArtHighlight(pMapObj, &rinfo.Camera); 
+					updateVBWithTestArtHighlight(pMapObj, &rinfo.Camera);
 				}
 
 				if (!m_drawObjects) {
@@ -2178,7 +2170,7 @@ if (pMapObj->isSelected()) {
 
 			if (count&1) {
 				int setting = pMapObj->getColor();
-					
+
 				if (doArrow) {
 					setting |= (1<<25);
 				}
@@ -2191,10 +2183,10 @@ if (pMapObj->isSelected()) {
 					updateVB(m_vertexBufferTile1,pMapObj->getColor(), doArrow, doDiamond);
 				}
 				DX8Wrapper::Set_Vertex_Buffer(m_vertexBufferTile1);
-				
+
 			} else {
 				int setting = pMapObj->getColor();
-					
+
 				if (doArrow) {
 					setting |= (1<<25);
 				}
@@ -2208,7 +2200,7 @@ if (pMapObj->isSelected()) {
 				}
 				DX8Wrapper::Set_Vertex_Buffer(m_vertexBufferTile2);
 			}
-			
+
 			///@todo - remove the istree stuff, or get the info from the thing template.  jba.
 			Bool isTree = false;
 
@@ -2222,15 +2214,15 @@ if (pMapObj->isSelected()) {
 			int polyCount = NUM_TRI;
 			if (!pMapObj->isSelected()) {
 				polyCount -= NUM_ARROW_TRI+NUM_SELECT_TRI;
-			} 
-						
+			}
+
 			DX8Wrapper::Set_Transform(D3DTS_WORLD,tm);
 			if (isTree) {
 				DX8Wrapper::Draw_Triangles(	NUM_TRI*3,polyCount, 0,	(m_numTriangles*3));
 			} else {
 				DX8Wrapper::Draw_Triangles(	0,polyCount, 0,	(m_numTriangles*3));
 			}
-			
+
 			count++;
 		}
 	}
@@ -2251,7 +2243,7 @@ if (pMapObj->isSelected()) {
 					loc.x = iLoc.x;
 					loc.y = iLoc.y;
 					loc.z = TheTerrainRenderObject->getHeightMapHeight(loc.x, loc.y, NULL);
-					SphereClass bounds(Vector3(loc.x, loc.y, loc.z), THE_RADIUS); 
+					SphereClass bounds(Vector3(loc.x, loc.y, loc.z), THE_RADIUS);
 					if (rinfo.Camera.Cull_Sphere(bounds)) {
 						continue;
 					}
@@ -2301,14 +2293,14 @@ if (pMapObj->isSelected()) {
 
 
  	if (BuildListTool::isActive()) for (i=0; i<TheSidesList->getNumSides(); i++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(i);
 		for (BuildListInfo *pBuild = pSide->getBuildList(); pBuild; pBuild = pBuild->getNext()) {
 			Coord3D loc = *pBuild->getLocation();
 			if (TheTerrainRenderObject) {
 				loc.z += TheTerrainRenderObject->getHeightMapHeight(loc.x, loc.y, NULL);
 			}
 			// Cull.
-			SphereClass bounds(Vector3(loc.x, loc.y, loc.z), THE_RADIUS); 
+			SphereClass bounds(Vector3(loc.x, loc.y, loc.z), THE_RADIUS);
 			if (rinfo.Camera.Cull_Sphere(bounds)) {
 				continue;
 			}
@@ -2337,14 +2329,14 @@ if (pMapObj->isSelected()) {
 				polyCountA -= NUM_ARROW_TRI+NUM_SELECT_TRI;
 			}
 
-#if 1	
+#if 1
 			DX8Wrapper::Set_Transform(D3DTS_WORLD,tmXX);
 			DX8Wrapper::Draw_Triangles(	0,polyCountA, 0,	(m_numTriangles*3));
 #endif
 
 		}
 	}
-	
+
 	DX8Wrapper::Set_Index_Buffer(m_indexBuffer,0);
  	DX8Wrapper::Set_Vertex_Buffer(m_vertexBufferWater);
 	Matrix3D tmReset(Transform);
@@ -2457,14 +2449,14 @@ if (pMapObj->isSelected()) {
 		m_lineRenderer->Reset();
 	}
 }
-#pragma optimize("", on)
 
-void BuildRectFromSegmentAndWidth(const Coord3D* start, const Coord3D* end, Real width, 
+
+void BuildRectFromSegmentAndWidth(const Coord3D* start, const Coord3D* end, Real width,
 																	Coord3D* outBL, Coord3D* outTL, Coord3D* outBR, Coord3D* outTR)
 {
 /*
-	Here's how we're generating the surface to render: 
- 		1) Assign longSeg to be the segment from rampStartPoint to rampStopPoint 
+	Here's how we're generating the surface to render:
+ 		1) Assign longSeg to be the segment from rampStartPoint to rampStopPoint
  		2) Cross product with the segment (0, 0, 1)
  		3) Normalize to get the unit vector (which is in the XY plane.)
  		4) Multiply the unit vector by the ramp width / 2
@@ -2477,7 +2469,7 @@ void BuildRectFromSegmentAndWidth(const Coord3D* start, const Coord3D* end, Real
 		return;
 	}
 
-	// 1) 
+	// 1)
 	Vector3 longSeg;
 	if (start->length() > end->length()) {
 		longSeg.X = end->x - start->x;
@@ -2498,7 +2490,7 @@ void BuildRectFromSegmentAndWidth(const Coord3D* start, const Coord3D* end, Real
 	// 3)
 	unitVec.Normalize();
 
-	// 4) 
+	// 4)
 	unitVec.Scale(Vector3(width, width, width));
 
 	Coord3D bl = { start->x + unitVec.X, start->y + unitVec.Y, start->z + unitVec.Z };
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/EditAction.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/EditAction.cpp
index d34968b3702..bae26db5dab 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/EditAction.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/EditAction.cpp
@@ -25,11 +25,6 @@
 #include "EditParameter.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 /////////////////////////////////////////////////////////////////////////////
 // EditAction dialog
@@ -71,7 +66,7 @@ static HTREEITEM findOrAdd(CTreeCtrl *tree, HTREEITEM parent, const char *pLabel
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		tree->GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -86,7 +81,7 @@ static HTREEITEM findOrAdd(CTreeCtrl *tree, HTREEITEM parent, const char *pLabel
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = (char*)pLabel;
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = tree->InsertItem(&ins);
 	return(child);
 }
@@ -95,14 +90,14 @@ static HTREEITEM findOrAdd(CTreeCtrl *tree, HTREEITEM parent, const char *pLabel
 // EditAction message handlers
 
 
-BOOL EditAction::OnInitDialog() 
+BOOL EditAction::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
 
 //	CDC *pDc =GetDC();
 	CRect rect;
-	
+
 	CTreeCtrl *pTree = (CTreeCtrl *)GetDlgItem(IDC_ACTION_TREE);
 	pTree->GetWindowRect(&rect);
 
@@ -121,7 +116,7 @@ BOOL EditAction::OnInitDialog()
 	m_myEditCtrl.ShowWindow(SW_SHOW);
 	m_myEditCtrl.SetEventMask(m_myEditCtrl.GetEventMask() | ENM_LINK | ENM_SELCHANGE | ENM_KEYEVENTS);
 
-	Int i;	
+	Int i;
 	HTREEITEM selItem = NULL;
 	for (i=0; i<ScriptAction::NUM_ITEMS; i++) {
 		const ActionTemplate *pTemplate = TheScriptEngine->getActionTemplate(i);
@@ -131,11 +126,11 @@ BOOL EditAction::OnInitDialog()
 		Int count = 0;
 		HTREEITEM parent = TVI_ROOT;
 		do {
-			count = 0; 
+			count = 0;
 			const char *nameStart = name;
 			while (*name && *name != '/') {
 				count++;
-				name++;								 
+				name++;
 			}
 			if (*name=='/') {
 				count++;
@@ -145,8 +140,7 @@ BOOL EditAction::OnInitDialog()
 				count = 0;
 			}
 			if (count>0) {
-				strncpy(prefix, nameStart, count);
-				prefix[count-1] = 0;
+				strlcpy(prefix, nameStart, count);
 				parent = findOrAdd(&m_actionTreeView, parent, prefix);
 			}
 		} while (count>0);
@@ -158,7 +152,7 @@ BOOL EditAction::OnInitDialog()
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = i;
 		ins.item.pszText = (char*)name;
-		ins.item.cchTextMax = 0;				
+		ins.item.cchTextMax = 0;
 		HTREEITEM item = m_actionTreeView.InsertItem(&ins);
 		if (i == m_action->getActionType()) {
 			selItem = item;
@@ -169,11 +163,11 @@ BOOL EditAction::OnInitDialog()
 		if (pTemplate->getName2().isEmpty()) continue;
 		parent = TVI_ROOT;
 		do {
-			count = 0; 
+			count = 0;
 			const char *nameStart = name;
 			while (*name && *name != '/') {
 				count++;
-				name++;								 
+				name++;
 			}
 			if (*name=='/') {
 				count++;
@@ -183,8 +177,7 @@ BOOL EditAction::OnInitDialog()
 				count = 0;
 			}
 			if (count>0) {
-				strncpy(prefix, nameStart, count);
-				prefix[count-1] = 0;
+				strlcpy(prefix, nameStart, count);
 				parent = findOrAdd(&m_actionTreeView, parent, prefix);
 			}
 		} while (count>0);
@@ -195,12 +188,12 @@ BOOL EditAction::OnInitDialog()
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = i;
 		ins.item.pszText = (char*)name;
-		ins.item.cchTextMax = 0;				
+		ins.item.cchTextMax = 0;
 		m_actionTreeView.InsertItem(&ins);
 	}
 	m_actionTreeView.Select(selItem, TVGN_FIRSTVISIBLE);
 	m_actionTreeView.SelectItem(selItem);
-	m_action->setWarnings(false); 
+	m_action->setWarnings(false);
 	m_myEditCtrl.SetWindowText(m_action->getUiText().str());
 	m_myEditCtrl.SetSel(-1, -1);
 	formatScriptActionText(0);
@@ -290,7 +283,7 @@ void EditAction::formatScriptActionText(Int parameterNdx) {
 		GetDlgItem(IDC_WARNINGS_CAPTION)->EnableWindow(true);
 		GetDlgItem(IDC_WARNINGS)->SetWindowText(warningText.str());
 	}
-		
+
 	m_modifiedTextColor = false;
 	m_myEditCtrl.SetSel(startSel, endSel);
 	m_curLinkChrg.cpMax = endSel;
@@ -300,13 +293,13 @@ void EditAction::formatScriptActionText(Int parameterNdx) {
 
 
 
-BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
-{																											
-	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam; 	 
+BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
+{
+	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 
 	// Handle events from the tree control.
 	if (pHdr->hdr.idFrom == IDC_ACTION_TREE) {
-		if (pHdr->hdr.code == TVN_SELCHANGED) {							
+		if (pHdr->hdr.code == TVN_SELCHANGED) {
 			char buffer[_MAX_PATH];
 			HTREEITEM hItem = m_actionTreeView.GetSelectedItem();
 			TVITEM item;
@@ -314,7 +307,7 @@ BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_actionTreeView.GetItem(&item);
 			if (item.lParam >= 0) {
 				enum ScriptAction::ScriptActionType actionType = (enum ScriptAction::ScriptActionType)item.lParam;
@@ -323,10 +316,10 @@ BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 					m_myEditCtrl.SetWindowText(m_action->getUiText().str());
 					formatScriptActionText(0);
 				}
-			}	
+			}
 		} else if (pHdr->hdr.code == TVN_KEYDOWN) {
 			NMTVKEYDOWN	*pKey = (NMTVKEYDOWN*)lParam;
-			Int key = pKey->wVKey;	
+			Int key = pKey->wVKey;
 			if (key==VK_SHIFT || key==VK_SPACE) {
 				HTREEITEM hItem = m_actionTreeView.GetSelectedItem();
 				if (!m_actionTreeView.ItemHasChildren(hItem)) {
@@ -338,7 +331,7 @@ BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			return 0;
 		}
 		return TRUE;
-	}  
+	}
 
 	// Handle events from the rich edit control containg the action pieces.
 	if (LOWORD(wParam) == IDC_RICH_EDIT_HERE+1) {
@@ -360,7 +353,7 @@ BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 					}
 					if (i<m_action->getNumParameters()) {
 						numChars = m_action->getParameter(i)->getUiText().getLength();
-						match = (curChar+numChars/2 > chrg.cpMin && curChar+numChars/2 < chrg.cpMax); 
+						match = (curChar+numChars/2 > chrg.cpMin && curChar+numChars/2 < chrg.cpMax);
 						if (match) {
 							m_curEditParameter = i;
 							break;
@@ -368,10 +361,10 @@ BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 						curChar += numChars;
 					}
 				}
-				if (pLink->msg == WM_LBUTTONDOWN) 
+				if (pLink->msg == WM_LBUTTONDOWN)
 				{
 					// Determine which parameter.
-					if (match) 
+					if (match)
 					{
 						if( m_action->getParameter( m_curEditParameter )->getParameterType() == Parameter::COMMANDBUTTON_ABILITY )
 						{
@@ -453,7 +446,7 @@ BOOL EditAction::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 
 /** Not actually a timer - just used to send a delayed message to self because rich
 edit control is stupid.  jba. */
-void EditAction::OnTimer(UINT nIDEvent) 
+void EditAction::OnTimer(UINT nIDEvent)
 {
 	m_myEditCtrl.SetWindowText(m_action->getUiText().str());
 	formatScriptActionText(m_curEditParameter);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/EditCondition.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/EditCondition.cpp
index e74a8dd1216..6df3962f51b 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/EditCondition.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/EditCondition.cpp
@@ -25,16 +25,11 @@
 #include "EditParameter.h"
 #include "GameLogic/ScriptEngine.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 LRESULT CMyTreeCtrl::WindowProc(	UINT message, WPARAM wParam, LPARAM lParam )
 {
 	if (message==WM_KEYDOWN) {
-		Int nVirtKey = (int) wParam;    // virtual-key code 
+		Int nVirtKey = (int) wParam;    // virtual-key code
 		if (nVirtKey == ' ') {
 			return 0;
 		}
@@ -83,7 +78,7 @@ static HTREEITEM findOrAdd(CTreeCtrl *tree, HTREEITEM parent, const char *pLabel
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		tree->GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -98,7 +93,7 @@ static HTREEITEM findOrAdd(CTreeCtrl *tree, HTREEITEM parent, const char *pLabel
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = (char*)pLabel;
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = tree->InsertItem(&ins);
 	return(child);
 }
@@ -107,14 +102,14 @@ static HTREEITEM findOrAdd(CTreeCtrl *tree, HTREEITEM parent, const char *pLabel
 // EditCondition message handlers
 
 
-BOOL EditCondition::OnInitDialog() 
+BOOL EditCondition::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
 
 //	CDC *pDc =GetDC();
 	CRect rect;
-	
+
 	CTreeCtrl *pTree = (CTreeCtrl *)GetDlgItem(IDC_CONDITION_TREE);
 	pTree->GetWindowRect(&rect);
 
@@ -133,7 +128,7 @@ BOOL EditCondition::OnInitDialog()
 	m_myEditCtrl.ShowWindow(SW_SHOW);
 	m_myEditCtrl.SetEventMask(m_myEditCtrl.GetEventMask() | ENM_LINK | ENM_SELCHANGE | ENM_KEYEVENTS);
 
-	Int i;	
+	Int i;
 	HTREEITEM selItem = NULL;
 	for (i=0; i<Condition::NUM_ITEMS; i++) {
 		const ConditionTemplate *pTemplate = TheScriptEngine->getConditionTemplate(i);
@@ -143,11 +138,11 @@ BOOL EditCondition::OnInitDialog()
 		Int count = 0;
 		HTREEITEM parent = TVI_ROOT;
 		do {
-			count = 0; 
+			count = 0;
 			const char *nameStart = name;
 			while (*name && *name != '/') {
 				count++;
-				name++;								 
+				name++;
 			}
 			if (*name=='/') {
 				count++;
@@ -157,8 +152,7 @@ BOOL EditCondition::OnInitDialog()
 				count = 0;
 			}
 			if (count>0) {
-				strncpy(prefix, nameStart, count);
-				prefix[count-1] = 0;
+				strlcpy(prefix, nameStart, count);
 				parent = findOrAdd(&m_conditionTreeView, parent, prefix);
 			}
 		} while (count>0);
@@ -170,7 +164,7 @@ BOOL EditCondition::OnInitDialog()
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = i;
 		ins.item.pszText = (char*)name;
-		ins.item.cchTextMax = 0;				
+		ins.item.cchTextMax = 0;
 		HTREEITEM item = m_conditionTreeView.InsertItem(&ins);
 		if (i == m_condition->getConditionType()) {
 			selItem = item;
@@ -181,11 +175,11 @@ BOOL EditCondition::OnInitDialog()
 		if (pTemplate->getName2().isEmpty()) continue;
 		parent = TVI_ROOT;
 		do {
-			count = 0; 
+			count = 0;
 			const char *nameStart = name;
 			while (*name && *name != '/') {
 				count++;
-				name++;								 
+				name++;
 			}
 			if (*name=='/') {
 				count++;
@@ -195,8 +189,7 @@ BOOL EditCondition::OnInitDialog()
 				count = 0;
 			}
 			if (count>0) {
-				strncpy(prefix, nameStart, count);
-				prefix[count-1] = 0;
+				strlcpy(prefix, nameStart, count);
 				parent = findOrAdd(&m_conditionTreeView, parent, prefix);
 			}
 		} while (count>0);
@@ -207,12 +200,12 @@ BOOL EditCondition::OnInitDialog()
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = i;
 		ins.item.pszText = (char*)name;
-		ins.item.cchTextMax = 0;				
+		ins.item.cchTextMax = 0;
 		m_conditionTreeView.InsertItem(&ins);
 	}
 	m_conditionTreeView.Select(selItem, TVGN_FIRSTVISIBLE);
 	m_conditionTreeView.SelectItem(selItem);
-	m_condition->setWarnings(false); 
+	m_condition->setWarnings(false);
 	m_myEditCtrl.SetWindowText(m_condition->getUiText().str());
 	m_myEditCtrl.SetSel(-1, -1);
 	formatConditionText(0);
@@ -302,7 +295,7 @@ void EditCondition::formatConditionText(Int parameterNdx) {
 		GetDlgItem(IDC_WARNINGS_CAPTION)->EnableWindow(true);
 		GetDlgItem(IDC_WARNINGS)->SetWindowText(warningText.str());
 	}
-		
+
 	m_modifiedTextColor = false;
 	m_myEditCtrl.SetSel(startSel, endSel);
 	m_curLinkChrg.cpMax = endSel;
@@ -312,13 +305,13 @@ void EditCondition::formatConditionText(Int parameterNdx) {
 
 
 
-BOOL EditCondition::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
-{																											
-	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam; 	 
+BOOL EditCondition::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
+{
+	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 
 	// Handle events from the tree control.
 	if (pHdr->hdr.idFrom == IDC_CONDITION_TREE) {
-		if (pHdr->hdr.code == TVN_SELCHANGED) {							
+		if (pHdr->hdr.code == TVN_SELCHANGED) {
 			char buffer[_MAX_PATH];
 			HTREEITEM hItem = m_conditionTreeView.GetSelectedItem();
 			TVITEM item;
@@ -326,7 +319,7 @@ BOOL EditCondition::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_conditionTreeView.GetItem(&item);
 			if (item.lParam >= 0) {
 				enum Condition::ConditionType conditionType = (enum Condition::ConditionType)item.lParam;
@@ -335,10 +328,10 @@ BOOL EditCondition::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 					m_myEditCtrl.SetWindowText(m_condition->getUiText().str());
 					formatConditionText(0);
 				}
-			}	
+			}
 		} else if (pHdr->hdr.code == TVN_KEYDOWN) {
 			NMTVKEYDOWN	*pKey = (NMTVKEYDOWN*)lParam;
-			Int key = pKey->wVKey;	
+			Int key = pKey->wVKey;
 			if (key==VK_SHIFT || key==VK_SPACE) {
 				HTREEITEM hItem = m_conditionTreeView.GetSelectedItem();
 				if (!m_conditionTreeView.ItemHasChildren(hItem)) {
@@ -350,7 +343,7 @@ BOOL EditCondition::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			return 0;
 		}
 		return TRUE;
-	}  
+	}
 
 	// Handle events from the rich edit control containg the condition pieces.
 	if (LOWORD(wParam) == IDC_RICH_EDIT_HERE+1) {
@@ -372,7 +365,7 @@ BOOL EditCondition::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 					}
 					if (i<m_condition->getNumParameters()) {
 						numChars = m_condition->getParameter(i)->getUiText().getLength();
-						match = (curChar+numChars/2 > chrg.cpMin && curChar+numChars/2 < chrg.cpMax); 
+						match = (curChar+numChars/2 > chrg.cpMin && curChar+numChars/2 < chrg.cpMax);
 						if (match) {
 							m_curEditParameter = i;
 							break;
@@ -454,11 +447,11 @@ BOOL EditCondition::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
-void EditCondition::OnSelchangeConditionType() 
+void EditCondition::OnSelchangeConditionType()
 {
 	CComboBox *pCmbo = (CComboBox *)GetDlgItem(IDC_CONDITION_TYPE);
 	Int index = 0;
-	CString str; 
+	CString str;
 	pCmbo->GetWindowText(str);
 	Int i;
 	for (i=0; i<ScriptAction::NUM_ITEMS; i++) {
@@ -475,7 +468,7 @@ void EditCondition::OnSelchangeConditionType()
 
 /** Not actually a timer - just used to send a delayed message to self because rich
 edit control is stupid.  jba. */
-void EditCondition::OnTimer(UINT nIDEvent) 
+void EditCondition::OnTimer(UINT nIDEvent)
 {
 	m_myEditCtrl.SetWindowText(m_condition->getUiText().str());
 	formatConditionText(m_curEditParameter);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/EditCoordParameter.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/EditCoordParameter.cpp
index dd88061a370..7176f65ce43 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/EditCoordParameter.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/EditCoordParameter.cpp
@@ -56,10 +56,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // EditCoordParameter message handlers
 
-BOOL EditCoordParameter::OnInitDialog() 
+BOOL EditCoordParameter::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CEdit *pEditX = (CEdit *)GetDlgItem(IDC_EDIT_X);
 	CEdit *pEditY = (CEdit *)GetDlgItem(IDC_EDIT_Y);
 	CEdit *pEditZ = (CEdit *)GetDlgItem(IDC_EDIT_Z);
@@ -77,7 +77,7 @@ BOOL EditCoordParameter::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void EditCoordParameter::OnOK() 
+void EditCoordParameter::OnOK()
 {
 	CEdit *pEditX = (CEdit *)GetDlgItem(IDC_EDIT_X);
 	CEdit *pEditY = (CEdit *)GetDlgItem(IDC_EDIT_Y);
@@ -113,7 +113,7 @@ void EditCoordParameter::OnOK()
 	CDialog::OnOK();
 }
 
-void EditCoordParameter::OnCancel() 
+void EditCoordParameter::OnCancel()
 {
 
 	CDialog::OnCancel();
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/EditGroup.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/EditGroup.cpp
index 64637b0200c..b0020a3f38d 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/EditGroup.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/EditGroup.cpp
@@ -55,7 +55,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // EditGroup message handlers
 
-void EditGroup::OnOK() 
+void EditGroup::OnOK()
 {
 	CString name;
 	GetDlgItem(IDC_GROUP_NAME)->GetWindowText(name);
@@ -67,10 +67,10 @@ void EditGroup::OnOK()
 	CDialog::OnOK();
 }
 
-BOOL EditGroup::OnInitDialog() 
+BOOL EditGroup::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CButton *pButton = (CButton*)GetDlgItem(IDC_GROUP_ACTIVE);
 	pButton->SetCheck(m_scriptGroup->isActive()?1:0);
 	pButton = (CButton*)GetDlgItem(IDC_GROUP_SUBROUTINE);
@@ -78,7 +78,7 @@ BOOL EditGroup::OnInitDialog()
 
 	CEdit *pEdit = (CEdit*)GetDlgItem(IDC_GROUP_NAME);
 	pEdit->SetWindowText(m_scriptGroup->getName().str());
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/EditObjectParameter.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/EditObjectParameter.cpp
index 6dc870bfc46..4612838395e 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/EditObjectParameter.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/EditObjectParameter.cpp
@@ -64,10 +64,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // EditObjectParameter message handlers
 
-BOOL EditObjectParameter::OnInitDialog() 
+BOOL EditObjectParameter::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 
 	CWnd *pWnd = GetDlgItem(IDC_OBJECT_TREEVIEW);
 	CRect rect;
@@ -87,7 +87,7 @@ BOOL EditObjectParameter::OnInitDialog()
 	{
 		addObject(tTemplate);
 
-	}  // end for tTemplate
+	}
 
 
 	addObjectLists();
@@ -100,13 +100,12 @@ BOOL EditObjectParameter::OnInitDialog()
 //-------------------------------------------------------------------------------------------------
 void EditObjectParameter::addObject( const ThingTemplate *thingTemplate  )
 {
-	char buffer[ _MAX_PATH ];
 	HTREEITEM parent = TVI_ROOT;
 	const char *leafName;
 	//
 	// if we have an thing template in mapObject, we've read it from the new INI database,
 	// we will sort those items into the tree based on properties of the template that
-	// make it easier for us to browse when building levels 
+	// make it easier for us to browse when building levels
 	//
 	// Feel free to reorganize how this tree is constructed from the template
 	// data at will, whatever makes it easier for design
@@ -117,12 +116,11 @@ void EditObjectParameter::addObject( const ThingTemplate *thingTemplate  )
 		// first check for test sorted objects
 		if( thingTemplate->getEditorSorting() == ES_TEST )
 			parent = findOrAdd( parent, "TEST" );
-	
+
 		// first sort by Side, either create or find the tree item with matching side name
 		AsciiString side = thingTemplate->getDefaultOwningSide();
-		DEBUG_ASSERTCRASH(!side.isEmpty(), ("NULL default side in template\n") );
-		strcpy( buffer, side.str() );
-		parent = findOrAdd( parent, buffer );
+		DEBUG_ASSERTCRASH(!side.isEmpty(), ("NULL default side in template") );
+		parent = findOrAdd( parent, side.str());
 
 		// next tier uses the editor sorting that design can specify in the INI
 		EditorSortingType i = ES_FIRST;
@@ -137,9 +135,9 @@ void EditObjectParameter::addObject( const ThingTemplate *thingTemplate  )
 				parent = findOrAdd( parent, EditorSortingNames[ i ] );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		if( i == ES_NUM_SORTING_TYPES )
 			parent = findOrAdd( parent, "UNSORTED" );
@@ -147,7 +145,7 @@ void EditObjectParameter::addObject( const ThingTemplate *thingTemplate  )
 		// the leaf name is the name of the template
 		leafName = thingTemplate->getName().str();
 
-	}  // end if
+	}
 
 	// add to the tree view
 	if( leafName )
@@ -160,7 +158,7 @@ void EditObjectParameter::addObject( const ThingTemplate *thingTemplate  )
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = 0;
 		ins.item.pszText = (char*)leafName;
-		ins.item.cchTextMax = strlen(leafName)+2;				
+		ins.item.cchTextMax = strlen(leafName)+2;
 		m_objectTreeView.InsertItem(&ins);
 
 	}
@@ -179,7 +177,7 @@ void EditObjectParameter::addObjectLists( )
 
 	std::vector<AsciiString> strings;
 	EditParameter::loadObjectTypeList(NULL, &strings);
-	
+
 	Int numItems = strings.size();
 
 	for (Int i = 0; i < numItems; ++i) {
@@ -197,7 +195,7 @@ void EditObjectParameter::addObjectLists( )
 			ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 			ins.item.lParam = 0;
 			ins.item.pszText = (char*)leafName;
-			ins.item.cchTextMax = strlen(leafName)+2;				
+			ins.item.cchTextMax = strlen(leafName)+2;
 			m_objectTreeView.InsertItem(&ins);
 		}
 	}
@@ -215,7 +213,7 @@ HTREEITEM EditObjectParameter::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_objectTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -230,20 +228,20 @@ HTREEITEM EditObjectParameter::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = (char*)pLabel;
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_objectTreeView.InsertItem(&ins);
 	return(child);
 }
 
-BOOL EditObjectParameter::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
-{																											
-	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam; 	 
+BOOL EditObjectParameter::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
+{
+	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 
 	// Handle events from the tree control.
 	if (pHdr->hdr.idFrom == IDC_TERRAIN_TREEVIEW) {
 		if (pHdr->hdr.code == TVN_KEYDOWN) {
 			NMTVKEYDOWN	*pKey = (NMTVKEYDOWN*)lParam;
-			Int key = pKey->wVKey;	
+			Int key = pKey->wVKey;
 			if (key==VK_SHIFT || key==VK_SPACE) {
 				HTREEITEM hItem = m_objectTreeView.GetSelectedItem();
 				if (!m_objectTreeView.ItemHasChildren(hItem)) {
@@ -258,7 +256,7 @@ BOOL EditObjectParameter::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResul
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
-void EditObjectParameter::OnOK() 
+void EditObjectParameter::OnOK()
 {
 	char buffer[_MAX_PATH];
 	HTREEITEM hItem = m_objectTreeView.GetSelectedItem();
@@ -272,7 +270,7 @@ void EditObjectParameter::OnOK()
 	item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 	item.hItem = hItem;
 	item.pszText = buffer;
-	item.cchTextMax = sizeof(buffer)-2;				
+	item.cchTextMax = sizeof(buffer)-2;
 	m_objectTreeView.GetItem(&item);
 	AsciiString objName = buffer;
 	// We used to try to find the TT here, but now we don't because we
@@ -281,7 +279,7 @@ void EditObjectParameter::OnOK()
 	CDialog::OnOK();
 }
 
-void EditObjectParameter::OnCancel() 
+void EditObjectParameter::OnCancel()
 {
 
 	CDialog::OnCancel();
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/EditParameter.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/EditParameter.cpp
index cedf8e96a8c..94fb3dad935 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/EditParameter.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/EditParameter.cpp
@@ -64,11 +64,6 @@
 #include "W3DDevice/GameClient/W3DGameFont.h"
 #include "W3DDevice/GameClient/HeightMap.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // TYPE DEFINES ///////////////////////////////////////////////////////////////////////////////////
 #define WORLDBUILDER_FONT_FILENAME		"GUIEFont.txt"
@@ -110,23 +105,23 @@ END_MESSAGE_MAP()
 // EditParameter message handlers
 SidesList *EditParameter::m_sidesListP = NULL;
 
-Int EditParameter::edit( Parameter *pParm, Int keyPressed, AsciiString unitName ) 
+Int EditParameter::edit( Parameter *pParm, Int keyPressed, AsciiString unitName )
 {
-	if (pParm->getParameterType() == Parameter::COORD3D) 
+	if (pParm->getParameterType() == Parameter::COORD3D)
 	{
 		EditCoordParameter editCoordDlg;
 		editCoordDlg.m_parameter = pParm;
 		Int ret = editCoordDlg.DoModal();
 		return ret;
 	}
-	else if (pParm->getParameterType() == Parameter::OBJECT_TYPE) 
+	else if (pParm->getParameterType() == Parameter::OBJECT_TYPE)
 	{
 		EditObjectParameter editObjDlg;
 		editObjDlg.m_parameter = pParm;
 		Int ret = editObjDlg.DoModal();
 		return ret;
 	}
-	else if (pParm->getParameterType() == Parameter::COLOR) 
+	else if (pParm->getParameterType() == Parameter::COLOR)
 	{
 		// convert from aarrggbb to 00bbggrr, with 0% alpha
 		UnsignedInt b = (pParm->getInt() & 0x000000ff);
@@ -161,11 +156,11 @@ Int EditParameter::edit( Parameter *pParm, Int keyPressed, AsciiString unitName
 	}
 }
 
-AsciiString EditParameter::getWarningText(Parameter *pParm, Bool isAction) 
+AsciiString EditParameter::getWarningText(Parameter *pParm, Bool isAction)
 {
 	AsciiString warningText;
 	AsciiString uiString = pParm->getString();
-	if (uiString.isEmpty()) 
+	if (uiString.isEmpty())
 		uiString = "???";
 	switch (pParm->getParameterType()) {
 		default:
@@ -260,7 +255,7 @@ AsciiString EditParameter::getWarningText(Parameter *pParm, Bool isAction)
 				warningText.format("Object flag '%s' is unrecognized.", uiString.str());
 			}
 			break;
-	
+
 		case Parameter::OBJECT_TYPE_LIST:
 			// No warning is possible.
 			break;
@@ -283,7 +278,7 @@ AsciiString EditParameter::getWarningText(Parameter *pParm, Bool isAction)
 			break;
 		case Parameter::BOOLEAN:
 			break;
-					 
+
 		case Parameter::REAL:
 			break;
 
@@ -321,7 +316,7 @@ AsciiString EditParameter::getWarningText(Parameter *pParm, Bool isAction)
 				warningText.format("Track '%s' does not exist.", uiString.str());
 			}
 			break;
-			
+
 		case Parameter::MOVIE:
 			if (!loadMovies(NULL, uiString)) {
 				AsciiString commentFromINI;
@@ -344,7 +339,7 @@ AsciiString EditParameter::getWarningText(Parameter *pParm, Bool isAction)
 				warningText.format("Science '%s' does not exist.", uiString.str());
 			}
 			break;
-		
+
 		case Parameter::SCIENCE_AVAILABILITY:
 			if( !loadScienceAvailabilities( NULL, uiString ) )
 			{
@@ -362,14 +357,14 @@ AsciiString EditParameter::getWarningText(Parameter *pParm, Bool isAction)
 		case Parameter::COMMANDBUTTON_ALL_ABILITIES:
 			//Not sure if I need to do anything here.
 			break;
-		
-		
+
+
 		case Parameter::BOUNDARY:
 			if (TheTerrainRenderObject->getMap()->getAllBoundaries().size() <= pParm->getInt()) {
 				warningText.format("Border %s does not exist.", BORDER_COLORS[pParm->getInt() % BORDER_COLORS_SIZE]);
-			} 
+			}
 			break;
-		
+
 		case Parameter::BUILDABLE:
 			break;
 
@@ -384,13 +379,13 @@ AsciiString EditParameter::getWarningText(Parameter *pParm, Bool isAction)
 
 		case Parameter::FACTION_NAME:
 			break;
-		
+
 		case Parameter::EMOTICON:
 			break;
 
 		case Parameter::REVEALNAME:
 			break;
-			
+
 
 	}
 	if (warningText.isNotEmpty()) {
@@ -404,9 +399,9 @@ AsciiString EditParameter::getInfoText(Parameter *pParm)
 {
 	AsciiString infoText;
 	AsciiString uiString = pParm->getString();
-	if (uiString.isEmpty()) 
+	if (uiString.isEmpty())
 		uiString = "???";
-	switch (pParm->getParameterType()) 
+	switch (pParm->getParameterType())
 	{
 		default:
 			DEBUG_CRASH(("Unknown parameter type."));
@@ -485,18 +480,18 @@ AsciiString EditParameter::getInfoText(Parameter *pParm)
 
 
 
-void EditParameter::OnChangeEdit() 
+void EditParameter::OnChangeEdit()
 {
 
 }
 
-void EditParameter::OnEditchangeCombo() 
+void EditParameter::OnEditchangeCombo()
 {
-	
+
 }
 
 
-void EditParameter::loadConditionParameter(Script *pScr, Parameter::ParameterType type, CComboBox *pCombo) 
+void EditParameter::loadConditionParameter(Script *pScr, Parameter::ParameterType type, CComboBox *pCombo)
 {
 	OrCondition *pOr;
 	if (pCombo==NULL) return; // null pcombo is used in syntaxing commands.  jba.
@@ -523,7 +518,7 @@ void EditParameter::loadConditionParameter(Script *pScr, Parameter::ParameterTyp
 	}
 }
 
-Bool EditParameter::loadActionParameter(Script *pScr, Parameter::ParameterType type, 	CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadActionParameter(Script *pScr, Parameter::ParameterType type, 	CComboBox *pCombo, AsciiString match)
 {
 	ScriptAction *pAction;
 	Bool found = false;
@@ -545,12 +540,12 @@ Bool EditParameter::loadActionParameter(Script *pScr, Parameter::ParameterType t
 	return found;
 }
 
-Bool EditParameter::loadAttackSetParameter(Script *pScr, CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadAttackSetParameter(Script *pScr, CComboBox *pCombo, AsciiString match)
 {
 	ScriptAction *pAction;
 	Bool found = false;
 	for (pAction = pScr->getAction(); pAction; pAction = pAction->getNext()) {
-		// Attack priorities are created by SET_ATTACK_PRIORITY_* actions, but 
+		// Attack priorities are created by SET_ATTACK_PRIORITY_* actions, but
 		// referenced by *_APPLY_PRIORITY actions.  So just load from the SET_... ones.
 		if (pAction->getActionType() != ScriptAction::SET_ATTACK_PRIORITY_KIND_OF &&
 			pAction->getActionType() != ScriptAction::SET_DEFAULT_ATTACK_PRIORITY &&
@@ -572,7 +567,7 @@ Bool EditParameter::loadAttackSetParameter(Script *pScr, CComboBox *pCombo, Asci
 	return found;
 }
 
-Bool EditParameter::loadCreateUnitParameter(Script *pScr, CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadCreateUnitParameter(Script *pScr, CComboBox *pCombo, AsciiString match)
 {
 	ScriptAction *pAction;
 	Bool found = false;
@@ -604,7 +599,7 @@ Bool EditParameter::loadCreateObjectListsParameter(Script *pScr, CComboBox *pCom
 		if (pAction->getActionType() != ScriptAction::OBJECTLIST_ADDOBJECTTYPE) {
 			continue;
 		}
-		
+
 		if (Parameter::OBJECT_TYPE_LIST == pAction->getParameter(0)->getParameterType()) {
 			if (match == pAction->getParameter(0)->getString()) {
 				found = true;
@@ -638,7 +633,7 @@ AsciiString EditParameter::getCreatedUnitTemplateName(AsciiString unitName)
 		ScriptAction *pAction;
 		for (pScr = pSL->getScript(); pScr; pScr=pScr->getNext()) {
 			for (pAction = pScr->getAction(); pAction; pAction = pAction->getNext()) {
-				if (pAction->getActionType() != ScriptAction::CREATE_NAMED_ON_TEAM_AT_WAYPOINT 
+				if (pAction->getActionType() != ScriptAction::CREATE_NAMED_ON_TEAM_AT_WAYPOINT
 						&& pAction->getActionType() != ScriptAction::UNIT_SPAWN_NAMED_LOCATION_ORIENTATION) {
 					continue;
 				}
@@ -685,13 +680,13 @@ AsciiString EditParameter::getCreatedUnitTemplateName(AsciiString unitName)
 						}
 					}
 				}
-			}		
+			}
 		}
 	}
 	return AsciiString::TheEmptyString;
 }
 
-Bool EditParameter::loadCounters(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadCounters(CComboBox *pCombo, AsciiString match)
 {
 	Bool found = false;
 	if (pCombo) pCombo->ResetContent();
@@ -720,7 +715,7 @@ Bool EditParameter::loadCounters(CComboBox *pCombo, AsciiString match)
 	return found;
 }
 
-Bool EditParameter::loadAttackPrioritySets(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadAttackPrioritySets(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) pCombo->ResetContent();
 	Int i;
@@ -758,7 +753,7 @@ Bool EditParameter::loadSpecialPowers(CComboBox *pCombo, AsciiString match)
 		if (!pPower) {
 			continue;
 		}
-		
+
 		AsciiString powerName = pPower->getName();
 		if (pCombo) {
 			pCombo->AddString(powerName.str());
@@ -778,14 +773,14 @@ Bool EditParameter::loadSciences(CComboBox *pCombo, AsciiString match)
 	Bool retVal = false;
 
 	std::vector<AsciiString> v = TheScienceStore->friend_getScienceNames();
-	for (int i = 0; i < v.size(); ++i) 
+	for (int i = 0; i < v.size(); ++i)
 	{
-		if (pCombo) 
+		if (pCombo)
 		{
 			pCombo->AddString(v[i].str());
 		}
 
-		if (match.compare(v[i]) == 0) 
+		if (match.compare(v[i]) == 0)
 		{
 			retVal = true;
 		}
@@ -823,7 +818,7 @@ Bool EditParameter::loadUpgrades(CComboBox *pCombo, AsciiString match)
 	Int numUpgrades = upgradeNames.size();
 
 	for (int i = 0; i < numUpgrades; ++i) {
-		
+
 		AsciiString upgradeName = upgradeNames[i];
 		if (pCombo) {
 			pCombo->AddString(upgradeName.str());
@@ -841,21 +836,21 @@ Bool EditParameter::loadUpgrades(CComboBox *pCombo, AsciiString match)
 Bool EditParameter::loadAbilities( CComboBox *pCombo, AsciiString match )
 {
 	Bool retVal = FALSE;
-	
+
 	MapObject *theUnit;
-	for( theUnit = MapObject::getFirstMapObject(); theUnit; theUnit = theUnit->getNext() ) 
+	for( theUnit = MapObject::getFirstMapObject(); theUnit; theUnit = theUnit->getNext() )
 	{
 		Bool exists;
-		AsciiString objName = theUnit->getProperties()->getAsciiString(TheKey_objectName, &exists); 
-		if( !exists ) 
+		AsciiString objName = theUnit->getProperties()->getAsciiString(TheKey_objectName, &exists);
+		if( !exists )
 		{
 			continue;
 		}
-		if( objName.isEmpty() ) 
+		if( objName.isEmpty() )
 		{
 			continue;
 		}
-		if( theUnit->getFlag(FLAG_BRIDGE_FLAGS) ) 
+		if( theUnit->getFlag(FLAG_BRIDGE_FLAGS) )
 		{
 			continue;
 		}
@@ -864,7 +859,7 @@ Bool EditParameter::loadAbilities( CComboBox *pCombo, AsciiString match )
 			break;
 		}
 	}
-	const ThingTemplate *theTemplate = NULL; 
+	const ThingTemplate *theTemplate = NULL;
 
 	if ( theUnit ) {
 		theTemplate = theUnit->getThingTemplate();
@@ -924,7 +919,7 @@ Bool EditParameter::loadAbilities( CComboBox *pCombo, AsciiString match )
 Bool EditParameter::loadAllAbilities( CComboBox *pCombo, AsciiString match )
 {
 	Bool retVal = FALSE;
-	
+
 	if( !TheControlBar )
 	{
 		// create the command bar
@@ -956,7 +951,7 @@ Bool EditParameter::loadAllAbilities( CComboBox *pCombo, AsciiString match )
 Bool EditParameter::loadEmoticons( CComboBox *pCombo, AsciiString match )
 {
 	Bool retVal = FALSE;
-	
+
 	Anim2DTemplate *animTemplate = TheAnim2DCollection->getTemplateHead();
 	//Iterate through all the definitions
 
@@ -979,7 +974,7 @@ Bool EditParameter::loadEmoticons( CComboBox *pCombo, AsciiString match )
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool EditParameter::loadFlags(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadFlags(CComboBox *pCombo, AsciiString match)
 {
 	Bool found = false;
 	if (pCombo) pCombo->ResetContent();
@@ -1009,11 +1004,11 @@ Bool EditParameter::loadFlags(CComboBox *pCombo, AsciiString match)
 }
 
 //-------------------------------------------------------------------------------------------------
-Bool EditParameter::loadObjectType(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadObjectType(CComboBox *pCombo, AsciiString match)
 {
-	if (pCombo) 
+	if (pCombo)
 		pCombo->ResetContent();
-	
+
 	Bool didMatch = false;
 
 	didMatch = loadObjectTypeList(pCombo, NULL, match);
@@ -1024,10 +1019,10 @@ Bool EditParameter::loadObjectType(CComboBox *pCombo, AsciiString match)
 		tTemplate;
 		tTemplate = tTemplate->friend_getNextTemplate() )
 	{
-		if (pCombo) 
+		if (pCombo)
 			pCombo->AddString( tTemplate->getName().str());
-		
-		if ((match==tTemplate->getName())) 
+
+		if ((match==tTemplate->getName()))
 			didMatch = true;
 	}
 	return didMatch;
@@ -1098,7 +1093,7 @@ Bool EditParameter::loadRevealNames(CComboBox *pCombo, AsciiString match)
 		}
 	}
 
-	return didMatch;	
+	return didMatch;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -1110,7 +1105,7 @@ Bool EditParameter::loadRevealNamesParameter(Script *pScr, CComboBox *pCombo, As
 		if (pAction->getActionType() != ScriptAction::MAP_REVEAL_PERMANENTLY_AT_WAYPOINT) {
 			continue;
 		}
-		
+
 		if (Parameter::REVEALNAME == pAction->getParameter(3)->getParameterType()) {
 			if (match == pAction->getParameter(3)->getString()) {
 				found = true;
@@ -1139,13 +1134,13 @@ Bool EditParameter::loadAudioType(Parameter::ParameterType  comboType, CComboBox
 
 	std::vector<AudioEventInfo *> eventInfos;
 	TheAudio->findAllAudioEventsOfType(type, eventInfos);
-	
+
 	for (int i = 0; i < eventInfos.size(); ++i) {
 		if (eventInfos[i]) {
 			if (pCombo) {
 				pCombo->AddString(eventInfos[i]->m_audioName.str());
 			}
-			
+
 			if (match == eventInfos[i]->m_audioName) {
 				retVal = true;
 			}
@@ -1165,7 +1160,7 @@ Bool EditParameter::loadMovies(CComboBox *pCombo, AsciiString match)
 		if (!pVideo) {
 			continue;
 		}
-		
+
 		AsciiString videoName = pVideo->m_internalName;
 		if (pCombo) {
 			pCombo->AddString(videoName.str());
@@ -1189,7 +1184,7 @@ Bool EditParameter::getMovieComment(AsciiString match, AsciiString& outCommentFr
 		if (!pVideo) {
 			continue;
 		}
-		
+
 		AsciiString videoName = pVideo->m_internalName;
 		if (match == videoName && pVideo->m_commentForWB != AsciiString::TheEmptyString) {
 			outCommentFromINI = pVideo->m_commentForWB;
@@ -1202,7 +1197,7 @@ Bool EditParameter::getMovieComment(AsciiString match, AsciiString& outCommentFr
 
 
 //-------------------------------------------------------------------------------------------------
-Bool EditParameter::loadTriggerAreas(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadTriggerAreas(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) pCombo->ResetContent();
 	Bool didMatch = false;
@@ -1356,7 +1351,7 @@ void EditParameter::readFontFile( const char *filename )
 			fontBuffer[ index++ ] = c;
 			fp->read(&c, 1);
 
-		}  // end while
+		}
 		fontBuffer[ index ] = '\0';
 		fp->read(&c, 1);
 
@@ -1373,21 +1368,21 @@ void EditParameter::readFontFile( const char *filename )
 		{
 			char buffer[ 1024 ];
 
-			sprintf( buffer, "Warning: The font '%s' Size: '%d' Bold: '%d', specified in the config file could not be loaded.  Does that font exist?",
+			snprintf( buffer, ARRAY_SIZE(buffer), "Warning: The font '%s' Size: '%d' Bold: '%d', specified in the config file could not be loaded.  Does that font exist?",
 							 fontBuffer, size, bold );
 			//MessageBox( m_appHWnd, buffer, "Cannot Load Font", MB_OK );
-			
-		}  // end if
 
-	}  // end for i
+		}
+
+	}
 
 	// close the file
 	fp->close();
 	fp = NULL;
 
-}  // end readFontFile
+}
 
-Bool EditParameter::loadWaypoints(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadWaypoints(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) pCombo->ResetContent();
 	Bool didMatch = false;
@@ -1402,7 +1397,7 @@ Bool EditParameter::loadWaypoints(CComboBox *pCombo, AsciiString match)
 	return didMatch;
 }
 
-Bool EditParameter::loadWaypointPaths(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadWaypointPaths(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) pCombo->ResetContent();
 	Bool didMatch = false;
@@ -1455,7 +1450,7 @@ Bool EditParameter::loadObjectFlags(CComboBox *pCombo, AsciiString match)
 	return didMatch;
 }
 
-Bool EditParameter::loadScripts(CComboBox *pCombo, Bool subr, AsciiString match) 
+Bool EditParameter::loadScripts(CComboBox *pCombo, Bool subr, AsciiString match)
 {
 	if (pCombo) pCombo->ResetContent();
 	Int i;
@@ -1487,7 +1482,7 @@ Bool EditParameter::loadScripts(CComboBox *pCombo, Bool subr, AsciiString match)
 	return didMatch;
 }
 
-Bool EditParameter::loadSides(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadSides(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) {
 		pCombo->ResetContent();
@@ -1512,7 +1507,7 @@ Bool EditParameter::loadSides(CComboBox *pCombo, AsciiString match)
 	return didMatch;
 }
 
-Bool EditParameter::loadTeams(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadTeams(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) {
 		pCombo->ResetContent();
@@ -1541,7 +1536,7 @@ Bool EditParameter::loadTeams(CComboBox *pCombo, AsciiString match)
 	return didMatch;
 }
 
-Bool EditParameter::loadTeamOrUnit(CComboBox *pCombo, AsciiString match) 
+Bool EditParameter::loadTeamOrUnit(CComboBox *pCombo, AsciiString match)
 {
 	if (pCombo) {
 		pCombo->ResetContent();
@@ -1562,11 +1557,11 @@ Bool EditParameter::loadTeamOrUnit(CComboBox *pCombo, AsciiString match)
 		}
 		if (pCombo) pCombo->AddString(name.str());
 		if ((name==match)) didMatch = true;
-	}	
+	}
 	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		Bool exists;
-		AsciiString objName = pMapObj->getProperties()->getAsciiString(TheKey_objectName, &exists); 
+		AsciiString objName = pMapObj->getProperties()->getAsciiString(TheKey_objectName, &exists);
 		if (!exists) continue;
 		if (objName.isEmpty()) continue;
 		if (pCombo) pCombo->AddString(objName.str());
@@ -1577,7 +1572,7 @@ Bool EditParameter::loadTeamOrUnit(CComboBox *pCombo, AsciiString match)
 
 Bool EditParameter::loadUnits(CComboBox *pCombo, AsciiString match)
 {
-	if (pCombo) 
+	if (pCombo)
 	{
 		pCombo->ResetContent();
 		pCombo->AddString(THIS_OBJECT);
@@ -1589,32 +1584,32 @@ Bool EditParameter::loadUnits(CComboBox *pCombo, AsciiString match)
 		didMatch = true;
 	}
 	if( match == ANY_OBJECT )
-	{ 
+	{
 		didMatch=true;
 	}
 
 	MapObject *pMapObj;
-	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
 		Bool exists;
-		AsciiString objName = pMapObj->getProperties()->getAsciiString(TheKey_objectName, &exists); 
-		if (!exists) 
+		AsciiString objName = pMapObj->getProperties()->getAsciiString(TheKey_objectName, &exists);
+		if (!exists)
 		{
 			continue;
 		}
-		if (objName.isEmpty()) 
+		if (objName.isEmpty())
 		{
 			continue;
 		}
-		if (pMapObj->getFlag(FLAG_ROAD_FLAGS)) 
+		if (pMapObj->getFlag(FLAG_ROAD_FLAGS))
 		{
 			continue;
 		}
-		if (pCombo) 
+		if (pCombo)
 		{
 			pCombo->AddString(objName.str());
 		}
-		if (objName == match) 
+		if (objName == match)
 		{
 			didMatch = true;
 		}
@@ -1622,24 +1617,24 @@ Bool EditParameter::loadUnits(CComboBox *pCombo, AsciiString match)
 
 	SidesList *sidesListP = m_sidesListP;
 	Int i;
-	if (sidesListP==NULL) 
+	if (sidesListP==NULL)
 	{
 		sidesListP = TheSidesList;
 	}
 	for (i = 0; i < sidesListP->getNumSides(); i++)
 	{
-		SidesInfo *pSide = sidesListP->getSideInfo(i); 
-	
+		SidesInfo *pSide = sidesListP->getSideInfo(i);
+
 		BuildListInfo *pBI = pSide->getBuildList();
 		while (pBI)
 		{
-			if (pBI->getBuildingName().isNotEmpty()) 
+			if (pBI->getBuildingName().isNotEmpty())
 			{
-				if (pCombo) 
+				if (pCombo)
 				{
 					pCombo->AddString(pBI->getBuildingName().str());
 				}
-				if (pBI->getBuildingName() == match) 
+				if (pBI->getBuildingName() == match)
 				{
 					didMatch = true;
 				}
@@ -1700,7 +1695,7 @@ Bool EditParameter::loadBridges(CComboBox *pCombo, AsciiString match)
 	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		Bool exists;
-		AsciiString objName = pMapObj->getProperties()->getAsciiString(TheKey_objectName, &exists); 
+		AsciiString objName = pMapObj->getProperties()->getAsciiString(TheKey_objectName, &exists);
 		if (!exists) continue;
 		if (objName.isEmpty()) continue;
 		if (pMapObj->getFlag(FLAG_BRIDGE_POINT1)) {
@@ -1713,10 +1708,10 @@ Bool EditParameter::loadBridges(CComboBox *pCombo, AsciiString match)
 	return didMatch;
 }
 
-BOOL EditParameter::OnInitDialog() 
+BOOL EditParameter::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CWnd *pCaption = GetDlgItem(IDC_CAPTION);
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_COMBO);
 	CComboBox *pList = (CComboBox*)GetDlgItem(IDC_LIST);
@@ -1841,7 +1836,7 @@ BOOL EditParameter::OnInitDialog()
 			pList->SetCurSel(m_parameter->getInt());
 			showList = true;
 			break;
-					 
+
 		case Parameter::REAL:
 			captionText = "Real number:";
 			editText.Format("%.2f", m_parameter->getReal());
@@ -1881,7 +1876,7 @@ BOOL EditParameter::OnInitDialog()
 			captionText = "Kind of:";
 			showList = true;
 			for (i=KINDOF_FIRST; i<KINDOF_COUNT; i++) {
-				pList->InsertString(-1, KindOfMaskType::getBitNames()[i-KINDOF_FIRST]);				
+				pList->InsertString(-1, KindOfMaskType::getBitNames()[i-KINDOF_FIRST]);
 			}
 			pList->SetCurSel(m_parameter->getInt());
 			break;
@@ -1910,9 +1905,9 @@ BOOL EditParameter::OnInitDialog()
 			pList->InsertString(-1, "Flank");
 			pList->InsertString(-1, "Special");
 			i = pList->FindStringExact(-1, m_parameter->getString().str());
-			if (i!=CB_ERR) 
+			if (i!=CB_ERR)
 				pList->SetCurSel(i);
-			else 
+			else
 				pList->SetCurSel(0);
 			showList = true;
 			break;
@@ -1974,7 +1969,7 @@ BOOL EditParameter::OnInitDialog()
 			showCombo = true;
 			loadSpecialPowers(pCombo);
 			break;
-		
+
 		case Parameter::SCIENCE:
 			captionText = "Science:";
 			showCombo = true;
@@ -1998,7 +1993,7 @@ BOOL EditParameter::OnInitDialog()
 			showCombo = true;
 			loadAbilities( pCombo );
 			break;
-		
+
 		case Parameter::COMMANDBUTTON_ALL_ABILITIES:
 			captionText = "Ability:";
 			showCombo = true;
@@ -2034,7 +2029,7 @@ BOOL EditParameter::OnInitDialog()
 			for (i = 0; i < 3; ++i) {
 				pList->InsertString(-1, Surfaces[i]);
 			}
-			
+
 			// 0 is invalid for surfaces, so change this to a 3 (which means AIR and GROUND)
 			if (m_parameter->getInt() == 0) {
 				m_parameter->friend_setInt(3);
@@ -2062,7 +2057,7 @@ BOOL EditParameter::OnInitDialog()
 			showList = true;
 			for( i = 0; i < OBJECT_STATUS_COUNT; i++ )
 			{
-				pList->InsertString( -1, ObjectStatusMaskType::getBitNames()[i] );				
+				pList->InsertString( -1, ObjectStatusMaskType::getBitNames()[i] );
 			}
 			pList->SelectString( -1, m_parameter->getString().str() );
 			break;
@@ -2092,7 +2087,7 @@ BOOL EditParameter::OnInitDialog()
 			break;
 		}
 		case Parameter::OBJECT_TYPE_LIST:
-		{	
+		{
 			captionText = "Object type list:";
 			showCombo = true;
 			loadObjectTypeList(pCombo);
@@ -2154,7 +2149,7 @@ Bool EditParameter::scanReal(CEdit *pEdit, Real scale)
 	}
 }
 
-void EditParameter::OnOK() 
+void EditParameter::OnOK()
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_COMBO);
 	CEdit *pEdit = (CEdit *)GetDlgItem(IDC_EDIT);
@@ -2226,7 +2221,7 @@ void EditParameter::OnOK()
 				return;
 			}
 			break;
-					 
+
 		case Parameter::REAL:
 			if (! scanReal(pEdit, 1.0f)) {
 				return;
@@ -2260,7 +2255,7 @@ void EditParameter::OnOK()
 			m_parameter->friend_setInt(pList->GetCurSel() + ATTITUDE_SLEEP);
 			break;
 		case Parameter::SKIRMISH_WAYPOINT_PATH:	{
-			CString cstr;			 
+			CString cstr;
 			pList->GetLBText(pList->GetCurSel(), cstr);
 			m_parameter->friend_setString((LPCTSTR)cstr);
 			break;
@@ -2269,7 +2264,7 @@ void EditParameter::OnOK()
 			m_parameter->friend_setInt(pList->GetCurSel() + RADAR_EVENT_CONSTRUCTION);
 			break;
 
-      
+
     case Parameter::LEFT_OR_RIGHT:
       m_parameter->friend_setInt(pList->GetCurSel() + 1);
       break;
@@ -2281,7 +2276,7 @@ void EditParameter::OnOK()
 			m_parameter->friend_setString(loadLocalizedText(NULL, comboText));
 			break;
 		case Parameter::BOUNDARY:
-		{	
+		{
 			Int curSel = pCombo->GetCurSel();
 			if (curSel >= 0) {
 				m_parameter->friend_setInt(curSel);
@@ -2304,11 +2299,11 @@ void EditParameter::OnOK()
 		case Parameter::OBJECT_STATUS:
 		{
 			Int curSel = pList->GetCurSel();
-			if( curSel >= 0 ) 
+			if( curSel >= 0 )
 			{
 				m_parameter->friend_setString( ObjectStatusMaskType::getBitNames()[curSel] );
-			} 
-			else 
+			}
+			else
 			{
 				m_parameter->friend_setString( AsciiString::TheEmptyString );
 			}
@@ -2337,7 +2332,7 @@ void EditParameter::OnOK()
 	CDialog::OnOK();
 }
 
-void EditParameter::OnCancel() 
+void EditParameter::OnCancel()
 {
 
 	CDialog::OnCancel();
@@ -2345,7 +2340,7 @@ void EditParameter::OnCancel()
 
 /* This function handles a left click on
    the "preview sound" button */
-void EditParameter::OnPreviewSound() 
+void EditParameter::OnPreviewSound()
 {
 	CString txt;
 	AsciiString comboText;
@@ -2363,7 +2358,7 @@ void EditParameter::OnPreviewSound()
 		event.setEventName(comboText);
 		event.setAudioEventInfo(TheAudio->findAudioEventInfo(comboText));
 		event.generateFilename();
-		
+
 		if (!event.getFilename().isEmpty()) {
 			PlaySound(event.getFilename().str(), NULL, SND_ASYNC | SND_FILENAME | SND_PURGE);
 		}
@@ -2380,7 +2375,7 @@ AsciiString EditParameter::loadLocalizedText(CComboBox *pCombo, AsciiString isSt
 			pCombo->AddString(vec[i].str());
 		}
 	}
-	
+
 	if (isStringInTable != AsciiString::TheEmptyString) {
 		for (int i = 0; i < vec.size(); ++i) {
 			if (isStringInTable.compare(vec[i].str()) == 0) {
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/EulaDialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/EulaDialog.cpp
index 06ed2faa3fa..605fd766cf3 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/EulaDialog.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/EulaDialog.cpp
@@ -59,13 +59,13 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // EulaDialog message handlers
 
-BOOL EulaDialog::OnInitDialog() 
+BOOL EulaDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CString theText;
 	theText.LoadString( IDS_EULA_AGREEMENT1 );
-	
+
 	CString concatText;
 	concatText.LoadString( IDS_EULA_AGREEMENT2 );
 	theText += concatText;
@@ -75,13 +75,13 @@ BOOL EulaDialog::OnInitDialog()
 	theText += concatText;
 	concatText.LoadString( IDS_EULA_AGREEMENT5 );
 	theText += concatText;
-	
+
 	CWnd *theEditDialog = GetDlgItem( IDC_EDIT1 );
 	if( theEditDialog )
 	{
 		theEditDialog->SetWindowText( theText );
 	}
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ExportScriptsOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ExportScriptsOptions.cpp
index 2795df6f068..d1eb509c7c7 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ExportScriptsOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ExportScriptsOptions.cpp
@@ -57,10 +57,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ExportScriptsOptions message handlers
 
-void ExportScriptsOptions::OnOK() 
+void ExportScriptsOptions::OnOK()
 {
 	// TODO: Add extra validation here
-	
+
 	CButton *pButton = (CButton*)GetDlgItem(IDC_WAYPOINTS);
 	m_waypoints = pButton->GetCheck()==1;
 	pButton = (CButton*)GetDlgItem(IDC_UNITS);
@@ -76,10 +76,10 @@ void ExportScriptsOptions::OnOK()
 	CDialog::OnOK();
 }
 
-BOOL ExportScriptsOptions::OnInitDialog() 
+BOOL ExportScriptsOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CButton *pButton = (CButton*)GetDlgItem(IDC_WAYPOINTS);
 	pButton->SetCheck(m_waypoints?1:0);
 	pButton = (CButton*)GetDlgItem(IDC_UNITS);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/EyedropperTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/EyedropperTool.cpp
index 56d007462b4..9b6ef999adb 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/EyedropperTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/EyedropperTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "EyedropperTool.h"
@@ -36,18 +36,18 @@
 //
 /// Constructor
 EyedropperTool::EyedropperTool(void) :
-	Tool(ID_EYEDROPPER_TOOL, IDC_EYEDROPPER) 
+	Tool(ID_EYEDROPPER_TOOL, IDC_EYEDROPPER)
 {
 }
-	
+
 /// Destructor
-EyedropperTool::~EyedropperTool(void) 
+EyedropperTool::~EyedropperTool(void)
 {
 }
 
 
 /// Shows the terrain materials options panel.
-void EyedropperTool::activate() 
+void EyedropperTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_TERRAIN_MATERIAL);
 	TerrainMaterial::setToolOptions(true);
@@ -56,7 +56,7 @@ void EyedropperTool::activate()
 
 /// Perform the tool behavior on mouse down.
 /** Finds the current texture class, and tells the terrain material panel to use it as fg. */
-void EyedropperTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void EyedropperTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherOptions.cpp
index 3ab85707efc..806d74b6026 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherOptions.cpp
@@ -36,7 +36,7 @@ Int FeatherOptions::m_currentRadius = 1;
 
 FeatherOptions::FeatherOptions(CWnd* pParent /*=NULL*/)
 {
-	//{{AFX_DATA_INIT(FeatherOptions) 
+	//{{AFX_DATA_INIT(FeatherOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -52,8 +52,8 @@ void FeatherOptions::DoDataExchange(CDataExchange* pDX)
 
 /// Sets the feather value in the dialog.
 /** Update the value in the edit control and the slider. */
-void FeatherOptions::setFeather(Int feather) 
-{ 
+void FeatherOptions::setFeather(Int feather)
+{
 	CString buf;
 	buf.Format("%d", feather);
 	m_currentFeather = feather;
@@ -66,8 +66,8 @@ void FeatherOptions::setFeather(Int feather)
 
 /// Sets the rate value in the dialog.
 /** Update the value in the edit control and the slider. */
-void FeatherOptions::setRate(Int rate) 
-{ 
+void FeatherOptions::setRate(Int rate)
+{
 	CString buf;
 	buf.Format("%d", rate);
 	m_currentRate = rate;
@@ -80,8 +80,8 @@ void FeatherOptions::setRate(Int rate)
 
 /// Sets the radius value in the dialog.
 /** Update the value in the edit control and the slider. */
-void FeatherOptions::setRadius(Int radius) 
-{ 
+void FeatherOptions::setRadius(Int radius)
+{
 	CString buf;
 	buf.Format("%d", radius);
 	m_currentRadius = radius;
@@ -97,12 +97,12 @@ void FeatherOptions::setRadius(Int radius)
 // FeatherOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL FeatherOptions::OnInitDialog() 
+BOOL FeatherOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = true;
 	m_featherPopup.SetupPopSliderButton(this, IDC_SIZE_POPUP, this);
 	m_radiusPopup.SetupPopSliderButton(this, IDC_RADIUS_POPUP, this);
@@ -122,7 +122,7 @@ BOOL FeatherOptions::OnInitDialog()
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void FeatherOptions::OnChangeSizeEdit() 
+void FeatherOptions::OnChangeSizeEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SIZE_EDIT);
@@ -134,7 +134,7 @@ void FeatherOptions::OnChangeSizeEdit()
 			if (1==sscanf(buffer, "%d", &width)) {
 				m_currentFeather = width;
 				FeatherTool::setFeather(m_currentFeather);
-				sprintf(buffer, "%.1f FEET.", m_currentFeather*MAP_XY_FACTOR);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentFeather*MAP_XY_FACTOR);
 				pEdit = m_staticThis->GetDlgItem(IDC_WIDTH_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -172,7 +172,7 @@ void FeatherOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMa
 		default:
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void FeatherOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -207,7 +207,7 @@ void FeatherOptions::PopSliderChanged(const long sliderID, long theVal)
 
 		default:
 			break;
-	}	// switch
+	}
 }
 
 void FeatherOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -221,7 +221,7 @@ void FeatherOptions::PopSliderFinished(const long sliderID, long theVal)
 		default:
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherTool.cpp
index e25f80bda4a..b50fbd0d40e 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "FeatherTool.h"
@@ -46,19 +46,19 @@ FeatherTool::FeatherTool(void) :
 	m_htMapFeatherCopy = NULL;
 	m_htMapRateCopy = NULL;
 }
-	
+
 /// Destructor
-FeatherTool::~FeatherTool(void) 
+FeatherTool::~FeatherTool(void)
 {
 	REF_PTR_RELEASE(m_htMapEditCopy);
-	REF_PTR_RELEASE(m_htMapFeatherCopy); 
-	REF_PTR_RELEASE(m_htMapRateCopy); 
+	REF_PTR_RELEASE(m_htMapFeatherCopy);
+	REF_PTR_RELEASE(m_htMapRateCopy);
 }
 
 
 
 /// Shows the brush options panel.
-void FeatherTool::activate() 
+void FeatherTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_FEATHER_OPTIONS);
 	DrawObject::setDoBrushFeedback(true);
@@ -66,8 +66,8 @@ void FeatherTool::activate()
 }
 
 /// Set the brush feather and notify the height options panel of the change.
-void FeatherTool::setFeather(Int feather) 
-{ 
+void FeatherTool::setFeather(Int feather)
+{
 	if (m_feather != feather) {
 		m_feather = feather;
 		// notify feather palette options panel
@@ -77,8 +77,8 @@ void FeatherTool::setFeather(Int feather)
 };
 
 /// Set the brush feather and notify the height options panel of the change.
-void FeatherTool::setRate(Int rate) 
-{ 
+void FeatherTool::setRate(Int rate)
+{
 	if (m_rate != rate) {
 		m_rate = rate;
 		// notify feather palette options panel
@@ -87,8 +87,8 @@ void FeatherTool::setRate(Int rate)
 };
 
 /// Set the brush feather and notify the height options panel of the change.
-void FeatherTool::setRadius(Int radius) 
-{ 
+void FeatherTool::setRadius(Int radius)
+{
 	if (m_radius != radius) {
 		m_radius = radius;
 		// notify feather palette options panel
@@ -99,7 +99,7 @@ void FeatherTool::setRadius(Int radius)
 /// Start tool.
 /** Setup the tool to start brushing - make a copy of the height map
 to edit, another copy because we need it :), and call mouseMovedDown. */
-void FeatherTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void FeatherTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -121,9 +121,9 @@ void FeatherTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 }
 
 /// End tool.
-/** Finish the tool operation - create a command, pass it to the 
+/** Finish the tool operation - create a command, pass it to the
 doc to execute, and cleanup ref'd objects. */
-void FeatherTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void FeatherTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -165,7 +165,7 @@ void FeatherTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 		if (i<0 || i>=m_htMapEditCopy->getXExtent()) {
 			continue;
 		}
-		for (j=ndx.y-sub; j<ndx.y+add; j++) {					
+		for (j=ndx.y-sub; j<ndx.y+add; j++) {
 			if (j<0 || j>=m_htMapEditCopy->getYExtent()) {
 				continue;
 			}
@@ -222,10 +222,10 @@ void FeatherTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 				total = floor(origHeight*(1.0f-rateF) + total*rateF + 0.5f);
 				m_htMapEditCopy->setHeight(i, j, total);
 				pDoc->invalCell(i, j);
-			} 
+			}
 		}
 	}
-	
+
 	IRegion2D partialRange;
 	partialRange.lo.x = ndx.x - brushWidth;
 	partialRange.hi.x = ndx.x + brushWidth;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/FenceOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/FenceOptions.cpp
index 189c2fad975..c49e0a24b67 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/FenceOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/FenceOptions.cpp
@@ -20,9 +20,9 @@
 //
 
 /** The fence options is essentially a front for the object options panel.
-The	fence options panel has a subset of the objects available, and when one is 
+The	fence options panel has a subset of the objects available, and when one is
 selected, makes the current object in the object options panel match this object.
-Then the new object is created by the object options panel, so team parenting and 
+Then the new object is created by the object options panel, so team parenting and
 so forth is all handled in the object options panel.  jba. */
 
 #define DEFINE_EDITOR_SORTING_NAMES
@@ -51,7 +51,7 @@ Int FenceOptions::m_currentObjectIndex=-1;
 Real FenceOptions::m_fenceSpacing=1;
 Real FenceOptions::m_fenceOffset=0;
 
-										 
+
 /////////////////////////////////////////////////////////////////////////////
 // FenceOptions dialog
 
@@ -68,9 +68,7 @@ FenceOptions::FenceOptions(CWnd* pParent /*=NULL*/)
 
 FenceOptions::~FenceOptions(void)
 {
-	if (m_objectsList) {
-		deleteInstance(m_objectsList);
-	}
+	deleteInstance(m_objectsList);
 	m_objectsList = NULL;
 }
 
@@ -134,7 +132,7 @@ void FenceOptions::updateObjectOptions()
 // FenceOptions message handlers
 
 /// Setup the controls in the dialog.
-BOOL FenceOptions::OnInitDialog() 
+BOOL FenceOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -163,7 +161,7 @@ BOOL FenceOptions::OnInitDialog()
 		Color cc = tTemplate->getDisplayColor();
 		pMap->setColor(cc);
 
-	}  // end for tTemplate
+	}
 
 
 	CWnd *pWnd = GetDlgItem(IDC_OBJECT_HEIGHT_EDIT);
@@ -212,7 +210,7 @@ HTREEITEM FenceOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_objectTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -227,7 +225,7 @@ HTREEITEM FenceOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = (char*)pLabel;
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_objectTreeView.InsertItem(&ins);
 	return(child);
 }
@@ -235,10 +233,9 @@ HTREEITEM FenceOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 //-------------------------------------------------------------------------------------------------
 /** Add the object hierarchy paths to the tree view. */
 //-------------------------------------------------------------------------------------------------
-void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const char *name, 
+void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const char *name,
 															 Int terrainNdx, HTREEITEM parent )
 {
-	char buffer[ _MAX_PATH ];
 	const char *leafName = NULL;
 
 	// sanity
@@ -248,7 +245,7 @@ void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const cha
 	//
 	// if we have an thing template in mapObject, we've read it from the new INI database,
 	// we will sort those items into the tree based on properties of the template that
-	// make it easier for us to browse when building levels 
+	// make it easier for us to browse when building levels
 	//
 	// Feel free to reorganize how this tree is constructed from the template
 	// data at will, whatever makes it easier for design
@@ -260,12 +257,11 @@ void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const cha
 		// first check for test sorted objects
 		if( thingTemplate->getEditorSorting() == ES_TEST )
 			parent = findOrAdd( parent, "TEST" );
-	
+
 		// first sort by side, either create or find the tree item with matching side name
 		AsciiString side = thingTemplate->getDefaultOwningSide();
-		DEBUG_ASSERTCRASH( !side.isEmpty(), ("NULL default side in template\n") );
-		strcpy( buffer, side.str() );
-		parent = findOrAdd( parent, buffer );
+		DEBUG_ASSERTCRASH( !side.isEmpty(), ("NULL default side in template") );
+		parent = findOrAdd( parent, side.str());
 
 		// next tier uses the editor sorting that design can specify in the INI
 		EditorSortingType i = ES_FIRST;
@@ -280,9 +276,9 @@ void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const cha
 				parent = findOrAdd( parent, EditorSortingNames[ i ] );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		if( i == ES_NUM_SORTING_TYPES )
 			parent = findOrAdd( parent, "UNSORTED" );
@@ -290,7 +286,7 @@ void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const cha
 		// the leaf name is the name of the template
 		leafName = thingTemplate->getName().str();
 
-	}  // end if
+	}
 
 	// add to the tree view
 	if( leafName )
@@ -303,7 +299,7 @@ void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const cha
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = terrainNdx;
 		ins.item.pszText = (char*)leafName;
-		ins.item.cchTextMax = strlen(leafName)+2;				
+		ins.item.cchTextMax = strlen(leafName)+2;
 		m_objectTreeView.InsertItem(&ins);
 
 	}
@@ -342,13 +338,13 @@ Bool FenceOptions::setObjectTreeViewSelection(HTREEITEM parent, Int selection)
 		item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;
 		item.hItem = child;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_objectTreeView.GetItem(&item);
 		if (item.lParam == selection) {
 			m_objectTreeView.SelectItem(child);
 			return(true);
 		}
-		if (setObjectTreeViewSelection(child, selection)) 
+		if (setObjectTreeViewSelection(child, selection))
 		{
 			updateObjectOptions();
 			return(true);
@@ -359,7 +355,7 @@ Bool FenceOptions::setObjectTreeViewSelection(HTREEITEM parent, Int selection)
 }
 
 
-BOOL FenceOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL FenceOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_objectTreeView.m_hWnd) {
@@ -384,7 +380,7 @@ BOOL FenceOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_objectTreeView.GetItem(&item);
 			if (item.lParam >= 0) {
 				m_currentObjectIndex = item.lParam;
@@ -395,14 +391,14 @@ BOOL FenceOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			updateObjectOptions();
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
 
 
 
-void FenceOptions::OnChangeFenceSpacingEdit() 
+void FenceOptions::OnChangeFenceSpacingEdit()
 {
 	CWnd *pWnd = m_staticThis->GetDlgItem(IDC_FENCE_SPACING_EDIT);
 	if (pWnd) {
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/FenceTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/FenceTool.cpp
index 5d34b88336f..339dd71c606 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/FenceTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/FenceTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "FenceTool.h"
@@ -45,13 +45,11 @@ FenceTool::FenceTool(void) :
 		m_curObjectWidth = 27.35f;
 		m_curObjectOffset = 0;
 }
-	
+
 /// Destructor
-FenceTool::~FenceTool(void) 
+FenceTool::~FenceTool(void)
 {
-	if (m_mapObjectList) {
-		deleteInstance(m_mapObjectList);
-	}
+	deleteInstance(m_mapObjectList);
 	m_mapObjectList = NULL;
 }
 
@@ -125,7 +123,7 @@ void FenceTool::updateMapObjectList(Coord3D downPt, Coord3D curPt, WbView* pView
 
 
 /// Turn off object tracking.
-void FenceTool::deactivate() 
+void FenceTool::deactivate()
 {
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (pDoc==NULL) return;
@@ -133,7 +131,7 @@ void FenceTool::deactivate()
 	p3View->setObjTracking(NULL, m_downPt3d, 0, false);
 }
 /// Shows the object options panel
-void FenceTool::activate() 
+void FenceTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_FENCE_OPTIONS);
 	DrawObject::setDoBrushFeedback(false);
@@ -145,7 +143,7 @@ void FenceTool::activate()
 }
 
 /** Execute the tool on mouse down - Place an object. */
-void FenceTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void FenceTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -154,10 +152,10 @@ void FenceTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 	pView->snapPoint(&cpt);
 	m_downPt2d = viewPt;
 	m_downPt3d = cpt;
-	if (m_mapObjectList) {
-		deleteInstance(m_mapObjectList);
-		m_mapObjectList = NULL;
-	}
+
+	deleteInstance(m_mapObjectList);
+	m_mapObjectList = NULL;
+
 	if (FenceOptions::hasSelectedObject()) {
 		FenceOptions::update();
 		m_curObjectWidth = FenceOptions::getFenceSpacing();
@@ -167,9 +165,9 @@ void FenceTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 		mouseMoved(m, viewPt, pView, pDoc);
 	}
 }
-																			 
+
 /** Tracking - show the object. */
-void FenceTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void FenceTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 //	Bool justAClick = true;
 	Coord3D cpt;
@@ -186,19 +184,19 @@ void FenceTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 	MapObject *pCur = ObjectOptions::getObjectNamed(AsciiString(ObjectOptions::getCurObjectName()));
 	p3View->setObjTracking(NULL, m_downPt3d, 0, false);
 	loc.z = ObjectOptions::getCurObjectHeight();
-	if (pCur && FenceOptions::hasSelectedObject()) { 
+	if (pCur && FenceOptions::hasSelectedObject()) {
 		// Display the transparent version of this object.
 		m_curObjectOffset = FenceOptions::getFenceOffset();
 		loc.x += m_curObjectOffset;
 		p3View->setObjTracking(pCur, loc, angle, true);
 	} else {
-		// Don't display anything. 
+		// Don't display anything.
 		p3View->setObjTracking(NULL, loc, angle, false);
 	}
 }
 
 /** Execute the tool on mouse up - Place an object. */
-void FenceTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void FenceTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	Coord3D cpt;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/FloodFillTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/FloodFillTool.cpp
index cf9e789be06..1bcc725ee75 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/FloodFillTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/FloodFillTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "FloodFillTool.h"
@@ -43,9 +43,9 @@ FloodFillTool::FloodFillTool(void) :
 	m_cliffCursor(NULL)
 {
 }
-	
+
 /// Destructor
-FloodFillTool::~FloodFillTool(void) 
+FloodFillTool::~FloodFillTool(void)
 {
 	if (m_cliffCursor) {
 		::DestroyCursor(m_cliffCursor);
@@ -54,7 +54,7 @@ FloodFillTool::~FloodFillTool(void)
 
 
 /// Shows the terrain materials options panel.
-void FloodFillTool::activate() 
+void FloodFillTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_TERRAIN_MATERIAL);
 	TerrainMaterial::setToolOptions(true);
@@ -63,7 +63,7 @@ void FloodFillTool::activate()
 }
 
 /** Set the cursor. */
-void FloodFillTool::setCursor(void)   
+void FloodFillTool::setCursor(void)
 {
 	if (m_adjustCliffTextures) {
 		if (m_cliffCursor == NULL) {
@@ -82,7 +82,7 @@ void FloodFillTool::setCursor(void)
 /** Creates a copy of the height map, flood fills it at pt with m_textureClassToDraw which
 has been set by the calling routine.  Then builds
 the command, and passes it to the doc. */
-void FloodFillTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void FloodFillTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	Coord3D cpt;
 	pView->viewToDocCoords(viewPt, &cpt);
@@ -94,7 +94,7 @@ void FloodFillTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 
 	if (m == TRACK_L)
 		m_textureClassToDraw = TerrainMaterial::getFgTexClass();
-	else 
+	else
 		m_textureClassToDraw = TerrainMaterial::getBgTexClass();
 
 //	WorldHeightMapEdit *pMap = pDoc->GetHeightMap();
@@ -113,7 +113,7 @@ void FloodFillTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 		WBDocUndoable *pUndo = new WBDocUndoable(pDoc, htMapEditCopy);
 		pDoc->AddAndDoUndoable(pUndo);
 		REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-	} 
+	}
 	REF_PTR_RELEASE(htMapEditCopy);
 }
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp
index f3089c11f07..31a8dbbc33f 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp
@@ -34,7 +34,7 @@
 GlobalLightOptions::GlobalLightOptions(CWnd* pParent /*=NULL*/)
 	: CDialog(GlobalLightOptions::IDD, pParent)
 {
-	//{{AFX_DATA_INIT(GlobalLightOptions) 
+	//{{AFX_DATA_INIT(GlobalLightOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -61,8 +61,8 @@ static void calcNewLight(Int lr, Int fb, Vector3 *newLight)
 	newLight->Rotate_Z(zAngle);
 }
 
-void GlobalLightOptions::updateEditFields(void) 
-{ 
+void GlobalLightOptions::updateEditFields(void)
+{
 	m_updating = true;
 	CString str;
 	CWnd *pEdit;
@@ -91,14 +91,14 @@ void GlobalLightOptions::updateEditFields(void)
 	m_updating = false;
 }
 
-void GlobalLightOptions::showLightFeedback(Int lightIndex) 
+void GlobalLightOptions::showLightFeedback(Int lightIndex)
 {
 	Vector3 light(0,0,0);
 	light.X = sin(PI/2.0f+m_angleElevation[lightIndex]/180.0f*PI)*cos(m_angleAzimuth[lightIndex]/180.0f*PI);// -WWMath::Sin(PI*(m_angleLR[lightIndex]-90)/180);
 	light.Y = sin(PI/2.0f+m_angleElevation[lightIndex]/180.0f*PI)*sin(m_angleAzimuth[lightIndex]/180.0f*PI);//-WWMath::Sin(PI*(m_angleFB[lightIndex]-90)/180);
 	light.Z = cos (PI/2.0f+m_angleElevation[lightIndex]/180.0f*PI);
 
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		Coord3D lightRay;
 		lightRay.x=light.X;lightRay.y=light.Y;lightRay.z=light.Z;
@@ -106,8 +106,8 @@ void GlobalLightOptions::showLightFeedback(Int lightIndex)
 	}
 }
 
-void GlobalLightOptions::applyAngle(Int lightIndex) 
-{ 
+void GlobalLightOptions::applyAngle(Int lightIndex)
+{
 	Vector3 light(0,0,0);
 	light.X = sin(PI/2.0f+m_angleElevation[lightIndex]/180.0f*PI)*cos(m_angleAzimuth[lightIndex]/180.0f*PI);// -WWMath::Sin(PI*(m_angleLR[lightIndex]-90)/180);
 	light.Y = sin(PI/2.0f+m_angleElevation[lightIndex]/180.0f*PI)*sin(m_angleAzimuth[lightIndex]/180.0f*PI);//-WWMath::Sin(PI*(m_angleFB[lightIndex]-90)/180);
@@ -129,7 +129,7 @@ void GlobalLightOptions::applyAngle(Int lightIndex)
 	tl.lightPos.y = light.Y;
 	tl.lightPos.z = light.Z;
 
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		pView->setLighting(&tl, m_lighting, lightIndex);
 		Coord3D lightRay;
@@ -142,7 +142,7 @@ static void SpitLights()
 {
 #ifdef DEBUG_LOGGING
 	CString lightstrings[100];
-	DEBUG_LOG(("GlobalLighting\n\n"));
+	DEBUG_LOG(("GlobalLighting\n"));
 	Int redA, greenA, blueA;
 	Int redD, greenD, blueD;
 	Real x, y, z;
@@ -172,9 +172,9 @@ static void SpitLights()
 			y = TheGlobalData->m_terrainLighting[time+TIME_OF_DAY_FIRST][light].lightPos.y;
 			z = TheGlobalData->m_terrainLighting[time+TIME_OF_DAY_FIRST][light].lightPos.z;
 
-			DEBUG_LOG(("TerrainLighting%sAmbient%s = R:%d G:%d B:%d\n", times[time], lights[light], redA, greenA, blueA));
-			DEBUG_LOG(("TerrainLighting%sDiffuse%s = R:%d G:%d B:%d\n", times[time], lights[light], redD, greenD, blueD));
-			DEBUG_LOG(("TerrainLighting%sLightPos%s = X:%0.2f Y:%0.2f Z:%0.2f\n", times[time], lights[light], x, y, z));
+			DEBUG_LOG(("TerrainLighting%sAmbient%s = R:%d G:%d B:%d", times[time], lights[light], redA, greenA, blueA));
+			DEBUG_LOG(("TerrainLighting%sDiffuse%s = R:%d G:%d B:%d", times[time], lights[light], redD, greenD, blueD));
+			DEBUG_LOG(("TerrainLighting%sLightPos%s = X:%0.2f Y:%0.2f Z:%0.2f", times[time], lights[light], x, y, z));
 
 			redA = TheGlobalData->m_terrainObjectsLighting[time+TIME_OF_DAY_FIRST][light].ambient.red*255;
 			greenA = TheGlobalData->m_terrainObjectsLighting[time+TIME_OF_DAY_FIRST][light].ambient.green*255;
@@ -188,50 +188,50 @@ static void SpitLights()
 			y = TheGlobalData->m_terrainObjectsLighting[time+TIME_OF_DAY_FIRST][light].lightPos.y;
 			z = TheGlobalData->m_terrainObjectsLighting[time+TIME_OF_DAY_FIRST][light].lightPos.z;
 
-			DEBUG_LOG(("TerrainObjectsLighting%sAmbient%s = R:%d G:%d B:%d\n", times[time], lights[light], redA, greenA, blueA));
-			DEBUG_LOG(("TerrainObjectsLighting%sDiffuse%s = R:%d G:%d B:%d\n", times[time], lights[light], redD, greenD, blueD));
-			DEBUG_LOG(("TerrainObjectsLighting%sLightPos%s = X:%0.2f Y:%0.2f Z:%0.2f\n", times[time], lights[light], x, y, z));
+			DEBUG_LOG(("TerrainObjectsLighting%sAmbient%s = R:%d G:%d B:%d", times[time], lights[light], redA, greenA, blueA));
+			DEBUG_LOG(("TerrainObjectsLighting%sDiffuse%s = R:%d G:%d B:%d", times[time], lights[light], redD, greenD, blueD));
+			DEBUG_LOG(("TerrainObjectsLighting%sLightPos%s = X:%0.2f Y:%0.2f Z:%0.2f", times[time], lights[light], x, y, z));
 
-			DEBUG_LOG(("\n"));
+			DEBUG_LOG_RAW(("\n"));
 		}
-		DEBUG_LOG(("\n"));
+		DEBUG_LOG_RAW(("\n"));
 	}
 
-	DEBUG_LOG(("GlobalLighting Code\n\n"));
+	DEBUG_LOG(("GlobalLighting Code\n"));
 	for (time=0; time<4; time++) {
 		for (Int light=0; light<3; light++) {
 			Int theTime = time+TIME_OF_DAY_FIRST;
 			GlobalData::TerrainLighting tl = TheGlobalData->m_terrainLighting[theTime][light];
 
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].ambient.red = %0.4ff;\n", theTime, light, tl.ambient.red));
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].ambient.green = %0.4ff;\n", theTime, light, tl.ambient.green));
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].ambient.blue = %0.4ff;\n", theTime, light, tl.ambient.blue));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].ambient.red = %0.4ff;", theTime, light, tl.ambient.red));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].ambient.green = %0.4ff;", theTime, light, tl.ambient.green));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].ambient.blue = %0.4ff;", theTime, light, tl.ambient.blue));
+
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].diffuse.red = %0.4ff;", theTime, light, tl.diffuse.red));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].diffuse.green = %0.4ff;", theTime, light, tl.diffuse.green));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].diffuse.blue = %0.4ff;", theTime, light, tl.diffuse.blue));
 
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].diffuse.red = %0.4ff;\n", theTime, light, tl.diffuse.red));
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].diffuse.green = %0.4ff;\n", theTime, light, tl.diffuse.green));
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].diffuse.blue = %0.4ff;\n", theTime, light, tl.diffuse.blue));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].lightPos.x = %0.4ff;", theTime, light, tl.lightPos.x));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].lightPos.y = %0.4ff;", theTime, light, tl.lightPos.y));
+			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].lightPos.z = %0.4ff;", theTime, light, tl.lightPos.z));
 
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].lightPos.x = %0.4ff;\n", theTime, light, tl.lightPos.x));
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].lightPos.y = %0.4ff;\n", theTime, light, tl.lightPos.y));
-			DEBUG_LOG(("TheGlobalData->m_terrainLighting[%d][%d].lightPos.z = %0.4ff;\n", theTime, light, tl.lightPos.z));
-				
 			tl = TheGlobalData->m_terrainObjectsLighting[theTime][light];
 
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].ambient.red = %0.4ff;\n", theTime, light, tl.ambient.red));
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].ambient.green = %0.4ff;\n", theTime, light, tl.ambient.green));
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].ambient.blue = %0.4ff;\n", theTime, light, tl.ambient.blue));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].ambient.red = %0.4ff;", theTime, light, tl.ambient.red));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].ambient.green = %0.4ff;", theTime, light, tl.ambient.green));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].ambient.blue = %0.4ff;", theTime, light, tl.ambient.blue));
 
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].diffuse.red = %0.4ff;\n", theTime, light, tl.diffuse.red));
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].diffuse.green = %0.4ff;\n", theTime, light, tl.diffuse.green));
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].diffuse.blue = %0.4ff;\n", theTime, light, tl.diffuse.blue));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].diffuse.red = %0.4ff;", theTime, light, tl.diffuse.red));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].diffuse.green = %0.4ff;", theTime, light, tl.diffuse.green));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].diffuse.blue = %0.4ff;", theTime, light, tl.diffuse.blue));
 
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].lightPos.x = %0.4ff;\n", theTime, light, tl.lightPos.x));
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].lightPos.y = %0.4ff;\n", theTime, light, tl.lightPos.y));
-			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].lightPos.z = %0.4ff;\n", theTime, light, tl.lightPos.z));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].lightPos.x = %0.4ff;", theTime, light, tl.lightPos.x));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].lightPos.y = %0.4ff;", theTime, light, tl.lightPos.y));
+			DEBUG_LOG(("TheGlobalData->m_terrainObjectsLighting[%d][%d].lightPos.z = %0.4ff;", theTime, light, tl.lightPos.z));
 
-			DEBUG_LOG(("\n"));
+			DEBUG_LOG_RAW(("\n"));
 		}
-		DEBUG_LOG(("\n"));
+		DEBUG_LOG_RAW(("\n"));
 	}
 #endif
 }
@@ -469,7 +469,7 @@ void GlobalLightOptions::OnResetLights()
 	TheWritableGlobalData->m_terrainObjectsLighting[4][2].lightPos.y = 0.00f;
 	TheWritableGlobalData->m_terrainObjectsLighting[4][2].lightPos.z = -1.00f;
 
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		pView->setLighting(&TheGlobalData->m_terrainLighting[TheGlobalData->m_timeOfDay][K_SUN], K_TERRAIN, K_SUN);
 		pView->setLighting(&TheGlobalData->m_terrainLighting[TheGlobalData->m_timeOfDay][K_ACCENT1], K_TERRAIN, K_ACCENT1);
@@ -488,9 +488,9 @@ void GlobalLightOptions::OnResetLights()
 // GlobalLightOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL GlobalLightOptions::OnInitDialog() 
+BOOL GlobalLightOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	kUIRedIDs[0] = IDC_RD_EDIT;
@@ -539,7 +539,7 @@ BOOL GlobalLightOptions::OnInitDialog()
 
 
 /** Displays the current values in the fields. */
-void GlobalLightOptions::stuffValuesIntoFields(Int lightIndex) 
+void GlobalLightOptions::stuffValuesIntoFields(Int lightIndex)
 {
 	const GlobalData::TerrainLighting *tl;
 	if (m_lighting == K_OBJECTS || m_lighting == K_BOTH) {
@@ -620,7 +620,7 @@ void GlobalLightOptions::stuffValuesIntoFields(Int lightIndex)
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
 
-BOOL GlobalLightOptions::GetInt(Int ctrlID, Int *rVal) 
+BOOL GlobalLightOptions::GetInt(Int ctrlID, Int *rVal)
 {
 	CWnd *pEdit = GetDlgItem(ctrlID);
 	char buffer[_MAX_PATH];
@@ -635,7 +635,7 @@ BOOL GlobalLightOptions::GetInt(Int ctrlID, Int *rVal)
 	return false;
 }
 
-void GlobalLightOptions::PutInt(Int ctrlID, Int val) 
+void GlobalLightOptions::PutInt(Int ctrlID, Int val)
 {
 	CString str;
 	CWnd *pEdit = GetDlgItem(ctrlID);
@@ -645,7 +645,7 @@ void GlobalLightOptions::PutInt(Int ctrlID, Int val)
 	}
 }
 
-void GlobalLightOptions::OnChangeFrontBackEdit() 
+void GlobalLightOptions::OnChangeFrontBackEdit()
 {
 	if (m_updating) return;
 	GetInt(IDC_FB_EDIT, &m_angleAzimuth[K_SUN]);
@@ -661,7 +661,7 @@ void GlobalLightOptions::OnChangeFrontBackEdit()
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the angles. */
-void GlobalLightOptions::OnChangeLeftRightEdit() 
+void GlobalLightOptions::OnChangeLeftRightEdit()
 {
 	if (m_updating) return;
 	GetInt(IDC_LR_EDIT, &m_angleElevation[K_SUN]);
@@ -713,13 +713,13 @@ void GlobalLightOptions::applyColor(Int lightIndex)
 		tl.diffuse.green = ComponentToPercent(clr);
 	if (GetInt(kUIBlueIDs[lightIndex], &clr))
 		tl.diffuse.blue = ComponentToPercent(clr);
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		pView->setLighting(&tl, m_lighting, lightIndex);
 	}
 }
 
-void GlobalLightOptions::OnChangeColorEdit() 
+void GlobalLightOptions::OnChangeColorEdit()
 {
 	if (m_updating) return;
 	applyColor(K_SUN);
@@ -775,7 +775,7 @@ void GlobalLightOptions::GetPopSliderInfo(const long sliderID, long *pMin, long
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void GlobalLightOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -822,7 +822,7 @@ void GlobalLightOptions::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void GlobalLightOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -845,7 +845,7 @@ void GlobalLightOptions::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
@@ -883,7 +883,7 @@ END_MESSAGE_MAP()
 
 
 
-void GlobalLightOptions::OnRadioEverything() 
+void GlobalLightOptions::OnRadioEverything()
 {
 	m_lighting = K_BOTH;
 	stuffValuesIntoFields(K_SUN);
@@ -891,7 +891,7 @@ void GlobalLightOptions::OnRadioEverything()
 	stuffValuesIntoFields(K_ACCENT2);
 }
 
-void GlobalLightOptions::OnRadioObjects() 
+void GlobalLightOptions::OnRadioObjects()
 {
 	m_lighting = K_OBJECTS;
 	stuffValuesIntoFields(K_SUN);
@@ -899,7 +899,7 @@ void GlobalLightOptions::OnRadioObjects()
 	stuffValuesIntoFields(K_ACCENT2);
 }
 
-void GlobalLightOptions::OnRadioTerrain() 
+void GlobalLightOptions::OnRadioTerrain()
 {
 	m_lighting = K_TERRAIN;
 	stuffValuesIntoFields(K_SUN);
@@ -924,9 +924,9 @@ void GlobalLightOptions::OnClose()
 {
 	ShowWindow(SW_HIDE);
 
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
-		Coord3D lightRay; 
+		Coord3D lightRay;
 		lightRay.x=0.0f;lightRay.y=0.0f;lightRay.z=-1.0f;	//default light above terrain.
 		pView->doLightFeedback(false,lightRay,0);	//turn off the light direction indicator
 	}
@@ -954,15 +954,15 @@ void GlobalLightOptions::OnShowWindow(BOOL bShow, UINT nStatus)
 #endif
 };
 
-void GlobalLightOptions::OnMove(int x, int y) 
+void GlobalLightOptions::OnMove(int x, int y)
 {
 	CDialog::OnMove(x, y);
-	
+
 	if (this->IsWindowVisible() && !this->IsIconic()) {
 		CRect frameRect;
 		GetWindowRect(&frameRect);
 		::AfxGetApp()->WriteProfileInt(GLOBALLIGHT_OPTIONS_PANEL_SECTION, "Top", frameRect.top);
 		::AfxGetApp()->WriteProfileInt(GLOBALLIGHT_OPTIONS_PANEL_SECTION, "Left", frameRect.left);
 	}
-	
+
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/GroveOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/GroveOptions.cpp
index fe13b64f24e..7be64efb177 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/GroveOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/GroveOptions.cpp
@@ -176,11 +176,11 @@ void GroveOptions::_setTreesToLists(void)
 {
 	CString str;
 	for (VecPairNameDisplayNameIt it = mVecDisplayNames.begin(); it != mVecDisplayNames.end(); it++) {
-		// TODO: If/when Models get Display strings, we need to replace the 
+		// TODO: If/when Models get Display strings, we need to replace the
 		// current (str = ...) line with the commented one JKMCD
 		str = it->first.str();
 		//str = GetDisplayNameFromPair(it).str();
-		
+
 		CComboBox* pComboBox = (CComboBox*) GetDlgItem(IDC_Grove_Type1);
 		if (pComboBox) {
 			pComboBox->AddString(str);
@@ -266,35 +266,35 @@ void GroveOptions::_setDefaultRatios(void)
 	CWnd* pWnd = GetDlgItem(IDC_Grove_Per1);
 	if (pWnd) {
 		defaultRatio = AfxGetApp()->GetProfileInt("GroveOptions", "DefaultRatio1", 0);
-		sprintf(buff, "%d", defaultRatio);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", defaultRatio);
 		pWnd->SetWindowText(buff);
 	}
 
 	pWnd = GetDlgItem(IDC_Grove_Per2);
 	if (pWnd) {
 		defaultRatio = AfxGetApp()->GetProfileInt("GroveOptions", "DefaultRatio2", 0);
-		sprintf(buff, "%d", defaultRatio);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", defaultRatio);
 		pWnd->SetWindowText(buff);
 	}
 
 	pWnd = GetDlgItem(IDC_Grove_Per3);
 	if (pWnd) {
 		defaultRatio = AfxGetApp()->GetProfileInt("GroveOptions", "DefaultRatio3", 0);
-		sprintf(buff, "%d", defaultRatio);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", defaultRatio);
 		pWnd->SetWindowText(buff);
 	}
 
 	pWnd = GetDlgItem(IDC_Grove_Per4);
 	if (pWnd) {
 		defaultRatio = AfxGetApp()->GetProfileInt("GroveOptions", "DefaultRatio4", 0);
-		sprintf(buff, "%d", defaultRatio);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", defaultRatio);
 		pWnd->SetWindowText(buff);
 	}
 
 	pWnd = GetDlgItem(IDC_Grove_Per5);
 	if (pWnd) {
 		defaultRatio = AfxGetApp()->GetProfileInt("GroveOptions", "DefaultRatio5", 0);
-		sprintf(buff, "%d", defaultRatio);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", defaultRatio);
 		pWnd->SetWindowText(buff);
 	}
 }
@@ -308,7 +308,7 @@ void GroveOptions::_setDefaultNumTrees(void)
 
 	int defaultNumTrees = AfxGetApp()->GetProfileInt("GroveOptions", "NumberofTrees", 10);
 	static char buff[ARBITRARY_BUFF_SIZE];
-	sprintf(buff, "%d", defaultNumTrees);
+	snprintf(buff, ARRAY_SIZE(buff), "%d", defaultNumTrees);
 
 	pWnd->SetWindowText(buff);
 }
@@ -379,14 +379,14 @@ void GroveOptions::_updateTreeWeights(void)
 
 	pWnd = GetDlgItem(IDC_Grove_PerTotal);
 	if (pWnd) {
-		sprintf(buff, "%d", val);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", val);
 		pWnd->SetWindowText(buff);
 	}
 }
 
 void GroveOptions::_updateTreeCount(void)
 {
-	static char buff[ARBITRARY_BUFF_SIZE];	
+	static char buff[ARBITRARY_BUFF_SIZE];
 	CWnd* pWnd = GetDlgItem(IDC_Grove_NumberTrees);
 	if (pWnd) {
 		pWnd->GetWindowText(buff, ARBITRARY_BUFF_SIZE - 1);
@@ -426,7 +426,7 @@ void GroveOptions::_updateGroveMakeup(void)
 			AfxGetApp()->WriteProfileInt("GroveOptions", "TreeType4", curSel);
 		} else if (type == 5) {
 			AfxGetApp()->WriteProfileInt("GroveOptions", "TreeType5", curSel);
-		}		
+		}
 	}
 }
 
@@ -442,7 +442,7 @@ void GroveOptions::_updatePlacementAllowed(void)
 
 	pButt = (CButton*) GetDlgItem(IDC_Grove_AllowWaterPlacement);
 	if (pButt) {
-		AfxGetApp()->WriteProfileInt("GroveOptions", "AllowWaterPlace", pButt->GetCheck()); 
+		AfxGetApp()->WriteProfileInt("GroveOptions", "AllowWaterPlace", pButt->GetCheck());
 	}
 
 
@@ -489,4 +489,4 @@ BEGIN_MESSAGE_MAP(GroveOptions, CDialog)
 	ON_CBN_SELENDOK(IDC_Grove_Type5, _updateGroveMakeup)
 	ON_BN_CLICKED(IDC_Grove_AllowCliffPlacement, _updatePlacementAllowed)
 	ON_BN_CLICKED(IDC_Grove_AllowWaterPlacement, _updatePlacementAllowed)
-END_MESSAGE_MAP()
\ No newline at end of file
+END_MESSAGE_MAP()
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/GroveTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/GroveTool.cpp
index 3896d02ac3c..753714f4574 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/GroveTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/GroveTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "GroveTool.h"
@@ -80,7 +80,7 @@ void GroveTool::plantTree( Coord3D *pos )
 	int totalValue = TheGroveOptions->getTotalTreePerc();
 	int randVal = GameLogicRandomValue(0, totalValue - 1);
 
-	
+
 	int runningCum = 0;
 	for (int i = 1; i <= 5; ++i) {
 		runningCum +=  TheGroveOptions->getNumType(i);
@@ -97,7 +97,7 @@ void GroveTool::plantTree( Coord3D *pos )
 	addObj(pos, treeName);
 }
 
-void GroveTool::activate() 
+void GroveTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_GROVE_OPTIONS);
 	DrawObject::setDoBrushFeedback(false);
@@ -108,15 +108,15 @@ void GroveTool::activate()
 void GroveTool::plantShrub( Coord3D *pos )
 {
 // TODO: Determine when we can tell something is a shurubbery, and plant it here - jkmcd
-//	addObj(pos, AsciiString("Shrub"));
+//	addObj(pos, "Shrub");
 }
 
 void GroveTool::_plantGroveInBox(CPoint tl, CPoint br, WbView* pView)
 {
 
 	int numTotalTrees = TheGroveOptions->getNumTrees();
-	
-	Coord3D tl3d, tr3d, bl3d;	
+
+	Coord3D tl3d, tr3d, bl3d;
 	pView->viewToDocCoords(tl, &tl3d);
 	pView->viewToDocCoords(CPoint(tl.x, br.y), &bl3d);
 	pView->viewToDocCoords(CPoint(br.x, tl.y), &tr3d);
@@ -141,7 +141,7 @@ void GroveTool::_plantGroveInBox(CPoint tl, CPoint br, WbView* pView)
 
 		tlVec = tlVec + trVec;
 		tlVec = tlVec + blVec;
-		
+
 		Coord3D position;
 
 		position.x = tlVec.X;
@@ -216,9 +216,9 @@ void GroveTool::plantGrove( Coord3D pos, Coord3D prevDir, Real baseHeight, Int l
 				// tree must be on map
 				// tree must not be in the water
 				if (dir.x * prevDir.x + dir.y * prevDir.y >= 0.0f &&
-						normal.z > flatTolerance && 
+						normal.z > flatTolerance &&
 						fabs(childPos.z - baseHeight) < heightTolerance &&
-						childPos.x > 0 && childPos.y > 0 && 
+						childPos.x > 0 && childPos.y > 0 &&
 						childPos.x < bounds.x && childPos.y < bounds.y &&
 						(!localIsUnderwater(childPos.x, childPos.y)))
 					break;
@@ -236,21 +236,19 @@ void GroveTool::plantGrove( Coord3D pos, Coord3D prevDir, Real baseHeight, Int l
 //
 /// Constructor
 GroveTool::GroveTool(void) :
-	Tool(ID_GROVE_TOOL, IDC_GROVE) 
+	Tool(ID_GROVE_TOOL, IDC_GROVE)
 {
 		m_headMapObj = NULL;
 }
-	
+
 /// Destructor
-GroveTool::~GroveTool(void) 
+GroveTool::~GroveTool(void)
 {
-	if (m_headMapObj) {
-		deleteInstance(m_headMapObj);
-	}
+	deleteInstance(m_headMapObj);
 }
 
 /** Execute the tool on mouse down - Place an object. */
-void GroveTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void GroveTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	m_downPt = viewPt;
@@ -258,7 +256,7 @@ void GroveTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 }
 
 /** Execute the tool on mouse up - Place an object. */
-void GroveTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void GroveTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -280,18 +278,18 @@ void GroveTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBui
 			m_headMapObj = NULL; // undoable owns it now.
 		}
 		return;
-	}	
+	}
+
+	Coord3D loc;
 
-	Coord3D loc;  
-	
 	pView->viewToDocCoords(m_downPt, &loc);
 
-	WorldHeightMapEdit *pMap = pDoc->GetHeightMap(); 
+	WorldHeightMapEdit *pMap = pDoc->GetHeightMap();
 	CPoint bounds;
 	bounds.x = pMap->getXExtent()*MAP_XY_FACTOR;
-	bounds.y = pMap->getYExtent()*MAP_XY_FACTOR; 
+	bounds.y = pMap->getYExtent()*MAP_XY_FACTOR;
 //	Real angle = 0;
-	Int depth = 3;		
+	Int depth = 3;
 	Coord3D zeroDir;
 
 	zeroDir.x = 0.0f;
@@ -344,7 +342,7 @@ void GroveTool::addObj(Coord3D *pos, AsciiString name)
 	MapObject *pNew = newInstance( MapObject)(theLoc, pCur->getName(), angle, 0, NULL, pCur->getThingTemplate() );
 	pNew->getProperties()->setAsciiString(TheKey_originalOwner, NEUTRAL_TEAM_INTERNAL_STR);
 	pNew->setNextMap(m_headMapObj);
-	m_headMapObj = pNew;	
+	m_headMapObj = pNew;
 }
 
 
@@ -352,11 +350,11 @@ void GroveTool::addObj(Coord3D *pos, AsciiString name)
 static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 {
 	Coord3D otherPos;
-	
+
 	otherPos = pos;
 	otherPos.x += MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
+
 	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) ||
 		  ((otherPos.z / pos.z / 1) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
@@ -365,8 +363,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos = pos;
 	otherPos.y += MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / 1) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
@@ -374,8 +372,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos = pos;
 	otherPos.y -= MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / 1) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
@@ -383,8 +381,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos = pos;
 	otherPos.x -= MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / 1) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / 1) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
@@ -393,8 +391,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos.x += MAP_XY_FACTOR;
 	otherPos.y += MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
@@ -403,8 +401,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos.x += MAP_XY_FACTOR;
 	otherPos.y -= MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
@@ -413,8 +411,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos.x -= MAP_XY_FACTOR;
 	otherPos.y -= MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
@@ -423,8 +421,8 @@ static Bool _positionIsTooCliffyForTrees(Coord3D pos)
 	otherPos.x -= MAP_XY_FACTOR;
 	otherPos.y += MAP_XY_FACTOR;
 	otherPos.z = TheTerrainRenderObject->getHeightMapHeight(otherPos.x, otherPos.y, NULL);
-	
-	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) || 
+
+	if (((pos.z / otherPos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN) ||
 			((otherPos.z / pos.z / SQRT_2) > MAX_TREE_RISE_OVER_RUN)) {
 		return true;
 	}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/HandScrollTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/HandScrollTool.cpp
index 9eb0349f55d..3ef8150a05e 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/HandScrollTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/HandScrollTool.cpp
@@ -20,7 +20,7 @@
 // Scrolling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "HandScrollTool.h"
@@ -39,22 +39,22 @@ static const Int MAX_SCROLL = 1000;
 
 /// Constructor
 HandScrollTool::HandScrollTool(void) :
-	Tool(ID_HAND_SCROLL_TOOL, IDC_HAND_SCROLL) 
+	Tool(ID_HAND_SCROLL_TOOL, IDC_HAND_SCROLL)
 {
 }
-	
+
 /// Shows the terrain materials options panel.
-void HandScrollTool::activate() 
+void HandScrollTool::activate()
 {
 	return; // Hand scroll tool intentionally doesn't change tool panel.
 }
 
 /// Destructor
-HandScrollTool::~HandScrollTool(void) 	  
+HandScrollTool::~HandScrollTool(void)
 {
 }
 
-void HandScrollTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void HandScrollTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L && m != TRACK_R && m != TRACK_M) return;
 
@@ -97,7 +97,7 @@ void HandScrollTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, C
 		// Scroll dynamically.
 		Coord3D prev, cur;
 		if (pView->viewToDocCoords(m_prevPt2d, &prev, false) &&
-					pView->viewToDocCoords(viewPt, &cur, false)) 
+					pView->viewToDocCoords(viewPt, &cur, false))
 		{
 
 			Real dx = cur.x - prev.x;
@@ -117,7 +117,7 @@ void HandScrollTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, C
 	}
 }
 
-void HandScrollTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void HandScrollTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m == TRACK_M) {
 		// if haven't moved, reset view
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ImpassableOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ImpassableOptions.cpp
index 7ace7f68cb1..2c59f005242 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ImpassableOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ImpassableOptions.cpp
@@ -19,7 +19,7 @@
 // ImpassableOptions.cpp
 // Author: John McDonald, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "ImpassableOptions.h"
@@ -28,11 +28,11 @@
 #include "WorldBuilderDoc.h"
 
 //-------------------------------------------------------------------------------------------------
-ImpassableOptions::ImpassableOptions(CWnd* pParent, Real defaultSlope) : 
-	CDialog(ImpassableOptions::IDD, pParent), 
+ImpassableOptions::ImpassableOptions(CWnd* pParent, Real defaultSlope) :
+	CDialog(ImpassableOptions::IDD, pParent),
 	m_slopeToShow(defaultSlope),
 	m_defaultSlopeToShow(defaultSlope)
-{	
+{
 	// nada to do
 	m_showImpassableAreas = TheTerrainRenderObject->getShowImpassableAreas();
 	TheTerrainRenderObject->setShowImpassableAreas(TRUE);
@@ -108,4 +108,4 @@ void ImpassableOptions::OnPreview()
 BEGIN_MESSAGE_MAP(ImpassableOptions, CDialog)
 	ON_EN_UPDATE(IDC_ANGLE, OnAngleChange)
 	ON_BN_CLICKED(IDC_PREVIEW, OnPreview)
-END_MESSAGE_MAP()
\ No newline at end of file
+END_MESSAGE_MAP()
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp
index 8b21f94e377..edd9ebd3e8c 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: LayersList.cpp 
+// FILE: LayersList.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -60,7 +60,7 @@ void CLLTreeCtrl::buildMoveMenu(CMenu* moveMenu, UINT firstID)
 
 	// to save the copy
 	const ListLayer& layer = pParent->GetAllLayers();
-	
+
 	ListLayer::const_iterator cit;
 
 	int i = 0;
@@ -120,7 +120,7 @@ void CLLTreeCtrl::OnRButtonDown(UINT nFlags, CPoint point)
 		if (contextIsLayer) {
 			CString itemText = GetItemText(item);
 			if ((itemText.CompareNoCase(LayersList::TheActiveLayerName.c_str()) == 0) ||
-				((LayersList::TheActiveLayerName.c_str() == NULL) && 
+				((LayersList::TheActiveLayerName.c_str() == NULL) &&
 				(LayersList::TheUnmutableDefaultLayerName.compare(LayersList::TheDefaultLayerName) == 0))) {
 				// Don't allow the current layer to be hidden.
 				// Because the objects will immediately disappear when placed.
@@ -130,7 +130,7 @@ void CLLTreeCtrl::OnRButtonDown(UINT nFlags, CPoint point)
 				Bool hidden = ll->isLayerHidden(AsciiString(itemText));
 				pPopup->CheckMenuItem(ID_HIDECURRENTLAYER, MF_BYCOMMAND | (hidden ? MF_CHECKED : MF_UNCHECKED));
 			}
-			
+
 			CMenu *moveMenu = pPopup->GetSubMenu(LAYERS_LIST_MERGE_LAYER_INTO);
 			moveMenu->RemoveMenu(0, MF_BYPOSITION);
 			buildMoveMenu(moveMenu, ID_LAYERSLIST_MERGELAYERINTO_BEGIN);
@@ -168,7 +168,7 @@ END_MESSAGE_MAP()
 // LayersList Implementation //////////////////////////////////////////////////////////////////////
 
 LayersList::LayersList(UINT nIDTemplate, CWnd *parentWnd) : CDialog(nIDTemplate, parentWnd)
-{ 
+{
 	mTree = NULL;
 	m_activatedLayer = false;
 	resetLayers();
@@ -306,7 +306,7 @@ void LayersList::addLayerNamed(IN AsciiString layerToAdd)
 		DEBUG_CRASH(("Already found a layer named %s", layerToAdd.str()));
 		return;
 	}
-	
+
 	if (layerToAdd.isEmpty()) {
 		return;
 	}
@@ -362,7 +362,7 @@ void LayersList::changeLayerName(IN AsciiString oldLayerName, AsciiString newLay
 }
 
 void LayersList::mergeLayerInto(IN ListLayerIt src, IN ListLayerIt dst)
-{	
+{
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (!pDoc) {
 		return;
@@ -431,11 +431,11 @@ void LayersList::updateUIFromList(void)
 
 //	int index = 0;
 
-	for (ListLayerIt layersIt = mLayers.begin(); layersIt != mLayers.end(); ++layersIt) {		
-		// Add a branch for each Layer. 
+	for (ListLayerIt layersIt = mLayers.begin(); layersIt != mLayers.end(); ++layersIt) {
+		// Add a branch for each Layer.
 		int iconToShow = (layersIt->show ? 0 : 1);
 		HTREEITEM thisBranch = pTree->InsertItem(layersIt->layerName.str(), iconToShow, iconToShow);
-		
+
 		for (ListMapObjectPtrIt objIt = layersIt->objectsInLayer.begin(); objIt != layersIt->objectsInLayer.end(); ++objIt) {
 			Bool exists;
 			AsciiString uniqueID = (*objIt)->getProperties()->getAsciiString(TheKey_uniqueID, &exists);
@@ -444,8 +444,8 @@ void LayersList::updateUIFromList(void)
 			} else {
 				pTree->InsertItem((*objIt)->getName().str(), iconToShow, iconToShow, thisBranch);
 			}
-		} 
-		
+		}
+
 		for (ListPolygonTriggerPtrIt triggerIt = layersIt->polygonTriggersInLayer.begin(); triggerIt != layersIt->polygonTriggersInLayer.end(); ++triggerIt) {
 			AsciiString uniqueID = (*triggerIt)->getTriggerName();
 			pTree->InsertItem(uniqueID.str(), iconToShow, iconToShow, thisBranch);
@@ -563,7 +563,7 @@ void LayersList::addMapObjectToLayer(IN MapObject *objectToAdd, IN ListLayerIt *
 		int iconToShow = (layerToAddTo->show ? 0 : 1);
 		mTree->InsertItem(objName.str(), iconToShow, iconToShow, hItem);
 	}
-	
+
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (!pDoc) {
 		return;
@@ -613,7 +613,7 @@ void LayersList::addPolygonTriggerToLayer(IN PolygonTrigger *triggerToAdd, IN Li
 		int iconToShow = (layerToAddTo->show ? 0 : 1);
 		mTree->InsertItem(triggerName.str(), iconToShow, iconToShow, hItem);
 	}
-	
+
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (!pDoc) {
 		return;
@@ -665,7 +665,7 @@ void LayersList::removeMapObjectFromLayer(IN MapObject *objectToRemove, IN ListL
 
 	// layerToRemoveFrom and objectToRemove are now valid. Remove em.
 	layerToRemoveFrom->objectsInLayer.erase(objectBeingRemove);
-	
+
 }
 
 void LayersList::removePolygonTriggerFromLayer(IN PolygonTrigger *triggerToRemove, IN ListLayerIt *layerIt, IN ListPolygonTriggerPtrIt *triggerIt)
@@ -704,7 +704,7 @@ void LayersList::removePolygonTriggerFromLayer(IN PolygonTrigger *triggerToRemov
 
 	// layerToRemoveFrom and objectToRemove are now valid. Remove em.
 	layerToRemoveFrom->polygonTriggersInLayer.erase(triggerBeingRemove);
-	
+
 }
 
 
@@ -719,7 +719,7 @@ BOOL LayersList::OnInitDialog()
 	if (!pTree) {
 		return 1;
 	}
-	
+
 	CRect rect;
 	mTree = new CLLTreeCtrl;
 	pTree->GetWindowRect(&rect);
@@ -733,7 +733,7 @@ BOOL LayersList::OnInitDialog()
 	// pTree should == mTree now.
 
 	mImageList.Create(16, 16, ILC_COLOR8, 3, 3);
-	
+
 	// If the order of these are changed, please update the enum in updateTreeImages.
 	mImageList.Add(LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_Show)));
 	mImageList.Add(LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_Hide)));
@@ -744,10 +744,10 @@ BOOL LayersList::OnInitDialog()
 
 
 	return 1;
-	
+
 }
 
-// returning 0 means editing can continue. 
+// returning 0 means editing can continue.
 // returning 1 means editing is cancelled
 void LayersList::OnBeginEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult)
 {
@@ -758,7 +758,7 @@ void LayersList::OnBeginEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult)
 	}
 
 	TV_DISPINFO *ptvdi = (TV_DISPINFO*) pNotifyStruct;
-	if (ptvdi == NULL) { 
+	if (ptvdi == NULL) {
 		(*pResult) = 1;
 		return;
 	}
@@ -774,9 +774,9 @@ void LayersList::OnBeginEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult)
 		return;
 	}
 
-	
+
 	CString str = pTree->GetItemText(ptvdi->item.hItem);
-	// if we can't find the layer of that name, then 
+	// if we can't find the layer of that name, then
 	if (!findLayerNamed(AsciiString(str))) {
 		// End the editing
 		(*pResult) = 1;
@@ -794,7 +794,7 @@ void LayersList::OnEndEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult)
 	if (!pTree) {
 		return;
 	}
-	
+
 	TV_DISPINFO *ptvdi = (TV_DISPINFO*) pNotifyStruct;
 	if (!ptvdi->item.pszText) {
 		return;
@@ -815,7 +815,7 @@ void LayersList::OnEndEditLabel(NMHDR *pNotifyStruct, LRESULT* pResult)
 	pTree->SetItemText(ptvdi->item.hItem, layerIt->layerName.str());
 
 	mCurrentlyEditingLabel = AsciiString::TheEmptyString;
-	
+
 	return;
 }
 
@@ -828,7 +828,7 @@ void LayersList::OnNewLayer()
 	}
 
 	static char buffer[1024];
-	sprintf(buffer, "%s %d", TheDefaultNewLayerName.c_str(), newLayerNum);
+	snprintf(buffer, ARRAY_SIZE(buffer), "%s %d", TheDefaultNewLayerName.c_str(), newLayerNum);
 	addLayerNamed(buffer);
 
 	HTREEITEM newItem = pTree->InsertItem(buffer, 0, 0);
@@ -917,7 +917,7 @@ HTREEITEM LayersList::findTreeObjectNamed(const AsciiString& objectToFind, HTREE
 	}
 
 	HTREEITEM hItem = mTree->GetChildItem(layerItem);
-	
+
 	while (hItem) {
 		if (objectToFind.compareNoCase(mTree->GetItemText(hItem)) == 0) {
 			return hItem;
@@ -966,7 +966,7 @@ void LayersList::OnCancel()
 	if (!pTree) {
 		return;
 	}
-	
+
 	// end editing in place with failure
 	TreeView_EndEditLabelNow(pTree->GetSafeHwnd(), true);
 }
@@ -987,20 +987,20 @@ void LayersList::OnMergeLayer(UINT commandID)
 	if (layerOffset < 0) {
 		return;
 	}
-	
+
 	ListLayerIt dstlayerIt = mLayers.begin();
 
 	while (layerOffset && dstlayerIt != mLayers.end()) {
 		++dstlayerIt;
 		--layerOffset;
 	}
-	
+
 	AsciiString lastClickedLayer = mTree->getLastClickedLayer();
 	ListLayerIt srclayerIt = mLayers.begin();
 	while (srclayerIt != mLayers.end() && srclayerIt->layerName.compareNoCase(lastClickedLayer) != 0) {
 		++srclayerIt;
 	}
-	
+
 	if (srclayerIt == mLayers.end()) {
 		return;
 	}
@@ -1024,14 +1024,14 @@ void LayersList::OnMergeObject(UINT commandID)
 	if (layerOffset < 0) {
 		return;
 	}
-	
+
 	ListLayerIt layerIt = mLayers.begin();
 
 	while (layerOffset && layerIt != mLayers.end()) {
 		++layerIt;
 		--layerOffset;
 	}
-	
+
 	AsciiString lastClickedObj = mTree->getLastClickedObject();
 	MapObject *objToMove = findObjectByUID(lastClickedObj);
 	if (objToMove) {
@@ -1049,7 +1049,7 @@ void LayersList::OnSelectActiveLayer()
 	while (srclayerIt != mLayers.end() && srclayerIt->layerName.compareNoCase(lastClickedLayer) != 0) {
 		++srclayerIt;
 	}
-	
+
 	if (srclayerIt == mLayers.end()) {
 		return;
 	}
@@ -1130,7 +1130,7 @@ void LayersList::updateTreeImages()
 		HTREEITEM item = mTree->GetChildItem(layer);
 		while (item) {
 			mTree->SetItemImage(item, childIcon, childIcon);
-			item = mTree->GetNextSiblingItem(item);	
+			item = mTree->GetNextSiblingItem(item);
 		}
 	}
 }
@@ -1141,7 +1141,7 @@ void LayersList::OnMergeViewSelection(UINT commandID)
 	if (layerOffset < 0) {
 		return;
 	}
-	
+
 	ListLayerIt layerIt = mLayers.begin();
 
 	while (layerOffset && layerIt != mLayers.end()) {
@@ -1155,12 +1155,12 @@ void LayersList::OnMergeViewSelection(UINT commandID)
 	while (mapObject) {
 		if (mapObject->isSelected()) {
 			allSelectedObjects.push(mapObject);
-		}	
-		
+		}
+
 		mapObject = mapObject->getNext();
 	}
 
-	while (allSelectedObjects.size() > 0) {
+	while (!allSelectedObjects.empty()) {
 		changeMapObjectLayer(allSelectedObjects.top(), layerIt->layerName);
 		allSelectedObjects.pop();
 	}
@@ -1172,12 +1172,12 @@ void LayersList::OnMergeViewSelection(UINT commandID)
 	while (polygonTrigger) {
 		if (polygonTrigger->getSelected()) {
 			allSelectedTriggers.push(polygonTrigger);
-		}	
-		
+		}
+
 		polygonTrigger = polygonTrigger->getNext();
 	}
 
-	while (allSelectedTriggers.size() > 0) {
+	while (!allSelectedTriggers.empty()) {
 		changePolygonTriggerLayer(allSelectedTriggers.top(), layerIt->layerName);
 		allSelectedTriggers.pop();
 	}
@@ -1297,7 +1297,7 @@ MapObject *LayersList::findObjectByUID(AsciiString objectIDToFind)
 		if (exists) {
 			if (testID.compareNoCase(objectIDToFind) == 0) {
 				return obj;
-			}			    
+			}
 		}
 		obj = obj->getNext();
 	}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/LightOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/LightOptions.cpp
index d192232ce05..6fbbe7267f6 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/LightOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/LightOptions.cpp
@@ -35,7 +35,7 @@ LightOptions *LightOptions::m_staticThis = NULL;
 
 LightOptions::LightOptions(CWnd* pParent /*=NULL*/)
 {
-	//{{AFX_DATA_INIT(LightOptions) 
+	//{{AFX_DATA_INIT(LightOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -51,8 +51,8 @@ void LightOptions::DoDataExchange(CDataExchange* pDX)
 
 MapObject *LightOptions::getSingleSelectedLight(void)
 {
-	MapObject *pMapObj; 
-	MapObject *theMapObj = NULL; 
+	MapObject *pMapObj;
+	MapObject *theMapObj = NULL;
 //	Bool found = false;
 	Int selCount=0;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
@@ -70,9 +70,9 @@ MapObject *LightOptions::getSingleSelectedLight(void)
 }
 
 
-void LightOptions::updateTheUI(void) 
+void LightOptions::updateTheUI(void)
 {
-	MapObject *theMapObj = getSingleSelectedLight(); 
+	MapObject *theMapObj = getSingleSelectedLight();
 	if (!theMapObj) return;
 	Dict *props = theMapObj->getProperties();
 
@@ -114,7 +114,7 @@ void LightOptions::updateTheUI(void)
 	}
 }
 
-void LightOptions::update(void) 
+void LightOptions::update(void)
 {
 	if (m_staticThis) {
 		m_staticThis->updateTheUI();
@@ -125,12 +125,12 @@ void LightOptions::update(void)
 // LightOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL LightOptions::OnInitDialog() 
+BOOL LightOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = true;
 
 	m_staticThis = this;
@@ -151,9 +151,9 @@ BEGIN_MESSAGE_MAP(LightOptions, COptionsPanel)
 END_MESSAGE_MAP()
 
 
-void LightOptions::OnChangeLightEdit() 
+void LightOptions::OnChangeLightEdit()
 {
-	MapObject *theMapObj = getSingleSelectedLight(); 
+	MapObject *theMapObj = getSingleSelectedLight();
 	if (!theMapObj) return;
 	if (!theMapObj->isLight()) return;
 
@@ -207,7 +207,7 @@ void LightOptions::OnChangeLightEdit()
 	props->setInt(TheKey_lightAmbientColor, lightAmbientColor.getAsInt());
 	props->setInt(TheKey_lightDiffuseColor, lightDiffuseColor.getAsInt());
 
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		pView->invalObjectInView(theMapObj);
 	}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MainFrm.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MainFrm.cpp
index ecfa71b739f..8c45d2599cc 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/MainFrm.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MainFrm.cpp
@@ -77,14 +77,11 @@ CMainFrame::CMainFrame()
 
 CMainFrame::~CMainFrame()
 {
-	if (m_layersList) {
-		delete m_layersList;
-	}
+	delete m_layersList;
+	m_layersList = NULL;
 
-	if (m_scriptDialog) {
-		delete m_scriptDialog;
-		m_scriptDialog = NULL;
-	}
+	delete m_scriptDialog;
+	m_scriptDialog = NULL;
 
 	SaveBarState("MainFrame");
 	TheMainFrame = NULL;
@@ -127,12 +124,12 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 #undef WRAP
 	CPoint pos(frameRect.left,frameRect.top+60);
 	this->FloatControlBar(&m_floatingToolBar, pos, CBRS_ALIGN_LEFT);
-	m_floatingToolBar.EnableDocking(CBRS_ALIGN_TOP); 
+	m_floatingToolBar.EnableDocking(CBRS_ALIGN_TOP);
 #endif
 
 	if (!m_wndStatusBar.Create(this) || !m_wndStatusBar.SetIndicators(indicators, sizeof(indicators)/sizeof(UINT)))
 	{
-		DEBUG_CRASH(("Failed to create status bar\n"));
+		DEBUG_CRASH(("Failed to create status bar"));
 	}
 
 	if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP
@@ -168,7 +165,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	m_noOptions.GetWindowRect(&frameRect);
 	if (m_optionsPanelWidth < frameRect.Width()) m_optionsPanelWidth = frameRect.Width();
 	if (m_optionsPanelHeight < frameRect.Height()) m_optionsPanelHeight = frameRect.Height();
-	
+
 	m_terrainMaterial.Create(IDD_TERRAIN_MATERIAL, this);
 	m_terrainMaterial.SetWindowPos(NULL, frameRect.left, frameRect.top,	0, 0, SWP_NOZORDER|SWP_NOSIZE);
 	m_terrainMaterial.GetWindowRect(&frameRect);
@@ -282,23 +279,23 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	m_cameraOptions.Create(IDD_CAMERA_OPTIONS, this);
 	m_cameraOptions.SetWindowPos(NULL, frameRect.left, frameRect.top, 0, 0, SWP_NOZORDER|SWP_NOSIZE);
  	m_cameraOptions.GetWindowRect(&frameRect);
-	
+
 	// now, setup the Layers Panel
 	m_layersList = new LayersList(LayersList::IDD, this);
 	m_layersList->Create(LayersList::IDD, this);
 	m_layersList->ShowWindow(::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "ShowLayersList", 0) ? SW_SHOW : SW_HIDE);
-	
+
 	CRect optionsRect;
 	m_globalLightOptions.GetWindowRect(&optionsRect);
 	m_layersList->SetWindowPos(NULL, optionsRect.left, optionsRect.bottom + 100, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
-  
+
 	Int sbf = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "ShowBrushFeedback", 1);
 	if (sbf != 0) {
 		DrawObject::enableFeedback();
 	} else {
 		DrawObject::disableFeedback();
 	}
-	
+
 	Int autoSave = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "AutoSave", 1);
 	m_autoSave = autoSave != 0;
 	autoSave = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "AutoSaveIntervalSeconds", 120);
@@ -325,7 +322,7 @@ void CMainFrame::adjustWindowSize(void)
 //	Int borderY = ::GetSystemMetrics(SM_CYEDGE);
 	Int viewWidth = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "Width", THREE_D_VIEW_WIDTH);
 	Int viewHeight = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "Height", THREE_D_VIEW_HEIGHT);
-	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();	
+	WbView3d * pView = CWorldBuilderDoc::GetActive3DView();
 	if (pView) {
 		pView->GetClientRect(&client);
 	}	else {
@@ -336,7 +333,7 @@ void CMainFrame::adjustWindowSize(void)
 		int heightDelta = client.Height() - (viewHeight);
 		this->GetWindowRect(window);
 		Int newWidth = window.Width()-widthDelta;
-		Int newHeight = window.Height()-heightDelta; 
+		Int newHeight = window.Height()-heightDelta;
 	this->SetWindowPos(NULL, 0,
 	0, newWidth, newHeight,
 	SWP_NOMOVE|SWP_NOZORDER); // MainFrm.cpp sets the top and left.
@@ -393,22 +390,22 @@ void CMainFrame::showOptionsDialog(Int dialogID)
 		case IDD_MESHMOLD_OPTIONS:newOptions  = &m_meshMoldOptions; break;
 		case IDD_WAYPOINT_OPTIONS:newOptions  = &m_waypointOptions; break;
 		case IDD_WATER_OPTIONS:newOptions  = &m_waterOptions; break;
-		case IDD_LIGHT_OPTIONS:newOptions  = &m_lightOptions; break;		
-		case IDD_BUILD_LIST_PANEL:newOptions  = &m_buildListOptions; break;		
+		case IDD_LIGHT_OPTIONS:newOptions  = &m_lightOptions; break;
+		case IDD_BUILD_LIST_PANEL:newOptions  = &m_buildListOptions; break;
 		case IDD_GROVE_OPTIONS:newOptions = &m_groveOptions; break;
 		case IDD_RAMP_OPTIONS:newOptions = &m_rampOptions; break;
 		case IDD_SCORCH_OPTIONS:newOptions = &m_scorchOptions; break;
 		case IDD_NO_OPTIONS:newOptions  = &m_noOptions; break;
-		default : break;												 
-	}																						 
+		default : break;
+	}
 	CRect frameRect;
 	if (newOptions && newOptions != m_curOptions) {
 		newOptions->GetWindowRect(&frameRect);
 		if (m_curOptions) {
 			m_curOptions->GetWindowRect(&frameRect);
 		}
-		newOptions->SetWindowPos(m_curOptions, frameRect.left, frameRect.top, 
-			m_optionsPanelWidth, m_optionsPanelHeight, 
+		newOptions->SetWindowPos(m_curOptions, frameRect.left, frameRect.top,
+			m_optionsPanelWidth, m_optionsPanelHeight,
 			SWP_NOZORDER | SWP_NOACTIVATE );
 		::AfxGetApp()->WriteProfileInt(OPTIONS_PANEL_SECTION, "Top", frameRect.top);
 		::AfxGetApp()->WriteProfileInt(OPTIONS_PANEL_SECTION, "Left", frameRect.left);
@@ -420,17 +417,14 @@ void CMainFrame::showOptionsDialog(Int dialogID)
 	}
 }
 
-void CMainFrame::OnEditGloballightoptions() 
+void CMainFrame::OnEditGloballightoptions()
 {
 	m_globalLightOptions.ShowWindow(SW_SHOWNA);
 }
 
 void CMainFrame::onEditScripts()
 {
-	if (m_scriptDialog) {
-		// Delete the old one since it is no longer valid.
-		delete m_scriptDialog;
-	}
+	delete m_scriptDialog;
 
 	CRect frameRect;
 	GetWindowRect(&frameRect);
@@ -465,14 +459,14 @@ void CMainFrame::Dump(CDumpContext& dc) const
 
 
 #if DEAD
-	void CMainFrame::OnEditContouroptions() 
+	void CMainFrame::OnEditContouroptions()
 	{
-		ContourOptions contourOptsDialog(this);	
+		ContourOptions contourOptsDialog(this);
 		contourOptsDialog.DoModal();
 	}
 #endif
 
-void CMainFrame::OnMove(int x, int y) 
+void CMainFrame::OnMove(int x, int y)
 {
 	CFrameWnd::OnMove(x, y);
 	if (this->IsWindowVisible() && !this->IsIconic()) {
@@ -483,7 +477,7 @@ void CMainFrame::OnMove(int x, int y)
 	}
 }
 
-void CMainFrame::OnViewBrushfeedback() 
+void CMainFrame::OnViewBrushfeedback()
 {
 	if (DrawObject::isFeedbackEnabled()) {
 		DrawObject::disableFeedback();
@@ -494,12 +488,12 @@ void CMainFrame::OnViewBrushfeedback()
 	}
 }
 
-void CMainFrame::OnUpdateViewBrushfeedback(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewBrushfeedback(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(DrawObject::isFeedbackEnabled()?1:0);
 }
 
-void CMainFrame::OnDestroy() 
+void CMainFrame::OnDestroy()
 {
 	if (m_hAutoSaveTimer) {
 		KillTimer(m_hAutoSaveTimer);
@@ -508,7 +502,7 @@ void CMainFrame::OnDestroy()
 	CFrameWnd::OnDestroy();
 }
 
-void CMainFrame::OnTimer(UINT nIDEvent) 
+void CMainFrame::OnTimer(UINT nIDEvent)
 {
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (pDoc && pDoc->needAutoSave()) {
@@ -522,7 +516,7 @@ void CMainFrame::OnTimer(UINT nIDEvent)
 	}
 }
 
-void CMainFrame::OnEditCameraoptions() 
+void CMainFrame::OnEditCameraoptions()
 {
 	m_cameraOptions.ShowWindow(SW_SHOWNA);
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MapPreview.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MapPreview.cpp
index d357df86ff4..c6ea342ee18 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/MapPreview.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MapPreview.cpp
@@ -18,12 +18,12 @@
 
 // FILE: MapPreview.cpp /////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Electronic Arts Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2002 - All Rights Reserved                  
-//                                                                          
+//
+//                       Electronic Arts Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2002 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 //	created:	Oct 2002
@@ -31,9 +31,9 @@
 //	Filename: 	MapPreview.cpp
 //
 //	author:		Chris Huybregts
-//	
-//	purpose:	Contains the code used to generate and save the map preview to 
-//						the map file.  (Original code was taken from the Radar code in 
+//
+//	purpose:	Contains the code used to generate and save the map preview to
+//						the map file.  (Original code was taken from the Radar code in
 //						game engine).
 //
 //-----------------------------------------------------------------------------
@@ -47,7 +47,7 @@
 // USER INCLUDES //////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 #include "WHeightMapEdit.h"
 #include "WorldBuilderDoc.h"
@@ -55,7 +55,7 @@
 #include "W3DDevice/GameClient/HeightMap.h"
 #include "Common/MapReaderWriterInfo.h"
 #include "Common/FileSystem.h"
-#include "WWLib/TARGA.H"
+#include "WWLib/TARGA.h"
 #include "Common/DataChunk.h"
 //-----------------------------------------------------------------------------
 // DEFINES ////////////////////////////////////////////////////////////////////
@@ -82,29 +82,29 @@ void MapPreview::save( CString mapName )
 	chunkWriter.openDataChunk("MapPreview", K_MAPPREVIEW_VERSION_1);
 	chunkWriter.writeInt(MAP_PREVIEW_WIDTH);
 	chunkWriter.writeInt(MAP_PREVIEW_HEIGHT);
-	DEBUG_LOG(("BeginMapPreviewInfo\n"));
+	DEBUG_LOG(("BeginMapPreviewInfo"));
 	for(Int i = 0; i < MAP_PREVIEW_HEIGHT; ++i)
 	{
 		for(Int j = 0; j < MAP_PREVIEW_WIDTH; ++j)
 		{
 			chunkWriter.writeInt(m_pixelBuffer[i][j]);
-			DEBUG_LOG(("x:%d, y:%d, %X\n", j, i, m_pixelBuffer[i][j]));
+			DEBUG_LOG(("x:%d, y:%d, %X", j, i, m_pixelBuffer[i][j]));
 		}
 	}
 	chunkWriter.closeDataChunk();
-	DEBUG_LOG(("EndMapPreviewInfo\n"));
+	DEBUG_LOG(("EndMapPreviewInfo"));
 */
 }
 
-void MapPreview::interpolateColorForHeight( RGBColor *color,	
-																					Real height, 
+void MapPreview::interpolateColorForHeight( RGBColor *color,
+																					Real height,
 																					Real hiZ,
 																					Real midZ,
 																					Real loZ )
 {
 	const Real howBright = 0.30f;  // bigger is brighter (0.0 to 1.0)
 	const Real howDark   = 0.60f;  // bigger is darker (0.0 to 1.0)
-	
+
 	// sanity on map height (flat maps bomb)
 	if (hiZ == midZ)
 		hiZ = midZ+0.1f;
@@ -129,7 +129,7 @@ void MapPreview::interpolateColorForHeight( RGBColor *color,
 		colorTarget.green = color->green + (1.0f - color->green) * howBright;
 		colorTarget.blue = color->blue + (1.0f - color->blue) * howBright;
 
-	}  // end if
+	}
 	else  // interpolate darker
 	{
 
@@ -141,7 +141,7 @@ void MapPreview::interpolateColorForHeight( RGBColor *color,
 		colorTarget.green = color->green + (0.0f - color->green) * howDark;
 		colorTarget.blue = color->blue + (0.0f - color->blue) * howDark;
 
-	}  // end else
+	}
 
 	// interpolate toward the target color
 	color->red = color->red + (colorTarget.red - color->red) * t;
@@ -162,7 +162,7 @@ void MapPreview::interpolateColorForHeight( RGBColor *color,
 	if( color->blue > 1.0f )
 		color->blue = 1.0f;
 
-}  // end interpolateColorForHeight
+}
 
 Bool MapPreview::mapPreviewToWorld(const ICoord2D *radar, Coord3D *world)
 {
@@ -188,7 +188,7 @@ Bool MapPreview::mapPreviewToWorld(const ICoord2D *radar, Coord3D *world)
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	WorldHeightMapEdit *pMap = pDoc->GetHeightMap();
 	Real xSample, ySample;
-	
+
 	xSample = INT_TO_REAL(pMap->getXExtent() - (2 * pMap->getBorderSize())) / MAP_PREVIEW_WIDTH;
 	ySample = INT_TO_REAL(pMap->getYExtent() - (2 * pMap->getBorderSize())) / MAP_PREVIEW_HEIGHT;
 	// translate to world
@@ -198,7 +198,7 @@ Bool MapPreview::mapPreviewToWorld(const ICoord2D *radar, Coord3D *world)
 	// find the terrain height here
 //	world->z = pMap->gethigh
 //	TheTerrainLogic->getGroundHeight( world->x, world->y );
-		
+
 	return TRUE;
 
 }
@@ -237,7 +237,7 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 	for(i = 0; i < MAP_PREVIEW_HEIGHT; ++i)
 	{
 		for(j = 0; j < MAP_PREVIEW_WIDTH; ++j)
-		{	
+		{
 			radarPoint.x = j;
 			radarPoint.y = i;
 			mapPreviewToWorld( &radarPoint, &worldPoint );
@@ -251,7 +251,7 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 		}
 	}
 	getTerrainAverageZ = getTerrainAverageZ /terrainCount;
-	
+
 
 
 //	Color paddingColor = GameMakeColor( 100, 100, 100, 255 );
@@ -265,14 +265,14 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 			radarPoint.x = x;
 			radarPoint.y = y;
 			mapPreviewToWorld( &radarPoint, &worldPoint );
-			
+
 
 			// get height of the terrain at this sample point
 			z = pMap->getHeight(worldPoint.x, worldPoint.y);
-			
+
 			// create a color based on the Z height of the map
 			//Real waterZ;
-			
+
 			if( localIsUnderwater( MAP_XY_FACTOR *(worldPoint.x - pMap->getBorderSize()), MAP_XY_FACTOR * ( worldPoint.y - pMap->getBorderSize())) )
 			{
 				const Int waterSamplesAway = 1;		// how many "tiles" from the center tile we will sample away
@@ -297,16 +297,16 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 								radarPoint.x = i;
 								radarPoint.y = j;
 								mapPreviewToWorld( &radarPoint, &worldPoint );
-								
+
 								// get Z at this sample height
 								Real underwaterZ = pMap->getHeight(worldPoint.x, worldPoint.y);
-								
+
 								// get color for this Z and add to our sample color
 								if( localIsUnderwater( MAP_XY_FACTOR *(worldPoint.x - pMap->getBorderSize()), MAP_XY_FACTOR * ( worldPoint.y - pMap->getBorderSize())))
 								{
 
 									// this is our "color" for water
-									color = waterColor;									
+									color = waterColor;
 
 									// interpolate the water color for height in the water table
 									interpolateColorForHeight( &color, underwaterZ, pMap->getMaxHeightValue(),getTerrainAverageZ,  pMap->getMinHeightValue() );
@@ -317,15 +317,15 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 									sampleColor.blue += color.blue;
 									samples++;
 
-								}  // end if
+								}
 
-							}  // end if
+							}
 
-						}  // end for i
+						}
 
-					}  // end if
+					}
 
-				}  // end for j
+				}
 
 				// prevent divide by zeros
 				if( samples == 0 )
@@ -336,7 +336,7 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 				color.green = sampleColor.green / (Real)samples;
 				color.blue = sampleColor.blue / (Real)samples;
 
-			}  // end if
+			}
 			else  // regular terrain ...
 			{
 				const Int samplesAway = 1;  // how many "tiles" from the center tile we will sample away
@@ -368,7 +368,7 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 								pMap->getTerrainColorAt( MAP_XY_FACTOR *(worldPoint.x - pMap->getBorderSize()) ,MAP_XY_FACTOR * ( worldPoint.y - pMap->getBorderSize()), &color );
 
 								// interpolate the color for height
-								interpolateColorForHeight( &color, z, 
+								interpolateColorForHeight( &color, z,
 																						maxHeight, getTerrainAverageZ, minHeight);
 																					 //pMap->getMaxHeightValue(),getTerrainAverageZ,  pMap->getMinHeightValue() );
 
@@ -378,13 +378,13 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 								sampleColor.blue += color.blue;
 								samples++;
 
-							}  // end if
+							}
 
-						}  // end for i
+						}
 
-					}  // end if
+					}
 
-				}  // end for j
+				}
 
 				// prevent divide by zeros
 				if( samples == 0 )
@@ -395,7 +395,7 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 				color.green = sampleColor.green / (Real)samples;
 				color.blue = sampleColor.blue / (Real)samples;
 
-			}  // end else
+			}
 
 			//
 			// draw the pixel for the terrain at this point, note that because of the orientation
@@ -406,11 +406,11 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 			// the sampling and interpolation algorithm for generating pretty looking terrain
 			// and water for the radar is just, well, expensive.
 			//
-			m_pixelBuffer[y][x]= 255 | (REAL_TO_INT(color.red *255) << 8) | (REAL_TO_INT(color.green *255) << 16) | REAL_TO_INT(color.blue * 255)<< 24; 
-			
-		}  // end for x
+			m_pixelBuffer[y][x]= 255 | (REAL_TO_INT(color.red *255) << 8) | (REAL_TO_INT(color.green *255) << 16) | REAL_TO_INT(color.blue * 255)<< 24;
+
+		}
 
-	}  // end for y
+	}
 	{
 		Targa tga;
 		tga.Header.Width = MAP_PREVIEW_WIDTH;
@@ -421,7 +421,7 @@ void MapPreview::buildMapPreviewTexture( CString tgaName )
 		tga.Save(tgaName,TGAF_IMAGE, FALSE);
 	}
 
-}  // end buildTerrainTexture
+}
 
 
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MapSettings.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MapSettings.cpp
index 413e991662a..cd020a3b988 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/MapSettings.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MapSettings.cpp
@@ -63,15 +63,15 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // MapSettings message handlers
 
-void MapSettings::OnChangeMapTimeofday() 
+void MapSettings::OnChangeMapTimeofday()
 {
 }
 
-void MapSettings::OnChangeMapWeather() 
+void MapSettings::OnChangeMapWeather()
 {
 }
 
-BOOL MapSettings::OnInitDialog() 
+BOOL MapSettings::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -84,8 +84,8 @@ BOOL MapSettings::OnInitDialog()
 		timeofday->AddString(TimeOfDayNames[i]);
 	}
 	timeofday->SetCurSel(TheGlobalData->m_timeOfDay-TIME_OF_DAY_FIRST);
-	
-	
+
+
 	CComboBox *weather = (CComboBox*)GetDlgItem(IDC_MAP_WEATHER);
 	weather->ResetContent();
 	for (i = 0; i < WEATHER_COUNT; i++)
@@ -123,7 +123,7 @@ BOOL MapSettings::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void MapSettings::OnOK() 
+void MapSettings::OnOK()
 {
 	CComboBox *timeofday = (CComboBox*)GetDlgItem(IDC_MAP_TIMEOFDAY);
 	CComboBox *weather = (CComboBox*)GetDlgItem(IDC_MAP_WEATHER);
@@ -148,19 +148,19 @@ void MapSettings::OnOK()
 	CDialog::OnOK();
 }
 
-void MapSettings::OnChangeMapTitle() 
+void MapSettings::OnChangeMapTitle()
 {
 	// TODO: If this is a RICHEDIT control, the control will not
 	// send this notification unless you override the CDialog::OnInitDialog()
 	// function and call CRichEditCtrl().SetEventMask()
 	// with the ENM_CHANGE flag ORed into the mask.
-	
+
 	// TODO: Add your control notification handler code here
-	
+
 }
 
-void MapSettings::OnChangeMapCompression() 
+void MapSettings::OnChangeMapCompression()
 {
 	// TODO: Add your control notification handler code here
-	
+
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldOptions.cpp
index 4df89baf80f..7dd04077560 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldOptions.cpp
@@ -53,12 +53,12 @@ void MeshMoldOptions::DoDataExchange(CDataExchange* pDX)
 }
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL MeshMoldOptions::OnInitDialog() 
+BOOL MeshMoldOptions::OnInitDialog()
 {
 	COptionsPanel::OnInitDialog();
-	
+
 	m_updating = true;
 	m_anglePopup.SetupPopSliderButton(this, IDC_ANGLE_POPUP, this);
 	m_scalePopup.SetupPopSliderButton(this, IDC_SCALE_POPUP, this);
@@ -80,33 +80,21 @@ BOOL MeshMoldOptions::OnInitDialog()
 	m_moldTreeView.ShowWindow(SW_SHOW);
 
 	{
-		char				dirBuf[_MAX_PATH];
-		char				findBuf[_MAX_PATH];
 		char				fileBuf[_MAX_PATH];
 		Int					i;
 
-		strcpy(dirBuf, ".\\data\\Editor\\Molds");
-		int len = strlen(dirBuf);
-
-		if (len > 0 && dirBuf[len - 1] != '\\') {
-			dirBuf[len++] = '\\';
-			dirBuf[len] = 0;
-		}
-		strcpy(findBuf, dirBuf);
-		strcat(findBuf, "*.w3d");
-
 		FilenameList filenameList;
-		TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), AsciiString("*.w3d"), filenameList, FALSE);
+		TheFileSystem->getFileListInDirectory(".\\data\\Editor\\Molds\\", "*.w3d", filenameList, FALSE);
 
-		if (filenameList.size() > 0) {
+		if (!filenameList.empty()) {
 			HTREEITEM child = NULL;
 			FilenameList::iterator it = filenameList.begin();
 			do {
 				AsciiString filename = *it;
 
-				len = filename.getLength();
+				int len = filename.getLength();
 				if (len<5) continue;
-				strcpy(fileBuf, filename.str());
+				strlcpy(fileBuf, filename.str(), ARRAY_SIZE(fileBuf));
 				for (i=strlen(fileBuf)-1; i>0; i--) {
 					if (fileBuf[i] == '.') {
 						// strip off .w3d file extension.
@@ -128,7 +116,7 @@ BOOL MeshMoldOptions::OnInitDialog()
 				ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 				ins.item.lParam = -1;
 				ins.item.pszText = nameStart;
-				ins.item.cchTextMax = strlen(nameStart);				
+				ins.item.cchTextMax = strlen(nameStart);
 				child = m_moldTreeView.InsertItem(&ins);
 
 				++it;
@@ -146,10 +134,10 @@ BOOL MeshMoldOptions::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void MeshMoldOptions::setHeight(Real height) 
-{ 
-	char buffer[50];
-	sprintf(buffer, "%.2f", height);
+void MeshMoldOptions::setHeight(Real height)
+{
+	char buffer[32];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%.2f", height);
 	m_currentHeight = height;
 	if (m_staticThis && !m_staticThis->m_updating) {
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -158,10 +146,10 @@ void MeshMoldOptions::setHeight(Real height)
 	MeshMoldTool::updateMeshLocation(false);
 }
 
-void MeshMoldOptions::setScale(Real scale) 
-{ 
-	char buffer[50];
-	sprintf(buffer, "%d", (int)floor(scale*100));
+void MeshMoldOptions::setScale(Real scale)
+{
+	char buffer[12];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%d", (int)floor(scale*100));
 	m_currentScale = scale;
 	if (m_staticThis && !m_staticThis->m_updating) {
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SCALE_EDIT);
@@ -170,10 +158,10 @@ void MeshMoldOptions::setScale(Real scale)
 	MeshMoldTool::updateMeshLocation(false);
 }
 
-void MeshMoldOptions::setAngle(Int angle) 
-{ 
-	char buffer[50];
-	sprintf(buffer, "%d", angle);
+void MeshMoldOptions::setAngle(Int angle)
+{
+	char buffer[12];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%d", angle);
 	m_currentAngle = angle;
 	if (m_staticThis && !m_staticThis->m_updating) {
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_ANGLE_EDIT);
@@ -211,7 +199,7 @@ void MeshMoldOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pM
 			// uh-oh!
 			DEBUG_CRASH(("Missing ID."));
 			break;
-	}	// switch
+	}
 }
 
 void MeshMoldOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -246,7 +234,7 @@ void MeshMoldOptions::PopSliderChanged(const long sliderID, long theVal)
 		default:
 			DEBUG_CRASH(("Missing ID."));
 			break;
-	}	// switch
+	}
 }
 
 void MeshMoldOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -262,7 +250,7 @@ void MeshMoldOptions::PopSliderFinished(const long sliderID, long theVal)
 		default:
 			DEBUG_CRASH(("Missing ID."));
 			break;
-	}	// switch
+	}
 
 }
 
@@ -282,19 +270,19 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // MeshMoldOptions message handlers
 
-void MeshMoldOptions::OnPreview() 
+void MeshMoldOptions::OnPreview()
 {
 	CButton *pButton = (CButton*)this->GetDlgItem(IDC_PREVIEW);
 	m_doingPreview = (pButton->GetCheck() == 1);
 	MeshMoldTool::updateMeshLocation(true);
 }
 
-void MeshMoldOptions::OnApplyMesh() 
+void MeshMoldOptions::OnApplyMesh()
 {
 	MeshMoldTool::apply(CWorldBuilderDoc::GetActiveDoc());
 }
 
-void MeshMoldOptions::OnChangeScaleEdit() 
+void MeshMoldOptions::OnChangeScaleEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SCALE_EDIT);
@@ -311,7 +299,7 @@ void MeshMoldOptions::OnChangeScaleEdit()
 		}
 }
 
-void MeshMoldOptions::OnChangeHeightEdit() 
+void MeshMoldOptions::OnChangeHeightEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -328,7 +316,7 @@ void MeshMoldOptions::OnChangeHeightEdit()
 		}
 }
 
-void MeshMoldOptions::OnChangeAngleEdit() 
+void MeshMoldOptions::OnChangeAngleEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_ANGLE_EDIT);
@@ -346,7 +334,7 @@ void MeshMoldOptions::OnChangeAngleEdit()
 }
 
 
-BOOL MeshMoldOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL MeshMoldOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_moldTreeView.m_hWnd) {
@@ -359,19 +347,19 @@ BOOL MeshMoldOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_moldTreeView.GetItem(&item);
 			m_meshModelName = AsciiString(buffer);
 			if (m_doingPreview) {
 				MeshMoldTool::updateMeshLocation(false);
 			}
 		}
-	}	
+	}
 	return COptionsPanel::OnNotify(wParam, lParam, pResult);
 }
 
 
-void MeshMoldOptions::OnRaise() 
+void MeshMoldOptions::OnRaise()
 {
 	m_raiseOnly = true;
 	m_lowerOnly = false;
@@ -380,7 +368,7 @@ void MeshMoldOptions::OnRaise()
 	}
 }
 
-void MeshMoldOptions::OnRaiseLower() 
+void MeshMoldOptions::OnRaiseLower()
 {
 	m_raiseOnly = false;
 	m_lowerOnly = false;
@@ -389,7 +377,7 @@ void MeshMoldOptions::OnRaiseLower()
 	}
 }
 
-void MeshMoldOptions::OnLower() 
+void MeshMoldOptions::OnLower()
 {
 	m_raiseOnly = false;
 	m_lowerOnly = true;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp
index 3d9952f779f..08a9d1dcee5 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp
@@ -20,13 +20,13 @@
 // Terrain shaping tool for worldbuilder.
 // Author: John Ahlquist, Oct 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "MeshMoldTool.h"
 #include "CUndoable.h"
 #include "MainFrm.h"
-#include "WHeightMapEdit.h"							 
+#include "WHeightMapEdit.h"
 #include "WorldBuilderDoc.h"
 #include "WorldBuilderView.h"
 #include "WorldBuilder.h"
@@ -43,22 +43,22 @@ Bool MeshMoldTool::m_tracking = false;
 Coord3D MeshMoldTool::m_toolPos;
 WorldHeightMapEdit *MeshMoldTool::m_htMapEditCopy = NULL;
 
-/// Constructor 
+/// Constructor
 MeshMoldTool::MeshMoldTool(void) :
 	Tool(ID_MOLD_TOOL, IDC_MOLD_POINTER)
 {
 	m_offsettingZ = false;
 }
-	
+
 /// Destructor
-MeshMoldTool::~MeshMoldTool(void) 
+MeshMoldTool::~MeshMoldTool(void)
 {
 	REF_PTR_RELEASE(m_htMapEditCopy);
 }
 
 
 /// Shows the mesh mold options panel.
-void MeshMoldTool::activate() 
+void MeshMoldTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_MESHMOLD_OPTIONS);
 	m_prevXIndex = -1;
@@ -69,7 +69,7 @@ void MeshMoldTool::activate()
 }
 
 /// Shows the mesh mold options panel.
-void MeshMoldTool::deactivate() 
+void MeshMoldTool::deactivate()
 {
 	m_tracking = false;
 	DrawObject::setDoMeshFeedback(false);
@@ -87,7 +87,7 @@ void MeshMoldTool::deactivate()
 /// Start tool.
 /** Setup the tool to start mesh molding - make a copy of the height map
 to edit, another copy because we need it :), and call mouseMovedDown. */
-void MeshMoldTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void MeshMoldTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	Coord3D cpt;
@@ -112,9 +112,9 @@ void MeshMoldTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 }
 
 /// End tool.
-/** Finish the tool operation - create a command, pass it to the 
+/** Finish the tool operation - create a command, pass it to the
 doc to execute, and cleanup ref'd objects. */
-void MeshMoldTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void MeshMoldTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	m_offsettingZ = false;
@@ -148,8 +148,8 @@ void MeshMoldTool::updateMeshLocation(Bool changePreview)
 		m_toolPos.z = MeshMoldOptions::getHeight();
 		DrawObject::setFeedbackPos(m_toolPos);
 		if (MeshMoldOptions::isDoingPreview() || changePreview) {
-			// doing preview 
-			CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc(); 
+			// doing preview
+			CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 			if (MeshMoldOptions::isDoingPreview()) {
 				applyMesh(pDoc);
 			} else if (m_htMapEditCopy) {
@@ -217,16 +217,16 @@ void MeshMoldTool::applyMesh(CWorldBuilderDoc *pDoc)
 				if (minX<0) minX = 0;
 				if (minY<0) minY = 0;
 				if (maxX > m_htMapEditCopy->getXExtent()) {
-					maxX = m_htMapEditCopy->getXExtent();	 
+					maxX = m_htMapEditCopy->getXExtent();
 				}
 				if (maxY > m_htMapEditCopy->getYExtent()) {
-					maxY = m_htMapEditCopy->getYExtent();	 
+					maxY = m_htMapEditCopy->getYExtent();
 				}
 				Int i, j;
 				for (j=minY; j<maxY; j++) {
 					for (i=minX; i<maxX; i++) {
-						Real X, Y; 
-						X = i*MAP_XY_FACTOR; 
+						Real X, Y;
+						X = i*MAP_XY_FACTOR;
 						X -= m_toolPos.x;
 						Y = j*MAP_XY_FACTOR;
 						Y -= m_toolPos.y;
@@ -245,7 +245,7 @@ void MeshMoldTool::applyMesh(CWorldBuilderDoc *pDoc)
 							Vector3 intersection = castResult.ContactPoint;
 							intersection.Z *= MeshMoldOptions::getScale();
 							Int newHeight = floor( ((intersection.Z+MeshMoldOptions::getHeight())/MAP_HEIGHT_SCALE)+0.5);
-							// check boundary values	
+							// check boundary values
 							if (newHeight < m_htMapEditCopy->getMinHeightValue()) newHeight = m_htMapEditCopy->getMinHeightValue();
 							if (newHeight > m_htMapEditCopy->getMaxHeightValue()) newHeight = m_htMapEditCopy->getMaxHeightValue();
 							Bool apply = true;
@@ -253,11 +253,11 @@ void MeshMoldTool::applyMesh(CWorldBuilderDoc *pDoc)
 								apply = newHeight > m_htMapEditCopy->getHeight(i+border, j+border);
 							} else if (MeshMoldOptions::isLoweringOnly()) {
 								apply = newHeight < m_htMapEditCopy->getHeight(i+border, j+border);
-							} 
+							}
 							if (apply) {
 								m_htMapEditCopy->setHeight(i+border, j+border, newHeight);
 							}
-						}		
+						}
 					}
 				}
 				IRegion2D partialRange;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MoundOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MoundOptions.cpp
index 2a288de93b0..daf3d40e10b 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/MoundOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MoundOptions.cpp
@@ -36,7 +36,7 @@ Int MoundOptions::m_currentFeather = 0;
 
 MoundOptions::MoundOptions(CWnd* pParent /*=NULL*/)
 {
-	//{{AFX_DATA_INIT(MoundOptions) 
+	//{{AFX_DATA_INIT(MoundOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -52,8 +52,8 @@ void MoundOptions::DoDataExchange(CDataExchange* pDX)
 
 /// Sets the feather value in the dialog.
 /** Update the value in the edit control and the slider. */
-void MoundOptions::setFeather(Int feather) 
-{ 
+void MoundOptions::setFeather(Int feather)
+{
 	CString buf;
 	buf.Format("%d", feather);
 	m_currentFeather = feather;
@@ -65,8 +65,8 @@ void MoundOptions::setFeather(Int feather)
 
 /// Sets the brush width value in the dialog.
 /** Update the value in the edit control and the slider. */
-void MoundOptions::setWidth(Int width) 
-{ 
+void MoundOptions::setWidth(Int width)
+{
 	CString buf;
 	buf.Format("%d", width);
 	m_currentWidth = width;
@@ -76,10 +76,10 @@ void MoundOptions::setWidth(Int width)
 	}
 }
 
-void MoundOptions::setHeight(Int height) 
-{ 
-	char buffer[50];
-	sprintf(buffer, "%d", height);
+void MoundOptions::setHeight(Int height)
+{
+	char buffer[12];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%d", height);
 	m_currentHeight = height;
 	if (m_staticThis && !m_staticThis->m_updating) {
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -93,12 +93,12 @@ void MoundOptions::setHeight(Int height)
 // MoundOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL MoundOptions::OnInitDialog() 
+BOOL MoundOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = true;
 	m_brushWidthPopup.SetupPopSliderButton(this, IDC_SIZE_POPUP, this);
 	m_brushFeatherPopup.SetupPopSliderButton(this, IDC_FEATHER_POPUP, this);
@@ -117,7 +117,7 @@ BOOL MoundOptions::OnInitDialog()
 /// Handles feather edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void MoundOptions::OnChangeFeatherEdit() 
+void MoundOptions::OnChangeFeatherEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_FEATHER_EDIT);
@@ -129,7 +129,7 @@ void MoundOptions::OnChangeFeatherEdit()
 			if (1==sscanf(buffer, "%d", &feather)) {
 				m_currentFeather = feather;
 				MoundTool::setFeather(m_currentFeather);
-				sprintf(buffer, "%.1f FEET.", m_currentFeather*MAP_XY_FACTOR);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentFeather*MAP_XY_FACTOR);
 				pEdit = m_staticThis->GetDlgItem(IDC_FEATHER_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -140,7 +140,7 @@ void MoundOptions::OnChangeFeatherEdit()
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void MoundOptions::OnChangeSizeEdit() 
+void MoundOptions::OnChangeSizeEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SIZE_EDIT);
@@ -152,7 +152,7 @@ void MoundOptions::OnChangeSizeEdit()
 			if (1==sscanf(buffer, "%d", &width)) {
 				m_currentWidth = width;
 				MoundTool::setWidth(m_currentWidth);
-				sprintf(buffer, "%.1f FEET.", m_currentWidth*MAP_XY_FACTOR);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentWidth*MAP_XY_FACTOR);
 				pEdit = m_staticThis->GetDlgItem(IDC_WIDTH_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -163,7 +163,7 @@ void MoundOptions::OnChangeSizeEdit()
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void MoundOptions::OnChangeHeightEdit() 
+void MoundOptions::OnChangeHeightEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -175,7 +175,7 @@ void MoundOptions::OnChangeHeightEdit()
 			if (1==sscanf(buffer, "%d", &height)) {
 				m_currentHeight = height;
 				MoundTool::setMoundHeight(m_currentHeight);
-				sprintf(buffer, "%.1f FEET.", m_currentHeight*MAP_HEIGHT_SCALE);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentHeight*MAP_HEIGHT_SCALE);
 				pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -212,7 +212,7 @@ void MoundOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax,
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void MoundOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -249,7 +249,7 @@ void MoundOptions::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void MoundOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -266,7 +266,7 @@ void MoundOptions::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MoundTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MoundTool.cpp
index 1d9ed6a4b1a..174395e4b66 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/MoundTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MoundTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "MoundTool.h"
@@ -41,7 +41,7 @@ Int MoundTool::m_brushFeather;
 
 
 
-/// Constructor 
+/// Constructor
 MoundTool::MoundTool(void) :
 	Tool(ID_BRUSH_ADD_TOOL, IDC_BRUSH_CROSS)
 {
@@ -49,17 +49,17 @@ MoundTool::MoundTool(void) :
 	m_htMapSaveCopy = NULL;
 	m_raising = true;
 }
-	
+
 /// Destructor
-MoundTool::~MoundTool(void) 
+MoundTool::~MoundTool(void)
 {
 	REF_PTR_RELEASE(m_htMapEditCopy);
 	REF_PTR_RELEASE(m_htMapSaveCopy);
 }
 
 
-void MoundTool::setMoundHeight(Int height) 
-{ 
+void MoundTool::setMoundHeight(Int height)
+{
 	if (m_moundHeight != height) {
 		m_moundHeight = height;
 		// notify mound options panel
@@ -68,19 +68,19 @@ void MoundTool::setMoundHeight(Int height)
 	}
 };
 /// Set the brush width and notify the height options panel of the change.
-void MoundTool::setWidth(Int width) 
-{ 
+void MoundTool::setWidth(Int width)
+{
 	if (m_brushWidth != width) {
 		m_brushWidth = width;
 		// notify brush palette options panel
-		MoundOptions::setWidth(width);  
+		MoundOptions::setWidth(width);
 		DrawObject::setBrushFeedbackParms(false, m_brushWidth, m_brushFeather);
 	}
 };
 
 /// Set the brush feather and notify the height options panel of the change.
-void MoundTool::setFeather(Int feather) 
-{ 
+void MoundTool::setFeather(Int feather)
+{
 	if (m_brushFeather != feather) {
 		m_brushFeather = feather;
 		// notify height palette options panel
@@ -91,14 +91,14 @@ void MoundTool::setFeather(Int feather)
 
 
 /// Shows the brush options panel.
-void MoundTool::activate() 
+void MoundTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_MOUND_OPTIONS);
 	DrawObject::setDoBrushFeedback(true);
 	DrawObject::setBrushFeedbackParms(false, m_brushWidth, m_brushFeather);
 }
 
-void MoundTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void MoundTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -115,7 +115,7 @@ void MoundTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 	mouseMoved(m, viewPt, pView, pDoc);
 }
 
-void MoundTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void MoundTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -166,7 +166,7 @@ void MoundTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 		if (i<0 || i>=m_htMapEditCopy->getXExtent()) {
 			continue;
 		}
-		for (j=ndx.y-sub; j<ndx.y+add; j++) {					
+		for (j=ndx.y-sub; j<ndx.y+add; j++) {
 			if (j<0 || j>=m_htMapEditCopy->getYExtent()) {
 				continue;
 			}
@@ -178,24 +178,24 @@ void MoundTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 			float fNewHeight = (blendFactor*(htDelta+curHeight))+((1.0f-blendFactor)*curHeight);
 			Int newHeight = floor(fNewHeight+0.5f);
 
-			// check boundary values	
+			// check boundary values
 			if (newHeight < m_htMapSaveCopy->getMinHeightValue()) newHeight = m_htMapSaveCopy->getMinHeightValue();
 			if (newHeight > m_htMapSaveCopy->getMaxHeightValue()) newHeight = m_htMapSaveCopy->getMaxHeightValue();
 
 			m_htMapEditCopy->setHeight(i, j, newHeight);
 			pDoc->invalCell(i, j);
-#else 
+#else
 			// Previous integer calculated mounding and blending.
 			// If not re-enabled by Dec 2001, delete as obsolete.
 			Int xd = abs( (2*(i-(ndx.x-sub)))+1 - brushWidth);
 			Int yd = abs( (2*(j-(ndx.y-sub)))+1 - brushWidth);
-			
+
 			float delta = (float)sqrt(xd*xd+yd*yd);
 			//Int curHeight = m_htMapSaveCopy->getHeight(i,j);
 			Int curHeight = m_htMapEditCopy->getHeight(i,j);
 			Int newHeight = curHeight + htDelta;
 
-			// check boundary values	
+			// check boundary values
 			if (newHeight < m_htMapSaveCopy->getMinHeightValue()) newHeight = m_htMapSaveCopy->getMinHeightValue();
 			if (newHeight > m_htMapSaveCopy->getMaxHeightValue()) newHeight = m_htMapSaveCopy->getMaxHeightValue();
 
@@ -242,6 +242,6 @@ void MoundTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 DigTool::DigTool(void)
 {
 	m_toolID = ID_BRUSH_SUBTRACT_TOOL;
-	m_raising = false;  // digging. 
+	m_raising = false;  // digging.
 }
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MyToolbar.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MyToolbar.cpp
index cbd0fc9627a..d7f5918ed44 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/MyToolbar.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MyToolbar.cpp
@@ -20,7 +20,7 @@
 // Class to handle cell size slider.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 
 #include "Lib/BaseType.h"
 #include "MyToolbar.h"
@@ -74,13 +74,13 @@ void CellSizeToolBar::SetupSlider(void)
 	m_staticThis = this;
 }
 
-void CellSizeToolBar::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
+void CellSizeToolBar::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 {
 	if (nSBCode != TB_THUMBTRACK) {
 		nPos = m_cellSlider.GetPos();
 	}
 	UnsignedInt i;
-	// invert 
+	// invert
 	nPos = MAX_POS - nPos + MIN_POS;
 	int newSize = 1;
 	for (i=1; i<nPos; i++) {
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/NewHeightMap.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/NewHeightMap.cpp
index fa3e50f9db7..fc866e5ea60 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/NewHeightMap.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/NewHeightMap.cpp
@@ -55,10 +55,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CNewHeightMap message handlers
 
-BOOL CNewHeightMap::OnInitDialog() 
+BOOL CNewHeightMap::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CWnd *edit = GetDlgItem(IDC_INITIAL_HEIGHT);
 	CString val;
 	val.Format("%d", mHeightInfo.initialHeight);
@@ -124,33 +124,33 @@ Bool CNewHeightMap::doAnchorButton(Int buttonID)
 	heightInfo.anchorLeft = false;
 	heightInfo.anchorRight = false;
 	switch(buttonID) {
-		case IDC_CENTER: 
+		case IDC_CENTER:
 		break;
-		case IDC_TOP_LEFT: 
+		case IDC_TOP_LEFT:
 			heightInfo.anchorTop = true;
 			heightInfo.anchorLeft = true;
 		break;
-		case IDC_TOP: 
+		case IDC_TOP:
 			heightInfo.anchorTop = true;
 		break;
-		case IDC_TOP_RIGHT: 
+		case IDC_TOP_RIGHT:
 			heightInfo.anchorTop = true;
 			heightInfo.anchorRight = true;
 		break;
-		case IDC_CENTER_LEFT: 
+		case IDC_CENTER_LEFT:
 			heightInfo.anchorLeft = true;
 		break;
-		case IDC_CENTER_RIGHT: 
+		case IDC_CENTER_RIGHT:
 			heightInfo.anchorRight = true;
 		break;
-		case IDC_BOTTOM: 
+		case IDC_BOTTOM:
 			heightInfo.anchorBottom = true;
 		break;
-		case IDC_BOTTOM_LEFT: 
+		case IDC_BOTTOM_LEFT:
 			heightInfo.anchorBottom = true;
 			heightInfo.anchorLeft = true;
 		break;
-		case IDC_BOTTOM_RIGHT: 
+		case IDC_BOTTOM_RIGHT:
 			heightInfo.anchorBottom = true;
 			heightInfo.anchorRight = true;
 		break;
@@ -186,7 +186,7 @@ Bool CNewHeightMap::doAnchorButton(Int buttonID)
 }
 
 
-void CNewHeightMap::OnOK() 
+void CNewHeightMap::OnOK()
 {
 	CWnd *edit = GetDlgItem(IDC_INITIAL_HEIGHT);
 	CString val;
@@ -213,15 +213,15 @@ void CNewHeightMap::OnOK()
 }
 
 
-BOOL CNewHeightMap::OnCommand(WPARAM wParam, LPARAM lParam) 
+BOOL CNewHeightMap::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 	Int cmd = HIWORD(wParam);
 	if (cmd == BN_CLICKED) {
-		Int idButton = (int) LOWORD(wParam);    // identifier of button 
+		Int idButton = (int) LOWORD(wParam);    // identifier of button
 		if (doAnchorButton(idButton)) {
 			return true;
 		}
 	}
- 	
+
 	return CDialog::OnCommand(wParam, lParam);
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectOptions.cpp
index 08876404dc5..dc1dc5b7f5a 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectOptions.cpp
@@ -64,9 +64,7 @@ ObjectOptions::ObjectOptions(CWnd* pParent /*=NULL*/)
 
 ObjectOptions::~ObjectOptions(void)
 {
-	if (m_objectsList) {
-		deleteInstance(m_objectsList);
-	}
+	deleteInstance(m_objectsList);
 	m_objectsList = NULL;
 }
 
@@ -101,7 +99,7 @@ static Int findSideListEntryWithPlayerOfSide(AsciiString side)
 		}
 	}
 
-	// DEBUG_CRASH(("no SideList entry found for %s!\n",side.str()));
+	// DEBUG_CRASH(("no SideList entry found for %s!",side.str()));
 	return -1;
 }
 
@@ -218,7 +216,7 @@ static const PlayerTemplate* findFirstPlayerTemplateOnSide(AsciiString side)
 		}
 	}
 
-	DEBUG_CRASH(("no player found for %s!\n",side.str()));
+	DEBUG_CRASH(("no player found for %s!",side.str()));
 	return NULL;
 }
 #endif
@@ -227,12 +225,12 @@ static const PlayerTemplate* findFirstPlayerTemplateOnSide(AsciiString side)
 // ObjectOptions message handlers
 
 /// Setup the controls in the dialog.
-BOOL ObjectOptions::OnInitDialog() 
+BOOL ObjectOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
 	m_updating = true;
-	
+
 //	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 
 
@@ -249,12 +247,12 @@ BOOL ObjectOptions::OnInitDialog()
 		pMap = newInstance( MapObject)( loc, tTemplate->getName(), 0.0f, 0, NULL, tTemplate );
 		pMap->setNextMap( m_objectsList );
 		m_objectsList = pMap;
-			
+
 		// get display color for the editor
 		Color cc = tTemplate->getDisplayColor();
 		pMap->setColor(cc);
 
-	}  // end for tTemplate
+	}
 
 #if 0		// Lights are not working right now.
 	{
@@ -262,10 +260,10 @@ BOOL ObjectOptions::OnInitDialog()
 		char base[1024] = "*Lights/Light";
 		MapObject *pMap = newInstance(MapObject)(pt, AsciiString(base), 0.0f, 0, NULL, NULL );
 		pMap->setIsLight();
-		
+
 		Dict *props = pMap->getProperties();
 		RGBColor tmp;
-		tmp.red = tmp.green = tmp.blue = 1.0f;		
+		tmp.red = tmp.green = tmp.blue = 1.0f;
 		Int tmpi = tmp.getAsInt();
 		props->setReal(TheKey_lightHeightAboveTerrain, 0.0f);
 		props->setReal(TheKey_lightInnerRadius, 15.0f);
@@ -276,32 +274,20 @@ BOOL ObjectOptions::OnInitDialog()
 		pMap->setNextMap(m_objectsList);
 		m_objectsList = pMap;
 	}
-#endif 
+#endif
 #ifdef LOAD_TEST_ASSETS
 	{
-		char				dirBuf[_MAX_PATH];
-		char				findBuf[_MAX_PATH];
 		char				fileBuf[_MAX_PATH];
 		Int					i;
 
-		strcpy(dirBuf, TEST_W3D_DIR_PATH);
-		int len = strlen(dirBuf);
-
-		if (len > 0 && dirBuf[len - 1] != '\\' && dirBuf[len-1] != '/') {
-			dirBuf[len++] = '\\';
-			dirBuf[len] = 0;
-		}
-		strcpy(findBuf, dirBuf);
-		strcat(findBuf, "*.*");
-
 		FilenameList filenameList;
-		TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), AsciiString("*.w3d"), filenameList, FALSE);
+		TheFileSystem->getFileListInDirectory(TEST_W3D_DIR_PATH, "*.w3d", filenameList, FALSE);
 
-		if (filenameList.size() > 0) {
+		if (!filenameList.empty()) {
 			FilenameList::iterator it = filenameList.begin();
 			do {
 				AsciiString filename = *it;
-				len = filename.getLength();
+				int len = filename.getLength();
 				if (len<5) continue;
 				// only do .w3d files
 
@@ -312,8 +298,8 @@ BOOL ObjectOptions::OnInitDialog()
 				}
 
 				strcpy(fileBuf, TEST_STRING);
-				strcat(fileBuf, "/");
-				strcat(fileBuf, token.str());
+				strlcat(fileBuf, "/", ARRAY_SIZE(fileBuf));
+				strlcat(fileBuf, token.str(), ARRAY_SIZE(fileBuf));
 				for (i=strlen(fileBuf)-1; i>0; i--) {
 					if (fileBuf[i] == '.') {
 						// strip off .w3d file extension.
@@ -386,7 +372,7 @@ HTREEITEM ObjectOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_objectTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -401,7 +387,7 @@ HTREEITEM ObjectOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = (char*)pLabel;
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_objectTreeView.InsertItem(&ins);
 	return(child);
 }
@@ -415,7 +401,7 @@ HTREEITEM ObjectOptions::_FindOrDont(const char* pLabel, HTREEITEM startPoint)
 {
 	std::list<HTREEITEM> itemsToEx;
 	itemsToEx.push_back(startPoint);
-	
+
 	while (itemsToEx.front()) {
 		char buffer[_MAX_PATH];
 		HTREEITEM hItem = itemsToEx.front();
@@ -428,19 +414,19 @@ HTREEITEM ObjectOptions::_FindOrDont(const char* pLabel, HTREEITEM startPoint)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_objectTreeView.GetItem(&item);
 
 			const char* strToTest = strrchr(pLabel, '/');
-//		if (strstr((strToTest ? strToTest : pLabel), buffer)) 
-			if (strcmp((strToTest ? strToTest : pLabel), buffer) == 0) 
+//		if (strstr((strToTest ? strToTest : pLabel), buffer))
+			if (strcmp((strToTest ? strToTest : pLabel), buffer) == 0)
 			{
 				return hItem;
 			}
 		} else {
 			// add the first child, the others will be caught by the adding of the siblings
 			itemsToEx.push_back(m_objectTreeView.GetChildItem(hItem));
-		} // Always add the first sibling, if it exists
+		}
 
 		if (m_objectTreeView.GetNextSiblingItem(hItem)) {
 			itemsToEx.push_back(m_objectTreeView.GetNextSiblingItem(hItem));
@@ -453,7 +439,7 @@ HTREEITEM ObjectOptions::_FindOrDont(const char* pLabel, HTREEITEM startPoint)
 //-------------------------------------------------------------------------------------------------
 /** Add the object hierarchy paths to the tree view. */
 //-------------------------------------------------------------------------------------------------
-void ObjectOptions::addObject( MapObject *mapObject, const char *pPath, 
+void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 															 Int terrainNdx, HTREEITEM parent )
 {
 	char buffer[ _MAX_PATH ];
@@ -466,7 +452,7 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 	//
 	// if we have an thing template in mapObject, we've read it from the new INI database,
 	// we will sort those items into the tree based on properties of the template that
-	// make it easier for us to browse when building levels 
+	// make it easier for us to browse when building levels
 	//
 	// Feel free to reorganize how this tree is constructed from the template
 	// data at will, whatever makes it easier for design
@@ -478,12 +464,11 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 		// first check for test sorted objects
 		if( thingTemplate->getEditorSorting() == ES_TEST )
 			parent = findOrAdd( parent, "TEST" );
-	
+
 		// first sort by side, either create or find the tree item with matching side name
 		AsciiString side = thingTemplate->getDefaultOwningSide();
-		DEBUG_ASSERTCRASH( !side.isEmpty(), ("NULL default side in template\n") );
-		strcpy( buffer, side.str() );
-		parent = findOrAdd( parent, buffer );
+		DEBUG_ASSERTCRASH( !side.isEmpty(), ("NULL default side in template") );
+		parent = findOrAdd( parent, side.str());
 
 		// next tier uses the editor sorting that design can specify in the INI
 		EditorSortingType i = ES_FIRST;
@@ -498,9 +483,9 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 				parent = findOrAdd( parent, EditorSortingNames[ i ] );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		if( i == ES_NUM_SORTING_TYPES )
 			parent = findOrAdd( parent, "UNSORTED" );
@@ -508,10 +493,10 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 		// the leaf name is the name of the template
 		leafName = thingTemplate->getName().str();
 
-	}  // end if
-	else 
+	}
+	else
 	{
-	
+
 		// all these old entries we will put in a tree for legacy GDF items
 		parent = findOrAdd( parent, "**TEST MODELS" );
 
@@ -523,7 +508,7 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 			}
 			if (pPath[i] == '/') {
 				pPath+= i+1;
-				i = 0;			
+				i = 0;
 			}
 			buffer[i] = pPath[i];
 			i++;
@@ -534,9 +519,9 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 			buffer[ i ] = 0;
 			leafName = buffer;
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 
 	// add to the tree view
 	if( leafName )
@@ -549,7 +534,7 @@ void ObjectOptions::addObject( MapObject *mapObject, const char *pPath,
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = terrainNdx;
 		ins.item.pszText = (char*)leafName;
-		ins.item.cchTextMax = strlen(leafName)+2;				
+		ins.item.cchTextMax = strlen(leafName)+2;
 		m_objectTreeView.InsertItem(&ins);
 
 	}
@@ -567,13 +552,13 @@ Bool ObjectOptions::setObjectTreeViewSelection(HTREEITEM parent, Int selection)
 		item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;
 		item.hItem = child;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_objectTreeView.GetItem(&item);
 		if (item.lParam == selection) {
 			m_objectTreeView.SelectItem(child);
 			return(true);
 		}
-		if (setObjectTreeViewSelection(child, selection)) 
+		if (setObjectTreeViewSelection(child, selection))
 		{
 			strcpy(m_currentObjectName, buffer);
 			updateLabel();
@@ -585,7 +570,7 @@ Bool ObjectOptions::setObjectTreeViewSelection(HTREEITEM parent, Int selection)
 }
 
 
-BOOL ObjectOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL ObjectOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_objectTreeView.m_hWnd) {
@@ -610,7 +595,7 @@ BOOL ObjectOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_objectTreeView.GetItem(&item);
 			if (item.lParam >= 0) {
 				m_currentObjectIndex = item.lParam;
@@ -622,7 +607,7 @@ BOOL ObjectOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			updateLabel();
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
@@ -657,13 +642,13 @@ MapObject *ObjectOptions::duplicateCurMapObjectForPlace(const Coord3D* loc, Real
 	MapObject *pCur = getCurMapObject();
 	if (pCur)
 	{
-		
+
 		Bool found = false;
 		const ThingTemplate* tt = pCur->getThingTemplate();
-		if (checkPlayers) 
+		if (checkPlayers)
 		{
 			AsciiString defaultTeam("team");
-			
+
 			AsciiString objectTeamName = m_curOwnerName;
 			if (objectTeamName != defaultTeam) {
 				TeamsInfo *teamInfo = TheSidesList->findTeamInfo(objectTeamName);
@@ -684,7 +669,7 @@ MapObject *ObjectOptions::duplicateCurMapObjectForPlace(const Coord3D* loc, Real
 				if (!found)
 				{
 					AddPlayerDialog addPlyr(pCur->getThingTemplate()->getDefaultOwningSide());
-					if (addPlyr.DoModal() == IDOK) 
+					if (addPlyr.DoModal() == IDOK)
 					{
 						for (int i = 0; i < TheSidesList->getNumSides(); i++)
 						{
@@ -713,8 +698,8 @@ MapObject *ObjectOptions::duplicateCurMapObjectForPlace(const Coord3D* loc, Real
 		}
 		if (found)
 		{
-			MapObject *pNew = newInstance(MapObject)( *loc, pCur->getName(), angle, 
-																			 pCur->getFlags(), pCur->getProperties(), 
+			MapObject *pNew = newInstance(MapObject)( *loc, pCur->getName(), angle,
+																			 pCur->getFlags(), pCur->getProperties(),
 																			 pCur->getThingTemplate() );
 			pNew->getProperties()->setAsciiString(TheKey_originalOwner, m_curOwnerName);
 			pNew->setColor(pCur->getColor());
@@ -795,7 +780,7 @@ Int ObjectOptions::getObjectNamedIndex(const AsciiString& name)
 }
 
 
-void ObjectOptions::OnEditchangeOwningteam() 
+void ObjectOptions::OnEditchangeOwningteam()
 {
 	CComboBox *list = (CComboBox*)GetDlgItem(IDC_OWNINGTEAM);
 	Int sel = list->GetCurSel();
@@ -826,7 +811,7 @@ void ObjectOptions::selectObject(const MapObject* pObj)
 		item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 		item.hItem = objToSel;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_staticThis->m_objectTreeView.GetItem(&item);
 
 		if (m_staticThis->m_objectTreeView.SelectItem(objToSel)) {
@@ -836,12 +821,12 @@ void ObjectOptions::selectObject(const MapObject* pObj)
 	}
 }
 
-void ObjectOptions::OnCloseupOwningteam() 
+void ObjectOptions::OnCloseupOwningteam()
 {
 	OnEditchangeOwningteam();
 }
 
-void ObjectOptions::OnSelchangeOwningteam() 
+void ObjectOptions::OnSelchangeOwningteam()
 {
 	OnEditchangeOwningteam();
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectPreview.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectPreview.cpp
index b2eb7a1307c..477a307a3ab 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectPreview.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectPreview.cpp
@@ -47,7 +47,7 @@
 
 #include "W3DDevice/GameClient/W3DAssetManager.h"
 #include "WW3D2/dx8wrapper.h"
-#include "WWLib/TARGA.H"
+#include "WWLib/TARGA.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // ObjectPreview
@@ -90,7 +90,7 @@ static UnsignedByte * saveSurface(IDirect3DSurface8 *surface)
 	HRESULT hr=m_pDev->CreateImageSurface(  desc.Width,desc.Height,desc.Format, &tempSurface);
 
 	hr=m_pDev->CopyRects(surface,NULL,0,tempSurface,NULL);
- 
+
 	D3DLOCKED_RECT lrect;
 
 	DX8_ErrorCode(tempSurface->LockRect(&lrect,NULL,D3DLOCK_READONLY));
@@ -229,7 +229,7 @@ static UnsignedByte * generatePreview( const ThingTemplate *tt )
 
 			Vector2 minVec = Vector2( -1, -1 );
 			Vector2 maxVec = Vector2( +1, +1 );
-			camera->Set_View_Plane( minVec, maxVec );		
+			camera->Set_View_Plane( minVec, maxVec );
 			camera->Set_Clip_Planes( 0.995f, 600.0f );
 			if (orthoCamera)
 				camera->Set_Projection_Type( CameraClass::ORTHO );
@@ -267,10 +267,10 @@ static UnsignedByte * generatePreview( const ThingTemplate *tt )
 /////////////////////////////////////////////////////////////////////////////
 // ObjectPreview message handlers
 
-void ObjectPreview::OnPaint() 
+void ObjectPreview::OnPaint()
 {
 	CPaintDC dc(this); // device context for painting
-	
+
 	CRect clientRect;
 	GetClientRect(&clientRect);
 
@@ -293,7 +293,7 @@ void ObjectPreview::OnPaint()
 void ObjectPreview::DrawMyTexture(CDC *pDc, int top, int left, Int width, Int height, UnsignedByte *rgbData)
 {
 	// Just blast about some dib bits.
-	
+
 	LPBITMAPINFO pBI;
 //	long bytes = sizeof(BITMAPINFO);
  	pBI = new BITMAPINFO;
@@ -310,9 +310,9 @@ void ObjectPreview::DrawMyTexture(CDC *pDc, int top, int left, Int width, Int he
 	pBI->bmiHeader.biClrImportant = 0;
 
 	//::Sleep(10);
-	//int val=::StretchDIBits(pDc->m_hDC, left, top, width, height, 0, 0, PREVIEW_WIDTH, PREVIEW_HEIGHT, rgbData, pBI, 
+	//int val=::StretchDIBits(pDc->m_hDC, left, top, width, height, 0, 0, PREVIEW_WIDTH, PREVIEW_HEIGHT, rgbData, pBI,
 	//	DIB_RGB_COLORS, SRCCOPY);
-	/*int val=*/::StretchDIBits(pDc->m_hDC, left, top, width, height, PREVIEW_WIDTH/4, PREVIEW_HEIGHT/4, PREVIEW_WIDTH/2, PREVIEW_HEIGHT/2, rgbData, pBI, 
+	/*int val=*/::StretchDIBits(pDc->m_hDC, left, top, width, height, PREVIEW_WIDTH/4, PREVIEW_HEIGHT/4, PREVIEW_WIDTH/2, PREVIEW_HEIGHT/2, rgbData, pBI,
 		DIB_RGB_COLORS, SRCCOPY);
 	delete(pBI);
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectTool.cpp
index e31d253efdf..bba4bb20036 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "ObjectTool.h"
@@ -39,12 +39,12 @@
 	enum {HYSTERESIS = 3};
 /// Constructor
 ObjectTool::ObjectTool(void) :
-	Tool(ID_PLACE_OBJECT_TOOL, IDC_PLACE_OBJECT) 
+	Tool(ID_PLACE_OBJECT_TOOL, IDC_PLACE_OBJECT)
 {
 }
-	
+
 /// Destructor
-ObjectTool::~ObjectTool(void) 
+ObjectTool::~ObjectTool(void)
 {
 }
 
@@ -58,13 +58,13 @@ Real ObjectTool::calcAngle(Coord3D downPt, Coord3D curPt, WbView* pView)
 	if (dist < 0.1) // check for div-by-zero.
 	{
 		angle = 0;
-	} 
-	else if (abs(dx) > abs(dy)) 
+	}
+	else if (abs(dx) > abs(dy))
 	{
 		angle = acos(	(double)dx / dist);
 		if (dy<0) angle = -angle;
-	} 
-	else 
+	}
+	else
 	{
 		angle = asin(	((double)dy) / dist);
 		if (dx<0) angle = PI-angle;
@@ -81,7 +81,7 @@ Real ObjectTool::calcAngle(Coord3D downPt, Coord3D curPt, WbView* pView)
 
 
 /// Turn off object tracking.
-void ObjectTool::deactivate() 
+void ObjectTool::deactivate()
 {
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (pDoc==NULL) return;
@@ -89,7 +89,7 @@ void ObjectTool::deactivate()
 	p3View->setObjTracking(NULL, m_downPt3d, 0, false);
 }
 /// Shows the object options panel
-void ObjectTool::activate() 
+void ObjectTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_OBJECT_OPTIONS);
 	DrawObject::setDoBrushFeedback(false);
@@ -100,7 +100,7 @@ void ObjectTool::activate()
 }
 
 /** Execute the tool on mouse down - Place an object. */
-void ObjectTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void ObjectTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -111,7 +111,7 @@ void ObjectTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 }
 
 /** Tracking - show the object. */
-void ObjectTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void ObjectTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	Bool justAClick = true;
 	Coord3D cpt;
@@ -131,17 +131,17 @@ void ObjectTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 	WbView3d *p3View = pDoc->GetActive3DView();
 	p3View->setObjTracking(NULL, m_downPt3d, 0, false);
 	loc.z = ObjectOptions::getCurObjectHeight();
-	if (pCur) { 
+	if (pCur) {
 		// Display the transparent version of this object.
 		p3View->setObjTracking(pCur, loc, angle, true);
 	} else {
-		// Don't display anything. 
+		// Don't display anything.
 		p3View->setObjTracking(NULL, loc, angle, false);
 	}
 }
 
 /** Execute the tool on mouse up - Place an object. */
-void ObjectTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void ObjectTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp
index 04a0746c3c5..99101543322 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp
@@ -33,11 +33,7 @@ OpenMap::OpenMap(TOpenMapInfo *pInfo, CWnd* pParent /*=NULL*/)
 	m_pInfo(pInfo)
 {
 	m_pInfo->browse = false;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	m_usingSystemDir = ::AfxGetApp()->GetProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", TRUE);
-#else
-	m_usingSystemDir = FALSE;
-#endif
 
 	//{{AFX_DATA_INIT(OpenMap)
 		// NOTE: the ClassWizard will add member initialization here
@@ -76,20 +72,20 @@ void OpenMap::OnUserMaps()
 	populateMapListbox( FALSE );
 }
 
-void OpenMap::OnBrowse() 
+void OpenMap::OnBrowse()
 {
 	m_pInfo->browse = true;
 	OnOK();
 }
 
-void OpenMap::OnOK() 
+void OpenMap::OnOK()
 {
 	CListBox *pList = (CListBox *)this->GetDlgItem(IDC_OPEN_LIST);
 	if (pList == NULL) {
 		OnCancel();
 		return;
 	}
-	
+
 	Int sel = pList->GetCurSel();
 	if (sel == LB_ERR) {
 		m_pInfo->browse = true;
@@ -110,9 +106,7 @@ void OpenMap::OnOK()
 void OpenMap::populateMapListbox( Bool systemMaps )
 {
 	m_usingSystemDir = systemMaps;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	::AfxGetApp()->WriteProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", m_usingSystemDir);
-#endif
 
 	HANDLE			hFindFile = 0;
 	WIN32_FIND_DATA			findData;
@@ -124,25 +118,16 @@ void OpenMap::populateMapListbox( Bool systemMaps )
 		strcpy(dirBuf, "Maps\\");
 	else
 	{
-		strcpy(dirBuf, TheGlobalData->getPath_UserData().str());
-		strcat(dirBuf, "Maps\\");
-	}
-
-	int len = strlen(dirBuf);
-
-	if (len > 0 && dirBuf[len - 1] != '\\') {
-		dirBuf[len++] = '\\';
-		dirBuf[len] = 0;
+		snprintf(dirBuf, ARRAY_SIZE(dirBuf), "%sMaps\\", TheGlobalData->getPath_UserData().str());
 	}
 	CListBox *pList = (CListBox *)this->GetDlgItem(IDC_OPEN_LIST);
 	if (pList == NULL) return;
 	pList->ResetContent();
-	strcpy(findBuf, dirBuf);
-	strcat(findBuf, "*.*");
+	snprintf(findBuf, ARRAY_SIZE(findBuf), "%s*.*", dirBuf);
 
 	Bool found = false;
 
-	hFindFile = FindFirstFile(findBuf, &findData); 
+	hFindFile = FindFirstFile(findBuf, &findData);
 	if (hFindFile != INVALID_HANDLE_VALUE) {
 		do {
 			if (strcmp(findData.cFileName, ".") == 0 || strcmp(findData.cFileName, "..") == 0)
@@ -151,11 +136,7 @@ void OpenMap::populateMapListbox( Bool systemMaps )
 				continue;
 			}
 
-			strcpy(fileBuf, dirBuf);
-			strcat(fileBuf, findData.cFileName);
-			strcat(fileBuf, "\\");
-			strcat(fileBuf, findData.cFileName);
-			strcat(fileBuf, ".map");
+			snprintf(fileBuf, ARRAY_SIZE(fileBuf), "%s%s\\%s.map", dirBuf, findData.cFileName, findData.cFileName);
 			try {
 				CFileStatus status;
 				if (CFile::GetStatus(fileBuf, status)) {
@@ -178,7 +159,7 @@ void OpenMap::populateMapListbox( Bool systemMaps )
 	}
 }
 
-BOOL OpenMap::OnInitDialog() 
+BOOL OpenMap::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -190,12 +171,9 @@ BOOL OpenMap::OnInitDialog()
 	if (pUserMaps != NULL)
 		pUserMaps->SetCheck( !m_usingSystemDir );
 
-#if !defined(RTS_DEBUG) && !defined(RTS_INTERNAL)
-	if (pSystemMaps)
-		pSystemMaps->ShowWindow( FALSE );
-	if (pUserMaps)
-		pUserMaps->ShowWindow( FALSE );
-#endif
+	// TheSuperHackers @tweak Originally World Builder has hidden the System Maps tab button in Release builds,
+	// perhaps with the intention to only show User Maps to community users. However, World Builder did release
+	// as a Debug build and always had the System Maps tab, therefore this now shows it always for simplicity.
 
 	populateMapListbox( m_usingSystemDir );
 
@@ -203,7 +181,7 @@ BOOL OpenMap::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void OpenMap::OnDblclkOpenList() 
+void OpenMap::OnDblclkOpenList()
 {
 	OnOK();
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/OptionsPanel.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/OptionsPanel.cpp
index cfc5e678f54..d89ca14342f 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/OptionsPanel.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/OptionsPanel.cpp
@@ -59,21 +59,21 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // COptionsPanel message handlers
 
-void COptionsPanel::OnMove(int x, int y) 
+void COptionsPanel::OnMove(int x, int y)
 {
 	CDialog::OnMove(x, y);
-	
+
 	if (this->IsWindowVisible() && !this->IsIconic()) {
 		CRect frameRect;
 		GetWindowRect(&frameRect);
 		::AfxGetApp()->WriteProfileInt(OPTIONS_PANEL_SECTION, "Top", frameRect.top);
 		::AfxGetApp()->WriteProfileInt(OPTIONS_PANEL_SECTION, "Left", frameRect.left);
 	}
-	
+
 }
 
 
-void COptionsPanel::OnEditRedo() 
+void COptionsPanel::OnEditRedo()
 {
 	// Redirect undo/redo to the doc so they get executed.
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
@@ -82,7 +82,7 @@ void COptionsPanel::OnEditRedo()
 	}
 }
 
-void COptionsPanel::OnUpdateEditRedo(CCmdUI* pCmdUI) 
+void COptionsPanel::OnUpdateEditRedo(CCmdUI* pCmdUI)
 {
 	// Redirect undo/redo to the doc so they get executed.
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
@@ -91,7 +91,7 @@ void COptionsPanel::OnUpdateEditRedo(CCmdUI* pCmdUI)
 	}
 }
 
-void COptionsPanel::OnEditUndo() 
+void COptionsPanel::OnEditUndo()
 {
 	// Redirect undo/redo to the doc so they get executed.
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
@@ -100,7 +100,7 @@ void COptionsPanel::OnEditUndo()
 	}
 }
 
-void COptionsPanel::OnUpdateEditUndo(CCmdUI* pCmdUI) 
+void COptionsPanel::OnUpdateEditUndo(CCmdUI* pCmdUI)
 {
 	// Redirect undo/redo to the doc so they get executed.
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp
index 9fee5c91d49..480ede7b2e4 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp
@@ -49,11 +49,11 @@ ReplaceUnitDialog::ReplaceUnitDialog(CWnd* pParent /*=NULL*/)
 	//}}AFX_DATA_INIT
 }
 
-BOOL ReplaceUnitDialog::OnInitDialog() 
+BOOL ReplaceUnitDialog::OnInitDialog()
 {
 	PickUnitDialog::OnInitDialog();
 	CWnd *pWnd = GetDlgItem(IDC_MISSINGLABEL);
-	if (pWnd) 
+	if (pWnd)
 		pWnd->SetWindowText(m_missingName.str());
 
 	return TRUE;
@@ -94,9 +94,7 @@ PickUnitDialog::PickUnitDialog(UINT id, CWnd* pParent /*=NULL*/)
 
 PickUnitDialog::~PickUnitDialog()
 {
-	if (m_objectsList) {
-		deleteInstance(m_objectsList);
-	}
+	deleteInstance(m_objectsList);
 	m_objectsList = NULL;
 }
 
@@ -115,22 +113,22 @@ BEGIN_MESSAGE_MAP(PickUnitDialog, CDialog)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-void PickUnitDialog::OnMove(int x, int y) 
+void PickUnitDialog::OnMove(int x, int y)
 {
 	CDialog::OnMove(x, y);
-	
+
 	if (this->IsWindowVisible() && !this->IsIconic()) {
 		CRect frameRect;
 		GetWindowRect(&frameRect);
 		::AfxGetApp()->WriteProfileInt(BUILD_PICK_PANEL_SECTION, "Top", frameRect.top);
 		::AfxGetApp()->WriteProfileInt(BUILD_PICK_PANEL_SECTION, "Left", frameRect.left);
 	}
-	
+
 }
 
 Bool PickUnitDialog::IsAllowableType(EditorSortingType sort, Bool isBuildable)
 {
-	if (m_factionOnly && !isBuildable) 
+	if (m_factionOnly && !isBuildable)
 	{
 		return false;
 	}
@@ -153,10 +151,10 @@ void PickUnitDialog::SetupAsPanel(void)
 /////////////////////////////////////////////////////////////////////////////
 // PickUnitDialog message handlers
 
-BOOL PickUnitDialog::OnInitDialog() 
+BOOL PickUnitDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 //	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 
 	// add entries from the thing factory as the available objects to use
@@ -175,7 +173,7 @@ BOOL PickUnitDialog::OnInitDialog()
 		pMap = newInstance(MapObject)( loc, tTemplate->getName(), 0.0f, 0, NULL, tTemplate );
 		pMap->setNextMap( m_objectsList );
 		m_objectsList = pMap;
-	}  // end for tTemplate
+	}
 
 	CWnd *pWnd = GetDlgItem(IDC_OBJECT_HEIGHT_EDIT);
 	if (pWnd) {
@@ -201,7 +199,7 @@ BOOL PickUnitDialog::OnInitDialog()
 		index++;
 		pMap = pMap->getNext();
 	}
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -218,7 +216,7 @@ HTREEITEM PickUnitDialog::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_objectTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -233,12 +231,12 @@ HTREEITEM PickUnitDialog::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = (char*)pLabel;
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_objectTreeView.InsertItem(&ins);
 	return(child);
 }
 
-BOOL PickUnitDialog::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL PickUnitDialog::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_objectTreeView.m_hWnd) {
@@ -263,10 +261,11 @@ BOOL PickUnitDialog::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_objectTreeView.GetItem(&item);
 			if (item.lParam >= 0) {
 				m_currentObjectIndex = item.lParam;
+				static_assert(ARRAY_SIZE(m_currentObjectName) >= ARRAY_SIZE(buffer), "Incorrect array size");
 				strcpy(m_currentObjectName, buffer);
 			}	else if (m_objectTreeView.ItemHasChildren(item.hItem)) {
 				strcpy(m_currentObjectName, "");
@@ -274,7 +273,7 @@ BOOL PickUnitDialog::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			}
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
@@ -293,7 +292,7 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 	//
 	// if we have an thing template in mapObject, we've read it from the new INI database,
 	// we will sort those items into the tree based on properties of the template that
-	// make it easier for us to browse when building levels 
+	// make it easier for us to browse when building levels
 	//
 	// Feel free to reorganize how this tree is constructed from the template
 	// data at will, whatever makes it easier for design
@@ -305,12 +304,11 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 		// first check for test sorted objects
 		if( thingTemplate->getEditorSorting() == ES_TEST )
 			parent = findOrAdd( parent, "TEST" );
-	
+
 		// first sort by side, either create or find the tree item with matching side name
 		AsciiString side = thingTemplate->getDefaultOwningSide();
-		DEBUG_ASSERTCRASH( !side.isEmpty(), ("NULL default side in template\n") );
-		strcpy( buffer, side.str() );
-		parent = findOrAdd( parent, buffer );
+		DEBUG_ASSERTCRASH( !side.isEmpty(), ("NULL default side in template") );
+		parent = findOrAdd( parent, side.str());
 
 		// next tier uses the editor sorting that design can specify in the INI
 		EditorSortingType i = ES_FIRST;
@@ -325,9 +323,9 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 				parent = findOrAdd( parent, EditorSortingNames[ i ] );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		if( i == ES_NUM_SORTING_TYPES )
 			parent = findOrAdd( parent, "UNSORTED" );
@@ -335,10 +333,10 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 		// the leaf name is the name of the template
 		leafName = thingTemplate->getName().str();
 
-	}  // end if
-	else 
+	}
+	else
 	{
-	
+
 		// all these old entries we will put in a tree for legacy GDF items
 		parent = findOrAdd( parent, "**TEST MODELS" );
 
@@ -350,7 +348,7 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 			}
 			if (pPath[i] == '/') {
 				pPath+= i+1;
-				i = 0;			
+				i = 0;
 			}
 			buffer[i] = pPath[i];
 			i++;
@@ -361,9 +359,9 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 			buffer[ i ] = 0;
 			leafName = buffer;
 
-		}  // end if
+		}
 
-	}  // end else if
+	}
 
 	// add to the tree view
 	if( leafName )
@@ -376,7 +374,7 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = index;
 		ins.item.pszText = (char*)leafName;
-		ins.item.cchTextMax = strlen(leafName)+2;				
+		ins.item.cchTextMax = strlen(leafName)+2;
 		m_objectTreeView.InsertItem(&ins);
 
 	}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/PointerTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/PointerTool.cpp
index 9c837c14279..84704c37a0c 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/PointerTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/PointerTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "PointerTool.h"
@@ -49,7 +49,7 @@ static void pickAllWaypointsInPath( Int sourceID, Bool select )
 	CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
 
 	helper_pickAllWaypointsInPath(sourceID, pDoc, pDoc->getNumWaypointLinks(), alreadyTouched);
-	
+
 	// already touched should now be filled with waypointIDs that want to be un/selected
 	MapObject *pMapObj = MapObject::getFirstMapObject();
 	while (pMapObj) {
@@ -94,12 +94,12 @@ PointerTool::PointerTool(void) :
 	m_moveCursor(NULL)
 {
 	m_toolID = ID_POINTER_TOOL;
-	m_cursorID = IDC_POINTER; 
+	m_cursorID = IDC_POINTER;
 
 }
-	
+
 /// Destructor
-PointerTool::~PointerTool(void) 
+PointerTool::~PointerTool(void)
 {
 	REF_PTR_RELEASE(m_modifyUndoable); // belongs to pDoc now.
 	if (m_rotateCursor) {
@@ -111,16 +111,16 @@ PointerTool::~PointerTool(void)
 }
 
 /// See if a single obj is selected that has properties.
-void PointerTool::checkForPropertiesPanel(void) 
+void PointerTool::checkForPropertiesPanel(void)
 {
 	MapObject *theMapObj = WaypointOptions::getSingleSelectedWaypoint();
 	PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon();
-	MapObject *theLightObj = LightOptions::getSingleSelectedLight(); 
-	MapObject *theObj = MapObjectProps::getSingleSelectedMapObject(); 
+	MapObject *theLightObj = LightOptions::getSingleSelectedLight();
+	MapObject *theObj = MapObjectProps::getSingleSelectedMapObject();
 	if (theMapObj) {
 		CMainFrame::GetMainFrame()->showOptionsDialog(IDD_WAYPOINT_OPTIONS);
 		WaypointOptions::update();
-	} else if (theTrigger) { 
+	} else if (theTrigger) {
 		if (theTrigger->isWaterArea()) {
 			CMainFrame::GetMainFrame()->showOptionsDialog(IDD_WATER_OPTIONS);
 			WaterOptions::update();
@@ -157,7 +157,7 @@ void PointerTool::clearSelection(void) ///< Clears the selected objects selected
 	// Clear selected build list items.
 	Int i;
 	for (i=0; i<TheSidesList->getNumSides(); i++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(i);
 		for (BuildListInfo *pBuild = pSide->getBuildList(); pBuild; pBuild = pBuild->getNext()) {
 			if (pBuild->isSelected()) {
 				pBuild->setSelected(false);
@@ -168,7 +168,7 @@ void PointerTool::clearSelection(void) ///< Clears the selected objects selected
 }
 
 /// Activate.
-void PointerTool::activate() 
+void PointerTool::activate()
 {
 	Tool::activate();
 	m_mouseUpRotate = false;
@@ -181,14 +181,14 @@ void PointerTool::activate()
 }
 
 /// deactivate.
-void PointerTool::deactivate() 
+void PointerTool::deactivate()
 {
 	m_curObject = NULL;
 	PolygonTool::deactivate();
 }
 
 /** Set the cursor. */
-void PointerTool::setCursor(void) 
+void PointerTool::setCursor(void)
 {
 	if (m_mouseUpRotate) {
 		if (m_rotateCursor == NULL) {
@@ -210,7 +210,7 @@ Bool PointerTool::allowPick(MapObject* pMapObj, WbView* pView)
 	EditorSortingType sort = ES_NONE;
 	if (!pMapObj) {
 		return false;
-	} 
+	}
 	const ThingTemplate *tt = pMapObj->getThingTemplate();
 	if (tt && tt->getEditorSorting() == ES_AUDIO) {
 		if (pView->GetPickConstraint() == ES_NONE || pView->GetPickConstraint() == ES_AUDIO) {
@@ -237,12 +237,12 @@ Bool PointerTool::allowPick(MapObject* pMapObj, WbView* pView)
 		if (sort != ES_NONE && sort != pView->GetPickConstraint()) {
 			return false;
 		}
-	} 
+	}
 	return true;
 }
 
 /** Execute the tool on mouse down - Pick an object. */
-void PointerTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void PointerTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -358,7 +358,7 @@ void PointerTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 
 	if (anySelected) {
 		if (m_curObject) {
-			// See if we are picking on the arrow. 
+			// See if we are picking on the arrow.
 			if (pView->picked(m_curObject, cpt) == PICK_ARROW) {
 				m_rotating = true;
 			}
@@ -461,7 +461,7 @@ void PointerTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 	while (curMapObj) {
 		if (curMapObj->isSelected()) {
 			//pDoc->invalObject(curMapObj);			// invaling in all views can be too slow.
-			pView->invalObjectInView(curMapObj);	
+			pView->invalObjectInView(curMapObj);
 		}
 		curMapObj = curMapObj->getNext();
 	}
@@ -480,7 +480,7 @@ void PointerTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 	while (curMapObj) {
 		if (curMapObj->isSelected()) {
 			//pDoc->invalObject(curMapObj);			// invaling in all views can be too slow.
-			pView->invalObjectInView(curMapObj);	
+			pView->invalObjectInView(curMapObj);
 		}
 		curMapObj = curMapObj->getNext();
 	}
@@ -490,9 +490,9 @@ void PointerTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 }
 
 
-/** Execute the tool on mouse up - if modifying, do the modify, 
+/** Execute the tool on mouse up - if modifying, do the modify,
 else update the selection. */
-void PointerTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void PointerTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -544,7 +544,7 @@ void PointerTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 			}
 		}
 
-	} 
+	}
 	checkForPropertiesPanel();
 }
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/PolygonTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/PolygonTool.cpp
index b42cf5496fe..32d54a67936 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/PolygonTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/PolygonTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "PolygonTool.h"
@@ -48,7 +48,7 @@ enum {SNAP_DISTANCE = 5};
 
 /// Constructor
 PolygonTool::PolygonTool(void) :
-	Tool(ID_POLYGON_TOOL, IDC_POLYGON), 
+	Tool(ID_POLYGON_TOOL, IDC_POLYGON),
 	m_poly_plusCursor(NULL),
 	m_poly_moveCursor(NULL)
 {
@@ -57,7 +57,7 @@ PolygonTool::PolygonTool(void) :
 
 
 /// Destructor
-PolygonTool::~PolygonTool(void) 
+PolygonTool::~PolygonTool(void)
 {
 	if (m_poly_plusCursor) {
 		::DestroyCursor(m_poly_plusCursor);
@@ -68,7 +68,7 @@ PolygonTool::~PolygonTool(void)
 }
 
 /// Clears it's is active flag.
-void PolygonTool::deactivate() 
+void PolygonTool::deactivate()
 {
 	m_poly_dragPointNdx = -1;
 	if (m_poly_curSelectedPolygon) {
@@ -82,7 +82,7 @@ void PolygonTool::deactivate()
 }
 
 /// Shows the terrain materials options panel.
-void PolygonTool::activate() 
+void PolygonTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_WAYPOINT_OPTIONS);
 	WaypointOptions::update();
@@ -119,7 +119,7 @@ Bool PolygonTool::poly_pickPoly(PolygonTrigger *pTrig, Coord3D loc, Int toleranc
 	}
 	if (count>0 && count<8) {
 		return true;
-	}		
+	}
 	return false;
 }
 
@@ -150,7 +150,7 @@ PolygonTrigger *PolygonTool::pickPolygon(Coord3D loc, CPoint viewPt, WbView* pVi
 			return pTrig;
 		}
 	}
-	return NULL; 
+	return NULL;
 }
 
 // Snap to other polys.
@@ -187,7 +187,7 @@ Int PolygonTool::poly_pickPoint(PolygonTrigger *pTrig, CPoint viewPt, WbView* pV
 		cpt.y = iLoc.y;
 		cpt.z = iLoc.z;
 		cpt.z = 0;
-		CPoint screenLoc; 
+		CPoint screenLoc;
 		pView->docToViewCoords(cpt, &screenLoc);
 		Int dx = screenLoc.x-viewPt.x;
 		Int dy = screenLoc.y - viewPt.y;
@@ -242,8 +242,8 @@ Int PolygonTool::poly_getInsertIndex(PolygonTrigger *pTrig, Coord3D loc) {
 }
 
 /** Do the pick on poly triggers. */
-void PolygonTool::poly_pickOnMouseDown(CPoint viewPt, WbView* pView) 
-{						 
+void PolygonTool::poly_pickOnMouseDown(CPoint viewPt, WbView* pView)
+{
 	m_poly_dragPointNdx = -1;
 	if (m_poly_curSelectedPolygon) {
 		Bool found = false;
@@ -274,7 +274,7 @@ void PolygonTool::poly_pickOnMouseDown(CPoint viewPt, WbView* pView)
 
 
 /// Perform the tool behavior on mouse down.
-void PolygonTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void PolygonTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	Coord3D docPt;
@@ -289,8 +289,8 @@ void PolygonTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 }
 
 /// Perform the tool behavior on mouse down.
-void PolygonTool::startMouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
-{	
+void PolygonTool::startMouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
+{
 	// Clear any selected map objects.
 	if (!m_poly_curSelectedPolygon) PointerTool::clearSelection();
 
@@ -305,7 +305,7 @@ void PolygonTool::startMouseDown(TTrackingMode m, CPoint viewPt, WbView* pView,
 	m_poly_moveUndoable = NULL;
 	if (m_poly_curSelectedPolygon==NULL) {
 		// adding a new polygon.
-		m_poly_curSelectedPolygon = newInstance(PolygonTrigger)(32); 
+		m_poly_curSelectedPolygon = newInstance(PolygonTrigger)(32);
 		AsciiString name;
 		name.format("Area %d", m_poly_curSelectedPolygon->getID());
 		m_poly_curSelectedPolygon->setTriggerName(name);
@@ -353,7 +353,7 @@ void PolygonTool::startMouseDown(TTrackingMode m, CPoint viewPt, WbView* pView,
 }
 
 /// Delete the selected polygon or point.
-Bool PolygonTool::deleteSelectedPolygon(void) 
+Bool PolygonTool::deleteSelectedPolygon(void)
 {
 	if (m_poly_curSelectedPolygon) {
 		Bool found = false;
@@ -391,7 +391,7 @@ Bool PolygonTool::deleteSelectedPolygon(void)
 }
 
 /** Set the cursor. */
-void PolygonTool::setCursor(void) 
+void PolygonTool::setCursor(void)
 {
 	if (m_poly_mouseUpPlus || (m_poly_isAdding && m_poly_curSelectedPolygon)) {
 		if (m_poly_plusCursor == NULL) {
@@ -462,7 +462,7 @@ void PolygonTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 }
 
 /** Mouse up - not much. */
-void PolygonTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void PolygonTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	REF_PTR_RELEASE(m_poly_moveUndoable); // belongs to pDoc now.
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/RampOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/RampOptions.cpp
index f190444437d..0971a777387 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/RampOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/RampOptions.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: RampOptions.cpp 
+// FILE: RampOptions.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/RampTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/RampTool.cpp
index e965ec71780..1c97fd6879e 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/RampTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/RampTool.cpp
@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// FILE: RampTool.cpp 
+// FILE: RampTool.cpp
 /*---------------------------------------------------------------------------*/
 /* EA Pacific                                                                */
 /* Confidential Information	                                                 */
@@ -131,9 +131,9 @@ void RampTool::applyRamp(CWorldBuilderDoc* pDoc)
 	VecHeightMapIndexes indices;
 
 	WorldHeightMapEdit *worldHeightDup = pDoc->GetHeightMap()->duplicate();
-	
+
 	Real width = TheRampOptions->getRampWidth();
-	
+
 	BuildRectFromSegmentAndWidth(&mStartPoint, &mEndPoint, width,
 															 &bl, &tl, &br, &tr);
 
@@ -148,8 +148,8 @@ void RampTool::applyRamp(CWorldBuilderDoc* pDoc)
 	}
 
 	/*
-		This part is pretty straightforward. Determine the U value for the shortest segment from the 
-		index's actual location to the segments from mStartPoint to mEndPoint, and then apply a 
+		This part is pretty straightforward. Determine the U value for the shortest segment from the
+		index's actual location to the segments from mStartPoint to mEndPoint, and then apply a
 		linear gradient factor according to the height from the beginning to the end of mStartPoint
 		and mEndPoint.
 	*/
@@ -157,15 +157,15 @@ void RampTool::applyRamp(CWorldBuilderDoc* pDoc)
 	for (int i = 0; i < indiceCount; ++i) {
 		Coord3D pt;
 		pDoc->getCoordFromCellIndex(indices[i], &pt);
-		
+
 		Real uVal;
 		Coord2D start = { mStartPoint.x, mStartPoint.y };
 		Coord2D end = { mEndPoint.x, mEndPoint.y };
 		Coord2D pt2D = { pt.x, pt.y };
-		
+
 		ShortestDistancePointToSegment2D(&start, &end, &pt2D, NULL, NULL, &uVal);
 		Real height = mStartPoint.z + uVal * (mEndPoint.z - mStartPoint.z);
-		
+
 		worldHeightDup->setHeight(indices[i].x, indices[i].y, (UnsignedByte) (height / MAP_HEIGHT_SCALE));
 	}
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/RoadOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/RoadOptions.cpp
index 51a6c292513..769a02996ce 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/RoadOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/RoadOptions.cpp
@@ -99,10 +99,10 @@ void RoadOptions::updateLabel(void)
 /** Returns true if only one or more roads is selected. */
 Bool RoadOptions::selectionIsRoadsOnly(void)
 {
-//	MapObject *theMapObj = NULL; 
+//	MapObject *theMapObj = NULL;
 	Bool foundRoad = false;
 	Bool foundAnythingElse = false;
-	MapObject *pMapObj; 
+	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj->isSelected()) {
 			if (pMapObj->getFlag(FLAG_ROAD_FLAGS)) {
@@ -118,7 +118,7 @@ Bool RoadOptions::selectionIsRoadsOnly(void)
 /** Returns true if only one or more roads is selected. */
 void RoadOptions::updateSelection(void)
 {
-//	MapObject *theMapObj = NULL; 
+//	MapObject *theMapObj = NULL;
 	Int angled = 0;
 	Int tight = 0;
 	Int broad = 0;
@@ -127,7 +127,7 @@ void RoadOptions::updateSelection(void)
 	Bool multipleNames = false;
 
 	if (!m_staticThis) return;
-	MapObject *pMapObj; 
+	MapObject *pMapObj;
 
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj->isSelected() && pMapObj->getFlag(FLAG_ROAD_FLAGS)) {
@@ -144,7 +144,7 @@ void RoadOptions::updateSelection(void)
 				tight = 1;
 			}	else {
 				broad = 1;
-			}	
+			}
 			if (pMapObj->getFlag(FLAG_ROAD_JOIN)) {
 				join = 1;
 			}
@@ -197,7 +197,7 @@ void RoadOptions::applyToSelection(void)
 		flagVal = FLAG_ROAD_CORNER_ANGLED;
 	} else if (m_tightCurve) {
 		flagVal = FLAG_ROAD_CORNER_TIGHT;
-	}	
+	}
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	ModifyFlagsUndoable *pUndo = new ModifyFlagsUndoable(pDoc, flagMask, flagVal);
 	pDoc->AddAndDoUndoable(pUndo);
@@ -209,7 +209,7 @@ void RoadOptions::applyToSelection(void)
 // RoadOptions message handlers
 
 /// Setup the controls in the dialog.
-BOOL RoadOptions::OnInitDialog() 
+BOOL RoadOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -237,24 +237,17 @@ BOOL RoadOptions::OnInitDialog()
 		index++;
 		m_numberOfRoads++;
 
-	}  // end for raod
+	}
 
 	// load roads from test assets
 #ifdef LOAD_TEST_ASSETS
 	{
-		char				dirBuf[_MAX_PATH];
-		char				findBuf[_MAX_PATH];
 		char				fileBuf[_MAX_PATH];
 
-		strcpy(dirBuf, ROAD_DIRECTORY);
-		int len = strlen(dirBuf);
-
-		strcpy(findBuf, dirBuf);
-
 		FilenameList filenameList;
-		TheFileSystem->getFileListInDirectory(AsciiString(findBuf), AsciiString("*.tga"), filenameList, FALSE);
+		TheFileSystem->getFileListInDirectory(ROAD_DIRECTORY, "*.tga", filenameList, FALSE);
 
-		if (filenameList.size() > 0) {
+		if (!filenameList.empty()) {
 			FilenameList::iterator it = filenameList.begin();
 			do {
 				AsciiString	filename = *it;
@@ -263,7 +256,7 @@ BOOL RoadOptions::OnInitDialog()
 					++it;
 					continue;
 				}
-				len = filename.getLength();
+				int len = filename.getLength();
 				if (len<5) {
 					++it;
 					continue;
@@ -273,9 +266,10 @@ BOOL RoadOptions::OnInitDialog()
 					++it;
 					continue;
 				}
+				static_assert(ARRAY_SIZE(fileBuf) >= ARRAY_SIZE(TEST_STRING), "Incorrect array size");
 				strcpy(fileBuf, TEST_STRING);
-				strcat(fileBuf, "\\");
-				strcat(fileBuf, filename.str());
+				strlcat(fileBuf, "\\", ARRAY_SIZE(fileBuf));
+				strlcat(fileBuf, filename.str(), ARRAY_SIZE(fileBuf));
 				addRoad(fileBuf, index, TVI_ROOT);
 				index++;
 				m_numberOfRoads++;
@@ -289,8 +283,8 @@ BOOL RoadOptions::OnInitDialog()
 	m_numberOfBridges = 0;
 	// add bridge defs from INI
 	TerrainRoadType *bridge;
-	for( bridge = TheTerrainRoads->firstBridge(); 
-			 bridge; 
+	for( bridge = TheTerrainRoads->firstBridge();
+			 bridge;
 			 bridge = TheTerrainRoads->nextBridge( bridge ) )
 	{
 
@@ -298,7 +292,7 @@ BOOL RoadOptions::OnInitDialog()
 		index++;
 		m_numberOfBridges++;
 
-	}  // end for bridge
+	}
 
 	m_currentRoadIndex = 1;
 	setRoadTreeViewSelection(TVI_ROOT, m_currentRoadIndex);
@@ -322,7 +316,7 @@ HTREEITEM RoadOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_roadTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -337,7 +331,7 @@ HTREEITEM RoadOptions::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = const_cast<char*>(pLabel);
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_roadTreeView.InsertItem(&ins);
 	return(child);
 }
@@ -354,7 +348,7 @@ Bool RoadOptions::findAndSelect(HTREEITEM parent, AsciiString label)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_roadTreeView.GetItem(&ins.item);
 		if (label.compare(buffer) == 0) {
 			m_roadTreeView.SelectItem(child);
@@ -387,17 +381,17 @@ void RoadOptions::addRoad(char *pPath, Int terrainNdx, HTREEITEM parent)
 			parent = findOrAdd( parent, "Roads" );
 
 		// set the name to place as the name of the road entry in INI
-		strcpy( buffer, road->getName().str() );
+		strlcpy(buffer, road->getName().str(), ARRAY_SIZE(buffer));
 
 		// do the add
 		doAdd = TRUE;
 
-	}  // end if
+	}
 
 #ifdef LOAD_TEST_ASSETS
 	if (!doAdd && !strncmp(TEST_STRING, pPath, strlen(TEST_STRING))) {
 		parent = findOrAdd(parent, TEST_STRING);
-		strcpy(buffer, pPath + strlen(TEST_STRING) + 1);
+		strlcpy(buffer, pPath + strlen(TEST_STRING) + 1, ARRAY_SIZE(buffer));
 		doAdd = true;
 	}
 #endif
@@ -412,7 +406,7 @@ void RoadOptions::addRoad(char *pPath, Int terrainNdx, HTREEITEM parent)
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = terrainNdx;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = strlen(buffer)+2;				
+		ins.item.cchTextMax = strlen(buffer)+2;
 		m_roadTreeView.InsertItem(&ins);
 	}
 
@@ -429,7 +423,7 @@ Bool RoadOptions::setRoadTreeViewSelection(HTREEITEM parent, Int selection)
 		item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;
 		item.hItem = child;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_roadTreeView.GetItem(&item);
 		if (item.lParam == selection) {
 			m_roadTreeView.SelectItem(child);
@@ -448,22 +442,22 @@ void RoadOptions::SelectConnected(void)
 {
 	std::list<MapObject*> roadSegs;
 	std::list<MapObject*> connectedSegs;
-	for (MapObject* pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+	for (MapObject* pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
-		if (pMapObj->getFlag(FLAG_ROAD_POINT1)) 
+		if (pMapObj->getFlag(FLAG_ROAD_POINT1))
 		{
-			if (pMapObj->isSelected() || pMapObj->getNext() && pMapObj->getNext()->isSelected()) 
+			if (pMapObj->isSelected() || pMapObj->getNext() && pMapObj->getNext()->isSelected())
 			{
 				connectedSegs.push_back(pMapObj);
 			}
-			else 
+			else
 			{
 				roadSegs.push_back(pMapObj);
 			}
 		}
 	}
 	Bool changed = true;
-	while (changed) 
+	while (changed)
 	{
 		changed = false;
 		for (std::list<MapObject*>::iterator it = roadSegs.begin(); it != roadSegs.end(); ++it)
@@ -535,7 +529,7 @@ void RoadOptions::ChangeRoadType(AsciiString newRoad)
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 }
 
-BOOL RoadOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL RoadOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_roadTreeView.m_hWnd) {
@@ -547,7 +541,7 @@ BOOL RoadOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_roadTreeView.GetItem(&item);
 			if (item.lParam >= 0) {
 				m_currentRoadIndex = item.lParam;
@@ -566,33 +560,33 @@ BOOL RoadOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			}
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
 
-void RoadOptions::OnTightCurve() 
+void RoadOptions::OnTightCurve()
 {
 	m_angleCorners = false;
 	m_tightCurve = true;
 	applyToSelection();
 }
 
-void RoadOptions::OnAngled() 
+void RoadOptions::OnAngled()
 {
 	m_angleCorners = true;
 	m_tightCurve = false;
 	applyToSelection();
 }
 
-void RoadOptions::OnBroadCurve() 
+void RoadOptions::OnBroadCurve()
 {
 	m_angleCorners = false;
 	m_tightCurve = false;
 	applyToSelection();
 }
 
-void RoadOptions::OnJoin() 
+void RoadOptions::OnJoin()
 {
 	CButton *pButton = (CButton *)m_staticThis->GetDlgItem(IDC_JOIN);
 	m_doJoin = pButton->GetCheck()==1;
@@ -607,7 +601,7 @@ void RoadOptions::OnJoin()
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 }
 
-void RoadOptions::OnApplyRoad() 
+void RoadOptions::OnApplyRoad()
 {
 	if (m_currentRoadName != AsciiString::TheEmptyString)
 	{
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/RoadTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/RoadTool.cpp
index 6e0171ea3ae..90e5f9d808b 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/RoadTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/RoadTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "RoadTool.h"
@@ -41,30 +41,30 @@
 //
 /// Constructor
 RoadTool::RoadTool(void) :
-	Tool(ID_ROAD_TOOL, IDC_ROAD) 
+	Tool(ID_ROAD_TOOL, IDC_ROAD)
 {
 	m_mapObj = NULL;
 }
-	
+
 /// Destructor
-RoadTool::~RoadTool(void) 
+RoadTool::~RoadTool(void)
 {
 	m_mapObj = NULL;
 }
 //-----------------------------------------------------------------------------
-//         Public Functions                                               
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 MapObject* RoadTool::findSegment(const Coord3D *pLoc, Coord3D *outLoc)
 {
-	for (MapObject* pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+	for (MapObject* pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
-		if (pMapObj->getFlag(FLAG_ROAD_POINT1)) 
+		if (pMapObj->getFlag(FLAG_ROAD_POINT1))
 		{
 			MapObject* pMapObj2 = pMapObj->getNext();
-			if (pMapObj2==NULL) 
+			if (pMapObj2==NULL)
 				break;
-			if (!pMapObj2->getFlag(FLAG_ROAD_POINT2)) 
+			if (!pMapObj2->getFlag(FLAG_ROAD_POINT2))
 				continue;
 			Coord2D start, end, loc, snapLoc;
 			start.x = pMapObj->getLocation()->x;
@@ -85,7 +85,7 @@ MapObject* RoadTool::findSegment(const Coord3D *pLoc, Coord3D *outLoc)
 			segment.y = loc.y - snapLoc.y;
 			dist = segment.length();
 
-			if (dist < ROAD_SNAP_DISTANCE*MAP_XY_FACTOR) 
+			if (dist < ROAD_SNAP_DISTANCE*MAP_XY_FACTOR)
 			{
 				outLoc->x = snapLoc.x;
 				outLoc->y = snapLoc.y;
@@ -147,7 +147,7 @@ Bool RoadTool::snap(Coord3D *pLoc, Bool skipFirst)
 
 
 /// Shows the road options panel.
-void RoadTool::activate() 
+void RoadTool::activate()
 {
 	PointerTool::clearSelection();
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_ROAD_OPTIONS);
@@ -156,7 +156,7 @@ void RoadTool::activate()
 }
 
 /** Execute the tool on mouse up - Place a road segment. */
-void RoadTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void RoadTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
@@ -260,7 +260,7 @@ void RoadTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBu
 		} else if (RoadOptions::isTightCurve()) {
 			pNew1->setFlag(FLAG_ROAD_CORNER_TIGHT);
 			pNew2->setFlag(FLAG_ROAD_CORNER_TIGHT);
-		}	
+		}
 	}
 
 	// Roads belong to the neutral player. :)
@@ -333,7 +333,7 @@ void RoadTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 	pDoc->invalObject(m_mapObj);
 }
 
-void RoadTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void RoadTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	m_mapObj = NULL;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/RulerOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/RulerOptions.cpp
index 9213cb08a96..a8e0b2adf6b 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/RulerOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/RulerOptions.cpp
@@ -32,7 +32,7 @@ RulerOptions*	RulerOptions::m_staticThis = NULL;
 /////////////////////////////////////////////////////////////////////////////
 RulerOptions::RulerOptions(CWnd* pParent /*=NULL*/)
 {
-	//{{AFX_DATA_INIT(RulerOptions) 
+	//{{AFX_DATA_INIT(RulerOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -48,8 +48,8 @@ void RulerOptions::DoDataExchange(CDataExchange* pDX)
 
 
 /** Update the value in the edit control. */
-void RulerOptions::setWidth(Real width) 
-{ 
+void RulerOptions::setWidth(Real width)
+{
 	CString buf;
 	// Multiply by 2 because we are changing from radius to diameter.
 	buf.Format("%f", width * 2.0f);
@@ -63,10 +63,10 @@ void RulerOptions::setWidth(Real width)
 
 
 /// Dialog UI initialization.
-BOOL RulerOptions::OnInitDialog() 
+BOOL RulerOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_staticThis = this;
 	m_updating = false;
 	if (RulerTool::getType() != RULER_CIRCLE) {
@@ -83,7 +83,7 @@ BOOL RulerOptions::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void RulerOptions::OnChangeWidthEdit() 
+void RulerOptions::OnChangeWidthEdit()
 {
 	if (m_updating) return;
 	CWnd *pEdit = GetDlgItem(IDC_RULER_WIDTH);
@@ -101,7 +101,7 @@ void RulerOptions::OnChangeWidthEdit()
 	}
 }
 
-void RulerOptions::OnChangeCheckRuler() 
+void RulerOptions::OnChangeCheckRuler()
 {
 	if (m_updating) return;
 	CWnd *pCheck = GetDlgItem(IDC_CHECK_RULER);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/RulerTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/RulerTool.cpp
index 0b0177cf4c9..bb1a6dc8bf2 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/RulerTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/RulerTool.cpp
@@ -19,7 +19,7 @@
 // RulerTool.cpp
 // Author: Mike Lytle, January 2003
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "RulerTool.h"
@@ -42,14 +42,14 @@ Tool(ID_RULER_TOOL, IDC_POINTER)
 	m_View = NULL;
 	m_staticThis = this;
 }
-	
+
 /// Destructor
-RulerTool::~RulerTool(void) 
+RulerTool::~RulerTool(void)
 {
 }
 
 // Activate.
-void RulerTool::activate() 
+void RulerTool::activate()
 {
 	Tool::activate();
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_RULER_OPTIONS);
@@ -60,7 +60,7 @@ void RulerTool::activate()
 }
 
 // Deactivate.
-void RulerTool::deactivate() 
+void RulerTool::deactivate()
 {
 	Tool::deactivate();
 
@@ -71,14 +71,14 @@ void RulerTool::deactivate()
 }
 
 /** Set the cursor. */
-void RulerTool::setCursor(void) 
+void RulerTool::setCursor(void)
 {
 	Tool::setCursor();
 }
 
 
 /** Execute the tool on mouse down */
-void RulerTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void RulerTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp
index c1856e5a0fb..22e6a197c7a 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp
@@ -32,11 +32,7 @@ SaveMap::SaveMap(TSaveMapInfo *pInfo, CWnd* pParent /*=NULL*/)
 	: CDialog(SaveMap::IDD, pParent),
 	m_pInfo(pInfo)
 {
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	m_pInfo->usingSystemDir = m_usingSystemDir = ::AfxGetApp()->GetProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", TRUE);
-#else
-	m_pInfo->usingSystemDir = m_usingSystemDir = FALSE;
-#endif
 
 	//{{AFX_DATA_INIT(SaveMap)
 		// NOTE: the ClassWizard will add member initialization here
@@ -75,7 +71,7 @@ void SaveMap::OnUserMaps()
 	populateMapListbox( FALSE );
 }
 
-void SaveMap::OnOK() 
+void SaveMap::OnOK()
 {
 	CWnd *pEdit = GetDlgItem(IDC_SAVE_MAP_EDIT);
 	if (pEdit == NULL) {
@@ -107,12 +103,12 @@ void SaveMap::OnOK()
 	CDialog::OnOK();
 }
 
-void SaveMap::OnCancel() 
+void SaveMap::OnCancel()
 {
 	CDialog::OnCancel();
 }
 
-void SaveMap::OnBrowse() 
+void SaveMap::OnBrowse()
 {
 	m_pInfo->browse = true;
 	CDialog::OnOK();
@@ -121,12 +117,10 @@ void SaveMap::OnBrowse()
 void SaveMap::populateMapListbox( Bool systemMaps )
 {
 	m_pInfo->usingSystemDir = m_usingSystemDir = systemMaps;
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	::AfxGetApp()->WriteProfileInt(MAP_OPENSAVE_PANEL_SECTION, "UseSystemDir", m_usingSystemDir);
-#endif
 
 	HANDLE			hFindFile = 0;
-	WIN32_FIND_DATA			findData; 
+	WIN32_FIND_DATA			findData;
 	char				dirBuf[_MAX_PATH];
 	char				findBuf[_MAX_PATH];
 	char				fileBuf[_MAX_PATH];
@@ -134,7 +128,7 @@ void SaveMap::populateMapListbox( Bool systemMaps )
 	if (systemMaps)
 		strcpy(dirBuf, ".\\Maps\\");
 	else
-		sprintf(dirBuf, "%sMaps\\", TheGlobalData->getPath_UserData().str());
+		snprintf(dirBuf, ARRAY_SIZE(dirBuf), "%sMaps\\", TheGlobalData->getPath_UserData().str());
 	int len = strlen(dirBuf);
 
 	if (len > 0 && dirBuf[len - 1] != '\\') {
@@ -144,10 +138,9 @@ void SaveMap::populateMapListbox( Bool systemMaps )
 	CListBox *pList = (CListBox *)this->GetDlgItem(IDC_SAVE_LIST);
 	if (pList == NULL) return;
 	pList->ResetContent();
-	strcpy(findBuf, dirBuf);
-	strcat(findBuf, "*.*");
+	snprintf(findBuf, ARRAY_SIZE(findBuf), "%s*.*", dirBuf);
 
-	hFindFile = FindFirstFile(findBuf, &findData); 
+	hFindFile = FindFirstFile(findBuf, &findData);
 	if (hFindFile != INVALID_HANDLE_VALUE) {
 		do {
 			if (strcmp(findData.cFileName, ".") == 0 || strcmp(findData.cFileName, "..") == 0)
@@ -155,11 +148,7 @@ void SaveMap::populateMapListbox( Bool systemMaps )
 			if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
 				continue;
 			}
-			strcpy(fileBuf, dirBuf);
-			strcat(fileBuf, findData.cFileName);
-			strcat(fileBuf, "\\");
-			strcat(fileBuf, findData.cFileName);
-			strcat(fileBuf, ".map");
+			snprintf(fileBuf, ARRAY_SIZE(fileBuf), "%s%s\\%s.map", dirBuf, findData.cFileName, findData.cFileName);
 			try {
 				CFileStatus status;
 				if (CFile::GetStatus(fileBuf, status)) {
@@ -175,7 +164,7 @@ void SaveMap::populateMapListbox( Bool systemMaps )
  	}
 	CEdit *pEdit = (CEdit*)GetDlgItem(IDC_SAVE_MAP_EDIT);
 	if (pEdit != NULL) {
-		strcpy(fileBuf, m_pInfo->filename);
+		strlcpy(fileBuf, m_pInfo->filename, ARRAY_SIZE(fileBuf));
 		Int len = strlen(fileBuf);
 		if (len>4 && stricmp(".map", fileBuf+(len-4)) == 0) {
 			// strip of the .map
@@ -194,13 +183,13 @@ void SaveMap::populateMapListbox( Bool systemMaps )
 	}
 }
 
-void SaveMap::OnSelchangeSaveList() 
+void SaveMap::OnSelchangeSaveList()
 {
 	CListBox *pList = (CListBox *)this->GetDlgItem(IDC_SAVE_LIST);
 	if (pList == NULL) {
 		return;
 	}
-	
+
 	Int sel = pList->GetCurSel();
 	CString filename;
 	if (sel != LB_ERR) {
@@ -213,7 +202,7 @@ void SaveMap::OnSelchangeSaveList()
 	pEdit->SetWindowText(filename);
 }
 
-BOOL SaveMap::OnInitDialog() 
+BOOL SaveMap::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -225,15 +214,12 @@ BOOL SaveMap::OnInitDialog()
 	if (pUserMaps != NULL)
 		pUserMaps->SetCheck( !m_usingSystemDir );
 
-#if !defined(RTS_DEBUG) && !defined(RTS_INTERNAL)
-	if (pSystemMaps)
-		pSystemMaps->ShowWindow( FALSE );
-	if (pUserMaps)
-		pUserMaps->ShowWindow( FALSE );
-#endif
+	// TheSuperHackers @tweak Originally World Builder has hidden the System Maps tab button in Release builds,
+	// perhaps with the intention to only show User Maps to community users. However, World Builder did release
+	// as a Debug build and always had the System Maps tab, therefore this now shows it always for simplicity.
 
 	populateMapListbox( m_usingSystemDir );
 
 	return FALSE;  // return TRUE unless you set the focus to a control
-	              
+
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchOptions.cpp
index ccb44e47c56..dd802ca1cb9 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchOptions.cpp
@@ -63,10 +63,10 @@ END_MESSAGE_MAP()
 
 MapObject *ScorchOptions::getSingleSelectedScorch(void)
 {
-	MapObject *theMapObj = NULL; 
+	MapObject *theMapObj = NULL;
 //	Bool found = false;
 	Int selCount=0;
-	MapObject *pMapObj; 
+	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj->isSelected()) {
 			if (pMapObj->isScorch()) {
@@ -82,10 +82,10 @@ MapObject *ScorchOptions::getSingleSelectedScorch(void)
 	return(NULL);
 }
 
-void ScorchOptions::updateTheUI(void) 
+void ScorchOptions::updateTheUI(void)
 {
 	m_updating = true;
-	MapObject *theMapObj = getSingleSelectedScorch(); 
+	MapObject *theMapObj = getSingleSelectedScorch();
 	CString str;
 	CWnd *pEdit;
 	if (theMapObj) {
@@ -102,7 +102,7 @@ void ScorchOptions::updateTheUI(void)
 	m_updating = false;
 }
 
-void ScorchOptions::update(void) 
+void ScorchOptions::update(void)
 {
 	if (m_staticThis) {
 		m_staticThis->updateTheUI();
@@ -112,11 +112,11 @@ void ScorchOptions::update(void)
 /////////////////////////////////////////////////////////////////////////////
 // ScorchOptions message handlers
 
-BOOL ScorchOptions::OnInitDialog() 
+BOOL ScorchOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	m_staticThis = this;
-	
+
 
 	m_radiusPopup.SetupPopSliderButton(this, IDC_SIZE_POPUP, this);
 
@@ -138,7 +138,7 @@ BOOL ScorchOptions::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void ScorchOptions::OnChangeScorchtype() 
+void ScorchOptions::OnChangeScorchtype()
 {
 	if (m_updating)
 		return;
@@ -148,7 +148,7 @@ void ScorchOptions::OnChangeScorchtype()
 	changeScorch();
 }
 
-void ScorchOptions::OnChangeSizeEdit() 
+void ScorchOptions::OnChangeSizeEdit()
 {
 	if (m_updating)
 		return;
@@ -176,7 +176,7 @@ void ScorchOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void ScorchOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -197,7 +197,7 @@ void ScorchOptions::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 	m_updating = false;
 }
 
@@ -212,7 +212,7 @@ void ScorchOptions::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
@@ -222,7 +222,7 @@ void ScorchOptions::changeScorch(void)
 
 	Dict newDict;
 	newDict.setInt(TheKey_scorchType, (Int)m_scorchtype);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
@@ -237,7 +237,7 @@ void ScorchOptions::changeSize(void)
 
 	Dict newDict;
 	newDict.setReal(TheKey_objectRadius, m_scorchsize);
-	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	pDoc->AddAndDoUndoable(pUndo);
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
@@ -256,4 +256,13 @@ void ScorchOptions::getAllSelectedDicts(void)
 		}
 		m_allSelectedDicts.push_back(pMapObj->getProperties());
 	}
-}
\ No newline at end of file
+}
+
+Dict** ScorchOptions::getAllSelectedDictsData()
+{
+#if defined(USING_STLPORT) || __cplusplus < 201103L
+	return !m_allSelectedDicts.empty() ? &m_allSelectedDicts.front() : NULL;
+#else
+	return m_allSelectedDicts.data();
+#endif
+}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchTool.cpp
index ecb86b8f432..311897b00f0 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchTool.cpp
@@ -19,7 +19,7 @@
 // ScorchTool.cpp
 // Author: Dennis Griffin, April 2002
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "ScorchTool.h"
@@ -39,22 +39,22 @@
 
 /// Constructor
 ScorchTool::ScorchTool(void) :
-	Tool(ID_SCORCH_TOOL, IDC_SCORCH) 
+	Tool(ID_SCORCH_TOOL, IDC_SCORCH)
 {
 }
-	
+
 /// Destructor
-ScorchTool::~ScorchTool(void) 
+ScorchTool::~ScorchTool(void)
 {
 }
 
 /// Clears it's is active flag.
-void ScorchTool::deactivate() 
+void ScorchTool::deactivate()
 {
 }
 
 /// Shows the terrain materials options panel.
-void ScorchTool::activate() 
+void ScorchTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_SCORCH_OPTIONS);
 	ScorchOptions::update();
@@ -94,12 +94,12 @@ MapObject *ScorchTool::pickScorch(Coord3D loc){
 			return pObj;
 		}
 	}
-	return NULL; 
+	return NULL;
 }
 
 
 /// Perform the tool behavior on mouse down.
-void ScorchTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void ScorchTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	Coord3D docPt;
@@ -111,7 +111,7 @@ void ScorchTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 		ScorchOptions::update();
 	} else {
 		pView->snapPoint(&docPt);
-		MapObject *pNew = newInstance(MapObject)(docPt, AsciiString("Scorch"), 0, 0, NULL, NULL );
+		MapObject *pNew = newInstance(MapObject)(docPt, "Scorch", 0, 0, NULL, NULL );
 		pNew->getProperties()->setAsciiString(TheKey_originalOwner, NEUTRAL_TEAM_INTERNAL_STR);
 		pNew->setSelected(true);
 		pNew->setIsScorch();
@@ -142,7 +142,7 @@ void ScorchTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 }
 
 /** Execute the tool on mouse up - Place an object. */
-void ScorchTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void ScorchTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp
index febfd35de8b..f57862fcbfc 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp
@@ -23,7 +23,7 @@
 #include "WorldBuilder.h"
 #include "ScriptActionsFalse.h"
 #include "GameLogic/Scripts.h"
-#include "EditAction.h"	
+#include "EditAction.h"
 #include "ScriptDialog.h"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -70,7 +70,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ScriptActionsFalse message handlers
 
-BOOL ScriptActionsFalse::OnInitDialog() 
+BOOL ScriptActionsFalse::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_COMMENT);
@@ -104,11 +104,11 @@ void ScriptActionsFalse::loadList(void)
 		}
 		pList->SetCurSel(m_index);
 		OnSelchangeActionList();
-	}	
+	}
 }
 
 
-void ScriptActionsFalse::OnEditAction() 
+void ScriptActionsFalse::OnEditAction()
 {
 	CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
 	if (m_falseAction == NULL) {
@@ -123,26 +123,26 @@ void ScriptActionsFalse::OnEditAction()
 	pList->SetCurSel(m_index);
 }
 
-void ScriptActionsFalse::enableUI() 
+void ScriptActionsFalse::enableUI()
 {
 	CWnd *pWnd = GetDlgItem(IDC_EDIT);
 	pWnd->EnableWindow(m_falseAction!=NULL);
-	
+
 	pWnd = GetDlgItem(IDC_COPY);
 	pWnd->EnableWindow(m_falseAction!=NULL);
 
 	pWnd = GetDlgItem(IDC_DELETE);
 	pWnd->EnableWindow(m_falseAction!=NULL);
-	
+
 	pWnd = GetDlgItem(IDC_MOVE_DOWN);
 	pWnd->EnableWindow(m_falseAction && m_falseAction->getNext());
 
 	pWnd = GetDlgItem(IDC_MOVE_UP);
 	pWnd->EnableWindow(m_falseAction && m_index>0);
-	
+
 }
 
-void ScriptActionsFalse::OnSelchangeActionList() 
+void ScriptActionsFalse::OnSelchangeActionList()
 {
 	m_falseAction = NULL;
 	CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
@@ -163,18 +163,18 @@ void ScriptActionsFalse::OnSelchangeActionList()
 			}
 			m_falseAction = m_falseAction->getNext();
 		}
-	}	
+	}
 	enableUI(); // Enable buttons based on selection.
 }
 
-void ScriptActionsFalse::OnDblclkActionList() 
+void ScriptActionsFalse::OnDblclkActionList()
 {
 	OnEditAction();
 }
 
 
 
-void ScriptActionsFalse::OnNew() 
+void ScriptActionsFalse::OnNew()
 {
 	ScriptAction *pAct = newInstance( ScriptAction)(ScriptAction::DEBUG_MESSAGE_BOX);
 	EditAction aDlg;
@@ -186,7 +186,7 @@ void ScriptActionsFalse::OnNew()
 		} else {
 			pAct->setNextAction(m_script->getFalseAction());
 			m_script->setFalseAction(pAct);
-		} 
+		}
 		m_index++;
 		loadList();
 	} else {
@@ -194,7 +194,7 @@ void ScriptActionsFalse::OnNew()
 	}
 }
 
-void ScriptActionsFalse::OnDelete() 
+void ScriptActionsFalse::OnDelete()
 {
 	if (m_falseAction) {
 		m_script->deleteFalseAction(m_falseAction);
@@ -202,7 +202,7 @@ void ScriptActionsFalse::OnDelete()
 	}
 }
 
-void ScriptActionsFalse::OnCopy() 
+void ScriptActionsFalse::OnCopy()
 {
 	if (m_falseAction) {
 		ScriptAction *pCopy = m_falseAction->duplicate();
@@ -213,7 +213,7 @@ void ScriptActionsFalse::OnCopy()
 	}
 }
 
-Bool ScriptActionsFalse::doMoveDown() 
+Bool ScriptActionsFalse::doMoveDown()
 {
 	if (m_falseAction && m_falseAction->getNext()) {
 		ScriptAction *pNext = m_falseAction->getNext();
@@ -240,7 +240,7 @@ Bool ScriptActionsFalse::doMoveDown()
 	return false;
 }
 
-void ScriptActionsFalse::OnMoveDown() 
+void ScriptActionsFalse::OnMoveDown()
 {
 	if (doMoveDown()) {
 		m_index++;
@@ -248,7 +248,7 @@ void ScriptActionsFalse::OnMoveDown()
 	}
 }
 
-void ScriptActionsFalse::OnMoveUp() 
+void ScriptActionsFalse::OnMoveUp()
 {
 	if (m_falseAction && m_index>0) {
 //		ScriptAction *pNext = m_falseAction;
@@ -266,7 +266,7 @@ void ScriptActionsFalse::OnMoveUp()
 	}
 }
 
-void ScriptActionsFalse::OnChangeEditComment() 
+void ScriptActionsFalse::OnChangeEditComment()
 {
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_COMMENT);
 	CString comment;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp
index e5a2f4624de..250f6d5815a 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp
@@ -23,7 +23,7 @@
 #include "WorldBuilder.h"
 #include "ScriptActionsTrue.h"
 #include "GameLogic/Scripts.h"
-#include "EditAction.h"	
+#include "EditAction.h"
 #include "ScriptDialog.h"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -70,7 +70,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ScriptActionsTrue message handlers
 
-BOOL ScriptActionsTrue::OnInitDialog() 
+BOOL ScriptActionsTrue::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_COMMENT);
@@ -104,11 +104,11 @@ void ScriptActionsTrue::loadList(void)
 		}
 		pList->SetCurSel(m_index);
 		OnSelchangeActionList();
-	}	
+	}
 }
 
 
-void ScriptActionsTrue::OnEditAction() 
+void ScriptActionsTrue::OnEditAction()
 {
 	CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
 	if (m_action == NULL) {
@@ -123,26 +123,26 @@ void ScriptActionsTrue::OnEditAction()
 	pList->SetCurSel(m_index);
 }
 
-void ScriptActionsTrue::enableUI() 
+void ScriptActionsTrue::enableUI()
 {
 	CWnd *pWnd = GetDlgItem(IDC_EDIT);
 	pWnd->EnableWindow(m_action!=NULL);
-	
+
 	pWnd = GetDlgItem(IDC_COPY);
 	pWnd->EnableWindow(m_action!=NULL);
 
 	pWnd = GetDlgItem(IDC_DELETE);
 	pWnd->EnableWindow(m_action!=NULL);
-	
+
 	pWnd = GetDlgItem(IDC_MOVE_DOWN);
 	pWnd->EnableWindow(m_action && m_action->getNext());
 
 	pWnd = GetDlgItem(IDC_MOVE_UP);
 	pWnd->EnableWindow(m_action && m_index>0);
-	
+
 }
 
-void ScriptActionsTrue::OnSelchangeActionList() 
+void ScriptActionsTrue::OnSelchangeActionList()
 {
 	m_action = NULL;
 	CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
@@ -163,18 +163,18 @@ void ScriptActionsTrue::OnSelchangeActionList()
 			}
 			m_action = m_action->getNext();
 		}
-	}	
+	}
 	enableUI(); // Enable buttons based on selection.
 }
 
-void ScriptActionsTrue::OnDblclkActionList() 
+void ScriptActionsTrue::OnDblclkActionList()
 {
 	OnEditAction();
 }
 
 
 
-void ScriptActionsTrue::OnNew() 
+void ScriptActionsTrue::OnNew()
 {
 	ScriptAction *pAct = newInstance( ScriptAction)(ScriptAction::DEBUG_MESSAGE_BOX);
 	EditAction aDlg;
@@ -186,7 +186,7 @@ void ScriptActionsTrue::OnNew()
 		} else {
 			pAct->setNextAction(m_script->getAction());
 			m_script->setAction(pAct);
-		} 
+		}
 		m_index++;
 		loadList();
 	} else {
@@ -194,7 +194,7 @@ void ScriptActionsTrue::OnNew()
 	}
 }
 
-void ScriptActionsTrue::OnDelete() 
+void ScriptActionsTrue::OnDelete()
 {
 	if (m_action) {
 		m_script->deleteAction(m_action);
@@ -202,7 +202,7 @@ void ScriptActionsTrue::OnDelete()
 	}
 }
 
-void ScriptActionsTrue::OnCopy() 
+void ScriptActionsTrue::OnCopy()
 {
 	if (m_action) {
 		ScriptAction *pCopy = m_action->duplicate();
@@ -213,7 +213,7 @@ void ScriptActionsTrue::OnCopy()
 	}
 }
 
-Bool ScriptActionsTrue::doMoveDown() 
+Bool ScriptActionsTrue::doMoveDown()
 {
 	if (m_action && m_action->getNext()) {
 		ScriptAction *pNext = m_action->getNext();
@@ -240,7 +240,7 @@ Bool ScriptActionsTrue::doMoveDown()
 	return false;
 }
 
-void ScriptActionsTrue::OnMoveDown() 
+void ScriptActionsTrue::OnMoveDown()
 {
 	if (doMoveDown()) {
 		m_index++;
@@ -248,7 +248,7 @@ void ScriptActionsTrue::OnMoveDown()
 	}
 }
 
-void ScriptActionsTrue::OnMoveUp() 
+void ScriptActionsTrue::OnMoveUp()
 {
 	if (m_action && m_index>0) {
 //		ScriptAction *pNext = m_action;
@@ -266,7 +266,7 @@ void ScriptActionsTrue::OnMoveUp()
 	}
 }
 
-void ScriptActionsTrue::OnChangeEditComment() 
+void ScriptActionsTrue::OnChangeEditComment()
 {
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_COMMENT);
 	CString comment;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptConditions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptConditions.cpp
index e4c7c40da2a..95888335164 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptConditions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptConditions.cpp
@@ -72,7 +72,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ScriptConditionsDlg message handlers
 
-BOOL ScriptConditionsDlg::OnInitDialog() 
+BOOL ScriptConditionsDlg::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
 	loadList();
@@ -102,7 +102,7 @@ void ScriptConditionsDlg::loadList(void)
 			Bool first = true;
 			while (pCond) {
 				AsciiString label;
-				if (first) label = "  "; 
+				if (first) label = "  ";
 				else label = "  *AND* ";
 				first = false;
 				label.concat(pCond->getUiText());
@@ -114,11 +114,11 @@ void ScriptConditionsDlg::loadList(void)
 		}
 		if (count>0) pList->SetCurSel(1);
 		OnSelchangeConditionList();
-	}	
+	}
 }
 
 
-void ScriptConditionsDlg::OnEditCondition() 
+void ScriptConditionsDlg::OnEditCondition()
 {
 	CListBox *pList = (CListBox *)GetDlgItem(IDC_CONDITION_LIST);
 	if (m_condition == NULL) {
@@ -134,17 +134,17 @@ void ScriptConditionsDlg::OnEditCondition()
 	if (m_orCondition && m_orCondition->getFirstAndCondition() == m_condition) {
 		first = true;
 	}
-	if (first) label = "  "; 
+	if (first) label = "  ";
 	else label = "    AND ";
 	label.concat(m_condition->getUiText());
 	pList->InsertString(m_index, label.str());
 }
 
-void ScriptConditionsDlg::enableUI() 
+void ScriptConditionsDlg::enableUI()
 {
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_CONDITION);
 	pWnd->EnableWindow(m_condition!=NULL);
-	
+
 	pWnd = GetDlgItem(IDC_COPY);
 	pWnd->EnableWindow(m_condition!=NULL);
 
@@ -180,11 +180,11 @@ void ScriptConditionsDlg::setSel(OrCondition *pOr, Condition *pCond)
 			}
 			m_orCondition = m_orCondition->getNextOrCondition();
 		}
-	}	
+	}
 	enableUI();
 }
 
-void ScriptConditionsDlg::OnSelchangeConditionList() 
+void ScriptConditionsDlg::OnSelchangeConditionList()
 {
 	m_orCondition = NULL;
 	m_condition = NULL;
@@ -193,7 +193,7 @@ void ScriptConditionsDlg::OnSelchangeConditionList()
 		Int count = pList->GetCurSel();
 		m_index = count;
 		if (count<0) return;
-		count+=1; 
+		count+=1;
 		m_orCondition = m_script->getOrCondition();
 		while (m_orCondition) {
 			count--;
@@ -212,16 +212,16 @@ void ScriptConditionsDlg::OnSelchangeConditionList()
 			}
 			m_orCondition = m_orCondition->getNextOrCondition();
 		}
-	}	
+	}
 }
 
-void ScriptConditionsDlg::OnDblclkConditionList() 
+void ScriptConditionsDlg::OnDblclkConditionList()
 {
 	OnEditCondition();
 }
 
 
-void ScriptConditionsDlg::OnOr() 
+void ScriptConditionsDlg::OnOr()
 {
 	OrCondition *pOr = newInstance( OrCondition);
 	if (m_orCondition) {
@@ -230,12 +230,12 @@ void ScriptConditionsDlg::OnOr()
 	} else {
 		pOr->setNextOrCondition(m_script->getOrCondition());
 		m_script->setOrCondition(pOr);
-	}	
+	}
 	loadList();
 	setSel(pOr, NULL);
 }
 
-void ScriptConditionsDlg::OnNew() 
+void ScriptConditionsDlg::OnNew()
 {
 	Condition *pCond = newInstance( Condition)(Condition::CONDITION_TRUE);
 	EditCondition cDlg;
@@ -254,7 +254,7 @@ void ScriptConditionsDlg::OnNew()
 			}
 			pCond->setNextCondition(m_orCondition->getFirstAndCondition());
 			m_orCondition->setFirstAndCondition(pCond);
-		} 
+		}
 		loadList();
 		setSel(pSavOr, pCond);
 	} else {
@@ -262,7 +262,7 @@ void ScriptConditionsDlg::OnNew()
 	}
 }
 
-void ScriptConditionsDlg::OnDelete() 
+void ScriptConditionsDlg::OnDelete()
 {
 	if (m_condition && m_orCondition) {
 		m_orCondition->deleteCondition(m_condition);
@@ -273,7 +273,7 @@ void ScriptConditionsDlg::OnDelete()
 	}
 }
 
-void ScriptConditionsDlg::OnCopy() 
+void ScriptConditionsDlg::OnCopy()
 {
 	if (m_condition) {
 		OrCondition *pSavOr = m_orCondition;
@@ -300,7 +300,7 @@ Int ScriptConditionsDlg::doMoveDown( OrCondition **outWhichNow )
 			pNOr->setFirstAndCondition(m_condition);
 			m_orCondition->removeCondition(m_condition);
 			m_condition->setNextCondition(newNext);
-			
+
 			*outWhichNow = pNOr;
 			return 2;	// we moved 2 indices, not just one.
 		}
@@ -371,11 +371,11 @@ Int ScriptConditionsDlg::doMoveUp( OrCondition **outWhichNow )
 				m_orCondition->removeCondition(m_condition);
 				pNOr->setFirstAndCondition(m_condition);
 			}
-			
+
 			(*outWhichNow) = pNOr;
 			return 2;	// we moved 2 indices, not just one.
 		}
-		
+
 		pPrev->setNextCondition(m_condition->getNext());
 		m_condition->setNextCondition(pPrev);
 
@@ -407,7 +407,7 @@ Int ScriptConditionsDlg::doMoveUp( OrCondition **outWhichNow )
 	return 0;
 }
 
-void ScriptConditionsDlg::OnMoveDown() 
+void ScriptConditionsDlg::OnMoveDown()
 {
 	Condition *pSav = m_condition;
 	OrCondition *pSavOr;
@@ -419,7 +419,7 @@ void ScriptConditionsDlg::OnMoveDown()
 	setSel(pSavOr, pSav);
 }
 
-void ScriptConditionsDlg::OnMoveUp() 
+void ScriptConditionsDlg::OnMoveUp()
 {
 	Condition *pSav = m_condition;
 	OrCondition *pSavOr;
@@ -431,7 +431,7 @@ void ScriptConditionsDlg::OnMoveUp()
 	setSel(pSavOr, pSav);
 }
 
-void ScriptConditionsDlg::OnChangeEditComment() 
+void ScriptConditionsDlg::OnChangeEditComment()
 {
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_COMMENT);
 	CString comment;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp
index 99fbaca8935..c45f8ef396f 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp
@@ -42,11 +42,6 @@
 #include "WaypointOptions.h"
 #include "Common/UnicodeString.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static const Int K_LOCAL_TEAMS_VERSION_1 = 1;
 
@@ -58,28 +53,28 @@ ScriptDialog *ScriptDialog::m_staticThis = NULL;
 static AsciiString formatScriptLabel(Script *pScr) {
 	AsciiString fmt;
 	if (pScr->isSubroutine()) {
-		fmt.concat("[S "); 
+		fmt.concat("[S ");
 	} else {
-		fmt.concat("[ns "); 
+		fmt.concat("[ns ");
 	}
 	if (pScr->isActive()) {
-		fmt.concat("A "); 
+		fmt.concat("A ");
 	} else {
-		fmt.concat("na "); 
+		fmt.concat("na ");
 	}
 	if (pScr->isOneShot()) {
-		fmt.concat("D] ["); 
+		fmt.concat("D] [");
 	} else {
-		fmt.concat("nd] ["); 
+		fmt.concat("nd] [");
 	}
 	if (pScr->isEasy()) {
-		fmt.concat("E "); 
-	} 
+		fmt.concat("E ");
+	}
 	if (pScr->isNormal()) {
-		fmt.concat("N "); 
-	} 
+		fmt.concat("N ");
+	}
 	if (pScr->isHard()) {
-		fmt.concat("H]"); 
+		fmt.concat("H]");
 	} else {
 		fmt.concat("]");
 	}
@@ -91,19 +86,19 @@ static AsciiString formatScriptLabel(ScriptGroup *pScrGrp) {
 	AsciiString fmt;
 	if (pScrGrp->isSubroutine())
 	{
-		fmt.concat("[S "); 
+		fmt.concat("[S ");
 	}
 	else
 	{
-		fmt.concat("[ns "); 
+		fmt.concat("[ns ");
 	}
 	if (pScrGrp->isActive())
 	{
-		fmt.concat("A]"); 
+		fmt.concat("A]");
 	}
 	else
 	{
-		fmt.concat("na]"); 
+		fmt.concat("na]");
 	}
 	fmt.concat(pScrGrp->getName().str());
 	return fmt;
@@ -206,7 +201,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ScriptDialog message handlers
 
-void ScriptDialog::OnSelchangedScriptTree(NMHDR* pNMHDR, LRESULT* pResult) 
+void ScriptDialog::OnSelchangedScriptTree(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
 	CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
@@ -215,18 +210,18 @@ void ScriptDialog::OnSelchangedScriptTree(NMHDR* pNMHDR, LRESULT* pResult)
 		m_curSelection.m_objType = ListType::PLAYER_TYPE;
 	} else {
 		m_curSelection.IntToList(pNMTreeView->itemNew.lParam);
-		DEBUG_ASSERTCRASH(m_curSelection.m_playerIndex <m_sides.getNumSides(),("")); 
-		DEBUG_ASSERTCRASH(m_curSelection.m_objType != ListType::BOGUS_TYPE, ("")); 
+		DEBUG_ASSERTCRASH(m_curSelection.m_playerIndex <m_sides.getNumSides(),(""));
+		DEBUG_ASSERTCRASH(m_curSelection.m_objType != ListType::BOGUS_TYPE, (""));
 	}
 	if (!this->m_draggingTreeView) {
-		pTree->SelectDropTarget(pNMTreeView->itemNew.hItem); 
+		pTree->SelectDropTarget(pNMTreeView->itemNew.hItem);
 	}
 	Script *pScript = getCurScript();
 	ScriptGroup *pGroup = getCurGroup();
 
 	CWnd *pWnd = GetDlgItem(IDC_EDIT_SCRIPT);
 	pWnd->EnableWindow(pScript!=NULL || pGroup!=NULL);
-	
+
 	pWnd = GetDlgItem(IDC_COPY_SCRIPT);
 	pWnd->EnableWindow(pScript!=NULL);
 
@@ -287,7 +282,7 @@ Script *ScriptDialog::getCurScript(void)
 				}
 			}
 		}
-	} 
+	}
 	return NULL;
 }
 
@@ -328,7 +323,7 @@ void ScriptDialog::updateScriptWarning(Script *pScript)
 				if (!warning.isEmpty()) {
 					pScript->setWarnings(true);
 					pCondition->setWarnings(true);
-				}	
+				}
 			}
 		}
 	}
@@ -342,7 +337,7 @@ void ScriptDialog::updateScriptWarning(Script *pScript)
 			if (!warning.isEmpty()) {
 				pScript->setWarnings(true);
 				pAction->setWarnings(true);
-			}	
+			}
 		}
 	}
 }
@@ -354,7 +349,7 @@ void ScriptDialog::OnPatchGC()
 /*  //Put up a dialog asking for search/replace parameters instead of hard-coded GC_ prefix.
 	ReplaceParameter editDlg();
 	if (IDOK==editDlg.DoModal())
-	{	
+	{
 
 	}*/
 }
@@ -402,7 +397,7 @@ void ScriptDialog::updateWarnings(Bool forceUpdate)
 				}
 			}
 		}
-	}	
+	}
 }
 
 extern AsciiString ConvertToNonGCName(AsciiString name, Bool checkTemplate=true);
@@ -425,7 +420,7 @@ void ScriptDialog::patchScriptParametersForGC(Script *pScript)
 					if (pParm->getParameterType() == Parameter::OBJECT_TYPE)
 					{	//see if removing the GC prefix fixes this warning:
 						AsciiString uiString = pParm->getString();
-						if (uiString.isEmpty()) 
+						if (uiString.isEmpty())
 							uiString = "???";
 						if (uiString.startsWith("GC_"))
 						{	swapString = ConvertToNonGCName(uiString, false);
@@ -441,7 +436,7 @@ void ScriptDialog::patchScriptParametersForGC(Script *pScript)
 					}
 					pScript->setWarnings(true);
 					pCondition->setWarnings(true);
-				}	
+				}
 			}
 		}
 	}
@@ -457,7 +452,7 @@ void ScriptDialog::patchScriptParametersForGC(Script *pScript)
 				if (pParm->getParameterType() == Parameter::OBJECT_TYPE)
 				{	//see if removing the GC prefix fixes this warning:
 					AsciiString uiString = pParm->getString();
-					if (uiString.isEmpty()) 
+					if (uiString.isEmpty())
 						uiString = "???";
 					if (uiString.startsWith("GC_"))
 					{	swapString = ConvertToNonGCName(uiString,false);
@@ -473,7 +468,7 @@ void ScriptDialog::patchScriptParametersForGC(Script *pScript)
 				}
 				pScript->setWarnings(true);
 				pAction->setWarnings(true);
-			}	
+			}
 		}
 	}
 }
@@ -507,10 +502,10 @@ void ScriptDialog::checkParametersForGC(void)
 				}
 			}
 		}
-	}	
+	}
 }
 
-BOOL ScriptDialog::OnInitDialog() 
+BOOL ScriptDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -564,7 +559,7 @@ BOOL ScriptDialog::OnInitDialog()
 	top.top = ::AfxGetApp()->GetProfileInt(SCRIPT_DIALOG_SECTION, "Top", top.top);
 	top.left =::AfxGetApp()->GetProfileInt(SCRIPT_DIALOG_SECTION, "Left", top.left);
 	SetWindowPos(NULL, top.left, top.top, 0, 0, SWP_NOZORDER|SWP_NOSIZE);
-	
+
 	return FALSE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -593,7 +588,7 @@ HTREEITEM ScriptDialog::addPlayer(Int playerIndx)
 	ins.item.stateMask = TVIS_STATEIMAGEMASK ;
 	ins.item.lParam = lt.ListToInt();
 	ins.item.pszText = (char *)fmt.str();
-	ins.item.cchTextMax = 0;				
+	ins.item.cchTextMax = 0;
 	HTREEITEM hItem = pTree->InsertItem(&ins);
 	ScriptList *pSL = m_sides.getSideInfo(playerIndx)->getScriptList();
 	if (pSL) {
@@ -601,7 +596,7 @@ HTREEITEM ScriptDialog::addPlayer(Int playerIndx)
 	}
 	updateIcons(TVI_ROOT);
 	return hItem;
-}		
+}
 
 void ScriptDialog::setIconGroup(HTREEITEM item)
 {
@@ -609,7 +604,7 @@ void ScriptDialog::setIconGroup(HTREEITEM item)
 
 	if (getCurGroup()->isActive())
 		pTree->SetItemState(item, INDEXTOSTATEIMAGEMASK(1), TVIS_STATEIMAGEMASK);
-	
+
 	if (!getCurGroup()->isActive())
 		pTree->SetItemState(item, INDEXTOSTATEIMAGEMASK(5), TVIS_STATEIMAGEMASK);
 
@@ -713,7 +708,7 @@ void ScriptDialog::addScriptList(HTREEITEM hPlayer, Int playerIndex, ScriptList
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 		ins.item.lParam = lt.ListToInt();
 		ins.item.pszText = (char *)fmt.str();
-		ins.item.cchTextMax = 0;				
+		ins.item.cchTextMax = 0;
 		ins.item.state = INDEXTOSTATEIMAGEMASK(1);
 		if (pGroup->hasWarnings()) {
 			ins.item.state = INDEXTOSTATEIMAGEMASK(3);
@@ -746,7 +741,7 @@ void ScriptDialog::addScriptList(HTREEITEM hPlayer, Int playerIndex, ScriptList
 				ins.item.stateMask = TVIS_STATEIMAGEMASK ;
 				ins.item.lParam = lt.ListToInt();
 				ins.item.pszText = (char *)fmt.str();
-				ins.item.cchTextMax = 0;				
+				ins.item.cchTextMax = 0;
 				/*HTREEITEM hItem =*/ pTree->InsertItem(&ins);
 			}
 		}
@@ -776,7 +771,7 @@ void ScriptDialog::addScriptList(HTREEITEM hPlayer, Int playerIndex, ScriptList
 			ins.item.stateMask = TVIS_STATEIMAGEMASK ;
 			ins.item.lParam = lt.ListToInt();
 			ins.item.pszText = (char *)fmt.str();
-			ins.item.cchTextMax = 0;				
+			ins.item.cchTextMax = 0;
 			/*HTREEITEM hItem =*/ pTree->InsertItem(&ins);
 		}
 	}
@@ -791,7 +786,7 @@ void ScriptDialog::reloadPlayer(Int playerIndex, ScriptList *pSL)
 {
 //	Dict *d = m_sides.getSideInfo(playerIndex)->getDict();
 	updateWarnings();
-	
+
 	CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
 	HTREEITEM player = pTree->GetChildItem(TVI_ROOT);
 	while (player != NULL) {
@@ -811,7 +806,7 @@ void ScriptDialog::reloadPlayer(Int playerIndex, ScriptList *pSL)
 	if (!player) return;
 	HTREEITEM child;
 	ListType currentSel = m_curSelection;
-	
+
 	if (currentSel.m_objType == ListType::SCRIPT_IN_GROUP_TYPE) {
 		if (currentSel.m_scriptIndex > 0) {
 			--currentSel.m_scriptIndex;
@@ -876,7 +871,7 @@ HTREEITEM ScriptDialog::findItem(ListType sel, Bool failSafe)
 			DEBUG_ASSERTCRASH(lt.m_objType == ListType::GROUP_TYPE, ("Not group"));
 			group = pTree->GetNextSiblingItem(group);
 		}
-	} 
+	}
 	DEBUG_ASSERTCRASH(group, ("Couldn't find group."));
 	if (!group) return NULL;
 	if (sel.m_objType == ListType::GROUP_TYPE) {
@@ -901,7 +896,7 @@ HTREEITEM ScriptDialog::findItem(ListType sel, Bool failSafe)
 	}
 
 	if (script || !failSafe) {
-		DEBUG_ASSERTCRASH(script, ("Couldn't find script.")); 
+		DEBUG_ASSERTCRASH(script, ("Couldn't find script."));
 		return script;
 	}
 
@@ -909,7 +904,7 @@ HTREEITEM ScriptDialog::findItem(ListType sel, Bool failSafe)
 	return group;
 }
 
-void ScriptDialog::OnNewFolder() 
+void ScriptDialog::OnNewFolder()
 {
 	Int ndx;
 	if (m_curSelection.m_objType == ListType::PLAYER_TYPE) {
@@ -935,7 +930,7 @@ void ScriptDialog::OnNewFolder()
 	updateIcons(TVI_ROOT);
 }
 
-void ScriptDialog::OnNewScript() 
+void ScriptDialog::OnNewScript()
 {
 	Script *pNewScript = newInstance( Script);
 
@@ -973,7 +968,7 @@ void ScriptDialog::OnNewScript()
 		deleteInstance(pNewScript);
 	}
 	updateIcons(TVI_ROOT);
-}		
+}
 
 void ScriptDialog::insertScript(Script *pNewScript)
 {
@@ -1016,7 +1011,7 @@ void ScriptDialog::insertScript(Script *pNewScript)
 	updateIcons(TVI_ROOT);
 }
 
-void ScriptDialog::OnEditScript() 
+void ScriptDialog::OnEditScript()
 {
 	Script *pScript = getCurScript();
 	ScriptGroup *pGroup = getCurGroup();
@@ -1072,7 +1067,7 @@ void ScriptDialog::OnEditScript()
 	deleteInstance(pDup);
 }
 
-void ScriptDialog::OnCopyScript() 
+void ScriptDialog::OnCopyScript()
 {
 	Script *pScript = getCurScript();
 	DEBUG_ASSERTCRASH(pScript, ("Null script."));
@@ -1085,7 +1080,7 @@ void ScriptDialog::OnCopyScript()
 	updateIcons(TVI_ROOT);
 }
 
-void ScriptDialog::OnDelete() 
+void ScriptDialog::OnDelete()
 {
 	Script *pScript = getCurScript();
 	ScriptList *pSL = m_sides.getSideInfo(m_curSelection.m_playerIndex)->getScriptList();
@@ -1196,7 +1191,7 @@ void ScriptDialog::scanParmForWaypointsAndTeams(Parameter *pParm, Bool doUnits,
 		TeamsInfo * pInfo = m_sides.findTeamInfo(teamName);
 		if (pInfo) {
 			pInfo->getDict()->setBool(TheKey_exportWithScript, true);
-		}	 
+		}
 		if (doUnits) {
 			MapObject *pObj;
 			for (pObj = MapObject::getFirstMapObject(); pObj; pObj = pObj->getNext()) {
@@ -1221,7 +1216,7 @@ void ScriptDialog::scanParmForWaypointsAndTeams(Parameter *pParm, Bool doUnits,
 					TeamsInfo * pInfo = m_sides.findTeamInfo(objsTeamName);
 					if (pInfo) {
 						pInfo->getDict()->setBool(TheKey_exportWithScript, true);
-					}	 
+					}
 				}
 			}
 		}
@@ -1264,7 +1259,7 @@ void ScriptDialog::scanForWaypointsAndTeams(Script *pScript, Bool doUnits, Bool
 #define K_PLAYERS_NAMES_FOR_SCRIPTS_VERSION_2 2
 
 /** Write out selected scripts, and possibly waypoints, trigger areas & teams. */
-void ScriptDialog::OnSave() 
+void ScriptDialog::OnSave()
 {
 	Bool doWaypoints = true;
 	Bool doTriggerAreas = true;
@@ -1291,22 +1286,17 @@ void ScriptDialog::OnSave()
 		scripts[i] = NULL;
 	}
 
-	CFileDialog fileDlg(false, ".scb", NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, 
+	CFileDialog fileDlg(false, ".scb", NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
 		"Script files (.scb)|*.scb||", this);
 
 	Int result = fileDlg.DoModal();
 
-	// Open document dialog may change working directory, 
+	// Open document dialog may change working directory,
 	// change it back.
 	char buf[_MAX_PATH];
 	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	if (char *pEnd = strrchr(buf, '\\')) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);
 	if (IDCANCEL==result) {
@@ -1402,8 +1392,8 @@ void ScriptDialog::OnSave()
 
 		/***************OBJECTS DATA ***************/
 		chunkWriter.openDataChunk("ObjectsList", 	K_OBJECTS_VERSION_3);
-			
-		for (pObj = MapObject::getFirstMapObject(); pObj; pObj = pObj->getNext()) 
+
+		for (pObj = MapObject::getFirstMapObject(); pObj; pObj = pObj->getNext())
 		{
 			if (!pObj->getProperties()->getBool(TheKey_exportWithScript)) {
 				continue;
@@ -1414,10 +1404,10 @@ void ScriptDialog::OnSave()
 				chunkWriter.writeReal( loc.y);
 				chunkWriter.writeReal( loc.z);
 				chunkWriter.writeReal( pObj->getAngle());
-				chunkWriter.writeInt(pObj->getFlags()); 
-				chunkWriter.writeAsciiString(pObj->getName());	
+				chunkWriter.writeInt(pObj->getFlags());
+				chunkWriter.writeAsciiString(pObj->getName());
 
-				chunkWriter.writeDict(*pObj->getProperties());	
+				chunkWriter.writeDict(*pObj->getProperties());
 
 			chunkWriter.closeDataChunk();
 		}
@@ -1425,7 +1415,7 @@ void ScriptDialog::OnSave()
 
 		/***************POLYGON TRIGGERS DATA ***************/
 		chunkWriter.openDataChunk("PolygonTriggers", 	K_TRIGGERS_VERSION_3);
-			
+
 			PolygonTrigger *pTrig;
 			Int count = 0;
 			for (pTrig=PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
@@ -1433,15 +1423,15 @@ void ScriptDialog::OnSave()
 					count++;
 				}
 			}
-			chunkWriter.writeInt(count); 
+			chunkWriter.writeInt(count);
 			for (pTrig=PolygonTrigger::getFirstPolygonTrigger(); pTrig; pTrig = pTrig->getNext()) {
 				if (!pTrig->doExportWithScripts()) continue;
-				chunkWriter.writeAsciiString(pTrig->getTriggerName());	
-				chunkWriter.writeInt(pTrig->getID()); 
+				chunkWriter.writeAsciiString(pTrig->getTriggerName());
+				chunkWriter.writeInt(pTrig->getID());
 				chunkWriter.writeByte(pTrig->isWaterArea());
 				chunkWriter.writeByte(pTrig->isRiver());
 				chunkWriter.writeInt(pTrig->getRiverStart());
-				chunkWriter.writeInt(pTrig->getNumPoints()); 
+				chunkWriter.writeInt(pTrig->getNumPoints());
 				Int i;
 				for (i=0; i<pTrig->getNumPoints(); i++) {
 					ICoord3D loc = *pTrig->getPoint(i);
@@ -1460,7 +1450,7 @@ void ScriptDialog::OnSave()
 				}
 			}
 
-			
+
 		chunkWriter.closeDataChunk();
  		/***************WAYPOINTS DATA ***************/
 			CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc();
@@ -1513,24 +1503,19 @@ void ScriptDialog::OnSave()
 	theFile.Close();
 }
 
-void ScriptDialog::OnLoad() 
+void ScriptDialog::OnLoad()
 {
-	CFileDialog fileDlg(true, ".scb", NULL, 0, 
+	CFileDialog fileDlg(true, ".scb", NULL, 0,
 		"Script files (.scb)|*.scb||", this);
 
 	Int result = fileDlg.DoModal();
 
-	// Open document dialog may change working directory, 
+	// Open document dialog may change working directory,
 	// change it back.
 	char buf[_MAX_PATH];
 	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	if (char *pEnd = strrchr(buf, '\\')) {
+		*pEnd = 0;
 	}
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	::SetCurrentDirectory(buf);
@@ -1541,7 +1526,7 @@ void ScriptDialog::OnLoad()
 	CString path = fileDlg.GetPathName();
 
 	CachedFileInputStream theInputStream;
-	if (theInputStream.open(AsciiString(path))) 
+	if (theInputStream.open(AsciiString(path)))
 	try {
 		ChunkInputStream *pStrm = &theInputStream;
 		DataChunkInput file( pStrm );
@@ -1549,12 +1534,12 @@ void ScriptDialog::OnLoad()
 		m_firstTrigger = NULL;
 		m_waypointBase = pDoc->getNextWaypointID();
 		m_maxWaypoint = m_waypointBase;
-		file.registerParser( AsciiString("PlayerScriptsList"), AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk );
-		file.registerParser( AsciiString("ObjectsList"), AsciiString::TheEmptyString, ParseObjectsDataChunk );
-		file.registerParser( AsciiString("PolygonTriggers"), AsciiString::TheEmptyString, ParsePolygonTriggersDataChunk );
-		file.registerParser( AsciiString("WaypointsList"), AsciiString::TheEmptyString, ParseWaypointDataChunk );
-		file.registerParser( AsciiString("ScriptTeams"), AsciiString::TheEmptyString, ParseTeamsDataChunk );
-		file.registerParser( AsciiString("ScriptsPlayers"), AsciiString::TheEmptyString, ParsePlayersDataChunk );
+		file.registerParser( "PlayerScriptsList", AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk );
+		file.registerParser( "ObjectsList", AsciiString::TheEmptyString, ParseObjectsDataChunk );
+		file.registerParser( "PolygonTriggers", AsciiString::TheEmptyString, ParsePolygonTriggersDataChunk );
+		file.registerParser( "WaypointsList", AsciiString::TheEmptyString, ParseWaypointDataChunk );
+		file.registerParser( "ScriptTeams", AsciiString::TheEmptyString, ParseTeamsDataChunk );
+		file.registerParser( "ScriptsPlayers", AsciiString::TheEmptyString, ParsePlayersDataChunk );
 		if (!file.parse(this)) {
 			throw(ERROR_CORRUPT_FILE_FORMAT);
 		}
@@ -1563,7 +1548,7 @@ void ScriptDialog::OnLoad()
 		CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 		SidesListUndoable *pUndo = new SidesListUndoable(m_sides, pDoc);
 		pDoc->AddAndDoUndoable(pUndo);
-		REF_PTR_RELEASE(pUndo); // belongs to pDoc now.		
+		REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 		m_sides = *TheSidesList;
 
 		if (m_firstReadObject) {
@@ -1655,13 +1640,13 @@ void ScriptDialog::OnLoad()
 /**
 * ScriptDialog::ParseObjectsDataChunk - read an objects chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptDialog::ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
 	file.m_currentObject = NULL;
-	file.registerParser( AsciiString("Object"), info->label, ParseObjectDataChunk );
+	file.registerParser( "Object", info->label, ParseObjectDataChunk );
 	return (file.parse(userData));
 }
 
@@ -1669,8 +1654,8 @@ Bool ScriptDialog::ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *in
 * WorldHeightMap::ParseObjectData - read a object info chunk.
 * Format is the newer CHUNKY format.
 *	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptDialog::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1682,14 +1667,14 @@ Bool ScriptDialog::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *inf
 	loc.y = file.readReal();
 	loc.z = file.readReal();
 	Real angle = file.readReal();
-	Int flags = file.readInt(); 
+	Int flags = file.readInt();
 	AsciiString name = file.readAsciiString();
 	Dict d;
 	d = file.readDict();
 	MapObject *pThisOne;
 
 	// create the map object
-	pThisOne = newInstance( MapObject)( loc, name, angle, flags, &d, 
+	pThisOne = newInstance( MapObject)( loc, name, angle, flags, &d,
 														TheThingFactory->findTemplate( name ) );
 
 	if (pThisOne->getProperties()->getType(TheKey_waypointID) == Dict::DICT_INT) {
@@ -1698,7 +1683,7 @@ Bool ScriptDialog::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *inf
 		if (pThis->m_maxWaypoint < pThisOne->getWaypointID()) pThis->m_maxWaypoint = pThisOne->getWaypointID();
 	}
 
-	DEBUG_LOG(("Adding object %s (%s)\n", name.str(), pThisOne->getProperties()->getAsciiString(TheKey_originalOwner).str()));
+	DEBUG_LOG(("Adding object %s (%s)", name.str(), pThisOne->getProperties()->getAsciiString(TheKey_originalOwner).str()));
 	// Check for duplicates.
 
 	MapObject *pObj;
@@ -1707,7 +1692,7 @@ Bool ScriptDialog::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *inf
 		Coord3D curLoc;
 		curLoc = *pObj->getLocation();
 		Bool locsMatch = (loc.x==curLoc.x&&loc.y==curLoc.y);
-		// If the locations match, and they are both waypoints or both not waypoints, and the names match, 
+		// If the locations match, and they are both waypoints or both not waypoints, and the names match,
 		// They're duplicate.
 		if (locsMatch && (pObj->isWaypoint() == pThisOne->isWaypoint()) && (pObj->getName() == pThisOne->getName())) {
 			duplicate = true;
@@ -1721,7 +1706,7 @@ Bool ScriptDialog::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *inf
  				AsciiString name = WaypointOptions::GenerateUniqueName(pThisOne->getWaypointID());
 				name.concat("-imp");
 			}
-		}	
+		}
 		if (duplicate) break;
 	}
 	if (duplicate) {
@@ -1743,8 +1728,8 @@ Bool ScriptDialog::ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *inf
 /**
 * ScriptDialog::ParseWaypointData - read waypoint data chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptDialog::ParseWaypointDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1766,8 +1751,8 @@ Bool ScriptDialog::ParseWaypointDataChunk(DataChunkInput &file, DataChunkInfo *i
 /**
 * ScriptDialog::ParseTeamsDataChunk - read teams data chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptDialog::ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1778,18 +1763,18 @@ Bool ScriptDialog::ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info
 		if (pThis->m_sides.findTeamInfo(teamName)) {
 			continue;
 		}
-		DEBUG_LOG(("Adding team %s\n", teamName.str()));
+		DEBUG_LOG(("Adding team %s", teamName.str()));
 		AsciiString player = teamDict.getAsciiString(TheKey_teamOwner);
 		if (pThis->m_sides.findSideInfo(player)) {
 			// player exists, so just add it.
 			pThis->m_sides.addTeam(&teamDict);
 		} else {
 			AsciiString warning;
-			warning.format("Importing team %s of player %s.  Player %s doesn't exist, Select player..", 
+			warning.format("Importing team %s of player %s.  Player %s doesn't exist, Select player..",
 				teamName.str(), player.str(), player.str());
 
-			::AfxMessageBox(warning.str(), MB_OK);	
-			TeamsInfo ti;	 
+			::AfxMessageBox(warning.str(), MB_OK);
+			TeamsInfo ti;
 			ti.init(&teamDict);
 			CFixTeamOwnerDialog fix(&ti, &pThis->m_sides);
 			bool nameSet = false;
@@ -1799,7 +1784,7 @@ Bool ScriptDialog::ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info
 					nameSet = true;
 				}
 			}
-						
+
 			if (nameSet == false) {
 				AsciiString neutralPlayerName; // neutral player name is empty string
 				// player doesn't exist, so add it to the neutral player.
@@ -1815,8 +1800,8 @@ Bool ScriptDialog::ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info
 /**
 * ScriptDialog::ParsePlayersDataChunk - read players names data chunk.
 * Format is the newer CHUNKY format.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptDialog::ParsePlayersDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1862,8 +1847,8 @@ Bool ScriptDialog::ParsePlayersDataChunk(DataChunkInput &file, DataChunkInfo *in
 * ScriptDialog::ParsePolygonTriggersDataChunk - read a polygon triggers chunk.
 * Format is the newer CHUNKY format.
 *	See PolygonTrigger::WritePolygonTriggersDataChunk for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool ScriptDialog::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -1876,7 +1861,7 @@ Bool ScriptDialog::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChunk
 	ScriptDialog *pThis = (ScriptDialog *)userData;
 	pThis->m_firstTrigger = NULL;
 	PolygonTrigger *pPrevTrig = NULL;
-	count = file.readInt(); 
+	count = file.readInt();
 	Bool isRiver;
 	Int riverStart;
 	while (count>0) {
@@ -1893,7 +1878,7 @@ Bool ScriptDialog::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChunk
 			isRiver = file.readByte();
 			riverStart = file.readInt();
 		}
-		numPoints = file.readInt(); 
+		numPoints = file.readInt();
 		PolygonTrigger *pTrig = newInstance(PolygonTrigger)(numPoints+1);
 		pTrig->setTriggerName(triggerName);
 		pTrig->setWaterArea(isWater);
@@ -1907,7 +1892,7 @@ Bool ScriptDialog::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChunk
 			loc.z = file.readInt();
 			pTrig->addPoint(loc);
 		}
-		// Check for duplicates. 
+		// Check for duplicates.
 		Bool duplicate = false;
 		PolygonTrigger *pCurrentTrigger;
 		for (pCurrentTrigger=PolygonTrigger::getFirstPolygonTrigger(); pCurrentTrigger; pCurrentTrigger = pCurrentTrigger->getNext()) {
@@ -1935,7 +1920,7 @@ Bool ScriptDialog::ParsePolygonTriggersDataChunk(DataChunkInput &file, DataChunk
 }
 
 
-void ScriptDialog::OnDblclkScriptTree(NMHDR* pNMHDR, LRESULT* pResult) 
+void ScriptDialog::OnDblclkScriptTree(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	Script *pScript = getCurScript();
 	ScriptGroup *pGroup = getCurGroup();
@@ -1944,7 +1929,7 @@ void ScriptDialog::OnDblclkScriptTree(NMHDR* pNMHDR, LRESULT* pResult)
 	*pResult = 0;
 }
 
-void ScriptDialog::OnOK() 
+void ScriptDialog::OnOK()
 {
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	SidesListUndoable *pUndo = new SidesListUndoable(m_sides, pDoc);
@@ -1953,13 +1938,13 @@ void ScriptDialog::OnOK()
 	CDialog::OnOK();
 }
 
-void ScriptDialog::OnCancel() 
+void ScriptDialog::OnCancel()
 {
-	
+
 	CDialog::OnCancel();
 }
 
-void ScriptDialog::OnBegindragScriptTree(NMHDR* pNMHDR, LRESULT* pResult) 
+void ScriptDialog::OnBegindragScriptTree(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
 	CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
@@ -1967,62 +1952,62 @@ void ScriptDialog::OnBegindragScriptTree(NMHDR* pNMHDR, LRESULT* pResult)
 	m_curSelection.IntToList(pNMTreeView->itemNew.lParam);
 	if (m_curSelection.m_objType != ListType::PLAYER_TYPE) {
 		m_dragItem = pNMTreeView->itemNew.hItem;
-    pTree->SelectItem(m_dragItem); 
+    pTree->SelectItem(m_dragItem);
 		m_draggingTreeView = true;
  		SetCapture();
 	}
 	*pResult = 0;
 }
 
-void ScriptDialog::OnMouseMove(UINT nFlags, CPoint point) 
+void ScriptDialog::OnMouseMove(UINT nFlags, CPoint point)
 {
 	if (m_draggingTreeView) {
 		CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
- 
-    HTREEITEM htiTarget;  // handle to target item 
-    TVHITTESTINFO tvht;  // hit test information 
+
+    HTREEITEM htiTarget;  // handle to target item
+    TVHITTESTINFO tvht;  // hit test information
 
 		const Int CENTER_OFFSET = 12;
 		point.y -= CENTER_OFFSET;
-    tvht.pt = point; 
+    tvht.pt = point;
     if ((htiTarget = pTree->HitTest( &tvht)) != NULL) {
-			pTree->SelectDropTarget(htiTarget); 
-    } 
+			pTree->SelectDropTarget(htiTarget);
+    }
   }
-	
+
 	CDialog::OnMouseMove(nFlags, point);
 }
 
-void ScriptDialog::OnLButtonUp(UINT nFlags, CPoint point) 
+void ScriptDialog::OnLButtonUp(UINT nFlags, CPoint point)
 {
 	if (m_draggingTreeView) {
 		CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
 		m_draggingTreeView = false;
 
 		ReleaseCapture();
-    HTREEITEM htiTarget;  // handle to target item 
-    TVHITTESTINFO tvht;  // hit test information 
+    HTREEITEM htiTarget;  // handle to target item
+    TVHITTESTINFO tvht;  // hit test information
 
 		const Int CENTER_OFFSET = 12;
 		point.y -= CENTER_OFFSET;
-    tvht.pt = point; 
-    if ((htiTarget = pTree->HitTest( &tvht)) != NULL) { 
-      pTree->SelectItem(htiTarget); 
+    tvht.pt = point;
+    if ((htiTarget = pTree->HitTest( &tvht)) != NULL) {
+      pTree->SelectItem(htiTarget);
 			pTree->SelectDropTarget(htiTarget);
 			doDropOn(m_dragItem, htiTarget);
-    } 
+    }
 	}
 	CDialog::OnLButtonUp(nFlags, point);
 }
 
-void ScriptDialog::doDropOn(HTREEITEM hDrag, HTREEITEM hTarget) 
+void ScriptDialog::doDropOn(HTREEITEM hDrag, HTREEITEM hTarget)
 {
 	if (hDrag == hTarget) return;
 	CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
 	ListType drag;
 	drag.IntToList(pTree->GetItemData(hDrag));
 	ListType target;
-	target.IntToList(pTree->GetItemData(hTarget));			
+	target.IntToList(pTree->GetItemData(hTarget));
 
 	Script *dragScript = NULL;
 	ScriptGroup *dragGroup = NULL;
@@ -2073,7 +2058,7 @@ void ScriptDialog::doDropOn(HTREEITEM hDrag, HTREEITEM hTarget)
 	}
 
 	if (dragScript) {
-		if (pGroup) { 
+		if (pGroup) {
 				pGroup->addScript(dragScript, target.m_scriptIndex);
 		}	else {
 			pSL->addScript(dragScript, target.m_scriptIndex);
@@ -2097,17 +2082,17 @@ void ScriptDialog::doDropOn(HTREEITEM hDrag, HTREEITEM hTarget)
 	updateIcons(TVI_ROOT);
 }
 
-void ScriptDialog::OnMove(int x, int y) 
+void ScriptDialog::OnMove(int x, int y)
 {
 	CDialog::OnMove(x, y);
-	
+
 	if (this->IsWindowVisible() && !this->IsIconic()) {
 		CRect frameRect;
 		GetWindowRect(&frameRect);
 		::AfxGetApp()->WriteProfileInt(SCRIPT_DIALOG_SECTION, "Top", frameRect.top);
 		::AfxGetApp()->WriteProfileInt(SCRIPT_DIALOG_SECTION, "Left", frameRect.left);
 	}
-	
+
 }
 
 /** This function reacts to the selection of "active" from
@@ -2118,17 +2103,17 @@ void ScriptDialog::OnScriptActivate()
 	Bool active;
 	CTreeCtrl *pTree = (CTreeCtrl*)GetDlgItem(IDC_SCRIPT_TREE);
 	HTREEITEM item = findItem(m_curSelection);
-	
+
 	if (getCurScript() != NULL)
 	{
 		/// Updates attributes
 		active = getCurScript()->isActive();
 		getCurScript()->setActive(!active);
-		
+
 		/// Updates screen to reflect change
 		Script *pScript = getCurScript();
 		pTree->SetItemText(item, formatScriptLabel(pScript).str());
-		
+
 		if (getCurScript()->hasWarnings())
 		{
 			pTree->SetItemState(item, INDEXTOSTATEIMAGEMASK(4), TVIS_STATEIMAGEMASK);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptProperties.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptProperties.cpp
index fcba96f7900..a6d0c4c7739 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptProperties.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptProperties.cpp
@@ -24,11 +24,6 @@
 #include "ScriptProperties.h"
 #include "GameLogic/Scripts.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 /////////////////////////////////////////////////////////////////////////////
 // ScriptProperties property page
 
@@ -74,12 +69,12 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ScriptProperties message handlers
 
-BOOL ScriptProperties::OnSetActive() 
+BOOL ScriptProperties::OnSetActive()
 {
 	if ( CPropertyPage::OnSetActive()) {
 		CWnd *pWnd = GetDlgItem(IDC_SCRIPT_COMMENT);
 		pWnd->SetWindowText(m_script->getComment().str());
-		
+
 		pWnd = GetDlgItem(IDC_SCRIPT_NAME);
 		pWnd->SetWindowText(m_script->getName().str());
 		enableControls();
@@ -88,7 +83,7 @@ BOOL ScriptProperties::OnSetActive()
 	return false;
 }
 
-void ScriptProperties::enableControls() 
+void ScriptProperties::enableControls()
 {
 	Bool isSubroutine = m_script->isSubroutine();
 	CButton *pButton = (CButton*)GetDlgItem(IDC_SCRIPT_SUBROUTINE);
@@ -121,7 +116,7 @@ void ScriptProperties::enableControls()
 	m_updating = false;
 }
 
-void ScriptProperties::OnChangeScriptComment() 
+void ScriptProperties::OnChangeScriptComment()
 {
 	CWnd *pWnd = GetDlgItem(IDC_SCRIPT_COMMENT);
 	CString comment;
@@ -129,7 +124,7 @@ void ScriptProperties::OnChangeScriptComment()
 	m_script->setComment(AsciiString((LPCTSTR)comment));
 }
 
-void ScriptProperties::OnChangeScriptName() 
+void ScriptProperties::OnChangeScriptName()
 {
 	CWnd *pWnd = GetDlgItem(IDC_SCRIPT_NAME);
 	CString name;
@@ -138,37 +133,37 @@ void ScriptProperties::OnChangeScriptName()
 	GetParent()->SetWindowText(name);
 }
 
-void ScriptProperties::OnScriptActive() 
+void ScriptProperties::OnScriptActive()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_SCRIPT_ACTIVE);
 	m_script->setActive(pButton->GetCheck()==1);
 }
 
-void ScriptProperties::OnOneShot() 
+void ScriptProperties::OnOneShot()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_ONE_SHOT);
 	m_script->setOneShot(pButton->GetCheck()==1);
 }
 
-void ScriptProperties::OnEasy() 
+void ScriptProperties::OnEasy()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_EASY);
 	m_script->setEasy(pButton->GetCheck()==1);
 }
 
-void ScriptProperties::OnHard() 
+void ScriptProperties::OnHard()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_HARD);
 	m_script->setHard(pButton->GetCheck()==1);
 }
 
-void ScriptProperties::OnNormal() 
+void ScriptProperties::OnNormal()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_NORMAL);
 	m_script->setNormal(pButton->GetCheck()==1);
 }
 
-void ScriptProperties::OnScriptSubroutine() 
+void ScriptProperties::OnScriptSubroutine()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_SCRIPT_SUBROUTINE);
 	Bool isSubroutine = pButton->GetCheck()==1;
@@ -178,7 +173,7 @@ void ScriptProperties::OnScriptSubroutine()
 
 }
 
-void ScriptProperties::OnEveryFrame() 
+void ScriptProperties::OnEveryFrame()
 {
 	m_updating = true;
 	CButton *pButton = (CButton*)GetDlgItem(IDC_EVERY_SECOND);
@@ -190,7 +185,7 @@ void ScriptProperties::OnEveryFrame()
 	m_updating = false;
 }
 
-void ScriptProperties::OnEverySecond() 
+void ScriptProperties::OnEverySecond()
 {
 	m_updating = true;
 	CButton *pButton = (CButton*)GetDlgItem(IDC_EVERY_SECOND);
@@ -202,7 +197,7 @@ void ScriptProperties::OnEverySecond()
 	m_updating = false;
 }
 
-void ScriptProperties::OnChangeSecondsEdit() 
+void ScriptProperties::OnChangeSecondsEdit()
 {
 	if (m_updating) return;
 	CButton *pButton = (CButton*)GetDlgItem(IDC_EVERY_SECOND);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp
index 80132014930..b5a2d134a29 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp
@@ -58,10 +58,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // SelectMacrotexture message handlers
 
-BOOL SelectMacrotexture::OnInitDialog() 
+BOOL SelectMacrotexture::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CWnd *pWnd = GetDlgItem(IDC_TEXTURE_TREEVIEW);
 	CRect rect;
 	pWnd->GetWindowRect(&rect);
@@ -73,38 +73,27 @@ BOOL SelectMacrotexture::OnInitDialog()
 	m_textureTreeView.ShowWindow(SW_SHOW);
 
 	{
-		char				dirBuf[_MAX_PATH];
-		char				findBuf[_MAX_PATH];
 		char				fileBuf[_MAX_PATH];
 
-		strcpy(dirBuf, "..\\TestArt");
-		int len = strlen(dirBuf);
-
-		if (len > 0 && dirBuf[len - 1] != '\\') {
-			dirBuf[len++] = '\\';
-			dirBuf[len] = 0;
-		}
-		strcpy(findBuf, dirBuf);
-
 		FilenameList filenameList;
-		TheFileSystem->getFileListInDirectory(AsciiString(findBuf), AsciiString("*.tga"), filenameList, FALSE);
+		TheFileSystem->getFileListInDirectory("..\\TestArt\\", "*.tga", filenameList, FALSE);
 
-		if (filenameList.size() > 0) {
+		if (!filenameList.empty()) {
 			TVINSERTSTRUCT ins;
 			HTREEITEM child = NULL;
 			FilenameList::iterator it = filenameList.begin();
 			do {
 				AsciiString filename = *it;
-				len = filename.getLength();
+				int len = filename.getLength();
 				if (len<5) continue;
-				strcpy(fileBuf, filename.str());
+				strlcpy(fileBuf, filename.str(), ARRAY_SIZE(fileBuf));
 					::memset(&ins, 0, sizeof(ins));
 					ins.hParent = TVI_ROOT;
 					ins.hInsertAfter = TVI_SORT;
 					ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 					ins.item.lParam = -1;
 					ins.item.pszText = fileBuf;
-					ins.item.cchTextMax = strlen(fileBuf);				
+					ins.item.cchTextMax = strlen(fileBuf);
 					child = m_textureTreeView.InsertItem(&ins);
 				++it;
 			} while (it != filenameList.end());
@@ -116,18 +105,18 @@ BOOL SelectMacrotexture::OnInitDialog()
 			ins.item.lParam = -1;
 			char defaultText[] = DEFAULT;
 			ins.item.pszText = defaultText;
-			ins.item.cchTextMax = strlen(defaultText);				
+			ins.item.cchTextMax = strlen(defaultText);
 			child = m_textureTreeView.InsertItem(&ins);
 
  		}
 	}
 
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-BOOL SelectMacrotexture::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL SelectMacrotexture::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_textureTreeView.m_hWnd) {
@@ -139,10 +128,10 @@ BOOL SelectMacrotexture::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult
 			item.mask = TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT|TVIF_STATE;
 			item.hItem = hItem;
 			item.pszText = buffer;
-			item.cchTextMax = sizeof(buffer)-2;				
+			item.cchTextMax = sizeof(buffer)-2;
 			m_textureTreeView.GetItem(&item);
 			if (0==strcmp(buffer, DEFAULT)) {
-				TheTerrainRenderObject->updateMacroTexture(AsciiString(""));
+				TheTerrainRenderObject->updateMacroTexture("");
 			} else {
 				TheTerrainRenderObject->updateMacroTexture(AsciiString(buffer));
 			}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ShadowOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ShadowOptions.cpp
index 087b3f4cbc7..d900c872046 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/ShadowOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ShadowOptions.cpp
@@ -61,7 +61,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // ShadowOptions message handlers
 
-void ShadowOptions::setShadowColor(void) 
+void ShadowOptions::setShadowColor(void)
 {
 	Int r, g, b, shift;
 
@@ -82,11 +82,11 @@ void ShadowOptions::setShadowColor(void)
 	if (b<0) b = 0;
 
 	UnsignedInt clr = (255<<24) + (r<<16) + (g<<8) + b;
-	DEBUG_LOG(("Setting shadows to %x\n", clr));
+	DEBUG_LOG(("Setting shadows to %x", clr));
 	TheW3DShadowManager->setShadowColor(clr);
 }
 
-void ShadowOptions::OnChangeAlphaEdit() 
+void ShadowOptions::OnChangeAlphaEdit()
 {
 	CWnd *pEdit = GetDlgItem(IDC_ALPHA_EDIT);
 	Real clr;
@@ -100,7 +100,7 @@ void ShadowOptions::OnChangeAlphaEdit()
 	}
 }
 
-void ShadowOptions::OnChangeBaEdit() 
+void ShadowOptions::OnChangeBaEdit()
 {
 	CWnd *pEdit = GetDlgItem(IDC_BA_EDIT);
 	Real clr;
@@ -114,7 +114,7 @@ void ShadowOptions::OnChangeBaEdit()
 	}
 }
 
-void ShadowOptions::OnChangeGaEdit() 
+void ShadowOptions::OnChangeGaEdit()
 {
 	CWnd *pEdit = GetDlgItem(IDC_GA_EDIT);
 	Real clr;
@@ -128,7 +128,7 @@ void ShadowOptions::OnChangeGaEdit()
 	}
 }
 
-void ShadowOptions::OnChangeRaEdit() 
+void ShadowOptions::OnChangeRaEdit()
 {
 	CWnd *pEdit = GetDlgItem(IDC_RA_EDIT);
 	Real clr;
@@ -142,10 +142,10 @@ void ShadowOptions::OnChangeRaEdit()
 	}
 }
 
-BOOL ShadowOptions::OnInitDialog() 
+BOOL ShadowOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	UnsignedInt clr = TheW3DShadowManager->getShadowColor();
 	m_red = ((clr>>16)&0x00FF)/255.0f;
 	m_green = ((clr>>8)&0x00FF)/255.0f;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/SplashScreen.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/SplashScreen.cpp
index 6c109b6a6dc..f3caf2281ee 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/SplashScreen.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/SplashScreen.cpp
@@ -46,7 +46,7 @@ SplashScreen::SplashScreen()
 	lf.lfQuality = DEFAULT_QUALITY;
 	lf.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
 	strcpy(lf.lfFaceName, "Arial");
-	
+
 	m_font.CreateFontIndirect(&lf);
 }
 
@@ -65,7 +65,7 @@ void SplashScreen::outputText(UINT nIDString)
 	}
 
 	m_loadString = str;
-	
+
 	RedrawWindow(&m_rect, NULL);
 }
 
@@ -75,15 +75,15 @@ void SplashScreen::OnPaint()
 	// we're extending the default behavior
 	CDialog::OnPaint();
 
-	
+
 	CDC *dc = GetDC();
-	
+
 	// Save off the old font
 	CFont *oldFont = dc->SelectObject(&m_font);
 	COLORREF oldRef = dc->SetTextColor(0x00000000);
-	
+
 //	dc->DrawText(m_loadString, m_rect, DT_VCENTER | DT_LEFT);
-	
+
 	// restore the old font
 	dc->SelectObject(oldFont);
 	dc->SetTextColor(oldRef);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamBehavior.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamBehavior.cpp
index ae37d30596a..8e7a08076ea 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamBehavior.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamBehavior.cpp
@@ -68,7 +68,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // TeamBehavior message handlers
 
-void TeamBehavior::updateScript(NameKeyType keyScript, int idcScript) 
+void TeamBehavior::updateScript(NameKeyType keyScript, int idcScript)
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(idcScript);
 	CString txt;
@@ -81,7 +81,7 @@ void TeamBehavior::updateScript(NameKeyType keyScript, int idcScript)
 	m_teamDict->setAsciiString(keyScript, comboText);
 }
 
-void TeamBehavior::setupScript(NameKeyType keyScript, int idcScript) 
+void TeamBehavior::setupScript(NameKeyType keyScript, int idcScript)
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(idcScript);
 	// Load the subroutine scripts into the combo box.
@@ -104,10 +104,10 @@ void TeamBehavior::setupScript(NameKeyType keyScript, int idcScript)
 }
 
 
-BOOL TeamBehavior::OnInitDialog() 
+BOOL TeamBehavior::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
-	
+
 	setupScript(TheKey_teamOnCreateScript, IDC_ON_CREATE_SCRIPT);
 	setupScript(TheKey_teamOnIdleScript, IDC_ON_IDLE_SCRIPT);
 	setupScript(TheKey_teamEnemySightedScript, IDC_ON_ENEMY_SIGHTED);
@@ -160,26 +160,26 @@ BOOL TeamBehavior::OnInitDialog()
 								// EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void TeamBehavior::OnTransportsReturn() 
+void TeamBehavior::OnTransportsReturn()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_TRANSPORTS_RETURN);
 	Bool checked = 	pCheck->GetCheck()==1;
 	m_teamDict->setBool(TheKey_teamTransportsReturn, checked);
 }
 
-void TeamBehavior::OnAvoidThreats() 
+void TeamBehavior::OnAvoidThreats()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_AVOID_THREATS);
 	Bool checked = 	pCheck->GetCheck()==1;
 	m_teamDict->setBool(TheKey_teamAvoidThreats, checked);
 }
 
-void TeamBehavior::OnSelchangeOnEnemySighted() 
+void TeamBehavior::OnSelchangeOnEnemySighted()
 {
 	updateScript(TheKey_teamEnemySightedScript, IDC_ON_ENEMY_SIGHTED);
 }
 
-void TeamBehavior::OnSelchangeOnDestroyed() 
+void TeamBehavior::OnSelchangeOnDestroyed()
 {
 	updateScript(TheKey_teamOnDestroyedScript, IDC_ON_DESTROYED);
 }
@@ -189,12 +189,12 @@ void TeamBehavior::OnSelchangeOnUnitDestroyed()
 	updateScript(TheKey_teamOnUnitDestroyedScript, IDC_ON_UNIT_DESTROYED_SCRIPT);
 }
 
-void TeamBehavior::OnSelchangeOnCreateScript() 
+void TeamBehavior::OnSelchangeOnCreateScript()
 {
 	updateScript(TheKey_teamOnCreateScript, IDC_ON_CREATE_SCRIPT);
 }
 
-void TeamBehavior::OnPerimeterDefense() 
+void TeamBehavior::OnPerimeterDefense()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_PERIMETER_DEFENSE);
 	if( pCheck )
@@ -212,7 +212,7 @@ void TeamBehavior::OnPerimeterDefense()
 	}
 }
 
-void TeamBehavior::OnBaseDefense() 
+void TeamBehavior::OnBaseDefense()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_BASE_DEFENSE);
 	if( pCheck )
@@ -230,7 +230,7 @@ void TeamBehavior::OnBaseDefense()
 	}
 }
 
-void TeamBehavior::OnChangePercentDestroyed() 
+void TeamBehavior::OnChangePercentDestroyed()
 {
 	CWnd *pWnd = GetDlgItem(IDC_PERCENT_DESTROYED);
 	if (pWnd) {
@@ -242,26 +242,26 @@ void TeamBehavior::OnChangePercentDestroyed()
 	}
 }
 
-void TeamBehavior::OnSelchangeEnemyInteractions() 
+void TeamBehavior::OnSelchangeEnemyInteractions()
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_ENEMY_INTERACTIONS);
 	Int mode = pCombo->GetCurSel();
-	if (mode >= 0) { 
+	if (mode >= 0) {
 		m_teamDict->setInt(TheKey_teamAggressiveness, mode + ATTITUDE_SLEEP);
 	}
 }
 
-void TeamBehavior::OnSelchangeOnAllClear() 
+void TeamBehavior::OnSelchangeOnAllClear()
 {
 	updateScript(TheKey_teamAllClearScript, IDC_ON_ALL_CLEAR);
 }
 
-void TeamBehavior::OnSelchangeOnIdleScript() 
+void TeamBehavior::OnSelchangeOnIdleScript()
 {
 	updateScript(TheKey_teamOnIdleScript, IDC_ON_IDLE_SCRIPT);
 }
 
-void TeamBehavior::OnAttackCommonTarget() 
+void TeamBehavior::OnAttackCommonTarget()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_ATTACK_COMMON_TARGET);
 	Bool checked = 	pCheck->GetCheck()==1;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamGeneric.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamGeneric.cpp
index f51ee1ade51..d577f9c7a9e 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamGeneric.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamGeneric.cpp
@@ -28,7 +28,7 @@
 #include "Common/Dict.h"
 #include "Common/WellKnownKeys.h"
 
-static const UINT s_allControls[][2] = 
+static const UINT s_allControls[][2] =
 {
 	{ IDC_SCRIPT_PREFIX1,		IDC_TeamGeneric_Script1,	},
 	{ IDC_SCRIPT_PREFIX2,		IDC_TeamGeneric_Script2,	},
@@ -51,7 +51,7 @@ static const UINT s_allControls[][2] =
 
 TeamGeneric::TeamGeneric() : CPropertyPage(TeamGeneric::IDD)
 {
-	
+
 }
 
 BOOL TeamGeneric::OnInitDialog()
@@ -238,4 +238,4 @@ BEGIN_MESSAGE_MAP(TeamGeneric, CPropertyPage)
 	ON_CBN_SELCHANGE(IDC_TeamGeneric_Script14, OnScriptAdjust)
 	ON_CBN_SELCHANGE(IDC_TeamGeneric_Script15, OnScriptAdjust)
 	ON_CBN_SELCHANGE(IDC_TeamGeneric_Script16, OnScriptAdjust)
-END_MESSAGE_MAP()
\ No newline at end of file
+END_MESSAGE_MAP()
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamIdentity.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamIdentity.cpp
index 62f98cc9533..e495b235f1b 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamIdentity.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamIdentity.cpp
@@ -24,7 +24,7 @@
 #include "TeamIdentity.h"
 #include "EditParameter.h"
 #include "PickUnitDialog.h"
-#include "Common/WellKnownKeys.h"	  
+#include "Common/WellKnownKeys.h"
 #include "Common/ThingTemplate.h"
 #include "Common/ThingFactory.h"
 #include "Common/ThingSort.h"
@@ -84,37 +84,37 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // TeamIdentity message handlers
 
-BOOL TeamIdentity::OnInitDialog() 
+BOOL TeamIdentity::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
-	
+
 	loadUnitsInfo(IDC_MIN_UNIT1, TheKey_teamUnitMinCount1,
 								IDC_MAX_UNIT1, TheKey_teamUnitMaxCount1,
-								IDC_UNIT_TYPE1, TheKey_teamUnitType1); 
+								IDC_UNIT_TYPE1, TheKey_teamUnitType1);
 
 	loadUnitsInfo(IDC_MIN_UNIT2, TheKey_teamUnitMinCount2,
 								IDC_MAX_UNIT2, TheKey_teamUnitMaxCount2,
-								IDC_UNIT_TYPE2, TheKey_teamUnitType2); 
+								IDC_UNIT_TYPE2, TheKey_teamUnitType2);
 
 	loadUnitsInfo(IDC_MIN_UNIT3, TheKey_teamUnitMinCount3,
 								IDC_MAX_UNIT3, TheKey_teamUnitMaxCount3,
-								IDC_UNIT_TYPE3, TheKey_teamUnitType3); 
+								IDC_UNIT_TYPE3, TheKey_teamUnitType3);
 
 	loadUnitsInfo(IDC_MIN_UNIT4, TheKey_teamUnitMinCount4,
 								IDC_MAX_UNIT4, TheKey_teamUnitMaxCount4,
-								IDC_UNIT_TYPE4, TheKey_teamUnitType4); 
+								IDC_UNIT_TYPE4, TheKey_teamUnitType4);
 
 	loadUnitsInfo(IDC_MIN_UNIT5, TheKey_teamUnitMinCount5,
 								IDC_MAX_UNIT5, TheKey_teamUnitMaxCount5,
-								IDC_UNIT_TYPE5, TheKey_teamUnitType5); 
+								IDC_UNIT_TYPE5, TheKey_teamUnitType5);
 
 	loadUnitsInfo(IDC_MIN_UNIT6, TheKey_teamUnitMinCount6,
 								IDC_MAX_UNIT6, TheKey_teamUnitMaxCount6,
-								IDC_UNIT_TYPE6, TheKey_teamUnitType6); 
+								IDC_UNIT_TYPE6, TheKey_teamUnitType6);
 
 	loadUnitsInfo(IDC_MIN_UNIT7, TheKey_teamUnitMinCount7,
 								IDC_MAX_UNIT7, TheKey_teamUnitMaxCount7,
-								IDC_UNIT_TYPE7, TheKey_teamUnitType7); 
+								IDC_UNIT_TYPE7, TheKey_teamUnitType7);
 
 	CComboBox *pCombo = (CComboBox *)GetDlgItem(IDC_HOME_WAYPOINT);
 	Bool exists;
@@ -164,11 +164,11 @@ BOOL TeamIdentity::OnInitDialog()
 	CWnd *pWnd = GetDlgItem(IDC_DESCRIPTION);
 	AsciiString description = m_teamDict->getAsciiString(TheKey_teamDescription, &exists);
 	pWnd->SetWindowText(description.str());
-	
+
 	pWnd = GetDlgItem(IDC_TEAM_NAME);
 	description = m_teamDict->getAsciiString(TheKey_teamName, &exists);
 	pWnd->SetWindowText(description.str());
-	
+
 	pWnd = GetDlgItem(IDC_MAX);
 	Int maxInstances = m_teamDict->getInt(TheKey_teamMaxInstances, &exists);
 	if (!exists) maxInstances = 1;
@@ -223,7 +223,7 @@ BOOL TeamIdentity::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void TeamIdentity::loadUnitsInfo(int idcMinUnit, NameKeyType keyMinUnit, 
+void TeamIdentity::loadUnitsInfo(int idcMinUnit, NameKeyType keyMinUnit,
 								int idcMaxUnit, NameKeyType keyMaxUnit,
 								int idcUnitType, NameKeyType keyUnitType)
 {
@@ -253,7 +253,10 @@ void TeamIdentity::loadUnitsInfo(int idcMinUnit, NameKeyType keyMinUnit,
 
 		// next tier uses the editor sorting bits that design can specify in the INI
 		EditorSortingType sort = tTemplate->getEditorSorting();
-		if (( sort != ES_VEHICLE ) && (sort != ES_INFANTRY)) continue;
+		// TheSuperHackers @tweak DayV 20/07/2025 Allow structures in teams.
+		if (sort != ES_VEHICLE && sort != ES_INFANTRY && sort != ES_STRUCTURE) {
+			continue;
+		}
 
 		Int ndx = pCombo->AddString(tTemplate->getName().str());
 		if (type == tTemplate->getName()) {
@@ -270,11 +273,11 @@ void TeamIdentity::loadUnitsInfo(int idcMinUnit, NameKeyType keyMinUnit,
 }
 
 
-BOOL TeamIdentity::OnCommand(WPARAM wParam, LPARAM lParam) 
+BOOL TeamIdentity::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 
-	Int wNotifyCode = HIWORD(wParam); // notification code 
-	Int wID = LOWORD(wParam);         // item, control, or accelerator identifier 
+	Int wNotifyCode = HIWORD(wParam); // notification code
+	Int wID = LOWORD(wParam);         // item, control, or accelerator identifier
 	NameKeyType key;
 	if (wNotifyCode == EN_CHANGE) {
 		Int editCtrl = wID;
@@ -332,18 +335,18 @@ BOOL TeamIdentity::OnCommand(WPARAM wParam, LPARAM lParam)
 			return true;
 		}
 	}
- 	
+
 	return CPropertyPage::OnCommand(wParam, lParam);
 }
 
-void TeamIdentity::OnAiRecruitable() 
+void TeamIdentity::OnAiRecruitable()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_AI_RECRUITABLE);
 	Bool checked = 	pCheck->GetCheck()==1;
 	m_teamDict->setBool(TheKey_teamIsAIRecruitable, checked);
 }
 
-void TeamIdentity::OnAutoReinforce() 
+void TeamIdentity::OnAutoReinforce()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_AUTO_REINFORCE);
 	Bool checked = 	pCheck->GetCheck()==1;
@@ -351,7 +354,7 @@ void TeamIdentity::OnAutoReinforce()
 }
 
 
-void TeamIdentity::OnChangeDescription() 
+void TeamIdentity::OnChangeDescription()
 {
 	CWnd *pWnd = GetDlgItem(IDC_DESCRIPTION);
 	if (pWnd) {
@@ -362,7 +365,7 @@ void TeamIdentity::OnChangeDescription()
 	}
 }
 
-void TeamIdentity::OnChangeMax() 
+void TeamIdentity::OnChangeMax()
 {
 	CWnd *pWnd = GetDlgItem(IDC_MAX);
 	if (pWnd) {
@@ -373,7 +376,7 @@ void TeamIdentity::OnChangeMax()
 	}
 }
 
-void TeamIdentity::OnChangePriorityDecrease() 
+void TeamIdentity::OnChangePriorityDecrease()
 {
 	CWnd *pWnd = GetDlgItem(IDC_PRIORITY_DECREASE);
 	if (pWnd) {
@@ -384,7 +387,7 @@ void TeamIdentity::OnChangePriorityDecrease()
 	}
 }
 
-void TeamIdentity::OnChangePriorityIncrease() 
+void TeamIdentity::OnChangePriorityIncrease()
 {
 	CWnd *pWnd = GetDlgItem(IDC_PRIORITY_INCREASE);
 	if (pWnd) {
@@ -395,7 +398,7 @@ void TeamIdentity::OnChangePriorityIncrease()
 	}
 }
 
-void TeamIdentity::OnSelchangeProductionCondition() 
+void TeamIdentity::OnSelchangeProductionCondition()
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_PRODUCTION_CONDITION);
 	CString txt;
@@ -408,7 +411,7 @@ void TeamIdentity::OnSelchangeProductionCondition()
 	m_teamDict->setAsciiString(TheKey_teamProductionCondition, comboText);
 }
 
-void TeamIdentity::OnChangeProductionPriority() 
+void TeamIdentity::OnChangeProductionPriority()
 {
 	CWnd *pWnd = GetDlgItem(IDC_PRODUCTION_PRIORITY);
 	if (pWnd) {
@@ -419,7 +422,7 @@ void TeamIdentity::OnChangeProductionPriority()
 	}
 }
 
-void TeamIdentity::OnSelchangeHomeWaypoint() 
+void TeamIdentity::OnSelchangeHomeWaypoint()
 {
 	CComboBox *pCombo = (CComboBox *)GetDlgItem(IDC_HOME_WAYPOINT);
 	CString txt;
@@ -432,11 +435,13 @@ void TeamIdentity::OnSelchangeHomeWaypoint()
 	m_teamDict->setAsciiString(TheKey_teamHome, comboText);
 }
 
-void TeamIdentity::OnUnitTypeButton(Int idcUnitType) 
+void TeamIdentity::OnUnitTypeButton(Int idcUnitType)
 {
 	PickUnitDialog dlg;
 	dlg.SetAllowableType(ES_VEHICLE);
 	dlg.SetAllowableType(ES_INFANTRY);
+	// TheSuperHackers @tweak DayV 20/07/2025 Allow structures in teams.
+	dlg.SetAllowableType(ES_STRUCTURE);
 	if (dlg.DoModal() == IDOK) {
 		AsciiString unit = dlg.getPickedUnit();
 		NameKeyType keyUnitType;
@@ -472,37 +477,37 @@ void TeamIdentity::OnUnitTypeButton(Int idcUnitType)
 
 }
 
-void TeamIdentity::OnUnitType1Button() 
+void TeamIdentity::OnUnitType1Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE1);
 }
 
-void TeamIdentity::OnUnitType2Button() 
+void TeamIdentity::OnUnitType2Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE2);
 }
 
-void TeamIdentity::OnUnitType3Button() 
+void TeamIdentity::OnUnitType3Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE3);
 }
 
-void TeamIdentity::OnUnitType4Button() 
+void TeamIdentity::OnUnitType4Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE4);
 }
 
-void TeamIdentity::OnUnitType5Button() 
+void TeamIdentity::OnUnitType5Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE5);
 }
 
-void TeamIdentity::OnUnitType6Button() 
+void TeamIdentity::OnUnitType6Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE6);
 }
 
-void TeamIdentity::OnUnitType7Button() 
+void TeamIdentity::OnUnitType7Button()
 {
 	OnUnitTypeButton(IDC_UNIT_TYPE7);
 }
@@ -517,18 +522,18 @@ void TeamIdentity::OnExecuteActions()
 	m_teamDict->setBool(TheKey_teamExecutesActionsOnCreate, pButton->GetCheck() ? true : false);
 }
 
-void TeamIdentity::OnChangeTeamName() 
+void TeamIdentity::OnChangeTeamName()
 {
 
 }
 
-void TeamIdentity::OnTeamSingleton() 
+void TeamIdentity::OnTeamSingleton()
 {
 	CButton *singleton = (CButton*)GetDlgItem(IDC_TEAM_SINGLETON);
 	m_teamDict->setBool(TheKey_teamIsSingleton, singleton->GetCheck() != 0);
 }
 
-void TeamIdentity::OnKillfocusTeamName() 
+void TeamIdentity::OnKillfocusTeamName()
 {
 	CWnd *pWnd = GetDlgItem(IDC_TEAM_NAME);
 	if (pWnd) {
@@ -566,7 +571,7 @@ void TeamIdentity::OnKillfocusTeamName()
 	}
 }
 
-void TeamIdentity::OnSelendokTeamowner() 
+void TeamIdentity::OnSelendokTeamowner()
 {
 	CWnd *pWnd = GetDlgItem(IDC_TEAMOWNER);
 	if (pWnd) {
@@ -577,7 +582,7 @@ void TeamIdentity::OnSelendokTeamowner()
 	}
 }
 
-void TeamIdentity::OnChangeTeamBuildFrames() 
+void TeamIdentity::OnChangeTeamBuildFrames()
 {
 	CWnd *pWnd = GetDlgItem(IDC_TEAM_BUILD_FRAMES);
 	if (pWnd) {
@@ -586,5 +591,5 @@ void TeamIdentity::OnChangeTeamBuildFrames()
 		Int idleFrames = atoi(val);
 		m_teamDict->setInt(TheKey_teamInitialIdleFrames, idleFrames);
 	}
-	
+
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamObjectProperties.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamObjectProperties.cpp
index 6c17d458052..4f11bd26741 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamObjectProperties.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamObjectProperties.cpp
@@ -36,7 +36,7 @@ TeamObjectProperties::TeamObjectProperties(Dict* dictToEdit)
 {
 	//{{AFX_DATA_INIT(TeamObjectProperties)
 		// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT	
+	//}}AFX_DATA_INIT
 }
 
 TeamObjectProperties::~TeamObjectProperties()
@@ -79,7 +79,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // TeamObjectProperties message handlers
 
-BOOL TeamObjectProperties::OnInitDialog() 
+BOOL TeamObjectProperties::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	updateTheUI();
@@ -93,7 +93,7 @@ void TeamObjectProperties::OnOK()
 	_PropertiesToDict();
 }
 
-void TeamObjectProperties::updateTheUI(void) 
+void TeamObjectProperties::updateTheUI(void)
 {
 	_DictToHealth();
 	_DictToHPs();
@@ -146,7 +146,7 @@ void TeamObjectProperties::_DictToHealth(void)
 		} else {
 			pItem->SelectString(-1, "Other");
 			static char buff[12];
-			sprintf(buff, "%d", value);
+			snprintf(buff, ARRAY_SIZE(buff), "%d", value);
 			pItem2->SetWindowText(buff);
 			pItem2->EnableWindow(TRUE);
 		}
@@ -189,7 +189,7 @@ void TeamObjectProperties::_DictToEnabled(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Enabled);
 	if (pItem) {
 		pItem->SetCheck(enabled);
-	}	
+	}
 }
 
 void TeamObjectProperties::_DictToDestructible(void)
@@ -203,7 +203,7 @@ void TeamObjectProperties::_DictToDestructible(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Indestructible);
 	if (pItem) {
 		pItem->SetCheck(destructible);
-	}	
+	}
 }
 
 void TeamObjectProperties::_DictToUnsellable(void)
@@ -217,7 +217,7 @@ void TeamObjectProperties::_DictToUnsellable(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Unsellable);
 	if (pItem) {
 		pItem->SetCheck(unsellable);
-	}	
+	}
 }
 
 void TeamObjectProperties::_DictToPowered(void)
@@ -231,8 +231,8 @@ void TeamObjectProperties::_DictToPowered(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Powered);
 	if (pItem) {
 		pItem->SetCheck(powered);
-	}	
-	
+	}
+
 }
 
 void TeamObjectProperties::_DictToAggressiveness(void)
@@ -270,9 +270,9 @@ void TeamObjectProperties::_DictToVisibilityRange(void)
 	CWnd* pItem = GetDlgItem(IDC_MAPOBJECT_VisionDistance);
 	if (pItem) {
 		static char buff[12];
-		sprintf(buff, "%d", distance);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", distance);
 		if (distance == 0) {
-			pItem->SetWindowText(""); 
+			pItem->SetWindowText("");
 		} else {
 			pItem->SetWindowText(buff);
 		}
@@ -332,9 +332,9 @@ void TeamObjectProperties::_DictToShroudClearingDistance(void)
 	CWnd* pItem = GetDlgItem(IDC_MAPOBJECT_ShroudClearingDistance);
 	if (pItem) {
 		static char buff[12];
-		sprintf(buff, "%d", distance);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", distance);
 		if (distance == 0) {
-			pItem->SetWindowText(""); 
+			pItem->SetWindowText("");
 		} else {
 			pItem->SetWindowText(buff);
 		}
@@ -348,11 +348,11 @@ void TeamObjectProperties::_DictToRecruitableAI(void)
  	if (m_dictToEdit) {
 		recruitableAI  = m_dictToEdit->getBool(TheKey_teamObjectRecruitableAI, &exists);
  	}
-	
+
  	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_RecruitableAI);
  	if (pItem) {
 		pItem->SetCheck(recruitableAI);
-	}	
+	}
 }
 
 void TeamObjectProperties::_DictToSelectable(void)
@@ -366,7 +366,7 @@ void TeamObjectProperties::_DictToSelectable(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Selectable);
 	if (pItem) {
 		pItem->SetCheck(selectable);
-	}	
+	}
 }
 
 void TeamObjectProperties::_DictToStoppingDistance(void)
@@ -379,14 +379,14 @@ void TeamObjectProperties::_DictToStoppingDistance(void)
 
 	CWnd* pItem = GetDlgItem(IDC_MAPOBJECT_StoppingDistance);
 	if (pItem) {
-		static char buff[12];
-		sprintf(buff, "%g", stoppingDistance);
+		static char buff[64];
+		sprintf(buff, ARRAY_SIZE(buff), "%g", stoppingDistance);
 		if (stoppingDistance == 0) {
-			pItem->SetWindowText(""); 
+			pItem->SetWindowText("");
 		} else {
 			pItem->SetWindowText(buff);
 		}
-	}	
+	}
 }
 
 void TeamObjectProperties::_HealthToDict(void)
@@ -459,7 +459,7 @@ void TeamObjectProperties::_AggressivenessToDict(void)
 	static char buf[1024];
 	owner->GetWindowText(buf, sizeof(buf)-2);
 	int value = 0;
-	
+
 	if (strcmp(buf, "Sleep") == 0) {
 		value = -2;
 	} else if (strcmp(buf, "Passive") == 0) {
@@ -496,7 +496,7 @@ void TeamObjectProperties::_VeterancyToDict(void)
 	CComboBox *owner = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Veterancy);
 	static char buf[1024];
 	int curSel = owner->GetCurSel();
-	int value = 0;	
+	int value = 0;
 	if (curSel >= 0) {
 		value=curSel;
 	}
@@ -542,7 +542,7 @@ void TeamObjectProperties::_RecruitableAIToDict(void)
 {
 	CButton *owner = (CButton*) GetDlgItem(IDC_MAPOBJECT_RecruitableAI);
 	Bool isChecked = (owner->GetCheck() != 0);
-	
+
 	m_dictToEdit->setBool(TheKey_teamObjectRecruitableAI, isChecked);
 }
 
@@ -554,7 +554,7 @@ void TeamObjectProperties::_SelectableToDict(void)
 	m_dictToEdit->setBool(TheKey_teamObjectSelectable, isChecked);
 }
 
-void TeamObjectProperties::_HPsToDict() 
+void TeamObjectProperties::_HPsToDict()
 {
 	Int value;
 	static char buf[1024];
@@ -678,7 +678,7 @@ void TeamObjectProperties::_PropertiesToDict()
 
 #endif
 
-BOOL TeamObjectProperties::OnCommand(WPARAM wParam, LPARAM lParam) 
+BOOL TeamObjectProperties::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 	return CPropertyPage::OnCommand(wParam, lParam);
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamReinforcement.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamReinforcement.cpp
index 877a3a33553..5582a7bbacc 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamReinforcement.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamReinforcement.cpp
@@ -62,7 +62,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // TeamReinforcement message handlers
 
-BOOL TeamReinforcement::OnInitDialog() 
+BOOL TeamReinforcement::OnInitDialog()
 {
 	CPropertyPage::OnInitDialog();
 	Bool exists;
@@ -79,7 +79,7 @@ BOOL TeamReinforcement::OnInitDialog()
 		}
 	}
 	pCombo->SetCurSel(stringNdx);
-	
+
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_TEAM_STARTS_FULL);
 	Bool teamStartsFull = m_teamDict->getBool(TheKey_teamStartsFull, &exists);
 	pCheck->SetCheck(teamStartsFull?1:0);
@@ -97,7 +97,7 @@ BOOL TeamReinforcement::OnInitDialog()
 	pCombo = (CComboBox *)GetDlgItem(IDC_VETERANCY);
 	Int value = m_teamDict->getInt(TheKey_teamVeterancy, &exists);
 	pCombo->SetCurSel(value);
-	
+
 	pCombo = (CComboBox *)GetDlgItem(IDC_WAYPOINT_COMBO);
 	EditParameter::loadWaypoints(pCombo);
 	AsciiString homeWaypoint = m_teamDict->getAsciiString(TheKey_teamReinforcementOrigin, &exists);
@@ -109,13 +109,13 @@ BOOL TeamReinforcement::OnInitDialog()
 		}
 	}
 	pCombo->SetCurSel(stringNdx);
-	
+
 
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void TeamReinforcement::OnDeployBy() 
+void TeamReinforcement::OnDeployBy()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_DEPLOY_BY);
 	if (pCheck->GetCheck()) {
@@ -134,14 +134,14 @@ void TeamReinforcement::OnDeployBy()
 	}
 }
 
-void TeamReinforcement::OnTeamStartsFull() 
+void TeamReinforcement::OnTeamStartsFull()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_TEAM_STARTS_FULL);
 	Bool checked = 	pCheck->GetCheck()==1;
 	m_teamDict->setBool(TheKey_teamStartsFull, checked);
 }
 
-void TeamReinforcement::OnSelchangeTransportCombo() 
+void TeamReinforcement::OnSelchangeTransportCombo()
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_TRANSPORT_COMBO);
 	CString txt;
@@ -154,26 +154,26 @@ void TeamReinforcement::OnSelchangeTransportCombo()
 	m_teamDict->setAsciiString(TheKey_teamTransport, comboText);
 }
 
-void TeamReinforcement::OnTransportsExit() 
+void TeamReinforcement::OnTransportsExit()
 {
 	CButton *pCheck = (CButton *) GetDlgItem(IDC_TRANSPORTS_EXIT);
 	Bool checked = 	pCheck->GetCheck()==1;
 	m_teamDict->setBool(TheKey_teamTransportsExit, checked);
 }
 
-void TeamReinforcement::OnSelchangeVeterancy() 
+void TeamReinforcement::OnSelchangeVeterancy()
 {
 	CComboBox *owner = (CComboBox*)GetDlgItem(IDC_VETERANCY);
 	static char buf[1024];
 	int curSel = owner->GetCurSel();
-	int value = 0;	
+	int value = 0;
 	if (curSel >= 0) {
 		value=curSel;
 	}
 	m_teamDict->setInt(TheKey_teamVeterancy, value);
 }
 
-void TeamReinforcement::OnSelchangeWaypointCombo() 
+void TeamReinforcement::OnSelchangeWaypointCombo()
 {
 	CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_WAYPOINT_COMBO);
 	CString txt;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp
index e9a756be326..1d2c46b3126 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp
@@ -27,10 +27,10 @@
 #include "TerrainMaterial.h"
 #include "WHeightMapEdit.h"
 #include "WorldBuilderDoc.h"
-#include "TileTool.h"				
+#include "TileTool.h"
 #include "wbview3d.h"
 #include "Common/TerrainTypes.h"
-#include "W3DDevice/GameClient/TerrainTex.h"	  
+#include "W3DDevice/GameClient/TerrainTex.h"
 #include "W3DDevice/GameClient/HeightMap.h"
 
 TerrainMaterial *TerrainMaterial::m_staticThis = NULL;
@@ -79,7 +79,7 @@ END_MESSAGE_MAP()
 // TerrainMaterial data access method.
 
 /// Set foreground texture and invalidate swatches.
-void TerrainMaterial::setFgTexClass(Int texClass) 
+void TerrainMaterial::setFgTexClass(Int texClass)
 {
 	if (m_staticThis) {
 		m_staticThis->m_currentFgTexture=texClass;
@@ -90,7 +90,7 @@ void TerrainMaterial::setFgTexClass(Int texClass)
 
 
 /// Set backgroundground texture and invalidate swatches.
-void TerrainMaterial::setBgTexClass(Int texClass) 
+void TerrainMaterial::setBgTexClass(Int texClass)
 {
 	if (m_staticThis) {
 		m_staticThis->m_currentBgTexture=texClass;
@@ -100,8 +100,8 @@ void TerrainMaterial::setBgTexClass(Int texClass)
 
 /// Sets the setWidth value in the dialog.
 /** Update the value in the edit control and the slider. */
-void TerrainMaterial::setWidth(Int width) 
-{ 
+void TerrainMaterial::setWidth(Int width)
+{
 	CString buf;
 	buf.Format("%d", width);
 	if (m_staticThis && !m_staticThis->m_updating) {
@@ -111,11 +111,11 @@ void TerrainMaterial::setWidth(Int width)
 	}
 }
 
-/// Sets the tool option - single & multi tile use this panel, 
+/// Sets the tool option - single & multi tile use this panel,
 // and only multi tile uses the width.
 /** Update the ui for the tool. */
-void TerrainMaterial::setToolOptions(Bool singleCell) 
-{ 
+void TerrainMaterial::setToolOptions(Bool singleCell)
+{
 	CString buf;
 	if (m_staticThis ) {
 		m_staticThis->m_updating = true;
@@ -179,7 +179,7 @@ Bool TerrainMaterial::setTerrainTreeViewSelection(HTREEITEM parent, Int selectio
 		item.mask = TVIF_HANDLE|TVIF_PARAM;
 		item.hItem = child;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_terrainTreeView.GetItem(&item);
 		if (item.lParam == selection) {
 			m_terrainTreeView.SelectItem(child);
@@ -198,7 +198,7 @@ Bool TerrainMaterial::setTerrainTreeViewSelection(HTREEITEM parent, Int selectio
 // TerrainMaterial message handlers
 
 /// Setup the controls in the dialog.
-BOOL TerrainMaterial::OnInitDialog() 
+BOOL TerrainMaterial::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -251,7 +251,7 @@ HTREEITEM TerrainMaterial::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_terrainTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -266,7 +266,7 @@ HTREEITEM TerrainMaterial::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = const_cast<LPSTR>(pLabel);
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_terrainTreeView.InsertItem(&ins);
 	return(child);
 }
@@ -297,16 +297,16 @@ void TerrainMaterial::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 				parent = findOrAdd( parent, terrainTypeNames[ i ] );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
 		// set the name in the tree view to that of the entry
-		strcpy( buffer, terrain->getName().str() );
+		strlcpy(buffer, terrain->getName().str(), ARRAY_SIZE(buffer));
 
 		doAdd = TRUE;
-	}  // end if
- 	else if (!WorldHeightMapEdit::getTexClassIsBlendEdge(terrainNdx)) 
+	}
+ 	else if (!WorldHeightMapEdit::getTexClassIsBlendEdge(terrainNdx))
 	{
 
 		// all these old entries we will put in a tree for eval textures
@@ -322,21 +322,21 @@ void TerrainMaterial::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 					parent = findOrAdd(parent, buffer);
 				}
 				pPath+= i+1;
-				i = 0;			
+				i = 0;
 			}
 			buffer[i] = pPath[i];
 			buffer[i+1] = 0;  // terminate at next character
 			doAdd = TRUE;
 			i++;
 		}
-	}  // end else
+	}
 
 	Int tilesPerRow = TEXTURE_WIDTH/(2*TILE_PIXEL_EXTENT+TILE_OFFSET);
 	Int availableTiles = 4 * tilesPerRow * tilesPerRow;
 	Int percent = (WorldHeightMapEdit::getTexClassNumTiles(terrainNdx)*100 + availableTiles/2) / availableTiles;
 
 	char label[_MAX_PATH];
-	sprintf(label, "%d%% %s", percent, buffer);
+	snprintf(label, ARRAY_SIZE(label), "%d%% %s", percent, buffer);
 
 
 	if( doAdd )
@@ -352,7 +352,7 @@ void TerrainMaterial::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = terrainNdx;
 		ins.item.pszText = label;
-		ins.item.cchTextMax = strlen(label)+2;				
+		ins.item.cchTextMax = strlen(label)+2;
 		m_terrainTreeView.InsertItem(&ins);
 	}
 
@@ -361,7 +361,7 @@ void TerrainMaterial::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 //* Create the tree view of textures from the textures in pMap. */
 void TerrainMaterial::updateTextures(WorldHeightMapEdit *pMap)
 {
-#if 1 
+#if 1
 	if (m_staticThis) {
 		m_staticThis->m_updating = true;
 		m_staticThis->m_terrainTreeView.DeleteAllItems();
@@ -369,7 +369,7 @@ void TerrainMaterial::updateTextures(WorldHeightMapEdit *pMap)
 		for (i=0; i<pMap->getNumTexClasses(); i++) {
 			char path[_MAX_PATH];
 			AsciiString uiName = pMap->getTexClassUiName(i);
-			strncpy(path, uiName.str(), _MAX_PATH-2);
+			strlcpy(path, uiName.str(), _MAX_PATH);
 			m_staticThis->addTerrain(path, i, TVI_ROOT);
 		}
 		m_staticThis->m_updating = false;
@@ -380,20 +380,20 @@ void TerrainMaterial::updateTextures(WorldHeightMapEdit *pMap)
 }
 
 /** Swap the foreground and background textures. */
-void TerrainMaterial::OnSwapTextures() 
+void TerrainMaterial::OnSwapTextures()
 {
-	
+
 	Int tmp = m_currentFgTexture;
 	m_currentFgTexture = m_currentBgTexture;
 	m_currentBgTexture = tmp;
-	m_terrainSwatches.Invalidate();	
+	m_terrainSwatches.Invalidate();
 	updateTextureSelection();
 }
 
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void TerrainMaterial::OnChangeSizeEdit() 
+void TerrainMaterial::OnChangeSizeEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SIZE_EDIT);
@@ -405,7 +405,7 @@ void TerrainMaterial::OnChangeSizeEdit()
 			if (1==sscanf(buffer, "%d", &width)) {
 				m_currentWidth = width;
 				BigTileTool::setWidth(m_currentWidth);
-				sprintf(buffer, "%.1f FEET.", m_currentWidth*MAP_XY_FACTOR);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentWidth*MAP_XY_FACTOR);
 				pEdit = m_staticThis->GetDlgItem(IDC_WIDTH_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -425,7 +425,7 @@ void TerrainMaterial::GetPopSliderInfo(const long sliderID, long *pMin, long *pM
 			break;
 		default:
 			break;
-	}	// switch
+	}
 }
 
 
@@ -445,7 +445,7 @@ void TerrainMaterial::PopSliderChanged(const long sliderID, long theVal)
 
 		default:
 			break;
-	}	// switch
+	}
 }
 
 void TerrainMaterial::PopSliderFinished(const long sliderID, long theVal)
@@ -456,12 +456,12 @@ void TerrainMaterial::PopSliderFinished(const long sliderID, long theVal)
 
 		default:
 			break;
-	}	// switch
+	}
 
 }
 
 
-BOOL TerrainMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL TerrainMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_terrainTreeView.m_hWnd) {
@@ -489,7 +489,7 @@ BOOL TerrainMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 						// Tried to switch to a too large texture.
 						::AfxMessageBox(IDS_TEXTURE_TOO_LARGE);
 						::AfxGetMainWnd()->SetFocus();
-					} 
+					}
 					m_currentFgTexture = texClass;
 					updateLabel();
 					m_terrainSwatches.Invalidate();
@@ -506,18 +506,18 @@ BOOL TerrainMaterial::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			}
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
-void TerrainMaterial::OnImpassable() 
+void TerrainMaterial::OnImpassable()
 {
 	m_paintingPassable = false;
 	CButton *button = (CButton *)GetDlgItem(IDC_PASSABLE);
 	button->SetCheck(0);
 }
 
-void TerrainMaterial::OnPassableCheck() 
+void TerrainMaterial::OnPassableCheck()
 {
 	CButton *owner = (CButton*) GetDlgItem(IDC_PASSABLE_CHECK);
 	Bool isChecked = (owner->GetCheck() != 0);
@@ -546,7 +546,7 @@ void TerrainMaterial::OnPassableCheck()
 	}
 }
 
-void TerrainMaterial::OnPassable() 
+void TerrainMaterial::OnPassable()
 {
 	m_paintingPassable = true;
 	CButton *button = (CButton *)GetDlgItem(IDC_IMPASSABLE);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainModal.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainModal.cpp
index cec000695d5..ad41eebdd37 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainModal.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainModal.cpp
@@ -80,7 +80,7 @@ void TerrainModal::updateLabel(void)
 }
 
 /// Setup the controls in the dialog.
-BOOL TerrainModal::OnInitDialog() 
+BOOL TerrainModal::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
@@ -123,7 +123,7 @@ HTREEITEM TerrainModal::findOrAdd(HTREEITEM parent, const char *pLabel)
 		ins.item.mask = TVIF_HANDLE|TVIF_TEXT;
 		ins.item.hItem = child;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = sizeof(buffer)-2;				
+		ins.item.cchTextMax = sizeof(buffer)-2;
 		m_terrainTreeView.GetItem(&ins.item);
 		if (strcmp(buffer, pLabel) == 0) {
 			return(child);
@@ -138,7 +138,7 @@ HTREEITEM TerrainModal::findOrAdd(HTREEITEM parent, const char *pLabel)
 	ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 	ins.item.lParam = -1;
 	ins.item.pszText = const_cast<LPSTR>(pLabel);
-	ins.item.cchTextMax = strlen(pLabel);				
+	ins.item.cchTextMax = strlen(pLabel);
 	child = m_terrainTreeView.InsertItem(&ins);
 	return(child);
 }
@@ -168,15 +168,15 @@ void TerrainModal::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 				parent = findOrAdd( parent, terrainTypeNames[ i ] );
 				break;  // exit for
 
-			}  // end if
+			}
 
-		}  // end for i
+		}
 
-		strcpy( buffer, terrain->getName().str() );
+		strlcpy(buffer, terrain->getName().str(), ARRAY_SIZE(buffer));
 
 		doAdd = TRUE;
-						
-	}  // end if
+
+	}
 	else
 	{
 
@@ -194,7 +194,7 @@ void TerrainModal::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 					parent = findOrAdd(parent, buffer);
 				}
 				pPath+= i+1;
-				i = 0;			
+				i = 0;
 			}
 			buffer[i] = pPath[i];
 			buffer[i+1] = 0;  // terminate at next char
@@ -202,7 +202,7 @@ void TerrainModal::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 			doAdd = TRUE;
 		}
 
-	}  // end else
+	}
 
 	if (doAdd)
 	{
@@ -214,7 +214,7 @@ void TerrainModal::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent)
 		ins.item.mask = TVIF_PARAM|TVIF_TEXT;
 		ins.item.lParam = terrainNdx;
 		ins.item.pszText = buffer;
-		ins.item.cchTextMax = strlen(buffer)+2;				
+		ins.item.cchTextMax = strlen(buffer)+2;
 		m_terrainTreeView.InsertItem(&ins);
 	}
 
@@ -234,7 +234,7 @@ void TerrainModal::updateTextures(void)
 		}
 		const char *tName = WorldHeightMapEdit::getTexClassName(i).str();
 		char path[_MAX_PATH];
-		strncpy(path, tName, _MAX_PATH-2);
+		strlcpy(path, tName, _MAX_PATH);
 		addTerrain(path, i, TVI_ROOT);
 	}
 	setTerrainTreeViewSelection(TVI_ROOT, m_currentFgTexture);
@@ -251,7 +251,7 @@ Bool TerrainModal::setTerrainTreeViewSelection(HTREEITEM parent, Int selection)
 		item.mask = TVIF_HANDLE|TVIF_PARAM;
 		item.hItem = child;
 		item.pszText = buffer;
-		item.cchTextMax = sizeof(buffer)-2;				
+		item.cchTextMax = sizeof(buffer)-2;
 		m_terrainTreeView.GetItem(&item);
 		if (item.lParam == selection) {
 			m_terrainTreeView.SelectItem(child);
@@ -267,7 +267,7 @@ Bool TerrainModal::setTerrainTreeViewSelection(HTREEITEM parent, Int selection)
 
 
 
-BOOL TerrainModal::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 
+BOOL TerrainModal::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 {
 	NMTREEVIEW *pHdr = (NMTREEVIEW *)lParam;
 	if (pHdr->hdr.hwndFrom == m_terrainTreeView.m_hWnd) {
@@ -286,7 +286,7 @@ BOOL TerrainModal::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			}
 		}
 	}
-	
+
 	return CDialog::OnNotify(wParam, lParam, pResult);
 }
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainSwatches.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainSwatches.cpp
index 8b3c2bf13ad..f95f55c2574 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainSwatches.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainSwatches.cpp
@@ -48,10 +48,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // TerrainSwatches message handlers
 
-void TerrainSwatches::OnPaint() 
+void TerrainSwatches::OnPaint()
 {
 	CPaintDC dc(this); // device context for painting
-	
+
 	CRect clientRect;
 	GetClientRect(&clientRect);
 
@@ -91,7 +91,7 @@ void TerrainSwatches::OnPaint()
 void TerrainSwatches::DrawMyTexture(CDC *pDc, int top, int left, Int width, UnsignedByte *rgbData)
 {
 	// Just blast about some dib bits.
-	
+
 	LPBITMAPINFO pBI;
 //	long bytes = sizeof(BITMAPINFO);
  	pBI = new BITMAPINFO;
@@ -108,7 +108,7 @@ void TerrainSwatches::DrawMyTexture(CDC *pDc, int top, int left, Int width, Unsi
 	pBI->bmiHeader.biClrImportant = 0;
 
 	//::Sleep(10);
-	/*int val=*/::StretchDIBits(pDc->m_hDC, left, top, width, width, 0, 0, width, width, rgbData, pBI, 
+	/*int val=*/::StretchDIBits(pDc->m_hDC, left, top, width, width, 0, 0, width, width, rgbData, pBI,
 		DIB_RGB_COLORS, SRCCOPY);
 	delete(pBI);
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TileTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TileTool.cpp
index bfbfa8719e6..4c2be616c08 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/TileTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TileTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "TileTool.h"
@@ -42,15 +42,15 @@ TileTool::TileTool(void) :
 {
 	m_htMapEditCopy = NULL;
 }
-	
+
 /// Destructor
-TileTool::~TileTool(void) 
+TileTool::~TileTool(void)
 {
 	REF_PTR_RELEASE(m_htMapEditCopy);
 }
 
 /// Shows the terrain materials options panel.
-void TileTool::activate() 
+void TileTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_TERRAIN_MATERIAL);
 	TerrainMaterial::setToolOptions(true);
@@ -60,7 +60,7 @@ void TileTool::activate()
 
 
 /// Common mouse down code for left and right clicks.
-void TileTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void TileTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m == TRACK_L)
 		m_textureClassToDraw = TerrainMaterial::getFgTexClass();
@@ -80,7 +80,7 @@ void TileTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBu
 }
 
 /// Common mouse up code for left and right clicks.
-void TileTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void TileTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L && m != TRACK_R) return;
 #define DONT_DO_FULL_UPDATE
@@ -188,14 +188,14 @@ BigTileTool::BigTileTool(void)
 }
 
 /// Shows the terrain materials options panel.
-void BigTileTool::setWidth(Int width) 
+void BigTileTool::setWidth(Int width)
 {
 	m_currentWidth = width;
 	DrawObject::setBrushFeedbackParms(true, m_currentWidth, 0);
 }
 
 /// Shows the terrain materials options panel.
-void BigTileTool::activate() 
+void BigTileTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_TERRAIN_MATERIAL);
 	TerrainMaterial::setToolOptions(false);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/Tool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/Tool.cpp
index d900a138703..4ad1b4353f0 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/Tool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/Tool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 #include "MainFrm.h"
 #include "DrawObject.h"
@@ -32,16 +32,16 @@
 /// Tool class.
 //
 /// Constructor
-Tool::Tool(Int toolID, Int cursorID) 
+Tool::Tool(Int toolID, Int cursorID)
 {
-	m_toolID = toolID; 
+	m_toolID = toolID;
 	m_cursorID = cursorID;
 	m_cursor = NULL;
 }
 
 
 /// Destructor
-Tool::~Tool(void) 
+Tool::~Tool(void)
 {
 	if (m_cursor) {
 		::DestroyCursor(m_cursor);
@@ -50,14 +50,14 @@ Tool::~Tool(void)
 
 
 /// Shows the "no options"  options panel.
-void Tool::activate() 
+void Tool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_NO_OPTIONS);
 	DrawObject::setDoBrushFeedback(false);
 }
 
 
-void Tool::setCursor(void) 
+void Tool::setCursor(void)
 {
 		if (m_cursor == NULL) {
 			m_cursor = AfxGetApp()->LoadCursor(MAKEINTRESOURCE(m_cursorID));
@@ -66,7 +66,7 @@ void Tool::setCursor(void)
 }
 
 /// Calculate the round blend factor.
-/** Calculates the blend amount of the brush.  1.0 means the brush sets the 
+/** Calculates the blend amount of the brush.  1.0 means the brush sets the
 height, 0.0 means no change, and between blends proportionally. */
 Real Tool::calcRoundBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int featherWidth)
 {
@@ -90,12 +90,12 @@ Real Tool::calcRoundBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int
 	if (dist <= featherWidth) {
 		return (featherWidth-dist)/featherWidth;
 	}
-	
+
 	return(0);
 }
 
 /// Calculate the square blend factor.
-/** Calculates the blend amount of the brush.  1.0 means the brush sets the 
+/** Calculates the blend amount of the brush.  1.0 means the brush sets the
 height, 0.0 means no change, and between blends proportionally. */
 Real Tool::calcSquareBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int featherWidth)
 {
@@ -119,7 +119,7 @@ Real Tool::calcSquareBlendFactor(CPoint center, Int x, Int y, Int brushWidth, In
 	if (dist <= featherWidth) {
 		return (featherWidth-dist)/featherWidth;
 	}
-	
+
 	return(0);
 }
 
@@ -138,9 +138,9 @@ void Tool::getCenterIndex(Coord3D *docLocP, Int brushWidth, CPoint *center, CWor
 	}
 }
 
-void Tool::getAllIndexesIn(const Coord3D *bl, const Coord3D *br, 
-													 const Coord3D *tl, const Coord3D *tr, 
-													 Int widthOutside, CWorldBuilderDoc *pDoc, 
+void Tool::getAllIndexesIn(const Coord3D *bl, const Coord3D *br,
+													 const Coord3D *tl, const Coord3D *tr,
+													 Int widthOutside, CWorldBuilderDoc *pDoc,
 													 VecHeightMapIndexes* allIndices)
 {
 	if (!(bl && br && tl && tr && pDoc && allIndices)) {
@@ -148,4 +148,4 @@ void Tool::getAllIndexesIn(const Coord3D *bl, const Coord3D *br,
 	}
 
 	pDoc->getAllIndexesInRect(bl, br, tl, tr, widthOutside, allIndices);
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WBFrameWnd.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WBFrameWnd.cpp
index e56c6b51f05..b6295224422 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WBFrameWnd.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WBFrameWnd.cpp
@@ -55,7 +55,7 @@ BOOL CWBFrameWnd::LoadFrame(UINT nIDResource,
 			SWP_NOZORDER|SWP_NOSIZE);
 		if (!m_cellSizeToolBar.Create(this, IDD_CELL_SLIDER, CBRS_LEFT, IDD_CELL_SLIDER))
 		{
-			DEBUG_CRASH(("Failed to create toolbar\n"));
+			DEBUG_CRASH(("Failed to create toolbar"));
 		}
 		EnableDocking(CBRS_ALIGN_ANY);
 		m_cellSizeToolBar.SetupSlider();
@@ -65,7 +65,7 @@ BOOL CWBFrameWnd::LoadFrame(UINT nIDResource,
 	return(ret);
 }
 
-void CWBFrameWnd::OnMove(int x, int y) 
+void CWBFrameWnd::OnMove(int x, int y)
 {
 	CFrameWnd::OnMove(x, y);
 	if (this->IsWindowVisible() && !this->IsIconic()) {
@@ -127,7 +127,7 @@ BOOL CWB3dFrameWnd::LoadFrame(UINT nIDResource,
 }
 
 
-void CWB3dFrameWnd::OnMove(int x, int y) 
+void CWB3dFrameWnd::OnMove(int x, int y)
 {
 	CFrameWnd::OnMove(x, y);
 	if (this->IsWindowVisible() && !this->IsIconic()) {
@@ -138,7 +138,7 @@ void CWB3dFrameWnd::OnMove(int x, int y)
 	}
 }
 
-void CWB3dFrameWnd::OnWindowPreview1024x768() 
+void CWB3dFrameWnd::OnWindowPreview1024x768()
 {
 	if (m_3dViewWidth == 1024) return;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "Width", 1024);
@@ -146,12 +146,12 @@ void CWB3dFrameWnd::OnWindowPreview1024x768()
 	adjustWindowSize();
 }
 
-void CWB3dFrameWnd::OnUpdateWindowPreview1024x768(CCmdUI* pCmdUI) 
+void CWB3dFrameWnd::OnUpdateWindowPreview1024x768(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_3dViewWidth==1024?1:0);
 }
 
-void CWB3dFrameWnd::OnWindowPreview640x480() 
+void CWB3dFrameWnd::OnWindowPreview640x480()
 {
 	if (m_3dViewWidth == 640) return;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "Width", 640);
@@ -159,12 +159,12 @@ void CWB3dFrameWnd::OnWindowPreview640x480()
 	adjustWindowSize();
 }
 
-void CWB3dFrameWnd::OnUpdateWindowPreview640x480(CCmdUI* pCmdUI) 
+void CWB3dFrameWnd::OnUpdateWindowPreview640x480(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_3dViewWidth==640?1:0);
 }
 
-void CWB3dFrameWnd::OnWindowPreview800x600() 
+void CWB3dFrameWnd::OnWindowPreview800x600()
 {
 	if (m_3dViewWidth == 800) return;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "Width", 800);
@@ -172,7 +172,7 @@ void CWB3dFrameWnd::OnWindowPreview800x600()
 	adjustWindowSize();
 }
 
-void CWB3dFrameWnd::OnUpdateWindowPreview800x600(CCmdUI* pCmdUI) 
+void CWB3dFrameWnd::OnUpdateWindowPreview800x600(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_3dViewWidth==800?1:0);
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WBHeightMap.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WBHeightMap.cpp
index d3823b6b7aa..be5ce2158b9 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WBHeightMap.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WBHeightMap.cpp
@@ -18,12 +18,12 @@
 
 // FILE: Heightmap.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -37,7 +37,7 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 #include "WBHeightMap.h"
 #include "Common/GlobalData.h"
@@ -47,7 +47,7 @@
 
 #define dontUSE_FLAT_HEIGHT_MAP
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -172,7 +172,7 @@ Bool WBHeightMap::Cast_Ray(RayCollisionTestClass & raytest)
 	Int EndCellY;
 	const Int overhang = 2*32; // Allow picking past the edge for scrolling & objects.
  	Vector3 minPt(MAP_XY_FACTOR*(-overhang), MAP_XY_FACTOR*(-overhang), -MAP_XY_FACTOR);
-	Vector3 maxPt(MAP_XY_FACTOR*(m_map->getXExtent()+overhang), 
+	Vector3 maxPt(MAP_XY_FACTOR*(m_map->getXExtent()+overhang),
 		MAP_XY_FACTOR*(m_map->getYExtent()+overhang), MAP_HEIGHT_SCALE*m_map->getMaxHeightValue()+MAP_XY_FACTOR);
 	MinMaxAABoxClass mmbox(minPt, maxPt);
 	hbox.Init(mmbox);
@@ -232,7 +232,7 @@ Bool WBHeightMap::Cast_Ray(RayCollisionTestClass & raytest)
 
 	Int offset;
 	for (offset = 1; offset < 5; offset *= 3) {
-		for (Y=StartCellY-offset; Y<=EndCellY+offset; Y++) { 
+		for (Y=StartCellY-offset; Y<=EndCellY+offset; Y++) {
 			//if (Y<0) continue;
 			//if (Y>=m_map->getYExtent()-1) continue;
 
@@ -262,10 +262,10 @@ Bool WBHeightMap::Cast_Ray(RayCollisionTestClass & raytest)
 				P3.Z=THE_Z;
 
 
-				tri.V[0] = &P0; 
+				tri.V[0] = &P0;
 				tri.V[1] = &P1;
 				tri.V[2] = &P2;
-				
+
 				tri.N = &normal;
 
 				tri.Compute_Normal();
@@ -276,10 +276,10 @@ Bool WBHeightMap::Cast_Ray(RayCollisionTestClass & raytest)
 					return true;
 
 				//top triangle
-				tri.V[0] = &P2; 
+				tri.V[0] = &P2;
 				tri.V[1] = &P3;
 				tri.V[2] = &P0;
-				
+
 				tri.N = &normal;
 
 				tri.Compute_Normal();
@@ -311,7 +311,7 @@ void WBHeightMap::Render(RenderInfoClass & rinfo)
 	FlatHeightMapRenderObjClass::Render(rinfo);
 #else
 	HeightMapRenderObjClass::Render(rinfo);
-#endif 
+#endif
 }
 
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WBPopupSlider.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WBPopupSlider.cpp
index 88f72a3333d..fb744e422c7 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WBPopupSlider.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WBPopupSlider.cpp
@@ -31,7 +31,7 @@
 
 void WBPopupSliderButton::SetupPopSliderButton
 (
-	CWnd *pParentWnd, 
+	CWnd *pParentWnd,
 	long controlID,
 	PopupSliderOwner *pOwner
 )
@@ -78,7 +78,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // WBPopupSliderButton message handlers
 
-void WBPopupSliderButton::OnLButtonDown(UINT nFlags, CPoint point) 
+void WBPopupSliderButton::OnLButtonDown(UINT nFlags, CPoint point)
 {
 nFlags;
 point;
@@ -207,7 +207,7 @@ void PopupSlider::MoveThumbUnderMouse(int xNew)
 	InvalidateRect(&iconRect, FALSE);
 
 	m_curValue = newVal;
-	
+
 	GetThumbIconRect(&iconRect);
 	iconRect.InflateRect(3, 3);
 	InvalidateRect(&iconRect, FALSE);
@@ -218,12 +218,12 @@ void PopupSlider::MoveThumbUnderMouse(int xNew)
 // PopupSlider static member functions
 
 void PopupSlider::New(CWnd *pParentWnd, long kind,
-						  PopupSliderOwner *pSliderOwner, 
+						  PopupSliderOwner *pSliderOwner,
 						  long sliderID)
 {
 	PopupSlider * pPopupSlider;
 
-	DEBUG_ASSERTCRASH(((SB_HORZ == kind) || (SB_VERT == kind)), 
+	DEBUG_ASSERTCRASH(((SB_HORZ == kind) || (SB_VERT == kind)),
 					("PopupSlider - unexpected kind of slider!"));
 
 	DEBUG_ASSERTCRASH(pSliderOwner, ("slider owner is NULL!"));
@@ -256,12 +256,10 @@ void PopupSlider::New(CWnd *pParentWnd, long kind,
 		member function */
 	} catch (...) {
 		// don't rethrow
-		if (pPopupSlider) {
-			delete pPopupSlider;
-			pPopupSlider = NULL;
-		}
+		delete pPopupSlider;
+		pPopupSlider = NULL;
 
-	}	// catch
+	}
 
 	gPopupSlider = pPopupSlider;
 	// gPopupSlider will be deleted when its PostNcDestroy method is called
@@ -270,7 +268,7 @@ void PopupSlider::New(CWnd *pParentWnd, long kind,
 /////////////////////////////////////////////////////////////////////////////
 // PopupSlider
 
-PopupSlider::PopupSlider() 
+PopupSlider::PopupSlider()
 {
 	mSliderOwner = NULL;
 
@@ -311,7 +309,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // PopupSlider message handlers
 
-BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd) 
+BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd)
 {
 	BOOL retVal;
 
@@ -320,8 +318,8 @@ BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd)
 			throw(-1);
 		}
 
-		mIcon = (HICON) LoadImage(AfxGetResourceHandle(), 
-				MAKEINTRESOURCE(IDI_Thumb), 
+		mIcon = (HICON) LoadImage(AfxGetResourceHandle(),
+				MAKEINTRESOURCE(IDI_Thumb),
 				IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS);
 
 
@@ -339,10 +337,10 @@ BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd)
 		CRect winRect(rect.right - winWidth, rect.bottom, rect.right, rect.bottom + winHeight);
 
 		// we'll just use "this" for the child ID
-		if (FALSE == CWnd::CreateEx(dwExStyle, (LPCTSTR) className, "", 
+		if (FALSE == CWnd::CreateEx(dwExStyle, (LPCTSTR) className, "",
 							  dwStyle, winRect.left, winRect.top,
-							  winRect.Width(), winRect.Height(), 
-							  pParentWnd->GetSafeHwnd(), 
+							  winRect.Width(), winRect.Height(),
+							  pParentWnd->GetSafeHwnd(),
 							  NULL, NULL))
 			throw(-1);
 
@@ -352,7 +350,7 @@ BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd)
 			// Calculate the center of the parent window
 			CPoint parentWindowCenter;
 			GetCursorPos(&parentWindowCenter);
-			
+
 			// Calculate the center of the thumb
 			CRect iconRect;
 			GetThumbIconRect(&iconRect);
@@ -374,7 +372,7 @@ BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd)
 			myWindowRect.OffsetRect(hAdjustToCenter, vAdjustToCenter);
 			SetWindowPos(NULL, myWindowRect.left, myWindowRect.top, myWindowRect.Width(), myWindowRect.Height(), SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOREDRAW);
 		}
-		
+
 		// finally, make sure the window appears on screen
 		//MakeSureWindowIsVisible(GetSafeHwnd());
 		ShowWindow(SW_SHOW);
@@ -386,19 +384,19 @@ BOOL PopupSlider::Create(const RECT& rect, CWnd* pParentWnd)
 	} catch (...) {
 		// don't rethrow
 		retVal = FALSE;
-	}	// catch
+	}
 
 	return retVal;
 }
 
-void PopupSlider::PostNcDestroy() 
+void PopupSlider::PostNcDestroy()
 {
 	if (mSliderOwner && (m_valOnLastFinished != m_curValue)) {
 		mSliderOwner->PopSliderFinished(mSliderID, m_curValue);
 	}
 
 	CWnd::PostNcDestroy();
-	
+
 	// now that the window has gone away, delete ourselves
 	if (gPopupSlider == this) {
 		delete gPopupSlider;
@@ -406,7 +404,7 @@ void PopupSlider::PostNcDestroy()
 	}
 }
 
-void PopupSlider::OnPaint() 
+void PopupSlider::OnPaint()
 {
 	CPaintDC dc(this); // device context for painting
 	CRect rc;
@@ -415,7 +413,7 @@ void PopupSlider::OnPaint()
 	CPen cpen(PS_NULL, 0, RGB(0x00, 0x00, 0x00));
 	CPen *pPenOld;
 	COLORREF ulColor, brColor;
-	
+
 	pCbrOld = dc.SelectObject(&cbr);
 	pPenOld = dc.SelectObject(&cpen);
 
@@ -446,7 +444,7 @@ void PopupSlider::OnPaint()
 	// Do not call CWnd::OnPaint() for painting messages
 }
 
-void PopupSlider::OnLButtonDown(UINT nFlags, CPoint point) 
+void PopupSlider::OnLButtonDown(UINT nFlags, CPoint point)
 {
 nFlags;
 	CRect rc;
@@ -499,11 +497,11 @@ nFlags;
 	}
 }
 
-void PopupSlider::OnLButtonUp(UINT nFlags, CPoint point) 
+void PopupSlider::OnLButtonUp(UINT nFlags, CPoint point)
 {
 	if (mDraggingThumb) {
 		mDraggingThumb = false;
-		
+
 		if (mSliderOwner) {
 			try {
 				mSliderOwner->PopSliderChanged(mSliderID, m_curValue);
@@ -525,7 +523,7 @@ void PopupSlider::OnLButtonUp(UINT nFlags, CPoint point)
 	mClickThrough = false;
 }
 
-void PopupSlider::OnDestroy() 
+void PopupSlider::OnDestroy()
 {
 	mEverMoved = false;
 	ReleaseCapture();
@@ -534,7 +532,7 @@ void PopupSlider::OnDestroy()
 }
 
 
-void PopupSlider::OnMouseMove(UINT nFlags, CPoint point) 
+void PopupSlider::OnMouseMove(UINT nFlags, CPoint point)
 {
 	if (!mSetOrigPt) {
 		mOrigPt = point;
@@ -579,11 +577,11 @@ void PopupSlider::OnMouseMove(UINT nFlags, CPoint point)
 			if (mSliderOwner) {
 				mSliderOwner->PopSliderChanged(mSliderID, m_curValue);
 			}
-		}	// if (PtInRect)
+		}
 	}
 }
 
-void PopupSlider::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) 
+void PopupSlider::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 {
 	CWnd::OnKeyDown(nChar, nRepCnt, nFlags);
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
index 024136eeef2..186fbd80e79 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
@@ -20,7 +20,7 @@
 // Class to encapsulate height map.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 #include "Common/STLTypedefs.h"
 #include "WHeightMapEdit.h"
@@ -43,11 +43,6 @@
 
 #include "Common/DataChunk.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 int WorldHeightMapEdit::m_numGlobalTextureClasses=0;
 TGlobalTextureClass WorldHeightMapEdit::m_globalTextureClasses[NUM_TEXTURE_CLASSES];
@@ -125,9 +120,9 @@ WorldHeightMapEdit::WorldHeightMapEdit(Int width, Int height, UnsignedByte initi
 	m_numCliffInfo = 1;
 	// Note - we have one less cell than the width & height. But for paranoia, allocate
 	// extra row. jba.
-	// 
+	//
 	Int numBytesX = (m_width+7)/8;	//how many bytes to fit all bitflags
-	Int numBytesY = m_height;	
+	Int numBytesY = m_height;
 
 	m_flipStateWidth=numBytesX;
 
@@ -187,7 +182,7 @@ m_warnTooManyBlend(false)
 	m_alphaTexHeight = pThis->m_alphaTexHeight;
 	m_alphaEdgeHeight = pThis->m_alphaEdgeHeight;
 	m_width = pThis->m_width;
-#ifdef EVAL_TILING_MODES																		  
+#ifdef EVAL_TILING_MODES
 	m_tileMode = pThis->m_tileMode;
 #endif
 	m_height = pThis->m_height;
@@ -214,9 +209,9 @@ m_warnTooManyBlend(false)
 	m_cliffInfoNdxes = new Short[m_dataSize];
 	// Note - we have one less cell than the width & height. But for paranoia, allocate
 	// extra row. jba.
-	// 
+	//
 	Int numBytesX = (m_width+7)/8;	//how many bytes to fit all bitflags
-	Int numBytesY = m_height;	
+	Int numBytesY = m_height;
 
 	m_flipStateWidth=numBytesX;
 
@@ -260,7 +255,7 @@ m_warnTooManyBlend(false)
  WorldHeightMapEdit - read a height map from a file.
  Just calls WorldHeightMap::WorldHeightMap(FILE *pStrm),
  then loads the texture classes.
-*/	 
+*/
 WorldHeightMapEdit::WorldHeightMapEdit(ChunkInputStream *pStrm):
 	WorldHeightMap(pStrm),
 	m_warnTooManyTex(false),
@@ -286,7 +281,7 @@ WorldHeightMapEdit::WorldHeightMapEdit(ChunkInputStream *pStrm):
 	// check for missing texture classes.
 	for (i=0; i<m_numTextureClasses; i++) {
 		if (m_textureClasses[i].globalTextureClass < 0) {
-			TerrainModal modalTerrainDlg(m_textureClasses[i].name, this);	
+			TerrainModal modalTerrainDlg(m_textureClasses[i].name, this);
 			if (IDOK==modalTerrainDlg.DoModal()) {
 				Int globalTex = modalTerrainDlg.getNewNdx();
 				m_textureClasses[i].globalTextureClass = globalTex;
@@ -331,13 +326,13 @@ Bool WorldHeightMapEdit::remapTextures(void)
 	Int i;
 	Bool anyChanges;
 	for (i=0; i<m_numTextureClasses; i++) {
-		TerrainModal modalTerrainDlg(m_textureClasses[i].name, this);	
+		TerrainModal modalTerrainDlg(m_textureClasses[i].name, this);
 		if (IDOK==modalTerrainDlg.DoModal()) {
 			Int globalTex = modalTerrainDlg.getNewNdx();
 			m_textureClasses[i].globalTextureClass = globalTex;
 			anyChanges = true;
 			m_textureClasses[i].name = m_globalTextureClasses[globalTex].name;
-		} 
+		}
 	}
 	if (anyChanges) {
 		optimizeTiles();
@@ -349,7 +344,7 @@ Bool WorldHeightMapEdit::remapTextures(void)
 void WorldHeightMapEdit::loadBitmap(char *path, const char *uiName)
 {
 	CachedFileInputStream stream;
-	if (!stream.open(AsciiString(path))) 
+	if (!stream.open(AsciiString(path)))
 	{
 		return;
 	}
@@ -390,11 +385,11 @@ void WorldHeightMapEdit::loadBitmap(char *path, const char *uiName)
 }
 
 /// Load the available bitmap images.
-void WorldHeightMapEdit::loadBaseImages(void) 
+void WorldHeightMapEdit::loadBaseImages(void)
 {
- 
- 	/// @todo - take this out when we are done evaluating terrain textures. 
-#if (defined(RTS_DEBUG) || defined(RTS_INTERNAL))
+
+ 	/// @todo - take this out when we are done evaluating terrain textures.
+#if defined(RTS_DEBUG)
  	loadDirectoryOfImages("..\\TestArt\\TestTerrain");
 #endif
 
@@ -405,44 +400,41 @@ void WorldHeightMapEdit::loadBaseImages(void)
 	     terrain;
 			 terrain = TheTerrainTypes->nextTerrain( terrain ) )
 	{
-		 if (m_numGlobalTextureClasses == NUM_TEXTURE_CLASSES) 
+		 if (m_numGlobalTextureClasses == NUM_TEXTURE_CLASSES)
 		 {
 			 break;
 		 }
 		// load the terrain definition for the WorldBuilder to reference
 		loadImagesFromTerrainType( terrain );
 
-	}  // end for
+	}
 
 }
 
 /// Loads all the images in a directory (including subdirectories)
-void WorldHeightMapEdit::loadDirectoryOfImages(const char *pFilePath) 
+void WorldHeightMapEdit::loadDirectoryOfImages(const char *pFilePath)
 {
 	char				dirBuf[_MAX_PATH];
-	char				findBuf[_MAX_PATH];
 	char				fileBuf[_MAX_PATH];
 
-	strcpy(dirBuf, pFilePath);
+	strlcpy(dirBuf, pFilePath, ARRAY_SIZE(dirBuf));
 	int len = strlen(dirBuf);
 
 	if (len > 0 && dirBuf[len - 1] != '\\') {
 		dirBuf[len++] = '\\';
 		dirBuf[len] = 0;
 	}
-	strcpy(findBuf, dirBuf);
 
 	FilenameList filenameList;
-	TheFileSystem->getFileListInDirectory(AsciiString(findBuf), AsciiString("*.*"), filenameList, TRUE);
+	TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), "*.*", filenameList, TRUE);
 
-	if (filenameList.size() == 0) {
+	if (filenameList.empty()) {
 		return;
 	}
 	FilenameList::iterator it = filenameList.begin();
 	do {
 		AsciiString filename = *it;
-		//strcpy(fileBuf, dirBuf);
-		strcpy(fileBuf, filename.str());
+		strlcpy(fileBuf, filename.str(), ARRAY_SIZE(fileBuf));
 		loadBitmap(fileBuf, filename.str());
 
 		++it;
@@ -462,7 +454,7 @@ void WorldHeightMapEdit::loadImagesFromTerrainType( TerrainType *terrain )
 	char buffer[ _MAX_PATH ];
 
 	// build path to texture file
-	sprintf( buffer, "%s%s", TERRAIN_TGA_DIR_PATH, terrain->getTexture().str() );
+	snprintf( buffer, ARRAY_SIZE(buffer), "%s%s", TERRAIN_TGA_DIR_PATH, terrain->getTexture().str() );
 
 	// create ascii string for texture path
 	AsciiString texturePath( buffer );
@@ -512,7 +504,7 @@ void WorldHeightMapEdit::loadImagesFromTerrainType( TerrainType *terrain )
 	m_globalTextureClasses[ texToUse ].isBlendEdgeTile = terrain->isBlendEdge();
 	m_numGlobalTextureClasses++;
 
-}																													
+}
 
 UnsignedByte * WorldHeightMapEdit::getPointerToClassTileData(Int texClass)
 {
@@ -538,7 +530,7 @@ void WorldHeightMapEdit::getTexClassNeighbors(Int xIndex, Int yIndex, Int textur
 		for (j=yIndex-1; j<yIndex+2; j++) {
 			if (i==xIndex && j==yIndex) continue;  // don't count self.
 			// Use x and y for indexing, in case we are along an edge.
-			// If we fall off the edge, clamp to the edge so that 
+			// If we fall off the edge, clamp to the edge so that
 			// tiles on the edge have 8 neighbors too.
 			Int x = i;
 			Int y = j;
@@ -566,27 +558,27 @@ void WorldHeightMapEdit::getTexClassNeighbors(Int xIndex, Int yIndex, Int textur
 
 //
 /// SaveToFile - saves a height map to a file.
-// Format is 
+// Format is
 //		tag - 4 bytes 'HtMp'
 //		version - 2 bytes
 //		width, height, length - 4 byte Int little endian.
-// 
+//
 //		length bytes of map data.
 //		length bytes of tile ndxes.
 //		numBitmapTiles, numBlendedTiles - 4 byte int little endian
 //		numBlendedTiles of tile data.
-//		
-//		
+//
+//
 //
 void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 {
-	// This is the chunk writer stuff.  
+	// This is the chunk writer stuff.
 	int i;
 
 	/**********HEIGHT MAP DATA ***********************/
 	chunkWriter.openDataChunk("HeightMapData", K_HEIGHT_MAP_VERSION_4);
 	Int numBoundaries = m_boundaries.size();
-		chunkWriter.writeInt(m_width);	
+		chunkWriter.writeInt(m_width);
 		chunkWriter.writeInt(m_height);
 		chunkWriter.writeInt(m_borderSize);
 		chunkWriter.writeInt(numBoundaries);
@@ -604,7 +596,7 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 		chunkWriter.writeInt(m_dataSize);
 		chunkWriter.writeArrayOfBytes((char *)m_data, m_dataSize);
 	*/
-		
+
 	chunkWriter.closeDataChunk();
 
 	/***************BLEND TILE DATA ***************/
@@ -626,7 +618,7 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 			chunkWriter.writeInt(m_textureClasses[i].firstTile);
 			chunkWriter.writeInt(m_textureClasses[i].numTiles);
 			chunkWriter.writeInt(m_textureClasses[i].width);
-			chunkWriter.writeInt(0); 
+			chunkWriter.writeInt(0);
 			chunkWriter.writeAsciiString(m_textureClasses[i].name);
 		}
 
@@ -678,7 +670,7 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 	/* important, must write this chunk BEFORE the player-list chunk */
 	MapObject::getWorldDict()->setInt(TheKey_weather, (Int)TheGlobalData->m_weather);
 	chunkWriter.openDataChunk("WorldInfo", K_WORLDDICT_VERSION_1);
-	chunkWriter.writeDict(*MapObject::getWorldDict());	
+	chunkWriter.writeDict(*MapObject::getWorldDict());
 	chunkWriter.closeDataChunk();
 
 	/***************PLAYER DATA ***************/
@@ -687,9 +679,9 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 
 	/***************OBJECTS DATA ***************/
 	chunkWriter.openDataChunk("ObjectsList", 	K_OBJECTS_VERSION_3);
-		
+
 	MapObject *pObj;
-	for (pObj = MapObject::getFirstMapObject(); pObj; pObj = pObj->getNext()) 
+	for (pObj = MapObject::getFirstMapObject(); pObj; pObj = pObj->getNext())
 	{
 		chunkWriter.openDataChunk("Object", 	K_OBJECTS_VERSION_3);
 			Coord3D loc = *pObj->getLocation();
@@ -697,15 +689,15 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 			chunkWriter.writeReal( loc.y);
 			chunkWriter.writeReal( loc.z);
 			chunkWriter.writeReal( pObj->getAngle());
-			chunkWriter.writeInt(pObj->getFlags()); 
-			chunkWriter.writeAsciiString(pObj->getName());	
+			chunkWriter.writeInt(pObj->getFlags());
+			chunkWriter.writeAsciiString(pObj->getName());
 
-			chunkWriter.writeDict(*pObj->getProperties());	
+			chunkWriter.writeDict(*pObj->getProperties());
 
 #ifdef NOT_IN_USE
 			if (pObj->getFlag(FLAG_WAYPOINT)) {
-				chunkWriter.writeInt(pObj->getWaypointID()); 
-				chunkWriter.writeAsciiString(AsciiString(pObj->getWaypointName()));	
+				chunkWriter.writeInt(pObj->getWaypointID());
+				chunkWriter.writeAsciiString(AsciiString(pObj->getWaypointName()));
 			}
 			else if (pObj->getFlag(FLAG_LIGHT)) {
 				TLightInfo info;
@@ -790,7 +782,7 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 		DEBUG_ASSERTCRASH(texClass>=0,("oops"));
 	}
 #endif
-	
+
 }
 
 //
@@ -799,7 +791,7 @@ void WorldHeightMapEdit::saveToFile(DataChunkOutput &chunkWriter)
 
 WorldHeightMapEdit *WorldHeightMapEdit::duplicate(void)
 {
-	WorldHeightMapEdit *newMap = new WorldHeightMapEdit(this); 
+	WorldHeightMapEdit *newMap = new WorldHeightMapEdit(this);
 	if (newMap->m_data == NULL) {
 		delete newMap;
 		return(NULL);
@@ -809,8 +801,8 @@ WorldHeightMapEdit *WorldHeightMapEdit::duplicate(void)
 
 
 
-Bool WorldHeightMapEdit::setTileNdx(Int xIndex, Int yIndex, Int textureClass, Bool singleTile) 
-{ 
+Bool WorldHeightMapEdit::setTileNdx(Int xIndex, Int yIndex, Int textureClass, Bool singleTile)
+{
 	Int ndx = (yIndex*m_width)+xIndex;
 	Int numClasses = m_numTextureClasses;
 	DEBUG_ASSERTCRASH(ndx>=0 && ndx<this->m_dataSize,("oops"));
@@ -827,7 +819,7 @@ Bool WorldHeightMapEdit::setTileNdx(Int xIndex, Int yIndex, Int textureClass, Bo
 	return (numClasses<m_numTextureClasses);
 }
 /* return index of globalTextureClass corresponding to texture holding this tile*/
-Int WorldHeightMapEdit::getTextureClassFromNdx(Int tileNdx) 
+Int WorldHeightMapEdit::getTextureClassFromNdx(Int tileNdx)
 {
 	Int i;
 	tileNdx = tileNdx>>2;
@@ -836,7 +828,7 @@ Int WorldHeightMapEdit::getTextureClassFromNdx(Int tileNdx)
 			continue;
 		}
 		// see if the blend tile is in a texture class, and get the right tile for xIndex, yIndex.
-		if (tileNdx >= m_textureClasses[i].firstTile && 
+		if (tileNdx >= m_textureClasses[i].firstTile &&
 			tileNdx < m_textureClasses[i].firstTile+m_textureClasses[i].numTiles) {
 			return(m_textureClasses[i].globalTextureClass);
 		}
@@ -877,13 +869,13 @@ Int WorldHeightMapEdit::getTileIndexFromTerrainType( TerrainType *terrain )
 	// not found
 	return -1;
 
-}  // end getTileIndexFromTerrainType
+}
 
 Int WorldHeightMapEdit::allocateTiles(Int textureClass)
 {
 //	int tileNdx = 0;
 	if (textureClass >= 0 && textureClass <m_numGlobalTextureClasses) {
-		Int firstTile = getFirstTile(textureClass); 
+		Int firstTile = getFirstTile(textureClass);
 		if (firstTile >= 0) return firstTile;
 		// hasn't been copied into m_sourceTiles yet.
 		if (this->m_numBitmapTiles + m_globalTextureClasses[textureClass].numTiles>NUM_SOURCE_TILES) {
@@ -911,7 +903,7 @@ Int WorldHeightMapEdit::allocateTiles(Int textureClass)
 		}
 		Int numTiles = m_globalTextureClasses[textureClass].numTiles;
 		for (i=0; i<numTiles; i++) {
-			REF_PTR_SET(m_sourceTiles[m_numBitmapTiles+i],m_globalTextureClasses[textureClass].tiles[i]); 
+			REF_PTR_SET(m_sourceTiles[m_numBitmapTiles+i],m_globalTextureClasses[textureClass].tiles[i]);
 		}
 		m_numBitmapTiles += numTiles;
 		return firstTile;
@@ -924,7 +916,7 @@ Int WorldHeightMapEdit::allocateEdgeTiles(Int globalTextureClass)
 {
 	if (globalTextureClass >= 0 && globalTextureClass <m_numGlobalTextureClasses) {
 		Int localClass;
-		Int firstTile = -1; 
+		Int firstTile = -1;
 		for (localClass=0; localClass<m_numEdgeTextureClasses; localClass++) {
 			Int globalClass = m_edgeTextureClasses[localClass].globalTextureClass;
 			if (globalClass == globalTextureClass) {
@@ -959,7 +951,7 @@ Int WorldHeightMapEdit::allocateEdgeTiles(Int globalTextureClass)
 		}
 		Int numTiles = m_globalTextureClasses[globalTextureClass].numTiles;
 		for (i=0; i<numTiles; i++) {
-			REF_PTR_SET(m_edgeTiles[m_numEdgeTiles+i],m_globalTextureClasses[globalTextureClass].tiles[i]); 
+			REF_PTR_SET(m_edgeTiles[m_numEdgeTiles+i],m_globalTextureClasses[globalTextureClass].tiles[i]);
 		}
 		m_numEdgeTiles += numTiles;
 		return localClass;
@@ -974,20 +966,20 @@ Int WorldHeightMapEdit::getTileNdxForClass(Int xIndex, Int yIndex, Int textureCl
 {
 	int tileNdx = 0;
 	if (textureClass >= 0 && textureClass <m_numGlobalTextureClasses) {
-		Int firstTile = getFirstTile(textureClass); //search used TextureClasses for one with the same globalTextureIndex 
+		Int firstTile = getFirstTile(textureClass); //search used TextureClasses for one with the same globalTextureIndex
 		DEBUG_ASSERTCRASH(!m_globalTextureClasses[textureClass].isBlendEdgeTile, ("Shouldn't use blend edge tiles for tiling."));
 		if (firstTile == -1) {
 			firstTile = allocateTiles(textureClass);
 		}
 		if (firstTile<0) return 0;
 
-		Int width = m_globalTextureClasses[textureClass].width; 
-		tileNdx = firstTile + ((xIndex/2)%width) + 
+		Int width = m_globalTextureClasses[textureClass].width;
+		tileNdx = firstTile + ((xIndex/2)%width) +
 			width*((yIndex/2)%width);	//2 terrain cells across tile so divide by 2
 		/* there are actually 4 subcells in a tile.  So be funky. :) */
 		tileNdx = tileNdx << 2;
 		Int ySubIndex = yIndex&0x01;
-		Int xSubIndex = xIndex&0x01;;
+		Int xSubIndex = xIndex&0x01;
 		tileNdx += 2*ySubIndex;
 		tileNdx += xSubIndex;
 	}
@@ -1001,7 +993,7 @@ Int WorldHeightMapEdit::getTileNdxForClass(Int xIndex, Int yIndex, Int textureCl
 Bool WorldHeightMapEdit::canFitTexture(Int textureClass)
 {
 	if (textureClass >= 0 && textureClass <m_numGlobalTextureClasses) {
-		Int firstTile = getFirstTile(textureClass); 
+		Int firstTile = getFirstTile(textureClass);
 		if (firstTile >= 0) return true; // already present.
 		if (this->m_numBitmapTiles + m_globalTextureClasses[textureClass].numTiles>NUM_SOURCE_TILES) {
 			// No room at the inn.
@@ -1029,12 +1021,12 @@ Bool WorldHeightMapEdit::canFitTexture(Int textureClass)
 }
 
 
-void WorldHeightMapEdit::blendTile(Int xIndex, Int yIndex, Int srcXIndex, Int srcYIndex, Int textureClass, Int edgeClass) 
+void WorldHeightMapEdit::blendTile(Int xIndex, Int yIndex, Int srcXIndex, Int srcYIndex, Int textureClass, Int edgeClass)
 {
 	Int ndx = (srcYIndex*m_width)+srcXIndex;
 	Int blendTileNdx = m_tileNdxes[ndx];	//source tile
 
-	ndx = (yIndex*m_width)+xIndex;			
+	ndx = (yIndex*m_width)+xIndex;
 	Int curTileNdx = m_tileNdxes[ndx];		//destination tile
 
 	if (textureClass < 0) {
@@ -1046,13 +1038,13 @@ void WorldHeightMapEdit::blendTile(Int xIndex, Int yIndex, Int srcXIndex, Int sr
 	}
 
 	if (curTileNdx == blendTileNdx) {//destination already contains continuation of source tile so no blend needed.
-		m_tileNdxes[ndx] = blendTileNdx;	
+		m_tileNdxes[ndx] = blendTileNdx;
 		m_blendTileNdxes[ndx] = 0;
 		m_extraBlendTileNdxes[ndx] = 0;
 		return;
 	}
 	//Updates m_blendTileNdxes[] for this coordinate with index into m_blendedTiles[]
-	blendSpecificTiles(xIndex, yIndex, srcXIndex, srcYIndex, curTileNdx, blendTileNdx, false, edgeClass); 
+	blendSpecificTiles(xIndex, yIndex, srcXIndex, srcYIndex, curTileNdx, blendTileNdx, false, edgeClass);
 }
 
 /*Allocate a new blend description or return existing one out of m_blendedTiles[] and increment m_numBlendedTiles*/
@@ -1092,7 +1084,7 @@ Int WorldHeightMapEdit::findOrCreateBlendTile(TBlendTileInfo *pBlendInfo)
 /*Blend blendTileNdx over curTileNdx. Blend from srcIndex to Index coordinates.
 Updates m_blendTileNdxes[] for this coordinate with index into m_blendedTiles[]*/
 void WorldHeightMapEdit::blendSpecificTiles(Int xIndex, Int yIndex, Int srcXIndex, Int srcYIndex,
-									Int curTileNdx, Int blendTileNdx, Bool longDiagonal, Int edgeClass) 
+									Int curTileNdx, Int blendTileNdx, Bool longDiagonal, Int edgeClass)
 {
 	TBlendTileInfo blendInfo;
 	blendInfo.blendNdx=blendTileNdx;	//store the tile that will blend over existing tile
@@ -1179,7 +1171,7 @@ void WorldHeightMapEdit::blendSpecificTiles(Int xIndex, Int yIndex, Int srcXInde
 				TBlendTileInfo tempBlendTileInfo=m_blendedTiles[m_blendTileNdxes[ndx]];
 				tempBlendTileInfo.inverted |= FLIPPED_MASK;
 				Short newNdx = findOrCreateBlendTile(&tempBlendTileInfo);
-				m_blendTileNdxes[ndx] = newNdx;	//remap this tile to use a new one. 
+				m_blendTileNdxes[ndx] = newNdx;	//remap this tile to use a new one.
 			}
 		}
 		else
@@ -1196,7 +1188,7 @@ void WorldHeightMapEdit::blendSpecificTiles(Int xIndex, Int yIndex, Int srcXInde
 		The edges are blended out, to whatever texture is already there.
 		If edgeClass == -1, use an alpha blend.  Otherwise, use tile class edgeClass.
 */
-void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClass) 
+void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClass)
 {
 	Int ndx = (yIndex*m_width)+xIndex;
 	Int curTileClass = getTextureClass(xIndex, yIndex);
@@ -1213,9 +1205,9 @@ void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClas
 				}
 			}
 		}
-	}	
+	}
 	if (globalEdgeClass>=0) {
-		localEdgeClass = allocateEdgeTiles(globalEdgeClass); 
+		localEdgeClass = allocateEdgeTiles(globalEdgeClass);
 	}
 
 	Int i,j;
@@ -1250,7 +1242,7 @@ void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClas
 					continue;
 				}
 				if (curTileClass != getTextureClass(i,j, true)) {
-					// This is a not us tile.  If it is mostly surrounded by us, 
+					// This is a not us tile.  If it is mostly surrounded by us,
 					// convert it to us, cause if we blend in from 3 sides, it basically
 					// obliterates it.
 					Int sides, total;
@@ -1302,14 +1294,14 @@ void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClas
 			for (j=pCurNode->m_y-1; j<pCurNode->m_y+2; j++) {
 				if (j<0) continue;
 				if (j>=m_height) continue;
-//				int thisTexClass = 
+//				int thisTexClass =
 				curNdx = (j*m_width)+i;
 				if (pProcessed[curNdx]) {
 					continue;
 				}
 				// If already blended to us skip it.
-				if (m_blendTileNdxes[curNdx] > 0) {					 
-					if (curTileClass == getTextureClassFromNdx(m_blendedTiles[ m_blendTileNdxes[curNdx]].blendNdx)) {					
+				if (m_blendTileNdxes[curNdx] > 0) {
+					if (curTileClass == getTextureClassFromNdx(m_blendedTiles[ m_blendTileNdxes[curNdx]].blendNdx)) {
 						continue;
 					}
 				}
@@ -1323,7 +1315,7 @@ void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClas
 		delete pCurNode;
 	}
 
-	if (pProcessed) delete pProcessed;
+	delete[] pProcessed;
 	pProcessed = NULL;
 }
 
@@ -1333,8 +1325,8 @@ void WorldHeightMapEdit::autoBlendOut(Int xIndex, Int yIndex, Int globalEdgeClas
 		Used by auto edging.  The texture at xIndex, yIndex is being
 		edged into by surrounding textures of textureClass.
 */
-void WorldHeightMapEdit::blendToThisClass(Int xIndex, Int yIndex, 
-																					Int textureClass, Int edgeClass) 
+void WorldHeightMapEdit::blendToThisClass(Int xIndex, Int yIndex,
+																					Int textureClass, Int edgeClass)
 {
 	Int sides, total;
 	getTexClassNeighbors(xIndex, yIndex, textureClass, &sides, &total);
@@ -1410,7 +1402,7 @@ void WorldHeightMapEdit::blendToThisClass(Int xIndex, Int yIndex,
 					}
 				}
 			}
-		}	
+		}
 
 		Int blendTileNdx = getBlendTileNdxForClass(xIndex, yIndex, textureClass);
 		Int ndx = (yIndex*m_width)+xIndex;
@@ -1434,14 +1426,14 @@ void WorldHeightMapEdit::blendToThisClass(Int xIndex, Int yIndex,
 		Fills the region at xIndex, yIndex with the specified texture. DoReplace forces texture to
 		be replaced on entire map.
 */
-Bool WorldHeightMapEdit::floodFill(Int xIndex, Int yIndex, Int textureClass, Bool doReplace) 
+Bool WorldHeightMapEdit::floodFill(Int xIndex, Int yIndex, Int textureClass, Bool doReplace)
 {
 	Int ndx = (yIndex*m_width)+xIndex;
 	Int curTileClass = getTextureClass(xIndex, yIndex, true);
 	if (curTileClass < 0) {
 		return(false);
 	}
-	
+
 	if (curTileClass == textureClass) {
 		// already filled with this texture.
 		return(false);
@@ -1482,7 +1474,7 @@ Bool WorldHeightMapEdit::floodFill(Int xIndex, Int yIndex, Int textureClass, Boo
 			REF_PTR_RELEASE(m_terrainTex); // need to update the texture.
 			Int numTiles = m_globalTextureClasses[textureClass].numTiles;
 			for (i=0; i<numTiles; i++) {
-				REF_PTR_SET(m_sourceTiles[m_textureClasses[localClass].firstTile+i],m_globalTextureClasses[textureClass].tiles[i]); 
+				REF_PTR_SET(m_sourceTiles[m_textureClasses[localClass].firstTile+i],m_globalTextureClasses[textureClass].tiles[i]);
 			}
 			optimizeTiles();
 			return true;
@@ -1531,7 +1523,7 @@ Bool WorldHeightMapEdit::floodFill(Int xIndex, Int yIndex, Int textureClass, Boo
 				if (i>=m_width-1) continue;
 				for (j=pCurNode->m_y-1; j<pCurNode->m_y+2; j++) {
 					if (j<0) continue;
-					if (j>=m_height-1) continue;	 
+					if (j>=m_height-1) continue;
  					ndx = (j*m_width)+i;
 					blendNdx = m_blendTileNdxes[ndx];
 					if (curTileClass != getTextureClass(i,j,true)) {
@@ -1550,7 +1542,7 @@ Bool WorldHeightMapEdit::floodFill(Int xIndex, Int yIndex, Int textureClass, Boo
 						continue;  // skip corners.
 					}
 					if (curTileClass == getTextureClass(i,j,true)) {
-						// Matches the current fill, so flood into it, 
+						// Matches the current fill, so flood into it,
 						CProcessNode *pNewNode = new CProcessNode(i,j);
 						pNewNode->m_next = pNodesToProcess;
 						pNodesToProcess = pNewNode;
@@ -1635,7 +1627,7 @@ void WorldHeightMapEdit::showTileStatusInfo(void)
 	setHeight
 		This sets the height, and adjusts the cliff flag for the cells affected.
 */
-void WorldHeightMapEdit::setHeight(Int xIndex, Int yIndex, UnsignedByte height) { 
+void WorldHeightMapEdit::setHeight(Int xIndex, Int yIndex, UnsignedByte height) {
 		Int ndx = (yIndex*m_width)+xIndex;
 		if ((ndx>=0) && (ndx<m_dataSize) && m_data) m_data[ndx]=height;
 		setCellCliffFlagFromHeights(xIndex, yIndex);
@@ -1647,7 +1639,7 @@ void WorldHeightMapEdit::setHeight(Int xIndex, Int yIndex, UnsignedByte height)
 
 /******************************************************************
 	optimizeTiles
-		This optimizes the tiles and blend tiles, recalculating them 
+		This optimizes the tiles and blend tiles, recalculating them
 		and removing any unused ones.
 */
 Bool WorldHeightMapEdit::optimizeTiles(void)
@@ -1746,7 +1738,7 @@ Bool WorldHeightMapEdit::optimizeTiles(void)
 			m_extraBlendTileNdxes[i] = newBlendNdx;
 
 		}
-	}		
+	}
 	// Run through all the blend tiles changing tile index to class.
 	for (i=1; i<m_numCliffInfo; i++) {
 		Int texClass  = m_cliffInfo[i].tileIndex;
@@ -1759,13 +1751,13 @@ Bool WorldHeightMapEdit::optimizeTiles(void)
 	return(true);
 }
 
- 
+
 
 /** ****************************************************************
 	resize
 		Changes the size of the height map.
 */
-Bool WorldHeightMapEdit::resize(Int newXSize, Int newYSize, Int newHeight, Int newBorder, Bool anchorTop, Bool anchorBottom, 
+Bool WorldHeightMapEdit::resize(Int newXSize, Int newYSize, Int newHeight, Int newBorder, Bool anchorTop, Bool anchorBottom,
 							Bool anchorLeft, Bool anchorRight, Coord3D *pObjOffset)
 {
 	if (newBorder<0) newBorder = 0;
@@ -1808,18 +1800,18 @@ Bool WorldHeightMapEdit::resize(Int newXSize, Int newYSize, Int newHeight, Int n
 	Short *blendTileNdxes = new Short[newDataSize];
 	Short *extraBlendTileNdxes = new Short[newDataSize];
 	UnsignedByte *data = new UnsignedByte[newDataSize];
-	Short  *cliffInfoNdxes = new Short[newDataSize];  	
-	
+	Short  *cliffInfoNdxes = new Short[newDataSize];
+
 	Int i, j;
 	for (i=0; i<newXSize; i++) {
 		for (j=0; j<newYSize; j++) {
-			Int newNdx = i+j*newXSize;	
+			Int newNdx = i+j*newXSize;
 			Int oldI = i+xOffset;
 			Bool inRange = true;
 			if(oldI>=m_width-1) {
 				oldI=m_width-2;
 				inRange = false;
-			}	
+			}
 			if (oldI<0) {
 				oldI = 0;
 				inRange = false;
@@ -1875,13 +1867,13 @@ Bool WorldHeightMapEdit::resize(Int newXSize, Int newYSize, Int newHeight, Int n
 	// Verify index remapping
 	for(i=0; i<m_dataSize; i++) {
 		if (m_cliffInfoNdxes[i]<0 || m_cliffInfoNdxes[i]>= m_numCliffInfo) {
-			m_cliffInfoNdxes[i] = 0;		
+			m_cliffInfoNdxes[i] = 0;
 		}
 		if (m_blendTileNdxes[i]<0 || m_blendTileNdxes[i]>= m_numBlendedTiles) {
-			m_blendTileNdxes[i] = 0;		
+			m_blendTileNdxes[i] = 0;
 		}
 		if (m_extraBlendTileNdxes[i]<0 || m_extraBlendTileNdxes[i]>= m_numBlendedTiles) {
-			m_extraBlendTileNdxes[i] = 0;		
+			m_extraBlendTileNdxes[i] = 0;
 		}
 	}
 	initCliffFlagsFromHeights();
@@ -1892,7 +1884,7 @@ Bool WorldHeightMapEdit::resize(Int newXSize, Int newYSize, Int newHeight, Int n
 
 
 /** Returns true if the texture class is used in the current
-map.  If false, the texture is not used or loaded in the 
+map.  If false, the texture is not used or loaded in the
 current map. */
 Bool WorldHeightMapEdit::isTexClassUsed(Int textureClass)
 {
@@ -1905,7 +1897,7 @@ Bool WorldHeightMapEdit::isTexClassUsed(Int textureClass)
 	}
 	return(false);
 }
-	 
+
 /** Returns the first tile for a texture class.  If the class is not
 used, returns -1. */
 Int WorldHeightMapEdit::getFirstTile(Int textureClass)
@@ -1919,11 +1911,11 @@ Int WorldHeightMapEdit::getFirstTile(Int textureClass)
 	}
 	return(-1);
 }
-	
- 
+
+
 /**
  dbgVerifyAfterUndo - Verifies that the structure is consistent.
-*/	 
+*/
 void WorldHeightMapEdit::dbgVerifyAfterUndo(void)
 {
 #ifdef DEBUG_CRASHING
@@ -1942,7 +1934,7 @@ void WorldHeightMapEdit::dbgVerifyAfterUndo(void)
 		DEBUG_ASSERTCRASH((m_textureClasses[j].width == m_globalTextureClasses[globalClass].width),("oops"));
 		DEBUG_ASSERTCRASH((m_textureClasses[j].numTiles == m_globalTextureClasses[globalClass].numTiles),("oops"));
 		TileData *pTile = m_sourceTiles[m_textureClasses[j].firstTile];
-		DEBUG_ASSERTCRASH((pTile == m_globalTextureClasses[globalClass].tiles[0]),("oops")); 
+		DEBUG_ASSERTCRASH((pTile == m_globalTextureClasses[globalClass].tiles[0]),("oops"));
 		DEBUG_ASSERTCRASH((j == m_globalTextureClasses[globalClass].forDebugOnly_fileTextureClass),("oops"));
 	}
 
@@ -1955,9 +1947,9 @@ void WorldHeightMapEdit::dbgVerifyAfterUndo(void)
 			DEBUG_ASSERTCRASH((m_textureClasses[localClass].width == m_globalTextureClasses[i].width),("oops"));
 			DEBUG_ASSERTCRASH((m_textureClasses[localClass].numTiles == m_globalTextureClasses[i].numTiles),("oops"));
 			TileData *pTile = m_sourceTiles[m_textureClasses[localClass].firstTile];
-			DEBUG_ASSERTCRASH((pTile == m_globalTextureClasses[i].tiles[0]),("oops")); 
+			DEBUG_ASSERTCRASH((pTile == m_globalTextureClasses[i].tiles[0]),("oops"));
 			DEBUG_ASSERTCRASH((m_textureClasses[localClass].numTiles == m_globalTextureClasses[i].numTiles),("oops"));
-		} 
+		}
 	}
 
 	for (i=0; i<m_numTextureClasses; i++) {
@@ -2078,7 +2070,7 @@ Bool WorldHeightMapEdit::selectSimilar(void)
 	for (selectedObj=firstObj; selectedObj; selectedObj=selectedObj->getNext()) {
 		if (selectedObj->getFlag(FLAG_ROAD_FLAGS)) {
 			continue;
-		} 
+		}
 		if (selectedObj->isSelected()) {
 			anySelected = true;
 			break;
@@ -2095,12 +2087,12 @@ Bool WorldHeightMapEdit::selectSimilar(void)
 
 		if (otherObj->getFlag(FLAG_ROAD_FLAGS)) {
 			continue;
-		} 
+		}
 
 		Bool exists;
 		AsciiString layerName = otherObj->getProperties()->getAsciiString(TheKey_objectLayer, &exists);
 		if (exists && TheLayersList->isLayerHidden(layerName)) {
-			continue;			
+			continue;
 		}
 
 		otherObj->setSelected(true);
@@ -2135,7 +2127,7 @@ Bool WorldHeightMapEdit::selectInvalidTeam(void)
 	for (obj=MapObject::TheMapObjectListPtr; obj; obj=obj->getNext()) {
 		if (obj->getFlag(FLAG_ROAD_FLAGS)) {
 			continue;
-		} 
+		}
 
 		const Dict *d = obj->getProperties();
 		if (d)
@@ -2163,11 +2155,11 @@ Bool WorldHeightMapEdit::selectInvalidTeam(void)
 		}
 	}
 
-	AsciiString report = "";
+	AsciiString report;
 	AsciiString line;
 
 #if 0
-	// I'm removing this because its causing buffer overflows, and we're really interested in 
+	// I'm removing this because its causing buffer overflows, and we're really interested in
 	// teams that are invalid anyways. I've confirmed that this is okay behavior with JL. (jkmcd)
 	for (it=validTeamNames.begin(); it!=validTeamNames.end(); ++it)
 	{
@@ -2185,7 +2177,7 @@ Bool WorldHeightMapEdit::selectInvalidTeam(void)
 
 	if (anySelected)
 	{
-		DEBUG_LOG(("%s\n", report.str()));
+		DEBUG_LOG(("%s", report.str()));
 		MessageBox(NULL, report.str(), "Missing team report", MB_OK);
 	}
 
@@ -2200,7 +2192,7 @@ AsciiString WorldHeightMapEdit::getTexClassUiName(int ndx)
 {
 	return(m_globalTextureClasses[ndx].uiName);
 }
- 
+
 static const Real HEIGHT_SCALE = MAP_HEIGHT_SCALE / MAP_XY_FACTOR;
 static const Real STRETCH_LIMIT = 1.5f;	 // If it is stretching less than this, don't adjust.
 static inline Int IABS(Int x) {	if (x>=0) return x; return -x;};
@@ -2215,7 +2207,7 @@ static Bool debugToggle = true;
 	doCliffAdjustment
 		Does a cliff adjustment the region at xIndex, yIndex.
 */
-Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex) 
+Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 {
 
 	debugToggle = !debugToggle;
@@ -2226,7 +2218,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 		return(false);
 	}
 	Real textureClassExtent = m_globalTextureClasses[curTileClass].width*TILE_PIXEL_EXTENT;
-	textureClassExtent /= TEXTURE_WIDTH; 
+	textureClassExtent /= TEXTURE_WIDTH;
 	Real startU = textureClassExtent/2;	// Center in the texture.
 	Real startV = 0; // We'll adjust the V values later.
 
@@ -2250,13 +2242,13 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 	uvRange.lo.y = 1;
 	uvRange.hi.x = -1;
 	uvRange.hi.y = -1;
-	
+
 
 	pNodesToProcess = new CProcessNode(xIndex, yIndex);
 	while (pNodesToProcess) {
 		CProcessNode *pCurNode = pNodesToProcess;
 		pNodesToProcess = pCurNode->m_next;
-		pCurNode->m_next = NULL;			 
+		pCurNode->m_next = NULL;
 
 		if (pNodesToProcess == NULL) {
 			if (pMutantNodes) {
@@ -2445,11 +2437,11 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 					if (i==pCurNode->m_x && j==pCurNode->m_y) continue;
 					if (i!=pCurNode->m_x && j!=pCurNode->m_y) continue;
 					if (j<0) continue;
-					if (j>=m_height-1) continue;	 
+					if (j>=m_height-1) continue;
  					ndx = (j*m_width)+i;
 					if (pProcessed[ndx]) continue;
 					CProcessNode *pNewNode = new CProcessNode(i,j);
-					DEBUG_LOG(("Adding node %d, %d\n", i, j));
+					DEBUG_LOG(("Adding node %d, %d", i, j));
 					pNodes[k++]	= pNewNode;
 					Real dx, dy;
 					if (i<pCurNode->m_x) {
@@ -2468,10 +2460,10 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 						// top.
 						dx = cliffInfo.u2 - cliffInfo.u3;
 						dy = cliffInfo.v2 - cliffInfo.v3;
-					}	
+					}
 					pNewNode->m_len = dx*dx + dy*dy;
 				}
-			}	
+			}
 			while (k)	{
 				Real maxLen = -1;
 				Int curNdx = -1;
@@ -2483,7 +2475,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 						}
 					}
 				}
-				if (curNdx>=0) { 
+				if (curNdx>=0) {
 					if (cliffInfo.mutant) {
 						pNodes[curNdx]->m_next = pMutantNodes;
 						pMutantNodes = pNodes[curNdx];
@@ -2491,7 +2483,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 					}	else {
 						if (pProcessTail) {
 							pProcessTail->m_next = pNodes[curNdx];
-						} 
+						}
 						pProcessTail = pNodes[curNdx];
 						if (pNodesToProcess == NULL) {
 							pNodesToProcess = pNodes[curNdx];
@@ -2506,7 +2498,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 
 			nodesProcessed++;
 			//if (nodesProcessed>2) break;
-		}	
+		}
 		delete pCurNode;
 	}
 
@@ -2548,7 +2540,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
 	removeCliffMapping
 		Removes all cliff adjustments.
 */
-Bool WorldHeightMapEdit::removeCliffMapping(void) 
+Bool WorldHeightMapEdit::removeCliffMapping(void)
 {
 
 	Int ndx;
@@ -2619,14 +2611,14 @@ Bool WorldHeightMapEdit::adjustForTiling( TCliffInfo &cliffInfo, Real textureWid
 	Real uBorder = TEX_PER_CELL * 0.5;
 	if (minU>=uBorder && maxU<textureWidth-uBorder) return true;
 	if (minU>=-delta && maxU<= textureWidth+delta) {
-		if (cliffInfo.u0<uBorder) cliffInfo.u0 = 0; 
-		if (cliffInfo.u1<uBorder) cliffInfo.u1 = 0; 
-		if (cliffInfo.u2<uBorder) cliffInfo.u2 = 0; 
-		if (cliffInfo.u3<uBorder) cliffInfo.u3 = 0; 
-		if (cliffInfo.u0>textureWidth-uBorder) cliffInfo.u0 = textureWidth; 
-		if (cliffInfo.u1>textureWidth-uBorder) cliffInfo.u1 = textureWidth; 
-		if (cliffInfo.u2>textureWidth-uBorder) cliffInfo.u2 = textureWidth; 
-		if (cliffInfo.u3>textureWidth-uBorder) cliffInfo.u3 = textureWidth; 
+		if (cliffInfo.u0<uBorder) cliffInfo.u0 = 0;
+		if (cliffInfo.u1<uBorder) cliffInfo.u1 = 0;
+		if (cliffInfo.u2<uBorder) cliffInfo.u2 = 0;
+		if (cliffInfo.u3<uBorder) cliffInfo.u3 = 0;
+		if (cliffInfo.u0>textureWidth-uBorder) cliffInfo.u0 = textureWidth;
+		if (cliffInfo.u1>textureWidth-uBorder) cliffInfo.u1 = textureWidth;
+		if (cliffInfo.u2>textureWidth-uBorder) cliffInfo.u2 = textureWidth;
+		if (cliffInfo.u3>textureWidth-uBorder) cliffInfo.u3 = textureWidth;
 		return true;
 	}
 
@@ -2640,29 +2632,29 @@ Bool WorldHeightMapEdit::adjustForTiling( TCliffInfo &cliffInfo, Real textureWid
 	}
 	TCliffInfo tmpCliff = cliffInfo;
 //	Bool doOffset = false;
-	Real offset;					 
+	Real offset;
 
-	DEBUG_ASSERTLOG(minU<-delta && maxU > delta, ("Oops, wrong.\n")) ;
+	DEBUG_ASSERTLOG(minU<-delta && maxU > delta, ("Oops, wrong.")) ;
 
 	// Straddles the 0 line.
 	if (maxU > -minU) {
 		offset = -minU;
 		// push min up to 0
-		if (cliffInfo.u0<0) cliffInfo.u0 = 0; 
-		if (cliffInfo.u1<0) cliffInfo.u1 = 0; 
-		if (cliffInfo.u2<0) cliffInfo.u2 = 0; 
-		if (cliffInfo.u3<0) cliffInfo.u3 = 0; 
+		if (cliffInfo.u0<0) cliffInfo.u0 = 0;
+		if (cliffInfo.u1<0) cliffInfo.u1 = 0;
+		if (cliffInfo.u2<0) cliffInfo.u2 = 0;
+		if (cliffInfo.u3<0) cliffInfo.u3 = 0;
 	} else {
 		// push max down to 0, & offset.
 		offset = -maxU;
-		if (cliffInfo.u0>0) cliffInfo.u0 = 0; 
-		if (cliffInfo.u1>0) cliffInfo.u1 = 0; 
-		if (cliffInfo.u2>0) cliffInfo.u2 = 0; 
-		if (cliffInfo.u3>0) cliffInfo.u3 = 0; 
+		if (cliffInfo.u0>0) cliffInfo.u0 = 0;
+		if (cliffInfo.u1>0) cliffInfo.u1 = 0;
+		if (cliffInfo.u2>0) cliffInfo.u2 = 0;
+		if (cliffInfo.u3>0) cliffInfo.u3 = 0;
 		cliffInfo.u0 += textureWidth;
 		cliffInfo.u1 += textureWidth;
 		cliffInfo.u2 += textureWidth;
-		cliffInfo.u3 += textureWidth;	 
+		cliffInfo.u3 += textureWidth;
 	}
 	Real triMinU;
 	Real triMaxU;
@@ -2707,12 +2699,12 @@ Bool WorldHeightMapEdit::adjustForTiling( TCliffInfo &cliffInfo, Real textureWid
 		cliffInfo.u0 = tmpCliff.u0 + offset;
 		cliffInfo.u1 = tmpCliff.u1 + offset;
 		cliffInfo.u2 = tmpCliff.u2 + offset;
-		cliffInfo.u3 = tmpCliff.u3 + offset;	 
+		cliffInfo.u3 = tmpCliff.u3 + offset;
 		if (maxU < -minU) {
 			cliffInfo.u0 += textureWidth;
 			cliffInfo.u1 += textureWidth;
 			cliffInfo.u2 += textureWidth;
-			cliffInfo.u3 += textureWidth;	 
+			cliffInfo.u3 += textureWidth;
 		}
 		cliffInfo.mutant = true;
 	}
@@ -2730,7 +2722,7 @@ static Bool usMatch(Real u1, Real u2) {
 	return false;
 }
 
-void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex, 
+void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 													UnsignedByte *pProcessed, TCliffInfo &cliffInfo)
 {
 #define PROMOTE_DIAGONALS 0	 // Don't promote them.
@@ -2751,7 +2743,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 				if (i==xIndex && j==yIndex) continue;
 				if (i!=xIndex && j!=yIndex) continue;
 				if (j<0) continue;
-				if (j>=m_height-1) continue;	
+				if (j>=m_height-1) continue;
  				Int ndx = (j*m_width)+i;
 				if (!pProcessed[ndx]) continue;
 				if (m_cliffInfoNdxes[ndx]) {
@@ -2765,7 +2757,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 					Bool shifted = false;
 					if (i==xIndex){
 						if (j<yIndex) {
-							// below 
+							// below
 							DEBUG_ASSERTCRASH(!lock1, ("Shouldn't happen."));
 							if (lock0 && !usMatch(tmpCliff.u0, info.u3)) {
 								shifted = true;
@@ -2779,7 +2771,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 								lock0 = lock1 = true;
 							}
 						} else {
-							// above 
+							// above
 							DEBUG_ASSERTCRASH(!lock2, ("Shouldn't happen."));
 							if (lock3 && !usMatch(tmpCliff.u3, info.u0)) {
 								shifted = true;
@@ -2813,7 +2805,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 								lock2 = lock1 = true;
 							}
 						}
-					}	 
+					}
 					if (shifted) tmpCliff.mutant = true;
 				}
 			}
@@ -2846,7 +2838,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 			if (fabs(dUa)<fabs(dUb)) {
 				tmpCliff.u0 = tmpCliff.u2 + dUb;
 				tmpCliff.v0 = tmpCliff.v2 + cliffInfo.v0 - cliffInfo.v2;
-			}	
+			}
 	#endif
 		}
 		if (!lock1) {
@@ -2856,7 +2848,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 				dUa =  cliffInfo.u1 - cliffInfo.u2;
 				tmpCliff.u1 = tmpCliff.u2 + dUa;
 				tmpCliff.v1 = tmpCliff.v2 + cliffInfo.v1 - cliffInfo.v2;
-			}	
+			}
 			if (lock0) {
 				dUa = cliffInfo.u1 - cliffInfo.u0;
 				tmpCliff.u1 = tmpCliff.u0 + dUa;
@@ -2869,7 +2861,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 			if (fabs(dUa)<fabs(dUb)) {
 				tmpCliff.u1 = tmpCliff.u3 + dUb;
 				tmpCliff.v1 = tmpCliff.v3 + cliffInfo.v1 - cliffInfo.v3;
-			}	
+			}
 	#endif
 		}
 		if (!lock2) {
@@ -2879,7 +2871,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 				dUa =  cliffInfo.u2 - cliffInfo.u1;
 				tmpCliff.u2 = tmpCliff.u1 + dUa;
 				tmpCliff.v2 = tmpCliff.v1 + cliffInfo.v2 - cliffInfo.v1;
-			}	
+			}
 			if (lock3) {
 				dUa = cliffInfo.u2 - cliffInfo.u3;
 				tmpCliff.u2 = tmpCliff.u3 + dUa;
@@ -2892,7 +2884,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 			if (fabs(dUa)<fabs(dUb)) {
 				tmpCliff.u2 = tmpCliff.u0 + dUb;
 				tmpCliff.v2 = tmpCliff.v0 + cliffInfo.v2 - cliffInfo.v0;
-			}	
+			}
 	#endif
 		}
 		if (!lock3) {
@@ -2902,7 +2894,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 				dUa =  cliffInfo.u3 - cliffInfo.u2;
 				tmpCliff.u3 = tmpCliff.u2 + dUa;
 				tmpCliff.v3 = tmpCliff.v2 + cliffInfo.v3 - cliffInfo.v2;
-			}	
+			}
 			if (lock0) {
 				dUa = cliffInfo.u3 - cliffInfo.u0;
 				tmpCliff.u3 = tmpCliff.u0 + dUa;
@@ -2915,7 +2907,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 			if (fabs(dUa)<fabs(dUb)) {
 				tmpCliff.u3 = tmpCliff.u1 + dUb;
 				tmpCliff.v3 = tmpCliff.v1 + cliffInfo.v3 - cliffInfo.v1;
-			}	
+			}
 	#endif
 		}
 
@@ -2970,7 +2962,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 					tmpCliff.u0 = tmpCliff.u2 + cliffInfo.u0 - cliffInfo.u2;
 					tmpCliff.v0 = tmpCliff.v2 + cliffInfo.v0 - cliffInfo.v2;
 				}
-			
+
 				if (!lock1) {
 					// Leave 3.
 					tmpCliff.u1 = tmpCliff.u3 + cliffInfo.u1 - cliffInfo.u3;
@@ -2980,7 +2972,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 					tmpCliff.u0 = tmpCliff.u3 + cliffInfo.u0 - cliffInfo.u3;
 					tmpCliff.v0 = tmpCliff.v3 + cliffInfo.v0 - cliffInfo.v3;
 				}
-			
+
 				if (!lock2) {
 					// Leave 0.
 					tmpCliff.u1 = tmpCliff.u0 + cliffInfo.u1 - cliffInfo.u0;
@@ -2990,7 +2982,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 					tmpCliff.u2 = tmpCliff.u0 + cliffInfo.u2 - cliffInfo.u0;
 					tmpCliff.v2 = tmpCliff.v0 + cliffInfo.v2 - cliffInfo.v0;
 				}
-			
+
 				if (!lock3) {
 					// Leave 1.
 					tmpCliff.u0 = tmpCliff.u1 + cliffInfo.u0 - cliffInfo.u1;
@@ -3001,7 +2993,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 					tmpCliff.v2 = tmpCliff.v1 + cliffInfo.v2 - cliffInfo.v1;
 				}
 				tmpCliff.mutant = true;
-			
+
 			}
 		}
 
@@ -3091,7 +3083,7 @@ void WorldHeightMapEdit::updateForAdjacentCliffs(Int xIndex, Int yIndex,
 
 
 
-void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex, 
+void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 													Int curTileClass, UnsignedByte *pProcessed)
 {
 	TCliffInfo tmpCliff;
@@ -3111,7 +3103,7 @@ void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 	}
 	if (!okToProcess) return;
 	Real textureClassExtent = m_globalTextureClasses[curTileClass].width*TILE_PIXEL_EXTENT;
-	textureClassExtent /= TEXTURE_WIDTH; 
+	textureClassExtent /= TEXTURE_WIDTH;
 	Int i, j;
 	for (i=xIndex-1; i<xIndex+2; i+=1) {
 		if (i<0) continue;
@@ -3120,7 +3112,7 @@ void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 			if (i==xIndex && j==yIndex) continue;
 			if (i!=xIndex && j!=yIndex) continue;
 			if (j<0) continue;
-			if (j>=m_height-1) continue;	
+			if (j>=m_height-1) continue;
  			Int ndx = (j*m_width)+i;
 			if (m_cliffInfoNdxes[ndx]) {
 				TCliffInfo info = m_cliffInfo[m_cliffInfoNdxes[ndx]];
@@ -3136,7 +3128,7 @@ void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 				Bool shifted = false;
 				if (i==xIndex){
 					if (j<yIndex) {
-						// below 
+						// below
 						DEBUG_ASSERTCRASH(!lock1, ("Shouldn't happen."));
 						if (lock0 && !usMatch(tmpCliff.u0, info.u3)) {
 							shifted = true;
@@ -3150,7 +3142,7 @@ void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 							lock0 = lock1 = true;
 						}
 					} else {
-						// above 
+						// above
 						DEBUG_ASSERTCRASH(!lock2, ("Shouldn't happen."));
 						if (lock3 && !usMatch(tmpCliff.u3, info.u0)) {
 							shifted = true;
@@ -3202,7 +3194,7 @@ void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 		if (minU>tmpCliff.u3) minU=tmpCliff.u3;
 		if (maxU<tmpCliff.u3) maxU=tmpCliff.u3;
 		if (maxU-minU<delta) {
-			// bad. 
+			// bad.
 			tmpCliff.mutant = true;
 			/* Pick the bigger v */
 			if (tmpCliff.v3 - tmpCliff.v0 > tmpCliff.v2-tmpCliff.v0) {
@@ -3250,8 +3242,8 @@ void WorldHeightMapEdit::updateFlatCellForAdjacentCliffs(Int xIndex, Int yIndex,
 	}
 
 	if (!gotXVec && !gotYVec) {
-		DEBUG_LOG(("Unexpected.  jba\n"));
-		return; 
+		DEBUG_LOG(("Unexpected.  jba"));
+		return;
 	}
 	if (gotXVec && !gotYVec) {
 		yVec.V = -xVec.U;
@@ -3358,11 +3350,11 @@ void WorldHeightMapEdit::changeBoundary(Int ndx, ICoord2D *border)
 
 void WorldHeightMapEdit::removeLastBoundary(void)
 {
-	if (m_boundaries.size() == 0) {
+	if (m_boundaries.empty()) {
 		DEBUG_CRASH(("Invalid border remove request. jkmcd"));
 		return;
 	}
-	
+
 	m_boundaries.pop_back();
 }
 
@@ -3422,7 +3414,7 @@ void WorldHeightMapEdit::findBoundaryNear(Coord3D *pt, float okDistance, Int *ou
 			return;
 		}
 	}
-	
+
 	(*outNdx) = -1;
 	(*outHandle) = -1;
-} 
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WaterOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WaterOptions.cpp
index c3511f7dca8..d69fce7bd98 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WaterOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WaterOptions.cpp
@@ -45,7 +45,7 @@ Bool WaterOptions::m_creatingWaterAreas = false;
 WaterOptions::WaterOptions(CWnd* pParent /*=NULL*/):
 m_moveUndoable(NULL)
 {
-	//{{AFX_DATA_INIT(WaterOptions) 
+	//{{AFX_DATA_INIT(WaterOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -59,10 +59,10 @@ void WaterOptions::DoDataExchange(CDataExchange* pDX)
 	//}}AFX_DATA_MAP
 }
 
-void WaterOptions::setHeight(Int height) 
-{ 
-	char buffer[50];
-	sprintf(buffer, "%d", height);
+void WaterOptions::setHeight(Int height)
+{
+	char buffer[12];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%d", height);
 	m_waterHeight = height;
 	if (m_staticThis && !m_staticThis->m_updating) {
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -70,7 +70,7 @@ void WaterOptions::setHeight(Int height)
 	}
 }
 
-void WaterOptions::updateTheUI(void) 
+void WaterOptions::updateTheUI(void)
 {
 	PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon();
 
@@ -79,7 +79,7 @@ void WaterOptions::updateTheUI(void)
 	if (theTrigger && pWnd) {
 		pWnd->SetWindowText(theTrigger->getTriggerName().str());
 		setHeight(theTrigger->getPoint(0)->z);
-	}	
+	}
 	CButton *pButton = (CButton*)GetDlgItem(IDC_WATER_POLYGON);
 	pButton->SetCheck(m_creatingWaterAreas ? 1:0);
 	Bool isRiver = false;
@@ -91,14 +91,14 @@ void WaterOptions::updateTheUI(void)
 	pButton->EnableWindow(theTrigger!=NULL);
 
 	pWnd = m_staticThis->GetDlgItem(IDC_SPACING);
-	char buffer[_MAX_PATH];
+	char buffer[12];
 	if (pWnd) {
-		sprintf(buffer, "%d", m_waterPointSpacing);
+		snprintf(buffer, ARRAY_SIZE(buffer), "%d", m_waterPointSpacing);
 		pWnd->SetWindowText(buffer);
 	}
 }
 
-void WaterOptions::update(void) 
+void WaterOptions::update(void)
 {
 	if (m_staticThis) {
 		m_staticThis->updateTheUI();
@@ -109,12 +109,12 @@ void WaterOptions::update(void)
 // WaterOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL WaterOptions::OnInitDialog() 
+BOOL WaterOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = true;
 
 	m_waterHeightPopup.SetupPopSliderButton(this, IDC_HEIGHT_POPUP, this);
@@ -130,15 +130,15 @@ BOOL WaterOptions::OnInitDialog()
 BEGIN_MESSAGE_MAP(WaterOptions, COptionsPanel)
 	//{{AFX_MSG_MAP(WaterOptions)
 	ON_CBN_KILLFOCUS(IDC_WATERNAME_EDIT, OnChangeWaterEdit)
-	ON_EN_CHANGE(IDC_HEIGHT_EDIT, OnChangeHeightEdit)	 
-	ON_EN_CHANGE(IDC_SPACING, OnChangeSpacingEdit)	 
+	ON_EN_CHANGE(IDC_HEIGHT_EDIT, OnChangeHeightEdit)
+	ON_EN_CHANGE(IDC_SPACING, OnChangeSpacingEdit)
 	ON_BN_CLICKED(IDC_WATER_POLYGON, OnWaterPolygon)
 	ON_BN_CLICKED(IDC_MAKE_RIVER, OnMakeRiver)
 	ON_CBN_SELENDOK(IDC_WATERNAME_EDIT, OnChangeWaterEdit)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-void WaterOptions::OnChangeWaterEdit() 
+void WaterOptions::OnChangeWaterEdit()
 {
 	PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon();
 
@@ -185,13 +185,13 @@ void WaterOptions::OnChangeWaterEdit()
 }
 
 
-void WaterOptions::OnWaterPolygon() 
+void WaterOptions::OnWaterPolygon()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_WATER_POLYGON);
 	m_creatingWaterAreas = (pButton->GetCheck()==1);
 }
 
-void WaterOptions::OnMakeRiver() 
+void WaterOptions::OnMakeRiver()
 {
 	CButton *pButton = (CButton*)GetDlgItem(IDC_MAKE_RIVER);
 	Bool river = (pButton->GetCheck()==1);
@@ -222,7 +222,7 @@ void WaterOptions::OnMakeRiver()
 				// Now find the other end.
 //				Real sourceWidth = endLen;
 
-				endLen=0;	
+				endLen=0;
 				Int endPoint = 0;
 				for (i=0; i<theTrigger->getNumPoints()-1; i++) {
 					if (i>=newPoint-1 && i<=newPoint+1) continue;
@@ -267,7 +267,7 @@ PolygonTrigger * WaterOptions::adjustCount(PolygonTrigger *trigger, Int firstPt,
 {
 	PolygonTrigger *pNew = newInstance(PolygonTrigger)(trigger->getNumPoints());
 //	Real endLen=0;
-	Real totalLen=0;	
+	Real totalLen=0;
 	Real curSpacingLen = 10;
 	Int curPoint = lastPt;
 	ICoord3D pt;
@@ -278,7 +278,7 @@ PolygonTrigger * WaterOptions::adjustCount(PolygonTrigger *trigger, Int firstPt,
 		if (curPoint>=trigger->getNumPoints()) {
 			curPoint = 0;
 		}
-	}	
+	}
 
 	curPoint = firstPt;
 	while (curPoint != lastPt) {
@@ -360,7 +360,7 @@ void WaterOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax,
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void WaterOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -386,7 +386,7 @@ void WaterOptions::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void WaterOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -401,7 +401,7 @@ void WaterOptions::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
@@ -413,7 +413,7 @@ void WaterOptions::startUpdateHeight(void)
 		return;
 	}
 	if (!theTrigger->isWaterArea()) {
-		REF_PTR_RELEASE(m_moveUndoable); 
+		REF_PTR_RELEASE(m_moveUndoable);
 		return;
 	}
 	if (m_moveUndoable && theTrigger == m_moveUndoable->getTrigger()) {
@@ -466,7 +466,7 @@ void WaterOptions::endUpdateHeight(void)
  /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void WaterOptions::OnChangeHeightEdit() 
+void WaterOptions::OnChangeHeightEdit()
 {
 	if (m_updating) return;
 	CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -488,11 +488,11 @@ void WaterOptions::OnChangeHeightEdit()
  /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void WaterOptions::OnChangeSpacingEdit() 
+void WaterOptions::OnChangeSpacingEdit()
 {
 	if (m_updating) return;
 	CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SPACING);
-	char buffer[_MAX_PATH];
+	char buffer[12];
 	if (pEdit) {
 		pEdit->GetWindowText(buffer, sizeof(buffer));
 		Int height;
@@ -500,7 +500,7 @@ void WaterOptions::OnChangeSpacingEdit()
 		if (1==sscanf(buffer, "%d", &height)) {
 			m_waterPointSpacing = height;
 		}	else {
-			sprintf(buffer, "%d", m_waterPointSpacing);
+			snprintf(buffer, ARRAY_SIZE(buffer), "%d", m_waterPointSpacing);
 			pEdit->SetWindowText(buffer);
 		}
 		m_updating = false;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WaterTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WaterTool.cpp
index 66f56411857..d2fb28cf319 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WaterTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WaterTool.cpp
@@ -20,7 +20,7 @@
 // Water area tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "WaterTool.h"
@@ -41,9 +41,9 @@
 Bool WaterTool::m_water_isActive = false;
 
 /// Constructor
-WaterTool::WaterTool(void) 
+WaterTool::WaterTool(void)
 {
-	m_toolID = ID_WATER_TOOL; 
+	m_toolID = ID_WATER_TOOL;
 	m_cursorID = IDC_WATER;
 
 	m_currentZ = 0;
@@ -53,7 +53,7 @@ WaterTool::WaterTool(void)
 
 
 /// Destructor
-WaterTool::~WaterTool(void) 
+WaterTool::~WaterTool(void)
 {
 	if (m_poly_plusCursor) {
 		::DestroyCursor(m_poly_plusCursor);
@@ -64,7 +64,7 @@ WaterTool::~WaterTool(void)
 }
 
 /// Clears it's is active flag.
-void WaterTool::deactivate() 
+void WaterTool::deactivate()
 {
 	PolygonTool::deactivate();
 	m_water_isActive = false;
@@ -73,7 +73,7 @@ void WaterTool::deactivate()
 static Bool doIt = false;
 
 /// Shows the no options panel.
-void WaterTool::activate() 
+void WaterTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_WATER_OPTIONS);
 	m_water_isActive = true;
@@ -92,7 +92,7 @@ void WaterTool::activate()
 #define INTENSE_DEBUG
 
 /// Perform the tool behavior on mouse down.
-void WaterTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void WaterTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	if (WaterOptions::getCreatingWaterAreas()) {
@@ -121,7 +121,7 @@ void WaterTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 
 
 /** Set the cursor. */
-void WaterTool::setCursor(void) 
+void WaterTool::setCursor(void)
 {
 	if (m_poly_mouseUpPlus || (m_poly_isAdding && m_poly_curSelectedPolygon)) {
 		if (m_poly_plusCursor == NULL) {
@@ -188,7 +188,7 @@ void WaterTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 }
 
 /** Mouse up - not much. */
-void WaterTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void WaterTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	REF_PTR_RELEASE(m_poly_moveUndoable); // belongs to pDoc now.
@@ -199,7 +199,7 @@ inline static Real mapZtoHeight(UnsignedByte mapZ) {
 }
 
 /// Perform the fill water area on mouse down.
-void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	Int waterHeight = m_currentZ;
 
@@ -219,8 +219,8 @@ void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 	Int i, j;
 	i = ndx.x;
 	j = ndx.y;
-	
-	WorldHeightMapEdit *pMap = pDoc->GetHeightMap(); 
+
+	WorldHeightMapEdit *pMap = pDoc->GetHeightMap();
 	if (i<0 || i>=pMap->getXExtent()-1) return;
 	if (j<0 || j>=pMap->getYExtent()-1) return;
 
@@ -232,7 +232,7 @@ void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 	// Move left till we find an edge.
 	while (i>0) {
 		i--;
-		intMapHeight = pMap->getHeight(i, j);	
+		intMapHeight = pMap->getHeight(i, j);
 		if (waterHeight<mapZtoHeight(intMapHeight)) {
 			break;
 		}
@@ -260,13 +260,13 @@ void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 		intMapHeight = pMap->getHeight(i, j);
 #ifdef INTENSE_DEBUG
 		if (bottom) {
-			DEBUG_LOG(("Bottom %d,%d\n", i, j));
+			DEBUG_LOG(("Bottom %d,%d", i, j));
 		} else if (left) {
-			DEBUG_LOG(("Left %d,%d\n", i, j));
+			DEBUG_LOG(("Left %d,%d", i, j));
 		} else if (right) {
-			DEBUG_LOG(("Right %d,%d\n", i, j));
+			DEBUG_LOG(("Right %d,%d", i, j));
 		} else if (top) {
-			DEBUG_LOG(("Top %d,%d\n", i, j));
+			DEBUG_LOG(("Top %d,%d", i, j));
 		}
 #endif
 		if (bottom) {
@@ -456,12 +456,12 @@ void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 				}
 				pt.x = (i+1)*MAP_XY_FACTOR;
 			}
-		} else { 
+		} else {
 			DEBUG_CRASH(("Logic error. jba.")); // shouldn't get here.
 		}
 		pt.x -= pMap->getBorderSize()*MAP_XY_FACTOR;
 		pt.y -= pMap->getBorderSize()*MAP_XY_FACTOR;
-		pNew->addPoint(pt);	
+		pNew->addPoint(pt);
 		curPoint++;
 		if (firstTime) {
 			startI = i;
@@ -470,7 +470,7 @@ void WaterTool::fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorl
 		}
 
 	}
-	
+
 	if (pNew->getNumPoints()>2) {
 		PolygonTrigger *pBetter = adjustSpacing(pNew, WaterOptions::getSpacing());
 		deleteInstance(pNew);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointOptions.cpp
index f0815500694..cf0000da9ac 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointOptions.cpp
@@ -42,7 +42,7 @@ WaypointOptions *WaypointOptions::m_staticThis = NULL;
 WaypointOptions::WaypointOptions(CWnd* pParent /*=NULL*/):
 m_moveUndoable(NULL)
 {
-	//{{AFX_DATA_INIT(WaypointOptions) 
+	//{{AFX_DATA_INIT(WaypointOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -58,10 +58,10 @@ void WaypointOptions::DoDataExchange(CDataExchange* pDX)
 
 MapObject *WaypointOptions::getSingleSelectedWaypoint(void)
 {
-	MapObject *theMapObj = NULL; 
+	MapObject *theMapObj = NULL;
 //	Bool found = false;
 	Int selCount=0;
-	MapObject *pMapObj; 
+	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj->isSelected()) {
 			if (pMapObj->isWaypoint()) {
@@ -96,12 +96,12 @@ PolygonTrigger *WaypointOptions::getSingleSelectedPolygon(void)
 	return(NULL);
 }
 
-void WaypointOptions::updateTheUI(void) 
+void WaypointOptions::updateTheUI(void)
 {
 	Tool *curTool = ((CWorldBuilderApp*)AfxGetApp())->getCurTool();
 
 	Bool isWaypointTool = (curTool && (curTool->getToolID() == ID_WAYPOINT_TOOL));
-	MapObject *theMapObj = getSingleSelectedWaypoint(); 
+	MapObject *theMapObj = getSingleSelectedWaypoint();
 	PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon();
 
 	CWnd *pWnd = this->GetDlgItem(IDC_WAYPOINTNAME_EDIT);
@@ -125,11 +125,11 @@ void WaypointOptions::updateTheUI(void)
 
 	if (theTrigger) {
 		pCaption1->ShowWindow(SW_SHOW);
-		pWnd->ShowWindow(SW_SHOW);	
+		pWnd->ShowWindow(SW_SHOW);
 	} else {
 		pCaption1->ShowWindow(SW_HIDE);
 		pCaption2->ShowWindow(SW_HIDE);
-		pWnd->ShowWindow(SW_HIDE);	
+		pWnd->ShowWindow(SW_HIDE);
 	}
 
 	if (pCombo && !theTrigger) {
@@ -186,11 +186,11 @@ void WaypointOptions::updateTheUI(void)
 
 			if (!tempObj)
 				break;
-			
+
 			// if it is a waypoint, add its name to the combo box
 			if (tempObj->isWaypoint())
 				pListWayptNames->AddString(tempObj->getWaypointName().str());
-			
+
 			tempObj = tempObj->getNext();
 		}
 
@@ -220,7 +220,7 @@ void WaypointOptions::updateTheUI(void)
 			// convert the location coordinates to strings
 			locX.format("%f", waypointLocation->x);
 			locY.format("%f", waypointLocation->y);
-			
+
 			// set the window text to reflect the current position of the waypoint
 			pWaypointX->SetWindowText(locX.str());
 			pWaypointY->SetWindowText(locY.str());
@@ -273,7 +273,7 @@ void WaypointOptions::updateTheUI(void)
 	}
 }
 
-void WaypointOptions::update(void) 
+void WaypointOptions::update(void)
 {
 	if (m_staticThis) {
 		m_staticThis->updateTheUI();
@@ -284,12 +284,12 @@ void WaypointOptions::update(void)
 // WaypointOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL WaypointOptions::OnInitDialog() 
+BOOL WaypointOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = true;
 
 	m_staticThis = this;
@@ -321,7 +321,7 @@ void WaypointOptions::OnChangeSelectedWaypoint()
 	if (!currentlySelected)
 		return;
 	currentlySelected->setSelected(false);
-	
+
 	// retrieve information from dialog box, if user-typed -- sel will be -1, otherwise it will be >=0
 	CString theText;
 	CComboBox *pListWayptNames = (CComboBox*)GetDlgItem(IDC_LIST_OF_WAYPOINT_NAMES);
@@ -332,7 +332,7 @@ void WaypointOptions::OnChangeSelectedWaypoint()
 		pListWayptNames->GetWindowText(theText);
 	}
 	AsciiString name((LPCTSTR)theText);
-	
+
 	// find and store the waypoint that corresponds to the information in the dialog box
 	Bool foundWaypoint = false;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
@@ -392,7 +392,7 @@ void WaypointOptions::OnEditWaypointLocationX()
 	newWaypointLocation.x = atof(name.str());
 	newWaypointLocation.y = waypointLocation->y;
 	newWaypointLocation.z = 0;
-	
+
 	// set the new information into both the waypointa and the window
 	waypt->setLocation(&newWaypointLocation);
 }
@@ -424,12 +424,12 @@ void WaypointOptions::OnEditWaypointLocationY()
 	newWaypointLocation.y = atof(name.str());
 	newWaypointLocation.x = waypointLocation->x;
 	newWaypointLocation.z = 0;
-	
+
 	// set the new information into both the waypointa and the window
 	waypt->setLocation(&newWaypointLocation);
 }
 
-Bool WaypointOptions::isUnique(AsciiString name, MapObject* theMapObj) 
+Bool WaypointOptions::isUnique(AsciiString name, MapObject* theMapObj)
 {
 	MapObject *pMapObj;
 	Bool didMatch = false;
@@ -446,7 +446,7 @@ Bool WaypointOptions::isUnique(AsciiString name, MapObject* theMapObj)
 	return (didMatch == false);
 }
 
-AsciiString WaypointOptions::GenerateUniqueName(Int id) 
+AsciiString WaypointOptions::GenerateUniqueName(Int id)
 {
 	AsciiString name;
 	name.format("Waypoint %d", id);
@@ -458,9 +458,9 @@ AsciiString WaypointOptions::GenerateUniqueName(Int id)
 	return name;
 }
 
-void WaypointOptions::OnChangeWaypointnameEdit() 
+void WaypointOptions::OnChangeWaypointnameEdit()
 {
-	MapObject *theMapObj = getSingleSelectedWaypoint(); 
+	MapObject *theMapObj = getSingleSelectedWaypoint();
 	PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon();
 
 	// get the combo box
@@ -514,14 +514,14 @@ void WaypointOptions::OnChangeWaypointnameEdit()
 }
 
 
-void WaypointOptions::OnEditchangeWaypointlabel1Edit() 
+void WaypointOptions::OnEditchangeWaypointlabel1Edit()
 {
 	changeWaypointLabel(IDC_WAYPOINTLABEL1_EDIT, TheKey_waypointPathLabel1);
 }
 
-void WaypointOptions::changeWaypointLabel(Int editControlID, NameKeyType key) 
+void WaypointOptions::changeWaypointLabel(Int editControlID, NameKeyType key)
 {
-	MapObject *theMapObj = getSingleSelectedWaypoint(); 
+	MapObject *theMapObj = getSingleSelectedWaypoint();
 	if (theMapObj==NULL) return;
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (!pDoc->isWaypointLinked(theMapObj)) {
@@ -539,19 +539,19 @@ void WaypointOptions::changeWaypointLabel(Int editControlID, NameKeyType key)
 	}
 }
 
-void WaypointOptions::OnEditchangeWaypointlabel2Edit() 
+void WaypointOptions::OnEditchangeWaypointlabel2Edit()
 {
 	changeWaypointLabel(IDC_WAYPOINTLABEL2_EDIT, TheKey_waypointPathLabel2);
 }
 
-void WaypointOptions::OnEditchangeWaypointlabel3Edit() 
+void WaypointOptions::OnEditchangeWaypointlabel3Edit()
 {
 	changeWaypointLabel(IDC_WAYPOINTLABEL3_EDIT, TheKey_waypointPathLabel3);
 }
 
-void WaypointOptions::OnWaypointBidirectional() 
+void WaypointOptions::OnWaypointBidirectional()
 {
-	MapObject *theMapObj = getSingleSelectedWaypoint(); 
+	MapObject *theMapObj = getSingleSelectedWaypoint();
 	if (theMapObj==NULL) return;
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 	if (!pDoc->isWaypointLinked(theMapObj)) {
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointTool.cpp
index 7f43256c45b..72a2506c656 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointTool.cpp
@@ -20,7 +20,7 @@
 // Texture tiling tool for worldbuilder.
 // Author: John Ahlquist, April 2001
 
-#include "StdAfx.h" 
+#include "StdAfx.h"
 #include "resource.h"
 
 #include "WaypointTool.h"
@@ -43,23 +43,23 @@ Bool WaypointTool::m_isActive = false;
 
 /// Constructor
 WaypointTool::WaypointTool(void) :
-	Tool(ID_WAYPOINT_TOOL, IDC_WAYPOINT) 
+	Tool(ID_WAYPOINT_TOOL, IDC_WAYPOINT)
 {
 }
-	
+
 /// Destructor
-WaypointTool::~WaypointTool(void) 
+WaypointTool::~WaypointTool(void)
 {
 }
 
 /// Clears it's is active flag.
-void WaypointTool::deactivate() 
+void WaypointTool::deactivate()
 {
 	m_isActive = false;
 }
 
 /// Shows the terrain materials options panel.
-void WaypointTool::activate() 
+void WaypointTool::activate()
 {
 	CMainFrame::GetMainFrame()->showOptionsDialog(IDD_WAYPOINT_OPTIONS);
 	WaypointOptions::update();
@@ -100,12 +100,12 @@ MapObject *WaypointTool::pickWaypoint(Coord3D loc){
 			return pObj;
 		}
 	}
-	return NULL; 
+	return NULL;
 }
 
 
 /// Perform the tool behavior on mouse down.
-void WaypointTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void WaypointTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	if (m != TRACK_L) return;
 	m_downWaypointID = 0;
@@ -119,14 +119,14 @@ void WaypointTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 		WaypointOptions::update();
 	}	else {
 		pView->snapPoint(&docPt);
-		MapObject *pNew = newInstance( MapObject)(docPt, AsciiString("*Waypoints/Waypoint"), 0, 0, NULL, NULL );
+		MapObject *pNew = newInstance( MapObject)(docPt, "*Waypoints/Waypoint", 0, 0, NULL, NULL );
 		Int id = pDoc->getNextWaypointID();
 		AsciiString name = WaypointOptions::GenerateUniqueName(id);
 		pNew->setSelected(true);
 		pNew->setIsWaypoint();
 		pNew->setWaypointID(id);
 		pNew->setWaypointName(name);
-		pNew->getProperties()->setAsciiString(TheKey_originalOwner, AsciiString("team"));
+		pNew->getProperties()->setAsciiString(TheKey_originalOwner, "team");
 		AddObjectUndoable *pUndo = new AddObjectUndoable(pDoc, pNew);
 		pDoc->AddAndDoUndoable(pUndo);
 		REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
@@ -154,7 +154,7 @@ void WaypointTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWo
 }
 
 /** Execute the tool on mouse up - Place an object. */
-void WaypointTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) 
+void WaypointTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc)
 {
 	DrawObject::stopWaypointDragFeedback();
 	if (m != TRACK_L) return;
@@ -166,7 +166,7 @@ void WaypointTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 	pObj = pickWaypoint(docPt);
 	if (pObj == NULL) {
 		pView->snapPoint(&docPt);
-		MapObject *pNew = newInstance( MapObject)(docPt, AsciiString("*Waypoints/Waypoint"), 0, 0, NULL, NULL );
+		MapObject *pNew = newInstance( MapObject)(docPt, "*Waypoints/Waypoint", 0, 0, NULL, NULL );
 		Int id = pDoc->getNextWaypointID();
 		AsciiString name;
 		name.format("Waypoint %d", id);
@@ -174,25 +174,25 @@ void WaypointTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 		pNew->setIsWaypoint();
 		pNew->setWaypointID(id);
 		pNew->setWaypointName(name);
-		pNew->getProperties()->setAsciiString(TheKey_originalOwner, AsciiString("team"));
+		pNew->getProperties()->setAsciiString(TheKey_originalOwner, "team");
 		AddObjectUndoable *pUndo = new AddObjectUndoable(pDoc, pNew);
 		pDoc->AddAndDoUndoable(pUndo);
 		REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 		pObj = pNew;
 		pNew = NULL; // undoable owns it now.
 	}
-	if (pObj) 
+	if (pObj)
 	{
 		pObj->setSelected(true);
-		if (m_downWaypointID && (pObj->getWaypointID() != m_downWaypointID)) 
+		if (m_downWaypointID && (pObj->getWaypointID() != m_downWaypointID))
 		{
 			Int waypointID = pObj->getWaypointID();
 			// If a link
-			if (pDoc->waypointLinkExists(m_downWaypointID, waypointID)) 
+			if (pDoc->waypointLinkExists(m_downWaypointID, waypointID))
 			{
 				pDoc->removeWaypointLink(m_downWaypointID, waypointID);
-			} 
-			else if (m_downWaypointID != waypointID) 
+			}
+			else if (m_downWaypointID != waypointID)
 			{
 				pDoc->addWaypointLink(m_downWaypointID, waypointID);
 			}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
index d9c1aa94764..ba2930f30a0 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
@@ -20,7 +20,6 @@
 //
 
 #include "StdAfx.h"
-#include <eh.h>
 #include "WorldBuilder.h"
 #include "euladialog.h"
 #include "MainFrm.h"
@@ -34,6 +33,7 @@
 
 //#include <wsys/StdFileSystem.h>
 #include "W3DDevice/GameClient/W3DFileSystem.h"
+#include "Common/FramePacer.h"
 #include "Common/GlobalData.h"
 #include "WHeightMapEdit.h"
 //#include "Common/GameFileSystem.h"
@@ -83,19 +83,14 @@
 #include "Win32Device/Common/Win32LocalFileSystem.h"
 #include "Win32Device/Common/Win32BIGFileSystem.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 static SubsystemInterfaceList TheSubsystemListRecord;
 
 template<class SUBSYSTEM>
-void initSubsystem(SUBSYSTEM*& sysref, SUBSYSTEM* sys, const char* path1 = NULL, const char* path2 = NULL, const char* dirpath = NULL)
+void initSubsystem(SUBSYSTEM*& sysref, SUBSYSTEM* sys, const char* path1 = NULL, const char* path2 = NULL)
 {
 	sysref = sys;
-	TheSubsystemListRecord.initSubsystem(sys, path1, path2, dirpath, NULL);
+	TheSubsystemListRecord.initSubsystem(sys, path1, path2, NULL);
 }
 
 
@@ -108,7 +103,7 @@ const Char *g_strFile = "data\\Generals.str";
 const Char *g_csfFile = "data\\%s\\Generals.csf";
 
 /////////////////////////////////////////////////////////////////////////////
-// WBGameFileClass - extends the file system a bit so we can get at some 
+// WBGameFileClass - extends the file system a bit so we can get at some
 // wb only data.  jba.
 
 class WBGameFileClass : public GameFileClass
@@ -130,7 +125,7 @@ char const * WBGameFileClass::Set_Name( char const *filename )
 	}
 
 	if (TheFileSystem->doesFileExist(filename)) {
-		strcpy( m_filePath, filename );
+		strlcpy(m_filePath, filename, ARRAY_SIZE(m_filePath));
 		m_fileExists = true;
 	}
 	return m_filename;
@@ -139,7 +134,7 @@ char const * WBGameFileClass::Set_Name( char const *filename )
 
 
 /////////////////////////////////////////////////////////////////////////////
-// WB_W3DFileSystem - extends the file system a bit so we can get at some 
+// WB_W3DFileSystem - extends the file system a bit so we can get at some
 // wb only data.  jba.
 
 class	WB_W3DFileSystem : public W3DFileSystem {
@@ -225,7 +220,7 @@ CWorldBuilderApp::CWorldBuilderApp() :
 	m_tools[10] = &m_pointerTool;
 	m_tools[11] = &m_blendEdgeTool;
 	m_tools[12] = &m_groveTool;
-	m_tools[13] = &m_meshMoldTool;	 
+	m_tools[13] = &m_meshMoldTool;
 	m_tools[14] = &m_roadTool;
 	m_tools[15] = &m_handScrollTool;
 	m_tools[16] = &m_waypointTool;
@@ -266,6 +261,14 @@ CWorldBuilderApp::~CWorldBuilderApp()
 	_exit(0);
 }
 
+/////////////////////////////////////////////////////////////////////////////
+// Handler for unhandled win32 exceptions.
+
+static LONG WINAPI UnHandledExceptionFilter(struct _EXCEPTION_POINTERS* e_info)
+{
+	DumpExceptionInfo(e_info->ExceptionRecord->ExceptionCode, e_info);
+	return EXCEPTION_EXECUTE_HANDLER;
+}
 
 /////////////////////////////////////////////////////////////////////////////
 // CWorldBuilderApp initialization
@@ -283,25 +286,21 @@ BOOL CWorldBuilderApp::InitInstance()
 	ApplicationHWnd = GetDesktopWindow();
 
 	// initialization
-  _set_se_translator( DumpExceptionInfo ); // Hook that allows stack trace.
+	SetUnhandledExceptionFilter(UnHandledExceptionFilter);
 
-	// start the log
-	DEBUG_INIT(DEBUG_FLAGS_DEFAULT);
+	// initialize the memory manager early
+	initMemoryManager();
 
 #ifdef DEBUG_LOGGING
 	// Turn on console output jba [3/20/2003]
 	DebugSetFlags(DebugGetFlags() | DEBUG_FLAG_LOG_TO_CONSOLE);
 #endif
 
-	DEBUG_LOG(("starting Worldbuilder.\n"));
+	DEBUG_LOG(("starting Worldbuilder."));
 
-#ifdef RTS_INTERNAL
-	DEBUG_LOG(("RTS_INTERNAL defined.\n"));
-#endif
 #ifdef RTS_DEBUG
-	DEBUG_LOG(("RTS_DEBUG defined.\n"));
+	DEBUG_LOG(("RTS_DEBUG defined."));
 #endif
-	initMemoryManager();
 #ifdef MEMORYPOOL_CHECKPOINTING
 	gFirstCP = TheMemoryPoolFactory->debugSetCheckpoint();
 #endif
@@ -311,7 +310,7 @@ BOOL CWorldBuilderApp::InitInstance()
 	loadWindow.SetWindowText("Loading Worldbuilder");
 	loadWindow.ShowWindow(SW_SHOW);
 	loadWindow.UpdateWindow();
-	
+
 	CRect rect(15, 315, 230, 333);
 	loadWindow.setTextOutputLocation(rect);
 	loadWindow.outputText(IDS_SPLASH_LOADING);
@@ -329,13 +328,8 @@ BOOL CWorldBuilderApp::InitInstance()
 	// Set the current directory to the app directory.
 	char buf[_MAX_PATH];
 	GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	if (char *pEnd = strrchr(buf, '\\')) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);
 
@@ -350,46 +344,45 @@ BOOL CWorldBuilderApp::InitInstance()
 
 	INI ini;
 
-	initSubsystem(TheWritableGlobalData, new GlobalData(), "Data\\INI\\Default\\GameData.ini", "Data\\INI\\GameData.ini");
-	
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	ini.load( AsciiString( "Data\\INI\\GameDataDebug.ini" ), INI_LOAD_MULTIFILE, NULL );
+	initSubsystem(TheWritableGlobalData, new GlobalData(), "Data\\INI\\Default\\GameData", "Data\\INI\\GameData");
+
+	TheFramePacer = new FramePacer();
+
+#if defined(RTS_DEBUG)
+	ini.loadFileDirectory( "Data\\INI\\GameDataDebug", INI_LOAD_MULTIFILE, NULL );
 #endif
 
 #ifdef DEBUG_CRASHING
 	TheWritableGlobalData->m_debugIgnoreAsserts = false;
 #endif
 
-#if defined(RTS_INTERNAL)
-	// leave on asserts for a while. jba. [4/15/2003] TheWritableGlobalData->m_debugIgnoreAsserts = true;
-#endif
-	DEBUG_LOG(("TheWritableGlobalData %x\n", TheWritableGlobalData));
+	DEBUG_LOG(("TheWritableGlobalData %x", TheWritableGlobalData));
 #if 1
 	// srj sez: put INI into our user data folder, not the ap dir
 	free((void*)m_pszProfileName);
-	strcpy(buf, TheGlobalData->getPath_UserData().str());
-	strcat(buf, "WorldBuilder.ini");
+	strlcpy(buf, TheGlobalData->getPath_UserData().str(), ARRAY_SIZE(buf));
+	strlcat(buf, "WorldBuilder.ini", ARRAY_SIZE(buf));
 #else
-	strcat(buf, "//");
-	strcat(buf, m_pszProfileName);
+	strlcat(buf, "//", ARRAY_SIZE(buf));
+	strlcat(buf, m_pszProfileName, ARRAY_SIZE(buf));
 	free((void*)m_pszProfileName);
 #endif
 	m_pszProfileName = (const char *)malloc(strlen(buf)+2);
 	strcpy((char*)m_pszProfileName, buf);
 
 	// ensure the user maps dir exists
-	sprintf(buf, "%sMaps\\", TheGlobalData->getPath_UserData().str());
+	snprintf(buf, ARRAY_SIZE(buf), "%sMaps\\", TheGlobalData->getPath_UserData().str());
 	CreateDirectory(buf, NULL);
 
 	// read the water settings from INI (must do prior to initing GameClient, apparently)
-	ini.load( AsciiString( "Data\\INI\\Default\\Water.ini" ), INI_LOAD_OVERWRITE, NULL );
-	ini.load( AsciiString( "Data\\INI\\Water.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Default\\Water", INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\INI\\Water", INI_LOAD_OVERWRITE, NULL );
 
 	initSubsystem(TheGameText, CreateGameTextInterface());
-	initSubsystem(TheScienceStore, new ScienceStore(), "Data\\INI\\Default\\Science.ini", "Data\\INI\\Science.ini");
-	initSubsystem(TheMultiplayerSettings, new MultiplayerSettings(), "Data\\INI\\Default\\Multiplayer.ini", "Data\\INI\\Multiplayer.ini");
-	initSubsystem(TheTerrainTypes, new TerrainTypeCollection(), "Data\\INI\\Default\\Terrain.ini", "Data\\INI\\Terrain.ini");
-	initSubsystem(TheTerrainRoads, new TerrainRoadCollection(), "Data\\INI\\Default\\Roads.ini", "Data\\INI\\Roads.ini");
+	initSubsystem(TheScienceStore, new ScienceStore(), "Data\\INI\\Default\\Science", "Data\\INI\\Science");
+	initSubsystem(TheMultiplayerSettings, new MultiplayerSettings(), "Data\\INI\\Default\\Multiplayer", "Data\\INI\\Multiplayer");
+	initSubsystem(TheTerrainTypes, new TerrainTypeCollection(), "Data\\INI\\Default\\Terrain", "Data\\INI\\Terrain");
+	initSubsystem(TheTerrainRoads, new TerrainRoadCollection(), "Data\\INI\\Default\\Roads", "Data\\INI\\Roads");
 
 	WorldHeightMapEdit::init();
 
@@ -398,7 +391,7 @@ BOOL CWorldBuilderApp::InitInstance()
 	TheScriptEngine->turnBreezeOff(); // stop the tree sway.
 
 	//  [2/11/2003]
-	ini.load( AsciiString( "Data\\Scripts\\Scripts.ini" ), INI_LOAD_OVERWRITE, NULL );
+	ini.loadFileDirectory( "Data\\Scripts\\Scripts", INI_LOAD_OVERWRITE, NULL );
 
 	// need this before TheAudio in case we're running off of CD - TheAudio can try to open Music.big on the CD...
 	initSubsystem(TheCDManager, CreateCDManager(), NULL);
@@ -410,19 +403,19 @@ BOOL CWorldBuilderApp::InitInstance()
 	initSubsystem(TheModuleFactory, (ModuleFactory*)(new W3DModuleFactory()));
 	initSubsystem(TheSidesList, new SidesList());
 	initSubsystem(TheCaveSystem, new CaveSystem());
-	initSubsystem(TheRankInfoStore, new RankInfoStore(), NULL, "Data\\INI\\Rank.ini");
-	initSubsystem(ThePlayerTemplateStore, new PlayerTemplateStore(), "Data\\INI\\Default\\PlayerTemplate.ini", "Data\\INI\\PlayerTemplate.ini");
-	initSubsystem(TheSpecialPowerStore, new SpecialPowerStore(), "Data\\INI\\Default\\SpecialPower.ini", "Data\\INI\\SpecialPower.ini" );
+	initSubsystem(TheRankInfoStore, new RankInfoStore(), NULL, "Data\\INI\\Rank");
+	initSubsystem(ThePlayerTemplateStore, new PlayerTemplateStore(), "Data\\INI\\Default\\PlayerTemplate", "Data\\INI\\PlayerTemplate");
+	initSubsystem(TheSpecialPowerStore, new SpecialPowerStore(), "Data\\INI\\Default\\SpecialPower", "Data\\INI\\SpecialPower" );
 	initSubsystem(TheParticleSystemManager, (ParticleSystemManager*)(new W3DParticleSystemManager()));
-	initSubsystem(TheFXListStore, new FXListStore(), "Data\\INI\\Default\\FXList.ini", "Data\\INI\\FXList.ini");
-	initSubsystem(TheWeaponStore, new WeaponStore(), NULL, "Data\\INI\\Weapon.ini");
-	initSubsystem(TheObjectCreationListStore, new ObjectCreationListStore(), "Data\\INI\\Default\\ObjectCreationList.ini", "Data\\INI\\ObjectCreationList.ini");
-	initSubsystem(TheLocomotorStore, new LocomotorStore(), NULL, "Data\\INI\\Locomotor.ini");
-	initSubsystem(TheDamageFXStore, new DamageFXStore(), NULL, "Data\\INI\\DamageFX.ini");
-	initSubsystem(TheArmorStore, new ArmorStore(), NULL, "Data\\INI\\Armor.ini");
-	initSubsystem(TheThingFactory, new ThingFactory(), "Data\\INI\\Default\\Object.ini", NULL, "Data\\INI\\Object");
-	initSubsystem(TheCrateSystem, new CrateSystem(), "Data\\INI\\Default\\Crate.ini", "Data\\INI\\Crate.ini");
-	initSubsystem(TheUpgradeCenter, new UpgradeCenter, "Data\\INI\\Default\\Upgrade.ini", "Data\\INI\\Upgrade.ini");
+	initSubsystem(TheFXListStore, new FXListStore(), "Data\\INI\\Default\\FXList", "Data\\INI\\FXList");
+	initSubsystem(TheWeaponStore, new WeaponStore(), NULL, "Data\\INI\\Weapon");
+	initSubsystem(TheObjectCreationListStore, new ObjectCreationListStore(), "Data\\INI\\Default\\ObjectCreationList", "Data\\INI\\ObjectCreationList");
+	initSubsystem(TheLocomotorStore, new LocomotorStore(), NULL, "Data\\INI\\Locomotor");
+	initSubsystem(TheDamageFXStore, new DamageFXStore(), NULL, "Data\\INI\\DamageFX");
+	initSubsystem(TheArmorStore, new ArmorStore(), NULL, "Data\\INI\\Armor");
+	initSubsystem(TheThingFactory, new ThingFactory(), "Data\\INI\\Default\\Object", "Data\\INI\\Object");
+	initSubsystem(TheCrateSystem, new CrateSystem(), "Data\\INI\\Default\\Crate", "Data\\INI\\Crate");
+	initSubsystem(TheUpgradeCenter, new UpgradeCenter, "Data\\INI\\Default\\Upgrade", "Data\\INI\\Upgrade");
 	initSubsystem(TheAnim2DCollection, new Anim2DCollection ); //Init's itself.
 
 	TheSubsystemListRecord.postProcessLoadAll();
@@ -433,8 +426,8 @@ BOOL CWorldBuilderApp::InitInstance()
 	DEBUG_ASSERTCRASH(!TheGlobalData->m_useHalfHeightMap, ("TheGlobalData->m_useHalfHeightMap : Don't use this setting in WB."));
 	TheWritableGlobalData->m_useHalfHeightMap = false;
 
-#if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
-	// WB never uses the shroud.
+#if ENABLE_CONFIGURABLE_SHROUD
+	// WB never uses the shroud. With shroud, terrain is black.
 	TheWritableGlobalData->m_shroudOn = FALSE;
 #endif
 
@@ -449,20 +442,20 @@ BOOL CWorldBuilderApp::InitInstance()
 
 	// Register the application's document templates.  Document templates
 	//  serve as the connection between documents, frame windows and views.
- 
+
 	m_3dtemplate = new CSingleDocTemplate(
 		IDR_MAPDOC,
 		RUNTIME_CLASS(CWorldBuilderDoc),
-		RUNTIME_CLASS(CWB3dFrameWnd), 
+		RUNTIME_CLASS(CWB3dFrameWnd),
 		RUNTIME_CLASS(WbView3d));
 
 	AddDocTemplate(m_3dtemplate);
 
 #ifdef MDI
-	CMainFrame* pMainFrame = new CMainFrame; 
-	if (!pMainFrame->LoadFrame(IDR_MAPDOC)) 
-		return FALSE; 
-	m_pMainWnd = pMainFrame; 
+	CMainFrame* pMainFrame = new CMainFrame;
+	if (!pMainFrame->LoadFrame(IDR_MAPDOC))
+		return FALSE;
+	m_pMainWnd = pMainFrame;
 #endif
 
 	// Parse command line for standard shell commands, DDE, file open
@@ -485,7 +478,7 @@ BOOL CWorldBuilderApp::InitInstance()
 //	if (!ProcessShellCommand(cmdInfo))
 //		return FALSE;
 
-	selectPointerTool();   
+	selectPointerTool();
 
 	CString openDir = this->GetProfileString(APP_SECTION, OPEN_FILE_DIR);
 	m_currentDirectory = openDir;
@@ -515,7 +508,7 @@ BOOL CWorldBuilderApp::OnCmdMsg(UINT nID, int nCode, void* pExtra,
 				{
 					// Update UI element state
 					CCmdUI *pUI = (CCmdUI*)pExtra;
-					pUI->SetCheck(m_curTool == pTool?1:0);	
+					pUI->SetCheck(m_curTool == pTool?1:0);
 					pUI->Enable(true);
 				}
 				return TRUE;
@@ -533,7 +526,7 @@ BOOL CWorldBuilderApp::OnCmdMsg(UINT nID, int nCode, void* pExtra,
 //=============================================================================
 /** Sets the active tool to the pointer, and clears the selection. */
 //=============================================================================
-void CWorldBuilderApp::selectPointerTool(void) 
+void CWorldBuilderApp::selectPointerTool(void)
 {
 	setActiveTool(&m_pointerTool);
 	// Clear selection.
@@ -545,7 +538,7 @@ void CWorldBuilderApp::selectPointerTool(void)
 //=============================================================================
 /** Sets the active tool, and activates it after deactivating the current tool. */
 //=============================================================================
-void CWorldBuilderApp::setActiveTool(Tool *pNewTool) 
+void CWorldBuilderApp::setActiveTool(Tool *pNewTool)
 {
 	if (m_curTool == pNewTool) {
 		// same tool
@@ -564,7 +557,7 @@ void CWorldBuilderApp::setActiveTool(Tool *pNewTool)
 //=============================================================================
 // CWorldBuilderApp::updateCurTool
 //=============================================================================
-/** Checks to see if any key modifiers (ctrl or alt) are pressed.  If so, 
+/** Checks to see if any key modifiers (ctrl or alt) are pressed.  If so,
 selectes the appropriate tool, else uses the normal tool. */
 //=============================================================================
 void CWorldBuilderApp::updateCurTool(Bool forceHand)
@@ -647,7 +640,7 @@ void CWorldBuilderApp::OnAppAbout()
 /////////////////////////////////////////////////////////////////////////////
 // CWorldBuilderApp message handlers
 
-int CWorldBuilderApp::ExitInstance() 
+int CWorldBuilderApp::ExitInstance()
 {
 
 	WriteProfileString(APP_SECTION, OPEN_FILE_DIR, m_currentDirectory.str());
@@ -659,6 +652,9 @@ int CWorldBuilderApp::ExitInstance()
 
 	WorldHeightMapEdit::shutdown();
 
+	delete TheFramePacer;
+	TheFramePacer = NULL;
+
 	delete TheFileSystem;
 	TheFileSystem = NULL;
 
@@ -678,20 +674,19 @@ int CWorldBuilderApp::ExitInstance()
 		TheMemoryPoolFactory->debugMemoryReport(REPORT_POOLINFO | REPORT_POOL_OVERFLOW | REPORT_SIMPLE_LEAKS, 0, 0);
 	#endif
 	shutdownMemoryManager();
-	DEBUG_SHUTDOWN();
 
 	return CWinApp::ExitInstance();
 }
 
-void CWorldBuilderApp::OnResetWindows() 
+void CWorldBuilderApp::OnResetWindows()
 {
 	if (CMainFrame::GetMainFrame()) {
 		CMainFrame::GetMainFrame()->ResetWindowPositions();
 	}
-	
+
 }
 
-void CWorldBuilderApp::OnFileOpen() 
+void CWorldBuilderApp::OnFileOpen()
 {
 #ifdef DO_MAPS_IN_DIRECTORIES
 	TOpenMapInfo info;
@@ -708,7 +703,7 @@ void CWorldBuilderApp::OnFileOpen()
 #endif
 
 	CFileStatus status;
-	if (m_currentDirectory != AsciiString("")) try {
+	if (!m_currentDirectory.isEmpty()) try {
 		if (CFile::GetStatus(m_currentDirectory.str(), status)) {
 			if (status.m_attribute & CFile::directory) {
 				::SetCurrentDirectory(m_currentDirectory.str());
@@ -719,15 +714,15 @@ void CWorldBuilderApp::OnFileOpen()
 	CWinApp::OnFileOpen();
 }
 
-void CWorldBuilderApp::OnTexturesizingMapclifftextures() 
+void CWorldBuilderApp::OnTexturesizingMapclifftextures()
 {
 	setActiveTool(&m_floodFillTool);
 	m_floodFillTool.setAdjustCliffs(true);
-	
+
 }
 
-void CWorldBuilderApp::OnUpdateTexturesizingMapclifftextures(CCmdUI* pCmdUI) 
+void CWorldBuilderApp::OnUpdateTexturesizingMapclifftextures(CCmdUI* pCmdUI)
 {
 	// TODO: Add your command update UI handler code here
-	
+
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp
index 3f695dbdeb2..dae135ea3e4 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp
@@ -59,11 +59,6 @@
 #include "WorldBuilderView.h"
 #include "MapPreview.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // Can't currently have multiple open... jba.
 #define notONLY_ONE_AT_A_TIME
@@ -196,17 +191,17 @@ class CachedMFCFileOutputStream : public OutputStream
 		c.pData = tmp;
 		c.size = numBytes;
 		m_cachedChunks.push_back(c);
-		DEBUG_LOG(("Caching %d bytes in chunk %d\n", numBytes, m_cachedChunks.size()));
+		DEBUG_LOG(("Caching %d bytes in chunk %d", numBytes, m_cachedChunks.size()));
 		m_totalBytes += numBytes;
 		return(numBytes);
 	};
 	virtual void flush(void) {
-		while (m_cachedChunks.size() != 0)//!m_cachedChunks.empty())
+		while (!m_cachedChunks.empty())//!m_cachedChunks.empty())
 		{
 			CachedChunk c = m_cachedChunks.front();
 			m_cachedChunks.pop_front();
 			try {
-				DEBUG_LOG(("Flushing %d bytes\n", c.size));
+				DEBUG_LOG(("Flushing %d bytes", c.size));
 				m_file->Write(c.pData, c.size);
 			} catch(...) {}
 			delete[] c.pData;
@@ -230,7 +225,7 @@ class CompressedCachedMFCFileOutputStream : public OutputStream
 		c.pData = tmp;
 		c.size = numBytes;
 		m_cachedChunks.push_back(c);
-		//DEBUG_LOG(("Caching %d bytes in chunk %d\n", numBytes, m_cachedChunks.size()));
+		//DEBUG_LOG(("Caching %d bytes in chunk %d", numBytes, m_cachedChunks.size()));
 		m_totalBytes += numBytes;
 		return(numBytes);
 	};
@@ -239,12 +234,12 @@ class CompressedCachedMFCFileOutputStream : public OutputStream
 			return;
 		UnsignedByte *srcBuffer = NEW UnsignedByte[m_totalBytes];
 		UnsignedByte *insertPos = srcBuffer;
-		while (m_cachedChunks.size() != 0)
+		while (!m_cachedChunks.empty())
 		{
 			CachedChunk c = m_cachedChunks.front();
 			m_cachedChunks.pop_front();
 			try {
-				//DEBUG_LOG(("Flushing %d bytes\n", c.size));
+				//DEBUG_LOG(("Flushing %d bytes", c.size));
 				memcpy(insertPos, c.pData, c.size);
 				insertPos += c.size;
 			} catch(...) {}
@@ -263,9 +258,9 @@ class CompressedCachedMFCFileOutputStream : public OutputStream
 		Int compressedLen = CompressionManager::getMaxCompressedSize( m_totalBytes, compressionToUse );
 		UnsignedByte *destBuffer = NEW UnsignedByte[compressedLen];
 		compressedLen = CompressionManager::compressData( compressionToUse, srcBuffer, m_totalBytes, destBuffer, compressedLen );
-		DEBUG_LOG(("Compressed %d bytes to %d bytes - compression of %g%%\n", m_totalBytes, compressedLen,
+		DEBUG_LOG(("Compressed %d bytes to %d bytes - compression of %g%%", m_totalBytes, compressedLen,
 			compressedLen/(Real)m_totalBytes*100.0f));
-		DEBUG_ASSERTCRASH(compressedLen, ("Failed to compress!\n"));
+		DEBUG_ASSERTCRASH(compressedLen, ("Failed to compress!"));
 		if (compressedLen)
 		{
 			m_file->Write(destBuffer, compressedLen);
@@ -287,7 +282,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 	ar.Flush();
 	m_waypointTableNeedsUpdate = true;
 	if (ar.IsStoring() && m_heightMap)
-	{	
+	{
 		try {
 			Int i;
 			MapPreview mPreview;
@@ -295,7 +290,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 
 			CompressedCachedMFCFileOutputStream theStream(ar.GetFile());
 			DataChunkOutput *chunkWriter = new DataChunkOutput(&theStream);
-			
+
 
 			m_heightMap->saveToFile(*chunkWriter);
  			/***************WAYPOINTS DATA ***************/
@@ -321,7 +316,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 		WorldHeightMapEdit *pOldHeightMap = m_heightMap;
 		CString pth = ar.GetFile()->GetFilePath();
 		CachedFileInputStream theInputStream;
-		if (theInputStream.open(AsciiString((const char *)pth))) 
+		if (theInputStream.open(AsciiString((const char *)pth)))
 		try {
 
 			WbApp()->selectPointerTool();
@@ -339,7 +334,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 				DataChunkInput file( pStrm );
 				if (file.isValidFileType()) {	// Backwards compatible files aren't valid data chunk files.
 					// Read the waypoints.
-					file.registerParser( AsciiString("WaypointsList"), AsciiString::TheEmptyString, ParseWaypointDataChunk );
+					file.registerParser( "WaypointsList", AsciiString::TheEmptyString, ParseWaypointDataChunk );
 					if (!file.parse(this)) {
 						throw(ERROR_CORRUPT_FILE_FORMAT);
 					}
@@ -359,13 +354,13 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 			m_heightMap->optimizeTiles(); // force to optimize tileset
 			SetHeightMap(m_heightMap, true);
 			Coord3D center;
-			center.x = MAP_XY_FACTOR*m_heightMap->getXExtent()/2; 
+			center.x = MAP_XY_FACTOR*m_heightMap->getXExtent()/2;
 			center.y = MAP_XY_FACTOR*m_heightMap->getYExtent()/2;
 			center.x -= m_heightMap->getBorderSize();
 			center.y -= m_heightMap->getBorderSize();
 			/* update objects. */
 			AsciiString startingCamName = TheNameKeyGenerator->keyToName(TheKey_InitialCameraPosition);
-			
+
 			TheLayersList->resetLayers();
 			AsciiString layerName;
 			Bool exists;
@@ -377,7 +372,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 			TheLayersList->disableUpdates();
 			MapObject *pMapObj = MapObject::getFirstMapObject();
 			while (pMapObj) {
-								
+
 				// Then, add it to the Layers List
 				layerName = pMapObj->getProperties()->getAsciiString(TheKey_objectLayer, &exists);
 				if (exists) {
@@ -409,7 +404,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 
 				polyTrigger = polyTrigger->getNext();
 			}
-			
+
 			TheLayersList->enableUpdates();
 
 			TerrainMaterial::updateTextures(m_heightMap);
@@ -439,10 +434,10 @@ void CWorldBuilderDoc::Serialize(CArchive& ar)
 
 AsciiString ConvertToNonGCName(AsciiString name, Bool checkTemplate=true)
 {
-	char oldName[256];
+	const char* replacePrefix = "GC_";
+	const size_t offset = name.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
 	char newName[256];
-	strcpy(oldName, name.str());
-	strcpy(newName, oldName+strlen("GC_"));
+	strlcpy(newName, name.str() + offset, ARRAY_SIZE(newName));
 	AsciiString swapName;
 	swapName.set(newName);
 	if (checkTemplate)
@@ -458,11 +453,11 @@ AsciiString ConvertToNonGCName(AsciiString name, Bool checkTemplate=true)
 
 AsciiString ConvertName(AsciiString name)
 {
-	char oldName[256];
+	const char* replacePrefix = "Fundamentalist";
+	const size_t offset = name.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
 	char newName[256];
-	strcpy(oldName, name.str());
 	strcpy(newName, "GLA");
-	strcat(newName, oldName+strlen("Fundamentalist"));
+	strlcat(newName, name.str() + offset, ARRAY_SIZE(newName));
 	AsciiString swapName;
 	swapName.set(newName);
 	const ThingTemplate *tt = TheThingFactory->findTemplate(swapName);
@@ -474,11 +469,11 @@ AsciiString ConvertName(AsciiString name)
 
 AsciiString ConvertFaction(AsciiString name)
 {
-	char oldName[256];
+	const char* replacePrefix = "FactionFundamentalist";
+	const size_t offset = name.startsWith(replacePrefix) ? strlen(replacePrefix) : 0u;
 	char newName[256];
-	strcpy(oldName, name.str());
 	strcpy(newName, "FactionGLA");
-	strcat(newName, oldName+strlen("FactionFundamentalist"));
+	strlcat(newName, name.str() + offset, ARRAY_SIZE(newName));
 	AsciiString swapName;
 	swapName.set(newName);
 	const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(swapName));
@@ -490,7 +485,7 @@ AsciiString ConvertFaction(AsciiString name)
 
 void CWorldBuilderDoc::validate(void)
 {
-	DEBUG_LOG(("Validating\n"));
+	DEBUG_LOG(("Validating"));
 
 	Dict swapDict;
 	Bool changed = false;
@@ -500,7 +495,7 @@ void CWorldBuilderDoc::validate(void)
 
 	// verify/fix the build lists
 	for (int side=0; side<TheSidesList->getNumSides(); side++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(side); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(side);
 
 		AsciiString tmplname = pSide->getDict()->getAsciiString(TheKey_playerFaction);
 		AsciiString playername = pSide->getDict()->getAsciiString(TheKey_playerName);
@@ -509,11 +504,11 @@ void CWorldBuilderDoc::validate(void)
 		}
 		const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(tmplname));
 		if (!pt) {
-			DEBUG_LOG(("Player '%s' Faction '%s' could not be found in sides list!\n", playername.str(), tmplname.str()));
+			DEBUG_LOG(("Player '%s' Faction '%s' could not be found in sides list!", playername.str(), tmplname.str()));
 			if (tmplname.startsWith("FactionFundamentalist")) {
 				swapName = ConvertFaction(tmplname);
 				if (swapName != AsciiString::TheEmptyString) {
-					DEBUG_LOG(("Changing Faction from %s to %s\n", tmplname.str(), swapName.str()));
+					DEBUG_LOG(("Changing Faction from %s to %s", tmplname.str(), swapName.str()));
 					pSide->getDict()->setAsciiString(TheKey_playerFaction, swapName);
 				}
 			}
@@ -525,7 +520,7 @@ void CWorldBuilderDoc::validate(void)
 			if (name.startsWith("Fundamentalist")) {
 				swapName = ConvertName(name);
 				if (swapName != AsciiString::TheEmptyString) {
-					DEBUG_LOG(("Changing BuildList from %s to %s\n", name.str(), swapName.str()));
+					DEBUG_LOG(("Changing BuildList from %s to %s", name.str(), swapName.str()));
 					pBuild->setTemplateName(swapName);
 				}
 			}
@@ -540,7 +535,7 @@ void CWorldBuilderDoc::validate(void)
 		if (type.startsWith("Fundamentalist")) {					\
 			swapName = ConvertName(type);										\
 			if (swapName != AsciiString::TheEmptyString) {	\
-				DEBUG_LOG(("Changing Team Ref from %s to %s\n", type.str(), swapName.str())); \
+				DEBUG_LOG(("Changing Team Ref from %s to %s", type.str(), swapName.str())); \
 				teamDict->setAsciiString(key, swapName);			\
 			}																								\
 		}																									\
@@ -575,7 +570,7 @@ void CWorldBuilderDoc::validate(void)
 		// at this point, only objects with models and teams should be left to process
 
 		// start by verifying the ThingTemplate for the object.
-		// swapDict contains a 'history' of missing model swaps done this load, so all objects with a 
+		// swapDict contains a 'history' of missing model swaps done this load, so all objects with a
 		// particular name are replaced with the exact same model.
 		AsciiString name = pMapObj->getName();
 		if (pMapObj->getThingTemplate() == NULL)
@@ -617,14 +612,14 @@ void CWorldBuilderDoc::validate(void)
 				}
 			}
 			swapName = swapDict.getAsciiString(NAMEKEY(name), &exists);
-			if (exists) 
+			if (exists)
 			{
 				const ThingTemplate *tt = TheThingFactory->findTemplate(swapName);
 				if (tt) {
 					changed = true;
 					pMapObj->setName(swapName);
 					pMapObj->setThingTemplate(tt);
-					DEBUG_LOG(("Changing Map Object from %s to %s\n", name.str(), swapName.str()));
+					DEBUG_LOG(("Changing Map Object from %s to %s", name.str(), swapName.str()));
 				}
 			}
 		}
@@ -647,26 +642,26 @@ void CWorldBuilderDoc::validate(void)
 					}
 					const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(tmplname));
 					if (!pt) {
-						DEBUG_LOG(("Player '%s' Faction '%s' could not be found in sides list!\n", playername.str(), tmplname.str()));
+						DEBUG_LOG(("Player '%s' Faction '%s' could not be found in sides list!", playername.str(), tmplname.str()));
 						if (tmplname.startsWith("FactionFundamentalist")) {
 							swapName = ConvertFaction(tmplname);
 							if (swapName != AsciiString::TheEmptyString) {
-								DEBUG_LOG(("Changing Faction from %s to %s\n", tmplname.str(), swapName.str()));
+								DEBUG_LOG(("Changing Faction from %s to %s", tmplname.str(), swapName.str()));
 								pSide->getDict()->setAsciiString(TheKey_playerFaction, swapName);
 							}
 						}
 					}
 				} else {
 					needToFixTeams = true;
-					DEBUG_LOG(("Side '%s' could not be found in sides list!\n", teamOwner.str()));
+					DEBUG_LOG(("Side '%s' could not be found in sides list!", teamOwner.str()));
 				}
 			} else {
 				needToFixTeams = true;
-				DEBUG_LOG(("Team '%s' could not be found in sides list!\n", teamName.str()));
+				DEBUG_LOG(("Team '%s' could not be found in sides list!", teamName.str()));
 			}
 		} else {
 			needToFixTeams = true;
-			DEBUG_LOG(("Object '%s' does not have a team at all!\n", name.str()));
+			DEBUG_LOG(("Object '%s' does not have a team at all!", name.str()));
 		}
 	}
 	if (needToFixTeams) {
@@ -679,13 +674,13 @@ void CWorldBuilderDoc::OnJumpToGame()
 	try {
 		DoFileSave();
 		CString filename;
-		DEBUG_LOG(("strTitle=%s strPathName=%s\n", m_strTitle, m_strPathName));
+		DEBUG_LOG(("strTitle=%s strPathName=%s", m_strTitle, m_strPathName));
 		if (strstr(m_strPathName, TheGlobalData->getPath_UserData().str()) != NULL)
-			filename.Format("%sMaps\\%s", TheGlobalData->getPath_UserData().str(), m_strTitle);
+			filename.Format("%sMaps\\%s", TheGlobalData->getPath_UserData().str(), static_cast<const char*>(m_strTitle));
 		else
-			filename.Format("Maps\\%s", m_strTitle);
+			filename.Format("Maps\\%s", static_cast<const char*>(m_strTitle));
 
-		/*int retval =*/ _spawnl(_P_NOWAIT, "\\projects\\rts\\run\\rtsi.exe", "ignored", "-scriptDebug", "-win", "-file", filename, NULL);
+		/*int retval =*/ _spawnl(_P_NOWAIT, "\\projects\\rts\\run\\rtsi.exe", "ignored", "-scriptDebug", "-win", "-file", static_cast<const char*>(filename), NULL);
 	} catch (...) {
 	}
 }
@@ -825,8 +820,8 @@ BOOL CWorldBuilderDoc::DoSave(LPCTSTR lpszPathName, BOOL bReplace)
 * CWorldBuilderDoc::ParseWaypointDataChunk - read a waypoint chunk.
 * Format is the newer CHUNKY format.
 *	See WHeightMapEdit.cpp for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool CWorldBuilderDoc::ParseWaypointDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -838,8 +833,8 @@ Bool CWorldBuilderDoc::ParseWaypointDataChunk(DataChunkInput &file, DataChunkInf
 * CWorldBuilderDoc::ParseWaypointData - read waypoint data chunk.
 * Format is the newer CHUNKY format.
 *	See WorldBuilderDoc.cpp for the writer.
-*	Input: DataChunkInput 
-*		
+*	Input: DataChunkInput
+*
 */
 Bool CWorldBuilderDoc::ParseWaypointData(DataChunkInput &file, DataChunkInfo *info, void *userData)
 {
@@ -848,7 +843,7 @@ Bool CWorldBuilderDoc::ParseWaypointData(DataChunkInput &file, DataChunkInfo *in
 	for (i=0; i<m_numWaypointLinks; i++) {
 		this->m_waypointLinks[i].waypoint1 = file.readInt();
 		this->m_waypointLinks[i].waypoint2 = file.readInt();
-		//DEBUG_LOG(("Waypoint link from %d to %d\n", m_waypointLinks[i].waypoint1, m_waypointLinks[i].waypoint2));
+		//DEBUG_LOG(("Waypoint link from %d to %d", m_waypointLinks[i].waypoint1, m_waypointLinks[i].waypoint2));
 	}
 	DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
 	return true;
@@ -969,7 +964,7 @@ void CWorldBuilderDoc::AddAndDoUndoable(Undoable *pUndo)
 	}
 }
 
-void CWorldBuilderDoc::OnEditRedo() 
+void CWorldBuilderDoc::OnEditRedo()
 {
 	Undoable *pUndo = m_undoList;
 	m_needAutosave = true;
@@ -989,12 +984,12 @@ void CWorldBuilderDoc::OnEditRedo()
 	}
 }
 
-void CWorldBuilderDoc::OnUpdateEditRedo(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateEditRedo(CCmdUI* pCmdUI)
 {
 	pCmdUI->Enable(m_undoList!=NULL && m_curRedo>0);
 }
 
-void CWorldBuilderDoc::OnEditUndo() 
+void CWorldBuilderDoc::OnEditUndo()
 {
 	Undoable *pUndo = m_undoList;
 	m_needAutosave = true;
@@ -1020,7 +1015,7 @@ void CWorldBuilderDoc::OnTogglePitchAndRotation( void )
 	}
 }
 
-void CWorldBuilderDoc::OnUpdateEditUndo(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateEditUndo(CCmdUI* pCmdUI)
 {
 	Bool canUndo=false;
 	if (m_undoList!=NULL) {
@@ -1040,7 +1035,7 @@ void CWorldBuilderDoc::OnUpdateEditUndo(CCmdUI* pCmdUI)
 }
 
 
-void CWorldBuilderDoc::OnTsInfo() 
+void CWorldBuilderDoc::OnTsInfo()
 {
 	if (m_heightMap) {
 		m_heightMap->showTileStatusInfo();
@@ -1048,7 +1043,7 @@ void CWorldBuilderDoc::OnTsInfo()
 }
 
 
-void CWorldBuilderDoc::OnTsCanonical() 
+void CWorldBuilderDoc::OnTsCanonical()
 {
 	if (m_heightMap) {
 
@@ -1059,19 +1054,19 @@ void CWorldBuilderDoc::OnTsCanonical()
 			updateHeightMap(htMapEditCopy, false, partialRange);
 			WBDocUndoable *pUndo = new WBDocUndoable(this, htMapEditCopy);
 			this->AddAndDoUndoable(pUndo);
-			REF_PTR_RELEASE(pUndo); // belongs to this now.	
+			REF_PTR_RELEASE(pUndo); // belongs to this now.
 		} else {
 			::Beep(1000,500);
 		}
 		REF_PTR_RELEASE(htMapEditCopy);
-	}	
+	}
 }
 
-void CWorldBuilderDoc::OnUpdateTsCanonical(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateTsCanonical(CCmdUI* pCmdUI)
 {
 }
 
-void CWorldBuilderDoc::OnFileResize() 
+void CWorldBuilderDoc::OnFileResize()
 {
 	TNewHeightInfo hi;
 	hi.initialHeight = 8;
@@ -1091,7 +1086,7 @@ void CWorldBuilderDoc::OnFileResize()
 	WorldHeightMapEdit *htMapEditCopy = GetHeightMap()->duplicate();
 	if (htMapEditCopy == NULL) return;
 	Coord3D objOffset;
-	if (htMapEditCopy->resize(hi.xExtent, hi.yExtent, hi.initialHeight, hi.borderWidth, 
+	if (htMapEditCopy->resize(hi.xExtent, hi.yExtent, hi.initialHeight, hi.borderWidth,
 		hi.anchorTop, hi.anchorBottom, hi.anchorLeft, hi.anchorRight, &objOffset)) {  // does all the work.
 		WBDocUndoable *pUndo = new WBDocUndoable(this, htMapEditCopy, &objOffset);
 		this->AddAndDoUndoable(pUndo);
@@ -1115,7 +1110,7 @@ void CWorldBuilderDoc::OnFileResize()
 }
 
 
-void CWorldBuilderDoc::OnTsRemap() 
+void CWorldBuilderDoc::OnTsRemap()
 {
 	if (m_heightMap) {
 		WorldHeightMapEdit *htMapEditCopy = GetHeightMap()->duplicate();
@@ -1130,7 +1125,7 @@ void CWorldBuilderDoc::OnTsRemap()
 			::Beep(1000,500);
 		}
 		REF_PTR_RELEASE(htMapEditCopy);
-	}	
+	}
 }
 
 /* static */ CWorldBuilderDoc *CWorldBuilderDoc::GetActiveDoc()
@@ -1151,7 +1146,7 @@ void CWorldBuilderDoc::OnTsRemap()
 		}
 	}
 
-#else 
+#else
 // only works for SDI, not MDI
 	return (CWorldBuilderDoc*)CMainFrame::GetMainFrame()->GetActiveDocument();
 #endif
@@ -1271,7 +1266,6 @@ BOOL CWorldBuilderDoc::OnNewDocument()
 	m_waypointTableNeedsUpdate = true;
 	m_curWaypointID = 0;
 	WbApp()->selectPointerTool();
-	PolygonTrigger::deleteTriggers();
 
 	// Make sure that all the old units are removed from the list.
 	// Bug fix by MLL 1/14/03
@@ -1279,6 +1273,9 @@ BOOL CWorldBuilderDoc::OnNewDocument()
 	TheLayersList->resetLayers();
 	TheLayersList->disableUpdates();
 
+	// TheSuperHackers @bugfix Caball009 20/06/2025 Must not delete polygon triggers before calling enableUpdates.
+	PolygonTrigger::deleteTriggers();
+
 	TheSidesList->clear();
 	TheSidesList->validateSides();
 
@@ -1291,10 +1288,10 @@ BOOL CWorldBuilderDoc::OnNewDocument()
 	// note - mHeight map has ref count of 1.
 
 	// Create a default water area.
-	PolygonTrigger *pTrig = newInstance(PolygonTrigger)(4); 
+	PolygonTrigger *pTrig = newInstance(PolygonTrigger)(4);
 	ICoord3D loc;
 	pTrig->setWaterArea(true);
-	pTrig->setTriggerName(AsciiString("Default Water"));
+	pTrig->setTriggerName("Default Water");
 	loc.x = -hi.borderWidth*MAP_XY_FACTOR;
 	loc.y = -hi.borderWidth*MAP_XY_FACTOR;
 	loc.z = TheGlobalData->m_waterPositionZ;
@@ -1306,7 +1303,7 @@ BOOL CWorldBuilderDoc::OnNewDocument()
 	loc.x = -hi.borderWidth*MAP_XY_FACTOR;
 	pTrig->addPoint(loc);
 	PolygonTrigger::addPolygonTrigger(pTrig);
-	TheLayersList->addPolygonTriggerToLayersList(pTrig, pTrig->getLayerName()); 
+	TheLayersList->addPolygonTriggerToLayersList(pTrig, pTrig->getLayerName());
 	SetHeightMap(m_heightMap, true);
 	TerrainMaterial::updateTextures(m_heightMap);
 
@@ -1391,7 +1388,7 @@ void CWorldBuilderDoc::updateHeightMap(WorldHeightMap *htMap, Bool partial, cons
 	}
 }
 
-BOOL CWorldBuilderDoc::OnOpenDocument(LPCTSTR lpszPathName) 
+BOOL CWorldBuilderDoc::OnOpenDocument(LPCTSTR lpszPathName)
 {
 #ifdef ONLY_ONE_AT_A_TIME
 	if (gAlreadyOpen) {
@@ -1399,8 +1396,8 @@ BOOL CWorldBuilderDoc::OnOpenDocument(LPCTSTR lpszPathName)
 		return FALSE;
 	}
 #endif
-	
-	// Open document dialog may change working directory, 
+
+	// Open document dialog may change working directory,
 	// let the app know what it was for future opens, and change it back.
 	char buf[_MAX_PATH];
 	::GetCurrentDirectory(_MAX_PATH, buf);
@@ -1408,43 +1405,41 @@ BOOL CWorldBuilderDoc::OnOpenDocument(LPCTSTR lpszPathName)
 	// clear out map-specific text
 	TheGameText->reset();
 	AsciiString s = lpszPathName;
-	while (s.getLength() && s.getCharAt(s.getLength()-1) != '\\')
-		s.removeLastChar();
+	const char* lastSep = s.reverseFind('\\');
+	if (lastSep != NULL)
+	{
+		s.truncateTo(lastSep - s.str() + 1);
+	}
 	s.concat("map.str");
-	DEBUG_LOG(("Looking for map-specific text in [%s]\n", s.str()));
+	DEBUG_LOG(("Looking for map-specific text in [%s]", s.str()));
 	TheGameText->initMapStringFile(s);
 
 	WbApp()->setCurrentDirectory(AsciiString(buf));
 	::GetModuleFileName(NULL, buf, sizeof(buf));
-	char *pEnd = buf + strlen(buf);
-	while (pEnd != buf) {
-		if (*pEnd == '\\') {
-			*pEnd = 0;
-			break;
-		}
-		pEnd--;
+	if (char *pEnd = strrchr(buf, '\\')) {
+		*pEnd = 0;
 	}
 	::SetCurrentDirectory(buf);
 
 	if (!CDocument::OnOpenDocument(lpszPathName))
 		return FALSE;
-	
+
 	Create3DView();
-	
+
 	return TRUE;
 }
 
 //=============================================================================
 // CWorldBuilderView::getCellIndexFromPoint
 //=============================================================================
-/** Given a cursor location, return the x and y index into the height map. 
+/** Given a cursor location, return the x and y index into the height map.
 If the location is outside the height map, returns false. */
 //=============================================================================
 Bool CWorldBuilderDoc::getCellIndexFromCoord(Coord3D cpt, CPoint *ndxP)
 {
 	// Set up default return value.
 	ndxP->x = -1;
-	ndxP->y = -1;	 
+	ndxP->y = -1;
 	Bool inMap = true;
 
 	WorldHeightMapEdit *pMap = GetHeightMap();
@@ -1466,7 +1461,7 @@ Bool CWorldBuilderDoc::getCellIndexFromCoord(Coord3D cpt, CPoint *ndxP)
 	Int yIndex = floor(cpt.y/MAP_XY_FACTOR);
 
 	yIndex += pMap->getBorderSize();
-	
+
 
 	// If negative, outside of map so return default.
 	if (yIndex<0) {
@@ -1505,7 +1500,7 @@ void CWorldBuilderDoc::getCoordFromCellIndex(CPoint ndx, Coord3D* pt)
 // CWorldBuilderView::getAllIndexesInRect
 //=============================================================================
 //=============================================================================
-Bool CWorldBuilderDoc::getAllIndexesInRect(const Coord3D* bl, const Coord3D* br, 
+Bool CWorldBuilderDoc::getAllIndexesInRect(const Coord3D* bl, const Coord3D* br,
 																					 const Coord3D* tl, const Coord3D* tr,
 																					 Int widthOutside, VecHeightMapIndexes* allIndices)
 {
@@ -1516,9 +1511,9 @@ Bool CWorldBuilderDoc::getAllIndexesInRect(const Coord3D* bl, const Coord3D* br,
 	}
 
 	Coord3D center = { (bl->x + tr->x) / 2, (bl->y + tr->y) / 2, (bl->z + tr->z) / 2 };
-	
+
 	allIndices->clear();
-	
+
 	CPoint ndx;
 
 	FindIndexNearest(this, &center, &ndx, PREFER_CENTER);
@@ -1529,21 +1524,21 @@ Bool CWorldBuilderDoc::getAllIndexesInRect(const Coord3D* bl, const Coord3D* br,
 
 	FindIndexNearest(this, &center, &ndx, PREFER_TOP);
 	AddUniqueAndNeighbors(this, bl, br, tl, tr, ndx, allIndices);
-	
+
 	FindIndexNearest(this, &center, &ndx, PREFER_RIGHT);
 	AddUniqueAndNeighbors(this, bl, br, tl, tr, ndx, allIndices);
-	
+
 	FindIndexNearest(this, &center, &ndx, PREFER_BOTTOM);
 	AddUniqueAndNeighbors(this, bl, br, tl, tr, ndx, allIndices);
-	
-	return (allIndices->size() > 0);
+
+	return (!allIndices->empty());
 }
 
 
 //=============================================================================
 // CWorldBuilderView::getCellPositionFromPoint
 //=============================================================================
-/** Given a pixel position, returns the x/y location in the height map.  This 
+/** Given a pixel position, returns the x/y location in the height map.  This
 will return real values, so a position can be 1.7, 2.4 or such.  If the position
 is not over the height map, return -1, -1. */
 //=============================================================================
@@ -1577,7 +1572,7 @@ void CWorldBuilderDoc::getObjArrowPoint(MapObject *pObj, Coord3D *location)
  	float angle = pObj->getAngle();
 	// The arrow starts in the +x direction.
 	Vector3 arrow(1.2f*MAP_XY_FACTOR, 0, 0);
-	// Rotate 
+	// Rotate
 	arrow.Rotate_Z(angle);
 	// Rotated.
 	location->x = arrow.X;
@@ -1588,18 +1583,18 @@ void CWorldBuilderDoc::getObjArrowPoint(MapObject *pObj, Coord3D *location)
 	//location->z += loc.z;
 }
 
-void CWorldBuilderDoc::OnEditLinkCenters() 
+void CWorldBuilderDoc::OnEditLinkCenters()
 {
 	m_linkCenters = !m_linkCenters;
 }
 
-void CWorldBuilderDoc::OnUpdateEditLinkCenters(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateEditLinkCenters(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_linkCenters?1:0);
 }
 
-BOOL CWorldBuilderDoc::CanCloseFrame(CFrameWnd* pFrame) 
-{	
+BOOL CWorldBuilderDoc::CanCloseFrame(CFrameWnd* pFrame)
+{
 	CView *pView = this->Get2DView();
 	if (pView && pView->GetParentFrame() == pFrame) {
 		return true; // can always close the 2d window.
@@ -1607,7 +1602,7 @@ BOOL CWorldBuilderDoc::CanCloseFrame(CFrameWnd* pFrame)
 	return SaveModified();
 }
 
-void CWorldBuilderDoc::OnViewTimeOfDay() 
+void CWorldBuilderDoc::OnViewTimeOfDay()
 {
 	WbView3d * pView = Get3DView();
 	if (pView) {
@@ -1615,7 +1610,7 @@ void CWorldBuilderDoc::OnViewTimeOfDay()
 	}
 }
 
-void CWorldBuilderDoc::OnWindow2dwindow() 
+void CWorldBuilderDoc::OnWindow2dwindow()
 {
 /*
 	CView *pView = this->Get2DView();
@@ -1632,7 +1627,7 @@ void CWorldBuilderDoc::OnWindow2dwindow()
 */
 }
 
-void CWorldBuilderDoc::OnUpdateWindow2dwindow(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateWindow2dwindow(CCmdUI* pCmdUI)
 {
 /*
 	CView *pView = this->Get2DView();
@@ -1643,14 +1638,14 @@ void CWorldBuilderDoc::OnUpdateWindow2dwindow(CCmdUI* pCmdUI)
 //=============================================================================
 // CWorldBuilderDoc::compressWaypointIds
 //=============================================================================
-/** Renumbers the waypoints and the links that reference them, removing any 
+/** Renumbers the waypoints and the links that reference them, removing any
 unused ids. */
 //=============================================================================
 void CWorldBuilderDoc::compressWaypointIds(void)
 {
 	updateWaypointTable();
 	m_curWaypointID = 0;
-	MapObject *pMapObj = NULL; 
+	MapObject *pMapObj = NULL;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj->isWaypoint()) {
 			Int nwpid = getNextWaypointID();
@@ -1697,10 +1692,10 @@ void CWorldBuilderDoc::compressWaypointIds(void)
 // CWorldBuilderDoc::updateWaypointTable
 //=============================================================================
 /** If any waypoints have changed (m_waypointTableNeedsUpdate) updates the waypoint
-table.  The waypoint table is used to locate waypoints by id, without searching 
+table.  The waypoint table is used to locate waypoints by id, without searching
 the objects list. (See getWaypointByID()) */
 //=============================================================================
-void CWorldBuilderDoc::updateWaypointTable(void) 
+void CWorldBuilderDoc::updateWaypointTable(void)
 {
 	if (m_waypointTableNeedsUpdate) {
 		m_waypointTableNeedsUpdate=false;
@@ -1709,7 +1704,7 @@ void CWorldBuilderDoc::updateWaypointTable(void)
 			m_waypointTable[i] = NULL;
 		}
 
-		MapObject *pMapObj = NULL; 
+		MapObject *pMapObj = NULL;
 		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 			if (pMapObj->isWaypoint()) {
 				Int id = pMapObj->getWaypointID();
@@ -1733,7 +1728,7 @@ void CWorldBuilderDoc::updateWaypointTable(void)
 //=============================================================================
 /** Adds a waypoint link between two waypoints, referenced by waypoint id. */
 //=============================================================================
-void CWorldBuilderDoc::addWaypointLink(Int waypointID1, Int waypointID2) 
+void CWorldBuilderDoc::addWaypointLink(Int waypointID1, Int waypointID2)
 {
 	Int i;
 	for (i=0; i<m_numWaypointLinks; i++) {
@@ -1755,7 +1750,7 @@ void CWorldBuilderDoc::addWaypointLink(Int waypointID1, Int waypointID2)
 //=============================================================================
 /** Removes a waypoint link between two waypoints, referenced by waypoint id. */
 //=============================================================================
-void CWorldBuilderDoc::removeWaypointLink(Int waypointID1, Int waypointID2) 
+void CWorldBuilderDoc::removeWaypointLink(Int waypointID1, Int waypointID2)
 {
 	Int i;
 	for (i=0; i<m_numWaypointLinks; i++) {
@@ -1785,7 +1780,7 @@ MapObject *CWorldBuilderDoc::getWaypointByID(Int waypointID)
 			return pObj;
 		}
 		DEBUG_ASSERTCRASH(pObj==NULL, ("Waypoint links to an obj that isn't a waypoint."));
-	} 
+	}
 	return NULL;
 }
 
@@ -1883,12 +1878,12 @@ void CWorldBuilderDoc::updateLWL(MapObject *pWay, MapObject *pSrcWay)
 				if (pObj == pCurWay) {
 					process = true;
 					pNewWay = m_waypointTable[waypointID2];
-				} 
+				}
 				pObj = m_waypointTable[waypointID2];
 				if (pObj == pCurWay) {
 					process = true;
 					pNewWay = m_waypointTable[waypointID1];
-				} 
+				}
 			}
 			if (process) {
 				m_waypointLinks[i].processedFlag = true;
@@ -1905,7 +1900,7 @@ void CWorldBuilderDoc::updateLWL(MapObject *pWay, MapObject *pSrcWay)
 //=============================================================================
 // CWorldBuilderDoc::getWaypointLink
 //=============================================================================
-/** Returns the two waypoint ID's that are linked.  Note that due to edits, one 
+/** Returns the two waypoint ID's that are linked.  Note that due to edits, one
 or both waypoints may have been deleted. */
 //=============================================================================
 void CWorldBuilderDoc::getWaypointLink(Int ndx, Int *waypointID1, Int *waypointID2)
@@ -1921,10 +1916,10 @@ void CWorldBuilderDoc::getWaypointLink(Int ndx, Int *waypointID1, Int *waypointI
 //=============================================================================
 // CWorldBuilderDoc::waypointLinkExists
 //=============================================================================
-/** Returns true if the two waypoint ID's are linked.  Note that due to edits, one 
+/** Returns true if the two waypoint ID's are linked.  Note that due to edits, one
 or both waypoints may have been deleted. */
 //=============================================================================
-Bool CWorldBuilderDoc::waypointLinkExists(Int waypointID1, Int waypointID2) 
+Bool CWorldBuilderDoc::waypointLinkExists(Int waypointID1, Int waypointID2)
 {
 	Int i;
 	for (i=0; i<m_numWaypointLinks; i++) {
@@ -1937,7 +1932,7 @@ Bool CWorldBuilderDoc::waypointLinkExists(Int waypointID1, Int waypointID2)
 }
 
 
-void CWorldBuilderDoc::OnViewReloadtextures() 
+void CWorldBuilderDoc::OnViewReloadtextures()
 {
 	WW3D::_Invalidate_Textures();
 	WorldHeightMapEdit *pMap = GetHeightMap();
@@ -1946,7 +1941,7 @@ void CWorldBuilderDoc::OnViewReloadtextures()
 	updateHeightMap(pMap, false, range);
 }
 
-void CWorldBuilderDoc::OnEditScripts() 
+void CWorldBuilderDoc::OnEditScripts()
 {
 	ASSERT(CMainFrame::GetMainFrame());
 	CMainFrame::GetMainFrame()->onEditScripts();
@@ -1962,11 +1957,11 @@ void CWorldBuilderDoc::OnViewHome()
 	MapObject *pMapObj = MapObject::getFirstMapObject();
 
 	// set pos to be the coordinates of the center of the map
-	pos.x = MAP_XY_FACTOR*m_heightMap->getXExtent()/2; 
+	pos.x = MAP_XY_FACTOR*m_heightMap->getXExtent()/2;
 	pos.y = MAP_XY_FACTOR*m_heightMap->getYExtent()/2;
 	pos.x -= MAP_XY_FACTOR*m_heightMap->getBorderSize();
 	pos.y -= MAP_XY_FACTOR*m_heightMap->getBorderSize();
-	
+
 	// if waypoint "InitialCameraPosition" exists, replace pos with the appropriate coordinates
 	while (pMapObj) {
 		if (pMapObj->isWaypoint()) {
@@ -1987,19 +1982,19 @@ void CWorldBuilderDoc::OnViewHome()
 	}
 }
 
-void CWorldBuilderDoc::OnTexturesizingTile4x4() 
+void CWorldBuilderDoc::OnTexturesizingTile4x4()
 {
 #ifdef EVAL_TILING_MODES
 	WorldHeightMapEdit *pMap = GetHeightMap();
 	pMap->m_tileMode = WorldHeightMap::TILE_4x4;
 	IRegion2D range = {0,0,0,0};
 	updateHeightMap(pMap, false, range);
-#else 
+#else
 	::AfxMessageBox("Feature not currently enabled.", MB_OK);
 #endif
 }
 
-void CWorldBuilderDoc::OnUpdateTexturesizingTile4x4(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateTexturesizingTile4x4(CCmdUI* pCmdUI)
 {
 #ifdef EVAL_TILING_MODES
 	WorldHeightMapEdit *pMap = GetHeightMap();
@@ -2007,19 +2002,19 @@ void CWorldBuilderDoc::OnUpdateTexturesizingTile4x4(CCmdUI* pCmdUI)
 #endif
 }
 
-void CWorldBuilderDoc::OnTexturesizingTile6x6() 
+void CWorldBuilderDoc::OnTexturesizingTile6x6()
 {
 #ifdef EVAL_TILING_MODES
 	WorldHeightMapEdit *pMap = GetHeightMap();
 	pMap->m_tileMode = WorldHeightMap::TILE_6x6;
 	IRegion2D range = {0,0,0,0};
 	updateHeightMap(pMap, false, range);
-#else 
+#else
 	::AfxMessageBox("Feature not currently enabled.", MB_OK);
 #endif
 }
 
-void CWorldBuilderDoc::OnUpdateTexturesizingTile6x6(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateTexturesizingTile6x6(CCmdUI* pCmdUI)
 {
 #ifdef EVAL_TILING_MODES
 	WorldHeightMapEdit *pMap = GetHeightMap();
@@ -2027,19 +2022,19 @@ void CWorldBuilderDoc::OnUpdateTexturesizingTile6x6(CCmdUI* pCmdUI)
 #endif
 }
 
-void CWorldBuilderDoc::OnTexturesizingTile8x8() 
+void CWorldBuilderDoc::OnTexturesizingTile8x8()
 {
 #ifdef EVAL_TILING_MODES
 	WorldHeightMapEdit *pMap = GetHeightMap();
 	pMap->m_tileMode = WorldHeightMap::TILE_8x8;
 	IRegion2D range = {0,0,0,0};
 	updateHeightMap(pMap, false, range);
-#else 
+#else
 	::AfxMessageBox("Feature not currently enabled.", MB_OK);
 #endif
 }
 
-void CWorldBuilderDoc::OnUpdateTexturesizingTile8x8(CCmdUI* pCmdUI) 
+void CWorldBuilderDoc::OnUpdateTexturesizingTile8x8(CCmdUI* pCmdUI)
 {
 #ifdef EVAL_TILING_MODES
 	WorldHeightMapEdit *pMap = GetHeightMap();
@@ -2050,28 +2045,28 @@ void CWorldBuilderDoc::OnUpdateTexturesizingTile8x8(CCmdUI* pCmdUI)
 static AsciiString formatScriptLabel(Script *pScr) {
 	AsciiString fmt;
 	if (pScr->isSubroutine()) {
-		fmt.concat("[S "); 
+		fmt.concat("[S ");
 	} else {
-		fmt.concat("[ns "); 
+		fmt.concat("[ns ");
 	}
 	if (pScr->isActive()) {
-		fmt.concat("A "); 
+		fmt.concat("A ");
 	} else {
-		fmt.concat("na "); 
+		fmt.concat("na ");
 	}
 	if (pScr->isOneShot()) {
-		fmt.concat("D] ["); 
+		fmt.concat("D] [");
 	} else {
-		fmt.concat("nd] ["); 
+		fmt.concat("nd] [");
 	}
 	if (pScr->isEasy()) {
-		fmt.concat("E "); 
-	} 
+		fmt.concat("E ");
+	}
 	if (pScr->isNormal()) {
-		fmt.concat("N "); 
-	} 
+		fmt.concat("N ");
+	}
 	if (pScr->isHard()) {
-		fmt.concat("H]"); 
+		fmt.concat("H]");
 	} else {
 		fmt.concat("]");
 	}
@@ -2092,8 +2087,8 @@ static void writeScript(FILE *theLogFile, const char * str)
 
 #define DUMP_RAW_DICTS
 #ifdef DUMP_RAW_DICTS
-static void writeRawDict( FILE *theLogFile, const char* nm, const Dict* d ) 
-{ 
+static void writeRawDict( FILE *theLogFile, const char* nm, const Dict* d )
+{
 	if (!d)
 	{
 		fprintf(theLogFile, "Dict %s is null!\n", nm);
@@ -2151,48 +2146,39 @@ static void fprintUnit(FILE *theLogFile, Dict *teamDict, NameKeyType keyMinUnit,
 
 }
 
-void CWorldBuilderDoc::OnDumpDocToText(void) 
+void CWorldBuilderDoc::OnDumpDocToText(void)
 {
-	MapObject *pMapObj = NULL; 
+	MapObject *pMapObj = NULL;
 	const char* vetStrings[] = {"Green", "Regular", "Veteran", "Elite"};
 	const char* aggroStrings[] = {"Passive", "Normal", "Guard", "Hunt", "Agressive", "Sleep"};
 	AsciiString noOwner = "No Owner";
 	static FILE *theLogFile = NULL;
 	Bool open = false;
 	try {
-		char dirbuf[ _MAX_PATH ];
-		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
-		char *pEnd = dirbuf + strlen( dirbuf );
-		while( pEnd != dirbuf ) 
+		char curbuf[_MAX_PATH];
+		GetModuleFileName(NULL, curbuf, sizeof(curbuf));
+		if (char *pEnd = strrchr(curbuf, '\\'))
 		{
-			if( *pEnd == '\\' ) 
-			{
-				*(pEnd + 1) = 0;
-				break;
-			}
-			pEnd--;
+			*(pEnd + 1) = 0;
 		}
 
-		char curbuf[ _MAX_PATH ];
-
-		strcpy(curbuf, dirbuf);
-		strcat(curbuf, m_strTitle);
-		strcat(curbuf, ".txt");
+		strlcat(curbuf, m_strTitle, ARRAY_SIZE(curbuf));
+		strlcat(curbuf, ".txt", ARRAY_SIZE(curbuf));
 
 		theLogFile = fopen(curbuf, "w");
 		if (theLogFile == NULL)
 			throw;
 
 		open = true;
-		
+
 		fprintf(theLogFile,"\n\n\nDump of Doc Contents\n");
 
 #ifdef DUMP_RAW_DICTS
-	
+
 		writeRawDict(theLogFile, "WorldDict", MapObject::getWorldDict());
 
 		fprintf(theLogFile,"Raw Map Object\n");
-		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) 
+		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 		{
 			Dict *d = pMapObj->getProperties();
 			TeamsInfo *teamInfo = TheSidesList->findTeamInfo(d->getAsciiString(TheKey_originalOwner));
@@ -2295,7 +2281,7 @@ void CWorldBuilderDoc::OnDumpDocToText(void)
 			}
 		}
 		fprintf(theLogFile,"End of Units\n");
-		
+
 		fprintf(theLogFile,"\nObject Types summary\n");
 		{
 			Int totalObjectCount = 0;
@@ -2316,23 +2302,23 @@ void CWorldBuilderDoc::OnDumpDocToText(void)
 
 			fprintf(theLogFile, "Total Map Objects (with ThingTemplates): %d\n", totalObjectCount);
 
-			while (mapOfTemplates.size() > 0) {
+			while (!mapOfTemplates.empty()) {
 				std::map<AsciiString, Int>::iterator storedIt = mapOfTemplates.begin();
-				
+
 				for (it = mapOfTemplates.begin(); it != mapOfTemplates.end(); ++it) {
 					if (storedIt->second < it->second) {
 						storedIt = it;
 					}
 				}
 
-				fprintf(theLogFile, "Map Object: %s, Instances: %d\n", storedIt->first.str(), storedIt->second); 
-				
-				// Now, erase it. 
+				fprintf(theLogFile, "Map Object: %s, Instances: %d\n", storedIt->first.str(), storedIt->second);
+
+				// Now, erase it.
 				mapOfTemplates.erase(storedIt);
 			}
 		}
 		fprintf(theLogFile,"\nEnd of Object Types summary\n");
-		
+
 		// dump the waypoints
 		fprintf(theLogFile,"\nWaypoints\n");
 		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
@@ -2420,7 +2406,7 @@ writeRawDict( theLogFile, "TeamInfo",ti->getDict() );
 #endif
 				if (ti->getDict()->getAsciiString(TheKey_teamOwner) == name)
 				{
-					Bool exists;														
+					Bool exists;
 					AsciiString teamName = ti->getDict()->getAsciiString(TheKey_teamName);
 					AsciiString waypoint = ti->getDict()->getAsciiString(TheKey_teamHome, &exists);
 					CString pri;
@@ -2454,7 +2440,7 @@ writeRawDict( theLogFile, "TeamInfo",ti->getDict() );
 					if (script.isEmpty()) script="<none>";
 					fprintf(theLogFile, " OnAllClear='%s'\n", script.str());
 				}
-			}								
+			}
 		}
 		fprintf(theLogFile,"End of Teams\n");
 
@@ -2572,14 +2558,14 @@ void FindIndexNearest(CWorldBuilderDoc* pDoc, const Coord3D* point, CPoint* outN
 			break;
 		}
 	};
-	
+
 	pDoc->getCellIndexFromCoord(testPoint, outNdx);
 }
 
 Bool IndexInRect(CWorldBuilderDoc* pDoc, const Coord3D* bl, const Coord3D* tl, const Coord3D* br, const Coord3D* tr, CPoint* index)
 {
 	Coord3D testPoint;
-	pDoc->getCoordFromCellIndex(*index, &testPoint);	
+	pDoc->getCoordFromCellIndex(*index, &testPoint);
 	return PointInsideRect3D(bl, tl, br, tr, &testPoint);
 }
 
@@ -2604,7 +2590,7 @@ Bool AddUniqueAndNeighbors(CWorldBuilderDoc* pDoc, const Coord3D* bl, const Coor
 	// first left
 	ndx.x += 1;
 	AddUniqueAndNeighbors(pDoc, bl, tl, br, tr, ndx, allIndices);
-	
+
 	// then right
 	ndx.x -= 2;
 	AddUniqueAndNeighbors(pDoc,bl, tl, br, tr, ndx, allIndices);
@@ -2617,12 +2603,12 @@ Bool AddUniqueAndNeighbors(CWorldBuilderDoc* pDoc, const Coord3D* bl, const Coor
 	// then bottom
 	ndx.y -= 2;
 	AddUniqueAndNeighbors(pDoc, bl, tl, br, tr, ndx, allIndices);
-	
+
 	return true;
 }
 
 
-void CWorldBuilderDoc::OnRemoveclifftexmapping() 
+void CWorldBuilderDoc::OnRemoveclifftexmapping()
 {
 	if (::AfxMessageBox(IDS_CONFIRM_REMOVE_CLIFF_MAPPING, MB_YESNO) == IDYES) {
 		if (m_heightMap) {
@@ -2634,10 +2620,10 @@ void CWorldBuilderDoc::OnRemoveclifftexmapping()
 				updateHeightMap(htMapEditCopy, false, partialRange);
 				WBDocUndoable *pUndo = new WBDocUndoable(this, htMapEditCopy);
 				this->AddAndDoUndoable(pUndo);
-				REF_PTR_RELEASE(pUndo); // belongs to this now.	
-			} 
+				REF_PTR_RELEASE(pUndo); // belongs to this now.
+			}
 			REF_PTR_RELEASE(htMapEditCopy);
-		}	
+		}
 	}
 }
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderView.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderView.cpp
index 214679d5f68..2f9c4a74bc4 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderView.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderView.cpp
@@ -18,12 +18,12 @@
 
 // FILE: WorldBuilderView.cpp ////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information                           
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:   RTS3
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-//         Includes                                                      
+//         Includes
 //-----------------------------------------------------------------------------
 
 #include "StdAfx.h"
@@ -57,7 +57,7 @@
 #include "Common/Debug.h"
 
 //-----------------------------------------------------------------------------
-//         Private Data                                                     
+//         Private Data
 //-----------------------------------------------------------------------------
 #define ROUND(x) (Int)(floor((x)+0.5))
 
@@ -65,7 +65,7 @@
 // CWorldBuilderView
 
 //-----------------------------------------------------------------------------
-//         Private Functions                                               
+//         Private Functions
 //-----------------------------------------------------------------------------
 
 /////////////////////////////////////////////////////////////////////////////
@@ -90,7 +90,7 @@ CWorldBuilderView::CWorldBuilderView() :
 
 	show = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "ShowTexture", 1);
 	m_showTexture = (show!=0);
-	
+
 
 }
 
@@ -103,11 +103,11 @@ BOOL CWorldBuilderView::PreCreateWindow(CREATESTRUCT& cs)
 	return WbView::PreCreateWindow(cs);
 }
 
-int CWorldBuilderView::OnCreate(LPCREATESTRUCT lpCreateStruct) 
+int CWorldBuilderView::OnCreate(LPCREATESTRUCT lpCreateStruct)
 {
 	if (WbView::OnCreate(lpCreateStruct) == -1)
 		return -1;
-	
+
 	return 0;
 }
 
@@ -160,10 +160,10 @@ void CWorldBuilderView::setCellSize(Int cellSize)
 	}
 }
 
-void CWorldBuilderView::setCenterInView(Real x, Real y) 
+void CWorldBuilderView::setCenterInView(Real x, Real y)
 {
 	if (x != m_centerPt.X || y != m_centerPt.Y) {
-		m_centerPt.X=x; 
+		m_centerPt.X=x;
 		m_centerPt.Y=y;
 		adjustDocSize();
 		Invalidate();
@@ -177,7 +177,7 @@ void CWorldBuilderView::setShowContours(Bool show)
 	Invalidate();
 }
 //-----------------------------------------------------------------------------
-//         Public Functions                                                
+//         Public Functions
 //-----------------------------------------------------------------------------
 
 //=============================================================================
@@ -259,11 +259,11 @@ DWORD CWorldBuilderView::getColorForHeight(UnsignedByte ht)
 //=============================================================================
 /** This draws the window. */
 //=============================================================================
-void CWorldBuilderView::OnPaint() 
+void CWorldBuilderView::OnPaint()
 {
 	CWorldBuilderDoc* pDoc = WbDoc();
 	ASSERT_VALID(pDoc);
-	
+
 	// If we are editing with a tool, draw the map being edited, if one exists.
 	WorldHeightMapEdit *pMap = getTrackingHeightMap();
 
@@ -326,7 +326,7 @@ void CWorldBuilderView::OnPaint()
 		dc.FillSolidRect(&rect, RGB(255,255,255));
 	}
 	if (minJ == 0) {
-		rect = clientRect; // Do bottom. 
+		rect = clientRect; // Do bottom.
 		rect.top = (pMap->getYExtent())*m_cellSize;
 		dc.FillSolidRect(&rect, RGB(255,255,255));
 	}
@@ -398,7 +398,7 @@ void CWorldBuilderView::OnPaint()
 			rect.left = lpt.x - m_cellSize;
 			rect.right = lpt.x + m_cellSize;
 			// If visible in the update region, draw it.
-			if (updateRgn.RectInRegion(&rect)) 
+			if (updateRgn.RectInRegion(&rect))
 			{
 				drawObjectInView(&dc, pMapObj);
 			}
@@ -471,14 +471,14 @@ void CWorldBuilderView::drawObjectInView(CDC *pDc, MapObject *pMapObj)
 	savPen = pDc->SelectObject(&ovalPen);
 	savBrush = pDc->SelectObject(&brush);
 	// Draw the object's circle.
-	pDc->Ellipse(&circle);	 
+	pDc->Ellipse(&circle);
 
 	// Draw the arrow
 	Int delta = (m_cellSize+4)/4;
 	Int smallDelta = (delta+4)/4;
-	
+
  	float angle = pMapObj->getAngle();
-	
+
 	Vector3 head1(m_cellSize - delta, smallDelta, 0);
 	Vector3 head2(m_cellSize - delta, -smallDelta, 0);
 	head1.Rotate_Z(-angle);
@@ -544,7 +544,7 @@ void CWorldBuilderView::drawContours(CDC *pDc, CRgn *pRgn, Int minX, Int maxX, I
 {
 	CWorldBuilderDoc* pDoc = WbDoc();
 	ASSERT_VALID(pDoc);
-	
+
 	WorldHeightMapEdit *pMap = getTrackingHeightMap();
 	// We do cell and cell+1 in the loop, so trim back the max limits.
 	if (maxX == pMap->getXExtent()) maxX--;
@@ -552,7 +552,7 @@ void CWorldBuilderView::drawContours(CDC *pDc, CRgn *pRgn, Int minX, Int maxX, I
 
 	Int curHeight;
 	Bool didWater = false;  // We do the water level first, then step through the contours.
-	for (curHeight = ContourOptions::getContourOffset(); curHeight < 255; 
+	for (curHeight = ContourOptions::getContourOffset(); curHeight < 255;
 		curHeight+= ContourOptions::getContourStep()) {
 		Bool doingWater = false;
 		CPen pen;
@@ -724,13 +724,13 @@ void CWorldBuilderView::drawContours(CDC *pDc, CRgn *pRgn, Int minX, Int maxX, I
 			curHeight = ContourOptions::getContourOffset() - ContourOptions::getContourStep();
 		}
 	}
-}	
+}
 
 
 //=============================================================================
 // CWorldBuilderView::interpolate
 //=============================================================================
-/** Given 2 points, pt1 and pt2, with different height valus ht1 and ht2, 
+/** Given 2 points, pt1 and pt2, with different height valus ht1 and ht2,
 determines where the height ht occurs along the line. */
 //=============================================================================
 void CWorldBuilderView::interpolate(CPoint *pt, Int ht, CPoint pt1, Int ht1, CPoint pt2, Int ht2)
@@ -749,11 +749,11 @@ void CWorldBuilderView::interpolate(CPoint *pt, Int ht, CPoint pt1, Int ht1, CPo
 	pt->x = (pt1.x*d1 + pt2.x*d2)/delta;
 	pt->y = (pt1.y*d1 + pt2.y*d2)/delta;
 }
-	
+
 //=============================================================================
 // CWorldBuilderView::drawMyTexture
 //=============================================================================
-/** Draws the tile data rgbData at pRect.  The tile data is square 4 byte 
+/** Draws the tile data rgbData at pRect.  The tile data is square 4 byte
 data, width pixels wide and tall. */
 //=============================================================================
 void CWorldBuilderView::drawMyTexture(CDC *pDc, CRect *pRect, Int width, UnsignedByte *rgbData)
@@ -772,7 +772,7 @@ void CWorldBuilderView::drawMyTexture(CDC *pDc, CRect *pRect, Int width, Unsigne
 	bi.bmiHeader.biClrUsed = 0;
 	bi.bmiHeader.biClrImportant = 0;
 
-	/*int val=*/::StretchDIBits(pDc->m_hDC, pRect->left, pRect->top, pRect->Width(), pRect->Height(), 0, 0, width, width, rgbData, &bi, 
+	/*int val=*/::StretchDIBits(pDc->m_hDC, pRect->left, pRect->top, pRect->Width(), pRect->Height(), 0, 0, width, width, rgbData, &bi,
 		DIB_RGB_COLORS, SRCCOPY);
 }
 
@@ -782,7 +782,7 @@ void CWorldBuilderView::drawMyTexture(CDC *pDc, CRect *pRect, Int width, Unsigne
 //=============================================================================
 /** Invalidates the pixel area for the height map call at a particular location. */
 //=============================================================================
-void CWorldBuilderView::invalidateCellInView(int xIndex, int yIndex) 
+void CWorldBuilderView::invalidateCellInView(int xIndex, int yIndex)
 {
 	CWorldBuilderDoc* pDoc = WbDoc();
 	ASSERT_VALID(pDoc);
@@ -793,7 +793,7 @@ void CWorldBuilderView::invalidateCellInView(int xIndex, int yIndex)
 	// Flip the y.
 	cell.bottom = (pMap->getYExtent()-yIndex)*m_cellSize;
 	// Adjust for scrolling.
-	cell.bottom -= mYScrollOffset; 
+	cell.bottom -= mYScrollOffset;
 	cell.top = cell.bottom-m_cellSize;
 	// Convert to pixel coord.
 	cell.left = xIndex*m_cellSize;
@@ -852,7 +852,7 @@ void CWorldBuilderView::adjustDocSize()
 //=============================================================================
 /** Standard window handler method for when the window size changes. */
 //=============================================================================
-void CWorldBuilderView::OnSize(UINT nType, int cx, int cy) 
+void CWorldBuilderView::OnSize(UINT nType, int cx, int cy)
 {
 	// Do parent class processing.
 	WbView::OnSize(nType, cx, cy);
@@ -865,7 +865,7 @@ void CWorldBuilderView::OnSize(UINT nType, int cx, int cy)
 //=============================================================================
 /** Standard window handler method for when the vertical scroll bar is used. */
 //=============================================================================
-void CWorldBuilderView::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
+void CWorldBuilderView::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 {
 	int scrollPixels=0;
 	// Based on the opcode, determine how may pixels to scroll.
@@ -886,7 +886,7 @@ void CWorldBuilderView::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBa
 //=============================================================================
 /** Standard window handler method for when the horizontal scroll bar is used. */
 //=============================================================================
-void CWorldBuilderView::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
+void CWorldBuilderView::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 {
 	int scrollPixels=0;
 
@@ -907,7 +907,7 @@ void CWorldBuilderView::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBa
 //=============================================================================
 /** Scrolls the window. */
 //=============================================================================
-void CWorldBuilderView::scrollInView(Real xScroll, Real yScroll, Bool end) 
+void CWorldBuilderView::scrollInView(Real xScroll, Real yScroll, Bool end)
 {
 	// Calculate new scroll offset.
 	Int newOffset = mXScrollOffset + xScroll*m_cellSize;
@@ -950,7 +950,7 @@ void CWorldBuilderView::scrollInView(Real xScroll, Real yScroll, Bool end)
 
 
 /** Toggles the show grid flag and invals the window. */
-void CWorldBuilderView::OnShowGrid() 
+void CWorldBuilderView::OnShowGrid()
 {
 	mShowGrid = !mShowGrid;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowGrid", mShowGrid?1:0);
@@ -958,17 +958,17 @@ void CWorldBuilderView::OnShowGrid()
 }
 
 /** Sets the check in the menu to match the show grid flag. */
-void CWorldBuilderView::OnUpdateShowGrid(CCmdUI* pCmdUI) 
+void CWorldBuilderView::OnUpdateShowGrid(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(mShowGrid?1:0);
 	// Note - grid doesn't show if the cell size < 4, so disable.
 	pCmdUI->Enable(m_cellSize>=MIN_GRID_SIZE);
-	
+
 }
 
 #if DEAD
 /** Toggles the show contours flag and invals the window. */
-void CWorldBuilderView::OnViewShowcontours() 
+void CWorldBuilderView::OnViewShowcontours()
 {
 	m_showContours = !m_showContours;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowContours", m_showContours?1:0);
@@ -976,17 +976,17 @@ void CWorldBuilderView::OnViewShowcontours()
 }
 
 /** Sets the check in the menu to match the show contours flag. */
-void CWorldBuilderView::OnUpdateViewShowcontours(CCmdUI* pCmdUI) 
+void CWorldBuilderView::OnUpdateViewShowcontours(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showContours?1:0);
 	// Note - contours don't show if the cell size < 4, so disable.
 	pCmdUI->Enable(m_cellSize>=MIN_GRID_SIZE);
 }
-#endif 
+#endif
 
 
 /** Toggles the show texture flag and invals the window. */
-void CWorldBuilderView::OnViewShowtexture() 
+void CWorldBuilderView::OnViewShowtexture()
 {
 	m_showTexture = !m_showTexture;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowTexture", m_showTexture?1:0);
@@ -994,7 +994,7 @@ void CWorldBuilderView::OnViewShowtexture()
 }
 
 /** Sets the check in the menu to match the show texture flag. */
-void CWorldBuilderView::OnUpdateViewShowtexture(CCmdUI* pCmdUI) 
+void CWorldBuilderView::OnUpdateViewShowtexture(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showTexture?1:0);
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/addplayerdialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/addplayerdialog.cpp
index 4c8f75a25c0..21e6149dc0f 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/addplayerdialog.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/addplayerdialog.cpp
@@ -62,11 +62,11 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // AddPlayerDialog message handlers
 
-void AddPlayerDialog::OnOK() 
-{	
+void AddPlayerDialog::OnOK()
+{
 	CComboBox *faction = (CComboBox*)GetDlgItem(IDC_COMBO1);
 
-	if (faction) 
+	if (faction)
 	{
 		// get the text out of the combo. If it is user-typed, sel will be -1, otherwise it will be >=0
 		CString theText;
@@ -76,9 +76,8 @@ void AddPlayerDialog::OnOK()
 		} else {
 			faction->GetWindowText(theText);
 		}
-		AsciiString name((LPCTSTR)theText);
 
-		const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY(name));
+		const PlayerTemplate* pt = ThePlayerTemplateStore->findPlayerTemplate(NAMEKEY((LPCTSTR)theText));
 		if (pt)
 		{
 			m_addedSide = pt ? pt->getName() : AsciiString::TheEmptyString;
@@ -91,23 +90,23 @@ void AddPlayerDialog::OnOK()
 			CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
 			SidesListUndoable *pUndo = new SidesListUndoable(newSides, pDoc);
 			pDoc->AddAndDoUndoable(pUndo);
-			REF_PTR_RELEASE(pUndo); // belongs to pDoc now.	
+			REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 		}
 	}
 
 	CDialog::OnOK();
 }
 
-void AddPlayerDialog::OnCancel() 
+void AddPlayerDialog::OnCancel()
 {
 	m_addedSide.clear();
 	CDialog::OnCancel();
 }
 
-BOOL AddPlayerDialog::OnInitDialog() 
+BOOL AddPlayerDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CComboBox *factions = (CComboBox*)GetDlgItem(IDC_COMBO1);
 	factions->ResetContent();
 	if (ThePlayerTemplateStore)
@@ -122,12 +121,12 @@ BOOL AddPlayerDialog::OnInitDialog()
 		}
 	}
 	factions->SetCurSel(0);
-	
-	return TRUE; 
+
+	return TRUE;
 }
 
-void AddPlayerDialog::OnEditchangeCombo1() 
+void AddPlayerDialog::OnEditchangeCombo1()
 {
 	// TODO: Add your control notification handler code here
-	
+
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/brushoptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/brushoptions.cpp
index a20d6709174..f8c50586f1a 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/brushoptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/brushoptions.cpp
@@ -36,7 +36,7 @@ Int BrushOptions::m_currentFeather = 0;
 
 BrushOptions::BrushOptions(CWnd* pParent /*=NULL*/)
 {
-	//{{AFX_DATA_INIT(BrushOptions) 
+	//{{AFX_DATA_INIT(BrushOptions)
 		// NOTE: the ClassWizard will add member initialization here
 	//}}AFX_DATA_INIT
 }
@@ -52,8 +52,8 @@ void BrushOptions::DoDataExchange(CDataExchange* pDX)
 
 /// Sets the feather value in the dialog.
 /** Update the value in the edit control and the slider. */
-void BrushOptions::setFeather(Int feather) 
-{ 
+void BrushOptions::setFeather(Int feather)
+{
 	CString buf;
 	buf.Format("%d", feather);
 	m_currentFeather = feather;
@@ -65,8 +65,8 @@ void BrushOptions::setFeather(Int feather)
 
 /// Sets the brush width value in the dialog.
 /** Update the value in the edit control and the slider. */
-void BrushOptions::setWidth(Int width) 
-{ 
+void BrushOptions::setWidth(Int width)
+{
 	CString buf;
 	buf.Format("%d", width);
 	m_currentWidth = width;
@@ -76,10 +76,10 @@ void BrushOptions::setWidth(Int width)
 	}
 }
 
-void BrushOptions::setHeight(Int height) 
-{ 
-	char buffer[50];
-	sprintf(buffer, "%d", height);
+void BrushOptions::setHeight(Int height)
+{
+	char buffer[12];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%d", height);
 	m_currentHeight = height;
 	if (m_staticThis && !m_staticThis->m_updating) {
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -93,12 +93,12 @@ void BrushOptions::setHeight(Int height)
 // BrushOptions message handlers
 
 /// Dialog UI initialization.
-/** Creates the slider controls, and sets the initial values for 
+/** Creates the slider controls, and sets the initial values for
 width and feather in the ui controls. */
-BOOL BrushOptions::OnInitDialog() 
+BOOL BrushOptions::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = true;
 	m_brushWidthPopup.SetupPopSliderButton(this, IDC_SIZE_POPUP, this);
 	m_brushFeatherPopup.SetupPopSliderButton(this, IDC_FEATHER_POPUP, this);
@@ -117,7 +117,7 @@ BOOL BrushOptions::OnInitDialog()
 /// Handles feather edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void BrushOptions::OnChangeFeatherEdit() 
+void BrushOptions::OnChangeFeatherEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_FEATHER_EDIT);
@@ -129,7 +129,7 @@ void BrushOptions::OnChangeFeatherEdit()
 			if (1==sscanf(buffer, "%d", &feather)) {
 				m_currentFeather = feather;
 				BrushTool::setFeather(m_currentFeather);
-				sprintf(buffer, "%.1f FEET.", m_currentFeather*MAP_XY_FACTOR);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentFeather*MAP_XY_FACTOR);
 				pEdit = m_staticThis->GetDlgItem(IDC_FEATHER_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -140,7 +140,7 @@ void BrushOptions::OnChangeFeatherEdit()
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void BrushOptions::OnChangeSizeEdit() 
+void BrushOptions::OnChangeSizeEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_SIZE_EDIT);
@@ -152,7 +152,7 @@ void BrushOptions::OnChangeSizeEdit()
 			if (1==sscanf(buffer, "%d", &width)) {
 				m_currentWidth = width;
 				BrushTool::setWidth(m_currentWidth);
-				sprintf(buffer, "%.1f FEET.", m_currentWidth*MAP_XY_FACTOR);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentWidth*MAP_XY_FACTOR);
 				pEdit = m_staticThis->GetDlgItem(IDC_WIDTH_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -163,7 +163,7 @@ void BrushOptions::OnChangeSizeEdit()
 /// Handles width edit ui messages.
 /** Gets the new edit control text, converts it to an int, then updates
 		the slider and brush tool. */
-void BrushOptions::OnChangeHeightEdit() 
+void BrushOptions::OnChangeHeightEdit()
 {
 		if (m_updating) return;
 		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_EDIT);
@@ -175,7 +175,7 @@ void BrushOptions::OnChangeHeightEdit()
 			if (1==sscanf(buffer, "%d", &height)) {
 				m_currentHeight = height;
 				BrushTool::setHeight(m_currentHeight);
-				sprintf(buffer, "%.1f FEET.", m_currentHeight*MAP_HEIGHT_SCALE);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentHeight*MAP_HEIGHT_SCALE);
 				pEdit = m_staticThis->GetDlgItem(IDC_HEIGHT_LABEL);
 				if (pEdit) pEdit->SetWindowText(buffer);
 			}
@@ -212,7 +212,7 @@ void BrushOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax,
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void BrushOptions::PopSliderChanged(const long sliderID, long theVal)
@@ -249,7 +249,7 @@ void BrushOptions::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 void BrushOptions::PopSliderFinished(const long sliderID, long theVal)
@@ -266,7 +266,7 @@ void BrushOptions::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp
index 028dc1171d3..2b0bab87209 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp
@@ -39,11 +39,6 @@
 const char* NEUTRAL_TEAM_UI_STR = "(neutral)";
 const char* NEUTRAL_TEAM_INTERNAL_STR = "team";
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -59,24 +54,24 @@ void MapObjectProps::makeMain()
 }
 
 
-MapObjectProps::MapObjectProps(Dict* dictToEdit, const char* title, CWnd* pParent /*=NULL*/) : 
+MapObjectProps::MapObjectProps(Dict* dictToEdit, const char* title, CWnd* pParent /*=NULL*/) :
 	COptionsPanel(MapObjectProps::IDD, pParent),
 	m_dictToEdit(dictToEdit),
 	m_title(title),
 	m_selectedObject(NULL),
   m_dictSource(NULL),
-  m_scale( 1.0f ), 
+  m_scale( 1.0f ),
   m_height( 0 ),
-  m_posUndoable( NULL ), 
+  m_posUndoable( NULL ),
   m_angle( 0 ),
-  m_defaultEntryIndex(0), 
+  m_defaultEntryIndex(0),
   m_defaultIsNone(true)
 {
 
 
   //{{AFX_DATA_INIT(MapObjectProps)
 		// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT	
+	//}}AFX_DATA_INIT
 }
 
 MapObjectProps::~MapObjectProps()
@@ -198,7 +193,7 @@ int MapObjectProps::getSel()
 void MapObjectProps::_DictToTeam(void)
 {
   int i;
-  
+
   AsciiString name;
   CComboBox *owner = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Team);
   owner->ResetContent();
@@ -217,7 +212,7 @@ void MapObjectProps::_DictToTeam(void)
     if (name == NEUTRAL_TEAM_INTERNAL_STR)
       name = NEUTRAL_TEAM_UI_STR;
     i = owner->FindStringExact(-1, name.str());
-		DEBUG_ASSERTLOG(i >= 0, ("missing team '%s'. Non-fatal (jkmcd)\n", name.str()));
+		DEBUG_ASSERTLOG(i >= 0, ("missing team '%s'. Non-fatal (jkmcd)", name.str()));
 
   }
   owner->SetCurSel(i);
@@ -226,15 +221,15 @@ void MapObjectProps::_DictToTeam(void)
 /// Move data from object to dialog controls
 void MapObjectProps::_DictToName(void)
 {
-  AsciiString name = "";
+  AsciiString name;
   Bool exists;
   if (m_dictToEdit)
   {
     name = m_dictToEdit->getAsciiString(TheKey_objectName, &exists);
   }
-  
+
   CWnd* pItem = GetDlgItem(IDC_MAPOBJECT_Name);
-  if (pItem) 
+  if (pItem)
   {
     pItem->SetWindowText(name.str());
   }
@@ -243,18 +238,18 @@ void MapObjectProps::_DictToName(void)
 /// Move data from object to dialog controls
 void MapObjectProps::_DictToScript(void)
 {
-  if (!m_dictToEdit) 
+  if (!m_dictToEdit)
   {
     return;
   }
-  
+
   Bool exists;
   CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Script);
   // Load the subroutine scripts into the combo box.
   EditParameter::loadScripts(pCombo, true);
   /*Int stringNdx =*/ pCombo->AddString("<none>");
   AsciiString script = m_dictToEdit->getAsciiString(TheKey_objectScriptAttachment, &exists);
-  
+
   if (script.isEmpty()) {
     pCombo->SelectString(-1, "<none>");
   } else {
@@ -266,19 +261,19 @@ void MapObjectProps::_DictToScript(void)
 void MapObjectProps::_TeamToDict(void)
 {
   getAllSelectedDicts();
-  
+
   CComboBox *owner = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Team);
   static char buf[1024];
   owner->GetWindowText(buf, sizeof(buf)-2);
   if (strcmp(buf, NEUTRAL_TEAM_UI_STR)==0)
-    strcpy(buf, NEUTRAL_TEAM_INTERNAL_STR);
-  
+    strlcpy(buf, NEUTRAL_TEAM_INTERNAL_STR, ARRAY_SIZE(buf));
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc )
   {
     Dict newDict;
     newDict.setAsciiString(TheKey_originalOwner, AsciiString(buf));
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
     // Update is called by Do
@@ -289,11 +284,11 @@ void MapObjectProps::_TeamToDict(void)
 void MapObjectProps::_NameToDict(void)
 {
   getAllSelectedDicts();
-  
+
   CWnd *owner = GetDlgItem(IDC_MAPOBJECT_Name);
   CString cstr;
   owner->GetWindowText(cstr);
-  
+
   // Note: when starting up, this is called before a document exists. Just ignore such
   // calls, since there can't be an object to affect.
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
@@ -301,10 +296,10 @@ void MapObjectProps::_NameToDict(void)
   {
     Dict newDict;
     newDict.setAsciiString(TheKey_objectName, cstr.GetBuffer(0));
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-    // Update is called by Do																																																						
+    // Update is called by Do
   }
 }
 
@@ -312,20 +307,20 @@ void MapObjectProps::_NameToDict(void)
 void MapObjectProps::_ScriptToDict(void)
 {
   getAllSelectedDicts();
-  
+
   CComboBox *owner = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Script);
   static char buf[1024];
   owner->GetWindowText(buf, sizeof(buf)-2);
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc )
   {
     Dict newDict;
     newDict.setAsciiString(TheKey_objectScriptAttachment, AsciiString(buf));
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-    // Update is called by Do	
+    // Update is called by Do
   }
 }
 
@@ -343,12 +338,12 @@ void MapObjectProps::_DictToScale(void)
   if (!exists) {
     m_scale = 1;
   }
-  
+
   CWnd* edit = GetDlgItem(IDC_MAPOBJECT_Scale);
   CString cstr;
   cstr.Format("%.2f", m_scale);
   edit->SetWindowText(cstr);
-  
+
   CButton *off = (CButton*) GetDlgItem(IDC_SCALE_OFF);
   CButton *on = (CButton*) GetDlgItem(IDC_SCALE_ON);
   if (!exists) {
@@ -363,7 +358,7 @@ void MapObjectProps::_DictToScale(void)
     GetDlgItem(IDC_SCALE_POPUP)->EnableWindow(true);
   }
 #endif
-  
+
 }
 
 /// Move data from object to dialog controls
@@ -376,7 +371,7 @@ void MapObjectProps::_DictToWeather(void)
     if (!exists)
       value = 0;
   }
-  
+
   CComboBox* pItem = (CComboBox*) GetDlgItem(IDC_MAPOBJECT_Weather);
   pItem->SetCurSel(value);
 }
@@ -391,7 +386,7 @@ void MapObjectProps::_DictToTime(void)
     if (!exists)
       value = 0;
   }
-  
+
   CComboBox* pItem = (CComboBox*) GetDlgItem(IDC_MAPOBJECT_Time);
   pItem->SetCurSel(value);
 }
@@ -400,42 +395,42 @@ void MapObjectProps::_DictToTime(void)
 void MapObjectProps::_WeatherToDict(void)
 {
   getAllSelectedDicts();
-  
+
   CComboBox *owner = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Weather);
   static char buf[1024];
   int curSel = owner->GetCurSel();
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc )
   {
     Dict newDict;
     newDict.setInt(TheKey_objectWeather, curSel);
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-    // Update is called by Do	
-  }  
+    // Update is called by Do
+  }
 }
 
 /// Move data from dialog controls to object
 void MapObjectProps::_TimeToDict(void)
 {
   getAllSelectedDicts();
-  
+
   CComboBox *owner = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Time);
   static char buf[1024];
   int curSel = owner->GetCurSel();
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc )
   {
     Dict newDict;
     newDict.setInt(TheKey_objectTime, curSel);
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-    // Update is called by Do	
-  }  
+    // Update is called by Do
+  }
 }
 
 /// Move data from dialog controls to object
@@ -444,7 +439,7 @@ void MapObjectProps::_ScaleToDict(void)
 // Currently not in mission disk.
 #if 0
   getAllSelectedDicts();
-  
+
   Real value = 0.0f;
   CWnd* edit = GetDlgItem(IDC_MAPOBJECT_Scale);
   CString cstr;
@@ -453,9 +448,9 @@ void MapObjectProps::_ScaleToDict(void)
     value = atof(cstr);
   }
   m_scale = value;
-  
+
   CButton *off = (CButton*) GetDlgItem(IDC_SCALE_OFF);
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc )
   {
@@ -465,7 +460,7 @@ void MapObjectProps::_ScaleToDict(void)
     } else {
       newDict.setReal(TheKey_objectPrototypeScale, m_scale);
     }
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
     // Update is called by Do
@@ -477,9 +472,9 @@ void MapObjectProps::_ScaleToDict(void)
 void MapObjectProps::ShowZOffset(MapObject *pMapObj)
 {
   const Coord3D *loc = pMapObj->getLocation();
-  static char buff[12];
+  static char buff[32];
   m_height = loc->z;
-  sprintf(buff, "%0.2f", loc->z);
+  snprintf(buff, ARRAY_SIZE(buff), "%0.2f", loc->z);
   CWnd* edit = GetDlgItem(IDC_MAPOBJECT_ZOffset);
   edit->SetWindowText(buff);
 }
@@ -509,8 +504,8 @@ void MapObjectProps::SetZOffset(void)
 void MapObjectProps::ShowAngle(MapObject *pMapObj)
 {
   m_angle = pMapObj->getAngle() * 180 / PI;
-  static char buff[12];
-  sprintf(buff, "%0.2f", m_angle);
+  static char buff[32];
+  snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_angle);
   CWnd* edit = GetDlgItem(IDC_MAPOBJECT_Angle);
   edit->SetWindowText(buff);
   m_angle = atof(buff);
@@ -520,8 +515,8 @@ void MapObjectProps::ShowAngle(MapObject *pMapObj)
 void MapObjectProps::ShowPosition(MapObject *pMapObj)
 {
   m_position = *pMapObj->getLocation();
-  static char buff[12];
-  sprintf(buff, "%0.2f, %0.2f", m_position.x, m_position.y);
+  static char buff[64];
+  snprintf(buff, ARRAY_SIZE(buff), "%0.2f, %0.2f", m_position.x, m_position.y);
   CWnd* edit = GetDlgItem(IDC_MAPOBJECT_XYPosition);
   edit->SetWindowText(buff);
   sscanf(buff, "%f,%f", &m_position.x, &m_position.y);
@@ -538,7 +533,7 @@ void MapObjectProps::SetAngle(void)
     angle = atof(cstr);
   }
   if (m_selectedObject==NULL) return;
-  if (m_angle!=angle) 
+  if (m_angle!=angle)
   {
     m_angle = angle;
     CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
@@ -611,7 +606,7 @@ void MapObjectProps::GetPopSliderInfo(const long sliderID, long *pMin, long *pMa
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 /// Slider control
@@ -622,7 +617,7 @@ void MapObjectProps::PopSliderChanged(const long sliderID, long theVal)
     return;
 
 	CWnd* edit;
-	static char buff[36];
+	static char buff[32];
 	switch (sliderID) {
 		case IDC_HEIGHT_POPUP:
 			if (!m_posUndoable) {
@@ -631,7 +626,7 @@ void MapObjectProps::PopSliderChanged(const long sliderID, long theVal)
 			}
 			m_posUndoable->SetZOffset(theVal);
 			m_height = theVal;
-			sprintf(buff, "%0.2f", m_height);
+			snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_height);
 			edit = GetDlgItem(IDC_MAPOBJECT_ZOffset);
 			edit->SetWindowText(buff);
 			break;
@@ -643,14 +638,14 @@ void MapObjectProps::PopSliderChanged(const long sliderID, long theVal)
 			}
 			m_posUndoable->RotateTo(theVal * PI/180);
 			m_angle = theVal;
-			sprintf(buff, "%0.2f", m_angle);
+			snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_angle);
 			edit = GetDlgItem(IDC_MAPOBJECT_Angle);
 			edit->SetWindowText(buff);
 			break;
 
 		case IDC_SCALE_POPUP:
 			m_scale = theVal/100.0f;
-			sprintf(buff, "%0.2f", m_scale);
+			snprintf(buff, ARRAY_SIZE(buff), "%0.2f", m_scale);
 			edit = GetDlgItem(IDC_MAPOBJECT_Scale);
 			edit->SetWindowText(buff);
 			break;
@@ -659,7 +654,7 @@ void MapObjectProps::PopSliderChanged(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 }
 
 /// Slider control
@@ -683,7 +678,7 @@ void MapObjectProps::PopSliderFinished(const long sliderID, long theVal)
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
 			break;
-	}	// switch
+	}
 
 }
 
@@ -691,43 +686,43 @@ void MapObjectProps::PopSliderFinished(const long sliderID, long theVal)
 void MapObjectProps::_PrebuiltUpgradesToDict(void)
 {
   getAllSelectedDicts();
-  
+
   CListBox *pBox = (CListBox *) GetDlgItem(IDC_MAPOBJECT_BuildWithUpgrades);
   if (!pBox) {
     return;
   }
-  
+
   // We only work for single selections
   if (m_allSelectedDicts.size() != 1) {
     return;
   }
-  
+
   if (m_selectedObject)	{
     if ( !m_selectedObject->getThingTemplate() ) {
       return;
     }
   }
-  
+
   Bool exists;
   int upgradeNum = 0;
   AsciiString upgradeString;
-  
+
   // We're going to sub this entire dict for the existing entire dict.
   Dict newDict = *m_allSelectedDicts[0];
-  
+
   // First, clear out any existing notions of what we should upgrade.
   do {
     AsciiString keyName;
     keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_objectGrantUpgrade).str(), upgradeNum);
     upgradeString = newDict.getAsciiString(NAMEKEY(keyName), &exists);
-    
+
     if (exists) {
       newDict.remove(NAMEKEY(keyName));
     }
-    
+
     ++upgradeNum;
   } while (!upgradeString.isEmpty());
-  
+
   upgradeNum = 0;
   // We've now removed them, so lets add the ones that are selected now.
   Int countOfItems = pBox->GetCount();
@@ -736,19 +731,19 @@ void MapObjectProps::_PrebuiltUpgradesToDict(void)
       CString selTxt;
       // This thing is selected. Get its text, and add it to the dict.
       pBox->GetText(i, selTxt);
-      
+
       AsciiString keyName;
       keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_objectGrantUpgrade).str(), upgradeNum);
       newDict.setAsciiString(NAMEKEY(keyName), AsciiString(selTxt.GetBuffer(0)));
       ++upgradeNum;
     }
   }
-  
+
   // Now, do the Undoable
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc != NULL )
   {
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, NAMEKEY_INVALID, m_allSelectedDicts.size(), pDoc, true);
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, NAMEKEY_INVALID, m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
   }
@@ -758,36 +753,36 @@ void MapObjectProps::_PrebuiltUpgradesToDict(void)
 void MapObjectProps::_DictToPrebuiltUpgrades(void)
 {
   getAllSelectedDicts();
-  
+
   CListBox *pBox = (CListBox*) GetDlgItem(IDC_MAPOBJECT_BuildWithUpgrades);
   if (!pBox) {
     return;
   }
-  
+
   // First, clear out the list
   pBox->ResetContent();
   CString cstr;
-  
+
   // Then, if there's multiple units selected, add the Single Selection Only string
   if (m_allSelectedDicts.size() > 1) {
     cstr.LoadString(IDS_SINGLE_SELECTION_ONLY);
     pBox->AddString(cstr);
     return;
   }
-  
+
   if (m_selectedObject == NULL) {
     return;
   }
-  
+
   // Otherwise, fill it with the upgrades available for this unit
   const ThingTemplate *tt = m_selectedObject->getThingTemplate();
   if (tt == NULL) {
     // This is valid. For instance, Scorch marks do not have thing templates.
     return;
   }
-  
+
   Bool noUpgrades = false;
-  
+
   // Now do any behaviors that are also upgrades.
   const ModuleInfo& mi = tt->getBehaviorModuleInfo();
   if (mi.getCount() == 0) {
@@ -798,16 +793,16 @@ void MapObjectProps::_DictToPrebuiltUpgrades(void)
     }
   } else {
     Int numBehaviorModules = mi.getCount();
-    
+
     Int numBehaviorsWithUpgrades = 0;
-    
+
     for (int i = 0; i < numBehaviorModules; ++i) {
       if (mi.getNthName(i).compareNoCase("GenerateMinefieldBehavior") == 0) {
         const GenerateMinefieldBehaviorModuleData *gmbmd = (const GenerateMinefieldBehaviorModuleData *)mi.getNthData(i);
         if (!gmbmd) {
           continue;
         }
-        if (gmbmd->m_upgradeMuxData.m_activationUpgradeNames.size() > 0) {
+        if (!gmbmd->m_upgradeMuxData.m_activationUpgradeNames.empty()) {
           cstr = gmbmd->m_upgradeMuxData.m_activationUpgradeNames[0].str();
           if (pBox->FindString(-1, cstr) == LB_ERR) {
             pBox->AddString(cstr);
@@ -816,7 +811,7 @@ void MapObjectProps::_DictToPrebuiltUpgrades(void)
         }
       }
     }
-    
+
     if (numBehaviorsWithUpgrades == 0) {
       if (noUpgrades) {
         cstr.LoadString(IDS_NO_UPGRADES);
@@ -825,19 +820,19 @@ void MapObjectProps::_DictToPrebuiltUpgrades(void)
       }
     }
   }
-  
+
   // Finally, walk through the upgrades that he already has, and select the appropriate members
   // from the list
-  
+
   Bool exists;
   int upgradeNum = 0;
   AsciiString upgradeString;
-  
+
   do {
     AsciiString keyName;
     keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_objectGrantUpgrade).str(), upgradeNum);
     upgradeString = m_dictToEdit->getAsciiString(NAMEKEY(keyName), &exists);
-    
+
     if (exists) {
       Int selNdx = pBox->FindStringExact(-1, upgradeString.str());
       if (selNdx == LB_ERR) {
@@ -846,11 +841,11 @@ void MapObjectProps::_DictToPrebuiltUpgrades(void)
         continue;
       }
       pBox->SetSel(selNdx);
-      
+
     } else {
       upgradeString.clear();
     }
-    
+
     ++upgradeNum;
   } while (!upgradeString.isEmpty());
 }
@@ -890,7 +885,7 @@ void MapObjectProps::_DictToHealth(void)
 		} else {
 			pItem->SelectString(-1, "Other");
 			static char buff[12];
-			sprintf(buff, "%d", value);
+			snprintf(buff, ARRAY_SIZE(buff), "%d", value);
 			pItem2->SetWindowText(buff);
 			pItem2->EnableWindow(TRUE);
 		}
@@ -936,7 +931,7 @@ void MapObjectProps::_DictToEnabled(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Enabled);
 	if (pItem) {
 		pItem->SetCheck(enabled);
-	}	
+	}
 }
 
 
@@ -952,7 +947,7 @@ void MapObjectProps::_DictToDestructible(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Indestructible);
 	if (pItem) {
 		pItem->SetCheck(destructible);
-	}	
+	}
 }
 
 /// Move data from object to dialog controls
@@ -967,7 +962,7 @@ void MapObjectProps::_DictToUnsellable(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Unsellable);
 	if (pItem) {
 		pItem->SetCheck(unsellable);
-	}	
+	}
 }
 
 /// Move data from object to dialog controls
@@ -975,16 +970,16 @@ void MapObjectProps::_DictToTargetable()
 {
 	Bool targetable = false;
 	Bool exists;
-	if( m_dictToEdit ) 
+	if( m_dictToEdit )
 	{
 		targetable = m_dictToEdit->getBool( TheKey_objectTargetable, &exists );
 	}
 
 	CButton* pItem = (CButton*) GetDlgItem( IDC_MAPOBJECT_Targetable );
-	if( pItem ) 
+	if( pItem )
 	{
 		pItem->SetCheck( targetable );
-	}	
+	}
 }
 
 /// Move data from object to dialog controls
@@ -999,8 +994,8 @@ void MapObjectProps::_DictToPowered(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Powered);
 	if (pItem) {
 		pItem->SetCheck(powered);
-	}	
-	
+	}
+
 }
 
 /// Move data from object to dialog controls
@@ -1040,9 +1035,9 @@ void MapObjectProps::_DictToVisibilityRange(void)
 	CWnd* pItem = GetDlgItem(IDC_MAPOBJECT_VisionDistance);
 	if (pItem) {
 		static char buff[12];
-		sprintf(buff, "%d", distance);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", distance);
 		if (distance == 0) {
-			pItem->SetWindowText(""); 
+			pItem->SetWindowText("");
 		} else {
 			pItem->SetWindowText(buff);
 		}
@@ -1076,9 +1071,9 @@ void MapObjectProps::_DictToShroudClearingDistance(void)
 	CWnd* pItem = GetDlgItem(IDC_MAPOBJECT_ShroudClearingDistance);
 	if (pItem) {
 		static char buff[12];
-		sprintf(buff, "%d", distance);
+		snprintf(buff, ARRAY_SIZE(buff), "%d", distance);
 		if (distance == 0) {
-			pItem->SetWindowText(""); 
+			pItem->SetWindowText("");
 		} else {
 			pItem->SetWindowText(buff);
 		}
@@ -1093,11 +1088,11 @@ void MapObjectProps::_DictToRecruitableAI(void)
  	if (m_dictToEdit) {
 		recruitableAI  = m_dictToEdit->getBool(TheKey_objectRecruitableAI, &exists);
  	}
-	
+
  	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_RecruitableAI);
  	if (pItem) {
 		pItem->SetCheck(recruitableAI);
-	}	
+	}
 }
 
 /// Move data from object to dialog controls
@@ -1115,7 +1110,7 @@ void MapObjectProps::_DictToSelectable(void)
 	CButton* pItem = (CButton*) GetDlgItem(IDC_MAPOBJECT_Selectable);
 	if (pItem) {
 		pItem->SetCheck(selectable);
-	}	
+	}
 }
 
 /// Move data from object to dialog controls
@@ -1129,10 +1124,10 @@ void MapObjectProps::_DictToStoppingDistance(void)
 
 	CWnd* pItem = GetDlgItem(IDC_MAPOBJECT_StoppingDistance);
 	if (pItem) {
-		static char buff[12];
-		sprintf(buff, "%g", stoppingDistance);
+		static char buff[32];
+		snprintf(buff, ARRAY_SIZE(buff), "%g", stoppingDistance);
 		pItem->SetWindowText(buff);
-	}	
+	}
 }
 
 
@@ -1171,7 +1166,7 @@ void MapObjectProps::_HealthToDict(void)
   {
 	  Dict newDict;
 	  newDict.setInt(TheKey_objectInitialHealth, value);
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	  // Update is called by Do
@@ -1192,7 +1187,7 @@ void MapObjectProps::_EnabledToDict(void)
   {
 	  Dict newDict;
 	  newDict.setBool(TheKey_objectEnabled, isChecked);
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	  // Update is called by Do
@@ -1212,10 +1207,10 @@ void MapObjectProps::_IndestructibleToDict(void)
   {
 	  Dict newDict;
 	  newDict.setBool(TheKey_objectIndestructible, isChecked);
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-	  // Update is called by Do	
+	  // Update is called by Do
   }
 }
 
@@ -1232,11 +1227,11 @@ void MapObjectProps::_UnsellableToDict(void)
   {
 	  Dict newDict;
 	  newDict.setBool(TheKey_objectUnsellable, isChecked);
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	  // Update is called by Do
-  }	
+  }
 }
 
 /// Move data from dialog controls to object
@@ -1252,7 +1247,7 @@ void MapObjectProps::_TargetableToDict()
   {
 	  Dict newDict;
 	  newDict.setBool( TheKey_objectTargetable, isChecked );
-	  DictItemUndoable *pUndo = new DictItemUndoable( &m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size() );
+	  DictItemUndoable *pUndo = new DictItemUndoable( getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size() );
 	  pDoc->AddAndDoUndoable( pUndo );
 	  REF_PTR_RELEASE( pUndo ); // belongs to pDoc now.
 	  // Update is called by Do
@@ -1273,7 +1268,7 @@ void MapObjectProps::_PoweredToDict(void)
   {
 	  Dict newDict;
 	  newDict.setBool(TheKey_objectPowered, isChecked);
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	  // Update is called by Do
@@ -1289,7 +1284,7 @@ void MapObjectProps::_AggressivenessToDict(void)
 	static char buf[1024];
 	owner->GetWindowText(buf, sizeof(buf)-2);
 	int value = 0;
-	
+
 	if (strcmp(buf, "Sleep") == 0) {
 		value = -2;
 	} else if (strcmp(buf, "Passive") == 0) {
@@ -1307,10 +1302,10 @@ void MapObjectProps::_AggressivenessToDict(void)
   {
 	  Dict newDict;
 	  newDict.setInt(TheKey_objectAggressiveness, value);
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-	  // Update is called by Do		
+	  // Update is called by Do
   }
 }
 
@@ -1335,7 +1330,7 @@ void MapObjectProps::_VisibilityToDict(void)
 	  if (value != -1) {
 		  newDict.setInt(TheKey_objectVisualRange, value);
 	  }
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, TheKey_objectVisualRange, m_allSelectedDicts.size());
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, TheKey_objectVisualRange, m_allSelectedDicts.size());
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	  // Update is called by Do
@@ -1350,7 +1345,7 @@ void MapObjectProps::_VeterancyToDict(void)
 	CComboBox *owner = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Veterancy);
 	static char buf[1024];
 	int curSel = owner->GetCurSel();
-	int value = 0;	
+	int value = 0;
 	if (curSel >= 0) {
 		value=curSel;
 	}
@@ -1360,10 +1355,10 @@ void MapObjectProps::_VeterancyToDict(void)
   {
 	  Dict newDict;
 	  newDict.setInt(TheKey_objectVeterancy, value);
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-	  // Update is called by Do	
+	  // Update is called by Do
   }
 }
 
@@ -1371,7 +1366,7 @@ void MapObjectProps::_VeterancyToDict(void)
 void MapObjectProps::_ShroudClearingDistanceToDict(void)
 {
 	getAllSelectedDicts();
-	
+
 	int value = -1;
 	CWnd* edit = GetDlgItem(IDC_MAPOBJECT_ShroudClearingDistance);
 	edit->EnableWindow(TRUE);
@@ -1388,7 +1383,7 @@ void MapObjectProps::_ShroudClearingDistanceToDict(void)
 	  if (value != -1) {
 		  newDict.setInt(TheKey_objectShroudClearingDistance, value);
 	  }
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, TheKey_objectShroudClearingDistance, m_allSelectedDicts.size());
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, TheKey_objectShroudClearingDistance, m_allSelectedDicts.size());
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	  // Update is called by Do
@@ -1399,16 +1394,16 @@ void MapObjectProps::_ShroudClearingDistanceToDict(void)
 void MapObjectProps::_RecruitableAIToDict(void)
 {
 	getAllSelectedDicts();
-	
+
 	CButton *owner = (CButton*) GetDlgItem(IDC_MAPOBJECT_RecruitableAI);
 	Bool isChecked = (owner->GetCheck() != 0);
-	
+
 	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc != NULL )
   {
 	  Dict newDict;
 	  newDict.setBool(TheKey_objectRecruitableAI, isChecked);
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	  // Update is called by Do
@@ -1433,7 +1428,7 @@ void MapObjectProps::_SelectableToDict(void)
 	  } else {
 		  newDict.setBool(TheKey_objectSelectable, isChecked);
 	  }
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	  // Update is called by Do
@@ -1441,10 +1436,10 @@ void MapObjectProps::_SelectableToDict(void)
 }
 
 /// Move data from dialog controls to object
-void MapObjectProps::_HPsToDict() 
+void MapObjectProps::_HPsToDict()
 {
 	getAllSelectedDicts();
-	
+
 	Int value;
 	static char buf[1024];
 
@@ -1460,7 +1455,7 @@ void MapObjectProps::_HPsToDict()
     Dict newDict;
 
 	  newDict.setInt(TheKey_objectMaxHPs, value);
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
   }
@@ -1487,7 +1482,7 @@ void MapObjectProps::_StoppingDistanceToDict(void)
   {
 	  Dict newDict;
 	  newDict.setReal(TheKey_objectStoppingDistance, value);
-	  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+	  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
 	  pDoc->AddAndDoUndoable(pUndo);
 	  REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	  // Update is called by Doc
@@ -1495,7 +1490,7 @@ void MapObjectProps::_StoppingDistanceToDict(void)
 }
 
 
-void MapObjectProps::OnEditprop() 
+void MapObjectProps::OnEditprop()
 {
 	int sel = getSel();
 	if (sel == -1 || !m_dictToEdit)
@@ -1506,8 +1501,8 @@ void MapObjectProps::OnEditprop()
 	AsciiString vstr = getNthValueStr(m_dictToEdit, sel, &enquote);
 	Dict::DataType type = m_dictToEdit->getNthType(sel);
 
-	PropEdit propDlg(&kstr, &type, &vstr, true, this);	
-	if (propDlg.DoModal() == IDOK) 
+	PropEdit propDlg(&kstr, &type, &vstr, true, this);
+	if (propDlg.DoModal() == IDOK)
 	{
 		Dict newDict = DictItemUndoable::buildSingleItemDict(kstr, type, vstr);
 		if (this == TheMapObjectProps)
@@ -1517,8 +1512,8 @@ void MapObjectProps::OnEditprop()
 			DictItemUndoable *pUndo = new DictItemUndoable(&m_dictToEdit, newDict, newDict.getNthKey(0));
 			pDoc->AddAndDoUndoable(pUndo);
 			REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
-		} 
-		else 
+		}
+		else
 		{
 			// we're running modal; just slam it in the dict
 			m_dictToEdit->copyPairFrom(newDict, newDict.getNthKey(0));
@@ -1527,7 +1522,7 @@ void MapObjectProps::OnEditprop()
 	}
 }
 
-void MapObjectProps::OnNewprop() 
+void MapObjectProps::OnNewprop()
 {
 	if (!m_dictToEdit)
 		return;
@@ -1536,8 +1531,8 @@ void MapObjectProps::OnNewprop()
 	static Dict::DataType lastNewType = Dict::DICT_BOOL;
 	AsciiString key, value;
 
-	PropEdit propDlg(&key, &lastNewType, &value, false, this);	
-	if (propDlg.DoModal() == IDOK) 
+	PropEdit propDlg(&key, &lastNewType, &value, false, this);
+	if (propDlg.DoModal() == IDOK)
 	{
 		Dict newDict = DictItemUndoable::buildSingleItemDict(key, lastNewType, value);
 		if (this == TheMapObjectProps)
@@ -1548,7 +1543,7 @@ void MapObjectProps::OnNewprop()
 			pDoc->AddAndDoUndoable(pUndo);
 			REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 		}
-		else 
+		else
 		{
 			// we're running modal; just slam it in the dict
 			m_dictToEdit->copyPairFrom(newDict, newDict.getNthKey(0));
@@ -1557,12 +1552,12 @@ void MapObjectProps::OnNewprop()
 	}
 }
 
-void MapObjectProps::OnRemoveprop() 
+void MapObjectProps::OnRemoveprop()
 {
 	int sel = getSel();
 	if (sel == -1)
 		return;
-	
+
 	NameKeyType k = m_dictToEdit->getNthKey(sel);
 	if (this == TheMapObjectProps)
 	{
@@ -1581,7 +1576,7 @@ void MapObjectProps::OnRemoveprop()
 	updateTheUI();
 }
 
-void MapObjectProps::OnDblclkProperties() 
+void MapObjectProps::OnDblclkProperties()
 {
 	OnEditprop();
 }
@@ -1590,9 +1585,9 @@ void MapObjectProps::OnDblclkProperties()
 static const Char NO_SOUND_STRING[] = "(None)";
 static const Char BASE_DEFAULT_STRING[] = "Default";
 
-void MapObjectProps::OnSelchangeProperties() 
+void MapObjectProps::OnSelchangeProperties()
 {
-	
+
 }
 
 /// Initialize dialog, especially drop down lists
@@ -1609,7 +1604,7 @@ BOOL MapObjectProps::OnInitDialog()
 	m_posUndoable = NULL;
 	m_angle = 0;
 	m_height = 0;
-	m_scale = 1.0f; 
+	m_scale = 1.0f;
 
 	InitSound();
 	updateTheUI();
@@ -1618,15 +1613,15 @@ BOOL MapObjectProps::OnInitDialog()
 }
 
 //---------------------------------------------------------------------------------------------------
-/*static*/ void MapObjectProps::update(void) 
+/*static*/ void MapObjectProps::update(void)
 {
-	if (TheMapObjectProps) 
+	if (TheMapObjectProps)
 	{
 		TheMapObjectProps->updateTheUI();
 	}
 }
 
-void MapObjectProps::updateTheUI(void) 
+void MapObjectProps::updateTheUI(void)
 {
 	if (this != TheMapObjectProps) {
 		return;
@@ -1670,14 +1665,14 @@ void MapObjectProps::updateTheUI(MapObject *pMapObj)
   _DictToSelectable();
   _DictToStoppingDistance();
   _DictToUnsellable();
-  _DictToTargetable();    
+  _DictToTargetable();
 	ShowZOffset(pMapObj);
   ShowAngle(pMapObj);
   ShowPosition(pMapObj);
 
   // Warning: order is important. dictToAttachedSound() must come before dictToCustomize(),
-  // dictToCustomize() must come before any of the customization controls, dictToLooping() 
-  // must come before dictToLoopCount(), and dictToLooping() and dictToLoopCount() must 
+  // dictToCustomize() must come before any of the customization controls, dictToLooping()
+  // must come before dictToLoopCount(), and dictToLooping() and dictToLoopCount() must
   // come before dictToEnabled().
   dictToAttachedSound();
   dictToCustomize();
@@ -1713,14 +1708,14 @@ void MapObjectProps::InitSound(void)
   DEBUG_ASSERTCRASH( soundComboBox != NULL, ("Cannot find sound combobox" ) );
   m_defaultEntryIndex = 0;
   m_defaultIsNone = true;
-  
+
   // Load up combobox
   if ( soundComboBox != NULL )
   {
     // Add all the sound names in order. Since the combobox has the SORTED style,
     // we can just add the strings in and let the combo box sort them
     const AudioEventInfoHash & audioEventHash = TheAudio->getAllAudioEvents();
-       
+
     AudioEventInfoHash::const_iterator it;
     for ( it = audioEventHash.begin(); it != audioEventHash.end(); it++ )
     {
@@ -1734,52 +1729,52 @@ void MapObjectProps::InitSound(void)
     m_defaultEntryIndex = soundComboBox->InsertString( 0, BASE_DEFAULT_STRING );
     m_defaultEntryName = NO_SOUND_STRING;
     m_defaultIsNone = true;
-    
+
     soundComboBox->InsertString( 1, NO_SOUND_STRING );
   }
-	
-} // end InitSound
+
+}
 
 
 // Adds a series of Undoable's to the given MultipleUndoable which clears the
-// objectSoundAmbientCustomized flag and all the customization flags out of 
+// objectSoundAmbientCustomized flag and all the customization flags out of
 // all the selected dictionaries.
 // NOTE: assumes getAllSelectedDicts() has already been called
 void MapObjectProps::clearCustomizeFlag( CWorldBuilderDoc* pDoc, MultipleUndoable * ownerUndoable )
 {
   Dict empty;
 
-  DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), empty, TheKey_objectSoundAmbientCustomized, m_allSelectedDicts.size(), pDoc, true);
+  DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), empty, TheKey_objectSoundAmbientCustomized, m_allSelectedDicts.size(), pDoc, true);
   ownerUndoable->addUndoable(pUndo);
   REF_PTR_RELEASE(pUndo); // belongs to ownerUndoable now.
 
   // Note: we can set all the undoes in between the first and last undo to not invalidate,
   // since the first (last for doing) and last invalidate after these changes anyway
-  pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), empty, TheKey_objectSoundAmbientMaxRange, m_allSelectedDicts.size(), pDoc, false);
+  pUndo = new DictItemUndoable(getAllSelectedDictsData(), empty, TheKey_objectSoundAmbientMaxRange, m_allSelectedDicts.size(), pDoc, false);
   ownerUndoable->addUndoable(pUndo);
   REF_PTR_RELEASE(pUndo); // belongs to ownerUndoable now.
-  
-  pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), empty, TheKey_objectSoundAmbientMinVolume, m_allSelectedDicts.size(), pDoc, false);
+
+  pUndo = new DictItemUndoable(getAllSelectedDictsData(), empty, TheKey_objectSoundAmbientMinVolume, m_allSelectedDicts.size(), pDoc, false);
   ownerUndoable->addUndoable(pUndo);
   REF_PTR_RELEASE(pUndo); // belongs to ownerUndoable now.
-  
-  pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), empty, TheKey_objectSoundAmbientVolume, m_allSelectedDicts.size(), pDoc, false);
+
+  pUndo = new DictItemUndoable(getAllSelectedDictsData(), empty, TheKey_objectSoundAmbientVolume, m_allSelectedDicts.size(), pDoc, false);
   ownerUndoable->addUndoable(pUndo);
   REF_PTR_RELEASE(pUndo); // belongs to ownerUndoable now.
-  
-  pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), empty, TheKey_objectSoundAmbientMinRange, m_allSelectedDicts.size(), pDoc, false);
+
+  pUndo = new DictItemUndoable(getAllSelectedDictsData(), empty, TheKey_objectSoundAmbientMinRange, m_allSelectedDicts.size(), pDoc, false);
   ownerUndoable->addUndoable(pUndo);
   REF_PTR_RELEASE(pUndo); // belongs to ownerUndoable now.
 
-  pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), empty, TheKey_objectSoundAmbientLooping, m_allSelectedDicts.size(), pDoc, false);
+  pUndo = new DictItemUndoable(getAllSelectedDictsData(), empty, TheKey_objectSoundAmbientLooping, m_allSelectedDicts.size(), pDoc, false);
   ownerUndoable->addUndoable(pUndo);
   REF_PTR_RELEASE(pUndo); // belongs to ownerUndoable now.
 
-  pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), empty, TheKey_objectSoundAmbientLoopCount, m_allSelectedDicts.size(), pDoc, false);
+  pUndo = new DictItemUndoable(getAllSelectedDictsData(), empty, TheKey_objectSoundAmbientLoopCount, m_allSelectedDicts.size(), pDoc, false);
   ownerUndoable->addUndoable(pUndo);
   REF_PTR_RELEASE(pUndo); // belongs to ownerUndoable now.
 
-  pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), empty, TheKey_objectSoundAmbientPriority, m_allSelectedDicts.size(), pDoc, true);
+  pUndo = new DictItemUndoable(getAllSelectedDictsData(), empty, TheKey_objectSoundAmbientPriority, m_allSelectedDicts.size(), pDoc, true);
   ownerUndoable->addUndoable(pUndo);
   REF_PTR_RELEASE(pUndo); // belongs to ownerUndoable now.
 }
@@ -1792,7 +1787,7 @@ void MapObjectProps::attachedSoundToDict(void)
     return;
 
   getAllSelectedDicts();
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc != NULL )
   {
@@ -1822,7 +1817,7 @@ void MapObjectProps::attachedSoundToDict(void)
       clearCustomizeFlag( pDoc, pUndo );
     }
 
-    DictItemUndoable *pDictUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, TheKey_objectSoundAmbient, m_allSelectedDicts.size(), pDoc, true);
+    DictItemUndoable *pDictUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, TheKey_objectSoundAmbient, m_allSelectedDicts.size(), pDoc, true);
     pUndo->addUndoable( pDictUndo );
     pDoc->AddAndDoUndoable( pUndo );
     REF_PTR_RELEASE( pDictUndo ); // belongs to pUndo
@@ -1837,19 +1832,19 @@ void MapObjectProps::customizeToDict(void)
   CButton * customizeCheckbox = (CButton *)GetDlgItem(IDC_CUSTOMIZE_CHECKBOX);
   if ( customizeCheckbox == NULL )
     return;
-  
+
   getAllSelectedDicts();
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc != NULL )
   {
     Dict newDict;
- 
+
     // For space reasons, erase key instead of added "false" key. Should be treated the same
     if ( customizeCheckbox->GetCheck() == 1 )
     {
       newDict.setBool( TheKey_objectSoundAmbientCustomized, true );
-      DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, TheKey_objectSoundAmbientCustomized, m_allSelectedDicts.size(), pDoc, true);
+      DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, TheKey_objectSoundAmbientCustomized, m_allSelectedDicts.size(), pDoc, true);
       pDoc->AddAndDoUndoable(pUndo);
       REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
       // Update is called by Doc
@@ -1861,7 +1856,7 @@ void MapObjectProps::customizeToDict(void)
       pDoc->AddAndDoUndoable( pUndo );
       REF_PTR_RELEASE( pUndo ); // belongs to pDoc now.
       // Update is called by Doc
-    }    
+    }
   }
 }
 
@@ -1871,17 +1866,17 @@ void MapObjectProps::enabledToDict(void)
   CButton * enabledCheckbox = (CButton *)GetDlgItem(IDC_ENABLED_CHECKBOX);
   if ( enabledCheckbox == NULL )
     return;
-  
+
   getAllSelectedDicts();
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc != NULL )
   {
     Dict newDict;
-    
+
     newDict.setBool( TheKey_objectSoundAmbientEnabled, enabledCheckbox->GetCheck() != 0 );
-    
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
     // Update is called by Doc
@@ -1894,17 +1889,17 @@ void MapObjectProps::loopingToDict(void)
   CButton * loopingCheckbox = (CButton *)GetDlgItem(IDC_LOOPING_CHECKBOX);
   if ( loopingCheckbox == NULL )
     return;
-  
+
   getAllSelectedDicts();
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc != NULL )
   {
     Dict newDict;
-    
+
     newDict.setBool( TheKey_objectSoundAmbientLooping, loopingCheckbox->GetCheck() != 0 );
-    
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
     // Update is called by Doc
@@ -1917,9 +1912,9 @@ void MapObjectProps::loopCountToDict(void)
   CEdit * loopCountEdit = (CEdit *)GetDlgItem(IDC_LOOPCOUNT_EDIT);
   if ( loopCountEdit == NULL )
     return;
-  
+
   getAllSelectedDicts();
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc != NULL )
   {
@@ -1927,10 +1922,10 @@ void MapObjectProps::loopCountToDict(void)
 
     CString loopCountString;
     loopCountEdit->GetWindowText(loopCountString);
-    
+
     newDict.setInt( TheKey_objectSoundAmbientLoopCount, atoi( loopCountString ) );
-    
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
     // Update is called by Doc
@@ -1943,21 +1938,21 @@ void MapObjectProps::minVolumeToDict(void)
   CEdit * minVolumeEdit = (CEdit *)GetDlgItem(IDC_MIN_VOLUME_EDIT);
   if ( minVolumeEdit == NULL )
     return;
-  
+
   getAllSelectedDicts();
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc != NULL )
   {
     Dict newDict;
-    
+
     CString minVolumeString;
     minVolumeEdit->GetWindowText(minVolumeString);
-    
+
     // Note: min volume is stored as Real between 0.0 and 1.0, but displayed as a percentage from 0 to 100
     newDict.setReal( TheKey_objectSoundAmbientMinVolume, INT_TO_REAL( atoi( minVolumeString ) ) / 100.0f );
-    
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
     // Update is called by Doc
@@ -1970,21 +1965,21 @@ void MapObjectProps::volumeToDict(void)
   CEdit * volumeEdit = (CEdit *)GetDlgItem(IDC_VOLUME_EDIT);
   if ( volumeEdit == NULL )
     return;
-  
+
   getAllSelectedDicts();
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc != NULL )
   {
     Dict newDict;
-    
+
     CString volumeString;
     volumeEdit->GetWindowText(volumeString);
-  
+
     // Note: volume is stored as Real between 0.0 and 1.0, but displayed as a percentage from 0 to 100
     newDict.setReal( TheKey_objectSoundAmbientVolume, INT_TO_REAL( atoi( volumeString ) ) / 100.0f );
-    
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
     // Update is called by Doc
@@ -1998,20 +1993,20 @@ void MapObjectProps::minRangeToDict(void)
   CEdit * minRangeEdit = (CEdit *)GetDlgItem(IDC_MIN_RANGE_EDIT);
   if ( minRangeEdit == NULL )
     return;
-  
+
   getAllSelectedDicts();
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc != NULL )
   {
     Dict newDict;
-    
+
     CString minRangeString;
     minRangeEdit->GetWindowText(minRangeString);
-    
+
     newDict.setReal( TheKey_objectSoundAmbientMinRange, INT_TO_REAL( atoi( minRangeString ) ) );
-    
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
     // Update is called by Doc
@@ -2024,20 +2019,20 @@ void MapObjectProps::maxRangeToDict(void)
   CEdit * maxRangeEdit = (CEdit *)GetDlgItem(IDC_MAX_RANGE_EDIT);
   if ( maxRangeEdit == NULL )
     return;
-  
+
   getAllSelectedDicts();
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc != NULL )
   {
     Dict newDict;
-    
+
     CString maxRangeString;
     maxRangeEdit->GetWindowText(maxRangeString);
-    
+
     newDict.setReal( TheKey_objectSoundAmbientMaxRange, INT_TO_REAL( atoi( maxRangeString ) ) );
-    
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
     // Update is called by Doc
@@ -2050,17 +2045,17 @@ void MapObjectProps::priorityToDict(void)
   CComboBox * priorityComboBox = (CComboBox *)GetDlgItem(IDC_PRIORITY_COMBO);
   if ( priorityComboBox == NULL )
     return;
-  
+
   getAllSelectedDicts();
-  
+
   CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
   if ( pDoc != NULL )
   {
     Dict newDict;
-    
+
     newDict.setInt( TheKey_objectSoundAmbientPriority, priorityComboBox->GetCurSel() );
-    
-    DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
+
+    DictItemUndoable *pUndo = new DictItemUndoable(getAllSelectedDictsData(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size(), pDoc, true);
     pDoc->AddAndDoUndoable(pUndo);
     REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
     // Update is called by Doc
@@ -2074,7 +2069,7 @@ void MapObjectProps::dictToAttachedSound()
   CComboBox * soundComboBox = (CComboBox *)GetDlgItem(IDC_SOUND_COMBO);
   if ( soundComboBox == NULL )
     return;
-  
+
   // Update the string for the "default" entry
   m_defaultIsNone = true;
   m_defaultEntryName = NO_SOUND_STRING;
@@ -2090,7 +2085,7 @@ void MapObjectProps::dictToAttachedSound()
     AsciiString string( BASE_DEFAULT_STRING );
 
     const AudioEventRTS * defaultAudioEvent;
-    
+
     // Note: getSoundAmbient will return a non-NULL pointer even if there is no real sound attached to the object
     if ( thingTemplate->hasSoundAmbient() )
     {
@@ -2123,7 +2118,7 @@ void MapObjectProps::dictToAttachedSound()
   // Now select the correct entry in the list box
   AsciiString sound;
   Bool exists = false;
-  if (m_dictToEdit) 
+  if (m_dictToEdit)
   {
     sound = m_dictToEdit->getAsciiString(TheKey_objectSoundAmbient, &exists);
   }
@@ -2135,7 +2130,7 @@ void MapObjectProps::dictToAttachedSound()
     return;
   }
 
-  if ( sound.isEmpty() )  
+  if ( sound.isEmpty() )
   {
     // Use the entry "(None)"
     sound = NO_SOUND_STRING;
@@ -2182,12 +2177,12 @@ void MapObjectProps::dictToCustomize()
 
   Bool exists = false;
   Bool customized = false;
-  if (m_dictToEdit) 
+  if (m_dictToEdit)
   {
     customized = m_dictToEdit->getBool(TheKey_objectSoundAmbientCustomized, &exists);
   }
 
-  customizeCheckbox->SetCheck( exists && customized ? 1 : 0 ); 
+  customizeCheckbox->SetCheck( exists && customized ? 1 : 0 );
 }
 
 
@@ -2207,27 +2202,27 @@ void MapObjectProps::dictToLooping()
   else
   {
     loopingCheckbox->EnableWindow( true );
-    
+
     // If customization is enabled, look to see if the looping flag has already been
     // customized
     Bool exists = false;
     Bool looping = false;
-    if (m_dictToEdit) 
+    if (m_dictToEdit)
     {
       looping = m_dictToEdit->getBool(TheKey_objectSoundAmbientLooping, &exists);
     }
-    
+
     if ( exists )
     {
       loopingCheckbox->SetCheck( looping ? 1 : 0 );
-      
+
       // Don't use defaults, just return
-      return; 
+      return;
     }
   }
 
   // If we get here, we need the default for the looping checkbox
-  
+
   CComboBox * soundComboBox = (CComboBox *)GetDlgItem(IDC_SOUND_COMBO);
   if ( soundComboBox == NULL )
   {
@@ -2235,7 +2230,7 @@ void MapObjectProps::dictToLooping()
     return;
   }
   Int index = soundComboBox->GetCurSel();
-  
+
   CString currentString;
   soundComboBox->GetLBText( index, currentString );
   if ( currentString == NO_SOUND_STRING || ( index == m_defaultEntryIndex && m_defaultIsNone ) )
@@ -2249,9 +2244,9 @@ void MapObjectProps::dictToLooping()
     // Correct the current string e.g. remove "Default <" and ">"
     currentString = m_defaultEntryName.str();
   }
-  
+
   AudioEventInfo * audioEventInfo = TheAudio->findAudioEventInfo(static_cast< const char * >( currentString ) );
-  
+
   loopingCheckbox->SetCheck( ( audioEventInfo && ( audioEventInfo->m_control & AC_LOOP ) ) ? 1 : 0 );
 }
 
@@ -2261,7 +2256,7 @@ void MapObjectProps::dictToLoopCount()
   CEdit * loopCountEdit = ( CEdit * )GetDlgItem(IDC_LOOPCOUNT_EDIT);
   if ( loopCountEdit == NULL )
     return;
-  
+
   // If the customized checkbox is off, all customization controls are disabled
   // If the looping checkbox is off, the loop count control is disabled
   CButton * customizeCheckbox = ( CButton * )GetDlgItem(IDC_CUSTOMIZE_CHECKBOX);
@@ -2274,29 +2269,29 @@ void MapObjectProps::dictToLoopCount()
   else
   {
     loopCountEdit->EnableWindow( true );
-    
+
     // If customization is enabled, look to see if the loop count has already been
     // customized
     Bool exists = false;
     Int loopCount = 0;
-    if (m_dictToEdit) 
+    if (m_dictToEdit)
     {
       loopCount = m_dictToEdit->getInt(TheKey_objectSoundAmbientLoopCount, &exists);
     }
-    
+
     if ( exists )
     {
       CString loopCountText;
       loopCountText.Format( "%d", loopCount );
       loopCountEdit->SetWindowText( loopCountText );
-      
+
       // Don't use defaults, just return
-      return; 
+      return;
     }
   }
-  
+
   // If we get here, we need the default for the loop count
-  
+
   CComboBox * soundComboBox = (CComboBox *)GetDlgItem(IDC_SOUND_COMBO);
   if ( soundComboBox == NULL )
   {
@@ -2305,7 +2300,7 @@ void MapObjectProps::dictToLoopCount()
   }
 
   Int index = soundComboBox->GetCurSel();
-  
+
   CString currentString;
   soundComboBox->GetLBText( index, currentString );
   if ( currentString == NO_SOUND_STRING || ( index == m_defaultEntryIndex && m_defaultIsNone ) )
@@ -2313,13 +2308,13 @@ void MapObjectProps::dictToLoopCount()
     loopCountEdit->SetWindowText( "0" );
     return;
   }
-  
+
   if ( index == m_defaultEntryIndex )
   {
     // Correct the current string e.g. remove "Default <" and ">"
     currentString = m_defaultEntryName.str();
   }
-  
+
   AudioEventInfo * audioEventInfo = TheAudio->findAudioEventInfo(static_cast< const char * >( currentString ) );
 
   if ( audioEventInfo == NULL )
@@ -2327,7 +2322,7 @@ void MapObjectProps::dictToLoopCount()
     loopCountEdit->SetWindowText( "0" );
     return;
   }
-  
+
   CString loopCountText;
   loopCountText.Format( "%d", audioEventInfo->m_loopCount );
   loopCountEdit->SetWindowText( loopCountText );
@@ -2367,7 +2362,7 @@ void MapObjectProps::dictToEnabled()
     // Look to see if the enabled flag has already been customized
     Bool exists = false;
     Bool enabled = false;
-    if (m_dictToEdit) 
+    if (m_dictToEdit)
     {
       enabled = m_dictToEdit->getBool(TheKey_objectSoundAmbientEnabled, &exists);
     }
@@ -2377,14 +2372,14 @@ void MapObjectProps::dictToEnabled()
       enableCheckbox->SetCheck( enabled ? 1 : 0 );
 
       // Don't use defaults, just return
-      return; 
+      return;
     }
   }
 
   // If we get here, we need the default for the enabled checkbox
 
   // Look up sound and see if it's looping. Looping-forever sounds start enabled;
-  // non-looping ones don't. 
+  // non-looping ones don't.
   // Actually, by now, dictToLooping and dictToLoopCount will have looked up the
   // info we need for us
   // NOTE: This test should match the tests done in Object::updateObjValuesFromMapProperties()
@@ -2413,7 +2408,7 @@ void MapObjectProps::dictToMinVolume()
   CEdit * minVolumeEdit = ( CEdit * )GetDlgItem(IDC_MIN_VOLUME_EDIT);
   if ( minVolumeEdit == NULL )
     return;
-  
+
   // If the customized checkbox is off, all customization controls are disabled
   CButton * customizeCheckbox = ( CButton * )GetDlgItem(IDC_CUSTOMIZE_CHECKBOX);
   if ( customizeCheckbox == NULL || customizeCheckbox->GetCheck() == 0 )
@@ -2423,28 +2418,28 @@ void MapObjectProps::dictToMinVolume()
   else
   {
     minVolumeEdit->EnableWindow( true );
-    
+
     // If customization is enabled, look to see if the minimum volume has already been
     // customized
     Bool exists = false;
     Real minVolume = 0.0f;
-    if (m_dictToEdit) 
+    if (m_dictToEdit)
     {
       minVolume = m_dictToEdit->getReal(TheKey_objectSoundAmbientMinVolume, &exists);
     }
-    
+
     if ( exists )
     {
       // Note: min volume is stored as Real between 0.0 and 1.0, but displayed as a percentage from 0 to 100
       CString minVolumeText;
       minVolumeText.Format( "%d", REAL_TO_INT( ( minVolume * 100.0f ) + 0.5 ) );
       minVolumeEdit->SetWindowText( minVolumeText );
-            
+
       // Don't use defaults, just return
-      return; 
+      return;
     }
   }
-  
+
   // If we get here, we need the default for the minimum volume
   CComboBox * soundComboBox = (CComboBox *)GetDlgItem(IDC_SOUND_COMBO);
   if ( soundComboBox == NULL )
@@ -2452,9 +2447,9 @@ void MapObjectProps::dictToMinVolume()
     minVolumeEdit->SetWindowText( "40" );
     return;
   }
-  
+
   Int index = soundComboBox->GetCurSel();
-  
+
   CString currentString;
   soundComboBox->GetLBText( index, currentString );
   if ( currentString == NO_SOUND_STRING || ( index == m_defaultEntryIndex && m_defaultIsNone ) )
@@ -2462,21 +2457,21 @@ void MapObjectProps::dictToMinVolume()
     minVolumeEdit->SetWindowText( "40" );
     return;
   }
-  
+
   if ( index == m_defaultEntryIndex )
   {
     // Correct the current string e.g. remove "Default <" and ">"
     currentString = m_defaultEntryName.str();
   }
-  
+
   AudioEventInfo * audioEventInfo = TheAudio->findAudioEventInfo(static_cast< const char * >( currentString ) );
-  
+
   if ( audioEventInfo == NULL )
   {
     minVolumeEdit->SetWindowText( "40" );
     return;
   }
-  
+
   // Note: min volume is stored as Real between 0.0 and 1.0, but displayed as a percentage from 0 to 100
   CString minVolumeText;
   minVolumeText.Format( "%d", REAL_TO_INT( ( audioEventInfo->m_minVolume * 100.0f ) + 0.5 ) );
@@ -2489,7 +2484,7 @@ void MapObjectProps::dictToVolume()
   CEdit * volumeEdit = ( CEdit * )GetDlgItem(IDC_VOLUME_EDIT);
   if ( volumeEdit == NULL )
     return;
-  
+
   // If the customized checkbox is off, all customization controls are disabled
   CButton * customizeCheckbox = ( CButton * )GetDlgItem(IDC_CUSTOMIZE_CHECKBOX);
   if ( customizeCheckbox == NULL || customizeCheckbox->GetCheck() == 0 )
@@ -2499,28 +2494,28 @@ void MapObjectProps::dictToVolume()
   else
   {
     volumeEdit->EnableWindow( true );
-    
+
     // If customization is enabled, look to see if the volume has already been
     // customized
     Bool exists = false;
     Real volume = 0.0f;
-    if (m_dictToEdit) 
+    if (m_dictToEdit)
     {
       volume = m_dictToEdit->getReal(TheKey_objectSoundAmbientVolume, &exists);
     }
-    
+
     if ( exists )
     {
       // Note: min volume is stored as Real between 0.0 and 1.0, but displayed as a percentage from 0 to 100
       CString volumeText;
       volumeText.Format( "%d", REAL_TO_INT( ( volume * 100.0f ) + 0.5 ) );
       volumeEdit->SetWindowText( volumeText );
-      
+
       // Don't use defaults, just return
-      return; 
+      return;
     }
   }
-  
+
   // If we get here, we need the default for the volume
   CComboBox * soundComboBox = (CComboBox *)GetDlgItem(IDC_SOUND_COMBO);
   if ( soundComboBox == NULL )
@@ -2528,9 +2523,9 @@ void MapObjectProps::dictToVolume()
     volumeEdit->SetWindowText( "100" );
     return;
   }
-  
+
   Int index = soundComboBox->GetCurSel();
-  
+
   CString currentString;
   soundComboBox->GetLBText( index, currentString );
   if ( currentString == NO_SOUND_STRING || ( index == m_defaultEntryIndex && m_defaultIsNone ) )
@@ -2538,7 +2533,7 @@ void MapObjectProps::dictToVolume()
     volumeEdit->SetWindowText( "100" );
     return;
   }
-  
+
   if ( index == m_defaultEntryIndex )
   {
     // Correct the current string e.g. remove "Default <" and ">"
@@ -2546,13 +2541,13 @@ void MapObjectProps::dictToVolume()
   }
 
   AudioEventInfo * audioEventInfo = TheAudio->findAudioEventInfo(static_cast< const char * >( currentString ) );
-  
+
   if ( audioEventInfo == NULL )
   {
     volumeEdit->SetWindowText( "100" );
     return;
   }
-  
+
   // Note: volume is stored as Real between 0.0 and 1.0, but displayed as a percentage from 0 to 100
   CString volumeText;
   volumeText.Format( "%d", REAL_TO_INT( ( audioEventInfo->m_volume * 100.0f ) + 0.5 ) );
@@ -2566,7 +2561,7 @@ void MapObjectProps::dictToMinRange()
   CEdit * minRangeEdit = ( CEdit * )GetDlgItem(IDC_MIN_RANGE_EDIT);
   if ( minRangeEdit == NULL )
     return;
-  
+
   // If the customized checkbox is off, all customization controls are disabled
   CButton * customizeCheckbox = ( CButton * )GetDlgItem(IDC_CUSTOMIZE_CHECKBOX);
   if ( customizeCheckbox == NULL || customizeCheckbox->GetCheck() == 0 )
@@ -2576,27 +2571,27 @@ void MapObjectProps::dictToMinRange()
   else
   {
     minRangeEdit->EnableWindow( true );
-    
+
     // If customization is enabled, look to see if the minimum range has already been
     // customized
     Bool exists = false;
     Real minRange = 0.0f;
-    if (m_dictToEdit) 
+    if (m_dictToEdit)
     {
       minRange = m_dictToEdit->getReal(TheKey_objectSoundAmbientMinRange, &exists);
     }
-    
+
     if ( exists )
     {
       CString minRangeText;
       minRangeText.Format( "%d", REAL_TO_INT(minRange) );
       minRangeEdit->SetWindowText( minRangeText );
-      
+
       // Don't use defaults, just return
-      return; 
+      return;
     }
   }
-  
+
   // If we get here, we need the default for the minimum range
   CComboBox * soundComboBox = (CComboBox *)GetDlgItem(IDC_SOUND_COMBO);
   if ( soundComboBox == NULL )
@@ -2604,9 +2599,9 @@ void MapObjectProps::dictToMinRange()
     minRangeEdit->SetWindowText( "175" );
     return;
   }
-  
+
   Int index = soundComboBox->GetCurSel();
-  
+
   CString currentString;
   soundComboBox->GetLBText( index, currentString );
   if ( currentString == NO_SOUND_STRING || ( index == m_defaultEntryIndex && m_defaultIsNone ) )
@@ -2614,21 +2609,21 @@ void MapObjectProps::dictToMinRange()
     minRangeEdit->SetWindowText( "175" );
     return;
   }
-  
+
   if ( index == m_defaultEntryIndex )
   {
     // Correct the current string e.g. remove "Default <" and ">"
     currentString = m_defaultEntryName.str();
   }
-  
+
   AudioEventInfo * audioEventInfo = TheAudio->findAudioEventInfo(static_cast< const char * >( currentString ) );
-  
+
   if ( audioEventInfo == NULL )
   {
     minRangeEdit->SetWindowText( "175" );
     return;
   }
-  
+
   CString minRangeText;
   minRangeText.Format( "%d", REAL_TO_INT( audioEventInfo->m_minDistance ) );
   minRangeEdit->SetWindowText( minRangeText );
@@ -2641,7 +2636,7 @@ void MapObjectProps::dictToMaxRange()
   CEdit * maxRangeEdit = ( CEdit * )GetDlgItem(IDC_MAX_RANGE_EDIT);
   if ( maxRangeEdit == NULL )
     return;
-  
+
   // If the customized checkbox is off, all customization controls are disabled
   CButton * customizeCheckbox = ( CButton * )GetDlgItem(IDC_CUSTOMIZE_CHECKBOX);
   if ( customizeCheckbox == NULL || customizeCheckbox->GetCheck() == 0 )
@@ -2651,27 +2646,27 @@ void MapObjectProps::dictToMaxRange()
   else
   {
     maxRangeEdit->EnableWindow( true );
-    
+
     // If customization is enabled, look to see if the maximum range has already been
     // customized
     Bool exists = false;
     Real maxRange = 0.0f;
-    if (m_dictToEdit) 
+    if (m_dictToEdit)
     {
       maxRange = m_dictToEdit->getReal(TheKey_objectSoundAmbientMaxRange, &exists);
     }
-    
+
     if ( exists )
     {
       CString maxRangeText;
       maxRangeText.Format( "%d", REAL_TO_INT( maxRange ) );
       maxRangeEdit->SetWindowText( maxRangeText );
-      
+
       // Don't use defaults, just return
-      return; 
+      return;
     }
   }
-  
+
   // If we get here, we need the default for the minimum range
   CComboBox * soundComboBox = (CComboBox *)GetDlgItem(IDC_SOUND_COMBO);
   if ( soundComboBox == NULL )
@@ -2679,9 +2674,9 @@ void MapObjectProps::dictToMaxRange()
     maxRangeEdit->SetWindowText( "600" );
     return;
   }
-  
+
   Int index = soundComboBox->GetCurSel();
-  
+
   CString currentString;
   soundComboBox->GetLBText( index, currentString );
   if ( currentString == NO_SOUND_STRING || ( index == m_defaultEntryIndex && m_defaultIsNone ) )
@@ -2689,21 +2684,21 @@ void MapObjectProps::dictToMaxRange()
     maxRangeEdit->SetWindowText( "600" );
     return;
   }
-  
+
   if ( index == m_defaultEntryIndex )
   {
     // Correct the current string e.g. remove "Default <" and ">"
     currentString = m_defaultEntryName.str();
   }
-  
+
   AudioEventInfo * audioEventInfo = TheAudio->findAudioEventInfo(static_cast< const char * >( currentString ) );
-  
+
   if ( audioEventInfo == NULL )
   {
     maxRangeEdit->SetWindowText( "600" );
     return;
   }
-  
+
   CString maxRangeText;
   maxRangeText.Format( "%d", REAL_TO_INT( audioEventInfo->m_maxDistance ) );
   maxRangeEdit->SetWindowText( maxRangeText );
@@ -2715,7 +2710,7 @@ void MapObjectProps::dictToPriority()
   CComboBox * priorityComboBox = ( CComboBox * )GetDlgItem(IDC_PRIORITY_COMBO);
   if ( priorityComboBox == NULL )
     return;
-  
+
   // If the customized checkbox is off, all customization controls are disabled
   CButton * customizeCheckbox = ( CButton * )GetDlgItem(IDC_CUSTOMIZE_CHECKBOX);
   if ( customizeCheckbox == NULL || customizeCheckbox->GetCheck() == 0 )
@@ -2725,16 +2720,16 @@ void MapObjectProps::dictToPriority()
   else
   {
     priorityComboBox->EnableWindow( true );
-    
+
     // If customization is enabled, look to see if the maximum range has already been
     // customized
     Bool exists = false;
     Int priorityEnum = AP_LOWEST;
-    if (m_dictToEdit) 
+    if (m_dictToEdit)
     {
       priorityEnum = m_dictToEdit->getInt(TheKey_objectSoundAmbientPriority, &exists);
     }
-    
+
     if ( exists )
     {
       if ( priorityEnum < 0 || priorityEnum > AP_CRITICAL )
@@ -2745,12 +2740,12 @@ void MapObjectProps::dictToPriority()
 
       // Note: indexes of priority combobox map to priority enum
       priorityComboBox->SetCurSel( priorityEnum );
-      
+
       // Don't use defaults, just return
-      return; 
+      return;
     }
   }
-  
+
   // If we get here, we need the default for the priority
   CComboBox * soundComboBox = (CComboBox *)GetDlgItem(IDC_SOUND_COMBO);
   if ( soundComboBox == NULL )
@@ -2758,9 +2753,9 @@ void MapObjectProps::dictToPriority()
     priorityComboBox->SetCurSel( AP_LOWEST );
     return;
   }
-  
+
   Int index = soundComboBox->GetCurSel();
-  
+
   CString currentString;
   soundComboBox->GetLBText( index, currentString );
   if ( currentString == NO_SOUND_STRING || ( index == m_defaultEntryIndex && m_defaultIsNone ) )
@@ -2768,21 +2763,21 @@ void MapObjectProps::dictToPriority()
     priorityComboBox->SetCurSel( AP_LOWEST );
     return;
   }
-  
+
   if ( index == m_defaultEntryIndex )
   {
     // Correct the current string e.g. remove "Default <" and ">"
     currentString = m_defaultEntryName.str();
   }
-  
+
   AudioEventInfo * audioEventInfo = TheAudio->findAudioEventInfo(static_cast< const char * >( currentString ) );
-  
+
   if ( audioEventInfo == NULL )
   {
     priorityComboBox->SetCurSel( AP_LOWEST );
     return;
   }
-  
+
   priorityComboBox->SetCurSel( audioEventInfo->m_priority );
 }
 
@@ -2805,13 +2800,13 @@ void MapObjectProps::enableButtons()
 
 /*static*/ MapObject *MapObjectProps::getSingleSelectedMapObject(void)
 {
-	MapObject *pMapObj; 
-	MapObject *theMapObj = NULL; 
+	MapObject *pMapObj;
+	MapObject *theMapObj = NULL;
 //	Bool found = false;
 	Int selCount=0;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 		if (pMapObj->isSelected()) {
-			if (!pMapObj->isWaypoint() && !pMapObj->isLight()) 
+			if (!pMapObj->isWaypoint() && !pMapObj->isLight())
 			{
 				theMapObj = pMapObj;
 			}
@@ -2869,21 +2864,29 @@ void MapObjectProps::getAllSelectedDicts(void)
 	}
 }
 
+Dict** MapObjectProps::getAllSelectedDictsData()
+{
+#if defined(USING_STLPORT) || __cplusplus < 201103L
+	return !m_allSelectedDicts.empty() ? &m_allSelectedDicts.front() : NULL;
+#else
+	return m_allSelectedDicts.data();
+#endif
+}
 
 /// Move data from dialog controls to object
-void MapObjectProps::OnScaleOn() 
+void MapObjectProps::OnScaleOn()
 {
   _ScaleToDict();
 }
 
 /// Move data from dialog controls to object
-void MapObjectProps::OnScaleOff() 
+void MapObjectProps::OnScaleOff()
 {
   _ScaleToDict();
 }
 
 /// Move data from dialog controls to object
-void MapObjectProps::OnKillfocusMAPOBJECTXYPosition() 
+void MapObjectProps::OnKillfocusMAPOBJECTXYPosition()
 {
   SetPosition();
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/playerlistdlg.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/playerlistdlg.cpp
index 500791de6ca..a7e33d0ab9d 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/playerlistdlg.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/playerlistdlg.cpp
@@ -53,7 +53,7 @@ static void fixDefaultTeamName(SidesList& sides, AsciiString oldpname, AsciiStri
 	{
 		tname.set("team");
 		tname.concat(newpname);
-		DEBUG_LOG(("rename team %s -> %s\n",ti->getDict()->getAsciiString(TheKey_teamName).str(),tname.str()));
+		DEBUG_LOG(("rename team %s -> %s",ti->getDict()->getAsciiString(TheKey_teamName).str(),tname.str()));
 		ti->getDict()->setAsciiString(TheKey_teamName, tname);
 		ti->getDict()->setAsciiString(TheKey_teamOwner, newpname);
 	}
@@ -71,7 +71,7 @@ static void updateAllTeams(SidesList& sides, AsciiString oldpname, AsciiString n
 		if (teamInfo) {
 			Bool exists;
 			Dict *dict = teamInfo->getDict();
-			
+
 			AsciiString teamOwner = dict->getAsciiString(TheKey_teamOwner, &exists);
 
 			if (exists && teamOwner.compare(oldpname) == 0) {
@@ -87,7 +87,7 @@ static void ensureValidPlayerName(Dict *d)
 {
 	// ensure there are no illegal chars in it. (in particular, no spaces!)
 	char buf[1024];
-	strcpy(buf, d->getAsciiString(TheKey_playerName).str());
+	strlcpy(buf, d->getAsciiString(TheKey_playerName).str(), ARRAY_SIZE(buf));
 	for (char* p = buf; *p; ++p)
 		if (!islegalplayernamechar(*p))
 			*p = '_';
@@ -118,7 +118,7 @@ static AsciiString UIToInternal(SidesList& sides, const AsciiString& n)
 static Bool containsToken(const AsciiString& cur_allies, const AsciiString& tokenIn)
 {
 	AsciiString name, token;
-	
+
 	name = cur_allies;
 	while (name.nextToken(&token))
 	{
@@ -131,7 +131,7 @@ static Bool containsToken(const AsciiString& cur_allies, const AsciiString& toke
 static AsciiString removeDupsFromEnemies(const AsciiString& cur_allies, const AsciiString& cur_enemies)
 {
 	AsciiString new_enemies, tmp, token;
-	
+
 	tmp = cur_enemies;
 	while (tmp.nextToken(&token))
 	{
@@ -159,7 +159,7 @@ static AsciiString extractFromAlliesList(CListBox *alliesList, SidesList& sides)
 			allies.concat(UIToInternal(sides, nm));
 		}
 	}
-//DEBUG_LOG(("a/e is (%s)\n",allies.str()));
+//DEBUG_LOG(("a/e is (%s)",allies.str()));
 	return allies;
 }
 
@@ -173,7 +173,7 @@ static void buildAlliesList(CListBox *alliesList, SidesList& sides,	const AsciiS
 	{
 		name = sides.getSideInfo(i)->getDict()->getAsciiString(TheKey_playerName);
 		if (name == omitPlayer || name.isEmpty())
-			continue;	
+			continue;
 		name = playerNameForUI(sides, i);
 		alliesList->AddString(name.str());
 	}
@@ -219,7 +219,7 @@ static const char* calcRelationStr(SidesList& sides, int t1, int t2)
 	SidesInfo* ti1;
 	SidesInfo* ti2;
 	AsciiString t2name;
-	
+
 
 	//	we use the relationship between our player's default teams.
 	ti1 = sides.getSideInfo(t1);
@@ -280,7 +280,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // PlayerListDlg message handlers
 
-void PlayerListDlg::OnNewplayer() 
+void PlayerListDlg::OnNewplayer()
 {
 	if (m_sides.getNumSides() >= MAX_PLAYER_COUNT - 1) ///Added -1 so we can always have an observer even for Single player games.
 		return;
@@ -305,13 +305,13 @@ void PlayerListDlg::OnNewplayer()
 	newPlayerDict.setBool(TheKey_playerIsHuman, true);
 	newPlayerDict.setUnicodeString(TheKey_playerDisplayName, pnameu);
 	newPlayerDict.setAsciiString(TheKey_playerFaction, addedPTName);
-	newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString(""));
-	newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString(""));
+	newPlayerDict.setAsciiString(TheKey_playerEnemies, "");
+	newPlayerDict.setAsciiString(TheKey_playerAllies, "");
 
 #ifdef NOT_IN_USE
 	// auto-open the advanced prop editor
 	MapObjectProps editor(&newPlayerDict, "Create New Player", this);
-	if (editor.DoModal() == IDOK) 
+	if (editor.DoModal() == IDOK)
 #endif
 	{
 		if (newPlayerDict.getAsciiString(TheKey_playerName).isEmpty())
@@ -329,10 +329,10 @@ void PlayerListDlg::OnNewplayer()
 			m_curPlayerIdx = m_sides.getNumSides()-1;
 			updateTheUI();
 		}
-	}	
+	}
 }
 
-void PlayerListDlg::OnEditplayer() 
+void PlayerListDlg::OnEditplayer()
 {
 	// TODO: the dialog referenced here has no ok or cancel buttons, so locks the editor
 	// re-enable this routine once it is not a guaranteed hang
@@ -348,7 +348,7 @@ void PlayerListDlg::OnEditplayer()
 
 	Dict playerDictCopy = *playerDict;
 	MapObjectProps editor(&playerDictCopy, "Edit Player", this);
-	if (editor.DoModal() == IDOK) 
+	if (editor.DoModal() == IDOK)
 	{
 		ensureValidPlayerName(&playerDictCopy);
 
@@ -380,14 +380,14 @@ void PlayerListDlg::OnEditplayer()
 #endif
 }
 
-void PlayerListDlg::OnRemoveplayer() 
+void PlayerListDlg::OnRemoveplayer()
 {
 	Dict *playerDict = m_sides.getSideInfo(m_curPlayerIdx)->getDict();
 	AsciiString pname = playerDict->getAsciiString(TheKey_playerName);
 	Bool isneutral = pname.isEmpty();
 	if (isneutral)
 		return;
-	
+
 	Int i;
 	Int count = 0;
 	for (i = 0; i < m_sides.getNumTeams(); i++)
@@ -397,7 +397,7 @@ void PlayerListDlg::OnRemoveplayer()
 		{
 			count += MapObject::countMapObjectsWithOwner(tdict->getAsciiString(TheKey_teamName));
 		}
-	} 
+	}
 
 	if (count > 0)
 	{
@@ -420,7 +420,7 @@ void PlayerListDlg::OnRemoveplayer()
 			m_sides.removeTeam(i);
 			goto try_again;
 		}
-	} 
+	}
 
 	Bool modified = m_sides.validateSides();
 	(void)modified;
@@ -428,14 +428,14 @@ void PlayerListDlg::OnRemoveplayer()
 	updateTheUI();
 }
 
-void PlayerListDlg::OnSelchangePlayers() 
+void PlayerListDlg::OnSelchangePlayers()
 {
 	CListBox *list = (CListBox*)GetDlgItem(IDC_PLAYERS);
 	m_curPlayerIdx = list->GetCurSel();
 	updateTheUI();
 }
 
-void PlayerListDlg::updateTheUI(void) 
+void PlayerListDlg::updateTheUI(void)
 {
 	char buffer[1024];
 
@@ -450,7 +450,7 @@ void PlayerListDlg::updateTheUI(void)
 	DEBUG_ASSERTLOG(!modified,("had to clean up sides in PlayerListDlg::updateTheUI! (caller should do this)"));
 
 	if (m_curPlayerIdx < 0) m_curPlayerIdx = 0;
-	if (m_curPlayerIdx >= m_sides.getNumSides()) 
+	if (m_curPlayerIdx >= m_sides.getNumSides())
 		m_curPlayerIdx = m_sides.getNumSides()-1;
 
 	// update player list
@@ -476,7 +476,7 @@ void PlayerListDlg::updateTheUI(void)
 	AsciiString cur_pname = pdict->getAsciiString(TheKey_playerName);
 	UnicodeString cur_pdname = pdict->getUnicodeString(TheKey_playerDisplayName);
 	Bool isNeutral = cur_pname.isEmpty();
-	
+
 	// update player name
 	{
 		CWnd *playername = GetDlgItem(IDC_PLAYERNAME);
@@ -568,11 +568,11 @@ void PlayerListDlg::updateTheUI(void)
 		pname = playerNameForUI(m_sides, i);
 
 		rstr = calcRelationStr(m_sides, m_curPlayerIdx, i);
-		sprintf(buffer, "%s: %s",pname.str(),rstr);
+		snprintf(buffer, ARRAY_SIZE(buffer), "%s: %s",pname.str(),rstr);
 		regardOthers->AddString(buffer);
 
 		rstr = calcRelationStr(m_sides, i, m_curPlayerIdx);
-		sprintf(buffer, "%s: %s",pname.str(),rstr);
+		snprintf(buffer, ARRAY_SIZE(buffer), "%s: %s",pname.str(),rstr);
 		regardMe->AddString(buffer);
 	}
 
@@ -597,10 +597,10 @@ void PlayerListDlg::updateTheUI(void)
 }
 
 
-BOOL PlayerListDlg::OnInitDialog() 
+BOOL PlayerListDlg::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	m_updating = 0;
 	m_sides = *TheSidesList;
 	m_curPlayerIdx = thePrevCurPlyr;
@@ -617,12 +617,12 @@ BOOL PlayerListDlg::OnInitDialog()
 
 	updateTheUI();
 	PopulateColorComboBox();
-	
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-void PlayerListDlg::OnDblclkPlayers() 
+void PlayerListDlg::OnDblclkPlayers()
 {
 	OnEditplayer();
 }
@@ -689,7 +689,7 @@ void PlayerListDlg::OnSelectPlayerColor()
 	CComboBox *pCombo = (CComboBox *)GetDlgItem(IDC_PlayerColorCombo);
 	Dict *playerDict = m_sides.getSideInfo(m_curPlayerIdx)->getDict();
 	if (pCombo && playerDict) {
-		CString str; 
+		CString str;
 		pCombo->GetWindowText(str);
 		Int index = -1;
 		Int numColors = TheMultiplayerSettings->getNumColors();
@@ -716,7 +716,7 @@ void PlayerListDlg::OnSelectPlayerColor()
 	updateTheUI();
 }
 
-void PlayerListDlg::OnSelchangeAllieslist() 
+void PlayerListDlg::OnSelchangeAllieslist()
 {
 	Dict *playerDict = m_sides.getSideInfo(m_curPlayerIdx)->getDict();
 	AsciiString pname = playerDict->getAsciiString(TheKey_playerName);
@@ -738,12 +738,12 @@ void PlayerListDlg::OnSelchangeAllieslist()
 	updateTheUI();
 }
 
-void PlayerListDlg::OnSelchangeEnemieslist() 
+void PlayerListDlg::OnSelchangeEnemieslist()
 {
 	OnSelchangeAllieslist();
 }
 
-void PlayerListDlg::OnOK() 
+void PlayerListDlg::OnOK()
 {
 	Bool modified = m_sides.validateSides();
 	(void)modified;
@@ -755,24 +755,24 @@ void PlayerListDlg::OnOK()
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 
 	thePrevCurPlyr = m_curPlayerIdx;
-	
+
 	CDialog::OnOK();
 }
 
-void PlayerListDlg::OnCancel() 
+void PlayerListDlg::OnCancel()
 {
 	CDialog::OnCancel();
 }
 
-void PlayerListDlg::OnPlayeriscomputer() 
+void PlayerListDlg::OnPlayeriscomputer()
 {
 	CButton *b = (CButton*)GetDlgItem(IDC_PLAYERISCOMPUTER);
 	m_sides.getSideInfo(m_curPlayerIdx)->getDict()->setBool(TheKey_playerIsHuman, b->GetCheck() == 0);
-	
-	updateTheUI();	
+
+	updateTheUI();
 }
 
-void PlayerListDlg::OnEditchangePlayerfaction() 
+void PlayerListDlg::OnEditchangePlayerfaction()
 {
 	CComboBox *faction = (CComboBox*)GetDlgItem(IDC_PLAYERFACTION);
 
@@ -794,7 +794,7 @@ void PlayerListDlg::OnEditchangePlayerfaction()
 	}
 }
 
-void PlayerListDlg::OnChangePlayername() 
+void PlayerListDlg::OnChangePlayername()
 {
 	CWnd *playername = GetDlgItem(IDC_PLAYERNAME);
 	char buf[1024];
@@ -815,7 +815,7 @@ void PlayerListDlg::OnChangePlayername()
 	{
 		pdict->setAsciiString(TheKey_playerName, pnamenew);
 		ensureValidPlayerName(pdict);
-		
+
 		updateAllTeams(m_sides, pnameold, pnamenew);
 		fixDefaultTeamName(m_sides, pnameold, pnamenew);
 	}
@@ -823,14 +823,14 @@ void PlayerListDlg::OnChangePlayername()
 	updateTheUI();
 }
 
-void PlayerListDlg::OnChangePlayerdisplayname() 
+void PlayerListDlg::OnChangePlayerdisplayname()
 {
 	CWnd *playername = GetDlgItem(IDC_PLAYERDISPLAYNAME);
 	char buf[1024];
 	playername->GetWindowText(buf, sizeof(buf)-2);
 
 	Dict *pdict = m_sides.getSideInfo(m_curPlayerIdx)->getDict();
-	
+
 	AsciiString tmp(buf);
 	UnicodeString pnamenew;
 	pnamenew.translate(tmp);
@@ -844,7 +844,7 @@ void PlayerListDlg::OnChangePlayerdisplayname()
 	updateTheUI();
 }
 
-static void addSide(SidesList *sides, AsciiString faction, 
+static void addSide(SidesList *sides, AsciiString faction,
 										AsciiString playerName, const wchar_t *playerUName)
 {
 	if (!sides->findSideInfo(playerName)) {
@@ -856,8 +856,8 @@ static void addSide(SidesList *sides, AsciiString faction,
 		newPlayerDict.setBool(TheKey_playerIsHuman, false);
 		newPlayerDict.setUnicodeString(TheKey_playerDisplayName, playerUStr);
 		newPlayerDict.setAsciiString(TheKey_playerFaction, faction);
-		newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString(""));
-		newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString(""));
+		newPlayerDict.setAsciiString(TheKey_playerEnemies, "");
+		newPlayerDict.setAsciiString(TheKey_playerAllies, "");
 
 		ensureValidPlayerName(&newPlayerDict);
 		sides->addSide(&newPlayerDict);
@@ -868,7 +868,7 @@ static void addSide(SidesList *sides, AsciiString faction,
 	}
 }
 
-void PlayerListDlg::OnAddskirmishplayers() 
+void PlayerListDlg::OnAddskirmishplayers()
 {
 	// PlyrCivilian
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/propedit.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/propedit.cpp
index 03570563402..266f0b48c33 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/propedit.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/propedit.cpp
@@ -124,43 +124,43 @@ void PropEdit::validate()
 /////////////////////////////////////////////////////////////////////////////
 // PropEdit message handlers
 
-void PropEdit::OnChangeKeyname() 
+void PropEdit::OnChangeKeyname()
 {
 	validate();
 }
 
-void PropEdit::OnEditchangeKeytype() 
+void PropEdit::OnEditchangeKeytype()
 {
 	validate();
 }
 
-void PropEdit::OnCloseupKeytype() 
+void PropEdit::OnCloseupKeytype()
 {
 	validate();
 }
 
-void PropEdit::OnSelchangeKeytype() 
+void PropEdit::OnSelchangeKeytype()
 {
 	validate();
 }
 
-void PropEdit::OnChangeValue() 
+void PropEdit::OnChangeValue()
 {
 	validate();
 }
 
 
-BOOL PropEdit::OnInitDialog() 
+BOOL PropEdit::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	CWnd *keyname = GetDlgItem(IDC_KEYNAME);
 	CWnd *valuename = GetDlgItem(IDC_VALUE);
 	CComboBox *keytype = (CComboBox*)GetDlgItem(IDC_KEYTYPE);
 	CButton *valuebool = (CButton*)GetDlgItem(IDC_PROPBOOL);
 
 	++m_updating;
-	keytype->SetCurSel((Int)*m_type);	
+	keytype->SetCurSel((Int)*m_type);
 	keyname->SetWindowText(m_key->str());
 	valuename->SetWindowText(m_value->str());
 	valuebool->SetCheck(strcmp(m_value->str(), "true")==0 ? 1 : 0);
@@ -170,7 +170,7 @@ BOOL PropEdit::OnInitDialog()
 	return TRUE;  // return TRUE unless you set the focus to a control
 }
 
-void PropEdit::OnPropbool() 
+void PropEdit::OnPropbool()
 {
-	validate();	
+	validate();
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/teamsdialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/teamsdialog.cpp
index 231da1a549d..17a197dd839 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/teamsdialog.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/teamsdialog.cpp
@@ -152,7 +152,7 @@ void CTeamsDialog::updateUI(Int whatToRebuild)
 
 	// constrain team index.
 	if (m_curTeam < 0) m_curTeam = 0;
-	if (m_curTeam >= m_sides.getNumTeams()) 
+	if (m_curTeam >= m_sides.getNumTeams())
 		m_curTeam = m_sides.getNumTeams()-1;
 
 	if (whatToRebuild & REBUILD_TEAMS)
@@ -188,7 +188,7 @@ void CTeamsDialog::updateUI(Int whatToRebuild)
 	--m_updating;
 }
 
-BOOL CTeamsDialog::OnInitDialog() 
+BOOL CTeamsDialog::OnInitDialog()
 {
 	CRect rect;
 
@@ -221,7 +221,7 @@ BOOL CTeamsDialog::OnInitDialog()
 	return TRUE;
 }
 
-void CTeamsDialog::OnOK() 
+void CTeamsDialog::OnOK()
 {
 	Bool modified = m_sides.validateSides();
 	(void)modified;
@@ -233,23 +233,23 @@ void CTeamsDialog::OnOK()
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 
 	thePrevCurTeam = m_curTeam;
-	
+
 	CDialog::OnOK();
 }
 
-void CTeamsDialog::OnCancel() 
+void CTeamsDialog::OnCancel()
 {
 	CDialog::OnCancel();
 }
 
-void CTeamsDialog::OnNewteam() 
+void CTeamsDialog::OnNewteam()
 {
 	Int num = 1;
 	AsciiString tname;
-	do 
+	do
 	{
 		tname.format("team%04d",num++);
-	} 
+	}
 	while (m_sides.findTeamInfo(tname));
 
 	AsciiString oname = m_sides.getTeamInfo(m_curTeam)->getDict()->getAsciiString(TheKey_teamOwner);
@@ -268,7 +268,7 @@ void CTeamsDialog::OnNewteam()
 	updateUI(REBUILD_ALL);
 }
 
-void CTeamsDialog::OnDeleteteam() 
+void CTeamsDialog::OnDeleteteam()
 {
 	if (m_curTeam < 0)
 		return;
@@ -279,7 +279,7 @@ void CTeamsDialog::OnDeleteteam()
 		DEBUG_CRASH(("should not be allowed"));
 		return;
 	}
-	
+
 	AsciiString tname = m_sides.getTeamInfo(m_curTeam)->getDict()->getAsciiString(TheKey_teamName);
 	Int count = MapObject::countMapObjectsWithOwner(tname);
 	if (count > 0)
@@ -294,7 +294,7 @@ void CTeamsDialog::OnDeleteteam()
 	updateUI(REBUILD_ALL);
 }
 
-void CTeamsDialog::OnEditTemplate() 
+void CTeamsDialog::OnEditTemplate()
 {
 	CPropertySheet editDialog;
 	editDialog.Construct("Edit Team Template.");
@@ -322,7 +322,7 @@ void CTeamsDialog::OnEditTemplate()
 	updateUI(REBUILD_ALL);
 }
 
-void CTeamsDialog::UpdateTeamsList() 
+void CTeamsDialog::UpdateTeamsList()
 {
 	CListCtrl *pList = (CListCtrl *)GetDlgItem(IDC_TEAMS_LIST);
 	pList->DeleteAllItems();
@@ -370,16 +370,16 @@ void CTeamsDialog::UpdateTeamsList()
 			m_curTeam = pList->GetItemData(0);
 			pList->SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
 			pList->EnsureVisible(0, false);
-		} 
+		}
 	}
 }
 
-void CTeamsDialog::OnSelchangePlayerList() 
+void CTeamsDialog::OnSelchangePlayerList()
 {
 	updateUI(REBUILD_ALL);
 }
 
-void CTeamsDialog::OnClickTeamsList(NMHDR* pNMHDR, LRESULT* pResult) 
+void CTeamsDialog::OnClickTeamsList(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	CListCtrl* pList = (CListCtrl*) GetDlgItem(IDC_TEAMS_LIST);
 
@@ -394,7 +394,7 @@ void CTeamsDialog::OnClickTeamsList(NMHDR* pNMHDR, LRESULT* pResult)
 	*pResult = 0;
 }
 
-void CTeamsDialog::OnDblclkTeamsList(NMHDR* pNMHDR, LRESULT* pResult) 
+void CTeamsDialog::OnDblclkTeamsList(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	CListCtrl* pList = (CListCtrl*) GetDlgItem(IDC_TEAMS_LIST);
 
@@ -410,17 +410,17 @@ void CTeamsDialog::OnDblclkTeamsList(NMHDR* pNMHDR, LRESULT* pResult)
 	*pResult = 0;
 }
 
-void CTeamsDialog::OnCopyteam() 
+void CTeamsDialog::OnCopyteam()
 {
 	Dict d = *m_sides.getTeamInfo(m_curTeam)->getDict();
 	AsciiString origName = d.getAsciiString(TheKey_teamName);
 
 	Int num = 1;
 	AsciiString tname;
-	do 
+	do
 	{
 		tname.format("%s.%2d",origName.str(), num++);
-	} 
+	}
 	while (m_sides.findTeamInfo(tname));
 
 	d.setAsciiString(TheKey_teamName, tname);
@@ -429,7 +429,7 @@ void CTeamsDialog::OnCopyteam()
 	updateUI(REBUILD_ALL);
 }
 
-void CTeamsDialog::OnSelectTeamMembers() 
+void CTeamsDialog::OnSelectTeamMembers()
 {
 	Int count = 0;
 	Dict d = *m_sides.getTeamInfo(m_curTeam)->getDict();
@@ -460,7 +460,7 @@ void CTeamsDialog::OnSelectTeamMembers()
 }
 
 /** This function moves a team up the list in the teams list dialog */
-void CTeamsDialog::OnMoveUpTeam() 
+void CTeamsDialog::OnMoveUpTeam()
 {
 	// don't move up if already at top of list
 	if (m_curTeam <= 1)
@@ -519,7 +519,7 @@ void CTeamsDialog::OnMoveUpTeam()
 }
 
 /// This function moves a team down the list in the teams list dialog
-void CTeamsDialog::OnMoveDownTeam() 
+void CTeamsDialog::OnMoveDownTeam()
 {
 	// don't move down if already at bottom of list
 	if (m_curTeam >= m_sides.getNumTeams()-1)
@@ -541,7 +541,7 @@ void CTeamsDialog::OnMoveDownTeam()
 			startRemove = i;
 		}
 
-		/* saves the one right after the selected item, deletes it from the list, 
+		/* saves the one right after the selected item, deletes it from the list,
 		 then adds it to the bottom of the list -- then adds the saved "temp" item
 		 to the bottom of the list */
 		else if (i == (m_curTeam+1)) {
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp
index 33667017120..c0e65b35e22 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp
@@ -36,11 +36,6 @@
 #include "teamsdialog.h"
 #include "LayersList.h"
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 Bool WbView::m_snapToGrid = false;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -144,7 +139,7 @@ BEGIN_MESSAGE_MAP(WbView, CView)
 	ON_COMMAND(ID_VIEW_SHOW_TERRAIN, OnShowTerrain)
 	ON_UPDATE_COMMAND_UI(ID_VIEW_SHOW_TERRAIN, OnUpdateShowTerrain)
 	ON_WM_CREATE()
-	
+
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -198,9 +193,9 @@ void WbView::mouseMove(TTrackingMode m, CPoint viewPt)
 {
 	MSG msg;
 	while (::PeekMessage(&msg, m_hWnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE)) {
-		viewPt.x = (short)LOWORD(msg.lParam);  // horizontal position of cursor 
-		viewPt.y = (short)HIWORD(msg.lParam);  // vertical position of cursor 
-		DEBUG_LOG(("Peek mouse %d, %d\n", viewPt.x,  viewPt.y));
+		viewPt.x = (short)LOWORD(msg.lParam);  // horizontal position of cursor
+		viewPt.y = (short)HIWORD(msg.lParam);  // vertical position of cursor
+		DEBUG_LOG(("Peek mouse %d, %d", viewPt.x,  viewPt.y));
 	}
 
 	if (m_trackingMode == TRACK_NONE) {
@@ -248,7 +243,7 @@ void WbView::mouseMove(TTrackingMode m, CPoint viewPt)
 		Int flags = pObj->getFlags();
 		if (!(pObj->isWaypoint() || (flags & flagsWeDontWant) != 0))
 			++totalObjects;
-		else 
+		else
 			++totalWaypoints;
 
 		pObj = pObj->getNext();
@@ -320,7 +315,7 @@ void WbView::mouseUp(TTrackingMode m, CPoint viewPt)
 	if (m_trackingMode == TRACK_NONE)
 		return;
 
-	if (GetCapture() == this) 
+	if (GetCapture() == this)
 	{
 		ReleaseCapture();
 	}
@@ -346,37 +341,37 @@ void WbView::mouseUp(TTrackingMode m, CPoint viewPt)
 	m_trackingMode = TRACK_NONE;
 }
 
-void WbView::OnMouseMove(UINT nFlags, CPoint point) 
+void WbView::OnMouseMove(UINT nFlags, CPoint point)
 {
 	mouseMove(m_trackingMode, point);
 }
 
-void WbView::OnRButtonUp(UINT nFlags, CPoint point) 
+void WbView::OnRButtonUp(UINT nFlags, CPoint point)
 {
 	mouseUp(TRACK_R, point);
 }
 
-void WbView::OnRButtonDown(UINT nFlags, CPoint point) 
+void WbView::OnRButtonDown(UINT nFlags, CPoint point)
 {
 	mouseDown(TRACK_R, point);
 }
 
-void WbView::OnLButtonUp(UINT nFlags, CPoint point) 
+void WbView::OnLButtonUp(UINT nFlags, CPoint point)
 {
 	mouseUp(TRACK_L, point);
 }
 
-void WbView::OnLButtonDown(UINT nFlags, CPoint point) 
+void WbView::OnLButtonDown(UINT nFlags, CPoint point)
 {
 	mouseDown(TRACK_L, point);
 }
 
-void WbView::OnMButtonUp(UINT nFlags, CPoint point) 
+void WbView::OnMButtonUp(UINT nFlags, CPoint point)
 {
 	mouseUp(TRACK_M, point);
 }
 
-void WbView::OnMButtonDown(UINT nFlags, CPoint point) 
+void WbView::OnMButtonDown(UINT nFlags, CPoint point)
 {
 	mouseDown(TRACK_M, point);
 }
@@ -448,12 +443,12 @@ void WbView::constrainCenterPt()
 //=============================================================================
 /** Standard window handler method for updating the cursor. */
 //=============================================================================
-BOOL WbView::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) 
+BOOL WbView::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
 {
 	if (nHitTest == HTCLIENT) {
 		// If we are tracking in our window, update the tool.
 		WbApp()->updateCurTool(false);
-		if (WbApp()->getCurTool()) {                       
+		if (WbApp()->getCurTool()) {
 			// Let the current tool set it's cursor.
 			WbApp()->getCurTool()->setCursor();
 		} else {
@@ -466,9 +461,9 @@ BOOL WbView::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
 	return(CView::OnSetCursor(pWnd, nHitTest, message));
 }
 
- 
+
 /** Handles the delete menu action. */
-void WbView::OnEditDelete() 
+void WbView::OnEditDelete()
 {
 	if (PolygonTool::isActive() || m_showPolygonTriggers) {
 		if (PolygonTool::deleteSelectedPolygon()) {
@@ -485,9 +480,9 @@ void WbView::OnEditDelete()
 
 /** Handles the key down event.  Currently, handles delete keys, and checks
 for updates to the current tool. */
-void WbView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) 
+void WbView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 {
-	if (nChar == VK_DELETE || nChar == VK_BACK) {	
+	if (nChar == VK_DELETE || nChar == VK_BACK) {
 		OnEditDelete();
 	}
 	WbApp()->updateCurTool(false);
@@ -496,15 +491,15 @@ void WbView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 
 /** Handles the key up event.  Currently, handles delete keys, and checks
 for updates to the current tool. */
-void WbView::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags) 
+void WbView::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags)
 {
 	WbApp()->updateCurTool(false);
 	OnSetCursor(this,HTCLIENT,0);
 }
 
-void WbView::OnEditCopy() 
+void WbView::OnEditCopy()
 {
-	MapObject *pTheCopy = NULL;	
+	MapObject *pTheCopy = NULL;
 	MapObject *pTmp = NULL;
 
 	MapObject *pObj = MapObject::getFirstMapObject();
@@ -541,26 +536,26 @@ void WbView::OnEditCopy()
 	pTheCopy = NULL; // belongs to the app.
 }
 
-void WbView::OnUpdateEditCopy(CCmdUI* pCmdUI) 
+void WbView::OnUpdateEditCopy(CCmdUI* pCmdUI)
 {
-	pCmdUI->Enable();	
+	pCmdUI->Enable();
 }
 
-void WbView::OnEditCut() 
+void WbView::OnEditCut()
 {
 	OnEditCopy();
 	OnEditDelete();
 }
 
-void WbView::OnUpdateEditCut(CCmdUI* pCmdUI) 
+void WbView::OnUpdateEditCut(CCmdUI* pCmdUI)
 {
-	pCmdUI->Enable();	
+	pCmdUI->Enable();
 }
 
-void WbView::OnEditPaste() 
+void WbView::OnEditPaste()
 {
 	CWorldBuilderDoc* pDoc = WbDoc();
-	MapObject *pTheCopy = NULL;	
+	MapObject *pTheCopy = NULL;
 	MapObject *pTmp = NULL;
 
 	/* First, clear the selection. */
@@ -571,7 +566,7 @@ void WbView::OnEditPaste()
 		pTmp = pObj->duplicate();
 		pTmp->setNextMap(pTheCopy);
 		pTmp->validate();
-		
+
 		pTheCopy = pTmp;
 		pTmp->setSelected(true);
 		pObj = pObj->getNext();
@@ -584,7 +579,7 @@ void WbView::OnEditPaste()
 }
 
 /** Toggles the show objects flag and invals the window. */
-void WbView::OnViewShowObjects() 
+void WbView::OnViewShowObjects()
 {
 	m_showObjects = !m_showObjects;
 	Invalidate(false);
@@ -596,48 +591,48 @@ void WbView::OnViewShowObjects()
 }
 
 /** Sets the check in the menu to match the show objects flag. */
-void WbView::OnUpdateViewShowObjects(CCmdUI* pCmdUI) 
+void WbView::OnUpdateViewShowObjects(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showObjects?1:0);
 }
 
-void WbView::OnUpdateEditPaste(CCmdUI* pCmdUI) 
+void WbView::OnUpdateEditPaste(CCmdUI* pCmdUI)
 {
 	MapObject *pTheCopy = WbApp()->getMapObjPasteList();
 	pCmdUI->Enable(pTheCopy != NULL);
 }
 
-void WbView::OnViewSnaptogrid() 
+void WbView::OnViewSnaptogrid()
 {
 	m_snapToGrid = !m_snapToGrid;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "SnapToGrid", m_snapToGrid?1:0);
 }
 
-void WbView::OnUpdateViewSnaptogrid(CCmdUI* pCmdUI) 
+void WbView::OnUpdateViewSnaptogrid(CCmdUI* pCmdUI)
 {
-	pCmdUI->SetCheck(m_snapToGrid?1:0);	
+	pCmdUI->SetCheck(m_snapToGrid?1:0);
 }
 
-void WbView::OnEditSelectdup() 
+void WbView::OnEditSelectdup()
 {
 	WorldHeightMapEdit *pMap = WbDoc()->GetHeightMap();
 	if (pMap==NULL) return;
 	pMap->selectDuplicates();
 }
-void WbView::OnEditSelectsimilar() 
+void WbView::OnEditSelectsimilar()
 {
 	WorldHeightMapEdit *pMap = WbDoc()->GetHeightMap();
 	if (pMap==NULL) return;
 	pMap->selectSimilar();
 }
-void WbView::OnEditSelectinvalidteam() 
+void WbView::OnEditSelectinvalidteam()
 {
 	WorldHeightMapEdit *pMap = WbDoc()->GetHeightMap();
 	if (pMap==NULL) return;
 	pMap->selectInvalidTeam();
 }
 
-void WbView::OnEditReplace() 
+void WbView::OnEditReplace()
 {
 	WorldHeightMapEdit *pMap = WbDoc()->GetHeightMap();
 	if (pMap==NULL) return;
@@ -676,7 +671,7 @@ void WbView::OnEditReplace()
 
 
 /** Shows the selected status of the reflects in mirror flag. */
-void WbView::OnUpdateObjectpropertiesReflectsinmirror(CCmdUI* pCmdUI) 
+void WbView::OnUpdateObjectpropertiesReflectsinmirror(CCmdUI* pCmdUI)
 {
 	Bool reflects = false;
 	Bool multiple = false;
@@ -705,7 +700,7 @@ void WbView::OnUpdateObjectpropertiesReflectsinmirror(CCmdUI* pCmdUI)
 	pCmdUI->SetCheck(val);
 }
 
-void WbView::OnObjectpropertiesReflectsinmirror() 
+void WbView::OnObjectpropertiesReflectsinmirror()
 {
 	Bool reflects = false;
 
@@ -716,7 +711,7 @@ void WbView::OnObjectpropertiesReflectsinmirror()
 		}
 		if (pMapObj->getFlag(FLAG_DRAWS_IN_MIRROR)) {
 			reflects = true;
-		} 
+		}
 	}
 
 	CWorldBuilderDoc* pDoc = WbDoc();
@@ -726,19 +721,19 @@ void WbView::OnObjectpropertiesReflectsinmirror()
 }
 
 // This is actually lock angle - used to be horizontal & vertical, now just 1.
-void WbView::OnLockHorizontal() 
+void WbView::OnLockHorizontal()
 {
 	m_lockAngle = !m_lockAngle;
 }
 
 // This is actually lock angle - used to be horizontal & vertical, now just 1.
-void WbView::OnUpdateLockHorizontal(CCmdUI* pCmdUI) 
+void WbView::OnUpdateLockHorizontal(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_lockAngle?1:0);
 }
 
 // Obsolete. Delete Jan15,2002 if nobody complains about it being missing.  jba.
-void WbView::OnLockVertical() 
+void WbView::OnLockVertical()
 {
 //	m_lockVertical = !m_lockVertical;
 //	if (m_lockVertical) {
@@ -747,59 +742,59 @@ void WbView::OnLockVertical()
 }
 
 // Obsolete. Delete Jan15,2002 if nobody complains about it being missing.  jba.
-void WbView::OnUpdateLockVertical(CCmdUI* pCmdUI) 
+void WbView::OnUpdateLockVertical(CCmdUI* pCmdUI)
 {
 //	pCmdUI->SetCheck(m_lockVertical?1:0);
 }
 
-void WbView::OnEditGloballightoptions() 
+void WbView::OnEditGloballightoptions()
 {
 	CMainFrame::GetMainFrame()->OnEditGloballightoptions();
 
-//	GlobalLightOptions globalLightDialog(this);	
+//	GlobalLightOptions globalLightDialog(this);
 //	globalLightDialog.DoModal();
 //	Coord3D lightRay;
 //	lightRay.x=0.0f;lightRay.y=0.0f;lightRay.z=-1.0f;	//default light above terrain.
 //	doLightFeedback(false,lightRay,0);	//turn off the light direction indicator
 }
 
-void WbView::OnViewShowwaypoints() 
+void WbView::OnViewShowwaypoints()
 {
 	m_showWaypoints = !m_showWaypoints;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowWaypoints", m_showWaypoints?1:0);
 	PointerTool::clearSelection();
 }
 
-void WbView::OnUpdateViewShowwaypoints(CCmdUI* pCmdUI) 
+void WbView::OnUpdateViewShowwaypoints(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showWaypoints?1:0);
 }
 
-void WbView::OnViewShowpolygontriggers() 
+void WbView::OnViewShowpolygontriggers()
 {
 	m_showPolygonTriggers = !m_showPolygonTriggers;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowPolygonTriggers", m_showPolygonTriggers?1:0);
 }
 
-void WbView::OnUpdateViewShowpolygontriggers(CCmdUI* pCmdUI) 
+void WbView::OnUpdateViewShowpolygontriggers(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showPolygonTriggers?1:0);
 }
 
-void WbView::OnEditPlayerlist() 
+void WbView::OnEditPlayerlist()
 {
 	PlayerListDlg dlg;
 	dlg.DoModal();
 }
 
-void WbView::OnEditWorldinfo() 
+void WbView::OnEditWorldinfo()
 {
 	// TODO jkmcd: are we going to ever use this? If so, implement it.
 #if 0
 	Dict *d = MapObject::getWorldDict();
 	Dict dcopy = *d;
 	MapObjectProps editor(&dcopy, "Edit World Info", NULL);
-	if (editor.DoModal() == IDOK) 
+	if (editor.DoModal() == IDOK)
 	{
 		CWorldBuilderDoc* pDoc = WbDoc();
 		DictItemUndoable *pUndo = new DictItemUndoable(d, dcopy, NAMEKEY_INVALID);
@@ -809,102 +804,102 @@ void WbView::OnEditWorldinfo()
 #endif
 }
 
-void WbView::OnPickStructures() 
+void WbView::OnPickStructures()
 {
 	m_pickConstraint = ES_STRUCTURE;
 }
 
-void WbView::OnUpdatePickStructures(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickStructures(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_STRUCTURE)?1:0);
 }
 
-void WbView::OnPickInfantry() 
+void WbView::OnPickInfantry()
 {
 	m_pickConstraint = ES_INFANTRY;
 }
 
-void WbView::OnUpdatePickInfantry(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickInfantry(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_INFANTRY)?1:0);
 }
 
-void WbView::OnPickVehicles() 
+void WbView::OnPickVehicles()
 {
 	m_pickConstraint = ES_VEHICLE;
 }
 
-void WbView::OnUpdatePickVehicles(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickVehicles(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_VEHICLE)?1:0);
 }
 
-void WbView::OnPickShrubbery() 
+void WbView::OnPickShrubbery()
 {
 	m_pickConstraint = ES_SHRUBBERY;
 }
 
-void WbView::OnUpdatePickShrubbery(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickShrubbery(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_SHRUBBERY)?1:0);
 }
 
-void WbView::OnPickManMade() 
+void WbView::OnPickManMade()
 {
 	m_pickConstraint = ES_MISC_MAN_MADE;
 }
 
-void WbView::OnUpdatePickManMade(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickManMade(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_MISC_MAN_MADE)?1:0);
 }
 
-void WbView::OnPickNatural() 
+void WbView::OnPickNatural()
 {
 	m_pickConstraint = ES_MISC_NATURAL;
 }
 
-void WbView::OnUpdatePickNatural(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickNatural(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_MISC_NATURAL)?1:0);
 }
 
-void WbView::OnPickDebris() 
+void WbView::OnPickDebris()
 {
 	m_pickConstraint = ES_DEBRIS;
 }
 
-void WbView::OnUpdatePickDebris(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickDebris(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_DEBRIS)?1:0);
 }
 
-void WbView::OnPickAnything() 
+void WbView::OnPickAnything()
 {
 	m_pickConstraint = ES_NONE;
 }
 
-void WbView::OnUpdatePickAnything(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickAnything(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_NONE)?1:0);
 }
 
-void WbView::OnPickWaypoints() 
+void WbView::OnPickWaypoints()
 {
 	m_pickConstraint = ES_WAYPOINT;
 }
 
-void WbView::OnUpdatePickWaypoints(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickWaypoints(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_WAYPOINT)?1:0);
 }
 
-void WbView::OnPickRoads() 
+void WbView::OnPickRoads()
 {
 	m_pickConstraint = ES_ROAD;
 }
 
-void WbView::OnUpdatePickRoads(CCmdUI* pCmdUI) 
+void WbView::OnUpdatePickRoads(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck((m_pickConstraint == ES_ROAD)?1:0);
 }
@@ -919,7 +914,7 @@ void WbView::OnUpdatePickSounds(CCmdUI* pCmdUI)
 	pCmdUI->SetCheck((m_pickConstraint == ES_AUDIO) ? 1 : 0);
 }
 
-void WbView::OnShowNames() 
+void WbView::OnShowNames()
 {
 	m_showNames = m_showNames ? false : true;
 	Invalidate(false);
@@ -931,7 +926,7 @@ void WbView::OnShowNames()
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowNames", m_showNames?1:0);
 }
 
-void WbView::OnUpdateShowNames(CCmdUI* pCmdUI) 
+void WbView::OnUpdateShowNames(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showNames ? 1 : 0);
 }
@@ -941,7 +936,7 @@ void WbView::OnValidationFixTeams()
 	Bool anyFixes = false;
 	Int i;
 	// Check for duplicate teams.
-	for (i = 0; i < TheSidesList->getNumTeams(); ++i) 
+	for (i = 0; i < TheSidesList->getNumTeams(); ++i)
 	{
 		Dict *d = TheSidesList->getTeamInfo(i)->getDict();
 
@@ -960,9 +955,9 @@ void WbView::OnValidationFixTeams()
 			}
 		}
 	}
-	
+
 	// Check for teams with invalid owners.
-	for (i = 0; i < TheSidesList->getNumTeams(); ++i) 
+	for (i = 0; i < TheSidesList->getNumTeams(); ++i)
 	{
 		Dict *d = TheSidesList->getTeamInfo(i)->getDict();
 		AsciiString oname = d->getAsciiString(TheKey_teamOwner);
@@ -1007,7 +1002,7 @@ void WbView::OnValidationFixTeams()
 				SidesInfo* pSide = TheSidesList->findSideInfo(teamOwner);
 				if (!pSide) {
 					teamExists = false;
-					DEBUG_LOG(("Side '%s' could not be found in sides list!\n", teamOwner.str()));
+					DEBUG_LOG(("Side '%s' could not be found in sides list!", teamOwner.str()));
 				}
 			} else {
 				// Couldn't find team. [8/8/2003]
@@ -1015,17 +1010,17 @@ void WbView::OnValidationFixTeams()
 			}
 		} else {
 			// Object doesn't even have a team name at all.  bad. jba. [8/8/2003]
-			teamExists = false; 
+			teamExists = false;
 		}
 		if (!teamExists) {
 			// Query the user for a player, and stick it on the default team. [8/8/2003]
 			AsciiString warning;
-			warning.format("Object '%s' named '%s' on team '%s' - team doesn't exist.  Select player for object...", 
+			warning.format("Object '%s' named '%s' on team '%s' - team doesn't exist.  Select player for object...",
 				tmplName.str(), name.str(), teamName.str());
 
 			anyFixes = true;
-			::AfxMessageBox(warning.str(), MB_OK);	
-			TeamsInfo ti;	 
+			::AfxMessageBox(warning.str(), MB_OK);
+			TeamsInfo ti;
 			CFixTeamOwnerDialog fix(&ti, TheSidesList);
 			if (fix.DoModal() == IDOK) {
 				if (fix.pickedValidTeam()) {
@@ -1040,7 +1035,7 @@ void WbView::OnValidationFixTeams()
 			}
 		}
 	}
-	
+
 
 	if (anyFixes) {
 		// Show a message indicating success.
@@ -1068,7 +1063,7 @@ void WbView::OnUpdateShowTerrain(CCmdUI* pCmdUI)
 }
 
 
-void WbView::OnEditTeamlist() 
+void WbView::OnEditTeamlist()
 {
 	CTeamsDialog dlg;
 	dlg.DoModal();
@@ -1082,9 +1077,9 @@ int WbView::OnCreate(LPCREATESTRUCT lpcs)
 	return CView::OnCreate(lpcs);
 }
 
-void WbView::rulerFeedbackInfo(Coord3D &point1, Coord3D &point2, Real dist) 
+void WbView::rulerFeedbackInfo(Coord3D &point1, Coord3D &point2, Real dist)
 {
 	m_rulerPoints[0] = point1;
-	m_rulerPoints[1] = point2; 
+	m_rulerPoints[1] = point2;
 	m_rulerLength = dist;
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp
index 94e9c6f51e7..c33edb6fee3 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp
@@ -31,7 +31,6 @@
 #include "W3DDevice/GameClient/Module/W3DModelDraw.h"
 #include "agg_def.h"
 #include "part_ldr.h"
-#include "rendobj.h"
 #include "hanim.h"
 #include "dx8wrapper.h"
 #include "dx8indexbuffer.h"
@@ -78,6 +77,7 @@
 #include "WorldBuilder.h"
 #include "wbview3d.h"
 #include "Common/Debug.h"
+#include "Common/FramePacer.h"
 #include "Common/ThingFactory.h"
 #include "GameClient/Water.h"
 #include "Common/WellKnownKeys.h"
@@ -95,11 +95,6 @@
 
 #include <d3dx8.h>
 
-#ifdef RTS_INTERNAL
-// for occasional debugging...
-//#pragma optimize("", off)
-//#pragma MESSAGE("************************************** WARNING, optimization disabled for debugging purposes")
-#endif
 
 // ----------------------------------------------------------------------------
 // Misc. Forward Declarations
@@ -140,6 +135,7 @@ static void WWDebug_Message_Callback(DebugType type, const char * message)
 {
 #ifdef RTS_DEBUG
 	::OutputDebugString(message);
+	::OutputDebugString("\n");
 #endif
 }
 
@@ -148,6 +144,7 @@ static void WWAssert_Callback(const char * message)
 {
 #ifdef RTS_DEBUG
 	::OutputDebugString(message);
+	::OutputDebugString("\n");
 	::DebugBreak();
 #endif
 }
@@ -186,6 +183,7 @@ class PlaceholderView : public View
 
 	virtual void drawView( void ) {};															///< Render the world visible in this view.
 	virtual void updateView( void ) {};															///< Render the world visible in this view.
+	virtual void stepView() {}; ///< Update view for every fixed time step
 
 	virtual void setZoomLimited( Bool limit ) {}			///< limit the zoom height
 	virtual Bool isZoomLimited( void ) { return TRUE; }							///< get status of zoom limit
@@ -194,7 +192,7 @@ class PlaceholderView : public View
 	virtual Int getWidth( void ) { return m_width; }
 	virtual void setHeight( Int height ) { m_height = height; }
 	virtual Int getHeight( void ) { return m_height; }
-	virtual void setOrigin( Int x, Int y) { m_originX=x; m_originY=y;}				///< Sets location of top-left view corner on display 
+	virtual void setOrigin( Int x, Int y) { m_originX=x; m_originY=y;}				///< Sets location of top-left view corner on display
 	virtual void getOrigin( Int *x, Int *y) { *x=m_originX; *y=m_originY;}			///< Return location of top-left view corner on display
 
 	virtual void forceRedraw() { }
@@ -202,11 +200,11 @@ class PlaceholderView : public View
 	virtual void lookAt( const Coord3D *o ){};														///< Center the view on the given coordinate
 	virtual void initHeightForMap( void ) {};														///<  Init the camera height for the map at the current position.
 	virtual void scrollBy( Coord2D *delta ){};														///< Shift the view by the given delta
-	virtual void moveCameraTo(const Coord3D *o, Int frames, Int shutter, 
+	virtual void moveCameraTo(const Coord3D *o, Int frames, Int shutter,
 														Bool orient, Real easeIn, Real easeOut) {lookAt(o);};
-	virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, 
+	virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter,
 														Bool orient, Real easeIn, Real easeOut) {};
-	virtual Bool isCameraMovementFinished(void) {return true;}; 
+	virtual Bool isCameraMovementFinished(void) {return true;};
  	virtual void resetCamera(const Coord3D *location, Int frames, Real easeIn, Real easeOut) {}; ///< Move camera to location, and reset to default angle & zoom.
  	virtual void rotateCamera(Real rotations, Int frames, Real easeIn, Real easeOut) {}; ///< Rotate camera about current viewpoint.
 	virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut) {};	///< Rotate camera to face an object, and hold on it
@@ -225,12 +223,12 @@ class PlaceholderView : public View
 	virtual void setDefaultView(Real pitch, Real angle, Real maxHeight) {};
 	virtual void zoomCamera( Real finalZoom, Int milliseconds, Real easeIn, Real easeOut ) {};
 	virtual void pitchCamera( Real finalPitch, Int milliseconds, Real easeIn, Real easeOut ) {};
-															
+
 	virtual void setAngle( Real angle ){};																///< Rotate the view around the up axis to the given angle
 	virtual Real getAngle( void ) { return 0; }
 	virtual void setPitch( Real angle ){};																	///< Rotate the view around the horizontal axis to the given angle
 	virtual Real getPitch( void ) { return 0; }							///< Return current camera pitch
-	virtual void setAngleAndPitchToDefault( void ){};													///< Set the view angle back to default 
+	virtual void setAngleAndPitchToDefault( void ){};													///< Set the view angle back to default
 	virtual void getPosition(Coord3D *pos)	{ ;}											///< Return camera position
 
 	virtual Real getHeightAboveGround() { return 1; }
@@ -274,7 +272,7 @@ class PlaceholderView : public View
 	virtual enum FilterTypes	 getViewFilterType(void) {return (enum FilterTypes)0;}			///< Turns on viewport special effect (black & white mode)
 
 	virtual void shake( const Coord3D *epicenter, CameraShakeType shakeType ) {};
-	
+
 	virtual Real getFXPitch( void ) const { return 1.0f; }
 	virtual void forceCameraConstraintRecalc(void) { }
 	virtual void rotateCameraTowardPosition(const Coord3D *pLoc, Int milliseconds, Real easeIn, Real easeOut, Bool reverseRotation) {};	///< Rotate camera to face an object, and hold on it
@@ -299,7 +297,7 @@ class SkeletonSceneClass : public RTS3DScene
 	SkeletonSceneClass(void) : m_testPass(NULL) { }
 	~SkeletonSceneClass(void) { REF_PTR_RELEASE(m_testPass); }
 
-	void					Set_Material_Pass(MaterialPassClass * pass)	{ REF_PTR_SET(m_testPass, pass); }	
+	void					Set_Material_Pass(MaterialPassClass * pass)	{ REF_PTR_SET(m_testPass, pass); }
 	virtual void Remove_Render_Object(RenderObjClass * obj);
 
 	Bool safeContains(RenderObjClass *obj);
@@ -372,7 +370,7 @@ WbView3d::WbView3d() :
 	m_scene(NULL),
 	m_overlayScene(NULL),
 	m_transparentObjectsScene(NULL),
-	m_baseBuildScene(NULL),	 
+	m_baseBuildScene(NULL),
 	m_objectToolTrackingObj(NULL),
 	m_showObjToolTrackingObj(false),
 	m_camera(NULL),
@@ -410,7 +408,7 @@ WbView3d::WbView3d() :
 	m_showLetterbox(false),
   m_showSoundCircles(false)
 {
-	TheTacticalView = &bogusTacticalView;  
+	TheTacticalView = &bogusTacticalView;
 	m_actualWinSize.x = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "Width", THREE_D_VIEW_WIDTH);
 	m_actualWinSize.y = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "Height", THREE_D_VIEW_HEIGHT);
 	m_cameraOffset.x = m_cameraOffset.y = m_cameraOffset.z = 1;
@@ -456,19 +454,15 @@ WbView3d::~WbView3d()
 // ----------------------------------------------------------------------------
 void WbView3d::shutdownWW3D(void)
 {
-	if (m_intersector) {
-		delete m_intersector;
-		m_intersector = NULL;
-	}
+	delete m_intersector;
+	m_intersector = NULL;
+
+	delete m_layer;
+	m_layer = NULL;
+
+	delete m_buildLayer;
+	m_buildLayer = NULL;
 
-	if (m_layer) {
-		delete m_layer;
-		m_layer = NULL;
-	}
-	if (m_buildLayer) {
-		delete m_buildLayer;
-		m_buildLayer = NULL;
-	}
 	if (m3DFont) {
 		m3DFont->Release();
 		m3DFont = NULL;
@@ -484,14 +478,14 @@ void WbView3d::shutdownWW3D(void)
 		}
 
 		if (TheW3DShadowManager)
-		{	
+		{
 			TheW3DShadowManager->removeAllShadows();
 			delete TheW3DShadowManager;
 			TheW3DShadowManager=NULL;
 		}
 		REF_PTR_RELEASE(m_transparentObjectsScene);
 		REF_PTR_RELEASE(m_overlayScene);
-		REF_PTR_RELEASE(m_baseBuildScene);	
+		REF_PTR_RELEASE(m_baseBuildScene);
 		REF_PTR_RELEASE(m_objectToolTrackingObj);
 		REF_PTR_RELEASE(m_scene);
 		REF_PTR_RELEASE(m_camera);
@@ -568,7 +562,7 @@ void WbView3d::ReAcquireResources(void)
 		} else {
 			m3DFont = NULL;
 		}
-		
+
 	} else {
 		m3DFont = NULL;
 	}
@@ -576,7 +570,7 @@ void WbView3d::ReAcquireResources(void)
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::killTheTimer(void) 
+void WbView3d::killTheTimer(void)
 {
 	if (m_timer != NULL) {
 		KillTimer(m_timer);
@@ -585,9 +579,9 @@ void WbView3d::killTheTimer(void)
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::reset3dEngineDisplaySize(Int width, Int height) 
+void WbView3d::reset3dEngineDisplaySize(Int width, Int height)
 {
-	if (m_actualWinSize.x == width && 
+	if (m_actualWinSize.x == width &&
 		m_actualWinSize.y == height) {
 		return;
 	}
@@ -605,12 +599,12 @@ void WbView3d::reset3dEngineDisplaySize(Int width, Int height)
 void WbView3d::initAssets()
 {
 
-	m_assetManager = new W3DAssetManager;	
+	m_assetManager = new W3DAssetManager;
 	m_assetManager->Register_Prototype_Loader(&_ParticleEmitterLoader );
 	m_assetManager->Register_Prototype_Loader(&_AggregateLoader);
 	m_assetManager->Set_WW3D_Load_On_Demand(true);
 }
-	
+
 // ----------------------------------------------------------------------------
 #define TERRAIN_SAMPLE_SIZE 40.0f
 static Real getHeightAroundPos(WBHeightMap *heightMap, Real x, Real y)
@@ -638,7 +632,7 @@ void WbView3d::setupCamera()
 		Real zAbs = zOffset + zPos;
 		if (zAbs<0) zAbs = -zAbs;
 		if (zAbs<0.01) zAbs = 0.01f;
-		//DEBUG_LOG(("zOffset = %.2f, zAbs = %.2f, zPos = %.2f\n", zOffset, zAbs, zPos));	
+		//DEBUG_LOG(("zOffset = %.2f, zAbs = %.2f, zPos = %.2f", zOffset, zAbs, zPos));
 		if (zOffset > 0) {
 			zOffset *= zAbs;
 		}	else if (zOffset < -0.3f) {
@@ -647,7 +641,7 @@ void WbView3d::setupCamera()
 		if (zOffset < -0.6f) {
 			zOffset = -0.3f + zOffset/2.0f;
 		}
-		//DEBUG_LOG(("zOffset = %.2f\n", zOffset));
+		//DEBUG_LOG(("zOffset = %.2f", zOffset));
 		zoom = zAbs;
 	}
 
@@ -661,7 +655,7 @@ void WbView3d::setupCamera()
 	pos.y = m_centerPt.Y* MAP_XY_FACTOR;
 	pos.z = m_centerPt.Z* MAP_XY_FACTOR;
 
-	Real groundLevel = m_heightMapRenderObj?getHeightAroundPos(m_heightMapRenderObj, pos.x, pos.y) : 0;  
+	Real groundLevel = m_heightMapRenderObj?getHeightAroundPos(m_heightMapRenderObj, pos.x, pos.y) : 0;
 
 	// set position of camera itself
 	/*
@@ -702,7 +696,7 @@ void WbView3d::setupCamera()
 	sourcePos.X += pos.x;
 	sourcePos.Y += pos.y;
 	sourcePos.Z += pos.z+groundLevel;
-	
+
 	targetPos.X += pos.x;
 	targetPos.Y += pos.y;
 	targetPos.Z += pos.z+groundLevel;
@@ -717,7 +711,7 @@ void WbView3d::setupCamera()
 	m_cameraSource = sourcePos;
 	m_cameraTarget = targetPos;
 	/*
-	DEBUG_LOG(("Camera: pos=(%g,%g) height=%g pitch=%g FXPitch=%g yaw=%g groundLevel=%g\n",
+	DEBUG_LOG(("Camera: pos=(%g,%g) height=%g pitch=%g FXPitch=%g yaw=%g groundLevel=%g",
 		targetPos.X, targetPos.Y,
 		m_actualHeightAboveGround,
 		pitch,
@@ -727,7 +721,7 @@ void WbView3d::setupCamera()
 
 	// build new camera transform
 	camtransform.Make_Identity();
-	if (factor < 0) { //WST 11/11/02. Fix camera flipping over when near the ground too early 
+	if (factor < 0) { //WST 11/11/02. Fix camera flipping over when near the ground too early
 		targetPos = sourcePos + (sourcePos-targetPos);
 	}
 	camtransform.Look_At( sourcePos, targetPos, 0 );
@@ -761,10 +755,10 @@ void WbView3d::setupCamera()
 // ----------------------------------------------------------------------------
 void WbView3d::init3dScene()
 {
-	// build scene	
+	// build scene
 	REF_PTR_RELEASE(m_overlayScene);
 	REF_PTR_RELEASE(m_transparentObjectsScene);
-	REF_PTR_RELEASE(m_baseBuildScene); 
+	REF_PTR_RELEASE(m_baseBuildScene);
 	REF_PTR_RELEASE(m_scene);
 	REF_PTR_RELEASE(m_camera);
 	REF_PTR_RELEASE(m_heightMapRenderObj);
@@ -783,13 +777,13 @@ void WbView3d::init3dScene()
 	theDynamicLight->Set_Diffuse( Vector3( red, green, blue) );
 	theDynamicLight->Set_Position(Vector3(211, 363, 10));
 	theDynamicLight->Set_Far_Attenuation_Range(5, 15);
-	// Note: Don't Add_Render_Object dynamic lights. 
+	// Note: Don't Add_Render_Object dynamic lights.
 	m_scene->addDynamicLight( theDynamicLight );
 #endif
 	m_overlayScene = NEW_REF(SkeletonSceneClass,());
 	m_baseBuildScene = NEW_REF(SkeletonSceneClass,());
 	m_transparentObjectsScene = NEW_REF(SkeletonSceneClass,());
-//	m_scene->Set_Polygon_Mode(SceneClass::LINE);	
+//	m_scene->Set_Polygon_Mode(SceneClass::LINE);
 	m_scene->Set_Ambient_Light(Vector3(0.5f,0.5f,0.5f));
 	m_overlayScene->Set_Ambient_Light(Vector3(0.5f,0.5f,0.5f));
 	m_baseBuildScene->Set_Ambient_Light(Vector3(0.5f,0.5f,0.5f));
@@ -803,10 +797,10 @@ void WbView3d::init3dScene()
 void WbView3d::resetRenderObjects()
 {
 	if (!m_scene) return;
-	if (TheW3DShadowManager) {	
+	if (TheW3DShadowManager) {
 		TheW3DShadowManager->removeAllShadows();
 	}
-	
+
 	SceneIterator *sceneIter = m_scene->Create_Iterator();
 	sceneIter->First();
 	while(!sceneIter->Is_Done()) {
@@ -829,7 +823,7 @@ void WbView3d::resetRenderObjects()
 	m_baseBuildScene->Destroy_Iterator(sceneIter);
 	MapObject *pMapObj = MapObject::getFirstMapObject();
 	// Erase references to render objs that have been removed.
-	while (pMapObj) 
+	while (pMapObj)
 	{
 		pMapObj->setRenderObj(NULL);
 		pMapObj = pMapObj->getNext();
@@ -837,7 +831,7 @@ void WbView3d::resetRenderObjects()
 
 	Int i;
 	for (i=0; i<TheSidesList->getNumSides(); i++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(i);
 		BuildListInfo *pBuild = pSide->getBuildList();
 		while (pBuild) {
 			pBuild->setRenderObj(NULL);
@@ -861,7 +855,7 @@ void WbView3d::resetRenderObjects()
 // ----------------------------------------------------------------------------
 void WbView3d::stepTimeOfDay()
 {
-	TheWritableGlobalData->m_timeOfDay = (TimeOfDay)(TheGlobalData->m_timeOfDay+1); 
+	TheWritableGlobalData->m_timeOfDay = (TimeOfDay)(TheGlobalData->m_timeOfDay+1);
 	if (TheGlobalData->m_timeOfDay >= TIME_OF_DAY_COUNT) {
 		TheWritableGlobalData->m_timeOfDay = TIME_OF_DAY_FIRST;
 	}
@@ -874,12 +868,12 @@ void WbView3d::setLighting(const GlobalData::TerrainLighting *tl, Int whichLight
 {
 	if (whichLighting == GlobalLightOptions::K_TERRAIN) {
 		TheWritableGlobalData->m_terrainLighting[TheGlobalData->m_timeOfDay][whichLight]= *tl;
-	} else if (whichLighting == GlobalLightOptions::K_OBJECTS) { 
+	} else if (whichLighting == GlobalLightOptions::K_OBJECTS) {
 		TheWritableGlobalData->m_terrainObjectsLighting[TheGlobalData->m_timeOfDay][whichLight]	= *tl;
-	} else if (whichLighting == GlobalLightOptions::K_BOTH) { 
+	} else if (whichLighting == GlobalLightOptions::K_BOTH) {
 		TheWritableGlobalData->m_terrainObjectsLighting[TheGlobalData->m_timeOfDay][whichLight]	= *tl;
 		TheWritableGlobalData->m_terrainLighting[TheGlobalData->m_timeOfDay][whichLight]	= *tl;
-	} 
+	}
 	const GlobalData::TerrainLighting *ol = &TheGlobalData->m_terrainObjectsLighting[TheGlobalData->m_timeOfDay][whichLight];
 	TheWritableGlobalData->setTimeOfDay(TheGlobalData->m_timeOfDay);
 	if( m_globalLight ) {
@@ -892,12 +886,12 @@ void WbView3d::setLighting(const GlobalData::TerrainLighting *tl, Int whichLight
 		if( m_scene && whichLight == 0) {	//only let the first light contribute to ambient
 			m_scene->Set_Ambient_Light( Vector3(ol->ambient.red, ol->ambient.green, ol->ambient.blue) );
 			m_baseBuildScene->Set_Ambient_Light( Vector3(ol->ambient.red, ol->ambient.green, ol->ambient.blue) );
-		}	
+		}
 	}
 	if(TheTerrainRenderObject) {
 		TheTerrainRenderObject->setTimeOfDay(TheGlobalData->m_timeOfDay);
 	}
-	if (TheW3DShadowManager) {	
+	if (TheW3DShadowManager) {
 		TheW3DShadowManager->setTimeOfDay(TheGlobalData->m_timeOfDay);
 	}
 	m_needToLoadRoads = true; // load roads next time we redraw.
@@ -905,7 +899,7 @@ void WbView3d::setLighting(const GlobalData::TerrainLighting *tl, Int whichLight
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::updateLights() 
+void WbView3d::updateLights()
 {
 	++m_updateCount;
 
@@ -922,7 +916,7 @@ void WbView3d::updateLights()
 			m_baseBuildScene->Set_Ambient_Light( Vector3(ol->ambient.red, ol->ambient.green, ol->ambient.blue) );
 		}
 
-		if (TheW3DShadowManager) {	
+		if (TheW3DShadowManager) {
 			TheW3DShadowManager->setTimeOfDay(TheGlobalData->m_timeOfDay);
 		}
 
@@ -951,7 +945,7 @@ void WbView3d::updateLights()
 
 	MapObject *pMapObj = MapObject::getFirstMapObject();
 	while (pMapObj && m_heightMapRenderObj) {
-		if (pMapObj->isLight()) { 
+		if (pMapObj->isLight()) {
 			Coord3D loc = *pMapObj->getLocation();
 			loc.z += m_heightMapRenderObj->getHeightMapHeight(loc.x, loc.y, NULL);
 			RenderObjClass *renderObj= pMapObj->getRenderObj();
@@ -997,7 +991,7 @@ void WbView3d::updateScorches(void)
 	MapObject *pMapObj;
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
-		if (pMapObj->isScorch()) 
+		if (pMapObj->isScorch())
 		{
 			const Coord3D *pos = pMapObj->getLocation();
 			Real radius = pMapObj->getProperties()->getReal(TheKey_objectRadius);
@@ -1018,9 +1012,9 @@ void WbView3d::updateTrees(void)
 	for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext())
 	{
 		const ThingTemplate *tTemplate;
-		
+
 		tTemplate = pMapObj->getThingTemplate();
-		if (tTemplate && tTemplate->isKindOf(KINDOF_OPTIMIZED_TREE) ) 
+		if (tTemplate && tTemplate->isKindOf(KINDOF_OPTIMIZED_TREE) )
 		{
 			Real scale = tTemplate->getAssetScale();
 			const ModuleInfo& mi = tTemplate->getDrawModuleInfo();
@@ -1034,7 +1028,7 @@ void WbView3d::updateTrees(void)
 					Coord3D pos = *pMapObj->getLocation();
 					if (m_heightMapRenderObj) {
 						pos.z += m_heightMapRenderObj->getHeightMapHeight(pos.x, pos.y, NULL);
-						TheTerrainRenderObject->addTree((DrawableID)(Int)pMapObj, pos, scale, pMapObj->getAngle(), 
+						TheTerrainRenderObject->addTree((DrawableID)(Int)pMapObj, pos, scale, pMapObj->getAngle(),
 							0.0f /*no random scaling*/, md);
 					}
 				}
@@ -1044,7 +1038,7 @@ void WbView3d::updateTrees(void)
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::invalidateCellInView(int xIndex, int yIndex) 
+void WbView3d::invalidateCellInView(int xIndex, int yIndex)
 {
 	Invalidate(false);	/// @todo be smarter about invaling the area
 }
@@ -1062,16 +1056,16 @@ void WbView3d::updateFenceListObjects(MapObject *pObject)
 		RenderObjClass *renderObj=NULL;
 		REF_PTR_SET( renderObj, pMapObj->getRenderObj() );
 		if (!renderObj) {
-			Real scale = 1.0; 
+			Real scale = 1.0;
 			AsciiString modelName = getModelNameAndScale(pMapObj, &scale, BODY_PRISTINE);
 			// set render object, or create if we need to
-			if( renderObj == NULL && modelName.isEmpty() == FALSE && 
-					strncmp( modelName.str(), "No ", 3 ) ) 
+			if( renderObj == NULL && modelName.isEmpty() == FALSE &&
+					strncmp( modelName.str(), "No ", 3 ) )
 			{
 
 				renderObj = m_assetManager->Create_Render_Obj( modelName.str(), scale, 0);
 
-			}  // end if
+			}
 		}
 
 		if (renderObj) {
@@ -1137,9 +1131,9 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 {
 	Int i;
 	Bool found = false;
-	
+
 	for (i=0; i<TheSidesList->getNumSides(); i++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(i);
 
 		// find which player color we should use
 		Int playerColor = 0xFFFFFF;
@@ -1159,7 +1153,7 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 			if (pBuildToInval == pBuild) {
 				found = true;
 			}
-			if (!found && pBuildToInval) { 
+			if (!found && pBuildToInval) {
 				continue;
 			}
 			if (!BuildListTool::isActive() && !pBuild->isInitiallyBuilt()) {
@@ -1176,10 +1170,10 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 					pBuild->setRenderObj(NULL);
 				}
 			}
-				
+
 			REF_PTR_SET(renderObj, pBuild->getRenderObj());
 			if (!renderObj) {
-				Real scale = 1.0; 
+				Real scale = 1.0;
 				AsciiString thingName = pBuild->getTemplateName();
 				const ThingTemplate *tTemplate = TheThingFactory->findTemplate(thingName);
 
@@ -1189,10 +1183,10 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 					state.clear();
 					modelName = getBestModelName(tTemplate, state);
 					scale = tTemplate->getAssetScale();
-				} 
+				}
 				// set render object, or create if we need to
-				if( renderObj == NULL && modelName.isEmpty() == FALSE && 
-						strncmp( modelName.str(), "No ", 3 ) ) 
+				if( renderObj == NULL && modelName.isEmpty() == FALSE &&
+						strncmp( modelName.str(), "No ", 3 ) )
 				{
 
 					renderObj = m_assetManager->Create_Render_Obj( modelName.str(), scale, playerColor);
@@ -1202,7 +1196,7 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 						Shadow::ShadowTypeInfo shadowInfo;
 						shadowInfo.allowUpdates=FALSE;	//shadow image will never update
 						shadowInfo.allowWorldAlign=TRUE;	//shadow image will wrap around world objects
-						strcpy(shadowInfo.m_ShadowName,tTemplate->getShadowTextureName().str());
+						strlcpy(shadowInfo.m_ShadowName, tTemplate->getShadowTextureName().str(), ARRAY_SIZE(shadowInfo.m_ShadowName));
 						DEBUG_ASSERTCRASH(shadowInfo.m_ShadowName[0] != '\0', ("this should be validated in ThingTemplate now"));
 						shadowInfo.m_type=(ShadowType)tTemplate->getShadowType();
 						shadowInfo.m_sizeX=tTemplate->getShadowSizeX();
@@ -1211,7 +1205,7 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 						shadowInfo.m_offsetY=tTemplate->getShadowOffsetY();
 						shadowObj=TheW3DShadowManager->addShadow(renderObj, &shadowInfo);
 					}
-				}  // end if
+				}
 			}
 			if (renderObj) {
 				pBuild->setRenderObj(renderObj);
@@ -1247,7 +1241,7 @@ void WbView3d::invalBuildListItemInView(BuildListInfo *pBuildToInval)
 AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, BodyDamageType curDamageState)
 {
 	ModelConditionFlags state;
-	switch (curDamageState) 
+	switch (curDamageState)
 	{
 			case BODY_PRISTINE:
 			default:
@@ -1273,7 +1267,7 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 	}
 	Int objWeather = 0;
 	Bool exists;
-	if (pMapObj && pMapObj->getProperties()) 
+	if (pMapObj && pMapObj->getProperties())
 	{
 		objWeather = pMapObj->getProperties()->getInt(TheKey_objectWeather, &exists);
 	}
@@ -1292,7 +1286,7 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 	}
 
 	Int objTime = 0;
-	if (pMapObj && pMapObj->getProperties()) 
+	if (pMapObj && pMapObj->getProperties())
 	{
 		objTime = pMapObj->getProperties()->getInt(TheKey_objectTime, &exists);
 	}
@@ -1310,15 +1304,18 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 			break;
 	}
 
-	AsciiString modelName("No Model Name");
+	AsciiString modelName;
 	*scale = 1.0f;
-	Int i;
+
+#ifdef LOAD_TEST_ASSETS
 	char buffer[ _MAX_PATH ];
-	if (strncmp(TEST_STRING, pMapObj->getName().str(), strlen(TEST_STRING)) == 0) 
+
+	if (strncmp(TEST_STRING, pMapObj->getName().str(), strlen(TEST_STRING)) == 0)
 	{
 		/* Handle test art models here */
-		strcpy(buffer, pMapObj->getName().str());
+		strlcpy(buffer, pMapObj->getName().str(), ARRAY_SIZE(buffer));
 
+		Int i;
 		for (i=0; buffer[i]; i++) {
 			if (buffer[i] == '/') {
 				i++;
@@ -1326,12 +1323,14 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 			}
 		}
 		modelName = buffer+i;
-	}	
-	else 
+	}
+#endif
+
+	if (modelName.isEmpty())
 	{
 		modelName = "No Model Name"; // must be this while GDF exists (it's the default)
 		const ThingTemplate *tTemplate;
-		
+
 		tTemplate = pMapObj->getThingTemplate();
 		if( tTemplate && !(pMapObj->getFlags() & FLAG_DONT_RENDER))
 		{
@@ -1340,8 +1339,8 @@ AsciiString WbView3d::getModelNameAndScale(MapObject *pMapObj, Real *scale, Body
 			modelName = getBestModelName(tTemplate, state);
 			*scale = tTemplate->getAssetScale();
 
-		}  // end if
-	}  // end else
+		}
+	}
 	return modelName;
 }
 
@@ -1398,7 +1397,7 @@ void WbView3d::invalObjectInView(MapObject *pMapObjIn)
 				// Couldn't find it, so update them all. [5/27/2003]
 				updateAllTrees = true;
 			}
-			if (found) break; 
+			if (found) break;
 		}
 
 		RenderObjClass *renderObj=NULL;
@@ -1457,11 +1456,11 @@ void WbView3d::invalObjectInView(MapObject *pMapObjIn)
 
 
 		if (!renderObj) {
-			Real scale = 1.0; 
+			Real scale = 1.0;
 			AsciiString modelName = getModelNameAndScale(pMapObj, &scale, curDamageState);
 			// set render object, or create if we need to
-			if( renderObj == NULL && modelName.isEmpty() == FALSE && 
-					strncmp( modelName.str(), "No ", 3 ) ) 
+			if( renderObj == NULL && modelName.isEmpty() == FALSE &&
+					strncmp( modelName.str(), "No ", 3 ) )
 			{
 
 				if (!getShowModels()) {
@@ -1475,7 +1474,7 @@ void WbView3d::invalObjectInView(MapObject *pMapObjIn)
 					shadowInfo.allowWorldAlign=TRUE;	//shadow image will wrap around world objects
 					if (tTemplate && tTemplate->getShadowType() != SHADOW_NONE && !(pMapObj->getFlags() & FLAG_DONT_RENDER))
 					{	//add correct type of shadow
-						strcpy(shadowInfo.m_ShadowName,tTemplate->getShadowTextureName().str());
+						strlcpy(shadowInfo.m_ShadowName, tTemplate->getShadowTextureName().str(), ARRAY_SIZE(shadowInfo.m_ShadowName));
 						DEBUG_ASSERTCRASH(shadowInfo.m_ShadowName[0] != '\0', ("this should be validated in ThingTemplate now"));
 						shadowInfo.m_type=(ShadowType)tTemplate->getShadowType();
 						shadowInfo.m_sizeX=tTemplate->getShadowSizeX();
@@ -1488,7 +1487,7 @@ void WbView3d::invalObjectInView(MapObject *pMapObjIn)
 						shadowObj=TheW3DShadowManager->addShadow(renderObj, &shadowInfo);
 					}
 				}
-			}  // end if
+			}
 		}
 
 		if (renderObj && !(pMapObj->getFlags() & FLAG_DONT_RENDER)) {
@@ -1544,13 +1543,13 @@ void WbView3d::invalObjectInView(MapObject *pMapObjIn)
 		m_needToLoadRoads = true; // load roads next time we redraw.
 	}
 	if (updateAllTrees) {
-		updateTrees();	
+		updateTrees();
 	}
 	if (isLight) {
-		updateLights(); 
+		updateLights();
 	}
 	if (isScorch) {
-		updateScorches(); 
+		updateScorches();
 	}
 	Invalidate(false);
 
@@ -1559,9 +1558,9 @@ void WbView3d::invalObjectInView(MapObject *pMapObjIn)
 
 
 // ----------------------------------------------------------------------------
-void WbView3d::updateHeightMapInView(WorldHeightMap *htMap, Bool partial, const IRegion2D &partialRange) 
+void WbView3d::updateHeightMapInView(WorldHeightMap *htMap, Bool partial, const IRegion2D &partialRange)
 {
-	if (htMap == NULL) 
+	if (htMap == NULL)
 		return;
 	++m_updateCount;
 
@@ -1576,7 +1575,7 @@ void WbView3d::updateHeightMapInView(WorldHeightMap *htMap, Bool partial, const
 
 		Int curTicks = ::GetTickCount();
 
-		RefRenderObjListIterator lightListIt(&m_lightList);	
+		RefRenderObjListIterator lightListIt(&m_lightList);
 		if (partial) {
 			m_heightMapRenderObj->doPartialUpdate(partialRange, htMap, &lightListIt);
 		} else {
@@ -1585,7 +1584,7 @@ void WbView3d::updateHeightMapInView(WorldHeightMap *htMap, Bool partial, const
 				htMap->setDrawWidth(htMap->getXExtent());
 				htMap->setDrawHeight(htMap->getYExtent());
 				m_heightMapRenderObj->initHeightData(htMap->getXExtent(), htMap->getYExtent(), htMap, &lightListIt);
-			} else {	
+			} else {
 				htMap->setDrawWidth(m_partialMapSize);
 				htMap->setDrawHeight(m_partialMapSize);
 				m_heightMapRenderObj->initHeightData(htMap->getDrawWidth(), htMap->getDrawHeight(), htMap, &lightListIt);
@@ -1594,7 +1593,7 @@ void WbView3d::updateHeightMapInView(WorldHeightMap *htMap, Bool partial, const
 		}
 		curTicks = GetTickCount() - curTicks;
 		if (curTicks < 1) curTicks = 1;
-	} 
+	}
 
 	invalObjectInView(NULL);	// update all the map objects, to account for ground changes
 
@@ -1656,7 +1655,7 @@ BuildListInfo *WbView3d::pickedBuildObjectInView(CPoint viewPt)
 	Int i;
 	viewToDocCoords(viewPt, &cpt, false);
  	for (i=0; i<TheSidesList->getNumSides(); i++) {
-		SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+		SidesInfo *pSide = TheSidesList->getSideInfo(i);
 		for (BuildListInfo *pBuild = pSide->getBuildList(); pBuild; pBuild = pBuild->getNext()) {
 			Coord3D center = *pBuild->getLocation();
 			center.x -= cpt.x;
@@ -1680,7 +1679,7 @@ BuildListInfo *WbView3d::pickedBuildObjectInView(CPoint viewPt)
 		Bool hit = m_intersector->Intersect_Screen_Point_Layer( logX, logY, *m_buildLayer );
 		if( hit ) {
  			for (i=0; i<TheSidesList->getNumSides(); i++) {
-				SidesInfo *pSide = TheSidesList->getSideInfo(i); 
+				SidesInfo *pSide = TheSidesList->getSideInfo(i);
 				for (BuildListInfo *pBuild = pSide->getBuildList(); pBuild; pBuild = pBuild->getNext()) {
 					if (pBuild->getRenderObj() == m_intersector->Result.IntersectedRenderObject) {
 						return pBuild;
@@ -1708,14 +1707,14 @@ Bool WbView3d::viewToDocCoords(CPoint curPt, Coord3D *newPt, Bool constrain)
 	Vector3 intersection(0,0,0);
 	// determine the ray corresponding to the camera and distance to projection plane
 	Matrix3D camera_matrix = m_camera->Get_Transform();
-	
+
 	Vector3 camera_location  = m_camera->Get_Position();
 
 	Vector3 rayLocation;
 	Vector3 rayDirection;
 	Vector3 rayDirectionPt;
 	// the projected ray has the same origin as the camera
-	rayLocation = camera_location; 
+	rayLocation = camera_location;
 	// determine the location of the screen coordinate in camera-model space
 	const ViewportClass &viewport = m_camera->Get_Viewport();
 
@@ -1743,7 +1742,7 @@ Bool WbView3d::viewToDocCoords(CPoint curPt, Coord3D *newPt, Bool constrain)
 	// Note - there are 2 ways to track.  One is for tools (like paint texture)
 	// that follow the terrain.  They want to track the terrain, so the texturing
 	// follows the cursor.  Most tools, however, don't want to jump up & down clifs
-	// and such.  So they use a fixed z plane when tracking, so things don't move 
+	// and such.  So they use a fixed z plane when tracking, so things don't move
 	// depending what you move over.
 	Bool followTerrain = true;
 	if (WbApp()->isCurToolLocked()) {
@@ -1758,8 +1757,8 @@ Bool WbView3d::viewToDocCoords(CPoint curPt, Coord3D *newPt, Bool constrain)
 			intersection = castResult.ContactPoint;
 			m_curTrackingZ = intersection.Z;
 			result = true;
-		}  // end if
-	} 
+		}
+	}
 	if (!result) {
 		intersection.X = Vector3::Find_X_At_Z(m_curTrackingZ, rayLocation, rayDirectionPt);
 		intersection.Y = Vector3::Find_Y_At_Z(m_curTrackingZ, rayLocation, rayDirectionPt);
@@ -1836,14 +1835,14 @@ Bool WbView3d::viewToDocCoordZ(CPoint curPt, Coord3D *newPt, Real theZ)
 	Vector3 intersection(0,0,0);
 	// determine the ray corresponding to the camera and distance to projection plane
 	Matrix3D camera_matrix = m_camera->Get_Transform();
-	
+
 	Vector3 camera_location  = m_camera->Get_Position();
 
 	Vector3 rayLocation;
 	Vector3 rayDirection;
 	Vector3 rayDirectionPt;
 	// the projected ray has the same origin as the camera
-	rayLocation = camera_location; 
+	rayLocation = camera_location;
 	// determine the location of the screen coordinate in camera-model space
 	const ViewportClass &viewport = m_camera->Get_Viewport();
 
@@ -1891,14 +1890,14 @@ void WbView3d::updateHysteresis(void)
 	Vector3 intersection(0,0,0);
 	// determine the ray corresponding to the camera and distance to projection plane
 	Matrix3D camera_matrix = m_camera->Get_Transform();
-	
+
 	Vector3 camera_location  = m_camera->Get_Position();
 
 	Vector3 rayLocation;
 	Vector3 rayDirection;
 	Vector3 rayDirectionPt;
 	// the projected ray has the same origin as the camera
-	rayLocation = camera_location; 
+	rayLocation = camera_location;
 	// determine the location of the screen coordinate in camera-model space
 	const ViewportClass &viewport = m_camera->Get_Viewport();
 
@@ -1999,7 +1998,7 @@ Bool WbView3d::docToViewCoords(Coord3D curPt, CPoint* newPt)
 	GetClientRect(&rClient);
 
 	//
-	// note that the screen coord returned from the project W3D camera 
+	// note that the screen coord returned from the project W3D camera
 	// gave us a screen coords that range from (-1,-1) bottom left to
 	// (1,1) top right ... we are turning that into (0,0) upper left
 	// coords now
@@ -2016,7 +2015,7 @@ Bool WbView3d::docToViewCoords(Coord3D curPt, CPoint* newPt)
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::redraw(void) 
+void WbView3d::redraw(void)
 {
 	if (m_updateCount > 0) {
 		return;
@@ -2030,7 +2029,7 @@ void WbView3d::redraw(void)
 	if (!m_ww3dInited) {
 		return;
 	}
-	
+
 	setupCamera();
 
 	DEBUG_ASSERTCRASH((m_heightMapRenderObj),("oops"));
@@ -2042,29 +2041,35 @@ void WbView3d::redraw(void)
 		}
 		++m_updateCount;
 		Int curTicks = GetTickCount();
-		RefRenderObjListIterator lightListIt(&m_lightList);	
+		RefRenderObjListIterator lightListIt(&m_lightList);
 		m_heightMapRenderObj->updateCenter(m_camera, &lightListIt);
 		m_heightMapRenderObj->On_Frame_Update();
 		--m_updateCount;
 
 		curTicks = GetTickCount()-curTicks;
 //		if (curTicks>2) {
-//			WWDEBUG_SAY(("%d ms for updateCenter, %d FPS\n", curTicks, 1000/curTicks));
+//			WWDEBUG_SAY(("%d ms for updateCenter, %d FPS", curTicks, 1000/curTicks));
 //		}
 	}
 	if (m_drawObject) {
-		m_drawObject->setDrawObjects(m_showObjects, 
+		m_drawObject->setDrawObjects(m_showObjects,
 			m_showWaypoints || WaypointTool::isActive(),
 			m_showPolygonTriggers || PolygonTool::isActive(),
       m_showBoundingBoxes, m_showSightRanges, m_showWeaponRanges, m_showSoundCircles, m_highlightTestArt, m_showLetterbox);
 	}
 
-	WW3D::Sync( GetTickCount() );
+	WW3D::Update_Logic_Frame_Time(TheFramePacer->getLogicTimeStepMilliseconds());
+	WW3D::Sync(WW3D::Get_Fractional_Sync_Milliseconds() >= WWSyncMilliseconds);
+
 	m_buildRedMultiplier += (GetTickCount()-m_time)/500.0f;
 	if (m_buildRedMultiplier>4.0f || m_buildRedMultiplier<0) {
 		m_buildRedMultiplier = 0;
 	}
+
 	render();
+
+	TheFramePacer->update();
+
 	m_time = ::GetTickCount();
 }
 
@@ -2075,17 +2080,17 @@ void WbView3d::render()
 
 	if (WW3D::Begin_Render(true,true,Vector3(0.5f,0.5f,0.5f), TheWaterTransparency->m_minWaterOpacity) == WW3D_ERROR_OK)
 	{
-		
+
 		DEBUG_ASSERTCRASH((m_heightMapRenderObj),("oops"));
 
-		
+
 		if (m_heightMapRenderObj) {
 			m_heightMapRenderObj->Set_Hidden((m_showTerrain ? 0 : 1));
 			m_heightMapRenderObj->doTextures(true);
 		}
 		m_scene->Set_Polygon_Mode(SceneClass::FILL);
 		// Render 3D scene
-		WW3D::Render(m_scene,m_camera);	
+		WW3D::Render(m_scene,m_camera);
 		Vector3 amb = m_baseBuildScene->Get_Ambient_Light();
 		Vector3 newAmb(amb);
 		Real mul = m_buildRedMultiplier;
@@ -2094,40 +2099,40 @@ void WbView3d::render()
 		newAmb.X *= mul;
 		newAmb.Y *= gMul;
 		if (newAmb.X>1) newAmb.X = 1;
-		m_baseBuildScene->Set_Ambient_Light(newAmb); 
-		WW3D::Render(m_baseBuildScene,m_camera);	
-		m_baseBuildScene->Set_Ambient_Light(amb); 
+		m_baseBuildScene->Set_Ambient_Light(newAmb);
+		WW3D::Render(m_baseBuildScene,m_camera);
+		m_baseBuildScene->Set_Ambient_Light(amb);
 
 		if (m_showWireframe) {
 			if (m_heightMapRenderObj) {
 				m_heightMapRenderObj->doTextures(false);
 				m_scene->Set_Polygon_Mode(SceneClass::LINE);
 				// Render 3D scene
-				WW3D::Render(m_scene,m_camera);	
-				WW3D::Render(m_baseBuildScene,m_camera);	
+				WW3D::Render(m_scene,m_camera);
+				WW3D::Render(m_baseBuildScene,m_camera);
 				m_heightMapRenderObj->doTextures(true);
 			}
-		} 
+		}
 		if (m_showObjToolTrackingObj && m_objectToolTrackingObj) {
 			m_transparentObjectsScene->Add_Render_Object(m_objectToolTrackingObj);
 			DX8TextureCategoryClass::SetForceMultiply(true);
 			TheDX8MeshRenderer.Enable_Lighting(false);
 			Real lightLevel = 1.0f;
-			m_transparentObjectsScene->Set_Ambient_Light(Vector3(lightLevel,lightLevel,lightLevel)); 
+			m_transparentObjectsScene->Set_Ambient_Light(Vector3(lightLevel,lightLevel,lightLevel));
 			WW3D::Render(m_transparentObjectsScene, m_camera);
 			TheDX8MeshRenderer.Enable_Lighting(true);
 			DX8TextureCategoryClass::SetForceMultiply(false);
 			m_transparentObjectsScene->Remove_Render_Object(m_objectToolTrackingObj);
 		}
-		
+
 		// Draw the 3d obj icons on top of the rest of the data.
-		WW3D::Render(m_overlayScene,m_camera);	
+		WW3D::Render(m_overlayScene,m_camera);
 		//if (mytext) mytext->Render();
 		if (m3DFont) {
 			drawLabels(NULL);
 		}
 
-		
+
 		WW3D::End_Render();
 	}
 	--m_updateCount;
@@ -2229,7 +2234,7 @@ void WbView3d::initWW3D()
 {
 	// only want to do once per instance, but do lazily.
 	if (!m_ww3dInited) {
-		
+
 
 
 		m_ww3dInited = true;
@@ -2239,18 +2244,18 @@ void WbView3d::initWW3D()
 		WW3D::Set_Prelit_Mode(WW3D::PRELIT_MODE_VERTEX);
 
 		initAssets();
-		WW3D::Init(m_hWnd);	
+		WW3D::Init(m_hWnd);
 		WW3D::Set_Prelit_Mode( WW3D::PRELIT_MODE_LIGHTMAP_MULTI_PASS );
 		WW3D::Set_Collision_Box_Display_Mask(0x00);	///<set to 0xff to make collision boxes visible
 
 		bogusTacticalView.setWidth(m_actualWinSize.x);
 		bogusTacticalView.setHeight(m_actualWinSize.y);
 		bogusTacticalView.setOrigin(0,0);
-		if (WW3D::Set_Render_Device(0, m_actualWinSize.x, m_actualWinSize.y, 32, true, true) != WW3D_ERROR_OK) 
+		if (WW3D::Set_Render_Device(0, m_actualWinSize.x, m_actualWinSize.y, 32, true, true) != WW3D_ERROR_OK)
 		{
 			// Getting the device at the default bit depth (32) didn't work, so try
 			// getting a 16 bit display.  (Voodoo 1-3 only supported 16 bit.) jba.
-			if (WW3D::Set_Render_Device(0, m_actualWinSize.x, m_actualWinSize.y, 16, true, true) != WW3D_ERROR_OK) 
+			if (WW3D::Set_Render_Device(0, m_actualWinSize.x, m_actualWinSize.y, 16, true, true) != WW3D_ERROR_OK)
 			{
 				DEBUG_CRASH(("Couldn't set render device."));
 			}
@@ -2283,7 +2288,7 @@ void WbView3d::initWW3D()
 			} else {
 				m3DFont = NULL;
 			}
-			
+
 		} else {
 			m3DFont = NULL;
 		}
@@ -2306,7 +2311,7 @@ void WbView3d::initWW3D()
 		TheWritableGlobalData->m_enableBehindBuildingMarkers = false;	//this is only for the game.
 		if (TheW3DShadowManager==NULL)
 		{	TheW3DShadowManager = new W3DShadowManager;
- 			TheW3DShadowManager->init();			
+ 			TheW3DShadowManager->init();
 		}
 #endif
 		updateLights();
@@ -2318,18 +2323,18 @@ void WbView3d::initWW3D()
 // WbView3d message handlers
 
 // ----------------------------------------------------------------------------
-int WbView3d::OnCreate(LPCREATESTRUCT lpCreateStruct) 
+int WbView3d::OnCreate(LPCREATESTRUCT lpCreateStruct)
 {
 	if (WbView::OnCreate(lpCreateStruct) == -1)
 		return -1;
-	
+
 	// install debug callbacks
 	WWDebug_Install_Message_Handler(WWDebug_Message_Callback);
 	WWDebug_Install_Assert_Handler(WWAssert_Callback);
 
 	m_timer = SetTimer(0, UPDATE_TIME, NULL);
 
-	initWW3D();	
+	initWW3D();
 	TheWritableGlobalData->m_useCloudMap = AfxGetApp()->GetProfileInt("GameOptions", "cloudMap", 0);
 	AfxGetApp()->WriteProfileInt("GameOptions", "cloudMap", TheGlobalData->m_useCloudMap);	// Just in case it wasn't already there
  	m_partialMapSize = AfxGetApp()->GetProfileInt("GameOptions", "partialMapSize", 97);
@@ -2345,8 +2350,8 @@ int WbView3d::OnCreate(LPCREATESTRUCT lpCreateStruct)
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::OnPaint() 
-{	
+void WbView3d::OnPaint()
+{
 
 	PAINTSTRUCT ps;
 	HDC hdc = ::BeginPaint(m_hWnd, &ps);
@@ -2360,7 +2365,7 @@ void WbView3d::OnPaint()
 		m_firstPaint = false;
 	}
 	DX8Wrapper::SetCleanupHook(this);
-	
+
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -2374,35 +2379,35 @@ void WbView3d::drawCircle( HDC hdc, const Coord3D & centerPoint, Real radius, CO
 
   // Create and select a correctly colored pen. Remember the old one so that it can be restored.
   HPEN pen = CreatePen(PS_SOLID, 2, color);
-  HPEN penOld = (HPEN)SelectObject(hdc, pen); 
-  
-  
+  HPEN penOld = (HPEN)SelectObject(hdc, pen);
+
+
   // Get the starting point on the circumference of the circle.
   pnt.x = centerPoint.x + radius * (Real)cosf(angle);
   pnt.y = centerPoint.y + radius * (Real)sinf(angle);
   pnt.z = centerPoint.z;
   docToViewCoords(pnt, &rulerPoints[0]);
-  
+
   angle += inc;
   for(; angle <= 2.0f * PI; angle += inc) {
 		// Get a new point on the circumference of the circle.
 		pnt.x = centerPoint.x + radius * (Real)cosf(angle);
     pnt.y = centerPoint.y + radius * (Real)sinf(angle);
     pnt.z = centerPoint.z;
-    
+
     docToViewCoords(pnt, &rulerPoints[1]);
-    
+
     ::Polyline(hdc, rulerPoints, 2);
-    
+
     // Remember the last point to use as the starting point for the next line.
-    rulerPoints[0].x = rulerPoints[1].x; 
+    rulerPoints[0].x = rulerPoints[1].x;
     rulerPoints[0].y = rulerPoints[1].y;
   }
 
   // Restore previous pen.
-  SelectObject(hdc, penOld);	
+  SelectObject(hdc, penOld);
   // Delete new pen.
-  DeleteObject(pen);	
+  DeleteObject(pen);
 }
 
 
@@ -2422,7 +2427,7 @@ void WbView3d::drawLabels(HDC hdc)
 
 	// Draw labels.
 	MapObject *pMapObj;
-	if (isNamesVisible()) 
+	if (isNamesVisible())
 	{
 		for (pMapObj = MapObject::getFirstMapObject(); pMapObj; pMapObj = pMapObj->getNext()) {
 			AsciiString name;
@@ -2451,7 +2456,7 @@ void WbView3d::drawLabels(HDC hdc)
 				pos = *pMapObj->getLocation();
 				pos.z = m_heightMapRenderObj->getHeightMapHeight(pos.x, pos.y, NULL);
 			} else if (pMapObj->getThingTemplate() && !(pMapObj->getFlags() & (FLAG_ROAD_FLAGS|FLAG_BRIDGE_FLAGS)) &&
-								 pMapObj->getRenderObj() == NULL && !pMapObj->getThingTemplate()->isKindOf(KINDOF_OPTIMIZED_TREE)) { 
+								 pMapObj->getRenderObj() == NULL && !pMapObj->getThingTemplate()->isKindOf(KINDOF_OPTIMIZED_TREE)) {
 				name = pMapObj->getThingTemplate()->getName();
 				pos = *pMapObj->getLocation();
 				pos.z += m_heightMapRenderObj->getHeightMapHeight(pos.x, pos.y, NULL);
@@ -2462,8 +2467,8 @@ void WbView3d::drawLabels(HDC hdc)
 				switch(i) {
 					case 0 : break;
 					case 1: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel1, &exists); break;
-					case 2: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel2, &exists);; break;
-					case 3: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel3, &exists);; break;
+					case 2: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel2, &exists); break;
+					case 3: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel3, &exists); break;
 					default: name.clear();
 				}
 				if (!name.isEmpty() && m_showWaypoints) {
@@ -2485,7 +2490,7 @@ void WbView3d::drawLabels(HDC hdc)
 						GetClientRect(&rClient);
 
 						//
-						// note that the screen coord returned from the project W3D camera 
+						// note that the screen coord returned from the project W3D camera
 						// gave us a screen coords that range from (-1,-1) bottom left to
 						// (1,1) top right ... we are turning that into (0,0) upper left
 						// coords now
@@ -2511,8 +2516,8 @@ void WbView3d::drawLabels(HDC hdc)
 							pt.x += 1;
 							rct.top = rct.bottom = pt.y;
 							rct.left = rct.right = pt.x;
-							m3DFont->DrawText(name.str(), name.getLength(), &rct, 
-								DT_LEFT | DT_NOCLIP | DT_TOP | DT_SINGLELINE, 0xAF000000 + (red<<16) + (green<<8)); 
+							m3DFont->DrawText(name.str(), name.getLength(), &rct,
+								DT_LEFT | DT_NOCLIP | DT_TOP | DT_SINGLELINE, 0xAF000000 + (red<<16) + (green<<8));
 
 						} else if (!m3DFont) {
 							//docToViewCoords(pos, &pt);
@@ -2542,20 +2547,20 @@ void WbView3d::drawLabels(HDC hdc)
       CPoint rulerPoints[2];
       docToViewCoords(m_rulerPoints[0], &rulerPoints[0]);
       docToViewCoords(m_rulerPoints[1], &rulerPoints[1]);
-      
+
       // Create and select a green pen. Remember the old one so that it can be restored.
       HPEN pen = CreatePen(PS_SOLID, 2, RGB(0,255,0));
-      HPEN penOld = (HPEN)SelectObject(hdc, pen); 
+      HPEN penOld = (HPEN)SelectObject(hdc, pen);
       // Draw the line ruler.
 			::Polyline(hdc, rulerPoints, 2);
 
       // Restore previous pen.
-      SelectObject(hdc, penOld);	
+      SelectObject(hdc, penOld);
       // Delete new pen.
-      DeleteObject(pen);	
+      DeleteObject(pen);
 		} else if (m_doRulerFeedback == RULER_CIRCLE) {
       drawCircle( hdc, m_rulerPoints[0], m_rulerLength, RGB( 0, 255, 0 ) );
-		}  
+		}
 	}
 
 	if (hdc && m_doLightFeedback)
@@ -2574,7 +2579,7 @@ void WbView3d::drawLabels(HDC hdc)
 
 			if (m_lightFeedbackMesh[lIndex] == NULL)
 			{	char nameBuf[64];
-				sprintf(nameBuf,"WB_LIGHT%d",lIndex+1);
+				snprintf(nameBuf, ARRAY_SIZE(nameBuf), "WB_LIGHT%d", lIndex+1);
 				m_lightFeedbackMesh[lIndex]=WW3DAssetManager::Get_Instance()->Create_Render_Obj(nameBuf);
 			}
 			if (m_lightFeedbackMesh[lIndex]==NULL) {
@@ -2595,7 +2600,7 @@ void WbView3d::drawLabels(HDC hdc)
 				GetClientRect(&rClient);
 
 				//
-				// note that the screen coord returned from the project W3D camera 
+				// note that the screen coord returned from the project W3D camera
 				// gave us a screen coords that range from (-1,-1) bottom left to
 				// (1,1) top right ... we are turning that into (0,0) upper left
 				// coords now
@@ -2615,13 +2620,13 @@ void WbView3d::drawLabels(HDC hdc)
 				rayPoints[1].y= rClient.top+syEnd;
 
 				HPEN pen=CreatePen( PS_SOLID,2, LightColors[lIndex]);
-				HPEN penOld = (HPEN)SelectObject(hdc, pen); 
+				HPEN penOld = (HPEN)SelectObject(hdc, pen);
 				Polyline(hdc,rayPoints,2);
 				SelectObject(hdc, penOld);	//restore previous pen
 				DeleteObject(pen);	//delete new pen
 			}
 #endif	//DRAW_LIGHT_DIRECTION_RAYS
-		}//end for
+		}
 	}
 	else
 	{	if (!m_doLightFeedback)
@@ -2640,14 +2645,14 @@ void WbView3d::drawLabels(HDC hdc)
 
 
 // ----------------------------------------------------------------------------
-void WbView3d::OnSize(UINT nType, int cx, int cy) 
+void WbView3d::OnSize(UINT nType, int cx, int cy)
 {
 	WbView::OnSize(nType, cx, cy);
 
 }
 
 // ----------------------------------------------------------------------------
-BOOL WbView3d::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) 
+BOOL WbView3d::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt)
 {
 	if (m_trackingMode == TRACK_NONE) {
 
@@ -2785,7 +2790,7 @@ Real WbView3d::getCurrentZoom(void)
 		Real zAbs = zOffset + zPos;
 		if (zAbs<0) zAbs = -zAbs;
 		if (zAbs<0.01) zAbs = 0.01f;
-		//DEBUG_LOG(("zOffset = %.2f, zAbs = %.2f, zPos = %.2f\n", zOffset, zAbs, zPos));	
+		//DEBUG_LOG(("zOffset = %.2f, zAbs = %.2f, zPos = %.2f", zOffset, zAbs, zPos));
 		if (zOffset > 0) {
 			zOffset *= zAbs;
 		}	else if (zOffset < -0.3f) {
@@ -2794,30 +2799,30 @@ Real WbView3d::getCurrentZoom(void)
 		if (zOffset < -0.6f) {
 			zOffset = -0.3f + zOffset/2.0f;
 		}
-		//DEBUG_LOG(("zOffset = %.2f\n", zOffset));
+		//DEBUG_LOG(("zOffset = %.2f", zOffset));
 		zoom = zAbs;
 	}
 	return zoom;
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::OnTimer(UINT nIDEvent) 
+void WbView3d::OnTimer(UINT nIDEvent)
 {
-	if (getLastDrawTime()+UPDATE_TIME<::GetTickCount()) 
+	if (getLastDrawTime()+UPDATE_TIME<::GetTickCount())
 	{
 		Invalidate(false);
 	}
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::OnDestroy() 
+void WbView3d::OnDestroy()
 {
 	killTheTimer();
-	WbView::OnDestroy();	
+	WbView::OnDestroy();
 }
 
 // ----------------------------------------------------------------------------
-void WbView3d::OnShowWindow(BOOL bShow, UINT nStatus) 
+void WbView3d::OnShowWindow(BOOL bShow, UINT nStatus)
 {
 	WbView::OnShowWindow(bShow, nStatus);
 }
@@ -2827,7 +2832,7 @@ void WbView3d::OnShowWindow(BOOL bShow, UINT nStatus)
 //=============================================================================
 /** Scrolls the window. */
 //=============================================================================
-void WbView3d::scrollInView(Real xScroll, Real yScroll, Bool end) 
+void WbView3d::scrollInView(Real xScroll, Real yScroll, Bool end)
 {
 	m_centerPt.X += xScroll;
 	m_centerPt.Y += yScroll;
@@ -2839,40 +2844,40 @@ void WbView3d::scrollInView(Real xScroll, Real yScroll, Bool end)
 	CMainFrame::GetMainFrame()->handleCameraChange();
 }
 
-void WbView3d::OnViewShowwireframe() 
+void WbView3d::OnViewShowwireframe()
 {
 	m_showWireframe = !m_showWireframe;
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowWireframe", m_showWireframe?1:0);
 }
 
-void WbView3d::OnUpdateViewShowwireframe(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowwireframe(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showWireframe?1:0);
-	
+
 }
 
-BOOL WbView3d::OnEraseBkgnd(CDC* pDC) 
+BOOL WbView3d::OnEraseBkgnd(CDC* pDC)
 {
 	// Never erase the background.  The 3d view always draws the entire
 	// window, so erasing just makes it flicker.  jba.
 	return true; // act like we erased.
 }
 
-void WbView3d::OnViewShowentire3dmap() 
+void WbView3d::OnViewShowentire3dmap()
 {
-	m_showEntireMap = !m_showEntireMap;	
+	m_showEntireMap = !m_showEntireMap;
 	IRegion2D range = {0,0,0,0};
 	this->updateHeightMapInView(WbDoc()->GetHeightMap(), false, range);
 	Invalidate(false);
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowEntireMap", m_showEntireMap?1:0);
 }
 
-void WbView3d::OnUpdateViewShowentire3dmap(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowentire3dmap(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showEntireMap?1:0);
 }
 
-void WbView3d::OnViewShowtopdownview() 
+void WbView3d::OnViewShowtopdownview()
 {
 	m_projection = !m_projection;
 	m_heightMapRenderObj->setFlattenHeights(m_projection);
@@ -2880,43 +2885,43 @@ void WbView3d::OnViewShowtopdownview()
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowTopDownView", m_projection?1:0);
 }
 
-void WbView3d::OnUpdateViewShowtopdownview(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowtopdownview(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_projection?1:0);
 }
 
-void WbView3d::OnViewShowclouds() 
+void WbView3d::OnViewShowclouds()
 {
 	TheWritableGlobalData->m_useCloudMap = !TheGlobalData->m_useCloudMap;
 	AfxGetApp()->WriteProfileInt("GameOptions", "cloudMap", TheGlobalData->m_useCloudMap);
 }
 
-void WbView3d::OnUpdateViewShowclouds(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowclouds(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(TheGlobalData->m_useCloudMap?1:0);
 }
 
-void WbView3d::OnViewShowmacrotexture() 
+void WbView3d::OnViewShowmacrotexture()
 {
 	Bool show = !TheGlobalData->m_useLightMap;
 	TheWritableGlobalData->m_useLightMap = show;
 }
 
-void WbView3d::OnUpdateViewShowmacrotexture(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowmacrotexture(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(TheGlobalData->m_useLightMap?1:0);
 }
 
-void WbView3d::OnEditSelectmacrotexture() 
+void WbView3d::OnEditSelectmacrotexture()
 {
 	SelectMacrotexture dlg;
 
 	// The macrotexture dialog sets the macrotexture in the 3d engine.
 	dlg.DoModal();
-	
+
 }
 
-void WbView3d::OnViewShowshadows() 
+void WbView3d::OnViewShowshadows()
 {
 	m_showShadows = !m_showShadows;
 	if (m_showShadows) {
@@ -2939,7 +2944,7 @@ void WbView3d::OnViewShowshadows()
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowShadows", m_showShadows?1:0);
 }
 
-void WbView3d::OnUpdateViewShowshadows(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowshadows(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showShadows?1:0);
 }
@@ -2986,7 +2991,7 @@ void WbView3d::OnEditMapSettings()
 	}
 }
 
-void WbView3d::OnEditShadows() 
+void WbView3d::OnEditShadows()
 {
 	if (!m_showShadows) {
 		OnViewShowshadows(); // turn them on.
@@ -2995,20 +3000,20 @@ void WbView3d::OnEditShadows()
 	dlg.DoModal();
 }
 
-void WbView3d::OnViewShowModels() 
+void WbView3d::OnViewShowModels()
 {
 	setShowModels(!getShowModels());
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowModels", getShowModels()?1:0);
 	resetRenderObjects();
 	invalObjectInView(NULL);
 }
-void WbView3d::OnUpdateViewShowModels(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowModels(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(getShowModels()?1:0);
 }
 
 // MLL C&C3
-void WbView3d::OnViewBoundingBoxes() 
+void WbView3d::OnViewBoundingBoxes()
 {
 	setShowBoundingBoxes(!getShowBoundingBoxes());
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowBoundingBoxes", getShowBoundingBoxes()?1:0);
@@ -3016,14 +3021,14 @@ void WbView3d::OnViewBoundingBoxes()
 	invalObjectInView(NULL);
 }
 // MLL C&C3
-void WbView3d::OnUpdateViewBoundingBoxes(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewBoundingBoxes(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(getShowBoundingBoxes()?1:0);
 }
 
 
 // MLL C&C3
-void WbView3d::OnViewSightRanges() 
+void WbView3d::OnViewSightRanges()
 {
 	setShowSightRanges(!getShowSightRanges());
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowSightRanges", getShowSightRanges()?1:0);
@@ -3031,13 +3036,13 @@ void WbView3d::OnViewSightRanges()
 	invalObjectInView(NULL);
 }
 // MLL C&C3
-void WbView3d::OnUpdateViewSightRanges(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewSightRanges(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(getShowSightRanges()?1:0);
 }
 
 // MLL C&C3
-void WbView3d::OnViewWeaponRanges() 
+void WbView3d::OnViewWeaponRanges()
 {
 	setShowWeaponRanges(!getShowWeaponRanges());
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowWeaponRanges", getShowWeaponRanges()?1:0);
@@ -3045,13 +3050,13 @@ void WbView3d::OnViewWeaponRanges()
 	invalObjectInView(NULL);
 }
 // MLL C&C3
-void WbView3d::OnUpdateViewWeaponRanges(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewWeaponRanges(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(getShowWeaponRanges()?1:0);
 }
 
 // MLL C&C3
-void WbView3d::OnHighlightTestArt() 
+void WbView3d::OnHighlightTestArt()
 {
 	setHighlightTestArt(!getHighlightTestArt());
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "HighlightTestArt", getHighlightTestArt()?1:0);
@@ -3059,38 +3064,38 @@ void WbView3d::OnHighlightTestArt()
 	invalObjectInView(NULL);
 }
 // MLL C&C3
-void WbView3d::OnUpdateHighlightTestArt(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateHighlightTestArt(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(getHighlightTestArt()?1:0);
 }
 
 
 // MLL C&C3
-void WbView3d::OnShowLetterbox() 
+void WbView3d::OnShowLetterbox()
 {
 	setShowLetterbox(!getShowLetterbox());
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowLetterBox", getShowLetterbox()?1:0);
 }
 // MLL C&C3
-void WbView3d::OnUpdateShowLetterbox(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateShowLetterbox(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(getShowLetterbox()?1:0);
 }
 
 
-void WbView3d::OnViewGarrisoned() 
+void WbView3d::OnViewGarrisoned()
 {
 	setShowGarrisoned(!getShowGarrisoned());
 	::AfxGetApp()->WriteProfileInt(MAIN_FRAME_SECTION, "ShowGarrisoned", getShowGarrisoned()?1:0);
 	resetRenderObjects();
 	invalObjectInView(NULL);
 }
-void WbView3d::OnUpdateViewGarrisoned(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewGarrisoned(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(getShowGarrisoned()?1:0);
 }
 
-void WbView3d::OnViewShowimpassableareas() 
+void WbView3d::OnViewShowimpassableareas()
 {
 	Bool showImpassable = false;
 	if (TheTerrainRenderObject) {
@@ -3102,7 +3107,7 @@ void WbView3d::OnViewShowimpassableareas()
 	}
 }
 
-void WbView3d::OnUpdateViewShowimpassableareas(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewShowimpassableareas(CCmdUI* pCmdUI)
 {
 	Bool showImpassable = false;
 	if (TheTerrainRenderObject) {
@@ -3123,72 +3128,72 @@ void WbView3d::OnImpassableAreaOptions()
 				TheTerrainRenderObject->setViewImpassableAreaSlope(opts.GetDefaultSlope());
 			}
 		}
-		
+
 		IRegion2D range = {0,0,0,0};
 		updateHeightMapInView(WbDoc()->GetHeightMap(), false, range);
 	}
 }
 
-void WbView3d::OnViewPartialmapsize96x96() 
+void WbView3d::OnViewPartialmapsize96x96()
 {
 	m_partialMapSize = 97;
 	AfxGetApp()->WriteProfileInt("GameOptions", "partialMapSize", m_partialMapSize);
-	m_showEntireMap = false;	
+	m_showEntireMap = false;
 	IRegion2D range = {0,0,0,0};
 	WbDoc()->GetHeightMap()->setDrawOrg(0, 0);
 	updateHeightMapInView(WbDoc()->GetHeightMap(), false, range);
 	Invalidate(false);
 }
 
-void WbView3d::OnUpdateViewPartialmapsize96x96(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewPartialmapsize96x96(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_partialMapSize == 97?1:0);
 }
 
-void WbView3d::OnViewPartialmapsize192x192() 
+void WbView3d::OnViewPartialmapsize192x192()
 {
 	m_partialMapSize = 192;
 	AfxGetApp()->WriteProfileInt("GameOptions", "partialMapSize", m_partialMapSize);
-	m_showEntireMap = false;	
+	m_showEntireMap = false;
 	IRegion2D range = {0,0,0,0};
 	WbDoc()->GetHeightMap()->setDrawOrg(0, 0);
 	updateHeightMapInView(WbDoc()->GetHeightMap(), false, range);
 	Invalidate(false);
 }
 
-void WbView3d::OnUpdateViewPartialmapsize192x192(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewPartialmapsize192x192(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_partialMapSize == 192?1:0);
 }
 
-void WbView3d::OnViewPartialmapsize160x160() 
+void WbView3d::OnViewPartialmapsize160x160()
 {
 	m_partialMapSize = 161;
 	AfxGetApp()->WriteProfileInt("GameOptions", "partialMapSize", m_partialMapSize);
-	m_showEntireMap = false;	
+	m_showEntireMap = false;
 	IRegion2D range = {0,0,0,0};
 	WbDoc()->GetHeightMap()->setDrawOrg(0, 0);
 	updateHeightMapInView(WbDoc()->GetHeightMap(), false, range);
 	Invalidate(false);
 }
 
-void WbView3d::OnUpdateViewPartialmapsize160x160(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewPartialmapsize160x160(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_partialMapSize == 161?1:0);
 }
 
-void WbView3d::OnViewPartialmapsize128x128() 
+void WbView3d::OnViewPartialmapsize128x128()
 {
 	m_partialMapSize = 129;
 	AfxGetApp()->WriteProfileInt("GameOptions", "partialMapSize", m_partialMapSize);
-	m_showEntireMap = false;	
+	m_showEntireMap = false;
 	IRegion2D range = {0,0,0,0};
 	WbDoc()->GetHeightMap()->setDrawOrg(0, 0);
 	updateHeightMapInView(WbDoc()->GetHeightMap(), false, range);
 	Invalidate(false);
 }
 
-void WbView3d::OnUpdateViewPartialmapsize128x128(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewPartialmapsize128x128(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_partialMapSize == 129?1:0);
 }
@@ -3205,7 +3210,7 @@ void WbView3d::OnViewLayersList()
 	}
 }
 
-void WbView3d::OnUpdateViewLayersList(CCmdUI* pCmdUI) 
+void WbView3d::OnUpdateViewLayersList(CCmdUI* pCmdUI)
 {
 	pCmdUI->SetCheck(m_showLayersList ? 1 : 0);
 }
diff --git a/GeneralsMD/Code/Tools/wdump/CMakeLists.txt b/GeneralsMD/Code/Tools/wdump/CMakeLists.txt
index a363e40260b..65d190703e4 100644
--- a/GeneralsMD/Code/Tools/wdump/CMakeLists.txt
+++ b/GeneralsMD/Code/Tools/wdump/CMakeLists.txt
@@ -21,7 +21,6 @@ target_link_libraries(z_wdump PRIVATE
     core_config
     core_utility
     core_wwstub # avoid linking GameEngine
-    dbghelplib
     imm32
     vfw32
     winmm
diff --git a/GeneralsMD/Code/Tools/wdump/FindDialog.cpp b/GeneralsMD/Code/Tools/wdump/FindDialog.cpp
index 6c92491bb26..a434d48516d 100644
--- a/GeneralsMD/Code/Tools/wdump/FindDialog.cpp
+++ b/GeneralsMD/Code/Tools/wdump/FindDialog.cpp
@@ -65,10 +65,10 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // FindDialog message handlers
 
-BOOL FindDialog::OnInitDialog() 
+BOOL FindDialog::OnInitDialog()
 {
 	CDialog::OnInitDialog();
-	
+
 	((CEdit*) GetDlgItem (IDC_FIND_STRING))->SetLimitText (MAX_FIND_STRING_LENGTH);
 	GetDlgItem (IDC_FIND_STRING)->SetWindowText (_FindString);
 
@@ -77,12 +77,12 @@ BOOL FindDialog::OnInitDialog()
 }
 
 
-void FindDialog::OnChangeFindString() 
+void FindDialog::OnChangeFindString()
 {
 	GetDlgItem (IDC_FIND_STRING)->GetWindowText (_FindString, MAX_FIND_STRING_LENGTH);
 }
 
-void FindDialog::OnUpdateFindString() 
+void FindDialog::OnUpdateFindString()
 {
-	GetDlgItem (IDOK)->EnableWindow (GetDlgItem (IDC_FIND_STRING)->GetWindowTextLength() > 0);	
+	GetDlgItem (IDOK)->EnableWindow (GetDlgItem (IDC_FIND_STRING)->GetWindowTextLength() > 0);
 }
diff --git a/GeneralsMD/Code/Tools/wdump/FindDialog.h b/GeneralsMD/Code/Tools/wdump/FindDialog.h
index e65cd40f928..07e3f616b9a 100644
--- a/GeneralsMD/Code/Tools/wdump/FindDialog.h
+++ b/GeneralsMD/Code/Tools/wdump/FindDialog.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_FINDDIALOG_H__C38C0FF8_E89B_11D3_A398_009027447394__INCLUDED_)
-#define AFX_FINDDIALOG_H__C38C0FF8_E89B_11D3_A398_009027447394__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
+
 // FindDialog.h : header file
 //
 
@@ -42,15 +38,15 @@ class FindDialog : public CDialog
 		return (_FindString);
 	}
 
-	static void Compare (const char *string)	
+	static void Compare (const char *string)
 	{
 		_Found |= (strstr (string, _FindString) != NULL);
 	}
-	
+
 	static bool Found()
 	{
 		return (_Found);
-	}	
+	}
 
 	static void Found (bool found)
 	{
@@ -90,5 +86,3 @@ class FindDialog : public CDialog
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_FINDDIALOG_H__C38C0FF8_E89B_11D3_A398_009027447394__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/wdump/chunk_d.cpp b/GeneralsMD/Code/Tools/wdump/chunk_d.cpp
index 732b9ffb8c5..9480b5ae113 100644
--- a/GeneralsMD/Code/Tools/wdump/chunk_d.cpp
+++ b/GeneralsMD/Code/Tools/wdump/chunk_d.cpp
@@ -37,9 +37,9 @@
 #include "w3d_file.h"
 #include "stdafx.h"
 #include "wdump.h"
-#include "Chunk_D.h"
+#include "chunk_d.h"
 #include "rawfilem.h"
-#include "finddialog.h"
+#include "FindDialog.h"
 
 #ifdef RTS_DEBUG
 #undef THIS_FILE
@@ -66,41 +66,41 @@ void ChunkTableClass::NewType(int ID, const char *name, void (*callback)(ChunkIt
 	ChunkType *chunktype = new ChunkType(name, callback, wrapper);
 	Types.SetAt((void *) ID, (void *) chunktype);
 }
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, const char *Value, const char *Type) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, const char *Value, const char *Type) {
 
-	if (List != NULL) {
-		int list_item = List->InsertItem(Counter++, Name);
-		List->SetItemText(list_item, 1, Type);
-		List->SetItemText(list_item, 2, Value);
+	if (list != NULL) {
+		int list_item = list->InsertItem(Counter++, Name);
+		list->SetItemText(list_item, 1, Type);
+		list->SetItemText(list_item, 2, Value);
 
 	} else {
 		FindDialog::Compare (Value);
 	}
 }
 
-void ChunkTableClass::AddItemVersion(CListCtrl *List,int &Counter,uint32 version)
+void ChunkTableClass::AddItemVersion(CListCtrl *list,int &Counter,uint32 version)
 {
 	char buf[64];
 	sprintf(buf,"%d.%d",W3D_GET_MAJOR_VERSION(version),W3D_GET_MINOR_VERSION(version));
-	AddItem(List,Counter,"Version",buf);
+	AddItem(list,Counter,"Version",buf);
 }
 
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, uint32 Value) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, uint32 Value) {
 	char buf[256];
 	sprintf(buf, "%d", Value);
-	AddItem(List, Counter, Name, buf, "int32");
+	AddItem(list, Counter, Name, buf, "int32");
 }
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, uint16 Value) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, uint16 Value) {
 	char buf[256];
 	sprintf(buf, "%d", Value);
-	AddItem(List, Counter, Name, buf, "int16");
+	AddItem(list, Counter, Name, buf, "int16");
 }
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, uint8 Value) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, uint8 Value) {
 	char buf[256];
 	sprintf(buf, "%d", Value);
-	AddItem(List, Counter, Name, buf, "int8");
+	AddItem(list, Counter, Name, buf, "int8");
 }
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, uint8 *Value, int Count) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, uint8 *Value, int Count) {
 	CString buffer;
 	CString temp;
 	int counter = 0;
@@ -110,14 +110,14 @@ void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, u
 	}
 	char type[256];
 	sprintf(type, "int8[%d]", Count);
-	AddItem(List, Counter, Name, (LPCTSTR) buffer, type);
+	AddItem(list, Counter, Name, (LPCTSTR) buffer, type);
 }
-void ChunkTableClass::AddItem(CListCtrl *List,int &Counter,  const char *Name, float32 Value) {
+void ChunkTableClass::AddItem(CListCtrl *list,int &Counter,  const char *Name, float32 Value) {
 	char buf[256];
 	sprintf(buf, "%f", Value);
-	AddItem(List, Counter, Name, buf, "float");
+	AddItem(list, Counter, Name, buf, "float");
 }
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, uint32 *Value, int Count) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, uint32 *Value, int Count) {
 	CString buffer;
 	CString temp;
 	int counter = 0;
@@ -127,9 +127,9 @@ void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, u
 	}
 	char type[256];
 	sprintf(type, "int32[%d]", Count);
-	AddItem(List, Counter, Name, (LPCTSTR) buffer, type);
+	AddItem(list, Counter, Name, (LPCTSTR) buffer, type);
 }
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, float32 *Value, int Count) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, float32 *Value, int Count) {
 	CString buffer;
 	CString temp;
 	int counter = 0;
@@ -139,34 +139,34 @@ void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, f
 	}
 	char type[256];
 	sprintf(type, "float[%d]", Count);
-	AddItem(List, Counter, Name, (LPCTSTR) buffer, type);
+	AddItem(list, Counter, Name, (LPCTSTR) buffer, type);
 }
 
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, IOVector3Struct *Value) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, IOVector3Struct *Value) {
 	char buf[256];
 	sprintf(buf, "%f %f %f", Value->X, Value->Y, Value->Z);
-	AddItem(List, Counter, Name, buf, "vector");
+	AddItem(list, Counter, Name, buf, "vector");
 }
 
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, IOVector4Struct *Value) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, IOVector4Struct *Value) {
 	char buf[256];
 	sprintf(buf, "%f %f %f %f", Value->X, Value->Y, Value->Z, Value->W);
-	AddItem(List, Counter, Name, buf, "vector4");
+	AddItem(list, Counter, Name, buf, "vector4");
 }
 
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, W3dQuaternionStruct *Value) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, W3dQuaternionStruct *Value) {
 	char buf[256];
 	sprintf(buf, "%f %f %f %f", Value->Q[0], Value->Q[1], Value->Q[2], Value->Q[3]);
-	AddItem(List, Counter, Name, buf, "quaternion");
+	AddItem(list, Counter, Name, buf, "quaternion");
 }
 
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, W3dRGBStruct *Value) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, W3dRGBStruct *Value) {
 	CString buffer;
 	buffer.Format( "(%d %d %d) ", Value->R, Value->G, Value->B);
-	AddItem(List, Counter, Name, (LPCTSTR) buffer, "RGB");
+	AddItem(list, Counter, Name, (LPCTSTR) buffer, "RGB");
 }
 
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, W3dRGBStruct *Value, int Count) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, W3dRGBStruct *Value, int Count) {
 	CString buffer;
 	CString temp;
 	int counter = 0;
@@ -177,34 +177,34 @@ void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, W
 	}
 	char type[256];
 	sprintf(type, "RGB[%d]", Count);
-	AddItem(List, Counter, Name, (LPCTSTR) buffer, type);
+	AddItem(list, Counter, Name, (LPCTSTR) buffer, type);
 }
 
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, W3dRGBAStruct *Value) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, W3dRGBAStruct *Value) {
 	CString buffer;
 	buffer.Format( "(%d %d %d %d) ", Value->R, Value->G, Value->B, Value->A);
-	AddItem(List, Counter, Name, (LPCTSTR) buffer, "RGBA");
+	AddItem(list, Counter, Name, (LPCTSTR) buffer, "RGBA");
 }
 
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, W3dTexCoordStruct *Value, int Count) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, W3dTexCoordStruct *Value, int Count) {
 	CString temp;
 	int counter = 0;
 	while(counter < Count) {
 		char type[256];
 		sprintf(type, "%s.TexCoord[%d]", Name, counter);
-		AddItem(List, Counter, type, &Value[counter]);
+		AddItem(list, Counter, type, &Value[counter]);
 		counter++;
 	}
 }
 
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, W3dTexCoordStruct *Value) 
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, W3dTexCoordStruct *Value)
 {
 	char buf[256];
 	sprintf(buf, "%f %f", Value->U, Value->V);
-	AddItem(List, Counter, Name, buf, "UV");
+	AddItem(list, Counter, Name, buf, "UV");
 }
 
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *name, W3dShaderStruct * shader) 
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *name, W3dShaderStruct * shader)
 {
 	static const char * _depth_compare[] = { "Pass Never","Pass Less","Pass Equal","Pass Less or Equal", "Pass Greater","Pass Not Equal","Pass Greater or Equal","Pass Always" };
 	static const char * _depth_mask[] = { "Write Disable", "Write Enable" };
@@ -225,31 +225,31 @@ void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *name, W
 	char label[256];
 
 	sprintf(label,"%s.DepthCompare",name);
-	AddItem(List, Counter, label, _depth_compare[W3d_Shader_Get_Depth_Compare(shader)]);
+	AddItem(list, Counter, label, _depth_compare[W3d_Shader_Get_Depth_Compare(shader)]);
 	sprintf(label,"%s.DepthMask",name);
-	AddItem(List, Counter, label, _depth_mask[W3d_Shader_Get_Depth_Mask(shader)]);
+	AddItem(list, Counter, label, _depth_mask[W3d_Shader_Get_Depth_Mask(shader)]);
 	sprintf(label,"%s.DestBlend",name);
-	AddItem(List, Counter, label, _destblend[W3d_Shader_Get_Dest_Blend_Func(shader)]);
+	AddItem(list, Counter, label, _destblend[W3d_Shader_Get_Dest_Blend_Func(shader)]);
 	sprintf(label,"%s.PriGradient",name);
-	AddItem(List, Counter, label, _prigradient[W3d_Shader_Get_Pri_Gradient(shader)]);
+	AddItem(list, Counter, label, _prigradient[W3d_Shader_Get_Pri_Gradient(shader)]);
 	sprintf(label,"%s.SecGradient",name);
-	AddItem(List, Counter, label, _secgradient[W3d_Shader_Get_Sec_Gradient(shader)]);
+	AddItem(list, Counter, label, _secgradient[W3d_Shader_Get_Sec_Gradient(shader)]);
 	sprintf(label,"%s.SrcBlend",name);
-	AddItem(List, Counter, label, _srcblend[W3d_Shader_Get_Src_Blend_Func(shader)]);
+	AddItem(list, Counter, label, _srcblend[W3d_Shader_Get_Src_Blend_Func(shader)]);
 	sprintf(label,"%s.Texturing",name);
-	AddItem(List, Counter, label, _texturing[W3d_Shader_Get_Texturing(shader)]);
+	AddItem(list, Counter, label, _texturing[W3d_Shader_Get_Texturing(shader)]);
 	sprintf(label,"%s.DetailColor",name);
-	AddItem(List, Counter, label, _detailcolor[W3d_Shader_Get_Detail_Color_Func(shader)]);
+	AddItem(list, Counter, label, _detailcolor[W3d_Shader_Get_Detail_Color_Func(shader)]);
 	sprintf(label,"%s.DetailAlpha",name);
-	AddItem(List, Counter, label, _detailalpha[W3d_Shader_Get_Detail_Alpha_Func(shader)]);
+	AddItem(list, Counter, label, _detailalpha[W3d_Shader_Get_Detail_Alpha_Func(shader)]);
 	sprintf(label,"%s.AlphaTest",name);
-	AddItem(List, Counter, label, _alphatest[W3d_Shader_Get_Alpha_Test(shader)]);	
+	AddItem(list, Counter, label, _alphatest[W3d_Shader_Get_Alpha_Test(shader)]);
 
 	counter++;
 	shader++;
 }
 
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *name, W3dPS2ShaderStruct * shader) 
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *name, W3dPS2ShaderStruct * shader)
 {
 	static const char * _depth_compare[] = { "Pass Never","Pass Less","Pass Always","Pass Less or Equal"};
 	static const char * _depth_mask[] = { "Write Disable", "Write Enable" };
@@ -269,95 +269,95 @@ void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *name, W
 	char label[256];
 
 	sprintf(label,"%s.DepthCompare",name);
-	AddItem(List, Counter, label, _depth_compare[W3d_Shader_Get_Depth_Compare(shader)]);
+	AddItem(list, Counter, label, _depth_compare[W3d_Shader_Get_Depth_Compare(shader)]);
 	sprintf(label,"%s.DepthMask",name);
-	AddItem(List, Counter, label, _depth_mask[W3d_Shader_Get_Depth_Mask(shader)]);
+	AddItem(list, Counter, label, _depth_mask[W3d_Shader_Get_Depth_Mask(shader)]);
 	sprintf(label,"%s.PriGradient",name);
-	AddItem(List, Counter, label, _prigradient[W3d_Shader_Get_Pri_Gradient(shader)]);
+	AddItem(list, Counter, label, _prigradient[W3d_Shader_Get_Pri_Gradient(shader)]);
 	sprintf(label,"%s.Texturing",name);
-	AddItem(List, Counter, label, _texturing[W3d_Shader_Get_Texturing(shader)]);
+	AddItem(list, Counter, label, _texturing[W3d_Shader_Get_Texturing(shader)]);
 
 	sprintf(label,"%s.AParam",name);
-	AddItem(List, Counter, label, _ablend[W3d_Shader_Get_PS2_Param_A(shader)]);
+	AddItem(list, Counter, label, _ablend[W3d_Shader_Get_PS2_Param_A(shader)]);
 
 	sprintf(label,"%s.BParam",name);
-	AddItem(List, Counter, label, _ablend[W3d_Shader_Get_PS2_Param_B(shader)]);
+	AddItem(list, Counter, label, _ablend[W3d_Shader_Get_PS2_Param_B(shader)]);
 
 	sprintf(label,"%s.CParam",name);
-	AddItem(List, Counter, label, _cblend[W3d_Shader_Get_PS2_Param_C(shader)]);
+	AddItem(list, Counter, label, _cblend[W3d_Shader_Get_PS2_Param_C(shader)]);
 
 	sprintf(label,"%s.DParam",name);
-	AddItem(List, Counter, label, _ablend[W3d_Shader_Get_PS2_Param_D(shader)]);
+	AddItem(list, Counter, label, _ablend[W3d_Shader_Get_PS2_Param_D(shader)]);
 
 	counter++;
 	shader++;
 }
 
 
-void ChunkTableClass::AddItem(CListCtrl *List, int &Counter, const char *Name, Vector3i *Value) {
+void ChunkTableClass::AddItem(CListCtrl *list, int &Counter, const char *Name, Vector3i *Value) {
 	char buf[256];
 	sprintf(buf, "%d %d %d", Value->I, Value->J, Value->K);
-	AddItem(List, Counter, Name, buf, "IJK");
+	AddItem(list, Counter, Name, buf, "IJK");
 }
 
-void ChunkTableClass::List_Subitems(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_Subitems(ChunkItem *Item, CListCtrl *list) {
 	int counter = 0;
 	POSITION p = Item->Chunks.GetHeadPosition();
 	while(p) {
 		ChunkItem *subitem = Item->Chunks.GetNext(p);
 		if(subitem->Type) {
-			AddItem(List, counter,subitem->Type->Name,  "", "chunk");
+			AddItem(list, counter,subitem->Type->Name,  "", "chunk");
 		}
 	}
 }
-void ChunkTableClass::List_W3D_CHUNK_MESH(ChunkItem *Item, CListCtrl *List) {
-	List_Subitems(Item, List);
+void ChunkTableClass::List_W3D_CHUNK_MESH(ChunkItem *Item, CListCtrl *list) {
+	List_Subitems(Item, list);
 }
-void ChunkTableClass::List_W3D_CHUNK_MESH_HEADER(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_MESH_HEADER(ChunkItem *Item, CListCtrl *list) {
 
 	W3dMeshHeaderStruct *data = (W3dMeshHeaderStruct *) Item->Data;
 	int Counter = 0;
 
 	char buf[64];
 	sprintf(buf,"%d.%d",W3D_GET_MAJOR_VERSION(data->Version),W3D_GET_MINOR_VERSION(data->Version));
-	AddItem(List, Counter,"Version", buf);
-	AddItem(List, Counter,"MeshName", data->MeshName);
-	AddItem(List,Counter,"Attributes",data->Attributes);
-	if (data->Attributes & W3D_MESH_FLAG_COLLISION_BOX)	AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_BOX");
-	if (data->Attributes & W3D_MESH_FLAG_SKIN)	AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_SKIN");
-	if (data->Attributes & W3D_MESH_FLAG_SHADOW)	AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_SHADOW");
-	if (data->Attributes & W3D_MESH_FLAG_ALIGNED)	AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_ALIGNED");
-	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_PHYSICAL)	AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_PHYSICAL");
-	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_PROJECTILE)	AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_PROJECTILE");
-	AddItem(List, Counter,"NumTris", data->NumTris);
-	AddItem(List, Counter,"NumQuads", data->NumQuads);
-	AddItem(List, Counter,"NumSrTris", data->NumSrTris);
-	AddItem(List, Counter,"NumPovQuads", data->NumPovQuads);
-	AddItem(List, Counter,"NumVertices", data->NumVertices);
-	AddItem(List, Counter,"NumNormals", data->NumNormals);
-	AddItem(List, Counter,"NumSrNormals", data->NumSrNormals);
-	AddItem(List, Counter,"NumTexCoords", data->NumTexCoords);
-	AddItem(List, Counter,"NumMaterials", data->NumMaterials);
-	AddItem(List, Counter,"NumVertColors", data->NumVertColors);
-	AddItem(List, Counter,"NumVertInfluences", data->NumVertInfluences);
-	AddItem(List, Counter,"NumDamageStages", data->NumDamageStages);
-	AddItem(List, Counter,"FutureCounts", data->FutureCounts, 5);
-	AddItem(List, Counter,"LODMin", data->LODMin);
-	AddItem(List, Counter,"LODMax", data->LODMax);
-	AddItem(List, Counter,"Min", &data->Min);
-	AddItem(List, Counter,"Max", &data->Max);
-	AddItem(List, Counter,"SphCenter", &data->SphCenter);
-	AddItem(List, Counter,"SphRadius", data->SphRadius);
-	AddItem(List, Counter,"Translation", &data->Translation);
-	AddItem(List, Counter,"Rotation", data->Rotation, 9);
-	AddItem(List, Counter,"MassCenter", &data->MassCenter);
-	AddItem(List, Counter,"Inertia", data->Inertia, 9);
-	AddItem(List, Counter,"Volume", data->Volume);
-	AddItem(List, Counter,"HierarchyTreeName", data->HierarchyTreeName);
-	AddItem(List, Counter,"HierarchyModelName", data->HierarchyModelName);
-	AddItem(List, Counter,"FutureUse", data->FutureUse, 24);
-}
-void ChunkTableClass::List_W3D_CHUNK_VERTICES(ChunkItem *Item, CListCtrl *List) {
+	AddItem(list, Counter,"Version", buf);
+	AddItem(list, Counter,"MeshName", data->MeshName);
+	AddItem(list,Counter,"Attributes",data->Attributes);
+	if (data->Attributes & W3D_MESH_FLAG_COLLISION_BOX)	AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_BOX");
+	if (data->Attributes & W3D_MESH_FLAG_SKIN)	AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_SKIN");
+	if (data->Attributes & W3D_MESH_FLAG_SHADOW)	AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_SHADOW");
+	if (data->Attributes & W3D_MESH_FLAG_ALIGNED)	AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_ALIGNED");
+	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_PHYSICAL)	AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_PHYSICAL");
+	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_PROJECTILE)	AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_PROJECTILE");
+	AddItem(list, Counter,"NumTris", data->NumTris);
+	AddItem(list, Counter,"NumQuads", data->NumQuads);
+	AddItem(list, Counter,"NumSrTris", data->NumSrTris);
+	AddItem(list, Counter,"NumPovQuads", data->NumPovQuads);
+	AddItem(list, Counter,"NumVertices", data->NumVertices);
+	AddItem(list, Counter,"NumNormals", data->NumNormals);
+	AddItem(list, Counter,"NumSrNormals", data->NumSrNormals);
+	AddItem(list, Counter,"NumTexCoords", data->NumTexCoords);
+	AddItem(list, Counter,"NumMaterials", data->NumMaterials);
+	AddItem(list, Counter,"NumVertColors", data->NumVertColors);
+	AddItem(list, Counter,"NumVertInfluences", data->NumVertInfluences);
+	AddItem(list, Counter,"NumDamageStages", data->NumDamageStages);
+	AddItem(list, Counter,"FutureCounts", data->FutureCounts, 5);
+	AddItem(list, Counter,"LODMin", data->LODMin);
+	AddItem(list, Counter,"LODMax", data->LODMax);
+	AddItem(list, Counter,"Min", &data->Min);
+	AddItem(list, Counter,"Max", &data->Max);
+	AddItem(list, Counter,"SphCenter", &data->SphCenter);
+	AddItem(list, Counter,"SphRadius", data->SphRadius);
+	AddItem(list, Counter,"Translation", &data->Translation);
+	AddItem(list, Counter,"Rotation", data->Rotation, 9);
+	AddItem(list, Counter,"MassCenter", &data->MassCenter);
+	AddItem(list, Counter,"Inertia", data->Inertia, 9);
+	AddItem(list, Counter,"Volume", data->Volume);
+	AddItem(list, Counter,"HierarchyTreeName", data->HierarchyTreeName);
+	AddItem(list, Counter,"HierarchyModelName", data->HierarchyModelName);
+	AddItem(list, Counter,"FutureUse", data->FutureUse, 24);
+}
+void ChunkTableClass::List_W3D_CHUNK_VERTICES(ChunkItem *Item, CListCtrl *list) {
 	W3dVectorStruct *data = (W3dVectorStruct *) Item->Data;
 	int Counter = 0;
 	void *max = (char *) Item->Data + Item->Length;
@@ -366,11 +366,11 @@ void ChunkTableClass::List_W3D_CHUNK_VERTICES(ChunkItem *Item, CListCtrl *List)
 	char buf[256];
 	while(data < max) {
 		sprintf(buf, "Vertex[%d]", counter++);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 		data++;
 	}
 }
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_NORMALS(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_NORMALS(ChunkItem *Item, CListCtrl *list) {
 	W3dVectorStruct *data = (W3dVectorStruct *) Item->Data;
 	int Counter = 0;
 	void *max = (char *) Item->Data + Item->Length;
@@ -379,11 +379,11 @@ void ChunkTableClass::List_W3D_CHUNK_VERTEX_NORMALS(ChunkItem *Item, CListCtrl *
 	char buf[256];
 	while(data < max) {
 		sprintf(buf, "Normal[%d]", counter++);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 		data++;
 	}
 }
-void ChunkTableClass::List_W3D_CHUNK_SURRENDER_NORMALS(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_SURRENDER_NORMALS(ChunkItem *Item, CListCtrl *list) {
 	W3dVectorStruct *data = (W3dVectorStruct *) Item->Data;
 	int Counter = 0;
 	void *max = (char *) Item->Data + Item->Length;
@@ -392,12 +392,12 @@ void ChunkTableClass::List_W3D_CHUNK_SURRENDER_NORMALS(ChunkItem *Item, CListCtr
 	char buf[256];
 	while(data < max) {
 		sprintf(buf, "SRNormal[%d]", counter++);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 		data++;
 	}
 }
-void ChunkTableClass::List_W3D_CHUNK_TEXCOORDS(ChunkItem *Item, CListCtrl *List) {
-	
+void ChunkTableClass::List_W3D_CHUNK_TEXCOORDS(ChunkItem *Item, CListCtrl *list) {
+
 	W3dTexCoordStruct *data = (W3dTexCoordStruct *) Item->Data;
 	int Counter = 0;
 	void *max = (char *) Item->Data + Item->Length;
@@ -406,11 +406,11 @@ void ChunkTableClass::List_W3D_CHUNK_TEXCOORDS(ChunkItem *Item, CListCtrl *List)
 	char buf[256];
 	while(data < max) {
 		sprintf(buf, "TexCoord[%d]", counter++);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 		data++;
 	}
 }
-void ChunkTableClass::List_O_W3D_CHUNK_MATERIALS(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_O_W3D_CHUNK_MATERIALS(ChunkItem *Item, CListCtrl *list) {
 
 	W3dMaterialStruct *data = (W3dMaterialStruct *) Item->Data;
 	int Counter = 0;
@@ -421,25 +421,25 @@ void ChunkTableClass::List_O_W3D_CHUNK_MATERIALS(ChunkItem *Item, CListCtrl *Lis
 	while(data < max) {
 
 		sprintf(buf, "Material[%d].MaterialName", counter);
-		AddItem(List, Counter, buf, data->MaterialName);
+		AddItem(list, Counter, buf, data->MaterialName);
 
 		sprintf(buf, "Material[%d].PrimaryName", counter);
-		AddItem(List, Counter, buf, data->PrimaryName);
+		AddItem(list, Counter, buf, data->PrimaryName);
 
 		sprintf(buf, "Material[%d].SecondaryName", counter);
-		AddItem(List, Counter, buf, data->SecondaryName);
+		AddItem(list, Counter, buf, data->SecondaryName);
 
 		sprintf(buf, "Material[%d].RenderFlags", counter);
-		AddItem(List, Counter, buf, data->RenderFlags);
+		AddItem(list, Counter, buf, data->RenderFlags);
 
 		sprintf(buf, "Material[%d].Red", counter);
-		AddItem(List, Counter, buf, data->Red);
+		AddItem(list, Counter, buf, data->Red);
 
 		sprintf(buf, "Material[%d].Green", counter);
-		AddItem(List, Counter, buf, data->Green);
+		AddItem(list, Counter, buf, data->Green);
 
 		sprintf(buf, "Material[%d].Blue", counter);
-		AddItem(List, Counter, buf, data->Blue);
+		AddItem(list, Counter, buf, data->Blue);
 
 		counter++;
 		data++;
@@ -448,16 +448,16 @@ void ChunkTableClass::List_O_W3D_CHUNK_MATERIALS(ChunkItem *Item, CListCtrl *Lis
 }
 
 
-void ChunkTableClass::List_O_W3D_CHUNK_TRIANGLES(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_O_W3D_CHUNK_TRIANGLES(ChunkItem *Item, CListCtrl *list) {
 
 	int Counter = 0;
-	AddItem(List, Counter, "Obsolete structure", "");
+	AddItem(list, Counter, "Obsolete structure", "");
 }
-void ChunkTableClass::List_O_W3D_CHUNK_QUADRANGLES(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_O_W3D_CHUNK_QUADRANGLES(ChunkItem *Item, CListCtrl *list) {
 		int Counter = 0;
-		AddItem(List, Counter, "Outdated structure", "");
+		AddItem(list, Counter, "Outdated structure", "");
 }
-void ChunkTableClass::List_O_W3D_CHUNK_SURRENDER_TRIANGLES(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_O_W3D_CHUNK_SURRENDER_TRIANGLES(ChunkItem *Item, CListCtrl *list) {
 	W3dSurrenderTriStruct *data = (W3dSurrenderTriStruct *) Item->Data;
 	int Counter = 0;
 	void *max = (char *) Item->Data + Item->Length;
@@ -467,41 +467,41 @@ void ChunkTableClass::List_O_W3D_CHUNK_SURRENDER_TRIANGLES(ChunkItem *Item, CLis
 	while(data < max) {
 
 		sprintf(buf, "Triangle[%d].Attributes", counter);
-		AddItem(List, Counter, buf, data->Attributes);
+		AddItem(list, Counter, buf, data->Attributes);
 
 		sprintf(buf, "Triangle[%d].Gouraud", counter);
-		AddItem(List, Counter, buf, data->Gouraud, 3);
+		AddItem(list, Counter, buf, data->Gouraud, 3);
 
 		sprintf(buf, "Triangle[%d].VertexIndices", counter);
-		AddItem(List, Counter, buf, data->Vindex, 3);
+		AddItem(list, Counter, buf, data->Vindex, 3);
 
 		sprintf(buf, "Triangle[%d].MaterialIdx", counter);
-		AddItem(List, Counter, buf, data->MaterialIdx);
+		AddItem(list, Counter, buf, data->MaterialIdx);
 
 		sprintf(buf, "Triangle[%d].Normal", counter);
-		AddItem(List, Counter, buf, &data->Normal);
+		AddItem(list, Counter, buf, &data->Normal);
 
 		sprintf(buf, "Triangle[%d].TexCoord", counter);
-		AddItem(List, Counter, buf, data->TexCoord, 3);
+		AddItem(list, Counter, buf, data->TexCoord, 3);
 
 		counter++;
 		data++;
 	}
 
 }
-void ChunkTableClass::List_O_W3D_CHUNK_POV_TRIANGLES(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_O_W3D_CHUNK_POV_TRIANGLES(ChunkItem *Item, CListCtrl *list) {
 	int Counter = 0;
-	AddItem(List, Counter,"Contact Greg if you need to look at this!", "unsupported");
+	AddItem(list, Counter,"Contact Greg if you need to look at this!", "unsupported");
 }
-void ChunkTableClass::List_O_W3D_CHUNK_POV_QUADRANGLES(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_O_W3D_CHUNK_POV_QUADRANGLES(ChunkItem *Item, CListCtrl *list) {
 	int Counter = 0;
-	AddItem(List, Counter,"Contact Greg if you need to look at this!", "unsupported");
+	AddItem(list, Counter,"Contact Greg if you need to look at this!", "unsupported");
 }
-void ChunkTableClass::List_W3D_CHUNK_MESH_USER_TEXT(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_MESH_USER_TEXT(ChunkItem *Item, CListCtrl *list) {
 	int Counter = 0;
-	AddItem(List, Counter,"UserText", (char *) Item->Data);
+	AddItem(list, Counter,"UserText", (char *) Item->Data);
 }
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_COLORS(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_COLORS(ChunkItem *Item, CListCtrl *list) {
 
 	W3dRGBStruct *data = (W3dRGBStruct *) Item->Data;
 	int Counter = 0;
@@ -513,16 +513,16 @@ void ChunkTableClass::List_W3D_CHUNK_VERTEX_COLORS(ChunkItem *Item, CListCtrl *L
 	int sz = sizeof(W3dRGBStruct);
 
 	while(data < max) {
-	
+
 		sprintf(buf, "Vertex[%d].RGB", counter);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_INFLUENCES(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_INFLUENCES(ChunkItem *Item, CListCtrl *list) {
 
 	W3dVertInfStruct *data = (W3dVertInfStruct *) Item->Data;
 	int Counter = 0;
@@ -531,21 +531,21 @@ void ChunkTableClass::List_W3D_CHUNK_VERTEX_INFLUENCES(ChunkItem *Item, CListCtr
 	int counter = 0;
 	char buf[256];
 	while(data < max) {
-	
+
 		sprintf(buf, "VertexInfluence[%d].BoneIdx", counter);
-		AddItem(List, Counter, buf, data->BoneIdx);
+		AddItem(list, Counter, buf, data->BoneIdx);
 		sprintf(buf, "VertexInfluence[%d].Pad", counter);
-		AddItem(List, Counter, buf, data->Pad, 6);
+		AddItem(list, Counter, buf, data->Pad, 6);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_DAMAGE(ChunkItem *Item, CListCtrl *List) {
-	List_Subitems(Item, List);
+void ChunkTableClass::List_W3D_CHUNK_DAMAGE(ChunkItem *Item, CListCtrl *list) {
+	List_Subitems(Item, list);
 }
-void ChunkTableClass::List_W3D_CHUNK_DAMAGE_HEADER(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_DAMAGE_HEADER(ChunkItem *Item, CListCtrl *list) {
 
 	W3dMeshDamageStruct *data = (W3dMeshDamageStruct *) Item->Data;
 	int Counter = 0;
@@ -554,22 +554,22 @@ void ChunkTableClass::List_W3D_CHUNK_DAMAGE_HEADER(ChunkItem *Item, CListCtrl *L
 	int counter = 0;
 	char buf[256];
 	while(data < max) {
-	
+
 		sprintf(buf, "DamageStruct[%d].NumDamageMaterials", counter);
-		AddItem(List, Counter, buf, data->NumDamageMaterials);
+		AddItem(list, Counter, buf, data->NumDamageMaterials);
 		sprintf(buf, "DamageStruct[%d].NumDamageVerts", counter);
-		AddItem(List, Counter, buf, data->NumDamageVerts);
+		AddItem(list, Counter, buf, data->NumDamageVerts);
 		sprintf(buf, "DamageStruct[%d].NumDamageColors", counter);
-		AddItem(List, Counter, buf, data->NumDamageColors);
+		AddItem(list, Counter, buf, data->NumDamageColors);
 		sprintf(buf, "DamageStruct[%d].DamageIndex", counter);
-		AddItem(List, Counter, buf, data->DamageIndex);
+		AddItem(list, Counter, buf, data->DamageIndex);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_DAMAGE_VERTICES(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_DAMAGE_VERTICES(ChunkItem *Item, CListCtrl *list) {
 
 	W3dMeshDamageVertexStruct *data = (W3dMeshDamageVertexStruct *) Item->Data;
 	int Counter = 0;
@@ -578,19 +578,19 @@ void ChunkTableClass::List_W3D_CHUNK_DAMAGE_VERTICES(ChunkItem *Item, CListCtrl
 	int counter = 0;
 	char buf[256];
 	while(data < max) {
-	
+
 		sprintf(buf, "DamageVertexStruct[%d].VertexIndex", counter);
-		AddItem(List, Counter, buf, data->VertexIndex);
+		AddItem(list, Counter, buf, data->VertexIndex);
 
 		sprintf(buf, "DamageVertexStruct[%d].NewVertex", counter);
-		AddItem(List, Counter, buf, data->VertexIndex);
+		AddItem(list, Counter, buf, data->VertexIndex);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_DAMAGE_COLORS(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_DAMAGE_COLORS(ChunkItem *Item, CListCtrl *list) {
 
 	W3dMeshDamageColorStruct *data = (W3dMeshDamageColorStruct *) Item->Data;
 	int Counter = 0;
@@ -599,19 +599,19 @@ void ChunkTableClass::List_W3D_CHUNK_DAMAGE_COLORS(ChunkItem *Item, CListCtrl *L
 	int counter = 0;
 	char buf[256];
 	while(data < max) {
-	
+
 		sprintf(buf, "DamageColorStruct[%d].VertexIndex", counter);
-		AddItem(List, Counter, buf, data->VertexIndex);
+		AddItem(list, Counter, buf, data->VertexIndex);
 
 		sprintf(buf, "DamageColorStruct[%d].NewColor", counter);
-		AddItem(List, Counter, buf, &data->NewColor);
+		AddItem(list, Counter, buf, &data->NewColor);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_O_W3D_CHUNK_MATERIALS2(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_O_W3D_CHUNK_MATERIALS2(ChunkItem *Item, CListCtrl *list) {
 	W3dMaterial2Struct *data = (W3dMaterial2Struct *) Item->Data;
 	int Counter = 0;
 	void *max = (char *) Item->Data + Item->Length;
@@ -621,34 +621,34 @@ void ChunkTableClass::List_O_W3D_CHUNK_MATERIALS2(ChunkItem *Item, CListCtrl *Li
 	while(data < max) {
 
 		sprintf(buf, "Material[%d].MaterialName", counter);
-		AddItem(List, Counter, buf, data->MaterialName);
+		AddItem(list, Counter, buf, data->MaterialName);
 
 		sprintf(buf, "Material[%d].PrimaryName", counter);
-		AddItem(List, Counter, buf, data->PrimaryName);
+		AddItem(list, Counter, buf, data->PrimaryName);
 
 		sprintf(buf, "Material[%d].SecondaryName", counter);
-		AddItem(List, Counter, buf, data->SecondaryName);
+		AddItem(list, Counter, buf, data->SecondaryName);
 
 		sprintf(buf, "Material[%d].RenderFlags", counter);
-		AddItem(List, Counter, buf, data->RenderFlags);
+		AddItem(list, Counter, buf, data->RenderFlags);
 
 		sprintf(buf, "Material[%d].Red", counter);
-		AddItem(List, Counter, buf, data->Red);
+		AddItem(list, Counter, buf, data->Red);
 
 		sprintf(buf, "Material[%d].Green", counter);
-		AddItem(List, Counter, buf, data->Green);
+		AddItem(list, Counter, buf, data->Green);
 
 		sprintf(buf, "Material[%d].Blue", counter);
-		AddItem(List, Counter, buf, data->Blue);
-	
+		AddItem(list, Counter, buf, data->Blue);
+
 		sprintf(buf, "Material[%d].Alpha", counter);
-		AddItem(List, Counter, buf, data->Alpha);
+		AddItem(list, Counter, buf, data->Alpha);
 
 		sprintf(buf, "Material[%d].PrimaryNumFrames", counter);
-		AddItem(List, Counter, buf, data->PrimaryNumFrames);
+		AddItem(list, Counter, buf, data->PrimaryNumFrames);
 
 		sprintf(buf, "Material[%d].SecondaryNumFrames", counter);
-		AddItem(List, Counter, buf, data->SecondaryNumFrames);
+		AddItem(list, Counter, buf, data->SecondaryNumFrames);
 
 		counter++;
 		data++;
@@ -656,145 +656,145 @@ void ChunkTableClass::List_O_W3D_CHUNK_MATERIALS2(ChunkItem *Item, CListCtrl *Li
 
 }
 
-void ChunkTableClass::List_W3D_CHUNK_MATERIALS3(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_MATERIALS3(ChunkItem *Item, CListCtrl *list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_MATERIAL3(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_MATERIAL3(ChunkItem *Item, CListCtrl *list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_MATERIAL3_NAME(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_MATERIAL3_NAME(ChunkItem *Item, CListCtrl *list)
 {
 	int Counter = 0;
 	char * data = (char *)Item->Data;
-	AddItem(List, Counter,"Material Name:", data);
+	AddItem(list, Counter,"Material Name:", data);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_MATERIAL3_INFO(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_MATERIAL3_INFO(ChunkItem *Item, CListCtrl *list)
 {
 	int Counter = 0;
 	W3dMaterial3Struct *data = (W3dMaterial3Struct *) Item->Data;
-	AddItem(List,Counter,"Attributes",data->Attributes);
-	if (data->Attributes & W3DMATERIAL_USE_ALPHA) AddItem(List,Counter,"Attributes","W3DMATERIAL_USE_ALPHA");
-	if (data->Attributes & W3DMATERIAL_USE_SORTING) AddItem(List,Counter,"Attributes","W3DMATERIAL_USE_SORTING");
-	if (data->Attributes & W3DMATERIAL_HINT_DIT_OVER_DCT) AddItem(List,Counter,"Attributes","W3DMATERIAL_HINT_DIT_OVER_DCT");
-	if (data->Attributes & W3DMATERIAL_HINT_SIT_OVER_SCT) AddItem(List,Counter,"Attributes","W3DMATERIAL_HINT_SIT_OVER_SCT");
-	if (data->Attributes & W3DMATERIAL_HINT_DIT_OVER_DIG) AddItem(List,Counter,"Attributes","W3DMATERIAL_HINT_DIT_OVER_DIG");
-	if (data->Attributes & W3DMATERIAL_HINT_SIT_OVER_SIG) AddItem(List,Counter,"Attributes","W3DMATERIAL_HINT_SIT_OVER_SIG");
-	if (data->Attributes & W3DMATERIAL_HINT_FAST_SPECULAR_AFTER_ALPHA) AddItem(List,Counter,"Attributes","W3DMATERIAL_HINT_FAST_SPECULAR_AFTER_ALPHA");
-	if (data->Attributes & W3DMATERIAL_PSX_TRANS_100) AddItem(List,Counter,"Attributes","W3DMATERIAL_PSX_TRANS_100");
-	if (data->Attributes & W3DMATERIAL_PSX_TRANS_50) AddItem(List,Counter,"Attributes","W3DMATERIAL_PSX_TRANS_50");
-	if (data->Attributes & W3DMATERIAL_PSX_TRANS_25) AddItem(List,Counter,"Attributes","W3DMATERIAL_PSX_TRANS_25");
-	if (data->Attributes & W3DMATERIAL_PSX_TRANS_MINUS_100) AddItem(List,Counter,"Attributes","W3DMATERIAL_PSX_TRANS_MINUS_100");
-	if (data->Attributes & W3DMATERIAL_PSX_NO_RT_LIGHTING) AddItem(List,Counter,"Attributes","W3DMATERIAL_PSX_NO_RT_LIGHTING");
-	AddItem(List, Counter,"Diffuse Color", &data->DiffuseColor);
-	AddItem(List, Counter,"Specular Color", &data->SpecularColor);
-	AddItem(List, Counter,"Emissive Coefficients", &data->EmissiveCoefficients);
-	AddItem(List, Counter,"Ambient Coefficients", &data->AmbientCoefficients);
-	AddItem(List, Counter,"Diffuse Coefficients", &data->DiffuseCoefficients);
-	AddItem(List, Counter,"Specular Coefficients", &data->SpecularCoefficients);
-	AddItem(List, Counter,"Shininess", data->Shininess);
-	AddItem(List, Counter,"Opacity", data->Opacity);
-	AddItem(List, Counter,"Translucency", data->Translucency);
-	AddItem(List, Counter,"Fog Coefficient", data->FogCoeff);
-}
-
-void ChunkTableClass::List_W3D_CHUNK_MAP3_FILENAME(ChunkItem * Item,CListCtrl * List)
+	AddItem(list,Counter,"Attributes",data->Attributes);
+	if (data->Attributes & W3DMATERIAL_USE_ALPHA) AddItem(list,Counter,"Attributes","W3DMATERIAL_USE_ALPHA");
+	if (data->Attributes & W3DMATERIAL_USE_SORTING) AddItem(list,Counter,"Attributes","W3DMATERIAL_USE_SORTING");
+	if (data->Attributes & W3DMATERIAL_HINT_DIT_OVER_DCT) AddItem(list,Counter,"Attributes","W3DMATERIAL_HINT_DIT_OVER_DCT");
+	if (data->Attributes & W3DMATERIAL_HINT_SIT_OVER_SCT) AddItem(list,Counter,"Attributes","W3DMATERIAL_HINT_SIT_OVER_SCT");
+	if (data->Attributes & W3DMATERIAL_HINT_DIT_OVER_DIG) AddItem(list,Counter,"Attributes","W3DMATERIAL_HINT_DIT_OVER_DIG");
+	if (data->Attributes & W3DMATERIAL_HINT_SIT_OVER_SIG) AddItem(list,Counter,"Attributes","W3DMATERIAL_HINT_SIT_OVER_SIG");
+	if (data->Attributes & W3DMATERIAL_HINT_FAST_SPECULAR_AFTER_ALPHA) AddItem(list,Counter,"Attributes","W3DMATERIAL_HINT_FAST_SPECULAR_AFTER_ALPHA");
+	if (data->Attributes & W3DMATERIAL_PSX_TRANS_100) AddItem(list,Counter,"Attributes","W3DMATERIAL_PSX_TRANS_100");
+	if (data->Attributes & W3DMATERIAL_PSX_TRANS_50) AddItem(list,Counter,"Attributes","W3DMATERIAL_PSX_TRANS_50");
+	if (data->Attributes & W3DMATERIAL_PSX_TRANS_25) AddItem(list,Counter,"Attributes","W3DMATERIAL_PSX_TRANS_25");
+	if (data->Attributes & W3DMATERIAL_PSX_TRANS_MINUS_100) AddItem(list,Counter,"Attributes","W3DMATERIAL_PSX_TRANS_MINUS_100");
+	if (data->Attributes & W3DMATERIAL_PSX_NO_RT_LIGHTING) AddItem(list,Counter,"Attributes","W3DMATERIAL_PSX_NO_RT_LIGHTING");
+	AddItem(list, Counter,"Diffuse Color", &data->DiffuseColor);
+	AddItem(list, Counter,"Specular Color", &data->SpecularColor);
+	AddItem(list, Counter,"Emissive Coefficients", &data->EmissiveCoefficients);
+	AddItem(list, Counter,"Ambient Coefficients", &data->AmbientCoefficients);
+	AddItem(list, Counter,"Diffuse Coefficients", &data->DiffuseCoefficients);
+	AddItem(list, Counter,"Specular Coefficients", &data->SpecularCoefficients);
+	AddItem(list, Counter,"Shininess", data->Shininess);
+	AddItem(list, Counter,"Opacity", data->Opacity);
+	AddItem(list, Counter,"Translucency", data->Translucency);
+	AddItem(list, Counter,"Fog Coefficient", data->FogCoeff);
+}
+
+void ChunkTableClass::List_W3D_CHUNK_MAP3_FILENAME(ChunkItem * Item,CListCtrl * list)
 {
 	int Counter = 0;
 	char * data = (char *)Item->Data;
-	AddItem(List, Counter, "Texture Filename:", data);
+	AddItem(list, Counter, "Texture Filename:", data);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_MAP3_INFO(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_MAP3_INFO(ChunkItem * Item,CListCtrl * list)
 {
 	int Counter = 0;
 	W3dMap3Struct * data = (W3dMap3Struct *)Item->Data;
 
-	AddItem(List, Counter, "Mapping Type",data->MappingType);
-	AddItem(List, Counter, "Frame Count",data->FrameCount);
-	AddItem(List, Counter, "Frame Rate",data->FrameRate);
+	AddItem(list, Counter, "Mapping Type",data->MappingType);
+	AddItem(list, Counter, "Frame Count",data->FrameCount);
+	AddItem(list, Counter, "Frame Rate",data->FrameRate);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_MATERIAL3_DC_MAP(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_MATERIAL3_DC_MAP(ChunkItem *Item, CListCtrl *list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_MATERIAL3_DI_MAP(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_MATERIAL3_DI_MAP(ChunkItem *Item, CListCtrl *list)
 {
-	List_Subitems(Item,List);
+	List_Subitems(Item,list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_MATERIAL3_SC_MAP(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_MATERIAL3_SC_MAP(ChunkItem *Item, CListCtrl *list)
 {
-	List_Subitems(Item,List);
+	List_Subitems(Item,list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_MATERIAL3_SI_MAP(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_MATERIAL3_SI_MAP(ChunkItem *Item, CListCtrl *list)
 {
-	List_Subitems(Item,List);
+	List_Subitems(Item,list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_MESH_HEADER3(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_MESH_HEADER3(ChunkItem *Item, CListCtrl *list) {
 
 	W3dMeshHeader3Struct *data = (W3dMeshHeader3Struct *) Item->Data;
 	int Counter = 0;
 
 	char buf[64];
 	sprintf(buf,"%d.%d",W3D_GET_MAJOR_VERSION(data->Version),W3D_GET_MINOR_VERSION(data->Version));
-	AddItem(List, Counter,"Version", buf);
-	AddItem(List, Counter,"MeshName", data->MeshName);
-	AddItem(List, Counter,"ContainerName", data->ContainerName);
-	AddItem(List, Counter,"Attributes",data->Attributes);
+	AddItem(list, Counter,"Version", buf);
+	AddItem(list, Counter,"MeshName", data->MeshName);
+	AddItem(list, Counter,"ContainerName", data->ContainerName);
+	AddItem(list, Counter,"Attributes",data->Attributes);
 	switch(data->Attributes & W3D_MESH_FLAG_GEOMETRY_TYPE_MASK)
 	{
 		case W3D_MESH_FLAG_GEOMETRY_TYPE_NORMAL:
-			AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_GEOMETRY_TYPE_NORMAL_MESH","flag");
+			AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_GEOMETRY_TYPE_NORMAL_MESH","flag");
 			break;
 		case W3D_MESH_FLAG_GEOMETRY_TYPE_CAMERA_ALIGNED:
-			AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_GEOMETRY_TYPE_CAMERA_ALIGNED","flag");
+			AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_GEOMETRY_TYPE_CAMERA_ALIGNED","flag");
 			break;
 		case W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN:
-			AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN","flag");
+			AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_GEOMETRY_TYPE_SKIN","flag");
 			break;
 		case W3D_MESH_FLAG_GEOMETRY_TYPE_AABOX:
-			AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_GEOMETRY_TYPE_AABOX","flag");
+			AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_GEOMETRY_TYPE_AABOX","flag");
 			break;
 		case W3D_MESH_FLAG_GEOMETRY_TYPE_OBBOX:
-			AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_GEOMETRY_TYPE_OBBOX","flag");
+			AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_GEOMETRY_TYPE_OBBOX","flag");
 			break;
 	};
-	
-	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_PHYSICAL)	AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_PHYSICAL","flag");
-	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_PROJECTILE)	AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_PROJECTILE","flag");
-	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_VIS)	AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_VIS","flag");
-	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_CAMERA)	AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_CAMERA","flag");
-	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_VEHICLE)	AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_VEHICLE","flag");
-
-	if (data->Attributes & W3D_MESH_FLAG_HIDDEN) AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_HIDDEN","flag");
-	if (data->Attributes & W3D_MESH_FLAG_TWO_SIDED) AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_TWO_SIDED","flag");
-	if (data->Attributes & W3D_MESH_FLAG_CAST_SHADOW) AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_CAST_SHADOW");
-	if (data->Attributes & W3D_MESH_FLAG_SHATTERABLE) AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_SHATTERABLE");
-	if (data->Attributes & W3D_MESH_FLAG_NPATCHABLE) AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_NPATCHABLE");
-
-	if (data->Attributes & W3D_MESH_FLAG_PRELIT_UNLIT) AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_PRELIT_UNLIT","flag");
-	if (data->Attributes & W3D_MESH_FLAG_PRELIT_VERTEX) AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_PRELIT_VERTEX","flag");
-	if (data->Attributes & W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_PASS) AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_PASS","flag");
-	if (data->Attributes & W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_TEXTURE) AddItem(List, Counter,"Attributes", "W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_TEXTURE","flag");
-
-	AddItem(List, Counter,"NumTris", data->NumTris);
-	AddItem(List, Counter,"NumVertices", data->NumVertices);
-	AddItem(List, Counter,"NumMaterials", data->NumMaterials);
-	AddItem(List, Counter,"NumDamageStages", data->NumDamageStages);
-	
+
+	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_PHYSICAL)	AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_PHYSICAL","flag");
+	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_PROJECTILE)	AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_PROJECTILE","flag");
+	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_VIS)	AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_VIS","flag");
+	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_CAMERA)	AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_CAMERA","flag");
+	if (data->Attributes & W3D_MESH_FLAG_COLLISION_TYPE_VEHICLE)	AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_COLLISION_TYPE_VEHICLE","flag");
+
+	if (data->Attributes & W3D_MESH_FLAG_HIDDEN) AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_HIDDEN","flag");
+	if (data->Attributes & W3D_MESH_FLAG_TWO_SIDED) AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_TWO_SIDED","flag");
+	if (data->Attributes & W3D_MESH_FLAG_CAST_SHADOW) AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_CAST_SHADOW");
+	if (data->Attributes & W3D_MESH_FLAG_SHATTERABLE) AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_SHATTERABLE");
+	if (data->Attributes & W3D_MESH_FLAG_NPATCHABLE) AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_NPATCHABLE");
+
+	if (data->Attributes & W3D_MESH_FLAG_PRELIT_UNLIT) AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_PRELIT_UNLIT","flag");
+	if (data->Attributes & W3D_MESH_FLAG_PRELIT_VERTEX) AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_PRELIT_VERTEX","flag");
+	if (data->Attributes & W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_PASS) AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_PASS","flag");
+	if (data->Attributes & W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_TEXTURE) AddItem(list, Counter,"Attributes", "W3D_MESH_FLAG_PRELIT_LIGHTMAP_MULTI_TEXTURE","flag");
+
+	AddItem(list, Counter,"NumTris", data->NumTris);
+	AddItem(list, Counter,"NumVertices", data->NumVertices);
+	AddItem(list, Counter,"NumMaterials", data->NumMaterials);
+	AddItem(list, Counter,"NumDamageStages", data->NumDamageStages);
+
 	if (data->SortLevel == SORT_LEVEL_NONE) {
-		AddItem(List, Counter, "SortLevel", "NONE");
+		AddItem(list, Counter, "SortLevel", "NONE");
 	} else {
-		AddItem(List, Counter, "SortLevel", (uint8)data->SortLevel);
+		AddItem(list, Counter, "SortLevel", (uint8)data->SortLevel);
 	}
 
 	if ((data->Attributes & W3D_MESH_FLAG_PRELIT_MASK) != 0x0) {
@@ -803,47 +803,47 @@ void ChunkTableClass::List_W3D_CHUNK_MESH_HEADER3(ChunkItem *Item, CListCtrl *Li
 		} else {
 			sprintf (buf, "UNKNOWN");
 		}
-	} else {	  
+	} else {
 		sprintf (buf, "N/A");
 	}
-	AddItem (List, Counter, "PrelitVersion", buf);
+	AddItem (list, Counter, "PrelitVersion", buf);
 
-	AddItem(List, Counter, "FutureCounts", data->FutureCounts, 1);
-	AddItem(List, Counter, "VertexChannels", data->VertexChannels);
-	if (data->VertexChannels & W3D_VERTEX_CHANNEL_LOCATION) AddItem(List,Counter,"VertexChannels","W3D_VERTEX_CHANNEL_LOCATION","flag");
-	if (data->VertexChannels & W3D_VERTEX_CHANNEL_NORMAL) AddItem(List,Counter,"VertexChannels","W3D_VERTEX_CHANNEL_NORMAL","flag");
-	if (data->VertexChannels & W3D_VERTEX_CHANNEL_TEXCOORD) AddItem(List,Counter,"VertexChannels","W3D_VERTEX_CHANNEL_TEXCOORD","flag");
-	if (data->VertexChannels & W3D_VERTEX_CHANNEL_COLOR) AddItem(List,Counter,"VertexChannels","W3D_VERTEX_CHANNEL_COLOR","flag");
-	if (data->VertexChannels & W3D_VERTEX_CHANNEL_BONEID) AddItem(List,Counter,"VertexChannels","W3D_VERTEX_CHANNEL_BONEID","flag");
-	AddItem(List, Counter,"FaceChannels", data->FaceChannels);
-	if (data->FaceChannels & W3D_FACE_CHANNEL_FACE) AddItem(List,Counter,"FaceChannels","W3D_FACE_CHANNEL_FACE","flag");
-	AddItem(List, Counter,"Min", &data->Min);
-	AddItem(List, Counter,"Max", &data->Max);
-	AddItem(List, Counter,"SphCenter", &data->SphCenter);
-	AddItem(List, Counter,"SphRadius", data->SphRadius);
+	AddItem(list, Counter, "FutureCounts", data->FutureCounts, 1);
+	AddItem(list, Counter, "VertexChannels", data->VertexChannels);
+	if (data->VertexChannels & W3D_VERTEX_CHANNEL_LOCATION) AddItem(list,Counter,"VertexChannels","W3D_VERTEX_CHANNEL_LOCATION","flag");
+	if (data->VertexChannels & W3D_VERTEX_CHANNEL_NORMAL) AddItem(list,Counter,"VertexChannels","W3D_VERTEX_CHANNEL_NORMAL","flag");
+	if (data->VertexChannels & W3D_VERTEX_CHANNEL_TEXCOORD) AddItem(list,Counter,"VertexChannels","W3D_VERTEX_CHANNEL_TEXCOORD","flag");
+	if (data->VertexChannels & W3D_VERTEX_CHANNEL_COLOR) AddItem(list,Counter,"VertexChannels","W3D_VERTEX_CHANNEL_COLOR","flag");
+	if (data->VertexChannels & W3D_VERTEX_CHANNEL_BONEID) AddItem(list,Counter,"VertexChannels","W3D_VERTEX_CHANNEL_BONEID","flag");
+	AddItem(list, Counter,"FaceChannels", data->FaceChannels);
+	if (data->FaceChannels & W3D_FACE_CHANNEL_FACE) AddItem(list,Counter,"FaceChannels","W3D_FACE_CHANNEL_FACE","flag");
+	AddItem(list, Counter,"Min", &data->Min);
+	AddItem(list, Counter,"Max", &data->Max);
+	AddItem(list, Counter,"SphCenter", &data->SphCenter);
+	AddItem(list, Counter,"SphRadius", data->SphRadius);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_TRIANGLES(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_TRIANGLES(ChunkItem *Item, CListCtrl *list) {
 	W3dTriStruct *data = (W3dTriStruct *) Item->Data;
 	int Counter = 0;
 	void *max = (char *) Item->Data + Item->Length;
 	assert(Item->Length % sizeof(W3dTriStruct) == 0);
-	
+
 	int counter = 0;
 	char buf[256];
 	while(data < max) {
 
 		sprintf(buf, "Triangle[%d].VertexIndices", counter);
-		AddItem(List, Counter, buf, data->Vindex, 3);
+		AddItem(list, Counter, buf, data->Vindex, 3);
 
 		sprintf(buf, "Triangle[%d].Attributes", counter);
-		AddItem(List, Counter, buf, data->Attributes);
+		AddItem(list, Counter, buf, data->Attributes);
 
 		sprintf(buf, "Triangle[%d].Normal", counter);
-		AddItem(List, Counter, buf, &data->Normal);
+		AddItem(list, Counter, buf, &data->Normal);
 
 		sprintf(buf, "Triangle[%d].Dist", counter);
-		AddItem(List, Counter, buf, data->Dist);
+		AddItem(list, Counter, buf, data->Dist);
 
 		counter++;
 		data++;
@@ -851,7 +851,7 @@ void ChunkTableClass::List_W3D_CHUNK_TRIANGLES(ChunkItem *Item, CListCtrl *List)
 
 }
 
-void ChunkTableClass::List_W3D_CHUNK_PER_TRI_MATERIALS(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_PER_TRI_MATERIALS(ChunkItem * Item,CListCtrl *list)
 {
 	unsigned short *data = (unsigned short *) Item->Data;
 	int Counter = 0;
@@ -862,149 +862,149 @@ void ChunkTableClass::List_W3D_CHUNK_PER_TRI_MATERIALS(ChunkItem * Item,CListCtr
 
 	while(data < max) {
 		sprintf(buf, "Triangle[%d].MaterialIdx", counter);
-		AddItem(List, Counter, buf, *data);
+		AddItem(list, Counter, buf, *data);
 		counter++;
 		data++;
 	}
 }
 
 
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_SHADE_INDICES(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_SHADE_INDICES(ChunkItem * Item,CListCtrl *list)
 {
 	uint32 * data = (uint32 *) Item->Data;
 	int Counter = 0;
 	void *max = (char *) Item->Data + Item->Length;
 	assert(Item->Length % sizeof(uint32) == 0);
 	int counter = 0;
-	
+
 	char buf[256];
 	while(data < max) {
 		sprintf(buf, "Index[%d]", counter);
-		AddItem(List, Counter, buf, *data);
+		AddItem(list, Counter, buf, *data);
 		counter++;
 		data++;
 	}
 }
 
-void	ChunkTableClass::List_W3D_CHUNK_MATERIAL_INFO(ChunkItem * Item,CListCtrl *List)
+void	ChunkTableClass::List_W3D_CHUNK_MATERIAL_INFO(ChunkItem * Item,CListCtrl *list)
 {
 	W3dMaterialInfoStruct * matinfo = (W3dMaterialInfoStruct *)Item->Data;
 	int counter = 0;
 
-	AddItem(List, counter,"PassCount", matinfo->PassCount);
-	AddItem(List, counter,"VertexMaterialCount", matinfo->VertexMaterialCount);
-	AddItem(List, counter,"ShaderCount", matinfo->ShaderCount);
-	AddItem(List, counter,"TextureCount",matinfo->TextureCount);
+	AddItem(list, counter,"PassCount", matinfo->PassCount);
+	AddItem(list, counter,"VertexMaterialCount", matinfo->VertexMaterialCount);
+	AddItem(list, counter,"ShaderCount", matinfo->ShaderCount);
+	AddItem(list, counter,"TextureCount",matinfo->TextureCount);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_MATERIALS(ChunkItem *Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_MATERIALS(ChunkItem *Item,CListCtrl *list)
 {
-	List_Subitems(Item,List);
+	List_Subitems(Item,list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_MATERIAL(ChunkItem *Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_MATERIAL(ChunkItem *Item,CListCtrl *list)
 {
-	List_Subitems(Item,List);
+	List_Subitems(Item,list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_MATERIAL_NAME(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_MATERIAL_NAME(ChunkItem * Item,CListCtrl *list)
 {
 	int Counter = 0;
 	char * data = (char *)Item->Data;
-	AddItem(List, Counter,"Material Name:", data);
+	AddItem(list, Counter,"Material Name:", data);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_MATERIAL_INFO(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_MATERIAL_INFO(ChunkItem * Item,CListCtrl *list)
 {
 	W3dVertexMaterialStruct *data = (W3dVertexMaterialStruct *)Item->Data;
 	int Counter = 0;
 
-	if (data->Attributes & W3DVERTMAT_USE_DEPTH_CUE)				AddItem (List, Counter, "Material.Attributes", "W3DVERTMAT_USE_DEPTH_CUE", "flag");
-	if (data->Attributes & W3DVERTMAT_ARGB_EMISSIVE_ONLY)			AddItem (List, Counter, "Material.Attributes", "W3DVERTMAT_ARGB_EMISSIVE_ONLY", "flag");
-	if (data->Attributes & W3DVERTMAT_COPY_SPECULAR_TO_DIFFUSE)	AddItem (List, Counter, "Material.Attributes", "W3DVERTMAT_COPY_SPECULAR_TO_DIFFUSE", "flag");
-	if (data->Attributes & W3DVERTMAT_DEPTH_CUE_TO_ALPHA)			AddItem (List, Counter, "Material.Attributes", "W3DVERTMAT_DEPTH_CUE_TO_ALPHA", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_UV)						AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_UV", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_ENVIRONMENT)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_ENVIRONMENT", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_CHEAP_ENVIRONMENT)	AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_CHEAP_ENVIRONMENT", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_SCREEN)					AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_SCREEN", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_LINEAR_OFFSET)		AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_LINEAR_OFFSET", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_SILHOUETTE)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_SILHOUETTE", "flag");
-
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_SCALE)							AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_SCALE", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_GRID)							AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_GRID", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_ROTATE)							AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_ROTATE", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_SINE_LINEAR_OFFSET)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_SINE_LINEAR_OFFSET", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_STEP_LINEAR_OFFSET)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_STEP_LINEAR_OFFSET", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_ZIGZAG_LINEAR_OFFSET)		AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_ZIGZAG_LINEAR_OFFSET", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_WS_CLASSIC_ENV)				AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_WS_CLASSIC_ENV", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_WS_ENVIRONMENT)				AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_WS_ENVIRONMENT", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_GRID_CLASSIC_ENV)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_GRID_CLASSIC_ENV", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_GRID_ENVIRONMENT)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_GRID_ENVIRONMENT", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_RANDOM)							AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_RANDOM", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_BUMPENV)						AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_BUMPENV", "flag");
-
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_UV)						AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_UV", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_ENVIRONMENT)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_ENVIRONMENT", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_CHEAP_ENVIRONMENT)	AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_CHEAP_ENVIRONMENT", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_SCREEN)					AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_SCREEN", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_LINEAR_OFFSET)		AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_LINEAR_OFFSET", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_SILHOUETTE)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_SILHOUETTE", "flag");
-
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_SCALE)							AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_SCALE", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_GRID)							AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_GRID", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_ROTATE)							AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_ROTATE", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_SINE_LINEAR_OFFSET)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_SINE_LINEAR_OFFSET", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_STEP_LINEAR_OFFSET)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_STEP_LINEAR_OFFSET", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_ZIGZAG_LINEAR_OFFSET)		AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_ZIGZAG_LINEAR_OFFSET", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_WS_CLASSIC_ENV)				AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_WS_CLASSIC_ENV", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_WS_ENVIRONMENT)				AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_WS_ENVIRONMENT", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_GRID_CLASSIC_ENV)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_GRID_CLASSIC_ENV", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_GRID_ENVIRONMENT)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_GRID_ENVIRONMENT", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_RANDOM)							AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_RANDOM", "flag");
-	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_BUMPENV)						AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_BUMPENV", "flag");
+	if (data->Attributes & W3DVERTMAT_USE_DEPTH_CUE)				AddItem (list, Counter, "Material.Attributes", "W3DVERTMAT_USE_DEPTH_CUE", "flag");
+	if (data->Attributes & W3DVERTMAT_ARGB_EMISSIVE_ONLY)			AddItem (list, Counter, "Material.Attributes", "W3DVERTMAT_ARGB_EMISSIVE_ONLY", "flag");
+	if (data->Attributes & W3DVERTMAT_COPY_SPECULAR_TO_DIFFUSE)	AddItem (list, Counter, "Material.Attributes", "W3DVERTMAT_COPY_SPECULAR_TO_DIFFUSE", "flag");
+	if (data->Attributes & W3DVERTMAT_DEPTH_CUE_TO_ALPHA)			AddItem (list, Counter, "Material.Attributes", "W3DVERTMAT_DEPTH_CUE_TO_ALPHA", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_UV)						AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_UV", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_ENVIRONMENT)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_ENVIRONMENT", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_CHEAP_ENVIRONMENT)	AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_CHEAP_ENVIRONMENT", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_SCREEN)					AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_SCREEN", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_LINEAR_OFFSET)		AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_LINEAR_OFFSET", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_SILHOUETTE)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_SILHOUETTE", "flag");
+
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_SCALE)							AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_SCALE", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_GRID)							AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_GRID", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_ROTATE)							AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_ROTATE", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_SINE_LINEAR_OFFSET)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_SINE_LINEAR_OFFSET", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_STEP_LINEAR_OFFSET)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_STEP_LINEAR_OFFSET", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_ZIGZAG_LINEAR_OFFSET)		AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_ZIGZAG_LINEAR_OFFSET", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_WS_CLASSIC_ENV)				AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_WS_CLASSIC_ENV", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_WS_ENVIRONMENT)				AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_WS_ENVIRONMENT", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_GRID_CLASSIC_ENV)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_GRID_CLASSIC_ENV", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_GRID_ENVIRONMENT)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_GRID_ENVIRONMENT", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_RANDOM)							AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_RANDOM", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE0_MAPPING_MASK) == W3DVERTMAT_STAGE0_MAPPING_BUMPENV)						AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE0_MAPPING_BUMPENV", "flag");
+
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_UV)						AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_UV", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_ENVIRONMENT)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_ENVIRONMENT", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_CHEAP_ENVIRONMENT)	AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_CHEAP_ENVIRONMENT", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_SCREEN)					AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_SCREEN", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_LINEAR_OFFSET)		AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_LINEAR_OFFSET", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_SILHOUETTE)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_SILHOUETTE", "flag");
+
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_SCALE)							AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_SCALE", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_GRID)							AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_GRID", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_ROTATE)							AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_ROTATE", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_SINE_LINEAR_OFFSET)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_SINE_LINEAR_OFFSET", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_STEP_LINEAR_OFFSET)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_STEP_LINEAR_OFFSET", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_ZIGZAG_LINEAR_OFFSET)		AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_ZIGZAG_LINEAR_OFFSET", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_WS_CLASSIC_ENV)				AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_WS_CLASSIC_ENV", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_WS_ENVIRONMENT)				AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_WS_ENVIRONMENT", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_GRID_CLASSIC_ENV)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_GRID_CLASSIC_ENV", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_GRID_ENVIRONMENT)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_GRID_ENVIRONMENT", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_RANDOM)							AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_RANDOM", "flag");
+	if ((data->Attributes & W3DVERTMAT_STAGE1_MAPPING_MASK) == W3DVERTMAT_STAGE1_MAPPING_BUMPENV)						AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_STAGE1_MAPPING_BUMPENV", "flag");
 
 	if (data->Attributes & W3DVERTMAT_PSX_MASK) {
 		if (data->Attributes & W3DVERTMAT_PSX_NO_RT_LIGHTING) {
-			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_PSX_NO_RT_LIGHTING", "flag");
+			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_PSX_NO_RT_LIGHTING", "flag");
 		}
 		else {
-			if ((data->Attributes & W3DVERTMAT_PSX_TRANS_MASK) == W3DVERTMAT_PSX_TRANS_NONE)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_PSX_TRANS_NONE", "flag");
-			if ((data->Attributes & W3DVERTMAT_PSX_TRANS_MASK) == W3DVERTMAT_PSX_TRANS_100)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_PSX_TRANS_100", "flag");
-			if ((data->Attributes & W3DVERTMAT_PSX_TRANS_MASK) == W3DVERTMAT_PSX_TRANS_50)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_PSX_TRANS_50", "flag");
-			if ((data->Attributes & W3DVERTMAT_PSX_TRANS_MASK) == W3DVERTMAT_PSX_TRANS_25)			AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_PSX_TRANS_25", "flag");
-			if ((data->Attributes & W3DVERTMAT_PSX_TRANS_MASK) == W3DVERTMAT_PSX_TRANS_MINUS_100)	AddItem(List, Counter, "Material.Attributes", "W3DVERTMAT_PSX_TRANS_MINUS_100", "flag");
+			if ((data->Attributes & W3DVERTMAT_PSX_TRANS_MASK) == W3DVERTMAT_PSX_TRANS_NONE)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_PSX_TRANS_NONE", "flag");
+			if ((data->Attributes & W3DVERTMAT_PSX_TRANS_MASK) == W3DVERTMAT_PSX_TRANS_100)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_PSX_TRANS_100", "flag");
+			if ((data->Attributes & W3DVERTMAT_PSX_TRANS_MASK) == W3DVERTMAT_PSX_TRANS_50)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_PSX_TRANS_50", "flag");
+			if ((data->Attributes & W3DVERTMAT_PSX_TRANS_MASK) == W3DVERTMAT_PSX_TRANS_25)			AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_PSX_TRANS_25", "flag");
+			if ((data->Attributes & W3DVERTMAT_PSX_TRANS_MASK) == W3DVERTMAT_PSX_TRANS_MINUS_100)	AddItem(list, Counter, "Material.Attributes", "W3DVERTMAT_PSX_TRANS_MINUS_100", "flag");
 		}
 	}
- 
-	AddItem(List, Counter, "Material.Attributes", data->Attributes);
-	AddItem(List, Counter, "Material.Ambient", &(data->Ambient));
-	AddItem(List, Counter, "Material.Diffuse", &(data->Diffuse));
-	AddItem(List, Counter, "Material.Specular", &(data->Specular));
-	AddItem(List, Counter, "Material.Emissive", &(data->Emissive));
-	AddItem(List, Counter, "Material.Shininess", data->Shininess);
-	AddItem(List, Counter, "Material.Opacity", data->Opacity);
-	AddItem(List, Counter, "Material.Translucency", data->Translucency);
+
+	AddItem(list, Counter, "Material.Attributes", data->Attributes);
+	AddItem(list, Counter, "Material.Ambient", &(data->Ambient));
+	AddItem(list, Counter, "Material.Diffuse", &(data->Diffuse));
+	AddItem(list, Counter, "Material.Specular", &(data->Specular));
+	AddItem(list, Counter, "Material.Emissive", &(data->Emissive));
+	AddItem(list, Counter, "Material.Shininess", data->Shininess);
+	AddItem(list, Counter, "Material.Opacity", data->Opacity);
+	AddItem(list, Counter, "Material.Translucency", data->Translucency);
 
 }
 
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_MAPPER_ARGS0(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_MAPPER_ARGS0(ChunkItem *Item, CListCtrl *list)
 {
 	int Counter = 0;
 	char * data = (char *)Item->Data;
-	AddItem(List, Counter, "Stage0 Mapper Args:", data);
+	AddItem(list, Counter, "Stage0 Mapper Args:", data);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_MAPPER_ARGS1(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_MAPPER_ARGS1(ChunkItem *Item, CListCtrl *list)
 {
 	int Counter = 0;
 	char * data = (char *)Item->Data;
-	AddItem(List, Counter, "Stage1 Mapper Args:", data);
+	AddItem(list, Counter, "Stage1 Mapper Args:", data);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_SHADERS(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_SHADERS(ChunkItem * Item,CListCtrl *list)
 {
 	W3dShaderStruct *shader = (W3dShaderStruct *)Item->Data;
-	
+
 	void *max = (char *)Item->Data + Item->Length;
 	assert(Item->Length % sizeof(W3dShaderStruct) == 0);
 	int counter = 0;
@@ -1013,13 +1013,13 @@ void ChunkTableClass::List_W3D_CHUNK_SHADERS(ChunkItem * Item,CListCtrl *List)
 	while(shader < max) {
 		sprintf(label,"shader[%d]",counter);
 		int counter2 = 0;
-		AddItem(List,counter2,label,shader);
+		AddItem(list,counter2,label,shader);
 		counter++;
 		shader++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_TANGENTS(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_TANGENTS(ChunkItem *Item, CListCtrl *list) {
 	W3dVectorStruct *data = (W3dVectorStruct *) Item->Data;
 	int Counter = 0;
 	void *max = (char *) Item->Data + Item->Length;
@@ -1028,12 +1028,12 @@ void ChunkTableClass::List_W3D_CHUNK_VERTEX_TANGENTS(ChunkItem *Item, CListCtrl
 	char buf[256];
 	while(data < max) {
 		sprintf(buf, "Tangent[%d]", counter++);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_BINORMALS(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_BINORMALS(ChunkItem *Item, CListCtrl *list) {
 	W3dVectorStruct *data = (W3dVectorStruct *) Item->Data;
 	int Counter = 0;
 	void *max = (char *) Item->Data + Item->Length;
@@ -1042,15 +1042,15 @@ void ChunkTableClass::List_W3D_CHUNK_VERTEX_BINORMALS(ChunkItem *Item, CListCtrl
 	char buf[256];
 	while(data < max) {
 		sprintf(buf, "Binormal[%d]", counter++);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_PS2_SHADERS(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_PS2_SHADERS(ChunkItem * Item,CListCtrl *list)
 {
 	W3dPS2ShaderStruct *shader = (W3dPS2ShaderStruct *)Item->Data;
-	
+
 	void *max = (char *)Item->Data + Item->Length;
 	assert(Item->Length % sizeof(W3dPS2ShaderStruct) == 0);
 	int counter = 0;
@@ -1059,34 +1059,34 @@ void ChunkTableClass::List_W3D_CHUNK_PS2_SHADERS(ChunkItem * Item,CListCtrl *Lis
 	while(shader < max) {
 		sprintf(label,"shader[%d]",counter);
 		int counter2 = 0;
-		AddItem(List,counter2,label,shader);
+		AddItem(list,counter2,label,shader);
 		counter++;
 		shader++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_FX_SHADERS(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_FX_SHADERS(ChunkItem * Item,CListCtrl *list)
 {
-	List_Subitems(Item,List);
+	List_Subitems(Item,list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_FX_SHADER(ChunkItem* Item, CListCtrl* List)
+void ChunkTableClass::List_W3D_CHUNK_FX_SHADER(ChunkItem* Item, CListCtrl* list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_FX_SHADER_INFO(ChunkItem* Item, CListCtrl* List)
+void ChunkTableClass::List_W3D_CHUNK_FX_SHADER_INFO(ChunkItem* Item, CListCtrl* list)
 {
 	uint8 version = *(uint8*)Item->Data;
 	W3dFXShaderInfoStruct* shaderinfo = (W3dFXShaderInfoStruct*)((uint8*)Item->Data + 1);
 	int counter = 0;
 
-	AddItem(List, counter, "Version", version);
-	AddItem(List, counter, "ShaderName", shaderinfo->ShaderName);
-	AddItem(List, counter, "Technique", shaderinfo->Technique);
+	AddItem(list, counter, "Version", version);
+	AddItem(list, counter, "ShaderName", shaderinfo->ShaderName);
+	AddItem(list, counter, "Technique", shaderinfo->Technique);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_FX_SHADER_CONSTANT(ChunkItem* Item, CListCtrl* List)
+void ChunkTableClass::List_W3D_CHUNK_FX_SHADER_CONSTANT(ChunkItem* Item, CListCtrl* list)
 {
 	int counter = 0;
 	uint8 *chunkdata = (uint8 *)Item->Data;
@@ -1097,78 +1097,78 @@ void ChunkTableClass::List_W3D_CHUNK_FX_SHADER_CONSTANT(ChunkItem* Item, CListCt
 	chunkdata += 4;
 	char* constantname = (char*)chunkdata;
 	chunkdata += constantstrlen;
-	AddItem(List, counter, "Type", type);
-	AddItem(List, counter, "ConstantName", constantname);
+	AddItem(list, counter, "Type", type);
+	AddItem(list, counter, "ConstantName", constantname);
 	if (type == CONSTANT_TYPE_TEXTURE)
 	{
 		// This is hopefully also null-terminated
 		uint32 texturestrlen = *(uint32 *)chunkdata;
 		chunkdata += 4;
 		char* texture = (char*)chunkdata;
-		AddItem(List, counter, "Texture", texture);
+		AddItem(list, counter, "Texture", texture);
 	}
 	else if (type >= CONSTANT_TYPE_FLOAT1 && type <= CONSTANT_TYPE_FLOAT4)
 	{
 		int count = type - 1;
 		float* floats = (float*)chunkdata;
-		AddItem(List, counter, "Floats", floats, count);
+		AddItem(list, counter, "Floats", floats, count);
 	}
 	else if (type == CONSTANT_TYPE_INT)
 	{
 		uint32 u = *(uint32*)chunkdata;
-		AddItem(List, counter, "Int", u);
+		AddItem(list, counter, "Int", u);
 	}
 	else if (type == CONSTANT_TYPE_BOOL)
 	{
 		uint8 u = *(uint8*)chunkdata;
-		AddItem(List, counter, "Bool", u);
+		AddItem(list, counter, "Bool", u);
 	}
 	else
 	{
-		AddItem(List, counter, "Unknown", "Unknown");
+		AddItem(list, counter, "Unknown", "Unknown");
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_TEXTURES(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_TEXTURES(ChunkItem * Item,CListCtrl *list)
 {
-	List_Subitems(Item,List);
+	List_Subitems(Item,list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_TEXTURE(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_TEXTURE(ChunkItem * Item,CListCtrl *list)
 {
-	List_Subitems(Item,List);
+	List_Subitems(Item,list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_TEXTURE_NAME(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_TEXTURE_NAME(ChunkItem * Item,CListCtrl *list)
 {
 	int Counter = 0;
 	char * data = (char *)Item->Data;
-	AddItem(List, Counter,"Texture Name:", data);
+	AddItem(list, Counter,"Texture Name:", data);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_TEXTURE_INFO(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_TEXTURE_INFO(ChunkItem * Item,CListCtrl *list)
 {
 	W3dTextureInfoStruct *data = (W3dTextureInfoStruct *)Item->Data;
 	int Counter = 0;
 
-	AddItem(List, Counter, "Texture.Attributes", data->Attributes);
-	
-	if (data->Attributes & W3DTEXTURE_PUBLISH)		AddItem(List, Counter,"Attributes", "W3DTEXTURE_PUBLISH","flag");
-	if (data->Attributes & W3DTEXTURE_NO_LOD)			AddItem(List, Counter,"Attributes", "W3DTEXTURE_NO_LOD","flag");
-	if (data->Attributes & W3DTEXTURE_CLAMP_U)		AddItem(List, Counter,"Attributes", "W3DTEXTURE_CLAMP_U","flag");
-	if (data->Attributes & W3DTEXTURE_CLAMP_V)		AddItem(List, Counter,"Attributes", "W3DTEXTURE_CLAMP_V","flag");
-	if (data->Attributes & W3DTEXTURE_ALPHA_BITMAP)	AddItem(List, Counter,"Attributes", "W3DTEXTURE_ALPHA_BITMAP","flag");
+	AddItem(list, Counter, "Texture.Attributes", data->Attributes);
+
+	if (data->Attributes & W3DTEXTURE_PUBLISH)		AddItem(list, Counter,"Attributes", "W3DTEXTURE_PUBLISH","flag");
+	if (data->Attributes & W3DTEXTURE_NO_LOD)			AddItem(list, Counter,"Attributes", "W3DTEXTURE_NO_LOD","flag");
+	if (data->Attributes & W3DTEXTURE_CLAMP_U)		AddItem(list, Counter,"Attributes", "W3DTEXTURE_CLAMP_U","flag");
+	if (data->Attributes & W3DTEXTURE_CLAMP_V)		AddItem(list, Counter,"Attributes", "W3DTEXTURE_CLAMP_V","flag");
+	if (data->Attributes & W3DTEXTURE_ALPHA_BITMAP)	AddItem(list, Counter,"Attributes", "W3DTEXTURE_ALPHA_BITMAP","flag");
 
-	AddItem(List, Counter, "Texture.FrameCount", data->FrameCount);
-	AddItem(List, Counter, "Texture.FrameRate", data->FrameRate);
+	AddItem(list, Counter, "Texture.FrameCount", data->FrameCount);
+	AddItem(list, Counter, "Texture.FrameRate", data->FrameRate);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_MATERIAL_PASS(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_MATERIAL_PASS(ChunkItem * Item,CListCtrl *list)
 {
-	List_Subitems(Item,List);
+	List_Subitems(Item,list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_VERTEX_MATERIAL_IDS(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_VERTEX_MATERIAL_IDS(ChunkItem * Item,CListCtrl *list)
 {
 	int Counter = 0;
 	int counter = 0;
@@ -1178,16 +1178,16 @@ void ChunkTableClass::List_W3D_CHUNK_VERTEX_MATERIAL_IDS(ChunkItem * Item,CListC
 	char buf[256];
 
 	while(data < max) {
-	
+
 		sprintf(buf, "Vertex[%d] Vertex Material Index", counter);
-		AddItem(List, Counter, buf, *data);
+		AddItem(list, Counter, buf, *data);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_SHADER_IDS(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_SHADER_IDS(ChunkItem * Item,CListCtrl *list)
 {
 	int Counter = 0;
 	int counter = 0;
@@ -1197,16 +1197,16 @@ void ChunkTableClass::List_W3D_CHUNK_SHADER_IDS(ChunkItem * Item,CListCtrl *List
 	char buf[256];
 
 	while(data < max) {
-	
+
 		sprintf(buf, "Face[%d] Shader Index", counter);
-		AddItem(List, Counter, buf, *data);
+		AddItem(list, Counter, buf, *data);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_DCG(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_DCG(ChunkItem * Item,CListCtrl *list)
 {
 	W3dRGBAStruct *data = (W3dRGBAStruct *) Item->Data;
 	int Counter = 0;
@@ -1216,16 +1216,16 @@ void ChunkTableClass::List_W3D_CHUNK_DCG(ChunkItem * Item,CListCtrl *List)
 	char buf[256];
 
 	while(data < max) {
-	
+
 		sprintf(buf, "Vertex[%d].DCG", counter);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_DIG(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_DIG(ChunkItem * Item,CListCtrl *list)
 {
 	W3dRGBStruct *data = (W3dRGBStruct *)Item->Data;
 	int Counter = 0;
@@ -1235,16 +1235,16 @@ void ChunkTableClass::List_W3D_CHUNK_DIG(ChunkItem * Item,CListCtrl *List)
 	char buf[256];
 
 	while(data < max) {
-	
+
 		sprintf(buf, "Vertex[%d].DIG", counter);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_SCG(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_SCG(ChunkItem * Item,CListCtrl *list)
 {
 	W3dRGBStruct *data = (W3dRGBStruct *)Item->Data;
 	int Counter = 0;
@@ -1254,16 +1254,16 @@ void ChunkTableClass::List_W3D_CHUNK_SCG(ChunkItem * Item,CListCtrl *List)
 	char buf[256];
 
 	while(data < max) {
-	
+
 		sprintf(buf, "Vertex[%d].SCG", counter);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_FXSHADER_IDS(ChunkItem* Item, CListCtrl* List)
+void ChunkTableClass::List_W3D_CHUNK_FXSHADER_IDS(ChunkItem* Item, CListCtrl* list)
 {
 	int Counter = 0;
 	int counter = 0;
@@ -1275,20 +1275,20 @@ void ChunkTableClass::List_W3D_CHUNK_FXSHADER_IDS(ChunkItem* Item, CListCtrl* Li
 	while (data < max) {
 
 		sprintf(buf, "Vertex[%d] FXShader Index", counter);
-		AddItem(List, Counter, buf, *data);
+		AddItem(list, Counter, buf, *data);
 
 		counter++;
 		data++;
 	}
 }
-		
-void ChunkTableClass::List_W3D_CHUNK_TEXTURE_STAGE(ChunkItem * Item,CListCtrl *List)
+
+void ChunkTableClass::List_W3D_CHUNK_TEXTURE_STAGE(ChunkItem * Item,CListCtrl *list)
 {
-	List_Subitems(Item,List);
+	List_Subitems(Item,list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_TEXTURE_IDS(ChunkItem * Item,CListCtrl *List)
-{	
+void ChunkTableClass::List_W3D_CHUNK_TEXTURE_IDS(ChunkItem * Item,CListCtrl *list)
+{
 	int Counter = 0;
 	int counter = 0;
 	uint32 *data = (uint32 *)Item->Data;
@@ -1297,16 +1297,16 @@ void ChunkTableClass::List_W3D_CHUNK_TEXTURE_IDS(ChunkItem * Item,CListCtrl *Lis
 	char buf[256];
 
 	while(data < max) {
-	
+
 		sprintf(buf, "Face[%d] Texture Index", counter);
-		AddItem(List, Counter, buf, *data);
+		AddItem(list, Counter, buf, *data);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_STAGE_TEXCOORDS(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_STAGE_TEXCOORDS(ChunkItem * Item,CListCtrl *list)
 {
 	W3dTexCoordStruct *data = (W3dTexCoordStruct *)Item->Data;
 	int Counter = 0;
@@ -1316,16 +1316,16 @@ void ChunkTableClass::List_W3D_CHUNK_STAGE_TEXCOORDS(ChunkItem * Item,CListCtrl
 	char buf[256];
 
 	while(data < max) {
-	
+
 		sprintf(buf, "Vertex[%d].UV", counter);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_PER_FACE_TEXCOORD_IDS(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_PER_FACE_TEXCOORD_IDS(ChunkItem * Item,CListCtrl *list)
 {
 	int Counter = 0;
 	int counter = 0;
@@ -1335,29 +1335,29 @@ void ChunkTableClass::List_W3D_CHUNK_PER_FACE_TEXCOORD_IDS(ChunkItem * Item,CLis
 	char buf[256];
 
 	while(data < max) {
-	
+
 		sprintf(buf, "Face[%d] UV Indices", counter);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_AABTREE(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_AABTREE(ChunkItem * Item,CListCtrl *list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_AABTREE_HEADER(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_AABTREE_HEADER(ChunkItem * Item,CListCtrl *list)
 {
 	W3dMeshAABTreeHeader * data = (W3dMeshAABTreeHeader*)Item->Data;
 	int Counter = 0;
-	AddItem(List, Counter, "NodeCount", data->NodeCount);
-	AddItem(List, Counter, "PolyCount", data->PolyCount);
+	AddItem(list, Counter, "NodeCount", data->NodeCount);
+	AddItem(list, Counter, "PolyCount", data->PolyCount);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_AABTREE_POLYINDICES(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_AABTREE_POLYINDICES(ChunkItem * Item,CListCtrl *list)
 {
 	int Counter = 0;
 	int counter = 0;
@@ -1367,43 +1367,43 @@ void ChunkTableClass::List_W3D_CHUNK_AABTREE_POLYINDICES(ChunkItem * Item,CListC
 	char buf[256];
 
 	while(data < max) {
-	
+
 		sprintf(buf, "Polygon Index[%d]", counter);
-		AddItem(List, Counter, buf, *data);
+		AddItem(list, Counter, buf, *data);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_AABTREE_NODES(ChunkItem * Item,CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_AABTREE_NODES(ChunkItem * Item,CListCtrl *list)
 {
 	W3dMeshAABTreeNode * data = (W3dMeshAABTreeNode *)Item->Data;
-	
+
 	int Counter = 0;
 	void *max = (char *)Item->Data + Item->Length;
 	assert(Item->Length % sizeof(W3dMeshAABTreeNode) == 0);
 	int counter = 0;
 	char buf[256];
-	
+
 	while(data < max) {
 
 		sprintf(buf, "Node[%d].Min", counter);
-		AddItem(List, Counter, buf, &data->Min);
+		AddItem(list, Counter, buf, &data->Min);
 
 		sprintf(buf, "Node[%d].Max", counter);
-		AddItem(List, Counter, buf, &data->Max);
+		AddItem(list, Counter, buf, &data->Max);
 
 		if (data->FrontOrPoly0 & 0x80000000) {
 			sprintf(buf, "Node[%d].Poly0",counter);
-			AddItem(List, Counter, buf, data->FrontOrPoly0 & 0x7FFFFFFF);
+			AddItem(list, Counter, buf, data->FrontOrPoly0 & 0x7FFFFFFF);
 			sprintf(buf, "Node[%d].PolyCount",counter);
-			AddItem(List, Counter, buf, data->BackOrPolyCount);
+			AddItem(list, Counter, buf, data->BackOrPolyCount);
 		} else {
 			sprintf(buf, "Node[%d].Front",counter);
-			AddItem(List, Counter, buf, data->FrontOrPoly0);
+			AddItem(list, Counter, buf, data->FrontOrPoly0);
 			sprintf(buf, "Node[%d].Back",counter);
-			AddItem(List, Counter, buf, data->BackOrPolyCount);
+			AddItem(list, Counter, buf, data->BackOrPolyCount);
 		}
 
 		counter++;
@@ -1411,22 +1411,22 @@ void ChunkTableClass::List_W3D_CHUNK_AABTREE_NODES(ChunkItem * Item,CListCtrl *L
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_HIERARCHY(ChunkItem *Item, CListCtrl *List) {
-	List_Subitems(Item, List);
+void ChunkTableClass::List_W3D_CHUNK_HIERARCHY(ChunkItem *Item, CListCtrl *list) {
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_HIERARCHY_HEADER(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_HIERARCHY_HEADER(ChunkItem *Item, CListCtrl *list) {
 	W3dHierarchyStruct *data = (W3dHierarchyStruct *) Item->Data;
 
 	int Counter = 0;
 	char buf[64];
 	sprintf(buf,"%d.%d",W3D_GET_MAJOR_VERSION(data->Version),W3D_GET_MINOR_VERSION(data->Version));
-	AddItem(List, Counter,"Version", buf);
-	AddItem(List, Counter, "Name", data->Name);
-	AddItem(List, Counter, "NumPivots", data->NumPivots);
-	AddItem(List, Counter, "Center", &data->Center);
+	AddItem(list, Counter,"Version", buf);
+	AddItem(list, Counter, "Name", data->Name);
+	AddItem(list, Counter, "NumPivots", data->NumPivots);
+	AddItem(list, Counter, "Center", &data->Center);
 }
-void ChunkTableClass::List_W3D_CHUNK_PIVOTS(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_PIVOTS(ChunkItem *Item, CListCtrl *list) {
 	W3dPivotStruct *data = (W3dPivotStruct *) Item->Data;
 	int Counter = 0;
 	void *max = (char *) Item->Data + Item->Length;
@@ -1436,28 +1436,28 @@ void ChunkTableClass::List_W3D_CHUNK_PIVOTS(ChunkItem *Item, CListCtrl *List) {
 	while(data < max) {
 
 		sprintf(buf, "Pivot[%d].Name", counter);
-		AddItem(List, Counter, buf, data->Name);
+		AddItem(list, Counter, buf, data->Name);
 
 		sprintf(buf, "Pivot[%d].ParentIdx", counter);
-		AddItem(List, Counter, buf, data->ParentIdx);
+		AddItem(list, Counter, buf, data->ParentIdx);
 
 		sprintf(buf, "Pivot[%d].Translation", counter);
-		AddItem(List, Counter, buf, &data->Translation);
+		AddItem(list, Counter, buf, &data->Translation);
 
 		sprintf(buf, "Pivot[%d].EulerAngles", counter);
-		AddItem(List, Counter, buf, &data->EulerAngles);
+		AddItem(list, Counter, buf, &data->EulerAngles);
 
 		sprintf(buf, "Pivot[%d].Rotation", counter);
-		AddItem(List, Counter, buf, &data->Rotation);
+		AddItem(list, Counter, buf, &data->Rotation);
 
 		counter++;
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_PIVOT_FIXUPS(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_PIVOT_FIXUPS(ChunkItem *Item, CListCtrl *list) {
 	W3dPivotFixupStruct *data = (W3dPivotFixupStruct *) Item->Data;
-	
+
 	int Counter = 0;
 	int pivot_counter = 0;
 
@@ -1465,31 +1465,31 @@ void ChunkTableClass::List_W3D_CHUNK_PIVOT_FIXUPS(ChunkItem *Item, CListCtrl *Li
 		char tmp[256];
 		for (int i=0;i<4;i++) {
 			sprintf(tmp,"Transform %d, Row[%d]", pivot_counter,i);
-			AddItem(List, Counter, tmp, data->TM[i], 3);
+			AddItem(list, Counter, tmp, data->TM[i], 3);
 		}
 		data++;
 		pivot_counter++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_ANIMATION(ChunkItem *Item, CListCtrl *List) {
-	List_Subitems(Item, List);
+void ChunkTableClass::List_W3D_CHUNK_ANIMATION(ChunkItem *Item, CListCtrl *list) {
+	List_Subitems(Item, list);
 }
-void ChunkTableClass::List_W3D_CHUNK_ANIMATION_HEADER(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_ANIMATION_HEADER(ChunkItem *Item, CListCtrl *list) {
 
 	W3dAnimHeaderStruct *data = (W3dAnimHeaderStruct *) Item->Data;
-	
+
 	int Counter = 0;
 	char buf[64];
 	sprintf(buf,"%d.%d",W3D_GET_MAJOR_VERSION(data->Version),W3D_GET_MINOR_VERSION(data->Version));
-	AddItem(List, Counter,"Version", buf);
-	AddItem(List, Counter, "Name", data->Name);
-	AddItem(List, Counter, "HierarchyName", data->HierarchyName);
-	AddItem(List, Counter, "NumFrames", data->NumFrames);
-	AddItem(List, Counter, "FrameRate", data->FrameRate);
+	AddItem(list, Counter,"Version", buf);
+	AddItem(list, Counter, "Name", data->Name);
+	AddItem(list, Counter, "HierarchyName", data->HierarchyName);
+	AddItem(list, Counter, "NumFrames", data->NumFrames);
+	AddItem(list, Counter, "FrameRate", data->FrameRate);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_ANIMATION_CHANNEL(ChunkItem *Item, CListCtrl *List) 
+void ChunkTableClass::List_W3D_CHUNK_ANIMATION_CHANNEL(ChunkItem *Item, CListCtrl *list)
 {
 	static const char * _chntypes[] = {
 		"X Translation",
@@ -1504,30 +1504,30 @@ void ChunkTableClass::List_W3D_CHUNK_ANIMATION_CHANNEL(ChunkItem *Item, CListCtr
 
 	W3dAnimChannelStruct *data = (W3dAnimChannelStruct *) Item->Data;
 	int Counter = 0;
-	AddItem(List, Counter, "FirstFrame", data->FirstFrame);
-	AddItem(List, Counter, "LastFrame", data->LastFrame);
+	AddItem(list, Counter, "FirstFrame", data->FirstFrame);
+	AddItem(list, Counter, "LastFrame", data->LastFrame);
 
 	if ((data->Flags >= ANIM_CHANNEL_X)&&(data->Flags <= ANIM_CHANNEL_Q)) {
-		AddItem(List, Counter, "ChannelType",_chntypes[data->Flags]);
+		AddItem(list, Counter, "ChannelType",_chntypes[data->Flags]);
 	} else {
-		AddItem(List, Counter, "ChannelType",data->Flags);
+		AddItem(list, Counter, "ChannelType",data->Flags);
 	}
 
-	AddItem(List, Counter, "Pivot", data->Pivot);
-	AddItem(List, Counter, "VectorLen", data->VectorLen);
+	AddItem(list, Counter, "Pivot", data->Pivot);
+	AddItem(list, Counter, "VectorLen", data->VectorLen);
 
 	CString name;
 	for (int frameidx=0; frameidx <= data->LastFrame - data->FirstFrame; frameidx++) {
 		for (int vidx = 0; vidx < data->VectorLen; vidx++) {
 			name.Format("Data[%d][%d]", frameidx, vidx);
-			AddItem(List, Counter, name, data->Data[frameidx * data->VectorLen + vidx]);
+			AddItem(list, Counter, name, data->Data[frameidx * data->VectorLen + vidx]);
 		}
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_BIT_CHANNEL(ChunkItem *Item, CListCtrl *List) 
+void ChunkTableClass::List_W3D_CHUNK_BIT_CHANNEL(ChunkItem *Item, CListCtrl *list)
 {
-	static const char * _chntypes[] = 
+	static const char * _chntypes[] =
 	{
 		"Visibility",
 	};
@@ -1537,164 +1537,164 @@ void ChunkTableClass::List_W3D_CHUNK_BIT_CHANNEL(ChunkItem *Item, CListCtrl *Lis
 	int Counter = 0;
 	unsigned char * bits = &(data->Data[0]);
 
-	AddItem(List, Counter, "FirstFrame", data->FirstFrame);
-	AddItem(List, Counter, "LastFrame", data->LastFrame);
+	AddItem(list, Counter, "FirstFrame", data->FirstFrame);
+	AddItem(list, Counter, "LastFrame", data->LastFrame);
 
 	if ((data->Flags >= BIT_CHANNEL_VIS)&&(data->Flags <= BIT_CHANNEL_VIS)) {
-		AddItem(List, Counter, "ChannelType",_chntypes[data->Flags]);
+		AddItem(list, Counter, "ChannelType",_chntypes[data->Flags]);
 	} else {
-		AddItem(List, Counter, "ChannelType",data->Flags);
+		AddItem(list, Counter, "ChannelType",data->Flags);
 	}
 
-	AddItem(List, Counter, "Pivot", data->Pivot);
-	AddItem(List, Counter, "Default Value", data->DefaultVal);
+	AddItem(list, Counter, "Pivot", data->Pivot);
+	AddItem(list, Counter, "Default Value", data->DefaultVal);
 
 	CString name;
 	for (int frameidx=0; frameidx <= data->LastFrame - data->FirstFrame; frameidx++) {
 		name.Format("Data[%d]",frameidx + data->FirstFrame);
-		AddItem(List, Counter, name, (uint8)Get_Bit(bits,frameidx));
+		AddItem(list, Counter, name, (uint8)Get_Bit(bits,frameidx));
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_HMODEL(ChunkItem *Item, CListCtrl *List) {
-	List_Subitems(Item, List);
+void ChunkTableClass::List_W3D_CHUNK_HMODEL(ChunkItem *Item, CListCtrl *list) {
+	List_Subitems(Item, list);
 }
-void ChunkTableClass::List_W3D_CHUNK_HMODEL_HEADER(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_HMODEL_HEADER(ChunkItem *Item, CListCtrl *list) {
 	W3dHModelHeaderStruct *data = (W3dHModelHeaderStruct *) Item->Data;
-	
+
 	int Counter = 0;
 	char buf[64];
 	sprintf(buf,"%d.%d",W3D_GET_MAJOR_VERSION(data->Version),W3D_GET_MINOR_VERSION(data->Version));
-	AddItem(List, Counter,"Version", buf);
-	AddItem(List, Counter, "Name", data->Name);
-	AddItem(List, Counter, "HierarchyName", data->HierarchyName);
-	AddItem(List, Counter, "NumConnections", data->NumConnections);
+	AddItem(list, Counter,"Version", buf);
+	AddItem(list, Counter, "Name", data->Name);
+	AddItem(list, Counter, "HierarchyName", data->HierarchyName);
+	AddItem(list, Counter, "NumConnections", data->NumConnections);
 }
-void ChunkTableClass::List_W3D_CHUNK_NODE(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_NODE(ChunkItem *Item, CListCtrl *list) {
 	W3dHModelNodeStruct *data = (W3dHModelNodeStruct *) Item->Data;
-	
+
 	int Counter = 0;
-	AddItem(List, Counter, "RenderObjName", data->RenderObjName);
-	AddItem(List, Counter, "PivotIdx", data->PivotIdx);
+	AddItem(list, Counter, "RenderObjName", data->RenderObjName);
+	AddItem(list, Counter, "PivotIdx", data->PivotIdx);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_COLLISION_NODE(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_COLLISION_NODE(ChunkItem *Item, CListCtrl *list) {
 	W3dHModelNodeStruct *data = (W3dHModelNodeStruct *) Item->Data;
-	
+
 	int Counter = 0;
-	AddItem(List, Counter, "CollisionMeshName", data->RenderObjName);
-	AddItem(List, Counter, "PivotIdx", data->PivotIdx);
+	AddItem(list, Counter, "CollisionMeshName", data->RenderObjName);
+	AddItem(list, Counter, "PivotIdx", data->PivotIdx);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_SKIN_NODE(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_SKIN_NODE(ChunkItem *Item, CListCtrl *list) {
 	W3dHModelNodeStruct *data = (W3dHModelNodeStruct *) Item->Data;
-	
+
 	int Counter = 0;
-	AddItem(List, Counter, "SkinMeshName", data->RenderObjName);
-	AddItem(List, Counter, "PivotIdx", data->PivotIdx);
+	AddItem(list, Counter, "SkinMeshName", data->RenderObjName);
+	AddItem(list, Counter, "PivotIdx", data->PivotIdx);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_HMODEL_AUX_DATA(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_HMODEL_AUX_DATA(ChunkItem *Item, CListCtrl *list) {
 
 	W3dHModelAuxDataStruct *data = (W3dHModelAuxDataStruct *) Item->Data;
-	
+
 	int Counter = 0;
-	AddItem(List, Counter, "Attributes", data->Attributes);
-	AddItem(List, Counter, "MeshCount", data->MeshCount);
-	AddItem(List, Counter, "CollisionCount", data->CollisionCount);
-	AddItem(List, Counter, "SkinCount", data->SkinCount);
-	AddItem(List, Counter, "FutureCounts", data->FutureCounts, 8);
-	AddItem(List, Counter, "LODMin", data->LODMin);
-	AddItem(List, Counter, "LODMax", data->LODMax);
-	AddItem(List, Counter, "FutureUse", data->FutureUse, 32);
+	AddItem(list, Counter, "Attributes", data->Attributes);
+	AddItem(list, Counter, "MeshCount", data->MeshCount);
+	AddItem(list, Counter, "CollisionCount", data->CollisionCount);
+	AddItem(list, Counter, "SkinCount", data->SkinCount);
+	AddItem(list, Counter, "FutureCounts", data->FutureCounts, 8);
+	AddItem(list, Counter, "LODMin", data->LODMin);
+	AddItem(list, Counter, "LODMax", data->LODMax);
+	AddItem(list, Counter, "FutureUse", data->FutureUse, 32);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_SHADOW_NODE(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_SHADOW_NODE(ChunkItem *Item, CListCtrl *list) {
 	W3dHModelNodeStruct *data = (W3dHModelNodeStruct *) Item->Data;
-	
+
 	int Counter = 0;
-	AddItem(List, Counter, "ShadowMeshName", data->RenderObjName);
-	AddItem(List, Counter, "PivotIdx", data->PivotIdx);
+	AddItem(list, Counter, "ShadowMeshName", data->RenderObjName);
+	AddItem(list, Counter, "PivotIdx", data->PivotIdx);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_LODMODEL(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_LODMODEL(ChunkItem *Item, CListCtrl *list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_LODMODEL_HEADER(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_LODMODEL_HEADER(ChunkItem *Item, CListCtrl *list)
 {
 	W3dLODModelHeaderStruct *data = (W3dLODModelHeaderStruct *) Item->Data;
 	int Counter = 0;
 
 	char buf[64];
 	sprintf(buf,"%d.%d",W3D_GET_MAJOR_VERSION(data->Version),W3D_GET_MINOR_VERSION(data->Version));
-	AddItem(List, Counter,"Version", buf);
-	AddItem(List, Counter, "Name", data->Name);
-	AddItem(List, Counter, "NumLODs", data->NumLODs);
+	AddItem(list, Counter,"Version", buf);
+	AddItem(list, Counter, "Name", data->Name);
+	AddItem(list, Counter, "NumLODs", data->NumLODs);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_LOD(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_LOD(ChunkItem * Item,CListCtrl * list)
 {
 	W3dLODStruct *data = (W3dLODStruct *) Item->Data;
 	int Counter = 0;
 
-	AddItem(List, Counter, "Render Object Name", data->RenderObjName);
-	AddItem(List, Counter, "LOD Min Distance", data->LODMin);
-	AddItem(List, Counter, "LOD Max Distance", data->LODMax);
+	AddItem(list, Counter, "Render Object Name", data->RenderObjName);
+	AddItem(list, Counter, "LOD Min Distance", data->LODMin);
+	AddItem(list, Counter, "LOD Max Distance", data->LODMax);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_COLLECTION(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_COLLECTION(ChunkItem * Item,CListCtrl * list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_COLLECTION_HEADER(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_COLLECTION_HEADER(ChunkItem * Item,CListCtrl * list)
 {
 	W3dCollectionHeaderStruct *data = (W3dCollectionHeaderStruct *) Item->Data;
 	int Counter = 0;
 
 	char buf[64];
 	sprintf(buf,"%d.%d",W3D_GET_MAJOR_VERSION(data->Version),W3D_GET_MINOR_VERSION(data->Version));
-	AddItem(List, Counter,"Version", buf);
-	AddItem(List, Counter, "Name", data->Name);
-	AddItem(List, Counter, "RenderObjectCount", data->RenderObjectCount);
+	AddItem(list, Counter,"Version", buf);
+	AddItem(list, Counter, "Name", data->Name);
+	AddItem(list, Counter, "RenderObjectCount", data->RenderObjectCount);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_COLLECTION_OBJ_NAME(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_COLLECTION_OBJ_NAME(ChunkItem * Item,CListCtrl * list)
 {
 	char * name = (char *)Item->Data;
 	int Counter = 0;
-	AddItem(List,Counter,"Render Object Name",name);	
+	AddItem(list,Counter,"Render Object Name",name);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_PLACEHOLDER(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_PLACEHOLDER(ChunkItem * Item,CListCtrl * list)
 {
 	W3dPlaceholderStruct * data = (W3dPlaceholderStruct *)(Item->Data);
 	int Counter = 0;
 
-	AddItemVersion(List,Counter,data->version);
-	AddItem(List,Counter,"Transform",&(data->transform[0][0]),3);
-	AddItem(List,Counter,"Transform",&(data->transform[1][0]),3);
-	AddItem(List,Counter,"Transform",&(data->transform[2][0]),3);
-	AddItem(List,Counter,"Transform",&(data->transform[3][0]),3);
-	AddItem(List,Counter,"Name",(char *)(data + 1));
+	AddItemVersion(list,Counter,data->version);
+	AddItem(list,Counter,"Transform",&(data->transform[0][0]),3);
+	AddItem(list,Counter,"Transform",&(data->transform[1][0]),3);
+	AddItem(list,Counter,"Transform",&(data->transform[2][0]),3);
+	AddItem(list,Counter,"Transform",&(data->transform[3][0]),3);
+	AddItem(list,Counter,"Name",(char *)(data + 1));
 }
 
-void ChunkTableClass::List_W3D_CHUNK_TRANSFORM_NODE(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_TRANSFORM_NODE(ChunkItem * Item,CListCtrl * list)
 {
 	W3dTransformNodeStruct * data = (W3dTransformNodeStruct *)(Item->Data);
 	int Counter = 0;
 
-	AddItemVersion(List,Counter,data->version);
-	AddItem(List,Counter,"Transform",&(data->transform[0][0]),3);
-	AddItem(List,Counter,"Transform",&(data->transform[1][0]),3);
-	AddItem(List,Counter,"Transform",&(data->transform[2][0]),3);
-	AddItem(List,Counter,"Transform",&(data->transform[3][0]),3);
-	AddItem(List,Counter,"Name",(char *)(data + 1));
+	AddItemVersion(list,Counter,data->version);
+	AddItem(list,Counter,"Transform",&(data->transform[0][0]),3);
+	AddItem(list,Counter,"Transform",&(data->transform[1][0]),3);
+	AddItem(list,Counter,"Transform",&(data->transform[2][0]),3);
+	AddItem(list,Counter,"Transform",&(data->transform[3][0]),3);
+	AddItem(list,Counter,"Name",(char *)(data + 1));
 }
 
-void ChunkTableClass::List_W3D_CHUNK_POINTS(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_POINTS(ChunkItem * Item,CListCtrl * list)
 {
 	W3dVectorStruct *data = (W3dVectorStruct *) Item->Data;
 
@@ -1706,242 +1706,242 @@ void ChunkTableClass::List_W3D_CHUNK_POINTS(ChunkItem * Item,CListCtrl * List)
 
 	while (data < max) {
 		sprintf(buf, "Point[%d]", counter++);
-		AddItem(List, Counter, buf, data);
+		AddItem(list, Counter, buf, data);
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_LIGHT(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_LIGHT(ChunkItem * Item,CListCtrl * list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_LIGHT_INFO(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_LIGHT_INFO(ChunkItem * Item,CListCtrl * list)
 {
 	W3dLightStruct * data = (W3dLightStruct *)Item->Data;
 	int counter = 0;
 
-	if ((data->Attributes & W3D_LIGHT_ATTRIBUTE_TYPE_MASK) == W3D_LIGHT_ATTRIBUTE_POINT) AddItem (List, counter, "Attributes", "W3D_LIGHT_ATTRIBUTE_POINT");
-	if ((data->Attributes & W3D_LIGHT_ATTRIBUTE_TYPE_MASK) == W3D_LIGHT_ATTRIBUTE_SPOT) AddItem (List, counter, "Attributes", "W3D_LIGHT_ATTRIBUTE_SPOT");
-	if ((data->Attributes & W3D_LIGHT_ATTRIBUTE_TYPE_MASK) == W3D_LIGHT_ATTRIBUTE_DIRECTIONAL) AddItem (List, counter, "Attributes", "W3D_LIGHT_ATTRIBUTE_DIRECTIONAL");
-	if (data->Attributes & W3D_LIGHT_ATTRIBUTE_CAST_SHADOWS)	AddItem (List, counter, "Attributes", "W3D_LIGHT_ATTRIBUTE_CAST_SHADOWS", "flag");
-	AddItem(List,counter,"Ambient",&(data->Ambient),1);
-	AddItem(List,counter,"Diffuse",&(data->Diffuse),1);
-	AddItem(List,counter,"Specular",&(data->Specular),1);
-	AddItem(List,counter,"Intensity",data->Intensity);
+	if ((data->Attributes & W3D_LIGHT_ATTRIBUTE_TYPE_MASK) == W3D_LIGHT_ATTRIBUTE_POINT) AddItem (list, counter, "Attributes", "W3D_LIGHT_ATTRIBUTE_POINT");
+	if ((data->Attributes & W3D_LIGHT_ATTRIBUTE_TYPE_MASK) == W3D_LIGHT_ATTRIBUTE_SPOT) AddItem (list, counter, "Attributes", "W3D_LIGHT_ATTRIBUTE_SPOT");
+	if ((data->Attributes & W3D_LIGHT_ATTRIBUTE_TYPE_MASK) == W3D_LIGHT_ATTRIBUTE_DIRECTIONAL) AddItem (list, counter, "Attributes", "W3D_LIGHT_ATTRIBUTE_DIRECTIONAL");
+	if (data->Attributes & W3D_LIGHT_ATTRIBUTE_CAST_SHADOWS)	AddItem (list, counter, "Attributes", "W3D_LIGHT_ATTRIBUTE_CAST_SHADOWS", "flag");
+	AddItem(list,counter,"Ambient",&(data->Ambient),1);
+	AddItem(list,counter,"Diffuse",&(data->Diffuse),1);
+	AddItem(list,counter,"Specular",&(data->Specular),1);
+	AddItem(list,counter,"Intensity",data->Intensity);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_SPOT_LIGHT_INFO(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_SPOT_LIGHT_INFO(ChunkItem * Item,CListCtrl * list)
 {
 	W3dSpotLightStruct * data = (W3dSpotLightStruct*)Item->Data;
 	int counter = 0;
-	AddItem(List,counter,"SpotDirection",&(data->SpotDirection));
-	AddItem(List,counter,"SpotAngle",data->SpotAngle);
-	AddItem(List,counter,"SpotExponent",data->SpotExponent);
+	AddItem(list,counter,"SpotDirection",&(data->SpotDirection));
+	AddItem(list,counter,"SpotAngle",data->SpotAngle);
+	AddItem(list,counter,"SpotExponent",data->SpotExponent);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_NEAR_ATTENUATION(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_NEAR_ATTENUATION(ChunkItem * Item,CListCtrl * list)
 {
 	W3dLightAttenuationStruct * data = (W3dLightAttenuationStruct *)Item->Data;
 	int counter = 0;
-	AddItem(List,counter,"Near Atten Start",data->Start);
-	AddItem(List,counter,"Near Atten End",data->End);
+	AddItem(list,counter,"Near Atten Start",data->Start);
+	AddItem(list,counter,"Near Atten End",data->End);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_FAR_ATTENUATION(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_FAR_ATTENUATION(ChunkItem * Item,CListCtrl * list)
 {
 	W3dLightAttenuationStruct * data = (W3dLightAttenuationStruct *)Item->Data;
 	int counter = 0;
-	AddItem(List,counter,"Far Atten Start",data->Start);
-	AddItem(List,counter,"Far Atten End",data->End);
+	AddItem(list,counter,"Far Atten Start",data->Start);
+	AddItem(list,counter,"Far Atten End",data->End);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_EMITTER(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_EMITTER(ChunkItem * Item,CListCtrl * list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_EMITTER_HEADER(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_EMITTER_HEADER(ChunkItem * Item,CListCtrl * list)
 {
 	W3dEmitterHeaderStruct * data = (W3dEmitterHeaderStruct*)Item->Data;
 	int counter = 0;
-	AddItem(List,counter,"Version",data->Version);
-	AddItem(List,counter,"Name",data->Name);
+	AddItem(list,counter,"Version",data->Version);
+	AddItem(list,counter,"Name",data->Name);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_EMITTER_USER_DATA(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_EMITTER_USER_DATA(ChunkItem * Item,CListCtrl * list)
 {
 	char * data = (char *)Item->Data;
 	int counter = 0;
-	AddItem(List,counter,"User Data",data);
+	AddItem(list,counter,"User Data",data);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_EMITTER_INFO(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_EMITTER_INFO(ChunkItem * Item,CListCtrl * list)
 {
 	W3dEmitterInfoStruct * data = (W3dEmitterInfoStruct *)Item->Data;
 	int counter = 0;
-	AddItem(List,counter,"Texture Name",data->TextureFilename);
-	AddItem(List,counter,"StartSize", data->StartSize);
-	AddItem(List,counter,"EndSize",data->EndSize);
-	AddItem(List,counter,"Lifetime",data->Lifetime);
-	AddItem(List,counter,"EmissionRate",data->EmissionRate);
-	AddItem(List,counter,"MaxEmissions",data->MaxEmissions);
-	AddItem(List,counter,"VelocityRandom",data->VelocityRandom);
-	AddItem(List,counter,"PositionRandom",data->PositionRandom);
-	AddItem(List,counter,"FadeTime",data->FadeTime);
-	AddItem(List,counter,"Gravity",data->Gravity);
-	AddItem(List,counter,"Elasticity",data->Elasticity);
-	AddItem(List,counter,"Velocity",&(data->Velocity));
-	AddItem(List,counter,"Acceleration",&(data->Acceleration));
-	AddItem(List,counter,"StartColor",&(data->StartColor));
-	AddItem(List,counter,"EndColor",&(data->EndColor));
-}	
-
-void ChunkTableClass::List_W3D_CHUNK_EMITTER_INFOV2(ChunkItem * Item,CListCtrl * List)
+	AddItem(list,counter,"Texture Name",data->TextureFilename);
+	AddItem(list,counter,"StartSize", data->StartSize);
+	AddItem(list,counter,"EndSize",data->EndSize);
+	AddItem(list,counter,"Lifetime",data->Lifetime);
+	AddItem(list,counter,"EmissionRate",data->EmissionRate);
+	AddItem(list,counter,"MaxEmissions",data->MaxEmissions);
+	AddItem(list,counter,"VelocityRandom",data->VelocityRandom);
+	AddItem(list,counter,"PositionRandom",data->PositionRandom);
+	AddItem(list,counter,"FadeTime",data->FadeTime);
+	AddItem(list,counter,"Gravity",data->Gravity);
+	AddItem(list,counter,"Elasticity",data->Elasticity);
+	AddItem(list,counter,"Velocity",&(data->Velocity));
+	AddItem(list,counter,"Acceleration",&(data->Acceleration));
+	AddItem(list,counter,"StartColor",&(data->StartColor));
+	AddItem(list,counter,"EndColor",&(data->EndColor));
+}
+
+void ChunkTableClass::List_W3D_CHUNK_EMITTER_INFOV2(ChunkItem * Item,CListCtrl * list)
 {
 	W3dEmitterInfoStructV2 * data = (W3dEmitterInfoStructV2 *)(Item->Data);
 	int counter = 0;
-	AddItem(List,counter,"BurstSize",data->BurstSize);
-	AddItem(List,counter,"CreationVolume.ClassID",data->CreationVolume.ClassID);
-	AddItem(List,counter,"CreationVolume.Value1",data->CreationVolume.Value1);
-	AddItem(List,counter,"CreationVolume.Value2",data->CreationVolume.Value2);
-	AddItem(List,counter,"CreationVolume.Value3",data->CreationVolume.Value3);
-	AddItem(List,counter,"VelRandom.ClassID",data->VelRandom.ClassID);
-	AddItem(List,counter,"VelRandom.Value1",data->VelRandom.Value1);
-	AddItem(List,counter,"VelRandom.Value2",data->VelRandom.Value2);
-	AddItem(List,counter,"VelRandom.Value3",data->VelRandom.Value3);
-	AddItem(List,counter,"OutwardVel",data->OutwardVel);
-	AddItem(List,counter,"VelInherit",data->VelInherit);
-	AddItem(List,counter,"Shader",&(data->Shader));
-	AddItem(List,counter,"RenderMode",data->RenderMode);
+	AddItem(list,counter,"BurstSize",data->BurstSize);
+	AddItem(list,counter,"CreationVolume.ClassID",data->CreationVolume.ClassID);
+	AddItem(list,counter,"CreationVolume.Value1",data->CreationVolume.Value1);
+	AddItem(list,counter,"CreationVolume.Value2",data->CreationVolume.Value2);
+	AddItem(list,counter,"CreationVolume.Value3",data->CreationVolume.Value3);
+	AddItem(list,counter,"VelRandom.ClassID",data->VelRandom.ClassID);
+	AddItem(list,counter,"VelRandom.Value1",data->VelRandom.Value1);
+	AddItem(list,counter,"VelRandom.Value2",data->VelRandom.Value2);
+	AddItem(list,counter,"VelRandom.Value3",data->VelRandom.Value3);
+	AddItem(list,counter,"OutwardVel",data->OutwardVel);
+	AddItem(list,counter,"VelInherit",data->VelInherit);
+	AddItem(list,counter,"Shader",&(data->Shader));
+	AddItem(list,counter,"RenderMode",data->RenderMode);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_EMITTER_PROPS(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_EMITTER_PROPS(ChunkItem * Item,CListCtrl * list)
 {
 	W3dEmitterPropertyStruct * data = (W3dEmitterPropertyStruct *)(Item->Data);
 	int counter = 0;
-	AddItem(List,counter,"ColorKeyframes",data->ColorKeyframes);
-	AddItem(List,counter,"OpacityKeyframes",data->OpacityKeyframes);
-	AddItem(List,counter,"SizeKeyframes",data->SizeKeyframes);
-	AddItem(List,counter,"ColorRandom",&(data->ColorRandom));
-	AddItem(List,counter,"OpacityRandom",data->OpacityRandom);
-	AddItem(List,counter,"SizeRandom",data->SizeRandom);
+	AddItem(list,counter,"ColorKeyframes",data->ColorKeyframes);
+	AddItem(list,counter,"OpacityKeyframes",data->OpacityKeyframes);
+	AddItem(list,counter,"SizeKeyframes",data->SizeKeyframes);
+	AddItem(list,counter,"ColorRandom",&(data->ColorRandom));
+	AddItem(list,counter,"OpacityRandom",data->OpacityRandom);
+	AddItem(list,counter,"SizeRandom",data->SizeRandom);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_EMITTER_COLOR_KEYFRAME(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_EMITTER_COLOR_KEYFRAME(ChunkItem * Item,CListCtrl * list)
 {
 	W3dEmitterColorKeyframeStruct * data = (W3dEmitterColorKeyframeStruct *)(Item->Data);
 	int counter = 0;
-	AddItem(List,counter,"Time",data->Time);
-	AddItem(List,counter,"Color",&(data->Color));
+	AddItem(list,counter,"Time",data->Time);
+	AddItem(list,counter,"Color",&(data->Color));
 }
 
-void ChunkTableClass::List_W3D_CHUNK_EMITTER_OPACITY_KEYFRAME(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_EMITTER_OPACITY_KEYFRAME(ChunkItem * Item,CListCtrl * list)
 {
 	W3dEmitterOpacityKeyframeStruct * data = (W3dEmitterOpacityKeyframeStruct *)(Item->Data);
 	int counter = 0;
-	AddItem(List,counter,"Time",data->Time);
-	AddItem(List,counter,"Opacity",data->Opacity);
+	AddItem(list,counter,"Time",data->Time);
+	AddItem(list,counter,"Opacity",data->Opacity);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_EMITTER_SIZE_KEYFRAME(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_EMITTER_SIZE_KEYFRAME(ChunkItem * Item,CListCtrl * list)
 {
 	W3dEmitterSizeKeyframeStruct * data = (W3dEmitterSizeKeyframeStruct *)(Item->Data);
 	int counter = 0;
-	AddItem(List,counter,"Time",data->Time);
-	AddItem(List,counter,"Size",data->Size);
+	AddItem(list,counter,"Time",data->Time);
+	AddItem(list,counter,"Size",data->Size);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_EMITTER_ROTATION_KEYFRAMES(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_EMITTER_ROTATION_KEYFRAMES(ChunkItem * Item,CListCtrl * list)
 {
 	W3dEmitterRotationHeaderStruct * header = (W3dEmitterRotationHeaderStruct*)(Item->Data);
 	int counter = 0;
-	AddItem(List,counter,"KeyframeCount",header->KeyframeCount);
-	AddItem(List,counter,"Random",header->Random);
+	AddItem(list,counter,"KeyframeCount",header->KeyframeCount);
+	AddItem(list,counter,"Random",header->Random);
 
 	W3dEmitterRotationKeyframeStruct * key = (W3dEmitterRotationKeyframeStruct *)((char*)Item->Data + sizeof(W3dEmitterRotationHeaderStruct));
 	char buf[256];
 	for (unsigned int i=0; i<header->KeyframeCount+1; i++) {
 		sprintf(buf,"Time[%d]",i);
-		AddItem(List,counter,buf,key[i].Time);
+		AddItem(list,counter,buf,key[i].Time);
 		sprintf(buf,"Rotation[%d]",i);
-		AddItem(List,counter,buf,key[i].Rotation);
+		AddItem(list,counter,buf,key[i].Rotation);
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_EMITTER_FRAME_KEYFRAMES(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_EMITTER_FRAME_KEYFRAMES(ChunkItem * Item,CListCtrl * list)
 {
 	W3dEmitterFrameHeaderStruct * header = (W3dEmitterFrameHeaderStruct*)(Item->Data);
 	int counter = 0;
-	AddItem(List,counter,"KeyframeCount",header->KeyframeCount);
-	AddItem(List,counter,"Random",header->Random);
+	AddItem(list,counter,"KeyframeCount",header->KeyframeCount);
+	AddItem(list,counter,"Random",header->Random);
 
 	W3dEmitterFrameKeyframeStruct * key = (W3dEmitterFrameKeyframeStruct *)((char *)Item->Data + sizeof(W3dEmitterFrameHeaderStruct));
 	char buf[256];
 	for (unsigned int i=0; i<header->KeyframeCount+1; i++) {
 		sprintf(buf,"Time[%d]",i);
-		AddItem(List,counter,buf,key[i].Time);
+		AddItem(list,counter,buf,key[i].Time);
 		sprintf(buf,"Frame[%d]",i);
-		AddItem(List,counter,buf,key[i].Frame);
+		AddItem(list,counter,buf,key[i].Frame);
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_EMITTER_BLUR_TIME_KEYFRAMES(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_EMITTER_BLUR_TIME_KEYFRAMES(ChunkItem * Item,CListCtrl * list)
 {
 	W3dEmitterBlurTimeHeaderStruct * header = (W3dEmitterBlurTimeHeaderStruct*)(Item->Data);
 	int counter = 0;
-	AddItem(List,counter,"KeyframeCount",header->KeyframeCount);
-	AddItem(List,counter,"Random",header->Random);
+	AddItem(list,counter,"KeyframeCount",header->KeyframeCount);
+	AddItem(list,counter,"Random",header->Random);
 
 	W3dEmitterBlurTimeKeyframeStruct * key = (W3dEmitterBlurTimeKeyframeStruct *)((char *)Item->Data + sizeof(W3dEmitterBlurTimeHeaderStruct));
 	char buf[256];
 	for (unsigned int i=0; i<header->KeyframeCount+1; i++) {
 		sprintf(buf,"Time[%d]",i);
-		AddItem(List,counter,buf,key[i].Time);
+		AddItem(list,counter,buf,key[i].Time);
 		sprintf(buf,"BlurTime[%d]",i);
-		AddItem(List,counter,buf,key[i].BlurTime);
+		AddItem(list,counter,buf,key[i].BlurTime);
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_AGGREGATE(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_AGGREGATE(ChunkItem * Item,CListCtrl * list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_AGGREGATE_HEADER(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_AGGREGATE_HEADER(ChunkItem * Item,CListCtrl * list)
 {
 	W3dAggregateHeaderStruct * data = (W3dAggregateHeaderStruct*)Item->Data;
 	int counter = 0;
-	AddItem(List,counter,"Version",data->Version);
-	AddItem(List,counter,"Name",data->Name);
+	AddItem(list,counter,"Version",data->Version);
+	AddItem(list,counter,"Name",data->Name);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_AGGREGATE_INFO(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_AGGREGATE_INFO(ChunkItem * Item,CListCtrl * list)
 {
 	W3dAggregateInfoStruct * info = (W3dAggregateInfoStruct *)Item->Data;
 	int counter = 0;
-	AddItem(List,counter,"BaseModelName",info->BaseModelName);
-	AddItem(List,counter,"SubobjectCount",info->SubobjectCount);
+	AddItem(list,counter,"BaseModelName",info->BaseModelName);
+	AddItem(list,counter,"SubobjectCount",info->SubobjectCount);
 
 	char label[256];
 	W3dAggregateSubobjectStruct * defs = (W3dAggregateSubobjectStruct *)((char*)Item->Data + sizeof(W3dAggregateInfoStruct));
-	
+
 	for (unsigned int subobj=0; subobj<info->SubobjectCount; subobj++) {
 		counter = 0;
-		
+
 		sprintf(label,"SubObject[%d].SubobjectName",subobj);
-		AddItem(List,counter,label,defs[subobj].SubobjectName);
+		AddItem(list,counter,label,defs[subobj].SubobjectName);
 		sprintf(label,"SubObject[%d].BoneName",subobj);
-		AddItem(List,counter,label,defs[subobj].BoneName);
+		AddItem(list,counter,label,defs[subobj].BoneName);
 
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_TEXTURE_REPLACER_INFO(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_TEXTURE_REPLACER_INFO(ChunkItem * Item,CListCtrl * list)
 {
 	W3dTextureReplacerHeaderStruct * header = (W3dTextureReplacerHeaderStruct *)(Item->Data);
 	int counter = 0;
-	AddItem(List,counter,"ReplacedTexturesCount",header->ReplacedTexturesCount);
+	AddItem(list,counter,"ReplacedTexturesCount",header->ReplacedTexturesCount);
 
 	W3dTextureReplacerStruct * data = (W3dTextureReplacerStruct *)(header + 1);
 
@@ -1951,166 +1951,166 @@ void ChunkTableClass::List_W3D_CHUNK_TEXTURE_REPLACER_INFO(ChunkItem * Item,CLis
 
 		for (pathidx=0; pathidx<MESH_PATH_ENTRIES; pathidx++){
 			sprintf(label,"Replacer[%d].MeshPath[%d]",replaceidx,pathidx);
-			AddItem(List,counter,label,data->MeshPath[pathidx]);
+			AddItem(list,counter,label,data->MeshPath[pathidx]);
 		}
 
 		for (pathidx=0; pathidx<MESH_PATH_ENTRIES; pathidx++){
 			sprintf(label,"Replacer[%d].BonePath[%d]",replaceidx,pathidx);
-			AddItem(List,counter,label,data->BonePath[pathidx]);
+			AddItem(list,counter,label,data->BonePath[pathidx]);
 		}
-		
-		AddItem(List,counter,"OldTextureName",data->OldTextureName);
-		AddItem(List,counter,"NewTextureName",data->NewTextureName);
-		AddItem(List,counter,"TextureParams.Attributes", data->TextureParams.Attributes);
-		AddItem(List,counter,"TextureParams.FrameCount", data->TextureParams.FrameCount);
-		AddItem(List,counter,"TextureParams.FrameRate", data->TextureParams.FrameRate);
+
+		AddItem(list,counter,"OldTextureName",data->OldTextureName);
+		AddItem(list,counter,"NewTextureName",data->NewTextureName);
+		AddItem(list,counter,"TextureParams.Attributes", data->TextureParams.Attributes);
+		AddItem(list,counter,"TextureParams.FrameCount", data->TextureParams.FrameCount);
+		AddItem(list,counter,"TextureParams.FrameRate", data->TextureParams.FrameRate);
 		data++;
 	}
 }
 
-void ChunkTableClass::List_W3D_CHUNK_AGGREGATE_CLASS_INFO(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_AGGREGATE_CLASS_INFO(ChunkItem * Item,CListCtrl * list)
 {
 	W3dAggregateMiscInfo * data = (W3dAggregateMiscInfo *)(Item->Data);
 	int counter = 0;
-	AddItem(List,counter,"OriginalClassID",data->OriginalClassID);
-	AddItem(List,counter,"Flags",data->Flags);
+	AddItem(list,counter,"OriginalClassID",data->OriginalClassID);
+	AddItem(list,counter,"Flags",data->Flags);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_HLOD(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_HLOD(ChunkItem * Item,CListCtrl * list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_HLOD_HEADER(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_HLOD_HEADER(ChunkItem * Item,CListCtrl * list)
 {
 	W3dHLodHeaderStruct * header = (W3dHLodHeaderStruct *)Item->Data;
 	int counter = 0;
-	
-	AddItem(List,counter,"Version",header->Version);
-	AddItem(List,counter,"LodCount", header->LodCount);
-	AddItem(List,counter,"Name",header->Name);
-	AddItem(List,counter,"HTree Name", header->HierarchyName);
+
+	AddItem(list,counter,"Version",header->Version);
+	AddItem(list,counter,"LodCount", header->LodCount);
+	AddItem(list,counter,"Name",header->Name);
+	AddItem(list,counter,"HTree Name", header->HierarchyName);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_HLOD_LOD_ARRAY(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_HLOD_LOD_ARRAY(ChunkItem * Item,CListCtrl * list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_HLOD_LOD_ARRAY_HEADER(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_HLOD_LOD_ARRAY_HEADER(ChunkItem * Item,CListCtrl * list)
 {
 	W3dHLodArrayHeaderStruct * header = (W3dHLodArrayHeaderStruct *)Item->Data;
 	int counter = 0;
 
-	AddItem(List,counter,"ModelCount",header->ModelCount);
-	AddItem(List,counter,"MaxScreenSize",header->MaxScreenSize);
+	AddItem(list,counter,"ModelCount",header->ModelCount);
+	AddItem(list,counter,"MaxScreenSize",header->MaxScreenSize);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_HLOD_SUB_OBJECT(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_HLOD_SUB_OBJECT(ChunkItem * Item,CListCtrl * list)
 {
 	W3dHLodSubObjectStruct * data = (W3dHLodSubObjectStruct *)Item->Data;
 	int counter = 0;
-	AddItem(List,counter,"Name",data->Name);
-	AddItem(List,counter,"BoneIndex",data->BoneIndex);
+	AddItem(list,counter,"Name",data->Name);
+	AddItem(list,counter,"BoneIndex",data->BoneIndex);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_BOX(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_BOX(ChunkItem * Item,CListCtrl * list)
 {
 	W3dBoxStruct * box = (W3dBoxStruct *)Item->Data;
 	int counter = 0;
-	AddItem(List,counter,"Version",box->Version);
-	AddItem(List,counter,"Attributes",box->Attributes);
+	AddItem(list,counter,"Version",box->Version);
+	AddItem(list,counter,"Attributes",box->Attributes);
 
 	if (box->Attributes & W3D_BOX_ATTRIBUTE_ORIENTED) {
-		AddItem(List,counter,"Attributes","W3D_BOX_ATTRIBUTE_ORIENTED","flag");
+		AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBUTE_ORIENTED","flag");
 	}
 	if (box->Attributes & W3D_BOX_ATTRIBUTE_ALIGNED) {
-		AddItem(List,counter,"Attributes","W3D_BOX_ATTRIBUTE_ALIGNED","flag");
+		AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBUTE_ALIGNED","flag");
 	}
 	if (box->Attributes & W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PHYSICAL) {
-		AddItem(List,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PHYSICAL","flag");
+		AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PHYSICAL","flag");
 	}
 	if (box->Attributes & W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PROJECTILE) {
-		AddItem(List,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PROJECTILE","flag");
+		AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_PROJECTILE","flag");
 	}
 	if (box->Attributes & W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VIS) {
-		AddItem(List,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VIS","flag");
+		AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VIS","flag");
 	}
 	if (box->Attributes & W3D_BOX_ATTRIBTUE_COLLISION_TYPE_CAMERA) {
-		AddItem(List,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_CAMERA","flag");
+		AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_CAMERA","flag");
 	}
 	if (box->Attributes & W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VEHICLE) {
-		AddItem(List,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VEHICLE","flag");
+		AddItem(list,counter,"Attributes","W3D_BOX_ATTRIBTUE_COLLISION_TYPE_VEHICLE","flag");
 	}
-	
-	AddItem(List,counter,"Name",box->Name);
-	AddItem(List,counter,"Color",&(box->Color));
-	AddItem(List,counter,"Center",&(box->Center));
-	AddItem(List,counter,"Extent",&(box->Extent));
+
+	AddItem(list,counter,"Name",box->Name);
+	AddItem(list,counter,"Color",&(box->Color));
+	AddItem(list,counter,"Center",&(box->Center));
+	AddItem(list,counter,"Extent",&(box->Extent));
 }
 
-void ChunkTableClass::List_W3D_CHUNK_NULL_OBJECT(ChunkItem * Item,CListCtrl * List)
+void ChunkTableClass::List_W3D_CHUNK_NULL_OBJECT(ChunkItem * Item,CListCtrl * list)
 {
 	W3dNullObjectStruct * null = (W3dNullObjectStruct *)Item->Data;
 	int counter = 0;
-	AddItemVersion(List,counter,null->Version);
-	AddItem(List,counter,"Attributes",null->Attributes);
+	AddItemVersion(list,counter,null->Version);
+	AddItem(list,counter,"Attributes",null->Attributes);
 
 	// No attributes are currently used
 
-	AddItem(List,counter,"Name",null->Name);
+	AddItem(list,counter,"Name",null->Name);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_PRELIT_UNLIT(ChunkItem *Item, CListCtrl *List) {
-	List_Subitems(Item, List);
+void ChunkTableClass::List_W3D_CHUNK_PRELIT_UNLIT(ChunkItem *Item, CListCtrl *list) {
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_PRELIT_VERTEX(ChunkItem *Item, CListCtrl *List) {
-	List_Subitems(Item, List);
+void ChunkTableClass::List_W3D_CHUNK_PRELIT_VERTEX(ChunkItem *Item, CListCtrl *list) {
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_PRELIT_LIGHTMAP_MULTI_PASS(ChunkItem *Item, CListCtrl *List) {
-	List_Subitems(Item, List);
+void ChunkTableClass::List_W3D_CHUNK_PRELIT_LIGHTMAP_MULTI_PASS(ChunkItem *Item, CListCtrl *list) {
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_PRELIT_LIGHTMAP_MULTI_TEXTURE(ChunkItem *Item, CListCtrl *List) {
-	List_Subitems(Item, List);
+void ChunkTableClass::List_W3D_CHUNK_PRELIT_LIGHTMAP_MULTI_TEXTURE(ChunkItem *Item, CListCtrl *list) {
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_LIGHTSCAPE(ChunkItem *Item, CListCtrl *List) {
-	List_Subitems(Item, List);
+void ChunkTableClass::List_W3D_CHUNK_LIGHTSCAPE(ChunkItem *Item, CListCtrl *list) {
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_LIGHTSCAPE_LIGHT(ChunkItem *Item, CListCtrl *List) {
-	List_Subitems(Item, List);
+void ChunkTableClass::List_W3D_CHUNK_LIGHTSCAPE_LIGHT(ChunkItem *Item, CListCtrl *list) {
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_LIGHT_TRANSFORM(ChunkItem *Item, CListCtrl *List) {
+void ChunkTableClass::List_W3D_CHUNK_LIGHT_TRANSFORM(ChunkItem *Item, CListCtrl *list) {
 
 	W3dLightTransformStruct *data = (W3dLightTransformStruct*) (Item->Data);
 
 	int counter = 0;
 
-	AddItem (List, counter, "Transform", &(data->Transform [0][0]), 4);
-	AddItem (List, counter, "Transform", &(data->Transform [1][0]), 4);
-	AddItem (List, counter, "Transform", &(data->Transform [2][0]), 4);
+	AddItem (list, counter, "Transform", &(data->Transform [0][0]), 4);
+	AddItem (list, counter, "Transform", &(data->Transform [1][0]), 4);
+	AddItem (list, counter, "Transform", &(data->Transform [2][0]), 4);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_DAZZLE(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_DAZZLE(ChunkItem *Item, CListCtrl *list)
 {
-	List_Subitems(Item, List);
+	List_Subitems(Item, list);
 }
 
-void ChunkTableClass::List_W3D_CHUNK_DAZZLE_NAME(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_DAZZLE_NAME(ChunkItem *Item, CListCtrl *list)
 {
 	int counter = 0;
-	AddItem (List, counter, "Dazzle Name", (char *)(Item->Data));
+	AddItem (list, counter, "Dazzle Name", (char *)(Item->Data));
 }
 
-void ChunkTableClass::List_W3D_CHUNK_DAZZLE_TYPENAME(ChunkItem *Item, CListCtrl *List)
+void ChunkTableClass::List_W3D_CHUNK_DAZZLE_TYPENAME(ChunkItem *Item, CListCtrl *list)
 {
 	int counter = 0;
-	AddItem (List, counter, "Dazzle Type Name", (char *)(Item->Data));
+	AddItem (list, counter, "Dazzle Type Name", (char *)(Item->Data));
 }
 
 ChunkTableClass::ChunkTableClass() {
@@ -2130,7 +2130,7 @@ ChunkTableClass::ChunkTableClass() {
 	NewType( W3D_CHUNK_MESH_USER_TEXT, "W3D_CHUNK_MESH_USER_TEXT", List_W3D_CHUNK_MESH_USER_TEXT);
 	NewType( W3D_CHUNK_VERTEX_COLORS, "W3D_CHUNK_VERTEX_COLORS", List_W3D_CHUNK_VERTEX_COLORS);
 	NewType( W3D_CHUNK_VERTEX_INFLUENCES, "W3D_CHUNK_VERTEX_INFLUENCES", List_W3D_CHUNK_VERTEX_INFLUENCES);
-	
+
 	NewType( W3D_CHUNK_DAMAGE, "W3D_CHUNK_DAMAGE", List_W3D_CHUNK_DAMAGE, true);
 	NewType( W3D_CHUNK_DAMAGE_HEADER, "W3D_CHUNK_DAMAGE_HEADER", List_W3D_CHUNK_DAMAGE_HEADER);
 	NewType( W3D_CHUNK_DAMAGE_VERTICES, "W3D_CHUNK_DAMAGE_VERTICES", List_W3D_CHUNK_DAMAGE_VERTICES);
@@ -2175,7 +2175,7 @@ ChunkTableClass::ChunkTableClass() {
 	NewType( W3D_CHUNK_TEXTURE, "W3D_CHUNK_TEXTURE", List_W3D_CHUNK_TEXTURE,true);
 	NewType( W3D_CHUNK_TEXTURE_NAME, "W3D_CHUNK_TEXTURE_NAME", List_W3D_CHUNK_TEXTURE_NAME);
 	NewType( W3D_CHUNK_TEXTURE_INFO, "W3D_CHUNK_TEXTURE_INFO", List_W3D_CHUNK_TEXTURE_INFO);
-	
+
 	NewType( W3D_CHUNK_MATERIAL_PASS, "W3D_CHUNK_MATERIAL_PASS", List_W3D_CHUNK_MATERIAL_PASS,true);
 	NewType( W3D_CHUNK_VERTEX_MATERIAL_IDS, "W3D_CHUNK_VERTEX_MATERIAL_IDS", List_W3D_CHUNK_VERTEX_MATERIAL_IDS);
 	NewType( W3D_CHUNK_SHADER_IDS, "W3D_CHUNK_SHADER_IDS", List_W3D_CHUNK_SHADER_IDS);
@@ -2188,12 +2188,12 @@ ChunkTableClass::ChunkTableClass() {
 	NewType( W3D_CHUNK_TEXTURE_IDS, "W3D_CHUNK_TEXTURE_IDS", List_W3D_CHUNK_TEXTURE_IDS);
 	NewType( W3D_CHUNK_STAGE_TEXCOORDS, "W3D_CHUNK_STAGE_TEXCOORDS", List_W3D_CHUNK_STAGE_TEXCOORDS);
 	NewType( W3D_CHUNK_PER_FACE_TEXCOORD_IDS, "W3D_CHUNK_PER_FACE_TEXCOORD_IDS", List_W3D_CHUNK_PER_FACE_TEXCOORD_IDS);
-	
+
 	NewType( W3D_CHUNK_AABTREE, "W3D_CHUNK_AABTREE", List_W3D_CHUNK_AABTREE,true);
 	NewType( W3D_CHUNK_AABTREE_HEADER, "W3D_CHUNK_AABTREE_HEADER", List_W3D_CHUNK_AABTREE_HEADER);
 	NewType( W3D_CHUNK_AABTREE_POLYINDICES, "W3D_CHUNK_AABTREE_POLYINDICES", List_W3D_CHUNK_AABTREE_POLYINDICES);
 	NewType( W3D_CHUNK_AABTREE_NODES, "W3D_CHUNK_AABTREE_NODES", List_W3D_CHUNK_AABTREE_NODES);
-	
+
 	NewType( W3D_CHUNK_HIERARCHY, "W3D_CHUNK_HIERARCHY", List_W3D_CHUNK_HIERARCHY, true);
 	NewType( W3D_CHUNK_HIERARCHY_HEADER, "W3D_CHUNK_HIERARCHY_HEADER", List_W3D_CHUNK_HIERARCHY_HEADER);
 	NewType( W3D_CHUNK_PIVOTS, "W3D_CHUNK_PIVOTS", List_W3D_CHUNK_PIVOTS);
@@ -2248,7 +2248,7 @@ ChunkTableClass::ChunkTableClass() {
 	NewType( W3D_CHUNK_AGGREGATE_INFO, "W3D_CHUNK_AGGREGATE_INFO",List_W3D_CHUNK_AGGREGATE_INFO);
 	NewType( W3D_CHUNK_TEXTURE_REPLACER_INFO, "W3D_CHUNK_TEXTURE_REPLACER_INFO", List_W3D_CHUNK_TEXTURE_REPLACER_INFO);
 	NewType( W3D_CHUNK_AGGREGATE_CLASS_INFO, "W3D_CHUNK_AGGREGATE_CLASS_INFO", List_W3D_CHUNK_AGGREGATE_CLASS_INFO);
-	
+
 	NewType( W3D_CHUNK_HLOD, "W3D_CHUNK_HLOD", List_W3D_CHUNK_HLOD, true);
 	NewType( W3D_CHUNK_HLOD_HEADER, "W3D_CHUNK_HLOD_HEADER", List_W3D_CHUNK_HLOD_HEADER);
 	NewType( W3D_CHUNK_HLOD_LOD_ARRAY, "W3D_CHUNK_HLOD_LOD_ARRAY", List_W3D_CHUNK_HLOD_LOD_ARRAY, true);
@@ -2277,7 +2277,7 @@ ChunkTableClass::ChunkTableClass() {
 
 ChunkType *ChunkTableClass::Lookup(int ID) {
 	ChunkType *chunktype;
-	if(Types.Lookup((void *) ID, (void *&) chunktype)) 
+	if(Types.Lookup((void *) ID, (void *&) chunktype))
 		return chunktype;
 	return 0;
 }
@@ -2305,8 +2305,7 @@ ChunkItem::ChunkItem(ChunkLoadClass &cload) {
 }
 
 ChunkItem::~ChunkItem() {
-	if(Data != 0) 
-		delete [] Data;
+	delete [] Data;
 	while(!Chunks.IsEmpty()) {
 		ChunkItem *item = Chunks.RemoveHead();
 		delete item;
@@ -2378,9 +2377,9 @@ bool ChunkData::Load(const char *filename)
 void ChunkData::Add_Chunk(ChunkLoadClass & cload, ChunkItem *Parent)
 {
 	ChunkItem *item = new ChunkItem(cload);
-	if(Parent) 
+	if(Parent)
 		Parent->Chunks.AddTail(item);
-	else 
+	else
 		Chunks.AddTail(item);
 //Moumine 1/2/2002    1:21:26 PM
 #if ! defined _W3DSHELLEXT
@@ -2389,15 +2388,15 @@ void ChunkData::Add_Chunk(ChunkLoadClass & cload, ChunkItem *Parent)
 			static CMapStringToString existing;
 
 			char * data = (char *)item->Data;
-			
+
 			CString value;
 			if(existing.Lookup(data, value) == FALSE) {
 
 				existing.SetAt(data, data);
 
-				if(theApp.TextureDumpFile != 0) 
+				if(theApp.TextureDumpFile != 0)
 					fprintf(theApp.TextureDumpFile, "%s,%s\n", (LPCTSTR)theApp.Filename, data);
-				TRACE("%s,%s\n", theApp.Filename, data);
+				TRACE("%s,%s\n", static_cast<const char*>(theApp.Filename), data);
 			}
 		}
 	}
diff --git a/GeneralsMD/Code/Tools/wdump/chunk_d.h b/GeneralsMD/Code/Tools/wdump/chunk_d.h
index 8efb942622e..8a06a4707c1 100644
--- a/GeneralsMD/Code/Tools/wdump/chunk_d.h
+++ b/GeneralsMD/Code/Tools/wdump/chunk_d.h
@@ -20,12 +20,8 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_CHUNK_D_H__41C157F9_5631_11D1_8CDB_006097C6A583__INCLUDED_)
-#define AFX_CHUNK_D_H__41C157F9_5631_11D1_8CDB_006097C6A583__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 class ChunkItem;
 
 class ChunkType {
@@ -40,7 +36,7 @@ class ChunkTableClass {
 public:
 	ChunkTableClass();
 	~ChunkTableClass();
-	ChunkType *Lookup(int ID); 
+	ChunkType *Lookup(int ID);
 	void NewType(int ID, const char *name, void (*callback)(ChunkItem *item, CListCtrl *list) = 0, bool wrapper = false);
 protected:
 	CMapPtrToPtr Types;
@@ -64,7 +60,7 @@ class ChunkTableClass {
 	static void AddItem(CListCtrl *List, int &Counter, const char *Name, Vector3i *Value);
 	static void AddItem(CListCtrl *List, int &Counter, const char *name, W3dShaderStruct * shader);
 	static void AddItem(CListCtrl *List, int &Counter, const char *name, W3dPS2ShaderStruct * shader);
-		
+
 	static void AddItemVersion(CListCtrl *List,int &Counter,uint32 version);
 
 
@@ -85,12 +81,12 @@ class ChunkTableClass {
 	static void List_W3D_CHUNK_MESH_USER_TEXT(ChunkItem *Item, CListCtrl *List);
 	static void List_W3D_CHUNK_VERTEX_COLORS(ChunkItem *Item, CListCtrl *List);
 	static void List_W3D_CHUNK_VERTEX_INFLUENCES(ChunkItem *Item, CListCtrl *List);
-	
+
 	static void List_W3D_CHUNK_DAMAGE(ChunkItem *Item, CListCtrl *List);
 	static void List_W3D_CHUNK_DAMAGE_HEADER(ChunkItem *Item, CListCtrl *List);
 	static void List_W3D_CHUNK_DAMAGE_VERTICES(ChunkItem *Item, CListCtrl *List);
 	static void List_W3D_CHUNK_DAMAGE_COLORS(ChunkItem *Item, CListCtrl *List);
-	
+
 	static void List_O_W3D_CHUNK_MATERIALS2(ChunkItem *Item, CListCtrl *List);
 
 	static void List_W3D_CHUNK_MATERIALS3(ChunkItem *Item, CListCtrl *List);
@@ -132,7 +128,7 @@ class ChunkTableClass {
 	static void List_W3D_CHUNK_TEXTURE(ChunkItem * Item,CListCtrl *List);
 	static void List_W3D_CHUNK_TEXTURE_NAME(ChunkItem * Item,CListCtrl *List);
 	static void List_W3D_CHUNK_TEXTURE_INFO(ChunkItem * Item,CListCtrl *List);
-	
+
 	static void List_W3D_CHUNK_MATERIAL_PASS(ChunkItem * Item,CListCtrl *List);
 	static void List_W3D_CHUNK_VERTEX_MATERIAL_IDS(ChunkItem * Item,CListCtrl *List);
 	static void List_W3D_CHUNK_SHADER_IDS(ChunkItem * Item,CListCtrl *List);
@@ -140,7 +136,7 @@ class ChunkTableClass {
 	static void List_W3D_CHUNK_DIG(ChunkItem * Item,CListCtrl *List);
 	static void List_W3D_CHUNK_SCG(ChunkItem * Item,CListCtrl *List);
 	static void List_W3D_CHUNK_FXSHADER_IDS(ChunkItem* Item, CListCtrl* List);
-	
+
 	static void List_W3D_CHUNK_TEXTURE_STAGE(ChunkItem * Item,CListCtrl *List);
 	static void List_W3D_CHUNK_TEXTURE_IDS(ChunkItem * Item,CListCtrl *List);
 	static void List_W3D_CHUNK_STAGE_TEXCOORDS(ChunkItem * Item,CListCtrl *List);
@@ -172,7 +168,7 @@ class ChunkTableClass {
 	static void List_W3D_CHUNK_LODMODEL(ChunkItem *Item, CListCtrl *List);
 	static void List_W3D_CHUNK_LODMODEL_HEADER(ChunkItem *Item, CListCtrl *List);
 	static void List_W3D_CHUNK_LOD(ChunkItem * Item,CListCtrl * List);
-	
+
 	static void List_W3D_CHUNK_COLLECTION(ChunkItem * Item,CListCtrl * List);
 	static void List_W3D_CHUNK_COLLECTION_HEADER(ChunkItem * Item,CListCtrl * List);
 	static void List_W3D_CHUNK_COLLECTION_OBJ_NAME(ChunkItem * Item,CListCtrl * List);
@@ -244,7 +240,7 @@ class ChunkItem {
 };
 
 
-class ChunkData  
+class ChunkData
 {
 public:
 	void Release_Data();
@@ -256,5 +252,3 @@ class ChunkData
 protected:
 	void Add_Chunk(ChunkLoadClass &cload, ChunkItem *Parent = 0); // add a chunk to the list of chunks maintained by ChunkData
 };
-
-#endif // !defined(AFX_CHUNK_D_H__41C157F9_5631_11D1_8CDB_006097C6A583__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/wdump/mainfrm.cpp b/GeneralsMD/Code/Tools/wdump/mainfrm.cpp
index 756c533d85a..d9fb113040e 100644
--- a/GeneralsMD/Code/Tools/wdump/mainfrm.cpp
+++ b/GeneralsMD/Code/Tools/wdump/mainfrm.cpp
@@ -22,9 +22,9 @@
 #include "stdafx.h"
 #include "wdump.h"
 #include "wdtview.h"
-#include "wdLview.h"
+#include "wdlview.h"
 
-#include "MainFrm.h"
+#include "mainfrm.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -59,7 +59,7 @@ static UINT indicators[] =
 CMainFrame::CMainFrame()
 {
 	// TODO: add member initialization code here
-	
+
 }
 
 CMainFrame::~CMainFrame()
@@ -70,7 +70,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 {
 	if (CFrameWnd::OnCreate(lpCreateStruct) == -1)
 		return -1;
-	
+
 	if (!m_wndToolBar.Create(this) ||
 		!m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
 	{
@@ -102,11 +102,11 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 BOOL CMainFrame::OnCreateClient( LPCREATESTRUCT /*lpcs*/,
 	CCreateContext* pContext)
 {
-	CRect r; 
+	CRect r;
 	GetClientRect(r);
-	// TODO: Add your specialized code here and/or call the base class 
-	if (!m_SplitWnd.CreateStatic(this, 1,2) || 
-		!m_SplitWnd.CreateView(0, 0, RUNTIME_CLASS(CWDumpTreeView), CSize(300,0), pContext) || 
+	// TODO: Add your specialized code here and/or call the base class
+	if (!m_SplitWnd.CreateStatic(this, 1,2) ||
+		!m_SplitWnd.CreateView(0, 0, RUNTIME_CLASS(CWDumpTreeView), CSize(300,0), pContext) ||
 		!m_SplitWnd.CreateView(0, 1, RUNTIME_CLASS(CWDumpListView), CSize(0,0), pContext)) {
 		return FALSE;
 	} else {
diff --git a/GeneralsMD/Code/Tools/wdump/mainfrm.h b/GeneralsMD/Code/Tools/wdump/mainfrm.h
index 6286bcb5446..9015bd9f316 100644
--- a/GeneralsMD/Code/Tools/wdump/mainfrm.h
+++ b/GeneralsMD/Code/Tools/wdump/mainfrm.h
@@ -20,12 +20,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_MAINFRM_H__41C157EB_5631_11D1_8CDB_006097C6A583__INCLUDED_)
-#define AFX_MAINFRM_H__41C157EB_5631_11D1_8CDB_006097C6A583__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 class CMainFrame : public CFrameWnd
 {
@@ -75,5 +70,3 @@ class CMainFrame : public CFrameWnd
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MAINFRM_H__41C157EB_5631_11D1_8CDB_006097C6A583__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/wdump/rawfilem.cpp b/GeneralsMD/Code/Tools/wdump/rawfilem.cpp
index 0eba9c71a5e..6e551ac90b8 100644
--- a/GeneralsMD/Code/Tools/wdump/rawfilem.cpp
+++ b/GeneralsMD/Code/Tools/wdump/rawfilem.cpp
@@ -16,22 +16,22 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : G                                      * 
- *                                                                                             * 
- *                     $Archive:: /G/wdump/RAWFILEM.CPP                                       $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : G                                      *
+ *                                                                                             *
+ *                     $Archive:: /G/wdump/RAWFILEM.cpp                                       $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/28/97 3:36p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 3                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   RawFileMClass::Bias -- Bias a file with a specific starting position and length.           *
  *   RawFileMClass::Close -- Perform a closure of the file.                                     *
  *   RawFileMClass::Create -- Creates an empty file.                                            *
@@ -56,9 +56,7 @@
 #include	<direct.h>
 #include	<share.h>
 #include	<stddef.h>
-#include	<stdio.h>
 #include	<stdlib.h>
-#include	<string.h>
 
 
 /***********************************************************************************************
@@ -67,7 +65,7 @@
  *    Display an error message as indicated. If it is allowed to retry, then pressing a key    *
  *    will return from this function. Otherwise, it will exit the program with "exit()".       *
  *                                                                                             *
- * INPUT:   error    -- The error number (same as the DOSERR.H error numbers).                 *
+ * INPUT:   error    -- The error number (same as the DOSERR.h error numbers).                 *
  *                                                                                             *
  *          canretry -- Can this routine exit normally so that retrying can occur? If this is  *
  *                      false, then the program WILL exit in this routine.                     *
@@ -141,7 +139,7 @@ RawFileMClass::RawFileMClass(char const * filename) :
  *=============================================================================================*/
 char const * RawFileMClass::Set_Name(char const * filename)
 {
-	if (Filename != NULL && Allocated) {
+	if (Allocated) {
 		free((char *)Filename);
 		Filename = NULL;
 		Allocated = false;
diff --git a/GeneralsMD/Code/Tools/wdump/rawfilem.h b/GeneralsMD/Code/Tools/wdump/rawfilem.h
index d53793b418b..9edd63a6a8a 100644
--- a/GeneralsMD/Code/Tools/wdump/rawfilem.h
+++ b/GeneralsMD/Code/Tools/wdump/rawfilem.h
@@ -16,30 +16,29 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*********************************************************************************************** 
- ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               *** 
- *********************************************************************************************** 
- *                                                                                             * 
- *                 Project Name : Command & Conquer                                            * 
- *                                                                                             * 
- *                     $Archive:: /G/wdump/RAWFILEM.H                                         $* 
- *                                                                                             * 
+/***********************************************************************************************
+ ***              C O N F I D E N T I A L  ---  W E S T W O O D  S T U D I O S               ***
+ ***********************************************************************************************
+ *                                                                                             *
+ *                 Project Name : Command & Conquer                                            *
+ *                                                                                             *
+ *                     $Archive:: /G/wdump/RAWFILEM.h                                         $*
+ *                                                                                             *
  *                      $Author:: Eric_c                                                      $*
- *                                                                                             * 
+ *                                                                                             *
  *                     $Modtime:: 7/28/97 3:36p                                               $*
- *                                                                                             * 
+ *                                                                                             *
  *                    $Revision:: 3                                                           $*
  *                                                                                             *
- *---------------------------------------------------------------------------------------------* 
- * Functions:                                                                                  * 
+ *---------------------------------------------------------------------------------------------*
+ * Functions:                                                                                  *
  *   RawFileMClass::File_Name -- Returns with the filename associate with the file object.      *
  *   RawFileMClass::RawFileMClass -- Default constructor for a file object.                      *
  *   RawFileMClass::~RawFileMClass -- Default deconstructor for a file object.                   *
  *   RawFileMClass::Is_Open -- Checks to see if the file is open or not.                        *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-#ifndef RAWFILEM_Hx
-#define RAWFILEM_Hx
+#pragma once
 
 #include	<errno.h>
 #include	<limits.h>
@@ -51,14 +50,14 @@
 #define	NULL_HANDLE		INVALID_HANDLE_VALUE
 #define	HANDLE_TYPE		HANDLE
 
-#include	"wwfile.h"
+#include "WWFILE.h"
 
 #ifdef NEVER
 	/*
 	**	This is a duplicate of the error numbers. The error handler for the RawFileMClass handles
 	**	these errors. If the error routine is overridden and additional errors are defined, then
 	**	use numbers starting with 100. Note that these errors here are listed in numerical order.
-	**	These errors are defined in the standard header file "ERRNO.H".
+	**	These errors are defined in the standard header file "ERRNO.h".
 	*/
 	EZERO,				// Non-error.
 	EINVFNC,				// Invalid function number.
@@ -320,5 +319,3 @@ inline bool RawFileMClass::Is_Open(void) const
 {
 	return(Handle != INVALID_HANDLE_VALUE);
 }
-
-#endif
diff --git a/GeneralsMD/Code/Tools/wdump/resource.h b/GeneralsMD/Code/Tools/wdump/resource.h
index 5e449a9891e..6ec54969c4f 100644
--- a/GeneralsMD/Code/Tools/wdump/resource.h
+++ b/GeneralsMD/Code/Tools/wdump/resource.h
@@ -12,7 +12,7 @@
 #define IDM_TOOLS_FIND_NEXT             32772
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
diff --git a/GeneralsMD/Code/Tools/wdump/stdafx.h b/GeneralsMD/Code/Tools/wdump/stdafx.h
index 7db9f698eca..13957be3164 100644
--- a/GeneralsMD/Code/Tools/wdump/stdafx.h
+++ b/GeneralsMD/Code/Tools/wdump/stdafx.h
@@ -21,12 +21,7 @@
 //      are changed infrequently
 //
 
-#if !defined(AFX_STDAFX_H__41C157E9_5631_11D1_8CDB_006097C6A583__INCLUDED_)
-#define AFX_STDAFX_H__41C157E9_5631_11D1_8CDB_006097C6A583__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
@@ -40,11 +35,9 @@
 #include <afxdlgs.h> // FileDialog class
 
 #include "chunkio.h"
-#include "vector3i.h"
+#include "Vector3i.h"
 #include "w3d_file.h"
 
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__41C157E9_5631_11D1_8CDB_006097C6A583__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/wdump/wdeview.cpp b/GeneralsMD/Code/Tools/wdump/wdeview.cpp
index 43af26d910b..0e5044b723f 100644
--- a/GeneralsMD/Code/Tools/wdump/wdeview.cpp
+++ b/GeneralsMD/Code/Tools/wdump/wdeview.cpp
@@ -21,7 +21,7 @@
 
 #include "stdafx.h"
 #include "wdump.h"
-#include "WDEView.h"
+#include "wdeview.h"
 #include "wdumpdoc.h"
 #include "chunk_d.h"
 
@@ -78,7 +78,7 @@ void CWDumpEditView::Dump(CDumpContext& dc) const
 /////////////////////////////////////////////////////////////////////////////
 // CWDumpEditView message handlers
 
-void CWDumpEditView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint) 
+void CWDumpEditView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint)
 {
 	// TODO: Add your specialized code here and/or call the base class
 	CEdit &edit = GetEditCtrl();
@@ -109,7 +109,7 @@ char * CWDumpEditView::Build_Hex_Text(unsigned char * Source, int Length)
 
 	int lines = Length / per_line;
 	int buf_size = Length * 5 + per_line * 5;
-	
+
 	char *buffer = new char[buf_size];
 	char *dest = buffer;
 
@@ -129,9 +129,9 @@ char * CWDumpEditView::Build_Hex_Text(unsigned char * Source, int Length)
 		counter = 0;
 		do {
 			char c = Source[counter];
-			if(c >= 32 && c <= 192) 
+			if(c >= 32 && c <= 192)
 				*dest++ = c;
-			else 
+			else
 				*dest++ = '.';
 		} while(++counter < per_line);
 
diff --git a/GeneralsMD/Code/Tools/wdump/wdeview.h b/GeneralsMD/Code/Tools/wdump/wdeview.h
index e6d80fd97fd..5b280f8670f 100644
--- a/GeneralsMD/Code/Tools/wdump/wdeview.h
+++ b/GeneralsMD/Code/Tools/wdump/wdeview.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WDVIEW_H__41C157F8_5631_11D1_8CDB_006097C6A583__INCLUDED_)
-#define AFX_WDVIEW_H__41C157F8_5631_11D1_8CDB_006097C6A583__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // WDView.h : header file
 //
 
@@ -69,5 +65,3 @@ class CWDumpEditView : public CEditView
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WDVIEW_H__41C157F8_5631_11D1_8CDB_006097C6A583__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/wdump/wdlview.cpp b/GeneralsMD/Code/Tools/wdump/wdlview.cpp
index 020ce22fe6c..e15f38eee43 100644
--- a/GeneralsMD/Code/Tools/wdump/wdlview.cpp
+++ b/GeneralsMD/Code/Tools/wdump/wdlview.cpp
@@ -21,8 +21,8 @@
 
 #include "stdafx.h"
 #include "wdump.h"
-#include "WDLView.h"
-#include "WDumpDoc.h"
+#include "wdlview.h"
+#include "wdumpdoc.h"
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
 #undef THIS_FILE
@@ -76,12 +76,12 @@ void CWDumpListView::Dump(CDumpContext& dc) const
 /////////////////////////////////////////////////////////////////////////////
 // CWDumpListView message handlers
 
-void CWDumpListView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint) 
+void CWDumpListView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint)
 {
 	CListCtrl &list = GetListCtrl();
 	CWdumpDoc *doc= (CWdumpDoc *) GetDocument();
 	ChunkItem *item = doc->m_ChunkItem;
-	list.DeleteAllItems();	
+	list.DeleteAllItems();
 
 
 	if((item != 0) && (item->Type != 0) && (item->Type->Callback != 0)) {
@@ -89,10 +89,10 @@ void CWDumpListView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint)
 	}
 }
 
-void CWDumpListView::OnInitialUpdate() 
+void CWDumpListView::OnInitialUpdate()
 {
 	CListView::OnInitialUpdate();
-	
+
 	CListCtrl &list = GetListCtrl();
 	long flags = list.GetStyle();
 	flags |= LVS_REPORT;
diff --git a/GeneralsMD/Code/Tools/wdump/wdlview.h b/GeneralsMD/Code/Tools/wdump/wdlview.h
index 2407c3c2d6e..28fb9103dd9 100644
--- a/GeneralsMD/Code/Tools/wdump/wdlview.h
+++ b/GeneralsMD/Code/Tools/wdump/wdlview.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WDLVIEW_H__6C0D7C07_56CD_11D1_8CDC_006097C6A583__INCLUDED_)
-#define AFX_WDLVIEW_H__6C0D7C07_56CD_11D1_8CDC_006097C6A583__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // WDLView.h : header file
 //
 
@@ -70,5 +66,3 @@ class CWDumpListView : public CListView
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WDLVIEW_H__6C0D7C07_56CD_11D1_8CDC_006097C6A583__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/wdump/wdtview.cpp b/GeneralsMD/Code/Tools/wdump/wdtview.cpp
index 6c5e3d0d1e7..b1d112364f3 100644
--- a/GeneralsMD/Code/Tools/wdump/wdtview.cpp
+++ b/GeneralsMD/Code/Tools/wdump/wdtview.cpp
@@ -21,10 +21,10 @@
 
 #include "stdafx.h"
 #include "wdump.h"
-#include "WDTView.h"
+#include "wdtview.h"
 #include "wdumpdoc.h"
 #include "chunk_d.h"
-#include "finddialog.h"
+#include "FindDialog.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -82,7 +82,7 @@ void CWDumpTreeView::Dump(CDumpContext& dc) const
 /////////////////////////////////////////////////////////////////////////////
 // CWDumpTreeView message handlers
 
-void CWDumpTreeView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint) 
+void CWDumpTreeView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint)
 {
 	// add all the chunk items to the view
 	CTreeCtrl &tree = GetTreeCtrl();
@@ -93,7 +93,7 @@ void CWDumpTreeView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint)
 
 	CWdumpDoc *doc= (CWdumpDoc *) GetDocument();
 	ChunkData *data = &doc->m_ChunkData;
-	
+
 	POSITION p = data->Chunks.GetHeadPosition();
 	while(p) {
 		ChunkItem *item = data->Chunks.GetNext(p);
@@ -102,7 +102,7 @@ void CWDumpTreeView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint)
 }
 
 
-void CWDumpTreeView::OnSelchanged(NMHDR* pNMHDR, LRESULT* pResult) 
+void CWDumpTreeView::OnSelchanged(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
 
@@ -118,7 +118,7 @@ void CWDumpTreeView::InsertItem(ChunkItem * item, HTREEITEM Parent)
 {
 	const char *name;
 
-	if(item->Type) 
+	if(item->Type)
 		name = item->Type->Name;
 	else {
 		static char _buf[256];
@@ -132,13 +132,13 @@ void CWDumpTreeView::InsertItem(ChunkItem * item, HTREEITEM Parent)
 
 	POSITION p = item->Chunks.GetHeadPosition();
 	while(p != 0) {
-		ChunkItem *subitem = item->Chunks.GetNext(p); 
+		ChunkItem *subitem = item->Chunks.GetNext(p);
 		InsertItem(subitem, tree_item);
 	}
 }
 
 
-void CWDumpTreeView::OnToolsFind() 
+void CWDumpTreeView::OnToolsFind()
 {
 	FindDialog finder;
 
@@ -152,15 +152,15 @@ void CWDumpTreeView::OnToolsFind()
 }
 
 
-void CWDumpTreeView::OnToolsFindNext() 
+void CWDumpTreeView::OnToolsFindNext()
 {
 	ChunkItem *matchedchunkitem;
-	
+
 	// If no string go request one.
 	if (strlen (FindDialog::String()) == 0) {
 
 		OnToolsFind();
-	
+
 	} else {
 
 		FindDialog::Found (false);
@@ -169,7 +169,7 @@ void CWDumpTreeView::OnToolsFindNext()
 		// item that corresponds to the matched chunk item.
 		{
 			CWaitCursor			waitcursor;
-			HTREEITEM			selectedtreeitem;						
+			HTREEITEM			selectedtreeitem;
 			ChunkItem		  *selectedchunkitem;
 			SearchStateEnum	searchstate;
 			CWdumpDoc		  *doc	= (CWdumpDoc *) GetDocument();
@@ -228,7 +228,7 @@ ChunkItem *CWDumpTreeView::FindChunkItem (ChunkItem *selectedchunkitem, ChunkIte
 	switch (searchstate) {
 
 		case FIND_SELECTED_ITEM:
-		
+
 			// Searching for the currently selected chunk item.
 			if (chunkitem == selectedchunkitem) {
 				searchstate = FIND_STRING;
@@ -237,7 +237,7 @@ ChunkItem *CWDumpTreeView::FindChunkItem (ChunkItem *selectedchunkitem, ChunkIte
 
 		case FIND_STRING:
 
-			// Searching for a string associated with the chunk item. 
+			// Searching for a string associated with the chunk item.
 			if (chunkitem == selectedchunkitem) {
 				searchstate = SEARCH_WRAPPED;
 				return (NULL);
@@ -280,7 +280,7 @@ void CWDumpTreeView::SelectTreeItem (HTREEITEM treeitem, ChunkItem *chunkitem)
 
 	// Select a tree item that matches the given chunk item. Recurse if necessary.
 	while (treeitem != NULL) {
-		
+
 		HTREEITEM subtreeitem;
 
 		if (tree.GetItemData (treeitem) == (DWORD) chunkitem) {
diff --git a/GeneralsMD/Code/Tools/wdump/wdtview.h b/GeneralsMD/Code/Tools/wdump/wdtview.h
index b03cfa93392..37590e07f62 100644
--- a/GeneralsMD/Code/Tools/wdump/wdtview.h
+++ b/GeneralsMD/Code/Tools/wdump/wdtview.h
@@ -16,12 +16,8 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(AFX_WDTVIEW_H__41C157F7_5631_11D1_8CDB_006097C6A583__INCLUDED_)
-#define AFX_WDTVIEW_H__41C157F7_5631_11D1_8CDB_006097C6A583__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 // WDTView.h : header file
 //
 
@@ -55,7 +51,7 @@ class CWDumpTreeView : public CTreeView
 	virtual void AssertValid() const;
 	virtual void Dump(CDumpContext& dc) const;
 #endif
-	
+
 	// Generated message map functions
 protected:
 
@@ -64,7 +60,7 @@ class CWDumpTreeView : public CTreeView
 		FIND_STRING,
 		SEARCH_WRAPPED
 	};
-	
+
 	void		  InsertItem(ChunkItem *item, HTREEITEM Parent = TVI_ROOT);
 	ChunkItem *FindChunkItem (ChunkItem *selectedchunkitem, ChunkItem *chunkitem, SearchStateEnum &searchstate);
 	void		  SelectTreeItem (HTREEITEM treeitem, ChunkItem *chunkitem);
@@ -81,5 +77,3 @@ class CWDumpTreeView : public CTreeView
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WDTVIEW_H__41C157F7_5631_11D1_8CDB_006097C6A583__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/wdump/wdump.cpp b/GeneralsMD/Code/Tools/wdump/wdump.cpp
index ae54ba86b84..6e704fdcc59 100644
--- a/GeneralsMD/Code/Tools/wdump/wdump.cpp
+++ b/GeneralsMD/Code/Tools/wdump/wdump.cpp
@@ -22,11 +22,11 @@
 #include "stdafx.h"
 #include "wdump.h"
 
-#include "MainFrm.h"
-#include "wdumpDoc.h"
-#include "wdView.h"
+#include "mainfrm.h"
+#include "wdumpdoc.h"
+#include "wdview.h"
 
-#include "FCNTL.H"
+#include "fcntl.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
@@ -63,7 +63,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CWdumpApp construction
 
-CWdumpApp::CWdumpApp() 
+CWdumpApp::CWdumpApp()
 : DumpTextures(false), NoWindow(false), TextureDumpFile(0)
 {
 	// TODO: add construction code here,
@@ -146,13 +146,13 @@ BOOL CWdumpApp::InitInstance()
 	if(NoWindow) {
 		if(cmdInfo.m_nShellCommand == CWDumpCommandLineInfo::FileOpen) {
 			const char *c = strrchr(cmdInfo.m_strFileName, '\\');
-			if(c == 0) 
+			if(c == 0)
 				c = (LPCTSTR) cmdInfo.m_strFileName;
 			if(*c == '\\')
 				c++;
 
 			Filename = c;
-			
+
 
 
 /*			STARTUPINFO info;
@@ -171,11 +171,11 @@ BOOL CWdumpApp::InitInstance()
 						_dup2( CrtOutput, 1);
 					}
 				}
-					 
+
 //				stdin = (struct _iobuf * ) info.hStdInput;
 //				stdout = (struct _iobuf * ) info.hStdOutput;
 			}
-*/			
+*/
 
 			CWdumpDoc *doc = (CWdumpDoc *) pDocTemplate->OpenDocumentFile(cmdInfo.m_strFileName, FALSE);
 
diff --git a/GeneralsMD/Code/Tools/wdump/wdump.h b/GeneralsMD/Code/Tools/wdump/wdump.h
index 74939840636..0cfc802e3bd 100644
--- a/GeneralsMD/Code/Tools/wdump/wdump.h
+++ b/GeneralsMD/Code/Tools/wdump/wdump.h
@@ -19,12 +19,7 @@
 // wdump.h : main header file for the WDUMP application
 //
 
-#if !defined(AFX_WDUMP_H__41C157E7_5631_11D1_8CDB_006097C6A583__INCLUDED_)
-#define AFX_WDUMP_H__41C157E7_5631_11D1_8CDB_006097C6A583__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #ifndef __AFXWIN_H__
 	#error include 'stdafx.h' before including this file for PCH
@@ -69,5 +64,3 @@ extern CWdumpApp theApp;
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WDUMP_H__41C157E7_5631_11D1_8CDB_006097C6A583__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/wdump/wdumpdoc.cpp b/GeneralsMD/Code/Tools/wdump/wdumpdoc.cpp
index 5976c4ed243..c5f276b2873 100644
--- a/GeneralsMD/Code/Tools/wdump/wdumpdoc.cpp
+++ b/GeneralsMD/Code/Tools/wdump/wdumpdoc.cpp
@@ -21,7 +21,7 @@
 
 #include "stdafx.h"
 #include "wdump.h"
-#include "wdumpDoc.h"
+#include "wdumpdoc.h"
 
 
 #ifdef RTS_DEBUG
@@ -102,23 +102,23 @@ void CWdumpDoc::Dump(CDumpContext& dc) const
 /////////////////////////////////////////////////////////////////////////////
 // CWdumpDoc commands
 
-void CWdumpDoc::OnFileOpen() 
+void CWdumpDoc::OnFileOpen()
 {
 	static char szFilter[] = "W3D Files (*.w3d)|*.w3d|WLT Files (*.wlt)|*.wlt|WHT Files (*.wht)|*.wht|WHA Files (*.wha)|*.wha|WTM Files (*.wtm)|*.wtm|All Files (*.*)|*.*||";
-	
-	CFileDialog f(	true, 
-						NULL, 
-						NULL, 
-						OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, 
+
+	CFileDialog f(	true,
+						NULL,
+						NULL,
+						OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
 						szFilter);
-	
+
 	if(f.DoModal() != IDOK) return;
 
 	// Add this filename to recent file list (MRU).
 	// NOTE: This call is not made by the framework.
 
 	//Moumine 1/2/2002    1:10:02 PM -- Project W3DShellExt needs to leave this out
-#if ! defined _W3DSHELLEXT 
+#if ! defined _W3DSHELLEXT
 	theApp.AddToRecentFileList (f.m_ofn.lpstrFile);
 #endif
 	m_ChunkItem = 0;
@@ -132,4 +132,4 @@ void CWdumpDoc::Read_File(const char *filename)
 	m_ChunkData.Load(filename);
 	m_ChunkItem = 0;
 	UpdateAllViews(0);
-}
\ No newline at end of file
+}
diff --git a/GeneralsMD/Code/Tools/wdump/wdumpdoc.h b/GeneralsMD/Code/Tools/wdump/wdumpdoc.h
index 720885626e8..5a6c9415748 100644
--- a/GeneralsMD/Code/Tools/wdump/wdumpdoc.h
+++ b/GeneralsMD/Code/Tools/wdump/wdumpdoc.h
@@ -20,22 +20,17 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_WDUMPDOC_H__41C157ED_5631_11D1_8CDB_006097C6A583__INCLUDED_)
-#define AFX_WDUMPDOC_H__41C157ED_5631_11D1_8CDB_006097C6A583__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #include "chunk_d.h"
 
 class CWdumpDoc : public CDocument
 {
-//Moumine 1/2/2002    11:12:25 AM ---Need this as public in project W3dShellExt  
+//Moumine 1/2/2002    11:12:25 AM ---Need this as public in project W3dShellExt
 #if ! defined _W3DSHELLEXT
-protected: // create from serialization only 
+protected: // create from serialization only
 #else
-public: 
+public:
 #endif
 	CWdumpDoc();
 protected:
@@ -79,5 +74,3 @@ class CWdumpDoc : public CDocument
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WDUMPDOC_H__41C157ED_5631_11D1_8CDB_006097C6A583__INCLUDED_)
diff --git a/GeneralsMD/Code/Tools/wdump/wdview.cpp b/GeneralsMD/Code/Tools/wdump/wdview.cpp
index b4dfb2bdd53..3ab0c9cfa46 100644
--- a/GeneralsMD/Code/Tools/wdump/wdview.cpp
+++ b/GeneralsMD/Code/Tools/wdump/wdview.cpp
@@ -22,8 +22,8 @@
 #include "stdafx.h"
 #include "wdump.h"
 
-#include "wdumpDoc.h"
-#include "wdView.h"
+#include "wdumpdoc.h"
+#include "wdview.h"
 
 #ifdef RTS_DEBUG
 #define new DEBUG_NEW
diff --git a/GeneralsMD/Code/Tools/wdump/wdview.h b/GeneralsMD/Code/Tools/wdump/wdview.h
index c65b8fb2d32..de270893e51 100644
--- a/GeneralsMD/Code/Tools/wdump/wdview.h
+++ b/GeneralsMD/Code/Tools/wdump/wdview.h
@@ -20,12 +20,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_WDUMPVIEW_H__41C157EF_5631_11D1_8CDB_006097C6A583__INCLUDED_)
-#define AFX_WDUMPVIEW_H__41C157EF_5631_11D1_8CDB_006097C6A583__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 class CWdumpView : public CView
 {
@@ -77,5 +72,3 @@ inline CWdumpDoc* CWdumpView::GetDocument()
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WDUMPVIEW_H__41C157EF_5631_11D1_8CDB_006097C6A583__INCLUDED_)
diff --git a/GeneralsMD/Run/place_steam_build_here.txt b/GeneralsMD/Run/place_steam_build_here.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/GeneralsReplays b/GeneralsReplays
new file mode 160000
index 00000000000..af0c61ccdcc
--- /dev/null
+++ b/GeneralsReplays
@@ -0,0 +1 @@
+Subproject commit af0c61ccdccbf06750b0ecd2de99fe65842bfc1a
diff --git a/README.md b/README.md
index 4c2482604f2..27149141ca0 100644
--- a/README.md
+++ b/README.md
@@ -1,49 +1,91 @@
+[![GitHub Release](https://img.shields.io/github/v/release/TheSuperHackers/GeneralsGameCode?include_prereleases&sort=date&display_name=tag&style=flat&label=Release)](https://github.com/TheSuperHackers/GeneralsGameCode/releases)
+![GitHub milestone details](https://img.shields.io/github/milestones/progress-percent/TheSuperHackers/GeneralsGameCode/3)
+![GitHub milestone details](https://img.shields.io/github/milestones/progress-percent/TheSuperHackers/GeneralsGameCode/1)
+![GitHub milestone details](https://img.shields.io/github/milestones/progress-percent/TheSuperHackers/GeneralsGameCode/4)
+![GitHub milestone details](https://img.shields.io/github/milestones/progress-percent/TheSuperHackers/GeneralsGameCode/5)
+![GitHub milestone details](https://img.shields.io/github/milestones/progress-percent/TheSuperHackers/GeneralsGameCode/6)
 
-# Command & Conquer Generals (inc. Zero Hour) Source Code
+[![GitHub issues by-label](https://img.shields.io/github/issues/TheSuperHackers/GeneralsGameCode/bug?style=flat&label=Bug%20Issues&labelColor=%23c4c4c4&color=%23424242)](https://github.com/TheSuperHackers/GeneralsGameCode/issues?q=label%3ABug)
+[![GitHub issues by-label](https://img.shields.io/github/issues/TheSuperHackers/GeneralsGameCode/enhancement?style=flat&label=Enhancement%20Issues&labelColor=%23c4c4c4&color=%23424242)](https://github.com/TheSuperHackers/GeneralsGameCode/issues?q=label%3AEnhancement)
+[![GitHub issues by-label](https://img.shields.io/github/issues/TheSuperHackers/GeneralsGameCode/major?style=flat&label=Major%20Issues&labelColor=%23c4c4c4&color=%23424242)](https://github.com/TheSuperHackers/GeneralsGameCode/issues?q=label%3AMajor)
+[![GitHub issues by-label](https://img.shields.io/github/issues/TheSuperHackers/GeneralsGameCode/critical?style=flat&label=Critical%20Issues&labelColor=%23c4c4c4&color=%23424242)](https://github.com/TheSuperHackers/GeneralsGameCode/issues?q=label%3ACritical)
+[![GitHub issues by-label](https://img.shields.io/github/issues/TheSuperHackers/GeneralsGameCode/blocker?style=flat&label=Blocker%20Issues&labelColor=%23c4c4c4&color=%23424242)](https://github.com/TheSuperHackers/GeneralsGameCode/issues?q=label%3ABlocker)
 
-This repository includes source code for Command & Conquer Generals, and its expansion pack Zero Hour. This release provides support to the Steam Workshop for both games ([C&C Generals](https://steamcommunity.com/workshop/browse/?appid=2229870) and [C&C Generals - Zero Hour](https://steamcommunity.com/workshop/browse/?appid=2732960)).
+# Welcome to the Generals Game Code Project
 
+GeneralsGameCode is a community-driven project aimed at fixing and improving the classic RTS game, *Command &
+Conquer: Generals* and its expansion *Zero Hour*. This repository contains the source code for both games, with a
+primary focus on *Zero Hour*.
 
-## Dependencies
+Additionally, there is a complementary project repository for fixing and improving game data and assets such as
+INI scripts, GUI, AI, maps, models, textures, audio, localization. You can find it
+[here](https://github.com/TheSuperHackers/GeneralsGamePatch/) and contribute to it as well.
 
-If you wish to rebuild the source code and tools successfully you will need to find or write new replacements (or remove the code using them entirely) for the following libraries;
+## Project Overview
 
-- DirectX SDK (Version 9.0 or higher) (expected path `\Code\Libraries\DirectX\`)
-- STLport (4.5.3) - (expected path `\Code\Libraries\STLport-4.5.3`)
-- 3DSMax 4 SDK - (expected path `\Code\Libraries\Max4SDK\`)
-- NVASM - (expected path `\Code\Tools\NVASM\`)
-- BYTEmark - (expected path `\Code\Libraries\Source\Benchmark`)
-- RAD Miles Sound System SDK - (expected path `\Code\Libraries\Source\WWVegas\Miles6\`)
-- RAD Bink SDK - (expected path `\Code\GameEngineDevice\Include\VideoDevice\Bink`)
-- SafeDisk API - (expected path `\Code\GameEngine\Include\Common\SafeDisk` and `\Code\Tools\Launcher\SafeDisk\`)
-- Miles Sound System "Asimp3" - (expected path `\Code\Libraries\WPAudio\Asimp3`)
-- GameSpy SDK - (expected path `\Code\Libraries\Source\GameSpy\`)
-- ZLib (1.1.4) - (expected path `\Code\Libraries\Source\Compression\ZLib\`)
-- LZH-Light (1.0) - (expected path `\Code\Libraries\Source\Compression\LZHCompress\CompLibSource` and `CompLibHeader`)
+The game was originally developed using Visual Studio 6 and C++98. We've updated the code to be compatible with Visual
+Studio 2022 and C++20.
 
+The initial goal of this project is to fix critical bugs and implement improvements while maintaining compatibility with
+the original *Generals* version 1.08 and *Zero Hour* version 1.04. Once we can break retail compatibility, more fixes
+and features will be possible to implement.
 
-## Compiling (Win32 Only)
+## Current Focus and Future Plans
 
-To use the compiled binaries, you must own the game. The C&C Ultimate Collection is available for purchase on [EA App](https://www.ea.com/en-gb/games/command-and-conquer/command-and-conquer-the-ultimate-collection/buy/pc) or [Steam](https://store.steampowered.com/bundle/39394/Command__Conquer_The_Ultimate_Collection/).
+Here's an overview of our current focus and future plans
 
-The quickest way to build all configurations in the project is to open `rts.dsw` in Microsoft Visual Studio C++ 6.0 (SP6 recommended for binary matching to Generals patch 1.08 and Zero Hour patch 1.04) and select Build -> Batch Build, then hit the “Rebuild All” button.
+- **Modernizing the Codebase**: Transitioning to modern C++ standards and refactoring old code.
+- **Critical Bug Fixes**: Fixing game-breaking issues (e.g., fullscreen crash).
+- **Minor Bug Fixes**: Addressing minor bugs (e.g., UI issues, graphical glitches).
+- **Cross-Platform Support**: Adding support for more platforms (e.g., Linux, macOS).
+- **Engine Improvements**: Enhancing the game engine to improve performance and stability.
+- **Client-Side Features**: Enhancing the game's client with features such as an improved replay viewer and UI updates.
+- **Multiplayer Improvements**: Implementing a new game server and an upgraded matchmaking lobby.
+- **Tooling Improvements**: Developing new or improving existing tools for modding and game development.
+- **Community-Driven Improvements**: Once the community grows, we plan to incorporate more features, updates, and
+  changes based on player feedback.
 
-If you wish to compile the code under a modern version of Microsoft Visual Studio, you can convert the legacy project file to a modern MSVC solution by opening `rts.dsw` in Microsoft Visual Studio .NET 2003, and then opening the newly created project and solution file in MSVC 2015 or newer.
+## Running the Game
 
-NOTE: As modern versions of MSVC enforce newer revisions of the C++ standard, you will need to make extensive changes to the codebase before it successfully compiles, even more so if you plan on compiling for the Win64 platform.
+To run *Generals* or *Zero Hour* using this project, you need to have the original *Command & Conquer: Generals and Zero Hour* game
+installed. The easiest way to get it is through *Command & Conquer The Ultimate Collection*
+on [Steam](https://store.steampowered.com/bundle/39394). Once the game is ready, download the latest version of the
+project from [GitHub Releases](https://github.com/TheSuperHackers/GeneralsGameCode/releases), extract the necessary 
+files, and follow the instructions in the [Wiki](https://github.com/TheSuperHackers/GeneralsGameCode/wiki).
 
-When the workspace has finished building, the compiled binaries will be copied to the folder called `/Run/` found in the root of each games directory. 
 
+## Joining the Community
 
-## Known Issues
+You can chat and discuss the development of the project on our [Discord channel](https://www.community-outpost.com/discord) to get the latest updates,
+report bugs, and contribute to the project!
 
-Windows has a policy where executables that contain words “version”, “update” or “install” in their filename will require UAC Elevation to run. This will affect “versionUpdate” and “buildVersionUpdate” projects from running as post-build events. Renaming the output binary name for these projects to not include these words should resolve the issue for you.
+## Building the Game Yourself
 
+We provide support for building the project using Visual Studio 6 (VS6) and Visual Studio 2022. For detailed build
+instructions, check the [Wiki](https://github.com/TheSuperHackers/GeneralsGameCode/wiki/build_guides), which also
+includes guides for building with Docker, CLion, and links to forks supporting additional versions.
 
-## STLport
-STLport will require changes to successfully compile this source code. The file [stlport.diff](stlport.diff) has been provided for you so you can review and apply these changes. Please make sure you are using STLport 4.5.3 before attempting to apply the patch.
+### Dependency management
 
+The repository uses a vcpkg manifest (`vcpkg.json`) paired with a lockfile (`vcpkg-lock.json`). When you add or upgrade
+dependencies, run `vcpkg install --x-manifest-root . --triplet <triplet>` with `VCPKG_FEATURE_FLAGS=versions` so the
+lockfile picks up the new versions and include the updated lockfile in your change. GitHub Actions consumes these ports
+through `VCPKG_BINARY_SOURCES=clear;files,<workspace>/vcpkg-bincache,readwrite` (paired with an `actions/cache` entry for
+that folder), so the first CI build warms the cache and subsequent builds pull prebuilt binaries instead of
+re-compiling everything.
 
-## License
+## Contributing
 
-This repository and its contents are licensed under the GPL v3 license, with additional terms applied. Please see [LICENSE.md](LICENSE.md) for details.
+We welcome contributions to the project! If you’re interested in contributing, you need to have knowledge of C++. Join
+the developer chat on Discord for more information on how to get started. Please make sure to read our
+[Contributing Guidelines](CONTRIBUTING.md) before submitting a pull request. You can also check out 
+the [Wiki](https://github.com/TheSuperHackers/GeneralsGameCode/wiki) for more detailed documentation.
+
+
+## License & Legal Disclaimer
+
+EA has not endorsed and does not support this product. All trademarks are the property of their respective owners.
+
+This project is licensed under the [GPL-3.0 License](https://www.gnu.org/licenses/gpl-3.0.html), which allows you to
+freely modify and distribute the source code under the terms of this license. Please see [LICENSE.md](LICENSE.md) 
+for details.
diff --git a/TESTING.md b/TESTING.md
new file mode 100644
index 00000000000..bcfed391427
--- /dev/null
+++ b/TESTING.md
@@ -0,0 +1,14 @@
+# Test Replays
+
+The GeneralsReplays folder contains replays and the required maps that are tested in CI to ensure that the game is retail compatible.
+
+You can also test with these replays locally:
+- Copy the replays into a subfolder in your `%USERPROFILE%/Documents/Command and Conquer Generals Zero Hour Data/Replays` folder.
+- Copy the maps into `%USERPROFILE%/Documents/Command and Conquer Generals Zero Hour Data/Maps`
+- Start the test with this: (copy into a .bat file next to your executable)
+```
+START /B /W generalszh.exe -jobs 4 -headless -replay subfolder/*.rep > replay_check.log
+echo %errorlevel%
+PAUSE
+```
+It will run the game in the background and check that each replay is compatible. You need to use a VC6 build with optimizations and RTS_BUILD_OPTION_DEBUG = OFF, otherwise the game won't be compatible.
\ No newline at end of file
diff --git a/cmake/compilers.cmake b/cmake/compilers.cmake
index 7d184f98672..bd8150860ab 100644
--- a/cmake/compilers.cmake
+++ b/cmake/compilers.cmake
@@ -20,6 +20,9 @@ if(MSVC)
     # Create PDB for Release as long as debug info was generated during compile.
     string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " /DEBUG /OPT:REF /OPT:ICF")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " /DEBUG /OPT:REF /OPT:ICF")
+    
+    # /INCREMENTAL:NO prevents PDB size bloat in Debug configuration(s).
+    add_link_options("/INCREMENTAL:NO")
 else()
     # We go a bit wild here and assume any other compiler we are going to use supports -g for debug info.
     string(APPEND CMAKE_CXX_FLAGS_RELEASE " -g")
@@ -36,6 +39,18 @@ if (NOT IS_VS6_BUILD)
         # Enforce strict __cplusplus version
         add_compile_options(/Zc:__cplusplus)
     endif()
+else()
+    if(RTS_BUILD_OPTION_VC6_FULL_DEBUG)
+        set_property(GLOBAL PROPERTY JOB_POOLS compile=1 link=1)
+    else()
+        # Define two pools: 'compile' with plenty of slots, 'link' with just one
+        set_property(GLOBAL PROPERTY JOB_POOLS compile=0 link=1)
+    endif()
+
+    # Tell CMake that all compile steps go into 'compile'
+    set(CMAKE_JOB_POOL_COMPILE compile)
+    # and all link steps go into 'link' (so only one link ever runs since vc6 can't handle multithreaded linking)
+    set(CMAKE_JOB_POOL_LINK link)
 endif()
 
 if(RTS_BUILD_OPTION_ASAN)
diff --git a/cmake/config-build.cmake b/cmake/config-build.cmake
index a001e42c597..6401c458be0 100644
--- a/cmake/config-build.cmake
+++ b/cmake/config-build.cmake
@@ -3,10 +3,10 @@ option(RTS_BUILD_CORE_TOOLS "Build core tools" ON)
 option(RTS_BUILD_CORE_EXTRAS "Build core extra tools/tests" OFF)
 option(RTS_BUILD_ZEROHOUR "Build Zero Hour code." ON)
 option(RTS_BUILD_GENERALS "Build Generals code." ON)
-option(RTS_BUILD_OPTION_INTERNAL "Build code with the \"Internal\" configuration." OFF)
 option(RTS_BUILD_OPTION_PROFILE "Build code with the \"Profile\" configuration." OFF)
 option(RTS_BUILD_OPTION_DEBUG "Build code with the \"Debug\" configuration." OFF)
 option(RTS_BUILD_OPTION_ASAN "Build code with Address Sanitizer." OFF)
+option(RTS_BUILD_OPTION_VC6_FULL_DEBUG "Build VC6 with full debug info." OFF)
 option(RTS_BUILD_OPTION_FFMPEG "Enable FFmpeg support" OFF)
 
 if(NOT RTS_BUILD_ZEROHOUR AND NOT RTS_BUILD_GENERALS)
@@ -18,10 +18,10 @@ add_feature_info(CoreTools RTS_BUILD_CORE_TOOLS "Build Core Mod Tools")
 add_feature_info(CoreExtras RTS_BUILD_CORE_EXTRAS "Build Core Extra Tools/Tests")
 add_feature_info(ZeroHourStuff RTS_BUILD_ZEROHOUR "Build Zero Hour code")
 add_feature_info(GeneralsStuff RTS_BUILD_GENERALS "Build Generals code")
-add_feature_info(InternalBuild RTS_BUILD_OPTION_INTERNAL "Building as an \"Internal\" build")
 add_feature_info(ProfileBuild RTS_BUILD_OPTION_PROFILE "Building as a \"Profile\" build")
 add_feature_info(DebugBuild RTS_BUILD_OPTION_DEBUG "Building as a \"Debug\" build")
 add_feature_info(AddressSanitizer RTS_BUILD_OPTION_ASAN "Building with address sanitizer")
+add_feature_info(Vc6FullDebug RTS_BUILD_OPTION_VC6_FULL_DEBUG "Building VC6 with full debug info")
 add_feature_info(FFmpegSupport RTS_BUILD_OPTION_FFMPEG "Building with FFmpeg support")
 
 if(RTS_BUILD_ZEROHOUR)
@@ -49,7 +49,11 @@ if(NOT IS_VS6_BUILD)
     target_compile_features(core_config INTERFACE cxx_std_20)
 endif()
 
-target_compile_options(core_config INTERFACE ${RTS_FLAGS})
+if(IS_VS6_BUILD AND RTS_BUILD_OPTION_VC6_FULL_DEBUG)
+    target_compile_options(core_config INTERFACE ${RTS_FLAGS} /Zi)
+else()
+    target_compile_options(core_config INTERFACE ${RTS_FLAGS})
+endif()
 
 # This disables a lot of warnings steering developers to use windows only functions/function names.
 if(MSVC)
@@ -63,12 +67,9 @@ endif()
 if(RTS_BUILD_OPTION_DEBUG)
     target_compile_definitions(core_config INTERFACE RTS_DEBUG WWDEBUG DEBUG)
 else()
-    target_compile_definitions(core_config INTERFACE RTS_RELEASE)
+    target_compile_definitions(core_config INTERFACE RTS_RELEASE NDEBUG)
+endif()
 
-    if(RTS_BUILD_OPTION_INTERNAL)
-        target_compile_definitions(core_config INTERFACE RTS_INTERNAL)
-    endif()
-    if(RTS_BUILD_OPTION_PROFILE)
-        target_compile_definitions(core_config INTERFACE RTS_PROFILE)
-    endif()
+if(RTS_BUILD_OPTION_PROFILE)
+    target_compile_definitions(core_config INTERFACE RTS_PROFILE)
 endif()
diff --git a/cmake/config-memory.cmake b/cmake/config-memory.cmake
index 72a28d1c94e..5daa6f110a4 100644
--- a/cmake/config-memory.cmake
+++ b/cmake/config-memory.cmake
@@ -20,6 +20,9 @@ option(RTS_MEMORYPOOL_DEBUG_INTENSE_VERIFY "Enables intensive verifications afte
 option(RTS_MEMORYPOOL_DEBUG_CHECK_BLOCK_OWNERSHIP "Enables debug to verify that a block actually belongs to the pool it is called with. This is great for debugging, but can be realllly slow, so is OFF by default." OFF)
 option(RTS_MEMORYPOOL_DEBUG_INTENSE_DMA_BOOKKEEPING "Prints statistics for memory usage of Memory Pools." OFF)
 
+# Memory dump options
+option(RTS_CRASHDUMP_ENABLE "Enables writing crash dumps on unhandled exceptions or release crash failures." ON)
+
 # Game Memory features
 add_feature_info(GameMemoryEnable RTS_GAMEMEMORY_ENABLE "Build with the original game memory implementation")
 
@@ -37,6 +40,8 @@ add_feature_info(MemoryPoolDebugIntenseVerify RTS_MEMORYPOOL_DEBUG_INTENSE_VERIF
 add_feature_info(MemoryPoolDebugCheckBlockOwnership RTS_MEMORYPOOL_DEBUG_CHECK_BLOCK_OWNERSHIP "Build with Memory Pool block ownership checks")
 add_feature_info(MemoryPoolDebugIntenseDmaBookkeeping RTS_MEMORYPOOL_DEBUG_INTENSE_DMA_BOOKKEEPING "Build with Memory Pool intense DMA bookkeeping")
 
+# Memory dump features
+add_feature_info(CrashDumpEnable RTS_CRASHDUMP_ENABLE "Build with Crash Dumps")
 
 # Game Memory features
 if(NOT RTS_GAMEMEMORY_ENABLE)
@@ -87,3 +92,10 @@ else()
         target_compile_definitions(core_config INTERFACE INTENSE_DMA_BOOKKEEPING=1)
     endif()
 endif()
+
+if(RTS_CRASHDUMP_ENABLE)
+    target_compile_definitions(core_config INTERFACE RTS_ENABLE_CRASHDUMP=1)
+    if (IS_VS6_BUILD AND NOT RTS_BUILD_OPTION_VC6_FULL_DEBUG)
+        message(STATUS "Crash Dumps will be significantly less useful in VC6 builds without full debug info enabled")
+    endif()
+endif()
diff --git a/cmake/dbghelp.cmake b/cmake/dbghelp.cmake
deleted file mode 100644
index 7940400e3e9..00000000000
--- a/cmake/dbghelp.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-FetchContent_Declare(
-    dbghelp
-    GIT_REPOSITORY https://github.com/TheSuperHackers/dbghelp-import-lib.git
-    GIT_TAG        afeb423d4597167c8fa94215f4574f3ae310f920
-)
-
-FetchContent_MakeAvailable(dbghelp)
\ No newline at end of file
diff --git a/cmake/gamespy.cmake b/cmake/gamespy.cmake
index ef68d1fe509..7c11ccd12ac 100644
--- a/cmake/gamespy.cmake
+++ b/cmake/gamespy.cmake
@@ -4,7 +4,7 @@ set(GAMESPY_SERVER_NAME "server.cnc-online.net")
 FetchContent_Declare(
     gamespy
     GIT_REPOSITORY https://github.com/TheAssemblyArmada/GamespySDK.git
-    GIT_TAG        d7ec6d4fea1c11fc37173ea954fc1ec47202a931
+    GIT_TAG        07e3d15c500415abc281efb74322ab6d9c857eb8
 )
 
 FetchContent_MakeAvailable(gamespy)
diff --git a/cmake/miles.cmake b/cmake/miles.cmake
index 61d43908b15..c25b27114c6 100644
--- a/cmake/miles.cmake
+++ b/cmake/miles.cmake
@@ -1,7 +1,7 @@
 FetchContent_Declare(
     miles
     GIT_REPOSITORY https://github.com/TheSuperHackers/miles-sdk-stub.git
-    GIT_TAG        0fef646a85c822475d55f19e3ca185263fb4a967
+    GIT_TAG        44c82ab6211028776facf53b0ce3a88a3e232c45
 )
 
 FetchContent_MakeAvailable(miles)
diff --git a/cmake/registry.cmake b/cmake/registry.cmake
new file mode 100644
index 00000000000..6f8caae6886
--- /dev/null
+++ b/cmake/registry.cmake
@@ -0,0 +1,15 @@
+# Helper macro for querying Windows registry values
+# Queries both 32-bit and 64-bit registry views automatically
+macro(fetch_registry_value registry_key registry_value output_var description)
+    if(NOT ${output_var})
+        cmake_host_system_information(RESULT _variable
+            QUERY WINDOWS_REGISTRY
+            "${registry_key}"
+            VALUE "${registry_value}"
+            VIEW 32_64)
+        if(_variable)
+            set(${output_var} "${_variable}" CACHE PATH "${description}")
+        endif()
+    endif()
+endmacro()
+
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index f94cc675117..d8d613ca9b2 100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,6 +1,24 @@
+# Create gitinfo.cpp
+set(GIT_PRE_CONFIGURE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/gitinfo/gitinfo.cpp.in")
+set(GIT_POST_CONFIGURE_FILE "${CMAKE_CURRENT_BINARY_DIR}/gitinfo.cpp")
+
+include(gitinfo/git_watcher.cmake)
+
+# Create resources library
+add_library(resources STATIC)
+
+target_sources(resources PRIVATE
+    "${CMAKE_CURRENT_BINARY_DIR}/gitinfo.cpp"
+    gitinfo/gitinfo.h
+)
+
+target_include_directories(resources PUBLIC
+    gitinfo
+)
+
 # Add resources (optional)
 if (MSVC_IDE)
-    add_library(resources INTERFACE
+    target_sources(resources PRIVATE
         visualstudio/asciistring.natvis
         visualstudio/stllist.natvis
         visualstudio/stlvector.natvis
diff --git a/resources/dockerbuild/Dockerfile b/resources/dockerbuild/Dockerfile
new file mode 100644
index 00000000000..cad26eb69b9
--- /dev/null
+++ b/resources/dockerbuild/Dockerfile
@@ -0,0 +1,93 @@
+FROM debian:12.10-slim
+
+# Build arguments
+ARG CMAKE_VERSION="3.31.6"
+ARG GIT_VERSION="2.49.0"
+ARG UID
+ARG GID
+
+# Install utils
+RUN apt update \
+    && apt install wget gpg unzip git -y \
+    && dpkg --add-architecture i386 \
+    && apt clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install wine
+RUN mkdir -pm755 /etc/apt/keyrings \
+    && (wget -O - https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /etc/apt/keyrings/winehq-archive.key -) \
+    && wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources \
+    && apt update \
+    && apt install --no-install-recommends winehq-stable -y \
+    && apt clean \
+    && rm -rf /var/lib/apt/lists/*
+# Setup build folder 
+RUN mkdir /build
+RUN chown  ${UID}:${GID} /build
+
+USER ${UID}:${GID}
+WORKDIR /build/tools
+
+# Install cmake windows
+RUN wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-windows-x86_64.zip \
+    && unzip cmake-${CMAKE_VERSION}-windows-x86_64.zip -d /build/tools/ \
+    && mv /build/tools/cmake-${CMAKE_VERSION}-windows-x86_64 /build/tools/cmake \
+    && find /build/tools/ -name "*.zip" -exec rm -f {} +
+
+# Install git windows
+RUN wget https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.1/MinGit-${GIT_VERSION}-64-bit.zip \
+    && unzip MinGit-${GIT_VERSION}-64-bit.zip -d /build/tools/ \
+    && mv /build/tools/cmd /build/tools/git \
+    && find /build/tools/ -name "*.zip" -exec rm -f {} +
+
+# Install Visual Studio 6 Portable
+RUN wget https://github.com/itsmattkc/MSVC600/archive/refs/heads/master.zip \
+    && unzip master.zip -d /build/tools \
+    && mv /build/tools/MSVC600-master/ /build/tools/vs6 \
+    && find /build/tools/ -name "*.zip" -exec rm -f {} +
+
+
+#Install ninja  
+RUN wget https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-win.zip \
+    && unzip ninja-win.zip -d /build/tools/ \
+    && find /build/tools/ -name "*.zip" -exec rm -f {} +
+
+# Setup wine prefix
+ENV WINEDEBUG=-all
+ENV WINEARCH=win64
+ENV WINEPREFIX=/build/prefix64
+
+# Create empty TEMP folder for linking
+RUN mkdir /build/tmp
+ENV TMP="Z:\\build\\tmp"
+ENV TEMP="Z:\\build\\tmp"
+ENV TEMPDIR="Z:\\build\\tmp"
+
+# Setup Visual Studio 6 Environment variables
+ENV VS="Z:\\build\\tools\\vs6"
+ENV MSVCDir="$VS\\vc98"
+ENV WINEPATH="C:\\windows\\system32;\
+$VS\\vc98\\bin;\
+$VS\\vc98\\lib;\
+$VS\\vc98\\include;\
+$VS\\common\\Tools;\
+$VS\\common\\MSDev98\\bin"
+ENV LIB="$VS\\vc98\\Lib;$VS\\vc98\\MFC\\Lib;Z:\\build\\cnc\\build\\vc6"
+ENV INCLUDE="$VS\\vc98\\ATL\\INCLUDE;\
+$VS\\vc98\\INCLUDE;\
+$VS\\vc98\\MFC\\INCLUDE;\
+$VS\\vc98\\Include"
+ENV CC="$VS\\vc98\\bin\\CL.exe"
+ENV CXX="$VS\\vc98\\bin\\CL.exe"
+ENV PRESET=vc6
+
+#prevent cache warning 
+ENV HOME=/build/tmp/home
+RUN mkdir /build/tmp/home
+
+WORKDIR /build/cnc
+
+USER root
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+CMD /entrypoint.sh
diff --git a/resources/dockerbuild/entrypoint.sh b/resources/dockerbuild/entrypoint.sh
new file mode 100644
index 00000000000..1fe64c12ea0
--- /dev/null
+++ b/resources/dockerbuild/entrypoint.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -euo pipefail
+cd /build/cnc
+wineboot
+if [ "${FORCE_CMAKE:-}" = "true" ] || [ ! -f  build/docker/build.ninja  ]; then
+   wine /build/tools/cmake/bin/cmake.exe \
+         --preset ${PRESET} \
+        -DCMAKE_SYSTEM="Windows" \
+        -DCMAKE_SYSTEM_NAME="Windows" \
+        -DCMAKE_SIZEOF_VOID_P=4 \
+        -DCMAKE_MAKE_PROGRAM="Z:/build/tools/ninja.exe" \
+        -DCMAKE_C_COMPILER="Z:/build/tools/vs6/vc98/bin/cl.exe" \
+        -DCMAKE_CXX_COMPILER="Z:/build/tools/vs6/vc98/bin/cl.exe" \
+        -DGIT_EXECUTABLE="Z:/build/tools/git/git.exe" \
+        -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
+        -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
+        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
+        -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \
+        -DCMAKE_DISABLE_PRECOMPILE_HEADERS=1 \
+        -DCMAKE_C_COMPILER_WORKS=1 \
+        -DCMAKE_CXX_COMPILER_WORKS=1 \
+        -B /build/cnc/build/docker
+fi
+
+cd /build/cnc/build/docker 
+wine cmd /c "set TMP=Z:\build\tmp& set TEMP=Z:\build\tmp& Z:\build\tools\ninja.exe $MAKE_TARGET"
+
+
diff --git a/resources/gitinfo/git_watcher.cmake b/resources/gitinfo/git_watcher.cmake
new file mode 100644
index 00000000000..0b4426cffa6
--- /dev/null
+++ b/resources/gitinfo/git_watcher.cmake
@@ -0,0 +1,345 @@
+# git_watcher.cmake
+# https://raw.githubusercontent.com/andrew-hardin/cmake-git-version-tracking/master/git_watcher.cmake
+#
+# Released under the MIT License.
+# https://raw.githubusercontent.com/andrew-hardin/cmake-git-version-tracking/master/LICENSE
+
+
+# This file defines a target that monitors the state of a git repo.
+# If the state changes (e.g. a commit is made), then a file gets reconfigured.
+# Here are the primary variables that control script behavior:
+#
+#   GIT_PRE_CONFIGURE_FILE (REQUIRED)
+#   -- The path to the file that'll be configured.
+#
+#   GIT_POST_CONFIGURE_FILE (REQUIRED)
+#   -- The path to the configured GIT_PRE_CONFIGURE_FILE.
+#
+#   GIT_STATE_FILE (OPTIONAL)
+#   -- The path to the file used to store the previous build's git state.
+#      Defaults to the current binary directory.
+#
+#   GIT_WORKING_DIR (OPTIONAL)
+#   -- The directory from which git commands will be run.
+#      Defaults to the directory with the top level CMakeLists.txt.
+#
+#   GIT_EXECUTABLE (OPTIONAL)
+#   -- The path to the git executable. It'll automatically be set if the
+#      user doesn't supply a path.
+#
+# DESIGN
+#   - This script was designed similar to a Python application
+#     with a Main() function. I wanted to keep it compact to
+#     simplify "copy + paste" usage.
+#
+#   - This script is invoked under two CMake contexts:
+#       1. Configure time (when build files are created).
+#       2. Build time (called via CMake -P).
+#     The first invocation is what registers the script to
+#     be executed at build time.
+#
+# MODIFICATIONS
+#   You may wish to track other git properties like when the last
+#   commit was made. There are two sections you need to modify,
+#   and they're tagged with a ">>>" header.
+
+# Short hand for converting paths to absolute.
+macro(PATH_TO_ABSOLUTE var_name)
+    get_filename_component(${var_name} "${${var_name}}" ABSOLUTE)
+endmacro()
+
+# Check that a required variable is set.
+macro(CHECK_REQUIRED_VARIABLE var_name)
+    if(NOT DEFINED ${var_name})
+        message(FATAL_ERROR "The \"${var_name}\" variable must be defined.")
+    endif()
+    PATH_TO_ABSOLUTE(${var_name})
+endmacro()
+
+# Check that an optional variable is set, or, set it to a default value.
+macro(CHECK_OPTIONAL_VARIABLE var_name default_value)
+    if(NOT DEFINED ${var_name})
+        set(${var_name} ${default_value})
+    endif()
+    PATH_TO_ABSOLUTE(${var_name})
+endmacro()
+
+CHECK_REQUIRED_VARIABLE(GIT_PRE_CONFIGURE_FILE)
+CHECK_REQUIRED_VARIABLE(GIT_POST_CONFIGURE_FILE)
+CHECK_OPTIONAL_VARIABLE(GIT_STATE_FILE "${CMAKE_BINARY_DIR}/git-state-hash")
+CHECK_OPTIONAL_VARIABLE(GIT_WORKING_DIR "${CMAKE_SOURCE_DIR}")
+
+# Check the optional git variable.
+# If it's not set, we'll try to find it using the CMake packaging system.
+if(NOT DEFINED GIT_EXECUTABLE)
+    find_package(Git QUIET REQUIRED)
+endif()
+CHECK_REQUIRED_VARIABLE(GIT_EXECUTABLE)
+
+
+set(_state_variable_names
+    GIT_RETRIEVED_STATE
+    GIT_HEAD_SHA1
+    GIT_IS_DIRTY
+    GIT_AUTHOR_NAME
+    GIT_AUTHOR_EMAIL
+    GIT_COMMIT_DATE_ISO8601
+    GIT_COMMIT_SUBJECT
+    GIT_COMMIT_BODY
+    GIT_COMMIT_TSTAMP
+    GIT_HEAD_SHORT_SHA1
+    GIT_REV_LIST_COUNT
+    GIT_TAG
+    # >>>
+    # 1. Add the name of the additional git variable you're interested in monitoring
+    #    to this list.
+)
+
+
+
+# Macro: RunGitCommand
+# Description: short-hand macro for calling a git function. Outputs are the
+#              "exit_code" and "output" variables.
+macro(RunGitCommand)
+    execute_process(COMMAND
+        "${GIT_EXECUTABLE}" ${ARGV}
+        WORKING_DIRECTORY "${_working_dir}"
+        RESULT_VARIABLE exit_code
+        OUTPUT_VARIABLE output
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT exit_code EQUAL 0)
+        set(ENV{GIT_RETRIEVED_STATE} "false")
+    endif()
+endmacro()
+
+
+
+# Function: GetGitState
+# Description: gets the current state of the git repo.
+# Args:
+#   _working_dir (in)  string; the directory from which git commands will be executed.
+function(GetGitState _working_dir)
+
+    # This is an error code that'll be set to FALSE if the
+    # RunGitCommand ever returns a non-zero exit code.
+    set(ENV{GIT_RETRIEVED_STATE} "true")
+
+    if(GIT_EXECUTABLE)
+        # Get whether or not the working tree is dirty.
+        RunGitCommand(status --porcelain)
+        if(NOT exit_code EQUAL 0)
+            set(ENV{GIT_IS_DIRTY} "false")
+        else()
+            if(NOT "${output}" STREQUAL "")
+                set(ENV{GIT_IS_DIRTY} "true")
+            else()
+                set(ENV{GIT_IS_DIRTY} "false")
+            endif()
+        endif()
+
+        # There's a long list of attributes grabbed from git show.
+        set(object HEAD)
+        RunGitCommand(show -s "--format=%H" ${object})
+        if(exit_code EQUAL 0)
+            set(ENV{GIT_HEAD_SHA1} ${output})
+        endif()
+
+        RunGitCommand(show -s "--format=%an" ${object})
+        if(exit_code EQUAL 0)
+            set(ENV{GIT_AUTHOR_NAME} "${output}")
+        endif()
+
+        RunGitCommand(show -s "--format=%ae" ${object})
+        if(exit_code EQUAL 0)
+            set(ENV{GIT_AUTHOR_EMAIL} "${output}")
+        endif()
+
+        RunGitCommand(show -s "--format=%ci" ${object})
+        if(exit_code EQUAL 0)
+            set(ENV{GIT_COMMIT_DATE_ISO8601} "${output}")
+        endif()
+
+        RunGitCommand(show -s "--format=%s" ${object})
+        if(exit_code EQUAL 0)
+            set(ENV{GIT_COMMIT_SUBJECT} "${output}")
+        endif()
+
+        RunGitCommand(show -s "--format=%b" ${object})
+        if(exit_code EQUAL 0)
+            if(output)
+                # Escape line breaks in the commit message.
+                string(REPLACE "\r\n" "\\r\\n\\\r\n" safe ${output})
+                if(safe STREQUAL output)
+                    # Didn't have windows lines - try unix lines.
+                    string(REPLACE "\n" "\\n\\\n" safe ${output})
+                endif()
+            else()
+                # There was no commit body - set the safe string to empty.
+                set(safe "")
+            endif()
+            set(ENV{GIT_COMMIT_BODY} "\"${safe}\"")
+        else()
+            set(ENV{GIT_COMMIT_BODY} "\"\"") # empty string.
+        endif()
+        
+        RunGitCommand(show -s "--format=%ct" ${object})
+        if(exit_code EQUAL 0)
+            set(ENV{GIT_COMMIT_TSTAMP} "${output}")
+        else()
+            set(ENV{GIT_COMMIT_TSTAMP} "0")
+        endif()
+        
+        RunGitCommand(show -s "--format=%h" ${object})
+        if(exit_code EQUAL 0)
+            set(ENV{GIT_HEAD_SHORT_SHA1} ${output})
+        endif()
+
+        RunGitCommand(rev-list --count ${object})
+        if(exit_code EQUAL 0)
+            set(ENV{GIT_REV_LIST_COUNT} ${output})
+        else()
+            set(ENV{GIT_REV_LIST_COUNT} "0")
+        endif()
+
+        RunGitCommand(describe --tags ${object})
+        if(exit_code EQUAL 0)
+            set(ENV{GIT_TAG} ${output})
+        else()
+            set(ENV{GIT_TAG} "")
+        endif()
+        
+        # >>>
+        # 2. Additional git properties can be added here via the
+        #    "execute_process()" command. Be sure to set them in
+        #    the environment using the same variable name you added
+        #    to the "_state_variable_names" list.
+    else()
+        set(ENV{GIT_IS_DIRTY} "true")
+        set(ENV{GIT_HEAD_SHA1} "DEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF")
+        set(ENV{GIT_AUTHOR_NAME} "Someone")
+        set(ENV{GIT_AUTHOR_EMAIL} "someone@someplace.org")
+        set(ENV{GIT_COMMIT_DATE_ISO8601} "1955-11-12 22:04:00 +0000")
+        set(ENV{GIT_COMMIT_SUBJECT} "Git Not Found")
+        set(ENV{GIT_COMMIT_BODY} "\"\"") # empty string.
+        set(ENV{GIT_COMMIT_TSTAMP} "0")
+        set(ENV{GIT_HEAD_SHORT_SHA1} "DEADBEEF")
+        set(ENV{GIT_REV_LIST_COUNT} "0")
+        set(ENV{GIT_TAG} "")
+    endif()
+
+endfunction()
+
+
+
+# Function: GitStateChangedAction
+# Description: this function is executed when the state of the git
+#              repository changes (e.g. a commit is made).
+function(GitStateChangedAction)
+    foreach(var_name ${_state_variable_names})
+        set(${var_name} $ENV{${var_name}})
+    endforeach()
+    configure_file("${GIT_PRE_CONFIGURE_FILE}" "${GIT_POST_CONFIGURE_FILE}" @ONLY)
+endfunction()
+
+
+
+# Function: HashGitState
+# Description: loop through the git state variables and compute a unique hash.
+# Args:
+#   _state (out)  string; a hash computed from the current git state.
+function(HashGitState _state)
+    set(ans "")
+    foreach(var_name ${_state_variable_names})
+        string(SHA256 ans "${ans}$ENV{${var_name}}")
+    endforeach()
+    set(${_state} ${ans} PARENT_SCOPE)
+endfunction()
+
+
+
+# Function: CheckGit
+# Description: check if the git repo has changed. If so, update the state file.
+# Args:
+#   _working_dir    (in)  string; the directory from which git commands will be ran.
+#   _state_changed (out)    bool; whether or no the state of the repo has changed.
+function(CheckGit _working_dir _state_changed)
+
+    # Get the current state of the repo.
+    GetGitState("${_working_dir}")
+
+    # Convert that state into a hash that we can compare against
+    # the hash stored on-disk.
+    HashGitState(state)
+
+    # Issue 14: post-configure file isn't being regenerated.
+    #
+    # Update the state to include the SHA256 for the pre-configure file.
+    # This forces the post-configure file to be regenerated if the
+    # pre-configure file has changed.
+    file(SHA256 ${GIT_PRE_CONFIGURE_FILE} preconfig_hash)
+    string(SHA256 state "${preconfig_hash}${state}")
+
+    # Check if the state has changed compared to the backup on disk.
+    if(EXISTS "${GIT_STATE_FILE}")
+        file(READ "${GIT_STATE_FILE}" OLD_HEAD_CONTENTS)
+        if(OLD_HEAD_CONTENTS STREQUAL "${state}")
+            # State didn't change.
+            set(${_state_changed} "false" PARENT_SCOPE)
+            return()
+        endif()
+    endif()
+
+    # The state has changed.
+    # We need to update the state file on disk.
+    # Future builds will compare their state to this file.
+    file(WRITE "${GIT_STATE_FILE}" "${state}")
+    set(${_state_changed} "true" PARENT_SCOPE)
+endfunction()
+
+
+
+# Function: SetupGitMonitoring
+# Description: this function sets up custom commands that make the build system
+#              check the state of git before every build. If the state has
+#              changed, then a file is configured.
+function(SetupGitMonitoring)
+    add_custom_target(check_git
+        ALL
+        DEPENDS ${GIT_PRE_CONFIGURE_FILE}
+        BYPRODUCTS
+            ${GIT_POST_CONFIGURE_FILE}
+            ${GIT_STATE_FILE}
+        COMMENT "Checking the git repository for changes..."
+        COMMAND
+            ${CMAKE_COMMAND}
+            -D_BUILD_TIME_CHECK_GIT=TRUE
+            -DGIT_WORKING_DIR=${GIT_WORKING_DIR}
+            -DGIT_EXECUTABLE=${GIT_EXECUTABLE}
+            -DGIT_STATE_FILE=${GIT_STATE_FILE}
+            -DGIT_PRE_CONFIGURE_FILE=${GIT_PRE_CONFIGURE_FILE}
+            -DGIT_POST_CONFIGURE_FILE=${GIT_POST_CONFIGURE_FILE}
+            -P "${CMAKE_CURRENT_LIST_FILE}")
+endfunction()
+
+
+
+# Function: Main
+# Description: primary entry-point to the script. Functions are selected based
+#              on whether it's configure or build time.
+function(Main)
+    if(_BUILD_TIME_CHECK_GIT)
+        # Check if the repo has changed.
+        # If so, run the change action.
+        CheckGit("${GIT_WORKING_DIR}" changed)
+        if(changed OR NOT EXISTS "${GIT_POST_CONFIGURE_FILE}")
+            GitStateChangedAction()
+        endif()
+    else()
+        # >> Executes at configure time.
+        SetupGitMonitoring()
+    endif()
+endfunction()
+
+# And off we go...
+Main()
diff --git a/resources/gitinfo/gitinfo.cpp.in b/resources/gitinfo/gitinfo.cpp.in
new file mode 100644
index 00000000000..6ab0802d017
--- /dev/null
+++ b/resources/gitinfo/gitinfo.cpp.in
@@ -0,0 +1,28 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "gitinfo.h"
+
+const char GitSHA1[] = "@GIT_HEAD_SHA1@";
+const char GitShortSHA1[] = "@GIT_HEAD_SHORT_SHA1@";
+const char GitCommitDate[] = "@GIT_COMMIT_DATE_ISO8601@";
+const char GitCommitAuthorName[] = "@GIT_AUTHOR_NAME@";
+const char GitTag[] = "@GIT_TAG@";
+time_t GitCommitTimeStamp = @GIT_COMMIT_TSTAMP@;
+bool GitUncommittedChanges = @GIT_IS_DIRTY@;
+bool GitHaveInfo = @GIT_RETRIEVED_STATE@;
+int GitRevision = @GIT_REV_LIST_COUNT@;
diff --git a/resources/gitinfo/gitinfo.h b/resources/gitinfo/gitinfo.h
new file mode 100644
index 00000000000..6fbd55fffe5
--- /dev/null
+++ b/resources/gitinfo/gitinfo.h
@@ -0,0 +1,40 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include <time.h>
+
+#ifdef __cplusplus
+extern "C" {
+#else
+#include <stdbool.h>
+#endif
+
+extern const char GitSHA1[];
+extern const char GitShortSHA1[];
+extern const char GitCommitDate[];
+extern const char GitCommitAuthorName[];
+extern const char GitTag[];
+extern time_t GitCommitTimeStamp;
+extern bool GitUncommittedChanges;
+extern bool GitHaveInfo;
+extern int GitRevision;
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/scripts/clang-tidy-plugin/CMakeLists.txt b/scripts/clang-tidy-plugin/CMakeLists.txt
new file mode 100644
index 00000000000..e8fdbd2581a
--- /dev/null
+++ b/scripts/clang-tidy-plugin/CMakeLists.txt
@@ -0,0 +1,63 @@
+# Custom clang-tidy plugin for GeneralsGameCode
+# This plugin provides checks for custom types like AsciiString and UnicodeString
+
+cmake_minimum_required(VERSION 3.20)
+project(GeneralsGameCodeClangTidyPlugin)
+
+# Find LLVM and Clang
+find_package(LLVM REQUIRED CONFIG)
+find_package(Clang REQUIRED CONFIG)
+
+message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+message(STATUS "Using ClangConfig.cmake in: ${Clang_DIR}")
+
+# Set up include directories
+include_directories(${LLVM_INCLUDE_DIRS})
+include_directories(${CLANG_INCLUDE_DIRS})
+
+# Add definitions
+add_definitions(${LLVM_DEFINITIONS})
+add_definitions(${CLANG_DEFINITIONS})
+
+# Set C++ standard
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Source files
+set(SOURCES
+  GeneralsGameCodeTidyModule.cpp
+  readability/UseIsEmptyCheck.cpp
+  readability/UseThisInsteadOfSingletonCheck.cpp
+)
+
+# Header files
+set(HEADERS
+  GeneralsGameCodeTidyModule.h
+  readability/UseIsEmptyCheck.h
+  readability/UseThisInsteadOfSingletonCheck.h
+)
+
+# Create the module library
+add_library(GeneralsGameCodeClangTidyPlugin MODULE ${SOURCES} ${HEADERS})
+
+# Link against required libraries
+target_link_libraries(GeneralsGameCodeClangTidyPlugin
+  PRIVATE
+  clangTidy
+  clangTidyReadabilityModule
+  clangAST
+  clangASTMatchers
+  clangBasic
+  clangFrontend
+  clangLex
+  clangTooling
+  LLVMSupport
+)
+
+# Set output directory
+set_target_properties(GeneralsGameCodeClangTidyPlugin PROPERTIES
+  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
diff --git a/scripts/clang-tidy-plugin/GeneralsGameCodeTidyModule.cpp b/scripts/clang-tidy-plugin/GeneralsGameCodeTidyModule.cpp
new file mode 100644
index 00000000000..ff4222ccebb
--- /dev/null
+++ b/scripts/clang-tidy-plugin/GeneralsGameCodeTidyModule.cpp
@@ -0,0 +1,30 @@
+//===--- GeneralsGameCodeTidyModule.cpp - GeneralsGameCode Tidy Module ---===//
+//
+// Custom clang-tidy module for GeneralsGameCode
+// Provides GeneralsGameCode-specific checks
+//
+//===----------------------------------------------------------------------===//
+
+#include "GeneralsGameCodeTidyModule.h"
+#include "readability/UseIsEmptyCheck.h"
+#include "readability/UseThisInsteadOfSingletonCheck.h"
+#include "llvm/Support/Registry.h"
+
+namespace clang::tidy::generalsgamecode {
+
+void GeneralsGameCodeTidyModule::addCheckFactories(
+    ClangTidyCheckFactories &CheckFactories) {
+  CheckFactories.registerCheck<readability::UseIsEmptyCheck>(
+      "generals-use-is-empty");
+  CheckFactories.registerCheck<readability::UseThisInsteadOfSingletonCheck>(
+      "generals-use-this-instead-of-singleton");
+}
+
+} // namespace clang::tidy::generalsgamecode
+
+static llvm::Registry<::clang::tidy::ClangTidyModule>::Add<
+    ::clang::tidy::generalsgamecode::GeneralsGameCodeTidyModule>
+    X("generalsgamecode", "GeneralsGameCode-specific checks");
+
+volatile int GeneralsGameCodeTidyModuleAnchorSource = 0;
+
diff --git a/scripts/clang-tidy-plugin/GeneralsGameCodeTidyModule.h b/scripts/clang-tidy-plugin/GeneralsGameCodeTidyModule.h
new file mode 100644
index 00000000000..f597578acb2
--- /dev/null
+++ b/scripts/clang-tidy-plugin/GeneralsGameCodeTidyModule.h
@@ -0,0 +1,24 @@
+//===--- GeneralsGameCodeTidyModule.h - GeneralsGameCode Tidy Module -----===//
+//
+// Custom clang-tidy module for GeneralsGameCode
+// Provides checks for custom types like AsciiString and UnicodeString
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GENERALSGAMECODE_GENERALSGAMECODETIDYMODULE_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GENERALSGAMECODE_GENERALSGAMECODETIDYMODULE_H
+
+#include "clang-tidy/ClangTidyModule.h"
+
+namespace clang::tidy::generalsgamecode {
+
+/// This module is for GeneralsGameCode-specific checks.
+class GeneralsGameCodeTidyModule : public ClangTidyModule {
+public:
+  void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override;
+};
+
+} // namespace clang::tidy::generalsgamecode
+
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GENERALSGAMECODE_GENERALSGAMECODETIDYMODULE_H
+
diff --git a/scripts/clang-tidy-plugin/README.md b/scripts/clang-tidy-plugin/README.md
new file mode 100644
index 00000000000..cbd9a2f83ef
--- /dev/null
+++ b/scripts/clang-tidy-plugin/README.md
@@ -0,0 +1,250 @@
+# GeneralsGameCode Clang-Tidy Custom Checks
+
+Custom clang-tidy checks for the GeneralsGameCode codebase. **This is primarily designed for Windows**, where checks are built directly into clang-tidy. Mac/Linux users can optionally use the plugin version.
+
+## Quick Start
+
+### Windows
+
+**Option 1: Use Pre-built clang-tidy**
+- Precompiled binaries can be found at: https://github.com/TheSuperHackers/GeneralsTools
+
+**Option 2: Build It Yourself**
+
+Follow the manual steps in the [Windows: Building Checks Into clang-tidy](#windows-building-checks-into-clang-tidy) section below.
+
+**Usage**
+```powershell
+llvm-project\build\bin\clang-tidy.exe -p build/clang-tidy `
+  --checks='-*,generals-use-is-empty,generals-use-this-instead-of-singleton' `
+  file.cpp
+```
+
+### macOS/Linux (Plugin Version)
+
+If you prefer the plugin approach on macOS/Linux:
+
+```bash
+# Build the plugin
+cd scripts/clang-tidy-plugin
+mkdir build && cd build
+cmake .. -DLLVM_DIR=/path/to/llvm/lib/cmake/llvm
+cmake --build . --config Release
+
+# Use with --load flag
+clang-tidy -p build/clang-tidy \
+  --checks='-*,generals-use-is-empty' \
+  -load scripts/clang-tidy-plugin/build/lib/libGeneralsGameCodeClangTidyPlugin.so \
+  file.cpp
+```
+
+**Note:** On Windows, plugin loading via `--load` is **not supported** due to DLL static initialization limitations. Windows users must use the built-in version.
+
+## Checks
+
+### `generals-use-is-empty`
+
+Finds uses of `getLength() == 0`, `getLength() > 0`, `compare("") == 0`, or `compareNoCase("") == 0` on `AsciiString` and `UnicodeString`, and `Get_Length() == 0` on `StringClass` and `WideStringClass`, and suggests using `isEmpty()`/`Is_Empty()` or `!isEmpty()`/`!Is_Empty()` instead.
+
+**Examples:**
+
+```cpp
+// Before (AsciiString/UnicodeString)
+if (str.getLength() == 0) { ... }
+if (str.getLength() > 0) { ... }
+if (str.compare("") == 0) { ... }
+if (str.compareNoCase("") == 0) { ... }
+if (str.compare(AsciiString::TheEmptyString) == 0) { ... }
+
+// After (AsciiString/UnicodeString)
+if (str.isEmpty()) { ... }
+if (!str.isEmpty()) { ... }
+if (str.isEmpty()) { ... }
+if (str.isEmpty()) { ... }
+if (str.isEmpty()) { ... }
+
+// Before (StringClass/WideStringClass)
+if (str.Get_Length() == 0) { ... }
+if (str.Get_Length() > 0) { ... }
+
+// After (StringClass/WideStringClass)
+if (str.Is_Empty()) { ... }
+if (!str.Is_Empty()) { ... }
+```
+
+### `generals-use-this-instead-of-singleton`
+
+Finds uses of singleton global variables (like `TheGameLogic->method()` or `TheGlobalData->member`) inside member functions of the same class type, and suggests using the member directly (e.g., `method()` or `member`) instead of the singleton reference.
+
+**Examples:**
+
+```cpp
+// Before
+void GameLogic::update() {
+  UnsignedInt now = TheGameLogic->getFrame();
+  TheGameLogic->setFrame(now + 1);
+  TheGameLogic->m_frame = 10;
+}
+
+// After
+void GameLogic::update() {
+  UnsignedInt now = getFrame();
+  setFrame(now + 1);
+  m_frame = 10;
+}
+```
+
+## Prerequisites
+
+Before using clang-tidy, you need to generate a compile commands database:
+
+```bash
+cmake -B build/clang-tidy -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON -G Ninja
+```
+
+This creates `build/clang-tidy/compile_commands.json` which tells clang-tidy how to compile each file.
+
+## Windows: Building Checks Into clang-tidy
+
+Since plugin loading via `--load` doesn't work on Windows, the checks are integrated directly into the clang-tidy source tree. This is the recommended approach for Windows.
+
+### Step 1: Clone and Build LLVM
+
+### Step 2: Copy Plugin Files to LLVM Source Tree
+
+```powershell
+# Create the plugin directory in clang-tools-extra
+mkdir llvm-project\clang-tools-extra\clang-tidy\plugins\generalsgamecode
+
+# Copy the plugin source files
+cp -r scripts\clang-tidy-plugin\*.cpp llvm-project\clang-tools-extra\clang-tidy\plugins\generalsgamecode\
+cp -r scripts\clang-tidy-plugin\*.h llvm-project\clang-tools-extra\clang-tidy\plugins\generalsgamecode\
+cp -r scripts\clang-tidy-plugin\readability llvm-project\clang-tools-extra\clang-tidy\plugins\generalsgamecode\
+```
+
+**Important:** After copying, you need to update the include paths in the headers:
+- Change `#include "clang-tidy/ClangTidyCheck.h"` to `#include "../../../ClangTidyCheck.h"`
+- Change `#include "clang-tidy/ClangTidyModule.h"` to `#include "../../ClangTidyModule.h"`
+
+### Step 3: Create CMakeLists.txt for the Module
+
+Create `llvm-project/clang-tools-extra/clang-tidy/plugins/generalsgamecode/CMakeLists.txt`:
+
+```cmake
+add_clang_library(clangTidyGeneralsGameCodeModule STATIC
+  GeneralsGameCodeTidyModule.cpp
+  readability/UseIsEmptyCheck.cpp
+  readability/UseThisInsteadOfSingletonCheck.cpp
+
+  LINK_LIBS
+  clangTidy
+  clangTidyUtils
+  )
+
+clang_target_link_libraries(clangTidyGeneralsGameCodeModule
+  PRIVATE
+  clangAST
+  clangASTMatchers
+  clangBasic
+  clangLex
+  clangTooling
+  )
+```
+
+### Step 4: Register the Module
+
+**Modify `llvm-project/clang-tools-extra/clang-tidy/CMakeLists.txt`:**
+
+Add the subdirectory:
+```cmake
+add_subdirectory(plugins/generalsgamecode)
+```
+
+Add to `ALL_CLANG_TIDY_CHECKS`:
+```cmake
+set(ALL_CLANG_TIDY_CHECKS
+  ...
+  clangTidyGeneralsGameCodeModule
+  ...
+)
+```
+
+**Modify `llvm-project/clang-tools-extra/clang-tidy/ClangTidyForceLinker.h`:**
+
+Add the anchor to force linker inclusion:
+```cpp
+// This anchor is used to force the linker to link the GeneralsGameCodeModule.
+extern volatile int GeneralsGameCodeModuleAnchorSource;
+static int LLVM_ATTRIBUTE_UNUSED GeneralsGameCodeModuleAnchorDestination =
+    GeneralsGameCodeModuleAnchorSource;
+```
+
+**Modify `llvm-project/clang-tools-extra/clang-tidy/plugins/generalsgamecode/GeneralsGameCodeTidyModule.cpp`:**
+
+Ensure the anchor is defined:
+```cpp
+namespace clang::tidy {
+// ... module registration ...
+
+// Force linker to include this module
+volatile int GeneralsGameCodeModuleAnchorSource = 0;
+}
+```
+
+### Step 5: Rebuild clang-tidy
+
+```powershell
+cd llvm-project\build
+ninja clang-tidy
+```
+
+### Step 6: Use the Built-in Checks
+
+Once rebuilt, the checks are always available - no `--load` flag needed:
+
+```powershell
+llvm-project\build\bin\clang-tidy.exe -p build/clang-tidy `
+  --checks='-*,generals-use-is-empty,generals-use-this-instead-of-singleton' `
+  file.cpp
+```
+
+
+## macOS/Linux: Building the Plugin
+
+If you're on macOS or Linux and want to use the plugin version:
+
+### Prerequisites
+
+**macOS:**
+```bash
+brew install llvm@21
+```
+
+**Linux (Ubuntu/Debian):**
+```bash
+sudo apt-get install llvm-21-dev clang-21 libclang-21-dev
+```
+
+### Building the Plugin
+
+```bash
+cd scripts/clang-tidy-plugin
+mkdir build && cd build
+cmake .. -DLLVM_DIR=/path/to/llvm/lib/cmake/llvm -DClang_DIR=/path/to/clang/lib/cmake/clang
+cmake --build . --config Release
+```
+
+The plugin will be built as a shared library (`.so` on Linux, `.dylib` on macOS) in the `build/lib/` directory.
+
+### Using the Plugin
+
+```bash
+clang-tidy -p build/clang-tidy \
+  --checks='-*,generals-use-is-empty,generals-use-this-instead-of-singleton' \
+  -load scripts/clang-tidy-plugin/build/lib/libGeneralsGameCodeClangTidyPlugin.so \
+  file.cpp
+```
+
+**Important:** The plugin must be built with the same LLVM version as the `clang-tidy` executable in your PATH. The CMake build will display which LLVM version it found (e.g., `Found LLVM 21.1.7`). Verify this matches your `clang-tidy --version` output.
+
+- Windows plugins not working is a known limitation - see [GitHub issue #159710](https://github.com/llvm/llvm-project/issues/159710) and [LLVM Discourse discussion](https://discourse.llvm.org/t/clang-tidy-is-clang-tidy-out-of-tree-check-plugin-load-mechanism-guaranteed-to-work-with-msvc/84111)
diff --git a/scripts/clang-tidy-plugin/readability/UseIsEmptyCheck.cpp b/scripts/clang-tidy-plugin/readability/UseIsEmptyCheck.cpp
new file mode 100644
index 00000000000..fe70a15b5ed
--- /dev/null
+++ b/scripts/clang-tidy-plugin/readability/UseIsEmptyCheck.cpp
@@ -0,0 +1,254 @@
+//===--- UseIsEmptyCheck.cpp - Use isEmpty() instead of getLength() == 0 -===//
+//
+// This check finds patterns like:
+//   - AsciiString::getLength() == 0  -> AsciiString::isEmpty()
+//   - AsciiString::getLength() > 0   -> !AsciiString::isEmpty()
+//   - UnicodeString::getLength() == 0 -> UnicodeString::isEmpty()
+//   - UnicodeString::getLength() > 0  -> !UnicodeString::isEmpty()
+//   - StringClass::Get_Length() == 0  -> StringClass::Is_Empty()
+//   - WideStringClass::Get_Length() == 0 -> WideStringClass::Is_Empty()
+//   - AsciiString::compare("") == 0  -> AsciiString::isEmpty()
+//   - UnicodeString::compare(L"") == 0 -> UnicodeString::isEmpty()
+//   - AsciiString::compare(AsciiString::TheEmptyString) == 0 -> AsciiString::isEmpty()
+//   - UnicodeString::compare(UnicodeString::TheEmptyString) == 0 -> UnicodeString::isEmpty()
+//
+//===----------------------------------------------------------------------===//
+
+#include "UseIsEmptyCheck.h"
+#include "clang/AST/ASTContext.h"
+#include "clang/ASTMatchers/ASTMatchers.h"
+#include "clang/Basic/SourceLocation.h"
+#include "clang/Lex/Lexer.h"
+
+using namespace clang::ast_matchers;
+
+namespace clang::tidy::generalsgamecode::readability {
+
+void UseIsEmptyCheck::registerMatchers(MatchFinder *Finder) {
+  // Matcher for AsciiString/UnicodeString with getLength()
+  auto GetLengthCall = cxxMemberCallExpr(
+      callee(cxxMethodDecl(hasName("getLength"))),
+      on(hasType(hasUnqualifiedDesugaredType(
+          recordType(hasDeclaration(cxxRecordDecl(
+              hasAnyName("AsciiString", "UnicodeString"))))))));
+
+  // Matcher for StringClass/WideStringClass with Get_Length()
+  auto GetLengthCallWWVegas = cxxMemberCallExpr(
+      callee(cxxMethodDecl(hasName("Get_Length"))),
+      on(hasType(hasUnqualifiedDesugaredType(
+          recordType(hasDeclaration(cxxRecordDecl(
+              hasAnyName("StringClass", "WideStringClass"))))))));
+
+  // Helper function to add matchers for a given GetLength call matcher
+  auto addMatchersForGetLength = [&](const auto &GetLengthMatcher) {
+    Finder->addMatcher(
+        binaryOperator(
+            hasOperatorName("=="),
+            hasLHS(ignoringParenImpCasts(GetLengthMatcher.bind("getLengthCall"))),
+            hasRHS(integerLiteral(equals(0)).bind("zero")))
+            .bind("comparison"),
+        this);
+
+    Finder->addMatcher(
+        binaryOperator(
+            hasOperatorName("!="),
+            hasLHS(ignoringParenImpCasts(GetLengthMatcher.bind("getLengthCall"))),
+            hasRHS(integerLiteral(equals(0)).bind("zero")))
+            .bind("comparison"),
+        this);
+
+    Finder->addMatcher(
+        binaryOperator(
+            hasOperatorName(">"),
+            hasLHS(ignoringParenImpCasts(GetLengthMatcher.bind("getLengthCall"))),
+            hasRHS(integerLiteral(equals(0)).bind("zero")))
+            .bind("comparison"),
+        this);
+
+    Finder->addMatcher(
+        binaryOperator(
+            hasOperatorName("<="),
+            hasLHS(ignoringParenImpCasts(GetLengthMatcher.bind("getLengthCall"))),
+            hasRHS(integerLiteral(equals(0)).bind("zero")))
+            .bind("comparison"),
+        this);
+
+    Finder->addMatcher(
+        binaryOperator(
+            hasOperatorName("=="),
+            hasLHS(integerLiteral(equals(0)).bind("zero")),
+            hasRHS(ignoringParenImpCasts(GetLengthMatcher.bind("getLengthCall"))))
+            .bind("comparison"),
+        this);
+
+    Finder->addMatcher(
+        binaryOperator(
+            hasOperatorName("!="),
+            hasLHS(integerLiteral(equals(0)).bind("zero")),
+            hasRHS(ignoringParenImpCasts(GetLengthMatcher.bind("getLengthCall"))))
+            .bind("comparison"),
+        this);
+  };
+
+  addMatchersForGetLength(GetLengthCall);
+  addMatchersForGetLength(GetLengthCallWWVegas);
+
+  // Matcher for TheEmptyString static member access (AsciiString::TheEmptyString or UnicodeString::TheEmptyString)
+  auto TheEmptyStringRef = memberExpr(
+      member(hasName("TheEmptyString")),
+      hasObjectExpression(hasType(hasUnqualifiedDesugaredType(
+          recordType(hasDeclaration(cxxRecordDecl(
+              hasAnyName("AsciiString", "UnicodeString"))))))));
+
+  // Matcher for AsciiString/UnicodeString with compare() - we'll check if argument is empty in check()
+  auto CompareCall = cxxMemberCallExpr(
+      callee(cxxMethodDecl(hasName("compare"))),
+      on(hasType(hasUnqualifiedDesugaredType(
+          recordType(hasDeclaration(cxxRecordDecl(
+              hasAnyName("AsciiString", "UnicodeString"))))))),
+      hasArgument(0, anyOf(
+          stringLiteral().bind("stringLiteralArg"),
+          TheEmptyStringRef.bind("theEmptyStringArg"))));
+
+  // Matcher for AsciiString/UnicodeString with compareNoCase() - we'll check if argument is empty in check()
+  auto CompareNoCaseCall = cxxMemberCallExpr(
+      callee(cxxMethodDecl(hasName("compareNoCase"))),
+      on(hasType(hasUnqualifiedDesugaredType(
+          recordType(hasDeclaration(cxxRecordDecl(
+              hasAnyName("AsciiString", "UnicodeString"))))))),
+      hasArgument(0, anyOf(
+          stringLiteral().bind("stringLiteralArg"),
+          TheEmptyStringRef.bind("theEmptyStringArg"))));
+
+  // Helper function to add matchers for compare() and compareNoCase() calls
+  auto addMatchersForCompare = [&](const auto &CompareMatcher, const char *BindingName) {
+    Finder->addMatcher(
+        binaryOperator(
+            hasOperatorName("=="),
+            hasLHS(ignoringParenImpCasts(CompareMatcher.bind(BindingName))),
+            hasRHS(integerLiteral(equals(0)).bind("zero")))
+            .bind("comparison"),
+        this);
+
+    Finder->addMatcher(
+        binaryOperator(
+            hasOperatorName("!="),
+            hasLHS(ignoringParenImpCasts(CompareMatcher.bind(BindingName))),
+            hasRHS(integerLiteral(equals(0)).bind("zero")))
+            .bind("comparison"),
+        this);
+
+    Finder->addMatcher(
+        binaryOperator(
+            hasOperatorName("=="),
+            hasLHS(integerLiteral(equals(0)).bind("zero")),
+            hasRHS(ignoringParenImpCasts(CompareMatcher.bind(BindingName))))
+            .bind("comparison"),
+        this);
+
+    Finder->addMatcher(
+        binaryOperator(
+            hasOperatorName("!="),
+            hasLHS(integerLiteral(equals(0)).bind("zero")),
+            hasRHS(ignoringParenImpCasts(CompareMatcher.bind(BindingName))))
+            .bind("comparison"),
+        this);
+  };
+
+  addMatchersForCompare(CompareCall, "compareCall");
+  addMatchersForCompare(CompareNoCaseCall, "compareNoCaseCall");
+}
+
+void UseIsEmptyCheck::check(const MatchFinder::MatchResult &Result) {
+  const auto *Comparison = Result.Nodes.getNodeAs<BinaryOperator>("comparison");
+  const auto *GetLengthCall =
+      Result.Nodes.getNodeAs<CXXMemberCallExpr>("getLengthCall");
+  const auto *CompareCall =
+      Result.Nodes.getNodeAs<CXXMemberCallExpr>("compareCall");
+  const auto *CompareNoCaseCall =
+      Result.Nodes.getNodeAs<CXXMemberCallExpr>("compareNoCaseCall");
+
+  if (!Comparison)
+    return;
+
+  const CXXMemberCallExpr *MethodCall = GetLengthCall ? GetLengthCall :
+                                        (CompareCall ? CompareCall : CompareNoCaseCall);
+  if (!MethodCall)
+    return;
+
+  // For compare() and compareNoCase() calls, verify the argument is actually empty
+  if (CompareCall || CompareNoCaseCall) {
+    const auto *StringLit = Result.Nodes.getNodeAs<StringLiteral>("stringLiteralArg");
+    const auto *TheEmptyString = Result.Nodes.getNodeAs<MemberExpr>("theEmptyStringArg");
+
+    if (StringLit) {
+      // Check if string literal is actually empty ("" or L"")
+      StringRef Str = StringLit->getString();
+      if (!Str.empty()) {
+        return; // Not an empty string literal
+      }
+    } else if (!TheEmptyString) {
+      return; // Not matching empty string pattern
+    }
+  }
+
+  const Expr *ObjectExpr = MethodCall->getImplicitObjectArgument();
+  if (!ObjectExpr)
+    return;
+
+  // Determine which method name to use based on the called method
+  StringRef MethodName = MethodCall->getMethodDecl()->getName();
+  std::string IsEmptyMethodName;
+  std::string MethodNameStr;
+
+  if (MethodName == "Get_Length") {
+    IsEmptyMethodName = "Is_Empty()";
+    MethodNameStr = "Get_Length()";
+  } else if (MethodName == "compare") {
+    IsEmptyMethodName = "isEmpty()";
+    MethodNameStr = "compare()";
+  } else if (MethodName == "compareNoCase") {
+    IsEmptyMethodName = "isEmpty()";
+    MethodNameStr = "compareNoCase()";
+  } else {
+    IsEmptyMethodName = "isEmpty()";
+    MethodNameStr = "getLength()";
+  }
+
+  StringRef Operator = Comparison->getOpcodeStr();
+  bool ShouldNegate = false;
+
+  if (Operator == "==") {
+    ShouldNegate = false;
+  } else if (Operator == "!=") {
+    ShouldNegate = true;
+  } else if (Operator == ">") {
+    ShouldNegate = true;
+  } else if (Operator == "<=") {
+    ShouldNegate = false;
+  } else {
+    return;
+  }
+
+  StringRef ObjectText = Lexer::getSourceText(
+      CharSourceRange::getTokenRange(ObjectExpr->getSourceRange()),
+      *Result.SourceManager, Result.Context->getLangOpts());
+
+  std::string Replacement;
+  if (ShouldNegate) {
+    Replacement = "!" + ObjectText.str() + "." + IsEmptyMethodName;
+  } else {
+    Replacement = ObjectText.str() + "." + IsEmptyMethodName;
+  }
+
+  SourceLocation StartLoc = Comparison->getBeginLoc();
+  SourceLocation EndLoc = Comparison->getEndLoc();
+
+  diag(Comparison->getBeginLoc(),
+       "use %0 instead of comparing %1 with 0")
+      << Replacement << MethodNameStr
+      << FixItHint::CreateReplacement(
+             CharSourceRange::getTokenRange(StartLoc, EndLoc), Replacement);
+}
+
+} // namespace clang::tidy::generalsgamecode::readability
diff --git a/scripts/clang-tidy-plugin/readability/UseIsEmptyCheck.h b/scripts/clang-tidy-plugin/readability/UseIsEmptyCheck.h
new file mode 100644
index 00000000000..2d6dd84253d
--- /dev/null
+++ b/scripts/clang-tidy-plugin/readability/UseIsEmptyCheck.h
@@ -0,0 +1,45 @@
+//===--- UseIsEmptyCheck.h - Use isEmpty() instead of getLength() == 0 ---===//
+//
+// This check finds patterns like:
+//   - AsciiString::getLength() == 0  -> AsciiString::isEmpty()
+//   - AsciiString::getLength() > 0   -> !AsciiString::isEmpty()
+//   - UnicodeString::getLength() == 0 -> UnicodeString::isEmpty()
+//   - UnicodeString::getLength() > 0  -> !UnicodeString::isEmpty()
+//   - StringClass::Get_Length() == 0  -> StringClass::Is_Empty()
+//   - WideStringClass::Get_Length() == 0 -> WideStringClass::Is_Empty()
+//   - AsciiString::compare("") == 0  -> AsciiString::isEmpty()
+//   - UnicodeString::compare(L"") == 0 -> UnicodeString::isEmpty()
+//   - AsciiString::compare(AsciiString::TheEmptyString) == 0 -> AsciiString::isEmpty()
+//   - UnicodeString::compare(UnicodeString::TheEmptyString) == 0 -> UnicodeString::isEmpty()
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GENERALSGAMECODE_READABILITY_USEISEMPTYCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GENERALSGAMECODE_READABILITY_USEISEMPTYCHECK_H
+
+#include "clang-tidy/ClangTidyCheck.h"
+
+namespace clang::tidy::generalsgamecode::readability {
+
+/// Finds uses of getLength() == 0 or getLength() > 0 on AsciiString and
+/// UnicodeString, and Get_Length() == 0 on StringClass and WideStringClass,
+/// and suggests using isEmpty()/Is_Empty() or !isEmpty()/!Is_Empty() instead.
+/// Also finds uses of compare("") == 0 or compare(TheEmptyString) == 0 and
+/// suggests using isEmpty() instead.
+///
+/// For the user-facing documentation see:
+/// http://clang.llvm.org/extra/clang-tidy/checks/generals-use-is-empty.html
+class UseIsEmptyCheck : public ClangTidyCheck {
+public:
+  UseIsEmptyCheck(StringRef Name, ClangTidyContext *Context)
+      : ClangTidyCheck(Name, Context) {}
+  void registerMatchers(ast_matchers::MatchFinder *Finder) override;
+  void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+  bool isLanguageVersionSupported(const LangOptions &LangOpts) const override {
+    return LangOpts.CPlusPlus;
+  }
+};
+
+} // namespace clang::tidy::generalsgamecode::readability
+
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GENERALSGAMECODE_READABILITY_USEISEMPTYCHECK_H
diff --git a/scripts/clang-tidy-plugin/readability/UseThisInsteadOfSingletonCheck.cpp b/scripts/clang-tidy-plugin/readability/UseThisInsteadOfSingletonCheck.cpp
new file mode 100644
index 00000000000..51eff283ef6
--- /dev/null
+++ b/scripts/clang-tidy-plugin/readability/UseThisInsteadOfSingletonCheck.cpp
@@ -0,0 +1,225 @@
+#include "UseThisInsteadOfSingletonCheck.h"
+#include "clang/AST/ASTContext.h"
+#include "clang/AST/Decl.h"
+#include "clang/AST/DeclCXX.h"
+#include "clang/AST/Expr.h"
+#include "clang/AST/ExprCXX.h"
+#include "clang/AST/Type.h"
+#include "clang/ASTMatchers/ASTMatchers.h"
+#include "clang/Basic/SourceLocation.h"
+#include "clang/Lex/Lexer.h"
+
+using namespace clang;
+using namespace clang::ast_matchers;
+
+namespace clang::tidy::generalsgamecode::readability {
+
+
+static const CXXMethodDecl *getEnclosingMethod(ASTContext *Context,
+                                                const Stmt *S) {
+  const CXXMethodDecl *Method = nullptr;
+  
+  auto Parents = Context->getParents(*S);
+  while (!Parents.empty()) {
+    if (const auto *M = Parents[0].get<CXXMethodDecl>()) {
+      if (!M->isStatic()) {
+        Method = M;
+        break;
+      }
+    }
+    Parents = Context->getParents(Parents[0]);
+  }
+  
+  return Method;
+}
+
+static bool typesMatch(const QualType &SingletonType,
+                       const CXXRecordDecl *EnclosingClass) {
+  if (!EnclosingClass) {
+    return false;
+  }
+
+  const Type *TypePtr = SingletonType.getTypePtrOrNull();
+  if (!TypePtr) {
+    return false;
+  }
+
+  if (const PointerType *PtrType = TypePtr->getAs<PointerType>()) {
+    QualType PointeeType = PtrType->getPointeeType();
+    if (const RecordType *RecordTy = PointeeType->getAs<RecordType>()) {
+      if (const CXXRecordDecl *RecordDecl =
+              dyn_cast<CXXRecordDecl>(RecordTy->getDecl())) {
+        return RecordDecl->getCanonicalDecl() ==
+               EnclosingClass->getCanonicalDecl();
+      }
+    }
+  }
+
+  return false;
+}
+
+void UseThisInsteadOfSingletonCheck::registerMatchers(MatchFinder *Finder) {
+  auto MemberExprMatcher = memberExpr(
+      hasObjectExpression(ignoringParenImpCasts(declRefExpr(to(varDecl(anyOf(hasGlobalStorage(), hasExternalFormalLinkage())).bind("singletonVar"))))),
+      hasDeclaration(fieldDecl()),
+      unless(hasAncestor(cxxMemberCallExpr())))
+      .bind("memberExpr");
+
+  auto MemberCallMatcher = cxxMemberCallExpr(
+      on(ignoringParenImpCasts(declRefExpr(to(varDecl(anyOf(hasGlobalStorage(), hasExternalFormalLinkage())).bind("singletonVarCall"))))))
+      .bind("memberCall");
+
+  Finder->addMatcher(MemberExprMatcher, this);
+  Finder->addMatcher(MemberCallMatcher, this);
+}
+
+void UseThisInsteadOfSingletonCheck::check(
+    const MatchFinder::MatchResult &Result) {
+  const auto *MemExpr = Result.Nodes.getNodeAs<clang::MemberExpr>("memberExpr");
+  const auto *MemberCall = Result.Nodes.getNodeAs<CXXMemberCallExpr>("memberCall");
+  
+  if (!MemExpr && !MemberCall) {
+    return;
+  }
+
+  const Stmt *TargetStmt = nullptr;
+  const VarDecl *FoundSingletonVar = nullptr;
+  bool IsCall = false;
+
+  if (MemberCall) {
+    IsCall = true;
+    TargetStmt = MemberCall;
+    FoundSingletonVar = Result.Nodes.getNodeAs<VarDecl>("singletonVarCall");
+    if (!FoundSingletonVar) {
+      const Expr *ImplicitObject = MemberCall->getImplicitObjectArgument();
+      if (ImplicitObject) {
+        ImplicitObject = ImplicitObject->IgnoreParenImpCasts();
+        if (const DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(ImplicitObject)) {
+          FoundSingletonVar = dyn_cast<VarDecl>(DRE->getDecl());
+        }
+      }
+    }
+  } else if (MemExpr) {
+    TargetStmt = MemExpr;
+    FoundSingletonVar = Result.Nodes.getNodeAs<VarDecl>("singletonVar");
+  }
+
+  if (!TargetStmt || !FoundSingletonVar) {
+    return;
+  }
+
+  StringRef SingletonName = FoundSingletonVar->getName();
+  if (!SingletonName.starts_with("The") || SingletonName.size() <= 3 ||
+      (SingletonName[3] < 'A' || SingletonName[3] > 'Z')) {
+    return;
+  }
+
+  const ASTContext *Context = Result.Context;
+
+  const CXXMethodDecl *EnclosingMethod = getEnclosingMethod(
+      const_cast<ASTContext *>(Context), TargetStmt);
+  if (!EnclosingMethod) {
+    return;
+  }
+
+  const CXXRecordDecl *EnclosingClass = EnclosingMethod->getParent();
+  if (!EnclosingClass) {
+    return;
+  }
+
+  QualType SingletonType = FoundSingletonVar->getType();
+  if (!typesMatch(SingletonType, EnclosingClass)) {
+    return;
+  }
+
+  const ValueDecl *Member = nullptr;
+  StringRef MemberName;
+  SourceLocation StartLoc, EndLoc;
+
+  if (IsCall && MemberCall) {
+    const CXXMethodDecl *Method = MemberCall->getMethodDecl();
+    if (!Method) {
+      return;
+    }
+    if (Method->isStatic()) {
+      return;
+    }
+    if (EnclosingMethod->isConst() && !Method->isConst()) {
+      return;
+    }
+    Member = Method;
+    MemberName = Method->getName();
+    StartLoc = MemberCall->getBeginLoc();
+    EndLoc = MemberCall->getEndLoc();
+  } else if (MemExpr) {
+    Member = MemExpr->getMemberDecl();
+    if (!Member) {
+      return;
+    }
+    MemberName = Member->getName();
+    StartLoc = MemExpr->getBeginLoc();
+    EndLoc = MemExpr->getEndLoc();
+  } else {
+    return;
+  }
+
+  SourceManager &SM = *Result.SourceManager;
+
+  std::string Replacement = std::string(MemberName);
+  
+  if (IsCall && MemberCall) {
+    SourceLocation RParenLoc = MemberCall->getRParenLoc();
+    const Expr *Callee = MemberCall->getCallee();
+    
+    if (RParenLoc.isValid() && Callee) {
+      SourceLocation CalleeEnd = Lexer::getLocForEndOfToken(
+          Callee->getEndLoc(), 0, SM, Result.Context->getLangOpts());
+      
+      if (CalleeEnd.isValid() && CalleeEnd < RParenLoc) {
+        SourceLocation ArgsStart = CalleeEnd;
+        SourceLocation ArgsEnd = Lexer::getLocForEndOfToken(
+            RParenLoc, 0, SM, Result.Context->getLangOpts());
+        
+        if (ArgsStart.isValid() && ArgsEnd.isValid() && ArgsStart < ArgsEnd) {
+          StringRef ArgsText = Lexer::getSourceText(
+              CharSourceRange::getCharRange(ArgsStart, ArgsEnd), SM,
+              Result.Context->getLangOpts());
+          ArgsText = ArgsText.ltrim();
+          if (!ArgsText.empty()) {
+            Replacement += ArgsText.str();
+          } else {
+            Replacement += "()";
+          }
+        } else {
+          Replacement += "()";
+        }
+      } else {
+        SourceLocation CallEnd = Lexer::getLocForEndOfToken(
+            MemberCall->getEndLoc(), 0, SM, Result.Context->getLangOpts());
+        if (CalleeEnd.isValid() && CallEnd.isValid() && CalleeEnd < CallEnd) {
+          StringRef ArgsText = Lexer::getSourceText(
+              CharSourceRange::getCharRange(CalleeEnd, CallEnd), SM,
+              Result.Context->getLangOpts());
+          ArgsText = ArgsText.ltrim();
+          if (!ArgsText.empty()) {
+            Replacement += ArgsText.str();
+          } else {
+            Replacement += "()";
+          }
+        } else {
+          Replacement += "()";
+        }
+      }
+    } else {
+      Replacement += "()";
+    }
+  }
+
+  diag(StartLoc, "use '%0' instead of '%1->%2' when inside a member function")
+      << Replacement << FoundSingletonVar->getName() << MemberName
+      << FixItHint::CreateReplacement(
+             CharSourceRange::getTokenRange(StartLoc, EndLoc), Replacement);
+}
+
+} // namespace clang::tidy::generalsgamecode::readability
+
diff --git a/scripts/clang-tidy-plugin/readability/UseThisInsteadOfSingletonCheck.h b/scripts/clang-tidy-plugin/readability/UseThisInsteadOfSingletonCheck.h
new file mode 100644
index 00000000000..1005d5d84b5
--- /dev/null
+++ b/scripts/clang-tidy-plugin/readability/UseThisInsteadOfSingletonCheck.h
@@ -0,0 +1,22 @@
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GENERALSGAMECODE_READABILITY_USETHISINSTEADOFSINGLETONCHECK_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GENERALSGAMECODE_READABILITY_USETHISINSTEADOFSINGLETONCHECK_H
+
+#include "clang-tidy/ClangTidyCheck.h"
+
+namespace clang::tidy::generalsgamecode::readability {
+
+class UseThisInsteadOfSingletonCheck : public ClangTidyCheck {
+public:
+  UseThisInsteadOfSingletonCheck(StringRef Name, ClangTidyContext *Context)
+      : ClangTidyCheck(Name, Context) {}
+  void registerMatchers(ast_matchers::MatchFinder *Finder) override;
+  void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+  bool isLanguageVersionSupported(const LangOptions &LangOpts) const override {
+    return LangOpts.CPlusPlus;
+  }
+};
+
+} // namespace clang::tidy::generalsgamecode::readability
+
+#endif
+
diff --git a/scripts/cpp/apply_code_formatting.py b/scripts/cpp/apply_code_formatting.py
new file mode 100644
index 00000000000..aa223652f81
--- /dev/null
+++ b/scripts/cpp/apply_code_formatting.py
@@ -0,0 +1,66 @@
+# Created with python 3.11.4
+
+# This script applies basic formatting and cleanups to the various CPP files.
+# Just run it.
+
+import glob
+import os
+
+
+def apply_formatting(line: str) -> str:
+    # Strip useless comments behind scope end
+    scopeEndIndex = line.find('}')
+    if scopeEndIndex >= 0:
+        if scopeEndIndex == 0 or line[:scopeEndIndex].isspace():
+            afterScopeIndex = scopeEndIndex + 1
+            while afterScopeIndex < len(line) and line[afterScopeIndex] == ';':
+                afterScopeIndex += 1
+            commentBeginIndex = line.find("//")
+            namespaceCommentBeginIndex = line.find("// namespace")
+            if commentBeginIndex >= 0 and namespaceCommentBeginIndex < 0:
+                if afterScopeIndex == commentBeginIndex or line[afterScopeIndex:commentBeginIndex].isspace():
+                    line = line[:commentBeginIndex]
+
+    # remove trailing whitespace
+    line = line.rstrip()
+    line += "\n"
+
+    return line
+
+
+def main():
+    current_dir = os.path.dirname(os.path.abspath(__file__))
+    root_dir = os.path.join(current_dir, "..", "..")
+    root_dir = os.path.normpath(root_dir)
+    core_dir = os.path.join(root_dir, "Core")
+    generals_dir = os.path.join(root_dir, "Generals")
+    generalsmd_dir = os.path.join(root_dir, "GeneralsMD")
+    utility_dir = os.path.join(root_dir, "Dependencies", "Utility")
+    fileNames = []
+    for ext in ["*.cpp", "*.h", "*.inl"]:
+        fileNames.extend(glob.glob(os.path.join(core_dir, '**', ext), recursive=True))
+        fileNames.extend(glob.glob(os.path.join(generals_dir, '**', ext), recursive=True))
+        fileNames.extend(glob.glob(os.path.join(generalsmd_dir, '**', ext), recursive=True))
+        fileNames.extend(glob.glob(os.path.join(utility_dir, '**', ext), recursive=True))
+
+    for fileName in fileNames:
+        with open(fileName, 'r', encoding="cp1252") as file:
+            try:
+                lines = file.readlines()
+            except UnicodeDecodeError:
+                continue # Not good.
+
+        with open(fileName, 'w', encoding="cp1252") as file:
+            for line in lines:
+                line = apply_formatting(line)
+                file.write(line)
+            if lines:
+                lastLine = lines[-1]
+                if lastLine and lastLine[-1] != '\n':
+                    file.write("\n") # write new line to end of file
+
+    return
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/cpp/harmonize_linebreaks_pragmaonce.py b/scripts/cpp/harmonize_linebreaks_pragmaonce.py
new file mode 100644
index 00000000000..cb53e0d0d3e
--- /dev/null
+++ b/scripts/cpp/harmonize_linebreaks_pragmaonce.py
@@ -0,0 +1,157 @@
+#!/usr/bin/env python3
+"""
+format_pragma_once_spacing.py
+
+Ensure consistent spacing around '#pragma once' in .h files:
+
+- Exactly one blank line AFTER '#pragma once'.
+- Exactly one blank line BEFORE '#pragma once' IF there is any non-blank content above it.
+  (If '#pragma once' is already the first non-blank content in the file, we do NOT insert
+   a leading blank line.)
+
+We leave everything else untouched.
+
+Outputs:
+- total .h files found
+- files changed
+- files without '#pragma once'
+"""
+
+from __future__ import annotations
+import argparse
+import re
+from pathlib import Path
+
+RE_PRAGMA_ONCE = re.compile(r'^\s*#\s*pragma\s+once\s*$', re.IGNORECASE)
+
+def is_blank(s: str) -> bool:
+    return s.strip() == ""
+
+def normalize_pragma_once_spacing(text: str) -> tuple[str, bool]:
+    """
+    For each '#pragma once' line in the file, enforce spacing rules.
+    Returns (new_text, changed).
+    """
+    # Preserve final newline behaviour
+    had_trailing_nl = text.endswith("\n")
+    lines = text.splitlines()
+
+    # Find all pragma indices
+    pragma_idxs = [i for i, ln in enumerate(lines) if RE_PRAGMA_ONCE.match(ln)]
+    if not pragma_idxs:
+        return text, False
+
+    changed = False
+    # We'll operate on a mutable list; keep track of index shifts when inserting/removing
+    i = 0
+    while i < len(lines):
+        if i in pragma_idxs:
+            # ----- BEFORE: ensure exactly one blank line IF there is any non-blank above -----
+            # Count run of blank lines immediately above
+            j = i - 1
+            blanks_before = 0
+            while j >= 0 and is_blank(lines[j]):
+                blanks_before += 1
+                j -= 1
+
+            has_nonblank_above = j >= 0  # there's some non-blank content above
+
+            # If there is content above, enforce exactly one blank line before
+            if has_nonblank_above:
+                # Remove all blank lines immediately above
+                if blanks_before > 1:
+                    # delete the extra blanks, keep none for now
+                    del lines[i - blanks_before: i - 1]  # keep one slot for later insert
+                    i -= (blanks_before - 1)
+                    changed = True
+                elif blanks_before == 0:
+                    # none present now; we'll insert one below
+                    pass
+                # After removals, ensure exactly one blank line
+                if i - 1 < 0 or not is_blank(lines[i - 1]):
+                    lines.insert(i, "")
+                    i += 1  # pragma shifts down by one
+                    # Update pragma index list too
+                    pragma_idxs = [p + 1 if p >= i - 1 else p for p in pragma_idxs]
+                    changed = True
+            else:
+                # No nonblank content above; ensure there are zero blank lines above
+                if blanks_before > 0:
+                    del lines[i - blanks_before:i]
+                    i -= blanks_before
+                    # Adjust pragma indices after deletion
+                    removed = blanks_before
+                    pragma_idxs = [p - removed if p >= i else p for p in pragma_idxs]
+                    changed = True
+
+            # Recompute blanks_after starting from (possibly) updated i
+            # ----- AFTER: ensure exactly one blank line after -----
+            k = i + 1
+            blanks_after = 0
+            while k < len(lines) and is_blank(lines[k]):
+                blanks_after += 1
+                k += 1
+
+            # Remove all blank lines after, then insert exactly one
+            if blanks_after != 1:
+                # remove all current blanks after
+                if blanks_after > 0:
+                    del lines[i + 1 : i + 1 + blanks_after]
+                    # adjust pragma indices after deletion (those after k shift left)
+                    # Not strictly needed for correctness here
+                    changed = True
+                # insert exactly one blank line
+                lines.insert(i + 1, "")
+                changed = True
+
+            # Advance past the pragma and the single enforced blank after it
+            i = i + 2
+            continue
+
+        i += 1
+
+    new_text = "\n".join(lines) + ("\n" if had_trailing_nl else "")
+    return new_text, changed
+
+def main():
+    ap = argparse.ArgumentParser(description="Ensure exactly one empty line before/after '#pragma once' in .h files.")
+    ap.add_argument("directory", type=Path, help="Root directory to scan recursively")
+    args = ap.parse_args()
+
+    root: Path = args.directory
+    if not root.exists() or not root.is_dir():
+        print(f"Error: {root} is not a directory")
+        raise SystemExit(2)
+
+    headers = [p for p in root.rglob("*.h") if p.is_file()]
+    changed = 0
+    no_pragma: list[str] = []
+
+    for hdr in headers:
+        try:
+            text = hdr.read_text(encoding="utf-8", errors="replace")
+        except Exception as e:
+            print(f"Read error: {hdr} ({e})")
+            continue
+
+        new_text, did_change = normalize_pragma_once_spacing(text)
+        if did_change:
+            try:
+                hdr.write_text(new_text, encoding="utf-8")
+                changed += 1
+            except Exception as e:
+                print(f"Write error: {hdr} ({e})")
+        else:
+            # Determine if it lacked pragma
+            if not RE_PRAGMA_ONCE.search(text):
+                no_pragma.append(str(hdr))
+
+    print(f"Total .h files found: {len(headers)}")
+    print(f"Files changed:        {changed}")
+    if no_pragma:
+        print("Files without '#pragma once':")
+        for p in no_pragma:
+            print(f"  - {p}")
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/cpp/refactor_asciistring_unicodestring_instantiation.py b/scripts/cpp/refactor_asciistring_unicodestring_instantiation.py
new file mode 100644
index 00000000000..9d72bc150b5
--- /dev/null
+++ b/scripts/cpp/refactor_asciistring_unicodestring_instantiation.py
@@ -0,0 +1,50 @@
+# Created with python 3.11.4
+
+# This script applies basic formatting and cleanups to the various CPP files.
+# Just run it.
+
+import glob
+import os
+import re
+
+
+def fix_string(line: str, typename: str) -> str:
+    # Build a regex that allows arbitrary whitespace
+    pattern = rf"""{typename}\s*\(\s*(L?)\s*"([^"]*)"\s*\)"""
+    # Replace typename( "value" ) -> "value"
+    return re.sub(pattern, r'\1"\2"', line)
+
+
+def main():
+    current_dir = os.path.dirname(os.path.abspath(__file__))
+    root_dir = os.path.join(current_dir, "..", "..")
+    root_dir = os.path.normpath(root_dir)
+    core_dir = os.path.join(root_dir, "Core")
+    generals_dir = os.path.join(root_dir, "Generals")
+    generalsmd_dir = os.path.join(root_dir, "GeneralsMD")
+    utility_dir = os.path.join(root_dir, "Dependencies", "Utility")
+    fileNames = []
+    for ext in ["*.cpp", "*.h", "*.inl"]:
+        fileNames.extend(glob.glob(os.path.join(core_dir, '**', ext), recursive=True))
+        fileNames.extend(glob.glob(os.path.join(generals_dir, '**', ext), recursive=True))
+        fileNames.extend(glob.glob(os.path.join(generalsmd_dir, '**', ext), recursive=True))
+        fileNames.extend(glob.glob(os.path.join(utility_dir, '**', ext), recursive=True))
+
+    for fileName in fileNames:
+        with open(fileName, 'r', encoding="cp1252") as file:
+            try:
+                lines = file.readlines()
+            except UnicodeDecodeError:
+                continue # Not good.
+
+        with open(fileName, 'w', encoding="cp1252") as file:
+            for line in lines:
+                line = fix_string(line, 'AsciiString')
+                line = fix_string(line, 'UnicodeString')
+                file.write(line)
+
+    return
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/cpp/refactor_debug_log_newline.py b/scripts/cpp/refactor_debug_log_newline.py
new file mode 100644
index 00000000000..177a6275f1f
--- /dev/null
+++ b/scripts/cpp/refactor_debug_log_newline.py
@@ -0,0 +1,98 @@
+# Created with python 3.11.4
+
+# This script helps removing trailing CR LF characters from game debug log messages in the various CPP files.
+# Just run it.
+
+import glob
+import os
+
+
+def modifyLine(line: str) -> str:
+    searchWords = [
+        "DEBUG_LOG",
+        "DEBUG_LOG_LEVEL",
+        "DEBUG_CRASH",
+        "DEBUG_ASSERTLOG",
+        "DEBUG_ASSERTCRASH",
+        "RELEASE_CRASH",
+        "RELEASE_CRASHLOCALIZED",
+        "WWDEBUG_SAY",
+        "WWDEBUG_WARNING",
+        "WWRELEASE_SAY",
+        "WWRELEASE_WARNING",
+        "WWRELEASE_ERROR",
+        "WWASSERT_PRINT",
+        "WWDEBUG_ERROR",
+        "SNAPSHOT_SAY",
+        "SHATTER_DEBUG_SAY",
+        "DBGMSG",
+        ### "REALLY_VERBOSE_LOG",
+        "DOUBLE_DEBUG",
+        "PERF_LOG",
+        "CRCGEN_LOG",
+        "STATECHANGED_LOG",
+        "PING_LOG",
+        "BONEPOS_LOG",
+    ]
+
+    SEARCH_PATTERNS = [
+        r'\r\n"',
+        r'\n"',
+    ]
+
+    for searchWord in searchWords:
+        wordBegin = line.find(searchWord)
+        wordEnd = wordBegin + len(searchWord)
+
+        if wordBegin >= 0:
+            for searchPattern in SEARCH_PATTERNS:
+                searchPatternLen = len(searchPattern)
+                i = wordEnd
+                lookEnd = len(line) - searchPatternLen
+
+                while i < lookEnd:
+                    pattern = line[i:i+searchPatternLen]
+                    if pattern == searchPattern:
+                        lineCopy = line[:i] + '"' + line[i+searchPatternLen:]
+                        return lineCopy
+                    i += 1
+
+            break
+
+    return line
+
+
+def main():
+    current_dir = os.path.dirname(os.path.abspath(__file__))
+    root_dir = os.path.join(current_dir, "..", "..")
+    root_dir = os.path.normpath(root_dir)
+    core_dir = os.path.join(root_dir, "Core")
+    generals_dir = os.path.join(root_dir, "Generals")
+    generalsmd_dir = os.path.join(root_dir, "GeneralsMD")
+    fileNames = []
+    fileNames.extend(glob.glob(os.path.join(core_dir, '**', '*.h'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(core_dir, '**', '*.cpp'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(core_dir, '**', '*.inl'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(generals_dir, '**', '*.h'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(generals_dir, '**', '*.cpp'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(generals_dir, '**', '*.inl'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(generalsmd_dir, '**', '*.h'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(generalsmd_dir, '**', '*.cpp'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(generalsmd_dir, '**', '*.inl'), recursive=True))
+
+    for fileName in fileNames:
+        with open(fileName, 'r', encoding="cp1252") as file:
+            try:
+                lines = file.readlines()
+            except UnicodeDecodeError:
+                continue # Not good.
+        with open(fileName, 'w', encoding="cp1252") as file:
+            for line in lines:
+                line = modifyLine(line)
+                file.write(line)
+
+    return
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/cpp/remove_duplicate_include_directives.py b/scripts/cpp/remove_duplicate_include_directives.py
new file mode 100644
index 00000000000..230bd874410
--- /dev/null
+++ b/scripts/cpp/remove_duplicate_include_directives.py
@@ -0,0 +1,41 @@
+# Created with python 3.13.2
+
+# This script removes duplicate include directives from the codebase of Generals and GeneralsMD.
+
+import os
+import re
+
+current_dir = os.path.dirname(os.path.abspath(__file__))
+root_dir = os.path.join(current_dir, "..", "..")
+root_dir = os.path.normpath(root_dir)
+core_dir = os.path.join(root_dir, "Core")
+generals_dir = os.path.join(root_dir, "Generals", "Code")
+generalsmd_dir = os.path.join(root_dir, "GeneralsMD", "Code")
+
+def remove_duplicate_includes_from_file(filepath):
+    include_pattern = re.compile(r'^\s*#\s*include\s+[<"].+[>"].*$', re.MULTILINE)
+    seen = set()
+    output_lines = []
+
+    with open(filepath, 'r', encoding='utf-8') as f:
+        for line in f:
+            match = include_pattern.match(line)
+            if match:
+                normalized = line.strip()
+                if normalized in seen:
+                    continue  # Skip duplicate
+                seen.add(normalized)
+            output_lines.append(line)
+
+    with open(filepath, 'w', encoding='utf-8') as f:
+        f.writelines(output_lines)
+
+def process_directory(root_dir):
+    for subdir, _, files in os.walk(root_dir):
+        for file in files:
+            if file.endswith(('.cpp', '.h', '.hpp', '.c', '.inl')):
+                filepath = os.path.join(subdir, file)
+                remove_duplicate_includes_from_file(filepath)
+
+process_directory(generals_dir)
+process_directory(generalsmd_dir)
diff --git a/scripts/cpp/remove_include_guards_pragma.py b/scripts/cpp/remove_include_guards_pragma.py
new file mode 100644
index 00000000000..d2554d7733a
--- /dev/null
+++ b/scripts/cpp/remove_include_guards_pragma.py
@@ -0,0 +1,208 @@
+#!/usr/bin/env python3
+"""
+remove_include_guards.py
+
+Recursively scan a directory for .h files and remove classic include guards
+ONLY if:
+  1) the file contains `#pragma once`, AND
+  2) there is substantive content between the guard's #define and its matching #endif
+     (i.e., not just blank/comment lines).
+
+Safely handles both:
+- #ifndef MACRO ... #define MACRO ... #endif
+- #if !defined(MACRO) ... #define MACRO ... #endif
+
+Leaves #pragma once intact. Prints totals and files skipped (with reasons).
+"""
+
+from __future__ import annotations
+import argparse
+import re
+from pathlib import Path
+
+RE_PRAGMA_ONCE = re.compile(r'^\s*#\s*pragma\s+once\b', re.IGNORECASE)
+
+RE_IFNDEF = re.compile(r'^\s*#\s*ifndef\s+([A-Za-z_][A-Za-z0-9_]*)\s*(?:\/\/.*|/\*.*\*/\s*)?$', re.ASCII)
+RE_IF_NOT_DEFINED = re.compile(
+    r'^\s*#\s*if\s*!+\s*defined\s*\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*\)\s*(?:\/\/.*|/\*.*\*/\s*)?$',
+    re.ASCII,
+)
+RE_DEFINE = re.compile(r'^\s*#\s*define\s+([A-Za-z_][A-Za-z0-9_]*)\b.*$', re.ASCII)
+RE_IF = re.compile(r'^\s*#\s*if(n?def)?\b', re.ASCII)   # #if/#ifdef/#ifndef
+RE_ENDIF = re.compile(r'^\s*#\s*endif\b', re.ASCII)
+
+def _strip_bom(text: str) -> str:
+    return text.lstrip('\ufeff')
+
+def has_pragma_once(lines: list[str]) -> bool:
+    return any(RE_PRAGMA_ONCE.match(l) for l in lines)
+
+def is_comment_or_blank(s: str) -> bool:
+    t = s.strip()
+    if not t:
+        return True
+    # Treat single-line comments and block-comment-only lines as non-substantive.
+    return t.startswith('//') or t.startswith('/*') or t.endswith('*/')
+
+def has_substantive_content(lines: list[str], start_idx: int, end_idx: int) -> bool:
+    """
+    Return True if there's at least one 'substantive' line between start_idx (inclusive)
+    and end_idx (exclusive). Substantive means not just blank/comment-only.
+    Any preprocessor directive like #include, #if, #define (for other macros),
+    code, etc. counts as content. (#endif is outside this range by design.)
+    """
+    for k in range(start_idx, end_idx):
+        s = lines[k]
+        if not is_comment_or_blank(s):
+            return True
+    return False
+
+def find_guard(lines: list[str], search_window: int = 150):
+    """
+    Locate a classic include guard near the file start.
+
+    Returns (i_if, i_define, macro, i_endif) or None.
+    """
+    n = len(lines)
+    lim = min(search_window, n)
+
+    for i in range(lim):
+        line = lines[i]
+        m1 = RE_IFNDEF.match(line)
+        m2 = RE_IF_NOT_DEFINED.match(line)
+        macro = None
+        if m1:
+            macro = m1.group(1)
+        elif m2:
+            macro = m2.group(1)
+        else:
+            continue
+
+        # Find #define with the same macro within a few lines, skipping blanks/comments
+        j = i + 1
+        max_lookahead = min(i + 10, n - 1)
+        found_define_index = None
+        while j <= max_lookahead:
+            l2 = lines[j]
+            if is_comment_or_blank(l2):
+                j += 1
+                continue
+            mdef = RE_DEFINE.match(l2)
+            if mdef and mdef.group(1) == macro:
+                found_define_index = j
+            break
+        if found_define_index is None:
+            continue
+
+        # Find the matching #endif for the opening #if/#ifndef at i
+        i_endif = match_endif(lines, start_index=found_define_index + 1, initial_depth=1)
+        if i_endif is None:
+            continue
+
+        return (i, found_define_index, macro, i_endif)
+
+    return None
+
+def match_endif(lines: list[str], start_index: int, initial_depth: int = 1):
+    depth = initial_depth
+    for k in range(start_index, len(lines)):
+        s = lines[k]
+        if not s.lstrip().startswith('#'):
+            continue
+        if RE_IF.match(s):
+            depth += 1
+        elif RE_ENDIF.match(s):
+            depth -= 1
+            if depth == 0:
+                return k
+    return None
+
+def remove_guard_from_text(text: str) -> tuple[str, bool, str | None]:
+    """
+    Remove include guard if detected AND:
+      - file has #pragma once
+      - there is substantive content between #define and #endif
+    Returns (new_text, changed_bool, reason_if_not_changed).
+    """
+    text = _strip_bom(text)
+    lines = text.splitlines()
+
+    if not has_pragma_once(lines):
+        return text, False, "no #pragma once"
+
+    found = find_guard(lines)
+    if not found:
+        return text, False, "no classic guard detected"
+
+    i_if, i_define, macro, i_endif = found
+
+    # NEW RULE: ensure the guarded region contains more than just the macro define.
+    if not has_substantive_content(lines, i_define + 1, i_endif):
+        # Likely a utility macro wrapper like:
+        #   #ifndef X
+        #   #define X ...
+        #   #endif
+        return text, False, "guard region has no content (macro wrapper)"
+
+    # Proceed to remove the guard
+    to_remove = {i_if, i_define}
+    if i_define + 1 < len(lines) and lines[i_define + 1].strip() == '':
+        to_remove.add(i_define + 1)
+    if i_if - 1 >= 0 and lines[i_if - 1].strip() == '':
+        to_remove.add(i_if - 1)
+
+    to_remove.add(i_endif)
+    if i_endif - 1 >= 0 and lines[i_endif - 1].strip() == '':
+        to_remove.add(i_endif - 1)
+
+    new_lines = [ln for idx, ln in enumerate(lines) if idx not in to_remove]
+
+    # Tidy leading/trailing blanks
+    while new_lines and new_lines[0].strip() == '':
+        new_lines.pop(0)
+    while new_lines and new_lines[-1].strip() == '':
+        new_lines.pop()
+
+    new_text = "\n".join(new_lines) + ("\n" if text.endswith("\n") else "")
+    return new_text, True, None
+
+def main():
+    ap = argparse.ArgumentParser(description="Remove classic include guards from .h files that already use #pragma once, skipping macro-only wrappers.")
+    ap.add_argument("directory", type=Path, help="Root directory to scan recursively")
+    args = ap.parse_args()
+
+    root: Path = args.directory
+    if not root.exists() or not root.is_dir():
+        print(f"Error: {root} is not a directory")
+        raise SystemExit(2)
+
+    all_headers = [p for p in root.rglob("*.h") if p.is_file()]
+    changed = 0
+    failed: list[str] = []
+
+    for hdr in all_headers:
+        try:
+            text = hdr.read_text(encoding="utf-8", errors="replace")
+        except Exception as e:
+            failed.append(f"{hdr} (read-error: {e})")
+            continue
+
+        new_text, did_change, reason = remove_guard_from_text(text)
+        if did_change:
+            try:
+                hdr.write_text(new_text, encoding="utf-8")
+                changed += 1
+            except Exception as e:
+                failed.append(f"{hdr} (write-error: {e})")
+        else:
+            failed.append(f"{hdr} ({reason or 'unknown reason'})")
+
+    print(f"Total .h files found: {len(all_headers)}")
+    print(f"Files changed:        {changed}")
+    if failed:
+        print("Guards not removed from:")
+        for path in failed:
+            print(f"  - {path}")
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/cpp/remove_mscver_from_pragma.py b/scripts/cpp/remove_mscver_from_pragma.py
new file mode 100644
index 00000000000..8870789d0a2
--- /dev/null
+++ b/scripts/cpp/remove_mscver_from_pragma.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+"""
+Remove MSVC-only guards around '#pragma once' in .h files, preserving surrounding blank lines.
+
+Recognised guard forms:
+  #if defined(_MSC_VER)
+  #ifdef _MSC_VER
+  #if _MSC_VER >= 1000
+
+Removes only:
+  - the '#if...' line,
+  - any blank lines immediately after it,
+  - any blank lines immediately after '#pragma once',
+  - the matching '#endif' line (optionally with trailing comment).
+
+Usage:
+  python unguard_pragma_once_universal.py /path/to/dir
+"""
+
+import sys
+import re
+from pathlib import Path
+
+# Match any of the IF guard forms. No VERBOSE flag; escape literal '#'.
+RE_IF = re.compile(
+    r'^\s*\#\s*'
+    r'(?:'
+      r'if\s+defined\s*\(\s*_MSC_VER\s*\)'         # #if defined(_MSC_VER)
+      r'|ifdef\s+_MSC_VER'                         # #ifdef _MSC_VER
+      r'|if\s+_MSC_VER(?:\s*[<>!=]=?\s*\d+)?'      # #if _MSC_VER [op num]
+    r')'
+    r'\s*(?://.*)?\r?\n?$',                        # optional end-of-line comment
+    re.IGNORECASE
+)
+
+RE_PRAGMA = re.compile(r'^\s*\#\s*pragma\s+once\s*\r?\n?$', re.IGNORECASE)
+RE_ENDIF  = re.compile(r'^\s*\#\s*endif\b.*\r?\n?$', re.IGNORECASE)
+RE_BLANK  = re.compile(r'^[ \t]*\r?\n?$')
+
+def read_text_with_fallback(p: Path) -> str:
+    for enc in ("utf-8", "utf-8-sig", "cp1252", "latin-1"):
+        try:
+            return p.read_text(encoding=enc)
+        except UnicodeDecodeError:
+            continue
+    return p.read_bytes().decode("latin-1", errors="replace")
+
+def unguard_msc_pragma_once(text: str) -> tuple[str, bool]:
+    lines = text.splitlines(keepends=True)
+    i = 0
+    changed = False
+
+    while i < len(lines):
+        if not RE_IF.match(lines[i]):
+            i += 1
+            continue
+
+        if_idx = i
+        j = i + 1
+
+        # remove blanks immediately after #if
+        while j < len(lines) and RE_BLANK.match(lines[j]):
+            j += 1
+
+        # require #pragma once next
+        if j >= len(lines) or not RE_PRAGMA.match(lines[j]):
+            i += 1
+            continue
+
+        pragma_idx = j
+        j += 1
+
+        # remove blanks immediately after pragma
+        while j < len(lines) and RE_BLANK.match(lines[j]):
+            j += 1
+
+        # require #endif next
+        if j >= len(lines) or not RE_ENDIF.match(lines[j]):
+            i += 1
+            continue
+
+        endif_idx = j
+
+        # Keep: everything before IF, the pragma line itself, everything after ENDIF
+        new_lines = []
+        new_lines.extend(lines[:if_idx])            # preserves any blank lines before the block
+        new_lines.append(lines[pragma_idx])         # keep '#pragma once'
+        new_lines.extend(lines[endif_idx + 1:])     # preserves any blank lines after the block
+
+        lines = new_lines
+        changed = True
+
+        # Resume scanning near the pragma location in the new list
+        i = max(0, if_idx - 1)
+
+    return "".join(lines), changed
+
+def main():
+    if len(sys.argv) != 2:
+        print("Usage: python unguard_pragma_once_universal.py /path/to/dir", file=sys.stderr)
+        sys.exit(2)
+
+    root = Path(sys.argv[1])
+    if not root.is_dir():
+        print(f"Error: {root} is not a directory", file=sys.stderr)
+        sys.exit(2)
+
+    total = 0
+    changed_count = 0
+
+    for p in root.rglob("*.h"):
+        total += 1
+        try:
+            original = read_text_with_fallback(p)
+            updated, changed = unguard_msc_pragma_once(original)
+            if changed:
+                p.write_text(updated, encoding="utf-8", newline="")
+                changed_count += 1
+        except Exception as ex:
+            print(f"[ERROR] Failed to process {p}: {ex}", file=sys.stderr)
+
+    print(f"Scanned {total} .h file(s); changed {changed_count} file(s).")
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/cpp/remove_rts_internal.py b/scripts/cpp/remove_rts_internal.py
new file mode 100644
index 00000000000..5c287772c76
--- /dev/null
+++ b/scripts/cpp/remove_rts_internal.py
@@ -0,0 +1,89 @@
+# Created with python 3.11.4
+
+# This script helps removing RTS_INTERNAL words from the various CPP files.
+# Just run it.
+
+import glob
+import os
+
+
+def modifyLine(line: str) -> str:
+    searchWords = [
+        "!defined(RTS_DEBUG) && !defined(RTS_INTERNAL)",
+        "!defined(RTS_INTERNAL) && !defined(RTS_DEBUG)",
+        "defined(RTS_DEBUG) || defined(RTS_INTERNAL)",
+        "defined(RTS_INTERNAL) || defined(RTS_DEBUG)",
+        "defined( RTS_INTERNAL ) || defined( RTS_DEBUG )",
+        "defined RTS_DEBUG || defined RTS_INTERNAL",
+        "RTS_DEBUG || RTS_INTERNAL",
+    ]
+
+    replaceWords = [
+        "!defined(RTS_DEBUG)",
+        "!defined(RTS_DEBUG)",
+        "defined(RTS_DEBUG)",
+        "defined(RTS_DEBUG)",
+        "defined(RTS_DEBUG)",
+        "defined(RTS_DEBUG)",
+        "RTS_DEBUG",
+    ]
+
+    for searchIdx, searchWord in enumerate(searchWords):
+        wordBegin = line.find(searchWord)
+        wordEnd = wordBegin + len(searchWord)
+        if wordBegin >= 0:
+            replaceWord = replaceWords[searchIdx]
+            lineCopy = line[:wordBegin] + replaceWord + line[wordEnd:]
+            return lineCopy
+
+    return line
+
+
+def main():
+    current_dir = os.path.dirname(os.path.abspath(__file__))
+    root_dir = os.path.join(current_dir, "..", "..")
+    root_dir = os.path.normpath(root_dir)
+    core_dir = os.path.join(root_dir, "Core")
+    generals_dir = os.path.join(root_dir, "Generals")
+    generalsmd_dir = os.path.join(root_dir, "GeneralsMD")
+    fileNames = []
+    fileNames.extend(glob.glob(os.path.join(core_dir, '**', '*.h'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(core_dir, '**', '*.cpp'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(core_dir, '**', '*.inl'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(generals_dir, '**', '*.h'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(generals_dir, '**', '*.cpp'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(generals_dir, '**', '*.inl'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(generalsmd_dir, '**', '*.h'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(generalsmd_dir, '**', '*.cpp'), recursive=True))
+    fileNames.extend(glob.glob(os.path.join(generalsmd_dir, '**', '*.inl'), recursive=True))
+
+    for fileName in fileNames:
+        with open(fileName, 'r', encoding="cp1252") as file:
+            try:
+                lines = file.readlines()
+            except UnicodeDecodeError:
+                continue # Not good.
+        with open(fileName, 'w', encoding="cp1252") as file:
+            skipLine = 0
+            for line in lines:
+                # Skip RTS_INTERNAL ifdef blocks
+                if skipLine > 0:
+                    if "#if" in line:
+                        skipLine += 1
+                    elif "#endif" in line:
+                        skipLine -= 1
+                    continue
+                if skipLine > 0:
+                    continue
+                if line == "#ifdef RTS_INTERNAL\n" or line == "#if defined(RTS_INTERNAL)\n":
+                    skipLine += 1
+                    continue
+
+                line = modifyLine(line)
+                file.write(line)
+
+    return
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/cpp/replace_include_guards_with_pragma.py b/scripts/cpp/replace_include_guards_with_pragma.py
new file mode 100644
index 00000000000..fc187ac52c9
--- /dev/null
+++ b/scripts/cpp/replace_include_guards_with_pragma.py
@@ -0,0 +1,246 @@
+#!/usr/bin/env python3
+"""
+replace_guards_with_pragma_once.py
+
+Recursively scan a directory for .h files that DO NOT contain `#pragma once`.
+For those files, detect classic include guards and replace the guard with a
+single `#pragma once`.
+
+We replace only when:
+  - A classic guard is found near the start:
+      #ifndef MACRO            OR     #if !defined(MACRO)
+      #define MACRO                   #define MACRO
+      ... (substantive content) ...
+      #endif
+  - There is substantive content between the #define and its matching #endif
+    (i.e., more than just blank lines or comment-only lines), to avoid replacing
+    macro wrapper patterns like:
+        #ifndef ARRAY_SIZE
+        #define ARRAY_SIZE(x) ...
+        #endif
+
+Output:
+- total .h files found
+- files changed
+- list of files not changed (with reason)
+"""
+
+from __future__ import annotations
+import argparse
+import re
+from pathlib import Path
+
+RE_PRAGMA_ONCE = re.compile(r'^\s*#\s*pragma\s+once\b', re.IGNORECASE)
+
+RE_IFNDEF = re.compile(r'^\s*#\s*ifndef\s+([A-Za-z_][A-Za-z0-9_]*)\s*(?:\/\/.*|/\*.*\*/\s*)?$', re.ASCII)
+RE_IF_NOT_DEFINED = re.compile(
+    r'^\s*#\s*if\s*!+\s*defined\s*\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*\)\s*(?:\/\/.*|/\*.*\*/\s*)?$',
+    re.ASCII,
+)
+RE_DEFINE = re.compile(r'^\s*#\s*define\s+([A-Za-z_][A-Za-z0-9_]*)\b.*$', re.ASCII)
+RE_IF = re.compile(r'^\s*#\s*if(n?def)?\b', re.ASCII)   # #if/#ifdef/#ifndef
+RE_ENDIF = re.compile(r'^\s*#\s*endif\b', re.ASCII)
+
+def _strip_bom(text: str) -> str:
+    return text.lstrip('\ufeff')
+
+def has_pragma_once(lines: list[str]) -> bool:
+    return any(RE_PRAGMA_ONCE.match(l) for l in lines)
+
+def is_comment_or_blank(s: str) -> bool:
+    t = s.strip()
+    if not t:
+        return True
+    # treat single-line/comment-only lines as non-substantive
+    return t.startswith('//') or t.startswith('/*') or t.endswith('*/')
+
+def has_substantive_content(lines: list[str], start_idx: int, end_idx: int) -> bool:
+    """
+    Return True if there's at least one non-blank, non-comment-only line
+    between start_idx (inclusive) and end_idx (exclusive).
+    """
+    for k in range(start_idx, end_idx):
+        if not is_comment_or_blank(lines[k]):
+            return True
+    return False
+
+def match_endif(lines: list[str], start_index: int, initial_depth: int = 1):
+    """
+    Find the index of the #endif that closes the #if/#ifndef starting before start_index.
+    Handles nested preprocessor blocks.
+    """
+    depth = initial_depth
+    for k in range(start_index, len(lines)):
+        s = lines[k]
+        if not s.lstrip().startswith('#'):
+            continue
+        if RE_IF.match(s):
+            depth += 1
+        elif RE_ENDIF.match(s):
+            depth -= 1
+            if depth == 0:
+                return k
+    return None
+
+def find_guard(lines: list[str], search_window: int = 200):
+    """
+    Locate classic include guard near the beginning (after possible license header).
+    Returns (i_if, i_define, macro, i_endif) or None.
+    """
+    n = len(lines)
+    lim = min(search_window, n)
+
+    for i in range(lim):
+        line = lines[i]
+        m1 = RE_IFNDEF.match(line)
+        m2 = RE_IF_NOT_DEFINED.match(line)
+        macro = None
+        if m1:
+            macro = m1.group(1)
+        elif m2:
+            macro = m2.group(1)
+        else:
+            continue
+
+        # Find #define with the same macro in the next few lines, skipping blanks/comments
+        j = i + 1
+        max_lookahead = min(i + 12, n - 1)
+        found_define_index = None
+        while j <= max_lookahead:
+            l2 = lines[j]
+            if is_comment_or_blank(l2):
+                j += 1
+                continue
+            mdef = RE_DEFINE.match(l2)
+            if mdef and mdef.group(1) == macro:
+                found_define_index = j
+            break
+        if found_define_index is None:
+            continue
+
+        # Find the closing #endif for this guard block
+        i_endif = match_endif(lines, start_index=found_define_index + 1, initial_depth=1)
+        if i_endif is None:
+            continue
+
+        return (i, found_define_index, macro, i_endif)
+
+    return None
+
+def replace_guard_with_pragma_once(text: str):
+    """
+    If file lacks #pragma once and has a classic include guard with substantive content,
+    replace the guard with a single '#pragma once'.
+    Returns (new_text, changed_bool, reason_if_not_changed).
+    """
+    text = _strip_bom(text)
+    lines = text.splitlines()
+
+    if has_pragma_once(lines):
+        return text, False, "already has #pragma once"
+
+    found = find_guard(lines)
+    if not found:
+        return text, False, "no classic guard detected"
+
+    i_if, i_define, macro, i_endif = found
+
+    # Ensure the region contains more than just the macro define
+    if not has_substantive_content(lines, i_define + 1, i_endif):
+        return text, False, "guard region has no content (macro wrapper)"
+
+    # Build new content:
+    # - Replace the opening guard pair with a single '#pragma once'
+    # - Remove the closing '#endif'
+    new_lines = list(lines)
+
+    # Prepare a tidy insertion: remove surrounding blank lines near opening/closing
+    remove_idxs = set()
+
+    # Remove opening lines
+    remove_idxs.add(i_if)
+    remove_idxs.add(i_define)
+
+    # Optional tidy: blank line immediately after the #define
+    if i_define + 1 < len(new_lines) and new_lines[i_define + 1].strip() == '':
+        remove_idxs.add(i_define + 1)
+
+    # Optional tidy: blank line immediately before the #if
+    if i_if - 1 >= 0 and new_lines[i_if - 1].strip() == '':
+        remove_idxs.add(i_if - 1)
+
+    # Remove closing '#endif' and an optional blank before it
+    remove_idxs.add(i_endif)
+    if i_endif - 1 >= 0 and new_lines[i_endif - 1].strip() == '':
+        remove_idxs.add(i_endif - 1)
+
+    # Apply removals
+    new_lines = [ln for idx, ln in enumerate(new_lines) if idx not in remove_idxs]
+
+    # Insert '#pragma once' at the original guard start position (adjusted for removals)
+    # Compute the new insertion index as the smallest kept index >= i_if
+    insertion_index = 0
+    count = 0
+    for idx in range(len(lines)):
+        if idx in remove_idxs:
+            continue
+        if idx >= i_if:
+            insertion_index = count
+            break
+        count += 1
+    else:
+        insertion_index = 0  # fallback (shouldn't happen)
+
+    new_lines.insert(insertion_index, "#pragma once")
+
+    # Tidy leading/trailing blank lines
+    while new_lines and new_lines[0].strip() == '':
+        new_lines.pop(0)
+    while new_lines and new_lines[-1].strip() == '':
+        new_lines.pop()
+
+    new_text = "\n".join(new_lines) + ("\n" if text.endswith("\n") else "")
+    return new_text, True, None
+
+def main():
+    ap = argparse.ArgumentParser(
+        description="Replace classic include guards with #pragma once in .h files that don't already have it."
+    )
+    ap.add_argument("directory", type=Path, help="Root directory to scan recursively")
+    args = ap.parse_args()
+
+    root: Path = args.directory
+    if not root.exists() or not root.is_dir():
+        print(f"Error: {root} is not a directory")
+        raise SystemExit(2)
+
+    all_headers = [p for p in root.rglob("*.h") if p.is_file()]
+    changed = 0
+    skipped: list[str] = []
+
+    for hdr in all_headers:
+        try:
+            text = hdr.read_text(encoding="utf-8", errors="replace")
+        except Exception as e:
+            skipped.append(f"{hdr} (read-error: {e})")
+            continue
+
+        new_text, did_change, reason = replace_guard_with_pragma_once(text)
+        if did_change:
+            try:
+                hdr.write_text(new_text, encoding="utf-8")
+                changed += 1
+            except Exception as e:
+                skipped.append(f"{hdr} (write-error: {e})")
+        else:
+            skipped.append(f"{hdr} ({reason or 'unknown reason'})")
+
+    print(f"Total .h files found: {len(all_headers)}")
+    print(f"Files changed:        {changed}")
+    if skipped:
+        print("Not changed:")
+        for path in skipped:
+            print(f"  - {path}")
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/cpp/unify_move_files.py b/scripts/cpp/unify_move_files.py
new file mode 100644
index 00000000000..e2757328ad9
--- /dev/null
+++ b/scripts/cpp/unify_move_files.py
@@ -0,0 +1,264 @@
+# Created with python 3.11.4
+
+# This script helps with moving cpp files from Generals or GeneralsMD to Core
+
+import os
+import shutil
+from enum import Enum
+
+
+class Game(Enum):
+    GENERALS = 0
+    ZEROHOUR = 1
+    CORE = 2
+
+
+class CmakeModifyType(Enum):
+    ADD_COMMENT = 0
+    REMOVE_COMMENT = 1
+
+
+current_dir = os.path.dirname(os.path.abspath(__file__))
+root_dir = os.path.join(current_dir, "..", "..")
+root_dir = os.path.normpath(root_dir)
+core_dir = os.path.join(root_dir, "Core")
+generals_dir = os.path.join(root_dir, "Generals", "Code")
+generalsmd_dir = os.path.join(root_dir, "GeneralsMD", "Code")
+
+
+def get_game_path(game: Game):
+    if game == Game.GENERALS:
+        return generals_dir
+    elif game == Game.ZEROHOUR:
+        return generalsmd_dir
+    elif game == Game.CORE:
+        return core_dir
+    assert(0)
+
+
+def get_opposite_game(game: Game):
+    if game == Game.GENERALS:
+        return Game.ZEROHOUR
+    elif game == Game.ZEROHOUR:
+        return Game.GENERALS
+    assert(0)
+
+
+def move_file(fromGame: Game, fromFile: str, toGame: Game, toFile: str):
+    fromPath = os.path.join(get_game_path(fromGame), os.path.normpath(fromFile))
+    toPath = os.path.join(get_game_path(toGame), os.path.normpath(toFile))
+    os.makedirs(os.path.dirname(toPath), exist_ok=True)
+    shutil.move(fromPath, toPath)
+
+
+def delete_file(game: Game, path: str):
+    os.remove(os.path.join(get_game_path(game), os.path.normpath(path)))
+
+
+def modify_cmakelists(cmakeFile: str, searchString: str, type: CmakeModifyType):
+    lines: list[str]
+    with open(cmakeFile, 'r', encoding="ascii") as file:
+        lines = file.readlines()
+
+    with open(cmakeFile, 'w', encoding="ascii") as file:
+        for index, line  in enumerate(lines):
+            if searchString in line:
+                if type == CmakeModifyType.ADD_COMMENT:
+                    lines[index] = "#" + line
+                else:
+                    lines[index] = line.replace("#", "", 1)
+
+        file.writelines(lines)
+
+
+def unify_file(fromGame: Game, fromFile: str, toGame: Game, toFile: str):
+    assert(toGame == Game.CORE)
+
+    fromOppositeGame = get_opposite_game(fromGame)
+    fromOppositeGamePath = get_game_path(fromOppositeGame)
+    fromGamePath = get_game_path(fromGame)
+    toGamePath = get_game_path(toGame)
+
+    fromFirstFolderIndex = fromFile.find("/")
+    toFirstFolderIndex = toFile.find("/")
+    assert(fromFirstFolderIndex > 0)
+    assert(toFirstFolderIndex > 0)
+
+    fromFirstFolderName = fromFile[:fromFirstFolderIndex]
+    toFirstFolderName = toFile[:toFirstFolderIndex]
+    fromFileInCmake = fromFile[fromFirstFolderIndex+1:]
+    toFileInCmake = toFile[toFirstFolderIndex+1:]
+
+    fromOppositeCmakeFile = os.path.join(fromOppositeGamePath, fromFirstFolderName, "CMakeLists.txt")
+    fromCmakeFile = os.path.join(fromGamePath, fromFirstFolderName, "CMakeLists.txt")
+    toCmakeFile = os.path.join(toGamePath, toFirstFolderName, "CMakeLists.txt")
+
+    modify_cmakelists(fromOppositeCmakeFile, fromFileInCmake, CmakeModifyType.ADD_COMMENT)
+    modify_cmakelists(fromCmakeFile, fromFileInCmake, CmakeModifyType.ADD_COMMENT)
+    modify_cmakelists(toCmakeFile, toFileInCmake, CmakeModifyType.REMOVE_COMMENT)
+
+    delete_file(fromOppositeGame, fromFile)
+    move_file(fromGame, fromFile, toGame, toFile)
+
+
+def unify_move_file(fromGame: Game, fromFile: str, toGame: Game, toFile: str):
+    assert(toGame == Game.CORE)
+
+    fromGamePath = get_game_path(fromGame)
+    toGamePath = get_game_path(toGame)
+
+    fromFirstFolderIndex = fromFile.find("/")
+    toFirstFolderIndex = toFile.find("/")
+    assert(fromFirstFolderIndex > 0)
+    assert(toFirstFolderIndex > 0)
+
+    fromFirstFolderName = fromFile[:fromFirstFolderIndex]
+    toFirstFolderName = toFile[:toFirstFolderIndex]
+    fromFileInCmake = fromFile[fromFirstFolderIndex+1:]
+    toFileInCmake = toFile[toFirstFolderIndex+1:]
+
+    fromCmakeFile = os.path.join(fromGamePath, fromFirstFolderName, "CMakeLists.txt")
+    toCmakeFile = os.path.join(toGamePath, toFirstFolderName, "CMakeLists.txt")
+
+    modify_cmakelists(fromCmakeFile, fromFileInCmake, CmakeModifyType.ADD_COMMENT)
+    modify_cmakelists(toCmakeFile, toFileInCmake, CmakeModifyType.REMOVE_COMMENT)
+
+    move_file(fromGame, fromFile, toGame, toFile)
+
+
+def main():
+
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/Common/crc.h", Game.CORE, "GameEngine/Include/Common/crc.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/Common/CRCDebug.h", Game.CORE, "GameEngine/Include/Common/CRCDebug.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/crc.cpp", Game.CORE, "GameEngine/Source/Common/crc.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/CRCDebug.cpp", Game.CORE, "GameEngine/Source/Common/CRCDebug.cpp")
+
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/Common/RandomValue.h", Game.CORE, "GameEngine/Include/Common/RandomValue.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/ClientRandomValue.h", Game.CORE, "GameEngine/Include/GameClient/ClientRandomValue.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/GameLogic/LogicRandomValue.h", Game.CORE, "GameEngine/Include/GameLogic/LogicRandomValue.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/RandomValue.cpp", Game.CORE, "GameEngine/Source/Common/RandomValue.cpp")
+
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/Common/Debug.h", Game.CORE, "GameEngine/Include/Common/Debug.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/System/Debug.cpp", Game.CORE, "GameEngine/Source/Common/System/Debug.cpp")
+
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/VideoPlayer.h", Game.CORE, "GameEngine/Include/GameClient/VideoPlayer.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/VideoPlayer.cpp", Game.CORE, "GameEngine/Source/GameClient/VideoPlayer.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/VideoStream.cpp", Game.CORE, "GameEngine/Source/GameClient/VideoStream.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/WindowVideoManager.h", Game.CORE, "GameEngine/Include/GameClient/WindowVideoManager.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp", Game.CORE, "GameEngine/Source/GameClient/GUI/WindowVideoManager.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/INI/INIVideo.cpp", Game.CORE, "GameEngine/Source/Common/INI/INIVideo.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h", Game.CORE, "GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp", Game.CORE, "GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h", Game.CORE, "GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegFile.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h", Game.CORE, "GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp", Game.CORE, "GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegFile.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp", Game.CORE, "GameEngineDevice/Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp")
+
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/Common/GameMemory.h", Game.CORE, "GameEngine/Include/Common/GameMemory.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/Common/GameMemoryNull.h", Game.CORE, "GameEngine/Include/Common/GameMemoryNull.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/System/GameMemory.cpp", Game.CORE, "GameEngine/Source/Common/System/GameMemory.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/System/GameMemoryNull.cpp", Game.CORE, "GameEngine/Source/Common/System/GameMemoryNull.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/System/MemoryInit.cpp", Game.CORE, "GameEngine/Source/Common/System/GameMemoryInit.cpp")
+    #unify_move_file(Game.GENERALS, "GameEngine/Source/Common/System/GameMemoryInitDMA_Generals.inl", Game.CORE, "GameEngine/Source/Common/System/GameMemoryInitDMA_Generals.inl")
+    #unify_move_file(Game.ZEROHOUR, "GameEngine/Source/Common/System/GameMemoryInitDMA_GeneralsMD.inl", Game.CORE, "GameEngine/Source/Common/System/GameMemoryInitDMA_GeneralsMD.inl")
+    #unify_move_file(Game.GENERALS, "GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl", Game.CORE, "GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl")
+    #unify_move_file(Game.ZEROHOUR, "GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl", Game.CORE, "GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl")
+
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/Common/ObjectStatusTypes.h", Game.CORE, "GameEngine/Include/Common/ObjectStatusTypes.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/Common/Radar.h", Game.CORE, "GameEngine/Include/Common/Radar.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/System/ObjectStatusTypes.cpp", Game.CORE, "GameEngine/Source/Common/System/ObjectStatusTypes.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/System/Radar.cpp", Game.CORE, "GameEngine/Source/Common/System/Radar.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp")
+
+    #unify_move_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/Smudge.h", Game.CORE, "GameEngine/Include/GameClient/Smudge.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/System/Smudge.cpp", Game.CORE, "GameEngine/Source/GameClient/System/Smudge.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DSmudge.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DSmudge.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp")
+
+    #unify_move_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/ParabolicEase.h", Game.CORE, "GameEngine/Include/GameClient/ParabolicEase.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/ParabolicEase.cpp", Game.CORE, "GameEngine/Source/GameClient/ParabolicEase.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/camerashakesystem.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/camerashakesystem.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/CameraShakeSystem.cpp")
+
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/View.h", Game.CORE, "GameEngine/Include/GameClient/View.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/View.cpp", Game.CORE, "GameEngine/Source/GameClient/View.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp")
+
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/bmp2d.cpp", Game.CORE, "Libraries/Source/WWVegas/WW3D2/bmp2d.cpp")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/bmp2d.h", Game.CORE, "Libraries/Source/WWVegas/WW3D2/bmp2d.h")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/dx8texman.cpp", Game.CORE, "Libraries/Source/WWVegas/WW3D2/dx8texman.cpp")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/dx8texman.h", Game.CORE, "Libraries/Source/WWVegas/WW3D2/dx8texman.h")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/matpass.cpp", Game.CORE, "Libraries/Source/WWVegas/WW3D2/matpass.cpp")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/matpass.h", Game.CORE, "Libraries/Source/WWVegas/WW3D2/matpass.h")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/texproject.cpp", Game.CORE, "Libraries/Source/WWVegas/WW3D2/texproject.cpp")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/texproject.h", Game.CORE, "Libraries/Source/WWVegas/WW3D2/texproject.h")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/texture.cpp", Game.CORE, "Libraries/Source/WWVegas/WW3D2/texture.cpp")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/texture.h", Game.CORE, "Libraries/Source/WWVegas/WW3D2/texture.h")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/texturefilter.cpp", Game.CORE, "Libraries/Source/WWVegas/WW3D2/texturefilter.cpp")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/texturefilter.h", Game.CORE, "Libraries/Source/WWVegas/WW3D2/texturefilter.h")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/textureloader.cpp", Game.CORE, "Libraries/Source/WWVegas/WW3D2/textureloader.cpp")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/textureloader.h", Game.CORE, "Libraries/Source/WWVegas/WW3D2/textureloader.h")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp", Game.CORE, "Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp")
+    #unify_file(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/texturethumbnail.h", Game.CORE, "Libraries/Source/WWVegas/WW3D2/texturethumbnail.h")
+
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/Water.h", Game.CORE, "GameEngine/Include/GameClient/Water.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/Water.cpp", Game.CORE, "GameEngine/Source/GameClient/Water.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvv", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/Water/wave.nvv")
+
+    #unify_move_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/Snow.h", Game.CORE, "GameEngine/Include/GameClient/Snow.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/Snow.cpp", Game.CORE, "GameEngine/Source/GameClient/Snow.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainBackground.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainBackground.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DSnow.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DSnow.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainBackground.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DPropDraw.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTreeDraw.cpp")
+
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/Common/MapObject.h", Game.CORE, "GameEngine/Include/Common/MapObject.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/MapUtil.h", Game.CORE, "GameEngine/Include/GameClient/MapUtil.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/TerrainRoads.h", Game.CORE, "GameEngine/Include/GameClient/TerrainRoads.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/TerrainVisual.h", Game.CORE, "GameEngine/Include/GameClient/TerrainVisual.h")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/MapUtil.cpp", Game.CORE, "GameEngine/Source/GameClient/MapUtil.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp", Game.CORE, "GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp", Game.CORE, "GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/TileData.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/TileData.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/TileData.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/TileData.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainVisual.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp")
+    #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp")
+
+    return
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/dockerbuild.sh b/scripts/dockerbuild.sh
new file mode 100755
index 00000000000..ec8ae69856f
--- /dev/null
+++ b/scripts/dockerbuild.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+RESOURCES_DIR=$SCRIPT_DIR/../resources
+
+
+usage() {
+  cat <<EOF
+Usage:
+  $(basename "$0") [OPTIONS] [TARGET]
+
+TARGET is passed to ninja.exe
+
+Options:
+  -h, --help            Show this help and exit
+  --cmake               Force run cmake.
+  --bash                Run the container interactively with bash entrypoint.
+
+Examples:
+  $(basename "$0")
+  $(basename "$0") my_target
+  $(basename "$0") --cmake
+  $(basename "$0") --cmake my_target
+  $(basename "$0") --bash
+EOF
+}
+
+
+FORCE_CMAKE="false"
+MAKE_TARGET=""
+INTERACTIVE="false"
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    --cmake)
+      FORCE_CMAKE="true"
+      shift
+      ;;
+    --bash)
+      INTERACTIVE="true"
+      shift
+      ;;
+    --) # end of options
+      shift
+      break
+      ;;
+    -*)
+      echo "Unknown option: $1" >&2
+      usage
+      exit 1
+      ;;
+    *)
+      # Positional TARGET (accept only one)
+      MAKE_TARGET="$MAKE_TARGET $1"
+      shift
+      ;;
+  esac
+done
+
+
+docker build --build-arg UID=$(id -u) --build-arg GID=$(id -g)  $RESOURCES_DIR/dockerbuild -t zerohour-build
+if [[ "$INTERACTIVE" == "true" ]]; then
+    FLAGS="  -it --entrypoint bash"
+else
+    FLAGS=""
+fi
+docker run   -u $(id -u):$(id -g) -e MAKE_TARGET="$MAKE_TARGET" -e FORCE_CMAKE=$FORCE_CMAKE -v "`pwd`":/build/cnc --rm $FLAGS zerohour-build
+
+
+
+
+
diff --git a/scripts/run-clang-tidy.py b/scripts/run-clang-tidy.py
new file mode 100755
index 00000000000..71b41ab70ce
--- /dev/null
+++ b/scripts/run-clang-tidy.py
@@ -0,0 +1,547 @@
+#!/usr/bin/env python3
+# TheSuperHackers @build JohnsterID 15/09/2025 Add clang-tidy runner script for code quality analysis
+# TheSuperHackers @build bobtista 04/12/2025 Simplify script for PCH-free analysis builds
+
+"""
+Clang-tidy runner script for GeneralsGameCode project.
+
+This is a convenience wrapper that:
+- Auto-detects the clang-tidy analysis build (build/clang-tidy)
+- Filters source files by include/exclude patterns
+- Processes files in batches to handle Windows command-line limits
+- Provides quiet progress reporting (only shows warnings/errors by default)
+
+For the analysis build to work correctly, it must be built WITHOUT precompiled headers.
+Run this first:
+  cmake -B build/clang-tidy -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja
+"""
+
+import argparse
+import json
+import multiprocessing
+import subprocess
+import sys
+from collections import defaultdict
+from pathlib import Path
+from typing import List, Optional, Tuple, Dict
+
+
+def find_clang_tidy() -> str:
+    """Find clang-tidy executable in PATH or common locations."""
+    try:
+        result = subprocess.run(
+            ['clang-tidy', '--version'],
+            capture_output=True,
+            text=True,
+            timeout=5
+        )
+        if result.returncode == 0:
+            return 'clang-tidy'
+    except (FileNotFoundError, subprocess.TimeoutExpired):
+        pass
+
+    import platform
+    if platform.system() == 'Darwin':
+        import glob
+        import re
+        possible_paths = glob.glob('/opt/homebrew/Cellar/llvm*/*/bin/clang-tidy')
+        possible_paths.extend(glob.glob('/usr/local/Cellar/llvm*/*/bin/clang-tidy'))
+
+        def extract_version(path):
+            match = re.search(r'llvm@?(\d+)', path)
+            if match:
+                return int(match.group(1))
+            match = re.search(r'/(\d+)\.(\d+)\.(\d+)', path)
+            if match:
+                return int(match.group(1)) * 10000 + int(match.group(2)) * 100 + int(match.group(3))
+            return 0
+
+        for path in sorted(possible_paths, key=extract_version, reverse=True):
+            try:
+                result = subprocess.run(
+                    [path, '--version'],
+                    capture_output=True,
+                    text=True,
+                    timeout=5
+                )
+                if result.returncode == 0:
+                    return path
+            except (FileNotFoundError, subprocess.TimeoutExpired):
+                continue
+
+    raise RuntimeError(
+        "clang-tidy not found in PATH. Please install clang-tidy:\n"
+        "  macOS: brew install llvm\n"
+        "  Windows: Install LLVM from https://llvm.org/builds/"
+    )
+
+
+def find_project_root() -> Path:
+    """Find the project root directory."""
+    current = Path(__file__).resolve().parent
+    while current != current.parent:
+        if (current / 'CMakeLists.txt').exists():
+            return current
+        current = current.parent
+    raise RuntimeError("Could not find project root (no CMakeLists.txt found)")
+
+
+def get_clang_tidy_version(clang_tidy_exe: str) -> Optional[str]:
+    """Get the version string from clang-tidy."""
+    try:
+        result = subprocess.run(
+            [clang_tidy_exe, '--version'],
+            capture_output=True,
+            text=True,
+            timeout=5
+        )
+        if result.returncode == 0:
+            return result.stdout.strip()
+    except (FileNotFoundError, subprocess.TimeoutExpired):
+        pass
+    return None
+
+
+def extract_llvm_version(version_string: str) -> Optional[str]:
+    """Extract LLVM version number from clang-tidy version string."""
+    import re
+    patterns = [
+        r'LLVM version (\d+\.\d+\.\d+)',
+        r'llvm version (\d+\.\d+\.\d+)',
+        r'Homebrew LLVM version (\d+\.\d+\.\d+)',
+        r'version (\d+\.\d+\.\d+)',
+    ]
+    for pattern in patterns:
+        match = re.search(pattern, version_string, re.IGNORECASE)
+        if match:
+            return match.group(1)
+    return None
+
+
+def find_clang_tidy_plugin(project_root: Path) -> Optional[str]:
+    """Find the GeneralsGameCode clang-tidy plugin."""
+    possible_paths = [
+        project_root / "scripts" / "clang-tidy-plugin" / "build" / "lib" / "libGeneralsGameCodeClangTidyPlugin.so",
+        project_root / "scripts" / "clang-tidy-plugin" / "build" / "lib" / "libGeneralsGameCodeClangTidyPlugin.dylib",
+        project_root / "scripts" / "clang-tidy-plugin" / "build" / "lib" / "libGeneralsGameCodeClangTidyPlugin.dll",
+        project_root / "scripts" / "clang-tidy-plugin" / "build" / "bin" / "libGeneralsGameCodeClangTidyPlugin.dll",
+    ]
+
+    for path in possible_paths:
+        if path.exists():
+            return str(path)
+
+    return None
+
+
+def find_compile_commands(build_dir: Optional[Path] = None) -> Path:
+    """Find compile_commands.json from the clang-tidy analysis build."""
+    project_root = find_project_root()
+
+    if build_dir:
+        if not build_dir.is_absolute():
+            build_dir = project_root / build_dir
+        compile_commands = build_dir / "compile_commands.json"
+        if compile_commands.exists():
+            return compile_commands
+        raise FileNotFoundError(
+            f"compile_commands.json not found in {build_dir}"
+        )
+
+    clang_tidy_build = project_root / "build" / "clang-tidy"
+    compile_commands = clang_tidy_build / "compile_commands.json"
+
+    if not compile_commands.exists():
+        raise RuntimeError(
+            "compile_commands.json not found!\n\n"
+            "Create the analysis build first:\n"
+            "  cmake -B build/clang-tidy -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja\n\n"
+            "Or specify a different build with --build-dir"
+        )
+
+    return compile_commands
+
+
+def load_compile_commands(compile_commands_path: Path) -> List[dict]:
+    """Load and parse compile_commands.json."""
+    try:
+        with open(compile_commands_path, 'r') as f:
+            return json.load(f)
+    except (json.JSONDecodeError, IOError) as e:
+        raise RuntimeError(f"Failed to load compile_commands.json: {e}")
+
+
+def filter_source_files(compile_commands: List[dict],
+                       include_patterns: List[str],
+                       exclude_patterns: List[str]) -> List[str]:
+    """Filter source files based on include/exclude patterns."""
+    project_root = find_project_root()
+    source_files = set()
+
+    for entry in compile_commands:
+        file_path = Path(entry['file'])
+
+        try:
+            rel_path = file_path.relative_to(project_root)
+        except ValueError:
+            continue
+
+        rel_path_str = str(rel_path)
+
+        if include_patterns:
+            if not any(pattern in rel_path_str for pattern in include_patterns):
+                continue
+
+        if any(pattern in rel_path_str for pattern in exclude_patterns):
+            continue
+
+        if file_path.suffix in {'.cpp', '.cxx', '.cc', '.c'}:
+            source_files.add(str(file_path))
+
+    return sorted(source_files)
+
+
+def _run_batch(args: Tuple) -> Tuple[int, Dict[str, List[str]]]:
+    """Helper function to run clang-tidy on a batch of files (for multiprocessing)."""
+    batch_num, batch, compile_commands_dir, fix, extra_args, project_root, clang_tidy_exe, verbose = args
+
+    cmd = [
+        clang_tidy_exe,
+        f'-p={compile_commands_dir}',
+    ]
+
+    if fix:
+        cmd.append('--fix')
+
+    if extra_args:
+        cmd.extend(extra_args)
+
+    cmd.extend(batch)
+
+    issues_by_file = defaultdict(list)
+
+    try:
+        result = subprocess.run(
+            cmd,
+            cwd=project_root,
+            capture_output=True,
+            text=True
+        )
+
+        if result.stdout or result.stderr:
+            output = result.stdout + result.stderr
+
+            for line in output.splitlines():
+                line = line.strip()
+                if not line:
+                    continue
+
+                line_lower = line.lower()
+                is_warning_or_error = ('warning' in line_lower or 'error' in line_lower)
+
+                if ':' in line and (is_warning_or_error or verbose):
+                    parts = line.split(':', 1)
+                    if parts:
+                        file_path = parts[0].strip()
+                        if any(file_path.endswith(ext) for ext in ['.cpp', '.cxx', '.cc', '.c', '.h', '.hpp', '.hxx']):
+                            try:
+                                rel_path = Path(file_path).relative_to(project_root)
+                                file_key = str(rel_path)
+                            except (ValueError, OSError):
+                                file_key = file_path
+
+                            if is_warning_or_error or verbose:
+                                issues_by_file[file_key].append(line)
+
+        return result.returncode, dict(issues_by_file)
+    except FileNotFoundError:
+        error_msg = "Error: clang-tidy not found. Please install LLVM/Clang."
+        if verbose:
+            print(error_msg, file=sys.stderr)
+        return 1, {}
+
+
+def run_clang_tidy(source_files: List[str],
+                  compile_commands_path: Path,
+                  extra_args: List[str],
+                  fix: bool = False,
+                  jobs: int = 1,
+                  verbose: bool = False,
+                  load_plugin: bool = True) -> int:
+    """Run clang-tidy on source files in batches, optionally in parallel."""
+    if not source_files:
+        print("No source files to analyze.")
+        return 0
+
+    clang_tidy_exe = find_clang_tidy()
+
+    project_root = find_project_root()
+    plugin_path = None
+    if load_plugin:
+        plugin_path = find_clang_tidy_plugin(project_root)
+        if plugin_path:
+            clang_tidy_version_str = get_clang_tidy_version(clang_tidy_exe)
+            if clang_tidy_version_str:
+                detected_version = extract_llvm_version(clang_tidy_version_str)
+                if detected_version:
+                    if verbose:
+                        print(f"Found clang-tidy plugin: {plugin_path}")
+                        print(f"Using clang-tidy LLVM version: {detected_version}")
+                        print("Note: Ensure the plugin was built with the same LLVM version (check CMake build output).\n")
+                    else:
+                        print(f"Note: Verify plugin was built with LLVM {detected_version} (check CMake build output)")
+                else:
+                    if verbose:
+                        print(f"Found clang-tidy plugin: {plugin_path}\n")
+            else:
+                if verbose:
+                    print(f"Found clang-tidy plugin: {plugin_path}\n")
+
+    BATCH_SIZE = 50
+    total_files = len(source_files)
+    batches = [source_files[i:i + BATCH_SIZE] for i in range(0, total_files, BATCH_SIZE)]
+
+    compile_commands_dir = compile_commands_path.parent
+
+    all_issues = defaultdict(list)
+    files_with_issues = set()
+    total_issues = 0
+
+    if plugin_path and '-load' not in ' '.join(extra_args):
+        extra_args = ['-load', plugin_path] + extra_args
+
+    if jobs > 1:
+        if verbose:
+            print(f"Running clang-tidy on {total_files} file(s) in {len(batches)} batch(es) with {jobs} workers...\n")
+        else:
+            print(f"Analyzing {total_files} file(s) with {jobs} workers...", end='', flush=True)
+
+        try:
+            with multiprocessing.Pool(processes=jobs) as pool:
+                batch_results = pool.map(
+                    _run_batch,
+                    [
+                        (idx + 1, batch, compile_commands_dir, fix, extra_args, project_root, clang_tidy_exe, verbose)
+                        for idx, batch in enumerate(batches)
+                    ]
+                )
+
+            overall_returncode = 0
+            for returncode, issues in batch_results:
+                if returncode != 0:
+                    overall_returncode = returncode
+                for file_path, file_issues in issues.items():
+                    if file_issues:
+                        all_issues[file_path].extend(file_issues)
+                        files_with_issues.add(file_path)
+                        total_issues += len(file_issues)
+
+            if not verbose:
+                print(" done.")
+        except KeyboardInterrupt:
+            print("\nInterrupted by user.")
+            return 130
+    else:
+        if verbose:
+            print(f"Running clang-tidy on {total_files} file(s) in {len(batches)} batch(es)...\n")
+        else:
+            print(f"Analyzing {total_files} file(s)...", end='', flush=True)
+
+        overall_returncode = 0
+        for batch_num, batch in enumerate(batches, 1):
+            try:
+                if verbose:
+                    print(f"Batch {batch_num}/{len(batches)}: {len(batch)} file(s)...")
+
+                returncode, issues = _run_batch((batch_num, batch, compile_commands_dir, fix, extra_args, project_root, clang_tidy_exe, verbose))
+                if returncode != 0:
+                    overall_returncode = returncode
+
+                for file_path, file_issues in issues.items():
+                    if file_issues:
+                        all_issues[file_path].extend(file_issues)
+                        files_with_issues.add(file_path)
+                        total_issues += len(file_issues)
+
+                if not verbose and batch_num < len(batches):
+                    print('.', end='', flush=True)
+            except KeyboardInterrupt:
+                print("\nInterrupted by user.")
+                return 130
+
+        if not verbose:
+            print(" done.")
+
+    print(f"\nSummary: {len(files_with_issues)} file(s) with issues, {total_issues} total issue(s)")
+
+    if all_issues:
+        print("\nIssues found:")
+        for file_path in sorted(all_issues.keys()):
+            print(f"\n{file_path}:")
+            for issue in all_issues[file_path]:
+                print(f"  {issue}")
+
+    return overall_returncode
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Run clang-tidy on GeneralsGameCode project",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Examples:
+  # First-time setup: Create PCH-free analysis build
+  cmake -B build/clang-tidy -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja
+
+  # Analyze all source files
+  python scripts/run-clang-tidy.py
+
+  # Analyze specific directory
+  python scripts/run-clang-tidy.py --include Core/Libraries/
+
+  # Analyze with specific checks
+  python scripts/run-clang-tidy.py --include GameClient/ -- -checks="-*,modernize-use-nullptr"
+
+  # Apply fixes (use with caution!)
+  python scripts/run-clang-tidy.py --fix --include Keyboard.cpp -- -checks="-*,modernize-use-nullptr"
+
+  # Use parallel processing (recommended: --jobs 4 for 6-core CPUs)
+  python scripts/run-clang-tidy.py --jobs 4 -- -checks="-*,modernize-use-nullptr"
+
+  # Show verbose output (default: only warnings/errors)
+  python scripts/run-clang-tidy.py --verbose --include Core/Libraries/
+
+  # Use different build directory
+  python scripts/run-clang-tidy.py --build-dir build/win32-debug
+
+Note: Requires a PCH-free build. Create with:
+      cmake -B build/clang-tidy -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja
+        """
+    )
+
+    parser.add_argument(
+        '--build-dir', '-b',
+        type=Path,
+        help='Build directory with compile_commands.json (auto-detected if omitted)'
+    )
+
+    parser.add_argument(
+        '--include', '-i',
+        action='append',
+        default=[],
+        help='Include files matching this pattern (can be used multiple times)'
+    )
+
+    parser.add_argument(
+        '--exclude', '-e',
+        action='append',
+        default=[],
+        help='Exclude files matching this pattern (can be used multiple times)'
+    )
+
+    parser.add_argument(
+        '--fix',
+        action='store_true',
+        help='Apply suggested fixes automatically (use with caution!)'
+    )
+
+    parser.add_argument(
+        '--jobs', '-j',
+        type=int,
+        default=multiprocessing.cpu_count(),
+        help=f'Number of parallel workers (default: {multiprocessing.cpu_count()} - auto-detected). Use 1 for serial processing'
+    )
+
+    parser.add_argument(
+        '--verbose', '-v',
+        action='store_true',
+        help='Show detailed output for each file (default: only show warnings/errors)'
+    )
+
+    parser.add_argument(
+        '--no-plugin',
+        action='store_true',
+        help='Do not automatically load the GeneralsGameCode clang-tidy plugin'
+    )
+
+    parser.add_argument(
+        'clang_tidy_args',
+        nargs='*',
+        help='Additional arguments to pass to clang-tidy, or specific files to analyze (if files are provided, --include/--exclude are ignored)'
+    )
+
+    args = parser.parse_args()
+
+    try:
+        compile_commands_path = find_compile_commands(args.build_dir)
+        print(f"Using compile commands: {compile_commands_path}\n")
+
+        project_root = find_project_root()
+        specified_files = []
+        clang_tidy_args = []
+
+        for arg in args.clang_tidy_args:
+            file_path = Path(arg)
+            if not file_path.is_absolute():
+                file_path = project_root / file_path
+
+            if file_path.exists() and file_path.suffix in {'.cpp', '.cxx', '.cc', '.c', '.h', '.hpp'}:
+                specified_files.append(str(file_path.resolve()))
+            else:
+                clang_tidy_args.append(arg)
+
+        if specified_files:
+            if args.verbose:
+                print(f"Analyzing {len(specified_files)} specified file(s)\n")
+            return run_clang_tidy(
+                specified_files,
+                compile_commands_path,
+                clang_tidy_args,
+                args.fix,
+                args.jobs,
+                args.verbose,
+                load_plugin=not args.no_plugin
+            )
+
+        compile_commands = load_compile_commands(compile_commands_path)
+
+        default_excludes = [
+            'Dependencies/MaxSDK',  # External SDK
+            '_deps/',               # CMake dependencies
+            'build/',               # Build artifacts
+            '.git/',                # Git directory
+        ]
+
+        exclude_patterns = default_excludes + args.exclude
+
+        source_files = filter_source_files(
+            compile_commands,
+            args.include,
+            exclude_patterns
+        )
+
+        if not source_files:
+            print("No source files found matching the criteria.")
+            return 1
+
+        if args.verbose:
+            print(f"Found {len(source_files)} source file(s) to analyze\n")
+
+        return run_clang_tidy(
+            source_files,
+            compile_commands_path,
+            clang_tidy_args,
+            args.fix,
+            args.jobs,
+            args.verbose,
+            load_plugin=not args.no_plugin
+        )
+
+    except Exception as e:
+        print(f"Error: {e}", file=sys.stderr)
+        return 1
+
+
+if __name__ == '__main__':
+    sys.exit(main())
+
diff --git a/vcpkg-lock.json b/vcpkg-lock.json
new file mode 100644
index 00000000000..422998f0378
--- /dev/null
+++ b/vcpkg-lock.json
@@ -0,0 +1,48 @@
+{
+    "version": 1,
+    "dependencies": [
+        {
+            "name": "ffmpeg",
+            "version-string": "7.1.1",
+            "port-version": 1,
+            "git-tree": "6ff75f1f596ada519241989f44077cda442480b2"
+        },
+        {
+            "name": "pkgconf",
+            "version-string": "2.3.0",
+            "port-version": 0,
+            "git-tree": "ae3886d8a627ec99dd18890389b6d5d331e29799"
+        },
+        {
+            "name": "vcpkg-cmake",
+            "version-string": "2024-04-23",
+            "port-version": 0,
+            "git-tree": "e74aa1e8f93278a8e71372f1fa08c3df420eb840"
+        },
+        {
+            "name": "vcpkg-cmake-get-vars",
+            "version-string": "2024-09-22",
+            "port-version": 0,
+            "git-tree": "f23148add155147f3d95ae622d3b0031beb25acf"
+        },
+        {
+            "name": "vcpkg-pkgconfig-get-modules",
+            "version-string": "2024-04-03",
+            "port-version": 0,
+            "git-tree": "6845369c8cb7d3c318e8e3ae92fd2b7570a756ca"
+        },
+        {
+            "name": "vcpkg-tool-meson",
+            "version-string": "1.6.1",
+            "port-version": 0,
+            "git-tree": "dc948c67d7f1359319f801078422e996b0a89fd0"
+        },
+        {
+            "name": "zlib",
+            "version-string": "1.3.1",
+            "port-version": 0,
+            "git-tree": "3f05e04b9aededb96786a911a16193cdb711f0c9"
+        }
+    ]
+}
+